diff --git a/.eslintrc.yml b/.eslintrc.yml
index 03051380c5d..d339201eff3 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -15,6 +15,7 @@ extends:
   - prettier/react
   - plugin:@typescript-eslint/recommended
   - prettier/@typescript-eslint
+  - plugin:github/react
 
 rules:
   ##########
@@ -29,6 +30,7 @@ rules:
   ###########
   # PLUGINS #
   ###########
+
   # TYPESCRIPT
   '@typescript-eslint/naming-convention':
     - error
@@ -111,6 +113,7 @@ rules:
   react/jsx-uses-vars: error
   react/jsx-uses-react: error
   react/no-unused-state: error
+  # niik 2023-12-05: turning this off to not muddy up the TS5 upgrade.
   react/no-unused-prop-types: error
   react/prop-types:
     - error
@@ -121,7 +124,10 @@ rules:
   jsdoc/check-tag-names: error
   jsdoc/check-types: error
   jsdoc/implements-on-classes: error
-  jsdoc/newline-after-description: error
+  jsdoc/tag-lines:
+    - error
+    - any
+    - startLines: 1
   jsdoc/no-undefined-types: error
   jsdoc/valid-types: error
 
@@ -184,6 +190,20 @@ rules:
     - selector: ExportDefaultDeclaration
       message: Use of default exports is forbidden
 
+  ###########
+  # jsx-a11y #
+  ###########
+
+  # autofocus is fine when it is being used to set focus to something in a way
+  # that doesn't skip any context or inputs. For example, in a named dialog, if you had
+  # a close button, a heading reflecting the name, and a labelled text input,
+  # focusing the text input wouldn't disadvantage a user because they're not
+  # missing anything of importance before it.  The problem is when it is used on
+  # larger web pages, e.g. to focus a form field in the main content, entirely
+  # skipping the header and often much else besides.
+  jsx-a11y/no-autofocus:
+    - off
+
 overrides:
   - files: '*.d.ts'
     rules:
@@ -196,6 +216,9 @@ overrides:
   - files: 'script/**/*'
     rules:
       '@typescript-eslint/no-non-null-assertion': off
+  - files: 'app/src/ui/octicons/octicons.generated.ts'
+    rules:
+      '@typescript-eslint/naming-convention': off
 
 parserOptions:
   sourceType: module
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index d10ac1b2c53..12b8b11eae9 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -66,7 +66,7 @@ comment to the existing issue if there is extra information you can contribute.
 
 Bugs are tracked as [GitHub issues](https://guides.github.com/features/issues/).
 
-Simply create an issue on the [GitHub Desktop issue tracker](https://github.com/desktop/desktop/issues/new?template=bug_report.md)
+Simply create an issue on the [GitHub Desktop issue tracker](https://github.com/desktop/desktop/issues/new?template=bug_report.yaml)
 and fill out the provided issue template.
 
 The information we are interested in includes:
@@ -87,7 +87,7 @@ community understand your suggestion :pencil: and find related suggestions
 Before creating enhancement suggestions, please check [this list](#before-submitting-an-enhancement-suggestion)
 as you might find out that you don't need to create one. When you are creating
 an enhancement suggestion, please [include as many details as possible](#how-do-i-submit-a-good-enhancement-suggestion).
-Fill in [the template](ISSUE_TEMPLATE/problem-to-raise.md), including the steps
+Fill in [the template](ISSUE_TEMPLATE/feature_request.yaml), including the steps
 that you imagine you would take if the feature you're requesting existed.
 
 #### Before Submitting An Enhancement Suggestion
@@ -101,7 +101,7 @@ information you would like to add.
 
 Enhancement suggestions are tracked as [GitHub issues](https://guides.github.com/features/issues/).
 
-Simply create an issue on the [GitHub Desktop issue tracker](https://github.com/desktop/desktop/issues/new?template=feature_request.md)
+Simply create an issue on the [GitHub Desktop issue tracker](https://github.com/desktop/desktop/issues/new?template=feature_request.yaml)
 and fill out the provided issue template.
 
 Some additional advice:
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000000..e22a9bd70ab
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,8 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: weekly
+    # Disable version updates and keep only security updates
+    open-pull-requests-limit: 0
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index f99b109d580..c5fcc02d167 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,5 +1,6 @@
 <!--
-What GitHub Desktop issue does this PR address? (for example, #1234)
+What GitHub Desktop issue does this PR address (for example, #1234)?
+If you have not created an issue for your PR, please search the issue tracker to see if there is an existing issue that aligns with your PR, or open a new issue for discussion.
 -->
 
 Closes #[issue number]
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 40e7a8537d0..55addcedfd4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,68 +4,102 @@ on:
   push:
     branches:
       - development
-      - __release-*
   pull_request:
+  workflow_call:
+    inputs:
+      repository:
+        default: desktop/desktop
+        required: false
+        type: string
+      ref:
+        required: true
+        type: string
+      upload-artifacts:
+        default: false
+        required: false
+        type: boolean
+      environment:
+        type: string
+        required: true
+      sign:
+        type: boolean
+        default: true
+        required: false
+    secrets:
+      AZURE_CODE_SIGNING_TENANT_ID:
+      AZURE_CODE_SIGNING_CLIENT_ID:
+      AZURE_CODE_SIGNING_CLIENT_SECRET:
+      DESKTOP_OAUTH_CLIENT_ID:
+      DESKTOP_OAUTH_CLIENT_SECRET:
+      APPLE_ID:
+      APPLE_ID_PASSWORD:
+      APPLE_TEAM_ID:
+      APPLE_APPLICATION_CERT:
+      APPLE_APPLICATION_CERT_PASSWORD:
+
+env:
+  NODE_VERSION: 20.17.0
 
 jobs:
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    env:
+      RELEASE_CHANNEL: ${{ inputs.environment }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          repository: ${{ inputs.repository || github.repository }}
+          ref: ${{ inputs.ref }}
+          submodules: recursive
+      - uses: actions/setup-node@v4
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+          cache: yarn
+      - run: yarn
+      - run: yarn validate-electron-version
+      - run: yarn lint
+      - run: yarn validate-changelog
+      - name: Ensure a clean working directory
+        run: git diff --name-status --exit-code
   build:
     name: ${{ matrix.friendlyName }} ${{ matrix.arch }}
     runs-on: ${{ matrix.os }}
-    permissions: read-all
+    permissions:
+      contents: read
     strategy:
       fail-fast: false
       matrix:
-        node: [16.13.0]
-        os: [macos-10.15, windows-2019]
+        os: [macos-13-xl-arm64, windows-2019]
         arch: [x64, arm64]
         include:
-          - os: macos-10.15
+          - os: macos-13-xl-arm64
             friendlyName: macOS
           - os: windows-2019
             friendlyName: Windows
     timeout-minutes: 60
+    environment: ${{ inputs.environment }}
     env:
-      # Needed for macOS arm64 until hosted macos-11.0 runners become available
-      SDKROOT: /Library/Developer/CommandLineTools/SDKs/MacOSX11.1.sdk
+      RELEASE_CHANNEL: ${{ inputs.environment }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
+          repository: ${{ inputs.repository || github.repository }}
+          ref: ${{ inputs.ref }}
           submodules: recursive
-      - name: Use Node.js ${{ matrix.node }}
-        uses: actions/setup-node@v1
+      - uses: actions/setup-python@v5
         with:
-          node-version: ${{ matrix.node }}
-
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-
-      - uses: actions/cache@v2
-        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
+          python-version: '3.11'
+      - name: Use Node.js ${{ env.NODE_VERSION }}
+        uses: actions/setup-node@v4
         with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-            ${{ runner.os }}-yarn-
-
-      # This step can be removed as soon as official Windows arm64 builds are published:
-      # https://github.com/nodejs/build/issues/2450#issuecomment-705853342
-      - name: Get NodeJS node-gyp lib for Windows arm64
-        if: ${{ matrix.os == 'windows-2019' && matrix.arch == 'arm64' }}
-        run: .\script\download-nodejs-win-arm64.ps1 ${{ matrix.node }}
-
+          node-version: ${{ env.NODE_VERSION }}
+          cache: yarn
       - name: Install and build dependencies
         run: yarn
         env:
           npm_config_arch: ${{ matrix.arch }}
           TARGET_ARCH: ${{ matrix.arch }}
-      - name: Lint
-        run: yarn lint
-      - name: Validate changelog
-        run: yarn validate-changelog
-      - name: Ensure a clean working directory
-        run: git diff --name-status --exit-code
       - name: Build production app
         run: yarn build:prod
         env:
@@ -74,28 +108,47 @@ jobs:
             ${{ secrets.DESKTOP_OAUTH_CLIENT_SECRET }}
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
-          DESKTOPBOT_TOKEN: ${{ secrets.DESKTOPBOT_TOKEN }}
-          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
+          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+          APPLE_APPLICATION_CERT: ${{ secrets.APPLE_APPLICATION_CERT }}
+          KEY_PASSWORD: ${{ secrets.APPLE_APPLICATION_CERT_PASSWORD }}
           npm_config_arch: ${{ matrix.arch }}
           TARGET_ARCH: ${{ matrix.arch }}
       - name: Prepare testing environment
         if: matrix.arch == 'x64'
         run: yarn test:setup
+        env:
+          npm_config_arch: ${{ matrix.arch }}
       - name: Run unit tests
         if: matrix.arch == 'x64'
         run: yarn test:unit
       - name: Run script tests
         if: matrix.arch == 'x64'
         run: yarn test:script
-      - name: Publish production app
-        run: yarn run publish
+      - name: Install Azure Code Signing Client
+        if: ${{ runner.os == 'Windows' && inputs.sign }}
+        run: |
+          $acsZip = Join-Path $env:RUNNER_TEMP "acs.zip"
+          $acsDir = Join-Path $env:RUNNER_TEMP "acs"
+          Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.Trusted.Signing.Client/1.0.52 -OutFile $acsZip -Verbose
+          Expand-Archive $acsZip -Destination $acsDir -Force -Verbose
+          # Replace ancient signtool in electron-winstall with one that supports ACS
+          Copy-Item -Path "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x64\*" -Include signtool.exe,signtool.exe.manifest,Microsoft.Windows.Build.Signing.mssign32.dll.manifest,mssign32.dll,Microsoft.Windows.Build.Signing.wintrust.dll.manifest,wintrust.dll,Microsoft.Windows.Build.Appx.AppxSip.dll.manifest,AppxSip.dll,Microsoft.Windows.Build.Appx.AppxPackaging.dll.manifest,AppxPackaging.dll,Microsoft.Windows.Build.Appx.OpcServices.dll.manifest,OpcServices.dll -Destination "node_modules\electron-winstaller\vendor" -Verbose
+      - name: Package production app
+        run: yarn package
         env:
           npm_config_arch: ${{ matrix.arch }}
-          DESKTOPBOT_TOKEN: ${{ secrets.DESKTOPBOT_TOKEN }}
-          WINDOWS_CERT_PASSWORD: ${{ secrets.WINDOWS_CERT_PASSWORD }}
-          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
-          DEPLOYMENT_SECRET: ${{ secrets.DEPLOYMENT_SECRET }}
-          AZURE_STORAGE_ACCOUNT: ${{ secrets.AZURE_STORAGE_ACCOUNT }}
-          AZURE_STORAGE_ACCESS_KEY: ${{ secrets.AZURE_STORAGE_ACCESS_KEY }}
-          AZURE_BLOB_CONTAINER: ${{ secrets.AZURE_BLOB_CONTAINER }}
-          AZURE_STORAGE_URL: ${{ secrets.AZURE_STORAGE_URL }}
+          AZURE_TENANT_ID: ${{ secrets.AZURE_CODE_SIGNING_TENANT_ID }}
+          AZURE_CLIENT_ID: ${{ secrets.AZURE_CODE_SIGNING_CLIENT_ID }}
+          AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CODE_SIGNING_CLIENT_SECRET }}
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        if: ${{ inputs.upload-artifacts }}
+        with:
+          name: ${{matrix.friendlyName}}-${{matrix.arch}}
+          path: |
+            dist/GitHub Desktop-${{matrix.arch}}.zip
+            dist/GitHubDesktop-*.nupkg
+            dist/GitHubDesktopSetup-${{matrix.arch}}.exe
+            dist/GitHubDesktopSetup-${{matrix.arch}}.msi
+            dist/bundle-size.json
+          if-no-files-found: error
diff --git a/.github/workflows/close-invalid.yml b/.github/workflows/close-invalid.yml
new file mode 100644
index 00000000000..c1fc8564a59
--- /dev/null
+++ b/.github/workflows/close-invalid.yml
@@ -0,0 +1,36 @@
+name: Close issue/PR on adding invalid label
+
+# **What it does**: This action closes issues and PRs that are labeled as invalid in the Desktop repo.
+
+on:
+  issues:
+    types: [labeled]
+  # Needed in lieu of `pull_request` so that PRs from a fork can be
+  # closed when marked as invalid.
+  pull_request_target:
+    types: [labeled]
+
+permissions:
+  contents: read
+  issues: write
+  pull-requests: write
+
+jobs:
+  close-on-adding-invalid-label:
+    if:
+      github.repository == 'desktop/desktop' && github.event.label.name ==
+      'invalid'
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Close issue
+        if: ${{ github.event_name == 'issues' }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: gh issue close ${{ github.event.issue.html_url }}
+
+      - name: Close PR
+        if: ${{ github.event_name == 'pull_request_target' }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: gh pr close ${{ github.event.pull_request.html_url }}
diff --git a/.github/workflows/close-single-word-issues.yml b/.github/workflows/close-single-word-issues.yml
new file mode 100644
index 00000000000..f2ef0dae8e3
--- /dev/null
+++ b/.github/workflows/close-single-word-issues.yml
@@ -0,0 +1,44 @@
+name: Close Single-Word Issues
+
+on:
+  issues:
+    types:
+      - opened
+
+permissions:
+  issues: write
+
+jobs:
+  close-issue:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Close Single-Word Issue
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const issueTitle = context.payload.issue.title.trim();
+            const isSingleWord = /^\S+$/.test(issueTitle);
+
+            if (isSingleWord) {
+              const issueNumber = context.payload.issue.number;
+              const repo = context.repo.repo;
+
+              // Close the issue and add the invalid label
+              github.rest.issues.update({
+                owner: context.repo.owner,
+                repo: repo,
+                issue_number: issueNumber,
+                labels: ['invalid'],
+                state: 'closed'
+              });
+
+              // Comment on the issue
+              await github.rest.issues.createComment({
+                owner: context.repo.owner,
+                repo: repo,
+                issue_number: issueNumber,
+                body: `This issue may have been opened accidentally. I'm going to close it now, but feel free to open a new issue with a more descriptive title.`
+              });
+            }
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 4d8d7d8f23a..6b78b39f3f4 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -18,11 +18,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
+        uses: github/codeql-action/init@v3
         with:
           config-file: ./.github/codeql/codeql-config.yml
 
@@ -32,7 +32,7 @@ jobs:
       # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below).
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v1
+        uses: github/codeql-action/autobuild@v3
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -46,4 +46,4 @@ jobs:
       #     make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1
+        uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/feature-request-comment.yml b/.github/workflows/feature-request-comment.yml
new file mode 100644
index 00000000000..9c65d4cc9c8
--- /dev/null
+++ b/.github/workflows/feature-request-comment.yml
@@ -0,0 +1,36 @@
+name: Add feature-request comment
+on:
+  issues:
+    types:
+      - labeled
+
+permissions:
+  issues: write
+
+jobs:
+  add-comment-to-feature-request-issues:
+    if: github.event.label.name == 'feature-request'
+    runs-on: ubuntu-latest
+    env:
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      GH_REPO: ${{ github.repository }}
+      NUMBER: ${{ github.event.issue.number }}
+      BODY: >
+        Thank you for your issue! We have categorized it as a feature request,
+        and it has been added to our backlog. In doing so, **we are not
+        committing to implementing this feature at this time**, but, we will
+        consider it for future releases based on community feedback and our own
+        product roadmap. 
+
+
+        Unless you see the
+        https://github.com/desktop/desktop/labels/help%20wanted label, we are
+        not currently looking for external contributions for this feature.
+
+
+        **If you come across this issue and would like to see it implemented,
+        please add a thumbs up!** This will help us prioritize the feature.
+        Please only comment if you have additional information or viewpoints to
+        contribute.
+    steps:
+      - run: gh issue comment "$NUMBER" --body "$BODY"
diff --git a/.github/workflows/on-issue-close.yml b/.github/workflows/on-issue-close.yml
new file mode 100644
index 00000000000..e768226d088
--- /dev/null
+++ b/.github/workflows/on-issue-close.yml
@@ -0,0 +1,17 @@
+name: Remove triage tab from closed issues
+on:
+  issues:
+    types:
+      - closed
+jobs:
+  label_issues:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+    steps:
+      - run: gh issue edit "$NUMBER" --remove-label "$LABELS"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_REPO: ${{ github.repository }}
+          NUMBER: ${{ github.event.issue.number }}
+          LABELS: triage
diff --git a/.github/workflows/pr-is-external.yml b/.github/workflows/pr-is-external.yml
new file mode 100644
index 00000000000..37a20941951
--- /dev/null
+++ b/.github/workflows/pr-is-external.yml
@@ -0,0 +1,22 @@
+name: PR external
+on:
+  pull_request_target:
+    types:
+      - reopened
+      - opened
+
+jobs:
+  label_issues:
+    # pull_request.head.label = {owner}:{branch}
+    if: startsWith(github.event.pull_request.head.label, 'desktop:') == false
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+      repository-projects: read
+    steps:
+      - run: gh pr edit "$NUMBER" --add-label "$LABELS"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_REPO: ${{ github.repository }}
+          NUMBER: ${{ github.event.pull_request.number }}
+          LABELS: external
diff --git a/.github/workflows/release-pr.yml b/.github/workflows/release-pr.yml
new file mode 100644
index 00000000000..f03f1f074f3
--- /dev/null
+++ b/.github/workflows/release-pr.yml
@@ -0,0 +1,49 @@
+name: 'Create Release Pull Request'
+
+on: create
+
+jobs:
+  build:
+    name: Create Release Pull Request
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+      - uses: actions/checkout@v4
+        if: |
+          startsWith(github.ref, 'refs/heads/releases/') && !contains(github.ref, 'test')
+
+      - name: Create Pull Request content
+        if: |
+          startsWith(github.ref, 'refs/heads/releases/') && !contains(github.ref, 'test')
+        run: |
+          PR_TITLE=`./script/draft-release/release-pr-content.sh title ${GITHUB_REF#refs/heads/}`
+          PR_BODY=`./script/draft-release/release-pr-content.sh body ${GITHUB_REF#refs/heads/}`
+
+          echo "PR_BODY<<EOF" >> $GITHUB_ENV
+          echo "$PR_BODY" >> $GITHUB_ENV
+          echo "EOF" >> $GITHUB_ENV
+
+          echo "PR_TITLE<<EOF" >> $GITHUB_ENV
+          echo "$PR_TITLE" >> $GITHUB_ENV
+          echo "EOF" >> $GITHUB_ENV
+
+      - uses: tibdex/github-app-token@v2
+        id: generate-token
+        if: |
+          startsWith(github.ref, 'refs/heads/releases/') && !contains(github.ref, 'test')
+        with:
+          app_id: ${{ secrets.DESKTOP_RELEASES_APP_ID }}
+          private_key: ${{ secrets.DESKTOP_RELEASES_APP_PRIVATE_KEY }}
+
+      - name: Create Release Pull Request
+        uses: peter-evans/create-pull-request@v6.0.5
+        if: |
+          startsWith(github.ref, 'refs/heads/releases/') && !contains(github.ref, 'test')
+        with:
+          token: ${{ steps.generate-token.outputs.token }}
+          title: ${{ env.PR_TITLE }}
+          body: ${{ env.PR_BODY }}
+          branch: ${{ github.ref }}
+          base: development
+          draft: true
diff --git a/.github/workflows/remove-triage-label.yml b/.github/workflows/remove-triage-label.yml
new file mode 100644
index 00000000000..7eac3f2f8ed
--- /dev/null
+++ b/.github/workflows/remove-triage-label.yml
@@ -0,0 +1,20 @@
+name: Remove triage label
+on:
+  issues:
+    types:
+      - labeled
+
+permissions:
+  issues: write
+
+jobs:
+  remove-triage-label-from-issues:
+    if: github.event.label.name != 'triage'
+    runs-on: ubuntu-latest
+    steps:
+      - run: gh issue edit "$NUMBER" --remove-label "$LABELS"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_REPO: ${{ github.repository }}
+          NUMBER: ${{ github.event.issue.number }}
+          LABELS: triage
diff --git a/.github/workflows/stale-issues.yml b/.github/workflows/stale-issues.yml
new file mode 100644
index 00000000000..9c8ebbd91a5
--- /dev/null
+++ b/.github/workflows/stale-issues.yml
@@ -0,0 +1,20 @@
+name: 'Marks stale issues and PRs'
+on:
+  schedule:
+    - cron: '30 1 * * *' # 1:30 AM UTC
+
+permissions:
+  issues: write
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v9
+        with:
+          stale-issue-label: 'stale, triage' # The label that will be added to the issues when automatically marked as stale
+          start-date: '2024-11-25T00:00:00Z' # Skip stale action for issues/PRs created before it
+          days-before-stale: 365
+          days-before-close: -1 # If -1, the issues nor pull requests will never be closed automatically.
+          days-before-pr-stale: -1 # If  -1, no pull requests will be marked as stale automatically.
+          exempt-issue-labels: 'never-stale, help wanted, ' # issues labeled as such will be excluded them from being marked as stale
diff --git a/.github/workflows/triage-issues.yml b/.github/workflows/triage-issues.yml
new file mode 100644
index 00000000000..f73bb297a68
--- /dev/null
+++ b/.github/workflows/triage-issues.yml
@@ -0,0 +1,34 @@
+name: Label incoming issues
+on:
+  issues:
+    types:
+      - reopened
+      - opened
+      - unlabeled
+
+permissions:
+  issues: write
+
+jobs:
+  label_incoming_issues:
+    runs-on: ubuntu-latest
+    if: github.event.action == 'opened' || github.event.action == 'reopened'
+    steps:
+      - run: gh issue edit "$NUMBER" --add-label "$LABELS"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_REPO: ${{ github.repository }}
+          NUMBER: ${{ github.event.issue.number }}
+          LABELS: triage
+  label_more_info_issues:
+    if:
+      github.event.action == 'unlabeled' && github.event.label.name ==
+      'more-info-needed'
+    runs-on: ubuntu-latest
+    steps:
+      - run: gh issue edit "$NUMBER" --add-label "$LABELS"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_REPO: ${{ github.repository }}
+          NUMBER: ${{ github.event.issue.number }}
+          LABELS: triage
diff --git a/.github/workflows/unable-to-reproduce-comment.yml b/.github/workflows/unable-to-reproduce-comment.yml
new file mode 100644
index 00000000000..9c13e43ee4c
--- /dev/null
+++ b/.github/workflows/unable-to-reproduce-comment.yml
@@ -0,0 +1,41 @@
+name: Add unable-to-reproduce comment
+on:
+  issues:
+    types:
+      - labeled
+
+permissions:
+  issues: write
+
+jobs:
+  add-comment-to-unable-to-reproduce-issues:
+    if: github.event.label.name == 'unable-to-reproduce'
+    runs-on: ubuntu-latest
+    env:
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      GH_REPO: ${{ github.repository }}
+      NUMBER: ${{ github.event.issue.number }}
+      LABELS: more-info-needed
+      BODY: >
+        Thank you for your issue! Unfortunately, we are unable to reproduce the
+        issue you are experiencing. Please provide more information so we can
+        help you.
+
+
+        Here are some tips for writing reproduction steps: 
+          - Step by step instructions accompanied by screenshots or screencasts
+        are the best.
+          - Be as specific as possible; include as much detail as you can. 
+          - If not already provided, include:
+              - the version of GitHub Desktop you are using. 
+              - the operating system you are using
+              - any environment factors you can think of.
+              - any custom configuration you are using.
+              - a log file from the day you experienced the issue (access log
+        files via the file menu and select `Help` > `Show Logs in
+        Finder/Explorer`.
+          - If relevant and can be shared, provide the repository or code you
+        are using.
+    steps:
+      - run: gh issue edit "$NUMBER" --add-label "$LABELS"
+      - run: gh issue comment "$NUMBER" --body "$BODY"
diff --git a/.gitignore b/.gitignore
index 30a0037ef0b..91bdd56682f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ coverage/
 npm-debug.log
 yarn-error.log
 app/node_modules/
+vendor/windows-argv-parser/build/
 .DS_Store
 .awcache
 .idea/
diff --git a/.markdownlint.js b/.markdownlint.js
new file mode 100644
index 00000000000..eb043f42c40
--- /dev/null
+++ b/.markdownlint.js
@@ -0,0 +1,2 @@
+const markdownlintGitHub = require('@github/markdownlint-github')
+module.exports = markdownlintGitHub.init()
diff --git a/.node-version b/.node-version
index 58a4133d910..3516580bbbc 100644
--- a/.node-version
+++ b/.node-version
@@ -1 +1 @@
-16.13.0
+20.17.0
diff --git a/.nvmrc b/.nvmrc
index ff650592a1e..016e34baf16 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-v16.13.0
+v20.17.0
diff --git a/.tool-versions b/.tool-versions
index 866f9e82545..5f93b9a8287 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
 python 3.9.5
-nodejs 16.13.0
+nodejs 20.17.0
diff --git a/.vscode/settings.json b/.vscode/settings.json
index d527f4e15c6..9c1caea584f 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -27,7 +27,7 @@
   "editor.formatOnSave": true,
   "prettier.ignorePath": ".prettierignore",
   "eslint.options": {
-    "configFile": ".eslintrc.yml",
+    "overrideConfigFile": ".eslintrc.yml",
     "rulePaths": ["eslint-rules"]
   },
   "eslint.validate": [
@@ -35,5 +35,6 @@
     "javascriptreact",
     "typescript",
     "typescriptreact"
-  ]
+  ],
+  "editor.defaultFormatter": "esbenp.prettier-vscode"
 }
diff --git a/README.md b/README.md
index a5038a7fdbf..27a7e9d105f 100644
--- a/README.md
+++ b/README.md
@@ -1,63 +1,62 @@
 # [GitHub Desktop](https://desktop.github.com)
 
-[GitHub Desktop](https://desktop.github.com/) is an open source [Electron](https://www.electronjs.org/)-based
-GitHub app. It is written in [TypeScript](http://www.typescriptlang.org) and
+[GitHub Desktop](https://desktop.github.com/) is an open-source [Electron](https://www.electronjs.org/)-based
+GitHub app. It is written in [TypeScript](https://www.typescriptlang.org) and
 uses [React](https://reactjs.org/).
 
-![GitHub Desktop screenshot - Windows](https://cloud.githubusercontent.com/assets/359239/26094502/a1f56d02-3a5d-11e7-8799-23c7ba5e5106.png)
+<picture>
+  <source
+    srcset="https://user-images.githubusercontent.com/634063/202742848-63fa1488-6254-49b5-af7c-96a6b50ea8af.png"
+    media="(prefers-color-scheme: dark)"
+  />
+  <img
+    width="1072"
+    src="https://user-images.githubusercontent.com/634063/202742985-bb3b3b94-8aca-404a-8d8a-fd6a6f030672.png"
+    alt="A screenshot of the GitHub Desktop application showing changes being viewed and committed with two attributed co-authors"
+  />
+</picture>
 
 ## Where can I get it?
 
 Download the official installer for your operating system:
 
  - [macOS](https://central.github.com/deployments/desktop/desktop/latest/darwin)
- - [macOS (Apple Silicon)](https://central.github.com/deployments/desktop/desktop/latest/darwin-arm64)
+ - [macOS (Apple silicon)](https://central.github.com/deployments/desktop/desktop/latest/darwin-arm64)
  - [Windows](https://central.github.com/deployments/desktop/desktop/latest/win32)
  - [Windows machine-wide install](https://central.github.com/deployments/desktop/desktop/latest/win32?format=msi)
 
-You can install this alongside your existing GitHub Desktop for Mac or GitHub
-Desktop for Windows application.
-
 Linux is not officially supported; however, you can find installers created for Linux from a fork of GitHub Desktop in the [Community Releases](https://github.com/desktop/desktop#community-releases) section.
 
-**NOTE**: There is no current migration path to import your existing
-repositories into the new application - you can drag-and-drop your repositories
-from disk onto the application to get started.
-
-
 ### Beta Channel
 
 Want to test out new features and get fixes before everyone else? Install the
 beta channel to get access to early builds of Desktop:
 
  - [macOS](https://central.github.com/deployments/desktop/desktop/latest/darwin?env=beta)
- - [macOS (Apple Silicon)](https://central.github.com/deployments/desktop/desktop/latest/darwin-arm64?env=beta)
+ - [macOS (Apple silicon)](https://central.github.com/deployments/desktop/desktop/latest/darwin-arm64?env=beta)
  - [Windows](https://central.github.com/deployments/desktop/desktop/latest/win32?env=beta)
  - [Windows (ARM64)](https://central.github.com/deployments/desktop/desktop/latest/win32-arm64?env=beta)
- 
+
 The release notes for the latest beta versions are available [here](https://desktop.github.com/release-notes/?env=beta).
 
+### Past Releases
+You can find past releases at https://desktop.githubusercontent.com. After installation of a past version, the auto update functionality will attempt to download the latest version. 
+
 ### Community Releases
 
 There are several community-supported package managers that can be used to
 install GitHub Desktop:
- - Windows users can install using [Chocolatey](https://chocolatey.org/) package manager:
-      `c:\> choco install github-desktop`
+ - Windows users can install using [winget](https://docs.microsoft.com/en-us/windows/package-manager/winget/) `c:\> winget install github-desktop` or [Chocolatey](https://chocolatey.org/) `c:\> choco install github-desktop`
  - macOS users can install using [Homebrew](https://brew.sh/) package manager:
       `$ brew install --cask github`
 
 Installers for various Linux distributions can be found on the
 [`shiftkey/desktop`](https://github.com/shiftkey/desktop) fork.
 
-Arch Linux users can install the latest version from the
-[AUR](https://aur.archlinux.org/packages/github-desktop-bin/).
-
 ## Is GitHub Desktop right for me? What are the primary areas of focus?
 
 [This document](https://github.com/desktop/desktop/blob/development/docs/process/what-is-desktop.md) describes the focus of GitHub Desktop and who the product is most useful for.
 
-And to see what the team is working on currently and in the near future, check out the [GitHub Desktop roadmap](https://github.com/desktop/desktop/blob/development/docs/process/roadmap.md).
-
 ## I have a problem with GitHub Desktop
 
 Note: The [GitHub Desktop Code of Conduct](https://github.com/desktop/desktop/blob/development/CODE_OF_CONDUCT.md) applies in all interactions relating to the GitHub Desktop project.
@@ -85,13 +84,16 @@ resources relevant to the project.
 
 If you're looking for something to work on, check out the [help wanted](https://github.com/desktop/desktop/issues?q=is%3Aissue+is%3Aopen+label%3A%22help%20wanted%22) label.
 
+## Building Desktop
+
+To setup your development environment for building Desktop, check out: [`setup.md`](./docs/contributing/setup.md).
+
 ## More Resources
 
 See [desktop.github.com](https://desktop.github.com) for more product-oriented
 information about GitHub Desktop.
 
-
-See our [getting started documentation](https://docs.github.com/en/desktop/installing-and-configuring-github-desktop/overview/getting-started-with-github-desktop) for more information on how to set up, authenticate, and configure GitHub Desktop.
+See our [getting started documentation](https://docs.github.com/en/desktop/overview/getting-started-with-github-desktop) for more information on how to set up, authenticate, and configure GitHub Desktop.
 
 ## License
 
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 00000000000..d9ca9342c30
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,11 @@
+GitHub takes the security of our software products and services seriously, including the open source code repositories managed through our GitHub organizations, such as [GitHub](https://github.com/GitHub).
+
+If you believe you have found a security vulnerability in this GitHub-owned open source repository, you can report it to us in one of two ways.
+
+If the vulnerability you have found is *not* [in scope for the GitHub Bug Bounty Program](https://bounty.github.com/#scope) or if you do not wish to be considered for a bounty reward, please report the issue to us directly using [private vulnerability reporting](https://docs.github.com/en/code-security/security-advisories/guidance-on-reporting-and-writing/privately-reporting-a-security-vulnerability).
+
+If the vulnerability you have found is [in scope for the GitHub Bug Bounty Program](https://bounty.github.com/#scope) and you would like for your finding to be considered for a bounty reward, please submit the vulnerability to us through [HackerOne](https://hackerone.com/github) in order to be eligible to receive a bounty award.
+
+**Please do not report security vulnerabilities through public GitHub issues, discussions, or pull requests.**
+
+Thanks for helping make GitHub safe for everyone.
diff --git a/app/.npmrc b/app/.npmrc
index 504b4d19bae..94caaa92c37 100644
--- a/app/.npmrc
+++ b/app/.npmrc
@@ -1,3 +1,3 @@
 runtime = electron
 disturl = https://electronjs.org/headers
-target = 17.0.1
+target = 32.1.2
diff --git a/app/app-info.ts b/app/app-info.ts
index 8c8fd1acbb3..b1317a989da 100644
--- a/app/app-info.ts
+++ b/app/app-info.ts
@@ -1,27 +1,12 @@
-import * as fs from 'fs'
-import * as Path from 'path'
-
 import { getSHA } from './git-info'
 import { getUpdatesURL, getChannel } from '../script/dist-info'
 import { version, productName } from './package.json'
 
-const projectRoot = Path.dirname(__dirname)
-
 const devClientId = '3a723b10ac5575cc5bb9'
 const devClientSecret = '22c34d87789a365981ed921352a7b9a8c3f69d54'
 
 const channel = getChannel()
 
-export function getCLICommands() {
-  return (
-    // eslint-disable-next-line no-sync
-    fs
-      .readdirSync(Path.resolve(projectRoot, 'app', 'src', 'cli', 'commands'))
-      .filter(name => name.endsWith('.ts'))
-      .map(name => name.replace(/\.ts$/, ''))
-  )
-}
-
 const s = JSON.stringify
 
 export function getReplacements() {
@@ -41,7 +26,6 @@ export function getReplacements() {
     __RELEASE_CHANNEL__: s(channel),
     __UPDATES_URL__: s(getUpdatesURL()),
     __SHA__: s(getSHA()),
-    __CLI_COMMANDS__: s(getCLICommands()),
     'process.platform': s(process.platform),
     'process.env.NODE_ENV': s(process.env.NODE_ENV || 'development'),
     'process.env.TEST_ENV': s(process.env.TEST_ENV),
diff --git a/app/jest.unit.config.js b/app/jest.unit.config.js
index 13d8d2482d0..f7d69ec2c99 100644
--- a/app/jest.unit.config.js
+++ b/app/jest.unit.config.js
@@ -2,8 +2,9 @@ module.exports = {
   roots: ['<rootDir>/src/', '<rootDir>/test/'],
   transform: {
     '^.+\\.tsx?$': 'ts-jest',
-    '\\.m?jsx?$': 'jest-esm-transformer',
+    '\\.m?jsx?$': '<rootDir>/test/esm-transformer.js',
   },
+  resolver: `<rootDir>/test/resolver.js`,
   testMatch: ['**/unit/**/*-test.ts{,x}'],
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
   setupFiles: ['<rootDir>/test/globals.ts', '<rootDir>/test/unit-test-env.ts'],
@@ -11,4 +12,5 @@ module.exports = {
   reporters: ['default', '<rootDir>../script/jest-actions-reporter.js'],
   // For now, @github Node modules required to be transformed by jest-esm-transformer
   transformIgnorePatterns: ['node_modules/(?!(@github))'],
+  testEnvironment: 'jsdom',
 }
diff --git a/app/package.json b/app/package.json
index 49f48512832..633c58374fb 100644
--- a/app/package.json
+++ b/app/package.json
@@ -3,7 +3,7 @@
   "productName": "GitHub Desktop",
   "bundleID": "com.github.GitHubClient",
   "companyName": "GitHub, Inc.",
-  "version": "3.0.2",
+  "version": "3.4.13-beta1",
   "main": "./main.js",
   "repository": {
     "type": "git",
@@ -17,55 +17,61 @@
   },
   "license": "MIT",
   "dependencies": {
+    "@floating-ui/react-dom": "^2.0.0",
     "@github/alive-client": "^0.0.2",
     "app-path": "^3.3.0",
     "byline": "^5.0.0",
     "chalk": "^2.3.0",
     "classnames": "^2.2.5",
-    "codemirror": "^5.60.0",
+    "codemirror": "^5.65.17",
     "codemirror-mode-elixir": "^1.1.2",
+    "codemirror-mode-luau": "^1.0.2",
+    "codemirror-mode-zig": "^1.0.7",
     "compare-versions": "^3.6.0",
     "deep-equal": "^1.0.1",
-    "desktop-notifications": "^0.2.2",
-    "desktop-trampoline": "desktop/desktop-trampoline#v0.9.8",
+    "desktop-notifications": "^0.2.4",
+    "desktop-trampoline": "desktop/desktop-trampoline#v0.9.10",
     "dexie": "^3.2.2",
-    "dompurify": "^2.3.3",
-    "dugite": "^1.109.0",
+    "dompurify": "^2.5.4",
+    "dugite": "3.0.0-rc5",
     "electron-window-state": "^5.0.3",
     "event-kit": "^2.0.0",
     "focus-trap-react": "^8.1.0",
     "fs-admin": "^0.19.0",
     "fuzzaldrin-plus": "^0.6.0",
     "keytar": "^7.8.0",
+    "lodash": "^4.17.21",
     "marked": "^4.0.10",
     "mem": "^4.3.0",
     "memoize-one": "^4.0.3",
+    "minimist": "^1.2.8",
     "mri": "^1.1.0",
     "p-limit": "^2.2.0",
+    "p-memoize": "^7.1.1",
     "primer-support": "^4.0.0",
     "prop-types": "^15.7.2",
     "quick-lru": "^3.0.0",
+    "re2js": "^0.3.0",
     "react": "^16.8.4",
-    "react-color": "^2.19.3",
+    "react-confetti": "^6.1.0",
     "react-css-transition-replace": "^3.0.3",
     "react-dom": "^16.8.4",
     "react-transition-group": "^4.4.1",
     "react-virtualized": "^9.20.0",
-    "registry-js": "^1.15.0",
+    "registry-js": "^1.16.0",
     "source-map-support": "^0.4.15",
+    "split2": "^4.2.0",
+    "string-argv": "^0.3.2",
     "strip-ansi": "^4.0.0",
     "textarea-caret": "^3.0.2",
     "triple-beam": "^1.3.0",
     "tslib": "^2.0.0",
     "untildify": "^3.0.2",
-    "username": "^5.1.0",
     "uuid": "^3.0.1",
-    "wicg-focus-ring": "^1.0.1",
+    "windows-argv-parser": "file:../vendor/windows-argv-parser",
     "winston": "^3.6.0"
   },
   "devDependencies": {
-    "devtron": "^1.4.0",
-    "electron-debug": "^3.1.0",
     "electron-devtools-installer": "^3.2.0",
     "temp": "^0.8.3",
     "webpack-hot-middleware": "^2.10.0"
diff --git a/app/src/cli/commands/clone.ts b/app/src/cli/commands/clone.ts
deleted file mode 100644
index 012c0531b77..00000000000
--- a/app/src/cli/commands/clone.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import * as QueryString from 'querystring'
-import { URL } from 'url'
-
-import { CommandError } from '../util'
-import { openDesktop } from '../open-desktop'
-import { ICommandModule, mriArgv } from '../load-commands'
-
-interface ICloneArgs extends mriArgv {
-  readonly branch?: string
-}
-
-export const command: ICommandModule = {
-  command: 'clone <url|slug>',
-  description: 'Clone a repository',
-  args: [
-    {
-      name: 'url|slug',
-      required: true,
-      description: 'The URL or the GitHub owner/name alias to clone',
-      type: 'string',
-    },
-  ],
-  options: {
-    branch: {
-      type: 'string',
-      aliases: ['b'],
-      description: 'The branch to checkout after cloning',
-    },
-  },
-  handler({ _: [cloneUrl], branch }: ICloneArgs) {
-    if (!cloneUrl) {
-      throw new CommandError('Clone URL must be specified')
-    }
-    try {
-      const _ = new URL(cloneUrl)
-      _.toString() // don’t mark as unused
-    } catch (e) {
-      // invalid URL, assume a GitHub repo
-      cloneUrl = `https://github.com/${cloneUrl}`
-    }
-    const url = `openRepo/${cloneUrl}?${QueryString.stringify({
-      branch,
-    })}`
-    openDesktop(url)
-  },
-}
diff --git a/app/src/cli/commands/help.ts b/app/src/cli/commands/help.ts
deleted file mode 100644
index 5396000901b..00000000000
--- a/app/src/cli/commands/help.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import chalk from 'chalk'
-
-import { commands, ICommandModule, IOption } from '../load-commands'
-
-import { dasherizeOption, printTable } from '../util'
-
-export const command: ICommandModule = {
-  command: 'help [command]',
-  description: 'Show the help page for a command',
-  handler({ _: [command] }) {
-    if (command) {
-      printCommandHelp(command, commands[command])
-    } else {
-      printHelp()
-    }
-  },
-}
-
-function printHelp() {
-  console.log(chalk.underline('Commands:'))
-  const table: string[][] = []
-  for (const commandName of Object.keys(commands)) {
-    const command = commands[commandName]
-    table.push([chalk.bold(command.command), command.description])
-  }
-  printTable(table)
-  console.log(
-    `\nRun ${chalk.bold(
-      `github help ${chalk.gray('<command>')}`
-    )} for details about each command`
-  )
-}
-
-function printCommandHelp(name: string, command: ICommandModule) {
-  if (!command) {
-    console.log(`Unrecognized command: ${chalk.bold.red.underline(name)}`)
-    printHelp()
-    return
-  }
-  console.log(`${chalk.gray('github')} ${command.command}`)
-  if (command.aliases) {
-    for (const alias of command.aliases) {
-      console.log(chalk.gray(`github ${alias}`))
-    }
-  }
-  console.log()
-  const [title, body] = command.description.split('\n', 1)
-  console.log(chalk.bold(title))
-  if (body) {
-    console.log(body)
-  }
-  const { options, args } = command
-  if (options) {
-    console.log(chalk.underline('\nOptions:'))
-    printTable(
-      Object.keys(options)
-        .map(k => [k, options[k]] as [string, IOption])
-        .map(([optionName, option]) => [
-          [optionName, ...(option.aliases || [])]
-            .map(dasherizeOption)
-            .map(x => chalk.bold.blue(x))
-            .join(chalk.gray(', ')),
-          option.description,
-          chalk.gray(`[${chalk.underline(option.type)}]`),
-        ])
-    )
-  }
-  if (args && args.length) {
-    console.log(chalk.underline('\nArguments:'))
-    printTable(
-      args.map(arg => [
-        (arg.required ? chalk.bold : chalk).blue(arg.name),
-        arg.required ? chalk.gray('(required)') : '',
-        arg.description,
-        chalk.gray(`[${chalk.underline(arg.type)}]`),
-      ])
-    )
-  }
-}
diff --git a/app/src/cli/commands/open.ts b/app/src/cli/commands/open.ts
deleted file mode 100644
index b5c58d19f68..00000000000
--- a/app/src/cli/commands/open.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import chalk from 'chalk'
-import * as Path from 'path'
-
-import { ICommandModule, mriArgv } from '../load-commands'
-import { openDesktop } from '../open-desktop'
-import { parseRemote } from '../../lib/remote-parsing'
-
-export const command: ICommandModule = {
-  command: 'open <path>',
-  aliases: ['<path>'],
-  description: 'Open a git repository in GitHub Desktop',
-  args: [
-    {
-      name: 'path',
-      description: 'The path to the repository to open',
-      type: 'string',
-      required: false,
-    },
-  ],
-  handler({ _: [pathArg] }: mriArgv) {
-    if (!pathArg) {
-      // just open Desktop
-      openDesktop()
-      return
-    }
-    //Check if the pathArg is a remote url
-    if (parseRemote(pathArg) != null) {
-      console.log(
-        `\nYou cannot open a remote URL in GitHub Desktop\n` +
-          `Use \`${chalk.bold(`git clone ` + pathArg)}\`` +
-          ` instead to initiate the clone`
-      )
-    } else {
-      const repositoryPath = Path.resolve(process.cwd(), pathArg)
-      const url = `openLocalRepo/${encodeURIComponent(repositoryPath)}`
-      openDesktop(url)
-    }
-  },
-}
diff --git a/app/src/cli/dev-commands-global.ts b/app/src/cli/dev-commands-global.ts
deleted file mode 100644
index 2199e5e0c45..00000000000
--- a/app/src/cli/dev-commands-global.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { getCLICommands } from '../../../app/app-info'
-
-const g: any = global
-g.__CLI_COMMANDS__ = getCLICommands()
diff --git a/app/src/cli/load-commands.ts b/app/src/cli/load-commands.ts
deleted file mode 100644
index f988ef4d17e..00000000000
--- a/app/src/cli/load-commands.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { Argv as mriArgv } from 'mri'
-
-import { TypeName } from './util'
-
-type StringArray = ReadonlyArray<string>
-
-export type CommandHandler = (args: mriArgv, argv: StringArray) => void
-export { mriArgv }
-
-export interface IOption {
-  readonly type: TypeName
-  readonly aliases?: StringArray
-  readonly description: string
-  readonly default?: any
-}
-
-interface IArgument {
-  readonly name: string
-  readonly required: boolean
-  readonly description: string
-  readonly type: TypeName
-}
-
-export interface ICommandModule {
-  name?: string
-  readonly command: string
-  readonly description: string
-  readonly handler: CommandHandler
-  readonly aliases?: StringArray
-  readonly options?: { [flag: string]: IOption }
-  readonly args?: ReadonlyArray<IArgument>
-  readonly unknownOptionHandler?: (flag: string) => void
-}
-
-function loadModule(name: string): ICommandModule {
-  return require(`./commands/${name}.ts`).command
-}
-
-interface ICommands {
-  [command: string]: ICommandModule
-}
-export const commands: ICommands = {}
-
-for (const fileName of __CLI_COMMANDS__) {
-  const mod = loadModule(fileName)
-  if (!mod.name) {
-    mod.name = fileName
-  }
-  commands[mod.name] = mod
-}
diff --git a/app/src/cli/main.ts b/app/src/cli/main.ts
index c9525da9b0c..48ecd76622d 100644
--- a/app/src/cli/main.ts
+++ b/app/src/cli/main.ts
@@ -1,107 +1,65 @@
-import mri, {
-  DictionaryObject,
-  Options as MriOptions,
-  ArrayOrString,
-} from 'mri'
-import chalk from 'chalk'
+import { join, resolve } from 'path'
+import parse from 'minimist'
+import { execFile, ExecFileException } from 'child_process'
 
-import { dasherizeOption, CommandError } from './util'
-import { commands } from './load-commands'
-const defaultCommand = 'open'
-
-let args = process.argv.slice(2)
-if (!args[0]) {
-  args[0] = '.'
-}
-const commandArg = args[0]
-args = args.slice(1)
-
-const supportsCommand = (name: string) => Object.hasOwn(commands, name)
-
-;(function attemptRun(name: string) {
-  try {
-    if (supportsCommand(name)) {
-      runCommand(name)
-    } else if (name.startsWith('--')) {
-      attemptRun(name.slice(2))
-    } else {
-      try {
-        args.unshift(commandArg)
-        runCommand(defaultCommand)
-      } catch (err) {
-        logError(err)
-        args = []
-        runCommand('help')
-      }
+const run = (...args: Array<string>) => {
+  function cb(e: ExecFileException | null, stderr: string) {
+    if (e) {
+      console.error(`Error running command ${args}`)
+      console.error(stderr)
+      process.exit(e.code)
     }
-  } catch (err) {
-    logError(err)
-    args = [name]
-    runCommand('help')
   }
-})(commandArg)
 
-function logError(err: CommandError) {
-  console.log(chalk.bgBlack.red('ERR!'), err.message)
-  if (err.stack && !err.pretty) {
-    console.log(chalk.gray(err.stack))
+  if (process.platform === 'darwin') {
+    execFile('open', ['-n', join(__dirname, '../../..'), '--args', ...args], cb)
+  } else if (process.platform === 'win32') {
+    const exeName = `GitHubDesktop${__DEV__ ? '-dev' : ''}.exe`
+    execFile(join(__dirname, `../../${exeName}`), args, cb)
+  } else {
+    throw new Error('Unsupported platform')
   }
 }
 
-console.log() // nice blank line before the command prompt
+const args = parse(process.argv.slice(2), {
+  alias: { help: 'h', branch: 'b' },
+  boolean: ['help'],
+})
 
-interface IMRIOpts extends MriOptions {
-  alias: DictionaryObject<ArrayOrString>
-  boolean: Array<string>
-  default: DictionaryObject
-  string: Array<string>
+const usage = (exitCode = 1): never => {
+  process.stderr.write(
+    'GitHub Desktop CLI usage: \n' +
+      '  github                            Open the current directory\n' +
+      '  github open [path]                Open the provided path\n' +
+      '  github clone [-b branch] <url>    Clone the repository by url or name/owner\n' +
+      '                                    (ex torvalds/linux), optionally checking out\n' +
+      '                                    the branch\n'
+  )
+  process.exit(exitCode)
 }
 
-function runCommand(name: string) {
-  const command = commands[name]
-  const opts: IMRIOpts = {
-    alias: {},
-    boolean: [],
-    default: {},
-    string: [],
-  }
-  if (command.options) {
-    for (const flag of Object.keys(command.options)) {
-      const flagOptions = command.options[flag]
-      if (flagOptions.aliases) {
-        opts.alias[flag] = flagOptions.aliases
-      }
-      if (Object.hasOwn(flagOptions, 'default')) {
-        opts.default[flag] = flagOptions.default
-      }
-      switch (flagOptions.type) {
-        case 'string':
-          opts.string.push(flag)
-          break
-        case 'boolean':
-          opts.boolean.push(flag)
-          break
-      }
-    }
-    opts.unknown = command.unknownOptionHandler
-  }
-  const parsedArgs = mri(args, opts)
-  if (command.options) {
-    for (const flag of Object.keys(parsedArgs)) {
-      if (!(flag in command.options)) {
-        continue
-      }
+delete process.env.ELECTRON_RUN_AS_NODE
 
-      const value = parsedArgs[flag]
-      const expectedType = command.options[flag].type
-      if (typeof value !== expectedType) {
-        throw new CommandError(
-          `Value passed to flag ${dasherizeOption(
-            flag
-          )} was of type ${typeof value}, but was expected to be of type ${expectedType}`
-        )
-      }
-    }
+if (args.help || args._.at(0) === 'help') {
+  usage(0)
+} else if (args._.at(0) === 'clone') {
+  const urlArg = args._.at(1)
+  // Assume name with owner slug if it looks like it
+  const url =
+    urlArg && /^[^\/]+\/[^\/]+$/.test(urlArg)
+      ? `https://github.com/${urlArg}`
+      : urlArg
+
+  if (!url) {
+    usage(1)
+  } else if (typeof args.branch === 'string') {
+    run(`--cli-clone=${url}`, `--cli-branch=${args.branch}`)
+  } else {
+    run(`--cli-clone=${url}`)
   }
-  command.handler(parsedArgs, args)
+} else {
+  const [firstArg, secondArg] = args._
+  const pathArg = firstArg === 'open' ? secondArg : firstArg
+  const path = resolve(pathArg ?? '.')
+  run(`--cli-open=${path}`)
 }
diff --git a/app/src/cli/open-desktop.ts b/app/src/cli/open-desktop.ts
deleted file mode 100644
index e81b97a94b7..00000000000
--- a/app/src/cli/open-desktop.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import * as ChildProcess from 'child_process'
-
-export function openDesktop(url: string = '') {
-  const env = { ...process.env }
-  // NB: We're gonna launch Desktop and we definitely don't want to carry over
-  // `ELECTRON_RUN_AS_NODE`. This seems to only happen on Windows.
-  delete env['ELECTRON_RUN_AS_NODE']
-
-  url = 'x-github-client://' + url
-
-  if (__DARWIN__) {
-    return ChildProcess.spawn('open', [url], { env })
-  } else if (__WIN32__) {
-    // https://github.com/nodejs/node/blob/b39dabefe6d/lib/child_process.js#L565-L577
-    const shell = process.env.comspec || 'cmd.exe'
-    return ChildProcess.spawn(shell, ['/d', '/c', 'start', url], { env })
-  } else {
-    throw new Error(
-      `Desktop command line interface not currently supported on platform ${process.platform}`
-    )
-  }
-}
diff --git a/app/src/cli/util.ts b/app/src/cli/util.ts
deleted file mode 100644
index 5bfabe4289d..00000000000
--- a/app/src/cli/util.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import stripAnsi from 'strip-ansi'
-
-export type TypeName =
-  | 'string'
-  | 'number'
-  | 'boolean'
-  | 'symbol'
-  | 'undefined'
-  | 'object'
-  | 'function'
-
-export class CommandError extends Error {
-  public pretty = true
-}
-
-export const dasherizeOption = (option: string) => {
-  if (option.length === 1) {
-    return '-' + option
-  } else {
-    return '--' + option
-  }
-}
-
-export function printTable(table: string[][]) {
-  const columnWidths = calculateColumnWidths(table)
-  for (const row of table) {
-    let rowStr = '  '
-    row.forEach((item, i) => {
-      rowStr += item
-      const neededSpaces = columnWidths[i] - stripAnsi(item).length
-      rowStr += ' '.repeat(neededSpaces + 2)
-    })
-    console.log(rowStr)
-  }
-}
-
-function calculateColumnWidths(table: string[][]) {
-  const columnWidths: number[] = Array(table[0].length).fill(0)
-  for (const row of table) {
-    row.forEach((item, i) => {
-      const width = stripAnsi(item).length
-      if (columnWidths[i] < width) {
-        columnWidths[i] = width
-      }
-    })
-  }
-  return columnWidths
-}
diff --git a/app/src/crash/crash-app.tsx b/app/src/crash/crash-app.tsx
index a52636f228e..4f1e4a30333 100644
--- a/app/src/crash/crash-app.tsx
+++ b/app/src/crash/crash-app.tsx
@@ -4,7 +4,7 @@ import { TitleBar } from '../ui/window/title-bar'
 import { encodePathAsUrl } from '../lib/path'
 import { WindowState } from '../lib/window-state'
 import { Octicon } from '../ui/octicons'
-import * as OcticonSymbol from '../ui/octicons/octicons.generated'
+import * as octicons from '../ui/octicons/octicons.generated'
 import { Button } from '../ui/lib/button'
 import { LinkButton } from '../ui/lib/link-button'
 import { getVersion } from '../ui/lib/app-proxy'
@@ -141,7 +141,7 @@ export class CrashApp extends React.Component<ICrashAppProps, ICrashAppState> {
 
     return (
       <header>
-        <Octicon symbol={OcticonSymbol.stop} className="error-icon" />
+        <Octicon symbol={octicons.stop} className="error-icon" />
         <h1>{message}</h1>
       </header>
     )
@@ -201,7 +201,9 @@ export class CrashApp extends React.Component<ICrashAppProps, ICrashAppState> {
   }
 
   private renderBackgroundGraphics() {
-    return <img className="background-graphic-bottom" src={BottomImageUri} />
+    return (
+      <img className="background-graphic-bottom" alt="" src={BottomImageUri} />
+    )
   }
 
   public render() {
diff --git a/app/src/highlighter/index.ts b/app/src/highlighter/index.ts
index 63885be640a..72b75de21ef 100644
--- a/app/src/highlighter/index.ts
+++ b/app/src/highlighter/index.ts
@@ -104,6 +104,7 @@ const extensionModes: ReadonlyArray<IModeDefinition> = [
     mappings: {
       '.markdown': 'text/x-markdown',
       '.md': 'text/x-markdown',
+      '.mdx': 'text/x-markdown',
     },
   },
   {
@@ -118,6 +119,7 @@ const extensionModes: ReadonlyArray<IModeDefinition> = [
     mappings: {
       '.xml': 'text/xml',
       '.xaml': 'text/xml',
+      '.xsd': 'text/xml',
       '.csproj': 'text/xml',
       '.fsproj': 'text/xml',
       '.vcxproj': 'text/xml',
@@ -148,6 +150,11 @@ const extensionModes: ReadonlyArray<IModeDefinition> = [
       '.h': 'text/x-c',
       '.cpp': 'text/x-c++src',
       '.hpp': 'text/x-c++src',
+      '.cc': 'text/x-c++src',
+      '.hh': 'text/x-c++src',
+      '.hxx': 'text/x-c++src',
+      '.cxx': 'text/x-c++src',
+      '.ino': 'text/x-c++src',
       '.kt': 'text/x-kotlin',
     },
   },
@@ -206,6 +213,8 @@ const extensionModes: ReadonlyArray<IModeDefinition> = [
     install: () => import('codemirror/mode/python/python'),
     mappings: {
       '.py': 'text/x-python',
+      '.pyi': 'text/x-python',
+      '.vpy': 'text/x-python',
     },
   },
   {
@@ -268,9 +277,10 @@ const extensionModes: ReadonlyArray<IModeDefinition> = [
     },
   },
   {
-    install: () => import('codemirror/mode/lua/lua'),
+    install: () => import('codemirror-mode-luau'),
     mappings: {
       '.lua': 'text/x-lua',
+      '.luau': 'text/x-luau',
     },
   },
   {
@@ -423,6 +433,18 @@ const extensionModes: ReadonlyArray<IModeDefinition> = [
       '.dart': 'application/dart',
     },
   },
+  {
+    install: () => import('codemirror-mode-zig'),
+    mappings: {
+      '.zig': 'text/x-zig',
+    },
+  },
+  {
+    install: () => import('codemirror/mode/cmake/cmake'),
+    mappings: {
+      '.cmake': 'text/x-cmake',
+    },
+  },
 ]
 
 /**
@@ -443,6 +465,12 @@ const basenameModes: ReadonlyArray<IModeDefinition> = [
       dockerfile: 'text/x-dockerfile',
     },
   },
+  {
+    install: () => import('codemirror/mode/toml/toml'),
+    mappings: {
+      'cargo.lock': 'text/x-toml',
+    },
+  },
 ]
 
 /**
@@ -586,8 +614,8 @@ function readToken(
   throw new Error(`Mode ${getModeName(mode)} failed to advance stream.`)
 }
 
-onmessage = async (ev: MessageEvent) => {
-  const request = ev.data as IHighlightRequest
+onmessage = async (ev: MessageEvent<IHighlightRequest>) => {
+  const request = ev.data
 
   const tabSize = request.tabSize || 4
   const addModeClass = request.addModeClass === true
diff --git a/app/src/lib/2fa.ts b/app/src/lib/2fa.ts
deleted file mode 100644
index 4e289590e66..00000000000
--- a/app/src/lib/2fa.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-const authenticatorAppWelcomeText =
-  'Open the two-factor authentication app on your device to view your authentication code and verify your identity.'
-const smsMessageWelcomeText =
-  'We just sent you a message via SMS with your authentication code. Enter the code in the form below to verify your identity.'
-
-/**
- * When authentication is requested via 2FA, the endpoint provides
- * a hint in the response header as to where the user should look
- * to retrieve the token.
- */
-export enum AuthenticationMode {
-  /*
-   * User should authenticate via a received text message.
-   */
-  Sms,
-  /*
-   * User should open TOTP mobile application and obtain code.
-   */
-  App,
-}
-
-export function getWelcomeMessage(type: AuthenticationMode): string {
-  return type === AuthenticationMode.Sms
-    ? smsMessageWelcomeText
-    : authenticatorAppWelcomeText
-}
diff --git a/app/src/lib/api.ts b/app/src/lib/api.ts
index a965ae1a936..d6f38944169 100644
--- a/app/src/lib/api.ts
+++ b/app/src/lib/api.ts
@@ -1,4 +1,3 @@
-import * as OS from 'os'
 import * as URL from 'url'
 import { Account } from '../models/account'
 
@@ -8,14 +7,20 @@ import {
   HTTPMethod,
   APIError,
   urlWithQueryString,
+  getUserAgent,
 } from './http'
-import { AuthenticationMode } from './2fa'
 import { uuid } from './uuid'
-import username from 'username'
 import { GitProtocol } from './remote-parsing'
-import { Emitter } from 'event-kit'
-import JSZip from 'jszip'
-import { updateEndpointVersion } from './endpoint-capabilities'
+import {
+  getEndpointVersion,
+  isDotCom,
+  isGHE,
+  updateEndpointVersion,
+} from './endpoint-capabilities'
+import {
+  clearCertificateErrorSuppressionFor,
+  suppressCertificateErrorFor,
+} from './suppress-certificate-error'
 
 const envEndpoint = process.env['DESKTOP_GITHUB_DOTCOM_API_ENDPOINT']
 const envHTMLURL = process.env['DESKTOP_GITHUB_DOTCOM_HTML_URL']
@@ -26,6 +31,15 @@ if (envAdditionalCookies !== undefined) {
   document.cookie += '; ' + envAdditionalCookies
 }
 
+type AffiliationFilter =
+  | 'owner'
+  | 'collaborator'
+  | 'organization_member'
+  | 'owner,collabor'
+  | 'owner,organization_member'
+  | 'collaborator,organization_member'
+  | 'owner,collaborator,organization_member'
+
 /**
  * Optional set of configurable settings for the fetchAll method
  */
@@ -48,7 +62,15 @@ interface IFetchAllOptions<T> {
    *
    * @param results  All results retrieved thus far
    */
-  continue?: (results: ReadonlyArray<T>) => boolean
+  continue?: (results: ReadonlyArray<T>) => boolean | Promise<boolean>
+
+  /**
+   * An optional callback which is invoked after each page of results is loaded
+   * from the API. This can be used to enable streaming of results.
+   *
+   * @param page The last fetched page of results
+   */
+  onPage?: (page: ReadonlyArray<T>) => void
 
   /**
    * Calculate the next page path given the response.
@@ -89,9 +111,6 @@ enum HttpStatusCode {
   NotFound = 404,
 }
 
-/** The note URL used for authorizations the app creates. */
-const NoteURL = 'https://desktop.github.com/'
-
 /**
  * Information about a repository as returned by the GitHub API.
  */
@@ -224,6 +243,9 @@ interface IAPIFullIdentity {
    */
   readonly email: string | null
   readonly type: GitHubAccountType
+  readonly plan?: {
+    readonly name: string
+  }
 }
 
 /** The users we get from the mentionables endpoint. */
@@ -468,6 +490,100 @@ export interface IAPIBranch {
   readonly protected: boolean
 }
 
+/** Repository rule information returned by the GitHub API */
+export interface IAPIRepoRule {
+  /**
+   * The ID of the ruleset this rule is configured in.
+   */
+  readonly ruleset_id: number
+
+  /**
+   * The type of the rule.
+   */
+  readonly type: APIRepoRuleType
+
+  /**
+   * The parameters that apply to the rule if it is a metadata rule.
+   * Other rule types may have parameters, but they are not used in
+   * this app so they are ignored. Do not attempt to use this field
+   * unless you know {@link type} matches a metadata rule type.
+   */
+  readonly parameters?: IAPIRepoRuleMetadataParameters
+}
+
+/**
+ * A non-exhaustive list of rules that can be configured. Only the rule
+ * types used by this app are included.
+ */
+export enum APIRepoRuleType {
+  Creation = 'creation',
+  Update = 'update',
+  RequiredDeployments = 'required_deployments',
+  RequiredSignatures = 'required_signatures',
+  RequiredStatusChecks = 'required_status_checks',
+  PullRequest = 'pull_request',
+  CommitMessagePattern = 'commit_message_pattern',
+  CommitAuthorEmailPattern = 'commit_author_email_pattern',
+  CommitterEmailPattern = 'committer_email_pattern',
+  BranchNamePattern = 'branch_name_pattern',
+}
+
+/**
+ * A ruleset returned from the GitHub API's "get all rulesets for a repo" endpoint.
+ * This endpoint returns a slimmed-down version of the full ruleset object, though
+ * only the ID is used.
+ */
+export interface IAPISlimRepoRuleset {
+  readonly id: number
+}
+
+/**
+ * A ruleset returned from the GitHub API's "get a ruleset for a repo" endpoint.
+ */
+export interface IAPIRepoRuleset extends IAPISlimRepoRuleset {
+  /**
+   * Whether the user making the API request can bypass the ruleset.
+   */
+  readonly current_user_can_bypass: 'always' | 'pull_requests_only' | 'never'
+}
+
+/**
+ * Metadata parameters for a repo rule metadata rule.
+ */
+export interface IAPIRepoRuleMetadataParameters {
+  /**
+   * User-supplied name/description of the rule
+   */
+  name: string
+
+  /**
+   * Whether the operator is negated. For example, if `true`
+   * and {@link operator} is `starts_with`, then the rule
+   * will be negated to 'does not start with'.
+   */
+  negate: boolean
+
+  /**
+   * The pattern to match against. If the operator is 'regex', then
+   * this is a regex string match. Otherwise, it is a raw string match
+   * of the type specified by {@link operator} with no additional parsing.
+   */
+  pattern: string
+
+  /**
+   * The type of match to use for the pattern. For example, `starts_with`
+   * means {@link pattern} must be at the start of the string.
+   */
+  operator: APIRepoRuleMetadataOperator
+}
+
+export enum APIRepoRuleMetadataOperator {
+  StartsWith = 'starts_with',
+  EndsWith = 'ends_with',
+  Contains = 'contains',
+  RegexMatch = 'regex',
+}
+
 interface IAPIPullRequestRef {
   readonly ref: string
   readonly sha: string
@@ -508,13 +624,13 @@ export interface IAPIPullRequestReview {
     | 'CHANGES_REQUESTED'
 }
 
-/** The metadata about a GitHub server. */
-export interface IServerMetadata {
-  /**
-   * Does the server support password-based authentication? If not, the user
-   * must go through the OAuth flow to authenticate.
-   */
-  readonly verifiable_password_authentication: boolean
+/** Represents both issue comments and PR review comments */
+export interface IAPIComment {
+  readonly id: number
+  readonly body: string
+  readonly html_url: string
+  readonly user: IAPIIdentity
+  readonly created_at: string
 }
 
 /** The server response when handling the OAuth callback (with code) to obtain an access token */
@@ -524,11 +640,6 @@ interface IAPIAccessToken {
   readonly token_type: string
 }
 
-/** The partial server response when creating a new authorization on behalf of a user */
-interface IAPIAuthorization {
-  readonly token: string
-}
-
 /** The response we receive from fetching mentionables. */
 interface IAPIMentionablesResponse {
   readonly etag: string | undefined
@@ -665,20 +776,23 @@ interface IAPIAliveWebSocket {
   readonly url: string
 }
 
+type TokenInvalidatedCallback = (endpoint: string, token: string) => void
+
 /**
  * An object for making authenticated requests to the GitHub API
  */
 export class API {
-  private static readonly TOKEN_INVALIDATED_EVENT = 'token-invalidated'
+  private static readonly tokenInvalidatedListeners =
+    new Set<TokenInvalidatedCallback>()
 
-  private static readonly emitter = new Emitter()
-
-  public static onTokenInvalidated(callback: (endpoint: string) => void) {
-    API.emitter.on(API.TOKEN_INVALIDATED_EVENT, callback)
+  public static onTokenInvalidated(callback: TokenInvalidatedCallback) {
+    this.tokenInvalidatedListeners.add(callback)
   }
 
-  private static emitTokenInvalidated(endpoint: string) {
-    API.emitter.emit(API.TOKEN_INVALIDATED_EVENT, endpoint)
+  private static emitTokenInvalidated(endpoint: string, token: string) {
+    this.tokenInvalidatedListeners.forEach(callback =>
+      callback(endpoint, token)
+    )
   }
 
   /** Create a new API client from the given account. */
@@ -733,6 +847,79 @@ export class API {
     }
   }
 
+  /**
+   * Fetch an issue comment (i.e. a comment on an issue or pull request).
+   *
+   * @param owner The owner of the repository
+   * @param name The name of the repository
+   * @param commentId The ID of the comment
+   *
+   * @returns The comment if it was found, null if it wasn't, or an error
+   * occurred.
+   */
+  public async fetchIssueComment(
+    owner: string,
+    name: string,
+    commentId: string
+  ): Promise<IAPIComment | null> {
+    try {
+      const response = await this.request(
+        'GET',
+        `repos/${owner}/${name}/issues/comments/${commentId}`
+      )
+      if (response.status === HttpStatusCode.NotFound) {
+        log.warn(
+          `fetchIssueComment: '${owner}/${name}/issues/comments/${commentId}' returned a 404`
+        )
+        return null
+      }
+      return await parsedResponse<IAPIComment>(response)
+    } catch (e) {
+      log.warn(
+        `fetchIssueComment: an error occurred for '${owner}/${name}/issues/comments/${commentId}'`,
+        e
+      )
+      return null
+    }
+  }
+
+  /**
+   * Fetch a pull request review comment (i.e. a comment that was posted as part
+   * of a review of a pull request).
+   *
+   * @param owner The owner of the repository
+   * @param name The name of the repository
+   * @param commentId The ID of the comment
+   *
+   * @returns The comment if it was found, null if it wasn't, or an error
+   * occurred.
+   */
+  public async fetchPullRequestReviewComment(
+    owner: string,
+    name: string,
+    commentId: string
+  ): Promise<IAPIComment | null> {
+    try {
+      const response = await this.request(
+        'GET',
+        `repos/${owner}/${name}/pulls/comments/${commentId}`
+      )
+      if (response.status === HttpStatusCode.NotFound) {
+        log.warn(
+          `fetchPullRequestReviewComment: '${owner}/${name}/pulls/comments/${commentId}' returned a 404`
+        )
+        return null
+      }
+      return await parsedResponse<IAPIComment>(response)
+    } catch (e) {
+      log.warn(
+        `fetchPullRequestReviewComment: an error occurred for '${owner}/${name}/pulls/comments/${commentId}'`,
+        e
+      )
+      return null
+    }
+  }
+
   /** Fetch a repo by its owner and name. */
   public async fetchRepository(
     owner: string,
@@ -793,22 +980,39 @@ export class API {
     }
   }
 
-  /** Fetch all repos a user has access to. */
-  public async fetchRepositories(): Promise<ReadonlyArray<IAPIRepository> | null> {
+  /**
+   * Fetch all repos a user has access to in a streaming fashion. The callback
+   * will be called for each new page fetched from the API.
+   */
+  public async streamUserRepositories(
+    callback: (repos: ReadonlyArray<IAPIRepository>) => void,
+    affiliation?: AffiliationFilter,
+    options?: IFetchAllOptions<IAPIRepository>
+  ) {
     try {
-      const repositories = await this.fetchAll<IAPIRepository>('user/repos')
-      // "But wait, repositories can't have a null owner" you say.
-      // Ordinarily you'd be correct but turns out there's super
-      // rare circumstances where a user has been deleted but the
-      // repository hasn't. Such cases are usually addressed swiftly
-      // but in some cases like GitHub Enterprise instances
-      // they can linger for longer than we'd like so we'll make
-      // sure to exclude any such dangling repository, chances are
-      // they won't be cloneable anyway.
-      return repositories.filter(x => x.owner !== null)
+      const base = 'user/repos'
+      const path = affiliation ? `${base}?affiliation=${affiliation}` : base
+
+      await this.fetchAll<IAPIRepository>(path, {
+        ...options,
+        // "But wait, repositories can't have a null owner" you say.
+        // Ordinarily you'd be correct but turns out there's super
+        // rare circumstances where a user has been deleted but the
+        // repository hasn't. Such cases are usually addressed swiftly
+        // but in some cases like GitHub Enterprise instances
+        // they can linger for longer than we'd like so we'll make
+        // sure to exclude any such dangling repository, chances are
+        // they won't be cloneable anyway.
+        onPage: page => {
+          callback(page.filter(x => x.owner !== null))
+          options?.onPage?.(page)
+        },
+      })
     } catch (error) {
-      log.warn(`fetchRepositories: ${error}`)
-      return null
+      log.warn(
+        `streamUserRepositories: failed with endpoint ${this.endpoint}`,
+        error
+      )
     }
   }
 
@@ -1047,17 +1251,97 @@ export class API {
     }
   }
 
+  /** Fetches all reviews from a given pull request. */
+  public async fetchPullRequestReviews(
+    owner: string,
+    name: string,
+    prNumber: string
+  ) {
+    try {
+      const path = `/repos/${owner}/${name}/pulls/${prNumber}/reviews`
+      const response = await this.request('GET', path)
+      return await parsedResponse<IAPIPullRequestReview[]>(response)
+    } catch (e) {
+      log.debug(
+        `failed fetching PR reviews for ${owner}/${name}/pulls/${prNumber}`,
+        e
+      )
+      return []
+    }
+  }
+
+  /** Fetches all review comments from a given pull request. */
+  public async fetchPullRequestReviewComments(
+    owner: string,
+    name: string,
+    prNumber: string,
+    reviewId: string
+  ) {
+    try {
+      const path = `/repos/${owner}/${name}/pulls/${prNumber}/reviews/${reviewId}/comments`
+      const response = await this.request('GET', path)
+      return await parsedResponse<IAPIComment[]>(response)
+    } catch (e) {
+      log.debug(
+        `failed fetching PR review comments for ${owner}/${name}/pulls/${prNumber}`,
+        e
+      )
+      return []
+    }
+  }
+
+  /** Fetches all review comments from a given pull request. */
+  public async fetchPullRequestComments(
+    owner: string,
+    name: string,
+    prNumber: string
+  ) {
+    try {
+      const path = `/repos/${owner}/${name}/pulls/${prNumber}/comments`
+      const response = await this.request('GET', path)
+      return await parsedResponse<IAPIComment[]>(response)
+    } catch (e) {
+      log.debug(
+        `failed fetching PR comments for ${owner}/${name}/pulls/${prNumber}`,
+        e
+      )
+      return []
+    }
+  }
+
+  /** Fetches all comments from a given issue. */
+  public async fetchIssueComments(
+    owner: string,
+    name: string,
+    issueNumber: string
+  ) {
+    try {
+      const path = `/repos/${owner}/${name}/issues/${issueNumber}/comments`
+      const response = await this.request('GET', path)
+      return await parsedResponse<IAPIComment[]>(response)
+    } catch (e) {
+      log.debug(
+        `failed fetching issue comments for ${owner}/${name}/issues/${issueNumber}`,
+        e
+      )
+      return []
+    }
+  }
+
   /**
    * Get the combined status for the given ref.
    */
   public async fetchCombinedRefStatus(
     owner: string,
     name: string,
-    ref: string
+    ref: string,
+    reloadCache: boolean = false
   ): Promise<IAPIRefStatus | null> {
     const safeRef = encodeURIComponent(ref)
     const path = `repos/${owner}/${name}/commits/${safeRef}/status?per_page=100`
-    const response = await this.request('GET', path)
+    const response = await this.request('GET', path, {
+      reloadCache,
+    })
 
     try {
       return await parsedResponse<IAPIRefStatus>(response)
@@ -1076,7 +1360,8 @@ export class API {
   public async fetchRefCheckRuns(
     owner: string,
     name: string,
-    ref: string
+    ref: string,
+    reloadCache: boolean = false
   ): Promise<IAPIRefCheckRuns | null> {
     const safeRef = encodeURIComponent(ref)
     const path = `repos/${owner}/${name}/commits/${safeRef}/check-runs?per_page=100`
@@ -1084,7 +1369,10 @@ export class API {
       Accept: 'application/vnd.github.antiope-preview+json',
     }
 
-    const response = await this.request('GET', path, { customHeaders: headers })
+    const response = await this.request('GET', path, {
+      customHeaders: headers,
+      reloadCache,
+    })
 
     try {
       return await parsedResponse<IAPIRefCheckRuns>(response)
@@ -1185,31 +1473,6 @@ export class API {
     return null
   }
 
-  /**
-   * Get JSZip for a workflow run log archive.
-   *
-   * If it fails to retrieve or parse the zip file, it will return null.
-   */
-  public async fetchWorkflowRunJobLogs(logsUrl: string): Promise<JSZip | null> {
-    const customHeaders = {
-      Accept: 'application/vnd.github.antiope-preview+json',
-    }
-    const response = await this.request('GET', logsUrl, {
-      customHeaders,
-    })
-
-    try {
-      const zipBlob = await response.blob()
-      return new JSZip().loadAsync(zipBlob)
-    } catch (e) {
-      // Sometimes a workflow provides a log url, but still returns a 404
-      // because a log file doesn't make sense for the workflow. Thus, we just
-      // want to fail without raising an error.
-    }
-
-    return null
-  }
-
   /**
    * Triggers GitHub to rerequest an existing check suite, without pushing new
    * code to a repository.
@@ -1275,6 +1538,23 @@ export class API {
       })
   }
 
+  public async getAvatarToken() {
+    return this.request('GET', `/desktop/avatar-token`)
+      .then(x => x.json())
+      .then((x: unknown) =>
+        x &&
+        typeof x === 'object' &&
+        'avatar_token' in x &&
+        typeof x.avatar_token === 'string'
+          ? x.avatar_token
+          : null
+      )
+      .catch(err => {
+        log.debug(`Failed to load avatar token`, err)
+        return null
+      })
+  }
+
   /**
    * Gets a single check suite using its id
    */
@@ -1355,6 +1635,72 @@ export class API {
     }
   }
 
+  /**
+   * Fetches all repository rules that apply to the provided branch.
+   */
+  public async fetchRepoRulesForBranch(
+    owner: string,
+    name: string,
+    branch: string
+  ): Promise<ReadonlyArray<IAPIRepoRule>> {
+    const path = `repos/${owner}/${name}/rules/branches/${encodeURIComponent(
+      branch
+    )}`
+    try {
+      const response = await this.request('GET', path)
+      return await parsedResponse<IAPIRepoRule[]>(response)
+    } catch (err) {
+      log.info(
+        `[fetchRepoRulesForBranch] unable to fetch repo rules for branch: ${branch} | ${path}`,
+        err
+      )
+      return new Array<IAPIRepoRule>()
+    }
+  }
+
+  /**
+   * Fetches slim versions of all repo rulesets for the given repository. Utilize the cache
+   * in IAppState instead of querying this if possible.
+   */
+  public async fetchAllRepoRulesets(
+    owner: string,
+    name: string
+  ): Promise<ReadonlyArray<IAPISlimRepoRuleset> | null> {
+    const path = `repos/${owner}/${name}/rulesets`
+    try {
+      const response = await this.request('GET', path)
+      return await parsedResponse<ReadonlyArray<IAPISlimRepoRuleset>>(response)
+    } catch (err) {
+      log.info(
+        `[fetchAllRepoRulesets] unable to fetch all repo rulesets | ${path}`,
+        err
+      )
+      return null
+    }
+  }
+
+  /**
+   * Fetches the repo ruleset with the given ID. Utilize the cache in IAppState
+   * instead of querying this if possible.
+   */
+  public async fetchRepoRuleset(
+    owner: string,
+    name: string,
+    id: number
+  ): Promise<IAPIRepoRuleset | null> {
+    const path = `repos/${owner}/${name}/rulesets/${id}`
+    try {
+      const response = await this.request('GET', path)
+      return await parsedResponse<IAPIRepoRuleset>(response)
+    } catch (err) {
+      log.info(
+        `[fetchRepoRuleset] unable to fetch repo ruleset for ID: ${id} | ${path}`,
+        err
+      )
+      return null
+    }
+  }
+
   /**
    * Authenticated requests to a paginating resource such as issues.
    *
@@ -1368,6 +1714,7 @@ export class API {
     const params = { per_page: `${opts.perPage}` }
 
     let nextPath: string | null = urlWithQueryString(path, params)
+    let page: ReadonlyArray<T> = []
     do {
       const response: Response = await this.request('GET', nextPath)
       if (opts.suppressErrors !== false && !response.ok) {
@@ -1375,15 +1722,16 @@ export class API {
         return buf
       }
 
-      const items = await parsedResponse<ReadonlyArray<T>>(response)
-      if (items) {
-        buf.push(...items)
+      page = await parsedResponse<ReadonlyArray<T>>(response)
+      if (page) {
+        buf.push(...page)
+        opts.onPage?.(page)
       }
 
       nextPath = opts.getNextPagePath
         ? opts.getNextPagePath(response)
         : getNextPagePathFromLink(response)
-    } while (nextPath && (!opts.continue || opts.continue(buf)))
+    } while (nextPath && (!opts.continue || (await opts.continue(buf))))
 
     return buf
   }
@@ -1418,7 +1766,7 @@ export class API {
       response.headers.has('X-GitHub-Request-Id') &&
       !response.headers.has('X-GitHub-OTP')
     ) {
-      API.emitTokenInvalidated(this.endpoint)
+      API.emitTokenInvalidated(this.endpoint, this.token)
     }
 
     tryUpdateEndpointVersionFromResponse(this.endpoint, response)
@@ -1512,139 +1860,23 @@ export class API {
   }
 }
 
-export enum AuthorizationResponseKind {
-  Authorized,
-  Failed,
-  TwoFactorAuthenticationRequired,
-  UserRequiresVerification,
-  PersonalAccessTokenBlocked,
-  Error,
-  EnterpriseTooOld,
-  /**
-   * The API has indicated that the user is required to go through
-   * the web authentication flow.
-   */
-  WebFlowRequired,
-}
-
-export type AuthorizationResponse =
-  | { kind: AuthorizationResponseKind.Authorized; token: string }
-  | { kind: AuthorizationResponseKind.Failed; response: Response }
-  | {
-      kind: AuthorizationResponseKind.TwoFactorAuthenticationRequired
-      type: AuthenticationMode
-    }
-  | { kind: AuthorizationResponseKind.Error; response: Response }
-  | { kind: AuthorizationResponseKind.UserRequiresVerification }
-  | { kind: AuthorizationResponseKind.PersonalAccessTokenBlocked }
-  | { kind: AuthorizationResponseKind.EnterpriseTooOld }
-  | { kind: AuthorizationResponseKind.WebFlowRequired }
-
-/**
- * Create an authorization with the given login, password, and one-time
- * password.
- */
-export async function createAuthorization(
-  endpoint: string,
-  login: string,
-  password: string,
-  oneTimePassword: string | null
-): Promise<AuthorizationResponse> {
-  const creds = Buffer.from(`${login}:${password}`, 'utf8').toString('base64')
-  const authorization = `Basic ${creds}`
-  const optHeader = oneTimePassword ? { 'X-GitHub-OTP': oneTimePassword } : {}
-
-  const note = await getNote()
-
-  const response = await request(
-    endpoint,
-    null,
-    'POST',
-    'authorizations',
-    {
-      scopes: oauthScopes,
-      client_id: ClientID,
-      client_secret: ClientSecret,
-      note: note,
-      note_url: NoteURL,
-      fingerprint: uuid(),
-    },
-    {
-      Authorization: authorization,
-      ...optHeader,
-    }
-  )
-
-  tryUpdateEndpointVersionFromResponse(endpoint, response)
-
+export async function deleteToken(account: Account) {
   try {
-    const result = await parsedResponse<IAPIAuthorization>(response)
-    if (result) {
-      const token = result.token
-      if (token && typeof token === 'string' && token.length) {
-        return { kind: AuthorizationResponseKind.Authorized, token }
-      }
-    }
-  } catch (e) {
-    if (response.status === 401) {
-      const otpResponse = response.headers.get('x-github-otp')
-      if (otpResponse) {
-        const pieces = otpResponse.split(';')
-        if (pieces.length === 2) {
-          const type = pieces[1].trim()
-          switch (type) {
-            case 'app':
-              return {
-                kind: AuthorizationResponseKind.TwoFactorAuthenticationRequired,
-                type: AuthenticationMode.App,
-              }
-            case 'sms':
-              return {
-                kind: AuthorizationResponseKind.TwoFactorAuthenticationRequired,
-                type: AuthenticationMode.Sms,
-              }
-            default:
-              return { kind: AuthorizationResponseKind.Failed, response }
-          }
-        }
-      }
-
-      return { kind: AuthorizationResponseKind.Failed, response }
-    }
+    const creds = Buffer.from(`${ClientID}:${ClientSecret}`).toString('base64')
+    const response = await request(
+      account.endpoint,
+      null,
+      'DELETE',
+      `applications/${ClientID}/token`,
+      { access_token: account.token },
+      { Authorization: `Basic ${creds}` }
+    )
 
-    const apiError = e instanceof APIError && e.apiError
-    if (apiError) {
-      if (
-        response.status === 403 &&
-        apiError.message ===
-          'This API can only be accessed with username and password Basic Auth'
-      ) {
-        // Authorization API does not support providing personal access tokens
-        return { kind: AuthorizationResponseKind.PersonalAccessTokenBlocked }
-      } else if (response.status === 410) {
-        return { kind: AuthorizationResponseKind.WebFlowRequired }
-      } else if (response.status === 422) {
-        if (apiError.errors) {
-          for (const error of apiError.errors) {
-            const isExpectedResource =
-              error.resource.toLowerCase() === 'oauthaccess'
-            const isExpectedField = error.field.toLowerCase() === 'user'
-            if (isExpectedField && isExpectedResource) {
-              return {
-                kind: AuthorizationResponseKind.UserRequiresVerification,
-              }
-            }
-          }
-        } else if (
-          apiError.message === 'Invalid OAuth application client_id or secret.'
-        ) {
-          return { kind: AuthorizationResponseKind.EnterpriseTooOld }
-        }
-      }
-    }
+    return response.status === 204
+  } catch (e) {
+    log.error(`deleteToken: failed with endpoint ${account.endpoint}`, e)
+    return false
   }
-
-  return { kind: AuthorizationResponseKind.Error, response }
 }
 
 /** Fetch the user authenticated by the token. */
@@ -1664,7 +1896,8 @@ export async function fetchUser(
       emails,
       user.avatar_url,
       user.id,
-      user.name || user.login
+      user.name || user.login,
+      user.plan?.name
     )
   } catch (e) {
     log.warn(`fetchUser: failed with endpoint ${endpoint}`, e)
@@ -1672,49 +1905,6 @@ export async function fetchUser(
   }
 }
 
-/** Get metadata from the server. */
-export async function fetchMetadata(
-  endpoint: string
-): Promise<IServerMetadata | null> {
-  const url = `${endpoint}/meta`
-
-  try {
-    const response = await request(endpoint, null, 'GET', 'meta', undefined, {
-      'Content-Type': 'application/json',
-    })
-
-    tryUpdateEndpointVersionFromResponse(endpoint, response)
-
-    const result = await parsedResponse<IServerMetadata>(response)
-    if (!result || result.verifiable_password_authentication === undefined) {
-      return null
-    }
-
-    return result
-  } catch (e) {
-    log.error(
-      `fetchMetadata: unable to load metadata from '${url}' as a fallback`,
-      e
-    )
-    return null
-  }
-}
-
-/** The note used for created authorizations. */
-async function getNote(): Promise<string> {
-  let localUsername = await username()
-
-  if (localUsername === undefined) {
-    localUsername = 'unknown'
-
-    log.error(
-      `getNote: unable to resolve machine username, using '${localUsername}' as a fallback`
-    )
-  }
-
-  return `GitHub Desktop on ${localUsername}@${OS.hostname()}`
-}
-
 /**
  * Map a repository's URL to the endpoint associated with it. For example:
  *
@@ -1752,6 +1942,18 @@ export function getHTMLURL(endpoint: string): string {
   if (endpoint === getDotComAPIEndpoint() && !envEndpoint) {
     return 'https://github.com'
   } else {
+    if (isGHE(endpoint)) {
+      const url = new window.URL(endpoint)
+
+      url.pathname = '/'
+
+      if (url.hostname.startsWith('api.')) {
+        url.hostname = url.hostname.replace(/^api\./, '')
+      }
+
+      return url.toString()
+    }
+
     const parsed = URL.parse(endpoint)
     return `${parsed.protocol}//${parsed.hostname}`
   }
@@ -1763,6 +1965,15 @@ export function getHTMLURL(endpoint: string): string {
  * http://github.mycompany.com -> http://github.mycompany.com/api/v3
  */
 export function getEnterpriseAPIURL(endpoint: string): string {
+  if (isGHE(endpoint)) {
+    const url = new window.URL(endpoint)
+
+    url.pathname = '/'
+    url.hostname = `api.${url.hostname}`
+
+    return url.toString()
+  }
+
   const parsed = URL.parse(endpoint)
   return `${parsed.protocol}//${parsed.hostname}/api/v3`
 }
@@ -1794,8 +2005,7 @@ export function getOAuthAuthorizationURL(
   state: string
 ): string {
   const urlBase = getHTMLURL(endpoint)
-  const scopes = oauthScopes
-  const scope = encodeURIComponent(scopes.join(' '))
+  const scope = encodeURIComponent(oauthScopes.join(' '))
   return `${urlBase}/login/oauth/authorize?client_id=${ClientID}&scope=${scope}&state=${state}`
 }
 
@@ -1835,3 +2045,88 @@ function tryUpdateEndpointVersionFromResponse(
     updateEndpointVersion(endpoint, gheVersion)
   }
 }
+
+const knownThirdPartyHosts = new Set([
+  'dev.azure.com',
+  'gitlab.com',
+  'bitbucket.org',
+  'amazonaws.com',
+  'visualstudio.com',
+])
+
+const isKnownThirdPartyHost = (hostname: string) => {
+  if (knownThirdPartyHosts.has(hostname)) {
+    return true
+  }
+
+  for (const knownHost of knownThirdPartyHosts) {
+    if (hostname.endsWith(`.${knownHost}`)) {
+      return true
+    }
+  }
+
+  return false
+}
+
+/**
+ * Attempts to determine whether or not the url belongs to a GitHub host.
+ *
+ * This is a best-effort attempt and may return `undefined` if encountering
+ * an error making the discovery request
+ */
+export async function isGitHubHost(url: string) {
+  const { hostname } = new window.URL(url)
+
+  const endpoint =
+    hostname === 'github.com' || hostname === 'api.github.com'
+      ? getDotComAPIEndpoint()
+      : getEnterpriseAPIURL(url)
+
+  if (isDotCom(endpoint) || isGHE(endpoint)) {
+    return true
+  }
+
+  if (isKnownThirdPartyHost(hostname)) {
+    return false
+  }
+
+  // github.example.com,
+  if (/(^|\.)(github)\./.test(hostname)) {
+    return true
+  }
+
+  // bitbucket.example.com, etc
+  if (/(^|\.)(bitbucket|gitlab)\./.test(hostname)) {
+    return false
+  }
+
+  if (getEndpointVersion(endpoint) !== null) {
+    return true
+  }
+
+  // Add a unique identifier to the URL to make sure our certificate error
+  // supression only catches this request
+  const metaUrl = `${endpoint}/meta?ghd=${uuid()}`
+
+  const ac = new AbortController()
+  const timeoutId = setTimeout(() => ac.abort(), 2000)
+  suppressCertificateErrorFor(metaUrl)
+  try {
+    const response = await fetch(metaUrl, {
+      headers: { 'user-agent': getUserAgent() },
+      signal: ac.signal,
+      credentials: 'omit',
+      method: 'HEAD',
+    })
+
+    tryUpdateEndpointVersionFromResponse(endpoint, response)
+
+    return response.headers.has('x-github-request-id')
+  } catch (e) {
+    log.debug(`isGitHubHost: failed with endpoint ${endpoint}`, e)
+    return undefined
+  } finally {
+    clearTimeout(timeoutId)
+    clearCertificateErrorSuppressionFor(metaUrl)
+  }
+}
diff --git a/app/src/lib/app-state.ts b/app/src/lib/app-state.ts
index d02694c324c..e97835cb970 100644
--- a/app/src/lib/app-state.ts
+++ b/app/src/lib/app-state.ts
@@ -11,8 +11,11 @@ import { IMenu } from '../models/app-menu'
 import { IRemote } from '../models/remote'
 import { CloneRepositoryTab } from '../models/clone-repository-tab'
 import { BranchesTab } from '../models/branches-tab'
-import { PullRequest } from '../models/pull-request'
-import { IAuthor } from '../models/author'
+import {
+  PullRequest,
+  PullRequestSuggestedNextAction,
+} from '../models/pull-request'
+import { Author } from '../models/author'
 import { MergeTreeResult } from '../models/merge'
 import { ICommitMessage } from '../models/commit-message'
 import {
@@ -22,18 +25,13 @@ import {
   ICloneProgress,
   IMultiCommitOperationProgress,
 } from '../models/progress'
-import { Popup } from '../models/popup'
 
 import { SignInState } from './stores/sign-in-store'
 
 import { WindowState } from './window-state'
 import { Shell } from './shells'
 
-import {
-  ApplicableTheme,
-  ApplicationTheme,
-  ICustomTheme,
-} from '../ui/lib/application-theme'
+import { ApplicableTheme, ApplicationTheme } from '../ui/lib/application-theme'
 import { IAccountRepositories } from './stores/api-repositories-store'
 import { ManualConflictResolution } from '../models/manual-conflict-resolution'
 import { Banner } from '../models/banner'
@@ -47,6 +45,11 @@ import {
   MultiCommitOperationStep,
 } from '../models/multi-commit-operation'
 import { IChangesetData } from './git'
+import { Popup } from '../models/popup'
+import { RepoRulesInfo } from '../models/repo-rules'
+import { IAPIRepoRuleset } from './api'
+import { ICustomIntegration } from './custom-integration'
+import { Emoji } from './emoji'
 
 export enum SelectionType {
   Repository,
@@ -107,6 +110,16 @@ export interface IAppState {
    */
   readonly windowZoomFactor: number
 
+  /**
+   * Whether or not the currently active element is itself, or is contained
+   * within, a resizable component. This is used to determine whether or not
+   * to enable the Expand/Contract pane menu items. Note that this doesn't
+   * necessarily mean that keyboard resides within the resizable component since
+   * using the Windows in-app menu bar will steal focus from the currently
+   * active element (but return it once closed).
+   */
+  readonly resizablePaneActive: boolean
+
   /**
    * A value indicating whether or not the current application
    * window has focus.
@@ -116,6 +129,7 @@ export interface IAppState {
   readonly showWelcomeFlow: boolean
   readonly focusCommitMessage: boolean
   readonly currentPopup: Popup | null
+  readonly allPopups: ReadonlyArray<Popup>
   readonly currentFoldout: Foldout | null
   readonly currentBanner: Banner | null
 
@@ -145,10 +159,10 @@ export interface IAppState {
    */
   readonly appMenuState: ReadonlyArray<IMenu>
 
-  readonly errors: ReadonlyArray<Error>
+  readonly errorCount: number
 
   /** Map from the emoji shortcut (e.g., :+1:) to the image's local path. */
-  readonly emoji: Map<string, string>
+  readonly emoji: Map<string, Emoji>
 
   /**
    * The width of the repository sidebar.
@@ -170,6 +184,15 @@ export interface IAppState {
   /** The width of the files list in the stash view */
   readonly stashedFilesWidth: IConstrainedValue
 
+  /** The width of the files list in the pull request files changed view */
+  readonly pullRequestFilesListWidth: IConstrainedValue
+
+  /** The width of the resizable branch drop down button in the toolbar. */
+  readonly branchDropdownWidth: IConstrainedValue
+
+  /** The width of the resizable push/pull button in the toolbar. */
+  readonly pushPullButtonWidth: IConstrainedValue
+
   /**
    * Used to highlight access keys throughout the app when the
    * Alt key is pressed. Only applicable on non-macOS platforms.
@@ -185,6 +208,9 @@ export interface IAppState {
   /** Whether we should ask the user to move the app to /Applications */
   readonly askToMoveToApplicationsFolderSetting: boolean
 
+  /** Whether we should use an external credential helper for third-party private repositories */
+  readonly useExternalCredentialHelper: boolean
+
   /** Whether we should show a confirmation dialog */
   readonly askForConfirmationOnRepositoryRemoval: boolean
 
@@ -194,9 +220,21 @@ export interface IAppState {
   /** Whether we should show a confirmation dialog */
   readonly askForConfirmationOnDiscardChangesPermanently: boolean
 
+  /** Should the app prompt the user to confirm a discard stash */
+  readonly askForConfirmationOnDiscardStash: boolean
+
+  /** Should the app prompt the user to confirm a commit checkout? */
+  readonly askForConfirmationOnCheckoutCommit: boolean
+
   /** Should the app prompt the user to confirm a force push? */
   readonly askForConfirmationOnForcePush: boolean
 
+  /** Should the app prompt the user to confirm an undo commit? */
+  readonly askForConfirmationOnUndoCommit: boolean
+
+  /** Should the app prompt the user to confirm they want to commit with changes are hidden by filter? */
+  readonly askForConfirmationOnCommitFilteredChanges: boolean
+
   /** How the app should handle uncommitted changes when switching branches */
   readonly uncommittedChangesStrategy: UncommittedChangesStrategy
 
@@ -206,6 +244,9 @@ export interface IAppState {
   /** Whether or not the app should use Windows' OpenSSH client */
   readonly useWindowsOpenSSH: boolean
 
+  /** Whether or not the app should show the commit length warning */
+  readonly showCommitLengthWarning: boolean
+
   /** The current setting for whether the user has disable usage reports */
   readonly optOutOfUsageTracking: boolean
   /**
@@ -227,6 +268,9 @@ export interface IAppState {
   /** Whether we should hide white space changes in history diff */
   readonly hideWhitespaceInHistoryDiff: boolean
 
+  /** Whether we should hide white space changes in the pull request diff */
+  readonly hideWhitespaceInPullRequestDiff: boolean
+
   /** Whether we should show side by side diffs */
   readonly showSideBySideDiff: boolean
 
@@ -245,12 +289,12 @@ export interface IAppState {
   /** The selected appearance (aka theme) preference */
   readonly selectedTheme: ApplicationTheme
 
-  /** The custom theme  */
-  readonly customTheme?: ICustomTheme
-
   /** The currently applied appearance (aka theme) */
   readonly currentTheme: ApplicableTheme
 
+  /** The selected tab size preference */
+  readonly selectedTabSize: number
+
   /**
    * A map keyed on a user account (GitHub.com or GitHub Enterprise)
    * containing an object with repositories that the authenticated
@@ -290,6 +334,18 @@ export interface IAppState {
    */
   readonly lastThankYou: ILastThankYou | undefined
 
+  /** Whether or not the user wants to use a custom editor. */
+  readonly useCustomEditor: boolean
+
+  /** Info needed to launch a custom editor chosen by the user. */
+  readonly customEditor: ICustomIntegration | null
+
+  /** Whether or not the user wants to use a custom shell. */
+  readonly useCustomShell: boolean
+
+  /** Info needed to launch a custom shell chosen by the user. */
+  readonly customShell: ICustomIntegration | null
+
   /**
    * Whether or not the CI status popover is visible.
    */
@@ -299,6 +355,22 @@ export interface IAppState {
    * Whether or not the user enabled high-signal notifications.
    */
   readonly notificationsEnabled: boolean
+
+  /** The users last chosen pull request suggested next action. */
+  readonly pullRequestSuggestedNextAction:
+    | PullRequestSuggestedNextAction
+    | undefined
+
+  /** Whether or not the user will see check marks indicating a line is included in the check in the diff */
+  readonly showDiffCheckMarks: boolean
+
+  /**
+   * Cached repo rulesets. Used to prevent repeatedly querying the same
+   * rulesets to check their bypass status.
+   */
+  readonly cachedRepoRulesets: ReadonlyMap<number, IAPIRepoRuleset>
+
+  readonly underlineLinks: boolean
 }
 
 export enum FoldoutType {
@@ -306,6 +378,7 @@ export enum FoldoutType {
   Branch,
   AppMenu,
   AddMenu,
+  PushPull,
 }
 
 export type AppMenuFoldout = {
@@ -317,15 +390,6 @@ export type AppMenuFoldout = {
    * keyboard navigation by pressing access keys.
    */
   enableAccessKeyNavigation: boolean
-
-  /**
-   * Whether the menu was opened by pressing Alt (or Alt+X where X is an
-   * access key for one of the top level menu items). This is used as a
-   * one-time signal to the AppMenu to use some special semantics for
-   * selection and focus. Specifically it will ensure that the last opened
-   * menu will receive focus.
-   */
-  openedWithAccessKey?: boolean
 }
 
 export type BranchFoldout = {
@@ -337,6 +401,7 @@ export type Foldout =
   | { type: FoldoutType.AddMenu }
   | BranchFoldout
   | AppMenuFoldout
+  | { type: FoldoutType.PushPull }
 
 export enum RepositorySectionTab {
   Changes,
@@ -418,6 +483,16 @@ export interface IRepositoryState {
   readonly compareState: ICompareState
   readonly selectedSection: RepositorySectionTab
 
+  /**
+   * The state of the current pull request view in the repository.
+   *
+   * It will be populated when a user initiates a pull request. It may have
+   * content to retain a users pull request state if they navigate
+   * away from the current pull request view and then back. It is returned
+   * to null after a pull request has been opened.
+   */
+  readonly pullRequestState: IPullRequestState | null
+
   /**
    * The name and email that will be used for the author info
    * when committing barring any race where user.name/user.email is
@@ -512,6 +587,13 @@ export interface IBranchesState {
    */
   readonly defaultBranch: Branch | null
 
+  /**
+   * The default branch of the upstream remote in a forked GitHub repository
+   * with the ForkContributionTarget.Parent behavior, or null if it cannot be
+   * inferred or is another kind of repository.
+   */
+  readonly upstreamDefaultBranch: Branch | null
+
   /**
    * A list of all branches (remote and local) that's currently in
    * the repository.
@@ -553,6 +635,25 @@ export interface ICommitSelection {
   /** The commits currently selected in the app */
   readonly shas: ReadonlyArray<string>
 
+  /**
+   * When multiple commits are selected, the diff is created using the rev range
+   * of firstSha^..lastSha in the selected shas. Thus comparing the trees of the
+   * the lastSha and the first parent of the first sha. However, our history
+   * list shows commits in chronological order. Thus, when a branch is merged,
+   * the commits from that branch are injected in their chronological order into
+   * the history list. Therefore, given a branch history of A, B, C, D,
+   * MergeCommit where B and C are from the merged branch, diffing on the
+   * selection of A through D would not have the changes from B an C.
+   *
+   * This is a list of the shas that are reachable by following the parent links
+   * (aka the graph) from the lastSha to the firstSha^ in the selection.
+   *
+   * Other notes: Given a selection A through D, executing `git diff A..D` would
+   * give us the changes since A but not including A; since the user will have
+   * selected A, we do `git diff A^..D` so that we include the changes of A.
+   * */
+  readonly shasInDiff: ReadonlyArray<string>
+
   /**
    * Whether the a selection of commits are group of adjacent to each other.
    * Example: Given these are indexes of sha's in history, 3, 4, 5, 6 is contiguous as
@@ -626,7 +727,7 @@ export interface IChangesState {
    * Co-Authored-By commit message trailers depending on whether
    * the user has chosen to do so.
    */
-  readonly coAuthors: ReadonlyArray<IAuthor>
+  readonly coAuthors: ReadonlyArray<Author>
 
   /**
    * Stores information about conflicts in the working directory
@@ -651,6 +752,11 @@ export interface IChangesState {
 
   /** `true` if the GitHub API reports that the branch is protected */
   readonly currentBranchProtected: boolean
+
+  /**
+   * Repo rules that apply to the current branch.
+   */
+  readonly currentRepoRulesInfo: RepoRulesInfo
 }
 
 /**
@@ -717,6 +823,9 @@ export interface ICompareState {
   /** The SHAs of commits to render in the compare list */
   readonly commitSHAs: ReadonlyArray<string>
 
+  /** The SHAs of commits to highlight in the compare list */
+  readonly shasToHighlight: ReadonlyArray<string>
+
   /**
    * A list of branches (remote and local) except the current branch, and
    * Desktop fork remote branches (see `Branch.isDesktopForkRemoteBranch`)
@@ -899,3 +1008,31 @@ export interface IConstrainedValue {
   readonly max: number
   readonly min: number
 }
+
+/**
+ * The state of the current pull request view in the repository.
+ */
+export interface IPullRequestState {
+  /**
+   * The base branch of a a pull request - the branch the currently checked out
+   * branch would merge into
+   */
+  readonly baseBranch: Branch | null
+
+  /** The SHAs of commits of the pull request */
+  readonly commitSHAs: ReadonlyArray<string> | null
+
+  /**
+   * The commit selection, file selection and diff of the pull request.
+   *
+   * Note: By default the commit selection shas will be all the pull request
+   * shas and will mean the diff represents the merge base of the current branch
+   * and the the pull request base branch. This is different than the
+   * repositories commit selection where the diff of all commits represents the
+   * diff between the latest commit and the earliest commits parent.
+   */
+  readonly commitSelection: ICommitSelection | null
+
+  /** The result of merging the pull request branch into the base branch */
+  readonly mergeStatus: MergeTreeResult | null
+}
diff --git a/app/src/lib/branch.ts b/app/src/lib/branch.ts
index 93ee13b9379..1f0342ba470 100644
--- a/app/src/lib/branch.ts
+++ b/app/src/lib/branch.ts
@@ -1,43 +1,26 @@
-import { Branch, BranchType } from '../models/branch'
-import { UpstreamRemoteName } from './stores'
+import { Branch } from '../models/branch'
 import {
-  RepositoryWithGitHubRepository,
-  getNonForkGitHubRepository,
+  isRepositoryWithGitHubRepository,
+  Repository,
 } from '../models/repository'
+import { IBranchesState } from './app-state'
 
 /**
- * Finds the default branch of the upstream repository of the passed repository.
- *
- * When the passed repository is not a fork or the fork is configured to use itself
- * as the ForkContributionTarget, then this method will return null. Otherwise it'll
- * return the default branch of the upstream repository.
  *
  * @param repository The repository to use.
- * @param branches all the branches in the local repo.
+ * @param branchesState The branches state of the repository.
+ * @returns The default branch of the user's contribution target, or null if it's not known.
+ *
+ * This method will return the fork's upstream default branch, if the user
+ * is contributing to the parent repository.
+ *
+ * Otherwise, this method will return the default branch of the passed in repository.
  */
-export function findDefaultUpstreamBranch(
-  repository: RepositoryWithGitHubRepository,
-  branches: ReadonlyArray<Branch>
+export function findContributionTargetDefaultBranch(
+  repository: Repository,
+  { defaultBranch, upstreamDefaultBranch }: IBranchesState
 ): Branch | null {
-  const githubRepository = getNonForkGitHubRepository(repository)
-
-  // This is a bit hacky... we checked if the result of calling
-  // getNonForkGitHubRepository() is the same as the associated
-  // gitHubRepository. When this happens, we know that either the
-  // repository is not a fork or that it's a fork with
-  // ForkContributionTarget=Self.
-  //
-  // TODO: Make this method return the default branch of the
-  // origin repository instead of null in this scenario.
-  if (githubRepository === repository.gitHubRepository) {
-    return null
-  }
-
-  const foundBranch = branches.find(
-    b =>
-      b.type === BranchType.Remote &&
-      b.name === `${UpstreamRemoteName}/${githubRepository.defaultBranch}`
-  )
-
-  return foundBranch !== undefined ? foundBranch : null
+  return isRepositoryWithGitHubRepository(repository)
+    ? upstreamDefaultBranch ?? defaultBranch
+    : defaultBranch
 }
diff --git a/app/src/lib/ci-checks/ci-checks.ts b/app/src/lib/ci-checks/ci-checks.ts
index d7e8f8e1fe2..1efb276b1dc 100644
--- a/app/src/lib/ci-checks/ci-checks.ts
+++ b/app/src/lib/ci-checks/ci-checks.ts
@@ -1,20 +1,20 @@
+import { Account } from '../../models/account'
+import { GitHubRepository } from '../../models/github-repository'
 import {
-  APICheckStatus,
+  API,
   APICheckConclusion,
-  IAPIWorkflowJobStep,
+  APICheckStatus,
   IAPIRefCheckRun,
   IAPIRefStatusItem,
-  IAPIWorkflowJob,
-  API,
+  IAPIWorkflowJobStep,
   IAPIWorkflowJobs,
   IAPIWorkflowRun,
 } from '../api'
-import JSZip from 'jszip'
-import { enableCICheckRunsLogs } from '../feature-flag'
-import { GitHubRepository } from '../../models/github-repository'
-import { Account } from '../../models/account'
 import { supportsRetrieveActionWorkflowByCheckSuiteId } from '../endpoint-capabilities'
-import { formatPreciseDuration } from '../format-duration'
+import {
+  formatLongPreciseDuration,
+  formatPreciseDuration,
+} from '../format-duration'
 
 /**
  * A Desktop-specific model closely related to a GitHub API Check Run.
@@ -50,41 +50,6 @@ export interface ICombinedRefCheck {
   readonly checks: ReadonlyArray<IRefCheck>
 }
 
-/**
- * Given a zipped list of logs from a workflow job, parses the different job
- * steps.
- */
-export async function parseJobStepLogs(
-  logZip: JSZip,
-  job: IAPIWorkflowJob
-): Promise<ReadonlyArray<IAPIWorkflowJobStep>> {
-  try {
-    const jobFolder = logZip.folder(job.name)
-    if (jobFolder === null) {
-      return job.steps
-    }
-
-    const stepsWLogs = new Array<IAPIWorkflowJobStep>()
-    for (const step of job.steps) {
-      const stepName = step.name.replace('/', '')
-      const stepFileName = `${step.number}_${stepName}.txt`
-      const stepLogFile = jobFolder.file(stepFileName)
-      if (stepLogFile === null) {
-        stepsWLogs.push(step)
-        continue
-      }
-
-      const log = await stepLogFile.async('text')
-      stepsWLogs.push({ ...step, log })
-    }
-    return stepsWLogs
-  } catch (e) {
-    log.warn('Could not parse logs for: ' + job.name)
-  }
-
-  return job.steps
-}
-
 /**
  * Convert a legacy API commit status to a fake check run
  */
@@ -321,7 +286,7 @@ export function isSuccess(check: IRefCheck) {
  * We use the check suite id as a proxy for determining what's
  * the "latest" of two check runs with the same name.
  */
-export function getLatestCheckRunsByName(
+export function getLatestCheckRunsById(
   checkRuns: ReadonlyArray<IAPIRefCheckRun>
 ): ReadonlyArray<IAPIRefCheckRun> {
   const latestCheckRunsByName = new Map<string, IAPIRefCheckRun>()
@@ -336,7 +301,7 @@ export function getLatestCheckRunsByName(
     // feels hacky... but we don't have any other meta data on a check run that
     // differieates these.
     const nameAndHasPRs =
-      checkRun.name +
+      checkRun.id +
       (checkRun.pull_requests.length > 0
         ? 'isPullRequestCheckRun'
         : 'isPushCheckRun')
@@ -361,7 +326,6 @@ export async function getLatestPRWorkflowRunsLogsForCheckRun(
   repo: string,
   checkRuns: ReadonlyArray<IRefCheck>
 ): Promise<ReadonlyArray<IRefCheck>> {
-  const logCache = new Map<string, JSZip>()
   const jobsCache = new Map<number, IAPIWorkflowJobs | null>()
   const mappedCheckRuns = new Array<IRefCheck>()
   for (const cr of checkRuns) {
@@ -369,12 +333,12 @@ export async function getLatestPRWorkflowRunsLogsForCheckRun(
       mappedCheckRuns.push(cr)
       continue
     }
-    const { id: wfId, logs_url } = cr.actionsWorkflow
+    const { id } = cr.actionsWorkflow
     // Multiple check runs match a single workflow run.
     // We can prevent several job network calls by caching them.
     const workFlowRunJobs =
-      jobsCache.get(wfId) ?? (await api.fetchWorkflowRunJobs(owner, repo, wfId))
-    jobsCache.set(wfId, workFlowRunJobs)
+      jobsCache.get(id) ?? (await api.fetchWorkflowRunJobs(owner, repo, id))
+    jobsCache.set(id, workFlowRunJobs)
 
     const matchingJob = workFlowRunJobs?.jobs.find(j => j.id === cr.id)
     if (matchingJob === undefined) {
@@ -382,31 +346,10 @@ export async function getLatestPRWorkflowRunsLogsForCheckRun(
       continue
     }
 
-    if (!enableCICheckRunsLogs()) {
-      mappedCheckRuns.push({
-        ...cr,
-        htmlUrl: matchingJob.html_url,
-        actionJobSteps: matchingJob.steps,
-      })
-
-      continue
-    }
-
-    // One workflow can have the logs for multiple check runs.. no need to
-    // keep retrieving it. So we are hashing it.
-    const logZip =
-      logCache.get(logs_url) ?? (await api.fetchWorkflowRunJobLogs(logs_url))
-    if (logZip === null) {
-      mappedCheckRuns.push(cr)
-      continue
-    }
-
-    logCache.set(logs_url, logZip)
-
     mappedCheckRuns.push({
       ...cr,
       htmlUrl: matchingJob.html_url,
-      actionJobSteps: await parseJobStepLogs(logZip, matchingJob),
+      actionJobSteps: matchingJob.steps,
     })
   }
 
@@ -595,7 +538,7 @@ function mapActionWorkflowsRunsToCheckRuns(
 
 /**
  *  Gets the duration of a check run or job step formatted in minutes and
- *  seconds.
+ *  seconds with short notation (e.g. 1m 30s)
  */
 export function getFormattedCheckRunDuration(
   checkRun: IAPIRefCheckRun | IAPIWorkflowJobStep
@@ -604,6 +547,17 @@ export function getFormattedCheckRunDuration(
   return isNaN(duration) ? '' : formatPreciseDuration(duration)
 }
 
+/**
+ *  Gets the duration of a check run or job step formatted in minutes and
+ *  seconds with long notation (e.g. 1 minute 30 seconds)
+ */
+export function getFormattedCheckRunLongDuration(
+  checkRun: IAPIRefCheckRun | IAPIWorkflowJobStep
+) {
+  const duration = getCheckDurationInMilliseconds(checkRun)
+  return isNaN(duration) ? '' : formatLongPreciseDuration(duration)
+}
+
 /**
  * Generates the URL pointing to the details of a given check run. If that check
  * run has no specific URL, returns the URL of the associated pull request.
diff --git a/app/src/lib/cli-action.ts b/app/src/lib/cli-action.ts
new file mode 100644
index 00000000000..2e0072b421c
--- /dev/null
+++ b/app/src/lib/cli-action.ts
@@ -0,0 +1,10 @@
+export type CLIAction =
+  | {
+      readonly kind: 'open-repository'
+      readonly path: string
+    }
+  | {
+      readonly kind: 'clone-url'
+      readonly url: string
+      readonly branch?: string
+    }
diff --git a/app/src/lib/commit-url.ts b/app/src/lib/commit-url.ts
new file mode 100644
index 00000000000..8dd293c8be2
--- /dev/null
+++ b/app/src/lib/commit-url.ts
@@ -0,0 +1,24 @@
+import * as crypto from 'crypto'
+import { GitHubRepository } from '../models/github-repository'
+
+/** Method to create the url for viewing a commit on dotcom */
+export function createCommitURL(
+  gitHubRepository: GitHubRepository,
+  SHA: string,
+  filePath?: string
+): string | null {
+  const baseURL = gitHubRepository.htmlURL
+
+  if (baseURL === null) {
+    return null
+  }
+
+  if (filePath === undefined) {
+    return `${baseURL}/commit/${SHA}`
+  }
+
+  const fileHash = crypto.createHash('sha256').update(filePath).digest('hex')
+  const fileSuffix = '#diff-' + fileHash
+
+  return `${baseURL}/commit/${SHA}${fileSuffix}`
+}
diff --git a/app/src/lib/create-terminal-stream.ts b/app/src/lib/create-terminal-stream.ts
new file mode 100644
index 00000000000..557a2475e88
--- /dev/null
+++ b/app/src/lib/create-terminal-stream.ts
@@ -0,0 +1,118 @@
+import { Transform } from 'node:stream'
+
+/**
+ * Creates a transform stream which removes redundant Git progress output by
+ * handling carriage returns the same way a terminal would, i.e by
+ * moving the cursor and (potentially) overwriting text.
+ *
+ * Git (and many other CLI tools) use this trick to present the
+ * user with nice looking progress. When writing something like...
+ *
+ * 'Downloading: 1%  \r'
+ * 'Downloading: 2%  \r'
+ *
+ * ...to the terminal the user is gonna perceive it as if the 1 just
+ * magically changes to a two.
+ *
+ * The carriage return character for all of you kids out there
+ * that haven't yet played with a manual typewriter refers to the
+ * "carriage" which held the character arms, see
+ *
+ *  https://en.wikipedia.org/wiki/Carriage_return#Typewriters
+ */
+export const createTerminalStream = () => {
+  // The virtual line buffer, think of this as one long line (1 KiB) in a
+  // terminal where `l` is the farthest we've written in that line and `p` is
+  // the current cursor position, i.e. where we'll write the next characters
+  let buf: Buffer, l: number, p: number
+
+  function reset() {
+    buf = Buffer.alloc(1024)
+    p = l = 0
+  }
+
+  reset()
+
+  return new Transform({
+    decodeStrings: true,
+    transform(chunk: Buffer, _, callback) {
+      let i = 0
+      let next, cr, lf
+
+      while (i < chunk.length) {
+        cr = chunk.indexOf(0x0d, i)
+
+        if (cr === -1) {
+          // Happy path, there's no carriage return so we can jump to the last
+          // linefeed. Significant performance boost for streams without CRs.
+          lf = chunk.subarray(i).lastIndexOf(0x0a)
+          lf = lf === -1 ? -1 : lf + i
+        } else {
+          // Slow path, we need to look for the next linefeed to see if it comes
+          // before or after the carriage return.
+          lf = chunk.indexOf(0x0a, i)
+        }
+
+        // The next LF, CR, or the last index if we don't find either
+        next = Math.min(
+          cr === -1 ? chunk.length - 1 : cr,
+          lf === -1 ? chunk.length - 1 : lf
+        )
+        next = next === -1 ? chunk.length - 1 : next
+
+        let sliceLength
+        let start = i
+        const end = next + 1
+
+        // Take the chunk and copy it into the buffer, if we can't fit it
+        while ((sliceLength = end - start) > 0) {
+          // Writing the chunk from the current cursor position will overflow
+          // the "line" (buf). When this happens in a terminal the line will
+          // wrap and the cursor will be moved to the next line. We simulate
+          // this by pushing our current "line" (if any) and the chunk
+          if (p + sliceLength > buf.length) {
+            // It's possible that our cursor has just been reset to 0, in that
+            // case we don't want to push because the chunk will "overwrite"
+            // the content in our buf.
+            if (p > 0) {
+              this.push(buf.subarray(0, p))
+            }
+
+            // Push at most however many bytes is left on the "line"
+            const remaining = buf.length - p
+            this.push(chunk.subarray(start, start + remaining))
+            start += remaining
+            reset()
+          } else {
+            // We can fit the entire chunk into the buffer, so just copy it
+            chunk.copy(buf, p, start)
+            p += sliceLength
+            // We may have written over only parts of the previous line
+            // contents, for example, with this input:
+            //  1. "foo bar\r"
+            //  2. "baz"
+            // the buffer should contain "baz bar"
+            l = Math.max(p, l)
+            break
+          }
+        }
+
+        if (chunk[next] === 0x0a /* \n */ && l > 0) {
+          // We found a line feed; push the current "line" and reset
+          this.push(buf.subarray(0, l))
+          reset()
+        } else if (chunk[next] === 0x0d /* \r */) {
+          // We found a carriage return, reset the cursor
+          p = 0
+        }
+
+        i = next + 1
+      }
+
+      callback()
+    },
+    flush(callback) {
+      callback(null, l > 0 ? buf.subarray(0, l) : null)
+    },
+  })
+}
diff --git a/app/src/lib/custom-integration.ts b/app/src/lib/custom-integration.ts
new file mode 100644
index 00000000000..116ac44397d
--- /dev/null
+++ b/app/src/lib/custom-integration.ts
@@ -0,0 +1,197 @@
+import { ChildProcess, SpawnOptions, spawn } from 'child_process'
+import { parseCommandLineArgv } from 'windows-argv-parser'
+import stringArgv from 'string-argv'
+import { promisify } from 'util'
+import { exec } from 'child_process'
+import { access, lstat } from 'fs/promises'
+import * as fs from 'fs'
+
+const execAsync = promisify(exec)
+
+/** The string that will be replaced by the target path in the custom integration arguments */
+export const TargetPathArgument = '%TARGET_PATH%'
+
+/** The interface representing a custom integration (external editor or shell) */
+export interface ICustomIntegration {
+  /** The path to the custom integration */
+  readonly path: string
+  /** The arguments to pass to the custom integration */
+  readonly arguments: string
+  /** The bundle ID of the custom integration (macOS only) */
+  readonly bundleID?: string
+}
+
+/**
+ * Parse the arguments string of a custom integration into an array of strings.
+ *
+ * @param args The arguments string to parse
+ */
+export function parseCustomIntegrationArguments(
+  args: string
+): ReadonlyArray<string> {
+  return __WIN32__ ? parseCommandLineArgv(args) : stringArgv(args)
+}
+
+// Function to retrieve, on macOS, the bundleId of an app given its path
+async function getAppBundleID(path: string) {
+  try {
+    // Ensure the path ends with `.app` for applications
+    if (!path.endsWith('.app')) {
+      throw new Error(
+        'The provided path does not point to a macOS application.'
+      )
+    }
+
+    // Use mdls to query the kMDItemCFBundleIdentifier attribute
+    const { stdout } = await execAsync(
+      `mdls -name kMDItemCFBundleIdentifier -raw "${path}"`
+    )
+    const bundleId = stdout.trim()
+
+    // Check for valid output
+    if (!bundleId || bundleId === '(null)') {
+      return undefined
+    }
+
+    return bundleId
+  } catch (error) {
+    console.error('Failed to retrieve bundle ID:', error)
+    return undefined
+  }
+}
+
+/**
+ * Replace the target path placeholder in the custom integration arguments with
+ * the actual target path.
+ *
+ * @param args The custom integration arguments
+ * @param repoPath The target path to replace the placeholder with
+ */
+export function expandTargetPathArgument(
+  args: ReadonlyArray<string>,
+  repoPath: string
+): ReadonlyArray<string> {
+  return args.map(arg => arg.replaceAll(TargetPathArgument, repoPath))
+}
+
+/**
+ * Check if the custom integration arguments contain the target path placeholder.
+ *
+ * @param args The custom integration arguments
+ */
+export function checkTargetPathArgument(args: ReadonlyArray<string>): boolean {
+  return args.some(arg => arg.includes(TargetPathArgument))
+}
+
+/**
+ * Validate the path of a custom integration.
+ *
+ * @param path The path to the custom integration
+ *
+ * @returns An object with a boolean indicating if the path is valid and, if
+ *          the path is a macOS app, the bundle ID of the app.
+ */
+export async function validateCustomIntegrationPath(
+  path: string
+): Promise<{ isValid: boolean; bundleID?: string }> {
+  if (path.length === 0) {
+    return { isValid: false }
+  }
+
+  let bundleID = undefined
+
+  try {
+    const pathStat = await lstat(path)
+    const canBeExecuted = await access(path, fs.constants.X_OK)
+      .then(() => true)
+      .catch(() => false)
+
+    const isExecutableFile =
+      (pathStat.isFile() || pathStat.isSymbolicLink()) && canBeExecuted
+
+    // On macOS, not only executable files are valid, but also apps (which are
+    // directories with a `.app` extension and from which we can retrieve
+    // the app bundle ID)
+    if (__DARWIN__ && !isExecutableFile && pathStat.isDirectory()) {
+      bundleID = await getAppBundleID(path)
+    }
+
+    return { isValid: isExecutableFile || !!bundleID, bundleID }
+  } catch (e) {
+    log.error(`Failed to validate path: ${path}`, e)
+    return { isValid: false }
+  }
+}
+
+/**
+ * Check if a custom integration is valid (meaning both the path and the
+ * arguments are valid).
+ *
+ * @param customIntegration The custom integration to validate
+ */
+export async function isValidCustomIntegration(
+  customIntegration: ICustomIntegration
+): Promise<boolean> {
+  try {
+    const pathResult = await validateCustomIntegrationPath(
+      customIntegration.path
+    )
+    const argv = parseCustomIntegrationArguments(customIntegration.arguments)
+    const targetPathPresent = checkTargetPathArgument(argv)
+    return pathResult.isValid && targetPathPresent
+  } catch (e) {
+    log.error('Failed to validate custom integration:', e)
+    return false
+  }
+}
+
+/**
+ * Migrates custom integrations stored with the old format (with the arguments
+ * stored as an array of strings) to the new format (with the arguments stored
+ * as a single string).
+ *
+ * @param customIntegration The custom integration to migrate
+ *
+ * @returns The migrated custom integration, or `null` if the custom integration
+ *         is already in the new format.
+ */
+export function migratedCustomIntegration(
+  customIntegration: ICustomIntegration | null
+): ICustomIntegration | null {
+  if (customIntegration === null) {
+    return null
+  }
+
+  // The first public release of the custom integrations feature stored the
+  // arguments as an array of strings. This caused some issues because the
+  // APIs used to parse them and split them into an array would remove any
+  // quotes. Storing exactly the same string as the user entered and then parse
+  // it right before invoking the custom integration is a better approach.
+  if (!Array.isArray(customIntegration.arguments)) {
+    return null
+  }
+
+  return {
+    ...customIntegration,
+    arguments: customIntegration.arguments.join(' '),
+  }
+}
+
+/**
+ * This helper function will use spawn to launch an integration (editor or shell).
+ * Its main purpose is to do some platform-specific argument handling, for example
+ * on Windows, where we need to wrap the command and arguments in quotes when
+ * the shell option is enabled.
+ *
+ * @param command Command to spawn
+ * @param args Arguments to pass to the command
+ * @param options Options to pass to spawn (optional)
+ * @returns The ChildProcess object returned by spawn
+ */
+export function spawnCustomIntegration(
+  command: string,
+  args: readonly string[],
+  options?: SpawnOptions
+): ChildProcess {
+  return options ? spawn(command, args, options) : spawn(command, args)
+}
diff --git a/app/src/lib/databases/repositories-database.ts b/app/src/lib/databases/repositories-database.ts
index 76fbebd833e..2f57ba1df03 100644
--- a/app/src/lib/databases/repositories-database.ts
+++ b/app/src/lib/databases/repositories-database.ts
@@ -22,7 +22,6 @@ export interface IDatabaseGitHubRepository {
   readonly name: string
   readonly private: boolean | null
   readonly htmlURL: string | null
-  readonly defaultBranch: string | null
   readonly cloneURL: string | null
 
   /** The database ID of the parent repository if the repository is a fork. */
diff --git a/app/src/lib/diff-parser.ts b/app/src/lib/diff-parser.ts
index 7b82932c548..3598ddb065c 100644
--- a/app/src/lib/diff-parser.ts
+++ b/app/src/lib/diff-parser.ts
@@ -311,7 +311,6 @@ export class DiffParser {
     let diffLineNumber = linesConsumed
     while ((c = this.parseLinePrefix(this.peek()))) {
       const line = this.readLine()
-      diffLineNumber++
 
       if (!line) {
         throw new Error('Expected unified diff line but reached end of diff')
@@ -338,6 +337,12 @@ export class DiffParser {
         continue
       }
 
+      // We must increase `diffLineNumber` only when we're certain that the line
+      // is not a "no newline" marker. Otherwise, we'll end up with a wrong
+      // `diffLineNumber` for the next line. This could happen if the last line
+      // in the file doesn't have a newline before the change.
+      diffLineNumber++
+
       let diffLine: DiffLine
 
       if (c === DiffPrefixAdd) {
diff --git a/app/src/lib/editors/darwin.ts b/app/src/lib/editors/darwin.ts
index 15dc96f2d1b..dd30b20b661 100644
--- a/app/src/lib/editors/darwin.ts
+++ b/app/src/lib/editors/darwin.ts
@@ -27,10 +27,62 @@ const editors: IDarwinExternalEditor[] = [
     name: 'Aptana Studio',
     bundleIdentifiers: ['aptana.studio'],
   },
+  {
+    name: 'Eclipse IDE for Java Developers',
+    bundleIdentifiers: ['epp.package.java'],
+  },
+  {
+    name: 'Eclipse IDE for Enterprise Java and Web Developers',
+    bundleIdentifiers: ['epp.package.jee'],
+  },
+  {
+    name: 'Eclipse IDE for C/C++ Developers',
+    bundleIdentifiers: ['epp.package.cpp'],
+  },
+  {
+    name: 'Eclipse IDE for Eclipse Committers',
+    bundleIdentifiers: ['epp.package.committers'],
+  },
+  {
+    name: 'Eclipse IDE for Embedded C/C++ Developers',
+    bundleIdentifiers: ['epp.package.embedcpp'],
+  },
+  {
+    name: 'Eclipse IDE for PHP Developers',
+    bundleIdentifiers: ['epp.package.php'],
+  },
+  {
+    name: 'Eclipse IDE for Java and DSL Developers',
+    bundleIdentifiers: ['epp.package.dsl'],
+  },
+  {
+    name: 'Eclipse IDE for RCP and RAP Developers',
+    bundleIdentifiers: ['epp.package.rcp'],
+  },
+  {
+    name: 'Eclipse Modeling Tools',
+    bundleIdentifiers: ['epp.package.modeling'],
+  },
+  {
+    name: 'Eclipse IDE for Scientific Computing',
+    bundleIdentifiers: ['epp.package.parallel'],
+  },
+  {
+    name: 'Eclipse IDE for Scout Developers',
+    bundleIdentifiers: ['epp.package.scout'],
+  },
   {
     name: 'MacVim',
     bundleIdentifiers: ['org.vim.MacVim'],
   },
+  {
+    name: 'Neovide',
+    bundleIdentifiers: ['com.neovide.neovide'],
+  },
+  {
+    name: 'VimR',
+    bundleIdentifiers: ['com.qvacua.VimR'],
+  },
   {
     name: 'Visual Studio Code',
     bundleIdentifiers: ['com.microsoft.VSCode'],
@@ -41,7 +93,7 @@ const editors: IDarwinExternalEditor[] = [
   },
   {
     name: 'VSCodium',
-    bundleIdentifiers: ['com.visualstudio.code.oss'],
+    bundleIdentifiers: ['com.visualstudio.code.oss', 'com.vscodium'],
   },
   {
     name: 'Sublime Text',
@@ -63,13 +115,25 @@ const editors: IDarwinExternalEditor[] = [
     name: 'PyCharm',
     bundleIdentifiers: ['com.jetbrains.PyCharm'],
   },
+  {
+    name: 'PyCharm Community Edition',
+    bundleIdentifiers: ['com.jetbrains.pycharm.ce'],
+  },
+  {
+    name: 'DataSpell',
+    bundleIdentifiers: ['com.jetbrains.DataSpell'],
+  },
   {
     name: 'RubyMine',
     bundleIdentifiers: ['com.jetbrains.RubyMine'],
   },
+  {
+    name: 'RustRover',
+    bundleIdentifiers: ['com.jetbrains.RustRover'],
+  },
   {
     name: 'RStudio',
-    bundleIdentifiers: ['org.rstudio.RStudio'],
+    bundleIdentifiers: ['org.rstudio.RStudio', 'com.rstudio.desktop'],
   },
   {
     name: 'TextMate',
@@ -83,6 +147,10 @@ const editors: IDarwinExternalEditor[] = [
     name: 'WebStorm',
     bundleIdentifiers: ['com.jetbrains.WebStorm'],
   },
+  {
+    name: 'CLion',
+    bundleIdentifiers: ['com.jetbrains.CLion'],
+  },
   {
     name: 'Typora',
     bundleIdentifiers: ['abnerworks.Typora'],
@@ -128,6 +196,34 @@ const editors: IDarwinExternalEditor[] = [
     name: 'Nova',
     bundleIdentifiers: ['com.panic.Nova'],
   },
+  {
+    name: 'Emacs',
+    bundleIdentifiers: ['org.gnu.Emacs'],
+  },
+  {
+    name: 'Lite XL',
+    bundleIdentifiers: ['com.lite-xl'],
+  },
+  {
+    name: 'Fleet',
+    bundleIdentifiers: ['Fleet.app'],
+  },
+  {
+    name: 'Pulsar',
+    bundleIdentifiers: ['dev.pulsar-edit.pulsar'],
+  },
+  {
+    name: 'Zed',
+    bundleIdentifiers: ['dev.zed.Zed'],
+  },
+  {
+    name: 'Zed (Preview)',
+    bundleIdentifiers: ['dev.zed.Zed-Preview'],
+  },
+  {
+    name: 'Cursor',
+    bundleIdentifiers: ['com.todesktop.230313mzl4w4u92'],
+  },
 ]
 
 async function findApplication(
@@ -144,11 +240,7 @@ async function findApplication(
           : Promise.reject(e)
       )
 
-      if (installPath === null) {
-        return null
-      }
-
-      if (await pathExists(installPath)) {
+      if (installPath && (await pathExists(installPath))) {
         return installPath
       }
 
diff --git a/app/src/lib/editors/found-editor.ts b/app/src/lib/editors/found-editor.ts
index a2c7f2bb5ad..f64241749f4 100644
--- a/app/src/lib/editors/found-editor.ts
+++ b/app/src/lib/editors/found-editor.ts
@@ -1,5 +1,4 @@
 export interface IFoundEditor<T> {
   readonly editor: T
   readonly path: string
-  readonly usesShell?: boolean
 }
diff --git a/app/src/lib/editors/launch.ts b/app/src/lib/editors/launch.ts
index 63bcfdbcd11..68099797156 100644
--- a/app/src/lib/editors/launch.ts
+++ b/app/src/lib/editors/launch.ts
@@ -1,6 +1,12 @@
 import { spawn, SpawnOptions } from 'child_process'
 import { pathExists } from '../../ui/lib/path-exists'
 import { ExternalEditorError, FoundEditor } from './shared'
+import {
+  expandTargetPathArgument,
+  ICustomIntegration,
+  parseCustomIntegrationArguments,
+  spawnCustomIntegration,
+} from '../custom-integration'
 
 /**
  * Open a given file or folder in the desired external editor.
@@ -14,8 +20,8 @@ export async function launchExternalEditor(
 ): Promise<void> {
   const editorPath = editor.path
   const exists = await pathExists(editorPath)
+  const label = __DARWIN__ ? 'Settings' : 'Options'
   if (!exists) {
-    const label = __DARWIN__ ? 'Preferences' : 'Options'
     throw new ExternalEditorError(
       `Could not find executable for '${editor.editor}' at path '${editor.path}'.  Please open ${label} and select an available editor.`,
       { openPreferences: true }
@@ -29,13 +35,86 @@ export async function launchExternalEditor(
     detached: true,
   }
 
-  if (editor.usesShell) {
-    spawn(`"${editorPath}"`, [`"${fullPath}"`], { ...opts, shell: true })
-  } else if (__DARWIN__) {
-    // In macOS we can use `open`, which will open the right executable file
-    // for us, we only need the path to the editor .app folder.
-    spawn('open', ['-a', editorPath, fullPath], opts)
-  } else {
-    spawn(editorPath, [fullPath], opts)
+  try {
+    if (__DARWIN__) {
+      // In macOS we can use `open`, which will open the right executable file
+      // for us, we only need the path to the editor .app folder.
+      spawn('open', ['-a', editorPath, fullPath], opts)
+    } else {
+      spawn(editorPath, [fullPath], opts)
+    }
+  } catch (error) {
+    log.error(`Error while launching ${editor.editor}`, error)
+    if (error?.code === 'EACCES') {
+      throw new ExternalEditorError(
+        `GitHub Desktop doesn't have the proper permissions to start '${editor.editor}'. Please open ${label} and try another editor.`,
+        { openPreferences: true }
+      )
+    } else {
+      throw new ExternalEditorError(
+        `Something went wrong while trying to start '${editor.editor}'. Please open ${label} and try another editor.`,
+        { openPreferences: true }
+      )
+    }
+  }
+}
+
+/**
+ * Open a given file or folder in the desired custom external editor.
+ *
+ * @param fullPath A folder or file path to pass as an argument when launching the editor.
+ * @param customEditor The external editor to launch.
+ */
+export async function launchCustomExternalEditor(
+  fullPath: string,
+  customEditor: ICustomIntegration
+): Promise<void> {
+  const editorPath = customEditor.path
+  const exists = await pathExists(editorPath)
+  const label = __DARWIN__ ? 'Settings' : 'Options'
+  if (!exists) {
+    throw new ExternalEditorError(
+      `Could not find executable for custom editor at path '${customEditor.path}'.  Please open ${label} and select an available editor.`,
+      { openPreferences: true }
+    )
+  }
+
+  const opts: SpawnOptions = {
+    // Make sure the editor processes are detached from the Desktop app.
+    // Otherwise, some editors (like Notepad++) will be killed when the
+    // Desktop app is closed.
+    detached: true,
+  }
+
+  const argv = parseCustomIntegrationArguments(customEditor.arguments)
+
+  // Replace instances of RepoPathArgument with fullPath in customEditor.arguments
+  const args = expandTargetPathArgument(argv, fullPath)
+
+  try {
+    if (__DARWIN__ && customEditor.bundleID) {
+      // In macOS we can use `open` if it's an app (i.e. if we have a bundleID),
+      // which will open the right executable file for us, we only need the path
+      // to the editor .app folder.
+      spawnCustomIntegration('open', ['-a', editorPath, ...args], opts)
+    } else {
+      spawnCustomIntegration(editorPath, args, opts)
+    }
+  } catch (error) {
+    log.error(
+      `Error while launching custom editor at path ${customEditor.path} with arguments ${args}`,
+      error
+    )
+    if (error?.code === 'EACCES') {
+      throw new ExternalEditorError(
+        `GitHub Desktop doesn't have the proper permissions to start custom editor at path ${customEditor.path}. Please open ${label} and try another editor.`,
+        { openPreferences: true }
+      )
+    } else {
+      throw new ExternalEditorError(
+        `Something went wrong while trying to start custom editor at path ${customEditor.path}. Please open ${label} and try another editor.`,
+        { openPreferences: true }
+      )
+    }
   }
 }
diff --git a/app/src/lib/editors/linux.ts b/app/src/lib/editors/linux.ts
index 7104b42440c..d3574b46f5b 100644
--- a/app/src/lib/editors/linux.ts
+++ b/app/src/lib/editors/linux.ts
@@ -23,17 +23,51 @@ const editors: ILinuxExternalEditor[] = [
     name: 'Neovim',
     paths: ['/usr/bin/nvim'],
   },
+  {
+    name: 'Neovim-Qt',
+    paths: ['/usr/bin/nvim-qt'],
+  },
+  {
+    name: 'Neovide',
+    paths: ['/usr/bin/neovide'],
+  },
+  {
+    name: 'gVim',
+    paths: ['/usr/bin/gvim'],
+  },
   {
     name: 'Visual Studio Code',
-    paths: ['/usr/share/code/bin/code', '/snap/bin/code', '/usr/bin/code'],
+    paths: [
+      '/usr/share/code/bin/code',
+      '/snap/bin/code',
+      '/usr/bin/code',
+      '/mnt/c/Program Files/Microsoft VS Code/bin/code',
+      '/var/lib/flatpak/app/com.visualstudio.code/current/active/export/bin/com.visualstudio.code',
+      '.local/share/flatpak/app/com.visualstudio.code/current/active/export/bin/com.visualstudio.code',
+    ],
   },
   {
     name: 'Visual Studio Code (Insiders)',
-    paths: ['/snap/bin/code-insiders', '/usr/bin/code-insiders'],
+    paths: [
+      '/snap/bin/code-insiders',
+      '/usr/bin/code-insiders',
+      '/var/lib/flatpak/app/com.visualstudio.code.insiders/current/active/export/bin/com.visualstudio.code.insiders',
+      '.local/share/flatpak/app/com.visualstudio.code.insiders/current/active/export/bin/com.visualstudio.code.insiders',
+    ],
   },
   {
     name: 'VSCodium',
-    paths: ['/usr/bin/codium', '/var/lib/flatpak/app/com.vscodium.codium'],
+    paths: [
+      '/usr/bin/codium',
+      '/var/lib/flatpak/app/com.vscodium.codium/current/active/export/bin/com.vscodium.codium',
+      '/usr/share/vscodium-bin/bin/codium',
+      '.local/share/flatpak/app/com.vscodium.codium/current/active/export/bin/com.vscodium.codium',
+      '/snap/bin/codium',
+    ],
+  },
+  {
+    name: 'VSCodium (Insiders)',
+    paths: ['/usr/bin/codium-insiders'],
   },
   {
     name: 'Sublime Text',
@@ -58,6 +92,125 @@ const editors: ILinuxExternalEditor[] = [
     name: 'Code',
     paths: ['/usr/bin/io.elementary.code'],
   },
+  {
+    name: 'Lite XL',
+    paths: ['/usr/bin/lite-xl'],
+  },
+  {
+    name: 'JetBrains PhpStorm',
+    paths: [
+      '/snap/bin/phpstorm',
+      '.local/share/JetBrains/Toolbox/scripts/PhpStorm',
+    ],
+  },
+  {
+    name: 'JetBrains WebStorm',
+    paths: [
+      '/snap/bin/webstorm',
+      '.local/share/JetBrains/Toolbox/scripts/webstorm',
+    ],
+  },
+  {
+    name: 'IntelliJ IDEA',
+    paths: ['/snap/bin/idea', '.local/share/JetBrains/Toolbox/scripts/idea'],
+  },
+  {
+    name: 'IntelliJ IDEA Ultimate Edition',
+    paths: [
+      '/snap/bin/intellij-idea-ultimate',
+      '.local/share/JetBrains/Toolbox/scripts/intellij-idea-ultimate',
+    ],
+  },
+  {
+    name: 'JetBrains Goland',
+    paths: [
+      '/snap/bin/goland',
+      '.local/share/JetBrains/Toolbox/scripts/goland',
+    ],
+  },
+  {
+    name: 'JetBrains CLion',
+    paths: ['/snap/bin/clion', '.local/share/JetBrains/Toolbox/scripts/clion1'],
+  },
+  {
+    name: 'JetBrains Rider',
+    paths: ['/snap/bin/rider', '.local/share/JetBrains/Toolbox/scripts/rider'],
+  },
+  {
+    name: 'JetBrains RubyMine',
+    paths: [
+      '/snap/bin/rubymine',
+      '.local/share/JetBrains/Toolbox/scripts/rubymine',
+    ],
+  },
+  {
+    name: 'JetBrains PyCharm',
+    paths: [
+      '/snap/bin/pycharm',
+      '/snap/bin/pycharm-professional',
+      '.local/share/JetBrains/Toolbox/scripts/pycharm',
+    ],
+  },
+  {
+    name: 'JetBrains RustRover',
+    paths: [
+      '/snap/bin/rustrover',
+      '.local/share/JetBrains/Toolbox/scripts/rustrover',
+    ],
+  },
+  {
+    name: 'Android Studio',
+    paths: [
+      '/snap/bin/studio',
+      '.local/share/JetBrains/Toolbox/scripts/studio',
+    ],
+  },
+  {
+    name: 'Emacs',
+    paths: ['/snap/bin/emacs', '/usr/local/bin/emacs', '/usr/bin/emacs'],
+  },
+  {
+    name: 'Kate',
+    paths: ['/usr/bin/kate'],
+  },
+  {
+    name: 'GEdit',
+    paths: ['/usr/bin/gedit'],
+  },
+  {
+    name: 'GNOME Text Editor',
+    paths: ['/usr/bin/gnome-text-editor'],
+  },
+  {
+    name: 'GNOME Builder',
+    paths: ['/usr/bin/gnome-builder'],
+  },
+  {
+    name: 'Notepadqq',
+    paths: ['/usr/bin/notepadqq'],
+  },
+  {
+    name: 'Mousepad',
+    paths: ['/usr/bin/mousepad'],
+  },
+  {
+    name: 'Pulsar',
+    paths: ['/usr/bin/pulsar'],
+  },
+  {
+    name: 'Pluma',
+    paths: ['/usr/bin/pluma'],
+  },
+  {
+    name: 'Zed',
+    paths: [
+      '/usr/bin/zedit',
+      '/usr/bin/zeditor',
+      '/usr/bin/zed-editor',
+      '~/.local/bin/zed',
+      '/usr/bin/zed',
+    ],
+  },
 ]
 
 async function getAvailablePath(paths: string[]): Promise<string | null> {
diff --git a/app/src/lib/editors/lookup.ts b/app/src/lib/editors/lookup.ts
index 95fdf8ce39a..652e51f8b1c 100644
--- a/app/src/lib/editors/lookup.ts
+++ b/app/src/lib/editors/lookup.ts
@@ -57,7 +57,7 @@ export async function findEditorOrDefault(
   if (name) {
     const match = editors.find(p => p.editor === name) || null
     if (!match) {
-      const menuItemName = __DARWIN__ ? 'Preferences' : 'Options'
+      const menuItemName = __DARWIN__ ? 'Settings' : 'Options'
       const message = `The editor '${name}' could not be found. Please open ${menuItemName} and choose an available editor.`
 
       throw new ExternalEditorError(message, { openPreferences: true })
diff --git a/app/src/lib/editors/shared.ts b/app/src/lib/editors/shared.ts
index 3375efdddcc..0440cddbe9f 100644
--- a/app/src/lib/editors/shared.ts
+++ b/app/src/lib/editors/shared.ts
@@ -10,10 +10,6 @@ export type FoundEditor = {
    * The executable associated with the editor to launch
    */
   path: string
-  /**
-   * the editor requires a shell spawn to launch
-   */
-  usesShell?: boolean
 }
 
 interface IErrorMetadata {
diff --git a/app/src/lib/editors/win32.ts b/app/src/lib/editors/win32.ts
index d24776e5ee3..4df4a5e9ebf 100644
--- a/app/src/lib/editors/win32.ts
+++ b/app/src/lib/editors/win32.ts
@@ -1,6 +1,7 @@
 import * as Path from 'path'
 
 import {
+  enumerateKeys,
   enumerateValues,
   HKEY,
   RegistryValue,
@@ -9,6 +10,7 @@ import {
 import { pathExists } from '../../ui/lib/path-exists'
 
 import { IFoundEditor } from './found-editor'
+import memoizeOne from 'memoize-one'
 
 interface IWindowsAppInformation {
   displayName: string
@@ -56,10 +58,10 @@ type WindowsExternalEditor = {
   readonly registryKeys: ReadonlyArray<RegistryKey>
 
   /** Prefix of the DisplayName registry key that belongs to this editor. */
-  readonly displayNamePrefix: string
+  readonly displayNamePrefixes: string[]
 
   /** Value of the Publisher registry key that belongs to this editor. */
-  readonly publisher: string
+  readonly publishers: string[]
 } & WindowsExternalEditorPathInfo
 
 const registryKey = (key: HKEY, ...subKeys: string[]): RegistryKey => ({
@@ -130,32 +132,32 @@ const executableShimPathsForJetBrainsIDE = (
   ]
 }
 
+// Function to allow for validating a string against the start of strings
+// in an array. Used for validating publisher and display name
+const validateStartsWith = (
+  registryVal: string,
+  definedVal: string[]
+): boolean => {
+  return definedVal.some(subString => registryVal.startsWith(subString))
+}
+
+/**
+ * Handles cases where the value includes:
+ * - An icon index after a comma (e.g., "C:\Path\app.exe,0")
+ * - Surrounding quotes (e.g., ""C:\Path\app.exe",0")
+ * and returns only the path to the executable.
+ */
+const getCleanInstallLocationFromDisplayIcon = (
+  displayIconValue: string
+): string => {
+  return displayIconValue.split(',')[0].replace(/"/g, '')
+}
+
 /**
  * This list contains all the external editors supported on Windows. Add a new
  * entry here to add support for your favorite editor.
  **/
 const editors: WindowsExternalEditor[] = [
-  {
-    name: 'Atom',
-    registryKeys: [CurrentUserUninstallKey('atom')],
-    executableShimPaths: [['bin', 'atom.cmd']],
-    displayNamePrefix: 'Atom',
-    publisher: 'GitHub Inc.',
-  },
-  {
-    name: 'Atom Beta',
-    registryKeys: [CurrentUserUninstallKey('atom-beta')],
-    executableShimPaths: [['bin', 'atom-beta.cmd']],
-    displayNamePrefix: 'Atom Beta',
-    publisher: 'GitHub Inc.',
-  },
-  {
-    name: 'Atom Nightly',
-    registryKeys: [CurrentUserUninstallKey('atom-nightly')],
-    executableShimPaths: [['bin', 'atom-nightly.cmd']],
-    displayNamePrefix: 'Atom Nightly',
-    publisher: 'GitHub Inc.',
-  },
   {
     name: 'Visual Studio Code',
     registryKeys: [
@@ -174,9 +176,9 @@ const editors: WindowsExternalEditor[] = [
       // ARM64 version of VSCode (system)
       LocalMachineUninstallKey('{A5270FC5-65AD-483E-AC30-2C276B63D0AC}_is1'),
     ],
-    executableShimPaths: [['bin', 'code.cmd']],
-    displayNamePrefix: 'Microsoft Visual Studio Code',
-    publisher: 'Microsoft Corporation',
+    executableShimPaths: [['code.exe']],
+    displayNamePrefixes: ['Microsoft Visual Studio Code'],
+    publishers: ['Microsoft Corporation'],
   },
   {
     name: 'Visual Studio Code (Insiders)',
@@ -196,31 +198,65 @@ const editors: WindowsExternalEditor[] = [
       // ARM64 version of VSCode (system)
       LocalMachineUninstallKey('{0AEDB616-9614-463B-97D7-119DD86CCA64}_is1'),
     ],
-    executableShimPaths: [['bin', 'code-insiders.cmd']],
-    displayNamePrefix: 'Microsoft Visual Studio Code Insiders',
-    publisher: 'Microsoft Corporation',
+    executableShimPaths: [['Code - Insiders.exe']],
+    displayNamePrefixes: ['Microsoft Visual Studio Code Insiders'],
+    publishers: ['Microsoft Corporation'],
   },
   {
-    name: 'Visual Studio Codium',
+    name: 'VSCodium',
     registryKeys: [
       // 64-bit version of VSCodium (user)
       CurrentUserUninstallKey('{2E1F05D1-C245-4562-81EE-28188DB6FD17}_is1'),
-      // 32-bit version of VSCodium (user)
+      // 32-bit version of VSCodium (user) - new key
+      CurrentUserUninstallKey('{0FD05EB4-651E-4E78-A062-515204B47A3A}_is1'),
+      // ARM64 version of VSCodium (user) - new key
+      CurrentUserUninstallKey('{57FD70A5-1B8D-4875-9F40-C5553F094828}_is1'),
+      // 64-bit version of VSCodium (system) - new key
+      LocalMachineUninstallKey('{88DA3577-054F-4CA1-8122-7D820494CFFB}_is1'),
+      // 32-bit version of VSCodium (system) - new key
+      Wow64LocalMachineUninstallKey(
+        '{763CBF88-25C6-4B10-952F-326AE657F16B}_is1'
+      ),
+      // ARM64 version of VSCodium (system) - new key
+      LocalMachineUninstallKey('{67DEE444-3D04-4258-B92A-BC1F0FF2CAE4}_is1'),
+      // 32-bit version of VSCodium (user) - old key
       CurrentUserUninstallKey('{C6065F05-9603-4FC4-8101-B9781A25D88E}}_is1'),
-      // ARM64 version of VSCodium (user)
+      // ARM64 version of VSCodium (user) - old key
       CurrentUserUninstallKey('{3AEBF0C8-F733-4AD4-BADE-FDB816D53D7B}_is1'),
-      // 64-bit version of VSCodium (system)
+      // 64-bit version of VSCodium (system) - old key
       LocalMachineUninstallKey('{D77B7E06-80BA-4137-BCF4-654B95CCEBC5}_is1'),
-      // 32-bit version of VSCodium (system)
+      // 32-bit version of VSCodium (system) - old key
       Wow64LocalMachineUninstallKey(
         '{E34003BB-9E10-4501-8C11-BE3FAA83F23F}_is1'
       ),
-      // ARM64 version of VSCodium (system)
+      // ARM64 version of VSCodium (system) - old key
       LocalMachineUninstallKey('{D1ACE434-89C5-48D1-88D3-E2991DF85475}_is1'),
     ],
-    executableShimPaths: [['bin', 'codium.cmd']],
-    displayNamePrefix: 'VSCodium',
-    publisher: 'Microsoft Corporation',
+    executableShimPaths: [['VSCodium.exe']],
+    displayNamePrefixes: ['VSCodium'],
+    publishers: ['VSCodium', 'Microsoft Corporation'],
+  },
+  {
+    name: 'VSCodium (Insiders)',
+    registryKeys: [
+      // 64-bit version of VSCodium - Insiders (user)
+      CurrentUserUninstallKey('{20F79D0D-A9AC-4220-9A81-CE675FFB6B41}_is1'),
+      // 32-bit version of VSCodium - Insiders (user)
+      CurrentUserUninstallKey('{ED2E5618-3E7E-4888-BF3C-A6CCC84F586F}_is1'),
+      // ARM64 version of VSCodium - Insiders (user)
+      CurrentUserUninstallKey('{2E362F92-14EA-455A-9ABD-3E656BBBFE71}_is1'),
+      // 64-bit version of VSCodium - Insiders (system)
+      LocalMachineUninstallKey('{B2E0DDB2-120E-4D34-9F7E-8C688FF839A2}_is1'),
+      // 32-bit version of VSCodium - Insiders (system)
+      Wow64LocalMachineUninstallKey(
+        '{EF35BB36-FA7E-4BB9-B7DA-D1E09F2DA9C9}_is1'
+      ),
+      // ARM64 version of VSCodium - Insiders (system)
+      LocalMachineUninstallKey('{44721278-64C6-4513-BC45-D48E07830599}_is1'),
+    ],
+    executableShimPaths: [['VSCodium - Insiders.exe']],
+    displayNamePrefixes: ['VSCodium Insiders', 'VSCodium (Insiders)'],
+    publishers: ['VSCodium'],
   },
   {
     name: 'Sublime Text',
@@ -231,8 +267,8 @@ const editors: WindowsExternalEditor[] = [
       LocalMachineUninstallKey('Sublime Text 3_is1'),
     ],
     executableShimPaths: [['subl.exe']],
-    displayNamePrefix: 'Sublime Text',
-    publisher: 'Sublime HQ Pty Ltd',
+    displayNamePrefixes: ['Sublime Text'],
+    publishers: ['Sublime HQ Pty Ltd'],
   },
   {
     name: 'Brackets',
@@ -240,8 +276,8 @@ const editors: WindowsExternalEditor[] = [
       Wow64LocalMachineUninstallKey('{4F3B6E8C-401B-4EDE-A423-6481C239D6FF}'),
     ],
     executableShimPaths: [['Brackets.exe']],
-    displayNamePrefix: 'Brackets',
-    publisher: 'brackets.io',
+    displayNamePrefixes: ['Brackets'],
+    publishers: ['brackets.io'],
   },
   {
     name: 'ColdFusion Builder',
@@ -252,8 +288,8 @@ const editors: WindowsExternalEditor[] = [
       LocalMachineUninstallKey('Adobe ColdFusion Builder 2016'),
     ],
     executableShimPaths: [['CFBuilder.exe']],
-    displayNamePrefix: 'Adobe ColdFusion Builder',
-    publisher: 'Adobe Systems Incorporated',
+    displayNamePrefixes: ['Adobe ColdFusion Builder'],
+    publishers: ['Adobe Systems Incorporated'],
   },
   {
     name: 'Typora',
@@ -266,8 +302,8 @@ const editors: WindowsExternalEditor[] = [
       ),
     ],
     executableShimPaths: [['typora.exe']],
-    displayNamePrefix: 'Typora',
-    publisher: 'typora.io',
+    displayNamePrefixes: ['Typora'],
+    publishers: ['typora.io'],
   },
   {
     name: 'SlickEdit',
@@ -296,8 +332,8 @@ const editors: WindowsExternalEditor[] = [
       LocalMachineUninstallKey('{7CC0E567-ACD6-41E8-95DA-154CEEDB0A18}'),
     ],
     executableShimPaths: [['win', 'vs.exe']],
-    displayNamePrefix: 'SlickEdit',
-    publisher: 'SlickEdit Inc.',
+    displayNamePrefixes: ['SlickEdit'],
+    publishers: ['SlickEdit Inc.'],
   },
   {
     name: 'Aptana Studio 3',
@@ -305,22 +341,22 @@ const editors: WindowsExternalEditor[] = [
       Wow64LocalMachineUninstallKey('{2D6C1116-78C6-469C-9923-3E549218773F}'),
     ],
     executableShimPaths: [['AptanaStudio3.exe']],
-    displayNamePrefix: 'Aptana Studio',
-    publisher: 'Appcelerator',
+    displayNamePrefixes: ['Aptana Studio'],
+    publishers: ['Appcelerator'],
   },
   {
     name: 'JetBrains Webstorm',
     registryKeys: registryKeysForJetBrainsIDE('WebStorm'),
     executableShimPaths: executableShimPathsForJetBrainsIDE('webstorm'),
-    displayNamePrefix: 'WebStorm',
-    publisher: 'JetBrains s.r.o.',
+    displayNamePrefixes: ['WebStorm'],
+    publishers: ['JetBrains s.r.o.'],
   },
   {
-    name: 'JetBrains Phpstorm',
+    name: 'JetBrains PhpStorm',
     registryKeys: registryKeysForJetBrainsIDE('PhpStorm'),
     executableShimPaths: executableShimPathsForJetBrainsIDE('phpstorm'),
-    displayNamePrefix: 'PhpStorm',
-    publisher: 'JetBrains s.r.o.',
+    displayNamePrefixes: ['PhpStorm'],
+    publishers: ['JetBrains s.r.o.'],
   },
   {
     name: 'Android Studio',
@@ -330,8 +366,8 @@ const editors: WindowsExternalEditor[] = [
       ['..', 'bin', `studio64.exe`],
       ['..', 'bin', `studio.exe`],
     ],
-    displayNamePrefix: 'Android Studio',
-    publisher: 'Google LLC',
+    displayNamePrefixes: ['Android Studio'],
+    publishers: ['Google LLC'],
   },
   {
     name: 'Notepad++',
@@ -342,29 +378,29 @@ const editors: WindowsExternalEditor[] = [
       Wow64LocalMachineUninstallKey('Notepad++'),
     ],
     installLocationRegistryKey: 'DisplayIcon',
-    displayNamePrefix: 'Notepad++',
-    publisher: 'Notepad++ Team',
+    displayNamePrefixes: ['Notepad++'],
+    publishers: ['Notepad++ Team'],
   },
   {
     name: 'JetBrains Rider',
     registryKeys: registryKeysForJetBrainsIDE('JetBrains Rider'),
     executableShimPaths: executableShimPathsForJetBrainsIDE('rider'),
-    displayNamePrefix: 'JetBrains Rider',
-    publisher: 'JetBrains s.r.o.',
+    displayNamePrefixes: ['JetBrains Rider'],
+    publishers: ['JetBrains s.r.o.'],
   },
   {
     name: 'RStudio',
     registryKeys: [Wow64LocalMachineUninstallKey('RStudio')],
     installLocationRegistryKey: 'DisplayIcon',
-    displayNamePrefix: 'RStudio',
-    publisher: 'RStudio',
+    displayNamePrefixes: ['RStudio'],
+    publishers: ['RStudio', 'Posit Software'],
   },
   {
     name: 'JetBrains IntelliJ Idea',
     registryKeys: registryKeysForJetBrainsIDE('IntelliJ IDEA'),
     executableShimPaths: executableShimPathsForJetBrainsIDE('idea'),
-    displayNamePrefix: 'IntelliJ IDEA ',
-    publisher: 'JetBrains s.r.o.',
+    displayNamePrefixes: ['IntelliJ IDEA '],
+    publishers: ['JetBrains s.r.o.'],
   },
   {
     name: 'JetBrains IntelliJ Idea Community Edition',
@@ -372,43 +408,83 @@ const editors: WindowsExternalEditor[] = [
       'IntelliJ IDEA Community Edition'
     ),
     executableShimPaths: executableShimPathsForJetBrainsIDE('idea'),
-    displayNamePrefix: 'IntelliJ IDEA Community Edition ',
-    publisher: 'JetBrains s.r.o.',
+    displayNamePrefixes: ['IntelliJ IDEA Community Edition '],
+    publishers: ['JetBrains s.r.o.'],
   },
   {
     name: 'JetBrains PyCharm',
     registryKeys: registryKeysForJetBrainsIDE('PyCharm'),
     executableShimPaths: executableShimPathsForJetBrainsIDE('pycharm'),
-    displayNamePrefix: 'PyCharm ',
-    publisher: 'JetBrains s.r.o.',
+    displayNamePrefixes: ['PyCharm '],
+    publishers: ['JetBrains s.r.o.'],
   },
   {
     name: 'JetBrains PyCharm Community Edition',
     registryKeys: registryKeysForJetBrainsIDE('PyCharm Community Edition'),
     executableShimPaths: executableShimPathsForJetBrainsIDE('pycharm'),
-    displayNamePrefix: 'PyCharm Community Edition',
-    publisher: 'JetBrains s.r.o.',
+    displayNamePrefixes: ['PyCharm Community Edition'],
+    publishers: ['JetBrains s.r.o.'],
   },
   {
     name: 'JetBrains CLion',
     registryKeys: registryKeysForJetBrainsIDE('CLion'),
     executableShimPaths: executableShimPathsForJetBrainsIDE('clion'),
-    displayNamePrefix: 'CLion ',
-    publisher: 'JetBrains s.r.o.',
+    displayNamePrefixes: ['CLion '],
+    publishers: ['JetBrains s.r.o.'],
   },
   {
     name: 'JetBrains RubyMine',
     registryKeys: registryKeysForJetBrainsIDE('RubyMine'),
     executableShimPaths: executableShimPathsForJetBrainsIDE('rubymine'),
-    displayNamePrefix: 'RubyMine ',
-    publisher: 'JetBrains s.r.o.',
+    displayNamePrefixes: ['RubyMine '],
+    publishers: ['JetBrains s.r.o.'],
   },
   {
     name: 'JetBrains GoLand',
     registryKeys: registryKeysForJetBrainsIDE('GoLand'),
     executableShimPaths: executableShimPathsForJetBrainsIDE('goland'),
-    displayNamePrefix: 'GoLand ',
-    publisher: 'JetBrains s.r.o.',
+    displayNamePrefixes: ['GoLand '],
+    publishers: ['JetBrains s.r.o.'],
+  },
+  {
+    name: 'JetBrains Fleet',
+    registryKeys: [LocalMachineUninstallKey('Fleet')],
+    installLocationRegistryKey: 'DisplayIcon',
+    displayNamePrefixes: ['Fleet '],
+    publishers: ['JetBrains s.r.o.'],
+  },
+  {
+    name: 'JetBrains DataSpell',
+    registryKeys: registryKeysForJetBrainsIDE('DataSpell'),
+    executableShimPaths: executableShimPathsForJetBrainsIDE('dataspell'),
+    displayNamePrefixes: ['DataSpell '],
+    publishers: ['JetBrains s.r.o.'],
+  },
+  {
+    name: 'JetBrains RustRover',
+    registryKeys: registryKeysForJetBrainsIDE('RustRover'),
+    executableShimPaths: executableShimPathsForJetBrainsIDE('rustrover'),
+    displayNamePrefixes: ['RustRover '],
+    publishers: ['JetBrains s.r.o.'],
+  },
+  {
+    name: 'Pulsar',
+    registryKeys: [
+      CurrentUserUninstallKey('0949b555-c22c-56b7-873a-a960bdefa81f'),
+      LocalMachineUninstallKey('0949b555-c22c-56b7-873a-a960bdefa81f'),
+    ],
+    executableShimPaths: [['..', 'pulsar', 'Pulsar.exe']],
+    displayNamePrefixes: ['Pulsar'],
+    publishers: ['Pulsar-Edit'],
+  },
+  {
+    name: 'Cursor',
+    registryKeys: [
+      CurrentUserUninstallKey('62625861-8486-5be9-9e46-1da50df5f8ff'),
+    ],
+    installLocationRegistryKey: 'DisplayIcon',
+    displayNamePrefixes: ['Cursor'],
+    publishers: ['Cursor AI, Inc.'],
   },
 ]
 
@@ -443,8 +519,8 @@ async function findApplication(editor: WindowsExternalEditor) {
     const { displayName, publisher, installLocation } = getAppInfo(editor, keys)
 
     if (
-      !displayName.startsWith(editor.displayNamePrefix) ||
-      publisher !== editor.publisher
+      !validateStartsWith(displayName, editor.displayNamePrefixes) ||
+      !editor.publishers.includes(publisher)
     ) {
       log.debug(`Unexpected registry entries for ${editor.name}`)
       continue
@@ -452,7 +528,7 @@ async function findApplication(editor: WindowsExternalEditor) {
 
     const executableShimPaths =
       editor.installLocationRegistryKey === 'DisplayIcon'
-        ? [installLocation]
+        ? [getCleanInstallLocationFromDisplayIcon(installLocation)]
         : editor.executableShimPaths.map(p => Path.join(installLocation, ...p))
 
     for (const path of executableShimPaths) {
@@ -465,9 +541,37 @@ async function findApplication(editor: WindowsExternalEditor) {
     }
   }
 
-  return null
+  return undefined
 }
 
+const getJetBrainsToolboxEditors = memoizeOne(async () => {
+  const re = /^JetBrains Toolbox \((.*)\)/
+  const editors = new Array<WindowsExternalEditor>()
+
+  for (const parent of [uninstallSubKey, wow64UninstallSubKey]) {
+    for (const key of enumerateKeys(HKEY.HKEY_CURRENT_USER, parent)) {
+      const m = re.exec(key)
+      if (m) {
+        const [name, product] = m
+        editors.push({
+          name,
+          installLocationRegistryKey: 'DisplayIcon',
+          registryKeys: [
+            {
+              key: HKEY.HKEY_CURRENT_USER,
+              subKey: `${parent}\\${key}`,
+            },
+          ],
+          displayNamePrefixes: [product],
+          publishers: ['JetBrains s.r.o.'],
+        })
+      }
+    }
+  }
+
+  return editors
+})
+
 /**
  * Lookup known external editors using the Windows registry to find installed
  * applications and their location on disk for Desktop to launch.
@@ -476,16 +580,19 @@ export async function getAvailableEditors(): Promise<
   ReadonlyArray<IFoundEditor<string>>
 > {
   const results: Array<IFoundEditor<string>> = []
+  const candidates = [
+    ...editors,
+    ...(await getJetBrainsToolboxEditors().catch(e => {
+      log.error(`Failed resolving JetBrains Toolbox products`, e)
+      return []
+    })),
+  ]
 
-  for (const editor of editors) {
+  for (const editor of candidates) {
     const path = await findApplication(editor)
 
     if (path) {
-      results.push({
-        editor: editor.name,
-        path,
-        usesShell: path.endsWith('.cmd'),
-      })
+      results.push({ editor: editor.name, path })
     }
   }
 
diff --git a/app/src/lib/email.ts b/app/src/lib/email.ts
index 2229a4709e2..565a0825623 100644
--- a/app/src/lib/email.ts
+++ b/app/src/lib/email.ts
@@ -1,7 +1,6 @@
-import * as URL from 'url'
-
-import { IAPIEmail, getDotComAPIEndpoint } from './api'
+import { IAPIEmail } from './api'
 import { Account } from '../models/account'
+import { isGHES } from './endpoint-capabilities'
 
 /**
  * Lookup a suitable email address to display in the application, based on the
@@ -53,11 +52,10 @@ function isEmailPublic(email: IAPIEmail): boolean {
  * email host is hardcoded to the subdomain users.noreply under the
  * endpoint host.
  */
-function getStealthEmailHostForEndpoint(endpoint: string) {
-  return getDotComAPIEndpoint() !== endpoint
-    ? `users.noreply.${URL.parse(endpoint).hostname}`
+const getStealthEmailHostForEndpoint = (endpoint: string) =>
+  isGHES(endpoint)
+    ? `users.noreply.${new URL(endpoint).hostname}`
     : 'users.noreply.github.com'
-}
 
 /**
  * Generate a legacy stealth email address for the user
@@ -122,3 +120,24 @@ export const isAttributableEmailFor = (account: Account, email: string) => {
     getLegacyStealthEmailForUser(login, endpoint).toLowerCase() === needle
   )
 }
+
+/**
+ * A regular expression meant to match both the legacy format GitHub.com
+ * stealth email address and the modern format (login@ vs id+login@).
+ *
+ * Yields two capture groups, the first being an optional capture of the
+ * user id and the second being the mandatory login.
+ */
+const StealthEmailRegexp = /^(?:(\d+)\+)?(.+?)@(users\.noreply\..+)$/i
+
+export const parseStealthEmail = (email: string, endpoint: string) => {
+  const stealthEmailHost = getStealthEmailHostForEndpoint(endpoint)
+  const match = StealthEmailRegexp.exec(email)
+
+  if (!match || stealthEmailHost !== match[3]) {
+    return null
+  }
+
+  const [, id, login] = match
+  return { id: id ? parseInt(id, 10) : undefined, login }
+}
diff --git a/app/src/lib/emoji.ts b/app/src/lib/emoji.ts
new file mode 100644
index 00000000000..3c2f02454f1
--- /dev/null
+++ b/app/src/lib/emoji.ts
@@ -0,0 +1,18 @@
+/** Represents an emoji */
+export type Emoji = {
+  /**
+   * The unicode string of the emoji if emoji is part of
+   * the unicode specification. If missing this emoji is
+   * a GitHub custom emoji such as :shipit:
+   */
+  readonly emoji?: string
+
+  /** URL of the image of the emoji (alternative to the unicode character) */
+  readonly url: string
+
+  /** One or more human readable aliases for the emoji character */
+  readonly aliases: ReadonlyArray<string>
+
+  /** An optional, human readable, description of the emoji  */
+  readonly description?: string
+}
diff --git a/app/src/lib/endpoint-capabilities.ts b/app/src/lib/endpoint-capabilities.ts
index c929e7530c2..b39d0372a7e 100644
--- a/app/src/lib/endpoint-capabilities.ts
+++ b/app/src/lib/endpoint-capabilities.ts
@@ -3,19 +3,22 @@ import { getDotComAPIEndpoint } from './api'
 import { assertNonNullable } from './fatal-error'
 
 export type VersionConstraint = {
-  /** Whether this constrain will be satisfied when using GitHub.com */
-  dotcom: boolean
   /**
-   * Whether this constrain will be satisfied when using GitHub AE
-   * Supports specifying a version constraint as a SemVer Range (ex: >= 3.1.0)
+   * Whether this constrain will be satisfied when using GitHub.com, defaults
+   * to false
+   **/
+  dotcom?: boolean
+  /**
+   * Whether this constrain will be satisfied when using ghe.com, defaults to
+   * the value of `dotcom` if not specified
    */
-  ae: boolean | string
+  ghe?: boolean
   /**
    * Whether this constrain will be satisfied when using GitHub Enterprise
    * Server. Supports specifying a version constraint as a SemVer Range (ex: >=
-   * 3.1.0)
+   * 3.1.0), defaults to false
    */
-  es: boolean | string
+  es?: boolean | string
 }
 
 /**
@@ -29,16 +32,6 @@ export type VersionConstraint = {
  */
 const assumedGHESVersion = new semver.SemVer('3.1.0')
 
-/**
- * If we're connected to a GHAE instance we won't know its version number
- * since it doesn't report that so we'll use this substitute GHES equivalent
- * version number.
- *
- * This should correspond loosely with the most recent GHES series and
- * needs to be updated manually.
- */
-const assumedGHAEVersion = new semver.SemVer('3.2.0')
-
 /** Stores raw x-github-enterprise-version headers keyed on endpoint */
 const rawVersionCache = new Map<string, string>()
 
@@ -49,29 +42,32 @@ const versionCache = new Map<string, semver.SemVer | null>()
 const endpointVersionKey = (ep: string) => `endpoint-version:${ep}`
 
 /**
- * Whether or not the given endpoint URI matches GitHub.com's
- *
- * I.e. https://api.github.com/
- *
- * Most often used to check if an endpoint _isn't_ GitHub.com meaning it's
- * either GitHub Enterprise Server or GitHub AE
+ * Whether or not the given endpoint belong's to GitHub.com
  */
-export const isDotCom = (ep: string) => ep === getDotComAPIEndpoint()
+export const isDotCom = (ep: string) => {
+  if (ep === getDotComAPIEndpoint()) {
+    return true
+  }
 
-/**
- * Whether or not the given endpoint URI appears to point to a GitHub AE
- * instance
- */
-export const isGHAE = (ep: string) =>
-  /^https:\/\/[a-z0-9-]+\.ghe\.com$/i.test(ep)
+  const { hostname } = new URL(ep)
+  return hostname === 'api.github.com' || hostname === 'github.com'
+}
+
+export const isGist = (ep: string) => {
+  const { hostname } = new URL(ep)
+  return hostname === 'gist.github.com' || hostname === 'gist.ghe.io'
+}
+
+/** Whether or not the given endpoint URI is under the ghe.com domain */
+export const isGHE = (ep: string) => new URL(ep).hostname.endsWith('.ghe.com')
 
 /**
  * Whether or not the given endpoint URI appears to point to a GitHub Enterprise
  * Server instance
  */
-export const isGHES = (ep: string) => !isDotCom(ep) && !isGHAE(ep)
+export const isGHES = (ep: string) => !isDotCom(ep) && !isGHE(ep)
 
-function getEndpointVersion(endpoint: string) {
+export function getEndpointVersion(endpoint: string) {
   const key = endpointVersionKey(endpoint)
   const cached = versionCache.get(key)
 
@@ -104,12 +100,12 @@ export function updateEndpointVersion(endpoint: string, version: string) {
 }
 
 function checkConstraint(
-  epConstraint: string | boolean,
+  epConstraint: string | boolean | undefined,
   epMatchesType: boolean,
   epVersion?: semver.SemVer
 ) {
   // Denial of endpoint type regardless of version
-  if (epConstraint === false) {
+  if (epConstraint === undefined || epConstraint === false) {
     return false
   }
 
@@ -131,32 +127,25 @@ function checkConstraint(
  *       Consumers should use the various `supports*` methods instead.
  */
 export const endpointSatisfies =
-  ({ dotcom, ae, es }: VersionConstraint, getVersion = getEndpointVersion) =>
+  ({ dotcom, ghe, es }: VersionConstraint, getVersion = getEndpointVersion) =>
   (ep: string) =>
     checkConstraint(dotcom, isDotCom(ep)) ||
-    checkConstraint(ae, isGHAE(ep), assumedGHAEVersion) ||
+    checkConstraint(ghe ?? dotcom, isGHE(ep)) ||
     checkConstraint(es, isGHES(ep), getVersion(ep) ?? assumedGHESVersion)
 
 /**
  * Whether or not the endpoint supports the internal GitHub Enterprise Server
  * avatars API
  */
-export const supportsAvatarsAPI = endpointSatisfies({
-  dotcom: false,
-  ae: '>= 3.0.0',
-  es: '>= 3.0.0',
-})
+export const supportsAvatarsAPI = endpointSatisfies({ es: '>= 3.0.0' })
 
 export const supportsRerunningChecks = endpointSatisfies({
   dotcom: true,
-  ae: '>= 3.4.0',
   es: '>= 3.4.0',
 })
 
 export const supportsRerunningIndividualOrFailedChecks = endpointSatisfies({
   dotcom: true,
-  ae: false,
-  es: false,
 })
 
 /**
@@ -165,12 +154,8 @@ export const supportsRerunningIndividualOrFailedChecks = endpointSatisfies({
  */
 export const supportsRetrieveActionWorkflowByCheckSuiteId = endpointSatisfies({
   dotcom: true,
-  ae: false,
-  es: false,
 })
 
-export const supportsAliveSessions = endpointSatisfies({
-  dotcom: true,
-  ae: false,
-  es: false,
-})
+export const supportsAliveSessions = endpointSatisfies({ dotcom: true })
+
+export const supportsRepoRules = endpointSatisfies({ dotcom: true })
diff --git a/app/src/lib/enterprise.ts b/app/src/lib/enterprise.ts
deleted file mode 100644
index 8390cd6e0c4..00000000000
--- a/app/src/lib/enterprise.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * The oldest officially supported version of GitHub Enterprise.
- * This information is used in user-facing text and shouldn't be
- * considered a hard limit, i.e. older versions of GitHub Enterprise
- * might (and probably do) work just fine but this should be a fairly
- * recent version that we can safely say that we'll work well with.
- */
-export const minimumSupportedEnterpriseVersion = '3.0.0'
diff --git a/app/src/lib/fatal-error.ts b/app/src/lib/fatal-error.ts
index 4013b5d8079..72f49755206 100644
--- a/app/src/lib/fatal-error.ts
+++ b/app/src/lib/fatal-error.ts
@@ -14,7 +14,6 @@ export function fatalError(msg: string): never {
  *                  in an exhaustive check.
  *
  * @param message   The message to be used in the runtime exception.
- *
  */
 export function assertNever(x: never, message: string): never {
   throw new Error(message)
diff --git a/app/src/lib/feature-flag.ts b/app/src/lib/feature-flag.ts
index 67d44dacb1b..5bc16eda80b 100644
--- a/app/src/lib/feature-flag.ts
+++ b/app/src/lib/feature-flag.ts
@@ -28,9 +28,20 @@ function enableBetaFeatures(): boolean {
   return enableDevelopmentFeatures() || __RELEASE_CHANNEL__ === 'beta'
 }
 
+/**
+ * Should the app show menu items that are used for testing various parts of the
+ * UI
+ *
+ * For our own testing purposes, this will likely remain enabled. But, sometimes
+ * we may want to create a test release for a user to test a fix in which case
+ * they should not need access to the test menu items.
+ */
+export const enableTestMenuItems = () =>
+  enableDevelopmentFeatures() || __RELEASE_CHANNEL__ === 'test'
+
 /** Should git pass `--recurse-submodules` when performing operations? */
 export function enableRecurseSubmodulesFlag(): boolean {
-  return enableBetaFeatures()
+  return true
 }
 
 export function enableReadmeOverwriteWarning(): boolean {
@@ -42,18 +53,6 @@ export function enableWSLDetection(): boolean {
   return enableBetaFeatures()
 }
 
-/** Should the app show hide whitespace in changes tab */
-export function enableHideWhitespaceInDiffOption(): boolean {
-  return true
-}
-
-/**
- * Should we use the new diff viewer for unified diffs?
- */
-export function enableExperimentalDiffViewer(): boolean {
-  return false
-}
-
 /**
  * Should we allow reporting unhandled rejections as if they were crashes?
  */
@@ -61,11 +60,6 @@ export function enableUnhandledRejectionReporting(): boolean {
   return enableBetaFeatures()
 }
 
-/** Should we allow expanding text diffs? */
-export function enableTextDiffExpansion(): boolean {
-  return true
-}
-
 /**
  * Should we allow x64 apps running under ARM translation to auto-update to
  * ARM64 builds?
@@ -78,76 +72,16 @@ export function enableUpdateFromEmulatedX64ToARM64(): boolean {
   return enableBetaFeatures()
 }
 
-/** Should we allow setting repository aliases? */
-export function enableRepositoryAliases(): boolean {
-  return true
-}
-
-/** Should we allow to create branches from a commit? */
-export function enableBranchFromCommit(): boolean {
-  return true
-}
-
-/** Should we allow squashing? */
-export function enableSquashing(): boolean {
-  return true
-}
-
-/** Should we allow squash-merging? */
-export function enableSquashMerging(): boolean {
-  return true
-}
-
-/** Should we allow amending commits? */
-export function enableAmendingCommits(): boolean {
-  return true
-}
-
-/** Should we allow reordering commits? */
-export function enableCommitReordering(): boolean {
-  return true
-}
-
 /** Should we allow resetting to a previous commit? */
 export function enableResetToCommit(): boolean {
-  return enableDevelopmentFeatures()
-}
-
-/** Should we show line changes (added/deleted) in commits? */
-export function enableLineChangesInCommit(): boolean {
-  return true
-}
-
-/** Should we allow high contrast theme option */
-export function enableHighContrastTheme(): boolean {
-  return enableBetaFeatures()
-}
-
-/** Should we allow customizing a theme */
-export function enableCustomizeTheme(): boolean {
-  return enableBetaFeatures()
-}
-
-/** Should we allow using Windows' OpenSSH? */
-export function enableWindowsOpenSSH(): boolean {
-  return true
-}
-
-/** Should we use SSH askpass? */
-export function enableSSHAskPass(): boolean {
   return true
 }
 
-/** Should we show ci check runs? */
-export function enableCICheckRuns(): boolean {
+/** Should we allow checking out a single commit? */
+export function enableCheckoutCommit(): boolean {
   return true
 }
 
-/** Should ci check runs show logs? */
-export function enableCICheckRunsLogs(): boolean {
-  return false
-}
-
 /** Should we show previous tags as suggestions? */
 export function enablePreviousTagSuggestions(): boolean {
   return enableBetaFeatures()
@@ -158,22 +92,14 @@ export function enablePullRequestQuickView(): boolean {
   return enableDevelopmentFeatures()
 }
 
-/** Should we enable high-signal notifications? */
-export function enableHighSignalNotifications(): boolean {
-  return true
+/** Should we support image previews for dds files? */
+export function enableImagePreviewsForDDSFiles(): boolean {
+  return enableBetaFeatures()
 }
 
-/** Should we enable PR review notifications? */
-export function enablePullRequestReviewNotifications(): boolean {
-  return true
-}
+export const enableCustomIntegration = () => true
 
-/** Should we enable the rerunning of failed and single jobs aka action based checks */
-export function enableReRunFailedAndSingleCheckJobs(): boolean {
-  return true
-}
+export const enableResizingToolbarButtons = () => true
+export const enableGitConfigParameters = enableBetaFeatures
 
-/** Should we enable displaying multi commit diffs. This also switches diff logic from one commit */
-export function enableMultiCommitDiffs(): boolean {
-  return enableDevelopmentFeatures()
-}
+export const enableFilteredChangesList = enableDevelopmentFeatures
diff --git a/app/src/lib/file-system.ts b/app/src/lib/file-system.ts
index e57248578b8..360f20397cd 100644
--- a/app/src/lib/file-system.ts
+++ b/app/src/lib/file-system.ts
@@ -3,7 +3,6 @@ import * as Path from 'path'
 import { Disposable } from 'event-kit'
 import { Tailer } from './tailer'
 import byline from 'byline'
-import * as Crypto from 'crypto'
 import { createReadStream } from 'fs'
 import { mkdtemp } from 'fs/promises'
 
@@ -80,23 +79,3 @@ export async function readPartialFile(
       .on('end', () => resolve(Buffer.concat(chunks, total)))
   })
 }
-
-export async function getFileHash(
-  path: string,
-  type: 'sha1' | 'sha256'
-): Promise<string> {
-  return new Promise((resolve, reject) => {
-    const hash = Crypto.createHash(type)
-    hash.setEncoding('hex')
-    const input = createReadStream(path)
-
-    hash.on('finish', () => {
-      resolve(hash.read() as string)
-    })
-
-    input.on('error', reject)
-    hash.on('error', reject)
-
-    input.pipe(hash)
-  })
-}
diff --git a/app/src/lib/find-account.ts b/app/src/lib/find-account.ts
index 84c12257fde..de6bc675b5c 100644
--- a/app/src/lib/find-account.ts
+++ b/app/src/lib/find-account.ts
@@ -80,7 +80,7 @@ export async function findAccountForRemoteURL(
     // As this needs to be done efficiently, we consider endpoints not matching
     // `getDotComAPIEndpoint()` to be GitHub Enterprise accounts, and accounts
     // without a token to be unauthenticated.
-    const sortedAccounts = Array.from(allAccounts).sort((a1, a2) => {
+    const sortedAccounts = allAccounts.toSorted((a1, a2) => {
       if (a1.endpoint === getDotComAPIEndpoint()) {
         return a1.token.length ? -1 : 1
       } else if (a2.endpoint === getDotComAPIEndpoint()) {
diff --git a/app/src/lib/find-default-branch.ts b/app/src/lib/find-default-branch.ts
new file mode 100644
index 00000000000..0c08347ef0e
--- /dev/null
+++ b/app/src/lib/find-default-branch.ts
@@ -0,0 +1,68 @@
+import { Branch, BranchType } from '../models/branch'
+import {
+  Repository,
+  isForkedRepositoryContributingToParent,
+} from '../models/repository'
+import { getRemoteHEAD } from './git'
+import { getDefaultBranch } from './helpers/default-branch'
+import { UpstreamRemoteName } from './stores/helpers/find-upstream-remote'
+
+/**
+ * Attempts to locate the default branch as determined by the HEAD symbolic link
+ * in the contribution target remote (origin or upstream) if such a ref exists,
+ * falling back to the value of the `init.defaultBranch` configuration and
+ * finally a const value of `main`.
+ *
+ * In determining the default branch we prioritize finding a local branch but if
+ * no local branch matches the default branch name nor is tracking the
+ * contribution target remote HEAD we'll fall back to looking for the remote
+ * branch itself.
+ */
+export async function findDefaultBranch(
+  repository: Repository,
+  branches: ReadonlyArray<Branch>,
+  defaultRemoteName: string | undefined
+) {
+  const remoteName = isForkedRepositoryContributingToParent(repository)
+    ? UpstreamRemoteName
+    : defaultRemoteName
+
+  const remoteHead = remoteName
+    ? await getRemoteHEAD(repository, remoteName)
+    : null
+
+  const defaultBranchName = remoteHead ?? (await getDefaultBranch())
+  const remoteRef = remoteHead ? `${remoteName}/${remoteHead}` : undefined
+
+  let localHit: Branch | undefined = undefined
+  let localTrackingHit: Branch | undefined = undefined
+  let remoteHit: Branch | undefined = undefined
+
+  for (const branch of branches) {
+    if (branch.type === BranchType.Local) {
+      if (branch.name === defaultBranchName) {
+        localHit = branch
+      }
+
+      if (remoteRef && branch.upstream === remoteRef) {
+        // Give preference to local branches that target the upstream
+        // default branch that also match the name. In other words, if there
+        // are two local branches which both track the origin default branch
+        // we'll prefer a branch which is also named the same as the default
+        // branch name.
+        if (!localTrackingHit || branch.name === defaultBranchName) {
+          localTrackingHit = branch
+        }
+      }
+    } else if (remoteRef && branch.name === remoteRef) {
+      remoteHit = branch
+    }
+  }
+
+  // When determining what the default branch is we give priority to local
+  // branches tracking the default branch of the contribution target (think
+  // origin) remote, then we consider local branches that are named the same
+  // as the default branch, and finally we look for the remote branch
+  // representing the default branch of the contribution target
+  return localTrackingHit ?? localHit ?? remoteHit ?? null
+}
diff --git a/app/src/lib/format-duration.ts b/app/src/lib/format-duration.ts
index e36efd8c8a5..6659c46e297 100644
--- a/app/src/lib/format-duration.ts
+++ b/app/src/lib/format-duration.ts
@@ -1,8 +1,14 @@
-export const units: [string, number][] = [
-  ['d', 86400000],
-  ['h', 3600000],
-  ['m', 60000],
-  ['s', 1000],
+type TimeUnitDescriptor = {
+  shortUnit: string
+  longUnit: string
+  ms: number
+}
+
+const units: TimeUnitDescriptor[] = [
+  { shortUnit: 'd', longUnit: 'day', ms: 86400000 },
+  { shortUnit: 'h', longUnit: 'hour', ms: 3600000 },
+  { shortUnit: 'm', longUnit: 'minute', ms: 60000 },
+  { shortUnit: 's', longUnit: 'second', ms: 1000 },
 ]
 
 /**
@@ -17,11 +23,34 @@ export const formatPreciseDuration = (ms: number) => {
   const parts = new Array<string>()
   ms = Math.abs(ms)
 
-  for (const [unit, value] of units) {
-    if (parts.length > 0 || ms >= value || unit === 's') {
-      const qty = Math.floor(ms / value)
-      ms -= qty * value
-      parts.push(`${qty}${unit}`)
+  for (const unit of units) {
+    if (parts.length > 0 || ms >= unit.ms || unit.shortUnit === 's') {
+      const qty = Math.floor(ms / unit.ms)
+      ms -= qty * unit.ms
+      parts.push(`${qty}${unit.shortUnit}`)
+    }
+  }
+
+  return parts.join(' ')
+}
+
+/**
+ * Creates a long style precise duration format used for displaying things
+ * like check run durations that typically only last for a few minutes.
+ *
+ * Example: formatLongPreciseDuration(3670000) -> "1 hour 1 minute 10 seconds"
+ *
+ * @param ms The duration in milliseconds
+ */
+export const formatLongPreciseDuration = (ms: number) => {
+  const parts = new Array<string>()
+  ms = Math.abs(ms)
+
+  for (const unit of units) {
+    if (parts.length > 0 || ms >= unit.ms || unit.shortUnit === 's') {
+      const qty = Math.floor(ms / unit.ms)
+      ms -= qty * unit.ms
+      parts.push(`${qty} ${unit.longUnit}${qty === 1 ? '' : 's'}`)
     }
   }
 
diff --git a/app/src/lib/generic-git-auth.ts b/app/src/lib/generic-git-auth.ts
index c234d70fb31..4eb5344f34f 100644
--- a/app/src/lib/generic-git-auth.ts
+++ b/app/src/lib/generic-git-auth.ts
@@ -1,45 +1,49 @@
-import * as URL from 'url'
-import { parseRemote } from './remote-parsing'
 import { getKeyForEndpoint } from './auth'
 import { TokenStore } from './stores/token-store'
 
-/** Get the hostname to use for the given remote. */
-export function getGenericHostname(remoteURL: string): string {
-  const parsed = parseRemote(remoteURL)
-  if (parsed) {
-    return parsed.hostname
-  }
+export const genericGitAuthUsernameKeyPrefix = 'genericGitAuth/username/'
 
-  const urlHostname = URL.parse(remoteURL).hostname
-  if (urlHostname) {
-    return urlHostname
-  }
-
-  return remoteURL
-}
-
-function getKeyForUsername(hostname: string): string {
-  return `genericGitAuth/username/${hostname}`
+function getKeyForUsername(endpoint: string): string {
+  return `${genericGitAuthUsernameKeyPrefix}${endpoint}`
 }
 
 /** Get the username for the host. */
-export function getGenericUsername(hostname: string): string | null {
-  const key = getKeyForUsername(hostname)
+export function getGenericUsername(endpoint: string): string | null {
+  const key = getKeyForUsername(endpoint)
   return localStorage.getItem(key)
 }
 
 /** Set the username for the host. */
-export function setGenericUsername(hostname: string, username: string) {
-  const key = getKeyForUsername(hostname)
+export function setGenericUsername(endpoint: string, username: string) {
+  const key = getKeyForUsername(endpoint)
   return localStorage.setItem(key, username)
 }
 
 /** Set the password for the username and host. */
 export function setGenericPassword(
-  hostname: string,
+  endpoint: string,
   username: string,
   password: string
 ): Promise<void> {
-  const key = getKeyForEndpoint(hostname)
+  const key = getKeyForEndpoint(endpoint)
   return TokenStore.setItem(key, username, password)
 }
+
+export function setGenericCredential(
+  endpoint: string,
+  username: string,
+  password: string
+) {
+  setGenericUsername(endpoint, username)
+  return setGenericPassword(endpoint, username, password)
+}
+
+/** Get the password for the given username and host. */
+export const getGenericPassword = (endpoint: string, username: string) =>
+  TokenStore.getItem(getKeyForEndpoint(endpoint), username)
+
+/** Delete a generic credential */
+export function deleteGenericCredential(endpoint: string, username: string) {
+  localStorage.removeItem(getKeyForUsername(endpoint))
+  return TokenStore.deleteItem(getKeyForEndpoint(endpoint), username)
+}
diff --git a/app/src/lib/get-file-hash.ts b/app/src/lib/get-file-hash.ts
new file mode 100644
index 00000000000..f7da29909a8
--- /dev/null
+++ b/app/src/lib/get-file-hash.ts
@@ -0,0 +1,15 @@
+import { createHash } from 'crypto'
+import { createReadStream } from 'fs'
+
+/**
+ * Calculates the hex encoded hash digest of a given file on disk.
+ */
+export const getFileHash = (path: string, type: 'sha1' | 'sha256') =>
+  new Promise<string>((resolve, reject) => {
+    const hash = createHash(type)
+
+    hash.on('finish', () => resolve(hash.digest('hex')))
+    hash.on('error', reject)
+
+    createReadStream(path).on('error', reject).pipe(hash)
+  })
diff --git a/app/src/lib/get-os.ts b/app/src/lib/get-os.ts
index 9d59260ff68..b8d55bffd43 100644
--- a/app/src/lib/get-os.ts
+++ b/app/src/lib/get-os.ts
@@ -27,7 +27,7 @@ function systemVersionLessThan(version: string) {
 }
 
 /** Get the OS we're currently running on. */
-export function getOS() {
+export function getOS(): string {
   const version = getSystemVersionSafe()
   if (__DARWIN__) {
     return `Mac OS ${version}`
@@ -38,6 +38,30 @@ export function getOS() {
   }
 }
 
+/** We're currently running macOS and it is macOS Ventura. */
+export const isMacOSVentura = memoizeOne(
+  () =>
+    __DARWIN__ &&
+    systemVersionGreaterThanOrEqualTo('13.0') &&
+    systemVersionLessThan('14.0')
+)
+
+/** We're currently running macOS and it is macOS Sonoma. */
+export const isMacOSSonoma = memoizeOne(
+  () =>
+    __DARWIN__ &&
+    systemVersionGreaterThanOrEqualTo('14.0') &&
+    systemVersionLessThan('15.0')
+)
+
+/** We're currently running macOS and it is macOS Sequoia. */
+export const isMacOSSequoia = memoizeOne(
+  () =>
+    __DARWIN__ &&
+    systemVersionGreaterThanOrEqualTo('15.0') &&
+    systemVersionLessThan('16.0')
+)
+
 /** We're currently running macOS and it is macOS Catalina or earlier. */
 export const isMacOSCatalinaOrEarlier = memoizeOne(
   () => __DARWIN__ && systemVersionLessThan('10.16')
@@ -59,3 +83,17 @@ export const isMacOSBigSurOrLater = memoizeOne(
 export const isWindows10And1809Preview17666OrLater = memoizeOne(
   () => __WIN32__ && systemVersionGreaterThanOrEqualTo('10.0.17666')
 )
+
+export const isWindowsAndNoLongerSupportedByElectron = memoizeOne(
+  () => __WIN32__ && systemVersionLessThan('10')
+)
+
+export const isMacOSAndNoLongerSupportedByElectron = memoizeOne(
+  () => __DARWIN__ && systemVersionLessThan('10.15')
+)
+
+export const isOSNoLongerSupportedByElectron = memoizeOne(
+  () =>
+    isMacOSAndNoLongerSupportedByElectron() ||
+    isWindowsAndNoLongerSupportedByElectron()
+)
diff --git a/app/src/lib/get-updater-guid.ts b/app/src/lib/get-updater-guid.ts
new file mode 100644
index 00000000000..0468e273c93
--- /dev/null
+++ b/app/src/lib/get-updater-guid.ts
@@ -0,0 +1,25 @@
+import { app } from 'electron'
+import { readFile, writeFile } from 'fs/promises'
+import { join } from 'path'
+import { uuid } from './uuid'
+
+let cachedGUID: string | undefined = undefined
+
+const getUpdateGUIDPath = () => join(app.getPath('userData'), '.update-id')
+const writeUpdateGUID = (id: string) =>
+  writeFile(getUpdateGUIDPath(), id).then(() => id)
+
+export const getUpdaterGUID = async () => {
+  return (
+    cachedGUID ??
+    readFile(getUpdateGUIDPath(), 'utf8')
+      .then(id => id.trim())
+      .then(id => (id.length === 36 ? id : writeUpdateGUID(uuid())))
+      .catch(() => writeUpdateGUID(uuid()))
+      .catch(e => {
+        log.error(`Could not read update id`, e)
+        return undefined
+      })
+      .then(id => (cachedGUID = id))
+  )
+}
diff --git a/app/src/lib/git/apply.ts b/app/src/lib/git/apply.ts
index 85467312822..bf3680cce19 100644
--- a/app/src/lib/git/apply.ts
+++ b/app/src/lib/git/apply.ts
@@ -64,6 +64,7 @@ export async function applyPatchToIndex(
     const { kind } = diff
     switch (diff.kind) {
       case DiffType.Binary:
+      case DiffType.Submodule:
       case DiffType.Image:
         throw new Error(
           `Can't create partial commit in binary file: ${file.path}`
diff --git a/app/src/lib/git/authentication.ts b/app/src/lib/git/authentication.ts
index 59d2b0f71b0..a6961d18a62 100644
--- a/app/src/lib/git/authentication.ts
+++ b/app/src/lib/git/authentication.ts
@@ -1,24 +1,13 @@
 import { GitError as DugiteError } from 'dugite'
-import { IGitAccount } from '../../models/git-account'
 
 /** Get the environment for authenticating remote operations. */
-export function envForAuthentication(auth: IGitAccount | null): Object {
-  const env = {
+export function envForAuthentication(): Record<string, string | undefined> {
+  return {
     // supported since Git 2.3, this is used to ensure we never interactively prompt
     // for credentials - even as a fallback
     GIT_TERMINAL_PROMPT: '0',
     GIT_TRACE: localStorage.getItem('git-trace') || '0',
   }
-
-  if (!auth) {
-    return env
-  }
-
-  return {
-    ...env,
-    DESKTOP_USERNAME: auth.login,
-    DESKTOP_ENDPOINT: auth.endpoint,
-  }
 }
 
 /** The set of errors which fit under the "authentication failed" umbrella. */
diff --git a/app/src/lib/git/branch.ts b/app/src/lib/git/branch.ts
index 936c792191a..d1988ee3d0c 100644
--- a/app/src/lib/git/branch.ts
+++ b/app/src/lib/git/branch.ts
@@ -1,16 +1,12 @@
-import { git, gitNetworkArguments } from './core'
+import { git } from './core'
 import { Repository } from '../../models/repository'
 import { Branch } from '../../models/branch'
-import { IGitAccount } from '../../models/git-account'
 import { formatAsLocalRef } from './refs'
 import { deleteRef } from './update-ref'
 import { GitError as DugiteError } from 'dugite'
-import { getRemoteURL } from './remote'
-import {
-  envForRemoteOperation,
-  getFallbackUrlForProxyResolve,
-} from './environment'
+import { envForRemoteOperation } from './environment'
 import { createForEachRefParser } from './git-delimiter-parser'
+import { IRemote } from '../../models/remote'
 
 /**
  * Create a new branch from the given start point.
@@ -72,30 +68,15 @@ export async function deleteLocalBranch(
  */
 export async function deleteRemoteBranch(
   repository: Repository,
-  account: IGitAccount | null,
-  remoteName: string,
+  remote: IRemote,
   remoteBranchName: string
 ): Promise<true> {
-  const remoteUrl =
-    (await getRemoteURL(repository, remoteName).catch(err => {
-      // If we can't get the URL then it's very unlikely Git will be able to
-      // either and the push will fail. The URL is only used to resolve the
-      // proxy though so it's not critical.
-      log.error(`Could not resolve remote url for remote ${remoteName}`, err)
-      return null
-    })) || getFallbackUrlForProxyResolve(account, repository)
-
-  const args = [
-    ...gitNetworkArguments(),
-    'push',
-    remoteName,
-    `:${remoteBranchName}`,
-  ]
+  const args = ['push', remote.name, `:${remoteBranchName}`]
 
   // If the user is not authenticated, the push is going to fail
   // Let this propagate and leave it to the caller to handle
   const result = await git(args, repository.path, 'deleteRemoteBranch', {
-    env: await envForRemoteOperation(account, remoteUrl),
+    env: await envForRemoteOperation(remote.url),
     expectedErrors: new Set<DugiteError>([DugiteError.BranchDeletionFailed]),
   })
 
@@ -104,7 +85,7 @@ export async function deleteRemoteBranch(
   // error we can safely remove our remote ref which is what would
   // happen if the push didn't fail.
   if (result.gitError === DugiteError.BranchDeletionFailed) {
-    const ref = `refs/remotes/${remoteName}/${remoteBranchName}`
+    const ref = `refs/remotes/${remote.name}/${remoteBranchName}`
     await deleteRef(repository, ref)
   }
 
diff --git a/app/src/lib/git/checkout.ts b/app/src/lib/git/checkout.ts
index 5ffbdc46f3c..7a026ccd80e 100644
--- a/app/src/lib/git/checkout.ts
+++ b/app/src/lib/git/checkout.ts
@@ -1,8 +1,7 @@
-import { git, IGitExecutionOptions, gitNetworkArguments } from './core'
+import { git, IGitStringExecutionOptions } from './core'
 import { Repository } from '../../models/repository'
 import { Branch, BranchType } from '../../models/branch'
 import { ICheckoutProgress } from '../../models/progress'
-import { IGitAccount } from '../../models/git-account'
 import {
   CheckoutProgressParser,
   executionOptionsWithProgress,
@@ -15,35 +14,74 @@ import {
 } from './environment'
 import { WorkingDirectoryFileChange } from '../../models/status'
 import { ManualConflictResolution } from '../../models/manual-conflict-resolution'
+import { CommitOneLine, shortenSHA } from '../../models/commit'
+import { IRemote } from '../../models/remote'
 
 export type ProgressCallback = (progress: ICheckoutProgress) => void
 
-async function getCheckoutArgs(
+function getCheckoutArgs(progressCallback?: ProgressCallback) {
+  return ['checkout', ...(progressCallback ? ['--progress'] : [])]
+}
+
+async function getBranchCheckoutArgs(branch: Branch) {
+  return [
+    branch.name,
+    ...(branch.type === BranchType.Remote
+      ? ['-b', branch.nameWithoutRemote]
+      : []),
+    ...(enableRecurseSubmodulesFlag() ? ['--recurse-submodules'] : []),
+    '--',
+  ]
+}
+
+async function getCheckoutOpts(
   repository: Repository,
-  branch: Branch,
-  account: IGitAccount | null,
-  progressCallback?: ProgressCallback
-) {
-  const baseArgs =
-    progressCallback != null
-      ? [...gitNetworkArguments(), 'checkout', '--progress']
-      : [...gitNetworkArguments(), 'checkout']
-
-  if (enableRecurseSubmodulesFlag()) {
-    return branch.type === BranchType.Remote
-      ? baseArgs.concat(
-          branch.name,
-          '-b',
-          branch.nameWithoutRemote,
-          '--recurse-submodules',
-          '--'
-        )
-      : baseArgs.concat(branch.name, '--recurse-submodules', '--')
-  } else {
-    return branch.type === BranchType.Remote
-      ? baseArgs.concat(branch.name, '-b', branch.nameWithoutRemote, '--')
-      : baseArgs.concat(branch.name, '--')
+  title: string,
+  target: string,
+  currentRemote: IRemote | null,
+  progressCallback?: ProgressCallback,
+  initialDescription?: string
+): Promise<IGitStringExecutionOptions> {
+  const opts: IGitStringExecutionOptions = {
+    env: await envForRemoteOperation(
+      getFallbackUrlForProxyResolve(repository, currentRemote)
+    ),
+    expectedErrors: AuthenticationErrors,
   }
+
+  if (!progressCallback) {
+    return opts
+  }
+
+  const kind = 'checkout'
+
+  // Initial progress
+  progressCallback({
+    kind,
+    title,
+    description: initialDescription ?? title,
+    value: 0,
+    target,
+  })
+
+  return await executionOptionsWithProgress(
+    { ...opts, trackLFSProgress: true },
+    new CheckoutProgressParser(),
+    progress => {
+      if (progress.kind === 'progress') {
+        const description = progress.details.text
+        const value = progress.percent
+
+        progressCallback({
+          kind,
+          title,
+          description,
+          value,
+          target,
+        })
+      }
+    }
+  )
 }
 
 /**
@@ -62,48 +100,63 @@ async function getCheckoutArgs(
  */
 export async function checkoutBranch(
   repository: Repository,
-  account: IGitAccount | null,
   branch: Branch,
+  currentRemote: IRemote | null,
   progressCallback?: ProgressCallback
 ): Promise<true> {
-  let opts: IGitExecutionOptions = {
-    env: await envForRemoteOperation(
-      account,
-      getFallbackUrlForProxyResolve(account, repository)
-    ),
-    expectedErrors: AuthenticationErrors,
-  }
+  const opts = await getCheckoutOpts(
+    repository,
+    `Checking out branch ${branch.name}`,
+    branch.name,
+    currentRemote,
+    progressCallback,
+    `Switching to ${__DARWIN__ ? 'Branch' : 'branch'}`
+  )
 
-  if (progressCallback) {
-    const title = `Checking out branch ${branch.name}`
-    const kind = 'checkout'
-    const targetBranch = branch.name
-
-    opts = await executionOptionsWithProgress(
-      { ...opts, trackLFSProgress: true },
-      new CheckoutProgressParser(),
-      progress => {
-        if (progress.kind === 'progress') {
-          const description = progress.details.text
-          const value = progress.percent
-
-          progressCallback({ kind, title, description, value, targetBranch })
-        }
-      }
-    )
+  const baseArgs = getCheckoutArgs(progressCallback)
+  const args = [...baseArgs, ...(await getBranchCheckoutArgs(branch))]
 
-    // Initial progress
-    progressCallback({ kind, title, value: 0, targetBranch })
-  }
+  await git(args, repository.path, 'checkoutBranch', opts)
+
+  // we return `true` here so `GitStore.performFailableGitOperation`
+  // will return _something_ differentiable from `undefined` if this succeeds
+  return true
+}
 
-  const args = await getCheckoutArgs(
+/**
+ * Check out the given commit.
+ * Literally invokes `git checkout <commit SHA>`.
+ *
+ * @param repository - The repository in which the branch checkout should
+ *                     take place
+ *
+ * @param commit     - The commit that should be checked out
+ *
+ * @param progressCallback - An optional function which will be invoked
+ *                           with information about the current progress
+ *                           of the checkout operation. When provided this
+ *                           enables the '--progress' command line flag for
+ *                           'git checkout'.
+ */
+export async function checkoutCommit(
+  repository: Repository,
+  commit: CommitOneLine,
+  currentRemote: IRemote | null,
+  progressCallback?: ProgressCallback
+): Promise<true> {
+  const title = `Checking out ${__DARWIN__ ? 'Commit' : 'commit'}`
+  const opts = await getCheckoutOpts(
     repository,
-    branch,
-    account,
+    title,
+    shortenSHA(commit.sha),
+    currentRemote,
     progressCallback
   )
 
-  await git(args, repository.path, 'checkoutBranch', opts)
+  const baseArgs = getCheckoutArgs(progressCallback)
+  const args = [...baseArgs, commit.sha]
+
+  await git(args, repository.path, 'checkoutCommit', opts)
 
   // we return `true` here so `GitStore.performFailableGitOperation`
   // will return _something_ differentiable from `undefined` if this succeeds
diff --git a/app/src/lib/git/cherry-pick.ts b/app/src/lib/git/cherry-pick.ts
index 2ddacd68053..b1ef16800d8 100644
--- a/app/src/lib/git/cherry-pick.ts
+++ b/app/src/lib/git/cherry-pick.ts
@@ -5,7 +5,12 @@ import {
   AppFileStatusKind,
   WorkingDirectoryFileChange,
 } from '../../models/status'
-import { git, IGitExecutionOptions, IGitResult } from './core'
+import {
+  git,
+  IGitExecutionOptions,
+  IGitResult,
+  IGitStringExecutionOptions,
+} from './core'
 import { getStatus } from './status'
 import { stageFiles } from './update-index'
 import { getCommitsInRange, revRange } from './rev-list'
@@ -101,8 +106,8 @@ class GitCherryPickParser {
  * @param progressCallback - the callback method that accepts an
  * `ICherryPickProgress` instance created by the parser
  */
-function configureOptionsWithCallBack(
-  baseOptions: IGitExecutionOptions,
+function configureOptionsWithCallBack<T extends IGitExecutionOptions>(
+  baseOptions: T,
   commits: readonly CommitOneLine[],
   progressCallback: (progress: IMultiCommitOperationProgress) => void,
   cherryPickedCount: number = 0
@@ -142,7 +147,7 @@ export async function cherryPick(
     return CherryPickResult.UnableToStart
   }
 
-  let baseOptions: IGitExecutionOptions = {
+  let baseOptions: IGitStringExecutionOptions = {
     expectedErrors: new Set([
       GitError.MergeConflicts,
       GitError.ConflictModifyDeletedInBranch,
@@ -157,7 +162,7 @@ export async function cherryPick(
     )
   }
 
-  // --keep-redundant-commits follows pattern of making sure someone cherry
+  // --empty=keep follows pattern of making sure someone cherry
   //  picked commit summaries appear in target branch history even tho they may
   //  be empty. This flag also results in the ability to cherry pick empty
   //  commits (thus, --allow-empty is not required.)
@@ -167,12 +172,7 @@ export async function cherryPick(
   //  there could be multiple empty commits. I.E. If user does a range that
   //  includes commits from that merge.
   const result = await git(
-    [
-      'cherry-pick',
-      ...commits.map(c => c.sha),
-      '--keep-redundant-commits',
-      '-m 1',
-    ],
+    ['cherry-pick', ...commits.map(c => c.sha), '--empty=keep', '-m 1'],
     repository.path,
     'cherry-pick',
     baseOptions
@@ -401,7 +401,7 @@ export async function continueCherryPick(
   const otherFiles = trackedFiles.filter(f => !manualResolutions.has(f.path))
   await stageFiles(repository, otherFiles)
 
-  const status = await getStatus(repository)
+  const status = await getStatus(repository, false)
   if (status == null) {
     log.warn(
       `[continueCherryPick] unable to get status after staging changes,
@@ -415,7 +415,7 @@ export async function continueCherryPick(
     return CherryPickResult.UnableToStart
   }
 
-  let options: IGitExecutionOptions = {
+  let options: IGitStringExecutionOptions = {
     expectedErrors: new Set([
       GitError.MergeConflicts,
       GitError.ConflictModifyDeletedInBranch,
@@ -465,12 +465,8 @@ export async function continueCherryPick(
     return parseCherryPickResult(result)
   }
 
-  // --keep-redundant-commits follows pattern of making sure someone cherry
-  //  picked commit summaries appear in target branch history even tho they may
-  //  be empty. This flag also results in the ability to cherry pick empty
-  //  commits (thus, --allow-empty is not required.)
   const result = await git(
-    ['cherry-pick', '--continue', '--keep-redundant-commits'],
+    ['cherry-pick', '--continue'],
     repository.path,
     'continueCherryPick',
     options
diff --git a/app/src/lib/git/clone.ts b/app/src/lib/git/clone.ts
index e05a2bf151e..954f85cc078 100644
--- a/app/src/lib/git/clone.ts
+++ b/app/src/lib/git/clone.ts
@@ -1,4 +1,4 @@
-import { git, IGitExecutionOptions, gitNetworkArguments } from './core'
+import { git, IGitStringExecutionOptions } from './core'
 import { ICloneProgress } from '../../models/progress'
 import { CloneOptions } from '../../models/clone-options'
 import { CloneProgressParser, executionOptionsWithProgress } from '../progress'
@@ -23,7 +23,6 @@ import { envForRemoteOperation } from './environment'
  *                           of the clone operation. When provided this enables
  *                           the '--progress' command line flag for
  *                           'git clone'.
- *
  */
 export async function clone(
   url: string,
@@ -31,19 +30,21 @@ export async function clone(
   options: CloneOptions,
   progressCallback?: (progress: ICloneProgress) => void
 ): Promise<void> {
-  const env = await envForRemoteOperation(options.account, url)
+  const env = {
+    ...(await envForRemoteOperation(url)),
+    GIT_CLONE_PROTECTION_ACTIVE: 'false',
+  }
 
   const defaultBranch = options.defaultBranch ?? (await getDefaultBranch())
 
   const args = [
-    ...gitNetworkArguments(),
     '-c',
     `init.defaultBranch=${defaultBranch}`,
     'clone',
     '--recursive',
   ]
 
-  let opts: IGitExecutionOptions = { env }
+  let opts: IGitStringExecutionOptions = { env }
 
   if (progressCallback) {
     args.push('--progress')
diff --git a/app/src/lib/git/config.ts b/app/src/lib/git/config.ts
index 2041dac7e62..08519747d03 100644
--- a/app/src/lib/git/config.ts
+++ b/app/src/lib/git/config.ts
@@ -28,6 +28,31 @@ export function getGlobalConfigValue(
   return getConfigValueInPath(name, null, false, undefined, env)
 }
 
+/**
+ * Look up a config value by name.
+ *
+ * Treats the returned value as a boolean as per Git's
+ * own definition of a boolean configuration value (i.e.
+ * 0 -> false, "off" -> false, "yes" -> true etc)
+ */
+export async function getBooleanConfigValue(
+  repository: Repository,
+  name: string,
+  onlyLocal: boolean = false,
+  env?: {
+    HOME: string
+  }
+): Promise<boolean | null> {
+  const value = await getConfigValueInPath(
+    name,
+    repository.path,
+    onlyLocal,
+    'bool',
+    env
+  )
+  return value === null ? null : value !== 'false'
+}
+
 /**
  * Look up a global config value by name.
  *
@@ -97,34 +122,21 @@ async function getConfigValueInPath(
   return pieces[0]
 }
 
-/** Get the path to the global git config. */
-export async function getGlobalConfigPath(env?: {
-  HOME: string
-}): Promise<string | null> {
-  const options = env ? { env } : undefined
-  const result = await git(
-    ['config', '--global', '--list', '--show-origin', '--name-only', '-z'],
-    __dirname,
-    'getGlobalConfigPath',
-    options
-  )
-  const segments = result.stdout.split('\0')
-  if (segments.length < 1) {
-    return null
-  }
-
-  const pathSegment = segments[0]
-  if (!pathSegment.length) {
-    return null
-  }
-
-  const path = pathSegment.match(/file:(.+)/i)
-  if (!path || path.length < 2) {
-    return null
-  }
-
-  return normalize(path[1])
-}
+/**
+ * Get the path to the global git config
+ *
+ * Note: this uses git config --edit which will automatically create the global
+ * config file if it doesn't exist yet. The primary purpose behind this method
+ * is to support opening the global git config for editing.
+ */
+export const getGlobalConfigPath = (env?: { HOME: string }) =>
+  git(['config', '--edit', '--global'], __dirname, 'getGlobalConfigPath', {
+    // We're using printf instead of echo because echo could attempt to decode
+    // escape sequences like \n which would be bad in a case like
+    // c:\Users\niik\.gitconfig
+    //         ^^
+    env: { ...env, GIT_EDITOR: 'printf %s' },
+  }).then(x => normalize(x.stdout))
 
 /** Set the local config value by name. */
 export async function setConfigValue(
diff --git a/app/src/lib/git/core.ts b/app/src/lib/git/core.ts
index a3756b44d35..ace69eb88da 100644
--- a/app/src/lib/git/core.ts
+++ b/app/src/lib/git/core.ts
@@ -1,20 +1,41 @@
 import {
-  GitProcess,
-  IGitResult as DugiteResult,
+  exec,
   GitError as DugiteError,
+  parseError,
+  IGitResult as DugiteResult,
   IGitExecutionOptions as DugiteExecutionOptions,
+  parseBadConfigValueErrorInfo,
+  ExecError,
 } from 'dugite'
 
 import { assertNever } from '../fatal-error'
 import * as GitPerf from '../../ui/lib/git-perf'
 import * as Path from 'path'
 import { isErrnoException } from '../errno-exception'
-import { ChildProcess } from 'child_process'
-import { Readable } from 'stream'
-import split2 from 'split2'
-import { getFileFromExceedsError } from '../helpers/regex'
 import { merge } from '../merge'
 import { withTrampolineEnv } from '../trampoline/trampoline-environment'
+import { createTailStream } from './create-tail-stream'
+import { createTerminalStream } from '../create-terminal-stream'
+import { kStringMaxLength } from 'buffer'
+
+export const coerceToString = (
+  value: string | Buffer,
+  encoding: BufferEncoding = 'utf8'
+) => (Buffer.isBuffer(value) ? value.toString(encoding) : value)
+
+export const coerceToBuffer = (
+  value: string | Buffer,
+  encoding: BufferEncoding = 'utf8'
+) => (Buffer.isBuffer(value) ? value : Buffer.from(value, encoding))
+
+export const isMaxBufferExceededError = (
+  error: unknown
+): error is ExecError & { code: 'ERR_CHILD_PROCESS_STDIO_MAXBUFFER' } => {
+  return (
+    error instanceof ExecError &&
+    error.code === 'ERR_CHILD_PROCESS_STDIO_MAXBUFFER'
+  )
+}
 
 /**
  * An extension of the execution options in dugite that
@@ -37,6 +58,12 @@ export interface IGitExecutionOptions extends DugiteExecutionOptions {
 
   /** Should it track & report LFS progress? */
   readonly trackLFSProgress?: boolean
+
+  /**
+   * Whether the command about to run is part of a background task or not.
+   * This affects error handling and UI such as credential prompts.
+   */
+  readonly isBackgroundTask?: boolean
 }
 
 /**
@@ -54,9 +81,6 @@ export interface IGitResult extends DugiteResult {
   /** The human-readable error description, based on `gitError`. */
   readonly gitErrorDescription: string | null
 
-  /** Both stdout and stderr combined. */
-  readonly combinedOutput: string
-
   /**
    * The path that the Git command was executed from, i.e. the
    * process working directory (not to be confused with the Git
@@ -64,6 +88,33 @@ export interface IGitResult extends DugiteResult {
    */
   readonly path: string
 }
+
+/** The result of shelling out to git using a string encoding (default) */
+export interface IGitStringResult extends IGitResult {
+  /** The standard output from git. */
+  readonly stdout: string
+
+  /** The standard error output from git. */
+  readonly stderr: string
+}
+
+export interface IGitStringExecutionOptions extends IGitExecutionOptions {
+  readonly encoding?: BufferEncoding
+}
+
+export interface IGitBufferExecutionOptions extends IGitExecutionOptions {
+  readonly encoding: 'buffer'
+}
+
+/** The result of shelling out to git using a buffer encoding */
+export interface IGitBufferResult extends IGitResult {
+  /** The standard output from git. */
+  readonly stdout: Buffer
+
+  /** The standard error output from git. */
+  readonly stderr: Buffer
+}
+
 export class GitError extends Error {
   /** The result from the failed command. */
   public readonly result: IGitResult
@@ -76,21 +127,25 @@ export class GitError extends Error {
    */
   public readonly isRawMessage: boolean
 
-  public constructor(result: IGitResult, args: ReadonlyArray<string>) {
+  public constructor(
+    result: IGitResult,
+    args: ReadonlyArray<string>,
+    terminalOutput: string
+  ) {
     let rawMessage = true
     let message
 
     if (result.gitErrorDescription) {
       message = result.gitErrorDescription
       rawMessage = false
-    } else if (result.combinedOutput.length > 0) {
-      message = result.combinedOutput
+    } else if (terminalOutput.length > 0) {
+      message = terminalOutput
     } else if (result.stderr.length) {
-      message = result.stderr
+      message = coerceToString(result.stderr)
     } else if (result.stdout.length) {
-      message = result.stdout
+      message = coerceToString(result.stdout)
     } else {
-      message = 'Unknown error'
+      message = `Unknown error (exit code ${result.exitCode})`
       rawMessage = false
     }
 
@@ -103,6 +158,16 @@ export class GitError extends Error {
   }
 }
 
+export const isGitError = (
+  e: unknown,
+  parsedError?: DugiteError
+): e is GitError => {
+  return (
+    e instanceof GitError &&
+    (parsedError === undefined || e.result.gitError === parsedError)
+  )
+}
+
 /**
  * Shell out to git with the given arguments, at the given path.
  *
@@ -122,6 +187,18 @@ export class GitError extends Error {
  * `successExitCodes` or an error not in `expectedErrors`, a `GitError` will be
  * thrown.
  */
+export async function git(
+  args: string[],
+  path: string,
+  name: string,
+  options?: IGitStringExecutionOptions
+): Promise<IGitStringResult>
+export async function git(
+  args: string[],
+  path: string,
+  name: string,
+  options?: IGitBufferExecutionOptions
+): Promise<IGitBufferResult>
 export async function git(
   args: string[],
   path: string,
@@ -131,121 +208,135 @@ export async function git(
   const defaultOptions: IGitExecutionOptions = {
     successExitCodes: new Set([0]),
     expectedErrors: new Set(),
+    maxBuffer: options?.encoding === 'buffer' ? Infinity : kStringMaxLength,
   }
 
-  let combinedOutput = ''
-  const opts = {
-    ...defaultOptions,
-    ...options,
-  }
-
-  opts.processCallback = (process: ChildProcess) => {
+  const opts = { ...defaultOptions, ...options }
+
+  // The combined contents of stdout and stderr with some light processing
+  // applied to remove redundant lines caused by Git's use of `\r` to "erase"
+  // the current line while writing progress output. See createTerminalOutput.
+  //
+  // Note: The output is capped at a maximum of 256kb and the sole intent of
+  // this property is to provide "terminal-like" output to the user when a Git
+  // command fails.
+  let terminalOutput = ''
+
+  // Keep at most 256kb of combined stderr and stdout output. This is used
+  // to provide more context in error messages.
+  opts.processCallback = process => {
+    const terminalStream = createTerminalStream()
+    const tailStream = createTailStream(256 * 1024, { encoding: 'utf8' })
+
+    terminalStream
+      .pipe(tailStream)
+      .on('data', (data: string) => (terminalOutput = data))
+      .on('error', e => log.error(`Terminal output error`, e))
+
+    process.stdout?.pipe(terminalStream, { end: false })
+    process.stderr?.pipe(terminalStream, { end: false })
+    process.on('close', () => terminalStream.end())
     options?.processCallback?.(process)
-
-    const combineOutput = (readable: Readable | null) => {
-      if (readable) {
-        readable.pipe(split2()).on('data', (line: string) => {
-          combinedOutput += line + '\n'
-        })
-      }
-    }
-
-    combineOutput(process.stderr)
-    combineOutput(process.stdout)
   }
 
-  return withTrampolineEnv(async env => {
-    const combinedEnv = merge(opts.env, env)
-
-    // Explicitly set TERM to 'dumb' so that if Desktop was launched
-    // from a terminal or if the system environment variables
-    // have TERM set Git won't consider us as a smart terminal.
-    // See https://github.com/git/git/blob/a7312d1a2/editor.c#L11-L15
-    opts.env = { TERM: 'dumb', ...combinedEnv } as Object
-
-    const commandName = `${name}: git ${args.join(' ')}`
-
-    const result = await GitPerf.measure(commandName, () =>
-      GitProcess.exec(args, path, opts)
-    ).catch(err => {
-      // If this is an exception thrown by Node.js (as opposed to
-      // dugite) let's keep the salient details but include the name of
-      // the operation.
-      if (isErrnoException(err)) {
-        throw new Error(`Failed to execute ${name}: ${err.code}`)
+  return withTrampolineEnv(
+    async env => {
+      const combinedEnv = merge(opts.env, env)
+
+      // Explicitly set TERM to 'dumb' so that if Desktop was launched
+      // from a terminal or if the system environment variables
+      // have TERM set Git won't consider us as a smart terminal.
+      // See https://github.com/git/git/blob/a7312d1a2/editor.c#L11-L15
+      opts.env = { TERM: 'dumb', ...combinedEnv }
+
+      const commandName = `${name}: git ${args.join(' ')}`
+
+      const result = await GitPerf.measure(commandName, () =>
+        exec(args, path, opts)
+      ).catch(err => {
+        // If this is an exception thrown by Node.js (as opposed to
+        // dugite) let's keep the salient details but include the name of
+        // the operation.
+        if (isErrnoException(err)) {
+          throw new Error(`Failed to execute ${name}: ${err.code}`)
+        }
+
+        if (isMaxBufferExceededError(err)) {
+          throw new ExecError(
+            `${err.message} for ${name}`,
+            err.stdout,
+            err.stderr,
+            // Dugite stores the original Node error in the cause property, by
+            // passing that along we ensure that all we're doing here is
+            // changing the error message (and capping the stack but that's
+            // okay since we know exactly where this error is coming from).
+            // The null coalescing here is a safety net in case dugite's
+            // behavior changes from underneath us.
+            err.cause ?? err
+          )
+        }
+
+        throw err
+      })
+
+      const exitCode = result.exitCode
+
+      let gitError: DugiteError | null = null
+      const acceptableExitCode = opts.successExitCodes
+        ? opts.successExitCodes.has(exitCode)
+        : false
+      if (!acceptableExitCode) {
+        gitError = parseError(coerceToString(result.stderr))
+        if (gitError === null) {
+          gitError = parseError(coerceToString(result.stdout))
+        }
       }
 
-      throw err
-    })
-
-    const exitCode = result.exitCode
-
-    let gitError: DugiteError | null = null
-    const acceptableExitCode = opts.successExitCodes
-      ? opts.successExitCodes.has(exitCode)
-      : false
-    if (!acceptableExitCode) {
-      gitError = GitProcess.parseError(result.stderr)
-      if (!gitError) {
-        gitError = GitProcess.parseError(result.stdout)
+      const gitErrorDescription =
+        gitError !== null
+          ? getDescriptionForError(gitError, coerceToString(result.stderr))
+          : null
+      const gitResult = {
+        ...result,
+        gitError,
+        gitErrorDescription,
+        path,
       }
-    }
-
-    const gitErrorDescription = gitError
-      ? getDescriptionForError(gitError)
-      : null
-    const gitResult = {
-      ...result,
-      gitError,
-      gitErrorDescription,
-      combinedOutput,
-      path,
-    }
-
-    let acceptableError = true
-    if (gitError && opts.expectedErrors) {
-      acceptableError = opts.expectedErrors.has(gitError)
-    }
-
-    if ((gitError && acceptableError) || acceptableExitCode) {
-      return gitResult
-    }
-
-    // The caller should either handle this error, or expect that exit code.
-    const errorMessage = new Array<string>()
-    errorMessage.push(
-      `\`git ${args.join(' ')}\` exited with an unexpected code: ${exitCode}.`
-    )
 
-    if (result.stdout) {
-      errorMessage.push('stdout:')
-      errorMessage.push(result.stdout)
-    }
+      let acceptableError = true
+      if (gitError !== null && opts.expectedErrors) {
+        acceptableError = opts.expectedErrors.has(gitError)
+      }
 
-    if (result.stderr) {
-      errorMessage.push('stderr:')
-      errorMessage.push(result.stderr)
-    }
+      if ((gitError !== null && acceptableError) || acceptableExitCode) {
+        return gitResult
+      }
 
-    if (gitError) {
+      // The caller should either handle this error, or expect that exit code.
+      const errorMessage = new Array<string>()
       errorMessage.push(
-        `(The error was parsed as ${gitError}: ${gitErrorDescription})`
+        `\`git ${args.join(' ')}\` exited with an unexpected code: ${exitCode}.`
       )
-    }
-
-    log.error(errorMessage.join('\n'))
 
-    if (gitError === DugiteError.PushWithFileSizeExceedingLimit) {
-      const result = getFileFromExceedsError(errorMessage.join())
-      const files = result.join('\n')
+      if (terminalOutput.length > 0) {
+        // Leave even less of the combined output in the log
+        errorMessage.push(terminalOutput.slice(-1024))
+      }
 
-      if (files !== '') {
-        gitResult.gitErrorDescription += '\n\nFile causing error:\n\n' + files
+      if (gitError !== null) {
+        errorMessage.push(
+          `(The error was parsed as ${gitError}: ${gitErrorDescription})`
+        )
       }
-    }
 
-    throw new GitError(gitResult, args)
-  })
+      log.error(errorMessage.join('\n'))
+
+      throw new GitError(gitResult, args, terminalOutput)
+    },
+    path,
+    options?.isBackgroundTask ?? false,
+    options?.env
+  )
 }
 
 /**
@@ -290,7 +381,7 @@ const lockFilePathRe = /^error: could not lock config file (.+?): File exists$/m
  * output.
  */
 export function parseConfigLockFilePathFromError(result: IGitResult) {
-  const match = lockFilePathRe.exec(result.stderr)
+  const match = lockFilePathRe.exec(coerceToString(result.stderr))
 
   if (match === null) {
     return null
@@ -306,10 +397,13 @@ export function parseConfigLockFilePathFromError(result: IGitResult) {
   return Path.resolve(result.path, `${normalized}.lock`)
 }
 
-function getDescriptionForError(error: DugiteError): string | null {
+export function getDescriptionForError(
+  error: DugiteError,
+  stderr: string
+): string | null {
   if (isAuthFailureError(error)) {
     const menuHint = __DARWIN__
-      ? 'GitHub Desktop > Preferences.'
+      ? 'GitHub Desktop > Settings.'
       : 'File > Options.'
     return `Authentication failed. Some common reasons include:
 
@@ -323,6 +417,13 @@ function getDescriptionForError(error: DugiteError): string | null {
   }
 
   switch (error) {
+    case DugiteError.BadConfigValue:
+      const errorInfo = parseBadConfigValueErrorInfo(stderr)
+      if (errorInfo === null) {
+        return 'Unsupported git configuration value.'
+      }
+
+      return `Unsupported value '${errorInfo.value}' for git config key '${errorInfo.key}'`
     case DugiteError.SSHKeyAuditUnverified:
       return 'The SSH key is unverified.'
     case DugiteError.RemoteDisconnection:
@@ -429,27 +530,13 @@ function getDescriptionForError(error: DugiteError): string | null {
     case DugiteError.ConflictModifyDeletedInBranch:
     case DugiteError.MergeCommitNoMainlineOption:
     case DugiteError.UnsafeDirectory:
+    case DugiteError.PathExistsButNotInRef:
       return null
     default:
       return assertNever(error, `Unknown error: ${error}`)
   }
 }
 
-/**
- * Return an array of command line arguments for network operation that override
- * the default git configuration values provided by local, global, or system
- * level git configs.
- *
- * These arguments should be inserted before the subcommand, i.e in the case of
- * `git pull` these arguments needs to go before the `pull` argument.
- */
-export const gitNetworkArguments = () => [
-  // Explicitly unset any defined credential helper, we rely on our
-  // own askpass for authentication.
-  '-c',
-  'credential.helper=',
-]
-
 /**
  * Returns the arguments to use on any git operation that can end up
  * triggering a rebase.
@@ -461,14 +548,13 @@ export function gitRebaseArguments() {
     // uses the merge backend even if the user has the apply backend
     // configured, since this is the only one supported.
     // This can go away once git deprecates the apply backend.
-    '-c',
-    'rebase.backend=merge',
+    ...['-c', 'rebase.backend=merge'],
   ]
 }
 
 /**
  * Returns the SHA of the passed in IGitResult
  */
-export function parseCommitSHA(result: IGitResult): string {
+export function parseCommitSHA(result: IGitStringResult): string {
   return result.stdout.split(']')[0].split(' ')[1]
 }
diff --git a/app/src/lib/git/create-tail-stream.ts b/app/src/lib/git/create-tail-stream.ts
new file mode 100644
index 00000000000..0592f9f8e95
--- /dev/null
+++ b/app/src/lib/git/create-tail-stream.ts
@@ -0,0 +1,36 @@
+import assert from 'assert'
+import { Transform, TransformOptions } from 'stream'
+
+type Options = Pick<TransformOptions, 'autoDestroy' | 'emitClose' | 'encoding'>
+
+export function createTailStream(capacity: number, options?: Options) {
+  assert.ok(capacity > 0, 'The "capacity" argument must be greater than 0')
+
+  const chunks: Buffer[] = []
+  let length = 0
+
+  return new Transform({
+    ...options,
+    decodeStrings: true,
+    transform(chunk, _, cb) {
+      chunks.push(chunk)
+      length += chunk.length
+
+      while (length > capacity) {
+        const firstChunk = chunks[0]
+        const overrun = length - capacity
+
+        if (overrun >= firstChunk.length) {
+          chunks.shift()
+          length -= firstChunk.length
+        } else {
+          chunks[0] = firstChunk.subarray(overrun)
+          length -= overrun
+        }
+      }
+
+      cb()
+    },
+    flush: cb => cb(null, Buffer.concat(chunks)),
+  })
+}
diff --git a/app/src/lib/git/credential.ts b/app/src/lib/git/credential.ts
new file mode 100644
index 00000000000..943ea76692e
--- /dev/null
+++ b/app/src/lib/git/credential.ts
@@ -0,0 +1,68 @@
+import { exec as git } from 'dugite'
+
+export const parseCredential = (value: string) => {
+  const cred = new Map<string, string>()
+
+  // The credential helper protocol is a simple key=value format but some of its
+  // keys are actually arrays which are represented as multiple key[] entries.
+  // Since we're currently storing credentials as a Map we need to handle this
+  // and expand multiple key[] entries into a key[0], key[1]... key[n] sequence.
+  // We then remove the number from the key when we're formatting the credential
+  for (const [, k, v] of value.matchAll(/^(.*?)=(.*)$/gm)) {
+    if (k.endsWith('[]')) {
+      let i = 0
+      let newKey
+
+      do {
+        newKey = `${k.slice(0, -2)}[${i}]`
+        i++
+      } while (cred.has(newKey))
+
+      cred.set(newKey, v)
+    } else {
+      cred.set(k, v)
+    }
+  }
+
+  return cred
+}
+
+export const formatCredential = (credential: Map<string, string>) =>
+  [...credential]
+    .map(([k, v]) => `${k.replace(/\[\d+\]$/, '[]')}=${v}\n`)
+    .join('')
+
+// Can't use git() as that will call withTrampolineEnv which calls this method
+const exec = (
+  cmd: string,
+  cred: Map<string, string>,
+  path: string,
+  env: Record<string, string | undefined> = {}
+) =>
+  git(
+    [
+      ...['-c', 'credential.helper='],
+      ...['-c', `credential.helper=manager`],
+      'credential',
+      cmd,
+    ],
+    path,
+    {
+      stdin: formatCredential(cred),
+      env: {
+        GIT_TERMINAL_PROMPT: '0',
+        GIT_ASKPASS: '',
+        TERM: 'dumb',
+        ...env,
+      },
+    }
+  ).then(({ exitCode, stderr, stdout }) => {
+    if (exitCode !== 0) {
+      throw new Error(stderr)
+    }
+    return parseCredential(stdout)
+  })
+
+export const fillCredential = exec.bind(null, 'fill')
+export const approveCredential = exec.bind(null, 'approve')
+export const rejectCredential = exec.bind(null, 'reject')
diff --git a/app/src/lib/git/diff-check.ts b/app/src/lib/git/diff-check.ts
index 131773078d7..3e418897fd1 100644
--- a/app/src/lib/git/diff-check.ts
+++ b/app/src/lib/git/diff-check.ts
@@ -1,5 +1,4 @@
-import { spawnAndComplete } from './spawn'
-import { getCaptures } from '../helpers/regex'
+import { git } from './core'
 
 /**
  * Returns a list of files with conflict markers present
@@ -10,33 +9,19 @@ import { getCaptures } from '../helpers/regex'
 export async function getFilesWithConflictMarkers(
   repositoryPath: string
 ): Promise<Map<string, number>> {
-  // git operation
-  const args = ['diff', '--check']
-  const { output } = await spawnAndComplete(
-    args,
+  const { stdout } = await git(
+    ['diff', '--check'],
     repositoryPath,
     'getFilesWithConflictMarkers',
-    new Set([0, 2])
+    { successExitCodes: new Set([0, 2]) }
   )
 
-  // result parsing
-  const outputStr = output.toString('utf8')
-  const captures = getCaptures(outputStr, fileNameCaptureRe)
-  if (captures.length === 0) {
-    return new Map<string, number>()
+  const files = new Map<string, number>()
+  const matches = stdout.matchAll(/^(.+):\d+: leftover conflict marker/gm)
+
+  for (const [, path] of matches) {
+    files.set(path, (files.get(path) ?? 0) + 1)
   }
-  // flatten the list (only does one level deep)
-  const flatCaptures = captures.reduce((acc, val) => acc.concat(val))
-  // count number of occurrences
-  const counted = flatCaptures.reduce(
-    (acc, val) => acc.set(val, (acc.get(val) || 0) + 1),
-    new Map<string, number>()
-  )
-  return counted
-}
 
-/**
- * matches a line reporting a leftover conflict marker
- * and captures the name of the file
- */
-const fileNameCaptureRe = /(.+):\d+: leftover conflict marker/gi
+  return files
+}
diff --git a/app/src/lib/git/diff.ts b/app/src/lib/git/diff.ts
index b2e0080a07d..2322d90fc9b 100644
--- a/app/src/lib/git/diff.ts
+++ b/app/src/lib/git/diff.ts
@@ -7,6 +7,7 @@ import {
   WorkingDirectoryFileChange,
   FileChange,
   AppFileStatusKind,
+  SubmoduleStatus,
   CommittedFileChange,
 } from '../../models/status'
 import {
@@ -18,20 +19,21 @@ import {
   LineEndingsChange,
   parseLineEndingText,
   ILargeTextDiff,
-  IUnrenderableDiff,
 } from '../../models/diff'
 
-import { spawnAndComplete } from './spawn'
-
 import { DiffParser } from '../diff-parser'
 import { getOldPathOrDefault } from '../get-old-path'
-import { getCaptures } from '../helpers/regex'
 import { readFile } from 'fs/promises'
 import { forceUnwrap } from '../fatal-error'
 import { git } from './core'
 import { NullTreeSHA } from './diff-index'
 import { GitError } from 'dugite'
-import { mapStatus } from './log'
+import { IChangesetData, parseRawLogWithNumstat } from './log'
+import { getConfigValue } from './config'
+import { getMergeBase } from './merge'
+import { IStatusEntry } from '../status-parser'
+import { createLogParser } from './git-delimiter-parser'
+import { enableImagePreviewsForDDSFiles } from '../feature-flag'
 
 /**
  * V8 has a limit on the size of string it can create (~256MB), and unless we want to
@@ -96,6 +98,10 @@ const imageFileExtensions = new Set([
   '.avif',
 ])
 
+if (enableImagePreviewsForDDSFiles()) {
+  imageFileExtensions.add('.dds')
+}
+
 /**
  * Render the difference between a file in the given commit and its parent
  *
@@ -116,6 +122,7 @@ export async function getCommitDiff(
     '-1',
     '--first-parent',
     '--patch-with-raw',
+    '--format=',
     '-z',
     '--no-color',
     '--',
@@ -129,13 +136,50 @@ export async function getCommitDiff(
     args.push(file.status.oldPath)
   }
 
-  const { output } = await spawnAndComplete(
-    args,
-    repository.path,
-    'getCommitDiff'
-  )
+  const { stdout } = await git(args, repository.path, 'getCommitDiff', {
+    encoding: 'buffer',
+  })
 
-  return buildDiff(output, repository, file, commitish)
+  return buildDiff(stdout, repository, file, commitish)
+}
+
+/**
+ * Render the diff between two branches with --merge-base for a file
+ * (Show what would be the result of merge)
+ */
+export async function getBranchMergeBaseDiff(
+  repository: Repository,
+  file: FileChange,
+  baseBranchName: string,
+  comparisonBranchName: string,
+  hideWhitespaceInDiff: boolean = false,
+  latestCommit: string
+): Promise<IDiff> {
+  const args = [
+    'diff',
+    '--merge-base',
+    baseBranchName,
+    comparisonBranchName,
+    ...(hideWhitespaceInDiff ? ['-w'] : []),
+    '--patch-with-raw',
+    '-z',
+    '--no-color',
+    '--',
+    file.path,
+  ]
+
+  if (
+    file.status.kind === AppFileStatusKind.Renamed ||
+    file.status.kind === AppFileStatusKind.Copied
+  ) {
+    args.push(file.status.oldPath)
+  }
+
+  const result = await git(args, repository.path, 'getBranchMergeBaseDiff', {
+    encoding: 'buffer',
+  })
+
+  return buildDiff(result.stdout, repository, file, latestCommit)
 }
 
 /**
@@ -161,6 +205,7 @@ export async function getCommitRangeDiff(
     latestCommit,
     ...(hideWhitespaceInDiff ? ['-w'] : []),
     '--patch-with-raw',
+    '--format=',
     '-z',
     '--no-color',
     '--',
@@ -175,7 +220,7 @@ export async function getCommitRangeDiff(
   }
 
   const result = await git(args, repository.path, 'getCommitsDiff', {
-    maxBuffer: Infinity,
+    encoding: 'buffer',
     expectedErrors: new Set([GitError.BadRevision]),
   })
 
@@ -192,11 +237,52 @@ export async function getCommitRangeDiff(
     )
   }
 
-  return buildDiff(
-    Buffer.from(result.combinedOutput),
+  return buildDiff(result.stdout, repository, file, latestCommit)
+}
+
+/**
+ * Get the files that were changed for the merge base comparison of two branches.
+ * (What would be the result of a merge)
+ */
+export async function getBranchMergeBaseChangedFiles(
+  repository: Repository,
+  baseBranchName: string,
+  comparisonBranchName: string,
+  latestComparisonBranchCommitRef: string
+): Promise<IChangesetData | null> {
+  const baseArgs = [
+    'diff',
+    '--merge-base',
+    baseBranchName,
+    comparisonBranchName,
+    '-C',
+    '-M',
+    '-z',
+    '--raw',
+    '--numstat',
+    '--',
+  ]
+
+  const mergeBaseCommit = await getMergeBase(
     repository,
-    file,
-    latestCommit
+    baseBranchName,
+    comparisonBranchName
+  )
+
+  if (mergeBaseCommit === null) {
+    return null
+  }
+
+  const result = await git(
+    baseArgs,
+    repository.path,
+    'getBranchMergeBaseChangedFiles'
+  )
+
+  return parseRawLogWithNumstat(
+    result.stdout,
+    `${latestComparisonBranchCommitRef}`,
+    mergeBaseCommit
   )
 }
 
@@ -204,11 +290,7 @@ export async function getCommitRangeChangedFiles(
   repository: Repository,
   shas: ReadonlyArray<string>,
   useNullTreeSHA: boolean = false
-): Promise<{
-  files: ReadonlyArray<CommittedFileChange>
-  linesAdded: number
-  linesDeleted: number
-}> {
+): Promise<IChangesetData> {
   if (shas.length === 0) {
     throw new Error('No commits to diff...')
   }
@@ -227,7 +309,7 @@ export async function getCommitRangeChangedFiles(
     '--',
   ]
 
-  const result = await git(
+  const { stdout, gitError } = await git(
     baseArgs,
     repository.path,
     'getCommitRangeChangedFiles',
@@ -239,98 +321,12 @@ export async function getCommitRangeChangedFiles(
   // This should only happen if the oldest commit does not have a parent (ex:
   // initial commit of a branch) and therefore `SHA^` is not a valid reference.
   // In which case, we will retry with the null tree sha.
-  if (result.gitError === GitError.BadRevision && useNullTreeSHA === false) {
+  if (gitError === GitError.BadRevision && useNullTreeSHA === false) {
     const useNullTreeSHA = true
     return getCommitRangeChangedFiles(repository, shas, useNullTreeSHA)
   }
 
-  return parseChangedFilesAndNumStat(
-    result.combinedOutput,
-    `${oldestCommitRef}..${latestCommitRef}`
-  )
-}
-
-/**
- * Parses output of diff flags -z --raw --numstat.
- *
- * Given the -z flag the new lines are separated by \0 character (left them as
- * new lines below for ease of reading)
- *
- * For modified, added, deleted, untracked:
- *    100644 100644 5716ca5 db3c77d M
- *    file_one_path
- *    :100644 100644 0835e4f 28096ea M
- *    file_two_path
- *    1    0       file_one_path
- *    1    0       file_two_path
- *
- * For copied or renamed:
- *    100644 100644 5716ca5 db3c77d M
- *    file_one_original_path
- *    file_one_new_path
- *    :100644 100644 0835e4f 28096ea M
- *    file_two_original_path
- *    file_two_new_path
- *    1    0
- *    file_one_original_path
- *    file_one_new_path
- *    1    0
- *    file_two_original_path
- *    file_two_new_path
- */
-function parseChangedFilesAndNumStat(stdout: string, committish: string) {
-  const lines = stdout.split('\0')
-  // Remove the trailing empty line
-  lines.splice(-1, 1)
-
-  const files: CommittedFileChange[] = []
-  let linesAdded = 0
-  let linesDeleted = 0
-
-  for (let i = 0; i < lines.length; i++) {
-    const parts = lines[i].split('\t')
-
-    if (parts.length === 1) {
-      const statusParts = parts[0].split(' ')
-      const statusText = statusParts.at(-1) ?? ''
-      let oldPath: string | undefined = undefined
-
-      if (
-        statusText.length > 0 &&
-        (statusText[0] === 'R' || statusText[0] === 'C')
-      ) {
-        oldPath = lines[++i]
-      }
-
-      const status = mapStatus(statusText, oldPath)
-      const path = lines[++i]
-
-      files.push(new CommittedFileChange(path, status, committish))
-    }
-
-    if (parts.length === 3) {
-      const [added, deleted, file] = parts
-
-      if (added === '-' || deleted === '-') {
-        continue
-      }
-
-      linesAdded += parseInt(added, 10)
-      linesDeleted += parseInt(deleted, 10)
-
-      // If a file is not renamed or copied, the file name is with the
-      // add/deleted lines other wise the 2 files names are the next two lines
-      if (file === '' && lines[i + 1].split('\t').length === 1) {
-        i = i + 2
-      }
-    }
-  }
-
-  return {
-    files,
-    linesAdded,
-    linesDeleted,
-  }
+  return parseRawLogWithNumstat(stdout, latestCommitRef, oldestCommitRef)
 }
 
 /**
@@ -354,10 +350,14 @@ export async function getWorkingDirectoryDiff(
     '--no-color',
   ]
   const successExitCodes = new Set([0])
+  const isSubmodule = file.status.submoduleStatus !== undefined
 
+  // For added submodules, we'll use the "default" parameters, which are able
+  // to output the submodule commit.
   if (
-    file.status.kind === AppFileStatusKind.New ||
-    file.status.kind === AppFileStatusKind.Untracked
+    !isSubmodule &&
+    (file.status.kind === AppFileStatusKind.New ||
+      file.status.kind === AppFileStatusKind.Untracked)
   ) {
     // `git diff --no-index` seems to emulate the exit codes from `diff` irrespective of
     // whether you set --exit-code
@@ -384,15 +384,15 @@ export async function getWorkingDirectoryDiff(
     args.push('HEAD', '--', file.path)
   }
 
-  const { output, error } = await spawnAndComplete(
+  const { stdout, stderr } = await git(
     args,
     repository.path,
     'getWorkingDirectoryDiff',
-    successExitCodes
+    { successExitCodes, encoding: 'buffer' }
   )
-  const lineEndingsChange = parseLineEndingsWarning(error)
+  const lineEndingsChange = parseLineEndingsWarning(stderr)
 
-  return buildDiff(output, repository, file, 'HEAD', lineEndingsChange)
+  return buildDiff(stdout, repository, file, 'HEAD', lineEndingsChange)
 }
 
 async function getImageDiff(
@@ -438,7 +438,8 @@ async function getImageDiff(
     // File status can't be conflicted for a file in a commit
     if (
       file.status.kind !== AppFileStatusKind.New &&
-      file.status.kind !== AppFileStatusKind.Untracked
+      file.status.kind !== AppFileStatusKind.Untracked &&
+      file.status.kind !== AppFileStatusKind.Deleted
     ) {
       // TODO: commitish^ won't work for the first commit
       //
@@ -450,6 +451,17 @@ async function getImageDiff(
         `${oldestCommitish}^`
       )
     }
+
+    if (
+      file instanceof CommittedFileChange &&
+      file.status.kind === AppFileStatusKind.Deleted
+    ) {
+      previous = await getBlobImage(
+        repository,
+        getOldPathOrDefault(file),
+        file.parentCommitish
+      )
+    }
   }
 
   return {
@@ -514,6 +526,9 @@ function getMediaType(extension: string) {
   if (extension === '.avif') {
     return 'image/avif'
   }
+  if (extension === '.dds') {
+    return 'image/vnd-ms.dds'
+  }
 
   // fallback value as per the spec
   return 'text/plain'
@@ -525,7 +540,7 @@ function getMediaType(extension: string) {
  * changes based on what the user has configured.
  */
 const lineEndingsChangeRegex =
-  /warning: (CRLF|CR|LF) will be replaced by (CRLF|CR|LF) in .*/
+  /', (CRLF|CR|LF) will be replaced by (CRLF|CR|LF) the .*/
 
 /**
  * Utility function for inspecting the stderr output for the line endings
@@ -566,16 +581,71 @@ function diffFromRawDiffOutput(output: Buffer): IRawDiff {
   return parser.parse(forceUnwrap(`Invalid diff output`, pieces.at(-1)))
 }
 
-function buildDiff(
+async function buildSubmoduleDiff(
+  buffer: Buffer,
+  repository: Repository,
+  file: FileChange,
+  status: SubmoduleStatus
+): Promise<IDiff> {
+  const path = file.path
+  const fullPath = Path.join(repository.path, path)
+  const url = await getConfigValue(repository, `submodule.${path}.url`, true)
+
+  let oldSHA = null
+  let newSHA = null
+
+  if (
+    status.commitChanged ||
+    file.status.kind === AppFileStatusKind.New ||
+    file.status.kind === AppFileStatusKind.Deleted
+  ) {
+    const diff = buffer.toString('utf-8')
+    const lines = diff.split('\n')
+    const baseRegex = 'Subproject commit ([^-]+)(-dirty)?$'
+    const oldSHARegex = new RegExp('-' + baseRegex)
+    const newSHARegex = new RegExp('\\+' + baseRegex)
+    const lineMatch = (regex: RegExp) =>
+      lines
+        .flatMap(line => {
+          const match = line.match(regex)
+          return match ? match[1] : []
+        })
+        .at(0) ?? null
+
+    oldSHA = lineMatch(oldSHARegex)
+    newSHA = lineMatch(newSHARegex)
+  }
+
+  return {
+    kind: DiffType.Submodule,
+    fullPath,
+    path,
+    url,
+    status,
+    oldSHA,
+    newSHA,
+  }
+}
+
+async function buildDiff(
   buffer: Buffer,
   repository: Repository,
   file: FileChange,
   oldestCommitish: string,
   lineEndingsChange?: LineEndingsChange
 ): Promise<IDiff> {
+  if (file.status.submoduleStatus !== undefined) {
+    return buildSubmoduleDiff(
+      buffer,
+      repository,
+      file,
+      file.status.submoduleStatus
+    )
+  }
+
   if (!isValidBuffer(buffer)) {
     // the buffer's diff is too large to be renderable in the UI
-    return Promise.resolve<IUnrenderableDiff>({ kind: DiffType.Unrenderable })
+    return { kind: DiffType.Unrenderable }
   }
 
   const diff = diffFromRawDiffOutput(buffer)
@@ -593,7 +663,7 @@ function buildDiff(
       hasHiddenBidiChars: diff.hasHiddenBidiChars,
     }
 
-    return Promise.resolve(largeTextDiff)
+    return largeTextDiff
   }
 
   return convertDiff(repository, file, diff, oldestCommitish, lineEndingsChange)
@@ -616,6 +686,7 @@ export async function getBlobImage(
   const extension = Path.extname(path)
   const contents = await getBlobContents(repository, commitish, path)
   return new Image(
+    contents.buffer,
     contents.toString('base64'),
     getMediaType(extension),
     contents.length
@@ -636,6 +707,7 @@ export async function getWorkingDirectoryImage(
 ): Promise<Image> {
   const contents = await readFile(Path.join(repository.path, file.path))
   return new Image(
+    contents.buffer,
     contents.toString('base64'),
     getMediaType(Path.extname(file.path)),
     contents.length
@@ -653,20 +725,51 @@ export async function getWorkingDirectoryImage(
  */
 export async function getBinaryPaths(
   repository: Repository,
-  ref: string
+  ref: string,
+  conflictedFilesInIndex: ReadonlyArray<IStatusEntry>
 ): Promise<ReadonlyArray<string>> {
-  const { output } = await spawnAndComplete(
+  const [detectedBinaryFiles, conflictedFilesUsingBinaryMergeDriver] =
+    await Promise.all([
+      getDetectedBinaryFiles(repository, ref),
+      getFilesUsingBinaryMergeDriver(repository, conflictedFilesInIndex),
+    ])
+
+  return Array.from(
+    new Set([...detectedBinaryFiles, ...conflictedFilesUsingBinaryMergeDriver])
+  )
+}
+
+/**
+ * Runs diff --numstat to get the list of files that have changed and which
+ * Git have detected as binary files
+ */
+async function getDetectedBinaryFiles(repository: Repository, ref: string) {
+  const { stdout } = await git(
     ['diff', '--numstat', '-z', ref],
     repository.path,
     'getBinaryPaths'
   )
-  const captures = getCaptures(output.toString('utf8'), binaryListRegex)
-  if (captures.length === 0) {
-    return []
-  }
-  // flatten the list (only does one level deep)
-  const flatCaptures = captures.reduce((acc, val) => acc.concat(val))
-  return flatCaptures
+
+  return Array.from(stdout.matchAll(binaryListRegex), m => m[1])
 }
 
 const binaryListRegex = /-\t-\t(?:\0.+\0)?([^\0]*)/gi
+
+async function getFilesUsingBinaryMergeDriver(
+  repository: Repository,
+  files: ReadonlyArray<IStatusEntry>
+) {
+  const { stdout } = await git(
+    ['check-attr', '--stdin', '-z', 'merge'],
+    repository.path,
+    'getConflictedFilesUsingBinaryMergeDriver',
+    {
+      stdin: files.map(f => f.path).join('\0'),
+    }
+  )
+
+  return createLogParser({ path: '', attr: '', value: '' })
+    .parse(stdout)
+    .filter(x => x.attr === 'merge' && x.value === 'binary')
+    .map(x => x.path)
+}
diff --git a/app/src/lib/git/environment.ts b/app/src/lib/git/environment.ts
index ad05be9c779..fedefb09aaa 100644
--- a/app/src/lib/git/environment.ts
+++ b/app/src/lib/git/environment.ts
@@ -1,8 +1,11 @@
 import { envForAuthentication } from './authentication'
-import { IGitAccount } from '../../models/git-account'
 import { resolveGitProxy } from '../resolve-git-proxy'
-import { getDotComAPIEndpoint } from '../api'
-import { Repository } from '../../models/repository'
+import { getHTMLURL } from '../api'
+import {
+  Repository,
+  isRepositoryWithGitHubRepository,
+} from '../../models/repository'
+import { IRemote } from '../../models/remote'
 
 /**
  * For many remote operations it's well known what the primary remote
@@ -17,25 +20,34 @@ import { Repository } from '../../models/repository'
  * be on a different server as well. That's too advanced for our usage
  * at the moment though so we'll just need to figure out some reasonable
  * url to fall back on.
+ *
+ * @param branchName If the operation we're about to undertake is related to a
+ *                   local ref (i.e branch) then we can use that to resolve its
+ *                   upstream tracking branch (and thereby its remote) and use
+ *                   that as the probable url to resolve a proxy for.
  */
 export function getFallbackUrlForProxyResolve(
-  account: IGitAccount | null,
-  repository: Repository
+  repository: Repository,
+  currentRemote: IRemote | null
 ) {
-  // If we've got an account with an endpoint that means we've already done the
-  // heavy lifting to figure out what the most likely endpoint is gonna be
-  // so we'll try to leverage that.
-  if (account !== null) {
-    // A GitHub.com Account will have api.github.com as its endpoint
-    return account.endpoint === getDotComAPIEndpoint()
-      ? 'https://github.com'
-      : account.endpoint
+  // We used to use account.endpoint here but we look up account by the
+  // repository endpoint (see getAccountForRepository) so we can skip the use
+  // of the account here and just use the repository endpoint directly.
+  if (isRepositoryWithGitHubRepository(repository)) {
+    return getHTMLURL(repository.gitHubRepository.endpoint)
   }
 
-  if (repository.gitHubRepository !== null) {
-    if (repository.gitHubRepository.cloneURL !== null) {
-      return repository.gitHubRepository.cloneURL
-    }
+  // This is a carry-over from the old code where we would use the current
+  // remote to resolve an account and then use that account's endpoint here.
+  // We've since removed the need to pass an account down here but unfortunately
+  // that means we need to pass the current remote instead. Note that ideally
+  // this should be looking up the remote url either based on the currently
+  // checked out branch, the upstream tracking branch of the branch being
+  // checked out, or the default remote if neither of those are available.
+  // Doing so by shelling out to Git here was deemed to costly and in order to
+  // finish this refactor we've opted to replicate the previous behavior here.
+  if (currentRemote) {
+    return currentRemote.url
   }
 
   // If all else fails let's assume that whatever network resource
@@ -61,12 +73,9 @@ export function getFallbackUrlForProxyResolve(
  *                  pointing to another host entirely. Used to resolve which
  *                  proxy (if any) should be used for the operation.
  */
-export async function envForRemoteOperation(
-  account: IGitAccount | null,
-  remoteUrl: string
-) {
+export async function envForRemoteOperation(remoteUrl: string) {
   return {
-    ...envForAuthentication(account),
+    ...envForAuthentication(),
     ...(await envForProxy(remoteUrl)),
   }
 }
@@ -85,7 +94,7 @@ export async function envForProxy(
   remoteUrl: string,
   env: NodeJS.ProcessEnv = process.env,
   resolve: (url: string) => Promise<string | undefined> = resolveGitProxy
-): Promise<NodeJS.ProcessEnv | undefined> {
+): Promise<Record<string, string | undefined> | undefined> {
   const protocolMatch = /^(https?):\/\//i.exec(remoteUrl)
 
   // We can only resolve and use a proxy for the protocols where cURL
diff --git a/app/src/lib/git/fetch.ts b/app/src/lib/git/fetch.ts
index 0049df0296e..408b29015a3 100644
--- a/app/src/lib/git/fetch.ts
+++ b/app/src/lib/git/fetch.ts
@@ -1,6 +1,5 @@
-import { git, IGitExecutionOptions, gitNetworkArguments } from './core'
+import { git, IGitStringExecutionOptions } from './core'
 import { Repository } from '../../models/repository'
-import { IGitAccount } from '../../models/git-account'
 import { IFetchProgress } from '../../models/progress'
 import { FetchProgressParser, executionOptionsWithProgress } from '../progress'
 import { enableRecurseSubmodulesFlag } from '../feature-flag'
@@ -9,33 +8,18 @@ import { ITrackingBranch } from '../../models/branch'
 import { envForRemoteOperation } from './environment'
 
 async function getFetchArgs(
-  repository: Repository,
   remote: string,
-  account: IGitAccount | null,
   progressCallback?: (progress: IFetchProgress) => void
 ) {
-  if (enableRecurseSubmodulesFlag()) {
-    return progressCallback != null
-      ? [
-          ...gitNetworkArguments(),
-          'fetch',
-          '--progress',
-          '--prune',
-          '--recurse-submodules=on-demand',
-          remote,
-        ]
-      : [
-          ...gitNetworkArguments(),
-          'fetch',
-          '--prune',
-          '--recurse-submodules=on-demand',
-          remote,
-        ]
-  } else {
-    return progressCallback != null
-      ? [...gitNetworkArguments(), 'fetch', '--progress', '--prune', remote]
-      : [...gitNetworkArguments(), 'fetch', '--prune', remote]
-  }
+  return [
+    'fetch',
+    ...(progressCallback ? ['--progress'] : []),
+    '--prune',
+    ...(enableRecurseSubmodulesFlag()
+      ? ['--recurse-submodules=on-demand']
+      : []),
+    remote,
+  ]
 }
 
 /**
@@ -52,16 +36,18 @@ async function getFetchArgs(
  *                           of the fetch operation. When provided this enables
  *                           the '--progress' command line flag for
  *                           'git fetch'.
+ * @param isBackgroundTask  - Whether the fetch is being performed as a
+ *                            background task as opposed to being user initiated
  */
 export async function fetch(
   repository: Repository,
-  account: IGitAccount | null,
   remote: IRemote,
-  progressCallback?: (progress: IFetchProgress) => void
+  progressCallback?: (progress: IFetchProgress) => void,
+  isBackgroundTask = false
 ): Promise<void> {
-  let opts: IGitExecutionOptions = {
+  let opts: IGitStringExecutionOptions = {
     successExitCodes: new Set([0]),
-    env: await envForRemoteOperation(account, remote.url),
+    env: await envForRemoteOperation(remote.url),
   }
 
   if (progressCallback) {
@@ -69,7 +55,7 @@ export async function fetch(
     const kind = 'fetch'
 
     opts = await executionOptionsWithProgress(
-      { ...opts, trackLFSProgress: true },
+      { ...opts, trackLFSProgress: true, isBackgroundTask },
       new FetchProgressParser(),
       progress => {
         // In addition to progress output from the remote end and from
@@ -100,12 +86,7 @@ export async function fetch(
     progressCallback({ kind, title, value: 0, remote: remote.name })
   }
 
-  const args = await getFetchArgs(
-    repository,
-    remote.name,
-    account,
-    progressCallback
-  )
+  const args = await getFetchArgs(remote.name, progressCallback)
 
   await git(args, repository.path, 'fetch', opts)
 }
@@ -113,19 +94,13 @@ export async function fetch(
 /** Fetch a given refspec from the given remote. */
 export async function fetchRefspec(
   repository: Repository,
-  account: IGitAccount | null,
   remote: IRemote,
   refspec: string
 ): Promise<void> {
-  await git(
-    [...gitNetworkArguments(), 'fetch', remote.name, refspec],
-    repository.path,
-    'fetchRefspec',
-    {
-      successExitCodes: new Set([0, 128]),
-      env: await envForRemoteOperation(account, remote.url),
-    }
-  )
+  await git(['fetch', remote.name, refspec], repository.path, 'fetchRefspec', {
+    successExitCodes: new Set([0, 128]),
+    env: await envForRemoteOperation(remote.url),
+  })
 }
 
 export async function fastForwardBranches(
@@ -138,18 +113,6 @@ export async function fastForwardBranches(
 
   const refPairs = branches.map(branch => `${branch.upstreamRef}:${branch.ref}`)
 
-  const opts: IGitExecutionOptions = {
-    // Fetch exits with an exit code of 1 if one or more refs failed to update
-    // which is what we expect will happen
-    successExitCodes: new Set([0, 1]),
-    env: {
-      // This will make sure the reflog entries are correct after
-      // fast-forwarding the branches.
-      GIT_REFLOG_ACTION: 'pull',
-    },
-    stdin: refPairs.join('\n'),
-  }
-
   await git(
     [
       'fetch',
@@ -166,6 +129,16 @@ export async function fastForwardBranches(
     ],
     repository.path,
     'fastForwardBranches',
-    opts
+    {
+      // Fetch exits with an exit code of 1 if one or more refs failed to update
+      // which is what we expect will happen
+      successExitCodes: new Set([0, 1]),
+      env: {
+        // This will make sure the reflog entries are correct after
+        // fast-forwarding the branches.
+        GIT_REFLOG_ACTION: 'pull',
+      },
+      stdin: refPairs.join('\n'),
+    }
   )
 }
diff --git a/app/src/lib/git/for-each-ref.ts b/app/src/lib/git/for-each-ref.ts
index 5f477a07581..d862e24068a 100644
--- a/app/src/lib/git/for-each-ref.ts
+++ b/app/src/lib/git/for-each-ref.ts
@@ -7,7 +7,6 @@ import {
   IBranchTip,
   ITrackingBranch,
 } from '../../models/branch'
-import { CommitIdentity } from '../../models/commit-identity'
 import { createForEachRefParser } from './git-delimiter-parser'
 
 /** Get all the branches. */
@@ -20,7 +19,6 @@ export async function getBranches(
     shortName: '%(refname:short)',
     upstreamShortName: '%(upstream:short)',
     sha: '%(objectname)',
-    author: '%(author)',
     symRef: '%(symref)',
   })
 
@@ -50,8 +48,7 @@ export async function getBranches(
       continue
     }
 
-    const author = CommitIdentity.parseIdentity(ref.author)
-    const tip: IBranchTip = { sha: ref.sha, author }
+    const tip: IBranchTip = { sha: ref.sha }
 
     const type = ref.fullName.startsWith('refs/heads')
       ? BranchType.Local
diff --git a/app/src/lib/git/format-patch.ts b/app/src/lib/git/format-patch.ts
index 28cd1173350..27c068477ca 100644
--- a/app/src/lib/git/format-patch.ts
+++ b/app/src/lib/git/format-patch.ts
@@ -1,6 +1,6 @@
 import { revRange } from './rev-list'
 import { Repository } from '../../models/repository'
-import { spawnAndComplete } from './spawn'
+import { git } from '.'
 
 /**
  * Generate a patch representing the changes associated with a range of commits
@@ -10,16 +10,8 @@ import { spawnAndComplete } from './spawn'
  * @param head ending commit in rage
  * @returns patch generated
  */
-export async function formatPatch(
-  repository: Repository,
-  base: string,
-  head: string
-): Promise<string> {
+export function formatPatch({ path }: Repository, base: string, head: string) {
   const range = revRange(base, head)
-  const { output } = await spawnAndComplete(
-    ['format-patch', '--unified=1', '--minimal', '--stdout', range],
-    repository.path,
-    'formatPatch'
-  )
-  return output.toString('utf8')
+  const args = ['format-patch', '--unified=1', '--minimal', '--stdout', range]
+  return git(args, path, 'formatPatch').then(x => x.stdout)
 }
diff --git a/app/src/lib/git/git-delimiter-parser.ts b/app/src/lib/git/git-delimiter-parser.ts
index 4faf944598a..a56d4cfc23a 100644
--- a/app/src/lib/git/git-delimiter-parser.ts
+++ b/app/src/lib/git/git-delimiter-parser.ts
@@ -1,3 +1,5 @@
+import { splitBuffer } from '../split-buffer'
+
 /**
  * Create a new parser suitable for parsing --format output from commands such
  * as `git log`, `git stash`, and other commands that are not derived from
@@ -12,19 +14,20 @@
  *               Example:
  *
  *               `const { args, parse } = createLogParser({ sha: '%H' })`
- *
  */
 export function createLogParser<T extends Record<string, string>>(fields: T) {
   const keys: Array<keyof T> = Object.keys(fields)
   const format = Object.values(fields).join('%x00')
   const formatArgs = ['-z', `--format=${format}`]
 
-  const parse = (value: string) => {
-    const records = value.split('\0')
+  const parse = <V extends string | Buffer>(value: V) => {
+    const records = (
+      Buffer.isBuffer(value) ? splitBuffer(value, '\0') : value.split('\0')
+    ) as V[]
     const entries = []
 
     for (let i = 0; i < records.length - keys.length; i += keys.length) {
-      const entry = {} as { [K in keyof T]: string }
+      const entry = {} as { [K in keyof T]: V }
       keys.forEach((key, ix) => (entry[key] = records[i + ix]))
       entries.push(entry)
     }
@@ -49,7 +52,6 @@ export function createLogParser<T extends Record<string, string>>(fields: T) {
  *               Example:
  *
  *               `const { args, parse } = createForEachRefParser({ sha: '%(objectname)' })`
- *
  */
 export function createForEachRefParser<T extends Record<string, string>>(
   fields: T
diff --git a/app/src/lib/git/gitignore.ts b/app/src/lib/git/gitignore.ts
index 540561f1e30..d43cdbd0a89 100644
--- a/app/src/lib/git/gitignore.ts
+++ b/app/src/lib/git/gitignore.ts
@@ -137,7 +137,7 @@ async function formatGitIgnoreContents(
       return
     }
 
-    if (text.endsWith('\n')) {
+    if (text === '' || text.endsWith('\n')) {
       resolve(text)
       return
     }
diff --git a/app/src/lib/git/interpret-trailers.ts b/app/src/lib/git/interpret-trailers.ts
index ef9c69fd94c..d3c1d09af03 100644
--- a/app/src/lib/git/interpret-trailers.ts
+++ b/app/src/lib/git/interpret-trailers.ts
@@ -157,6 +157,9 @@ export async function mergeTrailers(
 ) {
   const args = ['interpret-trailers']
 
+  // See https://github.com/git/git/blob/ebf3c04b262aa/Documentation/git-interpret-trailers.txt#L129-L132
+  args.push('--no-divider')
+
   if (unfold) {
     args.push('--unfold')
   }
diff --git a/app/src/lib/git/log.ts b/app/src/lib/git/log.ts
index 0de475dc8f0..b54f2924b9b 100644
--- a/app/src/lib/git/log.ts
+++ b/app/src/lib/git/log.ts
@@ -5,61 +5,115 @@ import {
   PlainFileStatus,
   CopiedOrRenamedFileStatus,
   UntrackedFileStatus,
+  AppFileStatus,
+  SubmoduleStatus,
 } from '../../models/status'
 import { Repository } from '../../models/repository'
 import { Commit } from '../../models/commit'
 import { CommitIdentity } from '../../models/commit-identity'
-import {
-  getTrailerSeparatorCharacters,
-  parseRawUnfoldedTrailers,
-} from './interpret-trailers'
-import { getCaptures } from '../helpers/regex'
+import { parseRawUnfoldedTrailers } from './interpret-trailers'
 import { createLogParser } from './git-delimiter-parser'
-import { revRange } from '.'
-import { enableLineChangesInCommit } from '../feature-flag'
+import { forceUnwrap } from '../fatal-error'
+import assert from 'assert'
+
+// File mode 160000 is used by git specifically for submodules:
+// https://github.com/git/git/blob/v2.37.3/cache.h#L62-L69
+const SubmoduleFileMode = '160000'
+
+function mapSubmoduleStatusFileModes(
+  status: string,
+  srcMode: string,
+  dstMode: string
+): SubmoduleStatus | undefined {
+  return srcMode === SubmoduleFileMode &&
+    dstMode === SubmoduleFileMode &&
+    status === 'M'
+    ? {
+        commitChanged: true,
+        untrackedChanges: false,
+        modifiedChanges: false,
+      }
+    : (srcMode === SubmoduleFileMode && status === 'D') ||
+      (dstMode === SubmoduleFileMode && status === 'A')
+    ? {
+        commitChanged: false,
+        untrackedChanges: false,
+        modifiedChanges: false,
+      }
+    : undefined
+}
 
 /**
  * Map the raw status text from Git to an app-friendly value
  * shamelessly borrowed from GitHub Desktop (Windows)
  */
-export function mapStatus(
+function mapStatus(
   rawStatus: string,
-  oldPath?: string
+  oldPath: string | undefined,
+  srcMode: string,
+  dstMode: string
 ): PlainFileStatus | CopiedOrRenamedFileStatus | UntrackedFileStatus {
   const status = rawStatus.trim()
+  const submoduleStatus = mapSubmoduleStatusFileModes(status, srcMode, dstMode)
 
   if (status === 'M') {
-    return { kind: AppFileStatusKind.Modified }
+    return { kind: AppFileStatusKind.Modified, submoduleStatus }
   } // modified
   if (status === 'A') {
-    return { kind: AppFileStatusKind.New }
+    return { kind: AppFileStatusKind.New, submoduleStatus }
   } // added
   if (status === '?') {
-    return { kind: AppFileStatusKind.Untracked }
+    return { kind: AppFileStatusKind.Untracked, submoduleStatus }
   } // untracked
   if (status === 'D') {
-    return { kind: AppFileStatusKind.Deleted }
+    return { kind: AppFileStatusKind.Deleted, submoduleStatus }
   } // deleted
   if (status === 'R' && oldPath != null) {
-    return { kind: AppFileStatusKind.Renamed, oldPath }
+    return {
+      kind: AppFileStatusKind.Renamed,
+      oldPath,
+      submoduleStatus,
+      renameIncludesModifications: false,
+    }
   } // renamed
   if (status === 'C' && oldPath != null) {
-    return { kind: AppFileStatusKind.Copied, oldPath }
+    return {
+      kind: AppFileStatusKind.Copied,
+      oldPath,
+      submoduleStatus,
+      renameIncludesModifications: false,
+    }
   } // copied
 
   // git log -M --name-status will return a RXXX - where XXX is a percentage
   if (status.match(/R[0-9]+/) && oldPath != null) {
-    return { kind: AppFileStatusKind.Renamed, oldPath }
+    return {
+      kind: AppFileStatusKind.Renamed,
+      oldPath,
+      submoduleStatus,
+      renameIncludesModifications: status !== 'R100',
+    }
   }
 
   // git log -C --name-status will return a CXXX - where XXX is a percentage
   if (status.match(/C[0-9]+/) && oldPath != null) {
-    return { kind: AppFileStatusKind.Copied, oldPath }
+    return {
+      kind: AppFileStatusKind.Copied,
+      oldPath,
+      submoduleStatus,
+      renameIncludesModifications: false,
+    }
   }
 
-  return { kind: AppFileStatusKind.Modified }
+  return { kind: AppFileStatusKind.Modified, submoduleStatus }
 }
 
+const isCopyOrRename = (
+  status: AppFileStatus
+): status is CopiedOrRenamedFileStatus =>
+  status.kind === AppFileStatusKind.Copied ||
+  status.kind === AppFileStatusKind.Renamed
+
 /**
  * Get the repository's commits using `revisionRange` and limited to `limit`
  */
@@ -110,6 +164,7 @@ export async function getCommits(
   )
   const result = await git(args, repository.path, 'getCommits', {
     successExitCodes: new Set([0, 128]),
+    encoding: 'buffer',
   })
 
   // if the repository has an unborn HEAD, return an empty history of commits
@@ -117,23 +172,33 @@ export async function getCommits(
     return new Array<Commit>()
   }
 
-  const trailerSeparators = await getTrailerSeparatorCharacters(repository)
   const parsed = parse(result.stdout)
 
   return parsed.map(commit => {
-    const tags = getCaptures(commit.refs, /tag: ([^\s,]+)/g)
-      .filter(i => i[0] !== undefined)
-      .map(i => i[0])
+    // Ref is of the format: (HEAD -> master, tag: some-tag-name, tag: some-other-tag,with-a-comma, origin/master, origin/HEAD)
+    // Refs are comma separated, but some like tags can also contain commas in the name, so we split on the pattern ", " and then
+    // check each ref for the tag prefix. We used to use the regex /tag: ([^\s,]+)/g)`, but will clip a tag with a comma short.
+    const tags = commit.refs
+      .toString()
+      .split(', ')
+      .flatMap(ref => (ref.startsWith('tag: ') ? ref.substring(5) : []))
 
     return new Commit(
-      commit.sha,
-      commit.shortSha,
-      commit.summary,
-      commit.body,
-      CommitIdentity.parseIdentity(commit.author),
-      CommitIdentity.parseIdentity(commit.committer),
-      commit.parents.length > 0 ? commit.parents.split(' ') : [],
-      parseRawUnfoldedTrailers(commit.trailers, trailerSeparators),
+      commit.sha.toString(),
+      commit.shortSha.toString(),
+      commit.summary.subarray(0, 100 * 1024).toString(),
+      commit.body.subarray(0, 100 * 1024).toString(),
+      CommitIdentity.parseIdentity(commit.author.toString()),
+      CommitIdentity.parseIdentity(commit.committer.toString()),
+      commit.parents.length > 0 ? commit.parents.toString().split(' ') : [],
+      // We know for sure that the trailer separator will be ':' since we got
+      // them from %(trailers:unfold) above, see `git help log`:
+      //
+      //   "key_value_separator=<SEP>: specify a separator inserted between
+      //    trailer lines. When this option is not given each trailer key-value
+      //    pair is separated by ": ". Otherwise it shares the same semantics as
+      //    separator=<SEP> above."
+      parseRawUnfoldedTrailers(commit.trailers.toString(), ':'),
       tags
     )
   })
@@ -159,7 +224,7 @@ export async function getChangedFiles(
   // opt-in for rename detection (-M) and copies detection (-C)
   // this is equivalent to the user configuring 'diff.renames' to 'copies'
   // NOTE: order here matters - doing -M before -C means copies aren't detected
-  const baseArgs = [
+  const args = [
     'log',
     sha,
     '-C',
@@ -168,101 +233,104 @@ export async function getChangedFiles(
     '-1',
     '--no-show-signature',
     '--first-parent',
+    '--raw',
     '--format=format:',
+    '--numstat',
     '-z',
+    '--',
   ]
 
-  // Run `git log` to obtain the file names and their state
-  const resultNameStatus = await git(
-    [...baseArgs, '--name-status', '--'],
-    repository.path,
-    'getChangedFilesNameStatus'
-  )
-
-  const files = parseChangedFiles(resultNameStatus.stdout, sha)
-
-  if (!enableLineChangesInCommit()) {
-    return { files, linesAdded: 0, linesDeleted: 0 }
-  }
-
-  // Run `git log` again, but this time to get the number of lines added/deleted
-  // per file
-  const resultNumStat = await git(
-    [...baseArgs, '--numstat', '--'],
-    repository.path,
-    'getChangedFilesNumStats'
-  )
-
-  const linesChanged = parseChangedFilesNumStat(resultNumStat.stdout)
-
-  return {
-    files,
-    ...linesChanged,
-  }
-}
-
-function parseChangedFilesNumStat(stdout: string): {
-  linesAdded: number
-  linesDeleted: number
-} {
-  const lines = stdout.split('\0')
-  let totalLinesAdded = 0
-  let totalLinesDeleted = 0
-
-  for (const line of lines) {
-    const parts = line.split('\t')
-    if (parts.length !== 3) {
-      continue
-    }
-
-    const [added, deleted] = parts
-
-    if (added === '-' || deleted === '-') {
-      continue
-    }
-
-    totalLinesAdded += parseInt(added, 10)
-    totalLinesDeleted += parseInt(deleted, 10)
-  }
-
-  return { linesAdded: totalLinesAdded, linesDeleted: totalLinesDeleted }
+  const { stdout } = await git(args, repository.path, 'getChangesFiles')
+  return parseRawLogWithNumstat(stdout, sha, `${sha}^`)
 }
 
 /**
- * Parses git `log` or `diff` output into a list of changed files
- * (see `getChangedFiles` for an example of use)
+ * Parses output of diff flags -z --raw --numstat.
+ *
+ * Given the -z flag the new lines are separated by \0 character (left them as
+ * new lines below for ease of reading)
+ *
+ * For modified, added, deleted, untracked:
+ *    100644 100644 5716ca5 db3c77d M
+ *    file_one_path
+ *    :100644 100644 0835e4f 28096ea M
+ *    file_two_path
+ *    1    0       file_one_path
+ *    1    0       file_two_path
  *
- * @param stdout raw output from a git `-z` and `--name-status` flags
- * @param committish commitish command was run against
+ * For copied or renamed:
+ *    100644 100644 5716ca5 db3c77d M
+ *    file_one_original_path
+ *    file_one_new_path
+ *    :100644 100644 0835e4f 28096ea M
+ *    file_two_original_path
+ *    file_two_new_path
+ *    1    0
+ *    file_one_original_path
+ *    file_one_new_path
+ *    1    0
+ *    file_two_original_path
+ *    file_two_new_path
  */
-export function parseChangedFiles(
+
+export function parseRawLogWithNumstat(
   stdout: string,
-  committish: string
-): ReadonlyArray<CommittedFileChange> {
+  sha: string,
+  parentCommitish: string
+) {
+  const files = new Array<CommittedFileChange>()
+  let linesAdded = 0
+  let linesDeleted = 0
+  let numStatCount = 0
   const lines = stdout.split('\0')
-  // Remove the trailing empty line
-  lines.splice(-1, 1)
-  const files: CommittedFileChange[] = []
-  for (let i = 0; i < lines.length; i++) {
-    const statusText = lines[i]
-
-    let oldPath: string | undefined = undefined
-
-    if (
-      statusText.length > 0 &&
-      (statusText[0] === 'R' || statusText[0] === 'C')
-    ) {
-      oldPath = lines[++i]
-    }
 
-    const status = mapStatus(statusText, oldPath)
-
-    const path = lines[++i]
-
-    files.push(new CommittedFileChange(path, status, committish))
+  for (let i = 0; i < lines.length - 1; i++) {
+    const line = lines[i]
+    if (line.startsWith(':')) {
+      const lineComponents = line.split(' ')
+      const srcMode = forceUnwrap(
+        'Invalid log output (srcMode)',
+        lineComponents[0]?.replace(':', '')
+      )
+      const dstMode = forceUnwrap(
+        'Invalid log output (dstMode)',
+        lineComponents[1]
+      )
+      const status = forceUnwrap(
+        'Invalid log output (status)',
+        lineComponents.at(-1)
+      )
+      const oldPath = /^R|C/.test(status)
+        ? forceUnwrap('Missing old path', lines.at(++i))
+        : undefined
+
+      const path = forceUnwrap('Missing path', lines.at(++i))
+
+      files.push(
+        new CommittedFileChange(
+          path,
+          mapStatus(status, oldPath, srcMode, dstMode),
+          sha,
+          parentCommitish
+        )
+      )
+    } else {
+      const match = /^(\d+|-)\t(\d+|-)\t/.exec(line)
+      const [, added, deleted] = forceUnwrap('Invalid numstat line', match)
+      linesAdded += added === '-' ? 0 : parseInt(added, 10)
+      linesDeleted += deleted === '-' ? 0 : parseInt(deleted, 10)
+
+      // If this entry denotes a rename or copy the old and new paths are on
+      // two separate fields (separated by \0). Otherwise they're on the same
+      // line as the added and deleted lines.
+      if (isCopyOrRename(files[numStatCount].status)) {
+        i += 2
+      }
+      numStatCount++
+    }
   }
 
-  return files
+  return { files, linesAdded, linesDeleted }
 }
 
 /** Get the commit for the given ref. */
@@ -278,24 +346,31 @@ export async function getCommit(
   return commits[0]
 }
 
-/**
- * Determine if merge commits exist in history after given commit
- * If no commitRef is null, goes back to HEAD of branch.
- */
-export async function doMergeCommitsExistAfterCommit(
-  repository: Repository,
-  commitRef: string | null
-): Promise<boolean> {
-  const commitRevRange =
-    commitRef === null ? undefined : revRange(commitRef, 'HEAD')
-
-  const mergeCommits = await getCommits(
-    repository,
-    commitRevRange,
-    undefined,
-    undefined,
-    ['--merges']
+/** Get the author identity for the given shas */
+export async function getAuthors(repository: Repository, shas: string[]) {
+  if (shas.length === 0) {
+    return []
+  }
+
+  const { stdout } = await git(
+    [
+      'log',
+      '--format=format:%an <%ae> %ad',
+      '--no-walk=unsorted',
+      '--date=raw',
+      '-z',
+      '--stdin',
+    ],
+    repository.path,
+    'getAuthors',
+    { stdin: shas.join('\n') }
   )
 
-  return mergeCommits.length > 0
+  const authors = stdout.split('\0').map(CommitIdentity.parseIdentity)
+
+  // This can happen if there are duplicate shas in the input, git log will only
+  // return the author once for each sha.
+  assert.equal(authors.length, shas.length, 'Commit to author mismatch')
+
+  return authors
 }
diff --git a/app/src/lib/git/merge-tree.ts b/app/src/lib/git/merge-tree.ts
index eb6b5a58770..a6e469901c1 100644
--- a/app/src/lib/git/merge-tree.ts
+++ b/app/src/lib/git/merge-tree.ts
@@ -1,117 +1,41 @@
-import byline from 'byline'
 import { Branch } from '../../models/branch'
 import { ComputedAction } from '../../models/computed-action'
 import { MergeTreeResult } from '../../models/merge'
 import { Repository } from '../../models/repository'
-import { isErrnoException } from '../errno-exception'
-import { getMergeBase } from './merge'
-import { spawnGit } from './spawn'
-
-// the merge-tree output is a collection of entries like this
-//
-// changed in both
-//  base   100644 f69fbc5c40409a1db7a3f8353bfffe46a21d6054 atom/browser/resources/mac/Info.plist
-//  our    100644 9094f0f7335edf833d51f688851e6a105de60433 atom/browser/resources/mac/Info.plist
-//  their  100644 2dd8bc646cff3869557549a39477e30022e6cfdd atom/browser/resources/mac/Info.plist
-// @@ -17,9 +17,15 @@
-// <key>CFBundleIconFile</key>
-// <string>electron.icns</string>
-// <key>CFBundleVersion</key>
-// +<<<<<<< .our
-// <string>4.0.0</string>
-// <key>CFBundleShortVersionString</key>
-// <string>4.0.0</string>
-// +=======
-// +  <string>1.4.16</string>
-// +  <key>CFBundleShortVersionString</key>
-// +  <string>1.4.16</string>
-// +>>>>>>> .their
-// <key>LSApplicationCategoryType</key>
-//<string>public.app-category.developer-tools</string>
-// <key>LSMinimumSystemVersion</key>
-
-// The first line for each entry is what I'm referring to as the the header
-// This regex filters on the known entries that can appear
-const contextHeaderRe =
-  /^(merged|added in remote|removed in remote|changed in both|removed in local|added in both)$/
-
-const conflictMarkerRe = /^\+[<>=]{7}$/
+import { git, isGitError } from './core'
+import { GitError } from 'dugite'
 
 export async function determineMergeability(
   repository: Repository,
   ours: Branch,
   theirs: Branch
-): Promise<MergeTreeResult> {
-  const mergeBase = await getMergeBase(repository, ours.tip.sha, theirs.tip.sha)
-
-  if (mergeBase === null) {
-    return { kind: ComputedAction.Invalid }
-  }
-
-  if (mergeBase === ours.tip.sha || mergeBase === theirs.tip.sha) {
-    return { kind: ComputedAction.Clean }
-  }
-
-  const process = await spawnGit(
-    ['merge-tree', mergeBase, ours.tip.sha, theirs.tip.sha],
+) {
+  return git(
+    [
+      'merge-tree',
+      '--write-tree',
+      '--name-only',
+      '--no-messages',
+      '-z',
+      ours.tip.sha,
+      theirs.tip.sha,
+    ],
     repository.path,
-    'mergeTree'
+    'determineMergeability',
+    { successExitCodes: new Set([0, 1]) }
   )
-
-  return await new Promise<MergeTreeResult>((resolve, reject) => {
-    const mergeTreeResultPromise: Promise<MergeTreeResult> =
-      process.stdout !== null
-        ? parseMergeTreeResult(process.stdout)
-        : Promise.reject(new Error('Failed reading merge-tree output'))
-
-    // If this is an exception thrown by Node.js while attempting to
-    // spawn let's keep the salient details but include the name of
-    // the operation.
-    process.on('error', e =>
-      reject(
-        isErrnoException(e) ? new Error(`merge-tree failed: ${e.code}`) : e
-      )
-    )
-
-    process.on('exit', code => {
-      if (code !== 0) {
-        reject(new Error(`merge-tree exited with code '${code}'`))
-      } else {
-        mergeTreeResultPromise.then(resolve, reject)
-      }
+    .then<MergeTreeResult>(({ stdout }) => {
+      // The output will be "<tree-id>\0[<filename>\0]*" so we can get the
+      // number of conflicted files by counting the number of null bytes and
+      // subtracting one for the tree id.
+      const conflictedFiles = (stdout.match(/\0/g)?.length ?? 0) - 1
+      return conflictedFiles > 0
+        ? { kind: ComputedAction.Conflicts, conflictedFiles }
+        : { kind: ComputedAction.Clean }
     })
-  })
-}
-
-export function parseMergeTreeResult(stream: NodeJS.ReadableStream) {
-  return new Promise<MergeTreeResult>(resolve => {
-    let seenConflictMarker = false
-    let conflictedFiles = 0
-
-    stream
-      .pipe(byline())
-      .on('data', (line: string) => {
-        // New header means new file, reset conflict flag and record if we've
-        // seen a conflict in this file or not
-        if (contextHeaderRe.test(line)) {
-          if (seenConflictMarker) {
-            conflictedFiles++
-            seenConflictMarker = false
-          }
-        } else if (conflictMarkerRe.test(line)) {
-          seenConflictMarker = true
-        }
-      })
-      .on('end', () => {
-        if (seenConflictMarker) {
-          conflictedFiles++
-        }
-
-        resolve(
-          conflictedFiles > 0
-            ? { kind: ComputedAction.Conflicts, conflictedFiles }
-            : { kind: ComputedAction.Clean }
-        )
-      })
-  })
+    .catch<MergeTreeResult>(e =>
+      isGitError(e, GitError.CannotMergeUnrelatedHistories)
+        ? Promise.resolve({ kind: ComputedAction.Invalid })
+        : Promise.reject(e)
+    )
 }
diff --git a/app/src/lib/git/pull.ts b/app/src/lib/git/pull.ts
index fa95a8c9104..3be7ab34ec2 100644
--- a/app/src/lib/git/pull.ts
+++ b/app/src/lib/git/pull.ts
@@ -1,15 +1,7 @@
-import {
-  git,
-  GitError,
-  IGitExecutionOptions,
-  gitNetworkArguments,
-  gitRebaseArguments,
-} from './core'
+import { git, gitRebaseArguments, IGitStringExecutionOptions } from './core'
 import { Repository } from '../../models/repository'
 import { IPullProgress } from '../../models/progress'
-import { IGitAccount } from '../../models/git-account'
 import { PullProgressParser, executionOptionsWithProgress } from '../progress'
-import { AuthenticationErrors } from './authentication'
 import { enableRecurseSubmodulesFlag } from '../feature-flag'
 import { IRemote } from '../../models/remote'
 import { envForRemoteOperation } from './environment'
@@ -18,31 +10,16 @@ import { getConfigValue } from './config'
 async function getPullArgs(
   repository: Repository,
   remote: string,
-  account: IGitAccount | null,
   progressCallback?: (progress: IPullProgress) => void
 ) {
-  const divergentPathArgs = await getDefaultPullDivergentBranchArguments(
-    repository
-  )
-
-  const args = [
-    ...gitNetworkArguments(),
+  return [
     ...gitRebaseArguments(),
     'pull',
-    ...divergentPathArgs,
+    ...(await getDefaultPullDivergentBranchArguments(repository)),
+    ...(enableRecurseSubmodulesFlag() ? ['--recurse-submodules'] : []),
+    ...(progressCallback ? ['--progress'] : []),
+    remote,
   ]
-
-  if (enableRecurseSubmodulesFlag()) {
-    args.push('--recurse-submodules')
-  }
-
-  if (progressCallback != null) {
-    args.push('--progress')
-  }
-
-  args.push(remote)
-
-  return args
 }
 
 /**
@@ -60,13 +37,11 @@ async function getPullArgs(
  */
 export async function pull(
   repository: Repository,
-  account: IGitAccount | null,
   remote: IRemote,
   progressCallback?: (progress: IPullProgress) => void
 ): Promise<void> {
-  let opts: IGitExecutionOptions = {
-    env: await envForRemoteOperation(account, remote.url),
-    expectedErrors: AuthenticationErrors,
+  let opts: IGitStringExecutionOptions = {
+    env: await envForRemoteOperation(remote.url),
   }
 
   if (progressCallback) {
@@ -106,17 +81,8 @@ export async function pull(
     progressCallback({ kind, title, value: 0, remote: remote.name })
   }
 
-  const args = await getPullArgs(
-    repository,
-    remote.name,
-    account,
-    progressCallback
-  )
-  const result = await git(args, repository.path, 'pull', opts)
-
-  if (result.gitErrorDescription) {
-    throw new GitError(result, args)
-  }
+  const args = await getPullArgs(repository, remote.name, progressCallback)
+  await git(args, repository.path, 'pull', opts)
 }
 
 /**
diff --git a/app/src/lib/git/push.ts b/app/src/lib/git/push.ts
index eb81701baf1..a58f89e8377 100644
--- a/app/src/lib/git/push.ts
+++ b/app/src/lib/git/push.ts
@@ -1,18 +1,10 @@
-import { GitError as DugiteError } from 'dugite'
-
-import {
-  git,
-  IGitExecutionOptions,
-  gitNetworkArguments,
-  GitError,
-} from './core'
+import { git, IGitStringExecutionOptions } from './core'
 import { Repository } from '../../models/repository'
 import { IPushProgress } from '../../models/progress'
-import { IGitAccount } from '../../models/git-account'
 import { PushProgressParser, executionOptionsWithProgress } from '../progress'
-import { AuthenticationErrors } from './authentication'
 import { IRemote } from '../../models/remote'
 import { envForRemoteOperation } from './environment'
+import { Branch } from '../../models/branch'
 
 export type PushOptions = {
   /**
@@ -22,6 +14,9 @@ export type PushOptions = {
    * See https://git-scm.com/docs/git-push#Documentation/git-push.txt---no-force-with-lease
    */
   readonly forceWithLease: boolean
+
+  /** A branch to push instead of the current branch */
+  readonly branch?: Branch
 }
 
 /**
@@ -50,7 +45,6 @@ export type PushOptions = {
  */
 export async function push(
   repository: Repository,
-  account: IGitAccount | null,
   remote: IRemote,
   localBranch: string,
   remoteBranch: string | null,
@@ -61,7 +55,6 @@ export async function push(
   progressCallback?: (progress: IPushProgress) => void
 ): Promise<void> {
   const args = [
-    ...gitNetworkArguments(),
     'push',
     remote.name,
     remoteBranch ? `${localBranch}:${remoteBranch}` : localBranch,
@@ -76,12 +69,8 @@ export async function push(
     args.push('--force-with-lease')
   }
 
-  const expectedErrors = new Set<DugiteError>(AuthenticationErrors)
-  expectedErrors.add(DugiteError.ProtectedBranchForcePush)
-
-  let opts: IGitExecutionOptions = {
-    env: await envForRemoteOperation(account, remote.url),
-    expectedErrors,
+  let opts: IGitStringExecutionOptions = {
+    env: await envForRemoteOperation(remote.url),
   }
 
   if (progressCallback) {
@@ -118,9 +107,5 @@ export async function push(
     })
   }
 
-  const result = await git(args, repository.path, 'push', opts)
-
-  if (result.gitErrorDescription) {
-    throw new GitError(result, args)
-  }
+  await git(args, repository.path, 'push', opts)
 }
diff --git a/app/src/lib/git/rebase.ts b/app/src/lib/git/rebase.ts
index 5e84cca5bf1..502d1d4c522 100644
--- a/app/src/lib/git/rebase.ts
+++ b/app/src/lib/git/rebase.ts
@@ -18,9 +18,10 @@ import { formatRebaseValue } from '../rebase'
 
 import {
   git,
-  IGitResult,
   IGitExecutionOptions,
   gitRebaseArguments,
+  IGitStringExecutionOptions,
+  IGitStringResult,
 } from './core'
 import { stageManualConflictResolution } from './stage'
 import { stageFiles } from './update-index'
@@ -37,6 +38,11 @@ export enum RebaseResult {
    * signal success to the user.
    */
   CompletedWithoutError = 'CompletedWithoutError',
+  /**
+   * Git completed the rebase without reporting any errors, but the branch was
+   * already up to date and there was nothing to do.
+   */
+  AlreadyUpToDate = 'AlreadyUpToDate',
   /**
    * The rebase encountered conflicts while attempting to rebase, and these
    * need to be resolved by the user before the rebase can continue.
@@ -308,8 +314,8 @@ class GitRebaseParser {
   }
 }
 
-function configureOptionsForRebase(
-  options: IGitExecutionOptions,
+function configureOptionsForRebase<T extends IGitExecutionOptions>(
+  options: T,
   progress?: RebaseProgressOptions
 ) {
   if (progress === undefined) {
@@ -356,7 +362,7 @@ export async function rebase(
   targetBranch: Branch,
   progressCallback?: (progress: IMultiCommitOperationProgress) => void
 ): Promise<RebaseResult> {
-  const baseOptions: IGitExecutionOptions = {
+  const baseOptions: IGitStringExecutionOptions = {
     expectedErrors: new Set([GitError.RebaseConflicts]),
   }
 
@@ -400,8 +406,12 @@ export async function abortRebase(repository: Repository) {
   await git(['rebase', '--abort'], repository.path, 'abortRebase')
 }
 
-function parseRebaseResult(result: IGitResult): RebaseResult {
+function parseRebaseResult(result: IGitStringResult): RebaseResult {
   if (result.exitCode === 0) {
+    if (result.stdout.trim().match(/^Current branch [^ ]+ is up to date.$/i)) {
+      return RebaseResult.AlreadyUpToDate
+    }
+
     return RebaseResult.CompletedWithoutError
   }
 
@@ -451,7 +461,7 @@ export async function continueRebase(
 
   await stageFiles(repository, otherFiles)
 
-  const status = await getStatus(repository)
+  const status = await getStatus(repository, false)
   if (status == null) {
     log.warn(
       `[continueRebase] unable to get status after staging changes, skipping any other steps`
@@ -468,7 +478,7 @@ export async function continueRebase(
     f => f.status.kind !== AppFileStatusKind.Untracked
   )
 
-  const baseOptions: IGitExecutionOptions = {
+  const baseOptions: IGitStringExecutionOptions = {
     expectedErrors: new Set([
       GitError.RebaseConflicts,
       GitError.UnresolvedConflicts,
@@ -545,9 +555,10 @@ export async function rebaseInteractive(
   progressCallback?: (progress: IMultiCommitOperationProgress) => void,
   commits?: ReadonlyArray<Commit>
 ): Promise<RebaseResult> {
-  const baseOptions: IGitExecutionOptions = {
+  const baseOptions: IGitStringExecutionOptions = {
     expectedErrors: new Set([GitError.RebaseConflicts]),
     env: {
+      GIT_SEQUENCE_EDITOR: undefined,
       GIT_EDITOR: gitEditor,
     },
   }
diff --git a/app/src/lib/git/remote.ts b/app/src/lib/git/remote.ts
index 7032bd7d77c..dc07b6a51e2 100644
--- a/app/src/lib/git/remote.ts
+++ b/app/src/lib/git/remote.ts
@@ -3,6 +3,8 @@ import { GitError } from 'dugite'
 
 import { Repository } from '../../models/repository'
 import { IRemote } from '../../models/remote'
+import { envForRemoteOperation } from './environment'
+import { getSymbolicRef } from './refs'
 
 /**
  * List the remotes, sorted alphabetically by `name`, for a repository.
@@ -18,14 +20,9 @@ export async function getRemotes(
     return []
   }
 
-  const output = result.stdout
-  const lines = output.split('\n')
-  const remotes = lines
-    .filter(x => x.endsWith('(fetch)'))
-    .map(x => x.split(/\s+/))
-    .map(x => ({ name: x[0], url: x[1] }))
-
-  return remotes
+  return [...result.stdout.matchAll(/^(.+)\t(.+)\s\(fetch\)/gm)].map(
+    ([, name, url]) => ({ name, url })
+  )
 }
 
 /** Add a new remote with the given URL. */
@@ -88,3 +85,48 @@ export async function getRemoteURL(
 
   return result.stdout
 }
+
+/**
+ * Update the HEAD ref of the remote, which is the default branch.
+ *
+ * @param isBackgroundTask Whether the fetch is being performed as a
+ *                         background task as opposed to being user initiated
+ */
+export async function updateRemoteHEAD(
+  repository: Repository,
+  remote: IRemote,
+  isBackgroundTask: boolean
+): Promise<void> {
+  const options = {
+    successExitCodes: new Set([0, 1, 128]),
+    env: await envForRemoteOperation(remote.url),
+    isBackgroundTask,
+  }
+
+  await git(
+    ['remote', 'set-head', '-a', remote.name],
+    repository.path,
+    'updateRemoteHEAD',
+    options
+  )
+}
+
+export async function getRemoteHEAD(
+  repository: Repository,
+  remote: string
+): Promise<string | null> {
+  const remoteNamespace = `refs/remotes/${remote}/`
+  const match = await getSymbolicRef(repository, `${remoteNamespace}HEAD`)
+  if (
+    match != null &&
+    match.length > remoteNamespace.length &&
+    match.startsWith(remoteNamespace)
+  ) {
+    // strip out everything related to the remote because this
+    // is likely to be a tracked branch locally
+    // e.g. `main`, `develop`, etc
+    return match.substring(remoteNamespace.length)
+  }
+
+  return null
+}
diff --git a/app/src/lib/git/rev-list.ts b/app/src/lib/git/rev-list.ts
index 6e87fe31c2a..cdb65b75e14 100644
--- a/app/src/lib/git/rev-list.ts
+++ b/app/src/lib/git/rev-list.ts
@@ -182,3 +182,20 @@ export async function getCommitsInRange(
 
   return commits
 }
+
+/**
+ * Determine if merge commits exist in history after given commit
+ * If commitRef is null, goes back to HEAD of branch.
+ */
+export async function doMergeCommitsExistAfterCommit(
+  repository: Repository,
+  commitRef: string | null
+): Promise<boolean> {
+  const revision = commitRef === null ? 'HEAD' : revRange(commitRef, 'HEAD')
+  const args = ['rev-list', '-1', '--merges', revision, '--']
+
+  return git(args, repository.path, 'doMergeCommitsExistAfterCommit', {
+    // 128 here means there's no HEAD, i.e we're on an unborn branch
+    successExitCodes: new Set([0, 128]),
+  }).then(x => x.stdout.length > 0)
+}
diff --git a/app/src/lib/git/rev-parse.ts b/app/src/lib/git/rev-parse.ts
index fb59ece94a3..27414411a5e 100644
--- a/app/src/lib/git/rev-parse.ts
+++ b/app/src/lib/git/rev-parse.ts
@@ -37,7 +37,7 @@ export async function getRepositoryType(path: string): Promise<RepositoryType> {
     }
 
     const unsafeMatch =
-      /fatal: unsafe repository \('(.+)\' is owned by someone else\)/.exec(
+      /fatal: detected dubious ownership in repository at '(.+)'/.exec(
         result.stderr
       )
     if (unsafeMatch) {
@@ -56,3 +56,23 @@ export async function getRepositoryType(path: string): Promise<RepositoryType> {
     throw err
   }
 }
+
+export async function getUpstreamRefForRef(path: string, ref?: string) {
+  const rev = (ref ?? '') + '@{upstream}'
+  const args = ['rev-parse', '--symbolic-full-name', rev]
+  const opts = { successExitCodes: new Set([0, 128]) }
+  const result = await git(args, path, 'getUpstreamRefForRef', opts)
+
+  return result.exitCode === 0 ? result.stdout.trim() : null
+}
+
+export async function getUpstreamRemoteNameForRef(path: string, ref?: string) {
+  const remoteRef = await getUpstreamRefForRef(path, ref)
+  return remoteRef?.match(/^refs\/remotes\/([^/]+)\//)?.[1] ?? null
+}
+
+export const getCurrentUpstreamRef = (path: string) =>
+  getUpstreamRefForRef(path)
+
+export const getCurrentUpstreamRemoteName = (path: string) =>
+  getUpstreamRemoteNameForRef(path)
diff --git a/app/src/lib/git/revert.ts b/app/src/lib/git/revert.ts
index 8cfeadd320a..6c8129f57a8 100644
--- a/app/src/lib/git/revert.ts
+++ b/app/src/lib/git/revert.ts
@@ -1,9 +1,8 @@
-import { git, gitNetworkArguments, IGitExecutionOptions } from './core'
+import { git, IGitStringExecutionOptions } from './core'
 
 import { Repository } from '../../models/repository'
 import { Commit } from '../../models/commit'
 import { IRevertProgress } from '../../models/progress'
-import { IGitAccount } from '../../models/git-account'
 
 import { executionOptionsWithProgress } from '../progress/from-process'
 import { RevertProgressParser } from '../progress/revert'
@@ -11,6 +10,7 @@ import {
   envForRemoteOperation,
   getFallbackUrlForProxyResolve,
 } from './environment'
+import { IRemote } from '../../models/remote'
 
 /**
  * Creates a new commit that reverts the changes of a previous commit
@@ -18,26 +18,24 @@ import {
  * @param repository  - The repository to update
  *
  * @param commit         - The SHA of the commit to be reverted
- *
  */
 export async function revertCommit(
   repository: Repository,
   commit: Commit,
-  account: IGitAccount | null,
+  currentRemote: IRemote | null,
   progressCallback?: (progress: IRevertProgress) => void
 ) {
-  const args = [...gitNetworkArguments(), 'revert']
+  const args = ['revert']
   if (commit.parentSHAs.length > 1) {
     args.push('-m', '1')
   }
 
   args.push(commit.sha)
 
-  let opts: IGitExecutionOptions = {}
+  let opts: IGitStringExecutionOptions = {}
   if (progressCallback) {
     const env = await envForRemoteOperation(
-      account,
-      getFallbackUrlForProxyResolve(account, repository)
+      getFallbackUrlForProxyResolve(repository, currentRemote)
     )
     opts = await executionOptionsWithProgress(
       { env, trackLFSProgress: true },
diff --git a/app/src/lib/git/show.ts b/app/src/lib/git/show.ts
index cc7a35bbe77..ec91683609d 100644
--- a/app/src/lib/git/show.ts
+++ b/app/src/lib/git/show.ts
@@ -1,9 +1,7 @@
-import { ChildProcess } from 'child_process'
-
-import { git } from './core'
-import { spawnAndComplete } from './spawn'
+import { coerceToBuffer, git, isMaxBufferExceededError } from './core'
 
 import { Repository } from '../../models/repository'
+import { GitError } from 'dugite'
 
 /**
  * Retrieve the binary contents of a blob from the repository at a given
@@ -21,30 +19,15 @@ import { Repository } from '../../models/repository'
  * @param path       - The file path, relative to the repository
  *                     root from where to read the blob contents
  */
-export async function getBlobContents(
+export const getBlobContents = (
   repository: Repository,
   commitish: string,
   path: string
-): Promise<Buffer> {
-  const successExitCodes = new Set([0, 1])
-  const setBinaryEncoding: (process: ChildProcess) => void = cb => {
-    // If Node.js encounters a synchronous runtime error while spawning
-    // `stdout` will be undefined and the error will be emitted asynchronously
-    if (cb.stdout) {
-      cb.stdout.setEncoding('binary')
-    }
-  }
-
-  const args = ['show', `${commitish}:${path}`]
-  const opts = {
-    successExitCodes,
-    processCallback: setBinaryEncoding,
-  }
-
-  const blobContents = await git(args, repository.path, 'getBlobContents', opts)
-
-  return Buffer.from(blobContents.stdout, 'binary')
-}
+) =>
+  git(['show', `${commitish}:${path}`], repository.path, 'getBlobContents', {
+    successExitCodes: new Set([0, 1]),
+    encoding: 'buffer',
+  }).then(r => r.stdout)
 
 /**
  * Retrieve some or all binary contents of a blob from the repository
@@ -73,18 +56,32 @@ export async function getPartialBlobContents(
   commitish: string,
   path: string,
   length: number
-): Promise<Buffer> {
-  const successExitCodes = new Set([0, 1])
-
-  const args = ['show', `${commitish}:${path}`]
-
-  const { output } = await spawnAndComplete(
-    args,
-    repository.path,
-    'getPartialBlobContents',
-    successExitCodes,
+): Promise<Buffer | null> {
+  return getPartialBlobContentsCatchPathNotInRef(
+    repository,
+    commitish,
+    path,
     length
   )
+}
+
+export async function getPartialBlobContentsCatchPathNotInRef(
+  repository: Repository,
+  commitish: string,
+  path: string,
+  length: number
+): Promise<Buffer | null> {
+  const args = ['show', `${commitish}:${path}`]
 
-  return output
+  return git(args, repository.path, 'getPartialBlobContentsCatchPathNotInRef', {
+    maxBuffer: length,
+    expectedErrors: new Set([GitError.PathExistsButNotInRef]),
+    encoding: 'buffer',
+  })
+    .then(r =>
+      r.gitError === GitError.PathExistsButNotInRef ? null : r.stdout
+    )
+    .catch(e =>
+      isMaxBufferExceededError(e) ? coerceToBuffer(e.stdout) : Promise.reject(e)
+    )
 }
diff --git a/app/src/lib/git/spawn.ts b/app/src/lib/git/spawn.ts
index 5eb2831274d..73fe80bce43 100644
--- a/app/src/lib/git/spawn.ts
+++ b/app/src/lib/git/spawn.ts
@@ -1,16 +1,13 @@
-import { GitProcess } from 'dugite'
-import { IGitSpawnExecutionOptions } from 'dugite/build/lib/git-process'
+import { spawn, IGitSpawnOptions } from 'dugite'
 import * as GitPerf from '../../ui/lib/git-perf'
-import { isErrnoException } from '../errno-exception'
 import { withTrampolineEnv } from '../trampoline/trampoline-environment'
 
-type ProcessOutput = {
-  /** The contents of stdout received from the spawned process */
-  output: Buffer
-  /** The contents of stderr received from the spawned process */
-  error: Buffer
-  /** The exit code returned by the spawned process */
-  exitCode: number | null
+type SpawnOptions = IGitSpawnOptions & {
+  /**
+   * Whether the command about to run is part of a background task or not.
+   * This affects error handling and UI such as credential prompts.
+   */
+  readonly isBackgroundTask?: boolean
 }
 
 /**
@@ -20,124 +17,22 @@ type ProcessOutput = {
  * @param path The path to execute the command from.
  * @param name The name of the operation - for tracing purposes.
  * @param successExitCodes An optional array of exit codes that indicate success.
- * @param stdOutMaxLength  An optional maximum number of bytes to read from stdout.
- *                         If the process writes more than this number of bytes it
- *                         will be killed silently and the truncated output is
- *                         returned.
  */
 export const spawnGit = (
   args: string[],
   path: string,
   name: string,
-  options?: IGitSpawnExecutionOptions
+  options?: SpawnOptions
 ) =>
-  withTrampolineEnv(trampolineEnv =>
-    GitPerf.measure(`${name}: git ${args.join(' ')}`, async () =>
-      GitProcess.spawn(args, path, {
-        ...options,
-        env: { ...options?.env, ...trampolineEnv },
-      })
-    )
-  )
-
-/**
- * Spawn a Git process and buffer the stdout and stderr streams, deferring
- * all processing work to the caller.
- *
- * @param args Array of strings to pass to the Git executable.
- * @param path The path to execute the command from.
- * @param name The name of the operation - for tracing purposes.
- * @param successExitCodes An optional array of exit codes that indicate success.
- * @param stdOutMaxLength  An optional maximum number of bytes to read from stdout.
- *                         If the process writes more than this number of bytes it
- *                         will be killed silently and the truncated output is
- *                         returned.
- */
-export async function spawnAndComplete(
-  args: string[],
-  path: string,
-  name: string,
-  successExitCodes?: Set<number>,
-  stdOutMaxLength?: number
-): Promise<ProcessOutput> {
-  return new Promise<ProcessOutput>(async (resolve, reject) => {
-    const process = await spawnGit(args, path, name)
-
-    process.on('error', err => {
-      // If this is an exception thrown by Node.js while attempting to
-      // spawn let's keep the salient details but include the name of
-      // the operation.
-      if (isErrnoException(err)) {
-        reject(new Error(`Failed to execute ${name}: ${err.code}`))
-      } else {
-        // for unhandled errors raised by the process, let's surface this in the
-        // promise and make the caller handle it
-        reject(err)
-      }
-    })
-
-    let totalStdoutLength = 0
-    let killSignalSent = false
-
-    const stdoutChunks = new Array<Buffer>()
-
-    // If Node.js encounters a synchronous runtime error while spawning
-    // `stdout` will be undefined and the error will be emitted asynchronously
-    if (process.stdout) {
-      process.stdout.on('data', (chunk: Buffer) => {
-        if (!stdOutMaxLength || totalStdoutLength < stdOutMaxLength) {
-          stdoutChunks.push(chunk)
-          totalStdoutLength += chunk.length
-        }
-
-        if (
-          stdOutMaxLength &&
-          totalStdoutLength >= stdOutMaxLength &&
-          !killSignalSent
-        ) {
-          process.kill()
-          killSignalSent = true
-        }
-      })
-    }
-
-    const stderrChunks = new Array<Buffer>()
-
-    // See comment above about stdout and asynchronous errors.
-    if (process.stderr) {
-      process.stderr.on('data', (chunk: Buffer) => {
-        stderrChunks.push(chunk)
-      })
-    }
-
-    process.on('close', (code, signal) => {
-      const stdout = Buffer.concat(
-        stdoutChunks,
-        stdOutMaxLength
-          ? Math.min(stdOutMaxLength, totalStdoutLength)
-          : totalStdoutLength
-      )
-
-      const stderr = Buffer.concat(stderrChunks)
-
-      // mimic the experience of GitProcess.exec for handling known codes when
-      // the process terminates
-      const exitCodes = successExitCodes || new Set([0])
-
-      if ((code !== null && exitCodes.has(code)) || signal) {
-        resolve({
-          output: stdout,
-          error: stderr,
-          exitCode: code,
+  withTrampolineEnv(
+    trampolineEnv =>
+      GitPerf.measure(`${name}: git ${args.join(' ')}`, async () =>
+        spawn(args, path, {
+          ...options,
+          env: { ...options?.env, ...trampolineEnv },
         })
-        return
-      } else {
-        reject(
-          new Error(
-            `Git returned an unexpected exit code '${code}' which should be handled by the caller (${name}).'`
-          )
-        )
-      }
-    })
-  })
-}
+      ),
+    path,
+    options?.isBackgroundTask ?? false,
+    options?.env
+  )
diff --git a/app/src/lib/git/stash.ts b/app/src/lib/git/stash.ts
index d7bc81131c6..8667850a270 100644
--- a/app/src/lib/git/stash.ts
+++ b/app/src/lib/git/stash.ts
@@ -1,5 +1,5 @@
 import { GitError as DugiteError } from 'dugite'
-import { git, GitError } from './core'
+import { coerceToString, git, GitError } from './core'
 import { Repository } from '../../models/repository'
 import {
   IStashEntry,
@@ -10,9 +10,10 @@ import {
   WorkingDirectoryFileChange,
   CommittedFileChange,
 } from '../../models/status'
-import { parseChangedFiles } from './log'
+import { parseRawLogWithNumstat } from './log'
 import { stageFiles } from './update-index'
 import { Branch } from '../../models/branch'
+import { createLogParser } from './git-delimiter-parser'
 
 export const DesktopStashEntryMarker = '!!GitHub_Desktop'
 
@@ -41,17 +42,19 @@ type StashResult = {
  * as well as the total amount of stash entries.
  */
 export async function getStashes(repository: Repository): Promise<StashResult> {
-  const delimiter = '1F'
-  const delimiterString = String.fromCharCode(parseInt(delimiter, 16))
-  const format = ['%gD', '%H', '%gs'].join(`%x${delimiter}`)
+  const { formatArgs, parse } = createLogParser({
+    name: '%gD',
+    stashSha: '%H',
+    message: '%gs',
+    tree: '%T',
+    parents: '%P',
+  })
 
   const result = await git(
-    ['log', '-g', '-z', `--pretty=${format}`, 'refs/stash'],
+    ['log', '-g', ...formatArgs, 'refs/stash', '--'],
     repository.path,
     'getStashEntries',
-    {
-      successExitCodes: new Set([0, 128]),
-    }
+    { successExitCodes: new Set([0, 128]) }
   )
 
   // There's no refs/stashes reflog in the repository or it's not
@@ -60,34 +63,55 @@ export async function getStashes(repository: Repository): Promise<StashResult> {
     return { desktopEntries: [], stashEntryCount: 0 }
   }
 
-  const desktopStashEntries: Array<IStashEntry> = []
-  const files: StashedFileChanges = {
-    kind: StashedChangesLoadStates.NotLoaded,
-  }
+  const desktopEntries: Array<IStashEntry> = []
+  const files: StashedFileChanges = { kind: StashedChangesLoadStates.NotLoaded }
 
-  const entries = result.stdout.split('\0').filter(s => s !== '')
-  for (const entry of entries) {
-    const pieces = entry.split(delimiterString)
-
-    if (pieces.length === 3) {
-      const [name, stashSha, message] = pieces
-      const branchName = extractBranchFromMessage(message)
-
-      if (branchName !== null) {
-        desktopStashEntries.push({
-          name,
-          branchName,
-          stashSha,
-          files,
-        })
-      }
+  const entries = parse(result.stdout)
+
+  for (const { name, message, stashSha, tree, parents } of entries) {
+    const branchName = extractBranchFromMessage(message)
+
+    if (branchName !== null) {
+      desktopEntries.push({
+        name,
+        stashSha,
+        branchName,
+        tree,
+        parents: parents.length > 0 ? parents.split(' ') : [],
+        files,
+      })
     }
   }
 
-  return {
-    desktopEntries: desktopStashEntries,
-    stashEntryCount: entries.length - 1,
-  }
+  return { desktopEntries, stashEntryCount: entries.length - 1 }
+}
+
+/**
+ * Moves a stash entry to a different branch by means of creating
+ * a new stash entry associated with the new branch and dropping the old
+ * stash entry.
+ */
+export async function moveStashEntry(
+  repository: Repository,
+  { stashSha, parents, tree }: IStashEntry,
+  branchName: string
+) {
+  const message = `On ${branchName}: ${createDesktopStashMessage(branchName)}`
+  const parentArgs = parents.flatMap(p => ['-p', p])
+
+  const { stdout: commitId } = await git(
+    ['commit-tree', ...parentArgs, '-m', message, '--no-gpg-sign', tree],
+    repository.path,
+    'moveStashEntryToBranch'
+  )
+
+  await git(
+    ['stash', 'store', '-m', message, commitId.trim()],
+    repository.path,
+    'moveStashEntryToBranch'
+  )
+
+  await dropDesktopStashEntry(repository, stashSha)
 }
 
 /**
@@ -133,28 +157,45 @@ export async function createDesktopStashEntry(
   const message = createDesktopStashMessage(branchName)
   const args = ['stash', 'push', '-m', message]
 
-  const result = await git(args, repository.path, 'createStashEntry', {
-    successExitCodes: new Set<number>([0, 1]),
-  })
-
-  if (result.exitCode === 1) {
-    // search for any line starting with `error:` -  /m here to ensure this is
-    // applied to each line, without needing to split the text
-    const errorPrefixRe = /^error: /m
-
-    const matches = errorPrefixRe.exec(result.stderr)
-    if (matches !== null && matches.length > 0) {
-      // rethrow, because these messages should prevent the stash from being created
-      throw new GitError(result, args)
+  const result = await git(args, repository.path, 'createStashEntry').catch(
+    e => {
+      // Note: 2024: Here be dragons. As I converted this code to get rid of the
+      // successExitCode use I got curious about the assumptions made in the
+      // following logic. It assumes that as long as the exit code for `git
+      // stash push` is 1 and there are no lines beginning with "error: " then
+      // a stash was created. That didn't hold up to a quick read of the stash
+      // code. For example, running git stash push in an unborn repository will
+      // get you an exit code of 1 but no stash was created:
+      //
+      // % git stash push -m foo ; echo $?
+      // You do not have the initial commit yet
+      // 1
+      //
+      // I'm not going to mess with this now but I felt the need to document
+      // my findings should I or any other brave soul choose to tackle this in
+      // the future.
+      if (e instanceof GitError && e.result.exitCode === 1) {
+        // search for any line starting with `error:` -  /m here to ensure this is
+        // applied to each line, without needing to split the text
+        const errorPrefixRe = /^error: /m
+
+        const matches = errorPrefixRe.exec(coerceToString(e.result.stderr))
+        if (matches !== null && matches.length > 0) {
+          // rethrow, because these messages should prevent the stash from being created
+          return Promise.reject(e)
+        }
+
+        // if no error messages were emitted by Git, we should log but continue because
+        // a valid stash was created and this should not interfere with the checkout
+
+        log.info(
+          `[createDesktopStashEntry] a stash was created successfully but exit code ${result.exitCode} reported. stderr: ${result.stderr}`
+        )
+        return e.result
+      }
+      return Promise.reject(e)
     }
-
-    // if no error messages were emitted by Git, we should log but continue because
-    // a valid stash was created and this should not interfere with the checkout
-
-    log.info(
-      `[createDesktopStashEntry] a stash was created successfully but exit code ${result.exitCode} reported. stderr: ${result.stderr}`
-    )
-  }
+  )
 
   // Stash doesn't consider it an error that there aren't any local changes to save.
   if (result.stdout === 'No local changes to save\n') {
@@ -200,31 +241,31 @@ export async function popStashEntry(
   // ignoring these git errors for now, this will change when we start
   // implementing the stash conflict flow
   const expectedErrors = new Set<DugiteError>([DugiteError.MergeConflicts])
-  const successExitCodes = new Set<number>([0, 1])
   const stashToPop = await getStashEntryMatchingSha(repository, stashSha)
 
   if (stashToPop !== null) {
     const args = ['stash', 'pop', '--quiet', `${stashToPop.name}`]
-    const result = await git(args, repository.path, 'popStashEntry', {
+    await git(args, repository.path, 'popStashEntry', {
       expectedErrors,
-      successExitCodes,
-    })
-
-    // popping a stashes that create conflicts in the working directory
-    // report an exit code of `1` and are not dropped after being applied.
-    // so, we check for this case and drop them manually
-    if (result.exitCode === 1) {
-      if (result.stderr.length > 0) {
-        // rethrow, because anything in stderr should prevent the stash from being popped
-        throw new GitError(result, args)
+    }).catch(e => {
+      // popping a stashes that create conflicts in the working directory
+      // report an exit code of `1` and are not dropped after being applied.
+      // so, we check for this case and drop them manually unless there's
+      // anything in stderr as that could have prevented the stash from being
+      // popped. Not the greatest approach but stash isn't very communicative
+      if (
+        e instanceof GitError &&
+        e.result.exitCode === 1 &&
+        e.result.stderr.length === 0
+      ) {
+        log.info(
+          `[popStashEntry] a stash was popped successfully but exit code ${e.result.exitCode} reported.`
+        )
+        // bye bye
+        return dropDesktopStashEntry(repository, stashSha)
       }
-
-      log.info(
-        `[popStashEntry] a stash was popped successfully but exit code ${result.exitCode} reported.`
-      )
-      // bye bye
-      await dropDesktopStashEntry(repository, stashSha)
-    }
+      return Promise.reject(e)
+    })
   }
 }
 
@@ -233,59 +274,24 @@ function extractBranchFromMessage(message: string): string | null {
   return match === null || match[1].length === 0 ? null : match[1]
 }
 
-/**
- * Get the files that were changed in the given stash commit.
- *
- * This is different than `getChangedFiles` because stashes
- * have _3 parents(!!!)_
- */
+/** Get the files that were changed in the given stash commit */
 export async function getStashedFiles(
   repository: Repository,
   stashSha: string
 ): Promise<ReadonlyArray<CommittedFileChange>> {
-  const [trackedFiles, untrackedFiles] = await Promise.all([
-    getChangedFilesWithinStash(repository, stashSha),
-    getChangedFilesWithinStash(repository, `${stashSha}^3`),
-  ])
-
-  const files = new Map<string, CommittedFileChange>()
-  trackedFiles.forEach(x => files.set(x.path, x))
-  untrackedFiles.forEach(x => files.set(x.path, x))
-  return [...files.values()].sort((x, y) => x.path.localeCompare(y.path))
-}
-
-/**
- * Same thing as `getChangedFiles` but with extra handling for 128 exit code
- * (which happens if the commit's parent is not valid)
- *
- * **TODO:** merge this with `getChangedFiles` in `log.ts`
- */
-async function getChangedFilesWithinStash(repository: Repository, sha: string) {
-  // opt-in for rename detection (-M) and copies detection (-C)
-  // this is equivalent to the user configuring 'diff.renames' to 'copies'
-  // NOTE: order here matters - doing -M before -C means copies aren't detected
   const args = [
-    'log',
-    sha,
-    '-C',
-    '-M',
-    '-m',
-    '-1',
-    '--no-show-signature',
-    '--first-parent',
-    '--name-status',
-    '--format=format:',
+    'stash',
+    'show',
+    stashSha,
+    '--raw',
+    '--numstat',
     '-z',
+    '--format=format:',
+    '--no-show-signature',
     '--',
   ]
-  const result = await git(args, repository.path, 'getChangedFilesForStash', {
-    // if this fails, its most likely
-    // because there weren't any untracked files,
-    // and that's okay!
-    successExitCodes: new Set([0, 128]),
-  })
-  if (result.exitCode === 0 && result.stdout.length > 0) {
-    return parseChangedFiles(result.stdout, sha)
-  }
-  return []
+
+  const { stdout } = await git(args, repository.path, 'getStashedFiles')
+
+  return parseRawLogWithNumstat(stdout, stashSha, `${stashSha}^`).files
 }
diff --git a/app/src/lib/git/status.ts b/app/src/lib/git/status.ts
index b5008a8537e..c2837aa562f 100644
--- a/app/src/lib/git/status.ts
+++ b/app/src/lib/git/status.ts
@@ -1,4 +1,3 @@
-import { spawnAndComplete } from './spawn'
 import { getFilesWithConflictMarkers } from './diff-check'
 import {
   WorkingDirectoryStatus,
@@ -28,14 +27,7 @@ import { getBinaryPaths } from './diff'
 import { getRebaseInternalState } from './rebase'
 import { RebaseInternalState } from '../../models/rebase'
 import { isCherryPickHeadFound } from './cherry-pick'
-
-/**
- * V8 has a limit on the size of string it can create (~256MB), and unless we want to
- * trigger an unhandled exception we need to do the encoding conversion by hand.
- *
- * As we may be executing status often, we should keep this to a reasonable threshold.
- */
-const MaxStatusBufferSize = 20e6 // 20MB in decimal
+import { git } from '.'
 
 /** The encapsulation of the result from 'git status' */
 export interface IStatusResult {
@@ -104,7 +96,10 @@ function parseConflictedState(
             conflictDetails.conflictCountsByPath.get(path) || 0,
         }
       } else {
-        return { kind: AppFileStatusKind.Conflicted, entry }
+        return {
+          kind: AppFileStatusKind.Conflicted,
+          entry,
+        }
       }
     }
     case UnmergedEntrySummary.BothModified: {
@@ -140,18 +135,43 @@ function convertToAppStatus(
   if (entry.kind === 'ordinary') {
     switch (entry.type) {
       case 'added':
-        return { kind: AppFileStatusKind.New }
+        return {
+          kind: AppFileStatusKind.New,
+          submoduleStatus: entry.submoduleStatus,
+        }
       case 'modified':
-        return { kind: AppFileStatusKind.Modified }
+        return {
+          kind: AppFileStatusKind.Modified,
+          submoduleStatus: entry.submoduleStatus,
+        }
       case 'deleted':
-        return { kind: AppFileStatusKind.Deleted }
+        return {
+          kind: AppFileStatusKind.Deleted,
+          submoduleStatus: entry.submoduleStatus,
+        }
     }
   } else if (entry.kind === 'copied' && oldPath != null) {
-    return { kind: AppFileStatusKind.Copied, oldPath }
+    return {
+      kind: AppFileStatusKind.Copied,
+      oldPath,
+      submoduleStatus: entry.submoduleStatus,
+      renameIncludesModifications: false,
+    }
   } else if (entry.kind === 'renamed' && oldPath != null) {
-    return { kind: AppFileStatusKind.Renamed, oldPath }
+    return {
+      kind: AppFileStatusKind.Renamed,
+      oldPath,
+      submoduleStatus: entry.submoduleStatus,
+      renameIncludesModifications:
+        entry.workingTree === GitStatusEntry.Modified ||
+        (entry.renameOrCopyScore !== undefined &&
+          entry.renameOrCopyScore < 100),
+    }
   } else if (entry.kind === 'untracked') {
-    return { kind: AppFileStatusKind.Untracked }
+    return {
+      kind: AppFileStatusKind.Untracked,
+      submoduleStatus: entry.submoduleStatus,
+    }
   } else if (entry.kind === 'conflicted') {
     return parseConflictedState(entry, path, conflictDetails)
   }
@@ -168,46 +188,37 @@ const conflictStatusCodes = ['DD', 'AU', 'UD', 'UA', 'DU', 'AA', 'UU']
  *  and fail gracefully if the location is not a Git repository
  */
 export async function getStatus(
-  repository: Repository
+  repository: Repository,
+  includeUntracked = true
 ): Promise<IStatusResult | null> {
   const args = [
     '--no-optional-locks',
     'status',
-    '--untracked-files=all',
+    ...(includeUntracked ? ['--untracked-files=all'] : []),
     '--branch',
     '--porcelain=2',
     '-z',
   ]
 
-  const result = await spawnAndComplete(
-    args,
-    repository.path,
-    'getStatus',
-    new Set([0, 128])
-  )
+  const { stdout, exitCode } = await git(args, repository.path, 'getStatus', {
+    successExitCodes: new Set([0, 128]),
+    encoding: 'buffer',
+  })
 
-  if (result.exitCode === 128) {
+  if (exitCode === 128) {
     log.debug(
       `'git status' returned 128 for '${repository.path}' and is likely missing its .git directory`
     )
     return null
   }
 
-  if (result.output.length > MaxStatusBufferSize) {
-    log.error(
-      `'git status' emitted ${result.output.length} bytes, which is beyond the supported threshold of ${MaxStatusBufferSize} bytes`
-    )
-    return null
-  }
-
-  const stdout = result.output.toString('utf8')
   const parsed = parsePorcelainStatus(stdout)
   const headers = parsed.filter(isStatusHeader)
   const entries = parsed.filter(isStatusEntry)
 
   const mergeHeadFound = await isMergeHeadSet(repository)
-  const conflictedFilesInIndex = entries.some(
-    e => conflictStatusCodes.indexOf(e.statusCode) > -1
+  const conflictedFilesInIndex = entries.filter(e =>
+    conflictStatusCodes.includes(e.statusCode)
   )
   const rebaseInternalState = await getRebaseInternalState(repository)
 
@@ -254,7 +265,7 @@ export async function getStatus(
     workingDirectory,
     isCherryPickingHeadFound,
     squashMsgFound,
-    doConflictedFilesExist: conflictedFilesInIndex,
+    doConflictedFilesExist: conflictedFilesInIndex.length > 0,
   }
 }
 
@@ -270,7 +281,11 @@ function buildStatusMap(
   entry: IStatusEntry,
   conflictDetails: ConflictFilesDetails
 ): Map<string, WorkingDirectoryFileChange> {
-  const status = mapStatus(entry.statusCode)
+  const status = mapStatus(
+    entry.statusCode,
+    entry.submoduleStatusCode,
+    entry.renameOrCopyScore
+  )
 
   if (status.kind === 'ordinary') {
     // when a file is added in the index but then removed in the working
@@ -300,7 +315,14 @@ function buildStatusMap(
     entry.oldPath
   )
 
-  const selection = DiffSelection.fromInitialSelection(DiffSelectionType.All)
+  const initialSelectionType =
+    appStatus.kind === AppFileStatusKind.Modified &&
+    appStatus.submoduleStatus !== undefined &&
+    !appStatus.submoduleStatus.commitChanged
+      ? DiffSelectionType.None
+      : DiffSelectionType.All
+
+  const selection = DiffSelection.fromInitialSelection(initialSelectionType)
 
   files.set(
     entry.path,
@@ -349,22 +371,36 @@ function parseStatusHeader(results: IStatusHeadersData, header: IStatusHeader) {
   }
 }
 
-async function getMergeConflictDetails(repository: Repository) {
+async function getMergeConflictDetails(
+  repository: Repository,
+  conflictedFilesInIndex: ReadonlyArray<IStatusEntry>
+) {
   const conflictCountsByPath = await getFilesWithConflictMarkers(
     repository.path
   )
-  const binaryFilePaths = await getBinaryPaths(repository, 'MERGE_HEAD')
+  const binaryFilePaths = await getBinaryPaths(
+    repository,
+    'MERGE_HEAD',
+    conflictedFilesInIndex
+  )
   return {
     conflictCountsByPath,
     binaryFilePaths,
   }
 }
 
-async function getRebaseConflictDetails(repository: Repository) {
+async function getRebaseConflictDetails(
+  repository: Repository,
+  conflictedFilesInIndex: ReadonlyArray<IStatusEntry>
+) {
   const conflictCountsByPath = await getFilesWithConflictMarkers(
     repository.path
   )
-  const binaryFilePaths = await getBinaryPaths(repository, 'REBASE_HEAD')
+  const binaryFilePaths = await getBinaryPaths(
+    repository,
+    'REBASE_HEAD',
+    conflictedFilesInIndex
+  )
   return {
     conflictCountsByPath,
     binaryFilePaths,
@@ -375,14 +411,21 @@ async function getRebaseConflictDetails(repository: Repository) {
  * We need to do these operations to detect conflicts that were the result
  * of popping a stash into the index
  */
-async function getWorkingDirectoryConflictDetails(repository: Repository) {
+async function getWorkingDirectoryConflictDetails(
+  repository: Repository,
+  conflictedFilesInIndex: ReadonlyArray<IStatusEntry>
+) {
   const conflictCountsByPath = await getFilesWithConflictMarkers(
     repository.path
   )
   let binaryFilePaths: ReadonlyArray<string> = []
   try {
     // its totally fine if HEAD doesn't exist, which throws an error
-    binaryFilePaths = await getBinaryPaths(repository, 'HEAD')
+    binaryFilePaths = await getBinaryPaths(
+      repository,
+      'HEAD',
+      conflictedFilesInIndex
+    )
   } catch (error) {}
 
   return {
@@ -397,26 +440,36 @@ async function getWorkingDirectoryConflictDetails(repository: Repository) {
  *
  * @param repository to get details from
  * @param mergeHeadFound whether a merge conflict has been detected
- * @param lookForStashConflicts whether it looks like a stash has introduced conflicts
- * @param rebaseInternalState details about the current rebase operation (if found)
+ * @param conflictedFilesInIndex all files marked as being conflicted in the
+ *                               index. Used to check for files using the binary
+ *                               merge driver and whether it looks like a stash
+ *                               has introduced conflicts
+ * @param rebaseInternalState details about the current rebase operation (if
+ * found)
  */
 async function getConflictDetails(
   repository: Repository,
   mergeHeadFound: boolean,
-  lookForStashConflicts: boolean,
+  conflictedFilesInIndex: ReadonlyArray<IStatusEntry>,
   rebaseInternalState: RebaseInternalState | null
 ): Promise<ConflictFilesDetails> {
   try {
     if (mergeHeadFound) {
-      return await getMergeConflictDetails(repository)
+      return await getMergeConflictDetails(repository, conflictedFilesInIndex)
     }
 
     if (rebaseInternalState !== null) {
-      return await getRebaseConflictDetails(repository)
+      return await getRebaseConflictDetails(repository, conflictedFilesInIndex)
     }
 
-    if (lookForStashConflicts) {
-      return await getWorkingDirectoryConflictDetails(repository)
+    // If there's conflicted files in the index but we don't have a merge head
+    // or a rebase internal state, then we're likely in a situation where a
+    // stash has introduced conflicts
+    if (conflictedFilesInIndex.length > 0) {
+      return await getWorkingDirectoryConflictDetails(
+        repository,
+        conflictedFilesInIndex
+      )
     }
   } catch (error) {
     log.error(
diff --git a/app/src/lib/git/tag.ts b/app/src/lib/git/tag.ts
index 50f8d38c79b..cdb775edc6f 100644
--- a/app/src/lib/git/tag.ts
+++ b/app/src/lib/git/tag.ts
@@ -1,6 +1,5 @@
-import { git, gitNetworkArguments } from './core'
+import { git } from './core'
 import { Repository } from '../../models/repository'
-import { IGitAccount } from '../../models/git-account'
 import { IRemote } from '../../models/remote'
 import { envForRemoteOperation } from './environment'
 
@@ -86,12 +85,10 @@ export async function getAllTags(
  */
 export async function fetchTagsToPush(
   repository: Repository,
-  account: IGitAccount | null,
   remote: IRemote,
   branchName: string
 ): Promise<ReadonlyArray<string>> {
   const args = [
-    ...gitNetworkArguments(),
     'push',
     remote.name,
     branchName,
@@ -102,7 +99,7 @@ export async function fetchTagsToPush(
   ]
 
   const result = await git(args, repository.path, 'fetchTagsToPush', {
-    env: await envForRemoteOperation(account, remote.url),
+    env: await envForRemoteOperation(remote.url),
     successExitCodes: new Set([0, 1, 128]),
   })
 
diff --git a/app/src/lib/globals.d.ts b/app/src/lib/globals.d.ts
index ea4b3c0416a..7c065f2ed85 100644
--- a/app/src/lib/globals.d.ts
+++ b/app/src/lib/globals.d.ts
@@ -44,8 +44,6 @@ declare const __RELEASE_CHANNEL__:
   | 'test'
   | 'development'
 
-declare const __CLI_COMMANDS__: ReadonlyArray<string>
-
 /** The URL for Squirrel's updates. */
 declare const __UPDATES_URL__: string
 
@@ -162,6 +160,8 @@ interface Window {
 
 interface HTMLDialogElement {
   showModal: () => void
+  close: (returnValue?: string | undefined) => void
+  open: boolean
 }
 /**
  * Obtain the number of elements of a tuple type
diff --git a/app/src/lib/gravatar.ts b/app/src/lib/gravatar.ts
deleted file mode 100644
index 8b6338000b6..00000000000
--- a/app/src/lib/gravatar.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import * as crypto from 'crypto'
-
-/**
- * Convert an email address to a Gravatar URL format
- *
- * @param email The email address associated with a user
- * @param size The size (in pixels) of the avatar to render
- */
-export function generateGravatarUrl(email: string, size: number = 60): string {
-  const input = email.trim().toLowerCase()
-  const hash = crypto.createHash('md5').update(input).digest('hex')
-
-  return `https://www.gravatar.com/avatar/${hash}?s=${size}`
-}
diff --git a/app/src/lib/helpers/default-branch.ts b/app/src/lib/helpers/default-branch.ts
index a21328e20fc..521666c4647 100644
--- a/app/src/lib/helpers/default-branch.ts
+++ b/app/src/lib/helpers/default-branch.ts
@@ -12,12 +12,6 @@ const DefaultBranchInDesktop = 'main'
  */
 const DefaultBranchSettingName = 'init.defaultBranch'
 
-/**
- * The branch names that Desktop shows by default as radio buttons on the
- * form that allows users to change default branch name.
- */
-export const SuggestedBranchNames: ReadonlyArray<string> = ['main', 'master']
-
 /**
  * Returns the configured default branch when creating new repositories
  */
diff --git a/app/src/lib/helpers/non-fatal-exception.ts b/app/src/lib/helpers/non-fatal-exception.ts
index cdc2d3ca853..c55fdf52c69 100644
--- a/app/src/lib/helpers/non-fatal-exception.ts
+++ b/app/src/lib/helpers/non-fatal-exception.ts
@@ -26,7 +26,23 @@ let lastNonFatalException: number | undefined = undefined
 /** Max one non fatal exeception per minute */
 const minIntervalBetweenNonFatalExceptions = 60 * 1000
 
-export function sendNonFatalException(kind: string, error: Error) {
+export type ExceptionKinds =
+  | 'invalidListSelection'
+  | 'TooManyPopups'
+  | 'remoteNameMismatch'
+  | 'tutorialRepoCreation'
+  | 'multiCommitOperation'
+  | 'PullRequestState'
+  | 'trampolineCommandParser'
+  | 'trampolineServer'
+  | 'PopupNoId'
+  | 'FailedToStartPullRequest'
+  | 'unhandledRejection'
+  | 'rebaseConflictsWithBranchAlreadyUpToDate'
+  | 'forkCreation'
+  | 'NoSuggestedActionsProvided'
+
+export function sendNonFatalException(kind: ExceptionKinds, error: Error) {
   if (getHasOptedOutOfStats()) {
     return
   }
diff --git a/app/src/lib/helpers/regex.ts b/app/src/lib/helpers/regex.ts
index 9e479c45edc..130ff6002b2 100644
--- a/app/src/lib/helpers/regex.ts
+++ b/app/src/lib/helpers/regex.ts
@@ -1,47 +1,3 @@
-/**
- * Get all regex captures within a body of text
- *
- * @param text string to search
- * @param re regex to search with. must have global option and one capture
- *
- * @returns arrays of strings captured by supplied regex
- */
-export function getCaptures(
-  text: string,
-  re: RegExp
-): ReadonlyArray<Array<string>> {
-  const matches = getMatches(text, re)
-  const captures = matches.reduce(
-    (acc, match) => acc.concat([match.slice(1)]),
-    new Array<Array<string>>()
-  )
-  return captures
-}
-
-/**
- * Get all regex matches within a body of text
- *
- * @param text string to search
- * @param re regex to search with. must have global option
- * @returns set of strings captured by supplied regex
- */
-export function getMatches(text: string, re: RegExp): Array<RegExpExecArray> {
-  if (re.global === false) {
-    throw new Error(
-      'A regex has been provided that is not marked as global, and has the potential to execute forever if it finds a match'
-    )
-  }
-
-  const matches = new Array<RegExpExecArray>()
-  let match = re.exec(text)
-
-  while (match !== null) {
-    matches.push(match)
-    match = re.exec(text)
-  }
-  return matches
-}
-
 /*
  * Looks for the phrases "remote: error File " and " is (file size I.E. 106.5 MB); this exceeds GitHub's file size limit of 100.00 MB"
  * inside of a string containing errors and return an array of all the filenames and their sizes located between these two strings.
diff --git a/app/src/lib/helpers/repo-rules.ts b/app/src/lib/helpers/repo-rules.ts
new file mode 100644
index 00000000000..0ad6eee48b7
--- /dev/null
+++ b/app/src/lib/helpers/repo-rules.ts
@@ -0,0 +1,222 @@
+import { RE2JS } from 're2js'
+import {
+  RepoRulesInfo,
+  IRepoRulesMetadataRule,
+  RepoRulesMetadataMatcher,
+  RepoRuleEnforced,
+} from '../../models/repo-rules'
+import {
+  APIRepoRuleMetadataOperator,
+  APIRepoRuleType,
+  IAPIRepoRule,
+  IAPIRepoRuleMetadataParameters,
+  IAPIRepoRuleset,
+} from '../api'
+import { supportsRepoRules } from '../endpoint-capabilities'
+import { Account } from '../../models/account'
+import {
+  Repository,
+  isRepositoryWithGitHubRepository,
+} from '../../models/repository'
+import { getBooleanConfigValue } from '../git'
+
+/**
+ * Returns whether repo rules could potentially exist for the provided account and repository.
+ * This only performs client-side checks, such as whether the user is on a free plan
+ * and the repo is public.
+ */
+export function useRepoRulesLogic(
+  account: Account | null,
+  repository: Repository
+): boolean {
+  if (
+    !account ||
+    !repository ||
+    !isRepositoryWithGitHubRepository(repository)
+  ) {
+    return false
+  }
+
+  const { endpoint, owner, isPrivate } = repository.gitHubRepository
+
+  if (!supportsRepoRules(endpoint)) {
+    return false
+  }
+
+  // repo owner's plan can't be checked, only the current user's. purposely return true
+  // if the repo owner is someone else, because if the current user is a collaborator on
+  // the free plan but the owner is a pro member, then repo rules could still be enabled.
+  // errors will be thrown by the API in this case, but there's no way to preemptively
+  // check for that.
+  if (
+    account.login === owner.login &&
+    (!account.plan || account.plan === 'free') &&
+    isPrivate
+  ) {
+    return false
+  }
+
+  return true
+}
+
+/**
+ * Parses the GitHub API response for a branch's repo rules into a more useable
+ * format.
+ */
+export async function parseRepoRules(
+  rules: ReadonlyArray<IAPIRepoRule>,
+  rulesets: ReadonlyMap<number, IAPIRepoRuleset>,
+  repository: Repository
+): Promise<RepoRulesInfo> {
+  const info = new RepoRulesInfo()
+  let gpgSignEnabled: boolean | undefined = undefined
+
+  for (const rule of rules) {
+    // if a ruleset is null/undefined, then act as if the rule doesn't exist because
+    // we don't know what will happen when they push
+    const ruleset = rulesets.get(rule.ruleset_id)
+    if (ruleset == null) {
+      continue
+    }
+
+    // a rule may be configured multiple times, and the strictest value always applies.
+    // since the rule will not exist in the API response if it's not enforced, we know
+    // we're always assigning either 'bypass' or true below. therefore, we only need
+    // to check if the existing value is true, otherwise it can always be overridden.
+    const enforced =
+      ruleset.current_user_can_bypass === 'always' ? 'bypass' : true
+
+    switch (rule.type) {
+      case APIRepoRuleType.Update:
+      case APIRepoRuleType.RequiredDeployments:
+      case APIRepoRuleType.RequiredStatusChecks:
+        info.basicCommitWarning =
+          info.basicCommitWarning !== true ? enforced : true
+        break
+
+      case APIRepoRuleType.Creation:
+        info.creationRestricted =
+          info.creationRestricted !== true ? enforced : true
+        break
+
+      case APIRepoRuleType.RequiredSignatures:
+        // check if the user has commit signing configured. if they do, the rule
+        // passes and doesn't need to be warned about.
+        gpgSignEnabled ??=
+          (await getBooleanConfigValue(repository, 'commit.gpgsign')) ?? false
+
+        if (gpgSignEnabled !== true) {
+          info.signedCommitsRequired =
+            info.signedCommitsRequired !== true ? enforced : true
+        }
+        break
+
+      case APIRepoRuleType.PullRequest:
+        info.pullRequestRequired =
+          info.pullRequestRequired !== true ? enforced : true
+        break
+
+      case APIRepoRuleType.CommitMessagePattern:
+        info.commitMessagePatterns.push(toMetadataRule(rule, enforced))
+        break
+
+      case APIRepoRuleType.CommitAuthorEmailPattern:
+        info.commitAuthorEmailPatterns.push(toMetadataRule(rule, enforced))
+        break
+
+      case APIRepoRuleType.CommitterEmailPattern:
+        info.committerEmailPatterns.push(toMetadataRule(rule, enforced))
+        break
+
+      case APIRepoRuleType.BranchNamePattern:
+        info.branchNamePatterns.push(toMetadataRule(rule, enforced))
+        break
+    }
+  }
+
+  return info
+}
+
+function toMetadataRule(
+  rule: IAPIRepoRule | undefined,
+  enforced: RepoRuleEnforced
+): IRepoRulesMetadataRule | undefined {
+  if (!rule?.parameters) {
+    return undefined
+  }
+
+  return {
+    enforced,
+    matcher: toMatcher(rule.parameters),
+    humanDescription: toHumanDescription(rule.parameters),
+    rulesetId: rule.ruleset_id,
+  }
+}
+
+function toHumanDescription(apiParams: IAPIRepoRuleMetadataParameters): string {
+  let description = 'must '
+  if (apiParams.negate) {
+    description += 'not '
+  }
+
+  if (apiParams.operator === APIRepoRuleMetadataOperator.RegexMatch) {
+    return description + `match the regular expression "${apiParams.pattern}"`
+  }
+
+  switch (apiParams.operator) {
+    case APIRepoRuleMetadataOperator.StartsWith:
+      description += 'start with '
+      break
+
+    case APIRepoRuleMetadataOperator.EndsWith:
+      description += 'end with '
+      break
+
+    case APIRepoRuleMetadataOperator.Contains:
+      description += 'contain '
+      break
+  }
+
+  return description + `"${apiParams.pattern}"`
+}
+
+/**
+ * Converts the given metadata rule into a matcher function that uses regex to test the rule.
+ */
+function toMatcher(
+  rule: IAPIRepoRuleMetadataParameters | undefined
+): RepoRulesMetadataMatcher {
+  if (!rule) {
+    return () => false
+  }
+
+  let regex: RE2JS
+
+  switch (rule.operator) {
+    case APIRepoRuleMetadataOperator.StartsWith:
+      regex = RE2JS.compile(`^${RE2JS.quote(rule.pattern)}`)
+      break
+
+    case APIRepoRuleMetadataOperator.EndsWith:
+      regex = RE2JS.compile(`${RE2JS.quote(rule.pattern)}$`)
+      break
+
+    case APIRepoRuleMetadataOperator.Contains:
+      regex = RE2JS.compile(`.*${RE2JS.quote(rule.pattern)}.*`)
+      break
+
+    case APIRepoRuleMetadataOperator.RegexMatch:
+      regex = RE2JS.compile(rule.pattern)
+      break
+  }
+
+  if (regex) {
+    if (rule.negate) {
+      return (toMatch: string) => !regex.matcher(toMatch).find()
+    } else {
+      return (toMatch: string) => regex.matcher(toMatch).find()
+    }
+  } else {
+    return () => false
+  }
+}
diff --git a/app/src/lib/http.ts b/app/src/lib/http.ts
index af011b326b8..f0d5ac1a409 100644
--- a/app/src/lib/http.ts
+++ b/app/src/lib/http.ts
@@ -2,7 +2,7 @@ import * as appProxy from '../ui/lib/app-proxy'
 import { URL } from 'url'
 
 /** The HTTP methods available. */
-export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'HEAD'
+export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'HEAD' | 'DELETE'
 
 /**
  * The structure of error messages returned from the GitHub API.
@@ -153,7 +153,7 @@ export function request(
 }
 
 /** Get the user agent to use for all requests. */
-function getUserAgent() {
+export function getUserAgent() {
   const platform = __DARWIN__ ? 'Macintosh' : 'Windows'
   return `GitHubDesktop/${appProxy.getVersion()} (${platform})`
 }
diff --git a/app/src/lib/ipc-shared.ts b/app/src/lib/ipc-shared.ts
index 07ffdb7cc09..f6539023518 100644
--- a/app/src/lib/ipc-shared.ts
+++ b/app/src/lib/ipc-shared.ts
@@ -16,6 +16,7 @@ import { ThemeSource } from '../ui/lib/theme-source'
 import { DesktopNotificationPermission } from 'desktop-notifications/dist/notification-permission'
 import { NotificationCallback } from 'desktop-notifications/dist/notification-callback'
 import { DesktopAliveEvent } from './stores/alive-store'
+import { CLIAction } from './cli-action'
 
 /**
  * Defines the simplex IPC channel names we use from the renderer
@@ -25,6 +26,7 @@ import { DesktopAliveEvent } from './stores/alive-store'
  */
 export type RequestChannels = {
   'select-all-window-contents': () => void
+  'dialog-did-open': () => void
   'update-menu-state': (
     state: Array<{ id: MenuIDs; state: IMenuItemState }>
   ) => void
@@ -46,6 +48,8 @@ export type RequestChannels = {
   'menu-event': (name: MenuEvent) => void
   log: (level: LogLevel, message: string) => void
   'will-quit': () => void
+  'will-quit-even-if-updating': () => void
+  'cancel-quitting': () => void
   'crash-ready': () => void
   'crash-quit': () => void
   'window-state-changed': (windowState: WindowState) => void
@@ -54,6 +58,7 @@ export type RequestChannels = {
   'app-menu': (menu: IMenu) => void
   'launch-timing-stats': (stats: ILaunchStats) => void
   'url-action': (action: URLActionType) => void
+  'cli-action': (action: CLIAction) => void
   'certificate-error': (
     certificate: Electron.Certificate,
     error: string,
@@ -63,6 +68,7 @@ export type RequestChannels = {
   blur: () => void
   'update-accounts': (accounts: ReadonlyArray<EndpointToken>) => void
   'quit-and-install-updates': () => void
+  'quit-app': () => void
   'minimize-window': () => void
   'maximize-window': () => void
   'unmaximize-window': () => void
@@ -77,6 +83,9 @@ export type RequestChannels = {
   'focus-window': () => void
   'notification-event': NotificationCallback<DesktopAliveEvent>
   'set-window-zoom-factor': (zoomFactor: number) => void
+  'show-installing-update': () => void
+  'install-windows-cli': () => void
+  'uninstall-windows-cli': () => void
 }
 
 /**
diff --git a/app/src/lib/markdown-filters/commit-mention-link-filter.ts b/app/src/lib/markdown-filters/commit-mention-link-filter.ts
index f32669df2e5..2131a19c433 100644
--- a/app/src/lib/markdown-filters/commit-mention-link-filter.ts
+++ b/app/src/lib/markdown-filters/commit-mention-link-filter.ts
@@ -1,4 +1,4 @@
-import { escapeRegExp } from 'lodash'
+import escapeRegExp from 'lodash/escapeRegExp'
 import { GitHubRepository } from '../../models/github-repository'
 import { getHTMLURL } from '../api'
 import { INodeFilter } from './node-filter'
diff --git a/app/src/lib/markdown-filters/emoji-filter.ts b/app/src/lib/markdown-filters/emoji-filter.ts
index 82d00dd4aa5..a42c83f5901 100644
--- a/app/src/lib/markdown-filters/emoji-filter.ts
+++ b/app/src/lib/markdown-filters/emoji-filter.ts
@@ -1,7 +1,8 @@
 import { INodeFilter } from './node-filter'
 import { fileURLToPath } from 'url'
 import { readFile } from 'fs/promises'
-import { escapeRegExp } from 'lodash'
+import escapeRegExp from 'lodash/escapeRegExp'
+import { Emoji } from '../emoji'
 
 /**
  * The Emoji Markdown filter will take a text node and create multiple text and
@@ -17,15 +18,15 @@ import { escapeRegExp } from 'lodash'
  */
 export class EmojiFilter implements INodeFilter {
   private readonly emojiRegex: RegExp
-  private readonly emojiFilePath: Map<string, string>
+  private readonly allEmoji: Map<string, Emoji>
   private readonly emojiBase64URICache: Map<string, string> = new Map()
 
   /**
    * @param emoji Map from the emoji ref (e.g., :+1:) to the image's local path.
    */
-  public constructor(emojiFilePath: Map<string, string>) {
-    this.emojiFilePath = emojiFilePath
-    this.emojiRegex = this.buildEmojiRegExp(emojiFilePath)
+  public constructor(emoji: Map<string, Emoji>) {
+    this.allEmoji = emoji
+    this.emojiRegex = this.buildEmojiRegExp(emoji)
   }
 
   /**
@@ -66,16 +67,16 @@ export class EmojiFilter implements INodeFilter {
       return null
     }
 
-    const nodes = new Array<Text | HTMLImageElement>()
+    const nodes = new Array<Text | HTMLImageElement | HTMLSpanElement>()
     for (let i = 0; i < emojiMatches.length; i++) {
       const emojiKey = emojiMatches[i]
-      const emojiPath = this.emojiFilePath.get(emojiKey)
-      if (emojiPath === undefined) {
+      const emoji = this.allEmoji.get(emojiKey)
+      if (emoji === undefined) {
         continue
       }
 
-      const emojiImg = await this.createEmojiNode(emojiPath)
-      if (emojiImg === null) {
+      const emojiNode = await this.createEmojiNode(emoji)
+      if (emojiNode === null) {
         continue
       }
 
@@ -83,7 +84,7 @@ export class EmojiFilter implements INodeFilter {
       const textBeforeEmoji = text.slice(0, emojiPosition)
       const textNodeBeforeEmoji = document.createTextNode(textBeforeEmoji)
       nodes.push(textNodeBeforeEmoji)
-      nodes.push(emojiImg)
+      nodes.push(emojiNode)
 
       text = text.slice(emojiPosition + emojiKey.length)
     }
@@ -97,17 +98,25 @@ export class EmojiFilter implements INodeFilter {
   }
 
   /**
-   * Method to build an emoji image node to insert in place of the emoji ref.
-   * If we fail to create the image element, returns null.
+   * Method to build an emoji node to insert in place of the emoji ref.
+   * If we fail to create the emoji element, returns null.
    */
   private async createEmojiNode(
-    emojiPath: string
-  ): Promise<HTMLImageElement | null> {
+    emoji: Emoji
+  ): Promise<HTMLImageElement | HTMLSpanElement | null> {
     try {
-      const dataURI = await this.getBase64FromImageUrl(emojiPath)
+      if (emoji.emoji) {
+        const emojiSpan = document.createElement('span')
+        emojiSpan.classList.add('emoji')
+        emojiSpan.textContent = emoji.emoji
+        return emojiSpan
+      }
+
+      const dataURI = await this.getBase64FromImageUrl(emoji.url)
       const emojiImg = new Image()
       emojiImg.classList.add('emoji')
       emojiImg.src = dataURI
+      emojiImg.alt = emoji.description ?? ''
       return emojiImg
     } catch (e) {}
     return null
@@ -136,7 +145,7 @@ export class EmojiFilter implements INodeFilter {
    *
    * @param emoji Map from the emoji ref (e.g., :+1:) to the image's local path.
    */
-  private buildEmojiRegExp(emoji: Map<string, string>): RegExp {
+  private buildEmojiRegExp(emoji: Map<string, Emoji>): RegExp {
     const emojiGroups = [...emoji.keys()]
       .map(emoji => escapeRegExp(emoji))
       .join('|')
diff --git a/app/src/lib/markdown-filters/issue-link-filter.ts b/app/src/lib/markdown-filters/issue-link-filter.ts
index 99599296f7c..5f238ff569e 100644
--- a/app/src/lib/markdown-filters/issue-link-filter.ts
+++ b/app/src/lib/markdown-filters/issue-link-filter.ts
@@ -1,4 +1,4 @@
-import { escapeRegExp } from 'lodash'
+import escapeRegExp from 'lodash/escapeRegExp'
 import { GitHubRepository } from '../../models/github-repository'
 import { getHTMLURL } from '../api'
 import { INodeFilter } from './node-filter'
diff --git a/app/src/lib/markdown-filters/node-filter.ts b/app/src/lib/markdown-filters/node-filter.ts
index 83ad9782600..fddf80765c5 100644
--- a/app/src/lib/markdown-filters/node-filter.ts
+++ b/app/src/lib/markdown-filters/node-filter.ts
@@ -14,6 +14,7 @@ import {
 import { CommitMentionLinkFilter } from './commit-mention-link-filter'
 import { MarkdownEmitter } from './markdown-filter'
 import { GitHubRepository } from '../../models/github-repository'
+import { Emoji } from '../emoji'
 
 export interface INodeFilter {
   /**
@@ -39,7 +40,7 @@ export interface INodeFilter {
 }
 
 export interface ICustomMarkdownFilterOptions {
-  emoji: Map<string, string>
+  emoji: Map<string, Emoji>
   repository?: GitHubRepository
   markdownContext?: MarkdownContext
 }
diff --git a/app/src/lib/markdown-filters/video-url-regex.ts b/app/src/lib/markdown-filters/video-url-regex.ts
index c83be25c568..17340c1dd87 100644
--- a/app/src/lib/markdown-filters/video-url-regex.ts
+++ b/app/src/lib/markdown-filters/video-url-regex.ts
@@ -1,4 +1,4 @@
-import { escapeRegExp } from 'lodash'
+import escapeRegExp from 'lodash/escapeRegExp'
 
 const user_images_cdn_url = 'https://user-images.githubusercontent.com'
 
diff --git a/app/src/lib/menu-update.ts b/app/src/lib/menu-update.ts
index 0c293cefcd2..aa5353be272 100644
--- a/app/src/lib/menu-update.ts
+++ b/app/src/lib/menu-update.ts
@@ -10,7 +10,7 @@ import { TipState } from '../models/tip'
 import { updateMenuState as ipcUpdateMenuState } from '../ui/main-process-proxy'
 import { AppMenu, MenuItem } from '../models/app-menu'
 import { hasConflictedFiles } from './status'
-import { enableSquashMerging } from './feature-flag'
+import { findContributionTargetDefaultBranch } from './branch'
 
 export interface IMenuItemState {
   readonly enabled?: boolean
@@ -102,17 +102,13 @@ function menuItemStateEqual(state: IMenuItemState, menuItem: MenuItem) {
   return true
 }
 
-const squashAndMergeMenuIds: ReadonlyArray<MenuIDs> = enableSquashMerging()
-  ? ['squash-and-merge-branch']
-  : []
-
 const allMenuIds: ReadonlyArray<MenuIDs> = [
   'rename-branch',
   'delete-branch',
   'discard-all-changes',
   'stash-all-changes',
   'preferences',
-  'update-branch',
+  'update-branch-with-contribution-target-branch',
   'compare-to-branch',
   'merge-branch',
   'rebase-branch',
@@ -139,7 +135,8 @@ const allMenuIds: ReadonlyArray<MenuIDs> = [
   'clone-repository',
   'about',
   'create-pull-request',
-  ...squashAndMergeMenuIds,
+  'preview-pull-request',
+  'squash-and-merge-branch',
 ]
 
 function getAllMenusDisabledBuilder(): MenuStateBuilder {
@@ -164,13 +161,14 @@ function getRepositoryMenuBuilder(state: IAppState): MenuStateBuilder {
   let onDetachedHead = false
   let hasChangedFiles = false
   let hasConflicts = false
-  let hasDefaultBranch = false
   let hasPublishedBranch = false
   let networkActionInProgress = false
   let tipStateIsUnknown = false
   let branchIsUnborn = false
   let rebaseInProgress = false
   let branchHasStashEntry = false
+  let onContributionTargetDefaultBranch = false
+  let hasContributionTargetDefaultBranch = false
 
   // check that its a github repo and if so, that is has issues enabled
   const repoIssuesEnabled =
@@ -185,12 +183,18 @@ function getRepositoryMenuBuilder(state: IAppState): MenuStateBuilder {
     const tip = branchesState.tip
     const defaultBranch = branchesState.defaultBranch
 
-    hasDefaultBranch = Boolean(defaultBranch)
-
     onBranch = tip.kind === TipState.Valid
     onDetachedHead = tip.kind === TipState.Detached
     tipStateIsUnknown = tip.kind === TipState.Unknown
     branchIsUnborn = tip.kind === TipState.Unborn
+    const contributionTarget = findContributionTargetDefaultBranch(
+      selectedState.repository,
+      branchesState
+    )
+    hasContributionTargetDefaultBranch = contributionTarget !== null
+    onContributionTargetDefaultBranch =
+      tip.kind === TipState.Valid &&
+      contributionTarget?.name === tip.branch.name
 
     // If we are:
     //  1. on the default branch, or
@@ -261,13 +265,13 @@ function getRepositoryMenuBuilder(state: IAppState): MenuStateBuilder {
       onNonDefaultBranch && !branchIsUnborn && !onDetachedHead
     )
     menuStateBuilder.setEnabled(
-      'update-branch',
-      onNonDefaultBranch && hasDefaultBranch && !onDetachedHead
+      'update-branch-with-contribution-target-branch',
+      onBranch &&
+        hasContributionTargetDefaultBranch &&
+        !onContributionTargetDefaultBranch
     )
     menuStateBuilder.setEnabled('merge-branch', onBranch)
-    if (enableSquashMerging()) {
-      menuStateBuilder.setEnabled('squash-and-merge-branch', onBranch)
-    }
+    menuStateBuilder.setEnabled('squash-and-merge-branch', onBranch)
     menuStateBuilder.setEnabled('rebase-branch', onBranch)
     menuStateBuilder.setEnabled(
       'compare-on-github',
@@ -288,6 +292,11 @@ function getRepositoryMenuBuilder(state: IAppState): MenuStateBuilder {
       'create-pull-request',
       isHostedOnGitHub && !branchIsUnborn && !onDetachedHead
     )
+    menuStateBuilder.setEnabled(
+      'preview-pull-request',
+      !branchIsUnborn && !onDetachedHead && isHostedOnGitHub
+    )
+
     menuStateBuilder.setEnabled(
       'push',
       !branchIsUnborn && !onDetachedHead && !networkActionInProgress
@@ -327,7 +336,7 @@ function getRepositoryMenuBuilder(state: IAppState): MenuStateBuilder {
 
     menuStateBuilder.disable('view-repository-on-github')
     menuStateBuilder.disable('create-pull-request')
-
+    menuStateBuilder.disable('preview-pull-request')
     if (
       selectedState &&
       selectedState.type === SelectionType.MissingRepository
@@ -343,11 +352,9 @@ function getRepositoryMenuBuilder(state: IAppState): MenuStateBuilder {
     menuStateBuilder.disable('delete-branch')
     menuStateBuilder.disable('discard-all-changes')
     menuStateBuilder.disable('stash-all-changes')
-    menuStateBuilder.disable('update-branch')
+    menuStateBuilder.disable('update-branch-with-contribution-target-branch')
     menuStateBuilder.disable('merge-branch')
-    if (enableSquashMerging()) {
-      menuStateBuilder.disable('squash-and-merge-branch')
-    }
+    menuStateBuilder.disable('squash-and-merge-branch')
     menuStateBuilder.disable('rebase-branch')
 
     menuStateBuilder.disable('push')
@@ -368,6 +375,7 @@ function getMenuState(state: IAppState): Map<MenuIDs, IMenuItemState> {
 
   return getAllMenusEnabledBuilder()
     .merge(getRepositoryMenuBuilder(state))
+    .merge(getAppMenuBuilder(state))
     .merge(getInWelcomeFlowBuilder(state.showWelcomeFlow))
     .merge(getNoRepositoriesBuilder(state)).state
 }
@@ -418,6 +426,16 @@ function getNoRepositoriesBuilder(state: IAppState): MenuStateBuilder {
   return menuStateBuilder
 }
 
+function getAppMenuBuilder(state: IAppState): MenuStateBuilder {
+  const menuStateBuilder = new MenuStateBuilder()
+  const enabled = state.resizablePaneActive
+
+  menuStateBuilder.setEnabled('increase-active-resizable-width', enabled)
+  menuStateBuilder.setEnabled('decrease-active-resizable-width', enabled)
+
+  return menuStateBuilder
+}
+
 function getRepoIssuesEnabled(repository: Repository): boolean {
   if (isRepositoryWithGitHubRepository(repository)) {
     const ghRepo = repository.gitHubRepository
diff --git a/app/src/lib/merge.ts b/app/src/lib/merge.ts
index b370ea89c55..79e912edca3 100644
--- a/app/src/lib/merge.ts
+++ b/app/src/lib/merge.ts
@@ -1,5 +1,8 @@
 /** Create a copy of an object by merging it with a subset of its properties. */
-export function merge<T, K extends keyof T>(obj: T, subset: Pick<T, K>): T {
+export function merge<T extends {}, K extends keyof T>(
+  obj: T | null | undefined,
+  subset: Pick<T, K>
+): T {
   const copy = Object.assign({}, obj)
   for (const k in subset) {
     copy[k] = subset[k]
diff --git a/app/src/lib/multi-commit-operation.ts b/app/src/lib/multi-commit-operation.ts
index 897c2909e2d..c1799a1dd1f 100644
--- a/app/src/lib/multi-commit-operation.ts
+++ b/app/src/lib/multi-commit-operation.ts
@@ -4,7 +4,6 @@ import {
   conflictSteps,
   MultiCommitOperationStepKind,
 } from '../models/multi-commit-operation'
-import { Popup, PopupType } from '../models/popup'
 import { TipState } from '../models/tip'
 import { IMultiCommitOperationState, IRepositoryState } from './app-state'
 
@@ -39,12 +38,11 @@ export function getMultiCommitOperationChooseBranchStep(
 }
 
 export function isConflictsFlow(
-  currentPopup: Popup | null,
+  isMultiCommitOperationPopupOpen: boolean,
   multiCommitOperationState: IMultiCommitOperationState | null
 ): boolean {
   return (
-    currentPopup !== null &&
-    currentPopup.type === PopupType.MultiCommitOperation &&
+    isMultiCommitOperationPopupOpen &&
     multiCommitOperationState !== null &&
     conflictSteps.includes(multiCommitOperationState.step.kind)
   )
diff --git a/app/src/lib/oauth.ts b/app/src/lib/oauth.ts
deleted file mode 100644
index f2692cc92c0..00000000000
--- a/app/src/lib/oauth.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-import { shell } from './app-shell'
-import { Account } from '../models/account'
-import { fatalError } from './fatal-error'
-import { getOAuthAuthorizationURL, requestOAuthToken, fetchUser } from './api'
-import { uuid } from './uuid'
-
-interface IOAuthState {
-  readonly state: string
-  readonly endpoint: string
-  readonly resolve: (account: Account) => void
-  readonly reject: (error: Error) => void
-}
-
-let oauthState: IOAuthState | null = null
-
-/**
- * Ask the user to auth with the given endpoint. This will open their browser.
- *
- * @param endpoint - The endpoint to auth against.
- *
- * Returns a {Promise} which will resolve when the OAuth flow as been completed.
- * Note that the promise may not complete if the user doesn't complete the OAuth
- * flow.
- */
-export function askUserToOAuth(endpoint: string) {
-  return new Promise<Account>((resolve, reject) => {
-    oauthState = { state: uuid(), endpoint, resolve, reject }
-
-    const oauthURL = getOAuthAuthorizationURL(endpoint, oauthState.state)
-    shell.openExternal(oauthURL)
-  })
-}
-
-/**
- * Request the authenticated using, using the code given to us by the OAuth
- * callback.
- *
- * @returns `undefined` if there is no valid OAuth state to use, or `null` if
- * the code cannot be used to retrieve a valid GitHub user.
- */
-export async function requestAuthenticatedUser(
-  code: string,
-  state: string
-): Promise<Account | null | undefined> {
-  if (!oauthState || state !== oauthState.state) {
-    log.warn(
-      'requestAuthenticatedUser was not called with valid OAuth state. This is likely due to a browser reloading the callback URL. Contact GitHub Support if you believe this is an error'
-    )
-    return undefined
-  }
-
-  const token = await requestOAuthToken(oauthState.endpoint, code)
-  if (token) {
-    return fetchUser(oauthState.endpoint, token)
-  } else {
-    return null
-  }
-}
-
-/**
- * Resolve the current OAuth request with the given account.
- *
- * Note that this can only be called after `askUserToOAuth` has been called and
- * must only be called once.
- */
-export function resolveOAuthRequest(account: Account) {
-  if (!oauthState) {
-    fatalError(
-      '`askUserToOAuth` must be called before resolving an auth request.'
-    )
-  }
-
-  oauthState.resolve(account)
-
-  oauthState = null
-}
-
-/**
- * Reject the current OAuth request with the given error.
- *
- * Note that this can only be called after `askUserToOAuth` has been called and
- * must only be called once.
- */
-export function rejectOAuthRequest(error: Error) {
-  if (!oauthState) {
-    fatalError(
-      '`askUserToOAuth` must be called before rejecting an auth request.'
-    )
-  }
-
-  oauthState.reject(error)
-
-  oauthState = null
-}
diff --git a/app/src/lib/parse-app-url.ts b/app/src/lib/parse-app-url.ts
index 50f115e8c2f..a81d2f418ef 100644
--- a/app/src/lib/parse-app-url.ts
+++ b/app/src/lib/parse-app-url.ts
@@ -23,13 +23,6 @@ export interface IOpenRepositoryFromURLAction {
   readonly filepath: string | null
 }
 
-export interface IOpenRepositoryFromPathAction {
-  readonly name: 'open-repository-from-path'
-
-  /** The local path to open. */
-  readonly path: string
-}
-
 export interface IUnknownAction {
   readonly name: 'unknown'
   readonly url: string
@@ -38,7 +31,6 @@ export interface IUnknownAction {
 export type URLActionType =
   | IOAuthAction
   | IOpenRepositoryFromURLAction
-  | IOpenRepositoryFromPathAction
   | IUnknownAction
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
@@ -132,12 +124,5 @@ export function parseAppURL(url: string): URLActionType {
     }
   }
 
-  if (actionName === 'openlocalrepo') {
-    return {
-      name: 'open-repository-from-path',
-      path: decodeURIComponent(parsedPath),
-    }
-  }
-
   return unknown
 }
diff --git a/app/src/lib/parse-carriage-return.ts b/app/src/lib/parse-carriage-return.ts
deleted file mode 100644
index 4d0b532d14d..00000000000
--- a/app/src/lib/parse-carriage-return.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Parses carriage returns the same way a terminal would, i.e by
- * moving the cursor and (potentially) overwriting text.
- *
- * Git (and many other CLI tools) use this trick to present the
- * user with nice looking progress. When writing something like...
- *
- * 'Downloading: 1%  \r'
- * 'Downloading: 2%  \r'
- *
- * ...to the terminal the user is gonna perceive it as if the 1 just
- * magically changes to a two.
- *
- * The carriage return character for all of you kids out there
- * that haven't yet played with a manual typewriter refers to the
- * "carriage" which held the character arms, see
- *
- *  https://en.wikipedia.org/wiki/Carriage_return#Typewriters
- */
-export function parseCarriageReturn(text: string) {
-  // Happy path, there are no carriage returns in
-  // the text, making this method a noop.
-  if (text.indexOf('\r') < 0) {
-    return text
-  }
-
-  return text
-    .split('\n')
-    .map(line =>
-      line.split('\r').reduce((buf, cur) =>
-        // Happy path, if the new line is equal to or longer
-        // than the previous, we can just use the new one
-        // without creating any new strings.
-        cur.length >= buf.length ? cur : cur + buf.substring(cur.length)
-      )
-    )
-    .join('\n')
-}
diff --git a/app/src/lib/popup-manager.ts b/app/src/lib/popup-manager.ts
new file mode 100644
index 00000000000..4025ee90eda
--- /dev/null
+++ b/app/src/lib/popup-manager.ts
@@ -0,0 +1,207 @@
+import { Popup, PopupType } from '../models/popup'
+import { sendNonFatalException } from './helpers/non-fatal-exception'
+import { uuid } from './uuid'
+
+/**
+ * The limit of how many popups allowed in the stack. Working under the
+ * assumption that a user should only be dealing with a couple of popups at a
+ * time, if a user hits the limit this would indicate a problem.
+ */
+const defaultPopupStackLimit = 50
+
+/**
+ * The popup manager is to manage the stack of currently open popups.
+ *
+ * Popup Flow Notes:
+ * 1. We have many types of popups. We only support opening one popup type at a
+ *    time with the exception of PopupType.Error. If the app is to produce
+ *    multiple errors, we want the user to be able to be informed of all them.
+ * 2. Error popups are viewed first ahead of any other popup types. Otherwise,
+ *    popups ordered by last on last off.
+ * 3. There are custom error handling popups that are not categorized as errors:
+ *     - When a error is captured in the app, we use the dispatcher method
+ *       'postError` to run through all the error handlers defined in
+ *       `errorHandler.ts`.
+ *     - If a custom error handler picks the error up, it handles it in a custom
+ *       way. Commonly, it users the dispatcher to open a popup specific to the
+ *       error - likely to allow interaction with the user. This is not an error
+ *       popup.
+ *    -  Otherwise, the error is captured by the `defaultErrorHandler` defined
+ *       in `errorHandler.ts` which simply dispatches to `presentError`. This
+ *       method requests ends up in the app-store to add a popup of type `Error`
+ *       to the stack. Then, it is rendered as a popup with the AppError
+ *       component.
+ *    - The AppError component additionally does some custom error handling for
+ *      cloning errors and for author errors. But, most errors are just
+ *      displayed as error text with a ok button.
+ */
+export class PopupManager {
+  private popupStack: ReadonlyArray<Popup> = []
+
+  public constructor(private readonly popupLimit = defaultPopupStackLimit) {}
+
+  /**
+   * Returns the last popup in the stack.
+   *
+   * The stack is sorted such that:
+   *  If there are error popups, it returns the last popup of type error,
+   *  otherwise returns the first non-error type popup.
+   */
+  public get currentPopup(): Popup | null {
+    return this.popupStack.at(-1) ?? null
+  }
+
+  /**
+   * Returns all the popups in the stack.
+   *
+   * The stack is sorted such that:
+   *  If there are error popups, they will be the last on the stack.
+   */
+  public get allPopups(): ReadonlyArray<Popup> {
+    return this.popupStack
+  }
+
+  /**
+   * Returns whether there are any popups in the stack.
+   */
+  public get isAPopupOpen(): boolean {
+    return this.currentPopup !== null
+  }
+
+  /**
+   * Returns an array of all popups in the stack of the provided type.
+   **/
+  public getPopupsOfType(popupType: PopupType): ReadonlyArray<Popup> {
+    return this.popupStack.filter(p => p.type === popupType)
+  }
+
+  /**
+   * Returns whether there are any popups of a given type in the stack.
+   */
+  public areTherePopupsOfType(popupType: PopupType): boolean {
+    return this.popupStack.some(p => p.type === popupType)
+  }
+
+  /**
+   * Adds a popup to the stack.
+   * - The popup will be given a unique id and returned.
+   * - It will not add multiple popups of the same type onto the stack
+   *   - NB: Error types are the only duplicates allowed
+   **/
+  public addPopup(popupToAdd: Popup): Popup {
+    if (popupToAdd.type === PopupType.Error) {
+      return this.addErrorPopup(popupToAdd.error)
+    }
+
+    const existingPopup = this.getPopupsOfType(popupToAdd.type)
+
+    const popup = { id: uuid(), ...popupToAdd }
+
+    if (existingPopup.length > 0) {
+      log.warn(
+        `Attempted to add a popup of already existing type - ${popupToAdd.type}.`
+      )
+      return popupToAdd
+    }
+
+    this.insertBeforeErrorPopups(popup)
+    this.checkStackLength()
+    return popup
+  }
+
+  /** Adds a non-Error type popup before any error popups. */
+  private insertBeforeErrorPopups(popup: Popup) {
+    if (this.popupStack.at(-1)?.type !== PopupType.Error) {
+      this.popupStack = this.popupStack.concat(popup)
+      return
+    }
+
+    const errorPopups = this.getPopupsOfType(PopupType.Error)
+    const nonErrorPopups = this.popupStack.filter(
+      p => p.type !== PopupType.Error
+    )
+    this.popupStack = [...nonErrorPopups, popup, ...errorPopups]
+  }
+
+  /*
+   * Adds an Error Popup to the stack
+   * - The popup will be given a unique id.
+   * - Multiple popups of a type error.
+   **/
+  public addErrorPopup(error: Error): Popup {
+    const popup: Popup = { id: uuid(), type: PopupType.Error, error }
+    this.popupStack = this.popupStack.concat(popup)
+    this.checkStackLength()
+    return popup
+  }
+
+  private checkStackLength() {
+    if (this.popupStack.length > this.popupLimit) {
+      // Remove the oldest
+      const oldest = this.popupStack[0]
+      const oldestError =
+        oldest.type === PopupType.Error ? `: ${oldest.error.message}` : null
+      const justAddedError =
+        this.currentPopup?.type === PopupType.Error
+          ? `Just added another Error: ${this.currentPopup.error.message}.`
+          : null
+      sendNonFatalException(
+        'TooManyPopups',
+        new Error(
+          `Max number of ${this.popupLimit} popups reached while adding popup of type ${this.currentPopup?.type}.
+          Removing last popup from the stack. Type ${oldest.type}${oldestError}.
+          ${justAddedError}`
+        )
+      )
+      this.popupStack = this.popupStack.slice(1)
+    }
+  }
+
+  /**
+   * Updates a popup in the stack and returns it.
+   * - It uses the popup id to find and update the popup.
+   */
+  public updatePopup(popupToUpdate: Popup) {
+    if (popupToUpdate.id === undefined) {
+      log.warn(`Attempted to update a popup without an id.`)
+      return
+    }
+
+    const index = this.popupStack.findIndex(p => p.id === popupToUpdate.id)
+    if (index < 0) {
+      log.warn(`Attempted to update a popup not in the stack.`)
+      return
+    }
+
+    this.popupStack = [
+      ...this.popupStack.slice(0, index),
+      popupToUpdate,
+      ...this.popupStack.slice(index + 1),
+    ]
+  }
+
+  /**
+   * Removes a popup based on it's id.
+   */
+  public removePopup(popup: Popup) {
+    if (popup.id === undefined) {
+      log.warn(`Attempted to remove a popup without an id.`)
+      return
+    }
+    this.popupStack = this.popupStack.filter(p => p.id !== popup.id)
+  }
+
+  /**
+   * Removes any popup of the given type from the stack
+   */
+  public removePopupByType(popupType: PopupType) {
+    this.popupStack = this.popupStack.filter(p => p.type !== popupType)
+  }
+
+  /**
+   * Removes popup from the stack by it's id
+   */
+  public removePopupById(popupId: string) {
+    this.popupStack = this.popupStack.filter(p => p.id !== popupId)
+  }
+}
diff --git a/app/src/lib/process/win32.ts b/app/src/lib/process/win32.ts
index a49358df2f0..ca62be737a4 100644
--- a/app/src/lib/process/win32.ts
+++ b/app/src/lib/process/win32.ts
@@ -1,11 +1,11 @@
 import { spawn as spawnInternal } from 'child_process'
-import * as Path from 'path'
 import {
   HKEY,
   RegistryValueType,
   RegistryValue,
   RegistryStringEntry,
   enumerateValues,
+  setValue,
 } from 'registry-js'
 
 function isStringRegistryValue(rv: RegistryValue): rv is RegistryStringEntry {
@@ -15,31 +15,49 @@ function isStringRegistryValue(rv: RegistryValue): rv is RegistryStringEntry {
   )
 }
 
-/** Get the path segments in the user's `Path`. */
-export function getPathSegments(): ReadonlyArray<string> {
+export function getPathRegistryValue(): RegistryStringEntry | null {
   for (const value of enumerateValues(HKEY.HKEY_CURRENT_USER, 'Environment')) {
     if (value.name === 'Path' && isStringRegistryValue(value)) {
-      return value.data.split(';').filter(x => x.length > 0)
+      return value
     }
   }
 
-  throw new Error('Could not find PATH environment variable')
+  return null
+}
+
+/** Get the path segments in the user's `Path`. */
+export function getPathSegments(): ReadonlyArray<string> {
+  const value = getPathRegistryValue()
+
+  if (value === null) {
+    throw new Error('Could not find PATH environment variable')
+  }
+
+  return value.data.split(';').filter(x => x.length > 0)
 }
 
 /** Set the user's `Path`. */
 export async function setPathSegments(
   paths: ReadonlyArray<string>
 ): Promise<void> {
-  let setxPath: string
-  const systemRoot = process.env['SystemRoot']
-  if (systemRoot) {
-    const system32Path = Path.join(systemRoot, 'System32')
-    setxPath = Path.join(system32Path, 'setx.exe')
-  } else {
-    setxPath = 'setx.exe'
+  const value = getPathRegistryValue()
+  if (value === null) {
+    throw new Error('Could not find PATH environment variable')
   }
 
-  await spawn(setxPath, ['Path', paths.join(';')])
+  try {
+    setValue(
+      HKEY.HKEY_CURRENT_USER,
+      'Environment',
+      'Path',
+      value.type,
+      paths.join(';')
+    )
+  } catch (e) {
+    log.error('Failed setting PATH environment variable', e)
+
+    throw new Error('Could not set the PATH environment variable')
+  }
 }
 
 /** Spawn a command with arguments and capture its output. */
diff --git a/app/src/lib/progress/from-process.ts b/app/src/lib/progress/from-process.ts
index d86de2e43be..4c19dc8284e 100644
--- a/app/src/lib/progress/from-process.ts
+++ b/app/src/lib/progress/from-process.ts
@@ -16,11 +16,13 @@ import { tailByLine } from '../file-system'
  * If the given options object already has a processCallback specified it will
  * be overwritten.
  */
-export async function executionOptionsWithProgress(
-  options: IGitExecutionOptions,
+export async function executionOptionsWithProgress<
+  T extends IGitExecutionOptions
+>(
+  options: T,
   parser: GitProgressParser,
   progressCallback: (progress: IGitProgress | IGitOutput) => void
-): Promise<IGitExecutionOptions> {
+): Promise<T> {
   let lfsProgressPath = null
   let env = {}
   if (options.trackLFSProgress) {
diff --git a/app/src/lib/read-emoji.ts b/app/src/lib/read-emoji.ts
index d5a67f2b970..2cc229ae7d2 100644
--- a/app/src/lib/read-emoji.ts
+++ b/app/src/lib/read-emoji.ts
@@ -1,6 +1,7 @@
 import * as Fs from 'fs'
 import * as Path from 'path'
 import { encodePathAsUrl } from './path'
+import { Emoji } from './emoji'
 
 /**
  * Type representing the contents of the gemoji json database
@@ -81,8 +82,8 @@ function getUrlFromUnicodeEmoji(emoji: string): string | null {
  *
  * @param rootDir - The folder containing the entry point (index.html or main.js) of the application.
  */
-export function readEmoji(rootDir: string): Promise<Map<string, string>> {
-  return new Promise<Map<string, string>>((resolve, reject) => {
+export function readEmoji(rootDir: string): Promise<Map<string, Emoji>> {
+  return new Promise<Map<string, Emoji>>((resolve, reject) => {
     const path = Path.join(rootDir, 'emoji.json')
     Fs.readFile(path, 'utf8', (err, data) => {
       if (err) {
@@ -90,7 +91,7 @@ export function readEmoji(rootDir: string): Promise<Map<string, string>> {
         return
       }
 
-      const tmp = new Map<string, string>()
+      const tmp = new Map<string, Emoji>()
 
       try {
         const db: IGemojiDb = JSON.parse(data)
@@ -107,14 +108,17 @@ export function readEmoji(rootDir: string): Promise<Map<string, string>> {
           }
 
           emoji.aliases.forEach(alias => {
-            tmp.set(`:${alias}:`, url)
+            tmp.set(`:${alias}:`, {
+              ...emoji,
+              url,
+            })
           })
         })
       } catch (e) {
         reject(e)
       }
 
-      const emoji = new Map<string, string>()
+      const emoji = new Map<string, Emoji>()
 
       // Sort and insert into actual map
       const keys = Array.from(tmp.keys()).sort()
diff --git a/app/src/lib/rebase.ts b/app/src/lib/rebase.ts
index 6ab9a6ddb1d..2f8e68179f3 100644
--- a/app/src/lib/rebase.ts
+++ b/app/src/lib/rebase.ts
@@ -3,6 +3,26 @@ import { IAheadBehind } from '../models/branch'
 import { TipState } from '../models/tip'
 import { clamp } from './clamp'
 
+/** Represents the force-push availability state of a branch. */
+export enum ForcePushBranchState {
+  /** The branch cannot be force-pushed (it hasn't diverged from its upstream) */
+  NotAvailable,
+
+  /**
+   * The branch can be force-pushed, but the user didn't do any operation that
+   * we consider should be followed by a force-push, like rebasing or amending a
+   * pushed commit.
+   */
+  Available,
+
+  /**
+   * The branch can be force-pushed, and the user did some operation that we
+   * consider should be followed by a force-push, like rebasing or amending a
+   * pushed commit.
+   */
+  Recommended,
+}
+
 /**
  * Format rebase percentage to ensure it's a value between 0 and 1, but to also
  * constrain it to two significant figures, avoiding the remainder that comes
@@ -16,18 +36,24 @@ export function formatRebaseValue(value: number) {
  * Check application state to see whether the action applied to the current
  * branch should be a force push
  */
-export function isCurrentBranchForcePush(
+export function getCurrentBranchForcePushState(
   branchesState: IBranchesState,
   aheadBehind: IAheadBehind | null
-) {
+): ForcePushBranchState {
   if (aheadBehind === null) {
     // no tracking branch found
-    return false
+    return ForcePushBranchState.NotAvailable
   }
 
-  const { tip, forcePushBranches } = branchesState
   const { ahead, behind } = aheadBehind
 
+  if (behind === 0 || ahead === 0) {
+    // no a diverged branch to force push
+    return ForcePushBranchState.NotAvailable
+  }
+
+  const { tip, forcePushBranches } = branchesState
+
   let canForcePushBranch = false
   if (tip.kind === TipState.Valid) {
     const localBranchName = tip.branch.nameWithoutRemote
@@ -36,5 +62,7 @@ export function isCurrentBranchForcePush(
     canForcePushBranch = foundEntry === sha
   }
 
-  return canForcePushBranch && behind > 0 && ahead > 0
+  return canForcePushBranch
+    ? ForcePushBranchState.Recommended
+    : ForcePushBranchState.Available
 }
diff --git a/app/src/lib/release-notes.ts b/app/src/lib/release-notes.ts
index c9590800fee..6043c3a1250 100644
--- a/app/src/lib/release-notes.ts
+++ b/app/src/lib/release-notes.ts
@@ -10,6 +10,7 @@ import { getVersion } from '../ui/lib/app-proxy'
 import { formatDate } from './format-date'
 import { offsetFromNow } from './offset-from'
 import { encodePathAsUrl } from './path'
+import { getUserAgent } from './http'
 
 // expects a release note entry to contain a header and then some text
 // example:
@@ -102,7 +103,9 @@ export async function getChangeLog(
     changelogURL.searchParams.set('limit', limit.toString())
   }
 
-  const response = await fetch(changelogURL.toString())
+  const response = await fetch(changelogURL.toString(), {
+    headers: { 'user-agent': getUserAgent() },
+  })
   if (response.ok) {
     const releases: ReadonlyArray<ReleaseMetadata> = await response.json()
     return releases
diff --git a/app/src/lib/remote-parsing.ts b/app/src/lib/remote-parsing.ts
index 737097d3723..2e8f15ca75b 100644
--- a/app/src/lib/remote-parsing.ts
+++ b/app/src/lib/remote-parsing.ts
@@ -27,19 +27,27 @@ interface IGitRemoteURL {
 const remoteRegexes: ReadonlyArray<{ protocol: GitProtocol; regex: RegExp }> = [
   {
     protocol: 'https',
-    regex: new RegExp('^https?://(?:.+@)?(.+)/(.+)/(.+?)(?:/|.git/?)?$'),
+    regex: new RegExp(
+      '^https?://(?:.+@)?(.+)/([^/]+)/([^/]+?)(?:/|\\.git/?)?$'
+    ),
   },
   {
     protocol: 'ssh',
-    regex: new RegExp('^git@(.+):(.+)/(.+?)(?:/|.git)?$'),
+    regex: new RegExp('^git@(.+):([^/]+)/([^/]+?)(?:/|\\.git)?$'),
   },
   {
     protocol: 'ssh',
-    regex: new RegExp('^git:(.+)/(.+)/(.+?)(?:/|.git)?$'),
+    regex: new RegExp(
+      '^(?:.+)@(.+\\.ghe\\.com):([^/]+)/([^/]+?)(?:/|\\.git)?$'
+    ),
   },
   {
     protocol: 'ssh',
-    regex: new RegExp('^ssh://git@(.+)/(.+)/(.+?)(?:/|.git)?$'),
+    regex: new RegExp('^git:(.+)/([^/]+)/([^/]+?)(?:/|\\.git)?$'),
+  },
+  {
+    protocol: 'ssh',
+    regex: new RegExp('^ssh://git@(.+)/(.+)/(.+?)(?:/|\\.git)?$'),
   },
 ]
 
diff --git a/app/src/lib/shells/darwin.ts b/app/src/lib/shells/darwin.ts
index f9f482d3db5..0828ccd483b 100644
--- a/app/src/lib/shells/darwin.ts
+++ b/app/src/lib/shells/darwin.ts
@@ -1,8 +1,14 @@
 import { spawn, ChildProcess } from 'child_process'
 import { assertNever } from '../fatal-error'
-import { IFoundShell } from './found-shell'
 import appPath from 'app-path'
 import { parseEnumValue } from '../enum'
+import { FoundShell } from './shared'
+import {
+  expandTargetPathArgument,
+  ICustomIntegration,
+  parseCustomIntegrationArguments,
+  spawnCustomIntegration,
+} from '../custom-integration'
 
 export enum Shell {
   Terminal = 'Terminal',
@@ -11,7 +17,9 @@ export enum Shell {
   PowerShellCore = 'PowerShell Core',
   Kitty = 'Kitty',
   Alacritty = 'Alacritty',
+  Tabby = 'Tabby',
   WezTerm = 'WezTerm',
+  Warp = 'Warp',
 }
 
 export const Default = Shell.Terminal
@@ -20,95 +28,142 @@ export function parse(label: string): Shell {
   return parseEnumValue(Shell, label) ?? Default
 }
 
-function getBundleID(shell: Shell): string {
+function getBundleIDs(shell: Shell): ReadonlyArray<string> {
   switch (shell) {
     case Shell.Terminal:
-      return 'com.apple.Terminal'
+      return ['com.apple.Terminal']
     case Shell.iTerm2:
-      return 'com.googlecode.iterm2'
+      return ['com.googlecode.iterm2']
     case Shell.Hyper:
-      return 'co.zeit.hyper'
+      return ['co.zeit.hyper']
     case Shell.PowerShellCore:
-      return 'com.microsoft.powershell'
+      return ['com.microsoft.powershell']
     case Shell.Kitty:
-      return 'net.kovidgoyal.kitty'
+      return ['net.kovidgoyal.kitty']
     case Shell.Alacritty:
-      return 'io.alacritty'
+      return ['org.alacritty', 'io.alacritty']
+    case Shell.Tabby:
+      return ['org.tabby']
     case Shell.WezTerm:
-      return 'com.github.wez.wezterm'
+      return ['com.github.wez.wezterm']
+    case Shell.Warp:
+      return ['dev.warp.Warp-Stable']
     default:
       return assertNever(shell, `Unknown shell: ${shell}`)
   }
 }
 
-async function getShellPath(shell: Shell): Promise<string | null> {
-  const bundleId = getBundleID(shell)
-  try {
-    return await appPath(bundleId)
-  } catch (e) {
-    // `appPath` will raise an error if it cannot find the program.
-    return null
+async function getShellInfo(
+  shell: Shell
+): Promise<{ path: string; bundleID: string } | null> {
+  const bundleIds = getBundleIDs(shell)
+  for (const id of bundleIds) {
+    try {
+      const path = await appPath(id)
+      return { path, bundleID: id }
+    } catch (error) {
+      log.debug(
+        `Unable to locate ${shell} installation with bundle id ${id}`,
+        error
+      )
+    }
   }
+
+  return null
 }
 
 export async function getAvailableShells(): Promise<
-  ReadonlyArray<IFoundShell<Shell>>
+  ReadonlyArray<FoundShell<Shell>>
 > {
   const [
-    terminalPath,
-    hyperPath,
-    iTermPath,
-    powerShellCorePath,
-    kittyPath,
-    alacrittyPath,
-    wezTermPath,
+    terminalInfo,
+    hyperInfo,
+    iTermInfo,
+    powerShellCoreInfo,
+    kittyInfo,
+    alacrittyInfo,
+    tabbyInfo,
+    wezTermInfo,
+    warpInfo,
   ] = await Promise.all([
-    getShellPath(Shell.Terminal),
-    getShellPath(Shell.Hyper),
-    getShellPath(Shell.iTerm2),
-    getShellPath(Shell.PowerShellCore),
-    getShellPath(Shell.Kitty),
-    getShellPath(Shell.Alacritty),
-    getShellPath(Shell.WezTerm),
+    getShellInfo(Shell.Terminal),
+    getShellInfo(Shell.Hyper),
+    getShellInfo(Shell.iTerm2),
+    getShellInfo(Shell.PowerShellCore),
+    getShellInfo(Shell.Kitty),
+    getShellInfo(Shell.Alacritty),
+    getShellInfo(Shell.Tabby),
+    getShellInfo(Shell.WezTerm),
+    getShellInfo(Shell.Warp),
   ])
 
-  const shells: Array<IFoundShell<Shell>> = []
-  if (terminalPath) {
-    shells.push({ shell: Shell.Terminal, path: terminalPath })
+  const shells: Array<FoundShell<Shell>> = []
+  if (terminalInfo) {
+    shells.push({ shell: Shell.Terminal, ...terminalInfo })
+  }
+
+  if (hyperInfo) {
+    shells.push({ shell: Shell.Hyper, ...hyperInfo })
   }
 
-  if (hyperPath) {
-    shells.push({ shell: Shell.Hyper, path: hyperPath })
+  if (iTermInfo) {
+    shells.push({ shell: Shell.iTerm2, ...iTermInfo })
   }
 
-  if (iTermPath) {
-    shells.push({ shell: Shell.iTerm2, path: iTermPath })
+  if (powerShellCoreInfo) {
+    shells.push({ shell: Shell.PowerShellCore, ...powerShellCoreInfo })
   }
 
-  if (powerShellCorePath) {
-    shells.push({ shell: Shell.PowerShellCore, path: powerShellCorePath })
+  if (kittyInfo) {
+    const kittyExecutable = `${kittyInfo.path}/Contents/MacOS/kitty`
+    shells.push({
+      shell: Shell.Kitty,
+      path: kittyExecutable,
+      bundleID: kittyInfo.bundleID,
+    })
   }
 
-  if (kittyPath) {
-    const kittyExecutable = `${kittyPath}/Contents/MacOS/kitty`
-    shells.push({ shell: Shell.Kitty, path: kittyExecutable })
+  if (alacrittyInfo) {
+    const alacrittyExecutable = `${alacrittyInfo.path}/Contents/MacOS/alacritty`
+    shells.push({
+      shell: Shell.Alacritty,
+      path: alacrittyExecutable,
+      bundleID: alacrittyInfo.bundleID,
+    })
   }
 
-  if (alacrittyPath) {
-    const alacrittyExecutable = `${alacrittyPath}/Contents/MacOS/alacritty`
-    shells.push({ shell: Shell.Alacritty, path: alacrittyExecutable })
+  if (tabbyInfo) {
+    const tabbyExecutable = `${tabbyInfo.path}/Contents/MacOS/Tabby`
+    shells.push({
+      shell: Shell.Tabby,
+      path: tabbyExecutable,
+      bundleID: tabbyInfo.bundleID,
+    })
   }
 
-  if (wezTermPath) {
-    const wezTermExecutable = `${wezTermPath}/Contents/MacOS/wezterm`
-    shells.push({ shell: Shell.WezTerm, path: wezTermExecutable })
+  if (wezTermInfo) {
+    const wezTermExecutable = `${wezTermInfo.path}/Contents/MacOS/wezterm`
+    shells.push({
+      shell: Shell.WezTerm,
+      path: wezTermExecutable,
+      bundleID: wezTermInfo.bundleID,
+    })
+  }
+
+  if (warpInfo) {
+    const warpExecutable = `${warpInfo.path}/Contents/MacOS/stable`
+    shells.push({
+      shell: Shell.Warp,
+      path: warpExecutable,
+      bundleID: warpInfo.bundleID,
+    })
   }
 
   return shells
 }
 
 export function launch(
-  foundShell: IFoundShell<Shell>,
+  foundShell: FoundShell<Shell>,
   path: string
 ): ChildProcess {
   if (foundShell.shell === Shell.Kitty) {
@@ -125,6 +180,12 @@ export function launch(
     // It uses --working-directory command to start the shell
     // in the specified working directory.
     return spawn(foundShell.path, ['--working-directory', path])
+  } else if (foundShell.shell === Shell.Tabby) {
+    // Tabby cannot open files in the folder format.
+    //
+    // It uses open command to start the shell
+    // in the specified working directory.
+    return spawn(foundShell.path, ['open', path])
   } else if (foundShell.shell === Shell.WezTerm) {
     // WezTerm, like Alacritty, "cannot open files in the 'folder' format."
     //
@@ -132,7 +193,18 @@ export function launch(
     // the working directory, followed by the path.
     return spawn(foundShell.path, ['start', '--cwd', path])
   } else {
-    const bundleID = getBundleID(foundShell.shell)
-    return spawn('open', ['-b', bundleID, path])
+    return spawn('open', ['-b', foundShell.bundleID, path])
   }
 }
+
+export function launchCustomShell(
+  customShell: ICustomIntegration,
+  path: string
+): ChildProcess {
+  const argv = parseCustomIntegrationArguments(customShell.arguments)
+  const args = expandTargetPathArgument(argv, path)
+
+  return customShell.bundleID
+    ? spawnCustomIntegration('open', ['-b', customShell.bundleID, ...args])
+    : spawnCustomIntegration(customShell.path, args)
+}
diff --git a/app/src/lib/shells/found-shell.ts b/app/src/lib/shells/found-shell.ts
deleted file mode 100644
index 89934594313..00000000000
--- a/app/src/lib/shells/found-shell.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export interface IFoundShell<T> {
-  readonly shell: T
-  readonly path: string
-  readonly extraArgs?: string[]
-}
diff --git a/app/src/lib/shells/linux.ts b/app/src/lib/shells/linux.ts
index 7ab0a4a5e89..afb8087cc31 100644
--- a/app/src/lib/shells/linux.ts
+++ b/app/src/lib/shells/linux.ts
@@ -1,11 +1,18 @@
 import { spawn, ChildProcess } from 'child_process'
 import { assertNever } from '../fatal-error'
-import { IFoundShell } from './found-shell'
 import { parseEnumValue } from '../enum'
 import { pathExists } from '../../ui/lib/path-exists'
+import { FoundShell } from './shared'
+import {
+  expandTargetPathArgument,
+  ICustomIntegration,
+  parseCustomIntegrationArguments,
+  spawnCustomIntegration,
+} from '../custom-integration'
 
 export enum Shell {
   Gnome = 'GNOME Terminal',
+  GnomeConsole = 'GNOME Console',
   Mate = 'MATE Terminal',
   Tilix = 'Tilix',
   Terminator = 'Terminator',
@@ -18,6 +25,8 @@ export enum Shell {
   XFCE = 'XFCE Terminal',
   Alacritty = 'Alacritty',
   Kitty = 'Kitty',
+  LXTerminal = 'LXDE Terminal',
+  Warp = 'Warp',
 }
 
 export const Default = Shell.Gnome
@@ -34,6 +43,8 @@ function getShellPath(shell: Shell): Promise<string | null> {
   switch (shell) {
     case Shell.Gnome:
       return getPathIfAvailable('/usr/bin/gnome-terminal')
+    case Shell.GnomeConsole:
+      return getPathIfAvailable('/usr/bin/kgx')
     case Shell.Mate:
       return getPathIfAvailable('/usr/bin/mate-terminal')
     case Shell.Tilix:
@@ -58,16 +69,21 @@ function getShellPath(shell: Shell): Promise<string | null> {
       return getPathIfAvailable('/usr/bin/alacritty')
     case Shell.Kitty:
       return getPathIfAvailable('/usr/bin/kitty')
+    case Shell.LXTerminal:
+      return getPathIfAvailable('/usr/bin/lxterminal')
+    case Shell.Warp:
+      return getPathIfAvailable('/usr/bin/warp-terminal')
     default:
       return assertNever(shell, `Unknown shell: ${shell}`)
   }
 }
 
 export async function getAvailableShells(): Promise<
-  ReadonlyArray<IFoundShell<Shell>>
+  ReadonlyArray<FoundShell<Shell>>
 > {
   const [
     gnomeTerminalPath,
+    gnomeConsolePath,
     mateTerminalPath,
     tilixPath,
     terminatorPath,
@@ -80,8 +96,11 @@ export async function getAvailableShells(): Promise<
     xfcePath,
     alacrittyPath,
     kittyPath,
+    lxterminalPath,
+    warpPath,
   ] = await Promise.all([
     getShellPath(Shell.Gnome),
+    getShellPath(Shell.GnomeConsole),
     getShellPath(Shell.Mate),
     getShellPath(Shell.Tilix),
     getShellPath(Shell.Terminator),
@@ -94,13 +113,19 @@ export async function getAvailableShells(): Promise<
     getShellPath(Shell.XFCE),
     getShellPath(Shell.Alacritty),
     getShellPath(Shell.Kitty),
+    getShellPath(Shell.LXTerminal),
+    getShellPath(Shell.Warp),
   ])
 
-  const shells: Array<IFoundShell<Shell>> = []
+  const shells: Array<FoundShell<Shell>> = []
   if (gnomeTerminalPath) {
     shells.push({ shell: Shell.Gnome, path: gnomeTerminalPath })
   }
 
+  if (gnomeConsolePath) {
+    shells.push({ shell: Shell.GnomeConsole, path: gnomeConsolePath })
+  }
+
   if (mateTerminalPath) {
     shells.push({ shell: Shell.Mate, path: mateTerminalPath })
   }
@@ -149,16 +174,25 @@ export async function getAvailableShells(): Promise<
     shells.push({ shell: Shell.Kitty, path: kittyPath })
   }
 
+  if (lxterminalPath) {
+    shells.push({ shell: Shell.LXTerminal, path: lxterminalPath })
+  }
+
+  if (warpPath) {
+    shells.push({ shell: Shell.Warp, path: warpPath })
+  }
+
   return shells
 }
 
 export function launch(
-  foundShell: IFoundShell<Shell>,
+  foundShell: FoundShell<Shell>,
   path: string
 ): ChildProcess {
   const shell = foundShell.shell
   switch (shell) {
     case Shell.Gnome:
+    case Shell.GnomeConsole:
     case Shell.Mate:
     case Shell.Tilix:
     case Shell.Terminator:
@@ -179,7 +213,20 @@ export function launch(
       return spawn(foundShell.path, ['-w', path])
     case Shell.Kitty:
       return spawn(foundShell.path, ['--single-instance', '--directory', path])
+    case Shell.LXTerminal:
+      return spawn(foundShell.path, ['--working-directory=' + path])
+    case Shell.Warp:
+      return spawn(foundShell.path, [], { cwd: path })
     default:
       return assertNever(shell, `Unknown shell: ${shell}`)
   }
 }
+
+export function launchCustomShell(
+  customShell: ICustomIntegration,
+  path: string
+): ChildProcess {
+  const argv = parseCustomIntegrationArguments(customShell.arguments)
+  const args = expandTargetPathArgument(argv, path)
+  return spawnCustomIntegration(customShell.path, args)
+}
diff --git a/app/src/lib/shells/shared.ts b/app/src/lib/shells/shared.ts
index 8d9dad37f7c..25e52bfd3ea 100644
--- a/app/src/lib/shells/shared.ts
+++ b/app/src/lib/shells/shared.ts
@@ -3,13 +3,23 @@ import { ChildProcess } from 'child_process'
 import * as Darwin from './darwin'
 import * as Win32 from './win32'
 import * as Linux from './linux'
-import { IFoundShell } from './found-shell'
 import { ShellError } from './error'
 import { pathExists } from '../../ui/lib/path-exists'
+import { ICustomIntegration } from '../custom-integration'
 
 export type Shell = Darwin.Shell | Win32.Shell | Linux.Shell
 
-export type FoundShell = IFoundShell<Shell>
+export type FoundShell<T extends Shell> = {
+  readonly shell: T
+  readonly path: string
+  readonly extraArgs?: ReadonlyArray<string>
+} & (T extends Darwin.Shell
+  ? {
+      readonly bundleID: string
+    }
+  : {})
+
+type AnyFoundShell = FoundShell<Shell>
 
 /** The default shell. */
 export const Default = (function () {
@@ -22,7 +32,7 @@ export const Default = (function () {
   }
 })()
 
-let shellCache: ReadonlyArray<FoundShell> | null = null
+let shellCache: ReadonlyArray<AnyFoundShell> | null = null
 
 /** Parse the label into the specified shell type. */
 export function parse(label: string): Shell {
@@ -40,7 +50,9 @@ export function parse(label: string): Shell {
 }
 
 /** Get the shells available for the user. */
-export async function getAvailableShells(): Promise<ReadonlyArray<FoundShell>> {
+export async function getAvailableShells(): Promise<
+  ReadonlyArray<AnyFoundShell>
+> {
   if (shellCache) {
     return shellCache
   }
@@ -62,7 +74,7 @@ export async function getAvailableShells(): Promise<ReadonlyArray<FoundShell>> {
 }
 
 /** Find the given shell or the default if the given shell can't be found. */
-export async function findShellOrDefault(shell: Shell): Promise<FoundShell> {
+export async function findShellOrDefault(shell: Shell): Promise<AnyFoundShell> {
   const available = await getAvailableShells()
   const found = available.find(s => s.shell === shell)
   if (found) {
@@ -74,7 +86,7 @@ export async function findShellOrDefault(shell: Shell): Promise<FoundShell> {
 
 /** Launch the given shell at the path. */
 export async function launchShell(
-  shell: FoundShell,
+  shell: AnyFoundShell,
   path: string,
   onError: (error: Error) => void
 ): Promise<void> {
@@ -83,7 +95,7 @@ export async function launchShell(
   // platform-specific build targets.
   const exists = await pathExists(shell.path)
   if (!exists) {
-    const label = __DARWIN__ ? 'Preferences' : 'Options'
+    const label = __DARWIN__ ? 'Settings' : 'Options'
     throw new ShellError(
       `Could not find executable for '${shell.shell}' at path '${shell.path}'.  Please open ${label} and select an available shell.`
     )
@@ -92,11 +104,11 @@ export async function launchShell(
   let cp: ChildProcess | null = null
 
   if (__DARWIN__) {
-    cp = Darwin.launch(shell as IFoundShell<Darwin.Shell>, path)
+    cp = Darwin.launch(shell as FoundShell<Darwin.Shell>, path)
   } else if (__WIN32__) {
-    cp = Win32.launch(shell as IFoundShell<Win32.Shell>, path)
+    cp = Win32.launch(shell as FoundShell<Win32.Shell>, path)
   } else if (__LINUX__) {
-    cp = Linux.launch(shell as IFoundShell<Linux.Shell>, path)
+    cp = Linux.launch(shell as FoundShell<Linux.Shell>, path)
   }
 
   if (cp != null) {
@@ -109,8 +121,45 @@ export async function launchShell(
   }
 }
 
+/** Launch custom shell at the path. */
+export async function launchCustomShell(
+  customShell: ICustomIntegration,
+  path: string,
+  onError: (error: Error) => void
+): Promise<void> {
+  // We have to manually cast the wider `Shell` type into the platform-specific
+  // type. This is less than ideal, but maybe the best we can do without
+  // platform-specific build targets.
+  const exists = await pathExists(customShell.path)
+  if (!exists) {
+    const label = __DARWIN__ ? 'Settings' : 'Options'
+    throw new ShellError(
+      `Could not find executable for custom shell at path '${customShell.path}'.  Please open ${label} and select an available shell.`
+    )
+  }
+
+  let cp: ChildProcess | null = null
+
+  if (__DARWIN__) {
+    cp = Darwin.launchCustomShell(customShell, path)
+  } else if (__WIN32__) {
+    cp = Win32.launchCustomShell(customShell, path)
+  } else if (__LINUX__) {
+    cp = Linux.launchCustomShell(customShell, path)
+  }
+
+  if (cp != null) {
+    addErrorTracing('Custom Shell', cp, onError)
+    return Promise.resolve()
+  } else {
+    return Promise.reject(
+      `Platform not currently supported for launching shells: ${process.platform}`
+    )
+  }
+}
+
 function addErrorTracing(
-  shell: Shell,
+  shell: Shell | 'Custom Shell',
   cp: ChildProcess,
   onError: (error: Error) => void
 ) {
diff --git a/app/src/lib/shells/win32.ts b/app/src/lib/shells/win32.ts
index e3c058eb120..765dd687064 100644
--- a/app/src/lib/shells/win32.ts
+++ b/app/src/lib/shells/win32.ts
@@ -2,11 +2,17 @@ import { spawn, ChildProcess } from 'child_process'
 import * as Path from 'path'
 import { enumerateValues, HKEY, RegistryValueType } from 'registry-js'
 import { assertNever } from '../fatal-error'
-import { IFoundShell } from './found-shell'
 import { enableWSLDetection } from '../feature-flag'
 import { findGitOnPath } from '../is-git-on-path'
 import { parseEnumValue } from '../enum'
 import { pathExists } from '../../ui/lib/path-exists'
+import { FoundShell } from './shared'
+import {
+  expandTargetPathArgument,
+  ICustomIntegration,
+  parseCustomIntegrationArguments,
+  spawnCustomIntegration,
+} from '../custom-integration'
 
 export enum Shell {
   Cmd = 'Command Prompt',
@@ -16,7 +22,7 @@ export enum Shell {
   GitBash = 'Git Bash',
   Cygwin = 'Cygwin',
   WSL = 'WSL',
-  WindowTerminal = 'Windows Terminal',
+  WindowsTerminal = 'Windows Terminal',
   FluentTerminal = 'Fluent Terminal',
   Alacritty = 'Alacritty',
 }
@@ -28,14 +34,16 @@ export function parse(label: string): Shell {
 }
 
 export async function getAvailableShells(): Promise<
-  ReadonlyArray<IFoundShell<Shell>>
+  ReadonlyArray<FoundShell<Shell>>
 > {
   const gitPath = await findGitOnPath()
-  const shells: IFoundShell<Shell>[] = [
+  const rootDir = process.env.WINDIR || 'C:\\Windows'
+  const dosKeyExePath = `"${rootDir}\\system32\\doskey.exe git=^"${gitPath}^" $*"`
+  const shells: FoundShell<Shell>[] = [
     {
       shell: Shell.Cmd,
       path: process.env.comspec || 'C:\\Windows\\System32\\cmd.exe',
-      extraArgs: gitPath ? ['/K', `"doskey git=^"${gitPath}^" $*"`] : [],
+      extraArgs: gitPath ? ['/K', dosKeyExePath] : [],
     },
   ]
 
@@ -100,7 +108,7 @@ export async function getAvailableShells(): Promise<
   const windowsTerminal = await findWindowsTerminal()
   if (windowsTerminal != null) {
     shells.push({
-      shell: Shell.WindowTerminal,
+      shell: Shell.WindowsTerminal,
       path: windowsTerminal,
     })
   }
@@ -390,7 +398,7 @@ async function findFluentTerminal(): Promise<string | null> {
 }
 
 export function launch(
-  foundShell: IFoundShell<Shell>,
+  foundShell: FoundShell<Shell>,
   path: string
 ): ChildProcess {
   const shell = foundShell.shell
@@ -461,7 +469,7 @@ export function launch(
           cwd: path,
         }
       )
-    case Shell.WindowTerminal:
+    case Shell.WindowsTerminal:
       const windowsTerminalPath = `"${foundShell.path}"`
       log.info(`launching ${shell} at path: ${windowsTerminalPath}`)
       return spawn(windowsTerminalPath, ['-d .'], { shell: true, cwd: path })
@@ -473,3 +481,16 @@ export function launch(
       return assertNever(shell, `Unknown shell: ${shell}`)
   }
 }
+
+export function launchCustomShell(
+  customShell: ICustomIntegration,
+  path: string
+): ChildProcess {
+  log.info(`launching custom shell at path: ${customShell.path}`)
+  const argv = parseCustomIntegrationArguments(customShell.arguments)
+  const args = expandTargetPathArgument(argv, path)
+  return spawnCustomIntegration(`"${customShell.path}"`, args, {
+    shell: true,
+    cwd: path,
+  })
+}
diff --git a/app/src/lib/split-buffer.ts b/app/src/lib/split-buffer.ts
new file mode 100644
index 00000000000..ca082a00b6c
--- /dev/null
+++ b/app/src/lib/split-buffer.ts
@@ -0,0 +1,14 @@
+export function splitBuffer(buffer: Buffer, delimiter: string): Buffer[] {
+  const result = []
+  let start = 0
+  let index = buffer.indexOf(delimiter, start)
+  while (index !== -1) {
+    result.push(buffer.subarray(start, index))
+    start = index + delimiter.length
+    index = buffer.indexOf(delimiter, start)
+  }
+  if (start <= buffer.length) {
+    result.push(buffer.subarray(start))
+  }
+  return result
+}
diff --git a/app/src/lib/squirrel-error-parser.ts b/app/src/lib/squirrel-error-parser.ts
index 89665443a14..337a14865fa 100644
--- a/app/src/lib/squirrel-error-parser.ts
+++ b/app/src/lib/squirrel-error-parser.ts
@@ -14,7 +14,6 @@ const squirrelTimeoutRegex =
  * friendlier message to the user.
  *
  * @param error The underlying error from Squirrel.
- *
  */
 export function parseError(error: Error): Error | null {
   if (squirrelMissingRegex.test(error.message)) {
diff --git a/app/src/lib/ssh/ssh-credential-storage.ts b/app/src/lib/ssh/ssh-credential-storage.ts
new file mode 100644
index 00000000000..35c7ba11f1a
--- /dev/null
+++ b/app/src/lib/ssh/ssh-credential-storage.ts
@@ -0,0 +1,87 @@
+import { TokenStore } from '../stores'
+
+const appName = __DEV__ ? 'GitHub Desktop Dev' : 'GitHub Desktop'
+
+export function getSSHCredentialStoreKey(name: string) {
+  return `${appName} - ${name}`
+}
+
+type SSHCredentialEntry = {
+  /** Store where this entry is stored. */
+  store: string
+
+  /** Key used to identify the credential in the store (e.g. username or hash). */
+  key: string
+}
+
+/**
+ * This map contains the SSH credentials that are pending to be stored. What this
+ * means is that a git operation is currently in progress, and the user wanted
+ * to store the passphrase for the SSH key, however we don't want to store it
+ * until we know the git operation finished successfully.
+ */
+const mostRecentSSHCredentials = new Map<string, SSHCredentialEntry>()
+
+/**
+ * Stores an SSH credential and also keeps it in memory to be deleted later if
+ * the ongoing git operation fails to authenticate.
+ *
+ * @param operationGUID A unique identifier for the ongoing git operation. In
+ *                      practice, it will always be the trampoline token for the
+ *                      ongoing git operation.
+ * @param store         Store where the SSH credential is stored.
+ * @param key           Key that identifies the SSH credential (e.g. username or
+ *                      key hash).
+ * @param password      Password for the SSH key / user.
+ */
+export async function setSSHCredential(
+  operationGUID: string,
+  store: string,
+  key: string,
+  password: string
+) {
+  setMostRecentSSHCredential(operationGUID, store, key)
+  await TokenStore.setItem(store, key, password)
+}
+
+/**
+ * Keeps the SSH credential details in memory to be deleted later if the ongoing
+ * git operation fails to authenticate.
+ *
+ * @param operationGUID A unique identifier for the ongoing git operation. In
+ *                      practice, it will always be the trampoline token for the
+ *                      ongoing git operation.
+ * @param store         Store where the SSH credential is stored.
+ * @param key           Key that identifies the SSH credential (e.g. username or
+ *                      key hash).
+ */
+export function setMostRecentSSHCredential(
+  operationGUID: string,
+  store: string,
+  key: string
+) {
+  mostRecentSSHCredentials.set(operationGUID, { store, key })
+}
+
+/**
+ * Removes the SSH credential from memory. This must be used after a git
+ * operation finished, regardless the result.
+ */
+export function removeMostRecentSSHCredential(operationGUID: string) {
+  mostRecentSSHCredentials.delete(operationGUID)
+}
+
+/**
+ * Deletes the SSH credential from the TokenStore. Used when the git operation
+ * fails to authenticate.
+ */
+export async function deleteMostRecentSSHCredential(operationGUID: string) {
+  const entry = mostRecentSSHCredentials.get(operationGUID)
+  if (entry) {
+    log.info(
+      `SSH auth failed, deleting credential for ${entry.store}:${entry.key}`
+    )
+
+    await TokenStore.deleteItem(entry.store, entry.key)
+  }
+}
diff --git a/app/src/lib/ssh/ssh-key-passphrase.ts b/app/src/lib/ssh/ssh-key-passphrase.ts
index 7782a1f530c..b20c4569534 100644
--- a/app/src/lib/ssh/ssh-key-passphrase.ts
+++ b/app/src/lib/ssh/ssh-key-passphrase.ts
@@ -1,11 +1,12 @@
-import { getFileHash } from '../file-system'
+import { getFileHash } from '../get-file-hash'
 import { TokenStore } from '../stores'
 import {
-  getSSHSecretStoreKey,
-  keepSSHSecretToStore,
-} from './ssh-secret-storage'
+  getSSHCredentialStoreKey,
+  setMostRecentSSHCredential,
+  setSSHCredential,
+} from './ssh-credential-storage'
 
-const SSHKeyPassphraseTokenStoreKey = getSSHSecretStoreKey(
+const SSHKeyPassphraseTokenStoreKey = getSSHCredentialStoreKey(
   'SSH key passphrases'
 )
 
@@ -25,8 +26,7 @@ export async function getSSHKeyPassphrase(keyPath: string) {
 }
 
 /**
- * Keeps the SSH key passphrase in memory to be stored later if the ongoing git
- * operation succeeds.
+ * Stores the SSH key passphrase.
  *
  * @param operationGUID A unique identifier for the ongoing git operation. In
  *                      practice, it will always be the trampoline token for the
@@ -34,14 +34,15 @@ export async function getSSHKeyPassphrase(keyPath: string) {
  * @param keyPath       Path to the SSH key.
  * @param passphrase    Passphrase for the SSH key.
  */
-export async function keepSSHKeyPassphraseToStore(
+export async function setSSHKeyPassphrase(
   operationGUID: string,
   keyPath: string,
   passphrase: string
 ) {
   try {
     const keyHash = await getHashForSSHKey(keyPath)
-    keepSSHSecretToStore(
+
+    await setSSHCredential(
       operationGUID,
       SSHKeyPassphraseTokenStoreKey,
       keyHash,
@@ -51,3 +52,29 @@ export async function keepSSHKeyPassphraseToStore(
     log.error('Could not store passphrase for SSH key:', e)
   }
 }
+
+/**
+ * Keeps the SSH credential details in memory to be deleted later if the ongoing
+ * git operation fails to authenticate.
+ *
+ * @param operationGUID A unique identifier for the ongoing git operation. In
+ *                      practice, it will always be the trampoline secret for the
+ *                      ongoing git operation.
+ * @param keyPath       Path of the SSH key.
+ */
+export async function setMostRecentSSHKeyPassphrase(
+  operationGUID: string,
+  keyPath: string
+) {
+  try {
+    const keyHash = await getHashForSSHKey(keyPath)
+
+    setMostRecentSSHCredential(
+      operationGUID,
+      SSHKeyPassphraseTokenStoreKey,
+      keyHash
+    )
+  } catch (e) {
+    log.error('Could not store passphrase for SSH key:', e)
+  }
+}
diff --git a/app/src/lib/ssh/ssh-secret-storage.ts b/app/src/lib/ssh/ssh-secret-storage.ts
deleted file mode 100644
index 7f651591f53..00000000000
--- a/app/src/lib/ssh/ssh-secret-storage.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { TokenStore } from '../stores'
-
-const appName = __DEV__ ? 'GitHub Desktop Dev' : 'GitHub Desktop'
-
-export function getSSHSecretStoreKey(name: string) {
-  return `${appName} - ${name}`
-}
-
-type SSHSecretEntry = {
-  /** Store where this entry will be stored. */
-  store: string
-
-  /** Key used to identify the secret in the store (e.g. username or hash). */
-  key: string
-
-  /** Actual secret to be stored (password). */
-  secret: string
-}
-
-/**
- * This map contains the SSH secrets that are pending to be stored. What this
- * means is that a git operation is currently in progress, and the user wanted
- * to store the passphrase for the SSH key, however we don't want to store it
- * until we know the git operation finished successfully.
- */
-const SSHSecretsToStore = new Map<string, SSHSecretEntry>()
-
-/**
- * Keeps the SSH secret in memory to be stored later if the ongoing git operation
- * succeeds.
- *
- * @param operationGUID A unique identifier for the ongoing git operation. In
- *                      practice, it will always be the trampoline secret for the
- *                      ongoing git operation.
- * @param key           Key that identifies the SSH secret (e.g. username or key
- *                      hash).
- * @param secret        Actual SSH secret to store.
- */
-export async function keepSSHSecretToStore(
-  operationGUID: string,
-  store: string,
-  key: string,
-  secret: string
-) {
-  SSHSecretsToStore.set(operationGUID, { store, key, secret })
-}
-
-/** Removes the SSH key passphrase from memory. */
-export function removePendingSSHSecretToStore(operationGUID: string) {
-  SSHSecretsToStore.delete(operationGUID)
-}
-
-/** Stores a pending SSH key passphrase if the operation succeeded. */
-export async function storePendingSSHSecret(operationGUID: string) {
-  const entry = SSHSecretsToStore.get(operationGUID)
-  if (entry === undefined) {
-    return
-  }
-
-  await TokenStore.setItem(entry.store, entry.key, entry.secret)
-}
diff --git a/app/src/lib/ssh/ssh-user-password.ts b/app/src/lib/ssh/ssh-user-password.ts
index 4bb25c43012..e4f930183c3 100644
--- a/app/src/lib/ssh/ssh-user-password.ts
+++ b/app/src/lib/ssh/ssh-user-password.ts
@@ -1,10 +1,12 @@
 import { TokenStore } from '../stores'
 import {
-  getSSHSecretStoreKey,
-  keepSSHSecretToStore,
-} from './ssh-secret-storage'
+  getSSHCredentialStoreKey,
+  setMostRecentSSHCredential,
+  setSSHCredential,
+} from './ssh-credential-storage'
 
-const SSHUserPasswordTokenStoreKey = getSSHSecretStoreKey('SSH user password')
+const SSHUserPasswordTokenStoreKey =
+  getSSHCredentialStoreKey('SSH user password')
 
 /** Retrieves the password for the given SSH username. */
 export async function getSSHUserPassword(username: string) {
@@ -17,8 +19,7 @@ export async function getSSHUserPassword(username: string) {
 }
 
 /**
- * Keeps the SSH user password in memory to be stored later if the ongoing git
- * operation succeeds.
+ * Stores the SSH user password.
  *
  * @param operationGUID A unique identifier for the ongoing git operation. In
  *                      practice, it will always be the trampoline token for the
@@ -26,15 +27,35 @@ export async function getSSHUserPassword(username: string) {
  * @param username      SSH user name. Usually in the form of `user@hostname`.
  * @param password      Password for the given user.
  */
-export async function keepSSHUserPasswordToStore(
+export async function setSSHUserPassword(
   operationGUID: string,
   username: string,
   password: string
 ) {
-  keepSSHSecretToStore(
+  await setSSHCredential(
     operationGUID,
     SSHUserPasswordTokenStoreKey,
     username,
     password
   )
 }
+
+/**
+ * Keeps the SSH credential details in memory to be deleted later if the ongoing
+ * git operation fails to authenticate.
+ *
+ * @param operationGUID A unique identifier for the ongoing git operation. In
+ *                      practice, it will always be the trampoline secret for the
+ *                      ongoing git operation.
+ * @param username      SSH user name.
+ */
+export function setMostRecentSSHUserPassword(
+  operationGUID: string,
+  username: string
+) {
+  setMostRecentSSHCredential(
+    operationGUID,
+    SSHUserPasswordTokenStoreKey,
+    username
+  )
+}
diff --git a/app/src/lib/ssh/ssh.ts b/app/src/lib/ssh/ssh.ts
index d9589d1866e..856cc0b11d5 100644
--- a/app/src/lib/ssh/ssh.ts
+++ b/app/src/lib/ssh/ssh.ts
@@ -1,9 +1,8 @@
 import memoizeOne from 'memoize-one'
 import { pathExists } from '../../ui/lib/path-exists'
-import { enableSSHAskPass, enableWindowsOpenSSH } from '../feature-flag'
 import { getBoolean } from '../local-storage'
 import {
-  getDesktopTrampolinePath,
+  getDesktopAskpassTrampolinePath,
   getSSHWrapperPath,
 } from '../trampoline/trampoline-environment'
 
@@ -13,7 +12,7 @@ export const UseWindowsOpenSSHKey: string = 'useWindowsOpenSSH'
 
 export const isWindowsOpenSSHAvailable = memoizeOne(
   async (): Promise<boolean> => {
-    if (!__WIN32__ || !enableWindowsOpenSSH()) {
+    if (!__WIN32__) {
       return false
     }
 
@@ -43,13 +42,11 @@ function isWindowsOpenSSHUseEnabled() {
  * context (OS and user settings).
  */
 export async function getSSHEnvironment() {
-  const baseEnv = enableSSHAskPass()
-    ? {
-        SSH_ASKPASS: getDesktopTrampolinePath(),
-        // DISPLAY needs to be set to _something_ so ssh actually uses SSH_ASKPASS
-        DISPLAY: '.',
-      }
-    : {}
+  const baseEnv = {
+    SSH_ASKPASS: getDesktopAskpassTrampolinePath(),
+    // DISPLAY needs to be set to _something_ so ssh actually uses SSH_ASKPASS
+    DISPLAY: '.',
+  }
 
   const canUseWindowsSSH = await isWindowsOpenSSHAvailable()
   if (canUseWindowsSSH && isWindowsOpenSSHUseEnabled()) {
@@ -60,7 +57,7 @@ export async function getSSHEnvironment() {
     }
   }
 
-  if (__DARWIN__ && __DEV__ && enableSSHAskPass()) {
+  if (__DARWIN__ && __DEV__) {
     // Replace git ssh command with our wrapper in dev builds, since they are
     // launched from a command line.
     return {
diff --git a/app/src/lib/stats/stats-database.ts b/app/src/lib/stats/stats-database.ts
index 598147c56da..66bff8a4610 100644
--- a/app/src/lib/stats/stats-database.ts
+++ b/app/src/lib/stats/stats-database.ts
@@ -122,7 +122,7 @@ export interface IDailyMeasures {
    */
   readonly enterpriseCommits: number
 
-  /** The number of times the user made a commit to a repo hosted on Github.com */
+  /** The number of times the user made a commit to a repo hosted on GitHub.com */
   readonly dotcomCommits: number
 
   /** The number of times the user made a commit to a protected GitHub or GitHub Enterprise repository */
@@ -146,9 +146,16 @@ export interface IDailyMeasures {
   /** The number of times the user committed a conflicted merge outside the merge conflicts dialog */
   readonly unguidedConflictedMergeCompletionCount: number
 
-  /** The number of times the user is taken to the create pull request page on dotcom */
+  /** The number of times the user is taken to the create pull request page on dotcom including.
+   *
+   * NB - This metric tracks all times including when
+   * `createPullRequestFromPreviewCount` this is tracked.
+   * */
   readonly createPullRequestCount: number
 
+  /** The number of times the user is taken to the create pull request page on dotcom from the preview dialog */
+  readonly createPullRequestFromPreviewCount: number
+
   /** The number of times the rebase conflicts dialog is dismissed */
   readonly rebaseConflictsDialogDismissalCount: number
 
@@ -164,6 +171,9 @@ export interface IDailyMeasures {
   /** The number of times a successful rebase without conflicts is detected */
   readonly rebaseSuccessWithoutConflictsCount: number
 
+  /** The number of times a rebase finishes without effect because the branch was already up-to-date */
+  readonly rebaseWithBranchAlreadyUpToDateCount: number
+
   /** The number of times a user performed a pull with `pull.rebase` in config set to `true` */
   readonly pullWithRebaseCount: number
 
@@ -467,6 +477,18 @@ export interface IDailyMeasures {
   /** The number of "checks failed" notifications the user received */
   readonly checksFailedNotificationCount: number
 
+  /**
+   * The number of "checks failed" notifications the user received for a recent
+   * repository other than the selected one.
+   */
+  readonly checksFailedNotificationFromRecentRepoCount: number
+
+  /**
+   * The number of "checks failed" notifications the user received for a
+   * non-recent repository other than the selected one.
+   */
+  readonly checksFailedNotificationFromNonRecentRepoCount: number
+
   /** The number of "checks failed" notifications the user clicked */
   readonly checksFailedNotificationClicked: number
 
@@ -485,6 +507,18 @@ export interface IDailyMeasures {
    */
   readonly checksFailedDialogRerunChecksCount: number
 
+  /**
+   * The number of PR review notifications the user received for a recent
+   * repository other than the selected one.
+   */
+  readonly pullRequestReviewNotificationFromRecentRepoCount: number
+
+  /**
+   * The number of PR review notifications the user received for a non-recent
+   * repository other than the selected one.
+   */
+  readonly pullRequestReviewNotificationFromNonRecentRepoCount: number
+
   /** The number of "approved PR" notifications the user received */
   readonly pullRequestReviewApprovedNotificationCount: number
 
@@ -520,6 +554,53 @@ export interface IDailyMeasures {
    * from the "changes requested" dialog.
    */
   readonly pullRequestReviewChangesRequestedDialogSwitchToPullRequestCount: number
+
+  /** The number of "commented PR" notifications the user received */
+  readonly pullRequestCommentNotificationCount: number
+
+  /** The number of "commented PR" notifications the user clicked */
+  readonly pullRequestCommentNotificationClicked: number
+
+  /**
+   * The number of PR comment notifications the user received for a non-recent
+   * repository other than the selected one.
+   */
+  readonly pullRequestCommentNotificationFromNonRecentRepoCount: number
+  /**
+   * The number of PR comment notifications the user received for a recent
+   * repository other than the selected one.
+   */
+  readonly pullRequestCommentNotificationFromRecentRepoCount: number
+
+  /**
+   * The number of times the user decided to switch to the affected pull request
+   * from the PR comment dialog.
+   */
+  readonly pullRequestCommentDialogSwitchToPullRequestCount: number
+
+  /** The number of times the user did a multi commit diff where there were unreachable commits */
+  readonly multiCommitDiffWithUnreachableCommitWarningCount: number
+
+  /** The number of times the user does a multi commit diff from the history view */
+  readonly multiCommitDiffFromHistoryCount: number
+
+  /** The number of times the user does a multi commit diff from the compare */
+  readonly multiCommitDiffFromCompareCount: number
+
+  /** The number of times the user opens the unreachable commits dialog */
+  readonly multiCommitDiffUnreachableCommitsDialogOpenedCount: number
+
+  /** The number of times the user opens a submodule diff from the changes list */
+  readonly submoduleDiffViewedFromChangesListCount: number
+
+  /** The number of times the user opens a submodule diff from the History view */
+  readonly submoduleDiffViewedFromHistoryCount: number
+
+  /** The number of times the user opens a submodule repository from its diff */
+  readonly openSubmoduleFromDiffCount: number
+
+  /** The number of times a user has opened the preview pull request dialog */
+  readonly previewedPullRequestCount: number
 }
 
 export class StatsDatabase extends Dexie {
diff --git a/app/src/lib/stats/stats-store.ts b/app/src/lib/stats/stats-store.ts
index e39a36aac04..6bb2cb08189 100644
--- a/app/src/lib/stats/stats-store.ts
+++ b/app/src/lib/stats/stats-store.ts
@@ -9,7 +9,14 @@ import { merge } from '../../lib/merge'
 import { getPersistedThemeName } from '../../ui/lib/application-theme'
 import { IUiActivityMonitor } from '../../ui/lib/ui-activity-monitor'
 import { Disposable } from 'event-kit'
-import { SignInMethod } from '../stores'
+import {
+  showDiffCheckMarksDefault,
+  showDiffCheckMarksKey,
+  underlineLinksDefault,
+  underlineLinksKey,
+  useCustomEditorKey,
+  useCustomShellKey,
+} from '../stores'
 import { assertNever } from '../fatal-error'
 import {
   getNumber,
@@ -28,6 +35,8 @@ import { getNotificationsEnabled } from '../stores/notifications-store'
 import { isInApplicationFolder } from '../../ui/main-process-proxy'
 import { getRendererGUID } from '../get-renderer-guid'
 import { ValidNotificationPullRequestReviewState } from '../valid-notification-pull-request-review'
+import { useExternalCredentialHelperKey } from '../trampoline/use-external-credential-helper'
+import { getUserAgent } from '../http'
 
 type PullRequestReviewStatFieldInfix =
   | 'Approved'
@@ -64,7 +73,6 @@ const FirstCommitCreatedAtKey = 'first-commit-created-at'
 const FirstPushToGitHubAtKey = 'first-push-to-github-at'
 const FirstNonDefaultBranchCheckoutAtKey =
   'first-non-default-branch-checkout-at'
-const WelcomeWizardSignInMethodKey = 'welcome-wizard-sign-in-method'
 const terminalEmulatorKey = 'shell'
 const textEditorKey: string = 'externalEditor'
 
@@ -112,11 +120,13 @@ const DefaultDailyMeasures: IDailyMeasures = {
   guidedConflictedMergeCompletionCount: 0,
   unguidedConflictedMergeCompletionCount: 0,
   createPullRequestCount: 0,
+  createPullRequestFromPreviewCount: 0,
   rebaseConflictsDialogDismissalCount: 0,
   rebaseConflictsDialogReopenedCount: 0,
   rebaseAbortedAfterConflictsCount: 0,
   rebaseSuccessAfterConflictsCount: 0,
   rebaseSuccessWithoutConflictsCount: 0,
+  rebaseWithBranchAlreadyUpToDateCount: 0,
   pullWithRebaseCount: 0,
   pullWithDefaultSettingCount: 0,
   stashEntriesCreatedOutsideDesktop: 0,
@@ -195,10 +205,14 @@ const DefaultDailyMeasures: IDailyMeasures = {
   viewsCheckJobStepOnline: 0,
   rerunsChecks: 0,
   checksFailedNotificationCount: 0,
+  checksFailedNotificationFromRecentRepoCount: 0,
+  checksFailedNotificationFromNonRecentRepoCount: 0,
   checksFailedNotificationClicked: 0,
   checksFailedDialogOpenCount: 0,
   checksFailedDialogSwitchToPullRequestCount: 0,
   checksFailedDialogRerunChecksCount: 0,
+  pullRequestReviewNotificationFromRecentRepoCount: 0,
+  pullRequestReviewNotificationFromNonRecentRepoCount: 0,
   pullRequestReviewApprovedNotificationCount: 0,
   pullRequestReviewApprovedNotificationClicked: 0,
   pullRequestReviewApprovedDialogSwitchToPullRequestCount: 0,
@@ -208,109 +222,102 @@ const DefaultDailyMeasures: IDailyMeasures = {
   pullRequestReviewChangesRequestedNotificationCount: 0,
   pullRequestReviewChangesRequestedNotificationClicked: 0,
   pullRequestReviewChangesRequestedDialogSwitchToPullRequestCount: 0,
+  pullRequestCommentNotificationCount: 0,
+  pullRequestCommentNotificationClicked: 0,
+  pullRequestCommentNotificationFromRecentRepoCount: 0,
+  pullRequestCommentNotificationFromNonRecentRepoCount: 0,
+  pullRequestCommentDialogSwitchToPullRequestCount: 0,
+  multiCommitDiffWithUnreachableCommitWarningCount: 0,
+  multiCommitDiffFromHistoryCount: 0,
+  multiCommitDiffFromCompareCount: 0,
+  multiCommitDiffUnreachableCommitsDialogOpenedCount: 0,
+  submoduleDiffViewedFromChangesListCount: 0,
+  submoduleDiffViewedFromHistoryCount: 0,
+  openSubmoduleFromDiffCount: 0,
+  previewedPullRequestCount: 0,
+}
+
+// A subtype of IDailyMeasures filtered to contain only its numeric properties
+type NumericMeasures = {
+  [P in keyof IDailyMeasures as IDailyMeasures[P] extends number
+    ? P
+    : never]: IDailyMeasures[P]
 }
 
 interface IOnboardingStats {
   /**
-   * Time (in seconds) from when the user first launched
-   * the application and entered the welcome wizard until
-   * the user added their first existing repository.
+   * Time (in seconds) from when the user first launched the application and
+   * entered the welcome wizard until the user added their first existing
+   * repository.
    *
-   * A negative value means that this action hasn't yet
-   * taken place while undefined means that the current
-   * user installed desktop prior to this metric being
-   * added and we will thus never be able to provide a
-   * value.
+   * A negative value means that this action hasn't yet taken place while
+   * undefined means that the current user installed desktop prior to this
+   * metric being added and we will thus never be able to provide a value.
    */
   readonly timeToFirstAddedRepository?: number
 
   /**
-   * Time (in seconds) from when the user first launched
-   * the application and entered the welcome wizard until
-   * the user cloned their first repository.
+   * Time (in seconds) from when the user first launched the application and
+   * entered the welcome wizard until the user cloned their first repository.
    *
-   * A negative value means that this action hasn't yet
-   * taken place while undefined means that the current
-   * user installed desktop prior to this metric being
-   * added and we will thus never be able to provide a
-   * value.
+   * A negative value means that this action hasn't yet taken place while
+   * undefined means that the current user installed desktop prior to this
+   * metric being added and we will thus never be able to provide a value.
    */
   readonly timeToFirstClonedRepository?: number
 
   /**
-   * Time (in seconds) from when the user first launched
-   * the application and entered the welcome wizard until
-   * the user created their first new repository.
+   * Time (in seconds) from when the user first launched the application and
+   * entered the welcome wizard until the user created their first new
+   * repository.
    *
-   * A negative value means that this action hasn't yet
-   * taken place while undefined means that the current
-   * user installed desktop prior to this metric being
-   * added and we will thus never be able to provide a
-   * value.
+   * A negative value means that this action hasn't yet taken place while
+   * undefined means that the current user installed desktop prior to this
+   * metric being added and we will thus never be able to provide a value.
    */
   readonly timeToFirstCreatedRepository?: number
 
   /**
-   * Time (in seconds) from when the user first launched
-   * the application and entered the welcome wizard until
-   * the user crafted their first commit.
+   * Time (in seconds) from when the user first launched the application and
+   * entered the welcome wizard until the user crafted their first commit.
    *
-   * A negative value means that this action hasn't yet
-   * taken place while undefined means that the current
-   * user installed desktop prior to this metric being
-   * added and we will thus never be able to provide a
-   * value.
+   * A negative value means that this action hasn't yet taken place while
+   * undefined means that the current user installed desktop prior to this
+   * metric being added and we will thus never be able to provide a value.
    */
   readonly timeToFirstCommit?: number
 
   /**
-   * Time (in seconds) from when the user first launched
-   * the application and entered the welcome wizard until
-   * the user performed their first push of a repository
-   * to GitHub.com or GitHub Enterprise. This metric
-   * does not track pushes to non-GitHub remotes.
+   * Time (in seconds) from when the user first launched the application and
+   * entered the welcome wizard until the user performed their first push of a
+   * repository to GitHub.com or GitHub Enterprise. This metric does not track
+   * pushes to non-GitHub remotes.
    */
   readonly timeToFirstGitHubPush?: number
 
   /**
-   * Time (in seconds) from when the user first launched
-   * the application and entered the welcome wizard until
-   * the user first checked out a branch in any repository
-   * which is not the default branch of that repository.
+   * Time (in seconds) from when the user first launched the application and
+   * entered the welcome wizard until the user first checked out a branch in any
+   * repository which is not the default branch of that repository.
    *
-   * Note that this metric will be set regardless of whether
-   * that repository was a GitHub.com/GHE repository, local
-   * repository or has a non-GitHub remote.
+   * Note that this metric will be set regardless of whether that repository was
+   * a GitHub.com/GHE repository, local repository or has a non-GitHub remote.
    *
-   * A negative value means that this action hasn't yet
-   * taken place while undefined means that the current
-   * user installed desktop prior to this metric being
-   * added and we will thus never be able to provide a
-   * value.
+   * A negative value means that this action hasn't yet taken place while
+   * undefined means that the current user installed desktop prior to this
+   * metric being added and we will thus never be able to provide a value.
    */
   readonly timeToFirstNonDefaultBranchCheckout?: number
 
   /**
-   * Time (in seconds) from when the user first launched
-   * the application and entered the welcome wizard until
-   * the user completed the wizard.
+   * Time (in seconds) from when the user first launched the application and
+   * entered the welcome wizard until the user completed the wizard.
    *
-   * A negative value means that this action hasn't yet
-   * taken place while undefined means that the current
-   * user installed desktop prior to this metric being
-   * added and we will thus never be able to provide a
-   * value.
+   * A negative value means that this action hasn't yet taken place while
+   * undefined means that the current user installed desktop prior to this
+   * metric being added and we will thus never be able to provide a value.
    */
   readonly timeToWelcomeWizardTerminated?: number
-
-  /**
-   * The method that was used when authenticating a
-   * user in the welcome flow. If multiple successful
-   * authentications happened during the welcome flow
-   * due to the user stepping back and signing in to
-   * another account this will reflect the last one.
-   */
-  readonly welcomeWizardSignInMethod?: 'basic' | 'web'
 }
 
 interface ICalculatedStats {
@@ -342,8 +349,8 @@ interface ICalculatedStats {
   readonly enterpriseAccount: boolean
 
   /**
-   * The name of the currently selected theme/application
-   * appearance as set at time of stats submission.
+   * The name of the currently selected theme/application appearance as set at
+   * time of stats submission.
    */
   readonly theme: string
 
@@ -356,12 +363,12 @@ interface ICalculatedStats {
   readonly eventType: 'usage'
 
   /**
-   * _[Forks]_
-   * How many repos did the user commit in without having `write` access?
+   * _[Forks]_ How many repos did the user commit in without having `write`
+   * access?
    *
-   * This is a hack in that its really a "computed daily measure" and the
-   * moment we have another one of those we should consider refactoring
-   * them into their own interface
+   * This is a hack in that its really a "computed daily measure" and the moment
+   * we have another one of those we should consider refactoring them into their
+   * own interface
    */
   readonly repositoriesCommittedInWithoutWriteAccess: number
 
@@ -379,6 +386,18 @@ interface ICalculatedStats {
 
   /** Whether or not the user has enabled high-signal notifications */
   readonly notificationsEnabled: boolean
+
+  /** Whether or not the user has their accessibility setting set for viewing link underlines */
+  readonly linkUnderlinesVisible: boolean
+
+  /** Whether or not the user has their accessibility setting set for viewing diff check marks */
+  readonly diffCheckMarksVisible: boolean
+
+  /**
+   * Whether or not the user has enabled the external credential helper or null
+   * if the user has not yet made an active decision
+   **/
+  readonly useExternalCredentialHelper?: boolean | null
 }
 
 type DailyStats = ICalculatedStats &
@@ -394,25 +413,37 @@ type DailyStats = ICalculatedStats &
  *
  */
 export interface IStatsStore {
-  recordMergeAbortedAfterConflicts: () => void
-  recordMergeSuccessAfterConflicts: () => void
-  recordRebaseAbortedAfterConflicts: () => void
-  recordRebaseSuccessAfterConflicts: () => void
+  increment: (
+    metric:
+      | 'mergeAbortedAfterConflictsCount'
+      | 'rebaseAbortedAfterConflictsCount'
+      | 'mergeSuccessAfterConflictsCount'
+      | 'rebaseSuccessAfterConflictsCount'
+  ) => void
 }
 
+const defaultPostImplementation = (body: Record<string, any>) =>
+  fetch(StatsEndpoint, {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'user-agent': getUserAgent(),
+    },
+    body: JSON.stringify(body),
+  })
+
 /** The store for the app's stats. */
 export class StatsStore implements IStatsStore {
-  private readonly db: StatsDatabase
-  private readonly uiActivityMonitor: IUiActivityMonitor
   private uiActivityMonitorSubscription: Disposable | null = null
 
   /** Has the user opted out of stats reporting? */
   private optOut: boolean
 
-  public constructor(db: StatsDatabase, uiActivityMonitor: IUiActivityMonitor) {
-    this.db = db
-    this.uiActivityMonitor = uiActivityMonitor
-
+  public constructor(
+    private readonly db: StatsDatabase,
+    private readonly uiActivityMonitor: IUiActivityMonitor,
+    private readonly post = defaultPostImplementation
+  ) {
     const storedValue = getHasOptedOutOfStats()
 
     this.optOut = storedValue || false
@@ -427,7 +458,7 @@ export class StatsStore implements IStatsStore {
 
     window.addEventListener('unhandledrejection', async () => {
       try {
-        this.recordUnhandledRejection()
+        this.increment('unhandledRejectionCount')
       } catch (err) {
         log.error(`Failed recording unhandled rejection`, err)
       }
@@ -491,18 +522,16 @@ export class StatsStore implements IStatsStore {
   }
 
   /**
-   * Clear the stored daily stats. Not meant to be called
-   * directly. Marked as public in order to enable testing
-   * of a specific scenario, see stats-store-tests for more
-   * detail.
+   * Clear the stored daily stats. Not meant to be called directly. Marked as
+   * public in order to enable testing of a specific scenario, see
+   * stats-store-tests for more detail.
    */
   public async clearDailyStats() {
     await this.db.launches.clear()
     await this.db.dailyMeasures.clear()
 
-    // This is a one-off, and the moment we have another
-    // computed daily measure we should consider refactoring
-    // them into their own interface
+    // This is a one-off, and the moment we have another computed daily measure
+    // we should consider refactoring them into their own interface
     localStorage.removeItem(RepositoriesCommittedInWithoutWriteAccessKey)
 
     this.enableUiActivityMonitoring()
@@ -537,13 +566,29 @@ export class StatsStore implements IStatsStore {
     const userType = this.determineUserType(accounts)
     const repositoryCounts = this.categorizedRepositoryCounts(repositories)
     const onboardingStats = this.getOnboardingStats()
-    const selectedTerminalEmulator =
-      localStorage.getItem(terminalEmulatorKey) || 'none'
-    const selectedTextEditor = localStorage.getItem(textEditorKey) || 'none'
+    const useCustomShell = getBoolean(useCustomShellKey, false)
+    const selectedTerminalEmulator = useCustomShell
+      ? 'custom'
+      : localStorage.getItem(terminalEmulatorKey) || 'none'
+    const useCustomEditor = getBoolean(useCustomEditorKey, false)
+    const selectedTextEditor = useCustomEditor
+      ? 'custom'
+      : localStorage.getItem(textEditorKey) || 'none'
     const repositoriesCommittedInWithoutWriteAccess = getNumberArray(
       RepositoriesCommittedInWithoutWriteAccessKey
     ).length
     const diffMode = getShowSideBySideDiff() ? 'split' : 'unified'
+    const linkUnderlinesVisible = getBoolean(
+      underlineLinksKey,
+      underlineLinksDefault
+    )
+    const diffCheckMarksVisible = getBoolean(
+      showDiffCheckMarksKey,
+      showDiffCheckMarksDefault
+    )
+
+    const useExternalCredentialHelper =
+      getBoolean(useExternalCredentialHelperKey) ?? null
 
     // isInApplicationsFolder is undefined when not running on Darwin
     const launchedFromApplicationsFolder = __DARWIN__
@@ -569,6 +614,9 @@ export class StatsStore implements IStatsStore {
       repositoriesCommittedInWithoutWriteAccess,
       diffMode,
       launchedFromApplicationsFolder,
+      linkUnderlinesVisible,
+      diffCheckMarksVisible,
+      useExternalCredentialHelper,
     }
   }
 
@@ -578,8 +626,8 @@ export class StatsStore implements IStatsStore {
     )
 
     // If we don't have a start time for the wizard none of our other metrics
-    // makes sense. This will happen for users who installed the app before
-    // we started tracking onboarding stats.
+    // makes sense. This will happen for users who installed the app before we
+    // started tracking onboarding stats.
     if (wizardInitiatedAt === null) {
       return {}
     }
@@ -594,8 +642,6 @@ export class StatsStore implements IStatsStore {
       FirstNonDefaultBranchCheckoutAtKey
     )
 
-    const welcomeWizardSignInMethod = getWelcomeWizardSignInMethod()
-
     return {
       timeToWelcomeWizardTerminated,
       timeToFirstAddedRepository,
@@ -604,7 +650,6 @@ export class StatsStore implements IStatsStore {
       timeToFirstCommit,
       timeToFirstGitHubPush,
       timeToFirstNonDefaultBranchCheckout,
-      welcomeWizardSignInMethod,
     }
   }
 
@@ -696,207 +741,49 @@ export class StatsStore implements IStatsStore {
 
   /** Record that a commit was accomplished. */
   public async recordCommit(): Promise<void> {
-    await this.updateDailyMeasures(m => ({
-      commits: m.commits + 1,
-    }))
-
+    await this.increment('commits')
     createLocalStorageTimestamp(FirstCommitCreatedAtKey)
   }
 
-  /** Record that a partial commit was accomplished. */
-  public recordPartialCommit(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      partialCommits: m.partialCommits + 1,
-    }))
-  }
-
-  /** Record that a commit was created with one or more co-authors. */
-  public recordCoAuthoredCommit(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      coAuthoredCommits: m.coAuthoredCommits + 1,
-    }))
-  }
-
   /**
    * Record that a commit was undone.
    *
    * @param cleanWorkingDirectory Whether the working directory is clean.
    */
-  public recordCommitUndone(cleanWorkingDirectory: boolean): Promise<void> {
-    if (cleanWorkingDirectory) {
-      return this.updateDailyMeasures(m => ({
-        commitsUndoneWithoutChanges: m.commitsUndoneWithoutChanges + 1,
-      }))
-    }
-    return this.updateDailyMeasures(m => ({
-      commitsUndoneWithChanges: m.commitsUndoneWithChanges + 1,
-    }))
-  }
-
-  /** Record that the user started amending a commit */
-  public recordAmendCommitStarted(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      amendCommitStartedCount: m.amendCommitStartedCount + 1,
-    }))
-  }
+  public recordCommitUndone = (cleanWorkingDirectory: boolean) =>
+    this.increment(
+      cleanWorkingDirectory
+        ? 'commitsUndoneWithoutChanges'
+        : 'commitsUndoneWithChanges'
+    )
 
   /**
    * Record that the user amended a commit.
    *
    * @param withFileChanges Whether the amendment included file changes or not.
    */
-  public recordAmendCommitSuccessful(withFileChanges: boolean): Promise<void> {
-    if (withFileChanges) {
-      return this.updateDailyMeasures(m => ({
-        amendCommitSuccessfulWithFileChangesCount:
-          m.amendCommitSuccessfulWithFileChangesCount + 1,
-      }))
-    }
-
-    return this.updateDailyMeasures(m => ({
-      amendCommitSuccessfulWithoutFileChangesCount:
-        m.amendCommitSuccessfulWithoutFileChangesCount + 1,
-    }))
-  }
-
-  /** Record that the user reset to a previous commit */
-  public recordResetToCommitCount(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      resetToCommitCount: m.resetToCommitCount + 1,
-    }))
-  }
-
-  /** Record that the user opened a shell. */
-  public recordOpenShell(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      openShellCount: m.openShellCount + 1,
-    }))
-  }
-
-  /** Record that a branch comparison has been made */
-  public recordBranchComparison(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      branchComparisons: m.branchComparisons + 1,
-    }))
-  }
-
-  /** Record that a branch comparison has been made to the default branch */
-  public recordDefaultBranchComparison(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      defaultBranchComparisons: m.defaultBranchComparisons + 1,
-    }))
-  }
-
-  /** Record that a merge has been initiated from the `compare` sidebar */
-  public recordCompareInitiatedMerge(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      mergesInitiatedFromComparison: m.mergesInitiatedFromComparison + 1,
-    }))
-  }
-
-  /** Record that a merge has been initiated from the `Branch -> Update From Default Branch` menu item */
-  public recordMenuInitiatedUpdate(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      updateFromDefaultBranchMenuCount: m.updateFromDefaultBranchMenuCount + 1,
-    }))
-  }
-
-  /** Record that conflicts were detected by a merge initiated by Desktop */
-  public recordMergeConflictFromPull(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      mergeConflictFromPullCount: m.mergeConflictFromPullCount + 1,
-    }))
-  }
-
-  /** Record that conflicts were detected by a merge initiated by Desktop */
-  public recordMergeConflictFromExplicitMerge(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      mergeConflictFromExplicitMergeCount:
-        m.mergeConflictFromExplicitMergeCount + 1,
-    }))
-  }
-
-  /** Record that a merge has been initiated from the `Branch -> Merge Into Current Branch` menu item */
-  public recordMenuInitiatedMerge(isSquash: boolean = false): Promise<void> {
-    if (isSquash) {
-      return this.updateDailyMeasures(m => ({
-        squashMergeIntoCurrentBranchMenuCount:
-          m.squashMergeIntoCurrentBranchMenuCount + 1,
-      }))
-    }
-
-    return this.updateDailyMeasures(m => ({
-      mergeIntoCurrentBranchMenuCount: m.mergeIntoCurrentBranchMenuCount + 1,
-    }))
-  }
-
-  public recordMenuInitiatedRebase(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      rebaseCurrentBranchMenuCount: m.rebaseCurrentBranchMenuCount + 1,
-    }))
-  }
-
-  /** Record that the user checked out a PR branch */
-  public recordPRBranchCheckout(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      prBranchCheckouts: m.prBranchCheckouts + 1,
-    }))
-  }
-
-  public recordRepoClicked(repoHasIndicator: boolean): Promise<void> {
-    if (repoHasIndicator) {
-      return this.updateDailyMeasures(m => ({
-        repoWithIndicatorClicked: m.repoWithIndicatorClicked + 1,
-      }))
-    }
-    return this.updateDailyMeasures(m => ({
-      repoWithoutIndicatorClicked: m.repoWithoutIndicatorClicked + 1,
-    }))
-  }
-
-  /**
-   * Records that the user made a commit using an email address that
-   * was not associated with the user's account on GitHub.com or GitHub
-   * Enterprise, meaning that the commit will not be attributed to the
-   * user's account.
-   */
-  public recordUnattributedCommit(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      unattributedCommits: m.unattributedCommits + 1,
-    }))
-  }
-
-  /**
-   * Records that the user made a commit to a repository hosted on
-   * a GitHub Enterprise instance
-   */
-  public recordCommitToEnterprise(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      enterpriseCommits: m.enterpriseCommits + 1,
-    }))
-  }
-
-  /** Records that the user made a commit to a repository hosted on GitHub.com */
-  public recordCommitToDotcom(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      dotcomCommits: m.dotcomCommits + 1,
-    }))
-  }
+  public recordAmendCommitSuccessful = (withFileChanges: boolean) =>
+    this.increment(
+      withFileChanges
+        ? 'amendCommitSuccessfulWithFileChangesCount'
+        : 'amendCommitSuccessfulWithoutFileChangesCount'
+    )
 
-  /** Record the user made a commit to a protected GitHub or GitHub Enterprise repository */
-  public recordCommitToProtectedBranch(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      commitsToProtectedBranch: m.commitsToProtectedBranch + 1,
-    }))
-  }
+  /** Record that a merge has been initiated from the `Branch -> Merge Into
+   * Current Branch` menu item */
+  public recordMenuInitiatedMerge = (isSquash: boolean = false) =>
+    this.increment(
+      isSquash
+        ? 'squashMergeIntoCurrentBranchMenuCount'
+        : 'mergeIntoCurrentBranchMenuCount'
+    )
 
-  /** Record the user made a commit to repository which has branch protections enabled */
-  public recordCommitToRepositoryWithBranchProtections(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      commitsToRepositoryWithBranchProtections:
-        m.commitsToRepositoryWithBranchProtections + 1,
-    }))
-  }
+  public recordRepoClicked = (repoHasIndicator: boolean) =>
+    this.increment(
+      repoHasIndicator
+        ? 'repoWithIndicatorClicked'
+        : 'repoWithoutIndicatorClicked'
+    )
 
   /** Set whether the user has opted out of stats reporting. */
   public async setOptOut(
@@ -936,16 +823,11 @@ export class StatsStore implements IStatsStore {
 
   /** Record that the user pushed to GitHub.com */
   private async recordPushToGitHub(options?: PushOptions): Promise<void> {
-    if (options && options.forceWithLease) {
-      await this.updateDailyMeasures(m => ({
-        dotcomForcePushCount: m.dotcomForcePushCount + 1,
-      }))
-    }
-
-    await this.updateDailyMeasures(m => ({
-      dotcomPushCount: m.dotcomPushCount + 1,
-    }))
-
+    await this.increment(
+      options && options.forceWithLease
+        ? 'dotcomForcePushCount'
+        : 'dotcomPushCount'
+    )
     createLocalStorageTimestamp(FirstPushToGitHubAtKey)
   }
 
@@ -953,696 +835,172 @@ export class StatsStore implements IStatsStore {
   private async recordPushToGitHubEnterprise(
     options?: PushOptions
   ): Promise<void> {
-    if (options && options.forceWithLease) {
-      await this.updateDailyMeasures(m => ({
-        enterpriseForcePushCount: m.enterpriseForcePushCount + 1,
-      }))
-    }
-
-    await this.updateDailyMeasures(m => ({
-      enterprisePushCount: m.enterprisePushCount + 1,
-    }))
+    await this.increment(
+      options && options.forceWithLease
+        ? 'enterpriseForcePushCount'
+        : 'enterprisePushCount'
+    )
 
-    // Note, this is not a typo. We track both GitHub.com and
-    // GitHub Enterprise under the same key
+    // Note, this is not a typo. We track both GitHub.com and GitHub Enterprise
+    // under the same key
     createLocalStorageTimestamp(FirstPushToGitHubAtKey)
   }
 
   /** Record that the user pushed to a generic remote */
-  private async recordPushToGenericRemote(
-    options?: PushOptions
-  ): Promise<void> {
-    if (options && options.forceWithLease) {
-      await this.updateDailyMeasures(m => ({
-        externalForcePushCount: m.externalForcePushCount + 1,
-      }))
-    }
+  private recordPushToGenericRemote = (options?: PushOptions) =>
+    this.increment(
+      options && options.forceWithLease
+        ? 'externalForcePushCount'
+        : 'externalPushCount'
+    )
 
-    await this.updateDailyMeasures(m => ({
-      externalPushCount: m.externalPushCount + 1,
-    }))
+  public recordWelcomeWizardInitiated() {
+    setNumber(WelcomeWizardInitiatedAtKey, Date.now())
+    localStorage.removeItem(WelcomeWizardCompletedAtKey)
   }
 
-  /** Record that the user saw a 'merge conflicts' warning but continued with the merge */
-  public recordUserProceededWhileLoading(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      mergedWithLoadingHintCount: m.mergedWithLoadingHintCount + 1,
-    }))
+  public recordWelcomeWizardTerminated() {
+    setNumber(WelcomeWizardCompletedAtKey, Date.now())
   }
 
-  /** Record that the user saw a 'merge conflicts' warning but continued with the merge */
-  public recordMergeHintSuccessAndUserProceeded(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      mergedWithCleanMergeHintCount: m.mergedWithCleanMergeHintCount + 1,
-    }))
+  public recordAddExistingRepository() {
+    createLocalStorageTimestamp(FirstRepositoryAddedAtKey)
   }
 
-  /** Record that the user saw a 'merge conflicts' warning but continued with the merge */
-  public recordUserProceededAfterConflictWarning(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      mergedWithConflictWarningHintCount:
-        m.mergedWithConflictWarningHintCount + 1,
-    }))
+  public recordCloneRepository() {
+    createLocalStorageTimestamp(FirstRepositoryClonedAtKey)
   }
 
-  /**
-   * Increments the `mergeConflictsDialogDismissalCount` metric
-   */
-  public recordMergeConflictsDialogDismissal(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      mergeConflictsDialogDismissalCount:
-        m.mergeConflictsDialogDismissalCount + 1,
-    }))
+  public recordCreateRepository() {
+    createLocalStorageTimestamp(FirstRepositoryCreatedAtKey)
   }
 
-  /**
-   * Increments the `anyConflictsLeftOnMergeConflictsDialogDismissalCount` metric
-   */
-  public recordAnyConflictsLeftOnMergeConflictsDialogDismissal(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      anyConflictsLeftOnMergeConflictsDialogDismissalCount:
-        m.anyConflictsLeftOnMergeConflictsDialogDismissalCount + 1,
-    }))
+  public recordNonDefaultBranchCheckout() {
+    createLocalStorageTimestamp(FirstNonDefaultBranchCheckoutAtKey)
   }
 
-  /**
-   * Increments the `mergeConflictsDialogReopenedCount` metric
-   */
-  public recordMergeConflictsDialogReopened(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      mergeConflictsDialogReopenedCount:
-        m.mergeConflictsDialogReopenedCount + 1,
-    }))
+  /** Record the number of stash entries created outside of Desktop for the day
+   * */
+  public addStashEntriesCreatedOutsideDesktop = (stashCount: number) =>
+    this.increment('stashEntriesCreatedOutsideDesktop', stashCount)
+
+  private onUiActivity = async () => {
+    this.disableUiActivityMonitoring()
+
+    return this.updateDailyMeasures(m => ({ active: true }))
   }
 
-  /**
-   * Increments the `guidedConflictedMergeCompletionCount` metric
+  /*
+   * Onboarding tutorial metrics
    */
-  public recordGuidedConflictedMergeCompletion(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      guidedConflictedMergeCompletionCount:
-        m.guidedConflictedMergeCompletionCount + 1,
-    }))
-  }
 
   /**
-   * Increments the `unguidedConflictedMergeCompletionCount` metric
+   * Onboarding tutorial has been started, the user has clicked the button to
+   * start the onboarding tutorial.
    */
-  public recordUnguidedConflictedMergeCompletion(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      unguidedConflictedMergeCompletionCount:
-        m.unguidedConflictedMergeCompletionCount + 1,
-    }))
+  public recordTutorialStarted() {
+    return this.updateDailyMeasures(() => ({ tutorialStarted: true }))
   }
 
-  /**
-   * Increments the `createPullRequestCount` metric
-   */
-  public recordCreatePullRequest(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      createPullRequestCount: m.createPullRequestCount + 1,
-    }))
+  /** Onboarding tutorial has been successfully created */
+  public recordTutorialRepoCreated() {
+    return this.updateDailyMeasures(() => ({ tutorialRepoCreated: true }))
   }
 
-  /**
-   * Increments the `rebaseConflictsDialogDismissalCount` metric
-   */
-  public recordRebaseConflictsDialogDismissal(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      rebaseConflictsDialogDismissalCount:
-        m.rebaseConflictsDialogDismissalCount + 1,
+  public recordTutorialEditorInstalled() {
+    return this.updateDailyMeasures(() => ({ tutorialEditorInstalled: true }))
+  }
+
+  public recordTutorialBranchCreated() {
+    return this.updateDailyMeasures(() => ({
+      tutorialEditorInstalled: true,
+      tutorialBranchCreated: true,
     }))
   }
 
-  /**
-   * Increments the `rebaseConflictsDialogReopenedCount` metric
-   */
-  public recordRebaseConflictsDialogReopened(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      rebaseConflictsDialogReopenedCount:
-        m.rebaseConflictsDialogReopenedCount + 1,
+  public recordTutorialFileEdited() {
+    return this.updateDailyMeasures(() => ({
+      tutorialEditorInstalled: true,
+      tutorialBranchCreated: true,
+      tutorialFileEdited: true,
     }))
   }
 
-  /**
-   * Increments the `rebaseAbortedAfterConflictsCount` metric
-   */
-  public recordRebaseAbortedAfterConflicts(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      rebaseAbortedAfterConflictsCount: m.rebaseAbortedAfterConflictsCount + 1,
+  public recordTutorialCommitCreated() {
+    return this.updateDailyMeasures(() => ({
+      tutorialEditorInstalled: true,
+      tutorialBranchCreated: true,
+      tutorialFileEdited: true,
+      tutorialCommitCreated: true,
     }))
   }
-  /**
-   * Increments the `pullWithRebaseCount` metric
-   */
-  public recordPullWithRebaseEnabled() {
-    return this.updateDailyMeasures(m => ({
-      pullWithRebaseCount: m.pullWithRebaseCount + 1,
+
+  public recordTutorialBranchPushed() {
+    return this.updateDailyMeasures(() => ({
+      tutorialEditorInstalled: true,
+      tutorialBranchCreated: true,
+      tutorialFileEdited: true,
+      tutorialCommitCreated: true,
+      tutorialBranchPushed: true,
     }))
   }
 
-  /**
-   * Increments the `rebaseSuccessWithoutConflictsCount` metric
-   */
-  public recordRebaseSuccessWithoutConflicts(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      rebaseSuccessWithoutConflictsCount:
-        m.rebaseSuccessWithoutConflictsCount + 1,
+  public recordTutorialPrCreated() {
+    return this.updateDailyMeasures(() => ({
+      tutorialEditorInstalled: true,
+      tutorialBranchCreated: true,
+      tutorialFileEdited: true,
+      tutorialCommitCreated: true,
+      tutorialBranchPushed: true,
+      tutorialPrCreated: true,
     }))
   }
 
-  /**
-   * Increments the `rebaseSuccessAfterConflictsCount` metric
-   */
-  public recordRebaseSuccessAfterConflicts(): Promise<void> {
+  public recordTutorialCompleted() {
+    return this.updateDailyMeasures(() => ({ tutorialCompleted: true }))
+  }
+
+  public recordHighestTutorialStepCompleted(step: number) {
     return this.updateDailyMeasures(m => ({
-      rebaseSuccessAfterConflictsCount: m.rebaseSuccessAfterConflictsCount + 1,
+      highestTutorialStepCompleted: Math.max(
+        step,
+        m.highestTutorialStepCompleted
+      ),
     }))
   }
 
   /**
-   * Increments the `pullWithDefaultSettingCount` metric
+   * Record that the user made a commit in a repository they don't have `write`
+   * access to. Dedupes based on the database ID provided
+   *
+   * @param gitHubRepositoryDbId database ID for the GitHubRepository of the
+   *                             local repo this commit was made in
    */
-  public recordPullWithDefaultSetting() {
-    return this.updateDailyMeasures(m => ({
-      pullWithDefaultSettingCount: m.pullWithDefaultSettingCount + 1,
-    }))
+  public recordRepositoryCommitedInWithoutWriteAccess(
+    gitHubRepositoryDbId: number
+  ) {
+    const ids = getNumberArray(RepositoriesCommittedInWithoutWriteAccessKey)
+    if (!ids.includes(gitHubRepositoryDbId)) {
+      setNumberArray(RepositoriesCommittedInWithoutWriteAccessKey, [
+        ...ids,
+        gitHubRepositoryDbId,
+      ])
+    }
   }
 
-  public recordWelcomeWizardInitiated() {
-    setNumber(WelcomeWizardInitiatedAtKey, Date.now())
-    localStorage.removeItem(WelcomeWizardCompletedAtKey)
-  }
+  public recordTagCreated = (numCreatedTags: number) =>
+    this.increment('tagsCreated', numCreatedTags)
 
-  public recordWelcomeWizardTerminated() {
-    setNumber(WelcomeWizardCompletedAtKey, Date.now())
-  }
-
-  public recordAddExistingRepository() {
-    createLocalStorageTimestamp(FirstRepositoryAddedAtKey)
-  }
-
-  public recordCloneRepository() {
-    createLocalStorageTimestamp(FirstRepositoryClonedAtKey)
-  }
-
-  public recordCreateRepository() {
-    createLocalStorageTimestamp(FirstRepositoryCreatedAtKey)
-  }
-
-  public recordNonDefaultBranchCheckout() {
-    createLocalStorageTimestamp(FirstNonDefaultBranchCheckoutAtKey)
-  }
-
-  public recordWelcomeWizardSignInMethod(method: SignInMethod) {
-    localStorage.setItem(WelcomeWizardSignInMethodKey, method)
-  }
-
-  /** Record when a conflicted merge was successfully completed by the user */
-  public recordMergeSuccessAfterConflicts(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      mergeSuccessAfterConflictsCount: m.mergeSuccessAfterConflictsCount + 1,
-    }))
-  }
-
-  /** Record when a conflicted merge was aborted by the user */
-  public recordMergeAbortedAfterConflicts(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      mergeAbortedAfterConflictsCount: m.mergeAbortedAfterConflictsCount + 1,
-    }))
-  }
-
-  /** Record when the user views a stash entry after checking out a branch */
-  public recordStashViewedAfterCheckout(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      stashViewedAfterCheckoutCount: m.stashViewedAfterCheckoutCount + 1,
-    }))
-  }
-
-  /** Record when the user **doesn't** view a stash entry after checking out a branch */
-  public recordStashNotViewedAfterCheckout(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      stashNotViewedAfterCheckoutCount: m.stashNotViewedAfterCheckoutCount + 1,
-    }))
-  }
-
-  /** Record when the user elects to take changes to new branch over stashing */
-  public recordChangesTakenToNewBranch(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      changesTakenToNewBranchCount: m.changesTakenToNewBranchCount + 1,
-    }))
-  }
-
-  /** Record when the user elects to stash changes on the current branch */
-  public recordStashCreatedOnCurrentBranch(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      stashCreatedOnCurrentBranchCount: m.stashCreatedOnCurrentBranchCount + 1,
-    }))
-  }
-
-  /** Record when the user discards a stash entry */
-  public recordStashDiscard(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      stashDiscardCount: m.stashDiscardCount + 1,
-    }))
-  }
-
-  /** Record when the user views a stash entry */
-  public recordStashView(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      stashViewCount: m.stashViewCount + 1,
-    }))
-  }
-
-  /** Record when the user restores a stash entry */
-  public recordStashRestore(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      stashRestoreCount: m.stashRestoreCount + 1,
-    }))
-  }
-
-  /** Record when the user takes no action on the stash entry */
-  public recordNoActionTakenOnStash(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      noActionTakenOnStashCount: m.noActionTakenOnStashCount + 1,
-    }))
-  }
-
-  /** Record the number of stash entries created outside of Desktop for the day */
-  public addStashEntriesCreatedOutsideDesktop(
-    stashCount: number
-  ): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      stashEntriesCreatedOutsideDesktop:
-        m.stashEntriesCreatedOutsideDesktop + stashCount,
-    }))
-  }
-
-  /**
-   * Record the number of times the user experiences the error
-   * "Some of your changes would be overwritten" when switching branches
-   */
-  public recordErrorWhenSwitchingBranchesWithUncommmittedChanges(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      errorWhenSwitchingBranchesWithUncommmittedChanges:
-        m.errorWhenSwitchingBranchesWithUncommmittedChanges + 1,
-    }))
-  }
-
-  /**
-   * Increment the number of times the user has opened their external editor
-   * from the suggested next steps view
-   */
-  public recordSuggestedStepOpenInExternalEditor(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      suggestedStepOpenInExternalEditor:
-        m.suggestedStepOpenInExternalEditor + 1,
-    }))
-  }
-
-  /**
-   * Increment the number of times the user has opened their repository in
-   * Finder/Explorer from the suggested next steps view
-   */
-  public recordSuggestedStepOpenWorkingDirectory(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      suggestedStepOpenWorkingDirectory:
-        m.suggestedStepOpenWorkingDirectory + 1,
-    }))
-  }
-
-  /**
-   * Increment the number of times the user has opened their repository on
-   * GitHub from the suggested next steps view
-   */
-  public recordSuggestedStepViewOnGitHub(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      suggestedStepViewOnGitHub: m.suggestedStepViewOnGitHub + 1,
-    }))
-  }
-
-  /**
-   * Increment the number of times the user has used the publish repository
-   * action from the suggested next steps view
-   */
-  public recordSuggestedStepPublishRepository(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      suggestedStepPublishRepository: m.suggestedStepPublishRepository + 1,
-    }))
-  }
-
-  /**
-   * Increment the number of times the user has used the publish branch
-   * action branch from the suggested next steps view
-   */
-  public recordSuggestedStepPublishBranch(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      suggestedStepPublishBranch: m.suggestedStepPublishBranch + 1,
-    }))
-  }
-
-  /**
-   * Increment the number of times the user has used the Create PR suggestion
-   * in the suggested next steps view.
-   */
-  public recordSuggestedStepCreatePullRequest(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      suggestedStepCreatePullRequest: m.suggestedStepCreatePullRequest + 1,
-    }))
-  }
-
-  /**
-   * Increment the number of times the user has used the View Stash suggestion
-   * in the suggested next steps view.
-   */
-  public recordSuggestedStepViewStash(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      suggestedStepViewStash: m.suggestedStepViewStash + 1,
-    }))
-  }
-
-  private onUiActivity = async () => {
-    this.disableUiActivityMonitoring()
-
-    return this.updateDailyMeasures(m => ({
-      active: true,
-    }))
-  }
-
-  /*
-   * Onboarding tutorial metrics
-   */
-
-  /**
-   * Onboarding tutorial has been started, the user has
-   * clicked the button to start the onboarding tutorial.
-   */
-  public recordTutorialStarted() {
-    return this.updateDailyMeasures(() => ({
-      tutorialStarted: true,
-    }))
-  }
-
-  /**
-   * Onboarding tutorial has been successfully created
-   */
-  public recordTutorialRepoCreated() {
-    return this.updateDailyMeasures(() => ({
-      tutorialRepoCreated: true,
-    }))
-  }
-
-  public recordTutorialEditorInstalled() {
-    return this.updateDailyMeasures(() => ({
-      tutorialEditorInstalled: true,
-    }))
-  }
-
-  public recordTutorialBranchCreated() {
-    return this.updateDailyMeasures(() => ({
-      tutorialEditorInstalled: true,
-      tutorialBranchCreated: true,
-    }))
-  }
-
-  public recordTutorialFileEdited() {
-    return this.updateDailyMeasures(() => ({
-      tutorialEditorInstalled: true,
-      tutorialBranchCreated: true,
-      tutorialFileEdited: true,
-    }))
-  }
-
-  public recordTutorialCommitCreated() {
-    return this.updateDailyMeasures(() => ({
-      tutorialEditorInstalled: true,
-      tutorialBranchCreated: true,
-      tutorialFileEdited: true,
-      tutorialCommitCreated: true,
-    }))
-  }
-
-  public recordTutorialBranchPushed() {
-    return this.updateDailyMeasures(() => ({
-      tutorialEditorInstalled: true,
-      tutorialBranchCreated: true,
-      tutorialFileEdited: true,
-      tutorialCommitCreated: true,
-      tutorialBranchPushed: true,
-    }))
-  }
-
-  public recordTutorialPrCreated() {
-    return this.updateDailyMeasures(() => ({
-      tutorialEditorInstalled: true,
-      tutorialBranchCreated: true,
-      tutorialFileEdited: true,
-      tutorialCommitCreated: true,
-      tutorialBranchPushed: true,
-      tutorialPrCreated: true,
-    }))
-  }
-
-  public recordTutorialCompleted() {
-    return this.updateDailyMeasures(() => ({
-      tutorialCompleted: true,
-    }))
-  }
-
-  public recordHighestTutorialStepCompleted(step: number) {
-    return this.updateDailyMeasures(m => ({
-      highestTutorialStepCompleted: Math.max(
-        step,
-        m.highestTutorialStepCompleted
-      ),
-    }))
-  }
-
-  public recordCommitToRepositoryWithoutWriteAccess() {
-    return this.updateDailyMeasures(m => ({
-      commitsToRepositoryWithoutWriteAccess:
-        m.commitsToRepositoryWithoutWriteAccess + 1,
-    }))
-  }
-
-  /**
-   * Record that the user made a commit in a repository they don't
-   * have `write` access to. Dedupes based on the database ID provided
-   *
-   * @param gitHubRepositoryDbId database ID for the GitHubRepository of
-   *                             the local repo this commit was made in
-   */
-  public recordRepositoryCommitedInWithoutWriteAccess(
-    gitHubRepositoryDbId: number
-  ) {
-    const ids = getNumberArray(RepositoriesCommittedInWithoutWriteAccessKey)
-    if (!ids.includes(gitHubRepositoryDbId)) {
-      setNumberArray(RepositoriesCommittedInWithoutWriteAccessKey, [
-        ...ids,
-        gitHubRepositoryDbId,
-      ])
-    }
-  }
-
-  public recordForkCreated() {
-    return this.updateDailyMeasures(m => ({
-      forksCreated: m.forksCreated + 1,
-    }))
-  }
-
-  public recordIssueCreationWebpageOpened() {
-    return this.updateDailyMeasures(m => ({
-      issueCreationWebpageOpenedCount: m.issueCreationWebpageOpenedCount + 1,
-    }))
-  }
-
-  public recordTagCreatedInDesktop() {
-    return this.updateDailyMeasures(m => ({
-      tagsCreatedInDesktop: m.tagsCreatedInDesktop + 1,
-    }))
-  }
-
-  public recordTagCreated(numCreatedTags: number) {
-    return this.updateDailyMeasures(m => ({
-      tagsCreated: m.tagsCreated + numCreatedTags,
-    }))
-  }
-
-  public recordTagDeleted() {
-    return this.updateDailyMeasures(m => ({
-      tagsDeleted: m.tagsDeleted + 1,
-    }))
-  }
-
-  public recordDiffOptionsViewed() {
-    return this.updateDailyMeasures(m => ({
-      diffOptionsViewedCount: m.diffOptionsViewedCount + 1,
-    }))
-  }
-
-  public recordRepositoryViewChanged() {
-    return this.updateDailyMeasures(m => ({
-      repositoryViewChangeCount: m.repositoryViewChangeCount + 1,
-    }))
-  }
-
-  public recordDiffModeChanged() {
-    return this.updateDailyMeasures(m => ({
-      diffModeChangeCount: m.diffModeChangeCount + 1,
-    }))
-  }
-
-  public recordUnhandledRejection() {
-    return this.updateDailyMeasures(m => ({
-      unhandledRejectionCount: m.unhandledRejectionCount + 1,
-    }))
-  }
-
-  private recordCherryPickSuccessful(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      cherryPickSuccessfulCount: m.cherryPickSuccessfulCount + 1,
-    }))
-  }
-
-  public recordCherryPickViaDragAndDrop(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      cherryPickViaDragAndDropCount: m.cherryPickViaDragAndDropCount + 1,
-    }))
-  }
-
-  public recordCherryPickViaContextMenu(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      cherryPickViaContextMenuCount: m.cherryPickViaContextMenuCount + 1,
-    }))
-  }
-
-  public recordDragStartedAndCanceled(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      dragStartedAndCanceledCount: m.dragStartedAndCanceledCount + 1,
-    }))
-  }
-
-  public recordCherryPickConflictsEncountered(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      cherryPickConflictsEncounteredCount:
-        m.cherryPickConflictsEncounteredCount + 1,
-    }))
-  }
-
-  public recordCherryPickSuccessfulWithConflicts(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      cherryPickSuccessfulWithConflictsCount:
-        m.cherryPickSuccessfulWithConflictsCount + 1,
-    }))
-  }
-
-  public recordCherryPickMultipleCommits(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      cherryPickMultipleCommitsCount: m.cherryPickMultipleCommitsCount + 1,
-    }))
-  }
-
-  private recordCherryPickUndone(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      cherryPickUndoneCount: m.cherryPickUndoneCount + 1,
-    }))
-  }
-
-  public recordCherryPickBranchCreatedCount(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      cherryPickBranchCreatedCount: m.cherryPickBranchCreatedCount + 1,
-    }))
-  }
-
-  private recordReorderSuccessful(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      reorderSuccessfulCount: m.reorderSuccessfulCount + 1,
-    }))
-  }
-
-  public recordReorderStarted(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      reorderStartedCount: m.reorderStartedCount + 1,
-    }))
-  }
-
-  private recordReorderConflictsEncountered(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      reorderConflictsEncounteredCount: m.reorderConflictsEncounteredCount + 1,
-    }))
-  }
-
-  private recordReorderSuccessfulWithConflicts(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      reorderSuccessfulWithConflictsCount:
-        m.reorderSuccessfulWithConflictsCount + 1,
-    }))
-  }
-
-  public recordReorderMultipleCommits(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      reorderMultipleCommitsCount: m.reorderMultipleCommitsCount + 1,
-    }))
-  }
-
-  private recordReorderUndone(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      reorderUndoneCount: m.reorderUndoneCount + 1,
-    }))
-  }
-
-  private recordSquashConflictsEncountered(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      squashConflictsEncounteredCount: m.squashConflictsEncounteredCount + 1,
-    }))
-  }
-
-  public recordSquashMultipleCommitsInvoked(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      squashMultipleCommitsInvokedCount:
-        m.squashMultipleCommitsInvokedCount + 1,
-    }))
-  }
-
-  private recordSquashSuccessful(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      squashSuccessfulCount: m.squashSuccessfulCount + 1,
-    }))
-  }
-
-  private recordSquashSuccessfulWithConflicts(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      squashSuccessfulWithConflictsCount:
-        m.squashSuccessfulWithConflictsCount + 1,
-    }))
-  }
-
-  public recordSquashViaContextMenuInvoked(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      squashViaContextMenuInvokedCount: m.squashViaContextMenuInvokedCount + 1,
-    }))
-  }
-
-  public recordSquashViaDragAndDropInvokedCount(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      squashViaDragAndDropInvokedCount: m.squashViaDragAndDropInvokedCount + 1,
-    }))
-  }
-
-  private recordSquashUndone(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      squashUndoneCount: m.squashUndoneCount + 1,
-    }))
-  }
+  private recordSquashUndone = () => this.increment('squashUndoneCount')
 
   public async recordOperationConflictsEncounteredCount(
     kind: MultiCommitOperationKind
   ): Promise<void> {
     switch (kind) {
       case MultiCommitOperationKind.Squash:
-        return this.recordSquashConflictsEncountered()
+        return this.increment('squashConflictsEncounteredCount')
       case MultiCommitOperationKind.Reorder:
-        return this.recordReorderConflictsEncountered()
+        return this.increment('reorderConflictsEncounteredCount')
       case MultiCommitOperationKind.Rebase:
         // ignored because rebase records different stats
         return
@@ -1662,11 +1020,11 @@ export class StatsStore implements IStatsStore {
   ): Promise<void> {
     switch (kind) {
       case MultiCommitOperationKind.Squash:
-        return this.recordSquashSuccessful()
+        return this.increment('squashSuccessfulCount')
       case MultiCommitOperationKind.Reorder:
-        return this.recordReorderSuccessful()
+        return this.increment('reorderSuccessfulCount')
       case MultiCommitOperationKind.CherryPick:
-        return this.recordCherryPickSuccessful()
+        return this.increment('cherryPickSuccessfulCount')
       case MultiCommitOperationKind.Rebase:
         // ignored because rebase records different stats
         return
@@ -1685,11 +1043,11 @@ export class StatsStore implements IStatsStore {
   ): Promise<void> {
     switch (kind) {
       case MultiCommitOperationKind.Squash:
-        return this.recordSquashSuccessfulWithConflicts()
+        return this.increment('squashSuccessfulWithConflictsCount')
       case MultiCommitOperationKind.Reorder:
-        return this.recordReorderSuccessfulWithConflicts()
+        return this.increment('reorderSuccessfulWithConflictsCount')
       case MultiCommitOperationKind.Rebase:
-        return this.recordRebaseSuccessAfterConflicts()
+        return this.increment('rebaseSuccessAfterConflictsCount')
       case MultiCommitOperationKind.CherryPick:
       case MultiCommitOperationKind.Merge:
         log.error(
@@ -1708,9 +1066,9 @@ export class StatsStore implements IStatsStore {
       case MultiCommitOperationKind.Squash:
         return this.recordSquashUndone()
       case MultiCommitOperationKind.Reorder:
-        return this.recordReorderUndone()
+        return this.increment('reorderUndoneCount')
       case MultiCommitOperationKind.CherryPick:
-        return this.recordCherryPickUndone()
+        return this.increment('cherryPickUndoneCount')
       case MultiCommitOperationKind.Rebase:
       case MultiCommitOperationKind.Merge:
         log.error(`[recordOperationUndone] - Operation not supported: ${kind}`)
@@ -1720,81 +1078,6 @@ export class StatsStore implements IStatsStore {
     }
   }
 
-  public recordSquashMergeSuccessfulWithConflicts(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      squashMergeSuccessfulWithConflictsCount:
-        m.squashMergeSuccessfulWithConflictsCount + 1,
-    }))
-  }
-
-  public recordSquashMergeSuccessful(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      squashMergeSuccessfulCount: m.squashMergeSuccessfulCount + 1,
-    }))
-  }
-
-  public recordSquashMergeInvokedCount(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      squashMergeInvokedCount: m.squashMergeInvokedCount + 1,
-    }))
-  }
-
-  public recordCheckRunsPopoverOpened(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      opensCheckRunsPopover: m.opensCheckRunsPopover + 1,
-    }))
-  }
-
-  public recordCheckViewedOnline(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      viewsCheckOnline: m.viewsCheckOnline + 1,
-    }))
-  }
-
-  public recordCheckJobStepViewedOnline(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      viewsCheckJobStepOnline: m.viewsCheckJobStepOnline + 1,
-    }))
-  }
-
-  public recordRerunChecks(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      rerunsChecks: m.rerunsChecks + 1,
-    }))
-  }
-
-  public recordChecksFailedNotificationShown(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      checksFailedNotificationCount: m.checksFailedNotificationCount + 1,
-    }))
-  }
-
-  public recordChecksFailedNotificationClicked(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      checksFailedNotificationClicked: m.checksFailedNotificationClicked + 1,
-    }))
-  }
-
-  public recordChecksFailedDialogOpen(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      checksFailedDialogOpenCount: m.checksFailedDialogOpenCount + 1,
-    }))
-  }
-
-  public recordChecksFailedDialogSwitchToPullRequest(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      checksFailedDialogSwitchToPullRequestCount:
-        m.checksFailedDialogSwitchToPullRequestCount + 1,
-    }))
-  }
-
-  public recordChecksFailedDialogRerunChecks(): Promise<void> {
-    return this.updateDailyMeasures(m => ({
-      checksFailedDialogRerunChecksCount:
-        m.checksFailedDialogRerunChecksCount + 1,
-    }))
-  }
-
   // Generates the stat field name for the given PR review type and suffix.
   private getStatFieldForRequestReviewState(
     reviewType: ValidNotificationPullRequestReviewState,
@@ -1812,15 +1095,14 @@ export class StatsStore implements IStatsStore {
     return `pullRequestReview${infixMap[reviewType]}${suffix}`
   }
 
-  // Generic method to record stats related to Pull Request review notifications.
+  // Generic method to record stats related to Pull Request review
+  // notifications.
   private recordPullRequestReviewStat(
     reviewType: ValidNotificationPullRequestReviewState,
     suffix: PullRequestReviewStatFieldSuffix
   ) {
     const statField = this.getStatFieldForRequestReviewState(reviewType, suffix)
-    return this.updateDailyMeasures(
-      m => ({ [statField]: m[statField] + 1 } as any)
-    )
+    return this.increment(statField)
   }
 
   public recordPullRequestReviewNotificationShown(
@@ -1844,34 +1126,26 @@ export class StatsStore implements IStatsStore {
     )
   }
 
-  /** Post some data to our stats endpoint. */
-  private post(body: object): Promise<Response> {
-    const options: RequestInit = {
-      method: 'POST',
-      headers: new Headers({ 'Content-Type': 'application/json' }),
-      body: JSON.stringify(body),
-    }
-
-    return fetch(StatsEndpoint, options)
-  }
+  public increment = (k: keyof NumericMeasures, n = 1) =>
+    this.updateDailyMeasures(
+      m => ({ [k]: m[k] + n } as Pick<IDailyMeasures, keyof NumericMeasures>)
+    )
 
   /**
    * Send opt-in ping with details of previous stored value (if known)
    *
-   * @param optOut        Whether or not the user has opted
-   *                      out of usage reporting.
-   * @param previousValue The raw, current value stored for the
-   *                      "stats-opt-out" localStorage key, or
-   *                      undefined if no previously stored value
-   *                      exists.
+   * @param optOut        Whether or not the user has opted out of usage
+   *                      reporting.
+   * @param previousValue The raw, current value stored for the "stats-opt-out"
+   *                      localStorage key, or undefined if no previously stored
+   *                      value exists.
    */
   private async sendOptInStatusPing(
     optOut: boolean,
     previousValue: boolean | undefined
   ): Promise<void> {
-    // The analytics pipeline expects us to submit `optIn` but we
-    // track `optOut` so we need to invert the value before we send
-    // it.
+    // The analytics pipeline expects us to submit `optIn` but we track `optOut`
+    // so we need to invert the value before we send it.
     const optIn = !optOut
     const previousOptInValue =
       previousValue === undefined ? null : !previousValue
@@ -1901,8 +1175,7 @@ export class StatsStore implements IStatsStore {
 /**
  * Store the current date (in unix time) in localStorage.
  *
- * If the provided key already exists it will not be
- * overwritten.
+ * If the provided key already exists it will not be overwritten.
  */
 function createLocalStorageTimestamp(key: string) {
   if (localStorage.getItem(key) === null) {
@@ -1913,25 +1186,22 @@ function createLocalStorageTimestamp(key: string) {
 /**
  * Get a time stamp (in unix time) from localStorage.
  *
- * If the key doesn't exist or if the stored value can't
- * be converted into a number this method will return null.
+ * If the key doesn't exist or if the stored value can't be converted into a
+ * number this method will return null.
  */
 function getLocalStorageTimestamp(key: string): number | null {
-  const timestamp = getNumber(key)
-  return timestamp === undefined ? null : timestamp
+  return getNumber(key) ?? null
 }
 
 /**
- * Calculate the duration (in seconds) between the time the
- * welcome wizard was initiated to the time for the given
- * action.
+ * Calculate the duration (in seconds) between the time the welcome wizard was
+ * initiated to the time for the given action.
  *
- * If no time stamp exists for when the welcome wizard was
- * initiated, which would be the case if the user completed
- * the wizard before we introduced onboarding metrics, or if
- * the delta between the two values are negative (which could
- * happen if a user manually manipulated localStorage in order
- * to run the wizard again) this method will return undefined.
+ * If no time stamp exists for when the welcome wizard was initiated, which
+ * would be the case if the user completed the wizard before we introduced
+ * onboarding metrics, or if the delta between the two values are negative
+ * (which could happen if a user manually manipulated localStorage in order to
+ * run the wizard again) this method will return undefined.
  */
 function timeTo(key: string): number | undefined {
   const startTime = getLocalStorageTimestamp(WelcomeWizardInitiatedAtKey)
@@ -1946,34 +1216,6 @@ function timeTo(key: string): number | undefined {
     : Math.round((endTime - startTime) / 1000)
 }
 
-/**
- * Get a string representing the sign in method that was used
- * when authenticating a user in the welcome flow. This method
- * ensures that the reported value is known to the analytics
- * system regardless of whether the enum value of the SignInMethod
- * type changes.
- */
-function getWelcomeWizardSignInMethod(): 'basic' | 'web' | undefined {
-  const method = localStorage.getItem(
-    WelcomeWizardSignInMethodKey
-  ) as SignInMethod | null
-
-  try {
-    switch (method) {
-      case SignInMethod.Basic:
-      case SignInMethod.Web:
-        return method
-      case null:
-        return undefined
-      default:
-        return assertNever(method, `Unknown sign in method: ${method}`)
-    }
-  } catch (ex) {
-    log.error(`Could not parse welcome wizard sign in method`, ex)
-    return undefined
-  }
-}
-
 /**
  * Return a value indicating whether the user has opted out of stats reporting
  * or not.
diff --git a/app/src/lib/status-parser.ts b/app/src/lib/status-parser.ts
index c642e97fec8..9df0ca64783 100644
--- a/app/src/lib/status-parser.ts
+++ b/app/src/lib/status-parser.ts
@@ -1,8 +1,10 @@
 import {
   FileEntry,
   GitStatusEntry,
+  SubmoduleStatus,
   UnmergedEntrySummary,
 } from '../models/status'
+import { splitBuffer } from './split-buffer'
 
 type StatusItem = IStatusHeader | IStatusEntry
 
@@ -21,8 +23,14 @@ export interface IStatusEntry {
   /** The two character long status code */
   readonly statusCode: string
 
+  /** The four character long submodule status code */
+  readonly submoduleStatusCode: string
+
   /** The original path in the case of a renamed file */
   readonly oldPath?: string
+
+  /** The rename or copy score in the case of a renamed file */
+  readonly renameOrCopyScore?: number
 }
 
 export function isStatusHeader(
@@ -45,7 +53,7 @@ const IgnoredEntryType = '!'
 
 /** Parses output from git status --porcelain -z into file status entries */
 export function parsePorcelainStatus(
-  output: string
+  output: Buffer
 ): ReadonlyArray<StatusItem> {
   const entries = new Array<StatusItem>()
 
@@ -63,10 +71,10 @@ export function parsePorcelainStatus(
   // containing special characters are not specially formatted; no quoting or
   // backslash-escaping is performed.
 
-  const tokens = output.split('\0')
+  const tokens = splitBuffer(output, '\0')
 
   for (let i = 0; i < tokens.length; i++) {
-    const field = tokens[i]
+    const field = tokens[i].toString()
     if (field.startsWith('# ') && field.length > 2) {
       entries.push({ kind: 'header', value: field.substring(2) })
       continue
@@ -77,7 +85,7 @@ export function parsePorcelainStatus(
     if (entryKind === ChangedEntryType) {
       entries.push(parseChangedEntry(field))
     } else if (entryKind === RenamedOrCopiedEntryType) {
-      entries.push(parsedRenamedOrCopiedEntry(field, tokens[++i]))
+      entries.push(parsedRenamedOrCopiedEntry(field, tokens[++i].toString()))
     } else if (entryKind === UnmergedEntryType) {
       entries.push(parseUnmergedEntry(field))
     } else if (entryKind === UntrackedEntryType) {
@@ -102,7 +110,12 @@ function parseChangedEntry(field: string): IStatusEntry {
     throw new Error(`Failed to parse status line for changed entry`)
   }
 
-  return { kind: 'entry', statusCode: match[1], path: match[8] }
+  return {
+    kind: 'entry',
+    statusCode: match[1],
+    submoduleStatusCode: match[2],
+    path: match[8],
+  }
 }
 
 // 2 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <X><score> <path><sep><origPath>
@@ -126,7 +139,14 @@ function parsedRenamedOrCopiedEntry(
     )
   }
 
-  return { kind: 'entry', statusCode: match[1], oldPath, path: match[9] }
+  return {
+    kind: 'entry',
+    statusCode: match[1],
+    submoduleStatusCode: match[2],
+    oldPath,
+    renameOrCopyScore: parseInt(match[8].substring(1), 10),
+    path: match[9],
+  }
 }
 
 // u <xy> <sub> <m1> <m2> <m3> <mW> <h1> <h2> <h3> <path>
@@ -144,6 +164,7 @@ function parseUnmergedEntry(field: string): IStatusEntry {
   return {
     kind: 'entry',
     statusCode: match[1],
+    submoduleStatusCode: match[2],
     path: match[10],
   }
 }
@@ -155,198 +176,244 @@ function parseUntrackedEntry(field: string): IStatusEntry {
     // NOTE: We return ?? instead of ? here to play nice with mapStatus,
     // might want to consider changing this (and mapStatus) in the future.
     statusCode: '??',
+    submoduleStatusCode: '????',
     path,
   }
 }
 
+function mapSubmoduleStatus(
+  submoduleStatusCode: string
+): SubmoduleStatus | undefined {
+  if (!submoduleStatusCode.startsWith('S')) {
+    return undefined
+  }
+
+  return {
+    commitChanged: submoduleStatusCode[1] === 'C',
+    modifiedChanges: submoduleStatusCode[2] === 'M',
+    untrackedChanges: submoduleStatusCode[3] === 'U',
+  }
+}
+
 /**
  * Map the raw status text from Git to a structure we can work with in the app.
  */
-export function mapStatus(status: string): FileEntry {
-  if (status === '??') {
-    return { kind: 'untracked' }
+export function mapStatus(
+  statusCode: string,
+  submoduleStatusCode: string,
+  renameOrCopyScore: number | undefined
+): FileEntry {
+  const submoduleStatus = mapSubmoduleStatus(submoduleStatusCode)
+
+  if (statusCode === '??') {
+    return { kind: 'untracked', submoduleStatus }
   }
 
-  if (status === '.M') {
+  if (statusCode === '.M') {
     return {
       kind: 'ordinary',
       type: 'modified',
       index: GitStatusEntry.Unchanged,
       workingTree: GitStatusEntry.Modified,
+      submoduleStatus,
     }
   }
 
-  if (status === 'M.') {
+  if (statusCode === 'M.') {
     return {
       kind: 'ordinary',
       type: 'modified',
       index: GitStatusEntry.Modified,
       workingTree: GitStatusEntry.Unchanged,
+      submoduleStatus,
     }
   }
 
-  if (status === '.A') {
+  if (statusCode === '.A') {
     return {
       kind: 'ordinary',
       type: 'added',
       index: GitStatusEntry.Unchanged,
       workingTree: GitStatusEntry.Added,
+      submoduleStatus,
     }
   }
 
-  if (status === 'A.') {
+  if (statusCode === 'A.') {
     return {
       kind: 'ordinary',
       type: 'added',
       index: GitStatusEntry.Added,
       workingTree: GitStatusEntry.Unchanged,
+      submoduleStatus,
     }
   }
 
-  if (status === '.D') {
+  if (statusCode === '.D') {
     return {
       kind: 'ordinary',
       type: 'deleted',
       index: GitStatusEntry.Unchanged,
       workingTree: GitStatusEntry.Deleted,
+      submoduleStatus,
     }
   }
 
-  if (status === 'D.') {
+  if (statusCode === 'D.') {
     return {
       kind: 'ordinary',
       type: 'deleted',
       index: GitStatusEntry.Deleted,
       workingTree: GitStatusEntry.Unchanged,
+      submoduleStatus,
     }
   }
 
-  if (status === 'R.') {
+  if (statusCode === 'R.') {
     return {
       kind: 'renamed',
       index: GitStatusEntry.Renamed,
       workingTree: GitStatusEntry.Unchanged,
+      renameOrCopyScore,
+      submoduleStatus,
     }
   }
 
-  if (status === '.R') {
+  if (statusCode === '.R') {
     return {
       kind: 'renamed',
       index: GitStatusEntry.Unchanged,
       workingTree: GitStatusEntry.Renamed,
+      renameOrCopyScore,
+      submoduleStatus,
     }
   }
 
-  if (status === 'C.') {
+  if (statusCode === 'C.') {
     return {
       kind: 'copied',
       index: GitStatusEntry.Copied,
       workingTree: GitStatusEntry.Unchanged,
+      submoduleStatus,
     }
   }
 
-  if (status === '.C') {
+  if (statusCode === '.C') {
     return {
       kind: 'copied',
       index: GitStatusEntry.Unchanged,
       workingTree: GitStatusEntry.Copied,
+      submoduleStatus,
     }
   }
 
-  if (status === 'AD') {
+  if (statusCode === 'AD') {
     return {
       kind: 'ordinary',
       type: 'added',
       index: GitStatusEntry.Added,
       workingTree: GitStatusEntry.Deleted,
+      submoduleStatus,
     }
   }
 
-  if (status === 'AM') {
+  if (statusCode === 'AM') {
     return {
       kind: 'ordinary',
       type: 'added',
       index: GitStatusEntry.Added,
       workingTree: GitStatusEntry.Modified,
+      submoduleStatus,
     }
   }
 
-  if (status === 'RM') {
+  if (statusCode === 'RM') {
     return {
       kind: 'renamed',
       index: GitStatusEntry.Renamed,
       workingTree: GitStatusEntry.Modified,
+      renameOrCopyScore,
+      submoduleStatus,
     }
   }
 
-  if (status === 'RD') {
+  if (statusCode === 'RD') {
     return {
       kind: 'renamed',
       index: GitStatusEntry.Renamed,
       workingTree: GitStatusEntry.Deleted,
+      renameOrCopyScore,
+      submoduleStatus,
     }
   }
 
-  if (status === 'DD') {
+  if (statusCode === 'DD') {
     return {
       kind: 'conflicted',
       action: UnmergedEntrySummary.BothDeleted,
       us: GitStatusEntry.Deleted,
       them: GitStatusEntry.Deleted,
+      submoduleStatus,
     }
   }
 
-  if (status === 'AU') {
+  if (statusCode === 'AU') {
     return {
       kind: 'conflicted',
       action: UnmergedEntrySummary.AddedByUs,
       us: GitStatusEntry.Added,
       them: GitStatusEntry.UpdatedButUnmerged,
+      submoduleStatus,
     }
   }
 
-  if (status === 'UD') {
+  if (statusCode === 'UD') {
     return {
       kind: 'conflicted',
       action: UnmergedEntrySummary.DeletedByThem,
       us: GitStatusEntry.UpdatedButUnmerged,
       them: GitStatusEntry.Deleted,
+      submoduleStatus,
     }
   }
 
-  if (status === 'UA') {
+  if (statusCode === 'UA') {
     return {
       kind: 'conflicted',
       action: UnmergedEntrySummary.AddedByThem,
       us: GitStatusEntry.UpdatedButUnmerged,
       them: GitStatusEntry.Added,
+      submoduleStatus,
     }
   }
 
-  if (status === 'DU') {
+  if (statusCode === 'DU') {
     return {
       kind: 'conflicted',
       action: UnmergedEntrySummary.DeletedByUs,
       us: GitStatusEntry.Deleted,
       them: GitStatusEntry.UpdatedButUnmerged,
+      submoduleStatus,
     }
   }
 
-  if (status === 'AA') {
+  if (statusCode === 'AA') {
     return {
       kind: 'conflicted',
       action: UnmergedEntrySummary.BothAdded,
       us: GitStatusEntry.Added,
       them: GitStatusEntry.Added,
+      submoduleStatus,
     }
   }
 
-  if (status === 'UU') {
+  if (statusCode === 'UU') {
     return {
       kind: 'conflicted',
       action: UnmergedEntrySummary.BothModified,
       us: GitStatusEntry.UpdatedButUnmerged,
       them: GitStatusEntry.UpdatedButUnmerged,
+      submoduleStatus,
     }
   }
 
@@ -354,5 +421,6 @@ export function mapStatus(status: string): FileEntry {
   return {
     kind: 'ordinary',
     type: 'modified',
+    submoduleStatus,
   }
 }
diff --git a/app/src/lib/stores/accounts-store.ts b/app/src/lib/stores/accounts-store.ts
index 39c3a1dd644..c25251aaed5 100644
--- a/app/src/lib/stores/accounts-store.ts
+++ b/app/src/lib/stores/accounts-store.ts
@@ -1,9 +1,10 @@
 import { IDataStore, ISecureStore } from './stores'
 import { getKeyForAccount } from '../auth'
 import { Account } from '../../models/account'
-import { fetchUser, EmailVisibility } from '../api'
+import { fetchUser, EmailVisibility, getEnterpriseAPIURL } from '../api'
 import { fatalError } from '../fatal-error'
 import { TypedBaseStore } from './base-store'
+import { isGHE } from '../endpoint-capabilities'
 
 /** The data-only interface for storage. */
 interface IEmail {
@@ -43,6 +44,7 @@ interface IAccount {
   readonly avatarURL: string
   readonly id: number
   readonly name: string
+  readonly plan?: string
 }
 
 /** The store for logged in accounts. */
@@ -162,6 +164,29 @@ export class AccountsStore extends TypedBaseStore<ReadonlyArray<Account>> {
     this.save()
   }
 
+  private getMigratedGHEAccounts(
+    accounts: ReadonlyArray<IAccount>
+  ): ReadonlyArray<IAccount> | null {
+    let migrated = false
+    const migratedAccounts = accounts.map(account => {
+      let endpoint = account.endpoint
+      const endpointURL = new URL(endpoint)
+      // Migrate endpoints of subdomains of `.ghe.com` that use the `/api/v3`
+      // path to the correct URL using the `api.` subdomain.
+      if (isGHE(endpoint) && !endpointURL.hostname.startsWith('api.')) {
+        endpoint = getEnterpriseAPIURL(endpoint)
+        migrated = true
+      }
+
+      return {
+        ...account,
+        endpoint,
+      }
+    })
+
+    return migrated ? migratedAccounts : null
+  }
+
   /**
    * Load the users into memory from storage.
    */
@@ -171,7 +196,10 @@ export class AccountsStore extends TypedBaseStore<ReadonlyArray<Account>> {
       return
     }
 
-    const rawAccounts: ReadonlyArray<IAccount> = JSON.parse(raw)
+    const parsedAccounts: ReadonlyArray<IAccount> = JSON.parse(raw)
+    const migratedAccounts = this.getMigratedGHEAccounts(parsedAccounts)
+    const rawAccounts = migratedAccounts ?? parsedAccounts
+
     const accountsWithTokens = []
     for (const account of rawAccounts) {
       const accountWithoutToken = new Account(
@@ -181,7 +209,8 @@ export class AccountsStore extends TypedBaseStore<ReadonlyArray<Account>> {
         account.emails,
         account.avatarURL,
         account.id,
-        account.name
+        account.name,
+        account.plan
       )
 
       const key = getKeyForAccount(accountWithoutToken)
@@ -196,7 +225,12 @@ export class AccountsStore extends TypedBaseStore<ReadonlyArray<Account>> {
     }
 
     this.accounts = accountsWithTokens
-    this.emitUpdate(this.accounts)
+    // If any account was migrated, make sure to persist the new value
+    if (migratedAccounts !== null) {
+      this.save() // Save already emits an update
+    } else {
+      this.emitUpdate(this.accounts)
+    }
   }
 
   private save() {
diff --git a/app/src/lib/stores/alive-store.ts b/app/src/lib/stores/alive-store.ts
index f0c00bacb05..a77cd3eec58 100644
--- a/app/src/lib/stores/alive-store.ts
+++ b/app/src/lib/stores/alive-store.ts
@@ -3,7 +3,6 @@ import { Account, accountEquals } from '../../models/account'
 import { API } from '../api'
 import { AliveSession, AliveEvent, Subscription } from '@github/alive-client'
 import { Emitter } from 'event-kit'
-import { enableHighSignalNotifications } from '../feature-flag'
 import { supportsAliveSessions } from '../endpoint-capabilities'
 
 /** Checks whether or not an account is included in a list of accounts. */
@@ -29,13 +28,23 @@ export interface IDesktopPullRequestReviewSubmitAliveEvent {
   readonly pull_request_number: number
   readonly state: 'APPROVED' | 'CHANGES_REQUESTED' | 'COMMENTED'
   readonly review_id: string
-  readonly number_of_comments: number
+}
+
+export interface IDesktopPullRequestCommentAliveEvent {
+  readonly type: 'pr-comment'
+  readonly subtype: 'review-comment' | 'issue-comment'
+  readonly timestamp: number
+  readonly owner: string
+  readonly repo: string
+  readonly pull_request_number: number
+  readonly comment_id: string
 }
 
 /** Represents an Alive event relevant to Desktop. */
 export type DesktopAliveEvent =
   | IDesktopChecksFailedAliveEvent
   | IDesktopPullRequestReviewSubmitAliveEvent
+  | IDesktopPullRequestCommentAliveEvent
 interface IAliveSubscription {
   readonly account: Account
   readonly subscription: Subscription<AliveStore>
@@ -107,7 +116,7 @@ export class AliveStore {
   }
 
   private subscribeToAccounts = async (accounts: ReadonlyArray<Account>) => {
-    if (!this.enabled || !enableHighSignalNotifications()) {
+    if (!this.enabled) {
       return
     }
 
@@ -248,7 +257,11 @@ export class AliveStore {
     }
 
     const data = event.data as any as DesktopAliveEvent
-    if (data.type === 'pr-checks-failed' || data.type === 'pr-review-submit') {
+    if (
+      data.type === 'pr-checks-failed' ||
+      data.type === 'pr-review-submit' ||
+      data.type === 'pr-comment'
+    ) {
       this.emitter.emit(this.ALIVE_EVENT_RECEIVED_EVENT, data)
     }
   }
diff --git a/app/src/lib/stores/api-repositories-store.ts b/app/src/lib/stores/api-repositories-store.ts
index ef20ad4e667..aa702713605 100644
--- a/app/src/lib/stores/api-repositories-store.ts
+++ b/app/src/lib/stores/api-repositories-store.ts
@@ -154,28 +154,82 @@ export class ApiRepositoriesStore extends BaseStore {
     this.emitUpdate()
   }
 
+  private getAccountState(account: Account) {
+    return this.accountState.get(resolveAccount(account, this.accountState))
+  }
+
   /**
    * Request that the store loads the list of repositories that
    * the provided account has explicit permissions to access.
    */
   public async loadRepositories(account: Account) {
-    const existingAccount = resolveAccount(account, this.accountState)
-    const existingRepositories = this.accountState.get(existingAccount)
+    const currentState = this.getAccountState(account)
 
-    if (existingRepositories !== undefined && existingRepositories.loading) {
+    if (currentState?.loading) {
       return
     }
 
-    this.updateAccount(existingAccount, { loading: true })
-
-    const api = API.fromAccount(existingAccount)
-    const repositories = await api.fetchRepositories()
+    this.updateAccount(account, { loading: true })
+
+    // We don't want to throw away the existing list of repositories if we're
+    // refreshing the list of repositories but we'll need to keep track of
+    // whether any repositories got deleted on the host so that we can remove
+    // them from our local state. We start out by adding all the repositories
+    // that we've seen up until this point to a map and then we'll remove them
+    // one by one as we load the fresh list from the API. Any repositories
+    // remaining in the map once we're done loading we can assume have been
+    // deleted on the host.
+    const missing = new Map<string, IAPIRepository>()
+    const repositories = new Map<string, IAPIRepository>()
+
+    currentState?.repositories.forEach(r => {
+      missing.set(r.clone_url, r)
+      repositories.set(r.clone_url, r)
+    })
+
+    const addPage = (page: ReadonlyArray<IAPIRepository>) => {
+      page.forEach(r => {
+        repositories.set(r.clone_url, r)
+        missing.delete(r.clone_url)
+      })
+      this.updateAccount(account, { repositories: [...repositories.values()] })
+    }
 
-    if (repositories === null) {
-      this.updateAccount(account, { loading: false })
-    } else {
-      this.updateAccount(account, { loading: false, repositories })
+    const api = API.fromAccount(resolveAccount(account, this.accountState))
+
+    // The vast majority of users have few repositories and no org affiliations.
+    // We'll start by making one request to load all repositories available to
+    // the user regardless of affiliation and only if that request isn't enough
+    // to load all repositories will we divvy up the requests and load
+    // repositories by owner and collaborator+org affiliation separately. This
+    // way we can avoid making unnecessary requests to the API for the majority
+    // of users while still improving the user experience for those users who
+    // have access to a lot of repositories and orgs.
+    await api.streamUserRepositories(addPage, undefined, {
+      async continue() {
+        // If the continue callback is called we know that the first request
+        // wasn't enough to load all repositories.
+        //
+        // For these users (with access to more than 100 repositories) we'll
+        // stream each of the three different affiliation types concurrently to
+        // minimize the time it takes to load all repositories.
+        await Promise.all([
+          api.streamUserRepositories(addPage, 'owner'),
+          api.streamUserRepositories(addPage, 'collaborator'),
+          api.streamUserRepositories(addPage, 'organization_member'),
+        ])
+
+        // Don't load more than one page in the initial stream request.
+        return false
+      },
+    })
+
+    if (missing.size) {
+      missing.forEach((_, clone_url) => repositories.delete(clone_url))
+      this.updateAccount(account, { repositories: [...repositories.values()] })
     }
+
+    this.updateAccount(account, { loading: false })
   }
 
   public getState(): ReadonlyMap<Account, IAccountRepositories> {
diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts
index 3bc0ff16591..c099e54516b 100644
--- a/app/src/lib/stores/app-store.ts
+++ b/app/src/lib/stores/app-store.ts
@@ -7,16 +7,23 @@ import {
   IssuesStore,
   PullRequestCoordinator,
   RepositoriesStore,
+  SignInResult,
   SignInStore,
+  UpstreamRemoteName,
 } from '.'
 import { Account } from '../../models/account'
 import { AppMenu, IMenu } from '../../models/app-menu'
-import { IAuthor } from '../../models/author'
+import { Author } from '../../models/author'
 import { Branch, BranchType, IAheadBehind } from '../../models/branch'
 import { BranchesTab } from '../../models/branches-tab'
 import { CloneRepositoryTab } from '../../models/clone-repository-tab'
 import { CloningRepository } from '../../models/cloning-repository'
-import { Commit, ICommitContext, CommitOneLine } from '../../models/commit'
+import {
+  Commit,
+  ICommitContext,
+  CommitOneLine,
+  shortenSHA,
+} from '../../models/commit'
 import {
   DiffSelection,
   DiffSelectionType,
@@ -29,7 +36,11 @@ import {
   GitHubRepository,
   hasWritePermission,
 } from '../../models/github-repository'
-import { PullRequest } from '../../models/pull-request'
+import {
+  defaultPullRequestSuggestedNextAction,
+  PullRequest,
+  PullRequestSuggestedNextAction,
+} from '../../models/pull-request'
 import {
   forkPullRequestRemoteName,
   IRemote,
@@ -42,6 +53,7 @@ import {
   isRepositoryWithGitHubRepository,
   RepositoryWithGitHubRepository,
   getNonForkGitHubRepository,
+  isForkedRepositoryContributingToParent,
 } from '../../models/repository'
 import {
   CommittedFileChange,
@@ -59,7 +71,6 @@ import {
   IMultiCommitOperationProgress,
 } from '../../models/progress'
 import { Popup, PopupType } from '../../models/popup'
-import { IGitAccount } from '../../models/git-account'
 import { themeChangeMonitor } from '../../ui/lib/theme-change-monitor'
 import { getAppPath } from '../../ui/lib/app-proxy'
 import {
@@ -67,7 +78,6 @@ import {
   ApplicationTheme,
   getCurrentlyAppliedTheme,
   getPersistedThemeName,
-  ICustomTheme,
   setPersistedTheme,
 } from '../../ui/lib/application-theme'
 import {
@@ -77,6 +87,10 @@ import {
   updatePreferredAppMenuItemLabels,
   updateAccounts,
   setWindowZoomFactor,
+  onShowInstallingUpdate,
+  sendWillQuitEvenIfUpdatingSync,
+  quitApp,
+  sendCancelQuittingSync,
 } from '../../ui/main-process-proxy'
 import {
   API,
@@ -85,6 +99,9 @@ import {
   IAPIOrganization,
   getEndpointForRepository,
   IAPIFullRepository,
+  IAPIComment,
+  IAPIRepoRuleset,
+  deleteToken,
 } from '../api'
 import { shell } from '../app-shell'
 import {
@@ -108,16 +125,17 @@ import {
   isMergeConflictState,
   IMultiCommitOperationState,
   IConstrainedValue,
+  ICompareState,
 } from '../app-state'
 import {
   findEditorOrDefault,
   getAvailableEditors,
+  launchCustomExternalEditor,
   launchExternalEditor,
 } from '../editors'
 import { assertNever, fatalError, forceUnwrap } from '../fatal-error'
 
 import { formatCommitMessage } from '../format-commit-message'
-import { getGenericHostname, getGenericUsername } from '../generic-git-auth'
 import { getAccountForRepository } from '../get-account-for-repository'
 import {
   abortMerge,
@@ -161,6 +179,12 @@ import {
   RepositoryType,
   getCommitRangeDiff,
   getCommitRangeChangedFiles,
+  updateRemoteHEAD,
+  getBranchMergeBaseChangedFiles,
+  getBranchMergeBaseDiff,
+  checkoutCommit,
+  getRemoteURL,
+  getGlobalConfigPath,
 } from '../git'
 import {
   installGlobalLFSFilters,
@@ -176,11 +200,12 @@ import {
   matchExistingRepository,
   urlMatchesRemote,
 } from '../repository-matching'
-import { isCurrentBranchForcePush } from '../rebase'
+import { ForcePushBranchState, getCurrentBranchForcePushState } from '../rebase'
 import { RetryAction, RetryActionType } from '../../models/retry-actions'
 import {
   Default as DefaultShell,
   findShellOrDefault,
+  launchCustomShell,
   launchShell,
   parse as parseShell,
   Shell,
@@ -194,6 +219,7 @@ import { promiseWithMinimumTimeout } from '../promise'
 import { BackgroundFetcher } from './helpers/background-fetcher'
 import { RepositoryStateCache } from './repository-state-cache'
 import { readEmoji } from '../read-emoji'
+import { Emoji } from '../emoji'
 import { GitStoreCache } from './git-store-cache'
 import { GitErrorContext } from '../git-error-context'
 import {
@@ -217,10 +243,7 @@ import {
 } from './updates/changes-state'
 import { ManualConflictResolution } from '../../models/manual-conflict-resolution'
 import { BranchPruner } from './helpers/branch-pruner'
-import {
-  enableHideWhitespaceInDiffOption,
-  enableMultiCommitDiffs,
-} from '../feature-flag'
+import { enableCustomIntegration } from '../feature-flag'
 import { Banner, BannerType } from '../../models/banner'
 import { ComputedAction } from '../../models/computed-action'
 import {
@@ -228,6 +251,7 @@ import {
   getLastDesktopStashEntryForBranch,
   popStashEntry,
   dropDesktopStashEntry,
+  moveStashEntry,
 } from '../git/stash'
 import {
   UncommittedChangesStrategy,
@@ -300,8 +324,24 @@ import {
 import * as ipcRenderer from '../ipc-renderer'
 import { pathExists } from '../../ui/lib/path-exists'
 import { offsetFromNow } from '../offset-from'
+import { findContributionTargetDefaultBranch } from '../branch'
 import { ValidNotificationPullRequestReview } from '../valid-notification-pull-request-review'
 import { determineMergeability } from '../git/merge-tree'
+import { PopupManager } from '../popup-manager'
+import { resizableComponentClass } from '../../ui/resizable'
+import { compare } from '../compare'
+import { parseRepoRules, useRepoRulesLogic } from '../helpers/repo-rules'
+import { RepoRulesInfo } from '../../models/repo-rules'
+import {
+  setUseExternalCredentialHelper,
+  useExternalCredentialHelper,
+  useExternalCredentialHelperDefault,
+} from '../trampoline/use-external-credential-helper'
+import { IOAuthAction } from '../parse-app-url'
+import {
+  ICustomIntegration,
+  migratedCustomIntegration,
+} from '../custom-integration'
 
 const LastSelectedRepositoryIDKey = 'last-selected-repository-id'
 
@@ -321,17 +361,37 @@ const commitSummaryWidthConfigKey: string = 'commit-summary-width'
 const defaultStashedFilesWidth: number = 250
 const stashedFilesWidthConfigKey: string = 'stashed-files-width'
 
+const defaultPullRequestFileListWidth: number = 250
+const pullRequestFileListConfigKey: string = 'pull-request-files-width'
+
+const defaultBranchDropdownWidth: number = 230
+const branchDropdownWidthConfigKey: string = 'branch-dropdown-width'
+
+const defaultPushPullButtonWidth: number = 230
+const pushPullButtonWidthConfigKey: string = 'push-pull-button-width'
+
 const askToMoveToApplicationsFolderDefault: boolean = true
 const confirmRepoRemovalDefault: boolean = true
+const showCommitLengthWarningDefault: boolean = false
 const confirmDiscardChangesDefault: boolean = true
 const confirmDiscardChangesPermanentlyDefault: boolean = true
+const confirmDiscardStashDefault: boolean = true
+const confirmCheckoutCommitDefault: boolean = true
 const askForConfirmationOnForcePushDefault = true
+const confirmUndoCommitDefault: boolean = true
+const confirmCommitFilteredChangesDefault: boolean = true
 const askToMoveToApplicationsFolderKey: string = 'askToMoveToApplicationsFolder'
 const confirmRepoRemovalKey: string = 'confirmRepoRemoval'
+const showCommitLengthWarningKey: string = 'showCommitLengthWarning'
 const confirmDiscardChangesKey: string = 'confirmDiscardChanges'
+const confirmDiscardStashKey: string = 'confirmDiscardStash'
+const confirmCheckoutCommitKey: string = 'confirmCheckoutCommit'
 const confirmDiscardChangesPermanentlyKey: string =
   'confirmDiscardChangesPermanentlyKey'
 const confirmForcePushKey: string = 'confirmForcePush'
+const confirmUndoCommitKey: string = 'confirmUndoCommit'
+const confirmCommitFilteredChangesKey: string =
+  'confirmCommitFilteredChangesKey'
 
 const uncommittedChangesStrategyKey = 'uncommittedChangesStrategyKind'
 
@@ -344,10 +404,16 @@ const hideWhitespaceInChangesDiffDefault = false
 const hideWhitespaceInChangesDiffKey = 'hide-whitespace-in-changes-diff'
 const hideWhitespaceInHistoryDiffDefault = false
 const hideWhitespaceInHistoryDiffKey = 'hide-whitespace-in-diff'
+const hideWhitespaceInPullRequestDiffDefault = false
+const hideWhitespaceInPullRequestDiffKey =
+  'hide-whitespace-in-pull-request-diff'
 
 const commitSpellcheckEnabledDefault = true
 const commitSpellcheckEnabledKey = 'commit-spellcheck-enabled'
 
+export const tabSizeDefault: number = 8
+const tabSizeKey: string = 'tab-size'
+
 const shellKey = 'shell'
 
 const repositoryIndicatorsEnabledKey = 'enable-repository-indicators'
@@ -365,7 +431,21 @@ const InitialRepositoryIndicatorTimeout = 2 * 60 * 1000
 const MaxInvalidFoldersToDisplay = 3
 
 const lastThankYouKey = 'version-and-users-of-last-thank-you'
-const customThemeKey = 'custom-theme-key'
+const pullRequestSuggestedNextActionKey =
+  'pull-request-suggested-next-action-key'
+
+export const useCustomEditorKey = 'use-custom-editor'
+const customEditorKey = 'custom-editor'
+
+export const useCustomShellKey = 'use-custom-shell'
+const customShellKey = 'custom-shell'
+
+export const underlineLinksKey = 'underline-links'
+export const underlineLinksDefault = true
+
+export const showDiffCheckMarksDefault = true
+export const showDiffCheckMarksKey = 'diff-check-marks-visible'
+
 export class AppStore extends TypedBaseStore<IAppState> {
   private readonly gitStoreCache: GitStoreCache
 
@@ -384,10 +464,8 @@ export class AppStore extends TypedBaseStore<IAppState> {
 
   private showWelcomeFlow = false
   private focusCommitMessage = false
-  private currentPopup: Popup | null = null
   private currentFoldout: Foldout | null = null
   private currentBanner: Banner | null = null
-  private errors: ReadonlyArray<Error> = new Array<Error>()
   private emitQueued = false
 
   private readonly localRepositoryStateLookup = new Map<
@@ -396,7 +474,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
   >()
 
   /** Map from shortcut (e.g., :+1:) to on disk URL. */
-  private emoji = new Map<string, string>()
+  private emoji = new Map<string, Emoji>()
 
   /**
    * The Application menu as an AppMenu instance or null if
@@ -420,25 +498,38 @@ export class AppStore extends TypedBaseStore<IAppState> {
   private sidebarWidth = constrain(defaultSidebarWidth)
   private commitSummaryWidth = constrain(defaultCommitSummaryWidth)
   private stashedFilesWidth = constrain(defaultStashedFilesWidth)
+  private pullRequestFileListWidth = constrain(defaultPullRequestFileListWidth)
+  private branchDropdownWidth = constrain(defaultBranchDropdownWidth)
+  private pushPullButtonWidth = constrain(defaultPushPullButtonWidth)
 
   private windowState: WindowState | null = null
   private windowZoomFactor: number = 1
+  private resizablePaneActive = false
   private isUpdateAvailableBannerVisible: boolean = false
   private isUpdateShowcaseVisible: boolean = false
 
   private askToMoveToApplicationsFolderSetting: boolean =
     askToMoveToApplicationsFolderDefault
+  private useExternalCredentialHelper: boolean =
+    useExternalCredentialHelperDefault
   private askForConfirmationOnRepositoryRemoval: boolean =
     confirmRepoRemovalDefault
   private confirmDiscardChanges: boolean = confirmDiscardChangesDefault
   private confirmDiscardChangesPermanently: boolean =
     confirmDiscardChangesPermanentlyDefault
+  private confirmDiscardStash: boolean = confirmDiscardStashDefault
+  private confirmCheckoutCommit: boolean = confirmCheckoutCommitDefault
   private askForConfirmationOnForcePush = askForConfirmationOnForcePushDefault
+  private confirmUndoCommit: boolean = confirmUndoCommitDefault
+  private confirmCommitFilteredChanges: boolean =
+    confirmCommitFilteredChangesDefault
   private imageDiffType: ImageDiffType = imageDiffTypeDefault
   private hideWhitespaceInChangesDiff: boolean =
     hideWhitespaceInChangesDiffDefault
   private hideWhitespaceInHistoryDiff: boolean =
     hideWhitespaceInHistoryDiffDefault
+  private hideWhitespaceInPullRequestDiff: boolean =
+    hideWhitespaceInPullRequestDiffDefault
   /** Whether or not the spellchecker is enabled for commit summary and description */
   private commitSpellcheckEnabled: boolean = commitSpellcheckEnabledDefault
   private showSideBySideDiff: boolean = ShowSideBySideDiffDefault
@@ -450,7 +541,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
   private resolvedExternalEditor: string | null = null
 
   /** The user's preferred shell. */
-  private selectedShell = DefaultShell
+  private selectedShell: Shell = DefaultShell
 
   /** The current repository filter text */
   private repositoryFilterText: string = ''
@@ -466,11 +557,13 @@ export class AppStore extends TypedBaseStore<IAppState> {
 
   private selectedBranchesTab = BranchesTab.Branches
   private selectedTheme = ApplicationTheme.System
-  private customTheme?: ICustomTheme
   private currentTheme: ApplicableTheme = ApplicationTheme.Light
+  private selectedTabSize = tabSizeDefault
 
   private useWindowsOpenSSH: boolean = false
 
+  private showCommitLengthWarning: boolean = showCommitLengthWarningDefault
+
   private hasUserViewedStash = false
 
   private repositoryIndicatorsEnabled: boolean
@@ -481,8 +574,28 @@ export class AppStore extends TypedBaseStore<IAppState> {
 
   private currentDragElement: DragElement | null = null
   private lastThankYou: ILastThankYou | undefined
+
+  private useCustomEditor: boolean = false
+  private customEditor: ICustomIntegration | null = null
+
+  private useCustomShell: boolean = false
+  private customShell: ICustomIntegration | null = null
+
   private showCIStatusPopover: boolean = false
 
+  /** A service for managing the stack of open popups */
+  private popupManager = new PopupManager()
+
+  private pullRequestSuggestedNextAction:
+    | PullRequestSuggestedNextAction
+    | undefined = undefined
+
+  private showDiffCheckMarks: boolean = showDiffCheckMarksDefault
+
+  private cachedRepoRulesets = new Map<number, IAPIRepoRuleset>()
+
+  private underlineLinks: boolean = underlineLinksDefault
+
   public constructor(
     private readonly gitHubUserStore: GitHubUserStore,
     private readonly cloningRepositoriesStore: CloningRepositoriesStore,
@@ -565,6 +678,12 @@ export class AppStore extends TypedBaseStore<IAppState> {
     this.notificationsStore.onPullRequestReviewSubmitNotification(
       this.onPullRequestReviewSubmitNotification
     )
+
+    this.notificationsStore.onPullRequestCommentNotification(
+      this.onPullRequestCommentNotification
+    )
+
+    onShowInstallingUpdate(this.onShowInstallingUpdate)
   }
 
   private initializeWindowState = async () => {
@@ -612,17 +731,19 @@ export class AppStore extends TypedBaseStore<IAppState> {
     return zoomFactor
   }
 
-  private onTokenInvalidated = (endpoint: string) => {
+  private onTokenInvalidated = (endpoint: string, token: string) => {
     const account = getAccountForEndpoint(this.accounts, endpoint)
 
     if (account === null) {
       return
     }
 
-    // If there is a currently open popup, don't do anything here. Since the
-    // app can only show one popup at a time, we don't want to close the current
-    // one in favor of the error we're about to show.
-    if (this.currentPopup !== null) {
+    // If we have a token for the account but it doesn't match the token that
+    // was invalidated that likely means that someone held onto an account for
+    // longer than they should have which is bad but what's even worse is if we
+    // invalidate an active account.
+    if (account.token && account.token !== token) {
+      log.error(`Token for ${endpoint} invalidated but token mismatch`)
       return
     }
 
@@ -635,6 +756,12 @@ export class AppStore extends TypedBaseStore<IAppState> {
     })
   }
 
+  private onShowInstallingUpdate = () => {
+    this._showPopup({
+      type: PopupType.InstallingUpdate,
+    })
+  }
+
   /** Figure out what step of the tutorial the user needs to do next */
   private async updateCurrentTutorialStep(
     repository: Repository
@@ -684,6 +811,9 @@ export class AppStore extends TypedBaseStore<IAppState> {
         this.statsStore.recordTutorialPrCreated()
         this.statsStore.recordTutorialCompleted()
         break
+      case TutorialStep.Announced:
+        // don't need to record anything for announcment
+        break
       default:
         assertNever(step, 'Unaccounted for step type')
     }
@@ -714,6 +844,11 @@ export class AppStore extends TypedBaseStore<IAppState> {
     await this.updateCurrentTutorialStep(repository)
   }
 
+  public async _markTutorialCompletionAsAnnounced(repository: Repository) {
+    this.tutorialAssessor.markTutorialCompletionAsAnnounced()
+    await this.updateCurrentTutorialStep(repository)
+  }
+
   private wireupIpcEventHandlers() {
     ipcRenderer.on('window-state-changed', (_, windowState) => {
       this.windowState = windowState
@@ -738,13 +873,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
 
     this.cloningRepositoriesStore.onDidError(e => this.emitError(e))
 
-    this.signInStore.onDidAuthenticate((account, method) => {
-      this._addAccount(account)
-
-      if (this.showWelcomeFlow) {
-        this.statsStore.recordWelcomeWizardSignInMethod(method)
-      }
-    })
+    this.signInStore.onDidAuthenticate(account => this._addAccount(account))
     this.signInStore.onDidUpdate(() => this.emitUpdate())
     this.signInStore.onDidError(error => this.emitError(error))
 
@@ -887,15 +1016,19 @@ export class AppStore extends TypedBaseStore<IAppState> {
       appIsFocused: this.appIsFocused,
       selectedState: this.getSelectedState(),
       signInState: this.signInStore.getState(),
-      currentPopup: this.currentPopup,
+      currentPopup: this.popupManager.currentPopup,
+      allPopups: this.popupManager.allPopups,
       currentFoldout: this.currentFoldout,
-      errors: this.errors,
+      errorCount: this.popupManager.getPopupsOfType(PopupType.Error).length,
       showWelcomeFlow: this.showWelcomeFlow,
       focusCommitMessage: this.focusCommitMessage,
       emoji: this.emoji,
       sidebarWidth: this.sidebarWidth,
+      branchDropdownWidth: this.branchDropdownWidth,
+      pushPullButtonWidth: this.pushPullButtonWidth,
       commitSummaryWidth: this.commitSummaryWidth,
       stashedFilesWidth: this.stashedFilesWidth,
+      pullRequestFilesListWidth: this.pullRequestFileListWidth,
       appMenuState: this.appMenu ? this.appMenu.openMenus : [],
       highlightAccessKeys: this.highlightAccessKeys,
       isUpdateAvailableBannerVisible: this.isUpdateAvailableBannerVisible,
@@ -903,17 +1036,24 @@ export class AppStore extends TypedBaseStore<IAppState> {
       currentBanner: this.currentBanner,
       askToMoveToApplicationsFolderSetting:
         this.askToMoveToApplicationsFolderSetting,
+      useExternalCredentialHelper: this.useExternalCredentialHelper,
       askForConfirmationOnRepositoryRemoval:
         this.askForConfirmationOnRepositoryRemoval,
       askForConfirmationOnDiscardChanges: this.confirmDiscardChanges,
       askForConfirmationOnDiscardChangesPermanently:
         this.confirmDiscardChangesPermanently,
+      askForConfirmationOnDiscardStash: this.confirmDiscardStash,
+      askForConfirmationOnCheckoutCommit: this.confirmCheckoutCommit,
       askForConfirmationOnForcePush: this.askForConfirmationOnForcePush,
+      askForConfirmationOnUndoCommit: this.confirmUndoCommit,
+      askForConfirmationOnCommitFilteredChanges:
+        this.confirmCommitFilteredChanges,
       uncommittedChangesStrategy: this.uncommittedChangesStrategy,
       selectedExternalEditor: this.selectedExternalEditor,
       imageDiffType: this.imageDiffType,
       hideWhitespaceInChangesDiff: this.hideWhitespaceInChangesDiff,
       hideWhitespaceInHistoryDiff: this.hideWhitespaceInHistoryDiff,
+      hideWhitespaceInPullRequestDiff: this.hideWhitespaceInPullRequestDiff,
       showSideBySideDiff: this.showSideBySideDiff,
       selectedShell: this.selectedShell,
       repositoryFilterText: this.repositoryFilterText,
@@ -921,18 +1061,28 @@ export class AppStore extends TypedBaseStore<IAppState> {
       selectedCloneRepositoryTab: this.selectedCloneRepositoryTab,
       selectedBranchesTab: this.selectedBranchesTab,
       selectedTheme: this.selectedTheme,
-      customTheme: this.customTheme,
       currentTheme: this.currentTheme,
+      selectedTabSize: this.selectedTabSize,
       apiRepositories: this.apiRepositoriesStore.getState(),
       useWindowsOpenSSH: this.useWindowsOpenSSH,
+      showCommitLengthWarning: this.showCommitLengthWarning,
       optOutOfUsageTracking: this.statsStore.getOptOut(),
       currentOnboardingTutorialStep: this.currentOnboardingTutorialStep,
       repositoryIndicatorsEnabled: this.repositoryIndicatorsEnabled,
       commitSpellcheckEnabled: this.commitSpellcheckEnabled,
       currentDragElement: this.currentDragElement,
       lastThankYou: this.lastThankYou,
+      useCustomEditor: this.useCustomEditor,
+      customEditor: this.customEditor,
+      useCustomShell: this.useCustomShell,
+      customShell: this.customShell,
       showCIStatusPopover: this.showCIStatusPopover,
       notificationsEnabled: getNotificationsEnabled(),
+      pullRequestSuggestedNextAction: this.pullRequestSuggestedNextAction,
+      resizablePaneActive: this.resizablePaneActive,
+      cachedRepoRulesets: this.cachedRepoRulesets,
+      underlineLinks: this.underlineLinks,
+      showDiffCheckMarks: this.showDiffCheckMarks,
     }
   }
 
@@ -988,6 +1138,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
       return {
         tip: gitStore.tip,
         defaultBranch: gitStore.defaultBranch,
+        upstreamDefaultBranch: gitStore.upstreamDefaultBranch,
         allBranches: gitStore.allBranches,
         recentBranches: gitStore.recentBranches,
         pullWithRebase: gitStore.pullWithRebase,
@@ -1049,6 +1200,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
   private clearBranchProtectionState(repository: Repository) {
     this.repositoryStateCache.updateChangesState(repository, () => ({
       currentBranchProtected: false,
+      currentRepoRulesInfo: new RepoRulesInfo(),
     }))
     this.emitUpdate()
   }
@@ -1080,6 +1232,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
       if (!hasWritePermission(gitHubRepo)) {
         this.repositoryStateCache.updateChangesState(repository, () => ({
           currentBranchProtected: false,
+          currentRepoRulesInfo: new RepoRulesInfo(),
         }))
         this.emitUpdate()
         return
@@ -1092,13 +1245,61 @@ export class AppStore extends TypedBaseStore<IAppState> {
       const pushControl = await api.fetchPushControl(owner, name, branchName)
       const currentBranchProtected = !isBranchPushable(pushControl)
 
+      let currentRepoRulesInfo = new RepoRulesInfo()
+      if (useRepoRulesLogic(account, repository)) {
+        const slimRulesets = await api.fetchAllRepoRulesets(owner, name)
+
+        // ultimate goal here is to fetch all rulesets that apply to the repo
+        // so they're already cached when needed later on
+        if (slimRulesets?.length) {
+          const rulesetIds = slimRulesets.map(r => r.id)
+
+          const calls: Promise<IAPIRepoRuleset | null>[] = []
+          for (const id of rulesetIds) {
+            // check the cache and don't re-query any that are already in there
+            if (!this.cachedRepoRulesets.has(id)) {
+              calls.push(api.fetchRepoRuleset(owner, name, id))
+            }
+          }
+
+          if (calls.length > 0) {
+            const rulesets = await Promise.all(calls)
+            this._updateCachedRepoRulesets(rulesets)
+          }
+        }
+
+        const branchRules = await api.fetchRepoRulesForBranch(
+          owner,
+          name,
+          branchName
+        )
+
+        if (branchRules.length > 0) {
+          currentRepoRulesInfo = await parseRepoRules(
+            branchRules,
+            this.cachedRepoRulesets,
+            repository
+          )
+        }
+      }
+
       this.repositoryStateCache.updateChangesState(repository, () => ({
         currentBranchProtected,
+        currentRepoRulesInfo,
       }))
       this.emitUpdate()
     }
   }
 
+  /** This shouldn't be called directly. See `Dispatcher`. */
+  public _updateCachedRepoRulesets(rulesets: Array<IAPIRepoRuleset | null>) {
+    for (const rs of rulesets) {
+      if (rs !== null) {
+        this.cachedRepoRulesets.set(rs.id, rs)
+      }
+    }
+  }
+
   private clearSelectedCommit(repository: Repository) {
     this.repositoryStateCache.updateCommitSelection(repository, () => ({
       shas: [],
@@ -1109,12 +1310,13 @@ export class AppStore extends TypedBaseStore<IAppState> {
   }
 
   /** This shouldn't be called directly. See `Dispatcher`. */
-  public async _changeCommitSelection(
+  public _changeCommitSelection(
     repository: Repository,
     shas: ReadonlyArray<string>,
     isContiguous: boolean
-  ): Promise<void> {
-    const { commitSelection } = this.repositoryStateCache.get(repository)
+  ): void {
+    const { commitSelection, commitLookup, compareState } =
+      this.repositoryStateCache.get(repository)
 
     if (
       commitSelection.shas.length === shas.length &&
@@ -1123,8 +1325,19 @@ export class AppStore extends TypedBaseStore<IAppState> {
       return
     }
 
+    const shasInDiff = this.getShasInDiff(
+      this.orderShasByHistory(repository, shas),
+      isContiguous,
+      commitLookup
+    )
+
+    if (shas.length > 1 && isContiguous) {
+      this.recordMultiCommitDiff(shas, shasInDiff, compareState)
+    }
+
     this.repositoryStateCache.updateCommitSelection(repository, () => ({
       shas,
+      shasInDiff,
       isContiguous,
       file: null,
       changesetData: { files: [], linesAdded: 0, linesDeleted: 0 },
@@ -1134,6 +1347,83 @@ export class AppStore extends TypedBaseStore<IAppState> {
     this.emitUpdate()
   }
 
+  private recordMultiCommitDiff(
+    shas: ReadonlyArray<string>,
+    shasInDiff: ReadonlyArray<string>,
+    compareState: ICompareState
+  ) {
+    const isHistoryTab = compareState.formState.kind === HistoryTabMode.History
+
+    if (isHistoryTab) {
+      this.statsStore.increment('multiCommitDiffFromHistoryCount')
+    } else {
+      this.statsStore.increment('multiCommitDiffFromCompareCount')
+    }
+
+    const hasUnreachableCommitWarning = !shas.every(s => shasInDiff.includes(s))
+
+    if (hasUnreachableCommitWarning) {
+      this.statsStore.increment(
+        'multiCommitDiffWithUnreachableCommitWarningCount'
+      )
+    }
+  }
+
+  /** This shouldn't be called directly. See `Dispatcher`. */
+  public async _updateShasToHighlight(
+    repository: Repository,
+    shasToHighlight: ReadonlyArray<string>
+  ) {
+    this.repositoryStateCache.updateCompareState(repository, () => ({
+      shasToHighlight,
+    }))
+    this.emitUpdate()
+  }
+
+  /**
+   * When multiple commits are selected, the diff is created using the rev range
+   * of firstSha^..lastSha in the selected shas. Thus comparing the trees of the
+   * the lastSha and the first parent of the first sha. However, our history
+   * list shows commits in chronological order. Thus, when a branch is merged,
+   * the commits from that branch are injected in their chronological order into
+   * the history list. Therefore, given a branch history of A, B, C, D,
+   * MergeCommit where B and C are from the merged branch, diffing on the
+   * selection of A through D would not have the changes from B an C.
+   *
+   * This method traverses the ancestral path from the last commit in the
+   * selection back to the first commit via checking the parents. The
+   * commits on this path are the commits whose changes will be seen in the
+   * diff. This is equivalent to doing `git rev-list firstSha^..lastSha`.
+   */
+  private getShasInDiff(
+    selectedShas: ReadonlyArray<string>,
+    isContiguous: boolean,
+    commitLookup: Map<string, Commit>
+  ) {
+    if (selectedShas.length <= 1 || !isContiguous) {
+      return selectedShas
+    }
+
+    const shasInDiff = new Set<string>()
+    const selected = new Set(selectedShas)
+    const shasToTraverse = [selectedShas.at(-1)]
+    let sha
+
+    while ((sha = shasToTraverse.pop()) !== undefined) {
+      if (!shasInDiff.has(sha)) {
+        shasInDiff.add(sha)
+
+        commitLookup.get(sha)?.parentSHAs?.forEach(parentSha => {
+          if (selected.has(parentSha) && !shasInDiff.has(parentSha)) {
+            shasToTraverse.push(parentSha)
+          }
+        })
+      }
+    }
+
+    return Array.from(shasInDiff)
+  }
+
   private updateOrSelectFirstCommit(
     repository: Repository,
     commitSHAs: ReadonlyArray<string>
@@ -1281,14 +1571,14 @@ export class AppStore extends TypedBaseStore<IAppState> {
       action.comparisonMode
     )
 
-    this.statsStore.recordBranchComparison()
+    this.statsStore.increment('branchComparisons')
     const { branchesState } = this.repositoryStateCache.get(repository)
 
     if (
       branchesState.defaultBranch !== null &&
       comparisonBranch.name === branchesState.defaultBranch.name
     ) {
-      this.statsStore.recordDefaultBranchComparison()
+      this.statsStore.increment('defaultBranchComparisons')
     }
 
     if (compare == null) {
@@ -1307,7 +1597,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
       aheadBehind,
     }
 
-    this.repositoryStateCache.updateCompareState(repository, s => ({
+    this.repositoryStateCache.updateCompareState(repository, () => ({
       formState: newState,
       filterText: comparisonBranch.name,
       commitSHAs,
@@ -1332,17 +1622,11 @@ export class AppStore extends TypedBaseStore<IAppState> {
     }
 
     if (tip.kind === TipState.Valid && aheadBehind.behind > 0) {
-      const mergeTreePromise = promiseWithMinimumTimeout(
-        () => determineMergeability(repository, tip.branch, action.branch),
-        500
+      this.currentMergeTreePromise = this.setupMergabilityPromise(
+        repository,
+        tip.branch,
+        action.branch
       )
-        .catch(err => {
-          log.warn(
-            `Error occurred while trying to merge ${tip.branch.name} (${tip.branch.tip.sha}) and ${action.branch.name} (${action.branch.tip.sha})`,
-            err
-          )
-          return null
-        })
         .then(mergeStatus => {
           this.repositoryStateCache.updateCompareState(repository, () => ({
             mergeStatus,
@@ -1350,16 +1634,9 @@ export class AppStore extends TypedBaseStore<IAppState> {
 
           this.emitUpdate()
         })
-
-      const cleanup = () => {
-        this.currentMergeTreePromise = null
-      }
-
-      // TODO: when we have Promise.prototype.finally available we
-      //       should use that here to make this intent clearer
-      mergeTreePromise.then(cleanup, cleanup)
-
-      this.currentMergeTreePromise = mergeTreePromise
+        .finally(() => {
+          this.currentMergeTreePromise = null
+        })
 
       return this.currentMergeTreePromise
     } else {
@@ -1371,6 +1648,23 @@ export class AppStore extends TypedBaseStore<IAppState> {
     }
   }
 
+  private setupMergabilityPromise(
+    repository: Repository,
+    baseBranch: Branch,
+    compareBranch: Branch
+  ) {
+    return promiseWithMinimumTimeout(
+      () => determineMergeability(repository, baseBranch, compareBranch),
+      500
+    ).catch(err => {
+      log.warn(
+        `Error occurred while trying to merge ${baseBranch.name} (${baseBranch.tip.sha}) and ${compareBranch.name} (${compareBranch.tip.sha})`,
+        err
+      )
+      return null
+    })
+  }
+
   /** This shouldn't be called directly. See `Dispatcher`. */
   public _updateCompareForm<K extends keyof ICompareFormUpdate>(
     repository: Repository,
@@ -1411,17 +1705,17 @@ export class AppStore extends TypedBaseStore<IAppState> {
     const state = this.repositoryStateCache.get(repository)
     const { commitSelection } = state
     const { shas: currentSHAs, isContiguous } = commitSelection
-    if (
-      currentSHAs.length === 0 ||
-      (currentSHAs.length > 1 && (!enableMultiCommitDiffs() || !isContiguous))
-    ) {
+    if (currentSHAs.length === 0 || (currentSHAs.length > 1 && !isContiguous)) {
       return
     }
 
     const gitStore = this.gitStoreCache.get(repository)
     const changesetData = await gitStore.performFailableOperation(() =>
       currentSHAs.length > 1
-        ? getCommitRangeChangedFiles(repository, currentSHAs)
+        ? getCommitRangeChangedFiles(
+            repository,
+            this.orderShasByHistory(repository, currentSHAs)
+          )
         : getChangedFiles(repository, currentSHAs[0])
     )
     if (!changesetData) {
@@ -1491,7 +1785,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
       }
     }
 
-    if (shas.length > 1 && (!enableMultiCommitDiffs() || !isContiguous)) {
+    if (shas.length > 1 && !isContiguous) {
       return
     }
 
@@ -1500,7 +1794,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
         ? await getCommitRangeDiff(
             repository,
             file,
-            shas,
+            this.orderShasByHistory(repository, shas),
             this.hideWhitespaceInHistoryDiff
           )
         : await getCommitDiff(
@@ -1623,6 +1917,9 @@ export class AppStore extends TypedBaseStore<IAppState> {
     )
     setNumberArray(RecentRepositoriesKey, slicedRecentRepositories)
     this.recentRepositories = slicedRecentRepositories
+    this.notificationsStore.setRecentRepositories(
+      this.repositories.filter(r => this.recentRepositories.includes(r.id))
+    )
     this.emitUpdate()
   }
 
@@ -1808,11 +2105,6 @@ export class AppStore extends TypedBaseStore<IAppState> {
       )
     }
 
-    const account = getAccountForRepository(this.accounts, repository)
-    if (!account) {
-      return
-    }
-
     if (!repository.gitHubRepository) {
       return
     }
@@ -1821,8 +2113,8 @@ export class AppStore extends TypedBaseStore<IAppState> {
     // similar to what's being done in `refreshAllIndicators`
     const fetcher = new BackgroundFetcher(
       repository,
-      account,
-      r => this.performFetch(r, account, FetchType.BackgroundTask),
+      this.accountsStore,
+      r => this._fetch(r, FetchType.BackgroundTask),
       r => this.shouldBackgroundFetch(r, null)
     )
     fetcher.start(withInitialSkew)
@@ -1857,19 +2149,45 @@ export class AppStore extends TypedBaseStore<IAppState> {
     this.stashedFilesWidth = constrain(
       getNumber(stashedFilesWidthConfigKey, defaultStashedFilesWidth)
     )
+    this.pullRequestFileListWidth = constrain(
+      getNumber(pullRequestFileListConfigKey, defaultPullRequestFileListWidth)
+    )
+    this.branchDropdownWidth = constrain(
+      getNumber(branchDropdownWidthConfigKey, defaultBranchDropdownWidth)
+    )
+    this.pushPullButtonWidth = constrain(
+      getNumber(pushPullButtonWidthConfigKey, defaultPushPullButtonWidth)
+    )
 
     this.updateResizableConstraints()
+    // TODO: Initiliaze here for now... maybe move to dialog mounting
+    this.updatePullRequestResizableConstraints()
 
     this.askToMoveToApplicationsFolderSetting = getBoolean(
       askToMoveToApplicationsFolderKey,
       askToMoveToApplicationsFolderDefault
     )
 
+    this.useExternalCredentialHelper = useExternalCredentialHelper()
+
     this.askForConfirmationOnRepositoryRemoval = getBoolean(
       confirmRepoRemovalKey,
       confirmRepoRemovalDefault
     )
 
+    // We're planning to flip the default value to false. As such we'll
+    // start persisting the current behavior to localstorage, so we
+    // can change the default in the future without affecting current
+    // users by removing this if statement.
+    if (getBoolean(showCommitLengthWarningKey) === undefined) {
+      setBoolean(showCommitLengthWarningKey, true)
+    }
+
+    this.showCommitLengthWarning = getBoolean(
+      showCommitLengthWarningKey,
+      showCommitLengthWarningDefault
+    )
+
     this.confirmDiscardChanges = getBoolean(
       confirmDiscardChangesKey,
       confirmDiscardChangesDefault
@@ -1880,11 +2198,31 @@ export class AppStore extends TypedBaseStore<IAppState> {
       confirmDiscardChangesPermanentlyDefault
     )
 
+    this.confirmDiscardStash = getBoolean(
+      confirmDiscardStashKey,
+      confirmDiscardStashDefault
+    )
+
+    this.confirmCheckoutCommit = getBoolean(
+      confirmCheckoutCommitKey,
+      confirmCheckoutCommitDefault
+    )
+
     this.askForConfirmationOnForcePush = getBoolean(
       confirmForcePushKey,
       askForConfirmationOnForcePushDefault
     )
 
+    this.confirmUndoCommit = getBoolean(
+      confirmUndoCommitKey,
+      confirmUndoCommitDefault
+    )
+
+    this.confirmCommitFilteredChanges = getBoolean(
+      confirmCommitFilteredChangesKey,
+      confirmCommitFilteredChangesDefault
+    )
+
     this.uncommittedChangesStrategy =
       getEnum(uncommittedChangesStrategyKey, UncommittedChangesStrategy) ??
       defaultUncommittedChangesStrategy
@@ -1912,6 +2250,10 @@ export class AppStore extends TypedBaseStore<IAppState> {
       hideWhitespaceInHistoryDiffKey,
       false
     )
+    this.hideWhitespaceInPullRequestDiff = getBoolean(
+      hideWhitespaceInPullRequestDiffKey,
+      false
+    )
     this.commitSpellcheckEnabled = getBoolean(
       commitSpellcheckEnabledKey,
       commitSpellcheckEnabledDefault
@@ -1919,14 +2261,12 @@ export class AppStore extends TypedBaseStore<IAppState> {
     this.showSideBySideDiff = getShowSideBySideDiff()
 
     this.selectedTheme = getPersistedThemeName()
-    this.customTheme = getObject<ICustomTheme>(customThemeKey)
     // Make sure the persisted theme is applied
     setPersistedTheme(this.selectedTheme)
 
-    this.currentTheme =
-      this.selectedTheme !== ApplicationTheme.HighContrast
-        ? await getCurrentlyAppliedTheme()
-        : this.selectedTheme
+    this.currentTheme = await getCurrentlyAppliedTheme()
+
+    this.selectedTabSize = getNumber(tabSizeKey, tabSizeDefault)
 
     themeChangeMonitor.onThemeChanged(theme => {
       this.currentTheme = theme
@@ -1935,9 +2275,45 @@ export class AppStore extends TypedBaseStore<IAppState> {
 
     this.lastThankYou = getObject<ILastThankYou>(lastThankYouKey)
 
+    this.useCustomEditor =
+      enableCustomIntegration() && getBoolean(useCustomEditorKey, false)
+    this.customEditor = getObject<ICustomIntegration>(customEditorKey) ?? null
+
+    this.useCustomShell =
+      enableCustomIntegration() && getBoolean(useCustomShellKey, false)
+    this.customShell = getObject<ICustomIntegration>(customShellKey) ?? null
+
+    // Migrate custom editor and shell to the new format if needed. This
+    // will persist the new format to local storage.
+    // Hopefully we can remove this migration in the future.
+    const migratedCustomEditor = migratedCustomIntegration(this.customEditor)
+    if (migratedCustomEditor !== null) {
+      this._setCustomEditor(migratedCustomEditor)
+    }
+    const migratedCustomShell = migratedCustomIntegration(this.customShell)
+    if (migratedCustomShell !== null) {
+      this._setCustomShell(migratedCustomShell)
+    }
+
+    this.pullRequestSuggestedNextAction =
+      getEnum(
+        pullRequestSuggestedNextActionKey,
+        PullRequestSuggestedNextAction
+      ) ?? defaultPullRequestSuggestedNextAction
+
+    // Always false if the feature flag is disabled.
+    this.underlineLinks = getBoolean(underlineLinksKey, underlineLinksDefault)
+
+    this.showDiffCheckMarks = getBoolean(
+      showDiffCheckMarksKey,
+      showDiffCheckMarksDefault
+    )
+
     this.emitUpdateNow()
 
     this.accountsStore.refresh()
+
+    this.updateMenuLabelsForSelectedRepository()
   }
 
   /**
@@ -1945,11 +2321,12 @@ export class AppStore extends TypedBaseStore<IAppState> {
    * dimensions change.
    */
   private updateResizableConstraints() {
-    // The combined width of the branch dropdown and the push pull fetch button
+    // The combined width of the branch dropdown and the push/pull/fetch button
     // Since the repository list toolbar button width is tied to the width of
-    // the sidebar we can't let it push the branch, and push/pull/fetch buttons
+    // the sidebar we can't let it push the branch, and push/pull/fetch button
     // off screen.
-    const toolbarButtonsWidth = 460
+    const toolbarButtonsMinWidth =
+      defaultPushPullButtonWidth + defaultBranchDropdownWidth
 
     // Start with all the available width
     let available = window.innerWidth
@@ -1960,7 +2337,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
     // 220 was determined as the minimum value since it is the smallest width
     // that will still fit the placeholder text in the branch selector textbox
     // of the history tab
-    const maxSidebarWidth = available - toolbarButtonsWidth
+    const maxSidebarWidth = available - toolbarButtonsMinWidth
     this.sidebarWidth = constrain(this.sidebarWidth, 220, maxSidebarWidth)
 
     // Now calculate the width we have left to distribute for the other panes
@@ -1976,6 +2353,69 @@ export class AppStore extends TypedBaseStore<IAppState> {
 
     this.commitSummaryWidth = constrain(this.commitSummaryWidth, 100, filesMax)
     this.stashedFilesWidth = constrain(this.stashedFilesWidth, 100, filesMax)
+
+    // Update the maximum width available for the branch dropdown resizable.
+    // The branch dropdown can only be as wide as the available space after
+    // taking the sidebar and pull/push/fetch button widths. If the room
+    // available is less than the default width, we will split the difference
+    // between the branch dropdown and the push/pull/fetch button so they stay
+    // visible on the most zoomed view.
+    const branchDropdownMax = available - defaultPushPullButtonWidth
+    const minimumBranchDropdownWidth =
+      defaultBranchDropdownWidth > available / 2
+        ? available / 2 - 10 // 10 is to give a little bit of space to see the fetch dropdown button
+        : defaultBranchDropdownWidth
+    this.branchDropdownWidth = constrain(
+      this.branchDropdownWidth,
+      minimumBranchDropdownWidth,
+      branchDropdownMax
+    )
+
+    const pushPullButtonMaxWidth = available - this.branchDropdownWidth.value
+    const minimumPushPullToolBarWidth =
+      defaultPushPullButtonWidth > available / 2
+        ? available / 2 + 30 // 30 to clip the fetch dropdown button in favor of seeing more of the words on the toolbar buttons
+        : defaultPushPullButtonWidth
+    this.pushPullButtonWidth = constrain(
+      this.pushPullButtonWidth,
+      minimumPushPullToolBarWidth,
+      pushPullButtonMaxWidth
+    )
+  }
+
+  /**
+   * Calculate the constraints of the resizable pane in the pull request dialog
+   * whenever the window dimensions change.
+   */
+  private updatePullRequestResizableConstraints() {
+    // TODO: Get width of PR dialog -> determine if we will have default width
+    // for pr dialog. The goal is for it expand to fill some percent of
+    // available window so it will change on window resize. We may have some max
+    // value and min value of where to derive a default is we cannot obtain the
+    // width for some reason (like initialization nad no pr dialog is open)
+    // Thoughts -> ß
+    // 1. Use dialog id to grab dialog if exists, else use default
+    // 2. Pass dialog width up when and call this contrainst on dialog mounting
+    //    to initialize and subscribe to window resize inside dialog to be able
+    //    to pass up dialog width on window resize.
+
+    // Get the width of the dialog
+    const available = 850
+    const dialogPadding = 20
+
+    // This is a pretty silly width for a diff but it will fit ~9 chars per line
+    // in unified mode after subtracting the width of the unified gutter and ~4
+    // chars per side in split diff mode. No one would want to use it this way
+    // but it doesn't break the layout and it allows users to temporarily
+    // maximize the width of the file list to see long path names.
+    const diffPaneMinWidth = 150
+    const filesListMax = available - dialogPadding - diffPaneMinWidth
+
+    this.pullRequestFileListWidth = constrain(
+      this.pullRequestFileListWidth,
+      100,
+      filesListMax
+    )
   }
 
   private updateSelectedExternalEditor(
@@ -2035,15 +2475,18 @@ export class AppStore extends TypedBaseStore<IAppState> {
    */
   private updateMenuItemLabels(state: IRepositoryState | null) {
     const {
+      useCustomShell,
       selectedShell,
+      selectedRepository,
+      useCustomEditor,
       selectedExternalEditor,
       askForConfirmationOnRepositoryRemoval,
       askForConfirmationOnForcePush,
     } = this
 
     const labels: MenuLabelsEvent = {
-      selectedShell,
-      selectedExternalEditor,
+      selectedShell: useCustomShell ? null : selectedShell,
+      selectedExternalEditor: useCustomEditor ? null : selectedExternalEditor,
       askForConfirmationOnRepositoryRemoval,
       askForConfirmationOnForcePush,
     }
@@ -2054,17 +2497,21 @@ export class AppStore extends TypedBaseStore<IAppState> {
     }
 
     const { changesState, branchesState, aheadBehind } = state
-    const { defaultBranch, currentPullRequest } = branchesState
+    const { currentPullRequest } = branchesState
 
-    const defaultBranchName =
-      defaultBranch === null || defaultBranch.upstreamWithoutRemote === null
-        ? undefined
-        : defaultBranch.upstreamWithoutRemote
+    let contributionTargetDefaultBranch: string | undefined
+    if (selectedRepository instanceof Repository) {
+      contributionTargetDefaultBranch =
+        findContributionTargetDefaultBranch(selectedRepository, branchesState)
+          ?.name ?? undefined
+    }
 
-    const isForcePushForCurrentRepository = isCurrentBranchForcePush(
-      branchesState,
-      aheadBehind
-    )
+    // From the menu, we'll offer to force-push whenever it's possible, regardless
+    // of whether or not the user performed any action we know would be followed
+    // by a force-push.
+    const isForcePushForCurrentRepository =
+      getCurrentBranchForcePushState(branchesState, aheadBehind) !==
+      ForcePushBranchState.NotAvailable
 
     const isStashedChangesVisible =
       changesState.selection.kind === ChangesSelectionKind.Stash
@@ -2074,7 +2521,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
 
     updatePreferredAppMenuItemLabels({
       ...labels,
-      defaultBranchName,
+      contributionTargetDefaultBranch,
       isForcePushForCurrentRepository,
       isStashedChangesVisible,
       hasCurrentPullRequest: currentPullRequest !== null,
@@ -2338,7 +2785,10 @@ export class AppStore extends TypedBaseStore<IAppState> {
 
     if (
       displayingBanner ||
-      isConflictsFlow(this.currentPopup, multiCommitOperationState)
+      isConflictsFlow(
+        this.popupManager.areTherePopupsOfType(PopupType.MultiCommitOperation),
+        multiCommitOperationState
+      )
     ) {
       return
     }
@@ -2371,6 +2821,8 @@ export class AppStore extends TypedBaseStore<IAppState> {
       assertNever(conflictState, `Unsupported conflict kind`)
     }
 
+    this.statsStore.increment('mergeConflictFromExplicitMergeCount')
+
     this._setMultiCommitOperationStep(repository, {
       kind: MultiCommitOperationStepKind.ShowConflicts,
       conflictState: {
@@ -2428,7 +2880,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
     const { multiCommitOperationState } = state
     if (
       userIsStartingMultiCommitOperation(
-        this.currentPopup,
+        this.popupManager.currentPopup,
         multiCommitOperationState
       )
     ) {
@@ -2443,24 +2895,33 @@ export class AppStore extends TypedBaseStore<IAppState> {
   /** This shouldn't be called directly. See `Dispatcher`. */
   public async _changeRepositorySection(
     repository: Repository,
-    selectedSection: RepositorySectionTab
+    selectedSection: RepositorySectionTab,
+    forceButtonFocus: boolean = false
   ): Promise<void> {
     this.repositoryStateCache.update(repository, state => {
       if (state.selectedSection !== selectedSection) {
-        this.statsStore.recordRepositoryViewChanged()
+        this.statsStore.increment('repositoryViewChangeCount')
       }
       return { selectedSection }
     })
     this.emitUpdate()
 
     if (selectedSection === RepositorySectionTab.History) {
-      return this.refreshHistorySection(repository)
+      await this.refreshHistorySection(repository)
     } else if (selectedSection === RepositorySectionTab.Changes) {
-      return this.refreshChangesSection(repository, {
+      await this.refreshChangesSection(repository, {
         includingStatus: true,
         clearPartialState: false,
       })
     }
+
+    if (forceButtonFocus) {
+      const repoSideBar = document.getElementById('repository-sidebar')
+      const button = repoSideBar?.querySelector(
+        '.tab-bar-item.selected'
+      ) as HTMLButtonElement
+      button?.focus()
+    }
   }
 
   /**
@@ -2534,7 +2995,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
     const diff = await getWorkingDirectoryDiff(
       repository,
       selectedFileBeforeLoad,
-      enableHideWhitespaceInDiffOption() && this.hideWhitespaceInChangesDiff
+      this.hideWhitespaceInChangesDiff
     )
 
     const stateAfterLoad = this.repositoryStateCache.get(repository)
@@ -2701,7 +3162,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
       // `hasUserViewedStash` is reset to false on every branch checkout
       // so we increment the metric before setting `hasUserViewedStash` to true
       // to make sure we only increment on the first view after checkout
-      this.statsStore.recordStashViewedAfterCheckout()
+      this.statsStore.increment('stashViewedAfterCheckoutCount')
       this.hasUserViewedStash = true
     }
   }
@@ -2852,7 +3313,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
       file => file.selection.getSelectionType() === DiffSelectionType.Partial
     )
     if (includedPartialSelections) {
-      this.statsStore.recordPartialCommit()
+      this.statsStore.increment('partialCommits')
     }
 
     if (isAmend) {
@@ -2861,22 +3322,22 @@ export class AppStore extends TypedBaseStore<IAppState> {
 
     const { trailers } = context
     if (trailers !== undefined && trailers.some(isCoAuthoredByTrailer)) {
-      this.statsStore.recordCoAuthoredCommit()
+      this.statsStore.increment('coAuthoredCommits')
     }
 
     const account = getAccountForRepository(this.accounts, repository)
     if (repository.gitHubRepository !== null) {
       if (account !== null) {
         if (account.endpoint === getDotComAPIEndpoint()) {
-          this.statsStore.recordCommitToDotcom()
+          this.statsStore.increment('dotcomCommits')
         } else {
-          this.statsStore.recordCommitToEnterprise()
+          this.statsStore.increment('enterpriseCommits')
         }
 
         const { commitAuthor } = repositoryState
         if (commitAuthor !== null) {
           if (!isAttributableEmailFor(account, commitAuthor.email)) {
-            this.statsStore.recordUnattributedCommit()
+            this.statsStore.increment('unattributedCommits')
           }
         }
       }
@@ -2887,7 +3348,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
         )
 
       if (branchProtectionsFound) {
-        this.statsStore.recordCommitToRepositoryWithBranchProtections()
+        this.statsStore.increment('commitsToRepositoryWithBranchProtections')
       }
 
       const branchName = findRemoteBranchName(
@@ -2899,7 +3360,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
       if (branchName !== null) {
         const { changesState } = this.repositoryStateCache.get(repository)
         if (changesState.currentBranchProtected) {
-          this.statsStore.recordCommitToProtectedBranch()
+          this.statsStore.increment('commitsToProtectedBranch')
         }
       }
 
@@ -2907,7 +3368,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
         repository.gitHubRepository !== null &&
         !hasWritePermission(repository.gitHubRepository)
       ) {
-        this.statsStore.recordCommitToRepositoryWithoutWriteAccess()
+        this.statsStore.increment('commitsToRepositoryWithoutWriteAccess')
         this.statsStore.recordRepositoryCommitedInWithoutWriteAccess(
           repository.gitHubRepository.dbID
         )
@@ -3038,6 +3499,8 @@ export class AppStore extends TypedBaseStore<IAppState> {
       return
     }
 
+    // loadBranches needs the default remote to determine the default branch
+    await gitStore.loadRemotes()
     await gitStore.loadBranches()
 
     const section = state.selectedSection
@@ -3055,7 +3518,6 @@ export class AppStore extends TypedBaseStore<IAppState> {
     }
 
     await Promise.all([
-      gitStore.loadRemotes(),
       gitStore.updateLastFetched(),
       gitStore.loadStashEntries(),
       this._refreshAuthor(repository),
@@ -3194,12 +3656,12 @@ export class AppStore extends TypedBaseStore<IAppState> {
    * of the current branch to its upstream tracking branch.
    */
   private fetchForRepositoryIndicator(repo: Repository) {
-    return this.withAuthenticatingUser(repo, async (repo, account) => {
+    return this.withRefreshedGitHubRepository(repo, async repo => {
       const isBackgroundTask = true
       const gitStore = this.gitStoreCache.get(repo)
 
       await this.withPushPullFetch(repo, () =>
-        gitStore.fetch(account, isBackgroundTask, progress =>
+        gitStore.fetch(isBackgroundTask, progress =>
           this.updatePushPullFetchProgress(repo, progress)
         )
       )
@@ -3243,6 +3705,12 @@ export class AppStore extends TypedBaseStore<IAppState> {
     this.emitUpdate()
   }
 
+  public _setShowCommitLengthWarning(showCommitLengthWarning: boolean) {
+    setBoolean(showCommitLengthWarningKey, showCommitLengthWarning)
+    this.showCommitLengthWarning = showCommitLengthWarning
+    this.emitUpdate()
+  }
+
   public _setNotificationsEnabled(notificationsEnabled: boolean) {
     this.notificationsStore.setNotificationsEnabled(notificationsEnabled)
     this.emitUpdate()
@@ -3310,32 +3778,45 @@ export class AppStore extends TypedBaseStore<IAppState> {
 
   /** This shouldn't be called directly. See `Dispatcher`. */
   public async _showPopup(popup: Popup): Promise<void> {
-    this._closePopup()
-
     // Always close the app menu when showing a pop up. This is only
     // applicable on Windows where we draw a custom app menu.
     this._closeFoldout(FoldoutType.AppMenu)
 
-    this.currentPopup = popup
+    this.popupManager.addPopup(popup)
     this.emitUpdate()
   }
 
   /** This shouldn't be called directly. See `Dispatcher`. */
   public _closePopup(popupType?: PopupType) {
-    const currentPopup = this.currentPopup
-    if (currentPopup == null) {
+    const currentPopup = this.popupManager.currentPopup
+    if (currentPopup === null) {
       return
     }
 
-    if (popupType !== undefined && currentPopup.type !== popupType) {
-      return
+    if (popupType === undefined) {
+      this.popupManager.removePopup(currentPopup)
+    } else {
+      if (currentPopup.type !== popupType) {
+        return
+      }
+
+      if (currentPopup.type === PopupType.CloneRepository) {
+        this._completeOpenInDesktop(() => Promise.resolve(null))
+      }
+
+      this.popupManager.removePopupByType(popupType)
     }
 
-    if (currentPopup.type === PopupType.CloneRepository) {
-      this._completeOpenInDesktop(() => Promise.resolve(null))
+    this.emitUpdate()
+  }
+
+  /** This shouldn't be called directly. See `Dispatcher`. */
+  public _closePopupById(popupId: string) {
+    if (this.popupManager.currentPopup === null) {
+      return
     }
 
-    this.currentPopup = null
+    this.popupManager.removePopupById(popupId)
     this.emitUpdate()
   }
 
@@ -3488,14 +3969,14 @@ export class AppStore extends TypedBaseStore<IAppState> {
       }
     }
 
-    return this.withAuthenticatingUser(repository, (repository, account) => {
+    return this.withRefreshedGitHubRepository(repository, repository => {
       // We always want to end with refreshing the repository regardless of
       // whether the checkout succeeded or not in order to present the most
       // up-to-date information to the user.
-      return this.checkoutImplementation(repository, branch, account, strategy)
+      return this.checkoutImplementation(repository, branch, strategy)
         .then(() => this.onSuccessfulCheckout(repository, branch))
         .catch(e => this.emitError(new CheckoutError(e, repository, branch)))
-        .then(() => this.refreshAfterCheckout(repository, branch))
+        .then(() => this.refreshAfterCheckout(repository, branch.name))
         .finally(() => this.updateCheckoutProgress(repository, null))
     })
   }
@@ -3504,15 +3985,16 @@ export class AppStore extends TypedBaseStore<IAppState> {
   private checkoutImplementation(
     repository: Repository,
     branch: Branch,
-    account: IGitAccount | null,
     strategy: UncommittedChangesStrategy
   ) {
+    const { currentRemote } = this.gitStoreCache.get(repository)
+
     if (strategy === UncommittedChangesStrategy.StashOnCurrentBranch) {
-      return this.checkoutAndLeaveChanges(repository, branch, account)
+      return this.checkoutAndLeaveChanges(repository, branch, currentRemote)
     } else if (strategy === UncommittedChangesStrategy.MoveToNewBranch) {
-      return this.checkoutAndBringChanges(repository, branch, account)
+      return this.checkoutAndBringChanges(repository, branch, currentRemote)
     } else {
-      return this.checkoutIgnoringChanges(repository, branch, account)
+      return this.checkoutIgnoringChanges(repository, branch, currentRemote)
     }
   }
 
@@ -3520,9 +4002,9 @@ export class AppStore extends TypedBaseStore<IAppState> {
   private async checkoutIgnoringChanges(
     repository: Repository,
     branch: Branch,
-    account: IGitAccount | null
+    currentRemote: IRemote | null
   ) {
-    await checkoutBranch(repository, account, branch, progress => {
+    await checkoutBranch(repository, branch, currentRemote, progress => {
       this.updateCheckoutProgress(repository, progress)
     })
   }
@@ -3535,7 +4017,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
   private async checkoutAndLeaveChanges(
     repository: Repository,
     branch: Branch,
-    account: IGitAccount | null
+    currentRemote: IRemote | null
   ) {
     const repositoryState = this.repositoryStateCache.get(repository)
     const { workingDirectory } = repositoryState.changesState
@@ -3543,10 +4025,10 @@ export class AppStore extends TypedBaseStore<IAppState> {
 
     if (tip.kind === TipState.Valid && workingDirectory.files.length > 0) {
       await this.createStashAndDropPreviousEntry(repository, tip.branch)
-      this.statsStore.recordStashCreatedOnCurrentBranch()
+      this.statsStore.increment('stashCreatedOnCurrentBranchCount')
     }
 
-    return this.checkoutIgnoringChanges(repository, branch, account)
+    return this.checkoutIgnoringChanges(repository, branch, currentRemote)
   }
 
   /**
@@ -3562,10 +4044,10 @@ export class AppStore extends TypedBaseStore<IAppState> {
   private async checkoutAndBringChanges(
     repository: Repository,
     branch: Branch,
-    account: IGitAccount | null
+    currentRemote: IRemote | null
   ) {
     try {
-      await this.checkoutIgnoringChanges(repository, branch, account)
+      await this.checkoutIgnoringChanges(repository, branch, currentRemote)
     } catch (checkoutError) {
       if (!isLocalChangesOverwrittenError(checkoutError)) {
         throw checkoutError
@@ -3583,10 +4065,10 @@ export class AppStore extends TypedBaseStore<IAppState> {
         throw checkoutError
       }
 
-      await this.checkoutIgnoringChanges(repository, branch, account)
+      await this.checkoutIgnoringChanges(repository, branch, currentRemote)
       await popStashEntry(repository, stash.stashSha)
 
-      this.statsStore.recordChangesTakenToNewBranch()
+      this.statsStore.increment('changesTakenToNewBranchCount')
     }
   }
 
@@ -3607,24 +4089,80 @@ export class AppStore extends TypedBaseStore<IAppState> {
     }
 
     if (stashEntry !== null && !this.hasUserViewedStash) {
-      this.statsStore.recordStashNotViewedAfterCheckout()
+      this.statsStore.increment('stashNotViewedAfterCheckoutCount')
     }
 
     this.hasUserViewedStash = false
   }
 
-  private async refreshAfterCheckout(repository: Repository, branch: Branch) {
+  /**
+   * @param commitish A branch name or a commit hash
+   */
+  private async refreshAfterCheckout(
+    repository: Repository,
+    commitish: string
+  ) {
     this.updateCheckoutProgress(repository, {
       kind: 'checkout',
       title: `Refreshing ${__DARWIN__ ? 'Repository' : 'repository'}`,
+      description: 'Checking out',
       value: 1,
-      targetBranch: branch.name,
+      target: commitish,
     })
 
     await this._refreshRepository(repository)
     return repository
   }
 
+  /**
+   * Checkout the given commit, ignoring any local changes.
+   *
+   * Note: This shouldn't be called directly. See `Dispatcher`.
+   */
+  public async _checkoutCommit(
+    repository: Repository,
+    commit: CommitOneLine
+  ): Promise<Repository> {
+    const repositoryState = this.repositoryStateCache.get(repository)
+    const { branchesState } = repositoryState
+    const { tip } = branchesState
+    const { currentRemote } = this.gitStoreCache.get(repository)
+
+    // No point in checking out the currently checked out commit.
+    if (
+      (tip.kind === TipState.Valid && tip.branch.tip.sha === commit.sha) ||
+      (tip.kind === TipState.Detached && tip.currentSha === commit.sha)
+    ) {
+      return repository
+    }
+
+    return this.withRefreshedGitHubRepository(repository, repository => {
+      // We always want to end with refreshing the repository regardless of
+      // whether the checkout succeeded or not in order to present the most
+      // up-to-date information to the user.
+      return this.checkoutCommitDefaultBehaviour(
+        repository,
+        commit,
+        currentRemote
+      )
+        .catch(e => this.emitError(new Error(e)))
+        .then(() =>
+          this.refreshAfterCheckout(repository, shortenSHA(commit.sha))
+        )
+        .finally(() => this.updateCheckoutProgress(repository, null))
+    })
+  }
+
+  private async checkoutCommitDefaultBehaviour(
+    repository: Repository,
+    commit: CommitOneLine,
+    currentRemote: IRemote | null
+  ) {
+    await checkoutCommit(repository, commit, currentRemote, progress => {
+      this.updateCheckoutProgress(repository, progress)
+    })
+  }
+
   /**
    * Creates a stash associated to the current checked out branch.
    *
@@ -3655,7 +4193,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
     }
 
     if (await this.createStashAndDropPreviousEntry(repository, currentBranch)) {
-      this.statsStore.recordStashCreatedOnCurrentBranch()
+      this.statsStore.increment('stashCreatedOnCurrentBranchCount')
       await this._refreshRepository(repository)
       return true
     }
@@ -3757,17 +4295,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
 
   /** This shouldn't be called directly. See `Dispatcher`. */
   public _pushError(error: Error): Promise<void> {
-    const newErrors = Array.from(this.errors)
-    newErrors.push(error)
-    this.errors = newErrors
-    this.emitUpdate()
-
-    return Promise.resolve()
-  }
-
-  /** This shouldn't be called directly. See `Dispatcher`. */
-  public _clearError(error: Error): Promise<void> {
-    this.errors = this.errors.filter(e => e !== error)
+    this.popupManager.addErrorPopup(error)
     this.emitUpdate()
 
     return Promise.resolve()
@@ -3788,9 +4316,15 @@ export class AppStore extends TypedBaseStore<IAppState> {
     newName: string
   ): Promise<void> {
     const gitStore = this.gitStoreCache.get(repository)
-    await gitStore.performFailableOperation(() =>
-      renameBranch(repository, branch, newName)
-    )
+    await gitStore.performFailableOperation(async () => {
+      await renameBranch(repository, branch, newName)
+
+      const stashEntry = gitStore.desktopStashEntries.get(branch.name)
+
+      if (stashEntry) {
+        await moveStashEntry(repository, stashEntry, newName)
+      }
+    })
 
     return this._refreshRepository(repository)
   }
@@ -3802,8 +4336,8 @@ export class AppStore extends TypedBaseStore<IAppState> {
     includeUpstream?: boolean,
     toCheckout?: Branch | null
   ): Promise<void> {
-    return this.withAuthenticatingUser(repository, async (r, account) => {
-      const gitStore = this.gitStoreCache.get(r)
+    return this.withRefreshedGitHubRepository(repository, async repository => {
+      const gitStore = this.gitStoreCache.get(repository)
 
       // If solely a remote branch, there is no need to checkout a branch.
       if (branch.type === BranchType.Remote) {
@@ -3816,8 +4350,18 @@ export class AppStore extends TypedBaseStore<IAppState> {
           )
         }
 
+        const remote =
+          gitStore.remotes.find(r => r.name === remoteName) ??
+          (await getRemoteURL(repository, remoteName)
+            .then(url => (url ? { name: remoteName, url } : undefined))
+            .catch(e => log.debug(`Could not get remote URL`, e)))
+
+        if (remote === undefined) {
+          throw new Error(`Could not determine remote url from: ${branch.ref}.`)
+        }
+
         await gitStore.performFailableOperation(() =>
-          deleteRemoteBranch(r, account, remoteName, nameWithoutRemote)
+          deleteRemoteBranch(repository, remote, nameWithoutRemote)
         )
 
         // We log the remote branch's sha so that the user can recover it.
@@ -3825,17 +4369,17 @@ export class AppStore extends TypedBaseStore<IAppState> {
           `Deleted branch ${branch.upstreamWithoutRemote} (was ${tip.sha})`
         )
 
-        return this._refreshRepository(r)
+        return this._refreshRepository(repository)
       }
 
       // If a local branch, user may have the branch to delete checked out and
       // we need to switch to a different branch (default or recent).
       const branchToCheckout =
-        toCheckout ?? this.getBranchToCheckoutAfterDelete(branch, r)
+        toCheckout ?? this.getBranchToCheckoutAfterDelete(branch, repository)
 
       if (branchToCheckout !== null) {
         await gitStore.performFailableOperation(() =>
-          checkoutBranch(r, account, branchToCheckout)
+          checkoutBranch(repository, branchToCheckout, gitStore.currentRemote)
         )
       }
 
@@ -3843,12 +4387,11 @@ export class AppStore extends TypedBaseStore<IAppState> {
         return this.deleteLocalBranchAndUpstreamBranch(
           repository,
           branch,
-          account,
           includeUpstream
         )
       })
 
-      return this._refreshRepository(r)
+      return this._refreshRepository(repository)
     })
   }
 
@@ -3859,7 +4402,6 @@ export class AppStore extends TypedBaseStore<IAppState> {
   private async deleteLocalBranchAndUpstreamBranch(
     repository: Repository,
     branch: Branch,
-    account: IGitAccount | null,
     includeUpstream?: boolean
   ): Promise<void> {
     await deleteLocalBranch(repository, branch.name)
@@ -3869,12 +4411,20 @@ export class AppStore extends TypedBaseStore<IAppState> {
       branch.upstreamRemoteName !== null &&
       branch.upstreamWithoutRemote !== null
     ) {
-      await deleteRemoteBranch(
-        repository,
-        account,
-        branch.upstreamRemoteName,
-        branch.upstreamWithoutRemote
-      )
+      const gitStore = this.gitStoreCache.get(repository)
+      const remoteName = branch.upstreamRemoteName
+
+      const remote =
+        gitStore.remotes.find(r => r.name === remoteName) ??
+        (await getRemoteURL(repository, remoteName)
+          .then(url => (url ? { name: remoteName, url } : undefined))
+          .catch(e => log.debug(`Could not get remote URL`, e)))
+
+      if (!remote) {
+        throw new Error(`Could not determine remote url from: ${branch.ref}.`)
+      }
+
+      await deleteRemoteBranch(repository, remote, branch.upstreamWithoutRemote)
     }
     return
   }
@@ -3923,14 +4473,40 @@ export class AppStore extends TypedBaseStore<IAppState> {
     repository: Repository,
     options?: PushOptions
   ): Promise<void> {
-    return this.withAuthenticatingUser(repository, (repository, account) => {
-      return this.performPush(repository, account, options)
+    return this.withRefreshedGitHubRepository(repository, repository => {
+      return this.performPush(repository, options)
     })
   }
 
+  private getBranchToPush(
+    repository: Repository,
+    options?: PushOptions
+  ): Branch | undefined {
+    if (options?.branch !== undefined) {
+      return options?.branch
+    }
+
+    const state = this.repositoryStateCache.get(repository)
+
+    const { tip } = state.branchesState
+
+    if (tip.kind === TipState.Unborn) {
+      throw new Error('The current branch is unborn.')
+    }
+
+    if (tip.kind === TipState.Detached) {
+      throw new Error('The current repository is in a detached HEAD state.')
+    }
+
+    if (tip.kind === TipState.Valid) {
+      return tip.branch
+    }
+
+    return
+  }
+
   private async performPush(
     repository: Repository,
-    account: IGitAccount | null,
     options?: PushOptions
   ): Promise<void> {
     const state = this.repositoryStateCache.get(repository)
@@ -3945,165 +4521,151 @@ export class AppStore extends TypedBaseStore<IAppState> {
     }
 
     return this.withPushPullFetch(repository, async () => {
-      const { tip } = state.branchesState
-
-      if (tip.kind === TipState.Unborn) {
-        throw new Error('The current branch is unborn.')
-      }
+      const branch = this.getBranchToPush(repository, options)
 
-      if (tip.kind === TipState.Detached) {
-        throw new Error('The current repository is in a detached HEAD state.')
+      if (branch === undefined) {
+        return
       }
 
-      if (tip.kind === TipState.Valid) {
-        const { branch } = tip
+      const remoteName = branch.upstreamRemoteName || remote.name
 
-        const remoteName = branch.upstreamRemoteName || remote.name
+      const pushTitle = `Pushing to ${remoteName}`
 
-        const pushTitle = `Pushing to ${remoteName}`
+      // Emit an initial progress even before our push begins
+      // since we're doing some work to get remotes up front.
+      this.updatePushPullFetchProgress(repository, {
+        kind: 'push',
+        title: pushTitle,
+        value: 0,
+        remote: remoteName,
+        branch: branch.name,
+      })
 
-        // Emit an initial progress even before our push begins
-        // since we're doing some work to get remotes up front.
-        this.updatePushPullFetchProgress(repository, {
-          kind: 'push',
-          title: pushTitle,
-          value: 0,
-          remote: remoteName,
-          branch: branch.name,
-        })
+      // Let's say that a push takes roughly twice as long as a fetch,
+      // this is of course highly inaccurate.
+      let pushWeight = 2.5
+      let fetchWeight = 1
 
-        // Let's say that a push takes roughly twice as long as a fetch,
-        // this is of course highly inaccurate.
-        let pushWeight = 2.5
-        let fetchWeight = 1
+      // Let's leave 10% at the end for refreshing
+      const refreshWeight = 0.1
 
-        // Let's leave 10% at the end for refreshing
-        const refreshWeight = 0.1
+      // Scale pull and fetch weights to be between 0 and 0.9.
+      const scale = (1 / (pushWeight + fetchWeight)) * (1 - refreshWeight)
 
-        // Scale pull and fetch weights to be between 0 and 0.9.
-        const scale = (1 / (pushWeight + fetchWeight)) * (1 - refreshWeight)
+      pushWeight *= scale
+      fetchWeight *= scale
 
-        pushWeight *= scale
-        fetchWeight *= scale
+      const retryAction: RetryAction = {
+        type: RetryActionType.Push,
+        repository,
+      }
 
-        const retryAction: RetryAction = {
-          type: RetryActionType.Push,
-          repository,
-        }
+      // This is most likely not necessary and is only here out of
+      // an abundance of caution. We're introducing support for
+      // automatically configuring Git proxies based on system
+      // proxy settings and therefore need to pass along the remote
+      // url to functions such as push, pull, fetch etc.
+      //
+      // Prior to this we relied primarily on the `branch.remote`
+      // property and used the `remote.name` as a fallback in case the
+      // branch object didn't have a remote name (i.e. if it's not
+      // published yet).
+      //
+      // The remote.name is derived from the current tip first and falls
+      // back to using the defaultRemote if the current tip isn't valid
+      // or if the current branch isn't published. There's however no
+      // guarantee that they'll be refreshed at the exact same time so
+      // there's a theoretical possibility that `branch.remote` and
+      // `remote.name` could be out of sync. I have no reason to suspect
+      // that's the case and if it is then we already have problems as
+      // the `fetchRemotes` call after the push already relies on the
+      // `remote` and not the `branch.remote`. All that said this is
+      // a critical path in the app and somehow breaking pushing would
+      // be near unforgivable so I'm introducing this `safeRemote`
+      // temporarily to ensure that there's no risk of us using an
+      // out of sync remote name while still providing envForRemoteOperation
+      // with an url to use when resolving proxies.
+      //
+      // I'm also adding a non fatal exception if this ever happens
+      // so that we can confidently remove this safeguard in a future
+      // release.
+      const safeRemote: IRemote = { name: remoteName, url: remote.url }
+
+      if (safeRemote.name !== remote.name) {
+        sendNonFatalException(
+          'remoteNameMismatch',
+          new Error('The current remote name differs from the branch remote')
+        )
+      }
 
-        // This is most likely not necessary and is only here out of
-        // an abundance of caution. We're introducing support for
-        // automatically configuring Git proxies based on system
-        // proxy settings and therefore need to pass along the remote
-        // url to functions such as push, pull, fetch etc.
-        //
-        // Prior to this we relied primarily on the `branch.remote`
-        // property and used the `remote.name` as a fallback in case the
-        // branch object didn't have a remote name (i.e. if it's not
-        // published yet).
-        //
-        // The remote.name is derived from the current tip first and falls
-        // back to using the defaultRemote if the current tip isn't valid
-        // or if the current branch isn't published. There's however no
-        // guarantee that they'll be refreshed at the exact same time so
-        // there's a theoretical possibility that `branch.remote` and
-        // `remote.name` could be out of sync. I have no reason to suspect
-        // that's the case and if it is then we already have problems as
-        // the `fetchRemotes` call after the push already relies on the
-        // `remote` and not the `branch.remote`. All that said this is
-        // a critical path in the app and somehow breaking pushing would
-        // be near unforgivable so I'm introducing this `safeRemote`
-        // temporarily to ensure that there's no risk of us using an
-        // out of sync remote name while still providing envForRemoteOperation
-        // with an url to use when resolving proxies.
-        //
-        // I'm also adding a non fatal exception if this ever happens
-        // so that we can confidently remove this safeguard in a future
-        // release.
-        const safeRemote: IRemote = { name: remoteName, url: remote.url }
-
-        if (safeRemote.name !== remote.name) {
-          sendNonFatalException(
-            'remoteNameMismatch',
-            new Error('The current remote name differs from the branch remote')
+      const gitStore = this.gitStoreCache.get(repository)
+      await gitStore.performFailableOperation(
+        async () => {
+          await pushRepo(
+            repository,
+            safeRemote,
+            branch.name,
+            branch.upstreamWithoutRemote,
+            gitStore.tagsToPush,
+            options,
+            progress => {
+              this.updatePushPullFetchProgress(repository, {
+                ...progress,
+                title: pushTitle,
+                value: pushWeight * progress.value,
+              })
+            }
           )
-        }
-
-        const gitStore = this.gitStoreCache.get(repository)
-        await gitStore.performFailableOperation(
-          async () => {
-            await pushRepo(
-              repository,
-              account,
-              safeRemote,
-              branch.name,
-              branch.upstreamWithoutRemote,
-              gitStore.tagsToPush,
-              options,
-              progress => {
-                this.updatePushPullFetchProgress(repository, {
-                  ...progress,
-                  title: pushTitle,
-                  value: pushWeight * progress.value,
-                })
-              }
-            )
-            gitStore.clearTagsToPush()
-
-            await gitStore.fetchRemotes(
-              account,
-              [safeRemote],
-              false,
-              fetchProgress => {
-                this.updatePushPullFetchProgress(repository, {
-                  ...fetchProgress,
-                  value: pushWeight + fetchProgress.value * fetchWeight,
-                })
-              }
-            )
-
-            const refreshTitle = __DARWIN__
-              ? 'Refreshing Repository'
-              : 'Refreshing repository'
-            const refreshStartProgress = pushWeight + fetchWeight
+          gitStore.clearTagsToPush()
 
+          await gitStore.fetchRemotes([safeRemote], false, fetchProgress => {
             this.updatePushPullFetchProgress(repository, {
-              kind: 'generic',
-              title: refreshTitle,
-              description: 'Fast-forwarding branches',
-              value: refreshStartProgress,
+              ...fetchProgress,
+              value: pushWeight + fetchProgress.value * fetchWeight,
             })
+          })
+
+          const refreshTitle = __DARWIN__
+            ? 'Refreshing Repository'
+            : 'Refreshing repository'
+          const refreshStartProgress = pushWeight + fetchWeight
+
+          this.updatePushPullFetchProgress(repository, {
+            kind: 'generic',
+            title: refreshTitle,
+            description: 'Fast-forwarding branches',
+            value: refreshStartProgress,
+          })
 
-            await this.fastForwardBranches(repository)
+          await this.fastForwardBranches(repository)
 
-            this.updatePushPullFetchProgress(repository, {
-              kind: 'generic',
-              title: refreshTitle,
-              value: refreshStartProgress + refreshWeight * 0.5,
-            })
+          this.updatePushPullFetchProgress(repository, {
+            kind: 'generic',
+            title: refreshTitle,
+            value: refreshStartProgress + refreshWeight * 0.5,
+          })
 
-            // manually refresh branch protections after the push, to ensure
-            // any new branch will immediately report as protected
-            await this.refreshBranchProtectionState(repository)
+          // manually refresh branch protections after the push, to ensure
+          // any new branch will immediately report as protected
+          await this.refreshBranchProtectionState(repository)
 
-            await this._refreshRepository(repository)
-          },
-          { retryAction }
-        )
+          await this._refreshRepository(repository)
+        },
+        { retryAction }
+      )
 
-        this.updatePushPullFetchProgress(repository, null)
+      this.updatePushPullFetchProgress(repository, null)
 
-        this.updateMenuLabelsForSelectedRepository()
+      this.updateMenuLabelsForSelectedRepository()
 
-        // Note that we're using `getAccountForRepository` here instead
-        // of the `account` instance we've got and that's because recordPush
-        // needs to be able to differentiate between a GHES account and a
-        // generic account and it can't do that only based on the endpoint.
-        this.statsStore.recordPush(
-          getAccountForRepository(this.accounts, repository),
-          options
-        )
-      }
+      // Note that we're using `getAccountForRepository` here instead
+      // of the `account` instance we've got and that's because recordPush
+      // needs to be able to differentiate between a GHES account and a
+      // generic account and it can't do that only based on the endpoint.
+      this.statsStore.recordPush(
+        getAccountForRepository(this.accounts, repository),
+        options
+      )
     })
   }
 
@@ -4158,16 +4720,13 @@ export class AppStore extends TypedBaseStore<IAppState> {
   }
 
   public async _pull(repository: Repository): Promise<void> {
-    return this.withAuthenticatingUser(repository, (repository, account) => {
-      return this.performPull(repository, account)
+    return this.withRefreshedGitHubRepository(repository, repository => {
+      return this.performPull(repository)
     })
   }
 
   /** This shouldn't be called directly. See `Dispatcher`. */
-  private async performPull(
-    repository: Repository,
-    account: IGitAccount | null
-  ): Promise<void> {
+  private async performPull(repository: Repository): Promise<void> {
     return this.withPushPullFetch(repository, async () => {
       const gitStore = this.gitStoreCache.get(repository)
       const remote = gitStore.currentRemote
@@ -4235,25 +4794,38 @@ export class AppStore extends TypedBaseStore<IAppState> {
           }
 
           if (gitStore.pullWithRebase) {
-            this.statsStore.recordPullWithRebaseEnabled()
+            this.statsStore.increment('pullWithRebaseCount')
           } else {
-            this.statsStore.recordPullWithDefaultSetting()
+            this.statsStore.increment('pullWithDefaultSettingCount')
           }
 
-          await gitStore.performFailableOperation(
-            () =>
-              pullRepo(repository, account, remote, progress => {
+          const pullSucceeded = await gitStore.performFailableOperation(
+            async () => {
+              await pullRepo(repository, remote, progress => {
                 this.updatePushPullFetchProgress(repository, {
                   ...progress,
                   value: progress.value * pullWeight,
                 })
-              }),
-            {
-              gitContext,
-              retryAction,
-            }
+              })
+              return true
+            },
+            { gitContext, retryAction }
           )
 
+          // If the pull failed we shouldn't try to update the remote HEAD
+          // because there's a decent chance that it failed either because we
+          // didn't have the correct credentials (which we won't this time
+          // either) or because there's a network error which likely will
+          // persist for the next operation as well.
+          if (pullSucceeded) {
+            // Updating the local HEAD symref isn't critical so we don't want
+            // to show an error message to the user and have them retry the
+            // entire pull operation if it fails.
+            await updateRemoteHEAD(repository, remote, false).catch(e =>
+              log.error('Failed updating remote HEAD', e)
+            )
+          }
+
           const refreshStartProgress = pullWeight + fetchWeight
           const refreshTitle = __DARWIN__
             ? 'Refreshing Repository'
@@ -4328,53 +4900,33 @@ export class AppStore extends TypedBaseStore<IAppState> {
     // skip pushing if the current branch is a detached HEAD or the repository
     // is unborn
     if (gitStore.tip.kind === TipState.Valid) {
-      await this.performPush(repository, account)
-    }
-
-    return this.repositoryWithRefreshedGitHubRepository(repository)
-  }
-
-  private getAccountForRemoteURL(remote: string): IGitAccount | null {
-    const account = matchGitHubRepository(this.accounts, remote)?.account
-    if (account !== undefined) {
-      const hasValidToken =
-        account.token.length > 0 ? 'has token' : 'empty token'
-      log.info(
-        `[AppStore.getAccountForRemoteURL] account found for remote: ${remote} - ${account.login} (${hasValidToken})`
-      )
-      return account
-    }
-
-    const hostname = getGenericHostname(remote)
-    const username = getGenericUsername(hostname)
-    if (username != null) {
-      log.info(
-        `[AppStore.getAccountForRemoteURL] found generic credentials for '${hostname}' and '${username}'`
-      )
-      return { login: username, endpoint: hostname }
+      if (
+        gitStore.defaultBranch !== null &&
+        gitStore.tip.branch.name !== gitStore.defaultBranch.name
+      ) {
+        await this.performPush(repository, {
+          branch: gitStore.defaultBranch,
+          forceWithLease: false,
+        })
+      }
+      await this.performPush(repository)
     }
 
-    log.info(
-      `[AppStore.getAccountForRemoteURL] no generic credentials found for '${remote}'`
-    )
+    await gitStore.refreshDefaultBranch()
 
-    return null
+    return this.repositoryWithRefreshedGitHubRepository(repository)
   }
 
   /** This shouldn't be called directly. See `Dispatcher`. */
   public _clone(
     url: string,
     path: string,
-    options?: { branch?: string; defaultBranch?: string }
+    options: { branch?: string; defaultBranch?: string } = {}
   ): {
     promise: Promise<boolean>
     repository: CloningRepository
   } {
-    const account = this.getAccountForRemoteURL(url)
-    const promise = this.cloningRepositoriesStore.clone(url, path, {
-      ...options,
-      account,
-    })
+    const promise = this.cloningRepositoriesStore.clone(url, path, options)
     const repository = this.cloningRepositoriesStore.repositories.find(
       r => r.url === url && r.path === path
     )!
@@ -4431,7 +4983,49 @@ export class AppStore extends TypedBaseStore<IAppState> {
     return this._refreshRepository(repository)
   }
 
-  public _setRepositoryCommitToAmend(
+  public async _startAmendingRepository(
+    repository: Repository,
+    commit: Commit,
+    isLocalCommit: boolean,
+    continueWithForcePush: boolean = false
+  ) {
+    const repositoryState = this.repositoryStateCache.get(repository)
+    const { tip } = repositoryState.branchesState
+    const { askForConfirmationOnForcePush } = this.getState()
+
+    if (
+      askForConfirmationOnForcePush &&
+      !continueWithForcePush &&
+      !isLocalCommit &&
+      tip.kind === TipState.Valid
+    ) {
+      return this._showPopup({
+        type: PopupType.WarnForcePush,
+        operation: 'Amend',
+        onBegin: () => {
+          this._startAmendingRepository(repository, commit, isLocalCommit, true)
+        },
+      })
+    }
+
+    await this._changeRepositorySection(
+      repository,
+      RepositorySectionTab.Changes
+    )
+
+    const gitStore = this.gitStoreCache.get(repository)
+    await gitStore.prepareToAmendCommit(commit)
+
+    this.setRepositoryCommitToAmend(repository, commit)
+
+    this.statsStore.increment('amendCommitStartedCount')
+  }
+
+  public async _stopAmendingRepository(repository: Repository) {
+    this.setRepositoryCommitToAmend(repository, null)
+  }
+
+  private setRepositoryCommitToAmend(
     repository: Repository,
     commit: Commit | null
   ) {
@@ -4456,9 +5050,12 @@ export class AppStore extends TypedBaseStore<IAppState> {
       changesState.workingDirectory.files.length === 0
 
     // Warn the user if there are changes in the working directory
+    // This warning can be disabled, except when the user tries to undo
+    // a merge commit.
     if (
       showConfirmationDialog &&
-      (!isWorkingDirectoryClean || commit.isMergeCommit)
+      ((this.confirmUndoCommit && !isWorkingDirectoryClean) ||
+        commit.isMergeCommit)
     ) {
       return this._showPopup({
         type: PopupType.WarnLocalChangesBeforeUndo,
@@ -4471,7 +5068,8 @@ export class AppStore extends TypedBaseStore<IAppState> {
     // Make sure we show the changes after undoing the commit
     await this._changeRepositorySection(
       repository,
-      RepositorySectionTab.Changes
+      RepositorySectionTab.Changes,
+      true
     )
 
     await gitStore.undoCommit(commit)
@@ -4529,15 +5127,12 @@ export class AppStore extends TypedBaseStore<IAppState> {
     repository: Repository,
     refspec: string
   ): Promise<void> {
-    return this.withAuthenticatingUser(
-      repository,
-      async (repository, account) => {
-        const gitStore = this.gitStoreCache.get(repository)
-        await gitStore.fetchRefspec(account, refspec)
+    return this.withRefreshedGitHubRepository(repository, async repository => {
+      const gitStore = this.gitStoreCache.get(repository)
+      await gitStore.fetchRefspec(refspec)
 
-        return this._refreshRepository(repository)
-      }
-    )
+      return this._refreshRepository(repository)
+    })
   }
 
   /**
@@ -4549,8 +5144,8 @@ export class AppStore extends TypedBaseStore<IAppState> {
    * if _any_ fetches or pulls are currently in-progress.
    */
   public _fetch(repository: Repository, fetchType: FetchType): Promise<void> {
-    return this.withAuthenticatingUser(repository, (repository, account) => {
-      return this.performFetch(repository, account, fetchType)
+    return this.withRefreshedGitHubRepository(repository, repository => {
+      return this.performFetch(repository, fetchType)
     })
   }
 
@@ -4565,8 +5160,8 @@ export class AppStore extends TypedBaseStore<IAppState> {
     remote: IRemote,
     fetchType: FetchType
   ): Promise<void> {
-    return this.withAuthenticatingUser(repository, (repository, account) => {
-      return this.performFetch(repository, account, fetchType, [remote])
+    return this.withRefreshedGitHubRepository(repository, repository => {
+      return this.performFetch(repository, fetchType, [remote])
     })
   }
 
@@ -4579,7 +5174,6 @@ export class AppStore extends TypedBaseStore<IAppState> {
    */
   private async performFetch(
     repository: Repository,
-    account: IGitAccount | null,
     fetchType: FetchType,
     remotes?: IRemote[]
   ): Promise<void> {
@@ -4599,10 +5193,9 @@ export class AppStore extends TypedBaseStore<IAppState> {
         }
 
         if (remotes === undefined) {
-          await gitStore.fetch(account, isBackgroundTask, progressCallback)
+          await gitStore.fetch(isBackgroundTask, progressCallback)
         } else {
           await gitStore.fetchRemotes(
-            account,
             remotes,
             isBackgroundTask,
             progressCallback
@@ -4681,6 +5274,48 @@ export class AppStore extends TypedBaseStore<IAppState> {
     return Promise.resolve()
   }
 
+  public _setBranchDropdownWidth(width: number): Promise<void> {
+    this.branchDropdownWidth = { ...this.branchDropdownWidth, value: width }
+    setNumber(branchDropdownWidthConfigKey, width)
+    this.updateResizableConstraints()
+    this.emitUpdate()
+
+    return Promise.resolve()
+  }
+
+  public _resetBranchDropdownWidth(): Promise<void> {
+    this.branchDropdownWidth = {
+      ...this.branchDropdownWidth,
+      value: defaultBranchDropdownWidth,
+    }
+    localStorage.removeItem(branchDropdownWidthConfigKey)
+    this.updateResizableConstraints()
+    this.emitUpdate()
+
+    return Promise.resolve()
+  }
+
+  public _setPushPullButtonWidth(width: number): Promise<void> {
+    this.pushPullButtonWidth = { ...this.pushPullButtonWidth, value: width }
+    setNumber(pushPullButtonWidthConfigKey, width)
+    this.updateResizableConstraints()
+    this.emitUpdate()
+
+    return Promise.resolve()
+  }
+
+  public _resetPushPullButtonWidth(): Promise<void> {
+    this.pushPullButtonWidth = {
+      ...this.pushPullButtonWidth,
+      value: defaultPushPullButtonWidth,
+    }
+    localStorage.removeItem(pushPullButtonWidthConfigKey)
+    this.updateResizableConstraints()
+    this.emitUpdate()
+
+    return Promise.resolve()
+  }
+
   public _setCommitSummaryWidth(width: number): Promise<void> {
     this.commitSummaryWidth = { ...this.commitSummaryWidth, value: width }
     setNumber(commitSummaryWidthConfigKey, width)
@@ -4778,16 +5413,16 @@ export class AppStore extends TypedBaseStore<IAppState> {
     const gitStore = this.gitStoreCache.get(repository)
 
     if (isSquash) {
-      this.statsStore.recordSquashMergeInvokedCount()
+      this.statsStore.increment('squashMergeInvokedCount')
     }
 
     if (mergeStatus !== null) {
       if (mergeStatus.kind === ComputedAction.Clean) {
-        this.statsStore.recordMergeHintSuccessAndUserProceeded()
+        this.statsStore.increment('mergedWithCleanMergeHintCount')
       } else if (mergeStatus.kind === ComputedAction.Conflicts) {
-        this.statsStore.recordUserProceededAfterConflictWarning()
+        this.statsStore.increment('mergedWithConflictWarningHintCount')
       } else if (mergeStatus.kind === ComputedAction.Loading) {
-        this.statsStore.recordUserProceededWhileLoading()
+        this.statsStore.increment('mergedWithLoadingHintCount')
       }
     }
 
@@ -4804,7 +5439,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
         // This code will only run when there are no conflicts.
         // Thus recordSquashMergeSuccessful is done here and when merge finishes
         // successfully after conflicts in `dispatcher.finishConflictedMerge`.
-        this.statsStore.recordSquashMergeSuccessful()
+        this.statsStore.increment('squashMergeSuccessfulCount')
       }
       this._endMultiCommitOperation(repository)
     } else if (
@@ -4986,11 +5621,18 @@ export class AppStore extends TypedBaseStore<IAppState> {
 
   /** This shouldn't be called directly. See `Dispatcher`. */
   public async _openShell(path: string) {
-    this.statsStore.recordOpenShell()
+    this.statsStore.increment('openShellCount')
+    const { useCustomShell, customShell } = this.getState()
 
     try {
-      const match = await findShellOrDefault(this.selectedShell)
-      await launchShell(match, path, error => this._pushError(error))
+      if (useCustomShell && customShell) {
+        await launchCustomShell(customShell, path, error =>
+          this._pushError(error)
+        )
+      } else {
+        const match = await findShellOrDefault(this.selectedShell)
+        await launchShell(match, path, error => this._pushError(error))
+      }
     } catch (error) {
       this.emitError(error)
     }
@@ -5001,23 +5643,34 @@ export class AppStore extends TypedBaseStore<IAppState> {
     return shell.openExternal(url)
   }
 
+  public async _editGlobalGitConfig() {
+    await getGlobalConfigPath()
+      .then(p => this._openInExternalEditor(p))
+      .catch(e => log.error('Could not open global Git config for editing', e))
+  }
+
   /** Open a path to a repository or file using the user's configured editor */
   public async _openInExternalEditor(fullPath: string): Promise<void> {
-    const { selectedExternalEditor } = this.getState()
+    const { selectedExternalEditor, useCustomEditor, customEditor } =
+      this.getState()
 
     try {
-      const match = await findEditorOrDefault(selectedExternalEditor)
-      if (match === null) {
-        this.emitError(
-          new ExternalEditorError(
-            `No suitable editors installed for GitHub Desktop to launch. Install ${suggestedExternalEditor.name} for your platform and restart GitHub Desktop to try again.`,
-            { suggestDefaultEditor: true }
+      if (useCustomEditor && customEditor) {
+        await launchCustomExternalEditor(fullPath, customEditor)
+      } else {
+        const match = await findEditorOrDefault(selectedExternalEditor)
+        if (match === null) {
+          this.emitError(
+            new ExternalEditorError(
+              `No suitable editors installed for GitHub Desktop to launch. Install ${suggestedExternalEditor.name} for your platform and restart GitHub Desktop to try again.`,
+              { suggestDefaultEditor: true }
+            )
           )
-        )
-        return
-      }
+          return
+        }
 
-      await launchExternalEditor(fullPath, match)
+        await launchExternalEditor(fullPath, match)
+      }
     } catch (error) {
       this.emitError(error)
     }
@@ -5042,6 +5695,12 @@ export class AppStore extends TypedBaseStore<IAppState> {
     this.emitUpdate()
   }
 
+  public _setUseExternalCredentialHelper(value: boolean) {
+    setUseExternalCredentialHelper(value)
+    this.useExternalCredentialHelper = value
+    this.emitUpdate()
+  }
+
   public _setAskToMoveToApplicationsFolderSetting(
     value: boolean
   ): Promise<void> {
@@ -5086,6 +5745,24 @@ export class AppStore extends TypedBaseStore<IAppState> {
     return Promise.resolve()
   }
 
+  public _setConfirmDiscardStashSetting(value: boolean): Promise<void> {
+    this.confirmDiscardStash = value
+
+    setBoolean(confirmDiscardStashKey, value)
+    this.emitUpdate()
+
+    return Promise.resolve()
+  }
+
+  public _setConfirmCheckoutCommitSetting(value: boolean): Promise<void> {
+    this.confirmCheckoutCommit = value
+
+    setBoolean(confirmCheckoutCommitKey, value)
+    this.emitUpdate()
+
+    return Promise.resolve()
+  }
+
   public _setConfirmForcePushSetting(value: boolean): Promise<void> {
     this.askForConfirmationOnForcePush = value
     setBoolean(confirmForcePushKey, value)
@@ -5097,6 +5774,24 @@ export class AppStore extends TypedBaseStore<IAppState> {
     return Promise.resolve()
   }
 
+  public _setConfirmUndoCommitSetting(value: boolean): Promise<void> {
+    this.confirmUndoCommit = value
+    setBoolean(confirmUndoCommitKey, value)
+
+    this.emitUpdate()
+
+    return Promise.resolve()
+  }
+
+  public _setConfirmCommitFilteredChanges(value: boolean): Promise<void> {
+    this.confirmCommitFilteredChanges = value
+    setBoolean(confirmCommitFilteredChangesKey, value)
+
+    this.emitUpdate()
+
+    return Promise.resolve()
+  }
+
   public _setUncommittedChangesStrategySetting(
     value: UncommittedChangesStrategy
   ): Promise<void> {
@@ -5163,11 +5858,24 @@ export class AppStore extends TypedBaseStore<IAppState> {
     }
   }
 
+  public _setHideWhitespaceInPullRequestDiff(
+    hideWhitespaceInDiff: boolean,
+    repository: Repository,
+    file: CommittedFileChange | null
+  ) {
+    setBoolean(hideWhitespaceInPullRequestDiffKey, hideWhitespaceInDiff)
+    this.hideWhitespaceInPullRequestDiff = hideWhitespaceInDiff
+
+    if (file !== null) {
+      this._changePullRequestFileSelection(repository, file)
+    }
+  }
+
   public _setShowSideBySideDiff(showSideBySideDiff: boolean) {
     if (showSideBySideDiff !== this.showSideBySideDiff) {
       setShowSideBySideDiff(showSideBySideDiff)
       this.showSideBySideDiff = showSideBySideDiff
-      this.statsStore.recordDiffModeChanged()
+      this.statsStore.increment('diffModeChangeCount')
       this.emitUpdate()
     }
   }
@@ -5228,38 +5936,31 @@ export class AppStore extends TypedBaseStore<IAppState> {
     return this._refreshRepository(repository)
   }
 
+  public _resolveOAuthRequest(action: IOAuthAction) {
+    return this.signInStore.resolveOAuthRequest(action)
+  }
+
   public _resetSignInState(): Promise<void> {
     this.signInStore.reset()
     return Promise.resolve()
   }
 
-  public _beginDotComSignIn(): Promise<void> {
-    this.signInStore.beginDotComSignIn()
-    return Promise.resolve()
+  public _beginDotComSignIn(resultCallback?: (result: SignInResult) => void) {
+    return this.signInStore.beginDotComSignIn(resultCallback)
   }
 
-  public _beginEnterpriseSignIn(): Promise<void> {
-    this.signInStore.beginEnterpriseSignIn()
-    return Promise.resolve()
+  public _beginEnterpriseSignIn(
+    resultCallback?: (result: SignInResult) => void
+  ) {
+    return this.signInStore.beginEnterpriseSignIn(resultCallback)
   }
 
   public _setSignInEndpoint(url: string): Promise<void> {
     return this.signInStore.setEndpoint(url)
   }
 
-  public _setSignInCredentials(
-    username: string,
-    password: string
-  ): Promise<void> {
-    return this.signInStore.authenticateWithBasicAuth(username, password)
-  }
-
-  public _requestBrowserAuthentication(): Promise<void> {
-    return this.signInStore.authenticateWithBrowser()
-  }
-
-  public _setSignInOTP(otp: string): Promise<void> {
-    return this.signInStore.setTwoFactorOTP(otp)
+  public _requestBrowserAuthentication() {
+    this.signInStore.authenticateWithBrowser()
   }
 
   public async _setAppFocusState(isFocused: boolean): Promise<void> {
@@ -5320,11 +6021,12 @@ export class AppStore extends TypedBaseStore<IAppState> {
     return this.repositoriesStore.updateRepositoryPath(repository, path)
   }
 
-  public _removeAccount(account: Account): Promise<void> {
+  public async _removeAccount(account: Account) {
     log.info(
       `[AppStore] removing account ${account.login} (${account.name}) from store`
     )
-    return this.accountsStore.removeAccount(account)
+    await this.accountsStore.removeAccount(account)
+    await deleteToken(account)
   }
 
   private async _addAccount(account: Account): Promise<void> {
@@ -5543,12 +6245,12 @@ export class AppStore extends TypedBaseStore<IAppState> {
     }`
   }
 
-  private async withAuthenticatingUser<T>(
+  private async withRefreshedGitHubRepository<T>(
     repository: Repository,
-    fn: (repository: Repository, account: IGitAccount | null) => Promise<T>
+    fn: (repository: Repository) => Promise<T>
   ): Promise<T> {
     let updatedRepository = repository
-    let account: IGitAccount | null = getAccountForRepository(
+    const account: Account | null = getAccountForRepository(
       this.accounts,
       updatedRepository
     )
@@ -5561,30 +6263,9 @@ export class AppStore extends TypedBaseStore<IAppState> {
       updatedRepository = await this.repositoryWithRefreshedGitHubRepository(
         repository
       )
-      account = getAccountForRepository(this.accounts, updatedRepository)
-    }
-
-    if (!account) {
-      const gitStore = this.gitStoreCache.get(repository)
-      const remote = gitStore.currentRemote
-      if (remote) {
-        const hostname = getGenericHostname(remote.url)
-        const username = getGenericUsername(hostname)
-        if (username != null) {
-          account = { login: username, endpoint: hostname }
-        }
-      }
-    }
-
-    if (account instanceof Account) {
-      const hasValidToken =
-        account.token.length > 0 ? 'has token' : 'empty token'
-      log.info(
-        `[AppStore.withAuthenticatingUser] account found for repository: ${repository.name} - ${account.login} (${hasValidToken})`
-      )
     }
 
-    return fn(updatedRepository, account)
+    return fn(updatedRepository)
   }
 
   private updateRevertProgress(
@@ -5605,43 +6286,18 @@ export class AppStore extends TypedBaseStore<IAppState> {
     repository: Repository,
     commit: Commit
   ): Promise<void> {
-    return this.withAuthenticatingUser(repository, async (repo, account) => {
-      const gitStore = this.gitStoreCache.get(repo)
+    return this.withRefreshedGitHubRepository(repository, async repository => {
+      const gitStore = this.gitStoreCache.get(repository)
 
-      await gitStore.revertCommit(repo, commit, account, progress => {
-        this.updateRevertProgress(repo, progress)
+      await gitStore.revertCommit(repository, commit, progress => {
+        this.updateRevertProgress(repository, progress)
       })
 
-      this.updateRevertProgress(repo, null)
+      this.updateRevertProgress(repository, null)
       await this._refreshRepository(repository)
     })
   }
 
-  public async promptForGenericGitAuthentication(
-    repository: Repository | CloningRepository,
-    retryAction: RetryAction
-  ): Promise<void> {
-    let url
-    if (repository instanceof Repository) {
-      const gitStore = this.gitStoreCache.get(repository)
-      const remote = gitStore.currentRemote
-      if (!remote) {
-        return
-      }
-
-      url = remote.url
-    } else {
-      url = repository.url
-    }
-
-    const hostname = getGenericHostname(url)
-    return this._showPopup({
-      type: PopupType.GenericGitAuthentication,
-      hostname,
-      retryAction,
-    })
-  }
-
   public async _installGlobalLFSFilters(force: boolean): Promise<void> {
     try {
       await installGlobalLFSFilters(force)
@@ -5709,7 +6365,10 @@ export class AppStore extends TypedBaseStore<IAppState> {
     await this._openInBrowser(url.toString())
   }
 
-  public async _createPullRequest(repository: Repository): Promise<void> {
+  public async _createPullRequest(
+    repository: Repository,
+    baseBranch?: Branch
+  ): Promise<void> {
     const gitHubRepository = repository.gitHubRepository
     if (!gitHubRepository) {
       return
@@ -5722,24 +6381,28 @@ export class AppStore extends TypedBaseStore<IAppState> {
       return
     }
 
-    const branch = tip.branch
+    const compareBranch = tip.branch
     const aheadBehind = state.aheadBehind
 
     if (aheadBehind == null) {
       this._showPopup({
         type: PopupType.PushBranchCommits,
         repository,
-        branch,
+        branch: compareBranch,
       })
     } else if (aheadBehind.ahead > 0) {
       this._showPopup({
         type: PopupType.PushBranchCommits,
         repository,
-        branch,
+        branch: compareBranch,
         unPushedCommits: aheadBehind.ahead,
       })
     } else {
-      await this._openCreatePullRequestInBrowser(repository, branch)
+      await this._openCreatePullRequestInBrowser(
+        repository,
+        compareBranch,
+        baseBranch
+      )
     }
   }
 
@@ -5834,21 +6497,43 @@ export class AppStore extends TypedBaseStore<IAppState> {
 
   public async _openCreatePullRequestInBrowser(
     repository: Repository,
-    branch: Branch
+    compareBranch: Branch,
+    baseBranch?: Branch
   ): Promise<void> {
     const gitHubRepository = repository.gitHubRepository
     if (!gitHubRepository) {
       return
     }
 
-    const urlEncodedBranchName = encodeURIComponent(branch.nameWithoutRemote)
-    const baseURL = `${gitHubRepository.htmlURL}/pull/new/${urlEncodedBranchName}`
+    const { parent, owner, name, htmlURL } = gitHubRepository
+    const isForkContributingToParent =
+      isForkedRepositoryContributingToParent(repository)
 
-    await this._openInBrowser(baseURL)
+    const baseForkPreface =
+      isForkContributingToParent && parent !== null
+        ? `${parent.owner.login}:${parent.name}:`
+        : ''
+    const encodedBaseBranch =
+      baseBranch !== undefined
+        ? baseForkPreface +
+          encodeURIComponent(baseBranch.nameWithoutRemote) +
+          '...'
+        : ''
 
-    if (this.currentOnboardingTutorialStep === TutorialStep.OpenPullRequest) {
-      this._markPullRequestTutorialStepAsComplete(repository)
-    }
+    const compareForkPreface = isForkContributingToParent
+      ? `${owner.login}:${name}:`
+      : ''
+
+    const encodedCompareBranch =
+      compareForkPreface +
+      encodeURIComponent(
+        compareBranch.upstreamWithoutRemote ?? compareBranch.nameWithoutRemote
+      )
+
+    const compareString = `${encodedBaseBranch}${encodedCompareBranch}`
+    const baseURL = `${htmlURL}/pull/new/${compareString}`
+
+    await this._openInBrowser(baseURL)
   }
 
   public async _updateExistingUpstreamRemote(
@@ -5904,7 +6589,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
     )
     if (prBranch !== undefined) {
       await this._checkoutBranch(repository, prBranch)
-      this.statsStore.recordPRBranchCheckout()
+      this.statsStore.increment('prBranchCheckouts')
     }
   }
 
@@ -6018,7 +6703,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
    */
   public _setCoAuthors(
     repository: Repository,
-    coAuthors: ReadonlyArray<IAuthor>
+    coAuthors: ReadonlyArray<Author>
   ) {
     this.gitStoreCache.get(repository).setCoAuthors(coAuthors)
     return Promise.resolve()
@@ -6030,21 +6715,20 @@ export class AppStore extends TypedBaseStore<IAppState> {
   public _setSelectedTheme(theme: ApplicationTheme) {
     setPersistedTheme(theme)
     this.selectedTheme = theme
-    if (theme === ApplicationTheme.HighContrast) {
-      this.currentTheme = theme
-    }
     this.emitUpdate()
 
     return Promise.resolve()
   }
 
   /**
-   * Set the custom application-wide theme
+   * Set the application-wide tab indentation
    */
-  public _setCustomTheme(theme: ICustomTheme) {
-    setObject(customThemeKey, theme)
-    this.customTheme = theme
-    this.emitUpdate()
+  public _setSelectedTabSize(tabSize: number) {
+    if (!isNaN(tabSize)) {
+      this.selectedTabSize = tabSize
+      setNumber(tabSizeKey, tabSize)
+      this.emitUpdate()
+    }
 
     return Promise.resolve()
   }
@@ -6169,15 +6853,12 @@ export class AppStore extends TypedBaseStore<IAppState> {
 
   /** This shouldn't be called directly. See `Dispatcher`. */
   public async _popStashEntry(repository: Repository, stashEntry: IStashEntry) {
-    const gitStore = this.gitStoreCache.get(repository)
-    await gitStore.performFailableOperation(() => {
-      return popStashEntry(repository, stashEntry.stashSha)
-    })
+    await popStashEntry(repository, stashEntry.stashSha)
     log.info(
       `[AppStore. _popStashEntry] popped stash with commit id ${stashEntry.stashSha}`
     )
 
-    this.statsStore.recordStashRestore()
+    this.statsStore.increment('stashRestoreCount')
     await this._refreshRepository(repository)
   }
 
@@ -6194,7 +6875,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
       `[AppStore. _dropStashEntry] dropped stash with commit id ${stashEntry.stashSha}`
     )
 
-    this.statsStore.recordStashDiscard()
+    this.statsStore.increment('stashDiscardCount')
     await gitStore.loadStashEntries()
   }
 
@@ -6291,13 +6972,13 @@ export class AppStore extends TypedBaseStore<IAppState> {
         path,
         (title, value, description) => {
           if (
-            this.currentPopup !== null &&
-            this.currentPopup.type === PopupType.CreateTutorialRepository
+            this.popupManager.currentPopup?.type ===
+            PopupType.CreateTutorialRepository
           ) {
-            this.currentPopup = {
-              ...this.currentPopup,
+            this.popupManager.updatePopup({
+              ...this.popupManager.currentPopup,
               progress: { kind: 'generic', title, value, description },
-            }
+            })
             this.emitUpdate()
           }
         }
@@ -6361,6 +7042,46 @@ export class AppStore extends TypedBaseStore<IAppState> {
     }
   }
 
+  /**
+   * Multi selection on the commit list can give an order of 1, 5, 3 if that is
+   * how the user selected them. However, we want to main chronological ordering
+   * of the commits to reduce the chance of conflicts during interact rebasing.
+   * Thus, assuming 1 is the first commit made by the user and 5 is the last. We
+   * want the order to be, 1, 3, 5.
+   */
+  private orderCommitsByHistory(
+    repository: Repository,
+    commits: ReadonlyArray<CommitOneLine>
+  ) {
+    const { compareState } = this.repositoryStateCache.get(repository)
+    const { commitSHAs } = compareState
+    const commitIndexBySha = new Map(commitSHAs.map((sha, i) => [sha, i]))
+
+    return commits.toSorted((a, b) =>
+      compare(commitIndexBySha.get(b.sha), commitIndexBySha.get(a.sha))
+    )
+  }
+
+  /**
+   * Multi selection on the commit list can give an order of 1, 5, 3 if that is
+   * how the user selected them. However, sometimes we want them in
+   * chronological ordering of the commits such as when get a range files
+   * changed. Thus, assuming 1 is the first commit made by the user and 5 is the
+   * last. We want the order to be, 1, 3, 5.
+   */
+  private orderShasByHistory(
+    repository: Repository,
+    commits: ReadonlyArray<string>
+  ) {
+    const { compareState } = this.repositoryStateCache.get(repository)
+    const { commitSHAs } = compareState
+    const commitIndexBySha = new Map(commitSHAs.map((sha, i) => [sha, i]))
+
+    return commits.toSorted((a, b) =>
+      compare(commitIndexBySha.get(b), commitIndexBySha.get(a))
+    )
+  }
+
   /** This shouldn't be called directly. See `Dispatcher`. */
   public async _cherryPick(
     repository: Repository,
@@ -6371,13 +7092,15 @@ export class AppStore extends TypedBaseStore<IAppState> {
       return CherryPickResult.UnableToStart
     }
 
+    const orderedCommits = this.orderCommitsByHistory(repository, commits)
+
     await this._refreshRepository(repository)
 
     const progressCallback =
       this.getMultiCommitOperationProgressCallBack(repository)
     const gitStore = this.gitStoreCache.get(repository)
     const result = await gitStore.performFailableOperation(() =>
-      cherryPick(repository, commits, progressCallback)
+      cherryPick(repository, orderedCommits, progressCallback)
     )
 
     return result || CherryPickResult.Error
@@ -6428,11 +7151,11 @@ export class AppStore extends TypedBaseStore<IAppState> {
   ): Promise<string | undefined> {
     const gitStore = this.gitStoreCache.get(repository)
 
-    const checkoutSuccessful = await this.withAuthenticatingUser(
+    const checkoutSuccessful = await this.withRefreshedGitHubRepository(
       repository,
-      (r, account) => {
+      repository => {
         return gitStore.performFailableOperation(() =>
-          checkoutBranch(repository, account, targetBranch)
+          checkoutBranch(repository, targetBranch, gitStore.currentRemote)
         )
       }
     )
@@ -6543,9 +7266,9 @@ export class AppStore extends TypedBaseStore<IAppState> {
     }
 
     const gitStore = this.gitStoreCache.get(repository)
-    await this.withAuthenticatingUser(repository, async (r, account) => {
+    await this.withRefreshedGitHubRepository(repository, async repository => {
       await gitStore.performFailableOperation(() =>
-        checkoutBranch(repository, account, sourceBranch)
+        checkoutBranch(repository, sourceBranch, gitStore.currentRemote)
       )
     })
   }
@@ -6585,6 +7308,30 @@ export class AppStore extends TypedBaseStore<IAppState> {
     this.emitUpdate()
   }
 
+  public _setUseCustomEditor(useCustomEditor: boolean) {
+    setBoolean(useCustomEditorKey, useCustomEditor)
+    this.useCustomEditor = useCustomEditor
+    this.emitUpdate()
+  }
+
+  public _setCustomEditor(customEditor: ICustomIntegration) {
+    setObject(customEditorKey, customEditor)
+    this.customEditor = customEditor
+    this.emitUpdate()
+  }
+
+  public _setUseCustomShell(useCustomShell: boolean) {
+    setBoolean(useCustomShellKey, useCustomShell)
+    this.useCustomShell = useCustomShell
+    this.emitUpdate()
+  }
+
+  public _setCustomShell(customShell: ICustomIntegration) {
+    setObject(customShellKey, customShell)
+    this.customShell = customShell
+    this.emitUpdate()
+  }
+
   /** This shouldn't be called directly. See `Dispatcher`. */
   public async _reorderCommits(
     repository: Repository,
@@ -6942,11 +7689,9 @@ export class AppStore extends TypedBaseStore<IAppState> {
     this.emitUpdate()
   }
 
-  private onChecksFailedNotification = async (
+  public onChecksFailedNotification = async (
     repository: RepositoryWithGitHubRepository,
     pullRequest: PullRequest,
-    commitMessage: string,
-    commitSha: string,
     checks: ReadonlyArray<IRefCheck>
   ) => {
     const selectedRepository =
@@ -6957,8 +7702,6 @@ export class AppStore extends TypedBaseStore<IAppState> {
       pullRequest,
       repository,
       shouldChangeRepository: true,
-      commitMessage,
-      commitSha,
       checks,
     }
 
@@ -6968,7 +7711,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
       selectedRepository === null ||
       selectedRepository.hash !== repository.hash
     ) {
-      this.statsStore.recordChecksFailedDialogOpen()
+      this.statsStore.increment('checksFailedDialogOpenCount')
       return this._showPopup(popup)
     }
 
@@ -6982,7 +7725,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
       // If it's the same branch, just show the existing CI check run popover
       this._setShowCIStatusPopover(true)
     } else {
-      this.statsStore.recordChecksFailedDialogOpen()
+      this.statsStore.increment('checksFailedDialogOpenCount')
 
       // If there is no current branch or it's different than the PR branch,
       // show the checks failed dialog, but it won't offer to switch to the
@@ -6997,8 +7740,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
   private onPullRequestReviewSubmitNotification = async (
     repository: RepositoryWithGitHubRepository,
     pullRequest: PullRequest,
-    review: ValidNotificationPullRequestReview,
-    numberOfComments: number
+    review: ValidNotificationPullRequestReview
   ) => {
     const selectedRepository =
       this.selectedRepository ?? (await this._selectRepository(repository))
@@ -7019,9 +7761,388 @@ export class AppStore extends TypedBaseStore<IAppState> {
       review,
       pullRequest,
       repository,
-      numberOfComments,
     })
   }
+
+  private onPullRequestCommentNotification = async (
+    repository: RepositoryWithGitHubRepository,
+    pullRequest: PullRequest,
+    comment: IAPIComment
+  ) => {
+    const selectedRepository =
+      this.selectedRepository ?? (await this._selectRepository(repository))
+
+    const state = this.repositoryStateCache.get(repository)
+
+    const { branchesState } = state
+    const { tip } = branchesState
+    const currentBranch = tip.kind === TipState.Valid ? tip.branch : null
+
+    return this._showPopup({
+      type: PopupType.PullRequestComment,
+      shouldCheckoutBranch:
+        currentBranch !== null && currentBranch.name !== pullRequest.head.ref,
+      shouldChangeRepository:
+        selectedRepository === null ||
+        selectedRepository.hash !== repository.hash,
+      comment,
+      pullRequest,
+      repository,
+    })
+  }
+
+  public async _startPullRequest(repository: Repository) {
+    const { tip, defaultBranch } =
+      this.repositoryStateCache.get(repository).branchesState
+
+    if (tip.kind !== TipState.Valid) {
+      // Shouldn't even be able to get here if so - just a type check
+      return
+    }
+
+    const currentBranch = tip.branch
+    this._initializePullRequestPreview(repository, defaultBranch, currentBranch)
+  }
+
+  private async _initializePullRequestPreview(
+    repository: Repository,
+    baseBranch: Branch | null,
+    currentBranch: Branch
+  ) {
+    if (baseBranch === null) {
+      this.showPullRequestPopupNoBaseBranch(repository, currentBranch)
+      return
+    }
+
+    const gitStore = this.gitStoreCache.get(repository)
+
+    const pullRequestCommits = await gitStore.getCommitsBetweenBranches(
+      baseBranch,
+      currentBranch
+    )
+
+    const commitsBetweenBranches = pullRequestCommits.map(c => c.sha)
+
+    // A user may compare two branches with no changes between them.
+    const emptyChangeSet = { files: [], linesAdded: 0, linesDeleted: 0 }
+    const changesetData =
+      commitsBetweenBranches.length > 0
+        ? await gitStore.performFailableOperation(() =>
+            getBranchMergeBaseChangedFiles(
+              repository,
+              baseBranch.name,
+              currentBranch.name,
+              commitsBetweenBranches[0]
+            )
+          )
+        : emptyChangeSet
+
+    if (changesetData === undefined) {
+      return
+    }
+
+    const hasMergeBase = changesetData !== null
+    // We don't care how many commits exist on the unrelated history that
+    // can't be merged.
+    const commitSHAs = hasMergeBase ? commitsBetweenBranches : []
+
+    this.repositoryStateCache.initializePullRequestState(repository, {
+      baseBranch,
+      commitSHAs,
+      commitSelection: {
+        shas: commitSHAs,
+        shasInDiff: commitSHAs,
+        isContiguous: true,
+        changesetData: changesetData ?? emptyChangeSet,
+        file: null,
+        diff: null,
+      },
+      mergeStatus:
+        commitSHAs.length > 0 || !hasMergeBase
+          ? {
+              kind: hasMergeBase
+                ? ComputedAction.Loading
+                : ComputedAction.Invalid,
+            }
+          : null,
+    })
+
+    this.emitUpdate()
+
+    if (commitSHAs.length > 0) {
+      this.setupPRMergeTreePromise(repository, baseBranch, currentBranch)
+    }
+
+    if (changesetData !== null && changesetData.files.length > 0) {
+      await this._changePullRequestFileSelection(
+        repository,
+        changesetData.files[0]
+      )
+    }
+
+    this.showPullRequestPopup(repository, currentBranch, commitSHAs)
+  }
+
+  public showPullRequestPopupNoBaseBranch(
+    repository: Repository,
+    currentBranch: Branch
+  ) {
+    this.repositoryStateCache.initializePullRequestState(repository, {
+      baseBranch: null,
+      commitSHAs: null,
+      commitSelection: null,
+      mergeStatus: null,
+    })
+
+    this.emitUpdate()
+
+    this.showPullRequestPopup(repository, currentBranch, [])
+  }
+
+  public showPullRequestPopup(
+    repository: Repository,
+    currentBranch: Branch,
+    commitSHAs: ReadonlyArray<string>
+  ) {
+    if (this.popupManager.areTherePopupsOfType(PopupType.StartPullRequest)) {
+      return
+    }
+
+    this.statsStore.increment('previewedPullRequestCount')
+
+    const { branchesState, localCommitSHAs } =
+      this.repositoryStateCache.get(repository)
+    const { allBranches, recentBranches, defaultBranch, currentPullRequest } =
+      branchesState
+    const gitStore = this.gitStoreCache.get(repository)
+    /*  We only want branches that are also on dotcom such that, when we ask a
+     *  user to create a pull request, the base branch also exists on dotcom.
+     */
+    const remote = isForkedRepositoryContributingToParent(repository)
+      ? UpstreamRemoteName
+      : gitStore.defaultRemote?.name
+    const prBaseBranches = allBranches.filter(
+      b => b.upstreamRemoteName === remote || b.remoteName === remote
+    )
+    const prRecentBaseBranches = recentBranches.filter(
+      b => b.upstreamRemoteName === remote || b.remoteName === remote
+    )
+    const { imageDiffType, selectedExternalEditor, showSideBySideDiff } =
+      this.getState()
+
+    const nonLocalCommitSHA =
+      commitSHAs.length > 0 && !localCommitSHAs.includes(commitSHAs[0])
+        ? commitSHAs[0]
+        : null
+
+    this._showPopup({
+      type: PopupType.StartPullRequest,
+      prBaseBranches,
+      prRecentBaseBranches,
+      currentBranch,
+      defaultBranch,
+      imageDiffType,
+      repository,
+      externalEditorLabel: selectedExternalEditor ?? undefined,
+      nonLocalCommitSHA,
+      showSideBySideDiff,
+      currentBranchHasPullRequest: currentPullRequest !== null,
+    })
+  }
+
+  public async _changePullRequestFileSelection(
+    repository: Repository,
+    file: CommittedFileChange
+  ): Promise<void> {
+    const { branchesState, pullRequestState } =
+      this.repositoryStateCache.get(repository)
+
+    if (
+      branchesState.tip.kind !== TipState.Valid ||
+      pullRequestState === null
+    ) {
+      return
+    }
+
+    const currentBranch = branchesState.tip.branch
+    const { baseBranch, commitSHAs } = pullRequestState
+    if (commitSHAs === null || baseBranch === null) {
+      return
+    }
+
+    this.repositoryStateCache.updatePullRequestCommitSelection(
+      repository,
+      () => ({
+        file,
+        diff: null,
+      })
+    )
+
+    this.emitUpdate()
+
+    if (commitSHAs.length === 0) {
+      // Shouldn't happen at this point, but if so moving forward doesn't
+      // make sense
+      return
+    }
+
+    const diff =
+      (await this.gitStoreCache
+        .get(repository)
+        .performFailableOperation(() =>
+          getBranchMergeBaseDiff(
+            repository,
+            file,
+            baseBranch.name,
+            currentBranch.name,
+            this.hideWhitespaceInPullRequestDiff,
+            commitSHAs[0]
+          )
+        )) ?? null
+
+    const { pullRequestState: stateAfterLoad } =
+      this.repositoryStateCache.get(repository)
+    const selectedFileAfterDiffLoad = stateAfterLoad?.commitSelection?.file
+
+    if (selectedFileAfterDiffLoad?.id !== file.id) {
+      // this means user has clicked on another file since loading the diff
+      return
+    }
+
+    this.repositoryStateCache.updatePullRequestCommitSelection(
+      repository,
+      () => ({
+        diff,
+      })
+    )
+
+    this.emitUpdate()
+  }
+
+  public _setPullRequestFileListWidth(width: number): Promise<void> {
+    this.pullRequestFileListWidth = {
+      ...this.pullRequestFileListWidth,
+      value: width,
+    }
+    setNumber(pullRequestFileListConfigKey, width)
+    this.updatePullRequestResizableConstraints()
+    this.emitUpdate()
+
+    return Promise.resolve()
+  }
+
+  public _resetPullRequestFileListWidth(): Promise<void> {
+    this.pullRequestFileListWidth = {
+      ...this.pullRequestFileListWidth,
+      value: defaultPullRequestFileListWidth,
+    }
+    localStorage.removeItem(pullRequestFileListConfigKey)
+    this.updatePullRequestResizableConstraints()
+    this.emitUpdate()
+
+    return Promise.resolve()
+  }
+
+  public _updatePullRequestBaseBranch(
+    repository: Repository,
+    baseBranch: Branch
+  ) {
+    const { branchesState, pullRequestState } =
+      this.repositoryStateCache.get(repository)
+    const { tip } = branchesState
+
+    if (tip.kind !== TipState.Valid) {
+      return
+    }
+
+    if (pullRequestState === null) {
+      // This would mean the user submitted PR after requesting base branch
+      // update.
+      return
+    }
+
+    this._initializePullRequestPreview(repository, baseBranch, tip.branch)
+  }
+
+  private setupPRMergeTreePromise(
+    repository: Repository,
+    baseBranch: Branch,
+    compareBranch: Branch
+  ) {
+    this.setupMergabilityPromise(repository, baseBranch, compareBranch).then(
+      (mergeStatus: MergeTreeResult | null) => {
+        this.repositoryStateCache.updatePullRequestState(repository, () => ({
+          mergeStatus,
+        }))
+        this.emitUpdate()
+      }
+    )
+  }
+
+  public _quitApp(evenIfUpdating: boolean) {
+    if (evenIfUpdating) {
+      sendWillQuitEvenIfUpdatingSync()
+    }
+
+    quitApp()
+  }
+
+  public _cancelQuittingApp() {
+    sendCancelQuittingSync()
+  }
+
+  public _setPullRequestSuggestedNextAction(
+    value: PullRequestSuggestedNextAction
+  ) {
+    this.pullRequestSuggestedNextAction = value
+
+    localStorage.setItem(pullRequestSuggestedNextActionKey, value)
+
+    this.emitUpdate()
+  }
+
+  private isResizePaneActive() {
+    if (document.activeElement === null) {
+      return false
+    }
+
+    const appMenuBar = document.getElementById('app-menu-bar')
+
+    // Don't track windows menu items as focused elements for keeping
+    // track of recently focused elements we want to act upon
+    if (appMenuBar?.contains(document.activeElement)) {
+      return this.resizablePaneActive
+    }
+
+    return (
+      document.activeElement.closest(`.${resizableComponentClass}`) !== null
+    )
+  }
+
+  public _appFocusedElementChanged() {
+    const resizablePaneActive = this.isResizePaneActive()
+
+    if (resizablePaneActive !== this.resizablePaneActive) {
+      this.resizablePaneActive = resizablePaneActive
+      this.emitUpdate()
+    }
+  }
+
+  public _updateUnderlineLinks(underlineLinks: boolean) {
+    if (underlineLinks !== this.underlineLinks) {
+      this.underlineLinks = underlineLinks
+      setBoolean(underlineLinksKey, underlineLinks)
+      this.emitUpdate()
+    }
+  }
+
+  public _updateShowDiffCheckMarks(showDiffCheckMarks: boolean) {
+    if (showDiffCheckMarks !== this.showDiffCheckMarks) {
+      this.showDiffCheckMarks = showDiffCheckMarks
+      setBoolean(showDiffCheckMarksKey, showDiffCheckMarks)
+      this.emitUpdate()
+    }
+  }
 }
 
 /**
@@ -7086,5 +8207,12 @@ function constrain(
   min = -Infinity,
   max = Infinity
 ): IConstrainedValue {
-  return { value: typeof value === 'number' ? value : value.value, min, max }
+  // Match CSS's behavior where min-width takes precedence over max-width
+  // See https://stackoverflow.com/a/16063871
+  const constrainedMax = max < min ? min : max
+  return {
+    value: typeof value === 'number' ? value : value.value,
+    min,
+    max: constrainedMax,
+  }
 }
diff --git a/app/src/lib/stores/commit-status-store.ts b/app/src/lib/stores/commit-status-store.ts
index a43ab95bc1f..506e32f39cd 100644
--- a/app/src/lib/stores/commit-status-store.ts
+++ b/app/src/lib/stores/commit-status-store.ts
@@ -1,24 +1,24 @@
 import pLimit from 'p-limit'
 import QuickLRU from 'quick-lru'
 
+import { Disposable, DisposableLike } from 'event-kit'
+import xor from 'lodash/xor'
 import { Account } from '../../models/account'
-import { AccountsStore } from './accounts-store'
 import { GitHubRepository } from '../../models/github-repository'
 import { API, getAccountForEndpoint, IAPICheckSuite } from '../api'
-import { DisposableLike, Disposable } from 'event-kit'
 import {
-  ICombinedRefCheck,
-  IRefCheck,
-  createCombinedCheckFromChecks,
   apiCheckRunToRefCheck,
-  getLatestCheckRunsByName,
   apiStatusToRefCheck,
-  getLatestPRWorkflowRunsLogsForCheckRun,
+  createCombinedCheckFromChecks,
   getCheckRunActionsWorkflowRuns,
+  getLatestCheckRunsById,
+  getLatestPRWorkflowRunsLogsForCheckRun,
+  ICombinedRefCheck,
+  IRefCheck,
   manuallySetChecksToPending,
 } from '../ci-checks/ci-checks'
-import _ from 'lodash'
 import { offsetFromNow } from '../offset-from'
+import { AccountsStore } from './accounts-store'
 
 interface ICommitStatusCacheEntry {
   /**
@@ -310,9 +310,7 @@ export class CommitStatusStore {
     }
 
     if (checkRuns !== null) {
-      const latestCheckRunsByName = getLatestCheckRunsByName(
-        checkRuns.check_runs
-      )
+      const latestCheckRunsByName = getLatestCheckRunsById(checkRuns.check_runs)
       checks.push(...latestCheckRunsByName.map(apiCheckRunToRefCheck))
     }
 
@@ -343,7 +341,7 @@ export class CommitStatusStore {
       existingChecks !== undefined &&
       existingChecks.check !== null &&
       existingChecks.check.checks.some(c => c.actionsWorkflow !== undefined) &&
-      _.xor(
+      xor(
         existingChecks.check.checks.map(cr => cr.id),
         checks.map(cr => cr.id)
       ).length === 0
diff --git a/app/src/lib/stores/git-store.ts b/app/src/lib/stores/git-store.ts
index caebad503de..2ad88655838 100644
--- a/app/src/lib/stores/git-store.ts
+++ b/app/src/lib/stores/git-store.ts
@@ -1,5 +1,9 @@
 import * as Path from 'path'
-import { Repository } from '../../models/repository'
+import {
+  getNonForkGitHubRepository,
+  isRepositoryWithForkedGitHubRepository,
+  Repository,
+} from '../../models/repository'
 import {
   WorkingDirectoryFileChange,
   AppFileStatusKind,
@@ -26,7 +30,6 @@ import {
   ErrorWithMetadata,
   IErrorMetadata,
 } from '../error-with-metadata'
-import { compare } from '../../lib/compare'
 import { queueWorkHigh } from '../../lib/queue-work'
 
 import {
@@ -63,7 +66,6 @@ import {
   getAheadBehind,
   revRange,
   revSymmetricDifference,
-  getSymbolicRef,
   getConfigValue,
   removeRemote,
   createTag,
@@ -71,6 +73,8 @@ import {
   deleteTag,
   MergeResult,
   createBranch,
+  updateRemoteHEAD,
+  getRemoteHEAD,
 } from '../git'
 import { GitError as DugiteError } from '../../lib/git'
 import { GitError } from 'dugite'
@@ -82,10 +86,9 @@ import {
   UpstreamRemoteName,
 } from './helpers/find-upstream-remote'
 import { findDefaultRemote } from './helpers/find-default-remote'
-import { IAuthor } from '../../models/author'
+import { Author, isKnownAuthor } from '../../models/author'
 import { formatCommitMessage } from '../format-commit-message'
 import { GitAuthor } from '../../models/git-author'
-import { IGitAccount } from '../../models/git-account'
 import { BaseStore } from './base-store'
 import { getStashes, getStashedFiles } from '../git/stash'
 import { IStashEntry, StashedChangesLoadStates } from '../../models/stash-entry'
@@ -96,6 +99,7 @@ import { DiffSelection, ITextDiff } from '../../models/diff'
 import { getDefaultBranch } from '../helpers/default-branch'
 import { stat } from 'fs/promises'
 import { findForkedRemotesToPrune } from './helpers/find-forked-remotes-to-prune'
+import { findDefaultBranch } from '../find-default-branch'
 
 /** The number of commits to load from history per batch. */
 const CommitBatchSize = 100
@@ -120,6 +124,8 @@ export class GitStore extends BaseStore {
 
   private _defaultBranch: Branch | null = null
 
+  private _upstreamDefaultBranch: Branch | null = null
+
   private _localTags: Map<string, string> | null = null
 
   private _allBranches: ReadonlyArray<Branch> = []
@@ -132,12 +138,14 @@ export class GitStore extends BaseStore {
 
   private _showCoAuthoredBy: boolean = false
 
-  private _coAuthors: ReadonlyArray<IAuthor> = []
+  private _coAuthors: ReadonlyArray<Author> = []
 
   private _aheadBehind: IAheadBehind | null = null
 
   private _tagsToPush: ReadonlyArray<string> = []
 
+  private _remotes: ReadonlyArray<IRemote> = []
+
   private _defaultRemote: IRemote | null = null
 
   private _currentRemote: IRemote | null = null
@@ -342,7 +350,7 @@ export class GitStore extends BaseStore {
     await this.refreshTags()
     this.addTagToPush(name)
 
-    this.statsStore.recordTagCreatedInDesktop()
+    this.statsStore.increment('tagsCreatedInDesktop')
   }
 
   public async deleteTag(name: string) {
@@ -358,7 +366,7 @@ export class GitStore extends BaseStore {
     await this.refreshTags()
     this.removeTagToPush(name)
 
-    this.statsStore.recordTagDeleted()
+    this.statsStore.increment('tagsDeleted')
   }
 
   /** The list of ordered SHAs. */
@@ -460,21 +468,35 @@ export class GitStore extends BaseStore {
     }
   }
 
-  private async refreshDefaultBranch() {
-    const defaultBranchName = await this.resolveDefaultBranch()
+  public async refreshDefaultBranch() {
+    this._defaultBranch = await findDefaultBranch(
+      this.repository,
+      this.allBranches,
+      this.defaultRemote?.name
+    )
 
-    // Find the default branch among all of our branches, giving
-    // priority to local branches by sorting them before remotes
-    this._defaultBranch =
-      this._allBranches
-        .filter(
-          b =>
-            (b.name === defaultBranchName &&
-              b.upstreamWithoutRemote === null) ||
-            b.upstreamWithoutRemote === defaultBranchName
-        )
-        .sort((x, y) => compare(x.type, y.type))
-        .shift() || null
+    // The upstream default branch is only relevant for forked GitHub repos when
+    // the fork behavior is contributing to the parent.
+    if (
+      !isRepositoryWithForkedGitHubRepository(this.repository) ||
+      getNonForkGitHubRepository(this.repository) ===
+        this.repository.gitHubRepository
+    ) {
+      this._upstreamDefaultBranch = null
+      return
+    }
+
+    const upstreamDefaultBranch =
+      (await getRemoteHEAD(this.repository, UpstreamRemoteName)) ??
+      getDefaultBranch()
+
+    this._upstreamDefaultBranch =
+      this._allBranches.find(
+        b =>
+          b.type === BranchType.Remote &&
+          b.remoteName === UpstreamRemoteName &&
+          b.nameWithoutRemote === upstreamDefaultBranch
+      ) ?? null
   }
 
   private addTagToPush(tagName: string) {
@@ -500,41 +522,6 @@ export class GitStore extends BaseStore {
     this.emitUpdate()
   }
 
-  /**
-   * Resolve the default branch name for the current repository,
-   * using the available API data, remote information or branch
-   * name conventions.
-   */
-  private async resolveDefaultBranch(): Promise<string> {
-    const { gitHubRepository } = this.repository
-    if (gitHubRepository && gitHubRepository.defaultBranch != null) {
-      return gitHubRepository.defaultBranch
-    }
-
-    if (this.currentRemote !== null) {
-      // the Git server should use [remote]/HEAD to advertise
-      // it's default branch, so see if it exists and matches
-      // a valid branch on the remote and attempt to use that
-      const remoteNamespace = `refs/remotes/${this.currentRemote.name}/`
-      const match = await getSymbolicRef(
-        this.repository,
-        `${remoteNamespace}HEAD`
-      )
-      if (
-        match != null &&
-        match.length > remoteNamespace.length &&
-        match.startsWith(remoteNamespace)
-      ) {
-        // strip out everything related to the remote because this
-        // is likely to be a tracked branch locally
-        // e.g. `main`, `develop`, etc
-        return match.substring(remoteNamespace.length)
-      }
-    }
-
-    return getDefaultBranch()
-  }
-
   private refreshRecentBranches(
     recentBranchNames: ReadonlyArray<string> | undefined
   ) {
@@ -587,6 +574,15 @@ export class GitStore extends BaseStore {
     return this._defaultBranch
   }
 
+  /**
+   * The default branch of the upstream remote in a forked GitHub repository
+   * with the ForkContributionTarget.Parent behavior, or null if it cannot be
+   * inferred or is another kind of repository.
+   */
+  public get upstreamDefaultBranch(): Branch | null {
+    return this._upstreamDefaultBranch
+  }
+
   /** All branches, including the current branch and the default branch. */
   public get allBranches(): ReadonlyArray<Branch> {
     return this._allBranches
@@ -709,6 +705,32 @@ export class GitStore extends BaseStore {
       return
     }
 
+    const coAuthorsRestored = await this.restoreCoAuthorsFromCommit(commit)
+    if (coAuthorsRestored) {
+      return
+    }
+
+    this._commitMessage = {
+      summary: commit.summary,
+      description: commit.body,
+    }
+    this.emitUpdate()
+  }
+
+  public async prepareToAmendCommit(commit: Commit) {
+    const coAuthorsRestored = await this.restoreCoAuthorsFromCommit(commit)
+    if (coAuthorsRestored) {
+      return
+    }
+
+    this._commitMessage = {
+      summary: commit.summary,
+      description: commit.body,
+    }
+    this.emitUpdate()
+  }
+
+  private async restoreCoAuthorsFromCommit(commit: Commit) {
     // Let's be safe about this since it's untried waters.
     // If we can restore co-authors then that's fantastic
     // but if we can't we shouldn't be throwing an error,
@@ -718,17 +740,14 @@ export class GitStore extends BaseStore {
       try {
         await this.loadCommitAndCoAuthors(commit)
         this.emitUpdate()
-        return
+
+        return true
       } catch (e) {
         log.error('Failed to restore commit and co-authors, falling back', e)
       }
     }
 
-    this._commitMessage = {
-      summary: commit.summary,
-      description: commit.body,
-    }
-    this.emitUpdate()
+    return false
   }
 
   /**
@@ -770,9 +789,8 @@ export class GitStore extends BaseStore {
     const lines = unfolded.split('\n')
 
     // We don't know (I mean, we're fairly sure) what the separator character
-    // used for the trailer is so we call out to git to get all possible
-    // characters. We'll need them in a bit
-    const separators = await getTrailerSeparatorCharacters(this.repository)
+    // used for the trailer is so we call out to git to get all possibilities
+    let separators: string | undefined = undefined
 
     // We know that what we've got now is well formed so we can capture the leading
     // token, followed by the separator char and a single space, followed by the
@@ -787,7 +805,14 @@ export class GitStore extends BaseStore {
       const match = coAuthorRe.exec(line)
 
       // Not a trailer line, we're sure of that
-      if (!match || separators.indexOf(match[1]) === -1) {
+      if (!match) {
+        continue
+      }
+
+      // Only shell out for separators if we really need them
+      separators ??= await getTrailerSeparatorCharacters(this.repository)
+
+      if (separators.indexOf(match[1]) === -1) {
         continue
       }
 
@@ -835,7 +860,7 @@ export class GitStore extends BaseStore {
     const extractedAuthors = extractedTrailers.map(t =>
       GitAuthor.parse(t.value)
     )
-    const newAuthors = new Array<IAuthor>()
+    const newAuthors = new Array<Author>()
 
     // Last step, phew! The most likely scenario where we
     // get called is when someone has just made a commit and
@@ -852,10 +877,12 @@ export class GitStore extends BaseStore {
       }
 
       const { name, email } = extractedAuthor
-      const existing = this.coAuthors.find(
-        a => a.name === name && a.email === email && a.username !== null
+      const existing = this.coAuthors
+        .filter(isKnownAuthor)
+        .find(a => a.name === name && a.email === email && a.username !== null)
+      newAuthors.push(
+        existing || { kind: 'known', name, email, username: null }
       )
-      newAuthors.push(existing || { name, email, username: null })
     }
 
     this._coAuthors = newAuthors
@@ -908,7 +935,7 @@ export class GitStore extends BaseStore {
    * Gets a list of co-authors to use when crafting the next
    * commit.
    */
-  public get coAuthors(): ReadonlyArray<IAuthor> {
+  public get coAuthors(): ReadonlyArray<Author> {
     return this._coAuthors
   }
 
@@ -922,7 +949,6 @@ export class GitStore extends BaseStore {
    *                           the overall fetch progress.
    */
   public async fetch(
-    account: IGitAccount | null,
     backgroundTask: boolean,
     progressCallback?: (fetchProgress: IFetchProgress) => void
   ): Promise<void> {
@@ -948,7 +974,6 @@ export class GitStore extends BaseStore {
 
     if (remotes.size > 0) {
       await this.fetchRemotes(
-        account,
         [...remotes.values()],
         backgroundTask,
         progressCallback
@@ -988,7 +1013,6 @@ export class GitStore extends BaseStore {
    *                           the overall fetch progress.
    */
   public async fetchRemotes(
-    account: IGitAccount | null,
     remotes: ReadonlyArray<IRemote>,
     backgroundTask: boolean,
     progressCallback?: (fetchProgress: IFetchProgress) => void
@@ -1003,7 +1027,7 @@ export class GitStore extends BaseStore {
       const remote = remotes[i]
       const startProgressValue = i * weight
 
-      await this.fetchRemote(account, remote, backgroundTask, progress => {
+      await this.fetchRemote(remote, backgroundTask, progress => {
         if (progress && progressCallback) {
           progressCallback({
             ...progress,
@@ -1024,19 +1048,36 @@ export class GitStore extends BaseStore {
    *                           the overall fetch progress.
    */
   public async fetchRemote(
-    account: IGitAccount | null,
     remote: IRemote,
     backgroundTask: boolean,
     progressCallback?: (fetchProgress: IFetchProgress) => void
   ): Promise<void> {
+    const repo = this.repository
     const retryAction: RetryAction = {
       type: RetryActionType.Fetch,
-      repository: this.repository,
+      repository: repo,
     }
-    await this.performFailableOperation(
-      () => fetchRepo(this.repository, account, remote, progressCallback),
+    const fetchSucceeded = await this.performFailableOperation(
+      async () => {
+        await fetchRepo(repo, remote, progressCallback, backgroundTask)
+        return true
+      },
       { backgroundTask, retryAction }
     )
+
+    // If the pull failed we shouldn't try to update the remote HEAD
+    // because there's a decent chance that it failed either because we
+    // didn't have the correct credentials (which we won't this time
+    // either) or because there's a network error which likely will
+    // persist for the next operation as well.
+    if (fetchSucceeded) {
+      // Updating the local HEAD symref isn't critical so we don't want
+      // to show an error message to the user and have them retry the
+      // entire pull operation if it fails.
+      await updateRemoteHEAD(repo, remote, backgroundTask).catch(e =>
+        log.error('Failed updating remote HEAD', e)
+      )
+    }
   }
 
   /**
@@ -1046,18 +1087,14 @@ export class GitStore extends BaseStore {
    * @param refspec - The association between a remote and local ref to use as
    *                  part of this action. Refer to git-scm for more
    *                  information on refspecs: https://www.git-scm.com/book/tr/v2/Git-Internals-The-Refspec
-   *
    */
-  public async fetchRefspec(
-    account: IGitAccount | null,
-    refspec: string
-  ): Promise<void> {
+  public async fetchRefspec(refspec: string): Promise<void> {
     // TODO: we should favour origin here
     const remotes = await getRemotes(this.repository)
 
     for (const remote of remotes) {
       await this.performFailableOperation(() =>
-        fetchRefspec(this.repository, account, remote, refspec)
+        fetchRefspec(this.repository, remote, refspec)
       )
     }
   }
@@ -1166,6 +1203,10 @@ export class GitStore extends BaseStore {
       : null
   }
 
+  public get desktopStashEntries(): ReadonlyMap<string, IStashEntry> {
+    return this._desktopStashEntries
+  }
+
   /** The total number of stash entries */
   public get stashEntryCount(): number {
     return this._stashEntryCount
@@ -1220,6 +1261,7 @@ export class GitStore extends BaseStore {
 
   public async loadRemotes(): Promise<void> {
     const remotes = await getRemotes(this.repository)
+    this._remotes = remotes
     this._defaultRemote = findDefaultRemote(remotes)
 
     const currentRemoteName =
@@ -1321,6 +1363,11 @@ export class GitStore extends BaseStore {
     return this._aheadBehind
   }
 
+  /** The list of configured remotes for the repository */
+  public get remotes() {
+    return this._remotes
+  }
+
   /**
    * The remote considered to be the "default" remote in the repository.
    *
@@ -1371,7 +1418,7 @@ export class GitStore extends BaseStore {
    *
    * @param coAuthors  Zero or more authors
    */
-  public setCoAuthors(coAuthors: ReadonlyArray<IAuthor>) {
+  public setCoAuthors(coAuthors: ReadonlyArray<Author>) {
     this._coAuthors = coAuthors
     this.emitUpdate()
   }
@@ -1563,11 +1610,10 @@ export class GitStore extends BaseStore {
   public async revertCommit(
     repository: Repository,
     commit: Commit,
-    account: IGitAccount | null,
     progressCallback?: (fetchProgress: IRevertProgress) => void
   ): Promise<void> {
     await this.performFailableOperation(() =>
-      revertCommit(repository, commit, account, progressCallback)
+      revertCommit(repository, commit, this.currentRemote, progressCallback)
     )
 
     this.emitUpdate()
@@ -1652,4 +1698,28 @@ export class GitStore extends BaseStore {
       await removeRemote(this.repository, remote.name)
     }
   }
+
+  /**
+   * Returns the commits associated with merging the comparison branch into the
+   * base branch.
+   */
+  public async getCommitsBetweenBranches(
+    baseBranch: Branch,
+    comparisonBranch: Branch
+  ): Promise<ReadonlyArray<Commit>> {
+    const revisionRange = revRange(baseBranch.name, comparisonBranch.name)
+    const commits = await this.performFailableOperation(() =>
+      getCommits(this.repository, revisionRange)
+    )
+
+    if (commits == null) {
+      return []
+    }
+
+    if (commits.length > 0) {
+      this.storeCommits(commits)
+    }
+
+    return commits
+  }
 }
diff --git a/app/src/lib/stores/helpers/background-fetcher.ts b/app/src/lib/stores/helpers/background-fetcher.ts
index 8dd6e468972..964b5a7868b 100644
--- a/app/src/lib/stores/helpers/background-fetcher.ts
+++ b/app/src/lib/stores/helpers/background-fetcher.ts
@@ -1,8 +1,8 @@
 import { Repository } from '../../../models/repository'
-import { Account } from '../../../models/account'
 import { GitHubRepository } from '../../../models/github-repository'
-import { API } from '../../api'
+import { API, getAccountForEndpoint } from '../../api'
 import { fatalError } from '../../fatal-error'
+import { AccountsStore } from '../accounts-store'
 
 /**
  * A default interval at which to automatically fetch repositories, if the
@@ -24,13 +24,6 @@ const SkewUpperBound = 30 * 1000
 
 /** The class which handles doing background fetches of the repository. */
 export class BackgroundFetcher {
-  private readonly repository: Repository
-  private readonly account: Account
-  private readonly fetch: (repository: Repository) => Promise<void>
-  private readonly shouldPerformFetch: (
-    repository: Repository
-  ) => Promise<boolean>
-
   /** The handle for our setTimeout invocation. */
   private timeoutHandle: number | null = null
 
@@ -38,16 +31,13 @@ export class BackgroundFetcher {
   private stopped = false
 
   public constructor(
-    repository: Repository,
-    account: Account,
-    fetch: (repository: Repository) => Promise<void>,
-    shouldPerformFetch: (repository: Repository) => Promise<boolean>
-  ) {
-    this.repository = repository
-    this.account = account
-    this.fetch = fetch
-    this.shouldPerformFetch = shouldPerformFetch
-  }
+    private readonly repository: Repository,
+    private readonly accountsStore: AccountsStore,
+    private readonly fetch: (repository: Repository) => Promise<void>,
+    private readonly shouldPerformFetch: (
+      repository: Repository
+    ) => Promise<boolean>
+  ) {}
 
   /** Start background fetching. */
   public start(withInitialSkew: boolean) {
@@ -129,21 +119,29 @@ export class BackgroundFetcher {
   private async getFetchInterval(
     repository: GitHubRepository
   ): Promise<number> {
-    const api = API.fromAccount(this.account)
+    const account = getAccountForEndpoint(
+      await this.accountsStore.getAll(),
+      repository.endpoint
+    )
 
     let interval = DefaultFetchInterval
-    try {
-      const pollInterval = await api.getFetchPollInterval(
-        repository.owner.login,
-        repository.name
-      )
-      if (pollInterval) {
-        interval = Math.max(pollInterval, MinimumInterval)
-      } else {
-        interval = DefaultFetchInterval
+
+    if (account) {
+      const api = API.fromAccount(account)
+
+      try {
+        const pollInterval = await api.getFetchPollInterval(
+          repository.owner.login,
+          repository.name
+        )
+        if (pollInterval) {
+          interval = Math.max(pollInterval, MinimumInterval)
+        } else {
+          interval = DefaultFetchInterval
+        }
+      } catch (e) {
+        log.error('Error fetching poll interval', e)
       }
-    } catch (e) {
-      log.error('Error fetching poll interval', e)
     }
 
     return interval + skewInterval()
diff --git a/app/src/lib/stores/helpers/branch-pruner.ts b/app/src/lib/stores/helpers/branch-pruner.ts
index e9ab9b64fc5..33b4b945a79 100644
--- a/app/src/lib/stores/helpers/branch-pruner.ts
+++ b/app/src/lib/stores/helpers/branch-pruner.ts
@@ -241,7 +241,9 @@ export class BranchPruner {
         log.info(`[BranchPruner] Branch '${branchName}' marked for deletion`)
       }
     }
-    this.onPruneCompleted(this.repository)
+    this.onPruneCompleted(this.repository).catch(e => {
+      log.error(`[BranchPruner] Error calling onPruneCompleted`, e)
+    })
   }
 }
 
diff --git a/app/src/lib/stores/helpers/create-tutorial-repository.ts b/app/src/lib/stores/helpers/create-tutorial-repository.ts
index dea55ed2208..ceacd9e94f5 100644
--- a/app/src/lib/stores/helpers/create-tutorial-repository.ts
+++ b/app/src/lib/stores/helpers/create-tutorial-repository.ts
@@ -73,7 +73,7 @@ async function pushRepo(
 
   const pushOpts = await executionOptionsWithProgress(
     {
-      env: await envForRemoteOperation(account, remote.url),
+      env: await envForRemoteOperation(remote.url),
     },
     new PushProgressParser(),
     progress => {
diff --git a/app/src/lib/stores/helpers/repository-indicator-updater.ts b/app/src/lib/stores/helpers/repository-indicator-updater.ts
index 85a231b888b..1a911f0ded4 100644
--- a/app/src/lib/stores/helpers/repository-indicator-updater.ts
+++ b/app/src/lib/stores/helpers/repository-indicator-updater.ts
@@ -125,7 +125,7 @@ export class RepositoryIndicatorUpdater {
 
   private clearRefreshTimeout() {
     if (this.refreshTimeoutId !== null) {
-      window.clearTimeout()
+      window.clearTimeout(this.refreshTimeoutId)
       this.refreshTimeoutId = null
     }
   }
diff --git a/app/src/lib/stores/helpers/tutorial-assessor.ts b/app/src/lib/stores/helpers/tutorial-assessor.ts
index ab52366eb3a..a80af641215 100644
--- a/app/src/lib/stores/helpers/tutorial-assessor.ts
+++ b/app/src/lib/stores/helpers/tutorial-assessor.ts
@@ -29,6 +29,8 @@ export class OnboardingTutorialAssessor {
   /** Is the tutorial currently paused? */
   private tutorialPaused: boolean = getBoolean(tutorialPausedKey, false)
 
+  private tutorialAnnounced: boolean = false
+
   public constructor(
     /** Method to call when we need to get the current editor */
     private getResolvedExternalEditor: () => string | null
@@ -61,8 +63,10 @@ export class OnboardingTutorialAssessor {
       return TutorialStep.PushBranch
     } else if (!this.pullRequestCreated(repositoryState)) {
       return TutorialStep.OpenPullRequest
-    } else {
+    } else if (!this.tutorialAnnounced) {
       return TutorialStep.AllDone
+    } else {
+      return TutorialStep.Announced
     }
   }
 
@@ -145,6 +149,10 @@ export class OnboardingTutorialAssessor {
     setBoolean(pullRequestStepCompleteKey, this.prStepComplete)
   }
 
+  public markTutorialCompletionAsAnnounced = () => {
+    this.tutorialAnnounced = true
+  }
+
   /**
    * Call when a new tutorial repository is created
    *
diff --git a/app/src/lib/stores/notifications-debug-store.ts b/app/src/lib/stores/notifications-debug-store.ts
new file mode 100644
index 00000000000..20355c69236
--- /dev/null
+++ b/app/src/lib/stores/notifications-debug-store.ts
@@ -0,0 +1,249 @@
+import { shortenSHA } from '../../models/commit'
+import { GitHubRepository } from '../../models/github-repository'
+import { PullRequest, getPullRequestCommitRef } from '../../models/pull-request'
+import { RepositoryWithGitHubRepository } from '../../models/repository'
+import { Dispatcher, defaultErrorHandler } from '../../ui/dispatcher'
+import { API, APICheckConclusion, IAPIComment } from '../api'
+import { showNotification } from '../notifications/show-notification'
+import {
+  isValidNotificationPullRequestReview,
+  ValidNotificationPullRequestReview,
+} from '../valid-notification-pull-request-review'
+import { AccountsStore } from './accounts-store'
+import { IDesktopChecksFailedAliveEvent } from './alive-store'
+import { NotificationsStore } from './notifications-store'
+import { PullRequestCoordinator } from './pull-request-coordinator'
+
+/**
+ * This class allows the TestNotifications dialog to fetch real data to simulate
+ * notifications.
+ */
+export class NotificationsDebugStore {
+  private cachedComments: Map<number, ReadonlyArray<IAPIComment>> = new Map()
+  private cachedReviews: Map<
+    number,
+    ReadonlyArray<ValidNotificationPullRequestReview>
+  > = new Map()
+
+  public constructor(
+    private readonly accountsStore: AccountsStore,
+    private readonly notificationsStore: NotificationsStore,
+    private readonly pullRequestCoordinator: PullRequestCoordinator
+  ) {}
+
+  private async getAccountForRepository(repository: GitHubRepository) {
+    const { endpoint } = repository
+
+    const accounts = await this.accountsStore.getAll()
+    return accounts.find(a => a.endpoint === endpoint) ?? null
+  }
+
+  private async getAPIForRepository(repository: GitHubRepository) {
+    const account = await this.getAccountForRepository(repository)
+
+    if (account === null) {
+      return null
+    }
+
+    return API.fromAccount(account)
+  }
+
+  /** Fetch all pull requests for the given repository. */
+  public async getPullRequests(
+    repository: RepositoryWithGitHubRepository,
+    options: { filterByComments?: boolean; filterByReviews?: boolean }
+  ) {
+    const prs = await this.pullRequestCoordinator.getAllPullRequests(repository)
+
+    if (!options.filterByComments && !options.filterByReviews) {
+      return prs
+    }
+
+    const filteredPrs = []
+    for (const pr of prs) {
+      if (options.filterByComments) {
+        const cachedComments = this.cachedComments.get(pr.pullRequestNumber)
+
+        if (cachedComments && cachedComments.length > 0) {
+          filteredPrs.push(pr)
+          continue
+        }
+
+        const comments = await this.getPullRequestComments(
+          repository,
+          pr.pullRequestNumber
+        )
+        this.cachedComments.set(pr.pullRequestNumber, comments)
+
+        if (comments.length > 0) {
+          filteredPrs.push(pr)
+        }
+      }
+
+      if (options.filterByReviews) {
+        const cachedReviews = this.cachedReviews.get(pr.pullRequestNumber)
+
+        if (cachedReviews && cachedReviews.length > 0) {
+          filteredPrs.push(pr)
+          continue
+        }
+
+        const reviews = await this.getPullRequestReviews(
+          repository,
+          pr.pullRequestNumber
+        )
+
+        this.cachedReviews.set(pr.pullRequestNumber, reviews)
+
+        if (reviews.length > 0) {
+          filteredPrs.push(pr)
+        }
+      }
+    }
+
+    return filteredPrs
+  }
+
+  /** Fetch all reviews for the given pull request. */
+  public async getPullRequestReviews(
+    repository: RepositoryWithGitHubRepository,
+    pullRequestNumber: number
+  ) {
+    const cachedReviews = this.cachedReviews.get(pullRequestNumber)
+    if (cachedReviews) {
+      return cachedReviews
+    }
+
+    const api = await this.getAPIForRepository(repository.gitHubRepository)
+    if (api === null) {
+      return []
+    }
+
+    const ghRepository = repository.gitHubRepository
+
+    const reviews = await api.fetchPullRequestReviews(
+      ghRepository.owner.login,
+      ghRepository.name,
+      pullRequestNumber.toString()
+    )
+
+    return reviews.filter(isValidNotificationPullRequestReview)
+  }
+
+  /** Fetch all comments (issue and review comments) for the given pull request. */
+  public async getPullRequestComments(
+    repository: RepositoryWithGitHubRepository,
+    pullRequestNumber: number
+  ) {
+    const cachedComments = this.cachedComments.get(pullRequestNumber)
+    if (cachedComments) {
+      return cachedComments
+    }
+
+    const api = await this.getAPIForRepository(repository.gitHubRepository)
+    if (api === null) {
+      return []
+    }
+
+    const ghRepository = repository.gitHubRepository
+
+    const issueComments = await api.fetchIssueComments(
+      ghRepository.owner.login,
+      ghRepository.name,
+      pullRequestNumber.toString()
+    )
+
+    const reviewComments = await api.fetchPullRequestComments(
+      ghRepository.owner.login,
+      ghRepository.name,
+      pullRequestNumber.toString()
+    )
+
+    return [...issueComments, ...reviewComments]
+  }
+
+  /** Simulate a notification for the given pull request review. */
+  public simulatePullRequestReviewNotification(
+    repository: GitHubRepository,
+    pullRequest: PullRequest,
+    review: ValidNotificationPullRequestReview
+  ) {
+    this.notificationsStore.simulateAliveEvent({
+      type: 'pr-review-submit',
+      timestamp: new Date(review.submitted_at).getTime(),
+      owner: repository.owner.login,
+      repo: repository.name,
+      pull_request_number: pullRequest.pullRequestNumber,
+      state: review.state,
+      review_id: review.id.toString(),
+    })
+  }
+
+  /** Simulate a notification for the given pull request comment. */
+  public simulatePullRequestCommentNotification(
+    repository: GitHubRepository,
+    pullRequest: PullRequest,
+    comment: IAPIComment,
+    isIssueComment: boolean
+  ) {
+    this.notificationsStore.simulateAliveEvent({
+      type: 'pr-comment',
+      subtype: isIssueComment ? 'issue-comment' : 'review-comment',
+      timestamp: new Date(comment.created_at).getTime(),
+      owner: repository.owner.login,
+      repo: repository.name,
+      pull_request_number: pullRequest.pullRequestNumber,
+      comment_id: comment.id.toString(),
+    })
+  }
+
+  /** Simulate a notification for pull request checks failure for the given PR. */
+  public async simulatePullRequestChecksFailed(
+    repository: RepositoryWithGitHubRepository,
+    pullRequest: PullRequest,
+    dispatcher: Dispatcher
+  ) {
+    const commitSha = pullRequest.head.sha
+    const commitRef = getPullRequestCommitRef(pullRequest.pullRequestNumber)
+    const checks = await this.notificationsStore.getChecksForRef(
+      repository.gitHubRepository,
+      commitRef
+    )
+
+    if (!checks) {
+      defaultErrorHandler(new Error('Could not get checks for PR'), dispatcher)
+      return
+    }
+
+    const event: IDesktopChecksFailedAliveEvent = {
+      type: 'pr-checks-failed',
+      timestamp: new Date(pullRequest.created).getTime(),
+      owner: repository.gitHubRepository.owner.login,
+      repo: repository.name,
+      pull_request_number: pullRequest.pullRequestNumber,
+      check_suite_id: checks[0].checkSuiteId ?? 0,
+      commit_sha: commitSha,
+    }
+
+    const numberOfFailedChecks = checks.filter(
+      check => check.conclusion === APICheckConclusion.Failure
+    ).length
+
+    const pluralChecks =
+      numberOfFailedChecks === 1 ? 'check was' : 'checks were'
+
+    const shortSHA = shortenSHA(commitSha)
+    const title = 'Pull Request checks failed'
+    const body = `${pullRequest.title} #${pullRequest.pullRequestNumber} (${shortSHA})\n${numberOfFailedChecks} ${pluralChecks} not successful.`
+    const onClick = () => {
+      dispatcher.onChecksFailedNotification(repository, pullRequest, checks)
+    }
+
+    showNotification({
+      title,
+      body,
+      userInfo: event,
+      onClick,
+    })
+  }
+}
diff --git a/app/src/lib/stores/notifications-store.ts b/app/src/lib/stores/notifications-store.ts
index 5dd5b418da2..60453ae270b 100644
--- a/app/src/lib/stores/notifications-store.ts
+++ b/app/src/lib/stores/notifications-store.ts
@@ -1,53 +1,59 @@
+import { NotificationCallback } from 'desktop-notifications/dist/notification-callback'
+import { Commit, shortenSHA } from '../../models/commit'
+import { GitHubRepository } from '../../models/github-repository'
+import { PullRequest, getPullRequestCommitRef } from '../../models/pull-request'
 import {
   Repository,
-  isRepositoryWithGitHubRepository,
   RepositoryWithGitHubRepository,
+  getForkContributionTarget,
+  isRepositoryWithForkedGitHubRepository,
+  isRepositoryWithGitHubRepository,
 } from '../../models/repository'
-import { PullRequest } from '../../models/pull-request'
-import { API, APICheckConclusion } from '../api'
+import { ForkContributionTarget } from '../../models/workflow-preferences'
+import { getVerbForPullRequestReview } from '../../ui/notifications/pull-request-review-helpers'
+import { API, APICheckConclusion, IAPIComment } from '../api'
 import {
-  createCombinedCheckFromChecks,
-  getLatestCheckRunsByName,
-  apiStatusToRefCheck,
-  apiCheckRunToRefCheck,
   IRefCheck,
+  apiCheckRunToRefCheck,
+  apiStatusToRefCheck,
+  createCombinedCheckFromChecks,
+  getLatestCheckRunsById,
 } from '../ci-checks/ci-checks'
-import { AccountsStore } from './accounts-store'
 import { getCommit } from '../git'
-import { GitHubRepository } from '../../models/github-repository'
-import { PullRequestCoordinator } from './pull-request-coordinator'
-import { Commit } from '../../models/commit'
-import {
-  AliveStore,
-  DesktopAliveEvent,
-  IDesktopChecksFailedAliveEvent,
-  IDesktopPullRequestReviewSubmitAliveEvent,
-} from './alive-store'
-import { setBoolean, getBoolean } from '../local-storage'
+import { getBoolean, setBoolean } from '../local-storage'
 import { showNotification } from '../notifications/show-notification'
 import { StatsStore } from '../stats'
 import { truncateWithEllipsis } from '../truncate-with-ellipsis'
-import { getVerbForPullRequestReview } from '../../ui/notifications/pull-request-review-helpers'
-import { enablePullRequestReviewNotifications } from '../feature-flag'
 import {
-  isValidNotificationPullRequestReview,
   ValidNotificationPullRequestReview,
+  isValidNotificationPullRequestReview,
 } from '../valid-notification-pull-request-review'
-import { NotificationCallback } from 'desktop-notifications/dist/notification-callback'
+import { AccountsStore } from './accounts-store'
+import {
+  AliveStore,
+  DesktopAliveEvent,
+  IDesktopChecksFailedAliveEvent,
+  IDesktopPullRequestCommentAliveEvent,
+  IDesktopPullRequestReviewSubmitAliveEvent,
+} from './alive-store'
+import { PullRequestCoordinator } from './pull-request-coordinator'
 
-type OnChecksFailedCallback = (
+export type OnChecksFailedCallback = (
   repository: RepositoryWithGitHubRepository,
   pullRequest: PullRequest,
-  commitMessage: string,
-  commitSha: string,
   checkRuns: ReadonlyArray<IRefCheck>
 ) => void
 
 type OnPullRequestReviewSubmitCallback = (
   repository: RepositoryWithGitHubRepository,
   pullRequest: PullRequest,
-  review: ValidNotificationPullRequestReview,
-  numberOfComments: number
+  review: ValidNotificationPullRequestReview
+) => void
+
+type OnPullRequestCommentCallback = (
+  repository: RepositoryWithGitHubRepository,
+  pullRequest: PullRequest,
+  comment: IAPIComment
 ) => void
 
 /**
@@ -67,11 +73,15 @@ export function getNotificationsEnabled() {
  */
 export class NotificationsStore {
   private repository: RepositoryWithGitHubRepository | null = null
+  private recentRepositories: ReadonlyArray<Repository> = []
   private onChecksFailedCallback: OnChecksFailedCallback | null = null
   private onPullRequestReviewSubmitCallback: OnPullRequestReviewSubmitCallback | null =
     null
+  private onPullRequestCommentCallback: OnPullRequestCommentCallback | null =
+    null
   private cachedCommits: Map<string, Commit> = new Map()
   private skipCommitShas: Set<string> = new Set()
+  private skipCheckRuns: Set<number> = new Set()
 
   public constructor(
     private readonly accountsStore: AccountsStore,
@@ -101,6 +111,12 @@ export class NotificationsStore {
   public onNotificationEventReceived: NotificationCallback<DesktopAliveEvent> =
     async (event, id, userInfo) => this.handleAliveEvent(userInfo, true)
 
+  public simulateAliveEvent(event: DesktopAliveEvent) {
+    if (__DEV__ || __RELEASE_CHANNEL__ === 'test') {
+      this.handleAliveEvent(event, false)
+    }
+  }
+
   private async handleAliveEvent(
     e: DesktopAliveEvent,
     skipNotification: boolean
@@ -110,22 +126,112 @@ export class NotificationsStore {
         return this.handleChecksFailedEvent(e, skipNotification)
       case 'pr-review-submit':
         return this.handlePullRequestReviewSubmitEvent(e, skipNotification)
+      case 'pr-comment':
+        return this.handlePullRequestCommentEvent(e, skipNotification)
     }
   }
 
-  private async handlePullRequestReviewSubmitEvent(
-    event: IDesktopPullRequestReviewSubmitAliveEvent,
+  private async handlePullRequestCommentEvent(
+    event: IDesktopPullRequestCommentAliveEvent,
     skipNotification: boolean
   ) {
-    if (!enablePullRequestReviewNotifications()) {
+    const repository = this.repository
+    if (repository === null) {
       return
     }
 
+    if (!this.isValidRepositoryForEvent(repository, event)) {
+      if (this.isRecentRepositoryEvent(event)) {
+        this.statsStore.increment(
+          'pullRequestCommentNotificationFromRecentRepoCount'
+        )
+      } else {
+        this.statsStore.increment(
+          'pullRequestCommentNotificationFromNonRecentRepoCount'
+        )
+      }
+      return
+    }
+
+    const pullRequests = await this.pullRequestCoordinator.getAllPullRequests(
+      repository
+    )
+    const pullRequest = pullRequests.find(
+      pr => pr.pullRequestNumber === event.pull_request_number
+    )
+
+    // If the PR is not in cache, it probably means the user didn't work on it
+    // recently, so we don't want to show a notification.
+    if (pullRequest === undefined) {
+      return
+    }
+
+    // Fetch comment from API depending on event subtype
+    const api = await this.getAPIForRepository(repository.gitHubRepository)
+    if (api === null) {
+      return
+    }
+
+    const comment =
+      event.subtype === 'issue-comment'
+        ? await api.fetchIssueComment(event.owner, event.repo, event.comment_id)
+        : await api.fetchPullRequestReviewComment(
+            event.owner,
+            event.repo,
+            event.comment_id
+          )
+
+    if (comment === null) {
+      return
+    }
+
+    const title = `@${comment.user.login} commented on your pull request`
+    const body = `${pullRequest.title} #${
+      pullRequest.pullRequestNumber
+    }\n${truncateWithEllipsis(comment.body, 50)}`
+    const onClick = () => {
+      this.statsStore.increment('pullRequestCommentNotificationClicked')
+
+      this.onPullRequestCommentCallback?.(repository, pullRequest, comment)
+    }
+
+    if (skipNotification) {
+      onClick()
+      return
+    }
+
+    showNotification({
+      title,
+      body,
+      userInfo: event,
+      onClick,
+    })
+
+    this.statsStore.increment('pullRequestCommentNotificationCount')
+  }
+
+  private async handlePullRequestReviewSubmitEvent(
+    event: IDesktopPullRequestReviewSubmitAliveEvent,
+    skipNotification: boolean
+  ) {
     const repository = this.repository
     if (repository === null) {
       return
     }
 
+    if (!this.isValidRepositoryForEvent(repository, event)) {
+      if (this.isRecentRepositoryEvent(event)) {
+        this.statsStore.increment(
+          'pullRequestReviewNotificationFromRecentRepoCount'
+        )
+      } else {
+        this.statsStore.increment(
+          'pullRequestReviewNotificationFromNonRecentRepoCount'
+        )
+      }
+      return
+    }
+
     const pullRequests = await this.pullRequestCoordinator.getAllPullRequests(
       repository
     )
@@ -139,16 +245,17 @@ export class NotificationsStore {
       return
     }
 
-    const { gitHubRepository } = repository
-    const api = await this.getAPIForRepository(gitHubRepository)
+    // PR reviews must be retrieved from the repository the PR belongs to
+    const pullsRepository = this.getContributingRepository(repository)
+    const api = await this.getAPIForRepository(pullsRepository)
 
     if (api === null) {
       return
     }
 
     const review = await api.fetchPullRequestReview(
-      gitHubRepository.owner.login,
-      gitHubRepository.name,
+      pullsRepository.owner.login,
+      pullsRepository.name,
       pullRequest.pullRequestNumber.toString(),
       event.review_id
     )
@@ -165,12 +272,7 @@ export class NotificationsStore {
     const onClick = () => {
       this.statsStore.recordPullRequestReviewNotificationClicked(review.state)
 
-      this.onPullRequestReviewSubmitCallback?.(
-        repository,
-        pullRequest,
-        review,
-        event.number_of_comments
-      )
+      this.onPullRequestReviewSubmitCallback?.(repository, pullRequest, review)
     }
 
     if (skipNotification) {
@@ -197,6 +299,17 @@ export class NotificationsStore {
       return
     }
 
+    if (!this.isValidRepositoryForEvent(repository, event)) {
+      if (this.isRecentRepositoryEvent(event)) {
+        this.statsStore.increment('checksFailedNotificationFromRecentRepoCount')
+      } else {
+        this.statsStore.increment(
+          'checksFailedNotificationFromNonRecentRepoCount'
+        )
+      }
+      return
+    }
+
     const pullRequests = await this.pullRequestCoordinator.getAllPullRequests(
       repository
     )
@@ -239,11 +352,29 @@ export class NotificationsStore {
       return
     }
 
-    const checks = await this.getChecksForRef(repository, pullRequest.head.ref)
+    // Checks must be retrieved from the repository the PR belongs to
+    const checksRepository = this.getContributingRepository(repository)
+
+    const checks = await this.getChecksForRef(
+      checksRepository,
+      getPullRequestCommitRef(pullRequest.pullRequestNumber)
+    )
     if (checks === null) {
       return
     }
 
+    // Make sure we haven't shown a notification for the check runs of this
+    // check suite already.
+    // If one of more jobs are re-run, the check suite will have the same ID
+    // but different check runs.
+    const checkSuiteCheckRunIds = checks.flatMap(check =>
+      check.checkSuiteId === event.check_suite_id ? check.id : []
+    )
+
+    if (checkSuiteCheckRunIds.every(id => this.skipCheckRuns.has(id))) {
+      return
+    }
+
     const numberOfFailedChecks = checks.filter(
       check => check.conclusion === APICheckConclusion.Failure
     ).length
@@ -255,22 +386,22 @@ export class NotificationsStore {
       return
     }
 
+    // Ignore any remaining notification for check runs that started along
+    // with this one.
+    for (const check of checks) {
+      this.skipCheckRuns.add(check.id)
+    }
+
     const pluralChecks =
       numberOfFailedChecks === 1 ? 'check was' : 'checks were'
 
-    const shortSHA = commitSHA.slice(0, 9)
+    const shortSHA = shortenSHA(commitSHA)
     const title = 'Pull Request checks failed'
     const body = `${pullRequest.title} #${pullRequest.pullRequestNumber} (${shortSHA})\n${numberOfFailedChecks} ${pluralChecks} not successful.`
     const onClick = () => {
-      this.statsStore.recordChecksFailedNotificationClicked()
-
-      this.onChecksFailedCallback?.(
-        repository,
-        pullRequest,
-        commit.summary,
-        commitSHA,
-        checks
-      )
+      this.statsStore.increment('checksFailedNotificationClicked')
+
+      this.onChecksFailedCallback?.(repository, pullRequest, checks)
     }
 
     if (skipNotification) {
@@ -285,7 +416,51 @@ export class NotificationsStore {
       onClick,
     })
 
-    this.statsStore.recordChecksFailedNotificationShown()
+    this.statsStore.increment('checksFailedNotificationCount')
+  }
+
+  private getContributingRepository(
+    repository: RepositoryWithGitHubRepository
+  ) {
+    const isForkContributingToParent =
+      isRepositoryWithForkedGitHubRepository(repository) &&
+      getForkContributionTarget(repository) === ForkContributionTarget.Parent
+
+    return isForkContributingToParent
+      ? repository.gitHubRepository.parent
+      : repository.gitHubRepository
+  }
+
+  private isValidRepositoryForEvent(
+    repository: RepositoryWithGitHubRepository,
+    event: DesktopAliveEvent
+  ) {
+    // If it's a fork and set to contribute to the parent repository, try to
+    // match the parent repository.
+    if (
+      isRepositoryWithForkedGitHubRepository(repository) &&
+      getForkContributionTarget(repository) === ForkContributionTarget.Parent
+    ) {
+      const parentRepository = repository.gitHubRepository.parent
+      return (
+        parentRepository.owner.login === event.owner &&
+        parentRepository.name === event.repo
+      )
+    }
+
+    const ghRepository = repository.gitHubRepository
+    return (
+      ghRepository.owner.login === event.owner &&
+      ghRepository.name === event.repo
+    )
+  }
+
+  private isRecentRepositoryEvent(event: DesktopAliveEvent) {
+    return this.recentRepositories.some(
+      r =>
+        isRepositoryWithGitHubRepository(r) &&
+        this.isValidRepositoryForEvent(r, event)
+    )
   }
 
   /**
@@ -293,9 +468,29 @@ export class NotificationsStore {
    * notifications for the currently selected repository will be shown.
    */
   public selectRepository(repository: Repository) {
+    if (repository.hash === this.repository?.hash) {
+      return
+    }
+
     this.repository = isRepositoryWithGitHubRepository(repository)
       ? repository
       : null
+    this.resetCache()
+  }
+
+  private resetCache() {
+    this.cachedCommits.clear()
+    this.skipCommitShas.clear()
+    this.skipCheckRuns.clear()
+  }
+
+  /**
+   * For stats purposes, we need to know which are the recent repositories. This
+   * will allow the notification store when a notification is related to one of
+   * these repositories.
+   */
+  public setRecentRepositories(repositories: ReadonlyArray<Repository>) {
+    this.recentRepositories = repositories
   }
 
   private async getAccountForRepository(repository: GitHubRepository) {
@@ -315,22 +510,20 @@ export class NotificationsStore {
     return API.fromAccount(account)
   }
 
-  private async getChecksForRef(
-    repository: RepositoryWithGitHubRepository,
-    ref: string
-  ) {
-    const { gitHubRepository } = repository
-    const { owner, name } = gitHubRepository
+  public async getChecksForRef(repository: GitHubRepository, ref: string) {
+    const { owner, name } = repository
 
-    const api = await this.getAPIForRepository(gitHubRepository)
+    const api = await this.getAPIForRepository(repository)
 
     if (api === null) {
       return null
     }
 
+    // Hit these API endpoints reloading the cache to make sure we have the
+    // latest data at the time the notification is received.
     const [statuses, checkRuns] = await Promise.all([
-      api.fetchCombinedRefStatus(owner.login, name, ref),
-      api.fetchRefCheckRuns(owner.login, name, ref),
+      api.fetchCombinedRefStatus(owner.login, name, ref, true),
+      api.fetchRefCheckRuns(owner.login, name, ref, true),
     ])
 
     const checks = new Array<IRefCheck>()
@@ -344,9 +537,7 @@ export class NotificationsStore {
     }
 
     if (checkRuns !== null) {
-      const latestCheckRunsByName = getLatestCheckRunsByName(
-        checkRuns.check_runs
-      )
+      const latestCheckRunsByName = getLatestCheckRunsById(checkRuns.check_runs)
       checks.push(...latestCheckRunsByName.map(apiCheckRunToRefCheck))
     }
 
@@ -370,4 +561,11 @@ export class NotificationsStore {
   ) {
     this.onPullRequestReviewSubmitCallback = callback
   }
+
+  /** Observe when the user reacted to a "PR comment" notification. */
+  public onPullRequestCommentNotification(
+    callback: OnPullRequestCommentCallback
+  ) {
+    this.onPullRequestCommentCallback = callback
+  }
 }
diff --git a/app/src/lib/stores/pull-request-coordinator.ts b/app/src/lib/stores/pull-request-coordinator.ts
index 3898757abeb..6bd4c6c3f56 100644
--- a/app/src/lib/stores/pull-request-coordinator.ts
+++ b/app/src/lib/stores/pull-request-coordinator.ts
@@ -80,7 +80,6 @@ export class PullRequestCoordinator {
    *    the `Repository`)
    *  * the parent GitHub repo, if the `Repository` has one (the
    *    `upstream` remote for the `Repository`)
-   *
    */
   public onPullRequestsChanged(
     fn: (
@@ -119,7 +118,6 @@ export class PullRequestCoordinator {
    *    the `Repository`)
    *  * the parent GitHub repo, if the `Repository` has one (the
    *    `upstream` remote for the `Repository`)
-   *
    */
   public onIsLoadingPullRequests(
     fn: (
diff --git a/app/src/lib/stores/repositories-store.ts b/app/src/lib/stores/repositories-store.ts
index 466d70c9203..8ecf70fa22e 100644
--- a/app/src/lib/stores/repositories-store.ts
+++ b/app/src/lib/stores/repositories-store.ts
@@ -28,7 +28,6 @@ import { WorkflowPreferences } from '../../models/workflow-preferences'
 import { clearTagsToPush } from './helpers/tags-to-push-storage'
 import { IMatchedGitHubRepository } from '../repository-matching'
 import { shallowEquals } from '../equality'
-import { enableRepositoryAliases } from '../feature-flag'
 
 type AddRepositoryOptions = {
   missing?: boolean
@@ -130,7 +129,6 @@ export class RepositoriesStore extends TypedBaseStore<
       repo.id,
       repo.private,
       repo.htmlURL,
-      repo.defaultBranch,
       repo.cloneURL,
       repo.issuesEnabled,
       repo.isArchived,
@@ -152,7 +150,7 @@ export class RepositoriesStore extends TypedBaseStore<
         ? await this.findGitHubRepositoryByID(repo.gitHubRepositoryID)
         : await Promise.resolve(null), // Dexie gets confused if we return null
       repo.missing,
-      enableRepositoryAliases() ? repo.alias : null,
+      repo.alias,
       repo.workflowPreferences,
       repo.isTutorialRepository
     )
@@ -449,7 +447,6 @@ export class RepositoriesStore extends TypedBaseStore<
 
         const skeletonRepo: IDatabaseGitHubRepository = {
           cloneURL: null,
-          defaultBranch: null,
           htmlURL: null,
           lastPruneDate: null,
           name: match.name,
@@ -557,7 +554,6 @@ export class RepositoriesStore extends TypedBaseStore<
       name: gitHubRepository.name,
       private: gitHubRepository.private,
       htmlURL: gitHubRepository.html_url,
-      defaultBranch: gitHubRepository.default_branch,
       cloneURL: gitHubRepository.clone_url,
       parentID,
       lastPruneDate: existingRepo?.lastPruneDate ?? null,
diff --git a/app/src/lib/stores/repository-state-cache.ts b/app/src/lib/stores/repository-state-cache.ts
index d7e2586657b..04e37e0faaa 100644
--- a/app/src/lib/stores/repository-state-cache.ts
+++ b/app/src/lib/stores/repository-state-cache.ts
@@ -18,14 +18,19 @@ import {
   ChangesSelectionKind,
   IMultiCommitOperationUndoState,
   IMultiCommitOperationState,
+  IPullRequestState,
 } from '../app-state'
 import { merge } from '../merge'
 import { DefaultCommitMessage } from '../../models/commit-message'
 import { sendNonFatalException } from '../helpers/non-fatal-exception'
+import { StatsStore } from '../stats'
+import { RepoRulesInfo } from '../../models/repo-rules'
 
 export class RepositoryStateCache {
   private readonly repositoryState = new Map<string, IRepositoryState>()
 
+  public constructor(private readonly statsStore: StatsStore) {}
+
   /** Get the state for the repository. */
   public get(repository: Repository): IRepositoryState {
     const existing = this.repositoryState.get(repository.hash)
@@ -84,10 +89,47 @@ export class RepositoryStateCache {
     this.update(repository, state => {
       const changesState = state.changesState
       const newState = merge(changesState, fn(changesState))
+      this.recordSubmoduleDiffViewedFromChangesListIfNeeded(
+        changesState,
+        newState
+      )
       return { changesState: newState }
     })
   }
 
+  private recordSubmoduleDiffViewedFromChangesListIfNeeded(
+    oldState: IChangesState,
+    newState: IChangesState
+  ) {
+    // Make sure only one file is selected from the current commit
+    if (
+      newState.selection.kind !== ChangesSelectionKind.WorkingDirectory ||
+      newState.selection.selectedFileIDs.length !== 1
+    ) {
+      return
+    }
+
+    const newFile = newState.workingDirectory.findFileWithID(
+      newState.selection.selectedFileIDs[0]
+    )
+
+    // Make sure that file is a submodule
+    if (newFile === null || newFile.status.submoduleStatus === undefined) {
+      return
+    }
+
+    // If the old state was also a submodule, make sure it's a different one
+    if (
+      oldState.selection.kind === ChangesSelectionKind.WorkingDirectory &&
+      oldState.selection.selectedFileIDs.length === 1 &&
+      oldState.selection.selectedFileIDs[0] === newFile.id
+    ) {
+      return
+    }
+
+    this.statsStore.increment('submoduleDiffViewedFromChangesListCount')
+  }
+
   public updateCommitSelection<K extends keyof ICommitSelection>(
     repository: Repository,
     fn: (state: ICommitSelection) => Pick<ICommitSelection, K>
@@ -95,10 +137,28 @@ export class RepositoryStateCache {
     this.update(repository, state => {
       const { commitSelection } = state
       const newState = merge(commitSelection, fn(commitSelection))
+      this.recordSubmoduleDiffViewedFromHistoryIfNeeded(
+        commitSelection,
+        newState
+      )
       return { commitSelection: newState }
     })
   }
 
+  private recordSubmoduleDiffViewedFromHistoryIfNeeded(
+    oldState: ICommitSelection,
+    newState: ICommitSelection
+  ) {
+    // Just detect when the app is gonna show the diff of a different submodule
+    // and record that in the stats.
+    if (
+      oldState.file?.id !== newState.file?.id &&
+      newState.file?.status.submoduleStatus !== undefined
+    ) {
+      this.statsStore.increment('submoduleDiffViewedFromHistoryCount')
+    }
+  }
+
   public updateBranchesState<K extends keyof IBranchesState>(
     repository: Repository,
     fn: (branchesState: IBranchesState) => Pick<IBranchesState, K>
@@ -172,12 +232,71 @@ export class RepositoryStateCache {
       return { multiCommitOperationState: null }
     })
   }
+
+  public initializePullRequestState(
+    repository: Repository,
+    pullRequestState: IPullRequestState | null
+  ) {
+    this.update(repository, () => {
+      return { pullRequestState }
+    })
+  }
+
+  private sendPullRequestStateNotExistsException() {
+    sendNonFatalException(
+      'PullRequestState',
+      new Error(`Cannot update a null pull request state`)
+    )
+  }
+
+  public updatePullRequestState<K extends keyof IPullRequestState>(
+    repository: Repository,
+    fn: (pullRequestState: IPullRequestState) => Pick<IPullRequestState, K>
+  ) {
+    const { pullRequestState } = this.get(repository)
+    if (pullRequestState === null) {
+      this.sendPullRequestStateNotExistsException()
+      return
+    }
+
+    this.update(repository, state => {
+      const oldState = state.pullRequestState
+      const pullRequestState =
+        oldState === null ? null : merge(oldState, fn(oldState))
+      return { pullRequestState }
+    })
+  }
+
+  public updatePullRequestCommitSelection<K extends keyof ICommitSelection>(
+    repository: Repository,
+    fn: (prCommitSelection: ICommitSelection) => Pick<ICommitSelection, K>
+  ) {
+    const { pullRequestState } = this.get(repository)
+    if (pullRequestState === null) {
+      this.sendPullRequestStateNotExistsException()
+      return
+    }
+
+    const oldState = pullRequestState.commitSelection
+    const commitSelection =
+      oldState === null ? null : merge(oldState, fn(oldState))
+    this.updatePullRequestState(repository, () => ({
+      commitSelection,
+    }))
+  }
+
+  public clearPullRequestState(repository: Repository) {
+    this.update(repository, () => {
+      return { pullRequestState: null }
+    })
+  }
 }
 
 function getInitialRepositoryState(): IRepositoryState {
   return {
     commitSelection: {
       shas: [],
+      shasInDiff: [],
       isContiguous: true,
       file: null,
       changesetData: { files: [], linesAdded: 0, linesDeleted: 0 },
@@ -198,11 +317,13 @@ function getInitialRepositoryState(): IRepositoryState {
       conflictState: null,
       stashEntry: null,
       currentBranchProtected: false,
+      currentRepoRulesInfo: new RepoRulesInfo(),
     },
     selectedSection: RepositorySectionTab.Changes,
     branchesState: {
       tip: { kind: TipState.Unknown },
       defaultBranch: null,
+      upstreamDefaultBranch: null,
       allBranches: new Array<Branch>(),
       recentBranches: new Array<Branch>(),
       openPullRequests: new Array<PullRequest>(),
@@ -219,10 +340,12 @@ function getInitialRepositoryState(): IRepositoryState {
       showBranchList: false,
       filterText: '',
       commitSHAs: [],
+      shasToHighlight: [],
       branches: new Array<Branch>(),
       recentBranches: new Array<Branch>(),
       defaultBranch: null,
     },
+    pullRequestState: null,
     commitAuthor: null,
     commitLookup: new Map<string, Commit>(),
     localCommitSHAs: [],
diff --git a/app/src/lib/stores/sign-in-store.ts b/app/src/lib/stores/sign-in-store.ts
index cd981ad7666..fa243b2145a 100644
--- a/app/src/lib/stores/sign-in-store.ts
+++ b/app/src/lib/stores/sign-in-store.ts
@@ -1,7 +1,6 @@
 import { Disposable } from 'event-kit'
 import { Account } from '../../models/account'
-import { assertNever, fatalError } from '../fatal-error'
-import { askUserToOAuth } from '../../lib/oauth'
+import { fatalError } from '../fatal-error'
 import {
   validateURL,
   InvalidURLErrorName,
@@ -9,27 +8,19 @@ import {
 } from '../../ui/lib/enterprise-validate-url'
 
 import {
-  createAuthorization,
-  AuthorizationResponse,
   fetchUser,
-  AuthorizationResponseKind,
-  getHTMLURL,
   getDotComAPIEndpoint,
   getEnterpriseAPIURL,
-  fetchMetadata,
+  requestOAuthToken,
+  getOAuthAuthorizationURL,
 } from '../../lib/api'
 
-import { AuthenticationMode } from '../../lib/2fa'
-
-import { minimumSupportedEnterpriseVersion } from '../../lib/enterprise'
 import { TypedBaseStore } from './base-store'
-import { timeout } from '../promise'
-
-function getUnverifiedUserErrorMessage(login: string): string {
-  return `Unable to authenticate. The account ${login} is lacking a verified email address. Please sign in to GitHub.com, confirm your email address in the Emails section under Personal settings, and try again.`
-}
-
-const EnterpriseTooOldMessage = `The GitHub Enterprise version does not support GitHub Desktop. Talk to your server's administrator about upgrading to the latest version of GitHub Enterprise.`
+import uuid from 'uuid'
+import { IOAuthAction } from '../parse-app-url'
+import { shell } from '../app-shell'
+import noop from 'lodash/noop'
+import { AccountsStore } from './accounts-store'
 
 /**
  * An enumeration of the possible steps that the sign in
@@ -37,6 +28,7 @@ const EnterpriseTooOldMessage = `The GitHub Enterprise version does not support
  */
 export enum SignInStep {
   EndpointEntry = 'EndpointEntry',
+  ExistingAccountWarning = 'ExistingAccountWarning',
   Authentication = 'Authentication',
   TwoFactorAuthentication = 'TwoFactorAuthentication',
   Success = 'Success',
@@ -48,8 +40,8 @@ export enum SignInStep {
  */
 export type SignInState =
   | IEndpointEntryState
+  | IExistingAccountWarning
   | IAuthenticationState
-  | ITwoFactorAuthenticationState
   | ISuccessState
 
 /**
@@ -76,6 +68,8 @@ export interface ISignInState {
    * sign in process is ongoing.
    */
   readonly loading: boolean
+
+  readonly resultCallback: (result: SignInResult) => void
 }
 
 /**
@@ -83,20 +77,8 @@ export interface ISignInState {
  * This is the initial step in the Enterprise sign in
  * flow and is not present when signing in to GitHub.com
  */
-export interface IEndpointEntryState extends ISignInState {
-  readonly kind: SignInStep.EndpointEntry
-}
-
-/**
- * State interface representing the Authentication step where
- * the user provides credentials and/or initiates a browser
- * OAuth sign in process. This step occurs as the first step
- * when signing in to GitHub.com and as the second step when
- * signing in to a GitHub Enterprise instance.
- */
-export interface IAuthenticationState extends ISignInState {
-  readonly kind: SignInStep.Authentication
-
+export interface IExistingAccountWarning extends ISignInState {
+  readonly kind: SignInStep.ExistingAccountWarning
   /**
    * The URL to the host which we're currently authenticating
    * against. This will be either https://api.github.com when
@@ -104,31 +86,31 @@ export interface IAuthenticationState extends ISignInState {
    * URL when signing in against a GitHub Enterprise
    * instance.
    */
+  readonly existingAccount: Account
   readonly endpoint: string
 
-  /**
-   * A value indicating whether or not the endpoint supports
-   * basic authentication (i.e. username and password). All
-   * GitHub Enterprise instances support OAuth (or web
-   * flow sign-in).
-   */
-  readonly supportsBasicAuth: boolean
+  readonly resultCallback: (result: SignInResult) => void
+}
 
-  /**
-   * The endpoint-specific URL for resetting credentials.
-   */
-  readonly forgotPasswordUrl: string
+/**
+ * State interface representing the endpoint entry step.
+ * This is the initial step in the Enterprise sign in
+ * flow and is not present when signing in to GitHub.com
+ */
+export interface IEndpointEntryState extends ISignInState {
+  readonly kind: SignInStep.EndpointEntry
+  readonly resultCallback: (result: SignInResult) => void
 }
 
 /**
- * State interface representing the TwoFactorAuthentication
- * step where the user provides an OTP token. This step
- * occurs after the authentication step both for GitHub.com,
- * and GitHub Enterprise when the user has enabled two
- * factor authentication on the host.
+ * State interface representing the Authentication step where
+ * the user provides credentials and/or initiates a browser
+ * OAuth sign in process. This step occurs as the first step
+ * when signing in to GitHub.com and as the second step when
+ * signing in to a GitHub Enterprise instance.
  */
-export interface ITwoFactorAuthenticationState extends ISignInState {
-  readonly kind: SignInStep.TwoFactorAuthentication
+export interface IAuthenticationState extends ISignInState {
+  readonly kind: SignInStep.Authentication
 
   /**
    * The URL to the host which we're currently authenticating
@@ -139,22 +121,14 @@ export interface ITwoFactorAuthenticationState extends ISignInState {
    */
   readonly endpoint: string
 
-  /**
-   * The username specified by the user in the preceding
-   * Authentication step
-   */
-  readonly username: string
-
-  /**
-   * The password specified by the user in the preceding
-   * Authentication step
-   */
-  readonly password: string
+  readonly resultCallback: (result: SignInResult) => void
 
-  /**
-   * The 2FA type expected by the GitHub endpoint.
-   */
-  readonly type: AuthenticationMode
+  readonly oauthState?: {
+    state: string
+    endpoint: string
+    onAuthCompleted: (account: Account) => void
+    onAuthError: (error: Error) => void
+  }
 }
 
 /**
@@ -165,31 +139,16 @@ export interface ITwoFactorAuthenticationState extends ISignInState {
  */
 export interface ISuccessState {
   readonly kind: SignInStep.Success
-}
-
-/**
- * The method used to authenticate a user.
- */
-export enum SignInMethod {
-  /**
-   * In-app sign-in with username, password, and possibly a
-   * two-factor code.
-   */
-  Basic = 'basic',
-  /**
-   * Sign-in through a web browser with a redirect back to
-   * the application.
-   */
-  Web = 'web',
+  readonly resultCallback: (result: SignInResult) => void
 }
 
 interface IAuthenticationEvent {
   readonly account: Account
-  readonly method: SignInMethod
 }
 
-/** The maximum time to wait for a `/meta` API call in milliseconds */
-const ServerMetaDataTimeout = 2000
+export type SignInResult =
+  | { kind: 'success'; account: Account }
+  | { kind: 'cancelled' }
 
 /**
  * A store encapsulating all logic related to signing in a user
@@ -197,29 +156,35 @@ const ServerMetaDataTimeout = 2000
  */
 export class SignInStore extends TypedBaseStore<SignInState | null> {
   private state: SignInState | null = null
-  /**
-   * A map keyed on an endpoint url containing the last known
-   * value of the verifiable_password_authentication meta property
-   * for that endpoint.
-   */
-  private endpointSupportBasicAuth = new Map<string, boolean>()
 
-  private emitAuthenticate(account: Account, method: SignInMethod) {
-    const event: IAuthenticationEvent = { account, method }
+  private accounts: ReadonlyArray<Account> = []
+
+  public constructor(private readonly accountStore: AccountsStore) {
+    super()
+
+    this.accountStore.getAll().then(accounts => {
+      this.accounts = accounts
+    })
+    this.accountStore.onDidUpdate(accounts => {
+      this.accounts = accounts
+    })
+  }
+
+  private emitAuthenticate(account: Account) {
+    const event: IAuthenticationEvent = { account }
     this.emitter.emit('did-authenticate', event)
+    this.state?.resultCallback({ kind: 'success', account })
   }
 
   /**
    * Registers an event handler which will be invoked whenever
    * a user has successfully completed a sign-in process.
    */
-  public onDidAuthenticate(
-    fn: (account: Account, method: SignInMethod) => void
-  ): Disposable {
+  public onDidAuthenticate(fn: (account: Account) => void): Disposable {
     return this.emitter.on(
       'did-authenticate',
-      ({ account, method }: IAuthenticationEvent) => {
-        fn(account, method)
+      ({ account }: IAuthenticationEvent) => {
+        fn(account)
       }
     )
   }
@@ -241,250 +206,159 @@ export class SignInStore extends TypedBaseStore<SignInState | null> {
     this.emitUpdate(this.getState())
   }
 
-  private async endpointSupportsBasicAuth(endpoint: string): Promise<boolean> {
-    if (endpoint === getDotComAPIEndpoint()) {
-      return false
-    }
-
-    const cached = this.endpointSupportBasicAuth.get(endpoint)
-    const fallbackValue =
-      cached === undefined
-        ? null
-        : { verifiable_password_authentication: cached }
-
-    const response = await timeout(
-      fetchMetadata(endpoint),
-      ServerMetaDataTimeout,
-      fallbackValue
-    )
-
-    if (response !== null) {
-      const supportsBasicAuth =
-        response.verifiable_password_authentication === true
-      this.endpointSupportBasicAuth.set(endpoint, supportsBasicAuth)
-
-      return supportsBasicAuth
-    }
-
-    throw new Error(
-      `Unable to authenticate with the GitHub Enterprise instance. Verify that the URL is correct, that your GitHub Enterprise instance is running version ${minimumSupportedEnterpriseVersion} or later, that you have an internet connection and try again.`
-    )
-  }
-
-  private getForgotPasswordURL(endpoint: string): string {
-    return `${getHTMLURL(endpoint)}/password_reset`
-  }
-
   /**
    * Clear any in-flight sign in state and return to the
    * initial (no sign-in) state.
    */
   public reset() {
+    const currentState = this.state
+    this.state?.resultCallback({ kind: 'cancelled' })
     this.setState(null)
+
+    if (currentState?.kind === SignInStep.Authentication) {
+      currentState.oauthState?.onAuthError(new Error('cancelled'))
+    }
   }
 
   /**
    * Initiate a sign in flow for github.com. This will put the store
    * in the Authentication step ready to receive user credentials.
    */
-  public beginDotComSignIn() {
+  public beginDotComSignIn(resultCallback?: (result: SignInResult) => void) {
     const endpoint = getDotComAPIEndpoint()
 
-    this.setState({
-      kind: SignInStep.Authentication,
-      endpoint,
-      supportsBasicAuth: false,
-      error: null,
-      loading: false,
-      forgotPasswordUrl: this.getForgotPasswordURL(endpoint),
-    })
+    if (this.state !== null) {
+      this.reset()
+    }
 
-    // Asynchronously refresh our knowledge about whether GitHub.com
-    // support username and password authentication or not.
-    this.endpointSupportsBasicAuth(endpoint)
-      .then(supportsBasicAuth => {
-        if (
-          this.state !== null &&
-          this.state.kind === SignInStep.Authentication &&
-          this.state.endpoint === endpoint
-        ) {
-          this.setState({ ...this.state, supportsBasicAuth })
-        }
+    const existingAccount = this.accounts.find(
+      x => x.endpoint === getDotComAPIEndpoint()
+    )
+
+    if (existingAccount) {
+      this.setState({
+        kind: SignInStep.ExistingAccountWarning,
+        endpoint,
+        existingAccount,
+        error: null,
+        loading: false,
+        resultCallback: resultCallback ?? noop,
       })
-      .catch(err =>
-        log.error(
-          'Failed resolving whether GitHub.com supports password authentication',
-          err
-        )
-      )
+    } else {
+      this.setState({
+        kind: SignInStep.Authentication,
+        endpoint,
+        error: null,
+        loading: false,
+        resultCallback: resultCallback ?? noop,
+      })
+    }
   }
 
   /**
-   * Attempt to advance from the authentication step using a username
-   * and password. This method must only be called when the store is
-   * in the authentication step or an error will be thrown. If the
-   * provided credentials are valid the store will either advance to
-   * the Success step or to the TwoFactorAuthentication step if the
-   * user has enabled two factor authentication.
-   *
-   * If an error occurs during sign in (such as invalid credentials)
-   * the authentication state will be updated with that error so that
-   * the responsible component can present it to the user.
+   * Initiate an OAuth sign in using the system configured browser.
+   * This method must only be called when the store is in the authentication
+   * step or an error will be thrown.
    */
-  public async authenticateWithBasicAuth(
-    username: string,
-    password: string
-  ): Promise<void> {
+  public async authenticateWithBrowser() {
     const currentState = this.state
 
-    if (!currentState || currentState.kind !== SignInStep.Authentication) {
+    if (
+      currentState?.kind !== SignInStep.Authentication &&
+      currentState?.kind !== SignInStep.ExistingAccountWarning
+    ) {
       const stepText = currentState ? currentState.kind : 'null'
       return fatalError(
-        `Sign in step '${stepText}' not compatible with authentication`
+        `Sign in step '${stepText}' not compatible with browser authentication`
       )
     }
 
-    const endpoint = currentState.endpoint
-
     this.setState({ ...currentState, loading: true })
 
-    let response: AuthorizationResponse
-    try {
-      response = await createAuthorization(endpoint, username, password, null)
-    } catch (e) {
-      this.emitError(e)
-      return
-    }
-
-    if (!this.state || this.state.kind !== SignInStep.Authentication) {
-      // Looks like the sign in flow has been aborted
-      return
+    if (currentState.kind === SignInStep.ExistingAccountWarning) {
+      const { existingAccount } = currentState
+      // Try to avoid emitting an error out of AccountsStore if the account
+      // is already gone.
+      if (this.accounts.find(x => x.endpoint === existingAccount.endpoint)) {
+        await this.accountStore.removeAccount(existingAccount)
+      }
     }
 
-    if (response.kind === AuthorizationResponseKind.Authorized) {
-      const token = response.token
-      const user = await fetchUser(endpoint, token)
+    const csrfToken = uuid()
 
-      if (!this.state || this.state.kind !== SignInStep.Authentication) {
-        // Looks like the sign in flow has been aborted
-        return
-      }
-
-      this.emitAuthenticate(user, SignInMethod.Basic)
-      this.setState({ kind: SignInStep.Success })
-    } else if (
-      response.kind ===
-      AuthorizationResponseKind.TwoFactorAuthenticationRequired
-    ) {
+    new Promise<Account>((resolve, reject) => {
+      const { endpoint, resultCallback } = currentState
+      log.info('[SignInStore] initializing OAuth flow')
       this.setState({
-        kind: SignInStep.TwoFactorAuthentication,
+        kind: SignInStep.Authentication,
         endpoint,
-        username,
-        password,
-        type: response.type,
+        resultCallback,
         error: null,
-        loading: false,
+        loading: true,
+        oauthState: {
+          state: csrfToken,
+          endpoint,
+          onAuthCompleted: resolve,
+          onAuthError: reject,
+        },
       })
-    } else {
-      if (response.kind === AuthorizationResponseKind.Error) {
-        this.emitError(
-          new Error(
-            `The server responded with an error while attempting to authenticate (${response.response.status})\n\n${response.response.statusText}`
-          )
-        )
-        this.setState({ ...currentState, loading: false })
-      } else if (response.kind === AuthorizationResponseKind.Failed) {
-        if (username.includes('@')) {
-          this.setState({
-            ...currentState,
-            loading: false,
-            error: new Error('Incorrect email or password.'),
-          })
-        } else {
-          this.setState({
-            ...currentState,
-            loading: false,
-            error: new Error('Incorrect username or password.'),
-          })
+      shell.openExternal(getOAuthAuthorizationURL(endpoint, csrfToken))
+    })
+      .then(account => {
+        if (!this.state || this.state.kind !== SignInStep.Authentication) {
+          // Looks like the sign in flow has been aborted
+          log.warn('[SignInStore] account resolved but session has changed')
+          return
         }
-      } else if (
-        response.kind === AuthorizationResponseKind.UserRequiresVerification
-      ) {
-        this.setState({
-          ...currentState,
-          loading: false,
-          error: new Error(getUnverifiedUserErrorMessage(username)),
-        })
-      } else if (
-        response.kind === AuthorizationResponseKind.PersonalAccessTokenBlocked
-      ) {
-        this.setState({
-          ...currentState,
-          loading: false,
-          error: new Error(
-            'A personal access token cannot be used to login to GitHub Desktop.'
-          ),
-        })
-      } else if (response.kind === AuthorizationResponseKind.EnterpriseTooOld) {
-        this.setState({
-          ...currentState,
-          loading: false,
-          error: new Error(EnterpriseTooOldMessage),
-        })
-      } else if (response.kind === AuthorizationResponseKind.WebFlowRequired) {
+
+        log.info('[SignInStore] account resolved')
+        this.emitAuthenticate(account)
         this.setState({
-          ...currentState,
-          loading: false,
-          supportsBasicAuth: false,
-          kind: SignInStep.Authentication,
+          kind: SignInStep.Success,
+          resultCallback: this.state.resultCallback,
         })
-      } else {
-        return assertNever(response, `Unsupported response: ${response}`)
-      }
-    }
+      })
+      .catch(e => {
+        // Make sure we're still in the same sign in session
+        if (
+          this.state?.kind === SignInStep.Authentication &&
+          this.state.oauthState?.state === csrfToken
+        ) {
+          log.info('[SignInStore] error with OAuth flow', e)
+          this.setState({ ...this.state, error: e, loading: false })
+        } else {
+          log.info(`[SignInStore] OAuth error but session has changed: ${e}`)
+        }
+      })
   }
 
-  /**
-   * Initiate an OAuth sign in using the system configured browser.
-   * This method must only be called when the store is in the authentication
-   * step or an error will be thrown.
-   *
-   * The promise returned will only resolve once the user has successfully
-   * authenticated. If the user terminates the sign-in process by closing
-   * their browser before the protocol handler is invoked, by denying the
-   * protocol handler to execute or by providing the wrong credentials
-   * this promise will never complete.
-   */
-  public async authenticateWithBrowser(): Promise<void> {
-    const currentState = this.state
-
-    if (!currentState || currentState.kind !== SignInStep.Authentication) {
-      const stepText = currentState ? currentState.kind : 'null'
-      return fatalError(
-        `Sign in step '${stepText}' not compatible with browser authentication`
-      )
+  public async resolveOAuthRequest(action: IOAuthAction) {
+    if (!this.state || this.state.kind !== SignInStep.Authentication) {
+      return
     }
 
-    this.setState({ ...currentState, loading: true })
-
-    let account: Account
-    try {
-      log.info('[SignInStore] initializing OAuth flow')
-      account = await askUserToOAuth(currentState.endpoint)
-      log.info('[SignInStore] account resolved')
-    } catch (e) {
-      log.info('[SignInStore] error with OAuth flow', e)
-      this.setState({ ...currentState, error: e, loading: false })
+    if (!this.state.oauthState) {
       return
     }
 
-    if (!this.state || this.state.kind !== SignInStep.Authentication) {
-      // Looks like the sign in flow has been aborted
+    if (this.state.oauthState.state !== action.state) {
+      log.warn(
+        'requestAuthenticatedUser was not called with valid OAuth state. This is likely due to a browser reloading the callback URL. Contact GitHub Support if you believe this is an error'
+      )
       return
     }
 
-    this.emitAuthenticate(account, SignInMethod.Web)
-    this.setState({ kind: SignInStep.Success })
+    const { endpoint } = this.state
+    const token = await requestOAuthToken(endpoint, action.code)
+
+    if (token) {
+      const account = await fetchUser(endpoint, token)
+      this.state.oauthState.onAuthCompleted(account)
+    } else {
+      this.state.oauthState.onAuthError(
+        new Error('Failed retrieving authenticated user')
+      )
+    }
   }
 
   /**
@@ -492,11 +366,18 @@ export class SignInStore extends TypedBaseStore<SignInState | null> {
    * This will put the store in the EndpointEntry step ready to
    * receive the url to the enterprise instance.
    */
-  public beginEnterpriseSignIn() {
+  public beginEnterpriseSignIn(
+    resultCallback?: (result: SignInResult) => void
+  ) {
+    if (this.state !== null) {
+      this.reset()
+    }
+
     this.setState({
       kind: SignInStep.EndpointEntry,
       error: null,
       loading: false,
+      resultCallback: resultCallback ?? noop,
     })
   }
 
@@ -516,13 +397,25 @@ export class SignInStore extends TypedBaseStore<SignInState | null> {
   public async setEndpoint(url: string): Promise<void> {
     const currentState = this.state
 
-    if (!currentState || currentState.kind !== SignInStep.EndpointEntry) {
+    if (
+      currentState?.kind !== SignInStep.EndpointEntry &&
+      currentState?.kind !== SignInStep.ExistingAccountWarning
+    ) {
       const stepText = currentState ? currentState.kind : 'null'
       return fatalError(
         `Sign in step '${stepText}' not compatible with endpoint entry`
       )
     }
 
+    /**
+     * If the user enters a github.com url in the GitHub Enterprise sign-in
+     * flow we'll redirect them to the GitHub.com sign-in flow.
+     */
+    if (/^(?:https:\/\/)?(?:api\.)?github\.com($|\/)/.test(url)) {
+      this.beginDotComSignIn(currentState.resultCallback)
+      return
+    }
+
     this.setState({ ...currentState, loading: true })
 
     let validUrl: string
@@ -536,7 +429,7 @@ export class SignInStore extends TypedBaseStore<SignInState | null> {
         )
       } else if (e.name === InvalidProtocolErrorName) {
         error = new Error(
-          'Unsupported protocol. Only http or https is supported when authenticating with GitHub Enterprise instances.'
+          'Unsupported protocol. Only https is supported when authenticating with GitHub Enterprise instances.'
         )
       }
 
@@ -545,140 +438,26 @@ export class SignInStore extends TypedBaseStore<SignInState | null> {
     }
 
     const endpoint = getEnterpriseAPIURL(validUrl)
-    try {
-      const supportsBasicAuth = await this.endpointSupportsBasicAuth(endpoint)
 
-      if (!this.state || this.state.kind !== SignInStep.EndpointEntry) {
-        // Looks like the sign in flow has been aborted
-        return
-      }
+    const existingAccount = this.accounts.find(x => x.endpoint === endpoint)
 
+    if (existingAccount) {
       this.setState({
-        kind: SignInStep.Authentication,
+        kind: SignInStep.ExistingAccountWarning,
         endpoint,
-        supportsBasicAuth,
+        existingAccount,
         error: null,
         loading: false,
-        forgotPasswordUrl: this.getForgotPasswordURL(endpoint),
+        resultCallback: currentState.resultCallback,
       })
-    } catch (e) {
-      let error = e
-      // We'll get an ENOTFOUND if the address couldn't be resolved.
-      if (e.code === 'ENOTFOUND') {
-        error = new Error(
-          'The server could not be found. Please verify that the URL is correct and that you have a stable internet connection.'
-        )
-      }
-
-      this.setState({ ...currentState, loading: false, error })
-    }
-  }
-
-  /**
-   * Attempt to complete the sign in flow with the given OTP token.\
-   * This method must only be called when the store is in the
-   * TwoFactorAuthentication step or an error will be thrown.
-   *
-   * If the provided token is valid the store will advance to
-   * the Success step.
-   *
-   * If an error occurs during sign in (such as invalid credentials)
-   * the authentication state will be updated with that error so that
-   * the responsible component can present it to the user.
-   */
-  public async setTwoFactorOTP(otp: string) {
-    const currentState = this.state
-
-    if (
-      !currentState ||
-      currentState.kind !== SignInStep.TwoFactorAuthentication
-    ) {
-      const stepText = currentState ? currentState.kind : 'null'
-      fatalError(
-        `Sign in step '${stepText}' not compatible with two factor authentication`
-      )
-    }
-
-    this.setState({ ...currentState, loading: true })
-
-    let response: AuthorizationResponse
-
-    try {
-      response = await createAuthorization(
-        currentState.endpoint,
-        currentState.username,
-        currentState.password,
-        otp
-      )
-    } catch (e) {
-      this.emitError(e)
-      return
-    }
-
-    if (!this.state || this.state.kind !== SignInStep.TwoFactorAuthentication) {
-      // Looks like the sign in flow has been aborted
-      return
-    }
-
-    if (response.kind === AuthorizationResponseKind.Authorized) {
-      const token = response.token
-      const user = await fetchUser(currentState.endpoint, token)
-
-      if (
-        !this.state ||
-        this.state.kind !== SignInStep.TwoFactorAuthentication
-      ) {
-        // Looks like the sign in flow has been aborted
-        return
-      }
-
-      this.emitAuthenticate(user, SignInMethod.Basic)
-      this.setState({ kind: SignInStep.Success })
     } else {
-      switch (response.kind) {
-        case AuthorizationResponseKind.Failed:
-        case AuthorizationResponseKind.TwoFactorAuthenticationRequired:
-          this.setState({
-            ...currentState,
-            loading: false,
-            error: new Error('Two-factor authentication failed.'),
-          })
-          break
-        case AuthorizationResponseKind.Error:
-          this.emitError(
-            new Error(
-              `The server responded with an error (${response.response.status})\n\n${response.response.statusText}`
-            )
-          )
-          break
-        case AuthorizationResponseKind.UserRequiresVerification:
-          this.emitError(
-            new Error(getUnverifiedUserErrorMessage(currentState.username))
-          )
-          break
-        case AuthorizationResponseKind.PersonalAccessTokenBlocked:
-          this.emitError(
-            new Error(
-              'A personal access token cannot be used to login to GitHub Desktop.'
-            )
-          )
-          break
-        case AuthorizationResponseKind.EnterpriseTooOld:
-          this.emitError(new Error(EnterpriseTooOldMessage))
-          break
-        case AuthorizationResponseKind.WebFlowRequired:
-          this.setState({
-            ...currentState,
-            forgotPasswordUrl: this.getForgotPasswordURL(currentState.endpoint),
-            loading: false,
-            supportsBasicAuth: false,
-            kind: SignInStep.Authentication,
-            error: null,
-          })
-          break
-        default:
-          assertNever(response, `Unknown response: ${response}`)
-      }
+      this.setState({
+        kind: SignInStep.Authentication,
+        endpoint,
+        error: null,
+        loading: false,
+        resultCallback: currentState.resultCallback,
+      })
     }
   }
 }
diff --git a/app/src/lib/stores/updates/changes-state.ts b/app/src/lib/stores/updates/changes-state.ts
index 8f274f82bcc..e15131d5aeb 100644
--- a/app/src/lib/stores/updates/changes-state.ts
+++ b/app/src/lib/stores/updates/changes-state.ts
@@ -193,7 +193,7 @@ function performEffectsForMergeStateChange(
 
   // The branch name has changed while remaining conflicted -> the merge must have been aborted
   if (branchNameChanged) {
-    statsStore.recordMergeAbortedAfterConflicts()
+    statsStore.increment('mergeAbortedAfterConflictsCount')
     return
   }
 
@@ -208,9 +208,9 @@ function performEffectsForMergeStateChange(
     const previousTip = prevConflictState.currentTip
 
     if (previousTip !== currentTip) {
-      statsStore.recordMergeSuccessAfterConflicts()
+      statsStore.increment('mergeSuccessAfterConflictsCount')
     } else {
-      statsStore.recordMergeAbortedAfterConflicts()
+      statsStore.increment('mergeAbortedAfterConflictsCount')
     }
   }
 }
@@ -233,7 +233,7 @@ function performEffectsForRebaseStateChange(
 
   // The branch name has changed while remaining conflicted -> the rebase must have been aborted
   if (branchNameChanged) {
-    statsStore.recordRebaseAbortedAfterConflicts()
+    statsStore.increment('rebaseAbortedAfterConflictsCount')
     return
   }
 
@@ -253,7 +253,7 @@ function performEffectsForRebaseStateChange(
       currentBranch === prevConflictState.targetBranch
 
     if (!previousTipChanged) {
-      statsStore.recordRebaseAbortedAfterConflicts()
+      statsStore.increment('rebaseAbortedAfterConflictsCount')
     }
   }
 
diff --git a/app/src/lib/suppress-certificate-error.ts b/app/src/lib/suppress-certificate-error.ts
new file mode 100644
index 00000000000..3bc795f9b48
--- /dev/null
+++ b/app/src/lib/suppress-certificate-error.ts
@@ -0,0 +1,13 @@
+const suppressedUrls = new Set<string>()
+
+export function suppressCertificateErrorFor(url: string) {
+  suppressedUrls.add(url)
+}
+
+export function clearCertificateErrorSuppressionFor(url: string) {
+  suppressedUrls.delete(url)
+}
+
+export function isCertificateErrorSuppressedFor(url: string) {
+  return suppressedUrls.has(url)
+}
diff --git a/app/src/lib/text-token-parser.ts b/app/src/lib/text-token-parser.ts
index 3dc6fce6b13..bb2a802cea5 100644
--- a/app/src/lib/text-token-parser.ts
+++ b/app/src/lib/text-token-parser.ts
@@ -5,6 +5,7 @@ import {
 } from '../models/repository'
 import { GitHubRepository } from '../models/github-repository'
 import { getHTMLURL } from './api'
+import { Emoji } from './emoji'
 
 export enum TokenType {
   /*
@@ -28,6 +29,10 @@ export type EmojiMatch = {
   readonly text: string
   // The path on disk to the image.
   readonly path: string
+  // The unicode character of the emoji, if available
+  readonly emoji?: string
+  // The human description of the emoji, if available
+  readonly description?: string
 }
 
 export type HyperlinkMatch = {
@@ -54,14 +59,14 @@ type LookupResult = {
  * A look-ahead tokenizer designed for scanning commit messages for emoji, issues, mentions and links.
  */
 export class Tokenizer {
-  private readonly emoji: Map<string, string>
+  private readonly allEmoji: Map<string, Emoji>
   private readonly repository: GitHubRepository | null = null
 
   private _results = new Array<TokenResult>()
   private _currentString = ''
 
-  public constructor(emoji: Map<string, string>, repository?: Repository) {
-    this.emoji = emoji
+  public constructor(emoji: Map<string, Emoji>, repository?: Repository) {
+    this.allEmoji = emoji
 
     if (repository && isRepositoryWithGitHubRepository(repository)) {
       this.repository = getNonForkGitHubRepository(repository)
@@ -115,13 +120,19 @@ export class Tokenizer {
       return null
     }
 
-    const path = this.emoji.get(maybeEmoji)
-    if (!path) {
+    const emoji = this.allEmoji.get(maybeEmoji)
+    if (!emoji) {
       return null
     }
 
     this.flush()
-    this._results.push({ kind: TokenType.Emoji, text: maybeEmoji, path })
+    this._results.push({
+      kind: TokenType.Emoji,
+      text: maybeEmoji,
+      path: emoji.url,
+      emoji: emoji.emoji,
+      description: emoji.description,
+    })
     return { nextIndex }
   }
 
diff --git a/app/src/lib/to_sentence.ts b/app/src/lib/to_sentence.ts
new file mode 100644
index 00000000000..6bb2cc44210
--- /dev/null
+++ b/app/src/lib/to_sentence.ts
@@ -0,0 +1,31 @@
+/**
+ * Converts the array to a comma-separated sentence where the last element is joined by the connector word
+ *
+ * Example output:
+ *  [].to_sentence                      # => ""
+ *  ['one'].to_sentence                 # => "one"
+ *  ['one', 'two'].to_sentence          # => "one and two"
+ *  ['one', 'two', 'three'].to_sentence # => "one, two, and three"
+ *
+ *   Based on https://gist.github.com/mudge/1076046 to emulate https://apidock.com/rails/Array/to_sentence
+ */
+export function toSentence(array: ReadonlyArray<string>): string {
+  const wordsConnector = ', ',
+    twoWordsConnector = ' and ',
+    lastWordConnector = ', and '
+
+  switch (array.length) {
+    case 0:
+      return ''
+    case 1:
+      return array.at(0) ?? ''
+    case 2:
+      return array.at(0) + twoWordsConnector + array.at(1)
+    default:
+      return (
+        array.slice(0, -1).join(wordsConnector) +
+        lastWordConnector +
+        array.at(-1)
+      )
+  }
+}
diff --git a/app/src/lib/trampoline/find-account.ts b/app/src/lib/trampoline/find-account.ts
new file mode 100644
index 00000000000..151f1637914
--- /dev/null
+++ b/app/src/lib/trampoline/find-account.ts
@@ -0,0 +1,60 @@
+import memoizeOne from 'memoize-one'
+import { getHTMLURL } from '../api'
+import { getGenericPassword, getGenericUsername } from '../generic-git-auth'
+import { AccountsStore } from '../stores'
+import { urlWithoutCredentials } from './url-without-credentials'
+import { Account } from '../../models/account'
+
+/**
+ * When we're asked for credentials we're typically first asked for the username
+ * immediately followed by the password. We memoize the getGenericPassword call
+ * such that we only call it once per endpoint/login pair. Since we include the
+ * trampoline token in the invalidation key we'll only call it once per
+ * trampoline session.
+ */
+const memoizedGetGenericPassword = memoizeOne(
+  (_trampolineToken: string, endpoint: string, login: string) =>
+    getGenericPassword(endpoint, login)
+)
+
+export async function findGitHubTrampolineAccount(
+  accountsStore: AccountsStore,
+  remoteUrl: string
+): Promise<Account | undefined> {
+  const accounts = await accountsStore.getAll()
+  const parsedUrl = new URL(remoteUrl)
+  return accounts.find(
+    a => new URL(getHTMLURL(a.endpoint)).origin === parsedUrl.origin
+  )
+}
+
+export async function findGenericTrampolineAccount(
+  trampolineToken: string,
+  remoteUrl: string
+) {
+  const parsedUrl = new URL(remoteUrl)
+  const endpoint = urlWithoutCredentials(remoteUrl)
+
+  const login =
+    parsedUrl.username === ''
+      ? getGenericUsername(endpoint)
+      : parsedUrl.username
+
+  if (!login) {
+    return undefined
+  }
+
+  const token = await memoizedGetGenericPassword(
+    trampolineToken,
+    endpoint,
+    login
+  )
+
+  if (!token) {
+    // We have a username but no password, that warrants a warning
+    log.warn(`credential: generic password for ${remoteUrl} missing`)
+    return undefined
+  }
+
+  return { login, endpoint, token }
+}
diff --git a/app/src/lib/trampoline/trampoline-askpass-handler.ts b/app/src/lib/trampoline/trampoline-askpass-handler.ts
index 68d6cc62a93..d2120c0e276 100644
--- a/app/src/lib/trampoline/trampoline-askpass-handler.ts
+++ b/app/src/lib/trampoline/trampoline-askpass-handler.ts
@@ -1,19 +1,22 @@
-import { getKeyForEndpoint } from '../auth'
 import {
   getSSHKeyPassphrase,
-  keepSSHKeyPassphraseToStore,
+  setMostRecentSSHKeyPassphrase,
+  setSSHKeyPassphrase,
 } from '../ssh/ssh-key-passphrase'
-import { TokenStore } from '../stores'
+import { AccountsStore } from '../stores/accounts-store'
 import { TrampolineCommandHandler } from './trampoline-command'
 import { trampolineUIHelper } from './trampoline-ui-helper'
 import { parseAddSSHHostPrompt } from '../ssh/ssh'
 import {
   getSSHUserPassword,
-  keepSSHUserPasswordToStore,
+  setMostRecentSSHUserPassword,
+  setSSHUserPassword,
 } from '../ssh/ssh-user-password'
-import { removePendingSSHSecretToStore } from '../ssh/ssh-secret-storage'
+import { removeMostRecentSSHCredential } from '../ssh/ssh-credential-storage'
+import { getIsBackgroundTaskEnvironment } from './trampoline-environment'
 
 async function handleSSHHostAuthenticity(
+  operationGUID: string,
   prompt: string
 ): Promise<'yes' | 'no' | undefined> {
   const info = parseAddSSHHostPrompt(prompt)
@@ -33,6 +36,13 @@ async function handleSSHHostAuthenticity(
     return 'yes'
   }
 
+  if (getIsBackgroundTaskEnvironment(operationGUID)) {
+    log.debug(
+      'handleSSHHostAuthenticity: background task environment, skipping prompt'
+    )
+    return undefined
+  }
+
   const addHost = await trampolineUIHelper.promptAddingSSHHost(
     info.host,
     info.ip,
@@ -66,9 +76,19 @@ async function handleSSHKeyPassphrase(
 
   const storedPassphrase = await getSSHKeyPassphrase(keyPath)
   if (storedPassphrase !== null) {
+    // Keep this stored passphrase around in case it's not valid and we need to
+    // delete it if the git operation fails to authenticate.
+    await setMostRecentSSHKeyPassphrase(operationGUID, keyPath)
     return storedPassphrase
   }
 
+  if (getIsBackgroundTaskEnvironment(operationGUID)) {
+    log.debug(
+      'handleSSHKeyPassphrase: background task environment, skipping prompt'
+    )
+    return undefined
+  }
+
   const { secret: passphrase, storeSecret: storePassphrase } =
     await trampolineUIHelper.promptSSHKeyPassphrase(keyPath)
 
@@ -80,9 +100,9 @@ async function handleSSHKeyPassphrase(
   // when, in one of those multiple attempts, the user chooses NOT to remember
   // the passphrase.
   if (passphrase !== undefined && storePassphrase) {
-    keepSSHKeyPassphraseToStore(operationGUID, keyPath, passphrase)
+    setSSHKeyPassphrase(operationGUID, keyPath, passphrase)
   } else {
-    removePendingSSHSecretToStore(operationGUID)
+    removeMostRecentSSHCredential(operationGUID)
   }
 
   return passphrase ?? ''
@@ -100,23 +120,35 @@ async function handleSSHUserPassword(operationGUID: string, prompt: string) {
 
   const storedPassword = await getSSHUserPassword(username)
   if (storedPassword !== null) {
+    // Keep this stored password around in case it's not valid and we need to
+    // delete it if the git operation fails to authenticate.
+    setMostRecentSSHUserPassword(operationGUID, username)
     return storedPassword
   }
 
+  if (getIsBackgroundTaskEnvironment(operationGUID)) {
+    log.debug(
+      'handleSSHUserPassword: background task environment, skipping prompt'
+    )
+    return undefined
+  }
+
   const { secret: password, storeSecret: storePassword } =
     await trampolineUIHelper.promptSSHUserPassword(username)
 
   if (password !== undefined && storePassword) {
-    keepSSHUserPasswordToStore(operationGUID, username, password)
+    setSSHUserPassword(operationGUID, username, password)
   } else {
-    removePendingSSHSecretToStore(operationGUID)
+    removeMostRecentSSHCredential(operationGUID)
   }
 
   return password ?? ''
 }
 
-export const askpassTrampolineHandler: TrampolineCommandHandler =
-  async command => {
+export const createAskpassTrampolineHandler: (
+  accountsStore: AccountsStore
+) => TrampolineCommandHandler =
+  (accountsStore: AccountsStore) => async command => {
     if (command.parameters.length !== 1) {
       return undefined
     }
@@ -124,7 +156,7 @@ export const askpassTrampolineHandler: TrampolineCommandHandler =
     const firstParameter = command.parameters[0]
 
     if (firstParameter.startsWith('The authenticity of host ')) {
-      return handleSSHHostAuthenticity(firstParameter)
+      return handleSSHHostAuthenticity(command.trampolineToken, firstParameter)
     }
 
     if (firstParameter.startsWith('Enter passphrase for key ')) {
@@ -135,23 +167,5 @@ export const askpassTrampolineHandler: TrampolineCommandHandler =
       return handleSSHUserPassword(command.trampolineToken, firstParameter)
     }
 
-    const username = command.environmentVariables.get('DESKTOP_USERNAME')
-    if (username === undefined || username.length === 0) {
-      return undefined
-    }
-
-    if (firstParameter.startsWith('Username')) {
-      return username
-    } else if (firstParameter.startsWith('Password')) {
-      const endpoint = command.environmentVariables.get('DESKTOP_ENDPOINT')
-      if (endpoint === undefined || endpoint.length === 0) {
-        return undefined
-      }
-
-      const key = getKeyForEndpoint(endpoint)
-      const token = await TokenStore.getItem(key, username)
-      return token ?? undefined
-    }
-
     return undefined
   }
diff --git a/app/src/lib/trampoline/trampoline-command-parser.ts b/app/src/lib/trampoline/trampoline-command-parser.ts
index 9dee69d77c7..d760082f69d 100644
--- a/app/src/lib/trampoline/trampoline-command-parser.ts
+++ b/app/src/lib/trampoline/trampoline-command-parser.ts
@@ -1,4 +1,5 @@
 import { parseEnumValue } from '../enum'
+import { assertNever } from '../fatal-error'
 import { sendNonFatalException } from '../helpers/non-fatal-exception'
 import {
   ITrampolineCommand,
@@ -10,6 +11,7 @@ enum TrampolineCommandParserState {
   Parameters,
   EnvironmentVariablesCount,
   EnvironmentVariables,
+  Stdin,
   Finished,
 }
 
@@ -22,6 +24,7 @@ export class TrampolineCommandParser {
   private readonly parameters: string[] = []
   private environmentVariablesCount: number = 0
   private readonly environmentVariables = new Map<string, string>()
+  private stdin = ''
 
   private state: TrampolineCommandParserState =
     TrampolineCommandParserState.ParameterCount
@@ -63,7 +66,7 @@ export class TrampolineCommandParser {
         if (this.environmentVariablesCount > 0) {
           this.state = TrampolineCommandParserState.EnvironmentVariables
         } else {
-          this.state = TrampolineCommandParserState.Finished
+          this.state = TrampolineCommandParserState.Stdin
         }
 
         break
@@ -86,12 +89,17 @@ export class TrampolineCommandParser {
         this.environmentVariables.set(variableKey, variableValue)
 
         if (this.environmentVariables.size === this.environmentVariablesCount) {
-          this.state = TrampolineCommandParserState.Finished
+          this.state = TrampolineCommandParserState.Stdin
         }
         break
-
+      case TrampolineCommandParserState.Stdin:
+        this.stdin = value
+        this.state = TrampolineCommandParserState.Finished
+        break
+      case TrampolineCommandParserState.Finished:
+        throw new Error(`Received value when in Finished`)
       default:
-        throw new Error(`Received value during invalid state: ${this.state}`)
+        assertNever(this.state, `Invalid state: ${this.state}`)
     }
   }
 
@@ -152,6 +160,7 @@ export class TrampolineCommandParser {
       trampolineToken,
       parameters: this.parameters,
       environmentVariables: this.environmentVariables,
+      stdin: this.stdin,
     }
   }
 
diff --git a/app/src/lib/trampoline/trampoline-command.ts b/app/src/lib/trampoline/trampoline-command.ts
index 18834e553c3..c0c2c6bc48a 100644
--- a/app/src/lib/trampoline/trampoline-command.ts
+++ b/app/src/lib/trampoline/trampoline-command.ts
@@ -1,5 +1,6 @@
 export enum TrampolineCommandIdentifier {
   AskPass = 'ASKPASS',
+  CredentialHelper = 'CREDENTIALHELPER',
 }
 
 /** Represents a command in our trampoline mechanism. */
@@ -28,6 +29,12 @@ export interface ITrampolineCommand {
 
   /** Environment variables that were set when the command was invoked. */
   readonly environmentVariables: ReadonlyMap<string, string>
+
+  /**
+   * The standard input received by the trampoline (note that when running as
+   * an askpass handler the trampoline won't read from stdin)
+   **/
+  readonly stdin: string
 }
 
 /**
diff --git a/app/src/lib/trampoline/trampoline-credential-helper.ts b/app/src/lib/trampoline/trampoline-credential-helper.ts
new file mode 100644
index 00000000000..c8a88b22fc2
--- /dev/null
+++ b/app/src/lib/trampoline/trampoline-credential-helper.ts
@@ -0,0 +1,265 @@
+import { AccountsStore } from '../stores'
+import { TrampolineCommandHandler } from './trampoline-command'
+import { forceUnwrap } from '../fatal-error'
+import {
+  approveCredential,
+  fillCredential,
+  formatCredential,
+  parseCredential,
+  rejectCredential,
+} from '../git/credential'
+import {
+  getCredentialUrl,
+  getIsBackgroundTaskEnvironment,
+  getTrampolineEnvironmentPath,
+  setHasRejectedCredentialsForEndpoint,
+} from './trampoline-environment'
+import { useExternalCredentialHelper } from './use-external-credential-helper'
+import {
+  findGenericTrampolineAccount,
+  findGitHubTrampolineAccount,
+} from './find-account'
+import { IGitAccount } from '../../models/git-account'
+import {
+  deleteGenericCredential,
+  setGenericCredential,
+} from '../generic-git-auth'
+import { urlWithoutCredentials } from './url-without-credentials'
+import { trampolineUIHelper as ui } from './trampoline-ui-helper'
+import { isGitHubHost } from '../api'
+import { isDotCom, isGHE, isGist } from '../endpoint-capabilities'
+
+type Credential = Map<string, string>
+type Store = AccountsStore
+
+const info = (msg: string) => log.info(`credential-helper: ${msg}`)
+const debug = (msg: string) => log.debug(`credential-helper: ${msg}`)
+const error = (msg: string, e: any) => log.error(`credential-helper: ${msg}`, e)
+
+/**
+ * Merges credential info from account into credential
+ *
+ * When looking up a first-party account (GitHub.com et al) we can use the
+ * account's endpoint host in the credential since that's the API url so instead
+ * we take all the fields from the credential and set the username and password
+ * from the Account on top of those.
+ */
+const credWithAccount = (c: Credential, a: IGitAccount | undefined) =>
+  a && new Map(c).set('username', a.login).set('password', a.token)
+
+async function getGitHubCredential(cred: Credential, store: AccountsStore) {
+  const endpoint = `${getCredentialUrl(cred)}`
+  const account = await findGitHubTrampolineAccount(store, endpoint)
+  if (account) {
+    info(`found GitHub credential for ${endpoint} in store`)
+  }
+  return credWithAccount(cred, account)
+}
+
+async function promptForCredential(cred: Credential, endpoint: string) {
+  const parsedUrl = new URL(endpoint)
+  const username = parsedUrl.username === '' ? undefined : parsedUrl.username
+  const account = await ui.promptForGenericGitAuthentication(endpoint, username)
+  info(`prompt for ${endpoint}: ${account ? 'completed' : 'cancelled'}`)
+  return credWithAccount(cred, account)
+}
+
+async function getGenericCredential(cred: Credential, token: string) {
+  const endpoint = `${getCredentialUrl(cred)}`
+  const account = await findGenericTrampolineAccount(token, endpoint)
+
+  if (account) {
+    info(`found generic credential for ${endpoint}`)
+    return credWithAccount(cred, account)
+  }
+
+  if (getIsBackgroundTaskEnvironment(token)) {
+    debug('background task environment, skipping prompt')
+    return undefined
+  } else {
+    return promptForCredential(cred, endpoint)
+  }
+}
+
+async function getExternalCredential(input: Credential, token: string) {
+  const path = getTrampolineEnvironmentPath(token)
+  const cred = await fillCredential(input, path, getGcmEnv(token))
+  if (cred) {
+    info(`found credential for ${getCredentialUrl(cred)} in external helper`)
+  }
+  return cred
+}
+
+/** Implementation of the 'get' git credential helper command */
+async function getCredential(cred: Credential, store: Store, token: string) {
+  const ghCred = await getGitHubCredential(cred, store)
+
+  if (ghCred) {
+    return ghCred
+  }
+
+  const endpointKind = await getEndpointKind(cred, store)
+  const accounts = await store.getAll()
+
+  const hasDotComAccount = accounts.some(a => isDotCom(a.endpoint))
+  const hasEnterpriseAccount = accounts.some(a => !isDotCom(a.endpoint))
+
+  // If it appears as if the endpoint is a GitHub host and we don't have an
+  // account for it (since we currently only allow one GitHub.com account and
+  // one Enterprise account) we prompt the user to sign in.
+  if (
+    (endpointKind === 'github.com' && !hasDotComAccount) ||
+    (endpointKind === 'enterprise' && !hasEnterpriseAccount)
+  ) {
+    if (getIsBackgroundTaskEnvironment(token)) {
+      debug('background task environment, skipping prompt')
+      return undefined
+    }
+
+    const endpoint = `${getCredentialUrl(cred)}`
+    const account = await ui.promptForGitHubSignIn(endpoint)
+
+    if (!account) {
+      setHasRejectedCredentialsForEndpoint(token, endpoint)
+    }
+
+    return credWithAccount(cred, account)
+  }
+
+  // GitHub.com/GHE creds are only stored internally
+  if (endpointKind !== 'generic') {
+    return undefined
+  }
+
+  return useExternalCredentialHelper()
+    ? getExternalCredential(cred, token)
+    : getGenericCredential(cred, token)
+}
+
+const getEndpointKind = async (cred: Credential, store: Store) => {
+  const credentialUrl = getCredentialUrl(cred)
+  const endpoint = `${credentialUrl}`
+
+  if (isGist(endpoint)) {
+    return 'generic'
+  }
+
+  if (isDotCom(endpoint)) {
+    return 'github.com'
+  }
+
+  if (isGHE(endpoint)) {
+    return 'ghe.com'
+  }
+
+  // When Git attempts to authenticate with a host it captures any
+  // WWW-Authenticate headers and forwards them to the credential helper. We
+  // use them as a happy-path to determine if the host is a GitHub host without
+  // having to resort to making a request ourselves.
+  for (const [k, v] of cred.entries()) {
+    if (k.startsWith('wwwauth[')) {
+      if (v.includes('realm="GitHub"')) {
+        return 'enterprise'
+      } else if (/realm="(GitLab|Gitea|Atlassian Bitbucket)"/.test(v)) {
+        return 'generic'
+      }
+    }
+  }
+
+  const existingAccount = await findGitHubTrampolineAccount(store, endpoint)
+  if (existingAccount) {
+    return isDotCom(existingAccount.endpoint) ? 'github.com' : 'enterprise'
+  }
+
+  return (await isGitHubHost(endpoint)) ? 'enterprise' : 'generic'
+}
+
+/** Implementation of the 'store' git credential helper command */
+async function storeCredential(cred: Credential, store: Store, token: string) {
+  if ((await getEndpointKind(cred, store)) !== 'generic') {
+    return
+  }
+
+  return useExternalCredentialHelper()
+    ? storeExternalCredential(cred, token)
+    : setGenericCredential(
+        urlWithoutCredentials(getCredentialUrl(cred)),
+        forceUnwrap(`credential missing username`, cred.get('username')),
+        forceUnwrap(`credential missing password`, cred.get('password'))
+      )
+}
+
+const storeExternalCredential = (cred: Credential, token: string) => {
+  const path = getTrampolineEnvironmentPath(token)
+  return approveCredential(cred, path, getGcmEnv(token))
+}
+
+/** Implementation of the 'erase' git credential helper command */
+async function eraseCredential(cred: Credential, store: Store, token: string) {
+  if ((await getEndpointKind(cred, store)) !== 'generic') {
+    return
+  }
+
+  return useExternalCredentialHelper()
+    ? eraseExternalCredential(cred, token)
+    : deleteGenericCredential(
+        urlWithoutCredentials(getCredentialUrl(cred)),
+        forceUnwrap(`credential missing username`, cred.get('username'))
+      )
+}
+
+const eraseExternalCredential = (cred: Credential, token: string) => {
+  const path = getTrampolineEnvironmentPath(token)
+  return rejectCredential(cred, path, getGcmEnv(token))
+}
+
+export const createCredentialHelperTrampolineHandler: (
+  store: AccountsStore
+) => TrampolineCommandHandler = (store: Store) => async command => {
+  const firstParameter = command.parameters.at(0)
+  if (!firstParameter) {
+    return undefined
+  }
+
+  const { trampolineToken: token } = command
+  const input = parseCredential(command.stdin)
+
+  if (__DEV__) {
+    debug(
+      `${firstParameter}\n${command.stdin
+        .replaceAll(/^password=.*$/gm, 'password=***')
+        .replaceAll(/^(.*)$/gm, '  $1')
+        .trimEnd()}`
+    )
+  }
+
+  try {
+    if (firstParameter === 'get') {
+      const cred = await getCredential(input, store, token)
+      if (!cred) {
+        const endpoint = `${getCredentialUrl(input)}`
+        info(`could not find credential for ${endpoint}`)
+        setHasRejectedCredentialsForEndpoint(token, endpoint)
+      }
+      return cred ? formatCredential(cred) : undefined
+    } else if (firstParameter === 'store') {
+      await storeCredential(input, store, token)
+    } else if (firstParameter === 'erase') {
+      await eraseCredential(input, store, token)
+    }
+    return undefined
+  } catch (e) {
+    error(`${firstParameter} failed`, e)
+    return undefined
+  }
+}
+
+function getGcmEnv(token: string): Record<string, string | undefined> {
+  const isBackgroundTask = getIsBackgroundTaskEnvironment(token)
+  return {
+    ...(process.env.GITHUB_DESKTOP_DISABLE_HARDWARE_ACCELERATION
+      ? { GCM_GUI_SOFTWARE_RENDERING: '1' }
+      : {}),
+    GCM_INTERACTIVE: isBackgroundTask ? '0' : '1',
+  }
+}
diff --git a/app/src/lib/trampoline/trampoline-environment.ts b/app/src/lib/trampoline/trampoline-environment.ts
index e111a671962..059d5092d28 100644
--- a/app/src/lib/trampoline/trampoline-environment.ts
+++ b/app/src/lib/trampoline/trampoline-environment.ts
@@ -1,13 +1,84 @@
 import { trampolineServer } from './trampoline-server'
 import { withTrampolineToken } from './trampoline-tokens'
 import * as Path from 'path'
-import { getDesktopTrampolineFilename } from 'desktop-trampoline'
-import { TrampolineCommandIdentifier } from '../trampoline/trampoline-command'
 import { getSSHEnvironment } from '../ssh/ssh'
 import {
-  removePendingSSHSecretToStore,
-  storePendingSSHSecret,
-} from '../ssh/ssh-secret-storage'
+  deleteMostRecentSSHCredential,
+  removeMostRecentSSHCredential,
+} from '../ssh/ssh-credential-storage'
+import { GitError as DugiteError, exec } from 'dugite'
+import memoizeOne from 'memoize-one'
+import { enableGitConfigParameters } from '../feature-flag'
+import { GitError, getDescriptionForError } from '../git/core'
+import { getDesktopAskpassTrampolineFilename } from 'desktop-trampoline'
+
+const hasRejectedCredentialsForEndpoint = new Map<string, Set<string>>()
+
+export const setHasRejectedCredentialsForEndpoint = (
+  trampolineToken: string,
+  endpoint: string
+) => {
+  const set = hasRejectedCredentialsForEndpoint.get(trampolineToken)
+  if (set) {
+    set.add(endpoint)
+  } else {
+    hasRejectedCredentialsForEndpoint.set(trampolineToken, new Set([endpoint]))
+  }
+}
+
+export const getHasRejectedCredentialsForEndpoint = (
+  trampolineToken: string,
+  endpoint: string
+) => {
+  return (
+    hasRejectedCredentialsForEndpoint.get(trampolineToken)?.has(endpoint) ??
+    false
+  )
+}
+const isBackgroundTaskEnvironment = new Map<string, boolean>()
+const trampolineEnvironmentPath = new Map<string, string>()
+
+export const getTrampolineEnvironmentPath = (trampolineToken: string) =>
+  trampolineEnvironmentPath.get(trampolineToken) ?? process.cwd()
+
+export const getIsBackgroundTaskEnvironment = (trampolineToken: string) =>
+  isBackgroundTaskEnvironment.get(trampolineToken) ?? false
+
+export const getCredentialUrl = (cred: Map<string, string>) => {
+  const u = cred.get('url')
+  if (u) {
+    return new URL(u)
+  }
+
+  const protocol = cred.get('protocol') ?? ''
+  const username = cred.get('username')
+  const user = username ? `${encodeURIComponent(username)}@` : ''
+  const host = cred.get('host') ?? ''
+  const path = cred.get('path') ?? ''
+
+  return new URL(`${protocol}://${user}${host}/${path}`)
+}
+
+export const GitUserAgent = memoizeOne(() =>
+  // Can't use git() as that will call withTrampolineEnv which calls this method
+  exec(['--version'], process.cwd())
+    // https://github.com/git/git/blob/a9e066fa63149291a55f383cfa113d8bdbdaa6b3/help.c#L733-L739
+    .then(r => /git version (.*)/.exec(r.stdout)?.at(1) ?? 'unknown')
+    .catch(e => {
+      log.warn(`Could not get git version information`, e)
+      return 'unknown'
+    })
+    .then(v => {
+      const suffix = __DEV__ ? `-${__SHA__.substring(0, 10)}` : ''
+      const ghdVersion = `GitHub Desktop/${__APP_VERSION__}${suffix}`
+      const { platform, arch } = process
+
+      return `git/${v} (${ghdVersion}; ${platform} ${arch})`
+    })
+)
+
+const fatalPromptsDisabledRe =
+  /^fatal: could not read .*?: terminal prompts disabled\n$/
 
 /**
  * Allows invoking a function with a set of environment variables to use when
@@ -21,15 +92,28 @@ import {
  *                  variables.
  */
 export async function withTrampolineEnv<T>(
-  fn: (env: Object) => Promise<T>
+  fn: (env: object) => Promise<T>,
+  path: string,
+  isBackgroundTask = false,
+  customEnv?: Record<string, string | undefined>
 ): Promise<T> {
   const sshEnv = await getSSHEnvironment()
 
   return withTrampolineToken(async token => {
+    isBackgroundTaskEnvironment.set(token, isBackgroundTask)
+    trampolineEnvironmentPath.set(token, path)
+
+    const existingGitEnvConfig =
+      customEnv?.['GIT_CONFIG_PARAMETERS'] ??
+      process.env['GIT_CONFIG_PARAMETERS'] ??
+      ''
+
+    const gitEnvConfigPrefix =
+      existingGitEnvConfig.length > 0 ? `${existingGitEnvConfig} ` : ''
+
     // The code below assumes a few things in order to manage SSH key passphrases
     // correctly:
-    // 1. `withTrampolineEnv` is only used in the functions `git` (core.ts) and
-    //    `spawnAndComplete` (spawn.ts)
+    // 1. `withTrampolineEnv` is only used in the functions `git` (core.ts)
     // 2. Those two functions always thrown an error when something went wrong,
     //    and just return a result when everything went fine.
     //
@@ -37,30 +121,107 @@ export async function withTrampolineEnv<T>(
     // `fn` has been invoked, we can store the SSH key passphrase for this git
     // operation if there was one pending to be stored.
     try {
-      const result = await fn({
+      return await fn({
         DESKTOP_PORT: await trampolineServer.getPort(),
         DESKTOP_TRAMPOLINE_TOKEN: token,
-        GIT_ASKPASS: getDesktopTrampolinePath(),
-        DESKTOP_TRAMPOLINE_IDENTIFIER: TrampolineCommandIdentifier.AskPass,
-
+        GIT_ASKPASS: '',
+        // This warrants some explanation. We're configuring the
+        // credential helper using environment variables rather than
+        // arguments (i.e. -c credential.helper=) because we want commands
+        // invoked by filters (i.e. Git LFS) to be able to pick up our
+        // configuration. Arguments passed to git commands are not passed
+        // down to filters.
+        //
+        // We're using the undocumented GIT_CONFIG_PARAMETERS environment
+        // variable over the documented GIT_CONFIG_{COUNT,KEY,VALUE} due
+        // to an apparent bug either in a Windows Python runtime
+        // dependency or in a Python project commonly used to manage hooks
+        // which isn't able to handle the blank environment variables we
+        // need when using GIT_CONFIG_*.
+        //
+        // See https://github.com/desktop/desktop/issues/18945
+        // See https://github.com/git/git/blob/ed155187b429a/config.c#L664
+        ...(enableGitConfigParameters()
+          ? {
+              GIT_CONFIG_PARAMETERS: `${gitEnvConfigPrefix}'credential.helper=' 'credential.helper=desktop'`,
+            }
+          : {
+              GIT_CONFIG_COUNT: '2',
+              GIT_CONFIG_KEY_0: 'credential.helper',
+              GIT_CONFIG_VALUE_0: '',
+              GIT_CONFIG_KEY_1: 'credential.helper',
+              GIT_CONFIG_VALUE_1: 'desktop',
+            }),
+        GIT_USER_AGENT: await GitUserAgent(),
         ...sshEnv,
       })
+    } catch (e) {
+      if (!getIsBackgroundTaskEnvironment(token)) {
+        // If the operation fails with an SSHAuthenticationFailed error, we
+        // assume that it's because the last credential we provided via the
+        // askpass handler was rejected. That's not necessarily the case but for
+        // practical purposes, it's as good as we can get with the information we
+        // have. We're limited by the ASKPASS flow here.
+        if (isSSHAuthFailure(e)) {
+          deleteMostRecentSSHCredential(token)
+        }
+      }
+
+      // Prior to us introducing the credential helper trampoline, our askpass
+      // trampoline would return an empty string as the username and password if
+      // we were unable to find an account or acquire credentials from the user.
+      // Git would take that to mean that the literal username and password were
+      // an empty string and would attempt to authenticate with those. This
+      // would fail and Git would then exit with an authentication error which
+      // would bubble up to the user. Now that we're using the credential helper
+      // Git knows that we failed to provide credentials and instead of trying
+      // to authenticate with an empty string it will exit with an error saying
+      // that it couldn't read the username since terminal prompts were
+      // disabled.
+      //
+      // We catch that specific error here and throw the user-friendly
+      // authentication failed error that we've always done in the past.
+      if (
+        hasRejectedCredentialsForEndpoint.has(token) &&
+        e instanceof GitError &&
+        fatalPromptsDisabledRe.test(e.message)
+      ) {
+        const msg = 'Authentication failed: user cancelled authentication'
+        const gitErrorDescription =
+          getDescriptionForError(DugiteError.HTTPSAuthenticationFailed, '') ??
+          msg
 
-      await storePendingSSHSecret(token)
+        const fakeAuthError = new GitError(
+          { ...e.result, gitErrorDescription },
+          e.args,
+          msg
+        )
 
-      return result
+        fakeAuthError.cause = e
+        throw fakeAuthError
+      }
+
+      throw e
     } finally {
-      removePendingSSHSecretToStore(token)
+      removeMostRecentSSHCredential(token)
+      isBackgroundTaskEnvironment.delete(token)
+      hasRejectedCredentialsForEndpoint.delete(token)
+      trampolineEnvironmentPath.delete(token)
     }
   })
 }
 
-/** Returns the path of the desktop-trampoline binary. */
-export function getDesktopTrampolinePath(): string {
+const isSSHAuthFailure = (e: unknown): e is GitError =>
+  e instanceof GitError &&
+  (e.result.gitError === DugiteError.SSHAuthenticationFailed ||
+    e.result.gitError === DugiteError.SSHPermissionDenied)
+
+/** Returns the path of the desktop-askpass-trampoline binary. */
+export function getDesktopAskpassTrampolinePath(): string {
   return Path.resolve(
     __dirname,
     'desktop-trampoline',
-    getDesktopTrampolineFilename()
+    getDesktopAskpassTrampolineFilename()
   )
 }
 
diff --git a/app/src/lib/trampoline/trampoline-server.ts b/app/src/lib/trampoline/trampoline-server.ts
index cb64fd48b59..a866049b9ec 100644
--- a/app/src/lib/trampoline/trampoline-server.ts
+++ b/app/src/lib/trampoline/trampoline-server.ts
@@ -1,7 +1,6 @@
 import { createServer, AddressInfo, Server, Socket } from 'net'
 import split2 from 'split2'
 import { sendNonFatalException } from '../helpers/non-fatal-exception'
-import { askpassTrampolineHandler } from './trampoline-askpass-handler'
 import {
   ITrampolineCommand,
   TrampolineCommandHandler,
@@ -42,11 +41,6 @@ export class TrampolineServer {
     // suite runner would never finish, hitting a 45min timeout for the whole
     // GitHub Action.
     this.server.unref()
-
-    this.registerCommandHandler(
-      TrampolineCommandIdentifier.AskPass,
-      askpassTrampolineHandler
-    )
   }
 
   private async listen(): Promise<void> {
@@ -158,7 +152,7 @@ export class TrampolineServer {
    * @param identifier Identifier of the command.
    * @param handler Handler to register.
    */
-  private registerCommandHandler(
+  public registerCommandHandler(
     identifier: TrampolineCommandIdentifier,
     handler: TrampolineCommandHandler
   ) {
@@ -177,7 +171,9 @@ export class TrampolineServer {
       return
     }
 
-    const result = await handler(command)
+    const result = await handler(command).catch(e =>
+      log.error('Error processing trampoline command', e)
+    )
 
     if (result !== undefined) {
       socket.end(result)
diff --git a/app/src/lib/trampoline/trampoline-ui-helper.ts b/app/src/lib/trampoline/trampoline-ui-helper.ts
index 7e6fe66d5e0..51e66310fc8 100644
--- a/app/src/lib/trampoline/trampoline-ui-helper.ts
+++ b/app/src/lib/trampoline/trampoline-ui-helper.ts
@@ -1,5 +1,8 @@
+import { Account } from '../../models/account'
+import { IGitAccount } from '../../models/git-account'
 import { PopupType } from '../../models/popup'
 import { Dispatcher } from '../../ui/dispatcher'
+import { SignInResult } from '../stores'
 
 type PromptSSHSecretResponse = {
   readonly secret: string | undefined
@@ -57,6 +60,48 @@ class TrampolineUIHelper {
       })
     })
   }
+
+  public promptForGenericGitAuthentication(
+    endpoint: string,
+    username?: string
+  ): Promise<IGitAccount | undefined> {
+    return new Promise(resolve => {
+      this.dispatcher.showPopup({
+        type: PopupType.GenericGitAuthentication,
+        remoteUrl: endpoint,
+        username,
+        onSubmit: (login: string, token: string) =>
+          resolve({ login, token, endpoint }),
+        onDismiss: () => resolve(undefined),
+      })
+    })
+  }
+
+  public promptForGitHubSignIn(endpoint: string): Promise<Account | undefined> {
+    return new Promise<Account | undefined>(async resolve => {
+      const cb = (result: SignInResult) => {
+        resolve(result.kind === 'success' ? result.account : undefined)
+        this.dispatcher.closePopup(PopupType.SignIn)
+      }
+
+      const { hostname, origin } = new URL(endpoint)
+      if (hostname === 'github.com') {
+        this.dispatcher.beginDotComSignIn(cb)
+      } else {
+        this.dispatcher.beginEnterpriseSignIn(cb)
+        await this.dispatcher.setSignInEndpoint(origin)
+      }
+
+      this.dispatcher.showPopup({
+        type: PopupType.SignIn,
+        isCredentialHelperSignIn: true,
+        credentialHelperUrl: endpoint,
+      })
+    }).catch(e => {
+      log.error(`Could not prompt for GitHub sign in`, e)
+      return undefined
+    })
+  }
 }
 
 export const trampolineUIHelper = new TrampolineUIHelper()
diff --git a/app/src/lib/trampoline/url-without-credentials.ts b/app/src/lib/trampoline/url-without-credentials.ts
new file mode 100644
index 00000000000..cec2631ccf1
--- /dev/null
+++ b/app/src/lib/trampoline/url-without-credentials.ts
@@ -0,0 +1,6 @@
+export function urlWithoutCredentials(remoteUrl: string | URL): string {
+  const url = new URL(remoteUrl)
+  url.username = ''
+  url.password = ''
+  return url.toString()
+}
diff --git a/app/src/lib/trampoline/use-external-credential-helper.ts b/app/src/lib/trampoline/use-external-credential-helper.ts
new file mode 100644
index 00000000000..12ff1556810
--- /dev/null
+++ b/app/src/lib/trampoline/use-external-credential-helper.ts
@@ -0,0 +1,11 @@
+import { getBoolean, setBoolean } from '../local-storage'
+
+export const useExternalCredentialHelperDefault = false
+export const useExternalCredentialHelperKey: string =
+  'useExternalCredentialHelper'
+
+export const useExternalCredentialHelper = () =>
+  getBoolean(useExternalCredentialHelperKey, useExternalCredentialHelperDefault)
+
+export const setUseExternalCredentialHelper = (value: boolean) =>
+  setBoolean(useExternalCredentialHelperKey, value)
diff --git a/app/src/lib/unique-coauthors-as-authors.ts b/app/src/lib/unique-coauthors-as-authors.ts
index 9e4ee710b88..4d45bf34833 100644
--- a/app/src/lib/unique-coauthors-as-authors.ts
+++ b/app/src/lib/unique-coauthors-as-authors.ts
@@ -1,21 +1,18 @@
-import _ from 'lodash'
-import { IAuthor } from '../models/author'
+import uniqWith from 'lodash/uniqWith'
+import { KnownAuthor } from '../models/author'
 import { Commit } from '../models/commit'
-import { GitAuthor } from '../models/git-author'
 
 export function getUniqueCoauthorsAsAuthors(
   commits: ReadonlyArray<Commit>
-): ReadonlyArray<IAuthor> {
-  const allCommitsCoAuthors: GitAuthor[] = _.flatten(
-    commits.map(c => c.coAuthors)
-  )
+): ReadonlyArray<KnownAuthor> {
+  const allCommitsCoAuthors = commits.flatMap(c => c.coAuthors)
 
-  const uniqueCoAuthors = _.uniqWith(
+  const uniqueCoAuthors = uniqWith(
     allCommitsCoAuthors,
     (a, b) => a.email === b.email && a.name === b.name
   )
 
   return uniqueCoAuthors.map(ca => {
-    return { name: ca.name, email: ca.email, username: null }
+    return { kind: 'known', name: ca.name, email: ca.email, username: null }
   })
 }
diff --git a/app/src/main-process/alive-origin-filter.ts b/app/src/main-process/alive-origin-filter.ts
index 5b6800da1cb..64b4d93b9bc 100644
--- a/app/src/main-process/alive-origin-filter.ts
+++ b/app/src/main-process/alive-origin-filter.ts
@@ -8,19 +8,26 @@ export function installAliveOriginFilter(orderedWebRequest: OrderedWebRequest) {
   orderedWebRequest.onBeforeSendHeaders.addEventListener(async details => {
     const { protocol, host } = new URL(details.url)
 
-    // If it's a WebSocket Secure request directed to a github.com subdomain,
-    // probably related to the Alive server, we need to override the `Origin`
-    // header with a valid value.
-    if (protocol === 'wss:' && /(^|\.)github\.com$/.test(host)) {
-      return {
-        requestHeaders: {
-          ...details.requestHeaders,
-          // TODO: discuss with Alive team a good Origin value to use here
-          Origin: 'https://desktop.github.com',
-        },
-      }
+    // Here we're only interested in WebSockets
+    if (protocol !== 'wss:') {
+      return {}
     }
 
-    return {}
+    // Alive URLs are supposed to be prefixed by "alive" and then the hostname
+    if (
+      !/^alive\.github\.com$/.test(host) &&
+      !/^alive\.(.*)\.ghe\.com$/.test(host)
+    ) {
+      return {}
+    }
+
+    // We will just replace the `alive` prefix (which indicates the service)
+    // with `desktop`.
+    return {
+      requestHeaders: {
+        ...details.requestHeaders,
+        Origin: `https://${host.replace('alive.', 'desktop.')}`,
+      },
+    }
   })
 }
diff --git a/app/src/main-process/app-window.ts b/app/src/main-process/app-window.ts
index 54fff826f05..0a2435f7f9e 100644
--- a/app/src/main-process/app-window.ts
+++ b/app/src/main-process/app-window.ts
@@ -6,6 +6,7 @@ import {
   autoUpdater,
   nativeTheme,
 } from 'electron'
+import { shell } from '../lib/app-shell'
 import { Emitter, Disposable } from 'event-kit'
 import { encodePathAsUrl } from '../lib/path'
 import {
@@ -25,6 +26,9 @@ import {
   installNotificationCallback,
   terminateDesktopNotifications,
 } from './notifications'
+import { addTrustedIPCSender } from './trusted-ipc-sender'
+import { getUpdaterGUID } from '../lib/get-updater-guid'
+import { CLIAction } from '../lib/cli-action'
 
 export class AppWindow {
   private window: Electron.BrowserWindow
@@ -32,6 +36,7 @@ export class AppWindow {
 
   private _loadTime: number | null = null
   private _rendererReadyTime: number | null = null
+  private isDownloadingUpdate: boolean = false
 
   private minWidth = 960
   private minHeight = 660
@@ -77,6 +82,7 @@ export class AppWindow {
     }
 
     this.window = new BrowserWindow(windowOptions)
+    addTrustedIPCSender(this.window.webContents)
 
     installNotificationCallback(this.window)
 
@@ -84,6 +90,7 @@ export class AppWindow {
     this.shouldMaximizeOnShow = savedWindowState.isMaximized
 
     let quitting = false
+    let quittingEvenIfUpdating = false
     app.on('before-quit', () => {
       quitting = true
     })
@@ -93,7 +100,39 @@ export class AppWindow {
       event.returnValue = true
     })
 
+    ipcMain.on('will-quit-even-if-updating', event => {
+      quitting = true
+      quittingEvenIfUpdating = true
+      event.returnValue = true
+    })
+
+    ipcMain.on('cancel-quitting', event => {
+      quitting = false
+      quittingEvenIfUpdating = false
+      event.returnValue = true
+    })
+
     this.window.on('close', e => {
+      // On macOS, closing the window doesn't mean the app is quitting. If the
+      // app is updating, we will prevent the window from closing only when the
+      // app is also quitting.
+      if (
+        (!__DARWIN__ || quitting) &&
+        !quittingEvenIfUpdating &&
+        this.isDownloadingUpdate
+      ) {
+        e.preventDefault()
+        ipcWebContents.send(this.window.webContents, 'show-installing-update')
+
+        // Make sure the window is visible, so the user can see why we're
+        // preventing the app from quitting. This is important on macOS, where
+        // the window could be hidden/closed when the user tries to quit.
+        // It could also happen on Windows if the user quits the app from the
+        // task bar while it's in the background.
+        this.show()
+        return
+      }
+
       // on macOS, when the user closes the window we really just hide it. This
       // lets us activate quickly and keep all our interesting logic in the
       // renderer.
@@ -102,9 +141,9 @@ export class AppWindow {
         // https://github.com/desktop/desktop/issues/12838
         if (this.window.isFullScreen()) {
           this.window.setFullScreen(false)
-          this.window.once('leave-full-screen', () => app.hide())
+          this.window.once('leave-full-screen', () => this.window.hide())
         } else {
-          app.hide()
+          this.window.hide()
         }
         return
       }
@@ -211,7 +250,7 @@ export class AppWindow {
     return !!this.loadTime && !!this.rendererReadyTime
   }
 
-  public onClose(fn: () => void) {
+  public onClosed(fn: () => void) {
     this.window.on('closed', fn)
   }
 
@@ -274,6 +313,13 @@ export class AppWindow {
     ipcWebContents.send(this.window.webContents, 'url-action', action)
   }
 
+  /** Send the URL action to the renderer. */
+  public sendCLIAction(action: CLIAction) {
+    this.show()
+
+    ipcWebContents.send(this.window.webContents, 'cli-action', action)
+  }
+
   /** Send the app launch timing stats to the renderer. */
   public sendLaunchTimingStats(stats: ILaunchStats) {
     ipcWebContents.send(this.window.webContents, 'launch-timing-stats', stats)
@@ -288,6 +334,32 @@ export class AppWindow {
     }
   }
 
+  /** Handle when a modal dialog is opened. */
+  public dialogDidOpen() {
+    if (this.window.isFocused()) {
+      // No additional notifications are needed.
+      return
+    }
+    // Care is taken to mimic OS dialog behaviors.
+    if (__DARWIN__) {
+      // macOS beeps when a modal dialog is opened.
+      shell.beep()
+      // See https://developer.apple.com/documentation/appkit/nsapplication/1428358-requestuserattention
+      // "If the inactive app presents a modal panel, this method will be invoked with NSCriticalRequest
+      // automatically. The modal panel is not brought to the front for an inactive app."
+      // NOTE: flashFrame() uses the 'informational' level, so we need to explicitly bounce the dock
+      // with the 'critical' level in order to that described behavior.
+      app.dock.bounce('critical')
+    } else {
+      // See https://learn.microsoft.com/en-us/windows/win32/uxguide/winenv-taskbar#taskbar-button-flashing
+      // "If an inactive program requires immediate attention,
+      // flash its taskbar button to draw attention and leave it highlighted."
+      // It advises not to beep.
+      this.window.once('focus', () => this.window.flashFrame(false))
+      this.window.flashFrame(true)
+    }
+  }
+
   /** Send a certificate error to the renderer. */
   public sendCertificateError(
     certificate: Electron.Certificate,
@@ -342,10 +414,12 @@ export class AppWindow {
 
   public setupAutoUpdater() {
     autoUpdater.on('error', (error: Error) => {
+      this.isDownloadingUpdate = false
       ipcWebContents.send(this.window.webContents, 'auto-updater-error', error)
     })
 
     autoUpdater.on('checking-for-update', () => {
+      this.isDownloadingUpdate = false
       ipcWebContents.send(
         this.window.webContents,
         'auto-updater-checking-for-update'
@@ -353,6 +427,7 @@ export class AppWindow {
     })
 
     autoUpdater.on('update-available', () => {
+      this.isDownloadingUpdate = true
       ipcWebContents.send(
         this.window.webContents,
         'auto-updater-update-available'
@@ -360,6 +435,7 @@ export class AppWindow {
     })
 
     autoUpdater.on('update-not-available', () => {
+      this.isDownloadingUpdate = false
       ipcWebContents.send(
         this.window.webContents,
         'auto-updater-update-not-available'
@@ -367,6 +443,7 @@ export class AppWindow {
     })
 
     autoUpdater.on('update-downloaded', () => {
+      this.isDownloadingUpdate = false
       ipcWebContents.send(
         this.window.webContents,
         'auto-updater-update-downloaded'
@@ -374,9 +451,9 @@ export class AppWindow {
     })
   }
 
-  public checkForUpdates(url: string) {
+  public async checkForUpdates(url: string) {
     try {
-      autoUpdater.setFeedURL({ url })
+      autoUpdater.setFeedURL({ url: await trySetUpdaterGuid(url) })
       autoUpdater.checkForUpdates()
     } catch (e) {
       return e
@@ -439,3 +516,18 @@ export class AppWindow {
     return filePaths.length > 0 ? filePaths[0] : null
   }
 }
+
+const trySetUpdaterGuid = async (url: string) => {
+  try {
+    const id = await getUpdaterGUID()
+    if (!id) {
+      return url
+    }
+
+    const parsed = new URL(url)
+    parsed.searchParams.set('guid', id)
+    return parsed.toString()
+  } catch (e) {
+    return url
+  }
+}
diff --git a/app/src/main-process/authenticated-avatar-filter.ts b/app/src/main-process/authenticated-avatar-filter.ts
deleted file mode 100644
index cb7b8ace5a6..00000000000
--- a/app/src/main-process/authenticated-avatar-filter.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { EndpointToken } from '../lib/endpoint-token'
-import { OrderedWebRequest } from './ordered-webrequest'
-
-/**
- * Installs a web request filter which adds the Authorization header for
- * unauthenticated requests to the GHES/GHAE private avatars API.
- *
- * Returns a method that can be used to update the list of signed-in accounts
- * which is used to resolve which token to use.
- */
-export function installAuthenticatedAvatarFilter(
-  orderedWebRequest: OrderedWebRequest
-) {
-  let originTokens = new Map<string, string>()
-
-  orderedWebRequest.onBeforeSendHeaders.addEventListener(async details => {
-    const { origin, pathname } = new URL(details.url)
-    const token = originTokens.get(origin)
-
-    if (token && pathname.startsWith('/api/v3/enterprise/avatars/')) {
-      return {
-        requestHeaders: {
-          ...details.requestHeaders,
-          Authorization: `token ${token}`,
-        },
-      }
-    }
-
-    return {}
-  })
-
-  return (accounts: ReadonlyArray<EndpointToken>) => {
-    originTokens = new Map(
-      accounts.map(({ endpoint, token }) => [new URL(endpoint).origin, token])
-    )
-  }
-}
diff --git a/app/src/main-process/authenticated-image-filter.ts b/app/src/main-process/authenticated-image-filter.ts
new file mode 100644
index 00000000000..8e970193719
--- /dev/null
+++ b/app/src/main-process/authenticated-image-filter.ts
@@ -0,0 +1,64 @@
+import { getDotComAPIEndpoint, getHTMLURL } from '../lib/api'
+import { EndpointToken } from '../lib/endpoint-token'
+import { OrderedWebRequest } from './ordered-webrequest'
+
+function isEnterpriseAvatarPath(pathname: string) {
+  return pathname.startsWith('/api/v3/enterprise/avatars/')
+}
+
+function isGitHubRepoAssetPath(pathname: string) {
+  // Matches paths like: /repo/owner/assets/userID/guid
+  return (
+    /^\/[^/]+\/[^/]+\/assets\/[^/]+\/[^/]+\/?$/.test(pathname) ||
+    // or: /user-attachments/assets/guid
+    /^\/user-attachments\/assets\/[^/]+\/?$/.test(pathname)
+  )
+}
+
+/**
+ * Installs a web request filter which adds the Authorization header for
+ * unauthenticated requests to the GHES/GHAE private avatars API, and for private
+ * repo assets.
+ *
+ * Returns a method that can be used to update the list of signed-in accounts
+ * which is used to resolve which token to use.
+ */
+export function installAuthenticatedImageFilter(
+  orderedWebRequest: OrderedWebRequest
+) {
+  let originTokens = new Map<string, string>()
+
+  orderedWebRequest.onBeforeSendHeaders.addEventListener(async details => {
+    const { origin, pathname } = new URL(details.url)
+    const token = originTokens.get(origin)
+
+    if (
+      token &&
+      (isEnterpriseAvatarPath(pathname) || isGitHubRepoAssetPath(pathname))
+    ) {
+      return {
+        requestHeaders: {
+          ...details.requestHeaders,
+          Authorization: `token ${token}`,
+        },
+      }
+    }
+
+    return {}
+  })
+
+  return (accounts: ReadonlyArray<EndpointToken>) => {
+    originTokens = new Map(
+      accounts.map(({ endpoint, token }) => [new URL(endpoint).origin, token])
+    )
+
+    // If we have a token for api.github.com, add another entry in our
+    // tokens-by-origin map with the same token for github.com. This is
+    // necessary for private image URLs.
+    const dotComAPIEndpoint = getDotComAPIEndpoint()
+    const dotComAPIToken = originTokens.get(dotComAPIEndpoint)
+    if (dotComAPIToken) {
+      originTokens.set(getHTMLURL(dotComAPIEndpoint), dotComAPIToken)
+    }
+  }
+}
diff --git a/app/src/main-process/crash-window.ts b/app/src/main-process/crash-window.ts
index 3a934d05896..d91fee11efc 100644
--- a/app/src/main-process/crash-window.ts
+++ b/app/src/main-process/crash-window.ts
@@ -4,6 +4,7 @@ import { ICrashDetails, ErrorType } from '../crash/shared'
 import { registerWindowStateChangedEvents } from '../lib/window-state'
 import * as ipcMain from './ipc-main'
 import * as ipcWebContents from './ipc-webcontents'
+import { addTrustedIPCSender } from './trusted-ipc-sender'
 
 const minWidth = 600
 const minHeight = 500
@@ -51,6 +52,7 @@ export class CrashWindow {
     }
 
     this.window = new BrowserWindow(windowOptions)
+    addTrustedIPCSender(this.window.webContents)
 
     this.error = error
     this.errorType = errorType
diff --git a/app/src/main-process/desktop-file-transport.ts b/app/src/main-process/desktop-file-transport.ts
index 0ec6e714ed3..7bda371d672 100644
--- a/app/src/main-process/desktop-file-transport.ts
+++ b/app/src/main-process/desktop-file-transport.ts
@@ -5,7 +5,7 @@ import TransportStream, { TransportStreamOptions } from 'winston-transport'
 import { EOL } from 'os'
 import { readdir, unlink } from 'fs/promises'
 import { promisify } from 'util'
-import { escapeRegExp } from 'lodash'
+import escapeRegExp from 'lodash/escapeRegExp'
 
 type DesktopFileTransportOptions = TransportStreamOptions & {
   readonly logDirectory: string
diff --git a/app/src/main-process/ipc-main.ts b/app/src/main-process/ipc-main.ts
index 1260ccfa25e..a68f4c99f5b 100644
--- a/app/src/main-process/ipc-main.ts
+++ b/app/src/main-process/ipc-main.ts
@@ -2,6 +2,17 @@ import { RequestChannels, RequestResponseChannels } from '../lib/ipc-shared'
 // eslint-disable-next-line no-restricted-imports
 import { ipcMain } from 'electron'
 import { IpcMainEvent, IpcMainInvokeEvent } from 'electron/main'
+import { isTrustedIPCSender } from './trusted-ipc-sender'
+
+type RequestChannelListener<T extends keyof RequestChannels> = (
+  event: IpcMainEvent,
+  ...args: Parameters<RequestChannels[T]>
+) => void
+
+type RequestResponseChannelListener<T extends keyof RequestResponseChannels> = (
+  event: IpcMainInvokeEvent,
+  ...args: Parameters<RequestResponseChannels[T]>
+) => ReturnType<RequestResponseChannels[T]>
 
 /**
  * Subscribes to the specified IPC channel and provides strong typing of
@@ -10,12 +21,9 @@ import { IpcMainEvent, IpcMainInvokeEvent } from 'electron/main'
  */
 export function on<T extends keyof RequestChannels>(
   channel: T,
-  listener: (
-    event: IpcMainEvent,
-    ...args: Parameters<RequestChannels[T]>
-  ) => void
+  listener: RequestChannelListener<T>
 ) {
-  ipcMain.on(channel, (event, ...args) => listener(event, ...(args as any)))
+  ipcMain.on(channel, safeListener(listener))
 }
 
 /**
@@ -25,12 +33,9 @@ export function on<T extends keyof RequestChannels>(
  */
 export function once<T extends keyof RequestChannels>(
   channel: T,
-  listener: (
-    event: IpcMainEvent,
-    ...args: Parameters<RequestChannels[T]>
-  ) => void
+  listener: RequestChannelListener<T>
 ) {
-  ipcMain.once(channel, (event, ...args) => listener(event, ...(args as any)))
+  ipcMain.once(channel, safeListener(listener))
 }
 
 /**
@@ -40,10 +45,22 @@ export function once<T extends keyof RequestChannels>(
  */
 export function handle<T extends keyof RequestResponseChannels>(
   channel: T,
-  listener: (
-    event: IpcMainInvokeEvent,
-    ...args: Parameters<RequestResponseChannels[T]>
-  ) => ReturnType<RequestResponseChannels[T]>
+  listener: RequestResponseChannelListener<T>
+) {
+  ipcMain.handle(channel, safeListener(listener))
+}
+
+function safeListener<E extends IpcMainEvent | IpcMainInvokeEvent, R>(
+  listener: (event: E, ...a: any) => R
 ) {
-  ipcMain.handle(channel, (event, ...args) => listener(event, ...(args as any)))
+  return (event: E, ...args: any) => {
+    if (!isTrustedIPCSender(event.sender)) {
+      log.error(
+        `IPC message received from invalid sender: ${event.senderFrame.url}`
+      )
+      return
+    }
+
+    return listener(event, ...args)
+  }
 }
diff --git a/app/src/main-process/log.ts b/app/src/main-process/log.ts
index 213280ef63f..9186f9a002f 100644
--- a/app/src/main-process/log.ts
+++ b/app/src/main-process/log.ts
@@ -1,7 +1,7 @@
 import * as winston from 'winston'
 import { getLogDirectoryPath } from '../lib/logging/get-log-path'
 import { LogLevel } from '../lib/logging/log-level'
-import { noop } from 'lodash'
+import noop from 'lodash/noop'
 import { DesktopConsoleTransport } from './desktop-console-transport'
 import memoizeOne from 'memoize-one'
 import { mkdir } from 'fs/promises'
diff --git a/app/src/main-process/main.ts b/app/src/main-process/main.ts
index 114480145f1..81cc75ffd68 100644
--- a/app/src/main-process/main.ts
+++ b/app/src/main-process/main.ts
@@ -10,13 +10,16 @@ import {
   nativeTheme,
 } from 'electron'
 import * as Fs from 'fs'
-import * as URL from 'url'
 
 import { AppWindow } from './app-window'
 import { buildDefaultMenu, getAllMenuItems } from './menu'
 import { shellNeedsPatching, updateEnvironmentForProcess } from '../lib/shell'
 import { parseAppURL } from '../lib/parse-app-url'
-import { handleSquirrelEvent } from './squirrel-updater'
+import {
+  handleSquirrelEvent,
+  installWindowsCLI,
+  uninstallWindowsCLI,
+} from './squirrel-updater'
 import { fatalError } from '../lib/fatal-error'
 
 import { log as writeLog } from './log'
@@ -30,7 +33,7 @@ import { now } from './now'
 import { showUncaughtException } from './show-uncaught-exception'
 import { buildContextMenu } from './menu/build-context-menu'
 import { OrderedWebRequest } from './ordered-webrequest'
-import { installAuthenticatedAvatarFilter } from './authenticated-avatar-filter'
+import { installAuthenticatedImageFilter } from './authenticated-image-filter'
 import { installAliveOriginFilter } from './alive-origin-filter'
 import { installSameOriginFilter } from './same-origin-filter'
 import * as ipcMain from './ipc-main'
@@ -46,6 +49,8 @@ import {
   showNotification,
 } from 'desktop-notifications'
 import { initializeDesktopNotifications } from './notifications'
+import parseCommandLineArgs from 'minimist'
+import { CLIAction } from '../lib/cli-action'
 
 app.setAppLogsPath()
 enableSourceMaps()
@@ -135,22 +140,20 @@ process.on('uncaughtException', (error: Error) => {
 let handlingSquirrelEvent = false
 if (__WIN32__ && process.argv.length > 1) {
   const arg = process.argv[1]
-
   const promise = handleSquirrelEvent(arg)
+
   if (promise) {
     handlingSquirrelEvent = true
     promise
-      .catch(e => {
-        log.error(`Failed handling Squirrel event: ${arg}`, e)
-      })
-      .then(() => {
-        app.quit()
-      })
-  } else {
-    handlePossibleProtocolLauncherArgs(process.argv)
+      .catch(e => log.error(`Failed handling Squirrel event: ${arg}`, e))
+      .then(() => app.quit())
   }
 }
 
+if (!handlingSquirrelEvent) {
+  handleCommandLineArguments(process.argv)
+}
+
 initializeDesktopNotifications()
 
 function handleAppURL(url: string) {
@@ -186,7 +189,7 @@ if (!handlingSquirrelEvent) {
       mainWindow.focus()
     }
 
-    handlePossibleProtocolLauncherArgs(args)
+    handleCommandLineArguments(args)
   })
 
   if (isDuplicateInstance) {
@@ -225,53 +228,46 @@ if (__DARWIN__) {
         return
       }
 
-      handleAppURL(
-        `x-github-client://openLocalRepo/${encodeURIComponent(path)}`
-      )
+      // Yeah this isn't technically a CLI action we use it here to indicate
+      // that it's more trusted than a URL action.
+      handleCLIAction({ kind: 'open-repository', path })
     })
   })
 }
 
-/**
- * Attempt to detect and handle any protocol handler arguments passed
- * either via the command line directly to the current process or through
- * IPC from a duplicate instance (see makeSingleInstance)
- *
- * @param args Essentially process.argv, i.e. the first element is the exec
- *             path
- */
-function handlePossibleProtocolLauncherArgs(args: ReadonlyArray<string>) {
-  log.info(`Received possible protocol arguments: ${args.length}`)
+async function handleCommandLineArguments(argv: string[]) {
+  const args = parseCommandLineArgs(argv)
 
-  if (__WIN32__) {
-    // Desktop registers it's protocol handler callback on Windows as
-    // `[executable path] --protocol-launcher "%1"`. Note that extra command
-    // line arguments might be added by Chromium
-    // (https://electronjs.org/docs/api/app#event-second-instance).
-    // At launch Desktop checks for that exact scenario here before doing any
-    // processing. If there's more than one matching url argument because of a
-    // malformed or untrusted url then we bail out.
-
-    const matchingUrls = args.filter(arg => {
-      // sometimes `URL.parse` throws an error
-      try {
-        const url = URL.parse(arg)
-        // i think this `slice` is just removing a trailing `:`
-        return url.protocol && possibleProtocols.has(url.protocol.slice(0, -1))
-      } catch (e) {
-        log.error(`Unable to parse argument as URL: ${arg}`)
-        return false
-      }
-    })
+  // Desktop registers it's protocol handler callback on Windows as
+  // `[executable path] --protocol-launcher "%1"`. Note that extra command
+  // line arguments might be added by Chromium
+  // (https://electronjs.org/docs/api/app#event-second-instance).
+  if (__WIN32__ && typeof args['protocol-launcher'] === 'string') {
+    handleAppURL(args['protocol-launcher'])
+    return
+  }
 
-    if (args.includes(protocolLauncherArg) && matchingUrls.length === 1) {
-      handleAppURL(matchingUrls[0])
-    } else {
-      log.error(`Malformed launch arguments received: ${args}`)
-    }
-  } else if (args.length > 1) {
-    handleAppURL(args[1])
+  if (typeof args['cli-open'] === 'string') {
+    handleCLIAction({ kind: 'open-repository', path: args['cli-open'] })
+  } else if (typeof args['cli-clone'] === 'string') {
+    handleCLIAction({
+      kind: 'clone-url',
+      url: args['cli-clone'],
+      branch:
+        typeof args['cli-branch'] === 'string' ? args['cli-branch'] : undefined,
+    })
   }
+
+  return
+}
+
+function handleCLIAction(action: CLIAction) {
+  onDidLoad(window => {
+    // This manual focus call _shouldn't_ be necessary, but is for Chrome on
+    // macOS. See https://github.com/desktop/desktop/issues/973.
+    window.focus()
+    window.sendCLIAction(action)
+  })
 }
 
 /**
@@ -317,8 +313,9 @@ app.on('ready', () => {
   // Ensures Alive websocket sessions are initiated with an acceptable Origin
   installAliveOriginFilter(orderedWebRequest)
 
-  // Adds an authorization header for requests of avatars on GHES
-  const updateAccounts = installAuthenticatedAvatarFilter(orderedWebRequest)
+  // Adds an authorization header for requests of avatars on GHES and private
+  // repo assets
+  const updateAccounts = installAuthenticatedImageFilter(orderedWebRequest)
 
   Menu.setApplicationMenu(
     buildDefaultMenu({
@@ -490,6 +487,8 @@ app.on('ready', () => {
     mainWindow?.quitAndInstallUpdate()
   )
 
+  ipcMain.on('quit-app', () => app.quit())
+
   ipcMain.on('minimize-window', () => mainWindow?.minimizeWindow())
 
   ipcMain.on('maximize-window', () => mainWindow?.maximizeWindow())
@@ -519,6 +518,11 @@ app.on('ready', () => {
     mainWindow?.setWindowZoomFactor(zoomFactor)
   )
 
+  if (__WIN32__) {
+    ipcMain.on('install-windows-cli', installWindowsCLI)
+    ipcMain.on('uninstall-windows-cli', uninstallWindowsCLI)
+  }
+
   /**
    * An event sent by the renderer asking for a copy of the current
    * application menu.
@@ -605,6 +609,9 @@ app.on('ready', () => {
     mainWindow?.selectAllWindowContents()
   )
 
+  /** An event sent by the renderer indicating a modal dialog is opened */
+  ipcMain.on('dialog-did-open', () => mainWindow?.dialogDidOpen())
+
   /**
    * An event sent by the renderer asking whether the Desktop is in the
    * applications folder
@@ -687,11 +694,11 @@ app.on('activate', () => {
 })
 
 app.on('web-contents-created', (event, contents) => {
-  contents.on('new-window', (event, url) => {
-    // Prevent links or window.open from opening new windows
-    event.preventDefault()
+  contents.setWindowOpenHandler(({ url }) => {
     log.warn(`Prevented new window to: ${url}`)
+    return { action: 'deny' }
   })
+
   // prevent link navigation within our windows
   // see https://www.electronjs.org/docs/tutorial/security#12-disable-or-limit-navigation
   contents.on('will-navigate', (event, url) => {
@@ -720,14 +727,18 @@ function createWindow() {
       REACT_DEVELOPER_TOOLS,
     } = require('electron-devtools-installer')
 
-    require('electron-debug')({ showDevTools: true })
-
     const ChromeLens = {
       id: 'idikgljglpfilbhaboonnpnnincjhjkd',
       electron: '>=1.2.1',
     }
 
-    const extensions = [REACT_DEVELOPER_TOOLS, ChromeLens]
+    const axeDevTools = {
+      id: 'lhdoppojpmngadmnindnejefpokejbdd',
+      electron: '>=1.2.1',
+      Permissions: ['tabs', 'debugger'],
+    }
+
+    const extensions = [REACT_DEVELOPER_TOOLS, ChromeLens, axeDevTools]
 
     for (const extension of extensions) {
       try {
@@ -738,7 +749,7 @@ function createWindow() {
     }
   }
 
-  window.onClose(() => {
+  window.onClosed(() => {
     mainWindow = null
     if (!__DARWIN__ && !preventQuit) {
       app.quit()
diff --git a/app/src/main-process/menu/build-default-menu.ts b/app/src/main-process/menu/build-default-menu.ts
index a79f1dba508..a67781c2921 100644
--- a/app/src/main-process/menu/build-default-menu.ts
+++ b/app/src/main-process/menu/build-default-menu.ts
@@ -5,11 +5,10 @@ import { truncateWithEllipsis } from '../../lib/truncate-with-ellipsis'
 import { getLogDirectoryPath } from '../../lib/logging/get-log-path'
 import { UNSAFE_openDirectory } from '../shell'
 import { MenuLabelsEvent } from '../../models/menu-labels'
-import { enableSquashMerging } from '../../lib/feature-flag'
 import * as ipcWebContents from '../ipc-webcontents'
 import { mkdir } from 'fs/promises'
+import { buildTestMenu } from './build-test-menu'
 
-const platformDefaultShell = __WIN32__ ? 'Command Prompt' : 'Terminal'
 const createPullRequestLabel = __DARWIN__
   ? 'Create Pull Request'
   : 'Create &pull request'
@@ -32,18 +31,25 @@ enum ZoomDirection {
   Out,
 }
 
+export const separator: Electron.MenuItemConstructorOptions = {
+  type: 'separator',
+}
+
 export function buildDefaultMenu({
   selectedExternalEditor,
   selectedShell,
   askForConfirmationOnForcePush,
   askForConfirmationOnRepositoryRemoval,
   hasCurrentPullRequest = false,
-  defaultBranchName = defaultBranchNameValue,
+  contributionTargetDefaultBranch = defaultBranchNameValue,
   isForcePushForCurrentRepository = false,
   isStashedChangesVisible = false,
   askForConfirmationWhenStashingAllChanges = true,
 }: MenuLabelsEvent): Electron.Menu {
-  defaultBranchName = truncateWithEllipsis(defaultBranchName, 25)
+  contributionTargetDefaultBranch = truncateWithEllipsis(
+    contributionTargetDefaultBranch,
+    25
+  )
 
   const removeRepoLabel = askForConfirmationOnRepositoryRemoval
     ? confirmRepositoryRemovalLabel
@@ -54,7 +60,6 @@ export function buildDefaultMenu({
     : createPullRequestLabel
 
   const template = new Array<Electron.MenuItemConstructorOptions>()
-  const separator: Electron.MenuItemConstructorOptions = { type: 'separator' }
 
   if (__DARWIN__) {
     template.push({
@@ -67,7 +72,7 @@ export function buildDefaultMenu({
         },
         separator,
         {
-          label: 'Preferences…',
+          label: 'Settings…',
           id: 'preferences',
           accelerator: 'CmdOrCtrl+,',
           click: emit('show-preferences'),
@@ -76,7 +81,7 @@ export function buildDefaultMenu({
         {
           label: 'Install Command Line Tool…',
           id: 'install-cli',
-          click: emit('install-cli'),
+          click: emit('install-darwin-cli'),
         },
         separator,
         {
@@ -120,6 +125,7 @@ export function buildDefaultMenu({
 
   if (!__DARWIN__) {
     const fileItems = fileMenu.submenu as Electron.MenuItemConstructorOptions[]
+    const exitAccelerator = __WIN32__ ? 'Alt+F4' : 'CmdOrCtrl+Q'
 
     fileItems.push(
       separator,
@@ -133,7 +139,7 @@ export function buildDefaultMenu({
       {
         role: 'quit',
         label: 'E&xit',
-        accelerator: 'Alt+F4',
+        accelerator: exitAccelerator,
       }
     )
   }
@@ -226,6 +232,22 @@ export function buildDefaultMenu({
         accelerator: 'CmdOrCtrl+-',
         click: zoom(ZoomDirection.Out),
       },
+      {
+        label: __DARWIN__
+          ? 'Expand Active Resizable'
+          : 'Expand active resizable',
+        id: 'increase-active-resizable-width',
+        accelerator: 'CmdOrCtrl+9',
+        click: emit('increase-active-resizable-width'),
+      },
+      {
+        label: __DARWIN__
+          ? 'Contract Active Resizable'
+          : 'Contract active resizable',
+        id: 'decrease-active-resizable-width',
+        accelerator: 'CmdOrCtrl+8',
+        click: emit('decrease-active-resizable-width'),
+      },
       separator,
       {
         label: '&Reload',
@@ -235,8 +257,8 @@ export function buildDefaultMenu({
         // chorded shortcuts, but this menu item is not a user-facing feature
         // so we are going to keep this one around.
         accelerator: 'CmdOrCtrl+Alt+R',
-        click(item: any, focusedWindow: Electron.BrowserWindow | undefined) {
-          if (focusedWindow) {
+        click(item: any, focusedWindow: Electron.BaseWindow | undefined) {
+          if (focusedWindow instanceof BrowserWindow) {
             focusedWindow.reload()
           }
         },
@@ -250,8 +272,8 @@ export function buildDefaultMenu({
         accelerator: (() => {
           return __DARWIN__ ? 'Alt+Command+I' : 'Ctrl+Shift+I'
         })(),
-        click(item: any, focusedWindow: Electron.BrowserWindow | undefined) {
-          if (focusedWindow) {
+        click(item: any, focusedWindow: Electron.BaseWindow | undefined) {
+          if (focusedWindow instanceof BrowserWindow) {
             focusedWindow.webContents.toggleDevTools()
           }
         },
@@ -282,6 +304,12 @@ export function buildDefaultMenu({
         accelerator: 'CmdOrCtrl+Shift+P',
         click: emit('pull'),
       },
+      {
+        id: 'fetch',
+        label: __DARWIN__ ? 'Fetch' : '&Fetch',
+        accelerator: 'CmdOrCtrl+Shift+T',
+        click: emit('fetch'),
+      },
       {
         label: removeRepoLabel,
         id: 'remove-repository',
@@ -297,8 +325,8 @@ export function buildDefaultMenu({
       },
       {
         label: __DARWIN__
-          ? `Open in ${selectedShell ?? platformDefaultShell}`
-          : `O&pen in ${selectedShell ?? platformDefaultShell}`,
+          ? `Open in ${selectedShell ?? 'Shell'}`
+          : `O&pen in ${selectedShell ?? 'shell'}`,
         id: 'open-in-shell',
         accelerator: 'Ctrl+`',
         click: emit('open-in-shell'),
@@ -376,11 +404,11 @@ export function buildDefaultMenu({
     separator,
     {
       label: __DARWIN__
-        ? `Update from ${defaultBranchName}`
-        : `&Update from ${defaultBranchName}`,
-      id: 'update-branch',
+        ? `Update from ${contributionTargetDefaultBranch}`
+        : `&Update from ${contributionTargetDefaultBranch}`,
+      id: 'update-branch-with-contribution-target-branch',
       accelerator: 'CmdOrCtrl+Shift+U',
-      click: emit('update-branch'),
+      click: emit('update-branch-with-contribution-target-branch'),
     },
     {
       label: __DARWIN__ ? 'Compare to Branch' : '&Compare to branch',
@@ -396,20 +424,14 @@ export function buildDefaultMenu({
       accelerator: 'CmdOrCtrl+Shift+M',
       click: emit('merge-branch'),
     },
-  ]
-
-  if (enableSquashMerging()) {
-    branchSubmenu.push({
+    {
       label: __DARWIN__
         ? 'Squash and Merge into Current Branch…'
         : 'Squas&h and merge into current branch…',
       id: 'squash-and-merge-branch',
       accelerator: 'CmdOrCtrl+Shift+H',
       click: emit('squash-and-merge-branch'),
-    })
-  }
-
-  branchSubmenu.push(
+    },
     {
       label: __DARWIN__ ? 'Rebase Current Branch…' : 'R&ebase current branch…',
       id: 'rebase-branch',
@@ -429,13 +451,21 @@ export function buildDefaultMenu({
       accelerator: 'CmdOrCtrl+Alt+B',
       click: emit('branch-on-github'),
     },
-    {
-      label: pullRequestLabel,
-      id: 'create-pull-request',
-      accelerator: 'CmdOrCtrl+R',
-      click: emit('open-pull-request'),
-    }
-  )
+  ]
+
+  branchSubmenu.push({
+    label: __DARWIN__ ? 'Preview Pull Request' : 'Preview pull request',
+    id: 'preview-pull-request',
+    accelerator: 'CmdOrCtrl+Alt+P',
+    click: emit('preview-pull-request'),
+  })
+
+  branchSubmenu.push({
+    label: pullRequestLabel,
+    id: 'create-pull-request',
+    accelerator: 'CmdOrCtrl+R',
+    click: emit('open-pull-request'),
+  })
 
   template.push({
     label: __DARWIN__ ? 'Branch' : '&Branch',
@@ -520,45 +550,7 @@ export function buildDefaultMenu({
     showLogsItem,
   ]
 
-  if (__DEV__) {
-    helpItems.push(
-      separator,
-      {
-        label: 'Crash main process…',
-        click() {
-          throw new Error('Boomtown!')
-        },
-      },
-      {
-        label: 'Crash renderer process…',
-        click: emit('boomtown'),
-      },
-      {
-        label: 'Show popup',
-        submenu: [
-          {
-            label: 'Release notes',
-            click: emit('show-release-notes-popup'),
-          },
-          {
-            label: 'Pull Request Check Run Failed',
-            click: emit('pull-request-check-run-failed'),
-          },
-        ],
-      },
-      {
-        label: 'Prune branches',
-        click: emit('test-prune-branches'),
-      }
-    )
-  }
-
-  if (__RELEASE_CHANNEL__ === 'development' || __RELEASE_CHANNEL__ === 'test') {
-    helpItems.push({
-      label: 'Show notification',
-      click: emit('test-show-notification'),
-    })
-  }
+  helpItems.push(...buildTestMenu())
 
   if (__DARWIN__) {
     template.push({
@@ -610,7 +602,7 @@ function getStashedChangesLabel(isStashedChangesVisible: boolean): string {
 
 type ClickHandler = (
   menuItem: Electron.MenuItem,
-  browserWindow: Electron.BrowserWindow | undefined,
+  browserWindow: Electron.BaseWindow | undefined,
   event: Electron.KeyboardEvent
 ) => void
 
@@ -618,14 +610,17 @@ type ClickHandler = (
  * Utility function returning a Click event handler which, when invoked, emits
  * the provided menu event over IPC.
  */
-function emit(name: MenuEvent): ClickHandler {
+export function emit(name: MenuEvent): ClickHandler {
   return (_, focusedWindow) => {
     // focusedWindow can be null if the menu item was clicked without the window
     // being in focus. A simple way to reproduce this is to click on a menu item
     // while in DevTools. Since Desktop only supports one window at a time we
     // can be fairly certain that the first BrowserWindow we find is the one we
     // want.
-    const window = focusedWindow ?? BrowserWindow.getAllWindows()[0]
+    const window =
+      focusedWindow instanceof BrowserWindow
+        ? focusedWindow
+        : BrowserWindow.getAllWindows()[0]
     if (window !== undefined) {
       ipcWebContents.send(window.webContents, 'menu-event', name)
     }
@@ -633,7 +628,7 @@ function emit(name: MenuEvent): ClickHandler {
 }
 
 /** The zoom steps that we support, these factors must sorted */
-const ZoomInFactors = [1, 1.1, 1.25, 1.5, 1.75, 2]
+const ZoomInFactors = [0.67, 0.75, 0.8, 0.9, 1, 1.1, 1.25, 1.5, 1.75, 2]
 const ZoomOutFactors = ZoomInFactors.slice().reverse()
 
 /**
@@ -654,7 +649,7 @@ function findClosestValue(arr: Array<number>, value: number) {
  */
 function zoom(direction: ZoomDirection): ClickHandler {
   return (menuItem, window) => {
-    if (!window) {
+    if (!(window instanceof BrowserWindow)) {
       return
     }
 
diff --git a/app/src/main-process/menu/build-spell-check-menu.ts b/app/src/main-process/menu/build-spell-check-menu.ts
index 1a6d6f658c0..730ece72368 100644
--- a/app/src/main-process/menu/build-spell-check-menu.ts
+++ b/app/src/main-process/menu/build-spell-check-menu.ts
@@ -13,9 +13,21 @@ export async function buildSpellCheckMenu(
     dom.
   */
   return new Promise(resolve => {
-    window.webContents.once('context-menu', (event, params) =>
+    /** This is to make sure the context menu invocation doesn't just hang
+     * waiting to find out if it needs spell checker menu items if electron
+     * never emits it's context menu event. This is known to happen with the
+     * Shift + F10 key on macOS */
+    const timer = setTimeout(() => {
+      resolve(undefined)
+      log.error(
+        `Unable to get spell check menu items  - no electron context-menu event`
+      )
+    }, 100)
+
+    window.webContents.once('context-menu', (event, params) => {
+      clearTimeout(timer)
       resolve(getSpellCheckMenuItems(event, params, window.webContents))
-    )
+    })
   })
 }
 
@@ -60,35 +72,67 @@ function getSpellCheckMenuItems(
     // NOTE: "On macOS as we use the native APIs there is no way to set the
     // language that the spellchecker uses" -- electron docs Therefore, we are
     // only allowing setting to English for non-mac machines.
-    const spellCheckLanguageItem = getSpellCheckLanguageMenuItem(
-      webContents.session
+    const { session } = webContents
+    const spellCheckLanguageItem = getSpellCheckLanguageMenuItemOptions(
+      app.getLocale(),
+      session.getSpellCheckerLanguages(),
+      session.availableSpellCheckerLanguages
     )
     if (spellCheckLanguageItem !== null) {
-      items.push(spellCheckLanguageItem)
+      items.push(
+        new MenuItem({
+          label: spellCheckLanguageItem.label,
+          click: () =>
+            session.setSpellCheckerLanguages(spellCheckLanguageItem.languages),
+        })
+      )
     }
   }
 
   return items
 }
 
+interface ISpellCheckMenuItemOption {
+  /**
+   * Dynamic label based on spellchecker's state
+   */
+  readonly label: string
+
+  /**
+   * An array with languages to set spellchecker
+   */
+  readonly languages: string[]
+}
+
+export const SpellcheckEnglishLabel = 'Set spellcheck to English'
+export const SpellcheckSystemLabel = 'Set spellcheck to system language'
+
 /**
- * Method to get a menu item to give user the option to use English or their
- * system language.
+ * Method to get a menu item options to give user the choice to use English or
+ * their system language.
+ *
+ * If system language is english or it's not part of the available languages,
+ * it returns null. If spellchecker is not set to english, it returns options
+ * that can set it to English. If spellchecker is set to english, it returns
+ * the options that can set it to their system language.
  *
- * If system language is english, it returns null. If spellchecker is not set to
- * english, it returns item that can set it to English. If spellchecker is set
- * to english, it returns the item that can set it to their system language.
+ * @param userLanguageCode Language code based on user's locale.
+ * @param spellcheckLanguageCodes An array of language codes the spellchecker
+ * is enabled for.
+ * @param availableSpellcheckLanguages An array which consists of all available
+ * spellchecker languages.
  */
-function getSpellCheckLanguageMenuItem(
-  session: Electron.Session
-): MenuItem | null {
-  const userLanguageCode = app.getLocale()
+export function getSpellCheckLanguageMenuItemOptions(
+  userLanguageCode: string,
+  spellcheckLanguageCodes: string[],
+  availableSpellcheckLanguages: string[]
+): ISpellCheckMenuItemOption | null {
   const englishLanguageCode = 'en-US'
-  const spellcheckLanguageCodes = session.getSpellCheckerLanguages()
 
   if (
-    userLanguageCode === englishLanguageCode &&
-    spellcheckLanguageCodes.includes(englishLanguageCode)
+    (userLanguageCode === englishLanguageCode &&
+      spellcheckLanguageCodes.includes(englishLanguageCode)) ||
+    !availableSpellcheckLanguages.includes(userLanguageCode)
   ) {
     return null
   }
@@ -101,11 +145,11 @@ function getSpellCheckLanguageMenuItem(
 
   const label =
     languageCode === englishLanguageCode
-      ? 'Set spellcheck to English'
-      : 'Set spellcheck to system language'
+      ? SpellcheckEnglishLabel
+      : SpellcheckSystemLabel
 
-  return new MenuItem({
+  return {
     label,
-    click: () => session.setSpellCheckerLanguages([languageCode]),
-  })
+    languages: [languageCode],
+  }
 }
diff --git a/app/src/main-process/menu/build-test-menu.ts b/app/src/main-process/menu/build-test-menu.ts
new file mode 100644
index 00000000000..0026f449e83
--- /dev/null
+++ b/app/src/main-process/menu/build-test-menu.ts
@@ -0,0 +1,198 @@
+import { MenuItemConstructorOptions } from 'electron'
+import { enableTestMenuItems } from '../../lib/feature-flag'
+import { emit, separator } from './build-default-menu'
+
+export function buildTestMenu() {
+  if (!enableTestMenuItems()) {
+    return []
+  }
+
+  const testMenuItems: MenuItemConstructorOptions[] = []
+
+  if (__WIN32__) {
+    testMenuItems.push(separator, {
+      label: 'Command Line Tool',
+      submenu: [
+        {
+          label: 'Install',
+          click: emit('install-windows-cli'),
+        },
+        {
+          label: 'Uninstall',
+          click: emit('uninstall-windows-cli'),
+        },
+      ],
+    })
+  }
+
+  const errorDialogsSubmenu: MenuItemConstructorOptions[] = [
+    {
+      label: 'Confirm Committing Conflicted Files',
+      click: emit('test-confirm-committing-conflicted-files'),
+    },
+    {
+      label: 'Discarded Changes Will Be Unrecoverable',
+      click: emit('test-discarded-changes-will-be-unrecoverable'),
+    },
+    {
+      label: 'Do you want to fork this repository?',
+      click: emit('test-do-you-want-fork-this-repository'),
+    },
+    {
+      label: 'Newer Commits On Remote',
+      click: emit('test-newer-commits-on-remote'),
+    },
+    {
+      label: 'Files Too Large',
+      click: emit('test-files-too-large'),
+    },
+    {
+      label: 'Generic Git Authentication',
+      click: emit('test-generic-git-authentication'),
+    },
+    {
+      label: 'Invalidated Account Token',
+      click: emit('test-invalidated-account-token'),
+    },
+  ]
+
+  if (__DARWIN__) {
+    errorDialogsSubmenu.push({
+      label: 'Move to Application Folder',
+      click: emit('test-move-to-application-folder'),
+    })
+  }
+
+  errorDialogsSubmenu.push(
+    {
+      label: 'Push Rejected',
+      click: emit('test-push-rejected'),
+    },
+    {
+      label: 'Re-Authorization Required',
+      click: emit('test-re-authorization-required'),
+    },
+    {
+      label: 'Unable to Locate Git',
+      click: emit('test-unable-to-locate-git'),
+    },
+    {
+      label: 'Unable to Open External Editor',
+      click: emit('test-no-external-editor'),
+    },
+    {
+      label: 'Unable to Open Shell',
+      click: emit('test-unable-to-open-shell'),
+    },
+    {
+      label: 'Untrusted Server',
+      click: emit('test-untrusted-server'),
+    },
+    {
+      label: 'Update Existing Git LFS Filters?',
+      click: emit('test-update-existing-git-lfs-filters'),
+    },
+    {
+      label: 'Upstream Already Exists',
+      click: emit('test-upstream-already-exists'),
+    }
+  )
+
+  testMenuItems.push(
+    separator,
+    {
+      label: 'Crash main process…',
+      click() {
+        throw new Error('Boomtown!')
+      },
+    },
+    {
+      label: 'Crash renderer process…',
+      click: emit('boomtown'),
+    },
+    {
+      label: 'Prune branches',
+      click: emit('test-prune-branches'),
+    },
+    {
+      label: 'Show notification',
+      click: emit('test-notification'),
+    },
+    {
+      label: 'Show popup',
+      submenu: [
+        {
+          label: 'Release notes',
+          click: emit('test-release-notes-popup'),
+        },
+        {
+          label: 'Thank you',
+          click: emit('test-thank-you-popup'),
+        },
+        {
+          label: 'Show App Error',
+          click: emit('test-app-error'),
+        },
+        {
+          label: 'Octicons',
+          click: emit('test-icons'),
+        },
+      ],
+    },
+    {
+      label: 'Show banner',
+      submenu: [
+        {
+          label: 'Update banner',
+          click: emit('test-update-banner'),
+        },
+        {
+          label: 'Update banner (priority)',
+          click: emit('test-prioritized-update-banner'),
+        },
+        {
+          label: `Showcase Update banner`,
+          click: emit('test-showcase-update-banner'),
+        },
+        {
+          label: `${__DARWIN__ ? 'Apple silicon' : 'Arm64'} banner`,
+          click: emit('test-arm64-banner'),
+        },
+        {
+          label: 'Thank you',
+          click: emit('test-thank-you-banner'),
+        },
+        {
+          label: 'Reorder Successful',
+          click: emit('test-reorder-banner'),
+        },
+        {
+          label: 'Reorder Undone',
+          click: emit('test-undone-banner'),
+        },
+        {
+          label: 'Cherry Pick Conflicts',
+          click: emit('test-cherry-pick-conflicts-banner'),
+        },
+        {
+          label: 'Merge Successful',
+          click: emit('test-merge-successful-banner'),
+        },
+        {
+          label: 'Accessibility',
+          click: emit('test-accessibility-banner'),
+        },
+        {
+          label: 'OS Version No Longer Supported',
+          click: emit('test-os-version-no-longer-supported'),
+        },
+      ],
+    },
+    {
+      label: 'Show Error Dialogs',
+      submenu: errorDialogsSubmenu,
+    }
+  )
+
+  return testMenuItems
+}
diff --git a/app/src/main-process/menu/menu-event.ts b/app/src/main-process/menu/menu-event.ts
index 561b7fb4386..93ca7880b07 100644
--- a/app/src/main-process/menu/menu-event.ts
+++ b/app/src/main-process/menu/menu-event.ts
@@ -2,6 +2,7 @@ export type MenuEvent =
   | 'push'
   | 'force-push'
   | 'pull'
+  | 'fetch'
   | 'show-changes'
   | 'show-history'
   | 'add-local-repository'
@@ -16,7 +17,7 @@ export type MenuEvent =
   | 'show-preferences'
   | 'choose-repository'
   | 'open-working-directory'
-  | 'update-branch'
+  | 'update-branch-with-contribution-target-branch'
   | 'compare-to-branch'
   | 'merge-branch'
   | 'squash-and-merge-branch'
@@ -29,16 +30,65 @@ export type MenuEvent =
   | 'clone-repository'
   | 'show-about'
   | 'go-to-commit-message'
-  | 'boomtown'
   | 'open-pull-request'
-  | 'install-cli'
+  | 'install-darwin-cli'
+  | 'install-windows-cli'
+  | 'uninstall-windows-cli'
   | 'open-external-editor'
   | 'select-all'
-  | 'show-release-notes-popup'
   | 'show-stashed-changes'
   | 'hide-stashed-changes'
-  | 'test-show-notification'
-  | 'test-prune-branches'
   | 'find-text'
   | 'create-issue-in-repository-on-github'
-  | 'pull-request-check-run-failed'
+  | 'preview-pull-request'
+  | 'test-app-error'
+  | 'decrease-active-resizable-width'
+  | 'increase-active-resizable-width'
+  | TestMenuEvent
+
+/**
+ * This is an alphabetized list of menu event's that are only used for testing
+ * UI.
+ */
+const TestMenuEvents = [
+  'boomtown',
+  'test-accessibility-banner',
+  'test-app-error',
+  'test-arm64-banner',
+  'test-confirm-committing-conflicted-files',
+  'test-cherry-pick-conflicts-banner',
+  'test-discarded-changes-will-be-unrecoverable',
+  'test-do-you-want-fork-this-repository',
+  'test-files-too-large',
+  'test-generic-git-authentication',
+  'test-icons',
+  'test-invalidated-account-token',
+  'test-merge-successful-banner',
+  'test-move-to-application-folder',
+  'test-newer-commits-on-remote',
+  'test-no-external-editor',
+  'test-notification',
+  'test-os-version-no-longer-supported',
+  'test-prune-branches',
+  'test-push-rejected',
+  'test-re-authorization-required',
+  'test-release-notes-popup',
+  'test-reorder-banner',
+  'test-showcase-update-banner',
+  'test-thank-you-banner',
+  'test-thank-you-popup',
+  'test-unable-to-locate-git',
+  'test-unable-to-open-shell',
+  'test-undone-banner',
+  'test-untrusted-server',
+  'test-update-banner',
+  'test-prioritized-update-banner',
+  'test-update-existing-git-lfs-filters',
+  'test-upstream-already-exists',
+] as const
+
+export type TestMenuEvent = typeof TestMenuEvents[number]
+
+export function isTestMenuEvent(value: any): value is TestMenuEvent {
+  return TestMenuEvents.includes(value)
+}
diff --git a/app/src/main-process/notifications.ts b/app/src/main-process/notifications.ts
index 98717e04d04..0ae209ca463 100644
--- a/app/src/main-process/notifications.ts
+++ b/app/src/main-process/notifications.ts
@@ -11,6 +11,11 @@ import * as ipcWebContents from './ipc-webcontents'
 let windowsToastActivatorClsid: string | undefined = undefined
 
 export function initializeDesktopNotifications() {
+  if (__LINUX__) {
+    // notifications not currently supported
+    return
+  }
+
   if (__DARWIN__) {
     initializeNotifications({})
     return
@@ -24,7 +29,7 @@ export function initializeDesktopNotifications() {
 
   if (windowsToastActivatorClsid === undefined) {
     log.error(
-      'Toast activator CLSID not found in any of the shortucts. Falling back to known CLSIDs.'
+      'Toast activator CLSID not found in any of the shortcuts. Falling back to known CLSIDs.'
     )
 
     // This is generated by Squirrel.Windows here:
diff --git a/app/src/main-process/ordered-webrequest.ts b/app/src/main-process/ordered-webrequest.ts
index b200cdcb587..bcb4494264c 100644
--- a/app/src/main-process/ordered-webrequest.ts
+++ b/app/src/main-process/ordered-webrequest.ts
@@ -1,7 +1,7 @@
 import {
   WebRequest,
   OnBeforeRequestListenerDetails,
-  Response,
+  CallbackResponse,
   OnBeforeSendHeadersListenerDetails,
   BeforeSendResponse,
   OnCompletedListenerDetails,
@@ -112,7 +112,7 @@ export class OrderedWebRequest {
 
   public readonly onBeforeRequest: AsyncListenerSet<
     OnBeforeRequestListenerDetails,
-    Response
+    CallbackResponse
   >
 
   public readonly onBeforeSendHeaders: AsyncListenerSet<
@@ -140,7 +140,7 @@ export class OrderedWebRequest {
     this.onBeforeRequest = new AsyncListenerSet(
       webRequest.onBeforeRequest.bind(webRequest),
       async (listeners, details) => {
-        let response: Response = {}
+        let response: CallbackResponse = {}
 
         for (const listener of listeners) {
           response = await listener(details)
diff --git a/app/src/main-process/show-uncaught-exception.ts b/app/src/main-process/show-uncaught-exception.ts
index e5b5c3151c2..5f04ee66fff 100644
--- a/app/src/main-process/show-uncaught-exception.ts
+++ b/app/src/main-process/show-uncaught-exception.ts
@@ -17,16 +17,13 @@ export function showUncaughtException(isLaunchError: boolean, error: Error) {
 
   setCrashMenu()
 
-  const crashWindow = new CrashWindow(
-    isLaunchError ? 'launch' : 'generic',
-    error
-  )
+  const window = new CrashWindow(isLaunchError ? 'launch' : 'generic', error)
 
-  crashWindow.onDidLoad(() => {
-    crashWindow.show()
+  window.onDidLoad(() => {
+    window.show()
   })
 
-  crashWindow.onFailedToLoad(async () => {
+  window.onFailedToLoad(async () => {
     await dialog.showMessageBox({
       type: 'error',
       title: __DARWIN__ ? `Unrecoverable Error` : 'Unrecoverable error',
@@ -44,12 +41,12 @@ export function showUncaughtException(isLaunchError: boolean, error: Error) {
     app.quit()
   })
 
-  crashWindow.onClose(() => {
+  window.onClose(() => {
     if (!__DEV__) {
       app.relaunch()
     }
     app.quit()
   })
 
-  crashWindow.load()
+  window.load()
 }
diff --git a/app/src/main-process/squirrel-updater.ts b/app/src/main-process/squirrel-updater.ts
index eb0ef380a42..d319880b0a8 100644
--- a/app/src/main-process/squirrel-updater.ts
+++ b/app/src/main-process/squirrel-updater.ts
@@ -38,15 +38,15 @@ export function handleSquirrelEvent(eventName: string): Promise<void> | null {
 
 async function handleInstalled(): Promise<void> {
   await createShortcut(['StartMenu', 'Desktop'])
-  await installCLI()
+  await installWindowsCLI()
 }
 
 async function handleUpdated(): Promise<void> {
   await updateShortcut()
-  await installCLI()
+  await installWindowsCLI()
 }
 
-async function installCLI(): Promise<void> {
+export async function installWindowsCLI(): Promise<void> {
   const binPath = getBinPath()
   await mkdir(binPath, { recursive: true })
   await writeBatchScriptCLITrampoline(binPath)
@@ -61,6 +61,17 @@ async function installCLI(): Promise<void> {
   }
 }
 
+export async function uninstallWindowsCLI() {
+  try {
+    const paths = getPathSegments()
+    const binPath = getBinPath()
+    const pathsWithoutBinPath = paths.filter(p => p !== binPath)
+    return setPathSegments(pathsWithoutBinPath)
+  } catch (e) {
+    log.error('Failed removing bin path from PATH environment variable', e)
+  }
+}
+
 /**
  * Get the path for the `bin` directory which exists in our `AppData` but
  * outside path which includes the installed app version.
@@ -135,15 +146,7 @@ function createShortcut(locations: ShortcutLocations): Promise<void> {
 
 async function handleUninstall(): Promise<void> {
   await removeShortcut()
-
-  try {
-    const paths = getPathSegments()
-    const binPath = getBinPath()
-    const pathsWithoutBinPath = paths.filter(p => p !== binPath)
-    return setPathSegments(pathsWithoutBinPath)
-  } catch (e) {
-    log.error('Failed removing bin path from PATH environment variable', e)
-  }
+  return uninstallWindowsCLI()
 }
 
 function removeShortcut(): Promise<void> {
diff --git a/app/src/main-process/trusted-ipc-sender.ts b/app/src/main-process/trusted-ipc-sender.ts
new file mode 100644
index 00000000000..ae36a90e78e
--- /dev/null
+++ b/app/src/main-process/trusted-ipc-sender.ts
@@ -0,0 +1,16 @@
+import { WebContents } from 'electron'
+
+// WebContents id of trusted senders of IPC messages. This is used to verify
+// that only IPC messages sent from trusted senders are handled, as recommended
+// by the Electron security documentation:
+// https://github.com/electron/electron/blob/main/docs/tutorial/security.md#17-validate-the-sender-of-all-ipc-messages
+const trustedSenders = new Set<number>()
+
+/** Adds a WebContents instance to the set of trusted IPC senders. */
+export const addTrustedIPCSender = (wc: WebContents) => {
+  trustedSenders.add(wc.id)
+  wc.on('destroyed', () => trustedSenders.delete(wc.id))
+}
+
+/** Returns true if the given WebContents is a trusted sender of IPC messages. */
+export const isTrustedIPCSender = (wc: WebContents) => trustedSenders.has(wc.id)
diff --git a/app/src/models/accessible-message.ts b/app/src/models/accessible-message.ts
new file mode 100644
index 00000000000..63323f9b0e1
--- /dev/null
+++ b/app/src/models/accessible-message.ts
@@ -0,0 +1,12 @@
+/** This is helper interface used when we have a message displayed that is a
+ * JSX.Element for visual styling and that message also needs to be given to
+ * screen reader users as well. Screen reader only messages should only be
+ * strings to prevent tab focusable element from being rendered but not visible
+ * as screen reader only messages are visually hidden */
+export interface IAccessibleMessage {
+  /** A message presented to screen reader users via an aria-live component. */
+  screenReaderMessage: string
+
+  /** A message visually displayed to the user. */
+  displayedMessage: string | JSX.Element
+}
diff --git a/app/src/models/account.ts b/app/src/models/account.ts
index 1c74a74bd61..95929859a27 100644
--- a/app/src/models/account.ts
+++ b/app/src/models/account.ts
@@ -20,7 +20,7 @@ export function accountEquals(x: Account, y: Account) {
 export class Account {
   /** Create an account which can be used to perform unauthenticated API actions */
   public static anonymous(): Account {
-    return new Account('', getDotComAPIEndpoint(), '', [], '', -1, '')
+    return new Account('', getDotComAPIEndpoint(), '', [], '', -1, '', 'free')
   }
 
   /**
@@ -41,7 +41,8 @@ export class Account {
     public readonly emails: ReadonlyArray<IAPIEmail>,
     public readonly avatarURL: string,
     public readonly id: number,
-    public readonly name: string
+    public readonly name: string,
+    public readonly plan?: string
   ) {}
 
   public withToken(token: string): Account {
@@ -52,7 +53,8 @@ export class Account {
       this.emails,
       this.avatarURL,
       this.id,
-      this.name
+      this.name,
+      this.plan
     )
   }
 
diff --git a/app/src/models/author.ts b/app/src/models/author.ts
index 2f96af822ac..0ad4db2e3c8 100644
--- a/app/src/models/author.ts
+++ b/app/src/models/author.ts
@@ -1,3 +1,34 @@
+/** This represents known authors (authors for which there is a GitHub user) */
+export type KnownAuthor = {
+  readonly kind: 'known'
+
+  /** The real name of the author */
+  readonly name: string
+
+  /** The email address of the author */
+  readonly email: string
+
+  /**
+   * The GitHub.com or GitHub Enterprise login for
+   * this author or null if that information is not
+   * available.
+   */
+  readonly username: string | null
+}
+
+/** This represents unknown authors (for which we still don't know a GitHub user) */
+export type UnknownAuthor = {
+  readonly kind: 'unknown'
+
+  /**
+   * The GitHub.com or GitHub Enterprise login for this author.
+   */
+  readonly username: string
+
+  /** Whether we're currently looking for a GitHub user or if search failed */
+  readonly state: 'searching' | 'error'
+}
+
 /**
  * A representation of an 'author'. In reality we're
  * talking about co-authors here but the representation
@@ -11,17 +42,9 @@
  * Additionally it includes an optional username which is
  * solely for presentation purposes inside AuthorInput
  */
-export interface IAuthor {
-  /** The real name of the author */
-  readonly name: string
-
-  /** The email address of the author */
-  readonly email: string
+export type Author = KnownAuthor | UnknownAuthor
 
-  /**
-   * The GitHub.com or GitHub Enterprise login for
-   * this author or null if that information is not
-   * available.
-   */
-  readonly username: string | null
+/** Checks whether or not a given author is a known user */
+export function isKnownAuthor(author: Author): author is KnownAuthor {
+  return author.kind === 'known'
 }
diff --git a/app/src/models/avatar.ts b/app/src/models/avatar.ts
index de4ef4479e9..3e6ac00050c 100644
--- a/app/src/models/avatar.ts
+++ b/app/src/models/avatar.ts
@@ -77,5 +77,9 @@ export function getAvatarUsersForCommit(
     )
   }
 
-  return avatarUsers
+  const avatarUsersByIdentity = new Map<string, IAvatarUser>(
+    avatarUsers.map(x => [x.name + x.email, x])
+  )
+
+  return [...avatarUsersByIdentity.values()]
 }
diff --git a/app/src/models/banner.ts b/app/src/models/banner.ts
index b347eaaeb03..0d24b65ac06 100644
--- a/app/src/models/banner.ts
+++ b/app/src/models/banner.ts
@@ -1,3 +1,4 @@
+import { Emoji } from '../lib/emoji'
 import { Popup } from './popup'
 
 export enum BannerType {
@@ -15,6 +16,8 @@ export enum BannerType {
   SuccessfulSquash = 'SuccessfulSquash',
   SuccessfulReorder = 'SuccessfulReorder',
   ConflictsFound = 'ConflictsFound',
+  OSVersionNoLongerSupported = 'OSVersionNoLongerSupported',
+  AccessibilitySettingsBanner = 'AccessibilitySettingsBanner',
 }
 
 export type Banner =
@@ -78,7 +81,7 @@ export type Banner =
     }
   | {
       readonly type: BannerType.OpenThankYouCard
-      readonly emoji: Map<string, string>
+      readonly emoji: Map<string, Emoji>
       readonly onOpenCard: () => void
       readonly onThrowCardAway: () => void
     }
@@ -119,3 +122,8 @@ export type Banner =
       /** callback to run when user clicks on link in banner text */
       readonly onOpenConflictsDialog: () => void
     }
+  | { readonly type: BannerType.OSVersionNoLongerSupported }
+  | {
+      readonly type: BannerType.AccessibilitySettingsBanner
+      readonly onOpenAccessibilitySettings: () => void
+    }
diff --git a/app/src/models/branch.ts b/app/src/models/branch.ts
index 63269333276..3d2f1e65058 100644
--- a/app/src/models/branch.ts
+++ b/app/src/models/branch.ts
@@ -1,6 +1,5 @@
 import { Commit } from './commit'
 import { removeRemotePrefix } from '../lib/remove-remote-prefix'
-import { CommitIdentity } from './commit-identity'
 import { ForkedRemotePrefix } from './remote'
 
 // NOTE: The values here matter as they are used to sort
@@ -32,7 +31,6 @@ export interface ITrackingBranch {
 /** Basic data about the latest commit on the branch. */
 export interface IBranchTip {
   readonly sha: string
-  readonly author: CommitIdentity
 }
 
 /** Default rules for where to create a branch from */
diff --git a/app/src/models/clone-options.ts b/app/src/models/clone-options.ts
index b50cccf4e8c..2138191b35b 100644
--- a/app/src/models/clone-options.ts
+++ b/app/src/models/clone-options.ts
@@ -1,9 +1,5 @@
-import { IGitAccount } from './git-account'
-
 /** Additional arguments to provide when cloning a repository */
 export type CloneOptions = {
-  /** The optional identity to provide when cloning. */
-  readonly account: IGitAccount | null
   /** The branch to checkout after the clone has completed. */
   readonly branch?: string
   /** The default branch name in case we're cloning an empty repository. */
diff --git a/app/src/models/commit.ts b/app/src/models/commit.ts
index 61e558a6061..44a0d8c206b 100644
--- a/app/src/models/commit.ts
+++ b/app/src/models/commit.ts
@@ -2,6 +2,11 @@ import { CommitIdentity } from './commit-identity'
 import { ITrailer, isCoAuthoredByTrailer } from '../lib/git/interpret-trailers'
 import { GitAuthor } from './git-author'
 
+/** Shortens a given SHA. */
+export function shortenSHA(sha: string) {
+  return sha.slice(0, 9)
+}
+
 /** Grouping of information required to create a commit */
 export interface ICommitContext {
   /**
diff --git a/app/src/models/diff/diff-data.ts b/app/src/models/diff/diff-data.ts
index 99cea420427..4ebeab139b7 100644
--- a/app/src/models/diff/diff-data.ts
+++ b/app/src/models/diff/diff-data.ts
@@ -1,5 +1,6 @@
 import { DiffHunk } from './raw-diff'
 import { Image } from './image'
+import { SubmoduleStatus } from '../status'
 /**
  * V8 has a limit on the size of string it can create, and unless we want to
  * trigger an unhandled exception we need to do the encoding conversion by hand
@@ -87,6 +88,28 @@ export interface IBinaryDiff {
   readonly kind: DiffType.Binary
 }
 
+export interface ISubmoduleDiff {
+  readonly kind: DiffType.Submodule
+
+  /** Full path of the submodule */
+  readonly fullPath: string
+
+  /** Path of the repository within its container repository */
+  readonly path: string
+
+  /** URL of the submodule */
+  readonly url: string | null
+
+  /** Status of the submodule */
+  readonly status: SubmoduleStatus
+
+  /** Previous SHA of the submodule, or null if it hasn't changed */
+  readonly oldSHA: string | null
+
+  /** New SHA of the submodule, or null if it hasn't changed */
+  readonly newSHA: string | null
+}
+
 export interface ILargeTextDiff extends ITextDiffData {
   readonly kind: DiffType.LargeText
 }
@@ -100,5 +123,6 @@ export type IDiff =
   | ITextDiff
   | IImageDiff
   | IBinaryDiff
+  | ISubmoduleDiff
   | ILargeTextDiff
   | IUnrenderableDiff
diff --git a/app/src/models/diff/diff-line.ts b/app/src/models/diff/diff-line.ts
index 6c7c088778a..f562094c662 100644
--- a/app/src/models/diff/diff-line.ts
+++ b/app/src/models/diff/diff-line.ts
@@ -38,4 +38,15 @@ export class DiffLine {
   public get content(): string {
     return this.text.substring(1)
   }
+
+  public equals(other: DiffLine) {
+    return (
+      this.text === other.text &&
+      this.type === other.type &&
+      this.originalLineNumber === other.originalLineNumber &&
+      this.oldLineNumber === other.oldLineNumber &&
+      this.newLineNumber === other.newLineNumber &&
+      this.noTrailingNewLine === other.noTrailingNewLine
+    )
+  }
 }
diff --git a/app/src/models/diff/diff-selection.ts b/app/src/models/diff/diff-selection.ts
index 3adbf4c4b24..c7e45bfb378 100644
--- a/app/src/models/diff/diff-selection.ts
+++ b/app/src/models/diff/diff-selection.ts
@@ -135,6 +135,54 @@ export class DiffSelection {
     }
   }
 
+  /**
+   * Returns a value indicating whether the range is all selected, partially
+   * selected, or not selected.
+   *
+   * @param from     The line index (inclusive) from where to checking the range.
+   *
+   * @param length   The number of lines to check from the start point of
+   *                  'from', Assumes positive number, returns None if length is <= 0.
+   */
+  public isRangeSelected(from: number, length: number): DiffSelectionType {
+    if (length <= 0) {
+      // This shouldn't happen? But if it does we'll log it and return None.
+      return DiffSelectionType.None
+    }
+
+    const computedSelectionType = this.getSelectionType()
+    if (computedSelectionType !== DiffSelectionType.Partial) {
+      // Nothing for us to do here. If all lines are selected or none, then any
+      // range of lines will be the same.
+      return computedSelectionType
+    }
+
+    if (length === 1) {
+      return this.isSelected(from)
+        ? DiffSelectionType.All
+        : DiffSelectionType.None
+    }
+
+    const to = from + length
+    let foundSelected = false
+    let foundDeselected = false
+    for (let i = from; i < to; i++) {
+      if (this.isSelected(i)) {
+        foundSelected = true
+      }
+
+      if (!this.isSelected(i)) {
+        foundDeselected = true
+      }
+
+      if (foundSelected && foundDeselected) {
+        return DiffSelectionType.Partial
+      }
+    }
+
+    return foundSelected ? DiffSelectionType.All : DiffSelectionType.None
+  }
+
   /**
    * Returns a value indicating wether the given line number is selectable.
    * A line not being selectable usually means it's a hunk header or a context
diff --git a/app/src/models/diff/image.ts b/app/src/models/diff/image.ts
index 9eb4702e375..f34992baef4 100644
--- a/app/src/models/diff/image.ts
+++ b/app/src/models/diff/image.ts
@@ -8,6 +8,7 @@ export class Image {
    * @param bytes Size of the file in bytes.
    */
   public constructor(
+    public readonly rawContents: ArrayBufferLike,
     public readonly contents: string,
     public readonly mediaType: string,
     public readonly bytes: number
diff --git a/app/src/models/diff/raw-diff.ts b/app/src/models/diff/raw-diff.ts
index 50c4d57c599..e38e3b1ba67 100644
--- a/app/src/models/diff/raw-diff.ts
+++ b/app/src/models/diff/raw-diff.ts
@@ -41,6 +41,21 @@ export class DiffHunk {
     public readonly unifiedDiffEnd: number,
     public readonly expansionType: DiffHunkExpansionType
   ) {}
+
+  public equals(other: DiffHunk) {
+    if (this === other) {
+      return true
+    }
+
+    return (
+      this.header.equals(other.header) &&
+      this.unifiedDiffStart === other.unifiedDiffStart &&
+      this.unifiedDiffEnd === other.unifiedDiffEnd &&
+      this.expansionType === other.expansionType &&
+      this.lines.length === other.lines.length &&
+      this.lines.every((xLine, ix) => xLine.equals(other.lines[ix]))
+    )
+  }
 }
 
 /** details about the start and end of a diff hunk */
@@ -61,6 +76,15 @@ export class DiffHunkHeader {
   public toDiffLineRepresentation() {
     return `@@ -${this.oldStartLine},${this.oldLineCount} +${this.newStartLine},${this.newLineCount} @@`
   }
+
+  public equals(other: DiffHunkHeader) {
+    return (
+      this.oldStartLine === other.oldStartLine &&
+      this.oldLineCount === other.oldLineCount &&
+      this.newStartLine === other.newStartLine &&
+      this.oldStartLine === other.oldStartLine
+    )
+  }
 }
 
 /** the contents of a diff generated by Git */
diff --git a/app/src/models/drag-drop.ts b/app/src/models/drag-drop.ts
index 95003e6241b..18b75d75f4c 100644
--- a/app/src/models/drag-drop.ts
+++ b/app/src/models/drag-drop.ts
@@ -1,3 +1,4 @@
+import { RowIndexPath } from '../ui/lib/list/list-row-index-path'
 import { Commit } from './commit'
 import { GitHubRepository } from './github-repository'
 
@@ -51,7 +52,7 @@ export type CommitTarget = {
 export type ListInsertionPointTarget = {
   type: DropTargetType.ListInsertionPoint
   data: DragData
-  index: number
+  index: RowIndexPath
 }
 
 /**
diff --git a/app/src/models/git-account.ts b/app/src/models/git-account.ts
index 0f5e04918c7..6d9bdcca8a8 100644
--- a/app/src/models/git-account.ts
+++ b/app/src/models/git-account.ts
@@ -7,4 +7,7 @@ export interface IGitAccount {
 
   /** The endpoint with which the user is authenticating. */
   readonly endpoint: string
+
+  /** The token/password to authenticate with */
+  readonly token: string
 }
diff --git a/app/src/models/github-repository.ts b/app/src/models/github-repository.ts
index d950c6227d3..794985684c7 100644
--- a/app/src/models/github-repository.ts
+++ b/app/src/models/github-repository.ts
@@ -22,7 +22,6 @@ export class GitHubRepository {
     public readonly dbID: number,
     public readonly isPrivate: boolean | null = null,
     public readonly htmlURL: string | null = null,
-    public readonly defaultBranch: string | null = null,
     public readonly cloneURL: string | null = null,
     public readonly issuesEnabled: boolean | null = null,
     public readonly isArchived: boolean | null = null,
@@ -36,7 +35,6 @@ export class GitHubRepository {
       this.dbID,
       this.isPrivate,
       this.htmlURL,
-      this.defaultBranch,
       this.cloneURL,
       this.issuesEnabled,
       this.isArchived,
diff --git a/app/src/models/menu-ids.ts b/app/src/models/menu-ids.ts
index 63b035e6e4d..bcabc009a31 100644
--- a/app/src/models/menu-ids.ts
+++ b/app/src/models/menu-ids.ts
@@ -5,7 +5,7 @@ export type MenuIDs =
   | 'discard-all-changes'
   | 'stash-all-changes'
   | 'preferences'
-  | 'update-branch'
+  | 'update-branch-with-contribution-target-branch'
   | 'merge-branch'
   | 'squash-and-merge-branch'
   | 'rebase-branch'
@@ -35,3 +35,6 @@ export type MenuIDs =
   | 'compare-to-branch'
   | 'toggle-stashed-changes'
   | 'create-issue-in-repository-on-github'
+  | 'preview-pull-request'
+  | 'decrease-active-resizable-width'
+  | 'increase-active-resizable-width'
diff --git a/app/src/models/menu-labels.ts b/app/src/models/menu-labels.ts
index 974297d61dd..1093e0c474e 100644
--- a/app/src/models/menu-labels.ts
+++ b/app/src/models/menu-labels.ts
@@ -28,11 +28,16 @@ export type MenuLabelsEvent = {
   readonly askForConfirmationOnRepositoryRemoval: boolean
 
   /**
-   * Specify the default branch associated with the current repository.
+   * Specify the default branch of the user's contribution target.
+   *
+   * This value should be the fork's upstream default branch, if the user
+   * is contributing to the parent repository.
+   *
+   * Otherwise, this value should be the default branch of the repository.
    *
    * Omit this value to indicate that the default branch is unknown.
    */
-  readonly defaultBranchName?: string
+  readonly contributionTargetDefaultBranch?: string
 
   /**
    * Is the current branch in a state where it can be force pushed to the remote?
diff --git a/app/src/models/multi-commit-operation.ts b/app/src/models/multi-commit-operation.ts
index d1c565fa4f9..69a79f7d837 100644
--- a/app/src/models/multi-commit-operation.ts
+++ b/app/src/models/multi-commit-operation.ts
@@ -18,6 +18,24 @@ export const enum MultiCommitOperationKind {
   Reorder = 'Reorder',
 }
 
+/** Type guard which narrows a string to a MultiCommitOperationKind */
+export function isIdMultiCommitOperation(
+  id: string
+): id is
+  | MultiCommitOperationKind.Rebase
+  | MultiCommitOperationKind.CherryPick
+  | MultiCommitOperationKind.Squash
+  | MultiCommitOperationKind.Merge
+  | MultiCommitOperationKind.Reorder {
+  return (
+    id === MultiCommitOperationKind.Rebase ||
+    id === MultiCommitOperationKind.CherryPick ||
+    id === MultiCommitOperationKind.Squash ||
+    id === MultiCommitOperationKind.Merge ||
+    id === MultiCommitOperationKind.Reorder
+  )
+}
+
 /**
  * Union type representing the possible states of an multi commit operation
  * such as rebase, interactive rebase, cherry-pick.
diff --git a/app/src/models/popup.ts b/app/src/models/popup.ts
index fdf1058b3a6..ea89afafc5e 100644
--- a/app/src/models/popup.ts
+++ b/app/src/models/popup.ts
@@ -14,79 +14,98 @@ import { Commit, CommitOneLine, ICommitContext } from './commit'
 import { IStashEntry } from './stash-entry'
 import { Account } from '../models/account'
 import { Progress } from './progress'
-import { ITextDiff, DiffSelection } from './diff'
+import { ITextDiff, DiffSelection, ImageDiffType } from './diff'
 import { RepositorySettingsTab } from '../ui/repository-settings/repository-settings'
 import { ICommitMessage } from './commit-message'
-import { IAuthor } from './author'
+import { Author, UnknownAuthor } from './author'
 import { IRefCheck } from '../lib/ci-checks/ci-checks'
 import { GitHubRepository } from './github-repository'
 import { ValidNotificationPullRequestReview } from '../lib/valid-notification-pull-request-review'
+import { UnreachableCommitsTab } from '../ui/history/unreachable-commits-dialog'
+import { IAPIComment } from '../lib/api'
 
 export enum PopupType {
-  RenameBranch = 1,
-  DeleteBranch,
-  DeleteRemoteBranch,
-  ConfirmDiscardChanges,
-  Preferences,
-  RepositorySettings,
-  AddRepository,
-  CreateRepository,
-  CloneRepository,
-  CreateBranch,
-  SignIn,
-  About,
-  InstallGit,
-  PublishRepository,
-  Acknowledgements,
-  UntrustedCertificate,
-  RemoveRepository,
-  TermsAndConditions,
-  PushBranchCommits,
-  CLIInstalled,
-  GenericGitAuthentication,
-  ExternalEditorFailed,
-  OpenShellFailed,
-  InitializeLFS,
-  LFSAttributeMismatch,
-  UpstreamAlreadyExists,
-  ReleaseNotes,
-  DeletePullRequest,
-  OversizedFiles,
-  CommitConflictsWarning,
-  PushNeedsPull,
-  ConfirmForcePush,
-  StashAndSwitchBranch,
-  ConfirmOverwriteStash,
-  ConfirmDiscardStash,
-  CreateTutorialRepository,
-  ConfirmExitTutorial,
-  PushRejectedDueToMissingWorkflowScope,
-  SAMLReauthRequired,
-  CreateFork,
-  CreateTag,
-  DeleteTag,
-  LocalChangesOverwritten,
-  ChooseForkSettings,
-  ConfirmDiscardSelection,
-  MoveToApplicationsFolder,
-  ChangeRepositoryAlias,
-  ThankYou,
-  CommitMessage,
-  MultiCommitOperation,
-  WarnLocalChangesBeforeUndo,
-  WarningBeforeReset,
-  InvalidatedToken,
-  AddSSHHost,
-  SSHKeyPassphrase,
-  SSHUserPassword,
-  PullRequestChecksFailed,
-  CICheckRunRerun,
-  WarnForcePush,
-  DiscardChangesRetry,
-  PullRequestReview,
+  RenameBranch = 'RenameBranch',
+  DeleteBranch = 'DeleteBranch',
+  DeleteRemoteBranch = 'DeleteRemoteBranch',
+  ConfirmDiscardChanges = 'ConfirmDiscardChanges',
+  Preferences = 'Preferences',
+  RepositorySettings = 'RepositorySettings',
+  AddRepository = 'AddRepository',
+  CreateRepository = 'CreateRepository',
+  CloneRepository = 'CloneRepository',
+  CreateBranch = 'CreateBranch',
+  SignIn = 'SignIn',
+  About = 'About',
+  InstallGit = 'InstallGit',
+  PublishRepository = 'PublishRepository',
+  Acknowledgements = 'Acknowledgements',
+  UntrustedCertificate = 'UntrustedCertificate',
+  RemoveRepository = 'RemoveRepository',
+  TermsAndConditions = 'TermsAndConditions',
+  PushBranchCommits = 'PushBranchCommits',
+  CLIInstalled = 'CLIInstalled',
+  GenericGitAuthentication = 'GenericGitAuthentication',
+  ExternalEditorFailed = 'ExternalEditorFailed',
+  OpenShellFailed = 'OpenShellFailed',
+  InitializeLFS = 'InitializeLFS',
+  LFSAttributeMismatch = 'LFSAttributeMismatch',
+  UpstreamAlreadyExists = 'UpstreamAlreadyExists',
+  ReleaseNotes = 'ReleaseNotes',
+  DeletePullRequest = 'DeletePullRequest',
+  OversizedFiles = 'OversizedFiles',
+  CommitConflictsWarning = 'CommitConflictsWarning',
+  PushNeedsPull = 'PushNeedsPull',
+  ConfirmForcePush = 'ConfirmForcePush',
+  StashAndSwitchBranch = 'StashAndSwitchBranch',
+  ConfirmOverwriteStash = 'ConfirmOverwriteStash',
+  ConfirmDiscardStash = 'ConfirmDiscardStash',
+  ConfirmCheckoutCommit = 'ConfirmCheckoutCommit',
+  CreateTutorialRepository = 'CreateTutorialRepository',
+  ConfirmExitTutorial = 'ConfirmExitTutorial',
+  PushRejectedDueToMissingWorkflowScope = 'PushRejectedDueToMissingWorkflowScope',
+  SAMLReauthRequired = 'SAMLReauthRequired',
+  CreateFork = 'CreateFork',
+  CreateTag = 'CreateTag',
+  DeleteTag = 'DeleteTag',
+  LocalChangesOverwritten = 'LocalChangesOverwritten',
+  ChooseForkSettings = 'ChooseForkSettings',
+  ConfirmDiscardSelection = 'ConfirmDiscardSelection',
+  MoveToApplicationsFolder = 'MoveToApplicationsFolder',
+  ChangeRepositoryAlias = 'ChangeRepositoryAlias',
+  ThankYou = 'ThankYou',
+  CommitMessage = 'CommitMessage',
+  MultiCommitOperation = 'MultiCommitOperation',
+  WarnLocalChangesBeforeUndo = 'WarnLocalChangesBeforeUndo',
+  WarningBeforeReset = 'WarningBeforeReset',
+  InvalidatedToken = 'InvalidatedToken',
+  AddSSHHost = 'AddSSHHost',
+  SSHKeyPassphrase = 'SSHKeyPassphrase',
+  SSHUserPassword = 'SSHUserPassword',
+  PullRequestChecksFailed = 'PullRequestChecksFailed',
+  CICheckRunRerun = 'CICheckRunRerun',
+  WarnForcePush = 'WarnForcePush',
+  DiscardChangesRetry = 'DiscardChangesRetry',
+  PullRequestReview = 'PullRequestReview',
+  UnreachableCommits = 'UnreachableCommits',
+  StartPullRequest = 'StartPullRequest',
+  Error = 'Error',
+  InstallingUpdate = 'InstallingUpdate',
+  TestNotifications = 'TestNotifications',
+  PullRequestComment = 'PullRequestComment',
+  UnknownAuthors = 'UnknownAuthors',
+  TestIcons = 'TestIcons',
+  ConfirmCommitFilteredChanges = 'ConfirmCommitFilteredChanges',
 }
 
-export type Popup =
+interface IBasePopup {
+  /**
+   * Unique id of the popup that it receives upon adding to the stack.
+   */
+  readonly id?: string
+}
+
+export type PopupDetail =
   | { type: PopupType.RenameBranch; repository: Repository; branch: Branch }
   | {
       type: PopupType.DeleteBranch
@@ -131,7 +150,11 @@ export type Popup =
       initialName?: string
       targetCommit?: CommitOneLine
     }
-  | { type: PopupType.SignIn }
+  | {
+      type: PopupType.SignIn
+      isCredentialHelperSignIn?: boolean
+      credentialHelperUrl?: string
+    }
   | { type: PopupType.About }
   | { type: PopupType.InstallGit; path: string }
   | { type: PopupType.PublishRepository; repository: Repository }
@@ -152,8 +175,10 @@ export type Popup =
   | { type: PopupType.CLIInstalled }
   | {
       type: PopupType.GenericGitAuthentication
-      hostname: string
-      retryAction: RetryAction
+      remoteUrl: string
+      username?: string
+      onSubmit: (username: string, password: string) => void
+      onDismiss: () => void
     }
   | {
       type: PopupType.ExternalEditorFailed
@@ -218,6 +243,11 @@ export type Popup =
       repository: Repository
       stash: IStashEntry
     }
+  | {
+      type: PopupType.ConfirmCheckoutCommit
+      repository: Repository
+      commit: CommitOneLine
+    }
   | {
       type: PopupType.CreateTutorialRepository
       account: Account
@@ -274,7 +304,7 @@ export type Popup =
     }
   | {
       type: PopupType.CommitMessage
-      coAuthors: ReadonlyArray<IAuthor>
+      coAuthors: ReadonlyArray<Author>
       showCoAuthoredBy: boolean
       commitMessage: ICommitMessage | null
       dialogTitle: string
@@ -328,8 +358,6 @@ export type Popup =
       repository: RepositoryWithGitHubRepository
       pullRequest: PullRequest
       shouldChangeRepository: boolean
-      commitMessage: string
-      commitSha: string
       checks: ReadonlyArray<IRefCheck>
     }
   | {
@@ -349,7 +377,57 @@ export type Popup =
       repository: RepositoryWithGitHubRepository
       pullRequest: PullRequest
       review: ValidNotificationPullRequestReview
-      numberOfComments: number
       shouldCheckoutBranch: boolean
       shouldChangeRepository: boolean
     }
+  | {
+      type: PopupType.UnreachableCommits
+      selectedTab: UnreachableCommitsTab
+    }
+  | {
+      type: PopupType.StartPullRequest
+      prBaseBranches: ReadonlyArray<Branch>
+      currentBranch: Branch
+      defaultBranch: Branch | null
+      externalEditorLabel?: string
+      imageDiffType: ImageDiffType
+      prRecentBaseBranches: ReadonlyArray<Branch>
+      repository: Repository
+      nonLocalCommitSHA: string | null
+      showSideBySideDiff: boolean
+      currentBranchHasPullRequest: boolean
+    }
+  | {
+      type: PopupType.Error
+      error: Error
+    }
+  | {
+      type: PopupType.InstallingUpdate
+    }
+  | {
+      type: PopupType.TestNotifications
+      repository: RepositoryWithGitHubRepository
+    }
+  | {
+      type: PopupType.PullRequestComment
+      repository: RepositoryWithGitHubRepository
+      pullRequest: PullRequest
+      comment: IAPIComment
+      shouldCheckoutBranch: boolean
+      shouldChangeRepository: boolean
+    }
+  | {
+      type: PopupType.UnknownAuthors
+      authors: ReadonlyArray<UnknownAuthor>
+      onCommit: () => void
+    }
+  | {
+      type: PopupType.TestIcons
+    }
+  | {
+      type: PopupType.ConfirmCommitFilteredChanges
+      onCommitAnyway: () => void
+      onClearFilter: () => void
+    }
+
+export type Popup = IBasePopup & PopupDetail
diff --git a/app/src/models/preferences.ts b/app/src/models/preferences.ts
index f938f20e671..26e379aaa2b 100644
--- a/app/src/models/preferences.ts
+++ b/app/src/models/preferences.ts
@@ -1,8 +1,10 @@
 export enum PreferencesTab {
-  Accounts = 0,
-  Integrations = 1,
-  Git = 2,
-  Appearance = 3,
-  Prompts = 4,
-  Advanced = 5,
+  Accounts,
+  Integrations,
+  Git,
+  Appearance,
+  Notifications,
+  Prompts,
+  Advanced,
+  Accessibility,
 }
diff --git a/app/src/models/progress.ts b/app/src/models/progress.ts
index ef9a06f5c6e..28802559d4e 100644
--- a/app/src/models/progress.ts
+++ b/app/src/models/progress.ts
@@ -42,8 +42,13 @@ export interface IGenericProgress extends IProgress {
 export interface ICheckoutProgress extends IProgress {
   kind: 'checkout'
 
-  /** The branch that's currently being checked out */
-  readonly targetBranch: string
+  /** The branch or commit that's currently being checked out */
+  readonly target: string
+
+  /**
+   * Infotext for the user.
+   */
+  readonly description: string
 }
 
 /**
diff --git a/app/src/models/pull-request.ts b/app/src/models/pull-request.ts
index 47dd05355ad..6176da439b7 100644
--- a/app/src/models/pull-request.ts
+++ b/app/src/models/pull-request.ts
@@ -41,3 +41,24 @@ export class PullRequest {
     public readonly body: string
   ) {}
 }
+
+/** The types of pull request suggested next actions */
+export enum PullRequestSuggestedNextAction {
+  PreviewPullRequest = 'PreviewPullRequest',
+  CreatePullRequest = 'CreatePullRequest',
+}
+
+/** Type guard which narrows a string to a PullRequestSuggestedNextAction */
+export function isIdPullRequestSuggestedNextAction(
+  id: string
+): id is
+  | PullRequestSuggestedNextAction.PreviewPullRequest
+  | PullRequestSuggestedNextAction.CreatePullRequest {
+  return (
+    id === PullRequestSuggestedNextAction.PreviewPullRequest ||
+    id === PullRequestSuggestedNextAction.CreatePullRequest
+  )
+}
+
+export const defaultPullRequestSuggestedNextAction =
+  PullRequestSuggestedNextAction.PreviewPullRequest
diff --git a/app/src/models/repo-rules.ts b/app/src/models/repo-rules.ts
new file mode 100644
index 00000000000..cd22dee03e2
--- /dev/null
+++ b/app/src/models/repo-rules.ts
@@ -0,0 +1,136 @@
+export type RepoRulesMetadataStatus = 'pass' | 'fail' | 'bypass'
+export type RepoRulesMetadataFailure = {
+  description: string
+  rulesetId: number
+}
+
+export class RepoRulesMetadataFailures {
+  public failed: RepoRulesMetadataFailure[] = []
+  public bypassed: RepoRulesMetadataFailure[] = []
+
+  /**
+   * Returns the status of the rule based on its failures.
+   * 'pass' means all rules passed, 'bypass' means some rules failed
+   * but the user can bypass all of the failures, and 'fail' means
+   * at least one rule failed that the user cannot bypass.
+   */
+  public get status(): RepoRulesMetadataStatus {
+    if (this.failed.length === 0) {
+      if (this.bypassed.length === 0) {
+        return 'pass'
+      }
+
+      return 'bypass'
+    }
+
+    return 'fail'
+  }
+}
+
+/**
+ * Metadata restrictions for a specific type of rule, as multiple can
+ * be configured at once and all apply to the branch.
+ */
+export class RepoRulesMetadataRules {
+  private rules: IRepoRulesMetadataRule[] = []
+
+  public push(rule?: IRepoRulesMetadataRule): void {
+    if (rule === undefined) {
+      return
+    }
+
+    this.rules.push(rule)
+  }
+
+  /**
+   * Whether any rules are configured.
+   */
+  public get hasRules(): boolean {
+    return this.rules.length > 0
+  }
+
+  /**
+   * Gets an object containing arrays of human-readable rules that
+   * fail to match the provided input string. If the returned object
+   * contains only empty arrays, then all rules pass.
+   */
+  public getFailedRules(toMatch: string): RepoRulesMetadataFailures {
+    const failures = new RepoRulesMetadataFailures()
+    for (const rule of this.rules) {
+      if (!rule.matcher(toMatch)) {
+        if (rule.enforced === 'bypass') {
+          failures.bypassed.push({
+            description: rule.humanDescription,
+            rulesetId: rule.rulesetId,
+          })
+        } else {
+          failures.failed.push({
+            description: rule.humanDescription,
+            rulesetId: rule.rulesetId,
+          })
+        }
+      }
+    }
+
+    return failures
+  }
+}
+
+/**
+ * Parsed repo rule info
+ */
+export class RepoRulesInfo {
+  /**
+   * Many rules are not handled in a special way, they
+   * instead just display a warning to the user when they're
+   * about to commit. They're lumped together into this flag
+   * for simplicity. See the `parseRepoRules` function for
+   * the full list.
+   */
+  public basicCommitWarning: RepoRuleEnforced = false
+
+  /**
+   * If true, the branch's name conflicts with a rule and
+   * cannot be created.
+   */
+  public creationRestricted: RepoRuleEnforced = false
+
+  /**
+   * Whether signed commits are required. `parseRepoRules` will
+   * set this to `false` if the user has commit signing configured.
+   */
+  public signedCommitsRequired: RepoRuleEnforced = false
+
+  public pullRequestRequired: RepoRuleEnforced = false
+  public commitMessagePatterns = new RepoRulesMetadataRules()
+  public commitAuthorEmailPatterns = new RepoRulesMetadataRules()
+  public committerEmailPatterns = new RepoRulesMetadataRules()
+  public branchNamePatterns = new RepoRulesMetadataRules()
+}
+
+export interface IRepoRulesMetadataRule {
+  /**
+   * Whether this rule is enforced for the current user.
+   */
+  enforced: RepoRuleEnforced
+
+  /**
+   * Function that determines whether the provided string matches the rule.
+   */
+  matcher: RepoRulesMetadataMatcher
+
+  /**
+   * Human-readable description of the rule. For example, a 'starts_with'
+   * rule with the pattern 'abc' that is negated would have a description
+   * of 'must not start with "abc"'.
+   */
+  humanDescription: string
+
+  /**
+   * ID of the ruleset this rule is configured in.
+   */
+  rulesetId: number
+}
+
+export type RepoRulesMetadataMatcher = (toMatch: string) => boolean
+export type RepoRuleEnforced = boolean | 'bypass'
diff --git a/app/src/models/repository.ts b/app/src/models/repository.ts
index e299d051bdd..74b9a89b9e6 100644
--- a/app/src/models/repository.ts
+++ b/app/src/models/repository.ts
@@ -213,3 +213,15 @@ export function getForkContributionTarget(
     ? repository.workflowPreferences.forkContributionTarget
     : ForkContributionTarget.Parent
 }
+
+/**
+ * Returns whether the fork is contributing to the parent
+ */
+export function isForkedRepositoryContributingToParent(
+  repository: Repository
+): boolean {
+  return (
+    isRepositoryWithForkedGitHubRepository(repository) &&
+    getForkContributionTarget(repository) === ForkContributionTarget.Parent
+  )
+}
diff --git a/app/src/models/stash-entry.ts b/app/src/models/stash-entry.ts
index da7f7667251..bf840018b05 100644
--- a/app/src/models/stash-entry.ts
+++ b/app/src/models/stash-entry.ts
@@ -12,6 +12,9 @@ export interface IStashEntry {
 
   /** The list of files this stash touches */
   readonly files: StashedFileChanges
+
+  readonly tree: string
+  readonly parents: ReadonlyArray<string>
 }
 
 /** Whether file changes for a stash entry are loaded or not */
diff --git a/app/src/models/status.ts b/app/src/models/status.ts
index ca7673f4c19..13aba603479 100644
--- a/app/src/models/status.ts
+++ b/app/src/models/status.ts
@@ -34,6 +34,7 @@ export type PlainFileStatus = {
     | AppFileStatusKind.New
     | AppFileStatusKind.Modified
     | AppFileStatusKind.Deleted
+  submoduleStatus?: SubmoduleStatus
 }
 
 /**
@@ -46,6 +47,8 @@ export type PlainFileStatus = {
 export type CopiedOrRenamedFileStatus = {
   kind: AppFileStatusKind.Copied | AppFileStatusKind.Renamed
   oldPath: string
+  renameIncludesModifications: boolean
+  submoduleStatus?: SubmoduleStatus
 }
 
 /**
@@ -56,6 +59,7 @@ export type ConflictsWithMarkers = {
   kind: AppFileStatusKind.Conflicted
   entry: TextConflictEntry
   conflictMarkerCount: number
+  submoduleStatus?: SubmoduleStatus
 }
 
 /**
@@ -65,6 +69,7 @@ export type ConflictsWithMarkers = {
 export type ManualConflict = {
   kind: AppFileStatusKind.Conflicted
   entry: ManualConflictEntry
+  submoduleStatus?: SubmoduleStatus
 }
 
 /** Union of potential conflict scenarios the application should handle */
@@ -92,7 +97,10 @@ export function isManualConflict(
 }
 
 /** Denotes an untracked file in the working directory) */
-export type UntrackedFileStatus = { kind: AppFileStatusKind.Untracked }
+export type UntrackedFileStatus = {
+  kind: AppFileStatusKind.Untracked
+  submoduleStatus?: SubmoduleStatus
+}
 
 /** The union of potential states associated with a file change in Desktop */
 export type AppFileStatus =
@@ -101,6 +109,22 @@ export type AppFileStatus =
   | ConflictedFileStatus
   | UntrackedFileStatus
 
+/** The status of a submodule */
+export type SubmoduleStatus = {
+  /** Whether or not the submodule is pointing to a different commit */
+  readonly commitChanged: boolean
+  /**
+   * Whether or not the submodule contains modified changes that haven't been
+   * committed yet
+   */
+  readonly modifiedChanges: boolean
+  /**
+   * Whether or not the submodule contains untracked changes that haven't been
+   * committed yet
+   */
+  readonly untrackedChanges: boolean
+}
+
 /** The porcelain status for an ordinary changed entry */
 type OrdinaryEntry = {
   readonly kind: 'ordinary'
@@ -110,6 +134,8 @@ type OrdinaryEntry = {
   readonly index?: GitStatusEntry
   /** the status of the working tree for this entry (if known) */
   readonly workingTree?: GitStatusEntry
+  /** the submodule status for this entry */
+  readonly submoduleStatus?: SubmoduleStatus
 }
 
 /** The porcelain status for a renamed or copied entry */
@@ -119,6 +145,10 @@ type RenamedOrCopiedEntry = {
   readonly index?: GitStatusEntry
   /** the status of the working tree for this entry (if known) */
   readonly workingTree?: GitStatusEntry
+  /** the submodule status for this entry */
+  readonly submoduleStatus?: SubmoduleStatus
+  /** The rename or copy score in the case of a renamed file */
+  readonly renameOrCopyScore?: number
 }
 
 export enum UnmergedEntrySummary {
@@ -149,13 +179,18 @@ type TextConflictDetails =
 
 type TextConflictEntry = {
   readonly kind: 'conflicted'
+  /** the submodule status for this entry */
+  readonly submoduleStatus?: SubmoduleStatus
 } & TextConflictDetails
 
 /**
  * Valid Git index states where the user needs to choose one of `us` or `them`
  * in the app.
  */
-type ManualConflictDetails =
+type ManualConflictDetails = {
+  /** the submodule status for this entry */
+  readonly submoduleStatus?: SubmoduleStatus
+} & (
   | {
       readonly action: UnmergedEntrySummary.BothAdded
       readonly us: GitStatusEntry.Added
@@ -191,9 +226,12 @@ type ManualConflictDetails =
       readonly us: GitStatusEntry.Deleted
       readonly them: GitStatusEntry.Deleted
     }
+)
 
 type ManualConflictEntry = {
   readonly kind: 'conflicted'
+  /** the submodule status for this entry */
+  readonly submoduleStatus?: SubmoduleStatus
 } & ManualConflictDetails
 
 /** The porcelain status for an unmerged entry */
@@ -202,6 +240,8 @@ export type UnmergedEntry = TextConflictEntry | ManualConflictEntry
 /** The porcelain status for an unmerged entry */
 type UntrackedEntry = {
   readonly kind: 'untracked'
+  /** the submodule status for this entry */
+  readonly submoduleStatus?: SubmoduleStatus
 }
 
 /** The union of possible entries from the git status */
@@ -279,7 +319,8 @@ export class CommittedFileChange extends FileChange {
   public constructor(
     path: string,
     status: AppFileStatus,
-    public readonly commitish: string
+    public readonly commitish: string,
+    public readonly parentCommitish: string
   ) {
     super(path, status)
 
diff --git a/app/src/models/tutorial-step.ts b/app/src/models/tutorial-step.ts
index 6a7c47292cb..ae3e962da75 100644
--- a/app/src/models/tutorial-step.ts
+++ b/app/src/models/tutorial-step.ts
@@ -8,6 +8,7 @@ export enum TutorialStep {
   OpenPullRequest = 'OpenPullRequest',
   AllDone = 'AllDone',
   Paused = 'Paused',
+  Announced = 'Announced',
 }
 
 export type ValidTutorialStep =
@@ -18,6 +19,7 @@ export type ValidTutorialStep =
   | TutorialStep.PushBranch
   | TutorialStep.OpenPullRequest
   | TutorialStep.AllDone
+  | TutorialStep.Announced
 
 export function isValidTutorialStep(
   step: TutorialStep
@@ -33,4 +35,5 @@ export const orderedTutorialSteps: ReadonlyArray<ValidTutorialStep> = [
   TutorialStep.PushBranch,
   TutorialStep.OpenPullRequest,
   TutorialStep.AllDone,
+  TutorialStep.Announced,
 ]
diff --git a/app/src/ui/about/about.tsx b/app/src/ui/about/about.tsx
index a867e199156..ae18a158b7e 100644
--- a/app/src/ui/about/about.tsx
+++ b/app/src/ui/about/about.tsx
@@ -16,6 +16,7 @@ import { RelativeTime } from '../relative-time'
 import { assertNever } from '../../lib/fatal-error'
 import { ReleaseNotesUri } from '../lib/releases'
 import { encodePathAsUrl } from '../../lib/path'
+import { isOSNoLongerSupportedByElectron } from '../../lib/get-os'
 
 const logoPath = __DARWIN__
   ? 'static/logo-64x64@2x.png'
@@ -25,7 +26,7 @@ const DesktopLogo = encodePathAsUrl(__dirname, logoPath)
 interface IAboutProps {
   /**
    * Event triggered when the dialog is dismissed by the user in the
-   * ways described in the Dialog component's dismissable prop.
+   * ways described in the Dialog component's dismissible prop.
    */
   readonly onDismissed: () => void
 
@@ -44,8 +45,8 @@ interface IAboutProps {
    */
   readonly applicationArchitecture: string
 
-  /** A function to call to kick off an update check. */
-  readonly onCheckForUpdates: () => void
+  /** A function to call to kick off a non-staggered update check. */
+  readonly onCheckForNonStaggeredUpdates: () => void
 
   readonly onShowAcknowledgements: () => void
 
@@ -114,15 +115,21 @@ export class About extends React.Component<IAboutProps, IAboutState> {
       case UpdateStatus.CheckingForUpdates:
       case UpdateStatus.UpdateAvailable:
       case UpdateStatus.UpdateNotChecked:
-        const disabled = ![
-          UpdateStatus.UpdateNotChecked,
-          UpdateStatus.UpdateNotAvailable,
-        ].includes(updateStatus)
+        const disabled =
+          ![
+            UpdateStatus.UpdateNotChecked,
+            UpdateStatus.UpdateNotAvailable,
+          ].includes(updateStatus) || isOSNoLongerSupportedByElectron()
+
+        const buttonTitle = 'Check for Updates'
 
         return (
           <Row>
-            <Button disabled={disabled} onClick={this.props.onCheckForUpdates}>
-              Check for Updates
+            <Button
+              disabled={disabled}
+              onClick={this.props.onCheckForNonStaggeredUpdates}
+            >
+              {buttonTitle}
             </Button>
           </Row>
         )
@@ -220,6 +227,18 @@ export class About extends React.Component<IAboutProps, IAboutState> {
       return null
     }
 
+    if (isOSNoLongerSupportedByElectron()) {
+      return (
+        <DialogError>
+          This operating system is no longer supported. Software updates have
+          been disabled.{' '}
+          <LinkButton uri="https://docs.github.com/en/desktop/installing-and-configuring-github-desktop/overview/supported-operating-systems">
+            Supported operating systems
+          </LinkButton>
+        </DialogError>
+      )
+    }
+
     if (!this.state.updateState.lastSuccessfulCheck) {
       return (
         <DialogError>
@@ -259,10 +278,12 @@ export class About extends React.Component<IAboutProps, IAboutState> {
     )
 
     const versionText = __DEV__ ? `Build ${version}` : `Version ${version}`
+    const titleId = 'Dialog_about'
 
     return (
       <Dialog
         id="about"
+        titleId={titleId}
         onSubmit={this.props.onDismissed}
         onDismissed={this.props.onDismissed}
       >
@@ -276,19 +297,19 @@ export class About extends React.Component<IAboutProps, IAboutState> {
               height="64"
             />
           </Row>
-          <h2>{name}</h2>
+          <h1 id={titleId}>About {name}</h1>
           <p className="no-padding">
             <span className="selectable-text">
               {versionText} ({this.props.applicationArchitecture})
             </span>{' '}
             ({releaseNotesLink})
           </p>
-          <p className="no-padding">
+          <p className="no-padding terms-and-license">
             <LinkButton onClick={this.props.onShowTermsAndConditions}>
               Terms and Conditions
             </LinkButton>
           </p>
-          <p>
+          <p className="terms-and-license">
             <LinkButton onClick={this.props.onShowAcknowledgements}>
               License and Open Source Notices
             </LinkButton>
diff --git a/app/src/ui/accessibility/aria-live-container.tsx b/app/src/ui/accessibility/aria-live-container.tsx
new file mode 100644
index 00000000000..af752f9ff88
--- /dev/null
+++ b/app/src/ui/accessibility/aria-live-container.tsx
@@ -0,0 +1,115 @@
+import debounce from 'lodash/debounce'
+import React, { Component } from 'react'
+
+interface IAriaLiveContainerProps {
+  /** The content that will be read by the screen reader.
+   *
+   * Original solution used props.children, but we ran into invisible tab
+   * issues when the message has a link. Thus, we are using a prop instead to
+   * require the message to be a string.
+   */
+  readonly message: string | null
+
+  /**
+   * There is a common pattern that we may need to announce a message in
+   * response to user input. Unfortunately, aria-live announcements are
+   * interrupted by continued user input. We can force a rereading of a message
+   * by appending an invisible character when the user finishes their input.
+   *
+   * For example, we have a search filter for a list of branches and we need to
+   * announce how may results are found. Say a list of branches and the user
+   * types "ma", the message becomes "1 result", but if they continue to type
+   * "main" the message will have been interrupted.
+   *
+   * This prop allows us to pass in when the user input changes. This can either
+   * be directly passing in the user input on change or a boolean representing
+   * when we want the message re-read. We can append the invisible character to
+   * force the screen reader to read the message again after each input. To
+   * prevent the message from being read too much, we debounce the message.
+   */
+  readonly trackedUserInput?: string | boolean
+
+  /** Optional id that can be used to associate the message to a control */
+  readonly id?: string
+}
+
+interface IAriaLiveContainerState {
+  /** The generated message for the screen reader */
+  readonly message: JSX.Element | null
+}
+
+/**
+ * This component encapsulates aria-live containers, which are used to
+ * communicate changes to screen readers. The container is hidden from
+ * view, but the screen reader will read the contents of the container
+ * when it changes.
+ *
+ * It also allows to make an invisible change in the content in order to force
+ * the screen reader to read the content again. This is useful when the content
+ * is the same but the screen reader should read it again.
+ */
+export class AriaLiveContainer extends Component<
+  IAriaLiveContainerProps,
+  IAriaLiveContainerState
+> {
+  private suffix: string = ''
+  private onTrackedInputChanged = debounce(() => {
+    this.setState({ message: this.buildMessage() })
+  }, 1000)
+
+  public constructor(props: IAriaLiveContainerProps) {
+    super(props)
+
+    this.state = {
+      message: this.props.message !== null ? this.buildMessage() : null,
+    }
+  }
+
+  public componentDidUpdate(prevProps: IAriaLiveContainerProps) {
+    if (prevProps.trackedUserInput === this.props.trackedUserInput) {
+      return
+    }
+
+    this.onTrackedInputChanged()
+  }
+
+  public componentWillUnmount() {
+    this.onTrackedInputChanged.cancel()
+  }
+
+  private buildMessage() {
+    // We need to toggle from two non-breaking spaces to one non-breaking space
+    // because VoiceOver does not detect the empty string as a change.
+    this.suffix = this.suffix === '\u00A0\u00A0' ? '\u00A0' : '\u00A0\u00A0'
+
+    return <>{this.props.message + this.suffix}</>
+  }
+
+  private renderMessage() {
+    // We are just using this as a typical aria-live container where the message
+    // changes per usage - no need to force re-reading of the same message.
+    if (this.props.trackedUserInput === undefined) {
+      return this.props.message
+    }
+
+    // We are using this as a container to force re-reading of the same message,
+    // so we are re-building message based on user input changes.
+    // If we get a null for the children, go ahead an empty out the
+    // message so we don't get an erroneous reading of a message after it is
+    // gone.
+    return this.props.message !== null ? this.state.message : ''
+  }
+
+  public render() {
+    return (
+      <div
+        id={this.props.id}
+        className="sr-only"
+        aria-live="polite"
+        aria-atomic="true"
+      >
+        {this.renderMessage()}
+      </div>
+    )
+  }
+}
diff --git a/app/src/ui/add-repository/add-existing-repository.tsx b/app/src/ui/add-repository/add-existing-repository.tsx
index 1084a2d578d..6eeed3ee481 100644
--- a/app/src/ui/add-repository/add-existing-repository.tsx
+++ b/app/src/ui/add-repository/add-existing-repository.tsx
@@ -6,15 +6,16 @@ import { Button } from '../lib/button'
 import { TextBox } from '../lib/text-box'
 import { Row } from '../lib/row'
 import { Dialog, DialogContent, DialogFooter } from '../dialog'
-import { Octicon } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
 import { LinkButton } from '../lib/link-button'
 import { PopupType } from '../../models/popup'
 import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group'
+import { FoldoutType } from '../../lib/app-state'
 
 import untildify from 'untildify'
 import { showOpenDialog } from '../main-process-proxy'
 import { Ref } from '../lib/ref'
+import { InputError } from '../lib/input-description/input-error'
+import { IAccessibleMessage } from '../../models/accessible-message'
 
 interface IAddExistingRepositoryProps {
   readonly dispatcher: Dispatcher
@@ -29,17 +30,6 @@ interface IAddExistingRepositoryProps {
 interface IAddExistingRepositoryState {
   readonly path: string
 
-  /**
-   * Indicates whether or not the path provided in the path state field exists and
-   * is a valid Git repository. This value is immediately switched
-   * to false when the path changes and updated (if necessary) by the
-   * function, checkIfPathIsRepository.
-   *
-   * If set to false the user will be prevented from submitting this dialog
-   * and given the option to create a new repository instead.
-   */
-  readonly isRepository: boolean
-
   /**
    * Indicates whether or not to render a warning message about the entered path
    * not containing a valid Git repository. This value differs from `isGitRepository` in that it holds
@@ -60,6 +50,8 @@ export class AddExistingRepository extends React.Component<
   IAddExistingRepositoryProps,
   IAddExistingRepositoryState
 > {
+  private pathTextBoxRef = React.createRef<TextBox>()
+
   public constructor(props: IAddExistingRepositoryProps) {
     super(props)
 
@@ -67,7 +59,6 @@ export class AddExistingRepository extends React.Component<
 
     this.state = {
       path,
-      isRepository: false,
       showNonGitRepositoryWarning: false,
       isRepositoryBare: false,
       isRepositoryUnsafe: false,
@@ -75,14 +66,6 @@ export class AddExistingRepository extends React.Component<
     }
   }
 
-  public async componentDidMount() {
-    const { path } = this.state
-
-    if (path.length !== 0) {
-      await this.validatePath(path)
-    }
-  }
-
   private onTrustDirectory = async () => {
     this.setState({ isTrustingRepository: true })
     const { repositoryUnsafePath, path } = this.state
@@ -94,18 +77,16 @@ export class AddExistingRepository extends React.Component<
   }
 
   private async updatePath(path: string) {
-    this.setState({ path, isRepository: false })
-    await this.validatePath(path)
+    this.setState({ path })
   }
 
-  private async validatePath(path: string) {
+  private async validatePath(path: string): Promise<boolean> {
     if (path.length === 0) {
       this.setState({
-        isRepository: false,
         isRepositoryBare: false,
         showNonGitRepositoryWarning: false,
       })
-      return
+      return false
     }
 
     const type = await getRepositoryType(path)
@@ -119,7 +100,6 @@ export class AddExistingRepository extends React.Component<
     this.setState(state =>
       path === state.path
         ? {
-            isRepository,
             isRepositoryBare,
             isRepositoryUnsafe,
             showNonGitRepositoryWarning,
@@ -127,83 +107,119 @@ export class AddExistingRepository extends React.Component<
           }
         : null
     )
+
+    return path.length > 0 && isRepository && !isRepositoryBare
   }
 
-  private renderWarning() {
-    if (!this.state.path.length || !this.state.showNonGitRepositoryWarning) {
+  private buildBareRepositoryError() {
+    if (
+      !this.state.path.length ||
+      !this.state.showNonGitRepositoryWarning ||
+      !this.state.isRepositoryBare
+    ) {
       return null
     }
 
-    if (this.state.isRepositoryBare) {
-      return (
-        <Row className="warning-helper-text">
-          <Octicon symbol={OcticonSymbol.alert} />
-          <p>
-            This directory appears to be a bare repository. Bare repositories
-            are not currently supported.
-          </p>
-        </Row>
-      )
+    const msg =
+      'This directory appears to be a bare repository. Bare repositories are not currently supported.'
+
+    return { screenReaderMessage: msg, displayedMessage: msg }
+  }
+
+  private buildRepositoryUnsafeError() {
+    const { repositoryUnsafePath, path } = this.state
+    if (
+      !this.state.path.length ||
+      !this.state.showNonGitRepositoryWarning ||
+      !this.state.isRepositoryUnsafe ||
+      repositoryUnsafePath === undefined
+    ) {
+      return null
     }
 
-    const { isRepositoryUnsafe, repositoryUnsafePath, path } = this.state
-
-    if (isRepositoryUnsafe && repositoryUnsafePath !== undefined) {
-      // Git for Windows will replace backslashes with slashes in the error
-      // message so we'll do the same to not show "the repo at path c:/repo"
-      // when the entered path is `c:\repo`.
-      const convertedPath = __WIN32__ ? path.replaceAll('\\', '/') : path
-
-      return (
-        <Row className="warning-helper-text">
-          <Octicon symbol={OcticonSymbol.alert} />
-          <div>
-            <p>
-              The Git repository
-              {repositoryUnsafePath !== convertedPath && (
-                <>
-                  {' at '}
-                  <Ref>{repositoryUnsafePath}</Ref>
-                </>
-              )}{' '}
-              appears to be owned by another user on your machine. Adding
-              untrusted repositories may automatically execute files in the
-              repository.
-            </p>
-            <p>
-              If you trust the owner of the directory you can
-              <LinkButton onClick={this.onTrustDirectory}>
-                add an exception for this directory
-              </LinkButton>{' '}
-              in order to continue.
-            </p>
-          </div>
-        </Row>
-      )
+    // Git for Windows will replace backslashes with slashes in the error
+    // message so we'll do the same to not show "the repo at path c:/repo"
+    // when the entered path is `c:\repo`.
+    const convertedPath = __WIN32__ ? path.replaceAll('\\', '/') : path
+
+    const displayedMessage = (
+      <>
+        <p>
+          The Git repository
+          {repositoryUnsafePath !== convertedPath && (
+            <>
+              {' at '}
+              <Ref>{repositoryUnsafePath}</Ref>
+            </>
+          )}{' '}
+          appears to be owned by another user on your machine. Adding untrusted
+          repositories may automatically execute files in the repository.
+        </p>
+        <p>
+          If you trust the owner of the directory you can
+          <LinkButton onClick={this.onTrustDirectory}>
+            {' '}
+            add an exception for this directory
+          </LinkButton>{' '}
+          in order to continue.
+        </p>
+      </>
+    )
+
+    const screenReaderMessage = `The Git repository appears to be owned by another user on your machine.
+      Adding untrusted repositories may automatically execute files in the repository.
+      If you trust the owner of the directory you can add an exception for this directory in order to continue.`
+
+    return { screenReaderMessage, displayedMessage }
+  }
+
+  private buildNotAGitRepositoryError(): IAccessibleMessage | null {
+    if (!this.state.path.length || !this.state.showNonGitRepositoryWarning) {
+      return null
     }
 
-    return (
-      <Row className="warning-helper-text">
-        <Octicon symbol={OcticonSymbol.alert} />
+    const displayedMessage = (
+      <>
+        <p>This directory does not appear to be a Git repository.</p>
         <p>
-          This directory does not appear to be a Git repository.
-          <br />
           Would you like to{' '}
           <LinkButton onClick={this.onCreateRepositoryClicked}>
             create a repository
           </LinkButton>{' '}
           here instead?
         </p>
+      </>
+    )
+
+    const screenReaderMessage =
+      'This directory does not appear to be a Git repository. Would you like to create a repository here instead?'
+
+    return { screenReaderMessage, displayedMessage }
+  }
+
+  private renderErrors() {
+    const msg: IAccessibleMessage | null =
+      this.buildBareRepositoryError() ??
+      this.buildRepositoryUnsafeError() ??
+      this.buildNotAGitRepositoryError()
+
+    if (msg === null) {
+      return null
+    }
+
+    return (
+      <Row>
+        <InputError
+          id="add-existing-repository-path-error"
+          ariaLiveMessage={msg.screenReaderMessage}
+        >
+          {msg.displayedMessage}
+        </InputError>
       </Row>
     )
   }
 
   public render() {
-    const disabled =
-      this.state.path.length === 0 ||
-      !this.state.isRepository ||
-      this.state.isRepositoryBare
-
     return (
       <Dialog
         id="add-existing-repository"
@@ -215,20 +231,21 @@ export class AddExistingRepository extends React.Component<
         <DialogContent>
           <Row>
             <TextBox
+              ref={this.pathTextBoxRef}
               value={this.state.path}
               label={__DARWIN__ ? 'Local Path' : 'Local path'}
               placeholder="repository path"
               onValueChanged={this.onPathChanged}
+              ariaDescribedBy="add-existing-repository-path-error"
             />
             <Button onClick={this.showFilePicker}>Choose…</Button>
           </Row>
-          {this.renderWarning()}
+          {this.renderErrors()}
         </DialogContent>
 
         <DialogFooter>
           <OkCancelButtonGroup
             okButtonText={__DARWIN__ ? 'Add Repository' : 'Add repository'}
-            okButtonDisabled={disabled}
           />
         </DialogFooter>
       </Dialog>
@@ -258,19 +275,30 @@ export class AddExistingRepository extends React.Component<
   }
 
   private addRepository = async () => {
+    const { path } = this.state
+    const isValidPath = await this.validatePath(path)
+
+    if (!isValidPath) {
+      this.pathTextBoxRef.current?.focus()
+      return
+    }
+
     this.props.onDismissed()
     const { dispatcher } = this.props
 
-    const resolvedPath = this.resolvedPath(this.state.path)
+    const resolvedPath = this.resolvedPath(path)
     const repositories = await dispatcher.addRepositories([resolvedPath])
 
     if (repositories.length > 0) {
+      dispatcher.closeFoldout(FoldoutType.Repository)
       dispatcher.selectRepository(repositories[0])
       dispatcher.recordAddExistingRepository()
     }
   }
 
   private onCreateRepositoryClicked = () => {
+    this.props.onDismissed()
+
     const resolvedPath = this.resolvedPath(this.state.path)
 
     return this.props.dispatcher.showPopup({
diff --git a/app/src/ui/add-repository/create-repository.tsx b/app/src/ui/add-repository/create-repository.tsx
index 08855c642a9..1544e20e52c 100644
--- a/app/src/ui/add-repository/create-repository.tsx
+++ b/app/src/ui/add-repository/create-repository.tsx
@@ -23,8 +23,6 @@ import { ILicense, getLicenses, writeLicense } from './licenses'
 import { writeGitAttributes } from './git-attributes'
 import { getDefaultDir, setDefaultDir } from '../lib/default-dir'
 import { Dialog, DialogContent, DialogFooter, DialogError } from '../dialog'
-import { Octicon } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
 import { LinkButton } from '../lib/link-button'
 import { PopupType } from '../../models/popup'
 import { Ref } from '../lib/ref'
@@ -34,7 +32,14 @@ import { showOpenDialog } from '../main-process-proxy'
 import { pathExists } from '../lib/path-exists'
 import { mkdir } from 'fs/promises'
 import { directoryExists } from '../../lib/directory-exists'
+import { FoldoutType } from '../../lib/app-state'
 import { join } from 'path'
+import { isTopMostDialog } from '../dialog/is-top-most'
+import { InputError } from '../lib/input-description/input-error'
+import { InputWarning } from '../lib/input-description/input-warning'
+
+/** URL used to provide information about submodules to the user. */
+const submoduleDocsUrl = 'https://gh.io/git-submodules'
 
 /** The sentinel value used to indicate no gitignore should be used. */
 const NoGitIgnoreValue = 'None'
@@ -47,29 +52,15 @@ const NoLicenseValue: ILicense = {
   hidden: false,
 }
 
-/** Is the path a git repository? */
-export const isGitRepository = async (path: string) => {
-  const type = await getRepositoryType(path).catch(e => {
-    log.error(`Unable to determine repository type`, e)
-    return { kind: 'missing' } as RepositoryType
-  })
-
-  if (type.kind === 'unsafe') {
-    // If the path is considered unsafe by Git we won't be able to
-    // verify that it's a repository (or worktree). So we'll fall back to this
-    // naive approximation.
-    return directoryExists(join(path, '.git'))
-  }
-
-  return type.kind !== 'missing'
-}
-
 interface ICreateRepositoryProps {
   readonly dispatcher: Dispatcher
   readonly onDismissed: () => void
 
   /** Prefills path input so user doesn't have to. */
   readonly initialPath?: string
+
+  /** Whether the dialog is the top most in the dialog stack */
+  readonly isTopMost: boolean
 }
 
 interface ICreateRepositoryState {
@@ -83,6 +74,9 @@ interface ICreateRepositoryState {
   /** Is the given path already a repository? */
   readonly isRepository: boolean
 
+  /** Is the given path already a subfolder of a repository? */
+  readonly isSubFolderOfRepository: boolean
+
   /** Should the repository be created with a default README? */
   readonly createWithReadme: boolean
 
@@ -114,6 +108,16 @@ export class CreateRepository extends React.Component<
   ICreateRepositoryProps,
   ICreateRepositoryState
 > {
+  private checkIsTopMostDialog = isTopMostDialog(
+    () => {
+      this.updateReadMeExists(this.state.path, this.state.name)
+      window.addEventListener('focus', this.onWindowFocus)
+    },
+    () => {
+      window.removeEventListener('focus', this.onWindowFocus)
+    }
+  )
+
   public constructor(props: ICreateRepositoryProps) {
     super(props)
 
@@ -136,6 +140,7 @@ export class CreateRepository extends React.Component<
       isValidPath: null,
       isRepository: false,
       readMeExists: false,
+      isSubFolderOfRepository: false,
     }
 
     if (path === null) {
@@ -144,7 +149,7 @@ export class CreateRepository extends React.Component<
   }
 
   public async componentDidMount() {
-    window.addEventListener('focus', this.onWindowFocus)
+    this.checkIsTopMostDialog(this.props.isTopMost)
 
     const gitIgnoreNames = await getGitIgnoreNames()
     const licenses = await getLicenses()
@@ -157,8 +162,12 @@ export class CreateRepository extends React.Component<
     this.updateReadMeExists(path, this.state.name)
   }
 
-  public componentWillUnmount() {
-    window.removeEventListener('focus', this.onWindowFocus)
+  public componentDidUpdate(): void {
+    this.checkIsTopMostDialog(this.props.isTopMost)
+  }
+
+  public componentWillUnmount(): void {
+    this.checkIsTopMostDialog(false)
   }
 
   private initializePath = async () => {
@@ -188,12 +197,35 @@ export class CreateRepository extends React.Component<
 
   private async updateIsRepository(path: string, name: string) {
     const fullPath = Path.join(path, sanitizedRepositoryName(name))
-    const isRepository = await isGitRepository(fullPath)
+
+    const type = await getRepositoryType(fullPath).catch(e => {
+      log.error(`Unable to determine repository type`, e)
+      return { kind: 'missing' } as RepositoryType
+    })
+
+    let isRepository: boolean = type.kind !== 'missing'
+    let isSubFolderOfRepository = false
+    if (type.kind === 'unsafe') {
+      // If the path is considered unsafe by Git we won't be able to
+      // verify that it's a repository (or worktree). So we'll fall back to this
+      // naive approximation.
+      isRepository = await directoryExists(join(path, '.git'))
+    }
+
+    if (type.kind === 'regular') {
+      // If the path is a regular repository, we'll check if the top level. If it
+      // isn't than, the path is a subfolder of the repository and a user may want
+      // to make it into a repository.
+      isRepository = type.topLevelWorkingDirectory === fullPath
+      isSubFolderOfRepository = !isRepository
+    }
 
     // Only update isRepository if the path is still the same one we were using
     // to check whether it looked like a repository.
     this.setState(state =>
-      state.path === path && state.name === name ? { isRepository } : null
+      state.path === path && state.name === name
+        ? { isRepository, isSubFolderOfRepository }
+        : null
     )
   }
 
@@ -391,6 +423,7 @@ export class CreateRepository extends React.Component<
 
     this.updateDefaultDirectory()
 
+    this.props.dispatcher.closeFoldout(FoldoutType.Repository)
     this.props.dispatcher.selectRepository(repository)
     this.props.dispatcher.recordCreateRepository()
     this.props.onDismissed()
@@ -420,10 +453,16 @@ export class CreateRepository extends React.Component<
     }
 
     return (
-      <Row className="warning-helper-text">
-        <Octicon symbol={OcticonSymbol.alert} />
-        Will be created as {sanitizedName}
-      </Row>
+      <InputWarning
+        id="repo-sanitized-name-warning"
+        trackedUserInput={this.state.name}
+        ariaLiveMessage={`Will be created as ${sanitizedName}. Spaces and invalid characters have been replaced by hyphens.`}
+      >
+        <p>Will be created as {sanitizedName}</p>
+        <span className="sr-only">
+          Spaces and invalid characters have been replaced by hyphens.
+        </span>
+      </InputWarning>
     )
   }
 
@@ -505,23 +544,55 @@ export class CreateRepository extends React.Component<
     )
   }
 
-  private renderGitRepositoryWarning() {
-    const isRepo = this.state.isRepository
+  private renderGitRepositoryError() {
+    const { isRepository, path, name } = this.state
 
-    if (!this.state.path || this.state.path.length === 0 || !isRepo) {
+    if (!path || path.length === 0 || !isRepository) {
       return null
     }
 
+    const fullPath = Path.join(path, sanitizedRepositoryName(name))
+
     return (
-      <Row className="warning-helper-text">
-        <Octicon symbol={OcticonSymbol.alert} />
-        <p>
-          This directory appears to be a Git repository. Would you like to{' '}
+      <Row>
+        <InputError
+          id="existing-repository-path-error"
+          trackedUserInput={this.state.path + this.state.name}
+          ariaLiveMessage={`The directory ${fullPath} appears to be a Git repository. Would you like to add this repository instead?`}
+        >
+          The directory <Ref>{fullPath}</Ref>appears to be a Git repository.
+          Would you like to{' '}
           <LinkButton onClick={this.onAddRepositoryClicked}>
             add this repository
           </LinkButton>{' '}
           instead?
-        </p>
+        </InputError>
+      </Row>
+    )
+  }
+
+  private renderGitRepositorySubFolderMessage() {
+    const { isSubFolderOfRepository, path, name } = this.state
+
+    if (!path || path.length === 0 || !isSubFolderOfRepository) {
+      return null
+    }
+
+    const fullPath = Path.join(path, sanitizedRepositoryName(name))
+
+    return (
+      <Row>
+        <InputWarning
+          id="path-is-subfolder-of-repository"
+          trackedUserInput={this.state.path + this.state.name}
+          ariaLiveMessage={`The directory ${fullPath} appears to be a subfolder Git repository. Did you know about submodules?`}
+        >
+          The directory <Ref>{fullPath}</Ref>appears to be a subfolder of Git
+          repository.
+          <LinkButton uri={submoduleDocsUrl}>
+            Learn about submodules.
+          </LinkButton>
+        </InputWarning>
       </Row>
     )
   }
@@ -539,17 +610,39 @@ export class CreateRepository extends React.Component<
     }
 
     return (
-      <Row className="warning-helper-text">
-        <Octicon symbol={OcticonSymbol.alert} />
-        <p>
+      <Row>
+        <InputWarning
+          id="readme-overwrite-warning"
+          trackedUserInput={this.state.createWithReadme}
+          ariaLiveMessage="This directory contains a README.md file already. Checking
+          this box will result in the existing file being overwritten."
+        >
           This directory contains a <Ref>README.md</Ref> file already. Checking
           this box will result in the existing file being overwritten.
-        </p>
+        </InputWarning>
       </Row>
     )
   }
 
+  private renderPathMessage = () => {
+    const { path, name, isRepository } = this.state
+
+    if (path === null || path === '' || name === '' || isRepository) {
+      return null
+    }
+
+    const fullPath = Path.join(path, sanitizedRepositoryName(name))
+
+    return (
+      <div id="create-repo-path-msg">
+        The repository will be created at <Ref>{fullPath}</Ref>.
+      </div>
+    )
+  }
+
   private onAddRepositoryClicked = () => {
+    this.props.onDismissed()
+
     const { path, name } = this.state
 
     // Shouldn't be able to even get here if path is null.
@@ -591,6 +684,7 @@ export class CreateRepository extends React.Component<
               label="Name"
               placeholder="repository name"
               onValueChanged={this.onNameChanged}
+              ariaDescribedBy="existing-repository-path-error repo-sanitized-name-warning"
             />
           </Row>
 
@@ -611,6 +705,7 @@ export class CreateRepository extends React.Component<
               placeholder="repository path"
               onValueChanged={this.onPathChanged}
               disabled={readOnlyPath || loadingDefaultDir}
+              ariaDescribedBy="existing-repository-path-error path-is-subfolder-of-repository"
             />
             <Button
               onClick={this.showFilePicker}
@@ -620,7 +715,8 @@ export class CreateRepository extends React.Component<
             </Button>
           </Row>
 
-          {this.renderGitRepositoryWarning()}
+          {this.renderGitRepositoryError()}
+          {this.renderGitRepositorySubFolderMessage()}
 
           <Row>
             <Checkbox
@@ -631,6 +727,7 @@ export class CreateRepository extends React.Component<
                   : CheckboxValue.Off
               }
               onChange={this.onCreateWithReadmeChange}
+              ariaDescribedBy="readme-overwrite-warning"
             />
           </Row>
           {this.renderReadmeOverwriteWarning()}
@@ -640,11 +737,13 @@ export class CreateRepository extends React.Component<
         </DialogContent>
 
         <DialogFooter>
+          {this.renderPathMessage()}
           <OkCancelButtonGroup
             okButtonText={
               __DARWIN__ ? 'Create Repository' : 'Create repository'
             }
             okButtonDisabled={disabled || loadingDefaultDir}
+            okButtonAriaDescribedBy="create-repo-path-msg"
           />
         </DialogFooter>
       </Dialog>
diff --git a/app/src/ui/app-error.tsx b/app/src/ui/app-error.tsx
index b5b91d068fc..f5d745f8892 100644
--- a/app/src/ui/app-error.tsx
+++ b/app/src/ui/app-error.tsx
@@ -7,25 +7,22 @@ import {
   DefaultDialogFooter,
 } from './dialog'
 import { dialogTransitionTimeout } from './app'
-import { GitError, isAuthFailureError } from '../lib/git/core'
+import { coerceToString, GitError, isAuthFailureError } from '../lib/git/core'
 import { Popup, PopupType } from '../models/popup'
-import { TransitionGroup, CSSTransition } from 'react-transition-group'
 import { OkCancelButtonGroup } from './dialog/ok-cancel-button-group'
 import { ErrorWithMetadata } from '../lib/error-with-metadata'
 import { RetryActionType, RetryAction } from '../models/retry-actions'
 import { Ref } from './lib/ref'
-import memoizeOne from 'memoize-one'
-import { parseCarriageReturn } from '../lib/parse-carriage-return'
+import { GitError as DugiteError } from 'dugite'
+import { LinkButton } from './lib/link-button'
+import { getFileFromExceedsError } from '../lib/helpers/regex'
 
 interface IAppErrorProps {
-  /** The list of queued, app-wide, errors  */
-  readonly errors: ReadonlyArray<Error>
+  /** The error to be displayed  */
+  readonly error: Error
 
-  /**
-   * A callback which is used whenever a particular error
-   * has been shown to, and been dismissed by, the user.
-   */
-  readonly onClearError: (error: Error) => void
+  /** Called to dismiss the dialog */
+  readonly onDismissed: () => void
   readonly onShowPopup: (popupType: Popup) => void | undefined
   readonly onRetryAction: (retryAction: RetryAction) => void
 }
@@ -48,18 +45,17 @@ interface IAppErrorState {
  */
 export class AppError extends React.Component<IAppErrorProps, IAppErrorState> {
   private dialogContent: HTMLDivElement | null = null
-  private formatGitErrorMessage = memoizeOne(parseCarriageReturn)
 
   public constructor(props: IAppErrorProps) {
     super(props)
     this.state = {
-      error: props.errors[0] || null,
+      error: props.error,
       disabled: false,
     }
   }
 
   public componentWillReceiveProps(nextProps: IAppErrorProps) {
-    const error = nextProps.errors[0] || null
+    const error = nextProps.error
 
     // We keep the currently shown error until it has disappeared
     // from the first spot in the application error queue.
@@ -68,23 +64,8 @@ export class AppError extends React.Component<IAppErrorProps, IAppErrorState> {
     }
   }
 
-  private onDismissed = () => {
-    const currentError = this.state.error
-
-    if (currentError !== null) {
-      this.setState({ error: null, disabled: true })
-
-      // Give some time for the dialog to nicely transition
-      // out before we clear the error and, potentially, deal
-      // with the next error in the queue.
-      window.setTimeout(() => {
-        this.props.onClearError(currentError)
-      }, dialogTransitionTimeout.exit)
-    }
-  }
-
   private showPreferencesDialog = () => {
-    this.onDismissed()
+    this.props.onDismissed()
 
     //This is a hacky solution to resolve multiple dialog windows
     //being open at the same time.
@@ -95,7 +76,7 @@ export class AppError extends React.Component<IAppErrorProps, IAppErrorState> {
 
   private onRetryAction = (event: React.MouseEvent<HTMLButtonElement>) => {
     event.preventDefault()
-    this.onDismissed()
+    this.props.onDismissed()
 
     const { error } = this.state
 
@@ -113,49 +94,53 @@ export class AppError extends React.Component<IAppErrorProps, IAppErrorState> {
     // If the error message is just the raw git output, display it in
     // fixed-width font
     if (isRawGitError(e)) {
-      const formattedMessage = this.formatGitErrorMessage(e.message)
-      return <p className="monospace">{formattedMessage}</p>
+      return <p className="monospace">{e.message}</p>
+    }
+
+    if (
+      isGitError(e) &&
+      e.result.gitError === DugiteError.PushWithFileSizeExceedingLimit
+    ) {
+      const files = getFileFromExceedsError(coerceToString(e.result.stderr))
+      return (
+        <>
+          <p>{error.message}</p>
+          {files.length > 0 && (
+            <>
+              <p>Files that exceed the limit</p>
+              <ul>
+                {files.map(file => (
+                  <li key={file}>{file}</li>
+                ))}
+              </ul>
+            </>
+          )}
+          <p>
+            See{' '}
+            <LinkButton uri="https://gh.io/lfs">https://gh.io/lfs</LinkButton>{' '}
+            for more information on managing large files on GitHub
+          </p>
+        </>
+      )
     }
 
     return <p>{e.message}</p>
   }
 
   private getTitle(error: Error) {
-    if (isCloneError(error)) {
-      return 'Clone failed'
+    switch (getDugiteError(error)) {
+      case DugiteError.PushWithFileSizeExceedingLimit:
+        return 'File size limit exceeded'
     }
 
-    return 'Error'
-  }
-
-  private renderDialog() {
-    const error = this.state.error
-
-    if (!error) {
-      return null
+    switch (getRetryActionType(error)) {
+      case RetryActionType.Clone:
+        return 'Clone failed'
+      case RetryActionType.Push:
+        return 'Failed to push'
     }
 
-    return (
-      <Dialog
-        id="app-error"
-        type="error"
-        key="error"
-        title={this.getTitle(error)}
-        dismissable={false}
-        onSubmit={this.onDismissed}
-        onDismissed={this.onDismissed}
-        disabled={this.state.disabled}
-        className={
-          isRawGitError(this.state.error) ? 'raw-git-error' : undefined
-        }
-      >
-        <DialogContent onRef={this.onDialogContentRef}>
-          {this.renderErrorMessage(error)}
-          {this.renderContentAfterErrorMessage(error)}
-        </DialogContent>
-        {this.renderFooter(error)}
-      </Dialog>
-    )
+    return 'Error'
   }
 
   private renderContentAfterErrorMessage(error: Error) {
@@ -207,7 +192,7 @@ export class AppError extends React.Component<IAppErrorProps, IAppErrorState> {
 
   private onCloseButtonClick = (e: React.MouseEvent<HTMLButtonElement>) => {
     e.preventDefault()
-    this.onDismissed()
+    this.props.onDismissed()
   }
 
   private renderFooter(error: Error) {
@@ -257,16 +242,36 @@ export class AppError extends React.Component<IAppErrorProps, IAppErrorState> {
   }
 
   public render() {
-    const dialogContent = this.renderDialog()
+    const error = this.state.error
+
+    if (!error) {
+      return null
+    }
 
     return (
-      <TransitionGroup>
-        {dialogContent && (
-          <CSSTransition classNames="modal" timeout={dialogTransitionTimeout}>
-            {dialogContent}
-          </CSSTransition>
-        )}
-      </TransitionGroup>
+      <Dialog
+        id="app-error"
+        type="error"
+        key="error"
+        title={this.getTitle(error)}
+        backdropDismissable={false}
+        onSubmit={this.props.onDismissed}
+        onDismissed={this.props.onDismissed}
+        disabled={this.state.disabled}
+        className={
+          isRawGitError(this.state.error) ? 'raw-git-error' : undefined
+        }
+        role="alertdialog"
+        ariaDescribedBy="app-error-description"
+      >
+        <DialogContent onRef={this.onDialogContentRef}>
+          <div id="app-error-description">
+            {this.renderErrorMessage(error)}
+            {this.renderContentAfterErrorMessage(error)}
+          </div>
+        </DialogContent>
+        {this.renderFooter(error)}
+      </Dialog>
     )
   }
 }
@@ -298,3 +303,16 @@ function isCloneError(error: Error) {
   const { retryAction } = error.metadata
   return retryAction !== undefined && retryAction.type === RetryActionType.Clone
 }
+
+function getRetryActionType(error: Error) {
+  if (!isErrorWithMetaData(error)) {
+    return undefined
+  }
+
+  return error.metadata.retryAction?.type
+}
+
+function getDugiteError(error: Error) {
+  const e = getUnderlyingError(error)
+  return isGitError(e) ? e.result.gitError : undefined
+}
diff --git a/app/src/ui/app-menu/app-menu-bar-button.tsx b/app/src/ui/app-menu/app-menu-bar-button.tsx
index 65e89f1ab02..91950bba86f 100644
--- a/app/src/ui/app-menu/app-menu-bar-button.tsx
+++ b/app/src/ui/app-menu/app-menu-bar-button.tsx
@@ -27,15 +27,6 @@ interface IAppMenuBarButtonProps {
    */
   readonly enableAccessKeyNavigation: boolean
 
-  /**
-   * Whether the menu was opened by pressing Alt (or Alt+X where X is an
-   * access key for one of the top level menu items). This is used as a
-   * one-time signal to the AppMenu to use some special semantics for
-   * selection and focus. Specifically it will ensure that the last opened
-   * menu will receive focus.
-   */
-  readonly openedWithAccessKey: boolean
-
   /**
    * Whether or not to highlight the access key of a top-level menu
    * items (if they have one). This is normally true when the Alt-key
@@ -202,13 +193,19 @@ export class AppMenuBarButton extends React.Component<
         onMouseEnter={this.onMouseEnter}
         onKeyDown={this.onKeyDown}
         tabIndex={-1}
-        role="menuitem"
+        buttonRole="menuitem"
+        buttonAriaHaspopup="menu"
       >
         <MenuListItem
+          menuItemId={`app-menu-${item.label}`}
           item={item}
           highlightAccessKey={this.props.highlightMenuAccessKey}
           renderAcceleratorText={false}
           renderSubMenuArrow={false}
+          selected={false}
+          // Root menu items are wrapped in AppMenuBarButton components which
+          // already have the role="menuitem" attribute.
+          hasNoRole={true}
         />
       </ToolbarDropdown>
     )
@@ -254,7 +251,7 @@ export class AppMenuBarButton extends React.Component<
     if (this.isMenuOpen) {
       this.props.onClose(this.props.menuItem, source)
     } else {
-      this.props.onOpen(this.props.menuItem)
+      this.props.onOpen(this.props.menuItem, true)
     }
   }
 
@@ -269,10 +266,9 @@ export class AppMenuBarButton extends React.Component<
       <AppMenu
         dispatcher={this.props.dispatcher}
         onClose={this.onMenuClose}
-        openedWithAccessKey={this.props.openedWithAccessKey}
         state={menuState}
         enableAccessKeyNavigation={this.props.enableAccessKeyNavigation}
-        autoHeight={true}
+        ariaLabelledby={`app-menu-${this.props.menuItem.label}`}
       />
     )
   }
diff --git a/app/src/ui/app-menu/app-menu-bar.tsx b/app/src/ui/app-menu/app-menu-bar.tsx
index 20bc6c5312b..0e4940f66a9 100644
--- a/app/src/ui/app-menu/app-menu-bar.tsx
+++ b/app/src/ui/app-menu/app-menu-bar.tsx
@@ -9,6 +9,10 @@ import { AppMenuBarButton } from './app-menu-bar-button'
 import { Dispatcher } from '../dispatcher'
 import { AppMenuFoldout, FoldoutType } from '../../lib/app-state'
 
+/** This is the id used for the windows app menu and used elsewhere
+ * to determine if the app menu is is focus */
+export const appMenuId = 'app-menu-bar'
+
 interface IAppMenuBarProps {
   readonly appMenu: ReadonlyArray<IMenu>
   readonly dispatcher: Dispatcher
@@ -445,10 +449,6 @@ export class AppMenuBar extends React.Component<
       ? this.props.appMenu.slice(1)
       : []
 
-    const openedWithAccessKey = foldoutState
-      ? foldoutState.openedWithAccessKey || false
-      : false
-
     const enableAccessKeyNavigation = foldoutState
       ? foldoutState.enableAccessKeyNavigation
       : false
@@ -468,7 +468,6 @@ export class AppMenuBar extends React.Component<
         menuState={menuState}
         highlightMenuAccessKey={highlightMenuAccessKey}
         enableAccessKeyNavigation={enableAccessKeyNavigation}
-        openedWithAccessKey={openedWithAccessKey}
         onClose={this.onMenuClose}
         onOpen={this.onMenuOpen}
         onMouseEnter={this.onMenuButtonMouseEnter}
diff --git a/app/src/ui/app-menu/app-menu.tsx b/app/src/ui/app-menu/app-menu.tsx
index 36bf8c59cc2..21f1174c2a2 100644
--- a/app/src/ui/app-menu/app-menu.tsx
+++ b/app/src/ui/app-menu/app-menu.tsx
@@ -31,24 +31,8 @@ interface IAppMenuProps {
    */
   readonly enableAccessKeyNavigation: boolean
 
-  /**
-   * Whether the menu was opened by pressing Alt (or Alt+X where X is an
-   * access key for one of the top level menu items). This is used as a
-   * one-time signal to the AppMenu to use some special semantics for
-   * selection and focus. Specifically it will ensure that the last opened
-   * menu will receive focus.
-   */
-  readonly openedWithAccessKey: boolean
-
-  /**
-   * If true the MenuPane only takes up as much vertical space needed to
-   * show all menu items. This does not affect maximum height, i.e. if the
-   * visible menu items takes up more space than what is available the menu
-   * will still overflow and be scrollable.
-   *
-   * @default false
-   */
-  readonly autoHeight?: boolean
+  /** The id of the element that serves as the menu's accessibility label */
+  readonly ariaLabelledby: string
 }
 
 export interface IKeyboardCloseSource {
@@ -85,22 +69,6 @@ function menuPaneClassNameFromId(id: string) {
 }
 
 export class AppMenu extends React.Component<IAppMenuProps, {}> {
-  /**
-   * The index of the menu pane that should receive focus after the
-   * next render. Default value is -1. This field is cleared after
-   * each successful focus operation.
-   */
-  private focusPane: number = -1
-
-  /**
-   * A mapping between pane index (depth) and actual MenuPane instances.
-   * This is used in order to (indirectly) call the focus method on the
-   * underlying List instances.
-   *
-   * See focusPane and ensurePaneFocus
-   */
-  private paneRefs: MenuPane[] = []
-
   /**
    * A numeric reference to a setTimeout timer id which is used for
    * opening and closing submenus after a delay.
@@ -109,29 +77,6 @@ export class AppMenu extends React.Component<IAppMenuProps, {}> {
    */
   private expandCollapseTimer: number | null = null
 
-  public constructor(props: IAppMenuProps) {
-    super(props)
-    this.focusPane = props.state.length - 1
-    this.receiveProps(null, props)
-  }
-
-  private receiveProps(
-    currentProps: IAppMenuProps | null,
-    nextProps: IAppMenuProps
-  ) {
-    if (nextProps.openedWithAccessKey) {
-      // We only want to react to the openedWithAccessKey prop once, either
-      // when it goes from false to true or when we receive it as our first
-      // prop. By doing it this way we save ourselves having to go through
-      // the dispatcher and updating the value once we've received it.
-      if (!currentProps || !currentProps.openedWithAccessKey) {
-        // Since we were opened with an access key we auto set focus to the
-        // last pane opened.
-        this.focusPane = nextProps.state.length - 1
-      }
-    }
-  }
-
   private onItemClicked = (
     depth: number,
     item: MenuItem,
@@ -154,9 +99,6 @@ export class AppMenu extends React.Component<IAppMenuProps, {}> {
       this.props.dispatcher.setAppMenuState(menu =>
         menu.withOpenedMenu(item, sourceIsAccessKey)
       )
-      if (source.kind === 'keyboard') {
-        this.focusPane = depth + 1
-      }
     } else if (item.type !== 'separator') {
       // Send the close event before actually executing the item so that
       // the menu can restore focus to the previously selected element
@@ -166,11 +108,12 @@ export class AppMenu extends React.Component<IAppMenuProps, {}> {
     }
   }
 
-  private onItemKeyDown = (
+  private onPaneKeyDown = (
     depth: number,
-    item: MenuItem,
-    event: React.KeyboardEvent<any>
+    event: React.KeyboardEvent<HTMLDivElement>
   ) => {
+    const { selectedItem } = this.props.state[depth]
+
     if (event.key === 'ArrowLeft' || event.key === 'Escape') {
       this.clearExpandCollapseTimer()
 
@@ -184,18 +127,16 @@ export class AppMenu extends React.Component<IAppMenuProps, {}> {
           menu.withClosedMenu(this.props.state[depth])
         )
 
-        this.focusPane = depth - 1
         event.preventDefault()
       }
     } else if (event.key === 'ArrowRight') {
       this.clearExpandCollapseTimer()
 
       // Open the submenu and select the first item
-      if (item.type === 'submenuItem') {
+      if (selectedItem?.type === 'submenuItem') {
         this.props.dispatcher.setAppMenuState(menu =>
-          menu.withOpenedMenu(item, true)
+          menu.withOpenedMenu(selectedItem, true)
         )
-        this.focusPane = depth + 1
         event.preventDefault()
       }
     }
@@ -222,6 +163,12 @@ export class AppMenu extends React.Component<IAppMenuProps, {}> {
     }, expandCollapseTimeout)
   }
 
+  private onClearSelection = (depth: number) => {
+    this.props.dispatcher.setAppMenuState(appMenu =>
+      appMenu.withDeselectedMenu(this.props.state[depth])
+    )
+  }
+
   private onSelectionChanged = (
     depth: number,
     item: MenuItem,
@@ -248,12 +195,6 @@ export class AppMenu extends React.Component<IAppMenuProps, {}> {
     }
   }
 
-  private onMenuPaneRef = (pane: MenuPane | null) => {
-    if (pane) {
-      this.paneRefs[pane.props.depth] = pane
-    }
-  }
-
   private onPaneMouseEnter = (depth: number) => {
     this.clearExpandCollapseTimer()
 
@@ -268,8 +209,6 @@ export class AppMenu extends React.Component<IAppMenuProps, {}> {
       // This ensures that the selection to this menu is reset.
       this.props.dispatcher.setAppMenuState(m => m.withDeselectedMenu(paneMenu))
     }
-
-    this.focusPane = depth
   }
 
   private onKeyDown = (event: React.KeyboardEvent<HTMLElement>) => {
@@ -280,12 +219,6 @@ export class AppMenu extends React.Component<IAppMenuProps, {}> {
   }
 
   private renderMenuPane(depth: number, menu: IMenu): JSX.Element {
-    // NB: We use the menu id instead of depth as the key here to force
-    // a new MenuPane instance and List. This is because we used dynamic
-    // row heights and the react-virtualized Grid component isn't able to
-    // recompute row heights accurately. Without this row indices which
-    // previously held a separator item will retain that height and vice-
-    // versa.
     // If the menu doesn't have an id it's the root menu
     const key = menu.id || '@'
     const className = menu.id ? menuPaneClassNameFromId(menu.id) : undefined
@@ -293,17 +226,17 @@ export class AppMenu extends React.Component<IAppMenuProps, {}> {
     return (
       <MenuPane
         key={key}
-        ref={this.onMenuPaneRef}
         className={className}
-        autoHeight={this.props.autoHeight}
         depth={depth}
         items={menu.items}
         selectedItem={menu.selectedItem}
         onItemClicked={this.onItemClicked}
         onMouseEnter={this.onPaneMouseEnter}
-        onItemKeyDown={this.onItemKeyDown}
+        onKeyDown={this.onPaneKeyDown}
         onSelectionChanged={this.onSelectionChanged}
         enableAccessKeyNavigation={this.props.enableAccessKeyNavigation}
+        onClearSelection={this.onClearSelection}
+        ariaLabelledby={this.props.ariaLabelledby}
       />
     )
   }
@@ -312,43 +245,14 @@ export class AppMenu extends React.Component<IAppMenuProps, {}> {
     const menus = this.props.state
     const panes = menus.map((m, depth) => this.renderMenuPane(depth, m))
 
-    // Clear out any old references we might have to panes that are
-    // no longer displayed.
-    this.paneRefs = this.paneRefs.slice(0, panes.length)
-
     return (
+      // eslint-disable-next-line jsx-a11y/no-static-element-interactions
       <div id="app-menu-foldout" onKeyDown={this.onKeyDown}>
         {panes}
       </div>
     )
   }
 
-  /**
-   * Called after mounting or re-rendering and ensures that the
-   * appropriate (if any) MenuPane list receives keyboard focus.
-   */
-  private ensurePaneFocus() {
-    if (this.focusPane >= 0) {
-      const pane = this.paneRefs[this.focusPane]
-      if (pane) {
-        pane.focus()
-        this.focusPane = -1
-      }
-    }
-  }
-
-  public componentWillReceiveProps(nextProps: IAppMenuProps) {
-    this.receiveProps(this.props, nextProps)
-  }
-
-  public componentDidMount() {
-    this.ensurePaneFocus()
-  }
-
-  public componentDidUpdate() {
-    this.ensurePaneFocus()
-  }
-
   public componentWillUnmount() {
     this.clearExpandCollapseTimer()
   }
diff --git a/app/src/ui/app-menu/menu-list-item.tsx b/app/src/ui/app-menu/menu-list-item.tsx
index aa7a7f37874..b18661d281e 100644
--- a/app/src/ui/app-menu/menu-list-item.tsx
+++ b/app/src/ui/app-menu/menu-list-item.tsx
@@ -2,7 +2,7 @@ import * as React from 'react'
 import classNames from 'classnames'
 
 import { Octicon } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import * as octicons from '../octicons/octicons.generated'
 import { MenuItem } from '../../models/app-menu'
 import { AccessText } from '../lib/access-text'
 import { getPlatformSpecificNameOrSymbolForModifier } from '../../lib/menu-item'
@@ -10,6 +10,12 @@ import { getPlatformSpecificNameOrSymbolForModifier } from '../../lib/menu-item'
 interface IMenuListItemProps {
   readonly item: MenuItem
 
+  /**
+   * A unique identifier for the menu item. On use is  to link it to the menu
+   * for accessibility labelling.
+   */
+  readonly menuItemId?: string
+
   /**
    * Whether or not to highlight the access key of a menu item (if one exists).
    *
@@ -34,6 +40,42 @@ interface IMenuListItemProps {
    * Defaults to true if not specified (i.e. undefined)
    */
   readonly renderSubMenuArrow?: boolean
+
+  /**
+   * Whether or not the menu item represented by this list item is the currently
+   * selected menu item.
+   */
+  readonly selected: boolean
+
+  /**
+   * Whether or not this menu item should have a role applied
+   */
+  readonly hasNoRole?: boolean
+
+  /** Called when the user's pointer device enter the list item */
+  readonly onMouseEnter?: (
+    item: MenuItem,
+    event: React.MouseEvent<HTMLDivElement>
+  ) => void
+  /** Called when the user's pointer device leaves the list item */
+  readonly onMouseLeave?: (
+    item: MenuItem,
+    event: React.MouseEvent<HTMLDivElement>
+  ) => void
+
+  /** Called when the user's pointer device clicks on the list item */
+  readonly onClick?: (
+    item: MenuItem,
+    event: React.MouseEvent<HTMLDivElement>
+  ) => void
+
+  /**
+   * Whether the list item should steal focus when selected. Defaults to
+   * false.
+   */
+  readonly focusOnSelection?: boolean
+
+  readonly renderLabel?: (item: MenuItem) => JSX.Element | undefined
 }
 
 /**
@@ -49,16 +91,59 @@ export function friendlyAcceleratorText(accelerator: string): string {
 }
 
 export class MenuListItem extends React.Component<IMenuListItemProps, {}> {
+  private wrapperRef = React.createRef<HTMLDivElement>()
+
   private getIcon(item: MenuItem): JSX.Element | null {
     if (item.type === 'checkbox' && item.checked) {
-      return <Octicon className="icon" symbol={OcticonSymbol.check} />
+      return <Octicon className="icon" symbol={octicons.check} />
     } else if (item.type === 'radio' && item.checked) {
-      return <Octicon className="icon" symbol={OcticonSymbol.dotFill} />
+      return <Octicon className="icon" symbol={octicons.dotFill} />
     }
 
     return null
   }
 
+  private onMouseEnter = (event: React.MouseEvent<HTMLDivElement>) => {
+    this.props.onMouseEnter?.(this.props.item, event)
+  }
+
+  private onMouseLeave = (event: React.MouseEvent<HTMLDivElement>) => {
+    this.props.onMouseLeave?.(this.props.item, event)
+  }
+
+  private onClick = (event: React.MouseEvent<HTMLDivElement>) => {
+    this.props.onClick?.(this.props.item, event)
+  }
+
+  public componentDidMount() {
+    if (this.props.selected && this.props.focusOnSelection) {
+      this.wrapperRef.current?.focus()
+    }
+  }
+
+  public componentDidUpdate(prevProps: IMenuListItemProps) {
+    const { focusOnSelection, selected } = this.props
+    if (focusOnSelection && selected && !prevProps.selected) {
+      this.wrapperRef.current?.focus()
+    }
+  }
+
+  private renderLabel() {
+    const { item, renderLabel } = this.props
+
+    if (renderLabel !== undefined) {
+      return renderLabel(item)
+    }
+
+    if (item.type === 'separator') {
+      return
+    }
+
+    return (
+      <AccessText text={item.label} highlight={this.props.highlightAccessKey} />
+    )
+  }
+
   public render() {
     const item = this.props.item
 
@@ -68,10 +153,7 @@ export class MenuListItem extends React.Component<IMenuListItemProps, {}> {
 
     const arrow =
       item.type === 'submenuItem' && this.props.renderSubMenuArrow !== false ? (
-        <Octicon
-          className="submenu-arrow"
-          symbol={OcticonSymbol.triangleRight}
-        />
+        <Octicon className="submenu-arrow" symbol={octicons.triangleRight} />
       ) : null
 
     const accelerator =
@@ -83,26 +165,38 @@ export class MenuListItem extends React.Component<IMenuListItemProps, {}> {
         </div>
       ) : null
 
-    const className = classNames(
-      'menu-item',
-      { disabled: !item.enabled },
-      { checkbox: item.type === 'checkbox' },
-      { radio: item.type === 'radio' },
-      {
-        checked:
-          (item.type === 'checkbox' || item.type === 'radio') && item.checked,
-      }
-    )
+    const { type } = item
+
+    const className = classNames('menu-item', {
+      disabled: !item.enabled,
+      checkbox: type === 'checkbox',
+      radio: type === 'radio',
+      checked: (type === 'checkbox' || type === 'radio') && item.checked,
+      selected: this.props.selected,
+    })
+
+    const role = this.props.hasNoRole
+      ? undefined
+      : type === 'checkbox'
+      ? 'menuitemradio'
+      : 'menuitem'
+    const ariaChecked = type === 'checkbox' ? item.checked : undefined
 
     return (
-      <div className={className}>
+      // eslint-disable-next-line jsx-a11y/click-events-have-key-events
+      <div
+        id={this.props.menuItemId}
+        className={className}
+        onMouseEnter={this.onMouseEnter}
+        onMouseLeave={this.onMouseLeave}
+        onClick={this.onClick}
+        ref={this.wrapperRef}
+        role={role}
+        tabIndex={-1}
+        aria-checked={ariaChecked}
+      >
         {this.getIcon(item)}
-        <div className="label">
-          <AccessText
-            text={item.label}
-            highlight={this.props.highlightAccessKey}
-          />
-        </div>
+        <div className="label">{this.renderLabel()}</div>
         {accelerator}
         {arrow}
       </div>
diff --git a/app/src/ui/app-menu/menu-pane.tsx b/app/src/ui/app-menu/menu-pane.tsx
index 0d8a544f771..c0dd8aab00b 100644
--- a/app/src/ui/app-menu/menu-pane.tsx
+++ b/app/src/ui/app-menu/menu-pane.tsx
@@ -1,13 +1,22 @@
 import * as React from 'react'
 import classNames from 'classnames'
 
-import { List, ClickSource, SelectionSource } from '../lib/list'
+import {
+  ClickSource,
+  findLastSelectableRow,
+  findNextSelectableRow,
+  IHoverSource,
+  IKeyboardSource,
+  IMouseClickSource,
+  SelectionSource,
+} from '../lib/list'
 import {
   MenuItem,
   itemIsSelectable,
   findItemByAccessKey,
 } from '../../models/app-menu'
 import { MenuListItem } from './menu-list-item'
+import { assertNever } from '../../lib/fatal-error'
 
 interface IMenuPaneProps {
   /**
@@ -47,14 +56,13 @@ interface IMenuPaneProps {
   ) => void
 
   /**
-   * A callback for when a keyboard key is pressed on a menu item. Note that
-   * this only picks up on keyboard events received by a MenuItem and does
-   * not cover keyboard events received on the MenuPane component itself.
+   * Called when the user presses down on a key while focused on, or within, the
+   * menu pane. Consumers should inspect isDefaultPrevented to determine whether
+   * the event was handled by the menu pane or not.
    */
-  readonly onItemKeyDown?: (
+  readonly onKeyDown?: (
     depth: number,
-    item: MenuItem,
-    event: React.KeyboardEvent<any>
+    event: React.KeyboardEvent<HTMLDivElement>
   ) => void
 
   /**
@@ -74,118 +82,95 @@ interface IMenuPaneProps {
    * enables access key highlighting for applicable menu items as well as
    * keyboard navigation by pressing access keys.
    */
-  readonly enableAccessKeyNavigation: boolean
-
-  /**
-   * If true the MenuPane only takes up as much vertical space needed to
-   * show all menu items. This does not affect maximum height, i.e. if the
-   * visible menu items takes up more space than what is available the menu
-   * will still overflow and be scrollable.
-   *
-   * @default false
-   */
-  readonly autoHeight?: boolean
-}
+  readonly enableAccessKeyNavigation?: boolean
 
-interface IMenuPaneState {
   /**
-   * A list of visible menu items that is to be rendered. This is a derivative
-   * of the props items with invisible items filtered out.
+   * Called to deselect the currently selected menu item (if any). This
+   * will be called when the user's pointer device leaves a menu item.
    */
-  readonly items: ReadonlyArray<MenuItem>
+  readonly onClearSelection: (depth: number) => void
 
-  /** The selected row index or -1 if no selection exists. */
-  readonly selectedIndex: number
-}
+  /** The id of the element that serves as the menu's accessibility label */
+  readonly ariaLabelledby?: string
 
-const RowHeight = 30
-const SeparatorRowHeight = 10
+  /** Whether we move focus to the next menu item with a label that starts with
+   * the typed character if such an menu item exists. */
+  readonly allowFirstCharacterNavigation?: boolean
 
-function getSelectedIndex(
-  selectedItem: MenuItem | undefined,
-  items: ReadonlyArray<MenuItem>
-) {
-  return selectedItem ? items.findIndex(i => i.id === selectedItem.id) : -1
+  readonly renderLabel?: (item: MenuItem) => JSX.Element | undefined
 }
 
-export function getListHeight(menuItems: ReadonlyArray<MenuItem>) {
-  return menuItems.reduce((acc, item) => acc + getRowHeight(item), 0)
-}
-
-export function getRowHeight(item: MenuItem) {
-  if (!item.visible) {
-    return 0
+export class MenuPane extends React.Component<IMenuPaneProps> {
+  private onRowClick = (
+    item: MenuItem,
+    event: React.MouseEvent<HTMLDivElement>
+  ) => {
+    if (item.type !== 'separator' && item.enabled) {
+      const source: IMouseClickSource = { kind: 'mouseclick', event }
+      this.props.onItemClicked(this.props.depth, item, source)
+    }
   }
 
-  return item.type === 'separator' ? SeparatorRowHeight : RowHeight
-}
+  private tryMoveSelection(
+    direction: 'up' | 'down' | 'first' | 'last',
+    source: ClickSource
+  ) {
+    const { items, selectedItem } = this.props
+    const row = selectedItem ? items.indexOf(selectedItem) : -1
+    const count = items.length
+    const selectable = (ix: number) => items[ix] && itemIsSelectable(items[ix])
+
+    let ix: number | null = null
+
+    if (direction === 'up' || direction === 'down') {
+      ix = findNextSelectableRow(count, { direction, row }, selectable)
+    } else if (direction === 'first' || direction === 'last') {
+      const d = direction === 'first' ? 'up' : 'down'
+      ix = findLastSelectableRow(d, count, selectable)
+    }
 
-/**
- * Creates a menu pane state given props. This is intentionally not
- * an instance member in order to avoid mistakenly using any other
- * input data or state than the received props.
- */
-function createState(props: IMenuPaneProps): IMenuPaneState {
-  const items = new Array<MenuItem>()
-  const selectedItem = props.selectedItem
-
-  let selectedIndex = -1
-
-  // Filter out all invisible items and maintain the correct
-  // selected index (if possible)
-  for (let i = 0; i < props.items.length; i++) {
-    const item = props.items[i]
-
-    if (item.visible) {
-      items.push(item)
-      if (item === selectedItem) {
-        selectedIndex = items.length - 1
-      }
+    if (ix !== null && items[ix] !== undefined) {
+      this.props.onSelectionChanged(this.props.depth, items[ix], source)
+      return true
     }
+
+    return false
   }
 
-  return { items, selectedIndex }
-}
+  private tryMoveSelectionByFirstCharacter(key: string, source: ClickSource) {
+    if (
+      key.length > 1 ||
+      !isPrintableCharacterKey(key) ||
+      !this.props.allowFirstCharacterNavigation
+    ) {
+      return
+    }
+    const { items, selectedItem } = this.props
+    const char = key.toLowerCase()
+    const currentRow = selectedItem ? items.indexOf(selectedItem) + 1 : 0
+    const start = currentRow + 1 > items.length ? 0 : currentRow + 1
 
-export class MenuPane extends React.Component<IMenuPaneProps, IMenuPaneState> {
-  private list: List | null = null
+    const firstChars = items.map(v =>
+      v.type === 'separator' ? '' : v.label.trim()[0].toLowerCase()
+    )
 
-  public constructor(props: IMenuPaneProps) {
-    super(props)
-    this.state = createState(props)
-  }
+    // Check menu items after selected
+    let ix: number = firstChars.indexOf(char, start)
 
-  public componentWillReceiveProps(nextProps: IMenuPaneProps) {
-    // No need to recreate the filtered list if it hasn't changed,
-    // we only have to update the selected item
-    if (this.props.items === nextProps.items) {
-      // Has the selection changed?
-      if (this.props.selectedItem !== nextProps.selectedItem) {
-        const selectedIndex = getSelectedIndex(
-          nextProps.selectedItem,
-          this.state.items
-        )
-        this.setState({ selectedIndex })
-      }
-    } else {
-      this.setState(createState(nextProps))
+    // check menu items before selected
+    if (ix === -1) {
+      ix = firstChars.indexOf(char, 0)
     }
-  }
 
-  private onRowClick = (row: number, source: ClickSource) => {
-    const item = this.state.items[row]
-
-    if (item.type !== 'separator' && item.enabled) {
-      this.props.onItemClicked(this.props.depth, item, source)
+    if (ix >= 0 && items[ix] !== undefined) {
+      this.props.onSelectionChanged(this.props.depth, items[ix], source)
+      return true
     }
-  }
 
-  private onSelectedRowChanged = (row: number, source: SelectionSource) => {
-    const item = this.state.items[row]
-    this.props.onSelectionChanged(this.props.depth, item, source)
+    return false
   }
 
-  private onKeyDown = (event: React.KeyboardEvent<any>) => {
+  private onKeyDown = (event: React.KeyboardEvent<HTMLDivElement>) => {
     if (event.defaultPrevented) {
       return
     }
@@ -195,103 +180,117 @@ export class MenuPane extends React.Component<IMenuPaneProps, IMenuPaneState> {
       return
     }
 
-    // If we weren't opened with the Alt key we ignore key presses other than
-    // arrow keys and Enter/Space etc.
-    if (!this.props.enableAccessKeyNavigation) {
-      return
-    }
+    const source: IKeyboardSource = { kind: 'keyboard', event }
+    const { selectedItem } = this.props
+    const { key } = event
 
-    // At this point the list will already have intercepted any arrow keys
-    // and the list items themselves will have caught Enter/Space
-    const item = findItemByAccessKey(event.key, this.state.items)
-    if (item && itemIsSelectable(item)) {
+    if (isSupportedKey(key)) {
       event.preventDefault()
-      this.props.onSelectionChanged(this.props.depth, item, {
-        kind: 'keyboard',
-        event: event,
-      })
-      this.props.onItemClicked(this.props.depth, item, {
-        kind: 'keyboard',
-        event: event,
-      })
-    }
-  }
 
-  private onRowKeyDown = (row: number, event: React.KeyboardEvent<any>) => {
-    if (this.props.onItemKeyDown) {
-      const item = this.state.items[row]
-      this.props.onItemKeyDown(this.props.depth, item, event)
+      if (key === 'ArrowUp' || key === 'ArrowDown') {
+        this.tryMoveSelection(key === 'ArrowUp' ? 'up' : 'down', source)
+      } else if (key === 'Home' || key === 'End') {
+        const direction = key === 'Home' ? 'first' : 'last'
+        this.tryMoveSelection(direction, source)
+      } else if (key === 'Enter' || key === ' ') {
+        if (selectedItem !== undefined) {
+          this.props.onItemClicked(this.props.depth, selectedItem, source)
+        }
+      } else {
+        assertNever(key, 'Unsupported key')
+      }
     }
-  }
 
-  private canSelectRow = (row: number) => {
-    const item = this.state.items[row]
-    return itemIsSelectable(item)
-  }
+    this.tryMoveSelectionByFirstCharacter(key, source)
+
+    // If we weren't opened with the Alt key we ignore key presses other than
+    // arrow keys and Enter/Space etc.
+    if (this.props.enableAccessKeyNavigation) {
+      // At this point the list will already have intercepted any arrow keys
+      // and the list items themselves will have caught Enter/Space
+      const item = findItemByAccessKey(event.key, this.props.items)
+      if (item && itemIsSelectable(item)) {
+        event.preventDefault()
+        this.props.onSelectionChanged(this.props.depth, item, {
+          kind: 'keyboard',
+          event: event,
+        })
+        this.props.onItemClicked(this.props.depth, item, {
+          kind: 'keyboard',
+          event: event,
+        })
+      }
+    }
 
-  private onListRef = (list: List | null) => {
-    this.list = list
+    this.props.onKeyDown?.(this.props.depth, event)
   }
 
   private onMouseEnter = (event: React.MouseEvent<any>) => {
-    if (this.props.onMouseEnter) {
-      this.props.onMouseEnter(this.props.depth)
-    }
+    this.props.onMouseEnter?.(this.props.depth)
   }
 
-  private renderMenuItem = (row: number) => {
-    const item = this.state.items[row]
-
-    return (
-      <MenuListItem
-        key={item.id}
-        item={item}
-        highlightAccessKey={this.props.enableAccessKeyNavigation}
-      />
-    )
+  private onRowMouseEnter = (
+    item: MenuItem,
+    event: React.MouseEvent<HTMLDivElement>
+  ) => {
+    if (itemIsSelectable(item)) {
+      const source: IHoverSource = { kind: 'hover', event }
+      this.props.onSelectionChanged(this.props.depth, item, source)
+    }
   }
 
-  private rowHeight = (info: { index: number }) => {
-    const item = this.state.items[info.index]
-    return item.type === 'separator' ? SeparatorRowHeight : RowHeight
+  private onRowMouseLeave = (
+    item: MenuItem,
+    event: React.MouseEvent<HTMLDivElement>
+  ) => {
+    if (this.props.selectedItem === item) {
+      this.props.onClearSelection(this.props.depth)
+    }
   }
 
   public render(): JSX.Element {
-    const style: React.CSSProperties =
-      this.props.autoHeight === true
-        ? { height: getListHeight(this.props.items) + 5, maxHeight: '100%' }
-        : {}
-
     const className = classNames('menu-pane', this.props.className)
 
     return (
+      // eslint-disable-next-line jsx-a11y/no-static-element-interactions
       <div
         className={className}
         onMouseEnter={this.onMouseEnter}
         onKeyDown={this.onKeyDown}
-        style={style}
+        tabIndex={-1}
+        role="menu"
+        aria-labelledby={this.props.ariaLabelledby}
       >
-        <List
-          ref={this.onListRef}
-          rowCount={this.state.items.length}
-          rowHeight={this.rowHeight}
-          rowRenderer={this.renderMenuItem}
-          selectedRows={[this.state.selectedIndex]}
-          onRowClick={this.onRowClick}
-          onSelectedRowChanged={this.onSelectedRowChanged}
-          canSelectRow={this.canSelectRow}
-          onRowKeyDown={this.onRowKeyDown}
-          invalidationProps={this.state.items}
-          selectOnHover={true}
-          ariaMode="menu"
-        />
+        {this.props.items
+          .filter(x => x.visible)
+          .map((item, ix) => (
+            <MenuListItem
+              key={ix + item.id}
+              item={item}
+              highlightAccessKey={this.props.enableAccessKeyNavigation === true}
+              selected={item.id === this.props.selectedItem?.id}
+              onMouseEnter={this.onRowMouseEnter}
+              onMouseLeave={this.onRowMouseLeave}
+              onClick={this.onRowClick}
+              renderLabel={this.props.renderLabel}
+              focusOnSelection={true}
+            />
+          ))}
       </div>
     )
   }
-
-  public focus() {
-    if (this.list) {
-      this.list.focus()
-    }
-  }
 }
+
+const supportedKeys = [
+  'ArrowUp',
+  'ArrowDown',
+  'Home',
+  'End',
+  'Enter',
+  ' ',
+] as const
+const isSupportedKey = (key: string): key is typeof supportedKeys[number] =>
+  (supportedKeys as readonly string[]).includes(key)
+
+const isPrintableCharacterKey = (key: string) =>
+  key.length === 1 && key.match(/\S/)
diff --git a/app/src/ui/app-theme.tsx b/app/src/ui/app-theme.tsx
index 9180cd6ab18..4563f1a6a5d 100644
--- a/app/src/ui/app-theme.tsx
+++ b/app/src/ui/app-theme.tsx
@@ -3,15 +3,10 @@ import {
   ApplicationTheme,
   getThemeName,
   getCurrentlyAppliedTheme,
-  ICustomTheme,
 } from './lib/application-theme'
-import { isHexColorLight } from './lib/color-manipulation'
-import { buildCustomThemeStyles } from './lib/custom-theme'
 
 interface IAppThemeProps {
   readonly theme: ApplicationTheme
-  readonly useCustomTheme: boolean
-  readonly customTheme?: ICustomTheme
 }
 
 /**
@@ -40,13 +35,6 @@ export class AppTheme extends React.PureComponent<IAppThemeProps> {
   }
 
   private async ensureTheme() {
-    const { customTheme, useCustomTheme } = this.props
-    if (customTheme !== undefined && useCustomTheme) {
-      this.clearThemes()
-      this.setCustomTheme(customTheme)
-      return
-    }
-
     let themeToDisplay = this.props.theme
 
     if (this.props.theme === ApplicationTheme.System) {
@@ -54,15 +42,10 @@ export class AppTheme extends React.PureComponent<IAppThemeProps> {
     }
 
     const newThemeClassName = `theme-${getThemeName(themeToDisplay)}`
-    const body = document.body
 
-    if (
-      !body.classList.contains(newThemeClassName) ||
-      (body.classList.contains('theme-high-contrast') &&
-        !this.props.useCustomTheme)
-    ) {
+    if (!document.body.classList.contains(newThemeClassName)) {
       this.clearThemes()
-      body.classList.add(newThemeClassName)
+      document.body.classList.add(newThemeClassName)
       this.updateColorScheme()
     }
   }
@@ -74,45 +57,6 @@ export class AppTheme extends React.PureComponent<IAppThemeProps> {
     rootStyle.colorScheme = isDarkTheme ? 'dark' : 'light'
   }
 
-  /**
-   * This takes a custom theme object and applies it over top either our dark or
-   * light theme dynamically creating a new variables style sheet.
-   *
-   * It uses the background color of the custom theme to determine if the custom
-   * theme should be based on the light or dark theme. This is most important
-   * for the diff syntax highlighting.
-   *
-   * @param customTheme
-   */
-  private setCustomTheme(customTheme: ICustomTheme) {
-    const { background } = customTheme
-    const body = document.body
-
-    if (!body.classList.contains('theme-high-contrast')) {
-      // Currently our only custom theme is the high-contrast theme
-      // If we were to expand upon custom theming we would not
-      // want this so specific.
-      body.classList.add('theme-high-contrast')
-      // This is important so that code diff syntax colors are legible if the
-      // user customizes to a light vs dark background. Tho, the code diff does
-      // still use the customizable text color for some of the syntax text so
-      // user can still make things illegible by choosing poorly.
-      const themeBase = isHexColorLight(background)
-        ? 'theme-light'
-        : 'theme-dark'
-      body.classList.add(themeBase)
-    }
-
-    const customThemeStyles = buildCustomThemeStyles(customTheme)
-
-    const styles = document.createElement('style')
-    styles.setAttribute('type', 'text/css')
-    styles.appendChild(document.createTextNode(customThemeStyles))
-
-    body.appendChild(styles)
-    this.updateColorScheme()
-  }
-
   private clearThemes() {
     const body = document.body
 
diff --git a/app/src/ui/app.tsx b/app/src/ui/app.tsx
index 6140020c25e..65ba4e12a4c 100644
--- a/app/src/ui/app.tsx
+++ b/app/src/ui/app.tsx
@@ -1,5 +1,6 @@
 import * as React from 'react'
-import * as crypto from 'crypto'
+import * as Path from 'path'
+
 import { TransitionGroup, CSSTransition } from 'react-transition-group'
 import {
   IAppState,
@@ -8,18 +9,24 @@ import {
   SelectionType,
   HistoryTabMode,
 } from '../lib/app-state'
-import { defaultErrorHandler, Dispatcher } from './dispatcher'
+import { Dispatcher } from './dispatcher'
 import { AppStore, GitHubUserStore, IssuesStore } from '../lib/stores'
 import { assertNever } from '../lib/fatal-error'
 import { shell } from '../lib/app-shell'
 import { updateStore, UpdateStatus } from './lib/update-store'
 import { RetryAction } from '../models/retry-actions'
+import { FetchType } from '../models/fetch'
 import { shouldRenderApplicationMenu } from './lib/features'
 import { matchExistingRepository } from '../lib/repository-matching'
 import { getDotComAPIEndpoint } from '../lib/api'
 import { getVersion, getName } from './lib/app-proxy'
-import { getOS } from '../lib/get-os'
-import { MenuEvent } from '../main-process/menu'
+import {
+  getOS,
+  isOSNoLongerSupportedByElectron,
+  isMacOSAndNoLongerSupportedByElectron,
+  isWindowsAndNoLongerSupportedByElectron,
+} from '../lib/get-os'
+import { MenuEvent, isTestMenuEvent } from '../main-process/menu'
 import {
   Repository,
   getGitHubHtmlUrl,
@@ -49,13 +56,15 @@ import {
   BranchDropdown,
   RevertProgress,
 } from './toolbar'
-import { iconForRepository, OcticonSymbolType } from './octicons'
-import * as OcticonSymbol from './octicons/octicons.generated'
+import { iconForRepository, OcticonSymbol } from './octicons'
+import * as octicons from './octicons/octicons.generated'
 import {
   showCertificateTrustDialog,
   sendReady,
   isInApplicationFolder,
   selectAllWindowContents,
+  installWindowsCLI,
+  uninstallWindowsCLI,
 } from './main-process-proxy'
 import { DiscardChanges } from './discard-changes'
 import { Welcome } from './welcome'
@@ -93,18 +102,19 @@ import { RepositoryStateCache } from '../lib/stores/repository-state-cache'
 import { PopupType, Popup } from '../models/popup'
 import { OversizedFiles } from './changes/oversized-files-warning'
 import { PushNeedsPullWarning } from './push-needs-pull'
-import { isCurrentBranchForcePush } from '../lib/rebase'
+import { getCurrentBranchForcePushState } from '../lib/rebase'
 import { Banner, BannerType } from '../models/banner'
 import { StashAndSwitchBranch } from './stash-changes/stash-and-switch-branch-dialog'
 import { OverwriteStash } from './stash-changes/overwrite-stashed-changes-dialog'
 import { ConfirmDiscardStashDialog } from './stashing/confirm-discard-stash'
+import { ConfirmCheckoutCommitDialog } from './checkout/confirm-checkout-commit'
 import { CreateTutorialRepositoryDialog } from './no-repositories/create-tutorial-repository-dialog'
 import { ConfirmExitTutorial } from './tutorial'
 import { TutorialStep, isValidTutorialStep } from '../models/tutorial-step'
 import { WorkflowPushRejectedDialog } from './workflow-push-rejected/workflow-push-rejected'
 import { SAMLReauthRequiredDialog } from './saml-reauth-required/saml-reauth-required'
 import { CreateForkDialog } from './forks/create-fork-dialog'
-import { findDefaultUpstreamBranch } from '../lib/branch'
+import { findContributionTargetDefaultBranch } from '../lib/branch'
 import {
   GitHubRepository,
   hasWritePermission,
@@ -132,7 +142,6 @@ import { ReleaseNote } from '../models/release-notes'
 import { CommitMessageDialog } from './commit-message/commit-message-dialog'
 import { buildAutocompletionProviders } from './autocompletion'
 import { DragType, DropTargetSelector } from '../models/drag-drop'
-import { enableSquashing } from '../lib/feature-flag'
 import { dragAndDropManager } from '../lib/drag-and-drop-manager'
 import { MultiCommitOperation } from './multi-commit-operation/multi-commit-operation'
 import { WarnLocalChangesBeforeUndo } from './undo/warn-local-changes-before-undo'
@@ -147,14 +156,32 @@ import { PullRequestChecksFailed } from './notifications/pull-request-checks-fai
 import { CICheckRunRerunDialog } from './check-runs/ci-check-run-rerun-dialog'
 import { WarnForcePushDialog } from './multi-commit-operation/dialog/warn-force-push-dialog'
 import { clamp } from '../lib/clamp'
+import { generateRepositoryListContextMenu } from './repositories-list/repository-list-item-context-menu'
 import * as ipcRenderer from '../lib/ipc-renderer'
-import { showNotification } from '../lib/notifications/show-notification'
 import { DiscardChangesRetryDialog } from './discard-changes/discard-changes-retry-dialog'
-import { generateDevReleaseSummary } from '../lib/release-notes'
 import { PullRequestReview } from './notifications/pull-request-review'
-import { getPullRequestCommitRef } from '../models/pull-request'
 import { getRepositoryType } from '../lib/git'
 import { SSHUserPassword } from './ssh/ssh-user-password'
+import { showContextualMenu } from '../lib/menu-item'
+import { UnreachableCommitsDialog } from './history/unreachable-commits-dialog'
+import { OpenPullRequestDialog } from './open-pull-request/open-pull-request-dialog'
+import { sendNonFatalException } from '../lib/helpers/non-fatal-exception'
+import { createCommitURL } from '../lib/commit-url'
+import { InstallingUpdate } from './installing-update/installing-update'
+import { DialogStackContext } from './dialog'
+import { TestNotifications } from './test-notifications/test-notifications'
+import { NotificationsDebugStore } from '../lib/stores/notifications-debug-store'
+import { PullRequestComment } from './notifications/pull-request-comment'
+import { UnknownAuthors } from './unknown-authors/unknown-authors-dialog'
+import { UnsupportedOSBannerDismissedAtKey } from './banners/os-version-no-longer-supported-banner'
+import { offsetFromNow } from '../lib/offset-from'
+import { getBoolean, getNumber } from '../lib/local-storage'
+import { IconPreviewDialog } from './octicons/icon-preview-dialog'
+import { accessibilityBannerDismissed } from './banners/accessibilty-settings-banner'
+import { isCertificateErrorSuppressedFor } from '../lib/suppress-certificate-error'
+import { webUtils } from 'electron'
+import { showTestUI } from './lib/test-ui-components/test-ui-components'
+import { ConfirmCommitFilteredChanges } from './changes/confirm-commit-filtered-changes-dialog'
 
 const MinuteInMilliseconds = 1000 * 60
 const HourInMilliseconds = MinuteInMilliseconds * 60
@@ -176,6 +203,7 @@ interface IAppProps {
   readonly issuesStore: IssuesStore
   readonly gitHubUserStore: GitHubUserStore
   readonly aheadBehindStore: AheadBehindStore
+  readonly notificationsDebugStore: NotificationsDebugStore
   readonly startTime: number
 }
 
@@ -211,7 +239,7 @@ export class App extends React.Component<IAppProps, IAppState> {
    * modal dialog such as the preferences, or an error dialog.
    */
   private get isShowingModal() {
-    return this.state.currentPopup !== null || this.state.errors.length > 0
+    return this.state.currentPopup !== null
   }
 
   /**
@@ -219,8 +247,8 @@ export class App extends React.Component<IAppProps, IAppState> {
    * passed popupType, so it can be used in render() without creating
    * multiple instances when the component gets re-rendered.
    */
-  private getOnPopupDismissedFn = memoizeOne((popupType: PopupType) => {
-    return () => this.onPopupDismissed(popupType)
+  private getOnPopupDismissedFn = memoizeOne((popupId: string) => {
+    return () => this.onPopupDismissed(popupId)
   })
 
   public constructor(props: IAppProps) {
@@ -287,6 +315,10 @@ export class App extends React.Component<IAppProps, IAppState> {
     })
 
     ipcRenderer.on('certificate-error', (_, certificate, error, url) => {
+      if (isCertificateErrorSuppressedFor(url)) {
+        return
+      }
+
       this.props.dispatcher.showPopup({
         type: PopupType.UntrustedCertificate,
         certificate,
@@ -299,6 +331,10 @@ export class App extends React.Component<IAppProps, IAppState> {
 
   public componentWillUnmount() {
     window.clearInterval(this.updateIntervalHandle)
+
+    if (__DARWIN__) {
+      window.removeEventListener('keydown', this.onMacOSWindowKeyDown)
+    }
   }
 
   private async performDeferredLaunchActions() {
@@ -338,12 +374,52 @@ export class App extends React.Component<IAppProps, IAppState> {
       this.showPopup({ type: PopupType.MoveToApplicationsFolder })
     }
 
+    this.setOnOpenBanner()
+  }
+
+  private onOpenAccessibilitySettings = () => {
+    this.props.dispatcher.showPopup({
+      type: PopupType.Preferences,
+      initialSelectedTab: PreferencesTab.Accessibility,
+    })
+  }
+
+  /**
+   * This method sets the app banner on opening the app. The last banner set in
+   * this method will be the one shown as only one banner is shown at a time.
+   * The only exception is the update available banner is always
+   * prioritized over other banners.
+   *
+   * Priority:
+   * 1. OS Not Supported by Electron
+   * 2. Accessibility Settings Banner
+   * 3. Thank you banner
+   */
+  private setOnOpenBanner() {
+    if (isOSNoLongerSupportedByElectron()) {
+      const dismissedAt = getNumber(UnsupportedOSBannerDismissedAtKey, 0)
+
+      // Remind the user that they're running an unsupported OS every 90 days
+      if (dismissedAt < offsetFromNow(-90, 'days')) {
+        this.setBanner({ type: BannerType.OSVersionNoLongerSupported })
+        return
+      }
+    }
+
+    if (getBoolean(accessibilityBannerDismissed) !== true) {
+      this.setBanner({
+        type: BannerType.AccessibilitySettingsBanner,
+        onOpenAccessibilitySettings: this.onOpenAccessibilitySettings,
+      })
+      return
+    }
+
     this.checkIfThankYouIsInOrder()
   }
 
   private onMenuEvent(name: MenuEvent): any {
     // Don't react to menu events when an error dialog is shown.
-    if (this.state.errors.length) {
+    if (name !== 'test-app-error' && this.state.errorCount > 1) {
       return
     }
 
@@ -354,10 +430,12 @@ export class App extends React.Component<IAppProps, IAppState> {
         return this.push({ forceWithLease: true })
       case 'pull':
         return this.pull()
+      case 'fetch':
+        return this.fetch()
       case 'show-changes':
-        return this.showChanges()
+        return this.showChanges(true)
       case 'show-history':
-        return this.showHistory()
+        return this.showHistory(true)
       case 'choose-repository':
         return this.chooseRepository()
       case 'add-local-repository':
@@ -382,11 +460,13 @@ export class App extends React.Component<IAppProps, IAppState> {
         return this.props.dispatcher.showPopup({ type: PopupType.Preferences })
       case 'open-working-directory':
         return this.openCurrentRepositoryWorkingDirectory()
-      case 'update-branch':
-        this.props.dispatcher.recordMenuInitiatedUpdate()
-        return this.updateBranch()
+      case 'update-branch-with-contribution-target-branch':
+        this.props.dispatcher.incrementMetric(
+          'updateFromDefaultBranchMenuCount'
+        )
+        return this.updateBranchWithContributionTargetBranch()
       case 'compare-to-branch':
-        return this.showHistory(true)
+        return this.showHistory(false, true)
       case 'merge-branch':
         this.props.dispatcher.recordMenuInitiatedMerge()
         return this.mergeBranch()
@@ -394,16 +474,16 @@ export class App extends React.Component<IAppProps, IAppState> {
         this.props.dispatcher.recordMenuInitiatedMerge(true)
         return this.mergeBranch(true)
       case 'rebase-branch':
-        this.props.dispatcher.recordMenuInitiatedRebase()
+        this.props.dispatcher.incrementMetric('rebaseCurrentBranchMenuCount')
         return this.showRebaseDialog()
       case 'show-repository-settings':
         return this.showRepositorySettings()
       case 'view-repository-on-github':
         return this.viewRepositoryOnGitHub()
       case 'compare-on-github':
-        return this.openBranchOnGitub('compare')
+        return this.openBranchOnGitHub('compare')
       case 'branch-on-github':
-        return this.openBranchOnGitub('tree')
+        return this.openBranchOnGitHub('tree')
       case 'create-issue-in-repository-on-github':
         return this.openIssueCreationOnGitHub()
       case 'open-in-shell':
@@ -412,151 +492,62 @@ export class App extends React.Component<IAppProps, IAppState> {
         return this.showCloneRepo()
       case 'show-about':
         return this.showAbout()
-      case 'boomtown':
-        return this.boomtown()
       case 'go-to-commit-message':
         return this.goToCommitMessage()
       case 'open-pull-request':
         return this.openPullRequest()
-      case 'install-cli':
-        return this.props.dispatcher.installCLI()
+      case 'preview-pull-request':
+        return this.startPullRequest()
+      case 'install-darwin-cli':
+        return this.props.dispatcher.installDarwinCLI()
+      case 'install-windows-cli':
+        return installWindowsCLI()
+      case 'uninstall-windows-cli':
+        return uninstallWindowsCLI()
       case 'open-external-editor':
         return this.openCurrentRepositoryInExternalEditor()
       case 'select-all':
         return this.selectAll()
-      case 'show-release-notes-popup':
-        return this.showFakeReleaseNotesPopup()
       case 'show-stashed-changes':
         return this.showStashedChanges()
       case 'hide-stashed-changes':
         return this.hideStashedChanges()
-      case 'test-show-notification':
-        return this.testShowNotification()
-      case 'test-prune-branches':
-        return this.testPruneBranches()
       case 'find-text':
         return this.findText()
-      case 'pull-request-check-run-failed':
-        return this.testPullRequestCheckRunFailed()
+      case 'increase-active-resizable-width':
+        return this.resizeActiveResizable('increase-active-resizable-width')
+      case 'decrease-active-resizable-width':
+        return this.resizeActiveResizable('decrease-active-resizable-width')
       default:
+        if (isTestMenuEvent(name)) {
+          return showTestUI(
+            name,
+            this.getRepository(),
+            this.props.dispatcher,
+            this.state.emoji
+          )
+        }
         return assertNever(name, `Unknown menu event name: ${name}`)
     }
   }
 
   /**
-   * Show a release notes popup for a fake release, intended only to
-   * make it easier to verify changes to the popup. Has no meaning
-   * about a new release being available.
+   * Handler for the 'increase-active-resizable-width' and
+   * 'decrease-active-resizable-width' menu event, dispatches a custom DOM event
+   * originating from the element which currently has keyboard focus. Components
+   * have a chance to intercept this event and implement their resize logic.
    */
-  private async showFakeReleaseNotesPopup() {
-    if (__DEV__) {
-      this.props.dispatcher.showPopup({
-        type: PopupType.ReleaseNotes,
-        newReleases: await generateDevReleaseSummary(),
+  private resizeActiveResizable(
+    menuId:
+      | 'increase-active-resizable-width'
+      | 'decrease-active-resizable-width'
+  ) {
+    document.activeElement?.dispatchEvent(
+      new CustomEvent(menuId, {
+        bubbles: true,
+        cancelable: true,
       })
-    }
-  }
-
-  private testShowNotification() {
-    if (
-      __RELEASE_CHANNEL__ !== 'development' &&
-      __RELEASE_CHANNEL__ !== 'test'
-    ) {
-      return
-    }
-
-    showNotification({
-      title: 'Test notification',
-      body: 'Click here! This is a test notification',
-      onClick: () => this.props.dispatcher.showPopup({ type: PopupType.About }),
-    })
-  }
-
-  private testPullRequestCheckRunFailed() {
-    if (
-      __RELEASE_CHANNEL__ !== 'development' &&
-      __RELEASE_CHANNEL__ !== 'test'
-    ) {
-      return
-    }
-
-    const { selectedState } = this.state
-    if (
-      selectedState == null ||
-      selectedState.type !== SelectionType.Repository
-    ) {
-      defaultErrorHandler(
-        new Error(
-          'You must be in a GitHub repo, on a pull request branch, and your branch tip must be in a valid state.'
-        ),
-        this.props.dispatcher
-      )
-      return
-    }
-
-    const {
-      repository,
-      state: {
-        branchesState: { currentPullRequest: pullRequest, tip },
-      },
-    } = selectedState
-
-    const currentBranchName =
-      tip.kind === TipState.Valid
-        ? tip.branch.upstreamWithoutRemote ?? tip.branch.name
-        : ''
-
-    if (
-      !isRepositoryWithGitHubRepository(repository) ||
-      pullRequest === null ||
-      currentBranchName === ''
-    ) {
-      defaultErrorHandler(
-        new Error(
-          'You must be in a GitHub repo, on a pull request branch, and your branch tip must be in a valid state.'
-        ),
-        this.props.dispatcher
-      )
-      return
-    }
-
-    const cachedStatus = this.props.dispatcher.tryGetCommitStatus(
-      repository.gitHubRepository,
-      getPullRequestCommitRef(pullRequest.pullRequestNumber)
     )
-
-    if (cachedStatus?.checks === undefined) {
-      // Probably be hard for this to happen as the checks start loading in the background for pr statuses
-      defaultErrorHandler(
-        new Error(
-          'Your pull request must have cached checks. Try opening the checks popover and then try again.'
-        ),
-        this.props.dispatcher
-      )
-      return
-    }
-
-    const { checks } = cachedStatus
-
-    const popup: Popup = {
-      type: PopupType.PullRequestChecksFailed,
-      pullRequest,
-      repository,
-      shouldChangeRepository: true,
-      commitMessage: 'Adding this feature',
-      commitSha: pullRequest.head.sha,
-      checks,
-    }
-
-    this.showPopup(popup)
-  }
-
-  private testPruneBranches() {
-    if (!__DEV__) {
-      return
-    }
-
-    this.props.appStore._testPruneBranches()
   }
 
   /**
@@ -602,23 +593,34 @@ export class App extends React.Component<IAppProps, IAppState> {
     }
   }
 
-  private boomtown() {
-    setImmediate(() => {
-      throw new Error('Boomtown!')
-    })
-  }
-
   private async goToCommitMessage() {
-    await this.showChanges()
+    await this.showChanges(false)
     this.props.dispatcher.setCommitMessageFocus(true)
   }
 
-  private checkForUpdates(inBackground: boolean) {
+  private checkForUpdates(
+    inBackground: boolean,
+    skipGuidCheck: boolean = false
+  ) {
     if (__LINUX__ || __RELEASE_CHANNEL__ === 'development') {
       return
     }
 
-    updateStore.checkForUpdates(inBackground)
+    if (isWindowsAndNoLongerSupportedByElectron()) {
+      log.error(
+        `Can't check for updates on Windows 8.1 or older. Next available update only supports Windows 10 and later`
+      )
+      return
+    }
+
+    if (isMacOSAndNoLongerSupportedByElectron()) {
+      log.error(
+        `Can't check for updates on macOS 10.14 or older. Next available update only supports macOS 10.15 and later`
+      )
+      return
+    }
+
+    updateStore.checkForUpdates(inBackground, skipGuidCheck)
   }
 
   private getDotComAccount(): Account | null {
@@ -635,7 +637,7 @@ export class App extends React.Component<IAppProps, IAppState> {
     return enterpriseAccount || null
   }
 
-  private updateBranch() {
+  private updateBranchWithContributionTargetBranch() {
     const { selectedState } = this.state
     if (
       selectedState == null ||
@@ -645,19 +647,27 @@ export class App extends React.Component<IAppProps, IAppState> {
     }
 
     const { state, repository } = selectedState
-    const defaultBranch = state.branchesState.defaultBranch
-    if (!defaultBranch) {
+
+    const contributionTargetDefaultBranch = findContributionTargetDefaultBranch(
+      repository,
+      state.branchesState
+    )
+    if (!contributionTargetDefaultBranch) {
       return
     }
 
     this.props.dispatcher.initializeMergeOperation(
       repository,
       false,
-      defaultBranch
+      contributionTargetDefaultBranch
     )
 
     const { mergeStatus } = state.compareState
-    this.props.dispatcher.mergeBranch(repository, defaultBranch, mergeStatus)
+    this.props.dispatcher.mergeBranch(
+      repository,
+      contributionTargetDefaultBranch,
+      mergeStatus
+    )
   }
 
   private mergeBranch(isSquash: boolean = false) {
@@ -672,7 +682,7 @@ export class App extends React.Component<IAppProps, IAppState> {
     this.props.dispatcher.startMergeBranchOperation(repository, isSquash)
   }
 
-  private openBranchOnGitub(view: 'tree' | 'compare') {
+  private openBranchOnGitHub(view: 'tree' | 'compare') {
     const htmlURL = this.getCurrentRepositoryGitHubURL()
     if (!htmlURL) {
       return
@@ -845,7 +855,10 @@ export class App extends React.Component<IAppProps, IAppState> {
     this.props.dispatcher.showPopup({ type: PopupType.About })
   }
 
-  private async showHistory(showBranchList: boolean = false) {
+  private async showHistory(
+    shouldFocusHistory: boolean,
+    showBranchList: boolean = false
+  ) {
     const state = this.state.selectedState
     if (state == null || state.type !== SelectionType.Repository) {
       return
@@ -866,19 +879,28 @@ export class App extends React.Component<IAppProps, IAppState> {
       filterText: '',
       showBranchList,
     })
+
+    if (shouldFocusHistory) {
+      this.repositoryViewRef.current?.setFocusHistoryNeeded()
+    }
   }
 
-  private showChanges() {
+  private async showChanges(shouldFocusChanges: boolean) {
     const state = this.state.selectedState
     if (state == null || state.type !== SelectionType.Repository) {
       return
     }
 
     this.props.dispatcher.closeCurrentFoldout()
-    return this.props.dispatcher.changeRepositorySection(
+
+    await this.props.dispatcher.changeRepositorySection(
       state.repository,
       RepositorySectionTab.Changes
     )
+
+    if (shouldFocusChanges) {
+      this.repositoryViewRef.current?.setFocusChangesNeeded()
+    }
   }
 
   private chooseRepository() {
@@ -932,6 +954,15 @@ export class App extends React.Component<IAppProps, IAppState> {
     this.props.dispatcher.pull(state.repository)
   }
 
+  private async fetch() {
+    const state = this.state.selectedState
+    if (state == null || state.type !== SelectionType.Repository) {
+      return
+    }
+
+    this.props.dispatcher.fetch(state.repository, FetchType.UserInitiatedTask)
+  }
+
   private showStashedChanges() {
     const state = this.state.selectedState
     if (state == null || state.type !== SelectionType.Repository) {
@@ -982,6 +1013,43 @@ export class App extends React.Component<IAppProps, IAppState> {
       window.addEventListener('keydown', this.onWindowKeyDown)
       window.addEventListener('keyup', this.onWindowKeyUp)
     }
+
+    if (__DARWIN__) {
+      window.addEventListener('keydown', this.onMacOSWindowKeyDown)
+    }
+
+    document.addEventListener('focus', this.onDocumentFocus, {
+      capture: true,
+    })
+  }
+
+  private onDocumentFocus = (event: FocusEvent) => {
+    this.props.dispatcher.appFocusedElementChanged()
+  }
+
+  /**
+   * Manages keyboard shortcuts specific to macOS.
+   * - adds Shift+F10 to open the context menus (like on Windows so macOS
+   *   keyboard users are not required to use VoiceOver to trigger context
+   *   menus)
+   */
+  private onMacOSWindowKeyDown = (event: KeyboardEvent) => {
+    // We do not want to override Shift+F10 behavior for the context menu on Windows.
+    if (!__DARWIN__) {
+      return
+    }
+
+    if (event.defaultPrevented) {
+      return
+    }
+
+    if (event.shiftKey && event.key === 'F10') {
+      document.activeElement?.dispatchEvent(
+        new Event('contextmenu', {
+          bubbles: true, // Required for React's event system
+        })
+      )
+    }
   }
 
   /**
@@ -1044,7 +1112,6 @@ export class App extends React.Component<IAppProps, IAppState> {
               this.props.dispatcher.showFoldout({
                 type: FoldoutType.AppMenu,
                 enableAccessKeyNavigation: true,
-                openedWithAccessKey: true,
               })
             } else {
               this.props.dispatcher.executeMenuItem(menuItemForAccessKey)
@@ -1086,7 +1153,6 @@ export class App extends React.Component<IAppProps, IAppState> {
             this.props.dispatcher.showFoldout({
               type: FoldoutType.AppMenu,
               enableAccessKeyNavigation: true,
-              openedWithAccessKey: false,
             })
           }
         }
@@ -1095,7 +1161,7 @@ export class App extends React.Component<IAppProps, IAppState> {
   }
 
   private async handleDragAndDrop(fileList: FileList) {
-    const paths = [...fileList].map(x => x.path)
+    const paths = Array.from(fileList, webUtils.getPathForFile)
     const { dispatcher } = this.props
 
     // If they're bulk adding repositories then just blindly try to add them.
@@ -1301,6 +1367,12 @@ export class App extends React.Component<IAppProps, IAppState> {
       this.state.currentFoldout &&
       this.state.currentFoldout.type === FoldoutType.AppMenu
 
+    // As Linux still uses the classic Electron menu, we are opting out of the
+    // custom menu that is shown as part of the title bar below
+    if (__LINUX__) {
+      return null
+    }
+
     // When we're in full-screen mode on Windows we only need to render
     // the title bar when the menu bar is active. On other platforms we
     // never render the title bar while in full-screen mode.
@@ -1336,8 +1408,8 @@ export class App extends React.Component<IAppProps, IAppState> {
     )
   }
 
-  private onPopupDismissed = (popupType: PopupType) => {
-    return this.props.dispatcher.closePopup(popupType)
+  private onPopupDismissed = (popupId: string) => {
+    return this.props.dispatcher.closePopupById(popupId)
   }
 
   private onContinueWithUntrustedCertificate = (
@@ -1352,34 +1424,49 @@ export class App extends React.Component<IAppProps, IAppState> {
   private onUpdateAvailableDismissed = () =>
     this.props.dispatcher.setUpdateBannerVisibility(false)
 
-  private currentPopupContent(): JSX.Element | null {
-    // Hide any dialogs while we're displaying an error
-    if (this.state.errors.length) {
+  private allPopupContent(): JSX.Element | null {
+    const { allPopups } = this.state
+
+    if (allPopups.length === 0) {
       return null
     }
 
-    const popup = this.state.currentPopup
+    return (
+      <>
+        {allPopups.map(popup => {
+          const isTopMost = this.state.currentPopup?.id === popup.id
+          return (
+            <DialogStackContext.Provider key={popup.id} value={{ isTopMost }}>
+              {this.popupContent(popup, isTopMost)}
+            </DialogStackContext.Provider>
+          )
+        })}
+      </>
+    )
+  }
 
-    if (!popup) {
+  private popupContent(popup: Popup, isTopMost: boolean): JSX.Element | null {
+    if (popup.id === undefined) {
+      // Should not be possible... but if it does we want to know about it.
+      sendNonFatalException(
+        'PopupNoId',
+        new Error(
+          `Attempted to open a popup of type '${popup.type}' without an Id`
+        )
+      )
       return null
     }
 
-    const onPopupDismissedFn = this.getOnPopupDismissedFn(popup.type)
+    const onPopupDismissedFn = this.getOnPopupDismissedFn(popup.id)
 
     switch (popup.type) {
       case PopupType.RenameBranch:
-        const stash =
-          this.state.selectedState !== null &&
-          this.state.selectedState.type === SelectionType.Repository
-            ? this.state.selectedState.state.changesState.stashEntry
-            : null
         return (
           <RenameBranch
             key="rename-branch"
             dispatcher={this.props.dispatcher}
             repository={popup.repository}
             branch={popup.branch}
-            stash={stash}
             onDismissed={onPopupDismissedFn}
           />
         )
@@ -1465,19 +1552,36 @@ export class App extends React.Component<IAppProps, IAppState> {
             confirmDiscardChangesPermanently={
               this.state.askForConfirmationOnDiscardChangesPermanently
             }
+            confirmDiscardStash={this.state.askForConfirmationOnDiscardStash}
+            confirmCheckoutCommit={
+              this.state.askForConfirmationOnCheckoutCommit
+            }
             confirmForcePush={this.state.askForConfirmationOnForcePush}
+            confirmUndoCommit={this.state.askForConfirmationOnUndoCommit}
+            askForConfirmationOnCommitFilteredChanges={
+              this.state.askForConfirmationOnCommitFilteredChanges
+            }
             uncommittedChangesStrategy={this.state.uncommittedChangesStrategy}
             selectedExternalEditor={this.state.selectedExternalEditor}
             useWindowsOpenSSH={this.state.useWindowsOpenSSH}
+            showCommitLengthWarning={this.state.showCommitLengthWarning}
             notificationsEnabled={this.state.notificationsEnabled}
             optOutOfUsageTracking={this.state.optOutOfUsageTracking}
+            useExternalCredentialHelper={this.state.useExternalCredentialHelper}
             enterpriseAccount={this.getEnterpriseAccount()}
             repository={repository}
             onDismissed={onPopupDismissedFn}
             selectedShell={this.state.selectedShell}
             selectedTheme={this.state.selectedTheme}
-            customTheme={this.state.customTheme}
+            selectedTabSize={this.state.selectedTabSize}
+            useCustomEditor={this.state.useCustomEditor}
+            customEditor={this.state.customEditor}
+            useCustomShell={this.state.useCustomShell}
+            customShell={this.state.customShell}
             repositoryIndicatorsEnabled={this.state.repositoryIndicatorsEnabled}
+            onEditGlobalGitConfig={this.editGlobalGitConfig}
+            underlineLinks={this.state.underlineLinks}
+            showDiffCheckMarks={this.state.showDiffCheckMarks}
           />
         )
       case PopupType.RepositorySettings: {
@@ -1507,6 +1611,8 @@ export class App extends React.Component<IAppProps, IAppState> {
             signInState={this.state.signInState}
             dispatcher={this.props.dispatcher}
             onDismissed={onPopupDismissedFn}
+            isCredentialHelperSignIn={popup.isCredentialHelperSignIn}
+            credentialHelperUrl={popup.credentialHelperUrl}
           />
         )
       case PopupType.AddRepository:
@@ -1525,6 +1631,7 @@ export class App extends React.Component<IAppProps, IAppState> {
             onDismissed={onPopupDismissedFn}
             dispatcher={this.props.dispatcher}
             initialPath={popup.path}
+            isTopMost={isTopMost}
           />
         )
       case PopupType.CloneRepository:
@@ -1540,6 +1647,7 @@ export class App extends React.Component<IAppProps, IAppState> {
             onTabSelected={this.onCloneRepositoriesTabSelected}
             apiRepositories={this.state.apiRepositories}
             onRefreshRepositories={this.onRefreshRepositories}
+            isTopMost={isTopMost}
           />
         )
       case PopupType.CreateBranch: {
@@ -1557,10 +1665,7 @@ export class App extends React.Component<IAppProps, IAppState> {
 
         if (isRepositoryWithGitHubRepository(repository)) {
           upstreamGhRepo = getNonForkGitHubRepository(repository)
-          upstreamDefaultBranch = findDefaultUpstreamBranch(
-            repository,
-            branchesState.allBranches
-          )
+          upstreamDefaultBranch = branchesState.upstreamDefaultBranch
         }
 
         return (
@@ -1573,6 +1678,8 @@ export class App extends React.Component<IAppProps, IAppState> {
             repository={repository}
             targetCommit={popup.targetCommit}
             upstreamGitHubRepository={upstreamGhRepo}
+            accounts={this.state.accounts}
+            cachedRepoRulesets={this.state.cachedRepoRulesets}
             onBranchCreatedFromCommit={this.onBranchCreatedFromCommit}
             onDismissed={onPopupDismissedFn}
             dispatcher={this.props.dispatcher}
@@ -1599,7 +1706,7 @@ export class App extends React.Component<IAppProps, IAppState> {
             applicationName={getName()}
             applicationVersion={version}
             applicationArchitecture={process.arch}
-            onCheckForUpdates={this.onCheckForUpdates}
+            onCheckForNonStaggeredUpdates={this.onCheckForNonStaggeredUpdates}
             onShowAcknowledgements={this.showAcknowledgements}
             onShowTermsAndConditions={this.showTermsAndConditions}
           />
@@ -1665,13 +1772,19 @@ export class App extends React.Component<IAppProps, IAppState> {
           <CLIInstalled key="cli-installed" onDismissed={onPopupDismissedFn} />
         )
       case PopupType.GenericGitAuthentication:
+        const onDismiss = () => {
+          popup.onDismiss?.()
+          onPopupDismissedFn()
+        }
+
         return (
           <GenericGitAuthentication
             key="generic-git-authentication"
-            hostname={popup.hostname}
-            onDismiss={onPopupDismissedFn}
-            onSave={this.onSaveCredentials}
-            retryAction={popup.retryAction}
+            remoteUrl={popup.remoteUrl}
+            username={popup.username}
+            // eslint-disable-next-line react/jsx-no-bind
+            onDismiss={onDismiss}
+            onSave={popup.onSubmit}
           />
         )
       case PopupType.ExternalEditorFailed:
@@ -1683,7 +1796,7 @@ export class App extends React.Component<IAppProps, IAppState> {
             key="editor-error"
             message={popup.message}
             onDismissed={onPopupDismissedFn}
-            showPreferencesDialog={this.onShowAdvancedPreferences}
+            showPreferencesDialog={this.onShowIntegrationsPreferences}
             viewPreferences={openPreferences}
             suggestDefaultEditor={suggestDefaultEditor}
           />
@@ -1694,7 +1807,7 @@ export class App extends React.Component<IAppProps, IAppState> {
             key="shell-error"
             message={popup.message}
             onDismissed={onPopupDismissedFn}
-            showPreferencesDialog={this.onShowAdvancedPreferences}
+            showPreferencesDialog={this.onShowIntegrationsPreferences}
           />
         )
       case PopupType.InitializeLFS:
@@ -1712,6 +1825,7 @@ export class App extends React.Component<IAppProps, IAppState> {
             key="lsf-attribute-mismatch"
             onDismissed={onPopupDismissedFn}
             onUpdateExistingFilters={this.updateExistingLFSFilters}
+            onEditGlobalGitConfig={this.editGlobalGitConfig}
           />
         )
       case PopupType.UpstreamAlreadyExists:
@@ -1732,6 +1846,7 @@ export class App extends React.Component<IAppProps, IAppState> {
             emoji={this.state.emoji}
             newReleases={popup.newReleases}
             onDismissed={onPopupDismissedFn}
+            underlineLinks={this.state.underlineLinks}
           />
         )
       case PopupType.DeletePullRequest:
@@ -1834,12 +1949,31 @@ export class App extends React.Component<IAppProps, IAppState> {
           <ConfirmDiscardStashDialog
             key="confirm-discard-stash-dialog"
             dispatcher={this.props.dispatcher}
+            askForConfirmationOnDiscardStash={
+              this.state.askForConfirmationOnDiscardStash
+            }
             repository={repository}
             stash={stash}
             onDismissed={onPopupDismissedFn}
           />
         )
       }
+      case PopupType.ConfirmCheckoutCommit: {
+        const { repository, commit } = popup
+
+        return (
+          <ConfirmCheckoutCommitDialog
+            key="confirm-checkout-commit-dialog"
+            dispatcher={this.props.dispatcher}
+            askForConfirmationOnCheckoutCommit={
+              this.state.askForConfirmationOnDiscardStash
+            }
+            repository={repository}
+            commit={commit}
+            onDismissed={onPopupDismissedFn}
+          />
+        )
+      }
       case PopupType.CreateTutorialRepository: {
         return (
           <CreateTutorialRepositoryDialog
@@ -2004,6 +2138,7 @@ export class App extends React.Component<IAppProps, IAppState> {
             commitAuthor={repositoryState.commitAuthor}
             commitMessage={popup.commitMessage}
             commitSpellcheckEnabled={this.state.commitSpellcheckEnabled}
+            showCommitLengthWarning={this.state.showCommitLengthWarning}
             dialogButtonText={popup.dialogButtonText}
             dialogTitle={popup.dialogTitle}
             dispatcher={this.props.dispatcher}
@@ -2012,11 +2147,14 @@ export class App extends React.Component<IAppProps, IAppState> {
             showBranchProtected={
               repositoryState.changesState.currentBranchProtected
             }
+            repoRulesInfo={repositoryState.changesState.currentRepoRulesInfo}
+            aheadBehind={repositoryState.aheadBehind}
             showCoAuthoredBy={popup.showCoAuthoredBy}
             showNoWriteAccess={!hasWritePermissionForRepository}
             onDismissed={onPopupDismissedFn}
             onSubmitCommitMessage={popup.onSubmitCommitMessage}
             repositoryAccount={repositoryAccount}
+            accounts={this.state.accounts}
           />
         )
       case PopupType.MultiCommitOperation: {
@@ -2050,6 +2188,8 @@ export class App extends React.Component<IAppProps, IAppState> {
             askForConfirmationOnForcePush={
               this.state.askForConfirmationOnForcePush
             }
+            accounts={this.state.accounts}
+            cachedRepoRulesets={this.state.cachedRepoRulesets}
             openFileInExternalEditor={this.openFileInExternalEditor}
             resolvedExternalEditor={this.state.resolvedExternalEditor}
             openRepositoryInShell={this.openCurrentRepositoryInShell}
@@ -2065,6 +2205,7 @@ export class App extends React.Component<IAppProps, IAppState> {
             repository={repository}
             commit={commit}
             isWorkingDirectoryClean={isWorkingDirectoryClean}
+            confirmUndoCommit={this.state.askForConfirmationOnUndoCommit}
             onDismissed={onPopupDismissedFn}
           />
         )
@@ -2132,8 +2273,6 @@ export class App extends React.Component<IAppProps, IAppState> {
             shouldChangeRepository={popup.shouldChangeRepository}
             repository={popup.repository}
             pullRequest={popup.pullRequest}
-            commitMessage={popup.commitMessage}
-            commitSha={popup.commitSha}
             checks={popup.checks}
             accounts={this.state.accounts}
             onSubmit={onPopupDismissedFn}
@@ -2186,18 +2325,176 @@ export class App extends React.Component<IAppProps, IAppState> {
       case PopupType.PullRequestReview: {
         return (
           <PullRequestReview
-            key="pull-request-checks-failed"
+            key="pull-request-review"
             dispatcher={this.props.dispatcher}
             shouldCheckoutBranch={popup.shouldCheckoutBranch}
             shouldChangeRepository={popup.shouldChangeRepository}
             repository={popup.repository}
             pullRequest={popup.pullRequest}
             review={popup.review}
-            numberOfComments={popup.numberOfComments}
             emoji={this.state.emoji}
+            onSubmit={onPopupDismissedFn}
+            onDismissed={onPopupDismissedFn}
+            underlineLinks={this.state.underlineLinks}
+            accounts={this.state.accounts}
+          />
+        )
+      }
+      case PopupType.UnreachableCommits: {
+        const { selectedState, emoji } = this.state
+        if (
+          selectedState == null ||
+          selectedState.type !== SelectionType.Repository
+        ) {
+          return null
+        }
+
+        const {
+          commitLookup,
+          commitSelection: { shas, shasInDiff },
+        } = selectedState.state
+
+        return (
+          <UnreachableCommitsDialog
+            selectedShas={shas}
+            shasInDiff={shasInDiff}
+            commitLookup={commitLookup}
+            selectedTab={popup.selectedTab}
+            emoji={emoji}
+            onDismissed={onPopupDismissedFn}
             accounts={this.state.accounts}
+          />
+        )
+      }
+      case PopupType.StartPullRequest: {
+        // Intentionally chose to get the current pull request state  on
+        // rerender because state variables such as file selection change
+        // via the dispatcher.
+        const pullRequestState = this.getPullRequestState()
+        if (pullRequestState === null) {
+          // This shouldn't happen..
+          sendNonFatalException(
+            'FailedToStartPullRequest',
+            new Error(
+              'Failed to start pull request because pull request state was null'
+            )
+          )
+          return null
+        }
+
+        const { pullRequestFilesListWidth, hideWhitespaceInPullRequestDiff } =
+          this.state
+
+        const {
+          prBaseBranches,
+          currentBranch,
+          defaultBranch,
+          imageDiffType,
+          externalEditorLabel,
+          nonLocalCommitSHA,
+          prRecentBaseBranches,
+          repository,
+          showSideBySideDiff,
+          currentBranchHasPullRequest,
+        } = popup
+
+        return (
+          <OpenPullRequestDialog
+            key="open-pull-request"
+            prBaseBranches={prBaseBranches}
+            currentBranch={currentBranch}
+            defaultBranch={defaultBranch}
+            dispatcher={this.props.dispatcher}
+            fileListWidth={pullRequestFilesListWidth}
+            hideWhitespaceInDiff={hideWhitespaceInPullRequestDiff}
+            imageDiffType={imageDiffType}
+            nonLocalCommitSHA={nonLocalCommitSHA}
+            pullRequestState={pullRequestState}
+            prRecentBaseBranches={prRecentBaseBranches}
+            repository={repository}
+            externalEditorLabel={externalEditorLabel}
+            showSideBySideDiff={showSideBySideDiff}
+            currentBranchHasPullRequest={currentBranchHasPullRequest}
+            onDismissed={onPopupDismissedFn}
+            onOpenInExternalEditor={this.onOpenInExternalEditor}
+          />
+        )
+      }
+      case PopupType.Error: {
+        return (
+          <AppError
+            error={popup.error}
+            onDismissed={onPopupDismissedFn}
+            onShowPopup={this.showPopup}
+            onRetryAction={this.onRetryAction}
+          />
+        )
+      }
+      case PopupType.InstallingUpdate: {
+        return (
+          <InstallingUpdate
+            key="installing-update"
+            dispatcher={this.props.dispatcher}
+            onDismissed={onPopupDismissedFn}
+          />
+        )
+      }
+      case PopupType.TestNotifications: {
+        return (
+          <TestNotifications
+            key="test-notifications"
+            dispatcher={this.props.dispatcher}
+            notificationsDebugStore={this.props.notificationsDebugStore}
+            repository={popup.repository}
+            onDismissed={onPopupDismissedFn}
+          />
+        )
+      }
+      case PopupType.PullRequestComment: {
+        return (
+          <PullRequestComment
+            key="pull-request-comment"
+            dispatcher={this.props.dispatcher}
+            shouldCheckoutBranch={popup.shouldCheckoutBranch}
+            shouldChangeRepository={popup.shouldChangeRepository}
+            repository={popup.repository}
+            pullRequest={popup.pullRequest}
+            comment={popup.comment}
+            emoji={this.state.emoji}
             onSubmit={onPopupDismissedFn}
             onDismissed={onPopupDismissedFn}
+            underlineLinks={this.state.underlineLinks}
+            accounts={this.state.accounts}
+          />
+        )
+      }
+      case PopupType.UnknownAuthors: {
+        return (
+          <UnknownAuthors
+            key="unknown-authors"
+            authors={popup.authors}
+            onCommit={popup.onCommit}
+            onDismissed={onPopupDismissedFn}
+          />
+        )
+      }
+      case PopupType.TestIcons: {
+        return (
+          <IconPreviewDialog
+            key="octicons-preview"
+            onDismissed={onPopupDismissedFn}
+          />
+        )
+      }
+      case PopupType.ConfirmCommitFilteredChanges: {
+        return (
+          <ConfirmCommitFilteredChanges
+            onCommitAnyway={popup.onCommitAnyway}
+            onDismissed={onPopupDismissedFn}
+            onClearFilter={popup.onClearFilter}
+            setConfirmCommitFilteredChanges={
+              this.setConfirmCommitFilteredChanges
+            }
           />
         )
       }
@@ -2206,6 +2503,22 @@ export class App extends React.Component<IAppProps, IAppState> {
     }
   }
 
+  private setConfirmCommitFilteredChanges = (value: boolean) => {
+    this.props.dispatcher.setConfirmCommitFilteredChanges(value)
+  }
+
+  private getPullRequestState() {
+    const { selectedState } = this.state
+    if (
+      selectedState == null ||
+      selectedState.type !== SelectionType.Repository
+    ) {
+      return null
+    }
+
+    return selectedState.state.pullRequestState
+  }
+
   private getWarnForcePushDialogOnBegin(
     onBegin: () => void,
     onPopupDismissedFn: () => void
@@ -2242,6 +2555,9 @@ export class App extends React.Component<IAppProps, IAppState> {
     this.props.dispatcher.installGlobalLFSFilters(true)
   }
 
+  private editGlobalGitConfig = () =>
+    this.props.dispatcher.editGlobalGitConfig()
+
   private initializeLFS = (repositories: ReadonlyArray<Repository>) => {
     this.props.dispatcher.installLFSHooks(repositories)
   }
@@ -2254,10 +2570,10 @@ export class App extends React.Component<IAppProps, IAppState> {
     this.props.dispatcher.refreshApiRepositories(account)
   }
 
-  private onShowAdvancedPreferences = () => {
+  private onShowIntegrationsPreferences = () => {
     this.props.dispatcher.showPopup({
       type: PopupType.Preferences,
-      initialSelectedTab: PreferencesTab.Advanced,
+      initialSelectedTab: PreferencesTab.Integrations,
     })
   }
 
@@ -2272,22 +2588,8 @@ export class App extends React.Component<IAppProps, IAppState> {
     this.props.dispatcher.openShell(path, true)
   }
 
-  private onSaveCredentials = async (
-    hostname: string,
-    username: string,
-    password: string,
-    retryAction: RetryAction
-  ) => {
-    await this.props.dispatcher.saveGenericGitCredentials(
-      hostname,
-      username,
-      password
-    )
-
-    this.props.dispatcher.performRetry(retryAction)
-  }
-
-  private onCheckForUpdates = () => this.checkForUpdates(false)
+  private onCheckForNonStaggeredUpdates = () =>
+    this.checkForUpdates(false, true)
 
   private showAcknowledgements = () => {
     this.props.dispatcher.showPopup({ type: PopupType.Acknowledgements })
@@ -2297,8 +2599,8 @@ export class App extends React.Component<IAppProps, IAppState> {
     this.props.dispatcher.showPopup({ type: PopupType.TermsAndConditions })
   }
 
-  private renderPopup() {
-    const popupContent = this.currentPopupContent()
+  private renderPopups() {
+    const popupContent = this.allPopupContent()
 
     return (
       <TransitionGroup>
@@ -2334,6 +2636,7 @@ export class App extends React.Component<IAppProps, IAppState> {
             commit={commit}
             selectedCommits={selectedCommits}
             emoji={emoji}
+            accounts={this.state.accounts}
           />
         )
       default:
@@ -2352,8 +2655,6 @@ export class App extends React.Component<IAppProps, IAppState> {
     return <FullScreenInfo windowState={this.state.windowState} />
   }
 
-  private clearError = (error: Error) => this.props.dispatcher.clearError(error)
-
   private onConfirmDiscardChangesChanged = (value: boolean) => {
     this.props.dispatcher.setConfirmDiscardChangesSetting(value)
   }
@@ -2362,17 +2663,6 @@ export class App extends React.Component<IAppProps, IAppState> {
     this.props.dispatcher.setConfirmDiscardChangesPermanentlySetting(value)
   }
 
-  private renderAppError() {
-    return (
-      <AppError
-        errors={this.state.errors}
-        onClearError={this.clearError}
-        onShowPopup={this.showPopup}
-        onRetryAction={this.onRetryAction}
-      />
-    )
-  }
-
   private onRetryAction = (retryAction: RetryAction) => {
     this.props.dispatcher.performRetry(retryAction)
   }
@@ -2381,15 +2671,15 @@ export class App extends React.Component<IAppProps, IAppState> {
     this.props.dispatcher.showPopup(popup)
   }
 
+  private setBanner = (banner: Banner) =>
+    this.props.dispatcher.setBanner(banner)
+
   private getDesktopAppContentsClassNames = (): string => {
     const { currentDragElement } = this.state
     const isCommitBeingDragged =
       currentDragElement !== null && currentDragElement.type === DragType.Commit
     return classNames({
       'commit-being-dragged': isCommitBeingDragged,
-      // 'squashing-enabled' is due to feature flagging. If feature flag is
-      // removed, we can just delete this line with adjustment to the css file
-      'squashing-enabled': isCommitBeingDragged && enableSquashing(),
     })
   }
 
@@ -2402,8 +2692,7 @@ export class App extends React.Component<IAppProps, IAppState> {
         {this.renderToolbar()}
         {this.renderBanner()}
         {this.renderRepository()}
-        {this.renderPopup()}
-        {this.renderAppError()}
+        {this.renderPopups()}
         {this.renderDragElement()}
       </div>
     )
@@ -2416,7 +2705,7 @@ export class App extends React.Component<IAppProps, IAppState> {
     const externalEditorLabel = this.state.selectedExternalEditor
       ? this.state.selectedExternalEditor
       : undefined
-    const shellLabel = this.state.selectedShell
+    const { useCustomShell, selectedShell } = this.state
     const filterText = this.state.repositoryFilterText
     return (
       <RepositoriesList
@@ -2436,7 +2725,7 @@ export class App extends React.Component<IAppProps, IAppState> {
         onShowRepository={this.showRepository}
         onOpenInExternalEditor={this.openInExternalEditor}
         externalEditorLabel={externalEditorLabel}
-        shellLabel={shellLabel}
+        shellLabel={useCustomShell ? undefined : selectedShell}
         dispatcher={this.props.dispatcher}
       />
     )
@@ -2478,6 +2767,16 @@ export class App extends React.Component<IAppProps, IAppState> {
     this.props.dispatcher.openInExternalEditor(repository.path)
   }
 
+  private onOpenInExternalEditor = (path: string) => {
+    const repository = this.state.selectedState?.repository
+    if (repository === undefined) {
+      return
+    }
+
+    const fullPath = Path.join(repository.path, path)
+    this.props.dispatcher.openInExternalEditor(fullPath)
+  }
+
   private showRepository = (repository: Repository | CloningRepository) => {
     if (!(repository instanceof Repository)) {
       return
@@ -2515,17 +2814,17 @@ export class App extends React.Component<IAppProps, IAppState> {
 
     const repository = selection ? selection.repository : null
 
-    let icon: OcticonSymbolType
+    let icon: OcticonSymbol
     let title: string
     if (repository) {
       const alias = repository instanceof Repository ? repository.alias : null
       icon = iconForRepository(repository)
       title = alias ?? repository.name
     } else if (this.state.repositories.length > 0) {
-      icon = OcticonSymbol.repo
+      icon = octicons.repo
       title = __DARWIN__ ? 'Select a Repository' : 'Select a repository'
     } else {
-      icon = OcticonSymbol.repo
+      icon = octicons.repo
       title = __DARWIN__ ? 'No Repositories' : 'No repositories'
     }
 
@@ -2548,6 +2847,11 @@ export class App extends React.Component<IAppProps, IAppState> {
       top: 0,
     }
 
+    /** The dropdown focus trap will stop focus event propagation we made need
+     * in some of our dialogs (noticed with Lists). Disabled this when dialogs
+     * are open */
+    const enableFocusTrap = this.state.currentPopup === null
+
     return (
       <ToolbarDropdown
         icon={icon}
@@ -2555,13 +2859,54 @@ export class App extends React.Component<IAppProps, IAppState> {
         description={__DARWIN__ ? 'Current Repository' : 'Current repository'}
         tooltip={tooltip}
         foldoutStyle={foldoutStyle}
+        onContextMenu={this.onRepositoryToolbarButtonContextMenu}
         onDropdownStateChanged={this.onRepositoryDropdownStateChanged}
         dropdownContentRenderer={this.renderRepositoryList}
         dropdownState={currentState}
+        enableFocusTrap={enableFocusTrap}
       />
     )
   }
 
+  private onRepositoryToolbarButtonContextMenu = () => {
+    const repository = this.state.selectedState?.repository
+    if (repository === undefined) {
+      return
+    }
+
+    const externalEditorLabel = this.state.selectedExternalEditor ?? undefined
+
+    const onChangeRepositoryAlias = (repository: Repository) => {
+      this.props.dispatcher.showPopup({
+        type: PopupType.ChangeRepositoryAlias,
+        repository,
+      })
+    }
+
+    const onRemoveRepositoryAlias = (repository: Repository) => {
+      this.props.dispatcher.changeRepositoryAlias(repository, null)
+    }
+
+    const items = generateRepositoryListContextMenu({
+      onRemoveRepository: this.removeRepository,
+      onShowRepository: this.showRepository,
+      onOpenInShell: this.openInShell,
+      onOpenInExternalEditor: this.openInExternalEditor,
+      askForConfirmationOnRemoveRepository:
+        this.state.askForConfirmationOnRepositoryRemoval,
+      externalEditorLabel: externalEditorLabel,
+      onChangeRepositoryAlias: onChangeRepositoryAlias,
+      onRemoveRepositoryAlias: onRemoveRepositoryAlias,
+      onViewOnGitHub: this.viewOnGitHub,
+      repository: repository,
+      shellLabel: this.state.useCustomShell
+        ? undefined
+        : this.state.selectedShell,
+    })
+
+    showContextualMenu(items)
+  }
+
   private renderPushPullToolbarButton() {
     const selection = this.state.selectedState
     if (!selection || selection.type !== SelectionType.Repository) {
@@ -2571,7 +2916,13 @@ export class App extends React.Component<IAppProps, IAppState> {
     const state = selection.state
     const revertProgress = state.revertProgress
     if (revertProgress) {
-      return <RevertProgress progress={revertProgress} />
+      return (
+        <RevertProgress
+          progress={revertProgress}
+          width={this.state.pushPullButtonWidth}
+          dispatcher={this.props.dispatcher}
+        />
+      )
     }
 
     let remoteName = state.remote ? state.remote.name : null
@@ -2587,9 +2938,26 @@ export class App extends React.Component<IAppProps, IAppState> {
 
     if (tip.kind === TipState.Valid && tip.branch.upstreamRemoteName !== null) {
       remoteName = tip.branch.upstreamRemoteName
+
+      if (tip.branch.upstreamWithoutRemote !== tip.branch.name) {
+        remoteName = tip.branch.upstream
+      }
     }
 
-    const isForcePush = isCurrentBranchForcePush(branchesState, aheadBehind)
+    const currentFoldout = this.state.currentFoldout
+
+    const isDropdownOpen =
+      currentFoldout !== null && currentFoldout.type === FoldoutType.PushPull
+
+    const forcePushBranchState = getCurrentBranchForcePushState(
+      branchesState,
+      aheadBehind
+    )
+
+    /** The dropdown focus trap will stop focus event propagation we made need
+     * in some of our dialogs (noticed with Lists). Disabled this when dialogs
+     * are open */
+    const enableFocusTrap = this.state.currentPopup === null
 
     return (
       <PushPullButton
@@ -2604,10 +2972,15 @@ export class App extends React.Component<IAppProps, IAppState> {
         tipState={tip.kind}
         pullWithRebase={pullWithRebase}
         rebaseInProgress={rebaseInProgress}
-        isForcePush={isForcePush}
+        forcePushBranchState={forcePushBranchState}
         shouldNudge={
           this.state.currentOnboardingTutorialStep === TutorialStep.PushBranch
         }
+        isDropdownOpen={isDropdownOpen}
+        askForConfirmationOnForcePush={this.state.askForConfirmationOnForcePush}
+        onDropdownStateChanged={this.onPushPullDropdownStateChanged}
+        enableFocusTrap={enableFocusTrap}
+        pushPullButtonWidth={this.state.pushPullButtonWidth}
       />
     )
   }
@@ -2648,12 +3021,22 @@ export class App extends React.Component<IAppProps, IAppState> {
 
     if (currentPullRequest == null) {
       dispatcher.createPullRequest(state.repository)
-      dispatcher.recordCreatePullRequest()
+      dispatcher.incrementMetric('createPullRequestCount')
     } else {
       dispatcher.showPullRequest(state.repository)
     }
   }
 
+  private startPullRequest = () => {
+    const state = this.state.selectedState
+
+    if (state == null || state.type !== SelectionType.Repository) {
+      return
+    }
+
+    this.props.dispatcher.startPullRequest(state.repository)
+  }
+
   private openCreatePullRequestInBrowser = (
     repository: Repository,
     branch: Branch
@@ -2661,6 +3044,14 @@ export class App extends React.Component<IAppProps, IAppState> {
     this.props.dispatcher.openCreatePullRequestInBrowser(repository, branch)
   }
 
+  private onPushPullDropdownStateChanged = (newState: DropdownState) => {
+    if (newState === 'open') {
+      this.props.dispatcher.showFoldout({ type: FoldoutType.PushPull })
+    } else {
+      this.props.dispatcher.closeFoldout(FoldoutType.PushPull)
+    }
+  }
+
   private onBranchDropdownStateChanged = (newState: DropdownState) => {
     if (newState === 'open') {
       this.props.dispatcher.showFoldout({ type: FoldoutType.Branch })
@@ -2684,10 +3075,16 @@ export class App extends React.Component<IAppProps, IAppState> {
     const repository = selection.repository
     const { branchesState } = selection.state
 
+    /** The dropdown focus trap will stop focus event propagation we made need
+     * in some of our dialogs (noticed with Lists). Disabled this when dialogs
+     * are open */
+    const enableFocusTrap = this.state.currentPopup === null
+
     return (
       <BranchDropdown
         dispatcher={this.props.dispatcher}
         isOpen={isOpen}
+        branchDropdownWidth={this.state.branchDropdownWidth}
         onDropDownStateChanged={this.onBranchDropdownStateChanged}
         repository={repository}
         repositoryState={selection.state}
@@ -2700,6 +3097,8 @@ export class App extends React.Component<IAppProps, IAppState> {
         }
         showCIStatusPopover={this.state.showCIStatusPopover}
         emoji={this.state.emoji}
+        enableFocusTrap={enableFocusTrap}
+        underlineLinks={this.state.underlineLinks}
       />
     )
   }
@@ -2728,13 +3127,18 @@ export class App extends React.Component<IAppProps, IAppState> {
       banner = this.renderUpdateBanner()
     }
     return (
-      <TransitionGroup>
-        {banner && (
-          <CSSTransition classNames="banner" timeout={bannerTransitionTimeout}>
-            {banner}
-          </CSSTransition>
-        )}
-      </TransitionGroup>
+      <div role="alert" aria-atomic="false">
+        <TransitionGroup>
+          {banner && (
+            <CSSTransition
+              classNames="banner"
+              timeout={bannerTransitionTimeout}
+            >
+              {banner}
+            </CSSTransition>
+          )}
+        </TransitionGroup>
+      </div>
     )
   }
 
@@ -2743,6 +3147,11 @@ export class App extends React.Component<IAppProps, IAppState> {
       <UpdateAvailable
         dispatcher={this.props.dispatcher}
         newReleases={updateStore.state.newReleases}
+        isX64ToARM64ImmediateAutoUpdate={
+          updateStore.state.isX64ToARM64ImmediateAutoUpdate
+        }
+        prioritizeUpdate={updateStore.state.prioritizeUpdate}
+        prioritizeUpdateInfoUrl={updateStore.state.prioritizeUpdateInfoUrl}
         onDismissed={this.onUpdateAvailableDismissed}
         isUpdateShowcaseVisible={this.state.isUpdateShowcaseVisible}
         emoji={this.state.emoji}
@@ -2801,9 +3210,9 @@ export class App extends React.Component<IAppProps, IAppState> {
     }
 
     if (selectedState.type === SelectionType.Repository) {
-      const externalEditorLabel = state.selectedExternalEditor
-        ? state.selectedExternalEditor
-        : undefined
+      const externalEditorLabel = state.useCustomEditor
+        ? undefined
+        : state.selectedExternalEditor ?? undefined
 
       return (
         <RepositoryView
@@ -2824,15 +3233,28 @@ export class App extends React.Component<IAppProps, IAppState> {
           imageDiffType={state.imageDiffType}
           hideWhitespaceInChangesDiff={state.hideWhitespaceInChangesDiff}
           hideWhitespaceInHistoryDiff={state.hideWhitespaceInHistoryDiff}
+          showDiffCheckMarks={state.showDiffCheckMarks}
           showSideBySideDiff={state.showSideBySideDiff}
           focusCommitMessage={state.focusCommitMessage}
           askForConfirmationOnDiscardChanges={
             state.askForConfirmationOnDiscardChanges
           }
+          askForConfirmationOnDiscardStash={
+            state.askForConfirmationOnDiscardStash
+          }
+          askForConfirmationOnCheckoutCommit={
+            state.askForConfirmationOnCheckoutCommit
+          }
+          askForConfirmationOnCommitFilteredChanges={
+            state.askForConfirmationOnCommitFilteredChanges
+          }
           accounts={state.accounts}
+          isExternalEditorAvailable={
+            state.useCustomEditor || state.selectedExternalEditor !== null
+          }
           externalEditorLabel={externalEditorLabel}
           resolvedExternalEditor={state.resolvedExternalEditor}
-          onOpenInExternalEditor={this.openFileInExternalEditor}
+          onOpenInExternalEditor={this.onOpenInExternalEditor}
           appMenu={state.appMenuState[0]}
           currentTutorialStep={state.currentOnboardingTutorialStep}
           onExitTutorial={this.onExitTutorial}
@@ -2840,7 +3262,9 @@ export class App extends React.Component<IAppProps, IAppState> {
           isShowingFoldout={this.state.currentFoldout !== null}
           aheadBehindStore={this.props.aheadBehindStore}
           commitSpellcheckEnabled={this.state.commitSpellcheckEnabled}
+          showCommitLengthWarning={this.state.showCommitLengthWarning}
           onCherryPick={this.startCherryPickWithoutBranch}
+          pullRequestSuggestedNextAction={state.pullRequestSuggestedNextAction}
         />
       )
     } else if (selectedState.type === SelectionType.CloningRepository) {
@@ -2866,7 +3290,6 @@ export class App extends React.Component<IAppProps, IAppState> {
     return (
       <Welcome
         dispatcher={this.props.dispatcher}
-        optOut={this.state.optOutOfUsageTracking}
         accounts={this.state.accounts}
         signInState={this.state.signInState}
       />
@@ -2878,21 +3301,26 @@ export class App extends React.Component<IAppProps, IAppState> {
       return null
     }
 
-    const className = this.state.appIsFocused ? 'focused' : 'blurred'
+    const className = classNames(
+      this.state.appIsFocused ? 'focused' : 'blurred',
+      {
+        'underline-links': this.state.underlineLinks,
+      }
+    )
 
     const currentTheme = this.state.showWelcomeFlow
       ? ApplicationTheme.Light
       : this.state.currentTheme
 
+    const currentTabSize = this.state.selectedTabSize
+
     return (
-      <div id="desktop-app-chrome" className={className}>
-        <AppTheme
-          theme={currentTheme}
-          customTheme={this.state.customTheme}
-          useCustomTheme={
-            this.state.selectedTheme === ApplicationTheme.HighContrast
-          }
-        />
+      <div
+        id="desktop-app-chrome"
+        className={className}
+        style={{ tabSize: currentTabSize }}
+      >
+        <AppTheme theme={currentTheme} />
         {this.renderTitlebar()}
         {this.state.showWelcomeFlow
           ? this.renderWelcomeFlow()
@@ -2923,22 +3351,17 @@ export class App extends React.Component<IAppProps, IAppState> {
       return
     }
 
-    const baseURL = repository.gitHubRepository.htmlURL
+    const commitURL = createCommitURL(
+      repository.gitHubRepository,
+      SHA,
+      filePath
+    )
 
-    let fileSuffix = ''
-    if (filePath != null) {
-      const fileHash = crypto
-        .createHash('sha256')
-        .update(filePath)
-        .digest('hex')
-      fileSuffix = '#diff-' + fileHash
+    if (commitURL === null) {
+      return
     }
 
-    if (baseURL) {
-      this.props.dispatcher.openInBrowser(
-        `${baseURL}/commit/${SHA}${fileSuffix}`
-      )
-    }
+    this.props.dispatcher.openInBrowser(commitURL)
   }
 
   private onBranchDeleted = (repository: Repository) => {
@@ -3002,7 +3425,7 @@ export class App extends React.Component<IAppProps, IAppState> {
     const initialStep = getMultiCommitOperationChooseBranchStep(repositoryState)
 
     this.props.dispatcher.setMultiCommitOperationStep(repository, initialStep)
-    this.props.dispatcher.recordCherryPickViaContextMenu()
+    this.props.dispatcher.incrementMetric('cherryPickViaContextMenuCount')
 
     this.showPopup({
       type: PopupType.MultiCommitOperation,
@@ -3070,7 +3493,7 @@ export class App extends React.Component<IAppProps, IAppState> {
         )
       },
     }
-    this.props.dispatcher.setBanner(banner)
+    this.setBanner(banner)
   }
 
   private openThankYouCard = (
@@ -3096,7 +3519,7 @@ export class App extends React.Component<IAppProps, IAppState> {
   private onDragEnd = (dropTargetSelector: DropTargetSelector | undefined) => {
     this.props.dispatcher.closeFoldout(FoldoutType.Branch)
     if (dropTargetSelector === undefined) {
-      this.props.dispatcher.recordDragStartedAndCanceled()
+      this.props.dispatcher.incrementMetric('dragStartedAndCanceledCount')
     }
   }
 }
diff --git a/app/src/ui/autocompletion/autocompleting-text-input.tsx b/app/src/ui/autocompletion/autocompleting-text-input.tsx
index 21484f2d999..3586ccc2f13 100644
--- a/app/src/ui/autocompletion/autocompleting-text-input.tsx
+++ b/app/src/ui/autocompletion/autocompleting-text-input.tsx
@@ -8,37 +8,63 @@ import {
 import { IAutocompletionProvider } from './index'
 import { fatalError } from '../../lib/fatal-error'
 import classNames from 'classnames'
+import getCaretCoordinates from 'textarea-caret'
+import { showContextualMenu } from '../../lib/menu-item'
+import { AriaLiveContainer } from '../accessibility/aria-live-container'
+import { createUniqueId, releaseUniqueId } from '../lib/id-pool'
+import {
+  Popover,
+  PopoverAnchorPosition,
+  PopoverDecoration,
+} from '../lib/popover'
 
 interface IRange {
   readonly start: number
   readonly length: number
 }
 
-import getCaretCoordinates from 'textarea-caret'
-import { showContextualMenu } from '../../lib/menu-item'
+interface IAutocompletingTextInputProps<ElementType, AutocompleteItemType> {
+  /** An optional specified id for the input */
+  readonly inputId?: string
 
-interface IAutocompletingTextInputProps<ElementType> {
   /**
    * An optional className to be applied to the rendered
    * top level element of the component.
    */
   readonly className?: string
 
+  /** Element ID for the input field. */
+  readonly elementId?: string
+
+  /** Content of an optional invisible label element for screen readers. */
+  readonly screenReaderLabel?: string
+
+  /**
+   * The label of the text box.
+   */
+  readonly label?: string | JSX.Element
+
   /** The placeholder for the input field. */
   readonly placeholder?: string
 
   /** The current value of the input field. */
   readonly value?: string
 
-  /** Disabled state for input field. */
-  readonly disabled?: boolean
+  /** Whether or not the input should be read-only and styled as disabled */
+  readonly readOnly?: boolean
 
   /** Indicates if input field should be required */
-  readonly isRequired?: boolean
+  readonly required?: boolean
 
   /** Indicates if input field applies spellcheck */
   readonly spellcheck?: boolean
 
+  /** Indicates if it should always try to autocomplete. Optional (defaults to false) */
+  readonly alwaysAutocomplete?: boolean
+
+  /** Filter for autocomplete items */
+  readonly autocompleteItemFilter?: (item: AutocompleteItemType) => boolean
+
   /**
    * Called when the user changes the value in the input field.
    */
@@ -47,6 +73,9 @@ interface IAutocompletingTextInputProps<ElementType> {
   /** Called on key down. */
   readonly onKeyDown?: (event: React.KeyboardEvent<ElementType>) => void
 
+  /** Called when an autocomplete item has been selected. */
+  readonly onAutocompleteItemSelected?: (value: AutocompleteItemType) => void
+
   /**
    * A list of autocompletion providers that should be enabled for this
    * input.
@@ -64,6 +93,9 @@ interface IAutocompletingTextInputProps<ElementType> {
    * in the input field.
    */
   readonly onContextMenu?: (event: React.MouseEvent<any>) => void
+
+  /** Called when the input field receives focus. */
+  readonly onFocus?: (event: React.FocusEvent<ElementType>) => void
 }
 
 interface IAutocompletionState<T> {
@@ -72,6 +104,8 @@ interface IAutocompletionState<T> {
   readonly range: IRange
   readonly rangeText: string
   readonly selectedItem: T | null
+  readonly selectedRowId: string | undefined
+  readonly itemListRowIdPrefix: string
 }
 
 /**
@@ -97,16 +131,36 @@ interface IAutocompletingTextInputState<T> {
    * matching autocompletion providers.
    */
   readonly autocompletionState: IAutocompletionState<T> | null
+
+  /** Coordinates of the caret in the input/textarea element */
+  readonly caretCoordinates: ReturnType<typeof getCaretCoordinates> | null
+
+  /**
+   * An automatically generated id for the text element used to reference
+   * it from the label element. This is generated once via the id pool when the
+   * component is mounted and then released once the component unmounts.
+   */
+  readonly uniqueInternalElementId?: string
+
+  /**
+   * An automatically generated id for the autocomplete container element used
+   * to reference it from the ARIA autocomplete-related attributes. This is
+   * generated once via the id pool when the component is mounted and then
+   * released once the component unmounts.
+   */
+  readonly autocompleteContainerId?: string
 }
 
 /** A text area which provides autocompletions as the user types. */
 export abstract class AutocompletingTextInput<
-  ElementType extends HTMLInputElement | HTMLTextAreaElement
+  ElementType extends HTMLInputElement | HTMLTextAreaElement,
+  AutocompleteItemType extends object
 > extends React.Component<
-  IAutocompletingTextInputProps<ElementType>,
-  IAutocompletingTextInputState<Object>
+  IAutocompletingTextInputProps<ElementType, AutocompleteItemType>,
+  IAutocompletingTextInputState<AutocompleteItemType>
 > {
   private element: ElementType | null = null
+  private invisibleCaretRef = React.createRef<HTMLDivElement>()
 
   /** The identifier for each autocompletion request. */
   private autocompletionRequestID = 0
@@ -117,10 +171,61 @@ export abstract class AutocompletingTextInput<
    */
   protected abstract getElementTagName(): 'textarea' | 'input'
 
-  public constructor(props: IAutocompletingTextInputProps<ElementType>) {
+  public constructor(
+    props: IAutocompletingTextInputProps<ElementType, AutocompleteItemType>
+  ) {
     super(props)
 
-    this.state = { autocompletionState: null }
+    this.state = {
+      autocompletionState: null,
+      caretCoordinates: null,
+    }
+  }
+
+  public componentWillMount() {
+    const elementId =
+      this.props.inputId ?? createUniqueId('autocompleting-text-input')
+    const autocompleteContainerId = createUniqueId('autocomplete-container')
+
+    this.setState({
+      uniqueInternalElementId: elementId,
+      autocompleteContainerId,
+    })
+  }
+
+  public componentWillUnmount() {
+    if (this.state.uniqueInternalElementId) {
+      releaseUniqueId(this.state.uniqueInternalElementId)
+    }
+
+    if (this.state.autocompleteContainerId) {
+      releaseUniqueId(this.state.autocompleteContainerId)
+    }
+  }
+
+  public componentDidUpdate(
+    prevProps: IAutocompletingTextInputProps<ElementType, AutocompleteItemType>
+  ) {
+    if (
+      this.props.autocompleteItemFilter !== prevProps.autocompleteItemFilter &&
+      this.state.autocompletionState !== null
+    ) {
+      this.open(this.element?.value ?? '')
+    }
+  }
+
+  private get elementId() {
+    return this.props.elementId ?? this.state.uniqueInternalElementId
+  }
+
+  private getItemAriaLabel = (row: number): string | undefined => {
+    const state = this.state.autocompletionState
+    if (!state) {
+      return undefined
+    }
+
+    const item = state.items[row]
+    return state.provider.getItemAriaLabel?.(item)
   }
 
   private renderItem = (row: number): JSX.Element | null => {
@@ -149,35 +254,9 @@ export abstract class AutocompletingTextInput<
       return null
     }
 
-    const element = this.element!
-    let coordinates = getCaretCoordinates(element, state.range.start)
-    coordinates = {
-      ...coordinates,
-      top: coordinates.top - element.scrollTop,
-      left: coordinates.left - element.scrollLeft,
-    }
-
-    const left = coordinates.left
-    const top = coordinates.top + YOffset
-    const selectedRow = state.selectedItem
-      ? items.indexOf(state.selectedItem)
-      : -1
-    const rect = element.getBoundingClientRect()
-    const popupAbsoluteTop = rect.top + coordinates.top
-
-    // The maximum height we can use for the popup without it extending beyond
-    // the Window bounds.
-    let maxHeight: number
-    if (
-      element.ownerDocument !== null &&
-      element.ownerDocument.defaultView !== null
-    ) {
-      const windowHeight = element.ownerDocument.defaultView.innerHeight
-      const spaceToBottomOfWindow = windowHeight - popupAbsoluteTop - YOffset
-      maxHeight = Math.min(DefaultPopupHeight, spaceToBottomOfWindow)
-    } else {
-      maxHeight = DefaultPopupHeight
-    }
+    const selectedRows = state.selectedItem
+      ? [items.indexOf(state.selectedItem)]
+      : []
 
     // The height needed to accommodate all the matched items without overflowing
     //
@@ -186,7 +265,7 @@ export abstract class AutocompletingTextInput<
     // without overflowing and triggering the scrollbar.
     const noOverflowItemHeight = RowHeight * items.length
 
-    const height = Math.min(noOverflowItemHeight, maxHeight)
+    const minHeight = RowHeight * Math.min(items.length, 3)
 
     // Use the completion text as invalidation props so that highlighting
     // will update as you type even though the number of items matched
@@ -198,24 +277,60 @@ export abstract class AutocompletingTextInput<
     const className = classNames('autocompletion-popup', state.provider.kind)
 
     return (
-      <div className={className} style={{ top, left, height }}>
+      <Popover
+        anchor={this.invisibleCaretRef.current}
+        anchorPosition={PopoverAnchorPosition.BottomLeft}
+        decoration={PopoverDecoration.None}
+        maxHeight={Math.min(DefaultPopupHeight, noOverflowItemHeight)}
+        minHeight={minHeight}
+        trapFocus={false}
+        className={className}
+        isDialog={false}
+      >
         <List
+          accessibleListId={this.state.autocompleteContainerId}
+          ref={this.onAutocompletionListRef}
           rowCount={items.length}
           rowHeight={RowHeight}
-          selectedRows={[selectedRow]}
+          rowId={this.getRowId}
+          selectedRows={selectedRows}
           rowRenderer={this.renderItem}
-          scrollToRow={selectedRow}
-          selectOnHover={true}
-          focusOnHover={false}
+          getRowAriaLabel={this.getItemAriaLabel}
+          scrollToRow={selectedRows.at(0)}
           onRowMouseDown={this.onRowMouseDown}
           onRowClick={this.insertCompletionOnClick}
           onSelectedRowChanged={this.onSelectedRowChanged}
           invalidationProps={searchText}
+          // Disable tab focus so that the user can't tab to the list of autocompletions
+          // Focus belongs to the input field.
+          shouldDisableTabFocus={true}
         />
-      </div>
+      </Popover>
     )
   }
 
+  private getRowId: (row: number) => string = row => {
+    const state = this.state.autocompletionState
+    if (!state) {
+      return ''
+    }
+
+    return `autocomplete-item-row-${state.itemListRowIdPrefix}-${row}`
+  }
+
+  private onAutocompletionListRef = (ref: List | null) => {
+    const { autocompletionState } = this.state
+    if (ref && autocompletionState && autocompletionState.selectedItem) {
+      const { items, selectedItem } = autocompletionState
+      this.setState({
+        autocompletionState: {
+          ...autocompletionState,
+          selectedRowId: this.getRowId(items.indexOf(selectedItem)),
+        },
+      })
+    }
+  }
+
   private onRowMouseDown = (row: number, event: React.MouseEvent<any>) => {
     const currentAutoCompletionState = this.state.autocompletionState
 
@@ -242,6 +357,7 @@ export abstract class AutocompletingTextInput<
     const newAutoCompletionState = {
       ...currentAutoCompletionState,
       selectedItem: newSelectedItem,
+      selectedRowId: newSelectedItem === null ? undefined : this.getRowId(row),
     }
 
     this.setState({ autocompletionState: newAutoCompletionState })
@@ -272,19 +388,57 @@ export abstract class AutocompletingTextInput<
     }
   }
 
+  private getActiveAutocompleteItemId(): string | undefined {
+    const { autocompletionState } = this.state
+
+    if (autocompletionState === null) {
+      return undefined
+    }
+
+    if (autocompletionState.selectedRowId) {
+      return autocompletionState.selectedRowId
+    }
+
+    if (autocompletionState.selectedItem === null) {
+      return undefined
+    }
+
+    const index = autocompletionState.items.indexOf(
+      autocompletionState.selectedItem
+    )
+
+    return this.getRowId(index)
+  }
+
   private renderTextInput() {
+    const { autocompletionState } = this.state
+
+    const autocompleteVisible =
+      autocompletionState !== null && autocompletionState.items.length > 0
+
     const props = {
       type: 'text',
+      id: this.elementId,
+      role: 'combobox',
       placeholder: this.props.placeholder,
       value: this.props.value,
       ref: this.onRef,
       onChange: this.onChange,
+      onScroll: this.onScroll,
       onKeyDown: this.onKeyDown,
+      onFocus: this.onFocus,
       onBlur: this.onBlur,
       onContextMenu: this.onContextMenu,
-      disabled: this.props.disabled,
-      'aria-required': this.props.isRequired ? true : false,
+      readOnly: this.props.readOnly,
+      required: this.props.required ? true : false,
       spellCheck: this.props.spellcheck,
+      autoComplete: 'off',
+      'aria-expanded': autocompleteVisible,
+      'aria-autocomplete': 'list' as const,
+      'aria-haspopup': 'listbox' as const,
+      'aria-controls': this.state.autocompleteContainerId,
+      'aria-owns': this.state.autocompleteContainerId,
+      'aria-activedescendant': this.getActiveAutocompleteItemId(),
     }
 
     return React.createElement<React.HTMLAttributes<ElementType>, ElementType>(
@@ -293,12 +447,75 @@ export abstract class AutocompletingTextInput<
     )
   }
 
+  // This will update the caret coordinates in the componen state, so that the
+  // "invisible caret" can be positioned correctly.
+  // Given the outcome of this function depends on both the caret coordinates
+  // and the scroll position, it should be called whenever the caret moves (on
+  // text changes) or the scroll position changes.
+  private updateCaretCoordinates = () => {
+    const element = this.element
+    if (!element) {
+      this.setState({ caretCoordinates: null })
+      return
+    }
+
+    const selectionEnd = element.selectionEnd
+    if (selectionEnd === null) {
+      this.setState({ caretCoordinates: null })
+      return
+    }
+
+    const caretCoordinates = getCaretCoordinates(element, selectionEnd)
+
+    this.setState({
+      caretCoordinates: {
+        top: caretCoordinates.top - element.scrollTop,
+        left: caretCoordinates.left - element.scrollLeft,
+        height: caretCoordinates.height,
+      },
+    })
+  }
+
+  private renderInvisibleCaret = () => {
+    const { caretCoordinates } = this.state
+    if (!caretCoordinates) {
+      return null
+    }
+
+    return (
+      <div
+        style={{
+          backgroundColor: 'transparent',
+          width: 2,
+          height: YOffset,
+          position: 'absolute',
+          left: caretCoordinates.left,
+          top: caretCoordinates.top,
+        }}
+        ref={this.invisibleCaretRef}
+      >
+        &nbsp;
+      </div>
+    )
+  }
+
   private onBlur = (e: React.FocusEvent<ElementType>) => {
     this.close()
   }
 
+  private onFocus = (e: React.FocusEvent<ElementType>) => {
+    if (!this.props.alwaysAutocomplete || this.element === null) {
+      return
+    }
+
+    this.open(this.element.value)
+
+    this.props.onFocus?.(e)
+  }
+
   private onRef = (ref: ElementType | null) => {
     this.element = ref
+    this.updateCaretCoordinates()
     if (this.props.onElementRef) {
       this.props.onElementRef(ref)
     }
@@ -314,16 +531,37 @@ export abstract class AutocompletingTextInput<
     const tagName = this.getElementTagName()
     const className = classNames(
       'autocompletion-container',
+      'no-invalid-state',
       this.props.className,
       {
         'text-box-component': tagName === 'input',
         'text-area-component': tagName === 'textarea',
       }
     )
+    const { label, screenReaderLabel } = this.props
+
+    const autoCompleteItems = this.state.autocompletionState?.items ?? []
+
+    const suggestionsMessage =
+      autoCompleteItems.length === 1
+        ? '1 suggestion'
+        : `${autoCompleteItems.length} suggestions`
+
     return (
       <div className={className}>
         {this.renderAutocompletions()}
+        {screenReaderLabel && label === undefined && (
+          <label className="sr-only" htmlFor={this.elementId}>
+            {screenReaderLabel}
+          </label>
+        )}
+        {label && <label htmlFor={this.elementId}>{label}</label>}
         {this.renderTextInput()}
+        {this.renderInvisibleCaret()}
+        <AriaLiveContainer
+          message={autoCompleteItems.length > 0 ? suggestionsMessage : null}
+          trackedUserInput={this.state.autocompletionState?.rangeText}
+        />
       </div>
     )
   }
@@ -338,7 +576,10 @@ export abstract class AutocompletingTextInput<
     this.element.selectionEnd = newCaretPosition
   }
 
-  private insertCompletion(item: Object, source: 'mouseclick' | 'keyboard') {
+  private insertCompletion(
+    item: AutocompleteItemType,
+    source: 'mouseclick' | 'keyboard'
+  ) {
     const element = this.element!
     const autocompletionState = this.state.autocompletionState!
     const originalText = element.value
@@ -372,7 +613,12 @@ export abstract class AutocompletingTextInput<
       this.setCursorPosition(newCaretPosition)
     }
 
+    this.props.onAutocompleteItemSelected?.(item)
+
     this.close()
+    if (this.props.alwaysAutocomplete) {
+      this.open('')
+    }
   }
 
   private getMovementDirection(
@@ -428,11 +674,16 @@ export abstract class AutocompletingTextInput<
         const newAutoCompletionState = {
           ...currentAutoCompletionState,
           selectedItem: newSelectedItem,
+          selectedRowId:
+            newSelectedItem === null ? undefined : this.getRowId(nextRow),
         }
 
         this.setState({ autocompletionState: newAutoCompletionState })
       }
-    } else if (event.key === 'Enter' || event.key === 'Tab') {
+    } else if (
+      event.key === 'Enter' ||
+      (event.key === 'Tab' && !event.shiftKey)
+    ) {
       const item = currentAutoCompletionState.selectedItem
       if (item) {
         event.preventDefault()
@@ -451,7 +702,9 @@ export abstract class AutocompletingTextInput<
   private async attemptAutocompletion(
     str: string,
     caretPosition: number
-  ): Promise<IAutocompletionState<any> | null> {
+  ): Promise<IAutocompletionState<AutocompleteItemType> | null> {
+    const lowercaseStr = str.toLowerCase()
+
     for (const provider of this.props.autocompletionProviders) {
       // NB: RegExps are stateful (AAAAAAAAAAAAAAAAAA) so defensively copy the
       // regex we're given.
@@ -463,15 +716,26 @@ export abstract class AutocompletingTextInput<
       }
 
       let result: RegExpExecArray | null = null
-      while ((result = regex.exec(str))) {
+      while ((result = regex.exec(lowercaseStr))) {
         const index = regex.lastIndex
         const text = result[1] || ''
-        if (index === caretPosition) {
+        if (index === caretPosition || this.props.alwaysAutocomplete) {
           const range = { start: index - text.length, length: text.length }
-          const items = await provider.getAutocompletionItems(text)
-
-          const selectedItem = items[0]
-          return { provider, items, range, selectedItem, rangeText: text }
+          let items = await provider.getAutocompletionItems(text)
+
+          if (this.props.autocompleteItemFilter) {
+            items = items.filter(this.props.autocompleteItemFilter)
+          }
+
+          return {
+            provider,
+            items,
+            range,
+            selectedItem: null,
+            selectedRowId: undefined,
+            rangeText: text,
+            itemListRowIdPrefix: this.buildAutocompleteListRowIdPrefix(),
+          }
         }
       }
     }
@@ -479,6 +743,14 @@ export abstract class AutocompletingTextInput<
     return null
   }
 
+  private buildAutocompleteListRowIdPrefix() {
+    return new Date().getTime().toString()
+  }
+
+  private onScroll = () => {
+    this.updateCaretCoordinates()
+  }
+
   private onChange = async (event: React.FormEvent<ElementType>) => {
     const str = event.currentTarget.value
 
@@ -486,6 +758,12 @@ export abstract class AutocompletingTextInput<
       this.props.onValueChanged(str)
     }
 
+    this.updateCaretCoordinates()
+
+    return this.open(str)
+  }
+
+  private async open(str: string) {
     const element = this.element
 
     if (element === null) {
diff --git a/app/src/ui/autocompletion/autocompletion-provider.ts b/app/src/ui/autocompletion/autocompletion-provider.ts
index 6b0115fc050..5882a5613a0 100644
--- a/app/src/ui/autocompletion/autocompletion-provider.ts
+++ b/app/src/ui/autocompletion/autocompletion-provider.ts
@@ -1,11 +1,15 @@
 import { AutocompletingTextInput } from './autocompleting-text-input'
 
-export class AutocompletingTextArea extends AutocompletingTextInput<HTMLTextAreaElement> {
+export class AutocompletingTextArea<
+  AutocompleteItemType extends object = object
+> extends AutocompletingTextInput<HTMLTextAreaElement, AutocompleteItemType> {
   protected getElementTagName(): 'textarea' | 'input' {
     return 'textarea'
   }
 }
-export class AutocompletingInput extends AutocompletingTextInput<HTMLInputElement> {
+export class AutocompletingInput<
+  AutocompleteItemType extends object = object
+> extends AutocompletingTextInput<HTMLInputElement, AutocompleteItemType> {
   protected getElementTagName(): 'textarea' | 'input' {
     return 'input'
   }
@@ -40,6 +44,9 @@ export interface IAutocompletionProvider<T> {
    */
   renderItem(item: T): JSX.Element
 
+  /** Returns the aria-label attribute for the rendered item. Optional. */
+  getItemAriaLabel?(item: T): string
+
   /**
    * Returns a text representation of a given autocompletion results.
    * This is the text that will end up going into the textbox if the
diff --git a/app/src/ui/autocompletion/build-autocompletion-providers.ts b/app/src/ui/autocompletion/build-autocompletion-providers.ts
index f762d66a74c..75f8bc38935 100644
--- a/app/src/ui/autocompletion/build-autocompletion-providers.ts
+++ b/app/src/ui/autocompletion/build-autocompletion-providers.ts
@@ -4,6 +4,7 @@ import {
   Repository,
 } from '../../models/repository'
 import {
+  CoAuthorAutocompletionProvider,
   EmojiAutocompletionProvider,
   IAutocompletionProvider,
   IssuesAutocompletionProvider,
@@ -12,11 +13,12 @@ import {
 import { Dispatcher } from '../dispatcher'
 import { GitHubUserStore, IssuesStore } from '../../lib/stores'
 import { Account } from '../../models/account'
+import { Emoji } from '../../lib/emoji'
 
 export function buildAutocompletionProviders(
   repository: Repository,
   dispatcher: Dispatcher,
-  emoji: Map<string, string>,
+  emoji: Map<string, Emoji>,
   issuesStore: IssuesStore,
   gitHubUserStore: GitHubUserStore,
   accounts: ReadonlyArray<Account>
@@ -42,7 +44,16 @@ export function buildAutocompletionProviders(
     const account = accounts.find(a => a.endpoint === gitHubRepository.endpoint)
 
     autocompletionProviders.push(
-      new UserAutocompletionProvider(gitHubUserStore, gitHubRepository, account)
+      new UserAutocompletionProvider(
+        gitHubUserStore,
+        gitHubRepository,
+        account
+      ),
+      new CoAuthorAutocompletionProvider(
+        gitHubUserStore,
+        gitHubRepository,
+        account
+      )
     )
   }
 
diff --git a/app/src/ui/autocompletion/emoji-autocompletion-provider.tsx b/app/src/ui/autocompletion/emoji-autocompletion-provider.tsx
index 64a0c436fdf..608393da232 100644
--- a/app/src/ui/autocompletion/emoji-autocompletion-provider.tsx
+++ b/app/src/ui/autocompletion/emoji-autocompletion-provider.tsx
@@ -2,6 +2,9 @@ import * as React from 'react'
 import { IAutocompletionProvider } from './index'
 import { compare } from '../../lib/compare'
 import { DefaultMaxHits } from './common'
+import { Emoji } from '../../lib/emoji'
+
+const sanitizeEmoji = (emoji: string) => emoji.replaceAll(':', '')
 
 /**
  * Interface describing a autocomplete match for the given search
@@ -9,7 +12,14 @@ import { DefaultMaxHits } from './common'
  */
 export interface IEmojiHit {
   /** A human-readable markdown representation of the emoji, ex :heart: */
-  readonly emoji: string
+  readonly title: string
+
+  /**
+   * The unicode string of the emoji if emoji is part of
+   * the unicode specification. If missing this emoji is
+   * a GitHub custom emoji such as :shipit:
+   */
+  readonly emoji?: string
 
   /**
    * The offset into the emoji string where the
@@ -31,10 +41,10 @@ export class EmojiAutocompletionProvider
 {
   public readonly kind = 'emoji'
 
-  private readonly emoji: Map<string, string>
+  private readonly allEmoji: Map<string, Emoji>
 
-  public constructor(emoji: Map<string, string>) {
-    this.emoji = emoji
+  public constructor(emoji: Map<string, Emoji>) {
+    this.allEmoji = emoji
   }
 
   public getRegExp(): RegExp {
@@ -49,18 +59,28 @@ export class EmojiAutocompletionProvider
     // when the user types a ':'. We want to open the popup
     // with suggestions as fast as possible.
     if (text.length === 0) {
-      return [...this.emoji.keys()]
-        .map(emoji => ({ emoji, matchStart: 0, matchLength: 0 }))
+      return [...this.allEmoji.entries()]
+        .map(([title, { emoji }]) => ({
+          title,
+          emoji,
+          matchStart: 0,
+          matchLength: 0,
+        }))
         .slice(0, maxHits)
     }
 
     const results = new Array<IEmojiHit>()
     const needle = text.toLowerCase()
 
-    for (const emoji of this.emoji.keys()) {
-      const index = emoji.indexOf(needle)
+    for (const [key, emoji] of this.allEmoji.entries()) {
+      const index = key.indexOf(needle)
       if (index !== -1) {
-        results.push({ emoji, matchStart: index, matchLength: needle.length })
+        results.push({
+          title: key,
+          emoji: emoji.emoji,
+          matchStart: index,
+          matchLength: needle.length,
+        })
       }
     }
 
@@ -79,42 +99,63 @@ export class EmojiAutocompletionProvider
       .sort(
         (x, y) =>
           compare(x.matchStart, y.matchStart) ||
-          compare(x.emoji.length, y.emoji.length) ||
-          compare(x.emoji, y.emoji)
+          compare(x.title.length, y.title.length) ||
+          compare(x.title, y.title)
       )
       .slice(0, maxHits)
   }
 
+  public getItemAriaLabel(hit: IEmojiHit): string {
+    const emoji = this.allEmoji.get(hit.title)
+    const sanitizedEmoji = sanitizeEmoji(hit.title)
+    const emojiDescription = emoji?.emoji
+      ? emoji.emoji
+      : emoji?.description ?? sanitizedEmoji
+    return emojiDescription === sanitizedEmoji
+      ? emojiDescription
+      : `${emojiDescription}, ${sanitizedEmoji}`
+  }
+
   public renderItem(hit: IEmojiHit) {
-    const emoji = hit.emoji
+    const emoji = this.allEmoji.get(hit.title)
 
     return (
-      <div className="emoji" key={emoji}>
-        <img className="icon" src={this.emoji.get(emoji)} />
+      <div className="emoji" key={hit.title}>
+        {emoji?.emoji ? (
+          <div className="icon">{emoji?.emoji}</div>
+        ) : (
+          <img
+            className="icon"
+            src={emoji?.url}
+            alt={emoji?.description ?? hit.title}
+          />
+        )}
         {this.renderHighlightedTitle(hit)}
       </div>
     )
   }
 
   private renderHighlightedTitle(hit: IEmojiHit) {
-    const emoji = hit.emoji
+    const emoji = sanitizeEmoji(hit.title)
 
     if (!hit.matchLength) {
       return <div className="title">{emoji}</div>
     }
 
+    // Offset the match start by one to account for the leading ':' that was
+    // removed from the emoji string
+    const matchStart = hit.matchStart - 1
+
     return (
       <div className="title">
-        {emoji.substring(0, hit.matchStart)}
-        <mark>
-          {emoji.substring(hit.matchStart, hit.matchStart + hit.matchLength)}
-        </mark>
-        {emoji.substring(hit.matchStart + hit.matchLength)}
+        {emoji.substring(0, matchStart)}
+        <mark>{emoji.substring(matchStart, matchStart + hit.matchLength)}</mark>
+        {emoji.substring(matchStart + hit.matchLength)}
       </div>
     )
   }
 
   public getCompletionText(item: IEmojiHit) {
-    return item.emoji
+    return item.emoji ?? item.title
   }
 }
diff --git a/app/src/ui/autocompletion/issues-autocompletion-provider.tsx b/app/src/ui/autocompletion/issues-autocompletion-provider.tsx
index 115c7f4df7e..1abeea1e923 100644
--- a/app/src/ui/autocompletion/issues-autocompletion-provider.tsx
+++ b/app/src/ui/autocompletion/issues-autocompletion-provider.tsx
@@ -53,7 +53,7 @@ export class IssuesAutocompletionProvider
   public renderItem(item: IIssueHit): JSX.Element {
     return (
       <div className="issue" key={item.number}>
-        <span className="number">#{item.number}</span>
+        <span className="number">#{item.number}</span>&nbsp;
         <span className="title">{item.title}</span>
       </div>
     )
diff --git a/app/src/ui/autocompletion/user-autocompletion-provider.tsx b/app/src/ui/autocompletion/user-autocompletion-provider.tsx
index 52057abf8a9..c604eead17b 100644
--- a/app/src/ui/autocompletion/user-autocompletion-provider.tsx
+++ b/app/src/ui/autocompletion/user-autocompletion-provider.tsx
@@ -7,7 +7,9 @@ import { Account } from '../../models/account'
 import { IMentionableUser } from '../../lib/databases/index'
 
 /** An autocompletion hit for a user. */
-export interface IUserHit {
+export type KnownUserHit = {
+  readonly kind: 'known-user'
+
   /** The username. */
   readonly username: string
 
@@ -27,11 +29,21 @@ export interface IUserHit {
   readonly endpoint: string
 }
 
+export type UnknownUserHit = {
+  readonly kind: 'unknown-user'
+
+  /** The username. */
+  readonly username: string
+}
+
+export type UserHit = KnownUserHit | UnknownUserHit
+
 function userToHit(
   repository: GitHubRepository,
   user: IMentionableUser
-): IUserHit {
+): UserHit {
   return {
+    kind: 'known-user',
     username: user.login,
     name: user.name,
     email: user.email,
@@ -41,7 +53,7 @@ function userToHit(
 
 /** The autocompletion provider for user mentions in a GitHub repository. */
 export class UserAutocompletionProvider
-  implements IAutocompletionProvider<IUserHit>
+  implements IAutocompletionProvider<UserHit>
 {
   public readonly kind = 'user'
 
@@ -63,9 +75,10 @@ export class UserAutocompletionProvider
     return /(?:^|\n| )(?:@)([a-z\d\\+-][a-z\d_-]*)?/g
   }
 
-  public async getAutocompletionItems(
-    text: string
-  ): Promise<ReadonlyArray<IUserHit>> {
+  protected async getUserAutocompletionItems(
+    text: string,
+    includeUnknownUser: boolean
+  ): Promise<ReadonlyArray<UserHit>> {
     const users = await this.gitHubUserStore.getMentionableUsersMatching(
       this.repository,
       text
@@ -77,19 +90,45 @@ export class UserAutocompletionProvider
       ? users.filter(x => x.login !== account.login)
       : users
 
-    return filtered.map(x => userToHit(this.repository, x))
+    const hits = filtered.map(x => userToHit(this.repository, x))
+
+    if (includeUnknownUser && text.length > 0) {
+      const exactMatch = hits.some(
+        hit => hit.username.toLowerCase() === text.toLowerCase()
+      )
+
+      if (!exactMatch) {
+        hits.push({
+          kind: 'unknown-user',
+          username: text,
+        })
+      }
+    }
+
+    return hits
   }
 
-  public renderItem(item: IUserHit): JSX.Element {
-    return (
+  public async getAutocompletionItems(
+    text: string
+  ): Promise<ReadonlyArray<UserHit>> {
+    return this.getUserAutocompletionItems(text, false)
+  }
+
+  public renderItem(item: UserHit): JSX.Element {
+    return item.kind === 'known-user' ? (
       <div className="user" key={item.username}>
         <span className="username">{item.username}</span>
         <span className="name">{item.name}</span>
       </div>
+    ) : (
+      <div className="user unknown" key={item.username}>
+        <span className="username">{item.username}</span>
+        <span className="description">Search for user</span>
+      </div>
     )
   }
 
-  public getCompletionText(item: IUserHit): string {
+  public getCompletionText(item: UserHit): string {
     return `@${item.username}`
   }
 
@@ -103,7 +142,7 @@ export class UserAutocompletionProvider
    *
    * @param login   The login (i.e. handle) of the user
    */
-  public async exactMatch(login: string): Promise<IUserHit | null> {
+  public async exactMatch(login: string): Promise<UserHit | null> {
     if (this.account === null) {
       return null
     }
@@ -117,3 +156,15 @@ export class UserAutocompletionProvider
     return userToHit(this.repository, user)
   }
 }
+
+export class CoAuthorAutocompletionProvider extends UserAutocompletionProvider {
+  public getRegExp(): RegExp {
+    return /(?:^|\n| )(?:@)?([a-z\d\\+-][a-z\d_-]*)?/g
+  }
+
+  public async getAutocompletionItems(
+    text: string
+  ): Promise<ReadonlyArray<UserHit>> {
+    return super.getUserAutocompletionItems(text, true)
+  }
+}
diff --git a/app/src/ui/banners/accessibilty-settings-banner.tsx b/app/src/ui/banners/accessibilty-settings-banner.tsx
new file mode 100644
index 00000000000..2091509981f
--- /dev/null
+++ b/app/src/ui/banners/accessibilty-settings-banner.tsx
@@ -0,0 +1,44 @@
+import * as React from 'react'
+import { Octicon } from '../octicons'
+import * as octicons from '../octicons/octicons.generated'
+import { Banner } from './banner'
+import { LinkButton } from '../lib/link-button'
+import { setBoolean } from '../../lib/local-storage'
+
+export const accessibilityBannerDismissed = 'accessibility-banner-dismissed'
+
+interface IAccessibilitySettingsBannerProps {
+  readonly onOpenAccessibilitySettings: () => void
+  readonly onDismissed: () => void
+}
+
+export class AccessibilitySettingsBanner extends React.Component<IAccessibilitySettingsBannerProps> {
+  private onDismissed = () => {
+    setBoolean(accessibilityBannerDismissed, true)
+    this.props.onDismissed()
+  }
+
+  private onOpenAccessibilitySettings = () => {
+    this.props.onOpenAccessibilitySettings()
+    this.onDismissed()
+  }
+
+  public render() {
+    return (
+      <Banner
+        id="accessibility-settings-banner"
+        dismissable={true}
+        onDismissed={this.onDismissed}
+      >
+        <Octicon symbol={octicons.accessibilityInset} />
+        <div className="banner-message">
+          Check out the new{' '}
+          <LinkButton onClick={this.onOpenAccessibilitySettings}>
+            accessibility settings
+          </LinkButton>{' '}
+          to control the visibility of the link underlines and diff check marks.
+        </div>
+      </Banner>
+    )
+  }
+}
diff --git a/app/src/ui/banners/banner.tsx b/app/src/ui/banners/banner.tsx
index 016dbafb16f..9c3762ae986 100644
--- a/app/src/ui/banners/banner.tsx
+++ b/app/src/ui/banners/banner.tsx
@@ -1,20 +1,29 @@
 import * as React from 'react'
 import { Octicon } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import * as octicons from '../octicons/octicons.generated'
+import classNames from 'classnames'
 
 interface IBannerProps {
   readonly id?: string
   readonly timeout?: number
   readonly dismissable?: boolean
+  readonly className?: string
   readonly onDismissed: () => void
 }
 
 export class Banner extends React.Component<IBannerProps, {}> {
-  private timeoutId: number | null = null
+  private banner = React.createRef<HTMLDivElement>()
+
+  // Timeout ID for manual focus placement after mounting
+  private focusTimeoutId: number | null = null
+
+  // Timeout ID for auto-dismissal of the banner after focus is lost
+  private dismissalTimeoutId: number | null = null
 
   public render() {
+    const cn = classNames('banner', this.props.className)
     return (
-      <div id={this.props.id} className="banner">
+      <div id={this.props.id} className={cn} ref={this.banner}>
         <div className="contents">{this.props.children}</div>
         {this.renderCloseButton()}
       </div>
@@ -22,31 +31,75 @@ export class Banner extends React.Component<IBannerProps, {}> {
   }
 
   private renderCloseButton() {
-    const { dismissable } = this.props
-    if (dismissable === undefined || dismissable === false) {
+    const { dismissable, onDismissed } = this.props
+
+    if (dismissable === false) {
       return null
     }
 
     return (
       <div className="close">
-        <a onClick={this.props.onDismissed}>
-          <Octicon symbol={OcticonSymbol.x} />
-        </a>
+        <button onClick={onDismissed} aria-label="Dismiss this message">
+          <Octicon symbol={octicons.x} />
+        </button>
       </div>
     )
   }
 
-  public componentDidMount = () => {
-    if (this.props.timeout !== undefined) {
-      this.timeoutId = window.setTimeout(() => {
-        this.props.onDismissed()
-      }, this.props.timeout)
+  public componentDidMount() {
+    this.focusTimeoutId = window.setTimeout(() => {
+      this.focusOnFirstSuitableElement()
+    }, 200)
+    this.addDismissalFocusListeners()
+  }
+
+  public componentWillUnmount() {
+    if (this.focusTimeoutId !== null) {
+      window.clearTimeout(this.focusTimeoutId)
+      this.focusTimeoutId = null
+    }
+
+    this.removeDismissalFocusListeners()
+  }
+
+  private focusOnFirstSuitableElement = () => {
+    const target =
+      this.banner.current?.querySelector('a') ||
+      this.banner.current?.querySelector('button')
+    target?.focus()
+  }
+
+  private addDismissalFocusListeners() {
+    this.banner.current?.addEventListener('focusin', this.onFocusIn)
+    this.banner.current?.addEventListener('focusout', this.onFocusOut)
+  }
+
+  private removeDismissalFocusListeners() {
+    this.banner.current?.removeEventListener('focusout', this.onFocusOut)
+    this.banner.current?.removeEventListener('focusin', this.onFocusIn)
+  }
+
+  private onFocusIn = () => {
+    if (this.dismissalTimeoutId !== null) {
+      window.clearTimeout(this.dismissalTimeoutId)
+      this.dismissalTimeoutId = null
     }
   }
 
-  public componentWillUnmount = () => {
-    if (this.props.timeout !== undefined && this.timeoutId !== null) {
-      window.clearTimeout(this.timeoutId)
+  private onFocusOut = async (event: FocusEvent) => {
+    const { dismissable, onDismissed, timeout } = this.props
+
+    if (
+      event.relatedTarget &&
+      this.banner.current?.contains(event.relatedTarget as Node)
+    ) {
+      return
+    }
+
+    if (dismissable !== false && timeout !== undefined) {
+      this.dismissalTimeoutId = window.setTimeout(() => {
+        onDismissed()
+      }, timeout)
     }
   }
 }
diff --git a/app/src/ui/banners/branch-already-up-to-date-banner.tsx b/app/src/ui/banners/branch-already-up-to-date-banner.tsx
index 76efa4d0938..6ed3cdbe4fd 100644
--- a/app/src/ui/banners/branch-already-up-to-date-banner.tsx
+++ b/app/src/ui/banners/branch-already-up-to-date-banner.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { Octicon } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import * as octicons from '../octicons/octicons.generated'
 import { Banner } from './banner'
 
 export function BranchAlreadyUpToDate({
@@ -29,7 +29,7 @@ export function BranchAlreadyUpToDate({
   return (
     <Banner id="successful-merge" timeout={5000} onDismissed={onDismissed}>
       <div className="green-circle">
-        <Octicon className="check-icon" symbol={OcticonSymbol.check} />
+        <Octicon className="check-icon" symbol={octicons.check} />
       </div>
       <div className="banner-message">{message}</div>
     </Banner>
diff --git a/app/src/ui/banners/cherry-pick-conflicts-banner.tsx b/app/src/ui/banners/cherry-pick-conflicts-banner.tsx
index 3b85f814892..67e871a0d4f 100644
--- a/app/src/ui/banners/cherry-pick-conflicts-banner.tsx
+++ b/app/src/ui/banners/cherry-pick-conflicts-banner.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { Octicon } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import * as octicons from '../octicons/octicons.generated'
 import { Banner } from './banner'
 import { LinkButton } from '../lib/link-button'
 
@@ -35,7 +35,7 @@ export class CherryPickConflictsBanner extends React.Component<
         dismissable={false}
         onDismissed={this.onDismissed}
       >
-        <Octicon className="alert-icon" symbol={OcticonSymbol.alert} />
+        <Octicon className="alert-icon" symbol={octicons.alert} />
         <div className="banner-message">
           <span>
             Resolve conflicts to continue cherry-picking onto{' '}
diff --git a/app/src/ui/banners/conflicts-found-banner.tsx b/app/src/ui/banners/conflicts-found-banner.tsx
index c6ed8044b93..0c76552246b 100644
--- a/app/src/ui/banners/conflicts-found-banner.tsx
+++ b/app/src/ui/banners/conflicts-found-banner.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { Octicon } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import * as octicons from '../octicons/octicons.generated'
 import { Banner } from './banner'
 import { LinkButton } from '../lib/link-button'
 
@@ -41,7 +41,7 @@ export class ConflictsFoundBanner extends React.Component<
         dismissable={false}
         onDismissed={this.onDismissed}
       >
-        <Octicon className="alert-icon" symbol={OcticonSymbol.alert} />
+        <Octicon className="alert-icon" symbol={octicons.alert} />
         <div className="banner-message">
           <span>
             Resolve conflicts to continue {this.props.operationDescription}.
diff --git a/app/src/ui/banners/merge-conflicts-banner.tsx b/app/src/ui/banners/merge-conflicts-banner.tsx
index e30358d9c8d..cbda3026fa8 100644
--- a/app/src/ui/banners/merge-conflicts-banner.tsx
+++ b/app/src/ui/banners/merge-conflicts-banner.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { Octicon } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import * as octicons from '../octicons/octicons.generated'
 import { Banner } from './banner'
 import { Dispatcher } from '../dispatcher'
 import { Popup } from '../../models/popup'
@@ -22,7 +22,7 @@ export class MergeConflictsBanner extends React.Component<
   private openDialog = () => {
     this.props.onDismissed()
     this.props.dispatcher.showPopup(this.props.popup)
-    this.props.dispatcher.recordMergeConflictsDialogReopened()
+    this.props.dispatcher.incrementMetric('mergeConflictsDialogReopenedCount')
   }
   public render() {
     return (
@@ -31,7 +31,7 @@ export class MergeConflictsBanner extends React.Component<
         dismissable={false}
         onDismissed={this.props.onDismissed}
       >
-        <Octicon className="alert-icon" symbol={OcticonSymbol.alert} />
+        <Octicon className="alert-icon" symbol={octicons.alert} />
         <div className="banner-message">
           <span>
             Resolve conflicts and commit to merge into{' '}
diff --git a/app/src/ui/banners/open-thank-you-card.tsx b/app/src/ui/banners/open-thank-you-card.tsx
index 4d81f239fd1..f2ac0e65b9c 100644
--- a/app/src/ui/banners/open-thank-you-card.tsx
+++ b/app/src/ui/banners/open-thank-you-card.tsx
@@ -2,9 +2,10 @@ import * as React from 'react'
 import { LinkButton } from '../lib/link-button'
 import { RichText } from '../lib/rich-text'
 import { Banner } from './banner'
+import { Emoji } from '../../lib/emoji'
 
 interface IOpenThankYouCardProps {
-  readonly emoji: Map<string, string>
+  readonly emoji: Map<string, Emoji>
   readonly onDismissed: () => void
   readonly onOpenCard: () => void
   readonly onThrowCardAway: () => void
@@ -20,26 +21,21 @@ export class OpenThankYouCard extends React.Component<
   public render() {
     return (
       <Banner id="open-thank-you-card" onDismissed={this.props.onDismissed}>
-        <span onSubmit={this.props.onOpenCard}>
-          The Desktop team would like to thank you for your contributions.{' '}
-          <LinkButton onClick={this.props.onOpenCard}>
-            Open Your Card
-          </LinkButton>{' '}
-          <RichText
-            className="thank-you-banner-emoji"
-            text={':tada:'}
-            emoji={this.props.emoji}
-            renderUrlsAsLinks={true}
-          />
-          or{' '}
-          <LinkButton onClick={this.onThrowCardAway}>Throw It Away</LinkButton>{' '}
-          <RichText
-            className="thank-you-banner-emoji"
-            text={':sob:'}
-            emoji={this.props.emoji}
-            renderUrlsAsLinks={true}
-          />
-        </span>
+        The Desktop team would like to thank you for your contributions.{' '}
+        <LinkButton onClick={this.props.onOpenCard}>Open Your Card</LinkButton>{' '}
+        <RichText
+          className="thank-you-banner-emoji"
+          text={':tada:'}
+          emoji={this.props.emoji}
+          renderUrlsAsLinks={true}
+        />
+        or <LinkButton onClick={this.onThrowCardAway}>Throw It Away</LinkButton>{' '}
+        <RichText
+          className="thank-you-banner-emoji"
+          text={':sob:'}
+          emoji={this.props.emoji}
+          renderUrlsAsLinks={true}
+        />
       </Banner>
     )
   }
diff --git a/app/src/ui/banners/os-version-no-longer-supported-banner.tsx b/app/src/ui/banners/os-version-no-longer-supported-banner.tsx
new file mode 100644
index 00000000000..89ee9fb97bd
--- /dev/null
+++ b/app/src/ui/banners/os-version-no-longer-supported-banner.tsx
@@ -0,0 +1,39 @@
+import * as React from 'react'
+import { Octicon } from '../octicons'
+import * as octicons from '../octicons/octicons.generated'
+import { Banner } from './banner'
+import { LinkButton } from '../lib/link-button'
+import { setNumber } from '../../lib/local-storage'
+
+export const UnsupportedOSBannerDismissedAtKey =
+  'unsupported-os-banner-dismissed-at'
+
+export class OSVersionNoLongerSupportedBanner extends React.Component<{
+  onDismissed: () => void
+}> {
+  private onDismissed = () => {
+    setNumber(UnsupportedOSBannerDismissedAtKey, Date.now())
+    this.props.onDismissed()
+  }
+
+  public render() {
+    return (
+      <Banner
+        id="conflicts-found-banner"
+        dismissable={true}
+        onDismissed={this.onDismissed}
+      >
+        <Octicon className="alert-icon" symbol={octicons.alert} />
+        <div className="banner-message">
+          <span>
+            This operating system is no longer supported. Software updates have
+            been disabled.
+          </span>
+          <LinkButton uri="https://docs.github.com/en/desktop/installing-and-configuring-github-desktop/overview/supported-operating-systems">
+            Support details
+          </LinkButton>
+        </div>
+      </Banner>
+    )
+  }
+}
diff --git a/app/src/ui/banners/rebase-conflicts-banner.tsx b/app/src/ui/banners/rebase-conflicts-banner.tsx
index e177ef7f2ad..2b1dcc6760b 100644
--- a/app/src/ui/banners/rebase-conflicts-banner.tsx
+++ b/app/src/ui/banners/rebase-conflicts-banner.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { Octicon } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import * as octicons from '../octicons/octicons.generated'
 import { Banner } from './banner'
 import { Dispatcher } from '../dispatcher'
 import { LinkButton } from '../lib/link-button'
@@ -22,7 +22,7 @@ export class RebaseConflictsBanner extends React.Component<
   private openDialog = async () => {
     this.props.onDismissed()
     this.props.onOpenDialog()
-    this.props.dispatcher.recordRebaseConflictsDialogReopened()
+    this.props.dispatcher.incrementMetric('rebaseConflictsDialogReopenedCount')
   }
 
   private onDismissed = () => {
@@ -38,7 +38,7 @@ export class RebaseConflictsBanner extends React.Component<
         dismissable={false}
         onDismissed={this.onDismissed}
       >
-        <Octicon className="alert-icon" symbol={OcticonSymbol.alert} />
+        <Octicon className="alert-icon" symbol={octicons.alert} />
         <div className="banner-message">
           <span>
             Resolve conflicts to continue rebasing{' '}
diff --git a/app/src/ui/banners/render-banner.tsx b/app/src/ui/banners/render-banner.tsx
index 939b8e26266..486a6e89543 100644
--- a/app/src/ui/banners/render-banner.tsx
+++ b/app/src/ui/banners/render-banner.tsx
@@ -18,6 +18,8 @@ import { OpenThankYouCard } from './open-thank-you-card'
 import { SuccessfulSquash } from './successful-squash'
 import { SuccessBanner } from './success-banner'
 import { ConflictsFoundBanner } from './conflicts-found-banner'
+import { OSVersionNoLongerSupportedBanner } from './os-version-no-longer-supported-banner'
+import { AccessibilitySettingsBanner } from './accessibilty-settings-banner'
 
 export function renderBanner(
   banner: Banner,
@@ -122,7 +124,11 @@ export function renderBanner(
     case BannerType.SquashUndone: {
       const pluralized = banner.commitsCount === 1 ? 'commit' : 'commits'
       return (
-        <SuccessBanner timeout={5000} onDismissed={onDismissed}>
+        <SuccessBanner
+          key="squash-undone"
+          timeout={5000}
+          onDismissed={onDismissed}
+        >
           Squash of {banner.commitsCount} {pluralized} undone.
         </SuccessBanner>
       )
@@ -132,6 +138,7 @@ export function renderBanner(
 
       return (
         <SuccessBanner
+          key="successful-reorder"
           timeout={15000}
           onDismissed={onDismissed}
           onUndo={banner.onUndo}
@@ -145,7 +152,11 @@ export function renderBanner(
     case BannerType.ReorderUndone: {
       const pluralized = banner.commitsCount === 1 ? 'commit' : 'commits'
       return (
-        <SuccessBanner timeout={5000} onDismissed={onDismissed}>
+        <SuccessBanner
+          key="reorder-undone"
+          timeout={5000}
+          onDismissed={onDismissed}
+        >
           Reorder of {banner.commitsCount} {pluralized} undone.
         </SuccessBanner>
       )
@@ -159,6 +170,15 @@ export function renderBanner(
           key={'conflicts-found'}
         ></ConflictsFoundBanner>
       )
+    case BannerType.OSVersionNoLongerSupported:
+      return <OSVersionNoLongerSupportedBanner onDismissed={onDismissed} />
+    case BannerType.AccessibilitySettingsBanner:
+      return (
+        <AccessibilitySettingsBanner
+          onOpenAccessibilitySettings={banner.onOpenAccessibilitySettings}
+          onDismissed={onDismissed}
+        />
+      )
     default:
       return assertNever(banner, `Unknown popup type: ${banner}`)
   }
diff --git a/app/src/ui/banners/success-banner.tsx b/app/src/ui/banners/success-banner.tsx
index 45a5c095c9a..d252d89389b 100644
--- a/app/src/ui/banners/success-banner.tsx
+++ b/app/src/ui/banners/success-banner.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react'
 import { LinkButton } from '../lib/link-button'
 import { Octicon } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import * as octicons from '../octicons/octicons.generated'
 import { Banner } from './banner'
 
 interface ISuccessBannerProps {
@@ -36,7 +36,7 @@ export class SuccessBanner extends React.Component<ISuccessBannerProps, {}> {
         onDismissed={this.props.onDismissed}
       >
         <div className="green-circle">
-          <Octicon className="check-icon" symbol={OcticonSymbol.check} />
+          <Octicon className="check-icon" symbol={octicons.checkCircleFill} />
         </div>
         <div className="banner-message">
           <span className="success-contents">{this.props.children}</span>
diff --git a/app/src/ui/banners/update-available.tsx b/app/src/ui/banners/update-available.tsx
index 37945f833d5..ea0bd6c14dd 100644
--- a/app/src/ui/banners/update-available.tsx
+++ b/app/src/ui/banners/update-available.tsx
@@ -1,9 +1,13 @@
 import * as React from 'react'
 import { Dispatcher } from '../dispatcher/index'
 import { LinkButton } from '../lib/link-button'
-import { lastShowCaseVersionSeen, updateStore } from '../lib/update-store'
+import {
+  UpdateStatus,
+  lastShowCaseVersionSeen,
+  updateStore,
+} from '../lib/update-store'
 import { Octicon } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import * as octicons from '../octicons/octicons.generated'
 import { PopupType } from '../../models/popup'
 import { shell } from '../../lib/app-shell'
 
@@ -11,39 +15,67 @@ import { ReleaseSummary } from '../../models/release-notes'
 import { Banner } from './banner'
 import { ReleaseNotesUri } from '../lib/releases'
 import { RichText } from '../lib/rich-text'
+import { Emoji } from '../../lib/emoji'
 
 interface IUpdateAvailableProps {
   readonly dispatcher: Dispatcher
   readonly newReleases: ReadonlyArray<ReleaseSummary> | null
+  readonly isX64ToARM64ImmediateAutoUpdate: boolean
   readonly isUpdateShowcaseVisible: boolean
-  readonly emoji: Map<string, string>
+  readonly emoji: Map<string, Emoji>
   readonly onDismissed: () => void
+  readonly prioritizeUpdate: boolean
+  readonly prioritizeUpdateInfoUrl: string | undefined
 }
 
 /**
  * A component which tells the user an update is available and gives them the
  * option of moving into the future or being a luddite.
  */
-export class UpdateAvailable extends React.Component<
-  IUpdateAvailableProps,
-  {}
-> {
+export class UpdateAvailable extends React.Component<IUpdateAvailableProps> {
   public render() {
     return (
-      <Banner id="update-available" onDismissed={this.props.onDismissed}>
-        {!this.props.isUpdateShowcaseVisible && (
-          <Octicon
-            className="download-icon"
-            symbol={OcticonSymbol.desktopDownload}
-          />
-        )}
-
+      <Banner
+        id="update-available"
+        className={this.props.prioritizeUpdate ? 'priority' : undefined}
+        dismissable={!this.props.prioritizeUpdate}
+        onDismissed={this.props.onDismissed}
+      >
+        {this.renderIcon()}
         {this.renderMessage()}
       </Banner>
     )
   }
 
+  private renderIcon() {
+    if (this.props.isUpdateShowcaseVisible) {
+      return null
+    }
+
+    if (this.props.prioritizeUpdate) {
+      return <Octicon className="warning-icon" symbol={octicons.alert} />
+    }
+
+    return (
+      <Octicon className="download-icon" symbol={octicons.desktopDownload} />
+    )
+  }
+
   private renderMessage = () => {
+    if (this.props.isX64ToARM64ImmediateAutoUpdate) {
+      return (
+        <span onSubmit={this.updateNow}>
+          An optimized version of GitHub Desktop is available for your{' '}
+          {__DARWIN__ ? 'Apple silicon' : 'Arm64'} machine and will be installed
+          at the next launch or{' '}
+          <LinkButton onClick={this.updateNow}>
+            restart GitHub Desktop
+          </LinkButton>{' '}
+          now.
+        </span>
+      )
+    }
+
     if (this.props.isUpdateShowcaseVisible) {
       const version =
         this.props.newReleases !== null
@@ -67,6 +99,26 @@ export class UpdateAvailable extends React.Component<
       )
     }
 
+    if (this.props.prioritizeUpdate) {
+      return (
+        <span onSubmit={this.updateNow}>
+          This version of GitHub Desktop is missing{' '}
+          {this.props.prioritizeUpdateInfoUrl ? (
+            <LinkButton uri={this.props.prioritizeUpdateInfoUrl}>
+              important updates
+            </LinkButton>
+          ) : (
+            'important updates'
+          )}
+          . Please{' '}
+          <LinkButton onClick={this.updateNow}>
+            restart GitHub Desktop
+          </LinkButton>{' '}
+          now to install pending updates.
+        </span>
+      )
+    }
+
     return (
       <span onSubmit={this.updateNow}>
         An updated version of GitHub Desktop is available and will be installed
@@ -109,6 +161,15 @@ export class UpdateAvailable extends React.Component<
   }
 
   private updateNow = () => {
+    if (
+      (__RELEASE_CHANNEL__ === 'development' ||
+        __RELEASE_CHANNEL__ === 'test') &&
+      updateStore.state.status !== UpdateStatus.UpdateReady
+    ) {
+      this.props.onDismissed()
+      return // causes a crash.. if no update is available
+    }
+
     updateStore.quitAndInstallUpdate()
   }
 }
diff --git a/app/src/ui/branches/branch-list-item-context-menu.tsx b/app/src/ui/branches/branch-list-item-context-menu.tsx
new file mode 100644
index 00000000000..c937379adfa
--- /dev/null
+++ b/app/src/ui/branches/branch-list-item-context-menu.tsx
@@ -0,0 +1,54 @@
+import { IMenuItem } from '../../lib/menu-item'
+import { clipboard } from 'electron'
+
+interface IBranchContextMenuConfig {
+  name: string
+  isLocal: boolean
+  onRenameBranch?: (branchName: string) => void
+  onViewPullRequestOnGitHub?: () => void
+  onDeleteBranch?: (branchName: string) => void
+}
+
+export function generateBranchContextMenuItems(
+  config: IBranchContextMenuConfig
+): IMenuItem[] {
+  const {
+    name,
+    isLocal,
+    onRenameBranch,
+    onViewPullRequestOnGitHub,
+    onDeleteBranch,
+  } = config
+  const items = new Array<IMenuItem>()
+
+  if (onRenameBranch !== undefined) {
+    items.push({
+      label: 'Rename…',
+      action: () => onRenameBranch(name),
+      enabled: isLocal,
+    })
+  }
+
+  items.push({
+    label: __DARWIN__ ? 'Copy Branch Name' : 'Copy branch name',
+    action: () => clipboard.writeText(name),
+  })
+
+  if (onViewPullRequestOnGitHub !== undefined) {
+    items.push({
+      label: 'View Pull Request on GitHub',
+      action: () => onViewPullRequestOnGitHub(),
+    })
+  }
+
+  items.push({ type: 'separator' })
+
+  if (onDeleteBranch !== undefined) {
+    items.push({
+      label: 'Delete…',
+      action: () => onDeleteBranch(name),
+    })
+  }
+
+  return items
+}
diff --git a/app/src/ui/branches/branch-list-item.tsx b/app/src/ui/branches/branch-list-item.tsx
index 54cc1c3af0a..3900defcf2e 100644
--- a/app/src/ui/branches/branch-list-item.tsx
+++ b/app/src/ui/branches/branch-list-item.tsx
@@ -1,13 +1,10 @@
-import { clipboard } from 'electron'
 import * as React from 'react'
 
 import { IMatches } from '../../lib/fuzzy-find'
 
 import { Octicon } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import * as octicons from '../octicons/octicons.generated'
 import { HighlightText } from '../lib/highlight-text'
-import { showContextualMenu } from '../../lib/menu-item'
-import { IMenuItem } from '../../lib/menu-item'
 import { dragAndDropManager } from '../../lib/drag-and-drop-manager'
 import { DragType, DropTargetType } from '../../models/drag-drop'
 import { TooltippedContent } from '../lib/tooltipped-content'
@@ -21,18 +18,10 @@ interface IBranchListItemProps {
   /** Specifies whether this item is currently selected */
   readonly isCurrentBranch: boolean
 
-  /** The date may be null if we haven't loaded the tip commit yet. */
-  readonly lastCommitDate: Date | null
-
   /** The characters in the branch name to highlight */
   readonly matches: IMatches
 
-  /** Specifies whether the branch is local */
-  readonly isLocal: boolean
-
-  readonly onRenameBranch?: (branchName: string) => void
-
-  readonly onDeleteBranch?: (branchName: string) => void
+  readonly authorDate: Date | undefined
 
   /** When a drag element has landed on a branch that is not current */
   readonly onDropOntoBranch?: (branchName: string) => void
@@ -60,47 +49,6 @@ export class BranchListItem extends React.Component<
     this.state = { isDragInProgress: false }
   }
 
-  private onContextMenu = (event: React.MouseEvent<HTMLDivElement>) => {
-    event.preventDefault()
-
-    /*
-      There are multiple instances in the application where a branch list item
-      is rendered. We only want to be able to rename or delete them on the
-      branch dropdown menu. Thus, other places simply will not provide these
-      methods, such as the merge and rebase logic.
-    */
-    const { onRenameBranch, onDeleteBranch, name, isLocal } = this.props
-    if (onRenameBranch === undefined && onDeleteBranch === undefined) {
-      return
-    }
-
-    const items: Array<IMenuItem> = []
-
-    if (onRenameBranch !== undefined) {
-      items.push({
-        label: 'Rename…',
-        action: () => onRenameBranch(name),
-        enabled: isLocal,
-      })
-    }
-
-    items.push({
-      label: __DARWIN__ ? 'Copy Branch Name' : 'Copy branch name',
-      action: () => clipboard.writeText(name),
-    })
-
-    items.push({ type: 'separator' })
-
-    if (onDeleteBranch !== undefined) {
-      items.push({
-        label: 'Delete…',
-        action: () => onDeleteBranch(name),
-      })
-    }
-
-    showContextualMenu(items)
-  }
-
   private onMouseEnter = () => {
     if (dragAndDropManager.isDragInProgress) {
       this.setState({ isDragInProgress: true })
@@ -142,15 +90,16 @@ export class BranchListItem extends React.Component<
   }
 
   public render() {
-    const { lastCommitDate, isCurrentBranch, name } = this.props
-    const icon = isCurrentBranch ? OcticonSymbol.check : OcticonSymbol.gitBranch
+    const { authorDate, isCurrentBranch, name } = this.props
+
+    const icon = isCurrentBranch ? octicons.check : octicons.gitBranch
     const className = classNames('branches-list-item', {
       'drop-target': this.state.isDragInProgress,
     })
 
     return (
+      // eslint-disable-next-line jsx-a11y/no-static-element-interactions
       <div
-        onContextMenu={this.onContextMenu}
         className={className}
         onMouseEnter={this.onMouseEnter}
         onMouseLeave={this.onMouseLeave}
@@ -165,10 +114,10 @@ export class BranchListItem extends React.Component<
         >
           <HighlightText text={name} highlight={this.props.matches.title} />
         </TooltippedContent>
-        {lastCommitDate && (
+        {authorDate && (
           <RelativeTime
             className="description"
-            date={lastCommitDate}
+            date={authorDate}
             onlyRelative={true}
           />
         )}
diff --git a/app/src/ui/branches/branch-list.tsx b/app/src/ui/branches/branch-list.tsx
index a3db3b365c2..3b424bfba84 100644
--- a/app/src/ui/branches/branch-list.tsx
+++ b/app/src/ui/branches/branch-list.tsx
@@ -1,14 +1,10 @@
 import * as React from 'react'
 
-import { Branch } from '../../models/branch'
+import { Branch, BranchType } from '../../models/branch'
 
 import { assertNever } from '../../lib/fatal-error'
 
-import {
-  FilterList,
-  IFilterListGroup,
-  SelectionSource,
-} from '../lib/filter-list'
+import { SelectionSource } from '../lib/filter-list'
 import { IMatches } from '../../lib/fuzzy-find'
 import { Button } from '../lib/button'
 import { TextBox } from '../lib/text-box'
@@ -20,10 +16,19 @@ import {
 } from './group-branches'
 import { NoBranches } from './no-branches'
 import { SelectionDirection, ClickSource } from '../lib/list'
+import { generateBranchContextMenuItems } from './branch-list-item-context-menu'
+import { showContextualMenu } from '../../lib/menu-item'
+import { SectionFilterList } from '../lib/section-filter-list'
+import memoizeOne from 'memoize-one'
+import { getAuthors } from '../../lib/git/log'
+import { Repository } from '../../models/repository'
+import uuid from 'uuid'
 
 const RowHeight = 30
 
 interface IBranchListProps {
+  readonly repository: Repository
+
   /**
    * See IBranchesState.defaultBranch
    */
@@ -92,12 +97,19 @@ interface IBranchListProps {
 
   readonly textbox?: TextBox
 
+  /** Aria label for a specific row */
+  readonly getBranchAriaLabel: (
+    item: IBranchListItem,
+    authorDate: Date | undefined
+  ) => string | undefined
+
   /**
    * Render function to apply to each branch in the list
    */
   readonly renderBranch: (
     item: IBranchListItem,
-    matches: IMatches
+    matches: IMatches,
+    authorDate: Date | undefined
   ) => JSX.Element
 
   /**
@@ -110,62 +122,73 @@ interface IBranchListProps {
 
   /** Called to render content before/above the branches filter and list. */
   readonly renderPreList?: () => JSX.Element | null
-}
 
-interface IBranchListState {
-  /**
-   * The grouped list of branches.
-   *
-   * Groups are currently defined as 'default branch', 'current branch',
-   * 'recent branches' and all branches.
-   */
-  readonly groups: ReadonlyArray<IFilterListGroup<IBranchListItem>>
+  /** Optional: No branches message */
+  readonly noBranchesMessage?: string | JSX.Element
 
-  /** The selected item in the filtered list */
-  readonly selectedItem: IBranchListItem | null
-}
-
-function createState(props: IBranchListProps): IBranchListState {
-  const groups = groupBranches(
-    props.defaultBranch,
-    props.currentBranch,
-    props.allBranches,
-    props.recentBranches
-  )
+  /** Optional: Callback for if rename context menu should exist */
+  readonly onRenameBranch?: (branchName: string) => void
 
-  let selectedItem: IBranchListItem | null = null
-  const selectedBranch = props.selectedBranch
-  if (selectedBranch) {
-    for (const group of groups) {
-      selectedItem =
-        group.items.find(i => {
-          const branch = i.branch
-          return branch.name === selectedBranch.name
-        }) || null
-
-      if (selectedItem) {
-        break
-      }
-    }
-  }
+  /** Optional: Callback for if delete context menu should exist */
+  readonly onDeleteBranch?: (branchName: string) => void
+}
 
-  return { groups, selectedItem }
+interface IBranchListState {
+  readonly commitAuthorDates: ReadonlyMap<string, Date>
 }
 
+const commitDateCache = new Map<string, Date>()
+
 /** The Branches list component. */
 export class BranchList extends React.Component<
   IBranchListProps,
   IBranchListState
 > {
-  private branchFilterList: FilterList<IBranchListItem> | null = null
+  private branchFilterList: SectionFilterList<IBranchListItem> | null = null
+
+  private getGroups = memoizeOne(groupBranches)
+  private getSelectedItem = memoizeOne(
+    (groups: ReturnType<typeof groupBranches>, selectedBranch: Branch | null) =>
+      groups
+        .flatMap(g => g.items)
+        .find(i => i.branch.name === selectedBranch?.name) ?? null
+  )
 
-  public constructor(props: IBranchListProps) {
-    super(props)
-    this.state = createState(props)
+  /**
+   * Generate an opaque value any time groups or commitAuthorDates changes
+   * in order to force the list to re-render.
+   *
+   * Note, change is determined by reference equality
+   */
+  private getInvalidationProp = memoizeOne(
+    (
+      _groups: ReturnType<typeof groupBranches>,
+      _commitAuthorDates: IBranchListState['commitAuthorDates']
+    ) => uuid()
+  )
+
+  private get invalidationProp() {
+    return this.getInvalidationProp(this.groups, this.state.commitAuthorDates)
+  }
+
+  private get groups() {
+    return this.getGroups(
+      this.props.defaultBranch,
+      this.props.currentBranch,
+      this.props.allBranches,
+      this.props.recentBranches
+    )
   }
 
-  public componentWillReceiveProps(nextProps: IBranchListProps) {
-    this.setState(createState(nextProps))
+  private get selectedItem() {
+    return this.getSelectedItem(this.groups, this.props.selectedBranch)
+  }
+
+  public constructor(props: IBranchListProps) {
+    super(props)
+    this.state = {
+      commitAuthorDates: new Map<string, Date>(),
+    }
   }
 
   public selectNextItem(focus: boolean = false, direction: SelectionDirection) {
@@ -174,41 +197,116 @@ export class BranchList extends React.Component<
     }
   }
 
+  public componentDidUpdate(prevProps: IBranchListProps) {
+    if (prevProps.allBranches !== this.props.allBranches) {
+      this.populateCommitDates()
+    }
+  }
+
+  private populateCommitDates = () => {
+    const cached = new Map<string, Date>()
+    const missing = new Array<string>()
+    const uniqShas = new Set(this.props.allBranches.map(b => b.tip.sha))
+
+    for (const sha of uniqShas) {
+      const date = commitDateCache.get(sha)
+      if (date) {
+        cached.set(sha, date)
+      } else {
+        missing.push(sha)
+      }
+    }
+
+    // Clean up the cache
+    for (const sha of commitDateCache.keys()) {
+      if (!uniqShas.has(sha)) {
+        commitDateCache.delete(sha)
+      }
+    }
+
+    this.setState({ commitAuthorDates: cached })
+
+    if (missing.length > 0) {
+      getAuthors(this.props.repository, missing)
+        .then(x => {
+          x.forEach(({ date }, i) => commitDateCache.set(missing[i], date))
+          this.populateCommitDates()
+        })
+        .catch(e => log.error(`Failed to populate commit dates`, e))
+    }
+  }
+
+  public componentDidMount() {
+    this.populateCommitDates()
+  }
+
   public render() {
     return (
-      <FilterList<IBranchListItem>
+      <SectionFilterList<IBranchListItem>
         ref={this.onBranchesFilterListRef}
         className="branches-list"
         rowHeight={RowHeight}
         filterText={this.props.filterText}
         onFilterTextChanged={this.props.onFilterTextChanged}
         onFilterKeyDown={this.props.onFilterKeyDown}
-        selectedItem={this.state.selectedItem}
+        selectedItem={this.selectedItem}
         renderItem={this.renderItem}
         renderGroupHeader={this.renderGroupHeader}
         onItemClick={this.onItemClick}
         onSelectionChanged={this.onSelectionChanged}
         onEnterPressedWithoutFilteredItems={this.onCreateNewBranch}
-        groups={this.state.groups}
-        invalidationProps={this.props.allBranches}
+        groups={this.groups}
+        invalidationProps={this.invalidationProp}
         renderPostFilter={this.onRenderNewButton}
         renderNoItems={this.onRenderNoItems}
         filterTextBox={this.props.textbox}
         hideFilterRow={this.props.hideFilterRow}
         onFilterListResultsChanged={this.props.onFilterListResultsChanged}
         renderPreList={this.props.renderPreList}
+        onItemContextMenu={this.onBranchContextMenu}
+        getItemAriaLabel={this.getItemAriaLabel}
+        getGroupAriaLabel={this.getGroupAriaLabel}
       />
     )
   }
 
+  private onBranchContextMenu = (
+    item: IBranchListItem,
+    event: React.MouseEvent<HTMLDivElement>
+  ) => {
+    event.preventDefault()
+
+    const { onRenameBranch, onDeleteBranch } = this.props
+
+    if (onRenameBranch === undefined && onDeleteBranch === undefined) {
+      return
+    }
+
+    const { type, name } = item.branch
+    const isLocal = type === BranchType.Local
+
+    const items = generateBranchContextMenuItems({
+      name,
+      isLocal,
+      onRenameBranch,
+      onDeleteBranch,
+    })
+
+    showContextualMenu(items)
+  }
+
   private onBranchesFilterListRef = (
-    filterList: FilterList<IBranchListItem> | null
+    filterList: SectionFilterList<IBranchListItem> | null
   ) => {
     this.branchFilterList = filterList
   }
 
   private renderItem = (item: IBranchListItem, matches: IMatches) => {
-    return this.props.renderBranch(item, matches)
+    return this.props.renderBranch(
+      item,
+      matches,
+      this.state.commitAuthorDates.get(item.branch.tip.sha)
+    )
   }
 
   private parseHeader(label: string): BranchGroupIdentifier | null {
@@ -222,6 +320,18 @@ export class BranchList extends React.Component<
     }
   }
 
+  private getItemAriaLabel = (item: IBranchListItem) => {
+    return this.props.getBranchAriaLabel(
+      item,
+      this.state.commitAuthorDates.get(item.branch.tip.sha)
+    )
+  }
+
+  private getGroupAriaLabel = (group: number) => {
+    const identifier = this.groups[group].identifier as BranchGroupIdentifier
+    return this.getGroupLabel(identifier)
+  }
+
   private renderGroupHeader = (label: string) => {
     const identifier = this.parseHeader(label)
 
@@ -249,6 +359,7 @@ export class BranchList extends React.Component<
       <NoBranches
         onCreateNewBranch={this.onCreateNewBranch}
         canCreateNewBranch={this.props.canCreateNewBranch}
+        noBranchesMessage={this.props.noBranchesMessage}
       />
     )
   }
diff --git a/app/src/ui/branches/branch-renderer.tsx b/app/src/ui/branches/branch-renderer.tsx
index aedcb1cebc7..410b242039c 100644
--- a/app/src/ui/branches/branch-renderer.tsx
+++ b/app/src/ui/branches/branch-renderer.tsx
@@ -1,34 +1,44 @@
 import * as React from 'react'
 
-import { Branch, BranchType } from '../../models/branch'
+import { Branch } from '../../models/branch'
 
 import { IBranchListItem } from './group-branches'
 import { BranchListItem } from './branch-list-item'
 import { IMatches } from '../../lib/fuzzy-find'
+import { getRelativeTimeInfoFromDate } from '../relative-time'
 
 export function renderDefaultBranch(
   item: IBranchListItem,
   matches: IMatches,
   currentBranch: Branch | null,
-  onRenameBranch?: (branchName: string) => void,
-  onDeleteBranch?: (branchName: string) => void,
+  authorDate: Date | undefined,
   onDropOntoBranch?: (branchName: string) => void,
   onDropOntoCurrentBranch?: () => void
 ): JSX.Element {
   const branch = item.branch
-  const commit = branch.tip
   const currentBranchName = currentBranch ? currentBranch.name : null
   return (
     <BranchListItem
       name={branch.name}
       isCurrentBranch={branch.name === currentBranchName}
-      isLocal={branch.type === BranchType.Local}
-      lastCommitDate={commit ? commit.author.date : null}
+      authorDate={authorDate}
       matches={matches}
-      onRenameBranch={onRenameBranch}
-      onDeleteBranch={onDeleteBranch}
       onDropOntoBranch={onDropOntoBranch}
       onDropOntoCurrentBranch={onDropOntoCurrentBranch}
     />
   )
 }
+
+export function getDefaultAriaLabelForBranch(
+  item: IBranchListItem,
+  authorDate: Date | undefined
+): string {
+  const branch = item.branch
+
+  if (!authorDate) {
+    return branch.name
+  }
+
+  const { relativeText } = getRelativeTimeInfoFromDate(authorDate, true)
+  return `${item.branch.name} ${relativeText}`
+}
diff --git a/app/src/ui/branches/branch-select.tsx b/app/src/ui/branches/branch-select.tsx
new file mode 100644
index 00000000000..909f7dd1eef
--- /dev/null
+++ b/app/src/ui/branches/branch-select.tsx
@@ -0,0 +1,137 @@
+import * as React from 'react'
+import { IMatches } from '../../lib/fuzzy-find'
+import { Branch } from '../../models/branch'
+import { ClickSource } from '../lib/list'
+import { PopoverDropdown } from '../lib/popover-dropdown'
+import { BranchList } from './branch-list'
+import {
+  getDefaultAriaLabelForBranch,
+  renderDefaultBranch,
+} from './branch-renderer'
+import { IBranchListItem } from './group-branches'
+import { Repository } from '../../models/repository'
+
+interface IBranchSelectProps {
+  readonly repository: Repository
+
+  /** The initially selected branch. */
+  readonly branch: Branch | null
+
+  /**
+   * See IBranchesState.defaultBranch
+   */
+  readonly defaultBranch: Branch | null
+
+  /**
+   * The currently checked out branch
+   */
+  readonly currentBranch: Branch
+
+  /**
+   * See IBranchesState.allBranches
+   */
+  readonly allBranches: ReadonlyArray<Branch>
+
+  /**
+   * See IBranchesState.recentBranches
+   */
+  readonly recentBranches: ReadonlyArray<Branch>
+
+  /** Called when the user changes the selected branch. */
+  readonly onChange?: (branch: Branch) => void
+
+  /** Optional: No branches message */
+  readonly noBranchesMessage?: string | JSX.Element
+}
+
+interface IBranchSelectState {
+  readonly selectedBranch: Branch | null
+  readonly filterText: string
+}
+
+/**
+ * A branch select element for filter and selecting a branch.
+ */
+export class BranchSelect extends React.Component<
+  IBranchSelectProps,
+  IBranchSelectState
+> {
+  private popoverRef = React.createRef<PopoverDropdown>()
+
+  public constructor(props: IBranchSelectProps) {
+    super(props)
+
+    this.state = {
+      selectedBranch: props.branch,
+      filterText: '',
+    }
+  }
+
+  private renderBranch = (
+    item: IBranchListItem,
+    matches: IMatches,
+    authorDate: Date | undefined
+  ) => {
+    return renderDefaultBranch(
+      item,
+      matches,
+      this.props.currentBranch,
+      authorDate
+    )
+  }
+
+  private getBranchAriaLabel = (
+    item: IBranchListItem,
+    authorDate: Date | undefined
+  ): string => {
+    return getDefaultAriaLabelForBranch(item, authorDate)
+  }
+
+  private onItemClick = (branch: Branch, source: ClickSource) => {
+    source.event.preventDefault()
+    this.popoverRef.current?.closePopover()
+    this.setState({ selectedBranch: branch })
+    this.props.onChange?.(branch)
+  }
+
+  private onFilterTextChanged = (filterText: string) => {
+    this.setState({ filterText })
+  }
+
+  public render() {
+    const {
+      currentBranch,
+      defaultBranch,
+      recentBranches,
+      allBranches,
+      noBranchesMessage,
+    } = this.props
+
+    const { filterText, selectedBranch } = this.state
+
+    return (
+      <PopoverDropdown
+        contentTitle="Choose a base branch"
+        buttonContent={selectedBranch?.name ?? ''}
+        label="base:"
+        ref={this.popoverRef}
+      >
+        <BranchList
+          repository={this.props.repository}
+          allBranches={allBranches}
+          currentBranch={currentBranch}
+          defaultBranch={defaultBranch}
+          recentBranches={recentBranches}
+          filterText={filterText}
+          onFilterTextChanged={this.onFilterTextChanged}
+          selectedBranch={selectedBranch}
+          canCreateNewBranch={false}
+          renderBranch={this.renderBranch}
+          getBranchAriaLabel={this.getBranchAriaLabel}
+          onItemClick={this.onItemClick}
+          noBranchesMessage={noBranchesMessage}
+        />
+      </PopoverDropdown>
+    )
+  }
+}
diff --git a/app/src/ui/branches/branches-container.tsx b/app/src/ui/branches/branches-container.tsx
index 0b6215c3eb2..fb88733b583 100644
--- a/app/src/ui/branches/branches-container.tsx
+++ b/app/src/ui/branches/branches-container.tsx
@@ -5,7 +5,7 @@ import {
   Repository,
   isRepositoryWithGitHubRepository,
 } from '../../models/repository'
-import { Branch, BranchType } from '../../models/branch'
+import { Branch } from '../../models/branch'
 import { BranchesTab } from '../../models/branches-tab'
 import { PopupType } from '../../models/popup'
 
@@ -17,19 +17,27 @@ import { TabBar } from '../tab-bar'
 
 import { Row } from '../lib/row'
 import { Octicon } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import * as octicons from '../octicons/octicons.generated'
 import { Button } from '../lib/button'
 
 import { BranchList } from './branch-list'
 import { PullRequestList } from './pull-request-list'
 import { IBranchListItem } from './group-branches'
-import { renderDefaultBranch } from './branch-renderer'
+import {
+  getDefaultAriaLabelForBranch,
+  renderDefaultBranch,
+} from './branch-renderer'
 import { IMatches } from '../../lib/fuzzy-find'
 import { startTimer } from '../lib/timing'
 import { dragAndDropManager } from '../../lib/drag-and-drop-manager'
 import { DragType, DropTargetType } from '../../models/drag-drop'
-import { enablePullRequestQuickView } from '../../lib/feature-flag'
+import {
+  enablePullRequestQuickView,
+  enableResizingToolbarButtons,
+} from '../../lib/feature-flag'
 import { PullRequestQuickView } from '../pull-request-quick-view'
+import { Emoji } from '../../lib/emoji'
+import classNames from 'classnames'
 
 interface IBranchesContainerProps {
   readonly dispatcher: Dispatcher
@@ -40,6 +48,8 @@ interface IBranchesContainerProps {
   readonly currentBranch: Branch | null
   readonly recentBranches: ReadonlyArray<Branch>
   readonly pullRequests: ReadonlyArray<PullRequest>
+  readonly onRenameBranch: (branchName: string) => void
+  readonly onDeleteBranch: (branchName: string) => void
 
   /** The pull request associated with the current branch. */
   readonly currentPullRequest: PullRequest | null
@@ -48,7 +58,9 @@ interface IBranchesContainerProps {
   readonly isLoadingPullRequests: boolean
 
   /** Map from the emoji shortcut (e.g., :+1:) to the image's local path. */
-  readonly emoji: Map<string, string>
+  readonly emoji: Map<string, Emoji>
+
+  readonly underlineLinks: boolean
 }
 
 interface IBranchesContainerState {
@@ -105,8 +117,11 @@ export class BranchesContainer extends React.Component<
   }
 
   public render() {
+    const classes = classNames('branches-container', {
+      resizable: enableResizingToolbarButtons(),
+    })
     return (
-      <div className="branches-container">
+      <div className={classes}>
         {this.renderTabBar()}
         {this.renderSelectedTab()}
         {this.renderMergeButtonRow()}
@@ -133,6 +148,7 @@ export class BranchesContainer extends React.Component<
         pullRequestItemTop={prListItemTop}
         onMouseEnter={this.onMouseEnterPullRequestQuickView}
         onMouseLeave={this.onMouseLeavePullRequestQuickView}
+        underlineLinks={this.props.underlineLinks}
       />
     )
   }
@@ -159,11 +175,13 @@ export class BranchesContainer extends React.Component<
 
     return (
       <Row className="merge-button-row">
-        <Button className="merge-button" onClick={this.onMergeClick}>
-          <Octicon className="icon" symbol={OcticonSymbol.gitMerge} />
-          <span title={`Merge a branch into ${currentBranch.name}`}>
-            Choose a branch to merge into <strong>{currentBranch.name}</strong>
-          </span>
+        <Button
+          className="merge-button"
+          onClick={this.onMergeClick}
+          tooltip={`Choose a branch to merge into ${currentBranch.name}`}
+        >
+          <Octicon className="icon" symbol={octicons.gitMerge} />
+          Choose a branch to merge into <strong>{currentBranch.name}</strong>
         </Button>
       </Row>
     )
@@ -190,8 +208,8 @@ export class BranchesContainer extends React.Component<
         selectedIndex={this.props.selectedTab}
         allowDragOverSwitching={true}
       >
-        <span>Branches</span>
-        <span className="pull-request-tab">
+        <span id="branches-tab">Branches</span>
+        <span id="pull-requests-tab" className="pull-request-tab">
           {__DARWIN__ ? 'Pull Requests' : 'Pull requests'}
           {this.renderOpenPullRequestsBubble()}
         </span>
@@ -199,20 +217,50 @@ export class BranchesContainer extends React.Component<
     )
   }
 
-  private renderBranch = (item: IBranchListItem, matches: IMatches) => {
+  private renderBranch = (
+    item: IBranchListItem,
+    matches: IMatches,
+    authorDate: Date | undefined
+  ) => {
     return renderDefaultBranch(
       item,
       matches,
       this.props.currentBranch,
-      this.onRenameBranch,
-      this.onDeleteBranch,
+      authorDate,
       this.onDropOntoBranch,
       this.onDropOntoCurrentBranch
     )
   }
 
+  private getBranchAriaLabel = (
+    item: IBranchListItem,
+    authorDate: Date | undefined
+  ): string => {
+    return getDefaultAriaLabelForBranch(item, authorDate)
+  }
+
   private renderSelectedTab() {
+    const { selectedTab, repository } = this.props
+
+    const ariaLabelledBy =
+      selectedTab === BranchesTab.Branches || !repository.gitHubRepository
+        ? 'branches-tab'
+        : 'pull-requests-tab'
+
+    return (
+      <div
+        role="tabpanel"
+        aria-labelledby={ariaLabelledBy}
+        className="branches-container-panel"
+      >
+        {this.renderSelectedTabContent()}
+      </div>
+    )
+  }
+
+  private renderSelectedTabContent() {
     let tab = this.props.selectedTab
+
     if (!this.props.repository.gitHubRepository) {
       tab = BranchesTab.Branches
     }
@@ -221,6 +269,7 @@ export class BranchesContainer extends React.Component<
       case BranchesTab.Branches:
         return (
           <BranchList
+            repository={this.props.repository}
             defaultBranch={this.props.defaultBranch}
             currentBranch={this.props.currentBranch}
             allBranches={this.props.allBranches}
@@ -233,13 +282,15 @@ export class BranchesContainer extends React.Component<
             canCreateNewBranch={true}
             onCreateNewBranch={this.onCreateBranchWithName}
             renderBranch={this.renderBranch}
+            getBranchAriaLabel={this.getBranchAriaLabel}
             hideFilterRow={dragAndDropManager.isDragOfTypeInProgress(
               DragType.Commit
             )}
             renderPreList={this.renderPreList}
+            onRenameBranch={this.props.onRenameBranch}
+            onDeleteBranch={this.props.onDeleteBranch}
           />
         )
-
       case BranchesTab.PullRequests: {
         return this.renderPullRequests()
       }
@@ -256,13 +307,14 @@ export class BranchesContainer extends React.Component<
     const label = __DARWIN__ ? 'New Branch' : 'New branch'
 
     return (
+      // eslint-disable-next-line jsx-a11y/no-static-element-interactions
       <div
         className="branches-list-item new-branch-drop"
         onMouseEnter={this.onMouseEnterNewBranchDrop}
         onMouseLeave={this.onMouseLeaveNewBranchDrop}
         onMouseUp={this.onMouseUpNewBranchDrop}
       >
-        <Octicon className="icon" symbol={OcticonSymbol.plus} />
+        <Octicon className="icon" symbol={octicons.plus} />
         <div className="name">{label}</div>
       </div>
     )
@@ -321,7 +373,6 @@ export class BranchesContainer extends React.Component<
         isOnDefaultBranch={!!isOnDefaultBranch}
         onSelectionChanged={this.onPullRequestSelectionChanged}
         onCreateBranch={this.onCreateBranch}
-        onDismiss={this.onDismiss}
         dispatcher={this.props.dispatcher}
         repository={repository}
         isLoadingPullRequests={this.props.isLoadingPullRequests}
@@ -355,10 +406,6 @@ export class BranchesContainer extends React.Component<
     this.props.dispatcher.changeBranchesTab(tab)
   }
 
-  private onDismiss = () => {
-    this.props.dispatcher.closeFoldout(FoldoutType.Branch)
-  }
-
   private onMergeClick = () => {
     this.props.dispatcher.closeFoldout(FoldoutType.Branch)
     this.props.dispatcher.startMergeBranchOperation(this.props.repository)
@@ -401,52 +448,6 @@ export class BranchesContainer extends React.Component<
     this.setState({ selectedPullRequest })
   }
 
-  private getBranchWithName(branchName: string): Branch | undefined {
-    return this.props.allBranches.find(branch => branch.name === branchName)
-  }
-
-  private onRenameBranch = (branchName: string) => {
-    const branch = this.getBranchWithName(branchName)
-
-    if (branch === undefined) {
-      return
-    }
-
-    this.props.dispatcher.showPopup({
-      type: PopupType.RenameBranch,
-      repository: this.props.repository,
-      branch: branch,
-    })
-  }
-
-  private onDeleteBranch = async (branchName: string) => {
-    const branch = this.getBranchWithName(branchName)
-
-    if (branch === undefined) {
-      return
-    }
-
-    if (branch.type === BranchType.Remote) {
-      this.props.dispatcher.showPopup({
-        type: PopupType.DeleteRemoteBranch,
-        repository: this.props.repository,
-        branch,
-      })
-      return
-    }
-
-    const aheadBehind = await this.props.dispatcher.getBranchAheadBehind(
-      this.props.repository,
-      branch
-    )
-    this.props.dispatcher.showPopup({
-      type: PopupType.DeleteBranch,
-      repository: this.props.repository,
-      branch,
-      existsOnRemote: aheadBehind !== null,
-    })
-  }
-
   /**
    * Method is to handle when something is dragged and dropped onto a branch
    * in the branch dropdown.
@@ -477,7 +478,7 @@ export class BranchesContainer extends React.Component<
 
   private onDropOntoCurrentBranch = () => {
     if (dragAndDropManager.isDragOfType(DragType.Commit)) {
-      this.props.dispatcher.recordDragStartedAndCanceled()
+      this.props.dispatcher.incrementMetric('dragStartedAndCanceledCount')
     }
   }
 
diff --git a/app/src/ui/branches/ci-status.tsx b/app/src/ui/branches/ci-status.tsx
index 994062ce33b..3e101379a4b 100644
--- a/app/src/ui/branches/ci-status.tsx
+++ b/app/src/ui/branches/ci-status.tsx
@@ -1,15 +1,11 @@
 import * as React from 'react'
-import { Octicon, OcticonSymbolType } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import { Octicon, OcticonSymbol } from '../octicons'
+import * as octicons from '../octicons/octicons.generated'
 import classNames from 'classnames'
 import { GitHubRepository } from '../../models/github-repository'
 import { DisposableLike } from 'event-kit'
 import { Dispatcher } from '../dispatcher'
-import {
-  ICombinedRefCheck,
-  IRefCheck,
-  isSuccess,
-} from '../../lib/ci-checks/ci-checks'
+import { ICombinedRefCheck, IRefCheck } from '../../lib/ci-checks/ci-checks'
 import { IAPIWorkflowJobStep } from '../../lib/api'
 
 interface ICIStatusProps {
@@ -115,7 +111,6 @@ export class CIStatus extends React.PureComponent<
           this.props.className
         )}
         symbol={getSymbolForCheck(check)}
-        title={getRefCheckSummary(check)}
       />
     )
   }
@@ -123,28 +118,28 @@ export class CIStatus extends React.PureComponent<
 
 export function getSymbolForCheck(
   check: ICombinedRefCheck | IRefCheck | IAPIWorkflowJobStep
-): OcticonSymbolType {
+): OcticonSymbol {
   switch (check.conclusion) {
     case 'timed_out':
-      return OcticonSymbol.x
+      return octicons.x
     case 'failure':
-      return OcticonSymbol.x
+      return octicons.x
     case 'neutral':
-      return OcticonSymbol.squareFill
+      return octicons.squareFill
     case 'success':
-      return OcticonSymbol.check
+      return octicons.check
     case 'cancelled':
-      return OcticonSymbol.stop
+      return octicons.stop
     case 'action_required':
-      return OcticonSymbol.alert
+      return octicons.alert
     case 'skipped':
-      return OcticonSymbol.skip
+      return octicons.skip
     case 'stale':
-      return OcticonSymbol.issueReopened
+      return octicons.issueReopened
   }
 
   // Pending
-  return OcticonSymbol.dotFill
+  return octicons.dotFill
 }
 
 export function getClassNameForCheck(
@@ -170,12 +165,12 @@ export function getClassNameForCheck(
 
 export function getSymbolForLogStep(
   logStep: IAPIWorkflowJobStep
-): OcticonSymbolType {
+): OcticonSymbol {
   switch (logStep.conclusion) {
     case 'success':
-      return OcticonSymbol.checkCircleFill
+      return octicons.checkCircleFill
     case 'failure':
-      return OcticonSymbol.xCircleFill
+      return octicons.xCircleFill
   }
 
   return getSymbolForCheck(logStep)
@@ -190,20 +185,3 @@ export function getClassNameForLogStep(logStep: IAPIWorkflowJobStep): string {
   // Pending
   return ''
 }
-
-/**
- * Convert the combined check to an app-friendly string.
- */
-export function getRefCheckSummary(check: ICombinedRefCheck): string {
-  if (check.checks.length === 1) {
-    const { name, description } = check.checks[0]
-    return `${name}: ${description}`
-  }
-
-  const successCount = check.checks.reduce(
-    (acc, cur) => acc + (isSuccess(cur) ? 1 : 0),
-    0
-  )
-
-  return `${successCount}/${check.checks.length} checks OK`
-}
diff --git a/app/src/ui/branches/no-branches.tsx b/app/src/ui/branches/no-branches.tsx
index 65a3baac540..3e5b99f3afc 100644
--- a/app/src/ui/branches/no-branches.tsx
+++ b/app/src/ui/branches/no-branches.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react'
 import { encodePathAsUrl } from '../../lib/path'
 import { Button } from '../lib/button'
+import { KeyboardShortcut } from '../keyboard-shortcut/keyboard-shortcut'
 
 const BlankSlateImage = encodePathAsUrl(
   __dirname,
@@ -12,6 +13,8 @@ interface INoBranchesProps {
   readonly onCreateNewBranch: () => void
   /** True to display the UI elements for creating a new branch, false to hide them */
   readonly canCreateNewBranch: boolean
+  /** Optional: No branches message */
+  readonly noBranchesMessage?: string | JSX.Element
 }
 
 export class NoBranches extends React.Component<INoBranchesProps> {
@@ -19,7 +22,7 @@ export class NoBranches extends React.Component<INoBranchesProps> {
     if (this.props.canCreateNewBranch) {
       return (
         <div className="no-branches">
-          <img src={BlankSlateImage} className="blankslate-image" />
+          <img src={BlankSlateImage} className="blankslate-image" alt="" />
 
           <div className="title">Sorry, I can't find that branch</div>
 
@@ -36,29 +39,21 @@ export class NoBranches extends React.Component<INoBranchesProps> {
           </Button>
 
           <div className="protip">
-            ProTip! Press {this.renderShortcut()} to quickly create a new branch
-            from anywhere within the app
+            ProTip! Press{' '}
+            <KeyboardShortcut
+              darwinKeys={['⌘', '⇧', 'N']}
+              keys={['Ctrl', 'Shift', 'N']}
+            />{' '}
+            to quickly create a new branch from anywhere within the app
           </div>
         </div>
       )
     }
 
-    return <div className="no-branches">Sorry, I can't find that branch</div>
-  }
-
-  private renderShortcut() {
-    if (__DARWIN__) {
-      return (
-        <span>
-          <kbd>⌘</kbd> + <kbd>⇧</kbd> + <kbd>N</kbd>
-        </span>
-      )
-    } else {
-      return (
-        <span>
-          <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>N</kbd>
-        </span>
-      )
-    }
+    return (
+      <div className="no-branches">
+        {this.props.noBranchesMessage ?? "Sorry, I can't find that branch"}
+      </div>
+    )
   }
 }
diff --git a/app/src/ui/branches/no-pull-requests.tsx b/app/src/ui/branches/no-pull-requests.tsx
index 2ff762b621a..ab4d870d763 100644
--- a/app/src/ui/branches/no-pull-requests.tsx
+++ b/app/src/ui/branches/no-pull-requests.tsx
@@ -33,7 +33,7 @@ export class NoPullRequests extends React.Component<INoPullRequestsProps, {}> {
   public render() {
     return (
       <div className="no-pull-requests">
-        <img src={BlankSlateImage} className="blankslate-image" />
+        <img src={BlankSlateImage} className="blankslate-image" alt="" />
         {this.renderTitle()}
         {this.renderCallToAction()}
       </div>
diff --git a/app/src/ui/branches/pull-request-badge.tsx b/app/src/ui/branches/pull-request-badge.tsx
index dc34db63473..69b10ad937b 100644
--- a/app/src/ui/branches/pull-request-badge.tsx
+++ b/app/src/ui/branches/pull-request-badge.tsx
@@ -3,8 +3,8 @@ import { CIStatus } from './ci-status'
 import { GitHubRepository } from '../../models/github-repository'
 import { Dispatcher } from '../dispatcher'
 import { ICombinedRefCheck } from '../../lib/ci-checks/ci-checks'
-import { enableCICheckRuns } from '../../lib/feature-flag'
 import { getPullRequestCommitRef } from '../../models/pull-request'
+import { Button } from '../lib/button'
 
 interface IPullRequestBadgeProps {
   /** The pull request's number. */
@@ -15,6 +15,11 @@ interface IPullRequestBadgeProps {
   /** The GitHub repository to use when looking up commit status. */
   readonly repository: GitHubRepository
 
+  /** Whether or not the check runs popover is open */
+  readonly showCIStatusPopover?: boolean
+
+  readonly onBadgeRef?: (ref: HTMLButtonElement | null) => void
+
   /** The GitHub repository to use when looking up commit status. */
   readonly onBadgeClick?: () => void
 
@@ -33,7 +38,7 @@ export class PullRequestBadge extends React.Component<
   IPullRequestBadgeProps,
   IPullRequestBadgeState
 > {
-  private badgeRef: HTMLDivElement | null = null
+  private badgeRef: HTMLButtonElement | null = null
   private badgeBoundingBottom: number = 0
 
   public constructor(props: IPullRequestBadgeProps) {
@@ -56,14 +61,13 @@ export class PullRequestBadge extends React.Component<
     }
   }
 
-  private onRef = (badgeRef: HTMLDivElement) => {
+  private onRef = (badgeRef: HTMLButtonElement | null) => {
     this.badgeRef = badgeRef
+    this.props.onBadgeRef?.(badgeRef)
   }
 
-  private onBadgeClick = (
-    event: React.MouseEvent<HTMLDivElement, MouseEvent>
-  ) => {
-    if (!this.state.isStatusShowing || !enableCICheckRuns()) {
+  private onBadgeClick = (event: React.MouseEvent<HTMLButtonElement>) => {
+    if (!this.state.isStatusShowing) {
       return
     }
 
@@ -78,7 +82,14 @@ export class PullRequestBadge extends React.Component<
   public render() {
     const ref = getPullRequestCommitRef(this.props.number)
     return (
-      <div className="pr-badge" onClick={this.onBadgeClick} ref={this.onRef}>
+      <Button
+        className="pr-badge"
+        onClick={this.onBadgeClick}
+        onButtonRef={this.onRef}
+        disabled={!this.state.isStatusShowing}
+        ariaHaspopup={true}
+        ariaExpanded={this.props.showCIStatusPopover === true}
+      >
         <span className="number">#{this.props.number}</span>
         <CIStatus
           commitRef={ref}
@@ -86,7 +97,7 @@ export class PullRequestBadge extends React.Component<
           repository={this.props.repository}
           onCheckChange={this.onCheckChange}
         />
-      </div>
+      </Button>
     )
   }
 }
diff --git a/app/src/ui/branches/pull-request-list-item-context-menu.tsx b/app/src/ui/branches/pull-request-list-item-context-menu.tsx
new file mode 100644
index 00000000000..86adbb4b557
--- /dev/null
+++ b/app/src/ui/branches/pull-request-list-item-context-menu.tsx
@@ -0,0 +1,21 @@
+import { IMenuItem } from '../../lib/menu-item'
+
+interface IPullRequestContextMenuConfig {
+  onViewPullRequestOnGitHub?: () => void
+}
+
+export function generatePullRequestContextMenuItems(
+  config: IPullRequestContextMenuConfig
+): IMenuItem[] {
+  const { onViewPullRequestOnGitHub } = config
+  const items = new Array<IMenuItem>()
+
+  if (onViewPullRequestOnGitHub !== undefined) {
+    items.push({
+      label: 'View Pull Request on GitHub',
+      action: () => onViewPullRequestOnGitHub(),
+    })
+  }
+
+  return items
+}
diff --git a/app/src/ui/branches/pull-request-list-item.tsx b/app/src/ui/branches/pull-request-list-item.tsx
index 23cabc57154..c28d5cb7c32 100644
--- a/app/src/ui/branches/pull-request-list-item.tsx
+++ b/app/src/ui/branches/pull-request-list-item.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react'
 import classNames from 'classnames'
 import { Octicon } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import * as octicons from '../octicons/octicons.generated'
 import { CIStatus } from './ci-status'
 import { HighlightText } from '../lib/highlight-text'
 import { IMatches } from '../../lib/fuzzy-find'
@@ -11,6 +11,7 @@ import { dragAndDropManager } from '../../lib/drag-and-drop-manager'
 import { DropTargetType } from '../../models/drag-drop'
 import { getPullRequestCommitRef } from '../../models/pull-request'
 import { formatRelative } from '../../lib/format-relative'
+import { TooltippedContent } from '../lib/tooltipped-content'
 
 export interface IPullRequestListItemProps {
   /** The title. */
@@ -126,6 +127,7 @@ export class PullRequestListItem extends React.Component<
     })
 
     return (
+      // eslint-disable-next-line jsx-a11y/no-static-element-interactions
       <div
         className={className}
         onMouseEnter={this.onMouseEnter}
@@ -137,18 +139,28 @@ export class PullRequestListItem extends React.Component<
             className="icon"
             symbol={
               this.props.draft
-                ? OcticonSymbol.gitPullRequestDraft
-                : OcticonSymbol.gitPullRequest
+                ? octicons.gitPullRequestDraft
+                : octicons.gitPullRequest
             }
           />
         </div>
         <div className="info">
-          <div className="title" title={title}>
+          <TooltippedContent
+            tagName="div"
+            className="title"
+            tooltip={title}
+            onlyWhenOverflowed={true}
+          >
             <HighlightText text={title || ''} highlight={matches.title} />
-          </div>
-          <div className="subtitle" title={subtitle}>
+          </TooltippedContent>
+          <TooltippedContent
+            tagName="div"
+            className="subtitle"
+            tooltip={subtitle}
+            onlyWhenOverflowed={true}
+          >
             <HighlightText text={subtitle || ''} highlight={matches.subtitle} />
-          </div>
+          </TooltippedContent>
         </div>
         {this.renderPullRequestStatus()}
       </div>
diff --git a/app/src/ui/branches/pull-request-list.tsx b/app/src/ui/branches/pull-request-list.tsx
index 28054d18786..8125d5ef393 100644
--- a/app/src/ui/branches/pull-request-list.tsx
+++ b/app/src/ui/branches/pull-request-list.tsx
@@ -1,6 +1,5 @@
 import * as React from 'react'
 import {
-  FilterList,
   IFilterListGroup,
   IFilterListItem,
   SelectionSource,
@@ -21,6 +20,10 @@ import { startTimer } from '../lib/timing'
 import { DragType } from '../../models/drag-drop'
 import { dragAndDropManager } from '../../lib/drag-and-drop-manager'
 import { formatRelative } from '../../lib/format-relative'
+import { AriaLiveContainer } from '../accessibility/aria-live-container'
+import { SectionFilterList } from '../lib/section-filter-list'
+import { generatePullRequestContextMenuItems } from './pull-request-list-item-context-menu'
+import { showContextualMenu } from '../../lib/menu-item'
 
 interface IPullRequestListItem extends IFilterListItem {
   readonly id: string
@@ -40,9 +43,6 @@ interface IPullRequestListProps {
   /** Is the default branch currently checked out? */
   readonly isOnDefaultBranch: boolean
 
-  /** Called when the user wants to dismiss the foldout. */
-  readonly onDismiss: () => void
-
   /** Called when the user opts to create a branch */
   readonly onCreateBranch: () => void
 
@@ -52,14 +52,6 @@ interface IPullRequestListProps {
     source: SelectionSource
   ) => void
 
-  /**
-   * Called when a key down happens in the filter field. Users have a chance to
-   * respond or cancel the default behavior by calling `preventDefault`.
-   */
-  readonly onFilterKeyDown?: (
-    event: React.KeyboardEvent<HTMLInputElement>
-  ) => void
-
   readonly dispatcher: Dispatcher
   readonly repository: RepositoryWithGitHubRepository
 
@@ -82,6 +74,7 @@ interface IPullRequestListState {
   readonly filterText: string
   readonly groupedItems: ReadonlyArray<IFilterListGroup<IPullRequestListItem>>
   readonly selectedItem: IPullRequestListItem | null
+  readonly screenReaderStateMessage: string | null
 }
 
 function resolveSelectedItem(
@@ -120,6 +113,7 @@ export class PullRequestList extends React.Component<
       filterText: '',
       groupedItems: [group],
       selectedItem,
+      screenReaderStateMessage: null,
     }
   }
 
@@ -130,27 +124,47 @@ export class PullRequestList extends React.Component<
       nextProps,
       this.state.selectedItem
     )
-    this.setState({ groupedItems: [group], selectedItem })
+
+    const loadingStarted =
+      !this.props.isLoadingPullRequests && nextProps.isLoadingPullRequests
+    const loadingComplete =
+      this.props.isLoadingPullRequests && !nextProps.isLoadingPullRequests
+    const numPullRequests = this.props.pullRequests.length
+    const plural = numPullRequests === 1 ? '' : 's'
+    const screenReaderStateMessage = loadingStarted
+      ? 'Hang Tight. Loading pull requests as fast as I can!'
+      : loadingComplete
+      ? `${numPullRequests} pull request${plural} found`
+      : null
+
+    this.setState({
+      groupedItems: [group],
+      selectedItem,
+      screenReaderStateMessage,
+    })
   }
 
   public render() {
     return (
-      <FilterList<IPullRequestListItem>
-        className="pull-request-list"
-        rowHeight={RowHeight}
-        groups={this.state.groupedItems}
-        selectedItem={this.state.selectedItem}
-        renderItem={this.renderPullRequest}
-        filterText={this.state.filterText}
-        onFilterTextChanged={this.onFilterTextChanged}
-        invalidationProps={this.props.pullRequests}
-        onItemClick={this.onItemClick}
-        onSelectionChanged={this.onSelectionChanged}
-        onFilterKeyDown={this.props.onFilterKeyDown}
-        renderGroupHeader={this.renderListHeader}
-        renderNoItems={this.renderNoItems}
-        renderPostFilter={this.renderPostFilter}
-      />
+      <>
+        <SectionFilterList<IPullRequestListItem>
+          className="pull-request-list"
+          rowHeight={RowHeight}
+          groups={this.state.groupedItems}
+          selectedItem={this.state.selectedItem}
+          renderItem={this.renderPullRequest}
+          filterText={this.state.filterText}
+          onFilterTextChanged={this.onFilterTextChanged}
+          invalidationProps={this.props.pullRequests}
+          onItemContextMenu={this.onPullRequestItemContextMenu}
+          onItemClick={this.onItemClick}
+          onSelectionChanged={this.onSelectionChanged}
+          renderGroupHeader={this.renderListHeader}
+          renderNoItems={this.renderNoItems}
+          renderPostFilter={this.renderPostFilter}
+        />
+        <AriaLiveContainer message={this.state.screenReaderStateMessage} />
+      </>
     )
   }
 
@@ -190,6 +204,21 @@ export class PullRequestList extends React.Component<
     )
   }
 
+  private onPullRequestItemContextMenu = (
+    item: IPullRequestListItem,
+    event: React.MouseEvent<HTMLDivElement>
+  ): void => {
+    event.preventDefault()
+
+    const items = generatePullRequestContextMenuItems({
+      onViewPullRequestOnGitHub: () => {
+        this.props.dispatcher.showPullRequestByPR(item.pullRequest)
+      },
+    })
+
+    showContextualMenu(items)
+  }
+
   private onMouseEnterPullRequest = (
     prNumber: number,
     prListItemTop: number
@@ -228,7 +257,7 @@ export class PullRequestList extends React.Component<
       prNumber === selectedPullRequest.pullRequestNumber
     ) {
       dispatcher.endMultiCommitOperation(repository)
-      dispatcher.recordDragStartedAndCanceled()
+      dispatcher.incrementMetric('dragStartedAndCanceledCount')
       return
     }
 
@@ -289,11 +318,14 @@ export class PullRequestList extends React.Component<
   }
 
   private renderPostFilter = () => {
+    const tooltip = 'Refresh the list of pull requests'
+
     return (
       <Button
         disabled={this.props.isLoadingPullRequests}
         onClick={this.onRefreshPullRequests}
-        tooltip="Refresh the list of pull requests"
+        ariaLabel={tooltip}
+        tooltip={tooltip}
       >
         <Octicon
           symbol={syncClockwise}
diff --git a/app/src/ui/branches/push-branch-commits.tsx b/app/src/ui/branches/push-branch-commits.tsx
index 76b3ec95f42..e24a1044089 100644
--- a/app/src/ui/branches/push-branch-commits.tsx
+++ b/app/src/ui/branches/push-branch-commits.tsx
@@ -86,6 +86,8 @@ export class PushBranchCommits extends React.Component<
         onSubmit={this.onSubmit}
         loading={this.state.isPushingOrPublishing}
         disabled={this.state.isPushingOrPublishing}
+        role="alertdialog"
+        ariaDescribedBy="push-branch-commits-title push-branch-commits-message"
       >
         {this.renderDialogContent()}
 
@@ -98,8 +100,10 @@ export class PushBranchCommits extends React.Component<
     if (renderPublishView(this.props.unPushedCommits)) {
       return (
         <DialogContent>
-          <p>Your branch must be published before opening a pull request.</p>
-          <p>
+          <p id="push-branch-commits-title">
+            Your branch must be published before opening a pull request.
+          </p>
+          <p id="push-branch-commits-message">
             Would you like to publish <Ref>{this.props.branch.name}</Ref> now
             and open a pull request?
           </p>
@@ -111,10 +115,10 @@ export class PushBranchCommits extends React.Component<
 
     return (
       <DialogContent>
-        <p>
+        <p id="push-branch-commits-title">
           You have {localCommits} that haven't been pushed to the remote yet.
         </p>
-        <p>
+        <p id="push-branch-commits-message">
           Would you like to push your changes to{' '}
           <Ref>{this.props.branch.name}</Ref> before creating your pull request?
         </p>
diff --git a/app/src/ui/change-repository-alias/change-repository-alias-dialog.tsx b/app/src/ui/change-repository-alias/change-repository-alias-dialog.tsx
index 26ec91cd719..0685ca36cfd 100644
--- a/app/src/ui/change-repository-alias/change-repository-alias-dialog.tsx
+++ b/app/src/ui/change-repository-alias/change-repository-alias-dialog.tsx
@@ -36,13 +36,17 @@ export class ChangeRepositoryAlias extends React.Component<
         title={
           __DARWIN__ ? `${verb} Repository Alias` : `${verb} repository alias`
         }
+        ariaDescribedBy="change-repository-alias-description"
         onDismissed={this.props.onDismissed}
         onSubmit={this.changeAlias}
       >
         <DialogContent>
-          <p>Choose a new alias for the repository "{nameOf(repository)}". </p>
+          <p id="change-repository-alias-description">
+            Choose a new alias for the repository "{nameOf(repository)}".{' '}
+          </p>
           <p>
             <TextBox
+              ariaLabel="Alias"
               value={this.state.newAlias}
               onValueChanged={this.onNameChanged}
             />
diff --git a/app/src/ui/changes/changed-file.tsx b/app/src/ui/changes/changed-file.tsx
index 39372f84a8b..131ff726bca 100644
--- a/app/src/ui/changes/changed-file.tsx
+++ b/app/src/ui/changes/changed-file.tsx
@@ -6,19 +6,17 @@ import { Checkbox, CheckboxValue } from '../lib/checkbox'
 import { mapStatus } from '../../lib/status'
 import { WorkingDirectoryFileChange } from '../../models/status'
 import { TooltipDirection } from '../lib/tooltip'
+import { TooltippedContent } from '../lib/tooltipped-content'
+import { AriaLiveContainer } from '../accessibility/aria-live-container'
 
 interface IChangedFileProps {
   readonly file: WorkingDirectoryFileChange
   readonly include: boolean | null
   readonly availableWidth: number
   readonly disableSelection: boolean
+  readonly checkboxTooltip?: string
+  readonly focused: boolean
   readonly onIncludeChanged: (path: string, include: boolean) => void
-
-  /** Callback called when user right-clicks on an item */
-  readonly onContextMenu: (
-    file: WorkingDirectoryFileChange,
-    event: React.MouseEvent<HTMLDivElement>
-  ) => void
 }
 
 /** a changed file in the working directory for a given repository */
@@ -39,7 +37,9 @@ export class ChangedFile extends React.Component<IChangedFileProps, {}> {
   }
 
   public render() {
-    const { status, path } = this.props.file
+    const { file, availableWidth, disableSelection, checkboxTooltip, focused } =
+      this.props
+    const { status, path } = file
     const fileStatus = mapStatus(status)
 
     const listItemPadding = 10 * 2
@@ -48,41 +48,61 @@ export class ChangedFile extends React.Component<IChangedFileProps, {}> {
     const filePadding = 5
 
     const availablePathWidth =
-      this.props.availableWidth -
+      availableWidth -
       listItemPadding -
       checkboxWidth -
       filePadding -
       statusWidth
 
+    const includedText =
+      this.props.include === true
+        ? 'included'
+        : this.props.include === undefined
+        ? 'partially included'
+        : 'not included'
+
+    const pathScreenReaderMessage = `${path} ${mapStatus(
+      status
+    )} ${includedText}`
+
     return (
-      <div className="file" onContextMenu={this.onContextMenu}>
-        <Checkbox
-          // The checkbox doesn't need to be tab reachable since we emulate
-          // checkbox behavior on the list item itself, ie hitting space bar
-          // while focused on a row will toggle selection.
-          tabIndex={-1}
-          value={this.checkboxValue}
-          onChange={this.handleCheckboxChange}
-          disabled={this.props.disableSelection}
-        />
+      <div className="file">
+        <TooltippedContent
+          tooltip={checkboxTooltip}
+          direction={TooltipDirection.EAST}
+          tagName="div"
+        >
+          <Checkbox
+            // The checkbox doesn't need to be tab reachable since we emulate
+            // checkbox behavior on the list item itself, ie hitting space bar
+            // while focused on a row will toggle selection.
+            tabIndex={-1}
+            value={this.checkboxValue}
+            onChange={this.handleCheckboxChange}
+            disabled={disableSelection}
+          />
+        </TooltippedContent>
 
         <PathLabel
           path={path}
           status={status}
           availableWidth={availablePathWidth}
+          ariaHidden={true}
         />
 
-        <Octicon
-          symbol={iconForStatus(status)}
-          className={'status status-' + fileStatus.toLowerCase()}
-          title={fileStatus}
-          tooltipDirection={TooltipDirection.EAST}
-        />
+        <AriaLiveContainer message={pathScreenReaderMessage} />
+        <TooltippedContent
+          ancestorFocused={focused}
+          openOnFocus={true}
+          tooltip={fileStatus}
+          direction={TooltipDirection.EAST}
+        >
+          <Octicon
+            symbol={iconForStatus(status)}
+            className={'status status-' + fileStatus.toLowerCase()}
+          />
+        </TooltippedContent>
       </div>
     )
   }
-
-  private onContextMenu = (event: React.MouseEvent<HTMLDivElement>) => {
-    this.props.onContextMenu(this.props.file, event)
-  }
 }
diff --git a/app/src/ui/changes/changes-list.tsx b/app/src/ui/changes/changes-list.tsx
index 9970ca7b233..bcfa973bf4f 100644
--- a/app/src/ui/changes/changes-list.tsx
+++ b/app/src/ui/changes/changes-list.tsx
@@ -17,7 +17,7 @@ import {
   Repository,
 } from '../../models/repository'
 import { Account } from '../../models/account'
-import { IAuthor } from '../../models/author'
+import { Author, UnknownAuthor } from '../../models/author'
 import { List, ClickSource } from '../lib/list'
 import { Checkbox, CheckboxValue } from '../lib/checkbox'
 import {
@@ -44,31 +44,35 @@ import {
   Foldout,
 } from '../../lib/app-state'
 import { ContinueRebase } from './continue-rebase'
-import { Octicon } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import { Octicon, OcticonSymbolVariant } from '../octicons'
+import * as octicons from '../octicons/octicons.generated'
 import { IStashEntry } from '../../models/stash-entry'
 import classNames from 'classnames'
 import { hasWritePermission } from '../../models/github-repository'
 import { hasConflictedFiles } from '../../lib/status'
 import { createObservableRef } from '../lib/observable-ref'
-import { Tooltip, TooltipDirection } from '../lib/tooltip'
+import { TooltipDirection } from '../lib/tooltip'
 import { Popup } from '../../models/popup'
 import { EOL } from 'os'
+import { TooltippedContent } from '../lib/tooltipped-content'
+import { RepoRulesInfo } from '../../models/repo-rules'
+import { IAheadBehind } from '../../models/branch'
+import { StashDiffViewerId } from '../stashing'
 
 const RowHeight = 29
-const StashIcon: OcticonSymbol.OcticonSymbolType = {
+const StashIcon: OcticonSymbolVariant = {
   w: 16,
   h: 16,
-  d:
+  p: [
     'M10.5 1.286h-9a.214.214 0 0 0-.214.214v9a.214.214 0 0 0 .214.214h9a.214.214 0 0 0 ' +
-    '.214-.214v-9a.214.214 0 0 0-.214-.214zM1.5 0h9A1.5 1.5 0 0 1 12 1.5v9a1.5 1.5 0 0 1-1.5 ' +
-    '1.5h-9A1.5 1.5 0 0 1 0 10.5v-9A1.5 1.5 0 0 1 1.5 0zm5.712 7.212a1.714 1.714 0 1 ' +
-    '1-2.424-2.424 1.714 1.714 0 0 1 2.424 2.424zM2.015 12.71c.102.729.728 1.29 1.485 ' +
-    '1.29h9a1.5 1.5 0 0 0 1.5-1.5v-9a1.5 1.5 0 0 0-1.29-1.485v1.442a.216.216 0 0 1 ' +
-    '.004.043v9a.214.214 0 0 1-.214.214h-9a.216.216 0 0 1-.043-.004H2.015zm2 2c.102.729.728 ' +
-    '1.29 1.485 1.29h9a1.5 1.5 0 0 0 1.5-1.5v-9a1.5 1.5 0 0 0-1.29-1.485v1.442a.216.216 0 0 1 ' +
-    '.004.043v9a.214.214 0 0 1-.214.214h-9a.216.216 0 0 1-.043-.004H4.015z',
-  fr: 'evenodd',
+      '.214-.214v-9a.214.214 0 0 0-.214-.214zM1.5 0h9A1.5 1.5 0 0 1 12 1.5v9a1.5 1.5 0 0 1-1.5 ' +
+      '1.5h-9A1.5 1.5 0 0 1 0 10.5v-9A1.5 1.5 0 0 1 1.5 0zm5.712 7.212a1.714 1.714 0 1 ' +
+      '1-2.424-2.424 1.714 1.714 0 0 1 2.424 2.424zM2.015 12.71c.102.729.728 1.29 1.485 ' +
+      '1.29h9a1.5 1.5 0 0 0 1.5-1.5v-9a1.5 1.5 0 0 0-1.29-1.485v1.442a.216.216 0 0 1 ' +
+      '.004.043v9a.214.214 0 0 1-.214.214h-9a.216.216 0 0 1-.043-.004H2.015zm2 2c.102.729.728 ' +
+      '1.29 1.485 1.29h9a1.5 1.5 0 0 0 1.5-1.5v-9a1.5 1.5 0 0 0-1.29-1.485v1.442a.216.216 0 0 1 ' +
+      '.004.043v9a.214.214 0 0 1-.214.214h-9a.216.216 0 0 1-.043-.004H4.015z',
+  ],
 }
 
 const GitIgnoreFileName = '.gitignore'
@@ -131,6 +135,8 @@ interface IChangesListProps {
   readonly onDiscardChanges: (file: WorkingDirectoryFileChange) => void
   readonly askForConfirmationOnDiscardChanges: boolean
   readonly focusCommitMessage: boolean
+  readonly isShowingModal: boolean
+  readonly isShowingFoldout: boolean
   readonly onDiscardChangesFromFiles: (
     files: ReadonlyArray<WorkingDirectoryFileChange>,
     isDiscardingAllChanges: boolean
@@ -143,11 +149,19 @@ interface IChangesListProps {
   readonly changesListScrollTop?: number
 
   /**
-   * Called to open a file it its default application
+   * Called to open a file in its default application
    *
    * @param path The path of the file relative to the root of the repository
    */
   readonly onOpenItem: (path: string) => void
+
+  /**
+   * Called to open a file in the default external editor
+   *
+   * @param path The path of the file relative to the root of the repository
+   */
+  readonly onOpenItemInExternalEditor: (path: string) => void
+
   /**
    * The currently checked out branch (null if no branch is checked out).
    */
@@ -158,6 +172,8 @@ interface IChangesListProps {
   readonly isCommitting: boolean
   readonly commitToAmend: Commit | null
   readonly currentBranchProtected: boolean
+  readonly currentRepoRulesInfo: RepoRulesInfo
+  readonly aheadBehind: IAheadBehind | null
 
   /**
    * Click event handler passed directly to the onRowClick prop of List, see
@@ -188,18 +204,11 @@ interface IChangesListProps {
    * Co-Authored-By commit message trailers depending on whether
    * the user has chosen to do so.
    */
-  readonly coAuthors: ReadonlyArray<IAuthor>
+  readonly coAuthors: ReadonlyArray<Author>
 
   /** The name of the currently selected external editor */
   readonly externalEditorLabel?: string
 
-  /**
-   * Callback to open a selected file using the configured external editor
-   *
-   * @param fullPath The full path to the file on disk
-   */
-  readonly onOpenInExternalEditor: (fullPath: string) => void
-
   readonly stashEntry: IStashEntry | null
 
   readonly isShowingStashEntry: boolean
@@ -211,10 +220,15 @@ interface IChangesListProps {
   readonly shouldNudgeToCommit: boolean
 
   readonly commitSpellcheckEnabled: boolean
+
+  readonly showCommitLengthWarning: boolean
+
+  readonly accounts: ReadonlyArray<Account>
 }
 
 interface IChangesState {
   readonly selectedRows: ReadonlyArray<number>
+  readonly focusedRow: number | null
 }
 
 function getSelectedRowsFromProps(
@@ -238,11 +252,13 @@ export class ChangesList extends React.Component<
   IChangesState
 > {
   private headerRef = createObservableRef<HTMLDivElement>()
+  private includeAllCheckBoxRef = React.createRef<Checkbox>()
 
   public constructor(props: IChangesListProps) {
     super(props)
     this.state = {
       selectedRows: getSelectedRowsFromProps(props),
+      focusedRow: null,
     }
   }
 
@@ -276,6 +292,18 @@ export class ChangesList extends React.Component<
 
     const file = workingDirectory.files[row]
     const selection = file.selection.getSelectionType()
+    const { submoduleStatus } = file.status
+
+    const isUncommittableSubmodule =
+      submoduleStatus !== undefined &&
+      file.status.kind === AppFileStatusKind.Modified &&
+      !submoduleStatus.commitChanged
+
+    const isPartiallyCommittableSubmodule =
+      submoduleStatus !== undefined &&
+      (submoduleStatus.commitChanged ||
+        file.status.kind === AppFileStatusKind.New) &&
+      (submoduleStatus.modifiedChanges || submoduleStatus.untrackedChanges)
 
     const includeAll =
       selection === DiffSelectionType.All
@@ -284,22 +312,31 @@ export class ChangesList extends React.Component<
         ? false
         : null
 
-    const include =
-      rebaseConflictState !== null
-        ? file.status.kind !== AppFileStatusKind.Untracked
-        : includeAll
+    const include = isUncommittableSubmodule
+      ? false
+      : rebaseConflictState !== null
+      ? file.status.kind !== AppFileStatusKind.Untracked
+      : includeAll
 
-    const disableSelection = isCommitting || rebaseConflictState !== null
+    const disableSelection =
+      isCommitting || rebaseConflictState !== null || isUncommittableSubmodule
+
+    const checkboxTooltip = isUncommittableSubmodule
+      ? 'This submodule change cannot be added to a commit in this repository because it contains changes that have not been committed.'
+      : isPartiallyCommittableSubmodule
+      ? 'Only changes that have been committed within the submodule will be added to this repository. You need to commit any other modified or untracked changes in the submodule before including them in this repository.'
+      : undefined
 
     return (
       <ChangedFile
         file={file}
-        include={include}
+        include={isPartiallyCommittableSubmodule && include ? null : include}
         key={file.id}
-        onContextMenu={this.onItemContextMenu}
         onIncludeChanged={onIncludeChanged}
         availableWidth={availableWidth}
         disableSelection={disableSelection}
+        checkboxTooltip={checkboxTooltip}
+        focused={this.state.focusedRow === row}
       />
     )
   }
@@ -469,7 +506,7 @@ export class ChangesList extends React.Component<
     file: WorkingDirectoryFileChange,
     enabled: boolean
   ): IMenuItem => {
-    const { externalEditorLabel, repository } = this.props
+    const { externalEditorLabel } = this.props
 
     const openInExternalEditor = externalEditorLabel
       ? `Open in ${externalEditorLabel}`
@@ -478,8 +515,7 @@ export class ChangesList extends React.Component<
     return {
       label: openInExternalEditor,
       action: () => {
-        const fullPath = Path.join(repository.path, file.path)
-        this.props.onOpenInExternalEditor(fullPath)
+        this.props.onOpenItemInExternalEditor(file.path)
       },
       enabled,
     }
@@ -527,13 +563,37 @@ export class ChangesList extends React.Component<
       { type: 'separator' },
     ]
     if (paths.length === 1) {
+      const enabled = Path.basename(path) !== GitIgnoreFileName
       items.push({
         label: __DARWIN__
           ? 'Ignore File (Add to .gitignore)'
           : 'Ignore file (add to .gitignore)',
         action: () => this.props.onIgnoreFile(path),
-        enabled: Path.basename(path) !== GitIgnoreFileName,
+        enabled,
       })
+
+      // Even on Windows, the path separator is '/' for git operations so cannot
+      // use Path.sep
+      const pathComponents = path.split('/').slice(0, -1)
+      if (pathComponents.length > 0) {
+        const submenu = pathComponents.map((_, index) => {
+          const label = `/${pathComponents
+            .slice(0, pathComponents.length - index)
+            .join('/')}`
+          return {
+            label,
+            action: () => this.props.onIgnoreFile(label),
+          }
+        })
+
+        items.push({
+          label: __DARWIN__
+            ? 'Ignore Folder (Add to .gitignore)'
+            : 'Ignore folder (add to .gitignore)',
+          submenu,
+          enabled,
+        })
+      }
     } else if (paths.length > 1) {
       items.push({
         label: __DARWIN__
@@ -648,9 +708,12 @@ export class ChangesList extends React.Component<
   }
 
   private onItemContextMenu = (
-    file: WorkingDirectoryFileChange,
+    row: number,
     event: React.MouseEvent<HTMLDivElement>
   ) => {
+    const { workingDirectory } = this.props
+    const file = workingDirectory.files[row]
+
     if (this.props.isCommitting) {
       return
     }
@@ -705,6 +768,7 @@ export class ChangesList extends React.Component<
       isCommitting,
       commitToAmend,
       currentBranchProtected,
+      currentRepoRulesInfo: currentRepoRulesInfo,
     } = this.props
 
     if (rebaseConflictState !== null) {
@@ -755,7 +819,10 @@ export class ChangesList extends React.Component<
       <CommitMessage
         onCreateCommit={this.props.onCreateCommit}
         branch={this.props.branch}
+        mostRecentLocalCommit={this.props.mostRecentLocalCommit}
         commitAuthor={this.props.commitAuthor}
+        isShowingModal={this.props.isShowingModal}
+        isShowingFoldout={this.props.isShowingFoldout}
         anyFilesSelected={anyFilesSelected}
         anyFilesAvailable={fileCount > 0}
         repository={repository}
@@ -774,11 +841,17 @@ export class ChangesList extends React.Component<
         prepopulateCommitSummary={prepopulateCommitSummary}
         key={repository.id}
         showBranchProtected={fileCount > 0 && currentBranchProtected}
+        repoRulesInfo={currentRepoRulesInfo}
+        aheadBehind={this.props.aheadBehind}
         showNoWriteAccess={fileCount > 0 && !hasWritePermissionForRepository}
         shouldNudge={this.props.shouldNudgeToCommit}
         commitSpellcheckEnabled={this.props.commitSpellcheckEnabled}
+        showCommitLengthWarning={this.props.showCommitLengthWarning}
         onCoAuthorsUpdated={this.onCoAuthorsUpdated}
         onShowCoAuthoredByChanged={this.onShowCoAuthoredByChanged}
+        onConfirmCommitWithUnknownCoAuthors={
+          this.onConfirmCommitWithUnknownCoAuthors
+        }
         onPersistCommitMessage={this.onPersistCommitMessage}
         onCommitMessageFocusSet={this.onCommitMessageFocusSet}
         onRefreshAuthor={this.onRefreshAuthor}
@@ -787,11 +860,12 @@ export class ChangesList extends React.Component<
         onCommitSpellcheckEnabledChanged={this.onCommitSpellcheckEnabledChanged}
         onStopAmending={this.onStopAmending}
         onShowCreateForkDialog={this.onShowCreateForkDialog}
+        accounts={this.props.accounts}
       />
     )
   }
 
-  private onCoAuthorsUpdated = (coAuthors: ReadonlyArray<IAuthor>) =>
+  private onCoAuthorsUpdated = (coAuthors: ReadonlyArray<Author>) =>
     this.props.dispatcher.setCoAuthors(this.props.repository, coAuthors)
 
   private onShowCoAuthoredByChanged = (showCoAuthors: boolean) => {
@@ -799,6 +873,14 @@ export class ChangesList extends React.Component<
     dispatcher.setShowCoAuthoredBy(repository, showCoAuthors)
   }
 
+  private onConfirmCommitWithUnknownCoAuthors = (
+    coAuthors: ReadonlyArray<UnknownAuthor>,
+    onCommitAnyway: () => void
+  ) => {
+    const { dispatcher } = this.props
+    dispatcher.showUnknownAuthorsCommitWarning(coAuthors, onCommitAnyway)
+  }
+
   private onRefreshAuthor = () =>
     this.props.dispatcher.refreshAuthor(this.props.repository)
 
@@ -830,10 +912,10 @@ export class ChangesList extends React.Component<
       dispatcher.selectWorkingDirectoryFiles(repository)
 
       // If the button is clicked, that implies the stash was not restored or discarded
-      dispatcher.recordNoActionTakenOnStash()
+      dispatcher.incrementMetric('noActionTakenOnStashCount')
     } else {
       dispatcher.selectStashedFile(repository)
-      dispatcher.recordStashView()
+      dispatcher.incrementMetric('stashViewCount')
     }
   }
 
@@ -852,15 +934,24 @@ export class ChangesList extends React.Component<
         className={className}
         onClick={this.onStashEntryClicked}
         tabIndex={0}
-        aria-selected={this.props.isShowingStashEntry}
+        aria-expanded={this.props.isShowingStashEntry}
+        aria-controls={
+          this.props.isShowingStashEntry ? StashDiffViewerId : undefined
+        }
       >
         <Octicon className="stack-icon" symbol={StashIcon} />
         <div className="text">Stashed Changes</div>
-        <Octicon symbol={OcticonSymbol.chevronRight} />
+        <Octicon symbol={octicons.chevronRight} />
       </button>
     )
   }
 
+  private onRowDoubleClick = (row: number) => {
+    const file = this.props.workingDirectory.files[row]
+
+    this.props.onOpenItemInExternalEditor(file.path)
+  }
+
   private onRowKeyDown = (
     _row: number,
     event: React.KeyboardEvent<HTMLDivElement>
@@ -877,6 +968,10 @@ export class ChangesList extends React.Component<
     return
   }
 
+  public focus() {
+    this.includeAllCheckBoxRef.current?.focus()
+  }
+
   public render() {
     const { workingDirectory, rebaseConflictState, isCommitting } = this.props
     const { files } = workingDirectory
@@ -888,7 +983,7 @@ export class ChangesList extends React.Component<
       file => file.selection.getSelectionType() !== DiffSelectionType.None
     ).length
     const totalFilesPlural = files.length === 1 ? 'file' : 'files'
-    const selectedChangesDescription = `${selectedChangeCount}/${files.length} changed ${totalFilesPlural} selected`
+    const selectedChangesDescription = `${selectedChangeCount}/${files.length} changed ${totalFilesPlural} included`
 
     const includeAllValue = getIncludeAllValue(
       workingDirectory,
@@ -899,42 +994,68 @@ export class ChangesList extends React.Component<
       files.length === 0 || isCommitting || rebaseConflictState !== null
 
     return (
-      <div className="changes-list-container file-list">
-        <div
-          className="header"
-          onContextMenu={this.onContextMenu}
-          ref={this.headerRef}
-        >
-          <Tooltip target={this.headerRef} direction={TooltipDirection.NORTH}>
-            {selectedChangesDescription}
-          </Tooltip>
-          <Checkbox
-            label={filesDescription}
-            value={includeAllValue}
-            onChange={this.onIncludeAllChanged}
-            disabled={disableAllCheckbox}
+      <>
+        <div className="changes-list-container file-list">
+          <div
+            className="header"
+            onContextMenu={this.onContextMenu}
+            ref={this.headerRef}
+          >
+            <TooltippedContent
+              tooltip={selectedChangesDescription}
+              direction={TooltipDirection.NORTH}
+              openOnFocus={true}
+            >
+              <Checkbox
+                ref={this.includeAllCheckBoxRef}
+                label={filesDescription}
+                value={includeAllValue}
+                onChange={this.onIncludeAllChanged}
+                disabled={disableAllCheckbox}
+                ariaDescribedBy="changesDescription"
+              />
+            </TooltippedContent>
+            <div className="sr-only" id="changesDescription">
+              {selectedChangesDescription}
+            </div>
+          </div>
+          <List
+            id="changes-list"
+            rowCount={files.length}
+            rowHeight={RowHeight}
+            rowRenderer={this.renderRow}
+            selectedRows={this.state.selectedRows}
+            selectionMode="multi"
+            onSelectionChanged={this.props.onFileSelectionChanged}
+            invalidationProps={{
+              workingDirectory: workingDirectory,
+              isCommitting: isCommitting,
+              focusedRow: this.state.focusedRow,
+            }}
+            onRowClick={this.props.onRowClick}
+            onRowDoubleClick={this.onRowDoubleClick}
+            onRowKeyboardFocus={this.onRowFocus}
+            onRowBlur={this.onRowBlur}
+            onScroll={this.onScroll}
+            setScrollTop={this.props.changesListScrollTop}
+            onRowKeyDown={this.onRowKeyDown}
+            onRowContextMenu={this.onItemContextMenu}
+            ariaLabel={filesDescription}
           />
         </div>
-        <List
-          id="changes-list"
-          rowCount={files.length}
-          rowHeight={RowHeight}
-          rowRenderer={this.renderRow}
-          selectedRows={this.state.selectedRows}
-          selectionMode="multi"
-          onSelectionChanged={this.props.onFileSelectionChanged}
-          invalidationProps={{
-            workingDirectory: workingDirectory,
-            isCommitting: isCommitting,
-          }}
-          onRowClick={this.props.onRowClick}
-          onScroll={this.onScroll}
-          setScrollTop={this.props.changesListScrollTop}
-          onRowKeyDown={this.onRowKeyDown}
-        />
         {this.renderStashedChanges()}
         {this.renderCommitMessageForm()}
-      </div>
+      </>
     )
   }
+
+  private onRowFocus = (row: number) => {
+    this.setState({ focusedRow: row })
+  }
+
+  private onRowBlur = (row: number) => {
+    if (this.state.focusedRow === row) {
+      this.setState({ focusedRow: null })
+    }
+  }
 }
diff --git a/app/src/ui/changes/changes.tsx b/app/src/ui/changes/changes.tsx
index dd7628b2f60..95b7be986f7 100644
--- a/app/src/ui/changes/changes.tsx
+++ b/app/src/ui/changes/changes.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { ChangedFileDetails } from './changed-file-details'
+import { DiffHeader } from '../diff/diff-header'
 import {
   DiffSelection,
   IDiff,
@@ -9,7 +9,6 @@ import {
 import { WorkingDirectoryFileChange } from '../../models/status'
 import { Repository } from '../../models/repository'
 import { Dispatcher } from '../dispatcher'
-import { enableHideWhitespaceInDiffOption } from '../../lib/feature-flag'
 import { SeamlessDiffSwitcher } from '../diff/seamless-diff-switcher'
 import { PopupType } from '../../models/popup'
 
@@ -30,6 +29,9 @@ interface IChangesProps {
    */
   readonly onOpenBinaryFile: (fullPath: string) => void
 
+  /** Called when the user requests to open a submodule. */
+  readonly onOpenSubmodule: (fullPath: string) => void
+
   /**
    * Called when the user is viewing an image diff and requests
    * to change the diff presentation mode.
@@ -47,6 +49,9 @@ interface IChangesProps {
    */
   readonly showSideBySideDiff: boolean
 
+  /** Whether or not to show the diff check marks indicating inclusion in a commit */
+  readonly showDiffCheckMarks: boolean
+
   /** Called when the user opens the diff options popover */
   readonly onDiffOptionsOpened: () => void
 }
@@ -58,10 +63,7 @@ export class Changes extends React.Component<IChangesProps, {}> {
    * progress or if the user has opted to hide whitespace changes.
    */
   private get lineSelectionDisabled() {
-    return (
-      this.props.isCommitting ||
-      (enableHideWhitespaceInDiffOption() && this.props.hideWhitespaceInDiff)
-    )
+    return this.props.isCommitting || this.props.hideWhitespaceInDiff
   }
 
   private onDiffLineIncludeChanged = (selection: DiffSelection) => {
@@ -99,8 +101,8 @@ export class Changes extends React.Component<IChangesProps, {}> {
 
   public render() {
     return (
-      <div className="changed-file">
-        <ChangedFileDetails
+      <div className="diff-container">
+        <DiffHeader
           path={this.props.file.path}
           status={this.props.file.status}
           diff={this.props.diff}
@@ -121,10 +123,12 @@ export class Changes extends React.Component<IChangesProps, {}> {
           diff={this.props.diff}
           hideWhitespaceInDiff={this.props.hideWhitespaceInDiff}
           showSideBySideDiff={this.props.showSideBySideDiff}
+          showDiffCheckMarks={this.props.showDiffCheckMarks}
           askForConfirmationOnDiscardChanges={
             this.props.askForConfirmationOnDiscardChanges
           }
           onOpenBinaryFile={this.props.onOpenBinaryFile}
+          onOpenSubmodule={this.props.onOpenSubmodule}
           onChangeImageDiffType={this.props.onChangeImageDiffType}
           onHideWhitespaceInDiffChanged={this.onHideWhitespaceInDiffChanged}
         />
diff --git a/app/src/ui/changes/commit-message-avatar.tsx b/app/src/ui/changes/commit-message-avatar.tsx
index 83f54e4f08c..d594a369586 100644
--- a/app/src/ui/changes/commit-message-avatar.tsx
+++ b/app/src/ui/changes/commit-message-avatar.tsx
@@ -2,36 +2,66 @@ import React from 'react'
 import { Select } from '../lib/select'
 import { Button } from '../lib/button'
 import { Row } from '../lib/row'
-import { Popover, PopoverCaretPosition } from '../lib/popover'
+import {
+  Popover,
+  PopoverAnchorPosition,
+  PopoverDecoration,
+} from '../lib/popover'
 import { IAvatarUser } from '../../models/avatar'
 import { Avatar } from '../lib/avatar'
 import { Octicon } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import * as octicons from '../octicons/octicons.generated'
 import { LinkButton } from '../lib/link-button'
+import { OkCancelButtonGroup } from '../dialog'
+import { getConfigValue } from '../../lib/git/config'
+import { Repository } from '../../models/repository'
+import classNames from 'classnames'
+import { RepoRulesMetadataFailures } from '../../models/repo-rules'
+import { RepoRulesMetadataFailureList } from '../repository-rules/repo-rules-failure-list'
+import { Account } from '../../models/account'
+
+export type CommitMessageAvatarWarningType =
+  | 'none'
+  | 'misattribution'
+  | 'disallowedEmail'
 
 interface ICommitMessageAvatarState {
   readonly isPopoverOpen: boolean
 
   /** Currently selected account email address. */
   readonly accountEmail: string
+
+  /** Whether the git configuration is local to the repository or global  */
+  readonly isGitConfigLocal: boolean
 }
 
 interface ICommitMessageAvatarProps {
   /** The user whose avatar should be displayed. */
   readonly user?: IAvatarUser
 
+  /** Current email address configured by the user. */
+  readonly email?: string
+
   /**
-   * The title of the avatar.
-   * Defaults to the name and email if undefined and is
-   * skipped completely if title is null
+   * Controls whether a warning should be displayed.
+   * - 'none': No error is displayed, the field is valid.
+   * - 'misattribution': The user's Git config emails don't match and the
+   * commit may not be attributed to the user.
+   * - 'disallowedEmail': A repository rule may prevent the user from
+   * committing with the selected email address.
    */
-  readonly title?: string | JSX.Element | null
+  readonly warningType: CommitMessageAvatarWarningType
 
-  /** Current email address configured by the user. */
-  readonly email?: string
+  /**
+   * List of validations that failed for repo rules. Only used if
+   * {@link warningType} is 'disallowedEmail'.
+   */
+  readonly emailRuleFailures?: RepoRulesMetadataFailures
 
-  /** Whether or not the warning badge on the avatar should be visible. */
-  readonly warningBadgeVisible: boolean
+  /**
+   * Name of the current branch
+   */
+  readonly branch: string | null
 
   /** Whether or not the user's account is a GHE account. */
   readonly isEnterpriseAccount: boolean
@@ -42,6 +72,11 @@ interface ICommitMessageAvatarProps {
   /** Preferred email address from the user's account. */
   readonly preferredAccountEmail: string
 
+  /**
+   * The currently selected repository
+   */
+  readonly repository: Repository
+
   readonly onUpdateEmail: (email: string) => void
 
   /**
@@ -49,6 +84,14 @@ interface ICommitMessageAvatarProps {
    * repository settings dialog
    */
   readonly onOpenRepositorySettings: () => void
+
+  /**
+   * Called when the user has requested to see the Git tab in the user settings
+   * dialog
+   */
+  readonly onOpenGitSettings: () => void
+
+  readonly accounts: ReadonlyArray<Account>
 }
 
 /**
@@ -59,31 +102,99 @@ export class CommitMessageAvatar extends React.Component<
   ICommitMessageAvatarProps,
   ICommitMessageAvatarState
 > {
+  private avatarButtonRef: HTMLButtonElement | null = null
+  private warningBadgeRef = React.createRef<HTMLDivElement>()
+
   public constructor(props: ICommitMessageAvatarProps) {
     super(props)
 
     this.state = {
       isPopoverOpen: false,
       accountEmail: this.props.preferredAccountEmail,
+      isGitConfigLocal: false,
+    }
+    this.determineGitConfigLocation()
+  }
+
+  public componentDidUpdate(prevProps: ICommitMessageAvatarProps) {
+    if (
+      this.props.user?.name !== prevProps.user?.name ||
+      this.props.user?.email !== prevProps.user?.email
+    ) {
+      this.determineGitConfigLocation()
     }
   }
 
+  private async determineGitConfigLocation() {
+    const isGitConfigLocal = await this.isGitConfigLocal()
+    this.setState({ isGitConfigLocal })
+  }
+
+  private isGitConfigLocal = async () => {
+    const { repository } = this.props
+    const localName = await getConfigValue(repository, 'user.name', true)
+    const localEmail = await getConfigValue(repository, 'user.email', true)
+    return localName !== null || localEmail !== null
+  }
+
+  private onButtonRef = (buttonRef: HTMLButtonElement | null) => {
+    this.avatarButtonRef = buttonRef
+  }
+
   public render() {
+    const { warningType, user } = this.props
+
+    let ariaLabel = ''
+    switch (warningType) {
+      case 'none':
+        ariaLabel = 'View commit author information'
+        break
+
+      case 'misattribution':
+        ariaLabel = 'Commit may be misattributed. View warning.'
+        break
+
+      case 'disallowedEmail':
+        ariaLabel = 'Email address is disallowed. View warning.'
+        break
+    }
+
+    const classes = classNames('commit-message-avatar-component', {
+      misattributed: warningType !== 'none',
+    })
+
     return (
-      <div className="commit-message-avatar-component">
-        <div onClick={this.onAvatarClick}>
-          {this.props.warningBadgeVisible && this.renderWarningBadge()}
-          <Avatar user={this.props.user} title={this.props.title} />
-        </div>
+      <div className={classes}>
+        <Button
+          className="avatar-button"
+          ariaLabel={ariaLabel}
+          onButtonRef={this.onButtonRef}
+          onClick={this.onAvatarClick}
+        >
+          {warningType !== 'none' && this.renderWarningBadge()}
+          <Avatar accounts={this.props.accounts} user={user} title={null} />
+        </Button>
         {this.state.isPopoverOpen && this.renderPopover()}
       </div>
     )
   }
 
   private renderWarningBadge() {
+    const { warningType, emailRuleFailures } = this.props
+
+    // the parent component only renders this one if an error/warning is present, so we
+    // only need to check which of the two it is here
+    const isError =
+      warningType === 'disallowedEmail' && emailRuleFailures?.status === 'fail'
+    const classes = classNames('warning-badge', {
+      error: isError,
+      warning: !isError,
+    })
+    const symbol = isError ? octicons.stop : octicons.alert
+
     return (
-      <div className="warning-badge">
-        <Octicon symbol={OcticonSymbol.alert} />
+      <div className={classes} ref={this.warningBadgeRef}>
+        <Octicon symbol={symbol} />
       </div>
     )
   }
@@ -106,11 +217,7 @@ export class CommitMessageAvatar extends React.Component<
     })
   }
 
-  private onAvatarClick = (event: React.FormEvent<HTMLDivElement>) => {
-    if (this.props.warningBadgeVisible === false) {
-      return
-    }
-
+  private onAvatarClick = (event: React.FormEvent<HTMLButtonElement>) => {
     event.preventDefault()
     if (this.state.isPopoverOpen) {
       this.closePopover()
@@ -119,31 +226,64 @@ export class CommitMessageAvatar extends React.Component<
     }
   }
 
-  private renderPopover() {
-    const accountTypeSuffix = this.props.isEnterpriseAccount
-      ? ' Enterprise'
-      : ''
+  private renderGitConfigPopover() {
+    const { user } = this.props
+    const { isGitConfigLocal } = this.state
 
-    const updateEmailTitle = __DARWIN__ ? 'Update Email' : 'Update email'
+    const location = isGitConfigLocal ? 'local' : 'global'
+    const locationDesc = isGitConfigLocal ? 'for your repository' : ''
+    const settingsName = __DARWIN__ ? 'settings' : 'options'
+    const settings = isGitConfigLocal
+      ? 'repository settings'
+      : `git ${settingsName}`
+    const buttonText = __DARWIN__ ? 'Open Git Settings' : 'Open git settings'
 
     return (
-      <Popover
-        caretPosition={PopoverCaretPosition.LeftBottom}
-        onClickOutside={this.closePopover}
-      >
-        <h3>This commit will be misattributed</h3>
-        <Row>
-          <div>
-            The email in your global Git config (
-            <span className="git-email">{this.props.email}</span>) doesn't match
-            your GitHub{accountTypeSuffix} account.{' '}
-            <LinkButton uri="https://docs.github.com/en/github/committing-changes-to-your-project/why-are-my-commits-linked-to-the-wrong-user">
-              Learn more.
+      <>
+        <p>{user && user.name && `Email: ${user.email}`}</p>
+
+        <p>
+          You can update your {location} git configuration {locationDesc} in
+          your {settings}.
+        </p>
+
+        {!isGitConfigLocal && (
+          <p className="secondary-text">
+            You can also set an email local to this repository from the{' '}
+            <LinkButton onClick={this.onRepositorySettingsClick}>
+              repository settings
             </LinkButton>
-          </div>
+            .
+          </p>
+        )}
+        <Row className="button-row">
+          <OkCancelButtonGroup
+            okButtonText={buttonText}
+            onOkButtonClick={this.onOpenGitSettings}
+            onCancelButtonClick={this.onIgnoreClick}
+          />
         </Row>
+      </>
+    )
+  }
+
+  private renderWarningPopover() {
+    const { warningType, emailRuleFailures } = this.props
+
+    const updateEmailTitle = __DARWIN__ ? 'Update Email' : 'Update email'
+
+    const sharedHeader = (
+      <>
+        The email in your global Git config (
+        <span className="git-email">{this.props.email}</span>)
+      </>
+    )
+
+    const sharedFooter = (
+      <>
         <Row>
           <Select
+            label="Your Account Emails"
             value={this.state.accountEmail}
             onChange={this.onSelectedGitHubEmailChange}
           >
@@ -171,6 +311,113 @@ export class CommitMessageAvatar extends React.Component<
             {updateEmailTitle}
           </Button>
         </Row>
+      </>
+    )
+
+    if (warningType === 'misattribution') {
+      const accountTypeSuffix = this.props.isEnterpriseAccount
+        ? ' Enterprise'
+        : ''
+
+      const userName =
+        this.props.user && this.props.user.name
+          ? ` for ${this.props.user.name}`
+          : ''
+
+      return (
+        <>
+          <Row>
+            <div>
+              {sharedHeader} doesn't match your GitHub{accountTypeSuffix}{' '}
+              account{userName}.{' '}
+              <LinkButton
+                ariaLabel="Learn more about commit attribution"
+                uri="https://docs.github.com/en/github/committing-changes-to-your-project/why-are-my-commits-linked-to-the-wrong-user"
+              >
+                Learn more
+              </LinkButton>
+            </div>
+          </Row>
+          {sharedFooter}
+        </>
+      )
+    } else if (
+      warningType === 'disallowedEmail' &&
+      emailRuleFailures &&
+      this.props.branch &&
+      this.props.repository.gitHubRepository
+    ) {
+      return (
+        <>
+          <RepoRulesMetadataFailureList
+            repository={this.props.repository.gitHubRepository}
+            branch={this.props.branch}
+            failures={emailRuleFailures}
+            leadingText={sharedHeader}
+          />
+          {sharedFooter}
+        </>
+      )
+    }
+
+    return
+  }
+
+  private getCommittingAsTitle(): string | JSX.Element | undefined {
+    const { user } = this.props
+
+    if (user === undefined) {
+      return 'Unknown user'
+    }
+
+    const { name, email } = user
+
+    if (name) {
+      return (
+        <>
+          Committing as <strong>{name}</strong>
+        </>
+      )
+    }
+
+    return <>Committing with {email}</>
+  }
+
+  private renderPopover() {
+    const { warningType } = this.props
+
+    let header: string | JSX.Element | undefined = ''
+    switch (this.props.warningType) {
+      case 'misattribution':
+        header = 'This commit will be misattributed'
+        break
+
+      case 'disallowedEmail':
+        header = 'This email address is disallowed'
+        break
+
+      default:
+        header = this.getCommittingAsTitle()
+        break
+    }
+
+    return (
+      <Popover
+        anchor={
+          warningType !== 'none'
+            ? this.warningBadgeRef.current
+            : this.avatarButtonRef
+        }
+        anchorPosition={PopoverAnchorPosition.RightBottom}
+        decoration={PopoverDecoration.Balloon}
+        onClickOutside={this.closePopover}
+        ariaLabelledby="commit-avatar-popover-header"
+      >
+        <h3 id="commit-avatar-popover-header">{header}</h3>
+
+        {warningType !== 'none'
+          ? this.renderWarningPopover()
+          : this.renderGitConfigPopover()}
       </Popover>
     )
   }
@@ -180,6 +427,15 @@ export class CommitMessageAvatar extends React.Component<
     this.props.onOpenRepositorySettings()
   }
 
+  private onOpenGitSettings = () => {
+    this.closePopover()
+    if (this.state.isGitConfigLocal) {
+      this.props.onOpenRepositorySettings()
+    } else {
+      this.props.onOpenGitSettings()
+    }
+  }
+
   private onIgnoreClick = (event: React.MouseEvent<HTMLButtonElement>) => {
     event.preventDefault()
     this.closePopover()
diff --git a/app/src/ui/changes/commit-message.tsx b/app/src/ui/changes/commit-message.tsx
index f019f200817..9e002c39710 100644
--- a/app/src/ui/changes/commit-message.tsx
+++ b/app/src/ui/changes/commit-message.tsx
@@ -4,18 +4,18 @@ import {
   AutocompletingTextArea,
   AutocompletingInput,
   IAutocompletionProvider,
-  UserAutocompletionProvider,
+  CoAuthorAutocompletionProvider,
 } from '../autocompletion'
 import { CommitIdentity } from '../../models/commit-identity'
 import { ICommitMessage } from '../../models/commit-message'
 import { Repository } from '../../models/repository'
 import { Button } from '../lib/button'
 import { Loading } from '../lib/loading'
-import { AuthorInput } from '../lib/author-input'
+import { AuthorInput } from '../lib/author-input/author-input'
 import { FocusContainer } from '../lib/focus-container'
-import { Octicon } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
-import { IAuthor } from '../../models/author'
+import { Octicon, OcticonSymbolVariant } from '../octicons'
+import * as octicons from '../octicons/octicons.generated'
+import { Author, UnknownAuthor, isKnownAuthor } from '../../models/author'
 import { IMenuItem } from '../../lib/menu-item'
 import { Commit, ICommitContext } from '../../models/commit'
 import { startTimer } from '../lib/timing'
@@ -25,7 +25,10 @@ import { Foldout, FoldoutType } from '../../lib/app-state'
 import { IAvatarUser, getAvatarUserFromAuthor } from '../../models/avatar'
 import { showContextualMenu } from '../../lib/menu-item'
 import { Account } from '../../models/account'
-import { CommitMessageAvatar } from './commit-message-avatar'
+import {
+  CommitMessageAvatar,
+  CommitMessageAvatarWarningType,
+} from './commit-message-avatar'
 import { getDotComAPIEndpoint } from '../../lib/api'
 import { isAttributableEmailFor, lookupPreferredEmail } from '../../lib/email'
 import { setGlobalConfigValue } from '../../lib/git/config'
@@ -33,20 +36,42 @@ import { Popup, PopupType } from '../../models/popup'
 import { RepositorySettingsTab } from '../repository-settings/repository-settings'
 import { IdealSummaryLength } from '../../lib/wrap-rich-text-commit-message'
 import { isEmptyOrWhitespace } from '../../lib/is-empty-or-whitespace'
-import { TooltippedContent } from '../lib/tooltipped-content'
 import { TooltipDirection } from '../lib/tooltip'
 import { pick } from '../../lib/pick'
-
-const addAuthorIcon = {
+import { ToggledtippedContent } from '../lib/toggletipped-content'
+import { PreferencesTab } from '../../models/preferences'
+import {
+  RepoRuleEnforced,
+  RepoRulesInfo,
+  RepoRulesMetadataFailures,
+} from '../../models/repo-rules'
+import { IAheadBehind } from '../../models/branch'
+import {
+  Popover,
+  PopoverAnchorPosition,
+  PopoverDecoration,
+} from '../lib/popover'
+import { RepoRulesetsForBranchLink } from '../repository-rules/repo-rulesets-for-branch-link'
+import { RepoRulesMetadataFailureList } from '../repository-rules/repo-rules-failure-list'
+import { formatCommitMessage } from '../../lib/format-commit-message'
+import { useRepoRulesLogic } from '../../lib/helpers/repo-rules'
+
+const addAuthorIcon: OcticonSymbolVariant = {
   w: 18,
   h: 13,
-  d:
+  p: [
     'M14 6V4.25a.75.75 0 0 1 1.5 0V6h1.75a.75.75 0 1 1 0 1.5H15.5v1.75a.75.75 0 0 ' +
-    '1-1.5 0V7.5h-1.75a.75.75 0 1 1 0-1.5H14zM8.5 4a2.5 2.5 0 1 1-5 0 2.5 2.5 0 0 1 5 ' +
-    '0zm.063 3.064a3.995 3.995 0 0 0 1.2-4.429A3.996 3.996 0 0 0 8.298.725a4.01 4.01 0 0 ' +
-    '0-6.064 1.91 3.987 3.987 0 0 0 1.2 4.43A5.988 5.988 0 0 0 0 12.2a.748.748 0 0 0 ' +
-    '.716.766.751.751 0 0 0 .784-.697 4.49 4.49 0 0 1 1.39-3.04 4.51 4.51 0 0 1 6.218 ' +
-    '0 4.49 4.49 0 0 1 1.39 3.04.748.748 0 0 0 .786.73.75.75 0 0 0 .714-.8 5.989 5.989 0 0 0-3.435-5.136z',
+      '1-1.5 0V7.5h-1.75a.75.75 0 1 1 0-1.5H14zM8.5 4a2.5 2.5 0 1 1-5 0 2.5 2.5 0 0 1 5 ' +
+      '0zm.063 3.064a3.995 3.995 0 0 0 1.2-4.429A3.996 3.996 0 0 0 8.298.725a4.01 4.01 0 0 ' +
+      '0-6.064 1.91 3.987 3.987 0 0 0 1.2 4.43A5.988 5.988 0 0 0 0 12.2a.748.748 0 0 0 ' +
+      '.716.766.751.751 0 0 0 .784-.697 4.49 4.49 0 0 1 1.39-3.04 4.51 4.51 0 0 1 6.218 ' +
+      '0 4.49 4.49 0 0 1 1.39 3.04.748.748 0 0 0 .786.73.75.75 0 0 0 .714-.8 5.989 5.989 0 0 0-3.435-5.136z',
+  ],
+}
+
+interface ICreateCommitOptions {
+  warnUnknownAuthors: boolean
+  warnFilesNotVisible: boolean
 }
 
 interface ICommitMessageProps {
@@ -54,6 +79,11 @@ interface ICommitMessageProps {
   readonly branch: string | null
   readonly commitAuthor: CommitIdentity | null
   readonly anyFilesSelected: boolean
+  /** Whether the user can see all the files to commit in the changes list. They
+   * may not be able to if the list is filtered */
+  readonly showPromptForCommittingFileHiddenByFilter?: boolean
+  readonly isShowingModal: boolean
+  readonly isShowingFoldout: boolean
 
   /**
    * Whether it's possible to select files for commit, affects messaging
@@ -70,6 +100,8 @@ interface ICommitMessageProps {
   readonly placeholder: string
   readonly prepopulateCommitSummary: boolean
   readonly showBranchProtected: boolean
+  readonly repoRulesInfo: RepoRulesInfo
+  readonly aheadBehind: IAheadBehind | null
   readonly showNoWriteAccess: boolean
 
   /**
@@ -78,6 +110,11 @@ interface ICommitMessageProps {
    */
   readonly showCoAuthoredBy: boolean
 
+  /**
+   * Whether or not to show a input labels (Default: false)
+   */
+  readonly showInputLabels?: boolean
+
   /**
    * A list of authors (name, email pairs) which have been
    * entered into the co-authors input box in the commit form
@@ -85,19 +122,27 @@ interface ICommitMessageProps {
    * Co-Authored-By commit message trailers depending on whether
    * the user has chosen to do so.
    */
-  readonly coAuthors: ReadonlyArray<IAuthor>
+  readonly coAuthors: ReadonlyArray<Author>
 
   /** Whether this component should show its onboarding tutorial nudge arrow */
   readonly shouldNudge?: boolean
 
   readonly commitSpellcheckEnabled: boolean
 
+  readonly showCommitLengthWarning: boolean
+
   /** Optional text to override default commit button text */
   readonly commitButtonText?: string
 
+  readonly mostRecentLocalCommit: Commit | null
+
   /** Whether or not to remember the coauthors in the changes state */
-  readonly onCoAuthorsUpdated: (coAuthors: ReadonlyArray<IAuthor>) => void
+  readonly onCoAuthorsUpdated: (coAuthors: ReadonlyArray<Author>) => void
   readonly onShowCoAuthoredByChanged: (showCoAuthoredBy: boolean) => void
+  readonly onConfirmCommitWithUnknownCoAuthors: (
+    coAuthors: ReadonlyArray<UnknownAuthor>,
+    onCommitAnyway: () => void
+  ) => void
 
   /**
    * Called when the component unmounts to give callers the ability
@@ -124,13 +169,19 @@ interface ICommitMessageProps {
   readonly onCommitSpellcheckEnabledChanged: (enabled: boolean) => void
   readonly onStopAmending: () => void
   readonly onShowCreateForkDialog: () => void
+  readonly onFilesToCommitNotVisible?: (onCommitAnyway: () => {}) => void
+  readonly onSuccessfulCommitCreated?: () => void
+  readonly accounts: ReadonlyArray<Account>
 }
 
 interface ICommitMessageState {
   readonly summary: string
   readonly description: string | null
 
-  readonly userAutocompletionProvider: UserAutocompletionProvider | null
+  readonly commitMessageAutocompletionProviders: ReadonlyArray<
+    IAutocompletionProvider<any>
+  >
+  readonly coAuthorAutocompletionProvider: CoAuthorAutocompletionProvider | null
 
   /**
    * Whether or not the description text area has more text that's
@@ -138,13 +189,31 @@ interface ICommitMessageState {
    * false when there's no action bar.
    */
   readonly descriptionObscured: boolean
+
+  readonly isCommittingStatusMessage: string
+
+  readonly repoRulesEnabled: boolean
+
+  readonly isRuleFailurePopoverOpen: boolean
+
+  readonly repoRuleCommitMessageFailures: RepoRulesMetadataFailures
+  readonly repoRuleCommitAuthorFailures: RepoRulesMetadataFailures
+  readonly repoRuleBranchNameFailures: RepoRulesMetadataFailures
 }
 
-function findUserAutoCompleteProvider(
+function findCommitMessageAutoCompleteProvider(
   providers: ReadonlyArray<IAutocompletionProvider<any>>
-): UserAutocompletionProvider | null {
+): ReadonlyArray<IAutocompletionProvider<any>> {
+  return providers.filter(
+    provider => !(provider instanceof CoAuthorAutocompletionProvider)
+  )
+}
+
+function findCoAuthorAutoCompleteProvider(
+  providers: ReadonlyArray<IAutocompletionProvider<any>>
+): CoAuthorAutocompletionProvider | null {
   for (const provider of providers) {
-    if (provider instanceof UserAutocompletionProvider) {
+    if (provider instanceof CoAuthorAutocompletionProvider) {
       return provider
     }
   }
@@ -165,6 +234,8 @@ export class CommitMessage extends React.Component<
 
   private coAuthorInputRef = React.createRef<AuthorInput>()
 
+  private readonly COMMIT_MSG_ERROR_BTN_ID = 'commit-message-failure-hint'
+
   public constructor(props: ICommitMessageProps) {
     super(props)
     const { commitMessage } = this.props
@@ -172,10 +243,18 @@ export class CommitMessage extends React.Component<
     this.state = {
       summary: commitMessage ? commitMessage.summary : '',
       description: commitMessage ? commitMessage.description : null,
-      userAutocompletionProvider: findUserAutoCompleteProvider(
+      commitMessageAutocompletionProviders:
+        findCommitMessageAutoCompleteProvider(props.autocompletionProviders),
+      coAuthorAutocompletionProvider: findCoAuthorAutoCompleteProvider(
         props.autocompletionProviders
       ),
       descriptionObscured: false,
+      isCommittingStatusMessage: '',
+      repoRulesEnabled: false,
+      isRuleFailurePopoverOpen: false,
+      repoRuleCommitMessageFailures: new RepoRulesMetadataFailures(),
+      repoRuleCommitAuthorFailures: new RepoRulesMetadataFailures(),
+      repoRuleBranchNameFailures: new RepoRulesMetadataFailures(),
     }
   }
 
@@ -183,6 +262,12 @@ export class CommitMessage extends React.Component<
   public componentWillUnmount() {
     const { props, state } = this
     props.onPersistCommitMessage?.(pick(state, 'summary', 'description'))
+    window.removeEventListener('keydown', this.onKeyDown)
+  }
+
+  public async componentDidMount() {
+    window.addEventListener('keydown', this.onKeyDown)
+    await this.updateRepoRuleFailures(undefined, undefined, true)
   }
 
   /**
@@ -197,43 +282,34 @@ export class CommitMessage extends React.Component<
   public componentWillReceiveProps(nextProps: ICommitMessageProps) {
     const { commitMessage } = nextProps
 
-    // If we switch from not amending to amending, we want to populate the
-    // textfields with the commit message from the commit.
-    if (this.props.commitToAmend === null && nextProps.commitToAmend !== null) {
-      this.fillWithCommitMessage({
-        summary: nextProps.commitToAmend.summary,
-        description: nextProps.commitToAmend.body,
-      })
-    } else if (
-      this.props.commitToAmend !== null &&
-      nextProps.commitToAmend === null &&
-      commitMessage !== null
-    ) {
-      this.fillWithCommitMessage(commitMessage)
-    }
-
     if (!commitMessage || commitMessage === this.props.commitMessage) {
       return
     }
 
-    if (this.state.summary === '' && !this.state.description) {
-      this.fillWithCommitMessage(commitMessage)
+    if (
+      (this.state.summary === '' && !this.state.description) ||
+      (this.props.commitToAmend === null && nextProps.commitToAmend)
+    ) {
+      this.setState({
+        summary: commitMessage.summary,
+        description: commitMessage.description,
+      })
     }
   }
 
-  private fillWithCommitMessage(commitMessage: ICommitMessage) {
-    this.setState({
-      summary: commitMessage.summary,
-      description: commitMessage.description,
-    })
-  }
-
-  public componentDidUpdate(prevProps: ICommitMessageProps) {
+  public async componentDidUpdate(
+    prevProps: ICommitMessageProps,
+    prevState: ICommitMessageState
+  ) {
     if (
       this.props.autocompletionProviders !== prevProps.autocompletionProviders
     ) {
       this.setState({
-        userAutocompletionProvider: findUserAutoCompleteProvider(
+        commitMessageAutocompletionProviders:
+          findCommitMessageAutoCompleteProvider(
+            this.props.autocompletionProviders
+          ),
+        coAuthorAutocompletionProvider: findCoAuthorAutoCompleteProvider(
           this.props.autocompletionProviders
         ),
       })
@@ -249,10 +325,147 @@ export class CommitMessage extends React.Component<
       this.isCoAuthorInputVisible &&
       // The co-author input could be also shown when switching between repos,
       // but in that case we don't want to give the focus to the input.
-      prevProps.repository.id === this.props.repository.id
+      prevProps.repository.id === this.props.repository.id &&
+      !!prevProps.commitToAmend === !!this.props.commitToAmend
     ) {
       this.coAuthorInputRef.current?.focus()
     }
+
+    if (
+      prevProps.isCommitting !== this.props.isCommitting &&
+      this.props.isCommitting &&
+      this.state.isCommittingStatusMessage === ''
+    ) {
+      this.setState({ isCommittingStatusMessage: this.getButtonTitle() })
+    }
+
+    if (
+      prevProps.mostRecentLocalCommit?.sha !==
+        this.props.mostRecentLocalCommit?.sha &&
+      this.props.mostRecentLocalCommit !== null
+    ) {
+      this.setState({
+        isCommittingStatusMessage: `Committed Just now - ${this.props.mostRecentLocalCommit.summary} (Sha: ${this.props.mostRecentLocalCommit.shortSha})`,
+      })
+    }
+
+    await this.updateRepoRuleFailures(prevProps, prevState)
+  }
+
+  private async updateRepoRuleFailures(
+    prevProps?: ICommitMessageProps,
+    prevState?: ICommitMessageState,
+    forceUpdate: boolean = false
+  ) {
+    let repoRulesEnabled = this.state.repoRulesEnabled
+    if (
+      forceUpdate ||
+      prevProps?.repository !== this.props.repository ||
+      prevProps?.repositoryAccount !== this.props.repositoryAccount
+    ) {
+      repoRulesEnabled = useRepoRulesLogic(
+        this.props.repositoryAccount,
+        this.props.repository
+      )
+      this.setState({ repoRulesEnabled })
+    }
+
+    if (!repoRulesEnabled) {
+      return
+    }
+
+    await this.updateRepoRulesCommitMessageFailures(
+      prevProps,
+      prevState,
+      forceUpdate
+    )
+    this.updateRepoRulesCommitAuthorFailures(prevProps, forceUpdate)
+    this.updateRepoRulesBranchNameFailures(prevProps, forceUpdate)
+  }
+
+  private async updateRepoRulesCommitMessageFailures(
+    prevProps?: ICommitMessageProps,
+    prevState?: ICommitMessageState,
+    forceUpdate?: boolean
+  ) {
+    if (
+      forceUpdate ||
+      prevState?.summary !== this.state.summary ||
+      prevState?.description !== this.state.description ||
+      prevProps?.coAuthors !== this.props.coAuthors ||
+      prevProps?.commitToAmend !== this.props.commitToAmend ||
+      prevProps?.repository !== this.props.repository ||
+      prevProps?.repoRulesInfo.commitMessagePatterns !==
+        this.props.repoRulesInfo.commitMessagePatterns
+    ) {
+      let summary = this.state.summary
+      if (!summary && !this.state.description) {
+        summary = this.summaryOrPlaceholder
+      }
+
+      const context: ICommitContext = {
+        summary,
+        description: this.state.description,
+        trailers: this.getCoAuthorTrailers(),
+        amend: this.props.commitToAmend !== null,
+      }
+
+      const msg = await formatCommitMessage(this.props.repository, context)
+      const failures =
+        this.props.repoRulesInfo.commitMessagePatterns.getFailedRules(msg)
+
+      this.setState({ repoRuleCommitMessageFailures: failures })
+    }
+  }
+
+  private updateRepoRulesCommitAuthorFailures(
+    prevProps?: ICommitMessageProps,
+    forceUpdate?: boolean
+  ) {
+    if (
+      forceUpdate ||
+      prevProps?.commitAuthor?.email !== this.props.commitAuthor?.email ||
+      prevProps?.repoRulesInfo.commitAuthorEmailPatterns !==
+        this.props.repoRulesInfo.commitAuthorEmailPatterns
+    ) {
+      const email = this.props.commitAuthor?.email
+      let failures: RepoRulesMetadataFailures
+
+      if (!email) {
+        failures = new RepoRulesMetadataFailures()
+      } else {
+        failures =
+          this.props.repoRulesInfo.commitAuthorEmailPatterns.getFailedRules(
+            email
+          )
+      }
+
+      this.setState({ repoRuleCommitAuthorFailures: failures })
+    }
+  }
+
+  private updateRepoRulesBranchNameFailures(
+    prevProps?: ICommitMessageProps,
+    forceUpdate?: boolean
+  ) {
+    if (
+      forceUpdate ||
+      prevProps?.branch !== this.props.branch ||
+      prevProps?.repoRulesInfo.branchNamePatterns !==
+        this.props.repoRulesInfo.branchNamePatterns
+    ) {
+      const branch = this.props.branch
+      let failures: RepoRulesMetadataFailures
+
+      if (!branch) {
+        failures = new RepoRulesMetadataFailures()
+      } else {
+        failures =
+          this.props.repoRulesInfo.branchNamePatterns.getFailedRules(branch)
+      }
+
+      this.setState({ repoRuleBranchNameFailures: failures })
+    }
   }
 
   private clearCommitMessage() {
@@ -282,7 +495,9 @@ export class CommitMessage extends React.Component<
     const { coAuthors } = this.props
     const token = 'Co-Authored-By'
     return this.isCoAuthorInputEnabled
-      ? coAuthors.map(a => ({ token, value: `${a.name} <${a.email}>` }))
+      ? coAuthors
+          .filter(isKnownAuthor)
+          .map(a => ({ token, value: `${a.name} <${a.email}>` }))
       : []
   }
 
@@ -292,13 +507,29 @@ export class CommitMessage extends React.Component<
       : this.state.summary
   }
 
-  private async createCommit() {
+  private async createCommit(options?: ICreateCommitOptions) {
     const { description } = this.state
 
     if (!this.canCommit() && !this.canAmend()) {
       return
     }
 
+    if (options?.warnUnknownAuthors !== false) {
+      const unknownAuthors = this.props.coAuthors.filter(
+        (author): author is UnknownAuthor => !isKnownAuthor(author)
+      )
+
+      if (unknownAuthors.length > 0) {
+        this.props.onConfirmCommitWithUnknownCoAuthors(unknownAuthors, () =>
+          this.createCommit({
+            warnUnknownAuthors: false,
+            warnFilesNotVisible: options?.warnFilesNotVisible === true,
+          })
+        )
+        return
+      }
+    }
+
     const trailers = this.getCoAuthorTrailers()
 
     const commitContext = {
@@ -308,36 +539,85 @@ export class CommitMessage extends React.Component<
       amend: this.props.commitToAmend !== null,
     }
 
+    if (
+      options?.warnFilesNotVisible !== false &&
+      this.props.showPromptForCommittingFileHiddenByFilter === true &&
+      this.props.onFilesToCommitNotVisible
+    ) {
+      this.props.onFilesToCommitNotVisible(() =>
+        this.createCommit({
+          warnUnknownAuthors: options?.warnUnknownAuthors === true,
+          warnFilesNotVisible: false,
+        })
+      )
+      return
+    }
+
     const timer = startTimer('create commit', this.props.repository)
     const commitCreated = await this.props.onCreateCommit(commitContext)
     timer.done()
 
     if (commitCreated) {
+      this.props.onSuccessfulCommitCreated?.()
       this.clearCommitMessage()
     }
   }
 
   private canCommit(): boolean {
     return (
-      (this.props.anyFilesSelected === true && this.state.summary.length > 0) ||
-      this.props.prepopulateCommitSummary
+      ((this.props.anyFilesSelected === true &&
+        this.state.summary.length > 0) ||
+        this.props.prepopulateCommitSummary) &&
+      !this.hasRepoRuleFailure()
     )
   }
 
   private canAmend(): boolean {
     return (
       this.props.commitToAmend !== null &&
-      (this.state.summary.length > 0 || this.props.prepopulateCommitSummary)
+      (this.state.summary.length > 0 || this.props.prepopulateCommitSummary) &&
+      !this.hasRepoRuleFailure()
     )
   }
 
-  private onKeyDown = (event: React.KeyboardEvent<Element>) => {
+  /**
+   * Whether the user will be prevented from pushing this commit due to a repo rule failure.
+   */
+  private hasRepoRuleFailure(): boolean {
+    const { aheadBehind, repoRulesInfo } = this.props
+
+    if (!this.state.repoRulesEnabled) {
+      return false
+    }
+
+    return (
+      repoRulesInfo.basicCommitWarning === true ||
+      repoRulesInfo.signedCommitsRequired === true ||
+      repoRulesInfo.pullRequestRequired === true ||
+      this.state.repoRuleCommitMessageFailures.status === 'fail' ||
+      this.state.repoRuleCommitAuthorFailures.status === 'fail' ||
+      (aheadBehind === null &&
+        (repoRulesInfo.creationRestricted === true ||
+          this.state.repoRuleBranchNameFailures.status === 'fail'))
+    )
+  }
+
+  private canExcecuteCommitShortcut(): boolean {
+    return !this.props.isShowingFoldout && !this.props.isShowingModal
+  }
+
+  private onKeyDown = (event: React.KeyboardEvent<Element> | KeyboardEvent) => {
     if (event.defaultPrevented) {
       return
     }
 
     const isShortcutKey = __DARWIN__ ? event.metaKey : event.ctrlKey
-    if (isShortcutKey && event.key === 'Enter' && this.canCommit()) {
+    if (
+      isShortcutKey &&
+      event.key === 'Enter' &&
+      (this.canCommit() || this.canAmend()) &&
+      this.canExcecuteCommitShortcut()
+    ) {
       this.createCommit()
       event.preventDefault()
     }
@@ -346,11 +626,6 @@ export class CommitMessage extends React.Component<
   private renderAvatar() {
     const { commitAuthor, repository } = this.props
     const { gitHubRepository } = repository
-    const avatarTitle = commitAuthor ? (
-      <>
-        Committing as <strong>{commitAuthor.name}</strong> {commitAuthor.email}
-      </>
-    ) : undefined
     const avatarUser: IAvatarUser | undefined =
       commitAuthor !== null
         ? getAvatarUserFromAuthor(commitAuthor, gitHubRepository)
@@ -360,21 +635,32 @@ export class CommitMessage extends React.Component<
     const accountEmails = repositoryAccount?.emails.map(e => e.email) ?? []
     const email = commitAuthor?.email
 
-    const warningBadgeVisible =
-      email !== undefined &&
-      repositoryAccount !== null &&
-      repositoryAccount !== undefined &&
-      isAttributableEmailFor(repositoryAccount, email) === false
+    let warningType: CommitMessageAvatarWarningType = 'none'
+    if (email !== undefined) {
+      if (
+        this.state.repoRulesEnabled &&
+        this.state.repoRuleCommitAuthorFailures.status !== 'pass'
+      ) {
+        warningType = 'disallowedEmail'
+      } else if (
+        repositoryAccount !== null &&
+        repositoryAccount !== undefined &&
+        isAttributableEmailFor(repositoryAccount, email) === false
+      ) {
+        warningType = 'misattribution'
+      }
+    }
 
     return (
       <CommitMessageAvatar
         user={avatarUser}
-        title={avatarTitle}
         email={commitAuthor?.email}
         isEnterpriseAccount={
           repositoryAccount?.endpoint !== getDotComAPIEndpoint()
         }
-        warningBadgeVisible={warningBadgeVisible}
+        warningType={warningType}
+        emailRuleFailures={this.state.repoRuleCommitAuthorFailures}
+        branch={this.props.branch}
         accountEmails={accountEmails}
         preferredAccountEmail={
           repositoryAccount !== null && repositoryAccount !== undefined
@@ -383,6 +669,9 @@ export class CommitMessage extends React.Component<
         }
         onUpdateEmail={this.onUpdateUserEmail}
         onOpenRepositorySettings={this.onOpenRepositorySettings}
+        onOpenGitSettings={this.onOpenGitSettings}
+        repository={repository}
+        accounts={this.props.accounts}
       />
     )
   }
@@ -400,6 +689,13 @@ export class CommitMessage extends React.Component<
     })
   }
 
+  private onOpenGitSettings = () => {
+    this.props.onShowPopup({
+      type: PopupType.Preferences,
+      initialSelectedTab: PreferencesTab.Git,
+    })
+  }
+
   private get isCoAuthorInputEnabled() {
     return this.props.repository.gitHubRepository !== null
   }
@@ -408,7 +704,7 @@ export class CommitMessage extends React.Component<
     return this.props.showCoAuthoredBy && this.isCoAuthorInputEnabled
   }
 
-  private onCoAuthorsUpdated = (coAuthors: ReadonlyArray<IAuthor>) =>
+  private onCoAuthorsUpdated = (coAuthors: ReadonlyArray<Author>) =>
     this.props.onCoAuthorsUpdated(coAuthors)
 
   private renderCoAuthorInput() {
@@ -416,7 +712,7 @@ export class CommitMessage extends React.Component<
       return null
     }
 
-    const autocompletionProvider = this.state.userAutocompletionProvider
+    const autocompletionProvider = this.state.coAuthorAutocompletionProvider
 
     if (!autocompletionProvider) {
       return null
@@ -428,7 +724,7 @@ export class CommitMessage extends React.Component<
         onAuthorsUpdated={this.onCoAuthorsUpdated}
         authors={this.props.coAuthors}
         autoCompleteProvider={autocompletionProvider}
-        disabled={this.props.isCommitting === true}
+        readOnly={this.props.isCommitting === true}
       />
     )
   }
@@ -511,15 +807,15 @@ export class CommitMessage extends React.Component<
     }
 
     return (
-      <button
+      <Button
         className="co-authors-toggle"
         onClick={this.onCoAuthorToggleButtonClick}
-        tabIndex={-1}
-        aria-label={this.toggleCoAuthorsText}
+        ariaLabel={this.toggleCoAuthorsText}
+        tooltip={this.toggleCoAuthorsText}
         disabled={this.props.isCommitting === true}
       >
         <Octicon symbol={addAuthorIcon} />
-      </button>
+      </Button>
     )
   }
 
@@ -588,14 +884,8 @@ export class CommitMessage extends React.Component<
     return <div className={className}>{this.renderCoAuthorToggleButton()}</div>
   }
 
-  private renderPermissionsCommitWarning() {
-    const {
-      commitToAmend,
-      showBranchProtected,
-      showNoWriteAccess,
-      repository,
-      branch,
-    } = this.props
+  private renderAmendCommitNotice() {
+    const { commitToAmend } = this.props
 
     if (commitToAmend !== null) {
       return (
@@ -607,7 +897,77 @@ export class CommitMessage extends React.Component<
           to make these changes as a new commit.
         </CommitWarning>
       )
-    } else if (showNoWriteAccess) {
+    } else {
+      return null
+    }
+  }
+
+  private renderBranchProtectionsRepoRulesCommitWarning() {
+    const {
+      showNoWriteAccess,
+      showBranchProtected,
+      repoRulesInfo,
+      aheadBehind,
+      repository,
+      branch,
+    } = this.props
+
+    const { repoRuleBranchNameFailures, repoRulesEnabled } = this.state
+
+    // if one of these is not bypassable, then that failure message needs to be shown rather than
+    // just displaying the first one in the if statement below
+    type WarningToDisplay = 'publish' | 'commitSigning' | 'basic' | null
+    const ruleEnforcementStatuses = new Map<
+      Exclude<WarningToDisplay, null>,
+      RepoRuleEnforced
+    >()
+
+    let repoRuleWarningToDisplay: WarningToDisplay = null
+
+    if (repoRulesEnabled) {
+      // has the current branch has been published?
+      if (aheadBehind === null && branch !== null) {
+        if (
+          repoRulesInfo.creationRestricted === true ||
+          repoRuleBranchNameFailures.status === 'fail'
+        ) {
+          ruleEnforcementStatuses.set('publish', true)
+        } else if (
+          repoRulesInfo.creationRestricted === 'bypass' ||
+          repoRuleBranchNameFailures.status === 'bypass'
+        ) {
+          ruleEnforcementStatuses.set('publish', 'bypass')
+        } else {
+          ruleEnforcementStatuses.set('publish', false)
+        }
+      }
+
+      ruleEnforcementStatuses.set(
+        'commitSigning',
+        repoRulesInfo.signedCommitsRequired
+      )
+      ruleEnforcementStatuses.set('basic', repoRulesInfo.basicCommitWarning)
+
+      // grab the first error to display
+      for (const status of ruleEnforcementStatuses) {
+        if (status[1] === true) {
+          repoRuleWarningToDisplay = status[0]
+          break
+        }
+      }
+
+      // if none errored, display the first bypassed
+      if (repoRuleWarningToDisplay === null) {
+        for (const status of ruleEnforcementStatuses) {
+          if (status[1] === 'bypass') {
+            repoRuleWarningToDisplay = status[0]
+            break
+          }
+        }
+      }
+    }
+
+    if (showNoWriteAccess) {
       return (
         <CommitWarning icon={CommitWarningIcon.Warning}>
           You don't have write access to <strong>{repository.name}</strong>.
@@ -623,7 +983,7 @@ export class CommitMessage extends React.Component<
         // If the branch is null that means we haven't loaded the tip yet or
         // we're on a detached head. We shouldn't ever end up here with
         // showBranchProtected being true without a branch but who knows
-        // what fun and exiting edge cases the future might hold
+        // what fun and exciting edge cases the future might hold
         return null
       }
 
@@ -634,62 +994,226 @@ export class CommitMessage extends React.Component<
           ?
         </CommitWarning>
       )
+    } else if (repoRuleWarningToDisplay === 'publish') {
+      const canBypass = ruleEnforcementStatuses.get('publish') === 'bypass'
+
+      return (
+        <CommitWarning
+          icon={canBypass ? CommitWarningIcon.Warning : CommitWarningIcon.Error}
+        >
+          The branch name <strong>{branch}</strong> fails{' '}
+          <RepoRulesetsForBranchLink
+            repository={repository.gitHubRepository}
+            branch={branch}
+          >
+            one or more rules
+          </RepoRulesetsForBranchLink>{' '}
+          that {canBypass ? 'would' : 'will'} prevent it from being published
+          {canBypass && ', but you can bypass them. Proceed with caution!'}
+          {!canBypass && (
+            <>
+              . Want to{' '}
+              <LinkButton onClick={this.onSwitchBranch}>
+                switch branches
+              </LinkButton>
+              ?
+            </>
+          )}
+        </CommitWarning>
+      )
+    } else if (repoRuleWarningToDisplay === 'commitSigning') {
+      const canBypass = repoRulesInfo.signedCommitsRequired === 'bypass'
+
+      return (
+        <CommitWarning
+          icon={canBypass ? CommitWarningIcon.Warning : CommitWarningIcon.Error}
+        >
+          <RepoRulesetsForBranchLink
+            repository={repository.gitHubRepository}
+            branch={branch}
+          >
+            One or more rules
+          </RepoRulesetsForBranchLink>{' '}
+          apply to the branch <strong>{branch}</strong> that require signed
+          commits
+          {canBypass && ', but you can bypass them. Proceed with caution!'}
+          {!canBypass && '.'}{' '}
+          <LinkButton uri="https://docs.github.com/authentication/managing-commit-signature-verification/signing-commits">
+            Learn more about commit signing.
+          </LinkButton>
+        </CommitWarning>
+      )
+    } else if (repoRuleWarningToDisplay === 'basic') {
+      const canBypass = repoRulesInfo.basicCommitWarning === 'bypass'
+
+      return (
+        <CommitWarning
+          icon={canBypass ? CommitWarningIcon.Warning : CommitWarningIcon.Error}
+        >
+          <RepoRulesetsForBranchLink
+            repository={repository.gitHubRepository}
+            branch={branch}
+          >
+            One or more rules
+          </RepoRulesetsForBranchLink>{' '}
+          apply to the branch <strong>{branch}</strong> that{' '}
+          {canBypass ? 'would' : 'will'} prevent pushing
+          {canBypass && ', but you can bypass them. Proceed with caution!'}
+          {!canBypass && (
+            <>
+              . Want to{' '}
+              <LinkButton onClick={this.onSwitchBranch}>
+                switch branches
+              </LinkButton>
+              ?
+            </>
+          )}
+        </CommitWarning>
+      )
     } else {
       return null
     }
   }
 
-  private onSwitchBranch = () => {
-    this.props.onShowFoldout({ type: FoldoutType.Branch })
+  private renderRuleFailurePopover() {
+    const { branch, repository } = this.props
+
+    // the failure status is checked here separately from whether the popover is open. if the
+    // user has it open but rules pass as they're typing, then keep the popover logic open
+    // but just don't render it. as they keep typing, if the message fails again, then the
+    // popover will open back up.
+    if (
+      !branch ||
+      !repository.gitHubRepository ||
+      !this.state.repoRulesEnabled ||
+      this.state.repoRuleCommitMessageFailures.status === 'pass'
+    ) {
+      return
+    }
+
+    const header = __DARWIN__
+      ? 'Commit Message Rule Failures'
+      : 'Commit message rule failures'
+    return (
+      <Popover
+        anchor={this.summaryTextInput}
+        anchorPosition={PopoverAnchorPosition.Right}
+        decoration={PopoverDecoration.Balloon}
+        minHeight={200}
+        ariaLabelledby="commit-message-rule-failure-popover-header"
+        onClickOutside={this.closeRuleFailurePopover}
+      >
+        <h3 id="commit-message-rule-failure-popover-header">{header}</h3>
+
+        <RepoRulesMetadataFailureList
+          repository={repository.gitHubRepository}
+          branch={branch}
+          failures={this.state.repoRuleCommitMessageFailures}
+          leadingText="This commit message"
+        />
+      </Popover>
+    )
   }
 
-  private renderSubmitButton() {
-    const { isCommitting, branch, commitButtonText } = this.props
-    const isSummaryBlank = isEmptyOrWhitespace(this.summaryOrPlaceholder)
-    const buttonEnabled =
-      (this.canCommit() || this.canAmend()) && !isCommitting && !isSummaryBlank
+  private toggleRuleFailurePopover = () => {
+    this.setState({
+      isRuleFailurePopoverOpen: !this.state.isRuleFailurePopoverOpen,
+    })
+  }
 
-    const loading = isCommitting ? <Loading /> : undefined
+  public closeRuleFailurePopover = () => {
+    this.setState({ isRuleFailurePopoverOpen: false })
+  }
+
+  private onSwitchBranch = () => {
+    this.props.onShowFoldout({ type: FoldoutType.Branch })
+  }
 
-    const isAmending = this.props.commitToAmend !== null
+  private getButtonVerb() {
+    const { isCommitting, commitToAmend } = this.props
 
     const amendVerb = isCommitting ? 'Amending' : 'Amend'
     const commitVerb = isCommitting ? 'Committing' : 'Commit'
+    const isAmending = commitToAmend !== null
 
-    const amendTitle = `${amendVerb} last commit`
-    const commitTitle =
-      branch !== null ? `${commitVerb} to ${branch}` : commitVerb
+    return isAmending ? amendVerb : commitVerb
+  }
 
-    let tooltip: string | undefined = undefined
+  private getCommittingButtonText() {
+    const { branch } = this.props
+    const verb = this.getButtonVerb()
 
-    if (buttonEnabled) {
-      tooltip = isAmending ? amendTitle : commitTitle
-    } else {
-      if (isSummaryBlank) {
-        tooltip = `A commit summary is required to commit`
-      } else if (!this.props.anyFilesSelected && this.props.anyFilesAvailable) {
-        tooltip = `Select one or more files to commit`
-      } else if (isCommitting) {
-        tooltip = `Committing changes…`
-      }
+    if (branch === null) {
+      return verb
     }
 
-    const defaultCommitContents =
-      branch !== null ? (
-        <>
-          {commitVerb} to <strong>{branch}</strong>
-        </>
-      ) : (
-        commitVerb
-      )
+    return (
+      <>
+        {verb} to <strong>{branch}</strong>
+      </>
+    )
+  }
+
+  private getCommittingButtonTitle() {
+    const { branch } = this.props
+    const verb = this.getButtonVerb()
+
+    if (branch === null) {
+      return verb
+    }
+
+    return `${verb} to ${branch}`
+  }
+
+  private getButtonText() {
+    const { commitToAmend, commitButtonText } = this.props
+
+    if (commitButtonText) {
+      return commitButtonText
+    }
+
+    const isAmending = commitToAmend !== null
+    return isAmending ? this.getButtonTitle() : this.getCommittingButtonText()
+  }
+
+  private getButtonTitle(): string {
+    const { commitToAmend, commitButtonText } = this.props
+
+    if (commitButtonText) {
+      return commitButtonText
+    }
+
+    const isAmending = commitToAmend !== null
+    return isAmending
+      ? `${this.getButtonVerb()} last commit`
+      : this.getCommittingButtonTitle()
+  }
+
+  private getButtonTooltip(buttonEnabled: boolean) {
+    if (buttonEnabled) {
+      return this.getButtonTitle()
+    }
 
-    const defaultAmendContents = <>{amendVerb} last commit</>
+    const isSummaryBlank = isEmptyOrWhitespace(this.summaryOrPlaceholder)
+    if (isSummaryBlank) {
+      return `A commit summary is required to commit`
+    } else if (!this.props.anyFilesSelected && this.props.anyFilesAvailable) {
+      return `Select one or more files to commit`
+    } else if (this.props.isCommitting) {
+      return `Committing changes…`
+    }
 
-    const defaultContents = isAmending
-      ? defaultAmendContents
-      : defaultCommitContents
+    return undefined
+  }
 
-    const commitButton = commitButtonText ? commitButtonText : defaultContents
+  private renderSubmitButton() {
+    const { isCommitting } = this.props
+    const isSummaryBlank = isEmptyOrWhitespace(this.summaryOrPlaceholder)
+    const buttonEnabled =
+      (this.canCommit() || this.canAmend()) && !isCommitting && !isSummaryBlank
+    const loading = isCommitting ? <Loading /> : undefined
+    const tooltip = this.getButtonTooltip(buttonEnabled)
+    const commitButton = this.getButtonText()
 
     return (
       <Button
@@ -698,6 +1222,7 @@ export class CommitMessage extends React.Component<
         onClick={this.onSubmit}
         disabled={!buttonEnabled}
         tooltip={tooltip}
+        tooltipDismissable={false}
         onlyShowTooltipWhenOverflowed={buttonEnabled}
       >
         <>
@@ -710,7 +1235,7 @@ export class CommitMessage extends React.Component<
 
   private renderSummaryLengthHint(): JSX.Element | null {
     return (
-      <TooltippedContent
+      <ToggledtippedContent
         delay={0}
         tooltip={
           <>
@@ -722,12 +1247,52 @@ export class CommitMessage extends React.Component<
             </div>
           </>
         }
+        ariaLiveMessage={
+          'Great commit summaries contain fewer than 50 characters. Place extra information in the description field.'
+        }
         direction={TooltipDirection.NORTH}
         className="length-hint"
         tooltipClassName="length-hint-tooltip"
+        ariaLabel="Open Summary Length Info"
       >
-        <Octicon symbol={OcticonSymbol.lightBulb} />
-      </TooltippedContent>
+        <Octicon symbol={octicons.lightBulb} />
+      </ToggledtippedContent>
+    )
+  }
+
+  private renderRepoRuleCommitMessageFailureHint(): JSX.Element | null {
+    // enableRepoRules FF is checked before this method
+
+    if (this.state.repoRuleCommitMessageFailures.status === 'pass') {
+      return null
+    }
+
+    const canBypass =
+      this.state.repoRuleCommitMessageFailures.status === 'bypass'
+
+    let ariaLabelPrefix: string
+    let bypassMessage = ''
+    if (canBypass) {
+      ariaLabelPrefix = 'Warning'
+      bypassMessage = ', but you can bypass them'
+    } else {
+      ariaLabelPrefix = 'Error'
+    }
+
+    return (
+      <button
+        id="commit-message-failure-hint"
+        className="commit-message-failure-hint button-component"
+        aria-label={`${ariaLabelPrefix}: Commit message fails repository rules${bypassMessage}. View details.`}
+        aria-haspopup="dialog"
+        aria-expanded={this.state.isRuleFailurePopoverOpen}
+        onClick={this.toggleRuleFailurePopover}
+      >
+        <Octicon
+          symbol={canBypass ? octicons.alert : octicons.stop}
+          className={canBypass ? 'warning-icon' : 'error-icon'}
+        />
+      </button>
     )
   }
 
@@ -741,15 +1306,31 @@ export class CommitMessage extends React.Component<
       'with-overflow': this.state.descriptionObscured,
     })
 
-    const showSummaryLengthHint = this.state.summary.length > IdealSummaryLength
+    const showRepoRuleCommitMessageFailureHint =
+      this.state.repoRulesEnabled &&
+      this.state.repoRuleCommitMessageFailures.status !== 'pass'
+
+    const showSummaryLengthHint =
+      this.props.showCommitLengthWarning &&
+      !showRepoRuleCommitMessageFailureHint &&
+      this.state.summary.length > IdealSummaryLength
+
     const summaryClassName = classNames('summary', {
-      'with-length-hint': showSummaryLengthHint,
+      'with-trailing-icon':
+        showRepoRuleCommitMessageFailureHint || showSummaryLengthHint,
     })
     const summaryInputClassName = classNames('summary-field', 'nudge-arrow', {
       'nudge-arrow-left': this.props.shouldNudge === true,
     })
 
+    const ariaDescribedBy = showRepoRuleCommitMessageFailureHint
+      ? this.COMMIT_MSG_ERROR_BTN_ID
+      : undefined
+
+    const { placeholder, isCommitting, commitSpellcheckEnabled } = this.props
+
     return (
+      // eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions
       <div
         role="group"
         aria-label="Create commit"
@@ -761,44 +1342,69 @@ export class CommitMessage extends React.Component<
           {this.renderAvatar()}
 
           <AutocompletingInput
-            isRequired={true}
+            required={true}
+            label={this.props.showInputLabels === true ? 'Summary' : undefined}
+            screenReaderLabel="Commit summary"
             className={summaryInputClassName}
-            placeholder={this.props.placeholder}
+            placeholder={placeholder}
             value={this.state.summary}
             onValueChanged={this.onSummaryChanged}
             onElementRef={this.onSummaryInputRef}
-            autocompletionProviders={this.props.autocompletionProviders}
+            autocompletionProviders={
+              this.state.commitMessageAutocompletionProviders
+            }
+            aria-describedby={ariaDescribedBy}
             onContextMenu={this.onAutocompletingInputContextMenu}
-            disabled={this.props.isCommitting === true}
-            spellcheck={this.props.commitSpellcheckEnabled}
+            readOnly={isCommitting === true}
+            spellcheck={commitSpellcheckEnabled}
           />
+          {showRepoRuleCommitMessageFailureHint &&
+            this.renderRepoRuleCommitMessageFailureHint()}
           {showSummaryLengthHint && this.renderSummaryLengthHint()}
         </div>
 
+        {this.state.isRuleFailurePopoverOpen && this.renderRuleFailurePopover()}
+
+        {this.props.showInputLabels === true && (
+          <label htmlFor="commit-message-description">Description</label>
+        )}
         <FocusContainer
           className="description-focus-container"
           onClick={this.onFocusContainerClick}
         >
           <AutocompletingTextArea
+            inputId="commit-message-description"
             className={descriptionClassName}
+            screenReaderLabel={
+              this.props.showInputLabels !== true
+                ? 'Commit description'
+                : undefined
+            }
             placeholder="Description"
             value={this.state.description || ''}
             onValueChanged={this.onDescriptionChanged}
-            autocompletionProviders={this.props.autocompletionProviders}
+            autocompletionProviders={
+              this.state.commitMessageAutocompletionProviders
+            }
+            aria-describedby={ariaDescribedBy}
             ref={this.onDescriptionFieldRef}
             onElementRef={this.onDescriptionTextAreaRef}
             onContextMenu={this.onAutocompletingInputContextMenu}
-            disabled={this.props.isCommitting === true}
-            spellcheck={this.props.commitSpellcheckEnabled}
+            readOnly={isCommitting === true}
+            spellcheck={commitSpellcheckEnabled}
           />
           {this.renderActionBar()}
         </FocusContainer>
 
         {this.renderCoAuthorInput()}
 
-        {this.renderPermissionsCommitWarning()}
+        {this.renderAmendCommitNotice()}
+        {this.renderBranchProtectionsRepoRulesCommitWarning()}
 
         {this.renderSubmitButton()}
+        <span className="sr-only" aria-live="polite" aria-atomic="true">
+          {this.state.isCommittingStatusMessage}
+        </span>
       </div>
     )
   }
diff --git a/app/src/ui/changes/commit-warning.tsx b/app/src/ui/changes/commit-warning.tsx
index 796888655b6..fa5cc7fe306 100644
--- a/app/src/ui/changes/commit-warning.tsx
+++ b/app/src/ui/changes/commit-warning.tsx
@@ -1,25 +1,30 @@
 import * as React from 'react'
 import { assertNever } from '../../lib/fatal-error'
 import { Octicon } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import * as octicons from '../octicons/octicons.generated'
 
 export enum CommitWarningIcon {
   Warning,
   Information,
+  Error,
 }
 
 const renderIcon = (icon: CommitWarningIcon) => {
   let className = ''
-  let symbol = OcticonSymbol.alert
+  let symbol = octicons.alert
 
   switch (icon) {
     case CommitWarningIcon.Warning:
       className = 'warning-icon'
-      symbol = OcticonSymbol.alert
+      symbol = octicons.alert
       break
     case CommitWarningIcon.Information:
       className = 'information-icon'
-      symbol = OcticonSymbol.info
+      symbol = octicons.info
+      break
+    case CommitWarningIcon.Error:
+      className = 'error-icon'
+      symbol = octicons.stop
       break
     default:
       assertNever(icon, `Unexpected icon value ${icon}`)
diff --git a/app/src/ui/changes/confirm-commit-filtered-changes-dialog.tsx b/app/src/ui/changes/confirm-commit-filtered-changes-dialog.tsx
new file mode 100644
index 00000000000..eb8a49d2ee1
--- /dev/null
+++ b/app/src/ui/changes/confirm-commit-filtered-changes-dialog.tsx
@@ -0,0 +1,92 @@
+import * as React from 'react'
+import { Dialog, DialogContent, DialogFooter } from '../dialog'
+import { Row } from '../lib/row'
+import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group'
+import { Checkbox, CheckboxValue } from '../lib/checkbox'
+
+interface IConfirmCommitFilteredChangesProps {
+  readonly onCommitAnyway: () => void
+  readonly onDismissed: () => void
+  readonly onClearFilter: () => void
+  readonly setConfirmCommitFilteredChanges: (value: boolean) => void
+}
+
+interface IConfirmCommitFilteredChangesState {
+  readonly askForConfirmationOnCommitFilteredChanges: boolean
+}
+
+export class ConfirmCommitFilteredChanges extends React.Component<
+  IConfirmCommitFilteredChangesProps,
+  IConfirmCommitFilteredChangesState
+> {
+  public constructor(props: IConfirmCommitFilteredChangesProps) {
+    super(props)
+
+    this.state = {
+      askForConfirmationOnCommitFilteredChanges: true,
+    }
+  }
+
+  public render() {
+    return (
+      <Dialog
+        id="hidden-changes"
+        type="warning"
+        title={
+          __DARWIN__ ? 'Commit Filtered Changes?' : 'Commit filtered changes?'
+        }
+        onSubmit={this.onSubmit}
+        onDismissed={this.props.onDismissed}
+        role="alertdialog"
+        ariaDescribedBy="confirm-commit-filtered-changes-message"
+      >
+        <DialogContent>
+          <p id="confirm-commit-filtered-changes-message">
+            You have a filter applied. There are changes that will be committed
+            hidden from view. Are you sure you want to commit these changes?
+          </p>
+          <Row>
+            <Checkbox
+              label="Do not show this message again"
+              value={
+                this.state.askForConfirmationOnCommitFilteredChanges
+                  ? CheckboxValue.Off
+                  : CheckboxValue.On
+              }
+              onChange={this.onShowMessageChange}
+            />
+          </Row>
+        </DialogContent>
+        <DialogFooter>
+          <OkCancelButtonGroup
+            destructive={true}
+            okButtonText={__DARWIN__ ? 'Commit Anyway' : 'Commit anyway'}
+            cancelButtonText={
+              __DARWIN__ ? 'Cancel and Clear Filter' : 'Cancel and clear filter'
+            }
+            onCancelButtonClick={this.onClearFilter}
+          />
+        </DialogFooter>
+      </Dialog>
+    )
+  }
+
+  private onShowMessageChange = (event: React.FormEvent<HTMLInputElement>) => {
+    const value = !event.currentTarget.checked
+
+    this.setState({ askForConfirmationOnCommitFilteredChanges: value })
+  }
+
+  private onClearFilter = () => {
+    this.props.onClearFilter()
+    this.props.onDismissed()
+  }
+
+  private onSubmit = () => {
+    this.props.setConfirmCommitFilteredChanges(
+      this.state.askForConfirmationOnCommitFilteredChanges
+    )
+    this.props.onCommitAnyway()
+    this.props.onDismissed()
+  }
+}
diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx
new file mode 100644
index 00000000000..f197118fff0
--- /dev/null
+++ b/app/src/ui/changes/filter-changes-list.tsx
@@ -0,0 +1,1194 @@
+import * as React from 'react'
+import * as Path from 'path'
+
+import { Dispatcher } from '../dispatcher'
+import { IMenuItem } from '../../lib/menu-item'
+import { revealInFileManager } from '../../lib/app-shell'
+import {
+  WorkingDirectoryStatus,
+  WorkingDirectoryFileChange,
+  AppFileStatusKind,
+} from '../../models/status'
+import { DiffSelectionType } from '../../models/diff'
+import { CommitIdentity } from '../../models/commit-identity'
+import { ICommitMessage } from '../../models/commit-message'
+import {
+  isRepositoryWithGitHubRepository,
+  Repository,
+} from '../../models/repository'
+import { Account } from '../../models/account'
+import { Author, UnknownAuthor } from '../../models/author'
+import { Checkbox, CheckboxValue } from '../lib/checkbox'
+import {
+  isSafeFileExtension,
+  DefaultEditorLabel,
+  CopyFilePathLabel,
+  RevealInFileManagerLabel,
+  OpenWithDefaultProgramLabel,
+  CopyRelativeFilePathLabel,
+  CopySelectedPathsLabel,
+  CopySelectedRelativePathsLabel,
+} from '../lib/context-menu'
+import { CommitMessage } from './commit-message'
+import { ChangedFile } from './changed-file'
+import { IAutocompletionProvider } from '../autocompletion'
+import { showContextualMenu } from '../../lib/menu-item'
+import { arrayEquals } from '../../lib/equality'
+import { clipboard } from 'electron'
+import { basename } from 'path'
+import { Commit, ICommitContext } from '../../models/commit'
+import {
+  RebaseConflictState,
+  ConflictState,
+  Foldout,
+} from '../../lib/app-state'
+import { ContinueRebase } from './continue-rebase'
+import { Octicon, OcticonSymbolVariant } from '../octicons'
+import * as octicons from '../octicons/octicons.generated'
+import { IStashEntry } from '../../models/stash-entry'
+import classNames from 'classnames'
+import { hasWritePermission } from '../../models/github-repository'
+import { hasConflictedFiles } from '../../lib/status'
+import { createObservableRef } from '../lib/observable-ref'
+import { TooltipDirection } from '../lib/tooltip'
+import { Popup, PopupType } from '../../models/popup'
+import { EOL } from 'os'
+import { TooltippedContent } from '../lib/tooltipped-content'
+import { RepoRulesInfo } from '../../models/repo-rules'
+import { IAheadBehind } from '../../models/branch'
+import { StashDiffViewerId } from '../stashing'
+import { AugmentedSectionFilterList } from '../lib/augmented-filter-list'
+import { IFilterListGroup, IFilterListItem } from '../lib/filter-list'
+import { ClickSource } from '../lib/list'
+import memoizeOne from 'memoize-one'
+
+interface IChangesListItem extends IFilterListItem {
+  readonly id: string
+  readonly text: ReadonlyArray<string>
+  readonly change: WorkingDirectoryFileChange
+}
+
+const RowHeight = 29
+const StashIcon: OcticonSymbolVariant = {
+  w: 16,
+  h: 16,
+  p: [
+    'M10.5 1.286h-9a.214.214 0 0 0-.214.214v9a.214.214 0 0 0 .214.214h9a.214.214 0 0 0 ' +
+      '.214-.214v-9a.214.214 0 0 0-.214-.214zM1.5 0h9A1.5 1.5 0 0 1 12 1.5v9a1.5 1.5 0 0 1-1.5 ' +
+      '1.5h-9A1.5 1.5 0 0 1 0 10.5v-9A1.5 1.5 0 0 1 1.5 0zm5.712 7.212a1.714 1.714 0 1 ' +
+      '1-2.424-2.424 1.714 1.714 0 0 1 2.424 2.424zM2.015 12.71c.102.729.728 1.29 1.485 ' +
+      '1.29h9a1.5 1.5 0 0 0 1.5-1.5v-9a1.5 1.5 0 0 0-1.29-1.485v1.442a.216.216 0 0 1 ' +
+      '.004.043v9a.214.214 0 0 1-.214.214h-9a.216.216 0 0 1-.043-.004H2.015zm2 2c.102.729.728 ' +
+      '1.29 1.485 1.29h9a1.5 1.5 0 0 0 1.5-1.5v-9a1.5 1.5 0 0 0-1.29-1.485v1.442a.216.216 0 0 1 ' +
+      '.004.043v9a.214.214 0 0 1-.214.214h-9a.216.216 0 0 1-.043-.004H4.015z',
+  ],
+}
+
+const GitIgnoreFileName = '.gitignore'
+
+/** Compute the 'Include All' checkbox value from the repository state */
+function getIncludeAllValue(
+  workingDirectory: WorkingDirectoryStatus,
+  rebaseConflictState: RebaseConflictState | null
+) {
+  if (rebaseConflictState !== null) {
+    if (workingDirectory.files.length === 0) {
+      // the current commit will be skipped in the rebase
+      return CheckboxValue.Off
+    }
+
+    // untracked files will be skipped by the rebase, so we need to ensure that
+    // the "Include All" checkbox matches this state
+    const onlyUntrackedFilesFound = workingDirectory.files.every(
+      f => f.status.kind === AppFileStatusKind.Untracked
+    )
+
+    if (onlyUntrackedFilesFound) {
+      return CheckboxValue.Off
+    }
+
+    const onlyTrackedFilesFound = workingDirectory.files.every(
+      f => f.status.kind !== AppFileStatusKind.Untracked
+    )
+
+    // show "Mixed" if we have a mixture of tracked and untracked changes
+    return onlyTrackedFilesFound ? CheckboxValue.On : CheckboxValue.Mixed
+  }
+
+  const { includeAll } = workingDirectory
+  if (includeAll === true) {
+    return CheckboxValue.On
+  } else if (includeAll === false) {
+    return CheckboxValue.Off
+  } else {
+    return CheckboxValue.Mixed
+  }
+}
+
+interface IFilterChangesListProps {
+  readonly repository: Repository
+  readonly repositoryAccount: Account | null
+  readonly workingDirectory: WorkingDirectoryStatus
+  readonly mostRecentLocalCommit: Commit | null
+  /**
+   * An object containing the conflicts in the working directory.
+   * When null it means that there are no conflicts.
+   */
+  readonly conflictState: ConflictState | null
+  readonly rebaseConflictState: RebaseConflictState | null
+  readonly selectedFileIDs: ReadonlyArray<string>
+  readonly onFileSelectionChanged: (rows: ReadonlyArray<number>) => void
+  readonly onIncludeChanged: (path: string, include: boolean) => void
+  readonly onSelectAll: (selectAll: boolean) => void
+  readonly onCreateCommit: (context: ICommitContext) => Promise<boolean>
+  readonly onDiscardChanges: (file: WorkingDirectoryFileChange) => void
+  readonly askForConfirmationOnDiscardChanges: boolean
+  readonly askForConfirmationOnCommitFilteredChanges: boolean
+  readonly focusCommitMessage: boolean
+  readonly isShowingModal: boolean
+  readonly isShowingFoldout: boolean
+  readonly onDiscardChangesFromFiles: (
+    files: ReadonlyArray<WorkingDirectoryFileChange>,
+    isDiscardingAllChanges: boolean
+  ) => void
+
+  /** Callback that fires on page scroll to pass the new scrollTop location */
+  readonly onChangesListScrolled: (scrollTop: number) => void
+
+  /* The scrollTop of the compareList. It is stored to allow for scroll position persistence */
+  readonly changesListScrollTop?: number
+
+  /**
+   * Called to open a file in its default application
+   *
+   * @param path The path of the file relative to the root of the repository
+   */
+  readonly onOpenItem: (path: string) => void
+
+  /**
+   * Called to open a file in the default external editor
+   *
+   * @param path The path of the file relative to the root of the repository
+   */
+  readonly onOpenItemInExternalEditor: (path: string) => void
+
+  /**
+   * The currently checked out branch (null if no branch is checked out).
+   */
+  readonly branch: string | null
+  readonly commitAuthor: CommitIdentity | null
+  readonly dispatcher: Dispatcher
+  readonly availableWidth: number
+  readonly isCommitting: boolean
+  readonly commitToAmend: Commit | null
+  readonly currentBranchProtected: boolean
+  readonly currentRepoRulesInfo: RepoRulesInfo
+  readonly aheadBehind: IAheadBehind | null
+
+  /**
+   * Click event handler passed directly to the onRowClick prop of List, see
+   * List Props for documentation.
+   */
+  readonly onRowClick?: (row: number, source: ClickSource) => void
+  readonly commitMessage: ICommitMessage
+
+  /** The autocompletion providers available to the repository. */
+  readonly autocompletionProviders: ReadonlyArray<IAutocompletionProvider<any>>
+
+  /** Called when the given file should be ignored. */
+  readonly onIgnoreFile: (pattern: string | string[]) => void
+
+  /** Called when the given pattern should be ignored. */
+  readonly onIgnorePattern: (pattern: string | string[]) => void
+
+  /**
+   * Whether or not to show a field for adding co-authors to
+   * a commit (currently only supported for GH/GHE repositories)
+   */
+  readonly showCoAuthoredBy: boolean
+
+  /**
+   * A list of authors (name, email pairs) which have been
+   * entered into the co-authors input box in the commit form
+   * and which _may_ be used in the subsequent commit to add
+   * Co-Authored-By commit message trailers depending on whether
+   * the user has chosen to do so.
+   */
+  readonly coAuthors: ReadonlyArray<Author>
+
+  /** The name of the currently selected external editor */
+  readonly externalEditorLabel?: string
+
+  readonly stashEntry: IStashEntry | null
+
+  readonly isShowingStashEntry: boolean
+
+  /**
+   * Whether we should show the onboarding tutorial nudge
+   * arrow pointing at the commit summary box
+   */
+  readonly shouldNudgeToCommit: boolean
+
+  readonly commitSpellcheckEnabled: boolean
+
+  readonly showCommitLengthWarning: boolean
+
+  readonly accounts: ReadonlyArray<Account>
+}
+
+interface IFilterChangesListState {
+  readonly filterText: string
+  readonly filteredItems: Map<string, IChangesListItem>
+  readonly selectedItems: ReadonlyArray<IChangesListItem>
+  readonly focusedRow: string | null
+  readonly groups: ReadonlyArray<IFilterListGroup<IChangesListItem>>
+}
+
+function getSelectedItemsFromProps(
+  props: IFilterChangesListProps
+): ReadonlyArray<IChangesListItem> {
+  if (props.selectedFileIDs.length === 0) {
+    return []
+  }
+
+  const selectedItems = []
+  for (let i = 0; i < props.selectedFileIDs.length; i++) {
+    const fid = props.selectedFileIDs[i]
+    const file = props.workingDirectory.findFileWithID(fid)
+    if (file === null) {
+      continue
+    }
+
+    selectedItems.push({
+      text: [file.path, file.status.kind.toString()],
+      id: file.id,
+      change: file,
+    })
+  }
+
+  return selectedItems
+}
+
+export class FilterChangesList extends React.Component<
+  IFilterChangesListProps,
+  IFilterChangesListState
+> {
+  private isCommittingFileHiddenByFilter = memoizeOne(
+    (
+      filterText: string,
+      fileIdsIncludedInCommit: ReadonlyArray<string>,
+      filteredItems: Map<string, IChangesListItem>,
+      fileCount: number
+    ) => {
+      // All possible files are present in the list (empty filter or all matching filter)
+      if (filterText === '' || filteredItems.size === fileCount) {
+        return false
+      }
+
+      // If filtered rows count is 1 and included for commit rows count is 2,
+      // there is no way the included for commit rows are visible regardless of
+      // what they are.
+      if (fileIdsIncludedInCommit.length > this.state.filteredItems.size) {
+        return true
+      }
+
+      // If we can find a file id included in the commit that does not exist in
+      // the filtered items, then we are committing a hidden file.
+      return fileIdsIncludedInCommit.some(fId => !filteredItems.get(fId))
+    }
+  )
+
+  private headerRef = createObservableRef<HTMLDivElement>()
+  private includeAllCheckBoxRef = React.createRef<Checkbox>()
+
+  public constructor(props: IFilterChangesListProps) {
+    super(props)
+
+    const groups = [this.createListItems(props.workingDirectory.files)]
+
+    this.state = {
+      filterText: '',
+      filteredItems: new Map<string, IChangesListItem>(),
+      selectedItems: getSelectedItemsFromProps(props),
+      focusedRow: null,
+      groups,
+    }
+  }
+
+  public componentWillReceiveProps(nextProps: IFilterChangesListProps) {
+    // No need to update state unless we haven't done it yet or the
+    // selected file id list has changed.
+    if (
+      !arrayEquals(nextProps.selectedFileIDs, this.props.selectedFileIDs) ||
+      !arrayEquals(
+        nextProps.workingDirectory.files,
+        this.props.workingDirectory.files
+      )
+    ) {
+      this.setState({
+        selectedItems: getSelectedItemsFromProps(nextProps),
+        groups: [this.createListItems(nextProps.workingDirectory.files)],
+      })
+    }
+  }
+
+  private createListItems(
+    files: ReadonlyArray<WorkingDirectoryFileChange>
+  ): IFilterListGroup<IChangesListItem> {
+    const items = files.map(file => ({
+      text: [file.path, file.status.kind.toString()],
+      id: file.id,
+      change: file,
+    }))
+
+    return {
+      identifier: 'changed-files',
+      items,
+    }
+  }
+
+  private onIncludeAllChanged = (event: React.FormEvent<HTMLInputElement>) => {
+    const include = event.currentTarget.checked
+    this.props.onSelectAll(include)
+  }
+
+  private renderChangedFile = (
+    changeListItem: IChangesListItem
+  ): JSX.Element | null => {
+    const {
+      rebaseConflictState,
+      isCommitting,
+      onIncludeChanged,
+      availableWidth,
+    } = this.props
+
+    const file = changeListItem.change
+    const selection = file.selection.getSelectionType()
+    const { submoduleStatus } = file.status
+
+    const isUncommittableSubmodule =
+      submoduleStatus !== undefined &&
+      file.status.kind === AppFileStatusKind.Modified &&
+      !submoduleStatus.commitChanged
+
+    const isPartiallyCommittableSubmodule =
+      submoduleStatus !== undefined &&
+      (submoduleStatus.commitChanged ||
+        file.status.kind === AppFileStatusKind.New) &&
+      (submoduleStatus.modifiedChanges || submoduleStatus.untrackedChanges)
+
+    const includeAll =
+      selection === DiffSelectionType.All
+        ? true
+        : selection === DiffSelectionType.None
+        ? false
+        : null
+
+    const include = isUncommittableSubmodule
+      ? false
+      : rebaseConflictState !== null
+      ? file.status.kind !== AppFileStatusKind.Untracked
+      : includeAll
+
+    const disableSelection =
+      isCommitting || rebaseConflictState !== null || isUncommittableSubmodule
+
+    const checkboxTooltip = isUncommittableSubmodule
+      ? 'This submodule change cannot be added to a commit in this repository because it contains changes that have not been committed.'
+      : isPartiallyCommittableSubmodule
+      ? 'Only changes that have been committed within the submodule will be added to this repository. You need to commit any other modified or untracked changes in the submodule before including them in this repository.'
+      : undefined
+
+    return (
+      <ChangedFile
+        file={file}
+        include={isPartiallyCommittableSubmodule && include ? null : include}
+        key={file.id}
+        onIncludeChanged={onIncludeChanged}
+        availableWidth={availableWidth}
+        disableSelection={disableSelection}
+        checkboxTooltip={checkboxTooltip}
+        focused={this.state.focusedRow === changeListItem.id}
+      />
+    )
+  }
+
+  private onDiscardAllChanges = () => {
+    this.props.onDiscardChangesFromFiles(
+      this.props.workingDirectory.files,
+      true
+    )
+  }
+
+  private onStashChanges = () => {
+    this.props.dispatcher.createStashForCurrentBranch(this.props.repository)
+  }
+
+  private onDiscardChanges = (files: ReadonlyArray<string>) => {
+    const workingDirectory = this.props.workingDirectory
+
+    if (files.length === 1) {
+      const modifiedFile = workingDirectory.files.find(f => f.path === files[0])
+
+      if (modifiedFile != null) {
+        this.props.onDiscardChanges(modifiedFile)
+      }
+    } else {
+      const modifiedFiles = new Array<WorkingDirectoryFileChange>()
+
+      files.forEach(file => {
+        const modifiedFile = workingDirectory.files.find(f => f.path === file)
+
+        if (modifiedFile != null) {
+          modifiedFiles.push(modifiedFile)
+        }
+      })
+
+      if (modifiedFiles.length > 0) {
+        // DiscardAllChanges can also be used for discarding several selected changes.
+        // Therefore, we update the pop up to reflect whether or not it is "all" changes.
+        const discardingAllChanges =
+          modifiedFiles.length === workingDirectory.files.length
+
+        this.props.onDiscardChangesFromFiles(
+          modifiedFiles,
+          discardingAllChanges
+        )
+      }
+    }
+  }
+
+  private getDiscardChangesMenuItemLabel = (files: ReadonlyArray<string>) => {
+    const label =
+      files.length === 1
+        ? __DARWIN__
+          ? `Discard Changes`
+          : `Discard changes`
+        : __DARWIN__
+        ? `Discard ${files.length} Selected Changes`
+        : `Discard ${files.length} selected changes`
+
+    return this.props.askForConfirmationOnDiscardChanges ? `${label}…` : label
+  }
+
+  private onContextMenu = (event: React.MouseEvent<any>) => {
+    event.preventDefault()
+
+    // need to preserve the working directory state while dealing with conflicts
+    if (this.props.rebaseConflictState !== null || this.props.isCommitting) {
+      return
+    }
+
+    const hasLocalChanges = this.props.workingDirectory.files.length > 0
+    const hasStash = this.props.stashEntry !== null
+    const hasConflicts =
+      this.props.conflictState !== null ||
+      hasConflictedFiles(this.props.workingDirectory)
+
+    const stashAllChangesLabel = __DARWIN__
+      ? 'Stash All Changes'
+      : 'Stash all changes'
+    const confirmStashAllChangesLabel = __DARWIN__
+      ? 'Stash All Changes…'
+      : 'Stash all changes…'
+
+    const items: IMenuItem[] = [
+      {
+        label: __DARWIN__ ? 'Discard All Changes…' : 'Discard all changes…',
+        action: this.onDiscardAllChanges,
+        enabled: hasLocalChanges,
+      },
+      {
+        label: hasStash ? confirmStashAllChangesLabel : stashAllChangesLabel,
+        action: this.onStashChanges,
+        enabled: hasLocalChanges && this.props.branch !== null && !hasConflicts,
+      },
+    ]
+
+    showContextualMenu(items)
+  }
+
+  private getDiscardChangesMenuItem = (
+    paths: ReadonlyArray<string>
+  ): IMenuItem => {
+    return {
+      label: this.getDiscardChangesMenuItemLabel(paths),
+      action: () => this.onDiscardChanges(paths),
+    }
+  }
+
+  private getCopyPathMenuItem = (
+    file: WorkingDirectoryFileChange
+  ): IMenuItem => {
+    return {
+      label: CopyFilePathLabel,
+      action: () => {
+        const fullPath = Path.join(this.props.repository.path, file.path)
+        clipboard.writeText(fullPath)
+      },
+    }
+  }
+
+  private getCopyRelativePathMenuItem = (
+    file: WorkingDirectoryFileChange
+  ): IMenuItem => {
+    return {
+      label: CopyRelativeFilePathLabel,
+      action: () => clipboard.writeText(Path.normalize(file.path)),
+    }
+  }
+
+  private getCopySelectedPathsMenuItem = (
+    files: WorkingDirectoryFileChange[]
+  ): IMenuItem => {
+    return {
+      label: CopySelectedPathsLabel,
+      action: () => {
+        const fullPaths = files.map(file =>
+          Path.join(this.props.repository.path, file.path)
+        )
+        clipboard.writeText(fullPaths.join(EOL))
+      },
+    }
+  }
+
+  private getCopySelectedRelativePathsMenuItem = (
+    files: WorkingDirectoryFileChange[]
+  ): IMenuItem => {
+    return {
+      label: CopySelectedRelativePathsLabel,
+      action: () => {
+        const paths = files.map(file => Path.normalize(file.path))
+        clipboard.writeText(paths.join(EOL))
+      },
+    }
+  }
+
+  private getRevealInFileManagerMenuItem = (
+    file: WorkingDirectoryFileChange
+  ): IMenuItem => {
+    return {
+      label: RevealInFileManagerLabel,
+      action: () => revealInFileManager(this.props.repository, file.path),
+      enabled: file.status.kind !== AppFileStatusKind.Deleted,
+    }
+  }
+
+  private getOpenInExternalEditorMenuItem = (
+    file: WorkingDirectoryFileChange,
+    enabled: boolean
+  ): IMenuItem => {
+    const { externalEditorLabel } = this.props
+
+    const openInExternalEditor = externalEditorLabel
+      ? `Open in ${externalEditorLabel}`
+      : DefaultEditorLabel
+
+    return {
+      label: openInExternalEditor,
+      action: () => {
+        this.props.onOpenItemInExternalEditor(file.path)
+      },
+      enabled,
+    }
+  }
+
+  private getDefaultContextMenu(
+    file: WorkingDirectoryFileChange
+  ): ReadonlyArray<IMenuItem> {
+    const { id, path, status } = file
+
+    const extension = Path.extname(path)
+    const isSafeExtension = isSafeFileExtension(extension)
+
+    const { workingDirectory, selectedFileIDs } = this.props
+
+    const selectedFiles = new Array<WorkingDirectoryFileChange>()
+    const paths = new Array<string>()
+    const extensions = new Set<string>()
+
+    const addItemToArray = (fileID: string) => {
+      const newFile = workingDirectory.findFileWithID(fileID)
+      if (newFile) {
+        selectedFiles.push(newFile)
+        paths.push(newFile.path)
+
+        const extension = Path.extname(newFile.path)
+        if (extension.length) {
+          extensions.add(extension)
+        }
+      }
+    }
+
+    if (selectedFileIDs.includes(id)) {
+      // user has selected a file inside an existing selection
+      // -> context menu entries should be applied to all selected files
+      selectedFileIDs.forEach(addItemToArray)
+    } else {
+      // this is outside their previous selection
+      // -> context menu entries should be applied to just this file
+      addItemToArray(id)
+    }
+
+    const items: IMenuItem[] = [
+      this.getDiscardChangesMenuItem(paths),
+      { type: 'separator' },
+    ]
+    if (paths.length === 1) {
+      const enabled = Path.basename(path) !== GitIgnoreFileName
+      items.push({
+        label: __DARWIN__
+          ? 'Ignore File (Add to .gitignore)'
+          : 'Ignore file (add to .gitignore)',
+        action: () => this.props.onIgnoreFile(path),
+        enabled,
+      })
+
+      // Even on Windows, the path separator is '/' for git operations so cannot
+      // use Path.sep
+      const pathComponents = path.split('/').slice(0, -1)
+      if (pathComponents.length > 0) {
+        const submenu = pathComponents.map((_, index) => {
+          const label = `/${pathComponents
+            .slice(0, pathComponents.length - index)
+            .join('/')}`
+          return {
+            label,
+            action: () => this.props.onIgnoreFile(label),
+          }
+        })
+
+        items.push({
+          label: __DARWIN__
+            ? 'Ignore Folder (Add to .gitignore)'
+            : 'Ignore folder (add to .gitignore)',
+          submenu,
+          enabled,
+        })
+      }
+    } else if (paths.length > 1) {
+      items.push({
+        label: __DARWIN__
+          ? `Ignore ${paths.length} Selected Files (Add to .gitignore)`
+          : `Ignore ${paths.length} selected files (add to .gitignore)`,
+        action: () => {
+          // Filter out any .gitignores that happens to be selected, ignoring
+          // those doesn't make sense.
+          this.props.onIgnoreFile(
+            paths.filter(path => Path.basename(path) !== GitIgnoreFileName)
+          )
+        },
+        // Enable this action as long as there's something selected which isn't
+        // a .gitignore file.
+        enabled: paths.some(path => Path.basename(path) !== GitIgnoreFileName),
+      })
+    }
+    // Five menu items should be enough for everyone
+    Array.from(extensions)
+      .slice(0, 5)
+      .forEach(extension => {
+        items.push({
+          label: __DARWIN__
+            ? `Ignore All ${extension} Files (Add to .gitignore)`
+            : `Ignore all ${extension} files (add to .gitignore)`,
+          action: () => this.props.onIgnorePattern(`*${extension}`),
+        })
+      })
+
+    if (paths.length > 1) {
+      items.push(
+        { type: 'separator' },
+        {
+          label: __DARWIN__
+            ? 'Include Selected Files'
+            : 'Include selected files',
+          action: () => {
+            selectedFiles.map(file =>
+              this.props.onIncludeChanged(file.path, true)
+            )
+          },
+        },
+        {
+          label: __DARWIN__
+            ? 'Exclude Selected Files'
+            : 'Exclude selected files',
+          action: () => {
+            selectedFiles.map(file =>
+              this.props.onIncludeChanged(file.path, false)
+            )
+          },
+        },
+        { type: 'separator' },
+        this.getCopySelectedPathsMenuItem(selectedFiles),
+        this.getCopySelectedRelativePathsMenuItem(selectedFiles)
+      )
+    } else {
+      items.push(
+        { type: 'separator' },
+        this.getCopyPathMenuItem(file),
+        this.getCopyRelativePathMenuItem(file)
+      )
+    }
+
+    const enabled = status.kind !== AppFileStatusKind.Deleted
+    items.push(
+      { type: 'separator' },
+      this.getRevealInFileManagerMenuItem(file),
+      this.getOpenInExternalEditorMenuItem(file, enabled),
+      {
+        label: OpenWithDefaultProgramLabel,
+        action: () => this.props.onOpenItem(path),
+        enabled: enabled && isSafeExtension,
+      }
+    )
+
+    return items
+  }
+
+  private getRebaseContextMenu(
+    file: WorkingDirectoryFileChange
+  ): ReadonlyArray<IMenuItem> {
+    const { path, status } = file
+
+    const extension = Path.extname(path)
+    const isSafeExtension = isSafeFileExtension(extension)
+
+    const items = new Array<IMenuItem>()
+
+    if (file.status.kind === AppFileStatusKind.Untracked) {
+      items.push(this.getDiscardChangesMenuItem([file.path]), {
+        type: 'separator',
+      })
+    }
+
+    const enabled = status.kind !== AppFileStatusKind.Deleted
+
+    items.push(
+      this.getCopyPathMenuItem(file),
+      this.getCopyRelativePathMenuItem(file),
+      { type: 'separator' },
+      this.getRevealInFileManagerMenuItem(file),
+      this.getOpenInExternalEditorMenuItem(file, enabled),
+      {
+        label: OpenWithDefaultProgramLabel,
+        action: () => this.props.onOpenItem(path),
+        enabled: enabled && isSafeExtension,
+      }
+    )
+
+    return items
+  }
+
+  private onItemContextMenu = (
+    item: IChangesListItem,
+    event: React.MouseEvent<HTMLDivElement>
+  ) => {
+    const file = item.change
+
+    if (this.props.isCommitting) {
+      return
+    }
+
+    event.preventDefault()
+
+    const items =
+      this.props.rebaseConflictState === null
+        ? this.getDefaultContextMenu(file)
+        : this.getRebaseContextMenu(file)
+
+    showContextualMenu(items)
+  }
+
+  private getPlaceholderMessage(
+    files: ReadonlyArray<WorkingDirectoryFileChange>,
+    prepopulateCommitSummary: boolean
+  ) {
+    if (!prepopulateCommitSummary) {
+      return 'Summary (required)'
+    }
+
+    const firstFile = files[0]
+    const fileName = basename(firstFile.path)
+
+    switch (firstFile.status.kind) {
+      case AppFileStatusKind.New:
+      case AppFileStatusKind.Untracked:
+        return `Create ${fileName}`
+      case AppFileStatusKind.Deleted:
+        return `Delete ${fileName}`
+      default:
+        // TODO:
+        // this doesn't feel like a great message for AppFileStatus.Copied or
+        // AppFileStatus.Renamed but without more insight (and whether this
+        // affects other parts of the flow) we can just default to this for now
+        return `Update ${fileName}`
+    }
+  }
+
+  private onScroll = (scrollTop: number, clientHeight: number) => {
+    this.props.onChangesListScrolled(scrollTop)
+  }
+
+  private renderCommitMessageForm = (): JSX.Element => {
+    const {
+      rebaseConflictState,
+      workingDirectory,
+      repository,
+      repositoryAccount,
+      dispatcher,
+      isCommitting,
+      commitToAmend,
+      currentBranchProtected,
+      currentRepoRulesInfo: currentRepoRulesInfo,
+    } = this.props
+
+    if (rebaseConflictState !== null) {
+      const hasUntrackedChanges = workingDirectory.files.some(
+        f => f.status.kind === AppFileStatusKind.Untracked
+      )
+
+      return (
+        <ContinueRebase
+          dispatcher={dispatcher}
+          repository={repository}
+          rebaseConflictState={rebaseConflictState}
+          workingDirectory={workingDirectory}
+          isCommitting={isCommitting}
+          hasUntrackedChanges={hasUntrackedChanges}
+        />
+      )
+    }
+
+    const fileCount = workingDirectory.files.length
+
+    const includeAllValue = getIncludeAllValue(
+      workingDirectory,
+      rebaseConflictState
+    )
+
+    const anyFilesSelected =
+      fileCount > 0 && includeAllValue !== CheckboxValue.Off
+
+    // Files selected to commit (to be committed) (not selected to see in diff)
+    const filesSelected = workingDirectory.files.filter(
+      f => f.selection.getSelectionType() !== DiffSelectionType.None
+    )
+
+    // When a single file is selected, we use a default commit summary
+    // based on the file name and change status.
+    // However, for onboarding tutorial repositories, we don't want to do this.
+    // See https://github.com/desktop/desktop/issues/8354
+    const prepopulateCommitSummary =
+      filesSelected.length === 1 && !repository.isTutorialRepository
+
+    // if this is not a github repo, we don't want to
+    // restrict what the user can do at all
+    const hasWritePermissionForRepository =
+      this.props.repository.gitHubRepository === null ||
+      hasWritePermission(this.props.repository.gitHubRepository)
+
+    const showPromptForCommittingFileHiddenByFilter =
+      this.props.askForConfirmationOnCommitFilteredChanges &&
+      this.isCommittingFileHiddenByFilter(
+        this.state.filterText,
+        filesSelected.map(f => f.id),
+        this.state.filteredItems,
+        fileCount
+      )
+
+    return (
+      <CommitMessage
+        onCreateCommit={this.props.onCreateCommit}
+        branch={this.props.branch}
+        mostRecentLocalCommit={this.props.mostRecentLocalCommit}
+        commitAuthor={this.props.commitAuthor}
+        isShowingModal={this.props.isShowingModal}
+        isShowingFoldout={this.props.isShowingFoldout}
+        anyFilesSelected={anyFilesSelected}
+        showPromptForCommittingFileHiddenByFilter={
+          showPromptForCommittingFileHiddenByFilter
+        }
+        anyFilesAvailable={fileCount > 0}
+        repository={repository}
+        repositoryAccount={repositoryAccount}
+        commitMessage={this.props.commitMessage}
+        focusCommitMessage={this.props.focusCommitMessage}
+        autocompletionProviders={this.props.autocompletionProviders}
+        isCommitting={isCommitting}
+        commitToAmend={commitToAmend}
+        showCoAuthoredBy={this.props.showCoAuthoredBy}
+        coAuthors={this.props.coAuthors}
+        placeholder={this.getPlaceholderMessage(
+          filesSelected,
+          prepopulateCommitSummary
+        )}
+        prepopulateCommitSummary={prepopulateCommitSummary}
+        key={repository.id}
+        showBranchProtected={fileCount > 0 && currentBranchProtected}
+        repoRulesInfo={currentRepoRulesInfo}
+        aheadBehind={this.props.aheadBehind}
+        showNoWriteAccess={fileCount > 0 && !hasWritePermissionForRepository}
+        shouldNudge={this.props.shouldNudgeToCommit}
+        commitSpellcheckEnabled={this.props.commitSpellcheckEnabled}
+        showCommitLengthWarning={this.props.showCommitLengthWarning}
+        onCoAuthorsUpdated={this.onCoAuthorsUpdated}
+        onShowCoAuthoredByChanged={this.onShowCoAuthoredByChanged}
+        onConfirmCommitWithUnknownCoAuthors={
+          this.onConfirmCommitWithUnknownCoAuthors
+        }
+        onPersistCommitMessage={this.onPersistCommitMessage}
+        onCommitMessageFocusSet={this.onCommitMessageFocusSet}
+        onRefreshAuthor={this.onRefreshAuthor}
+        onShowPopup={this.onShowPopup}
+        onShowFoldout={this.onShowFoldout}
+        onCommitSpellcheckEnabledChanged={this.onCommitSpellcheckEnabledChanged}
+        onStopAmending={this.onStopAmending}
+        onShowCreateForkDialog={this.onShowCreateForkDialog}
+        onFilesToCommitNotVisible={this.onFilesToCommitNotVisible}
+        accounts={this.props.accounts}
+        onSuccessfulCommitCreated={this.onSuccessfulCommitCreated}
+      />
+    )
+  }
+
+  private onSuccessfulCommitCreated = () => {
+    this.clearFilter()
+  }
+
+  private onCoAuthorsUpdated = (coAuthors: ReadonlyArray<Author>) =>
+    this.props.dispatcher.setCoAuthors(this.props.repository, coAuthors)
+
+  private onShowCoAuthoredByChanged = (showCoAuthors: boolean) => {
+    const { dispatcher, repository } = this.props
+    dispatcher.setShowCoAuthoredBy(repository, showCoAuthors)
+  }
+
+  private onConfirmCommitWithUnknownCoAuthors = (
+    coAuthors: ReadonlyArray<UnknownAuthor>,
+    onCommitAnyway: () => void
+  ) => {
+    const { dispatcher } = this.props
+    dispatcher.showUnknownAuthorsCommitWarning(coAuthors, onCommitAnyway)
+  }
+
+  private onRefreshAuthor = () =>
+    this.props.dispatcher.refreshAuthor(this.props.repository)
+
+  private onCommitMessageFocusSet = () =>
+    this.props.dispatcher.setCommitMessageFocus(false)
+
+  private onPersistCommitMessage = (message: ICommitMessage) =>
+    this.props.dispatcher.setCommitMessage(this.props.repository, message)
+
+  private onShowPopup = (p: Popup) => this.props.dispatcher.showPopup(p)
+  private onShowFoldout = (f: Foldout) => this.props.dispatcher.showFoldout(f)
+
+  private onCommitSpellcheckEnabledChanged = (enabled: boolean) =>
+    this.props.dispatcher.setCommitSpellcheckEnabled(enabled)
+
+  private onStopAmending = () =>
+    this.props.dispatcher.stopAmendingRepository(this.props.repository)
+
+  private onShowCreateForkDialog = () => {
+    if (isRepositoryWithGitHubRepository(this.props.repository)) {
+      this.props.dispatcher.showCreateForkDialog(this.props.repository)
+    }
+  }
+
+  private onStashEntryClicked = () => {
+    const { isShowingStashEntry, dispatcher, repository } = this.props
+
+    if (isShowingStashEntry) {
+      dispatcher.selectWorkingDirectoryFiles(repository)
+
+      // If the button is clicked, that implies the stash was not restored or discarded
+      dispatcher.incrementMetric('noActionTakenOnStashCount')
+    } else {
+      dispatcher.selectStashedFile(repository)
+      dispatcher.incrementMetric('stashViewCount')
+    }
+  }
+
+  private renderStashedChanges() {
+    if (this.props.stashEntry === null) {
+      return null
+    }
+
+    const className = classNames(
+      'stashed-changes-button',
+      this.props.isShowingStashEntry ? 'selected' : null
+    )
+
+    return (
+      <button
+        className={className}
+        onClick={this.onStashEntryClicked}
+        tabIndex={0}
+        aria-expanded={this.props.isShowingStashEntry}
+        aria-controls={
+          this.props.isShowingStashEntry ? StashDiffViewerId : undefined
+        }
+      >
+        <Octicon className="stack-icon" symbol={StashIcon} />
+        <div className="text">Stashed Changes</div>
+        <Octicon symbol={octicons.chevronRight} />
+      </button>
+    )
+  }
+
+  private onChangedFileDoubleClick = (item: IChangesListItem) => {
+    this.props.onOpenItemInExternalEditor(item.change.path)
+  }
+
+  private onItemKeyDown = (
+    _item: IChangesListItem,
+    event: React.KeyboardEvent<HTMLDivElement>
+  ) => {
+    // The commit is already in-flight but this check prevents the
+    // user from changing selection.
+    if (
+      this.props.isCommitting &&
+      (event.key === 'Enter' || event.key === ' ')
+    ) {
+      event.preventDefault()
+    }
+
+    return
+  }
+
+  public focus() {
+    this.includeAllCheckBoxRef.current?.focus()
+  }
+
+  private onChangedFileClick = (
+    item: IChangesListItem,
+    source: ClickSource
+  ) => {
+    const fileIndex = this.props.workingDirectory.findFileIndexByID(
+      item.change.id
+    )
+
+    this.props.onRowClick?.(fileIndex, source)
+  }
+
+  private onFilterTextChanged = (text: string) => {
+    this.setState({ filterText: text })
+  }
+
+  private onFilterListResultsChanged = (
+    filteredItems: ReadonlyArray<IChangesListItem>
+  ) => {
+    const filteredSet = new Map<string, IChangesListItem>()
+    filteredItems.forEach(f => filteredSet.set(f.id, f))
+    this.setState({ filteredItems: filteredSet })
+  }
+
+  private onFileSelectionChanged = (items: ReadonlyArray<IChangesListItem>) => {
+    const rows = items.map(i =>
+      this.props.workingDirectory.findFileIndexByID(i.change.id)
+    )
+    this.props.onFileSelectionChanged(rows)
+  }
+
+  private onFilesToCommitNotVisible = (onCommitAnyway: () => void) => {
+    this.props.dispatcher.showPopup({
+      type: PopupType.ConfirmCommitFilteredChanges,
+      onCommitAnyway,
+      onClearFilter: this.clearFilter,
+    })
+  }
+
+  private clearFilter = () => {
+    this.setState({ filterText: '' })
+  }
+
+  public render() {
+    const { workingDirectory, rebaseConflictState, isCommitting } = this.props
+    const { files } = workingDirectory
+
+    const filesPlural = files.length === 1 ? 'file' : 'files'
+    const filesDescription = `${files.length} changed ${filesPlural}`
+
+    const selectedChangeCount = files.filter(
+      file => file.selection.getSelectionType() !== DiffSelectionType.None
+    ).length
+    const totalFilesPlural = files.length === 1 ? 'file' : 'files'
+    const selectedChangesDescription = `${selectedChangeCount}/${files.length} changed ${totalFilesPlural} included`
+
+    const includeAllValue = getIncludeAllValue(
+      workingDirectory,
+      rebaseConflictState
+    )
+
+    const disableAllCheckbox =
+      files.length === 0 || isCommitting || rebaseConflictState !== null
+
+    return (
+      <>
+        <div className="changes-list-container file-list">
+          <div
+            className="header"
+            onContextMenu={this.onContextMenu}
+            ref={this.headerRef}
+          >
+            <TooltippedContent
+              tooltip={selectedChangesDescription}
+              direction={TooltipDirection.NORTH}
+              openOnFocus={true}
+            >
+              <Checkbox
+                ref={this.includeAllCheckBoxRef}
+                label={filesDescription}
+                value={includeAllValue}
+                onChange={this.onIncludeAllChanged}
+                disabled={disableAllCheckbox}
+                ariaDescribedBy="changesDescription"
+              />
+            </TooltippedContent>
+            <div className="sr-only" id="changesDescription">
+              {selectedChangesDescription}
+            </div>
+          </div>
+          <AugmentedSectionFilterList<IChangesListItem>
+            id="changes-list"
+            rowHeight={RowHeight}
+            filterText={this.state.filterText}
+            onFilterTextChanged={this.onFilterTextChanged}
+            onFilterListResultsChanged={this.onFilterListResultsChanged}
+            selectedItems={this.state.selectedItems}
+            selectionMode="multi"
+            renderItem={this.renderChangedFile}
+            onItemClick={this.onChangedFileClick}
+            onItemDoubleClick={this.onChangedFileDoubleClick}
+            onItemKeyboardFocus={this.onChangedFileFocus}
+            onItemBlur={this.onChangedFileBlur}
+            onScroll={this.onScroll}
+            setScrollTop={this.props.changesListScrollTop}
+            onItemKeyDown={this.onItemKeyDown}
+            onSelectionChanged={this.onFileSelectionChanged}
+            groups={this.state.groups}
+            invalidationProps={{
+              workingDirectory: workingDirectory,
+              isCommitting: isCommitting,
+              focusedRow: this.state.focusedRow,
+            }}
+            onItemContextMenu={this.onItemContextMenu}
+            ariaLabel={filesDescription}
+          />
+        </div>
+        {this.renderStashedChanges()}
+        {this.renderCommitMessageForm()}
+      </>
+    )
+  }
+
+  private onChangedFileFocus = (changeListItem: IChangesListItem) => {
+    this.setState({ focusedRow: changeListItem.id })
+  }
+
+  private onChangedFileBlur = (changeListItem: IChangesListItem) => {
+    if (this.state.focusedRow === changeListItem.id) {
+      this.setState({ focusedRow: null })
+    }
+  }
+}
diff --git a/app/src/ui/changes/multiple-selection.tsx b/app/src/ui/changes/multiple-selection.tsx
index 185bc1b8110..aae914d6247 100644
--- a/app/src/ui/changes/multiple-selection.tsx
+++ b/app/src/ui/changes/multiple-selection.tsx
@@ -18,7 +18,7 @@ export class MultipleSelection extends React.Component<
   public render() {
     return (
       <div className="panel blankslate" id="no-changes">
-        <img src={BlankSlateImage} className="blankslate-image" />
+        <img src={BlankSlateImage} className="blankslate-image" alt="" />
         <div>{this.props.count} files selected</div>
       </div>
     )
diff --git a/app/src/ui/changes/no-changes.tsx b/app/src/ui/changes/no-changes.tsx
index 08c549a1aa1..c3dca5a2d23 100644
--- a/app/src/ui/changes/no-changes.tsx
+++ b/app/src/ui/changes/no-changes.tsx
@@ -13,12 +13,24 @@ import { TipState, IValidBranch } from '../../models/tip'
 import { Ref } from '../lib/ref'
 import { IAheadBehind } from '../../models/branch'
 import { IRemote } from '../../models/remote'
-import { isCurrentBranchForcePush } from '../../lib/rebase'
+import {
+  ForcePushBranchState,
+  getCurrentBranchForcePushState,
+} from '../../lib/rebase'
 import { StashedChangesLoadStates } from '../../models/stash-entry'
 import { Dispatcher } from '../dispatcher'
 import { SuggestedActionGroup } from '../suggested-actions'
 import { PreferencesTab } from '../../models/preferences'
 import { PopupType } from '../../models/popup'
+import {
+  DropdownSuggestedAction,
+  IDropdownSuggestedActionOption,
+} from '../suggested-actions/dropdown-suggested-action'
+import {
+  PullRequestSuggestedNextAction,
+  isIdPullRequestSuggestedNextAction,
+} from '../../models/pull-request'
+import { KeyboardShortcut } from '../keyboard-shortcut/keyboard-shortcut'
 
 function formatMenuItemLabel(text: string) {
   if (__WIN32__ || __LINUX__) {
@@ -68,6 +80,9 @@ interface INoChangesProps {
    * opening the repository in an external editor.
    */
   readonly isExternalEditorAvailable: boolean
+
+  /** The user's preference of pull request suggested next action to use **/
+  readonly pullRequestSuggestedNextAction?: PullRequestSuggestedNextAction
 }
 
 /**
@@ -147,7 +162,7 @@ function buildMenuItemInfoMap(
     }
 
     const infoItem: IMenuItemInfo = {
-      label: item.label,
+      label: item.label as string,
       acceleratorKeys: getItemAcceleratorKeys(item),
       parentMenuLabels:
         parent === undefined ? [] : [parent.label, ...parent.parentMenuLabels],
@@ -212,8 +227,13 @@ export class NoChanges extends React.Component<
     )
   }
 
-  private renderDiscoverabilityKeyboardShortcut(menuItem: IMenuItemInfo) {
-    return menuItem.acceleratorKeys.map((k, i) => <kbd key={k + i}>{k}</kbd>)
+  private renderDiscoverabilityKeyboardShortcut(menuItemInfo: IMenuItemInfo) {
+    return (
+      <KeyboardShortcut
+        darwinKeys={menuItemInfo.acceleratorKeys}
+        keys={menuItemInfo.acceleratorKeys}
+      />
+    )
   }
 
   private renderMenuBackedAction(
@@ -254,7 +274,7 @@ export class NoChanges extends React.Component<
   }
 
   private onShowInFileManagerClicked = () =>
-    this.props.dispatcher.recordSuggestedStepOpenWorkingDirectory()
+    this.props.dispatcher.incrementMetric('suggestedStepOpenWorkingDirectory')
 
   private renderViewOnGitHub() {
     const isGitHub = this.props.repository.gitHubRepository !== null
@@ -272,7 +292,7 @@ export class NoChanges extends React.Component<
   }
 
   private onViewOnGitHubClicked = () =>
-    this.props.dispatcher.recordSuggestedStepViewOnGitHub()
+    this.props.dispatcher.incrementMetric('suggestedStepViewOnGitHub')
 
   private openIntegrationPreferences = () => {
     this.props.dispatcher.showPopup({
@@ -307,7 +327,7 @@ export class NoChanges extends React.Component<
       <>
         Select your editor in{' '}
         <LinkButton onClick={this.openIntegrationPreferences}>
-          {__DARWIN__ ? 'Preferences' : 'Options'}
+          {__DARWIN__ ? 'Settings' : 'Options'}
         </LinkButton>
       </>
     )
@@ -321,7 +341,7 @@ export class NoChanges extends React.Component<
   }
 
   private onOpenInExternalEditorClicked = () =>
-    this.props.dispatcher.recordSuggestedStepOpenInExternalEditor()
+    this.props.dispatcher.incrementMetric('suggestedStepOpenInExternalEditor')
 
   private renderRemoteAction() {
     const { remote, aheadBehind, branchesState, tagsToPush } =
@@ -341,7 +361,9 @@ export class NoChanges extends React.Component<
       return this.renderPublishBranchAction(tip)
     }
 
-    const isForcePush = isCurrentBranchForcePush(branchesState, aheadBehind)
+    const isForcePush =
+      getCurrentBranchForcePushState(branchesState, aheadBehind) ===
+      ForcePushBranchState.Recommended
     if (isForcePush) {
       // do not render an action currently after the rebase has completed, as
       // the default behaviour is currently to pull in changes from the tracking
@@ -425,7 +447,7 @@ export class NoChanges extends React.Component<
   }
 
   private onViewStashClicked = () =>
-    this.props.dispatcher.recordSuggestedStepViewStash()
+    this.props.dispatcher.incrementMetric('suggestedStepViewStash')
 
   private renderPublishRepositoryAction() {
     // This is a bit confusing, there's no dedicated
@@ -463,7 +485,7 @@ export class NoChanges extends React.Component<
   }
 
   private onPublishRepositoryClicked = () =>
-    this.props.dispatcher.recordSuggestedStepPublishRepository()
+    this.props.dispatcher.incrementMetric('suggestedStepPublishRepository')
 
   private renderPublishBranchAction(tip: IValidBranch) {
     // This is a bit confusing, there's no dedicated
@@ -512,7 +534,7 @@ export class NoChanges extends React.Component<
   }
 
   private onPublishBranchClicked = () =>
-    this.props.dispatcher.recordSuggestedStepPublishBranch()
+    this.props.dispatcher.incrementMetric('suggestedStepPublishBranch')
 
   private renderPullBranchAction(
     tip: IValidBranch,
@@ -632,12 +654,16 @@ export class NoChanges extends React.Component<
     )
   }
 
-  private renderCreatePullRequestAction(tip: IValidBranch) {
-    const itemId: MenuIDs = 'create-pull-request'
-    const menuItem = this.getMenuItemInfo(itemId)
+  private onPullRequestSuggestedActionChanged = (action: string) => {
+    if (isIdPullRequestSuggestedNextAction(action)) {
+      this.props.dispatcher.setPullRequestSuggestedNextAction(action)
+    }
+  }
 
-    if (menuItem === undefined) {
-      log.error(`Could not find matching menu item for ${itemId}`)
+  private renderCreatePullRequestAction(tip: IValidBranch) {
+    const createMenuItem = this.getMenuItemInfo('create-pull-request')
+    if (createMenuItem === undefined) {
+      log.error(`Could not find matching menu item for 'create-pull-request'`)
       return null
     }
 
@@ -652,23 +678,55 @@ export class NoChanges extends React.Component<
     const title = `Create a Pull Request from your current branch`
     const buttonText = `Create Pull Request`
 
+    const previewPullMenuItem = this.getMenuItemInfo('preview-pull-request')
+
+    if (previewPullMenuItem === undefined) {
+      log.error(`Could not find matching menu item for 'preview-pull-request'`)
+      return null
+    }
+
+    const createPullRequestAction: IDropdownSuggestedActionOption = {
+      title,
+      label: buttonText,
+      description,
+      id: PullRequestSuggestedNextAction.CreatePullRequest,
+      menuItemId: 'create-pull-request',
+      discoverabilityContent:
+        this.renderDiscoverabilityElements(createMenuItem),
+      disabled: !createMenuItem.enabled,
+      onClick: this.onCreatePullRequestClicked,
+    }
+
+    const previewPullRequestAction: IDropdownSuggestedActionOption = {
+      title: `Preview the Pull Request from your current branch`,
+      label: 'Preview Pull Request',
+      description: (
+        <>
+          The current branch (<Ref>{tip.branch.name}</Ref>) is already published
+          to GitHub. Preview the changes this pull request will have before
+          proposing your changes.
+        </>
+      ),
+      id: PullRequestSuggestedNextAction.PreviewPullRequest,
+      menuItemId: 'preview-pull-request',
+      discoverabilityContent:
+        this.renderDiscoverabilityElements(previewPullMenuItem),
+      disabled: !previewPullMenuItem.enabled,
+    }
+
     return (
-      <MenuBackedSuggestedAction
-        key="create-pr-action"
-        title={title}
-        menuItemId={itemId}
-        description={description}
-        buttonText={buttonText}
-        discoverabilityContent={this.renderDiscoverabilityElements(menuItem)}
-        type="primary"
-        disabled={!menuItem.enabled}
-        onClick={this.onCreatePullRequestClicked}
+      <DropdownSuggestedAction
+        key="pull-request-action"
+        className="pull-request-action"
+        suggestedActions={[previewPullRequestAction, createPullRequestAction]}
+        selectedActionValue={this.props.pullRequestSuggestedNextAction}
+        onSuggestedActionChanged={this.onPullRequestSuggestedActionChanged}
       />
     )
   }
 
   private onCreatePullRequestClicked = () =>
-    this.props.dispatcher.recordSuggestedStepCreatePullRequest()
+    this.props.dispatcher.incrementMetric('suggestedStepCreatePullRequest')
 
   private renderActions() {
     return (
@@ -704,9 +762,9 @@ export class NoChanges extends React.Component<
 
   public render() {
     return (
-      <div id="no-changes">
+      <div className="changes-interstitial">
         <div className="content">
-          <div className="header">
+          <div className="interstitial-header">
             <div className="text">
               <h1>No local changes</h1>
               <p>
@@ -714,7 +772,7 @@ export class NoChanges extends React.Component<
                 some friendly suggestions for what to do next.
               </p>
             </div>
-            <img src={PaperStackImage} className="blankslate-image" />
+            <img src={PaperStackImage} className="blankslate-image" alt="" />
           </div>
           {this.renderActions()}
         </div>
diff --git a/app/src/ui/changes/sidebar.tsx b/app/src/ui/changes/sidebar.tsx
index 37ae00df643..dfe253d9407 100644
--- a/app/src/ui/changes/sidebar.tsx
+++ b/app/src/ui/changes/sidebar.tsx
@@ -29,6 +29,10 @@ import { filesNotTrackedByLFS } from '../../lib/git/lfs'
 import { getLargeFilePaths } from '../../lib/large-files'
 import { isConflictedFile, hasUnresolvedConflicts } from '../../lib/status'
 import { getAccountForRepository } from '../../lib/get-account-for-repository'
+import { IAheadBehind } from '../../models/branch'
+import { Emoji } from '../../lib/emoji'
+import { enableFilteredChangesList } from '../../lib/feature-flag'
+import { FilterChangesList } from './filter-changes-list'
 
 /**
  * The timeout for the animation of the enter/leave animation for Undo.
@@ -41,20 +45,28 @@ const UndoCommitAnimationTimeout = 500
 interface IChangesSidebarProps {
   readonly repository: Repository
   readonly changes: IChangesState
+  readonly aheadBehind: IAheadBehind | null
   readonly dispatcher: Dispatcher
   readonly commitAuthor: CommitIdentity | null
   readonly branch: string | null
-  readonly emoji: Map<string, string>
+  readonly emoji: Map<string, Emoji>
   readonly mostRecentLocalCommit: Commit | null
+  // Used in receiveProps, no-unused-prop-types doesn't know that
+  // eslint-disable-next-line react/no-unused-prop-types
   readonly issuesStore: IssuesStore
   readonly availableWidth: number
   readonly isCommitting: boolean
   readonly commitToAmend: Commit | null
   readonly isPushPullFetchInProgress: boolean
+  // Used in receiveProps, no-unused-prop-types doesn't know that
+  // eslint-disable-next-line react/no-unused-prop-types
   readonly gitHubUserStore: GitHubUserStore
   readonly focusCommitMessage: boolean
   readonly askForConfirmationOnDiscardChanges: boolean
+  readonly askForConfirmationOnCommitFilteredChanges: boolean
   readonly accounts: ReadonlyArray<Account>
+  readonly isShowingModal: boolean
+  readonly isShowingFoldout: boolean
   /** The name of the currently selected external editor */
   readonly externalEditorLabel?: string
 
@@ -74,12 +86,15 @@ interface IChangesSidebarProps {
   readonly shouldNudgeToCommit: boolean
 
   readonly commitSpellcheckEnabled: boolean
+
+  readonly showCommitLengthWarning: boolean
 }
 
 export class ChangesSidebar extends React.Component<IChangesSidebarProps, {}> {
   private autocompletionProviders: ReadonlyArray<
     IAutocompletionProvider<any>
   > | null = null
+  private changesListRef = React.createRef<ChangesList>()
 
   public constructor(props: IChangesSidebarProps) {
     super(props)
@@ -144,7 +159,9 @@ export class ChangesSidebar extends React.Component<IChangesSidebarProps, {}> {
 
     if (conflictedFilesLeft.length === 0) {
       this.props.dispatcher.clearBanner()
-      this.props.dispatcher.recordUnguidedConflictedMergeCompletion()
+      this.props.dispatcher.incrementMetric(
+        'unguidedConflictedMergeCompletionCount'
+      )
     }
 
     // which of the files selected for committing are conflicted (with markers)?
@@ -246,6 +263,14 @@ export class ChangesSidebar extends React.Component<IChangesSidebarProps, {}> {
     const fullPath = Path.join(this.props.repository.path, path)
     openFile(fullPath, this.props.dispatcher)
   }
+  /**
+   * Called to open a file in the default external editor
+   *
+   * @param path The path of the file relative to the root of the repository
+   */
+  private onOpenItemInExternalEditor = (path: string) => {
+    this.props.onOpenInExternalEditor(path)
+  }
 
   /**
    * Toggles the selection of a given working directory file.
@@ -340,6 +365,10 @@ export class ChangesSidebar extends React.Component<IChangesSidebarProps, {}> {
     return this.renderMostRecentLocalCommit()
   }
 
+  public focus() {
+    this.changesListRef.current?.focus()
+  }
+
   public render() {
     const {
       workingDirectory,
@@ -349,6 +378,7 @@ export class ChangesSidebar extends React.Component<IChangesSidebarProps, {}> {
       conflictState,
       selection,
       currentBranchProtected,
+      currentRepoRulesInfo,
     } = this.props.changes
     let rebaseConflictState: RebaseConflictState | null = null
     if (conflictState !== null) {
@@ -368,9 +398,14 @@ export class ChangesSidebar extends React.Component<IChangesSidebarProps, {}> {
       this.props.repository
     )
 
+    const ChangesListComponent = enableFilteredChangesList()
+      ? FilterChangesList
+      : ChangesList
+
     return (
-      <div className="panel">
-        <ChangesList
+      <div className="panel" role="tabpanel" aria-labelledby="changes-tab">
+        <ChangesListComponent
+          ref={this.changesListRef}
           dispatcher={this.props.dispatcher}
           repository={this.props.repository}
           repositoryAccount={repositoryAccount}
@@ -387,6 +422,9 @@ export class ChangesSidebar extends React.Component<IChangesSidebarProps, {}> {
           askForConfirmationOnDiscardChanges={
             this.props.askForConfirmationOnDiscardChanges
           }
+          askForConfirmationOnCommitFilteredChanges={
+            this.props.askForConfirmationOnCommitFilteredChanges
+          }
           onDiscardChangesFromFiles={this.onDiscardChangesFromFiles}
           onOpenItem={this.onOpenItem}
           onRowClick={this.onChangedItemClick}
@@ -394,6 +432,8 @@ export class ChangesSidebar extends React.Component<IChangesSidebarProps, {}> {
           branch={this.props.branch}
           commitMessage={commitMessage}
           focusCommitMessage={this.props.focusCommitMessage}
+          isShowingModal={this.props.isShowingModal}
+          isShowingFoldout={this.props.isShowingFoldout}
           autocompletionProviders={this.autocompletionProviders!}
           availableWidth={this.props.availableWidth}
           onIgnoreFile={this.onIgnoreFile}
@@ -403,7 +443,7 @@ export class ChangesSidebar extends React.Component<IChangesSidebarProps, {}> {
           showCoAuthoredBy={showCoAuthoredBy}
           coAuthors={coAuthors}
           externalEditorLabel={this.props.externalEditorLabel}
-          onOpenInExternalEditor={this.props.onOpenInExternalEditor}
+          onOpenItemInExternalEditor={this.onOpenItemInExternalEditor}
           onChangesListScrolled={this.props.onChangesListScrolled}
           changesListScrollTop={this.props.changesListScrollTop}
           stashEntry={this.props.changes.stashEntry}
@@ -411,6 +451,10 @@ export class ChangesSidebar extends React.Component<IChangesSidebarProps, {}> {
           currentBranchProtected={currentBranchProtected}
           shouldNudgeToCommit={this.props.shouldNudgeToCommit}
           commitSpellcheckEnabled={this.props.commitSpellcheckEnabled}
+          showCommitLengthWarning={this.props.showCommitLengthWarning}
+          currentRepoRulesInfo={currentRepoRulesInfo}
+          aheadBehind={this.props.aheadBehind}
+          accounts={this.props.accounts}
         />
         {this.renderUndoCommit(rebaseConflictState)}
       </div>
diff --git a/app/src/ui/changes/undo-commit.tsx b/app/src/ui/changes/undo-commit.tsx
index 8f276737ab7..b60523b0a31 100644
--- a/app/src/ui/changes/undo-commit.tsx
+++ b/app/src/ui/changes/undo-commit.tsx
@@ -4,6 +4,7 @@ import { Commit } from '../../models/commit'
 import { RichText } from '../lib/rich-text'
 import { RelativeTime } from '../relative-time'
 import { Button } from '../lib/button'
+import { Emoji } from '../../lib/emoji'
 
 interface IUndoCommitProps {
   /** The function to call when the Undo button is clicked. */
@@ -13,7 +14,7 @@ interface IUndoCommitProps {
   readonly commit: Commit
 
   /** The emoji cache to use when rendering the commit message */
-  readonly emoji: Map<string, string>
+  readonly emoji: Map<string, Emoji>
 
   /** whether a push, pull or fetch is in progress */
   readonly isPushPullFetchInProgress: boolean
@@ -45,8 +46,13 @@ export class UndoCommit extends React.Component<IUndoCommitProps, {}> {
             renderUrlsAsLinks={false}
           />
         </div>
-        <div className="actions" title={title}>
-          <Button size="small" disabled={disabled} onClick={this.props.onUndo}>
+        <div className="actions">
+          <Button
+            size="small"
+            disabled={disabled}
+            onClick={this.props.onUndo}
+            tooltip={title}
+          >
             Undo
           </Button>
         </div>
diff --git a/app/src/ui/check-runs/ci-check-re-run-button.tsx b/app/src/ui/check-runs/ci-check-re-run-button.tsx
index c42c7b0a99e..f72d4bdff93 100644
--- a/app/src/ui/check-runs/ci-check-re-run-button.tsx
+++ b/app/src/ui/check-runs/ci-check-re-run-button.tsx
@@ -1,11 +1,10 @@
 import * as React from 'react'
 import { APICheckConclusion } from '../../lib/api'
 import { IRefCheck } from '../../lib/ci-checks/ci-checks'
-import { enableReRunFailedAndSingleCheckJobs } from '../../lib/feature-flag'
 import { IMenuItem, showContextualMenu } from '../../lib/menu-item'
 import { Button } from '../lib/button'
 import { Octicon, syncClockwise } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import * as octicons from '../octicons/octicons.generated'
 
 interface ICICheckReRunButtonProps {
   readonly disabled: boolean
@@ -22,11 +21,7 @@ export class CICheckReRunButton extends React.PureComponent<ICICheckReRunButtonP
   }
 
   private onRerunChecks = () => {
-    if (
-      !enableReRunFailedAndSingleCheckJobs() ||
-      !this.props.canReRunFailed ||
-      !this.failedChecksExist
-    ) {
+    if (!this.props.canReRunFailed || !this.failedChecksExist) {
       this.props.onRerunChecks(false)
       return
     }
@@ -47,11 +42,9 @@ export class CICheckReRunButton extends React.PureComponent<ICICheckReRunButtonP
 
   public render() {
     const text =
-      enableReRunFailedAndSingleCheckJobs() &&
-      this.props.canReRunFailed &&
-      this.failedChecksExist ? (
+      this.props.canReRunFailed && this.failedChecksExist ? (
         <>
-          Re-run <Octicon symbol={OcticonSymbol.triangleDown} />
+          Re-run <Octicon symbol={octicons.triangleDown} />
         </>
       ) : (
         'Re-run Checks'
diff --git a/app/src/ui/check-runs/ci-check-run-actions-job-step-item.tsx b/app/src/ui/check-runs/ci-check-run-actions-job-step-item.tsx
index f4e5b1783c9..7310a8236d8 100644
--- a/app/src/ui/check-runs/ci-check-run-actions-job-step-item.tsx
+++ b/app/src/ui/check-runs/ci-check-run-actions-job-step-item.tsx
@@ -1,14 +1,19 @@
 import * as React from 'react'
 import { Octicon } from '../octicons'
+import * as octicons from '../octicons/octicons.generated'
 import classNames from 'classnames'
 import {
   getClassNameForCheck,
   getSymbolForLogStep,
 } from '../branches/ci-status'
 import { IAPIWorkflowJobStep } from '../../lib/api'
-import { getFormattedCheckRunDuration } from '../../lib/ci-checks/ci-checks'
+import {
+  getFormattedCheckRunDuration,
+  getFormattedCheckRunLongDuration,
+} from '../../lib/ci-checks/ci-checks'
 import { TooltippedContent } from '../lib/tooltipped-content'
 import { TooltipDirection } from '../lib/tooltip'
+import { Button } from '../lib/button'
 
 interface ICICheckRunActionsJobStepListItemProps {
   readonly step: IAPIWorkflowJobStep
@@ -24,7 +29,7 @@ export class CICheckRunActionsJobStepListItem extends React.PureComponent<ICIChe
   }
 
   private onStepHeaderRef = (step: IAPIWorkflowJobStep) => {
-    return (stepHeaderRef: HTMLDivElement | null) => {
+    return (stepHeaderRef: HTMLLIElement | null) => {
       if (
         this.props.firstFailedStep !== undefined &&
         step.number === this.props.firstFailedStep.number &&
@@ -38,9 +43,12 @@ export class CICheckRunActionsJobStepListItem extends React.PureComponent<ICIChe
   public render() {
     const { step } = this.props
     return (
-      <div
-        className="ci-check-run-job-step list-item"
+      <li
+        className="ci-check-run-job-step"
         ref={this.onStepHeaderRef(step)}
+        aria-label={`${step.name}, ${getFormattedCheckRunLongDuration(
+          step
+        )}, ${getClassNameForCheck(step)}`}
       >
         <div className="job-step-status-symbol">
           <Octicon
@@ -56,16 +64,25 @@ export class CICheckRunActionsJobStepListItem extends React.PureComponent<ICIChe
           className="job-step-name"
           tooltip={step.name}
           onlyWhenOverflowed={true}
-          tagName="div"
+          tagName="span"
           direction={TooltipDirection.NORTH}
         >
-          <span onClick={this.onViewJobStepExternally}>{step.name}</span>
+          {step.name}
         </TooltippedContent>
 
         <div className="job-step-duration">
           {getFormattedCheckRunDuration(step)}
         </div>
-      </div>
+        <Button
+          role="link"
+          className="view-check-externally"
+          onClick={this.onViewJobStepExternally}
+          tooltip={`View ${step.name} on GitHub`}
+          ariaLabel={`View ${step.name} on GitHub`}
+        >
+          <Octicon symbol={octicons.linkExternal} />
+        </Button>
+      </li>
     )
   }
 }
diff --git a/app/src/ui/check-runs/ci-check-run-actions-job-step-list.tsx b/app/src/ui/check-runs/ci-check-run-actions-job-step-list.tsx
index 060b6ea59e4..3a4514df51e 100644
--- a/app/src/ui/check-runs/ci-check-run-actions-job-step-list.tsx
+++ b/app/src/ui/check-runs/ci-check-run-actions-job-step-list.tsx
@@ -48,6 +48,6 @@ export class CICheckRunActionsJobStepList extends React.PureComponent<
       )
     })
 
-    return <div className="ci-check-run-job-steps-list">{jobSteps}</div>
+    return <ul className="ci-check-run-job-steps-list">{jobSteps}</ul>
   }
 }
diff --git a/app/src/ui/check-runs/ci-check-run-list-item.tsx b/app/src/ui/check-runs/ci-check-run-list-item.tsx
index bd05e9136dd..791df662f91 100644
--- a/app/src/ui/check-runs/ci-check-run-list-item.tsx
+++ b/app/src/ui/check-runs/ci-check-run-list-item.tsx
@@ -3,23 +3,19 @@ import { IRefCheck } from '../../lib/ci-checks/ci-checks'
 import { Octicon } from '../octicons'
 import { getClassNameForCheck, getSymbolForCheck } from '../branches/ci-status'
 import classNames from 'classnames'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import * as octicons from '../octicons/octicons.generated'
 import { TooltippedContent } from '../lib/tooltipped-content'
 import { CICheckRunActionsJobStepList } from './ci-check-run-actions-job-step-list'
 import { IAPIWorkflowJobStep } from '../../lib/api'
 import { TooltipDirection } from '../lib/tooltip'
-import { enableReRunFailedAndSingleCheckJobs } from '../../lib/feature-flag'
+import { Button } from '../lib/button'
+import { CICheckRunNoStepItem } from './ci-check-run-no-steps'
+import { CICheckRunStepListHeader } from './ci-check-run-step-list-header'
 
 interface ICICheckRunListItemProps {
   /** The check run to display **/
   readonly checkRun: IRefCheck
 
-  /** Whether call for actions logs is pending */
-  readonly loadingActionLogs: boolean
-
-  /** Whether tcall for actions workflows is pending */
-  readonly loadingActionWorkflows: boolean
-
   /** Whether to show the logs for this check run */
   readonly isCheckRunExpanded: boolean
 
@@ -35,6 +31,14 @@ interface ICICheckRunListItemProps {
   /** Showing a condensed view */
   readonly isCondensedView?: boolean
 
+  /**
+   * When the list item is displayed in the rerun dialog, there are no sub
+   * elements or view so they are not headers.
+   *
+   * Default: true
+   **/
+  readonly isHeader?: false
+
   /** Callback for when a check run is clicked */
   readonly onCheckRunExpansionToggleClick: (checkRun: IRefCheck) => void
 
@@ -51,20 +55,8 @@ interface ICICheckRunListItemProps {
   readonly onRerunJob?: (checkRun: IRefCheck) => void
 }
 
-interface ICICheckRunListItemState {
-  readonly isMouseOver: boolean
-}
-
 /** The CI check list item. */
-export class CICheckRunListItem extends React.PureComponent<
-  ICICheckRunListItemProps,
-  ICICheckRunListItemState
-> {
-  public constructor(props: ICICheckRunListItemProps) {
-    super(props)
-    this.state = { isMouseOver: false }
-  }
-
+export class CICheckRunListItem extends React.PureComponent<ICICheckRunListItemProps> {
   private toggleCheckRunExpansion = () => {
     this.props.onCheckRunExpansionToggleClick(this.props.checkRun)
   }
@@ -77,8 +69,7 @@ export class CICheckRunListItem extends React.PureComponent<
     this.props.onViewJobStep?.(this.props.checkRun, step)
   }
 
-  private rerunJob = (e: React.MouseEvent) => {
-    e.stopPropagation()
+  private rerunJob = () => {
     if (this.props.checkRun.actionJobSteps === undefined) {
       return
     }
@@ -86,16 +77,6 @@ export class CICheckRunListItem extends React.PureComponent<
     this.props.onRerunJob?.(this.props.checkRun)
   }
 
-  private onMouseEnter = () => {
-    if (!this.state.isMouseOver) {
-      this.setState({ isMouseOver: true })
-    }
-  }
-
-  private onMouseLeave = (e: React.MouseEvent) => {
-    this.setState({ isMouseOver: false })
-  }
-
   private renderCheckStatusSymbol = (): JSX.Element => {
     const { checkRun } = this.props
 
@@ -113,14 +94,9 @@ export class CICheckRunListItem extends React.PureComponent<
   }
 
   private renderCheckJobStepToggle = (): JSX.Element | null => {
-    const { checkRun, isCheckRunExpanded, selectable, notExpandable } =
-      this.props
-
-    if (
-      checkRun.actionJobSteps === undefined ||
-      selectable ||
-      notExpandable === true
-    ) {
+    const { isCheckRunExpanded, selectable, notExpandable } = this.props
+
+    if (selectable || notExpandable) {
       return null
     }
 
@@ -128,9 +104,7 @@ export class CICheckRunListItem extends React.PureComponent<
       <div className="job-step-toggled-indicator">
         <Octicon
           symbol={
-            isCheckRunExpanded
-              ? OcticonSymbol.chevronUp
-              : OcticonSymbol.chevronDown
+            isCheckRunExpanded ? octicons.chevronUp : octicons.chevronDown
           }
         />
       </div>
@@ -138,25 +112,19 @@ export class CICheckRunListItem extends React.PureComponent<
   }
 
   private renderCheckRunName = (): JSX.Element => {
-    const { checkRun, isCondensedView, onViewCheckExternally } = this.props
+    const { checkRun, isCondensedView, isHeader } = this.props
     const { name, description } = checkRun
     return (
       <div className="ci-check-list-item-detail">
         <TooltippedContent
+          id={`check-run-header-${checkRun.id}`}
           className="ci-check-name"
           tooltip={name}
           onlyWhenOverflowed={true}
-          tagName="div"
+          tagName={isHeader === false ? 'span' : 'h3'}
           direction={TooltipDirection.NORTH}
         >
-          <span
-            className={classNames({
-              isLink: onViewCheckExternally !== undefined,
-            })}
-            onClick={this.onViewCheckExternally}
-          >
-            {name}
-          </span>
+          {name}
         </TooltippedContent>
 
         {isCondensedView ? null : (
@@ -166,68 +134,92 @@ export class CICheckRunListItem extends React.PureComponent<
     )
   }
 
-  private renderJobRerun = (): JSX.Element | null => {
-    const { checkRun, onRerunJob } = this.props
-    const { isMouseOver } = this.state
-
-    if (
-      !isMouseOver ||
-      onRerunJob === undefined ||
-      !enableReRunFailedAndSingleCheckJobs()
-    ) {
-      return null
-    }
+  private renderCheckRunListItem = (): JSX.Element | null => {
+    const {
+      checkRun,
+      selectable,
+      notExpandable,
+      isCheckRunExpanded,
+      selected,
+      isCondensedView,
+    } = this.props
 
-    const classes = classNames('job-rerun', {
-      'not-action-job': checkRun.actionJobSteps === undefined,
+    const classes = classNames('ci-check-list-item', {
+      sticky: isCheckRunExpanded,
+      selected,
+      condensed: isCondensedView,
     })
 
-    const tooltip =
-      checkRun.actionJobSteps !== undefined
-        ? 'Re-run this check'
-        : 'This check cannot be re-run individually.'
+    const content = (
+      <>
+        {this.renderCheckStatusSymbol()}
+        {this.renderCheckRunName()}
+        {this.renderCheckJobStepToggle()}
+      </>
+    )
+
+    if (!selectable && notExpandable) {
+      return <div className={classes}>{content}</div>
+    }
 
     return (
-      <div className={classes} onClick={this.rerunJob}>
-        <TooltippedContent tooltip={tooltip}>
-          <Octicon symbol={OcticonSymbol.sync} />
-        </TooltippedContent>
-      </div>
+      <Button
+        className={classes}
+        onClick={this.toggleCheckRunExpansion}
+        ariaExpanded={!selectable ? this.props.isCheckRunExpanded : undefined}
+        ariaControls={`checkRun-${checkRun.id}`}
+      >
+        {content}
+      </Button>
     )
   }
 
-  public render() {
-    const { checkRun, isCheckRunExpanded, selected, isCondensedView } =
-      this.props
+  public renderStepsRegion() {
+    const { isCheckRunExpanded, checkRun } = this.props
 
-    const classes = classNames('ci-check-list-item', 'list-item', {
-      sticky: isCheckRunExpanded,
-      selected,
-      condensed: isCondensedView,
+    if (!isCheckRunExpanded) {
+      return null
+    }
+
+    const areNoSteps = checkRun.actionJobSteps === undefined
+
+    const classes = classNames('ci-steps-container', {
+      'no-steps': areNoSteps,
     })
+
     return (
       <div
-        className="ci-check-list-item-group"
-        onMouseEnter={this.onMouseEnter}
-        onMouseLeave={this.onMouseLeave}
+        role="region"
+        className={classes}
+        id={`checkrun-${checkRun.id}`}
+        aria-labelledby={`check-run-header-${checkRun.id}`}
       >
-        <div
-          className={classes}
-          onClick={this.toggleCheckRunExpansion}
-          tabIndex={0}
-        >
-          {this.renderCheckStatusSymbol()}
-          {this.renderCheckRunName()}
-          {this.renderJobRerun()}
-          {this.renderCheckJobStepToggle()}
-        </div>
-        {isCheckRunExpanded && checkRun.actionJobSteps !== undefined ? (
+        <CICheckRunStepListHeader
+          checkRun={checkRun}
+          onRerunJob={this.rerunJob}
+          onViewCheckExternally={this.onViewCheckExternally}
+        />
+
+        {areNoSteps ? (
+          <CICheckRunNoStepItem
+            onViewCheckExternally={this.onViewCheckExternally}
+          />
+        ) : (
           <CICheckRunActionsJobStepList
             steps={checkRun.actionJobSteps}
             onViewJobStep={this.onViewJobStep}
           />
-        ) : null}
+        )}
       </div>
     )
   }
+
+  public render() {
+    return (
+      <>
+        {this.renderCheckRunListItem()}
+        {this.renderStepsRegion()}
+      </>
+    )
+  }
 }
diff --git a/app/src/ui/check-runs/ci-check-run-list.tsx b/app/src/ui/check-runs/ci-check-run-list.tsx
index 953c2744525..2e9d7657ecb 100644
--- a/app/src/ui/check-runs/ci-check-run-list.tsx
+++ b/app/src/ui/check-runs/ci-check-run-list.tsx
@@ -14,12 +14,6 @@ interface ICICheckRunListProps {
   /** List of check runs to display */
   readonly checkRuns: ReadonlyArray<IRefCheck>
 
-  /** Whether loading action logs */
-  readonly loadingActionLogs: boolean
-
-  /** Whether loading workflow  */
-  readonly loadingActionWorkflows: boolean
-
   /** Whether check runs can be selected. Default: false */
   readonly selectable?: boolean
 
@@ -162,8 +156,6 @@ export class CICheckRunList extends React.PureComponent<
         <CICheckRunListItem
           checkRun={c}
           key={i}
-          loadingActionLogs={this.props.loadingActionLogs}
-          loadingActionWorkflows={this.props.loadingActionWorkflows}
           selectable={selectable}
           selected={selectable && checkRunExpanded}
           // Only expand check runs if the list is not selectable
@@ -174,6 +166,7 @@ export class CICheckRunList extends React.PureComponent<
           onViewJobStep={this.props.onViewJobStep}
           onRerunJob={this.props.onRerunJob}
           isCondensedView={this.props.isCondensedView}
+          isHeader={false}
         />
       )
     })
@@ -200,7 +193,7 @@ export class CICheckRunList extends React.PureComponent<
     const groups = checkRunGroupNames.map((groupName, i) => {
       return (
         <div className="ci-check-run-list-group" key={i}>
-          <div className={groupHeaderClasses}>{groupName}</div>
+          <h2 className={groupHeaderClasses}>{groupName}</h2>
           {this.renderListItems(checkRunGroups.get(groupName))}
         </div>
       )
diff --git a/app/src/ui/check-runs/ci-check-run-no-steps.tsx b/app/src/ui/check-runs/ci-check-run-no-steps.tsx
new file mode 100644
index 00000000000..f9c944008a7
--- /dev/null
+++ b/app/src/ui/check-runs/ci-check-run-no-steps.tsx
@@ -0,0 +1,35 @@
+import * as React from 'react'
+import { Octicon } from '../octicons'
+import * as octicons from '../octicons/octicons.generated'
+import { Button } from '../lib/button'
+import { encodePathAsUrl } from '../../lib/path'
+
+const PaperStackImage = encodePathAsUrl(__dirname, 'static/paper-stack.svg')
+
+interface ICICheckRunNoStepProps {
+  /** Callback to opens check runs target url (maybe GitHub, maybe third party) */
+  readonly onViewCheckExternally: () => void
+}
+
+/** The CI check no step view. */
+export class CICheckRunNoStepItem extends React.PureComponent<ICICheckRunNoStepProps> {
+  public render() {
+    return (
+      <div className="ci-check-run-no-steps">
+        <p>
+          There are no steps to display for this check.
+          <Button
+            className="button-with-icon"
+            onClick={this.props.onViewCheckExternally}
+            role="link"
+          >
+            View check details
+            <Octicon symbol={octicons.linkExternal} />
+          </Button>
+        </p>
+
+        <img src={PaperStackImage} alt="" />
+      </div>
+    )
+  }
+}
diff --git a/app/src/ui/check-runs/ci-check-run-popover.tsx b/app/src/ui/check-runs/ci-check-run-popover.tsx
index 9a1a47dcdb0..feb3ac2c4e6 100644
--- a/app/src/ui/check-runs/ci-check-run-popover.tsx
+++ b/app/src/ui/check-runs/ci-check-run-popover.tsx
@@ -11,12 +11,20 @@ import {
   FailingCheckConclusions,
 } from '../../lib/ci-checks/ci-checks'
 import { Octicon, syncClockwise } from '../octicons'
-import { APICheckConclusion, IAPIWorkflowJobStep } from '../../lib/api'
-import { Popover, PopoverCaretPosition } from '../lib/popover'
+import {
+  APICheckConclusion,
+  APICheckStatus,
+  IAPIWorkflowJobStep,
+} from '../../lib/api'
+import {
+  Popover,
+  PopoverAnchorPosition,
+  PopoverDecoration,
+} from '../lib/popover'
 import { CICheckRunList } from './ci-check-run-list'
 import { encodePathAsUrl } from '../../lib/path'
 import { PopupType } from '../../models/popup'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import * as octicons from '../octicons/octicons.generated'
 import { Donut } from '../donut'
 import {
   supportsRerunningChecks,
@@ -24,12 +32,29 @@ import {
 } from '../../lib/endpoint-capabilities'
 import { getPullRequestCommitRef } from '../../models/pull-request'
 import { CICheckReRunButton } from './ci-check-re-run-button'
+import groupBy from 'lodash/groupBy'
+import { toSentence } from '../../lib/to_sentence'
 
 const BlankSlateImage = encodePathAsUrl(
   __dirname,
   'static/empty-no-pull-requests.svg'
 )
 
+export function getCombinedStatusSummary(
+  statusHolders: ReadonlyArray<{ conclusion: APICheckConclusion | null }>,
+  description?: 'check' | 'step'
+): string {
+  const conclusions = Object.values(groupBy(statusHolders, 'conclusion')).map(
+    g =>
+      `${g.length} ${getCheckRunConclusionAdjective(
+        g[0].conclusion
+      ).toLocaleLowerCase()}`
+  )
+
+  const pluralize = statusHolders.length > 1 ? `${description}s` : description
+  return `${toSentence(conclusions)} ${pluralize}`
+}
+
 interface ICICheckRunPopoverProps {
   readonly dispatcher: Dispatcher
 
@@ -42,9 +67,7 @@ interface ICICheckRunPopoverProps {
   /** The pull request's number. */
   readonly prNumber: number
 
-  /** The bottom of the pull request badge so we can position popover relative
-   * to it. */
-  readonly badgeBottom: number
+  readonly anchor: HTMLElement | null
 
   /** Callback for when popover closes */
   readonly closePopover: (event?: MouseEvent) => void
@@ -53,7 +76,6 @@ interface ICICheckRunPopoverProps {
 interface ICICheckRunPopoverState {
   readonly checkRuns: ReadonlyArray<IRefCheck>
   readonly checkRunSummary: string
-  readonly loadingActionLogs: boolean
   readonly loadingActionWorkflows: boolean
 }
 
@@ -75,7 +97,6 @@ export class CICheckRunPopover extends React.PureComponent<
     this.state = {
       checkRuns: cachedStatus?.checks ?? [],
       checkRunSummary: this.getCombinedCheckSummary(cachedStatus),
-      loadingActionLogs: true,
       loadingActionWorkflows: true,
     }
   }
@@ -125,7 +146,6 @@ export class CICheckRunPopover extends React.PureComponent<
       checkRuns: [...check.checks],
       checkRunSummary: this.getCombinedCheckSummary(check),
       loadingActionWorkflows: false,
-      loadingActionLogs: false,
     })
   }
 
@@ -145,7 +165,7 @@ export class CICheckRunPopover extends React.PureComponent<
       `${this.props.repository.htmlURL}/pull/${this.props.prNumber}`
 
     this.props.dispatcher.openInBrowser(url)
-    this.props.dispatcher.recordCheckViewedOnline()
+    this.props.dispatcher.incrementMetric('viewsCheckOnline')
   }
 
   private onViewJobStep = (
@@ -158,7 +178,7 @@ export class CICheckRunPopover extends React.PureComponent<
 
     if (url !== null) {
       dispatcher.openInBrowser(url)
-      this.props.dispatcher.recordCheckJobStepViewedOnline()
+      this.props.dispatcher.incrementMetric('viewsCheckJobStepOnline')
     }
   }
 
@@ -168,30 +188,7 @@ export class CICheckRunPopover extends React.PureComponent<
     if (combinedCheck === null || combinedCheck.checks.length === 0) {
       return ''
     }
-
-    const { checks } = combinedCheck
-    const conclusionMap = new Map<string, number>()
-    for (const check of checks) {
-      const adj = getCheckRunConclusionAdjective(
-        check.conclusion
-      ).toLocaleLowerCase()
-      conclusionMap.set(adj, (conclusionMap.get(adj) ?? 0) + 1)
-    }
-
-    const summaryArray = []
-    for (const [conclusion, count] of conclusionMap.entries()) {
-      summaryArray.push({ count, conclusion })
-    }
-
-    if (summaryArray.length > 1) {
-      const output = summaryArray.map(
-        ({ count, conclusion }) => `${count} ${conclusion}`
-      )
-      return `${output.slice(0, -1).join(', ')}, and ${output.slice(-1)} checks`
-    }
-
-    const pluralize = summaryArray[0].count > 1 ? 'checks' : 'check'
-    return `${summaryArray[0].count} ${summaryArray[0].conclusion} ${pluralize}`
+    return getCombinedStatusSummary(combinedCheck.checks, 'check')
   }
 
   private rerunChecks = (
@@ -207,20 +204,6 @@ export class CICheckRunPopover extends React.PureComponent<
     })
   }
 
-  private getPopoverPositioningStyles = (): React.CSSProperties => {
-    const top = this.props.badgeBottom + 10
-    return { top }
-  }
-
-  private getListHeightStyles = (): React.CSSProperties => {
-    const headerHeight = 55
-    return {
-      maxHeight: `${
-        window.innerHeight - (this.props.badgeBottom + headerHeight + 20)
-      }px`,
-    }
-  }
-
   private renderRerunButton = () => {
     const { checkRuns } = this.state
     if (!supportsRerunningChecks(this.props.repository.endpoint)) {
@@ -242,7 +225,7 @@ export class CICheckRunPopover extends React.PureComponent<
   private renderCheckRunLoadings(): JSX.Element {
     return (
       <div className="loading-check-runs">
-        <img src={BlankSlateImage} className="blankslate-image" />
+        <img src={BlankSlateImage} className="blankslate-image" alt="" />
         <div className="title">Stand By</div>
         <div className="call-to-action">Check runs incoming!</div>
       </div>
@@ -264,20 +247,28 @@ export class CICheckRunPopover extends React.PureComponent<
         return (
           <Octicon
             className={'completeness-indicator-success'}
-            symbol={OcticonSymbol.checkCircleFill}
+            symbol={octicons.checkCircleFill}
           />
         )
       case allFailure: {
         return (
           <Octicon
             className={'completeness-indicator-error'}
-            symbol={OcticonSymbol.xCircleFill}
+            symbol={octicons.xCircleFill}
           />
         )
       }
     }
 
-    return <Donut valueMap={getCheckStatusCountMap(checkRuns)} />
+    const valueMap = getCheckStatusCountMap(checkRuns)
+
+    const ariaLabel = `Completeness indicator. ${
+      valueMap.get(APICheckStatus.Completed) ?? 0
+    } completed, ${valueMap.get(APICheckStatus.InProgress) ?? 0} in progress, ${
+      valueMap.get(APICheckStatus.Queued) ?? 0
+    } queued.`
+
+    return <Donut ariaLabel={ariaLabel} valueMap={valueMap} />
   }
 
   private getTitle(
@@ -340,7 +331,7 @@ export class CICheckRunPopover extends React.PureComponent<
       )
 
     return (
-      <div className="ci-check-run-list-header" tabIndex={0}>
+      <div className="ci-check-run-list-header">
         <div className="completeness-indicator">
           {this.renderCompletenessIndicator(
             allSuccessIsh,
@@ -350,14 +341,14 @@ export class CICheckRunPopover extends React.PureComponent<
           )}
         </div>
         <div className="ci-check-run-list-title-container">
-          <div className="title">
+          <h1 id="ci-check-run-header" className="title">
             {this.getTitle(
               allSuccessIsh,
               allFailure,
               somePendingNoFailures,
               loading
             )}
-          </div>
+          </h1>
           <div className="check-run-list-summary">{checkRunSummary}</div>
         </div>
         {this.renderRerunButton()}
@@ -370,20 +361,15 @@ export class CICheckRunPopover extends React.PureComponent<
   }
 
   public renderList = (): JSX.Element => {
-    const { checkRuns, loadingActionLogs, loadingActionWorkflows } = this.state
+    const { checkRuns, loadingActionWorkflows } = this.state
     if (loadingActionWorkflows) {
       return this.renderCheckRunLoadings()
     }
 
     return (
-      <div
-        className="ci-check-run-list-container"
-        style={this.getListHeightStyles()}
-      >
+      <div className="ci-check-run-list-container">
         <CICheckRunList
           checkRuns={checkRuns}
-          loadingActionLogs={loadingActionLogs}
-          loadingActionWorkflows={loadingActionWorkflows}
           onViewCheckDetails={this.onViewCheckDetails}
           onViewJobStep={this.onViewJobStep}
           onRerunJob={
@@ -402,12 +388,16 @@ export class CICheckRunPopover extends React.PureComponent<
     return (
       <div className="ci-check-list-popover">
         <Popover
-          caretPosition={PopoverCaretPosition.Top}
+          anchor={this.props.anchor}
+          anchorPosition={PopoverAnchorPosition.Bottom}
+          decoration={PopoverDecoration.Balloon}
+          ariaLabelledby="ci-check-run-header"
           onClickOutside={this.props.closePopover}
-          style={this.getPopoverPositioningStyles()}
         >
-          {this.renderHeader()}
-          {this.renderList()}
+          <div className="ci-check-run-list-wrapper">
+            {this.renderHeader()}
+            {this.renderList()}
+          </div>
         </Popover>
       </div>
     )
diff --git a/app/src/ui/check-runs/ci-check-run-rerun-dialog.tsx b/app/src/ui/check-runs/ci-check-run-rerun-dialog.tsx
index 38e10ac8edf..31b5459110a 100644
--- a/app/src/ui/check-runs/ci-check-run-rerun-dialog.tsx
+++ b/app/src/ui/check-runs/ci-check-run-rerun-dialog.tsx
@@ -11,7 +11,7 @@ import {
   IAPICheckSuite,
 } from '../../lib/api'
 import { Octicon } from '../octicons'
-import * as OcticonSymbol from './../octicons/octicons.generated'
+import * as octicons from './../octicons/octicons.generated'
 import { encodePathAsUrl } from '../../lib/path'
 import { offsetFromNow } from '../../lib/offset-from'
 
@@ -74,7 +74,7 @@ export class CICheckRunRerunDialog extends React.Component<
       prRef,
       this.state.rerunnable
     )
-    dispatcher.recordRerunChecks()
+    dispatcher.incrementMetric('rerunsChecks')
     this.props.onDismissed()
   }
 
@@ -140,8 +140,6 @@ export class CICheckRunRerunDialog extends React.Component<
       <div className="ci-check-run-list check-run-rerun-list">
         <CICheckRunList
           checkRuns={this.state.rerunnable}
-          loadingActionLogs={false}
-          loadingActionWorkflows={false}
           notExpandable={true}
           isCondensedView={true}
         />
@@ -190,7 +188,7 @@ export class CICheckRunRerunDialog extends React.Component<
           }${pluralize} that cannot be re-run`
     return (
       <div className="non-re-run-info warning-helper-text">
-        <Octicon symbol={OcticonSymbol.alert} />
+        <Octicon symbol={octicons.alert} />
 
         {`${warningPrefix}. A check run cannot be re-run if the check is more than one month old,
           the check or its dependent has not completed, or the check is not configured to be
@@ -220,7 +218,7 @@ export class CICheckRunRerunDialog extends React.Component<
     if (this.state.loadingCheckSuites && this.props.checkRuns.length > 1) {
       return (
         <div className="loading-rerun-checks">
-          <img src={BlankSlateImage} className="blankslate-image" />
+          <img src={BlankSlateImage} className="blankslate-image" alt="" />
           <div className="title">Please wait</div>
           <div className="call-to-action">
             Determining which checks can be re-run.
diff --git a/app/src/ui/check-runs/ci-check-run-step-list-header.tsx b/app/src/ui/check-runs/ci-check-run-step-list-header.tsx
new file mode 100644
index 00000000000..691be34959a
--- /dev/null
+++ b/app/src/ui/check-runs/ci-check-run-step-list-header.tsx
@@ -0,0 +1,82 @@
+import * as React from 'react'
+import { Octicon } from '../octicons'
+import * as octicons from '../octicons/octicons.generated'
+import { Button } from '../lib/button'
+import { getCombinedStatusSummary } from './ci-check-run-popover'
+import { IRefCheck } from '../../lib/ci-checks/ci-checks'
+
+interface ICICheckRunStepListHeaderProps {
+  /** The check run to display **/
+  readonly checkRun: IRefCheck
+
+  /** Callback to opens check runs target url (maybe GitHub, maybe third party) */
+  readonly onViewCheckExternally: () => void
+
+  /** Callback to rerun a job*/
+  readonly onRerunJob?: (check: IRefCheck) => void
+}
+
+/** The CI check no step view. */
+export class CICheckRunStepListHeader extends React.PureComponent<ICICheckRunStepListHeaderProps> {
+  private onRerunJob = () => {
+    const { onRerunJob, checkRun } = this.props
+    onRerunJob?.(checkRun)
+  }
+
+  private renderJobRerun = (): JSX.Element | null => {
+    const { checkRun, onRerunJob } = this.props
+
+    if (onRerunJob === undefined) {
+      return null
+    }
+
+    const tooltip = `Re-run ${checkRun.name}`
+    return (
+      <Button
+        className="job-rerun"
+        tooltip={tooltip}
+        onClick={this.onRerunJob}
+        ariaLabel={tooltip}
+      >
+        <Octicon symbol={octicons.sync} />
+      </Button>
+    )
+  }
+
+  private renderLinkExternal = (): JSX.Element | null => {
+    const { onViewCheckExternally, checkRun } = this.props
+
+    if (onViewCheckExternally === undefined) {
+      return null
+    }
+
+    const label = `View ${checkRun.name} on GitHub`
+    return (
+      <Button
+        role="link"
+        className="view-check-externally"
+        onClick={this.props.onViewCheckExternally}
+        tooltip={label}
+        ariaLabel={label}
+      >
+        <Octicon symbol={octicons.linkExternal} />
+      </Button>
+    )
+  }
+
+  public render() {
+    const { actionJobSteps } = this.props.checkRun
+
+    if (actionJobSteps === undefined) {
+      return null
+    }
+
+    return (
+      <div className="ci-check-run-steps-header">
+        <h4>{getCombinedStatusSummary(actionJobSteps, 'step')}</h4>
+        {this.renderJobRerun()}
+        {this.renderLinkExternal()}
+      </div>
+    )
+  }
+}
diff --git a/app/src/ui/checkout/confirm-checkout-commit.tsx b/app/src/ui/checkout/confirm-checkout-commit.tsx
new file mode 100644
index 00000000000..ac97a8da35f
--- /dev/null
+++ b/app/src/ui/checkout/confirm-checkout-commit.tsx
@@ -0,0 +1,106 @@
+import * as React from 'react'
+import { Dialog, DialogContent, DialogFooter } from '../dialog'
+import { Repository } from '../../models/repository'
+import { Dispatcher } from '../dispatcher'
+import { Row } from '../lib/row'
+import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group'
+import { Checkbox, CheckboxValue } from '../lib/checkbox'
+import { CommitOneLine } from '../../models/commit'
+
+interface IConfirmCheckoutCommitProps {
+  readonly dispatcher: Dispatcher
+  readonly repository: Repository
+  readonly commit: CommitOneLine
+  readonly askForConfirmationOnCheckoutCommit: boolean
+  readonly onDismissed: () => void
+}
+
+interface IConfirmCheckoutCommitState {
+  readonly isCheckingOut: boolean
+  readonly confirmCheckoutCommit: boolean
+}
+/**
+ * Dialog to confirm checking out a commit
+ */
+export class ConfirmCheckoutCommitDialog extends React.Component<
+  IConfirmCheckoutCommitProps,
+  IConfirmCheckoutCommitState
+> {
+  public constructor(props: IConfirmCheckoutCommitProps) {
+    super(props)
+
+    this.state = {
+      isCheckingOut: false,
+      confirmCheckoutCommit: props.askForConfirmationOnCheckoutCommit,
+    }
+  }
+
+  public render() {
+    const title = __DARWIN__ ? 'Checkout Commit?' : 'Checkout commit?'
+
+    return (
+      <Dialog
+        id="checkout-commit"
+        type="warning"
+        title={title}
+        loading={this.state.isCheckingOut}
+        disabled={this.state.isCheckingOut}
+        onSubmit={this.onSubmit}
+        onDismissed={this.props.onDismissed}
+        ariaDescribedBy="checking-out-commit-confirmation"
+        role="alertdialog"
+      >
+        <DialogContent>
+          <Row id="checking-out-commit-confirmation">
+            Checking out a commit will create a detached HEAD, and you will no
+            longer be on any branch. Are you sure you want to checkout this
+            commit?
+          </Row>
+          <Row>
+            <Checkbox
+              label="Do not show this message again"
+              value={
+                this.state.confirmCheckoutCommit
+                  ? CheckboxValue.Off
+                  : CheckboxValue.On
+              }
+              onChange={this.onaskForConfirmationOnCheckoutCommitChanged}
+            />
+          </Row>
+        </DialogContent>
+        <DialogFooter>
+          <OkCancelButtonGroup destructive={true} okButtonText="Checkout" />
+        </DialogFooter>
+      </Dialog>
+    )
+  }
+
+  private onaskForConfirmationOnCheckoutCommitChanged = (
+    event: React.FormEvent<HTMLInputElement>
+  ) => {
+    const value = !event.currentTarget.checked
+
+    this.setState({ confirmCheckoutCommit: value })
+  }
+
+  private onSubmit = async () => {
+    const { dispatcher, repository, commit, onDismissed } = this.props
+
+    this.setState({
+      isCheckingOut: true,
+    })
+
+    try {
+      dispatcher.setConfirmCheckoutCommitSetting(
+        this.state.confirmCheckoutCommit
+      )
+      await dispatcher.checkoutCommit(repository, commit)
+    } finally {
+      this.setState({
+        isCheckingOut: false,
+      })
+    }
+
+    onDismissed()
+  }
+}
diff --git a/app/src/ui/clone-repository/clone-generic-repository.tsx b/app/src/ui/clone-repository/clone-generic-repository.tsx
index 678da4bbeca..10f5bd9cff2 100644
--- a/app/src/ui/clone-repository/clone-generic-repository.tsx
+++ b/app/src/ui/clone-repository/clone-generic-repository.tsx
@@ -39,10 +39,12 @@ export class CloneGenericRepository extends React.Component<
             onValueChanged={this.onUrlChanged}
             autoFocus={true}
             label={
-              <span>
-                Repository URL or GitHub username and repository
-                <br />(<Ref>hubot/cool-repo</Ref>)
-              </span>
+              <div className="clone-url-textbox-label">
+                <p>Repository URL or GitHub username and repository</p>
+                <p>
+                  (<Ref>hubot/cool-repo</Ref>)
+                </p>
+              </div>
             }
           />
         </Row>
diff --git a/app/src/ui/clone-repository/clone-repository.tsx b/app/src/ui/clone-repository/clone-repository.tsx
index a8896f9295c..82e080894c6 100644
--- a/app/src/ui/clone-repository/clone-repository.tsx
+++ b/app/src/ui/clone-repository/clone-repository.tsx
@@ -3,6 +3,7 @@ import * as React from 'react'
 import { Dispatcher } from '../dispatcher'
 import { getDefaultDir, setDefaultDir } from '../lib/default-dir'
 import { Account } from '../../models/account'
+import { FoldoutType } from '../../lib/app-state'
 import {
   IRepositoryIdentifier,
   parseRepositoryIdentifier,
@@ -23,6 +24,7 @@ import { ClickSource } from '../lib/list'
 import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group'
 import { showOpenDialog, showSaveDialog } from '../main-process-proxy'
 import { readdir } from 'fs/promises'
+import { isTopMostDialog } from '../dialog/is-top-most'
 
 interface ICloneRepositoryProps {
   readonly dispatcher: Dispatcher
@@ -64,6 +66,9 @@ interface ICloneRepositoryProps {
    * available for cloning.
    */
   readonly onRefreshRepositories: (account: Account) => void
+
+  /** Whether the dialog is the top most in the dialog stack */
+  readonly isTopMost: boolean
 }
 
 interface ICloneRepositoryState {
@@ -147,6 +152,16 @@ export class CloneRepository extends React.Component<
   ICloneRepositoryProps,
   ICloneRepositoryState
 > {
+  private checkIsTopMostDialog = isTopMostDialog(
+    () => {
+      this.validatePath()
+      window.addEventListener('focus', this.onWindowFocus)
+    },
+    () => {
+      window.removeEventListener('focus', this.onWindowFocus)
+    }
+  )
+
   public constructor(props: ICloneRepositoryProps) {
     super(props)
 
@@ -187,6 +202,12 @@ export class CloneRepository extends React.Component<
     if (prevProps.selectedTab !== this.props.selectedTab) {
       this.validatePath()
     }
+
+    if (prevProps.initialURL !== this.props.initialURL) {
+      this.updateUrl(this.props.initialURL || '')
+    }
+
+    this.checkIsTopMostDialog(this.props.isTopMost)
   }
 
   public componentDidMount() {
@@ -195,7 +216,11 @@ export class CloneRepository extends React.Component<
       this.updateUrl(initialURL)
     }
 
-    window.addEventListener('focus', this.onWindowFocus)
+    this.checkIsTopMostDialog(this.props.isTopMost)
+  }
+
+  public componentWillUnmount(): void {
+    this.checkIsTopMostDialog(false)
   }
 
   private initializePath = async () => {
@@ -219,10 +244,6 @@ export class CloneRepository extends React.Component<
     this.updateUrl(selectedTabState.url)
   }
 
-  public componentWillUnmount() {
-    window.removeEventListener('focus', this.onWindowFocus)
-  }
-
   public render() {
     const { error } = this.getSelectedTabState()
     return (
@@ -237,20 +258,30 @@ export class CloneRepository extends React.Component<
           onTabClicked={this.onTabClicked}
           selectedIndex={this.props.selectedTab}
         >
-          <span>GitHub.com</span>
-          <span>GitHub Enterprise</span>
-          <span>URL</span>
+          <span id="dotcom-tab">GitHub.com</span>
+          <span id="enterprise-tab">GitHub Enterprise</span>
+          <span id="url-tab">URL</span>
         </TabBar>
 
         {error ? <DialogError>{error.message}</DialogError> : null}
 
-        {this.renderActiveTab()}
+        <div role="tabpanel" aria-labelledby={this.getSelectedTabId()}>
+          {this.renderActiveTab()}
+        </div>
 
         {this.renderFooter()}
       </Dialog>
     )
   }
 
+  private getSelectedTabId = () => {
+    return this.props.selectedTab === CloneRepositoryTab.DotCom
+      ? 'dotcom-tab'
+      : this.props.selectedTab === CloneRepositoryTab.Enterprise
+      ? 'enterprise-tab'
+      : 'url-tab'
+  }
+
   private checkIfCloningDisabled = () => {
     const tabState = this.getSelectedTabState()
     const { error, url, path } = tabState
@@ -472,8 +503,8 @@ export class CloneRepository extends React.Component<
             onAction={this.signInEnterprise}
           >
             <div>
-              If you have a GitHub Enterprise or AE account at work, sign in to
-              it to get access to your repositories.
+              If you are using GitHub Enterprise at work, sign in to it to get
+              access to your repositories.
             </div>
           </CallToAction>
         )
@@ -676,6 +707,10 @@ export class CloneRepository extends React.Component<
       accounts.push(this.props.enterpriseAccount)
     }
 
+    if (url.endsWith('.wiki.git')) {
+      return { url }
+    }
+
     const account = await findAccountForRemoteURL(url, accounts)
     if (lastParsedIdentifier !== null && account !== null) {
       const api = API.fromAccount(account)
@@ -724,6 +759,7 @@ export class CloneRepository extends React.Component<
 
     const { url, defaultBranch } = cloneInfo
 
+    this.props.dispatcher.closeFoldout(FoldoutType.Repository)
     try {
       this.cloneImpl(url.trim(), path, defaultBranch)
     } catch (e) {
diff --git a/app/src/ui/clone-repository/cloneable-repository-filter-list.tsx b/app/src/ui/clone-repository/cloneable-repository-filter-list.tsx
index 50a0293c5aa..27ef18f984f 100644
--- a/app/src/ui/clone-repository/cloneable-repository-filter-list.tsx
+++ b/app/src/ui/clone-repository/cloneable-repository-filter-list.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { Account } from '../../models/account'
-import { FilterList, IFilterListGroup } from '../lib/filter-list'
+import { IFilterListGroup } from '../lib/filter-list'
 import { IAPIRepository, getDotComAPIEndpoint, getHTMLURL } from '../../lib/api'
 import {
   ICloneableRepositoryListItem,
@@ -15,6 +15,8 @@ import { HighlightText } from '../lib/highlight-text'
 import { ClickSource } from '../lib/list'
 import { LinkButton } from '../lib/link-button'
 import { Ref } from '../lib/ref'
+import { SectionFilterList } from '../lib/section-filter-list'
+import { TooltippedContent } from '../lib/tooltipped-content'
 
 interface ICloneableRepositoryFilterListProps {
   /** The account to clone from. */
@@ -153,6 +155,15 @@ export class CloneableRepositoryFilterList extends React.PureComponent<ICloneabl
     this.props.onRefreshRepositories(this.props.account)
   }
 
+  private getGroupAriaLabelGetter =
+    (groups: ReadonlyArray<IFilterListGroup<ICloneableRepositoryListItem>>) =>
+    (group: number) => {
+      const groupIdentifier = groups[group].identifier
+      return groupIdentifier === YourRepositoriesIdentifier
+        ? this.getYourRepositoriesLabel()
+        : groupIdentifier
+    }
+
   public render() {
     const { repositories, account, selectedItem } = this.props
 
@@ -160,8 +171,8 @@ export class CloneableRepositoryFilterList extends React.PureComponent<ICloneabl
     const selectedListItem = this.getSelectedListItem(groups, selectedItem)
 
     return (
-      <FilterList<ICloneableRepositoryListItem>
-        className="clone-github-repo"
+      <SectionFilterList<ICloneableRepositoryListItem>
+        className={'clone-github-repo'}
         rowHeight={RowHeight}
         selectedItem={selectedListItem}
         renderItem={this.renderItem}
@@ -174,7 +185,8 @@ export class CloneableRepositoryFilterList extends React.PureComponent<ICloneabl
         renderNoItems={this.renderNoItems}
         renderPostFilter={this.renderPostFilter}
         onItemClick={this.props.onItemClicked ? this.onItemClick : undefined}
-        placeholderText="Filter your repositories"
+        placeholderText={'Filter your repositories'}
+        getGroupAriaLabel={this.getGroupAriaLabelGetter(groups)}
       />
     )
   }
@@ -206,10 +218,14 @@ export class CloneableRepositoryFilterList extends React.PureComponent<ICloneabl
     }
   }
 
+  private getYourRepositoriesLabel = () => {
+    return __DARWIN__ ? 'Your Repositories' : 'Your repositories'
+  }
+
   private renderGroupHeader = (identifier: string) => {
     let header = identifier
     if (identifier === YourRepositoriesIdentifier) {
-      header = __DARWIN__ ? 'Your Repositories' : 'Your repositories'
+      header = this.getYourRepositoriesLabel()
     }
     return (
       <div className="clone-repository-list-content clone-repository-list-group-header">
@@ -225,19 +241,28 @@ export class CloneableRepositoryFilterList extends React.PureComponent<ICloneabl
     return (
       <div className="clone-repository-list-item">
         <Octicon className="icon" symbol={item.icon} />
-        <div className="name" title={item.text[0]}>
+        <TooltippedContent
+          className="name"
+          tooltip={item.text[0]}
+          onlyWhenOverflowed={true}
+          tagName="div"
+        >
           <HighlightText text={item.text[0]} highlight={matches.title} />
-        </div>
+        </TooltippedContent>
+        {item.archived && <div className="archived">Archived</div>}
       </div>
     )
   }
 
   private renderPostFilter = () => {
+    const tooltip = 'Refresh the list of repositories'
+
     return (
       <Button
         disabled={this.props.loading}
         onClick={this.refreshRepositories}
-        tooltip="Refresh the list of repositories"
+        ariaLabel={tooltip}
+        tooltip={tooltip}
       >
         <Octicon
           symbol={syncClockwise}
diff --git a/app/src/ui/clone-repository/group-repositories.ts b/app/src/ui/clone-repository/group-repositories.ts
index 6f9e07a00b6..e161f89d197 100644
--- a/app/src/ui/clone-repository/group-repositories.ts
+++ b/app/src/ui/clone-repository/group-repositories.ts
@@ -1,8 +1,10 @@
 import { IAPIRepository } from '../../lib/api'
 import { IFilterListGroup, IFilterListItem } from '../lib/filter-list'
-import { caseInsensitiveCompare } from '../../lib/compare'
-import { OcticonSymbolType } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import { OcticonSymbol } from '../octicons'
+import * as octicons from '../octicons/octicons.generated'
+import entries from 'lodash/entries'
+import groupBy from 'lodash/groupBy'
+import { caseInsensitiveEquals, compare } from '../../lib/compare'
 
 /** The identifier for the "Your Repositories" grouping. */
 export const YourRepositoriesIdentifier = 'your-repositories'
@@ -18,70 +20,57 @@ export interface ICloneableRepositoryListItem extends IFilterListItem {
   readonly name: string
 
   /** The icon for the repo. */
-  readonly icon: OcticonSymbolType
+  readonly icon: OcticonSymbol
 
   /** The clone URL. */
   readonly url: string
+
+  /** Whether or not the repository is archived */
+  readonly archived?: boolean
 }
 
-function getIcon(gitHubRepo: IAPIRepository): OcticonSymbolType {
+function getIcon(gitHubRepo: IAPIRepository): OcticonSymbol {
   if (gitHubRepo.private) {
-    return OcticonSymbol.lock
+    return octicons.lock
   }
   if (gitHubRepo.fork) {
-    return OcticonSymbol.repoForked
+    return octicons.repoForked
   }
 
-  return OcticonSymbol.repo
+  return octicons.repo
 }
 
-function convert(
-  repositories: ReadonlyArray<IAPIRepository>
-): ReadonlyArray<ICloneableRepositoryListItem> {
-  const repos: ReadonlyArray<ICloneableRepositoryListItem> = repositories.map(
-    repo => {
-      const icon = getIcon(repo)
-
-      return {
-        id: repo.html_url,
-        text: [`${repo.owner.login}/${repo.name}`],
-        url: repo.clone_url,
-        name: repo.name,
-        icon,
-      }
-    }
-  )
-
-  return repos
-}
+const toListItems = (repositories: ReadonlyArray<IAPIRepository>) =>
+  repositories
+    .map<ICloneableRepositoryListItem>(repo => ({
+      id: repo.html_url,
+      text: [`${repo.owner.login}/${repo.name}`],
+      url: repo.clone_url,
+      name: repo.name,
+      icon: getIcon(repo),
+      archived: repo.archived,
+    }))
+    .sort((x, y) => compare(x.name, y.name))
 
 export function groupRepositories(
   repositories: ReadonlyArray<IAPIRepository>,
   login: string
 ): ReadonlyArray<IFilterListGroup<ICloneableRepositoryListItem>> {
-  const userRepos = repositories.filter(repo => repo.owner.type === 'User')
-  const orgRepos = repositories.filter(
-    repo => repo.owner.type === 'Organization'
+  const groups = groupBy(repositories, x =>
+    caseInsensitiveEquals(x.owner.login, login)
+      ? YourRepositoriesIdentifier
+      : x.owner.login
   )
 
-  const groups = [
-    {
-      identifier: YourRepositoriesIdentifier,
-      items: convert(userRepos),
-    },
-  ]
-
-  const orgs = orgRepos.map(repo => repo.owner.login)
-  const distinctOrgs = Array.from(new Set(orgs))
-
-  for (const org of distinctOrgs.sort(caseInsensitiveCompare)) {
-    const orgRepositories = orgRepos.filter(repo => repo.owner.login === org)
-
-    groups.push({
-      identifier: org,
-      items: convert(orgRepositories),
+  return entries(groups)
+    .map(([identifier, repos]) => ({ identifier, items: toListItems(repos) }))
+    .sort((x, y) => {
+      if (x.identifier === YourRepositoriesIdentifier) {
+        return -1
+      } else if (y.identifier === YourRepositoriesIdentifier) {
+        return 1
+      } else {
+        return compare(x.identifier, y.identifier)
+      }
     })
-  }
-
-  return groups
 }
diff --git a/app/src/ui/cloning-repository.tsx b/app/src/ui/cloning-repository.tsx
index e6352b657a2..aaca8cae3f3 100644
--- a/app/src/ui/cloning-repository.tsx
+++ b/app/src/ui/cloning-repository.tsx
@@ -3,8 +3,9 @@ import * as React from 'react'
 import { CloningRepository } from '../models/cloning-repository'
 import { ICloneProgress } from '../models/progress'
 import { Octicon } from './octicons'
-import * as OcticonSymbol from './octicons/octicons.generated'
+import * as octicons from './octicons/octicons.generated'
 import { UiView } from './ui-view'
+import { TooltippedContent } from './lib/tooltipped-content'
 
 interface ICloningRepositoryProps {
   readonly repository: CloningRepository
@@ -24,13 +25,17 @@ export class CloningRepositoryView extends React.Component<
     return (
       <UiView id="cloning-repository-view">
         <div className="title-container">
-          <Octicon symbol={OcticonSymbol.desktopDownload} />
+          <Octicon symbol={octicons.desktopDownload} />
           <div className="title">Cloning {this.props.repository.name}</div>
         </div>
         <progress value={progressValue} />
-        <div title={this.props.progress.description} className="details">
+        <TooltippedContent
+          tagName="div"
+          className="details"
+          tooltip={this.props.progress.description}
+        >
           {this.props.progress.description}
-        </div>
+        </TooltippedContent>
       </UiView>
     )
   }
diff --git a/app/src/ui/commit-message/commit-message-dialog.tsx b/app/src/ui/commit-message/commit-message-dialog.tsx
index 5c7df0b7cfa..270c1dcfcff 100644
--- a/app/src/ui/commit-message/commit-message-dialog.tsx
+++ b/app/src/ui/commit-message/commit-message-dialog.tsx
@@ -9,13 +9,14 @@ import { ICommitContext } from '../../models/commit'
 import { CommitIdentity } from '../../models/commit-identity'
 import { ICommitMessage } from '../../models/commit-message'
 import { IAutocompletionProvider } from '../autocompletion'
-import { IAuthor } from '../../models/author'
+import { Author, UnknownAuthor } from '../../models/author'
 import { CommitMessage } from '../changes/commit-message'
-import { noop } from 'lodash'
+import noop from 'lodash/noop'
 import { Popup } from '../../models/popup'
 import { Foldout } from '../../lib/app-state'
 import { Account } from '../../models/account'
-import { pick } from '../../lib/pick'
+import { RepoRulesInfo } from '../../models/repo-rules'
+import { IAheadBehind } from '../../models/branch'
 
 interface ICommitMessageDialogProps {
   /**
@@ -34,7 +35,7 @@ interface ICommitMessageDialogProps {
    * subsequent commit to add Co-Authored-By commit message trailers depending
    * on whether the user has chosen to do so.
    */
-  readonly coAuthors: ReadonlyArray<IAuthor>
+  readonly coAuthors: ReadonlyArray<Author>
 
   /**
    * The name and email that will be used for the author info when committing
@@ -52,6 +53,8 @@ interface ICommitMessageDialogProps {
    */
   readonly commitSpellcheckEnabled: boolean
 
+  readonly showCommitLengthWarning: boolean
+
   /** Text for the ok button */
   readonly dialogButtonText: string
 
@@ -70,6 +73,11 @@ interface ICommitMessageDialogProps {
   /** Whether to warn the user that they are on a protected branch. */
   readonly showBranchProtected: boolean
 
+  /** Repository rules that apply to the branch. */
+  readonly repoRulesInfo: RepoRulesInfo
+
+  readonly aheadBehind: IAheadBehind | null
+
   /**
    * Whether or not to show a field for adding co-authors to a commit
    * (currently only supported for GH/GHE repositories)
@@ -86,11 +94,12 @@ interface ICommitMessageDialogProps {
   readonly onSubmitCommitMessage: (context: ICommitContext) => Promise<boolean>
 
   readonly repositoryAccount: Account | null
+  readonly accounts: ReadonlyArray<Account>
 }
 
 interface ICommitMessageDialogState {
   readonly showCoAuthoredBy: boolean
-  readonly coAuthors: ReadonlyArray<IAuthor>
+  readonly coAuthors: ReadonlyArray<Author>
 }
 
 export class CommitMessageDialog extends React.Component<
@@ -99,7 +108,8 @@ export class CommitMessageDialog extends React.Component<
 > {
   public constructor(props: ICommitMessageDialogProps) {
     super(props)
-    this.state = pick(props, 'showCoAuthoredBy', 'coAuthors')
+    const { showCoAuthoredBy, coAuthors } = props
+    this.state = { showCoAuthoredBy, coAuthors }
   }
 
   public render() {
@@ -111,8 +121,12 @@ export class CommitMessageDialog extends React.Component<
       >
         <DialogContent>
           <CommitMessage
+            showInputLabels={true}
             branch={this.props.branch}
+            mostRecentLocalCommit={null}
             commitAuthor={this.props.commitAuthor}
+            isShowingModal={true}
+            isShowingFoldout={false}
             commitButtonText={this.props.dialogButtonText}
             commitToAmend={null}
             repository={this.props.repository}
@@ -125,10 +139,16 @@ export class CommitMessageDialog extends React.Component<
             prepopulateCommitSummary={this.props.prepopulateCommitSummary}
             key={this.props.repository.id}
             showBranchProtected={this.props.showBranchProtected}
+            repoRulesInfo={this.props.repoRulesInfo}
+            aheadBehind={this.props.aheadBehind}
             showNoWriteAccess={this.props.showNoWriteAccess}
             commitSpellcheckEnabled={this.props.commitSpellcheckEnabled}
+            showCommitLengthWarning={this.props.showCommitLengthWarning}
             onCoAuthorsUpdated={this.onCoAuthorsUpdated}
             onShowCoAuthoredByChanged={this.onShowCoAuthorsChanged}
+            onConfirmCommitWithUnknownCoAuthors={
+              this.onConfirmCommitWithUnknownCoAuthors
+            }
             onCreateCommit={this.props.onSubmitCommitMessage}
             anyFilesAvailable={true}
             anyFilesSelected={true}
@@ -142,18 +162,27 @@ export class CommitMessageDialog extends React.Component<
             repositoryAccount={this.props.repositoryAccount}
             onStopAmending={this.onStopAmending}
             onShowCreateForkDialog={this.onShowCreateForkDialog}
+            accounts={this.props.accounts}
           />
         </DialogContent>
       </Dialog>
     )
   }
 
-  private onCoAuthorsUpdated = (coAuthors: ReadonlyArray<IAuthor>) =>
+  private onCoAuthorsUpdated = (coAuthors: ReadonlyArray<Author>) =>
     this.setState({ coAuthors })
 
   private onShowCoAuthorsChanged = (showCoAuthoredBy: boolean) =>
     this.setState({ showCoAuthoredBy })
 
+  private onConfirmCommitWithUnknownCoAuthors = (
+    coAuthors: ReadonlyArray<UnknownAuthor>,
+    onCommitAnyway: () => void
+  ) => {
+    const { dispatcher } = this.props
+    dispatcher.showUnknownAuthorsCommitWarning(coAuthors, onCommitAnyway)
+  }
+
   private onRefreshAuthor = () =>
     this.props.dispatcher.refreshAuthor(this.props.repository)
 
diff --git a/app/src/ui/copy-button.tsx b/app/src/ui/copy-button.tsx
new file mode 100644
index 00000000000..f23756de79e
--- /dev/null
+++ b/app/src/ui/copy-button.tsx
@@ -0,0 +1,72 @@
+import { clipboard } from 'electron'
+import React from 'react'
+import * as octicons from './octicons/octicons.generated'
+import { Octicon } from './octicons'
+import { sleep } from '../lib/promise'
+import { Button } from './lib/button'
+import { AriaLiveContainer } from './accessibility/aria-live-container'
+
+interface ICopyButtonProps {
+  readonly copyContent: string
+  readonly ariaLabel: string
+}
+
+interface ICopyButtonState {
+  readonly showCopied: boolean
+}
+
+export class CopyButton extends React.Component<
+  ICopyButtonProps,
+  ICopyButtonState
+> {
+  public constructor(props: ICopyButtonProps) {
+    super(props)
+
+    this.state = {
+      showCopied: false,
+    }
+  }
+
+  private onCopy = async (e: React.MouseEvent<HTMLButtonElement>) => {
+    e.preventDefault()
+    clipboard.writeText(this.props.copyContent)
+
+    this.setState({ showCopied: true })
+
+    await sleep(2000)
+
+    this.setState({ showCopied: false })
+  }
+
+  public renderSymbol() {
+    const { showCopied } = this.state
+
+    const symbol = showCopied ? octicons.check : octicons.copy
+
+    return <Octicon symbol={symbol} height={24} />
+  }
+
+  public render() {
+    const { ariaLabel } = this.props
+    const { showCopied } = this.state
+
+    const copiedMessage = 'Copied!'
+    const ariaMessage = showCopied ? copiedMessage : ''
+    return (
+      <Button
+        className="copy-button"
+        tooltip={showCopied ? copiedMessage : ariaLabel}
+        ariaLabel={ariaLabel}
+        onClick={this.onCopy}
+        openTooltipOnClick={true}
+        applyTooltipAriaDescribedBy={false}
+      >
+        {this.renderSymbol()}
+        <AriaLiveContainer
+          message={ariaMessage}
+          trackedUserInput={ariaMessage}
+        />
+      </Button>
+    )
+  }
+}
diff --git a/app/src/ui/create-branch/create-branch-dialog.tsx b/app/src/ui/create-branch/create-branch-dialog.tsx
index 2cd885825bf..f8d49dab2a3 100644
--- a/app/src/ui/create-branch/create-branch-dialog.tsx
+++ b/app/src/ui/create-branch/create-branch-dialog.tsx
@@ -1,12 +1,15 @@
 import * as React from 'react'
 
-import { Repository } from '../../models/repository'
+import {
+  Repository,
+  isRepositoryWithGitHubRepository,
+} from '../../models/repository'
 import { Dispatcher } from '../dispatcher'
 import { Branch, StartPoint } from '../../models/branch'
 import { Row } from '../lib/row'
 import { Ref } from '../lib/ref'
 import { LinkButton } from '../lib/link-button'
-import { Dialog, DialogError, DialogContent, DialogFooter } from '../dialog'
+import { Dialog, DialogContent, DialogFooter } from '../dialog'
 import {
   VerticalSegmentedControl,
   ISegmentedItem,
@@ -28,11 +31,19 @@ import { CommitOneLine } from '../../models/commit'
 import { PopupType } from '../../models/popup'
 import { RepositorySettingsTab } from '../repository-settings/repository-settings'
 import { isRepositoryWithForkedGitHubRepository } from '../../models/repository'
+import { API, APIRepoRuleType, IAPIRepoRuleset } from '../../lib/api'
+import { Account } from '../../models/account'
+import { getAccountForRepository } from '../../lib/get-account-for-repository'
+import { InputError } from '../lib/input-description/input-error'
+import { InputWarning } from '../lib/input-description/input-warning'
+import { parseRepoRules, useRepoRulesLogic } from '../../lib/helpers/repo-rules'
 
 interface ICreateBranchProps {
   readonly repository: Repository
   readonly targetCommit?: CommitOneLine
   readonly upstreamGitHubRepository: GitHubRepository | null
+  readonly accounts: ReadonlyArray<Account>
+  readonly cachedRepoRulesets: ReadonlyMap<number, IAPIRepoRuleset>
   readonly dispatcher: Dispatcher
   readonly onBranchCreatedFromCommit?: () => void
   readonly onDismissed: () => void
@@ -63,7 +74,7 @@ interface ICreateBranchProps {
 }
 
 interface ICreateBranchState {
-  readonly currentError: Error | null
+  readonly currentError: { error: Error; isWarning: boolean } | null
   readonly branchName: string
   readonly startPoint: StartPoint
 
@@ -101,6 +112,10 @@ export class CreateBranch extends React.Component<
   ICreateBranchProps,
   ICreateBranchState
 > {
+  private branchRulesDebounceId: number | null = null
+
+  private readonly ERRORS_ID = 'branch-name-errors'
+
   public constructor(props: ICreateBranchProps) {
     super(props)
 
@@ -135,6 +150,16 @@ export class CreateBranch extends React.Component<
         ),
       })
     }
+
+    if (nextProps.initialName.length > 0) {
+      this.checkBranchRules(nextProps.initialName)
+    }
+  }
+
+  public componentWillUnmount() {
+    if (this.branchRulesDebounceId !== null) {
+      window.clearTimeout(this.branchRulesDebounceId)
+    }
   }
 
   private renderBranchSelection() {
@@ -190,6 +215,37 @@ export class CreateBranch extends React.Component<
     }
   }
 
+  private renderBranchNameErrors() {
+    const { currentError } = this.state
+    if (!currentError) {
+      return null
+    }
+
+    if (currentError.isWarning) {
+      return (
+        <Row>
+          <InputWarning
+            id={this.ERRORS_ID}
+            trackedUserInput={this.state.branchName}
+          >
+            {currentError.error.message}
+          </InputWarning>
+        </Row>
+      )
+    } else {
+      return (
+        <Row>
+          <InputError
+            id={this.ERRORS_ID}
+            trackedUserInput={this.state.branchName}
+          >
+            {currentError.error.message}
+          </InputError>
+        </Row>
+      )
+    }
+  }
+
   private onBaseBranchChanged = (startPoint: StartPoint) => {
     this.setState({
       startPoint,
@@ -199,9 +255,9 @@ export class CreateBranch extends React.Component<
   public render() {
     const disabled =
       this.state.branchName.length <= 0 ||
-      !!this.state.currentError ||
+      (!!this.state.currentError && !this.state.currentError.isWarning) ||
       /^\s*$/.test(this.state.branchName)
-    const error = this.state.currentError
+    const hasError = !!this.state.currentError
 
     return (
       <Dialog
@@ -212,15 +268,16 @@ export class CreateBranch extends React.Component<
         loading={this.state.isCreatingBranch}
         disabled={this.state.isCreatingBranch}
       >
-        {error ? <DialogError>{error.message}</DialogError> : null}
-
         <DialogContent>
           <RefNameTextBox
             label="Name"
+            ariaDescribedBy={hasError ? this.ERRORS_ID : undefined}
             initialValue={this.props.initialName}
             onValueChange={this.onBranchNameChange}
           />
 
+          {this.renderBranchNameErrors()}
+
           {renderBranchNameExistsOnRemoteWarning(
             this.state.branchName,
             this.props.allBranches
@@ -259,20 +316,148 @@ export class CreateBranch extends React.Component<
     this.updateBranchName(name)
   }
 
-  private updateBranchName(branchName: string) {
+  private async updateBranchName(branchName: string) {
+    this.setState({ branchName })
+
     const alreadyExists =
       this.props.allBranches.findIndex(b => b.name === branchName) > -1
 
     const currentError = alreadyExists
-      ? new Error(`A branch named ${branchName} already exists`)
+      ? {
+          error: new Error(`A branch named ${branchName} already exists.`),
+          isWarning: false,
+        }
       : null
 
+    if (!currentError) {
+      if (this.branchRulesDebounceId !== null) {
+        window.clearTimeout(this.branchRulesDebounceId)
+      }
+
+      this.branchRulesDebounceId = window.setTimeout(
+        this.checkBranchRules,
+        500,
+        branchName
+      )
+    }
+
     this.setState({
       branchName,
       currentError,
     })
   }
 
+  /**
+   * Checks repo rules to see if the provided branch name is valid for the
+   * current user and repository. The "get all rules for a branch" endpoint
+   * is called first, and if a "creation" or "branch name" rule is found,
+   * then those rulesets are checked to see if the current user can bypass
+   * them.
+   */
+  private checkBranchRules = async (branchName: string) => {
+    if (
+      this.state.branchName !== branchName ||
+      this.props.accounts.length === 0 ||
+      !isRepositoryWithGitHubRepository(this.props.repository) ||
+      branchName === '' ||
+      this.state.currentError !== null
+    ) {
+      return
+    }
+
+    const account = getAccountForRepository(
+      this.props.accounts,
+      this.props.repository
+    )
+
+    if (
+      account === null ||
+      !useRepoRulesLogic(account, this.props.repository)
+    ) {
+      return
+    }
+
+    const api = API.fromAccount(account)
+    const branchRules = await api.fetchRepoRulesForBranch(
+      this.props.repository.gitHubRepository.owner.login,
+      this.props.repository.gitHubRepository.name,
+      branchName
+    )
+
+    // Make sure user branch name hasn't changed during api call
+    if (this.state.branchName !== branchName) {
+      return
+    }
+
+    // filter the rules to only the relevant ones and get their IDs. use a Set to dedupe.
+    const toCheck = new Set(
+      branchRules
+        .filter(
+          r =>
+            r.type === APIRepoRuleType.Creation ||
+            r.type === APIRepoRuleType.BranchNamePattern
+        )
+        .map(r => r.ruleset_id)
+    )
+
+    // there are no relevant rules for this branch name, so return
+    if (toCheck.size === 0) {
+      return
+    }
+
+    // check for actual failures
+    const { branchNamePatterns, creationRestricted } = await parseRepoRules(
+      branchRules,
+      this.props.cachedRepoRulesets,
+      this.props.repository
+    )
+
+    // Make sure user branch name hasn't changed during parsing of repo rules
+    // (async due to a config retrieval of users with commit signing repo rules)
+    if (this.state.branchName !== branchName) {
+      return
+    }
+
+    const { status } = branchNamePatterns.getFailedRules(branchName)
+
+    // Only possible kind of failures is branch name pattern failures and creation restriction
+    if (creationRestricted !== true && status === 'pass') {
+      return
+    }
+
+    // check cached rulesets to see which ones the user can bypass
+    let cannotBypass = false
+    for (const id of toCheck) {
+      const rs = this.props.cachedRepoRulesets.get(id)
+
+      if (rs?.current_user_can_bypass !== 'always') {
+        // the user cannot bypass, so stop checking
+        cannotBypass = true
+        break
+      }
+    }
+
+    if (cannotBypass) {
+      this.setState({
+        currentError: {
+          error: new Error(
+            `Branch name '${branchName}' is restricted by repo rules.`
+          ),
+          isWarning: false,
+        },
+      })
+    } else {
+      this.setState({
+        currentError: {
+          error: new Error(
+            `Branch name '${branchName}' is restricted by repo rules, but you can bypass them. Proceed with caution!`
+          ),
+          isWarning: true,
+        },
+      })
+    }
+  }
+
   private createBranch = async () => {
     const name = this.state.branchName
 
@@ -288,7 +473,10 @@ export class CreateBranch extends React.Component<
       // to make sure the startPoint state is valid given the current props.
       if (!defaultBranch) {
         this.setState({
-          currentError: new Error('Could not determine the default branch'),
+          currentError: {
+            error: new Error('Could not determine the default branch.'),
+            isWarning: false,
+          },
         })
         return
       }
@@ -299,7 +487,10 @@ export class CreateBranch extends React.Component<
       // to make sure the startPoint state is valid given the current props.
       if (!upstreamDefaultBranch) {
         this.setState({
-          currentError: new Error('Could not determine the default branch'),
+          currentError: {
+            error: new Error('Could not determine the default branch.'),
+            isWarning: false,
+          },
         })
         return
       }
@@ -354,8 +545,12 @@ export class CreateBranch extends React.Component<
         <div>
           Your new branch will be based on your currently checked out branch (
           <Ref>{currentBranchName}</Ref>){this.renderForkLinkSuffix()}.{' '}
-          <Ref>{currentBranchName}</Ref> is the {defaultBranchLink} for your
-          repository.
+          {defaultBranch?.name === currentBranchName && (
+            <>
+              <Ref>{currentBranchName}</Ref> is the {defaultBranchLink} for your
+              repository.
+            </>
+          )}
         </div>
       )
     } else {
diff --git a/app/src/ui/delete-branch/delete-branch-dialog.tsx b/app/src/ui/delete-branch/delete-branch-dialog.tsx
index 7f226973598..3c26e77cec9 100644
--- a/app/src/ui/delete-branch/delete-branch-dialog.tsx
+++ b/app/src/ui/delete-branch/delete-branch-dialog.tsx
@@ -45,14 +45,18 @@ export class DeleteBranch extends React.Component<
         onDismissed={this.props.onDismissed}
         disabled={this.state.isDeleting}
         loading={this.state.isDeleting}
+        role="alertdialog"
+        ariaDescribedBy="delete-branch-confirmation-message delete-branch-confirmation-message-remote"
       >
         <DialogContent>
-          <p>
-            Delete branch <Ref>{this.props.branch.name}</Ref>?<br />
-            This action cannot be undone.
-          </p>
+          <div id="delete-branch-confirmation-message">
+            <p>
+              Delete branch <Ref>{this.props.branch.name}</Ref>?
+            </p>
+            <p>This action cannot be undone.</p>
 
-          {this.renderDeleteOnRemote()}
+            {this.renderDeleteOnRemote()}
+          </div>
         </DialogContent>
         <DialogFooter>
           <OkCancelButtonGroup destructive={true} okButtonText="Delete" />
@@ -65,7 +69,7 @@ export class DeleteBranch extends React.Component<
     if (this.props.branch.upstreamRemoteName && this.props.existsOnRemote) {
       return (
         <div>
-          <p>
+          <p id="delete-branch-confirmation-message-remote">
             <strong>
               The branch also exists on the remote, do you wish to delete it
               there as well?
diff --git a/app/src/ui/delete-branch/delete-remote-branch-dialog.tsx b/app/src/ui/delete-branch/delete-remote-branch-dialog.tsx
index c80eb85d10b..82cfa67e8bc 100644
--- a/app/src/ui/delete-branch/delete-remote-branch-dialog.tsx
+++ b/app/src/ui/delete-branch/delete-remote-branch-dialog.tsx
@@ -39,17 +39,21 @@ export class DeleteRemoteBranch extends React.Component<
         onDismissed={this.props.onDismissed}
         disabled={this.state.isDeleting}
         loading={this.state.isDeleting}
+        role="alertdialog"
+        ariaDescribedBy="delete-branch-confirmation-message"
       >
         <DialogContent>
-          <p>
-            Delete remote branch <Ref>{this.props.branch.name}</Ref>?<br />
-            This action cannot be undone.
-          </p>
+          <div id="delete-branch-confirmation-message">
+            <p>
+              Delete remote branch <Ref>{this.props.branch.name}</Ref>?
+            </p>
+            <p>This action cannot be undone.</p>
 
-          <p>
-            This branch does not exist locally. Deleting it may impact others
-            collaborating on this branch.
-          </p>
+            <p>
+              This branch does not exist locally. Deleting it may impact others
+              collaborating on this branch.
+            </p>
+          </div>
         </DialogContent>
         <DialogFooter>
           <OkCancelButtonGroup destructive={true} okButtonText="Delete" />
diff --git a/app/src/ui/delete-tag/delete-tag-dialog.tsx b/app/src/ui/delete-tag/delete-tag-dialog.tsx
index 5bf3a62c79c..2db5dbdb13d 100644
--- a/app/src/ui/delete-tag/delete-tag-dialog.tsx
+++ b/app/src/ui/delete-tag/delete-tag-dialog.tsx
@@ -39,9 +39,11 @@ export class DeleteTag extends React.Component<
         onDismissed={this.props.onDismissed}
         disabled={this.state.isDeleting}
         loading={this.state.isDeleting}
+        role="alertdialog"
+        ariaDescribedBy="delete-tag-confirmation"
       >
         <DialogContent>
-          <p>
+          <p id="delete-tag-confirmation">
             Are you sure you want to delete the tag{' '}
             <Ref>{this.props.tagName}</Ref>?
           </p>
diff --git a/app/src/ui/dialog/dialog.tsx b/app/src/ui/dialog/dialog.tsx
index fc5b0313c70..b4760befa35 100644
--- a/app/src/ui/dialog/dialog.tsx
+++ b/app/src/ui/dialog/dialog.tsx
@@ -3,6 +3,40 @@ import classNames from 'classnames'
 import { DialogHeader } from './header'
 import { createUniqueId, releaseUniqueId } from '../lib/id-pool'
 import { getTitleBarHeight } from '../window/title-bar'
+import { isTopMostDialog } from './is-top-most'
+import { isMacOSSonoma, isMacOSVentura } from '../../lib/get-os'
+import { sendDialogDidOpen } from '../main-process-proxy'
+
+/**
+ * Class name used for elements that should be focused initially when a dialog
+ * is shown.
+ */
+export const DialogPreferredFocusClassName = 'dialog-preferred-focus'
+
+export interface IDialogStackContext {
+  /** Whether or not this dialog is the top most one in the stack to be
+   * interacted with by the user. This will also determine if event listeners
+   * will be active or not. */
+  isTopMost: boolean
+}
+
+/**
+ * The DialogStackContext is used to communicate between the `Dialog` and the
+ * `App` information that is mostly unique to the `Dialog` component such as
+ * whether it is at the top of the popup stack. Some, but not the vast majority,
+ * custom popup components in between may also utilize this to enable and
+ * disable event listeners in response to changes in whether it is the top most
+ * popup.
+ *
+ * NB *** React.Context is not the preferred method of passing data to child
+ * components for this code base. We are choosing to use it here as implementing
+ * prop drilling would be extremely tedious and would lead to adding  `Dialog`
+ * props on 60+ components that would not otherwise use them. ***
+ *
+ */
+export const DialogStackContext = React.createContext<IDialogStackContext>({
+  isTopMost: false,
+})
 
 /**
  * The time (in milliseconds) from when the dialog is mounted
@@ -35,19 +69,39 @@ interface IDialogProps {
   readonly title?: string | JSX.Element
 
   /**
-   * Whether or not the dialog should be dismissable. A dismissable dialog
-   * can be dismissed either by clicking on the backdrop or by clicking
-   * the close button in the header (if a header was specified). Dismissal
-   * will trigger the onDismissed event which callers must handle and pass
-   * on to the dispatcher in order to close the dialog.
-   *
-   * A non-dismissable dialog can only be closed by means of the component
-   * implementing a dialog. An example would be a critical error or warning
-   * that requires explicit user action by for example clicking on a button.
+   * Typically, a titleId is automatically generated based on the title
+   * attribute if it is a string. If it is not provided, we must assume the
+   * responsibility of providing a titleID that is used as the id of the h1 in
+   * the custom header and used in the aria attributes in this dialog component.
+   * By providing this titleID, the state.titleID will be set to this value and
+   * used in the aria attributes.
+   * */
+  readonly titleId?: string
+
+  /**
+   * An optional element to render to the right of the dialog title.
+   * This can be used to render additional controls that don't belong to the
+   * heading element itself, but are still part of the header (visually).
+   */
+  readonly renderHeaderAccessory?: () => JSX.Element
+
+  /**
+   * Whether or not the dialog should be dismissable by clicking on the
+   * backdrop. Dismissal will trigger the onDismissed event which callers
+   * must handle and pass on to the dispatcher in order to close the dialog.
    *
    * Defaults to true if omitted.
    */
-  readonly dismissable?: boolean
+  readonly backdropDismissable?: boolean
+
+  /**
+   * Whether or not the dialog should be dismissable by any built-in means
+   * (like pressing Escape, clicking on the close button, or clicking on the
+   * backdrop -if enabled-).
+   *
+   * Defaults to false if omitted.
+   */
+  readonly dismissDisabled?: boolean
 
   /**
    * Event triggered when the dialog is dismissed by the user in the
@@ -104,8 +158,66 @@ interface IDialogProps {
    * of the loading operation.
    */
   readonly loading?: boolean
+
+  /** Whether or not to override focus of first element with close button */
+  readonly focusCloseButtonOnOpen?: boolean
+
+  readonly onDialogRef?: (ref: HTMLDialogElement | null) => void
+}
+
+/**
+ * If role is alertdialog, ariaDescribedBy is required.
+ */
+interface IAlertDialogProps extends IDialogProps {
+  /** This is used to point to an element containing content pertinent to the
+   * users workflow. This should be provided for dialogs that are alerts or
+   * confirmations so that that the information that is interrupting the user's
+   * workflow is screen reader announced and acquire a response */
+  readonly ariaDescribedBy: string
+
+  /** By default, a dialog has role of "dialog" and requires the use of an
+   * "aria-label" or "aria-labelledby" to accessibily announce the title or
+   * purpose of the header. This is typically accomplished by providing the
+   * `title` prop and the dialog component will take care of adding the
+   * `aria-labelledby` attribute.
+   *
+   * However, if the dialog is an alert or confirmation dialog we should use the
+   * role of `alertdialog` AND the `ariaDescribedBy` prop should be provided
+   * containing the id of the element with the information required by the user
+   * to proceed or be made aware of to ensure it is also read by screen readers.
+   *
+   *
+   * https://www.w3.org/TR/wai-aria-1.1/#alertdialog
+   * "An alert dialog is a modal dialog that interrupts the user's workflow to
+   * communicate an important message and acquire a response. Examples include
+   * action confirmation prompts and error message confirmations. The
+   * alertdialog role enables assistive technologies and browsers to distinguish
+   * alert dialogs from other dialogs so they have the option of giving alert
+   * dialogs special treatment, such as playing a system alert sound."
+   * */
+  readonly role: 'alertdialog'
 }
 
+/**
+ * If role is undefined or dialog, ariaDescribedBy is optional.
+ */
+interface IDescribedByDialogProps extends IDialogProps {
+  /** This is used to point to an element containing content pertinent to the
+   * users workflow. This should be provided for dialogs that are alerts or
+   * confirmations so that that the information that is interrupting the user's
+   * workflow is screen reader announced and acquire a response */
+  readonly ariaDescribedBy?: string
+
+  /** By default, a dialog has role of "dialog". This is only required for a
+   * role of 'alertdialog' in which case  `ariaDescribedBy` must also be
+   * provided */
+  readonly role?: 'dialog'
+}
+
+/** Interface union to force usage of `ariaDescribedBy` if role of `alertdialog`
+ * is used */
+type DialogProps = IAlertDialogProps | IDescribedByDialogProps
+
 interface IDialogState {
   /**
    * When a dialog is shown we wait for a few hundred milliseconds before
@@ -137,7 +249,19 @@ interface IDialogState {
  * underlying elements. It's not possible to use the tab key to move focus
  * out of the dialog without first dismissing it.
  */
-export class Dialog extends React.Component<IDialogProps, IDialogState> {
+export class Dialog extends React.Component<DialogProps, IDialogState> {
+  public static contextType = DialogStackContext
+  public declare context: React.ContextType<typeof DialogStackContext>
+
+  private checkIsTopMostDialog = isTopMostDialog(
+    () => {
+      this.onDialogIsTopMost()
+    },
+    () => {
+      this.onDialogIsNotTopMost()
+    }
+  )
+
   private dialogElement: HTMLDialogElement | null = null
   private dismissGraceTimeoutId?: number
 
@@ -152,9 +276,9 @@ export class Dialog extends React.Component<IDialogProps, IDialogState> {
   private readonly resizeObserver: ResizeObserver
   private resizeDebounceId: number | null = null
 
-  public constructor(props: IDialogProps) {
+  public constructor(props: DialogProps) {
     super(props)
-    this.state = { isAppearing: true }
+    this.state = { isAppearing: true, titleId: this.props.titleId }
 
     // Observe size changes and let codemirror know
     // when it needs to refresh.
@@ -214,13 +338,29 @@ export class Dialog extends React.Component<IDialogProps, IDialogState> {
 
   private onDismissGraceTimer = () => {
     this.setState({ isAppearing: false })
+
+    this.dialogElement?.dispatchEvent(
+      new CustomEvent('dialog-appeared', {
+        bubbles: true,
+        cancelable: false,
+      })
+    )
+  }
+
+  private isBackdropDismissable() {
+    return this.props.backdropDismissable !== false
   }
 
   private isDismissable() {
-    return this.props.dismissable === undefined || this.props.dismissable
+    return this.props.dismissDisabled !== true
   }
 
   private updateTitleId() {
+    if (this.props.titleId) {
+      // Using the one provided that is used in a custom header
+      return
+    }
+
     if (this.state.titleId) {
       releaseUniqueId(this.state.titleId)
       this.setState({ titleId: undefined })
@@ -242,11 +382,18 @@ export class Dialog extends React.Component<IDialogProps, IDialogState> {
   }
 
   public componentDidMount() {
-    if (!this.dialogElement) {
+    sendDialogDidOpen()
+    this.checkIsTopMostDialog(this.context.isTopMost)
+  }
+
+  protected onDialogIsTopMost() {
+    if (this.dialogElement == null) {
       return
     }
 
-    this.dialogElement.showModal()
+    if (!this.dialogElement.open) {
+      this.dialogElement.showModal()
+    }
 
     // Provide an event that components can subscribe to in order to perform
     // tasks such as re-layout after the dialog is visible
@@ -268,6 +415,20 @@ export class Dialog extends React.Component<IDialogProps, IDialogState> {
     window.addEventListener('resize', this.scheduleResizeEvent)
   }
 
+  protected onDialogIsNotTopMost() {
+    if (this.dialogElement !== null && this.dialogElement.open) {
+      this.dialogElement?.close()
+    }
+
+    this.clearDismissGraceTimeout()
+
+    window.removeEventListener('focus', this.onWindowFocus)
+    document.removeEventListener('mouseup', this.onDocumentMouseUp)
+
+    this.resizeObserver.disconnect()
+    window.removeEventListener('resize', this.scheduleResizeEvent)
+  }
+
   /**
    * Attempts to move keyboard focus to the first _suitable_ child of the
    * dialog.
@@ -295,7 +456,11 @@ export class Dialog extends React.Component<IDialogProps, IDialogState> {
    * In attempting to follow the guidelines outlined above we follow a priority
    * order in determining the first suitable child.
    *
-   *  1. The element with the lowest positive tabIndex
+   *  1. An element marked with the `DialogPreferredFocusClassName` class.
+   *     Sometimes we just need a specific element to get focus first, and it's
+   *     hard to fit it into the rest of these generic focus rules.
+   *
+   *  2. The element with the lowest positive tabIndex
    *     This might sound counterintuitive but imagine the following pseudo
    *     dialog this would be button D as button D would be the first button
    *     to get focused when hitting Tab.
@@ -307,18 +472,20 @@ export class Dialog extends React.Component<IDialogProps, IDialogState> {
    *      <button tabIndex=1>D</button>
    *     </dialog>
    *
-   *  2. The first element which is either implicitly keyboard focusable (like a
+   *  3. The first element which is either implicitly keyboard focusable (like a
    *     text input field) or explicitly focusable through tabIndex=0 (like a TabBar
    *     tab)
    *
-   *  3. The first submit button. We use this as a proxy for what macOS HIG calls
+   *  4. The first submit button. We use this as a proxy for what macOS HIG calls
    *     "default button". It's not the same thing but for our purposes it's close
    *     enough.
    *
-   *  4. Any remaining button
+   *  5. Any remaining button
+   *
+   *  6. The dialog close button
    *
    */
-  private focusFirstSuitableChild() {
+  public focusFirstSuitableChild() {
     const dialog = this.dialogElement
 
     if (dialog === null) {
@@ -332,6 +499,9 @@ export class Dialog extends React.Component<IDialogProps, IDialogState> {
       '[tabindex]:not(:disabled):not([tabindex="-1"])',
     ].join(', ')
 
+    // Element marked as "preferred" to have the focus when dialog is shown
+    let firstPreferred: HTMLElement | null = null
+
     // The element which has the lowest explicit tab index (i.e. greater than 0)
     let firstExplicit: { 0: number; 1: HTMLElement | null } = [Infinity, null]
 
@@ -346,18 +516,31 @@ export class Dialog extends React.Component<IDialogProps, IDialogState> {
     // anchor tag masquerading as a button)
     let firstTabbable: HTMLElement | null = null
 
+    const closeButton = dialog.querySelector(
+      ':scope > div.dialog-header button.close'
+    )
+
+    if (
+      closeButton instanceof HTMLElement &&
+      this.props.focusCloseButtonOnOpen
+    ) {
+      closeButton.focus()
+      return
+    }
+
     const excludedInputTypes = [
       ':not([type=button])',
       ':not([type=submit])',
       ':not([type=reset])',
       ':not([type=hidden])',
-      ':not([type=checkbox])',
       ':not([type=radio])',
     ]
 
+    const preferredFirstSelector = `.${DialogPreferredFocusClassName}`
     const inputSelector = `input${excludedInputTypes.join('')}, textarea`
     const buttonSelector =
       'input[type=button], input[type=submit] input[type=reset], button'
+
     const submitSelector = 'input[type=submit], button[type=submit]'
 
     for (const candidate of dialog.querySelectorAll(selector)) {
@@ -367,7 +550,12 @@ export class Dialog extends React.Component<IDialogProps, IDialogState> {
 
       const tabIndex = parseInt(candidate.getAttribute('tabindex') || '', 10)
 
-      if (tabIndex > 0 && tabIndex < firstExplicit[0]) {
+      if (
+        firstPreferred === null &&
+        candidate.matches(preferredFirstSelector)
+      ) {
+        firstPreferred = candidate
+      } else if (tabIndex > 0 && tabIndex < firstExplicit[0]) {
         firstExplicit = [tabIndex, candidate]
       } else if (
         firstTabbable === null &&
@@ -379,16 +567,29 @@ export class Dialog extends React.Component<IDialogProps, IDialogState> {
         candidate.matches(submitSelector)
       ) {
         firstSubmitButton = candidate
-      } else if (firstButton === null && candidate.matches(buttonSelector)) {
+      } else if (
+        firstButton === null &&
+        candidate.matches(buttonSelector) &&
+        candidate !== closeButton
+      ) {
         firstButton = candidate
       }
     }
 
-    const newActive =
-      firstExplicit[1] || firstTabbable || firstSubmitButton || firstButton
+    const focusCandidates = [
+      firstPreferred,
+      firstExplicit[1],
+      firstTabbable,
+      firstSubmitButton,
+      firstButton,
+      closeButton,
+    ]
 
-    if (newActive !== null) {
-      newActive.focus()
+    for (const focusCandidate of focusCandidates) {
+      if (focusCandidate instanceof HTMLElement) {
+        focusCandidate.focus()
+        break
+      }
     }
   }
 
@@ -418,23 +619,19 @@ export class Dialog extends React.Component<IDialogProps, IDialogState> {
   }
 
   public componentWillUnmount() {
-    this.clearDismissGraceTimeout()
-
     if (this.state.titleId) {
       releaseUniqueId(this.state.titleId)
     }
 
-    window.removeEventListener('focus', this.onWindowFocus)
-    document.removeEventListener('mouseup', this.onDocumentMouseUp)
-
-    this.resizeObserver.disconnect()
-    window.removeEventListener('resize', this.scheduleResizeEvent)
+    this.checkIsTopMostDialog(false)
   }
 
-  public componentDidUpdate() {
+  public componentDidUpdate(prevProps: DialogProps) {
     if (!this.props.title && this.state.titleId) {
       this.updateTitleId()
     }
+
+    this.checkIsTopMostDialog(this.context.isTopMost)
   }
 
   private onDialogCancel = (e: Event | React.SyntheticEvent) => {
@@ -447,7 +644,7 @@ export class Dialog extends React.Component<IDialogProps, IDialogState> {
       return
     }
 
-    if (this.isDismissable() === false) {
+    if (!this.isDismissable() || !this.isBackdropDismissable()) {
       return
     }
 
@@ -533,12 +730,14 @@ export class Dialog extends React.Component<IDialogProps, IDialogState> {
     }
 
     this.dialogElement = e
+    this.props.onDialogRef?.(e)
   }
 
   private onKeyDown = (event: React.KeyboardEvent) => {
     if (event.defaultPrevented) {
       return
     }
+
     const shortcutKey = __DARWIN__ ? event.metaKey : event.ctrlKey
     if ((shortcutKey && event.key === 'w') || event.key === 'Escape') {
       this.onDialogCancel(event)
@@ -572,13 +771,78 @@ export class Dialog extends React.Component<IDialogProps, IDialogState> {
       <DialogHeader
         title={this.props.title}
         titleId={this.state.titleId}
-        dismissable={this.isDismissable()}
-        onDismissed={this.onDismiss}
+        showCloseButton={this.isDismissable()}
+        onCloseButtonClick={this.onDismiss}
+        renderAccessory={this.props.renderHeaderAccessory}
         loading={this.props.loading}
       />
     )
   }
 
+  /**
+   * Gets the aria-labelledby and aria-describedby attributes for the dialog
+   * element.
+   *
+   * The correct semantics are that the dialog element should have the
+   * aria-labelledby and the aria-describedby is optional unless the dialog has
+   * a role of alertdialog, in which case both are required.
+   *
+   * However, macOS VoiceOver is not consistent. We have different implementations for it.
+   */
+  private getAriaAttributes() {
+    if (isMacOSVentura()) {
+      /*
+       * macOs Ventura introduced a regression in that:
+       *
+       * For role of 'dialog' (default),  the aria-labelledby is not announced and
+       *    if provided prevents the aria-describedby from being announced. Thus,
+       *    this method will add the aria-labelledby to the aria-describedby in this
+       *    case.
+       *
+       * For role of 'alertdialog', the aria-labelledby is announced but not the
+       *    aria-describedby. Thus, this method will add both to the
+       *    aria-labelledby.
+       *
+       * Neither of the above is semantically correct tho, hopefully, macOs will be
+       * fixed in a future release. The issue is known for macOS versions 13.0 to
+       * the current version of 13.5 as of 2023-07-31.
+       *
+       * A known macOS behavior is that if two ids are provided to the
+       * aria-describedby only the first one is announced with a note about the
+       * second one existing. This currently does not impact us as we only provide
+       * one id for non-alert dialogs and the alert dialogs are handled with the
+       * `aria-labelledby` where both ids are announced
+       */
+      if (this.props.role === 'alertdialog') {
+        return {
+          'aria-labelledby': `${this.state.titleId} ${this.props.ariaDescribedBy}`,
+        }
+      }
+
+      return {
+        'aria-describedby': `${this.state.titleId} ${
+          this.props.ariaDescribedBy ?? ''
+        }`,
+      }
+    }
+
+    if (isMacOSSonoma() && this.props.role !== 'alertdialog') {
+      // macOS Sonoma introduced a regression in that: For role of 'dialog', the
+      // aria-labelledby is not announced. However, if the dialog has a child
+      // with a role of header (aka h* elemeent) it will be announced as long as
+      // the aria-labelledby is NOT provided.
+      return {
+        'aria-describedby': this.props.ariaDescribedBy,
+      }
+    }
+
+    // correct semantics
+    return {
+      'aria-labelledby': this.state.titleId,
+      'aria-describedby': this.props.ariaDescribedBy,
+    }
+  }
+
   public render() {
     const className = classNames(
       {
@@ -590,13 +854,15 @@ export class Dialog extends React.Component<IDialogProps, IDialogState> {
     )
 
     return (
+      // eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions
       <dialog
         ref={this.onDialogRef}
         id={this.props.id}
+        role={this.props.role}
         onMouseDown={this.onDialogMouseDown}
         onKeyDown={this.onKeyDown}
         className={className}
-        aria-labelledby={this.state.titleId}
+        {...this.getAriaAttributes()}
         tabIndex={-1}
       >
         {this.renderHeader()}
diff --git a/app/src/ui/dialog/error.tsx b/app/src/ui/dialog/error.tsx
index 10e8d078407..83992ded63c 100644
--- a/app/src/ui/dialog/error.tsx
+++ b/app/src/ui/dialog/error.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { Octicon } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import * as octicons from '../octicons/octicons.generated'
 
 /**
  * A component used for displaying short error messages inline
@@ -16,8 +16,8 @@ import * as OcticonSymbol from '../octicons/octicons.generated'
 export class DialogError extends React.Component {
   public render() {
     return (
-      <div className="dialog-error">
-        <Octicon symbol={OcticonSymbol.stop} />
+      <div className="dialog-banner dialog-error" role="alert">
+        <Octicon symbol={octicons.stop} />
         <div>{this.props.children}</div>
       </div>
     )
diff --git a/app/src/ui/dialog/header.tsx b/app/src/ui/dialog/header.tsx
index 0ae75c83523..17871c202f4 100644
--- a/app/src/ui/dialog/header.tsx
+++ b/app/src/ui/dialog/header.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { Octicon, syncClockwise } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import * as octicons from '../octicons/octicons.generated'
 
 interface IDialogHeaderProps {
   /**
@@ -16,17 +16,20 @@ interface IDialogHeaderProps {
    */
   readonly titleId?: string
 
+  /** Whether or not the header should show a close button */
+  readonly showCloseButton?: boolean
+
   /**
-   * Whether or not the implementing dialog is dismissable. This controls
-   * whether or not the dialog header renders a close button or not.
+   * An optional element to render to the right of the dialog title.
+   * This can be used to render additional controls that don't belong to the
+   * heading element itself, but are still part of the header (visually).
    */
-  readonly dismissable: boolean
+  readonly renderAccessory?: () => JSX.Element
 
   /**
-   * Event triggered when the dialog is dismissed by the user in the
-   * ways described in the dismissable prop.
+   * Event triggered when the dialog is dismissed by the user.
    */
-  readonly onDismissed?: () => void
+  readonly onCloseButtonClick?: () => void
 
   /**
    * Whether or not the dialog contents are currently involved in processing
@@ -47,50 +50,44 @@ interface IDialogHeaderProps {
  * might be necessary to use this component directly.
  */
 export class DialogHeader extends React.Component<IDialogHeaderProps, {}> {
-  private onCloseButtonClick = (e: React.MouseEvent<HTMLAnchorElement>) => {
-    if (this.props.onDismissed) {
-      this.props.onDismissed()
+  private onCloseButtonClick = (e: React.MouseEvent<HTMLButtonElement>) => {
+    /** This prevent default is a preventative measure since the dialog is akin
+     * to a big Form element. We wouldn't any surprise form handling. */
+    e.preventDefault()
+    if (this.props.onCloseButtonClick) {
+      this.props.onCloseButtonClick()
     }
   }
 
   private renderCloseButton() {
-    if (!this.props.dismissable) {
+    if (this.props.showCloseButton === false) {
       return null
     }
 
-    // We're intentionally using <a> here instead of <button> because
-    // we can't prevent chromium from giving it focus when the the dialog
-    // appears. Setting tabindex to -1 doesn't work. This might be a bug,
-    // I don't know and we may want to revisit it at some point but for
-    // now an anchor will have to do.
     return (
-      <a
+      <button
         className="close"
         onClick={this.onCloseButtonClick}
-        aria-label="close"
-        role="button"
+        aria-label="Close"
       >
-        <Octicon symbol={OcticonSymbol.x} />
-      </a>
+        <Octicon symbol={octicons.x} />
+      </button>
     )
   }
 
-  private renderTitle() {
-    return <h1 id={this.props.titleId}>{this.props.title}</h1>
-  }
-
   public render() {
     const spinner = this.props.loading ? (
       <Octicon className="icon spin" symbol={syncClockwise} />
     ) : null
 
     return (
-      <header className="dialog-header">
-        {this.renderTitle()}
+      <div className="dialog-header">
+        <h1 id={this.props.titleId}>{this.props.title}</h1>
+        {this.props.renderAccessory?.()}
         {spinner}
         {this.renderCloseButton()}
         {this.props.children}
-      </header>
+      </div>
     )
   }
 }
diff --git a/app/src/ui/dialog/is-top-most.tsx b/app/src/ui/dialog/is-top-most.tsx
new file mode 100644
index 00000000000..c6247d817ac
--- /dev/null
+++ b/app/src/ui/dialog/is-top-most.tsx
@@ -0,0 +1,17 @@
+import memoizeOne from 'memoize-one'
+
+/** This method is a memoizedOne for a consistent means of handling when the
+ * isTopMost property of the `DialogStackContext` changes in the various popups
+ * that consume it.  */
+export function isTopMostDialog(
+  onDialogIsTopMost: () => void,
+  onDialogIsNotTopMost: () => void
+) {
+  return memoizeOne((isTopMost: boolean) => {
+    if (isTopMost) {
+      onDialogIsTopMost()
+    } else {
+      onDialogIsNotTopMost()
+    }
+  })
+}
diff --git a/app/src/ui/dialog/ok-cancel-button-group.tsx b/app/src/ui/dialog/ok-cancel-button-group.tsx
index c7db2e22056..7ab5cdc0591 100644
--- a/app/src/ui/dialog/ok-cancel-button-group.tsx
+++ b/app/src/ui/dialog/ok-cancel-button-group.tsx
@@ -21,6 +21,9 @@ interface IOkCancelButtonGroupProps {
   /** An optional title (i.e. tooltip) for the Ok button, defaults to none */
   readonly okButtonTitle?: string
 
+  /** Aria description of the ok button */
+  readonly okButtonAriaDescribedBy?: string
+
   /**
    * An optional event handler for when the Ok button is clicked (either
    * explicitly or as the result of a form keyboard submission). If specified
@@ -145,6 +148,7 @@ export class OkCancelButtonGroup extends React.Component<
         disabled={this.props.okButtonDisabled}
         tooltip={this.props.okButtonTitle}
         type={this.props.destructive === true ? 'button' : 'submit'}
+        ariaDescribedBy={this.props.okButtonAriaDescribedBy}
       >
         {this.props.okButtonText || 'Ok'}
       </Button>
diff --git a/app/src/ui/dialog/success.tsx b/app/src/ui/dialog/success.tsx
new file mode 100644
index 00000000000..7251f8ff46e
--- /dev/null
+++ b/app/src/ui/dialog/success.tsx
@@ -0,0 +1,25 @@
+import * as React from 'react'
+import { Octicon } from '../octicons'
+import * as octicons from '../octicons/octicons.generated'
+
+/**
+ * A component used for displaying short success messages inline
+ * in a dialog. These success messages (there can be more than one)
+ * should be rendered as the first child of the <Dialog> component
+ * and support arbitrary content.
+ *
+ * The content (success message) is paired with a check icon and receive
+ * special styling.
+ *
+ * Provide `children` to display content inside the error dialog.
+ */
+export class DialogSuccess extends React.Component {
+  public render() {
+    return (
+      <div className="dialog-banner dialog-success" role="alert">
+        <Octicon symbol={octicons.check} />
+        <div>{this.props.children}</div>
+      </div>
+    )
+  }
+}
diff --git a/app/src/ui/diff/code-mirror-host.tsx b/app/src/ui/diff/code-mirror-host.tsx
deleted file mode 100644
index d840a34274d..00000000000
--- a/app/src/ui/diff/code-mirror-host.tsx
+++ /dev/null
@@ -1,263 +0,0 @@
-import * as React from 'react'
-import CodeMirror, {
-  Doc,
-  Editor,
-  EditorChange,
-  EditorConfiguration,
-  LineHandle,
-} from 'codemirror'
-
-// Required for us to be able to customize the foreground color of selected text
-import 'codemirror/addon/selection/mark-selection'
-
-// Autocompletion plugin
-import 'codemirror/addon/hint/show-hint'
-
-import 'codemirror/addon/scroll/simplescrollbars'
-
-import 'codemirror/addon/search/search'
-
-interface ICodeMirrorHostProps {
-  /**
-   * An optional class name for the wrapper element around the
-   * CodeMirror component
-   */
-  readonly className?: string
-
-  /** The text contents for the editor */
-  readonly value: string | Doc
-
-  /** Any CodeMirror specific settings */
-  readonly options?: EditorConfiguration
-
-  /** Callback for diff to control whether selection is enabled */
-  readonly isSelectionEnabled?: () => boolean
-
-  /** Callback for when CodeMirror renders (or re-renders) a line */
-  readonly onRenderLine?: (
-    cm: Editor,
-    line: LineHandle,
-    elem: HTMLElement
-  ) => void
-
-  /** Callback for when CodeMirror has completed a batch of changes to the editor */
-  readonly onChanges?: (cm: Editor, change: EditorChange[]) => void
-
-  /** Callback for when the viewport changes due to scrolling or other updates */
-  readonly onViewportChange?: (cm: Editor, from: number, to: number) => void
-
-  /** Callback for when the editor document is swapped out for a new one */
-  readonly onSwapDoc?: (cm: Editor, oldDoc: Doc) => void
-
-  /**
-   * Called after the document has been swapped, meaning that consumers of this
-   * event have access to the updated viewport (as opposed to onSwapDoc)
-   */
-  readonly onAfterSwapDoc?: (cm: Editor, oldDoc: Doc, newDoc: Doc) => void
-
-  /**
-   * Called when user want to open context menu.
-   */
-  readonly onContextMenu?: (cm: Editor, event: Event) => void
-
-  /**
-   * Called when content has been copied. The default behavior may be prevented
-   * by calling `preventDefault` on the event.
-   */
-  readonly onCopy?: (editor: Editor, event: Event) => void
-}
-
-/**
- * Attempts to cancel an active mouse selection in the
- * given editor by accessing undocumented APIs. This is likely
- * to break in the future.
- */
-function cancelActiveSelection(cm: Editor) {
-  if (cm.state && cm.state.selectingText instanceof Function) {
-    try {
-      // Simulate a mouseup event which will cause CodeMirror
-      // to abort its currently active selection. If no selection
-      // is active the selectingText property will not be a function
-      // so we won't end up here.
-      cm.state.selectingText(new CustomEvent('fake-event'))
-    } catch (err) {
-      // If we end up here it's likely because CodeMirror has changed
-      // its internal API.
-      // See https://github.com/codemirror/CodeMirror/issues/5821
-      log.info('Unable to cancel CodeMirror selection', err)
-    }
-  }
-}
-
-/**
- * A component hosting a CodeMirror instance
- */
-export class CodeMirrorHost extends React.Component<ICodeMirrorHostProps, {}> {
-  private static updateDoc(cm: Editor, value: string | Doc) {
-    if (typeof value === 'string') {
-      cm.setValue(value)
-    } else {
-      cancelActiveSelection(cm)
-      cm.swapDoc(value)
-    }
-  }
-
-  private wrapper: HTMLDivElement | null = null
-  private codeMirror: Editor | null = null
-
-  /**
-   * Resize observer used for tracking width changes and
-   * refreshing the internal codemirror instance when
-   * they occur
-   */
-  private readonly resizeObserver: ResizeObserver
-  private resizeDebounceId: number | null = null
-  private lastKnownWidth: number | null = null
-
-  public constructor(props: ICodeMirrorHostProps) {
-    super(props)
-
-    // Observe size changes and let codemirror know
-    // when it needs to refresh.
-    this.resizeObserver = new ResizeObserver(entries => {
-      if (entries.length === 1 && this.codeMirror) {
-        const newWidth = entries[0].contentRect.width
-
-        // We don't care about the first resize, let's just
-        // store what we've got. Codemirror already does a good
-        // job of height changes through monitoring window resize,
-        // we just need to care about when the width changes and
-        // do a re-layout
-        if (this.lastKnownWidth === null) {
-          this.lastKnownWidth = newWidth
-        } else if (this.lastKnownWidth !== newWidth) {
-          this.lastKnownWidth = newWidth
-
-          if (this.resizeDebounceId !== null) {
-            cancelAnimationFrame(this.resizeDebounceId)
-            this.resizeDebounceId = null
-          }
-          this.resizeDebounceId = requestAnimationFrame(this.onResized)
-        }
-      }
-    })
-  }
-
-  /**
-   * Gets the internal CodeMirror instance or null if CodeMirror hasn't
-   * been initialized yet (happens when component mounts)
-   */
-  public getEditor(): Editor | null {
-    return this.codeMirror
-  }
-
-  public componentDidMount() {
-    this.codeMirror = CodeMirror(this.wrapper!, this.props.options)
-
-    this.codeMirror.on('renderLine', this.onRenderLine)
-    this.codeMirror.on('changes', this.onChanges)
-    this.codeMirror.on('viewportChange', this.onViewportChange)
-    this.codeMirror.on('beforeSelectionChange', this.beforeSelectionChanged)
-    this.codeMirror.on('copy', this.onCopy)
-    this.codeMirror.on('contextmenu', this.onContextMenu)
-    this.codeMirror.on('swapDoc', this.onSwapDoc as any)
-
-    CodeMirrorHost.updateDoc(this.codeMirror, this.props.value)
-    this.resizeObserver.observe(this.codeMirror.getWrapperElement())
-  }
-
-  private onSwapDoc = (cm: Editor, oldDoc: Doc) => {
-    if (this.props.onSwapDoc) {
-      this.props.onSwapDoc(cm, oldDoc)
-    }
-  }
-
-  private onContextMenu = (instance: Editor, event: Event) => {
-    if (this.props.onContextMenu) {
-      this.props.onContextMenu(instance, event)
-    }
-  }
-
-  private onCopy = (instance: Editor, event: Event) => {
-    if (this.props.onCopy) {
-      this.props.onCopy(instance, event)
-    }
-  }
-
-  public componentWillUnmount() {
-    const cm = this.codeMirror
-
-    if (cm) {
-      cm.off('changes', this.onChanges)
-      cm.off('viewportChange', this.onViewportChange)
-      cm.off('renderLine', this.onRenderLine)
-      cm.off('beforeSelectionChange', this.beforeSelectionChanged)
-      cm.off('copy', this.onCopy)
-      cm.off('swapDoc', this.onSwapDoc as any)
-
-      this.codeMirror = null
-    }
-
-    this.resizeObserver.disconnect()
-  }
-
-  public componentDidUpdate(prevProps: ICodeMirrorHostProps) {
-    if (this.codeMirror && this.props.value !== prevProps.value) {
-      const oldDoc = this.codeMirror.getDoc()
-      CodeMirrorHost.updateDoc(this.codeMirror, this.props.value)
-      const newDoc = this.codeMirror.getDoc()
-
-      if (this.props.onAfterSwapDoc) {
-        this.props.onAfterSwapDoc(this.codeMirror, oldDoc, newDoc)
-      }
-    }
-  }
-
-  private beforeSelectionChanged = (cm: Editor, changeObj: any) => {
-    if (this.props.isSelectionEnabled) {
-      if (!this.props.isSelectionEnabled()) {
-        // ignore whatever the user has currently selected, pass in a
-        // "nothing selected" value
-        // NOTE:
-        // - `head` is the part of the selection that is moving
-        // - `anchor` is the other end
-        changeObj.update([
-          { head: { line: 0, ch: 0 }, anchor: { line: 0, ch: 0 } },
-        ])
-      }
-    }
-  }
-
-  private onChanges = (cm: Editor, changes: EditorChange[]) => {
-    if (this.props.onChanges) {
-      this.props.onChanges(cm, changes)
-    }
-  }
-
-  private onViewportChange = (cm: Editor, from: number, to: number) => {
-    if (this.props.onViewportChange) {
-      this.props.onViewportChange(cm, from, to)
-    }
-  }
-
-  private onRenderLine = (cm: Editor, line: LineHandle, elem: HTMLElement) => {
-    if (this.props.onRenderLine) {
-      this.props.onRenderLine(cm, line, elem)
-    }
-  }
-
-  private onResized = () => {
-    this.resizeDebounceId = null
-    if (this.codeMirror) {
-      this.codeMirror.refresh()
-    }
-  }
-
-  private onRef = (ref: HTMLDivElement | null) => {
-    this.wrapper = ref
-  }
-
-  public render() {
-    return <div className={this.props.className} ref={this.onRef} />
-  }
-}
diff --git a/app/src/ui/diff/diff-contents-warning.tsx b/app/src/ui/diff/diff-contents-warning.tsx
new file mode 100644
index 00000000000..075e117478e
--- /dev/null
+++ b/app/src/ui/diff/diff-contents-warning.tsx
@@ -0,0 +1,90 @@
+import React from 'react'
+import { Octicon } from '../octicons'
+import * as octicons from '../octicons/octicons.generated'
+import { LinkButton } from '../lib/link-button'
+import { ITextDiff, LineEndingsChange } from '../../models/diff'
+
+enum DiffContentsWarningType {
+  UnicodeBidiCharacters,
+  LineEndingsChange,
+}
+
+type DiffContentsWarningItem =
+  | {
+      readonly type: DiffContentsWarningType.UnicodeBidiCharacters
+    }
+  | {
+      readonly type: DiffContentsWarningType.LineEndingsChange
+      readonly lineEndingsChange: LineEndingsChange
+    }
+
+interface IDiffContentsWarningProps {
+  readonly diff: ITextDiff
+}
+
+export class DiffContentsWarning extends React.Component<IDiffContentsWarningProps> {
+  public render() {
+    const items = this.getTextDiffWarningItems()
+
+    if (items.length === 0) {
+      return null
+    }
+
+    return (
+      <div className="diff-contents-warning-container">
+        {items.map((item, i) => (
+          <div className="diff-contents-warning" key={i}>
+            <Octicon symbol={octicons.alert} />
+            {this.getWarningMessageForItem(item)}
+          </div>
+        ))}
+      </div>
+    )
+  }
+
+  private getTextDiffWarningItems(): ReadonlyArray<DiffContentsWarningItem> {
+    const items = new Array<DiffContentsWarningItem>()
+    const { diff } = this.props
+
+    if (diff.hasHiddenBidiChars) {
+      items.push({
+        type: DiffContentsWarningType.UnicodeBidiCharacters,
+      })
+    }
+
+    if (diff.lineEndingsChange) {
+      items.push({
+        type: DiffContentsWarningType.LineEndingsChange,
+        lineEndingsChange: diff.lineEndingsChange,
+      })
+    }
+
+    return items
+  }
+
+  private getWarningMessageForItem(item: DiffContentsWarningItem) {
+    switch (item.type) {
+      case DiffContentsWarningType.UnicodeBidiCharacters:
+        return (
+          <>
+            This diff contains bidirectional Unicode text that may be
+            interpreted or compiled differently than what appears below. To
+            review, open the file in an editor that reveals hidden Unicode
+            characters.{' '}
+            <LinkButton uri="https://github.co/hiddenchars">
+              Learn more about bidirectional Unicode characters
+            </LinkButton>
+          </>
+        )
+
+      case DiffContentsWarningType.LineEndingsChange:
+        const { lineEndingsChange } = item
+        return (
+          <>
+            This diff contains a change in line endings from '
+            {lineEndingsChange.from}' to '{lineEndingsChange.to}'.
+          </>
+        )
+    }
+  }
+}
diff --git a/app/src/ui/diff/diff-explorer.ts b/app/src/ui/diff/diff-explorer.ts
index 507cc41aae4..13fa8b29a42 100644
--- a/app/src/ui/diff/diff-explorer.ts
+++ b/app/src/ui/diff/diff-explorer.ts
@@ -44,7 +44,7 @@ export function diffHunkForIndex(
 /**
  * Locate the diff line and hunk for the given (absolute) line number in the diff.
  */
-export function diffLineInfoForIndex(
+function diffLineInfoForIndex(
   hunks: ReadonlyArray<DiffHunk>,
   index: number
 ): IDiffLineInfo | null {
@@ -64,7 +64,7 @@ export function diffLineInfoForIndex(
 /**
  * Locate the diff line for the given (absolute) line number in the diff.
  */
-export function diffLineForIndex(
+function diffLineForIndex(
   hunks: ReadonlyArray<DiffHunk>,
   index: number
 ): DiffLine | null {
@@ -76,24 +76,6 @@ export function diffLineForIndex(
   return diffLineInfo.line
 }
 
-/** Get the line number as represented in the diff text itself. */
-export function lineNumberForDiffLine(
-  diffLine: DiffLine,
-  hunks: ReadonlyArray<DiffHunk>
-): number {
-  let lineOffset = 0
-  for (const hunk of hunks) {
-    const index = hunk.lines.indexOf(diffLine)
-    if (index > -1) {
-      return index + lineOffset
-    } else {
-      lineOffset += hunk.lines.length
-    }
-  }
-
-  return -1
-}
-
 /**
  * For the given row in the diff, determine the range of elements that
  * should be displayed as interactive, as a hunk is not granular enough.
diff --git a/app/src/ui/changes/changed-file-details.tsx b/app/src/ui/diff/diff-header.tsx
similarity index 52%
rename from app/src/ui/changes/changed-file-details.tsx
rename to app/src/ui/diff/diff-header.tsx
index a9f1ad17b10..fe5907d6b03 100644
--- a/app/src/ui/changes/changed-file-details.tsx
+++ b/app/src/ui/diff/diff-header.tsx
@@ -3,12 +3,10 @@ import { PathLabel } from '../lib/path-label'
 import { AppFileStatus } from '../../models/status'
 import { IDiff, DiffType } from '../../models/diff'
 import { Octicon, iconForStatus } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
 import { mapStatus } from '../../lib/status'
-import { DiffOptions } from '../diff/diff-options'
-import { RepositorySectionTab } from '../../lib/app-state'
+import { DiffOptions } from './diff-options'
 
-interface IChangedFileDetailsProps {
+interface IDiffHeaderProps {
   readonly path: string
   readonly status: AppFileStatus
   readonly diff: IDiff | null
@@ -30,10 +28,7 @@ interface IChangedFileDetailsProps {
 }
 
 /** Displays information about a file */
-export class ChangedFileDetails extends React.Component<
-  IChangedFileDetailsProps,
-  {}
-> {
+export class DiffHeader extends React.Component<IDiffHeaderProps, {}> {
   public render() {
     const status = this.props.status
     const fileStatus = mapStatus(status)
@@ -41,18 +36,8 @@ export class ChangedFileDetails extends React.Component<
     return (
       <div className="header">
         <PathLabel path={this.props.path} status={this.props.status} />
-        {this.renderDecorator()}
 
-        <DiffOptions
-          sourceTab={RepositorySectionTab.Changes}
-          onHideWhitespaceChangesChanged={
-            this.props.onHideWhitespaceInDiffChanged
-          }
-          hideWhitespaceChanges={this.props.hideWhitespaceInDiff}
-          onShowSideBySideDiffChanged={this.props.onShowSideBySideDiffChanged}
-          showSideBySideDiff={this.props.showSideBySideDiff}
-          onDiffOptionsOpened={this.props.onDiffOptionsOpened}
-        />
+        {this.renderDiffOptions()}
 
         <Octicon
           symbol={iconForStatus(status)}
@@ -63,24 +48,22 @@ export class ChangedFileDetails extends React.Component<
     )
   }
 
-  private renderDecorator() {
-    const diff = this.props.diff
-
-    if (diff === null) {
+  private renderDiffOptions() {
+    if (this.props.diff?.kind === DiffType.Submodule) {
       return null
     }
 
-    if (diff.kind === DiffType.Text && diff.lineEndingsChange) {
-      const message = `Warning: line endings will be changed from '${diff.lineEndingsChange.from}' to '${diff.lineEndingsChange.to}'.`
-      return (
-        <Octicon
-          symbol={OcticonSymbol.alert}
-          className={'line-endings'}
-          title={message}
-        />
-      )
-    } else {
-      return null
-    }
+    return (
+      <DiffOptions
+        isInteractiveDiff={true}
+        onHideWhitespaceChangesChanged={
+          this.props.onHideWhitespaceInDiffChanged
+        }
+        hideWhitespaceChanges={this.props.hideWhitespaceInDiff}
+        onShowSideBySideDiffChanged={this.props.onShowSideBySideDiffChanged}
+        showSideBySideDiff={this.props.showSideBySideDiff}
+        onDiffOptionsOpened={this.props.onDiffOptionsOpened}
+      />
+    )
   }
 }
diff --git a/app/src/ui/diff/diff-helpers.tsx b/app/src/ui/diff/diff-helpers.tsx
index e28ed500217..9637de6451d 100644
--- a/app/src/ui/diff/diff-helpers.tsx
+++ b/app/src/ui/diff/diff-helpers.tsx
@@ -9,8 +9,7 @@ import {
   CommittedFileChange,
 } from '../../models/status'
 import { DiffHunk, DiffHunkExpansionType } from '../../models/diff/raw-diff'
-import { DiffLineType } from '../../models/diff'
-import { DiffSyntaxToken } from './diff-syntax-mode'
+import { DiffLineType, ILargeTextDiff, ITextDiff } from '../../models/diff'
 
 /**
  * DiffRowType defines the different types of
@@ -207,6 +206,21 @@ export type SimplifiedDiffRow =
 
 export type ChangedFile = WorkingDirectoryFileChange | CommittedFileChange
 
+/**
+ * Whether the row is a type that represent a change (added, deleted, modified)
+ * in the diff. This is useful for checking to see if a row type would have
+ * something like 'hunkStartLine` on it.
+ */
+export function isRowChanged(
+  row: DiffRow | SimplifiedDiffRow
+): row is IDiffRowAdded | IDiffRowDeleted | IDiffRowModified {
+  return (
+    row.type === DiffRowType.Added ||
+    row.type === DiffRowType.Deleted ||
+    row.type === DiffRowType.Modified
+  )
+}
+
 /**
  * Returns an object with two ILineTokens objects that can be used to highlight
  * the added and removed characters between two lines.
@@ -429,28 +443,37 @@ export function getFirstAndLastClassesSideBySide(
 }
 
 /**
- * Used to obtain classes applied to style the row if it is the first or last of
- * a group of added, deleted, or modified rows in the unified diff.
- **/
-export function getFirstAndLastClassesUnified(
-  token: DiffSyntaxToken,
-  prevToken: DiffSyntaxToken | undefined,
-  nextToken: DiffSyntaxToken | undefined
-): string[] {
-  const addedOrDeletedTokens = [DiffSyntaxToken.Add, DiffSyntaxToken.Delete]
-  if (!addedOrDeletedTokens.includes(token)) {
-    return []
-  }
-
-  const classNames = []
-
-  if (prevToken !== token) {
-    classNames.push('is-first')
+ * Compares two text diffs for structural equality.
+ *
+ * Components needing to know whether a re-render is necessary after receiving
+ * a diff is the intended use case.
+ */
+export function textDiffEquals(
+  x: ITextDiff | ILargeTextDiff,
+  y: ITextDiff | ILargeTextDiff
+) {
+  if (x === y) {
+    return true
   }
 
-  if (nextToken !== token) {
-    classNames.push('is-last')
+  if (
+    x.text === y.text &&
+    x.kind === y.kind &&
+    x.hasHiddenBidiChars === y.hasHiddenBidiChars &&
+    x.lineEndingsChange === y.lineEndingsChange &&
+    x.hunks.length === y.hunks.length
+  ) {
+    // This is a performance optimization which lets us avoid iterating over all
+    // lines (deep equality on all hunks). We're already comparing the diff text
+    // above so the only thing that can change with the diff text staying the
+    // same is whether or not the last line is followed by a trailing newline.
+    // That information is encodeded in the noTrailingNewLine property which
+    // exists on all lines but is only ever set on lines in the last hunk
+    return (
+      x.hunks.length === 0 ||
+      x.hunks[x.hunks.length - 1].equals(y.hunks[y.hunks.length - 1])
+    )
   }
 
-  return classNames
+  return false
 }
diff --git a/app/src/ui/diff/diff-options.tsx b/app/src/ui/diff/diff-options.tsx
index 6acce9a1ad8..27862eba87c 100644
--- a/app/src/ui/diff/diff-options.tsx
+++ b/app/src/ui/diff/diff-options.tsx
@@ -1,18 +1,22 @@
 import * as React from 'react'
 import { Checkbox, CheckboxValue } from '../lib/checkbox'
 import { Octicon } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import * as octicons from '../octicons/octicons.generated'
 import { RadioButton } from '../lib/radio-button'
-import { Popover, PopoverCaretPosition } from '../lib/popover'
-import { enableHideWhitespaceInDiffOption } from '../../lib/feature-flag'
-import { RepositorySectionTab } from '../../lib/app-state'
+import {
+  Popover,
+  PopoverAnchorPosition,
+  PopoverDecoration,
+} from '../lib/popover'
+import { Tooltip, TooltipDirection } from '../lib/tooltip'
+import { createObservableRef } from '../lib/observable-ref'
 
 interface IDiffOptionsProps {
-  readonly sourceTab: RepositorySectionTab
+  readonly isInteractiveDiff: boolean
   readonly hideWhitespaceChanges: boolean
   readonly onHideWhitespaceChangesChanged: (
     hideWhitespaceChanges: boolean
-  ) => Promise<void>
+  ) => void
 
   readonly showSideBySideDiff: boolean
   readonly onShowSideBySideDiffChanged: (showSideBySideDiff: boolean) => void
@@ -29,7 +33,9 @@ export class DiffOptions extends React.Component<
   IDiffOptionsProps,
   IDiffOptionsState
 > {
+  private innerButtonRef = createObservableRef<HTMLButtonElement>()
   private diffOptionsRef = React.createRef<HTMLDivElement>()
+  private gearIconRef = React.createRef<HTMLSpanElement>()
 
   public constructor(props: IDiffOptionsProps) {
     super(props)
@@ -76,11 +82,26 @@ export class DiffOptions extends React.Component<
   }
 
   public render() {
+    const buttonLabel = `Diff ${__DARWIN__ ? 'Settings' : 'Options'}`
     return (
       <div className="diff-options-component" ref={this.diffOptionsRef}>
-        <button onClick={this.onButtonClick}>
-          <Octicon symbol={OcticonSymbol.gear} />
-          <Octicon symbol={OcticonSymbol.triangleDown} />
+        <button
+          aria-label={buttonLabel}
+          onClick={this.onButtonClick}
+          aria-expanded={this.state.isPopoverOpen}
+          ref={this.innerButtonRef}
+        >
+          <Tooltip
+            target={this.innerButtonRef}
+            direction={TooltipDirection.NORTH}
+            applyAriaDescribedBy={false}
+          >
+            {buttonLabel}
+          </Tooltip>
+          <span ref={this.gearIconRef}>
+            <Octicon symbol={octicons.gear} />
+          </span>
+          <Octicon symbol={octicons.triangleDown} />
         </button>
         {this.state.isPopoverOpen && this.renderPopover()}
       </div>
@@ -88,11 +109,17 @@ export class DiffOptions extends React.Component<
   }
 
   private renderPopover() {
+    const header = `Diff ${__DARWIN__ ? 'Settings' : 'Options'}`
     return (
       <Popover
-        caretPosition={PopoverCaretPosition.TopRight}
+        ariaLabelledby="diff-options-popover-header"
+        anchor={this.gearIconRef.current}
+        anchorPosition={PopoverAnchorPosition.BottomRight}
+        decoration={PopoverDecoration.Balloon}
+        onMousedownOutside={this.closePopover}
         onClickOutside={this.closePopover}
       >
+        <h3 id="diff-options-popover-header">{header}</h3>
         {this.renderHideWhitespaceChanges()}
         {this.renderShowSideBySide()}
       </Popover>
@@ -108,8 +135,8 @@ export class DiffOptions extends React.Component<
 
   private renderShowSideBySide() {
     return (
-      <section>
-        <h3>Diff display</h3>
+      <fieldset role="radiogroup">
+        <legend>Diff display</legend>
         <RadioButton
           value="Unified"
           checked={!this.props.showSideBySideDiff}
@@ -126,21 +153,14 @@ export class DiffOptions extends React.Component<
           }
           onSelected={this.onSideBySideSelected}
         />
-      </section>
+      </fieldset>
     )
   }
 
   private renderHideWhitespaceChanges() {
-    if (
-      this.props.sourceTab === RepositorySectionTab.Changes &&
-      !enableHideWhitespaceInDiffOption()
-    ) {
-      return
-    }
-
     return (
-      <section>
-        <h3>Whitespace</h3>
+      <fieldset>
+        <legend>Whitespace</legend>
         <Checkbox
           value={
             this.props.hideWhitespaceChanges
@@ -152,13 +172,13 @@ export class DiffOptions extends React.Component<
             __DARWIN__ ? 'Hide Whitespace Changes' : 'Hide whitespace changes'
           }
         />
-        {this.props.sourceTab === RepositorySectionTab.Changes && (
+        {this.props.isInteractiveDiff && (
           <p className="secondary-text">
             Interacting with individual lines or hunks will be disabled while
             hiding whitespace.
           </p>
         )}
-      </section>
+      </fieldset>
     )
   }
 }
diff --git a/app/src/ui/diff/diff-search-input.tsx b/app/src/ui/diff/diff-search-input.tsx
index 12712a491e2..9564b3c74f9 100644
--- a/app/src/ui/diff/diff-search-input.tsx
+++ b/app/src/ui/diff/diff-search-input.tsx
@@ -32,8 +32,8 @@ export class DiffSearchInput extends React.Component<
     return (
       <div className="diff-search">
         <TextBox
-          placeholder="Search..."
-          type="search"
+          placeholder="Search…"
+          displayClearButton={true}
           autoFocus={true}
           onValueChanged={this.onChange}
           onKeyDown={this.onKeyDown}
diff --git a/app/src/ui/diff/diff-syntax-mode.ts b/app/src/ui/diff/diff-syntax-mode.ts
deleted file mode 100644
index 3c7cb11e7a1..00000000000
--- a/app/src/ui/diff/diff-syntax-mode.ts
+++ /dev/null
@@ -1,300 +0,0 @@
-import { DiffHunk, DiffLine, DiffLineType } from '../../models/diff'
-import * as CodeMirror from 'codemirror'
-import { diffLineForIndex } from './diff-explorer'
-import { ITokens } from '../../lib/highlighter/types'
-
-import 'codemirror/mode/javascript/javascript'
-import { enableTextDiffExpansion } from '../../lib/feature-flag'
-import { DefaultDiffExpansionStep } from './text-diff-expansion'
-import { getFirstAndLastClassesUnified } from './diff-helpers'
-
-export interface IDiffSyntaxModeOptions {
-  /**
-   * The unified diff representing the change
-   */
-  readonly hunks: ReadonlyArray<DiffHunk>
-
-  /**
-   * Tokens returned from the highlighter for the 'before'
-   * version of the change
-   */
-  readonly oldTokens: ITokens
-
-  /**
-   * Tokens returned from the highlighter for the 'after'
-   * version of the change
-   */
-  readonly newTokens: ITokens
-}
-
-export interface IDiffSyntaxModeSpec extends IDiffSyntaxModeOptions {
-  readonly name: 'github-diff-syntax'
-}
-
-export enum DiffSyntaxToken {
-  Add = 'diff-add',
-  Delete = 'diff-delete',
-  Hunk = 'diff-hunk',
-  Context = 'diff-context',
-}
-
-const TokenNames: { [key: string]: DiffSyntaxToken | undefined } = {
-  '+': DiffSyntaxToken.Add,
-  '-': DiffSyntaxToken.Delete,
-  '@': DiffSyntaxToken.Hunk,
-  ' ': DiffSyntaxToken.Context,
-}
-
-interface IState {
-  diffLineIndex: number
-  previousHunkOldEndLine: number | null
-  prevLineToken: DiffSyntaxToken | undefined
-}
-
-function skipLine(stream: CodeMirror.StringStream, state: IState) {
-  stream.skipToEnd()
-  state.diffLineIndex++
-  return null
-}
-
-function getBaseDiffLineStyle(
-  token: DiffSyntaxToken,
-  customBackgroundClassNames: ReadonlyArray<string> = []
-) {
-  const customBackgroundStyles = customBackgroundClassNames
-    .map(c => `line-background-${c}`)
-    .join(' ')
-
-  return `line-${token} line-background-${token} ${customBackgroundStyles}`
-}
-
-/**
- * Attempt to get tokens for a particular diff line. This will attempt
- * to look up tokens in both the old tokens and the new which is
- * important because for context lines we might only have tokens in
- * one version and we need to be resilient about that.
- */
-export function getTokensForDiffLine(
-  diffLine: DiffLine,
-  oldTokens: ITokens | undefined,
-  newTokens: ITokens | undefined
-) {
-  const oldTokensResult = getTokens(diffLine.oldLineNumber, oldTokens)
-
-  if (oldTokensResult !== null) {
-    return oldTokensResult
-  }
-
-  return getTokens(diffLine.newLineNumber, newTokens)
-}
-
-/**
- * Attempt to get tokens for a particular diff line. This will attempt
- * to look up tokens in both the old tokens and the new which is
- * important because for context lines we might only have tokens in
- * one version and we need to be resilient about that.
- */
-export function getTokens(
-  lineNumber: number | null,
-  tokens: ITokens | undefined
-) {
-  // Note: Diff lines numbers start at one so we adjust this in order
-  // to get the line _index_ in the before or after file contents.
-  if (
-    tokens !== undefined &&
-    lineNumber !== null &&
-    tokens[lineNumber - 1] !== undefined
-  ) {
-    return tokens[lineNumber - 1]
-  }
-
-  return null
-}
-
-export class DiffSyntaxMode {
-  public static readonly ModeName = 'github-diff-syntax'
-
-  private readonly hunks?: ReadonlyArray<DiffHunk>
-  private readonly oldTokens?: ITokens
-  private readonly newTokens?: ITokens
-
-  public constructor(
-    hunks?: ReadonlyArray<DiffHunk>,
-    oldTokens?: ITokens,
-    newTokens?: ITokens
-  ) {
-    this.hunks = hunks
-    this.oldTokens = oldTokens
-    this.newTokens = newTokens
-  }
-
-  public startState(): IState {
-    return {
-      diffLineIndex: 0,
-      previousHunkOldEndLine: null,
-      prevLineToken: undefined,
-    }
-  }
-
-  public blankLine(state: IState) {
-    // If we run into a blank line and we don't have hunks yet, and given we
-    // should never get blank diffs, let's assume we're in the last line of a
-    // diff that was just loaded, but for which we haven't run the highlighter
-    // yet. If we don't do this, that last line will be formatted wrongly.
-    if (this.hunks === undefined) {
-      return getBaseDiffLineStyle(DiffSyntaxToken.Hunk)
-    }
-
-    // A line might be empty in a non-blank diff for the only line of the
-    // dummy hunk we put at the bottom of the diff to allow users to expand
-    // the visible contents.
-    if (this.hunks.length > 0) {
-      const diffLine = diffLineForIndex(this.hunks, state.diffLineIndex)
-      if (diffLine?.type === DiffLineType.Hunk) {
-        return getBaseDiffLineStyle(DiffSyntaxToken.Hunk)
-      }
-    }
-
-    // Should never happen except for blank diffs but
-    // let's play along
-    state.diffLineIndex++
-    return undefined
-  }
-
-  public token = (
-    stream: CodeMirror.StringStream,
-    state: IState
-  ): string | null => {
-    // The first character of a line in a diff is always going to
-    // be the diff line marker so we always take care of that first.
-    if (stream.sol()) {
-      const tokenKey = stream.next()
-
-      if (stream.eol()) {
-        state.diffLineIndex++
-      }
-
-      if (tokenKey === null) {
-        return null
-      }
-
-      const token = TokenNames[tokenKey]
-
-      if (token === undefined) {
-        return null
-      }
-
-      const nextLine = stream.lookAhead(1)
-      const nextLineToken =
-        typeof nextLine === 'string' ? TokenNames[nextLine[0]] : undefined
-
-      const lineBackgroundClassNames = getFirstAndLastClassesUnified(
-        token,
-        state.prevLineToken,
-        nextLineToken
-      )
-      state.prevLineToken = token
-
-      let result = getBaseDiffLineStyle(token, lineBackgroundClassNames)
-
-      // If it's a hunk header line, we want to make a few extra checks
-      // depending on the distance to the previous hunk.
-      if (token === DiffSyntaxToken.Hunk && enableTextDiffExpansion()) {
-        // First we grab the numbers in the hunk header
-        const matches = stream.match(/\@ -(\d+),(\d+) \+\d+,\d+ \@\@/)
-        if (matches !== null) {
-          const oldStartLine = parseInt(matches[1])
-          const oldLineCount = parseInt(matches[2])
-
-          // If there is a hunk above and the distance with this one is bigger
-          // than the expansion "step", return an additional class name that
-          // will be used to make that line taller to fit the expansion buttons.
-          if (
-            state.previousHunkOldEndLine !== null &&
-            oldStartLine - state.previousHunkOldEndLine >
-              DefaultDiffExpansionStep
-          ) {
-            result += ` line-${token}-expandable-both`
-          }
-
-          // Finally we update the state with the index of the last line of the
-          // current hunk.
-          state.previousHunkOldEndLine = oldStartLine + oldLineCount
-        }
-
-        // Check again if we reached the EOL after matching the regex
-        if (stream.eol()) {
-          state.diffLineIndex++
-        }
-      }
-
-      return result
-    }
-
-    // This happens when the mode is running without tokens, in this
-    // case there's really nothing more for us to do than what we've
-    // already done above to deal with the diff line marker.
-    if (this.hunks == null) {
-      return skipLine(stream, state)
-    }
-
-    const diffLine = diffLineForIndex(this.hunks, state.diffLineIndex)
-
-    if (!diffLine) {
-      return skipLine(stream, state)
-    }
-
-    const lineTokens = getTokensForDiffLine(
-      diffLine,
-      this.oldTokens,
-      this.newTokens
-    )
-
-    if (!lineTokens) {
-      return skipLine(stream, state)
-    }
-
-    // -1 because the diff line that we're looking at is always prefixed
-    // by +, -, @ or space depending on the type of diff line. Those markers
-    // are obviously not present in the before/after version.
-    const token = lineTokens[stream.pos - stream.lineStart - 1]
-
-    if (!token) {
-      // There's no token at the current position so let's skip ahead
-      // until we find one or we hit the end of the line. Note that we
-      // don't have to worry about already being at the end of the line
-      // as it's a requirement for modes to always advance the stream. In
-      // other words, CodeMirror will never give us a stream already at
-      // the end of a line.
-      do {
-        stream.pos++
-      } while (!stream.eol() && !lineTokens[stream.pos - stream.lineStart - 1])
-    } else {
-      stream.pos += token.length
-    }
-
-    if (stream.eol()) {
-      state.diffLineIndex++
-    }
-
-    return token ? token.token : null
-  }
-}
-
-CodeMirror.defineMode(
-  DiffSyntaxMode.ModeName,
-  function (
-    config: CodeMirror.EditorConfiguration,
-    modeOptions?: IDiffSyntaxModeOptions
-  ) {
-    if (!modeOptions) {
-      throw new Error('I needs me some options')
-    }
-
-    return new DiffSyntaxMode(
-      modeOptions.hunks,
-      modeOptions.oldTokens,
-      modeOptions.newTokens
-    )
-  }
-)
diff --git a/app/src/ui/diff/get-tokens.ts b/app/src/ui/diff/get-tokens.ts
new file mode 100644
index 00000000000..819f4c14037
--- /dev/null
+++ b/app/src/ui/diff/get-tokens.ts
@@ -0,0 +1,24 @@
+import { ITokens } from '../../lib/highlighter/types'
+
+/**
+ * Attempt to get tokens for a particular diff line. This will attempt
+ * to look up tokens in both the old tokens and the new which is
+ * important because for context lines we might only have tokens in
+ * one version and we need to be resilient about that.
+ */
+export function getTokens(
+  lineNumber: number | null,
+  tokens: ITokens | undefined
+) {
+  // Note: Diff lines numbers start at one so we adjust this in order
+  // to get the line _index_ in the before or after file contents.
+  if (
+    tokens !== undefined &&
+    lineNumber !== null &&
+    tokens[lineNumber - 1] !== undefined
+  ) {
+    return tokens[lineNumber - 1]
+  }
+
+  return null
+}
diff --git a/app/src/ui/diff/hidden-bidi-chars-warning.tsx b/app/src/ui/diff/hidden-bidi-chars-warning.tsx
deleted file mode 100644
index 53c46ca2742..00000000000
--- a/app/src/ui/diff/hidden-bidi-chars-warning.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import React from 'react'
-import { Octicon } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
-import { LinkButton } from '../lib/link-button'
-
-export class HiddenBidiCharsWarning extends React.Component {
-  public render() {
-    return (
-      <div className="hidden-bidi-chars-warning">
-        <Octicon symbol={OcticonSymbol.alert} />
-        This diff contains bidirectional Unicode text that may be interpreted or
-        compiled differently than what appears below. To review, open the file
-        in an editor that reveals hidden Unicode characters.{' '}
-        <LinkButton uri="https://github.co/hiddenchars">
-          Learn more about bidirectional Unicode characters
-        </LinkButton>
-      </div>
-    )
-  }
-}
diff --git a/app/src/ui/diff/image-diffs/dds-converter.ts b/app/src/ui/diff/image-diffs/dds-converter.ts
new file mode 100644
index 00000000000..d3cbd020b1f
--- /dev/null
+++ b/app/src/ui/diff/image-diffs/dds-converter.ts
@@ -0,0 +1,203 @@
+import parseDDS from 'parse-dds'
+
+const vert = `
+attribute vec2 position;
+varying vec2 vUv;
+
+void main() {
+  vUv = (position + 1.0) * 0.5;
+  vUv.y = 1.0 - vUv.y;
+  gl_Position = vec4(position, 1.0, 1.0);
+}
+`
+
+const frag = `
+precision mediump float;
+
+varying vec2 vUv;
+uniform sampler2D tex0;
+
+void main() {
+  gl_FragColor = texture2D(tex0, vUv);
+}
+`
+
+function compileShader(
+  gl: WebGL2RenderingContext,
+  type: number,
+  source: string
+) {
+  const shader = gl.createShader(type)
+  if (!shader) {
+    return null
+  }
+  gl.shaderSource(shader, source)
+  gl.compileShader(shader)
+  if (!gl.getShaderParameter(shader, gl.COMPILE_STATUS)) {
+    const errLog = gl.getShaderInfoLog(shader)
+    throw new Error('Error compiling shader:\n' + errLog)
+  }
+  return shader
+}
+
+function linkProgram(
+  gl: WebGL2RenderingContext,
+  vertShader: WebGLShader,
+  fragShader: WebGLShader
+) {
+  const program = gl.createProgram()
+  if (!program) {
+    return null
+  }
+  gl.attachShader(program, vertShader)
+  gl.attachShader(program, fragShader)
+  gl.linkProgram(program)
+  if (!gl.getProgramParameter(program, gl.LINK_STATUS)) {
+    const errLog = gl.getProgramInfoLog(program)
+    throw new Error('Error linking program: ' + errLog)
+  }
+  return program
+}
+
+function compileProgram(
+  gl: WebGL2RenderingContext,
+  vertSource: string,
+  fragSource: string
+) {
+  const vertShader = compileShader(gl, gl.VERTEX_SHADER, vertSource)
+  if (!vertShader) {
+    throw new Error('Failed to compile vertex shader')
+  }
+
+  const fragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragSource)
+  if (!fragShader) {
+    throw new Error('Failed to compile fragment shader')
+  }
+
+  const program = linkProgram(gl, vertShader, fragShader)
+  return program
+}
+
+function createBuffer(gl: WebGL2RenderingContext, data: Float32Array) {
+  const handle = gl.createBuffer()
+
+  // Bind (setup) buffer
+  gl.bindBuffer(gl.ARRAY_BUFFER, handle)
+
+  // Initialize the buffer's data store
+  gl.bufferData(gl.ARRAY_BUFFER, data, gl.DYNAMIC_DRAW)
+
+  return handle
+}
+
+function createVertexArray(gl: WebGL2RenderingContext, buffer: WebGLBuffer) {
+  const handle = gl.createVertexArray()
+  if (!handle) {
+    throw new Error('Failed to create WebGLVertexArrayObject')
+  }
+
+  // Bind (setup) vertex array and buffer
+  gl.bindVertexArray(handle)
+  gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, null)
+  gl.bindBuffer(gl.ARRAY_BUFFER, buffer)
+
+  // Enable the first generic vertex attribute array
+  gl.enableVertexAttribArray(0)
+
+  // Bind the buffer we just bound to `gl.ARRAY_BUFFER` to a generic vertex attribute of the current vertex buffer object
+  gl.vertexAttribPointer(0, 2, gl.FLOAT, false, 0, 0)
+
+  // Unbind (cleanup) vertex array
+  gl.bindVertexArray(null)
+
+  return handle
+}
+
+function triangle(gl: WebGL2RenderingContext) {
+  const buffer = createBuffer(gl, new Float32Array([-1, -1, -1, 4, 4, -1]))
+  if (!buffer) {
+    throw new Error('Failed to create WebGLBuffer')
+  }
+
+  // Bind (setup) vertex array and buffer
+  const vertexArray = createVertexArray(gl, buffer)
+  gl.bindVertexArray(vertexArray)
+  gl.bindBuffer(gl.ARRAY_BUFFER, buffer)
+
+  // Draw triangle
+  gl.drawArrays(gl.TRIANGLES, 0, 3)
+
+  // Unbind (cleanup) vertex array and buffer
+  gl.bindVertexArray(null)
+  gl.bindBuffer(gl.ARRAY_BUFFER, null)
+}
+
+function getFormat(ext: WEBGL_compressed_texture_s3tc, ddsFormat: string) {
+  switch (ddsFormat) {
+    case 'dxt1':
+      return ext.COMPRESSED_RGB_S3TC_DXT1_EXT
+    case 'dxt3':
+      return ext.COMPRESSED_RGBA_S3TC_DXT3_EXT
+    case 'dxt5':
+      return ext.COMPRESSED_RGBA_S3TC_DXT5_EXT
+    default:
+      throw new Error('Unsupported format ' + ddsFormat)
+  }
+}
+
+function drawToCanvas(
+  canvas: HTMLCanvasElement,
+  format: string,
+  width: number,
+  height: number,
+  imageData: ArrayBufferView
+) {
+  canvas.width = width
+  canvas.height = height
+  const gl = canvas.getContext('webgl2', { preserveDrawingBuffer: true })
+  if (!gl) {
+    throw new Error('Failed to get webgl2 context')
+  }
+
+  gl.bindTexture(gl.TEXTURE_2D, gl.createTexture())
+  gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR)
+  gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR)
+  const ext = gl.getExtension('WEBGL_compressed_texture_s3tc')
+  if (!ext) {
+    throw new Error('Failed to get WEBGL_compressed_texture_s3tc extension')
+  }
+
+  const internalFormat = getFormat(ext, format)
+  gl.compressedTexImage2D(
+    gl.TEXTURE_2D,
+    0,
+    internalFormat,
+    width,
+    height,
+    0,
+    imageData
+  )
+
+  const program = compileProgram(gl, vert, frag)
+  gl.useProgram(program)
+
+  gl.viewport(0, 0, width, height)
+  triangle(gl)
+}
+
+export function convertDDSImage(contents: ArrayBufferLike) {
+  const ddsData = parseDDS(contents)
+
+  // Get the first mipmap texture.
+  const [image] = ddsData.images
+  const [imageWidth, imageHeight] = image.shape
+  const imageData = new Uint8Array(contents, image.offset, image.length)
+
+  // Draw the DXT texture to the canvas using WebGL2.
+  const canvas = document.createElement('canvas')
+  drawToCanvas(canvas, ddsData.format, imageWidth, imageHeight, imageData)
+
+  const mediaType = 'image/png'
+  const dataURL = canvas.toDataURL(mediaType, 1.0)
+  return dataURL
+}
diff --git a/app/src/ui/diff/image-diffs/image-container.tsx b/app/src/ui/diff/image-diffs/image-container.tsx
index a909d1dd4a5..f123bf5db92 100644
--- a/app/src/ui/diff/image-diffs/image-container.tsx
+++ b/app/src/ui/diff/image-diffs/image-container.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react'
 
 import { Image } from '../../../models/diff'
+import { convertDDSImage } from './dds-converter'
 
 interface IImageProps {
   /** The image contents to render */
@@ -13,14 +14,64 @@ interface IImageProps {
   readonly onElementLoad?: (img: HTMLImageElement) => void
 }
 
-export class ImageContainer extends React.Component<IImageProps, {}> {
+interface IImageState {
+  readonly imageSource: string | null
+}
+
+export class ImageContainer extends React.Component<IImageProps, IImageState> {
+  public constructor(props: IImageProps) {
+    super(props)
+    this.state = {
+      imageSource: null,
+    }
+  }
+
+  public loadImage(image: Image) {
+    if (image.mediaType === 'image/vnd-ms.dds') {
+      try {
+        const dataURL = convertDDSImage(image.rawContents)
+        this.setState({
+          imageSource: dataURL,
+        })
+      } catch (error) {
+        console.error('Error loading DDS image:', error)
+        this.setState({ imageSource: null })
+      }
+    } else {
+      this.setState({
+        imageSource: `data:${image.mediaType};base64,${image.contents}`,
+      })
+    }
+  }
+
+  public componentDidMount() {
+    const { image } = this.props
+    this.loadImage(image)
+  }
+
+  public componentDidUpdate(prevProps: IImageProps) {
+    const { image } = this.props
+    if (image === prevProps.image) {
+      return
+    }
+
+    this.loadImage(image)
+  }
+
   public render() {
-    const image = this.props.image
-    const imageSource = `data:${image.mediaType};base64,${image.contents}`
+    const { imageSource } = this.state
+    if (!imageSource) {
+      return null
+    }
 
     return (
       <div className="image-wrapper">
-        <img src={imageSource} style={this.props.style} onLoad={this.onLoad} />
+        <img
+          src={imageSource}
+          style={this.props.style}
+          onLoad={this.onLoad}
+          alt=""
+        />
       </div>
     )
   }
diff --git a/app/src/ui/diff/image-diffs/swipe.tsx b/app/src/ui/diff/image-diffs/swipe.tsx
index b1c5e027e0c..d3081aeb0be 100644
--- a/app/src/ui/diff/image-diffs/swipe.tsx
+++ b/app/src/ui/diff/image-diffs/swipe.tsx
@@ -27,10 +27,24 @@ export class Swipe extends React.Component<
 
     const swiperWidth = this.props.maxSize.width * (1 - this.state.percentage)
 
+    const previousStyle: React.CSSProperties = {
+      position: 'absolute',
+      top: 0,
+      left: 0,
+      height: this.props.maxSize.height,
+      width: this.props.maxSize.width,
+      clipPath: `inset(0 ${Math.floor(swiperWidth)}px 0 0)`,
+    }
+
     const currentStyle: React.CSSProperties = {
+      position: 'absolute',
+      top: 0,
+      left: 0,
       height: this.props.maxSize.height,
       width: this.props.maxSize.width,
-      left: -(this.props.maxSize.width - swiperWidth),
+      clipPath: `inset(0 0 0 ${Math.floor(
+        this.props.maxSize.width - swiperWidth
+      )}px)`,
     }
 
     const maxSize: React.CSSProperties = {
@@ -42,27 +56,19 @@ export class Swipe extends React.Component<
       <div className="image-diff-swipe">
         <div className="sizing-container" ref={this.props.onContainerRef}>
           <div className="image-container" style={style}>
-            <div className="image-diff-previous" style={style}>
+            <div className="image-diff-previous" style={previousStyle}>
               <ImageContainer
                 image={this.props.previous}
                 onElementLoad={this.props.onPreviousImageLoad}
                 style={maxSize}
               />
             </div>
-            <div
-              className="swiper"
-              style={{
-                width: swiperWidth,
-                height: this.props.maxSize.height,
-              }}
-            >
-              <div className="image-diff-current" style={currentStyle}>
-                <ImageContainer
-                  image={this.props.current}
-                  onElementLoad={this.props.onCurrentImageLoad}
-                  style={maxSize}
-                />
-              </div>
+            <div className="image-diff-current" style={currentStyle}>
+              <ImageContainer
+                image={this.props.current}
+                onElementLoad={this.props.onCurrentImageLoad}
+                style={maxSize}
+              />
             </div>
           </div>
         </div>
diff --git a/app/src/ui/diff/image-diffs/two-up.tsx b/app/src/ui/diff/image-diffs/two-up.tsx
index 8006ec84c4c..96eb918df1a 100644
--- a/app/src/ui/diff/image-diffs/two-up.tsx
+++ b/app/src/ui/diff/image-diffs/two-up.tsx
@@ -27,7 +27,8 @@ export class TwoUp extends React.Component<ITwoUpProps, {}> {
     const diffBytesSign = diffBytes >= 0 ? '+' : ''
 
     const style: React.CSSProperties = {
-      maxWidth: this.props.maxSize.width,
+      maxWidth:
+        this.props.maxSize.width < 200 ? undefined : this.props.maxSize.width,
     }
 
     return (
diff --git a/app/src/ui/diff/index.tsx b/app/src/ui/diff/index.tsx
index 670001ebc6f..f344d03f626 100644
--- a/app/src/ui/diff/index.tsx
+++ b/app/src/ui/diff/index.tsx
@@ -19,6 +19,7 @@ import {
   ITextDiff,
   ILargeTextDiff,
   ImageDiffType,
+  ISubmoduleDiff,
 } from '../../models/diff'
 import { Button } from '../lib/button'
 import {
@@ -27,13 +28,11 @@ import {
   DeletedImageDiff,
 } from './image-diffs'
 import { BinaryFile } from './binary-file'
-import { TextDiff } from './text-diff'
 import { SideBySideDiff } from './side-by-side-diff'
-import {
-  enableHideWhitespaceInDiffOption,
-  enableExperimentalDiffViewer,
-} from '../../lib/feature-flag'
 import { IFileContents } from './syntax-highlighting'
+import { SubmoduleDiff } from './submodule-diff'
+import { Octicon } from '../octicons'
+import * as OcticonSymbol from '../octicons/octicons.generated'
 
 // image used when no diff is displayed
 const NoDiffImage = encodePathAsUrl(__dirname, 'static/ufo-alert.svg')
@@ -77,12 +76,18 @@ interface IDiffProps {
   /** Whether we should show a confirmation dialog when the user discards changes */
   readonly askForConfirmationOnDiscardChanges?: boolean
 
+  /** Whether or not to show the diff check marks indicating inclusion in a commit */
+  readonly showDiffCheckMarks: boolean
+
   /**
    * Called when the user requests to open a binary file in an the
    * system-assigned application for said file type.
    */
   readonly onOpenBinaryFile: (fullPath: string) => void
 
+  /** Called when the user requests to open a submodule. */
+  readonly onOpenSubmodule?: (fullPath: string) => void
+
   /**
    * Called when the user is viewing an image diff and requests
    * to change the diff presentation mode.
@@ -124,6 +129,8 @@ export class Diff extends React.Component<IDiffProps, IDiffState> {
         return this.renderText(diff)
       case DiffType.Binary:
         return this.renderBinaryFile()
+      case DiffType.Submodule:
+        return this.renderSubmoduleDiff(diff)
       case DiffType.Image:
         return this.renderImage(diff)
       case DiffType.LargeText: {
@@ -171,13 +178,14 @@ export class Diff extends React.Component<IDiffProps, IDiffState> {
   private renderLargeTextDiff() {
     return (
       <div className="panel empty large-diff">
-        <img src={NoDiffImage} className="blankslate-image" />
-        <p>
-          The diff is too large to be displayed by default.
-          <br />
-          You can try to show it anyway, but performance may be negatively
-          impacted.
-        </p>
+        <img src={NoDiffImage} className="blankslate-image" alt="" />
+        <div className="description">
+          <p>The diff is too large to be displayed by default.</p>
+          <p>
+            You can try to show it anyway, but performance may be negatively
+            impacted.
+          </p>
+        </div>
         <Button onClick={this.showLargeDiff}>
           {__DARWIN__ ? 'Show Diff' : 'Show diff'}
         </Button>
@@ -188,7 +196,7 @@ export class Diff extends React.Component<IDiffProps, IDiffState> {
   private renderUnrenderableDiff() {
     return (
       <div className="panel empty large-diff">
-        <img src={NoDiffImage} />
+        <img src={NoDiffImage} alt="" />
         <p>The diff is too large to be displayed.</p>
       </div>
     )
@@ -218,6 +226,15 @@ export class Diff extends React.Component<IDiffProps, IDiffState> {
       }
 
       if (this.props.file.status.kind === AppFileStatusKind.Renamed) {
+        // Check if it was changed too
+        if (this.props.file.status.renameIncludesModifications) {
+          return (
+            <div className="panel renamed">
+              <Octicon symbol={OcticonSymbol.alert} />
+              The file was renamed and includes changes.
+            </div>
+          )
+        }
         return (
           <div className="panel renamed">
             The file was renamed but not changed
@@ -246,6 +263,16 @@ export class Diff extends React.Component<IDiffProps, IDiffState> {
     return this.renderTextDiff(diff)
   }
 
+  private renderSubmoduleDiff(diff: ISubmoduleDiff) {
+    return (
+      <SubmoduleDiff
+        onOpenSubmodule={this.props.onOpenSubmodule}
+        diff={diff}
+        readOnly={this.props.readOnly}
+      />
+    )
+  }
+
   private renderBinaryFile() {
     return (
       <BinaryFile
@@ -257,44 +284,20 @@ export class Diff extends React.Component<IDiffProps, IDiffState> {
   }
 
   private renderTextDiff(diff: ITextDiff) {
-    const hideWhitespaceInDiff =
-      enableHideWhitespaceInDiffOption() && this.props.hideWhitespaceInDiff
-
-    if (enableExperimentalDiffViewer() || this.props.showSideBySideDiff) {
-      return (
-        <SideBySideDiff
-          repository={this.props.repository}
-          file={this.props.file}
-          diff={diff}
-          fileContents={this.props.fileContents}
-          hideWhitespaceInDiff={hideWhitespaceInDiff}
-          showSideBySideDiff={this.props.showSideBySideDiff}
-          onIncludeChanged={this.props.onIncludeChanged}
-          onDiscardChanges={this.props.onDiscardChanges}
-          askForConfirmationOnDiscardChanges={
-            this.props.askForConfirmationOnDiscardChanges
-          }
-          onHideWhitespaceInDiffChanged={
-            this.props.onHideWhitespaceInDiffChanged
-          }
-        />
-      )
-    }
-
     return (
-      <TextDiff
-        repository={this.props.repository}
+      <SideBySideDiff
         file={this.props.file}
-        readOnly={this.props.readOnly}
-        hideWhitespaceInDiff={hideWhitespaceInDiff}
-        onIncludeChanged={this.props.onIncludeChanged}
-        onDiscardChanges={this.props.onDiscardChanges}
         diff={diff}
         fileContents={this.props.fileContents}
+        hideWhitespaceInDiff={this.props.hideWhitespaceInDiff}
+        showSideBySideDiff={this.props.showSideBySideDiff}
+        onIncludeChanged={this.props.onIncludeChanged}
+        onDiscardChanges={this.props.onDiscardChanges}
         askForConfirmationOnDiscardChanges={
           this.props.askForConfirmationOnDiscardChanges
         }
         onHideWhitespaceInDiffChanged={this.props.onHideWhitespaceInDiffChanged}
+        showDiffCheckMarks={this.props.showDiffCheckMarks}
       />
     )
   }
diff --git a/app/src/ui/diff/seamless-diff-switcher.tsx b/app/src/ui/diff/seamless-diff-switcher.tsx
index 5e46365cc80..9a1c2710e32 100644
--- a/app/src/ui/diff/seamless-diff-switcher.tsx
+++ b/app/src/ui/diff/seamless-diff-switcher.tsx
@@ -17,12 +17,10 @@ import {
   ILargeTextDiff,
 } from '../../models/diff'
 import { Loading } from '../lib/loading'
-import {
-  getFileContents,
-  getLineFilters,
-  IFileContents,
-} from './syntax-highlighting'
+import { getFileContents, IFileContents } from './syntax-highlighting'
 import { getTextDiffWithBottomDummyHunk } from './text-diff-expansion'
+import { textDiffEquals } from './diff-helpers'
+import noop from 'lodash/noop'
 
 /**
  * The time (in milliseconds) we allow when loading a diff before
@@ -40,26 +38,41 @@ interface ISeamlessDiffSwitcherProps {
    * diff's lines can be selected, e.g., displaying a change in the working
    * directory.
    */
+  // Used in getDerivedStateFromProps, no-unused-prop-types doesn't know that
+  // eslint-disable-next-line react/no-unused-prop-types
   readonly readOnly: boolean
 
   /** The file whose diff should be displayed. */
   readonly file: ChangedFile
 
   /** Called when the includedness of lines or a range of lines has changed. */
+  // Used in getDerivedStateFromProps, no-unused-prop-types doesn't know that
+  // eslint-disable-next-line react/no-unused-prop-types
   readonly onIncludeChanged?: (diffSelection: DiffSelection) => void
 
   /** The diff that should be rendered */
   readonly diff: IDiff | null
 
   /** The type of image diff to display. */
+  // Used in getDerivedStateFromProps, no-unused-prop-types doesn't know that
+  // eslint-disable-next-line react/no-unused-prop-types
   readonly imageDiffType: ImageDiffType
 
   /** Hiding whitespace in diff. */
+  // Used in getDerivedStateFromProps, no-unused-prop-types doesn't know that
+  // eslint-disable-next-line react/no-unused-prop-types
   readonly hideWhitespaceInDiff: boolean
 
   /** Whether we should display side by side diffs. */
+  // Used in getDerivedStateFromProps, no-unused-prop-types doesn't know that
+  // eslint-disable-next-line react/no-unused-prop-types
   readonly showSideBySideDiff: boolean
 
+  /** Whether or not to show the diff check marks indicating inclusion in a commit */
+  // Used in getDerivedStateFromProps, no-unused-prop-types doesn't know that
+  // eslint-disable-next-line react/no-unused-prop-types
+  readonly showDiffCheckMarks: boolean
+
   /** Whether we should show a confirmation dialog when the user discards changes */
   readonly askForConfirmationOnDiscardChanges?: boolean
 
@@ -67,24 +80,37 @@ interface ISeamlessDiffSwitcherProps {
    * Called when the user requests to open a binary file in an the
    * system-assigned application for said file type.
    */
+  // Used in getDerivedStateFromProps, no-unused-prop-types doesn't know that
+  // eslint-disable-next-line react/no-unused-prop-types
   readonly onOpenBinaryFile: (fullPath: string) => void
 
+  /** Called when the user requests to open a submodule. */
+  // Used in getDerivedStateFromProps, no-unused-prop-types doesn't know that
+  // eslint-disable-next-line react/no-unused-prop-types
+  readonly onOpenSubmodule?: (fullPath: string) => void
+
   /**
    * Called when the user is viewing an image diff and requests
    * to change the diff presentation mode.
    */
+  // Used in getDerivedStateFromProps, no-unused-prop-types doesn't know that
+  // eslint-disable-next-line react/no-unused-prop-types
   readonly onChangeImageDiffType: (type: ImageDiffType) => void
 
   /*
    * Called when the user wants to discard a selection of the diff.
    * Only applicable when readOnly is false.
    */
+  // Used in getDerivedStateFromProps, no-unused-prop-types doesn't know that
+  // eslint-disable-next-line react/no-unused-prop-types
   readonly onDiscardChanges?: (
     diff: ITextDiff,
     diffSelection: DiffSelection
   ) => void
 
   /** Called when the user changes the hide whitespace in diffs setting. */
+  // Used in getDerivedStateFromProps, no-unused-prop-types doesn't know that
+  // eslint-disable-next-line react/no-unused-prop-types
   readonly onHideWhitespaceInDiffChanged: (checked: boolean) => void
 }
 
@@ -116,9 +142,6 @@ interface ISeamlessDiffSwitcherState {
   readonly fileContents: IFileContents | null
 }
 
-/** I'm super useful */
-function noop() {}
-
 function isSameFile(prevFile: ChangedFile, newFile: ChangedFile) {
   return prevFile === newFile || prevFile.id === newFile.id
 }
@@ -128,7 +151,7 @@ function isSameDiff(prevDiff: IDiff, newDiff: IDiff) {
     prevDiff === newDiff ||
     (isTextDiff(prevDiff) &&
       isTextDiff(newDiff) &&
-      prevDiff.text === newDiff.text)
+      textDiffEquals(prevDiff, newDiff))
   )
 }
 
@@ -257,11 +280,9 @@ export class SeamlessDiffSwitcher extends React.Component<
 
     this.loadingState = { file: fileToLoad, diff }
 
-    const lineFilters = getLineFilters(diff.hunks)
     const fileContents = await getFileContents(
       this.props.repository,
-      fileToLoad,
-      lineFilters
+      fileToLoad
     )
 
     this.loadingState = null
@@ -311,10 +332,12 @@ export class SeamlessDiffSwitcher extends React.Component<
       readOnly,
       hideWhitespaceInDiff,
       showSideBySideDiff,
+      showDiffCheckMarks,
       onIncludeChanged,
       onDiscardChanges,
       file,
       onOpenBinaryFile,
+      onOpenSubmodule,
       onChangeImageDiffType,
       onHideWhitespaceInDiffChanged,
     } = this.state.propSnapshot
@@ -346,9 +369,11 @@ export class SeamlessDiffSwitcher extends React.Component<
             askForConfirmationOnDiscardChanges={
               this.props.askForConfirmationOnDiscardChanges
             }
+            showDiffCheckMarks={showDiffCheckMarks}
             onIncludeChanged={isLoadingDiff ? noop : onIncludeChanged}
             onDiscardChanges={isLoadingDiff ? noop : onDiscardChanges}
             onOpenBinaryFile={isLoadingDiff ? noop : onOpenBinaryFile}
+            onOpenSubmodule={isLoadingDiff ? noop : onOpenSubmodule}
             onChangeImageDiffType={isLoadingDiff ? noop : onChangeImageDiffType}
             onHideWhitespaceInDiffChanged={
               isLoadingDiff ? noop : onHideWhitespaceInDiffChanged
diff --git a/app/src/ui/diff/side-by-side-diff-row.tsx b/app/src/ui/diff/side-by-side-diff-row.tsx
index a3b8d806b1c..2527dfddc02 100644
--- a/app/src/ui/diff/side-by-side-diff-row.tsx
+++ b/app/src/ui/diff/side-by-side-diff-row.tsx
@@ -6,19 +6,120 @@ import {
   DiffRowType,
   IDiffRowData,
   DiffColumn,
+  isRowChanged,
 } from './diff-helpers'
 import { ILineTokens } from '../../lib/highlighter/types'
 import classNames from 'classnames'
-import { Octicon } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
-import { narrowNoNewlineSymbol } from './text-diff'
+import { Octicon, OcticonSymbolVariant } from '../octicons'
+import * as octicons from '../octicons/octicons.generated'
 import { shallowEquals, structuralEquals } from '../../lib/equality'
-import { DiffHunkExpansionType } from '../../models/diff'
-import { DiffExpansionKind } from './text-diff-expansion'
-import { PopoverCaretPosition } from '../lib/popover'
+import { DiffHunkExpansionType, DiffSelectionType } from '../../models/diff'
+import { PopoverAnchorPosition } from '../lib/popover'
 import { WhitespaceHintPopover } from './whitespace-hint-popover'
-import { TooltippedContent } from '../lib/tooltipped-content'
 import { TooltipDirection } from '../lib/tooltip'
+import { Button } from '../lib/button'
+import { diffCheck, diffDash } from '../octicons/diff'
+
+// This is a custom version of the no-newline octicon that's exactly as
+// tall as it needs to be (8px) which helps with aligning it on the line.
+const narrowNoNewlineSymbol: OcticonSymbolVariant = {
+  w: 16,
+  h: 8,
+  p: [
+    'm 16,1 0,3 c 0,0.55 -0.45,1 -1,1 l -3,0 0,2 -3,-3 3,-3 0,2 2,0 0,-2 2,0 z M 8,4 C 8,6.2 6.2,8 4,8 1.8,8 0,6.2 0,4 0,1.8 1.8,0 4,0 6.2,0 8,1.8 8,4 Z M 1.5,5.66 5.66,1.5 C 5.18,1.19 4.61,1 4,1 2.34,1 1,2.34 1,4 1,4.61 1.19,5.17 1.5,5.66 Z M 7,4 C 7,3.39 6.81,2.83 6.5,2.34 L 2.34,6.5 C 2.82,6.81 3.39,7 4,7 5.66,7 7,5.66 7,4 Z',
+  ],
+}
+
+enum DiffRowPrefix {
+  Added = '+',
+  Deleted = '-',
+  Nothing = '\u{A0}',
+}
+
+/**
+ * This interface is used to pass information about a continuous group of
+ * selectable rows to the row component as it pertains to a given row.
+ *
+ * Primarily used for the styling of the row and it's check all control.
+ */
+export interface IRowSelectableGroup {
+  /**
+   * Whether or not the row is the first in the selectable group
+   */
+  isFirst: boolean
+
+  /**
+   * Whether or not the group is hovered by the mouse
+   */
+  isHovered: boolean
+
+  /**
+   * Whether or not the check all handle is rendered in this row
+   */
+  isCheckAllRenderedInRow: boolean
+
+  /**
+   * The selection state of the group - 'All', 'Partial', or 'None'
+   */
+  selectionState: DiffSelectionType
+
+  /**
+   * The height of the number of rendered rows in the group
+   *
+   * Usually, this is the height of all the rows in the group, but if the group
+   * is partially scrolled out of view, it will be the height of the rendered
+   * row. The diff is a virtualized list, so a row may be rendered but out of
+   * view.
+   */
+  height: number
+
+  /**
+   * The data that does not change on render
+   */
+  staticData: IRowSelectableGroupStaticData
+}
+
+/**
+ * This is to house the data that could be cached as it should not change with
+ * each row render. It is info such as whether or not the row is the first or
+ * last in the group, the line numbers, and the diff type of the group.
+ */
+export interface IRowSelectableGroupStaticData {
+  /**
+   * The group's rows starting index.
+   *
+   * Note: Since the array of diff rows includes hunk
+   * headeres, this does not equate to the line numbers.
+   */
+  diffRowStartIndex: number
+
+  /**
+   * The group's rows ending index.
+   *
+   * Note: Since the array of diff rows includes hunk
+   * headers, this does not equate to the line numbers.
+   */
+  diffRowStopIndex: number
+
+  /** The group's diff type, all 'added',  all 'deleted', or a mix = 'modified */
+  diffType: DiffRowType
+
+  /**
+   * The line numbers associated with the group
+   */
+  lineNumbers: ReadonlyArray<number>
+
+  /**
+   * The line numbers identifiers associated with the group.
+   *
+   * If the line numbers are [4, 5, 6] then the lineNumbersIdentifiers could be
+   * something like [`4-before`, `4-after`, `5-after`, `6-after`] as the line
+   * number is not unique without the "before" or "after" suffix
+   */
+  lineNumbersIdentifiers: ReadonlyArray<CheckBoxIdentifier>
+}
+
+export type CheckBoxIdentifier = `${number}-${'after' | 'before'}`
 
 interface ISideBySideDiffRowProps {
   /**
@@ -31,11 +132,6 @@ interface ISideBySideDiffRowProps {
    */
   readonly isDiffSelectable: boolean
 
-  /**
-   * Whether the row belongs to a hunk that is hovered.
-   */
-  readonly isHunkHovered: boolean
-
   /**
    * Whether to display the rows side by side.
    */
@@ -66,13 +162,6 @@ interface ISideBySideDiffRowProps {
     select: boolean
   ) => void
 
-  /**
-   * Called when a line selection is updated. Called with the
-   * row and column of the hovered line.
-   * (only relevant when isDiffSelectable is true)
-   */
-  readonly onUpdateSelection: (row: number, column: DiffColumn) => void
-
   /**
    * Called when the user hovers the hunk handle. Called with the start
    * line of the hunk.
@@ -87,7 +176,10 @@ interface ISideBySideDiffRowProps {
    */
   readonly onMouseLeaveHunk: (hunkStartLine: number) => void
 
-  readonly onExpandHunk: (hunkIndex: number, kind: DiffExpansionKind) => void
+  readonly onExpandHunk: (
+    hunkIndex: number,
+    kind: DiffHunkExpansionType
+  ) => void
 
   /**
    * Called when the user clicks on the hunk handle. Called with the start
@@ -104,6 +196,15 @@ interface ISideBySideDiffRowProps {
    */
   readonly onContextMenuLine: (diffLineNumber: number) => void
 
+  /**
+   * Called when the user toggles the inclusion of line
+   */
+  readonly onLineNumberCheckedChanged: (
+    row: number,
+    column: DiffColumn,
+    select: boolean
+  ) => void
+
   /**
    * Called when the user right-clicks a hunk handle. Called with the start
    * line of the hunk.
@@ -116,11 +217,6 @@ interface ISideBySideDiffRowProps {
    */
   readonly onContextMenuExpandHunk: () => void
 
-  /**
-   * Called when the user right-clicks text on the diff.
-   */
-  readonly onContextMenuText: () => void
-
   /**
    * Array of classes applied to the after section of a row
    */
@@ -133,6 +229,18 @@ interface ISideBySideDiffRowProps {
 
   /** Called when the user changes the hide whitespace in diffs setting. */
   readonly onHideWhitespaceInDiffChanged: (checked: boolean) => void
+
+  readonly onHunkExpansionRef: (
+    hunkIndex: number,
+    expansionType: DiffHunkExpansionType,
+    element: HTMLButtonElement | null
+  ) => void
+
+  /** Whether or not to show the diff check marks indicating inclusion in a commit */
+  readonly showDiffCheckMarks: boolean
+
+  /** The selectable group details */
+  readonly rowSelectableGroup: IRowSelectableGroup | null
 }
 
 interface ISideBySideDiffRowState {
@@ -147,33 +255,44 @@ export class SideBySideDiffRow extends React.Component<
     super(props)
     this.state = { showWhitespaceHint: undefined }
   }
-  public render() {
-    const { row, showSideBySideDiff, beforeClassNames, afterClassNames } =
-      this.props
 
+  public render() {
+    const {
+      row,
+      showSideBySideDiff,
+      beforeClassNames,
+      afterClassNames,
+      isDiffSelectable,
+    } = this.props
+    const baseRowClasses = classNames('row', {
+      'has-check-all-control':
+        this.props.showDiffCheckMarks && isDiffSelectable,
+    })
     const beforeClasses = classNames('before', ...beforeClassNames)
     const afterClasses = classNames('after', ...afterClassNames)
     switch (row.type) {
       case DiffRowType.Hunk: {
-        const className = ['row', 'hunk-info']
-        if (row.expansionType === DiffHunkExpansionType.Both) {
-          className.push('expandable-both')
-        }
-
+        const rowClasses = classNames('hunk-info', baseRowClasses, {
+          'expandable-both': row.expansionType === DiffHunkExpansionType.Both,
+        })
         return (
-          <div className={classNames(className)}>
+          <div className={rowClasses} role="cell">
             {this.renderHunkHeaderGutter(row.hunkIndex, row.expansionType)}
             {this.renderContentFromString(row.content)}
           </div>
         )
       }
       case DiffRowType.Context:
+        const rowClasses = classNames('context', baseRowClasses)
         const { beforeLineNumber, afterLineNumber } = row
         if (!showSideBySideDiff) {
           return (
-            <div className="row context">
+            <div className={rowClasses} role="cell">
               <div className="before">
-                {this.renderLineNumbers([beforeLineNumber, afterLineNumber])}
+                {this.renderLineNumbers(
+                  [beforeLineNumber, afterLineNumber],
+                  undefined
+                )}
                 {this.renderContentFromString(row.content, row.beforeTokens)}
               </div>
             </div>
@@ -181,13 +300,13 @@ export class SideBySideDiffRow extends React.Component<
         }
 
         return (
-          <div className="row context">
+          <div className={rowClasses} role="cell">
             <div className="before">
-              {this.renderLineNumber(beforeLineNumber)}
+              {this.renderLineNumber(beforeLineNumber, DiffColumn.Before)}
               {this.renderContentFromString(row.content, row.beforeTokens)}
             </div>
             <div className="after">
-              {this.renderLineNumber(afterLineNumber)}
+              {this.renderLineNumber(afterLineNumber, DiffColumn.After)}
               {this.renderContentFromString(row.content, row.afterTokens)}
             </div>
           </div>
@@ -195,16 +314,18 @@ export class SideBySideDiffRow extends React.Component<
 
       case DiffRowType.Added: {
         const { lineNumber, isSelected } = row.data
+        const rowClasses = classNames('added', baseRowClasses)
         if (!showSideBySideDiff) {
           return (
-            <div
-              className="row added"
-              onMouseEnter={this.onMouseEnterLineNumber}
-            >
+            <div className={rowClasses} role="cell">
+              {this.renderHunkHandle()}
               <div className={afterClasses}>
-                {this.renderLineNumbers([undefined, lineNumber], isSelected)}
-                {this.renderHunkHandle()}
-                {this.renderContent(row.data)}
+                {this.renderLineNumbers(
+                  [undefined, lineNumber],
+                  DiffColumn.After,
+                  isSelected
+                )}
+                {this.renderContent(row.data, DiffRowPrefix.Added)}
                 {this.renderWhitespaceHintPopover(DiffColumn.After)}
               </div>
             </div>
@@ -212,33 +333,35 @@ export class SideBySideDiffRow extends React.Component<
         }
 
         return (
-          <div className="row added" onMouseEnter={this.onMouseEnterLineNumber}>
+          <div className={rowClasses} role="cell">
             <div className={beforeClasses}>
-              {this.renderLineNumber()}
+              {this.renderLineNumber(undefined, DiffColumn.Before)}
               {this.renderContentFromString('')}
               {this.renderWhitespaceHintPopover(DiffColumn.Before)}
             </div>
+            {this.renderHunkHandle()}
             <div className={afterClasses}>
-              {this.renderLineNumber(lineNumber, isSelected)}
-              {this.renderContent(row.data)}
+              {this.renderLineNumber(lineNumber, DiffColumn.After, isSelected)}
+              {this.renderContent(row.data, DiffRowPrefix.Added)}
               {this.renderWhitespaceHintPopover(DiffColumn.After)}
             </div>
-            {this.renderHunkHandle()}
           </div>
         )
       }
       case DiffRowType.Deleted: {
         const { lineNumber, isSelected } = row.data
+        const rowClasses = classNames('deleted', baseRowClasses)
         if (!showSideBySideDiff) {
           return (
-            <div
-              className="row deleted"
-              onMouseEnter={this.onMouseEnterLineNumber}
-            >
+            <div className={rowClasses} role="cell">
+              {this.renderHunkHandle()}
               <div className={beforeClasses}>
-                {this.renderLineNumbers([lineNumber, undefined], isSelected)}
-                {this.renderHunkHandle()}
-                {this.renderContent(row.data)}
+                {this.renderLineNumbers(
+                  [lineNumber, undefined],
+                  DiffColumn.Before,
+                  isSelected
+                )}
+                {this.renderContent(row.data, DiffRowPrefix.Deleted)}
                 {this.renderWhitespaceHintPopover(DiffColumn.Before)}
               </div>
             </div>
@@ -246,45 +369,45 @@ export class SideBySideDiffRow extends React.Component<
         }
 
         return (
-          <div
-            className="row deleted"
-            onMouseEnter={this.onMouseEnterLineNumber}
-          >
+          <div className={rowClasses} role="cell">
             <div className={beforeClasses}>
-              {this.renderLineNumber(lineNumber, isSelected)}
-              {this.renderContent(row.data)}
+              {this.renderLineNumber(lineNumber, DiffColumn.Before, isSelected)}
+              {this.renderContent(row.data, DiffRowPrefix.Deleted)}
               {this.renderWhitespaceHintPopover(DiffColumn.Before)}
             </div>
+            {this.renderHunkHandle()}
             <div className={afterClasses}>
-              {this.renderLineNumber()}
-              {this.renderContentFromString('')}
+              {this.renderLineNumber(undefined, DiffColumn.After)}
+              {this.renderContentFromString('', [])}
               {this.renderWhitespaceHintPopover(DiffColumn.After)}
             </div>
-            {this.renderHunkHandle()}
           </div>
         )
       }
       case DiffRowType.Modified: {
         const { beforeData: before, afterData: after } = row
+        const rowClasses = classNames('modified', baseRowClasses)
         return (
-          <div className="row modified">
-            <div
-              className={beforeClasses}
-              onMouseEnter={this.onMouseEnterLineNumber}
-            >
-              {this.renderLineNumber(before.lineNumber, before.isSelected)}
-              {this.renderContent(before)}
+          <div className={rowClasses} role="cell">
+            <div className={beforeClasses}>
+              {this.renderLineNumber(
+                before.lineNumber,
+                DiffColumn.Before,
+                before.isSelected
+              )}
+              {this.renderContent(before, DiffRowPrefix.Deleted)}
               {this.renderWhitespaceHintPopover(DiffColumn.Before)}
             </div>
-            <div
-              className={afterClasses}
-              onMouseEnter={this.onMouseEnterLineNumber}
-            >
-              {this.renderLineNumber(after.lineNumber, after.isSelected)}
-              {this.renderContent(after)}
+            {this.renderHunkHandle()}
+            <div className={afterClasses}>
+              {this.renderLineNumber(
+                after.lineNumber,
+                DiffColumn.After,
+                after.isSelected
+              )}
+              {this.renderContent(after, DiffRowPrefix.Added)}
               {this.renderWhitespaceHintPopover(DiffColumn.After)}
             </div>
-            {this.renderHunkHandle()}
           </div>
         )
       }
@@ -311,23 +434,31 @@ export class SideBySideDiffRow extends React.Component<
 
   private renderContentFromString(
     content: string,
-    tokens: ReadonlyArray<ILineTokens> = []
+    tokens: ReadonlyArray<ILineTokens> = [],
+    prefix: DiffRowPrefix = DiffRowPrefix.Nothing
   ) {
     return this.renderContent({ content, tokens, noNewLineIndicator: false })
   }
 
   private renderContent(
-    data: Pick<IDiffRowData, 'content' | 'noNewLineIndicator' | 'tokens'>
+    data: Pick<IDiffRowData, 'content' | 'noNewLineIndicator' | 'tokens'>,
+    prefix: DiffRowPrefix = DiffRowPrefix.Nothing
   ) {
     return (
-      <div className="content" onContextMenu={this.props.onContextMenuText}>
-        {syntaxHighlightLine(data.content, data.tokens)}
-        {data.noNewLineIndicator && (
-          <Octicon
-            symbol={narrowNoNewlineSymbol}
-            title="No newline at end of file"
-          />
-        )}
+      <div className="content">
+        <div className="prefix">&nbsp;&nbsp;{prefix}&nbsp;&nbsp;</div>
+        <div className="content-wrapper">
+          {/* Copy to clipboard will ignore empty "lines" unless we add br */}
+          {data.content.length === 0 && <br />}
+
+          {syntaxHighlightLine(data.content, data.tokens)}
+          {data.noNewLineIndicator && (
+            <Octicon
+              symbol={narrowNoNewlineSymbol}
+              title="No newline at end of file"
+            />
+          )}
+        </div>
       </div>
     )
   }
@@ -340,41 +471,56 @@ export class SideBySideDiffRow extends React.Component<
       // This can only be the first hunk
       case DiffHunkExpansionType.Up:
         return {
-          icon: OcticonSymbol.foldUp,
+          icon: octicons.foldUp,
           title: 'Expand Up',
-          handler: this.onExpandHunk(hunkIndex, 'up'),
+          handler: this.onExpandHunk(hunkIndex, expansionType),
         }
       // This can only be the last dummy hunk. In this case, we expand the
       // second to last hunk down.
       case DiffHunkExpansionType.Down:
         return {
-          icon: OcticonSymbol.foldDown,
+          icon: octicons.foldDown,
           title: 'Expand Down',
-          handler: this.onExpandHunk(hunkIndex - 1, 'down'),
+          handler: this.onExpandHunk(hunkIndex - 1, expansionType),
         }
       case DiffHunkExpansionType.Short:
         return {
-          icon: OcticonSymbol.fold,
+          icon: octicons.fold,
           title: 'Expand All',
-          handler: this.onExpandHunk(hunkIndex, 'up'),
+          handler: this.onExpandHunk(hunkIndex, expansionType),
         }
     }
 
     throw new Error(`Unexpected expansion type ${expansionType}`)
   }
 
+  /**
+   * This method returns the width of a line gutter in pixels. For unified diffs
+   * the gutter contains the line number of both before and after sides, whereas
+   * for side-by-side diffs the gutter contains the line number of only one side.
+   */
+  private get lineGutterWidth() {
+    const {
+      showSideBySideDiff,
+      lineNumberWidth,
+      isDiffSelectable,
+      showDiffCheckMarks,
+    } = this.props
+    return (
+      (showSideBySideDiff ? lineNumberWidth : lineNumberWidth * 2) +
+      (isDiffSelectable && showDiffCheckMarks ? 20 : 0)
+    )
+  }
+
   private renderHunkExpansionHandle(
     hunkIndex: number,
     expansionType: DiffHunkExpansionType
   ) {
+    const width = this.lineGutterWidth
     if (expansionType === DiffHunkExpansionType.None) {
       return (
-        <div
-          className="hunk-expansion-handle"
-          onContextMenu={this.props.onContextMenuExpandHunk}
-          style={{ width: this.props.lineNumberWidth }}
-        >
-          <span></span>
+        <div className="hunk-expansion-handle" style={{ width }}>
+          <div className="hunk-expansion-placeholder" />
         </div>
       )
     }
@@ -387,20 +533,28 @@ export class SideBySideDiffRow extends React.Component<
     return (
       <div
         className="hunk-expansion-handle selectable hoverable"
-        onClick={elementInfo.handler}
-        style={{ width: this.props.lineNumberWidth }}
-        onContextMenu={this.props.onContextMenuExpandHunk}
+        style={{ width }}
       >
-        <TooltippedContent
-          direction={TooltipDirection.SOUTH}
+        <Button
+          onClick={elementInfo.handler}
+          onContextMenu={this.props.onContextMenuExpandHunk}
           tooltip={elementInfo.title}
+          toolTipDirection={TooltipDirection.SOUTH}
+          ariaLabel={elementInfo.title}
+          onButtonRef={this.getOnHunkExpansionRef(hunkIndex, expansionType)}
         >
           <Octicon symbol={elementInfo.icon} />
-        </TooltippedContent>
+        </Button>
       </div>
     )
   }
 
+  private getOnHunkExpansionRef =
+    (hunkIndex: number, expansionType: DiffHunkExpansionType) =>
+    (button: HTMLButtonElement | null) => {
+      this.props.onHunkExpansionRef(hunkIndex, expansionType, button)
+    }
+
   private renderHunkHeaderGutter(
     hunkIndex: number,
     expansionType: DiffHunkExpansionType
@@ -421,83 +575,273 @@ export class SideBySideDiffRow extends React.Component<
   }
 
   private renderHunkHandle() {
-    if (!this.props.isDiffSelectable) {
+    const { isDiffSelectable, rowSelectableGroup, row } = this.props
+    if (!isDiffSelectable) {
       return null
     }
 
-    return (
-      <div
-        className="hunk-handle hoverable"
+    if (!isRowChanged(row)) {
+      return null
+    }
+
+    if (rowSelectableGroup === null) {
+      return this.renderHunkHandlePlaceHolder()
+    }
+
+    const {
+      height,
+      selectionState,
+      staticData,
+      isCheckAllRenderedInRow,
+      isFirst,
+    } = rowSelectableGroup
+
+    if (!isCheckAllRenderedInRow) {
+      return this.renderHunkHandlePlaceHolder(selectionState)
+    }
+
+    const { lineNumbers, lineNumbersIdentifiers, diffType } = staticData
+    const isOnlyOneCheckInRow = lineNumbersIdentifiers.length === 1
+    const style = { height }
+    const hunkHandleClassName = classNames('hunk-handle', 'hoverable', {
+      // selected is a class if any line in the group is selected
+      selected: selectionState !== DiffSelectionType.None,
+    })
+    const checkAllId = lineNumbersIdentifiers.join('-')
+
+    /* The hunk-handle is a a single element with a calculated height of all the
+     rows in the selectable group (See `getRowSelectableGroupHeight` in
+     `side-by-side-diff.tsx`). This gives us a single element to be our control
+     of the check all functionality. It is positioned absolutely over the
+     hunk-handle-place-holders in each row in order to provide one element that
+     is interactive.
+
+     Other notes: I originally attempted to just use a single hunk-handle
+     for the first row in a group as the heights of the rows are calculated and
+     the rows do not clip overflow. However, that messes with the initial
+     measurement for cache of the first row's height as the cell measurer will
+     include the hunk handles initially calculated height (num rows times
+     default row height) in it's measurement. (Resulting in the first row in a
+     group heights = to however many lines in the group x 20) Thus, I decided to
+     use the place holder element in each row to define the width of the hunk
+     handle in the row and just position the hunk handle over them. A bit on the
+     hacky side.
+    */
+    const hunkHandle = (
+      <label
+        htmlFor={checkAllId}
         onMouseEnter={this.onMouseEnterHunk}
         onMouseLeave={this.onMouseLeaveHunk}
-        onClick={this.onClickHunk}
         onContextMenu={this.onContextMenuHunk}
+        className={hunkHandleClassName}
+        style={style}
+      >
+        <span className="focus-handle">
+          {!this.props.showDiffCheckMarks && (
+            <div className="increased-hover-surface" style={{ height }} />
+          )}
+          {!isOnlyOneCheckInRow &&
+            this.getCheckAllOcticon(selectionState, isFirst)}
+          {!isOnlyOneCheckInRow && (
+            <span className="sr-only">
+              {' '}
+              Lines {lineNumbers.at(0)} to {lineNumbers.at(-1)}{' '}
+              {diffType === DiffRowType.Added
+                ? 'added'
+                : diffType === DiffRowType.Deleted
+                ? 'deleted'
+                : 'modified'}
+            </span>
+          )}
+        </span>
+      </label>
+    )
+
+    const checkAllControl = (
+      <input
+        className="sr-only"
+        id={checkAllId}
+        type="checkbox"
+        aria-controls={lineNumbersIdentifiers.join(' ')}
+        aria-checked={
+          selectionState === DiffSelectionType.All
+            ? true
+            : selectionState === DiffSelectionType.Partial
+            ? 'mixed'
+            : false
+        }
+        onChange={this.onClickHunk}
+        onFocus={this.onHunkFocus}
+        onBlur={this.onHunkBlur}
+        onContextMenu={this.onContextMenuHunk}
+      />
+    )
+
+    return (
+      <>
+        {!isOnlyOneCheckInRow && checkAllControl}
+        {hunkHandle}
+        {this.renderHunkHandlePlaceHolder(selectionState)}
+      </>
+    )
+  }
+
+  /**
+   * On scroll of the diff, the rendering of the hunk handle can be delayed so
+   * we make the placeholder mimic the selected state so visually it looks like
+   * the hunk handle is there and there isn't a flickter of grey background.
+   */
+  private renderHunkHandlePlaceHolder = (
+    selectionState?: DiffSelectionType
+  ) => {
+    return (
+      <div
+        className={classNames('hunk-handle-place-holder', {
+          selected: selectionState !== DiffSelectionType.None,
+        })}
       ></div>
     )
   }
 
+  private getCheckAllOcticon = (
+    selectionState: DiffSelectionType,
+    isFirst: boolean
+  ) => {
+    if (!isFirst || !this.props.showDiffCheckMarks) {
+      return null
+    }
+
+    if (selectionState === DiffSelectionType.All) {
+      return <Octicon symbol={diffCheck} />
+    }
+    if (selectionState === DiffSelectionType.Partial) {
+      return <Octicon symbol={diffDash} />
+    }
+
+    return null
+  }
+
+  private getLineNumbersContainerID(column: DiffColumn) {
+    return `line-numbers-${this.props.numRow}-${column}`
+  }
+
   /**
    * Renders the line number box.
    *
    * @param lineNumbers Array with line numbers to display.
+   * @param column      Column to which the line number belongs.
    * @param isSelected  Whether the line has been selected.
    *                    If undefined is passed, the line is treated
    *                    as non-selectable.
    */
   private renderLineNumbers(
     lineNumbers: Array<number | undefined>,
+    column: DiffColumn | undefined,
     isSelected?: boolean
   ) {
-    if (!this.props.isDiffSelectable || isSelected === undefined) {
-      return (
-        <div
-          className="line-number"
-          style={{ width: this.props.lineNumberWidth }}
-        >
-          {lineNumbers.map((lineNumber, index) => (
-            <span key={index}>{lineNumber}</span>
-          ))}
-        </div>
-      )
+    const wrapperID =
+      column === undefined ? undefined : this.getLineNumbersContainerID(column)
+    const isSelectable = this.props.isDiffSelectable && isSelected !== undefined
+    const classes = classNames('line-number', {
+      selectable: isSelectable,
+      hoverable: isSelectable,
+      'line-selected': isSelected,
+      hover: this.props.rowSelectableGroup?.isHovered,
+    })
+
+    const firstDefinedLineNumber = lineNumbers
+      .filter(ln => ln !== undefined)
+      .at(0)
+    if (firstDefinedLineNumber === undefined) {
+      // This shouldn't be possible. If there are no line numbers, we shouldn't
+      // be rendering this component.
+      return null
     }
 
+    // Note: This id is used by the check all aria-controls attribute,
+    // modification of this should be reflected there.
+    const checkboxId: CheckBoxIdentifier = `${firstDefinedLineNumber}-${
+      column === DiffColumn.After ? 'after' : 'before'
+    }`
+
     return (
+      // eslint-disable-next-line jsx-a11y/no-static-element-interactions
       <div
-        className={classNames('line-number', 'selectable', 'hoverable', {
-          'line-selected': isSelected,
-          hover: this.props.isHunkHovered,
-        })}
-        style={{ width: this.props.lineNumberWidth }}
+        id={wrapperID}
+        className={classes}
+        style={{ width: this.lineGutterWidth }}
         onMouseDown={this.onMouseDownLineNumber}
-        onContextMenu={this.onContextMenuLineNumber}
       >
-        {lineNumbers.map((lineNumber, index) => (
-          <span key={index}>{lineNumber}</span>
-        ))}
+        {isSelectable &&
+          this.renderLineNumberCheckbox(checkboxId, isSelected === true)}
+        <label
+          htmlFor={checkboxId}
+          onContextMenu={this.onContextMenuLineNumber}
+        >
+          {this.renderLineNumberCheck(isSelected)}
+          {lineNumbers.map((lineNumber, index) => (
+            <span key={index}>
+              {lineNumber && <span className="sr-only">Line </span>}
+              {lineNumber}
+              {lineNumber && isSelected !== undefined && (
+                <span className="sr-only">
+                  {column === DiffColumn.After ? ' added' : ' deleted'}
+                </span>
+              )}
+            </span>
+          ))}
+        </label>
+      </div>
+    )
+  }
+
+  private renderLineNumberCheck(isSelected?: boolean) {
+    if (!this.props.isDiffSelectable || !this.props.showDiffCheckMarks) {
+      return null
+    }
+
+    return (
+      <div className="line-number-check">
+        {isSelected ? <Octicon symbol={diffCheck} /> : null}
       </div>
     )
   }
 
+  private renderLineNumberCheckbox(
+    checkboxId: string | undefined,
+    isSelected: boolean
+  ) {
+    return (
+      <input
+        onContextMenu={this.onContextMenuLineNumber}
+        className="sr-only"
+        id={checkboxId}
+        type="checkbox"
+        onChange={this.onLineNumberCheckboxChange}
+        checked={isSelected}
+      />
+    )
+  }
+
   private renderWhitespaceHintPopover(column: DiffColumn) {
     if (this.state.showWhitespaceHint !== column) {
       return
     }
+    const elementID = `line-numbers-${this.props.numRow}-${column}`
+    const anchor = document.getElementById(elementID)
+    if (anchor === null) {
+      return
+    }
 
-    const caretPosition =
+    const anchorPosition =
       column === DiffColumn.Before
-        ? PopoverCaretPosition.RightTop
-        : PopoverCaretPosition.LeftTop
-
-    const style: React.CSSProperties = {
-      [column === DiffColumn.Before ? 'marginRight' : 'marginLeft']:
-        this.props.lineNumberWidth + 10,
-      marginTop: -10,
-    }
+        ? PopoverAnchorPosition.LeftTop
+        : PopoverAnchorPosition.RightTop
 
     return (
       <WhitespaceHintPopover
-        caretPosition={caretPosition}
-        style={style}
+        anchor={anchor}
+        anchorPosition={anchorPosition}
         onHideWhitespaceInDiffChanged={this.props.onHideWhitespaceInDiffChanged}
         onDismissed={this.onWhitespaceHintClose}
       />
@@ -512,22 +856,21 @@ export class SideBySideDiffRow extends React.Component<
    * Renders the line number box.
    *
    * @param lineNumber  Line number to display.
+   * @param column      Column to which the line number belongs.
    * @param isSelected  Whether the line has been selected.
    *                    If undefined is passed, the line is treated
    *                    as non-selectable.
    */
-  private renderLineNumber(lineNumber?: number, isSelected?: boolean) {
-    return this.renderLineNumbers([lineNumber], isSelected)
+  private renderLineNumber(
+    lineNumber: number | undefined,
+    column: DiffColumn,
+    isSelected?: boolean
+  ) {
+    return this.renderLineNumbers([lineNumber], column, isSelected)
   }
 
   private getDiffColumn(targetElement?: Element): DiffColumn | null {
-    const { row, showSideBySideDiff } = this.props
-
-    // On unified diffs we don't have columns so we always use "before" to not
-    // mess up with line selections.
-    if (!showSideBySideDiff) {
-      return DiffColumn.Before
-    }
+    const { row } = this.props
 
     switch (row.type) {
       case DiffRowType.Added:
@@ -569,6 +912,29 @@ export class SideBySideDiffRow extends React.Component<
     return null
   }
 
+  private onLineNumberCheckboxChange = ({
+    currentTarget: checkbox,
+  }: {
+    currentTarget: HTMLInputElement
+  }) => {
+    const column = this.getDiffColumn(checkbox)
+
+    if (column === null) {
+      return
+    }
+
+    if (this.props.hideWhitespaceInDiff) {
+      this.setState({ showWhitespaceHint: column })
+      return
+    }
+
+    this.props.onLineNumberCheckedChanged(
+      this.props.numRow,
+      column,
+      checkbox.checked
+    )
+  }
+
   private onMouseDownLineNumber = (evt: React.MouseEvent) => {
     if (evt.buttons === 2) {
       return
@@ -577,27 +943,20 @@ export class SideBySideDiffRow extends React.Component<
     const column = this.getDiffColumn(evt.currentTarget)
     const data = this.getDiffData(evt.currentTarget)
 
-    if (data !== null && column !== null) {
-      if (this.props.hideWhitespaceInDiff) {
-        this.setState({ showWhitespaceHint: column })
-        return
-      }
-
-      this.props.onStartSelection(this.props.numRow, column, !data.isSelected)
+    if (column === null) {
+      return
     }
-  }
 
-  private onMouseEnterLineNumber = (evt: React.MouseEvent) => {
     if (this.props.hideWhitespaceInDiff) {
+      this.setState({ showWhitespaceHint: column })
       return
     }
 
-    const data = this.getDiffData(evt.currentTarget)
-    const column = this.getDiffColumn(evt.currentTarget)
-
-    if (data !== null && column !== null) {
-      this.props.onUpdateSelection(this.props.numRow, column)
+    if (data === null) {
+      return
     }
+
+    this.props.onStartSelection(this.props.numRow, column, !data.isSelected)
   }
 
   private onMouseEnterHunk = () => {
@@ -612,10 +971,23 @@ export class SideBySideDiffRow extends React.Component<
     }
   }
 
-  private onExpandHunk = (hunkIndex: number, kind: DiffExpansionKind) => () => {
-    this.props.onExpandHunk(hunkIndex, kind)
+  private onHunkFocus = () => {
+    if ('hunkStartLine' in this.props.row) {
+      this.props.onMouseEnterHunk(this.props.row.hunkStartLine)
+    }
+  }
+
+  private onHunkBlur = () => {
+    if ('hunkStartLine' in this.props.row) {
+      this.props.onMouseLeaveHunk(this.props.row.hunkStartLine)
+    }
   }
 
+  private onExpandHunk =
+    (hunkIndex: number, kind: DiffHunkExpansionType) => () => {
+      this.props.onExpandHunk(hunkIndex, kind)
+    }
+
   private onClickHunk = () => {
     if (this.props.hideWhitespaceInDiff) {
       const { row } = this.props
diff --git a/app/src/ui/diff/side-by-side-diff.tsx b/app/src/ui/diff/side-by-side-diff.tsx
index 459cb667845..0ac6b50f3ca 100644
--- a/app/src/ui/diff/side-by-side-diff.tsx
+++ b/app/src/ui/diff/side-by-side-diff.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { Repository } from '../../models/repository'
+
 import {
   ITextDiff,
   DiffLineType,
@@ -7,6 +7,7 @@ import {
   DiffLine,
   DiffSelection,
   DiffHunkExpansionType,
+  DiffSelectionType,
 } from '../../models/diff'
 import {
   getLineFilters,
@@ -26,8 +27,15 @@ import {
   CellMeasurerCache,
   CellMeasurer,
   ListRowProps,
+  OverscanIndicesGetterParams,
+  defaultOverscanIndicesGetter,
 } from 'react-virtualized'
-import { SideBySideDiffRow } from './side-by-side-diff-row'
+import {
+  CheckBoxIdentifier,
+  IRowSelectableGroup,
+  IRowSelectableGroupStaticData,
+  SideBySideDiffRow,
+} from './side-by-side-diff-row'
 import memoize from 'memoize-one'
 import {
   findInteractiveOriginalDiffRange,
@@ -47,9 +55,11 @@ import {
   getNumberOfDigits,
   MaxIntraLineDiffStringLength,
   getFirstAndLastClassesSideBySide,
+  textDiffEquals,
+  isRowChanged,
 } from './diff-helpers'
 import { showContextualMenu } from '../../lib/menu-item'
-import { getTokens } from './diff-syntax-mode'
+import { getTokens } from './get-tokens'
 import { DiffSearchInput } from './diff-search-input'
 import {
   expandTextDiffHunk,
@@ -57,27 +67,44 @@ import {
   expandWholeTextDiff,
 } from './text-diff-expansion'
 import { IMenuItem } from '../../lib/menu-item'
-import { HiddenBidiCharsWarning } from './hidden-bidi-chars-warning'
-import { escapeRegExp } from 'lodash'
+import { DiffContentsWarning } from './diff-contents-warning'
+import { findDOMNode } from 'react-dom'
+import escapeRegExp from 'lodash/escapeRegExp'
+import ReactDOM from 'react-dom'
+import { AriaLiveContainer } from '../accessibility/aria-live-container'
 
 const DefaultRowHeight = 20
 
-export interface ISelectionPoint {
-  readonly column: DiffColumn
-  readonly row: number
-}
-
 export interface ISelection {
-  readonly from: ISelectionPoint
-  readonly to: ISelectionPoint
+  /// Initial diff line number in the selection
+  readonly from: number
+
+  /// Last diff line number in the selection
+  readonly to: number
+
   readonly isSelected: boolean
 }
 
+type SearchDirection = 'next' | 'previous'
+
 type ModifiedLine = { line: DiffLine; diffLineNumber: number }
 
-interface ISideBySideDiffProps {
-  readonly repository: Repository
+const isElement = (n: Node): n is Element => n.nodeType === Node.ELEMENT_NODE
+const closestElement = (n: Node): Element | null =>
+  isElement(n) ? n : n.parentElement
+
+const closestRow = (n: Node, container: Element) => {
+  const row = closestElement(n)?.closest('div[role=row]')
+  if (row && container.contains(row)) {
+    const rowIndex =
+      row.ariaRowIndex !== null ? parseInt(row.ariaRowIndex, 10) : NaN
+    return isNaN(rowIndex) ? undefined : rowIndex
+  }
 
+  return undefined
+}
+
+interface ISideBySideDiffProps {
   /** The file whose diff should be displayed. */
   readonly file: ChangedFile
 
@@ -118,6 +145,9 @@ interface ISideBySideDiffProps {
    */
   readonly showSideBySideDiff: boolean
 
+  /** Whether or not to show the diff check marks indicating inclusion in a commit */
+  readonly showDiffCheckMarks: boolean
+
   /** Called when the user changes the hide whitespace in diffs setting. */
   readonly onHideWhitespaceInDiffChanged: (checked: boolean) => void
 }
@@ -142,7 +172,7 @@ interface ISideBySideDiffState {
    * column is doing it. This allows us to limit text selection to that
    * specific column via CSS.
    */
-  readonly selectingTextInRow?: 'before' | 'after'
+  readonly selectingTextInRow: 'before' | 'after'
 
   /**
    * The current diff selection. This is used while
@@ -182,6 +212,14 @@ interface ISideBySideDiffState {
   readonly searchResults?: SearchResults
 
   readonly selectedSearchResult: number | undefined
+
+  readonly ariaLiveMessage: string
+
+  /** This tracks the last expanded hunk index so that we can refocus the expander after rerender */
+  readonly lastExpandedHunk: {
+    hunkIndex: number
+    expansionType: DiffHunkExpansionType
+  } | null
 }
 
 const listRowsHeightCache = new CellMeasurerCache({
@@ -194,10 +232,34 @@ export class SideBySideDiff extends React.Component<
   ISideBySideDiffState
 > {
   private virtualListRef = React.createRef<List>()
+  private diffContainer: HTMLDivElement | null = null
 
   /** Diff to restore when "Collapse all expanded lines" option is used */
   private diffToRestore: ITextDiff | null = null
 
+  private textSelectionStartRow: number | undefined = undefined
+  private textSelectionEndRow: number | undefined = undefined
+
+  private renderedStartIndex: number = 0
+  private renderedStopIndex: number | undefined = undefined
+
+  private readonly hunkExpansionRefs = new Map<string, HTMLButtonElement>()
+
+  /**
+   * This is just a signal that will toggle whenever the aria live message
+   * changes, indicating it should be reannounced by screen readers.
+   */
+  private ariaLiveChangeSignal: boolean = false
+
+  /**
+   * Caches a group of selectable row's information that does not change on row
+   * rerender like line numbers using the row's hunkStartLline as the key.
+   */
+  private readonly rowSelectableGroupStaticDataCache = new Map<
+    number,
+    IRowSelectableGroupStaticData
+  >()
+
   public constructor(props: ISideBySideDiffProps) {
     super(props)
 
@@ -205,6 +267,9 @@ export class SideBySideDiff extends React.Component<
       diff: props.diff,
       isSearching: false,
       selectedSearchResult: undefined,
+      selectingTextInRow: 'before',
+      lastExpandedHunk: null,
+      ariaLiveMessage: '',
     }
   }
 
@@ -216,12 +281,147 @@ export class SideBySideDiff extends React.Component<
     // Listen for the custom event find-text (see app.tsx)
     // and trigger the search plugin if we see it.
     document.addEventListener('find-text', this.showSearch)
+
+    document.addEventListener('cut', this.onCutOrCopy)
+    document.addEventListener('copy', this.onCutOrCopy)
+
+    document.addEventListener('selectionchange', this.onDocumentSelectionChange)
+
+    this.addContextMenuListenerToDiff()
+  }
+
+  private addContextMenuListenerToDiff = () => {
+    const diffNode = findDOMNode(this.virtualListRef.current)
+    const diff = diffNode instanceof HTMLElement ? diffNode : null
+    diff?.addEventListener('contextmenu', this.onContextMenuText)
+  }
+
+  private removeContextMenuListenerFromDiff = () => {
+    const diffNode = findDOMNode(this.virtualListRef.current)
+    const diff = diffNode instanceof HTMLElement ? diffNode : null
+    diff?.removeEventListener('contextmenu', this.onContextMenuText)
+  }
+
+  private onCutOrCopy = (ev: ClipboardEvent) => {
+    if (ev.defaultPrevented || !this.isEntireDiffSelected()) {
+      return
+    }
+
+    const exclude = this.props.showSideBySideDiff
+      ? this.state.selectingTextInRow === 'before'
+        ? DiffLineType.Add
+        : DiffLineType.Delete
+      : false
+
+    const contents = this.state.diff.hunks
+      .flatMap(h => h.lines.filter(l => l.type !== exclude).map(l => l.content))
+      .join('\n')
+
+    ev.preventDefault()
+    ev.clipboardData?.setData('text/plain', contents)
+  }
+
+  private onDocumentSelectionChange = (ev: Event) => {
+    if (!this.diffContainer) {
+      return
+    }
+
+    const selection = document.getSelection()
+
+    this.textSelectionStartRow = undefined
+    this.textSelectionEndRow = undefined
+
+    if (!selection || selection.isCollapsed) {
+      return
+    }
+
+    // Check to see if there's at least a partial selection within the
+    // diff container. If there isn't then we want to get out of here as
+    // quickly as possible.
+    if (!selection.containsNode(this.diffContainer, true)) {
+      return
+    }
+
+    if (this.isEntireDiffSelected(selection)) {
+      return
+    }
+
+    // Get the range to coerce uniform direction (i.e we don't want to have to
+    // care about whether the user is selecting right to left or left to right)
+    const range = selection.getRangeAt(0)
+    const { startContainer, endContainer } = range
+
+    // The (relative) happy path is when the user is currently selecting within
+    // the diff. That means that the start container will very likely be a text
+    // node somewhere within a row.
+    let startRow = closestRow(startContainer, this.diffContainer)
+
+    // If we couldn't find the row by walking upwards it's likely that the user
+    // has moved their selection to the container itself or beyond (i.e dragged
+    // their selection all the way up to the point where they're now selecting
+    // inside the commit details).
+    //
+    // If so we attempt to check if the first row we're currently rendering is
+    // encompassed in the selection
+    if (startRow === undefined) {
+      const firstRow = this.diffContainer.querySelector(
+        'div[role=row]:first-child'
+      )
+
+      if (firstRow && range.intersectsNode(firstRow)) {
+        startRow = closestRow(firstRow, this.diffContainer)
+      }
+    }
+
+    // If we don't have  starting row there's no point in us trying to find
+    // the end row.
+    if (startRow === undefined) {
+      return
+    }
+
+    let endRow = closestRow(endContainer, this.diffContainer)
+
+    if (endRow === undefined) {
+      const lastRow = this.diffContainer.querySelector(
+        'div[role=row]:last-child'
+      )
+
+      if (lastRow && range.intersectsNode(lastRow)) {
+        endRow = closestRow(lastRow, this.diffContainer)
+      }
+    }
+
+    this.textSelectionStartRow = startRow
+    this.textSelectionEndRow = endRow
+  }
+
+  private isEntireDiffSelected(selection = document.getSelection()) {
+    const { diffContainer } = this
+
+    if (selection?.rangeCount === 0) {
+      return false
+    }
+
+    const ancestor = selection?.getRangeAt(0).commonAncestorContainer
+
+    // This is an artefact of the selectAllChildren call in the onSelectAll
+    // handler. We can get away with checking for this since we're handling
+    // the select-all event coupled with the fact that we have CSS rules which
+    // prevents text selection within the diff unless focus resides within the
+    // diff container.
+    return ancestor === diffContainer
   }
 
   public componentWillUnmount() {
     window.removeEventListener('keydown', this.onWindowKeyDown)
     document.removeEventListener('mouseup', this.onEndSelection)
     document.removeEventListener('find-text', this.showSearch)
+    document.removeEventListener(
+      'selectionchange',
+      this.onDocumentSelectionChange
+    )
+    document.removeEventListener('mousemove', this.onUpdateSelection)
+    this.removeContextMenuListenerFromDiff()
   }
 
   public componentDidUpdate(
@@ -235,11 +435,10 @@ export class SideBySideDiff extends React.Component<
       this.clearListRowsHeightCache()
     }
 
-    if (this.props.diff.text !== prevProps.diff.text) {
+    if (!textDiffEquals(this.props.diff, prevProps.diff)) {
       this.diffToRestore = null
-      this.setState({
-        diff: this.props.diff,
-      })
+      this.setState({ diff: this.props.diff, lastExpandedHunk: null })
+      this.rowSelectableGroupStaticDataCache.clear()
     }
 
     // Scroll to top if we switched to a new file
@@ -248,7 +447,110 @@ export class SideBySideDiff extends React.Component<
       this.props.file.id !== prevProps.file.id
     ) {
       this.virtualListRef.current.scrollToPosition(0)
+
+      // Reset selection
+      this.textSelectionStartRow = undefined
+      this.textSelectionEndRow = undefined
+
+      if (this.diffContainer) {
+        const selection = document.getSelection()
+        if (selection?.containsNode(this.diffContainer, true)) {
+          selection.empty()
+        }
+      }
+
+      this.rowSelectableGroupStaticDataCache.clear()
+    }
+
+    if (prevProps.showSideBySideDiff !== this.props.showSideBySideDiff) {
+      this.rowSelectableGroupStaticDataCache.clear()
+    }
+
+    if (this.state.lastExpandedHunk !== prevState.lastExpandedHunk) {
+      this.focusAfterLastExpandedHunkChange()
+    }
+  }
+
+  private focusListElement = () => {
+    const diffNode = findDOMNode(this.virtualListRef.current)
+    const diff = diffNode instanceof HTMLElement ? diffNode : null
+    diff?.focus()
+  }
+
+  /**
+   * This handles app focus after a user has clicked on an diff expansion
+   * button. With the exception of the top expand up button, the expansion
+   * buttons disappear after clicking and by default the focus moves to the app
+   * body. This is not ideal for accessibilty as a keyboard user must then tab
+   * all the way back to the diff to continut to interact with it.
+   *
+   * If an expansion button of the type clicked is available, we focus it.
+   * Otherwise, we try to find the next closest expansion button and focus that.
+   * If no expansion buttons available, we focus the diff container. This makes
+   * it so if a user expands down and can expand down further, they will
+   * automatically be focused on the next expand down.
+   *
+   * Other context:
+   * - When a user clicks on a diff expansion button, the
+   * lastExpandedHunk state is updated. In the componentDidUpdate, we detect
+   * that change in order to call this after the new expansion buttons have
+   * rendered. The rendered expansion buttons are stored in a map.
+   * - A hunk index may have multiple expansion buttons (up and down) so it does
+   *   not uniquely identify a button.
+   */
+  private focusAfterLastExpandedHunkChange() {
+    if (this.state.lastExpandedHunk === null) {
+      return
+    }
+
+    // No expansion buttons? Focus the diff
+    if (this.hunkExpansionRefs.size === 0) {
+      this.focusListElement()
+      return
+    }
+
+    const expansionHunkKeys = Array.from(this.hunkExpansionRefs.keys()).sort()
+    const { hunkIndex, expansionType } = this.state.lastExpandedHunk
+    const lastExpandedKey = `${hunkIndex}-${expansionType}`
+
+    // If there is a new hunk expansion button of same type in same place as the
+    // last, focus it
+    const lastExpandedHunkButton = this.hunkExpansionRefs.get(lastExpandedKey)
+    if (lastExpandedHunkButton) {
+      lastExpandedHunkButton.focus()
+      return
+    }
+
+    function getHunkKeyIndex(key: string) {
+      return parseInt(key.split('-').at(0) || '', 10)
+    }
+
+    // No?, Then try to focus the next closest hunk in tab order
+    const closestInTabOrder = expansionHunkKeys.find(
+      key => getHunkKeyIndex(key) >= hunkIndex
+    )
+
+    if (closestInTabOrder) {
+      const closetHunkButton = this.hunkExpansionRefs.get(closestInTabOrder)
+      closetHunkButton?.focus()
+      return
+    }
+
+    // No? Then try to focus the next closest hunk in reverse tab order
+    const closestInReverseTabOrder = expansionHunkKeys
+      .reverse()
+      .find(key => getHunkKeyIndex(key) <= hunkIndex)
+
+    if (closestInReverseTabOrder) {
+      const closetHunkButton = this.hunkExpansionRefs.get(
+        closestInReverseTabOrder
+      )
+      closetHunkButton?.focus()
+      return
     }
+
+    // We should never get here, but just in case focus something!
+    this.focusListElement()
   }
 
   private canExpandDiff() {
@@ -260,14 +562,37 @@ export class SideBySideDiff extends React.Component<
     )
   }
 
-  public render() {
+  private onDiffContainerRef = (ref: HTMLDivElement | null) => {
+    if (ref === null) {
+      this.diffContainer?.removeEventListener('select-all', this.onSelectAll)
+    } else {
+      ref.addEventListener('select-all', this.onSelectAll)
+    }
+    this.diffContainer = ref
+  }
+
+  private getCurrentDiffRows() {
     const { diff } = this.state
 
-    const rows = getDiffRows(
+    return getDiffRows(
       diff,
       this.props.showSideBySideDiff,
       this.canExpandDiff()
     )
+  }
+
+  private onRowsRendered = (info: {
+    startIndex: number
+    stopIndex: number
+  }) => {
+    this.renderedStartIndex = info.startIndex
+    this.renderedStopIndex = info.stopIndex
+  }
+
+  public render() {
+    const { diff, ariaLiveMessage, isSearching } = this.state
+
+    const rows = this.getCurrentDiffRows()
     const containerClassName = classNames('side-by-side-diff-container', {
       'unified-diff': !this.props.showSideBySideDiff,
       [`selecting-${this.state.selectingTextInRow}`]:
@@ -277,15 +602,27 @@ export class SideBySideDiff extends React.Component<
     })
 
     return (
-      <div className={containerClassName} onMouseDown={this.onMouseDown}>
-        {diff.hasHiddenBidiChars && <HiddenBidiCharsWarning />}
-        {this.state.isSearching && (
+      // eslint-disable-next-line jsx-a11y/no-static-element-interactions
+      <div
+        className={containerClassName}
+        onMouseDown={this.onMouseDown}
+        onKeyDown={this.onKeyDown}
+      >
+        <DiffContentsWarning diff={diff} />
+        {isSearching && (
           <DiffSearchInput
             onSearch={this.onSearch}
             onClose={this.onSearchCancel}
           />
         )}
-        <div className="side-by-side-diff cm-s-default">
+        <div
+          className="side-by-side-diff cm-s-default"
+          ref={this.onDiffContainerRef}
+        >
+          <AriaLiveContainer
+            message={ariaLiveMessage}
+            trackedUserInput={this.ariaLiveChangeSignal}
+          />
           <AutoSizer onResize={this.clearListRowsHeightCache}>
             {({ height, width }) => (
               <List
@@ -295,11 +632,13 @@ export class SideBySideDiff extends React.Component<
                 rowCount={rows.length}
                 rowHeight={this.getRowHeight}
                 rowRenderer={this.renderRow}
+                onRowsRendered={this.onRowsRendered}
                 ref={this.virtualListRef}
+                overscanIndicesGetter={this.overscanIndicesGetter}
                 // The following properties are passed to the list
                 // to make sure that it gets re-rendered when any of
                 // them change.
-                isSearching={this.state.isSearching}
+                isSearching={isSearching}
                 selectedSearchResult={this.state.selectedSearchResult}
                 searchQuery={this.state.searchQuery}
                 showSideBySideDiff={this.props.showSideBySideDiff}
@@ -307,8 +646,12 @@ export class SideBySideDiff extends React.Component<
                 afterTokens={this.state.afterTokens}
                 temporarySelection={this.state.temporarySelection}
                 hoveredHunk={this.state.hoveredHunk}
+                showDiffCheckMarks={this.props.showDiffCheckMarks}
                 isSelectable={canSelect(this.props.file)}
                 fileSelection={this.getSelection()}
+                // rows are memoized and include things like the
+                // noNewlineIndicator
+                rows={rows}
               />
             )}
           </AutoSizer>
@@ -317,6 +660,197 @@ export class SideBySideDiff extends React.Component<
     )
   }
 
+  private overscanIndicesGetter = (params: OverscanIndicesGetterParams) => {
+    const [start, end] = [this.textSelectionStartRow, this.textSelectionEndRow]
+
+    if (start === undefined || end === undefined) {
+      return defaultOverscanIndicesGetter(params)
+    }
+
+    const startIndex = Math.min(start, params.startIndex)
+    const stopIndex = Math.max(
+      params.stopIndex,
+      Math.min(params.cellCount - 1, end)
+    )
+
+    return defaultOverscanIndicesGetter({ ...params, startIndex, stopIndex })
+  }
+
+  /**
+   * Gathers information about if the row is in a selectable group. This
+   * information is used to facilitate the use of check all feature for the
+   * selectable group.
+   *
+   * This will return null if the row is not in a selectable group. A group is
+   * more than one row.
+   */
+  private getRowSelectableGroupDetails(
+    rowIndex: number
+  ): IRowSelectableGroup | null {
+    const { diff, hoveredHunk } = this.state
+
+    const rows = getDiffRows(
+      diff,
+      this.props.showSideBySideDiff,
+      this.canExpandDiff()
+    )
+    const row = rows[rowIndex]
+
+    if (row === undefined || !isRowChanged(row)) {
+      return null
+    }
+
+    const { hunkStartLine } = row
+    const staticData = this.getRowSelectableGroupStaticData(hunkStartLine, rows)
+    const { diffRowStartIndex, diffRowStopIndex } = staticData
+
+    const isFirst = diffRowStartIndex === rowIndex
+    const isCheckAllRenderedInRow =
+      isFirst ||
+      (diffRowStartIndex < this.renderedStartIndex &&
+        rowIndex === this.renderedStartIndex)
+
+    return {
+      isFirst,
+      isCheckAllRenderedInRow,
+      isHovered: hoveredHunk === hunkStartLine,
+      selectionState: this.getSelectableGroupSelectionState(
+        diff.hunks,
+        hunkStartLine
+      ),
+      height: this.getRowSelectableGroupHeight(
+        diffRowStartIndex,
+        diffRowStopIndex
+      ),
+      staticData,
+    }
+  }
+
+  private getSelectableGroupSelectionState(
+    hunks: ReadonlyArray<DiffHunk>,
+    hunkStartLine: number
+  ): DiffSelectionType {
+    const selection = this.getSelection()
+    if (selection === undefined) {
+      return DiffSelectionType.None
+    }
+
+    const range = findInteractiveOriginalDiffRange(hunks, hunkStartLine)
+    if (range === null) {
+      //Shouldn't happen, but if it does, we can't do anything with it
+      return DiffSelectionType.None
+    }
+
+    const { from, to } = range
+
+    return selection.isRangeSelected(from, to - from + 1)
+  }
+
+  private getRowSelectableGroupHeight = (from: number, to: number) => {
+    const start =
+      from > this.renderedStartIndex ? from : this.renderedStartIndex
+
+    const stop =
+      this.renderedStopIndex !== undefined && to > this.renderedStopIndex + 10
+        ? this.renderedStopIndex + 10
+        : to
+
+    let height = 0
+    for (let i = start; i <= stop; i++) {
+      height += this.getRowHeight({ index: i })
+    }
+
+    return height
+  }
+
+  private getSelectableGroupRowIndexRange(
+    hunkStartLine: number,
+    rows: ReadonlyArray<SimplifiedDiffRow>
+  ) {
+    const diffRowStartIndex = rows.findIndex(
+      r => isRowChanged(r) && r.hunkStartLine === hunkStartLine
+    )
+
+    let diffRowStopIndex = diffRowStartIndex
+
+    while (
+      rows[diffRowStopIndex + 1] !== undefined &&
+      isRowChanged(rows[diffRowStopIndex + 1])
+    ) {
+      diffRowStopIndex++
+    }
+
+    return {
+      diffRowStartIndex,
+      diffRowStopIndex,
+    }
+  }
+
+  private getRowSelectableGroupStaticData = (
+    hunkStartLine: number,
+    rows: ReadonlyArray<SimplifiedDiffRow>
+  ): IRowSelectableGroupStaticData => {
+    const cachedStaticData =
+      this.rowSelectableGroupStaticDataCache.get(hunkStartLine)
+    if (cachedStaticData !== undefined) {
+      return cachedStaticData
+    }
+
+    const { diffRowStartIndex, diffRowStopIndex } =
+      this.getSelectableGroupRowIndexRange(hunkStartLine, rows)
+
+    const lineNumbers = new Set<number>()
+    let hasAfter = false
+    let hasBefore = false
+
+    const groupRows = rows.slice(diffRowStartIndex, diffRowStopIndex + 1)
+
+    const lineNumbersIdentifiers: Array<CheckBoxIdentifier> = []
+
+    for (const r of groupRows) {
+      if (r.type === DiffRowType.Added) {
+        lineNumbers.add(r.data.lineNumber)
+        hasAfter = true
+        lineNumbersIdentifiers.push(`${r.data.lineNumber}-after`)
+      }
+
+      if (r.type === DiffRowType.Deleted) {
+        lineNumbers.add(r.data.lineNumber)
+        hasBefore = true
+        lineNumbersIdentifiers.push(`${r.data.lineNumber}-before`)
+      }
+
+      if (r.type === DiffRowType.Modified) {
+        hasAfter = true
+        hasBefore = true
+        lineNumbers.add(r.beforeData.lineNumber)
+        lineNumbers.add(r.afterData.lineNumber)
+        lineNumbersIdentifiers.push(
+          `${r.beforeData.lineNumber}-before`,
+          `${r.afterData.lineNumber}-after`
+        )
+      }
+    }
+
+    const diffType =
+      hasAfter && hasBefore
+        ? DiffRowType.Modified
+        : hasAfter
+        ? DiffRowType.Added
+        : DiffRowType.Deleted
+
+    const data: IRowSelectableGroupStaticData = {
+      diffRowStartIndex,
+      diffRowStopIndex,
+      diffType,
+      lineNumbers: Array.from(lineNumbers).sort(),
+      lineNumbersIdentifiers,
+    }
+
+    this.rowSelectableGroupStaticDataCache.set(hunkStartLine, data)
+    return data
+  }
+
   private renderRow = ({ index, parent, style, key }: ListRowProps) => {
     const { diff } = this.state
     const rows = getDiffRows(
@@ -352,8 +886,7 @@ export class SideBySideDiff extends React.Component<
 
     const rowWithTokens = this.createFullRow(row, index)
 
-    const isHunkHovered =
-      'hunkStartLine' in row && this.state.hoveredHunk === row.hunkStartLine
+    const rowSelectableGroupDetails = this.getRowSelectableGroupDetails(index)
 
     return (
       <CellMeasurer
@@ -363,17 +896,17 @@ export class SideBySideDiff extends React.Component<
         parent={parent}
         rowIndex={index}
       >
-        <div key={key} style={style}>
+        <div key={key} style={style} role="row" aria-rowindex={index}>
           <SideBySideDiffRow
             row={rowWithTokens}
             lineNumberWidth={lineNumberWidth}
             numRow={index}
             isDiffSelectable={canSelect(this.props.file)}
-            isHunkHovered={isHunkHovered}
+            rowSelectableGroup={rowSelectableGroupDetails}
             showSideBySideDiff={this.props.showSideBySideDiff}
             hideWhitespaceInDiff={this.props.hideWhitespaceInDiff}
+            showDiffCheckMarks={this.props.showDiffCheckMarks}
             onStartSelection={this.onStartSelection}
-            onUpdateSelection={this.onUpdateSelection}
             onMouseEnterHunk={this.onMouseEnterHunk}
             onMouseLeaveHunk={this.onMouseLeaveHunk}
             onExpandHunk={this.onExpandHunk}
@@ -381,18 +914,60 @@ export class SideBySideDiff extends React.Component<
             onContextMenuLine={this.onContextMenuLine}
             onContextMenuHunk={this.onContextMenuHunk}
             onContextMenuExpandHunk={this.onContextMenuExpandHunk}
-            onContextMenuText={this.onContextMenuText}
             onHideWhitespaceInDiffChanged={
               this.props.onHideWhitespaceInDiffChanged
             }
             beforeClassNames={beforeClassNames}
             afterClassNames={afterClassNames}
+            onHunkExpansionRef={this.onHunkExpansionRef}
+            onLineNumberCheckedChanged={this.onLineNumberCheckedChanged}
           />
         </div>
       </CellMeasurer>
     )
   }
 
+  private onLineNumberCheckedChanged = (
+    row: number,
+    column: DiffColumn,
+    isSelected: boolean
+  ) => {
+    if (this.props.onIncludeChanged === undefined) {
+      return
+    }
+
+    let selection = this.getSelection()
+    if (selection === undefined) {
+      return
+    }
+
+    const lineBefore = this.getDiffLineNumber(row, column)
+    const lineAfter = this.getDiffLineNumber(row, column)
+
+    if (lineBefore !== null) {
+      selection = selection.withLineSelection(lineBefore, isSelected)
+    }
+
+    if (lineAfter !== null) {
+      selection = selection.withLineSelection(lineAfter, isSelected)
+    }
+
+    this.props.onIncludeChanged(selection)
+  }
+
+  private onHunkExpansionRef = (
+    hunkIndex: number,
+    expansionType: DiffHunkExpansionType,
+    button: HTMLButtonElement | null
+  ) => {
+    const key = `${hunkIndex}-${expansionType}`
+    if (button === null) {
+      this.hunkExpansionRefs.delete(key)
+    } else {
+      this.hunkExpansionRefs.set(key, button)
+    }
+  }
+
   private getRowHeight = (row: { index: number }) => {
     return listRowsHeightCache.rowHeight(row) ?? DefaultRowHeight
   }
@@ -449,7 +1024,7 @@ export class SideBySideDiff extends React.Component<
         data: this.getRowDataPopulated(
           row.data,
           numRow,
-          this.props.showSideBySideDiff ? DiffColumn.After : DiffColumn.Before,
+          DiffColumn.After,
           this.state.afterTokens
         ),
       }
@@ -538,8 +1113,6 @@ export class SideBySideDiff extends React.Component<
         data.diffLineNumber !== null &&
         isInSelection(
           data.diffLineNumber,
-          row,
-          column,
           this.getSelection(),
           this.state.temporarySelection
         ),
@@ -592,6 +1165,10 @@ export class SideBySideDiff extends React.Component<
       return null
     }
 
+    return this.getDiffRowLineNumber(row, column)
+  }
+
+  private getDiffRowLineNumber(row: SimplifiedDiffRow, column: DiffColumn) {
     if (row.type === DiffRowType.Added || row.type === DiffRowType.Deleted) {
       return row.data.diffLineNumber
     }
@@ -635,26 +1212,114 @@ export class SideBySideDiff extends React.Component<
     }
   }
 
+  private onKeyDown = (event: React.KeyboardEvent<HTMLDivElement>) => {
+    const modifiers = event.altKey || event.metaKey || event.shiftKey
+
+    if (!__DARWIN__ && event.key === 'a' && event.ctrlKey && !modifiers) {
+      this.onSelectAll(event)
+    }
+  }
+
+  /**
+   * Called when the user presses CtrlOrCmd+A while focused within the diff
+   * container or when the user triggers the select-all event. Note that this
+   * deals with text-selection whereas several other methods in this component
+   * named similarly deals with selection within the gutter.
+   */
+  private onSelectAll = (ev?: Event | React.SyntheticEvent<unknown>) => {
+    if (this.diffContainer) {
+      ev?.preventDefault()
+      document.getSelection()?.selectAllChildren(this.diffContainer)
+    }
+  }
+
   private onStartSelection = (
     row: number,
     column: DiffColumn,
     isSelected: boolean
   ) => {
-    const point: ISelectionPoint = { row, column }
-    const temporarySelection = { from: point, to: point, isSelected }
+    const line = this.getDiffLineNumber(row, column)
+    if (line === null) {
+      return
+    }
+    const temporarySelection = { from: line, to: line, isSelected }
     this.setState({ temporarySelection })
 
     document.addEventListener('mouseup', this.onEndSelection, { once: true })
+    document.addEventListener('mousemove', this.onUpdateSelection)
   }
 
-  private onUpdateSelection = (row: number, column: DiffColumn) => {
+  private onUpdateSelection = (ev: MouseEvent) => {
     const { temporarySelection } = this.state
-    if (temporarySelection === undefined) {
+    const list = this.virtualListRef.current
+    if (!temporarySelection || !list) {
       return
     }
 
-    const to = { row, column }
-    this.setState({ temporarySelection: { ...temporarySelection, to } })
+    const listNode = ReactDOM.findDOMNode(list)
+    if (!(listNode instanceof Element)) {
+      return
+    }
+
+    const rect = listNode.getBoundingClientRect()
+    const offsetInList = ev.clientY - rect.top
+    const offsetInListScroll = offsetInList + listNode.scrollTop
+
+    const rows = this.getCurrentDiffRows()
+    const totalRows = rows.length
+
+    let rowOffset = 0
+
+    // I haven't found an easy way to calculate which row the mouse is over,
+    // especially since react-virtualized's `getOffsetForRow` is buggy (see
+    // https://github.com/bvaughn/react-virtualized/issues/1422).
+    // Instead, the approach here is to iterate over all rows and sum their
+    // heights to calculate the offset of each row. Once we find the row that
+    // contains the mouse, we scroll to it and update the temporary selection.
+    for (let index = 0; index < totalRows; index++) {
+      // Use row height cache in order to do the math faster
+      let height = listRowsHeightCache.getHeight(index, 0)
+      if (height === undefined) {
+        list.recomputeRowHeights(index)
+        height = listRowsHeightCache.getHeight(index, 0) ?? DefaultRowHeight
+      }
+
+      if (
+        offsetInListScroll >= rowOffset &&
+        offsetInListScroll < rowOffset + height
+      ) {
+        const row = rows[index]
+        let column = DiffColumn.Before
+
+        if (this.props.showSideBySideDiff) {
+          column =
+            ev.clientX <= rect.left + rect.width / 2
+              ? DiffColumn.Before
+              : DiffColumn.After
+        } else {
+          // `column` is irrelevant in unified diff because there aren't rows of
+          // type Modified (see `getModifiedRows`)
+        }
+        const diffLineNumber = this.getDiffRowLineNumber(row, column)
+
+        // Always scroll to the row that contains the mouse, to ease range-based
+        // selection with it
+        list.scrollToRow(index)
+
+        if (diffLineNumber !== null) {
+          this.setState({
+            temporarySelection: {
+              ...temporarySelection,
+              to: diffLineNumber,
+            },
+          })
+        }
+
+        return
+      }
+
+      rowOffset += height
+    }
   }
 
   private onEndSelection = () => {
@@ -667,20 +1332,11 @@ export class SideBySideDiff extends React.Component<
 
     const { from: tmpFrom, to: tmpTo, isSelected } = temporarySelection
 
-    const fromRow = Math.min(tmpFrom.row, tmpTo.row)
-    const toRow = Math.max(tmpFrom.row, tmpTo.row)
-
-    for (let row = fromRow; row <= toRow; row++) {
-      const lineBefore = this.getDiffLineNumber(row, tmpFrom.column)
-      const lineAfter = this.getDiffLineNumber(row, tmpTo.column)
-
-      if (lineBefore !== null) {
-        selection = selection.withLineSelection(lineBefore, isSelected)
-      }
+    const fromLine = Math.min(tmpFrom, tmpTo)
+    const toLine = Math.max(tmpFrom, tmpTo)
 
-      if (lineAfter !== null) {
-        selection = selection.withLineSelection(lineAfter, isSelected)
-      }
+    for (let line = fromLine; line <= toLine; line++) {
+      selection = selection.withLineSelection(line, isSelected)
     }
 
     this.props.onIncludeChanged?.(selection)
@@ -697,14 +1353,24 @@ export class SideBySideDiff extends React.Component<
     this.setState({ hoveredHunk: undefined })
   }
 
-  private onExpandHunk = (hunkIndex: number, kind: DiffExpansionKind) => {
+  private onExpandHunk = (
+    hunkIndex: number,
+    expansionType: DiffHunkExpansionType
+  ) => {
     const { diff } = this.state
 
     if (hunkIndex === -1 || hunkIndex >= diff.hunks.length) {
       return
     }
 
+    this.setState({ lastExpandedHunk: { hunkIndex, expansionType } })
+
+    const kind = expansionType === DiffHunkExpansionType.Down ? 'down' : 'up'
+
     this.expandHunk(diff.hunks[hunkIndex], kind)
+
+    this.ariaLiveChangeSignal = !this.ariaLiveChangeSignal
+    this.setState({ ariaLiveMessage: 'Expanded' })
   }
 
   private onClickHunk = (hunkStartLine: number, select: boolean) => {
@@ -728,9 +1394,19 @@ export class SideBySideDiff extends React.Component<
   /**
    * Handler to show a context menu when the user right-clicks on the diff text.
    */
-  private onContextMenuText = () => {
+  private onContextMenuText = (evt: React.MouseEvent | MouseEvent) => {
     const selectionLength = window.getSelection()?.toString().length ?? 0
 
+    if (
+      evt.target instanceof HTMLElement &&
+      (evt.target.closest('.line-number') !== null ||
+        evt.target.closest('.hunk-handle') !== null || // Windows uses the label element
+        evt.target.closest('.hunk-expansion-handle') !== null ||
+        evt.target instanceof HTMLInputElement) // macOS users the input element which is adjacent to the .hunk-handle
+    ) {
+      return
+    }
+
     const items: IMenuItem[] = [
       {
         label: 'Copy',
@@ -738,6 +1414,10 @@ export class SideBySideDiff extends React.Component<
         role: selectionLength > 0 ? 'copy' : undefined,
         enabled: selectionLength > 0,
       },
+      {
+        label: __DARWIN__ ? 'Select All' : 'Select all',
+        action: () => this.onSelectAll(),
+      },
     ]
 
     const expandMenuItem = this.buildExpandMenuItem()
@@ -821,7 +1501,11 @@ export class SideBySideDiff extends React.Component<
 
     this.diffToRestore = diff
 
-    this.setState({ diff: updatedDiff })
+    this.ariaLiveChangeSignal = !this.ariaLiveChangeSignal
+    this.setState({
+      diff: updatedDiff,
+      ariaLiveMessage: 'Expanded',
+    })
   }
 
   private onCollapseExpandedLines = () => {
@@ -933,56 +1617,93 @@ export class SideBySideDiff extends React.Component<
     }
   }
 
-  private onSearch = (searchQuery: string, direction: 'next' | 'previous') => {
-    let { selectedSearchResult, searchResults: searchResults } = this.state
-    const { showSideBySideDiff } = this.props
-    const { diff } = this.state
+  private onSearch = (searchQuery: string, direction: SearchDirection) => {
+    const { searchResults } = this.state
 
-    // If the query is unchanged and we've got tokens we'll continue, else we'll restart
-    if (searchQuery === this.state.searchQuery && searchResults !== undefined) {
-      if (selectedSearchResult === undefined) {
-        selectedSearchResult = 0
-      } else {
-        const delta = direction === 'next' ? 1 : -1
-
-        // http://javascript.about.com/od/problemsolving/a/modulobug.htm
-        selectedSearchResult =
-          (selectedSearchResult + delta + searchResults.length) %
-          searchResults.length
-      }
+    if (searchQuery?.trim() === '') {
+      this.resetSearch(true, 'No results')
+    } else if (searchQuery === this.state.searchQuery && searchResults) {
+      this.continueSearch(searchResults, direction)
     } else {
-      searchResults = calcSearchTokens(
-        diff,
-        showSideBySideDiff,
-        searchQuery,
-        this.canExpandDiff()
-      )
-      selectedSearchResult = 0
-
-      if (searchResults === undefined || searchResults.length === 0) {
-        this.resetSearch(true)
-        return
-      }
+      this.startSearch(searchQuery, direction)
     }
+  }
+
+  private startSearch = (searchQuery: string, direction: SearchDirection) => {
+    const searchResults = calcSearchTokens(
+      this.state.diff,
+      this.props.showSideBySideDiff,
+      searchQuery,
+      this.canExpandDiff()
+    )
 
-    const scrollToRow = searchResults.get(selectedSearchResult)?.row
+    if (searchResults === undefined || searchResults.length === 0) {
+      this.resetSearch(true, `No results for "${searchQuery}"`)
+    } else {
+      const ariaLiveMessage = `Result 1 of ${searchResults.length} for "${searchQuery}"`
 
-    if (scrollToRow !== undefined) {
-      this.virtualListRef.current?.scrollToRow(scrollToRow)
+      this.scrollToSearchResult(0)
+
+      this.ariaLiveChangeSignal = !this.ariaLiveChangeSignal
+
+      this.setState({
+        searchQuery,
+        searchResults,
+        selectedSearchResult: 0,
+        ariaLiveMessage,
+      })
     }
+  }
+
+  private continueSearch = (
+    searchResults: SearchResults,
+    direction: SearchDirection
+  ) => {
+    const { searchQuery } = this.state
+    let { selectedSearchResult = 0 } = this.state
+
+    const delta = direction === 'next' ? 1 : -1
 
-    this.setState({ searchQuery, searchResults, selectedSearchResult })
+    // https://web.archive.org/web/20090717035140if_/javascript.about.com/od/problemsolving/a/modulobug.htm
+    selectedSearchResult =
+      (selectedSearchResult + delta + searchResults.length) %
+      searchResults.length
+
+    const ariaLiveMessage = `Result ${selectedSearchResult + 1} of ${
+      searchResults.length
+    } for "${searchQuery}"`
+
+    this.scrollToSearchResult(selectedSearchResult)
+
+    this.ariaLiveChangeSignal = !this.ariaLiveChangeSignal
+    this.setState({
+      searchResults,
+      selectedSearchResult,
+      ariaLiveMessage,
+    })
   }
 
   private onSearchCancel = () => {
     this.resetSearch(false)
   }
 
-  private resetSearch(isSearching: boolean) {
+  private scrollToSearchResult = (index: number) => {
+    const { searchResults } = this.state
+
+    const scrollToRow = searchResults?.get(index)?.row
+
+    if (scrollToRow !== undefined) {
+      this.virtualListRef.current?.scrollToRow(scrollToRow)
+    }
+  }
+
+  private resetSearch(isSearching: boolean, searchLiveMessage: string = '') {
+    this.ariaLiveChangeSignal = !this.ariaLiveChangeSignal
     this.setState({
       selectedSearchResult: undefined,
       searchQuery: undefined,
       searchResults: undefined,
+      ariaLiveMessage: searchLiveMessage,
       isSearching,
     })
   }
@@ -1380,8 +2101,6 @@ function* enumerateColumnContents(
 
 function isInSelection(
   diffLineNumber: number,
-  row: number,
-  column: DiffColumn,
   selection: DiffSelection | undefined,
   temporarySelection: ISelection | undefined
 ) {
@@ -1391,7 +2110,10 @@ function isInSelection(
     return isInStoredSelection
   }
 
-  const isInTemporary = isInTemporarySelection(row, column, temporarySelection)
+  const isInTemporary = isInTemporarySelection(
+    diffLineNumber,
+    temporarySelection
+  )
 
   if (temporarySelection.isSelected) {
     return isInStoredSelection || isInTemporary
@@ -1400,9 +2122,8 @@ function isInSelection(
   }
 }
 
-export function isInTemporarySelection(
-  row: number,
-  column: DiffColumn,
+function isInTemporarySelection(
+  diffLineNumber: number,
   selection: ISelection | undefined
 ): selection is ISelection {
   if (selection === undefined) {
@@ -1410,9 +2131,8 @@ export function isInTemporarySelection(
   }
 
   if (
-    row >= Math.min(selection.from.row, selection.to.row) &&
-    row <= Math.max(selection.to.row, selection.from.row) &&
-    (column === selection.from.column || column === selection.to.column)
+    diffLineNumber >= Math.min(selection.from, selection.to) &&
+    diffLineNumber <= Math.max(selection.to, selection.from)
   ) {
     return true
   }
diff --git a/app/src/ui/diff/submodule-diff.tsx b/app/src/ui/diff/submodule-diff.tsx
new file mode 100644
index 00000000000..3e524dcaa9f
--- /dev/null
+++ b/app/src/ui/diff/submodule-diff.tsx
@@ -0,0 +1,212 @@
+import React from 'react'
+import { parseRepositoryIdentifier } from '../../lib/remote-parsing'
+import { ISubmoduleDiff } from '../../models/diff'
+import { LinkButton } from '../lib/link-button'
+import { Octicon } from '../octicons'
+import * as octicons from '../octicons/octicons.generated'
+import { SuggestedAction } from '../suggested-actions'
+import { Ref } from '../lib/ref'
+import { CopyButton } from '../copy-button'
+import { shortenSHA } from '../../models/commit'
+
+type SubmoduleItemIcon =
+  | {
+      readonly octicon: typeof octicons.info
+      readonly className: 'info-icon'
+    }
+  | {
+      readonly octicon: typeof octicons.diffModified
+      readonly className: 'modified-icon'
+    }
+  | {
+      readonly octicon: typeof octicons.diffAdded
+      readonly className: 'added-icon'
+    }
+  | {
+      readonly octicon: typeof octicons.diffRemoved
+      readonly className: 'removed-icon'
+    }
+  | {
+      readonly octicon: typeof octicons.fileDiff
+      readonly className: 'untracked-icon'
+    }
+
+interface ISubmoduleDiffProps {
+  readonly onOpenSubmodule?: (fullPath: string) => void
+  readonly diff: ISubmoduleDiff
+
+  /**
+   * Whether the diff is readonly, e.g., displaying a historical diff, or the
+   * diff's content can be committed, e.g., displaying a change in the working
+   * directory.
+   */
+  readonly readOnly: boolean
+}
+
+export class SubmoduleDiff extends React.Component<ISubmoduleDiffProps> {
+  public constructor(props: ISubmoduleDiffProps) {
+    super(props)
+  }
+
+  public render() {
+    return (
+      <div className="changes-interstitial submodule-diff">
+        <div className="content">
+          <div className="interstitial-header">
+            <div className="text">
+              <h1>Submodule changes</h1>
+            </div>
+          </div>
+          {this.renderSubmoduleInfo()}
+          {this.renderCommitChangeInfo()}
+          {this.renderSubmodulesChangesInfo()}
+          {this.renderOpenSubmoduleAction()}
+        </div>
+      </div>
+    )
+  }
+
+  private renderSubmoduleInfo() {
+    if (this.props.diff.url === null) {
+      return null
+    }
+
+    const repoIdentifier = parseRepositoryIdentifier(this.props.diff.url)
+    if (repoIdentifier === null) {
+      return null
+    }
+
+    const hostname =
+      repoIdentifier.hostname === 'github.com'
+        ? ''
+        : ` (${repoIdentifier.hostname})`
+
+    return this.renderSubmoduleDiffItem(
+      { octicon: octicons.info, className: 'info-icon' },
+      <>
+        This is a submodule based on the repository{' '}
+        <LinkButton
+          uri={`https://${repoIdentifier.hostname}/${repoIdentifier.owner}/${repoIdentifier.name}`}
+        >
+          {repoIdentifier.owner}/{repoIdentifier.name}
+          {hostname}
+        </LinkButton>
+        .
+      </>
+    )
+  }
+
+  private renderCommitChangeInfo() {
+    const { diff, readOnly } = this.props
+    const { oldSHA, newSHA } = diff
+
+    const verb = readOnly ? 'was' : 'has been'
+    const suffix = readOnly
+      ? ''
+      : ' This change can be committed to the parent repository.'
+
+    if (oldSHA !== null && newSHA !== null) {
+      return this.renderSubmoduleDiffItem(
+        { octicon: octicons.diffModified, className: 'modified-icon' },
+        <>
+          This submodule changed its commit from{' '}
+          {this.renderCommitSHA(oldSHA, 'previous')} to{' '}
+          {this.renderCommitSHA(newSHA, 'new')}.{suffix}
+        </>
+      )
+    } else if (oldSHA === null && newSHA !== null) {
+      return this.renderSubmoduleDiffItem(
+        { octicon: octicons.diffAdded, className: 'added-icon' },
+        <>
+          This submodule {verb} added pointing at commit{' '}
+          {this.renderCommitSHA(newSHA)}.{suffix}
+        </>
+      )
+    } else if (oldSHA !== null && newSHA === null) {
+      return this.renderSubmoduleDiffItem(
+        { octicon: octicons.diffRemoved, className: 'removed-icon' },
+        <>
+          This submodule {verb} removed while it was pointing at commit{' '}
+          {this.renderCommitSHA(oldSHA)}.{suffix}
+        </>
+      )
+    }
+
+    return null
+  }
+
+  private renderCommitSHA(sha: string, which?: 'previous' | 'new') {
+    const whichInfix = which === undefined ? '' : ` ${which}`
+
+    return (
+      <>
+        <Ref>{shortenSHA(sha)}</Ref>
+        <CopyButton
+          ariaLabel={`Copy the full${whichInfix} SHA`}
+          copyContent={sha}
+        />
+      </>
+    )
+  }
+
+  private renderSubmodulesChangesInfo() {
+    const { diff } = this.props
+
+    if (!diff.status.untrackedChanges && !diff.status.modifiedChanges) {
+      return null
+    }
+
+    const changes =
+      diff.status.untrackedChanges && diff.status.modifiedChanges
+        ? 'modified and untracked'
+        : diff.status.untrackedChanges
+        ? 'untracked'
+        : 'modified'
+
+    return this.renderSubmoduleDiffItem(
+      { octicon: octicons.fileDiff, className: 'untracked-icon' },
+      <>
+        This submodule has {changes} changes. Those changes must be committed
+        inside of the submodule before they can be part of the parent
+        repository.
+      </>
+    )
+  }
+
+  private renderSubmoduleDiffItem(
+    icon: SubmoduleItemIcon,
+    content: React.ReactElement
+  ) {
+    return (
+      <div className="item">
+        <Octicon symbol={icon.octicon} className={icon.className} />
+        <div className="content">{content}</div>
+      </div>
+    )
+  }
+
+  private renderOpenSubmoduleAction() {
+    // If no url is found for the submodule, it means it can't be opened
+    // This happens if the user is looking at an old commit which references
+    // a submodule that got later deleted.
+    if (this.props.diff.url === null) {
+      return null
+    }
+
+    return (
+      <span>
+        <SuggestedAction
+          title="Open this submodule on GitHub Desktop"
+          description="You can open this submodule on GitHub Desktop as a normal repository to manage and commit any changes in it."
+          buttonText={__DARWIN__ ? 'Open Repository' : 'Open repository'}
+          type="primary"
+          onClick={this.onOpenSubmoduleClick}
+        />
+      </span>
+    )
+  }
+
+  private onOpenSubmoduleClick = () => {
+    this.props.onOpenSubmodule?.(this.props.diff.fullPath)
+  }
+}
diff --git a/app/src/ui/diff/syntax-highlighting/index.ts b/app/src/ui/diff/syntax-highlighting/index.ts
index b598c631e8b..0f76c20a34d 100644
--- a/app/src/ui/diff/syntax-highlighting/index.ts
+++ b/app/src/ui/diff/syntax-highlighting/index.ts
@@ -15,7 +15,6 @@ import {
 import { Repository } from '../../../models/repository'
 import { DiffHunk, DiffLineType, DiffLine } from '../../../models/diff'
 import { getOldPathOrDefault } from '../../../lib/get-old-path'
-import { enableTextDiffExpansion } from '../../../lib/feature-flag'
 
 /** The maximum number of bytes we'll process for highlighting. */
 const MaxHighlightContentLength = 256 * 1024
@@ -66,7 +65,7 @@ async function getOldFileContent(
     // actually committed to get the appropriate content.
     commitish = 'HEAD'
   } else if (file instanceof CommittedFileChange) {
-    commitish = `${file.commitish}^`
+    commitish = file.parentCommitish
   } else {
     return assertNever(file, 'Unknown file change type')
   }
@@ -107,27 +106,14 @@ async function getNewFileContent(
 
 export async function getFileContents(
   repo: Repository,
-  file: ChangedFile,
-  lineFilters: ILineFilters
+  file: ChangedFile
 ): Promise<IFileContents> {
-  // If text-diff expansion is enabled, we'll always want to load both the old
-  // and the new contents, so that we can expand the diff as needed.
-  const oldContentsPromise =
-    enableTextDiffExpansion() || lineFilters.oldLineFilter.length
-      ? getOldFileContent(repo, file)
-      : Promise.resolve(null)
-
-  const newContentsPromise =
-    enableTextDiffExpansion() || lineFilters.newLineFilter.length
-      ? getNewFileContent(repo, file)
-      : Promise.resolve(null)
-
   const [oldContents, newContents] = await Promise.all([
-    oldContentsPromise.catch(e => {
+    getOldFileContent(repo, file).catch(e => {
       log.error('Could not load old contents for syntax highlighting', e)
       return null
     }),
-    newContentsPromise.catch(e => {
+    getNewFileContent(repo, file).catch(e => {
       log.error('Could not load new contents for syntax highlighting', e)
       return null
     }),
@@ -138,7 +124,6 @@ export async function getFileContents(
     oldContents: oldContents?.toString('utf8').split(/\r?\n/) ?? [],
     newContents: newContents?.toString('utf8').split(/\r?\n/) ?? [],
     canBeExpanded:
-      enableTextDiffExpansion() &&
       newContents !== null &&
       newContents.length <= MaxDiffExpansionNewContentLength,
   }
diff --git a/app/src/ui/diff/text-diff-expansion.ts b/app/src/ui/diff/text-diff-expansion.ts
index a9b2188f7cd..092426a1a9b 100644
--- a/app/src/ui/diff/text-diff-expansion.ts
+++ b/app/src/ui/diff/text-diff-expansion.ts
@@ -1,4 +1,3 @@
-import { enableTextDiffExpansion } from '../../lib/feature-flag'
 import {
   DiffHunk,
   DiffHunkExpansionType,
@@ -91,10 +90,6 @@ export function getHunkHeaderExpansionType(
   hunkHeader: DiffHunkHeader,
   previousHunk: DiffHunk | null
 ): DiffHunkExpansionType {
-  if (!enableTextDiffExpansion()) {
-    return DiffHunkExpansionType.None
-  }
-
   const distanceToPrevious =
     previousHunk === null
       ? Infinity
diff --git a/app/src/ui/diff/text-diff.tsx b/app/src/ui/diff/text-diff.tsx
deleted file mode 100644
index 0c8305f58ab..00000000000
--- a/app/src/ui/diff/text-diff.tsx
+++ /dev/null
@@ -1,1581 +0,0 @@
-import * as React from 'react'
-import ReactDOM from 'react-dom'
-import { clipboard } from 'electron'
-import { Editor, Doc, EditorConfiguration } from 'codemirror'
-
-import {
-  DiffHunk,
-  DiffLineType,
-  DiffSelection,
-  DiffLine,
-  ITextDiff,
-  DiffHunkExpansionType,
-} from '../../models/diff'
-import {
-  WorkingDirectoryFileChange,
-  CommittedFileChange,
-} from '../../models/status'
-
-import { DiffSyntaxMode, IDiffSyntaxModeSpec } from './diff-syntax-mode'
-import { CodeMirrorHost } from './code-mirror-host'
-import {
-  diffLineForIndex,
-  findInteractiveOriginalDiffRange,
-  lineNumberForDiffLine,
-  DiffRangeType,
-  diffLineInfoForIndex,
-  getLineInOriginalDiff,
-} from './diff-explorer'
-
-import {
-  getLineFilters,
-  highlightContents,
-  IFileContents,
-} from './syntax-highlighting'
-import { relativeChanges } from './changed-range'
-import { Repository } from '../../models/repository'
-import memoizeOne from 'memoize-one'
-import { structuralEquals } from '../../lib/equality'
-import { assertNever } from '../../lib/fatal-error'
-import { clamp } from '../../lib/clamp'
-import { uuid } from '../../lib/uuid'
-import { showContextualMenu } from '../../lib/menu-item'
-import { IMenuItem } from '../../lib/menu-item'
-import {
-  canSelect,
-  getLineWidthFromDigitCount,
-  getNumberOfDigits,
-  MaxIntraLineDiffStringLength,
-} from './diff-helpers'
-import {
-  expandTextDiffHunk,
-  DiffExpansionKind,
-  expandWholeTextDiff,
-} from './text-diff-expansion'
-import { createOcticonElement } from '../octicons/octicon'
-import * as OcticonSymbol from '../octicons/octicons.generated'
-import { WhitespaceHintPopover } from './whitespace-hint-popover'
-import { PopoverCaretPosition } from '../lib/popover'
-import { HiddenBidiCharsWarning } from './hidden-bidi-chars-warning'
-
-// This is a custom version of the no-newline octicon that's exactly as
-// tall as it needs to be (8px) which helps with aligning it on the line.
-export const narrowNoNewlineSymbol = {
-  w: 16,
-  h: 8,
-  d: 'm 16,1 0,3 c 0,0.55 -0.45,1 -1,1 l -3,0 0,2 -3,-3 3,-3 0,2 2,0 0,-2 2,0 z M 8,4 C 8,6.2 6.2,8 4,8 1.8,8 0,6.2 0,4 0,1.8 1.8,0 4,0 6.2,0 8,1.8 8,4 Z M 1.5,5.66 5.66,1.5 C 5.18,1.19 4.61,1 4,1 2.34,1 1,2.34 1,4 1,4.61 1.19,5.17 1.5,5.66 Z M 7,4 C 7,3.39 6.81,2.83 6.5,2.34 L 2.34,6.5 C 2.82,6.81 3.39,7 4,7 5.66,7 7,5.66 7,4 Z',
-}
-
-type ChangedFile = WorkingDirectoryFileChange | CommittedFileChange
-
-/**
- * Checks to see if any key parameters in the props object that are used
- * when performing highlighting has changed. This is used to determine
- * whether highlighting should abort in between asynchronous operations
- * due to some factor (like which file is currently selected) have changed
- * and thus rendering the in-flight highlighting data useless.
- */
-function highlightParametersEqual(
-  newProps: ITextDiffProps,
-  prevProps: ITextDiffProps,
-  newState: ITextDiffState,
-  prevState: ITextDiffState
-) {
-  return (
-    (newProps === prevProps || newProps.file.id === prevProps.file.id) &&
-    newState.diff.text === prevState.diff.text &&
-    prevProps.fileContents?.file.id === newProps.fileContents?.file.id
-  )
-}
-
-type SelectionKind = 'hunk' | 'range'
-
-interface ISelection {
-  readonly from: number
-  readonly to: number
-  readonly kind: SelectionKind
-  readonly isSelected: boolean
-}
-
-function createNoNewlineIndicatorWidget() {
-  const widget = document.createElement('span')
-  const titleId = uuid()
-
-  const { w, h, d } = narrowNoNewlineSymbol
-
-  const xmlns = 'http://www.w3.org/2000/svg'
-  const svgElem = document.createElementNS(xmlns, 'svg')
-  svgElem.setAttribute('version', '1.1')
-  svgElem.setAttribute('viewBox', `0 0 ${w} ${h}`)
-  svgElem.setAttribute('role', 'img')
-  svgElem.setAttribute('aria-labelledby', titleId)
-  svgElem.classList.add('no-newline')
-
-  const titleElem = document.createElementNS(xmlns, 'title')
-  titleElem.setAttribute('id', titleId)
-  titleElem.setAttribute('lang', 'en')
-  titleElem.textContent = 'No newline at end of file'
-  svgElem.appendChild(titleElem)
-
-  const pathElem = document.createElementNS(xmlns, 'path')
-  pathElem.setAttribute('role', 'presentation')
-  pathElem.setAttribute('d', d)
-  pathElem.textContent = 'No newline at end of file'
-  svgElem.appendChild(pathElem)
-
-  widget.appendChild(svgElem)
-  return widget
-}
-
-/**
- * Utility function to check whether a selection exists, and whether
- * the given index is contained within the selection.
- */
-function inSelection(s: ISelection | null, ix: number): s is ISelection {
-  if (s === null) {
-    return false
-  }
-  return ix >= Math.min(s.from, s.to) && ix <= Math.max(s.to, s.from)
-}
-
-/** Utility function for checking whether an event target has a given CSS class */
-function targetHasClass(target: EventTarget | null, token: string) {
-  return target instanceof HTMLElement && target.classList.contains(token)
-}
-
-interface ITextDiffProps {
-  readonly repository: Repository
-  /** The file whose diff should be displayed. */
-  readonly file: ChangedFile
-  /** The initial diff that should be rendered */
-  readonly diff: ITextDiff
-  /**
-   * Contents of the old and new files related to the current text diff.
-   */
-  readonly fileContents: IFileContents | null
-  /** If true, no selections or discards can be done against this diff. */
-  readonly readOnly: boolean
-  /**
-   * Called when the includedness of lines or a range of lines has changed.
-   * Only applicable when readOnly is false.
-   */
-  readonly onIncludeChanged?: (diffSelection: DiffSelection) => void
-
-  readonly hideWhitespaceInDiff: boolean
-
-  /**
-   * Called when the user wants to discard a selection of the diff.
-   * Only applicable when readOnly is false.
-   */
-  readonly onDiscardChanges?: (
-    diff: ITextDiff,
-    diffSelection: DiffSelection
-  ) => void
-  /**
-   * Whether we'll show a confirmation dialog when the user
-   * discards changes.
-   */
-  readonly askForConfirmationOnDiscardChanges?: boolean
-
-  /** Called when the user changes the hide whitespace in diffs setting. */
-  readonly onHideWhitespaceInDiffChanged: (checked: boolean) => void
-}
-
-interface ITextDiffState {
-  /** The diff that should be rendered */
-  readonly diff: ITextDiff
-}
-
-const diffGutterName = 'diff-gutter'
-
-function showSearch(cm: Editor) {
-  const wrapper = cm.getWrapperElement()
-
-  // Is there already a dialog open? If so we'll attempt to move
-  // focus there instead of opening another dialog since CodeMirror
-  // doesn't auto-close dialogs when opening a new one.
-  const existingSearchField = wrapper.querySelector(
-    ':scope > .CodeMirror-dialog .CodeMirror-search-field'
-  )
-
-  if (existingSearchField !== null) {
-    if (existingSearchField instanceof HTMLElement) {
-      existingSearchField.focus()
-    }
-    return
-  }
-
-  cm.execCommand('findPersistent')
-
-  const dialog = wrapper.querySelector('.CodeMirror-dialog')
-
-  if (dialog === null) {
-    return
-  }
-
-  dialog.classList.add('CodeMirror-search-dialog')
-  const searchField = dialog.querySelector('.CodeMirror-search-field')
-
-  if (searchField instanceof HTMLInputElement) {
-    searchField.placeholder = 'Search'
-    searchField.style.removeProperty('width')
-  }
-}
-
-/**
- * Scroll the editor vertically by either line or page the number
- * of times specified by the `step` parameter.
- *
- * This differs from the moveV function in CodeMirror in that it
- * doesn't attempt to scroll by moving the cursor but rather by
- * actually changing the scrollTop (if possible).
- */
-function scrollEditorVertically(step: number, unit: 'line' | 'page') {
-  return (cm: Editor) => {
-    // The magic number 4 here is specific to Desktop and it's
-    // the extra padding we put around lines (2px below and 2px
-    // above)
-    const lineHeight = Math.round(cm.defaultTextHeight() + 4)
-    const scrollInfo = cm.getScrollInfo()
-
-    if (unit === 'line') {
-      cm.scrollTo(undefined, scrollInfo.top + step * lineHeight)
-    } else {
-      // We subtract one line from the page height to keep som
-      // continuity when scrolling. Scrolling a full page leaves
-      // the user without any anchor point
-      const pageHeight = scrollInfo.clientHeight - lineHeight
-      cm.scrollTo(undefined, scrollInfo.top + step * pageHeight)
-    }
-  }
-}
-
-const defaultEditorOptions: EditorConfiguration = {
-  lineNumbers: false,
-  readOnly: true,
-  showCursorWhenSelecting: false,
-  cursorBlinkRate: -1,
-  lineWrapping: true,
-  mode: { name: DiffSyntaxMode.ModeName },
-  // Make sure CodeMirror doesn't capture Tab (and Shift-Tab) and thus destroy tab navigation
-  extraKeys: {
-    Tab: false,
-    Home: 'goDocStart',
-    End: 'goDocEnd',
-    'Shift-Tab': false,
-    // Steal the default key binding so that we can launch our
-    // custom search UI.
-    [__DARWIN__ ? 'Cmd-F' : 'Ctrl-F']: showSearch,
-    // Disable all other search-related shortcuts so that they
-    // don't interfere with global app shortcuts.
-    [__DARWIN__ ? 'Cmd-G' : 'Ctrl-G']: false, // findNext
-    [__DARWIN__ ? 'Shift-Cmd-G' : 'Shift-Ctrl-G']: false, // findPrev
-    [__DARWIN__ ? 'Cmd-Alt-F' : 'Shift-Ctrl-F']: false, // replace
-    [__DARWIN__ ? 'Shift-Cmd-Alt-F' : 'Shift-Ctrl-R']: false, // replaceAll
-    Down: scrollEditorVertically(1, 'line'),
-    Up: scrollEditorVertically(-1, 'line'),
-    PageDown: scrollEditorVertically(1, 'page'),
-    PageUp: scrollEditorVertically(-1, 'page'),
-  },
-  scrollbarStyle: __DARWIN__ ? 'simple' : 'native',
-  styleSelectedText: true,
-  lineSeparator: '\n',
-  specialChars:
-    /[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b-\u200f\u2028\u2029\ufeff]/,
-  gutters: [diffGutterName],
-}
-
-export class TextDiff extends React.Component<ITextDiffProps, ITextDiffState> {
-  private codeMirror: Editor | null = null
-  private whitespaceHintMountId: number | null = null
-  private whitespaceHintContainer: Element | null = null
-
-  private getCodeMirrorDocument = memoizeOne(
-    (text: string, noNewlineIndicatorLines: ReadonlyArray<number>) => {
-      const { mode, firstLineNumber, lineSeparator } = defaultEditorOptions
-      // If the text looks like it could have been formatted using Windows
-      // line endings (\r\n) we need to massage it a bit before we hand it
-      // off to CodeMirror. That's because CodeMirror has two ways of splitting
-      // lines, one is the built in which splits on \n, \r\n and \r. The last
-      // one is important because that will match carriage return characters
-      // inside a diff line. The other way is when consumers supply the
-      // lineSeparator option. That option only takes a string meaning we can
-      // either make it split on '\r\n', '\n' or '\r' but not what we would like
-      // to do, namely '\r?\n'. We want to keep CR characters inside of a diff
-      // line so that we can mark them using the specialChars attribute so
-      // we convert all \r\n to \n and remove any trailing \r character.
-      if (text.indexOf('\r') !== -1) {
-        // Capture the \r if followed by (positive lookahead) a \n or
-        // the end of the string. Note that this does not capture the \n.
-        text = text.replace(/\r(?=\n|$)/g, '')
-      }
-
-      const doc = new Doc(
-        text,
-        mode,
-        firstLineNumber,
-        lineSeparator ?? undefined
-      )
-
-      for (const noNewlineLine of noNewlineIndicatorLines) {
-        doc.setBookmark(
-          { line: noNewlineLine, ch: Infinity },
-          { widget: createNoNewlineIndicatorWidget() }
-        )
-      }
-
-      return doc
-    },
-    // Only re-run the memoization function if the text differs or the array
-    // differs (by structural equality). Allows us to re-use the document as
-    // much as possible, recreating it only if a no-newline appears/disappears
-    structuralEquals
-  )
-
-  /**
-   * Returns an array of line numbers that should be marked as lacking a
-   * new line. Memoized such that even if `hunks` changes we don't have
-   * to re-run getCodeMirrorDocument needlessly.
-   */
-  private getNoNewlineIndicatorLines = memoizeOne(
-    (hunks: ReadonlyArray<DiffHunk>) => {
-      const lines = new Array<number>()
-      for (const hunk of hunks) {
-        for (const line of hunk.lines) {
-          if (line.noTrailingNewLine) {
-            lines.push(lineNumberForDiffLine(line, hunks))
-          }
-        }
-      }
-      return lines
-    }
-  )
-
-  /** The current, active, diff gutter selection if any */
-  private selection: ISelection | null = null
-
-  /** Diff to restore when "Collapse all expanded lines" option is used */
-  private diffToRestore: ITextDiff | null = null
-
-  /** Whether a particular range should be highlighted due to hover */
-  private hunkHighlightRange: ISelection | null = null
-
-  /**
-   * When CodeMirror swaps documents it will usually lead to the
-   * viewportChange event being emitted but there are several scenarios
-   * where that doesn't happen (where the viewport happens to be the same
-   * after swapping). We set this field to false whenever we get notified
-   * that a document is about to get swapped out (`onSwapDoc`), and we set it
-   * to true on each call to `onViewportChanged` allowing us to check in
-   * the post-swap event (`onAfterSwapDoc`) whether the document swap
-   * triggered a viewport change event or not.
-   *
-   * This is important because we rely on the viewportChange event to
-   * know when to update our gutters and by leveraging this field we
-   * can ensure that we always repaint gutter on each document swap and
-   * that we only do so once per document swap.
-   */
-  private swappedDocumentHasUpdatedViewport = true
-
-  public constructor(props: ITextDiffProps) {
-    super(props)
-
-    this.state = {
-      diff: this.props.diff,
-    }
-  }
-
-  private async initDiffSyntaxMode() {
-    if (!this.codeMirror) {
-      return
-    }
-
-    const contents = this.props.fileContents
-
-    if (contents === null) {
-      return
-    }
-
-    const { diff: currentDiff } = this.state
-
-    // Store the current props and state to that we can see if anything
-    // changes from underneath us as we're making asynchronous
-    // operations that makes our data stale or useless.
-    const propsSnapshot = this.props
-    const stateSnapshot = this.state
-
-    const lineFilters = getLineFilters(currentDiff.hunks)
-    const tsOpt = this.codeMirror.getOption('tabSize')
-    const tabSize = typeof tsOpt === 'number' ? tsOpt : 4
-
-    const tokens = await highlightContents(contents, tabSize, lineFilters)
-
-    if (
-      !highlightParametersEqual(
-        this.props,
-        propsSnapshot,
-        this.state,
-        stateSnapshot
-      )
-    ) {
-      return
-    }
-
-    const spec: IDiffSyntaxModeSpec = {
-      name: DiffSyntaxMode.ModeName,
-      hunks: currentDiff.hunks,
-      oldTokens: tokens.oldTokens,
-      newTokens: tokens.newTokens,
-    }
-
-    if (this.codeMirror) {
-      this.codeMirror.setOption('mode', spec)
-    }
-  }
-
-  /**
-   * start a selection gesture based on the current interaction
-   */
-  private startSelection(
-    file: WorkingDirectoryFileChange,
-    hunks: ReadonlyArray<DiffHunk>,
-    index: number,
-    kind: SelectionKind
-  ) {
-    if (this.selection !== null) {
-      this.cancelSelection()
-    }
-
-    const indexInOriginalDiff = getLineInOriginalDiff(hunks, index)
-    if (indexInOriginalDiff === null) {
-      return
-    }
-
-    const isSelected = !file.selection.isSelected(indexInOriginalDiff)
-
-    if (this.props.hideWhitespaceInDiff) {
-      if (file.selection.isSelectable(indexInOriginalDiff)) {
-        this.mountWhitespaceHint(index)
-      }
-      return
-    }
-
-    if (kind === 'hunk') {
-      const range = findInteractiveOriginalDiffRange(hunks, index)
-      if (!range) {
-        console.error('unable to find range for given line in diff')
-        return
-      }
-
-      const { from, to } = range
-      this.selection = { isSelected, from, to, kind }
-    } else if (kind === 'range') {
-      this.selection = {
-        isSelected,
-        from: indexInOriginalDiff,
-        to: indexInOriginalDiff,
-        kind,
-      }
-      document.addEventListener('mousemove', this.onDocumentMouseMove)
-    } else {
-      assertNever(kind, `Unknown selection kind ${kind}`)
-    }
-
-    document.addEventListener('mouseup', this.onDocumentMouseUp, { once: true })
-  }
-
-  private cancelSelection() {
-    if (this.selection) {
-      document.removeEventListener('mouseup', this.onDocumentMouseUp)
-      document.removeEventListener('mousemove', this.onDocumentMouseMove)
-      this.selection = null
-      this.updateViewport()
-    }
-  }
-
-  private onDocumentMouseMove = (ev: MouseEvent) => {
-    if (
-      this.codeMirror === null ||
-      this.selection === null ||
-      this.selection.kind !== 'range'
-    ) {
-      return
-    }
-
-    // CodeMirror can return a line that doesn't exist if the
-    // pointer is placed underneath the last line so we clamp it
-    // to the range of valid values.
-    const max = Math.max(0, this.codeMirror.getDoc().lineCount() - 1)
-    const index = clamp(this.codeMirror.lineAtHeight(ev.y), 0, max)
-
-    this.codeMirror.scrollIntoView({ line: index, ch: 0 })
-
-    const to = getLineInOriginalDiff(this.state.diff.hunks, index)
-
-    if (to === null) {
-      return
-    }
-
-    if (to !== this.selection.to) {
-      this.selection = { ...this.selection, to }
-      this.updateViewport()
-    }
-  }
-
-  private onDocumentMouseUp = (ev: MouseEvent) => {
-    ev.preventDefault()
-
-    // We only care about the primary button here, secondary
-    // button clicks are handled by `onContextMenu`
-    if (ev.button !== 0) {
-      return
-    }
-
-    if (this.selection === null || this.codeMirror === null) {
-      return this.cancelSelection()
-    }
-
-    // A range selection is when the user clicks on the "hunk handle"
-    // which is a hit area spanning 10 or so pixels on either side of
-    // the gutter border, extending into the text area. We capture the
-    // mouse down event on that hunk handle and for the mouse up event
-    // we need to make sure the user is still within that hunk handle
-    // section and in the correct range.
-    if (this.selection.kind === 'hunk') {
-      const index = this.codeMirror.lineAtHeight(ev.y)
-      const indexInOriginalDiff = getLineInOriginalDiff(
-        this.state.diff.hunks,
-        index
-      )
-      if (indexInOriginalDiff === null) {
-        return
-      }
-
-      // Is the pointer over the same range (i.e hunk) that the
-      // selection was originally started from?
-      if (
-        indexInOriginalDiff === null ||
-        !targetHasClass(ev.target, 'hunk-handle') ||
-        !inSelection(this.selection, indexInOriginalDiff)
-      ) {
-        return this.cancelSelection()
-      }
-    } else if (this.selection.kind === 'range') {
-      // Special case drag drop selections of 1 as single line 'click'
-      // events for which we require that the cursor is still on the
-      // original gutter element (i.e. if you mouse down on a gutter
-      // element and move the mouse out of the gutter it should not
-      // count as a click when you mouse up)
-      if (this.selection.from === this.selection.to) {
-        if (
-          !targetHasClass(ev.target, 'diff-line-number') &&
-          !targetHasClass(ev.target, 'diff-line-gutter')
-        ) {
-          return this.cancelSelection()
-        }
-      }
-    } else {
-      return assertNever(
-        this.selection.kind,
-        `Unknown selection kind ${this.selection.kind}`
-      )
-    }
-
-    this.endSelection()
-  }
-
-  /**
-   * complete the selection gesture and apply the change to the diff
-   */
-  private endSelection() {
-    const { onIncludeChanged, file } = this.props
-    if (onIncludeChanged && this.selection && canSelect(file)) {
-      const current = file.selection
-      const { isSelected } = this.selection
-
-      const lower = Math.min(this.selection.from, this.selection.to)
-      const upper = Math.max(this.selection.from, this.selection.to)
-      const length = upper - lower + 1
-
-      onIncludeChanged(current.withRangeSelection(lower, length, isSelected))
-      this.selection = null
-    }
-  }
-
-  private isSelectionEnabled = () => {
-    return this.selection === null
-  }
-
-  private canExpandDiff() {
-    const contents = this.props.fileContents
-    return (
-      contents !== null &&
-      contents.canBeExpanded &&
-      contents.newContents.length > 0
-    )
-  }
-
-  /** Expand a selected hunk. */
-  private expandHunk(hunk: DiffHunk, kind: DiffExpansionKind) {
-    const contents = this.props.fileContents
-
-    if (contents === null || !this.canExpandDiff()) {
-      return
-    }
-
-    const updatedDiff = expandTextDiffHunk(
-      this.state.diff,
-      hunk,
-      kind,
-      contents.newContents
-    )
-
-    if (updatedDiff === undefined) {
-      return
-    }
-
-    this.setState({ diff: updatedDiff })
-    this.updateViewport()
-  }
-
-  private getAndStoreCodeMirrorInstance = (cmh: CodeMirrorHost | null) => {
-    this.codeMirror = cmh === null ? null : cmh.getEditor()
-    this.initDiffSyntaxMode()
-  }
-
-  private onContextMenu = (instance: CodeMirror.Editor, event: Event) => {
-    const selectionRanges = instance.getDoc().listSelections()
-    const isTextSelected = selectionRanges != null
-
-    const action = () => {
-      this.onCopy(instance, event)
-    }
-
-    const items: IMenuItem[] = [
-      {
-        label: 'Copy',
-        action,
-        enabled: isTextSelected,
-      },
-    ]
-
-    const expandMenuItem = this.buildExpandMenuItem(event)
-    if (expandMenuItem !== null) {
-      items.push({ type: 'separator' }, expandMenuItem)
-    }
-
-    const discardMenuItems = this.buildDiscardMenuItems(instance, event)
-    if (discardMenuItems !== null) {
-      items.push({ type: 'separator' }, ...discardMenuItems)
-    }
-
-    showContextualMenu(items)
-  }
-
-  private buildExpandMenuItem(event: Event): IMenuItem | null {
-    if (!this.canExpandDiff()) {
-      return null
-    }
-
-    if (!(event instanceof MouseEvent)) {
-      // We can only infer which line was clicked when the context menu is opened
-      // via a mouse event.
-      return null
-    }
-
-    const diff = this.state.diff
-
-    return this.diffToRestore === null
-      ? {
-          label: __DARWIN__ ? 'Expand Whole File' : 'Expand whole file',
-          action: this.onExpandWholeFile,
-          // If there is only one hunk that can't be expanded, disable this item
-          enabled:
-            diff.hunks.length !== 1 ||
-            diff.hunks[0].expansionType !== DiffHunkExpansionType.None,
-        }
-      : {
-          label: __DARWIN__
-            ? 'Collapse Expanded Lines'
-            : 'Collapse expanded lines',
-          action: this.onCollapseExpandedLines,
-        }
-  }
-
-  private buildDiscardMenuItems(
-    editor: CodeMirror.Editor,
-    event: Event
-  ): ReadonlyArray<IMenuItem> | null {
-    const file = this.props.file
-
-    if (this.props.readOnly || !canSelect(file)) {
-      // Changes can't be discarded in readOnly mode.
-      return null
-    }
-
-    if (!(event instanceof MouseEvent)) {
-      // We can only infer which line was clicked when the context menu is opened
-      // via a mouse event.
-      return null
-    }
-
-    if (!this.props.onDiscardChanges) {
-      return null
-    }
-
-    const diff = this.state.diff
-    const lineNumber = editor.lineAtHeight(event.y)
-    const diffLine = diffLineForIndex(diff.hunks, lineNumber)
-    if (diffLine === null || !diffLine.isIncludeableLine()) {
-      // Do not show the discard options for lines that are not additions/deletions.
-      return null
-    }
-
-    const range = findInteractiveOriginalDiffRange(diff.hunks, lineNumber)
-    if (range === null) {
-      return null
-    }
-
-    if (range.type === null) {
-      return null
-    }
-
-    // When user opens the context menu from the hunk handle, we should
-    // discard the range of changes that from that hunk.
-    if (targetHasClass(event.target, 'hunk-handle')) {
-      return [
-        {
-          label: this.getDiscardLabel(range.type, range.to - range.from + 1),
-          action: () => this.onDiscardChanges(file, range.from, range.to),
-        },
-      ]
-    }
-
-    // When user opens the context menu from a specific line, we should
-    // discard only that line.
-    if (targetHasClass(event.target, 'diff-line-number')) {
-      // We don't allow discarding individual lines on hunks that have both
-      // added and modified lines, since that can lead to unexpected results
-      // (e.g discarding the added line on a hunk that is a 1-line modification
-      // will leave the line deleted).
-      return [
-        {
-          label: this.getDiscardLabel(range.type, 1),
-          action: () => this.onDiscardChanges(file, lineNumber),
-          enabled: range.type !== DiffRangeType.Mixed,
-        },
-      ]
-    }
-
-    return null
-  }
-
-  private onDiscardChanges(
-    file: WorkingDirectoryFileChange,
-    startLine: number,
-    endLine: number = startLine
-  ) {
-    if (!this.props.onDiscardChanges) {
-      return
-    }
-
-    const selection = file.selection
-      .withSelectNone()
-      .withRangeSelection(startLine, endLine - startLine + 1, true)
-
-    // Pass the original diff (from props) instead of the (potentially)
-    // expanded one.
-    this.props.onDiscardChanges(this.props.diff, selection)
-  }
-
-  private onExpandWholeFile = () => {
-    const contents = this.props.fileContents
-
-    if (contents === null || !this.canExpandDiff()) {
-      return
-    }
-
-    const updatedDiff = expandWholeTextDiff(
-      this.state.diff,
-      contents.newContents
-    )
-
-    if (updatedDiff === undefined) {
-      return
-    }
-
-    this.diffToRestore = this.state.diff
-
-    this.setState({ diff: updatedDiff })
-    this.updateViewport()
-  }
-
-  private onCollapseExpandedLines = () => {
-    if (this.diffToRestore === null) {
-      return
-    }
-
-    this.setState({ diff: this.diffToRestore })
-    this.updateViewport()
-
-    this.diffToRestore = null
-  }
-
-  private getDiscardLabel(rangeType: DiffRangeType, numLines: number): string {
-    const suffix = this.props.askForConfirmationOnDiscardChanges ? '…' : ''
-    let type = ''
-
-    if (rangeType === DiffRangeType.Additions) {
-      type = __DARWIN__ ? 'Added' : 'added'
-    } else if (rangeType === DiffRangeType.Deletions) {
-      type = __DARWIN__ ? 'Removed' : 'removed'
-    } else if (rangeType === DiffRangeType.Mixed) {
-      type = __DARWIN__ ? 'Modified' : 'modified'
-    } else {
-      assertNever(rangeType, `Invalid range type: ${rangeType}`)
-    }
-
-    const plural = numLines > 1 ? 's' : ''
-    return __DARWIN__
-      ? `Discard ${type} Line${plural}${suffix}`
-      : `Discard ${type} line${plural}${suffix}`
-  }
-
-  private onCopy = (editor: Editor, event: Event) => {
-    event.preventDefault()
-
-    // Remove the diff line markers from the copied text. The beginning of the
-    // selection might start within a line, in which case we don't have to trim
-    // the diff type marker. But for selections that span multiple lines, we'll
-    // trim it.
-    const doc = editor.getDoc()
-    const lines = doc.getSelections()
-    const selectionRanges = doc.listSelections()
-    const lineContent: Array<string> = []
-
-    for (let i = 0; i < lines.length; i++) {
-      const range = selectionRanges[i]
-      const content = lines[i]
-      const contentLines = content.split('\n')
-      for (const [i, line] of contentLines.entries()) {
-        if (i === 0 && range.head.ch > 0) {
-          lineContent.push(line)
-        } else {
-          lineContent.push(line.substring(1))
-        }
-      }
-
-      const textWithoutMarkers = lineContent.join('\n')
-      clipboard.writeText(textWithoutMarkers)
-    }
-  }
-
-  private markIntraLineChanges(doc: Doc, hunks: ReadonlyArray<DiffHunk>) {
-    for (const hunk of hunks) {
-      const additions = hunk.lines.filter(l => l.type === DiffLineType.Add)
-      const deletions = hunk.lines.filter(l => l.type === DiffLineType.Delete)
-      if (additions.length !== deletions.length) {
-        continue
-      }
-
-      for (let i = 0; i < additions.length; i++) {
-        const addLine = additions[i]
-        const deleteLine = deletions[i]
-        if (
-          addLine.text.length > MaxIntraLineDiffStringLength ||
-          deleteLine.text.length > MaxIntraLineDiffStringLength
-        ) {
-          continue
-        }
-
-        const changeRanges = relativeChanges(
-          addLine.content,
-          deleteLine.content
-        )
-        const addRange = changeRanges.stringARange
-        if (addRange.length > 0) {
-          const addLineNumber = lineNumberForDiffLine(addLine, hunks)
-          if (addLineNumber > -1) {
-            const addFrom = {
-              line: addLineNumber,
-              ch: addRange.location + 1,
-            }
-            const addTo = {
-              line: addLineNumber,
-              ch: addRange.location + addRange.length + 1,
-            }
-            doc.markText(addFrom, addTo, { className: 'cm-diff-add-inner' })
-          }
-        }
-
-        const deleteRange = changeRanges.stringBRange
-        if (deleteRange.length > 0) {
-          const deleteLineNumber = lineNumberForDiffLine(deleteLine, hunks)
-          if (deleteLineNumber > -1) {
-            const deleteFrom = {
-              line: deleteLineNumber,
-              ch: deleteRange.location + 1,
-            }
-            const deleteTo = {
-              line: deleteLineNumber,
-              ch: deleteRange.location + deleteRange.length + 1,
-            }
-            doc.markText(deleteFrom, deleteTo, {
-              className: 'cm-diff-delete-inner',
-            })
-          }
-        }
-      }
-    }
-  }
-
-  private onSwapDoc = (cm: Editor, oldDoc: Doc) => {
-    this.swappedDocumentHasUpdatedViewport = false
-    this.initDiffSyntaxMode()
-    this.markIntraLineChanges(cm.getDoc(), this.state.diff.hunks)
-  }
-
-  /**
-   * When we swap in a new document that happens to have the exact same number
-   * of lines as the previous document and where neither of those document
-   * needs scrolling (i.e the document doesn't extend beyond the visible area
-   * of the editor) we technically never update the viewport as far as CodeMirror
-   * is concerned, meaning that we don't get a chance to update our gutters.
-   *
-   * By subscribing to the event that happens immediately after the document
-   * swap has been completed we can check for this condition and others that
-   * cause the onViewportChange event to not be emitted while swapping documents,
-   * (see `swappedDocumentHasUpdatedViewport`) and explicitly update the viewport
-   * (and thereby the gutters).
-   */
-  private onAfterSwapDoc = (cm: Editor, oldDoc: Doc, newDoc: Doc) => {
-    if (!this.swappedDocumentHasUpdatedViewport) {
-      this.updateViewport()
-    }
-  }
-
-  private onViewportChange = (cm: Editor, from: number, to: number) => {
-    const doc = cm.getDoc()
-    const batchedOps = new Array<Function>()
-
-    this.swappedDocumentHasUpdatedViewport = true
-
-    const hunks = this.state.diff.hunks
-
-    doc.eachLine(from, to, line => {
-      const lineNumber = doc.getLineNumber(line)
-
-      if (lineNumber !== null) {
-        const diffLineInfo = diffLineInfoForIndex(hunks, lineNumber)
-
-        if (diffLineInfo !== null) {
-          const { hunk, line: diffLine } = diffLineInfo
-          const lineInfo = cm.lineInfo(line)
-
-          if (
-            lineInfo.gutterMarkers &&
-            diffGutterName in lineInfo.gutterMarkers
-          ) {
-            const marker = lineInfo.gutterMarkers[diffGutterName]
-            if (marker instanceof HTMLElement) {
-              this.updateGutterMarker(marker, hunk, diffLine)
-            }
-          } else {
-            batchedOps.push(() => {
-              const marker = this.createGutterMarker(
-                lineNumber,
-                hunks,
-                hunk,
-                diffLine,
-                getNumberOfDigits(this.state.diff.maxLineNumber)
-              )
-              cm.setGutterMarker(line, diffGutterName, marker)
-            })
-          }
-        }
-      }
-    })
-
-    // Updating a gutter marker doesn't affect layout or rendering
-    // as far as CodeMirror is concerned so we only run an operation
-    // (which will trigger a CodeMirror refresh) when we have gutter
-    // markers to create.
-    if (batchedOps.length > 0) {
-      cm.operation(() => batchedOps.forEach(x => x()))
-    }
-
-    const diffSize = getLineWidthFromDigitCount(
-      getNumberOfDigits(this.state.diff.maxLineNumber)
-    )
-
-    const gutterParentElement = cm.getGutterElement()
-    const gutterElement =
-      gutterParentElement.getElementsByClassName(diffGutterName)[0]
-
-    const newStyle = `width: ${diffSize * 2}px;`
-    const currentStyle = gutterElement.getAttribute('style')
-    if (newStyle !== currentStyle) {
-      gutterElement.setAttribute('style', newStyle)
-      cm.refresh()
-    }
-  }
-
-  /**
-   * Returns a value indicating whether the given line index is included
-   * in the current temporary or permanent (props) selection. Note that
-   * this function does not care about whether the line can be included,
-   * only whether it is indicated to be included by either selection.
-   */
-  private isIncluded(index: number) {
-    const { file } = this.props
-    return inSelection(this.selection, index)
-      ? this.selection.isSelected
-      : canSelect(file) && file.selection.isSelected(index)
-  }
-
-  private getGutterLineClassNameInfo(
-    hunk: DiffHunk,
-    diffLine: DiffLine
-  ): { [className: string]: boolean } {
-    const isIncludeable = diffLine.isIncludeableLine()
-    const isIncluded =
-      isIncludeable &&
-      diffLine.originalLineNumber !== null &&
-      this.isIncluded(diffLine.originalLineNumber)
-    const hover =
-      isIncludeable &&
-      diffLine.originalLineNumber !== null &&
-      inSelection(this.hunkHighlightRange, diffLine.originalLineNumber)
-
-    const shouldEnableDiffExpansion = this.canExpandDiff()
-
-    return {
-      'diff-line-gutter': true,
-      'diff-add': diffLine.type === DiffLineType.Add,
-      'diff-delete': diffLine.type === DiffLineType.Delete,
-      'diff-context': diffLine.type === DiffLineType.Context,
-      'diff-hunk': diffLine.type === DiffLineType.Hunk,
-      'read-only': this.props.readOnly,
-      'diff-line-selected': isIncluded,
-      'diff-line-hover': hover,
-      'expandable-down':
-        shouldEnableDiffExpansion &&
-        hunk.expansionType === DiffHunkExpansionType.Down,
-      'expandable-up':
-        shouldEnableDiffExpansion &&
-        hunk.expansionType === DiffHunkExpansionType.Up,
-      'expandable-both':
-        shouldEnableDiffExpansion &&
-        hunk.expansionType === DiffHunkExpansionType.Both,
-      'expandable-short':
-        shouldEnableDiffExpansion &&
-        hunk.expansionType === DiffHunkExpansionType.Short,
-      includeable: isIncludeable && !this.props.readOnly,
-    }
-  }
-
-  private createGutterMarker(
-    index: number,
-    hunks: ReadonlyArray<DiffHunk>,
-    hunk: DiffHunk,
-    diffLine: DiffLine,
-    digitCount: number
-  ) {
-    const diffSize = getLineWidthFromDigitCount(digitCount)
-
-    const marker = document.createElement('div')
-    marker.style.width = `${diffSize * 2}px`
-    marker.style.margin = '0px'
-    marker.className = 'diff-line-gutter'
-
-    marker.addEventListener(
-      'mousedown',
-      this.onDiffLineGutterMouseDown.bind(this, index)
-    )
-
-    const oldLineNumber = document.createElement('div')
-    oldLineNumber.classList.add('diff-line-number', 'before')
-    oldLineNumber.style.width = `${diffSize}px`
-    marker.appendChild(oldLineNumber)
-
-    const newLineNumber = document.createElement('div')
-    newLineNumber.classList.add('diff-line-number', 'after')
-    newLineNumber.style.width = `${diffSize}px`
-    marker.appendChild(newLineNumber)
-
-    const hunkHandle = document.createElement('div')
-    hunkHandle.addEventListener('mouseenter', this.onHunkHandleMouseEnter)
-    hunkHandle.addEventListener('mouseleave', this.onHunkHandleMouseLeave)
-    hunkHandle.addEventListener('mousedown', this.onHunkHandleMouseDown)
-    hunkHandle.classList.add('hunk-handle')
-    marker.appendChild(hunkHandle)
-
-    if (this.canExpandDiff()) {
-      const hunkExpandUpHandle = document.createElement('div')
-      hunkExpandUpHandle.classList.add('hunk-expand-up-handle')
-      hunkExpandUpHandle.title = 'Expand Up'
-      hunkExpandUpHandle.addEventListener(
-        'click',
-        this.onHunkExpandHalfHandleMouseDown.bind(this, hunks, hunk, 'up')
-      )
-      marker.appendChild(hunkExpandUpHandle)
-
-      hunkExpandUpHandle.appendChild(
-        createOcticonElement(OcticonSymbol.foldUp, 'hunk-expand-icon')
-      )
-
-      const hunkExpandDownHandle = document.createElement('div')
-      hunkExpandDownHandle.classList.add('hunk-expand-down-handle')
-      hunkExpandDownHandle.title = 'Expand Down'
-      hunkExpandDownHandle.addEventListener(
-        'click',
-        this.onHunkExpandHalfHandleMouseDown.bind(this, hunks, hunk, 'down')
-      )
-      marker.appendChild(hunkExpandDownHandle)
-
-      hunkExpandDownHandle.appendChild(
-        createOcticonElement(OcticonSymbol.foldDown, 'hunk-expand-icon')
-      )
-
-      const hunkExpandWholeHandle = document.createElement('div')
-      hunkExpandWholeHandle.classList.add('hunk-expand-whole-handle')
-      hunkExpandWholeHandle.title = 'Expand whole'
-      hunkExpandWholeHandle.addEventListener(
-        'click',
-        this.onHunkExpandWholeHandleMouseDown.bind(this, hunks, hunk)
-      )
-      marker.appendChild(hunkExpandWholeHandle)
-
-      hunkExpandWholeHandle.appendChild(
-        createOcticonElement(
-          OcticonSymbol.foldDown,
-          'hunk-expand-icon',
-          'hunk-expand-down-icon'
-        )
-      )
-
-      hunkExpandWholeHandle.appendChild(
-        createOcticonElement(
-          OcticonSymbol.foldUp,
-          'hunk-expand-icon',
-          'hunk-expand-up-icon'
-        )
-      )
-
-      hunkExpandWholeHandle.appendChild(
-        createOcticonElement(
-          OcticonSymbol.unfold,
-          'hunk-expand-icon',
-          'hunk-expand-short-icon'
-        )
-      )
-    }
-
-    this.updateGutterMarker(marker, hunk, diffLine)
-
-    return marker
-  }
-
-  private onHunkExpandWholeHandleMouseDown = (
-    hunks: ReadonlyArray<DiffHunk>,
-    hunk: DiffHunk,
-    ev: MouseEvent
-  ) => {
-    // If the event is prevented that means the hunk handle was
-    // clicked first and prevented the default action so we'll bail.
-    if (ev.defaultPrevented || this.codeMirror === null) {
-      return
-    }
-
-    // We only care about the primary button here, secondary
-    // button clicks are handled by `onContextMenu`
-    if (ev.button !== 0) {
-      return
-    }
-
-    ev.preventDefault()
-
-    // This code is invoked when the user clicks a hunk line gutter that is
-    // not splitted in half, meaning it can only be expanded either up or down
-    // (or the distance between hunks is too short it doesn't matter). It
-    // won't be invoked when the user can choose to expand it up or down.
-    //
-    // With that in mind, in those situations, we'll ALWAYS expand the hunk
-    // up except when it's the last "dummy" hunk we placed to allow expanding
-    // the diff from the bottom. In that case, we'll expand the second-to-last
-    // hunk down.
-    if (
-      hunk.lines.length === 1 &&
-      hunks.length > 1 &&
-      hunk === hunks[hunks.length - 1]
-    ) {
-      const previousHunk = hunks[hunks.length - 2]
-      this.expandHunk(previousHunk, 'down')
-    } else {
-      this.expandHunk(hunk, 'up')
-    }
-  }
-
-  private onHunkExpandHalfHandleMouseDown = (
-    hunks: ReadonlyArray<DiffHunk>,
-    hunk: DiffHunk,
-    kind: DiffExpansionKind,
-    ev: MouseEvent
-  ) => {
-    if (!this.codeMirror) {
-      return
-    }
-
-    // We only care about the primary button here, secondary
-    // button clicks are handled by `onContextMenu`
-    if (ev.button !== 0) {
-      return
-    }
-
-    ev.preventDefault()
-
-    // This code is run when the user clicks on a hunk header line gutter that
-    // is split in two, meaning you can expand up or down the gap the line is
-    // located.
-    // Expanding it up will basically expand *up* the hunk to which that line
-    // belongs, as expected.
-    // Expanding that gap down, however, will expand *down* the hunk that is
-    // located right above this one.
-    if (kind === 'down') {
-      const hunkIndex = hunks.indexOf(hunk)
-      if (hunkIndex > 0) {
-        const previousHunk = hunks[hunkIndex - 1]
-        this.expandHunk(previousHunk, 'down')
-      }
-    } else {
-      this.expandHunk(hunk, 'up')
-    }
-  }
-
-  private updateGutterMarker(
-    marker: HTMLElement,
-    hunk: DiffHunk,
-    diffLine: DiffLine
-  ) {
-    const classNameInfo = this.getGutterLineClassNameInfo(hunk, diffLine)
-    for (const [className, include] of Object.entries(classNameInfo)) {
-      if (include) {
-        marker.classList.add(className)
-      } else {
-        marker.classList.remove(className)
-      }
-    }
-
-    const hunkExpandWholeHandle = marker.getElementsByClassName(
-      'hunk-expand-whole-handle'
-    )[0]
-    if (hunkExpandWholeHandle !== undefined) {
-      if (classNameInfo['expandable-short'] === true) {
-        hunkExpandWholeHandle.setAttribute('title', 'Expand All')
-      } else if (classNameInfo['expandable-both'] !== true) {
-        if (classNameInfo['expandable-down']) {
-          hunkExpandWholeHandle.setAttribute('title', 'Expand Down')
-        } else {
-          hunkExpandWholeHandle.setAttribute('title', 'Expand Up')
-        }
-      }
-    }
-
-    const isIncludeableLine =
-      !this.props.readOnly && diffLine.isIncludeableLine()
-
-    if (diffLine.type === DiffLineType.Hunk || isIncludeableLine) {
-      marker.setAttribute('role', 'button')
-    } else {
-      marker.removeAttribute('role')
-    }
-
-    const [oldLineNumber, newLineNumber] = marker.childNodes
-    oldLineNumber.textContent = `${diffLine.oldLineNumber ?? ''}`
-    newLineNumber.textContent = `${diffLine.newLineNumber ?? ''}`
-  }
-
-  private onHunkHandleMouseEnter = (ev: MouseEvent) => {
-    if (
-      this.codeMirror === null ||
-      this.props.readOnly ||
-      (this.selection !== null && this.selection.kind === 'range')
-    ) {
-      return
-    }
-    const lineNumber = this.codeMirror.lineAtHeight(ev.y)
-    const hunks = this.state.diff.hunks
-    const diffLine = diffLineForIndex(hunks, lineNumber)
-
-    if (!diffLine || !diffLine.isIncludeableLine()) {
-      return
-    }
-
-    const range = findInteractiveOriginalDiffRange(hunks, lineNumber)
-
-    if (range === null) {
-      return
-    }
-
-    const { from, to } = range
-
-    this.hunkHighlightRange = { from, to, kind: 'hunk', isSelected: false }
-    this.updateViewport()
-  }
-
-  private updateViewport() {
-    if (this.codeMirror) {
-      const { from, to } = this.codeMirror.getViewport()
-      this.onViewportChange(this.codeMirror, from, to)
-    }
-  }
-
-  private onDiffLineGutterMouseDown = (index: number, ev: MouseEvent) => {
-    // If the event is prevented that means the hunk handle was
-    // clicked first and prevented the default action so we'll bail.
-    if (ev.defaultPrevented || this.codeMirror === null) {
-      return
-    }
-
-    // We only care about the primary button here, secondary
-    // button clicks are handled by `onContextMenu`
-    if (ev.button !== 0) {
-      return
-    }
-
-    const { file, readOnly } = this.props
-    const diff = this.state.diff
-
-    if (!canSelect(file) || readOnly) {
-      return
-    }
-
-    ev.preventDefault()
-
-    this.startSelection(file, diff.hunks, index, 'range')
-  }
-
-  private onHunkHandleMouseLeave = (ev: MouseEvent) => {
-    if (this.hunkHighlightRange !== null) {
-      this.hunkHighlightRange = null
-      this.updateViewport()
-    }
-  }
-
-  private onHunkHandleMouseDown = (ev: MouseEvent) => {
-    if (!this.codeMirror) {
-      return
-    }
-
-    // We only care about the primary button here, secondary
-    // button clicks are handled by `onContextMenu`
-    if (ev.button !== 0) {
-      return
-    }
-
-    const { file, readOnly } = this.props
-    const diff = this.state.diff
-
-    if (!canSelect(file) || readOnly) {
-      return
-    }
-
-    ev.preventDefault()
-
-    const lineNumber = this.codeMirror.lineAtHeight(ev.y)
-    this.startSelection(file, diff.hunks, lineNumber, 'hunk')
-  }
-
-  public componentWillUnmount() {
-    this.cancelSelection()
-    this.unmountWhitespaceHint()
-    this.codeMirror = null
-    document.removeEventListener('find-text', this.onFindText)
-  }
-
-  private mountWhitespaceHint(index: number) {
-    this.unmountWhitespaceHint()
-
-    // Since we're in a bit of a weird state here where CodeMirror is mounted
-    // through React and we're in turn mounting a React component from a
-    // DOM event we want to make sure we're not mounting the Popover
-    // synchronously. Doing so will cause the popover to receiving the bubbling
-    // mousedown event (on document) which caused it to be mounted in the first
-    // place and it will then close itself thinking that it's seen a mousedown
-    // event outside of its container.
-    this.whitespaceHintMountId = requestAnimationFrame(() => {
-      this.whitespaceHintMountId = null
-      const cm = this.codeMirror
-
-      if (cm === null) {
-        return
-      }
-
-      const container = document.createElement('div')
-      container.style.position = 'absolute'
-      const scroller = cm.getScrollerElement()
-
-      const diffSize = getLineWidthFromDigitCount(
-        getNumberOfDigits(this.state.diff.maxLineNumber)
-      )
-
-      const lineY = cm.heightAtLine(index, 'local')
-      // We're positioning relative to the scroll container, not the
-      // sizer or lines so we'll have to account for the gutter width and
-      // the hunk handle.
-      const style: React.CSSProperties = { left: diffSize * 2 + 10 }
-      let caretPosition = PopoverCaretPosition.LeftTop
-
-      // Offset down by 10px to align the popover arrow.
-      container.style.top = `${lineY - 10}px`
-
-      // If the line is further than 50% down the viewport we'll flip the
-      // popover to point upwards so as to not get hidden beneath (or above)
-      // the scroll boundary.
-      if (lineY - scroller.scrollTop > scroller.clientHeight / 2) {
-        caretPosition = PopoverCaretPosition.LeftBottom
-        style.bottom = -35
-      }
-
-      scroller.appendChild(container)
-      this.whitespaceHintContainer = container
-
-      ReactDOM.render(
-        <WhitespaceHintPopover
-          caretPosition={caretPosition}
-          onDismissed={this.unmountWhitespaceHint}
-          onHideWhitespaceInDiffChanged={
-            this.props.onHideWhitespaceInDiffChanged
-          }
-          style={style}
-        />,
-        container
-      )
-    })
-  }
-
-  private unmountWhitespaceHint = () => {
-    if (this.whitespaceHintMountId !== null) {
-      cancelAnimationFrame(this.whitespaceHintMountId)
-      this.whitespaceHintMountId = null
-    }
-
-    // Note that unmountComponentAtNode may cause a reentrant call to this
-    // method by means of the Popover onDismissed callback. This is why we can't
-    // trust that whitespaceHintContainer remains non-null after this.
-    if (this.whitespaceHintContainer !== null) {
-      ReactDOM.unmountComponentAtNode(this.whitespaceHintContainer)
-    }
-
-    if (this.whitespaceHintContainer !== null) {
-      this.whitespaceHintContainer.remove()
-      this.whitespaceHintContainer = null
-    }
-  }
-
-  // eslint-disable-next-line react-proper-lifecycle-methods
-  public componentDidUpdate(
-    prevProps: ITextDiffProps,
-    prevState: ITextDiffState,
-    snapshot: CodeMirror.ScrollInfo | null
-  ) {
-    if (this.codeMirror === null) {
-      return
-    }
-
-    if (!isSameFileContents(this.props.fileContents, prevProps.fileContents)) {
-      this.initDiffSyntaxMode()
-    }
-
-    if (canSelect(this.props.file)) {
-      if (
-        !canSelect(prevProps.file) ||
-        this.props.file.selection !== prevProps.file.selection
-      ) {
-        // If the text has changed the gutters will be recreated
-        // regardless but if it hasn't then we'll need to update
-        // the viewport.
-        if (this.props.diff.text === prevProps.diff.text) {
-          this.updateViewport()
-        }
-      }
-    }
-
-    if (this.props.diff.text !== prevProps.diff.text) {
-      this.diffToRestore = null
-      this.setState({
-        diff: this.props.diff,
-      })
-    }
-
-    if (snapshot !== null) {
-      this.codeMirror.scrollTo(undefined, snapshot.top)
-    }
-
-    // Scroll to top if we switched to a new file
-    if (this.props.file.id !== prevProps.file.id) {
-      this.codeMirror.scrollTo(undefined, 0)
-    }
-  }
-
-  public getSnapshotBeforeUpdate(
-    prevProps: ITextDiffProps,
-    prevState: ITextDiffState
-  ) {
-    // Store the scroll position when the file stays the same
-    // but we probably swapped out the document
-    if (
-      this.codeMirror !== null &&
-      ((this.props.file !== prevProps.file &&
-        this.props.file.id === prevProps.file.id &&
-        this.props.diff.text !== prevProps.diff.text) ||
-        this.state.diff.text !== prevState.diff.text)
-    ) {
-      return this.codeMirror.getScrollInfo()
-    }
-    return null
-  }
-
-  public componentDidMount() {
-    // Listen for the custom event find-text (see app.tsx)
-    // and trigger the search plugin if we see it.
-    document.addEventListener('find-text', this.onFindText)
-  }
-
-  private onFindText = (ev: Event) => {
-    if (!ev.defaultPrevented && this.codeMirror) {
-      ev.preventDefault()
-      showSearch(this.codeMirror)
-    }
-  }
-
-  public render() {
-    const { diff } = this.state
-    const doc = this.getCodeMirrorDocument(
-      diff.text,
-      this.getNoNewlineIndicatorLines(this.state.diff.hunks)
-    )
-
-    return (
-      <>
-        {diff.hasHiddenBidiChars && <HiddenBidiCharsWarning />}
-        <CodeMirrorHost
-          className="diff-code-mirror"
-          value={doc}
-          options={defaultEditorOptions}
-          isSelectionEnabled={this.isSelectionEnabled}
-          onSwapDoc={this.onSwapDoc}
-          onAfterSwapDoc={this.onAfterSwapDoc}
-          onViewportChange={this.onViewportChange}
-          ref={this.getAndStoreCodeMirrorInstance}
-          onContextMenu={this.onContextMenu}
-          onCopy={this.onCopy}
-        />
-      </>
-    )
-  }
-}
-
-function isSameFileContents(x: IFileContents | null, y: IFileContents | null) {
-  return x?.newContents === y?.newContents && x?.oldContents === y?.oldContents
-}
diff --git a/app/src/ui/diff/whitespace-hint-popover.tsx b/app/src/ui/diff/whitespace-hint-popover.tsx
index e07532941d2..b9d1d65c7ca 100644
--- a/app/src/ui/diff/whitespace-hint-popover.tsx
+++ b/app/src/ui/diff/whitespace-hint-popover.tsx
@@ -1,31 +1,35 @@
 import * as React from 'react'
 import {
   Popover,
-  PopoverCaretPosition,
+  PopoverAnchorPosition,
   PopoverAppearEffect,
+  PopoverDecoration,
 } from '../lib/popover'
 import { OkCancelButtonGroup } from '../dialog'
 
 interface IWhitespaceHintPopoverProps {
-  readonly caretPosition: PopoverCaretPosition
+  readonly anchor: HTMLElement | null
+  readonly anchorPosition: PopoverAnchorPosition
   /** Called when the user changes the hide whitespace in diffs setting. */
   readonly onHideWhitespaceInDiffChanged: (checked: boolean) => void
   readonly onDismissed: () => void
-  readonly style: React.CSSProperties
 }
 
 export class WhitespaceHintPopover extends React.Component<IWhitespaceHintPopoverProps> {
   public render() {
     return (
       <Popover
-        caretPosition={this.props.caretPosition}
-        onClickOutside={this.onDismissed}
+        anchor={this.props.anchor}
+        anchorPosition={this.props.anchorPosition}
+        decoration={PopoverDecoration.Balloon}
+        onMousedownOutside={this.onDismissed}
         className={'whitespace-hint'}
-        style={this.props.style}
         appearEffect={PopoverAppearEffect.Shake}
+        ariaLabelledby="whitespace-hint-header"
+        ariaDescribedBy="whitespace-hint-message"
       >
-        <h3>Show whitespace changes?</h3>
-        <p className="byline">
+        <h3 id="whitespace-hint-header">Show whitespace changes?</h3>
+        <p id="whitespace-hint-message" className="byline">
           Selecting lines is disabled when hiding whitespace changes.
         </p>
         <footer>
diff --git a/app/src/ui/discard-changes/discard-changes-dialog.tsx b/app/src/ui/discard-changes/discard-changes-dialog.tsx
index f174255bc56..533389dfd98 100644
--- a/app/src/ui/discard-changes/discard-changes-dialog.tsx
+++ b/app/src/ui/discard-changes/discard-changes-dialog.tsx
@@ -80,14 +80,16 @@ export class DiscardChanges extends React.Component<
         title={this.getDialogTitle()}
         onDismissed={this.props.onDismissed}
         onSubmit={this.discard}
-        dismissable={isDiscardingChanges ? false : true}
+        dismissDisabled={isDiscardingChanges}
         loading={isDiscardingChanges}
         disabled={isDiscardingChanges}
         type="warning"
+        role="alertdialog"
+        ariaDescribedBy="discard-changes-confirmation-file-list discard-changes-confirmation-message"
       >
         <DialogContent>
           {this.renderFileList()}
-          <p>
+          <p id="discard-changes-confirmation-message">
             Changes can be restored by retrieving them from the {TrashNameLabel}
             .
           </p>
@@ -98,6 +100,8 @@ export class DiscardChanges extends React.Component<
           <OkCancelButtonGroup
             destructive={true}
             okButtonText={this.getOkButtonLabel()}
+            okButtonDisabled={isDiscardingChanges}
+            cancelButtonDisabled={isDiscardingChanges}
           />
         </DialogFooter>
       </Dialog>
@@ -128,14 +132,14 @@ export class DiscardChanges extends React.Component<
   private renderFileList() {
     if (this.props.files.length > MaxFilesToList) {
       return (
-        <p>
+        <p id="discard-changes-confirmation-file-list">
           Are you sure you want to discard all {this.props.files.length} changed
           files?
         </p>
       )
     } else {
       return (
-        <div>
+        <div id="discard-changes-confirmation-file-list">
           <p>Are you sure you want to discard all changes to:</p>
           <div className="file-list">
             <ul>
diff --git a/app/src/ui/discard-changes/discard-changes-retry-dialog.tsx b/app/src/ui/discard-changes/discard-changes-retry-dialog.tsx
index 875832c94e0..c72284f5d8f 100644
--- a/app/src/ui/discard-changes/discard-changes-retry-dialog.tsx
+++ b/app/src/ui/discard-changes/discard-changes-retry-dialog.tsx
@@ -32,7 +32,11 @@ export class DiscardChangesRetryDialog extends React.Component<
 
     return (
       <Dialog
-        title="Error"
+        title={
+          __DARWIN__
+            ? 'Discarded Changes Will Be Unrecoverable'
+            : 'Discarded changes will be unrecoverable'
+        }
         id="discard-changes-retry"
         loading={retrying}
         disabled={retrying}
diff --git a/app/src/ui/discard-changes/discard-selection-dialog.tsx b/app/src/ui/discard-changes/discard-selection-dialog.tsx
index 67f3e163233..2b7770555ab 100644
--- a/app/src/ui/discard-changes/discard-selection-dialog.tsx
+++ b/app/src/ui/discard-changes/discard-selection-dialog.tsx
@@ -73,7 +73,7 @@ export class DiscardSelection extends React.Component<
         }
         onDismissed={this.props.onDismissed}
         onSubmit={this.discard}
-        dismissable={isDiscardingChanges ? false : true}
+        dismissDisabled={isDiscardingChanges}
         loading={isDiscardingChanges}
         disabled={isDiscardingChanges}
         type="warning"
@@ -102,6 +102,8 @@ export class DiscardSelection extends React.Component<
           <OkCancelButtonGroup
             destructive={true}
             okButtonText={this.getOkButtonLabel()}
+            okButtonDisabled={isDiscardingChanges}
+            cancelButtonDisabled={isDiscardingChanges}
           />
         </DialogFooter>
       </Dialog>
diff --git a/app/src/ui/dispatcher/dispatcher.ts b/app/src/ui/dispatcher/dispatcher.ts
index dfa8a158139..a48001dbbc7 100644
--- a/app/src/ui/dispatcher/dispatcher.ts
+++ b/app/src/ui/dispatcher/dispatcher.ts
@@ -5,6 +5,8 @@ import {
   IAPIPullRequest,
   IAPIFullRepository,
   IAPICheckSuite,
+  IAPIRepoRuleset,
+  getDotComAPIEndpoint,
 } from '../../lib/api'
 import { shell } from '../../lib/app-shell'
 import {
@@ -34,11 +36,6 @@ import {
   getRepositoryType,
 } from '../../lib/git'
 import { isGitOnPath } from '../../lib/is-git-on-path'
-import {
-  rejectOAuthRequest,
-  requestAuthenticatedUser,
-  resolveOAuthRequest,
-} from '../../lib/oauth'
 import {
   IOpenRepositoryFromURLAction,
   IUnknownAction,
@@ -56,7 +53,7 @@ import { getTipSha } from '../../lib/tip'
 
 import { Account } from '../../models/account'
 import { AppMenu, ExecutableMenuItem } from '../../models/app-menu'
-import { IAuthor } from '../../models/author'
+import { Author, UnknownAuthor } from '../../models/author'
 import { Branch, IAheadBehind } from '../../models/branch'
 import { BranchesTab } from '../../models/branches-tab'
 import { CloneRepositoryTab } from '../../models/clone-repository-tab'
@@ -68,7 +65,10 @@ import { FetchType } from '../../models/fetch'
 import { GitHubRepository } from '../../models/github-repository'
 import { ManualConflictResolution } from '../../models/manual-conflict-resolution'
 import { Popup, PopupType } from '../../models/popup'
-import { PullRequest } from '../../models/pull-request'
+import {
+  PullRequest,
+  PullRequestSuggestedNextAction,
+} from '../../models/pull-request'
 import {
   Repository,
   RepositoryWithGitHubRepository,
@@ -86,7 +86,7 @@ import {
 import { TipState, IValidBranch } from '../../models/tip'
 import { Banner, BannerType } from '../../models/banner'
 
-import { ApplicationTheme, ICustomTheme } from '../lib/application-theme'
+import { ApplicationTheme } from '../lib/application-theme'
 import { installCLI } from '../lib/install-cli'
 import {
   executeMenuItem,
@@ -106,7 +106,6 @@ import { resolveWithin } from '../../lib/path'
 import { CherryPickResult } from '../../lib/git/cherry-pick'
 import { sleep } from '../../lib/promise'
 import { DragElement, DragType } from '../../models/drag-drop'
-import { findDefaultUpstreamBranch } from '../../lib/branch'
 import { ILastThankYou } from '../../models/last-thank-you'
 import { dragAndDropManager } from '../../lib/drag-and-drop-manager'
 import {
@@ -119,7 +118,12 @@ import {
 import { getMultiCommitOperationChooseBranchStep } from '../../lib/multi-commit-operation'
 import { ICombinedRefCheck, IRefCheck } from '../../lib/ci-checks/ci-checks'
 import { ValidNotificationPullRequestReviewState } from '../../lib/valid-notification-pull-request-review'
-import { enableReRunFailedAndSingleCheckJobs } from '../../lib/feature-flag'
+import { UnreachableCommitsTab } from '../history/unreachable-commits-dialog'
+import { sendNonFatalException } from '../../lib/helpers/non-fatal-exception'
+import { SignInResult } from '../../lib/stores/sign-in-store'
+import { ICustomIntegration } from '../../lib/custom-integration'
+import { isAbsolute } from 'path'
+import { CLIAction } from '../../lib/cli-action'
 
 /**
  * An error handler function.
@@ -138,13 +142,16 @@ export type ErrorHandler = (
  */
 export class Dispatcher {
   private readonly errorHandlers = new Array<ErrorHandler>()
+  public incrementMetric: StatsStore['increment']
 
   public constructor(
     private readonly appStore: AppStore,
     private readonly repositoryStateManager: RepositoryStateCache,
     private readonly statsStore: StatsStore,
     private readonly commitStatusStore: CommitStatusStore
-  ) {}
+  ) {
+    this.incrementMetric = statsStore.increment.bind(statsStore)
+  }
 
   /** Load the initial state for the app. */
   public loadInitialState(): Promise<void> {
@@ -237,10 +244,18 @@ export class Dispatcher {
     repository: Repository,
     shas: ReadonlyArray<string>,
     isContiguous: boolean
-  ): Promise<void> {
+  ): void {
     return this.appStore._changeCommitSelection(repository, shas, isContiguous)
   }
 
+  /** Update the shas that should be highlighted */
+  public updateShasToHighlight(
+    repository: Repository,
+    shasToHighlight: ReadonlyArray<string>
+  ) {
+    this.appStore._updateShasToHighlight(repository, shasToHighlight)
+  }
+
   /**
    * Change the selected changed file in the history view.
    *
@@ -377,6 +392,13 @@ export class Dispatcher {
     return this.appStore._closePopup(popupType)
   }
 
+  /**
+   * Close the popup with given id.
+   */
+  public closePopupById(popupId: string) {
+    return this.appStore._closePopupById(popupId)
+  }
+
   /** Show the foldout. This will close any current popup. */
   public showFoldout(foldout: Foldout): Promise<void> {
     return this.appStore._showFoldout(foldout)
@@ -677,6 +699,14 @@ export class Dispatcher {
     return this.appStore._checkoutBranch(repository, branch, strategy)
   }
 
+  /** Check out the given commit. */
+  public checkoutCommit(
+    repository: Repository,
+    commit: CommitOneLine
+  ): Promise<Repository> {
+    return this.appStore._checkoutCommit(repository, commit)
+  }
+
   /** Push the current branch. */
   public push(repository: Repository): Promise<void> {
     return this.appStore._push(repository)
@@ -758,11 +788,6 @@ export class Dispatcher {
     return this.appStore._pushError(error)
   }
 
-  /** Clear the given error. */
-  public clearError(error: Error): Promise<void> {
-    return this.appStore._clearError(error)
-  }
-
   /**
    * Clone a missing repository to the previous path, and update it's
    * state in the repository list if the clone completes without error.
@@ -876,35 +901,17 @@ export class Dispatcher {
     isLocalCommit: boolean,
     continueWithForcePush: boolean = false
   ) {
-    const repositoryState = this.repositoryStateManager.get(repository)
-    const { tip } = repositoryState.branchesState
-    const { askForConfirmationOnForcePush } = this.appStore.getState()
-
-    if (
-      askForConfirmationOnForcePush &&
-      !continueWithForcePush &&
-      !isLocalCommit &&
-      tip.kind === TipState.Valid
-    ) {
-      return this.showPopup({
-        type: PopupType.WarnForcePush,
-        operation: 'Amend',
-        onBegin: () => {
-          this.startAmendingRepository(repository, commit, isLocalCommit, true)
-        },
-      })
-    }
-
-    await this.changeRepositorySection(repository, RepositorySectionTab.Changes)
-
-    this.appStore._setRepositoryCommitToAmend(repository, commit)
-
-    this.statsStore.recordAmendCommitStarted()
+    this.appStore._startAmendingRepository(
+      repository,
+      commit,
+      isLocalCommit,
+      continueWithForcePush
+    )
   }
 
   /** Stop amending the most recent commit. */
   public async stopAmendingRepository(repository: Repository) {
-    this.appStore._setRepositoryCommitToAmend(repository, null)
+    this.appStore._stopAmendingRepository(repository)
   }
 
   /** Undo the given commit. */
@@ -922,7 +929,7 @@ export class Dispatcher {
     commit: Commit,
     showConfirmationDialog: boolean = true
   ): Promise<void> {
-    this.statsStore.recordResetToCommitCount()
+    this.statsStore.increment('resetToCommitCount')
     return this.appStore._resetToCommit(
       repository,
       commit,
@@ -946,6 +953,41 @@ export class Dispatcher {
     return this.appStore._setSidebarWidth(width)
   }
 
+  /**
+   * Set the width of the Branch toolbar button to the given value.
+   * This affects the toolbar button and its dropdown element.
+   *
+   * @param width The value for the width of Branch button
+   */
+  public setBranchDropdownWidth(width: number): Promise<void> {
+    return this.appStore._setBranchDropdownWidth(width)
+  }
+
+  /**
+   * Reset the width of the Branch toolbar button to its default value.
+   */
+  public resetBranchDropdownWidth(): Promise<void> {
+    return this.appStore._resetBranchDropdownWidth()
+  }
+
+  /**
+   * Set the width of the Push/Push toolbar button to the given value.
+   * This affects the toolbar button and its dropdown element.
+   *
+   * @param width The value for the width of Push/Pull button
+   */
+  public setPushPullButtonWidth(width: number): Promise<void> {
+    return this.appStore._setPushPullButtonWidth(width)
+  }
+
+  /**
+   * Reset the width of the Push/Pull toolbar button to its default
+   * value.
+   */
+  public resetPushPullButtonWidth(): Promise<void> {
+    return this.appStore._resetPushPullButtonWidth()
+  }
+
   /**
    * Set the update banner's visibility
    */
@@ -1190,6 +1232,31 @@ export class Dispatcher {
         baseBranch.name,
         targetBranch.name
       )
+    } else if (result === RebaseResult.AlreadyUpToDate) {
+      if (tip.kind !== TipState.Valid) {
+        log.warn(
+          `[rebase] tip after already up to date is ${tip.kind} but this should be a valid tip if the rebase completed without error`
+        )
+        return
+      }
+
+      const { operationDetail } = multiCommitOperationState
+      const { sourceBranch } = operationDetail
+
+      const ourBranch = targetBranch !== null ? targetBranch.name : ''
+      const theirBranch = sourceBranch !== null ? sourceBranch.name : ''
+
+      const banner: Banner = {
+        type: BannerType.BranchAlreadyUpToDate,
+        ourBranch,
+        theirBranch,
+      }
+
+      this.statsStore.increment('rebaseWithBranchAlreadyUpToDateCount')
+
+      this.setBanner(banner)
+      this.endMultiCommitOperation(repository)
+      await this.refreshRepository(repository)
     } else if (result === RebaseResult.CompletedWithoutError) {
       if (tip.kind !== TipState.Valid) {
         log.warn(
@@ -1198,7 +1265,7 @@ export class Dispatcher {
         return
       }
 
-      this.statsStore.recordRebaseSuccessWithoutConflicts()
+      this.statsStore.increment('rebaseSuccessWithoutConflictsCount')
       await this.completeMultiCommitOperation(repository, commits.length)
     } else if (result === RebaseResult.Error) {
       // we were unable to successfully start the rebase, and an error should
@@ -1238,6 +1305,11 @@ export class Dispatcher {
       manualResolutions
     )
 
+    // At this point, given continueRebase was invoked, we can assume that the
+    // rebase encountered some conflicts and they have been resolved. Getting
+    // now a CompletedWithoutError result means that the rebase has completed
+    // successfully and there aren't more conflicts to resolve, therefore we can
+    // track this as a successful rebase with conflicts.
     if (result === RebaseResult.CompletedWithoutError) {
       this.statsStore.recordOperationSuccessfulWithConflicts(kind)
     }
@@ -1302,8 +1374,8 @@ export class Dispatcher {
         // app-store._mergeBranch because it only records there when there are
         // no conflicts. Thus, recordSquashMergeSuccessful is done here in order
         // to capture all successful squash merges under this metric.
-        this.statsStore.recordSquashMergeSuccessful()
-        this.statsStore.recordSquashMergeSuccessfulWithConflicts()
+        this.statsStore.increment('squashMergeSuccessfulCount')
+        this.statsStore.increment('squashMergeSuccessfulWithConflictsCount')
       }
     }
   }
@@ -1393,6 +1465,12 @@ export class Dispatcher {
     return this.appStore.setStatsOptOut(optOut, userViewedPrompt)
   }
 
+  public setUseExternalCredentialHelper(useExternalCredentialHelper: boolean) {
+    return this.appStore._setUseExternalCredentialHelper(
+      useExternalCredentialHelper
+    )
+  }
+
   /** Moves the app to the /Applications folder on macOS. */
   public moveToApplicationsFolder() {
     return moveToApplicationsFolder()
@@ -1402,25 +1480,19 @@ export class Dispatcher {
    * Clear any in-flight sign in state and return to the
    * initial (no sign-in) state.
    */
-  public resetSignInState(): Promise<void> {
+  public resetSignInState() {
     return this.appStore._resetSignInState()
   }
 
-  /**
-   * Initiate a sign in flow for github.com. This will put the store
-   * in the Authentication step ready to receive user credentials.
-   */
-  public beginDotComSignIn(): Promise<void> {
-    return this.appStore._beginDotComSignIn()
-  }
-
   /**
    * Initiate a sign in flow for a GitHub Enterprise instance. This will
    * put the store in the EndpointEntry step ready to receive the url
    * to the enterprise instance.
    */
-  public beginEnterpriseSignIn(): Promise<void> {
-    return this.appStore._beginEnterpriseSignIn()
+  public beginEnterpriseSignIn(
+    resultCallback?: (result: SignInResult) => void
+  ) {
+    this.appStore._beginEnterpriseSignIn(resultCallback)
   }
 
   /**
@@ -1440,23 +1512,27 @@ export class Dispatcher {
     return this.appStore._setSignInEndpoint(url)
   }
 
-  /**
-   * Attempt to advance from the authentication step using a username
-   * and password. This method must only be called when the store is
-   * in the authentication step or an error will be thrown. If the
-   * provided credentials are valid the store will either advance to
-   * the Success step or to the TwoFactorAuthentication step if the
-   * user has enabled two factor authentication.
-   *
-   * If an error occurs during sign in (such as invalid credentials)
-   * the authentication state will be updated with that error so that
-   * the responsible component can present it to the user.
-   */
-  public setSignInCredentials(
-    username: string,
-    password: string
-  ): Promise<void> {
-    return this.appStore._setSignInCredentials(username, password)
+  public beginDotComSignIn(resultCallback: (result: SignInResult) => void) {
+    this.appStore._beginDotComSignIn(resultCallback)
+  }
+
+  public beginBrowserBasedSignIn(
+    endpoint: string,
+    resultCallback?: (result: SignInResult) => void
+  ) {
+    if (
+      endpoint === getDotComAPIEndpoint() ||
+      new URL(endpoint).hostname === 'github.com'
+    ) {
+      this.appStore._beginDotComSignIn(resultCallback)
+      this.requestBrowserAuthentication()
+    } else {
+      this.appStore._beginEnterpriseSignIn(resultCallback)
+      this.appStore
+        ._setSignInEndpoint(endpoint)
+        .then(() => this.requestBrowserAuthentication())
+        .catch(e => log.error(`Error setting sign in endpoint`, e))
+    }
   }
 
   /**
@@ -1470,8 +1546,8 @@ export class Dispatcher {
    * protocol handler to execute or by providing the wrong credentials
    * this promise will never complete.
    */
-  public requestBrowserAuthentication(): Promise<void> {
-    return this.appStore._requestBrowserAuthentication()
+  public requestBrowserAuthentication() {
+    this.appStore._requestBrowserAuthentication()
   }
 
   /**
@@ -1483,34 +1559,22 @@ export class Dispatcher {
    * protocol handler to execute or by providing the wrong credentials
    * this promise will never complete.
    */
-  public async requestBrowserAuthenticationToDotcom(): Promise<void> {
-    await this.beginDotComSignIn()
-    return this.requestBrowserAuthentication()
-  }
-
-  /**
-   * Attempt to complete the sign in flow with the given OTP token.\
-   * This method must only be called when the store is in the
-   * TwoFactorAuthentication step or an error will be thrown.
-   *
-   * If the provided token is valid the store will advance to
-   * the Success step.
-   *
-   * If an error occurs during sign in (such as invalid credentials)
-   * the authentication state will be updated with that error so that
-   * the responsible component can present it to the user.
-   */
-  public setSignInOTP(otp: string): Promise<void> {
-    return this.appStore._setSignInOTP(otp)
+  public requestBrowserAuthenticationToDotcom(
+    resultCallback?: (result: SignInResult) => void
+  ) {
+    this.appStore._beginDotComSignIn(resultCallback)
+    this.requestBrowserAuthentication()
   }
 
   /**
    * Launch a sign in dialog for authenticating a user with
    * GitHub.com.
    */
-  public async showDotComSignInDialog(): Promise<void> {
-    await this.appStore._beginDotComSignIn()
-    await this.appStore._showPopup({ type: PopupType.SignIn })
+  public async showDotComSignInDialog(
+    resultCallback?: (result: SignInResult) => void
+  ): Promise<void> {
+    this.appStore._beginDotComSignIn(resultCallback)
+    this.appStore._showPopup({ type: PopupType.SignIn })
   }
 
   /**
@@ -1518,14 +1582,17 @@ export class Dispatcher {
    * a GitHub Enterprise instance.
    * Optionally, you can provide an endpoint URL.
    */
-  public async showEnterpriseSignInDialog(endpoint?: string): Promise<void> {
-    await this.appStore._beginEnterpriseSignIn()
+  public async showEnterpriseSignInDialog(
+    endpoint?: string,
+    resultCallback?: (result: SignInResult) => void
+  ): Promise<void> {
+    this.appStore._beginEnterpriseSignIn(resultCallback)
 
     if (endpoint !== undefined) {
-      await this.appStore._setSignInEndpoint(endpoint)
+      this.appStore._setSignInEndpoint(endpoint)
     }
 
-    await this.appStore._showPopup({ type: PopupType.SignIn })
+    this.appStore._showPopup({ type: PopupType.SignIn })
   }
 
   /**
@@ -1538,6 +1605,17 @@ export class Dispatcher {
     await this.appStore._showCreateForkDialog(repository)
   }
 
+  public async showUnknownAuthorsCommitWarning(
+    authors: ReadonlyArray<UnknownAuthor>,
+    onCommitAnyway: () => void
+  ) {
+    return this.appStore._showPopup({
+      type: PopupType.UnknownAuthors,
+      authors,
+      onCommit: onCommitAnyway,
+    })
+  }
+
   /**
    * Register a new error handler.
    *
@@ -1692,6 +1770,11 @@ export class Dispatcher {
     }
 
     if (filepath !== null) {
+      if (isAbsolute(filepath)) {
+        log.error(`Refusing to open absolute path: ${filepath}`)
+        return
+      }
+
       const resolved = await resolveWithin(repository.path, filepath)
 
       if (resolved !== null) {
@@ -1779,20 +1862,43 @@ export class Dispatcher {
     return repository
   }
 
+  public async dispatchCLIAction(action: CLIAction) {
+    if (action.kind === 'clone-url') {
+      const { branch, url } = action
+
+      if (branch) {
+        await this.openBranchNameFromUrl(url, branch)
+      } else {
+        await this.openOrCloneRepository(url)
+      }
+    } else if (action.kind === 'open-repository') {
+      // user may accidentally provide a folder within the repository
+      // this ensures we use the repository root, if it is actually a repository
+      // otherwise we consider it an untracked repository
+      const path = await getRepositoryType(action.path)
+        .then(t =>
+          t.kind === 'regular' ? t.topLevelWorkingDirectory : action.path
+        )
+        .catch(e => {
+          log.error('Could not determine repository type', e)
+          return action.path
+        })
+
+      const { repositories } = this.appStore.getState()
+      const existingRepository = matchExistingRepository(repositories, path)
+
+      if (existingRepository) {
+        await this.selectRepository(existingRepository)
+      } else {
+        await this.showPopup({ type: PopupType.AddRepository, path })
+      }
+    }
+  }
+
   public async dispatchURLAction(action: URLActionType): Promise<void> {
     switch (action.name) {
       case 'oauth':
-        try {
-          log.info(`[Dispatcher] requesting authenticated user`)
-          const user = await requestAuthenticatedUser(action.code, action.state)
-          if (user) {
-            resolveOAuthRequest(user)
-          } else if (user === null) {
-            rejectOAuthRequest(new Error('Unable to fetch authenticated user.'))
-          }
-        } catch (e) {
-          rejectOAuthRequest(e)
-        }
+        await this.appStore._resolveOAuthRequest(action)
 
         if (__DARWIN__) {
           // workaround for user reports that the application doesn't receive focus
@@ -1811,30 +1917,6 @@ export class Dispatcher {
         this.openRepositoryFromUrl(action)
         break
 
-      case 'open-repository-from-path':
-        // user may accidentally provide a folder within the repository
-        // this ensures we use the repository root, if it is actually a repository
-        // otherwise we consider it an untracked repository
-        const path = await getRepositoryType(action.path)
-          .then(t =>
-            t.kind === 'regular' ? t.topLevelWorkingDirectory : action.path
-          )
-          .catch(e => {
-            log.error('Could not determine repository type', e)
-            return action.path
-          })
-
-        const { repositories } = this.appStore.getState()
-        const existingRepository = matchExistingRepository(repositories, path)
-
-        if (existingRepository) {
-          await this.selectRepository(existingRepository)
-          this.statsStore.recordAddExistingRepository()
-        } else {
-          await this.showPopup({ type: PopupType.AddRepository, path })
-        }
-        break
-
       default:
         const unknownAction: IUnknownAction = action
         log.warn(
@@ -1948,12 +2030,29 @@ export class Dispatcher {
     })
   }
 
+  public async openOrAddRepository(path: string): Promise<Repository | null> {
+    const state = this.appStore.getState()
+    const repositories = state.repositories
+    const existingRepository = repositories.find(r => r.path === path)
+
+    if (existingRepository) {
+      return await this.selectRepository(existingRepository)
+    }
+
+    return this.appStore._startOpenInDesktop(() => {
+      this.showPopup({
+        type: PopupType.AddRepository,
+        path,
+      })
+    })
+  }
+
   /**
    * Install the CLI tool.
    *
    * This is used only on macOS.
    */
-  public async installCLI() {
+  public async installDarwinCLI() {
     try {
       await installCLI()
 
@@ -1965,14 +2064,6 @@ export class Dispatcher {
     }
   }
 
-  /** Prompt the user to authenticate for a generic git server. */
-  public promptForGenericGitAuthentication(
-    repository: Repository | CloningRepository,
-    retry: RetryAction
-  ): Promise<void> {
-    return this.appStore.promptForGenericGitAuthentication(repository, retry)
-  }
-
   /** Save the generic git credentials. */
   public async saveGenericGitCredentials(
     hostname: string,
@@ -2098,6 +2189,19 @@ export class Dispatcher {
     )
   }
 
+  /** Change the hide whitespace in pull request diff setting */
+  public onHideWhitespaceInPullRequestDiffChanged(
+    hideWhitespaceInDiff: boolean,
+    repository: Repository,
+    file: CommittedFileChange | null = null
+  ) {
+    this.appStore._setHideWhitespaceInPullRequestDiff(
+      hideWhitespaceInDiff,
+      repository,
+      file
+    )
+  }
+
   /** Change the side by side diff setting */
   public onShowSideBySideDiffChanged(showSideBySideDiff: boolean) {
     return this.appStore._setShowSideBySideDiff(showSideBySideDiff)
@@ -2151,8 +2255,11 @@ export class Dispatcher {
    * openCreatePullRequestInBrowser method which immediately opens the
    * create pull request page without showing a dialog.
    */
-  public createPullRequest(repository: Repository): Promise<void> {
-    return this.appStore._createPullRequest(repository)
+  public createPullRequest(
+    repository: Repository,
+    baseBranch?: Branch
+  ): Promise<void> {
+    return this.appStore._createPullRequest(repository, baseBranch)
   }
 
   /**
@@ -2232,7 +2339,7 @@ export class Dispatcher {
    */
   public setCoAuthors(
     repository: Repository,
-    coAuthors: ReadonlyArray<IAuthor>
+    coAuthors: ReadonlyArray<Author>
   ) {
     return this.appStore._setCoAuthors(repository, coAuthors)
   }
@@ -2314,10 +2421,26 @@ export class Dispatcher {
     await this.appStore._loadStatus(repository)
   }
 
+  public setConfirmDiscardStashSetting(value: boolean) {
+    return this.appStore._setConfirmDiscardStashSetting(value)
+  }
+
+  public setConfirmCheckoutCommitSetting(value: boolean) {
+    return this.appStore._setConfirmCheckoutCommitSetting(value)
+  }
+
   public setConfirmForcePushSetting(value: boolean) {
     return this.appStore._setConfirmForcePushSetting(value)
   }
 
+  public setConfirmUndoCommitSetting(value: boolean) {
+    return this.appStore._setConfirmUndoCommitSetting(value)
+  }
+
+  public setConfirmCommitFilteredChanges(value: boolean) {
+    return this.appStore._setConfirmCommitFilteredChanges(value)
+  }
+
   /**
    * Converts a local repository to use the given fork
    * as its default remote and associated `GitHubRepository`.
@@ -2329,22 +2452,6 @@ export class Dispatcher {
     return this.appStore._convertRepositoryToFork(repository, fork)
   }
 
-  /**
-   * Updates the application state to indicate a conflict is in-progress
-   * as a result of a pull and increments the relevant metric.
-   */
-  public mergeConflictDetectedFromPull() {
-    return this.statsStore.recordMergeConflictFromPull()
-  }
-
-  /**
-   * Updates the application state to indicate a conflict is in-progress
-   * as a result of a merge and increments the relevant metric.
-   */
-  public mergeConflictDetectedFromExplicitMerge() {
-    return this.statsStore.recordMergeConflictFromExplicitMerge()
-  }
-
   /**
    * Increments the `mergeIntoCurrentBranchMenuCount` metric
    */
@@ -2352,27 +2459,6 @@ export class Dispatcher {
     return this.statsStore.recordMenuInitiatedMerge(isSquash)
   }
 
-  /**
-   * Increments the `rebaseIntoCurrentBranchMenuCount` metric
-   */
-  public recordMenuInitiatedRebase() {
-    return this.statsStore.recordMenuInitiatedRebase()
-  }
-
-  /**
-   * Increments the `updateFromDefaultBranchMenuCount` metric
-   */
-  public recordMenuInitiatedUpdate() {
-    return this.statsStore.recordMenuInitiatedUpdate()
-  }
-
-  /**
-   * Increments the `mergesInitiatedFromComparison` metric
-   */
-  public recordCompareInitiatedMerge() {
-    return this.statsStore.recordCompareInitiatedMerge()
-  }
-
   /**
    * Set the application-wide theme
    */
@@ -2381,10 +2467,10 @@ export class Dispatcher {
   }
 
   /**
-   * Set the custom application-wide theme
+   * Set the application-wide tab size
    */
-  public setCustomTheme(theme: ICustomTheme) {
-    return this.appStore._setCustomTheme(theme)
+  public setSelectedTabSize(tabSize: number) {
+    return this.appStore._setSelectedTabSize(tabSize)
   }
 
   /**
@@ -2395,13 +2481,6 @@ export class Dispatcher {
     return this.statsStore.recordRepoClicked(repoHasIndicator)
   }
 
-  /**
-   * Increments the `createPullRequestCount` metric
-   */
-  public recordCreatePullRequest() {
-    return this.statsStore.recordCreatePullRequest()
-  }
-
   public recordWelcomeWizardInitiated() {
     return this.statsStore.recordWelcomeWizardInitiated()
   }
@@ -2414,62 +2493,8 @@ export class Dispatcher {
     this.statsStore.recordAddExistingRepository()
   }
 
-  /**
-   * Increments the `mergeConflictsDialogDismissalCount` metric
-   */
-  public recordMergeConflictsDialogDismissal() {
-    this.statsStore.recordMergeConflictsDialogDismissal()
-  }
-
-  /**
-   * Increments the `mergeConflictsDialogReopenedCount` metric
-   */
-  public recordMergeConflictsDialogReopened() {
-    this.statsStore.recordMergeConflictsDialogReopened()
-  }
-
-  /**
-   * Increments the `anyConflictsLeftOnMergeConflictsDialogDismissalCount` metric
-   */
-  public recordAnyConflictsLeftOnMergeConflictsDialogDismissal() {
-    this.statsStore.recordAnyConflictsLeftOnMergeConflictsDialogDismissal()
-  }
-
-  /**
-   * Increments the `guidedConflictedMergeCompletionCount` metric
-   */
-  public recordGuidedConflictedMergeCompletion() {
-    this.statsStore.recordGuidedConflictedMergeCompletion()
-  }
-
-  /**
-   * Increments the `unguidedConflictedMergeCompletionCount` metric
-   */
-  public recordUnguidedConflictedMergeCompletion() {
-    this.statsStore.recordUnguidedConflictedMergeCompletion()
-  }
-
   // TODO: more rebase-related actions
 
-  /**
-   * Increments the `rebaseConflictsDialogDismissalCount` metric
-   */
-  public recordRebaseConflictsDialogDismissal() {
-    this.statsStore.recordRebaseConflictsDialogDismissal()
-  }
-
-  /**
-   * Increments the `rebaseConflictsDialogReopenedCount` metric
-   */
-  public recordRebaseConflictsDialogReopened() {
-    this.statsStore.recordRebaseConflictsDialogReopened()
-  }
-
-  /** Increments the `errorWhenSwitchingBranchesWithUncommmittedChanges` metric */
-  public recordErrorWhenSwitchingBranchesWithUncommmittedChanges() {
-    return this.statsStore.recordErrorWhenSwitchingBranchesWithUncommmittedChanges()
-  }
-
   /**
    * Refresh the list of open pull requests for the given repository.
    */
@@ -2544,11 +2569,7 @@ export class Dispatcher {
     const promises = new Array<Promise<boolean>>()
 
     // If it is one and in actions check, we can rerun it individually.
-    if (
-      checkRuns.length === 1 &&
-      checkRuns[0].actionsWorkflow !== undefined &&
-      enableReRunFailedAndSingleCheckJobs()
-    ) {
+    if (checkRuns.length === 1 && checkRuns[0].actionsWorkflow !== undefined) {
       promises.push(
         this.commitStatusStore.rerunJob(repository, checkRuns[0].id)
       )
@@ -2558,11 +2579,7 @@ export class Dispatcher {
     const checkSuiteIds = new Set<number>()
     const workflowRunIds = new Set<number>()
     for (const cr of checkRuns) {
-      if (
-        failedOnly &&
-        cr.actionsWorkflow !== undefined &&
-        enableReRunFailedAndSingleCheckJobs()
-      ) {
+      if (failedOnly && cr.actionsWorkflow !== undefined) {
         workflowRunIds.add(cr.actionsWorkflow.id)
         continue
       }
@@ -2644,72 +2661,6 @@ export class Dispatcher {
     return this.appStore._hideStashedChanges(repository)
   }
 
-  /**
-   * Increment the number of times the user has opened their external editor
-   * from the suggested next steps view
-   */
-  public recordSuggestedStepOpenInExternalEditor(): Promise<void> {
-    return this.statsStore.recordSuggestedStepOpenInExternalEditor()
-  }
-
-  /**
-   * Increment the number of times the user has opened their repository in
-   * Finder/Explorer from the suggested next steps view
-   */
-  public recordSuggestedStepOpenWorkingDirectory(): Promise<void> {
-    return this.statsStore.recordSuggestedStepOpenWorkingDirectory()
-  }
-
-  /**
-   * Increment the number of times the user has opened their repository on
-   * GitHub from the suggested next steps view
-   */
-  public recordSuggestedStepViewOnGitHub(): Promise<void> {
-    return this.statsStore.recordSuggestedStepViewOnGitHub()
-  }
-
-  /**
-   * Increment the number of times the user has used the publish repository
-   * action from the suggested next steps view
-   */
-  public recordSuggestedStepPublishRepository(): Promise<void> {
-    return this.statsStore.recordSuggestedStepPublishRepository()
-  }
-
-  /**
-   * Increment the number of times the user has used the publish branch
-   * action branch from the suggested next steps view
-   */
-  public recordSuggestedStepPublishBranch(): Promise<void> {
-    return this.statsStore.recordSuggestedStepPublishBranch()
-  }
-
-  /**
-   * Increment the number of times the user has used the Create PR suggestion
-   * in the suggested next steps view.
-   */
-  public recordSuggestedStepCreatePullRequest(): Promise<void> {
-    return this.statsStore.recordSuggestedStepCreatePullRequest()
-  }
-
-  /**
-   * Increment the number of times the user has used the View Stash suggestion
-   * in the suggested next steps view.
-   */
-  public recordSuggestedStepViewStash(): Promise<void> {
-    return this.statsStore.recordSuggestedStepViewStash()
-  }
-
-  /** Record when the user takes no action on the stash entry */
-  public recordNoActionTakenOnStash(): Promise<void> {
-    return this.statsStore.recordNoActionTakenOnStash()
-  }
-
-  /** Record when the user views the stash entry */
-  public recordStashView(): Promise<void> {
-    return this.statsStore.recordStashView()
-  }
-
   /** Call when the user opts to skip the pick editor step of the onboarding tutorial */
   public skipPickEditorTutorialStep(repository: Repository) {
     return this.appStore._skipPickEditorTutorialStep(repository)
@@ -2723,13 +2674,8 @@ export class Dispatcher {
     return this.appStore._markPullRequestTutorialStepAsComplete(repository)
   }
 
-  /**
-   * Increments the `forksCreated ` metric` indicating that the user has
-   * elected to create a fork when presented with a dialog informing
-   * them that they don't have write access to the current repository.
-   */
-  public recordForkCreated() {
-    return this.statsStore.recordForkCreated()
+  public markTutorialCompletionAsAnnounced(repository: Repository) {
+    return this.appStore._markTutorialCompletionAsAnnounced(repository)
   }
 
   /**
@@ -2750,7 +2696,7 @@ export class Dispatcher {
     // See https://github.com/desktop/desktop/issues/9232 for rationale
     const url = getGitHubHtmlUrl(repository)
     if (url !== null) {
-      this.statsStore.recordIssueCreationWebpageOpened()
+      this.statsStore.increment('issueCreationWebpageOpenedCount')
       return this.appStore._openInBrowser(`${url}/issues/new/choose`)
     } else {
       return false
@@ -2769,12 +2715,12 @@ export class Dispatcher {
     this.appStore._setUseWindowsOpenSSH(useWindowsOpenSSH)
   }
 
-  public setNotificationsEnabled(notificationsEnabled: boolean) {
-    this.appStore._setNotificationsEnabled(notificationsEnabled)
+  public setShowCommitLengthWarning(showCommitLengthWarning: boolean) {
+    this.appStore._setShowCommitLengthWarning(showCommitLengthWarning)
   }
 
-  public recordDiffOptionsViewed() {
-    return this.statsStore.recordDiffOptionsViewed()
+  public setNotificationsEnabled(notificationsEnabled: boolean) {
+    this.appStore._setNotificationsEnabled(notificationsEnabled)
   }
 
   private logHowToRevertCherryPick(
@@ -2861,7 +2807,7 @@ export class Dispatcher {
     )
 
     if (commits.length > 1) {
-      this.statsStore.recordCherryPickMultipleCommits()
+      this.statsStore.increment('cherryPickMultipleCommitsCount')
     }
 
     const nameAfterCheckout = await this.appStore._checkoutBranchReturnName(
@@ -2939,7 +2885,7 @@ export class Dispatcher {
     )
     this.appStore._setMultiCommitOperationTargetBranch(repository, targetBranch)
     this.appStore._setCherryPickBranchCreated(repository, true)
-    this.statsStore.recordCherryPickBranchCreatedCount()
+    this.statsStore.increment('cherryPickBranchCreatedCount')
     return this.cherryPick(repository, targetBranch, commits, sourceBranch)
   }
 
@@ -2994,7 +2940,7 @@ export class Dispatcher {
       repository,
     })
 
-    this.statsStore.recordCherryPickViaDragAndDrop()
+    this.statsStore.increment('cherryPickViaDragAndDropCount')
     this.setCherryPickBranchCreated(repository, false)
     this.cherryPick(repository, targetBranch, commits, sourceBranch)
   }
@@ -3055,7 +3001,7 @@ export class Dispatcher {
     )
 
     if (result === CherryPickResult.CompletedWithoutError) {
-      this.statsStore.recordCherryPickSuccessfulWithConflicts()
+      this.statsStore.increment('cherryPickSuccessfulWithConflictsCount')
     }
 
     this.processCherryPickResult(
@@ -3102,7 +3048,7 @@ export class Dispatcher {
       },
     })
 
-    this.statsStore.recordCherryPickConflictsEncountered()
+    this.statsStore.increment('cherryPickConflictsEncounteredCount')
   }
 
   /** Aborts an ongoing cherry pick and switches back to the source branch. */
@@ -3180,16 +3126,6 @@ export class Dispatcher {
     return this.appStore._setCherryPickProgressFromState(repository)
   }
 
-  /** Method to record cherry pick initiated via the context menu. */
-  public recordCherryPickViaContextMenu() {
-    this.statsStore.recordCherryPickViaContextMenu()
-  }
-
-  /** Method to record an operation started via drag and drop and canceled. */
-  public recordDragStartedAndCanceled() {
-    this.statsStore.recordDragStartedAndCanceled()
-  }
-
   /** Method to set the drag element */
   public setDragElement(dragElement: DragElement): void {
     this.appStore._setDragElement(dragElement)
@@ -3208,7 +3144,8 @@ export class Dispatcher {
     sourceBranch: Branch | null
   ): Promise<void> {
     const { branchesState } = this.repositoryStateManager.get(repository)
-    const { defaultBranch, allBranches, tip } = branchesState
+    const { defaultBranch, upstreamDefaultBranch, allBranches, tip } =
+      branchesState
 
     if (tip.kind !== TipState.Valid) {
       this.appStore._clearCherryPickingHead(repository, null)
@@ -3221,12 +3158,6 @@ export class Dispatcher {
     const upstreamGhRepo = isGHRepo
       ? getNonForkGitHubRepository(repository as RepositoryWithGitHubRepository)
       : null
-    const upstreamDefaultBranch = isGHRepo
-      ? findDefaultUpstreamBranch(
-          repository as RepositoryWithGitHubRepository,
-          allBranches
-        )
-      : null
 
     this.initializeMultiCommitOperation(
       repository,
@@ -3288,6 +3219,26 @@ export class Dispatcher {
     this.appStore._setLastThankYou(lastThankYou)
   }
 
+  /** Set whether or not the user wants to use a custom external editor */
+  public setUseCustomEditor(useCustomEditor: boolean) {
+    this.appStore._setUseCustomEditor(useCustomEditor)
+  }
+
+  /** Set the custom external editor info */
+  public setCustomEditor(customEditor: ICustomIntegration) {
+    this.appStore._setCustomEditor(customEditor)
+  }
+
+  /** Set whether or not the user wants to use a custom shell */
+  public setUseCustomShell(useCustomShell: boolean) {
+    this.appStore._setUseCustomShell(useCustomShell)
+  }
+
+  /** Set the custom shell info */
+  public setCustomShell(customShell: ICustomIntegration) {
+    this.appStore._setCustomShell(customShell)
+  }
+
   public async reorderCommits(
     repository: Repository,
     commitsToReorder: ReadonlyArray<Commit>,
@@ -3315,10 +3266,10 @@ export class Dispatcher {
       return
     }
 
-    this.statsStore.recordReorderStarted()
+    this.statsStore.increment('reorderStartedCount')
 
     if (commitsToReorder.length > 1) {
-      this.statsStore.recordReorderMultipleCommits()
+      this.statsStore.increment('reorderMultipleCommitsCount')
     }
 
     this.appStore._initializeMultiCommitOperation(
@@ -3424,7 +3375,7 @@ export class Dispatcher {
     }
 
     if (toSquash.length > 1) {
-      this.statsStore.recordSquashMultipleCommitsInvoked()
+      this.statsStore.increment('squashMultipleCommitsInvokedCount')
     }
 
     this.initializeMultiCommitOperation(
@@ -3442,6 +3393,7 @@ export class Dispatcher {
       tip.branch.tip.sha
     )
 
+    this.closePopup(PopupType.CommitMessage)
     this.showPopup({
       type: PopupType.MultiCommitOperation,
       repository,
@@ -3547,6 +3499,14 @@ export class Dispatcher {
     // conflict flow if squash results in conflict.
     const status = await this.appStore._loadStatus(repository)
     switch (result) {
+      case RebaseResult.AlreadyUpToDate:
+        sendNonFatalException(
+          'rebaseConflictsWithBranchAlreadyUpToDate',
+          new Error(
+            `processMultiCommitOperationRebaseResult was invoked (which means Desktop went into a conflicts-found state) but the branch was already up-to-date, so there couldn't be any conflicts at all`
+          )
+        )
+        break
       case RebaseResult.CompletedWithoutError:
         if (status !== null && status.currentTip !== undefined) {
           // This sets the history to the current tip
@@ -3701,10 +3661,7 @@ export class Dispatcher {
         }
         break
       case MultiCommitOperationKind.Rebase:
-        const sourceBranch =
-          operationDetail.kind === MultiCommitOperationKind.Rebase
-            ? operationDetail.sourceBranch
-            : null
+        const { sourceBranch } = operationDetail
         banner = {
           type: BannerType.SuccessfulRebase,
           targetBranch: targetBranch !== null ? targetBranch.name : '',
@@ -3857,9 +3814,9 @@ export class Dispatcher {
   /** Records the squash that a squash has been invoked by either drag and drop or context menu */
   public recordSquashInvoked(isInvokedByContextMenu: boolean): void {
     if (isInvokedByContextMenu) {
-      this.statsStore.recordSquashViaContextMenuInvoked()
+      this.statsStore.increment('squashViaContextMenuInvokedCount')
     } else {
-      this.statsStore.recordSquashViaDragAndDropInvokedCount()
+      this.statsStore.increment('squashViaDragAndDropInvokedCount')
     }
   }
 
@@ -3898,7 +3855,7 @@ export class Dispatcher {
   public setShowCIStatusPopover(showCIStatusPopover: boolean) {
     this.appStore._setShowCIStatusPopover(showCIStatusPopover)
     if (showCIStatusPopover) {
-      this.statsStore.recordCheckRunsPopoverOpened()
+      this.statsStore.increment('opensCheckRunsPopover')
     }
   }
 
@@ -3906,29 +3863,114 @@ export class Dispatcher {
     this.appStore._toggleCIStatusPopover()
   }
 
-  public recordCheckViewedOnline() {
-    this.statsStore.recordCheckViewedOnline()
+  public recordPullRequestReviewDialogSwitchToPullRequest(
+    reviewType: ValidNotificationPullRequestReviewState
+  ) {
+    this.statsStore.recordPullRequestReviewDialogSwitchToPullRequest(reviewType)
+  }
+
+  public showUnreachableCommits(selectedTab: UnreachableCommitsTab) {
+    this.statsStore.increment(
+      'multiCommitDiffUnreachableCommitsDialogOpenedCount'
+    )
+
+    this.showPopup({
+      type: PopupType.UnreachableCommits,
+      selectedTab,
+    })
+  }
+
+  public startPullRequest(repository: Repository) {
+    this.appStore._startPullRequest(repository)
+  }
+
+  /**
+   * Change the selected changed file of the current pull request state.
+   */
+  public changePullRequestFileSelection(
+    repository: Repository,
+    file: CommittedFileChange
+  ): Promise<void> {
+    return this.appStore._changePullRequestFileSelection(repository, file)
   }
 
-  public recordCheckJobStepViewedOnline() {
-    this.statsStore.recordCheckJobStepViewedOnline()
+  /**
+   * Set the width of the file list column in the pull request files changed
+   */
+  public setPullRequestFileListWidth(width: number): Promise<void> {
+    return this.appStore._setPullRequestFileListWidth(width)
   }
 
-  public recordRerunChecks() {
-    this.statsStore.recordRerunChecks()
+  /**
+   * Reset the width of the file list column in the pull request files changed
+   */
+  public resetPullRequestFileListWidth(): Promise<void> {
+    return this.appStore._resetPullRequestFileListWidth()
   }
 
-  public recordChecksFailedDialogSwitchToPullRequest() {
-    this.statsStore.recordChecksFailedDialogSwitchToPullRequest()
+  public updatePullRequestBaseBranch(repository: Repository, branch: Branch) {
+    this.appStore._updatePullRequestBaseBranch(repository, branch)
   }
 
-  public recordChecksFailedDialogRerunChecks() {
-    this.statsStore.recordChecksFailedDialogRerunChecks()
+  /**
+   * Attempts to quit the app if it's not updating, unless requested to quit
+   * even if it is updating.
+   *
+   * @param evenIfUpdating Whether to quit even if the app is updating.
+   */
+  public quitApp(evenIfUpdating: boolean) {
+    this.appStore._quitApp(evenIfUpdating)
   }
 
-  public recordPullRequestReviewDialogSwitchToPullRequest(
-    reviewType: ValidNotificationPullRequestReviewState
+  /**
+   * Cancels quitting the app. This could be needed if, on macOS, the user tries
+   * to quit the app while an update is in progress, but then after being
+   * informed about the issues that could cause they decided to not close the
+   * app yet.
+   */
+  public cancelQuittingApp() {
+    this.appStore._cancelQuittingApp()
+  }
+
+  /**
+   * Sets the user's preference for which pull request suggested next action to
+   * use
+   */
+  public setPullRequestSuggestedNextAction(
+    value: PullRequestSuggestedNextAction
   ) {
-    this.statsStore.recordPullRequestReviewDialogSwitchToPullRequest(reviewType)
+    return this.appStore._setPullRequestSuggestedNextAction(value)
+  }
+
+  public appFocusedElementChanged() {
+    this.appStore._appFocusedElementChanged()
+  }
+
+  public updateCachedRepoRulesets(rulesets: Array<IAPIRepoRuleset | null>) {
+    this.appStore._updateCachedRepoRulesets(rulesets)
+  }
+
+  public onChecksFailedNotification(
+    repository: RepositoryWithGitHubRepository,
+    pullRequest: PullRequest,
+    checks: ReadonlyArray<IRefCheck>
+  ) {
+    this.appStore.onChecksFailedNotification(repository, pullRequest, checks)
+  }
+
+  public setUnderlineLinksSetting(underlineLinks: boolean) {
+    return this.appStore._updateUnderlineLinks(underlineLinks)
+  }
+
+  public setDiffCheckMarksSetting(diffCheckMarks: boolean) {
+    return this.appStore._updateShowDiffCheckMarks(diffCheckMarks)
+  }
+
+  public testPruneBranches() {
+    return this.appStore._testPruneBranches()
+  }
+
+  public editGlobalGitConfig() {
+    return this.appStore._editGlobalGitConfig()
   }
 }
diff --git a/app/src/ui/dispatcher/error-handlers.ts b/app/src/ui/dispatcher/error-handlers.ts
index 34d670ae4f6..ce134b8c713 100644
--- a/app/src/ui/dispatcher/error-handlers.ts
+++ b/app/src/ui/dispatcher/error-handlers.ts
@@ -1,7 +1,4 @@
-import {
-  GitError as DugiteError,
-  RepositoryDoesNotExistErrorCode,
-} from 'dugite'
+import { GitError as DugiteError } from 'dugite'
 
 import { Dispatcher } from '.'
 import { ExternalEditorError } from '../../lib/editors/shared'
@@ -9,8 +6,11 @@ import {
   DiscardChangesError,
   ErrorWithMetadata,
 } from '../../lib/error-with-metadata'
-import { AuthenticationErrors } from '../../lib/git/authentication'
-import { GitError, isAuthFailureError } from '../../lib/git/core'
+import {
+  coerceToString,
+  GitError,
+  isAuthFailureError,
+} from '../../lib/git/core'
 import { ShellError } from '../../lib/shells'
 import { UpstreamAlreadyExistsError } from '../../lib/stores/upstream-already-exists-error'
 
@@ -22,6 +22,7 @@ import {
 import { hasWritePermission } from '../../models/github-repository'
 import { RetryActionType } from '../../models/retry-actions'
 import { parseFilesToBeOverwritten } from '../lib/parse-files-to-be-overwritten'
+import { pathExists } from '../lib/path-exists'
 
 /** An error which also has a code property. */
 interface IErrorWithCode extends Error {
@@ -109,7 +110,7 @@ export async function missingRepositoryHandler(
   const gitError = asGitError(e.underlyingError)
   const missing =
     (gitError && gitError.result.gitError === DugiteError.NotAGitRepository) ||
-    (errorWithCode && errorWithCode.code === RepositoryDoesNotExistErrorCode)
+    (errorWithCode && !(await pathExists(repository.path)))
 
   if (missing) {
     await dispatcher.updateRepositoryMissing(repository, true)
@@ -139,53 +140,6 @@ export async function backgroundTaskHandler(
   }
 }
 
-/** Handle git authentication errors in a manner that seems Right And Good. */
-export async function gitAuthenticationErrorHandler(
-  error: Error,
-  dispatcher: Dispatcher
-): Promise<Error | null> {
-  const e = asErrorWithMetadata(error)
-  if (!e) {
-    return error
-  }
-
-  const gitError = asGitError(e.underlyingError)
-  if (!gitError) {
-    return error
-  }
-
-  const dugiteError = gitError.result.gitError
-  if (!dugiteError) {
-    return error
-  }
-
-  if (!AuthenticationErrors.has(dugiteError)) {
-    return error
-  }
-
-  const repository = e.metadata.repository
-  if (!repository) {
-    return error
-  }
-
-  // If it's a GitHub repository then it's not some generic git server
-  // authentication problem, but more likely a legit permission problem. So let
-  // the error continue to bubble up.
-  if (repository instanceof Repository && repository.gitHubRepository) {
-    return error
-  }
-
-  const retry = e.metadata.retryAction
-  if (!retry) {
-    log.error(`No retry action provided for a git authentication error.`, e)
-    return error
-  }
-
-  await dispatcher.promptForGenericGitAuthentication(repository, retry)
-
-  return null
-}
-
 export async function externalEditorErrorHandler(
   error: Error,
   dispatcher: Dispatcher
@@ -239,7 +193,7 @@ export async function pushNeedsPullHandler(
   }
 
   const dugiteError = gitError.result.gitError
-  if (!dugiteError) {
+  if (dugiteError === null) {
     return error
   }
 
@@ -280,7 +234,7 @@ export async function mergeConflictHandler(
   }
 
   const dugiteError = gitError.result.gitError
-  if (!dugiteError) {
+  if (dugiteError === null) {
     return error
   }
 
@@ -307,10 +261,10 @@ export async function mergeConflictHandler(
 
   switch (gitContext.kind) {
     case 'pull':
-      dispatcher.mergeConflictDetectedFromPull()
+      dispatcher.incrementMetric('mergeConflictFromPullCount')
       break
     case 'merge':
-      dispatcher.mergeConflictDetectedFromExplicitMerge()
+      dispatcher.incrementMetric('mergeConflictFromExplicitMergeCount')
       break
   }
 
@@ -339,7 +293,7 @@ export async function lfsAttributeMismatchHandler(
   }
 
   const dugiteError = gitError.result.gitError
-  if (!dugiteError) {
+  if (dugiteError === null) {
     return error
   }
 
@@ -392,7 +346,7 @@ export async function rebaseConflictsHandler(
   }
 
   const dugiteError = gitError.result.gitError
-  if (!dugiteError) {
+  if (dugiteError === null) {
     return error
   }
 
@@ -502,7 +456,7 @@ export async function samlReauthRequired(error: Error, dispatcher: Dispatcher) {
     return error
   }
 
-  const remoteMessage = getRemoteMessage(gitError.result.stderr)
+  const remoteMessage = getRemoteMessage(coerceToString(gitError.result.stderr))
   const match = samlReauthErrorMessageRe.exec(remoteMessage)
 
   if (!match) {
@@ -605,10 +559,14 @@ export async function localChangesOverwrittenHandler(
   }
 
   if (e.metadata.gitContext?.kind === 'checkout') {
-    dispatcher.recordErrorWhenSwitchingBranchesWithUncommmittedChanges()
+    dispatcher.incrementMetric(
+      'errorWhenSwitchingBranchesWithUncommmittedChanges'
+    )
   }
 
-  const files = parseFilesToBeOverwritten(gitError.result.stderr)
+  const files = parseFilesToBeOverwritten(
+    coerceToString(gitError.result.stderr)
+  )
 
   dispatcher.showPopup({
     type: PopupType.LocalChangesOverwritten,
diff --git a/app/src/ui/donut.tsx b/app/src/ui/donut.tsx
index 482f680de26..89a9e61ed67 100644
--- a/app/src/ui/donut.tsx
+++ b/app/src/ui/donut.tsx
@@ -26,6 +26,10 @@ interface IDonutProps {
    * the segments green and red.
    */
   readonly valueMap: Map<string, number>
+
+  /** Accessible label for the generated donut. Note: If the donut rendering is
+   * purely decorative, you can hide it with aria-hiden. */
+  readonly ariaLabel?: string
 }
 
 /**
@@ -44,7 +48,13 @@ export class Donut extends React.Component<IDonutProps, {}> {
     })
 
     return (
-      <svg className="donut" version="1.1" viewBox={viewBox} tabIndex={-1}>
+      <svg
+        aria-label={this.props.ariaLabel}
+        className="donut"
+        version="1.1"
+        viewBox={viewBox}
+        tabIndex={-1}
+      >
         {svgPaths}
       </svg>
     )
diff --git a/app/src/ui/drag-elements/commit-drag-element.tsx b/app/src/ui/drag-elements/commit-drag-element.tsx
index fc674e7d327..026cab3d329 100644
--- a/app/src/ui/drag-elements/commit-drag-element.tsx
+++ b/app/src/ui/drag-elements/commit-drag-element.tsx
@@ -8,13 +8,21 @@ import { DragType, DropTarget, DropTargetType } from '../../models/drag-drop'
 import { GitHubRepository } from '../../models/github-repository'
 import { CommitListItem } from '../history/commit-list-item'
 import { Octicon } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import * as octicons from '../octicons/octicons.generated'
+import { Account } from '../../models/account'
+import { Emoji } from '../../lib/emoji'
 
 interface ICommitDragElementProps {
   readonly commit: Commit
   readonly selectedCommits: ReadonlyArray<Commit>
   readonly gitHubRepository: GitHubRepository | null
-  readonly emoji: Map<string, string>
+  /**
+   * Whether or not this is shown for a keyboard-based insertion (like reordering
+   * commits). Optional. Default: false
+   */
+  readonly isKeyboardInsertion?: boolean
+  readonly emoji: Map<string, Emoji>
+  readonly accounts: ReadonlyArray<Account>
 }
 
 interface ICommitDragElementState {
@@ -72,7 +80,7 @@ export class CommitDragElement extends React.Component<
     switch (currentDropTarget.type) {
       case DropTargetType.Branch:
         const copyToPlus = __DARWIN__ ? null : (
-          <Octicon className="copy-to-icon" symbol={OcticonSymbol.plus} />
+          <Octicon className="copy-to-icon" symbol={octicons.plus} />
         )
         toolTipContents = (
           <>
@@ -168,7 +176,10 @@ export class CommitDragElement extends React.Component<
     const { commit, gitHubRepository, selectedCommits, emoji } = this.props
     const count = selectedCommits.length
 
-    const className = classNames({ 'multiple-selected': count > 1 })
+    const className = classNames({
+      'multiple-selected': count > 1,
+      'in-keyboard-insertion-mode': this.props.isKeyboardInsertion ?? false,
+    })
     return (
       <div id="commit-drag-element" className={className}>
         <div className="commit-box">
@@ -178,11 +189,8 @@ export class CommitDragElement extends React.Component<
             commit={commit}
             selectedCommits={selectedCommits}
             emoji={emoji}
-            canBeUndone={false}
-            canBeAmended={false}
-            canBeResetTo={false}
-            isLocal={false}
             showUnpushedIndicator={false}
+            accounts={this.props.accounts}
           />
         </div>
         {this.renderDragToolTip()}
diff --git a/app/src/ui/dropdown-select-button.tsx b/app/src/ui/dropdown-select-button.tsx
index f2a35912e89..83dba73a6b2 100644
--- a/app/src/ui/dropdown-select-button.tsx
+++ b/app/src/ui/dropdown-select-button.tsx
@@ -2,17 +2,20 @@ import classNames from 'classnames'
 import React from 'react'
 import { Button } from './lib/button'
 import { Octicon } from './octicons'
-import * as OcticonSymbol from './octicons/octicons.generated'
+import * as octicons from './octicons/octicons.generated'
+import { MenuPane } from './app-menu'
+import { ICheckboxMenuItem, MenuItem } from '../models/app-menu'
+import { ClickSource, SelectionSource } from './lib/list'
 
 export interface IDropdownSelectButtonOption {
   /** The select option header label. */
-  readonly label?: string | JSX.Element
+  readonly label: string
 
   /** The select option description */
   readonly description?: string | JSX.Element
 
   /** The select option's value */
-  readonly value?: string
+  readonly id: string
 }
 
 interface IDropdownSelectButtonProps {
@@ -20,7 +23,7 @@ interface IDropdownSelectButtonProps {
   readonly options: ReadonlyArray<IDropdownSelectButtonOption>
 
   /** The selection option value */
-  readonly selectedValue?: string
+  readonly checkedOption?: string
 
   /** Whether or not the button is enabled */
   readonly disabled?: boolean
@@ -28,8 +31,14 @@ interface IDropdownSelectButtonProps {
   /** tooltip for the button */
   readonly tooltip?: string
 
+  /** aria-describedby for the button */
+  readonly ariaDescribedBy?: string
+
+  /** aria-label for the dropdown button */
+  readonly dropdownAriaLabel: string
+
   /** Callback for when the button selection changes*/
-  readonly onSelectChange?: (
+  readonly onCheckedOptionChange?: (
     selectedOption: IDropdownSelectButtonOption
   ) => void
 
@@ -44,7 +53,10 @@ interface IDropdownSelectButtonState {
   /** Whether the options are rendered */
   readonly showButtonOptions: boolean
 
-  /** The currently selected option */
+  /** The currently checked option (not necessarily highlighted, but is the only option checked) */
+  readonly checkedOption: IDropdownSelectButtonOption | null
+
+  /** The currently selected option -> The option highlighted that if clicked or hit enter on would become checked */
   readonly selectedOption: IDropdownSelectButtonOption | null
 
   /**
@@ -59,14 +71,47 @@ export class DropdownSelectButton extends React.Component<
   IDropdownSelectButtonState
 > {
   private invokeButtonRef: HTMLButtonElement | null = null
+  private dropdownButtonRef: HTMLButtonElement | null = null
   private optionsContainerRef: HTMLDivElement | null = null
+  private dropdownSelectContainerRef = React.createRef<HTMLDivElement>()
 
   public constructor(props: IDropdownSelectButtonProps) {
     super(props)
 
     this.state = {
       showButtonOptions: false,
-      selectedOption: this.getSelectedOption(props.selectedValue),
+      checkedOption: this.getCheckedOption(props.checkedOption),
+      selectedOption: this.getCheckedOption(props.checkedOption),
+    }
+  }
+
+  public componentDidMount(): void {
+    if (this.dropdownSelectContainerRef.current) {
+      this.dropdownSelectContainerRef.current.addEventListener(
+        'focusout',
+        this.onFocusOut
+      )
+    }
+  }
+
+  public componentWillUnmount(): void {
+    if (this.dropdownSelectContainerRef.current) {
+      this.dropdownSelectContainerRef.current.removeEventListener(
+        'focusout',
+        this.onFocusOut
+      )
+    }
+  }
+
+  private onFocusOut = (event: FocusEvent) => {
+    if (
+      this.state.showButtonOptions &&
+      event.relatedTarget &&
+      !this.dropdownSelectContainerRef.current?.contains(
+        event.relatedTarget as Node
+      )
+    ) {
+      this.setState({ showButtonOptions: false })
     }
   }
 
@@ -89,7 +134,7 @@ export class DropdownSelectButton extends React.Component<
     }
   }
 
-  private getSelectedOption(
+  private getCheckedOption(
     selectedValue: string | undefined
   ): IDropdownSelectButtonOption | null {
     const { options } = this.props
@@ -97,74 +142,189 @@ export class DropdownSelectButton extends React.Component<
       return null
     }
 
-    const selectedOption = options.find(o => o.value === selectedValue)
-    if (selectedOption === undefined) {
-      return options[0]
+    const selectedOption = options.find(o => o.id === selectedValue)
+    return selectedOption ?? options[0]
+  }
+
+  private onItemClick = (
+    depth: number,
+    item: MenuItem,
+    source: ClickSource
+  ) => {
+    const selectedOption = this.props.options.find(o => o.id === item.id)
+
+    if (!selectedOption) {
+      return
     }
-    return selectedOption
+
+    this.setState({ checkedOption: selectedOption, showButtonOptions: false })
+    this.dropdownButtonRef?.focus()
+    this.props.onCheckedOptionChange?.(selectedOption)
   }
 
-  private onSelectionChange = (selectedOption: IDropdownSelectButtonOption) => {
-    return (_event: React.MouseEvent<HTMLLIElement, MouseEvent>) => {
-      this.setState({ selectedOption, showButtonOptions: false })
+  private onClearSelection = () => {
+    this.setState({ selectedOption: null })
+  }
 
-      const { onSelectChange } = this.props
-      if (onSelectChange !== undefined) {
-        onSelectChange(selectedOption)
-      }
+  private onPaneKeyDown = (
+    depth: number | undefined,
+    event: React.KeyboardEvent<HTMLDivElement>
+  ) => {
+    if (event.key !== 'Escape' && event.key !== 'Esc') {
+      return
     }
+
+    event.preventDefault()
+    event.stopPropagation()
+    this.dropdownButtonRef?.focus()
+    this.setState({ showButtonOptions: false })
+  }
+
+  private onSelectionChanged = (
+    depth: number,
+    item: MenuItem,
+    source: SelectionSource
+  ) => {
+    const selectedOption = this.props.options.find(o => o.id === item.id)
+
+    if (!selectedOption) {
+      return
+    }
+
+    this.setState({ selectedOption })
   }
 
   private openSplitButtonDropdown = () => {
     this.setState({ showButtonOptions: !this.state.showButtonOptions })
   }
 
+  private onDropdownButtonKeyDown = (
+    event: React.KeyboardEvent<HTMLButtonElement>
+  ) => {
+    const { key } = event
+    let flag = false
+
+    switch (key) {
+      case ' ':
+      case 'Enter':
+      case 'ArrowDown':
+      case 'Down':
+        this.setState({
+          selectedOption: this.props.options.at(0) ?? null,
+          showButtonOptions: true,
+        })
+        flag = true
+        break
+
+      case 'Esc':
+      case 'Escape':
+        this.dropdownButtonRef?.focus()
+        this.setState({ showButtonOptions: false })
+        flag = true
+        break
+
+      case 'Up':
+      case 'ArrowUp':
+        this.setState({
+          selectedOption: this.props.options.at(-1) ?? null,
+          showButtonOptions: true,
+        })
+        flag = true
+        break
+
+      default:
+        break
+    }
+
+    if (flag) {
+      event.stopPropagation()
+      event.preventDefault()
+    }
+  }
+
   private onInvokeButtonRef = (buttonRef: HTMLButtonElement | null) => {
     this.invokeButtonRef = buttonRef
   }
 
+  private onDropdownButtonRef = (buttonRef: HTMLButtonElement | null) => {
+    this.dropdownButtonRef = buttonRef
+  }
+
   private onOptionsContainerRef = (ref: HTMLDivElement | null) => {
     this.optionsContainerRef = ref
   }
 
-  private renderSelectedIcon(option: IDropdownSelectButtonOption) {
-    const { selectedOption } = this.state
-    if (selectedOption === null || option.value !== selectedOption.value) {
+  private renderOption = (item: MenuItem) => {
+    const option = this.props.options.find(o => o.id === item.id)
+    if (!option) {
       return
     }
 
     return (
-      <Octicon
-        className="selected-option-indicator"
-        symbol={OcticonSymbol.check}
-      />
+      <>
+        <div className="option-title">{option.label}</div>
+        <div className="option-description">{option.description}</div>
+      </>
     )
   }
 
+  private getMenuItems(
+    options: ReadonlyArray<IDropdownSelectButtonOption>,
+    checkedOptionId: string | undefined
+  ): ReadonlyArray<MenuItem> {
+    const defaultCheckBoxMenuItem: ICheckboxMenuItem = {
+      type: 'checkbox',
+      id: '',
+      label: '',
+      checked: false,
+      enabled: true,
+      visible: true,
+      accelerator: null,
+      accessKey: null,
+    }
+
+    return options.map(({ id, label }) => {
+      const checked = checkedOptionId === id
+      return { ...defaultCheckBoxMenuItem, ...{ id, label, checked } }
+    })
+  }
+
   private renderSplitButtonOptions() {
-    if (!this.state.showButtonOptions) {
+    const {
+      showButtonOptions,
+      checkedOption,
+      selectedOption,
+      optionsPositionBottom: bottom,
+    } = this.state
+
+    if (!showButtonOptions) {
       return
     }
 
     const { options } = this.props
-    const { optionsPositionBottom: bottom } = this.state
+
+    const items = this.getMenuItems(options, checkedOption?.id)
+    const selectedItem = items.find(i => i.id === selectedOption?.id)
     const openClass = bottom !== undefined ? 'open-top' : 'open-bottom'
     const classes = classNames('dropdown-select-button-options', openClass)
+
     return (
       <div
         className={classes}
         style={{ bottom }}
         ref={this.onOptionsContainerRef}
       >
-        <ul>
-          {options.map(o => (
-            <li key={o.value} onClick={this.onSelectionChange(o)}>
-              {this.renderSelectedIcon(o)}
-              <div className="option-title">{o.label}</div>
-              <div className="option-description">{o.description}</div>
-            </li>
-          ))}
-        </ul>
+        <MenuPane
+          depth={0}
+          items={items}
+          selectedItem={selectedItem}
+          onItemClicked={this.onItemClick}
+          onKeyDown={this.onPaneKeyDown}
+          onSelectionChanged={this.onSelectionChanged}
+          onClearSelection={this.onClearSelection}
+          allowFirstCharacterNavigation={true}
+          renderLabel={this.renderOption}
+        />
       </div>
     )
   }
@@ -172,16 +332,19 @@ export class DropdownSelectButton extends React.Component<
   private onSubmit = (event: React.MouseEvent<HTMLButtonElement>) => {
     if (
       this.props.onSubmit !== undefined &&
-      this.state.selectedOption !== null
+      this.state.checkedOption !== null
     ) {
-      this.props.onSubmit(event, this.state.selectedOption)
+      this.props.onSubmit(event, this.state.checkedOption)
     }
   }
 
   public render() {
-    const { options, disabled } = this.props
-    const { selectedOption, optionsPositionBottom, showButtonOptions } =
-      this.state
+    const { options, disabled, dropdownAriaLabel } = this.props
+    const {
+      checkedOption: selectedOption,
+      optionsPositionBottom,
+      showButtonOptions,
+    } = this.state
     if (options.length === 0 || selectedOption === null) {
       return
     }
@@ -197,24 +360,32 @@ export class DropdownSelectButton extends React.Component<
     // The button is type of submit so that it will trigger a form's onSubmit
     // method.
     return (
-      <div className={containerClasses}>
-        <Button
-          className="invoke-button"
-          disabled={disabled}
-          type="submit"
-          tooltip={this.props.tooltip}
-          onButtonRef={this.onInvokeButtonRef}
-          onClick={this.onSubmit}
-        >
-          {selectedOption.label}
-        </Button>
-        <Button
-          className={dropdownClasses}
-          onClick={this.openSplitButtonDropdown}
-          type="button"
-        >
-          <Octicon symbol={OcticonSymbol.triangleDown} />
-        </Button>
+      <div className={containerClasses} ref={this.dropdownSelectContainerRef}>
+        <div className="dropdown-button-wrappers">
+          <Button
+            className="invoke-button"
+            disabled={disabled}
+            type="submit"
+            ariaDescribedBy={this.props.ariaDescribedBy}
+            tooltip={this.props.tooltip}
+            onButtonRef={this.onInvokeButtonRef}
+            onClick={this.onSubmit}
+          >
+            {selectedOption.label}
+          </Button>
+          <Button
+            className={dropdownClasses}
+            onClick={this.openSplitButtonDropdown}
+            onKeyDown={this.onDropdownButtonKeyDown}
+            onButtonRef={this.onDropdownButtonRef}
+            type="button"
+            ariaExpanded={showButtonOptions}
+            ariaHaspopup={true}
+            ariaLabel={dropdownAriaLabel}
+          >
+            <Octicon symbol={octicons.triangleDown} />
+          </Button>
+        </div>
         {this.renderSplitButtonOptions()}
       </div>
     )
diff --git a/app/src/ui/forks/create-fork-dialog.tsx b/app/src/ui/forks/create-fork-dialog.tsx
index 30490ffba93..a2198760430 100644
--- a/app/src/ui/forks/create-fork-dialog.tsx
+++ b/app/src/ui/forks/create-fork-dialog.tsx
@@ -52,7 +52,7 @@ export class CreateForkDialog extends React.Component<
         gitHubRepository.owner.login,
         gitHubRepository.name
       )
-      this.props.dispatcher.recordForkCreated()
+      this.props.dispatcher.incrementMetric('forksCreated')
       const updatedRepository =
         await this.props.dispatcher.convertRepositoryToFork(
           this.props.repository,
@@ -80,7 +80,7 @@ export class CreateForkDialog extends React.Component<
         title="Do you want to fork this repository?"
         onDismissed={this.props.onDismissed}
         onSubmit={this.state.error ? undefined : this.onSubmit}
-        dismissable={!this.state.loading}
+        dismissDisabled={this.state.loading}
         loading={this.state.loading}
         type={this.state.error ? 'error' : 'normal'}
         key={this.props.repository.name}
diff --git a/app/src/ui/generic-git-auth/generic-git-auth.tsx b/app/src/ui/generic-git-auth/generic-git-auth.tsx
index 5dbeefb0b5a..8aeca4bdfae 100644
--- a/app/src/ui/generic-git-auth/generic-git-auth.tsx
+++ b/app/src/ui/generic-git-auth/generic-git-auth.tsx
@@ -3,28 +3,26 @@ import * as React from 'react'
 import { TextBox } from '../lib/text-box'
 import { Row } from '../lib/row'
 import { Dialog, DialogContent, DialogFooter } from '../dialog'
-import { RetryAction } from '../../models/retry-actions'
 import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group'
 import { Ref } from '../lib/ref'
 import { LinkButton } from '../lib/link-button'
+import { PasswordTextBox } from '../lib/password-text-box'
 
 interface IGenericGitAuthenticationProps {
-  /** The hostname with which the user tried to authenticate. */
-  readonly hostname: string
+  /** The remote url with which the user tried to authenticate. */
+  readonly remoteUrl: string
 
   /** The function to call when the user saves their credentials. */
-  readonly onSave: (
-    hostname: string,
-    username: string,
-    password: string,
-    retryAction: RetryAction
-  ) => void
+  readonly onSave: (username: string, password: string) => void
 
   /** The function to call when the user dismisses the dialog. */
   readonly onDismiss: () => void
 
-  /** The action to retry after getting credentials. */
-  readonly retryAction: RetryAction
+  /**
+   * In case the username is predetermined. Setting this will prevent
+   * the popup from allowing the user to change the username.
+   */
+  readonly username?: string
 }
 
 interface IGenericGitAuthenticationState {
@@ -40,7 +38,7 @@ export class GenericGitAuthentication extends React.Component<
   public constructor(props: IGenericGitAuthenticationProps) {
     super(props)
 
-    this.state = { username: '', password: '' }
+    this.state = { username: this.props.username ?? '', password: '' }
   }
 
   public render() {
@@ -51,33 +49,45 @@ export class GenericGitAuthentication extends React.Component<
         title={__DARWIN__ ? `Authentication Failed` : `Authentication failed`}
         onDismissed={this.props.onDismiss}
         onSubmit={this.save}
+        role="alertdialog"
+        ariaDescribedBy="generic-git-auth-error"
       >
         <DialogContent>
-          <p>
-            We were unable to authenticate with <Ref>{this.props.hostname}</Ref>
-            . Please enter your username and password to try again.
+          <p id="generic-git-auth-error">
+            We were unable to authenticate with{' '}
+            <Ref>{this.props.remoteUrl}</Ref>. Please enter{' '}
+            {this.props.username ? (
+              <>
+                the password for the user <Ref>{this.props.username}</Ref>
+              </>
+            ) : (
+              'your username and password'
+            )}{' '}
+            to try again.
           </p>
 
-          <Row>
-            <TextBox
-              label="Username"
-              autoFocus={true}
-              value={this.state.username}
-              onValueChanged={this.onUsernameChange}
-            />
-          </Row>
+          {this.props.username === undefined && (
+            <Row>
+              <TextBox
+                label="Username"
+                autoFocus={true}
+                value={this.state.username}
+                onValueChanged={this.onUsernameChange}
+              />
+            </Row>
+          )}
 
           <Row>
-            <TextBox
+            <PasswordTextBox
               label="Password"
-              type="password"
               value={this.state.password}
               onValueChanged={this.onPasswordChange}
+              ariaDescribedBy="generic-git-auth-password-description"
             />
           </Row>
 
           <Row>
-            <div>
+            <div id="generic-git-auth-password-description">
               Depending on your repository's hosting service, you might need to
               use a Personal Access Token (PAT) as your password. Learn more
               about creating a PAT in our{' '}
@@ -90,10 +100,7 @@ export class GenericGitAuthentication extends React.Component<
         </DialogContent>
 
         <DialogFooter>
-          <OkCancelButtonGroup
-            okButtonText={__DARWIN__ ? 'Save and Retry' : 'Save and retry'}
-            okButtonDisabled={disabled}
-          />
+          <OkCancelButtonGroup okButtonDisabled={disabled} />
         </DialogFooter>
       </Dialog>
     )
@@ -108,13 +115,10 @@ export class GenericGitAuthentication extends React.Component<
   }
 
   private save = () => {
-    this.props.onDismiss()
-
     this.props.onSave(
-      this.props.hostname,
-      this.state.username,
-      this.state.password,
-      this.props.retryAction
+      this.props.username ?? this.state.username,
+      this.state.password
     )
+    this.props.onDismiss()
   }
 }
diff --git a/app/src/ui/history/commit-list-item.tsx b/app/src/ui/history/commit-list-item.tsx
index 374a299173f..586a7fdccbf 100644
--- a/app/src/ui/history/commit-list-item.tsx
+++ b/app/src/ui/history/commit-list-item.tsx
@@ -1,24 +1,15 @@
+/* eslint-disable jsx-a11y/no-static-element-interactions */
 import * as React from 'react'
-import { Commit, CommitOneLine } from '../../models/commit'
+import { Commit } from '../../models/commit'
 import { GitHubRepository } from '../../models/github-repository'
 import { IAvatarUser, getAvatarUsersForCommit } from '../../models/avatar'
 import { RichText } from '../lib/rich-text'
 import { RelativeTime } from '../relative-time'
-import { getDotComAPIEndpoint } from '../../lib/api'
-import { clipboard } from 'electron'
-import { showContextualMenu } from '../../lib/menu-item'
 import { CommitAttribution } from '../lib/commit-attribution'
 import { AvatarStack } from '../lib/avatar-stack'
-import { IMenuItem } from '../../lib/menu-item'
 import { Octicon } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import * as octicons from '../octicons/octicons.generated'
 import { Draggable } from '../lib/draggable'
-import {
-  enableAmendingCommits,
-  enableBranchFromCommit,
-  enableResetToCommit,
-  enableSquashing,
-} from '../../lib/feature-flag'
 import { dragAndDropManager } from '../../lib/drag-and-drop-manager'
 import {
   DragType,
@@ -26,25 +17,15 @@ import {
   DropTargetType,
 } from '../../models/drag-drop'
 import classNames from 'classnames'
+import { TooltippedContent } from '../lib/tooltipped-content'
+import { Account } from '../../models/account'
+import { Emoji } from '../../lib/emoji'
 
 interface ICommitProps {
   readonly gitHubRepository: GitHubRepository | null
   readonly commit: Commit
   readonly selectedCommits: ReadonlyArray<Commit>
-  readonly emoji: Map<string, string>
-  readonly isLocal: boolean
-  readonly canBeUndone: boolean
-  readonly canBeAmended: boolean
-  readonly canBeResetTo: boolean
-  readonly onResetToCommit?: (commit: Commit) => void
-  readonly onUndoCommit?: (commit: Commit) => void
-  readonly onRevertCommit?: (commit: Commit) => void
-  readonly onViewCommitOnGitHub?: (sha: string) => void
-  readonly onCreateBranch?: (commit: CommitOneLine) => void
-  readonly onCreateTag?: (targetCommitSha: string) => void
-  readonly onDeleteTag?: (tagName: string) => void
-  readonly onAmendCommit?: (commit: Commit, isLocalCommit: boolean) => void
-  readonly onCherryPick?: (commits: ReadonlyArray<CommitOneLine>) => void
+  readonly emoji: Map<string, Emoji>
   readonly onRenderCommitDragElement?: (commit: Commit) => void
   readonly onRemoveDragElement?: () => void
   readonly onSquash?: (
@@ -52,11 +33,15 @@ interface ICommitProps {
     squashOnto: Commit,
     isInvokedByContextMenu: boolean
   ) => void
+  /**
+   * Whether or not the commit can be dragged for certain operations like squash,
+   * cherry-pick, reorder, etc. Defaults to false.
+   */
+  readonly isDraggable?: boolean
   readonly showUnpushedIndicator: boolean
   readonly unpushedIndicatorTitle?: string
-  readonly unpushedTags?: ReadonlyArray<string>
-  readonly isCherryPickInProgress?: boolean
   readonly disableSquashing?: boolean
+  readonly accounts: ReadonlyArray<Account>
 }
 
 interface ICommitListItemState {
@@ -93,7 +78,6 @@ export class CommitListItem extends React.PureComponent<
   private onMouseUp = () => {
     const { onSquash, selectedCommits, commit, disableSquashing } = this.props
     if (
-      enableSquashing() &&
       disableSquashing !== true &&
       dragAndDropManager.isDragOfTypeInProgress(DragType.Commit) &&
       onSquash !== undefined &&
@@ -111,7 +95,6 @@ export class CommitListItem extends React.PureComponent<
     if (
       disableSquashing !== true &&
       dragAndDropManager.isDragOfTypeInProgress(DragType.Commit) &&
-      enableSquashing() &&
       !isSelected
     ) {
       dragAndDropManager.emitEnterDropTarget({
@@ -132,7 +115,7 @@ export class CommitListItem extends React.PureComponent<
       author: { date },
     } = commit
 
-    const isDraggable = this.canCherryPick()
+    const isDraggable = this.props.isDraggable || false
     const hasEmptySummary = commit.summary.length === 0
     const commitSummary = hasEmptySummary
       ? 'Empty commit message'
@@ -157,7 +140,6 @@ export class CommitListItem extends React.PureComponent<
       >
         <div
           className="commit"
-          onContextMenu={this.onContextMenu}
           onMouseEnter={this.onMouseEnter}
           onMouseLeave={this.onMouseLeave}
           onMouseUp={this.onMouseUp}
@@ -170,7 +152,10 @@ export class CommitListItem extends React.PureComponent<
               renderUrlsAsLinks={false}
             />
             <div className="description">
-              <AvatarStack users={this.state.avatarUsers} />
+              <AvatarStack
+                users={this.state.avatarUsers}
+                accounts={this.props.accounts}
+              />
               <div className="byline">
                 <CommitAttribution
                   gitHubRepository={this.props.gitHubRepository}
@@ -208,241 +193,16 @@ export class CommitListItem extends React.PureComponent<
     }
 
     return (
-      <div
+      <TooltippedContent
+        tagName="div"
         className="unpushed-indicator"
-        title={this.props.unpushedIndicatorTitle}
+        tooltip={this.props.unpushedIndicatorTitle}
       >
-        <Octicon symbol={OcticonSymbol.arrowUp} />
-      </div>
-    )
-  }
-
-  private onAmendCommit = () => {
-    this.props.onAmendCommit?.(this.props.commit, this.props.isLocal)
-  }
-
-  private onCopySHA = () => {
-    clipboard.writeText(this.props.commit.sha)
-  }
-
-  private onViewOnGitHub = () => {
-    if (this.props.onViewCommitOnGitHub) {
-      this.props.onViewCommitOnGitHub(this.props.commit.sha)
-    }
-  }
-
-  private onCreateTag = () => {
-    if (this.props.onCreateTag) {
-      this.props.onCreateTag(this.props.commit.sha)
-    }
-  }
-
-  private onCherryPick = () => {
-    if (this.props.onCherryPick !== undefined) {
-      this.props.onCherryPick(this.props.selectedCommits)
-    }
-  }
-
-  private onSquash = () => {
-    if (this.props.onSquash !== undefined) {
-      this.props.onSquash(this.props.selectedCommits, this.props.commit, true)
-    }
-  }
-
-  private onContextMenu = (event: React.MouseEvent<any>) => {
-    event.preventDefault()
-
-    let items: IMenuItem[] = []
-    if (this.props.selectedCommits.length > 1) {
-      items = this.getContextMenuMultipleCommits()
-    } else {
-      items = this.getContextMenuForSingleCommit()
-    }
-
-    showContextualMenu(items)
-  }
-
-  private getContextMenuForSingleCommit(): IMenuItem[] {
-    let viewOnGitHubLabel = 'View on GitHub'
-    const gitHubRepository = this.props.gitHubRepository
-
-    if (
-      gitHubRepository &&
-      gitHubRepository.endpoint !== getDotComAPIEndpoint()
-    ) {
-      viewOnGitHubLabel = 'View on GitHub Enterprise'
-    }
-
-    const items: IMenuItem[] = []
-
-    if (this.props.canBeAmended && enableAmendingCommits()) {
-      items.push({
-        label: __DARWIN__ ? 'Amend Commit…' : 'Amend commit…',
-        action: this.onAmendCommit,
-      })
-    }
-
-    if (this.props.canBeUndone) {
-      items.push({
-        label: __DARWIN__ ? 'Undo Commit…' : 'Undo commit…',
-        action: () => {
-          if (this.props.onUndoCommit) {
-            this.props.onUndoCommit(this.props.commit)
-          }
-        },
-        enabled: this.props.onUndoCommit !== undefined,
-      })
-    }
-
-    if (enableResetToCommit()) {
-      items.push({
-        label: __DARWIN__ ? 'Reset to Commit…' : 'Reset to commit…',
-        action: () => {
-          if (this.props.onResetToCommit) {
-            this.props.onResetToCommit(this.props.commit)
-          }
-        },
-        enabled:
-          this.props.canBeResetTo && this.props.onResetToCommit !== undefined,
-      })
-    }
-
-    items.push({
-      label: __DARWIN__
-        ? 'Revert Changes in Commit'
-        : 'Revert changes in commit',
-      action: () => {
-        if (this.props.onRevertCommit) {
-          this.props.onRevertCommit(this.props.commit)
-        }
-      },
-      enabled: this.props.onRevertCommit !== undefined,
-    })
-
-    items.push({ type: 'separator' })
-
-    if (enableBranchFromCommit()) {
-      items.push({
-        label: __DARWIN__
-          ? 'Create Branch from Commit'
-          : 'Create branch from commit',
-        action: () => {
-          if (this.props.onCreateBranch) {
-            this.props.onCreateBranch(this.props.commit)
-          }
-        },
-      })
-    }
-
-    items.push({
-      label: 'Create Tag…',
-      action: this.onCreateTag,
-      enabled: this.props.onCreateTag !== undefined,
-    })
-
-    const deleteTagsMenuItem = this.getDeleteTagsMenuItem()
-
-    if (deleteTagsMenuItem !== null) {
-      items.push(
-        {
-          type: 'separator',
-        },
-        deleteTagsMenuItem
-      )
-    }
-
-    items.push({
-      label: __DARWIN__ ? 'Cherry-pick Commit…' : 'Cherry-pick commit…',
-      action: this.onCherryPick,
-      enabled: this.canCherryPick(),
-    })
-
-    items.push(
-      { type: 'separator' },
-      {
-        label: 'Copy SHA',
-        action: this.onCopySHA,
-      },
-      {
-        label: viewOnGitHubLabel,
-        action: this.onViewOnGitHub,
-        enabled: !this.props.isLocal && !!gitHubRepository,
-      }
-    )
-
-    return items
-  }
-
-  private getContextMenuMultipleCommits(): IMenuItem[] {
-    const items: IMenuItem[] = []
-
-    const count = this.props.selectedCommits.length
-    items.push({
-      label: __DARWIN__
-        ? `Cherry-pick ${count} Commits…`
-        : `Cherry-pick ${count} commits…`,
-      action: this.onCherryPick,
-      enabled: this.canCherryPick(),
-    })
-
-    if (enableSquashing()) {
-      items.push({
-        label: __DARWIN__
-          ? `Squash ${count} Commits…`
-          : `Squash ${count} commits…`,
-        action: this.onSquash,
-      })
-    }
-
-    return items
-  }
-
-  private canCherryPick(): boolean {
-    const { onCherryPick, isCherryPickInProgress } = this.props
-    return (
-      onCherryPick !== undefined &&
-      this.onSquash !== undefined &&
-      isCherryPickInProgress === false
-      // TODO: isSquashInProgress === false
+        <Octicon symbol={octicons.arrowUp} />
+      </TooltippedContent>
     )
   }
 
-  private getDeleteTagsMenuItem(): IMenuItem | null {
-    const { unpushedTags, onDeleteTag, commit } = this.props
-
-    if (
-      onDeleteTag === undefined ||
-      unpushedTags === undefined ||
-      commit.tags.length === 0
-    ) {
-      return null
-    }
-
-    if (commit.tags.length === 1) {
-      const tagName = commit.tags[0]
-
-      return {
-        label: `Delete tag ${tagName}`,
-        action: () => onDeleteTag(tagName),
-        enabled: unpushedTags.includes(tagName),
-      }
-    }
-
-    // Convert tags to a Set to avoid O(n^2)
-    const unpushedTagsSet = new Set(unpushedTags)
-
-    return {
-      label: 'Delete tag…',
-      submenu: commit.tags.map(tagName => {
-        return {
-          label: tagName,
-          action: () => onDeleteTag(tagName),
-          enabled: unpushedTagsSet.has(tagName),
-        }
-      }),
-    }
-  }
-
   private onDragStart = () => {
     // Removes active status from commit selection so they do not appear
     // highlighted in commit list.
@@ -472,7 +232,7 @@ function renderRelativeTime(date: Date) {
   return (
     <>
       {` • `}
-      <RelativeTime date={date} abbreviate={true} />
+      <RelativeTime date={date} />
     </>
   )
 }
diff --git a/app/src/ui/history/commit-list.tsx b/app/src/ui/history/commit-list.tsx
index 3943ed78ee8..fcd47c84c3b 100644
--- a/app/src/ui/history/commit-list.tsx
+++ b/app/src/ui/history/commit-list.tsx
@@ -3,9 +3,31 @@ import memoize from 'memoize-one'
 import { GitHubRepository } from '../../models/github-repository'
 import { Commit, CommitOneLine } from '../../models/commit'
 import { CommitListItem } from './commit-list-item'
-import { List } from '../lib/list'
+import { KeyboardInsertionData, List } from '../lib/list'
 import { arrayEquals } from '../../lib/equality'
 import { DragData, DragType } from '../../models/drag-drop'
+import classNames from 'classnames'
+import memoizeOne from 'memoize-one'
+import { IMenuItem, showContextualMenu } from '../../lib/menu-item'
+import {
+  enableCheckoutCommit,
+  enableResetToCommit,
+} from '../../lib/feature-flag'
+import { getDotComAPIEndpoint } from '../../lib/api'
+import { clipboard } from 'electron'
+import { RowIndexPath } from '../lib/list/list-row-index-path'
+import { assertNever } from '../../lib/fatal-error'
+import { CommitDragElement } from '../drag-elements/commit-drag-element'
+import { AriaLiveContainer } from '../accessibility/aria-live-container'
+import debounce from 'lodash/debounce'
+import {
+  Popover,
+  PopoverAnchorPosition,
+  PopoverScreenBorderPadding,
+} from '../lib/popover'
+import { KeyboardShortcut } from '../keyboard-shortcut/keyboard-shortcut'
+import { Account } from '../../models/account'
+import { Emoji } from '../../lib/emoji'
 
 const RowHeight = 50
 
@@ -23,57 +45,69 @@ interface ICommitListProps {
   readonly selectedSHAs: ReadonlyArray<string>
 
   /** Whether or not commits in this list can be undone. */
-  readonly canUndoCommits: boolean
+  readonly canUndoCommits?: boolean
 
   /** Whether or not commits in this list can be amended. */
-  readonly canAmendCommits: boolean
+  readonly canAmendCommits?: boolean
 
   /** Whether or the user can reset to commits in this list. */
-  readonly canResetToCommits: boolean
+  readonly canResetToCommits?: boolean
 
   /** The emoji lookup to render images inline */
-  readonly emoji: Map<string, string>
+  readonly emoji: Map<string, Emoji>
 
   /** The list of known local commits for the current branch */
   readonly localCommitSHAs: ReadonlyArray<string>
 
   /** The message to display inside the list when no results are displayed */
-  readonly emptyListMessage: JSX.Element | string
+  readonly emptyListMessage?: JSX.Element | string
+
+  /** Data to be reordered via keyboard */
+  readonly keyboardReorderData?: KeyboardInsertionData
 
   /** Callback which fires when a commit has been selected in the list */
-  readonly onCommitsSelected: (
+  readonly onCommitsSelected?: (
     commits: ReadonlyArray<Commit>,
     isContiguous: boolean
   ) => void
 
   /** Callback that fires when a scroll event has occurred */
-  readonly onScroll: (start: number, end: number) => void
+  readonly onScroll?: (start: number, end: number) => void
 
   /** Callback to fire to undo a given commit in the current repository */
-  readonly onUndoCommit: ((commit: Commit) => void) | undefined
+  readonly onUndoCommit?: (commit: Commit) => void
 
   /** Callback to fire to reset to a given commit in the current repository */
-  readonly onResetToCommit: (commit: Commit) => void
+  readonly onResetToCommit?: (commit: Commit) => void
 
   /** Callback to fire to revert a given commit in the current repository */
-  readonly onRevertCommit: ((commit: Commit) => void) | undefined
+  readonly onRevertCommit?: (commit: Commit) => void
 
   readonly onAmendCommit?: (commit: Commit, isLocalCommit: boolean) => void
 
   /** Callback to fire to open a given commit on GitHub */
-  readonly onViewCommitOnGitHub: (sha: string) => void
+  readonly onViewCommitOnGitHub?: (sha: string) => void
+
+  /** Callback to fire to cancel a keyboard reordering operation */
+  readonly onCancelKeyboardReorder?: () => void
 
   /**
    * Callback to fire to create a branch from a given commit in the current
    * repository
    */
-  readonly onCreateBranch: (commit: CommitOneLine) => void
+  readonly onCreateBranch?: (commit: CommitOneLine) => void
+
+  /**
+   * Callback to fire to checkout the selected commit in the current
+   * repository
+   */
+  readonly onCheckoutCommit?: (commit: CommitOneLine) => void
 
   /** Callback to fire to open the dialog to create a new tag on the given commit */
-  readonly onCreateTag: (targetCommitSha: string) => void
+  readonly onCreateTag?: (targetCommitSha: string) => void
 
   /** Callback to fire to delete an unpushed tag */
-  readonly onDeleteTag: (tagName: string) => void
+  readonly onDeleteTag?: (tagName: string) => void
 
   /**
    * A handler called whenever the user drops commits on the list to be inserted.
@@ -90,10 +124,13 @@ interface ICommitListProps {
   ) => void
 
   /** Callback to fire to cherry picking the commit  */
-  readonly onCherryPick: (commits: ReadonlyArray<CommitOneLine>) => void
+  readonly onCherryPick?: (commits: ReadonlyArray<CommitOneLine>) => void
+
+  /** Callback to fire to start reordering commits with the keyboard */
+  readonly onKeyboardReorder?: (toReorder: ReadonlyArray<Commit>) => void
 
   /** Callback to fire to squashing commits  */
-  readonly onSquash: (
+  readonly onSquash?: (
     toSquash: ReadonlyArray<Commit>,
     squashOnto: Commit,
     lastRetainedCommitRef: string | null,
@@ -113,30 +150,106 @@ interface ICommitListProps {
   readonly isLocalRepository: boolean
 
   /* Tags that haven't been pushed yet. This is used to show the unpushed indicator */
-  readonly tagsToPush: ReadonlyArray<string> | null
+  readonly tagsToPush?: ReadonlyArray<string>
 
   /** Whether or not commits in this list can be reordered. */
-  readonly reorderingEnabled: boolean
+  readonly reorderingEnabled?: boolean
 
-  /** Whether a cherry pick is progress */
-  readonly isCherryPickInProgress: boolean
+  /** Whether a multi commit operation is in progress (in particular the
+   * conflicts resolution step allows interaction with history) */
+  readonly isMultiCommitOperationInProgress?: boolean
 
   /** Callback to render commit drag element */
-  readonly onRenderCommitDragElement: (
+  readonly onRenderCommitDragElement?: (
     commit: Commit,
     selectedCommits: ReadonlyArray<Commit>
   ) => void
 
   /** Callback to remove commit drag element */
-  readonly onRemoveCommitDragElement: () => void
+  readonly onRemoveCommitDragElement?: () => void
+
+  /** Whether reordering should be enabled on the commit list */
+  readonly disableReordering?: boolean
 
   /** Whether squashing should be enabled on the commit list */
   readonly disableSquashing?: boolean
+
+  /** Shas that should be highlighted */
+  readonly shasToHighlight?: ReadonlyArray<string>
+
+  readonly accounts: ReadonlyArray<Account>
+
+  /** This will make the list semantics friendly to screen reader users in browse mode. */
+  readonly isInformationalView?: boolean
+}
+
+interface ICommitListState {
+  /**
+   * Aria live message used to guide users through the keyboard reordering
+   * process.
+   */
+  readonly reorderingMessage: string
 }
 
 /** A component which displays the list of commits. */
-export class CommitList extends React.Component<ICommitListProps, {}> {
+export class CommitList extends React.Component<
+  ICommitListProps,
+  ICommitListState
+> {
   private commitsHash = memoize(makeCommitsHash, arrayEquals)
+  private commitIndexBySha = memoizeOne(
+    (commitSHAs: ReadonlyArray<string>) =>
+      new Map(commitSHAs.map((sha, index) => [sha, index]))
+  )
+
+  private containerRef = React.createRef<HTMLDivElement>()
+  private listRef = React.createRef<List>()
+
+  // This function is debounced to avoid updating the aria live region too
+  // frequently on every key press.
+  private updateKeyboardReorderingMessage = debounce(
+    (insertionIndexPath: RowIndexPath | null) => {
+      const { keyboardReorderData } = this.props
+
+      if (keyboardReorderData === undefined) {
+        this.setState({ reorderingMessage: '' })
+        return
+      }
+
+      const plural = keyboardReorderData.commits.length === 1 ? '' : 's'
+
+      if (insertionIndexPath !== null) {
+        const { row } = insertionIndexPath
+
+        const insertionPoint =
+          row < this.props.commitSHAs.length
+            ? `before commit ${row + 1}`
+            : `after commit ${row}`
+
+        this.setState({
+          reorderingMessage: `Press Enter to insert the selected commit${plural} ${insertionPoint} or Escape to cancel.`,
+        })
+        return
+      }
+
+      this.setState({
+        reorderingMessage: `Use the Up and Down arrow keys to choose a new location for the selected commit${plural}, then press Enter to confirm or Escape to cancel.`,
+      })
+    },
+    500
+  )
+
+  public constructor(props: ICommitListProps) {
+    super(props)
+
+    this.state = { reorderingMessage: '' }
+  }
+
+  public componentDidUpdate(prevProps: ICommitListProps) {
+    if (this.props.keyboardReorderData !== prevProps.keyboardReorderData) {
+      this.updateKeyboardReorderingMessage(null)
+    }
+  }
 
   private getVisibleCommits(): ReadonlyArray<Commit> {
     const commits = new Array<Commit>()
@@ -150,6 +263,9 @@ export class CommitList extends React.Component<ICommitListProps, {}> {
     return commits
   }
 
+  private isLocalCommit = (sha: string) =>
+    this.props.localCommitSHAs.includes(sha)
+
   private renderCommit = (row: number) => {
     const sha = this.props.commitSHAs[row]
     const commit = this.props.commitLookup.get(sha)
@@ -163,58 +279,42 @@ export class CommitList extends React.Component<ICommitListProps, {}> {
       return null
     }
 
-    const tagsToPushSet = new Set(this.props.tagsToPush || [])
-
-    const isLocal = this.props.localCommitSHAs.includes(commit.sha)
-    const unpushedTags = commit.tags.filter(tagName =>
-      tagsToPushSet.has(tagName)
-    )
+    const isLocal = this.isLocalCommit(commit.sha)
+    const unpushedTags = this.getUnpushedTags(commit)
 
     const showUnpushedIndicator =
       (isLocal || unpushedTags.length > 0) &&
       this.props.isLocalRepository === false
 
-    // The user can reset to any commit up to the first non-local one (included).
-    // They cannot reset to the most recent commit... because they're already
-    // in it.
-    const isResettableCommit =
-      row > 0 && row <= this.props.localCommitSHAs.length
-
     return (
       <CommitListItem
         key={commit.sha}
         gitHubRepository={this.props.gitHubRepository}
-        isLocal={isLocal}
-        canBeUndone={this.props.canUndoCommits && isLocal && row === 0}
-        canBeAmended={this.props.canAmendCommits && row === 0}
-        canBeResetTo={this.props.canResetToCommits && isResettableCommit}
         showUnpushedIndicator={showUnpushedIndicator}
         unpushedIndicatorTitle={this.getUnpushedIndicatorTitle(
           isLocal,
           unpushedTags.length
         )}
-        unpushedTags={unpushedTags}
         commit={commit}
         emoji={this.props.emoji}
-        onCreateBranch={this.props.onCreateBranch}
-        onCreateTag={this.props.onCreateTag}
-        onDeleteTag={this.props.onDeleteTag}
-        onCherryPick={this.props.onCherryPick}
+        isDraggable={
+          this.props.isMultiCommitOperationInProgress === false &&
+          !this.inKeyboardReorderMode
+        }
         onSquash={this.onSquash}
-        onResetToCommit={this.props.onResetToCommit}
-        onUndoCommit={this.props.onUndoCommit}
-        onRevertCommit={this.props.onRevertCommit}
-        onAmendCommit={this.props.onAmendCommit}
-        onViewCommitOnGitHub={this.props.onViewCommitOnGitHub}
-        selectedCommits={this.lookupCommits(this.props.selectedSHAs)}
-        isCherryPickInProgress={this.props.isCherryPickInProgress}
+        selectedCommits={this.selectedCommits}
         onRenderCommitDragElement={this.onRenderCommitDragElement}
         onRemoveDragElement={this.props.onRemoveCommitDragElement}
         disableSquashing={this.props.disableSquashing}
+        accounts={this.props.accounts}
       />
     )
   }
 
+  private get inKeyboardReorderMode() {
+    return this.props.keyboardReorderData !== undefined
+  }
+
   private getLastRetainedCommitRef(indexes: ReadonlyArray<number>) {
     const maxIndex = Math.max(...indexes)
     const lastIndex = this.props.commitSHAs.length - 1
@@ -233,7 +333,7 @@ export class CommitList extends React.Component<ICommitListProps, {}> {
     const indexes = [...toSquash, squashOnto].map(v =>
       this.props.commitSHAs.findIndex(sha => sha === v.sha)
     )
-    this.props.onSquash(
+    this.props.onSquash?.(
       toSquash,
       squashOnto,
       this.getLastRetainedCommitRef(indexes),
@@ -242,10 +342,7 @@ export class CommitList extends React.Component<ICommitListProps, {}> {
   }
 
   private onRenderCommitDragElement = (commit: Commit) => {
-    this.props.onRenderCommitDragElement(
-      commit,
-      this.lookupCommits(this.props.selectedSHAs)
-    )
+    this.props.onRenderCommitDragElement?.(commit, this.selectedCommits)
   }
 
   private getUnpushedIndicatorTitle(
@@ -265,16 +362,19 @@ export class CommitList extends React.Component<ICommitListProps, {}> {
     return undefined
   }
 
+  private get selectedCommits() {
+    return this.lookupCommits(this.props.selectedSHAs)
+  }
+
+  private getUnpushedTags(commit: Commit) {
+    const tagsToPushSet = new Set(this.props.tagsToPush ?? [])
+    return commit.tags.filter(tagName => tagsToPushSet.has(tagName))
+  }
+
   private onSelectionChanged = (rows: ReadonlyArray<number>) => {
-    // Multi select can give something like 1, 5, 3 depending on order that user
-    // selects. We want to ensure they are in chronological order for best
-    // cherry-picking results. If user wants to use cherry-picking for
-    // reordering, they will need to do multiple cherry-picks.
-    // Goal: first commit in history -> first on array
-    const sorted = [...rows].sort((a, b) => b - a)
-    const selectedShas = sorted.map(r => this.props.commitSHAs[r])
+    const selectedShas = rows.map(r => this.props.commitSHAs[r])
     const selectedCommits = this.lookupCommits(selectedShas)
-    this.props.onCommitsSelected(selectedCommits, this.isContiguous(sorted))
+    this.props.onCommitsSelected?.(selectedCommits, this.isContiguous(rows))
   }
 
   /**
@@ -288,13 +388,15 @@ export class CommitList extends React.Component<ICommitListProps, {}> {
       return true
     }
 
-    for (let i = 0; i < indexes.length; i++) {
-      const current = indexes[i]
-      if (i + 1 === indexes.length) {
+    const sorted = indexes.toSorted((a, b) => b - a)
+
+    for (let i = 0; i < sorted.length; i++) {
+      const current = sorted[i]
+      if (i + 1 === sorted.length) {
         continue
       }
 
-      if (current - 1 !== indexes[i + 1]) {
+      if (current - 1 !== sorted[i + 1]) {
         return false
       }
     }
@@ -308,7 +410,7 @@ export class CommitList extends React.Component<ICommitListProps, {}> {
     const sha = this.props.commitSHAs[row]
     const commit = this.props.commitLookup.get(sha)
     if (commit) {
-      this.props.onCommitsSelected([commit], true)
+      this.props.onCommitsSelected?.([commit], true)
     }
   }
 
@@ -333,57 +435,448 @@ export class CommitList extends React.Component<ICommitListProps, {}> {
     const numberOfRows = Math.ceil(clientHeight / RowHeight)
     const top = Math.floor(scrollTop / RowHeight)
     const bottom = top + numberOfRows
-    this.props.onScroll(top, bottom)
+    this.props.onScroll?.(top, bottom)
 
     // Pass new scroll value so the scroll position will be remembered (if the callback has been supplied).
-    if (this.props.onCompareListScrolled != null) {
-      this.props.onCompareListScrolled(scrollTop)
-    }
+    this.props.onCompareListScrolled?.(scrollTop)
   }
 
-  private rowForSHA(sha_: string | null): number {
-    const sha = sha_
-    if (!sha) {
-      return -1
+  private rowForSHA(sha: string) {
+    return this.commitIndexBySha(this.props.commitSHAs).get(sha) ?? -1
+  }
+
+  private getRowCustomClassMap = () => {
+    const { commitSHAs, shasToHighlight } = this.props
+    if (shasToHighlight === undefined || shasToHighlight.length === 0) {
+      return undefined
+    }
+
+    const rowsForShasNotInDiff = commitSHAs
+      .filter(sha => shasToHighlight.includes(sha))
+      .map(sha => this.rowForSHA(sha))
+
+    if (rowsForShasNotInDiff.length === 0) {
+      return undefined
     }
 
-    return this.props.commitSHAs.findIndex(s => s === sha)
+    const rowClassMap = new Map<string, ReadonlyArray<number>>()
+    rowClassMap.set('highlighted', rowsForShasNotInDiff)
+    return rowClassMap
+  }
+
+  public focus() {
+    this.listRef.current?.focus()
   }
 
   public render() {
-    if (this.props.commitSHAs.length === 0) {
+    const {
+      commitSHAs,
+      selectedSHAs,
+      shasToHighlight,
+      emptyListMessage,
+      reorderingEnabled,
+      isMultiCommitOperationInProgress,
+    } = this.props
+    if (commitSHAs.length === 0) {
       return (
-        <div className="panel blankslate">{this.props.emptyListMessage}</div>
+        <div className="panel blankslate">
+          {emptyListMessage ?? 'No commits to list'}
+        </div>
       )
     }
 
+    const classes = classNames({
+      'has-highlighted-commits':
+        shasToHighlight !== undefined && shasToHighlight.length > 0,
+    })
+
+    const selectedRows = selectedSHAs
+      .map(sha => this.rowForSHA(sha))
+      .filter(r => r !== -1)
+
     return (
-      <div id="commit-list">
+      <div id="commit-list" className={classes} ref={this.containerRef}>
+        {this.renderReorderCommitsHint()}
         <List
-          rowCount={this.props.commitSHAs.length}
+          ariaLabel="Commits"
+          role={this.props.isInformationalView === true ? 'list' : 'listbox'}
+          ref={this.listRef}
+          rowCount={commitSHAs.length}
           rowHeight={RowHeight}
-          selectedRows={this.props.selectedSHAs.map(sha => this.rowForSHA(sha))}
+          selectedRows={selectedRows}
           rowRenderer={this.renderCommit}
           onDropDataInsertion={this.onDropDataInsertion}
           onSelectionChanged={this.onSelectionChanged}
           onSelectedRowChanged={this.onSelectedRowChanged}
+          onKeyboardInsertionIndexPathChanged={
+            this.onKeyboardInsertionIndexPathChanged
+          }
+          onCancelKeyboardInsertion={this.props.onCancelKeyboardReorder}
+          onConfirmKeyboardInsertion={this.onConfirmKeyboardReorder}
+          onRowContextMenu={this.onRowContextMenu}
           selectionMode="multi"
           onScroll={this.onScroll}
+          keyboardInsertionData={this.props.keyboardReorderData}
+          keyboardInsertionElementRenderer={this.renderKeyboardInsertionElement}
           insertionDragType={
-            this.props.reorderingEnabled ? DragType.Commit : undefined
+            reorderingEnabled === true &&
+            isMultiCommitOperationInProgress === false
+              ? DragType.Commit
+              : undefined
           }
           invalidationProps={{
             commits: this.props.commitSHAs,
             localCommitSHAs: this.props.localCommitSHAs,
             commitLookupHash: this.commitsHash(this.getVisibleCommits()),
             tagsToPush: this.props.tagsToPush,
+            shasToHighlight: this.props.shasToHighlight,
           }}
           setScrollTop={this.props.compareListScrollTop}
+          rowCustomClassNameMap={this.getRowCustomClassMap()}
         />
+        <AriaLiveContainer message={this.state.reorderingMessage} />
       </div>
     )
   }
 
+  private renderReorderCommitsHint = () => {
+    if (!this.inKeyboardReorderMode) {
+      return null
+    }
+
+    const containerWidth = this.containerRef.current?.clientWidth ?? 0
+    const reorderCommitsHintTitle = __DARWIN__
+      ? 'Reorder Commits'
+      : 'Reorder commits'
+
+    return (
+      <Popover
+        className="reorder-commits-hint-popover"
+        anchor={this.containerRef.current}
+        anchorOffset={PopoverScreenBorderPadding}
+        anchorPosition={PopoverAnchorPosition.Top}
+        isDialog={false}
+        trapFocus={false}
+        style={{
+          width: `${containerWidth - 2 * PopoverScreenBorderPadding}px`,
+        }}
+      >
+        <h4>{reorderCommitsHintTitle}</h4>
+        <p>
+          Use <KeyboardShortcut darwinKeys={['↑']} keys={['↑']} />
+          <KeyboardShortcut darwinKeys={['↓']} keys={['↓']} /> to choose a new
+          location.
+        </p>
+        <p>
+          Press <KeyboardShortcut darwinKeys={['⏎']} keys={['⏎']} /> to confirm.
+        </p>
+      </Popover>
+    )
+  }
+
+  private renderKeyboardInsertionElement = (
+    data: KeyboardInsertionData
+  ): JSX.Element | null => {
+    const { emoji, gitHubRepository } = this.props
+    const { commits } = data
+
+    if (commits.length === 0) {
+      return null
+    }
+
+    switch (data.type) {
+      case DragType.Commit:
+        return (
+          <CommitDragElement
+            gitHubRepository={gitHubRepository}
+            commit={commits[0]}
+            selectedCommits={commits}
+            isKeyboardInsertion={true}
+            emoji={emoji}
+            accounts={this.props.accounts}
+          />
+        )
+      default:
+        return assertNever(data.type, `Unknown drag element type: ${data}`)
+    }
+  }
+
+  private onRowContextMenu = (
+    row: number,
+    event: React.MouseEvent<HTMLDivElement>
+  ) => {
+    event.preventDefault()
+
+    if (this.inKeyboardReorderMode) {
+      return
+    }
+
+    const sha = this.props.commitSHAs[row]
+    const commit = this.props.commitLookup.get(sha)
+    if (commit === undefined) {
+      if (__DEV__) {
+        log.warn(
+          `[CommitList]: the commit '${sha}' does not exist in the cache`
+        )
+      }
+      return
+    }
+
+    let items: IMenuItem[] = []
+    if (this.props.selectedSHAs.length > 1) {
+      items = this.getContextMenuMultipleCommits(commit)
+    } else {
+      items = this.getContextMenuForSingleCommit(row, commit)
+    }
+
+    showContextualMenu(items)
+  }
+
+  private getContextMenuForSingleCommit(
+    row: number,
+    commit: Commit
+  ): IMenuItem[] {
+    const isLocal = this.isLocalCommit(commit.sha)
+
+    const canBeUndone =
+      this.props.canUndoCommits === true && isLocal && row === 0
+    const canBeAmended = this.props.canAmendCommits === true && row === 0
+    // The user can reset to any commit up to the first non-local one (included).
+    // They cannot reset to the most recent commit... because they're already
+    // in it.
+    const isResettableCommit =
+      row > 0 && row <= this.props.localCommitSHAs.length
+    const canBeResetTo =
+      this.props.canResetToCommits === true && isResettableCommit
+    const canBeCheckedOut = row > 0 //Cannot checkout the current commit
+
+    let viewOnGitHubLabel = 'View on GitHub'
+    const gitHubRepository = this.props.gitHubRepository
+
+    if (
+      gitHubRepository &&
+      gitHubRepository.endpoint !== getDotComAPIEndpoint()
+    ) {
+      viewOnGitHubLabel = 'View on GitHub Enterprise'
+    }
+
+    const items: IMenuItem[] = []
+
+    if (canBeAmended) {
+      items.push({
+        label: __DARWIN__ ? 'Amend Commit…' : 'Amend commit…',
+        action: () => this.props.onAmendCommit?.(commit, isLocal),
+      })
+    }
+
+    if (canBeUndone) {
+      items.push({
+        label: __DARWIN__ ? 'Undo Commit…' : 'Undo commit…',
+        action: () => {
+          if (this.props.onUndoCommit) {
+            this.props.onUndoCommit(commit)
+          }
+        },
+        enabled: this.props.onUndoCommit !== undefined,
+      })
+    }
+
+    if (enableResetToCommit()) {
+      items.push({
+        label: __DARWIN__ ? 'Reset to Commit…' : 'Reset to commit…',
+        action: () => {
+          if (this.props.onResetToCommit) {
+            this.props.onResetToCommit(commit)
+          }
+        },
+        enabled: canBeResetTo && this.props.onResetToCommit !== undefined,
+      })
+    }
+
+    if (enableCheckoutCommit()) {
+      items.push({
+        label: __DARWIN__ ? 'Checkout Commit' : 'Checkout commit',
+        action: () => {
+          this.props.onCheckoutCommit?.(commit)
+        },
+        enabled: canBeCheckedOut && this.props.onCheckoutCommit !== undefined,
+      })
+    }
+
+    items.push({
+      label: __DARWIN__ ? 'Reorder Commit' : 'Reorder commit',
+      action: () => {
+        this.props.onKeyboardReorder?.([commit])
+      },
+      enabled: this.canReorder(),
+    })
+
+    items.push(
+      {
+        label: __DARWIN__
+          ? 'Revert Changes in Commit'
+          : 'Revert changes in commit',
+        action: () => {
+          if (this.props.onRevertCommit) {
+            this.props.onRevertCommit(commit)
+          }
+        },
+        enabled: this.props.onRevertCommit !== undefined,
+      },
+      { type: 'separator' },
+      {
+        label: __DARWIN__
+          ? 'Create Branch from Commit'
+          : 'Create branch from commit',
+        action: () => {
+          if (this.props.onCreateBranch) {
+            this.props.onCreateBranch(commit)
+          }
+        },
+      },
+      {
+        label: 'Create Tag…',
+        action: () => this.props.onCreateTag?.(commit.sha),
+        enabled: this.props.onCreateTag !== undefined,
+      }
+    )
+
+    const deleteTagsMenuItem = this.getDeleteTagsMenuItem(commit)
+
+    if (deleteTagsMenuItem !== null) {
+      items.push(
+        {
+          type: 'separator',
+        },
+        deleteTagsMenuItem
+      )
+    }
+    const darwinTagsLabel = commit.tags.length > 1 ? 'Copy Tags' : 'Copy Tag'
+    const windowTagsLabel = commit.tags.length > 1 ? 'Copy tags' : 'Copy tag'
+    items.push(
+      {
+        label: __DARWIN__ ? 'Cherry-pick Commit…' : 'Cherry-pick commit…',
+        action: () => this.props.onCherryPick?.(this.selectedCommits),
+        enabled: this.canCherryPick(),
+      },
+      { type: 'separator' },
+      {
+        label: 'Copy SHA',
+        action: () => clipboard.writeText(commit.sha),
+      },
+      {
+        label: __DARWIN__ ? darwinTagsLabel : windowTagsLabel,
+        action: () => clipboard.writeText(commit.tags.join(' ')),
+        enabled: commit.tags.length > 0,
+      },
+      {
+        label: viewOnGitHubLabel,
+        action: () => this.props.onViewCommitOnGitHub?.(commit.sha),
+        enabled: !isLocal && !!gitHubRepository,
+      }
+    )
+
+    return items
+  }
+
+  private canCherryPick(): boolean {
+    const { onCherryPick, isMultiCommitOperationInProgress } = this.props
+    return (
+      onCherryPick !== undefined && isMultiCommitOperationInProgress === false
+    )
+  }
+
+  private canReorder = () =>
+    this.props.onKeyboardReorder !== undefined &&
+    this.props.disableReordering === false &&
+    this.props.isMultiCommitOperationInProgress === false
+
+  private canSquash(): boolean {
+    const { onSquash, disableSquashing, isMultiCommitOperationInProgress } =
+      this.props
+    return (
+      onSquash !== undefined &&
+      disableSquashing === false &&
+      isMultiCommitOperationInProgress === false
+    )
+  }
+
+  private getDeleteTagsMenuItem(commit: Commit): IMenuItem | null {
+    const { onDeleteTag } = this.props
+    const unpushedTags = this.getUnpushedTags(commit)
+
+    if (
+      onDeleteTag === undefined ||
+      unpushedTags === undefined ||
+      commit.tags.length === 0
+    ) {
+      return null
+    }
+
+    if (commit.tags.length === 1) {
+      const tagName = commit.tags[0]
+
+      return {
+        label: `Delete tag ${tagName}`,
+        action: () => onDeleteTag(tagName),
+        enabled: unpushedTags.includes(tagName),
+      }
+    }
+
+    // Convert tags to a Set to avoid O(n^2)
+    const unpushedTagsSet = new Set(unpushedTags)
+
+    return {
+      label: 'Delete tag…',
+      submenu: commit.tags.map(tagName => {
+        return {
+          label: tagName,
+          action: () => onDeleteTag(tagName),
+          enabled: unpushedTagsSet.has(tagName),
+        }
+      }),
+    }
+  }
+
+  private getContextMenuMultipleCommits(commit: Commit): IMenuItem[] {
+    const count = this.props.selectedSHAs.length
+
+    return [
+      {
+        label: __DARWIN__
+          ? `Cherry-pick ${count} Commits…`
+          : `Cherry-pick ${count} commits…`,
+        action: () => this.props.onCherryPick?.(this.selectedCommits),
+        enabled: this.canCherryPick(),
+      },
+      {
+        label: __DARWIN__
+          ? `Squash ${count} Commits…`
+          : `Squash ${count} commits…`,
+        action: () => this.onSquash(this.selectedCommits, commit, true),
+        enabled: this.canSquash(),
+      },
+      {
+        label: __DARWIN__
+          ? `Reorder ${count} Commits…`
+          : `Reorder ${count} commits…`,
+        action: () => this.props.onKeyboardReorder?.(this.selectedCommits),
+        enabled: this.canReorder(),
+      },
+    ]
+  }
+
+  private onKeyboardInsertionIndexPathChanged = (indexPath: RowIndexPath) => {
+    this.updateKeyboardReorderingMessage(indexPath)
+  }
+
+  private onConfirmKeyboardReorder = (
+    indexPath: RowIndexPath,
+    data: KeyboardInsertionData
+  ) => {
+    this.onDropDataInsertion(indexPath.row, data)
+  }
+
   private onDropDataInsertion = (row: number, data: DragData) => {
     if (
       this.props.onDropCommitInsertion === undefined ||
diff --git a/app/src/ui/history/commit-summary.tsx b/app/src/ui/history/commit-summary.tsx
deleted file mode 100644
index f16c83a66a5..00000000000
--- a/app/src/ui/history/commit-summary.tsx
+++ /dev/null
@@ -1,547 +0,0 @@
-import * as React from 'react'
-import classNames from 'classnames'
-
-import { Octicon } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
-import { RichText } from '../lib/rich-text'
-import { Repository } from '../../models/repository'
-import { Commit } from '../../models/commit'
-import { getAvatarUsersForCommit, IAvatarUser } from '../../models/avatar'
-import { AvatarStack } from '../lib/avatar-stack'
-import { CommitAttribution } from '../lib/commit-attribution'
-import { Tokenizer, TokenResult } from '../../lib/text-token-parser'
-import { wrapRichTextCommitMessage } from '../../lib/wrap-rich-text-commit-message'
-import { DiffOptions } from '../diff/diff-options'
-import { RepositorySectionTab } from '../../lib/app-state'
-import { IChangesetData } from '../../lib/git'
-import { TooltippedContent } from '../lib/tooltipped-content'
-import { clipboard } from 'electron'
-import { TooltipDirection } from '../lib/tooltip'
-import { AppFileStatusKind } from '../../models/status'
-import _ from 'lodash'
-
-interface ICommitSummaryProps {
-  readonly repository: Repository
-  readonly commits: ReadonlyArray<Commit>
-  readonly changesetData: IChangesetData
-  readonly emoji: Map<string, string>
-
-  /**
-   * Whether or not the commit body container should
-   * be rendered expanded or not. In expanded mode the
-   * commit body container takes over the diff view
-   * allowing for full height, scrollable reading of
-   * the commit message body.
-   */
-  readonly isExpanded: boolean
-
-  readonly onExpandChanged: (isExpanded: boolean) => void
-
-  readonly onDescriptionBottomChanged: (descriptionBottom: Number) => void
-
-  readonly hideDescriptionBorder: boolean
-
-  readonly hideWhitespaceInDiff: boolean
-
-  /** Whether we should display side by side diffs. */
-  readonly showSideBySideDiff: boolean
-  readonly onHideWhitespaceInDiffChanged: (checked: boolean) => Promise<void>
-
-  /** Called when the user changes the side by side diffs setting. */
-  readonly onShowSideBySideDiffChanged: (checked: boolean) => void
-
-  /** Called when the user opens the diff options popover */
-  readonly onDiffOptionsOpened: () => void
-}
-
-interface ICommitSummaryState {
-  /**
-   * The commit message summary, i.e. the first line in the commit message.
-   * Note that this may differ from the body property in the commit object
-   * passed through props, see the createState method for more details.
-   */
-  readonly summary: ReadonlyArray<TokenResult>
-
-  /**
-   * The commit message body, i.e. anything after the first line of text in the
-   * commit message. Note that this may differ from the body property in the
-   * commit object passed through props, see the createState method for more
-   * details.
-   */
-  readonly body: ReadonlyArray<TokenResult>
-
-  /**
-   * Whether or not the commit body text overflows its container. Used in
-   * conjunction with the isExpanded prop.
-   */
-  readonly isOverflowed: boolean
-
-  /**
-   * The avatars associated with this commit. Used when rendering
-   * the avatar stack and calculated whenever the commit prop changes.
-   */
-  readonly avatarUsers: ReadonlyArray<IAvatarUser>
-}
-
-/**
- * Creates the state object for the CommitSummary component.
- *
- * Ensures that the commit summary never exceeds 72 characters and wraps it
- * into the commit body if it does.
- *
- * @param isOverflowed Whether or not the component should render the commit
- *                     body in expanded mode, see the documentation for the
- *                     isOverflowed state property.
- *
- * @param props        The current commit summary prop object.
- */
-function createState(
-  isOverflowed: boolean,
-  props: ICommitSummaryProps
-): ICommitSummaryState {
-  const { emoji, repository, commits } = props
-  const tokenizer = new Tokenizer(emoji, repository)
-
-  const plainTextBody =
-    commits.length > 1
-      ? commits
-          .map(
-            c =>
-              `${c.shortSha} - ${c.summary}${
-                c.body.trim() !== '' ? `\n${c.body}` : ''
-              }`
-          )
-          .join('\n\n')
-      : commits[0].body
-
-  const { summary, body } = wrapRichTextCommitMessage(
-    commits[0].summary,
-    plainTextBody,
-    tokenizer
-  )
-
-  const allAvatarUsers = commits.flatMap(c =>
-    getAvatarUsersForCommit(repository.gitHubRepository, c)
-  )
-  const avatarUsers = _.uniqWith(
-    allAvatarUsers,
-    (a, b) => a.email === b.email && a.name === b.name
-  )
-
-  return { isOverflowed, summary, body, avatarUsers }
-}
-
-/**
- * Helper function which determines if two commit objects
- * have the same commit summary and body.
- */
-function messageEquals(x: Commit, y: Commit) {
-  return x.summary === y.summary && x.body === y.body
-}
-
-export class CommitSummary extends React.Component<
-  ICommitSummaryProps,
-  ICommitSummaryState
-> {
-  private descriptionScrollViewRef: HTMLDivElement | null = null
-  private readonly resizeObserver: ResizeObserver | null = null
-  private updateOverflowTimeoutId: NodeJS.Immediate | null = null
-  private descriptionRef: HTMLDivElement | null = null
-
-  public constructor(props: ICommitSummaryProps) {
-    super(props)
-
-    this.state = createState(false, props)
-
-    const ResizeObserverClass: typeof ResizeObserver = (window as any)
-      .ResizeObserver
-
-    if (ResizeObserverClass || false) {
-      this.resizeObserver = new ResizeObserverClass(entries => {
-        for (const entry of entries) {
-          if (entry.target === this.descriptionScrollViewRef) {
-            // We might end up causing a recursive update by updating the state
-            // when we're reacting to a resize so we'll defer it until after
-            // react is done with this frame.
-            if (this.updateOverflowTimeoutId !== null) {
-              clearImmediate(this.updateOverflowTimeoutId)
-            }
-
-            this.updateOverflowTimeoutId = setImmediate(this.onResized)
-          }
-        }
-      })
-    }
-  }
-
-  private onResized = () => {
-    if (this.descriptionRef) {
-      const descriptionBottom =
-        this.descriptionRef.getBoundingClientRect().bottom
-      this.props.onDescriptionBottomChanged(descriptionBottom)
-    }
-
-    if (this.props.isExpanded) {
-      return
-    }
-
-    this.updateOverflow()
-  }
-
-  private onDescriptionScrollViewRef = (ref: HTMLDivElement | null) => {
-    this.descriptionScrollViewRef = ref
-
-    if (this.resizeObserver) {
-      this.resizeObserver.disconnect()
-
-      if (ref) {
-        this.resizeObserver.observe(ref)
-      } else {
-        this.setState({ isOverflowed: false })
-      }
-    }
-  }
-
-  private onDescriptionRef = (ref: HTMLDivElement | null) => {
-    this.descriptionRef = ref
-  }
-
-  private renderExpander() {
-    if (
-      !this.state.body.length ||
-      (!this.props.isExpanded && !this.state.isOverflowed)
-    ) {
-      return null
-    }
-
-    const expanded = this.props.isExpanded
-    const onClick = expanded ? this.onCollapse : this.onExpand
-    const icon = expanded ? OcticonSymbol.fold : OcticonSymbol.unfold
-
-    return (
-      <a onClick={onClick} className="expander">
-        <Octicon symbol={icon} />
-        {expanded ? 'Collapse' : 'Expand'}
-      </a>
-    )
-  }
-
-  private onExpand = () => {
-    this.props.onExpandChanged(true)
-  }
-
-  private onCollapse = () => {
-    if (this.descriptionScrollViewRef) {
-      this.descriptionScrollViewRef.scrollTop = 0
-    }
-
-    this.props.onExpandChanged(false)
-  }
-
-  private updateOverflow() {
-    const scrollView = this.descriptionScrollViewRef
-    if (scrollView) {
-      this.setState({
-        isOverflowed: scrollView.scrollHeight > scrollView.offsetHeight,
-      })
-    } else {
-      if (this.state.isOverflowed) {
-        this.setState({ isOverflowed: false })
-      }
-    }
-  }
-
-  public componentDidMount() {
-    // No need to check if it overflows if we're expanded
-    if (!this.props.isExpanded) {
-      this.updateOverflow()
-    }
-  }
-
-  public componentWillUpdate(nextProps: ICommitSummaryProps) {
-    if (
-      nextProps.commits.length !== this.props.commits.length ||
-      !nextProps.commits.every((nextCommit, i) =>
-        messageEquals(nextCommit, this.props.commits[i])
-      )
-    ) {
-      this.setState(createState(false, nextProps))
-    }
-  }
-
-  public componentDidUpdate(
-    prevProps: ICommitSummaryProps,
-    prevState: ICommitSummaryState
-  ) {
-    // No need to check if it overflows if we're expanded
-    if (!this.props.isExpanded) {
-      // If the body has changed or we've just toggled the expanded
-      // state we'll recalculate whether we overflow or not.
-      if (prevState.body !== this.state.body || prevProps.isExpanded) {
-        this.updateOverflow()
-      }
-    } else {
-      // Clear overflow state if we're expanded, we don't need it.
-      if (this.state.isOverflowed) {
-        this.setState({ isOverflowed: false })
-      }
-    }
-  }
-
-  private renderDescription() {
-    if (this.state.body.length === 0) {
-      return null
-    }
-
-    return (
-      <div
-        className="commit-summary-description-container"
-        ref={this.onDescriptionRef}
-      >
-        <div
-          className="commit-summary-description-scroll-view"
-          ref={this.onDescriptionScrollViewRef}
-        >
-          <RichText
-            className="commit-summary-description"
-            emoji={this.props.emoji}
-            repository={this.props.repository}
-            text={this.state.body}
-          />
-        </div>
-
-        {this.renderExpander()}
-      </div>
-    )
-  }
-
-  private getShaRef = (useShortSha?: boolean) => {
-    const { commits } = this.props
-    const oldest = useShortSha ? commits[0].shortSha : commits[0].sha
-
-    if (commits.length === 1) {
-      return oldest
-    }
-
-    const latestCommit = commits.at(-1)
-    const latest = useShortSha ? latestCommit?.shortSha : latestCommit?.sha
-
-    return `${oldest}^..${latest}`
-  }
-
-  public render() {
-    const className = classNames({
-      expanded: this.props.isExpanded,
-      collapsed: !this.props.isExpanded,
-      'has-expander': this.props.isExpanded || this.state.isOverflowed,
-      'hide-description-border': this.props.hideDescriptionBorder,
-    })
-
-    const hasEmptySummary = this.state.summary.length === 0
-    const commitSummary = hasEmptySummary
-      ? 'Empty commit message'
-      : this.props.commits.length > 1
-      ? `Viewing the diff of ${this.props.commits.length} commits`
-      : this.state.summary
-
-    const summaryClassNames = classNames('commit-summary-title', {
-      'empty-summary': hasEmptySummary,
-    })
-
-    return (
-      <div id="commit-summary" className={className}>
-        <div className="commit-summary-header">
-          <RichText
-            className={summaryClassNames}
-            emoji={this.props.emoji}
-            repository={this.props.repository}
-            text={commitSummary}
-          />
-
-          <ul className="commit-summary-meta">
-            <li
-              className="commit-summary-meta-item without-truncation"
-              aria-label="Author"
-            >
-              <AvatarStack users={this.state.avatarUsers} />
-              <CommitAttribution
-                gitHubRepository={this.props.repository.gitHubRepository}
-                commits={this.props.commits}
-              />
-            </li>
-
-            <li
-              className="commit-summary-meta-item without-truncation"
-              aria-label="SHA"
-            >
-              <Octicon symbol={OcticonSymbol.gitCommit} />
-              <TooltippedContent
-                className="sha"
-                tooltip={this.renderShaTooltip()}
-                tooltipClassName="sha-hint"
-                interactive={true}
-                direction={TooltipDirection.SOUTH}
-              >
-                {this.getShaRef(true)}
-              </TooltippedContent>
-            </li>
-
-            {this.renderChangedFilesDescription()}
-            {this.renderLinesChanged()}
-            {this.renderTags()}
-
-            <li
-              className="commit-summary-meta-item without-truncation"
-              title="Diff Options"
-            >
-              <DiffOptions
-                sourceTab={RepositorySectionTab.History}
-                hideWhitespaceChanges={this.props.hideWhitespaceInDiff}
-                onHideWhitespaceChangesChanged={
-                  this.props.onHideWhitespaceInDiffChanged
-                }
-                showSideBySideDiff={this.props.showSideBySideDiff}
-                onShowSideBySideDiffChanged={
-                  this.props.onShowSideBySideDiffChanged
-                }
-                onDiffOptionsOpened={this.props.onDiffOptionsOpened}
-              />
-            </li>
-          </ul>
-        </div>
-
-        {this.renderDescription()}
-      </div>
-    )
-  }
-
-  private renderShaTooltip() {
-    return (
-      <>
-        <code>{this.getShaRef()}</code>
-        <button onClick={this.onCopyShaButtonClick}>Copy</button>
-      </>
-    )
-  }
-
-  private onCopyShaButtonClick = (e: React.MouseEvent<HTMLButtonElement>) => {
-    e.preventDefault()
-    clipboard.writeText(this.getShaRef())
-  }
-
-  private renderChangedFilesDescription = () => {
-    const fileCount = this.props.changesetData.files.length
-    const filesPlural = fileCount === 1 ? 'file' : 'files'
-    const filesShortDescription = `${fileCount} changed ${filesPlural}`
-
-    let filesAdded = 0
-    let filesModified = 0
-    let filesRemoved = 0
-    for (const file of this.props.changesetData.files) {
-      switch (file.status.kind) {
-        case AppFileStatusKind.New:
-          filesAdded += 1
-          break
-        case AppFileStatusKind.Modified:
-          filesModified += 1
-          break
-        case AppFileStatusKind.Deleted:
-          filesRemoved += 1
-          break
-      }
-    }
-
-    const filesLongDescription = (
-      <>
-        {filesAdded > 0 ? (
-          <span>
-            <Octicon
-              className="files-added-icon"
-              symbol={OcticonSymbol.diffAdded}
-            />
-            {filesAdded} added
-          </span>
-        ) : null}
-        {filesModified > 0 ? (
-          <span>
-            <Octicon
-              className="files-modified-icon"
-              symbol={OcticonSymbol.diffModified}
-            />
-            {filesModified} modified
-          </span>
-        ) : null}
-        {filesRemoved > 0 ? (
-          <span>
-            <Octicon
-              className="files-deleted-icon"
-              symbol={OcticonSymbol.diffRemoved}
-            />
-            {filesRemoved} deleted
-          </span>
-        ) : null}
-      </>
-    )
-
-    return (
-      <TooltippedContent
-        className="commit-summary-meta-item without-truncation"
-        tooltipClassName="changed-files-description-tooltip"
-        tooltip={fileCount > 0 ? filesLongDescription : undefined}
-      >
-        <Octicon symbol={OcticonSymbol.diff} />
-        {filesShortDescription}
-      </TooltippedContent>
-    )
-  }
-
-  private renderLinesChanged() {
-    const linesAdded = this.props.changesetData.linesAdded
-    const linesDeleted = this.props.changesetData.linesDeleted
-    if (linesAdded + linesDeleted === 0) {
-      return null
-    }
-
-    const linesAddedPlural = linesAdded === 1 ? 'line' : 'lines'
-    const linesDeletedPlural = linesDeleted === 1 ? 'line' : 'lines'
-    const linesAddedTitle = `${linesAdded} ${linesAddedPlural} added`
-    const linesDeletedTitle = `${linesDeleted} ${linesDeletedPlural} deleted`
-
-    return (
-      <>
-        <TooltippedContent
-          tagName="li"
-          className="commit-summary-meta-item without-truncation lines-added"
-          tooltip={linesAddedTitle}
-        >
-          +{linesAdded}
-        </TooltippedContent>
-        <TooltippedContent
-          tagName="li"
-          className="commit-summary-meta-item without-truncation lines-deleted"
-          tooltip={linesDeletedTitle}
-        >
-          -{linesDeleted}
-        </TooltippedContent>
-      </>
-    )
-  }
-
-  private renderTags() {
-    const tags = this.props.commits.flatMap(c => c.tags) || []
-
-    if (tags.length === 0) {
-      return null
-    }
-
-    return (
-      <li className="commit-summary-meta-item" title={tags.join('\n')}>
-        <span aria-label="Tags">
-          <Octicon symbol={OcticonSymbol.tag} />
-        </span>
-
-        <span className="tags">{tags.join(', ')}</span>
-      </li>
-    )
-  }
-}
diff --git a/app/src/ui/history/committed-file-item.tsx b/app/src/ui/history/committed-file-item.tsx
index e19a91be447..5144db22248 100644
--- a/app/src/ui/history/committed-file-item.tsx
+++ b/app/src/ui/history/committed-file-item.tsx
@@ -4,26 +4,19 @@ import { CommittedFileChange } from '../../models/status'
 import { mapStatus } from '../../lib/status'
 import { PathLabel } from '../lib/path-label'
 import { Octicon, iconForStatus } from '../octicons'
+import { TooltippedContent } from '../lib/tooltipped-content'
+import { TooltipDirection } from '../lib/tooltip'
 
 interface ICommittedFileItemProps {
   readonly availableWidth: number
   readonly file: CommittedFileChange
-  readonly onContextMenu?: (
-    file: CommittedFileChange,
-    event: React.MouseEvent<HTMLDivElement>
-  ) => void
+  readonly focused: boolean
 }
 
 export class CommittedFileItem extends React.Component<ICommittedFileItemProps> {
-  private onContextMenu = (event: React.MouseEvent<HTMLDivElement>) => {
-    if (this.props.onContextMenu !== undefined) {
-      this.props.onContextMenu(this.props.file, event)
-    }
-  }
-
   public render() {
-    const { file } = this.props
-    const status = file.status
+    const { file, focused } = this.props
+    const { status } = file
     const fileStatus = mapStatus(status)
 
     const listItemPadding = 10 * 2
@@ -36,18 +29,24 @@ export class CommittedFileItem extends React.Component<ICommittedFileItemProps>
       statusWidth
 
     return (
-      <div className="file" onContextMenu={this.onContextMenu}>
+      <div className="file">
         <PathLabel
           path={file.path}
           status={file.status}
           availableWidth={availablePathWidth}
+          ariaHidden={true}
         />
-
-        <Octicon
-          symbol={iconForStatus(status)}
-          className={'status status-' + fileStatus.toLowerCase()}
-          title={fileStatus}
-        />
+        <TooltippedContent
+          ancestorFocused={focused}
+          openOnFocus={true}
+          tooltip={fileStatus}
+          direction={TooltipDirection.NORTH}
+        >
+          <Octicon
+            symbol={iconForStatus(status)}
+            className={'status status-' + fileStatus.toLowerCase()}
+          />
+        </TooltippedContent>
       </div>
     )
   }
diff --git a/app/src/ui/history/compare-branch-list-item.tsx b/app/src/ui/history/compare-branch-list-item.tsx
index 4adb6949f57..a28b39d186f 100644
--- a/app/src/ui/history/compare-branch-list-item.tsx
+++ b/app/src/ui/history/compare-branch-list-item.tsx
@@ -1,13 +1,14 @@
 import * as React from 'react'
 
 import { Octicon } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import * as octicons from '../octicons/octicons.generated'
 import { HighlightText } from '../lib/highlight-text'
 import { Branch, IAheadBehind } from '../../models/branch'
 import { IMatches } from '../../lib/fuzzy-find'
 import { AheadBehindStore } from '../../lib/stores/ahead-behind-store'
 import { Repository } from '../../models/repository'
 import { DisposableLike } from 'event-kit'
+import { TooltippedContent } from '../lib/tooltipped-content'
 
 interface ICompareBranchListItemProps {
   readonly branch: Branch
@@ -107,18 +108,18 @@ export class CompareBranchListItem extends React.Component<
     const { currentBranch, branch } = this.props
     const { aheadBehind } = this.state
     const isCurrentBranch = branch.name === currentBranch?.name
-    const icon = isCurrentBranch ? OcticonSymbol.check : OcticonSymbol.gitBranch
+    const icon = isCurrentBranch ? octicons.check : octicons.gitBranch
 
     const aheadBehindElement = aheadBehind ? (
       <div className="branch-commit-counter">
         <span className="branch-commit-counter-item">
           {aheadBehind.behind}
-          <Octicon className="icon" symbol={OcticonSymbol.arrowDown} />
+          <Octicon className="icon" symbol={octicons.arrowDown} />
         </span>
 
         <span className="branch-commit-counter-item">
           {aheadBehind.ahead}
-          <Octicon className="icon" symbol={OcticonSymbol.arrowUp} />
+          <Octicon className="icon" symbol={octicons.arrowUp} />
         </span>
       </div>
     ) : null
@@ -126,12 +127,17 @@ export class CompareBranchListItem extends React.Component<
     return (
       <div className="branches-list-item">
         <Octicon className="icon" symbol={icon} />
-        <div className="name" title={branch.name}>
+        <TooltippedContent
+          className="name"
+          tooltip={branch.name}
+          onlyWhenOverflowed={true}
+          tagName="div"
+        >
           <HighlightText
             text={branch.name}
             highlight={this.props.matches.title}
           />
-        </div>
+        </TooltippedContent>
         {aheadBehindElement}
       </div>
     )
diff --git a/app/src/ui/history/compare.tsx b/app/src/ui/history/compare.tsx
index 7d74d46eddf..4f7c545cd7c 100644
--- a/app/src/ui/history/compare.tsx
+++ b/app/src/ui/history/compare.tsx
@@ -19,7 +19,7 @@ import { IBranchListItem } from '../branches/group-branches'
 import { TabBar } from '../tab-bar'
 import { CompareBranchListItem } from './compare-branch-list-item'
 import { FancyTextBox } from '../lib/fancy-text-box'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import * as octicons from '../octicons/octicons.generated'
 import { SelectionSource } from '../lib/filter-list'
 import { IMatches } from '../../lib/fuzzy-find'
 import { Ref } from '../lib/ref'
@@ -30,15 +30,18 @@ import { PopupType } from '../../models/popup'
 import { getUniqueCoauthorsAsAuthors } from '../../lib/unique-coauthors-as-authors'
 import { getSquashedCommitDescription } from '../../lib/squash/squashed-commit-description'
 import { doMergeCommitsExistAfterCommit } from '../../lib/git'
-import { enableCommitReordering } from '../../lib/feature-flag'
+import { KeyboardInsertionData } from '../lib/list'
+import { Account } from '../../models/account'
+import { Emoji } from '../../lib/emoji'
 
 interface ICompareSidebarProps {
   readonly repository: Repository
   readonly isLocalRepository: boolean
   readonly compareState: ICompareState
-  readonly emoji: Map<string, string>
+  readonly emoji: Map<string, Emoji>
   readonly commitLookup: Map<string, Commit>
   readonly localCommitSHAs: ReadonlyArray<string>
+  readonly askForConfirmationOnCheckoutCommit: boolean
   readonly dispatcher: Dispatcher
   readonly currentBranch: Branch | null
   readonly selectedCommitShas: ReadonlyArray<string>
@@ -54,7 +57,9 @@ interface ICompareSidebarProps {
   readonly localTags: Map<string, string> | null
   readonly tagsToPush: ReadonlyArray<string> | null
   readonly aheadBehindStore: AheadBehindStore
-  readonly isCherryPickInProgress: boolean
+  readonly isMultiCommitOperationInProgress?: boolean
+  readonly shasToHighlight: ReadonlyArray<string>
+  readonly accounts: ReadonlyArray<Account>
 }
 
 interface ICompareSidebarState {
@@ -64,6 +69,9 @@ interface ICompareSidebarState {
    * For all other cases, use the prop
    */
   readonly focusedBranch: Branch | null
+
+  /** Data to be reordered via keyboard */
+  readonly keyboardReorderData?: KeyboardInsertionData
 }
 
 /** If we're within this many rows from the bottom, load the next history batch. */
@@ -76,6 +84,7 @@ export class CompareSidebar extends React.Component<
   private textbox: TextBox | null = null
   private readonly loadChangedFilesScheduler = new ThrottledScheduler(200)
   private branchList: BranchList | null = null
+  private commitListRef = React.createRef<CommitList>()
   private loadingMoreCommitsPromise: Promise<void> | null = null
   private resultCount = 0
 
@@ -131,6 +140,10 @@ export class CompareSidebar extends React.Component<
     }
   }
 
+  public focusHistory() {
+    this.commitListRef.current?.focus()
+  }
+
   public componentWillMount() {
     this.props.dispatcher.initializeCompare(this.props.repository)
   }
@@ -150,11 +163,12 @@ export class CompareSidebar extends React.Component<
     const placeholderText = getPlaceholderText(this.props.compareState)
 
     return (
-      <div id="compare-view">
+      <div id="compare-view" role="tabpanel" aria-labelledby="history-tab">
         <div className="compare-form">
           <FancyTextBox
-            symbol={OcticonSymbol.gitBranch}
-            type="search"
+            ariaLabel="Branch filter"
+            symbol={octicons.gitBranch}
+            displayClearButton={true}
             placeholder={placeholderText}
             onFocus={this.onTextBoxFocused}
             value={filterText}
@@ -225,19 +239,19 @@ export class CompareSidebar extends React.Component<
 
     return (
       <CommitList
+        ref={this.commitListRef}
         gitHubRepository={this.props.repository.gitHubRepository}
         isLocalRepository={this.props.isLocalRepository}
         commitLookup={this.props.commitLookup}
         commitSHAs={commitSHAs}
         selectedSHAs={this.props.selectedCommitShas}
+        shasToHighlight={this.props.shasToHighlight}
         localCommitSHAs={this.props.localCommitSHAs}
         canResetToCommits={formState.kind === HistoryTabMode.History}
         canUndoCommits={formState.kind === HistoryTabMode.History}
         canAmendCommits={formState.kind === HistoryTabMode.History}
         emoji={this.props.emoji}
-        reorderingEnabled={
-          enableCommitReordering() && formState.kind === HistoryTabMode.History
-        }
+        reorderingEnabled={formState.kind === HistoryTabMode.History}
         onViewCommitOnGitHub={this.props.onViewCommitOnGitHub}
         onUndoCommit={this.onUndoCommit}
         onResetToCommit={this.onResetToCommit}
@@ -250,28 +264,42 @@ export class CompareSidebar extends React.Component<
         onCommitsSelected={this.onCommitsSelected}
         onScroll={this.onScroll}
         onCreateBranch={this.onCreateBranch}
+        onCheckoutCommit={this.onCheckoutCommit}
         onCreateTag={this.onCreateTag}
         onDeleteTag={this.onDeleteTag}
         onCherryPick={this.onCherryPick}
         onDropCommitInsertion={this.onDropCommitInsertion}
+        onKeyboardReorder={this.onKeyboardReorder}
+        onCancelKeyboardReorder={this.onCancelKeyboardReorder}
         onSquash={this.onSquash}
         emptyListMessage={emptyListMessage}
         onCompareListScrolled={this.props.onCompareListScrolled}
         compareListScrollTop={this.props.compareListScrollTop}
-        tagsToPush={this.props.tagsToPush}
-        isCherryPickInProgress={this.props.isCherryPickInProgress}
+        tagsToPush={this.props.tagsToPush ?? []}
         onRenderCommitDragElement={this.onRenderCommitDragElement}
         onRemoveCommitDragElement={this.onRemoveCommitDragElement}
+        disableReordering={formState.kind === HistoryTabMode.Compare}
         disableSquashing={formState.kind === HistoryTabMode.Compare}
+        isMultiCommitOperationInProgress={
+          this.props.isMultiCommitOperationInProgress
+        }
+        keyboardReorderData={this.state.keyboardReorderData}
+        accounts={this.props.accounts}
       />
     )
   }
 
+  private onCancelKeyboardReorder = () => {
+    this.setState({ keyboardReorderData: undefined })
+  }
+
   private onDropCommitInsertion = async (
     baseCommit: Commit | null,
     commitsToInsert: ReadonlyArray<Commit>,
     lastRetainedCommitRef: string | null
   ) => {
+    this.setState({ keyboardReorderData: undefined })
+
     if (
       await doMergeCommitsExistAfterCommit(
         this.props.repository,
@@ -328,6 +356,7 @@ export class CompareSidebar extends React.Component<
 
     return (
       <BranchList
+        repository={this.props.repository}
         ref={this.onBranchesListRef}
         defaultBranch={defaultBranch}
         currentBranch={this.props.currentBranch}
@@ -341,6 +370,7 @@ export class CompareSidebar extends React.Component<
         onItemClick={this.onBranchItemClicked}
         onFilterTextChanged={this.onBranchFilterTextChanged}
         renderBranch={this.renderCompareBranchListItem}
+        getBranchAriaLabel={this.getBranchAriaLabel}
         onFilterListResultsChanged={this.filterListResultsChanged}
       />
     )
@@ -411,6 +441,10 @@ export class CompareSidebar extends React.Component<
     )
   }
 
+  private getBranchAriaLabel = (item: IBranchListItem): string => {
+    return item.branch.name
+  }
+
   private onBranchFilterKeyDown = (
     event: React.KeyboardEvent<HTMLInputElement>
   ) => {
@@ -592,6 +626,20 @@ export class CompareSidebar extends React.Component<
     })
   }
 
+  private onCheckoutCommit = (commit: CommitOneLine) => {
+    const { repository, dispatcher, askForConfirmationOnCheckoutCommit } =
+      this.props
+    if (!askForConfirmationOnCheckoutCommit) {
+      dispatcher.checkoutCommit(repository, commit)
+    } else {
+      dispatcher.showPopup({
+        type: PopupType.ConfirmCheckoutCommit,
+        commit: commit,
+        repository,
+      })
+    }
+  }
+
   private onDeleteTag = (tagName: string) => {
     this.props.dispatcher.showDeleteTagDialog(this.props.repository, tagName)
   }
@@ -600,6 +648,18 @@ export class CompareSidebar extends React.Component<
     this.props.onCherryPick(this.props.repository, commits)
   }
 
+  private onKeyboardReorder = (toReorder: ReadonlyArray<Commit>) => {
+    const { commitSHAs } = this.props.compareState
+
+    this.setState({
+      keyboardReorderData: {
+        type: DragType.Commit,
+        commits: toReorder,
+        itemIndices: toReorder.map(c => commitSHAs.indexOf(c.sha)),
+      },
+    })
+  }
+
   private onSquash = async (
     toSquash: ReadonlyArray<Commit>,
     squashOnto: Commit,
@@ -648,6 +708,8 @@ export class CompareSidebar extends React.Component<
       dialogButtonText: `Squash ${allCommitsInSquash.length} Commits`,
       prepopulateCommitSummary: true,
       onSubmitCommitMessage: async (context: ICommitContext) => {
+        this.props.dispatcher.closePopup(PopupType.CommitMessage)
+
         this.props.dispatcher.squash(
           this.props.repository,
           toSquashSansSquashOnto,
@@ -668,8 +730,8 @@ function getPlaceholderText(state: ICompareState) {
     return __DARWIN__ ? 'No Branches to Compare' : 'No branches to compare'
   } else if (formState.kind === HistoryTabMode.History) {
     return __DARWIN__
-      ? 'Select Branch to Compare...'
-      : 'Select branch to compare...'
+      ? 'Select Branch to Compare…'
+      : 'Select branch to compare…'
   } else {
     return undefined
   }
diff --git a/app/src/ui/history/expandable-commit-summary.tsx b/app/src/ui/history/expandable-commit-summary.tsx
new file mode 100644
index 00000000000..78765d44928
--- /dev/null
+++ b/app/src/ui/history/expandable-commit-summary.tsx
@@ -0,0 +1,592 @@
+import * as React from 'react'
+import classNames from 'classnames'
+
+import { Octicon } from '../octicons'
+import * as octicons from '../octicons/octicons.generated'
+import { RichText } from '../lib/rich-text'
+import { Repository } from '../../models/repository'
+import { Commit } from '../../models/commit'
+import { getAvatarUsersForCommit, IAvatarUser } from '../../models/avatar'
+import { AvatarStack } from '../lib/avatar-stack'
+import { CommitAttribution } from '../lib/commit-attribution'
+import { Tokenizer, TokenResult } from '../../lib/text-token-parser'
+import { wrapRichTextCommitMessage } from '../../lib/wrap-rich-text-commit-message'
+import { IChangesetData } from '../../lib/git'
+import uniqWith from 'lodash/uniqWith'
+import { LinkButton } from '../lib/link-button'
+import { UnreachableCommitsTab } from './unreachable-commits-dialog'
+import memoizeOne from 'memoize-one'
+import { Button } from '../lib/button'
+import { Avatar } from '../lib/avatar'
+import { CopyButton } from '../copy-button'
+import { Account } from '../../models/account'
+import { Emoji } from '../../lib/emoji'
+
+interface IExpandableCommitSummaryProps {
+  readonly repository: Repository
+  readonly selectedCommits: ReadonlyArray<Commit>
+  readonly shasInDiff: ReadonlyArray<string>
+  readonly changesetData: IChangesetData
+  readonly emoji: Map<string, Emoji>
+
+  /**
+   * Whether or not the commit body container should
+   * be rendered expanded or not. In expanded mode the
+   * commit body container takes over the diff view
+   * allowing for full height, scrollable reading of
+   * the commit message body.
+   */
+  readonly isExpanded: boolean
+
+  readonly onExpandChanged: (isExpanded: boolean) => void
+
+  /** Called to highlight certain shas in the history */
+  readonly onHighlightShas: (shasToHighlight: ReadonlyArray<string>) => void
+
+  /** Called to show unreachable commits dialog */
+  readonly showUnreachableCommits: (tab: UnreachableCommitsTab) => void
+
+  readonly accounts: ReadonlyArray<Account>
+}
+
+interface IExpandableCommitSummaryState {
+  /**
+   * The commit message summary, i.e. the first line in the commit message.
+   * Note that this may differ from the body property in the commit object
+   * passed through props, see the createState method for more details.
+   */
+  readonly summary: ReadonlyArray<TokenResult>
+
+  /**
+   * Whether the commit summary was empty.
+   */
+  readonly hasEmptySummary: boolean
+
+  /**
+   * The commit message body, i.e. anything after the first line of text in the
+   * commit message. Note that this may differ from the body property in the
+   * commit object passed through props, see the createState method for more
+   * details.
+   */
+  readonly body: ReadonlyArray<TokenResult>
+
+  /**
+   * Whether or not the commit body text overflows its container. Used in
+   * conjunction with the isExpanded prop.
+   */
+  readonly isOverflowed: boolean
+
+  /**
+   * The avatars associated with this commit. Used when rendering
+   * the avatar stack and calculated whenever the commit prop changes.
+   */
+  readonly avatarUsers: ReadonlyArray<IAvatarUser>
+}
+
+/**
+ * Creates the state object for the ExpandableCommitSummary component.
+ *
+ * Ensures that the commit summary never exceeds 72 characters and wraps it
+ * into the commit body if it does.
+ *
+ * @param isOverflowed Whether or not the component should render the commit
+ *                     body in expanded mode, see the documentation for the
+ *                     isOverflowed state property.
+ *
+ * @param props        The current commit summary prop object.
+ */
+function createState(
+  isOverflowed: boolean,
+  props: IExpandableCommitSummaryProps
+): IExpandableCommitSummaryState {
+  const { emoji, repository, selectedCommits } = props
+  const tokenizer = new Tokenizer(emoji, repository)
+
+  const { summary, body } = wrapRichTextCommitMessage(
+    getCommitSummary(selectedCommits),
+    selectedCommits[0].body,
+    tokenizer
+  )
+
+  const hasEmptySummary =
+    selectedCommits.length === 1 && selectedCommits[0].summary.length === 0
+
+  const allAvatarUsers = selectedCommits.flatMap(c =>
+    getAvatarUsersForCommit(repository.gitHubRepository, c)
+  )
+
+  const avatarUsers = uniqWith(
+    allAvatarUsers,
+    (a, b) => a.email === b.email && a.name === b.name
+  )
+
+  return { isOverflowed, summary, body, avatarUsers, hasEmptySummary }
+}
+
+function getCommitSummary(selectedCommits: ReadonlyArray<Commit>) {
+  return selectedCommits[0].summary.length === 0
+    ? 'Empty commit message'
+    : selectedCommits[0].summary
+}
+
+/**
+ * Helper function which determines if two commit objects
+ * have the same commit summary and body.
+ */
+function messageEquals(x: Commit, y: Commit) {
+  return x.summary === y.summary && x.body === y.body
+}
+
+export class ExpandableCommitSummary extends React.Component<
+  IExpandableCommitSummaryProps,
+  IExpandableCommitSummaryState
+> {
+  private descriptionScrollViewRef: HTMLDivElement | null = null
+  private readonly resizeObserver: ResizeObserver | null = null
+  private updateOverflowTimeoutId: NodeJS.Immediate | null = null
+
+  private getCountCommitsNotInDiff = memoizeOne(
+    (
+      selectedCommits: ReadonlyArray<Commit>,
+      shasInDiff: ReadonlyArray<string>
+    ) => {
+      if (selectedCommits.length === 1) {
+        return 0
+      } else {
+        const shas = new Set(shasInDiff)
+        return selectedCommits.reduce(
+          (acc, c) => acc + (shas.has(c.sha) ? 0 : 1),
+          0
+        )
+      }
+    }
+  )
+
+  public constructor(props: IExpandableCommitSummaryProps) {
+    super(props)
+
+    this.state = createState(false, props)
+
+    const ResizeObserverClass: typeof ResizeObserver = (window as any)
+      .ResizeObserver
+
+    if (ResizeObserverClass || false) {
+      this.resizeObserver = new ResizeObserverClass(entries => {
+        for (const entry of entries) {
+          if (entry.target === this.descriptionScrollViewRef) {
+            // We might end up causing a recursive update by updating the state
+            // when we're reacting to a resize so we'll defer it until after
+            // react is done with this frame.
+            if (this.updateOverflowTimeoutId !== null) {
+              clearImmediate(this.updateOverflowTimeoutId)
+            }
+
+            this.updateOverflowTimeoutId = setImmediate(this.onResized)
+          }
+        }
+      })
+    }
+  }
+
+  private onResized = () => {
+    if (this.props.isExpanded) {
+      return
+    }
+
+    this.updateOverflow()
+  }
+
+  private onDescriptionScrollViewRef = (ref: HTMLDivElement | null) => {
+    this.descriptionScrollViewRef = ref
+
+    if (this.resizeObserver) {
+      this.resizeObserver.disconnect()
+
+      if (ref) {
+        this.resizeObserver.observe(ref)
+      } else {
+        this.setState({ isOverflowed: false })
+      }
+    }
+  }
+
+  private renderExpander() {
+    const { selectedCommits, isExpanded } = this.props
+    if (selectedCommits.length > 1) {
+      return null
+    }
+
+    return (
+      <Button
+        onClick={isExpanded ? this.onCollapse : this.onExpand}
+        className="expander"
+        tooltip={isExpanded ? 'Collapse' : 'Expand'}
+        applyTooltipAriaDescribedBy={false}
+        ariaExpanded={isExpanded}
+        ariaLabel={
+          isExpanded ? 'Collapse commit details' : 'Expand commit details'
+        }
+        ariaControls="expandable-commit-summary"
+      >
+        <Octicon symbol={isExpanded ? octicons.fold : octicons.unfold} />
+      </Button>
+    )
+  }
+
+  private onExpand = () => {
+    this.props.onExpandChanged(true)
+  }
+
+  private onCollapse = () => {
+    if (this.descriptionScrollViewRef) {
+      this.descriptionScrollViewRef.scrollTop = 0
+    }
+
+    this.props.onExpandChanged(false)
+  }
+
+  private updateOverflow() {
+    const scrollView = this.descriptionScrollViewRef
+    if (scrollView) {
+      this.setState({
+        isOverflowed: scrollView.scrollHeight > scrollView.offsetHeight,
+      })
+    } else {
+      if (this.state.isOverflowed) {
+        this.setState({ isOverflowed: false })
+      }
+    }
+  }
+
+  public componentDidMount() {
+    // No need to check if it overflows if we're expanded
+    if (!this.props.isExpanded) {
+      this.updateOverflow()
+    }
+  }
+
+  public componentWillUpdate(nextProps: IExpandableCommitSummaryProps) {
+    if (
+      nextProps.selectedCommits.length !== this.props.selectedCommits.length ||
+      !nextProps.selectedCommits.every((nextCommit, i) =>
+        messageEquals(nextCommit, this.props.selectedCommits[i])
+      )
+    ) {
+      this.setState(createState(false, nextProps))
+    }
+  }
+
+  public componentDidUpdate(
+    prevProps: IExpandableCommitSummaryProps,
+    prevState: IExpandableCommitSummaryState
+  ) {
+    // No need to check if it overflows if we're expanded
+    if (!this.props.isExpanded) {
+      // If the body has changed or we've just toggled the expanded
+      // state we'll recalculate whether we overflow or not.
+      if (prevState.body !== this.state.body || prevProps.isExpanded) {
+        this.updateOverflow()
+      }
+    } else {
+      // Clear overflow state if we're expanded, we don't need it.
+      if (this.state.isOverflowed) {
+        this.setState({ isOverflowed: false })
+      }
+    }
+  }
+
+  private renderDescription() {
+    if (this.state.body.length === 0 || this.props.selectedCommits.length > 1) {
+      return null
+    }
+
+    const className = classNames('ecs-description', {
+      overflowed: this.state.isOverflowed,
+    })
+
+    return (
+      <div className={className}>
+        <div
+          className="ecs-description-scroll-view"
+          ref={this.onDescriptionScrollViewRef}
+        >
+          <RichText
+            className="ecs-description-text selectable"
+            emoji={this.props.emoji}
+            repository={this.props.repository}
+            text={this.state.body}
+          />
+        </div>
+      </div>
+    )
+  }
+
+  private onHighlightShasInDiff = () => {
+    this.props.onHighlightShas(this.props.shasInDiff)
+  }
+
+  private onHighlightShasNotInDiff = () => {
+    const { onHighlightShas, selectedCommits, shasInDiff } = this.props
+    onHighlightShas(
+      selectedCommits.filter(c => !shasInDiff.includes(c.sha)).map(c => c.sha)
+    )
+  }
+
+  private onRemoveHighlightOfShas = () => {
+    this.props.onHighlightShas([])
+  }
+
+  private showUnreachableCommits = () => {
+    this.props.showUnreachableCommits(UnreachableCommitsTab.Unreachable)
+  }
+
+  private showReachableCommits = () => {
+    this.props.showUnreachableCommits(UnreachableCommitsTab.Reachable)
+  }
+
+  private renderCommitsNotReachable = () => {
+    const { selectedCommits, shasInDiff } = this.props
+    if (selectedCommits.length === 1) {
+      return
+    }
+
+    const excludedCommitsCount = this.getCountCommitsNotInDiff(
+      selectedCommits,
+      shasInDiff
+    )
+
+    if (excludedCommitsCount === 0) {
+      return
+    }
+
+    const commitsPluralized = excludedCommitsCount > 1 ? 'commits' : 'commit'
+
+    return (
+      // eslint-disable-next-line jsx-a11y/mouse-events-have-key-events
+      <div
+        className="commit-unreachable-info"
+        onMouseOver={this.onHighlightShasNotInDiff}
+        onMouseOut={this.onRemoveHighlightOfShas}
+      >
+        <Octicon symbol={octicons.info} />
+        <LinkButton onClick={this.showUnreachableCommits}>
+          {excludedCommitsCount} unreachable {commitsPluralized}
+        </LinkButton>{' '}
+        not included.
+      </div>
+    )
+  }
+
+  private renderExpandedAuthor(user: IAvatarUser): string | JSX.Element {
+    if (!user) {
+      return 'Unknown user'
+    }
+
+    if (user.name) {
+      return (
+        <>
+          {user.name}
+          {' <'}
+          {user.email}
+          {'>'}
+        </>
+      )
+    }
+
+    return user.email
+  }
+
+  private renderAuthorList = () => {
+    return this.state.avatarUsers.map((user, i) => {
+      return (
+        <div className="author selectable" key={i}>
+          <Avatar accounts={this.props.accounts} user={user} title={null} />
+          <div>{this.renderExpandedAuthor(user)}</div>
+        </div>
+      )
+    })
+  }
+
+  private renderAuthorStack = () => {
+    const { selectedCommits, repository, accounts } = this.props
+    const { avatarUsers } = this.state
+
+    return (
+      <>
+        <AvatarStack users={avatarUsers} accounts={accounts} />
+        <CommitAttribution
+          gitHubRepository={repository.gitHubRepository}
+          commits={selectedCommits}
+        />
+      </>
+    )
+  }
+
+  private renderAuthors = () => {
+    const { selectedCommits, isExpanded } = this.props
+    if (selectedCommits.length > 1) {
+      return
+    }
+
+    return (
+      <div className="ecs-meta-item authors">
+        {isExpanded ? this.renderAuthorList() : this.renderAuthorStack()}
+      </div>
+    )
+  }
+
+  private renderCommitRef = () => {
+    const { selectedCommits, isExpanded } = this.props
+    if (selectedCommits.length > 1) {
+      return
+    }
+
+    const { shortSha, sha } = selectedCommits[0]
+
+    return (
+      <div className="ecs-meta-item commit-ref">
+        <Octicon symbol={octicons.gitCommit} />
+        <div className="ref selectable">{isExpanded ? sha : shortSha}</div>
+        <CopyButton ariaLabel="Copy the full SHA" copyContent={sha} />
+      </div>
+    )
+  }
+
+  private renderSummaryText = () => {
+    const { selectedCommits, shasInDiff } = this.props
+    const { summary } = this.state
+
+    if (selectedCommits.length === 1) {
+      return (
+        <RichText
+          emoji={this.props.emoji}
+          repository={this.props.repository}
+          className="selectable"
+          text={summary}
+        />
+      )
+    }
+
+    const commitsNotInDiff = this.getCountCommitsNotInDiff(
+      selectedCommits,
+      shasInDiff
+    )
+    const numInDiff = selectedCommits.length - commitsNotInDiff
+    const commitsPluralized = numInDiff > 1 ? 'commits' : 'commit'
+
+    return (
+      <>
+        Showing changes from{' '}
+        {commitsNotInDiff > 0 ? (
+          <LinkButton
+            className="commits-in-diff"
+            onMouseOver={this.onHighlightShasInDiff}
+            onMouseOut={this.onRemoveHighlightOfShas}
+            onClick={this.showReachableCommits}
+          >
+            {numInDiff} {commitsPluralized}
+          </LinkButton>
+        ) : (
+          <>
+            {' '}
+            {numInDiff} {commitsPluralized}
+          </>
+        )}
+      </>
+    )
+  }
+
+  private renderSummary = () => {
+    const { hasEmptySummary } = this.state
+    const summaryClassNames = classNames('ecs-title', {
+      'empty-summary': hasEmptySummary,
+    })
+
+    return (
+      <div className={summaryClassNames}>
+        {this.renderSummaryText()}
+        {this.renderExpander()}
+      </div>
+    )
+  }
+
+  private renderMetaItems = () => {
+    if (this.props.selectedCommits.length > 1) {
+      return null
+    }
+
+    return (
+      <div className="ecs-meta">
+        {this.renderAuthors()}
+        {this.renderCommitRef()}
+        {this.renderLinesChanged()}
+        {this.renderTags()}
+      </div>
+    )
+  }
+
+  public render() {
+    const className = classNames({
+      expanded: this.props.isExpanded,
+    })
+
+    return (
+      <div id="expandable-commit-summary" className={className}>
+        {this.renderSummary()}
+        <div className="beneath-summary">
+          {this.renderDescription()}
+          {this.renderMetaItems()}
+        </div>
+        {this.renderCommitsNotReachable()}
+      </div>
+    )
+  }
+
+  private renderLinesChanged() {
+    const { changesetData, selectedCommits, isExpanded } = this.props
+    const { linesAdded, linesDeleted } = changesetData
+
+    if (
+      (linesAdded === 0 && linesDeleted === 0) ||
+      selectedCommits.length > 1
+    ) {
+      return null
+    }
+
+    return (
+      <div className="ecs-meta-item lines-added-deleted">
+        {isExpanded ? <Octicon symbol={octicons.diff} /> : null}
+        <div className="lines-added">
+          {!isExpanded ? <>+{linesAdded}</> : <>{linesAdded} added lines</>}
+        </div>
+        <div className="lines-deleted">
+          {!isExpanded ? (
+            <>-{linesDeleted}</>
+          ) : (
+            <>{linesDeleted} removed lines</>
+          )}
+        </div>
+      </div>
+    )
+  }
+
+  private renderTags() {
+    const { selectedCommits } = this.props
+    if (selectedCommits.length > 1) {
+      return
+    }
+
+    const tags = selectedCommits[0].tags
+
+    if (tags.length === 0) {
+      return
+    }
+
+    return (
+      <div className="ecs-meta-item tags selectable">
+        <Octicon symbol={octicons.tag} />
+        <span>{tags.join(', ')}</span>
+      </div>
+    )
+  }
+}
diff --git a/app/src/ui/history/file-list.tsx b/app/src/ui/history/file-list.tsx
index fdf821c916c..c593e482823 100644
--- a/app/src/ui/history/file-list.tsx
+++ b/app/src/ui/history/file-list.tsx
@@ -1,13 +1,15 @@
 import * as React from 'react'
+import { mapStatus } from '../../lib/status'
 
 import { CommittedFileChange } from '../../models/status'
-import { List } from '../lib/list'
+import { ClickSource, List } from '../lib/list'
 import { CommittedFileItem } from './committed-file-item'
 
 interface IFileListProps {
   readonly files: ReadonlyArray<CommittedFileChange>
   readonly selectedFile: CommittedFileChange | null
   readonly onSelectedFileChanged: (file: CommittedFileChange) => void
+  readonly onRowDoubleClick: (row: number, source: ClickSource) => void
   readonly availableWidth: number
   readonly onContextMenu?: (
     file: CommittedFileChange,
@@ -15,10 +17,22 @@ interface IFileListProps {
   ) => void
 }
 
+interface IFileListState {
+  readonly focusedRow: number | null
+}
+
 /**
  * Display a list of changed files as part of a commit or stash
  */
-export class FileList extends React.Component<IFileListProps> {
+export class FileList extends React.Component<IFileListProps, IFileListState> {
+  public constructor(props: IFileListProps) {
+    super(props)
+
+    this.state = {
+      focusedRow: null,
+    }
+  }
+
   private onSelectedRowChanged = (row: number) => {
     const file = this.props.files[row]
     this.props.onSelectedFileChanged(file)
@@ -29,13 +43,29 @@ export class FileList extends React.Component<IFileListProps> {
       <CommittedFileItem
         file={this.props.files[row]}
         availableWidth={this.props.availableWidth}
-        onContextMenu={this.props.onContextMenu}
+        focused={this.state.focusedRow === row}
       />
     )
   }
 
-  private rowForFile(file: CommittedFileChange | null): number {
-    return file ? this.props.files.findIndex(f => f.path === file.path) : -1
+  private selectedRowsForFile(): ReadonlyArray<number> {
+    const { selectedFile: file, files } = this.props
+    const fileIndex = file ? files.findIndex(f => f.path === file.path) : -1
+    return fileIndex >= 0 ? [fileIndex] : []
+  }
+
+  private onRowContextMenu = (
+    row: number,
+    event: React.MouseEvent<HTMLDivElement>
+  ) => {
+    this.props.onContextMenu?.(this.props.files[row], event)
+  }
+
+  private getFileAriaLabel = (row: number) => {
+    const file = this.props.files[row]
+    const { path, status } = file
+    const fileStatus = mapStatus(status)
+    return `${path} ${fileStatus}`
   }
 
   public render() {
@@ -45,10 +75,26 @@ export class FileList extends React.Component<IFileListProps> {
           rowRenderer={this.renderFile}
           rowCount={this.props.files.length}
           rowHeight={29}
-          selectedRows={[this.rowForFile(this.props.selectedFile)]}
+          selectedRows={this.selectedRowsForFile()}
           onSelectedRowChanged={this.onSelectedRowChanged}
+          onRowDoubleClick={this.props.onRowDoubleClick}
+          onRowContextMenu={this.onRowContextMenu}
+          onRowKeyboardFocus={this.onRowFocus}
+          onRowBlur={this.onRowBlur}
+          getRowAriaLabel={this.getFileAriaLabel}
+          invalidationProps={{ focusedRow: this.state.focusedRow }}
         />
       </div>
     )
   }
+
+  private onRowFocus = (row: number) => {
+    this.setState({ focusedRow: row })
+  }
+
+  private onRowBlur = (row: number) => {
+    if (this.state.focusedRow === row) {
+      this.setState({ focusedRow: null })
+    }
+  }
 }
diff --git a/app/src/ui/history/index.ts b/app/src/ui/history/index.ts
index 7603ced06af..f4fabb6e82f 100644
--- a/app/src/ui/history/index.ts
+++ b/app/src/ui/history/index.ts
@@ -1,2 +1,2 @@
-export { SelectedCommits } from './selected-commit'
+export { SelectedCommits } from './selected-commits'
 export { CompareSidebar } from './compare'
diff --git a/app/src/ui/history/merge-call-to-action-with-conflicts.tsx b/app/src/ui/history/merge-call-to-action-with-conflicts.tsx
index 060bfe31b78..df4e4c4d764 100644
--- a/app/src/ui/history/merge-call-to-action-with-conflicts.tsx
+++ b/app/src/ui/history/merge-call-to-action-with-conflicts.tsx
@@ -12,7 +12,10 @@ import {
   IDropdownSelectButtonOption,
 } from '../dropdown-select-button'
 import { getMergeOptions, updateRebasePreview } from '../lib/update-branch'
-import { MultiCommitOperationKind } from '../../models/multi-commit-operation'
+import {
+  MultiCommitOperationKind,
+  isIdMultiCommitOperation,
+} from '../../models/multi-commit-operation'
 import { RebasePreview } from '../../models/rebase'
 
 interface IMergeCallToActionWithConflictsProps {
@@ -97,9 +100,12 @@ export class MergeCallToActionWithConflicts extends React.Component<
   }
 
   private onOperationChange = (option: IDropdownSelectButtonOption) => {
-    const value = option.value as MultiCommitOperationKind
-    this.setState({ selectedOperation: value })
-    if (value === MultiCommitOperationKind.Rebase) {
+    if (!isIdMultiCommitOperation(option.id)) {
+      return
+    }
+
+    this.setState({ selectedOperation: option.id })
+    if (option.id === MultiCommitOperationKind.Rebase) {
       this.updateRebasePreview(this.props.comparisonBranch)
     }
   }
@@ -108,13 +114,14 @@ export class MergeCallToActionWithConflicts extends React.Component<
     event: React.MouseEvent<HTMLButtonElement>,
     selectedOption: IDropdownSelectButtonOption
   ) => {
+    if (!isIdMultiCommitOperation(selectedOption.id)) {
+      return
+    }
     event.preventDefault()
 
     const { dispatcher, repository } = this.props
 
-    await this.dispatchOperation(
-      selectedOption.value as MultiCommitOperationKind
-    )
+    await this.dispatchOperation(selectedOption.id)
 
     dispatcher.executeCompare(repository, {
       kind: HistoryTabMode.History,
@@ -163,7 +170,7 @@ export class MergeCallToActionWithConflicts extends React.Component<
       [],
       currentBranch.tip.sha
     )
-    dispatcher.recordCompareInitiatedMerge()
+    dispatcher.incrementMetric('mergesInitiatedFromComparison')
 
     return dispatcher.mergeBranch(
       repository,
@@ -182,10 +189,11 @@ export class MergeCallToActionWithConflicts extends React.Component<
         {mergeDetails}
 
         <DropdownSelectButton
-          selectedValue={this.state.selectedOperation}
+          checkedOption={this.state.selectedOperation}
           options={getMergeOptions()}
+          dropdownAriaLabel="Merge options"
           disabled={disabled}
-          onSelectChange={this.onOperationChange}
+          onCheckedOptionChange={this.onOperationChange}
           onSubmit={this.onOperationInvoked}
         />
       </div>
diff --git a/app/src/ui/history/merge-call-to-action.tsx b/app/src/ui/history/merge-call-to-action.tsx
index 39139251694..0b6105f1e63 100644
--- a/app/src/ui/history/merge-call-to-action.tsx
+++ b/app/src/ui/history/merge-call-to-action.tsx
@@ -71,7 +71,7 @@ export class MergeCallToAction extends React.Component<
   private onMergeClicked = async () => {
     const formState = this.props.formState
 
-    this.props.dispatcher.recordCompareInitiatedMerge()
+    this.props.dispatcher.incrementMetric('mergesInitiatedFromComparison')
 
     await this.props.dispatcher.mergeBranch(
       this.props.repository,
diff --git a/app/src/ui/history/selected-commit.tsx b/app/src/ui/history/selected-commits.tsx
similarity index 76%
rename from app/src/ui/history/selected-commit.tsx
rename to app/src/ui/history/selected-commits.tsx
index 3b31b63dffb..569373fd1f9 100644
--- a/app/src/ui/history/selected-commit.tsx
+++ b/app/src/ui/history/selected-commits.tsx
@@ -25,7 +25,6 @@ import { Dispatcher } from '../dispatcher'
 import { Resizable } from '../resizable'
 import { showContextualMenu } from '../../lib/menu-item'
 
-import { CommitSummary } from './commit-summary'
 import { FileList } from './file-list'
 import { SeamlessDiffSwitcher } from '../diff/seamless-diff-switcher'
 import { getDotComAPIEndpoint } from '../../lib/api'
@@ -34,14 +33,18 @@ import { IChangesetData } from '../../lib/git'
 import { IConstrainedValue } from '../../lib/app-state'
 import { clamp } from '../../lib/clamp'
 import { pathExists } from '../lib/path-exists'
-import { enableMultiCommitDiffs } from '../../lib/feature-flag'
+import { UnreachableCommitsTab } from './unreachable-commits-dialog'
+import { ExpandableCommitSummary } from './expandable-commit-summary'
+import { DiffHeader } from '../diff/diff-header'
+import { Account } from '../../models/account'
+import { Emoji } from '../../lib/emoji'
 
 interface ISelectedCommitsProps {
   readonly repository: Repository
-  readonly isLocalRepository: boolean
   readonly dispatcher: Dispatcher
-  readonly emoji: Map<string, string>
+  readonly emoji: Map<string, Emoji>
   readonly selectedCommits: ReadonlyArray<Commit>
+  readonly shasInDiff: ReadonlyArray<string>
   readonly localCommitSHAs: ReadonlyArray<string>
   readonly changesetData: IChangesetData
   readonly selectedFile: CommittedFileChange | null
@@ -69,6 +72,9 @@ interface ISelectedCommitsProps {
    */
   readonly onOpenBinaryFile: (fullPath: string) => void
 
+  /** Called when the user requests to open a submodule. */
+  readonly onOpenSubmodule: (fullPath: string) => void
+
   /**
    * Called when the user is viewing an image diff and requests
    * to change the diff presentation mode.
@@ -83,11 +89,12 @@ interface ISelectedCommitsProps {
 
   /** Whether or not the selection of commits is contiguous */
   readonly isContiguous: boolean
+
+  readonly accounts: ReadonlyArray<Account>
 }
 
 interface ISelectedCommitsState {
   readonly isExpanded: boolean
-  readonly hideDescriptionBorder: boolean
 }
 
 /** The History component. Contains the commit list, commit summary, and diff. */
@@ -96,14 +103,12 @@ export class SelectedCommits extends React.Component<
   ISelectedCommitsState
 > {
   private readonly loadChangedFilesScheduler = new ThrottledScheduler(200)
-  private historyRef: HTMLDivElement | null = null
 
   public constructor(props: ISelectedCommitsProps) {
     super(props)
 
     this.state = {
       isExpanded: false,
-      hideDescriptionBorder: false,
     }
   }
 
@@ -111,8 +116,11 @@ export class SelectedCommits extends React.Component<
     this.props.dispatcher.changeFileSelection(this.props.repository, file)
   }
 
-  private onHistoryRef = (ref: HTMLDivElement | null) => {
-    this.historyRef = ref
+  private onRowDoubleClick = (row: number) => {
+    const files = this.props.changesetData.files
+    const file = files[row]
+
+    this.props.onOpenInExternalEditor(file.path)
   }
 
   public componentWillUpdate(nextProps: ISelectedCommitsProps) {
@@ -148,52 +156,78 @@ export class SelectedCommits extends React.Component<
     }
 
     return (
-      <SeamlessDiffSwitcher
-        repository={this.props.repository}
-        imageDiffType={this.props.selectedDiffType}
-        file={file}
-        diff={diff}
-        readOnly={true}
-        hideWhitespaceInDiff={this.props.hideWhitespaceInDiff}
+      <div className="diff-container">
+        {this.renderDiffHeader()}
+        <SeamlessDiffSwitcher
+          repository={this.props.repository}
+          imageDiffType={this.props.selectedDiffType}
+          file={file}
+          diff={diff}
+          readOnly={true}
+          hideWhitespaceInDiff={this.props.hideWhitespaceInDiff}
+          showDiffCheckMarks={false}
+          showSideBySideDiff={this.props.showSideBySideDiff}
+          onOpenBinaryFile={this.props.onOpenBinaryFile}
+          onChangeImageDiffType={this.props.onChangeImageDiffType}
+          onHideWhitespaceInDiffChanged={this.onHideWhitespaceInDiffChanged}
+          onOpenSubmodule={this.props.onOpenSubmodule}
+        />
+      </div>
+    )
+  }
+
+  private renderDiffHeader() {
+    const { selectedFile } = this.props
+    if (selectedFile === null) {
+      return null
+    }
+
+    const { path, status } = selectedFile
+
+    return (
+      <DiffHeader
+        diff={this.props.currentDiff}
+        path={path}
+        status={status}
         showSideBySideDiff={this.props.showSideBySideDiff}
-        onOpenBinaryFile={this.props.onOpenBinaryFile}
-        onChangeImageDiffType={this.props.onChangeImageDiffType}
+        onShowSideBySideDiffChanged={this.onShowSideBySideDiffChanged}
+        hideWhitespaceInDiff={this.props.hideWhitespaceInDiff}
         onHideWhitespaceInDiffChanged={this.onHideWhitespaceInDiffChanged}
+        onDiffOptionsOpened={this.props.onDiffOptionsOpened}
       />
     )
   }
 
   private renderCommitSummary(commits: ReadonlyArray<Commit>) {
     return (
-      <CommitSummary
-        commits={commits}
+      <ExpandableCommitSummary
+        selectedCommits={commits}
+        shasInDiff={this.props.shasInDiff}
         changesetData={this.props.changesetData}
         emoji={this.props.emoji}
         repository={this.props.repository}
         onExpandChanged={this.onExpandChanged}
         isExpanded={this.state.isExpanded}
-        onDescriptionBottomChanged={this.onDescriptionBottomChanged}
-        hideDescriptionBorder={this.state.hideDescriptionBorder}
-        hideWhitespaceInDiff={this.props.hideWhitespaceInDiff}
-        showSideBySideDiff={this.props.showSideBySideDiff}
-        onHideWhitespaceInDiffChanged={this.onHideWhitespaceInDiffChanged}
-        onShowSideBySideDiffChanged={this.onShowSideBySideDiffChanged}
-        onDiffOptionsOpened={this.props.onDiffOptionsOpened}
+        onHighlightShas={this.onHighlightShas}
+        showUnreachableCommits={this.showUnreachableCommits}
+        accounts={this.props.accounts}
       />
     )
   }
 
-  private onExpandChanged = (isExpanded: boolean) => {
-    this.setState({ isExpanded })
+  private showUnreachableCommits = (selectedTab: UnreachableCommitsTab) => {
+    this.props.dispatcher.showUnreachableCommits(selectedTab)
   }
 
-  private onDescriptionBottomChanged = (descriptionBottom: Number) => {
-    if (this.historyRef) {
-      const historyBottom = this.historyRef.getBoundingClientRect().bottom
-      this.setState({
-        hideDescriptionBorder: descriptionBottom >= historyBottom,
-      })
-    }
+  private onHighlightShas = (shasToHighlight: ReadonlyArray<string>) => {
+    this.props.dispatcher.updateShasToHighlight(
+      this.props.repository,
+      shasToHighlight
+    )
+  }
+
+  private onExpandChanged = (isExpanded: boolean) => {
+    this.setState({ isExpanded })
   }
 
   private onHideWhitespaceInDiffChanged = (hideWhitespaceInDiff: boolean) => {
@@ -226,13 +260,27 @@ export class SelectedCommits extends React.Component<
     const availableWidth = clamp(this.props.commitSummaryWidth) - 1
 
     return (
-      <FileList
-        files={files}
-        onSelectedFileChanged={this.onFileSelected}
-        selectedFile={this.props.selectedFile}
-        availableWidth={availableWidth}
-        onContextMenu={this.onContextMenu}
-      />
+      <>
+        {this.renderFileHeader()}
+        <FileList
+          files={files}
+          onSelectedFileChanged={this.onFileSelected}
+          selectedFile={this.props.selectedFile}
+          availableWidth={availableWidth}
+          onContextMenu={this.onContextMenu}
+          onRowDoubleClick={this.onRowDoubleClick}
+        />
+      </>
+    )
+  }
+
+  private renderFileHeader() {
+    const fileCount = this.props.changesetData.files.length
+    const filesPlural = fileCount === 1 ? 'file' : 'files'
+    return (
+      <div className="file-list-header">
+        {fileCount} changed {filesPlural}
+      </div>
     )
   }
 
@@ -249,10 +297,7 @@ export class SelectedCommits extends React.Component<
   public render() {
     const { selectedCommits, isContiguous } = this.props
 
-    if (
-      selectedCommits.length > 1 &&
-      (!isContiguous || !enableMultiCommitDiffs())
-    ) {
+    if (selectedCommits.length > 1 && !isContiguous) {
       return this.renderMultipleCommitsBlankSlate()
     }
 
@@ -264,7 +309,7 @@ export class SelectedCommits extends React.Component<
     const { commitSummaryWidth } = this.props
 
     return (
-      <div id="history" ref={this.onHistoryRef} className={className}>
+      <div id="history" className={className}>
         {this.renderCommitSummary(selectedCommits)}
         <div className="commit-details">
           <Resizable
@@ -273,6 +318,7 @@ export class SelectedCommits extends React.Component<
             maximumWidth={commitSummaryWidth.max}
             onResize={this.onCommitSummaryResize}
             onReset={this.onCommitSummaryReset}
+            description="Selected commit file list"
           >
             {this.renderFileList()}
           </Resizable>
@@ -300,21 +346,16 @@ export class SelectedCommits extends React.Component<
     return (
       <div id="multiple-commits-selected" className="blankslate">
         <div className="panel blankslate">
-          <img src={BlankSlateImage} className="blankslate-image" />
+          <img src={BlankSlateImage} className="blankslate-image" alt="" />
           <div>
             <p>
-              Unable to display diff when multiple{' '}
-              {enableMultiCommitDiffs() ? 'non-consecutive ' : ' '}commits are
-              selected.
+              Unable to display diff when multiple non-consecutive selected.
             </p>
             <div>You can:</div>
             <ul>
               <li>
-                Select a single commit{' '}
-                {enableMultiCommitDiffs()
-                  ? 'or a range of consecutive commits '
-                  : ' '}
-                to view a diff.
+                Select a single commit or a range of consecutive commits to view
+                a diff.
               </li>
               <li>Drag the commits to the branch menu to cherry-pick them.</li>
               <li>Drag the commits to squash or reorder them.</li>
@@ -369,7 +410,7 @@ export class SelectedCommits extends React.Component<
       },
       {
         label: openInExternalEditor,
-        action: () => this.props.onOpenInExternalEditor(fullPath),
+        action: () => this.props.onOpenInExternalEditor(file.path),
         enabled: fileExistsOnDisk,
       },
       {
@@ -425,7 +466,7 @@ function NoCommitSelected() {
 
   return (
     <div className="panel blankslate">
-      <img src={BlankSlateImage} className="blankslate-image" />
+      <img src={BlankSlateImage} className="blankslate-image" alt="" />
       No commit selected
     </div>
   )
diff --git a/app/src/ui/history/unreachable-commits-dialog.tsx b/app/src/ui/history/unreachable-commits-dialog.tsx
new file mode 100644
index 00000000000..1add18ee26d
--- /dev/null
+++ b/app/src/ui/history/unreachable-commits-dialog.tsx
@@ -0,0 +1,171 @@
+import * as React from 'react'
+import { Dialog, DialogFooter } from '../dialog'
+import { TabBar } from '../tab-bar'
+import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group'
+import { Commit } from '../../models/commit'
+import { CommitList } from './commit-list'
+import { LinkButton } from '../lib/link-button'
+import { Account } from '../../models/account'
+import { Emoji } from '../../lib/emoji'
+
+export enum UnreachableCommitsTab {
+  Unreachable,
+  Reachable,
+}
+
+interface IUnreachableCommitsDialogProps {
+  /** The shas of the currently selected commits */
+  readonly selectedShas: ReadonlyArray<string>
+
+  /** The shas of the commits showed in the diff */
+  readonly shasInDiff: ReadonlyArray<string>
+
+  /** The commits loaded, keyed by their full SHA. */
+  readonly commitLookup: Map<string, Commit>
+
+  /** Used to set the selected tab. */
+  readonly selectedTab: UnreachableCommitsTab
+
+  /** The emoji lookup to render images inline */
+  readonly emoji: Map<string, Emoji>
+
+  /** Called to dismiss the  */
+  readonly onDismissed: () => void
+
+  readonly accounts: ReadonlyArray<Account>
+}
+
+interface IUnreachableCommitsDialogState {
+  /** The currently select tab. */
+  readonly selectedTab: UnreachableCommitsTab
+
+  /** The currently selected sha in the list */
+  readonly selectedSHAs: ReadonlyArray<string>
+}
+
+/** The component for for viewing the unreachable commits in the current diff a repository. */
+export class UnreachableCommitsDialog extends React.Component<
+  IUnreachableCommitsDialogProps,
+  IUnreachableCommitsDialogState
+> {
+  public constructor(props: IUnreachableCommitsDialogProps) {
+    super(props)
+
+    this.state = {
+      selectedTab: props.selectedTab,
+      selectedSHAs: [],
+    }
+  }
+
+  public componentWillUpdate(nextProps: IUnreachableCommitsDialogProps) {
+    const currentSelectedTab = this.props.selectedTab
+    const selectedTab = nextProps.selectedTab
+
+    if (currentSelectedTab !== selectedTab) {
+      this.setState({ selectedTab })
+    }
+  }
+
+  private onTabClicked = (selectedTab: UnreachableCommitsTab) => {
+    this.setState({ selectedTab })
+  }
+
+  private getShasToDisplay = () => {
+    const { selectedTab } = this.state
+    const { shasInDiff, selectedShas } = this.props
+    if (selectedTab === UnreachableCommitsTab.Reachable) {
+      return shasInDiff
+    }
+
+    return selectedShas.filter(sha => !shasInDiff.includes(sha))
+  }
+
+  private onCommitsSelected = (
+    commits: ReadonlyArray<Commit>,
+    isContiguous: boolean
+  ) => {
+    this.setState({ selectedSHAs: commits.map(c => c.sha) })
+  }
+
+  private renderTabs() {
+    return (
+      <TabBar
+        onTabClicked={this.onTabClicked}
+        selectedIndex={this.state.selectedTab}
+      >
+        <span>Unreachable</span>
+        <span>Reachable</span>
+      </TabBar>
+    )
+  }
+
+  private renderActiveTab() {
+    const { commitLookup, emoji } = this.props
+
+    return (
+      <>
+        {this.renderUnreachableCommitsMessage()}
+        <div className="unreachable-commit-list">
+          <CommitList
+            gitHubRepository={null}
+            isLocalRepository={true}
+            commitLookup={commitLookup}
+            commitSHAs={this.getShasToDisplay()}
+            selectedSHAs={this.state.selectedSHAs}
+            localCommitSHAs={[]}
+            emoji={emoji}
+            onCommitsSelected={this.onCommitsSelected}
+            accounts={this.props.accounts}
+            isInformationalView={true}
+          />
+        </div>
+      </>
+    )
+  }
+
+  private renderFooter() {
+    return (
+      <DialogFooter>
+        <OkCancelButtonGroup cancelButtonVisible={false} />
+      </DialogFooter>
+    )
+  }
+
+  private renderUnreachableCommitsMessage = () => {
+    const count = this.getShasToDisplay().length
+    const commitsPluralized = count > 1 ? 'commits' : 'commit'
+    const pronounPluralized = count > 1 ? `they're` : `it's`
+    return (
+      <div className="message">
+        You will{' '}
+        {this.state.selectedTab === UnreachableCommitsTab.Unreachable
+          ? 'not'
+          : ''}{' '}
+        see changes from the following {commitsPluralized} because{' '}
+        {pronounPluralized}{' '}
+        {this.state.selectedTab === UnreachableCommitsTab.Unreachable
+          ? 'not'
+          : ''}{' '}
+        in the ancestry path of the most recent commit in your selection.{' '}
+        <LinkButton uri="https://github.com/desktop/desktop/blob/development/docs/learn-more/unreachable-commits.md">
+          Learn more about unreachable commits.
+        </LinkButton>
+      </div>
+    )
+  }
+
+  public render() {
+    return (
+      <Dialog
+        className="unreachable-commits"
+        title={__DARWIN__ ? 'Commit Reachability' : 'Commit reachability'}
+        onSubmit={this.props.onDismissed}
+        onDismissed={this.props.onDismissed}
+      >
+        {this.renderTabs()}
+        {this.renderActiveTab()}
+        {this.renderFooter()}
+      </Dialog>
+    )
+  }
+}
diff --git a/app/src/ui/index.tsx b/app/src/ui/index.tsx
index 997818a83f6..ad32d7dc7d7 100644
--- a/app/src/ui/index.tsx
+++ b/app/src/ui/index.tsx
@@ -6,7 +6,6 @@ import * as Path from 'path'
 import { App } from './app'
 import {
   Dispatcher,
-  gitAuthenticationErrorHandler,
   externalEditorErrorHandler,
   openShellErrorHandler,
   mergeConflictHandler,
@@ -56,16 +55,6 @@ import { ApiRepositoriesStore } from '../lib/stores/api-repositories-store'
 import { CommitStatusStore } from '../lib/stores/commit-status-store'
 import { PullRequestCoordinator } from '../lib/stores/pull-request-coordinator'
 
-// We're using a polyfill for the upcoming CSS4 `:focus-ring` pseudo-selector.
-// This allows us to not have to override default accessibility driven focus
-// styles for buttons in the case when a user clicks on a button. This also
-// gives better visibility to individuals who navigate with the keyboard.
-//
-// See:
-//   https://github.com/WICG/focus-ring
-//   Focus Ring! -- A11ycasts #16: https://youtu.be/ilj2P5-5CjI
-import 'wicg-focus-ring'
-
 import { sendNonFatalException } from '../lib/helpers/non-fatal-exception'
 import { enableUnhandledRejectionReporting } from '../lib/feature-flag'
 import { AheadBehindStore } from '../lib/stores/ahead-behind-store'
@@ -79,6 +68,12 @@ import { NotificationsStore } from '../lib/stores/notifications-store'
 import * as ipcRenderer from '../lib/ipc-renderer'
 import { migrateRendererGUID } from '../lib/get-renderer-guid'
 import { initializeRendererNotificationHandler } from '../lib/notifications/notification-handler'
+import { Grid } from 'react-virtualized'
+import { NotificationsDebugStore } from '../lib/stores/notifications-debug-store'
+import { trampolineServer } from '../lib/trampoline/trampoline-server'
+import { TrampolineCommandIdentifier } from '../lib/trampoline/trampoline-command'
+import { createAskpassTrampolineHandler } from '../lib/trampoline/trampoline-askpass-handler'
+import { createCredentialHelperTrampolineHandler } from '../lib/trampoline/trampoline-credential-helper'
 
 if (__DEV__) {
   installDevGlobals()
@@ -168,8 +163,8 @@ const sendErrorWithContext = (
           extra.windowZoomFactor = `${currentState.windowZoomFactor}`
         }
 
-        if (currentState.errors.length > 0) {
-          extra.activeAppErrors = `${currentState.errors.length}`
+        if (currentState.errorCount > 0) {
+          extra.activeAppErrors = `${currentState.errorCount}`
         }
 
         extra.repositoryCount = `${currentState.repositories.length}`
@@ -229,9 +224,21 @@ const statsStore = new StatsStore(
   new StatsDatabase('StatsDatabase'),
   new UiActivityMonitor()
 )
-const signInStore = new SignInStore()
 
 const accountsStore = new AccountsStore(localStorage, TokenStore)
+
+const signInStore = new SignInStore(accountsStore)
+
+trampolineServer.registerCommandHandler(
+  TrampolineCommandIdentifier.AskPass,
+  createAskpassTrampolineHandler(accountsStore)
+)
+
+trampolineServer.registerCommandHandler(
+  TrampolineCommandIdentifier.CredentialHelper,
+  createCredentialHelperTrampolineHandler(accountsStore)
+)
+
 const repositoriesStore = new RepositoriesStore(
   new RepositoriesDatabase('Database')
 )
@@ -246,7 +253,7 @@ const pullRequestCoordinator = new PullRequestCoordinator(
   repositoriesStore
 )
 
-const repositoryStateManager = new RepositoryStateCache()
+const repositoryStateManager = new RepositoryStateCache(statsStore)
 
 const apiRepositoriesStore = new ApiRepositoriesStore(accountsStore)
 
@@ -262,6 +269,12 @@ const notificationsStore = new NotificationsStore(
   statsStore
 )
 
+const notificationsDebugStore = new NotificationsDebugStore(
+  accountsStore,
+  notificationsStore,
+  pullRequestCoordinator
+)
+
 const appStore = new AppStore(
   gitHubUserStore,
   cloningRepositoriesStore,
@@ -294,7 +307,6 @@ dispatcher.registerErrorHandler(openShellErrorHandler)
 dispatcher.registerErrorHandler(mergeConflictHandler)
 dispatcher.registerErrorHandler(lfsAttributeMismatchHandler)
 dispatcher.registerErrorHandler(insufficientGitHubRepoPermissions)
-dispatcher.registerErrorHandler(gitAuthenticationErrorHandler)
 dispatcher.registerErrorHandler(pushNeedsPullHandler)
 dispatcher.registerErrorHandler(samlReauthRequired)
 dispatcher.registerErrorHandler(backgroundTaskHandler)
@@ -337,9 +349,40 @@ ipcRenderer.on('blur', () => {
 })
 
 ipcRenderer.on('url-action', (_, action) =>
-  dispatcher.dispatchURLAction(action)
+  dispatcher
+    .dispatchURLAction(action)
+    .catch(e => log.error(`URL action ${action.name} failed`, e))
+)
+
+ipcRenderer.on('cli-action', (_, action) =>
+  dispatcher
+    .dispatchCLIAction(action)
+    .catch(e => log.error(`CLI action ${action.kind} failed`, e))
 )
 
+// react-virtualized will use the literal string "grid" as the 'aria-label'
+// attribute unless we override it. This is a problem because aria-label should
+// not be set unless there's a compelling reason for it[1].
+//
+// Similarly the default props call for the 'aria-readonly' attribute to be set
+// to true which according to MDN doesn't fit our use case[2]:
+//
+// > This indicates to the user that an interactive element that would normally
+// > be focusable and copyable has been placed in a read-only (not disabled)
+// > state.
+//
+// 1. https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Attributes/aria-label
+// 2. https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Attributes/aria-readonly
+;(function (
+  defaults: Record<string, unknown> | undefined,
+  types: Record<string, unknown> | undefined
+) {
+  ;['aria-label', 'aria-readonly'].forEach(k => {
+    delete defaults?.[k]
+    delete types?.[k]
+  })
+})(Grid.defaultProps, Grid.propTypes)
+
 ReactDOM.render(
   <App
     dispatcher={dispatcher}
@@ -348,6 +391,7 @@ ReactDOM.render(
     issuesStore={issuesStore}
     gitHubUserStore={gitHubUserStore}
     aheadBehindStore={aheadBehindStore}
+    notificationsDebugStore={notificationsDebugStore}
     startTime={startTime}
   />,
   document.getElementById('desktop-app-container')!
diff --git a/app/src/ui/installing-update/installing-update.tsx b/app/src/ui/installing-update/installing-update.tsx
new file mode 100644
index 00000000000..fc75cd630ec
--- /dev/null
+++ b/app/src/ui/installing-update/installing-update.tsx
@@ -0,0 +1,92 @@
+import * as React from 'react'
+
+import { Row } from '../lib/row'
+import {
+  Dialog,
+  DialogContent,
+  OkCancelButtonGroup,
+  DialogFooter,
+} from '../dialog'
+import { updateStore, IUpdateState, UpdateStatus } from '../lib/update-store'
+import { Disposable } from 'event-kit'
+import { Dispatcher } from '../dispatcher'
+
+interface IInstallingUpdateProps {
+  /**
+   * Event triggered when the dialog is dismissed by the user in the
+   * ways described in the Dialog component's dismissable prop.
+   */
+  readonly onDismissed: () => void
+
+  readonly dispatcher: Dispatcher
+}
+
+/**
+ * A dialog that presents information about the
+ * running application such as name and version.
+ */
+export class InstallingUpdate extends React.Component<IInstallingUpdateProps> {
+  private updateStoreEventHandle: Disposable | null = null
+
+  private onUpdateStateChanged = (updateState: IUpdateState) => {
+    // If the update is not being downloaded (`UpdateStatus.UpdateAvailable`),
+    // i.e. if it's already downloaded or not available, close the window.
+    if (updateState.status !== UpdateStatus.UpdateAvailable) {
+      this.props.dispatcher.quitApp(false)
+    }
+  }
+
+  public componentDidMount() {
+    this.updateStoreEventHandle = updateStore.onDidChange(
+      this.onUpdateStateChanged
+    )
+
+    // Manually update the state to ensure we're in sync with the store
+    this.onUpdateStateChanged(updateStore.state)
+  }
+
+  public componentWillUnmount() {
+    if (this.updateStoreEventHandle) {
+      this.updateStoreEventHandle.dispose()
+      this.updateStoreEventHandle = null
+    }
+
+    // This will ensure the app doesn't try to quit after the update is
+    // installed once the dialog is closed (explicitly or implicitly, by
+    // opening another dialog on top of this one).
+    this.props.dispatcher.cancelQuittingApp()
+  }
+
+  private onQuitAnywayButtonClicked = () => {
+    this.props.dispatcher.quitApp(true)
+  }
+
+  public render() {
+    return (
+      <Dialog
+        id="installing-update"
+        title={__DARWIN__ ? 'Installing Update…' : 'Installing update…'}
+        loading={true}
+        onSubmit={this.props.onDismissed}
+        backdropDismissable={false}
+        type="warning"
+        onDismissed={this.props.onDismissed}
+      >
+        <DialogContent>
+          <Row className="updating-message">
+            Do not close GitHub Desktop while the update is in progress. Closing
+            now may break your installation.
+          </Row>
+        </DialogContent>
+        <DialogFooter>
+          <OkCancelButtonGroup
+            okButtonText={__DARWIN__ ? 'Quit Anyway' : 'Quit anyway'}
+            onOkButtonClick={this.onQuitAnywayButtonClicked}
+            onCancelButtonClick={this.props.onDismissed}
+            destructive={true}
+          />
+        </DialogFooter>
+      </Dialog>
+    )
+  }
+}
diff --git a/app/src/ui/invalidated-token/invalidated-token.tsx b/app/src/ui/invalidated-token/invalidated-token.tsx
index 6c9f9bfd46c..d1f1c7b6160 100644
--- a/app/src/ui/invalidated-token/invalidated-token.tsx
+++ b/app/src/ui/invalidated-token/invalidated-token.tsx
@@ -24,7 +24,9 @@ export class InvalidatedToken extends React.Component<IInvalidatedTokenProps> {
       <Dialog
         id="invalidated-token"
         type="warning"
-        title="Warning"
+        title={
+          __DARWIN__ ? 'Invalidated Account Token' : 'Invalidated account token'
+        }
         onSubmit={this.onSubmit}
         onDismissed={this.props.onDismissed}
       >
diff --git a/app/src/ui/keyboard-shortcut/keyboard-shortcut.tsx b/app/src/ui/keyboard-shortcut/keyboard-shortcut.tsx
new file mode 100644
index 00000000000..0c1d61145f5
--- /dev/null
+++ b/app/src/ui/keyboard-shortcut/keyboard-shortcut.tsx
@@ -0,0 +1,23 @@
+import * as React from 'react'
+
+interface IKeyboardShortCutProps {
+  /** Windows/Linux keyboard shortcut */
+  readonly keys: ReadonlyArray<string>
+  /** MacOS keyboard shortcut */
+  readonly darwinKeys: ReadonlyArray<string>
+}
+
+export class KeyboardShortcut extends React.Component<IKeyboardShortCutProps> {
+  public render() {
+    const keys = __DARWIN__ ? this.props.darwinKeys : this.props.keys
+
+    return keys.map((k, i) => {
+      return (
+        <React.Fragment key={k + i}>
+          <kbd>{k}</kbd>
+          {!__DARWIN__ && i < keys.length - 1 ? <>+</> : null}
+        </React.Fragment>
+      )
+    })
+  }
+}
diff --git a/app/src/ui/lfs/attribute-mismatch.tsx b/app/src/ui/lfs/attribute-mismatch.tsx
index f7adf6fc590..b5a78cfbf1c 100644
--- a/app/src/ui/lfs/attribute-mismatch.tsx
+++ b/app/src/ui/lfs/attribute-mismatch.tsx
@@ -1,8 +1,6 @@
 import * as React from 'react'
 import { Dialog, DialogContent, DialogFooter } from '../dialog'
 import { LinkButton } from '../lib/link-button'
-import { getGlobalConfigPath } from '../../lib/git'
-import { shell } from '../../lib/app-shell'
 import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group'
 
 interface IAttributeMismatchProps {
@@ -11,50 +9,11 @@ interface IAttributeMismatchProps {
 
   /** Called when the user has chosen to replace the update filters. */
   readonly onUpdateExistingFilters: () => void
-}
 
-interface IAttributeMismatchState {
-  readonly globalGitConfigPath: string | null
+  readonly onEditGlobalGitConfig: () => void
 }
 
-export class AttributeMismatch extends React.Component<
-  IAttributeMismatchProps,
-  IAttributeMismatchState
-> {
-  public constructor(props: IAttributeMismatchProps) {
-    super(props)
-
-    this.state = {
-      globalGitConfigPath: null,
-    }
-  }
-
-  public async componentDidMount() {
-    try {
-      const path = await getGlobalConfigPath()
-      this.setState({ globalGitConfigPath: path })
-    } catch (error) {
-      log.warn(`Couldn't get the global git config path`, error)
-    }
-  }
-
-  private renderGlobalGitConfigLink() {
-    const path = this.state.globalGitConfigPath
-    const msg = 'your global git config'
-    if (path) {
-      return <LinkButton onClick={this.showGlobalGitConfig}>{msg}</LinkButton>
-    } else {
-      return msg
-    }
-  }
-
-  private showGlobalGitConfig = () => {
-    const path = this.state.globalGitConfigPath
-    if (path) {
-      shell.openPath(path)
-    }
-  }
-
+export class AttributeMismatch extends React.Component<IAttributeMismatchProps> {
   public render() {
     return (
       <Dialog
@@ -70,8 +29,11 @@ export class AttributeMismatch extends React.Component<
         <DialogContent>
           <p>
             Git LFS filters are already configured in{' '}
-            {this.renderGlobalGitConfigLink()} but are not the values it
-            expects. Would you like to update them now?
+            <LinkButton onClick={this.props.onEditGlobalGitConfig}>
+              your global git config
+            </LinkButton>{' '}
+            but are not the values it expects. Would you like to update them
+            now?
           </p>
         </DialogContent>
 
diff --git a/app/src/ui/lfs/initialize-lfs.tsx b/app/src/ui/lfs/initialize-lfs.tsx
index 91299ec263a..efe59f912ec 100644
--- a/app/src/ui/lfs/initialize-lfs.tsx
+++ b/app/src/ui/lfs/initialize-lfs.tsx
@@ -35,8 +35,9 @@ export class InitializeLFS extends React.Component<IInitializeLFSProps, {}> {
       <Dialog
         id="initialize-lfs"
         title="Initialize Git LFS"
-        dismissable={false}
+        backdropDismissable={false}
         onSubmit={this.onInitialize}
+        onDismissed={this.props.onDismissed}
       >
         <DialogContent>{this.renderRepositories()}</DialogContent>
 
diff --git a/app/src/ui/lib/access-text.tsx b/app/src/ui/lib/access-text.tsx
index 6f3bb3c51b5..c926d5d2677 100644
--- a/app/src/ui/lib/access-text.tsx
+++ b/app/src/ui/lib/access-text.tsx
@@ -78,6 +78,11 @@ export class AccessText extends React.Component<IAccessTextProps, {}> {
 
     const plainText = `${preText}${accessKeyText}${postText}`
 
+    // When adding this linter disable, I thought about changing this to use a
+    // screen reader only span instead of aria-label as I believe the purpose to
+    // to provide a label for screen readers... But wasn't 100% sure if that is
+    // it's purpose to be dug into later.
+    // eslint-disable-next-line github/a11y-role-supports-aria-props
     return <span aria-label={plainText}>{elements}</span>
   }
 }
diff --git a/app/src/ui/lib/action-status-icon.tsx b/app/src/ui/lib/action-status-icon.tsx
index 48ff4f33bc6..ca3644a924e 100644
--- a/app/src/ui/lib/action-status-icon.tsx
+++ b/app/src/ui/lib/action-status-icon.tsx
@@ -3,8 +3,8 @@ import classNames from 'classnames'
 import { ComputedAction } from '../../models/computed-action'
 import { assertNever } from '../../lib/fatal-error'
 
-import { Octicon, OcticonSymbolType } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import { Octicon, OcticonSymbol } from '../octicons'
+import * as octicons from '../octicons/octicons.generated'
 
 interface IActionStatusIconProps {
   /** The status to display to the user */
@@ -52,16 +52,16 @@ export class ActionStatusIcon extends React.Component<IActionStatusIconProps> {
   }
 }
 
-function getSymbolForState(status: ComputedAction): OcticonSymbolType {
+function getSymbolForState(status: ComputedAction): OcticonSymbol {
   switch (status) {
     case ComputedAction.Loading:
-      return OcticonSymbol.dotFill
+      return octicons.dotFill
     case ComputedAction.Conflicts:
-      return OcticonSymbol.alert
+      return octicons.alert
     case ComputedAction.Invalid:
-      return OcticonSymbol.x
+      return octicons.x
     case ComputedAction.Clean:
-      return OcticonSymbol.check
+      return octicons.check
     default:
       return assertNever(status, `Unknown state: ${JSON.stringify(status)}`)
   }
diff --git a/app/src/ui/lib/app-proxy.ts b/app/src/ui/lib/app-proxy.ts
index 960b6d228d6..78db36c4fe6 100644
--- a/app/src/ui/lib/app-proxy.ts
+++ b/app/src/ui/lib/app-proxy.ts
@@ -8,7 +8,6 @@ export type PathType =
   | 'home'
   | 'appData'
   | 'userData'
-  | 'cache'
   | 'temp'
   | 'exe'
   | 'module'
@@ -21,6 +20,7 @@ export type PathType =
   | 'recent'
   | 'logs'
   | 'crashDumps'
+  | 'sessionData'
 
 /**
  * Get the version of the app.
diff --git a/app/src/ui/lib/application-theme.ts b/app/src/ui/lib/application-theme.ts
index 47ad7e8dffc..f6dd5c9bbf0 100644
--- a/app/src/ui/lib/application-theme.ts
+++ b/app/src/ui/lib/application-theme.ts
@@ -9,20 +9,6 @@ import {
 } from '../main-process-proxy'
 import { ThemeSource } from './theme-source'
 
-/** Interface for set of customizable styles */
-export interface ICustomTheme {
-  // application background color
-  background: string
-  // application border color
-  border: string
-  // main application text color
-  text: string
-  // used to indicate a selected item or action button
-  activeItem: string
-  // text used on selected item or action button
-  activeText: string
-}
-
 /**
  * A set of the user-selectable appearances (aka themes)
  */
@@ -30,13 +16,9 @@ export enum ApplicationTheme {
   Light = 'light',
   Dark = 'dark',
   System = 'system',
-  HighContrast = 'highContrast',
 }
 
-export type ApplicableTheme =
-  | ApplicationTheme.Light
-  | ApplicationTheme.Dark
-  | ApplicationTheme.HighContrast
+export type ApplicableTheme = ApplicationTheme.Light | ApplicationTheme.Dark
 
 /**
  * Gets the friendly name of an application theme for use
@@ -48,7 +30,6 @@ export function getThemeName(theme: ApplicationTheme): ThemeSource {
     case ApplicationTheme.Light:
       return 'light'
     case ApplicationTheme.Dark:
-    case ApplicationTheme.HighContrast:
       return 'dark'
     default:
       return 'system'
@@ -91,8 +72,7 @@ function getApplicationThemeSetting(): ApplicationTheme {
 
   if (
     themeSetting === ApplicationTheme.Light ||
-    themeSetting === ApplicationTheme.Dark ||
-    themeSetting === ApplicationTheme.HighContrast
+    themeSetting === ApplicationTheme.Dark
   ) {
     return themeSetting
   }
@@ -140,9 +120,11 @@ export function supportsSystemThemeChanges(): boolean {
     // was released October 2nd, 2018 and the feature can just be "attained" by upgrading
     // See https://github.com/desktop/desktop/issues/9015 for more
     return isWindows10And1809Preview17666OrLater()
+  } else {
+    // enabling this for Linux users as an experiment to see if distributions
+    // work with how Chromium detects theme changes
+    return true
   }
-
-  return false
 }
 
 function isDarkModeEnabled(): Promise<boolean> {
diff --git a/app/src/ui/lib/aria-types.ts b/app/src/ui/lib/aria-types.ts
new file mode 100644
index 00000000000..9da74541e53
--- /dev/null
+++ b/app/src/ui/lib/aria-types.ts
@@ -0,0 +1,3 @@
+import { HTMLAttributes } from 'react'
+
+export type AriaHasPopupType = HTMLAttributes<HTMLElement>['aria-haspopup']
diff --git a/app/src/ui/lib/augmented-filter-list.tsx b/app/src/ui/lib/augmented-filter-list.tsx
new file mode 100644
index 00000000000..ba8ac4e78e6
--- /dev/null
+++ b/app/src/ui/lib/augmented-filter-list.tsx
@@ -0,0 +1,889 @@
+import * as React from 'react'
+import classnames from 'classnames'
+
+import { SectionList, ClickSource } from '../lib/list/section-list'
+import {
+  findNextSelectableRow,
+  SelectionDirection,
+} from '../lib/list/section-list-selection'
+import { TextBox } from '../lib/text-box'
+import { Row } from '../lib/row'
+
+import { match, IMatch, IMatches } from '../../lib/fuzzy-find'
+import { AriaLiveContainer } from '../accessibility/aria-live-container'
+import {
+  InvalidRowIndexPath,
+  RowIndexPath,
+  rowIndexPathEquals,
+} from './list/list-row-index-path'
+import {
+  IFilterListGroup,
+  IFilterListItem,
+  SelectionSource,
+} from './filter-list'
+import * as octicons from '../octicons/octicons.generated'
+import xor from 'lodash/xor'
+
+interface IFlattenedGroup {
+  readonly kind: 'group'
+  readonly identifier: string
+}
+
+interface IFlattenedItem<T extends IFilterListItem> {
+  readonly kind: 'item'
+  readonly item: T
+  /** Array of indexes in `item.text` that should be highlighted */
+  readonly matches: IMatches
+}
+
+/**
+ * A row in the list. This is used internally after the user-provided groups are
+ * flattened.
+ */
+type IFilterListRow<T extends IFilterListItem> =
+  | IFlattenedGroup
+  | IFlattenedItem<T>
+
+interface IAugmentedSectionFilterListProps<T extends IFilterListItem> {
+  /** The unique identifier for the outer element of the component (optional, defaults to null) */
+  readonly id?: string
+
+  /** A class name for the wrapping element. */
+  readonly className?: string
+
+  /** The height of the rows. */
+  readonly rowHeight: number
+
+  /** The ordered groups to display in the list. */
+  // eslint-disable-next-line react/no-unused-prop-types
+  readonly groups: ReadonlyArray<IFilterListGroup<T>>
+
+  /** The selected item. */
+  readonly selectedItems: ReadonlyArray<T>
+
+  /** Called to render each visible item. */
+  readonly renderItem: (item: T, matches: IMatches) => JSX.Element | null
+
+  /** Called to render header for the group with the given identifier. */
+  readonly renderGroupHeader?: (identifier: string) => JSX.Element | null
+
+  /** Called to render content before/above the filter and list. */
+  readonly renderPreList?: () => JSX.Element | null
+
+  /**
+   * This function will be called when a pointer device is pressed and then
+   * released on a selectable row. Note that this follows the conventions
+   * of button elements such that pressing Enter or Space on a keyboard
+   * while focused on a particular row will also trigger this event. Consumers
+   * can differentiate between the two using the source parameter.
+   *
+   * Note that this event handler will not be called for keyboard events
+   * if `event.preventDefault()` was called in the onRowKeyDown event handler.
+   *
+   * Consumers of this event do _not_ have to call event.preventDefault,
+   * when this event is subscribed to the list will automatically call it.
+   */
+  readonly onItemClick?: (item: T, source: ClickSource) => void
+
+  readonly onItemDoubleClick?: (item: T, source: ClickSource) => void
+
+  /**
+   * This function will be called when the selection changes as a result of a
+   * user keyboard or mouse action (i.e. not when props change). This function
+   * will not be invoked when an already selected row is clicked on.
+   *
+   * @param selectedItem - The item that was just selected
+   * @param source       - The kind of user action that provoked the change,
+   *                       either a pointer device press, or a keyboard event
+   *                       (arrow up/down)
+   */
+  readonly onSelectionChanged?: (
+    selectedItems: ReadonlyArray<T>,
+    source: SelectionSource
+  ) => void
+
+  /**
+   * Called when a key down happens in the filter text input. Users have a
+   * chance to respond or cancel the default behavior by calling
+   * `preventDefault()`.
+   */
+  readonly onFilterKeyDown?: (
+    event: React.KeyboardEvent<HTMLInputElement>
+  ) => void
+
+  /** Called when the Enter key is pressed in field of type search */
+  readonly onEnterPressedWithoutFilteredItems?: (text: string) => void
+
+  /** Aria label for a specific item */
+  readonly getItemAriaLabel?: (item: T) => string | undefined
+
+  /** Aria label for a specific group */
+  readonly getGroupAriaLabel?: (group: number) => string | undefined
+
+  /** The current filter text to use in the form */
+  readonly filterText?: string
+
+  /** Called when the filter text is changed by the user */
+  readonly onFilterTextChanged?: (text: string) => void
+
+  /**
+   * Whether or not the filter list should allow selection
+   * and filtering. Defaults to false.
+   */
+  readonly disabled?: boolean
+
+  /** Any props which should cause a re-render if they change. */
+  readonly invalidationProps: any
+
+  /** Called to render content after the filter. */
+  readonly renderPostFilter?: () => JSX.Element | null
+
+  /** Called when there are no items to render.  */
+  readonly renderNoItems?: () => JSX.Element | null
+
+  /**
+   * A reference to a TextBox that will be used to control this component.
+   *
+   * See https://github.com/desktop/desktop/issues/4317 for refactoring work to
+   * make this more composable which should make this unnecessary.
+   */
+  readonly filterTextBox?: TextBox
+
+  /**
+   * Callback to fire when the items in the filter list are updated
+   */
+  readonly onFilterListResultsChanged?: (
+    filteredItems: ReadonlyArray<T>
+  ) => void
+
+  /** Placeholder text for text box. Default is "Filter". */
+  readonly placeholderText?: string
+
+  /** If true, we do not render the filter. */
+  readonly hideFilterRow?: boolean
+
+  /**
+   * A handler called whenever a context menu event is received on the
+   * row container element.
+   *
+   * The context menu is invoked when a user right clicks the row or
+   * uses keyboard shortcut.s
+   */
+  readonly onItemContextMenu?: (
+    item: T,
+    event: React.MouseEvent<HTMLDivElement>
+  ) => void
+
+  /** This function will be called only when an item obtains focus via keyboard */
+  readonly onItemKeyboardFocus?: (
+    item: T,
+    event: React.KeyboardEvent<any>
+  ) => void
+
+  /** This function will be called when a row loses focus */
+  readonly onItemBlur?: (
+    item: T,
+    event: React.FocusEvent<HTMLDivElement>
+  ) => void
+
+  readonly onItemKeyDown?: (item: T, event: React.KeyboardEvent<any>) => void
+
+  readonly onScroll?: (scrollTop: number, clientHeight: number) => void
+
+  /**
+   * The number of pixels from the top of the list indicating
+   * where to scroll do on rendering of the list.
+   */
+  readonly setScrollTop?: number
+
+  /** The aria-label attribute for the list component. */
+  readonly ariaLabel?: string
+
+  /**
+   * This prop defines the behaviour of the selection of items within this list.
+   *  - 'single' : (default) single list-item selection. [shift] and [ctrl] have
+   * no effect. Use in combination with one of:
+   *             onSelectedRowChanged(row: T)
+   *             onSelectionChanged(rows: T[])
+   *  - 'multi' : allows range and/or arbitrary selection. [shift] and [ctrl]
+   * can be used. Use in combination with:
+   *    onSelectionChanged(rows: T[])
+   *
+   * Note... the SectionList also has 'range' and this has not been implemented
+   * in this filter list (not needed yet)
+   */
+  readonly selectionMode?: 'single' | 'multi'
+}
+
+interface IAugmentedSectionFilterListState<T extends IFilterListItem> {
+  readonly rows: ReadonlyArray<ReadonlyArray<IFilterListRow<T>>>
+  readonly selectedRows: ReadonlyArray<RowIndexPath>
+  readonly filterValue: string
+  readonly filterValueChanged: boolean
+  // Indices of groups in the filtered list
+  readonly groups: ReadonlyArray<number>
+}
+
+/** A List which includes the ability to filter based on its contents. */
+export class AugmentedSectionFilterList<
+  T extends IFilterListItem
+> extends React.Component<
+  IAugmentedSectionFilterListProps<T>,
+  IAugmentedSectionFilterListState<T>
+> {
+  private list: SectionList | null = null
+  private filterTextBox: TextBox | null = null
+
+  public constructor(props: IAugmentedSectionFilterListProps<T>) {
+    super(props)
+
+    if (props.filterTextBox !== undefined) {
+      this.filterTextBox = props.filterTextBox
+    }
+
+    this.state = createStateUpdate(props, null)
+  }
+
+  public componentWillReceiveProps(
+    nextProps: IAugmentedSectionFilterListProps<T>
+  ) {
+    this.setState(createStateUpdate(nextProps, this.state))
+  }
+
+  public componentDidUpdate(
+    prevProps: IAugmentedSectionFilterListProps<T>,
+    prevState: IAugmentedSectionFilterListState<T>
+  ) {
+    if (this.props.onSelectionChanged) {
+      const oldSelectedItemIds = prevState.selectedRows
+        .map(row => getItemIdFromRowIndex(prevState.rows, row))
+        .filter(i => i !== null)
+      const newSelectedItemIds = this.state.selectedRows
+        .map(row => getItemIdFromRowIndex(this.state.rows, row))
+        .filter(i => i !== null)
+
+      if (!this.hasSameIds(oldSelectedItemIds, newSelectedItemIds)) {
+        const propSelectionIds = this.props.selectedItems.map(si => si.id)
+
+        if (!this.hasSameIds(newSelectedItemIds, propSelectionIds)) {
+          const newSelectedItems = this.state.selectedRows
+            .map(row => getItemFromRowIndex(this.state.rows, row))
+            .filter(r => r !== null)
+
+          this.props.onSelectionChanged(newSelectedItems, {
+            kind: 'filter',
+            filterText: this.props.filterText || '',
+          })
+        }
+      }
+    }
+
+    if (this.props.onFilterListResultsChanged !== undefined) {
+      const oldFilteredIds = prevState.rows
+        .flat()
+        .filter(row => row.kind === 'item')
+        .map(r => r.item.id)
+
+      const currentFilteredItemIds = this.state.rows
+        .flat()
+        .filter(row => row.kind === 'item')
+        .map(r => r.item)
+
+      const currentFilteredIds = currentFilteredItemIds.map(i => i.id)
+
+      if (!this.hasSameIds(oldFilteredIds, currentFilteredIds)) {
+        this.props.onFilterListResultsChanged(currentFilteredItemIds)
+      }
+    }
+  }
+
+  private hasSameIds(
+    oldIds: ReadonlyArray<string>,
+    newIds: ReadonlyArray<string>
+  ) {
+    if (oldIds.length !== newIds.length) {
+      return false
+    }
+
+    // xor  = exclusive Or; returns the symmetric difference of given arrays
+    // i.e. it will create an array that contains an id that doesn’t exist in
+    // both arrays. If no empty array, then both arrays contain the same elements.
+    return xor(oldIds, newIds).length === 0
+  }
+
+  public componentDidMount() {
+    if (this.filterTextBox !== null) {
+      this.filterTextBox.selectAll()
+    }
+  }
+
+  public renderTextBox() {
+    return (
+      <TextBox
+        ref={this.onTextBoxRef}
+        displayClearButton={true}
+        prefixedIcon={octicons.search}
+        autoFocus={true}
+        placeholder={this.props.placeholderText || 'Filter'}
+        className="filter-list-filter-field"
+        onValueChanged={this.onFilterValueChanged}
+        onEnterPressed={this.onEnterPressed}
+        onKeyDown={this.onKeyDown}
+        value={this.props.filterText}
+        disabled={this.props.disabled}
+      />
+    )
+  }
+
+  public renderLiveContainer() {
+    if (!this.state.filterValueChanged) {
+      return null
+    }
+
+    const itemRows = this.state.rows.flat().filter(row => row.kind === 'item')
+    const resultsPluralized = itemRows.length === 1 ? 'result' : 'results'
+    const screenReaderMessage = `${itemRows.length} ${resultsPluralized}`
+
+    return (
+      <AriaLiveContainer
+        trackedUserInput={this.state.filterValue}
+        message={screenReaderMessage}
+      />
+    )
+  }
+
+  public renderFilterRow() {
+    if (this.props.hideFilterRow === true) {
+      return null
+    }
+
+    return (
+      <Row className="filter-field-row">
+        {this.props.filterTextBox === undefined ? this.renderTextBox() : null}
+        {this.props.renderPostFilter ? this.props.renderPostFilter() : null}
+      </Row>
+    )
+  }
+
+  public render() {
+    return (
+      <div className={classnames('filter-list', this.props.className)}>
+        {this.renderLiveContainer()}
+
+        {this.props.renderPreList ? this.props.renderPreList() : null}
+
+        {this.renderFilterRow()}
+
+        <div className="filter-list-container">{this.renderContent()}</div>
+      </div>
+    )
+  }
+
+  public selectNextItem(
+    focus: boolean = false,
+    inDirection: SelectionDirection = 'down'
+  ) {
+    if (this.list === null) {
+      return
+    }
+
+    const lastSelectedRow = this.state.selectedRows.at(-1)
+
+    if (lastSelectedRow === undefined) {
+      return
+    }
+
+    let next: RowIndexPath | null = null
+
+    const rowCount = this.state.rows.map(r => r.length)
+    if (
+      lastSelectedRow.row === -1 ||
+      lastSelectedRow.row === this.state.rows.length
+    ) {
+      next = findNextSelectableRow(
+        rowCount,
+        {
+          direction: inDirection,
+          row: InvalidRowIndexPath,
+        },
+        this.canSelectRow
+      )
+    } else {
+      next = findNextSelectableRow(
+        rowCount,
+        {
+          direction: inDirection,
+          row: lastSelectedRow,
+        },
+        this.canSelectRow
+      )
+    }
+
+    if (next !== null) {
+      this.setState({ selectedRows: [next] }, () => {
+        if (focus && this.list !== null) {
+          this.list.focus()
+        }
+      })
+    }
+  }
+
+  private renderContent() {
+    if (this.state.rows.length === 0 && this.props.renderNoItems) {
+      return this.props.renderNoItems()
+    } else {
+      const firstSelectedRow = this.state.selectedRows.at(-1)
+
+      return (
+        <SectionList
+          id={this.props.id}
+          ref={this.onListRef}
+          rowCount={this.state.rows.map(r => r.length)}
+          rowRenderer={this.renderRow}
+          sectionHasHeader={this.sectionHasHeader}
+          getRowAriaLabel={this.getRowAriaLabel}
+          rowHeight={this.props.rowHeight}
+          selectedRows={
+            firstSelectedRow &&
+            rowIndexPathEquals(firstSelectedRow, InvalidRowIndexPath)
+              ? []
+              : this.state.selectedRows
+          }
+          onSelectionChanged={this.onRowSelectionChanged}
+          onRowClick={this.onRowClick}
+          onRowDoubleClick={this.onRowDoubleClick}
+          onRowKeyDown={this.onRowKeyDown}
+          onRowContextMenu={this.onRowContextMenu}
+          onRowKeyboardFocus={this.onRowKeyboardFocus}
+          onRowBlur={this.onRowBlur}
+          canSelectRow={this.canSelectRow}
+          invalidationProps={{
+            ...this.props,
+            ...this.props.invalidationProps,
+          }}
+          onScroll={this.props.onScroll}
+          setScrollTop={this.props.setScrollTop}
+          ariaLabel={this.props.ariaLabel}
+          selectionMode={this.props.selectionMode}
+        />
+      )
+    }
+  }
+
+  private sectionHasHeader = (section: number) => {
+    const rows = this.state.rows[section]
+    return rows.length > 0 && rows[0].kind === 'group'
+  }
+
+  private getRowAriaLabel = (index: RowIndexPath) => {
+    const row = this.state.rows[index.section][index.row]
+    if (row.kind !== 'item') {
+      return undefined
+    }
+
+    const itemAriaLabel = this.props.getItemAriaLabel?.(row.item)
+
+    if (itemAriaLabel === undefined) {
+      return undefined
+    }
+
+    const groupAriaLabel = this.props.getGroupAriaLabel?.(
+      this.state.groups[index.section]
+    )
+
+    return groupAriaLabel !== undefined
+      ? `${itemAriaLabel}, ${groupAriaLabel}`
+      : itemAriaLabel
+  }
+
+  private renderRow = (index: RowIndexPath) => {
+    const row = this.state.rows[index.section][index.row]
+    if (row.kind === 'item') {
+      return this.props.renderItem(row.item, row.matches)
+    } else if (this.props.renderGroupHeader) {
+      return this.props.renderGroupHeader(row.identifier)
+    } else {
+      return null
+    }
+  }
+
+  private onTextBoxRef = (component: TextBox | null) => {
+    this.filterTextBox = component
+  }
+
+  private onListRef = (instance: SectionList | null) => {
+    this.list = instance
+  }
+
+  private onFilterValueChanged = (text: string) => {
+    if (this.props.onFilterTextChanged) {
+      this.props.onFilterTextChanged(text)
+    }
+  }
+
+  private onEnterPressed = (text: string) => {
+    const rows = this.state.rows.length
+    if (
+      rows === 0 &&
+      text.trim().length > 0 &&
+      this.props.onEnterPressedWithoutFilteredItems !== undefined
+    ) {
+      this.props.onEnterPressedWithoutFilteredItems(text)
+    }
+  }
+
+  private onRowSelectionChanged = (
+    rows: ReadonlyArray<RowIndexPath>,
+    source: SelectionSource
+  ) => {
+    this.setState({ selectedRows: rows })
+
+    if (this.props.onSelectionChanged) {
+      const items = rows
+        .map(index => this.state.rows[index.section][index.row])
+        .filter(r => r.kind === 'item')
+        .map(r => r.item)
+      this.props.onSelectionChanged(items, source)
+    }
+  }
+
+  private canSelectRow = (index: RowIndexPath) => {
+    if (this.props.disabled) {
+      return false
+    }
+
+    const row = this.state.rows[index.section][index.row]
+    return row.kind === 'item'
+  }
+
+  private onRowClick = (index: RowIndexPath, source: ClickSource) => {
+    if (this.props.onItemClick) {
+      const row = this.state.rows[index.section][index.row]
+
+      if (row.kind === 'item') {
+        this.props.onItemClick(row.item, source)
+      }
+    }
+  }
+
+  private onRowDoubleClick = (index: RowIndexPath, source: ClickSource) => {
+    if (this.props.onItemDoubleClick) {
+      const row = this.state.rows[index.section][index.row]
+
+      if (row.kind === 'item') {
+        this.props.onItemDoubleClick(row.item, source)
+      }
+    }
+  }
+
+  private onRowContextMenu = (
+    index: RowIndexPath,
+    source: React.MouseEvent<HTMLDivElement>
+  ) => {
+    if (!this.props.onItemContextMenu) {
+      return
+    }
+
+    const row = this.state.rows[index.section][index.row]
+
+    if (row.kind !== 'item') {
+      return
+    }
+
+    this.props.onItemContextMenu(row.item, source)
+  }
+
+  private onRowKeyboardFocus = (
+    index: RowIndexPath,
+    source: React.KeyboardEvent<any>
+  ) => {
+    if (!this.props.onItemKeyboardFocus) {
+      return
+    }
+
+    const row = this.state.rows[index.section][index.row]
+
+    if (row.kind !== 'item') {
+      return
+    }
+
+    this.props.onItemKeyboardFocus(row.item, source)
+  }
+
+  private onRowBlur = (
+    index: RowIndexPath,
+    source: React.FocusEvent<HTMLDivElement>
+  ) => {
+    if (!this.props.onItemBlur) {
+      return
+    }
+
+    const row = this.state.rows[index.section][index.row]
+
+    if (row.kind !== 'item') {
+      return
+    }
+
+    this.props.onItemBlur(row.item, source)
+  }
+
+  private onRowKeyDown = (
+    indexPath: RowIndexPath,
+    event: React.KeyboardEvent<any>
+  ) => {
+    const row = this.state.rows[indexPath.section][indexPath.row]
+
+    if (row.kind === 'item' && this.props.onItemKeyDown) {
+      this.props.onItemKeyDown(row.item, event)
+    }
+
+    if (event.defaultPrevented) {
+      return
+    }
+
+    const list = this.list
+    if (!list) {
+      return
+    }
+
+    const rowCount = this.state.rows.map(r => r.length)
+
+    const firstSelectableRow = findNextSelectableRow(
+      rowCount,
+      { direction: 'down', row: InvalidRowIndexPath },
+      this.canSelectRow
+    )
+    const lastSelectableRow = findNextSelectableRow(
+      rowCount,
+      {
+        direction: 'up',
+        row: {
+          section: 0,
+          row: 0,
+        },
+      },
+      this.canSelectRow
+    )
+
+    let shouldFocus = false
+
+    if (
+      event.key === 'ArrowUp' &&
+      firstSelectableRow &&
+      rowIndexPathEquals(indexPath, firstSelectableRow)
+    ) {
+      shouldFocus = true
+    } else if (
+      event.key === 'ArrowDown' &&
+      lastSelectableRow &&
+      rowIndexPathEquals(indexPath, lastSelectableRow)
+    ) {
+      shouldFocus = true
+    }
+
+    if (shouldFocus) {
+      const textBox = this.filterTextBox
+
+      if (textBox) {
+        event.preventDefault()
+        textBox.focus()
+      }
+    }
+  }
+
+  private onKeyDown = (event: React.KeyboardEvent<HTMLInputElement>) => {
+    const list = this.list
+    const key = event.key
+
+    if (!list) {
+      return
+    }
+
+    if (this.props.onFilterKeyDown) {
+      this.props.onFilterKeyDown(event)
+    }
+
+    if (event.defaultPrevented) {
+      return
+    }
+
+    const rowCount = this.state.rows.map(r => r.length)
+
+    if (key === 'ArrowDown') {
+      if (rowCount.length > 0) {
+        const selectedRow = findNextSelectableRow(
+          rowCount,
+          { direction: 'down', row: InvalidRowIndexPath },
+          this.canSelectRow
+        )
+        if (selectedRow != null) {
+          this.setState({ selectedRows: [selectedRow] }, () => {
+            list.focus()
+          })
+        }
+      }
+
+      event.preventDefault()
+    } else if (key === 'ArrowUp') {
+      if (rowCount.length > 0) {
+        const selectedRow = findNextSelectableRow(
+          rowCount,
+          {
+            direction: 'up',
+            row: {
+              section: 0,
+              row: 0,
+            },
+          },
+          this.canSelectRow
+        )
+        if (selectedRow != null) {
+          this.setState({ selectedRows: [selectedRow] }, () => {
+            list.focus()
+          })
+        }
+      }
+
+      event.preventDefault()
+    } else if (key === 'Enter') {
+      // no repositories currently displayed, bail out
+      if (rowCount.length === 0) {
+        return event.preventDefault()
+      }
+
+      const filterText = this.props.filterText
+
+      if (filterText !== undefined && !/\S/.test(filterText)) {
+        return event.preventDefault()
+      }
+
+      const row = findNextSelectableRow(
+        rowCount,
+        { direction: 'down', row: InvalidRowIndexPath },
+        this.canSelectRow
+      )
+
+      if (row != null) {
+        this.onRowClick(row, { kind: 'keyboard', event })
+      }
+    }
+  }
+}
+
+export function getText<T extends IFilterListItem>(
+  item: T
+): ReadonlyArray<string> {
+  return item['text']
+}
+
+function getFirstVisibleRow<T extends IFilterListItem>(
+  rows: ReadonlyArray<ReadonlyArray<IFilterListRow<T>>>
+): RowIndexPath {
+  for (let i = 0; i < rows.length; i++) {
+    const groupRows = rows[i]
+    for (let j = 0; j < groupRows.length; j++) {
+      const row = groupRows[j]
+      if (row.kind === 'item') {
+        return { section: i, row: j }
+      }
+    }
+  }
+
+  return InvalidRowIndexPath
+}
+
+function createStateUpdate<T extends IFilterListItem>(
+  props: IAugmentedSectionFilterListProps<T>,
+  state: IAugmentedSectionFilterListState<T> | null
+) {
+  const rows = new Array<Array<IFilterListRow<T>>>()
+  const filter = (props.filterText || '').toLowerCase()
+  const selectedRows = []
+  let section = 0
+  const selectedItems = props.selectedItems
+  const groupIndices = []
+
+  for (const [idx, group] of props.groups.entries()) {
+    const groupRows = new Array<IFilterListRow<T>>()
+    const items: ReadonlyArray<IMatch<T>> = filter
+      ? match(filter, group.items, getText)
+      : group.items.map(item => ({
+          score: 1,
+          matches: { title: [], subtitle: [] },
+          item,
+        }))
+
+    if (!items.length) {
+      continue
+    }
+
+    groupIndices.push(idx)
+
+    if (props.renderGroupHeader) {
+      groupRows.push({ kind: 'group', identifier: group.identifier })
+    }
+
+    for (const { item, matches } of items) {
+      if (selectedItems.some(si => item.id === si.id)) {
+        selectedRows.push({
+          section,
+          row: groupRows.length,
+        })
+      }
+
+      groupRows.push({ kind: 'item', item, matches })
+    }
+
+    rows.push(groupRows)
+    section++
+  }
+
+  if (selectedRows.length === 0 && filter.length) {
+    // If the selected item isn't in the list (e.g., filtered out), then
+    // select the first visible item.
+    selectedRows.push(getFirstVisibleRow(rows))
+  }
+
+  // Stay true if already set, otherwise become true if the filter has content
+  const filterValueChanged = state?.filterValueChanged
+    ? true
+    : filter.length > 0
+
+  return {
+    rows: rows,
+    selectedRows,
+    filterValue: filter,
+    filterValueChanged,
+    groups: groupIndices,
+  }
+}
+
+function getItemFromRowIndex<T extends IFilterListItem>(
+  items: ReadonlyArray<ReadonlyArray<IFilterListRow<T>>>,
+  index: RowIndexPath
+): T | null {
+  if (index.section < 0 || index.section >= items.length) {
+    return null
+  }
+
+  const group = items[index.section]
+  if (index.row < 0 || index.row >= group.length) {
+    return null
+  }
+
+  const row = group[index.row]
+
+  if (row.kind === 'item') {
+    return row.item
+  }
+
+  return null
+}
+
+function getItemIdFromRowIndex<T extends IFilterListItem>(
+  items: ReadonlyArray<ReadonlyArray<IFilterListRow<T>>>,
+  index: RowIndexPath
+): string | null {
+  const item = getItemFromRowIndex(items, index)
+  return item ? item.id : null
+}
diff --git a/app/src/ui/lib/authentication-form.tsx b/app/src/ui/lib/authentication-form.tsx
index 6418aaaaba2..aee78dad105 100644
--- a/app/src/ui/lib/authentication-form.tsx
+++ b/app/src/ui/lib/authentication-form.tsx
@@ -1,44 +1,14 @@
 import * as React from 'react'
-import { LinkButton } from '../lib/link-button'
 import { Octicon } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
-import { Loading } from './loading'
+import * as octicons from '../octicons/octicons.generated'
 import { Form } from './form'
 import { Button } from './button'
-import { TextBox } from './text-box'
-import { Errors } from './errors'
-import { getDotComAPIEndpoint } from '../../lib/api'
 
 /** Text to let the user know their browser will send them back to GH Desktop */
 export const BrowserRedirectMessage =
   "Your browser will redirect you back to GitHub Desktop once you've signed in. If your browser asks for your permission to launch GitHub Desktop please allow it to."
 
 interface IAuthenticationFormProps {
-  /**
-   * The URL to the host which we're currently authenticating
-   * against. This will be either https://api.github.com when
-   * signing in against GitHub.com or a user-specified
-   * URL when signing in against a GitHub Enterprise
-   * instance.
-   */
-  readonly endpoint: string
-
-  /**
-   * Does the server support basic auth?
-   * If the server responds that it doesn't, the user will be prompted to use
-   * that server's web sign in flow.
-   *
-   * ("Basic auth" is logging in via user + password entered directly in Desktop.)
-   */
-  readonly supportsBasicAuth: boolean
-
-  /**
-   * A callback which is invoked once the user has entered a username
-   * and password and submitted those either by clicking on the submit
-   * button or by submitting the form through other means (ie hitting Enter).
-   */
-  readonly onSubmit: (username: string, password: string) => void
-
   /**
    * A callback which is invoked if the user requests OAuth sign in using
    * their system configured browser.
@@ -50,135 +20,18 @@ interface IAuthenticationFormProps {
    * (Usually, a 'cancel' button)
    */
   readonly additionalButtons?: ReadonlyArray<JSX.Element>
-
-  /**
-   * An error which, if present, is presented to the
-   * user in close proximity to the actions or input fields
-   * related to the current step.
-   */
-  readonly error: Error | null
-
-  /**
-   * A value indicating whether or not the sign in store is
-   * busy processing a request. While this value is true all
-   * form inputs and actions save for a cancel action will
-   * be disabled.
-   */
-  readonly loading: boolean
-
-  readonly forgotPasswordUrl: string
-}
-
-interface IAuthenticationFormState {
-  readonly username: string
-  readonly password: string
 }
 
 /** The GitHub authentication component. */
-export class AuthenticationForm extends React.Component<
-  IAuthenticationFormProps,
-  IAuthenticationFormState
-> {
-  public constructor(props: IAuthenticationFormProps) {
-    super(props)
-
-    this.state = { username: '', password: '' }
-  }
-
+export class AuthenticationForm extends React.Component<IAuthenticationFormProps> {
   public render() {
-    const content = this.props.supportsBasicAuth
-      ? this.renderSignInForm()
-      : this.renderEndpointRequiresWebFlow()
-
     return (
-      <Form className="sign-in-form" onSubmit={this.signIn}>
-        {content}
+      <Form className="sign-in-form" onSubmit={this.signInWithBrowser}>
+        {this.renderEndpointRequiresWebFlow()}
       </Form>
     )
   }
 
-  private renderUsernamePassword() {
-    const disabled = this.props.loading
-    return (
-      <>
-        <TextBox
-          label="Username or email address"
-          disabled={disabled}
-          autoFocus={true}
-          onValueChanged={this.onUsernameChange}
-        />
-
-        <TextBox
-          label="Password"
-          type="password"
-          disabled={disabled}
-          onValueChanged={this.onPasswordChange}
-        />
-
-        {this.renderError()}
-
-        <div className="sign-in-footer">{this.renderActions()}</div>
-      </>
-    )
-  }
-
-  private renderActions() {
-    const signInDisabled = Boolean(
-      !this.state.username.length ||
-        !this.state.password.length ||
-        this.props.loading
-    )
-    return (
-      <div className="actions">
-        {this.props.supportsBasicAuth ? (
-          <Button type="submit" disabled={signInDisabled}>
-            {this.props.loading ? <Loading /> : null} Sign in
-          </Button>
-        ) : null}
-
-        {this.props.additionalButtons}
-
-        {this.props.supportsBasicAuth ? (
-          <LinkButton
-            className="forgot-password-link"
-            uri={this.props.forgotPasswordUrl}
-          >
-            Forgot password?
-          </LinkButton>
-        ) : null}
-      </div>
-    )
-  }
-
-  private renderSignInWithBrowser() {
-    return (
-      <>
-        {this.renderSignInWithBrowserButton()}
-
-        {this.props.additionalButtons}
-      </>
-    )
-  }
-
-  /**
-   * Show the sign in locally form
-   *
-   * Also displays an option to sign in with browser for
-   * enterprise users (but not for dot com users since
-   * they will have already been offered this option
-   * earlier in the UI flow).
-   */
-  private renderSignInForm() {
-    return this.props.endpoint === getDotComAPIEndpoint() ? (
-      this.renderUsernamePassword()
-    ) : (
-      <>
-        {this.renderSignInWithBrowser()}
-        {this.renderUsernamePassword()}
-      </>
-    )
-  }
-
   /**
    * Show a message informing the user they must sign in via the web flow
    * and a button to do so
@@ -186,69 +39,24 @@ export class AuthenticationForm extends React.Component<
   private renderEndpointRequiresWebFlow() {
     return (
       <>
-        {getEndpointRequiresWebFlowMessage(this.props.endpoint)}
-        {this.renderSignInWithBrowserButton()}
+        {BrowserRedirectMessage}
+        <Button
+          type="submit"
+          className="button-with-icon"
+          onClick={this.signInWithBrowser}
+          autoFocus={true}
+          role="link"
+        >
+          Sign in using your browser
+          <Octicon symbol={octicons.linkExternal} />
+        </Button>
         {this.props.additionalButtons}
       </>
     )
   }
 
-  private renderSignInWithBrowserButton() {
-    return (
-      <Button
-        type="submit"
-        className="button-with-icon"
-        onClick={this.signInWithBrowser}
-      >
-        Sign in using your browser
-        <Octicon symbol={OcticonSymbol.linkExternal} />
-      </Button>
-    )
-  }
-
-  private renderError() {
-    const error = this.props.error
-    if (!error) {
-      return null
-    }
-
-    return <Errors>{error.message}</Errors>
-  }
-
-  private onUsernameChange = (username: string) => {
-    this.setState({ username })
-  }
-
-  private onPasswordChange = (password: string) => {
-    this.setState({ password })
-  }
-
   private signInWithBrowser = (event?: React.MouseEvent<HTMLButtonElement>) => {
-    if (event) {
-      event.preventDefault()
-    }
+    event?.preventDefault()
     this.props.onBrowserSignInRequested()
   }
-
-  private signIn = () => {
-    this.props.onSubmit(this.state.username, this.state.password)
-  }
-}
-
-function getEndpointRequiresWebFlowMessage(endpoint: string): JSX.Element {
-  if (endpoint === getDotComAPIEndpoint()) {
-    return (
-      <>
-        <p>GitHub now requires you to sign in with your browser.</p>
-        <p>{BrowserRedirectMessage}</p>
-      </>
-    )
-  } else {
-    return (
-      <p>
-        Your GitHub Enterprise instance requires you to sign in with your
-        browser.
-      </p>
-    )
-  }
 }
diff --git a/app/src/ui/lib/author-input.tsx b/app/src/ui/lib/author-input.tsx
deleted file mode 100644
index 3fc3e43b746..00000000000
--- a/app/src/ui/lib/author-input.tsx
+++ /dev/null
@@ -1,871 +0,0 @@
-import * as React from 'react'
-import CodeMirror, {
-  Editor,
-  EditorConfiguration,
-  Doc,
-  Position,
-  TextMarkerOptions,
-} from 'codemirror'
-import classNames from 'classnames'
-import { UserAutocompletionProvider, IUserHit } from '../autocompletion'
-import { compare } from '../../lib/compare'
-import { arrayEquals } from '../../lib/equality'
-import { syncClockwise } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
-import { IAuthor } from '../../models/author'
-import { showContextualMenu } from '../../lib/menu-item'
-import { IMenuItem } from '../../lib/menu-item'
-import { getLegacyStealthEmailForUser } from '../../lib/email'
-
-interface IAuthorInputProps {
-  /**
-   * An optional class name for the wrapper element around the
-   * author input component
-   */
-  readonly className?: string
-
-  /**
-   * The user autocomplete provider to use when searching for substring
-   * matches while autocompleting.
-   */
-  readonly autoCompleteProvider: UserAutocompletionProvider
-
-  /**
-   * The list of authors to fill the input with initially. If this
-   * prop changes from what's propagated through onAuthorsUpdated
-   * while the component is mounted it will reset, loosing
-   * any text that has not yet been resolved to an author.
-   */
-  readonly authors: ReadonlyArray<IAuthor>
-
-  /**
-   * A method called when authors has been added or removed from the
-   * input field.
-   */
-  readonly onAuthorsUpdated: (authors: ReadonlyArray<IAuthor>) => void
-
-  /**
-   * Whether or not the input should be read-only and styled as being
-   * disabled. When disabled the component will not accept focus.
-   */
-  readonly disabled: boolean
-}
-
-/**
- * Return the position previous to (i.e before) the given
- * position in a codemirror doc
- */
-function prevPosition(doc: Doc, pos: Position) {
-  return doc.posFromIndex(doc.indexFromPos(pos) - 1)
-}
-
-/**
- * Return the position next to (i.e after) the given
- * position in a codemirror doc
- */
-function nextPosition(doc: Doc, pos: Position) {
-  return doc.posFromIndex(doc.indexFromPos(pos) + 1)
-}
-
-/**
- * Gets a value indicating whether the given position is
- * _inside_ of an existing marker. Note that marker ranges
- * are inclusive and this method takes that into account.
- */
-function posIsInsideMarkedText(doc: Doc, pos: Position) {
-  const marks = doc.findMarksAt(pos) as any as ActualTextMarker[]
-  const ix = doc.indexFromPos(pos)
-
-  return marks.some(mark => {
-    const markPos = mark.find()
-
-    // This shouldn't ever happen since we just pulled them
-    // from the doc
-    if (!markPos) {
-      return false
-    }
-
-    const from = doc.indexFromPos(markPos.from)
-    const to = doc.indexFromPos(markPos.to)
-
-    return ix > from && ix < to
-  })
-}
-
-function isMarkOrWhitespace(doc: Doc, pos: Position) {
-  const line = doc.getLine(pos.line)
-  if (/\s/.test(line.charAt(pos.ch))) {
-    return true
-  }
-
-  return posIsInsideMarkedText(doc, pos)
-}
-
-function posEquals(x: Position, y: Position) {
-  return x.line === y.line && x.ch === y.ch
-}
-
-/**
- * Scan through the doc, starting at the given start position and
- * moving using the iter function for as long as the predicate is
- * true or the iterator function fails to update the position (i.e
- * at the start or end of the document)
- *
- * @param doc       The codemirror document to scan through
- *
- * @param start     The initial position, note that this position is
- *                  not inclusive, i.e. the predicate will not be
- *                  called for the initial position
- *
- * @param predicate A function called with each position returned
- *                  from the iter function that determines whether
- *                  or not to keep scanning through the document.
- *
- *                  If the predicate returns true this function will
- *                  keep iterating.
- *
- * @param iter      A function that, given either the start position
- *                  or a position returned from the previous iter
- *                  call, returns the next position to scan.
- */
-function scanWhile(
-  doc: Doc,
-  start: Position,
-  predicate: (doc: Doc, pos: Position) => boolean,
-  iter: (doc: Doc, pos: Position) => Position
-) {
-  let pos = start
-
-  for (
-    let next = iter(doc, start);
-    predicate(doc, next) && !posEquals(pos, next);
-    next = iter(doc, next)
-  ) {
-    pos = next
-  }
-
-  return pos
-}
-
-/**
- * Scan through the doc, starting at the given start position and
- * moving using the iter function until the predicate returns
- * true or the iterator function fails to update the position (i.e
- * at the start or end of the document)
- *
- * @param doc       The codemirror document to scan through
- *
- * @param start     The initial position, note that this position is
- *                  not inclusive, i.e. the predicate will not be
- *                  called for the initial position
- *
- * @param predicate A function called with each position returned
- *                  from the iter function that determines whether
- *                  or not to keep scanning through the document.
- *
- *                  If the predicate returns false this function will
- *                  keep iterating.
- *
- * @param iter      A function that, given either the start position
- *                  or a position returned from the previous iter
- *                  call, returns the next position to scan.
- */
-function scanUntil(
-  doc: Doc,
-  start: Position,
-  predicate: (doc: Doc, pos: Position) => boolean,
-  iter: (doc: Doc, pos: Position) => Position
-): Position {
-  return scanWhile(doc, start, (doc, pos) => !predicate(doc, pos), iter)
-}
-
-function appendTextMarker(
-  cm: Editor,
-  text: string,
-  options: TextMarkerOptions
-): ActualTextMarker {
-  const doc = cm.getDoc()
-  const from = doc.posFromIndex(Infinity)
-
-  doc.replaceRange(text, from)
-  const to = doc.posFromIndex(Infinity)
-
-  return doc.markText(from, to, options) as any as ActualTextMarker
-}
-
-/**
- * Comparison method for use in sorting lists of markers in ascending
- * order of start positions.
- */
-function orderByPosition(x: ActualTextMarker, y: ActualTextMarker) {
-  const xPos = x.find()
-  const yPos = y.find()
-
-  if (xPos === undefined || yPos === undefined) {
-    return compare(xPos, yPos)
-  }
-
-  return compare(xPos.from, yPos.from)
-}
-
-// The types for CodeMirror.TextMarker is all wrong, this is what it
-// actually looks like
-// eslint-disable-next-line @typescript-eslint/naming-convention
-interface ActualTextMarker extends TextMarkerOptions {
-  /** Remove the mark. */
-  clear(): void
-
-  /**
-   * Returns a {from, to} object (both holding document positions), indicating
-   * the current position of the marked range, or undefined if the marker is
-   * no longer in the document.
-   */
-  find(): { from: Position; to: Position } | undefined
-
-  changed(): void
-}
-
-function renderUnknownUserAutocompleteItem(
-  elem: HTMLElement,
-  self: any,
-  data: any
-) {
-  const text = data.username as string
-  const user = document.createElement('div')
-  user.classList.add('user', 'unknown')
-
-  const username = document.createElement('span')
-  username.className = 'username'
-  username.innerText = text
-  user.appendChild(username)
-
-  const description = document.createElement('span')
-  description.className = 'description'
-  description.innerText = `Search for user`
-  user.appendChild(description)
-
-  elem.appendChild(user)
-}
-
-function renderUserAutocompleteItem(elem: HTMLElement, self: any, data: any) {
-  const author = data.author as IAuthor
-  const user = document.createElement('div')
-  user.className = 'user'
-
-  // This will always be non-null when we get it from the
-  // autocompletion provider but let's be extra cautious
-  if (author.username) {
-    const username = document.createElement('span')
-    username.className = 'username'
-    username.innerText = author.username
-    user.appendChild(username)
-  }
-
-  const name = document.createElement('span')
-  name.className = 'name'
-  name.innerText = author.name
-
-  user.appendChild(name)
-  elem.appendChild(user)
-}
-
-/**
- * Returns an email address which can be used on the host side to
- * look up the user which is to be given attribution.
- *
- * If the user has a public email address specified in their profile
- * that's used and if they don't then we'll generate a stealth email
- * address.
- */
-function getEmailAddressForUser(user: IUserHit) {
-  return user.email && user.email.length > 0
-    ? user.email
-    : getLegacyStealthEmailForUser(user.username, user.endpoint)
-}
-
-function getDisplayTextForAuthor(author: IAuthor) {
-  return author.username === null ? author.name : `@${author.username}`
-}
-
-function renderHandleMarkReplacementElement(author: IAuthor) {
-  const elem = document.createElement('span')
-  elem.classList.add('handle')
-  elem.title = `${author.name} <${author.email}>`
-  elem.innerText = getDisplayTextForAuthor(author)
-
-  return elem
-}
-
-function renderUnknownHandleMarkReplacementElement(
-  username: string,
-  isError: boolean
-) {
-  const elem = document.createElement('span')
-
-  elem.classList.add('handle', isError ? 'error' : 'progress')
-  elem.title = isError
-    ? `Could not find user with username ${username}`
-    : `Searching for @${username}`
-
-  const symbol = isError ? OcticonSymbol.stop : syncClockwise
-
-  const spinner = document.createElementNS('http://www.w3.org/2000/svg', 'svg')
-  spinner.classList.add('icon')
-
-  if (!isError) {
-    spinner.classList.add('spin')
-  }
-
-  const path = document.createElementNS('http://www.w3.org/2000/svg', 'path')
-
-  spinner.viewBox.baseVal.width = symbol.w
-  spinner.viewBox.baseVal.height = symbol.h
-
-  path.setAttribute('d', symbol.d)
-  spinner.appendChild(path)
-
-  elem.appendChild(document.createTextNode(`@${username}`))
-  elem.appendChild(spinner)
-
-  return elem
-}
-
-function markRangeAsHandle(
-  doc: Doc,
-  from: Position,
-  to: Position,
-  author: IAuthor
-): ActualTextMarker {
-  const elem = renderHandleMarkReplacementElement(author)
-
-  return doc.markText(from, to, {
-    atomic: true,
-    className: 'handle',
-    readOnly: false,
-    replacedWith: elem,
-    handleMouseEvents: true,
-  }) as any as ActualTextMarker
-}
-
-function triggerAutoCompleteBasedOnCursorPosition(cm: Editor) {
-  const doc = cm.getDoc()
-
-  if (doc.somethingSelected()) {
-    return
-  }
-
-  const cursor = doc.getCursor()
-  const p = scanUntil(doc, cursor, isMarkOrWhitespace, prevPosition)
-
-  if (posEquals(cursor, p)) {
-    return
-  }
-
-  ;(cm as any).showHint()
-}
-
-/**
- * Convert a IUserHit object which is returned from
- * user-autocomplete-provider into an IAuthor object.
- *
- * If the IUserHit object lacks an email address we'll
- * attempt to create a stealth email address.
- */
-function authorFromUserHit(user: IUserHit): IAuthor {
-  return {
-    name: user.name || user.username,
-    email: getEmailAddressForUser(user),
-    username: user.username,
-  }
-}
-
-/**
- * Autocompletable input field for possible authors of a commit.
- *
- * Intended primarily for co-authors but written in a general enough
- * fashion to deal only with authors in general.
- */
-export class AuthorInput extends React.Component<IAuthorInputProps, {}> {
-  /**
-   * The codemirror instance if mounted, otherwise null
-   */
-  private editor: Editor | null = null
-
-  /**
-   * Resize observer used for tracking width changes and
-   * refreshing the internal codemirror instance when
-   * they occur
-   */
-  private readonly resizeObserver: ResizeObserver
-  private resizeDebounceId: number | null = null
-  private lastKnownWidth: number | null = null
-
-  /**
-   * Whether or not the hint (i.e. autocompleter)
-   * is currently active.
-   */
-  private hintActive: boolean = false
-
-  /**
-   * A reference to the label mark (the persistent
-   * part of the placeholder text)
-   */
-  private label: ActualTextMarker | null = null
-
-  /**
-   * A reference to the placeholder mark (the second
-   * part of the placeholder text which is collapsed
-   * when there's user input)
-   */
-  private placeholder: ActualTextMarker | null = null
-
-  /**
-   * The internal list of authors. Note that codemirror
-   * ultimately is the source of truth for what authors
-   * are in here but we synchronize that into this field
-   * whenever codemirror reports a change. We also use
-   * this array to detect whether the author props have
-   * change, in which case we blow away everything and
-   * start from scratch.
-   */
-  private authors: ReadonlyArray<IAuthor> = []
-
-  // For undo association
-  private readonly markAuthorMap = new Map<ActualTextMarker, IAuthor>()
-  private readonly authorMarkMap = new Map<IAuthor, ActualTextMarker>()
-
-  public constructor(props: IAuthorInputProps) {
-    super(props)
-
-    // Observe size changes and let codemirror know
-    // when it needs to refresh.
-    this.resizeObserver = new ResizeObserver(entries => {
-      if (entries.length === 1 && this.editor) {
-        const newWidth = entries[0].contentRect.width
-
-        // We don't care about the first resize, let's just
-        // store what we've got
-        if (!this.lastKnownWidth) {
-          this.lastKnownWidth = newWidth
-          return
-        }
-
-        // Codemirror already does a good job of height changes,
-        // we just need to care about when the width changes and
-        // do a re-layout
-        if (this.lastKnownWidth !== newWidth) {
-          this.lastKnownWidth = newWidth
-
-          if (this.resizeDebounceId !== null) {
-            cancelAnimationFrame(this.resizeDebounceId)
-            this.resizeDebounceId = null
-          }
-          this.resizeDebounceId = requestAnimationFrame(this.onResized)
-        }
-      }
-    })
-
-    this.state = {}
-  }
-
-  public focus() {
-    this.editor?.focus()
-  }
-
-  public componentWillUnmount() {
-    // Sometimes the completion box seems to fail to register
-    // the blur event and close. It's hard to reproduce so
-    // we'll just make doubly sure it's closed when we're
-    // about to go away.
-    if (this.editor) {
-      const state = this.editor.state
-      if (state.completionActive && state.completionActive.close) {
-        state.completionActive.close()
-      }
-    }
-  }
-
-  public componentWillReceiveProps(nextProps: IAuthorInputProps) {
-    const cm = this.editor
-
-    if (!cm) {
-      return
-    }
-
-    // If the authors prop have changed from our internal representation
-    // we'll throw up our hands and reset the input to whatever we're
-    // given.
-    if (
-      nextProps.authors !== this.props.authors &&
-      !arrayEquals(this.authors, nextProps.authors)
-    ) {
-      cm.operation(() => {
-        this.reset(cm, nextProps.authors)
-      })
-    }
-
-    if (nextProps.disabled !== this.props.disabled) {
-      cm.setOption('readOnly', nextProps.disabled ? 'nocursor' : false)
-    }
-  }
-
-  private onResized = () => {
-    this.resizeDebounceId = null
-    if (this.editor) {
-      this.editor.refresh()
-    }
-  }
-
-  private onContainerRef = (elem: HTMLDivElement) => {
-    if (elem) {
-      this.editor = this.initializeCodeMirror(elem)
-      this.resizeObserver.observe(elem)
-    } else {
-      this.editor = null
-      this.resizeObserver.disconnect()
-    }
-  }
-
-  private applyCompletion = (cm: Editor, data: any, completion: any) => {
-    const from: Position = completion.from || data.from
-    const to: Position = completion.to || data.to
-    const author: IAuthor = completion.author
-
-    this.insertAuthor(cm, author, from, to)
-    this.updateAuthors(cm)
-  }
-
-  private applyUnknownUserCompletion = (
-    cm: Editor,
-    data: any,
-    completion: any
-  ) => {
-    const from: Position = completion.from || data.from
-    const to: Position = completion.to || data.to
-    const username: string = completion.username
-    const text = `@${username}`
-    const doc = cm.getDoc()
-
-    doc.replaceRange(text, from, to, 'complete')
-    const end = doc.posFromIndex(doc.indexFromPos(from) + text.length)
-
-    // Create a temporary, atomic, marker so that the text can't be modified.
-    // This marker will be styled in such a way as to indicate that it's
-    // processing.
-    const tmpMark = doc.markText(from, end, {
-      atomic: true,
-      className: 'handle progress',
-      readOnly: false,
-      replacedWith: renderUnknownHandleMarkReplacementElement(username, false),
-      handleMouseEvents: true,
-    }) as any as ActualTextMarker
-
-    // Note that it's important that this method isn't async up until
-    // this point since show-hint expects a synchronous method
-    return this.props.autoCompleteProvider.exactMatch(username).then(hit => {
-      cm.operation(() => {
-        const tmpPos = tmpMark.find()
-
-        // Since we're async here it's possible that the user has deleted
-        // the temporary mark already, in which case we just bail.
-        if (!tmpPos) {
-          return
-        }
-
-        // Clear out the temporary mark and get ready to either replace
-        // it with a proper handle marker or an error marker.
-        tmpMark.clear()
-
-        if (!hit) {
-          doc.markText(tmpPos.from, tmpPos.to, {
-            atomic: true,
-            className: 'handle error',
-            readOnly: false,
-            replacedWith: renderUnknownHandleMarkReplacementElement(
-              username,
-              true
-            ),
-            handleMouseEvents: true,
-          })
-
-          return
-        }
-
-        this.insertAuthor(cm, authorFromUserHit(hit), tmpPos.from, tmpPos.to)
-      })
-    })
-  }
-
-  private insertAuthor(
-    cm: Editor,
-    author: IAuthor,
-    from: Position,
-    to?: Position
-  ) {
-    const text = getDisplayTextForAuthor(author)
-    const doc = cm.getDoc()
-
-    doc.replaceRange(text, from, to, 'complete')
-
-    const end = doc.posFromIndex(doc.indexFromPos(from) + text.length)
-    const marker = markRangeAsHandle(doc, from, end, author)
-
-    this.markAuthorMap.set(marker, author)
-    this.authorMarkMap.set(author, marker)
-
-    return marker
-  }
-
-  private appendAuthor(cm: Editor, author: IAuthor) {
-    const doc = cm.getDoc()
-    return this.insertAuthor(cm, author, doc.posFromIndex(Infinity))
-  }
-
-  private onAutocompleteUser = async (cm: Editor, x?: any, y?: any) => {
-    const doc = cm.getDoc()
-    const cursor = doc.getCursor() as Readonly<Position>
-
-    // expand the current cursor position into a range covering as
-    // long of an autocompletable string as possible.
-    const from = scanUntil(doc, cursor, isMarkOrWhitespace, prevPosition)
-    const to = scanUntil(doc, cursor, isMarkOrWhitespace, nextPosition)
-
-    const word = doc.getRange(from, to)
-
-    const needle = word.replace(/^@/, '')
-    const hits = await this.props.autoCompleteProvider.getAutocompletionItems(
-      needle
-    )
-
-    const exactMatch = hits.some(
-      hit => hit.username.toLowerCase() === needle.toLowerCase()
-    )
-
-    const existingUsernames = new Set(this.authors.map(x => x.username))
-
-    const list: any[] = hits
-      .map(authorFromUserHit)
-      .filter(x => x.username === null || !existingUsernames.has(x.username))
-      .map(author => ({
-        author,
-        text: getDisplayTextForAuthor(author),
-        render: renderUserAutocompleteItem,
-        className: 'autocompletion-item',
-        hint: this.applyCompletion,
-      }))
-
-    if (!exactMatch && needle.length > 0) {
-      list.push({
-        text: `@${needle}`,
-        username: needle,
-        render: renderUnknownUserAutocompleteItem,
-        className: 'autocompletion-item',
-        hint: this.applyUnknownUserCompletion,
-      })
-    }
-
-    return { list, from, to }
-  }
-
-  private updatePlaceholderVisibility(cm: Editor) {
-    if (this.label && this.placeholder) {
-      const labelRange = this.label.find()
-      const placeholderRange = this.placeholder.find()
-
-      // If this happen then codemirror has done something
-      // weird. It shouldn't be possible to remove these
-      // markers from the document.
-      if (!labelRange || !placeholderRange) {
-        return
-      }
-
-      const doc = cm.getDoc()
-
-      const collapse =
-        doc.indexFromPos(labelRange.to) !==
-        doc.indexFromPos(placeholderRange.from)
-
-      if (this.placeholder.collapsed !== collapse) {
-        this.placeholder.collapsed = collapse
-        this.placeholder.changed()
-      }
-    }
-  }
-
-  private getAllHandleMarks(cm: Editor): Array<ActualTextMarker> {
-    return cm.getDoc().getAllMarks() as any as ActualTextMarker[]
-  }
-
-  private initializeCodeMirror(host: HTMLDivElement) {
-    const CodeMirrorOptions: EditorConfiguration & {
-      hintOptions: any
-    } = {
-      mode: 'null',
-      lineWrapping: true,
-      extraKeys: {
-        Tab: false,
-        Enter: false,
-        'Shift-Tab': false,
-        'Ctrl-Space': 'autocomplete',
-        'Ctrl-Enter': false,
-        'Cmd-Enter': false,
-        // Disable all search-related shortcuts.
-        [__DARWIN__ ? 'Cmd-F' : 'Ctrl-F']: false, // find
-        [__DARWIN__ ? 'Cmd-G' : 'Ctrl-G']: false, // findNext
-        [__DARWIN__ ? 'Shift-Cmd-G' : 'Shift-Ctrl-G']: false, // findPrev
-        [__DARWIN__ ? 'Cmd-Alt-F' : 'Shift-Ctrl-F']: false, // replace
-        [__DARWIN__ ? 'Shift-Cmd-Alt-F' : 'Shift-Ctrl-R']: false, // replaceAll
-      },
-      readOnly: this.props.disabled ? 'nocursor' : false,
-      hintOptions: {
-        completeOnSingleClick: true,
-        completeSingle: false,
-        closeOnUnfocus: true,
-        closeCharacters: /\s/,
-        hint: this.onAutocompleteUser,
-        container: host,
-      },
-    }
-
-    const cm = CodeMirror(host, CodeMirrorOptions)
-
-    cm.operation(() => {
-      this.reset(cm, this.props.authors)
-    })
-
-    cm.on('startCompletion', () => {
-      this.hintActive = true
-    })
-
-    cm.on('endCompletion', () => {
-      this.hintActive = false
-    })
-
-    cm.on('change', () => {
-      this.updatePlaceholderVisibility(cm)
-
-      if (!this.hintActive) {
-        triggerAutoCompleteBasedOnCursorPosition(cm)
-      }
-    })
-
-    cm.on('focus', () => {
-      if (!this.hintActive) {
-        triggerAutoCompleteBasedOnCursorPosition(cm)
-      }
-    })
-
-    cm.on('changes', () => {
-      this.updateAuthors(cm)
-    })
-
-    const wrapperElem = cm.getWrapperElement()
-
-    // Do the very least we can do to pretend that we're a
-    // single line textbox. Users can still paste newlines
-    // though and if the do we don't care.
-    wrapperElem.addEventListener('keypress', (e: KeyboardEvent) => {
-      if (!e.defaultPrevented && e.key === 'Enter') {
-        e.preventDefault()
-      }
-    })
-
-    wrapperElem.addEventListener('contextmenu', e => {
-      this.onContextMenu(cm, e)
-    })
-
-    return cm
-  }
-
-  private onContextMenu(cm: Editor, e: MouseEvent) {
-    e.preventDefault()
-
-    const menu: IMenuItem[] = [
-      { label: 'Undo', action: () => cm.getDoc().undo() },
-      { label: 'Redo', action: () => cm.getDoc().redo() },
-      { type: 'separator' },
-      { role: 'cut' },
-      { role: 'copy' },
-      { role: 'paste' },
-    ]
-
-    if (__WIN32__) {
-      menu.push({ type: 'separator' })
-    }
-
-    menu.push({
-      label: __DARWIN__ ? 'Select All' : 'Select all',
-      action: () => {
-        cm.execCommand('selectAll')
-      },
-    })
-
-    showContextualMenu(menu)
-  }
-
-  private updateAuthors(cm: Editor) {
-    const markers = this.getAllHandleMarks(cm).sort(orderByPosition)
-    const authors = new Array<IAuthor>()
-
-    for (const marker of markers) {
-      const author = this.markAuthorMap.get(marker)
-
-      // undefined authors shouldn't happen lol
-      if (author) {
-        authors.push(author)
-      }
-    }
-
-    if (!arrayEquals(this.authors, authors)) {
-      this.authors = authors
-      this.props.onAuthorsUpdated(authors)
-    }
-  }
-
-  private reset(cm: Editor, authors: ReadonlyArray<IAuthor>) {
-    const doc = cm.getDoc()
-
-    cm.setValue('')
-    doc.clearHistory()
-
-    this.authors = []
-    this.authorMarkMap.clear()
-    this.markAuthorMap.clear()
-
-    this.label = appendTextMarker(cm, 'Co-Authors ', {
-      atomic: true,
-      inclusiveLeft: true,
-      className: 'label',
-      readOnly: true,
-    })
-
-    for (const author of authors) {
-      this.appendAuthor(cm, author)
-    }
-
-    this.authors = this.props.authors
-
-    this.placeholder = appendTextMarker(cm, '@username', {
-      atomic: true,
-      inclusiveRight: true,
-      className: 'placeholder',
-      readOnly: true,
-      collapsed: authors.length > 0,
-    })
-
-    // We know that find won't returned undefined here because we
-    // _just_ put the placeholder in there
-    doc.setCursor(this.placeholder.find()!.from)
-  }
-
-  public render() {
-    const className = classNames(
-      'author-input-component',
-      this.props.className,
-      {
-        disabled: this.props.disabled,
-      }
-    )
-    return <div className={className} ref={this.onContainerRef} />
-  }
-}
diff --git a/app/src/ui/lib/author-input/author-handle.tsx b/app/src/ui/lib/author-input/author-handle.tsx
new file mode 100644
index 00000000000..68d4e80a9a1
--- /dev/null
+++ b/app/src/ui/lib/author-input/author-handle.tsx
@@ -0,0 +1,165 @@
+import classNames from 'classnames'
+import React from 'react'
+import { Author, isKnownAuthor } from '../../../models/author'
+import { Octicon, syncClockwise } from '../../octicons'
+import * as octicons from '../../octicons/octicons.generated'
+import { getFullTextForAuthor, getDisplayTextForAuthor } from './author-text'
+
+interface IAuthorHandleProps {
+  /** Author to render */
+  readonly author: Author
+
+  /** Index of the author in the list of added authors */
+  readonly index: number
+
+  /** Whether the author is focused */
+  readonly isFocused: boolean
+
+  /** Whether the author is the last author in the list of added authors */
+  readonly isLastAuthor: boolean
+
+  /** Whether the author is the first author in the list of added authors */
+  readonly isFirstAuthor: boolean
+
+  /** Whether the container element has the focus within it */
+  readonly isFocusWithinContainer: boolean
+
+  /** Whether the input element has the focus */
+  readonly isInputFocused: boolean
+
+  /** Callback to invoke when the user presses a key */
+  readonly onKeyDown: (
+    index: number,
+    event: React.KeyboardEvent<HTMLElement>
+  ) => void
+
+  /** Callback to invoke when the user clicks on the author */
+  readonly onHandleClick: (
+    index: number,
+    event: React.MouseEvent<HTMLElement>
+  ) => void
+
+  /** Callback to invoke when the user clicks on the remove button */
+  readonly onRemoveClick: (
+    index: number,
+    event: React.MouseEvent<HTMLElement>
+  ) => void
+
+  /** Callback to invoke when the user focuses on the author */
+  readonly onFocus: (
+    index: number,
+    event: React.FocusEvent<HTMLElement>
+  ) => void
+}
+
+export class AuthorHandle extends React.Component<IAuthorHandleProps> {
+  private getAriaLabel() {
+    const { author } = this.props
+    if (isKnownAuthor(author)) {
+      return `${getFullTextForAuthor(
+        author
+      )} press backspace or delete to remove`
+    }
+
+    const isError = author.state === 'error'
+    const stateAriaLabel = isError ? 'user not found' : 'searching'
+    return `${author.username}, ${stateAriaLabel}, press backspace or delete to remove`
+  }
+
+  private getClassName() {
+    const { author, isFocused } = this.props
+    const classNamesArr: Array<any> = ['handle', { focused: isFocused }]
+    if (!isKnownAuthor(author)) {
+      const isError = author.state === 'error'
+      classNamesArr.push({ progress: !isError, error: isError })
+    }
+    return classNames(classNamesArr)
+  }
+
+  private getTitle() {
+    const { author } = this.props
+
+    if (isKnownAuthor(author)) {
+      return undefined
+    }
+
+    return author.state === 'error'
+      ? `Could not find user with username ${author.username}`
+      : `Searching for @${author.username}`
+  }
+
+  private getTabIndex() {
+    const {
+      isFocusWithinContainer,
+      isFocused,
+      isLastAuthor,
+      isFirstAuthor,
+      isInputFocused,
+    } = this.props
+    // If the component is not focused, then only the first author should be
+    // focusable
+    if (!isFocusWithinContainer) {
+      return isFirstAuthor ? 0 : -1
+    }
+
+    // If the author is focused already, then it should be focusable
+    if (isFocused) {
+      return 0
+    }
+
+    // Otherwise, if the input is focused, then only the last author should be
+    // focusable in order to leave the input with shift+tab
+    return isLastAuthor && isInputFocused ? 0 : -1
+  }
+
+  public render() {
+    const { author, isFocused } = this.props
+
+    return (
+      // eslint-disable-next-line github/a11y-no-title-attribute
+      <div
+        className={this.getClassName()}
+        title={this.getTitle()}
+        role="option"
+        aria-label={this.getAriaLabel()}
+        aria-selected={isFocused}
+        onKeyDown={this.onKeyDown}
+        onClick={this.onHandleClick}
+        tabIndex={this.getTabIndex()}
+        onFocus={this.onFocus}
+      >
+        <span aria-hidden="true">{getDisplayTextForAuthor(author)}</span>
+        {!isKnownAuthor(author) && (
+          <Octicon
+            className={classNames('icon', { spin: author.state !== 'error' })}
+            symbol={author.state === 'error' ? octicons.stop : syncClockwise}
+          />
+        )}
+        <button onClick={this.onRemoveClick} tabIndex={-1}>
+          <Octicon className="delete" symbol={octicons.x} />
+        </button>
+      </div>
+    )
+  }
+
+  private onKeyDown = (event: React.KeyboardEvent<HTMLElement>) => {
+    this.props.onKeyDown(this.props.index, event)
+  }
+
+  private onRemoveClick = (event: React.MouseEvent<HTMLElement>) => {
+    event.preventDefault()
+    this.props.onRemoveClick(this.props.index, event)
+  }
+
+  private onHandleClick = (event: React.MouseEvent<HTMLElement>) => {
+    if (event.isDefaultPrevented()) {
+      return
+    }
+
+    this.props.onHandleClick(this.props.index, event)
+  }
+
+  private onFocus = (event: React.FocusEvent<HTMLElement>) => {
+    this.props.onFocus(this.props.index, event)
+  }
+}
diff --git a/app/src/ui/lib/author-input/author-input.tsx b/app/src/ui/lib/author-input/author-input.tsx
new file mode 100644
index 00000000000..77231b4a666
--- /dev/null
+++ b/app/src/ui/lib/author-input/author-input.tsx
@@ -0,0 +1,495 @@
+import * as React from 'react'
+import classNames from 'classnames'
+import {
+  UserAutocompletionProvider,
+  AutocompletingInput,
+  UserHit,
+  KnownUserHit,
+} from '../../autocompletion'
+import {
+  Author,
+  isKnownAuthor,
+  KnownAuthor,
+  UnknownAuthor,
+} from '../../../models/author'
+import { getLegacyStealthEmailForUser } from '../../../lib/email'
+import memoizeOne from 'memoize-one'
+import { FocusContainer } from '../focus-container'
+import { AuthorHandle } from './author-handle'
+import { getFullTextForAuthor } from './author-text'
+
+interface IAuthorInputProps {
+  /**
+   * An optional class name for the wrapper element around the
+   * author input component
+   */
+  readonly className?: string
+
+  /**
+   * The user autocomplete provider to use when searching for substring
+   * matches while autocompleting.
+   */
+  readonly autoCompleteProvider: UserAutocompletionProvider
+
+  /**
+   * The list of authors to fill the input with initially. If this
+   * prop changes from what's propagated through onAuthorsUpdated
+   * while the component is mounted it will reset, loosing
+   * any text that has not yet been resolved to an author.
+   */
+  readonly authors: ReadonlyArray<Author>
+
+  /**
+   * A method called when authors has been added or removed from the
+   * input field.
+   */
+  readonly onAuthorsUpdated: (authors: ReadonlyArray<Author>) => void
+
+  /**
+   * Whether or not the input should be read-only and styled as being disabled.
+   */
+  readonly readOnly: boolean
+}
+
+interface IAuthorInputState {
+  /** Whether or not the focus is within this component */
+  readonly isFocusedWithin: boolean
+
+  /** Index of the added author currently focused */
+  readonly focusedAuthorIndex: number | null
+
+  /** Last action description to be announced by screen readers */
+  readonly lastActionDescription: string | null
+}
+
+/**
+ * Returns an email address which can be used on the host side to
+ * look up the user which is to be given attribution.
+ *
+ * If the user has a public email address specified in their profile
+ * that's used and if they don't then we'll generate a stealth email
+ * address.
+ */
+function getEmailAddressForUser(user: KnownUserHit) {
+  return user.email && user.email.length > 0
+    ? user.email
+    : getLegacyStealthEmailForUser(user.username, user.endpoint)
+}
+
+/**
+ * Convert a IUserHit object which is returned from
+ * user-autocomplete-provider into a KnownAuthor object.
+ *
+ * If the IUserHit object lacks an email address we'll
+ * attempt to create a stealth email address.
+ */
+function authorFromUserHit(user: KnownUserHit): KnownAuthor {
+  return {
+    kind: 'known',
+    name: user.name || user.username,
+    email: getEmailAddressForUser(user),
+    username: user.username,
+  }
+}
+
+/**
+ * Autocompletable input field for possible authors of a commit.
+ *
+ * Intended primarily for co-authors but written in a general enough
+ * fashion to deal only with authors in general.
+ */
+export class AuthorInput extends React.Component<
+  IAuthorInputProps,
+  IAuthorInputState
+> {
+  private autocompletingInputRef =
+    React.createRef<AutocompletingInput<UserHit>>()
+  private shadowInputRef = React.createRef<HTMLDivElement>()
+  private inputRef: HTMLInputElement | null = null
+  private authorContainerRef = React.createRef<HTMLDivElement>()
+
+  private getAutocompleteItemFilter = memoizeOne(
+    (authors: ReadonlyArray<Author>) => (item: UserHit) => {
+      if (item.kind !== 'known-user') {
+        return true
+      }
+
+      const usernames = authors.map(a => a.username)
+
+      return !usernames.some(u => u === item.username)
+    }
+  )
+
+  public constructor(props: IAuthorInputProps) {
+    super(props)
+
+    this.state = {
+      isFocusedWithin: false,
+      focusedAuthorIndex: null,
+      lastActionDescription: null,
+    }
+  }
+
+  public componentDidUpdate(
+    prevProps: IAuthorInputProps,
+    prevState: IAuthorInputState
+  ) {
+    // If the focus is inside of the component and _something_ changed that
+    // could affect the focus, make sure the focus is still where it should
+    if (
+      this.state.isFocusedWithin &&
+      (prevProps.authors.length !== this.props.authors.length ||
+        prevState.focusedAuthorIndex !== this.state.focusedAuthorIndex)
+    ) {
+      this.focusAuthorHandle(this.state.focusedAuthorIndex)
+    }
+  }
+
+  public focus() {
+    this.autocompletingInputRef.current?.focus()
+  }
+
+  private focusAuthorHandle(index: number | null) {
+    if (index === null) {
+      this.inputRef?.focus()
+      return
+    }
+
+    const handle = this.authorContainerRef.current?.getElementsByClassName(
+      'handle'
+    )[index] as HTMLElement | null
+    handle?.focus()
+  }
+
+  public render() {
+    const className = classNames(
+      'author-input-component',
+      this.props.className,
+      {
+        disabled: this.props.readOnly,
+      }
+    )
+
+    return (
+      <FocusContainer
+        className={className}
+        onFocusWithinChanged={this.onFocusWithinChanged}
+      >
+        <div className="sr-only" aria-live="polite" aria-atomic="true">
+          {this.state.lastActionDescription}
+        </div>
+        <div className="shadow-input" ref={this.shadowInputRef} />
+        <label id="author-input-label" className="label" htmlFor="author-input">
+          Co-Authors&nbsp;
+        </label>
+        {this.renderAuthors()}
+        <AutocompletingInput<UserHit>
+          elementId="author-input"
+          placeholder="@username"
+          alwaysAutocomplete={true}
+          autocompletionProviders={[this.props.autoCompleteProvider]}
+          autocompleteItemFilter={this.getAutocompleteItemFilter(
+            this.props.authors
+          )}
+          ref={this.autocompletingInputRef}
+          onElementRef={this.onInputRef}
+          onAutocompleteItemSelected={this.onAutocompleteItemSelected}
+          onValueChanged={this.onCoAuthorsValueChanged}
+          onKeyDown={this.onInputKeyDown}
+          onFocus={this.onInputFocus}
+          readOnly={this.props.readOnly}
+        />
+      </FocusContainer>
+    )
+  }
+
+  private renderAuthors() {
+    return (
+      <div
+        className="added-author-container"
+        ref={this.authorContainerRef}
+        aria-labelledby="author-input-label"
+        role="listbox"
+      >
+        {this.props.authors.map((author, index) => {
+          return this.renderAuthor(author, index)
+        })}
+      </div>
+    )
+  }
+
+  private renderAuthor(author: Author, index: number) {
+    const { focusedAuthorIndex, isFocusedWithin } = this.state
+
+    return (
+      <AuthorHandle
+        key={
+          isKnownAuthor(author) ? getFullTextForAuthor(author) : author.username
+        }
+        index={index}
+        author={author}
+        isFocusWithinContainer={isFocusedWithin}
+        isFocused={focusedAuthorIndex === index}
+        isLastAuthor={index === this.props.authors.length - 1}
+        isFirstAuthor={index === 0}
+        isInputFocused={focusedAuthorIndex === null}
+        onKeyDown={this.onAuthorKeyDown}
+        onHandleClick={this.onAuthorClick}
+        onRemoveClick={this.onRemoveAuthorClick}
+        onFocus={this.onAuthorFocus}
+      />
+    )
+  }
+  private onFocusWithinChanged = (isFocusedWithin: boolean) => {
+    const focusedAuthorIndex = isFocusedWithin
+      ? this.state.focusedAuthorIndex
+      : null
+    this.setState({ focusedAuthorIndex, isFocusedWithin })
+  }
+
+  private onAuthorKeyDown = (
+    index: number,
+    event: React.KeyboardEvent<HTMLElement>
+  ) => {
+    if (event.key === 'ArrowLeft') {
+      this.focusPreviousAuthor()
+    } else if (event.key === 'ArrowRight') {
+      this.focusNextAuthor()
+    } else if (
+      this.state.focusedAuthorIndex !== null &&
+      (event.key === 'Backspace' || event.key === 'Delete')
+    ) {
+      this.removeAuthor(
+        this.state.focusedAuthorIndex,
+        event.key === 'Backspace' ? 'back' : 'forward'
+      )
+    }
+  }
+
+  private removeAuthor(index: number, direction: 'back' | 'forward' | 'none') {
+    const { authors } = this.props
+
+    if (index >= authors.length) {
+      return
+    }
+
+    const authorToRemove = authors[index]
+    const newAuthors = authors.slice(0, index).concat(authors.slice(index + 1))
+    let newFocusedAuthorIndex: number | null = null
+
+    // Focus next author depending on the "direction" of the removal:
+    // - if we're using backspace, move to the previous author
+    // - if we're using delete, move to the next author (which means staying
+    //   on the same index)
+    if (newAuthors.length > 0) {
+      if (direction === 'back') {
+        newFocusedAuthorIndex = Math.max(0, index - 1)
+      } else {
+        newFocusedAuthorIndex =
+          index === authors.length - 1
+            ? null
+            : Math.min(newAuthors.length - 1, index)
+      }
+    }
+
+    let actionDescription = `Removed ${authorToRemove.username}`
+    if (isKnownAuthor(authorToRemove)) {
+      actionDescription += ` (${authorToRemove.name})`
+    }
+
+    this.setState({
+      focusedAuthorIndex: newFocusedAuthorIndex,
+      lastActionDescription: actionDescription,
+    })
+
+    this.emitAuthorsUpdated(newAuthors)
+  }
+
+  private emitAuthorsUpdated(addedAuthors: ReadonlyArray<Author>) {
+    this.props.onAuthorsUpdated(addedAuthors)
+  }
+
+  private focusPreviousAuthor() {
+    const { focusedAuthorIndex } = this.state
+    const { authors } = this.props
+
+    if (focusedAuthorIndex === null) {
+      this.setState({ focusedAuthorIndex: authors.length - 1 })
+    } else if (focusedAuthorIndex > 0) {
+      this.setState({ focusedAuthorIndex: focusedAuthorIndex - 1 })
+    }
+  }
+
+  private focusNextAuthor() {
+    const { focusedAuthorIndex } = this.state
+    const { authors } = this.props
+
+    if (
+      focusedAuthorIndex !== null &&
+      focusedAuthorIndex < authors.length - 1
+    ) {
+      this.setState({ focusedAuthorIndex: focusedAuthorIndex + 1 })
+    } else {
+      this.setState({ focusedAuthorIndex: null })
+    }
+  }
+
+  private onInputFocus = () => {
+    this.setState({
+      focusedAuthorIndex: null,
+    })
+  }
+
+  private onCoAuthorsValueChanged = (value: string) => {
+    if (
+      this.shadowInputRef.current === null ||
+      this.inputRef === null ||
+      this.inputRef.parentElement === null ||
+      this.inputRef.parentElement.parentElement === null
+    ) {
+      return
+    }
+
+    // HACK: input elements don't behave as expected when we want them to fit
+    // to their content, and expand if there is enough space. They take more
+    // space than needed.
+    // This HACK uses a "shadow" (invisible) element with same styles as the
+    // input element to calculate the width of the input element based on its
+    // content.
+    // We will also take into account the width of the ancestors' width to make
+    // the input element expand as much as possible without overflowing.
+
+    this.shadowInputRef.current.textContent = value
+    const valueWidth = this.shadowInputRef.current.clientWidth
+    this.shadowInputRef.current.textContent = this.inputRef.placeholder
+    const placeholderWidth = this.shadowInputRef.current.clientWidth
+
+    const inputParent = this.inputRef.parentElement
+    const inputGrandparent = this.inputRef.parentElement.parentElement
+
+    const grandparentPadding = 10
+    inputParent.style.minWidth = `${Math.min(
+      inputGrandparent.getBoundingClientRect().width - grandparentPadding,
+      Math.max(valueWidth, placeholderWidth)
+    )}px`
+  }
+
+  private onInputRef = (input: HTMLInputElement | null) => {
+    if (input === null) {
+      return
+    }
+
+    this.inputRef = input
+  }
+
+  private onAutocompleteItemSelected = (item: UserHit) => {
+    const authorToAdd: Author =
+      item.kind === 'known-user'
+        ? authorFromUserHit(item)
+        : {
+            kind: 'unknown',
+            username: item.username,
+            state: 'searching',
+          }
+
+    const newAuthors = [...this.props.authors, authorToAdd]
+    this.emitAuthorsUpdated(newAuthors)
+
+    let actionDescription = `Added ${authorToAdd.username}`
+    if (!isKnownAuthor(authorToAdd)) {
+      this.attemptUnknownAuthorSearch(authorToAdd)
+    } else {
+      actionDescription += ` (${authorToAdd.name})`
+    }
+
+    this.setState({ lastActionDescription: actionDescription })
+
+    if (this.inputRef !== null) {
+      this.inputRef.value = ''
+      this.onCoAuthorsValueChanged('')
+    }
+  }
+
+  private async attemptUnknownAuthorSearch(author: UnknownAuthor) {
+    const knownAuthor = this.props.authors
+      .filter(isKnownAuthor)
+      .find(a => a.username?.toLowerCase() === author.username.toLowerCase())
+
+    if (knownAuthor !== undefined) {
+      this.updateUnknownAuthor(knownAuthor)
+      return
+    }
+
+    const hit = await this.props.autoCompleteProvider.exactMatch(
+      author.username
+    )
+
+    if (hit === null || hit.kind !== 'known-user') {
+      const erroredUnknownAuthor: UnknownAuthor = {
+        ...author,
+        state: 'error',
+      }
+
+      this.updateUnknownAuthor(erroredUnknownAuthor)
+      this.setState({
+        lastActionDescription: `Error: user ${author.username} not found`,
+      })
+      return
+    }
+
+    const hitAuthor = authorFromUserHit(hit)
+    this.updateUnknownAuthor(hitAuthor)
+  }
+
+  private updateUnknownAuthor(author: Author) {
+    const newAuthors = this.props.authors.map(a =>
+      a.username?.toLowerCase() === author.username?.toLowerCase() &&
+      !isKnownAuthor(a)
+        ? author
+        : a
+    )
+
+    this.emitAuthorsUpdated(newAuthors)
+  }
+
+  private onInputKeyDown = (event: React.KeyboardEvent<HTMLInputElement>) => {
+    if (this.inputRef === null) {
+      return
+    }
+
+    if (
+      (event.key === 'ArrowLeft' || event.key === 'Backspace') &&
+      this.inputRef.selectionStart === 0
+    ) {
+      this.focusPreviousAuthor()
+    }
+
+    // If Space is pressed at the end of the text, attempt to autocomplete
+    if (
+      event.key === ' ' &&
+      this.inputRef.selectionStart === this.inputRef.value.length
+    ) {
+      event.preventDefault()
+
+      const value = this.inputRef.value.trim()
+      if (value.length !== 0) {
+        this.onAutocompleteItemSelected({
+          kind: 'unknown-user',
+          username: value,
+        })
+      }
+    }
+  }
+
+  private onAuthorClick = (index: number) => {
+    this.setState({ focusedAuthorIndex: index })
+  }
+
+  private onRemoveAuthorClick = (index: number) => {
+    this.removeAuthor(index, 'forward')
+  }
+
+  private onAuthorFocus = (index: number) => {
+    this.setState({ focusedAuthorIndex: index })
+  }
+}
diff --git a/app/src/ui/lib/author-input/author-text.ts b/app/src/ui/lib/author-input/author-text.ts
new file mode 100644
index 00000000000..405d19990f7
--- /dev/null
+++ b/app/src/ui/lib/author-input/author-text.ts
@@ -0,0 +1,19 @@
+import { Author, isKnownAuthor } from '../../../models/author'
+
+export function getFullTextForAuthor(author: Author) {
+  if (isKnownAuthor(author)) {
+    return author.username === null
+      ? author.name
+      : `@${author.username} (${author.name})`
+  } else {
+    return `@${author.username}`
+  }
+}
+
+export function getDisplayTextForAuthor(author: Author) {
+  if (isKnownAuthor(author)) {
+    return author.username === null ? author.name : `@${author.username}`
+  } else {
+    return `@${author.username}`
+  }
+}
diff --git a/app/src/ui/lib/avatar-stack.tsx b/app/src/ui/lib/avatar-stack.tsx
index f0681292efd..f0022a798aa 100644
--- a/app/src/ui/lib/avatar-stack.tsx
+++ b/app/src/ui/lib/avatar-stack.tsx
@@ -2,6 +2,7 @@ import * as React from 'react'
 import classNames from 'classnames'
 import { Avatar } from './avatar'
 import { IAvatarUser } from '../../models/avatar'
+import { Account } from '../../models/account'
 
 /**
  * The maximum number of avatars to stack before hiding
@@ -12,6 +13,7 @@ const MaxDisplayedAvatars = 3
 
 interface IAvatarStackProps {
   readonly users: ReadonlyArray<IAvatarUser>
+  readonly accounts: ReadonlyArray<Account>
 }
 
 /**
@@ -22,7 +24,7 @@ interface IAvatarStackProps {
 export class AvatarStack extends React.Component<IAvatarStackProps, {}> {
   public render() {
     const elems = []
-    const users = this.props.users
+    const { users, accounts } = this.props
 
     for (let i = 0; i < this.props.users.length; i++) {
       if (
@@ -32,7 +34,7 @@ export class AvatarStack extends React.Component<IAvatarStackProps, {}> {
         elems.push(<div key="more" className="avatar-more avatar" />)
       }
 
-      elems.push(<Avatar key={`${i}`} user={users[i]} />)
+      elems.push(<Avatar key={`${i}`} user={users[i]} accounts={accounts} />)
     }
 
     const className = classNames('AvatarStack', {
diff --git a/app/src/ui/lib/avatar.tsx b/app/src/ui/lib/avatar.tsx
index a785c3c7937..b879415d3dc 100644
--- a/app/src/ui/lib/avatar.tsx
+++ b/app/src/ui/lib/avatar.tsx
@@ -1,12 +1,154 @@
 import * as React from 'react'
 import { IAvatarUser } from '../../models/avatar'
-import { shallowEquals } from '../../lib/equality'
-import { generateGravatarUrl } from '../../lib/gravatar'
-import { Octicon } from '../octicons'
-import { getDotComAPIEndpoint } from '../../lib/api'
+import { Octicon, OcticonSymbolVariant } from '../octicons'
+import { API, getDotComAPIEndpoint, getHTMLURL } from '../../lib/api'
 import { TooltippedContent } from './tooltipped-content'
 import { TooltipDirection } from './tooltip'
-import { supportsAvatarsAPI } from '../../lib/endpoint-capabilities'
+import {
+  isGHE,
+  isGHES,
+  supportsAvatarsAPI,
+} from '../../lib/endpoint-capabilities'
+import { Account } from '../../models/account'
+import { parseStealthEmail } from '../../lib/email'
+import noop from 'lodash/noop'
+import { offsetFrom } from '../../lib/offset-from'
+import { ExpiringOperationCache } from './expiring-operation-cache'
+import { forceUnwrap } from '../../lib/fatal-error'
+
+const avatarTokenCache = new ExpiringOperationCache<
+  { endpoint: string; accounts: ReadonlyArray<Account> },
+  string
+>(
+  ({ endpoint }) => endpoint,
+  async ({ endpoint, accounts }) => {
+    if (!isGHE(endpoint)) {
+      throw new Error('Avatar tokens are only available for ghe.com')
+    }
+
+    const account = accounts.find(a => a.endpoint === endpoint)
+    if (!account) {
+      throw new Error('No account found for endpoint')
+    }
+
+    const api = new API(endpoint, account.token)
+    const token = await api.getAvatarToken()
+
+    return forceUnwrap('Avatar token missing', token)
+  },
+  () => offsetFrom(0, 50, 'minutes')
+)
+
+const getBotLogin = (user: IAvatarUser) => {
+  const { endpoint } = user
+  if (user.avatarURL !== undefined || endpoint === null) {
+    return undefined
+  }
+
+  const match = parseStealthEmail(user.email, endpoint)
+
+  return match?.login?.endsWith('[bot]') ? match.login : undefined
+}
+
+const botAvatarCache = new ExpiringOperationCache<
+  { user: IAvatarUser; accounts: ReadonlyArray<Account> },
+  IAvatarUser
+>(
+  ({ user }) => `${user.endpoint}:${user.email}`,
+  async ({ user, accounts }) => {
+    const { endpoint } = user
+    if (user.avatarURL !== undefined || endpoint === null) {
+      throw new Error('Avatar URL already resolved or endpoint is missing')
+    }
+
+    const account = accounts.find(a => a.endpoint === user.endpoint)
+
+    if (!account) {
+      throw new Error('No account found for endpoint')
+    }
+
+    const login = getBotLogin(user)
+
+    if (!login) {
+      throw new Error('Email does not appear to be a bot email')
+    }
+
+    const api = new API(endpoint, account.token)
+    const apiUser = await api.fetchUser(login)
+
+    if (!apiUser?.avatar_url) {
+      throw new Error('No avatar url returned from API')
+    }
+
+    return { ...user, avatarURL: apiUser.avatar_url }
+  },
+  ({ user }) =>
+    user.endpoint && isGHE(user.endpoint)
+      ? offsetFrom(0, 50, 'minutes')
+      : Infinity
+)
+
+const dotComBot = (login: string, id: number, integrationId: number) => {
+  const avatarURL = `https://avatars.githubusercontent.com/in/${integrationId}?v=4`
+  const endpoint = getDotComAPIEndpoint()
+  const stealthHost = 'users.noreply.github.com'
+  return [
+    {
+      email: `${id}+${login}@${stealthHost}`,
+      name: login,
+      avatarURL,
+      endpoint,
+    },
+    { email: `${login}@${stealthHost}`, name: login, avatarURL, endpoint },
+  ]
+}
+
+const knownAvatars: ReadonlyArray<IAvatarUser> = [
+  ...dotComBot('dependabot[bot]', 49699333, 29110),
+  ...dotComBot('github-actions[bot]', 41898282, 15368),
+  ...dotComBot('github-pages[bot]', 52472962, 34598),
+]
+
+// Preload some of the more popular bot avatars so we don't have to hit the API
+knownAvatars.forEach(user =>
+  botAvatarCache.set({ user, accounts: [] }, user, Infinity)
+)
+
+/**
+ * This maps contains avatar URLs that have failed to load and
+ * the last time they failed to load (in milliseconds since the epoc)
+ *
+ * This is used to prevent us from retrying to load avatars where the
+ * server returned an error (or was unreachable). Since browsers doesn't
+ * cache the error itself and since we re-mount our image tags when
+ * scrolling through our virtualized lists we can end up making a lot
+ * of redundant requests to the server when it's busy or down. So
+ * when an avatar fails to load we'll remember that and not attempt
+ * to load it again for a while (see RetryLimit)
+ */
+const FailingAvatars = new Map<string, number>()
+
+/**
+ * Don't attempt to load an avatar that failed to load more than
+ * once every 5 minutes
+ */
+const RetryLimit = 5 * 60 * 1000
+
+function pruneExpiredFailingAvatars() {
+  const expired = new Array<string>()
+
+  for (const [url, lastError] of FailingAvatars.entries()) {
+    if (Date.now() - lastError > RetryLimit) {
+      expired.push(url)
+    } else {
+      // Map is sorted by insertion order so we can bail out early assuming
+      // we can trust the clock (which I know we can't but it's good enough)
+      break
+    }
+  }
+
+  expired.forEach(url => FailingAvatars.delete(url))
+}
 
 interface IAvatarProps {
   /** The user whose avatar should be displayed. */
@@ -24,11 +166,15 @@ interface IAvatarProps {
    * attempt to request, defaults to 64px.
    */
   readonly size?: number
+
+  readonly accounts: ReadonlyArray<Account>
 }
 
 interface IAvatarState {
   readonly user?: IAvatarUser
   readonly candidates: ReadonlyArray<string>
+  readonly imageError: boolean
+  readonly avatarToken?: string | Promise<void>
 }
 
 /**
@@ -36,20 +182,34 @@ interface IAvatarState {
  * The octicon has been tweaked to add some padding and so that it scales nicely in
  * a square aspect ratio.
  */
-const DefaultAvatarSymbol = {
+const DefaultAvatarSymbol: OcticonSymbolVariant = {
   w: 16,
   h: 16,
-  d: 'M13 13.145a.844.844 0 0 1-.832.855H3.834A.846.846 0 0 1 3 13.142v-.856c0-2.257 3.333-3.429 3.333-3.429s.191-.35 0-.857c-.7-.531-.786-1.363-.833-3.429C5.644 2.503 7.056 2 8 2s2.356.502 2.5 2.571C10.453 6.637 10.367 7.47 9.667 8c-.191.506 0 .857 0 .857S13 10.03 13 12.286v.859z',
+  p: [
+    'M13 13.145a.844.844 0 0 1-.832.855H3.834A.846.846 0 0 1 3 13.142v-.856c0-2.257 3.333-3.429 3.333-3.429s.191-.35 0-.857c-.7-.531-.786-1.363-.833-3.429C5.644 2.503 7.056 2 8 2s2.356.502 2.5 2.571C10.453 6.637 10.367 7.47 9.667 8c-.191.506 0 .857 0 .857S13 10.03 13 12.286v.859z',
+  ],
 }
 
-/**
- * A regular expression meant to match both the legacy format GitHub.com
- * stealth email address and the modern format (login@ vs id+login@).
- *
- * Yields two capture groups, the first being an optional capture of the
- * user id and the second being the mandatory login.
- */
-const StealthEmailRegexp = /^(?:(\d+)\+)?(.+?)@users\.noreply\.(.*)$/i
+function getEmailAvatarUrl(ep: string) {
+  if (isGHES(ep)) {
+    // GHES Endpoint urls look something like https://github.example.com/api/v3
+    // (note the lack of a trailing slash). We really should change our endpoint
+    // URLs to always have a trailing slash but that's one heck of an
+    // undertaking since we'd have to migrate all the existing endpoints in
+    // our IndexedDB databases so for now we'll just assume we'll add a trailing
+    // slash in the future and be future proof.
+    return new URL(`enterprise/avatars/u/e`, ep.endsWith('/') ? ep : `${ep}/`)
+  } else if (isGHE(ep)) {
+    // getHTMLURL(ep) is a noop here since it currently only deals with
+    // github.com and assumes all others confrom to the GHES url structure but
+    // we're likely going to need to update that in the future to support
+    // ghe.com specifically so we're calling it here for future proofing.
+    return new URL('/avatars/u/e', getHTMLURL(ep))
+  } else {
+    // It's safe to fall back to GitHub.com, at worst we'll get identicons
+    return new URL('https://avatars.githubusercontent.com/u/e')
+  }
+}
 
 /**
  * Produces an ordered iterable of avatar urls to attempt to load for the
@@ -57,6 +217,7 @@ const StealthEmailRegexp = /^(?:(\d+)\+)?(.+?)@users\.noreply\.(.*)$/i
  */
 function getAvatarUrlCandidates(
   user: IAvatarUser | undefined,
+  avatarToken: string | undefined,
   size = 64
 ): ReadonlyArray<string> {
   const candidates = new Array<string>()
@@ -65,14 +226,14 @@ function getAvatarUrlCandidates(
     return candidates
   }
 
-  const { email, endpoint, avatarURL } = user
-  const isDotCom = endpoint === getDotComAPIEndpoint()
+  const { email, avatarURL } = user
+  const ep = user.endpoint ?? getDotComAPIEndpoint()
 
   // By leveraging the avatar url from the API (if we've got it) we can
   // load the avatar from one of the load balanced domains (avatars). We can't
   // do the same for GHES/GHAE however since the URLs returned by the API are
   // behind private mode.
-  if (isDotCom && avatarURL !== undefined) {
+  if (!isGHES(ep) && avatarURL !== undefined) {
     // The avatar urls returned by the API doesn't come with a size parameter,
     // they default to the biggest size we need on GitHub.com which is usually
     // much bigger than what desktop needs so we'll set a size explicitly.
@@ -86,146 +247,140 @@ function getAvatarUrlCandidates(
       // URLs which we can expect the API to not give us
       candidates.push(avatarURL)
     }
-  } else if (endpoint !== null && !isDotCom && !supportsAvatarsAPI(endpoint)) {
+  }
+
+  if (isGHES(ep) && !supportsAvatarsAPI(ep)) {
     // We're dealing with an old GitHub Enterprise instance so we're unable to
     // get to the avatar by requesting the avatarURL due to the private mode
-    // (see https://github.com/desktop/desktop/issues/821). So we have no choice
-    // but to fall back to gravatar for now.
-    candidates.push(generateGravatarUrl(email, size))
-    return candidates
+    // (see https://github.com/desktop/desktop/issues/821).
+    return []
   }
 
-  // Are we dealing with a GitHub.com stealth/anonymous email address in
-  // either legacy format:
-  //  niik@users.noreply.github.com
-  //
-  // or the current format
-  //  634063+niik@users.noreply.github.com
-  //
-  // If so we unfortunately can't rely on the GitHub avatar endpoint to
-  // deliver a match based solely on that email address but luckily for us
-  // the avatar service supports looking up a user based either on user id
-  // of login, user id being the better option as it's not affected by
-  // account renames.
-  const stealthEmailMatch = StealthEmailRegexp.exec(email)
-
-  const avatarEndpoint =
-    endpoint === null || isDotCom
-      ? 'https://avatars.githubusercontent.com'
-      : `${endpoint}/enterprise/avatars`
-
-  if (stealthEmailMatch) {
-    const [, userId, login, hostname] = stealthEmailMatch
+  if (isGHE(ep) && !avatarToken) {
+    // ghe.com requires a token, nothing we can do here, we'll be called again
+    // once the token has been loaded
+    return []
+  }
 
-    if (
-      hostname === 'github.com' ||
-      (endpoint !== null && hostname === new URL(endpoint).hostname)
-    ) {
-      if (userId !== undefined) {
-        const userIdParam = encodeURIComponent(userId)
-        candidates.push(`${avatarEndpoint}/u/${userIdParam}?s=${size}`)
-      } else {
-        const loginParam = encodeURIComponent(login)
-        candidates.push(`${avatarEndpoint}/${loginParam}?s=${size}`)
-      }
-    }
+  const emailAvatarUrl = getEmailAvatarUrl(ep)
+
+  emailAvatarUrl.searchParams.set('email', email)
+  emailAvatarUrl.searchParams.set('s', `${size}`)
+
+  if (isGHE(ep) && avatarToken) {
+    emailAvatarUrl.searchParams.set('token', avatarToken)
   }
 
-  // The /u/e endpoint above falls back to gravatar (proxied)
-  // so we don't have to add gravatar to the fallback.
-  const emailParam = encodeURIComponent(email)
-  candidates.push(`${avatarEndpoint}/u/e?email=${emailParam}&s=${size}`)
+  candidates.push(`${emailAvatarUrl}`)
 
   return candidates
 }
 
+const getInitialStateForUser = (
+  user: IAvatarUser | undefined,
+  accounts: ReadonlyArray<Account>,
+  size: number | undefined,
+  avatarToken?: string
+): Pick<IAvatarState, 'user' | 'candidates' | 'avatarToken'> => {
+  if (user && !user.avatarURL) {
+    user = botAvatarCache.tryGet({ user, accounts }) ?? user
+  }
+  const endpoint = user?.endpoint
+  avatarToken ??=
+    endpoint && isGHE(endpoint)
+      ? avatarTokenCache.tryGet({ endpoint, accounts })
+      : undefined
+  const candidates = getAvatarUrlCandidates(user, avatarToken, size)
+
+  return { user, candidates, avatarToken }
+}
+
 /** A component for displaying a user avatar. */
 export class Avatar extends React.Component<IAvatarProps, IAvatarState> {
   public static getDerivedStateFromProps(
     props: IAvatarProps,
     state: IAvatarState
-  ): Partial<IAvatarState> | null {
-    const { user, size } = props
-    if (!shallowEquals(user, state.user)) {
-      const candidates = getAvatarUrlCandidates(user, size)
-      return { user, candidates }
+  ) {
+    // Explicitly exclude equality checks on avatarURL or else we'll end up
+    // infinitely looping when the user gets resolved into a bot account
+    if (
+      props.user?.email !== state.user?.email ||
+      props.user?.endpoint !== state.user?.endpoint ||
+      props.user?.name !== state.user?.name
+    ) {
+      return getInitialStateForUser(props.user, props.accounts, props.size)
     }
+
     return null
   }
 
+  /** Set to true when unmounting to avoid unnecessary state updates */
+  private cancelAvatarRequests = false
+
   public constructor(props: IAvatarProps) {
     super(props)
 
-    const { user, size } = props
+    const { user, size, accounts } = props
+
     this.state = {
-      user,
-      candidates: getAvatarUrlCandidates(user, size),
+      ...getInitialStateForUser(user, accounts, size),
+      imageError: false,
     }
   }
 
-  private getTitle(): string | JSX.Element | undefined {
-    if (this.props.title === null) {
+  private getTitle() {
+    const { title, accounts } = this.props
+    const { user } = this.state
+
+    if (title === null) {
       return undefined
     }
 
-    if (this.props.title !== undefined) {
-      return this.props.title
+    if (title !== undefined) {
+      return title
     }
 
-    const user = this.props.user
-    if (user) {
-      if (user.name) {
-        return (
-          <>
-            <Avatar title={null} user={user} />
+    if (user?.name) {
+      return (
+        <>
+          <Avatar title={null} user={user} accounts={accounts} />
+          <div>
             <div>
-              <div>
-                <strong>{user.name}</strong>
-              </div>
-              <div>{user.email}</div>
+              <strong>{user.name}</strong>
             </div>
-          </>
-        )
-      } else {
-        return user.email
-      }
+            <div>{user.email}</div>
+          </div>
+        </>
+      )
     }
 
-    return 'Unknown user'
+    return user?.email ?? 'Unknown user'
   }
 
   private onImageError = (e: React.SyntheticEvent<HTMLImageElement>) => {
-    if (this.state.candidates.length > 0) {
-      this.setState({ candidates: this.state.candidates.slice(1) })
+    const { src } = e.currentTarget
+    const candidates = this.state.candidates.filter(x => x !== src)
+    this.setState({ candidates, imageError: candidates.length === 0 })
+  }
+
+  private onImageLoad = (e: React.SyntheticEvent<HTMLImageElement>) => {
+    if (this.state.imageError) {
+      this.setState({ imageError: false })
     }
   }
 
   public render() {
     const title = this.getTitle()
-    const { user } = this.props
+    const { imageError, user } = this.state
     const alt = user
       ? `Avatar for ${user.name || user.email}`
       : `Avatar for unknown user`
 
-    if (this.state.candidates.length === 0) {
-      return (
-        <Octicon
-          symbol={DefaultAvatarSymbol}
-          className="avatar"
-          title={title}
-        />
-      )
-    }
-
-    const src = this.state.candidates[0]
-
-    const img = (
-      <img className="avatar" src={src} alt={alt} onError={this.onImageError} />
-    )
-
-    if (title === undefined) {
-      return img
-    }
+    const now = Date.now()
+    const src = this.state.candidates.find(c => {
+      const lastFailed = FailingAvatars.get(c)
+      return lastFailed === undefined || now - lastFailed > RetryLimit
+    })
 
     return (
       <TooltippedContent
@@ -235,29 +390,146 @@ export class Avatar extends React.Component<IAvatarProps, IAvatarState> {
         direction={TooltipDirection.NORTH}
         tagName="div"
       >
-        {img}
+        {(!src || imageError) && (
+          <Octicon symbol={DefaultAvatarSymbol} className="avatar" />
+        )}
+        {src && (
+          <img
+            className="avatar"
+            // This is critical for the functionality of onImageRef, we need a
+            // new Image element for each unique url.
+            key={src}
+            ref={this.onImageRef}
+            src={src}
+            alt={alt}
+            onLoad={this.onImageLoad}
+            onError={this.onImageError}
+            style={{ display: imageError ? 'none' : undefined }}
+          />
+        )}
       </TooltippedContent>
     )
   }
 
+  private onImageRef = (img: HTMLImageElement | null) => {
+    // This is different from the onImageLoad react event handler because we're
+    // never unsubscribing from this. If we were to use the react event handler
+    // we'd miss errors that happen after the Avatar component (or img
+    // component) has unmounted. We use a `key` on the img element to ensure
+    // we're always using a new img element for each unique url.
+    img?.addEventListener('error', () => {
+      // Keep the map sorted on last failure, see pruneExpiredFailingAvatars
+      FailingAvatars.delete(img.src)
+      FailingAvatars.set(img.src, Date.now())
+    })
+  }
+
+  private ensureAvatarToken() {
+    // fetch the avatar token for the endpoint if we don't have it
+    // when the async fetch completes, check if we're still mounted and if
+    // the endpoint still matches
+    // also need to keep track of whether we have an async fetch in flight or
+    // not so we don't trigger multiple fetches for the same endpoint
+    const { accounts } = this.props
+    const { user } = this.state
+    const endpoint = user?.endpoint
+
+    // We've already got a token or we don't have a user, nothing to do here
+    if (this.state.avatarToken || !user || !accounts) {
+      return
+    }
+
+    if (!endpoint || !isGHE(endpoint)) {
+      return
+    }
+
+    // Can we get a token synchronously?
+    const token = avatarTokenCache.tryGet({ endpoint, accounts })
+    if (token) {
+      this.resetAvatarCandidates(token)
+      return
+    }
+
+    this.setState({
+      avatarToken: avatarTokenCache
+        .get({ endpoint, accounts })
+        .then(token => {
+          if (!this.cancelAvatarRequests) {
+            if (token && this.state.user?.endpoint === endpoint) {
+              this.resetAvatarCandidates(token)
+            }
+          }
+        })
+        .catch(e => log.debug(`Failed to fetch avatar token: ${e}`)),
+    })
+  }
+
+  public componentDidUpdate(prevProps: IAvatarProps, prevState: IAvatarState) {
+    this.ensureAvatarToken()
+
+    const oldUser = prevState.user
+    const newUser = this.state.user
+
+    if (
+      oldUser?.endpoint !== newUser?.endpoint ||
+      oldUser?.email !== newUser?.email
+    ) {
+      this.resolveBotAvatar()
+    }
+  }
+
+  private resetAvatarCandidates(avatarToken?: string) {
+    const { user } = this.state
+    const { size, accounts } = this.props
+
+    this.setState(getInitialStateForUser(user, accounts, size, avatarToken))
+  }
+
   public componentDidMount() {
     window.addEventListener('online', this.onInternetConnected)
+    pruneExpiredFailingAvatars()
+    this.ensureAvatarToken()
+    this.resolveBotAvatar()
+  }
+
+  private resolveBotAvatar() {
+    const { accounts } = this.props
+    const { user } = this.state
+
+    if (user?.endpoint && !user.avatarURL && getBotLogin(user)) {
+      botAvatarCache
+        .get({ user, accounts })
+        .then(resolved => {
+          if (
+            !this.cancelAvatarRequests &&
+            user.endpoint === resolved.endpoint &&
+            user.email === resolved.email &&
+            user.name === resolved.name &&
+            user.avatarURL !== resolved.avatarURL
+          ) {
+            this.setState({ user: resolved }, () =>
+              this.resetAvatarCandidates()
+            )
+          }
+        })
+        .catch(noop)
+    }
   }
 
   public componentWillUnmount() {
     window.removeEventListener('online', this.onInternetConnected)
+    this.cancelAvatarRequests = true
   }
 
   private onInternetConnected = () => {
+    // Let's assume us being offline was the reason for failing to
+    // load the avatars
+    FailingAvatars.clear()
+
     // If we've been offline and therefore failed to load an avatar
     // we'll automatically retry when the user becomes connected again.
     if (this.state.candidates.length === 0) {
-      const { user, size } = this.props
-      const candidates = getAvatarUrlCandidates(user, size)
-
-      if (candidates.length > 0) {
-        this.setState({ candidates })
-      }
+      this.resetAvatarCandidates()
     }
   }
 }
diff --git a/app/src/ui/lib/branch-name-warnings.tsx b/app/src/ui/lib/branch-name-warnings.tsx
index 0d4c6294299..ffc9061529d 100644
--- a/app/src/ui/lib/branch-name-warnings.tsx
+++ b/app/src/ui/lib/branch-name-warnings.tsx
@@ -3,15 +3,14 @@ import { Branch, BranchType } from '../../models/branch'
 
 import { Row } from './row'
 import { Octicon } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import * as octicons from '../octicons/octicons.generated'
 import { Ref } from './ref'
-import { IStashEntry } from '../../models/stash-entry'
 
 export function renderBranchHasRemoteWarning(branch: Branch) {
   if (branch.upstream != null) {
     return (
       <Row className="warning-helper-text">
-        <Octicon symbol={OcticonSymbol.alert} />
+        <Octicon symbol={octicons.alert} />
         <p>
           This branch is tracking <Ref>{branch.upstream}</Ref> and renaming this
           branch will not change the branch name on the remote.
@@ -38,25 +37,10 @@ export function renderBranchNameExistsOnRemoteWarning(
 
   return (
     <Row className="warning-helper-text">
-      <Octicon symbol={OcticonSymbol.alert} />
+      <Octicon symbol={octicons.alert} />
       <p>
         A branch named <Ref>{sanitizedName}</Ref> already exists on the remote.
       </p>
     </Row>
   )
 }
-
-export function renderStashWillBeLostWarning(stash: IStashEntry | null) {
-  if (stash === null) {
-    return null
-  }
-  return (
-    <Row className="warning-helper-text">
-      <Octicon symbol={OcticonSymbol.alert} />
-      <p>
-        Your current stashed changes on this branch will no longer be visible in
-        GitHub Desktop if the branch is renamed.
-      </p>
-    </Row>
-  )
-}
diff --git a/app/src/ui/lib/button.tsx b/app/src/ui/lib/button.tsx
index 4e7f21409f1..32fc7c14dd8 100644
--- a/app/src/ui/lib/button.tsx
+++ b/app/src/ui/lib/button.tsx
@@ -2,22 +2,34 @@ import * as React from 'react'
 import classNames from 'classnames'
 import { Tooltip, TooltipDirection } from './tooltip'
 import { createObservableRef } from './observable-ref'
+import { AriaHasPopupType } from './aria-types'
 
 export interface IButtonProps {
   /**
    * A callback which is invoked when the button is clicked
    * using a pointer device or keyboard. The source event is
    * passed along and can be used to prevent the default action
-   * or stop the even from bubbling.
+   * or stop the event from bubbling.
    */
   readonly onClick?: (event: React.MouseEvent<HTMLButtonElement>) => void
 
+  /**
+   * A callback which is invoked when the button's context menu
+   * is activated using a pointer device or keyboard. The source
+   * event is passed along and can be used to prevent the default
+   * action or stop the event from bubbling.
+   */
+  readonly onContextMenu?: (event: React.MouseEvent<HTMLButtonElement>) => void
+
   /**
    * A function that's called when the user moves over the button with
    * a pointer device.
    */
   readonly onMouseEnter?: (event: React.MouseEvent<HTMLButtonElement>) => void
 
+  /** Called on key down. */
+  readonly onKeyDown?: (event: React.KeyboardEvent<HTMLButtonElement>) => void
+
   /** An optional tooltip to render when hovering over the button */
   readonly tooltip?: string
 
@@ -66,14 +78,117 @@ export interface IButtonProps {
    */
   readonly tabIndex?: number
 
+  /**
+   * ARIA roles provide semantic meaning to content, allowing screen readers and
+   * other tools to present and support interaction with object in a way that is
+   * consistent with user expectations of that type of object. ARIA roles can be
+   * used to describe elements that don't natively exist in HTML or exist but
+   * don't yet have full browser support.
+   *
+   * By default, many semantic elements in HTML have a role; for example, <input
+   * type="radio"> has the "radio" role. Non-semantic elements in HTML do not
+   * have a role; <div> and <span> without added semantics return null. The role
+   * attribute can provide semantics.
+   */
   readonly role?: string
+
+  /**
+   * The aria-expanded attribute is set on an element to indicate if a control
+   * is expanded or collapsed, and whether or not the controlled elements are
+   * displayed or hidden.
+   *
+   * There are several widgets that can be expanded and collapsed, including
+   * menus, dialogs, and accordion panels. Each of these objects, in turn, has
+   * an interactive element that controls their opening and closing. The
+   * aria-expanded attribute is applied to this focusable, interactive control
+   * that toggles the visibility of the object.
+   */
   readonly ariaExpanded?: boolean
 
+  /** An aria attribute indicates the availability and type of interactive popup
+   * element that can be triggered by the element on which the attribute is set
+   *
+   * Notes: The value true is the same as menu. Any other value, including an
+   * empty string or other role, is treated as if false were set.
+   * */
+  readonly ariaHaspopup?: AriaHasPopupType
+
+  /**
+   * Typically the contents of a button serve the purpose of describing the
+   * buttons use. However, ariaLabel can be used if the contents do not suffice.
+   * Such as when a button wraps an image and there is no text.
+   */
+  readonly ariaLabel?: string
+
+  /** Whether the button is hidden from screen readers Caution: very rare
+   * instances where a button should be hidden from screen readers. Example:
+   * Windows "Minimize", "Maximize", "Close" are hidden per operating system
+   * convention.
+   */
+  readonly ariaHidden?: boolean
+
+  /** If a button has a sentence type further description than it's label or
+   * contents */
+  readonly ariaDescribedBy?: string
+
   /**
    * Whether to only show the tooltip when the tooltip target overflows its
    * bounds. Typically this is used in conjunction with an ellipsis CSS ruleset.
    */
   readonly onlyShowTooltipWhenOverflowed?: boolean
+
+  /** The aria-pressed attribute indicates the current "pressed" state of a
+   * toggle button.
+   *
+   * Accessibility notes: Do not change the contents of the label on a toggle
+   * button when the state changes. If a button label says "pause", do not
+   * change it to "play" when pressed.
+   * */
+  readonly ariaPressed?: boolean
+
+  /**
+   * Identifies the element (or elements) whose contents or presence are
+   * controlledby this button.
+   *
+   * For example:
+   * - A button may control the visibility content of a neighboring div.
+   * - A tab controls the display of its associated tab panel.
+   * */
+  readonly ariaControls?: string
+
+  /** Whether the input field should auto focus when mounted. */
+  readonly autoFocus?: boolean
+
+  /** Specify the direction of the tooltip */
+  readonly toolTipDirection?: TooltipDirection
+
+  /** Specify custom classes for the button's tooltip */
+  readonly tooltipClassName?: string
+
+  /** Whether the button's tooltip opens on click  */
+  readonly openTooltipOnClick?: boolean
+
+  /**
+   * Whether or not to apply the aria-desribedby to the target element.
+   *
+   * If the button already has an aria label that is the same as the tooltip
+   * content, this should be false.
+   *
+   * Note: If the tooltip does provide more context than the targets accessible
+   * label (visual or aria), this should be true.
+   *
+   * Default: true
+   * */
+  readonly applyTooltipAriaDescribedBy?: boolean
+
+  /**
+   * Whether or not the tooltip should be dismissable via the escape key. This
+   * is generally true, but if the tooltip is communicating something important
+   * to the user, such as an input error, it should not be dismissable.
+   *
+   * Defaults to true
+   */
+  readonly tooltipDismissable?: boolean
 }
 
 /**
@@ -118,6 +233,8 @@ export class Button extends React.Component<IButtonProps, {}> {
       <button
         className={className}
         onClick={disabled ? preventDefault : this.onClick}
+        onKeyDown={this.props.onKeyDown}
+        onContextMenu={disabled ? preventDefault : this.onContextMenu}
         type={this.props.type || 'button'}
         ref={this.innerButtonRef}
         tabIndex={this.props.tabIndex}
@@ -125,14 +242,25 @@ export class Button extends React.Component<IButtonProps, {}> {
         role={this.props.role}
         aria-expanded={this.props.ariaExpanded}
         aria-disabled={disabled ? 'true' : undefined}
+        aria-label={this.props.ariaLabel}
+        aria-describedby={this.props.ariaDescribedBy}
+        aria-haspopup={this.props.ariaHaspopup}
+        aria-pressed={this.props.ariaPressed}
+        aria-hidden={this.props.ariaHidden}
+        aria-controls={this.props.ariaControls}
+        autoFocus={this.props.autoFocus}
       >
         {tooltip && (
           <Tooltip
+            className={this.props.tooltipClassName}
             target={this.innerButtonRef}
-            direction={TooltipDirection.NORTH}
+            direction={this.props.toolTipDirection ?? TooltipDirection.NORTH}
             // Show the tooltip immediately on hover if the button is disabled
-            delay={disabled && tooltip ? 0 : undefined}
+            delay={disabled ? 0 : undefined}
             onlyWhenOverflowed={this.props.onlyShowTooltipWhenOverflowed}
+            openOnTargetClick={this.props.openTooltipOnClick}
+            applyAriaDescribedBy={this.props.applyTooltipAriaDescribedBy}
+            dismissable={this.props.tooltipDismissable}
           >
             {tooltip}
           </Tooltip>
@@ -151,6 +279,14 @@ export class Button extends React.Component<IButtonProps, {}> {
       event.preventDefault()
     }
   }
+
+  private onContextMenu = (event: React.MouseEvent<HTMLButtonElement>) => {
+    this.props.onContextMenu?.(event)
+
+    if (this.props.type === undefined) {
+      event.preventDefault()
+    }
+  }
 }
 
 const preventDefault = (e: Event | React.SyntheticEvent) => e.preventDefault()
diff --git a/app/src/ui/lib/call-to-action.tsx b/app/src/ui/lib/call-to-action.tsx
index f44f97d427e..f3ba98a6a8a 100644
--- a/app/src/ui/lib/call-to-action.tsx
+++ b/app/src/ui/lib/call-to-action.tsx
@@ -1,11 +1,14 @@
 import * as React from 'react'
 import { Row } from './row'
 import { Button } from './button'
+import classNames from 'classnames'
 
 interface ICallToActionProps {
   /** The action title. */
   readonly actionTitle: string
 
+  readonly buttonClassName?: string
+
   /** The function to call when the user clicks the action button. */
   readonly onAction: () => void
 }
@@ -16,10 +19,15 @@ interface ICallToActionProps {
  */
 export class CallToAction extends React.Component<ICallToActionProps, {}> {
   public render() {
+    const className = classNames(
+      'action-button',
+      'button-component-primary',
+      this.props.buttonClassName
+    )
     return (
       <Row className="call-to-action">
         {this.props.children}
-        <Button className="action-button" type="submit" onClick={this.onClick}>
+        <Button className={className} onClick={this.onClick}>
           {this.props.actionTitle}
         </Button>
       </Row>
diff --git a/app/src/ui/lib/checkbox.tsx b/app/src/ui/lib/checkbox.tsx
index 42e556651bd..66020e91a79 100644
--- a/app/src/ui/lib/checkbox.tsx
+++ b/app/src/ui/lib/checkbox.tsx
@@ -1,5 +1,6 @@
 import * as React from 'react'
 import { createUniqueId, releaseUniqueId } from './id-pool'
+import uuid from 'uuid'
 
 /** The possible values for a Checkbox component. */
 export enum CheckboxValue {
@@ -23,6 +24,10 @@ interface ICheckboxProps {
 
   /** The label for the checkbox. */
   readonly label?: string | JSX.Element
+
+  /** An aria description of a checkbox - intended to provide more verbose
+   * information than a label that a the user might need */
+  readonly ariaDescribedBy?: string
 }
 
 interface ICheckboxState {
@@ -49,7 +54,10 @@ export class Checkbox extends React.Component<ICheckboxProps, ICheckboxState> {
   }
 
   public componentWillMount() {
-    const friendlyName = this.props.label || 'unknown'
+    const friendlyName =
+      this.props.label && typeof this.props.label === 'string'
+        ? this.props.label
+        : uuid()
     const inputId = createUniqueId(`Checkbox_${friendlyName}`)
 
     this.setState({ inputId })
@@ -61,6 +69,10 @@ export class Checkbox extends React.Component<ICheckboxProps, ICheckboxState> {
     }
   }
 
+  public focus() {
+    this.input?.focus()
+  }
+
   private updateInputState() {
     const input = this.input
     if (input) {
@@ -77,6 +89,15 @@ export class Checkbox extends React.Component<ICheckboxProps, ICheckboxState> {
     this.updateInputState()
   }
 
+  private onDoubleClick = (event: React.MouseEvent<HTMLInputElement>) => {
+    // This will prevent double clicks on the checkbox to be bubbled up in the
+    // DOM hierarchy and trigger undesired actions. For example, a double click
+    // on the checkbox in the changed file list should not open the file in the
+    // external editor.
+    event.preventDefault()
+    event.stopPropagation()
+  }
+
   private renderLabel() {
     const label = this.props.label
     const inputId = this.state.inputId
@@ -92,8 +113,10 @@ export class Checkbox extends React.Component<ICheckboxProps, ICheckboxState> {
           tabIndex={this.props.tabIndex}
           type="checkbox"
           onChange={this.onChange}
+          onDoubleClick={this.onDoubleClick}
           ref={this.onInputRef}
           disabled={this.props.disabled}
+          aria-describedby={this.props.ariaDescribedBy}
         />
         {this.renderLabel()}
       </div>
diff --git a/app/src/ui/lib/color-manipulation.ts b/app/src/ui/lib/color-manipulation.ts
deleted file mode 100644
index e1212cbe96f..00000000000
--- a/app/src/ui/lib/color-manipulation.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-interface IParsedRGB {
-  red: number
-  blue: number
-  green: number
-  usePound: boolean
-}
-
-/**
- * Extracts the red, blue, green values from a hex string into a object.
- *
- * @param hex - a 6 character string that represents a hex value -- #123456 or
- * 123456.
- * Note: Providing a non hex string won't fail, but may not be meaninful.
- * @returns - a IParsedRGB object that houses a parsed red, green, blue and whether the value was prefaced with a #.
- */
-function parseHex(hex: string): IParsedRGB {
-  let usePound = false
-
-  if (hex[0] === '#') {
-    hex = hex.slice(1)
-    usePound = true
-  }
-
-  // convert rrggbb to decimal
-  const num = parseInt(hex, 16)
-
-  return {
-    red: num >> 16,
-    blue: (num >> 8) & 0x00ff,
-    green: num & 0x0000ff,
-    usePound,
-  }
-}
-
-/**
- * Given a number, it caps it at the rgb extremes of 0 and  255.
- * Example:
- *  colorSegment = -1, returns 0.
- *  colorSegment = 256, returns 255.
- *  colorSegment = 100, returns 100.
- *
- * @param colorSegment - number.
- * @returns - a number between 0 and 255 inclusive.
- */
-function capColorSegment(colorSegment: number): number {
-  return colorSegment > 255 ? 255 : colorSegment < 0 ? 0 : colorSegment
-}
-
-/**
- * This method takes a hex value splits it into red, green, blue values and adds
- * the amount number to them. Thus, providing a positive number will lighten the
- * value by pushing the value closer to 255, 255, 255 aka white. Providing a
- * negative number will darken the value by pushing the value closer to 0, 0, 0
- * aka black.
- *
- * Note: Since this caps the red, green, and blue values at 255 and 0, this
- * method will also have a flattening to black or white effect to the color if
- * the color already has a value you near the extremes or the amount provided is
- * rather high/low.
- *
- * @param hex - a 6 character string that represents a hex value -- #123456 or
- * 123456.
- * Note: Providing a non hex string won't fail, but may not be meaninful.
- * @param amount - a number. Positive lightens. Negative darkens.
- * @returns - a hex value. If prefaced with a '#', it will be returnes prefaced
- * with a '#'.
- */
-export function lightenDarkenHexColor(hex: string, amount: number) {
-  const parsedHex: IParsedRGB = parseHex(hex)
-
-  const red = capColorSegment(parsedHex.red + amount)
-  const blue = capColorSegment(parsedHex.blue + amount)
-  const green = capColorSegment(parsedHex.green + amount)
-
-  const backToHex = (green | (blue << 8) | (red << 16)).toString(16)
-  return (parsedHex.usePound ? '#' : '') + backToHex
-}
-
-/**
- * Calculates a luma range 0 to 255 and returns true if > 150.
- *
- * @param hex - a 6 character string that represents a hex value -- #123456 or 123456
- * Note: Providing a non hex string won't fail, but may not be meaninful.
- * @returns Calculates a luma range 0 to 255 and returns true if luma > 150.
- */
-export function isHexColorLight(hex: string): boolean {
-  const { red, green, blue } = parseHex(hex)
-
-  // The resulting luma value range is 0..255, where 0 is the darkest and 255 is the lightest.
-  const luma = 0.2126 * red + 0.7152 * green + 0.0722 * blue // per ITU-R BT.709
-
-  return luma > 150
-}
diff --git a/app/src/ui/lib/commit-attribution.tsx b/app/src/ui/lib/commit-attribution.tsx
index d0fbc409802..3a7f9030473 100644
--- a/app/src/ui/lib/commit-attribution.tsx
+++ b/app/src/ui/lib/commit-attribution.tsx
@@ -40,23 +40,15 @@ export class CommitAttribution extends React.Component<
         <span className="authors">{this.renderAuthorInline(authors[0])}</span>
       )
     } else if (authors.length === 2) {
-      const title = authors.map(a => a.name).join(', ')
-
       return (
-        <span className="authors" title={title}>
+        <span className="authors">
           {this.renderAuthorInline(authors[0])}
           {`, `}
           {this.renderAuthorInline(authors[1])}
         </span>
       )
     } else {
-      const title = authors.map(a => a.name).join(', ')
-
-      return (
-        <span className="authors" title={title}>
-          {authors.length} people
-        </span>
-      )
+      return <span className="authors">{authors.length} people</span>
     }
   }
 
diff --git a/app/src/ui/lib/configure-git-user.tsx b/app/src/ui/lib/configure-git-user.tsx
index fa652d57cf0..80243501454 100644
--- a/app/src/ui/lib/configure-git-user.tsx
+++ b/app/src/ui/lib/configure-git-user.tsx
@@ -21,6 +21,7 @@ import { RadioButton } from './radio-button'
 import { Select } from './select'
 import { GitEmailNotFoundWarning } from './git-email-not-found-warning'
 import { getDotComAPIEndpoint } from '../../lib/api'
+import { Loading } from './loading'
 
 interface IConfigureGitUserProps {
   /** The logged-in accounts. */
@@ -53,6 +54,8 @@ interface IConfigureGitUserState {
    * choice to delete the lock file.
    */
   readonly existingLockFilePath?: string
+
+  readonly loadingGitConfig: boolean
 }
 
 /**
@@ -82,6 +85,7 @@ export class ConfigureGitUser extends React.Component<
       gitHubName: account?.name || account?.login || '',
       gitHubEmail:
         this.account !== null ? lookupPreferredEmail(this.account) : '',
+      loadingGitConfig: true,
     }
   }
 
@@ -113,6 +117,7 @@ export class ConfigureGitUser extends React.Component<
           prevState.manualEmail.length === 0
             ? globalUserEmail || ''
             : prevState.manualEmail,
+        loadingGitConfig: false,
       }),
       () => {
         // Chances are low that we actually have an account at mount-time
@@ -198,9 +203,7 @@ export class ConfigureGitUser extends React.Component<
 
         {error}
 
-        {this.state.useGitHubAuthorInfo
-          ? this.renderGitHubInfo()
-          : this.renderGitConfigForm()}
+        {this.renderConfigForm()}
 
         {this.renderExampleCommit()}
       </div>
@@ -248,12 +251,9 @@ export class ConfigureGitUser extends React.Component<
           commit={dummyCommit}
           emoji={emoji}
           gitHubRepository={null}
-          canBeUndone={false}
-          canBeAmended={false}
-          canBeResetTo={false}
-          isLocal={false}
           showUnpushedIndicator={false}
           selectedCommits={[dummyCommit]}
+          accounts={this.props.accounts}
         />
       </div>
     )
@@ -276,6 +276,7 @@ export class ConfigureGitUser extends React.Component<
           checked={this.state.useGitHubAuthorInfo}
           onSelected={this.onUseGitHubInfoSelected}
           value="github-account"
+          autoFocus={true}
         />
         <RadioButton
           label="Configure manually"
@@ -293,14 +294,7 @@ export class ConfigureGitUser extends React.Component<
     }
 
     return (
-      <Form className="sign-in-form" onSubmit={this.save}>
-        <TextBox
-          label="Name"
-          placeholder="Your Name"
-          value={this.state.gitHubName}
-          disabled={true}
-        />
-
+      <>
         <Select
           label="Email"
           value={this.state.gitHubEmail}
@@ -312,31 +306,20 @@ export class ConfigureGitUser extends React.Component<
             </option>
           ))}
         </Select>
-
-        <Row>
-          <Button type="submit">{this.props.saveLabel || 'Save'}</Button>
-          {this.props.children}
-        </Row>
-      </Form>
+      </>
     )
   }
 
   private renderGitConfigForm() {
     return (
-      <Form className="sign-in-form" onSubmit={this.save}>
-        <TextBox
-          label="Name"
-          placeholder="Your Name"
-          value={this.state.manualName}
-          onValueChanged={this.onNameChange}
-        />
-
+      <>
         <TextBox
           type="email"
           label="Email"
           placeholder="your-email@example.com"
           value={this.state.manualEmail}
           onValueChanged={this.onEmailChange}
+          readOnly={this.state.loadingGitConfig}
         />
 
         {this.account !== null && (
@@ -345,7 +328,38 @@ export class ConfigureGitUser extends React.Component<
             email={this.state.manualEmail}
           />
         )}
+      </>
+    )
+  }
+
+  private renderConfigForm() {
+    return (
+      <Form className="sign-in-form" onSubmit={this.save}>
+        {!this.state.useGitHubAuthorInfo && this.state.loadingGitConfig && (
+          <div className="git-config-loading">
+            <Loading /> Checking for an existing git config…
+          </div>
+        )}
+        <div className="sign-in-form-inputs">
+          <TextBox
+            label="Name"
+            placeholder="Your Name"
+            onValueChanged={this.onNameChange}
+            value={
+              this.state.useGitHubAuthorInfo
+                ? this.state.gitHubName
+                : this.state.manualName
+            }
+            readOnly={
+              this.state.useGitHubAuthorInfo || this.state.loadingGitConfig
+            }
+            autoFocus={true}
+          />
 
+          {this.state.useGitHubAuthorInfo
+            ? this.renderGitHubInfo()
+            : this.renderGitConfigForm()}
+        </div>
         <Row>
           <Button type="submit">{this.props.saveLabel || 'Save'}</Button>
           {this.props.children}
diff --git a/app/src/ui/lib/conflicts/render-functions.tsx b/app/src/ui/lib/conflicts/render-functions.tsx
index 4ccafad3319..dbc28855a05 100644
--- a/app/src/ui/lib/conflicts/render-functions.tsx
+++ b/app/src/ui/lib/conflicts/render-functions.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { Octicon } from '../../octicons'
-import * as OcticonSymbol from '../../octicons/octicons.generated'
+import * as octicons from '../../octicons/octicons.generated'
 import { LinkButton } from '../link-button'
 
 export function renderUnmergedFilesSummary(conflictedFilesCount: number) {
@@ -9,14 +9,14 @@ export function renderUnmergedFilesSummary(conflictedFilesCount: number) {
     conflictedFilesCount === 1
       ? `1 conflicted file`
       : `${conflictedFilesCount} conflicted files`
-  return <h3 className="summary">{message}</h3>
+  return <h2 className="summary">{message}</h2>
 }
 
 export function renderAllResolved() {
   return (
     <div className="all-conflicts-resolved">
       <div className="green-circle">
-        <Octicon symbol={OcticonSymbol.check} />
+        <Octicon symbol={octicons.check} />
       </div>
       <div className="message">All conflicts resolved</div>
     </div>
diff --git a/app/src/ui/lib/conflicts/unmerged-file.tsx b/app/src/ui/lib/conflicts/unmerged-file.tsx
index 49c4878011d..9639283e8be 100644
--- a/app/src/ui/lib/conflicts/unmerged-file.tsx
+++ b/app/src/ui/lib/conflicts/unmerged-file.tsx
@@ -12,7 +12,7 @@ import { Repository } from '../../../models/repository'
 import { Dispatcher } from '../../dispatcher'
 import { showContextualMenu } from '../../../lib/menu-item'
 import { Octicon } from '../../octicons'
-import * as OcticonSymbol from '../../octicons/octicons.generated'
+import * as octicons from '../../octicons/octicons.generated'
 import { PathText } from '../path-text'
 import { ManualConflictResolution } from '../../../models/manual-conflict-resolution'
 import {
@@ -20,15 +20,16 @@ import {
   RevealInFileManagerLabel,
 } from '../context-menu'
 import { openFile } from '../open-file'
-import { shell } from 'electron'
 import { Button } from '../button'
 import { IMenuItem } from '../../../lib/menu-item'
-import { LinkButton } from '../link-button'
 import {
   hasUnresolvedConflicts,
   getUnmergedStatusEntryDescription,
   getLabelForManualResolutionOption,
 } from '../../../lib/status'
+import { revealInFileManager } from '../../../lib/app-shell'
+
+const defaultConflictsResolvedMessage = 'No conflicts remaining'
 
 /**
  * Renders an unmerged file status and associated buttons for the merge conflicts modal
@@ -73,6 +74,10 @@ export const renderUnmergedFile: React.FunctionComponent<{
   readonly resolvedExternalEditor: string | null
   readonly openFileInExternalEditor: (path: string) => void
   readonly dispatcher: Dispatcher
+  readonly isFileResolutionOptionsMenuOpen: boolean
+  readonly setIsFileResolutionOptionsMenuOpen: (
+    isFileResolutionOptionsMenuOpen: boolean
+  ) => void
 }> = props => {
   if (
     isConflictWithMarkers(props.status) &&
@@ -88,6 +93,9 @@ export const renderUnmergedFile: React.FunctionComponent<{
       dispatcher: props.dispatcher,
       ourBranch: props.ourBranch,
       theirBranch: props.theirBranch,
+      isFileResolutionOptionsMenuOpen: props.isFileResolutionOptionsMenuOpen,
+      setIsFileResolutionOptionsMenuOpen:
+        props.setIsFileResolutionOptionsMenuOpen,
     })
   }
   if (
@@ -126,22 +134,33 @@ const renderResolvedFile: React.FunctionComponent<{
   readonly branch?: string
   readonly dispatcher: Dispatcher
 }> = props => {
+  const fileStatusSummary = getResolvedFileStatusSummary(
+    props.status,
+    props.manualResolution,
+    props.branch
+  )
   return (
     <li key={props.path} className="unmerged-file-status-resolved">
-      <Octicon symbol={OcticonSymbol.fileCode} className="file-octicon" />
-      <div className="column-left">
+      <Octicon symbol={octicons.fileCode} className="file-octicon" />
+      <div className="column-left" id={props.path}>
         <PathText path={props.path} />
-        {renderResolvedFileStatusSummary({
-          path: props.path,
-          status: props.status,
-          branch: props.branch,
-          manualResolution: props.manualResolution,
-          repository: props.repository,
-          dispatcher: props.dispatcher,
-        })}
+        <div className="file-conflicts-status">{fileStatusSummary}</div>
       </div>
+      {fileStatusSummary === defaultConflictsResolvedMessage ? null : (
+        <Button
+          className="undo-button"
+          onClick={makeUndoManualResolutionClickHandler(
+            props.path,
+            props.repository,
+            props.dispatcher
+          )}
+          ariaDescribedBy={props.path}
+        >
+          Undo
+        </Button>
+      )}
       <div className="green-circle">
-        <Octicon symbol={OcticonSymbol.check} />
+        <Octicon symbol={octicons.check} />
       </div>
     </li>
   )
@@ -193,7 +212,7 @@ const renderManualConflictedFile: React.FunctionComponent<{
           onClick={onDropdownClick}
         >
           Resolve
-          <Octicon symbol={OcticonSymbol.triangleDown} />
+          <Octicon symbol={octicons.triangleDown} />
         </Button>
       </div>
     </>
@@ -208,7 +227,7 @@ function renderConflictedFileWrapper(
 ): JSX.Element {
   return (
     <li key={path} className="unmerged-file-status-conflicts">
-      <Octicon symbol={OcticonSymbol.fileCode} className="file-octicon" />
+      <Octicon symbol={octicons.fileCode} className="file-octicon" />
       {content}
     </li>
   )
@@ -223,6 +242,10 @@ const renderConflictedFileWithConflictMarkers: React.FunctionComponent<{
   readonly dispatcher: Dispatcher
   readonly ourBranch?: string
   readonly theirBranch?: string
+  readonly isFileResolutionOptionsMenuOpen: boolean
+  readonly setIsFileResolutionOptionsMenuOpen: (
+    isFileResolutionOptionsMenuOpen: boolean
+  ) => void
 }> = props => {
   const humanReadableConflicts = calculateConflicts(
     props.status.conflictMarkerCount
@@ -240,7 +263,8 @@ const renderConflictedFileWithConflictMarkers: React.FunctionComponent<{
     props.dispatcher,
     props.status,
     props.ourBranch,
-    props.theirBranch
+    props.theirBranch,
+    props.setIsFileResolutionOptionsMenuOpen
   )
 
   const content = (
@@ -261,8 +285,11 @@ const renderConflictedFileWithConflictMarkers: React.FunctionComponent<{
         <Button
           onClick={onDropdownClick}
           className="small-button button-group-item arrow-menu"
+          ariaLabel="File resolution options"
+          ariaHaspopup="menu"
+          ariaExpanded={props.isFileResolutionOptionsMenuOpen}
         >
-          <Octicon symbol={OcticonSymbol.triangleDown} />
+          <Octicon symbol={octicons.triangleDown} />
         </Button>
       </div>
     </>
@@ -313,8 +340,11 @@ const makeMarkerConflictDropdownClickHandler = (
   repository: Repository,
   dispatcher: Dispatcher,
   status: ConflictsWithMarkers,
-  ourBranch?: string,
-  theirBranch?: string
+  ourBranch: string | undefined,
+  theirBranch: string | undefined,
+  setIsFileResolutionOptionsMenuOpen: (
+    isFileResolutionOptionsMenuOpen: boolean
+  ) => void
 ) => {
   return () => {
     const absoluteFilePath = join(repository.path, relativeFilePath)
@@ -325,7 +355,7 @@ const makeMarkerConflictDropdownClickHandler = (
       },
       {
         label: RevealInFileManagerLabel,
-        action: () => shell.showItemInFolder(absoluteFilePath),
+        action: () => revealInFileManager(repository, relativeFilePath),
       },
       {
         type: 'separator',
@@ -339,7 +369,10 @@ const makeMarkerConflictDropdownClickHandler = (
         theirBranch
       ),
     ]
-    showContextualMenu(items)
+    setIsFileResolutionOptionsMenuOpen(true)
+    showContextualMenu(items).then(() => {
+      setIsFileResolutionOptionsMenuOpen(false)
+    })
   }
 }
 
@@ -385,45 +418,20 @@ function resolvedFileStatusString(
   if (manualResolution === ManualConflictResolution.theirs) {
     return getUnmergedStatusEntryDescription(status.entry.them, branch)
   }
-  return 'No conflicts remaining'
+  return defaultConflictsResolvedMessage
 }
 
-const renderResolvedFileStatusSummary: React.FunctionComponent<{
-  path: string
-  status: ConflictedFileStatus
-  repository: Repository
-  dispatcher: Dispatcher
-  manualResolution?: ManualConflictResolution
+const getResolvedFileStatusSummary = (
+  status: ConflictedFileStatus,
+  manualResolution?: ManualConflictResolution,
   branch?: string
-}> = props => {
-  if (
-    isConflictWithMarkers(props.status) &&
-    props.status.conflictMarkerCount === 0
-  ) {
-    return <div className="file-conflicts-status">No conflicts remaining</div>
-  }
-
-  const statusString = resolvedFileStatusString(
-    props.status,
-    props.manualResolution,
-    props.branch
-  )
+) => {
+  const noConflictMarkers =
+    isConflictWithMarkers(status) && status.conflictMarkerCount === 0
 
-  return (
-    <div className="file-conflicts-status">
-      {statusString}
-      &nbsp;
-      <LinkButton
-        onClick={makeUndoManualResolutionClickHandler(
-          props.path,
-          props.repository,
-          props.dispatcher
-        )}
-      >
-        Undo
-      </LinkButton>
-    </div>
-  )
+  return noConflictMarkers
+    ? defaultConflictsResolvedMessage
+    : resolvedFileStatusString(status, manualResolution, branch)
 }
 
 /** returns the name of the branch that corresponds to the chosen manual resolution */
diff --git a/app/src/ui/lib/context-menu.ts b/app/src/ui/lib/context-menu.ts
index 6f96ecb139d..7f718dfb86a 100644
--- a/app/src/ui/lib/context-menu.ts
+++ b/app/src/ui/lib/context-menu.ts
@@ -17,6 +17,8 @@ export const DefaultEditorLabel = __DARWIN__
   ? 'Open in External Editor'
   : 'Open in external editor'
 
+export const DefaultShellLabel = __DARWIN__ ? 'Open in Shell' : 'Open in shell'
+
 export const RevealInFileManagerLabel = __DARWIN__
   ? 'Reveal in Finder'
   : __WIN32__
diff --git a/app/src/ui/lib/custom-theme.ts b/app/src/ui/lib/custom-theme.ts
deleted file mode 100644
index e08ea9dd8e4..00000000000
--- a/app/src/ui/lib/custom-theme.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { ApplicationTheme, ICustomTheme } from './application-theme'
-import { lightenDarkenHexColor } from './color-manipulation'
-
-/**
- * An array to hold default custom themes.
- *
- * This currently only has high-contrast, but if we expanded on customizable
- * themes in the future. We could just add to this array for other defaults.
- */
-export const CustomThemeDefaults = {
-  [ApplicationTheme.HighContrast]: {
-    background: '#090c11',
-    border: '#7a828e',
-    text: '#f0f3f6',
-    activeItem: '#9ea7b3',
-    activeText: '#090c11',
-  },
-}
-
-/**
- * This takes a custom theme object and builds a custom theme style sheet base on the class
- * .custom-theme.
- *
- * Currently, our only custom theme is a high-contrast theme, thus there are
- * styles that are specifically added for this purpose such as adding borders
- * or backgrounds to things that didn't have borders in our non-high-contrast
- * themes.
- *
- * @param customTheme - object with custom theme object
- */
-export function buildCustomThemeStyles(customTheme: ICustomTheme): string {
-  const { background, text, activeItem, activeText, border } = customTheme
-  const secondaryActiveColor = lightenDarkenHexColor(activeItem, 20)
-  const secondaryBackgroundColor = lightenDarkenHexColor(background, 20)
-
-  return `body.theme-high-contrast {
-    --hc-background-color: ${background};
-    --hc-secondary-background-color: ${secondaryBackgroundColor};
-    --hc-border-color: ${border};
-    --hc-text-color: ${text};
-    --hc-active-item-color: ${activeItem};
-    --hc-secondary-active-item-color: ${secondaryActiveColor};
-    --hc-active-text-color: ${activeText};
-  }`
-}
diff --git a/app/src/ui/lib/draggable.tsx b/app/src/ui/lib/draggable.tsx
index 30250e3f74e..5dbe91712a3 100644
--- a/app/src/ui/lib/draggable.tsx
+++ b/app/src/ui/lib/draggable.tsx
@@ -51,10 +51,28 @@ export class Draggable extends React.Component<IDraggableProps> {
     this.dragElement = document.getElementById('dragElement')
   }
 
+  /**
+   * A user can drag a commit if they are holding down the left mouse button or
+   * event.button === 0
+   *
+   * Exceptions:
+   *  - macOS allow emulating a right click by holding down the ctrl and left
+   *    mouse button.
+   *  - user can not drag during a shift click
+   *
+   * All other MouseEvent.button values are:
+   * 2: right button/pen barrel button
+   * 1: middle button
+   * X1, X2: mouse back/forward buttons
+   * 5: pen eraser
+   * -1: No button changed
+   *
+   * Ref: https://www.w3.org/TR/pointerevents/#the-button-property
+   *
+   * */
   private canDragCommit(event: React.MouseEvent<HTMLDivElement>): boolean {
-    // right clicks or shift clicks
     const isSpecialClick =
-      event.button === 2 ||
+      event.button !== 0 ||
       (__DARWIN__ && event.button === 0 && event.ctrlKey) ||
       event.shiftKey
 
@@ -174,6 +192,7 @@ export class Draggable extends React.Component<IDraggableProps> {
 
   public render() {
     return (
+      // eslint-disable-next-line jsx-a11y/no-static-element-interactions
       <div className="draggable" onMouseDown={this.onMouseDown}>
         {this.props.children}
       </div>
diff --git a/app/src/ui/lib/enterprise-validate-url.ts b/app/src/ui/lib/enterprise-validate-url.ts
index 5807ac0f25e..222f3b5c4d5 100644
--- a/app/src/ui/lib/enterprise-validate-url.ts
+++ b/app/src/ui/lib/enterprise-validate-url.ts
@@ -1,8 +1,5 @@
 import * as URL from 'url'
 
-/** The protocols over which we can connect to Enterprise instances. */
-const AllowedProtocols = new Set(['https:', 'http:'])
-
 /** The name for errors thrown because of an invalid URL. */
 export const InvalidURLErrorName = 'invalid-url'
 
@@ -38,7 +35,7 @@ export function validateURL(address: string): string {
     throw error
   }
 
-  if (!AllowedProtocols.has(url.protocol)) {
+  if (url.protocol !== 'https:') {
     const error = new Error('Invalid protocol')
     error.name = InvalidProtocolErrorName
     throw error
diff --git a/app/src/ui/lib/errors.tsx b/app/src/ui/lib/errors.tsx
index e0538a0744b..8baa1517c41 100644
--- a/app/src/ui/lib/errors.tsx
+++ b/app/src/ui/lib/errors.tsx
@@ -14,6 +14,10 @@ interface IErrorsProps {
 export class Errors extends React.Component<IErrorsProps, {}> {
   public render() {
     const className = classNames('errors-component', this.props.className)
-    return <div className={className}>{this.props.children}</div>
+    return (
+      <div className={className} role="alert">
+        {this.props.children}
+      </div>
+    )
   }
 }
diff --git a/app/src/ui/lib/expiring-operation-cache.ts b/app/src/ui/lib/expiring-operation-cache.ts
new file mode 100644
index 00000000000..18d66bdcc80
--- /dev/null
+++ b/app/src/ui/lib/expiring-operation-cache.ts
@@ -0,0 +1,112 @@
+const isPending = <T>(item: unknown | Promise<T>): item is Promise<T> =>
+  typeof item === 'object' && item !== null && 'then' in item
+
+/**
+ * An asynchronous operation cache with a configurable expiration time.
+ *
+ * Supports synchronously checking whether the operation result is available.
+ */
+export class ExpiringOperationCache<TKey, T> {
+  private readonly data: Map<
+    string,
+    { item: T; timeoutId?: number } | Promise<T>
+  > = new Map()
+
+  public constructor(
+    /** Function returning a unique string used as the underlying cache key */
+    private readonly keyFunc: (key: TKey) => string,
+    /**
+     * Function returning a promise resolving to the operation result for the
+     * given key
+     **/
+    private readonly valueFunc: (key: TKey) => Promise<T>,
+    /**
+     * Function returning number of milliseconds (or Infinity) to store the
+     * operation result before it expires. Defaults to Infinity.
+     */
+    private readonly expirationFunc: (key: TKey, value: T) => number = () =>
+      Infinity
+  ) {}
+
+  /**
+   * Store the given value in the cache.
+   *
+   * Useful for preloading the cache. Note that this overrides any existing or
+   * pending operation result for the given key.
+   */
+  public set(key: TKey, value: T, expiresIn?: number) {
+    const timeout = expiresIn ?? this.expirationFunc(key, value)
+
+    if (timeout <= 0) {
+      return this.delete(key)
+    }
+
+    const cacheKey = this.keyFunc(key)
+    const item = {
+      item: value,
+      timeoutId: isFinite(timeout)
+        ? window.setTimeout(() => {
+            if (this.data.get(cacheKey) === item) {
+              this.data.delete(cacheKey)
+            }
+          }, timeout)
+        : undefined,
+    }
+
+    this.delete(key)
+    this.data.set(cacheKey, item)
+  }
+
+  /**
+   * Manually expire the operation result for the given key.
+   */
+  public delete(key: TKey) {
+    const cacheKey = this.keyFunc(key)
+    const cached = this.data.get(cacheKey)
+
+    if (cached && !isPending(cached)) {
+      if (cached.timeoutId !== undefined) {
+        window.clearTimeout(cached.timeoutId)
+      }
+    }
+
+    this.data.delete(cacheKey)
+  }
+
+  /**
+   * Attempt to synchronously return the cached operation result
+   */
+  public tryGet(key: TKey): T | undefined {
+    const cached = this.data.get(this.keyFunc(key))
+    return cached && !isPending(cached) ? cached.item : undefined
+  }
+
+  /**
+   * Asynchronously return the cached operation result, or start the operation
+   */
+  public async get(key: TKey): Promise<T> {
+    const cacheKey = this.keyFunc(key)
+    const cached = this.data.get(cacheKey)
+
+    if (cached) {
+      return isPending(cached) ? cached : cached.item
+    }
+
+    const promise = this.valueFunc(key)
+      .then(value => {
+        if (this.data.get(cacheKey) === promise) {
+          this.set(key, value)
+        }
+        return value
+      })
+      .catch(e => {
+        if (this.data.get(cacheKey) === promise) {
+          this.data.delete(cacheKey)
+        }
+        return Promise.reject(e)
+      })
+
+    this.data.set(this.keyFunc(key), promise)
+    return promise
+  }
+}
diff --git a/app/src/ui/lib/fancy-text-box.tsx b/app/src/ui/lib/fancy-text-box.tsx
index 5734f19f0a5..69abeb9e163 100644
--- a/app/src/ui/lib/fancy-text-box.tsx
+++ b/app/src/ui/lib/fancy-text-box.tsx
@@ -1,11 +1,11 @@
 import * as React from 'react'
-import { Octicon, OcticonSymbolType } from '../octicons'
+import { Octicon, OcticonSymbol } from '../octicons'
 import { TextBox, ITextBoxProps } from './text-box'
 import classNames from 'classnames'
 
 interface IFancyTextBoxProps extends ITextBoxProps {
   /** Icon to render */
-  readonly symbol: OcticonSymbolType
+  readonly symbol: OcticonSymbol
 
   /** Callback used to get a reference to internal TextBox */
   readonly onRef: (textbox: TextBox) => void
@@ -38,6 +38,7 @@ export class FancyTextBox extends React.Component<
       <div className={componentCSS}>
         <Octicon className={octiconCSS} symbol={this.props.symbol} />
         <TextBox
+          ariaLabel={this.props.ariaLabel}
           value={this.props.value}
           onFocus={this.onFocus}
           onBlur={this.onBlur}
@@ -45,6 +46,7 @@ export class FancyTextBox extends React.Component<
           disabled={this.props.disabled}
           type={this.props.type}
           placeholder={this.props.placeholder}
+          displayClearButton={this.props.displayClearButton}
           onKeyDown={this.props.onKeyDown}
           onValueChanged={this.props.onValueChanged}
           onSearchCleared={this.props.onSearchCleared}
diff --git a/app/src/ui/lib/filter-list.tsx b/app/src/ui/lib/filter-list.tsx
index 28437bf7056..655785bd730 100644
--- a/app/src/ui/lib/filter-list.tsx
+++ b/app/src/ui/lib/filter-list.tsx
@@ -12,6 +12,7 @@ import { TextBox } from '../lib/text-box'
 import { Row } from '../lib/row'
 
 import { match, IMatch, IMatches } from '../../lib/fuzzy-find'
+import { AriaLiveContainer } from '../accessibility/aria-live-container'
 
 /** An item in the filter list. */
 export interface IFilterListItem {
@@ -59,6 +60,7 @@ interface IFilterListProps<T extends IFilterListItem> {
   readonly rowHeight: number
 
   /** The ordered groups to display in the list. */
+  // eslint-disable-next-line react/no-unused-prop-types
   readonly groups: ReadonlyArray<IFilterListGroup<T>>
 
   /** The selected item. */
@@ -154,11 +156,25 @@ interface IFilterListProps<T extends IFilterListItem> {
 
   /** If true, we do not render the filter. */
   readonly hideFilterRow?: boolean
+
+  /**
+   * A handler called whenever a context menu event is received on the
+   * row container element.
+   *
+   * The context menu is invoked when a user right clicks the row or
+   * uses keyboard shortcut.s
+   */
+  readonly onItemContextMenu?: (
+    item: T,
+    event: React.MouseEvent<HTMLDivElement>
+  ) => void
 }
 
 interface IFilterListState<T extends IFilterListItem> {
   readonly rows: ReadonlyArray<IFilterListRow<T>>
   readonly selectedRow: number
+  readonly filterValue: string
+  readonly filterValueChanged: boolean
 }
 
 /**
@@ -185,17 +201,15 @@ export class FilterList<T extends IFilterListItem> extends React.Component<
   public constructor(props: IFilterListProps<T>) {
     super(props)
 
-    this.state = createStateUpdate(props)
-  }
-
-  public componentWillMount() {
-    if (this.props.filterTextBox !== undefined) {
-      this.filterTextBox = this.props.filterTextBox
+    if (props.filterTextBox !== undefined) {
+      this.filterTextBox = props.filterTextBox
     }
+
+    this.state = createStateUpdate(props, null)
   }
 
   public componentWillReceiveProps(nextProps: IFilterListProps<T>) {
-    this.setState(createStateUpdate(nextProps))
+    this.setState(createStateUpdate(nextProps, this.state))
   }
 
   public componentDidUpdate(
@@ -249,7 +263,7 @@ export class FilterList<T extends IFilterListItem> extends React.Component<
     return (
       <TextBox
         ref={this.onTextBoxRef}
-        type="search"
+        displayClearButton={true}
         autoFocus={true}
         placeholder={this.props.placeholderText || 'Filter'}
         className="filter-list-filter-field"
@@ -262,6 +276,23 @@ export class FilterList<T extends IFilterListItem> extends React.Component<
     )
   }
 
+  public renderLiveContainer() {
+    if (!this.state.filterValueChanged) {
+      return null
+    }
+
+    const itemRows = this.state.rows.filter(row => row.kind === 'item')
+    const resultsPluralized = itemRows.length === 1 ? 'result' : 'results'
+    const screenReaderMessage = `${itemRows.length} ${resultsPluralized}`
+
+    return (
+      <AriaLiveContainer
+        message={screenReaderMessage}
+        trackedUserInput={this.state.filterValue}
+      />
+    )
+  }
+
   public renderFilterRow() {
     if (this.props.hideFilterRow === true) {
       return null
@@ -278,6 +309,8 @@ export class FilterList<T extends IFilterListItem> extends React.Component<
   public render() {
     return (
       <div className={classnames('filter-list', this.props.className)}>
+        {this.renderLiveContainer()}
+
         {this.props.renderPreList ? this.props.renderPreList() : null}
 
         {this.renderFilterRow()}
@@ -338,10 +371,13 @@ export class FilterList<T extends IFilterListItem> extends React.Component<
           rowCount={this.state.rows.length}
           rowRenderer={this.renderRow}
           rowHeight={this.props.rowHeight}
-          selectedRows={[this.state.selectedRow]}
+          selectedRows={
+            this.state.selectedRow === -1 ? [] : [this.state.selectedRow]
+          }
           onSelectedRowChanged={this.onSelectedRowChanged}
           onRowClick={this.onRowClick}
           onRowKeyDown={this.onRowKeyDown}
+          onRowContextMenu={this.onRowContextMenu}
           canSelectRow={this.canSelectRow}
           invalidationProps={{
             ...this.props,
@@ -418,6 +454,23 @@ export class FilterList<T extends IFilterListItem> extends React.Component<
     }
   }
 
+  private onRowContextMenu = (
+    index: number,
+    source: React.MouseEvent<HTMLDivElement>
+  ) => {
+    if (!this.props.onItemContextMenu) {
+      return
+    }
+
+    const row = this.state.rows[index]
+
+    if (row.kind !== 'item') {
+      return
+    }
+
+    this.props.onItemContextMenu(row.item, source)
+  }
+
   private onRowKeyDown = (row: number, event: React.KeyboardEvent<any>) => {
     const list = this.list
     if (!list) {
@@ -535,7 +588,8 @@ export function getText<T extends IFilterListItem>(
 }
 
 function createStateUpdate<T extends IFilterListItem>(
-  props: IFilterListProps<T>
+  props: IFilterListProps<T>,
+  state: IFilterListState<T> | null
 ) {
   const flattenedRows = new Array<IFilterListRow<T>>()
   const filter = (props.filterText || '').toLowerCase()
@@ -576,7 +630,17 @@ function createStateUpdate<T extends IFilterListItem>(
     selectedRow = flattenedRows.findIndex(i => i.kind === 'item')
   }
 
-  return { rows: flattenedRows, selectedRow }
+  // Stay true if already set, otherwise become true if the filter has content
+  const filterValueChanged = state?.filterValueChanged
+    ? true
+    : filter.length > 0
+
+  return {
+    rows: flattenedRows,
+    selectedRow,
+    filterValue: filter,
+    filterValueChanged,
+  }
 }
 
 function getItemFromRowIndex<T extends IFilterListItem>(
diff --git a/app/src/ui/lib/focus-container.tsx b/app/src/ui/lib/focus-container.tsx
index f5379b2969a..13362a4938e 100644
--- a/app/src/ui/lib/focus-container.tsx
+++ b/app/src/ui/lib/focus-container.tsx
@@ -3,6 +3,7 @@ import classNames from 'classnames'
 
 interface IFocusContainerProps {
   readonly className?: string
+  readonly role?: React.HTMLAttributes<HTMLElement>['role']
   readonly onClick?: (event: React.MouseEvent<HTMLDivElement>) => void
   readonly onKeyDown?: (event: React.KeyboardEvent<HTMLDivElement>) => void
 
@@ -100,9 +101,11 @@ export class FocusContainer extends React.Component<
     })
 
     return (
+      // eslint-disable-next-line jsx-a11y/no-static-element-interactions
       <div
         className={className}
         ref={this.onWrapperRef}
+        role={this.props.role}
         onClick={this.onClick}
         onMouseDown={this.onMouseDown}
         onKeyDown={this.onKeyDown}
diff --git a/app/src/ui/lib/git-config-user-form.tsx b/app/src/ui/lib/git-config-user-form.tsx
index ffe50e1ba02..155d18c9b64 100644
--- a/app/src/ui/lib/git-config-user-form.tsx
+++ b/app/src/ui/lib/git-config-user-form.tsx
@@ -18,6 +18,8 @@ interface IGitConfigUserFormProps {
 
   readonly onNameChanged: (name: string) => void
   readonly onEmailChanged: (email: string) => void
+
+  readonly isLoadingGitConfig: boolean
 }
 
 interface IGitConfigUserFormState {
@@ -47,7 +49,10 @@ export class GitConfigUserForm extends React.Component<
     super(props)
 
     this.state = {
-      emailIsOther: !this.accountEmails.includes(this.props.email),
+      emailIsOther:
+        this.accountEmails.length > 0 &&
+        !this.accountEmails.includes(this.props.email) &&
+        !this.props.isLoadingGitConfig,
     }
   }
 
@@ -67,7 +72,10 @@ export class GitConfigUserForm extends React.Component<
     // from the user, to prevent annoying UI glitches.
     if (prevProps.email !== this.props.email && !isEmailInputFocused) {
       this.setState({
-        emailIsOther: !this.accountEmails.includes(this.props.email),
+        emailIsOther:
+          this.accountEmails.length > 0 &&
+          !this.accountEmails.includes(this.props.email) &&
+          !this.props.isLoadingGitConfig,
       })
     }
 
@@ -97,10 +105,12 @@ export class GitConfigUserForm extends React.Component<
         </Row>
         {this.renderEmailDropdown()}
         {this.renderEmailTextBox()}
-        <GitEmailNotFoundWarning
-          accounts={this.accounts}
-          email={this.props.email}
-        />
+        {this.state.emailIsOther ? (
+          <GitEmailNotFoundWarning
+            accounts={this.accounts}
+            email={this.props.email}
+          />
+        ) : null}
       </div>
     )
   }
@@ -160,6 +170,8 @@ export class GitConfigUserForm extends React.Component<
     // presented independently, without the email dropdown, not when presented
     // as a consequence of the option "Other" selected in the dropdown.
     const label = this.state.emailIsOther ? undefined : 'Email'
+    // If there is not a label, provide a screen reader announcement.
+    const ariaLabel = label ? undefined : 'Email'
 
     return (
       <Row>
@@ -170,6 +182,9 @@ export class GitConfigUserForm extends React.Component<
           value={this.props.email}
           disabled={this.props.disabled}
           onValueChanged={this.props.onEmailChanged}
+          ariaLabel={ariaLabel}
+          ariaDescribedBy="git-email-not-found-warning-for-screen-readers"
+          ariaControls="git-email-not-found-warning-for-screen-readers"
         />
       </Row>
     )
diff --git a/app/src/ui/lib/git-email-not-found-warning.tsx b/app/src/ui/lib/git-email-not-found-warning.tsx
index 7a4e17a7e6d..56de1ce113c 100644
--- a/app/src/ui/lib/git-email-not-found-warning.tsx
+++ b/app/src/ui/lib/git-email-not-found-warning.tsx
@@ -3,6 +3,9 @@ import { Account } from '../../models/account'
 import { LinkButton } from './link-button'
 import { getDotComAPIEndpoint } from '../../lib/api'
 import { isAttributableEmailFor } from '../../lib/email'
+import { Octicon } from '../octicons'
+import * as octicons from '../octicons/octicons.generated'
+import { AriaLiveContainer } from '../accessibility/aria-live-container'
 
 interface IGitEmailNotFoundWarningProps {
   /** The account the commit should be attributed to. */
@@ -17,25 +20,69 @@ interface IGitEmailNotFoundWarningProps {
  * email doesn't match any of the emails in their GitHub (Enterprise) account.
  */
 export class GitEmailNotFoundWarning extends React.Component<IGitEmailNotFoundWarningProps> {
+  private buildMessage(isAttributableEmail: boolean) {
+    const indicatorIcon = !isAttributableEmail ? (
+      <span className="warning-icon">⚠️</span>
+    ) : (
+      <span className="green-circle">
+        <Octicon className="check-icon" symbol={octicons.check} />
+      </span>
+    )
+
+    const learnMore = !isAttributableEmail ? (
+      <LinkButton
+        ariaLabel="Learn more about commit attribution"
+        uri="https://docs.github.com/en/github/committing-changes-to-your-project/why-are-my-commits-linked-to-the-wrong-user"
+      >
+        Learn more.
+      </LinkButton>
+    ) : null
+
+    return (
+      <>
+        {indicatorIcon}
+        {this.buildScreenReaderMessage(isAttributableEmail)}
+        {learnMore}
+      </>
+    )
+  }
+
+  private buildScreenReaderMessage(isAttributableEmail: boolean) {
+    const verb = !isAttributableEmail ? 'does not match' : 'matches'
+    const info = !isAttributableEmail
+      ? 'Your commits will be wrongly attributed. '
+      : ''
+    return `This email address ${verb} ${this.getAccountTypeDescription()}. ${info}`
+  }
+
   public render() {
     const { accounts, email } = this.props
 
-    if (
-      accounts.length === 0 ||
-      accounts.some(account => isAttributableEmailFor(account, email))
-    ) {
+    if (accounts.length === 0 || email.trim().length === 0) {
       return null
     }
 
+    const isAttributableEmail = accounts.some(account =>
+      isAttributableEmailFor(account, email)
+    )
+
+    /**
+     * Here we put the message in the top div for visual users immediately  and
+     * in the bottom div for screen readers. The screen reader content is
+     * debounced to avoid frequent updates from typing in the email field.
+     */
     return (
-      <div className="git-email-not-found-warning">
-        <span className="warning-icon">⚠️</span> This email address doesn't
-        match {this.getAccountTypeDescription()}, so your commits will be
-        wrongly attributed.{' '}
-        <LinkButton uri="https://docs.github.com/en/github/committing-changes-to-your-project/why-are-my-commits-linked-to-the-wrong-user">
-          Learn more.
-        </LinkButton>
-      </div>
+      <>
+        <div className="git-email-not-found-warning">
+          {this.buildMessage(isAttributableEmail)}
+        </div>
+
+        <AriaLiveContainer
+          id="git-email-not-found-warning-for-screen-readers"
+          trackedUserInput={this.props.email}
+          message={this.buildScreenReaderMessage(isAttributableEmail)}
+        />
+      </>
     )
   }
 
diff --git a/app/src/ui/lib/horizontal-rule.tsx b/app/src/ui/lib/horizontal-rule.tsx
new file mode 100644
index 00000000000..efe9378b9b8
--- /dev/null
+++ b/app/src/ui/lib/horizontal-rule.tsx
@@ -0,0 +1,10 @@
+import React from 'react'
+
+/** Horizontal rule/separator with optional title. */
+export const HorizontalRule: React.FunctionComponent<{
+  readonly title?: string
+}> = props => (
+  <div className="horizontal-rule">
+    <span className="horizontal-rule-content">{props.title}</span>
+  </div>
+)
diff --git a/app/src/ui/lib/input-description/input-caption.tsx b/app/src/ui/lib/input-description/input-caption.tsx
new file mode 100644
index 00000000000..7b1fd9d77d3
--- /dev/null
+++ b/app/src/ui/lib/input-description/input-caption.tsx
@@ -0,0 +1,24 @@
+import * as React from 'react'
+import {
+  IBaseInputDescriptionProps,
+  InputDescription,
+  InputDescriptionType,
+} from './input-description'
+
+/**
+ * An caption element with app-standard styles for captions to be used with inputs.
+ *
+ * Provide `children` elements to render as the content for the error element.
+ */
+export class Caption extends React.Component<IBaseInputDescriptionProps> {
+  public render() {
+    return (
+      <InputDescription
+        inputDescriptionType={InputDescriptionType.Caption}
+        {...this.props}
+      >
+        {this.props.children}
+      </InputDescription>
+    )
+  }
+}
diff --git a/app/src/ui/lib/input-description/input-description.tsx b/app/src/ui/lib/input-description/input-description.tsx
new file mode 100644
index 00000000000..bf946ea88d1
--- /dev/null
+++ b/app/src/ui/lib/input-description/input-description.tsx
@@ -0,0 +1,145 @@
+import * as React from 'react'
+import { Octicon } from '../../octicons'
+import * as octicons from '../../octicons/octicons.generated'
+import classNames from 'classnames'
+import { AriaLiveContainer } from '../../accessibility/aria-live-container'
+import { assertNever } from '../../../lib/fatal-error'
+
+export enum InputDescriptionType {
+  Caption,
+  Warning,
+  Error,
+}
+
+export interface IBaseInputDescriptionProps {
+  /** The ID for description. This ID needs be linked to the associated input
+   * using the `aria-describedby` attribute for screen reader users. */
+  readonly id: string
+
+  /**
+   * There is a common pattern that we may need to announce a message in
+   * response to user input. Unfortunately, aria-live announcements are
+   * interrupted by continued user input. We can force a rereading of a message
+   * by appending an invisible character when the user finishes their input.
+   *
+   * This prop allows us to pass in when the user input changes. We can append
+   * the invisible character to force the screen reader to read the message
+   * again after each input. To prevent the message from being read too much, we
+   * debounce the message.
+   */
+  readonly trackedUserInput?: string | boolean
+
+  readonly ariaLiveMessage?: string
+
+  readonly className?: string
+}
+
+export interface IInputDescriptionProps extends IBaseInputDescriptionProps {
+  /** Whether the description is a caption, a warning, or an error.
+   *
+   * Captions are styled with a muted color and are used to provide additional information about the input.
+   * Warnings are styled with a orange color with warning icon and are used to communicate that the input is valid but may have unintended consequences.
+   * Errors are styled with a red color with error icon and are used to communicate that the input is invalid.
+   */
+  readonly inputDescriptionType: InputDescriptionType
+}
+
+/**
+ * An Input description element with app-standard styles for captions, warnings,
+ * and errors of inputs.
+ *
+ * Provide `children` elements to render as the content for the error element.
+ */
+export class InputDescription extends React.Component<IInputDescriptionProps> {
+  private getClassName() {
+    const { inputDescriptionType: type } = this.props
+
+    switch (type) {
+      case InputDescriptionType.Caption:
+        return classNames(
+          'input-description',
+          this.props.className,
+          'input-description-caption'
+        )
+      case InputDescriptionType.Warning:
+        return classNames(
+          'input-description',
+          this.props.className,
+          'input-description-warning'
+        )
+      case InputDescriptionType.Error:
+        return classNames(
+          'input-description',
+          this.props.className,
+          'input-description-error'
+        )
+      default:
+        return assertNever(type, `Unknown input type  ${type}`)
+    }
+  }
+
+  private renderIcon() {
+    const { inputDescriptionType: type } = this.props
+
+    switch (type) {
+      case InputDescriptionType.Caption:
+        return null
+      case InputDescriptionType.Warning:
+        return <Octicon symbol={octicons.alert} />
+      case InputDescriptionType.Error:
+        return <Octicon symbol={octicons.stop} />
+      default:
+        return assertNever(type, `Unknown input type  ${type}`)
+    }
+  }
+
+  /** If a input is a warning or an error that is displayed in response to
+   * tracked user input. We want it announced on user input debounce. */
+  private renderAriaLiveContainer() {
+    if (
+      this.props.inputDescriptionType === InputDescriptionType.Caption ||
+      this.props.trackedUserInput === undefined ||
+      this.props.ariaLiveMessage === undefined
+    ) {
+      return null
+    }
+
+    return (
+      <AriaLiveContainer
+        message={this.props.ariaLiveMessage}
+        trackedUserInput={this.props.trackedUserInput}
+      />
+    )
+  }
+
+  /** If the input is an error, and we are not announcing it based on user
+   * input. We should have a role of alert so that it at least announced once.
+   * This may be true if the error is displayed in response to a form submission.
+   * */
+  private getRole() {
+    if (
+      this.props.inputDescriptionType === InputDescriptionType.Error &&
+      this.props.trackedUserInput === undefined
+    ) {
+      return 'alert'
+    }
+
+    return undefined
+  }
+
+  public render() {
+    return (
+      <>
+        <div
+          id={this.props.id}
+          className={this.getClassName()}
+          role={this.getRole()}
+        >
+          {this.renderIcon()}
+          <div className="input-description-content">{this.props.children}</div>
+        </div>
+        {this.renderAriaLiveContainer()}
+      </>
+    )
+  }
+}
diff --git a/app/src/ui/lib/input-description/input-error.tsx b/app/src/ui/lib/input-description/input-error.tsx
new file mode 100644
index 00000000000..4d6300d5c56
--- /dev/null
+++ b/app/src/ui/lib/input-description/input-error.tsx
@@ -0,0 +1,24 @@
+import * as React from 'react'
+import {
+  IBaseInputDescriptionProps,
+  InputDescription,
+  InputDescriptionType,
+} from './input-description'
+
+/**
+ * An Error component with app-standard styles for errors to be used with inputs.
+ *
+ * Provide `children` elements to render as the content for the error element.
+ */
+export class InputError extends React.Component<IBaseInputDescriptionProps> {
+  public render() {
+    return (
+      <InputDescription
+        inputDescriptionType={InputDescriptionType.Error}
+        {...this.props}
+      >
+        {this.props.children}
+      </InputDescription>
+    )
+  }
+}
diff --git a/app/src/ui/lib/input-description/input-warning.tsx b/app/src/ui/lib/input-description/input-warning.tsx
new file mode 100644
index 00000000000..fce3d9da6fb
--- /dev/null
+++ b/app/src/ui/lib/input-description/input-warning.tsx
@@ -0,0 +1,24 @@
+import * as React from 'react'
+import {
+  IBaseInputDescriptionProps,
+  InputDescription,
+  InputDescriptionType,
+} from './input-description'
+
+/**
+ * An Warning component with app-standard styles for warnings to be used with inputs.
+ *
+ * Provide `children` elements to render as the content for the error element.
+ */
+export class InputWarning extends React.Component<IBaseInputDescriptionProps> {
+  public render() {
+    return (
+      <InputDescription
+        inputDescriptionType={InputDescriptionType.Warning}
+        {...this.props}
+      >
+        {this.props.children}
+      </InputDescription>
+    )
+  }
+}
diff --git a/app/src/ui/lib/link-button.tsx b/app/src/ui/lib/link-button.tsx
index 1835a1fa333..f765f8424ad 100644
--- a/app/src/ui/lib/link-button.tsx
+++ b/app/src/ui/lib/link-button.tsx
@@ -11,6 +11,12 @@ interface ILinkButtonProps {
   /** A function to call on click. */
   readonly onClick?: () => void
 
+  /** A function to call when mouse is hovered over */
+  readonly onMouseOver?: () => void
+
+  /** A function to call when mouse is moved off */
+  readonly onMouseOut?: () => void
+
   /** CSS classes attached to the component */
   readonly className?: string
 
@@ -22,6 +28,9 @@ interface ILinkButtonProps {
 
   /** title-text or tooltip for the link */
   readonly title?: string
+
+  /** aria-label for the link */
+  readonly ariaLabel?: string
 }
 
 /**
@@ -38,12 +47,16 @@ export class LinkButton extends React.Component<ILinkButtonProps, {}> {
     const { title } = this.props
 
     return (
+      // eslint-disable-next-line jsx-a11y/mouse-events-have-key-events
       <a
         ref={this.anchorRef}
         className={className}
         href={href}
+        onMouseOver={this.props.onMouseOver}
+        onMouseOut={this.props.onMouseOut}
         onClick={this.onClick}
         tabIndex={this.props.tabIndex}
+        aria-label={this.props.ariaLabel}
       >
         {title && <Tooltip target={this.anchorRef}>{title}</Tooltip>}
         {this.props.children}
diff --git a/app/src/ui/lib/list/list-item-insertion-overlay.tsx b/app/src/ui/lib/list/list-item-insertion-overlay.tsx
index d9aa9f9f7ce..130d3acea80 100644
--- a/app/src/ui/lib/list/list-item-insertion-overlay.tsx
+++ b/app/src/ui/lib/list/list-item-insertion-overlay.tsx
@@ -1,10 +1,12 @@
+/* eslint-disable jsx-a11y/no-static-element-interactions */
 import classNames from 'classnames'
 import { Disposable } from 'event-kit'
 import * as React from 'react'
 import { dragAndDropManager } from '../../../lib/drag-and-drop-manager'
 import { DragData, DragType, DropTargetType } from '../../../models/drag-drop'
+import { RowIndexPath } from './list-row-index-path'
 
-enum InsertionFeedbackType {
+export enum InsertionFeedbackType {
   None,
   Top,
   Bottom,
@@ -12,12 +14,14 @@ enum InsertionFeedbackType {
 
 interface IListItemInsertionOverlayProps {
   readonly onDropDataInsertion?: (
-    insertionIndex: number,
+    insertionIndex: RowIndexPath,
     data: DragData
   ) => void
 
-  readonly itemIndex: number
+  readonly itemIndex: RowIndexPath
   readonly dragType: DragType
+  readonly forcedFeedbackType: InsertionFeedbackType
+  readonly isKeyboardInsertion?: boolean
 }
 
 interface IListItemInsertionOverlayState {
@@ -95,14 +99,25 @@ export class ListItemInsertionOverlay extends React.PureComponent<
     // from them).
     return (
       <div className="list-item-insertion-overlay">
-        {this.state.isDragInProgress && this.renderTopElements()}
+        {this.renderTopElements()}
         {this.props.children}
-        {this.state.isDragInProgress && this.renderBottomElements()}
+        {this.renderBottomElements()}
       </div>
     )
   }
 
   private renderTopElements() {
+    if (this.props.isKeyboardInsertion === true) {
+      return (
+        this.props.forcedFeedbackType === InsertionFeedbackType.Top &&
+        this.renderInsertionIndicator(InsertionFeedbackType.Top)
+      )
+    }
+
+    if (!this.state.isDragInProgress) {
+      return null
+    }
+
     return (
       <>
         <div
@@ -120,6 +135,17 @@ export class ListItemInsertionOverlay extends React.PureComponent<
   }
 
   private renderBottomElements() {
+    if (this.props.isKeyboardInsertion === true) {
+      return (
+        this.props.forcedFeedbackType === InsertionFeedbackType.Bottom &&
+        this.renderInsertionIndicator(InsertionFeedbackType.Bottom)
+      )
+    }
+
+    if (!this.state.isDragInProgress) {
+      return null
+    }
+
     return (
       <>
         {this.state.feedbackType === InsertionFeedbackType.Bottom &&
@@ -187,7 +213,10 @@ export class ListItemInsertionOverlay extends React.PureComponent<
       let index = this.props.itemIndex
 
       if (this.state.feedbackType === InsertionFeedbackType.Bottom) {
-        index++
+        index = {
+          ...index,
+          row: index.row + 1,
+        }
       }
       this.props.onDropDataInsertion(index, dragAndDropManager.dragData)
     }
diff --git a/app/src/ui/lib/list/list-row-index-path.ts b/app/src/ui/lib/list/list-row-index-path.ts
new file mode 100644
index 00000000000..20b40044aeb
--- /dev/null
+++ b/app/src/ui/lib/list/list-row-index-path.ts
@@ -0,0 +1,92 @@
+export type RowIndexPath = {
+  readonly row: number
+  readonly section: number
+}
+
+export const InvalidRowIndexPath: RowIndexPath = { section: -1, row: -1 }
+
+export function rowIndexPathEquals(a: RowIndexPath, b: RowIndexPath): boolean {
+  return a.section === b.section && a.row === b.row
+}
+
+export function getTotalRowCount(rowCount: ReadonlyArray<number>) {
+  return rowCount.reduce((sum, count) => sum + count, 0)
+}
+
+export function rowIndexPathToGlobalIndex(
+  indexPath: RowIndexPath,
+  rowCount: ReadonlyArray<number>
+): number | null {
+  if (!isValidRow(indexPath, rowCount)) {
+    return null
+  }
+
+  let index = 0
+
+  for (let section = 0; section < indexPath.section; section++) {
+    index += rowCount[section]
+  }
+
+  index += indexPath.row
+
+  return index
+}
+
+export function globalIndexToRowIndexPath(
+  index: number,
+  rowCount: ReadonlyArray<number>
+): RowIndexPath | null {
+  if (index < 0 || index >= getTotalRowCount(rowCount)) {
+    return null
+  }
+
+  let section = 0
+  let row = index
+
+  while (row >= rowCount[section]) {
+    row -= rowCount[section]
+    section++
+  }
+
+  return { section, row }
+}
+
+export function isValidRow(
+  indexPath: RowIndexPath,
+  rowCount: ReadonlyArray<number>
+) {
+  return (
+    indexPath.section >= 0 &&
+    indexPath.section < rowCount.length &&
+    indexPath.row >= 0 &&
+    indexPath.row < rowCount[indexPath.section]
+  )
+}
+
+export function getFirstRowIndexPath(
+  rowCount: ReadonlyArray<number>
+): RowIndexPath | null {
+  if (rowCount.length > 0) {
+    for (let section = 0; section < rowCount.length; section++) {
+      if (rowCount[section] > 0) {
+        return { section, row: 0 }
+      }
+    }
+  }
+
+  return null
+}
+
+export function getLastRowIndexPath(
+  rowCount: ReadonlyArray<number>
+): RowIndexPath | null {
+  if (rowCount.length > 0) {
+    for (let section = rowCount.length - 1; section >= 0; section--) {
+      if (rowCount[section] > 0) {
+        return { section, row: rowCount[section] - 1 }
+      }
+    }
+  }
+
+  return null
+}
diff --git a/app/src/ui/lib/list/list-row.tsx b/app/src/ui/lib/list/list-row.tsx
index 56b5112ac69..fbef70275f3 100644
--- a/app/src/ui/lib/list/list-row.tsx
+++ b/app/src/ui/lib/list/list-row.tsx
@@ -1,15 +1,16 @@
 import * as React from 'react'
 import classNames from 'classnames'
+import { RowIndexPath } from './list-row-index-path'
 
 interface IListRowProps {
+  /** whether or not the section to which this row belongs has a header */
+  readonly sectionHasHeader: boolean
+
   /** the total number of row in this list */
   readonly rowCount: number
 
   /** the index of the row in the list */
-  readonly rowIndex: number
-
-  /** the accessibility mode to assign to the row */
-  readonly ariaMode?: 'list' | 'menu'
+  readonly rowIndex: RowIndexPath
 
   /** custom styles to provide to the row */
   readonly style?: React.CSSProperties
@@ -23,23 +24,68 @@ interface IListRowProps {
   /** whether the row should be rendered as selected */
   readonly selected?: boolean
 
-  /** callback to fire when the DOM element is created */
-  readonly onRef?: (element: HTMLDivElement | null) => void
+  /** whether the row should be rendered as selected for keyboard insertion*/
+  readonly selectedForKeyboardInsertion?: boolean
+
+  /** whether the list to which this row belongs is in keyboard insertion mode */
+  readonly inKeyboardInsertionMode: boolean
 
-  /** callback to fire when the row receives a mouseover event */
-  readonly onRowMouseOver: (index: number, e: React.MouseEvent<any>) => void
+  /** callback to fire when the DOM element is created */
+  readonly onRowRef?: (
+    index: RowIndexPath,
+    element: HTMLDivElement | null
+  ) => void
 
   /** callback to fire when the row receives a mousedown event */
-  readonly onRowMouseDown: (index: number, e: React.MouseEvent<any>) => void
+  readonly onRowMouseDown: (
+    index: RowIndexPath,
+    e: React.MouseEvent<any>
+  ) => void
 
   /** callback to fire when the row receives a mouseup event */
-  readonly onRowMouseUp: (index: number, e: React.MouseEvent<any>) => void
+  readonly onRowMouseUp: (index: RowIndexPath, e: React.MouseEvent<any>) => void
 
   /** callback to fire when the row is clicked */
-  readonly onRowClick: (index: number, e: React.MouseEvent<any>) => void
+  readonly onRowClick: (index: RowIndexPath, e: React.MouseEvent<any>) => void
+
+  /** callback to fire when the row is double clicked */
+  readonly onRowDoubleClick: (
+    index: RowIndexPath,
+    e: React.MouseEvent<any>
+  ) => void
 
   /** callback to fire when the row receives a keyboard event */
-  readonly onRowKeyDown: (index: number, e: React.KeyboardEvent<any>) => void
+  readonly onRowKeyDown: (
+    index: RowIndexPath,
+    e: React.KeyboardEvent<any>
+  ) => void
+
+  /** called when the row (or any of its descendants) receives focus due to a
+   * keyboard event
+   */
+  readonly onRowKeyboardFocus?: (
+    index: RowIndexPath,
+    e: React.KeyboardEvent<any>
+  ) => void
+
+  /** called when the row (or any of its descendants) receives focus */
+  readonly onRowFocus?: (
+    index: RowIndexPath,
+    e: React.FocusEvent<HTMLDivElement>
+  ) => void
+
+  /** called when the row (and all of its descendants) loses focus */
+  readonly onRowBlur?: (
+    index: RowIndexPath,
+    e: React.FocusEvent<HTMLDivElement>
+  ) => void
+
+  /** Called back for when the context menu is invoked (user right clicks of
+   * uses keyboard shortcuts) */
+  readonly onContextMenu?: (
+    index: RowIndexPath,
+    e: React.MouseEvent<HTMLDivElement>
+  ) => void
 
   /**
    * Whether or not this list row is going to be selectable either through
@@ -50,11 +96,37 @@ interface IListRowProps {
 
   /** a custom css class to apply to the row */
   readonly className?: string
+
+  /**
+   * aria label value for screen readers
+   *
+   * Note: you may need to apply an aria-hidden attribute to any child text
+   * elements for this to take precedence.
+   */
+  readonly ariaLabel?: string
+
+  /** Optional role setting.
+   *
+   * By default our lists use the `listbox` role paired with list items of role
+   * 'option' because that have selection capability. In that case, a
+   * screenreader will only browse to the selected list option. If the list is
+   * meant to be informational as opposed for selection, we should use `list`
+   * with `listitem` as the role for the items so browse mode can navigate them.
+   */
+  readonly role?: 'option' | 'listitem' | 'presentation'
 }
 
 export class ListRow extends React.Component<IListRowProps, {}> {
-  private onRowMouseOver = (e: React.MouseEvent<HTMLDivElement>) => {
-    this.props.onRowMouseOver(this.props.rowIndex, e)
+  // Since there is no way of knowing when a row has been focused via keyboard
+  // or mouse interaction, we will use the keyDown and keyUp events to track
+  // what the user did to get the row in a focused state.
+  // The heuristic is that we should receive a focus event followed by a keyUp
+  // event, with no keyDown events (since that keyDown event should've happened
+  // in the component that previously had focus).
+  private keyboardFocusDetectionState: 'ready' | 'failed' | 'focused' = 'ready'
+
+  private onRef = (elem: HTMLDivElement | null) => {
+    this.props.onRowRef?.(this.props.rowIndex, elem)
   }
 
   private onRowMouseDown = (e: React.MouseEvent<HTMLDivElement>) => {
@@ -69,20 +141,64 @@ export class ListRow extends React.Component<IListRowProps, {}> {
     this.props.onRowClick(this.props.rowIndex, e)
   }
 
+  private onRowDoubleClick = (e: React.MouseEvent<HTMLDivElement>) => {
+    this.props.onRowDoubleClick(this.props.rowIndex, e)
+  }
+
   private onRowKeyDown = (e: React.KeyboardEvent<HTMLDivElement>) => {
     this.props.onRowKeyDown(this.props.rowIndex, e)
+    this.keyboardFocusDetectionState = 'failed'
+  }
+
+  private onRowKeyUp = (e: React.KeyboardEvent<HTMLDivElement>) => {
+    if (this.keyboardFocusDetectionState === 'focused') {
+      this.props.onRowKeyboardFocus?.(this.props.rowIndex, e)
+    }
+    this.keyboardFocusDetectionState = 'ready'
+  }
+
+  private onFocus = (e: React.FocusEvent<HTMLDivElement>) => {
+    this.props.onRowFocus?.(this.props.rowIndex, e)
+    if (this.keyboardFocusDetectionState === 'ready') {
+      this.keyboardFocusDetectionState = 'focused'
+    }
+  }
+
+  private onBlur = (e: React.FocusEvent<HTMLDivElement>) => {
+    this.keyboardFocusDetectionState = 'ready'
+    this.props.onRowBlur?.(this.props.rowIndex, e)
+  }
+
+  private onContextMenu = (e: React.MouseEvent<HTMLDivElement>) => {
+    this.props.onContextMenu?.(this.props.rowIndex, e)
   }
 
   public render() {
-    const selected = this.props.selected
-    const className = classNames(
+    const {
+      selected,
+      selectedForKeyboardInsertion,
+      selectable,
+      inKeyboardInsertionMode,
+      className,
+      style,
+      rowCount,
+      id,
+      tabIndex,
+      rowIndex,
+      children,
+      sectionHasHeader,
+      role,
+    } = this.props
+    const rowClassName = classNames(
       'list-item',
-      { selected },
-      { 'not-selectable': this.props.selectable === false },
-      this.props.className
+      {
+        selected,
+        'in-keyboard-insertion-mode': inKeyboardInsertionMode,
+        'selected-for-keyboard-insertion': selectedForKeyboardInsertion,
+        'not-selectable': selectable === false,
+      },
+      className
     )
-    const role = this.props.ariaMode === 'menu' ? 'menuitem' : 'option'
-
     // react-virtualized gives us an explicit pixel width for rows, but that
     // width doesn't take into account whether or not the scroll bar needs
     // width too, e.g., on macOS when "Show scroll bars" is set to "Always."
@@ -90,26 +206,58 @@ export class ListRow extends React.Component<IListRowProps, {}> {
     // *But* the parent Grid uses `autoContainerWidth` which means its width
     // *does* reflect any width needed by the scroll bar. So we should just use
     // that width.
-    const style = { ...this.props.style, width: '100%' }
+    const fullWidthStyle = { ...style, width: '100%' }
+
+    let ariaSetSize: number | undefined = rowCount
+    let ariaPosInSet: number | undefined = rowIndex.row + 1
+    if (sectionHasHeader) {
+      if (rowIndex.row === 0) {
+        ariaSetSize = undefined
+        ariaPosInSet = undefined
+      } else {
+        ariaSetSize -= 1
+        ariaPosInSet -= 1
+      }
+    }
 
     return (
       <div
-        id={this.props.id}
-        aria-setsize={this.props.rowCount}
-        aria-posinset={this.props.rowIndex + 1}
-        aria-selected={this.props.selected}
-        role={role}
-        className={className}
-        tabIndex={this.props.tabIndex}
-        ref={this.props.onRef}
-        onMouseOver={this.onRowMouseOver}
+        id={id}
+        role={
+          sectionHasHeader && rowIndex.row === 0
+            ? 'presentation'
+            : role ?? 'option'
+        }
+        aria-setsize={ariaSetSize}
+        aria-posinset={ariaPosInSet}
+        aria-selected={selectable ? selected : undefined}
+        aria-label={this.props.ariaLabel}
+        className={rowClassName}
+        tabIndex={tabIndex}
+        ref={this.onRef}
         onMouseDown={this.onRowMouseDown}
         onMouseUp={this.onRowMouseUp}
         onClick={this.onRowClick}
+        onDoubleClick={this.onRowDoubleClick}
         onKeyDown={this.onRowKeyDown}
-        style={style}
+        onKeyUp={this.onRowKeyUp}
+        style={fullWidthStyle}
+        onFocus={this.onFocus}
+        onBlur={this.onBlur}
+        onContextMenu={this.onContextMenu}
       >
-        {this.props.children}
+        {
+          // HACK: When we have an ariaLabel we need to make sure that the
+          // child elements are not exposed to the screen reader, otherwise
+          // VoiceOver will decide to read the children elements instead of the
+          // ariaLabel.
+          <div
+            className="list-item-content-wrapper"
+            aria-hidden={this.props.ariaLabel !== undefined}
+          >
+            {children}
+          </div>
+        }
       </div>
     )
   }
diff --git a/app/src/ui/lib/list/list.tsx b/app/src/ui/lib/list/list.tsx
index b326473316c..1813151d63b 100644
--- a/app/src/ui/lib/list/list.tsx
+++ b/app/src/ui/lib/list/list.tsx
@@ -15,8 +15,15 @@ import {
 } from './selection'
 import { createUniqueId, releaseUniqueId } from '../../lib/id-pool'
 import { range } from '../../../lib/range'
-import { ListItemInsertionOverlay } from './list-item-insertion-overlay'
+import {
+  InsertionFeedbackType,
+  ListItemInsertionOverlay,
+} from './list-item-insertion-overlay'
 import { DragData, DragType } from '../../../models/drag-drop'
+import memoizeOne from 'memoize-one'
+import { RowIndexPath } from './list-row-index-path'
+import { sendNonFatalException } from '../../../lib/helpers/non-fatal-exception'
+import classNames from 'classnames'
 
 /**
  * Describe the first argument given to the cellRenderer,
@@ -43,6 +50,15 @@ export interface IRowRendererParams {
 
 export type ClickSource = IMouseClickSource | IKeyboardSource
 
+/**
+ * Represents data that can be inserted/reordered via keyboard, as an alternative
+ * method to drag & drop.
+ */
+export type KeyboardInsertionData = {
+  /** Indices in the list of the items being reordered, if any. */
+  readonly itemIndices: ReadonlyArray<number>
+} & DragData
+
 interface IListProps {
   /**
    * Mandatory callback for rendering the contents of a particular
@@ -70,13 +86,43 @@ interface IListProps {
    */
   readonly rowHeight: number | ((info: { index: number }) => number)
 
+  /**
+   * Function that generates an ID for a given row. This will allow the
+   * container component of the list to have control over the ID of the
+   * row and allow it to be used for things like keyboard navigation.
+   */
+  readonly rowId?: (row: number) => string
+
   /**
    * The currently selected rows indexes. Used to attach a special
    * selection class on those row's containers as well as being used
    * for keyboard selection.
+   *
+   * It is expected that the use case for this is setting of the initially
+   * selected rows or clearing a list selection.
+   *
+   * N.B. Since it is used for keyboard selection, changing the ordering of
+   * elements in this array in a parent component may result in unexpected
+   * behaviors when a user modifies their selection via key commands.
+   * See #15536 lessons learned.
    */
   readonly selectedRows: ReadonlyArray<number>
 
+  /** Whether or not to disable focusing on the list with Tab (optional, defaults to false) */
+  readonly shouldDisableTabFocus?: boolean
+
+  /**
+   * Used to attach special classes to specific rows
+   */
+  readonly rowCustomClassNameMap?: Map<string, ReadonlyArray<number>>
+
+  /**
+   * Data to be inserted via keyboard. When this is not undefined, the list enters
+   * into a "keyboard insertion mode". This mode is used as a keyboard-accessible
+   * alternative to drag & drop for certain operations like reordering commits.
+   */
+  readonly keyboardInsertionData?: KeyboardInsertionData
+
   /**
    * This function will be called when a pointer device is pressed and then
    * released on a selectable row. Note that this follows the conventions
@@ -92,6 +138,26 @@ interface IListProps {
    */
   readonly onRowClick?: (row: number, source: ClickSource) => void
 
+  readonly onRowDoubleClick?: (row: number, source: IMouseClickSource) => void
+
+  /** This function will be called when a row obtains focus, no matter how */
+  readonly onRowFocus?: (
+    row: number,
+    event: React.FocusEvent<HTMLDivElement>
+  ) => void
+
+  /** This function will be called only when a row obtains focus via keyboard */
+  readonly onRowKeyboardFocus?: (
+    row: number,
+    e: React.KeyboardEvent<any>
+  ) => void
+
+  /** This function will be called when a row loses focus */
+  readonly onRowBlur?: (
+    row: number,
+    event: React.FocusEvent<HTMLDivElement>
+  ) => void
+
   /**
    * This prop defines the behaviour of the selection of items within this list.
    *  - 'single' : (default) single list-item selection. [shift] and [ctrl] have
@@ -116,8 +182,7 @@ interface IListProps {
    *
    * @param row    - The index of the row that was just selected
    * @param source - The kind of user action that provoked the change, either
-   *                 a pointer device press, hover (if selectOnHover is set) or
-   *                 a keyboard event (arrow up/down)
+   *                 a pointer device press or a keyboard event (arrow up/down)
    */
   readonly onSelectedRowChanged?: (row: number, source: SelectionSource) => void
 
@@ -131,8 +196,7 @@ interface IListProps {
    * @param start  - The index of the first selected row
    * @param end    - The index of the last selected row
    * @param source - The kind of user action that provoked the change, either
-   *                 a pointer device press, hover (if selectOnHover is set) or
-   *                 a keyboard event (arrow up/down)
+   *                 a pointer device press or a keyboard event (arrow up/down)
    */
   readonly onSelectedRangeChanged?: (
     start: number,
@@ -148,8 +212,7 @@ interface IListProps {
    *
    * @param rows   - The indexes of the row(s) that are part of the selection
    * @param source - The kind of user action that provoked the change, either
-   *                 a pointer device press, hover (if selectOnHover is set) or
-   *                 a keyboard event (arrow up/down)
+   *                 a pointer device press or a keyboard event (arrow up/down)
    */
   readonly onSelectionChanged?: (
     rows: ReadonlyArray<number>,
@@ -175,6 +238,18 @@ interface IListProps {
    */
   readonly onRowMouseDown?: (row: number, event: React.MouseEvent<any>) => void
 
+  /**
+   * A handler called whenever a context menu event is received on the
+   * row container element.
+   *
+   * The context menu is invoked when a user right clicks the row or
+   * uses keyboard shortcut.
+   */
+  readonly onRowContextMenu?: (
+    row: number,
+    event: React.MouseEvent<HTMLDivElement>
+  ) => void
+
   /**
    * A handler called whenever the user drops items on the list to be inserted.
    *
@@ -202,29 +277,70 @@ interface IListProps {
   /** The unique identifier for the outer element of the component (optional, defaults to null) */
   readonly id?: string
 
+  /** The unique identifier of the accessible list component (optional) */
+  readonly accessibleListId?: string
+
   /** The row that should be scrolled to when the list is rendered. */
   readonly scrollToRow?: number
 
-  /** Whether or not selection should follow pointer device */
-  readonly selectOnHover?: boolean
-
   /** Type of elements that can be inserted in the list via drag & drop. Optional. */
   readonly insertionDragType?: DragType
 
   /**
-   * Whether or not to explicitly move focus to a row if it was selected
-   * by hovering (has no effect if selectOnHover is not set). Defaults to
-   * true if not defined.
+   * The number of pixels from the top of the list indicating
+   * where to scroll do on rendering of the list.
+   */
+  readonly setScrollTop?: number
+
+  /** The aria-labelledby attribute for the list component. */
+  readonly ariaLabelledBy?: string
+
+  /** The aria-label attribute for the list component. */
+  readonly ariaLabel?: string
+
+  /** Optional role setting.
+   *
+   * By default our lists use the `listbox` role paired with list items of role
+   * 'option' because that have selection capability. In that case, a
+   * screenreader will only browse to the selected list option. If the list is
+   * meant to be a read only list, we should use `list` with `listitem` as the
+   * role for the items so browse mode can navigate them.
    */
-  readonly focusOnHover?: boolean
+  readonly role?: 'listbox' | 'list'
 
-  readonly ariaMode?: 'list' | 'menu'
+  /**
+   * Optional callback for providing an aria label for screen readers for each
+   * row.
+   *
+   * Note: you may need to apply an aria-hidden attribute to any child text
+   * elements for this to take precedence.
+   */
+  readonly getRowAriaLabel?: (row: number) => string | undefined
 
   /**
-   * The number of pixels from the top of the list indicating
-   * where to scroll do on rendering of the list.
+   * Renderer of the floating element that will be shown right next to the list
+   * and that represents the element being inserted/reordered.
    */
-  readonly setScrollTop?: number
+  readonly keyboardInsertionElementRenderer?: (
+    data: KeyboardInsertionData
+  ) => JSX.Element | null
+
+  /**
+   * Callback to fire when the index path of the position to insert items via
+   * keyboard changes.
+   */
+  readonly onKeyboardInsertionIndexPathChanged?: (
+    indexPath: RowIndexPath
+  ) => void
+
+  /** Callback to fire when keyboard-based insertion is cancelled. */
+  readonly onCancelKeyboardInsertion?: () => void
+
+  /** Callback to fire when keyboard-based insertion is confirmed. */
+  readonly onConfirmKeyboardInsertion?: (
+    indexPath: RowIndexPath,
+    data: KeyboardInsertionData
+  ) => void
 }
 
 interface IListState {
@@ -235,6 +351,11 @@ interface IListState {
   readonly width?: number
 
   readonly rowIdPrefix?: string
+
+  /**
+   * The index path of the position where user wants to insert items via keyboard.
+   */
+  readonly keyboardInsertionIndexPath: RowIndexPath | null
 }
 
 /**
@@ -256,6 +377,11 @@ export class List extends React.Component<IListProps, IListState> {
   private fakeScroll: HTMLDivElement | null = null
   private focusRow = -1
 
+  private readonly rowRefs = new Map<number, HTMLDivElement>()
+
+  private readonly keyboardInsertionElementRef =
+    React.createRef<HTMLDivElement>()
+
   /**
    * The style prop for our child Grid. We keep this here in order
    * to not create a new object on each render and thus forcing
@@ -278,10 +404,31 @@ export class List extends React.Component<IListProps, IListState> {
   private readonly resizeObserver: ResizeObserver | null = null
   private updateSizeTimeoutId: NodeJS.Immediate | null = null
 
+  /**
+   * Get the props for the inner scroll container (called containerProps on the
+   * Grid component). This is memoized to avoid causing the Grid component to
+   * rerender every time the list component rerenders (the Grid component is a
+   * pure component so a complex object like containerProps being instantiated
+   * on each render would cause it to rerender constantly).
+   */
+  private getContainerProps = memoizeOne(
+    (
+      activeDescendant: string | undefined
+    ): React.HTMLProps<HTMLDivElement> => ({
+      onKeyDown: this.onKeyDown,
+      'aria-activedescendant': activeDescendant,
+      'aria-multiselectable':
+        this.props.selectionMode === 'multi' ||
+        this.props.selectionMode === 'range'
+          ? 'true'
+          : undefined,
+    })
+  )
+
   public constructor(props: IListProps) {
     super(props)
 
-    this.state = {}
+    this.state = { keyboardInsertionIndexPath: null }
 
     const ResizeObserverClass: typeof ResizeObserver = (window as any)
       .ResizeObserver
@@ -308,6 +455,16 @@ export class List extends React.Component<IListProps, IListState> {
     }
   }
 
+  private getRowId(row: number): string | undefined {
+    if (this.props.rowId) {
+      return this.props.rowId(row)
+    }
+
+    return this.state.rowIdPrefix === undefined
+      ? undefined
+      : `${this.state.rowIdPrefix}-${row}`
+  }
+
   private onResized = (target: HTMLElement, contentRect: ClientRect) => {
     this.updateSizeTimeoutId = null
 
@@ -396,6 +553,59 @@ export class List extends React.Component<IListProps, IListState> {
       ? event.metaKey && event.key === 'ArrowDown'
       : event.key === 'End'
 
+    const { keyboardInsertionData } = this.props
+
+    if (keyboardInsertionData !== undefined) {
+      if (event.key === 'Escape') {
+        this.props.onCancelKeyboardInsertion?.()
+        event.preventDefault()
+        return
+      }
+
+      const { keyboardInsertionIndexPath } = this.state
+      if (event.key === 'Enter' && keyboardInsertionIndexPath) {
+        this.props.onConfirmKeyboardInsertion?.(
+          keyboardInsertionIndexPath,
+          keyboardInsertionData
+        )
+        event.preventDefault()
+        return
+      }
+
+      const { rowCount } = this.props
+      let row = -1
+
+      if (isHomeKey) {
+        row = 0
+      } else if (isEndKey) {
+        // There is no -1 here because you can insert _after_ the last row
+        row = rowCount
+      } else if (keyboardInsertionIndexPath) {
+        if (event.key === 'ArrowUp') {
+          row = Math.max(keyboardInsertionIndexPath.row - 1, 0)
+        } else if (event.key === 'ArrowDown') {
+          row = Math.min(
+            keyboardInsertionIndexPath.row + 1,
+            // There is no -1 here because you can insert _after_ the last row
+            rowCount
+          )
+        } else {
+          return
+        }
+      } else {
+        return
+      }
+
+      const indexPath: RowIndexPath = { section: 0, row }
+      this.setState({ keyboardInsertionIndexPath: indexPath })
+      this.props.onKeyboardInsertionIndexPathChanged?.(indexPath)
+
+      this.moveSelectionTo(Math.min(row, rowCount - 1), source)
+
+      event.preventDefault()
+      return
+    }
+
     const isRangeSelection =
       event.shiftKey &&
       this.props.selectionMode !== undefined &&
@@ -435,6 +645,10 @@ export class List extends React.Component<IListProps, IListState> {
     }
   }
 
+  private get inKeyboardInsertionMode() {
+    return this.props.keyboardInsertionData !== undefined
+  }
+
   private moveSelectionByPage(
     direction: SelectionDirection,
     source: SelectionSource
@@ -517,18 +731,26 @@ export class List extends React.Component<IListProps, IListState> {
   }
 
   private onRowKeyDown = (
-    rowIndex: number,
+    indexPath: RowIndexPath,
     event: React.KeyboardEvent<any>
   ) => {
+    if (this.inKeyboardInsertionMode) {
+      return
+    }
+
     if (this.props.onRowKeyDown) {
-      this.props.onRowKeyDown(rowIndex, event)
+      this.props.onRowKeyDown(indexPath.row, event)
     }
 
+    const hasModifier =
+      event.altKey || event.ctrlKey || event.metaKey || event.shiftKey
+
     // We give consumers the power to prevent the onRowClick event by subscribing
     // to the onRowKeyDown event and calling event.preventDefault. This lets
     // consumers add their own semantics for keyboard presses.
     if (
       !event.defaultPrevented &&
+      !hasModifier &&
       (event.key === 'Enter' || event.key === ' ')
     ) {
       this.toggleSelection(event)
@@ -537,8 +759,16 @@ export class List extends React.Component<IListProps, IListState> {
   }
 
   private onFocusContainerKeyDown = (event: React.KeyboardEvent<any>) => {
+    if (this.inKeyboardInsertionMode) {
+      return
+    }
+
+    const hasModifier =
+      event.altKey || event.ctrlKey || event.metaKey || event.shiftKey
+
     if (
       !event.defaultPrevented &&
+      !hasModifier &&
       (event.key === 'Enter' || event.key === ' ')
     ) {
       this.toggleSelection(event)
@@ -546,6 +776,26 @@ export class List extends React.Component<IListProps, IListState> {
     }
   }
 
+  private onFocusWithinChanged = (focusWithin: boolean) => {
+    // So the grid lost focus (we manually focus the grid if the focused list
+    // item is unmounted) so we mustn't attempt to refocus the previously
+    // focused list item if it scrolls back into view.
+    if (!focusWithin) {
+      this.focusRow = -1
+
+      // If we're in keyboard insertion mode, we need to cancel it
+      // when the list loses focus.
+      if (this.inKeyboardInsertionMode) {
+        this.props.onCancelKeyboardInsertion?.()
+      }
+    } else if (this.props.selectedRows.length === 0) {
+      const firstSelectableRowIndexPath = this.getFirstSelectableRowIndexPath()
+      if (firstSelectableRowIndexPath !== null) {
+        this.moveSelectionTo(firstSelectableRowIndexPath, { kind: 'focus' })
+      }
+    }
+  }
+
   private toggleSelection = (event: React.KeyboardEvent<any>) => {
     this.props.selectedRows.forEach(row => {
       if (!this.props.onRowClick) {
@@ -565,21 +815,37 @@ export class List extends React.Component<IListProps, IListState> {
     })
   }
 
-  private onRowMouseOver = (row: number, event: React.MouseEvent<any>) => {
-    if (this.props.selectOnHover && this.canSelectRow(row)) {
-      if (
-        this.props.selectedRows.includes(row) &&
-        this.props.onSelectionChanged
-      ) {
-        this.props.onSelectionChanged([row], { kind: 'hover', event })
-        // By calling scrollRowToVisible we ensure that hovering over a partially
-        // visible item at the top or bottom of the list scrolls it into view but
-        // more importantly `scrollRowToVisible` automatically manages focus so
-        // using it here allows us to piggy-back on its focus-preserving magic
-        // even though we could theoretically live without scrolling
-        this.scrollRowToVisible(row)
-      }
+  private onRowFocus = (
+    indexPath: RowIndexPath,
+    e: React.FocusEvent<HTMLDivElement>
+  ) => {
+    this.focusRow = indexPath.row
+    this.props.onRowFocus?.(indexPath.row, e)
+  }
+
+  private onRowKeyboardFocus = (
+    indexPath: RowIndexPath,
+    e: React.KeyboardEvent<HTMLDivElement>
+  ) => {
+    this.focusRow = indexPath.row
+    this.props.onRowKeyboardFocus?.(indexPath.row, e)
+  }
+
+  private onRowBlur = (
+    indexPath: RowIndexPath,
+    e: React.FocusEvent<HTMLDivElement>
+  ) => {
+    if (this.focusRow === indexPath.row) {
+      this.focusRow = -1
     }
+    this.props.onRowBlur?.(indexPath.row, e)
+  }
+
+  private onRowContextMenu = (
+    indexPath: RowIndexPath,
+    e: React.MouseEvent<HTMLDivElement>
+  ) => {
+    this.props.onRowContextMenu?.(indexPath.row, e)
   }
 
   /** Convenience method for invoking canSelectRow callback when it exists */
@@ -587,6 +853,16 @@ export class List extends React.Component<IListProps, IListState> {
     return this.props.canSelectRow ? this.props.canSelectRow(rowIndex) : true
   }
 
+  private getFirstSelectableRowIndexPath(): number | null {
+    for (let i = 0; i < this.props.rowCount; i++) {
+      if (this.canSelectRow(i)) {
+        return i
+      }
+    }
+
+    return null
+  }
+
   private addSelection(direction: SelectionDirection, source: SelectionSource) {
     if (this.props.selectedRows.length === 0) {
       return this.moveSelection(direction, source)
@@ -679,11 +955,11 @@ export class List extends React.Component<IListProps, IListState> {
   }
 
   private moveSelectionTo(row: number, source: SelectionSource) {
-    if (this.props.onSelectionChanged) {
+    if (this.props.onSelectionChanged && !this.inKeyboardInsertionMode) {
       this.props.onSelectionChanged([row], source)
     }
 
-    if (this.props.onSelectedRowChanged) {
+    if (this.props.onSelectedRowChanged && !this.inKeyboardInsertionMode) {
       const rowCount = this.props.rowCount
 
       if (row < 0 || row >= rowCount) {
@@ -699,10 +975,14 @@ export class List extends React.Component<IListProps, IListState> {
     this.scrollRowToVisible(row)
   }
 
-  private scrollRowToVisible(row: number) {
+  private scrollRowToVisible(row: number, moveFocus = true) {
     if (this.grid !== null) {
       this.grid.scrollToCell({ rowIndex: row, columnIndex: 0 })
-      this.focusRow = row
+
+      if (moveFocus) {
+        this.focusRow = row
+        this.rowRefs.get(row)?.focus({ preventScroll: true })
+      }
     }
   }
 
@@ -727,7 +1007,7 @@ export class List extends React.Component<IListProps, IListState> {
     if (scrollToRow !== undefined && prevProps.scrollToRow !== scrollToRow) {
       // Prefer scrollTop position over scrollToRow
       if (setScrollTop === undefined) {
-        this.scrollRowToVisible(scrollToRow)
+        this.scrollRowToVisible(scrollToRow, false)
       }
     }
 
@@ -762,6 +1042,28 @@ export class List extends React.Component<IListProps, IListState> {
         }
       }
     }
+
+    // When the list enters into "keyboard insertion mode", set an initial
+    // insertion index path using either the first selected row or the first
+    // row of the list.
+    if (
+      prevProps.keyboardInsertionData === undefined &&
+      this.props.keyboardInsertionData !== undefined
+    ) {
+      this.setState({
+        keyboardInsertionIndexPath:
+          this.props.selectedRows.length > 0
+            ? { section: 0, row: this.props.selectedRows[0] }
+            : { section: 0, row: 0 },
+      })
+    }
+
+    if (
+      prevState.keyboardInsertionIndexPath !==
+      this.state.keyboardInsertionIndexPath
+    ) {
+      this.updateKeyboardInsertionElementPosition()
+    }
   }
 
   public componentWillMount() {
@@ -783,73 +1085,142 @@ export class List extends React.Component<IListProps, IListState> {
     }
   }
 
-  private onFocusedItemRef = (element: HTMLDivElement | null) => {
-    if (this.props.focusOnHover !== false && element !== null) {
-      element.focus()
+  private onRowRef = (
+    indexPath: RowIndexPath,
+    element: HTMLDivElement | null
+  ) => {
+    if (element === null) {
+      this.rowRefs.delete(indexPath.row)
+    } else {
+      this.rowRefs.set(indexPath.row, element)
     }
 
-    this.focusRow = -1
+    if (indexPath.row === this.focusRow) {
+      // The currently focused row is going being unmounted so we'll move focus
+      // programmatically to the grid so that keyboard navigation still works
+      if (element === null) {
+        const grid = ReactDOM.findDOMNode(this.grid)
+        if (grid instanceof HTMLElement) {
+          grid.focus({ preventScroll: true })
+        }
+      } else {
+        // A previously focused row is being mounted again, we'll move focus
+        // back to it
+        element.focus({ preventScroll: true })
+      }
+    }
   }
 
-  private renderRow = (params: IRowRendererParams) => {
-    const rowIndex = params.rowIndex
-    const selectable = this.canSelectRow(rowIndex)
-    const selected = this.props.selectedRows.indexOf(rowIndex) !== -1
-    const focused = rowIndex === this.focusRow
-
-    // An unselectable row shouldn't be focusable
-    let tabIndex: number | undefined = undefined
-    if (selectable) {
-      tabIndex = selected && this.props.selectedRows[0] === rowIndex ? 0 : -1
+  private getCustomRowClassNames = (rowIndex: number) => {
+    const { rowCustomClassNameMap } = this.props
+    if (rowCustomClassNameMap === undefined) {
+      return undefined
     }
 
-    // We only need to keep a reference to the focused element
-    const ref = focused ? this.onFocusedItemRef : undefined
+    const customClasses = new Array<string>()
+    rowCustomClassNameMap.forEach(
+      (rows: ReadonlyArray<number>, className: string) => {
+        if (rows.includes(rowIndex)) {
+          customClasses.push(className)
+        }
+      }
+    )
 
-    const row = this.props.rowRenderer(rowIndex)
+    return customClasses.length === 0 ? undefined : customClasses.join(' ')
+  }
 
-    const element =
-      this.props.insertionDragType !== undefined ? (
-        <ListItemInsertionOverlay
-          onDropDataInsertion={this.props.onDropDataInsertion}
-          itemIndex={rowIndex}
-          dragType={this.props.insertionDragType}
-        >
-          {row}
-        </ListItemInsertionOverlay>
-      ) : (
-        row
-      )
+  private getRowRenderer = (firstSelectableRowIndex: number | null) => {
+    return (params: IRowRendererParams) => {
+      const { selectedRows, keyboardInsertionData, shouldDisableTabFocus } =
+        this.props
+      const { keyboardInsertionIndexPath } = this.state
+      const rowIndex = params.rowIndex
+      const selectable = this.canSelectRow(rowIndex)
+      const selected = selectedRows.indexOf(rowIndex) !== -1
+      const customClasses = this.getCustomRowClassNames(rowIndex)
+
+      // An unselectable row shouldn't be focusable
+      let tabIndex: number | undefined = undefined
+      if (shouldDisableTabFocus === true) {
+        tabIndex = -1
+      } else if (selectable) {
+        tabIndex =
+          (selected && selectedRows[0] === rowIndex) ||
+          (selectedRows.length === 0 && firstSelectableRowIndex === rowIndex)
+            ? 0
+            : -1
+      }
 
-    const id = this.state.rowIdPrefix
-      ? `${this.state.rowIdPrefix}-${rowIndex}`
-      : undefined
+      const row = this.props.rowRenderer(rowIndex)
+      let forcedFeedbackType = InsertionFeedbackType.None
 
-    return (
-      <ListRow
-        key={params.key}
-        id={id}
-        onRef={ref}
-        rowCount={this.props.rowCount}
-        rowIndex={rowIndex}
-        selected={selected}
-        ariaMode={this.props.ariaMode}
-        onRowClick={this.onRowClick}
-        onRowKeyDown={this.onRowKeyDown}
-        onRowMouseDown={this.onRowMouseDown}
-        onRowMouseUp={this.onRowMouseUp}
-        onRowMouseOver={this.onRowMouseOver}
-        style={params.style}
-        tabIndex={tabIndex}
-        children={element}
-        selectable={selectable}
-      />
-    )
+      if (keyboardInsertionData && keyboardInsertionIndexPath) {
+        if (keyboardInsertionIndexPath.row === rowIndex) {
+          forcedFeedbackType = InsertionFeedbackType.Top
+        } else if (keyboardInsertionIndexPath.row === rowIndex + 1) {
+          forcedFeedbackType = InsertionFeedbackType.Bottom
+        }
+      }
+
+      const element =
+        this.props.insertionDragType !== undefined ? (
+          <ListItemInsertionOverlay
+            isKeyboardInsertion={this.inKeyboardInsertionMode}
+            onDropDataInsertion={this.onDropDataInsertion}
+            itemIndex={{ section: 0, row: rowIndex }}
+            dragType={this.props.insertionDragType}
+            forcedFeedbackType={forcedFeedbackType}
+          >
+            {row}
+          </ListItemInsertionOverlay>
+        ) : (
+          row
+        )
+
+      const id = this.getRowId(rowIndex)
+
+      const ariaLabel =
+        this.props.getRowAriaLabel !== undefined
+          ? this.props.getRowAriaLabel(rowIndex)
+          : undefined
+
+      return (
+        <ListRow
+          key={params.key}
+          id={id}
+          role={this.props.role === 'list' ? 'listitem' : undefined}
+          onRowRef={this.onRowRef}
+          rowCount={this.props.rowCount}
+          rowIndex={{ section: 0, row: rowIndex }}
+          sectionHasHeader={false}
+          selected={selected}
+          selectedForKeyboardInsertion={
+            keyboardInsertionData !== undefined &&
+            keyboardInsertionData.itemIndices.includes(rowIndex)
+          }
+          inKeyboardInsertionMode={this.inKeyboardInsertionMode}
+          ariaLabel={ariaLabel}
+          onRowClick={this.onRowClick}
+          onRowDoubleClick={this.onRowDoubleClick}
+          onRowKeyDown={this.onRowKeyDown}
+          onRowMouseDown={this.onRowMouseDown}
+          onRowMouseUp={this.onRowMouseUp}
+          onRowFocus={this.onRowFocus}
+          onRowKeyboardFocus={this.onRowKeyboardFocus}
+          onRowBlur={this.onRowBlur}
+          onContextMenu={this.onRowContextMenu}
+          style={params.style}
+          tabIndex={tabIndex}
+          children={element}
+          selectable={selectable}
+          className={customClasses}
+        />
+      )
+    }
   }
 
   public render() {
     let content: JSX.Element[] | JSX.Element | null
-
     if (this.resizeObserver) {
       content = this.renderContents(
         this.state.width ?? 0,
@@ -866,37 +1237,83 @@ export class List extends React.Component<IListProps, IListState> {
       )
     }
 
-    // we select the last item from the selection array for this prop
-    const activeDescendant =
-      this.props.selectedRows.length && this.state.rowIdPrefix
-        ? `${this.state.rowIdPrefix}-${
-            this.props.selectedRows[this.props.selectedRows.length - 1]
-          }`
-        : undefined
-
-    const role = this.props.ariaMode === 'menu' ? 'menu' : 'listbox'
-
     return (
-      <div
-        ref={this.onRef}
-        id={this.props.id}
-        className="list"
-        onKeyDown={this.onKeyDown}
-        role={role}
-        aria-activedescendant={activeDescendant}
-      >
+      <div ref={this.onRef} id={this.props.id} className="list">
         {content}
+        {this.renderKeyboardInsertionElement()}
       </div>
     )
   }
 
+  private renderKeyboardInsertionElement = () => {
+    const { keyboardInsertionData, keyboardInsertionElementRenderer } =
+      this.props
+    const { keyboardInsertionIndexPath } = this.state
+
+    if (!keyboardInsertionData || !keyboardInsertionIndexPath) {
+      return null
+    }
+
+    if (!this.list) {
+      return
+    }
+
+    const listRect = this.list.getBoundingClientRect()
+
+    type U = number | string
+    const renderOverlay = (top: U, left: U, width: U, height: U) => (
+      <div style={{ top, left, width, height }} className="overlay" />
+    )
+
+    return (
+      <>
+        {renderOverlay(0, 0, '100%', listRect.top)}
+        {renderOverlay(listRect.top, 0, listRect.left, listRect.height)}
+        {renderOverlay(listRect.top, listRect.right, '100%', listRect.height)}
+        {renderOverlay(listRect.bottom, 0, '100%', '100%')}
+        <div
+          className="keyboard-insertion-element"
+          style={{ top: 0, left: 0 }}
+          ref={this.keyboardInsertionElementRef}
+        >
+          {keyboardInsertionElementRenderer?.(keyboardInsertionData)}
+        </div>
+      </>
+    )
+  }
+
+  private updateKeyboardInsertionElementPosition = () => {
+    const { keyboardInsertionData } = this.props
+    const { keyboardInsertionIndexPath } = this.state
+    const element = this.keyboardInsertionElementRef.current
+
+    if (!keyboardInsertionData || !keyboardInsertionIndexPath || !element) {
+      return
+    }
+
+    const rowElement = this.rowRefs.get(keyboardInsertionIndexPath.row)
+
+    if (!rowElement || !this.list) {
+      return
+    }
+
+    const rowRect = rowElement.getBoundingClientRect()
+    const listRect = this.list.getBoundingClientRect()
+
+    const top = Math.min(
+      Math.max(listRect.top, rowRect.top),
+      listRect.top + listRect.height - element.clientHeight
+    )
+    element.style.top = `${top}px`
+    element.style.left = `${rowRect.right + 20}px`
+  }
+
   /**
    * Renders the react-virtualized Grid component and optionally
    * a fake scroll bar component if running on Windows.
    *
    * @param width - The width of the Grid as given by AutoSizer
    * @param height - The height of the Grid as given by AutoSizer
-   *
    */
   private renderContents(width: number, height: number) {
     if (__WIN32__) {
@@ -926,30 +1343,69 @@ export class List extends React.Component<IListProps, IListState> {
    * @param height - The height of the Grid as given by AutoSizer
    */
   private renderGrid(width: number, height: number) {
-    // The currently selected list item is focusable but if
-    // there's no focused item (and there's items to switch between)
-    // the list itself needs to be focusable so that you can reach
-    // it with keyboard navigation and select an item.
+    // It is possible to send an invalid array such as [-1] to this component,
+    // if you do, you get weird focus problems. We shouldn't be doing this.. but
+    // if we do, send a non fatal exception to tell us about it.
+    if (this.props.selectedRows[0] < 0) {
+      sendNonFatalException(
+        'invalidListSelection',
+        new Error(
+          `Invalid selected rows that contained a negative number passed to List component. This will cause keyboard navigation and focus problems.`
+        )
+      )
+    }
+
+    // The currently selected list item is focusable but if there's no focused
+    // item the list itself needs to be focusable so that you can reach it with
+    // keyboard navigation and select an item.
     const tabIndex =
-      this.props.selectedRows.length < 1 && this.props.rowCount > 0 ? 0 : -1
+      this.props.shouldDisableTabFocus === true
+        ? -1
+        : this.props.selectedRows.length < 1
+        ? 0
+        : -1
+
+    // we select the last item from the selection array for this prop
+    const activeDescendant =
+      this.props.selectedRows.length && this.state.rowIdPrefix
+        ? this.getRowId(
+            this.props.selectedRows[this.props.selectedRows.length - 1]
+          )
+        : undefined
+
+    const containerProps = this.getContainerProps(activeDescendant)
+
+    const className = classNames('list-focus-container', {
+      'in-keyboard-insertion-mode': this.inKeyboardInsertionMode,
+    })
 
     return (
       <FocusContainer
-        className="list-focus-container"
+        className={className}
         onKeyDown={this.onFocusContainerKeyDown}
+        onFocusWithinChanged={this.onFocusWithinChanged}
       >
         <Grid
-          aria-label={''}
-          role={''}
+          id={this.props.accessibleListId}
+          aria-labelledby={this.props.ariaLabelledBy}
+          aria-label={this.props.ariaLabel}
+          role={this.props.role ?? 'listbox'}
           ref={this.onGridRef}
           autoContainerWidth={true}
+          containerRole="presentation"
+          containerProps={containerProps}
           width={width}
           height={height}
           columnWidth={width}
           columnCount={1}
+          aria-multiselectable={
+            this.props.selectionMode !== 'single' ? true : undefined
+          }
           rowCount={this.props.rowCount}
           rowHeight={this.props.rowHeight}
-          cellRenderer={this.renderRow}
+          cellRenderer={this.getRowRenderer(
+            this.getFirstSelectableRowIndexPath()
+          )}
           onScroll={this.onScroll}
           scrollTop={this.props.setScrollTop}
           overscanRowCount={4}
@@ -972,7 +1428,6 @@ export class List extends React.Component<IListProps, IListState> {
    * and accurately positions the fake scroll bar.
    *
    * @param height The height of the Grid as given by AutoSizer
-   *
    */
   private renderFakeScroll(height: number) {
     let totalHeight: number = 0
@@ -1020,7 +1475,16 @@ export class List extends React.Component<IListProps, IListState> {
     }
   }
 
-  private onRowMouseDown = (row: number, event: React.MouseEvent<any>) => {
+  private onRowMouseDown = (
+    indexPath: RowIndexPath,
+    event: React.MouseEvent<any>
+  ) => {
+    if (this.inKeyboardInsertionMode) {
+      return
+    }
+
+    const { row } = indexPath
+
     if (this.canSelectRow(row)) {
       if (this.props.onRowMouseDown) {
         this.props.onRowMouseDown(row, event)
@@ -1113,7 +1577,16 @@ export class List extends React.Component<IListProps, IListState> {
     }
   }
 
-  private onRowMouseUp = (row: number, event: React.MouseEvent<any>) => {
+  private onRowMouseUp = (
+    indexPath: RowIndexPath,
+    event: React.MouseEvent<any>
+  ) => {
+    if (this.inKeyboardInsertionMode) {
+      return
+    }
+
+    const { row } = indexPath
+
     if (!this.canSelectRow(row)) {
       return
     }
@@ -1175,21 +1648,47 @@ export class List extends React.Component<IListProps, IListState> {
     }
   }
 
-  private onRowClick = (row: number, event: React.MouseEvent<any>) => {
-    if (this.canSelectRow(row) && this.props.onRowClick) {
+  private onDropDataInsertion = (indexPath: RowIndexPath, data: DragData) => {
+    this.props.onDropDataInsertion?.(indexPath.row, data)
+  }
+
+  private onRowClick = (
+    indexPath: RowIndexPath,
+    event: React.MouseEvent<any>
+  ) => {
+    if (this.inKeyboardInsertionMode) {
+      return
+    }
+
+    if (this.canSelectRow(indexPath.row) && this.props.onRowClick) {
       const rowCount = this.props.rowCount
 
-      if (row < 0 || row >= rowCount) {
+      if (indexPath.row < 0 || indexPath.row >= rowCount) {
         log.debug(
-          `[List.onRowClick] unable to onRowClick for row ${row} as it is outside the bounds of the array [0, ${rowCount}]`
+          `[List.onRowClick] unable to onRowClick for row ${indexPath.row} as it is outside the bounds of the array [0, ${rowCount}]`
         )
         return
       }
 
-      this.props.onRowClick(row, { kind: 'mouseclick', event })
+      this.props.onRowClick(indexPath.row, { kind: 'mouseclick', event })
     }
   }
 
+  private onRowDoubleClick = (
+    indexPath: RowIndexPath,
+    event: React.MouseEvent<any>
+  ) => {
+    if (this.inKeyboardInsertionMode) {
+      return
+    }
+
+    if (!this.props.onRowDoubleClick) {
+      return
+    }
+
+    this.props.onRowDoubleClick(indexPath.row, { kind: 'mouseclick', event })
+  }
+
   private onScroll = ({
     scrollTop,
     clientHeight,
@@ -1217,6 +1716,8 @@ export class List extends React.Component<IListProps, IListState> {
 
       this.fakeScroll.scrollTop = scrollTop
     }
+
+    this.updateKeyboardInsertionElementPosition()
   }
 
   /**
diff --git a/app/src/ui/lib/list/section-list-selection.ts b/app/src/ui/lib/list/section-list-selection.ts
new file mode 100644
index 00000000000..3040c0526eb
--- /dev/null
+++ b/app/src/ui/lib/list/section-list-selection.ts
@@ -0,0 +1,200 @@
+import * as React from 'react'
+import {
+  getTotalRowCount,
+  globalIndexToRowIndexPath,
+  InvalidRowIndexPath,
+  isValidRow,
+  RowIndexPath,
+  rowIndexPathEquals,
+  rowIndexPathToGlobalIndex,
+} from './list-row-index-path'
+
+export type SelectionDirection = 'up' | 'down'
+
+interface ISelectRowAction {
+  /**
+   * The vertical direction use when searching for a selectable row.
+   */
+  readonly direction: SelectionDirection
+
+  /**
+   * The starting row index to search from.
+   */
+  readonly row: RowIndexPath
+
+  /**
+   * A flag to indicate or not to look beyond the last or first
+   * row (depending on direction) such that given the last row and
+   * a downward direction will consider the first row as a
+   * candidate or given the first row and an upward direction
+   * will consider the last row as a candidate.
+   *
+   * Defaults to true if not set.
+   */
+  readonly wrap?: boolean
+}
+
+/**
+ * Interface describing a user initiated selection change event
+ * originating from a pointer device clicking or pressing on an item.
+ */
+export interface IMouseClickSource {
+  readonly kind: 'mouseclick'
+  readonly event: React.MouseEvent<any>
+}
+
+/**
+ * Interface describing a user initiated selection change event
+ * originating from a pointer device hovering over an item.
+ * Only applicable when selectedOnHover is set.
+ */
+export interface IHoverSource {
+  readonly kind: 'hover'
+  readonly event: React.MouseEvent<any>
+}
+
+/**
+ * Interface describing a user initiated selection change event
+ * originating from a keyboard
+ */
+export interface IKeyboardSource {
+  readonly kind: 'keyboard'
+  readonly event: React.KeyboardEvent<any>
+}
+
+/**
+ * Interface describing a user initiated selection of all list
+ * items (usually by clicking the Edit > Select all menu item in
+ * the application window). This is highly specific to GitHub Desktop
+ */
+export interface ISelectAllSource {
+  readonly kind: 'select-all'
+}
+
+/**
+ * Interface describing a user initiated selection change event originating
+ * when focusing the list when it has no selection.
+ */
+export interface IFocusSource {
+  readonly kind: 'focus'
+}
+
+/** A type union of possible sources of a selection changed event */
+export type SelectionSource =
+  | IMouseClickSource
+  | IHoverSource
+  | IKeyboardSource
+  | ISelectAllSource
+  | IFocusSource
+
+/**
+ * Determine the next selectable row, given the direction and a starting
+ * row index. Whether a row is selectable or not is determined using
+ * the `canSelectRow` function, which defaults to true if not provided.
+ *
+ * Returns null if no row can be selected or if the only selectable row is
+ * identical to the given row parameter.
+ */
+export function findNextSelectableRow(
+  rowCount: ReadonlyArray<number>,
+  action: ISelectRowAction,
+  canSelectRow: (indexPath: RowIndexPath) => boolean = row => true
+): RowIndexPath | null {
+  const totalRowCount = getTotalRowCount(rowCount)
+  if (totalRowCount === 0) {
+    return null
+  }
+
+  const { direction, row } = action
+  const wrap = action.wrap === undefined ? true : action.wrap
+  const rowIndex = rowIndexPathEquals(InvalidRowIndexPath, row)
+    ? -1
+    : rowIndexPathToGlobalIndex(row, rowCount)
+
+  if (rowIndex === null) {
+    return null
+  }
+
+  // Ensure the row value is in the range between 0 and rowCount - 1
+  //
+  // If the row falls outside this range, use the direction
+  // given to choose a suitable value:
+  //
+  //  - move in an upward direction -> select last row
+  //  - move in a downward direction -> select first row
+  //
+  let currentRow = isValidRow(row, rowCount)
+    ? rowIndex
+    : direction === 'up'
+    ? totalRowCount - 1
+    : 0
+
+  // handle specific case from switching from filter text to list
+  //
+  // locking currentRow to [0,rowCount) above means that the below loops
+  // will skip over the first entry
+  if (direction === 'down' && rowIndexPathEquals(row, InvalidRowIndexPath)) {
+    currentRow = -1
+  }
+
+  const delta = direction === 'up' ? -1 : 1
+
+  // Iterate through all rows (starting offset from the
+  // given row and ending on and including the given row)
+  for (let i = 0; i < totalRowCount; i++) {
+    currentRow += delta
+
+    if (currentRow >= totalRowCount) {
+      // We've hit rock bottom, wrap around to the top
+      // if we're allowed to or give up.
+      if (wrap) {
+        currentRow = 0
+      } else {
+        break
+      }
+    } else if (currentRow < 0) {
+      // We've reached the top, wrap around to the bottom
+      // if we're allowed to or give up
+      if (wrap) {
+        currentRow = totalRowCount - 1
+      } else {
+        break
+      }
+    }
+
+    const currentRowIndexPath = globalIndexToRowIndexPath(currentRow, rowCount)
+    if (
+      currentRowIndexPath !== null &&
+      !rowIndexPathEquals(row, currentRowIndexPath) &&
+      canSelectRow(currentRowIndexPath)
+    ) {
+      return currentRowIndexPath
+    }
+  }
+
+  return null
+}
+
+/**
+ * Find the last selectable row in either direction, used
+ * for moving to the first or last selectable row in a list,
+ * i.e. Home/End key navigation.
+ */
+export function findLastSelectableRow(
+  direction: SelectionDirection,
+  rowCount: ReadonlyArray<number>,
+  canSelectRow: (indexPath: RowIndexPath) => boolean
+): RowIndexPath | null {
+  const totalRowCount = getTotalRowCount(rowCount)
+  let i = direction === 'up' ? 0 : totalRowCount - 1
+  const delta = direction === 'up' ? 1 : -1
+
+  for (; i >= 0 && i < totalRowCount; i += delta) {
+    const indexPath = globalIndexToRowIndexPath(i, rowCount)
+    if (indexPath !== null && canSelectRow(indexPath)) {
+      return indexPath
+    }
+  }
+
+  return null
+}
diff --git a/app/src/ui/lib/list/section-list.tsx b/app/src/ui/lib/list/section-list.tsx
new file mode 100644
index 00000000000..61cf1925534
--- /dev/null
+++ b/app/src/ui/lib/list/section-list.tsx
@@ -0,0 +1,1761 @@
+import * as React from 'react'
+import * as ReactDOM from 'react-dom'
+import { Grid, AutoSizer, Index } from 'react-virtualized'
+import { shallowEquals, structuralEquals } from '../../../lib/equality'
+import { FocusContainer } from '../../lib/focus-container'
+import { ListRow } from './list-row'
+import {
+  findNextSelectableRow,
+  SelectionSource,
+  SelectionDirection,
+  IMouseClickSource,
+  IKeyboardSource,
+  ISelectAllSource,
+  findLastSelectableRow,
+} from './section-list-selection'
+import { createUniqueId, releaseUniqueId } from '../../lib/id-pool'
+import {
+  InsertionFeedbackType,
+  ListItemInsertionOverlay,
+} from './list-item-insertion-overlay'
+import { DragData, DragType } from '../../../models/drag-drop'
+import memoizeOne from 'memoize-one'
+import {
+  getTotalRowCount,
+  globalIndexToRowIndexPath,
+  InvalidRowIndexPath,
+  isValidRow,
+  RowIndexPath,
+  rowIndexPathEquals,
+  rowIndexPathToGlobalIndex,
+} from './list-row-index-path'
+import { range } from '../../../lib/range'
+import { sendNonFatalException } from '../../../lib/helpers/non-fatal-exception'
+
+/**
+ * Describe the first argument given to the cellRenderer,
+ * See
+ *  https://github.com/bvaughn/react-virtualized/issues/386
+ *  https://github.com/bvaughn/react-virtualized/blob/8.0.11/source/Grid/defaultCellRangeRenderer.js#L38-L44
+ */
+export interface IRowRendererParams {
+  /** Horizontal (column) index of cell */
+  readonly columnIndex: number
+
+  /** The Grid is currently being scrolled */
+  readonly isScrolling: boolean
+
+  /** Unique key within array of cells */
+  readonly key: React.Key
+
+  /** Vertical (row) index of cell */
+  readonly rowIndex: number
+
+  /** Style object to be applied to cell */
+  readonly style: React.CSSProperties
+}
+
+export type ClickSource = IMouseClickSource | IKeyboardSource
+
+interface ISectionListProps {
+  /**
+   * Mandatory callback for rendering the contents of a particular
+   * row. The callback is not responsible for the outer wrapper
+   * of the row, only its contents and may return null although
+   * that will result in an empty list item.
+   */
+  readonly rowRenderer: (indexPath: RowIndexPath) => JSX.Element | null
+
+  /**
+   * Whether or not a given section has a header row at the beginning. When
+   * ommitted, it's assumed the section does NOT have a header row.
+   */
+  readonly sectionHasHeader?: (section: number) => boolean
+
+  /**
+   * The total number of rows in the list. This is used for
+   * scroll virtualization purposes when calculating the theoretical
+   * height of the list.
+   */
+  readonly rowCount: ReadonlyArray<number>
+
+  /**
+   * The height of each individual row in the list. This height
+   * is enforced for each row container and attempting to render a row
+   * which does not fit inside that height is forbidden.
+   *
+   * Can either be a number (most efficient) in which case all rows
+   * are of equal height, or, a function that, given a row index returns
+   * the height of that particular row.
+   */
+  readonly rowHeight: number | ((info: { index: RowIndexPath }) => number)
+
+  /**
+   * Function that generates an ID for a given row. This will allow the
+   * container component of the list to have control over the ID of the
+   * row and allow it to be used for things like keyboard navigation.
+   */
+  readonly rowId?: (indexPath: RowIndexPath) => string
+
+  /**
+   * The currently selected rows indexes. Used to attach a special
+   * selection class on those row's containers as well as being used
+   * for keyboard selection.
+   *
+   * It is expected that the use case for this is setting of the initially
+   * selected rows or clearing a list selection.
+   *
+   * N.B. Since it is used for keyboard selection, changing the ordering of
+   * elements in this array in a parent component may result in unexpected
+   * behaviors when a user modifies their selection via key commands.
+   * See #15536 lessons learned.
+   */
+  readonly selectedRows: ReadonlyArray<RowIndexPath>
+
+  /**
+   * Used to attach special classes to specific rows
+   */
+  readonly rowCustomClassNameMap?: Map<string, ReadonlyArray<RowIndexPath>>
+
+  /**
+   * This function will be called when a pointer device is pressed and then
+   * released on a selectable row. Note that this follows the conventions
+   * of button elements such that pressing Enter or Space on a keyboard
+   * while focused on a particular row will also trigger this event. Consumers
+   * can differentiate between the two using the source parameter.
+   *
+   * Note that this event handler will not be called for keyboard events
+   * if `event.preventDefault()` was called in the onRowKeyDown event handler.
+   *
+   * Consumers of this event do _not_ have to call event.preventDefault,
+   * when this event is subscribed to the list will automatically call it.
+   */
+  readonly onRowClick?: (row: RowIndexPath, source: ClickSource) => void
+
+  readonly onRowDoubleClick?: (
+    indexPath: RowIndexPath,
+    source: IMouseClickSource
+  ) => void
+
+  /** This function will be called when a row obtains focus, no matter how */
+  readonly onRowFocus?: (
+    indexPath: RowIndexPath,
+    source: React.FocusEvent<HTMLDivElement>
+  ) => void
+
+  /** This function will be called only when a row obtains focus via keyboard */
+  readonly onRowKeyboardFocus?: (
+    indexPath: RowIndexPath,
+    e: React.KeyboardEvent<any>
+  ) => void
+
+  /** This function will be called when a row loses focus */
+  readonly onRowBlur?: (
+    indexPath: RowIndexPath,
+    source: React.FocusEvent<HTMLDivElement>
+  ) => void
+
+  /**
+   * This prop defines the behaviour of the selection of items within this list.
+   *  - 'single' : (default) single list-item selection. [shift] and [ctrl] have
+   * no effect. Use in combination with one of:
+   *             onSelectedRowChanged(row: number)
+   *             onSelectionChanged(rows: number[])
+   *  - 'range' : allows for selecting continuous ranges. [shift] can be used.
+   * [ctrl] has no effect. Use in combination with one of:
+   *             onSelectedRangeChanged(start: number, end: number)
+   *             onSelectionChanged(rows: number[])
+   *  - 'multi' : allows range and/or arbitrary selection. [shift] and [ctrl]
+   * can be used. Use in combination with:
+   *             onSelectionChanged(rows: number[])
+   */
+  readonly selectionMode?: 'single' | 'range' | 'multi'
+
+  /**
+   * This function will be called when the selection changes as a result of a
+   * user keyboard or mouse action (i.e. not when props change). This function
+   * will not be invoked when an already selected row is clicked on.
+   * Use this function when the selectionMode is 'single'
+   *
+   * @param row    - The index of the row that was just selected
+   * @param source - The kind of user action that provoked the change, either
+   *                 a pointer device press or a keyboard event (arrow up/down)
+   */
+  readonly onSelectedRowChanged?: (
+    indexPath: RowIndexPath,
+    source: SelectionSource
+  ) => void
+
+  /**
+   * This function will be called when the selection changes as a result of a
+   * user keyboard or mouse action (i.e. not when props change). This function
+   * will not be invoked when an already selected row is clicked on.
+   * Index parameters are inclusive
+   * Use this function when the selectionMode is 'range'
+   *
+   * @param start  - The index of the first selected row
+   * @param end    - The index of the last selected row
+   * @param source - The kind of user action that provoked the change, either
+   *                 a pointer device press or a keyboard event (arrow up/down)
+   */
+  readonly onSelectedRangeChanged?: (
+    start: RowIndexPath,
+    end: RowIndexPath,
+    source: SelectionSource
+  ) => void
+
+  /**
+   * This function will be called when the selection changes as a result of a
+   * user keyboard or mouse action (i.e. not when props change). This function
+   * will not be invoked when an already selected row is clicked on.
+   * Use this function for any selectionMode
+   *
+   * @param rows   - The indexes of the row(s) that are part of the selection
+   * @param source - The kind of user action that provoked the change, either
+   *                 a pointer device press or a keyboard event (arrow up/down)
+   */
+  readonly onSelectionChanged?: (
+    rows: ReadonlyArray<RowIndexPath>,
+    source: SelectionSource
+  ) => void
+
+  /**
+   * A handler called whenever a key down event is received on the
+   * row container element. Due to the way the container is currently
+   * implemented the element produced by the rowRendered will never
+   * see keyboard events without stealing focus away from the container.
+   *
+   * Primary use case for this is to allow items to react to the space
+   * bar in order to toggle selection. This function is responsible
+   * for calling event.preventDefault() when acting on a key press.
+   */
+  readonly onRowKeyDown?: (
+    indexPath: RowIndexPath,
+    event: React.KeyboardEvent<any>
+  ) => void
+
+  /**
+   * A handler called whenever a mouse down event is received on the
+   * row container element. Unlike onSelectionChanged, this is raised
+   * for every mouse down event, whether the row is selected or not.
+   */
+  readonly onRowMouseDown?: (
+    indexPath: RowIndexPath,
+    event: React.MouseEvent<any>
+  ) => void
+
+  /**
+   * A handler called whenever a context menu event is received on the
+   * row container element.
+   *
+   * The context menu is invoked when a user right clicks the row or
+   * uses keyboard shortcut.
+   */
+  readonly onRowContextMenu?: (
+    row: RowIndexPath,
+    event: React.MouseEvent<HTMLDivElement>
+  ) => void
+
+  /**
+   * A handler called whenever the user drops items on the list to be inserted.
+   *
+   * @param row - The index of the row where the user intends to insert the new
+   *              items.
+   * @param data -  The data dropped by the user.
+   */
+  readonly onDropDataInsertion?: (
+    indexPath: RowIndexPath,
+    data: DragData
+  ) => void
+
+  /**
+   * An optional handler called to determine whether a given row is
+   * selectable or not. Reasons for why a row might not be selectable
+   * includes it being a group header or the item being disabled.
+   */
+  readonly canSelectRow?: (row: RowIndexPath) => boolean
+  readonly onScroll?: (scrollTop: number, clientHeight: number) => void
+
+  /**
+   * List's underlying implementation acts as a pure component based on the
+   * above props. So if there are any other properties that also determine
+   * whether the list should re-render, List must know about them.
+   */
+  readonly invalidationProps?: any
+
+  /** The unique identifier for the outer element of the component (optional, defaults to null) */
+  readonly id?: string
+
+  /** The unique identifier of the accessible list component (optional) */
+  readonly accessibleListId?: string
+
+  /** The row that should be scrolled to when the list is rendered. */
+  readonly scrollToRow?: RowIndexPath
+
+  /** Type of elements that can be inserted in the list via drag & drop. Optional. */
+  readonly insertionDragType?: DragType
+
+  /**
+   * The number of pixels from the top of the list indicating
+   * where to scroll do on rendering of the list.
+   */
+  readonly setScrollTop?: number
+
+  /** The aria-labelledby attribute for the list component. */
+  readonly ariaLabelledBy?: string
+
+  /** The aria-label attribute for the list component. */
+  readonly ariaLabel?: string
+
+  /**
+   * Optional callback for providing an aria label for screen readers for each
+   * row.
+   *
+   * Note: you may need to apply an aria-hidden attribute to any child text
+   * elements for this to take precedence.
+   */
+  readonly getRowAriaLabel?: (indexPath: RowIndexPath) => string | undefined
+}
+
+interface ISectionListState {
+  /** The available height for the list as determined by ResizeObserver */
+  readonly height?: number
+
+  /** The available width for the list as determined by ResizeObserver */
+  readonly width?: number
+
+  readonly rowIdPrefix?: string
+
+  readonly scrollTop: number
+}
+
+/**
+ * Create an array with row indices between firstRow and lastRow (inclusive).
+ *
+ * This is essentially a range function with the explicit behavior of
+ * inclusive upper and lower bound.
+ */
+function createSelectionBetween(
+  firstRow: RowIndexPath,
+  lastRow: RowIndexPath,
+  rowCount: ReadonlyArray<number>
+): ReadonlyArray<RowIndexPath> {
+  const firstIndex = rowIndexPathToGlobalIndex(firstRow, rowCount)
+  const lastIndex = rowIndexPathToGlobalIndex(lastRow, rowCount)
+  if (firstIndex === null || lastIndex === null) {
+    return []
+  }
+
+  const end = lastIndex > firstIndex ? lastIndex + 1 : lastIndex - 1
+  // range is upper bound exclusive
+  const rowRange = range(firstIndex, end)
+  const selection = new Array<RowIndexPath>(rowRange.length)
+  for (let i = 0; i < rowRange.length; i++) {
+    const indexPath = globalIndexToRowIndexPath(rowRange[i], rowCount)
+    if (indexPath !== null) {
+      selection[i] = indexPath
+    }
+  }
+  return selection
+}
+
+// Since objects cannot be keys in a Map, this class encapsulates the logic for
+// creating a string key from a RowIndexPath.
+class RowRefsMap {
+  private readonly map = new Map<string, HTMLDivElement>()
+
+  private getIndexPathKey(indexPath: RowIndexPath): string {
+    return `${indexPath.section}-${indexPath.row}`
+  }
+
+  public get(indexPath: RowIndexPath): HTMLDivElement | undefined {
+    return this.map.get(this.getIndexPathKey(indexPath))
+  }
+
+  public set(indexPath: RowIndexPath, element: HTMLDivElement) {
+    this.map.set(this.getIndexPathKey(indexPath), element)
+  }
+
+  public delete(indexPath: RowIndexPath) {
+    this.map.delete(this.getIndexPathKey(indexPath))
+  }
+}
+
+export class SectionList extends React.Component<
+  ISectionListProps,
+  ISectionListState
+> {
+  private fakeScroll: HTMLDivElement | null = null
+  private focusRow: RowIndexPath = InvalidRowIndexPath
+
+  private readonly rowRefs = new RowRefsMap()
+
+  /**
+   * The style prop for our child Grid. We keep this here in order
+   * to not create a new object on each render and thus forcing
+   * the Grid to re-render even though nothing has changed.
+   */
+  private gridStyle: React.CSSProperties = { overflowX: 'hidden' }
+
+  /**
+   * On Win32 we use a fake scroll bar. This variable keeps track of
+   * which of the actual scroll container and the fake scroll container
+   * received the scroll event first to avoid bouncing back and forth
+   * causing jerky scroll bars and more importantly making the mouse
+   * wheel scroll speed appear different when scrolling over the
+   * fake scroll bar and the actual one.
+   */
+  private lastScroll: 'grid' | 'fake' | null = null
+
+  private list: HTMLDivElement | null = null
+  private rootGrid: Grid | null = null
+  private grids = new Map<number, Grid>()
+  private readonly resizeObserver: ResizeObserver | null = null
+  private updateSizeTimeoutId: NodeJS.Immediate | null = null
+
+  /**
+   * Get the props for the inner scroll container (called containerProps on the
+   * Grid component). This is memoized to avoid causing the Grid component to
+   * rerender every time the list component rerenders (the Grid component is a
+   * pure component so a complex object like containerProps being instantiated
+   * on each render would cause it to rerender constantly).
+   */
+  private getContainerProps = memoizeOne(
+    (
+      activeDescendant: string | undefined
+    ): React.HTMLProps<HTMLDivElement> => ({
+      onKeyDown: this.onKeyDown,
+      'aria-activedescendant': activeDescendant,
+      'aria-multiselectable':
+        this.props.selectionMode === 'multi' ||
+        this.props.selectionMode === 'range'
+          ? 'true'
+          : undefined,
+    })
+  )
+
+  public constructor(props: ISectionListProps) {
+    super(props)
+
+    this.state = {
+      scrollTop: 0,
+    }
+
+    const ResizeObserverClass: typeof ResizeObserver = (window as any)
+      .ResizeObserver
+
+    if (ResizeObserver || false) {
+      this.resizeObserver = new ResizeObserverClass(entries => {
+        for (const { target, contentRect } of entries) {
+          if (target === this.list && this.list !== null) {
+            // We might end up causing a recursive update by updating the state
+            // when we're reacting to a resize so we'll defer it until after
+            // react is done with this frame.
+            if (this.updateSizeTimeoutId !== null) {
+              clearImmediate(this.updateSizeTimeoutId)
+            }
+
+            this.updateSizeTimeoutId = setImmediate(
+              this.onResized,
+              this.list,
+              contentRect
+            )
+          }
+        }
+      })
+    }
+  }
+
+  private get totalRowCount() {
+    return getTotalRowCount(this.props.rowCount)
+  }
+
+  private getRowId(indexPath: RowIndexPath): string | undefined {
+    if (this.props.rowId) {
+      return this.props.rowId(indexPath)
+    }
+
+    return this.state.rowIdPrefix === undefined
+      ? undefined
+      : `${this.state.rowIdPrefix}-${indexPath.section}-${indexPath.row}`
+  }
+
+  private onResized = (target: HTMLElement, contentRect: ClientRect) => {
+    this.updateSizeTimeoutId = null
+
+    const [width, height] = [target.offsetWidth, target.offsetHeight]
+
+    if (this.state.width !== width || this.state.height !== height) {
+      this.setState({ width, height })
+    }
+  }
+
+  private onSelectAll = (event: Event | React.SyntheticEvent<any>) => {
+    const selectionMode = this.props.selectionMode
+
+    if (selectionMode !== 'range' && selectionMode !== 'multi') {
+      return
+    }
+
+    event.preventDefault()
+
+    if (this.totalRowCount <= 0) {
+      return
+    }
+
+    const source: ISelectAllSource = { kind: 'select-all' }
+    const firstRow: RowIndexPath = { section: 0, row: 0 }
+    const lastRow: RowIndexPath = {
+      section: this.props.rowCount.length - 1,
+      row: this.props.rowCount[this.props.rowCount.length - 1] - 1,
+    }
+
+    if (this.props.onSelectionChanged) {
+      const newSelection = createSelectionBetween(
+        firstRow,
+        lastRow,
+        this.props.rowCount
+      )
+      this.props.onSelectionChanged(newSelection, source)
+    }
+
+    if (selectionMode === 'range' && this.props.onSelectedRangeChanged) {
+      this.props.onSelectedRangeChanged(firstRow, lastRow, source)
+    }
+  }
+
+  private onRef = (element: HTMLDivElement | null) => {
+    if (element === null && this.list !== null) {
+      this.list.removeEventListener('select-all', this.onSelectAll)
+    }
+
+    this.list = element
+
+    if (element !== null) {
+      // This is a custom event that desktop emits through <App />
+      // when the user selects the Edit > Select all menu item. We
+      // hijack it and select all list items rather than let it bubble
+      // to electron's default behavior which is to select all selectable
+      // text in the renderer.
+      element.addEventListener('select-all', this.onSelectAll)
+    }
+
+    if (this.resizeObserver) {
+      this.resizeObserver.disconnect()
+
+      if (element !== null) {
+        this.resizeObserver.observe(element)
+      } else {
+        this.setState({ width: undefined, height: undefined })
+      }
+    }
+  }
+
+  private onKeyDown = (event: React.KeyboardEvent<any>) => {
+    if (this.props.onRowKeyDown) {
+      for (const row of this.props.selectedRows) {
+        this.props.onRowKeyDown(row, event)
+      }
+    }
+
+    // The consumer is given a change to prevent the default behavior for
+    // keyboard navigation so that they can customize its behavior as needed.
+    if (event.defaultPrevented) {
+      return
+    }
+
+    const source: SelectionSource = { kind: 'keyboard', event }
+
+    // Home is Cmd+ArrowUp on macOS, end is Cmd+ArrowDown, see
+    // https://github.com/desktop/desktop/pull/8644#issuecomment-645965884
+    const isHomeKey = __DARWIN__
+      ? event.metaKey && event.key === 'ArrowUp'
+      : event.key === 'Home'
+    const isEndKey = __DARWIN__
+      ? event.metaKey && event.key === 'ArrowDown'
+      : event.key === 'End'
+
+    const isRangeSelection =
+      event.shiftKey &&
+      this.props.selectionMode !== undefined &&
+      this.props.selectionMode !== 'single'
+
+    if (isHomeKey || isEndKey) {
+      const direction = isHomeKey ? 'up' : 'down'
+      if (isRangeSelection) {
+        this.addSelectionToLastSelectableRow(direction, source)
+      } else {
+        this.moveSelectionToLastSelectableRow(direction, source)
+      }
+      event.preventDefault()
+    } else if (event.key === 'ArrowUp' || event.key === 'ArrowDown') {
+      const direction = event.key === 'ArrowUp' ? 'up' : 'down'
+      if (isRangeSelection) {
+        this.addSelection(direction, source)
+      } else {
+        this.moveSelection(direction, source)
+      }
+      event.preventDefault()
+    } else if (!__DARWIN__ && event.key === 'a' && event.ctrlKey) {
+      // On Windows Chromium will steal the Ctrl+A shortcut before
+      // Electron gets its hands on it meaning that the Select all
+      // menu item can't be invoked by means of keyboard shortcuts
+      // on Windows. Clicking on the menu item still emits the
+      // 'select-all' custom DOM event.
+      this.onSelectAll(event)
+    } else if (event.key === 'PageUp' || event.key === 'PageDown') {
+      const direction = event.key === 'PageUp' ? 'up' : 'down'
+      if (isRangeSelection) {
+        this.addSelectionByPage(direction, source)
+      } else {
+        this.moveSelectionByPage(direction, source)
+      }
+      event.preventDefault()
+    }
+  }
+
+  private moveSelectionByPage(
+    direction: SelectionDirection,
+    source: SelectionSource
+  ) {
+    const newSelection = this.getNextPageRowIndexPath(direction)
+    this.moveSelectionTo(newSelection, source)
+  }
+
+  private addSelectionByPage(
+    direction: SelectionDirection,
+    source: SelectionSource
+  ) {
+    const { selectedRows } = this.props
+    const newSelection = this.getNextPageRowIndexPath(direction)
+    const firstSelection = selectedRows[0] ?? 0
+    const range = createSelectionBetween(
+      firstSelection,
+      newSelection,
+      this.props.rowCount
+    )
+
+    if (this.props.onSelectionChanged) {
+      this.props.onSelectionChanged(range, source)
+    }
+
+    if (this.props.onSelectedRangeChanged) {
+      this.props.onSelectedRangeChanged(
+        range[0],
+        range[range.length - 1],
+        source
+      )
+    }
+
+    this.scrollRowToVisible(newSelection)
+  }
+
+  private getNextPageRowIndexPath(direction: SelectionDirection) {
+    const { selectedRows } = this.props
+    const lastSelection: RowIndexPath = selectedRows.at(-1) ?? {
+      row: 0,
+      section: 0,
+    }
+
+    return this.findNextPageSelectableRow(lastSelection, direction)
+  }
+
+  private getHeightForRowAtIndexPath(index: RowIndexPath) {
+    const { rowHeight } = this.props
+    return typeof rowHeight === 'number' ? rowHeight : rowHeight({ index })
+  }
+
+  private findNextPageSelectableRow(
+    fromRow: RowIndexPath,
+    direction: SelectionDirection
+  ) {
+    const { height: listHeight } = this.state
+    const { rowCount } = this.props
+
+    if (listHeight === undefined) {
+      return fromRow
+    }
+
+    let offset = 0
+    let newSelection = fromRow
+    const delta = direction === 'up' ? -1 : 1
+
+    // Starting from the last selected row, move up or down depending
+    // on the direction, keeping a sum of the height of all the rows
+    // we've seen until the accumulated height is about to exceed that
+    // of the list height. Once we've found the index of the item that
+    // just about exceeds the height we'll pick that one as the next
+    // selection.
+    for (let i = fromRow.section; i < rowCount.length && i >= 0; i += delta) {
+      const initialRow = i === fromRow.section ? fromRow.row : 0
+
+      for (let j = initialRow; j < rowCount[i] && j >= 0; j += delta) {
+        const indexPath = { section: i, row: j }
+        const h = this.getHeightForRowAtIndexPath(indexPath)
+
+        if (offset + h > listHeight) {
+          break
+        }
+        offset += h
+
+        if (this.canSelectRow(indexPath)) {
+          newSelection = indexPath
+        }
+      }
+    }
+
+    return newSelection
+  }
+
+  private onRowKeyDown = (
+    rowIndex: RowIndexPath,
+    event: React.KeyboardEvent<any>
+  ) => {
+    if (this.props.onRowKeyDown) {
+      this.props.onRowKeyDown(rowIndex, event)
+    }
+
+    const hasModifier =
+      event.altKey || event.ctrlKey || event.metaKey || event.shiftKey
+
+    // We give consumers the power to prevent the onRowClick event by subscribing
+    // to the onRowKeyDown event and calling event.preventDefault. This lets
+    // consumers add their own semantics for keyboard presses.
+    if (
+      !event.defaultPrevented &&
+      !hasModifier &&
+      (event.key === 'Enter' || event.key === ' ')
+    ) {
+      this.toggleSelection(event)
+      event.preventDefault()
+    }
+  }
+
+  private onFocusContainerKeyDown = (event: React.KeyboardEvent<any>) => {
+    const hasModifier =
+      event.altKey || event.ctrlKey || event.metaKey || event.shiftKey
+
+    if (
+      !event.defaultPrevented &&
+      !hasModifier &&
+      (event.key === 'Enter' || event.key === ' ')
+    ) {
+      this.toggleSelection(event)
+      event.preventDefault()
+    }
+  }
+
+  private onFocusWithinChanged = (focusWithin: boolean) => {
+    // So the grid lost focus (we manually focus the grid if the focused list
+    // item is unmounted) so we mustn't attempt to refocus the previously
+    // focused list item if it scrolls back into view.
+    if (!focusWithin) {
+      this.focusRow = InvalidRowIndexPath
+    } else if (this.props.selectedRows.length === 0) {
+      const firstSelectableRowIndexPath = this.getFirstSelectableRowIndexPath()
+      if (firstSelectableRowIndexPath !== null) {
+        this.moveSelectionTo(firstSelectableRowIndexPath, { kind: 'focus' })
+      }
+    }
+  }
+
+  private toggleSelection = (event: React.KeyboardEvent<any>) => {
+    this.props.selectedRows.forEach(row => {
+      if (!this.props.onRowClick) {
+        return
+      }
+
+      if (!isValidRow(row, this.props.rowCount)) {
+        log.debug(
+          `[List.toggleSelection] unable to onRowClick for row ${row} as it is outside the bounds`
+        )
+        return
+      }
+
+      this.props.onRowClick(row, { kind: 'keyboard', event })
+    })
+  }
+
+  private onRowFocus = (
+    index: RowIndexPath,
+    e: React.FocusEvent<HTMLDivElement>
+  ) => {
+    this.focusRow = index
+    this.props.onRowFocus?.(index, e)
+  }
+
+  private onRowKeyboardFocus = (
+    index: RowIndexPath,
+    e: React.KeyboardEvent<HTMLDivElement>
+  ) => {
+    this.props.onRowKeyboardFocus?.(index, e)
+  }
+
+  private onRowBlur = (
+    index: RowIndexPath,
+    e: React.FocusEvent<HTMLDivElement>
+  ) => {
+    if (rowIndexPathEquals(this.focusRow, index)) {
+      this.focusRow = InvalidRowIndexPath
+    }
+    this.props.onRowBlur?.(index, e)
+  }
+
+  private onRowContextMenu = (
+    row: RowIndexPath,
+    e: React.MouseEvent<HTMLDivElement>
+  ) => {
+    this.props.onRowContextMenu?.(row, e)
+  }
+
+  private get firstRowIndexPath(): RowIndexPath {
+    for (let section = 0; section < this.props.rowCount.length; section++) {
+      const rowCount = this.props.rowCount[section]
+      if (rowCount > 0) {
+        return { section, row: 0 }
+      }
+    }
+
+    return InvalidRowIndexPath
+  }
+
+  /** Convenience method for invoking canSelectRow callback when it exists */
+  private canSelectRow = (rowIndex: RowIndexPath) => {
+    return this.props.canSelectRow ? this.props.canSelectRow(rowIndex) : true
+  }
+
+  private getFirstSelectableRowIndexPath(): RowIndexPath | null {
+    const { rowCount } = this.props
+
+    for (let section = 0; section < rowCount.length; section++) {
+      const rowCountInSection = rowCount[section]
+      for (let row = 0; row < rowCountInSection; row++) {
+        const indexPath = { section, row }
+        if (this.canSelectRow(indexPath)) {
+          return indexPath
+        }
+      }
+    }
+
+    return null
+  }
+
+  private addSelection(direction: SelectionDirection, source: SelectionSource) {
+    if (this.props.selectedRows.length === 0) {
+      return this.moveSelection(direction, source)
+    }
+
+    const lastSelection =
+      this.props.selectedRows[this.props.selectedRows.length - 1]
+
+    const selectionOrigin = this.props.selectedRows[0]
+
+    const newRow = findNextSelectableRow(
+      this.props.rowCount,
+      { direction, row: lastSelection, wrap: false },
+      this.canSelectRow
+    )
+
+    if (newRow != null) {
+      if (this.props.onSelectionChanged) {
+        const newSelection = createSelectionBetween(
+          selectionOrigin,
+          newRow,
+          this.props.rowCount
+        )
+        this.props.onSelectionChanged(newSelection, source)
+      }
+
+      if (
+        this.props.selectionMode === 'range' &&
+        this.props.onSelectedRangeChanged
+      ) {
+        this.props.onSelectedRangeChanged(selectionOrigin, newRow, source)
+      }
+
+      this.scrollRowToVisible(newRow)
+    }
+  }
+
+  private moveSelection(
+    direction: SelectionDirection,
+    source: SelectionSource
+  ) {
+    const lastSelection =
+      this.props.selectedRows.length > 0
+        ? this.props.selectedRows[this.props.selectedRows.length - 1]
+        : InvalidRowIndexPath
+
+    const newRow = findNextSelectableRow(
+      this.props.rowCount,
+      { direction, row: lastSelection },
+      this.canSelectRow
+    )
+
+    if (newRow != null) {
+      this.moveSelectionTo(newRow, source)
+    }
+  }
+
+  private moveSelectionToLastSelectableRow(
+    direction: SelectionDirection,
+    source: SelectionSource
+  ) {
+    const { canSelectRow, props } = this
+    const { rowCount } = props
+    const row = findLastSelectableRow(direction, rowCount, canSelectRow)
+
+    if (row !== null) {
+      this.moveSelectionTo(row, source)
+    }
+  }
+
+  private addSelectionToLastSelectableRow(
+    direction: SelectionDirection,
+    source: SelectionSource
+  ) {
+    const { canSelectRow, props } = this
+    const { rowCount, selectedRows } = props
+    const row = findLastSelectableRow(direction, rowCount, canSelectRow)
+
+    if (row === null) {
+      return
+    }
+
+    const firstRow = this.firstRowIndexPath
+    const firstSelection = selectedRows[0] ?? firstRow
+    const range = createSelectionBetween(firstSelection, row, rowCount)
+
+    this.props.onSelectionChanged?.(range, source)
+
+    const from = range.at(0) ?? firstRow
+    const to = range.at(-1) ?? firstRow
+
+    this.props.onSelectedRangeChanged?.(from, to, source)
+
+    this.scrollRowToVisible(row)
+  }
+
+  private moveSelectionTo(indexPath: RowIndexPath, source: SelectionSource) {
+    if (this.props.onSelectionChanged) {
+      this.props.onSelectionChanged([indexPath], source)
+    }
+
+    if (this.props.onSelectedRowChanged) {
+      if (!isValidRow(indexPath, this.props.rowCount)) {
+        log.debug(
+          `[List.moveSelection] unable to onSelectedRowChanged for row '${indexPath}' as it is outside the bounds`
+        )
+        return
+      }
+
+      this.props.onSelectedRowChanged(indexPath, source)
+    }
+
+    this.scrollRowToVisible(indexPath)
+  }
+
+  private scrollRowToVisible(indexPath: RowIndexPath, moveFocus = true) {
+    if (this.rootGrid === null) {
+      return
+    }
+
+    const { scrollTop } = this.state
+
+    const rowHeight = this.getHeightForRowAtIndexPath(indexPath)
+    const sectionOffset = this.getSectionScrollOffset(indexPath.section)
+    const rowOffsetInSection = this.getRowOffsetInSection(indexPath)
+
+    const grid = ReactDOM.findDOMNode(this.rootGrid)
+    if (!(grid instanceof HTMLElement)) {
+      return
+    }
+    const gridHeight = grid.getBoundingClientRect().height
+
+    const minCellOffset =
+      sectionOffset + rowOffsetInSection + rowHeight - gridHeight
+    const maxCellOffset = sectionOffset + rowOffsetInSection
+
+    const newScrollTop = Math.max(
+      minCellOffset,
+      Math.min(maxCellOffset, scrollTop)
+    )
+
+    this.rootGrid?.scrollToPosition({
+      scrollLeft: 0,
+      scrollTop: newScrollTop,
+    })
+
+    if (moveFocus) {
+      this.focusRow = indexPath
+      this.rowRefs.get(indexPath)?.focus({ preventScroll: true })
+    }
+  }
+
+  public componentDidMount() {
+    const { props } = this
+    const { selectedRows, scrollToRow, setScrollTop } = props
+
+    // If we have a selected row when we're about to mount
+    // we'll scroll to it immediately.
+    const row = scrollToRow ?? selectedRows.at(0)
+    if (row === undefined) {
+      return
+    }
+
+    const grid = this.grids.get(row.section)
+
+    // Prefer scrollTop position over scrollToRow
+    if (grid !== undefined && setScrollTop === undefined) {
+      grid.scrollToCell({ rowIndex: row.row, columnIndex: 0 })
+    }
+  }
+
+  public componentDidUpdate(
+    prevProps: ISectionListProps,
+    prevState: ISectionListState
+  ) {
+    const { scrollToRow, setScrollTop } = this.props
+    if (
+      scrollToRow !== undefined &&
+      (prevProps.scrollToRow === undefined ||
+        !rowIndexPathEquals(prevProps.scrollToRow, scrollToRow))
+    ) {
+      // Prefer scrollTop position over scrollToRow
+      if (setScrollTop === undefined) {
+        this.scrollRowToVisible(scrollToRow, false)
+      }
+    }
+
+    if (this.grids.size > 0) {
+      const hasEqualRowCount = structuralEquals(
+        this.props.rowCount,
+        prevProps.rowCount
+      )
+
+      // A non-exhaustive set of checks to see if our current update has already
+      // triggered a re-render of the Grid. In order to do this perfectly we'd
+      // have to do a shallow compare on all the props we pass to Grid but
+      // this should cover the majority of cases.
+      const gridHasUpdatedAlready =
+        !hasEqualRowCount ||
+        this.state.width !== prevState.width ||
+        this.state.height !== prevState.height
+
+      // If the number of groups doesn't change, but the size of them does, we
+      // need to recompute the grid size to ensure that the rows are laid out
+      // correctly.
+      if (!hasEqualRowCount) {
+        this.rootGrid?.recomputeGridSize()
+      }
+
+      if (!gridHasUpdatedAlready) {
+        const selectedRowChanged = !structuralEquals(
+          prevProps.selectedRows,
+          this.props.selectedRows
+        )
+
+        const invalidationPropsChanged = !shallowEquals(
+          prevProps.invalidationProps,
+          this.props.invalidationProps
+        )
+
+        // Now we need to figure out whether anything changed in such a way that
+        // the Grid has to update regardless of its props. Previously we passed
+        // our selectedRow and invalidationProps down to Grid and figured that
+        // it, being a pure component, would do the right thing but that's not
+        // quite the case since invalidationProps is a complex object.
+        if (selectedRowChanged || invalidationPropsChanged) {
+          for (const grid of this.grids.values()) {
+            grid.forceUpdate()
+          }
+        }
+      }
+    }
+  }
+
+  public componentWillMount() {
+    this.setState({ rowIdPrefix: createUniqueId('ListRow') })
+  }
+
+  public componentWillUnmount() {
+    if (this.updateSizeTimeoutId !== null) {
+      clearImmediate(this.updateSizeTimeoutId)
+      this.updateSizeTimeoutId = null
+    }
+
+    if (this.resizeObserver) {
+      this.resizeObserver.disconnect()
+    }
+
+    if (this.state.rowIdPrefix) {
+      releaseUniqueId(this.state.rowIdPrefix)
+    }
+  }
+
+  private onRowRef = (
+    rowIndex: RowIndexPath,
+    element: HTMLDivElement | null
+  ) => {
+    if (element === null) {
+      this.rowRefs.delete(rowIndex)
+    } else {
+      this.rowRefs.set(rowIndex, element)
+    }
+
+    if (rowIndexPathEquals(rowIndex, this.focusRow)) {
+      // The currently focused row is going being unmounted so we'll move focus
+      // programmatically to the grid so that keyboard navigation still works
+      if (element === null) {
+        const rowGrid = this.grids.get(rowIndex.section)
+        if (rowGrid === undefined) {
+          const grid = ReactDOM.findDOMNode(rowGrid)
+          if (grid instanceof HTMLElement) {
+            grid.focus({ preventScroll: true })
+          }
+        }
+      } else {
+        // A previously focused row is being mounted again, we'll move focus
+        // back to it
+        element.focus({ preventScroll: true })
+      }
+    }
+  }
+
+  private getCustomRowClassNames = (rowIndex: RowIndexPath) => {
+    const { rowCustomClassNameMap } = this.props
+    if (rowCustomClassNameMap === undefined) {
+      return undefined
+    }
+
+    const customClasses = new Array<string>()
+    rowCustomClassNameMap.forEach(
+      (rows: ReadonlyArray<RowIndexPath>, className: string) => {
+        if (rows.includes(rowIndex)) {
+          customClasses.push(className)
+        }
+      }
+    )
+
+    return customClasses.length === 0 ? undefined : customClasses.join(' ')
+  }
+
+  private getRowRenderer = (
+    section: number,
+    firstSelectableRowIndexPath: RowIndexPath | null
+  ) => {
+    return (params: IRowRendererParams) => {
+      const { selectedRows } = this.props
+      const indexPath: RowIndexPath = {
+        section: section,
+        row: params.rowIndex,
+      }
+
+      const selectable = this.canSelectRow(indexPath)
+      const selected =
+        selectedRows.findIndex(r => rowIndexPathEquals(r, indexPath)) !== -1
+      const customClasses = this.getCustomRowClassNames(indexPath)
+
+      // An unselectable row shouldn't be focusable
+      let tabIndex: number | undefined = undefined
+      if (selectable) {
+        tabIndex =
+          (selected && rowIndexPathEquals(selectedRows[0], indexPath)) ||
+          (selectedRows.length === 0 &&
+            firstSelectableRowIndexPath !== null &&
+            rowIndexPathEquals(firstSelectableRowIndexPath, indexPath))
+            ? 0
+            : -1
+      }
+
+      const row = this.props.rowRenderer(indexPath)
+      const sectionHasHeader =
+        this.props.sectionHasHeader?.(indexPath.section) ?? false
+
+      const element =
+        this.props.insertionDragType !== undefined ? (
+          <ListItemInsertionOverlay
+            onDropDataInsertion={this.props.onDropDataInsertion}
+            itemIndex={indexPath}
+            dragType={this.props.insertionDragType}
+            forcedFeedbackType={InsertionFeedbackType.None}
+          >
+            {row}
+          </ListItemInsertionOverlay>
+        ) : (
+          row
+        )
+
+      const id = this.getRowId(indexPath)
+
+      const ariaLabel =
+        this.props.getRowAriaLabel !== undefined
+          ? this.props.getRowAriaLabel(indexPath)
+          : undefined
+
+      return (
+        <ListRow
+          key={params.key}
+          id={id}
+          ariaLabel={ariaLabel}
+          sectionHasHeader={sectionHasHeader}
+          onRowRef={this.onRowRef}
+          rowCount={this.props.rowCount[indexPath.section]}
+          rowIndex={indexPath}
+          selected={selected}
+          inKeyboardInsertionMode={false}
+          onRowClick={this.onRowClick}
+          onRowDoubleClick={this.onRowDoubleClick}
+          onRowKeyDown={this.onRowKeyDown}
+          onRowMouseDown={this.onRowMouseDown}
+          onRowMouseUp={this.onRowMouseUp}
+          onRowFocus={this.onRowFocus}
+          onRowKeyboardFocus={this.onRowKeyboardFocus}
+          onRowBlur={this.onRowBlur}
+          onContextMenu={this.onRowContextMenu}
+          style={params.style}
+          tabIndex={tabIndex}
+          children={element}
+          selectable={selectable}
+          className={customClasses}
+        />
+      )
+    }
+  }
+
+  public render() {
+    let content: JSX.Element[] | JSX.Element | null
+    if (this.resizeObserver) {
+      content = this.renderContents(
+        this.state.width ?? 0,
+        this.state.height ?? 0
+      )
+    } else {
+      // Legacy in the event that we don't have ResizeObserver
+      content = (
+        <AutoSizer disableWidth={true} disableHeight={true}>
+          {({ width, height }: { width: number; height: number }) =>
+            this.renderContents(width, height)
+          }
+        </AutoSizer>
+      )
+    }
+
+    return (
+      // eslint-disable-next-line github/a11y-role-supports-aria-props
+      <div
+        ref={this.onRef}
+        id={this.props.id}
+        className="list"
+        aria-labelledby={this.props.ariaLabelledBy}
+        aria-label={this.props.ariaLabel}
+      >
+        {content}
+      </div>
+    )
+  }
+
+  /**
+   * Renders the react-virtualized Grid component and optionally
+   * a fake scroll bar component if running on Windows.
+   *
+   * @param width - The width of the Grid as given by AutoSizer
+   * @param height - The height of the Grid as given by AutoSizer
+   */
+  private renderContents(width: number, height: number) {
+    if (__WIN32__) {
+      return (
+        <>
+          {this.renderGrid(width, height)}
+          {this.renderFakeScroll(height)}
+        </>
+      )
+    }
+
+    return this.renderGrid(width, height)
+  }
+
+  private getRowHeight = (section: number) => {
+    const rowHeight = this.props.rowHeight
+
+    if (typeof rowHeight === 'number') {
+      return rowHeight
+    }
+
+    return (params: Index) => {
+      const index: RowIndexPath = {
+        section: section,
+        row: params.index,
+      }
+
+      return rowHeight({ index })
+    }
+  }
+
+  private onRootGridRef = (ref: Grid | null) => {
+    this.rootGrid = ref
+  }
+
+  private getOnGridRef = (section: number) => {
+    return (ref: Grid | null) => {
+      if (ref === null) {
+        this.grids.delete(section)
+      } else {
+        this.grids.set(section, ref)
+      }
+    }
+  }
+
+  private onFakeScrollRef = (ref: HTMLDivElement | null) => {
+    this.fakeScroll = ref
+  }
+
+  private getSectionScrollOffset = (section: number) =>
+    this.props.rowCount
+      .slice(0, section)
+      .reduce((height, _x, idx) => height + this.getSectionHeight(idx), 0)
+
+  private getSectionGridRenderer =
+    (width: number, height: number) => (params: IRowRendererParams) => {
+      const section = params.rowIndex
+
+      // we select the last item from the selection array for this prop
+      const sectionHeight = this.getSectionHeight(section)
+      const offset = this.getSectionScrollOffset(section)
+
+      const relativeScrollTop = Math.max(
+        0,
+        Math.min(sectionHeight, this.state.scrollTop - offset)
+      )
+
+      return (
+        <Grid
+          key={section}
+          id={this.props.accessibleListId}
+          role="listbox"
+          ref={this.getOnGridRef(section)}
+          autoContainerWidth={true}
+          containerRole="presentation"
+          aria-multiselectable={
+            this.props.selectionMode !== 'single' ? true : undefined
+          }
+          // Set the width and columnWidth to a hardcoded large value to prevent
+          columnWidth={10000}
+          width={10000}
+          height={Math.min(sectionHeight, height)}
+          columnCount={1}
+          rowCount={this.props.rowCount[section]}
+          rowHeight={this.getRowHeight(section)}
+          cellRenderer={this.getRowRenderer(
+            section,
+            this.getFirstSelectableRowIndexPath()
+          )}
+          scrollTop={relativeScrollTop}
+          overscanRowCount={4}
+          style={{ ...params.style, width: '100%' }}
+          tabIndex={-1}
+        />
+      )
+    }
+
+  private getRowOffsetInSection(indexPath: RowIndexPath) {
+    if (typeof this.props.rowHeight === 'number') {
+      return indexPath.row * this.props.rowHeight
+    }
+
+    let offset = 0
+    for (let i = 0; i < indexPath.row; i++) {
+      offset += this.props.rowHeight({ index: indexPath })
+    }
+    return offset
+  }
+
+  private getSectionHeight(section: number) {
+    if (typeof this.props.rowHeight === 'number') {
+      return this.props.rowCount[section] * this.props.rowHeight
+    }
+
+    let height = 0
+    for (let i = 0; i < this.props.rowCount[section]; i++) {
+      height += this.props.rowHeight({ index: { section, row: i } })
+    }
+    return height
+  }
+
+  private get totalHeight() {
+    return this.props.rowCount.reduce((total, _count, section) => {
+      return total + this.getSectionHeight(section)
+    })
+  }
+
+  private sectionHeight = ({ index }: Index) => {
+    return this.getSectionHeight(index)
+  }
+
+  /**
+   * Renders the react-virtualized Grid component
+   *
+   * @param width - The width of the Grid as given by AutoSizer
+   * @param height - The height of the Grid as given by AutoSizer
+   */
+  private renderGrid(width: number, height: number) {
+    // It is possible to send an invalid array such as [-1] to this component,
+    // if you do, you get weird focus problems. We shouldn't be doing this.. but
+    // if we do, send a non fatal exception to tell us about it.
+    const firstSelectedRow = this.props.selectedRows.at(0)
+    if (
+      firstSelectedRow &&
+      rowIndexPathEquals(firstSelectedRow, InvalidRowIndexPath)
+    ) {
+      sendNonFatalException(
+        'invalidListSelection',
+        new Error(
+          `Invalid selected rows that contained a negative number passed to SectionList component. This will cause keyboard navigation and focus problems.`
+        )
+      )
+    }
+
+    const { selectedRows } = this.props
+    const activeDescendant =
+      selectedRows.length && this.state.rowIdPrefix
+        ? this.getRowId(selectedRows[selectedRows.length - 1])
+        : undefined
+    const containerProps = this.getContainerProps(activeDescendant)
+    // The currently selected list item is focusable but if there's no focused
+    // item the list itself needs to be focusable so that you can reach it with
+    // keyboard navigation and select an item.
+    const tabIndex = selectedRows.length > 0 ? -1 : 0
+    return (
+      <FocusContainer
+        className="list-focus-container"
+        onKeyDown={this.onFocusContainerKeyDown}
+        onFocusWithinChanged={this.onFocusWithinChanged}
+      >
+        <Grid
+          id={this.props.accessibleListId}
+          role="presentation"
+          ref={this.onRootGridRef}
+          autoContainerWidth={true}
+          containerRole="presentation"
+          containerProps={containerProps}
+          width={width}
+          height={height}
+          columnWidth={width}
+          columnCount={1}
+          rowCount={this.props.rowCount.length}
+          rowHeight={this.sectionHeight}
+          cellRenderer={this.getSectionGridRenderer(width, height)}
+          onScroll={this.onScroll}
+          scrollTop={this.props.setScrollTop}
+          overscanRowCount={4}
+          style={this.gridStyle}
+          tabIndex={tabIndex}
+        />
+      </FocusContainer>
+    )
+  }
+
+  /**
+   * Renders a fake scroll container which sits on top of the
+   * react-virtualized Grid component in order for us to be
+   * able to have nice looking scrollbars on Windows.
+   *
+   * The fake scroll bar synchronizes its position
+   *
+   * NB: Should only be used on win32 platforms and needs to
+   * be coupled with styling that hides scroll bars on Grid
+   * and accurately positions the fake scroll bar.
+   *
+   * @param height The height of the Grid as given by AutoSizer
+   */
+  private renderFakeScroll(height: number) {
+    return (
+      <div
+        className="fake-scroll"
+        ref={this.onFakeScrollRef}
+        style={{ height }}
+        onScroll={this.onFakeScroll}
+      >
+        <div style={{ height: this.totalHeight, pointerEvents: 'none' }} />
+      </div>
+    )
+  }
+
+  // Set the scroll position of the actual Grid to that
+  // of the fake scroll bar. This is for mousewheel/touchpad
+  // scrolling on top of the fake Grid or actual dragging of
+  // the scroll thumb.
+  private onFakeScroll = (e: React.UIEvent<HTMLDivElement>) => {
+    // We're getting this event in reaction to the Grid
+    // having been scrolled and subsequently updating the
+    // fake scrollTop, ignore it
+    if (this.lastScroll === 'grid') {
+      this.lastScroll = null
+      return
+    }
+
+    this.lastScroll = 'fake'
+
+    if (this.rootGrid) {
+      const element = ReactDOM.findDOMNode(this.rootGrid)
+      if (element instanceof Element) {
+        element.scrollTop = e.currentTarget.scrollTop
+      }
+    }
+
+    this.setState({ scrollTop: e.currentTarget.scrollTop })
+
+    // Make sure the root grid re-renders its children
+    this.rootGrid?.recomputeGridSize()
+  }
+
+  private onRowMouseDown = (
+    row: RowIndexPath,
+    event: React.MouseEvent<any>
+  ) => {
+    if (this.canSelectRow(row)) {
+      if (this.props.onRowMouseDown) {
+        this.props.onRowMouseDown(row, event)
+      }
+
+      // macOS allow emulating a right click by holding down the ctrl key while
+      // performing a "normal" click.
+      const isRightClick =
+        event.button === 2 ||
+        (__DARWIN__ && event.button === 0 && event.ctrlKey)
+
+      // prevent the right-click event from changing the selection if not necessary
+      if (isRightClick && this.props.selectedRows.includes(row)) {
+        return
+      }
+
+      const multiSelectKey = __DARWIN__ ? event.metaKey : event.ctrlKey
+
+      if (
+        event.shiftKey &&
+        this.props.selectedRows.length &&
+        this.props.selectionMode &&
+        this.props.selectionMode !== 'single'
+      ) {
+        /*
+         * if [shift] is pressed and selectionMode is different than 'single',
+         * select all in-between first selection and current row
+         */
+        const selectionOrigin = this.props.selectedRows[0]
+
+        if (this.props.onSelectionChanged) {
+          const newSelection = createSelectionBetween(
+            selectionOrigin,
+            row,
+            this.props.rowCount
+          )
+          this.props.onSelectionChanged(newSelection, {
+            kind: 'mouseclick',
+            event,
+          })
+        }
+        if (
+          this.props.selectionMode === 'range' &&
+          this.props.onSelectedRangeChanged
+        ) {
+          this.props.onSelectedRangeChanged(selectionOrigin, row, {
+            kind: 'mouseclick',
+            event,
+          })
+        }
+      } else if (multiSelectKey && this.props.selectionMode === 'multi') {
+        /*
+         * if [ctrl] is pressed and selectionMode is 'multi',
+         * toggle selection of the targeted row
+         */
+        if (this.props.onSelectionChanged) {
+          let newSelection: ReadonlyArray<RowIndexPath>
+          if (this.props.selectedRows.includes(row)) {
+            // remove the ability to deselect the last item
+            if (this.props.selectedRows.length === 1) {
+              return
+            }
+            newSelection = this.props.selectedRows.filter(
+              ix => !rowIndexPathEquals(ix, row)
+            )
+          } else {
+            newSelection = [...this.props.selectedRows, row]
+          }
+
+          this.props.onSelectionChanged(newSelection, {
+            kind: 'mouseclick',
+            event,
+          })
+        }
+      } else if (
+        (this.props.selectionMode === 'range' ||
+          this.props.selectionMode === 'multi') &&
+        this.props.selectedRows.length > 1 &&
+        this.props.selectedRows.includes(row)
+      ) {
+        // Do nothing. Multiple rows are already selected. We assume the user is
+        // pressing down on multiple and may desire to start dragging. We will
+        // invoke the single selection `onRowMouseUp` if they let go here and no
+        // special keys are being pressed.
+      } else if (
+        this.props.selectedRows.length !== 1 ||
+        (this.props.selectedRows.length === 1 &&
+          !rowIndexPathEquals(row, this.props.selectedRows[0]))
+      ) {
+        /*
+         * if no special key is pressed, and that the selection is different,
+         * single selection occurs
+         */
+        this.selectSingleRowAfterMouseEvent(row, event)
+      }
+    }
+  }
+
+  private onRowMouseUp = (row: RowIndexPath, event: React.MouseEvent<any>) => {
+    if (!this.canSelectRow(row)) {
+      return
+    }
+
+    // macOS allow emulating a right click by holding down the ctrl key while
+    // performing a "normal" click.
+    const isRightClick =
+      event.button === 2 || (__DARWIN__ && event.button === 0 && event.ctrlKey)
+
+    // prevent the right-click event from changing the selection if not necessary
+    if (isRightClick && this.props.selectedRows.includes(row)) {
+      return
+    }
+
+    const multiSelectKey = __DARWIN__ ? event.metaKey : event.ctrlKey
+
+    if (
+      !event.shiftKey &&
+      !multiSelectKey &&
+      this.props.selectedRows.length > 1 &&
+      this.props.selectedRows.includes(row) &&
+      (this.props.selectionMode === 'range' ||
+        this.props.selectionMode === 'multi')
+    ) {
+      // No special keys are depressed and multiple rows were selected. The
+      // onRowMouseDown event was ignored for this scenario because the user may
+      // desire to started dragging multiple. However, if they let go, we want a
+      // new single selection to occur.
+      this.selectSingleRowAfterMouseEvent(row, event)
+    }
+  }
+
+  private selectSingleRowAfterMouseEvent(
+    row: RowIndexPath,
+    event: React.MouseEvent<any>
+  ): void {
+    if (this.props.onSelectionChanged) {
+      this.props.onSelectionChanged([row], { kind: 'mouseclick', event })
+    }
+
+    if (this.props.onSelectedRangeChanged) {
+      this.props.onSelectedRangeChanged(row, row, {
+        kind: 'mouseclick',
+        event,
+      })
+    }
+
+    if (this.props.onSelectedRowChanged) {
+      if (!isValidRow(row, this.props.rowCount)) {
+        log.debug(
+          `[List.selectSingleRowAfterMouseEvent] unable to onSelectedRowChanged for row '${row}' as it is outside the bounds`
+        )
+        return
+      }
+
+      this.props.onSelectedRowChanged(row, { kind: 'mouseclick', event })
+    }
+  }
+
+  private onRowClick = (row: RowIndexPath, event: React.MouseEvent<any>) => {
+    if (this.canSelectRow(row) && this.props.onRowClick) {
+      if (!isValidRow(row, this.props.rowCount)) {
+        log.debug(
+          `[List.onRowClick] unable to onRowClick for row ${row} as it is outside the bounds`
+        )
+        return
+      }
+
+      this.props.onRowClick(row, { kind: 'mouseclick', event })
+    }
+  }
+
+  private onRowDoubleClick = (
+    row: RowIndexPath,
+    event: React.MouseEvent<any>
+  ) => {
+    if (!this.props.onRowDoubleClick) {
+      return
+    }
+
+    this.props.onRowDoubleClick(row, { kind: 'mouseclick', event })
+  }
+
+  private onScroll = ({
+    scrollTop,
+    clientHeight,
+  }: {
+    scrollTop: number
+    clientHeight: number
+  }) => {
+    if (this.props.onScroll) {
+      this.props.onScroll(scrollTop, clientHeight)
+    }
+
+    // Set the scroll position of the fake scroll bar to that
+    // of the actual Grid. This is for mousewheel/touchpad scrolling
+    // on top of the Grid.
+    if (__WIN32__ && this.fakeScroll) {
+      // We're getting this event in reaction to the fake scroll
+      // having been scrolled and subsequently updating the
+      // Grid scrollTop, ignore it.
+      if (this.lastScroll === 'fake') {
+        this.lastScroll = null
+        return
+      }
+
+      this.lastScroll = 'grid'
+
+      this.fakeScroll.scrollTop = scrollTop
+    }
+
+    this.setState({ scrollTop })
+
+    // Make sure the root grid re-renders its children
+    this.rootGrid?.recomputeGridSize()
+  }
+
+  /**
+   * Explicitly put keyboard focus on the list or the selected item in the list.
+   *
+   * If the list a selected item it will be scrolled (if it's not already
+   * visible) and it will receive keyboard focus. If the list has no selected
+   * item the list itself will receive focus. From there keyboard navigation
+   * can be used to select the first or last items in the list.
+   *
+   * This method is a noop if the list has not yet been mounted.
+   */
+  public focus() {
+    const { selectedRows, rowCount } = this.props
+    const lastSelectedRow = selectedRows.at(-1)
+
+    if (
+      lastSelectedRow !== undefined &&
+      isValidRow(lastSelectedRow, rowCount)
+    ) {
+      this.scrollRowToVisible(lastSelectedRow)
+    } else {
+      // TODO: decide which grid to focus
+      // if (this.grid) {
+      //   const element = ReactDOM.findDOMNode(this.grid) as HTMLDivElement
+      //   if (element) {
+      //     element.focus()
+      //   }
+      // }
+    }
+  }
+}
diff --git a/app/src/ui/lib/list/selection.ts b/app/src/ui/lib/list/selection.ts
index 8369463eef4..023159f69e7 100644
--- a/app/src/ui/lib/list/selection.ts
+++ b/app/src/ui/lib/list/selection.ts
@@ -62,12 +62,21 @@ export interface ISelectAllSource {
   readonly kind: 'select-all'
 }
 
+/**
+ * Interface describing a user initiated selection change event originating
+ * when focusing the list when it has no selection.
+ */
+export interface IFocusSource {
+  readonly kind: 'focus'
+}
+
 /** A type union of possible sources of a selection changed event */
 export type SelectionSource =
   | IMouseClickSource
   | IHoverSource
   | IKeyboardSource
   | ISelectAllSource
+  | IFocusSource
 
 /**
  * Determine the next selectable row, given the direction and a starting
@@ -87,7 +96,7 @@ export function findNextSelectableRow(
   }
 
   const { direction, row } = action
-  const wrap = action.wrap === undefined ? true : action.wrap
+  const wrap = action.wrap ?? true
 
   // Ensure the row value is in the range between 0 and rowCount - 1
   //
diff --git a/app/src/ui/lib/password-text-box.tsx b/app/src/ui/lib/password-text-box.tsx
new file mode 100644
index 00000000000..798c60c189f
--- /dev/null
+++ b/app/src/ui/lib/password-text-box.tsx
@@ -0,0 +1,53 @@
+import * as React from 'react'
+import { ITextBoxProps, TextBox } from './text-box'
+import { Button } from './button'
+import { Octicon } from '../octicons'
+import * as octicons from '../octicons/octicons.generated'
+
+interface IPasswordTextBoxState {
+  /**
+   * Whether or not the password is currently visible in the underlying input
+   */
+  readonly showPassword: boolean
+}
+
+/** An password input element with app-standard styles and a button for toggling
+ * the visibility of the user password. */
+export class PasswordTextBox extends React.Component<
+  ITextBoxProps,
+  IPasswordTextBoxState
+> {
+  private textBoxRef = React.createRef<TextBox>()
+
+  public constructor(props: ITextBoxProps) {
+    super(props)
+
+    this.state = { showPassword: false }
+  }
+
+  private onTogglePasswordVisibility = () => {
+    this.setState({ showPassword: !this.state.showPassword })
+    this.textBoxRef.current!.focus()
+  }
+
+  public render() {
+    const buttonIcon = this.state.showPassword
+      ? octicons.eye
+      : octicons.eyeClosed
+    const type = this.state.showPassword ? 'text' : 'password'
+    const props: ITextBoxProps = { ...this.props, ...{ type } }
+    return (
+      <div className="password-text-box">
+        <TextBox {...props} ref={this.textBoxRef} />
+        <Button
+          ariaLabel="Toggle password visibility"
+          tooltip="Toggle password visibility"
+          onClick={this.onTogglePasswordVisibility}
+          ariaPressed={this.state.showPassword}
+        >
+          <Octicon symbol={buttonIcon} />
+        </Button>
+      </div>
+    )
+  }
+}
diff --git a/app/src/ui/lib/path-exists.ts b/app/src/ui/lib/path-exists.ts
index 5b195d18773..081fa8cff29 100644
--- a/app/src/ui/lib/path-exists.ts
+++ b/app/src/ui/lib/path-exists.ts
@@ -1,5 +1,5 @@
 import { access } from 'fs/promises'
-import { constant } from 'lodash'
+import constant from 'lodash/constant'
 
 /**
  * Returns a value indicating whether or not the provided path exists (as in
diff --git a/app/src/ui/lib/path-label.tsx b/app/src/ui/lib/path-label.tsx
index f5b4e7fe5ac..cb9281da9db 100644
--- a/app/src/ui/lib/path-label.tsx
+++ b/app/src/ui/lib/path-label.tsx
@@ -2,7 +2,7 @@ import * as React from 'react'
 
 import { AppFileStatus, AppFileStatusKind } from '../../models/status'
 import { Octicon } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import * as octicons from '../octicons/octicons.generated'
 import { PathText } from './path-text'
 
 interface IPathLabelProps {
@@ -12,6 +12,9 @@ interface IPathLabelProps {
   readonly status: AppFileStatus
 
   readonly availableWidth?: number
+
+  /** aria hidden value */
+  readonly ariaHidden?: boolean
 }
 
 /** The pixel width reserved to give the resize arrow padding on either side. */
@@ -41,17 +44,17 @@ export class PathLabel extends React.Component<IPathLabelProps, {}> {
         ? availableWidth / 2 - ResizeArrowPadding
         : undefined
       return (
-        <label {...props}>
+        <span {...props} aria-hidden={this.props.ariaHidden}>
           <PathText path={status.oldPath} availableWidth={segmentWidth} />
-          <Octicon className="rename-arrow" symbol={OcticonSymbol.arrowRight} />
+          <Octicon className="rename-arrow" symbol={octicons.arrowRight} />
           <PathText path={this.props.path} availableWidth={segmentWidth} />
-        </label>
+        </span>
       )
     } else {
       return (
-        <label {...props}>
+        <span {...props} aria-hidden={this.props.ariaHidden}>
           <PathText path={this.props.path} availableWidth={availableWidth} />
-        </label>
+        </span>
       )
     }
   }
diff --git a/app/src/ui/lib/popover-dropdown.tsx b/app/src/ui/lib/popover-dropdown.tsx
new file mode 100644
index 00000000000..6d00356b4ed
--- /dev/null
+++ b/app/src/ui/lib/popover-dropdown.tsx
@@ -0,0 +1,104 @@
+import * as React from 'react'
+import { Button } from './button'
+import { Popover, PopoverAnchorPosition, PopoverDecoration } from './popover'
+import { Octicon } from '../octicons'
+import * as octicons from '../octicons/octicons.generated'
+import classNames from 'classnames'
+
+const maxPopoverContentHeight = 500
+
+interface IPopoverDropdownProps {
+  readonly className?: string
+  readonly contentTitle: string
+  readonly buttonContent: JSX.Element | string
+  readonly label: string
+}
+
+interface IPopoverDropdownState {
+  readonly showPopover: boolean
+}
+
+/**
+ * A dropdown component for displaying a dropdown button that opens
+ * a popover to display contents relative to the button content.
+ */
+export class PopoverDropdown extends React.Component<
+  IPopoverDropdownProps,
+  IPopoverDropdownState
+> {
+  private invokeButtonRef: HTMLButtonElement | null = null
+
+  public constructor(props: IPopoverDropdownProps) {
+    super(props)
+
+    this.state = {
+      showPopover: false,
+    }
+  }
+
+  private onInvokeButtonRef = (buttonRef: HTMLButtonElement | null) => {
+    this.invokeButtonRef = buttonRef
+  }
+
+  private togglePopover = () => {
+    this.setState({ showPopover: !this.state.showPopover })
+  }
+
+  public closePopover = () => {
+    this.setState({ showPopover: false })
+  }
+
+  private renderPopover() {
+    if (!this.state.showPopover) {
+      return
+    }
+
+    const { contentTitle } = this.props
+
+    return (
+      <Popover
+        className="popover-dropdown-popover"
+        anchor={this.invokeButtonRef}
+        anchorPosition={PopoverAnchorPosition.BottomLeft}
+        maxHeight={maxPopoverContentHeight}
+        decoration={PopoverDecoration.Balloon}
+        onClickOutside={this.closePopover}
+        ariaLabelledby="popover-dropdown-header"
+      >
+        <div className="popover-dropdown-wrapper">
+          <div className="popover-dropdown-header">
+            <h3 id="popover-dropdown-header">{contentTitle}</h3>
+
+            <button
+              className="close"
+              onClick={this.closePopover}
+              aria-label="Close"
+            >
+              <Octicon symbol={octicons.x} />
+            </button>
+          </div>
+          <div className="popover-dropdown-content">{this.props.children}</div>
+        </div>
+      </Popover>
+    )
+  }
+
+  public render() {
+    const { className, buttonContent, label } = this.props
+    const cn = classNames('popover-dropdown-component', className)
+
+    return (
+      <div className={cn}>
+        <Button
+          onClick={this.togglePopover}
+          onButtonRef={this.onInvokeButtonRef}
+        >
+          <span className="popover-dropdown-button-label">{label}</span>
+          <span className="button-content">{buttonContent}</span>
+          <Octicon symbol={octicons.triangleDown} />
+        </Button>
+        {this.renderPopover()}
+      </div>
+    )
+  }
+}
diff --git a/app/src/ui/lib/popover.tsx b/app/src/ui/lib/popover.tsx
index 883a8cdef6e..7c8fd80511e 100644
--- a/app/src/ui/lib/popover.tsx
+++ b/app/src/ui/lib/popover.tsx
@@ -2,43 +2,100 @@ import * as React from 'react'
 import FocusTrap from 'focus-trap-react'
 import { Options as FocusTrapOptions } from 'focus-trap'
 import classNames from 'classnames'
+import {
+  ComputePositionReturn,
+  autoUpdate,
+  computePosition,
+} from '@floating-ui/react-dom'
+import {
+  arrow,
+  flip,
+  offset,
+  Placement,
+  shift,
+  Side,
+  size,
+} from '@floating-ui/core'
+import { assertNever } from '../../lib/fatal-error'
+import { isMacOSSequoia, isMacOSSonoma, isMacOSVentura } from '../../lib/get-os'
 
 /**
- * Position of the caret relative to the pop up. It's composed by 2 dimensions:
- * - The first one is the edge on which the caret will rest.
- * - The second one is the alignment of the caret within that edge.
+ * Position of the popover relative to its anchor element. It's composed by 2
+ * dimensions:
+ * - The first one is the edge of the anchor element from which the popover will
+ *   be displayed.
+ * - The second one is the alignment of the popover within that edge.
  *
- * Example: TopRight means the caret will be in the top edge, on its right side.
- *
- * **Note:** If new positions are added to this enum, the value given to them
- * is prepended with `popover-caret-` to create a class name which defines, in
- * `app/styles/ui/_popover.scss`, where the caret is located for that specific
- * position.
+ * Example: BottomRight means the popover will be in the bottom edge of the
+ * anchor element, on its right side.
  **/
-export enum PopoverCaretPosition {
+export enum PopoverAnchorPosition {
   Top = 'top',
   TopRight = 'top-right',
   TopLeft = 'top-left',
+  Left = 'left',
   LeftTop = 'left-top',
   LeftBottom = 'left-bottom',
+  Bottom = 'bottom',
+  BottomLeft = 'bottom-left',
+  BottomRight = 'bottom-right',
+  Right = 'right',
   RightTop = 'right-top',
+  RightBottom = 'right-bottom',
 }
 
 export enum PopoverAppearEffect {
   Shake = 'shake',
 }
 
+export enum PopoverDecoration {
+  None = 'none',
+  Balloon = 'balloon',
+}
+
+const TipSize = 8
+const TipCornerPadding = TipSize
+export const PopoverScreenBorderPadding = 10
+
 interface IPopoverProps {
   readonly onClickOutside?: (event?: MouseEvent) => void
-  readonly caretPosition: PopoverCaretPosition
+  readonly onMousedownOutside?: (event?: MouseEvent) => void
+  /** Element to anchor the popover to */
+  readonly anchor: HTMLElement | null
+  /** Offset to apply to the distance from the anchor */
+  readonly anchorOffset?: number
+  /** The position of the popover relative to the anchor.  */
+  readonly anchorPosition: PopoverAnchorPosition
+  /** Whether or not the popover behaves as a dialog. Optional. Default: true */
+  readonly isDialog?: boolean
+  /**
+   * The position of the tip or pointer of the popover relative to the side at
+   * which the tip is presented. Optional. Default: Center
+   */
   readonly className?: string
   readonly style?: React.CSSProperties
   readonly appearEffect?: PopoverAppearEffect
+  readonly ariaLabelledby?: string
+  readonly ariaDescribedBy?: string
+  readonly trapFocus?: boolean // Default: true
+  readonly decoration?: PopoverDecoration // Default: none
+
+  /** Maximum height decided by clients of Popover */
+  readonly maxHeight?: number
+  /** Minimum height decided by clients of Popover */
+  readonly minHeight?: number
 }
 
-export class Popover extends React.Component<IPopoverProps> {
+interface IPopoverState {
+  readonly position: ComputePositionReturn | null
+}
+
+export class Popover extends React.Component<IPopoverProps, IPopoverState> {
   private focusTrapOptions: FocusTrapOptions
   private containerDivRef = React.createRef<HTMLDivElement>()
+  private contentDivRef = React.createRef<HTMLDivElement>()
+  private tipDivRef = React.createRef<HTMLDivElement>()
+  private floatingCleanUp: (() => void) | null = null
 
   public constructor(props: IPopoverProps) {
     super(props)
@@ -46,23 +103,105 @@ export class Popover extends React.Component<IPopoverProps> {
     this.focusTrapOptions = {
       allowOutsideClick: true,
       escapeDeactivates: true,
-      onDeactivate: this.props.onClickOutside,
+      onDeactivate: this.props.onMousedownOutside ?? this.props.onClickOutside,
     }
+
+    this.state = { position: null }
+  }
+
+  private async setupPosition() {
+    this.floatingCleanUp?.()
+    this.floatingCleanUp = null
+
+    const { anchor } = this.props
+
+    if (
+      anchor === null ||
+      anchor === undefined ||
+      this.containerDivRef.current === null
+    ) {
+      return
+    }
+
+    this.floatingCleanUp = autoUpdate(
+      anchor,
+      this.containerDivRef.current,
+      this.updatePosition
+    )
+  }
+
+  private updatePosition = async () => {
+    const { anchor, anchorOffset, decoration, maxHeight } = this.props
+    const containerDiv = this.containerDivRef.current
+    const contentDiv = this.contentDivRef.current
+
+    if (
+      anchor === null ||
+      anchor === undefined ||
+      containerDiv === null ||
+      contentDiv === null
+    ) {
+      return
+    }
+
+    const tipDiv = this.tipDivRef.current
+    const extraOffset = anchorOffset ?? 0
+    const popoverOffset = decoration === PopoverDecoration.Balloon ? TipSize : 0
+
+    const middleware = [
+      offset(popoverOffset + extraOffset),
+      shift({ padding: PopoverScreenBorderPadding }),
+      flip({ padding: PopoverScreenBorderPadding }),
+      size({
+        apply({ availableHeight, availableWidth }) {
+          Object.assign(contentDiv.style, {
+            maxHeight:
+              maxHeight === undefined
+                ? `${availableHeight}px`
+                : `${Math.min(availableHeight, maxHeight)}px`,
+            maxWidth: `${availableWidth}px`,
+          })
+        },
+        padding: PopoverScreenBorderPadding,
+      }),
+    ]
+
+    if (decoration === PopoverDecoration.Balloon && tipDiv) {
+      middleware.push(arrow({ element: tipDiv, padding: TipCornerPadding }))
+    }
+
+    const position = await computePosition(anchor, containerDiv, {
+      strategy: 'fixed',
+      placement: this.getFloatingPlacementForAnchorPosition(),
+      middleware,
+    })
+
+    this.setState({ position })
   }
 
   public componentDidMount() {
     document.addEventListener('click', this.onDocumentClick)
+    document.addEventListener('mousedown', this.onDocumentMouseDown)
+    this.setupPosition()
+  }
+
+  public componentDidUpdate(prevProps: IPopoverProps) {
+    if (prevProps.anchor !== this.props.anchor) {
+      this.setupPosition()
+    }
   }
 
   public componentWillUnmount() {
     document.removeEventListener('click', this.onDocumentClick)
+    document.removeEventListener('mousedown', this.onDocumentMouseDown)
   }
 
   private onDocumentClick = (event: MouseEvent) => {
-    const { current: ref } = this.containerDivRef
+    const ref = this.containerDivRef.current
     const { target } = event
 
     if (
+      !event.defaultPrevented &&
       ref !== null &&
       ref.parentElement !== null &&
       target instanceof Node &&
@@ -73,24 +212,221 @@ export class Popover extends React.Component<IPopoverProps> {
     }
   }
 
+  private onDocumentMouseDown = (event: MouseEvent) => {
+    const ref = this.containerDivRef.current
+    const { target } = event
+
+    if (
+      !event.defaultPrevented &&
+      ref !== null &&
+      ref.parentElement !== null &&
+      target instanceof Node &&
+      !ref.parentElement.contains(target) &&
+      this.props.onMousedownOutside !== undefined
+    ) {
+      this.props.onMousedownOutside(event)
+    }
+  }
+
+  /**
+   * Gets the aria-labelledby or aria-describedby attribute
+   *
+   * The correct semantics are that a dialog element (which this is) should have
+   * an aria-labelledby for it's title.
+   *
+   * However, macOs VoiceOver is not reliable so we have some workarounds...
+   */
+  private getAriaAttributes() {
+    if (this.props.isDialog === false) {
+      return {}
+    }
+
+    if (isMacOSVentura()) {
+      /* macOs Ventura introduced a regression in that the aria-labelledby
+       * is not announced and if provided prevents the aria-describedby from being
+       * announced. Thus, this method will use aria-describedby instead of the
+       * aria-labelledby for macOs Ventura. This is not semantically correct tho,
+       * hopefully, macOs will be fixed in a future release. The issue is known for
+       * macOS versions 13.0 to the current version of 13.5 as of 2023-07-31. */
+      return {
+        'aria-describedby': `${this.props.ariaLabelledby} ${this.props.ariaDescribedBy}`,
+      }
+    }
+
+    if (isMacOSSonoma() || isMacOSSequoia()) {
+      // macOS Sonoma introduced a regression in that: For role of 'dialog', the
+      // aria-labelledby is not announced. However, if the dialog has a child
+      // with a role of header (aka h* elemeent) it will be announced as long as
+      // the aria-labelledby is not provided.
+      return {}
+    }
+
+    // correct semantics
+    return {
+      'aria-labelledby': this.props.ariaLabelledby,
+      'aria-describedby': this.props.ariaDescribedBy,
+    }
+  }
+
   public render() {
+    const {
+      trapFocus,
+      className,
+      appearEffect,
+      children,
+      decoration,
+      maxHeight,
+      minHeight,
+      isDialog,
+    } = this.props
     const cn = classNames(
-      'popover-component',
-      this.getClassNameForCaret(),
-      this.props.className,
-      this.props.appearEffect && `appear-${this.props.appearEffect}`
+      decoration === PopoverDecoration.Balloon && 'popover-component',
+      className,
+      appearEffect && `appear-${appearEffect}`
     )
 
-    return (
-      <FocusTrap active={true} focusTrapOptions={this.focusTrapOptions}>
-        <div className={cn} ref={this.containerDivRef} style={this.props.style}>
-          {this.props.children}
+    const { position } = this.state
+    // Make sure the popover *always* has at least `position: fixed` set, otherwise
+    // it can cause weird layout glitches.
+    const style: React.CSSProperties = {
+      position: 'fixed',
+      zIndex: 17, // same as --foldout-z-index
+      height: 'auto',
+      ...this.props.style,
+    }
+    const contentStyle: React.CSSProperties = {
+      overflow: 'hidden',
+      width: '100%',
+    }
+    let tipStyle: React.CSSProperties = {}
+
+    if (position) {
+      style.top = position.y === undefined ? undefined : `${position.y}px`
+      style.left = position.x === undefined ? undefined : `${position.x}px`
+      contentStyle.minHeight =
+        minHeight === undefined ? undefined : `${minHeight}px`
+      contentStyle.height =
+        maxHeight === undefined ? undefined : `${maxHeight}px`
+
+      const arrow = position.middlewareData.arrow
+
+      if (arrow) {
+        const side: Side = position.placement.split('-')[0] as Side
+
+        const staticSide = {
+          top: 'bottom',
+          right: 'left',
+          bottom: 'top',
+          left: 'right',
+        }[side]
+
+        const angle = {
+          top: '270deg',
+          right: '0deg',
+          bottom: '90deg',
+          left: '180deg',
+        }[side]
+
+        tipStyle = {
+          top: arrow.y,
+          left: arrow.x,
+          transform: `rotate(${angle})`,
+          [staticSide]: this.tipDivRef.current
+            ? `${-this.tipDivRef.current.offsetWidth}px`
+            : undefined,
+        }
+      }
+    }
+
+    const content = (
+      <div
+        className={cn}
+        style={style}
+        ref={this.containerDivRef}
+        {...this.getAriaAttributes()}
+        role={isDialog === false ? undefined : 'dialog'}
+      >
+        <div
+          className="popover-content"
+          style={contentStyle}
+          ref={this.contentDivRef}
+        >
+          {children}
         </div>
-      </FocusTrap>
+        {decoration === PopoverDecoration.Balloon && (
+          <div
+            className="popover-tip"
+            style={{
+              position: 'absolute',
+              width: TipSize * 2,
+              height: TipSize * 2,
+              ...tipStyle,
+            }}
+            ref={this.tipDivRef}
+          >
+            <div
+              className="popover-tip-border"
+              style={{
+                position: 'absolute',
+                right: 1,
+                width: 0,
+                height: 0,
+                borderWidth: `${TipSize}px`,
+                borderRightWidth: `${TipSize - 1}px`,
+              }}
+            />
+            <div
+              className="popover-tip-background"
+              style={{
+                position: 'absolute',
+                right: 0,
+                width: 0,
+                height: 0,
+                borderWidth: `${TipSize}px`,
+                borderRightWidth: `${TipSize - 1}px`,
+              }}
+            />
+          </div>
+        )}
+      </div>
+    )
+
+    return trapFocus !== false ? (
+      <FocusTrap focusTrapOptions={this.focusTrapOptions}>{content}</FocusTrap>
+    ) : (
+      content
     )
   }
 
-  private getClassNameForCaret() {
-    return `popover-caret-${this.props.caretPosition}`
+  private getFloatingPlacementForAnchorPosition(): Placement {
+    const { anchorPosition } = this.props
+    switch (anchorPosition) {
+      case PopoverAnchorPosition.Top:
+        return 'top'
+      case PopoverAnchorPosition.TopLeft:
+        return 'top-start'
+      case PopoverAnchorPosition.TopRight:
+        return 'top-end'
+      case PopoverAnchorPosition.Left:
+        return 'left'
+      case PopoverAnchorPosition.LeftTop:
+        return 'left-start'
+      case PopoverAnchorPosition.LeftBottom:
+        return 'left-end'
+      case PopoverAnchorPosition.Right:
+        return 'right'
+      case PopoverAnchorPosition.RightTop:
+        return 'right-start'
+      case PopoverAnchorPosition.RightBottom:
+        return 'right-end'
+      case PopoverAnchorPosition.Bottom:
+        return 'bottom'
+      case PopoverAnchorPosition.BottomLeft:
+        return 'bottom-start'
+      case PopoverAnchorPosition.BottomRight:
+        return 'bottom-end'
+      default:
+        assertNever(anchorPosition, 'Unknown anchor position')
+    }
   }
 }
diff --git a/app/src/ui/lib/radio-button.tsx b/app/src/ui/lib/radio-button.tsx
index edfa6b7a597..13d7eea1f85 100644
--- a/app/src/ui/lib/radio-button.tsx
+++ b/app/src/ui/lib/radio-button.tsx
@@ -19,14 +19,20 @@ interface IRadioButtonProps<T> {
   readonly checked: boolean
 
   /**
-   * The label of the radio button.
+   * The label of the radio button. If not provided, the children are used
    */
-  readonly label: string | JSX.Element
+  readonly label?: string | JSX.Element
 
   /**
    * The value of the radio button.
    */
   readonly value: T
+
+  /** Optional: The tab index of the radio button */
+  readonly tabIndex?: number
+
+  /** Whether the textarea field should auto focus when mounted. */
+  readonly autoFocus?: boolean
 }
 
 interface IRadioButtonState {
@@ -58,8 +64,12 @@ export class RadioButton<T extends string> extends React.Component<
           value={this.props.value}
           checked={this.props.checked}
           onChange={this.onSelected}
+          tabIndex={this.props.tabIndex}
+          autoFocus={this.props.autoFocus}
         />
-        <label htmlFor={this.state.inputId}>{this.props.label}</label>
+        <label htmlFor={this.state.inputId}>
+          {this.props.label ?? this.props.children}
+        </label>
       </div>
     )
   }
diff --git a/app/src/ui/lib/radio-group.tsx b/app/src/ui/lib/radio-group.tsx
new file mode 100644
index 00000000000..60f792ea77c
--- /dev/null
+++ b/app/src/ui/lib/radio-group.tsx
@@ -0,0 +1,74 @@
+import * as React from 'react'
+import { RadioButton } from './radio-button'
+
+interface IRadioGroupProps<T> {
+  /** The id of the element that serves as the menu's accessibility label */
+  readonly ariaLabelledBy?: string
+
+  /**
+   * The currently selected item, denoted by its key.
+   */
+  readonly selectedKey: T
+
+  /**
+   * The keys of the radio buttons to display, in order of the radio buttons.
+   */
+  readonly radioButtonKeys: ReadonlyArray<T>
+
+  /** Optional class for radio group*/
+  readonly className?: string
+
+  /**
+   * A function that's called whenever the selected item changes, either
+   * as a result of a click using a pointer device or as a result of the user
+   * hitting an up/down while the component has focus.
+   *
+   * The key argument corresponds to the key property of the selected item.
+   */
+  readonly onSelectionChanged: (key: T) => void
+
+  /** Render radio button label contents */
+  readonly renderRadioButtonLabelContents: (key: T) => JSX.Element | string
+}
+
+/**
+ * A component for presenting a small number of choices to the user.
+ */
+export class RadioGroup<T extends string> extends React.Component<
+  IRadioGroupProps<T>
+> {
+  private onSelectionChanged = (key: T) => {
+    this.props.onSelectionChanged(key)
+  }
+
+  private renderRadioButtons() {
+    const { radioButtonKeys, selectedKey } = this.props
+
+    return radioButtonKeys.map(key => {
+      const checked = selectedKey === key
+      return (
+        <RadioButton<T>
+          key={key}
+          checked={checked}
+          value={key}
+          onSelected={this.onSelectionChanged}
+          tabIndex={checked ? 0 : -1}
+        >
+          {this.props.renderRadioButtonLabelContents(key)}
+        </RadioButton>
+      )
+    })
+  }
+
+  public render() {
+    return (
+      <div
+        role="radiogroup"
+        aria-labelledby={this.props.ariaLabelledBy}
+        className={this.props.className}
+      >
+        {this.renderRadioButtons()}
+      </div>
+    )
+  }
+}
diff --git a/app/src/ui/lib/ref-name-text-box.tsx b/app/src/ui/lib/ref-name-text-box.tsx
index 9a7d1b37325..5500e88d2ef 100644
--- a/app/src/ui/lib/ref-name-text-box.tsx
+++ b/app/src/ui/lib/ref-name-text-box.tsx
@@ -2,9 +2,9 @@ import * as React from 'react'
 
 import { sanitizedRefName } from '../../lib/sanitize-ref-name'
 import { TextBox } from './text-box'
-import { Octicon } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
 import { Ref } from './ref'
+import { InputWarning } from './input-description/input-warning'
+import { InputError } from './input-description/input-error'
 
 interface IRefNameProps {
   /**
@@ -19,6 +19,16 @@ interface IRefNameProps {
    */
   readonly label?: string | JSX.Element
 
+  /**
+   * The aria-labelledBy attribute for the text box.
+   */
+  readonly ariaLabelledBy?: string
+
+  /**
+   * The aria-describedby attribute for the text box.
+   */
+  readonly ariaDescribedBy?: string
+
   /**
    * Called when the user changes the ref name.
    *
@@ -27,16 +37,12 @@ interface IRefNameProps {
   readonly onValueChange?: (sanitizedValue: string) => void
 
   /**
-   * Called when the user-entered ref name is not valid.
+   * Optional verb for the warning message.
    *
-   * This gives the opportunity to the caller to specify
-   * a custom warning message explaining that the sanitized
-   * value will be used instead.
+   * Warning message: Will be {this.props.warningMessageVerb ?? 'saved '} as{'
+   * '} <Ref>{sanitizedValue}</Ref>.
    */
-  readonly renderWarningMessage?: (
-    sanitizedValue: string,
-    proposedValue: string
-  ) => JSX.Element | string
+  readonly warningMessageVerb?: string
 
   /**
    * Callback used when the component loses focus.
@@ -84,11 +90,17 @@ export class RefNameTextBox extends React.Component<
           label={this.props.label}
           value={this.state.proposedValue}
           ref={this.textBoxRef}
+          ariaLabelledBy={this.props.ariaLabelledBy}
+          ariaDescribedBy={
+            this.props.ariaDescribedBy +
+            ` branch-name-warning` +
+            ` branch-name-error`
+          }
           onValueChanged={this.onValueChange}
           onBlur={this.onBlur}
         />
 
-        {this.renderRefValueWarning()}
+        {this.renderRefValueWarningError()}
       </div>
     )
   }
@@ -130,43 +142,55 @@ export class RefNameTextBox extends React.Component<
     }
   }
 
-  private renderRefValueWarning() {
+  private renderRefValueWarningError() {
     const { proposedValue, sanitizedValue } = this.state
 
     if (proposedValue === sanitizedValue) {
       return null
     }
 
-    const renderWarningMessage =
-      this.props.renderWarningMessage ?? this.defaultRenderWarningMessage
-
-    return (
-      <div className="warning-helper-text">
-        <Octicon symbol={OcticonSymbol.alert} />
-
-        <p>{renderWarningMessage(sanitizedValue, proposedValue)}</p>
-      </div>
-    )
-  }
-
-  private defaultRenderWarningMessage(
-    sanitizedValue: string,
-    proposedValue: string
-  ) {
     // If the proposed value ends up being sanitized as
     // an empty string we show a message saying that the
     // proposed value is invalid.
     if (sanitizedValue.length === 0) {
       return (
-        <>
+        <InputError
+          id="branch-name-error"
+          className="warning-helper-text"
+          trackedUserInput={proposedValue}
+          ariaLiveMessage={`Error: ${proposedValue} is not a valid name.`}
+        >
           <Ref>{proposedValue}</Ref> is not a valid name.
-        </>
+        </InputError>
       )
     }
 
+    return (
+      <InputWarning
+        id="branch-name-warning"
+        className="warning-helper-text"
+        trackedUserInput={proposedValue}
+        ariaLiveMessage={this.getWarningMessageAsString(sanitizedValue)}
+      >
+        <p>{this.renderWarningMessage(sanitizedValue)}</p>
+      </InputWarning>
+    )
+  }
+
+  private getWarningMessageAsString(sanitizedValue: string): string {
+    return `Warning: Will be ${
+      this.props.warningMessageVerb ?? 'created '
+    } as ${sanitizedValue}. Spaces and invalid characters have been replaced by hyphens.`
+  }
+
+  private renderWarningMessage(sanitizedValue: string) {
     return (
       <>
-        Will be created as <Ref>{sanitizedValue}</Ref>.
+        Will be {this.props.warningMessageVerb ?? 'created'} as{' '}
+        <Ref>{sanitizedValue}</Ref>.{' '}
+        <span className="sr-only">
+          Spaces and invalid characters have been replaced by hyphens.
+        </span>
       </>
     )
   }
diff --git a/app/src/ui/lib/rich-text.tsx b/app/src/ui/lib/rich-text.tsx
index 59a7f052929..b2ba6fc3bae 100644
--- a/app/src/ui/lib/rich-text.tsx
+++ b/app/src/ui/lib/rich-text.tsx
@@ -7,12 +7,13 @@ import { assertNever } from '../../lib/fatal-error'
 import memoizeOne from 'memoize-one'
 import { createObservableRef } from './observable-ref'
 import { Tooltip } from './tooltip'
+import { Emoji } from '../../lib/emoji'
 
 interface IRichTextProps {
   readonly className?: string
 
   /** A lookup of emoji characters to map to image resources */
-  readonly emoji: Map<string, string>
+  readonly emoji: Map<string, Emoji>
 
   /**
    * The raw text to inspect for things to highlight or an array
@@ -35,7 +36,7 @@ interface IRichTextProps {
 }
 
 function getElements(
-  emoji: Map<string, string>,
+  emoji: Map<string, Emoji>,
   repository: Repository | undefined,
   renderUrlsAsLinks: boolean | undefined,
   text: string | ReadonlyArray<TokenResult>
@@ -46,14 +47,18 @@ function getElements(
   return tokens.map((token, index) => {
     switch (token.kind) {
       case TokenType.Emoji:
-        return (
-          <img
-            key={index}
-            alt={token.text}
-            className="emoji"
-            src={token.path}
-          />
-        )
+        if (token.emoji) {
+          return <span key={index}>{token.emoji}</span>
+        } else {
+          return (
+            <img
+              key={index}
+              alt={token.description ?? token.text}
+              className="emoji"
+              src={token.path}
+            />
+          )
+        }
       case TokenType.Link:
         if (renderUrlsAsLinks !== false) {
           const title = token.text !== token.url ? token.url : undefined
diff --git a/app/src/ui/lib/row.tsx b/app/src/ui/lib/row.tsx
index d56ca2667c3..76b26ea17bd 100644
--- a/app/src/ui/lib/row.tsx
+++ b/app/src/ui/lib/row.tsx
@@ -2,6 +2,9 @@ import * as React from 'react'
 import classNames from 'classnames'
 
 interface IRowProps {
+  /** The id of the internal element */
+  readonly id?: string
+
   /** The class name for the internal element. */
   readonly className?: string
 }
@@ -14,6 +17,10 @@ interface IRowProps {
 export class Row extends React.Component<IRowProps, {}> {
   public render() {
     const className = classNames('row-component', this.props.className)
-    return <div className={className}>{this.props.children}</div>
+    return (
+      <div id={this.props.id} className={className}>
+        {this.props.children}
+      </div>
+    )
   }
 }
diff --git a/app/src/ui/lib/sandboxed-markdown.tsx b/app/src/ui/lib/sandboxed-markdown.tsx
index 561f46a09c4..2b8c1811828 100644
--- a/app/src/ui/lib/sandboxed-markdown.tsx
+++ b/app/src/ui/lib/sandboxed-markdown.tsx
@@ -6,11 +6,12 @@ import { readFile } from 'fs/promises'
 import { Tooltip } from './tooltip'
 import { createObservableRef } from './observable-ref'
 import { getObjectId } from './object-id'
-import { debounce } from 'lodash'
+import debounce from 'lodash/debounce'
 import {
   MarkdownEmitter,
   parseMarkdown,
 } from '../../lib/markdown-filters/markdown-filter'
+import { Emoji } from '../../lib/emoji'
 
 interface ISandboxedMarkdownProps {
   /** A string of unparsed markdown to display */
@@ -33,13 +34,19 @@ interface ISandboxedMarkdownProps {
   readonly onMarkdownParsed?: () => void
 
   /** Map from the emoji shortcut (e.g., :+1:) to the image's local path. */
-  readonly emoji: Map<string, string>
+  readonly emoji: Map<string, Emoji>
 
   /** The GitHub repository for some markdown filters such as issue and commits. */
   readonly repository?: GitHubRepository
 
   /** The context of which markdown resides - such as PullRequest, PullRequestComment, Commit */
   readonly markdownContext?: MarkdownContext
+
+  readonly underlineLinks: boolean
+
+  /** An area label to explain to screen reader users what the contents of the
+   * iframe are before they navigate into them. */
+  readonly ariaLabel: string
 }
 
 interface ISandboxedMarkdownState {
@@ -202,7 +209,12 @@ export class SandboxedMarkdown extends React.PureComponent<
         ${scrapeVariable('--text-color')}
         ${scrapeVariable('--background-color')}
       }
+
       ${css}
+
+      .markdown-body a {
+        text-decoration: ${this.props.underlineLinks ? 'underline' : 'inherit'};
+      }
     </style>`
   }
 
@@ -279,8 +291,10 @@ export class SandboxedMarkdown extends React.PureComponent<
 
     // Not sure why the content height != body height exactly. But we need to
     // set the height explicitly to prevent scrollbar/content cut off.
+    // HACK: Add 1 to the new height to avoid UI glitches like the one shown
+    // in https://github.com/desktop/desktop/pull/18596
     const divHeight = this.contentDivRef.clientHeight
-    this.frameContainingDivRef.style.height = `${divHeight}px`
+    this.frameContainingDivRef.style.height = `${divHeight + 1}px`
     this.props.onMarkdownParsed?.()
   }
 
@@ -367,9 +381,11 @@ export class SandboxedMarkdown extends React.PureComponent<
         ref={this.onFrameContainingDivRef}
       >
         <iframe
+          title="sandboxed-markdown-component"
           className="sandboxed-markdown-component"
-          sandbox=""
+          sandbox="allow-same-origin"
           ref={this.onFrameRef}
+          aria-label={this.props.ariaLabel}
         />
         {tooltipElements.map(e => (
           <Tooltip
diff --git a/app/src/ui/lib/section-filter-list.tsx b/app/src/ui/lib/section-filter-list.tsx
new file mode 100644
index 00000000000..1752c8f9125
--- /dev/null
+++ b/app/src/ui/lib/section-filter-list.tsx
@@ -0,0 +1,743 @@
+import * as React from 'react'
+import classnames from 'classnames'
+
+import { SectionList, ClickSource } from '../lib/list/section-list'
+import {
+  findNextSelectableRow,
+  SelectionDirection,
+} from '../lib/list/section-list-selection'
+import { TextBox } from '../lib/text-box'
+import { Row } from '../lib/row'
+
+import { match, IMatch, IMatches } from '../../lib/fuzzy-find'
+import { AriaLiveContainer } from '../accessibility/aria-live-container'
+import {
+  InvalidRowIndexPath,
+  RowIndexPath,
+  rowIndexPathEquals,
+} from './list/list-row-index-path'
+import {
+  IFilterListGroup,
+  IFilterListItem,
+  SelectionSource,
+} from './filter-list'
+import * as octicons from '../octicons/octicons.generated'
+
+interface IFlattenedGroup {
+  readonly kind: 'group'
+  readonly identifier: string
+}
+
+interface IFlattenedItem<T extends IFilterListItem> {
+  readonly kind: 'item'
+  readonly item: T
+  /** Array of indexes in `item.text` that should be highlighted */
+  readonly matches: IMatches
+}
+
+/**
+ * A row in the list. This is used internally after the user-provided groups are
+ * flattened.
+ */
+type IFilterListRow<T extends IFilterListItem> =
+  | IFlattenedGroup
+  | IFlattenedItem<T>
+
+interface ISectionFilterListProps<T extends IFilterListItem> {
+  /** A class name for the wrapping element. */
+  readonly className?: string
+
+  /** The height of the rows. */
+  readonly rowHeight: number
+
+  /** The ordered groups to display in the list. */
+  // eslint-disable-next-line react/no-unused-prop-types
+  readonly groups: ReadonlyArray<IFilterListGroup<T>>
+
+  /** The selected item. */
+  readonly selectedItem: T | null
+
+  /** Called to render each visible item. */
+  readonly renderItem: (item: T, matches: IMatches) => JSX.Element | null
+
+  /** Called to render header for the group with the given identifier. */
+  readonly renderGroupHeader?: (identifier: string) => JSX.Element | null
+
+  /** Called to render content before/above the filter and list. */
+  readonly renderPreList?: () => JSX.Element | null
+
+  /**
+   * This function will be called when a pointer device is pressed and then
+   * released on a selectable row. Note that this follows the conventions
+   * of button elements such that pressing Enter or Space on a keyboard
+   * while focused on a particular row will also trigger this event. Consumers
+   * can differentiate between the two using the source parameter.
+   *
+   * Note that this event handler will not be called for keyboard events
+   * if `event.preventDefault()` was called in the onRowKeyDown event handler.
+   *
+   * Consumers of this event do _not_ have to call event.preventDefault,
+   * when this event is subscribed to the list will automatically call it.
+   */
+  readonly onItemClick?: (item: T, source: ClickSource) => void
+
+  /**
+   * This function will be called when the selection changes as a result of a
+   * user keyboard or mouse action (i.e. not when props change). This function
+   * will not be invoked when an already selected row is clicked on.
+   *
+   * @param selectedItem - The item that was just selected
+   * @param source       - The kind of user action that provoked the change,
+   *                       either a pointer device press, or a keyboard event
+   *                       (arrow up/down)
+   */
+  readonly onSelectionChanged?: (
+    selectedItem: T | null,
+    source: SelectionSource
+  ) => void
+
+  /**
+   * Called when a key down happens in the filter text input. Users have a
+   * chance to respond or cancel the default behavior by calling
+   * `preventDefault()`.
+   */
+  readonly onFilterKeyDown?: (
+    event: React.KeyboardEvent<HTMLInputElement>
+  ) => void
+
+  /** Called when the Enter key is pressed in field of type search */
+  readonly onEnterPressedWithoutFilteredItems?: (text: string) => void
+
+  /** Aria label for a specific item */
+  readonly getItemAriaLabel?: (item: T) => string | undefined
+
+  /** Aria label for a specific group */
+  readonly getGroupAriaLabel?: (group: number) => string | undefined
+
+  /** The current filter text to use in the form */
+  readonly filterText?: string
+
+  /** Called when the filter text is changed by the user */
+  readonly onFilterTextChanged?: (text: string) => void
+
+  /**
+   * Whether or not the filter list should allow selection
+   * and filtering. Defaults to false.
+   */
+  readonly disabled?: boolean
+
+  /** Any props which should cause a re-render if they change. */
+  readonly invalidationProps: any
+
+  /** Called to render content after the filter. */
+  readonly renderPostFilter?: () => JSX.Element | null
+
+  /** Called when there are no items to render.  */
+  readonly renderNoItems?: () => JSX.Element | null
+
+  /**
+   * A reference to a TextBox that will be used to control this component.
+   *
+   * See https://github.com/desktop/desktop/issues/4317 for refactoring work to
+   * make this more composable which should make this unnecessary.
+   */
+  readonly filterTextBox?: TextBox
+
+  /**
+   * Callback to fire when the items in the filter list are updated
+   */
+  readonly onFilterListResultsChanged?: (resultCount: number) => void
+
+  /** Placeholder text for text box. Default is "Filter". */
+  readonly placeholderText?: string
+
+  /** If true, we do not render the filter. */
+  readonly hideFilterRow?: boolean
+
+  /**
+   * A handler called whenever a context menu event is received on the
+   * row container element.
+   *
+   * The context menu is invoked when a user right clicks the row or
+   * uses keyboard shortcut.s
+   */
+  readonly onItemContextMenu?: (
+    item: T,
+    event: React.MouseEvent<HTMLDivElement>
+  ) => void
+}
+
+interface IFilterListState<T extends IFilterListItem> {
+  readonly rows: ReadonlyArray<ReadonlyArray<IFilterListRow<T>>>
+  readonly selectedRow: RowIndexPath
+  readonly filterValue: string
+  readonly filterValueChanged: boolean
+  // Indices of groups in the filtered list
+  readonly groups: ReadonlyArray<number>
+}
+
+/** A List which includes the ability to filter based on its contents. */
+export class SectionFilterList<
+  T extends IFilterListItem
+> extends React.Component<ISectionFilterListProps<T>, IFilterListState<T>> {
+  private list: SectionList | null = null
+  private filterTextBox: TextBox | null = null
+
+  public constructor(props: ISectionFilterListProps<T>) {
+    super(props)
+
+    if (props.filterTextBox !== undefined) {
+      this.filterTextBox = props.filterTextBox
+    }
+
+    this.state = createStateUpdate(props, null)
+  }
+
+  public componentWillReceiveProps(nextProps: ISectionFilterListProps<T>) {
+    this.setState(createStateUpdate(nextProps, this.state))
+  }
+
+  public componentDidUpdate(
+    prevProps: ISectionFilterListProps<T>,
+    prevState: IFilterListState<T>
+  ) {
+    if (this.props.onSelectionChanged) {
+      const oldSelectedItemId = getItemIdFromRowIndex(
+        prevState.rows,
+        prevState.selectedRow
+      )
+      const newSelectedItemId = getItemIdFromRowIndex(
+        this.state.rows,
+        this.state.selectedRow
+      )
+
+      if (oldSelectedItemId !== newSelectedItemId) {
+        const propSelectionId = this.props.selectedItem
+          ? this.props.selectedItem.id
+          : null
+
+        if (propSelectionId !== newSelectedItemId) {
+          const newSelectedItem = getItemFromRowIndex(
+            this.state.rows,
+            this.state.selectedRow
+          )
+          this.props.onSelectionChanged(newSelectedItem, {
+            kind: 'filter',
+            filterText: this.props.filterText || '',
+          })
+        }
+      }
+    }
+
+    if (this.props.onFilterListResultsChanged !== undefined) {
+      const itemCount = this.state.rows
+        .flat()
+        .filter(row => row.kind === 'item').length
+
+      this.props.onFilterListResultsChanged(itemCount)
+    }
+  }
+
+  public componentDidMount() {
+    if (this.filterTextBox !== null) {
+      this.filterTextBox.selectAll()
+    }
+  }
+
+  public renderTextBox() {
+    return (
+      <TextBox
+        ref={this.onTextBoxRef}
+        displayClearButton={true}
+        prefixedIcon={octicons.search}
+        autoFocus={true}
+        placeholder={this.props.placeholderText || 'Filter'}
+        className="filter-list-filter-field"
+        onValueChanged={this.onFilterValueChanged}
+        onEnterPressed={this.onEnterPressed}
+        onKeyDown={this.onKeyDown}
+        value={this.props.filterText}
+        disabled={this.props.disabled}
+      />
+    )
+  }
+
+  public renderLiveContainer() {
+    if (!this.state.filterValueChanged) {
+      return null
+    }
+
+    const itemRows = this.state.rows.flat().filter(row => row.kind === 'item')
+    const resultsPluralized = itemRows.length === 1 ? 'result' : 'results'
+    const screenReaderMessage = `${itemRows.length} ${resultsPluralized}`
+
+    return (
+      <AriaLiveContainer
+        trackedUserInput={this.state.filterValue}
+        message={screenReaderMessage}
+      />
+    )
+  }
+
+  public renderFilterRow() {
+    if (this.props.hideFilterRow === true) {
+      return null
+    }
+
+    return (
+      <Row className="filter-field-row">
+        {this.props.filterTextBox === undefined ? this.renderTextBox() : null}
+        {this.props.renderPostFilter ? this.props.renderPostFilter() : null}
+      </Row>
+    )
+  }
+
+  public render() {
+    return (
+      <div className={classnames('filter-list', this.props.className)}>
+        {this.renderLiveContainer()}
+
+        {this.props.renderPreList ? this.props.renderPreList() : null}
+
+        {this.renderFilterRow()}
+
+        <div className="filter-list-container">{this.renderContent()}</div>
+      </div>
+    )
+  }
+
+  public selectNextItem(
+    focus: boolean = false,
+    inDirection: SelectionDirection = 'down'
+  ) {
+    if (this.list === null) {
+      return
+    }
+    let next: RowIndexPath | null = null
+
+    const rowCount = this.state.rows.map(r => r.length)
+    if (
+      this.state.selectedRow.row === -1 ||
+      this.state.selectedRow.row === this.state.rows.length
+    ) {
+      next = findNextSelectableRow(
+        rowCount,
+        {
+          direction: inDirection,
+          row: InvalidRowIndexPath,
+        },
+        this.canSelectRow
+      )
+    } else {
+      next = findNextSelectableRow(
+        rowCount,
+        {
+          direction: inDirection,
+          row: this.state.selectedRow,
+        },
+        this.canSelectRow
+      )
+    }
+
+    if (next !== null) {
+      this.setState({ selectedRow: next }, () => {
+        if (focus && this.list !== null) {
+          this.list.focus()
+        }
+      })
+    }
+  }
+
+  private renderContent() {
+    if (this.state.rows.length === 0 && this.props.renderNoItems) {
+      return this.props.renderNoItems()
+    } else {
+      return (
+        <SectionList
+          ref={this.onListRef}
+          rowCount={this.state.rows.map(r => r.length)}
+          rowRenderer={this.renderRow}
+          sectionHasHeader={this.sectionHasHeader}
+          getRowAriaLabel={this.getRowAriaLabel}
+          rowHeight={this.props.rowHeight}
+          selectedRows={
+            rowIndexPathEquals(this.state.selectedRow, InvalidRowIndexPath)
+              ? []
+              : [this.state.selectedRow]
+          }
+          onSelectedRowChanged={this.onSelectedRowChanged}
+          onRowClick={this.onRowClick}
+          onRowKeyDown={this.onRowKeyDown}
+          onRowContextMenu={this.onRowContextMenu}
+          canSelectRow={this.canSelectRow}
+          invalidationProps={{
+            ...this.props,
+            ...this.props.invalidationProps,
+          }}
+        />
+      )
+    }
+  }
+
+  private sectionHasHeader = (section: number) => {
+    const rows = this.state.rows[section]
+    return rows.length > 0 && rows[0].kind === 'group'
+  }
+
+  private getRowAriaLabel = (index: RowIndexPath) => {
+    const row = this.state.rows[index.section][index.row]
+    if (row.kind !== 'item') {
+      return undefined
+    }
+
+    const itemAriaLabel = this.props.getItemAriaLabel?.(row.item)
+
+    if (itemAriaLabel === undefined) {
+      return undefined
+    }
+
+    const groupAriaLabel = this.props.getGroupAriaLabel?.(
+      this.state.groups[index.section]
+    )
+
+    return groupAriaLabel !== undefined
+      ? `${itemAriaLabel}, ${groupAriaLabel}`
+      : itemAriaLabel
+  }
+
+  private renderRow = (index: RowIndexPath) => {
+    const row = this.state.rows[index.section][index.row]
+    if (row.kind === 'item') {
+      return this.props.renderItem(row.item, row.matches)
+    } else if (this.props.renderGroupHeader) {
+      return this.props.renderGroupHeader(row.identifier)
+    } else {
+      return null
+    }
+  }
+
+  private onTextBoxRef = (component: TextBox | null) => {
+    this.filterTextBox = component
+  }
+
+  private onListRef = (instance: SectionList | null) => {
+    this.list = instance
+  }
+
+  private onFilterValueChanged = (text: string) => {
+    if (this.props.onFilterTextChanged) {
+      this.props.onFilterTextChanged(text)
+    }
+  }
+
+  private onEnterPressed = (text: string) => {
+    const rows = this.state.rows.length
+    if (
+      rows === 0 &&
+      text.trim().length > 0 &&
+      this.props.onEnterPressedWithoutFilteredItems !== undefined
+    ) {
+      this.props.onEnterPressedWithoutFilteredItems(text)
+    }
+  }
+
+  private onSelectedRowChanged = (
+    index: RowIndexPath,
+    source: SelectionSource
+  ) => {
+    this.setState({ selectedRow: index })
+
+    if (this.props.onSelectionChanged) {
+      const row = this.state.rows[index.section][index.row]
+      if (row.kind === 'item') {
+        this.props.onSelectionChanged(row.item, source)
+      }
+    }
+  }
+
+  private canSelectRow = (index: RowIndexPath) => {
+    if (this.props.disabled) {
+      return false
+    }
+
+    const row = this.state.rows[index.section][index.row]
+    return row.kind === 'item'
+  }
+
+  private onRowClick = (index: RowIndexPath, source: ClickSource) => {
+    if (this.props.onItemClick) {
+      const row = this.state.rows[index.section][index.row]
+
+      if (row.kind === 'item') {
+        this.props.onItemClick(row.item, source)
+      }
+    }
+  }
+
+  private onRowContextMenu = (
+    index: RowIndexPath,
+    source: React.MouseEvent<HTMLDivElement>
+  ) => {
+    if (!this.props.onItemContextMenu) {
+      return
+    }
+
+    const row = this.state.rows[index.section][index.row]
+
+    if (row.kind !== 'item') {
+      return
+    }
+
+    this.props.onItemContextMenu(row.item, source)
+  }
+
+  private onRowKeyDown = (
+    indexPath: RowIndexPath,
+    event: React.KeyboardEvent<any>
+  ) => {
+    const list = this.list
+    if (!list) {
+      return
+    }
+
+    const rowCount = this.state.rows.map(r => r.length)
+
+    const firstSelectableRow = findNextSelectableRow(
+      rowCount,
+      { direction: 'down', row: InvalidRowIndexPath },
+      this.canSelectRow
+    )
+    const lastSelectableRow = findNextSelectableRow(
+      rowCount,
+      {
+        direction: 'up',
+        row: {
+          section: 0,
+          row: 0,
+        },
+      },
+      this.canSelectRow
+    )
+
+    let shouldFocus = false
+
+    if (
+      event.key === 'ArrowUp' &&
+      firstSelectableRow &&
+      rowIndexPathEquals(indexPath, firstSelectableRow)
+    ) {
+      shouldFocus = true
+    } else if (
+      event.key === 'ArrowDown' &&
+      lastSelectableRow &&
+      rowIndexPathEquals(indexPath, lastSelectableRow)
+    ) {
+      shouldFocus = true
+    }
+
+    if (shouldFocus) {
+      const textBox = this.filterTextBox
+
+      if (textBox) {
+        event.preventDefault()
+        textBox.focus()
+      }
+    }
+  }
+
+  private onKeyDown = (event: React.KeyboardEvent<HTMLInputElement>) => {
+    const list = this.list
+    const key = event.key
+
+    if (!list) {
+      return
+    }
+
+    if (this.props.onFilterKeyDown) {
+      this.props.onFilterKeyDown(event)
+    }
+
+    if (event.defaultPrevented) {
+      return
+    }
+
+    const rowCount = this.state.rows.map(r => r.length)
+
+    if (key === 'ArrowDown') {
+      if (rowCount.length > 0) {
+        const selectedRow = findNextSelectableRow(
+          rowCount,
+          { direction: 'down', row: InvalidRowIndexPath },
+          this.canSelectRow
+        )
+        if (selectedRow != null) {
+          this.setState({ selectedRow }, () => {
+            list.focus()
+          })
+        }
+      }
+
+      event.preventDefault()
+    } else if (key === 'ArrowUp') {
+      if (rowCount.length > 0) {
+        const selectedRow = findNextSelectableRow(
+          rowCount,
+          {
+            direction: 'up',
+            row: {
+              section: 0,
+              row: 0,
+            },
+          },
+          this.canSelectRow
+        )
+        if (selectedRow != null) {
+          this.setState({ selectedRow }, () => {
+            list.focus()
+          })
+        }
+      }
+
+      event.preventDefault()
+    } else if (key === 'Enter') {
+      // no repositories currently displayed, bail out
+      if (rowCount.length === 0) {
+        return event.preventDefault()
+      }
+
+      const filterText = this.props.filterText
+
+      if (filterText !== undefined && !/\S/.test(filterText)) {
+        return event.preventDefault()
+      }
+
+      const row = findNextSelectableRow(
+        rowCount,
+        { direction: 'down', row: InvalidRowIndexPath },
+        this.canSelectRow
+      )
+
+      if (row != null) {
+        this.onRowClick(row, { kind: 'keyboard', event })
+      }
+    }
+  }
+}
+
+export function getText<T extends IFilterListItem>(
+  item: T
+): ReadonlyArray<string> {
+  return item['text']
+}
+
+function getFirstVisibleRow<T extends IFilterListItem>(
+  rows: ReadonlyArray<ReadonlyArray<IFilterListRow<T>>>
+): RowIndexPath {
+  for (let i = 0; i < rows.length; i++) {
+    const groupRows = rows[i]
+    for (let j = 0; j < groupRows.length; j++) {
+      const row = groupRows[j]
+      if (row.kind === 'item') {
+        return { section: i, row: j }
+      }
+    }
+  }
+
+  return InvalidRowIndexPath
+}
+
+function createStateUpdate<T extends IFilterListItem>(
+  props: ISectionFilterListProps<T>,
+  state: IFilterListState<T> | null
+) {
+  const rows = new Array<Array<IFilterListRow<T>>>()
+  const filter = (props.filterText || '').toLowerCase()
+  let selectedRow = InvalidRowIndexPath
+  let section = 0
+  const selectedItem = props.selectedItem
+  const groupIndices = []
+
+  for (const [idx, group] of props.groups.entries()) {
+    const groupRows = new Array<IFilterListRow<T>>()
+    const items: ReadonlyArray<IMatch<T>> = filter
+      ? match(filter, group.items, getText)
+      : group.items.map(item => ({
+          score: 1,
+          matches: { title: [], subtitle: [] },
+          item,
+        }))
+
+    if (!items.length) {
+      continue
+    }
+
+    groupIndices.push(idx)
+
+    if (props.renderGroupHeader) {
+      groupRows.push({ kind: 'group', identifier: group.identifier })
+    }
+
+    for (const { item, matches } of items) {
+      if (selectedItem && item.id === selectedItem.id) {
+        selectedRow = {
+          section,
+          row: groupRows.length,
+        }
+      }
+
+      groupRows.push({ kind: 'item', item, matches })
+    }
+
+    rows.push(groupRows)
+    section++
+  }
+
+  if (selectedRow.row < 0 && filter.length) {
+    // If the selected item isn't in the list (e.g., filtered out), then
+    // select the first visible item.
+    selectedRow = getFirstVisibleRow(rows)
+  }
+
+  // Stay true if already set, otherwise become true if the filter has content
+  const filterValueChanged = state?.filterValueChanged
+    ? true
+    : filter.length > 0
+
+  return {
+    rows: rows,
+    selectedRow,
+    filterValue: filter,
+    filterValueChanged,
+    groups: groupIndices,
+  }
+}
+
+function getItemFromRowIndex<T extends IFilterListItem>(
+  items: ReadonlyArray<ReadonlyArray<IFilterListRow<T>>>,
+  index: RowIndexPath
+): T | null {
+  if (index.section < 0 || index.section >= items.length) {
+    return null
+  }
+
+  const group = items[index.section]
+  if (index.row < 0 || index.row >= group.length) {
+    return null
+  }
+
+  const row = group[index.row]
+
+  if (row.kind === 'item') {
+    return row.item
+  }
+
+  return null
+}
+
+function getItemIdFromRowIndex<T extends IFilterListItem>(
+  items: ReadonlyArray<ReadonlyArray<IFilterListRow<T>>>,
+  index: RowIndexPath
+): string | null {
+  const item = getItemFromRowIndex(items, index)
+  return item ? item.id : null
+}
diff --git a/app/src/ui/lib/sign-in.tsx b/app/src/ui/lib/sign-in.tsx
index 7ea2fad0d5c..c695b8ab5f8 100644
--- a/app/src/ui/lib/sign-in.tsx
+++ b/app/src/ui/lib/sign-in.tsx
@@ -1,7 +1,6 @@
 import * as React from 'react'
 import { AuthenticationForm } from './authentication-form'
 import { assertNever } from '../../lib/fatal-error'
-import { TwoFactorAuthentication } from '../lib/two-factor-authentication'
 import { EnterpriseServerEntry } from '../lib/enterprise-server-entry'
 import { Dispatcher } from '../dispatcher'
 import {
@@ -9,8 +8,10 @@ import {
   SignInStep,
   IEndpointEntryState,
   IAuthenticationState,
-  ITwoFactorAuthenticationState,
+  IExistingAccountWarning,
 } from '../../lib/stores'
+import { Ref } from './ref'
+import { getHTMLURL } from '../../lib/api'
 
 interface ISignInProps {
   readonly signInState: SignInState
@@ -27,19 +28,27 @@ export class SignIn extends React.Component<ISignInProps, {}> {
     this.props.dispatcher.setSignInEndpoint(url)
   }
 
-  private onCredentialsEntered = (username: string, password: string) => {
-    this.props.dispatcher.setSignInCredentials(username, password)
-  }
-
   private onBrowserSignInRequested = () => {
     this.props.dispatcher.requestBrowserAuthentication()
   }
 
-  private onOTPEntered = (otp: string) => {
-    this.props.dispatcher.setSignInOTP(otp)
+  private renderExistingAccountWarningStep(state: IExistingAccountWarning) {
+    return (
+      <>
+        <p className="existing-account-warning">
+          You're already signed in to{' '}
+          <Ref>{new URL(getHTMLURL(state.endpoint)).host}</Ref> with the account{' '}
+          <Ref>{state.existingAccount.login}</Ref>. If you continue, you will
+          first be signed out.
+        </p>
+        {this.renderAuthenticationStep(state)}
+      </>
+    )
   }
 
-  private renderEndpointEntryStep(state: IEndpointEntryState) {
+  private renderEndpointEntryStep(
+    state: IEndpointEntryState | IExistingAccountWarning
+  ) {
     const children = this.props.children as ReadonlyArray<JSX.Element>
     return (
       <EnterpriseServerEntry
@@ -51,33 +60,15 @@ export class SignIn extends React.Component<ISignInProps, {}> {
     )
   }
 
-  private renderAuthenticationStep(state: IAuthenticationState) {
+  private renderAuthenticationStep(
+    state: IAuthenticationState | IExistingAccountWarning
+  ) {
     const children = this.props.children as ReadonlyArray<JSX.Element>
 
     return (
       <AuthenticationForm
-        loading={state.loading}
-        error={state.error}
-        supportsBasicAuth={state.supportsBasicAuth}
         additionalButtons={children}
         onBrowserSignInRequested={this.onBrowserSignInRequested}
-        onSubmit={this.onCredentialsEntered}
-        forgotPasswordUrl={state.forgotPasswordUrl}
-        endpoint={state.endpoint}
-      />
-    )
-  }
-
-  private renderTwoFactorAuthenticationStep(
-    state: ITwoFactorAuthenticationState
-  ) {
-    return (
-      <TwoFactorAuthentication
-        loading={state.loading}
-        error={state.error}
-        type={state.type}
-        additionalButtons={this.props.children}
-        onOTPEntered={this.onOTPEntered}
       />
     )
   }
@@ -89,10 +80,10 @@ export class SignIn extends React.Component<ISignInProps, {}> {
     switch (state.kind) {
       case SignInStep.EndpointEntry:
         return this.renderEndpointEntryStep(state)
+      case SignInStep.ExistingAccountWarning:
+        return this.renderExistingAccountWarningStep(state)
       case SignInStep.Authentication:
         return this.renderAuthenticationStep(state)
-      case SignInStep.TwoFactorAuthentication:
-        return this.renderTwoFactorAuthenticationStep(state)
       case SignInStep.Success:
         return null
       default:
diff --git a/app/src/ui/lib/test-ui-components/test-ui-components.ts b/app/src/ui/lib/test-ui-components/test-ui-components.ts
new file mode 100644
index 00000000000..8bba75729dc
--- /dev/null
+++ b/app/src/ui/lib/test-ui-components/test-ui-components.ts
@@ -0,0 +1,500 @@
+import uuid from 'uuid'
+import { TestMenuEvent } from '../../../main-process/menu'
+import {
+  isRepositoryWithGitHubRepository,
+  Repository,
+} from '../../../models/repository'
+import { Dispatcher } from '../../dispatcher'
+import { assertNever } from '../../../lib/fatal-error'
+import {
+  ExternalEditorError,
+  suggestedExternalEditor,
+} from '../../../lib/editors/shared'
+import { updateStore } from '../update-store'
+import { enableTestMenuItems } from '../../../lib/feature-flag'
+import { Banner, BannerType } from '../../../models/banner'
+import { PopupType } from '../../../models/popup'
+import { CloningRepository } from '../../../models/cloning-repository'
+import { generateDevReleaseSummary } from '../../../lib/release-notes'
+import { ReleaseNote } from '../../../models/release-notes'
+import { getVersion } from '../app-proxy'
+import { Emoji } from '../../../lib/emoji'
+import { GitHubRepository } from '../../../models/github-repository'
+import { Account } from '../../../models/account'
+import { ShellError } from '../../../lib/shells/error'
+import { RetryActionType } from '../../../models/retry-actions'
+import {
+  AppFileStatusKind,
+  WorkingDirectoryFileChange,
+} from '../../../models/status'
+import { DiffSelection, DiffSelectionType } from '../../../models/diff'
+
+export function showTestUI(
+  name: TestMenuEvent,
+  repository: Repository | CloningRepository | null,
+  dispatcher: Dispatcher,
+  emoji: Map<string, Emoji>
+) {
+  if (!__DEV__ && !enableTestMenuItems()) {
+    return
+  }
+
+  switch (name) {
+    case 'boomtown':
+      return boomtown()
+    case 'test-accessibility-banner':
+      return dispatcher.setBanner({
+        type: BannerType.AccessibilitySettingsBanner,
+        onOpenAccessibilitySettings: () => {},
+      })
+    case 'test-app-error':
+      return testAppError()
+    case 'test-arm64-banner':
+      return showFakeUpdateBanner({ isArm64: true })
+    case 'test-confirm-committing-conflicted-files':
+      return showFakeConfirmCommittingConflictedFiles()
+    case 'test-cherry-pick-conflicts-banner':
+      return showFakeCherryPickConflictBanner()
+    case 'test-discarded-changes-will-be-unrecoverable':
+      return showFakeDiscardedChangesWillBeUnrecoverable()
+    case 'test-do-you-want-fork-this-repository':
+      return showFakeDoYouWantForkThisRepository()
+    case 'test-files-too-large':
+      return showFakeFilesTooLarge()
+    case 'test-generic-git-authentication':
+      return dispatcher.showPopup({
+        type: PopupType.GenericGitAuthentication,
+        remoteUrl: 'test-github.com',
+        onSubmit: (login: string, token: string) => {},
+        onDismiss: () => {},
+      })
+    case 'test-icons':
+      return showIconTestDialog()
+    case 'test-invalidated-account-token':
+      return dispatcher.showPopup({
+        type: PopupType.InvalidatedToken,
+        account: Account.anonymous(),
+      })
+    case 'test-merge-successful-banner':
+      return showFakeMergeSuccessfulBanner()
+    case 'test-move-to-application-folder':
+      return dispatcher.showPopup({ type: PopupType.MoveToApplicationsFolder })
+    case 'test-newer-commits-on-remote':
+      return showNewerCommitsOnRemote()
+    case 'test-no-external-editor':
+      return showTestNoExternalEditor()
+    case 'test-notification':
+      return testShowNotification()
+    case 'test-os-version-no-longer-supported':
+      return dispatcher.setBanner({
+        type: BannerType.OSVersionNoLongerSupported,
+      })
+    case 'test-prune-branches':
+      return testPruneBranches()
+    case 'test-push-rejected':
+      return showFakePushRejected()
+    case 'test-re-authorization-required':
+      return dispatcher.showPopup({
+        type: PopupType.SAMLReauthRequired,
+        organizationName: 'test-org',
+        endpoint: 'test-endpoint',
+      })
+    case 'test-release-notes-popup':
+      return showFakeReleaseNotesPopup()
+    case 'test-reorder-banner':
+      return showFakeReorderBanner()
+    case 'test-showcase-update-banner':
+      return showFakeUpdateBanner({ isShowcase: true })
+    case 'test-thank-you-banner':
+      return showFakeThankYouBanner()
+    case 'test-thank-you-popup':
+      return showFakeThankYouPopup()
+    case 'test-unable-to-locate-git':
+      return dispatcher.showPopup({
+        type: PopupType.InstallGit,
+        path: '/test/path/to/git',
+      })
+    case 'test-unable-to-open-shell':
+      return dispatcher.postError(
+        new ShellError(
+          `Could not find executable for '${
+            __DARWIN__ ? 'Terminal' : 'Command Prompt'
+          }' at path 'some/invalid/path'.  Please open ${
+            __DARWIN__ ? 'Settings' : 'Options'
+          } and select an available shell.`
+        )
+      )
+    case 'test-undone-banner':
+      return showFakeUndoneBanner()
+    case 'test-untrusted-server':
+      const mockIssuer = {
+        commonName: 'asdf',
+        country: 'asfd',
+        locality: 'asd',
+        organizations: ['org'],
+        organizationUnits: ['orgUnit'],
+        state: 'asdf',
+      }
+
+      const mockCert: any = {
+        data: 'asdf',
+        fingerprint: 'asdf',
+        issuerName: 'asdf',
+        issuer: mockIssuer,
+        serialNumber: 'asdf',
+        subject: mockIssuer,
+        subjectName: 'asdf',
+        validExpiry: 1731503528677,
+        validStart: 1731503528677,
+      }
+
+      mockCert.issueCert = mockCert
+      return dispatcher.showPopup({
+        type: PopupType.UntrustedCertificate,
+        certificate: mockCert,
+        url: `https://www.github.com`,
+      })
+    case 'test-update-banner':
+      return showFakeUpdateBanner({})
+    case 'test-prioritized-update-banner':
+      return showFakeUpdateBanner({
+        isPriority: true,
+        priorityInfoUrl: 'https://desktop.github.com',
+      })
+    case 'test-update-existing-git-lfs-filters':
+      return dispatcher.showPopup({ type: PopupType.LFSAttributeMismatch })
+    case 'test-upstream-already-exists':
+      return showFakeUpstreamAlreadyExists()
+    default:
+      return assertNever(name, `Unknown menu event name: ${name}`)
+  }
+
+  function boomtown() {
+    setImmediate(() => {
+      throw new Error('Boomtown!')
+    })
+  }
+
+  function testAppError() {
+    return dispatcher.postError(
+      new Error('Test Error - to use default error handler' + uuid())
+    )
+  }
+
+  function showFakeUpdateBanner(options: {
+    isArm64?: boolean
+    isShowcase?: boolean
+    isPriority?: boolean
+    priorityInfoUrl?: string
+  }) {
+    updateStore.setIsx64ToARM64ImmediateAutoUpdate(options.isArm64 === true)
+
+    if (options.isShowcase) {
+      dispatcher.setUpdateShowCaseVisibility(true)
+      return
+    }
+
+    if (options.isPriority !== undefined) {
+      updateStore.setPrioritizeUpdate(options.isPriority)
+    }
+
+    updateStore.setPrioritizeUpdateInfoUrl(options.priorityInfoUrl)
+
+    dispatcher.setUpdateBannerVisibility(true)
+  }
+
+  function showFakeConfirmCommittingConflictedFiles() {
+    if (repository == null || repository instanceof CloningRepository) {
+      return dispatcher.postError(
+        new Error(
+          'No repository to test with - check out a repository and try again'
+        )
+      )
+    }
+
+    return dispatcher.showPopup({
+      type: PopupType.CommitConflictsWarning,
+      files: [
+        new WorkingDirectoryFileChange(
+          'test/test.md',
+          { kind: AppFileStatusKind.New },
+          DiffSelection.fromInitialSelection(DiffSelectionType.All)
+        ),
+        new WorkingDirectoryFileChange(
+          'mock/mock.md',
+          { kind: AppFileStatusKind.New },
+          DiffSelection.fromInitialSelection(DiffSelectionType.All)
+        ),
+      ],
+      repository,
+      context: {
+        summary: 'Test summary',
+        description: 'Test description',
+      },
+    })
+  }
+
+  function showFakeCherryPickConflictBanner() {
+    dispatcher.setBanner({
+      type: BannerType.CherryPickConflictsFound,
+      targetBranchName: 'fake-branch',
+      onOpenConflictsDialog: () => {},
+    })
+  }
+
+  function showFakeDiscardedChangesWillBeUnrecoverable() {
+    if (repository == null || repository instanceof CloningRepository) {
+      return dispatcher.postError(
+        new Error(
+          'No repository to test with - check out a repository and try again'
+        )
+      )
+    }
+
+    return dispatcher.showPopup({
+      type: PopupType.DiscardChangesRetry,
+      retryAction: {
+        type: RetryActionType.DiscardChanges,
+        repository,
+        files: [
+          new WorkingDirectoryFileChange(
+            'test/test.md',
+            { kind: AppFileStatusKind.New },
+            DiffSelection.fromInitialSelection(DiffSelectionType.All)
+          ),
+          new WorkingDirectoryFileChange(
+            'mock/mock.md',
+            { kind: AppFileStatusKind.New },
+            DiffSelection.fromInitialSelection(DiffSelectionType.All)
+          ),
+        ],
+      },
+    })
+  }
+
+  function showFakeDoYouWantForkThisRepository() {
+    if (
+      repository == null ||
+      repository instanceof CloningRepository ||
+      !isRepositoryWithGitHubRepository(repository)
+    ) {
+      return dispatcher.postError(
+        new Error(
+          'No GitHub repository to test with - check out a GitHub repository and try again'
+        )
+      )
+    }
+
+    return dispatcher.showPopup({
+      type: PopupType.CreateFork,
+      repository,
+      account: Account.anonymous(),
+    })
+  }
+
+  function showFakeFilesTooLarge() {
+    if (
+      repository == null ||
+      repository instanceof CloningRepository ||
+      !isRepositoryWithGitHubRepository(repository)
+    ) {
+      return dispatcher.postError(
+        new Error(
+          'No GitHub repository to test with - check out a GitHub repository and try again'
+        )
+      )
+    }
+
+    return dispatcher.showPopup({
+      type: PopupType.OversizedFiles,
+      oversizedFiles: ['test/app.tsx', 'test/popup.tsx'],
+      context: {
+        summary: 'Test summary',
+        description: 'Test description',
+      },
+      repository,
+    })
+  }
+
+  function showIconTestDialog() {
+    dispatcher.showPopup({
+      type: PopupType.TestIcons,
+    })
+  }
+
+  function showFakeMergeSuccessfulBanner() {
+    dispatcher.setBanner({
+      type: BannerType.SuccessfulMerge,
+      ourBranch: 'fake-branch',
+    })
+  }
+
+  function showNewerCommitsOnRemote() {
+    if (repository == null || repository instanceof CloningRepository) {
+      return
+    }
+    dispatcher.showPopup({ type: PopupType.PushNeedsPull, repository })
+  }
+
+  function showTestNoExternalEditor() {
+    dispatcher.postError(
+      new ExternalEditorError(
+        `No suitable editors installed for GitHub Desktop to launch. Install ${suggestedExternalEditor.name} for your platform and restart GitHub Desktop to try again.`,
+        { suggestDefaultEditor: true }
+      )
+    )
+  }
+
+  function testShowNotification() {
+    // if current repository is not repository with github repository, return
+    if (
+      repository == null ||
+      repository instanceof CloningRepository ||
+      !isRepositoryWithGitHubRepository(repository)
+    ) {
+      return
+    }
+
+    dispatcher.showPopup({
+      type: PopupType.TestNotifications,
+      repository,
+    })
+  }
+
+  function testPruneBranches() {
+    dispatcher.testPruneBranches()
+  }
+
+  function showFakePushRejected() {
+    if (
+      repository == null ||
+      repository instanceof CloningRepository ||
+      !isRepositoryWithGitHubRepository(repository)
+    ) {
+      return dispatcher.postError(
+        new Error(
+          'No GitHub repository to test with - check out a GitHub repository and try again'
+        )
+      )
+    }
+
+    return dispatcher.showPopup({
+      type: PopupType.PushRejectedDueToMissingWorkflowScope,
+      rejectedPath: `.gitub/workflows/test.yml`,
+      repository,
+    })
+  }
+
+  async function showFakeReleaseNotesPopup() {
+    dispatcher.showPopup({
+      type: PopupType.ReleaseNotes,
+      newReleases: await generateDevReleaseSummary(),
+    })
+  }
+
+  function showFakeReorderBanner() {
+    dispatcher.setBanner({
+      type: BannerType.SuccessfulReorder,
+      count: 1,
+      onUndo: () => {
+        dispatcher.setBanner({
+          type: BannerType.ReorderUndone,
+          commitsCount: 1,
+        })
+      },
+    })
+  }
+
+  function showFakeThankYouBanner() {
+    const userContributions: ReadonlyArray<ReleaseNote> = [
+      {
+        kind: 'fixed',
+        message: 'A totally awesome fix that fixes something - #123. Thanks!',
+      },
+      {
+        kind: 'added',
+        message:
+          'You can now do this new thing that was added here - #456. Thanks!',
+      },
+    ]
+
+    const banner: Banner = {
+      type: BannerType.OpenThankYouCard,
+      // Grab emoji's by reference because we could still be loading emoji's
+      emoji,
+      onOpenCard: () =>
+        dispatcher.showPopup({
+          type: PopupType.ThankYou,
+          userContributions,
+          friendlyName: 'Test User',
+          latestVersion: getVersion(),
+        }),
+      onThrowCardAway: () => {
+        console.log('Thrown away :(....')
+      },
+    }
+    dispatcher.setBanner(banner)
+  }
+
+  function showFakeThankYouPopup() {
+    dispatcher.showPopup({
+      type: PopupType.ThankYou,
+      userContributions: [
+        {
+          kind: 'new',
+          message: '[New] Added fake thank you dialog',
+        },
+      ],
+      friendlyName: 'kind contributor',
+      latestVersion: '3.0.0',
+    })
+  }
+
+  function showFakeUndoneBanner() {
+    dispatcher.setBanner({
+      type: BannerType.ReorderUndone,
+      commitsCount: 1,
+    })
+  }
+
+  function showFakeUpstreamAlreadyExists() {
+    if (
+      repository == null ||
+      repository instanceof CloningRepository ||
+      !isRepositoryWithGitHubRepository(repository)
+    ) {
+      return dispatcher.postError(
+        new Error(
+          'No GitHub repository to test with - check out a github repo and try again'
+        )
+      )
+    }
+
+    const repo = new Repository(
+      repository.path,
+      repository.id,
+      new GitHubRepository(
+        repository.gitHubRepository.name,
+        repository.gitHubRepository.owner,
+        repository.gitHubRepository.dbID,
+        repository.gitHubRepository.isPrivate,
+        repository.gitHubRepository.htmlURL,
+        repository.gitHubRepository.cloneURL,
+        repository.gitHubRepository.issuesEnabled,
+        repository.gitHubRepository.isArchived,
+        repository.gitHubRepository.permissions,
+        repository.gitHubRepository // This ensures the repository has a parent even if it's not a fork for easier testing purposes
+      ),
+      repository.missing
+    )
+
+    return dispatcher.showPopup({
+      type: PopupType.UpstreamAlreadyExists,
+      repository: repo,
+      existingRemote: {
+        name: 'heya',
+        url: 'http://github.com/tidy-dev/heya.git',
+      },
+    })
+  }
+}
diff --git a/app/src/ui/lib/text-area.tsx b/app/src/ui/lib/text-area.tsx
index 1eef80e3231..fb37e328abc 100644
--- a/app/src/ui/lib/text-area.tsx
+++ b/app/src/ui/lib/text-area.tsx
@@ -46,6 +46,13 @@ interface ITextAreaProps {
 
   /** A callback to receive the underlying `textarea` instance. */
   readonly onTextAreaRef?: (instance: HTMLTextAreaElement | null) => void
+
+  /** Optional aria-label attribute */
+  readonly ariaLabel?: string
+
+  /** Optional aria-describedby attribute - usually for associating a descriptive
+   * message to the input such as a validation error, warning, or caption */
+  readonly ariaDescribedBy?: string
 }
 
 /** A textarea element with app-standard styles. */
@@ -84,6 +91,8 @@ export class TextArea extends React.Component<ITextAreaProps, {}> {
           onKeyDown={this.props.onKeyDown}
           ref={this.props.onTextAreaRef}
           onContextMenu={this.onContextMenu}
+          aria-label={this.props.ariaLabel}
+          aria-describedby={this.props.ariaDescribedBy}
         />
       </label>
     )
diff --git a/app/src/ui/lib/text-box.tsx b/app/src/ui/lib/text-box.tsx
index df4f5a12805..d334cc468b3 100644
--- a/app/src/ui/lib/text-box.tsx
+++ b/app/src/ui/lib/text-box.tsx
@@ -1,8 +1,10 @@
 import * as React from 'react'
 import classNames from 'classnames'
 import { createUniqueId, releaseUniqueId } from './id-pool'
-import { LinkButton } from './link-button'
 import { showContextualMenu } from '../../lib/menu-item'
+import { Octicon } from '../octicons'
+import * as octicons from '../octicons/octicons.generated'
+import { AriaLiveContainer } from '../accessibility/aria-live-container'
 
 export interface ITextBoxProps {
   /** The label for the input field. */
@@ -26,6 +28,30 @@ export interface ITextBoxProps {
   /** Whether the input field is disabled. */
   readonly disabled?: boolean
 
+  /** Whether the input field is read-only. */
+  readonly readOnly?: boolean
+
+  /** Indicates if input field should be required */
+  readonly required?: boolean
+
+  /**
+   * Indicates whether or not the control displays an invalid state.
+   * Default: true
+   */
+  readonly displayInvalidState?: boolean
+
+  /**
+   * Whether or not the control displays a clear button when it has text.
+   * Default: false
+   */
+  readonly displayClearButton?: boolean
+
+  /**
+   * Whether or not the control displays a clear button when it has text.
+   * Default: false
+   */
+  readonly prefixedIcon?: octicons.OcticonSymbol
+
   /**
    * Called when the user changes the value in the input field.
    *
@@ -47,34 +73,6 @@ export interface ITextBoxProps {
   /** The type of the input. Defaults to `text`. */
   readonly type?: 'text' | 'search' | 'password' | 'email'
 
-  /**
-   * An optional text for a link label element. A link label is, for the purposes
-   * of this control an anchor element that's rendered alongside (ie on the same)
-   * row as the the label element.
-   *
-   * Note that the link label will only be rendered if the textbox has a
-   * label text (specified through the label prop). A link label is used for
-   * presenting the user with a contextual link related to a specific text
-   * input such as a password recovery link for a password text box.
-   */
-  readonly labelLinkText?: string
-
-  /**
-   * An optional URL to be opened when the label link (if present, see the
-   * labelLinkText prop for more details) is clicked. The link will be opened using the
-   * standard semantics of a LinkButton, i.e. in the configured system browser.
-   *
-   * If not specified consumers need to subscribe to the onLabelLinkClick event.
-   */
-  readonly labelLinkUri?: string
-
-  /**
-   * An optional event handler which is invoked when the label link (if present,
-   * see the labelLinkText prop for more details) is clicked. See the onClick
-   * event on the LinkButton component for more details.
-   */
-  readonly onLabelLinkClick?: () => void
-
   /** The tab index of the input element. */
   readonly tabIndex?: number
 
@@ -97,6 +95,18 @@ export interface ITextBoxProps {
 
   /** Indicates if input field applies spellcheck */
   readonly spellcheck?: boolean
+
+  /** Optional aria-label attribute */
+  readonly ariaLabel?: string
+
+  /** Optional aria-labelledby attribute */
+  readonly ariaLabelledBy?: string
+
+  /** Optional aria-describedby attribute - usually for associating a descriptive
+   * message to the input such as a validation error, warning, or caption */
+  readonly ariaDescribedBy?: string
+
+  readonly ariaControls?: string
 }
 
 interface ITextBoxState {
@@ -111,6 +121,11 @@ interface ITextBoxState {
    * Text to display in the underlying input element
    */
   readonly value?: string
+
+  /**
+   * Input just cleared via clear button.
+   */
+  readonly valueCleared: boolean
 }
 
 /** An input element with app-standard styles. */
@@ -121,7 +136,7 @@ export class TextBox extends React.Component<ITextBoxProps, ITextBoxState> {
     const friendlyName = this.props.label || this.props.placeholder
     const inputId = createUniqueId(`TextBox_${friendlyName}`)
 
-    this.setState({ inputId, value: this.props.value })
+    this.setState({ inputId, value: this.props.value, valueCleared: false })
   }
 
   public componentWillUnmount() {
@@ -177,7 +192,9 @@ export class TextBox extends React.Component<ITextBoxProps, ITextBoxState> {
   private onChange = (event: React.FormEvent<HTMLInputElement>) => {
     const value = event.currentTarget.value
 
-    this.setState({ value }, () => {
+    // Even when the new value is '', we don't want to render the aria-live
+    // message saying "input cleared", so we set valueCleared to false.
+    this.setState({ value, valueCleared: false }, () => {
       if (this.props.onValueChanged) {
         this.props.onValueChanged(value)
       }
@@ -185,9 +202,26 @@ export class TextBox extends React.Component<ITextBoxProps, ITextBoxState> {
   }
 
   private onSearchTextCleared = () => {
-    if (this.props.onSearchCleared != null) {
-      this.props.onSearchCleared()
+    this.setState({ valueCleared: true })
+    this.props.onSearchCleared?.()
+  }
+
+  private clearSearchText = (e: React.MouseEvent) => {
+    e.preventDefault()
+
+    if (this.inputElement === null) {
+      return
     }
+
+    this.inputElement.value = ''
+
+    this.setState({ value: '', valueCleared: true }, () => {
+      if (this.props.onValueChanged) {
+        this.props.onValueChanged('')
+      }
+      this.props.onSearchCleared?.()
+      this.focus()
+    })
   }
 
   /**
@@ -213,35 +247,6 @@ export class TextBox extends React.Component<ITextBoxProps, ITextBoxState> {
     }
   }
 
-  private renderLabelLink() {
-    if (!this.props.labelLinkText) {
-      return null
-    }
-
-    return (
-      <LinkButton
-        uri={this.props.labelLinkUri}
-        onClick={this.props.onLabelLinkClick}
-        className="link-label"
-      >
-        {this.props.labelLinkText}
-      </LinkButton>
-    )
-  }
-
-  private renderLabel() {
-    if (!this.props.label) {
-      return null
-    }
-
-    return (
-      <div className="label-container">
-        <label htmlFor={this.state.inputId}>{this.props.label}</label>
-        {this.renderLabelLink()}
-      </div>
-    )
-  }
-
   private onContextMenu = (event: React.MouseEvent<any>) => {
     event.preventDefault()
     showContextualMenu([{ role: 'editMenu' }])
@@ -290,13 +295,21 @@ export class TextBox extends React.Component<ITextBoxProps, ITextBoxState> {
   }
 
   public render() {
-    const className = classNames('text-box-component', this.props.className)
-    const inputId = this.props.label ? this.state.inputId : undefined
+    const { label, className, prefixedIcon } = this.props
+    const inputId = label ? this.state.inputId : undefined
 
     return (
-      <div className={className}>
-        {this.renderLabel()}
-
+      <div
+        className={classNames('text-box-component', className, {
+          'no-invalid-state': this.props.displayInvalidState === false,
+          'display-clear-button': this.props.displayClearButton === true,
+          'display-prefixed-icon': prefixedIcon !== undefined,
+        })}
+      >
+        {label && <label htmlFor={inputId}>{label}</label>}
+        {prefixedIcon && (
+          <Octicon className="prefixed-icon" symbol={prefixedIcon} />
+        )}
         <input
           id={inputId}
           ref={this.onInputRef}
@@ -304,7 +317,8 @@ export class TextBox extends React.Component<ITextBoxProps, ITextBoxState> {
           onBlur={this.onBlur}
           autoFocus={this.props.autoFocus}
           disabled={this.props.disabled}
-          type={this.props.type}
+          readOnly={this.props.readOnly}
+          type={this.props.type ?? 'text'}
           placeholder={this.props.placeholder}
           value={this.state.value}
           onChange={this.onChange}
@@ -312,7 +326,26 @@ export class TextBox extends React.Component<ITextBoxProps, ITextBoxState> {
           tabIndex={this.props.tabIndex}
           onContextMenu={this.onContextMenu}
           spellCheck={this.props.spellcheck === true}
+          aria-label={this.props.ariaLabel}
+          aria-labelledby={this.props.ariaLabelledBy}
+          aria-controls={this.props.ariaControls}
+          aria-describedby={this.props.ariaDescribedBy}
+          required={this.props.required}
         />
+        {this.props.displayClearButton &&
+          this.state.value !== undefined &&
+          this.state.value !== '' && (
+            <button
+              className="clear-button"
+              aria-label="Clear"
+              onClick={this.clearSearchText}
+            >
+              <Octicon symbol={octicons.x} />
+            </button>
+          )}
+        {this.state.valueCleared && (
+          <AriaLiveContainer message="Input cleared" />
+        )}
       </div>
     )
   }
diff --git a/app/src/ui/lib/toggletipped-content.tsx b/app/src/ui/lib/toggletipped-content.tsx
new file mode 100644
index 00000000000..0a91667310b
--- /dev/null
+++ b/app/src/ui/lib/toggletipped-content.tsx
@@ -0,0 +1,131 @@
+import * as React from 'react'
+import { ITooltipProps, Tooltip } from './tooltip'
+import { createObservableRef } from './observable-ref'
+import classNames from 'classnames'
+import { AriaLiveContainer } from '../accessibility/aria-live-container'
+
+/**
+ * IToggledtippedContentProps is a superset of ITooltipProps but does not
+ * define the `target` prop as that's set programatically in render
+ */
+interface IToggledtippedContentProps
+  extends Omit<ITooltipProps<HTMLElement>, 'target'> {
+  /** The tooltip contents */
+  readonly tooltip: JSX.Element | string | undefined
+
+  /** Likely the tooltips content as a string - whatever needs to be
+   * communicated to a screen reader user that is communicated through the
+   * tooltip */
+  readonly ariaLiveMessage: string
+
+  /**
+   * An optional additional class name to set on the tooltip in order to be able
+   * to apply specific styles to the tooltip
+   */
+  readonly tooltipClassName?: string
+
+  /** An optional class name to set on the wrapper element */
+  readonly className?: string
+
+  /** An optional aria-label property in case children is not descriptive
+   * - for example an icon */
+  readonly ariaLabel?: string
+}
+
+interface IToggledtippedContentState {
+  /** State of when the tooltip is visible */
+  readonly tooltipVisible: boolean
+}
+
+/**
+ * A less keyboard toggleable version of the Tooltip content component for when
+ * it's acceptable to add a wrapping element around the content. The content
+ * will be wrapped in a button as it is toggleable. supports all the options
+ * that the Tooltip component does without having to worry about refs.
+ **/
+export class ToggledtippedContent extends React.Component<
+  IToggledtippedContentProps,
+  IToggledtippedContentState
+> {
+  private buttonRef: HTMLButtonElement | null = null
+  private buttonRefObservable = createObservableRef<HTMLButtonElement>()
+  private shouldForceAriaLiveMessage = false
+
+  public constructor(props: IToggledtippedContentProps) {
+    super(props)
+    this.state = {
+      tooltipVisible: false,
+    }
+
+    this.buttonRefObservable.subscribe(this.onButtonRef)
+  }
+
+  private onToggle = () => {
+    this.shouldForceAriaLiveMessage = !this.shouldForceAriaLiveMessage
+  }
+
+  private onTooltipVisible = () => {
+    this.setState({ tooltipVisible: true })
+  }
+
+  private onTooltipHidden = () => {
+    this.setState({ tooltipVisible: false })
+  }
+
+  private onButtonRef = (ref: HTMLButtonElement | null) => {
+    if (ref === null) {
+      const currRef = this.buttonRef
+      currRef?.removeEventListener('tooltip-shown', this.onTooltipVisible)
+      currRef?.removeEventListener('tooltip-hidden', this.onTooltipHidden)
+    } else {
+      ref.addEventListener('tooltip-shown', this.onTooltipVisible)
+      ref.addEventListener('tooltip-hidden', this.onTooltipHidden)
+    }
+    this.buttonRef = ref
+  }
+
+  public render() {
+    const {
+      tooltip,
+      children,
+      className,
+      tooltipClassName,
+      ariaLabel,
+      ariaLiveMessage,
+      ...rest
+    } = this.props
+
+    const classes = classNames('toggletip', className)
+
+    return (
+      <button
+        ref={this.buttonRefObservable}
+        className={classes}
+        aria-label={ariaLabel}
+        aria-haspopup="dialog"
+        type="button"
+        onClick={this.onToggle}
+      >
+        <>
+          {tooltip !== undefined && (
+            <Tooltip
+              target={this.buttonRefObservable}
+              className={tooltipClassName}
+              isToggleTip={true}
+              {...rest}
+            >
+              {tooltip}
+            </Tooltip>
+          )}
+          {children}
+          {this.state.tooltipVisible && (
+            <AriaLiveContainer
+              message={ariaLiveMessage}
+              trackedUserInput={this.shouldForceAriaLiveMessage}
+            />
+          )}
+        </>
+      </button>
+    )
+  }
+}
diff --git a/app/src/ui/lib/tooltip.tsx b/app/src/ui/lib/tooltip.tsx
index 6e4b05abbf1..956b1d9ab2b 100644
--- a/app/src/ui/lib/tooltip.tsx
+++ b/app/src/ui/lib/tooltip.tsx
@@ -53,6 +53,15 @@ export interface ITooltipProps<T> {
    */
   readonly interactive?: boolean
 
+  /**
+   * Whether or not the tooltip should be dismissable via the escape key. This
+   * is generally true, but if the tooltip is communicating something important
+   * to the user, such as an input error, it should not be dismissable.
+   *
+   * Defaults to true
+   */
+  readonly dismissable?: boolean
+
   /**
    * The amount of time to wait (in milliseconds) while a user hovers over the
    * target before displaying the tooltip. There's typically no reason to
@@ -109,6 +118,45 @@ export interface ITooltipProps<T> {
    * element within in iframe.
    */
   readonly tooltipOffset?: DOMRect
+
+  /** Optional parameter for toggle tip behavior.
+   *
+   * This means that on target click
+   * the tooltip will be shown but not on target focus.
+   */
+  readonly isToggleTip?: boolean
+
+  /** Optional parameter for to open on target click
+   *
+   * If you are looking for toggle tip behavior (tooltip does not open on
+   * focus), use isToggleTip instead.
+   */
+  readonly openOnTargetClick?: boolean
+
+  /** Open on target focus - typically only tooltips that target an element with
+   * ":focus-visible open on focus. This means any time the target it focused it
+   * opens." */
+  readonly openOnFocus?: boolean
+
+  /** Whether or not an ancestor component is focused, used in case we want
+   * the tooltip to be shown when it's focused. Examples of this are how we
+   * want to show the tooltip for file status icons when files in the file
+   * list are focused.
+   */
+  readonly ancestorFocused?: boolean
+
+  /** Whether or not to apply the aria-desribedby to the target element.
+   *
+   * Sometimes the target element maybe something like a button that already has
+   * an aria label that is the same as the tooltip content, if so this should be
+   * false.
+   *
+   * Note: If the tooltip does provide more context than the targets accessible
+   * label (visual or aria), this should be true.
+   *
+   * Default: true
+   * */
+  readonly applyAriaDescribedBy?: boolean
 }
 
 interface ITooltipState {
@@ -267,11 +315,86 @@ export class Tooltip<T extends TooltipTarget> extends React.Component<
 
     if (this.state.show !== prevState.show) {
       if (this.state.show && this.props.accessible !== false && this.state.id) {
-        target?.setAttribute('aria-describedby', this.state.id)
+        this.addToTargetAriaDescribedBy(target)
       } else {
-        target?.removeAttribute('aria-describedby')
+        this.removeFromTargetAriaDescribedBy(target)
       }
     }
+
+    if (prevProps.ancestorFocused !== this.props.ancestorFocused) {
+      this.updateBasedOnAncestorFocused()
+    }
+  }
+
+  private addToTargetAriaDescribedBy(target: TooltipTarget | null) {
+    if (
+      !target ||
+      !this.state.id ||
+      this.props.applyAriaDescribedBy === false
+    ) {
+      return
+    }
+
+    const ariaDescribedBy = target.getAttribute('aria-describedby')
+    const ariaDescribedByArray = ariaDescribedBy
+      ? ariaDescribedBy.split(' ')
+      : []
+    if (!ariaDescribedByArray.includes(this.state.id)) {
+      ariaDescribedByArray.push(this.state.id)
+      target.setAttribute('aria-describedby', ariaDescribedByArray.join(' '))
+    }
+  }
+
+  private removeFromTargetAriaDescribedBy(target: TooltipTarget | null) {
+    if (
+      !target ||
+      !this.state.id ||
+      this.props.applyAriaDescribedBy === false
+    ) {
+      return
+    }
+
+    const ariaDescribedBy = target.getAttribute('aria-describedby')
+    const ariaDescribedByArray = ariaDescribedBy
+      ? ariaDescribedBy.split(' ')
+      : []
+    const index = ariaDescribedByArray.indexOf(this.state.id)
+    if (index === -1) {
+      return
+    }
+
+    ariaDescribedByArray.splice(index, 1)
+
+    if (ariaDescribedByArray.length === 0) {
+      target.removeAttribute('aria-describedby')
+    } else {
+      target.setAttribute('aria-describedby', ariaDescribedByArray.join(' '))
+    }
+  }
+
+  private updateBasedOnAncestorFocused() {
+    const { target } = this.state
+    if (target === null) {
+      return
+    }
+
+    const { ancestorFocused } = this.props
+    if (ancestorFocused === true) {
+      this.beginShowTooltip()
+    } else if (ancestorFocused === false) {
+      this.beginHideTooltip()
+    }
+  }
+
+  private onKeyDown = (event: KeyboardEvent) => {
+    if (
+      event.key === 'Escape' &&
+      this.state.show &&
+      this.props.dismissable !== false
+    ) {
+      event.preventDefault()
+      this.beginHideTooltip()
+    }
   }
 
   private installTooltip(elem: TooltipTarget) {
@@ -280,26 +403,40 @@ export class Tooltip<T extends TooltipTarget> extends React.Component<
     elem.addEventListener('mousemove', this.onTargetMouseMove)
     elem.addEventListener('mousedown', this.onTargetMouseDown)
     elem.addEventListener('focus', this.onTargetFocus)
+    elem.addEventListener('focusin', this.onTargetFocusIn)
+    elem.addEventListener('focusout', this.onTargetBlur)
     elem.addEventListener('blur', this.onTargetBlur)
     elem.addEventListener('tooltip-shown', this.onTooltipShown)
     elem.addEventListener('tooltip-hidden', this.onTooltipHidden)
+    elem.addEventListener('click', this.onTargetClick)
+    elem.addEventListener('keydown', this.onKeyDown)
   }
 
   private removeTooltip(prevTarget: TooltipTarget | null) {
     if (prevTarget !== null) {
       if (prevTarget.getAttribute('aria-describedby')) {
-        prevTarget.removeAttribute('aria-describedby')
+        this.removeFromTargetAriaDescribedBy(prevTarget)
       }
       prevTarget.removeEventListener('mouseenter', this.onTargetMouseEnter)
       prevTarget.removeEventListener('mouseleave', this.onTargetMouseLeave)
       prevTarget.removeEventListener('mousemove', this.onTargetMouseMove)
       prevTarget.removeEventListener('mousedown', this.onTargetMouseDown)
       prevTarget.removeEventListener('focus', this.onTargetFocus)
+      prevTarget.removeEventListener('focusin', this.onTargetFocusIn)
+      prevTarget.removeEventListener('focusout', this.onTargetBlur)
       prevTarget.removeEventListener('blur', this.onTargetBlur)
+      prevTarget.removeEventListener('click', this.onTargetClick)
+      prevTarget.removeEventListener('keydown', this.onKeyDown)
     }
   }
 
+  private updateMouseRect = (event: MouseEvent) => {
+    this.mouseRect = new DOMRect(event.clientX - 10, event.clientY - 10, 20, 20)
+  }
+
   private onTargetMouseEnter = (event: MouseEvent) => {
+    this.updateMouseRect(event)
+
     this.mouseOverTarget = true
     this.cancelHideTooltip()
     if (!this.state.show) {
@@ -308,18 +445,44 @@ export class Tooltip<T extends TooltipTarget> extends React.Component<
   }
 
   private onTargetMouseMove = (event: MouseEvent) => {
-    this.mouseRect = new DOMRect(event.clientX - 10, event.clientY - 10, 20, 20)
+    this.updateMouseRect(event)
   }
 
   private onTargetMouseDown = (event: MouseEvent) => {
-    this.hideTooltip()
+    if (!this.props.isToggleTip) {
+      this.hideTooltip()
+    }
   }
 
   private onTargetFocus = (event: FocusEvent) => {
     // We only want to show the tooltip if the target was focused as a result of
     // keyboard navigation, see
     // https://developer.mozilla.org/en-US/docs/Web/CSS/:focus-visible
-    if (this.state.target?.matches(':focus-visible')) {
+    if (
+      this.state.target?.matches(':focus-visible') &&
+      !this.props.isToggleTip
+    ) {
+      this.beginShowTooltip()
+    }
+  }
+
+  private onTargetClick = (event: FocusEvent) => {
+    // We only want to handle click events for toggle tips
+    if (
+      !this.state.show &&
+      (this.props.isToggleTip || this.props.openOnTargetClick)
+    ) {
+      this.beginShowTooltip()
+    }
+  }
+
+  /**
+   * The focusin event fires when an element has received focus,
+   * after the focus event. The two events differ in that focusin bubbles, while
+   * focus does not.
+   */
+  private onTargetFocusIn = (event: FocusEvent) => {
+    if (this.props.openOnFocus) {
       this.beginShowTooltip()
     }
   }
@@ -619,7 +782,9 @@ function getTooltipPositionStyle(
   r.x -= host.x
   r.y -= host.y
 
-  return { transform: `translate(${r.left}px, ${r.top}px)` }
+  return {
+    transform: `translate(${Math.round(r.left)}px, ${Math.round(r.top)}px)`,
+  }
 }
 
 function getTooltipRectRelativeTo(
diff --git a/app/src/ui/lib/tooltipped-commit-sha.tsx b/app/src/ui/lib/tooltipped-commit-sha.tsx
new file mode 100644
index 00000000000..95c0037e673
--- /dev/null
+++ b/app/src/ui/lib/tooltipped-commit-sha.tsx
@@ -0,0 +1,68 @@
+import { clipboard } from 'electron'
+import React from 'react'
+import { Commit, shortenSHA } from '../../models/commit'
+import { Ref } from './ref'
+import { TooltipDirection } from './tooltip'
+import { TooltippedContent } from './tooltipped-content'
+
+interface ITooltippedCommitSHAProps {
+  readonly className?: string
+  /** Commit or long SHA of a commit to render in the component. */
+  readonly commit: string | Commit
+
+  /** Whether or not render the commit as a Ref component. Default: false */
+  readonly asRef?: boolean
+}
+
+export class TooltippedCommitSHA extends React.Component<
+  ITooltippedCommitSHAProps,
+  {}
+> {
+  private get shortSHA() {
+    const { commit } = this.props
+    return typeof commit === 'string' ? shortenSHA(commit) : commit.shortSha
+  }
+
+  private get longSHA() {
+    const { commit } = this.props
+    return typeof commit === 'string' ? commit : commit.sha
+  }
+
+  public render() {
+    const { className } = this.props
+
+    return (
+      <TooltippedContent
+        className={className}
+        tooltip={this.renderSHATooltip()}
+        tooltipClassName="sha-hint"
+        interactive={true}
+        direction={TooltipDirection.SOUTH}
+      >
+        {this.renderShortSHA()}
+      </TooltippedContent>
+    )
+  }
+
+  private renderShortSHA() {
+    return this.props.asRef === true ? (
+      <Ref>{this.shortSHA}</Ref>
+    ) : (
+      this.shortSHA
+    )
+  }
+
+  private renderSHATooltip() {
+    return (
+      <>
+        <code>{this.longSHA}</code>
+        <button onClick={this.onCopySHAButtonClick}>Copy</button>
+      </>
+    )
+  }
+
+  private onCopySHAButtonClick = (e: React.MouseEvent<HTMLButtonElement>) => {
+    e.preventDefault()
+    clipboard.writeText(this.longSHA)
+  }
+}
diff --git a/app/src/ui/lib/tooltipped-content.tsx b/app/src/ui/lib/tooltipped-content.tsx
index 3a4a1993437..26aada8683f 100644
--- a/app/src/ui/lib/tooltipped-content.tsx
+++ b/app/src/ui/lib/tooltipped-content.tsx
@@ -14,6 +14,9 @@ interface ITooltippedContentProps
   /** The wrapper element tag name, defaults to span */
   readonly tagName?: keyof HTMLElementTagNameMap
 
+  /** The html id of the element */
+  readonly id?: string
+
   /**
    * An optional additional class name to set on the tooltip in order to be able
    * to apply specific styles to the tooltip
@@ -22,6 +25,16 @@ interface ITooltippedContentProps
 
   /** An optional class name to set on the wrapper element */
   readonly className?: string
+
+  /** Open on target focus */
+  readonly openOnFocus?: boolean
+
+  /** Whether or not an ancestor component is focused, used in case we want
+   * the tooltip to be shown when it's focused. Examples of this are how we
+   * want to show the tooltip for file status icons when files in the file
+   * list are focused.
+   */
+  readonly ancestorFocused?: boolean
 }
 
 /**
@@ -37,6 +50,7 @@ export class TooltippedContent extends React.Component<ITooltippedContentProps>
       this.props
 
     return React.createElement(tagName ?? 'span', {
+      id: this.props.id,
       ref: this.wrapperRef,
       className: className,
       children: (
diff --git a/app/src/ui/lib/two-factor-authentication.tsx b/app/src/ui/lib/two-factor-authentication.tsx
deleted file mode 100644
index 499439876a5..00000000000
--- a/app/src/ui/lib/two-factor-authentication.tsx
+++ /dev/null
@@ -1,105 +0,0 @@
-import * as React from 'react'
-import { Loading } from './loading'
-import { Button } from './button'
-import { TextBox } from './text-box'
-import { Form } from './form'
-import { Errors } from './errors'
-
-import { getWelcomeMessage, AuthenticationMode } from '../../lib/2fa'
-
-interface ITwoFactorAuthenticationProps {
-  /**
-   * A callback which is invoked once the user has entered a
-   * OTP token and submitted it either by clicking on the submit
-   * button or by submitting the form through other means (ie hitting Enter).
-   */
-  readonly onOTPEntered: (otp: string) => void
-
-  /** An array of additional buttons to render after the "Sign In" button. */
-  readonly additionalButtons?:
-    | ReadonlyArray<JSX.Element>
-    | number
-    | string
-    | boolean
-    | {}
-    | null
-
-  /**
-   * An error which, if present, is presented to the
-   * user in close proximity to the actions or input fields
-   * related to the current step.
-   */
-  readonly error: Error | null
-
-  /**
-   * A value indicating whether or not the sign in store is
-   * busy processing a request. While this value is true all
-   * form inputs and actions save for a cancel action will
-   * be disabled.
-   */
-  readonly loading: boolean
-
-  /**
-   * The 2FA type expected by the GitHub endpoint.
-   */
-  readonly type: AuthenticationMode
-}
-
-interface ITwoFactorAuthenticationState {
-  readonly otp: string
-}
-
-/** The two-factor authentication component. */
-export class TwoFactorAuthentication extends React.Component<
-  ITwoFactorAuthenticationProps,
-  ITwoFactorAuthenticationState
-> {
-  public constructor(props: ITwoFactorAuthenticationProps) {
-    super(props)
-
-    this.state = { otp: '' }
-  }
-
-  public render() {
-    const textEntryDisabled = this.props.loading
-
-    // ensure user has entered non-whitespace characters
-    const codeProvided = /\S+/.test(this.state.otp)
-    const signInDisabled = !codeProvided || this.props.loading
-    const errors = this.props.error ? (
-      <Errors>{this.props.error.message}</Errors>
-    ) : null
-
-    return (
-      <div>
-        <p className="welcome-text">{getWelcomeMessage(this.props.type)}</p>
-
-        <Form onSubmit={this.signIn}>
-          <TextBox
-            label="Authentication code"
-            disabled={textEntryDisabled}
-            autoFocus={true}
-            onValueChanged={this.onOTPChange}
-          />
-
-          {errors}
-
-          <div className="actions">
-            <Button type="submit" disabled={signInDisabled}>
-              {this.props.loading ? <Loading /> : null} Verify
-            </Button>
-            {this.props.additionalButtons}
-          </div>
-        </Form>
-      </div>
-    )
-  }
-
-  private onOTPChange = (text: string) => {
-    this.setState({ otp: text })
-  }
-
-  private signIn = () => {
-    this.props.onOTPEntered(this.state.otp)
-  }
-}
diff --git a/app/src/ui/lib/update-branch.ts b/app/src/ui/lib/update-branch.ts
index 5ee73bf0eab..fb76a3b0939 100644
--- a/app/src/ui/lib/update-branch.ts
+++ b/app/src/ui/lib/update-branch.ts
@@ -1,5 +1,4 @@
-import { enableSquashMerging } from '../../lib/feature-flag'
-import { getCommitsBetweenCommits, getMergeBase } from '../../lib/git'
+import { getCommitsBetweenCommits } from '../../lib/git'
 import { promiseWithMinimumTimeout } from '../../lib/promise'
 import { Branch } from '../../models/branch'
 import { ComputedAction } from '../../models/computed-action'
@@ -9,29 +8,26 @@ import { Repository } from '../../models/repository'
 import { IDropdownSelectButtonOption } from '../dropdown-select-button'
 
 export function getMergeOptions(): ReadonlyArray<IDropdownSelectButtonOption> {
-  const mergeOptions = [
+  return [
     {
       label: 'Create a merge commit',
       description:
         'The commits from the selected branch will be added to the current branch via a merge commit.',
-      value: MultiCommitOperationKind.Merge,
+      id: MultiCommitOperationKind.Merge,
     },
-  ]
-  if (enableSquashMerging()) {
-    mergeOptions.push({
+    {
       label: 'Squash and merge',
       description:
         'The commits in the selected branch will be combined into one commit in the current branch.',
-      value: MultiCommitOperationKind.Squash,
-    })
-  }
-  mergeOptions.push({
-    label: 'Rebase',
-    description:
-      'The commits from the selected branch will be rebased and added to the current branch.',
-    value: MultiCommitOperationKind.Rebase,
-  })
-  return mergeOptions
+      id: MultiCommitOperationKind.Squash,
+    },
+    {
+      label: 'Rebase',
+      description:
+        'The commits from the selected branch will be rebased and added to the current branch.',
+      id: MultiCommitOperationKind.Rebase,
+    },
+  ]
 }
 
 export async function updateRebasePreview(
@@ -46,21 +42,15 @@ export async function updateRebasePreview(
     kind: ComputedAction.Loading,
   })
 
-  const { commits, base } = await promiseWithMinimumTimeout(async () => {
-    const commits = await getCommitsBetweenCommits(
-      repository,
-      baseBranch.tip.sha,
-      targetBranch.tip.sha
-    )
-
-    const base = await getMergeBase(
-      repository,
-      baseBranch.tip.sha,
-      targetBranch.tip.sha
-    )
-
-    return { commits, base }
-  }, 500)
+  const commits = await promiseWithMinimumTimeout(
+    () =>
+      getCommitsBetweenCommits(
+        repository,
+        baseBranch.tip.sha,
+        targetBranch.tip.sha
+      ),
+    500
+  )
 
   // if the branch being track has changed since we started this work, abandon
   // any further state updates (this function is re-entrant if the user is
@@ -79,14 +69,8 @@ export async function updateRebasePreview(
     return
   }
 
-  // the target branch is a direct descendant of the base branch
-  // which means the target branch is already up to date and the commits
-  // do not need to be applied
-  const isDirectDescendant = base === baseBranch.tip.sha
-  const commitsOrIgnore = isDirectDescendant ? [] : commits
-
   onUpdate({
     kind: ComputedAction.Clean,
-    commits: commitsOrIgnore,
+    commits,
   })
 }
diff --git a/app/src/ui/lib/update-store.ts b/app/src/ui/lib/update-store.ts
index b74b9ae5464..ce26a5ab4fd 100644
--- a/app/src/ui/lib/update-store.ts
+++ b/app/src/ui/lib/update-store.ts
@@ -22,6 +22,8 @@ import { setNumber, getNumber } from '../../lib/local-storage'
 import { enableUpdateFromEmulatedX64ToARM64 } from '../../lib/feature-flag'
 import { offsetFromNow } from '../../lib/offset-from'
 import { gte, SemVer } from 'semver'
+import { getVersion } from './app-proxy'
+import { getUserAgent } from '../../lib/http'
 
 /** The last version a showcase was seen. */
 export const lastShowCaseVersionSeen = 'version-of-last-showcase'
@@ -47,7 +49,10 @@ export enum UpdateStatus {
 export interface IUpdateState {
   status: UpdateStatus
   lastSuccessfulCheck: Date | null
+  isX64ToARM64ImmediateAutoUpdate: boolean
   newReleases: ReadonlyArray<ReleaseSummary> | null
+  prioritizeUpdate: boolean
+  prioritizeUpdateInfoUrl: string | undefined
 }
 
 /** A store which contains the current state of the auto updater. */
@@ -56,9 +61,20 @@ class UpdateStore {
   private status = UpdateStatus.UpdateNotChecked
   private lastSuccessfulCheck: Date | null = null
   private newReleases: ReadonlyArray<ReleaseSummary> | null = null
+  private isX64ToARM64ImmediateAutoUpdate: boolean = false
 
   /** Is the most recent update check user initiated? */
   private userInitiatedUpdate = true
+  private _prioritizeUpdate = false
+  private _prioritizeUpdateInfoUrl: string | undefined = undefined
+
+  public get prioritizeUpdate() {
+    return this._prioritizeUpdate
+  }
+
+  public get prioritizeUpdateInfoUrl() {
+    return this._prioritizeUpdateInfoUrl
+  }
 
   public constructor() {
     const lastSuccessfulCheckTime = getNumber(lastSuccessfulCheckKey, 0)
@@ -112,8 +128,31 @@ class UpdateStore {
 
   private onUpdateDownloaded = async () => {
     this.newReleases = await generateReleaseSummary()
+    // We know it's an "immediate" auto-update from x64 to arm64 if the app is
+    // running on arm64 under x64 emulation and there is only one new release
+    // and it's the same version we have right now (which means we spoofed
+    // Central with an old version of the app).
+    this.isX64ToARM64ImmediateAutoUpdate =
+      this.supportsImmediateUpdateFromEmulatedX64ToARM64() &&
+      this.newReleases !== null &&
+      this.newReleases.length === 1 &&
+      this.newReleases[0].latestVersion === getVersion() &&
+      (await isRunningUnderARM64Translation())
     this.status = UpdateStatus.UpdateReady
     this.emitDidChange()
+
+    this.updatePriorityUpdateStatus()
+  }
+
+  /**
+   * Whether or not the app supports auto-updating x64 apps running under ARM
+   * translation to ARM64 builds IMMEDIATELY instead of waiting for the next
+   * release.
+   */
+  private supportsImmediateUpdateFromEmulatedX64ToARM64(): boolean {
+    // Because of how Squirrel.Windows works, this is only available for macOS.
+    // See: https://github.com/desktop/desktop/pull/14998
+    return __DARWIN__
   }
 
   /** Register a function to call when the auto updater state changes. */
@@ -143,24 +182,62 @@ class UpdateStore {
       status: this.status,
       lastSuccessfulCheck: this.lastSuccessfulCheck,
       newReleases: this.newReleases,
+      isX64ToARM64ImmediateAutoUpdate: this.isX64ToARM64ImmediateAutoUpdate,
+      prioritizeUpdate: this.prioritizeUpdate,
+      prioritizeUpdateInfoUrl: this.prioritizeUpdateInfoUrl,
     }
   }
 
   /**
    * Check for updates.
    *
-   * @param inBackground - Are we checking for updates in the background, or was
+   * @param inBackground  - Are we checking for updates in the background, or was
    *                       this check user-initiated?
+   * @param skipGuidCheck - If true, don't check the GUID. If true, this will
+   *                       effectively disable the staggered releases system and
+   *                       attempt to retrieve the latest available deployment.
    */
-  public async checkForUpdates(inBackground: boolean) {
+  public async checkForUpdates(inBackground: boolean, skipGuidCheck: boolean) {
     // An update has been downloaded and the app is waiting to be restarted.
     // Checking for updates again may result in the running app being nuked
-    // when it finds a subsequent update.
-    if (__WIN32__ && this.status === UpdateStatus.UpdateReady) {
+    // when it finds a subsequent update on Windows, or the "Quit and Update"
+    // button to crash the app if in the subsequent check, there is no update
+    // available anymore due to a disabled update.
+    if (this.status === UpdateStatus.UpdateReady) {
+      this.updatePriorityUpdateStatus()
       return
     }
 
-    let updatesURL = __UPDATES_URL__
+    const updatesUrl = await this.getUpdatesUrl(skipGuidCheck)
+
+    if (updatesUrl === null) {
+      return
+    }
+
+    this.userInitiatedUpdate = !inBackground
+
+    const error = await checkForUpdates(updatesUrl)
+
+    if (error !== undefined) {
+      this.emitError(error)
+    }
+  }
+
+  private async getUpdatesUrl(skipGuidCheck: boolean) {
+    let url = null
+
+    try {
+      url = new URL(__UPDATES_URL__)
+    } catch (e) {
+      log.error('Error parsing updates url', e)
+      return __UPDATES_URL__
+    }
+
+    if (skipGuidCheck) {
+      // This will effectively disable the staggered releases system and attempt
+      // to retrieve the latest available deployment.
+      url.searchParams.set('skipGuidCheck', '1')
+    }
 
     // If the app is running under arm64 to x64 translation, we need to tweak the
     // update URL here to point at the arm64 binary.
@@ -168,21 +245,20 @@ class UpdateStore {
       enableUpdateFromEmulatedX64ToARM64() &&
       (await isRunningUnderARM64Translation()) === true
     ) {
-      const url = new URL(updatesURL)
       url.pathname = url.pathname.replace(
         /\/desktop\/desktop\/(x64\/)?latest/,
         '/desktop/desktop/arm64/latest'
       )
-      updatesURL = url.toString()
-    }
-
-    this.userInitiatedUpdate = !inBackground
-
-    const error = await checkForUpdates(updatesURL)
 
-    if (error !== undefined) {
-      this.emitError(error)
+      // If we want the app to force an auto-update from x64 to arm64 right
+      // after being installed, we need to spoof a really old version to trick
+      // both Central and Squirrel into thinking we need the update.
+      if (this.supportsImmediateUpdateFromEmulatedX64ToARM64()) {
+        url.searchParams.set('version', '0.0.64')
+      }
     }
+
+    return url.toString()
   }
 
   /** Quit and install the update. */
@@ -194,6 +270,32 @@ class UpdateStore {
     quitAndInstallUpdate()
   }
 
+  private async updatePriorityUpdateStatus() {
+    try {
+      const response = await fetch(await this.getUpdatesUrl(false), {
+        method: 'HEAD',
+        headers: { 'user-agent': getUserAgent() },
+      })
+
+      const prioritizeUpdate =
+        response.headers.get('x-prioritize-update') === 'true'
+
+      const prioritizeUpdateInfoUrl =
+        response.headers.get('x-prioritize-update-info-url') ?? undefined
+
+      if (
+        this._prioritizeUpdate !== prioritizeUpdate ||
+        this._prioritizeUpdateInfoUrl !== prioritizeUpdateInfoUrl
+      ) {
+        this._prioritizeUpdate = prioritizeUpdate
+        this._prioritizeUpdateInfoUrl = prioritizeUpdateInfoUrl
+        this.emitDidChange()
+      }
+    } catch (e) {
+      log.error('Error updating priority update status', e)
+    }
+  }
+
   /**
    * Method to determine if we should show an update showcase call to action.
    *
@@ -231,6 +333,45 @@ class UpdateStore {
       )
       .some(r => r.pretext.length > 0)
   }
+
+  /** This method has only been added for ease of testing the update banner in
+   * this state and as such is limite to dev and test environments */
+  public setIsx64ToARM64ImmediateAutoUpdate(value: boolean) {
+    if (
+      __RELEASE_CHANNEL__ !== 'development' &&
+      __RELEASE_CHANNEL__ !== 'test'
+    ) {
+      return
+    }
+
+    this.isX64ToARM64ImmediateAutoUpdate = value
+  }
+
+  /** This method has only been added for ease of testing the update banner in
+   * this state and as such is limite to dev and test environments */
+  public setPrioritizeUpdate(value: boolean) {
+    if (
+      __RELEASE_CHANNEL__ !== 'development' &&
+      __RELEASE_CHANNEL__ !== 'test'
+    ) {
+      return
+    }
+
+    this._prioritizeUpdate = value
+  }
+
+  /** This method has only been added for ease of testing the update banner in
+   * this state and as such is limite to dev and test environments */
+  public setPrioritizeUpdateInfoUrl(value: string | undefined) {
+    if (
+      __RELEASE_CHANNEL__ !== 'development' &&
+      __RELEASE_CHANNEL__ !== 'test'
+    ) {
+      return
+    }
+
+    this._prioritizeUpdateInfoUrl = value
+  }
 }
 
 /** The store which contains the current state of the auto updater. */
diff --git a/app/src/ui/lib/vertical-segmented-control/segmented-item.tsx b/app/src/ui/lib/vertical-segmented-control/segmented-item.tsx
index dc302698809..6801d5f6d41 100644
--- a/app/src/ui/lib/vertical-segmented-control/segmented-item.tsx
+++ b/app/src/ui/lib/vertical-segmented-control/segmented-item.tsx
@@ -64,10 +64,12 @@ export class SegmentedItem<T> extends React.Component<
     const className = isSelected ? 'selected' : undefined
 
     return (
+      // eslint-disable-next-line jsx-a11y/click-events-have-key-events
       <li
         className={className}
         onClick={this.onClick}
         onDoubleClick={this.onDoubleClick}
+        // eslint-disable-next-line jsx-a11y/no-noninteractive-element-to-interactive-role
         role="radio"
         id={this.props.id}
         aria-checked={isSelected ? 'true' : 'false'}
diff --git a/app/src/ui/lib/vertical-segmented-control/vertical-segmented-control.tsx b/app/src/ui/lib/vertical-segmented-control/vertical-segmented-control.tsx
index 270491e00e6..1dcffdbc646 100644
--- a/app/src/ui/lib/vertical-segmented-control/vertical-segmented-control.tsx
+++ b/app/src/ui/lib/vertical-segmented-control/vertical-segmented-control.tsx
@@ -194,6 +194,7 @@ export class VerticalSegmentedControl<T extends Key> extends React.Component<
     }
 
     const label = this.props.label ? (
+      // eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions, jsx-a11y/click-events-have-key-events
       <legend onClick={this.onLegendClick}>{this.props.label}</legend>
     ) : undefined
 
diff --git a/app/src/ui/local-changes-overwritten/local-changes-overwritten-dialog.tsx b/app/src/ui/local-changes-overwritten/local-changes-overwritten-dialog.tsx
index dbffea6febf..97f9849bd93 100644
--- a/app/src/ui/local-changes-overwritten/local-changes-overwritten-dialog.tsx
+++ b/app/src/ui/local-changes-overwritten/local-changes-overwritten-dialog.tsx
@@ -35,7 +35,7 @@ interface ILocalChangesOverwrittenDialogProps {
   readonly files: ReadonlyArray<string>
 }
 interface ILocalChangesOverwrittenDialogState {
-  readonly stashingAndRetrying: boolean
+  readonly stashing: boolean
 }
 
 export class LocalChangesOverwrittenDialog extends React.Component<
@@ -44,7 +44,7 @@ export class LocalChangesOverwrittenDialog extends React.Component<
 > {
   public constructor(props: ILocalChangesOverwrittenDialogProps) {
     super(props)
-    this.state = { stashingAndRetrying: false }
+    this.state = { stashing: false }
   }
 
   public render() {
@@ -57,19 +57,23 @@ export class LocalChangesOverwrittenDialog extends React.Component<
       <Dialog
         title="Error"
         id="local-changes-overwritten"
-        loading={this.state.stashingAndRetrying}
-        disabled={this.state.stashingAndRetrying}
+        loading={this.state.stashing}
+        disabled={this.state.stashing}
         onDismissed={this.props.onDismissed}
         onSubmit={this.onSubmit}
         type="error"
+        role="alertdialog"
+        ariaDescribedBy="local-changes-error-description"
       >
         <DialogContent>
-          <p>
-            Unable to {this.getRetryActionName()} when changes are present on
-            your branch.{overwrittenText}
-          </p>
-          {this.renderFiles()}
-          {this.renderStashText()}
+          <div id="local-changes-error-description">
+            <p>
+              Unable to {this.getRetryActionName()} when changes are present on
+              your branch.{overwrittenText}
+            </p>
+            {this.renderFiles()}
+            {this.renderStashText()}
+          </div>
         </DialogContent>
         {this.renderFooter()}
       </Dialog>
@@ -96,7 +100,7 @@ export class LocalChangesOverwrittenDialog extends React.Component<
   }
 
   private renderStashText() {
-    if (this.props.hasExistingStash && !this.state.stashingAndRetrying) {
+    if (this.props.hasExistingStash && !this.state.stashing) {
       return null
     }
 
@@ -104,7 +108,7 @@ export class LocalChangesOverwrittenDialog extends React.Component<
   }
 
   private renderFooter() {
-    if (this.props.hasExistingStash && !this.state.stashingAndRetrying) {
+    if (this.props.hasExistingStash && !this.state.stashing) {
       return <DefaultDialogFooter />
     }
 
@@ -134,7 +138,7 @@ export class LocalChangesOverwrittenDialog extends React.Component<
       return
     }
 
-    this.setState({ stashingAndRetrying: true })
+    this.setState({ stashing: true })
 
     // We know that there's no stash for the current branch so we can safely
     // tell createStashForCurrentBranch not to show a confirmation dialog which
@@ -144,11 +148,11 @@ export class LocalChangesOverwrittenDialog extends React.Component<
       false
     )
 
+    this.props.onDismissed()
+
     if (createdStash) {
       await dispatcher.performRetry(retryAction)
     }
-
-    this.props.onDismissed()
   }
 
   /**
diff --git a/app/src/ui/main-process-proxy.ts b/app/src/ui/main-process-proxy.ts
index 710c04378c2..8a6cfdf09a1 100644
--- a/app/src/ui/main-process-proxy.ts
+++ b/app/src/ui/main-process-proxy.ts
@@ -155,6 +155,9 @@ export const getCurrentWindowZoomFactor = invokeProxy(
   0
 )
 
+/** Tell the main process that a modal dialog has opened */
+export const sendDialogDidOpen = sendProxy('dialog-did-open', 0)
+
 /** Tell the main process to set the current window's zoom factor */
 export const setWindowZoomFactor = sendProxy('set-window-zoom-factor', 1)
 
@@ -164,6 +167,9 @@ export const checkForUpdates = invokeProxy('check-for-updates', 1)
 /** Tell the main process to quit the app and install updates */
 export const quitAndInstallUpdate = sendProxy('quit-and-install-updates', 0)
 
+/** Tell the main process to quit the app */
+export const quitApp = sendProxy('quit-app', 0)
+
 /** Subscribes to auto updater error events originating from the main process */
 export function onAutoUpdaterError(
   errorHandler: (evt: Electron.IpcRendererEvent, error: Error) => void
@@ -200,6 +206,12 @@ export function onNativeThemeUpdated(eventHandler: () => void) {
   ipcRenderer.on('native-theme-updated', eventHandler)
 }
 
+/** Subscribes to the "show installing update dialog" event originating from the
+ * main process */
+export function onShowInstallingUpdate(eventHandler: () => void) {
+  ipcRenderer.on('show-installing-update', eventHandler)
+}
+
 /** Tell the main process to set the native theme source */
 export const setNativeThemeSource = sendProxy('set-native-theme-source', 1)
 
@@ -273,6 +285,29 @@ export function sendWillQuitSync() {
   ipcRenderer.sendSync('will-quit')
 }
 
+/**
+ * Tell the main process that we're going to quit, even if the app is installing
+ * an update. This means it should allow the window to close.
+ *
+ * This event is sent synchronously to avoid any races with subsequent calls
+ * that would tell the app to quit.
+ */
+export function sendWillQuitEvenIfUpdatingSync() {
+  // eslint-disable-next-line no-sync
+  ipcRenderer.sendSync('will-quit-even-if-updating')
+}
+
+/**
+ * Tell the main process that the user cancelled quitting.
+ *
+ * This event is sent synchronously to avoid any races with subsequent calls
+ * that would tell the app to quit.
+ */
+export function sendCancelQuittingSync() {
+  // eslint-disable-next-line no-sync
+  ipcRenderer.sendSync('cancel-quitting')
+}
+
 /**
  * Tell the main process to move the application to the application folder
  */
@@ -361,3 +396,7 @@ export const requestNotificationsPermission = invokeProxy(
   'request-notifications-permission',
   0
 )
+
+/** Tell the main process to (un)install the CLI on Windows */
+export const installWindowsCLI = sendProxy('install-windows-cli', 0)
+export const uninstallWindowsCLI = sendProxy('uninstall-windows-cli', 0)
diff --git a/app/src/ui/move-to-applications-folder.tsx b/app/src/ui/move-to-applications-folder.tsx
index 40f02414023..d914f7a2e46 100644
--- a/app/src/ui/move-to-applications-folder.tsx
+++ b/app/src/ui/move-to-applications-folder.tsx
@@ -37,7 +37,7 @@ export class MoveToApplicationsFolder extends React.Component<
       <Dialog
         title="Move GitHub Desktop to the Applications folder?"
         id="move-to-applications-folder"
-        dismissable={false}
+        backdropDismissable={false}
         onDismissed={this.props.onDismissed}
         onSubmit={this.onSubmit}
         type="warning"
@@ -47,8 +47,8 @@ export class MoveToApplicationsFolder extends React.Component<
             We've detected that you're not running GitHub Desktop from the
             Applications folder of your machine. This could cause problems with
             the app, including impacting your ability to sign in.
-            <br />
-            <br />
+          </p>
+          <p>
             Do you want to move GitHub Desktop to the Applications folder now?
             This will also restart the app.
           </p>
diff --git a/app/src/ui/multi-commit-operation/base-multi-commit-operation.tsx b/app/src/ui/multi-commit-operation/base-multi-commit-operation.tsx
index aed59470f6f..0736b25ec95 100644
--- a/app/src/ui/multi-commit-operation/base-multi-commit-operation.tsx
+++ b/app/src/ui/multi-commit-operation/base-multi-commit-operation.tsx
@@ -12,6 +12,9 @@ import { ConfirmAbortDialog } from './dialog/confirm-abort-dialog'
 import { ProgressDialog } from './dialog/progress-dialog'
 import { WarnForcePushDialog } from './dialog/warn-force-push-dialog'
 import { PopupType } from '../../models/popup'
+import { Account } from '../../models/account'
+import { IAPIRepoRuleset } from '../../lib/api'
+import { Emoji } from '../../lib/emoji'
 
 export interface IMultiCommitOperationProps {
   readonly repository: Repository
@@ -24,7 +27,7 @@ export interface IMultiCommitOperationProps {
   readonly conflictState: ConflictState | null
 
   /** The emoji map for showing commit emoji's */
-  readonly emoji: Map<string, string>
+  readonly emoji: Map<string, Emoji>
 
   /** The current state of the working directory */
   readonly workingDirectory: WorkingDirectoryStatus
@@ -32,6 +35,14 @@ export interface IMultiCommitOperationProps {
   /** Whether user should be warned about force pushing */
   readonly askForConfirmationOnForcePush: boolean
 
+  // react/no-unused-prop-types doesn't understand abstract classes and
+  // thinks these are unused but they are used in the subclasses.
+  // eslint-disable-next-line react/no-unused-prop-types
+  readonly accounts: ReadonlyArray<Account>
+
+  // eslint-disable-next-line react/no-unused-prop-types
+  readonly cachedRepoRulesets: ReadonlyMap<number, IAPIRepoRuleset>
+
   /**
    * Callbacks for the conflict selection components to let the user jump out
    * to their preferred editor.
@@ -93,6 +104,8 @@ export abstract class BaseMultiCommitOperation extends React.Component<IMultiCom
         {targetBranch !== null ? <strong>{targetBranch.name}</strong> : null}
       </>
     )
+
+    this.props.dispatcher.closePopup(PopupType.MultiCommitOperation)
     return dispatcher.onConflictsFoundBanner(
       repository,
       operationDescription,
diff --git a/app/src/ui/multi-commit-operation/cherry-pick.tsx b/app/src/ui/multi-commit-operation/cherry-pick.tsx
index 53f2d67e588..9d740ec4c8e 100644
--- a/app/src/ui/multi-commit-operation/cherry-pick.tsx
+++ b/app/src/ui/multi-commit-operation/cherry-pick.tsx
@@ -79,6 +79,7 @@ export abstract class CherryPick extends BaseMultiCommitOperation {
     return (
       <ChooseTargetBranchDialog
         key="choose-target-branch"
+        repository={this.props.repository}
         allBranches={allBranches}
         defaultBranch={defaultBranch}
         recentBranches={recentBranches}
@@ -130,6 +131,8 @@ export abstract class CherryPick extends BaseMultiCommitOperation {
         defaultBranch={defaultBranch}
         upstreamDefaultBranch={upstreamDefaultBranch}
         upstreamGitHubRepository={upstreamGhRepo}
+        accounts={this.props.accounts}
+        cachedRepoRulesets={this.props.cachedRepoRulesets}
         allBranches={allBranches}
         repository={repository}
         onDismissed={this.onFlowEnded}
diff --git a/app/src/ui/multi-commit-operation/choose-branch/base-choose-branch-dialog.tsx b/app/src/ui/multi-commit-operation/choose-branch/base-choose-branch-dialog.tsx
index dedda9490c6..aefa83d5ff6 100644
--- a/app/src/ui/multi-commit-operation/choose-branch/base-choose-branch-dialog.tsx
+++ b/app/src/ui/multi-commit-operation/choose-branch/base-choose-branch-dialog.tsx
@@ -2,7 +2,6 @@ import * as React from 'react'
 import { Branch } from '../../../models/branch'
 import { Repository } from '../../../models/repository'
 import { IMatches } from '../../../lib/fuzzy-find'
-import { truncateWithEllipsis } from '../../../lib/truncate-with-ellipsis'
 import { Dialog, DialogContent, DialogFooter } from '../../dialog'
 import {
   BranchList,
@@ -15,11 +14,46 @@ import {
   DropdownSelectButton,
   IDropdownSelectButtonOption,
 } from '../../dropdown-select-button'
-import { MultiCommitOperationKind } from '../../../models/multi-commit-operation'
+import {
+  MultiCommitOperationKind,
+  isIdMultiCommitOperation,
+} from '../../../models/multi-commit-operation'
 import { assertNever } from '../../../lib/fatal-error'
 import { getMergeOptions } from '../../lib/update-branch'
+import { getDefaultAriaLabelForBranch } from '../../branches/branch-renderer'
+import { ComputedAction } from '../../../models/computed-action'
+
+export function canStartOperation(
+  selectedBranch: Branch | null,
+  currentBranch: Branch,
+  commitCount: number | undefined,
+  statusKind: ComputedAction | undefined
+): boolean {
+  // Is there even a branch selected?
+  if (selectedBranch === null) {
+    return false
+  }
+
+  // Is the selected branch the current branch?
+  if (selectedBranch.name === currentBranch?.name) {
+    return false
+  }
+
+  // We can always start if there are conflicts, we'll just
+  // have to deal with the conflicts post the operation
+  if (statusKind === ComputedAction.Conflicts) {
+    return true
+  }
+
+  // Are there even commits to operate on?
+  if (commitCount === undefined || commitCount === 0) {
+    return false
+  }
+
+  return statusKind !== ComputedAction.Invalid
+}
 
-interface IBaseChooseBranchDialogProps {
+export interface IBaseChooseBranchDialogProps {
   readonly dispatcher: Dispatcher
 
   readonly repository: Repository
@@ -34,6 +68,11 @@ interface IBaseChooseBranchDialogProps {
    */
   readonly currentBranch: Branch
 
+  /**
+   * The branch to select when dialog it is opened
+   */
+  readonly initialBranch?: Branch
+
   /**
    * See IBranchesState.allBranches
    */
@@ -44,11 +83,6 @@ interface IBaseChooseBranchDialogProps {
    */
   readonly recentBranches: ReadonlyArray<Branch>
 
-  /**
-   * The branch to select when the rebase dialog is opened
-   */
-  readonly initialBranch?: Branch
-
   /**
    * Type of operation (Merge, Squash, Rebase)
    */
@@ -61,85 +95,40 @@ interface IBaseChooseBranchDialogProps {
   readonly onDismissed: () => void
 }
 
-export interface IBaseChooseBranchDialogState {
-  /** The currently selected branch. */
+export interface IChooseBranchDialogProps extends IBaseChooseBranchDialogProps {
   readonly selectedBranch: Branch | null
+  readonly dialogTitle: string | JSX.Element | undefined
+  readonly submitButtonTooltip?: string
+  readonly canStartOperation: boolean
+  readonly start: () => void
+  readonly onSelectionChanged: (selectedBranch: Branch | null) => void
+}
 
+export interface IChooseBranchDialogState {
   /** The filter text to use in the branch selector */
   readonly filterText: string
-
-  /**
-   * A preview of the operation using the selected base branch to test whether the
-   * current branch will be cleanly applied.
-   */
-  readonly statusPreview: JSX.Element | null
 }
 
-export abstract class BaseChooseBranchDialog extends React.Component<
-  IBaseChooseBranchDialogProps,
-  IBaseChooseBranchDialogState
+export class ChooseBranchDialog extends React.Component<
+  IChooseBranchDialogProps,
+  IChooseBranchDialogState
 > {
-  protected abstract start: () => void
-
-  protected abstract canStart: () => boolean
-
-  protected abstract updateStatus: (branch: Branch) => Promise<void>
-
-  protected abstract getDialogTitle: (
-    branchName: string
-  ) => string | JSX.Element | undefined
-
-  protected abstract renderActionStatusIcon: () => JSX.Element | null
-
-  public constructor(props: IBaseChooseBranchDialogProps) {
+  public constructor(props: IChooseBranchDialogProps) {
     super(props)
 
-    const selectedBranch = this.resolveSelectedBranch()
-
     this.state = {
-      selectedBranch,
       filterText: '',
-      statusPreview: null,
     }
   }
 
-  public componentDidMount() {
-    const { selectedBranch } = this.state
-    if (selectedBranch !== null) {
-      this.updateStatus(selectedBranch)
-    }
-  }
-
-  protected getSubmitButtonToolTip = (): string | undefined => {
-    return undefined
-  }
-
-  private onFilterTextChanged = (filterText: string) => {
-    this.setState({ filterText })
-  }
-
-  private onItemClick = (branch: Branch, source: ClickSource) => {
-    if (source.kind !== 'keyboard' || source.event.key !== 'Enter') {
-      return
-    }
-
-    source.event.preventDefault()
-
-    const { selectedBranch } = this.state
-
-    if (selectedBranch !== null && selectedBranch.name === branch.name) {
-      this.start()
-    }
-  }
-
-  protected onSelectionChanged = async (selectedBranch: Branch | null) => {
-    if (selectedBranch != null) {
-      this.setState({ selectedBranch })
-      return this.updateStatus(selectedBranch)
+  public componentDidMount(): void {
+    const initialSelectedBranch = this.resolveSelectedBranch()
+    if (
+      initialSelectedBranch !== null &&
+      initialSelectedBranch.ref !== this.props.selectedBranch?.ref
+    ) {
+      this.props.onSelectionChanged(initialSelectedBranch)
     }
-
-    // return to empty state
-    this.setState({ selectedBranch })
   }
 
   /**
@@ -151,7 +140,7 @@ export abstract class BaseChooseBranchDialog extends React.Component<
    * If the current branch is the default branch, `null` is returned. Otherwise
    * the default branch is used.
    */
-  protected resolveSelectedBranch(): Branch | null {
+  private resolveSelectedBranch(): Branch | null {
     const { currentBranch, defaultBranch, initialBranch } = this.props
 
     if (initialBranch !== undefined) {
@@ -161,11 +150,31 @@ export abstract class BaseChooseBranchDialog extends React.Component<
     return currentBranch === defaultBranch ? null : defaultBranch
   }
 
+  private onFilterTextChanged = (filterText: string) => {
+    this.setState({ filterText })
+  }
+
+  private onItemClick = (branch: Branch, source: ClickSource) => {
+    if (source.kind !== 'keyboard' || source.event.key !== 'Enter') {
+      return
+    }
+
+    source.event.preventDefault()
+
+    const { selectedBranch } = this.props
+    if (selectedBranch !== null && selectedBranch.name === branch.name) {
+      this.props.start()
+    }
+  }
+
   private onOperationChange = (option: IDropdownSelectButtonOption) => {
-    const value = option.value as MultiCommitOperationKind
+    if (!isIdMultiCommitOperation(option.id)) {
+      return
+    }
+
     const { dispatcher, repository } = this.props
-    const { selectedBranch } = this.state
-    switch (value) {
+    const { selectedBranch } = this.props
+    switch (option.id) {
       case MultiCommitOperationKind.Merge:
         dispatcher.startMergeBranchOperation(repository, false, selectedBranch)
         break
@@ -179,50 +188,62 @@ export abstract class BaseChooseBranchDialog extends React.Component<
       case MultiCommitOperationKind.Reorder:
         break
       default:
-        assertNever(value, `Unknown operation value: ${option.value}`)
+        assertNever(option.id, `Unknown operation value: ${option.id}`)
     }
   }
 
   private renderStatusPreview() {
-    const { currentBranch } = this.props
-    const { selectedBranch, statusPreview: preview } = this.state
+    const { currentBranch, selectedBranch, children } = this.props
 
-    if (
-      preview == null ||
-      currentBranch == null ||
-      selectedBranch == null ||
-      currentBranch.name === selectedBranch.name
-    ) {
+    if (selectedBranch == null || currentBranch.name === selectedBranch.name) {
       return null
     }
 
-    return (
-      <div className="merge-status-component">
-        {this.renderActionStatusIcon()}
-        <p className="merge-info">{preview}</p>
-      </div>
+    return <div className="merge-status-component">{children}</div>
+  }
+
+  private renderBranch = (
+    item: IBranchListItem,
+    matches: IMatches,
+    authorDate: Date | undefined
+  ) => {
+    return renderDefaultBranch(
+      item,
+      matches,
+      this.props.currentBranch,
+      authorDate
     )
   }
 
-  private renderBranch = (item: IBranchListItem, matches: IMatches) => {
-    return renderDefaultBranch(item, matches, this.props.currentBranch)
+  private getBranchAriaLabel = (
+    item: IBranchListItem,
+    authorDate: Date | undefined
+  ): string => {
+    return getDefaultAriaLabelForBranch(item, authorDate)
   }
 
   public render() {
-    const { selectedBranch } = this.state
-    const { currentBranch, operation } = this.props
-    const truncatedName = truncateWithEllipsis(currentBranch.name, 40)
+    const {
+      selectedBranch,
+      currentBranch,
+      operation,
+      dialogTitle,
+      canStartOperation,
+      submitButtonTooltip,
+      start,
+      onSelectionChanged,
+    } = this.props
 
     return (
       <Dialog
         id="choose-branch"
         onDismissed={this.props.onDismissed}
-        onSubmit={this.start}
-        dismissable={true}
-        title={this.getDialogTitle(truncatedName)}
+        onSubmit={start}
+        title={dialogTitle}
       >
         <DialogContent>
           <BranchList
+            repository={this.props.repository}
             allBranches={this.props.allBranches}
             currentBranch={currentBranch}
             defaultBranch={this.props.defaultBranch}
@@ -230,20 +251,23 @@ export abstract class BaseChooseBranchDialog extends React.Component<
             filterText={this.state.filterText}
             onFilterTextChanged={this.onFilterTextChanged}
             selectedBranch={selectedBranch}
-            onSelectionChanged={this.onSelectionChanged}
+            onSelectionChanged={onSelectionChanged}
             canCreateNewBranch={false}
             renderBranch={this.renderBranch}
+            getBranchAriaLabel={this.getBranchAriaLabel}
             onItemClick={this.onItemClick}
           />
         </DialogContent>
         <DialogFooter>
           {this.renderStatusPreview()}
           <DropdownSelectButton
-            selectedValue={operation}
+            checkedOption={operation}
             options={getMergeOptions()}
-            disabled={!this.canStart()}
-            tooltip={this.getSubmitButtonToolTip()}
-            onSelectChange={this.onOperationChange}
+            disabled={!canStartOperation}
+            ariaDescribedBy="merge-status-preview"
+            dropdownAriaLabel="Merge options"
+            tooltip={submitButtonTooltip}
+            onCheckedOptionChange={this.onOperationChange}
           />
         </DialogFooter>
       </Dialog>
diff --git a/app/src/ui/multi-commit-operation/choose-branch/choose-target-branch.tsx b/app/src/ui/multi-commit-operation/choose-branch/choose-target-branch.tsx
index ef1c6621068..a1fc2d8f7da 100644
--- a/app/src/ui/multi-commit-operation/choose-branch/choose-target-branch.tsx
+++ b/app/src/ui/multi-commit-operation/choose-branch/choose-target-branch.tsx
@@ -13,8 +13,11 @@ import {
   renderDefaultBranch,
 } from '../../branches'
 import { ClickSource } from '../../lib/list'
+import { getDefaultAriaLabelForBranch } from '../../branches/branch-renderer'
+import { Repository } from '../../../models/repository'
 
 interface IChooseTargetBranchDialogProps {
+  readonly repository: Repository
   /**
    * See IBranchesState.defaultBranch
    */
@@ -92,8 +95,24 @@ export class ChooseTargetBranchDialog extends React.Component<
     this.setState({ selectedBranch })
   }
 
-  private renderBranch = (item: IBranchListItem, matches: IMatches) => {
-    return renderDefaultBranch(item, matches, this.props.currentBranch)
+  private renderBranch = (
+    item: IBranchListItem,
+    matches: IMatches,
+    authorDate: Date | undefined
+  ) => {
+    return renderDefaultBranch(
+      item,
+      matches,
+      this.props.currentBranch,
+      authorDate
+    )
+  }
+
+  private getBranchAriaLabel = (
+    item: IBranchListItem,
+    authorDate: Date | undefined
+  ): string => {
+    return getDefaultAriaLabelForBranch(item, authorDate)
   }
 
   private onEnterPressed = (branch: Branch, source: ClickSource) => {
@@ -170,7 +189,6 @@ export class ChooseTargetBranchDialog extends React.Component<
         id="cherry-pick"
         onDismissed={this.props.onDismissed}
         onSubmit={this.onSubmit}
-        dismissable={true}
         title={
           <strong>
             Cherry-pick {this.props.commitCount} {pluralize} to a branch
@@ -179,6 +197,7 @@ export class ChooseTargetBranchDialog extends React.Component<
       >
         <DialogContent>
           <BranchList
+            repository={this.props.repository}
             allBranches={this.props.allBranches}
             currentBranch={this.props.currentBranch}
             defaultBranch={this.props.defaultBranch}
@@ -191,6 +210,7 @@ export class ChooseTargetBranchDialog extends React.Component<
             canCreateNewBranch={true}
             onCreateNewBranch={this.props.onCreateNewBranch}
             renderBranch={this.renderBranch}
+            getBranchAriaLabel={this.getBranchAriaLabel}
             onItemClick={this.onEnterPressed}
           />
         </DialogContent>
diff --git a/app/src/ui/multi-commit-operation/choose-branch/merge-choose-branch-dialog.tsx b/app/src/ui/multi-commit-operation/choose-branch/merge-choose-branch-dialog.tsx
index 0ab1c63bfd0..361aa16384e 100644
--- a/app/src/ui/multi-commit-operation/choose-branch/merge-choose-branch-dialog.tsx
+++ b/app/src/ui/multi-commit-operation/choose-branch/merge-choose-branch-dialog.tsx
@@ -1,25 +1,45 @@
 import React from 'react'
 import { getAheadBehind, revSymmetricDifference } from '../../../lib/git'
 import { determineMergeability } from '../../../lib/git/merge-tree'
-import { promiseWithMinimumTimeout } from '../../../lib/promise'
 import { Branch } from '../../../models/branch'
 import { ComputedAction } from '../../../models/computed-action'
 import { MergeTreeResult } from '../../../models/merge'
 import { MultiCommitOperationKind } from '../../../models/multi-commit-operation'
 import { PopupType } from '../../../models/popup'
 import { ActionStatusIcon } from '../../lib/action-status-icon'
-import { BaseChooseBranchDialog } from './base-choose-branch-dialog'
+import {
+  ChooseBranchDialog,
+  IBaseChooseBranchDialogProps,
+  canStartOperation,
+} from './base-choose-branch-dialog'
+import { truncateWithEllipsis } from '../../../lib/truncate-with-ellipsis'
 
-export class MergeChooseBranchDialog extends BaseChooseBranchDialog {
-  private commitCount: number = 0
-  private mergeStatus: MergeTreeResult | null = null
+interface IMergeChooseBranchDialogState {
+  readonly commitCount: number
+  readonly mergeStatus: MergeTreeResult | null
+  readonly selectedBranch: Branch | null
+}
+
+export class MergeChooseBranchDialog extends React.Component<
+  IBaseChooseBranchDialogProps,
+  IMergeChooseBranchDialogState
+> {
+  public constructor(props: IBaseChooseBranchDialogProps) {
+    super(props)
+
+    this.state = {
+      selectedBranch: null,
+      commitCount: 0,
+      mergeStatus: null,
+    }
+  }
 
-  protected start = () => {
+  private start = () => {
     if (!this.canStart()) {
       return
     }
 
-    const { selectedBranch } = this.state
+    const { selectedBranch, mergeStatus } = this.state
     const { operation, dispatcher, repository } = this.props
     if (!selectedBranch) {
       return
@@ -28,136 +48,130 @@ export class MergeChooseBranchDialog extends BaseChooseBranchDialog {
     dispatcher.mergeBranch(
       repository,
       selectedBranch,
-      this.mergeStatus,
+      mergeStatus,
       operation === MultiCommitOperationKind.Squash
     )
-    this.props.dispatcher.closePopup(PopupType.MultiCommitOperation)
-  }
 
-  protected canStart = (): boolean => {
-    const selectedBranch = this.state.selectedBranch
-    const currentBranch = this.props.currentBranch
-
-    const selectedBranchIsCurrentBranch =
-      selectedBranch !== null &&
-      currentBranch !== null &&
-      selectedBranch.name === currentBranch.name
-
-    const isBehind = this.commitCount !== undefined && this.commitCount > 0
+    dispatcher.closePopup(PopupType.MultiCommitOperation)
+  }
 
-    const canMergeBranch =
-      this.mergeStatus === null ||
-      this.mergeStatus.kind !== ComputedAction.Invalid
+  private canStart = (): boolean => {
+    const { currentBranch } = this.props
+    const { selectedBranch, commitCount, mergeStatus } = this.state
 
-    return (
-      selectedBranch !== null &&
-      !selectedBranchIsCurrentBranch &&
-      isBehind &&
-      canMergeBranch
+    return canStartOperation(
+      selectedBranch,
+      currentBranch,
+      commitCount,
+      mergeStatus?.kind
     )
   }
 
-  protected onSelectionChanged = async (selectedBranch: Branch | null) => {
-    if (selectedBranch != null) {
-      this.setState({ selectedBranch })
-      return this.updateStatus(selectedBranch)
+  private onSelectionChanged = (selectedBranch: Branch | null) => {
+    if (selectedBranch === null) {
+      this.setState({ selectedBranch, commitCount: 0, mergeStatus: null })
+    } else {
+      this.setState(
+        {
+          selectedBranch,
+          commitCount: 0,
+          mergeStatus: { kind: ComputedAction.Loading },
+        },
+        () => this.updateStatus(selectedBranch)
+      )
     }
-
-    // return to empty state
-    this.setState({ selectedBranch })
-    this.commitCount = 0
-    this.mergeStatus = null
   }
 
-  protected renderActionStatusIcon = () => {
-    return (
-      <ActionStatusIcon
-        status={this.mergeStatus}
-        classNamePrefix="merge-status"
-      />
+  private getDialogTitle = () => {
+    const truncatedName = truncateWithEllipsis(
+      this.props.currentBranch.name,
+      40
     )
-  }
-
-  protected getDialogTitle = (branchName: string) => {
     const squashPrefix =
       this.props.operation === MultiCommitOperationKind.Squash
         ? 'Squash and '
         : null
     return (
       <>
-        {squashPrefix}Merge into <strong>{branchName}</strong>
+        {squashPrefix}Merge into <strong>{truncatedName}</strong>
       </>
     )
   }
 
-  protected updateStatus = async (branch: Branch) => {
+  private updateStatus = async (branch: Branch) => {
     const { currentBranch, repository } = this.props
-    this.mergeStatus = { kind: ComputedAction.Loading }
-    this.updateMergeStatusPreview(branch)
-
-    if (currentBranch != null) {
-      this.mergeStatus = await promiseWithMinimumTimeout(
-        () => determineMergeability(repository, currentBranch, branch),
-        500
-      ).catch<MergeTreeResult>(e => {
-        log.error('Failed determining mergeability', e)
-        return { kind: ComputedAction.Clean }
-      })
-
-      this.updateMergeStatusPreview(branch)
+
+    const mergeStatus = await determineMergeability(
+      repository,
+      currentBranch,
+      branch
+    ).catch<MergeTreeResult>(e => {
+      log.error('Failed determining mergeability', e)
+      return { kind: ComputedAction.Clean }
+    })
+
+    // The user has selected a different branch since we started or the branch
+    // has changed, so don't update the preview with stale data.
+    //
+    // We don't have to check if the state changed from underneath us if we
+    // loaded the status from cache, because that means we never kicked off an
+    // async operation.
+    if (this.state.selectedBranch?.tip.sha !== branch.tip.sha) {
+      return
+    }
+
+    // Can't go forward if the merge status is invalid, no need to check commit count
+    if (mergeStatus.kind === ComputedAction.Invalid) {
+      this.setState({ mergeStatus })
+      return
     }
 
+    // Commit count is used in the UI output as well as determining whether the
+    // submit button is enabled
     const range = revSymmetricDifference('', branch.name)
-    const aheadBehind = await getAheadBehind(this.props.repository, range)
-    this.commitCount = aheadBehind ? aheadBehind.behind : 0
+    const aheadBehind = await getAheadBehind(repository, range)
+    const commitCount = aheadBehind ? aheadBehind.behind : 0
 
-    if (this.state.selectedBranch !== branch) {
-      this.commitCount = 0
+    if (this.state.selectedBranch.tip.sha !== branch.tip.sha) {
+      return
     }
 
-    this.updateMergeStatusPreview(branch)
+    this.setState({ commitCount, mergeStatus })
   }
 
-  private updateMergeStatusPreview(branch: Branch) {
-    this.setState({ statusPreview: this.getMergeStatusPreview(branch) })
-  }
-
-  private getMergeStatusPreview(branch: Branch): JSX.Element | null {
+  private renderStatusPreviewMessage(): JSX.Element | null {
+    const { mergeStatus, selectedBranch: branch } = this.state
     const { currentBranch } = this.props
 
-    if (this.mergeStatus === null) {
+    if (mergeStatus === null || branch === null) {
       return null
     }
 
-    if (this.mergeStatus.kind === ComputedAction.Loading) {
+    if (mergeStatus.kind === ComputedAction.Loading) {
       return this.renderLoadingMergeMessage()
     }
 
-    if (this.mergeStatus.kind === ComputedAction.Clean) {
+    if (mergeStatus.kind === ComputedAction.Clean) {
       return this.renderCleanMergeMessage(
         branch,
         currentBranch,
-        this.commitCount
+        this.state.commitCount
       )
     }
 
-    if (this.mergeStatus.kind === ComputedAction.Invalid) {
+    if (mergeStatus.kind === ComputedAction.Invalid) {
       return this.renderInvalidMergeMessage()
     }
 
     return this.renderConflictedMergeMessage(
       branch,
       currentBranch,
-      this.mergeStatus.conflictedFiles
+      mergeStatus.conflictedFiles
     )
   }
 
   private renderLoadingMergeMessage() {
-    return (
-      <React.Fragment>
-        Checking for ability to merge automatically...
-      </React.Fragment>
-    )
+    return <>Checking for ability to merge automatically...</>
   }
 
   private renderCleanMergeMessage(
@@ -212,4 +226,33 @@ export class MergeChooseBranchDialog extends BaseChooseBranchDialog {
       </React.Fragment>
     )
   }
+
+  private renderStatusPreview() {
+    return (
+      <>
+        <ActionStatusIcon
+          status={this.state.mergeStatus}
+          classNamePrefix="merge-status"
+        />
+        <p className="merge-info" id="merge-status-preview">
+          {this.renderStatusPreviewMessage()}
+        </p>
+      </>
+    )
+  }
+
+  public render() {
+    return (
+      <ChooseBranchDialog
+        {...this.props}
+        start={this.start}
+        selectedBranch={this.state.selectedBranch}
+        canStartOperation={this.canStart()}
+        dialogTitle={this.getDialogTitle()}
+        onSelectionChanged={this.onSelectionChanged}
+      >
+        {this.renderStatusPreview()}
+      </ChooseBranchDialog>
+    )
+  }
 }
diff --git a/app/src/ui/multi-commit-operation/choose-branch/rebase-choose-branch-dialog.tsx b/app/src/ui/multi-commit-operation/choose-branch/rebase-choose-branch-dialog.tsx
index fa0da2783de..80a67ee9370 100644
--- a/app/src/ui/multi-commit-operation/choose-branch/rebase-choose-branch-dialog.tsx
+++ b/app/src/ui/multi-commit-operation/choose-branch/rebase-choose-branch-dialog.tsx
@@ -4,118 +4,142 @@ import { ComputedAction } from '../../../models/computed-action'
 import { RebasePreview } from '../../../models/rebase'
 import { ActionStatusIcon } from '../../lib/action-status-icon'
 import { updateRebasePreview } from '../../lib/update-branch'
-import { BaseChooseBranchDialog } from './base-choose-branch-dialog'
+import {
+  ChooseBranchDialog,
+  IBaseChooseBranchDialogProps,
+  canStartOperation,
+} from './base-choose-branch-dialog'
+import { truncateWithEllipsis } from '../../../lib/truncate-with-ellipsis'
+
+interface IRebaseChooseBranchDialogState {
+  readonly rebasePreview: RebasePreview | null
+  readonly selectedBranch: Branch | null
+}
 
-export abstract class RebaseChooseBranchDialog extends BaseChooseBranchDialog {
-  private rebasePreview: RebasePreview | null = null
+export class RebaseChooseBranchDialog extends React.Component<
+  IBaseChooseBranchDialogProps,
+  IRebaseChooseBranchDialogState
+> {
+  public constructor(props: IBaseChooseBranchDialogProps) {
+    super(props)
 
-  protected start = () => {
-    const { selectedBranch } = this.state
-    const { repository, currentBranch } = this.props
-    if (!selectedBranch) {
-      return
+    this.state = {
+      selectedBranch: null,
+      rebasePreview: null,
     }
+  }
 
-    if (
-      this.rebasePreview === null ||
-      this.rebasePreview.kind !== ComputedAction.Clean
-    ) {
+  private start = () => {
+    if (!this.canStart()) {
       return
     }
 
-    if (!this.canStart()) {
+    const { selectedBranch, rebasePreview } = this.state
+    const { repository, currentBranch, dispatcher } = this.props
+
+    // Just type checking here, this shouldn't be possible
+    if (
+      selectedBranch === null ||
+      rebasePreview === null ||
+      rebasePreview.kind !== ComputedAction.Clean
+    ) {
       return
     }
 
-    this.props.dispatcher.startRebase(
+    dispatcher.startRebase(
       repository,
       selectedBranch,
       currentBranch,
-      this.rebasePreview.commits
+      rebasePreview.commits
     )
   }
 
-  protected canStart = (): boolean => {
-    return (
-      this.state.selectedBranch !== null &&
-      !this.selectedBranchIsCurrentBranch() &&
-      this.selectedBranchIsAheadOfCurrentBranch()
+  private canStart = (): boolean => {
+    const { currentBranch } = this.props
+    const { selectedBranch, rebasePreview } = this.state
+    const commitCount =
+      rebasePreview?.kind === ComputedAction.Clean
+        ? rebasePreview.commits.length
+        : undefined
+    return canStartOperation(
+      selectedBranch,
+      currentBranch,
+      commitCount,
+      rebasePreview?.kind
     )
   }
 
-  private selectedBranchIsCurrentBranch() {
-    const currentBranch = this.props.currentBranch
-    const { selectedBranch } = this.state
-    return (
+  private onSelectionChanged = (selectedBranch: Branch | null) => {
+    this.setState({ selectedBranch })
+
+    if (selectedBranch === null) {
+      this.setState({ rebasePreview: null })
+      return
+    }
+
+    this.updateStatus(selectedBranch)
+  }
+
+  private getSubmitButtonToolTip = () => {
+    const { currentBranch } = this.props
+    const { selectedBranch, rebasePreview } = this.state
+
+    const selectedBranchIsCurrentBranch =
       selectedBranch !== null &&
       currentBranch !== null &&
       selectedBranch.name === currentBranch.name
-    )
-  }
 
-  private selectedBranchIsAheadOfCurrentBranch() {
-    return this.rebasePreview !== null &&
-      this.rebasePreview.kind === ComputedAction.Clean
-      ? this.rebasePreview.commits.length > 0
-      : false
-  }
+    const areCommitsToRebase =
+      rebasePreview?.kind === ComputedAction.Clean
+        ? rebasePreview.commits.length > 0
+        : false
 
-  protected getSubmitButtonToolTip = () => {
-    return this.selectedBranchIsCurrentBranch()
-      ? 'You are not able to rebase this branch onto itself'
-      : !this.selectedBranchIsAheadOfCurrentBranch()
-      ? 'There are no commits on the current branch to rebase'
+    return selectedBranchIsCurrentBranch
+      ? 'You are not able to rebase this branch onto itself.'
+      : !areCommitsToRebase
+      ? 'There are no commits on the current branch to rebase.'
       : undefined
   }
 
-  protected getDialogTitle = (branchName: string) => {
+  private getDialogTitle = () => {
+    const truncatedName = truncateWithEllipsis(
+      this.props.currentBranch.name,
+      40
+    )
     return (
       <>
-        Rebase <strong>{branchName}</strong>
+        Rebase <strong>{truncatedName}</strong>
       </>
     )
   }
 
-  protected renderActionStatusIcon = () => {
-    return (
-      <ActionStatusIcon
-        status={this.rebasePreview}
-        classNamePrefix="merge-status"
-      />
-    )
-  }
-
-  protected updateStatus = async (baseBranch: Branch) => {
+  private updateStatus = async (baseBranch: Branch) => {
     const { currentBranch: targetBranch, repository } = this.props
     updateRebasePreview(baseBranch, targetBranch, repository, rebasePreview => {
-      this.rebasePreview = rebasePreview
-      this.updateRebaseStatusPreview(baseBranch)
+      this.setState({ rebasePreview })
     })
   }
 
-  private updateRebaseStatusPreview(baseBranch: Branch) {
-    this.setState({ statusPreview: this.getRebaseStatusPreview(baseBranch) })
-  }
-
-  private getRebaseStatusPreview(baseBranch: Branch): JSX.Element | null {
-    if (this.rebasePreview == null) {
+  private renderStatusPreviewMessage(): JSX.Element | null {
+    const { rebasePreview, selectedBranch: baseBranch } = this.state
+    if (rebasePreview == null || baseBranch == null) {
       return null
     }
 
     const { currentBranch } = this.props
 
-    if (this.rebasePreview.kind === ComputedAction.Loading) {
+    if (rebasePreview.kind === ComputedAction.Loading) {
       return this.renderLoadingRebaseMessage()
     }
-    if (this.rebasePreview.kind === ComputedAction.Clean) {
+    if (rebasePreview.kind === ComputedAction.Clean) {
       return this.renderCleanRebaseMessage(
         currentBranch,
         baseBranch,
-        this.rebasePreview.commits.length
+        rebasePreview.commits.length
       )
     }
 
-    if (this.rebasePreview.kind === ComputedAction.Invalid) {
+    if (rebasePreview.kind === ComputedAction.Invalid) {
       return this.renderInvalidRebaseMessage()
     }
 
@@ -155,4 +179,34 @@ export abstract class RebaseChooseBranchDialog extends BaseChooseBranchDialog {
       </>
     )
   }
+
+  private renderStatusPreview() {
+    return (
+      <>
+        <ActionStatusIcon
+          status={this.state.rebasePreview}
+          classNamePrefix="merge-status"
+        />
+        <p className="merge-info" id="merge-status-preview">
+          {this.renderStatusPreviewMessage()}
+        </p>
+      </>
+    )
+  }
+
+  public render() {
+    return (
+      <ChooseBranchDialog
+        {...this.props}
+        start={this.start}
+        selectedBranch={this.state.selectedBranch}
+        canStartOperation={this.canStart()}
+        dialogTitle={this.getDialogTitle()}
+        submitButtonTooltip={this.getSubmitButtonToolTip()}
+        onSelectionChanged={this.onSelectionChanged}
+      >
+        {this.renderStatusPreview()}
+      </ChooseBranchDialog>
+    )
+  }
 }
diff --git a/app/src/ui/multi-commit-operation/dialog/confirm-abort-dialog.tsx b/app/src/ui/multi-commit-operation/dialog/confirm-abort-dialog.tsx
index 6bcaee3c106..9b247cc4ea7 100644
--- a/app/src/ui/multi-commit-operation/dialog/confirm-abort-dialog.tsx
+++ b/app/src/ui/multi-commit-operation/dialog/confirm-abort-dialog.tsx
@@ -61,9 +61,11 @@ export class ConfirmAbortDialog extends React.Component<
         onSubmit={this.onSubmit}
         disabled={this.state.isAborting}
         type="warning"
+        role="alertdialog"
+        ariaDescribedBy="abort-operation-confirmation"
       >
         <DialogContent>
-          <div className="column-left">
+          <div className="column-left" id="abort-operation-confirmation">
             <p>
               Are you sure you want to abort this {operation.toLowerCase()}?
             </p>
diff --git a/app/src/ui/multi-commit-operation/dialog/conflicts-dialog.tsx b/app/src/ui/multi-commit-operation/dialog/conflicts-dialog.tsx
index e07d9966015..c9f29583375 100644
--- a/app/src/ui/multi-commit-operation/dialog/conflicts-dialog.tsx
+++ b/app/src/ui/multi-commit-operation/dialog/conflicts-dialog.tsx
@@ -20,6 +20,7 @@ import {
 } from '../../lib/conflicts'
 import { ManualConflictResolution } from '../../../models/manual-conflict-resolution'
 import { OkCancelButtonGroup } from '../../dialog/ok-cancel-button-group'
+import { DialogSuccess } from '../../dialog/success'
 
 interface IConflictsDialogProps {
   readonly dispatcher: Dispatcher
@@ -45,6 +46,8 @@ interface IConflictsDialogProps {
 interface IConflictsDialogState {
   readonly isCommitting: boolean
   readonly isAborting: boolean
+  readonly isFileResolutionOptionsMenuOpen: boolean
+  readonly countResolved: number | null
 }
 
 /**
@@ -61,6 +64,8 @@ export class ConflictsDialog extends React.Component<
     this.state = {
       isCommitting: false,
       isAborting: false,
+      isFileResolutionOptionsMenuOpen: false,
+      countResolved: null,
     }
   }
 
@@ -94,6 +99,19 @@ export class ConflictsDialog extends React.Component<
     }
   }
 
+  public componentDidUpdate(): void {
+    const { workingDirectory, manualResolutions } = this.props
+
+    const resolvedConflicts = getResolvedFiles(
+      workingDirectory,
+      manualResolutions
+    )
+
+    if (resolvedConflicts.length !== (this.state.countResolved ?? 0)) {
+      this.setState({ countResolved: resolvedConflicts.length })
+    }
+  }
+
   /**
    *  Invokes submit callback and dismisses modal
    */
@@ -116,6 +134,12 @@ export class ConflictsDialog extends React.Component<
   private openThisRepositoryInShell = () =>
     this.props.openRepositoryInShell(this.props.repository)
 
+  private setIsFileResolutionOptionsMenuOpen = (
+    isFileResolutionOptionsMenuOpen: boolean
+  ) => {
+    this.setState({ isFileResolutionOptionsMenuOpen })
+  }
+
   /**
    *  Renders the list of conflicts in the dialog
    */
@@ -136,6 +160,10 @@ export class ConflictsDialog extends React.Component<
                 manualResolution: this.props.manualResolutions.get(f.path),
                 ourBranch: this.props.ourBranch,
                 theirBranch: this.props.theirBranch,
+                isFileResolutionOptionsMenuOpen:
+                  this.state.isFileResolutionOptionsMenuOpen,
+                setIsFileResolutionOptionsMenuOpen:
+                  this.setIsFileResolutionOptionsMenuOpen,
               })
             : null
         )}
@@ -160,6 +188,38 @@ export class ConflictsDialog extends React.Component<
     )
   }
 
+  /**
+   * Renders the banner based on count of resolved files.
+   *
+   * If the count of resolved files is null, then the banner is
+   * not rendered as no conflicts have been resolved, yet. If the count of resolved
+   * files is 0, then there have been conflicts resolved, but they have been
+   * undone, we show an undone banner.
+   */
+  public renderBanner(conflictedFilesCount: number) {
+    const { countResolved } = this.state
+    if (countResolved === null) {
+      return
+    }
+
+    if (countResolved === 0) {
+      return <DialogSuccess>All resolutions have been undone.</DialogSuccess>
+    }
+
+    if (conflictedFilesCount === 0) {
+      return (
+        <DialogSuccess>All conflicted files have been resolved. </DialogSuccess>
+      )
+    }
+
+    const conflictPluralized = countResolved === 1 ? 'file has' : 'files have'
+    return (
+      <DialogSuccess>
+        {countResolved} conflicted {conflictPluralized} been resolved.
+      </DialogSuccess>
+    )
+  }
+
   public render() {
     const {
       workingDirectory,
@@ -183,13 +243,14 @@ export class ConflictsDialog extends React.Component<
     return (
       <Dialog
         id="conflicts-dialog"
-        dismissable={!this.state.isCommitting}
+        dismissDisabled={this.state.isCommitting}
         onDismissed={this.props.onDismissed}
         onSubmit={this.onSubmit}
         title={headerTitle}
         loading={this.state.isCommitting}
         disabled={this.state.isCommitting}
       >
+        {this.renderBanner(conflictedFiles.length)}
         <DialogContent>
           {this.renderContent(unmergedFiles, conflictedFiles.length)}
         </DialogContent>
diff --git a/app/src/ui/multi-commit-operation/dialog/progress-dialog.tsx b/app/src/ui/multi-commit-operation/dialog/progress-dialog.tsx
index 3ee25432dd7..89e38f2ceba 100644
--- a/app/src/ui/multi-commit-operation/dialog/progress-dialog.tsx
+++ b/app/src/ui/multi-commit-operation/dialog/progress-dialog.tsx
@@ -3,8 +3,9 @@ import { formatRebaseValue } from '../../../lib/rebase'
 import { RichText } from '../../lib/rich-text'
 import { Dialog, DialogContent } from '../../dialog'
 import { Octicon } from '../../octicons'
-import * as OcticonSymbol from '../../octicons/octicons.generated'
+import * as octicons from '../../octicons/octicons.generated'
 import { IMultiCommitOperationProgress } from '../../../models/progress'
+import { Emoji } from '../../../lib/emoji'
 
 interface IProgressDialogProps {
   /**
@@ -18,7 +19,7 @@ interface IProgressDialogProps {
    */
   readonly operation: string
   readonly progress: IMultiCommitOperationProgress
-  readonly emoji: Map<string, string>
+  readonly emoji: Map<string, Emoji>
 }
 
 export class ProgressDialog extends React.Component<IProgressDialogProps> {
@@ -29,7 +30,7 @@ export class ProgressDialog extends React.Component<IProgressDialogProps> {
     const progressValue = formatRebaseValue(value)
     return (
       <Dialog
-        dismissable={false}
+        dismissDisabled={true}
         id="multi-commit-progress"
         title={`${operation} in progress`}
       >
@@ -39,7 +40,7 @@ export class ProgressDialog extends React.Component<IProgressDialogProps> {
 
             <div className="details">
               <div className="green-circle">
-                <Octicon symbol={OcticonSymbol.check} />
+                <Octicon symbol={octicons.check} />
               </div>
               <div className="summary">
                 <div className="message">
diff --git a/app/src/ui/multi-commit-operation/dialog/warn-force-push-dialog.tsx b/app/src/ui/multi-commit-operation/dialog/warn-force-push-dialog.tsx
index cac32edcedb..edb25b71da7 100644
--- a/app/src/ui/multi-commit-operation/dialog/warn-force-push-dialog.tsx
+++ b/app/src/ui/multi-commit-operation/dialog/warn-force-push-dialog.tsx
@@ -49,12 +49,16 @@ export class WarnForcePushDialog extends React.Component<
         title={title}
         onDismissed={onDismissed}
         onSubmit={this.onBegin}
-        dismissable={false}
+        backdropDismissable={false}
         type="warning"
+        role="alertdialog"
+        ariaDescribedBy="warn-force-push-confirmation-title warn-force-push-confirmation-message"
       >
         <DialogContent>
-          <p>Are you sure you want to {operation.toLowerCase()}?</p>
-          <p>
+          <p id="warn-force-push-confirmation-title">
+            Are you sure you want to {operation.toLowerCase()}?
+          </p>
+          <p id="warn-force-push-confirmation-message">
             At the end of the {operation.toLowerCase()} flow, GitHub Desktop
             will enable you to force push the branch to update the upstream
             branch. Force pushing will alter the history on the remote and
diff --git a/app/src/ui/multi-commit-operation/merge.tsx b/app/src/ui/multi-commit-operation/merge.tsx
index 719dec7d65c..2ff16a6c47f 100644
--- a/app/src/ui/multi-commit-operation/merge.tsx
+++ b/app/src/ui/multi-commit-operation/merge.tsx
@@ -50,7 +50,7 @@ export abstract class Merge extends BaseMultiCommitOperation {
       RepositorySectionTab.Changes
     )
     this.onFlowEnded()
-    dispatcher.recordGuidedConflictedMergeCompletion()
+    dispatcher.incrementMetric('guidedConflictedMergeCompletionCount')
   }
 
   protected onAbort = async (): Promise<void> => {
@@ -75,12 +75,14 @@ export abstract class Merge extends BaseMultiCommitOperation {
       this.endFlowInvalidState(true)
       return
     }
-    dispatcher.recordMergeConflictsDialogDismissal()
+    dispatcher.incrementMetric('mergeConflictsDialogDismissalCount')
     const anyConflictedFiles =
       getConflictedFiles(workingDirectory, conflictState.manualResolutions)
         .length > 0
     if (anyConflictedFiles) {
-      dispatcher.recordAnyConflictsLeftOnMergeConflictsDialogDismissal()
+      dispatcher.incrementMetric(
+        'anyConflictsLeftOnMergeConflictsDialogDismissalCount'
+      )
     }
     this.onInvokeConflictsDialogDismissed('merge into')
   }
diff --git a/app/src/ui/multi-commit-operation/multi-commit-operation.tsx b/app/src/ui/multi-commit-operation/multi-commit-operation.tsx
index 251d8dbdf41..6631d5f0bd4 100644
--- a/app/src/ui/multi-commit-operation/multi-commit-operation.tsx
+++ b/app/src/ui/multi-commit-operation/multi-commit-operation.tsx
@@ -29,6 +29,8 @@ export class MultiCommitOperation extends React.Component<IMultiCommitOperationP
             askForConfirmationOnForcePush={
               this.props.askForConfirmationOnForcePush
             }
+            accounts={this.props.accounts}
+            cachedRepoRulesets={this.props.cachedRepoRulesets}
             openFileInExternalEditor={this.props.openFileInExternalEditor}
             resolvedExternalEditor={this.props.resolvedExternalEditor}
             openRepositoryInShell={this.props.openRepositoryInShell}
@@ -46,6 +48,8 @@ export class MultiCommitOperation extends React.Component<IMultiCommitOperationP
             askForConfirmationOnForcePush={
               this.props.askForConfirmationOnForcePush
             }
+            accounts={this.props.accounts}
+            cachedRepoRulesets={this.props.cachedRepoRulesets}
             openFileInExternalEditor={this.props.openFileInExternalEditor}
             resolvedExternalEditor={this.props.resolvedExternalEditor}
             openRepositoryInShell={this.props.openRepositoryInShell}
@@ -63,6 +67,8 @@ export class MultiCommitOperation extends React.Component<IMultiCommitOperationP
             askForConfirmationOnForcePush={
               this.props.askForConfirmationOnForcePush
             }
+            accounts={this.props.accounts}
+            cachedRepoRulesets={this.props.cachedRepoRulesets}
             openFileInExternalEditor={this.props.openFileInExternalEditor}
             resolvedExternalEditor={this.props.resolvedExternalEditor}
             openRepositoryInShell={this.props.openRepositoryInShell}
diff --git a/app/src/ui/no-repositories/create-tutorial-repository-dialog.tsx b/app/src/ui/no-repositories/create-tutorial-repository-dialog.tsx
index c49e478987e..a7f9f25c904 100644
--- a/app/src/ui/no-repositories/create-tutorial-repository-dialog.tsx
+++ b/app/src/ui/no-repositories/create-tutorial-repository-dialog.tsx
@@ -76,7 +76,7 @@ export class CreateTutorialRepositoryDialog extends React.Component<ICreateTutor
         title="Start tutorial"
         onDismissed={this.props.onDismissed}
         onSubmit={this.onSubmit}
-        dismissable={!loading}
+        dismissDisabled={loading}
         loading={loading}
         disabled={loading}
       >
diff --git a/app/src/ui/no-repositories/no-repositories-view.tsx b/app/src/ui/no-repositories/no-repositories-view.tsx
index 5f313277725..36bbb48a79e 100644
--- a/app/src/ui/no-repositories/no-repositories-view.tsx
+++ b/app/src/ui/no-repositories/no-repositories-view.tsx
@@ -1,8 +1,8 @@
 import * as React from 'react'
 import { UiView } from '../ui-view'
 import { Button } from '../lib/button'
-import { Octicon, OcticonSymbolType } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import { Octicon, OcticonSymbol } from '../octicons'
+import * as octicons from '../octicons/octicons.generated'
 import {
   WelcomeLeftTopImageUri,
   WelcomeLeftBottomImageUri,
@@ -129,24 +129,28 @@ export class NoRepositoriesView extends React.Component<
   public render() {
     return (
       <UiView id="no-repositories">
-        <header>
-          <h1>Let's get started!</h1>
-          <p>Add a repository to GitHub Desktop to start collaborating</p>
-        </header>
-
-        <div className="content">
-          {this.renderGetStartedActions()}
-          {this.renderRepositoryList()}
-        </div>
+        <section aria-label="Let's get started!">
+          <header>
+            <h1>Let's get started!</h1>
+            <p>Add a repository to GitHub Desktop to start collaborating</p>
+          </header>
+
+          <div className="content">
+            {this.renderRepositoryList()}
+            {this.renderGetStartedActions()}
+          </div>
 
-        <img
-          className="no-repositories-graphic-top"
-          src={WelcomeLeftTopImageUri}
-        />
-        <img
-          className="no-repositories-graphic-bottom"
-          src={WelcomeLeftBottomImageUri}
-        />
+          <img
+            className="no-repositories-graphic-top"
+            src={WelcomeLeftTopImageUri}
+            alt=""
+          />
+          <img
+            className="no-repositories-graphic-bottom"
+            src={WelcomeLeftBottomImageUri}
+            alt=""
+          />
+        </section>
       </UiView>
     )
   }
@@ -178,6 +182,12 @@ export class NoRepositoriesView extends React.Component<
     }
   }
 
+  private isUserSignedIn() {
+    return (
+      this.props.dotComAccount !== null || this.props.enterpriseAccount !== null
+    )
+  }
+
   private getSelectedAccount() {
     const { selectedTab } = this.state
     if (selectedTab === AccountTab.dotCom) {
@@ -341,33 +351,31 @@ export class NoRepositoriesView extends React.Component<
   private onShowClone = () => this.props.onClone()
 
   private renderButtonGroupButton(
-    symbol: OcticonSymbolType,
+    symbol: OcticonSymbol,
     title: string,
     onClick: () => void,
-    type?: 'submit'
+    type?: 'submit',
+    autoFocus?: boolean
   ) {
     return (
-      <li>
-        <Button onClick={onClick} type={type}>
+      <span>
+        <Button onClick={onClick} type={type} autoFocus={autoFocus}>
           <Octicon symbol={symbol} />
           <div>{title}</div>
         </Button>
-      </li>
+      </span>
     )
   }
 
   private renderTutorialRepositoryButton() {
     // No tutorial if you're not signed in.
-    if (
-      this.props.dotComAccount === null &&
-      this.props.enterpriseAccount === null
-    ) {
+    if (!this.isUserSignedIn()) {
       return null
     }
 
     if (this.props.tutorialPaused) {
       return this.renderButtonGroupButton(
-        OcticonSymbol.mortarBoard,
+        octicons.mortarBoard,
         __DARWIN__
           ? 'Return to In Progress Tutorial'
           : 'Return to in progress tutorial',
@@ -376,7 +384,7 @@ export class NoRepositoriesView extends React.Component<
       )
     } else {
       return this.renderButtonGroupButton(
-        OcticonSymbol.mortarBoard,
+        octicons.mortarBoard,
         __DARWIN__
           ? 'Create a Tutorial Repository…'
           : 'Create a tutorial repository…',
@@ -388,30 +396,32 @@ export class NoRepositoriesView extends React.Component<
 
   private renderCloneButton() {
     return this.renderButtonGroupButton(
-      OcticonSymbol.repoClone,
+      octicons.repoClone,
       __DARWIN__
         ? 'Clone a Repository from the Internet…'
         : 'Clone a repository from the Internet…',
-      this.onShowClone
+      this.onShowClone,
+      undefined,
+      !this.isUserSignedIn()
     )
   }
 
   private renderCreateRepositoryButton() {
     return this.renderButtonGroupButton(
-      OcticonSymbol.plus,
+      octicons.plus,
       __DARWIN__
-        ? 'Create a New Repository on your Hard Drive…'
-        : 'Create a New Repository on your hard drive…',
+        ? 'Create a New Repository on your Local Drive…'
+        : 'Create a New Repository on your local drive…',
       this.props.onCreate
     )
   }
 
   private renderAddExistingRepositoryButton() {
     return this.renderButtonGroupButton(
-      OcticonSymbol.fileDirectory,
+      octicons.fileDirectory,
       __DARWIN__
-        ? 'Add an Existing Repository from your Hard Drive…'
-        : 'Add an Existing Repository from your hard drive…',
+        ? 'Add an Existing Repository from your Local Drive…'
+        : 'Add an Existing Repository from your local drive…',
       this.props.onAdd
     )
   }
@@ -419,15 +429,15 @@ export class NoRepositoriesView extends React.Component<
   private renderGetStartedActions() {
     return (
       <div className="content-pane">
-        <ul className="button-group">
+        <div className="button-group">
           {this.renderTutorialRepositoryButton()}
           {this.renderCloneButton()}
           {this.renderCreateRepositoryButton()}
           {this.renderAddExistingRepositoryButton()}
-        </ul>
+        </div>
 
         <div className="drag-drop-info">
-          <Octicon symbol={OcticonSymbol.lightBulb} />
+          <Octicon symbol={octicons.lightBulb} />
           <div>
             <strong>ProTip!</strong> You can drag &amp; drop an existing
             repository folder here to add it to Desktop
diff --git a/app/src/ui/notifications/pull-request-checks-failed.tsx b/app/src/ui/notifications/pull-request-checks-failed.tsx
index ed9f5049797..a14754e824f 100644
--- a/app/src/ui/notifications/pull-request-checks-failed.tsx
+++ b/app/src/ui/notifications/pull-request-checks-failed.tsx
@@ -15,16 +15,16 @@ import {
 import { Account } from '../../models/account'
 import { API, IAPIWorkflowJobStep } from '../../lib/api'
 import { Octicon } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import * as octicons from '../octicons/octicons.generated'
 import { RepositoryWithGitHubRepository } from '../../models/repository'
 import { CICheckRunActionsJobStepList } from '../check-runs/ci-check-run-actions-job-step-list'
-import { LinkButton } from '../lib/link-button'
 import { encodePathAsUrl } from '../../lib/path'
 import { PopupType } from '../../models/popup'
 import { CICheckReRunButton } from '../check-runs/ci-check-re-run-button'
 import { supportsRerunningIndividualOrFailedChecks } from '../../lib/endpoint-capabilities'
+import { CICheckRunNoStepItem } from '../check-runs/ci-check-run-no-steps'
+import { CICheckRunStepListHeader } from '../check-runs/ci-check-run-step-list-header'
 
-const PaperStackImage = encodePathAsUrl(__dirname, 'static/paper-stack.svg')
 const BlankSlateImage = encodePathAsUrl(
   __dirname,
   'static/empty-no-pull-requests.svg'
@@ -36,8 +36,6 @@ interface IPullRequestChecksFailedProps {
   readonly accounts: ReadonlyArray<Account>
   readonly repository: RepositoryWithGitHubRepository
   readonly pullRequest: PullRequest
-  readonly commitMessage: string
-  readonly commitSha: string
   readonly checks: ReadonlyArray<IRefCheck>
   readonly onSubmit: () => void
   readonly onDismissed: () => void
@@ -48,7 +46,6 @@ interface IPullRequestChecksFailedState {
   readonly selectedCheckID: number
   readonly checks: ReadonlyArray<IRefCheck>
   readonly loadingActionWorkflows: boolean
-  readonly loadingActionLogs: boolean
 }
 
 /**
@@ -71,7 +68,6 @@ export class PullRequestChecksFailed extends React.Component<
       selectedCheckID: selectedCheck.id,
       checks,
       loadingActionWorkflows: true,
-      loadingActionLogs: true,
     }
   }
 
@@ -82,7 +78,7 @@ export class PullRequestChecksFailed extends React.Component<
   }
 
   private get loadingChecksInfo(): boolean {
-    return this.state.loadingActionWorkflows || this.state.loadingActionLogs
+    return this.state.loadingActionWorkflows
   }
 
   public render() {
@@ -105,17 +101,16 @@ export class PullRequestChecksFailed extends React.Component<
 
     const header = (
       <div className="ci-check-run-dialog-header">
-        <Octicon symbol={OcticonSymbol.xCircleFill} />
+        <Octicon symbol={octicons.xCircleFill} />
         <div className="title-container">
           <div className="summary">
             {failedChecks.length} {pluralChecks} failed in your pull request
           </div>
           <span className="pr-title">
-            <span className="pr-title">{pullRequest.title}</span>{' '}
+            {pullRequest.title}{' '}
             <span className="pr-number">#{pullRequest.pullRequestNumber}</span>{' '}
           </span>
         </div>
-        {this.renderRerunButton()}
       </div>
     )
 
@@ -124,7 +119,8 @@ export class PullRequestChecksFailed extends React.Component<
         id="pull-request-checks-failed"
         type="normal"
         title={header}
-        dismissable={false}
+        renderHeaderAccessory={this.renderRerunButton}
+        backdropDismissable={false}
         onSubmit={this.props.onSubmit}
         onDismissed={this.props.onDismissed}
         loading={loadingChecksInfo || this.state.switchingToPullRequest}
@@ -176,8 +172,6 @@ export class PullRequestChecksFailed extends React.Component<
     return (
       <CICheckRunList
         checkRuns={this.state.checks}
-        loadingActionLogs={this.state.loadingActionLogs}
-        loadingActionWorkflows={this.state.loadingActionWorkflows}
         selectable={true}
         onViewCheckDetails={this.onViewOnGitHub}
         onCheckRunClick={this.onCheckRunClick}
@@ -192,56 +186,66 @@ export class PullRequestChecksFailed extends React.Component<
     )
   }
 
-  private renderCheckRunSteps() {
-    const selectedCheck = this.selectedCheck
-    if (selectedCheck === undefined) {
-      return null
+  private checkRunStepContent() {
+    if (this.loadingChecksInfo) {
+      return this.renderCheckRunStepsLoading()
     }
 
-    let stepsContent = null
+    if (this.selectedCheck?.actionJobSteps === undefined) {
+      return (
+        <CICheckRunNoStepItem
+          onViewCheckExternally={this.onViewSelectedCheckRunOnGitHub}
+        />
+      )
+    }
 
-    if (this.loadingChecksInfo) {
-      stepsContent = this.renderCheckRunStepsLoading()
-    } else if (selectedCheck.actionJobSteps === undefined) {
-      stepsContent = this.renderEmptyLogOutput()
-    } else {
-      stepsContent = (
+    return (
+      <>
+        <CICheckRunStepListHeader
+          checkRun={this.selectedCheck}
+          onRerunJob={
+            supportsRerunningIndividualOrFailedChecks(
+              this.props.repository.gitHubRepository.endpoint
+            )
+              ? this.onRerunJob
+              : undefined
+          }
+          onViewCheckExternally={this.onViewSelectedCheckRunOnGitHub}
+        />
         <CICheckRunActionsJobStepList
-          steps={selectedCheck.actionJobSteps}
+          steps={this.selectedCheck.actionJobSteps}
           onViewJobStep={this.onViewJobStep}
         />
-      )
+      </>
+    )
+  }
+
+  private renderCheckRunSteps() {
+    if (this.selectedCheck === undefined) {
+      return null
     }
 
     return (
-      <div className="ci-check-run-job-steps-container">{stepsContent}</div>
+      <div
+        className="ci-check-run-job-steps-container"
+        role="region"
+        id={`checkrun-${this.selectedCheck.id}`}
+        aria-labelledby={`check-run-header-${this.selectedCheck.id}`}
+      >
+        {this.checkRunStepContent()}
+      </div>
     )
   }
 
   private renderCheckRunStepsLoading(): JSX.Element {
     return (
       <div className="loading-check-runs">
-        <img src={BlankSlateImage} className="blankslate-image" />
+        <img src={BlankSlateImage} className="blankslate-image" alt="" />
         <div className="title">Stand By</div>
         <div className="call-to-action">Check run steps incoming!</div>
       </div>
     )
   }
-  private renderEmptyLogOutput() {
-    return (
-      <div className="no-steps-to-display">
-        <div className="text">
-          There are no steps to display for this check.
-          <div>
-            <LinkButton onClick={this.onViewSelectedCheckRunOnGitHub}>
-              View check details
-            </LinkButton>
-          </div>
-        </div>
-        <img src={PaperStackImage} className="blankslate-image" />
-      </div>
-    )
-  }
 
   private onViewJobStep = (step: IAPIWorkflowJobStep): void => {
     const { repository, pullRequest, dispatcher } = this.props
@@ -291,7 +295,7 @@ export class PullRequestChecksFailed extends React.Component<
     failedOnly: boolean,
     checks?: ReadonlyArray<IRefCheck>
   ) => {
-    this.props.dispatcher.recordChecksFailedDialogRerunChecks()
+    this.props.dispatcher.incrementMetric('checksFailedDialogRerunChecksCount')
 
     const prRef = getPullRequestCommitRef(
       this.props.pullRequest.pullRequestNumber
@@ -315,10 +319,7 @@ export class PullRequestChecksFailed extends React.Component<
     )
 
     if (account === undefined) {
-      this.setState({
-        loadingActionWorkflows: false,
-        loadingActionLogs: false,
-      })
+      this.setState({ loadingActionWorkflows: false })
       return
     }
 
@@ -344,10 +345,7 @@ export class PullRequestChecksFailed extends React.Component<
       return
     }
 
-    this.setState({
-      checks: checkRunsWithActionsUrls,
-      loadingActionWorkflows: false,
-    })
+    this.setState({ checks: checkRunsWithActionsUrls })
 
     const checks = await getLatestPRWorkflowRunsLogsForCheckRun(
       api,
@@ -360,7 +358,7 @@ export class PullRequestChecksFailed extends React.Component<
       return
     }
 
-    this.setState({ checks, loadingActionLogs: false })
+    this.setState({ checks, loadingActionWorkflows: false })
   }
 
   private onCheckRunClick = (checkRun: IRefCheck): void => {
@@ -395,7 +393,9 @@ export class PullRequestChecksFailed extends React.Component<
     event.preventDefault()
     const { dispatcher, repository, pullRequest } = this.props
 
-    this.props.dispatcher.recordChecksFailedDialogSwitchToPullRequest()
+    this.props.dispatcher.incrementMetric(
+      'checksFailedDialogSwitchToPullRequestCount'
+    )
 
     this.setState({ switchingToPullRequest: true })
     await dispatcher.selectRepository(repository)
diff --git a/app/src/ui/notifications/pull-request-comment-like.tsx b/app/src/ui/notifications/pull-request-comment-like.tsx
new file mode 100644
index 00000000000..d696f9860e8
--- /dev/null
+++ b/app/src/ui/notifications/pull-request-comment-like.tsx
@@ -0,0 +1,212 @@
+import * as React from 'react'
+import { Dialog, DialogContent, DialogFooter } from '../dialog'
+import { PullRequest } from '../../models/pull-request'
+import { Dispatcher } from '../dispatcher'
+import { Octicon, OcticonSymbol } from '../octicons'
+import * as octicons from '../octicons/octicons.generated'
+import { RepositoryWithGitHubRepository } from '../../models/repository'
+import { SandboxedMarkdown } from '../lib/sandboxed-markdown'
+import { LinkButton } from '../lib/link-button'
+import classNames from 'classnames'
+import { Avatar } from '../lib/avatar'
+import { formatRelative } from '../../lib/format-relative'
+import { getStealthEmailForUser } from '../../lib/email'
+import { IAPIIdentity } from '../../lib/api'
+import { Account } from '../../models/account'
+import { Emoji } from '../../lib/emoji'
+
+interface IPullRequestCommentLikeProps {
+  readonly id?: string
+  readonly dispatcher: Dispatcher
+  readonly repository: RepositoryWithGitHubRepository
+  readonly pullRequest: PullRequest
+  readonly eventDate: Date
+  readonly eventVerb: string
+  readonly eventIconSymbol: OcticonSymbol
+  readonly eventIconClass: string
+  readonly externalURL: string
+  readonly user: IAPIIdentity
+  readonly body: string
+
+  /** Map from the emoji shortcut (e.g., :+1:) to the image's local path. */
+  readonly emoji: Map<string, Emoji>
+
+  readonly switchingToPullRequest: boolean
+
+  readonly underlineLinks: boolean
+
+  readonly renderFooterContent: () => JSX.Element
+
+  readonly onSubmit: () => void
+  readonly onDismissed: () => void
+
+  readonly accounts: ReadonlyArray<Account>
+}
+
+/**
+ * Dialog to show a pull request review.
+ */
+export abstract class PullRequestCommentLike extends React.Component<IPullRequestCommentLikeProps> {
+  public render() {
+    const { title, pullRequestNumber } = this.props.pullRequest
+
+    const header = (
+      <div className="pull-request-comment-like-dialog-header">
+        {this.renderPullRequestIcon()}
+        <span className="pr-title">
+          {title} <span className="pr-number">#{pullRequestNumber}</span>{' '}
+        </span>
+      </div>
+    )
+
+    return (
+      <Dialog
+        id={this.props.id}
+        type="normal"
+        title={header}
+        backdropDismissable={false}
+        onSubmit={this.props.onSubmit}
+        onDismissed={this.props.onDismissed}
+        loading={this.props.switchingToPullRequest}
+      >
+        <DialogContent>
+          <div className="comment-container">
+            {this.renderTimelineItem()}
+            {this.renderCommentBubble()}
+          </div>
+        </DialogContent>
+        <DialogFooter>{this.props.renderFooterContent()}</DialogFooter>
+      </Dialog>
+    )
+  }
+
+  private renderTimelineItem() {
+    const { user, repository, eventDate, eventVerb, externalURL, accounts } =
+      this.props
+    const { endpoint } = repository.gitHubRepository
+    const userAvatar = {
+      name: user.login,
+      email: getStealthEmailForUser(user.id, user.login, endpoint),
+      avatarURL: user.avatar_url,
+      endpoint: endpoint,
+    }
+
+    const bottomLine = this.shouldRenderCommentBubble()
+      ? null
+      : this.renderDashedTimelineLine('bottom')
+
+    const timelineItemClass = classNames('timeline-item', {
+      'with-comment': this.shouldRenderCommentBubble(),
+    })
+
+    const diff = eventDate.getTime() - Date.now()
+    const relativeReviewDate = formatRelative(diff)
+
+    return (
+      <div className="timeline-item-container">
+        {this.renderDashedTimelineLine('top')}
+        <div className={timelineItemClass}>
+          <Avatar
+            accounts={accounts}
+            user={userAvatar}
+            title={null}
+            size={40}
+          />
+          {this.renderReviewIcon()}
+          <div className="summary">
+            <LinkButton uri={user.html_url} className="author">
+              {user.login}
+            </LinkButton>{' '}
+            {eventVerb} your pull request{' '}
+            <LinkButton uri={externalURL} className="submission-date">
+              {relativeReviewDate}
+            </LinkButton>
+          </div>
+        </div>
+        {bottomLine}
+      </div>
+    )
+  }
+
+  private shouldRenderCommentBubble() {
+    return this.props.body !== ''
+  }
+
+  private renderCommentBubble() {
+    if (!this.shouldRenderCommentBubble()) {
+      return null
+    }
+
+    return (
+      <div className="comment-bubble-container">
+        <div className="comment-bubble">{this.renderReviewBody()}</div>
+        {this.renderDashedTimelineLine('bottom')}
+      </div>
+    )
+  }
+
+  private renderDashedTimelineLine(type: 'top' | 'bottom') {
+    return (
+      <svg
+        aria-hidden="true"
+        xmlns="http://www.w3.org/2000/svg"
+        className={`timeline-line ${type}`}
+      >
+        {/* Need to use 0.5 for X to prevent nearest neighbour filtering causing
+        the line to appear semi-transparent. */}
+        <line x1="0.5" y1="0" x2="0.5" y2="100%" />
+      </svg>
+    )
+  }
+
+  private onMarkdownLinkClicked = (url: string) => {
+    this.props.dispatcher.openInBrowser(url)
+  }
+
+  private renderReviewBody() {
+    const { body, emoji, pullRequest } = this.props
+    const { base } = pullRequest
+
+    return (
+      <SandboxedMarkdown
+        markdown={body}
+        emoji={emoji}
+        baseHref={base.gitHubRepository.htmlURL ?? undefined}
+        repository={base.gitHubRepository}
+        onMarkdownLinkClicked={this.onMarkdownLinkClicked}
+        markdownContext={'PullRequestComment'}
+        underlineLinks={this.props.underlineLinks}
+        ariaLabel="Pull request markdown comment"
+      />
+    )
+  }
+
+  private renderPullRequestIcon = () => {
+    const { pullRequest } = this.props
+
+    const cls = classNames('pull-request-icon', {
+      draft: pullRequest.draft,
+    })
+
+    return (
+      <Octicon
+        className={cls}
+        symbol={
+          pullRequest.draft
+            ? octicons.gitPullRequestDraft
+            : octicons.gitPullRequest
+        }
+      />
+    )
+  }
+
+  private renderReviewIcon = () => {
+    const { eventIconSymbol, eventIconClass } = this.props
+
+    return (
+      <div className={classNames('review-icon-container', eventIconClass)}>
+        <Octicon symbol={eventIconSymbol} />
+      </div>
+    )
+  }
+}
diff --git a/app/src/ui/notifications/pull-request-comment.tsx b/app/src/ui/notifications/pull-request-comment.tsx
new file mode 100644
index 00000000000..8f5587faaa7
--- /dev/null
+++ b/app/src/ui/notifications/pull-request-comment.tsx
@@ -0,0 +1,159 @@
+import * as React from 'react'
+import { Row } from '../lib/row'
+import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group'
+import { PullRequest } from '../../models/pull-request'
+import { Dispatcher } from '../dispatcher'
+import { RepositoryWithGitHubRepository } from '../../models/repository'
+import { LinkButton } from '../lib/link-button'
+import { IAPIComment } from '../../lib/api'
+import { getPullRequestReviewStateIcon } from './pull-request-review-helpers'
+import { PullRequestCommentLike } from './pull-request-comment-like'
+import { Account } from '../../models/account'
+import { Emoji } from '../../lib/emoji'
+
+interface IPullRequestCommentProps {
+  readonly dispatcher: Dispatcher
+  readonly repository: RepositoryWithGitHubRepository
+  readonly pullRequest: PullRequest
+  readonly comment: IAPIComment
+
+  /** Map from the emoji shortcut (e.g., :+1:) to the image's local path. */
+  readonly emoji: Map<string, Emoji>
+
+  readonly underlineLinks: boolean
+
+  /**
+   * Whether or not the dialog should offer to switch to the PR's repository or
+   * to checkout the PR branch when applicable (e.g. non-approved reviews).
+   */
+  readonly shouldCheckoutBranch: boolean
+  readonly shouldChangeRepository: boolean
+
+  readonly onSubmit: () => void
+  readonly onDismissed: () => void
+
+  readonly accounts: ReadonlyArray<Account>
+}
+
+interface IPullRequestCommentState {
+  readonly switchingToPullRequest: boolean
+}
+
+/**
+ * Dialog to show a pull request comment.
+ */
+export class PullRequestComment extends React.Component<
+  IPullRequestCommentProps,
+  IPullRequestCommentState
+> {
+  public constructor(props: IPullRequestCommentProps) {
+    super(props)
+
+    this.state = {
+      switchingToPullRequest: false,
+    }
+  }
+
+  public render() {
+    const {
+      dispatcher,
+      repository,
+      pullRequest,
+      emoji,
+      comment,
+      onSubmit,
+      onDismissed,
+      accounts,
+    } = this.props
+
+    const icon = getPullRequestReviewStateIcon('COMMENTED')
+
+    return (
+      <PullRequestCommentLike
+        id="pull-request-comment"
+        dispatcher={dispatcher}
+        repository={repository}
+        pullRequest={pullRequest}
+        emoji={emoji}
+        eventDate={new Date(comment.created_at)}
+        eventVerb="commented on"
+        eventIconSymbol={icon.symbol}
+        eventIconClass={icon.className}
+        externalURL={comment.html_url}
+        user={comment.user}
+        body={comment.body}
+        switchingToPullRequest={this.state.switchingToPullRequest}
+        renderFooterContent={this.renderFooterContent}
+        onSubmit={onSubmit}
+        onDismissed={onDismissed}
+        underlineLinks={this.props.underlineLinks}
+        accounts={accounts}
+      />
+    )
+  }
+
+  private renderFooterContent = () => {
+    const { shouldChangeRepository, shouldCheckoutBranch, comment } = this.props
+
+    let okButtonTitle: undefined | string = undefined
+
+    if (shouldChangeRepository) {
+      okButtonTitle = __DARWIN__
+        ? 'Switch to Repository and Pull Request'
+        : 'Switch to repository and pull request'
+    } else if (shouldCheckoutBranch) {
+      okButtonTitle = __DARWIN__
+        ? 'Switch to Pull Request'
+        : 'Switch to pull request'
+    }
+
+    const okCancelButtonGroup = (
+      <OkCancelButtonGroup
+        onCancelButtonClick={this.props.onDismissed}
+        cancelButtonText="Dismiss"
+        // If there is nothing special about the OK button, just hide the cancel
+        // button, since they will both just dismiss the dialog.
+        cancelButtonVisible={okButtonTitle !== undefined}
+        okButtonText={okButtonTitle}
+        okButtonDisabled={this.state.switchingToPullRequest}
+        onOkButtonClick={this.onSubmit}
+      />
+    )
+
+    const openInBrowserText = __DARWIN__ ? 'Open in Browser' : 'Open in browser'
+
+    return (
+      <Row>
+        <div className="footer-links">
+          <LinkButton uri={comment.html_url}>{openInBrowserText}</LinkButton>
+        </div>
+        {okCancelButtonGroup}
+      </Row>
+    )
+  }
+
+  private onSubmit = async (event: React.MouseEvent<HTMLButtonElement>) => {
+    event.preventDefault()
+
+    const {
+      dispatcher,
+      repository,
+      pullRequest,
+      shouldChangeRepository,
+      shouldCheckoutBranch,
+    } = this.props
+
+    if (shouldChangeRepository || shouldCheckoutBranch) {
+      this.setState({ switchingToPullRequest: true })
+      await dispatcher.selectRepository(repository)
+      await dispatcher.checkoutPullRequest(repository, pullRequest)
+      this.setState({ switchingToPullRequest: false })
+
+      dispatcher.incrementMetric(
+        'pullRequestCommentDialogSwitchToPullRequestCount'
+      )
+    }
+
+    this.props.onDismissed()
+  }
+}
diff --git a/app/src/ui/notifications/pull-request-review-helpers.ts b/app/src/ui/notifications/pull-request-review-helpers.ts
index 83a8f5e066e..81975ebf787 100644
--- a/app/src/ui/notifications/pull-request-review-helpers.ts
+++ b/app/src/ui/notifications/pull-request-review-helpers.ts
@@ -2,8 +2,8 @@ import {
   ValidNotificationPullRequestReview,
   ValidNotificationPullRequestReviewState,
 } from '../../lib/valid-notification-pull-request-review'
-import * as OcticonSymbol from '../octicons/octicons.generated'
-import { OcticonSymbolType } from '../octicons/octicons.generated'
+import * as octicons from '../octicons/octicons.generated'
+import { OcticonSymbol } from '../octicons'
 
 /** Returns the user-facing verb for a given review's state. */
 export function getVerbForPullRequestReview(
@@ -20,7 +20,7 @@ export function getVerbForPullRequestReview(
 }
 
 type ReviewStateIcon = {
-  symbol: OcticonSymbolType
+  symbol: OcticonSymbol
   className: string
 }
 
@@ -31,17 +31,17 @@ export function getPullRequestReviewStateIcon(
   switch (state) {
     case 'APPROVED':
       return {
-        symbol: OcticonSymbol.check,
+        symbol: octicons.check,
         className: 'pr-review-approved',
       }
     case 'CHANGES_REQUESTED':
       return {
-        symbol: OcticonSymbol.fileDiff,
+        symbol: octicons.fileDiff,
         className: 'pr-review-changes-requested',
       }
     case 'COMMENTED':
       return {
-        symbol: OcticonSymbol.eye,
+        symbol: octicons.eye,
         className: 'pr-review-commented',
       }
   }
diff --git a/app/src/ui/notifications/pull-request-review.tsx b/app/src/ui/notifications/pull-request-review.tsx
index d98303a76b6..8d5579dfef6 100644
--- a/app/src/ui/notifications/pull-request-review.tsx
+++ b/app/src/ui/notifications/pull-request-review.tsx
@@ -1,35 +1,29 @@
 import * as React from 'react'
-import { Dialog, DialogContent, DialogFooter } from '../dialog'
 import { Row } from '../lib/row'
 import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group'
 import { PullRequest } from '../../models/pull-request'
 import { Dispatcher } from '../dispatcher'
-import { Account } from '../../models/account'
-import { Octicon } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
 import { RepositoryWithGitHubRepository } from '../../models/repository'
-import { SandboxedMarkdown } from '../lib/sandboxed-markdown'
 import {
   getPullRequestReviewStateIcon,
   getVerbForPullRequestReview,
 } from './pull-request-review-helpers'
 import { LinkButton } from '../lib/link-button'
-import classNames from 'classnames'
-import { Avatar } from '../lib/avatar'
-import { formatRelative } from '../../lib/format-relative'
 import { ValidNotificationPullRequestReview } from '../../lib/valid-notification-pull-request-review'
-import { getStealthEmailForUser } from '../../lib/email'
+import { PullRequestCommentLike } from './pull-request-comment-like'
+import { Account } from '../../models/account'
+import { Emoji } from '../../lib/emoji'
 
 interface IPullRequestReviewProps {
   readonly dispatcher: Dispatcher
-  readonly accounts: ReadonlyArray<Account>
   readonly repository: RepositoryWithGitHubRepository
   readonly pullRequest: PullRequest
   readonly review: ValidNotificationPullRequestReview
-  readonly numberOfComments: number
 
   /** Map from the emoji shortcut (e.g., :+1:) to the image's local path. */
-  readonly emoji: Map<string, string>
+  readonly emoji: Map<string, Emoji>
+
+  readonly underlineLinks: boolean
 
   /**
    * Whether or not the dialog should offer to switch to the PR's repository or
@@ -40,6 +34,8 @@ interface IPullRequestReviewProps {
 
   readonly onSubmit: () => void
   readonly onDismissed: () => void
+
+  readonly accounts: ReadonlyArray<Account>
 }
 
 interface IPullRequestReviewState {
@@ -47,7 +43,7 @@ interface IPullRequestReviewState {
 }
 
 /**
- * Dialog to show the result of a CI check run.
+ * Dialog to show a pull request review.
  */
 export class PullRequestReview extends React.Component<
   IPullRequestReviewProps,
@@ -62,115 +58,43 @@ export class PullRequestReview extends React.Component<
   }
 
   public render() {
-    const { title, pullRequestNumber } = this.props.pullRequest
+    const {
+      dispatcher,
+      repository,
+      pullRequest,
+      emoji,
+      review,
+      onSubmit,
+      onDismissed,
+    } = this.props
 
-    const header = (
-      <div className="pull-request-review-dialog-header">
-        {this.renderPullRequestIcon()}
-        <span className="pr-title">
-          <span className="pr-title">{title}</span>{' '}
-          <span className="pr-number">#{pullRequestNumber}</span>{' '}
-        </span>
-      </div>
-    )
+    const icon = getPullRequestReviewStateIcon(review.state)
 
     return (
-      <Dialog
+      <PullRequestCommentLike
         id="pull-request-review"
-        type="normal"
-        title={header}
-        dismissable={false}
-        onSubmit={this.props.onSubmit}
-        onDismissed={this.props.onDismissed}
-        loading={this.state.switchingToPullRequest}
-      >
-        <DialogContent>
-          <div className="review-container">
-            {this.renderTimelineItem()}
-            {this.renderCommentBubble()}
-          </div>
-        </DialogContent>
-        <DialogFooter>{this.renderFooterContent()}</DialogFooter>
-      </Dialog>
-    )
-  }
-
-  private renderTimelineItem() {
-    const { review, repository } = this.props
-    const { user } = review
-    const { endpoint } = repository.gitHubRepository
-    const verb = getVerbForPullRequestReview(review)
-    const userAvatar = {
-      name: user.login,
-      email: getStealthEmailForUser(user.id, user.login, endpoint),
-      avatarURL: user.avatar_url,
-      endpoint: endpoint,
-    }
-
-    const bottomLine = this.shouldRenderCommentBubble()
-      ? null
-      : this.renderDashedTimelineLine('bottom')
-
-    const timelineItemClass = classNames('timeline-item', {
-      'with-comment': this.shouldRenderCommentBubble(),
-    })
-
-    const submittedAt = new Date(review.submitted_at)
-    const diff = submittedAt.getTime() - Date.now()
-    const relativeReviewDate = formatRelative(diff)
-
-    return (
-      <div className="timeline-item-container">
-        {this.renderDashedTimelineLine('top')}
-        <div className={timelineItemClass}>
-          <Avatar user={userAvatar} title={null} size={40} />
-          {this.renderReviewIcon()}
-          <div className="summary">
-            <LinkButton uri={review.user.html_url} className="reviewer">
-              {review.user.login}
-            </LinkButton>{' '}
-            {verb} your pull request{' '}
-            <LinkButton uri={review.html_url} className="submission-date">
-              {relativeReviewDate}
-            </LinkButton>
-          </div>
-        </div>
-        {bottomLine}
-      </div>
-    )
-  }
-
-  private shouldRenderCommentBubble() {
-    return this.props.review.body !== ''
-  }
-
-  private renderCommentBubble() {
-    if (!this.shouldRenderCommentBubble()) {
-      return null
-    }
-
-    return (
-      <div className="comment-bubble-container">
-        <div className="comment-bubble">{this.renderReviewBody()}</div>
-        {this.renderDashedTimelineLine('bottom')}
-      </div>
-    )
-  }
-
-  private renderDashedTimelineLine(type: 'top' | 'bottom') {
-    return (
-      <svg
-        xmlns="http://www.w3.org/2000/svg"
-        className={`timeline-line ${type}`}
-      >
-        {/* Need to use 0.5 for X to prevent nearest neighbour filtering causing
-        the line to appear semi-transparent. */}
-        <line x1="0.5" y1="0" x2="0.5" y2="100%" />
-      </svg>
+        dispatcher={dispatcher}
+        repository={repository}
+        pullRequest={pullRequest}
+        emoji={emoji}
+        eventDate={new Date(review.submitted_at)}
+        eventVerb={getVerbForPullRequestReview(review)}
+        eventIconSymbol={icon.symbol}
+        eventIconClass={icon.className}
+        externalURL={review.html_url}
+        user={review.user}
+        body={review.body}
+        switchingToPullRequest={this.state.switchingToPullRequest}
+        renderFooterContent={this.renderFooterContent}
+        onSubmit={onSubmit}
+        onDismissed={onDismissed}
+        underlineLinks={this.props.underlineLinks}
+        accounts={this.props.accounts}
+      />
     )
   }
 
-  private renderFooterContent() {
+  private renderFooterContent = () => {
     const { review, shouldChangeRepository, shouldCheckoutBranch } = this.props
     const isApprovedReview = review.state === 'APPROVED'
 
@@ -213,56 +137,6 @@ export class PullRequestReview extends React.Component<
     )
   }
 
-  private onMarkdownLinkClicked = (url: string) => {
-    this.props.dispatcher.openInBrowser(url)
-  }
-
-  private renderReviewBody() {
-    const { review, emoji, pullRequest } = this.props
-    const { base } = pullRequest
-
-    return (
-      <SandboxedMarkdown
-        markdown={review.body}
-        emoji={emoji}
-        baseHref={base.gitHubRepository.htmlURL ?? undefined}
-        repository={base.gitHubRepository}
-        onMarkdownLinkClicked={this.onMarkdownLinkClicked}
-        markdownContext={'PullRequestComment'}
-      />
-    )
-  }
-
-  private renderPullRequestIcon = () => {
-    const { pullRequest } = this.props
-
-    const cls = classNames('pull-request-icon', {
-      draft: pullRequest.draft,
-    })
-
-    return (
-      <Octicon
-        className={cls}
-        symbol={
-          pullRequest.draft
-            ? OcticonSymbol.gitPullRequestDraft
-            : OcticonSymbol.gitPullRequest
-        }
-      />
-    )
-  }
-
-  private renderReviewIcon = () => {
-    const { review } = this.props
-
-    const icon = getPullRequestReviewStateIcon(review.state)
-    return (
-      <div className={classNames('review-icon-container', icon.className)}>
-        <Octicon symbol={icon.symbol} />
-      </div>
-    )
-  }
-
   private onSubmit = async (event: React.MouseEvent<HTMLButtonElement>) => {
     event.preventDefault()
 
diff --git a/app/src/ui/octicons/diff-check.ts b/app/src/ui/octicons/diff-check.ts
new file mode 100644
index 00000000000..e6e505f5e5a
--- /dev/null
+++ b/app/src/ui/octicons/diff-check.ts
@@ -0,0 +1,13 @@
+import { OcticonSymbolVariant } from '.'
+
+/**
+ * An check mark produced by Gavin that is scaled for 12x12 as opposed to the
+ * regular 16x16 and is thicker for better visibility.
+ */
+export const diffCheck: OcticonSymbolVariant = {
+  w: 12,
+  h: 12,
+  p: [
+    'M10.5303 2.96967C10.8232 3.26256 10.8232 3.73744 10.5303 4.03033L5.03033 9.53033C4.73744 9.82322 4.26256 9.82322 3.96967 9.53033L1.46967 7.03033C1.17678 6.73744 1.17678 6.26256 1.46967 5.96967C1.76256 5.67678 2.23744 5.67678 2.53033 5.96967L4.5 7.93934L9.46967 2.96967C9.76256 2.67678 10.2374 2.67678 10.5303 2.96967Z',
+  ],
+}
diff --git a/app/src/ui/octicons/diff.ts b/app/src/ui/octicons/diff.ts
new file mode 100644
index 00000000000..c1325ca908c
--- /dev/null
+++ b/app/src/ui/octicons/diff.ts
@@ -0,0 +1,26 @@
+import { OcticonSymbolVariant } from '.'
+
+/**
+ * An check mark produced by Gavin that is scaled for 12x12 as opposed to the
+ * regular 16x16 and is thicker for better visibility.
+ */
+export const diffCheck: OcticonSymbolVariant = {
+  w: 12,
+  h: 12,
+  p: [
+    'M10.5303 2.96967C10.8232 3.26256 10.8232 3.73744 10.5303 4.03033L5.03033 9.53033C4.73744 9.82322 4.26256 9.82322 3.96967 9.53033L1.46967 7.03033C1.17678 6.73744 1.17678 6.26256 1.46967 5.96967C1.76256 5.67678 2.23744 5.67678 2.53033 5.96967L4.5 7.93934L9.46967 2.96967C9.76256 2.67678 10.2374 2.67678 10.5303 2.96967Z',
+  ],
+}
+
+/**
+ * An dash for the "mixed" state of the diff hunk handle check all produced by
+ * Gavin that is scaled for 12x12 as opposed to the regular 16x16 and is thicker
+ * for better visibility.
+ */
+export const diffDash: OcticonSymbolVariant = {
+  w: 12,
+  h: 12,
+  p: [
+    'm1.3125 6c0-.41421.33579-.75.75-.75h7.875c.4142 0 .75.33579.75.75s-.3358.75-.75.75h-7.875c-.41421 0-.75-.33579-.75-.75z',
+  ],
+}
diff --git a/app/src/ui/octicons/icon-preview-dialog.tsx b/app/src/ui/octicons/icon-preview-dialog.tsx
new file mode 100644
index 00000000000..4c99d327734
--- /dev/null
+++ b/app/src/ui/octicons/icon-preview-dialog.tsx
@@ -0,0 +1,54 @@
+import * as React from 'react'
+import { Dialog, DialogContent } from '../dialog'
+import * as octicons from './octicons.generated'
+import { Octicon, OcticonSymbolVariant, OcticonSymbolVariants } from '.'
+
+interface IIconPreviewDialogProps {
+  readonly onDismissed: () => void
+}
+
+export class IconPreviewDialog extends React.Component<IIconPreviewDialogProps> {
+  public render() {
+    return (
+      <Dialog
+        id="octicons-preview-dialog"
+        className="octicons-preview-dialog"
+        title="Icon Preview"
+        onDismissed={this.props.onDismissed}
+      >
+        <DialogContent>
+          <ul className="octicons-preview-list">
+            {Object.entries(octicons).map(([name, variants]) =>
+              this.renderIconVariants(name, variants)
+            )}
+          </ul>
+        </DialogContent>
+      </Dialog>
+    )
+  }
+
+  private renderIconVariants(name: string, icons: OcticonSymbolVariants) {
+    return (
+      <li key={name}>
+        <h2>{name}</h2>
+        <ul>
+          {Object.entries(icons).map(([size, icon]) =>
+            this.renderIcon(name, size, icon)
+          )}
+        </ul>
+      </li>
+    )
+  }
+
+  private renderIcon(name: string, height: string, icon: OcticonSymbolVariant) {
+    const sizeText = `${icon.h}x${icon.w}`
+    const title = `${name} - ${sizeText}`
+
+    return (
+      <li key={`name-${sizeText}`}>
+        <Octicon height={parseInt(height)} symbol={icon} title={title} />
+        <small>{sizeText}</small>
+      </li>
+    )
+  }
+}
diff --git a/app/src/ui/octicons/index.ts b/app/src/ui/octicons/index.ts
index aec6bd1bfbb..416738d13c9 100644
--- a/app/src/ui/octicons/index.ts
+++ b/app/src/ui/octicons/index.ts
@@ -1,4 +1,4 @@
-export { OcticonSymbolType } from './octicons.generated'
+export * from './octicons.generated'
 export { Octicon } from './octicon'
 export { iconForRepository } from './repository'
 export { iconForStatus } from './status'
diff --git a/app/src/ui/octicons/octicon.tsx b/app/src/ui/octicons/octicon.tsx
index 24142514eab..1552e496322 100644
--- a/app/src/ui/octicons/octicon.tsx
+++ b/app/src/ui/octicons/octicon.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { OcticonSymbolType } from './octicons.generated'
+import { OcticonSymbol, OcticonSymbolVariant } from '.'
 import classNames from 'classnames'
 import ReactDOM from 'react-dom'
 import { createObservableRef } from '../lib/observable-ref'
@@ -7,11 +7,11 @@ import { Tooltip, TooltipDirection } from '../lib/tooltip'
 
 interface IOcticonProps {
   /**
-   * An instance of an object conforming to the OcticonSymbol
-   * type. Supports custom paths as well as those provided
-   * through the static properties of the OcticonSymbol class.
+   * An instance of an object conforming to the OcticonSymbol type. Supports
+   * custom paths as well as those provided through the static properties of
+   * the OcticonSymbol class.
    */
-  readonly symbol: OcticonSymbolType
+  readonly symbol: OcticonSymbol
 
   /**
    * An optional classname that will be appended to the default
@@ -20,11 +20,13 @@ interface IOcticonProps {
   readonly className?: string
 
   /**
-   * An optional string to use as a tooltip for the icon
+   * An optional string to use as a tooltip and aria-label for the icon
    */
-  readonly title?: JSX.Element | string
+  readonly title?: string
 
   readonly tooltipDirection?: TooltipDirection
+
+  readonly height?: number
 }
 
 /**
@@ -34,14 +36,40 @@ interface IOcticonProps {
  * which is why the width and height properties specify the maximum and
  * not the minimum size.
  *
- * Usage: `<Octicon symbol={OcticonSymbol.mark_github} />`
+ * Usage: `<Octicon symbol={octicons.markGithub} />`
  */
 export class Octicon extends React.Component<IOcticonProps, {}> {
   private svgRef = createObservableRef<SVGSVGElement>()
 
   public render() {
-    const { symbol, title, tooltipDirection } = this.props
-    const viewBox = `0 0 ${symbol.w} ${symbol.h}`
+    const { symbol } = this.props
+
+    if (this.isSingleVariant(symbol)) {
+      return this.renderIcon(symbol.p, symbol.h, symbol.w)
+    } else {
+      const height = this.props.height ?? 16
+      const naturalHeight = this.closestNaturalHeight(
+        Object.keys(symbol).map(h => parseInt(h, 10)) as Array<number>,
+        height
+      )
+
+      const scaledSymbol = symbol[naturalHeight]
+
+      if (scaledSymbol === undefined) {
+        // Should never happen, but if it does the app should still be usable
+        return null
+      }
+
+      const naturalWidth = scaledSymbol.w
+      const width = height * (naturalWidth / naturalHeight)
+
+      return this.renderIcon(scaledSymbol.p, height, width)
+    }
+  }
+
+  private renderIcon(paths: string[], height: number, width: number) {
+    const { title, tooltipDirection } = this.props
+    const viewBox = `0 0 ${width} ${height}`
     const className = classNames('octicon', this.props.className)
 
     // Hide the octicon from screen readers when it's only being used
@@ -56,21 +84,59 @@ export class Octicon extends React.Component<IOcticonProps, {}> {
     return (
       <svg
         aria-hidden={ariaHidden}
+        aria-label={title}
         className={className}
         version="1.1"
         viewBox={viewBox}
         ref={this.svgRef}
         tabIndex={-1}
+        height={height}
+        width={width}
       >
         {title !== undefined && (
           <Tooltip target={this.svgRef} direction={direction}>
             {title}
           </Tooltip>
         )}
-        <path fillRule={symbol.fr} d={symbol.d} />
+
+        {paths.map((d, i) => (
+          <path key={i} d={d} />
+        ))}
       </svg>
     )
   }
+
+  /**
+   * Determine if the given symbol is a single variant or a set of variants.
+   *
+   * @param symbol The symbol to check.
+   * @returns      True if the symbol is a single variant, false if it's a set.
+   */
+  private isSingleVariant(
+    symbol: OcticonSymbol
+  ): symbol is OcticonSymbolVariant {
+    return (
+      symbol instanceof Object &&
+      symbol.hasOwnProperty('p') &&
+      symbol.hasOwnProperty('h') &&
+      symbol.hasOwnProperty('w')
+    )
+  }
+
+  /**
+   * Find the closest natural height to the given height. Falls back to the
+   * first height in the list if none are larger or equal than the given height.
+   *
+   * @param naturalHeights The list of natural heights to choose from.
+   * @param height         The height to find the closest natural height to.
+   * @returns              The closest natural height to the given height.
+   */
+  private closestNaturalHeight(naturalHeights: Array<number>, height: number) {
+    return naturalHeights.reduce(
+      (acc, naturalHeight) => (naturalHeight <= height ? naturalHeight : acc),
+      naturalHeights[0]
+    )
+  }
 }
 
 /**
@@ -81,7 +147,7 @@ export class Octicon extends React.Component<IOcticonProps, {}> {
  * @param id        Optional identifier to set to the wrapper element.
  */
 export function createOcticonElement(
-  symbol: OcticonSymbolType,
+  symbol: OcticonSymbol,
   className?: string,
   id?: string
 ) {
diff --git a/app/src/ui/octicons/octicons.generated.ts b/app/src/ui/octicons/octicons.generated.ts
index 19a34917b5d..17874484654 100644
--- a/app/src/ui/octicons/octicons.generated.ts
+++ b/app/src/ui/octicons/octicons.generated.ts
@@ -3,1577 +3,5052 @@
  * Manually changing this file will only lead to sadness.
  */
 
-export type OcticonSymbolType = {
-  readonly w: number
-  readonly h: number
-  readonly d: string
-  readonly fr?: React.SVGAttributes<SVGElement>['fillRule']
-}
-
-export const alert: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M8.22 1.754a.25.25 0 00-.44 0L1.698 13.132a.25.25 0 00.22.368h12.164a.25.25 0 00.22-.368L8.22 1.754zm-1.763-.707c.659-1.234 2.427-1.234 3.086 0l6.082 11.378A1.75 1.75 0 0114.082 15H1.918a1.75 1.75 0 01-1.543-2.575L6.457 1.047zM9 11a1 1 0 11-2 0 1 1 0 012 0zm-.25-5.25a.75.75 0 00-1.5 0v2.5a.75.75 0 001.5 0v-2.5z',
-  fr: 'evenodd',
-}
-
-export const archive: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M1.75 2.5a.25.25 0 00-.25.25v1.5c0 .138.112.25.25.25h12.5a.25.25 0 00.25-.25v-1.5a.25.25 0 00-.25-.25H1.75zM0 2.75C0 1.784.784 1 1.75 1h12.5c.966 0 1.75.784 1.75 1.75v1.5A1.75 1.75 0 0114.25 6H1.75A1.75 1.75 0 010 4.25v-1.5zM1.75 7a.75.75 0 01.75.75v5.5c0 .138.112.25.25.25h10.5a.25.25 0 00.25-.25v-5.5a.75.75 0 111.5 0v5.5A1.75 1.75 0 0113.25 15H2.75A1.75 1.75 0 011 13.25v-5.5A.75.75 0 011.75 7zm4.5 1a.75.75 0 000 1.5h3.5a.75.75 0 100-1.5h-3.5z',
-  fr: 'evenodd',
-}
-
-export const arrowBoth: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M3.72 3.72a.75.75 0 011.06 1.06L2.56 7h10.88l-2.22-2.22a.75.75 0 011.06-1.06l3.5 3.5a.75.75 0 010 1.06l-3.5 3.5a.75.75 0 11-1.06-1.06l2.22-2.22H2.56l2.22 2.22a.75.75 0 11-1.06 1.06l-3.5-3.5a.75.75 0 010-1.06l3.5-3.5z',
-  fr: 'evenodd',
-}
-
-export const arrowDown: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M13.03 8.22a.75.75 0 010 1.06l-4.25 4.25a.75.75 0 01-1.06 0L3.47 9.28a.75.75 0 011.06-1.06l2.97 2.97V3.75a.75.75 0 011.5 0v7.44l2.97-2.97a.75.75 0 011.06 0z',
-  fr: 'evenodd',
-}
-
-export const arrowDownLeft: OcticonSymbolType = {
-  w: 24,
-  h: 24,
-  d: 'M5.75 8.5a.75.75 0 00-.75.75v9c0 .414.336.75.75.75h9a.75.75 0 000-1.5H7.56L17.78 7.28a.75.75 0 00-1.06-1.06L6.5 16.44V9.25a.75.75 0 00-.75-.75z',
-  fr: 'evenodd',
-}
-
-export const arrowDownRight: OcticonSymbolType = {
-  w: 24,
-  h: 24,
-  d: 'M18.25 8.5a.75.75 0 01.75.75v9a.75.75 0 01-.75.75h-9a.75.75 0 010-1.5h7.19L6.22 7.28a.75.75 0 011.06-1.06L17.5 16.44V9.25a.75.75 0 01.75-.75z',
-  fr: 'evenodd',
-}
-
-export const arrowLeft: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M7.78 12.53a.75.75 0 01-1.06 0L2.47 8.28a.75.75 0 010-1.06l4.25-4.25a.75.75 0 011.06 1.06L4.81 7h7.44a.75.75 0 010 1.5H4.81l2.97 2.97a.75.75 0 010 1.06z',
-  fr: 'evenodd',
-}
-
-export const arrowRight: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M8.22 2.97a.75.75 0 011.06 0l4.25 4.25a.75.75 0 010 1.06l-4.25 4.25a.75.75 0 01-1.06-1.06l2.97-2.97H3.75a.75.75 0 010-1.5h7.44L8.22 4.03a.75.75 0 010-1.06z',
-  fr: 'evenodd',
-}
-
-export const arrowUp: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M3.47 7.78a.75.75 0 010-1.06l4.25-4.25a.75.75 0 011.06 0l4.25 4.25a.75.75 0 01-1.06 1.06L9 4.81v7.44a.75.75 0 01-1.5 0V4.81L4.53 7.78a.75.75 0 01-1.06 0z',
-  fr: 'evenodd',
-}
-
-export const arrowUpLeft: OcticonSymbolType = {
-  w: 24,
-  h: 24,
-  d: 'M5.75 15.5a.75.75 0 01-.75-.75v-9A.75.75 0 015.75 5h9a.75.75 0 010 1.5H7.56l10.22 10.22a.75.75 0 11-1.06 1.06L6.5 7.56v7.19a.75.75 0 01-.75.75z',
-  fr: 'evenodd',
-}
-
-export const arrowUpRight: OcticonSymbolType = {
-  w: 24,
-  h: 24,
-  d: 'M18.25 15.5a.75.75 0 00.75-.75v-9a.75.75 0 00-.75-.75h-9a.75.75 0 000 1.5h7.19L6.22 16.72a.75.75 0 101.06 1.06L17.5 7.56v7.19c0 .414.336.75.75.75z',
-  fr: 'evenodd',
-}
-
-export const beaker: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M5 5.782V2.5h-.25a.75.75 0 010-1.5h6.5a.75.75 0 010 1.5H11v3.282l3.666 5.76C15.619 13.04 14.543 15 12.767 15H3.233c-1.776 0-2.852-1.96-1.899-3.458L5 5.782zM9.5 2.5h-3V6a.75.75 0 01-.117.403L4.73 9h6.54L9.617 6.403A.75.75 0 019.5 6V2.5zm-6.9 9.847L3.775 10.5h8.45l1.175 1.847a.75.75 0 01-.633 1.153H3.233a.75.75 0 01-.633-1.153z',
-  fr: 'evenodd',
-}
-
-export const bell: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M8 16a2 2 0 001.985-1.75c.017-.137-.097-.25-.235-.25h-3.5c-.138 0-.252.113-.235.25A2 2 0 008 16z',
-  fr: undefined,
-}
-
-export const bellFill: OcticonSymbolType = {
-  w: 24,
-  h: 24,
-  d: 'M6 8a6 6 0 1112 0v2.917c0 .703.228 1.387.65 1.95L20.7 15.6a1.5 1.5 0 01-1.2 2.4h-15a1.5 1.5 0 01-1.2-2.4l2.05-2.733a3.25 3.25 0 00.65-1.95V8zm6 13.5A3.502 3.502 0 018.645 19h6.71A3.502 3.502 0 0112 21.5z',
-  fr: 'evenodd',
-}
-
-export const bellSlash: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 014.38 1.55 5 5 0 0113 5v2.373a.75.75 0 01-1.5 0V5A3.5 3.5 0 008 1.5zM4.182 4.31L1.19 2.143a.75.75 0 10-.88 1.214L3 5.305v2.642a.25.25 0 01-.042.139L1.255 10.64A1.518 1.518 0 002.518 13h11.108l1.184.857a.75.75 0 10.88-1.214l-1.375-.996a1.196 1.196 0 00-.013-.01L4.198 4.321a.733.733 0 00-.016-.011zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.018.018 0 00-.003.01.015.015 0 00.005.012.017.017 0 00.006.004l.007.001h9.037zM8 16a2 2 0 001.985-1.75c.017-.137-.097-.25-.235-.25h-3.5c-.138 0-.252.113-.235.25A2 2 0 008 16z',
-  fr: 'evenodd',
-}
-
-export const bold: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M4 2a1 1 0 00-1 1v10a1 1 0 001 1h5.5a3.5 3.5 0 001.852-6.47A3.5 3.5 0 008.5 2H4zm4.5 5a1.5 1.5 0 100-3H5v3h3.5zM5 9v3h4.5a1.5 1.5 0 000-3H5z',
-  fr: 'evenodd',
-}
-
-export const book: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M0 1.75A.75.75 0 01.75 1h4.253c1.227 0 2.317.59 3 1.501A3.744 3.744 0 0111.006 1h4.245a.75.75 0 01.75.75v10.5a.75.75 0 01-.75.75h-4.507a2.25 2.25 0 00-1.591.659l-.622.621a.75.75 0 01-1.06 0l-.622-.621A2.25 2.25 0 005.258 13H.75a.75.75 0 01-.75-.75V1.75zm8.755 3a2.25 2.25 0 012.25-2.25H14.5v9h-3.757c-.71 0-1.4.201-1.992.572l.004-7.322zm-1.504 7.324l.004-5.073-.002-2.253A2.25 2.25 0 005.003 2.5H1.5v9h3.757a3.75 3.75 0 011.994.574z',
-  fr: 'evenodd',
-}
-
-export const bookmark: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M4.75 2.5a.25.25 0 00-.25.25v9.91l3.023-2.489a.75.75 0 01.954 0l3.023 2.49V2.75a.25.25 0 00-.25-.25h-6.5zM3 2.75C3 1.784 3.784 1 4.75 1h6.5c.966 0 1.75.784 1.75 1.75v11.5a.75.75 0 01-1.227.579L8 11.722l-3.773 3.107A.75.75 0 013 14.25V2.75z',
-  fr: 'evenodd',
-}
-
-export const bookmarkFill: OcticonSymbolType = {
-  w: 24,
-  h: 24,
-  d: 'M6.69 2a1.75 1.75 0 00-1.75 1.756L5 21.253a.75.75 0 001.219.583L12 17.21l5.782 4.625A.75.75 0 0019 21.25V3.75A1.75 1.75 0 0017.25 2H6.69z',
-  fr: 'evenodd',
-}
-
-export const bookmarkSlash: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M1.19 1.143a.75.75 0 10-.88 1.214L3 4.305v9.945a.75.75 0 001.206.596L8 11.944l3.794 2.902A.75.75 0 0013 14.25v-2.703l1.81 1.31a.75.75 0 10.88-1.214l-2.994-2.168a1.09 1.09 0 00-.014-.01L4.196 3.32a.712.712 0 00-.014-.01L1.19 1.143zM4.5 5.39v7.341l3.044-2.328a.75.75 0 01.912 0l3.044 2.328V10.46l-7-5.07zM5.865 1a.75.75 0 000 1.5h5.385a.25.25 0 01.25.25v3.624a.75.75 0 001.5 0V2.75A1.75 1.75 0 0011.25 1H5.865z',
-  fr: 'evenodd',
-}
-
-export const bookmarkSlashFill: OcticonSymbolType = {
-  w: 24,
-  h: 24,
-  d: 'M3.232 2.175a.75.75 0 10-.964 1.15l2.679 2.244L5 21.253a.75.75 0 001.219.583L12 17.21l5.782 4.625A.75.75 0 0019 21.25v-3.907l1.768 1.482a.75.75 0 10.964-1.15l-18.5-15.5zM7.422 2a.75.75 0 00-.482 1.325l10.828 9.073A.75.75 0 0019 11.823V3.75A1.75 1.75 0 0017.25 2H7.421h.001z',
-  fr: 'evenodd',
-}
-
-export const briefcase: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M6.75 0A1.75 1.75 0 005 1.75V3H1.75A1.75 1.75 0 000 4.75v8.5C0 14.216.784 15 1.75 15h12.5A1.75 1.75 0 0016 13.25v-8.5A1.75 1.75 0 0014.25 3H11V1.75A1.75 1.75 0 009.25 0h-2.5zM9.5 3V1.75a.25.25 0 00-.25-.25h-2.5a.25.25 0 00-.25.25V3h3zM5 4.5H1.75a.25.25 0 00-.25.25V6a2 2 0 002 2h9a2 2 0 002-2V4.75a.25.25 0 00-.25-.25H5zm-1.5 5a3.484 3.484 0 01-2-.627v4.377c0 .138.112.25.25.25h12.5a.25.25 0 00.25-.25V8.873a3.484 3.484 0 01-2 .627h-9z',
-  fr: 'evenodd',
-}
-
-export const broadcast: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M3.267 1.457c.3.286.312.76.026 1.06A6.475 6.475 0 001.5 7a6.472 6.472 0 001.793 4.483.75.75 0 01-1.086 1.034 8.89 8.89 0 01-.276-.304l.569-.49-.569.49A7.971 7.971 0 010 7c0-2.139.84-4.083 2.207-5.517a.75.75 0 011.06-.026zm9.466 0a.75.75 0 011.06.026A7.975 7.975 0 0116 7c0 2.139-.84 4.083-2.207 5.517a.75.75 0 11-1.086-1.034A6.475 6.475 0 0014.5 7a6.475 6.475 0 00-1.793-4.483.75.75 0 01.026-1.06zM8.75 8.582a1.75 1.75 0 10-1.5 0v5.668a.75.75 0 001.5 0V8.582zM5.331 4.736a.75.75 0 10-1.143-.972A4.983 4.983 0 003 7c0 1.227.443 2.352 1.177 3.222a.75.75 0 001.146-.967A3.483 3.483 0 014.5 7c0-.864.312-1.654.831-2.264zm6.492-.958a.75.75 0 00-1.146.967c.514.61.823 1.395.823 2.255 0 .86-.31 1.646-.823 2.255a.75.75 0 101.146.967A4.983 4.983 0 0013 7a4.983 4.983 0 00-1.177-3.222z',
-  fr: 'evenodd',
-}
-
-export const browser: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M6 3h1v1H6V3zM4 3h1v1H4V3zM2 3h1v1H2V3zm12 10H2V5h12v8zm0-9H8V3h6v1zm1-1c0-.55-.45-1-1-1H2c-.55 0-1 .45-1 1v10c0 .55.45 1 1 1h12c.55 0 1-.45 1-1V3z',
-  fr: 'evenodd',
-}
-
-export const bug: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M11 10h3V9h-3V8l3.17-1.03-.34-.94L11 7V6c0-.55-.45-1-1-1V4c0-.48-.36-.88-.83-.97L10.2 2H12V1H9.8l-2 2h-.59L5.2 1H3v1h1.8l1.03 1.03C5.36 3.12 5 3.51 5 4v1c-.55 0-1 .45-1 1v1l-2.83-.97-.34.94L4 8v1H1v1h3v1L.83 12.03l.34.94L4 12v1c0 .55.45 1 1 1h1l1-1V6h1v7l1 1h1c.55 0 1-.45 1-1v-1l2.83.97.34-.94L11 11v-1zM9 5H6V4h3v1z',
-  fr: 'evenodd',
-}
-
-export const calendar: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M4.75 0a.75.75 0 01.75.75V2h5V.75a.75.75 0 011.5 0V2h1.25c.966 0 1.75.784 1.75 1.75v10.5A1.75 1.75 0 0113.25 16H2.75A1.75 1.75 0 011 14.25V3.75C1 2.784 1.784 2 2.75 2H4V.75A.75.75 0 014.75 0zm0 3.5h8.5a.25.25 0 01.25.25V6h-11V3.75a.25.25 0 01.25-.25h2zm-2.25 4v6.75c0 .138.112.25.25.25h10.5a.25.25 0 00.25-.25V7.5h-11z',
-  fr: 'evenodd',
-}
-
-export const check: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M13.78 4.22a.75.75 0 010 1.06l-7.25 7.25a.75.75 0 01-1.06 0L2.22 9.28a.75.75 0 011.06-1.06L6 10.94l6.72-6.72a.75.75 0 011.06 0z',
-  fr: 'evenodd',
-}
-
-export const checkCircle: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M1.5 8a6.5 6.5 0 1113 0 6.5 6.5 0 01-13 0zM0 8a8 8 0 1116 0A8 8 0 010 8zm11.78-1.72a.75.75 0 00-1.06-1.06L6.75 9.19 5.28 7.72a.75.75 0 00-1.06 1.06l2 2a.75.75 0 001.06 0l4.5-4.5z',
-  fr: 'evenodd',
-}
-
-export const checkCircleFill: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M8 16A8 8 0 108 0a8 8 0 000 16zm3.78-9.72a.75.75 0 00-1.06-1.06L6.75 9.19 5.28 7.72a.75.75 0 00-1.06 1.06l2 2a.75.75 0 001.06 0l4.5-4.5z',
-  fr: 'evenodd',
-}
-
-export const checklist: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M2.5 1.75a.25.25 0 01.25-.25h8.5a.25.25 0 01.25.25v7.736a.75.75 0 101.5 0V1.75A1.75 1.75 0 0011.25 0h-8.5A1.75 1.75 0 001 1.75v11.5c0 .966.784 1.75 1.75 1.75h3.17a.75.75 0 000-1.5H2.75a.25.25 0 01-.25-.25V1.75zM4.75 4a.75.75 0 000 1.5h4.5a.75.75 0 000-1.5h-4.5zM4 7.75A.75.75 0 014.75 7h2a.75.75 0 010 1.5h-2A.75.75 0 014 7.75zm11.774 3.537a.75.75 0 00-1.048-1.074L10.7 14.145 9.281 12.72a.75.75 0 00-1.062 1.058l1.943 1.95a.75.75 0 001.055.008l4.557-4.45z',
-  fr: 'evenodd',
-}
-
-export const chevronDown: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M12.78 6.22a.75.75 0 010 1.06l-4.25 4.25a.75.75 0 01-1.06 0L3.22 7.28a.75.75 0 011.06-1.06L8 9.94l3.72-3.72a.75.75 0 011.06 0z',
-  fr: 'evenodd',
-}
-
-export const chevronLeft: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M9.78 12.78a.75.75 0 01-1.06 0L4.47 8.53a.75.75 0 010-1.06l4.25-4.25a.75.75 0 011.06 1.06L6.06 8l3.72 3.72a.75.75 0 010 1.06z',
-  fr: 'evenodd',
-}
-
-export const chevronRight: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M6.22 3.22a.75.75 0 011.06 0l4.25 4.25a.75.75 0 010 1.06l-4.25 4.25a.75.75 0 01-1.06-1.06L9.94 8 6.22 4.28a.75.75 0 010-1.06z',
-  fr: 'evenodd',
-}
-
-export const chevronUp: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M3.22 9.78a.75.75 0 010-1.06l4.25-4.25a.75.75 0 011.06 0l4.25 4.25a.75.75 0 01-1.06 1.06L8 6.06 4.28 9.78a.75.75 0 01-1.06 0z',
-  fr: 'evenodd',
-}
-
-export const circle: OcticonSymbolType = {
-  w: 24,
-  h: 24,
-  d: 'M12 2.5a9.5 9.5 0 100 19 9.5 9.5 0 000-19zM1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12z',
-  fr: 'evenodd',
-}
-
-export const circleSlash: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M1.5 8a6.5 6.5 0 0110.535-5.096l-9.131 9.131A6.472 6.472 0 011.5 8zm2.465 5.096a6.5 6.5 0 009.131-9.131l-9.131 9.131zM8 0a8 8 0 100 16A8 8 0 008 0z',
-  fr: 'evenodd',
-}
-
-export const clippy: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M5.75 1a.75.75 0 00-.75.75v3c0 .414.336.75.75.75h4.5a.75.75 0 00.75-.75v-3a.75.75 0 00-.75-.75h-4.5zm.75 3V2.5h3V4h-3zm-2.874-.467a.75.75 0 00-.752-1.298A1.75 1.75 0 002 3.75v9.5c0 .966.784 1.75 1.75 1.75h8.5A1.75 1.75 0 0014 13.25v-9.5a1.75 1.75 0 00-.874-1.515.75.75 0 10-.752 1.298.25.25 0 01.126.217v9.5a.25.25 0 01-.25.25h-8.5a.25.25 0 01-.25-.25v-9.5a.25.25 0 01.126-.217z',
-  fr: 'evenodd',
-}
-
-export const clock: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M1.5 8a6.5 6.5 0 1113 0 6.5 6.5 0 01-13 0zM8 0a8 8 0 100 16A8 8 0 008 0zm.5 4.75a.75.75 0 00-1.5 0v3.5a.75.75 0 00.471.696l2.5 1a.75.75 0 00.557-1.392L8.5 7.742V4.75z',
-  fr: 'evenodd',
-}
-
-export const code: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M4.72 3.22a.75.75 0 011.06 1.06L2.06 8l3.72 3.72a.75.75 0 11-1.06 1.06L.47 8.53a.75.75 0 010-1.06l4.25-4.25zm6.56 0a.75.75 0 10-1.06 1.06L13.94 8l-3.72 3.72a.75.75 0 101.06 1.06l4.25-4.25a.75.75 0 000-1.06l-4.25-4.25z',
-  fr: 'evenodd',
-}
-
-export const codeReview: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M1.5 2.75a.25.25 0 01.25-.25h12.5a.25.25 0 01.25.25v8.5a.25.25 0 01-.25.25h-6.5a.75.75 0 00-.53.22L4.5 14.44v-2.19a.75.75 0 00-.75-.75h-2a.25.25 0 01-.25-.25v-8.5zM1.75 1A1.75 1.75 0 000 2.75v8.5C0 12.216.784 13 1.75 13H3v1.543a1.457 1.457 0 002.487 1.03L8.061 13h6.189A1.75 1.75 0 0016 11.25v-8.5A1.75 1.75 0 0014.25 1H1.75zm5.03 3.47a.75.75 0 010 1.06L5.31 7l1.47 1.47a.75.75 0 01-1.06 1.06l-2-2a.75.75 0 010-1.06l2-2a.75.75 0 011.06 0zm2.44 0a.75.75 0 000 1.06L10.69 7 9.22 8.47a.75.75 0 001.06 1.06l2-2a.75.75 0 000-1.06l-2-2a.75.75 0 00-1.06 0z',
-  fr: 'evenodd',
-}
-
-export const codeSquare: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M1.75 1.5a.25.25 0 00-.25.25v12.5c0 .138.112.25.25.25h12.5a.25.25 0 00.25-.25V1.75a.25.25 0 00-.25-.25H1.75zM0 1.75C0 .784.784 0 1.75 0h12.5C15.216 0 16 .784 16 1.75v12.5A1.75 1.75 0 0114.25 16H1.75A1.75 1.75 0 010 14.25V1.75zm9.22 3.72a.75.75 0 000 1.06L10.69 8 9.22 9.47a.75.75 0 101.06 1.06l2-2a.75.75 0 000-1.06l-2-2a.75.75 0 00-1.06 0zM6.78 6.53a.75.75 0 00-1.06-1.06l-2 2a.75.75 0 000 1.06l2 2a.75.75 0 101.06-1.06L5.31 8l1.47-1.47z',
-  fr: 'evenodd',
-}
-
-export const comment: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M2.75 2.5a.25.25 0 00-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 01.75.75v2.19l2.72-2.72a.75.75 0 01.53-.22h4.5a.25.25 0 00.25-.25v-7.5a.25.25 0 00-.25-.25H2.75zM1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0113.25 12H9.06l-2.573 2.573A1.457 1.457 0 014 13.543V12H2.75A1.75 1.75 0 011 10.25v-7.5z',
-  fr: 'evenodd',
-}
-
-export const commentDiscussion: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M1.5 2.75a.25.25 0 01.25-.25h8.5a.25.25 0 01.25.25v5.5a.25.25 0 01-.25.25h-3.5a.75.75 0 00-.53.22L3.5 11.44V9.25a.75.75 0 00-.75-.75h-1a.25.25 0 01-.25-.25v-5.5zM1.75 1A1.75 1.75 0 000 2.75v5.5C0 9.216.784 10 1.75 10H2v1.543a1.457 1.457 0 002.487 1.03L7.061 10h3.189A1.75 1.75 0 0012 8.25v-5.5A1.75 1.75 0 0010.25 1h-8.5zM14.5 4.75a.25.25 0 00-.25-.25h-.5a.75.75 0 110-1.5h.5c.966 0 1.75.784 1.75 1.75v5.5A1.75 1.75 0 0114.25 12H14v1.543a1.457 1.457 0 01-2.487 1.03L9.22 12.28a.75.75 0 111.06-1.06l2.22 2.22v-2.19a.75.75 0 01.75-.75h1a.25.25 0 00.25-.25v-5.5z',
-  fr: 'evenodd',
-}
-
-export const commit: OcticonSymbolType = {
-  w: 24,
-  h: 24,
-  d: 'M17.5 11.75a.75.75 0 01.75-.75h5a.75.75 0 010 1.5h-5a.75.75 0 01-.75-.75zm-17.5 0A.75.75 0 01.75 11h5a.75.75 0 010 1.5h-5a.75.75 0 01-.75-.75z',
-  fr: 'evenodd',
-}
-
-export const copy: OcticonSymbolType = {
-  w: 24,
-  h: 24,
-  d: 'M4.75 3A1.75 1.75 0 003 4.75v9.5c0 .966.784 1.75 1.75 1.75h1.5a.75.75 0 000-1.5h-1.5a.25.25 0 01-.25-.25v-9.5a.25.25 0 01.25-.25h9.5a.25.25 0 01.25.25v1.5a.75.75 0 001.5 0v-1.5A1.75 1.75 0 0014.25 3h-9.5zm5 5A1.75 1.75 0 008 9.75v9.5c0 .966.784 1.75 1.75 1.75h9.5A1.75 1.75 0 0021 19.25v-9.5A1.75 1.75 0 0019.25 8h-9.5zM9.5 9.75a.25.25 0 01.25-.25h9.5a.25.25 0 01.25.25v9.5a.25.25 0 01-.25.25h-9.5a.25.25 0 01-.25-.25v-9.5z',
-  fr: 'evenodd',
-}
-
-export const cpu: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M6.5.75a.75.75 0 00-1.5 0V2H3.75A1.75 1.75 0 002 3.75V5H.75a.75.75 0 000 1.5H2v3H.75a.75.75 0 000 1.5H2v1.25c0 .966.784 1.75 1.75 1.75H5v1.25a.75.75 0 001.5 0V14h3v1.25a.75.75 0 001.5 0V14h1.25A1.75 1.75 0 0014 12.25V11h1.25a.75.75 0 000-1.5H14v-3h1.25a.75.75 0 000-1.5H14V3.75A1.75 1.75 0 0012.25 2H11V.75a.75.75 0 00-1.5 0V2h-3V.75zm5.75 11.75h-8.5a.25.25 0 01-.25-.25v-8.5a.25.25 0 01.25-.25h8.5a.25.25 0 01.25.25v8.5a.25.25 0 01-.25.25zM5.75 5a.75.75 0 00-.75.75v4.5c0 .414.336.75.75.75h4.5a.75.75 0 00.75-.75v-4.5a.75.75 0 00-.75-.75h-4.5zm.75 4.5v-3h3v3h-3z',
-  fr: 'evenodd',
-}
-
-export const creditCard: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M10.75 9a.75.75 0 000 1.5h1.5a.75.75 0 000-1.5h-1.5z',
-  fr: undefined,
-}
-
-export const crossReference: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M16 1.25v4.146a.25.25 0 01-.427.177L14.03 4.03l-3.75 3.75a.75.75 0 11-1.06-1.06l3.75-3.75-1.543-1.543A.25.25 0 0111.604 1h4.146a.25.25 0 01.25.25zM2.75 3.5a.25.25 0 00-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 01.75.75v2.19l2.72-2.72a.75.75 0 01.53-.22h4.5a.25.25 0 00.25-.25v-2.5a.75.75 0 111.5 0v2.5A1.75 1.75 0 0113.25 13H9.06l-2.573 2.573A1.457 1.457 0 014 14.543V13H2.75A1.75 1.75 0 011 11.25v-7.5C1 2.784 1.784 2 2.75 2h5.5a.75.75 0 010 1.5h-5.5z',
-  fr: 'evenodd',
-}
-
-export const dash: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M2 8a.75.75 0 01.75-.75h10.5a.75.75 0 010 1.5H2.75A.75.75 0 012 8z',
-  fr: 'evenodd',
-}
-
-export const database: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M2.5 3.5c0-.133.058-.318.282-.55.227-.237.592-.484 1.1-.708C4.899 1.795 6.354 1.5 8 1.5c1.647 0 3.102.295 4.117.742.51.224.874.47 1.101.707.224.233.282.418.282.551 0 .133-.058.318-.282.55-.227.237-.592.484-1.1.708C11.101 5.205 9.646 5.5 8 5.5c-1.647 0-3.102-.295-4.117-.742-.51-.224-.874-.47-1.101-.707-.224-.233-.282-.418-.282-.551zM1 3.5c0-.626.292-1.165.7-1.59.406-.422.956-.767 1.579-1.041C4.525.32 6.195 0 8 0c1.805 0 3.475.32 4.722.869.622.274 1.172.62 1.578 1.04.408.426.7.965.7 1.591v9c0 .626-.292 1.165-.7 1.59-.406.422-.956.767-1.579 1.041C11.476 15.68 9.806 16 8 16c-1.805 0-3.475-.32-4.721-.869-.623-.274-1.173-.62-1.579-1.04-.408-.426-.7-.965-.7-1.591v-9zM2.5 8V5.724c.241.15.503.286.779.407C4.525 6.68 6.195 7 8 7c1.805 0 3.475-.32 4.722-.869.275-.121.537-.257.778-.407V8c0 .133-.058.318-.282.55-.227.237-.592.484-1.1.708C11.101 9.705 9.646 10 8 10c-1.647 0-3.102-.295-4.117-.742-.51-.224-.874-.47-1.101-.707C2.558 8.318 2.5 8.133 2.5 8zm0 2.225V12.5c0 .133.058.318.282.55.227.237.592.484 1.1.708 1.016.447 2.471.742 4.118.742 1.647 0 3.102-.295 4.117-.742.51-.224.874-.47 1.101-.707.224-.233.282-.418.282-.551v-2.275c-.241.15-.503.285-.778.406-1.247.549-2.917.869-4.722.869-1.805 0-3.475-.32-4.721-.869a6.236 6.236 0 01-.779-.406z',
-  fr: 'evenodd',
-}
-
-export const desktopDownload: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M8.75 5V.75a.75.75 0 00-1.5 0V5H5.104a.25.25 0 00-.177.427l2.896 2.896a.25.25 0 00.354 0l2.896-2.896A.25.25 0 0010.896 5H8.75zM1.5 2.75a.25.25 0 01.25-.25h3a.75.75 0 000-1.5h-3A1.75 1.75 0 000 2.75v7.5C0 11.216.784 12 1.75 12h3.727c-.1 1.041-.52 1.872-1.292 2.757A.75.75 0 004.75 16h6.5a.75.75 0 00.565-1.243c-.772-.885-1.193-1.716-1.292-2.757h3.727A1.75 1.75 0 0016 10.25v-7.5A1.75 1.75 0 0014.25 1h-3a.75.75 0 000 1.5h3a.25.25 0 01.25.25v7.5a.25.25 0 01-.25.25H1.75a.25.25 0 01-.25-.25v-7.5zM9.018 12H6.982a5.72 5.72 0 01-.765 2.5h3.566a5.72 5.72 0 01-.765-2.5z',
-  fr: 'evenodd',
-}
-
-export const deviceCamera: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M15 3H7c0-.55-.45-1-1-1H2c-.55 0-1 .45-1 1-.55 0-1 .45-1 1v9c0 .55.45 1 1 1h14c.55 0 1-.45 1-1V4c0-.55-.45-1-1-1zM6 5H2V4h4v1zm4.5 7C8.56 12 7 10.44 7 8.5S8.56 5 10.5 5 14 6.56 14 8.5 12.44 12 10.5 12zM13 8.5c0 1.38-1.13 2.5-2.5 2.5S8 9.87 8 8.5 9.13 6 10.5 6 13 7.13 13 8.5z',
-  fr: 'evenodd',
-}
-
-export const deviceCameraVideo: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M16 3.75a.75.75 0 00-1.136-.643L11 5.425V4.75A1.75 1.75 0 009.25 3h-7.5A1.75 1.75 0 000 4.75v6.5C0 12.216.784 13 1.75 13h7.5A1.75 1.75 0 0011 11.25v-.675l3.864 2.318A.75.75 0 0016 12.25v-8.5zm-5 5.075l3.5 2.1v-5.85l-3.5 2.1v1.65zM9.5 6.75v-2a.25.25 0 00-.25-.25h-7.5a.25.25 0 00-.25.25v6.5c0 .138.112.25.25.25h7.5a.25.25 0 00.25-.25v-4.5z',
-  fr: 'evenodd',
-}
-
-export const deviceDesktop: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M1.75 2.5h12.5a.25.25 0 01.25.25v7.5a.25.25 0 01-.25.25H1.75a.25.25 0 01-.25-.25v-7.5a.25.25 0 01.25-.25zM14.25 1H1.75A1.75 1.75 0 000 2.75v7.5C0 11.216.784 12 1.75 12h3.727c-.1 1.041-.52 1.872-1.292 2.757A.75.75 0 004.75 16h6.5a.75.75 0 00.565-1.243c-.772-.885-1.193-1.716-1.292-2.757h3.727A1.75 1.75 0 0016 10.25v-7.5A1.75 1.75 0 0014.25 1zM9.018 12H6.982a5.72 5.72 0 01-.765 2.5h3.566a5.72 5.72 0 01-.765-2.5z',
-  fr: 'evenodd',
-}
-
-export const deviceMobile: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M3.75 0A1.75 1.75 0 002 1.75v12.5c0 .966.784 1.75 1.75 1.75h8.5A1.75 1.75 0 0014 14.25V1.75A1.75 1.75 0 0012.25 0h-8.5zM3.5 1.75a.25.25 0 01.25-.25h8.5a.25.25 0 01.25.25v12.5a.25.25 0 01-.25.25h-8.5a.25.25 0 01-.25-.25V1.75zM8 13a1 1 0 100-2 1 1 0 000 2z',
-  fr: 'evenodd',
-}
-
-export const diff: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M8.75 1.75a.75.75 0 00-1.5 0V5H4a.75.75 0 000 1.5h3.25v3.25a.75.75 0 001.5 0V6.5H12A.75.75 0 0012 5H8.75V1.75zM4 13a.75.75 0 000 1.5h8a.75.75 0 100-1.5H4z',
-  fr: 'evenodd',
-}
-
-export const diffAdded: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M13.25 2.5H2.75a.25.25 0 00-.25.25v10.5c0 .138.112.25.25.25h10.5a.25.25 0 00.25-.25V2.75a.25.25 0 00-.25-.25zM2.75 1h10.5c.966 0 1.75.784 1.75 1.75v10.5A1.75 1.75 0 0113.25 15H2.75A1.75 1.75 0 011 13.25V2.75C1 1.784 1.784 1 2.75 1zM8 4a.75.75 0 01.75.75v2.5h2.5a.75.75 0 010 1.5h-2.5v2.5a.75.75 0 01-1.5 0v-2.5h-2.5a.75.75 0 010-1.5h2.5v-2.5A.75.75 0 018 4z',
-  fr: 'evenodd',
-}
-
-export const diffIgnored: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M2.75 2.5h10.5a.25.25 0 01.25.25v10.5a.25.25 0 01-.25.25H2.75a.25.25 0 01-.25-.25V2.75a.25.25 0 01.25-.25zM13.25 1H2.75A1.75 1.75 0 001 2.75v10.5c0 .966.784 1.75 1.75 1.75h10.5A1.75 1.75 0 0015 13.25V2.75A1.75 1.75 0 0013.25 1zm-1.97 4.78a.75.75 0 00-1.06-1.06l-5.5 5.5a.75.75 0 101.06 1.06l5.5-5.5z',
-  fr: 'evenodd',
-}
-
-export const diffModified: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M2.75 2.5h10.5a.25.25 0 01.25.25v10.5a.25.25 0 01-.25.25H2.75a.25.25 0 01-.25-.25V2.75a.25.25 0 01.25-.25zM13.25 1H2.75A1.75 1.75 0 001 2.75v10.5c0 .966.784 1.75 1.75 1.75h10.5A1.75 1.75 0 0015 13.25V2.75A1.75 1.75 0 0013.25 1zM8 10a2 2 0 100-4 2 2 0 000 4z',
-  fr: 'evenodd',
-}
-
-export const diffRemoved: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M2.75 2.5h10.5a.25.25 0 01.25.25v10.5a.25.25 0 01-.25.25H2.75a.25.25 0 01-.25-.25V2.75a.25.25 0 01.25-.25zM13.25 1H2.75A1.75 1.75 0 001 2.75v10.5c0 .966.784 1.75 1.75 1.75h10.5A1.75 1.75 0 0015 13.25V2.75A1.75 1.75 0 0013.25 1zm-2 7.75a.75.75 0 000-1.5h-6.5a.75.75 0 000 1.5h6.5z',
-  fr: 'evenodd',
-}
-
-export const diffRenamed: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M2.75 2.5h10.5a.25.25 0 01.25.25v10.5a.25.25 0 01-.25.25H2.75a.25.25 0 01-.25-.25V2.75a.25.25 0 01.25-.25zM13.25 1H2.75A1.75 1.75 0 001 2.75v10.5c0 .966.784 1.75 1.75 1.75h10.5A1.75 1.75 0 0015 13.25V2.75A1.75 1.75 0 0013.25 1zm-1.47 7.53a.75.75 0 000-1.06L8.53 4.22a.75.75 0 00-1.06 1.06l1.97 1.97H4.75a.75.75 0 000 1.5h4.69l-1.97 1.97a.75.75 0 101.06 1.06l3.25-3.25z',
-  fr: 'evenodd',
-}
-
-export const dot: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M8 5.5a2.5 2.5 0 100 5 2.5 2.5 0 000-5zM4 8a4 4 0 118 0 4 4 0 01-8 0z',
-  fr: 'evenodd',
-}
-
-export const dotFill: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M8 4a4 4 0 100 8 4 4 0 000-8z',
-  fr: 'evenodd',
-}
-
-export const download: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M7.47 10.78a.75.75 0 001.06 0l3.75-3.75a.75.75 0 00-1.06-1.06L8.75 8.44V1.75a.75.75 0 00-1.5 0v6.69L4.78 5.97a.75.75 0 00-1.06 1.06l3.75 3.75zM3.75 13a.75.75 0 000 1.5h8.5a.75.75 0 000-1.5h-8.5z',
-  fr: 'evenodd',
-}
-
-export const ellipsis: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M0 5.75C0 4.784.784 4 1.75 4h12.5c.966 0 1.75.784 1.75 1.75v4.5A1.75 1.75 0 0114.25 12H1.75A1.75 1.75 0 010 10.25v-4.5zM4 7a1 1 0 100 2 1 1 0 000-2zm3 1a1 1 0 112 0 1 1 0 01-2 0zm5-1a1 1 0 100 2 1 1 0 000-2z',
-  fr: 'evenodd',
-}
-
-export const eye: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M1.679 7.932c.412-.621 1.242-1.75 2.366-2.717C5.175 4.242 6.527 3.5 8 3.5c1.473 0 2.824.742 3.955 1.715 1.124.967 1.954 2.096 2.366 2.717a.119.119 0 010 .136c-.412.621-1.242 1.75-2.366 2.717C10.825 11.758 9.473 12.5 8 12.5c-1.473 0-2.824-.742-3.955-1.715C2.92 9.818 2.09 8.69 1.679 8.068a.119.119 0 010-.136zM8 2c-1.981 0-3.67.992-4.933 2.078C1.797 5.169.88 6.423.43 7.1a1.619 1.619 0 000 1.798c.45.678 1.367 1.932 2.637 3.024C4.329 13.008 6.019 14 8 14c1.981 0 3.67-.992 4.933-2.078 1.27-1.091 2.187-2.345 2.637-3.023a1.619 1.619 0 000-1.798c-.45-.678-1.367-1.932-2.637-3.023C11.671 2.992 9.981 2 8 2zm0 8a2 2 0 100-4 2 2 0 000 4z',
-  fr: 'evenodd',
-}
-
-export const eyeClosed: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M.143 2.31a.75.75 0 011.047-.167l14.5 10.5a.75.75 0 11-.88 1.214l-2.248-1.628C11.346 13.19 9.792 14 8 14c-1.981 0-3.67-.992-4.933-2.078C1.797 10.832.88 9.577.43 8.9a1.618 1.618 0 010-1.797c.353-.533.995-1.42 1.868-2.305L.31 3.357A.75.75 0 01.143 2.31zm3.386 3.378a14.21 14.21 0 00-1.85 2.244.12.12 0 00-.022.068c0 .021.006.045.022.068.412.621 1.242 1.75 2.366 2.717C5.175 11.758 6.527 12.5 8 12.5c1.195 0 2.31-.488 3.29-1.191L9.063 9.695A2 2 0 016.058 7.52l-2.53-1.832zM8 3.5c-.516 0-1.017.09-1.499.251a.75.75 0 11-.473-1.423A6.23 6.23 0 018 2c1.981 0 3.67.992 4.933 2.078 1.27 1.091 2.187 2.345 2.637 3.023a1.619 1.619 0 010 1.798c-.11.166-.248.365-.41.587a.75.75 0 11-1.21-.887c.148-.201.272-.382.371-.53a.119.119 0 000-.137c-.412-.621-1.242-1.75-2.366-2.717C10.825 4.242 9.473 3.5 8 3.5z',
-  fr: 'evenodd',
-}
-
-export const eyeSlash: OcticonSymbolType = {
-  w: 24,
-  h: 24,
-  d: 'M8.052 5.837A9.715 9.715 0 0112 5c2.955 0 5.309 1.315 7.06 2.864 1.756 1.553 2.866 3.307 3.307 4.08a.11.11 0 01.016.055.122.122 0 01-.017.06 16.766 16.766 0 01-1.53 2.218.75.75 0 101.163.946 18.253 18.253 0 001.67-2.42 1.607 1.607 0 00.001-1.602c-.485-.85-1.69-2.757-3.616-4.46C18.124 5.034 15.432 3.5 12 3.5c-1.695 0-3.215.374-4.552.963a.75.75 0 00.604 1.373z',
-  fr: undefined,
-}
-
-export const file: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M3.75 1.5a.25.25 0 00-.25.25v11.5c0 .138.112.25.25.25h8.5a.25.25 0 00.25-.25V6H9.75A1.75 1.75 0 018 4.25V1.5H3.75zm5.75.56v2.19c0 .138.112.25.25.25h2.19L9.5 2.06zM2 1.75C2 .784 2.784 0 3.75 0h5.086c.464 0 .909.184 1.237.513l3.414 3.414c.329.328.513.773.513 1.237v8.086A1.75 1.75 0 0112.25 15h-8.5A1.75 1.75 0 012 13.25V1.75z',
-  fr: 'evenodd',
-}
-
-export const fileBinary: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M4 1.75C4 .784 4.784 0 5.75 0h5.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v8.586A1.75 1.75 0 0114.25 15h-9a.75.75 0 010-1.5h9a.25.25 0 00.25-.25V6h-2.75A1.75 1.75 0 0110 4.25V1.5H5.75a.25.25 0 00-.25.25v2a.75.75 0 01-1.5 0v-2zm7.5-.188V4.25c0 .138.112.25.25.25h2.688a.252.252 0 00-.011-.013l-2.914-2.914a.272.272 0 00-.013-.011zM0 7.75C0 6.784.784 6 1.75 6h1.5C4.216 6 5 6.784 5 7.75v2.5A1.75 1.75 0 013.25 12h-1.5A1.75 1.75 0 010 10.25v-2.5zm1.75-.25a.25.25 0 00-.25.25v2.5c0 .138.112.25.25.25h1.5a.25.25 0 00.25-.25v-2.5a.25.25 0 00-.25-.25h-1.5zm5-1.5a.75.75 0 000 1.5h.75v3h-.75a.75.75 0 000 1.5h3a.75.75 0 000-1.5H9V6.75A.75.75 0 008.25 6h-1.5z',
-  fr: 'evenodd',
-}
-
-export const fileCode: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M4 1.75C4 .784 4.784 0 5.75 0h5.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v8.586A1.75 1.75 0 0114.25 15h-9a.75.75 0 010-1.5h9a.25.25 0 00.25-.25V6h-2.75A1.75 1.75 0 0110 4.25V1.5H5.75a.25.25 0 00-.25.25v2.5a.75.75 0 01-1.5 0v-2.5zm7.5-.188V4.25c0 .138.112.25.25.25h2.688a.252.252 0 00-.011-.013l-2.914-2.914a.272.272 0 00-.013-.011zM5.72 6.72a.75.75 0 000 1.06l1.47 1.47-1.47 1.47a.75.75 0 101.06 1.06l2-2a.75.75 0 000-1.06l-2-2a.75.75 0 00-1.06 0zM3.28 7.78a.75.75 0 00-1.06-1.06l-2 2a.75.75 0 000 1.06l2 2a.75.75 0 001.06-1.06L1.81 9.25l1.47-1.47z',
-  fr: 'evenodd',
-}
-
-export const fileDiff: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M2.75 1.5a.25.25 0 00-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 00.25-.25V4.664a.25.25 0 00-.073-.177l-2.914-2.914a.25.25 0 00-.177-.073H2.75zM1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0113.25 16H2.75A1.75 1.75 0 011 14.25V1.75zm7 1.5a.75.75 0 01.75.75v1.5h1.5a.75.75 0 010 1.5h-1.5v1.5a.75.75 0 01-1.5 0V7h-1.5a.75.75 0 010-1.5h1.5V4A.75.75 0 018 3.25zm-3 8a.75.75 0 01.75-.75h4.5a.75.75 0 010 1.5h-4.5a.75.75 0 01-.75-.75z',
-  fr: 'evenodd',
-}
-
-export const fileDirectory: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M1.75 1A1.75 1.75 0 000 2.75v10.5C0 14.216.784 15 1.75 15h12.5A1.75 1.75 0 0016 13.25v-8.5A1.75 1.75 0 0014.25 3h-6.5a.25.25 0 01-.2-.1l-.9-1.2c-.33-.44-.85-.7-1.4-.7h-3.5z',
-  fr: 'evenodd',
-}
-
-export const fileDirectoryFill: OcticonSymbolType = {
-  w: 24,
-  h: 24,
-  d: 'M2 4.75C2 3.784 2.784 3 3.75 3h4.971c.58 0 1.12.286 1.447.765l1.404 2.063a.25.25 0 00.207.11h8.471c.966 0 1.75.783 1.75 1.75V19.25A1.75 1.75 0 0120.25 21H3.75A1.75 1.75 0 012 19.25V4.75z',
-  fr: 'evenodd',
-}
-
-export const fileMedia: OcticonSymbolType = {
-  w: 24,
-  h: 24,
-  d: 'M2.25 4a.25.25 0 00-.25.25v15.5c0 .138.112.25.25.25h3.178L14 10.977a1.75 1.75 0 012.506-.032L22 16.44V4.25a.25.25 0 00-.25-.25H2.25zm3.496 17.5H21.75a1.75 1.75 0 001.75-1.75V4.25a1.75 1.75 0 00-1.75-1.75H2.25A1.75 1.75 0 00.5 4.25v15.5c0 .966.784 1.75 1.75 1.75h3.496zM22 19.75v-1.19l-6.555-6.554a.25.25 0 00-.358.004L7.497 20H21.75a.25.25 0 00.25-.25zM9 9.25a1.75 1.75 0 11-3.5 0 1.75 1.75 0 013.5 0zm1.5 0a3.25 3.25 0 11-6.5 0 3.25 3.25 0 016.5 0z',
-  fr: 'evenodd',
-}
-
-export const fileSubmodule: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M0 2.75C0 1.784.784 1 1.75 1H5c.55 0 1.07.26 1.4.7l.9 1.2a.25.25 0 00.2.1h6.75c.966 0 1.75.784 1.75 1.75v8.5A1.75 1.75 0 0114.25 15H1.75A1.75 1.75 0 010 13.25V2.75zm9.42 9.36l2.883-2.677a.25.25 0 000-.366L9.42 6.39a.25.25 0 00-.42.183V8.5H4.75a.75.75 0 100 1.5H9v1.927c0 .218.26.331.42.183z',
-  fr: 'evenodd',
-}
-
-export const fileSymlink: OcticonSymbolType = {
-  w: 24,
-  h: 24,
-  d: 'M3 3a2 2 0 012-2h9.982a2 2 0 011.414.586l4.018 4.018A2 2 0 0121 7.018V21a2 2 0 01-2 2H4.75a.75.75 0 010-1.5H19a.5.5 0 00.5-.5V8.5h-4a2 2 0 01-2-2v-4H5a.5.5 0 00-.5.5v6.25a.75.75 0 01-1.5 0V3zm12-.5v4a.5.5 0 00.5.5h4a.5.5 0 00-.146-.336l-4.018-4.018A.5.5 0 0015 2.5zm-5.692 12l-2.104-2.236a.75.75 0 111.092-1.028l3.294 3.5a.75.75 0 010 1.028l-3.294 3.5a.75.75 0 11-1.092-1.028L9.308 16H4.09a2.59 2.59 0 00-2.59 2.59v3.16a.75.75 0 01-1.5 0v-3.16a4.09 4.09 0 014.09-4.09h5.218z',
-  fr: 'evenodd',
-}
-
-export const fileSymlinkFile: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M2 1.75C2 .784 2.784 0 3.75 0h5.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v8.586A1.75 1.75 0 0112.25 15h-7a.75.75 0 010-1.5h7a.25.25 0 00.25-.25V6H9.75A1.75 1.75 0 018 4.25V1.5H3.75a.25.25 0 00-.25.25V4.5a.75.75 0 01-1.5 0V1.75zm7.5-.188V4.25c0 .138.112.25.25.25h2.688a.252.252 0 00-.011-.013L9.513 1.573a.248.248 0 00-.013-.011zm-8 10.675a2.25 2.25 0 012.262-2.25L4 9.99v1.938c0 .218.26.331.42.183l2.883-2.677a.25.25 0 000-.366L4.42 6.39a.25.25 0 00-.42.183V8.49l-.23-.001A3.75 3.75 0 000 12.238v1.012a.75.75 0 001.5 0v-1.013z',
-  fr: 'evenodd',
-}
-
-export const fileZip: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M3.5 1.75a.25.25 0 01.25-.25h3a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h2.086a.25.25 0 01.177.073l2.914 2.914a.25.25 0 01.073.177v8.586a.25.25 0 01-.25.25h-.5a.75.75 0 000 1.5h.5A1.75 1.75 0 0014 13.25V4.664c0-.464-.184-.909-.513-1.237L10.573.513A1.75 1.75 0 009.336 0H3.75A1.75 1.75 0 002 1.75v11.5c0 .649.353 1.214.874 1.515a.75.75 0 10.752-1.298.25.25 0 01-.126-.217V1.75zM8.75 3a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5zM6 5.25a.75.75 0 01.75-.75h.5a.75.75 0 010 1.5h-.5A.75.75 0 016 5.25zm2 1.5A.75.75 0 018.75 6h.5a.75.75 0 010 1.5h-.5A.75.75 0 018 6.75zm-1.25.75a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5zM8 9.75A.75.75 0 018.75 9h.5a.75.75 0 010 1.5h-.5A.75.75 0 018 9.75zm-.75.75a1.75 1.75 0 00-1.75 1.75v3c0 .414.336.75.75.75h2.5a.75.75 0 00.75-.75v-3a1.75 1.75 0 00-1.75-1.75h-.5zM7 12.25a.25.25 0 01.25-.25h.5a.25.25 0 01.25.25v2.25H7v-2.25z',
-  fr: 'evenodd',
-}
-
-export const filter: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M.75 3a.75.75 0 000 1.5h14.5a.75.75 0 000-1.5H.75zM3 7.75A.75.75 0 013.75 7h8.5a.75.75 0 010 1.5h-8.5A.75.75 0 013 7.75zm3 4a.75.75 0 01.75-.75h2.5a.75.75 0 010 1.5h-2.5a.75.75 0 01-.75-.75z',
-  fr: 'evenodd',
-}
-
-export const fire: OcticonSymbolType = {
-  w: 24,
-  h: 24,
-  d: 'M12.185 21.5c4.059 0 7.065-2.84 7.065-6.75 0-2.337-1.093-3.489-2.678-5.158l-.021-.023c-1.44-1.517-3.139-3.351-3.649-6.557a6.14 6.14 0 00-1.911 1.76c-.787 1.144-1.147 2.633-.216 4.495.603 1.205.777 2.74-.277 3.794-.657.657-1.762 1.1-2.956.586-.752-.324-1.353-.955-1.838-1.79-.567.706-.954 1.74-.954 2.893 0 3.847 3.288 6.75 7.435 6.75zm2.08-19.873c-.017-.345-.296-.625-.632-.543-2.337.575-6.605 4.042-4.2 8.854.474.946.392 1.675.004 2.062-.64.64-1.874.684-2.875-1.815-.131-.327-.498-.509-.803-.334-1.547.888-2.509 2.86-2.509 4.899 0 4.829 4.122 8.25 8.935 8.25 4.812 0 8.565-3.438 8.565-8.25 0-2.939-1.466-4.482-3.006-6.102-1.61-1.694-3.479-3.476-3.479-7.021z',
-  fr: 'evenodd',
-}
-
-export const flame: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M7.998 14.5c2.832 0 5-1.98 5-4.5 0-1.463-.68-2.19-1.879-3.383l-.036-.037c-1.013-1.008-2.3-2.29-2.834-4.434-.322.256-.63.579-.864.953-.432.696-.621 1.58-.046 2.73.473.947.67 2.284-.278 3.232-.61.61-1.545.84-2.403.633a2.788 2.788 0 01-1.436-.874A3.21 3.21 0 003 10c0 2.53 2.164 4.5 4.998 4.5zM9.533.753C9.496.34 9.16.009 8.77.146 7.035.75 4.34 3.187 5.997 6.5c.344.689.285 1.218.003 1.5-.419.419-1.54.487-2.04-.832-.173-.454-.659-.762-1.035-.454C2.036 7.44 1.5 8.702 1.5 10c0 3.512 2.998 6 6.498 6s6.5-2.5 6.5-6c0-2.137-1.128-3.26-2.312-4.438-1.19-1.184-2.436-2.425-2.653-4.81z',
-  fr: 'evenodd',
-}
-
-export const fold: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M10.896 2H8.75V.75a.75.75 0 00-1.5 0V2H5.104a.25.25 0 00-.177.427l2.896 2.896a.25.25 0 00.354 0l2.896-2.896A.25.25 0 0010.896 2zM8.75 15.25a.75.75 0 01-1.5 0V14H5.104a.25.25 0 01-.177-.427l2.896-2.896a.25.25 0 01.354 0l2.896 2.896a.25.25 0 01-.177.427H8.75v1.25zm-6.5-6.5a.75.75 0 000-1.5h-.5a.75.75 0 000 1.5h.5zM6 8a.75.75 0 01-.75.75h-.5a.75.75 0 010-1.5h.5A.75.75 0 016 8zm2.25.75a.75.75 0 000-1.5h-.5a.75.75 0 000 1.5h.5zM12 8a.75.75 0 01-.75.75h-.5a.75.75 0 010-1.5h.5A.75.75 0 0112 8zm2.25.75a.75.75 0 000-1.5h-.5a.75.75 0 000 1.5h.5z',
-  fr: 'evenodd',
-}
-
-export const foldDown: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M8.177 14.323l2.896-2.896a.25.25 0 00-.177-.427H8.75V7.764a.75.75 0 10-1.5 0V11H5.104a.25.25 0 00-.177.427l2.896 2.896a.25.25 0 00.354 0zM2.25 5a.75.75 0 000-1.5h-.5a.75.75 0 000 1.5h.5zM6 4.25a.75.75 0 01-.75.75h-.5a.75.75 0 010-1.5h.5a.75.75 0 01.75.75zM8.25 5a.75.75 0 000-1.5h-.5a.75.75 0 000 1.5h.5zM12 4.25a.75.75 0 01-.75.75h-.5a.75.75 0 010-1.5h.5a.75.75 0 01.75.75zm2.25.75a.75.75 0 000-1.5h-.5a.75.75 0 000 1.5h.5z',
-  fr: 'evenodd',
-}
-
-export const foldUp: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M7.823 1.677L4.927 4.573A.25.25 0 005.104 5H7.25v3.236a.75.75 0 101.5 0V5h2.146a.25.25 0 00.177-.427L8.177 1.677a.25.25 0 00-.354 0zM13.75 11a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5zm-3.75.75a.75.75 0 01.75-.75h.5a.75.75 0 010 1.5h-.5a.75.75 0 01-.75-.75zM7.75 11a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5zM4 11.75a.75.75 0 01.75-.75h.5a.75.75 0 010 1.5h-.5a.75.75 0 01-.75-.75zM1.75 11a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5z',
-  fr: 'evenodd',
-}
-
-export const gear: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M7.429 1.525a6.593 6.593 0 011.142 0c.036.003.108.036.137.146l.289 1.105c.147.56.55.967.997 1.189.174.086.341.183.501.29.417.278.97.423 1.53.27l1.102-.303c.11-.03.175.016.195.046.219.31.41.641.573.989.014.031.022.11-.059.19l-.815.806c-.411.406-.562.957-.53 1.456a4.588 4.588 0 010 .582c-.032.499.119 1.05.53 1.456l.815.806c.08.08.073.159.059.19a6.494 6.494 0 01-.573.99c-.02.029-.086.074-.195.045l-1.103-.303c-.559-.153-1.112-.008-1.529.27-.16.107-.327.204-.5.29-.449.222-.851.628-.998 1.189l-.289 1.105c-.029.11-.101.143-.137.146a6.613 6.613 0 01-1.142 0c-.036-.003-.108-.037-.137-.146l-.289-1.105c-.147-.56-.55-.967-.997-1.189a4.502 4.502 0 01-.501-.29c-.417-.278-.97-.423-1.53-.27l-1.102.303c-.11.03-.175-.016-.195-.046a6.492 6.492 0 01-.573-.989c-.014-.031-.022-.11.059-.19l.815-.806c.411-.406.562-.957.53-1.456a4.587 4.587 0 010-.582c.032-.499-.119-1.05-.53-1.456l-.815-.806c-.08-.08-.073-.159-.059-.19a6.44 6.44 0 01.573-.99c.02-.029.086-.075.195-.045l1.103.303c.559.153 1.112.008 1.529-.27.16-.107.327-.204.5-.29.449-.222.851-.628.998-1.189l.289-1.105c.029-.11.101-.143.137-.146zM8 0c-.236 0-.47.01-.701.03-.743.065-1.29.615-1.458 1.261l-.29 1.106c-.017.066-.078.158-.211.224a5.994 5.994 0 00-.668.386c-.123.082-.233.09-.3.071L3.27 2.776c-.644-.177-1.392.02-1.82.63a7.977 7.977 0 00-.704 1.217c-.315.675-.111 1.422.363 1.891l.815.806c.05.048.098.147.088.294a6.084 6.084 0 000 .772c.01.147-.038.246-.088.294l-.815.806c-.474.469-.678 1.216-.363 1.891.2.428.436.835.704 1.218.428.609 1.176.806 1.82.63l1.103-.303c.066-.019.176-.011.299.071.213.143.436.272.668.386.133.066.194.158.212.224l.289 1.106c.169.646.715 1.196 1.458 1.26a8.094 8.094 0 001.402 0c.743-.064 1.29-.614 1.458-1.26l.29-1.106c.017-.066.078-.158.211-.224a5.98 5.98 0 00.668-.386c.123-.082.233-.09.3-.071l1.102.302c.644.177 1.392-.02 1.82-.63.268-.382.505-.789.704-1.217.315-.675.111-1.422-.364-1.891l-.814-.806c-.05-.048-.098-.147-.088-.294a6.1 6.1 0 000-.772c-.01-.147.039-.246.088-.294l.814-.806c.475-.469.679-1.216.364-1.891a7.992 7.992 0 00-.704-1.218c-.428-.609-1.176-.806-1.82-.63l-1.103.303c-.066.019-.176.011-.299-.071a5.991 5.991 0 00-.668-.386c-.133-.066-.194-.158-.212-.224L10.16 1.29C9.99.645 9.444.095 8.701.031A8.094 8.094 0 008 0zm1.5 8a1.5 1.5 0 11-3 0 1.5 1.5 0 013 0zM11 8a3 3 0 11-6 0 3 3 0 016 0z',
-  fr: 'evenodd',
-}
-
-export const gift: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M4.75 1.5a1.25 1.25 0 100 2.5h2.309c-.233-.818-.542-1.401-.878-1.793-.43-.502-.915-.707-1.431-.707zM2 2.75c0 .45.108.875.3 1.25h-.55A1.75 1.75 0 000 5.75v2c0 .698.409 1.3 1 1.582v4.918c0 .966.784 1.75 1.75 1.75h10.5A1.75 1.75 0 0015 14.25V9.332c.591-.281 1-.884 1-1.582v-2A1.75 1.75 0 0014.25 4h-.55a2.75 2.75 0 00-2.45-4c-.984 0-1.874.42-2.57 1.23A5.086 5.086 0 008 2.274a5.086 5.086 0 00-.68-1.042C6.623.42 5.733 0 4.75 0A2.75 2.75 0 002 2.75zM8.941 4h2.309a1.25 1.25 0 100-2.5c-.516 0-1 .205-1.43.707-.337.392-.646.975-.879 1.793zm-1.84 1.5H1.75a.25.25 0 00-.25.25v2c0 .138.112.25.25.25h5.5V5.5h-.149zm1.649 0V8h5.5a.25.25 0 00.25-.25v-2a.25.25 0 00-.25-.25h-5.5zm0 4h4.75v4.75a.25.25 0 01-.25.25h-4.5v-5zm-1.5 0v5h-4.5a.25.25 0 01-.25-.25V9.5h4.75z',
-  fr: 'evenodd',
-}
-
-export const gitBranch: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M11.75 2.5a.75.75 0 100 1.5.75.75 0 000-1.5zm-2.25.75a2.25 2.25 0 113 2.122V6A2.5 2.5 0 0110 8.5H6a1 1 0 00-1 1v1.128a2.251 2.251 0 11-1.5 0V5.372a2.25 2.25 0 111.5 0v1.836A2.492 2.492 0 016 7h4a1 1 0 001-1v-.628A2.25 2.25 0 019.5 3.25zM4.25 12a.75.75 0 100 1.5.75.75 0 000-1.5zM3.5 3.25a.75.75 0 111.5 0 .75.75 0 01-1.5 0z',
-  fr: 'evenodd',
-}
-
-export const gitCommit: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M10.5 7.75a2.5 2.5 0 11-5 0 2.5 2.5 0 015 0zm1.43.75a4.002 4.002 0 01-7.86 0H.75a.75.75 0 110-1.5h3.32a4.001 4.001 0 017.86 0h3.32a.75.75 0 110 1.5h-3.32z',
-  fr: 'evenodd',
-}
-
-export const gitCompare: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M9.573.677L7.177 3.073a.25.25 0 000 .354l2.396 2.396A.25.25 0 0010 5.646V4h1a1 1 0 011 1v5.628a2.251 2.251 0 101.5 0V5A2.5 2.5 0 0011 2.5h-1V.854a.25.25 0 00-.427-.177zM6 12v-1.646a.25.25 0 01.427-.177l2.396 2.396a.25.25 0 010 .354l-2.396 2.396A.25.25 0 016 15.146V13.5H5A2.5 2.5 0 012.5 11V5.372a2.25 2.25 0 111.5 0V11a1 1 0 001 1h1zm6.75 0a.75.75 0 100 1.5.75.75 0 000-1.5zM4 3.25a.75.75 0 11-1.5 0 .75.75 0 011.5 0z',
-  fr: 'evenodd',
-}
-
-export const gitFork: OcticonSymbolType = {
-  w: 24,
-  h: 24,
-  d: 'M12 21a1.75 1.75 0 110-3.5 1.75 1.75 0 010 3.5zm-3.25-1.75a3.25 3.25 0 106.5 0 3.25 3.25 0 00-6.5 0zm-3-12.75a1.75 1.75 0 110-3.5 1.75 1.75 0 010 3.5zM2.5 4.75a3.25 3.25 0 106.5 0 3.25 3.25 0 00-6.5 0zM18.25 6.5a1.75 1.75 0 110-3.5 1.75 1.75 0 010 3.5zM15 4.75a3.25 3.25 0 106.5 0 3.25 3.25 0 00-6.5 0z',
-  fr: 'evenodd',
-}
-
-export const gitMerge: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M5 3.254V3.25v.005a.75.75 0 110-.005v.004zm.45 1.9a2.25 2.25 0 10-1.95.218v5.256a2.25 2.25 0 101.5 0V7.123A5.735 5.735 0 009.25 9h1.378a2.251 2.251 0 100-1.5H9.25a4.25 4.25 0 01-3.8-2.346zM12.75 9a.75.75 0 100-1.5.75.75 0 000 1.5zm-8.5 4.5a.75.75 0 100-1.5.75.75 0 000 1.5z',
-  fr: 'evenodd',
-}
-
-export const gitPullRequest: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M7.177 3.073L9.573.677A.25.25 0 0110 .854v4.792a.25.25 0 01-.427.177L7.177 3.427a.25.25 0 010-.354zM3.75 2.5a.75.75 0 100 1.5.75.75 0 000-1.5zm-2.25.75a2.25 2.25 0 113 2.122v5.256a2.251 2.251 0 11-1.5 0V5.372A2.25 2.25 0 011.5 3.25zM11 2.5h-1V4h1a1 1 0 011 1v5.628a2.251 2.251 0 101.5 0V5A2.5 2.5 0 0011 2.5zm1 10.25a.75.75 0 111.5 0 .75.75 0 01-1.5 0zM3.75 12a.75.75 0 100 1.5.75.75 0 000-1.5z',
-  fr: 'evenodd',
-}
-
-export const gitPullRequestDraft: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M2.5 3.25a.75.75 0 111.5 0 .75.75 0 01-1.5 0zM3.25 1a2.25 2.25 0 00-.75 4.372v5.256a2.251 2.251 0 101.5 0V5.372A2.25 2.25 0 003.25 1zm0 11a.75.75 0 100 1.5.75.75 0 000-1.5zm9.5 3a2.25 2.25 0 100-4.5 2.25 2.25 0 000 4.5zm0-3a.75.75 0 100 1.5.75.75 0 000-1.5zM14 7.5a1.25 1.25 0 11-2.5 0 1.25 1.25 0 012.5 0zm0-4.25a1.25 1.25 0 11-2.5 0 1.25 1.25 0 012.5 0z',
-  fr: 'evenodd',
-}
-
-export const globe: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M1.543 7.25h2.733c.144-2.074.866-3.756 1.58-4.948.12-.197.237-.381.353-.552a6.506 6.506 0 00-4.666 5.5zm2.733 1.5H1.543a6.506 6.506 0 004.666 5.5 11.13 11.13 0 01-.352-.552c-.715-1.192-1.437-2.874-1.581-4.948zm1.504 0h4.44a9.637 9.637 0 01-1.363 4.177c-.306.51-.612.919-.857 1.215a9.978 9.978 0 01-.857-1.215A9.637 9.637 0 015.78 8.75zm4.44-1.5H5.78a9.637 9.637 0 011.363-4.177c.306-.51.612-.919.857-1.215.245.296.55.705.857 1.215A9.638 9.638 0 0110.22 7.25zm1.504 1.5c-.144 2.074-.866 3.756-1.58 4.948-.12.197-.237.381-.353.552a6.506 6.506 0 004.666-5.5h-2.733zm2.733-1.5h-2.733c-.144-2.074-.866-3.756-1.58-4.948a11.738 11.738 0 00-.353-.552 6.506 6.506 0 014.666 5.5zM8 0a8 8 0 100 16A8 8 0 008 0z',
-  fr: 'evenodd',
-}
-
-export const grabber: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M10 13a1 1 0 100-2 1 1 0 000 2zm-4 0a1 1 0 100-2 1 1 0 000 2zm1-5a1 1 0 11-2 0 1 1 0 012 0zm3 1a1 1 0 100-2 1 1 0 000 2zm1-5a1 1 0 11-2 0 1 1 0 012 0zM6 5a1 1 0 100-2 1 1 0 000 2z',
-  fr: 'evenodd',
-}
-
-export const graph: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M1.5 1.75a.75.75 0 00-1.5 0v12.5c0 .414.336.75.75.75h14.5a.75.75 0 000-1.5H1.5V1.75zm14.28 2.53a.75.75 0 00-1.06-1.06L10 7.94 7.53 5.47a.75.75 0 00-1.06 0L3.22 8.72a.75.75 0 001.06 1.06L7 7.06l2.47 2.47a.75.75 0 001.06 0l5.25-5.25z',
-  fr: 'evenodd',
-}
-
-export const heading: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M3.75 2a.75.75 0 01.75.75V7h7V2.75a.75.75 0 011.5 0v10.5a.75.75 0 01-1.5 0V8.5h-7v4.75a.75.75 0 01-1.5 0V2.75A.75.75 0 013.75 2z',
-  fr: 'evenodd',
-}
-
-export const heart: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M4.25 2.5c-1.336 0-2.75 1.164-2.75 3 0 2.15 1.58 4.144 3.365 5.682A20.565 20.565 0 008 13.393a20.561 20.561 0 003.135-2.211C12.92 9.644 14.5 7.65 14.5 5.5c0-1.836-1.414-3-2.75-3-1.373 0-2.609.986-3.029 2.456a.75.75 0 01-1.442 0C6.859 3.486 5.623 2.5 4.25 2.5zM8 14.25l-.345.666-.002-.001-.006-.003-.018-.01a7.643 7.643 0 01-.31-.17 22.075 22.075 0 01-3.434-2.414C2.045 10.731 0 8.35 0 5.5 0 2.836 2.086 1 4.25 1 5.797 1 7.153 1.802 8 3.02 8.847 1.802 10.203 1 11.75 1 13.914 1 16 2.836 16 5.5c0 2.85-2.045 5.231-3.885 6.818a22.08 22.08 0 01-3.744 2.584l-.018.01-.006.003h-.002L8 14.25zm0 0l.345.666a.752.752 0 01-.69 0L8 14.25z',
-  fr: 'evenodd',
-}
-
-export const heartFill: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M7.655 14.916L8 14.25l.345.666a.752.752 0 01-.69 0zm0 0L8 14.25l.345.666.002-.001.006-.003.018-.01a7.643 7.643 0 00.31-.17 22.08 22.08 0 003.433-2.414C13.956 10.731 16 8.35 16 5.5 16 2.836 13.914 1 11.75 1 10.203 1 8.847 1.802 8 3.02 7.153 1.802 5.797 1 4.25 1 2.086 1 0 2.836 0 5.5c0 2.85 2.045 5.231 3.885 6.818a22.075 22.075 0 003.744 2.584l.018.01.006.003h.002z',
-  fr: 'evenodd',
-}
-
-export const history: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M1.643 3.143L.427 1.927A.25.25 0 000 2.104V5.75c0 .138.112.25.25.25h3.646a.25.25 0 00.177-.427L2.715 4.215a6.5 6.5 0 11-1.18 4.458.75.75 0 10-1.493.154 8.001 8.001 0 101.6-5.684zM7.75 4a.75.75 0 01.75.75v2.992l2.028.812a.75.75 0 01-.557 1.392l-2.5-1A.75.75 0 017 8.25v-3.5A.75.75 0 017.75 4z',
-  fr: 'evenodd',
-}
-
-export const home: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M8.156 1.835a.25.25 0 00-.312 0l-5.25 4.2a.25.25 0 00-.094.196v7.019c0 .138.112.25.25.25H5.5V8.25a.75.75 0 01.75-.75h3.5a.75.75 0 01.75.75v5.25h2.75a.25.25 0 00.25-.25V6.23a.25.25 0 00-.094-.195l-5.25-4.2zM6.906.664a1.75 1.75 0 012.187 0l5.25 4.2c.415.332.657.835.657 1.367v7.019A1.75 1.75 0 0113.25 15h-3.5a.75.75 0 01-.75-.75V9H7v5.25a.75.75 0 01-.75.75h-3.5A1.75 1.75 0 011 13.25V6.23c0-.531.242-1.034.657-1.366l5.25-4.2h-.001z',
-  fr: 'evenodd',
-}
-
-export const homeFill: OcticonSymbolType = {
-  w: 24,
-  h: 24,
-  d: 'M12.97 2.59a1.5 1.5 0 00-1.94 0l-7.5 6.363A1.5 1.5 0 003 10.097V19.5A1.5 1.5 0 004.5 21h4.75a.75.75 0 00.75-.75V14h4v6.25c0 .414.336.75.75.75h4.75a1.5 1.5 0 001.5-1.5v-9.403a1.5 1.5 0 00-.53-1.144l-7.5-6.363z',
-  fr: undefined,
-}
-
-export const horizontalRule: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M0 7.75A.75.75 0 01.75 7h14.5a.75.75 0 010 1.5H.75A.75.75 0 010 7.75z',
-  fr: 'evenodd',
-}
-
-export const hourglass: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M2.75 1a.75.75 0 000 1.5h.75v1.25a4.75 4.75 0 001.9 3.8l.333.25c.134.1.134.3 0 .4l-.333.25a4.75 4.75 0 00-1.9 3.8v1.25h-.75a.75.75 0 000 1.5h10.5a.75.75 0 000-1.5h-.75v-1.25a4.75 4.75 0 00-1.9-3.8l-.333-.25a.25.25 0 010-.4l.333-.25a4.75 4.75 0 001.9-3.8V2.5h.75a.75.75 0 000-1.5H2.75zM11 2.5H5v1.25a3.25 3.25 0 001.3 2.6l.333.25c.934.7.934 2.1 0 2.8l-.333.25a3.25 3.25 0 00-1.3 2.6v1.25h6v-1.25a3.25 3.25 0 00-1.3-2.6l-.333-.25a1.75 1.75 0 010-2.8l.333-.25a3.25 3.25 0 001.3-2.6V2.5z',
-  fr: 'evenodd',
-}
-
-export const hubot: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M0 8a8 8 0 1116 0v5.25a.75.75 0 01-1.5 0V8a6.5 6.5 0 10-13 0v5.25a.75.75 0 01-1.5 0V8zm5.5 4.25a.75.75 0 01.75-.75h3.5a.75.75 0 010 1.5h-3.5a.75.75 0 01-.75-.75zM3 6.75C3 5.784 3.784 5 4.75 5h6.5c.966 0 1.75.784 1.75 1.75v1.5A1.75 1.75 0 0111.25 10h-6.5A1.75 1.75 0 013 8.25v-1.5zm1.47-.53a.75.75 0 011.06 0l.97.97.97-.97a.75.75 0 011.06 0l.97.97.97-.97a.75.75 0 111.06 1.06l-1.5 1.5a.75.75 0 01-1.06 0L8 7.81l-.97.97a.75.75 0 01-1.06 0l-1.5-1.5a.75.75 0 010-1.06z',
-  fr: 'evenodd',
-}
-
-export const image: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M1.75 2.5a.25.25 0 00-.25.25v10.5c0 .138.112.25.25.25h.94a.76.76 0 01.03-.03l6.077-6.078a1.75 1.75 0 012.412-.06L14.5 10.31V2.75a.25.25 0 00-.25-.25H1.75zm12.5 11H4.81l5.048-5.047a.25.25 0 01.344-.009l4.298 3.889v.917a.25.25 0 01-.25.25zm1.75-.25V2.75A1.75 1.75 0 0014.25 1H1.75A1.75 1.75 0 000 2.75v10.5C0 14.216.784 15 1.75 15h12.5A1.75 1.75 0 0016 13.25zM5.5 6a.5.5 0 11-1 0 .5.5 0 011 0zM7 6a2 2 0 11-4 0 2 2 0 014 0z',
-  fr: 'evenodd',
-}
-
-export const inbox: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M2.8 2.06A1.75 1.75 0 014.41 1h7.18c.7 0 1.333.417 1.61 1.06l2.74 6.395a.75.75 0 01.06.295v4.5A1.75 1.75 0 0114.25 15H1.75A1.75 1.75 0 010 13.25v-4.5a.75.75 0 01.06-.295L2.8 2.06zm1.61.44a.25.25 0 00-.23.152L1.887 8H4.75a.75.75 0 01.6.3L6.625 10h2.75l1.275-1.7a.75.75 0 01.6-.3h2.863L11.82 2.652a.25.25 0 00-.23-.152H4.41zm10.09 7h-2.875l-1.275 1.7a.75.75 0 01-.6.3h-3.5a.75.75 0 01-.6-.3L4.375 9.5H1.5v3.75c0 .138.112.25.25.25h12.5a.25.25 0 00.25-.25V9.5z',
-  fr: 'evenodd',
-}
-
-export const infinity: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M3.5 6c-1.086 0-2 .914-2 2 0 1.086.914 2 2 2 .525 0 1.122-.244 1.825-.727.51-.35 1.025-.79 1.561-1.273-.536-.483-1.052-.922-1.56-1.273C4.621 6.244 4.025 6 3.5 6zm4.5.984c-.59-.533-1.204-1.066-1.825-1.493-.797-.548-1.7-.991-2.675-.991C1.586 4.5 0 6.086 0 8s1.586 3.5 3.5 3.5c.975 0 1.878-.444 2.675-.991.621-.427 1.235-.96 1.825-1.493.59.533 1.204 1.066 1.825 1.493.797.547 1.7.991 2.675.991 1.914 0 3.5-1.586 3.5-3.5s-1.586-3.5-3.5-3.5c-.975 0-1.878.443-2.675.991-.621.427-1.235.96-1.825 1.493zM9.114 8c.536.483 1.052.922 1.56 1.273.704.483 1.3.727 1.826.727 1.086 0 2-.914 2-2 0-1.086-.914-2-2-2-.525 0-1.122.244-1.825.727-.51.35-1.025.79-1.561 1.273z',
-  fr: 'evenodd',
-}
-
-export const info: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M8 1.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13zM0 8a8 8 0 1116 0A8 8 0 010 8zm6.5-.25A.75.75 0 017.25 7h1a.75.75 0 01.75.75v2.75h.25a.75.75 0 010 1.5h-2a.75.75 0 010-1.5h.25v-2h-.25a.75.75 0 01-.75-.75zM8 6a1 1 0 100-2 1 1 0 000 2z',
-  fr: 'evenodd',
-}
-
-export const insights: OcticonSymbolType = {
-  w: 24,
-  h: 24,
-  d: 'M11.75 3.5a.75.75 0 01.75.75v15.5a.75.75 0 01-1.5 0V4.25a.75.75 0 01.75-.75zm6.5 3.625a.75.75 0 01.75.75V19.75a.75.75 0 01-1.5 0V7.875a.75.75 0 01.75-.75zM5.25 11a.75.75 0 01.75.75v8a.75.75 0 01-1.5 0v-8a.75.75 0 01.75-.75z',
-  fr: 'evenodd',
-}
-
-export const issueClosed: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M1.5 8a6.5 6.5 0 0110.65-5.003.75.75 0 00.959-1.153 8 8 0 102.592 8.33.75.75 0 10-1.444-.407A6.5 6.5 0 011.5 8zM8 12a1 1 0 100-2 1 1 0 000 2zm0-8a.75.75 0 01.75.75v3.5a.75.75 0 11-1.5 0v-3.5A.75.75 0 018 4zm4.78 4.28l3-3a.75.75 0 00-1.06-1.06l-2.47 2.47-.97-.97a.749.749 0 10-1.06 1.06l1.5 1.5a.75.75 0 001.06 0z',
-  fr: 'evenodd',
-}
-
-export const issueOpened: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M8 1.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13zM0 8a8 8 0 1116 0A8 8 0 010 8zm9 3a1 1 0 11-2 0 1 1 0 012 0zm-.25-6.25a.75.75 0 00-1.5 0v3.5a.75.75 0 001.5 0v-3.5z',
-  fr: 'evenodd',
-}
-
-export const issueReopened: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M8 1.5a6.491 6.491 0 00-5.285 2.715l1.358 1.358A.25.25 0 013.896 6H.25A.25.25 0 010 5.75V2.104a.25.25 0 01.427-.177l1.216 1.216a8 8 0 0114.315 4.03.748.748 0 01-.668.83.75.75 0 01-.824-.676A6.501 6.501 0 008 1.5zM.712 8.004a.75.75 0 01.822.67 6.501 6.501 0 0011.751 3.111l-1.358-1.358a.25.25 0 01.177-.427h3.646a.25.25 0 01.25.25v3.646a.25.25 0 01-.427.177l-1.216-1.216A8 8 0 01.042 8.827a.75.75 0 01.67-.823zM9 11a1 1 0 11-2 0 1 1 0 012 0zm-.25-6.25a.75.75 0 00-1.5 0v3.5a.75.75 0 001.5 0v-3.5z',
-  fr: 'evenodd',
-}
-
-export const italic: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M6 2.75A.75.75 0 016.75 2h6.5a.75.75 0 010 1.5h-2.505l-3.858 9H9.25a.75.75 0 010 1.5h-6.5a.75.75 0 010-1.5h2.505l3.858-9H6.75A.75.75 0 016 2.75z',
-  fr: 'evenodd',
-}
-
-export const kebabHorizontal: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M8 9a1.5 1.5 0 100-3 1.5 1.5 0 000 3zM1.5 9a1.5 1.5 0 100-3 1.5 1.5 0 000 3zm13 0a1.5 1.5 0 100-3 1.5 1.5 0 000 3z',
-  fr: undefined,
-}
-
-export const key: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M6.5 5.5a4 4 0 112.731 3.795.75.75 0 00-.768.18L7.44 10.5H6.25a.75.75 0 00-.75.75v1.19l-.06.06H4.25a.75.75 0 00-.75.75v1.19l-.06.06H1.75a.25.25 0 01-.25-.25v-1.69l5.024-5.023a.75.75 0 00.181-.768A3.995 3.995 0 016.5 5.5zm4-5.5a5.5 5.5 0 00-5.348 6.788L.22 11.72a.75.75 0 00-.22.53v2C0 15.216.784 16 1.75 16h2a.75.75 0 00.53-.22l.5-.5a.75.75 0 00.22-.53V14h.75a.75.75 0 00.53-.22l.5-.5a.75.75 0 00.22-.53V12h.75a.75.75 0 00.53-.22l.932-.932A5.5 5.5 0 1010.5 0zm.5 6a1 1 0 100-2 1 1 0 000 2z',
-  fr: 'evenodd',
-}
-
-export const law: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M8.75.75a.75.75 0 00-1.5 0V2h-.984c-.305 0-.604.08-.869.23l-1.288.737A.25.25 0 013.984 3H1.75a.75.75 0 000 1.5h.428L.066 9.192a.75.75 0 00.154.838l.53-.53-.53.53v.001l.002.002.002.002.006.006.016.015.045.04a3.514 3.514 0 00.686.45A4.492 4.492 0 003 11c.88 0 1.556-.22 2.023-.454a3.515 3.515 0 00.686-.45l.045-.04.016-.015.006-.006.002-.002.001-.002L5.25 9.5l.53.53a.75.75 0 00.154-.838L3.822 4.5h.162c.305 0 .604-.08.869-.23l1.289-.737a.25.25 0 01.124-.033h.984V13h-2.5a.75.75 0 000 1.5h6.5a.75.75 0 000-1.5h-2.5V3.5h.984a.25.25 0 01.124.033l1.29.736c.264.152.563.231.868.231h.162l-2.112 4.692a.75.75 0 00.154.838l.53-.53-.53.53v.001l.002.002.002.002.006.006.016.015.045.04a3.517 3.517 0 00.686.45A4.492 4.492 0 0013 11c.88 0 1.556-.22 2.023-.454a3.512 3.512 0 00.686-.45l.045-.04.01-.01.006-.005.006-.006.002-.002.001-.002-.529-.531.53.53a.75.75 0 00.154-.838L13.823 4.5h.427a.75.75 0 000-1.5h-2.234a.25.25 0 01-.124-.033l-1.29-.736A1.75 1.75 0 009.735 2H8.75V.75zM1.695 9.227c.285.135.718.273 1.305.273s1.02-.138 1.305-.273L3 6.327l-1.305 2.9zm10 0c.285.135.718.273 1.305.273s1.02-.138 1.305-.273L13 6.327l-1.305 2.9z',
-  fr: 'evenodd',
-}
-
-export const lightBulb: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M8 1.5c-2.363 0-4 1.69-4 3.75 0 .984.424 1.625.984 2.304l.214.253c.223.264.47.556.673.848.284.411.537.896.621 1.49a.75.75 0 01-1.484.211c-.04-.282-.163-.547-.37-.847a8.695 8.695 0 00-.542-.68c-.084-.1-.173-.205-.268-.32C3.201 7.75 2.5 6.766 2.5 5.25 2.5 2.31 4.863 0 8 0s5.5 2.31 5.5 5.25c0 1.516-.701 2.5-1.328 3.259-.095.115-.184.22-.268.319-.207.245-.383.453-.541.681-.208.3-.33.565-.37.847a.75.75 0 01-1.485-.212c.084-.593.337-1.078.621-1.489.203-.292.45-.584.673-.848.075-.088.147-.173.213-.253.561-.679.985-1.32.985-2.304 0-2.06-1.637-3.75-4-3.75zM6 15.25a.75.75 0 01.75-.75h2.5a.75.75 0 010 1.5h-2.5a.75.75 0 01-.75-.75zM5.75 12a.75.75 0 000 1.5h4.5a.75.75 0 000-1.5h-4.5z',
-  fr: 'evenodd',
-}
-
-export const link: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M7.775 3.275a.75.75 0 001.06 1.06l1.25-1.25a2 2 0 112.83 2.83l-2.5 2.5a2 2 0 01-2.83 0 .75.75 0 00-1.06 1.06 3.5 3.5 0 004.95 0l2.5-2.5a3.5 3.5 0 00-4.95-4.95l-1.25 1.25zm-4.69 9.64a2 2 0 010-2.83l2.5-2.5a2 2 0 012.83 0 .75.75 0 001.06-1.06 3.5 3.5 0 00-4.95 0l-2.5 2.5a3.5 3.5 0 004.95 4.95l1.25-1.25a.75.75 0 00-1.06-1.06l-1.25 1.25a2 2 0 01-2.83 0z',
-  fr: 'evenodd',
-}
-
-export const linkExternal: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M10.604 1h4.146a.25.25 0 01.25.25v4.146a.25.25 0 01-.427.177L13.03 4.03 9.28 7.78a.75.75 0 01-1.06-1.06l3.75-3.75-1.543-1.543A.25.25 0 0110.604 1zM3.75 2A1.75 1.75 0 002 3.75v8.5c0 .966.784 1.75 1.75 1.75h8.5A1.75 1.75 0 0014 12.25v-3.5a.75.75 0 00-1.5 0v3.5a.25.25 0 01-.25.25h-8.5a.25.25 0 01-.25-.25v-8.5a.25.25 0 01.25-.25h3.5a.75.75 0 000-1.5h-3.5z',
-  fr: 'evenodd',
-}
-
-export const listOrdered: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M2.003 2.5a.5.5 0 00-.723-.447l-1.003.5a.5.5 0 00.446.895l.28-.14V6H.5a.5.5 0 000 1h2.006a.5.5 0 100-1h-.503V2.5zM5 3.25a.75.75 0 01.75-.75h8.5a.75.75 0 010 1.5h-8.5A.75.75 0 015 3.25zm0 5a.75.75 0 01.75-.75h8.5a.75.75 0 010 1.5h-8.5A.75.75 0 015 8.25zm0 5a.75.75 0 01.75-.75h8.5a.75.75 0 010 1.5h-8.5a.75.75 0 01-.75-.75zM.924 10.32l.003-.004a.851.851 0 01.144-.153A.66.66 0 011.5 10c.195 0 .306.068.374.146a.57.57 0 01.128.376c0 .453-.269.682-.8 1.078l-.035.025C.692 11.98 0 12.495 0 13.5a.5.5 0 00.5.5h2.003a.5.5 0 000-1H1.146c.132-.197.351-.372.654-.597l.047-.035c.47-.35 1.156-.858 1.156-1.845 0-.365-.118-.744-.377-1.038-.268-.303-.658-.484-1.126-.484-.48 0-.84.202-1.068.392a1.858 1.858 0 00-.348.384l-.007.011-.002.004-.001.002-.001.001a.5.5 0 00.851.525zM.5 10.055l-.427-.26.427.26z',
-  fr: 'evenodd',
-}
-
-export const listUnordered: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M2 4a1 1 0 100-2 1 1 0 000 2zm3.75-1.5a.75.75 0 000 1.5h8.5a.75.75 0 000-1.5h-8.5zm0 5a.75.75 0 000 1.5h8.5a.75.75 0 000-1.5h-8.5zm0 5a.75.75 0 000 1.5h8.5a.75.75 0 000-1.5h-8.5zM3 8a1 1 0 11-2 0 1 1 0 012 0zm-1 6a1 1 0 100-2 1 1 0 000 2z',
-  fr: 'evenodd',
-}
-
-export const location: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M11.536 3.464a5 5 0 010 7.072L8 14.07l-3.536-3.535a5 5 0 117.072-7.072v.001zm1.06 8.132a6.5 6.5 0 10-9.192 0l3.535 3.536a1.5 1.5 0 002.122 0l3.535-3.536zM8 9a2 2 0 100-4 2 2 0 000 4z',
-  fr: 'evenodd',
-}
-
-export const lock: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M4 4v2h-.25A1.75 1.75 0 002 7.75v5.5c0 .966.784 1.75 1.75 1.75h8.5A1.75 1.75 0 0014 13.25v-5.5A1.75 1.75 0 0012.25 6H12V4a4 4 0 10-8 0zm6.5 2V4a2.5 2.5 0 00-5 0v2h5zM12 7.5h.25a.25.25 0 01.25.25v5.5a.25.25 0 01-.25.25h-8.5a.25.25 0 01-.25-.25v-5.5a.25.25 0 01.25-.25H12z',
-  fr: 'evenodd',
-}
-
-export const logoGist: OcticonSymbolType = {
-  w: 25,
-  h: 16,
-  d: 'M4.7 8.73h2.45v4.02c-.55.27-1.64.34-2.53.34-2.56 0-3.47-2.2-3.47-5.05 0-2.85.91-5.06 3.48-5.06 1.28 0 2.06.23 3.28.73V2.66C7.27 2.33 6.25 2 4.63 2 1.13 2 0 4.69 0 8.03c0 3.34 1.11 6.03 4.63 6.03 1.64 0 2.81-.27 3.59-.64V7.73H4.7v1zm6.39 3.72V6.06h-1.05v6.28c0 1.25.58 1.72 1.72 1.72v-.89c-.48 0-.67-.16-.67-.7v-.02zm.25-8.72c0-.44-.33-.78-.78-.78s-.77.34-.77.78.33.78.77.78.78-.34.78-.78zm4.34 5.69c-1.5-.13-1.78-.48-1.78-1.17 0-.77.33-1.34 1.88-1.34 1.05 0 1.66.16 2.27.36v-.94c-.69-.3-1.52-.39-2.25-.39-2.2 0-2.92 1.2-2.92 2.31 0 1.08.47 1.88 2.73 2.08 1.55.13 1.77.63 1.77 1.34 0 .73-.44 1.42-2.06 1.42-1.11 0-1.86-.19-2.33-.36v.94c.5.2 1.58.39 2.33.39 2.38 0 3.14-1.2 3.14-2.41 0-1.28-.53-2.03-2.75-2.23h-.03zm8.58-2.47v-.86h-2.42v-2.5l-1.08.31v2.11l-1.56.44v.48h1.56v5c0 1.53 1.19 2.13 2.5 2.13.19 0 .52-.02.69-.05v-.89c-.19.03-.41.03-.61.03-.97 0-1.5-.39-1.5-1.34V6.94h2.42v.02-.01z',
-  fr: 'evenodd',
-}
-
-export const logoGithub: OcticonSymbolType = {
-  w: 45,
-  h: 16,
-  d: 'M18.53 12.03h-.02c.009 0 .015.01.024.011h.006l-.01-.01zm.004.011c-.093.001-.327.05-.574.05-.78 0-1.05-.36-1.05-.83V8.13h1.59c.09 0 .16-.08.16-.19v-1.7c0-.09-.08-.17-.16-.17h-1.59V3.96c0-.08-.05-.13-.14-.13h-2.16c-.09 0-.14.05-.14.13v2.17s-1.09.27-1.16.28c-.08.02-.13.09-.13.17v1.36c0 .11.08.19.17.19h1.11v3.28c0 2.44 1.7 2.69 2.86 2.69.53 0 1.17-.17 1.27-.22.06-.02.09-.09.09-.16v-1.5a.177.177 0 00-.146-.18zM42.23 9.84c0-1.81-.73-2.05-1.5-1.97-.6.04-1.08.34-1.08.34v3.52s.49.34 1.22.36c1.03.03 1.36-.34 1.36-2.25zm2.43-.16c0 3.43-1.11 4.41-3.05 4.41-1.64 0-2.52-.83-2.52-.83s-.04.46-.09.52c-.03.06-.08.08-.14.08h-1.48c-.1 0-.19-.08-.19-.17l.02-11.11c0-.09.08-.17.17-.17h2.13c.09 0 .17.08.17.17v3.77s.82-.53 2.02-.53l-.01-.02c1.2 0 2.97.45 2.97 3.88zm-8.72-3.61h-2.1c-.11 0-.17.08-.17.19v5.44s-.55.39-1.3.39-.97-.34-.97-1.09V6.25c0-.09-.08-.17-.17-.17h-2.14c-.09 0-.17.08-.17.17v5.11c0 2.2 1.23 2.75 2.92 2.75 1.39 0 2.52-.77 2.52-.77s.05.39.08.45c.02.05.09.09.16.09h1.34c.11 0 .17-.08.17-.17l.02-7.47c0-.09-.08-.17-.19-.17zm-23.7-.01h-2.13c-.09 0-.17.09-.17.2v7.34c0 .2.13.27.3.27h1.92c.2 0 .25-.09.25-.27V6.23c0-.09-.08-.17-.17-.17zm-1.05-3.38c-.77 0-1.38.61-1.38 1.38 0 .77.61 1.38 1.38 1.38.75 0 1.36-.61 1.36-1.38 0-.77-.61-1.38-1.36-1.38zm16.49-.25h-2.11c-.09 0-.17.08-.17.17v4.09h-3.31V2.6c0-.09-.08-.17-.17-.17h-2.13c-.09 0-.17.08-.17.17v11.11c0 .09.09.17.17.17h2.13c.09 0 .17-.08.17-.17V8.96h3.31l-.02 4.75c0 .09.08.17.17.17h2.13c.09 0 .17-.08.17-.17V2.6c0-.09-.08-.17-.17-.17zM8.81 7.35v5.74c0 .04-.01.11-.06.13 0 0-1.25.89-3.31.89-2.49 0-5.44-.78-5.44-5.92S2.58 1.99 5.1 2c2.18 0 3.06.49 3.2.58.04.05.06.09.06.14L7.94 4.5c0 .09-.09.2-.2.17-.36-.11-.9-.33-2.17-.33-1.47 0-3.05.42-3.05 3.73s1.5 3.7 2.58 3.7c.92 0 1.25-.11 1.25-.11v-2.3H4.88c-.11 0-.19-.08-.19-.17V7.35c0-.09.08-.17.19-.17h3.74c.11 0 .19.08.19.17z',
-  fr: 'evenodd',
-}
-
-export const mail: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M1.75 2A1.75 1.75 0 000 3.75v.736a.75.75 0 000 .027v7.737C0 13.216.784 14 1.75 14h12.5A1.75 1.75 0 0016 12.25v-8.5A1.75 1.75 0 0014.25 2H1.75zM14.5 4.07v-.32a.25.25 0 00-.25-.25H1.75a.25.25 0 00-.25.25v.32L8 7.88l6.5-3.81zm-13 1.74v6.441c0 .138.112.25.25.25h12.5a.25.25 0 00.25-.25V5.809L8.38 9.397a.75.75 0 01-.76 0L1.5 5.809z',
-  fr: 'evenodd',
-}
-
-export const markGithub: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0016 8c0-4.42-3.58-8-8-8z',
-  fr: 'evenodd',
-}
-
-export const markdown: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M14.85 3H1.15C.52 3 0 3.52 0 4.15v7.69C0 12.48.52 13 1.15 13h13.69c.64 0 1.15-.52 1.15-1.15v-7.7C16 3.52 15.48 3 14.85 3zM9 11H7V8L5.5 9.92 4 8v3H2V5h2l1.5 2L7 5h2v6zm2.99.5L9.5 8H11V5h2v3h1.5l-2.51 3.5z',
-  fr: 'evenodd',
-}
-
-export const megaphone: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M15.571.572A.75.75 0 0116 1.25L14.777.668c.001 0 0 0 0 0l-.015.012-.076.056a5.508 5.508 0 01-.345.224 9.982 9.982 0 01-1.463.719c-1.322.528-3.351 1.07-6.124 1.071a1.6 1.6 0 00-.861-.25H4a4 4 0 00-1.499 7.71.758.758 0 00-.001.04c0 2.32.486 3.93.813 4.75.262.66.897 1 1.517 1h1.197c.685 0 1.228-.389 1.546-.857.317-.466.468-1.09.31-1.696-.2-.767-.382-1.835-.383-3.183 2.394.086 4.177.577 5.378 1.057a9.965 9.965 0 011.463.719 5.7 5.7 0 01.421.28l.014.012h.002A.75.75 0 0016 11.75V1.25L14.777.668a.75.75 0 01.794-.096zM4.002 10.5c.033 1.969.45 3.306.704 3.946.004.01.01.02.027.03a.185.185 0 00.097.024h1.197c.083 0 .202-.047.305-.2a.608.608 0 00.1-.475 14.036 14.036 0 01-.43-3.329 1.64 1.64 0 01-.11.004h-1.89zM7.5 8.763c2.601.087 4.573.62 5.935 1.166.41.164.766.33 1.065.483V2.588c-.3.154-.654.319-1.065.483C12.073 3.616 10.1 4.15 7.5 4.237v4.526zM14.777.668zM1.5 6.5A2.5 2.5 0 014 4h1.893c.059 0 .107.048.107.107v4.786A.107.107 0 015.893 9H4a2.5 2.5 0 01-2.5-2.5z',
-  fr: 'evenodd',
-}
-
-export const mention: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M4.75 2.37a6.5 6.5 0 006.5 11.26.75.75 0 01.75 1.298 8 8 0 113.994-7.273.754.754 0 01.006.095v1.5a2.75 2.75 0 01-5.072 1.475A4 4 0 1112 8v1.25a1.25 1.25 0 002.5 0V7.867a6.5 6.5 0 00-9.75-5.496V2.37zM10.5 8a2.5 2.5 0 10-5 0 2.5 2.5 0 005 0z',
-  fr: 'evenodd',
-}
-
-export const meter: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M8 1.5a6.5 6.5 0 106.016 4.035.75.75 0 011.388-.57 8 8 0 11-4.37-4.37.75.75 0 01-.569 1.389A6.479 6.479 0 008 1.5zm6.28.22a.75.75 0 010 1.06l-4.063 4.064a2.5 2.5 0 11-1.06-1.06L13.22 1.72a.75.75 0 011.06 0zM7 8a1 1 0 112 0 1 1 0 01-2 0z',
-  fr: 'evenodd',
-}
-
-export const milestone: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M7.75 0a.75.75 0 01.75.75V3h3.634c.414 0 .814.147 1.13.414l2.07 1.75a1.75 1.75 0 010 2.672l-2.07 1.75a1.75 1.75 0 01-1.13.414H8.5v5.25a.75.75 0 11-1.5 0V10H2.75A1.75 1.75 0 011 8.25v-3.5C1 3.784 1.784 3 2.75 3H7V.75A.75.75 0 017.75 0zm0 8.5h4.384a.25.25 0 00.161-.06l2.07-1.75a.25.25 0 000-.38l-2.07-1.75a.25.25 0 00-.161-.06H2.75a.25.25 0 00-.25.25v3.5c0 .138.112.25.25.25h5z',
-  fr: 'evenodd',
-}
-
-export const mirror: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M8.75 1.75a.75.75 0 00-1.5 0v.5a.75.75 0 001.5 0v-.5zM8 4a.75.75 0 01.75.75v.5a.75.75 0 01-1.5 0v-.5A.75.75 0 018 4zm.75 3.75a.75.75 0 00-1.5 0v.5a.75.75 0 001.5 0v-.5zM8 10a.75.75 0 01.75.75v.5a.75.75 0 01-1.5 0v-.5A.75.75 0 018 10zm0 3a.75.75 0 01.75.75v.5a.75.75 0 01-1.5 0v-.5A.75.75 0 018 13zm7.547-9.939A.75.75 0 0116 3.75v8.5a.75.75 0 01-1.265.545l-4.5-4.25a.75.75 0 010-1.09l4.5-4.25a.75.75 0 01.812-.144zM11.842 8l2.658 2.51V5.49L11.842 8zM0 12.25a.75.75 0 001.265.545l4.5-4.25a.75.75 0 000-1.09l-4.5-4.25A.75.75 0 000 3.75v8.5zm1.5-6.76L4.158 8 1.5 10.51V5.49z',
-  fr: 'evenodd',
-}
-
-export const moon: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M9.598 1.591a.75.75 0 01.785-.175 7 7 0 11-8.967 8.967.75.75 0 01.961-.96 5.5 5.5 0 007.046-7.046.75.75 0 01.175-.786zm1.616 1.945a7 7 0 01-7.678 7.678 5.5 5.5 0 107.678-7.678z',
-  fr: 'evenodd',
-}
-
-export const mortarBoard: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M7.693 1.066a.75.75 0 01.614 0l7.25 3.25a.75.75 0 010 1.368L13 6.831v2.794c0 1.024-.81 1.749-1.66 2.173-.893.447-2.075.702-3.34.702-.278 0-.55-.012-.816-.036a.75.75 0 01.133-1.494c.22.02.45.03.683.03 1.082 0 2.025-.221 2.67-.543.69-.345.83-.682.83-.832V7.503L8.307 8.934a.75.75 0 01-.614 0L4 7.28v1.663c.296.105.575.275.812.512.438.438.688 1.059.688 1.796v3a.75.75 0 01-.75.75h-3a.75.75 0 01-.75-.75v-3c0-.737.25-1.358.688-1.796.237-.237.516-.407.812-.512V6.606L.443 5.684a.75.75 0 010-1.368l7.25-3.25zM2.583 5L8 7.428 13.416 5 8 2.572 2.583 5zM2.5 11.25c0-.388.125-.611.25-.735a.704.704 0 01.5-.203c.19 0 .37.071.5.203.125.124.25.347.25.735v2.25H2.5v-2.25z',
-  fr: 'evenodd',
-}
-
-export const mute: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M8 2.75a.75.75 0 00-1.238-.57L3.472 5H1.75A1.75 1.75 0 000 6.75v2.5C0 10.216.784 11 1.75 11h1.723l3.289 2.82A.75.75 0 008 13.25V2.75zM4.238 6.32L6.5 4.38v7.24L4.238 9.68a.75.75 0 00-.488-.18h-2a.25.25 0 01-.25-.25v-2.5a.25.25 0 01.25-.25h2a.75.75 0 00.488-.18zm7.042-1.1a.75.75 0 10-1.06 1.06L11.94 8l-1.72 1.72a.75.75 0 101.06 1.06L13 9.06l1.72 1.72a.75.75 0 101.06-1.06L14.06 8l1.72-1.72a.75.75 0 00-1.06-1.06L13 6.94l-1.72-1.72z',
-  fr: 'evenodd',
-}
-
-export const noEntry: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M2.5 8a5.5 5.5 0 1111 0 5.5 5.5 0 01-11 0zM8 1a7 7 0 100 14A7 7 0 008 1zm3.25 7.75a.75.75 0 000-1.5h-6.5a.75.75 0 000 1.5h6.5z',
-  fr: 'evenodd',
-}
-
-export const northStar: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M8.5.75a.75.75 0 00-1.5 0v5.19L4.391 3.33a.75.75 0 10-1.06 1.061L5.939 7H.75a.75.75 0 000 1.5h5.19l-2.61 2.609a.75.75 0 101.061 1.06L7 9.561v5.189a.75.75 0 001.5 0V9.56l2.609 2.61a.75.75 0 101.06-1.061L9.561 8.5h5.189a.75.75 0 000-1.5H9.56l2.61-2.609a.75.75 0 00-1.061-1.06L8.5 5.939V.75z',
-  fr: undefined,
-}
-
-export const note: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M0 3.75C0 2.784.784 2 1.75 2h12.5c.966 0 1.75.784 1.75 1.75v8.5A1.75 1.75 0 0114.25 14H1.75A1.75 1.75 0 010 12.25v-8.5zm1.75-.25a.25.25 0 00-.25.25v8.5c0 .138.112.25.25.25h12.5a.25.25 0 00.25-.25v-8.5a.25.25 0 00-.25-.25H1.75zM3.5 6.25a.75.75 0 01.75-.75h7a.75.75 0 010 1.5h-7a.75.75 0 01-.75-.75zm.75 2.25a.75.75 0 000 1.5h4a.75.75 0 000-1.5h-4z',
-  fr: 'evenodd',
-}
-
-export const octoface: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M14.7 5.34c.13-.32.55-1.59-.13-3.31 0 0-1.05-.33-3.44 1.3-1-.28-2.07-.32-3.13-.32s-2.13.04-3.13.32c-2.39-1.64-3.44-1.3-3.44-1.3-.68 1.72-.26 2.99-.13 3.31C.49 6.21 0 7.33 0 8.69 0 13.84 3.33 15 7.98 15S16 13.84 16 8.69c0-1.36-.49-2.48-1.3-3.35zM8 14.02c-3.3 0-5.98-.15-5.98-3.35 0-.76.38-1.48 1.02-2.07 1.07-.98 2.9-.46 4.96-.46 2.07 0 3.88-.52 4.96.46.65.59 1.02 1.3 1.02 2.07 0 3.19-2.68 3.35-5.98 3.35zM5.49 9.01c-.66 0-1.2.8-1.2 1.78s.54 1.79 1.2 1.79c.66 0 1.2-.8 1.2-1.79s-.54-1.78-1.2-1.78zm5.02 0c-.66 0-1.2.79-1.2 1.78s.54 1.79 1.2 1.79c.66 0 1.2-.8 1.2-1.79s-.53-1.78-1.2-1.78z',
-  fr: 'evenodd',
-}
-
-export const organization: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M1.5 14.25c0 .138.112.25.25.25H4v-1.25a.75.75 0 01.75-.75h2.5a.75.75 0 01.75.75v1.25h2.25a.25.25 0 00.25-.25V1.75a.25.25 0 00-.25-.25h-8.5a.25.25 0 00-.25.25v12.5zM1.75 16A1.75 1.75 0 010 14.25V1.75C0 .784.784 0 1.75 0h8.5C11.216 0 12 .784 12 1.75v12.5c0 .085-.006.168-.018.25h2.268a.25.25 0 00.25-.25V8.285a.25.25 0 00-.111-.208l-1.055-.703a.75.75 0 11.832-1.248l1.055.703c.487.325.779.871.779 1.456v5.965A1.75 1.75 0 0114.25 16h-3.5a.75.75 0 01-.197-.026c-.099.017-.2.026-.303.026h-3a.75.75 0 01-.75-.75V14h-1v1.25a.75.75 0 01-.75.75h-3zM3 3.75A.75.75 0 013.75 3h.5a.75.75 0 010 1.5h-.5A.75.75 0 013 3.75zM3.75 6a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5zM3 9.75A.75.75 0 013.75 9h.5a.75.75 0 010 1.5h-.5A.75.75 0 013 9.75zM7.75 9a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5zM7 6.75A.75.75 0 017.75 6h.5a.75.75 0 010 1.5h-.5A.75.75 0 017 6.75zM7.75 3a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5z',
-  fr: 'evenodd',
-}
-
-export const package_: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M8.878.392a1.75 1.75 0 00-1.756 0l-5.25 3.045A1.75 1.75 0 001 4.951v6.098c0 .624.332 1.2.872 1.514l5.25 3.045a1.75 1.75 0 001.756 0l5.25-3.045c.54-.313.872-.89.872-1.514V4.951c0-.624-.332-1.2-.872-1.514L8.878.392zM7.875 1.69a.25.25 0 01.25 0l4.63 2.685L8 7.133 3.245 4.375l4.63-2.685zM2.5 5.677v5.372c0 .09.047.171.125.216l4.625 2.683V8.432L2.5 5.677zm6.25 8.271l4.625-2.683a.25.25 0 00.125-.216V5.677L8.75 8.432v5.516z',
-  fr: 'evenodd',
-}
-
-export const packageDependencies: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M6.122.392a1.75 1.75 0 011.756 0l5.25 3.045c.54.313.872.89.872 1.514V7.25a.75.75 0 01-1.5 0V5.677L7.75 8.432v6.384a1 1 0 01-1.502.865L.872 12.563A1.75 1.75 0 010 11.049V4.951c0-.624.332-1.2.872-1.514L6.122.392zM7.125 1.69l4.63 2.685L7 7.133 2.245 4.375l4.63-2.685a.25.25 0 01.25 0zM1.5 11.049V5.677l4.75 2.755v5.516l-4.625-2.683a.25.25 0 01-.125-.216zm11.672-.282a.75.75 0 10-1.087-1.034l-2.378 2.5a.75.75 0 000 1.034l2.378 2.5a.75.75 0 101.087-1.034L11.999 13.5h3.251a.75.75 0 000-1.5h-3.251l1.173-1.233z',
-  fr: 'evenodd',
-}
-
-export const packageDependents: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M6.122.392a1.75 1.75 0 011.756 0l5.25 3.045c.54.313.872.89.872 1.514V7.25a.75.75 0 01-1.5 0V5.677L7.75 8.432v6.384a1 1 0 01-1.502.865L.872 12.563A1.75 1.75 0 010 11.049V4.951c0-.624.332-1.2.872-1.514L6.122.392zM7.125 1.69l4.63 2.685L7 7.133 2.245 4.375l4.63-2.685a.25.25 0 01.25 0zM1.5 11.049V5.677l4.75 2.755v5.516l-4.625-2.683a.25.25 0 01-.125-.216zm10.828 3.684a.75.75 0 101.087 1.034l2.378-2.5a.75.75 0 000-1.034l-2.378-2.5a.75.75 0 00-1.087 1.034L13.501 12H10.25a.75.75 0 000 1.5h3.251l-1.173 1.233z',
-  fr: 'evenodd',
-}
-
-export const paintbrush: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M11.134 1.535C9.722 2.562 8.16 4.057 6.889 5.312 5.8 6.387 5.041 7.401 4.575 8.294a3.745 3.745 0 00-3.227 1.054c-.43.431-.69 1.066-.86 1.657a11.982 11.982 0 00-.358 1.914A21.263 21.263 0 000 15.203v.054l.75-.007-.007.75h.054a14.404 14.404 0 00.654-.012 21.243 21.243 0 001.63-.118c.62-.07 1.3-.18 1.914-.357.592-.17 1.226-.43 1.657-.861a3.745 3.745 0 001.055-3.217c.908-.461 1.942-1.216 3.04-2.3 1.279-1.262 2.764-2.825 3.775-4.249.501-.706.923-1.428 1.125-2.096.2-.659.235-1.469-.368-2.07-.606-.607-1.42-.55-2.069-.34-.66.213-1.376.646-2.076 1.155zm-3.95 8.48a3.76 3.76 0 00-1.19-1.192 9.758 9.758 0 011.161-1.607l1.658 1.658a9.853 9.853 0 01-1.63 1.142zM.742 16l.007-.75-.75.008A.75.75 0 00.743 16zM12.016 2.749c-1.224.89-2.605 2.189-3.822 3.384l1.718 1.718c1.21-1.205 2.51-2.597 3.387-3.833.47-.662.78-1.227.912-1.662.134-.444.032-.551.009-.575h-.001V1.78c-.014-.014-.112-.113-.548.027-.432.14-.995.462-1.655.942zM1.62 13.089a19.56 19.56 0 00-.104 1.395 19.55 19.55 0 001.396-.104 10.528 10.528 0 001.668-.309c.526-.151.856-.325 1.011-.48a2.25 2.25 0 00-3.182-3.182c-.155.155-.329.485-.48 1.01a10.515 10.515 0 00-.309 1.67z',
-  fr: 'evenodd',
-}
-
-export const paperAirplane: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M1.592 2.712L2.38 7.25h4.87a.75.75 0 110 1.5H2.38l-.788 4.538L13.929 8 1.592 2.712zM.989 8L.064 2.68a1.341 1.341 0 011.85-1.462l13.402 5.744a1.13 1.13 0 010 2.076L1.913 14.782a1.341 1.341 0 01-1.85-1.463L.99 8z',
-  fr: 'evenodd',
-}
-
-export const pencil: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M11.013 1.427a1.75 1.75 0 012.474 0l1.086 1.086a1.75 1.75 0 010 2.474l-8.61 8.61c-.21.21-.47.364-.756.445l-3.251.93a.75.75 0 01-.927-.928l.929-3.25a1.75 1.75 0 01.445-.758l8.61-8.61zm1.414 1.06a.25.25 0 00-.354 0L10.811 3.75l1.439 1.44 1.263-1.263a.25.25 0 000-.354l-1.086-1.086zM11.189 6.25L9.75 4.81l-6.286 6.287a.25.25 0 00-.064.108l-.558 1.953 1.953-.558a.249.249 0 00.108-.064l6.286-6.286z',
-  fr: 'evenodd',
-}
-
-export const people: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M5.5 3.5a2 2 0 100 4 2 2 0 000-4zM2 5.5a3.5 3.5 0 115.898 2.549 5.507 5.507 0 013.034 4.084.75.75 0 11-1.482.235 4.001 4.001 0 00-7.9 0 .75.75 0 01-1.482-.236A5.507 5.507 0 013.102 8.05 3.49 3.49 0 012 5.5zM11 4a.75.75 0 100 1.5 1.5 1.5 0 01.666 2.844.75.75 0 00-.416.672v.352a.75.75 0 00.574.73c1.2.289 2.162 1.2 2.522 2.372a.75.75 0 101.434-.44 5.01 5.01 0 00-2.56-3.012A3 3 0 0011 4z',
-  fr: 'evenodd',
-}
-
-export const person: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M10.5 5a2.5 2.5 0 11-5 0 2.5 2.5 0 015 0zm.061 3.073a4 4 0 10-5.123 0 6.004 6.004 0 00-3.431 5.142.75.75 0 001.498.07 4.5 4.5 0 018.99 0 .75.75 0 101.498-.07 6.005 6.005 0 00-3.432-5.142z',
-  fr: 'evenodd',
-}
-
-export const pin: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M4.456.734a1.75 1.75 0 012.826.504l.613 1.327a3.081 3.081 0 002.084 1.707l2.454.584c1.332.317 1.8 1.972.832 2.94L11.06 10l3.72 3.72a.75.75 0 11-1.061 1.06L10 11.06l-2.204 2.205c-.968.968-2.623.5-2.94-.832l-.584-2.454a3.081 3.081 0 00-1.707-2.084l-1.327-.613a1.75 1.75 0 01-.504-2.826L4.456.734zM5.92 1.866a.25.25 0 00-.404-.072L1.794 5.516a.25.25 0 00.072.404l1.328.613A4.582 4.582 0 015.73 9.63l.584 2.454a.25.25 0 00.42.12l5.47-5.47a.25.25 0 00-.12-.42L9.63 5.73a4.581 4.581 0 01-3.098-2.537L5.92 1.866z',
-  fr: 'evenodd',
-}
-
-export const play: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M1.5 8a6.5 6.5 0 1113 0 6.5 6.5 0 01-13 0zM8 0a8 8 0 100 16A8 8 0 008 0zM6.379 5.227A.25.25 0 006 5.442v5.117a.25.25 0 00.379.214l4.264-2.559a.25.25 0 000-.428L6.379 5.227z',
-  fr: 'evenodd',
-}
-
-export const plug: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M10.276 3.09a.25.25 0 01.192-.09h.782a.25.25 0 01.25.25v8.5a.25.25 0 01-.25.25h-.782a.25.25 0 01-.192-.09l-.95-1.14a.75.75 0 00-.483-.264l-3.124-.39a.25.25 0 01-.219-.249V5.133a.25.25 0 01.219-.248l3.124-.39a.75.75 0 00.483-.265l.95-1.14zM4 8v1.867a1.75 1.75 0 001.533 1.737l2.83.354.761.912c.332.4.825.63 1.344.63h.782A1.75 1.75 0 0013 11.75V11h2.25a.75.75 0 000-1.5H13v-4h2.25a.75.75 0 000-1.5H13v-.75a1.75 1.75 0 00-1.75-1.75h-.782c-.519 0-1.012.23-1.344.63l-.76.913-2.831.353A1.75 1.75 0 004 5.133V6.5H2.5A2.5 2.5 0 000 9v5.25a.75.75 0 001.5 0V9a1 1 0 011-1H4z',
-  fr: 'evenodd',
-}
-
-export const plus: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M8 2a.75.75 0 01.75.75v4.5h4.5a.75.75 0 010 1.5h-4.5v4.5a.75.75 0 01-1.5 0v-4.5h-4.5a.75.75 0 010-1.5h4.5v-4.5A.75.75 0 018 2z',
-  fr: 'evenodd',
-}
-
-export const plusCircle: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M1.5 8a6.5 6.5 0 1113 0 6.5 6.5 0 01-13 0zM8 0a8 8 0 100 16A8 8 0 008 0zm.75 4.75a.75.75 0 00-1.5 0v2.5h-2.5a.75.75 0 000 1.5h2.5v2.5a.75.75 0 001.5 0v-2.5h2.5a.75.75 0 000-1.5h-2.5v-2.5z',
-  fr: 'evenodd',
-}
-
-export const project: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M1.75 0A1.75 1.75 0 000 1.75v12.5C0 15.216.784 16 1.75 16h12.5A1.75 1.75 0 0016 14.25V1.75A1.75 1.75 0 0014.25 0H1.75zM1.5 1.75a.25.25 0 01.25-.25h12.5a.25.25 0 01.25.25v12.5a.25.25 0 01-.25.25H1.75a.25.25 0 01-.25-.25V1.75zM11.75 3a.75.75 0 00-.75.75v7.5a.75.75 0 001.5 0v-7.5a.75.75 0 00-.75-.75zm-8.25.75a.75.75 0 011.5 0v5.5a.75.75 0 01-1.5 0v-5.5zM8 3a.75.75 0 00-.75.75v3.5a.75.75 0 001.5 0v-3.5A.75.75 0 008 3z',
-  fr: 'evenodd',
-}
-
-export const pulse: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M6 2a.75.75 0 01.696.471L10 10.731l1.304-3.26A.75.75 0 0112 7h3.25a.75.75 0 010 1.5h-2.742l-1.812 4.528a.75.75 0 01-1.392 0L6 4.77 4.696 8.03A.75.75 0 014 8.5H.75a.75.75 0 010-1.5h2.742l1.812-4.529A.75.75 0 016 2z',
-  fr: 'evenodd',
-}
-
-export const question: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M8 1.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13zM0 8a8 8 0 1116 0A8 8 0 010 8zm9 3a1 1 0 11-2 0 1 1 0 012 0zM6.92 6.085c.081-.16.19-.299.34-.398.145-.097.371-.187.74-.187.28 0 .553.087.738.225A.613.613 0 019 6.25c0 .177-.04.264-.077.318a.956.956 0 01-.277.245c-.076.051-.158.1-.258.161l-.007.004a7.728 7.728 0 00-.313.195 2.416 2.416 0 00-.692.661.75.75 0 001.248.832.956.956 0 01.276-.245 6.3 6.3 0 01.26-.16l.006-.004c.093-.057.204-.123.313-.195.222-.149.487-.355.692-.662.214-.32.329-.702.329-1.15 0-.76-.36-1.348-.863-1.725A2.76 2.76 0 008 4c-.631 0-1.155.16-1.572.438-.413.276-.68.638-.849.977a.75.75 0 101.342.67z',
-  fr: 'evenodd',
-}
-
-export const quote: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M1.75 2.5a.75.75 0 000 1.5h10.5a.75.75 0 000-1.5H1.75zm4 5a.75.75 0 000 1.5h8.5a.75.75 0 000-1.5h-8.5zm0 5a.75.75 0 000 1.5h8.5a.75.75 0 000-1.5h-8.5zM2.5 7.75a.75.75 0 00-1.5 0v6a.75.75 0 001.5 0v-6z',
-  fr: 'evenodd',
-}
-
-export const reply: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M6.78 1.97a.75.75 0 010 1.06L3.81 6h6.44A4.75 4.75 0 0115 10.75v2.5a.75.75 0 01-1.5 0v-2.5a3.25 3.25 0 00-3.25-3.25H3.81l2.97 2.97a.75.75 0 11-1.06 1.06L1.47 7.28a.75.75 0 010-1.06l4.25-4.25a.75.75 0 011.06 0z',
-  fr: 'evenodd',
-}
-
-export const repo: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M2 2.5A2.5 2.5 0 014.5 0h8.75a.75.75 0 01.75.75v12.5a.75.75 0 01-.75.75h-2.5a.75.75 0 110-1.5h1.75v-2h-8a1 1 0 00-.714 1.7.75.75 0 01-1.072 1.05A2.495 2.495 0 012 11.5v-9zm10.5-1V9h-8c-.356 0-.694.074-1 .208V2.5a1 1 0 011-1h8zM5 12.25v3.25a.25.25 0 00.4.2l1.45-1.087a.25.25 0 01.3 0L8.6 15.7a.25.25 0 00.4-.2v-3.25a.25.25 0 00-.25-.25h-3.5a.25.25 0 00-.25.25z',
-  fr: 'evenodd',
-}
-
-export const repoClone: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M15 0H9v7c0 .55.45 1 1 1h1v1h1V8h3c.55 0 1-.45 1-1V1c0-.55-.45-1-1-1zm-4 7h-1V6h1v1zm4 0h-3V6h3v1zm0-2h-4V1h4v4zM4 5H3V4h1v1zm0-2H3V2h1v1zM2 1h6V0H1C.45 0 0 .45 0 1v12c0 .55.45 1 1 1h2v2l1.5-1.5L6 16v-2h5c.55 0 1-.45 1-1v-3H2V1zm9 10v2H6v-1H3v1H1v-2h10zM3 8h1v1H3V8zm1-1H3V6h1v1z',
-  fr: 'evenodd',
-}
-
-export const repoForked: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M5 3.25a.75.75 0 11-1.5 0 .75.75 0 011.5 0zm0 2.122a2.25 2.25 0 10-1.5 0v.878A2.25 2.25 0 005.75 8.5h1.5v2.128a2.251 2.251 0 101.5 0V8.5h1.5a2.25 2.25 0 002.25-2.25v-.878a2.25 2.25 0 10-1.5 0v.878a.75.75 0 01-.75.75h-4.5A.75.75 0 015 6.25v-.878zm3.75 7.378a.75.75 0 11-1.5 0 .75.75 0 011.5 0zm3-8.75a.75.75 0 100-1.5.75.75 0 000 1.5z',
-  fr: 'evenodd',
-}
-
-export const repoPull: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M13 8V6H7V4h6V2l3 3-3 3zM4 2H3v1h1V2zm7 5h1v6c0 .55-.45 1-1 1H6v2l-1.5-1.5L3 16v-2H1c-.55 0-1-.45-1-1V1c0-.55.45-1 1-1h10c.55 0 1 .45 1 1v2h-1V1H2v9h9V7zm0 4H1v2h2v-1h3v1h5v-2zM4 6H3v1h1V6zm0-2H3v1h1V4zM3 9h1V8H3v1z',
-  fr: 'evenodd',
-}
-
-export const repoPush: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M1 2.5A2.5 2.5 0 013.5 0h8.75a.75.75 0 01.75.75v3.5a.75.75 0 01-1.5 0V1.5h-8a1 1 0 00-1 1v6.708A2.492 2.492 0 013.5 9h3.25a.75.75 0 010 1.5H3.5a1 1 0 100 2h5.75a.75.75 0 010 1.5H3.5A2.5 2.5 0 011 11.5v-9zm13.23 7.79a.75.75 0 001.06-1.06l-2.505-2.505a.75.75 0 00-1.06 0L9.22 9.229a.75.75 0 001.06 1.061l1.225-1.224v6.184a.75.75 0 001.5 0V9.066l1.224 1.224z',
-  fr: 'evenodd',
-}
-
-export const repoTemplate: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M6 .75A.75.75 0 016.75 0h2.5a.75.75 0 010 1.5h-2.5A.75.75 0 016 .75zm5 0a.75.75 0 01.75-.75h1.5a.75.75 0 01.75.75v1.5a.75.75 0 01-1.5 0V1.5h-.75A.75.75 0 0111 .75zM4.992.662a.75.75 0 01-.636.848c-.436.063-.783.41-.846.846a.75.75 0 01-1.485-.212A2.501 2.501 0 014.144.025a.75.75 0 01.848.637zM2.75 4a.75.75 0 01.75.75v1.5a.75.75 0 01-1.5 0v-1.5A.75.75 0 012.75 4zm10.5 0a.75.75 0 01.75.75v1.5a.75.75 0 01-1.5 0v-1.5a.75.75 0 01.75-.75zM2.75 8a.75.75 0 01.75.75v.268A1.72 1.72 0 013.75 9h.5a.75.75 0 010 1.5h-.5a.25.25 0 00-.25.25v.75c0 .28.114.532.3.714a.75.75 0 01-1.05 1.072A2.495 2.495 0 012 11.5V8.75A.75.75 0 012.75 8zm10.5 0a.75.75 0 01.75.75v4.5a.75.75 0 01-.75.75h-2.5a.75.75 0 010-1.5h1.75v-2h-.75a.75.75 0 010-1.5h.75v-.25a.75.75 0 01.75-.75zM6 9.75A.75.75 0 016.75 9h2.5a.75.75 0 010 1.5h-2.5A.75.75 0 016 9.75zm-1 2.5v3.25a.25.25 0 00.4.2l1.45-1.087a.25.25 0 01.3 0L8.6 15.7a.25.25 0 00.4-.2v-3.25a.25.25 0 00-.25-.25h-3.5a.25.25 0 00-.25.25z',
-  fr: 'evenodd',
-}
-
-export const report: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M1.75 1.5a.25.25 0 00-.25.25v9.5c0 .138.112.25.25.25h2a.75.75 0 01.75.75v2.19l2.72-2.72a.75.75 0 01.53-.22h6.5a.25.25 0 00.25-.25v-9.5a.25.25 0 00-.25-.25H1.75zM0 1.75C0 .784.784 0 1.75 0h12.5C15.216 0 16 .784 16 1.75v9.5A1.75 1.75 0 0114.25 13H8.06l-2.573 2.573A1.457 1.457 0 013 14.543V13H1.75A1.75 1.75 0 010 11.25v-9.5zM9 9a1 1 0 11-2 0 1 1 0 012 0zm-.25-5.25a.75.75 0 00-1.5 0v2.5a.75.75 0 001.5 0v-2.5z',
-  fr: 'evenodd',
-}
-
-export const rocket: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M14.064 0a8.75 8.75 0 00-6.187 2.563l-.459.458c-.314.314-.616.641-.904.979H3.31a1.75 1.75 0 00-1.49.833L.11 7.607a.75.75 0 00.418 1.11l3.102.954c.037.051.079.1.124.145l2.429 2.428c.046.046.094.088.145.125l.954 3.102a.75.75 0 001.11.418l2.774-1.707a1.75 1.75 0 00.833-1.49V9.485c.338-.288.665-.59.979-.904l.458-.459A8.75 8.75 0 0016 1.936V1.75A1.75 1.75 0 0014.25 0h-.186zM10.5 10.625c-.088.06-.177.118-.266.175l-2.35 1.521.548 1.783 1.949-1.2a.25.25 0 00.119-.213v-2.066zM3.678 8.116L5.2 5.766c.058-.09.117-.178.176-.266H3.309a.25.25 0 00-.213.119l-1.2 1.95 1.782.547zm5.26-4.493A7.25 7.25 0 0114.063 1.5h.186a.25.25 0 01.25.25v.186a7.25 7.25 0 01-2.123 5.127l-.459.458a15.21 15.21 0 01-2.499 2.02l-2.317 1.5-2.143-2.143 1.5-2.317a15.25 15.25 0 012.02-2.5l.458-.458h.002zM12 5a1 1 0 11-2 0 1 1 0 012 0zm-8.44 9.56a1.5 1.5 0 10-2.12-2.12c-.734.73-1.047 2.332-1.15 3.003a.23.23 0 00.265.265c.671-.103 2.273-.416 3.005-1.148z',
-  fr: 'evenodd',
-}
-
-export const rss: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M2.002 2.725a.75.75 0 01.797-.699C8.79 2.42 13.58 7.21 13.974 13.201a.75.75 0 11-1.497.098 10.502 10.502 0 00-9.776-9.776.75.75 0 01-.7-.798zM2 13a1 1 0 112 0 1 1 0 01-2 0zm.84-5.95a.75.75 0 00-.179 1.489c2.509.3 4.5 2.291 4.8 4.8a.75.75 0 101.49-.178A7.003 7.003 0 002.838 7.05z',
-  fr: 'evenodd',
-}
-
-export const ruby: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M3.637 2.291A.75.75 0 014.23 2h7.54a.75.75 0 01.593.291l3.48 4.5a.75.75 0 01-.072.999l-7.25 7a.75.75 0 01-1.042 0l-7.25-7a.75.75 0 01-.072-.999l3.48-4.5zM4.598 3.5L1.754 7.177 8 13.207l6.246-6.03L11.402 3.5H4.598z',
-  fr: 'evenodd',
-}
-
-export const screenFull: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M2.75 2.5a.25.25 0 00-.25.25v2.5a.75.75 0 01-1.5 0v-2.5C1 1.784 1.784 1 2.75 1h2.5a.75.75 0 010 1.5h-2.5zM10 1.75a.75.75 0 01.75-.75h2.5c.966 0 1.75.784 1.75 1.75v2.5a.75.75 0 01-1.5 0v-2.5a.25.25 0 00-.25-.25h-2.5a.75.75 0 01-.75-.75zM1.75 10a.75.75 0 01.75.75v2.5c0 .138.112.25.25.25h2.5a.75.75 0 010 1.5h-2.5A1.75 1.75 0 011 13.25v-2.5a.75.75 0 01.75-.75zm12.5 0a.75.75 0 01.75.75v2.5A1.75 1.75 0 0113.25 15h-2.5a.75.75 0 010-1.5h2.5a.25.25 0 00.25-.25v-2.5a.75.75 0 01.75-.75z',
-  fr: 'evenodd',
-}
-
-export const screenNormal: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M5.25 1a.75.75 0 01.75.75v2.5A1.75 1.75 0 014.25 6h-2.5a.75.75 0 010-1.5h2.5a.25.25 0 00.25-.25v-2.5A.75.75 0 015.25 1zm5.5 0a.75.75 0 01.75.75v2.5c0 .138.112.25.25.25h2.5a.75.75 0 010 1.5h-2.5A1.75 1.75 0 0110 4.25v-2.5a.75.75 0 01.75-.75zM1 10.75a.75.75 0 01.75-.75h2.5c.966 0 1.75.784 1.75 1.75v2.5a.75.75 0 01-1.5 0v-2.5a.25.25 0 00-.25-.25h-2.5a.75.75 0 01-.75-.75zm9 1c0-.966.784-1.75 1.75-1.75h2.5a.75.75 0 010 1.5h-2.5a.25.25 0 00-.25.25v2.5a.75.75 0 01-1.5 0v-2.5z',
-  fr: 'evenodd',
-}
-
-export const search: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M11.5 7a4.499 4.499 0 11-8.998 0A4.499 4.499 0 0111.5 7zm-.82 4.74a6 6 0 111.06-1.06l3.04 3.04a.75.75 0 11-1.06 1.06l-3.04-3.04z',
-  fr: 'evenodd',
-}
-
-export const server: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M1.75 1A1.75 1.75 0 000 2.75v4c0 .372.116.717.314 1a1.742 1.742 0 00-.314 1v4c0 .966.784 1.75 1.75 1.75h12.5A1.75 1.75 0 0016 12.75v-4c0-.372-.116-.717-.314-1 .198-.283.314-.628.314-1v-4A1.75 1.75 0 0014.25 1H1.75zm0 7.5a.25.25 0 00-.25.25v4c0 .138.112.25.25.25h12.5a.25.25 0 00.25-.25v-4a.25.25 0 00-.25-.25H1.75zM1.5 2.75a.25.25 0 01.25-.25h12.5a.25.25 0 01.25.25v4a.25.25 0 01-.25.25H1.75a.25.25 0 01-.25-.25v-4zm5.5 2A.75.75 0 017.75 4h4.5a.75.75 0 010 1.5h-4.5A.75.75 0 017 4.75zM7.75 10a.75.75 0 000 1.5h4.5a.75.75 0 000-1.5h-4.5zM3 4.75A.75.75 0 013.75 4h.5a.75.75 0 010 1.5h-.5A.75.75 0 013 4.75zM3.75 10a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5z',
-  fr: 'evenodd',
-}
-
-export const settings: OcticonSymbolType = {
-  w: 24,
-  h: 24,
-  d: 'M11.31 2.525a9.648 9.648 0 011.38 0c.055.004.135.05.162.16l.351 1.45c.153.628.626 1.08 1.173 1.278.205.074.405.157.6.249a1.832 1.832 0 001.733-.074l1.275-.776c.097-.06.186-.036.228 0 .348.302.674.628.976.976.036.042.06.13 0 .228l-.776 1.274a1.832 1.832 0 00-.074 1.734c.092.195.175.395.248.6.198.547.652 1.02 1.278 1.172l1.45.353c.111.026.157.106.161.161a9.653 9.653 0 010 1.38c-.004.055-.05.135-.16.162l-1.45.351a1.833 1.833 0 00-1.278 1.173 6.926 6.926 0 01-.25.6 1.832 1.832 0 00.075 1.733l.776 1.275c.06.097.036.186 0 .228a9.555 9.555 0 01-.976.976c-.042.036-.13.06-.228 0l-1.275-.776a1.832 1.832 0 00-1.733-.074 6.926 6.926 0 01-.6.248 1.833 1.833 0 00-1.172 1.278l-.353 1.45c-.026.111-.106.157-.161.161a9.653 9.653 0 01-1.38 0c-.055-.004-.135-.05-.162-.16l-.351-1.45a1.833 1.833 0 00-1.173-1.278 6.928 6.928 0 01-.6-.25 1.832 1.832 0 00-1.734.075l-1.274.776c-.097.06-.186.036-.228 0a9.56 9.56 0 01-.976-.976c-.036-.042-.06-.13 0-.228l.776-1.275a1.832 1.832 0 00.074-1.733 6.948 6.948 0 01-.249-.6 1.833 1.833 0 00-1.277-1.172l-1.45-.353c-.111-.026-.157-.106-.161-.161a9.648 9.648 0 010-1.38c.004-.055.05-.135.16-.162l1.45-.351a1.833 1.833 0 001.278-1.173 6.95 6.95 0 01.249-.6 1.832 1.832 0 00-.074-1.734l-.776-1.274c-.06-.097-.036-.186 0-.228.302-.348.628-.674.976-.976.042-.036.13-.06.228 0l1.274.776a1.832 1.832 0 001.734.074 6.95 6.95 0 01.6-.249 1.833 1.833 0 001.172-1.277l.353-1.45c.026-.111.106-.157.161-.161zM12 1c-.268 0-.534.01-.797.028-.763.055-1.345.617-1.512 1.304l-.352 1.45c-.02.078-.09.172-.225.22a8.45 8.45 0 00-.728.303c-.13.06-.246.044-.315.002l-1.274-.776c-.604-.368-1.412-.354-1.99.147-.403.348-.78.726-1.129 1.128-.5.579-.515 1.387-.147 1.99l.776 1.275c.042.069.059.185-.002.315a8.45 8.45 0 00-.302.728c-.05.135-.143.206-.221.225l-1.45.352c-.687.167-1.249.749-1.304 1.512a11.149 11.149 0 000 1.594c.055.763.617 1.345 1.304 1.512l1.45.352c.078.02.172.09.22.225.09.248.191.491.303.729.06.129.044.245.002.314l-.776 1.274c-.368.604-.354 1.412.147 1.99.348.403.726.78 1.128 1.129.579.5 1.387.515 1.99.147l1.275-.776c.069-.042.185-.059.315.002.237.112.48.213.728.302.135.05.206.143.225.221l.352 1.45c.167.687.749 1.249 1.512 1.303a11.125 11.125 0 001.594 0c.763-.054 1.345-.616 1.512-1.303l.352-1.45c.02-.078.09-.172.225-.22.248-.09.491-.191.729-.303.129-.06.245-.044.314-.002l1.274.776c.604.368 1.412.354 1.99-.147.403-.348.78-.726 1.129-1.128.5-.579.515-1.387.147-1.99l-.776-1.275c-.042-.069-.059-.185.002-.315.112-.237.213-.48.302-.728.05-.135.143-.206.221-.225l1.45-.352c.687-.167 1.249-.749 1.303-1.512a11.125 11.125 0 000-1.594c-.054-.763-.616-1.345-1.303-1.512l-1.45-.352c-.078-.02-.172-.09-.22-.225a8.469 8.469 0 00-.303-.728c-.06-.13-.044-.246-.002-.315l.776-1.274c.368-.604.354-1.412-.147-1.99-.348-.403-.726-.78-1.128-1.129-.579-.5-1.387-.515-1.99-.147l-1.275.776c-.069.042-.185.059-.315-.002a8.465 8.465 0 00-.728-.302c-.135-.05-.206-.143-.225-.221l-.352-1.45c-.167-.687-.749-1.249-1.512-1.304A11.149 11.149 0 0012 1zm2.5 11a2.5 2.5 0 11-5 0 2.5 2.5 0 015 0zm1.5 0a4 4 0 11-8 0 4 4 0 018 0z',
-  fr: 'evenodd',
-}
-
-export const share: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M7.823.177L4.927 3.073a.25.25 0 00.177.427H7.25v5.75a.75.75 0 001.5 0V3.5h2.146a.25.25 0 00.177-.427L8.177.177a.25.25 0 00-.354 0zM3.75 6.5a.25.25 0 00-.25.25v6.5c0 .138.112.25.25.25h8.5a.25.25 0 00.25-.25v-6.5a.25.25 0 00-.25-.25h-1a.75.75 0 010-1.5h1c.966 0 1.75.784 1.75 1.75v6.5A1.75 1.75 0 0112.25 15h-8.5A1.75 1.75 0 012 13.25v-6.5C2 5.784 2.784 5 3.75 5h1a.75.75 0 110 1.5h-1z',
-  fr: 'evenodd',
-}
-
-export const shareAndroid: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M13.5 3a1.5 1.5 0 11-3 0 1.5 1.5 0 013 0zM15 3a3 3 0 01-5.175 2.066l-3.92 2.179a3.005 3.005 0 010 1.51l3.92 2.179a3 3 0 11-.73 1.31l-3.92-2.178a3 3 0 110-4.133l3.92-2.178A3 3 0 1115 3zm-1.5 10a1.5 1.5 0 11-3 0 1.5 1.5 0 013 0zm-9-5a1.5 1.5 0 11-3 0 1.5 1.5 0 013 0z',
-  fr: 'evenodd',
-}
-
-export const shield: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M7.467.133a1.75 1.75 0 011.066 0l5.25 1.68A1.75 1.75 0 0115 3.48V7c0 1.566-.32 3.182-1.303 4.682-.983 1.498-2.585 2.813-5.032 3.855a1.7 1.7 0 01-1.33 0c-2.447-1.042-4.049-2.357-5.032-3.855C1.32 10.182 1 8.566 1 7V3.48a1.75 1.75 0 011.217-1.667l5.25-1.68zm.61 1.429a.25.25 0 00-.153 0l-5.25 1.68a.25.25 0 00-.174.238V7c0 1.358.275 2.666 1.057 3.86.784 1.194 2.121 2.34 4.366 3.297a.2.2 0 00.154 0c2.245-.956 3.582-2.104 4.366-3.298C13.225 9.666 13.5 8.36 13.5 7V3.48a.25.25 0 00-.174-.237l-5.25-1.68zM9 10.5a1 1 0 11-2 0 1 1 0 012 0zm-.25-5.75a.75.75 0 10-1.5 0v3a.75.75 0 001.5 0v-3z',
-  fr: 'evenodd',
-}
-
-export const shieldCheck: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M8.533.133a1.75 1.75 0 00-1.066 0l-5.25 1.68A1.75 1.75 0 001 3.48V7c0 1.566.32 3.182 1.303 4.682.983 1.498 2.585 2.813 5.032 3.855a1.7 1.7 0 001.33 0c2.447-1.042 4.049-2.357 5.032-3.855C14.68 10.182 15 8.566 15 7V3.48a1.75 1.75 0 00-1.217-1.667L8.533.133zm-.61 1.429a.25.25 0 01.153 0l5.25 1.68a.25.25 0 01.174.238V7c0 1.358-.275 2.666-1.057 3.86-.784 1.194-2.121 2.34-4.366 3.297a.2.2 0 01-.154 0c-2.245-.956-3.582-2.104-4.366-3.298C2.775 9.666 2.5 8.36 2.5 7V3.48a.25.25 0 01.174-.237l5.25-1.68zM11.28 6.28a.75.75 0 00-1.06-1.06L7.25 8.19l-.97-.97a.75.75 0 10-1.06 1.06l1.5 1.5a.75.75 0 001.06 0l3.5-3.5z',
-  fr: 'evenodd',
-}
-
-export const shieldLock: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M8.533.133a1.75 1.75 0 00-1.066 0l-5.25 1.68A1.75 1.75 0 001 3.48V7c0 1.566.32 3.182 1.303 4.682.983 1.498 2.585 2.813 5.032 3.855a1.7 1.7 0 001.33 0c2.447-1.042 4.049-2.357 5.032-3.855C14.68 10.182 15 8.566 15 7V3.48a1.75 1.75 0 00-1.217-1.667L8.533.133zm-.61 1.429a.25.25 0 01.153 0l5.25 1.68a.25.25 0 01.174.238V7c0 1.358-.275 2.666-1.057 3.86-.784 1.194-2.121 2.34-4.366 3.297a.2.2 0 01-.154 0c-2.245-.956-3.582-2.104-4.366-3.298C2.775 9.666 2.5 8.36 2.5 7V3.48a.25.25 0 01.174-.237l5.25-1.68zM9.5 6.5a1.5 1.5 0 01-.75 1.3v2.45a.75.75 0 01-1.5 0V7.8A1.5 1.5 0 119.5 6.5z',
-  fr: 'evenodd',
-}
-
-export const shieldX: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M8.533.133a1.75 1.75 0 00-1.066 0l-5.25 1.68A1.75 1.75 0 001 3.48V7c0 1.566.32 3.182 1.303 4.682.983 1.498 2.585 2.813 5.032 3.855a1.7 1.7 0 001.33 0c2.447-1.042 4.049-2.357 5.032-3.855C14.68 10.182 15 8.566 15 7V3.48a1.75 1.75 0 00-1.217-1.667L8.533.133zm-.61 1.429a.25.25 0 01.153 0l5.25 1.68a.25.25 0 01.174.238V7c0 1.358-.275 2.666-1.057 3.86-.784 1.194-2.121 2.34-4.366 3.297a.2.2 0 01-.154 0c-2.245-.956-3.582-2.104-4.366-3.298C2.775 9.666 2.5 8.36 2.5 7V3.48a.25.25 0 01.174-.237l5.25-1.68zM6.78 5.22a.75.75 0 10-1.06 1.06L6.94 7.5 5.72 8.72a.75.75 0 001.06 1.06L8 8.56l1.22 1.22a.75.75 0 101.06-1.06L9.06 7.5l1.22-1.22a.75.75 0 10-1.06-1.06L8 6.44 6.78 5.22z',
-  fr: 'evenodd',
-}
-
-export const signIn: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M2 2.75C2 1.784 2.784 1 3.75 1h2.5a.75.75 0 010 1.5h-2.5a.25.25 0 00-.25.25v10.5c0 .138.112.25.25.25h2.5a.75.75 0 010 1.5h-2.5A1.75 1.75 0 012 13.25V2.75zm6.56 4.5l1.97-1.97a.75.75 0 10-1.06-1.06L6.22 7.47a.75.75 0 000 1.06l3.25 3.25a.75.75 0 101.06-1.06L8.56 8.75h5.69a.75.75 0 000-1.5H8.56z',
-  fr: 'evenodd',
-}
-
-export const signOut: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M2 2.75C2 1.784 2.784 1 3.75 1h2.5a.75.75 0 010 1.5h-2.5a.25.25 0 00-.25.25v10.5c0 .138.112.25.25.25h2.5a.75.75 0 010 1.5h-2.5A1.75 1.75 0 012 13.25V2.75zm10.44 4.5H6.75a.75.75 0 000 1.5h5.69l-1.97 1.97a.75.75 0 101.06 1.06l3.25-3.25a.75.75 0 000-1.06l-3.25-3.25a.75.75 0 10-1.06 1.06l1.97 1.97z',
-  fr: 'evenodd',
-}
-
-export const skip: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M1.5 8a6.5 6.5 0 1113 0 6.5 6.5 0 01-13 0zM8 0a8 8 0 100 16A8 8 0 008 0zm3.28 5.78a.75.75 0 00-1.06-1.06l-5.5 5.5a.75.75 0 101.06 1.06l5.5-5.5z',
-  fr: 'evenodd',
-}
-
-export const smiley: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M1.5 8a6.5 6.5 0 1113 0 6.5 6.5 0 01-13 0zM8 0a8 8 0 100 16A8 8 0 008 0zM5 8a1 1 0 100-2 1 1 0 000 2zm7-1a1 1 0 11-2 0 1 1 0 012 0zM5.32 9.636a.75.75 0 011.038.175l.007.009c.103.118.22.222.35.31.264.178.683.37 1.285.37.602 0 1.02-.192 1.285-.371.13-.088.247-.192.35-.31l.007-.008a.75.75 0 111.222.87l-.614-.431c.614.43.614.431.613.431v.001l-.001.002-.002.003-.005.007-.014.019a1.984 1.984 0 01-.184.213c-.16.166-.338.316-.53.445-.63.418-1.37.638-2.127.629-.946 0-1.652-.308-2.126-.63a3.32 3.32 0 01-.715-.657l-.014-.02-.005-.006-.002-.003v-.002h-.001l.613-.432-.614.43a.75.75 0 01.183-1.044h.001z',
-  fr: 'evenodd',
-}
-
-export const square: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M4 5.75C4 4.784 4.784 4 5.75 4h4.5c.966 0 1.75.784 1.75 1.75v4.5A1.75 1.75 0 0110.25 12h-4.5A1.75 1.75 0 014 10.25v-4.5zm1.75-.25a.25.25 0 00-.25.25v4.5c0 .138.112.25.25.25h4.5a.25.25 0 00.25-.25v-4.5a.25.25 0 00-.25-.25h-4.5z',
-  fr: 'evenodd',
-}
-
-export const squareFill: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M5.75 4A1.75 1.75 0 004 5.75v4.5c0 .966.784 1.75 1.75 1.75h4.5A1.75 1.75 0 0012 10.25v-4.5A1.75 1.75 0 0010.25 4h-4.5z',
-  fr: 'evenodd',
-}
-
-export const squirrel: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M3.499.75a.75.75 0 011.5 0v.996C5.9 2.903 6.793 3.65 7.662 4.376l.24.202c-.036-.694.055-1.422.426-2.163C9.1.873 10.794-.045 12.622.26 14.408.558 16 1.94 16 4.25c0 1.278-.954 2.575-2.44 2.734l.146.508.065.22c.203.701.412 1.455.476 2.226.142 1.707-.4 3.03-1.487 3.898C11.714 14.671 10.27 15 8.75 15h-6a.75.75 0 010-1.5h1.376a4.489 4.489 0 01-.563-1.191 3.833 3.833 0 01-.05-2.063 4.636 4.636 0 01-2.025-.293.75.75 0 11.525-1.406c1.357.507 2.376-.006 2.698-.318l.009-.01a.748.748 0 011.06 0 .75.75 0 01-.012 1.074c-.912.92-.992 1.835-.768 2.586.221.74.745 1.337 1.196 1.621H8.75c1.343 0 2.398-.296 3.074-.836.635-.507 1.036-1.31.928-2.602-.05-.603-.216-1.224-.422-1.93l-.064-.221c-.12-.407-.246-.84-.353-1.29a2.404 2.404 0 01-.507-.441 3.063 3.063 0 01-.633-1.248.75.75 0 011.455-.364c.046.185.144.436.31.627.146.168.353.305.712.305.738 0 1.25-.615 1.25-1.25 0-1.47-.95-2.315-2.123-2.51-1.172-.196-2.227.387-2.706 1.345-.46.92-.27 1.774.019 3.062l.042.19a.753.753 0 01.01.05c.348.443.666.949.94 1.553a.75.75 0 11-1.365.62c-.553-1.217-1.32-1.94-2.3-2.768a85.08 85.08 0 00-.317-.265c-.814-.68-1.75-1.462-2.692-2.619a3.74 3.74 0 00-1.023.88c-.406.495-.663 1.036-.722 1.508.116.122.306.21.591.239.388.038.797-.06 1.032-.19a.75.75 0 01.728 1.31c-.515.287-1.23.439-1.906.373-.682-.067-1.473-.38-1.879-1.193L.75 5.677V5.5c0-.984.48-1.94 1.077-2.664.46-.559 1.05-1.055 1.673-1.353V.75z',
-  fr: 'evenodd',
-}
-
-export const star: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M8 .25a.75.75 0 01.673.418l1.882 3.815 4.21.612a.75.75 0 01.416 1.279l-3.046 2.97.719 4.192a.75.75 0 01-1.088.791L8 12.347l-3.766 1.98a.75.75 0 01-1.088-.79l.72-4.194L.818 6.374a.75.75 0 01.416-1.28l4.21-.611L7.327.668A.75.75 0 018 .25zm0 2.445L6.615 5.5a.75.75 0 01-.564.41l-3.097.45 2.24 2.184a.75.75 0 01.216.664l-.528 3.084 2.769-1.456a.75.75 0 01.698 0l2.77 1.456-.53-3.084a.75.75 0 01.216-.664l2.24-2.183-3.096-.45a.75.75 0 01-.564-.41L8 2.694v.001z',
-  fr: 'evenodd',
-}
-
-export const starFill: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M8 .25a.75.75 0 01.673.418l1.882 3.815 4.21.612a.75.75 0 01.416 1.279l-3.046 2.97.719 4.192a.75.75 0 01-1.088.791L8 12.347l-3.766 1.98a.75.75 0 01-1.088-.79l.72-4.194L.818 6.374a.75.75 0 01.416-1.28l4.21-.611L7.327.668A.75.75 0 018 .25z',
-  fr: 'evenodd',
-}
-
-export const stop: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M4.47.22A.75.75 0 015 0h6a.75.75 0 01.53.22l4.25 4.25c.141.14.22.331.22.53v6a.75.75 0 01-.22.53l-4.25 4.25A.75.75 0 0111 16H5a.75.75 0 01-.53-.22L.22 11.53A.75.75 0 010 11V5a.75.75 0 01.22-.53L4.47.22zm.84 1.28L1.5 5.31v5.38l3.81 3.81h5.38l3.81-3.81V5.31L10.69 1.5H5.31zM8 4a.75.75 0 01.75.75v3.5a.75.75 0 01-1.5 0v-3.5A.75.75 0 018 4zm0 8a1 1 0 100-2 1 1 0 000 2z',
-  fr: 'evenodd',
-}
-
-export const stopwatch: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M5.75.75A.75.75 0 016.5 0h3a.75.75 0 010 1.5h-.75v1l-.001.041a6.718 6.718 0 013.464 1.435l.007-.006.75-.75a.75.75 0 111.06 1.06l-.75.75-.006.007a6.75 6.75 0 11-10.548 0L2.72 5.03l-.75-.75a.75.75 0 011.06-1.06l.75.75.007.006A6.718 6.718 0 017.25 2.541a.756.756 0 010-.041v-1H6.5a.75.75 0 01-.75-.75zM8 14.5A5.25 5.25 0 108 4a5.25 5.25 0 000 10.5zm.389-6.7l1.33-1.33a.75.75 0 111.061 1.06L9.45 8.861A1.502 1.502 0 018 10.75a1.5 1.5 0 11.389-2.95z',
-  fr: 'evenodd',
-}
-
-export const sun: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M8 10.5a2.5 2.5 0 100-5 2.5 2.5 0 000 5zM8 12a4 4 0 100-8 4 4 0 000 8zM8 0a.75.75 0 01.75.75v1.5a.75.75 0 01-1.5 0V.75A.75.75 0 018 0zm0 13a.75.75 0 01.75.75v1.5a.75.75 0 01-1.5 0v-1.5A.75.75 0 018 13zM2.343 2.343a.75.75 0 011.061 0l1.06 1.061a.75.75 0 01-1.06 1.06l-1.06-1.06a.75.75 0 010-1.06zm9.193 9.193a.75.75 0 011.06 0l1.061 1.06a.75.75 0 01-1.06 1.061l-1.061-1.06a.75.75 0 010-1.061zM16 8a.75.75 0 01-.75.75h-1.5a.75.75 0 010-1.5h1.5A.75.75 0 0116 8zM3 8a.75.75 0 01-.75.75H.75a.75.75 0 010-1.5h1.5A.75.75 0 013 8zm10.657-5.657a.75.75 0 010 1.061l-1.061 1.06a.75.75 0 11-1.06-1.06l1.06-1.06a.75.75 0 011.06 0zm-9.193 9.193a.75.75 0 010 1.06l-1.06 1.061a.75.75 0 11-1.061-1.06l1.06-1.061a.75.75 0 011.061 0z',
-  fr: 'evenodd',
-}
-
-export const sync: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M8 2.5a5.487 5.487 0 00-4.131 1.869l1.204 1.204A.25.25 0 014.896 6H1.25A.25.25 0 011 5.75V2.104a.25.25 0 01.427-.177l1.38 1.38A7.001 7.001 0 0114.95 7.16a.75.75 0 11-1.49.178A5.501 5.501 0 008 2.5zM1.705 8.005a.75.75 0 01.834.656 5.501 5.501 0 009.592 2.97l-1.204-1.204a.25.25 0 01.177-.427h3.646a.25.25 0 01.25.25v3.646a.25.25 0 01-.427.177l-1.38-1.38A7.001 7.001 0 011.05 8.84a.75.75 0 01.656-.834z',
-  fr: 'evenodd',
-}
-
-export const tab: OcticonSymbolType = {
-  w: 24,
-  h: 24,
-  d: 'M22 4.25a.75.75 0 00-1.5 0v15a.75.75 0 001.5 0v-15zm-9.72 14.28a.75.75 0 11-1.06-1.06l4.97-4.97H1.75a.75.75 0 010-1.5h14.44l-4.97-4.97a.75.75 0 011.06-1.06l6.25 6.25a.75.75 0 010 1.06l-6.25 6.25z',
-  fr: undefined,
-}
-
-export const tag: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M2.5 7.775V2.75a.25.25 0 01.25-.25h5.025a.25.25 0 01.177.073l6.25 6.25a.25.25 0 010 .354l-5.025 5.025a.25.25 0 01-.354 0l-6.25-6.25a.25.25 0 01-.073-.177zm-1.5 0V2.75C1 1.784 1.784 1 2.75 1h5.025c.464 0 .91.184 1.238.513l6.25 6.25a1.75 1.75 0 010 2.474l-5.026 5.026a1.75 1.75 0 01-2.474 0l-6.25-6.25A1.75 1.75 0 011 7.775zM6 5a1 1 0 100 2 1 1 0 000-2z',
-  fr: 'evenodd',
-}
-
-export const tasklist: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M2.5 2.75a.25.25 0 01.25-.25h10.5a.25.25 0 01.25.25v10.5a.25.25 0 01-.25.25H2.75a.25.25 0 01-.25-.25V2.75zM2.75 1A1.75 1.75 0 001 2.75v10.5c0 .966.784 1.75 1.75 1.75h10.5A1.75 1.75 0 0015 13.25V2.75A1.75 1.75 0 0013.25 1H2.75zm9.03 5.28a.75.75 0 00-1.06-1.06L6.75 9.19 5.28 7.72a.75.75 0 00-1.06 1.06l2 2a.75.75 0 001.06 0l4.5-4.5z',
-  fr: 'evenodd',
-}
-
-export const telescope: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M14.184 1.143a1.75 1.75 0 00-2.502-.57L.912 7.916a1.75 1.75 0 00-.53 2.32l.447.775a1.75 1.75 0 002.275.702l11.745-5.656a1.75 1.75 0 00.757-2.451l-1.422-2.464zm-1.657.669a.25.25 0 01.358.081l1.422 2.464a.25.25 0 01-.108.35l-2.016.97-1.505-2.605 1.85-1.26zM9.436 3.92l1.391 2.41-5.42 2.61-.942-1.63 4.97-3.39zM3.222 8.157l-1.466 1a.25.25 0 00-.075.33l.447.775a.25.25 0 00.325.1l1.598-.769-.83-1.436zm6.253 2.306a.75.75 0 00-.944-.252l-1.809.87a.75.75 0 00-.293.253L4.38 14.326a.75.75 0 101.238.848l1.881-2.75v2.826a.75.75 0 001.5 0v-2.826l1.881 2.75a.75.75 0 001.238-.848l-2.644-3.863z',
-  fr: 'evenodd',
-}
-
-export const terminal: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M0 2.75C0 1.784.784 1 1.75 1h12.5c.966 0 1.75.784 1.75 1.75v10.5A1.75 1.75 0 0114.25 15H1.75A1.75 1.75 0 010 13.25V2.75zm1.75-.25a.25.25 0 00-.25.25v10.5c0 .138.112.25.25.25h12.5a.25.25 0 00.25-.25V2.75a.25.25 0 00-.25-.25H1.75zM7.25 8a.75.75 0 01-.22.53l-2.25 2.25a.75.75 0 11-1.06-1.06L5.44 8 3.72 6.28a.75.75 0 111.06-1.06l2.25 2.25c.141.14.22.331.22.53zm1.5 1.5a.75.75 0 000 1.5h3a.75.75 0 000-1.5h-3z',
-  fr: 'evenodd',
-}
-
-export const threeBars: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M1 2.75A.75.75 0 011.75 2h12.5a.75.75 0 110 1.5H1.75A.75.75 0 011 2.75zm0 5A.75.75 0 011.75 7h12.5a.75.75 0 110 1.5H1.75A.75.75 0 011 7.75zM1.75 12a.75.75 0 100 1.5h12.5a.75.75 0 100-1.5H1.75z',
-  fr: 'evenodd',
-}
-
-export const thumbsdown: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M7.083 15.986c1.34.153 2.334-.982 2.334-2.183v-.5c0-1.329.646-2.123 1.317-2.614.329-.24.66-.403.919-.508a1.75 1.75 0 001.514.872h1a1.75 1.75 0 001.75-1.75v-7.5a1.75 1.75 0 00-1.75-1.75h-1a1.75 1.75 0 00-1.662 1.2c-.525-.074-1.068-.228-1.726-.415L9.305.705C8.151.385 6.765.053 4.917.053c-1.706 0-2.97.152-3.722 1.139-.353.463-.537 1.042-.669 1.672C.41 3.424.32 4.108.214 4.897l-.04.306c-.25 1.869-.266 3.318.188 4.316.244.537.622.943 1.136 1.2.495.248 1.066.334 1.669.334h1.422l-.015.112c-.07.518-.157 1.17-.157 1.638 0 .921.151 1.718.655 2.299.512.589 1.248.797 2.011.884zm4.334-13.232c-.706-.089-1.39-.284-2.072-.479a63.914 63.914 0 00-.441-.125c-1.096-.304-2.335-.597-3.987-.597-1.794 0-2.28.222-2.529.548-.147.193-.275.505-.393 1.07-.105.502-.188 1.124-.295 1.93l-.04.3c-.25 1.882-.19 2.933.067 3.497a.921.921 0 00.443.48c.208.104.52.175.997.175h1.75c.685 0 1.295.577 1.205 1.335-.022.192-.049.39-.075.586-.066.488-.13.97-.13 1.329 0 .808.144 1.15.288 1.316.137.157.401.303 1.048.377.307.035.664-.237.664-.693v-.5c0-1.922.978-3.127 1.932-3.825a5.862 5.862 0 011.568-.809V2.754zm1.75 6.798a.25.25 0 01-.25-.25v-7.5a.25.25 0 01.25-.25h1a.25.25 0 01.25.25v7.5a.25.25 0 01-.25.25h-1z',
-  fr: 'evenodd',
-}
-
-export const thumbsup: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M8.834.066C7.494-.087 6.5 1.048 6.5 2.25v.5c0 1.329-.647 2.124-1.318 2.614-.328.24-.66.403-.918.508A1.75 1.75 0 002.75 5h-1A1.75 1.75 0 000 6.75v7.5C0 15.216.784 16 1.75 16h1a1.75 1.75 0 001.662-1.201c.525.075 1.067.229 1.725.415.152.043.31.088.475.133 1.154.32 2.54.653 4.388.653 1.706 0 2.97-.153 3.722-1.14.353-.463.537-1.042.668-1.672.118-.56.208-1.243.313-2.033l.04-.306c.25-1.869.265-3.318-.188-4.316a2.418 2.418 0 00-1.137-1.2C13.924 5.085 13.353 5 12.75 5h-1.422l.015-.113c.07-.518.157-1.17.157-1.637 0-.922-.151-1.719-.656-2.3-.51-.589-1.247-.797-2.01-.884zM4.5 13.3c.705.088 1.39.284 2.072.478l.441.125c1.096.305 2.334.598 3.987.598 1.794 0 2.28-.223 2.528-.549.147-.193.276-.505.394-1.07.105-.502.188-1.124.295-1.93l.04-.3c.25-1.882.189-2.933-.068-3.497a.922.922 0 00-.442-.48c-.208-.104-.52-.174-.997-.174H11c-.686 0-1.295-.577-1.206-1.336.023-.192.05-.39.076-.586.065-.488.13-.97.13-1.328 0-.809-.144-1.15-.288-1.316-.137-.158-.402-.304-1.048-.378C8.357 1.521 8 1.793 8 2.25v.5c0 1.922-.978 3.128-1.933 3.825a5.861 5.861 0 01-1.567.81V13.3zM2.75 6.5a.25.25 0 01.25.25v7.5a.25.25 0 01-.25.25h-1a.25.25 0 01-.25-.25v-7.5a.25.25 0 01.25-.25h1z',
-  fr: 'evenodd',
-}
-
-export const tools: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M5.433 2.304A4.494 4.494 0 003.5 6c0 1.598.832 3.002 2.09 3.802.518.328.929.923.902 1.64v.008l-.164 3.337a.75.75 0 11-1.498-.073l.163-3.33c.002-.085-.05-.216-.207-.316A5.996 5.996 0 012 6a5.994 5.994 0 012.567-4.92 1.482 1.482 0 011.673-.04c.462.296.76.827.76 1.423v2.82c0 .082.041.16.11.206l.75.51a.25.25 0 00.28 0l.75-.51A.25.25 0 009 5.282V2.463c0-.596.298-1.127.76-1.423a1.482 1.482 0 011.673.04A5.994 5.994 0 0114 6a5.996 5.996 0 01-2.786 5.068c-.157.1-.209.23-.207.315l.163 3.33a.75.75 0 11-1.498.074l-.164-3.345c-.027-.717.384-1.312.902-1.64A4.496 4.496 0 0012.5 6a4.494 4.494 0 00-1.933-3.696c-.024.017-.067.067-.067.16v2.818a1.75 1.75 0 01-.767 1.448l-.75.51a1.75 1.75 0 01-1.966 0l-.75-.51A1.75 1.75 0 015.5 5.282V2.463c0-.092-.043-.142-.067-.159zm.01-.005z',
-  fr: 'evenodd',
-}
-
-export const trash: OcticonSymbolType = {
-  w: 24,
-  h: 24,
-  d: 'M16 1.75V3h5.25a.75.75 0 010 1.5H2.75a.75.75 0 010-1.5H8V1.75C8 .784 8.784 0 9.75 0h4.5C15.216 0 16 .784 16 1.75zm-6.5 0a.25.25 0 01.25-.25h4.5a.25.25 0 01.25.25V3h-5V1.75z',
-  fr: 'evenodd',
-}
-
-export const trashcan: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M6.5 1.75a.25.25 0 01.25-.25h2.5a.25.25 0 01.25.25V3h-3V1.75zm4.5 0V3h2.25a.75.75 0 010 1.5H2.75a.75.75 0 010-1.5H5V1.75C5 .784 5.784 0 6.75 0h2.5C10.216 0 11 .784 11 1.75zM4.496 6.675a.75.75 0 10-1.492.15l.66 6.6A1.75 1.75 0 005.405 15h5.19c.9 0 1.652-.681 1.741-1.576l.66-6.6a.75.75 0 00-1.492-.149l-.66 6.6a.25.25 0 01-.249.225h-5.19a.25.25 0 01-.249-.225l-.66-6.6z',
-  fr: 'evenodd',
-}
-
-export const triangleDown: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M4.427 6.427l3.396 3.396a.25.25 0 00.354 0l3.396-3.396A.25.25 0 0011.396 6H4.604a.25.25 0 00-.177.427z',
-  fr: undefined,
-}
-
-export const triangleLeft: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M9.573 4.427L6.177 7.823a.25.25 0 000 .354l3.396 3.396a.25.25 0 00.427-.177V4.604a.25.25 0 00-.427-.177z',
-  fr: undefined,
-}
-
-export const triangleRight: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M6.427 4.427l3.396 3.396a.25.25 0 010 .354l-3.396 3.396A.25.25 0 016 11.396V4.604a.25.25 0 01.427-.177z',
-  fr: undefined,
-}
-
-export const triangleUp: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M4.427 9.573l3.396-3.396a.25.25 0 01.354 0l3.396 3.396a.25.25 0 01-.177.427H4.604a.25.25 0 01-.177-.427z',
-  fr: undefined,
-}
-
-export const typography: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M6.21 8.5L4.574 3.594 2.857 8.5H6.21zm.5 1.5l.829 2.487a.75.75 0 001.423-.474L5.735 2.332a1.216 1.216 0 00-2.302-.018l-3.39 9.688a.75.75 0 001.415.496L2.332 10H6.71zm3.13-4.358C10.53 4.374 11.87 4 13 4c1.5 0 3 .939 3 2.601v5.649a.75.75 0 01-1.448.275C13.995 12.82 13.3 13 12.5 13c-.77 0-1.514-.231-2.078-.709-.577-.488-.922-1.199-.922-2.041 0-.694.265-1.411.887-1.944C11 7.78 11.88 7.5 13 7.5h1.5v-.899c0-.54-.5-1.101-1.5-1.101-.869 0-1.528.282-1.84.858a.75.75 0 11-1.32-.716zM14.5 9H13c-.881 0-1.375.22-1.637.444-.253.217-.363.5-.363.806 0 .408.155.697.39.896.249.21.63.354 1.11.354.732 0 1.26-.209 1.588-.449.35-.257.412-.495.412-.551V9z',
-  fr: 'evenodd',
-}
-
-export const unfold: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M8.177.677l2.896 2.896a.25.25 0 01-.177.427H8.75v1.25a.75.75 0 01-1.5 0V4H5.104a.25.25 0 01-.177-.427L7.823.677a.25.25 0 01.354 0zM7.25 10.75a.75.75 0 011.5 0V12h2.146a.25.25 0 01.177.427l-2.896 2.896a.25.25 0 01-.354 0l-2.896-2.896A.25.25 0 015.104 12H7.25v-1.25zm-5-2a.75.75 0 000-1.5h-.5a.75.75 0 000 1.5h.5zM6 8a.75.75 0 01-.75.75h-.5a.75.75 0 010-1.5h.5A.75.75 0 016 8zm2.25.75a.75.75 0 000-1.5h-.5a.75.75 0 000 1.5h.5zM12 8a.75.75 0 01-.75.75h-.5a.75.75 0 010-1.5h.5A.75.75 0 0112 8zm2.25.75a.75.75 0 000-1.5h-.5a.75.75 0 000 1.5h.5z',
-  fr: 'evenodd',
-}
-
-export const unlock: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M5.5 4a2.5 2.5 0 014.607-1.346.75.75 0 101.264-.808A4 4 0 004 4v2h-.501A1.5 1.5 0 002 7.5v6A1.5 1.5 0 003.5 15h9a1.5 1.5 0 001.5-1.5v-6A1.5 1.5 0 0012.5 6h-7V4zm-.75 3.5H3.5v6h9v-6H4.75z',
-  fr: 'evenodd',
-}
-
-export const unmute: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M7.563 2.069A.75.75 0 018 2.75v10.5a.75.75 0 01-1.238.57L3.472 11H1.75A1.75 1.75 0 010 9.25v-2.5C0 5.784.784 5 1.75 5h1.723l3.289-2.82a.75.75 0 01.801-.111zM6.5 4.38L4.238 6.319a.75.75 0 01-.488.181h-2a.25.25 0 00-.25.25v2.5c0 .138.112.25.25.25h2a.75.75 0 01.488.18L6.5 11.62V4.38zm6.096-2.038a.75.75 0 011.06 0 8 8 0 010 11.314.75.75 0 01-1.06-1.06 6.5 6.5 0 000-9.193.75.75 0 010-1.06v-.001zm-1.06 2.121a.75.75 0 10-1.061 1.061 3.5 3.5 0 010 4.95.75.75 0 101.06 1.06 5 5 0 000-7.07l.001-.001z',
-  fr: 'evenodd',
-}
-
-export const unverifed: OcticonSymbolType = {
-  w: 24,
-  h: 24,
-  d: 'M13 16.5a1 1 0 11-2 0 1 1 0 012 0zm-2.517-7.665c.112-.223.268-.424.488-.57C11.186 8.12 11.506 8 12 8c.384 0 .766.118 1.034.319a.953.953 0 01.403.806c0 .48-.218.81-.62 1.186a9.293 9.293 0 01-.409.354 19.8 19.8 0 00-.294.249c-.246.213-.524.474-.738.795l-.126.19V13.5a.75.75 0 001.5 0v-1.12c.09-.1.203-.208.347-.333.063-.055.14-.119.222-.187.166-.14.358-.3.52-.452.536-.5 1.098-1.2 1.098-2.283a2.45 2.45 0 00-1.003-2.006C13.37 6.695 12.658 6.5 12 6.5c-.756 0-1.373.191-1.861.517a2.944 2.944 0 00-.997 1.148.75.75 0 001.341.67z',
-  fr: undefined,
-}
-
-export const unverified: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M6.415.52a2.678 2.678 0 013.17 0l.928.68c.153.113.33.186.518.215l1.138.175a2.678 2.678 0 012.241 2.24l.175 1.138c.029.187.102.365.215.518l.68.928a2.678 2.678 0 010 3.17l-.68.928a1.179 1.179 0 00-.215.518l-.175 1.138a2.678 2.678 0 01-2.241 2.241l-1.138.175a1.179 1.179 0 00-.518.215l-.928.68a2.678 2.678 0 01-3.17 0l-.928-.68a1.179 1.179 0 00-.518-.215L3.83 14.41a2.678 2.678 0 01-2.24-2.24l-.175-1.138a1.179 1.179 0 00-.215-.518l-.68-.928a2.678 2.678 0 010-3.17l.68-.928a1.17 1.17 0 00.215-.518l.175-1.14a2.678 2.678 0 012.24-2.24l1.138-.175c.187-.029.365-.102.518-.215l.928-.68zm2.282 1.209a1.178 1.178 0 00-1.394 0l-.928.68a2.678 2.678 0 01-1.18.489l-1.136.174a1.178 1.178 0 00-.987.987l-.174 1.137a2.678 2.678 0 01-.489 1.18l-.68.927c-.305.415-.305.98 0 1.394l.68.928c.256.348.423.752.489 1.18l.174 1.136c.078.51.478.909.987.987l1.137.174c.427.066.831.233 1.18.489l.927.68c.415.305.98.305 1.394 0l.928-.68a2.678 2.678 0 011.18-.489l1.136-.174c.51-.078.909-.478.987-.987l.174-1.137c.066-.427.233-.831.489-1.18l.68-.927c.305-.415.305-.98 0-1.394l-.68-.928a2.678 2.678 0 01-.489-1.18l-.174-1.136a1.178 1.178 0 00-.987-.987l-1.137-.174a2.678 2.678 0 01-1.18-.489l-.927-.68zM9 11a1 1 0 11-2 0 1 1 0 012 0zM6.92 6.085c.081-.16.19-.299.34-.398.145-.097.371-.187.74-.187.28 0 .553.087.738.225A.613.613 0 019 6.25c0 .177-.04.264-.077.318a.956.956 0 01-.277.245c-.076.051-.158.1-.258.161l-.007.004c-.093.056-.204.122-.313.195a2.416 2.416 0 00-.692.661.75.75 0 001.248.832.956.956 0 01.276-.245 6.3 6.3 0 01.26-.16l.006-.004c.093-.057.204-.123.313-.195.222-.149.487-.355.692-.662.214-.32.329-.702.329-1.15 0-.76-.36-1.348-.862-1.725A2.76 2.76 0 008 4c-.631 0-1.154.16-1.572.438-.413.276-.68.638-.849.977a.75.75 0 001.342.67z',
-  fr: 'evenodd',
-}
-
-export const upload: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M8.53 1.22a.75.75 0 00-1.06 0L3.72 4.97a.75.75 0 001.06 1.06l2.47-2.47v6.69a.75.75 0 001.5 0V3.56l2.47 2.47a.75.75 0 101.06-1.06L8.53 1.22zM3.75 13a.75.75 0 000 1.5h8.5a.75.75 0 000-1.5h-8.5z',
-  fr: 'evenodd',
-}
-
-export const verified: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M9.585.52a2.678 2.678 0 00-3.17 0l-.928.68a1.178 1.178 0 01-.518.215L3.83 1.59a2.678 2.678 0 00-2.24 2.24l-.175 1.14a1.178 1.178 0 01-.215.518l-.68.928a2.678 2.678 0 000 3.17l.68.928c.113.153.186.33.215.518l.175 1.138a2.678 2.678 0 002.24 2.24l1.138.175c.187.029.365.102.518.215l.928.68a2.678 2.678 0 003.17 0l.928-.68a1.17 1.17 0 01.518-.215l1.138-.175a2.678 2.678 0 002.241-2.241l.175-1.138c.029-.187.102-.365.215-.518l.68-.928a2.678 2.678 0 000-3.17l-.68-.928a1.179 1.179 0 01-.215-.518L14.41 3.83a2.678 2.678 0 00-2.24-2.24l-1.138-.175a1.179 1.179 0 01-.518-.215L9.585.52zM7.303 1.728c.415-.305.98-.305 1.394 0l.928.68c.348.256.752.423 1.18.489l1.136.174c.51.078.909.478.987.987l.174 1.137c.066.427.233.831.489 1.18l.68.927c.305.415.305.98 0 1.394l-.68.928a2.678 2.678 0 00-.489 1.18l-.174 1.136a1.178 1.178 0 01-.987.987l-1.137.174a2.678 2.678 0 00-1.18.489l-.927.68c-.415.305-.98.305-1.394 0l-.928-.68a2.678 2.678 0 00-1.18-.489l-1.136-.174a1.178 1.178 0 01-.987-.987l-.174-1.137a2.678 2.678 0 00-.489-1.18l-.68-.927a1.178 1.178 0 010-1.394l.68-.928c.256-.348.423-.752.489-1.18l.174-1.136c.078-.51.478-.909.987-.987l1.137-.174a2.678 2.678 0 001.18-.489l.927-.68zM11.28 6.78a.75.75 0 00-1.06-1.06L7 8.94 5.78 7.72a.75.75 0 00-1.06 1.06l1.75 1.75a.75.75 0 001.06 0l3.75-3.75z',
-  fr: 'evenodd',
-}
-
-export const versions: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M7.75 14A1.75 1.75 0 016 12.25v-8.5C6 2.784 6.784 2 7.75 2h6.5c.966 0 1.75.784 1.75 1.75v8.5A1.75 1.75 0 0114.25 14h-6.5zm-.25-1.75c0 .138.112.25.25.25h6.5a.25.25 0 00.25-.25v-8.5a.25.25 0 00-.25-.25h-6.5a.25.25 0 00-.25.25v8.5zM4.9 3.508a.75.75 0 01-.274 1.025.25.25 0 00-.126.217v6.5a.25.25 0 00.126.217.75.75 0 01-.752 1.298A1.75 1.75 0 013 11.25v-6.5c0-.649.353-1.214.874-1.516a.75.75 0 011.025.274zM1.625 5.533a.75.75 0 10-.752-1.299A1.75 1.75 0 000 5.75v4.5c0 .649.353 1.214.874 1.515a.75.75 0 10.752-1.298.25.25 0 01-.126-.217v-4.5a.25.25 0 01.126-.217z',
-  fr: 'evenodd',
-}
+export type OcticonSymbolVariant = {
+  /** SVG path element data */
+  readonly p: string[]
 
-export const workflow: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M0 1.75C0 .784.784 0 1.75 0h3.5C6.216 0 7 .784 7 1.75v3.5A1.75 1.75 0 015.25 7H4v4a1 1 0 001 1h4v-1.25C9 9.784 9.784 9 10.75 9h3.5c.966 0 1.75.784 1.75 1.75v3.5A1.75 1.75 0 0114.25 16h-3.5A1.75 1.75 0 019 14.25v-.75H5A2.5 2.5 0 012.5 11V7h-.75A1.75 1.75 0 010 5.25v-3.5zm1.75-.25a.25.25 0 00-.25.25v3.5c0 .138.112.25.25.25h3.5a.25.25 0 00.25-.25v-3.5a.25.25 0 00-.25-.25h-3.5zm9 9a.25.25 0 00-.25.25v3.5c0 .138.112.25.25.25h3.5a.25.25 0 00.25-.25v-3.5a.25.25 0 00-.25-.25h-3.5z',
-  fr: 'evenodd',
-}
-
-export const x: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M3.72 3.72a.75.75 0 011.06 0L8 6.94l3.22-3.22a.75.75 0 111.06 1.06L9.06 8l3.22 3.22a.75.75 0 11-1.06 1.06L8 9.06l-3.22 3.22a.75.75 0 01-1.06-1.06L6.94 8 3.72 4.78a.75.75 0 010-1.06z',
-  fr: 'evenodd',
-}
-
-export const xCircle: OcticonSymbolType = {
-  w: 24,
-  h: 24,
-  d: 'M9.036 7.976a.75.75 0 00-1.06 1.06L10.939 12l-2.963 2.963a.75.75 0 101.06 1.06L12 13.06l2.963 2.964a.75.75 0 001.061-1.06L13.061 12l2.963-2.964a.75.75 0 10-1.06-1.06L12 10.939 9.036 7.976z',
-  fr: undefined,
-}
+  /** The width of the symbol */
+  readonly w: number
 
-export const xCircleFill: OcticonSymbolType = {
-  w: 24,
-  h: 24,
-  d: 'M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12zm8.036-4.024a.75.75 0 00-1.06 1.06L10.939 12l-2.963 2.963a.75.75 0 101.06 1.06L12 13.06l2.963 2.964a.75.75 0 001.061-1.06L13.061 12l2.963-2.964a.75.75 0 10-1.06-1.06L12 10.939 9.036 7.976z',
-  fr: 'evenodd',
+  /** The height of the symbol */
+  readonly h: number
 }
 
-export const zap: OcticonSymbolType = {
-  w: 16,
-  h: 16,
-  d: 'M10.561 1.5a.016.016 0 00-.01.004L3.286 8.571A.25.25 0 003.462 9H6.75a.75.75 0 01.694 1.034l-1.713 4.188 6.982-6.793A.25.25 0 0012.538 7H9.25a.75.75 0 01-.683-1.06l2.008-4.418.003-.006a.02.02 0 00-.004-.009.02.02 0 00-.006-.006L10.56 1.5zM9.504.43a1.516 1.516 0 012.437 1.713L10.415 5.5h2.123c1.57 0 2.346 1.909 1.22 3.004l-7.34 7.142a1.25 1.25 0 01-.871.354h-.302a1.25 1.25 0 01-1.157-1.723L5.633 10.5H3.462c-1.57 0-2.346-1.909-1.22-3.004L9.503.429z',
-  fr: 'evenodd',
+export type OcticonSymbolVariants = Record<PropertyKey, OcticonSymbolVariant>
+
+export type OcticonSymbol = OcticonSymbolVariant | OcticonSymbolVariants
+
+export const accessibility: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M9.923 5.302c.063.063.122.129.178.198H14A.75.75 0 0 1 14 7h-3.3l.578 5.163.362 2.997a.75.75 0 0 1-1.49.18L9.868 13H6.132l-.282 2.34a.75.75 0 0 1-1.49-.18l.362-2.997L5.3 7H2a.75.75 0 0 1 0-1.5h3.9a2.54 2.54 0 0 1 .176-.198 3 3 0 1 1 3.847 0ZM9.2 7.073h-.001a1.206 1.206 0 0 0-2.398 0L6.305 11.5h3.39ZM9.5 3a1.5 1.5 0 1 0-3.001.001A1.5 1.5 0 0 0 9.5 3Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const accessibilityInset: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0Zm2 4a2 2 0 1 0-2.95 1.76 1.87 1.87 0 0 0-.32.24H3.75a.75.75 0 0 0 0 1.5h2.363l-.607 5.67a.75.75 0 1 0 1.49.16l.25-2.33h1.508l.25 2.33a.75.75 0 0 0 1.492-.16L9.888 7.5h2.362a.75.75 0 0 0 0-1.5H9.27a1.98 1.98 0 0 0-.32-.24A2 2 0 0 0 10 4Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const alert: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M6.457 1.047c.659-1.234 2.427-1.234 3.086 0l6.082 11.378A1.75 1.75 0 0 1 14.082 15H1.918a1.75 1.75 0 0 1-1.543-2.575Zm1.763.707a.25.25 0 0 0-.44 0L1.698 13.132a.25.25 0 0 0 .22.368h12.164a.25.25 0 0 0 .22-.368Zm.53 3.996v2.5a.75.75 0 0 1-1.5 0v-2.5a.75.75 0 0 1 1.5 0ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M13 17.5a1 1 0 1 1-2 0 1 1 0 0 1 2 0Zm-.25-8.25a.75.75 0 0 0-1.5 0v4.5a.75.75 0 0 0 1.5 0v-4.5Z',
+      'M9.836 3.244c.963-1.665 3.365-1.665 4.328 0l8.967 15.504c.963 1.667-.24 3.752-2.165 3.752H3.034c-1.926 0-3.128-2.085-2.165-3.752Zm3.03.751a1.002 1.002 0 0 0-1.732 0L2.168 19.499A1.002 1.002 0 0 0 3.034 21h17.932a1.002 1.002 0 0 0 .866-1.5L12.866 3.994Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const alertFill: OcticonSymbolVariants = {
+  '12': {
+    p: [
+      'M4.855.708c.5-.896 1.79-.896 2.29 0l4.675 8.351a1.312 1.312 0 0 1-1.146 1.954H1.33A1.313 1.313 0 0 1 .183 9.058ZM7 7V3H5v4Zm-1 3a1 1 0 1 0 0-2 1 1 0 0 0 0 2Z',
+    ],
+    h: 12,
+    w: 12,
+  },
+  '16': {
+    p: [
+      'M6.457 1.047c.659-1.234 2.427-1.234 3.086 0l6.082 11.378A1.75 1.75 0 0 1 14.082 15H1.918a1.75 1.75 0 0 1-1.543-2.575ZM8 5a.75.75 0 0 0-.75.75v2.5a.75.75 0 0 0 1.5 0v-2.5A.75.75 0 0 0 8 5Zm1 6a1 1 0 1 0-2 0 1 1 0 0 0 2 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M9.836 3.244c.963-1.665 3.365-1.665 4.328 0l8.967 15.504c.963 1.667-.24 3.752-2.165 3.752H3.034c-1.926 0-3.128-2.085-2.165-3.752ZM12 8.5a.75.75 0 0 0-.75.75v4.5a.75.75 0 0 0 1.5 0v-4.5A.75.75 0 0 0 12 8.5Zm1 9a1 1 0 1 0-2 0 1 1 0 0 0 2 0Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const apps: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M1.5 3.25c0-.966.784-1.75 1.75-1.75h2.5c.966 0 1.75.784 1.75 1.75v2.5A1.75 1.75 0 0 1 5.75 7.5h-2.5A1.75 1.75 0 0 1 1.5 5.75Zm7 0c0-.966.784-1.75 1.75-1.75h2.5c.966 0 1.75.784 1.75 1.75v2.5a1.75 1.75 0 0 1-1.75 1.75h-2.5A1.75 1.75 0 0 1 8.5 5.75Zm-7 7c0-.966.784-1.75 1.75-1.75h2.5c.966 0 1.75.784 1.75 1.75v2.5a1.75 1.75 0 0 1-1.75 1.75h-2.5a1.75 1.75 0 0 1-1.75-1.75Zm7 0c0-.966.784-1.75 1.75-1.75h2.5c.966 0 1.75.784 1.75 1.75v2.5a1.75 1.75 0 0 1-1.75 1.75h-2.5a1.75 1.75 0 0 1-1.75-1.75ZM3.25 3a.25.25 0 0 0-.25.25v2.5c0 .138.112.25.25.25h2.5A.25.25 0 0 0 6 5.75v-2.5A.25.25 0 0 0 5.75 3Zm7 0a.25.25 0 0 0-.25.25v2.5c0 .138.112.25.25.25h2.5a.25.25 0 0 0 .25-.25v-2.5a.25.25 0 0 0-.25-.25Zm-7 7a.25.25 0 0 0-.25.25v2.5c0 .138.112.25.25.25h2.5a.25.25 0 0 0 .25-.25v-2.5a.25.25 0 0 0-.25-.25Zm7 0a.25.25 0 0 0-.25.25v2.5c0 .138.112.25.25.25h2.5a.25.25 0 0 0 .25-.25v-2.5a.25.25 0 0 0-.25-.25Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const archive: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M0 2.75C0 1.784.784 1 1.75 1h12.5c.966 0 1.75.784 1.75 1.75v1.5A1.75 1.75 0 0 1 14.25 6H1.75A1.75 1.75 0 0 1 0 4.25ZM1.75 7a.75.75 0 0 1 .75.75v5.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25v-5.5a.75.75 0 0 1 1.5 0v5.5A1.75 1.75 0 0 1 13.25 15H2.75A1.75 1.75 0 0 1 1 13.25v-5.5A.75.75 0 0 1 1.75 7Zm0-4.5a.25.25 0 0 0-.25.25v1.5c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25v-1.5a.25.25 0 0 0-.25-.25ZM6.25 8h3.5a.75.75 0 0 1 0 1.5h-3.5a.75.75 0 0 1 0-1.5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M2.75 2h18.5c.966 0 1.75.784 1.75 1.75v3.5A1.75 1.75 0 0 1 21.25 9H2.75A1.75 1.75 0 0 1 1 7.25v-3.5C1 2.784 1.784 2 2.75 2Zm18.5 1.5H2.75a.25.25 0 0 0-.25.25v3.5c0 .138.112.25.25.25h18.5a.25.25 0 0 0 .25-.25v-3.5a.25.25 0 0 0-.25-.25ZM2.75 10a.75.75 0 0 1 .75.75v9.5c0 .138.112.25.25.25h16.5a.25.25 0 0 0 .25-.25v-9.5a.75.75 0 0 1 1.5 0v9.5A1.75 1.75 0 0 1 20.25 22H3.75A1.75 1.75 0 0 1 2 20.25v-9.5a.75.75 0 0 1 .75-.75Z',
+      'M9.75 11.5a.75.75 0 0 0 0 1.5h4.5a.75.75 0 0 0 0-1.5h-4.5Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const arrowBoth: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M3.72 3.72a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L2.56 7h10.88l-2.22-2.22a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018l3.5 3.5a.75.75 0 0 1 0 1.06l-3.5 3.5a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734l2.22-2.22H2.56l2.22 2.22a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215l-3.5-3.5a.75.75 0 0 1 0-1.06Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M7.78 5.97a.75.75 0 0 0-1.06 0l-5.25 5.25a.75.75 0 0 0 0 1.06l5.25 5.25a.75.75 0 0 0 1.06-1.06L3.81 12.5h16.38l-3.97 3.97a.75.75 0 1 0 1.06 1.06l5.25-5.25a.75.75 0 0 0 0-1.06l-5.25-5.25a.75.75 0 1 0-1.06 1.06L20.19 11H3.81l3.97-3.97a.75.75 0 0 0 0-1.06Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const arrowDown: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M13.03 8.22a.75.75 0 0 1 0 1.06l-4.25 4.25a.75.75 0 0 1-1.06 0L3.47 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018l2.97 2.97V3.75a.75.75 0 0 1 1.5 0v7.44l2.97-2.97a.75.75 0 0 1 1.06 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M4.97 13.22a.75.75 0 0 1 1.06 0L11 18.19V3.75a.75.75 0 0 1 1.5 0v14.44l4.97-4.97a.749.749 0 0 1 1.275.326.749.749 0 0 1-.215.734l-6.25 6.25a.75.75 0 0 1-1.06 0l-6.25-6.25a.75.75 0 0 1 0-1.06Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const arrowDownLeft: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M11.78 4.22a.75.75 0 0 1 0 1.06l-5.26 5.26h4.2a.75.75 0 0 1 0 1.5H4.71a.75.75 0 0 1-.75-.75V5.28a.75.75 0 0 1 1.5 0v4.2l5.26-5.26a.75.75 0 0 1 1.06 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M5.75 8.5a.75.75 0 0 1 .75.75v7.19L16.72 6.22a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L7.56 17.5h7.19a.75.75 0 0 1 0 1.5h-9a.75.75 0 0 1-.75-.75v-9a.75.75 0 0 1 .75-.75Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const arrowDownRight: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M4.22 4.179a.75.75 0 0 1 1.06 0l5.26 5.26v-4.2a.75.75 0 0 1 1.5 0v6.01a.75.75 0 0 1-.75.75H5.28a.75.75 0 0 1 0-1.5h4.2L4.22 5.24a.75.75 0 0 1 0-1.06Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M18.25 8.5a.75.75 0 0 1 .75.75v9a.75.75 0 0 1-.75.75h-9a.75.75 0 0 1 0-1.5h7.19L6.22 7.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L17.5 16.44V9.25a.75.75 0 0 1 .75-.75Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const arrowLeft: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M7.78 12.53a.75.75 0 0 1-1.06 0L2.47 8.28a.75.75 0 0 1 0-1.06l4.25-4.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L4.81 7h7.44a.75.75 0 0 1 0 1.5H4.81l2.97 2.97a.75.75 0 0 1 0 1.06Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M10.78 19.03a.75.75 0 0 1-1.06 0l-6.25-6.25a.75.75 0 0 1 0-1.06l6.25-6.25a.749.749 0 0 1 1.275.326.749.749 0 0 1-.215.734L5.81 11.5h14.44a.75.75 0 0 1 0 1.5H5.81l4.97 4.97a.75.75 0 0 1 0 1.06Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const arrowRight: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8.22 2.97a.75.75 0 0 1 1.06 0l4.25 4.25a.75.75 0 0 1 0 1.06l-4.25 4.25a.751.751 0 0 1-1.042-.018.751.751 0 0 1-.018-1.042l2.97-2.97H3.75a.75.75 0 0 1 0-1.5h7.44L8.22 4.03a.75.75 0 0 1 0-1.06Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M13.22 19.03a.75.75 0 0 1 0-1.06L18.19 13H3.75a.75.75 0 0 1 0-1.5h14.44l-4.97-4.97a.749.749 0 0 1 .326-1.275.749.749 0 0 1 .734.215l6.25 6.25a.75.75 0 0 1 0 1.06l-6.25 6.25a.75.75 0 0 1-1.06 0Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const arrowSwitch: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M5.22 14.78a.75.75 0 0 0 1.06-1.06L4.56 12h8.69a.75.75 0 0 0 0-1.5H4.56l1.72-1.72a.75.75 0 0 0-1.06-1.06l-3 3a.75.75 0 0 0 0 1.06l3 3Zm5.56-6.5a.75.75 0 1 1-1.06-1.06l1.72-1.72H2.75a.75.75 0 0 1 0-1.5h8.69L9.72 2.28a.75.75 0 0 1 1.06-1.06l3 3a.75.75 0 0 1 0 1.06l-3 3Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M7.72 21.78a.75.75 0 0 0 1.06-1.06L5.56 17.5h14.69a.75.75 0 0 0 0-1.5H5.56l3.22-3.22a.75.75 0 1 0-1.06-1.06l-4.5 4.5a.75.75 0 0 0 0 1.06l4.5 4.5Zm8.56-9.5a.75.75 0 1 1-1.06-1.06L18.44 8H3.75a.75.75 0 0 1 0-1.5h14.69l-3.22-3.22a.75.75 0 0 1 1.06-1.06l4.5 4.5a.75.75 0 0 1 0 1.06l-4.5 4.5Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const arrowUp: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M3.47 7.78a.75.75 0 0 1 0-1.06l4.25-4.25a.75.75 0 0 1 1.06 0l4.25 4.25a.751.751 0 0 1-.018 1.042.751.751 0 0 1-1.042.018L9 4.81v7.44a.75.75 0 0 1-1.5 0V4.81L4.53 7.78a.75.75 0 0 1-1.06 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M18.655 10.405a.75.75 0 0 1-1.06 0l-4.97-4.97v14.44a.75.75 0 0 1-1.5 0V5.435l-4.97 4.97a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734l6.25-6.25a.75.75 0 0 1 1.06 0l6.25 6.25a.75.75 0 0 1 0 1.06Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const arrowUpLeft: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M3.96 4.75A.75.75 0 0 1 4.71 4h6.01a.75.75 0 0 1 0 1.5h-4.2l5.26 5.26a.75.75 0 0 1-1.06 1.061l-5.26-5.26v4.2a.75.75 0 0 1-1.5 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M5.75 15.5a.75.75 0 0 1-.75-.75v-9A.75.75 0 0 1 5.75 5h9a.75.75 0 0 1 0 1.5H7.56l10.22 10.22a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215L6.5 7.56v7.19a.75.75 0 0 1-.75.75Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const arrowUpRight: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M4.53 4.75A.75.75 0 0 1 5.28 4h6.01a.75.75 0 0 1 .75.75v6.01a.75.75 0 0 1-1.5 0v-4.2l-5.26 5.261a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734L9.48 5.5h-4.2a.75.75 0 0 1-.75-.75Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M18.25 15.5a.75.75 0 0 1-.75-.75V7.56L7.28 17.78a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734L16.44 6.5H9.25a.75.75 0 0 1 0-1.5h9a.75.75 0 0 1 .75.75v9a.75.75 0 0 1-.75.75Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const beaker: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M5 5.782V2.5h-.25a.75.75 0 0 1 0-1.5h6.5a.75.75 0 0 1 0 1.5H11v3.282l3.666 5.76C15.619 13.04 14.543 15 12.767 15H3.233c-1.776 0-2.852-1.96-1.899-3.458Zm-2.4 6.565a.75.75 0 0 0 .633 1.153h9.534a.75.75 0 0 0 .633-1.153L12.225 10.5h-8.45ZM9.5 2.5h-3V6c0 .143-.04.283-.117.403L4.73 9h6.54L9.617 6.403A.746.746 0 0 1 9.5 6Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M8 8.807V3.5h-.563a.75.75 0 0 1 0-1.5h9.125a.75.75 0 0 1 0 1.5H16v5.307l5.125 9.301c.964 1.75-.302 3.892-2.299 3.892H5.174c-1.998 0-3.263-2.142-2.3-3.892ZM4.189 18.832a1.123 1.123 0 0 0 .985 1.668h13.652a1.123 1.123 0 0 0 .985-1.668L17.7 15H6.3ZM14.5 3.5h-5V9a.75.75 0 0 1-.093.362L7.127 13.5h9.746l-2.28-4.138A.75.75 0 0 1 14.5 9Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const bell: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8 16a2 2 0 0 0 1.985-1.75c.017-.137-.097-.25-.235-.25h-3.5c-.138 0-.252.113-.235.25A2 2 0 0 0 8 16ZM3 5a5 5 0 0 1 10 0v2.947c0 .05.015.098.042.139l1.703 2.555A1.519 1.519 0 0 1 13.482 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947Zm5-3.5A3.5 3.5 0 0 0 4.5 5v2.947c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01l.001.006c0 .002.002.004.004.006l.006.004.007.001h10.964l.007-.001.006-.004.004-.006.001-.007a.017.017 0 0 0-.003-.01l-1.703-2.554a1.745 1.745 0 0 1-.294-.97V5A3.5 3.5 0 0 0 8 1.5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M12 1c3.681 0 7 2.565 7 6v4.539c0 .642.189 1.269.545 1.803l2.2 3.298A1.517 1.517 0 0 1 20.482 19H15.5a3.5 3.5 0 1 1-7 0H3.519a1.518 1.518 0 0 1-1.265-2.359l2.2-3.299A3.25 3.25 0 0 0 5 11.539V7c0-3.435 3.318-6 7-6ZM6.5 7v4.539a4.75 4.75 0 0 1-.797 2.635l-2.2 3.298-.003.01.001.007.004.006.006.004.007.001h16.964l.007-.001.006-.004.004-.006.001-.006a.017.017 0 0 0-.003-.01l-2.199-3.299a4.753 4.753 0 0 1-.798-2.635V7c0-2.364-2.383-4.5-5.5-4.5S6.5 4.636 6.5 7ZM14 19h-4a2 2 0 1 0 4 0Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const bellFill: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8 16c.9 0 1.7-.6 1.9-1.5.1-.3-.1-.5-.4-.5h-3c-.3 0-.5.2-.4.5.2.9 1 1.5 1.9 1.5ZM3 5c0-2.8 2.2-5 5-5s5 2.2 5 5v3l1.7 2.6c.2.2.3.5.3.8 0 .8-.7 1.5-1.5 1.5h-11c-.8.1-1.5-.6-1.5-1.4 0-.3.1-.6.3-.8L3 8.1V5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M6 8a6 6 0 1 1 12 0v2.917c0 .703.228 1.387.65 1.95L20.7 15.6a1.5 1.5 0 0 1-1.2 2.4h-15a1.5 1.5 0 0 1-1.2-2.4l2.05-2.733a3.25 3.25 0 0 0 .65-1.95Zm6 13.5A3.502 3.502 0 0 1 8.645 19h6.71A3.502 3.502 0 0 1 12 21.5Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const bellSlash: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'm4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M1.22 1.22a.75.75 0 0 1 1.06 0l20.5 20.5a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215L17.94 19H15.5a3.5 3.5 0 1 1-7 0H3.518a1.516 1.516 0 0 1-1.263-2.36l2.2-3.298A3.249 3.249 0 0 0 5 11.539V7c0-.294.025-.583.073-.866L1.22 2.28a.75.75 0 0 1 0-1.06ZM6.5 7.56h-.001v3.979a4.75 4.75 0 0 1-.797 2.635l-2.2 3.298-.003.01.001.007.004.006.006.004.007.001H16.44ZM10 19a2 2 0 1 0 4 0Zm2-16.5c-1.463 0-2.8.485-3.788 1.257l-.04.032a.75.75 0 1 1-.935-1.173l.05-.04C8.548 1.59 10.212 1 12 1c3.681 0 7 2.565 7 6v4.539c0 .642.19 1.269.546 1.803l1.328 1.992a.75.75 0 1 1-1.248.832l-1.328-1.992a4.75 4.75 0 0 1-.798-2.635V7c0-2.364-2.383-4.5-5.5-4.5Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const blocked: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M4.467.22a.749.749 0 0 1 .53-.22h6.006c.199 0 .389.079.53.22l4.247 4.247c.141.14.22.331.22.53v6.006a.749.749 0 0 1-.22.53l-4.247 4.247a.749.749 0 0 1-.53.22H4.997a.749.749 0 0 1-.53-.22L.22 11.533a.749.749 0 0 1-.22-.53V4.997c0-.199.079-.389.22-.53Zm.84 1.28L1.5 5.308v5.384L5.308 14.5h5.384l3.808-3.808V5.308L10.692 1.5ZM4 7.75A.75.75 0 0 1 4.75 7h6.5a.75.75 0 0 1 0 1.5h-6.5A.75.75 0 0 1 4 7.75Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M7.638 2.22a.749.749 0 0 1 .53-.22h7.664c.199 0 .389.079.53.22l5.418 5.418c.141.14.22.332.22.53v7.664a.749.749 0 0 1-.22.53l-5.418 5.418a.749.749 0 0 1-.53.22H8.168a.749.749 0 0 1-.53-.22l-5.42-5.418a.752.752 0 0 1-.219-.53V8.168c0-.199.079-.389.22-.53l5.418-5.42ZM8.48 3.5 3.5 8.48v7.04l4.98 4.98h7.04l4.98-4.98V8.48L15.52 3.5ZM7 11.75a.75.75 0 0 1 .75-.75h8.5a.75.75 0 0 1 0 1.5h-8.5a.75.75 0 0 1-.75-.75Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const bold: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M4 2h4.5a3.501 3.501 0 0 1 2.852 5.53A3.499 3.499 0 0 1 9.5 14H4a1 1 0 0 1-1-1V3a1 1 0 0 1 1-1Zm1 7v3h4.5a1.5 1.5 0 0 0 0-3Zm3.5-2a1.5 1.5 0 0 0 0-3H5v3Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M6 4.75c0-.69.56-1.25 1.25-1.25h5a4.752 4.752 0 0 1 3.888 7.479A5 5 0 0 1 14 20.5H7.25c-.69 0-1.25-.56-1.25-1.25ZM8.5 13v5H14a2.5 2.5 0 1 0 0-5Zm0-2.5h3.751A2.25 2.25 0 0 0 12.25 6H8.5Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const book: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M0 1.75A.75.75 0 0 1 .75 1h4.253c1.227 0 2.317.59 3 1.501A3.743 3.743 0 0 1 11.006 1h4.245a.75.75 0 0 1 .75.75v10.5a.75.75 0 0 1-.75.75h-4.507a2.25 2.25 0 0 0-1.591.659l-.622.621a.75.75 0 0 1-1.06 0l-.622-.621A2.25 2.25 0 0 0 5.258 13H.75a.75.75 0 0 1-.75-.75Zm7.251 10.324.004-5.073-.002-2.253A2.25 2.25 0 0 0 5.003 2.5H1.5v9h3.757a3.75 3.75 0 0 1 1.994.574ZM8.755 4.75l-.004 7.322a3.752 3.752 0 0 1 1.992-.572H14.5v-9h-3.495a2.25 2.25 0 0 0-2.25 2.25Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M0 3.75A.75.75 0 0 1 .75 3h7.497c1.566 0 2.945.8 3.751 2.014A4.495 4.495 0 0 1 15.75 3h7.5a.75.75 0 0 1 .75.75v15.063a.752.752 0 0 1-.755.75l-7.682-.052a3 3 0 0 0-2.142.878l-.89.891a.75.75 0 0 1-1.061 0l-.902-.901a2.996 2.996 0 0 0-2.121-.879H.75a.75.75 0 0 1-.75-.75Zm12.75 15.232a4.503 4.503 0 0 1 2.823-.971l6.927.047V4.5h-6.75a3 3 0 0 0-3 3ZM11.247 7.497a3 3 0 0 0-3-2.997H1.5V18h6.947c1.018 0 2.006.346 2.803.98Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const bookmark: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M3 2.75C3 1.784 3.784 1 4.75 1h6.5c.966 0 1.75.784 1.75 1.75v11.5a.75.75 0 0 1-1.227.579L8 11.722l-3.773 3.107A.751.751 0 0 1 3 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v9.91l3.023-2.489a.75.75 0 0 1 .954 0l3.023 2.49V2.75a.25.25 0 0 0-.25-.25Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M5 3.75C5 2.784 5.784 2 6.75 2h10.5c.966 0 1.75.784 1.75 1.75v17.5a.75.75 0 0 1-1.218.586L12 17.21l-5.781 4.625A.75.75 0 0 1 5 21.25Zm1.75-.25a.25.25 0 0 0-.25.25v15.94l5.031-4.026a.749.749 0 0 1 .938 0L17.5 19.69V3.75a.25.25 0 0 0-.25-.25Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const bookmarkFill: OcticonSymbolVariants = {
+  '24': {
+    p: [
+      'M6.69 2h10.56c.966 0 1.75.784 1.75 1.75v17.5a.75.75 0 0 1-1.218.585L12 17.21l-5.781 4.626A.75.75 0 0 1 5 21.253L4.94 3.756A1.748 1.748 0 0 1 6.69 2Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const bookmarkSlash: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M1.19 1.143 4.182 3.31l.014.01 8.486 6.145.014.01 2.994 2.168a.75.75 0 1 1-.88 1.214L13 11.547v2.703a.75.75 0 0 1-1.206.596L8 11.944l-3.794 2.902A.75.75 0 0 1 3 14.25V4.305L.31 2.357a.75.75 0 1 1 .88-1.214ZM4.5 5.39v7.341l3.044-2.328a.75.75 0 0 1 .912 0l3.044 2.328V10.46ZM5.865 1h5.385c.966 0 1.75.784 1.75 1.75v3.624a.75.75 0 0 1-1.5 0V2.75a.25.25 0 0 0-.25-.25H5.865a.75.75 0 0 1 0-1.5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M1.565 2.018v-.001l21.75 15.75a.75.75 0 1 1-.88 1.215L19 16.495v4.764a.748.748 0 0 1-1.219.584L12 17.21l-5.781 4.634A.75.75 0 0 1 5 21.259V6.357L.685 3.232a.75.75 0 0 1 .88-1.214ZM17.5 15.408l-11-7.965v12.254l5.031-4.032a.749.749 0 0 1 .938 0l5.031 4.032ZM7.25 2a.75.75 0 0 0 0 1.5h10a.25.25 0 0 1 .25.25v6.5a.75.75 0 0 0 1.5 0v-6.5A1.75 1.75 0 0 0 17.25 2h-10Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const bookmarkSlashFill: OcticonSymbolVariants = {
+  '24': {
+    p: [
+      'm3.232 2.175 18.5 15.5a.75.75 0 1 1-.964 1.15L19 17.343v3.907a.75.75 0 0 1-1.218.585L12 17.21l-5.781 4.626A.75.75 0 0 1 5 21.253L4.947 5.569 2.268 3.325a.75.75 0 1 1 .964-1.15ZM7.421 2h9.829c.966 0 1.75.784 1.75 1.75v8.073a.75.75 0 0 1-1.232.575L6.94 3.325A.75.75 0 0 1 7.421 2Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const briefcase: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M6.75 0h2.5C10.216 0 11 .784 11 1.75V3h3.25c.966 0 1.75.784 1.75 1.75v8.5A1.75 1.75 0 0 1 14.25 15H1.75A1.75 1.75 0 0 1 0 13.25v-8.5C0 3.784.784 3 1.75 3H5V1.75C5 .784 5.784 0 6.75 0ZM3.5 9.5a3.49 3.49 0 0 1-2-.627v4.377c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25V8.873a3.49 3.49 0 0 1-2 .627Zm-1.75-5a.25.25 0 0 0-.25.25V6a2 2 0 0 0 2 2h9a2 2 0 0 0 2-2V4.75a.25.25 0 0 0-.25-.25H1.75ZM9.5 3V1.75a.25.25 0 0 0-.25-.25h-2.5a.25.25 0 0 0-.25.25V3Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M7.5 1.75C7.5.784 8.284 0 9.25 0h5.5c.966 0 1.75.784 1.75 1.75V4h4.75c.966 0 1.75.784 1.75 1.75v14.5A1.75 1.75 0 0 1 21.25 22H2.75A1.75 1.75 0 0 1 1 20.25V5.75C1 4.784 1.784 4 2.75 4H7.5Zm-5 10.24v8.26c0 .138.112.25.25.25h18.5a.25.25 0 0 0 .25-.25v-8.26A4.235 4.235 0 0 1 18.75 13H5.25a4.235 4.235 0 0 1-2.75-1.01Zm19-3.24v-3a.25.25 0 0 0-.25-.25H2.75a.25.25 0 0 0-.25.25v3a2.75 2.75 0 0 0 2.75 2.75h13.5a2.75 2.75 0 0 0 2.75-2.75Zm-6.5-7a.25.25 0 0 0-.25-.25h-5.5a.25.25 0 0 0-.25.25V4h6Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const broadcast: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8.75 8.582v5.668a.75.75 0 0 1-1.5 0V8.582a1.75 1.75 0 1 1 1.5 0Zm3.983-7.125a.75.75 0 0 1 1.06.026A7.976 7.976 0 0 1 16 7c0 2.139-.84 4.083-2.207 5.517a.75.75 0 1 1-1.086-1.034A6.474 6.474 0 0 0 14.5 7a6.474 6.474 0 0 0-1.793-4.483.75.75 0 0 1 .026-1.06Zm-9.466 0c.3.286.312.76.026 1.06A6.474 6.474 0 0 0 1.5 7a6.47 6.47 0 0 0 1.793 4.483.75.75 0 0 1-1.086 1.034A7.973 7.973 0 0 1 0 7c0-2.139.84-4.083 2.207-5.517a.75.75 0 0 1 1.06-.026Zm8.556 2.321A4.988 4.988 0 0 1 13 7a4.988 4.988 0 0 1-1.177 3.222.75.75 0 1 1-1.146-.967A3.487 3.487 0 0 0 11.5 7c0-.86-.309-1.645-.823-2.255a.75.75 0 0 1 1.146-.967Zm-6.492.958A3.48 3.48 0 0 0 4.5 7a3.48 3.48 0 0 0 .823 2.255.75.75 0 0 1-1.146.967A4.981 4.981 0 0 1 3 7a4.982 4.982 0 0 1 1.188-3.236.75.75 0 1 1 1.143.972Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M20.485 2.515a.75.75 0 0 0-1.06 1.06A10.465 10.465 0 0 1 22.5 11c0 2.9-1.174 5.523-3.075 7.424a.75.75 0 0 0 1.06 1.061A11.965 11.965 0 0 0 24 11c0-3.314-1.344-6.315-3.515-8.485Zm-15.91 1.06a.75.75 0 0 0-1.06-1.06A11.965 11.965 0 0 0 0 11c0 3.313 1.344 6.314 3.515 8.485a.75.75 0 0 0 1.06-1.06A10.465 10.465 0 0 1 1.5 11c0-2.9 1.174-5.524 3.075-7.425ZM8.11 7.11a.75.75 0 0 0-1.06-1.06A6.98 6.98 0 0 0 5 11a6.98 6.98 0 0 0 2.05 4.95.75.75 0 0 0 1.06-1.061 5.48 5.48 0 0 1-1.61-3.89 5.48 5.48 0 0 1 1.61-3.888Zm8.84-1.06a.75.75 0 1 0-1.06 1.06A5.48 5.48 0 0 1 17.5 11a5.48 5.48 0 0 1-1.61 3.889.75.75 0 1 0 1.06 1.06A6.98 6.98 0 0 0 19 11a6.98 6.98 0 0 0-2.05-4.949ZM14 11a2 2 0 0 1-1.25 1.855v8.395a.75.75 0 0 1-1.5 0v-8.395A2 2 0 1 1 14 11Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const browser: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M0 2.75C0 1.784.784 1 1.75 1h12.5c.966 0 1.75.784 1.75 1.75v10.5A1.75 1.75 0 0 1 14.25 15H1.75A1.75 1.75 0 0 1 0 13.25ZM14.5 6h-13v7.25c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25Zm-6-3.5v2h6V2.75a.25.25 0 0 0-.25-.25ZM5 2.5v2h2v-2Zm-3.25 0a.25.25 0 0 0-.25.25V4.5h2v-2Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M0 3.75C0 2.784.784 2 1.75 2h20.5c.966 0 1.75.784 1.75 1.75v16.5A1.75 1.75 0 0 1 22.25 22H1.75A1.75 1.75 0 0 1 0 20.25ZM22.5 7h-21v13.25c0 .138.112.25.25.25h20.5a.25.25 0 0 0 .25-.25Zm-10-3.5v2h10V3.75a.25.25 0 0 0-.25-.25ZM7 3.5v2h4v-2Zm-5.25 0a.25.25 0 0 0-.25.25V5.5h4v-2Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const bug: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M4.72.22a.75.75 0 0 1 1.06 0l1 .999a3.488 3.488 0 0 1 2.441 0l.999-1a.748.748 0 0 1 1.265.332.75.75 0 0 1-.205.729l-.775.776c.616.63.995 1.493.995 2.444v.327c0 .1-.009.197-.025.292.408.14.764.392 1.029.722l1.968-.787a.75.75 0 0 1 .556 1.392L13 7.258V9h2.25a.75.75 0 0 1 0 1.5H13v.5c0 .409-.049.806-.141 1.186l2.17.868a.75.75 0 0 1-.557 1.392l-2.184-.873A4.997 4.997 0 0 1 8 16a4.997 4.997 0 0 1-4.288-2.427l-2.183.873a.75.75 0 0 1-.558-1.392l2.17-.868A5.036 5.036 0 0 1 3 11v-.5H.75a.75.75 0 0 1 0-1.5H3V7.258L.971 6.446a.75.75 0 0 1 .558-1.392l1.967.787c.265-.33.62-.583 1.03-.722a1.677 1.677 0 0 1-.026-.292V4.5c0-.951.38-1.814.995-2.444L4.72 1.28a.75.75 0 0 1 0-1.06Zm.53 6.28a.75.75 0 0 0-.75.75V11a3.5 3.5 0 1 0 7 0V7.25a.75.75 0 0 0-.75-.75ZM6.173 5h3.654A.172.172 0 0 0 10 4.827V4.5a2 2 0 1 0-4 0v.327c0 .096.077.173.173.173Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M7.72.22a.75.75 0 0 1 1.06 0l1.204 1.203A4.98 4.98 0 0 1 12 1c.717 0 1.4.151 2.016.423L15.22.22a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042l-.971.972A4.991 4.991 0 0 1 17 6v1.104a2.755 2.755 0 0 1 1.917 1.974l1.998-.999a.75.75 0 0 1 .67 1.342L19 10.714V13.5l3.25.003a.75.75 0 0 1 0 1.5L19 15.001V16c0 .568-.068 1.134-.204 1.686l.04.018 2.75 1.375a.75.75 0 1 1-.671 1.342l-2.638-1.319A6.998 6.998 0 0 1 12 23a6.998 6.998 0 0 1-6.197-3.742l-2.758 1.181a.752.752 0 0 1-1.064-.776.752.752 0 0 1 .474-.602l2.795-1.199A6.976 6.976 0 0 1 5 16v-.996H1.75a.75.75 0 0 1 0-1.5H5v-2.79L2.415 9.42a.75.75 0 0 1 .67-1.342l1.998.999A2.756 2.756 0 0 1 7 7.104V6a4.99 4.99 0 0 1 1.69-3.748l-.97-.972a.75.75 0 0 1 0-1.06ZM6.5 9.75V16a5.5 5.5 0 1 0 11 0V9.75c0-.69-.56-1.25-1.25-1.25h-8.5c-.69 0-1.25.56-1.25 1.25ZM8.5 7h7V6a3.5 3.5 0 1 0-7 0Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const cache: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M2.5 5.724V8c0 .248.238.7 1.169 1.159.874.43 2.144.745 3.62.822a.75.75 0 1 1-.078 1.498c-1.622-.085-3.102-.432-4.204-.975a5.565 5.565 0 0 1-.507-.28V12.5c0 .133.058.318.282.551.227.237.591.483 1.101.707 1.015.447 2.47.742 4.117.742.406 0 .802-.018 1.183-.052a.751.751 0 1 1 .134 1.494C8.89 15.98 8.45 16 8 16c-1.805 0-3.475-.32-4.721-.869-.623-.274-1.173-.619-1.579-1.041-.408-.425-.7-.964-.7-1.59v-9c0-.626.292-1.165.7-1.591.406-.42.956-.766 1.579-1.04C4.525.32 6.195 0 8 0c1.806 0 3.476.32 4.721.869.623.274 1.173.619 1.579 1.041.408.425.7.964.7 1.59 0 .626-.292 1.165-.7 1.591-.406.42-.956.766-1.578 1.04C11.475 6.68 9.805 7 8 7c-1.805 0-3.475-.32-4.721-.869a6.15 6.15 0 0 1-.779-.407Zm0-2.224c0 .133.058.318.282.551.227.237.591.483 1.101.707C4.898 5.205 6.353 5.5 8 5.5c1.646 0 3.101-.295 4.118-.742.508-.224.873-.471 1.1-.708.224-.232.282-.417.282-.55 0-.133-.058-.318-.282-.551-.227-.237-.591-.483-1.101-.707C11.102 1.795 9.647 1.5 8 1.5c-1.646 0-3.101.295-4.118.742-.508.224-.873.471-1.1.708-.224.232-.282.417-.282.55Z',
+      'M14.49 7.582a.375.375 0 0 0-.66-.313l-3.625 4.625a.375.375 0 0 0 .295.606h2.127l-.619 2.922a.375.375 0 0 0 .666.304l3.125-4.125A.375.375 0 0 0 15.5 11h-1.778l.769-3.418Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const calendar: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M4.75 0a.75.75 0 0 1 .75.75V2h5V.75a.75.75 0 0 1 1.5 0V2h1.25c.966 0 1.75.784 1.75 1.75v10.5A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25V3.75C1 2.784 1.784 2 2.75 2H4V.75A.75.75 0 0 1 4.75 0ZM2.5 7.5v6.75c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V7.5Zm10.75-4H2.75a.25.25 0 0 0-.25.25V6h11V3.75a.25.25 0 0 0-.25-.25Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M6.75 0a.75.75 0 0 1 .75.75V3h9V.75a.75.75 0 0 1 1.5 0V3h2.75c.966 0 1.75.784 1.75 1.75v16a1.75 1.75 0 0 1-1.75 1.75H3.25a1.75 1.75 0 0 1-1.75-1.75v-16C1.5 3.784 2.284 3 3.25 3H6V.75A.75.75 0 0 1 6.75 0ZM21 9.5H3v11.25c0 .138.112.25.25.25h17.5a.25.25 0 0 0 .25-.25Zm-17.75-5a.25.25 0 0 0-.25.25V8h18V4.75a.25.25 0 0 0-.25-.25Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const check: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M21.03 5.72a.75.75 0 0 1 0 1.06l-11.5 11.5a.747.747 0 0 1-1.072-.012l-5.5-5.75a.75.75 0 1 1 1.084-1.036l4.97 5.195L19.97 5.72a.75.75 0 0 1 1.06 0Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const checkCircle: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm1.5 0a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Zm10.28-1.72-4.5 4.5a.75.75 0 0 1-1.06 0l-2-2a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018l1.47 1.47 3.97-3.97a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M17.28 9.28a.75.75 0 0 0-1.06-1.06l-5.97 5.97-2.47-2.47a.75.75 0 0 0-1.06 1.06l3 3a.75.75 0 0 0 1.06 0l6.5-6.5Z',
+      'M12 1c6.075 0 11 4.925 11 11s-4.925 11-11 11S1 18.075 1 12 5.925 1 12 1ZM2.5 12a9.5 9.5 0 0 0 9.5 9.5 9.5 9.5 0 0 0 9.5-9.5A9.5 9.5 0 0 0 12 2.5 9.5 9.5 0 0 0 2.5 12Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const checkCircleFill: OcticonSymbolVariants = {
+  '12': {
+    p: [
+      'M6 0a6 6 0 1 1 0 12A6 6 0 0 1 6 0Zm-.705 8.737L9.63 4.403 8.392 3.166 5.295 6.263l-1.7-1.702L2.356 5.8l2.938 2.938Z',
+    ],
+    h: 12,
+    w: 12,
+  },
+  '16': {
+    p: [
+      'M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm3.78-9.72a.751.751 0 0 0-.018-1.042.751.751 0 0 0-1.042-.018L6.75 9.19 5.28 7.72a.751.751 0 0 0-1.042.018.751.751 0 0 0-.018 1.042l2 2a.75.75 0 0 0 1.06 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12Zm16.28-2.72a.751.751 0 0 0-.018-1.042.751.751 0 0 0-1.042-.018l-5.97 5.97-2.47-2.47a.751.751 0 0 0-1.042.018.751.751 0 0 0-.018 1.042l3 3a.75.75 0 0 0 1.06 0Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const checkbox: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M2.75 1h10.5c.966 0 1.75.784 1.75 1.75v10.5A1.75 1.75 0 0 1 13.25 15H2.75A1.75 1.75 0 0 1 1 13.25V2.75C1 1.784 1.784 1 2.75 1ZM2.5 2.75v10.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V2.75a.25.25 0 0 0-.25-.25H2.75a.25.25 0 0 0-.25.25Zm9.28 3.53-4.5 4.5a.75.75 0 0 1-1.06 0l-2-2a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018l1.47 1.47 3.97-3.97a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M17.28 9.28a.75.75 0 0 0-1.06-1.06l-5.97 5.97-2.47-2.47a.75.75 0 0 0-1.06 1.06l3 3a.75.75 0 0 0 1.06 0l6.5-6.5Z',
+      'M3.75 2h16.5c.966 0 1.75.784 1.75 1.75v16.5A1.75 1.75 0 0 1 20.25 22H3.75A1.75 1.75 0 0 1 2 20.25V3.75C2 2.784 2.784 2 3.75 2ZM3.5 3.75v16.5c0 .138.112.25.25.25h16.5a.25.25 0 0 0 .25-.25V3.75a.25.25 0 0 0-.25-.25H3.75a.25.25 0 0 0-.25.25Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const checklist: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M2.5 1.75v11.5c0 .138.112.25.25.25h3.17a.75.75 0 0 1 0 1.5H2.75A1.75 1.75 0 0 1 1 13.25V1.75C1 .784 1.784 0 2.75 0h8.5C12.216 0 13 .784 13 1.75v7.736a.75.75 0 0 1-1.5 0V1.75a.25.25 0 0 0-.25-.25h-8.5a.25.25 0 0 0-.25.25Zm13.274 9.537v-.001l-4.557 4.45a.75.75 0 0 1-1.055-.008l-1.943-1.95a.75.75 0 0 1 1.062-1.058l1.419 1.425 4.026-3.932a.75.75 0 1 1 1.048 1.074ZM4.75 4h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1 0-1.5ZM4 7.75A.75.75 0 0 1 4.75 7h2a.75.75 0 0 1 0 1.5h-2A.75.75 0 0 1 4 7.75Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M3.5 3.75a.25.25 0 0 1 .25-.25h13.5a.25.25 0 0 1 .25.25v10a.75.75 0 0 0 1.5 0v-10A1.75 1.75 0 0 0 17.25 2H3.75A1.75 1.75 0 0 0 2 3.75v16.5c0 .966.784 1.75 1.75 1.75h7a.75.75 0 0 0 0-1.5h-7a.25.25 0 0 1-.25-.25V3.75Z',
+      'M6.25 7a.75.75 0 0 0 0 1.5h8.5a.75.75 0 0 0 0-1.5h-8.5Zm-.75 4.75a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Zm16.28 4.53a.75.75 0 1 0-1.06-1.06l-4.97 4.97-1.97-1.97a.75.75 0 1 0-1.06 1.06l2.5 2.5a.75.75 0 0 0 1.06 0l5.5-5.5Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const chevronDown: OcticonSymbolVariants = {
+  '12': {
+    p: [
+      'M6 8.825c-.2 0-.4-.1-.5-.2l-3.3-3.3c-.3-.3-.3-.8 0-1.1.3-.3.8-.3 1.1 0l2.7 2.7 2.7-2.7c.3-.3.8-.3 1.1 0 .3.3.3.8 0 1.1l-3.2 3.2c-.2.2-.4.3-.6.3Z',
+    ],
+    h: 12,
+    w: 12,
+  },
+  '16': {
+    p: [
+      'M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M5.22 8.22a.749.749 0 0 0 0 1.06l6.25 6.25a.749.749 0 0 0 1.06 0l6.25-6.25a.749.749 0 1 0-1.06-1.06L12 13.939 6.28 8.22a.749.749 0 0 0-1.06 0Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const chevronLeft: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M9.78 12.78a.75.75 0 0 1-1.06 0L4.47 8.53a.75.75 0 0 1 0-1.06l4.25-4.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L6.06 8l3.72 3.72a.75.75 0 0 1 0 1.06Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M15.28 5.22a.75.75 0 0 1 0 1.06L9.56 12l5.72 5.72a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215l-6.25-6.25a.75.75 0 0 1 0-1.06l6.25-6.25a.75.75 0 0 1 1.06 0Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const chevronRight: OcticonSymbolVariants = {
+  '12': {
+    p: [
+      'M4.7 10c-.2 0-.4-.1-.5-.2-.3-.3-.3-.8 0-1.1L6.9 6 4.2 3.3c-.3-.3-.3-.8 0-1.1.3-.3.8-.3 1.1 0l3.3 3.2c.3.3.3.8 0 1.1L5.3 9.7c-.2.2-.4.3-.6.3Z',
+    ],
+    h: 12,
+    w: 12,
+  },
+  '16': {
+    p: [
+      'M6.22 3.22a.75.75 0 0 1 1.06 0l4.25 4.25a.75.75 0 0 1 0 1.06l-4.25 4.25a.751.751 0 0 1-1.042-.018.751.751 0 0 1-.018-1.042L9.94 8 6.22 4.28a.75.75 0 0 1 0-1.06Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M8.72 18.78a.75.75 0 0 1 0-1.06L14.44 12 8.72 6.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018l6.25 6.25a.75.75 0 0 1 0 1.06l-6.25 6.25a.75.75 0 0 1-1.06 0Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const chevronUp: OcticonSymbolVariants = {
+  '12': {
+    p: [
+      'M6 4c-.2 0-.4.1-.5.2L2.2 7.5c-.3.3-.3.8 0 1.1.3.3.8.3 1.1 0L6 5.9l2.7 2.7c.3.3.8.3 1.1 0 .3-.3.3-.8 0-1.1L6.6 4.3C6.4 4.1 6.2 4 6 4Z',
+    ],
+    h: 12,
+    w: 12,
+  },
+  '16': {
+    p: [
+      'M3.22 10.53a.749.749 0 0 1 0-1.06l4.25-4.25a.749.749 0 0 1 1.06 0l4.25 4.25a.749.749 0 1 1-1.06 1.06L8 6.811 4.28 10.53a.749.749 0 0 1-1.06 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M18.78 15.78a.749.749 0 0 1-1.06 0L12 10.061 6.28 15.78a.749.749 0 1 1-1.06-1.06l6.25-6.25a.749.749 0 0 1 1.06 0l6.25 6.25a.749.749 0 0 1 0 1.06Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const circle: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12Zm11-9.5A9.5 9.5 0 0 0 2.5 12a9.5 9.5 0 0 0 9.5 9.5 9.5 9.5 0 0 0 9.5-9.5A9.5 9.5 0 0 0 12 2.5Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const circleSlash: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM3.965 13.096a6.5 6.5 0 0 0 9.131-9.131ZM1.5 8a6.474 6.474 0 0 0 1.404 4.035l9.131-9.131A6.499 6.499 0 0 0 1.5 8Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M12 1c6.075 0 11 4.925 11 11s-4.925 11-11 11S1 18.075 1 12 5.925 1 12 1ZM5.834 19.227A9.464 9.464 0 0 0 12 21.5a9.5 9.5 0 0 0 9.5-9.5 9.464 9.464 0 0 0-2.273-6.166ZM2.5 12a9.464 9.464 0 0 0 2.273 6.166L18.166 4.773A9.463 9.463 0 0 0 12 2.5 9.5 9.5 0 0 0 2.5 12Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const clock: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Zm7-3.25v2.992l2.028.812a.75.75 0 0 1-.557 1.392l-2.5-1A.751.751 0 0 1 7 8.25v-3.5a.75.75 0 0 1 1.5 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M12.5 7.25a.75.75 0 0 0-1.5 0v5.5c0 .27.144.518.378.651l3.5 2a.75.75 0 0 0 .744-1.302L12.5 12.315V7.25Z',
+      'M12 1c6.075 0 11 4.925 11 11s-4.925 11-11 11S1 18.075 1 12 5.925 1 12 1ZM2.5 12a9.5 9.5 0 0 0 9.5 9.5 9.5 9.5 0 0 0 9.5-9.5A9.5 9.5 0 0 0 12 2.5 9.5 9.5 0 0 0 2.5 12Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const clockFill: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8.575-3.25a.825.825 0 1 0-1.65 0v3.5c0 .337.205.64.519.766l2.5 1a.825.825 0 0 0 .612-1.532l-1.981-.793Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12Zm11.575-4.75a.825.825 0 1 0-1.65 0v5.5c0 .296.159.57.416.716l3.5 2a.825.825 0 0 0 .818-1.432l-3.084-1.763Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const cloud: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M2 7.25A5.225 5.225 0 0 1 7.25 2a5.222 5.222 0 0 1 4.767 3.029A4.472 4.472 0 0 1 16 9.5c0 2.505-1.995 4.5-4.5 4.5h-8A3.474 3.474 0 0 1 0 10.5c0-1.41.809-2.614 2.001-3.17Zm1.54.482a.75.75 0 0 1-.556.832c-.86.22-1.484.987-1.484 1.936 0 1.124.876 2 2 2h8c1.676 0 3-1.324 3-3s-1.324-3-3-3a.75.75 0 0 1-.709-.504A3.72 3.72 0 0 0 7.25 3.5C5.16 3.5 3.5 5.16 3.5 7.25c.002.146.014.292.035.436l.004.036.001.008Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M3.103 10.107c0-4.244 3.445-7.607 7.733-7.607 3.19 0 5.912 1.858 7.099 4.563l.01.022.001.006C21.348 7.345 24 10.095 24 13.536 24 17.148 21.076 20 17.431 20H5.017C2.23 20 0 17.83 0 15.06a4.899 4.899 0 0 1 3.112-4.581 7.696 7.696 0 0 1-.009-.372ZM10.836 4c-3.485 0-6.233 2.717-6.233 6.107 0 .284.022.602.052.756a.75.75 0 0 1-.552.869c-1.52.385-2.603 1.712-2.603 3.328 0 1.917 1.532 3.44 3.517 3.44h12.414c2.843 0 5.069-2.206 5.069-4.964 0-2.759-2.226-4.965-5.069-4.965a.75.75 0 0 1-.696-.47l-.179-.446C15.606 5.5 13.424 4 10.836 4Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const cloudOffline: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M7.25 2c-.69 0-1.351.13-1.957.371a.75.75 0 1 0 .554 1.394c.43-.17.903-.265 1.403-.265a3.72 3.72 0 0 1 3.541 2.496.75.75 0 0 0 .709.504c1.676 0 3 1.324 3 3a3 3 0 0 1-.681 1.92.75.75 0 0 0 1.156.955A4.496 4.496 0 0 0 16 9.5a4.472 4.472 0 0 0-3.983-4.471A5.222 5.222 0 0 0 7.25 2ZM.72 1.72a.75.75 0 0 1 1.06 0l2.311 2.31c.03.025.056.052.08.08l8.531 8.532.035.034 2.043 2.044a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215l-1.8-1.799a4.54 4.54 0 0 1-.42.019h-8A3.474 3.474 0 0 1 0 10.5c0-1.41.809-2.614 2.001-3.17a5.218 5.218 0 0 1 .646-2.622L.72 2.78a.75.75 0 0 1 0-1.06ZM3.5 7.25c.004.161.018.322.041.481a.75.75 0 0 1-.557.833c-.86.22-1.484.986-1.484 1.936 0 1.124.876 2 2 2h6.94L3.771 5.832A3.788 3.788 0 0 0 3.5 7.25Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'm2.78 2.22 19.5 19.5a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215l-2.845-2.845a6.932 6.932 0 0 1-.944.065H5.017C2.229 20 0 17.831 0 15.059a4.899 4.899 0 0 1 3.111-4.58A7.52 7.52 0 0 1 4.36 5.922L1.72 3.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018ZM16.94 18.5 5.448 7.01a6.026 6.026 0 0 0-.794 3.853.75.75 0 0 1-.552.869c-1.52.385-2.603 1.712-2.603 3.328 0 1.917 1.532 3.44 3.517 3.44Zm-6.104-16a7.865 7.865 0 0 0-3.638.88.75.75 0 1 0 .692 1.331A6.365 6.365 0 0 1 10.836 4c2.588 0 4.77 1.5 5.72 3.655l.179.445a.75.75 0 0 0 .696.471c2.843 0 5.069 2.206 5.069 4.965a4.9 4.9 0 0 1-1.684 3.716.75.75 0 0 0 .986 1.13A6.396 6.396 0 0 0 24 13.536c0-3.44-2.652-6.191-6.054-6.445l-.002-.006a.634.634 0 0 0-.01-.022C16.749 4.358 14.026 2.5 10.837 2.5Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const code: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'm11.28 3.22 4.25 4.25a.75.75 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734L13.94 8l-3.72-3.72a.749.749 0 0 1 .326-1.275.749.749 0 0 1 .734.215Zm-6.56 0a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L2.06 8l3.72 3.72a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215L.47 8.53a.75.75 0 0 1 0-1.06Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M15.22 4.97a.75.75 0 0 1 1.06 0l6.5 6.5a.75.75 0 0 1 0 1.06l-6.5 6.5a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734L21.19 12l-5.97-5.97a.75.75 0 0 1 0-1.06Zm-6.44 0a.75.75 0 0 1 0 1.06L2.81 12l5.97 5.97a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215l-6.5-6.5a.75.75 0 0 1 0-1.06l6.5-6.5a.75.75 0 0 1 1.06 0Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const codeOfConduct: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8.048 2.241c.964-.709 2.079-1.238 3.325-1.241a4.616 4.616 0 0 1 3.282 1.355c.41.408.757.86.996 1.428.238.568.348 1.206.347 1.968 0 2.193-1.505 4.254-3.081 5.862-1.496 1.526-3.213 2.796-4.249 3.563l-.22.163a.749.749 0 0 1-.895 0l-.221-.163c-1.036-.767-2.753-2.037-4.249-3.563C1.51 10.008.007 7.952.002 5.762a4.614 4.614 0 0 1 1.353-3.407C3.123.585 6.223.537 8.048 2.24Zm-1.153.983c-1.25-1.033-3.321-.967-4.48.191a3.115 3.115 0 0 0-.913 2.335c0 1.556 1.109 3.24 2.652 4.813C5.463 11.898 6.96 13.032 8 13.805c.353-.262.758-.565 1.191-.905l-1.326-1.223a.75.75 0 0 1 1.018-1.102l1.48 1.366c.328-.281.659-.577.984-.887L9.99 9.802a.75.75 0 1 1 1.019-1.103l1.384 1.28c.295-.329.566-.661.81-.995L12.92 8.7l-1.167-1.168c-.674-.671-1.78-.664-2.474.03-.268.269-.538.537-.802.797-.893.882-2.319.843-3.185-.032-.346-.35-.693-.697-1.043-1.047a.75.75 0 0 1-.04-1.016c.162-.191.336-.401.52-.623.62-.748 1.356-1.637 2.166-2.417Zm7.112 4.442c.313-.65.491-1.293.491-1.916v-.001c0-.614-.088-1.045-.23-1.385-.143-.339-.357-.633-.673-.949a3.111 3.111 0 0 0-2.218-.915c-1.092.003-2.165.627-3.226 1.602-.823.755-1.554 1.637-2.228 2.45l-.127.154.562.566a.755.755 0 0 0 1.066.02l.794-.79c1.258-1.258 3.312-1.31 4.594-.032.396.394.792.791 1.173 1.173Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M2.828 4.328C5.26 1.896 9.5 1.881 11.935 4.317c.024.024.046.05.067.076 1.391-1.078 2.993-1.886 4.777-1.89a6.22 6.22 0 0 1 4.424 1.825c.559.56 1.023 1.165 1.34 1.922.318.756.47 1.617.468 2.663 0 2.972-2.047 5.808-4.269 8.074-2.098 2.14-4.507 3.924-5.974 5.009l-.311.23a.752.752 0 0 1-.897 0l-.312-.23c-1.466-1.085-3.875-2.869-5.973-5.009-2.22-2.263-4.264-5.095-4.27-8.063a6.216 6.216 0 0 1 1.823-4.596Zm8.033 1.042c-1.846-1.834-5.124-1.823-6.969.022a4.712 4.712 0 0 0-1.382 3.52c0 2.332 1.65 4.79 3.839 7.022 1.947 1.986 4.184 3.66 5.66 4.752a78.214 78.214 0 0 0 2.159-1.645l-2.14-1.974a.752.752 0 0 1 1.02-1.106l2.295 2.118c.616-.52 1.242-1.08 1.85-1.672l-2.16-1.992a.753.753 0 0 1 1.021-1.106l2.188 2.02a18.963 18.963 0 0 0 1.528-1.877l-.585-.586-1.651-1.652c-1.078-1.074-2.837-1.055-3.935.043-.379.38-.76.758-1.132 1.126-1.14 1.124-2.96 1.077-4.07-.043-.489-.495-.98-.988-1.475-1.482a.752.752 0 0 1-.04-1.019c.234-.276.483-.576.745-.893.928-1.12 2.023-2.442 3.234-3.576Zm9.725 6.77c.579-1.08.92-2.167.92-3.228.002-.899-.128-1.552-.35-2.08-.22-.526-.551-.974-1.017-1.44a4.71 4.71 0 0 0-3.356-1.384c-1.66.004-3.25.951-4.77 2.346-1.18 1.084-2.233 2.353-3.188 3.506l-.351.423c.331.332.663.664.993.998a1.375 1.375 0 0 0 1.943.03c.37-.365.748-.74 1.125-1.118 1.662-1.663 4.373-1.726 6.06-.045.56.558 1.12 1.12 1.658 1.658Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const codeReview: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M1.75 1h12.5c.966 0 1.75.784 1.75 1.75v8.5A1.75 1.75 0 0 1 14.25 13H8.061l-2.574 2.573A1.458 1.458 0 0 1 3 14.543V13H1.75A1.75 1.75 0 0 1 0 11.25v-8.5C0 1.784.784 1 1.75 1ZM1.5 2.75v8.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h6.5a.25.25 0 0 0 .25-.25v-8.5a.25.25 0 0 0-.25-.25H1.75a.25.25 0 0 0-.25.25Zm5.28 1.72a.75.75 0 0 1 0 1.06L5.31 7l1.47 1.47a.751.751 0 0 1-.018 1.042.751.751 0 0 1-1.042.018l-2-2a.75.75 0 0 1 0-1.06l2-2a.75.75 0 0 1 1.06 0Zm2.44 0a.75.75 0 0 1 1.06 0l2 2a.75.75 0 0 1 0 1.06l-2 2a.751.751 0 0 1-1.042-.018.751.751 0 0 1-.018-1.042L10.69 7 9.22 5.53a.75.75 0 0 1 0-1.06Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M10.3 6.74a.75.75 0 0 1-.04 1.06l-2.908 2.7 2.908 2.7a.75.75 0 1 1-1.02 1.1l-3.5-3.25a.75.75 0 0 1 0-1.1l3.5-3.25a.75.75 0 0 1 1.06.04Zm3.44 1.06a.75.75 0 1 1 1.02-1.1l3.5 3.25a.75.75 0 0 1 0 1.1l-3.5 3.25a.75.75 0 1 1-1.02-1.1l2.908-2.7-2.908-2.7Z',
+      'M1.5 4.25c0-.966.784-1.75 1.75-1.75h17.5c.966 0 1.75.784 1.75 1.75v12.5a1.75 1.75 0 0 1-1.75 1.75h-9.69l-3.573 3.573A1.458 1.458 0 0 1 5 21.043V18.5H3.25a1.75 1.75 0 0 1-1.75-1.75ZM3.25 4a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h2.5a.75.75 0 0 1 .75.75v3.19l3.72-3.72a.749.749 0 0 1 .53-.22h10a.25.25 0 0 0 .25-.25V4.25a.25.25 0 0 0-.25-.25Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const codeSquare: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M0 1.75C0 .784.784 0 1.75 0h12.5C15.216 0 16 .784 16 1.75v12.5A1.75 1.75 0 0 1 14.25 16H1.75A1.75 1.75 0 0 1 0 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25V1.75a.25.25 0 0 0-.25-.25Zm7.47 3.97a.75.75 0 0 1 1.06 0l2 2a.75.75 0 0 1 0 1.06l-2 2a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734L10.69 8 9.22 6.53a.75.75 0 0 1 0-1.06ZM6.78 6.53 5.31 8l1.47 1.47a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215l-2-2a.75.75 0 0 1 0-1.06l2-2a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M10.3 8.24a.75.75 0 0 1-.04 1.06L7.352 12l2.908 2.7a.75.75 0 1 1-1.02 1.1l-3.5-3.25a.75.75 0 0 1 0-1.1l3.5-3.25a.75.75 0 0 1 1.06.04Zm3.44 1.06a.75.75 0 1 1 1.02-1.1l3.5 3.25a.75.75 0 0 1 0 1.1l-3.5 3.25a.75.75 0 1 1-1.02-1.1l2.908-2.7-2.908-2.7Z',
+      'M2 3.75C2 2.784 2.784 2 3.75 2h16.5c.966 0 1.75.784 1.75 1.75v16.5A1.75 1.75 0 0 1 20.25 22H3.75A1.75 1.75 0 0 1 2 20.25Zm1.75-.25a.25.25 0 0 0-.25.25v16.5c0 .138.112.25.25.25h16.5a.25.25 0 0 0 .25-.25V3.75a.25.25 0 0 0-.25-.25Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const codescan: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8.47 4.97a.75.75 0 0 0 0 1.06L9.94 7.5 8.47 8.97a.75.75 0 1 0 1.06 1.06l2-2a.75.75 0 0 0 0-1.06l-2-2a.75.75 0 0 0-1.06 0ZM6.53 6.03a.75.75 0 0 0-1.06-1.06l-2 2a.75.75 0 0 0 0 1.06l2 2a.75.75 0 1 0 1.06-1.06L5.06 7.5l1.47-1.47Z',
+      'M12.246 13.307a7.501 7.501 0 1 1 1.06-1.06l2.474 2.473a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215ZM1.5 7.5a6.002 6.002 0 0 0 3.608 5.504 6.002 6.002 0 0 0 6.486-1.117.748.748 0 0 1 .292-.293A6 6 0 1 0 1.5 7.5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M11.97 6.97a.75.75 0 0 0 0 1.06l2.47 2.47-2.47 2.47a.75.75 0 1 0 1.06 1.06l3-3a.75.75 0 0 0 0-1.06l-3-3a.75.75 0 0 0-1.06 0ZM9.03 8.03a.75.75 0 0 0-1.06-1.06l-3 3a.75.75 0 0 0 0 1.06l3 3a.75.75 0 0 0 1.06-1.06L6.56 10.5l2.47-2.47Z',
+      'M10.5 0C16.299 0 21 4.701 21 10.5a10.457 10.457 0 0 1-2.564 6.875l4.344 4.345a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215l-4.345-4.344A10.459 10.459 0 0 1 10.5 21C4.701 21 0 16.299 0 10.5S4.701 0 10.5 0Zm-9 10.5a9 9 0 0 0 9 9 9 9 0 0 0 9-9 9 9 0 0 0-9-9 9 9 0 0 0-9 9Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const codescanCheckmark: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M10.28 6.28a.75.75 0 1 0-1.06-1.06L6.25 8.19l-.97-.97a.75.75 0 0 0-1.06 1.06l1.5 1.5a.75.75 0 0 0 1.06 0l3.5-3.5Z',
+      'M7.5 15a7.5 7.5 0 1 1 5.807-2.754l2.473 2.474a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215l-2.474-2.473A7.472 7.472 0 0 1 7.5 15Zm0-13.5a6 6 0 1 0 4.094 10.386.748.748 0 0 1 .293-.292 6.002 6.002 0 0 0 1.117-6.486A6.002 6.002 0 0 0 7.5 1.5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M15.03 8.28a.75.75 0 0 0-1.06-1.06l-5.22 5.22-2.22-2.22a.75.75 0 1 0-1.06 1.06l2.75 2.75a.75.75 0 0 0 1.06 0l5.75-5.75Z',
+      'M0 10.5C0 4.701 4.701 0 10.5 0S21 4.701 21 10.5c0 2.63-.967 5.033-2.564 6.875l4.344 4.345a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215l-4.345-4.344A10.457 10.457 0 0 1 10.5 21C4.701 21 0 16.299 0 10.5Zm10.5-9a9 9 0 0 0-9 9 9 9 0 0 0 9 9 9 9 0 0 0 9-9 9 9 0 0 0-9-9Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const codespaces: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M0 11.25c0-.966.784-1.75 1.75-1.75h12.5c.966 0 1.75.784 1.75 1.75v3A1.75 1.75 0 0 1 14.25 16H1.75A1.75 1.75 0 0 1 0 14.25Zm2-9.5C2 .784 2.784 0 3.75 0h8.5C13.216 0 14 .784 14 1.75v5a1.75 1.75 0 0 1-1.75 1.75h-8.5A1.75 1.75 0 0 1 2 6.75Zm1.75-.25a.25.25 0 0 0-.25.25v5c0 .138.112.25.25.25h8.5a.25.25 0 0 0 .25-.25v-5a.25.25 0 0 0-.25-.25Zm-2 9.5a.25.25 0 0 0-.25.25v3c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25v-3a.25.25 0 0 0-.25-.25Z',
+      'M7 12.75a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Zm-4 0a.75.75 0 0 1 .75-.75h.5a.75.75 0 0 1 0 1.5h-.5a.75.75 0 0 1-.75-.75Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M3.5 3.75C3.5 2.784 4.284 2 5.25 2h13.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 18.75 13H5.25a1.75 1.75 0 0 1-1.75-1.75Zm-2 12c0-.966.784-1.75 1.75-1.75h17.5c.966 0 1.75.784 1.75 1.75v4a1.75 1.75 0 0 1-1.75 1.75H3.25a1.75 1.75 0 0 1-1.75-1.75ZM5.25 3.5a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h13.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Zm-2 12a.25.25 0 0 0-.25.25v4c0 .138.112.25.25.25h17.5a.25.25 0 0 0 .25-.25v-4a.25.25 0 0 0-.25-.25Z',
+      'M10 17.75a.75.75 0 0 1 .75-.75h6.5a.75.75 0 0 1 0 1.5h-6.5a.75.75 0 0 1-.75-.75Zm-4 0a.75.75 0 0 1 .75-.75h.5a.75.75 0 0 1 0 1.5h-.5a.75.75 0 0 1-.75-.75Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const columns: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M2.75 0h2.5C6.216 0 7 .784 7 1.75v12.5A1.75 1.75 0 0 1 5.25 16h-2.5A1.75 1.75 0 0 1 1 14.25V1.75C1 .784 1.784 0 2.75 0Zm8 0h2.5C14.216 0 15 .784 15 1.75v12.5A1.75 1.75 0 0 1 13.25 16h-2.5A1.75 1.75 0 0 1 9 14.25V1.75C9 .784 9.784 0 10.75 0ZM2.5 1.75v12.5c0 .138.112.25.25.25h2.5a.25.25 0 0 0 .25-.25V1.75a.25.25 0 0 0-.25-.25h-2.5a.25.25 0 0 0-.25.25Zm8 0v12.5c0 .138.112.25.25.25h2.5a.25.25 0 0 0 .25-.25V1.75a.25.25 0 0 0-.25-.25h-2.5a.25.25 0 0 0-.25.25Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M3.75 2h5.5c.966 0 1.75.784 1.75 1.75v16.5A1.75 1.75 0 0 1 9.25 22h-5.5A1.75 1.75 0 0 1 2 20.25V3.75C2 2.784 2.784 2 3.75 2Zm11 0h5.5c.966 0 1.75.784 1.75 1.75v16.5A1.75 1.75 0 0 1 20.25 22h-5.5A1.75 1.75 0 0 1 13 20.25V3.75c0-.966.784-1.75 1.75-1.75ZM3.5 3.75v16.5c0 .138.112.25.25.25h5.5a.25.25 0 0 0 .25-.25V3.75a.25.25 0 0 0-.25-.25h-5.5a.25.25 0 0 0-.25.25Zm11 0v16.5c0 .138.112.25.25.25h5.5a.25.25 0 0 0 .25-.25V3.75a.25.25 0 0 0-.25-.25h-5.5a.25.25 0 0 0-.25.25Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const commandPalette: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'm6.354 8.04-4.773 4.773a.75.75 0 1 0 1.061 1.06L7.945 8.57a.75.75 0 0 0 0-1.06L2.642 2.206a.75.75 0 0 0-1.06 1.061L6.353 8.04ZM8.75 11.5a.75.75 0 0 0 0 1.5h5.5a.75.75 0 0 0 0-1.5h-5.5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M3.045 18.894 9.94 12 3.045 5.106a.75.75 0 0 1 1.06-1.061l7.425 7.425a.75.75 0 0 1 0 1.06l-7.424 7.425a.75.75 0 0 1-1.061-1.06Zm8.205.606a.75.75 0 0 0 0 1.5h9.5a.75.75 0 0 0 0-1.5h-9.5Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const comment: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 13.25 12H9.06l-2.573 2.573A1.458 1.458 0 0 1 4 13.543V12H2.75A1.75 1.75 0 0 1 1 10.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h4.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M1.5 4.25c0-.966.784-1.75 1.75-1.75h17.5c.966 0 1.75.784 1.75 1.75v12.5a1.75 1.75 0 0 1-1.75 1.75h-9.69l-3.573 3.573A1.458 1.458 0 0 1 5 21.043V18.5H3.25a1.75 1.75 0 0 1-1.75-1.75ZM3.25 4a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h2.5a.75.75 0 0 1 .75.75v3.19l3.72-3.72a.749.749 0 0 1 .53-.22h10a.25.25 0 0 0 .25-.25V4.25a.25.25 0 0 0-.25-.25Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const commentDiscussion: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M1.75 1h8.5c.966 0 1.75.784 1.75 1.75v5.5A1.75 1.75 0 0 1 10.25 10H7.061l-2.574 2.573A1.458 1.458 0 0 1 2 11.543V10h-.25A1.75 1.75 0 0 1 0 8.25v-5.5C0 1.784.784 1 1.75 1ZM1.5 2.75v5.5c0 .138.112.25.25.25h1a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h3.5a.25.25 0 0 0 .25-.25v-5.5a.25.25 0 0 0-.25-.25h-8.5a.25.25 0 0 0-.25.25Zm13 2a.25.25 0 0 0-.25-.25h-.5a.75.75 0 0 1 0-1.5h.5c.966 0 1.75.784 1.75 1.75v5.5A1.75 1.75 0 0 1 14.25 12H14v1.543a1.458 1.458 0 0 1-2.487 1.03L9.22 12.28a.749.749 0 0 1 .326-1.275.749.749 0 0 1 .734.215l2.22 2.22v-2.19a.75.75 0 0 1 .75-.75h1a.25.25 0 0 0 .25-.25Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M1.75 1h12.5c.966 0 1.75.784 1.75 1.75v9.5A1.75 1.75 0 0 1 14.25 14H8.061l-2.574 2.573A1.458 1.458 0 0 1 3 15.543V14H1.75A1.75 1.75 0 0 1 0 12.25v-9.5C0 1.784.784 1 1.75 1ZM1.5 2.75v9.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h6.5a.25.25 0 0 0 .25-.25v-9.5a.25.25 0 0 0-.25-.25H1.75a.25.25 0 0 0-.25.25Z',
+      'M22.5 8.75a.25.25 0 0 0-.25-.25h-3.5a.75.75 0 0 1 0-1.5h3.5c.966 0 1.75.784 1.75 1.75v9.5A1.75 1.75 0 0 1 22.25 20H21v1.543a1.457 1.457 0 0 1-2.487 1.03L15.939 20H10.75A1.75 1.75 0 0 1 9 18.25v-1.465a.75.75 0 0 1 1.5 0v1.465c0 .138.112.25.25.25h5.5a.75.75 0 0 1 .53.22l2.72 2.72v-2.19a.75.75 0 0 1 .75-.75h2a.25.25 0 0 0 .25-.25v-9.5Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const commit: OcticonSymbolVariants = {
+  '24': {
+    p: [
+      'M0 11.75A.75.75 0 0 1 .75 11h5a.75.75 0 0 1 0 1.5h-5a.75.75 0 0 1-.75-.75Zm17.5 0a.75.75 0 0 1 .75-.75h5a.75.75 0 0 1 0 1.5h-5a.75.75 0 0 1-.75-.75Z',
+      'M12 17.75a6 6 0 1 1 0-12 6 6 0 0 1 0 12Zm0-1.5a4.5 4.5 0 1 0 0-9 4.5 4.5 0 0 0 0 9Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const container: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'm10.41.24 4.711 2.774c.544.316.878.897.879 1.526v5.01a1.77 1.77 0 0 1-.88 1.53l-7.753 4.521-.002.001a1.769 1.769 0 0 1-1.774 0H5.59L.873 12.85A1.761 1.761 0 0 1 0 11.327V6.292c0-.304.078-.598.22-.855l.004-.005.01-.019c.15-.262.369-.486.64-.643L8.641.239a1.752 1.752 0 0 1 1.765 0l.002.001ZM9.397 1.534l-7.17 4.182 4.116 2.388a.27.27 0 0 0 .269 0l7.152-4.148-4.115-2.422a.252.252 0 0 0-.252 0Zm-7.768 10.02 4.1 2.393V9.474a1.807 1.807 0 0 1-.138-.072L1.5 7.029v4.298c0 .095.05.181.129.227Zm8.6.642 1.521-.887v-4.45l-1.521.882ZM7.365 9.402h.001c-.044.026-.09.049-.136.071v4.472l1.5-.875V8.61Zm5.885 1.032 1.115-.65h.002a.267.267 0 0 0 .133-.232V5.264l-1.25.725Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M13.152.682a2.251 2.251 0 0 1 2.269 0l.007.004 6.957 4.276a2.277 2.277 0 0 1 1.126 1.964v7.516c0 .81-.432 1.56-1.133 1.968l-.002.001-11.964 7.037-.004.003c-.706.41-1.578.41-2.284 0l-.026-.015-6.503-4.502a2.268 2.268 0 0 1-1.096-1.943V9.438c0-.392.1-.77.284-1.1l.003-.006.014-.026c.197-.342.48-.627.82-.827h.002L13.152.681Zm.757 1.295h-.001L2.648 8.616l6.248 4.247a.775.775 0 0 0 .758-.01h.001l11.633-6.804-6.629-4.074a.75.75 0 0 0-.75.003ZM8.517 14.33a2.286 2.286 0 0 1-.393-.18l-.023-.014-6.102-4.147v7.003c0 .275.145.528.379.664l.025.014 6.114 4.232V14.33ZM18 9.709l-3.25 1.9v7.548L18 17.245Zm-7.59 4.438-.002.002a2.296 2.296 0 0 1-.391.18v7.612l3.233-1.902v-7.552Zm9.09-5.316v7.532l2.124-1.25a.776.776 0 0 0 .387-.671V7.363Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const copilot: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M7.998 15.035c-4.562 0-7.873-2.914-7.998-3.749V9.338c.085-.628.677-1.686 1.588-2.065.013-.07.024-.143.036-.218.029-.183.06-.384.126-.612-.201-.508-.254-1.084-.254-1.656 0-.87.128-1.769.693-2.484.579-.733 1.494-1.124 2.724-1.261 1.206-.134 2.262.034 2.944.765.05.053.096.108.139.165.044-.057.094-.112.143-.165.682-.731 1.738-.899 2.944-.765 1.23.137 2.145.528 2.724 1.261.566.715.693 1.614.693 2.484 0 .572-.053 1.148-.254 1.656.066.228.098.429.126.612.012.076.024.148.037.218.924.385 1.522 1.471 1.591 2.095v1.872c0 .766-3.351 3.795-8.002 3.795Zm0-1.485c2.28 0 4.584-1.11 5.002-1.433V7.862l-.023-.116c-.49.21-1.075.291-1.727.291-1.146 0-2.059-.327-2.71-.991A3.222 3.222 0 0 1 8 6.303a3.24 3.24 0 0 1-.544.743c-.65.664-1.563.991-2.71.991-.652 0-1.236-.081-1.727-.291l-.023.116v4.255c.419.323 2.722 1.433 5.002 1.433ZM6.762 2.83c-.193-.206-.637-.413-1.682-.297-1.019.113-1.479.404-1.713.7-.247.312-.369.789-.369 1.554 0 .793.129 1.171.308 1.371.162.181.519.379 1.442.379.853 0 1.339-.235 1.638-.54.315-.322.527-.827.617-1.553.117-.935-.037-1.395-.241-1.614Zm4.155-.297c-1.044-.116-1.488.091-1.681.297-.204.219-.359.679-.242 1.614.091.726.303 1.231.618 1.553.299.305.784.54 1.638.54.922 0 1.28-.198 1.442-.379.179-.2.308-.578.308-1.371 0-.765-.123-1.242-.37-1.554-.233-.296-.693-.587-1.713-.7Z',
+      'M6.25 9.037a.75.75 0 0 1 .75.75v1.501a.75.75 0 0 1-1.5 0V9.787a.75.75 0 0 1 .75-.75Zm4.25.75v1.501a.75.75 0 0 1-1.5 0V9.787a.75.75 0 0 1 1.5 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M23.922 16.992c-.861 1.495-5.859 5.023-11.922 5.023-6.063 0-11.061-3.528-11.922-5.023A.641.641 0 0 1 0 16.736v-2.869a.841.841 0 0 1 .053-.22c.372-.935 1.347-2.292 2.605-2.656.167-.429.414-1.055.644-1.517a10.195 10.195 0 0 1-.052-1.086c0-1.331.282-2.499 1.132-3.368.397-.406.89-.717 1.474-.952 1.399-1.136 3.392-2.093 6.122-2.093 2.731 0 4.767.957 6.166 2.093.584.235 1.077.546 1.474.952.85.869 1.132 2.037 1.132 3.368 0 .368-.014.733-.052 1.086.23.462.477 1.088.644 1.517 1.258.364 2.233 1.721 2.605 2.656a.832.832 0 0 1 .053.22v2.869a.641.641 0 0 1-.078.256ZM12.172 11h-.344a4.323 4.323 0 0 1-.355.508C10.703 12.455 9.555 13 7.965 13c-1.725 0-2.989-.359-3.782-1.259a2.005 2.005 0 0 1-.085-.104L4 11.741v6.585c1.435.779 4.514 2.179 8 2.179 3.486 0 6.565-1.4 8-2.179v-6.585l-.098-.104s-.033.045-.085.104c-.793.9-2.057 1.259-3.782 1.259-1.59 0-2.738-.545-3.508-1.492a4.323 4.323 0 0 1-.355-.508h-.016.016Zm.641-2.935c.136 1.057.403 1.913.878 2.497.442.544 1.134.938 2.344.938 1.573 0 2.292-.337 2.657-.751.384-.435.558-1.15.558-2.361 0-1.14-.243-1.847-.705-2.319-.477-.488-1.319-.862-2.824-1.025-1.487-.161-2.192.138-2.533.529-.269.307-.437.808-.438 1.578v.021c0 .265.021.562.063.893Zm-1.626 0c.042-.331.063-.628.063-.894v-.02c-.001-.77-.169-1.271-.438-1.578-.341-.391-1.046-.69-2.533-.529-1.505.163-2.347.537-2.824 1.025-.462.472-.705 1.179-.705 2.319 0 1.211.175 1.926.558 2.361.365.414 1.084.751 2.657.751 1.21 0 1.902-.394 2.344-.938.475-.584.742-1.44.878-2.497Z',
+      'M14.5 14.25a1 1 0 0 1 1 1v2a1 1 0 0 1-2 0v-2a1 1 0 0 1 1-1Zm-5 0a1 1 0 0 1 1 1v2a1 1 0 0 1-2 0v-2a1 1 0 0 1 1-1Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+  '48': {
+    p: [
+      'M47.801 34.003c-1.72 2.988-11.706 10.037-23.82 10.037S1.881 36.991.161 34.003a1.309 1.309 0 0 1-.161-.57v-5.615c.012-.17.047-.338.11-.498.744-1.867 2.692-4.58 5.206-5.308.333-.855.826-2.106 1.287-3.029a20.112 20.112 0 0 1-.104-2.171c0-2.659.563-4.992 2.262-6.729.793-.811 1.777-1.433 2.945-1.901C14.502 5.911 18.483 4 23.938 4c5.455 0 9.523 1.911 12.319 4.182 1.167.468 2.151 1.09 2.944 1.901 1.699 1.737 2.263 4.07 2.263 6.729 0 .736-.027 1.465-.105 2.171.461.923.954 2.174 1.288 3.029 2.513.728 4.461 3.441 5.205 5.308.081.205.115.424.115.645v5.318c0 .252-.04.502-.166.72ZM24.325 22.031h-.688a8.52 8.52 0 0 1-.709 1.016c-1.537 1.892-3.833 2.98-7.008 2.98-3.447 0-5.972-.717-7.557-2.514a4.408 4.408 0 0 1-.171-.21l-.195.21v13.155c2.867 1.558 9.02 4.353 15.984 4.353s13.117-2.795 15.984-4.353V23.513l-.195-.21s-.066.091-.171.21c-1.584 1.797-4.11 2.514-7.557 2.514-3.175 0-5.47-1.088-7.008-2.98a8.637 8.637 0 0 1-.709-1.016h-.033.033Zm-1.969-5.864a14.31 14.31 0 0 0 .127-1.785v-.042c-.003-1.537-.339-2.538-.876-3.152-.681-.78-2.09-1.378-5.06-1.057-3.008.326-4.69 1.073-5.643 2.048-.923.944-1.408 2.356-1.408 4.633 0 2.42.348 3.849 1.115 4.719.729.827 2.165 1.499 5.309 1.499 2.417 0 3.799-.786 4.683-1.873.948-1.168 1.482-2.878 1.753-4.99Zm3.25 0c.271 2.112.805 3.822 1.754 4.99.883 1.087 2.265 1.873 4.682 1.873 3.145 0 4.58-.672 5.309-1.499.767-.87 1.116-2.299 1.116-4.719 0-2.277-.485-3.689-1.408-4.633-.954-.975-2.635-1.722-5.644-2.048-2.969-.321-4.378.277-5.06 1.057-.537.614-.873 1.615-.876 3.152v.042c.002.53.042 1.123.127 1.785Z',
+      'M28.998 28.516c1.104 0 1.999.895 1.999 1.999v3.998a2 2 0 1 1-3.998 0v-3.998c0-1.104.895-1.999 1.999-1.999Zm-9.996 0c1.104 0 1.999.895 1.999 1.999v3.998a2 2 0 1 1-3.998 0v-3.998c0-1.104.895-1.999 1.999-1.999Z',
+    ],
+    h: 48,
+    w: 48,
+  },
+  '96': {
+    p: [
+      'M95.667 67.954C92.225 73.933 72.24 88.04 47.997 88.04 23.754 88.04 3.769 73.933.328 67.954c-.216-.375-.307-.796-.328-1.226V55.661c.019-.371.089-.736.226-1.081 1.489-3.738 5.386-9.166 10.417-10.623.667-1.712 1.655-4.215 2.576-6.062-.154-1.414-.208-2.872-.208-4.345 0-5.322 1.128-9.99 4.527-13.466 1.587-1.623 3.557-2.869 5.893-3.805 5.595-4.545 13.563-8.369 24.48-8.369s19.057 3.824 24.652 8.369c2.337.936 4.306 2.182 5.894 3.805 3.399 3.476 4.527 8.144 4.527 13.466 0 1.473-.054 2.931-.208 4.345.921 1.847 1.909 4.35 2.576 6.062 5.03 1.457 8.928 6.885 10.417 10.623.163.41.231.848.231 1.289v10.644c0 .504-.081 1.004-.333 1.441ZM48.686 43.993l-.3.001-1.077-.001c-.423.709-.894 1.39-1.418 2.035-3.078 3.787-7.672 5.964-14.026 5.964-6.897 0-11.952-1.435-15.123-5.032a7.886 7.886 0 0 1-.342-.419l-.39.419v26.326c5.737 3.118 18.05 8.713 31.987 8.713 13.938 0 26.251-5.595 31.988-8.713V46.96l-.39-.419s-.132.181-.342.419c-3.171 3.597-8.226 5.032-15.123 5.032-6.354 0-10.949-2.177-14.026-5.964a17.178 17.178 0 0 1-1.418-2.034h-.066l.066-.001Zm-3.94-11.733c.17-1.326.251-2.513.253-3.573v-.084c-.005-3.077-.678-5.079-1.752-6.308-1.365-1.562-4.184-2.758-10.127-2.115-6.021.652-9.386 2.146-11.294 4.098-1.847 1.889-2.818 4.715-2.818 9.272 0 4.842.698 7.703 2.232 9.443 1.459 1.655 4.332 3.001 10.625 3.001 4.837 0 7.603-1.573 9.371-3.749 1.899-2.336 2.967-5.759 3.51-9.985Zm6.503 0c.543 4.226 1.611 7.649 3.51 9.985 1.768 2.176 4.533 3.749 9.371 3.749 6.292 0 9.165-1.346 10.624-3.001 1.535-1.74 2.232-4.601 2.232-9.443 0-4.557-.97-7.383-2.817-9.272-1.908-1.952-5.274-3.446-11.294-4.098-5.943-.643-8.763.553-10.127 2.115-1.074 1.229-1.747 3.231-1.752 6.308v.084c.002 1.06.083 2.247.253 3.573Zm-2.563 11.734h.066l-.066-.001v.001Z',
+      'M38.5 55.75a3.5 3.5 0 0 1 3.5 3.5v8.5a3.5 3.5 0 1 1-7 0v-8.5a3.5 3.5 0 0 1 3.5-3.5Zm19 0a3.5 3.5 0 0 1 3.5 3.5v8.5a3.5 3.5 0 1 1-7 0v-8.5a3.5 3.5 0 0 1 3.5-3.5Z',
+    ],
+    h: 96,
+    w: 96,
+  },
+}
+export const copilotError: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M16 11.24c0 .112-.072.274-.21.467L13 9.688V7.862l-.023-.116c-.49.21-1.075.291-1.727.291-.198 0-.388-.009-.571-.029L6.833 5.226a4.01 4.01 0 0 0 .17-.782c.117-.935-.037-1.395-.241-1.614-.193-.206-.637-.413-1.682-.297-.683.076-1.115.231-1.395.415l-1.257-.91c.579-.564 1.413-.877 2.485-.996 1.206-.134 2.262.034 2.944.765.05.053.096.108.139.165.044-.057.094-.112.143-.165.682-.731 1.738-.899 2.944-.765 1.23.137 2.145.528 2.724 1.261.566.715.693 1.614.693 2.484 0 .572-.053 1.148-.254 1.656.066.228.098.429.126.612.012.076.024.148.037.218.924.385 1.522 1.471 1.591 2.095Zm-5.083-8.707c-1.044-.116-1.488.091-1.681.297-.204.219-.359.679-.242 1.614.091.726.303 1.231.618 1.553.299.305.784.54 1.638.54.922 0 1.28-.198 1.442-.379.179-.2.308-.578.308-1.371 0-.765-.123-1.242-.37-1.554-.233-.296-.693-.587-1.713-.7Zm2.511 11.074c-1.393.776-3.272 1.428-5.43 1.428-4.562 0-7.873-2.914-7.998-3.749V9.338c.085-.628.677-1.686 1.588-2.065.013-.07.024-.143.036-.218.029-.183.06-.384.126-.612-.18-.455-.241-.963-.252-1.475L.31 4.107A.747.747 0 0 1 0 3.509V3.49a.748.748 0 0 1 .625-.73c.156-.026.306.047.435.139l14.667 10.578a.592.592 0 0 1 .227.264.752.752 0 0 1 .046.249v.022a.75.75 0 0 1-1.19.596Zm-1.367-.991L5.635 7.964a5.128 5.128 0 0 1-.889.073c-.652 0-1.236-.081-1.727-.291l-.023.116v4.255c.419.323 2.722 1.433 5.002 1.433 1.539 0 3.089-.505 4.063-.934Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const copilotWarning: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8.498 14.811a4.53 4.53 0 0 1-1.161-1.337 4.476 4.476 0 0 1-.587-2.224 4.496 4.496 0 0 1 4.5-4.5 4.5 4.5 0 0 1 4.5 4.5 4.5 4.5 0 0 1-7.252 3.561ZM10.5 8.75V11a.75.75 0 0 0 1.5 0V8.75a.75.75 0 1 0-1.5 0Zm.75 5.75a1 1 0 1 0 0-2 1 1 0 0 0 0 2Z',
+      'm14.354 6.114-.05-.029a5.949 5.949 0 0 0-1.351-.589c.03-.19.047-.422.047-.709 0-.765-.123-1.242-.37-1.554-.233-.296-.693-.587-1.713-.7-1.044-.116-1.488.091-1.681.297-.204.219-.359.679-.242 1.614.058.462.165.834.316 1.127A6.025 6.025 0 0 0 6.369 7.76c-.472.185-1.015.277-1.623.277-.652 0-1.236-.081-1.727-.291l-.023.116v4.255c.265.205 1.285.725 2.577 1.079a5.937 5.937 0 0 0 .939 1.736C2.733 14.407.111 12.027 0 11.286V9.338c.085-.628.677-1.686 1.588-2.065.013-.07.024-.143.036-.218.029-.183.06-.384.126-.612-.201-.508-.254-1.084-.254-1.656 0-.87.128-1.769.693-2.484.579-.733 1.494-1.124 2.724-1.261 1.206-.134 2.262.034 2.944.765.05.053.096.108.139.165.044-.057.094-.112.143-.165.682-.731 1.738-.899 2.944-.765 1.23.137 2.145.528 2.724 1.261.566.715.693 1.614.693 2.484 0 .452-.033.906-.146 1.327ZM6.762 2.83c-.193-.206-.637-.413-1.682-.297-1.019.113-1.479.404-1.713.7-.247.312-.369.789-.369 1.554 0 .793.129 1.171.308 1.371.162.181.519.379 1.442.379.853 0 1.339-.235 1.638-.54.315-.322.527-.827.617-1.553.117-.935-.037-1.395-.241-1.614Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const copy: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M0 6.75C0 5.784.784 5 1.75 5h1.5a.75.75 0 0 1 0 1.5h-1.5a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h7.5a.25.25 0 0 0 .25-.25v-1.5a.75.75 0 0 1 1.5 0v1.5A1.75 1.75 0 0 1 9.25 16h-7.5A1.75 1.75 0 0 1 0 14.25Z',
+      'M5 1.75C5 .784 5.784 0 6.75 0h7.5C15.216 0 16 .784 16 1.75v7.5A1.75 1.75 0 0 1 14.25 11h-7.5A1.75 1.75 0 0 1 5 9.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h7.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M7.024 3.75c0-.966.784-1.75 1.75-1.75H20.25c.966 0 1.75.784 1.75 1.75v11.498a1.75 1.75 0 0 1-1.75 1.75H8.774a1.75 1.75 0 0 1-1.75-1.75Zm1.75-.25a.25.25 0 0 0-.25.25v11.498c0 .139.112.25.25.25H20.25a.25.25 0 0 0 .25-.25V3.75a.25.25 0 0 0-.25-.25Z',
+      'M1.995 10.749a1.75 1.75 0 0 1 1.75-1.751H5.25a.75.75 0 1 1 0 1.5H3.745a.25.25 0 0 0-.25.25L3.5 20.25c0 .138.111.25.25.25h9.5a.25.25 0 0 0 .25-.25v-1.51a.75.75 0 1 1 1.5 0v1.51A1.75 1.75 0 0 1 13.25 22h-9.5A1.75 1.75 0 0 1 2 20.25l-.005-9.501Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const cpu: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M6.5.75V2h3V.75a.75.75 0 0 1 1.5 0V2h1.25c.966 0 1.75.784 1.75 1.75V5h1.25a.75.75 0 0 1 0 1.5H14v3h1.25a.75.75 0 0 1 0 1.5H14v1.25A1.75 1.75 0 0 1 12.25 14H11v1.25a.75.75 0 0 1-1.5 0V14h-3v1.25a.75.75 0 0 1-1.5 0V14H3.75A1.75 1.75 0 0 1 2 12.25V11H.75a.75.75 0 0 1 0-1.5H2v-3H.75a.75.75 0 0 1 0-1.5H2V3.75C2 2.784 2.784 2 3.75 2H5V.75a.75.75 0 0 1 1.5 0Zm5.75 11.75a.25.25 0 0 0 .25-.25v-8.5a.25.25 0 0 0-.25-.25h-8.5a.25.25 0 0 0-.25.25v8.5c0 .138.112.25.25.25ZM5.75 5h4.5a.75.75 0 0 1 .75.75v4.5a.75.75 0 0 1-.75.75h-4.5a.75.75 0 0 1-.75-.75v-4.5A.75.75 0 0 1 5.75 5Zm.75 4.5h3v-3h-3Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M8.75 8h6.5a.75.75 0 0 1 .75.75v6.5a.75.75 0 0 1-.75.75h-6.5a.75.75 0 0 1-.75-.75v-6.5A.75.75 0 0 1 8.75 8Zm.75 6.5h5v-5h-5Z',
+      'M15.25 1a.75.75 0 0 1 .75.75V4h2.25c.966 0 1.75.784 1.75 1.75V8h2.25a.75.75 0 0 1 0 1.5H20v5h2.25a.75.75 0 0 1 0 1.5H20v2.25A1.75 1.75 0 0 1 18.25 20H16v2.25a.75.75 0 0 1-1.5 0V20h-5v2.25a.75.75 0 0 1-1.5 0V20H5.75A1.75 1.75 0 0 1 4 18.25V16H1.75a.75.75 0 0 1 0-1.5H4v-5H1.75a.75.75 0 0 1 0-1.5H4V5.75C4 4.784 4.784 4 5.75 4H8V1.75a.75.75 0 0 1 1.5 0V4h5V1.75a.75.75 0 0 1 .75-.75Zm3 17.5a.25.25 0 0 0 .25-.25V5.75a.25.25 0 0 0-.25-.25H5.75a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const creditCard: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M10.75 9a.75.75 0 0 0 0 1.5h1.5a.75.75 0 0 0 0-1.5h-1.5Z',
+      'M0 3.75C0 2.784.784 2 1.75 2h12.5c.966 0 1.75.784 1.75 1.75v8.5A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25ZM14.5 6.5h-13v5.75c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25Zm0-2.75a.25.25 0 0 0-.25-.25H1.75a.25.25 0 0 0-.25.25V5h13Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M15.25 14a.75.75 0 0 0 0 1.5h3.5a.75.75 0 0 0 0-1.5h-3.5Z',
+      'M1.75 3h20.5c.966 0 1.75.784 1.75 1.75v14.5A1.75 1.75 0 0 1 22.25 21H1.75A1.75 1.75 0 0 1 0 19.25V4.75C0 3.784.784 3 1.75 3Zm-.25 7v9.25c0 .138.112.25.25.25h20.5a.25.25 0 0 0 .25-.25V10Zm0-5.25V8.5h21V4.75a.25.25 0 0 0-.25-.25H1.75a.25.25 0 0 0-.25.25Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const crossReference: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M2.75 3.5a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h4.5a.25.25 0 0 0 .25-.25v-2.5a.75.75 0 0 1 1.5 0v2.5A1.75 1.75 0 0 1 13.25 13H9.06l-2.573 2.573A1.458 1.458 0 0 1 4 14.543V13H2.75A1.75 1.75 0 0 1 1 11.25v-7.5C1 2.784 1.784 2 2.75 2h5.5a.75.75 0 0 1 0 1.5ZM16 1.25v4.146a.25.25 0 0 1-.427.177L14.03 4.03l-3.75 3.75a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734l3.75-3.75-1.543-1.543A.25.25 0 0 1 11.604 1h4.146a.25.25 0 0 1 .25.25Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M16.5 2.25a.75.75 0 0 1 .75-.75h5.5a.75.75 0 0 1 .75.75v5.5a.75.75 0 0 1-1.5 0V4.06l-6.22 6.22a.75.75 0 1 1-1.06-1.06L20.94 3h-3.69a.75.75 0 0 1-.75-.75Z',
+      'M3.25 4a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h2.5a.75.75 0 0 1 .75.75v3.19l3.72-3.72a.75.75 0 0 1 .53-.22h10a.25.25 0 0 0 .25-.25v-6a.75.75 0 0 1 1.5 0v6a1.75 1.75 0 0 1-1.75 1.75h-9.69l-3.573 3.573A1.457 1.457 0 0 1 5 21.043V18.5H3.25a1.75 1.75 0 0 1-1.75-1.75V4.25c0-.966.784-1.75 1.75-1.75h11a.75.75 0 0 1 0 1.5h-11Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const dash: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M2 7.75A.75.75 0 0 1 2.75 7h10a.75.75 0 0 1 0 1.5h-10A.75.75 0 0 1 2 7.75Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M4.5 12.75a.75.75 0 0 1 .75-.75h13.5a.75.75 0 0 1 0 1.5H5.25a.75.75 0 0 1-.75-.75Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const database: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M1 3.5c0-.626.292-1.165.7-1.59.406-.422.956-.767 1.579-1.041C4.525.32 6.195 0 8 0c1.805 0 3.475.32 4.722.869.622.274 1.172.62 1.578 1.04.408.426.7.965.7 1.591v9c0 .626-.292 1.165-.7 1.59-.406.422-.956.767-1.579 1.041C11.476 15.68 9.806 16 8 16c-1.805 0-3.475-.32-4.721-.869-.623-.274-1.173-.62-1.579-1.04-.408-.426-.7-.965-.7-1.591Zm1.5 0c0 .133.058.318.282.551.227.237.591.483 1.101.707C4.898 5.205 6.353 5.5 8 5.5c1.646 0 3.101-.295 4.118-.742.508-.224.873-.471 1.1-.708.224-.232.282-.417.282-.55 0-.133-.058-.318-.282-.551-.227-.237-.591-.483-1.101-.707C11.102 1.795 9.647 1.5 8 1.5c-1.646 0-3.101.295-4.118.742-.508.224-.873.471-1.1.708-.224.232-.282.417-.282.55Zm0 4.5c0 .133.058.318.282.551.227.237.591.483 1.101.707C4.898 9.705 6.353 10 8 10c1.646 0 3.101-.295 4.118-.742.508-.224.873-.471 1.1-.708.224-.232.282-.417.282-.55V5.724c-.241.15-.503.286-.778.407C11.475 6.68 9.805 7 8 7c-1.805 0-3.475-.32-4.721-.869a6.15 6.15 0 0 1-.779-.407Zm0 2.225V12.5c0 .133.058.318.282.55.227.237.592.484 1.1.708 1.016.447 2.471.742 4.118.742 1.647 0 3.102-.295 4.117-.742.51-.224.874-.47 1.101-.707.224-.233.282-.418.282-.551v-2.275c-.241.15-.503.285-.778.406-1.247.549-2.917.869-4.722.869-1.805 0-3.475-.32-4.721-.869a6.327 6.327 0 0 1-.779-.406Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M12 1.25c2.487 0 4.773.402 6.466 1.079.844.337 1.577.758 2.112 1.264.536.507.922 1.151.922 1.907v12.987l-.026.013h.026c0 .756-.386 1.4-.922 1.907-.535.506-1.268.927-2.112 1.264-1.693.677-3.979 1.079-6.466 1.079s-4.774-.402-6.466-1.079c-.844-.337-1.577-.758-2.112-1.264C2.886 19.9 2.5 19.256 2.5 18.5h.026l-.026-.013V5.5c0-.756.386-1.4.922-1.907.535-.506 1.268-.927 2.112-1.264C7.226 1.652 9.513 1.25 12 1.25ZM4 14.371v4.116l-.013.013H4c0 .211.103.487.453.817.351.332.898.666 1.638.962 1.475.589 3.564.971 5.909.971 2.345 0 4.434-.381 5.909-.971.739-.296 1.288-.63 1.638-.962.349-.33.453-.607.453-.817h.013L20 18.487v-4.116a7.85 7.85 0 0 1-1.534.8c-1.693.677-3.979 1.079-6.466 1.079s-4.774-.402-6.466-1.079a7.843 7.843 0 0 1-1.534-.8ZM20 12V7.871a7.85 7.85 0 0 1-1.534.8C16.773 9.348 14.487 9.75 12 9.75s-4.774-.402-6.466-1.079A7.85 7.85 0 0 1 4 7.871V12c0 .21.104.487.453.817.35.332.899.666 1.638.961 1.475.59 3.564.972 5.909.972 2.345 0 4.434-.382 5.909-.972.74-.295 1.287-.629 1.638-.96.35-.33.453-.607.453-.818ZM4 5.5c0 .211.103.487.453.817.351.332.898.666 1.638.962 1.475.589 3.564.971 5.909.971 2.345 0 4.434-.381 5.909-.971.739-.296 1.288-.63 1.638-.962.349-.33.453-.607.453-.817 0-.211-.103-.487-.453-.817-.351-.332-.898-.666-1.638-.962-1.475-.589-3.564-.971-5.909-.971-2.345 0-4.434.381-5.909.971-.739.296-1.288.63-1.638.962C4.104 5.013 4 5.29 4 5.5Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const dependabot: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M5.75 7.5a.75.75 0 0 1 .75.75v1.5a.75.75 0 0 1-1.5 0v-1.5a.75.75 0 0 1 .75-.75Zm5.25.75a.75.75 0 0 0-1.5 0v1.5a.75.75 0 0 0 1.5 0v-1.5Z',
+      'M6.25 0h2A.75.75 0 0 1 9 .75V3.5h3.25a2.25 2.25 0 0 1 2.25 2.25V8h.75a.75.75 0 0 1 0 1.5h-.75v2.75a2.25 2.25 0 0 1-2.25 2.25h-8.5a2.25 2.25 0 0 1-2.25-2.25V9.5H.75a.75.75 0 0 1 0-1.5h.75V5.75A2.25 2.25 0 0 1 3.75 3.5H7.5v-2H6.25a.75.75 0 0 1 0-1.5ZM3 5.75v6.5c0 .414.336.75.75.75h8.5a.75.75 0 0 0 .75-.75v-6.5a.75.75 0 0 0-.75-.75h-8.5a.75.75 0 0 0-.75.75Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M8.75 11a.75.75 0 0 1 .75.75v3.5a.75.75 0 0 1-1.5 0v-3.5a.75.75 0 0 1 .75-.75Zm7.25.75a.75.75 0 0 0-1.5 0v3.5a.75.75 0 0 0 1.5 0v-3.5Z',
+      'M9.813 1h2.437a.75.75 0 0 1 .75.75V5h6.75A2.25 2.25 0 0 1 22 7.25v5.25h1.25a.75.75 0 0 1 0 1.5H22v5.75A2.25 2.25 0 0 1 19.75 22H4.25A2.25 2.25 0 0 1 2 19.75V14H.75a.75.75 0 0 1 0-1.5H2V7.25A2.25 2.25 0 0 1 4.25 5h7.25V2.5H9.813A.75.75 0 0 1 9.812 1ZM3.5 7.25v12.5c0 .414.336.75.75.75h15.5a.75.75 0 0 0 .75-.75V7.25a.75.75 0 0 0-.75-.75H4.25a.75.75 0 0 0-.75.75Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const desktopDownload: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'm4.927 5.427 2.896 2.896a.25.25 0 0 0 .354 0l2.896-2.896A.25.25 0 0 0 10.896 5H8.75V.75a.75.75 0 1 0-1.5 0V5H5.104a.25.25 0 0 0-.177.427Z',
+      'M1.573 2.573a.25.25 0 0 0-.073.177v7.5a.25.25 0 0 0 .25.25h12.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25h-3a.75.75 0 1 1 0-1.5h3A1.75 1.75 0 0 1 16 2.75v7.5A1.75 1.75 0 0 1 14.25 12h-3.727c.099 1.041.52 1.872 1.292 2.757A.75.75 0 0 1 11.25 16h-6.5a.75.75 0 0 1-.565-1.243c.772-.885 1.192-1.716 1.292-2.757H1.75A1.75 1.75 0 0 1 0 10.25v-7.5A1.75 1.75 0 0 1 1.75 1h3a.75.75 0 0 1 0 1.5h-3a.25.25 0 0 0-.177.073ZM6.982 12a5.72 5.72 0 0 1-.765 2.5h3.566a5.72 5.72 0 0 1-.765-2.5H6.982Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M11.25 9.331V.75a.75.75 0 0 1 1.5 0v8.58l1.949-2.11A.75.75 0 1 1 15.8 8.237l-3.25 3.52a.75.75 0 0 1-1.102 0l-3.25-3.52A.75.75 0 1 1 9.3 7.22l1.949 2.111Z',
+      'M2.5 3.75v11.5c0 .138.112.25.25.25h18.5a.25.25 0 0 0 .25-.25V3.75a.25.25 0 0 0-.25-.25h-5.5a.75.75 0 0 1 0-1.5h5.5c.966 0 1.75.784 1.75 1.75v11.5A1.75 1.75 0 0 1 21.25 17h-6.204c.171 1.375.805 2.652 1.769 3.757A.752.752 0 0 1 16.25 22h-8.5a.75.75 0 0 1-.566-1.243c.965-1.105 1.599-2.382 1.77-3.757H2.75A1.75 1.75 0 0 1 1 15.25V3.75C1 2.784 1.784 2 2.75 2h5.5a.75.75 0 0 1 0 1.5h-5.5a.25.25 0 0 0-.25.25ZM10.463 17c-.126 1.266-.564 2.445-1.223 3.5h5.52c-.66-1.055-1.098-2.234-1.223-3.5Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const deviceCamera: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M15 3c.55 0 1 .45 1 1v9c0 .55-.45 1-1 1H1c-.55 0-1-.45-1-1V4c0-.55.45-1 1-1 0-.55.45-1 1-1h4c.55 0 1 .45 1 1Zm-4.5 9c1.94 0 3.5-1.56 3.5-3.5S12.44 5 10.5 5 7 6.56 7 8.5 8.56 12 10.5 12ZM13 8.5c0 1.38-1.13 2.5-2.5 2.5S8 9.87 8 8.5 9.13 6 10.5 6 13 7.13 13 8.5ZM6 5V4H2v1Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const deviceCameraVideo: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M16 3.75v8.5a.75.75 0 0 1-1.136.643L11 10.575v.675A1.75 1.75 0 0 1 9.25 13h-7.5A1.75 1.75 0 0 1 0 11.25v-6.5C0 3.784.784 3 1.75 3h7.5c.966 0 1.75.784 1.75 1.75v.675l3.864-2.318A.75.75 0 0 1 16 3.75Zm-6.5 1a.25.25 0 0 0-.25-.25h-7.5a.25.25 0 0 0-.25.25v6.5c0 .138.112.25.25.25h7.5a.25.25 0 0 0 .25-.25v-6.5ZM11 8.825l3.5 2.1v-5.85l-3.5 2.1Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M24 5.25v13a.75.75 0 0 1-1.136.643L16.5 15.075v2.175A1.75 1.75 0 0 1 14.75 19h-13A1.75 1.75 0 0 1 0 17.25v-11C0 5.284.784 4.5 1.75 4.5h13c.966 0 1.75.784 1.75 1.75v2.175l6.364-3.818A.75.75 0 0 1 24 5.25Zm-9 1a.25.25 0 0 0-.25-.25h-13a.25.25 0 0 0-.25.25v11c0 .138.112.25.25.25h13a.25.25 0 0 0 .25-.25v-11Zm1.5 7.075 6 3.6V6.575l-6 3.6Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const deviceDesktop: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M14.25 1c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 14.25 12h-3.727c.099 1.041.52 1.872 1.292 2.757A.752.752 0 0 1 11.25 16h-6.5a.75.75 0 0 1-.565-1.243c.772-.885 1.192-1.716 1.292-2.757H1.75A1.75 1.75 0 0 1 0 10.25v-7.5C0 1.784.784 1 1.75 1ZM1.75 2.5a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25ZM9.018 12H6.982a5.72 5.72 0 0 1-.765 2.5h3.566a5.72 5.72 0 0 1-.765-2.5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M8.954 17H2.75A1.75 1.75 0 0 1 1 15.25V3.75C1 2.784 1.784 2 2.75 2h18.5c.966 0 1.75.784 1.75 1.75v11.5A1.75 1.75 0 0 1 21.25 17h-6.204c.171 1.375.805 2.652 1.769 3.757A.752.752 0 0 1 16.25 22h-8.5a.75.75 0 0 1-.565-1.243c.964-1.105 1.598-2.382 1.769-3.757ZM21.5 3.75a.25.25 0 0 0-.25-.25H2.75a.25.25 0 0 0-.25.25v11.5c0 .138.112.25.25.25h18.5a.25.25 0 0 0 .25-.25ZM13.537 17h-3.074c-.126 1.266-.564 2.445-1.223 3.5h5.52c-.659-1.055-1.098-2.234-1.223-3.5Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const deviceMobile: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M3.75 0h8.5C13.216 0 14 .784 14 1.75v12.5A1.75 1.75 0 0 1 12.25 16h-8.5A1.75 1.75 0 0 1 2 14.25V1.75C2 .784 2.784 0 3.75 0ZM3.5 1.75v12.5c0 .138.112.25.25.25h8.5a.25.25 0 0 0 .25-.25V1.75a.25.25 0 0 0-.25-.25h-8.5a.25.25 0 0 0-.25.25ZM8 13a1 1 0 1 1 0-2 1 1 0 0 1 0 2Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M10.25 5.25A.75.75 0 0 1 11 4.5h2A.75.75 0 0 1 13 6h-2a.75.75 0 0 1-.75-.75ZM12 19.5a1 1 0 1 0 0-2 1 1 0 0 0 0 2Z',
+      'M4 2.75C4 1.784 4.784 1 5.75 1h12.5c.966 0 1.75.784 1.75 1.75v18.5A1.75 1.75 0 0 1 18.25 23H5.75A1.75 1.75 0 0 1 4 21.25Zm1.75-.25a.25.25 0 0 0-.25.25v18.5c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25V2.75a.25.25 0 0 0-.25-.25Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const devices: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M0 2.75C0 1.784.784 1 1.75 1h12.5c.966 0 1.75.784 1.75 1.75V5a.75.75 0 0 1-1.5 0V2.75a.25.25 0 0 0-.25-.25H1.75a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25H7A.75.75 0 0 1 7 12h-.268a5.712 5.712 0 0 1-.765 2.5H7A.75.75 0 0 1 7 16H4.5a.75.75 0 0 1-.565-1.243c.772-.885 1.193-1.716 1.292-2.757H1.75A1.75 1.75 0 0 1 0 10.25v-7.5Z',
+      'M10.75 7h3.5c.967 0 1.75.784 1.75 1.75v5.5A1.75 1.75 0 0 1 14.25 16h-3.5A1.75 1.75 0 0 1 9 14.25v-5.5C9 7.784 9.783 7 10.75 7Zm-.25 1.75v5.5c0 .138.112.25.25.25h3.5a.25.25 0 0 0 .25-.25v-5.5a.25.25 0 0 0-.25-.25h-3.5a.25.25 0 0 0-.25.25Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M1 3.75C1 2.784 1.784 2 2.75 2h18.5c.966 0 1.75.784 1.75 1.75v4a.75.75 0 0 1-1.5 0v-4a.25.25 0 0 0-.25-.25H2.75a.25.25 0 0 0-.25.25v11.5c0 .138.112.25.25.25h9a.75.75 0 0 1 0 1.5h-1.287c-.126 1.266-.564 2.445-1.223 3.5h2.51a.75.75 0 0 1 0 1.5h-4a.75.75 0 0 1-.565-1.243c.964-1.105 1.598-2.382 1.769-3.757H2.75A1.75 1.75 0 0 1 1 15.25V3.75Z',
+      'M14 11.75c0-.967.783-1.75 1.75-1.75h5.5c.966 0 1.75.783 1.75 1.75v8.5A1.75 1.75 0 0 1 21.25 22h-5.5A1.75 1.75 0 0 1 14 20.25Zm1.75-.25a.25.25 0 0 0-.25.25v8.5c0 .138.112.25.25.25h5.5a.25.25 0 0 0 .25-.25v-8.5a.25.25 0 0 0-.25-.25Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const diamond: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M.527 9.237a1.75 1.75 0 0 1 0-2.474L6.777.512a1.75 1.75 0 0 1 2.475 0l6.251 6.25a1.75 1.75 0 0 1 0 2.475l-6.25 6.251a1.75 1.75 0 0 1-2.475 0L.527 9.238Zm1.06-1.414a.25.25 0 0 0 0 .354l6.251 6.25a.25.25 0 0 0 .354 0l6.25-6.25a.25.25 0 0 0 0-.354l-6.25-6.25a.25.25 0 0 0-.354 0l-6.25 6.25Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M1.527 13.237a1.75 1.75 0 0 1 0-2.474l9.272-9.273a1.75 1.75 0 0 1 2.475 0l9.272 9.273a1.75 1.75 0 0 1 0 2.474l-9.272 9.272a1.75 1.75 0 0 1-2.475 0Zm1.06-1.414a.25.25 0 0 0 0 .354l9.273 9.272a.25.25 0 0 0 .353 0l9.272-9.272a.25.25 0 0 0 0-.354l-9.272-9.272a.25.25 0 0 0-.353 0Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const diff: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8.75 1.75V5H12a.75.75 0 0 1 0 1.5H8.75v3.25a.75.75 0 0 1-1.5 0V6.5H4A.75.75 0 0 1 4 5h3.25V1.75a.75.75 0 0 1 1.5 0ZM4 13h8a.75.75 0 0 1 0 1.5H4A.75.75 0 0 1 4 13Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M12.25 3.5a.75.75 0 0 1 .75.75V8.5h4.25a.75.75 0 0 1 0 1.5H13v4.25a.75.75 0 0 1-1.5 0V10H7.25a.75.75 0 0 1 0-1.5h4.25V4.25a.75.75 0 0 1 .75-.75ZM6.562 19.25a.75.75 0 0 1 .75-.75h9.938a.75.75 0 0 1 0 1.5H7.312a.75.75 0 0 1-.75-.75Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const diffAdded: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M2.75 1h10.5c.966 0 1.75.784 1.75 1.75v10.5A1.75 1.75 0 0 1 13.25 15H2.75A1.75 1.75 0 0 1 1 13.25V2.75C1 1.784 1.784 1 2.75 1Zm10.5 1.5H2.75a.25.25 0 0 0-.25.25v10.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V2.75a.25.25 0 0 0-.25-.25ZM8 4a.75.75 0 0 1 .75.75v2.5h2.5a.75.75 0 0 1 0 1.5h-2.5v2.5a.75.75 0 0 1-1.5 0v-2.5h-2.5a.75.75 0 0 1 0-1.5h2.5v-2.5A.75.75 0 0 1 8 4Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const diffIgnored: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M13.25 1c.966 0 1.75.784 1.75 1.75v10.5A1.75 1.75 0 0 1 13.25 15H2.75A1.75 1.75 0 0 1 1 13.25V2.75C1 1.784 1.784 1 2.75 1ZM2.75 2.5a.25.25 0 0 0-.25.25v10.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V2.75a.25.25 0 0 0-.25-.25Zm8.53 3.28-5.5 5.5a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734l5.5-5.5a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const diffModified: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M13.25 1c.966 0 1.75.784 1.75 1.75v10.5A1.75 1.75 0 0 1 13.25 15H2.75A1.75 1.75 0 0 1 1 13.25V2.75C1 1.784 1.784 1 2.75 1ZM2.75 2.5a.25.25 0 0 0-.25.25v10.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V2.75a.25.25 0 0 0-.25-.25ZM8 10a2 2 0 1 1-.001-3.999A2 2 0 0 1 8 10Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const diffRemoved: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M13.25 1c.966 0 1.75.784 1.75 1.75v10.5A1.75 1.75 0 0 1 13.25 15H2.75A1.75 1.75 0 0 1 1 13.25V2.75C1 1.784 1.784 1 2.75 1ZM2.75 2.5a.25.25 0 0 0-.25.25v10.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V2.75a.25.25 0 0 0-.25-.25Zm8.5 6.25h-6.5a.75.75 0 0 1 0-1.5h6.5a.75.75 0 0 1 0 1.5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const diffRenamed: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M13.25 1c.966 0 1.75.784 1.75 1.75v10.5A1.75 1.75 0 0 1 13.25 15H2.75A1.75 1.75 0 0 1 1 13.25V2.75C1 1.784 1.784 1 2.75 1ZM2.75 2.5a.25.25 0 0 0-.25.25v10.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V2.75a.25.25 0 0 0-.25-.25Zm9.03 6.03-3.25 3.25a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734l1.97-1.97H4.75a.75.75 0 0 1 0-1.5h4.69L7.47 5.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018l3.25 3.25a.75.75 0 0 1 0 1.06Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const discussionClosed: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M0 2.75C0 1.783.784 1 1.75 1h8.5c.967 0 1.75.783 1.75 1.75v5.5A1.75 1.75 0 0 1 10.25 10H7.061l-2.574 2.573A1.457 1.457 0 0 1 2 11.543V10h-.25A1.75 1.75 0 0 1 0 8.25Zm1.75-.25a.25.25 0 0 0-.25.25v5.5c0 .138.112.25.25.25h1a.75.75 0 0 1 .75.75v2.189L6.22 8.72a.747.747 0 0 1 .53-.22h3.5a.25.25 0 0 0 .25-.25v-5.5a.25.25 0 0 0-.25-.25Zm12.5 2h-.5a.75.75 0 0 1 0-1.5h.5c.967 0 1.75.783 1.75 1.75v5.5A1.75 1.75 0 0 1 14.25 12H14v1.543a1.457 1.457 0 0 1-2.487 1.03L9.22 12.28a.749.749 0 1 1 1.06-1.06l2.22 2.219V11.25a.75.75 0 0 1 .75-.75h1a.25.25 0 0 0 .25-.25v-5.5a.25.25 0 0 0-.25-.25Zm-5.47.28-3 3a.747.747 0 0 1-1.06 0l-1.5-1.5a.749.749 0 1 1 1.06-1.06l.97.969L7.72 3.72a.749.749 0 1 1 1.06 1.06Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M0 2.75C0 1.783.784 1 1.75 1h12.5c.967 0 1.75.783 1.75 1.75v9.5A1.75 1.75 0 0 1 14.25 14H8.061l-2.574 2.573A1.457 1.457 0 0 1 3 15.543V14H1.75A1.75 1.75 0 0 1 0 12.25Zm1.75-.25a.25.25 0 0 0-.25.25v9.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.189l2.72-2.719a.747.747 0 0 1 .53-.22h6.5a.25.25 0 0 0 .25-.25v-9.5a.25.25 0 0 0-.25-.25Zm20.5 6h-3.5a.75.75 0 0 1 0-1.5h3.5c.966 0 1.75.784 1.75 1.75v9.5A1.75 1.75 0 0 1 22.25 20H21v1.543a1.457 1.457 0 0 1-2.487 1.03L15.939 20H10.75A1.75 1.75 0 0 1 9 18.25v-1.465a.75.75 0 0 1 1.5 0v1.465c0 .138.112.25.25.25h5.5c.199 0 .39.079.53.22l2.72 2.719V19.25a.75.75 0 0 1 .75-.75h2a.25.25 0 0 0 .25-.25v-9.5a.25.25 0 0 0-.25-.25Zm-9.72-3.22-5 5a.747.747 0 0 1-1.06 0l-2.5-2.5a.749.749 0 1 1 1.06-1.06L7 8.689l4.47-4.469a.749.749 0 1 1 1.06 1.06Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const discussionDuplicate: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M0 2.75C0 1.783.784 1 1.75 1h8.5c.967 0 1.75.783 1.75 1.75v5.5A1.75 1.75 0 0 1 10.25 10H7.061l-2.574 2.573A1.457 1.457 0 0 1 2 11.543V10h-.25A1.75 1.75 0 0 1 0 8.25Zm1.75-.25a.25.25 0 0 0-.25.25v5.5c0 .138.112.25.25.25h1a.75.75 0 0 1 .75.75v2.189L6.22 8.72a.747.747 0 0 1 .53-.22h3.5a.25.25 0 0 0 .25-.25v-5.5a.25.25 0 0 0-.25-.25Zm12.5 2h-.5a.75.75 0 0 1 0-1.5h.5c.967 0 1.75.783 1.75 1.75v5.5A1.75 1.75 0 0 1 14.25 12H14v1.543a1.457 1.457 0 0 1-2.487 1.03L9.22 12.28a.749.749 0 1 1 1.06-1.06l2.22 2.219V11.25a.75.75 0 0 1 .75-.75h1a.25.25 0 0 0 .25-.25v-5.5a.25.25 0 0 0-.25-.25Zm-6.282.03L5.03 7.468a.749.749 0 1 1-1.06-1.061L6.907 3.47a.75.75 0 0 1 1.061 1.06Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M0 2.75C0 1.783.784 1 1.75 1h12.5c.967 0 1.75.783 1.75 1.75v9.5A1.75 1.75 0 0 1 14.25 14H8.061l-2.574 2.573A1.457 1.457 0 0 1 3 15.543V14H1.75A1.75 1.75 0 0 1 0 12.25Zm1.75-.25a.25.25 0 0 0-.25.25v9.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.189l2.72-2.719a.747.747 0 0 1 .53-.22h6.5a.25.25 0 0 0 .25-.25v-9.5a.25.25 0 0 0-.25-.25Zm20.5 6h-3.5a.75.75 0 0 1 0-1.5h3.5c.966 0 1.75.784 1.75 1.75v9.5A1.75 1.75 0 0 1 22.25 20H21v1.543a1.457 1.457 0 0 1-2.487 1.03L15.939 20H10.75A1.75 1.75 0 0 1 9 18.25v-1.465a.75.75 0 0 1 1.5 0v1.465c0 .138.112.25.25.25h5.5c.199 0 .39.079.53.22l2.72 2.719V19.25a.75.75 0 0 1 .75-.75h2a.25.25 0 0 0 .25-.25v-9.5a.25.25 0 0 0-.25-.25ZM11.28 5.53l-5 5a.749.749 0 1 1-1.06-1.06l5-5a.749.749 0 1 1 1.06 1.06Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const discussionOutdated: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M0 2.75C0 1.783.784 1 1.75 1h8.5c.967 0 1.75.783 1.75 1.75v5.5A1.75 1.75 0 0 1 10.25 10H7.061l-2.574 2.573A1.457 1.457 0 0 1 2 11.543V10h-.25A1.75 1.75 0 0 1 0 8.25Zm1.75-.25a.25.25 0 0 0-.25.25v5.5c0 .138.112.25.25.25h1a.75.75 0 0 1 .75.75v2.189L6.22 8.72a.747.747 0 0 1 .53-.22h3.5a.25.25 0 0 0 .25-.25v-5.5a.25.25 0 0 0-.25-.25Zm12.5 2h-.5a.75.75 0 0 1 0-1.5h.5c.967 0 1.75.783 1.75 1.75v5.5A1.75 1.75 0 0 1 14.25 12H14v1.543a1.457 1.457 0 0 1-2.487 1.03L9.22 12.28a.749.749 0 1 1 1.06-1.06l2.22 2.219V11.25a.75.75 0 0 1 .75-.75h1a.25.25 0 0 0 .25-.25v-5.5a.25.25 0 0 0-.25-.25ZM6.5 4v1.492l.466.187.036.015.812.375a.75.75 0 1 1-.628 1.362l-.795-.367-.92-.368A.75.75 0 0 1 5 6V4a.75.75 0 0 1 1.5 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M0 2.75C0 1.783.784 1 1.75 1h12.5c.967 0 1.75.783 1.75 1.75v9.5A1.75 1.75 0 0 1 14.25 14H8.061l-2.574 2.573A1.457 1.457 0 0 1 3 15.543V14H1.75A1.75 1.75 0 0 1 0 12.25Zm1.75-.25a.25.25 0 0 0-.25.25v9.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.189l2.72-2.719a.747.747 0 0 1 .53-.22h6.5a.25.25 0 0 0 .25-.25v-9.5a.25.25 0 0 0-.25-.25Zm20.5 6h-3.5a.75.75 0 0 1 0-1.5h3.5c.966 0 1.75.784 1.75 1.75v9.5A1.75 1.75 0 0 1 22.25 20H21v1.543a1.457 1.457 0 0 1-2.487 1.03L15.939 20H10.75A1.75 1.75 0 0 1 9 18.25v-1.465a.75.75 0 0 1 1.5 0v1.465c0 .138.112.25.25.25h5.5c.199 0 .39.079.53.22l2.72 2.719V19.25a.75.75 0 0 1 .75-.75h2a.25.25 0 0 0 .25-.25v-9.5a.25.25 0 0 0-.25-.25ZM8.5 4.75v3.14l1.15.488a.608.608 0 0 1 .037.017l1.393.681a.75.75 0 0 1-.66 1.348l-1.374-.673-1.589-.674A.751.751 0 0 1 7 8.386V4.75a.75.75 0 0 1 1.5 0Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const dot: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M4 8a4 4 0 1 1 8 0 4 4 0 0 1-8 0Zm4-2.5a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M12 18a6 6 0 1 1 0-12 6 6 0 0 1 0 12Zm0-1.5a4.5 4.5 0 1 0 0-9 4.5 4.5 0 0 0 0 9Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const dotFill: OcticonSymbolVariants = {
+  '16': { p: ['M8 4a4 4 0 1 1 0 8 4 4 0 0 1 0-8Z'], h: 16, w: 16 },
+  '24': { p: ['M12 18a6 6 0 1 0 0-12 6 6 0 0 0 0 12Z'], h: 24, w: 24 },
+}
+export const download: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M2.75 14A1.75 1.75 0 0 1 1 12.25v-2.5a.75.75 0 0 1 1.5 0v2.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25v-2.5a.75.75 0 0 1 1.5 0v2.5A1.75 1.75 0 0 1 13.25 14Z',
+      'M7.25 7.689V2a.75.75 0 0 1 1.5 0v5.689l1.97-1.969a.749.749 0 1 1 1.06 1.06l-3.25 3.25a.749.749 0 0 1-1.06 0L4.22 6.78a.749.749 0 1 1 1.06-1.06l1.97 1.969Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M4.75 17.25a.75.75 0 0 1 .75.75v2.25c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25V18a.75.75 0 0 1 1.5 0v2.25A1.75 1.75 0 0 1 18.25 22H5.75A1.75 1.75 0 0 1 4 20.25V18a.75.75 0 0 1 .75-.75Z',
+      'M5.22 9.97a.749.749 0 0 1 1.06 0l4.97 4.969V2.75a.75.75 0 0 1 1.5 0v12.189l4.97-4.969a.749.749 0 1 1 1.06 1.06l-6.25 6.25a.749.749 0 0 1-1.06 0l-6.25-6.25a.749.749 0 0 1 0-1.06Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const duplicate: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M10.5 3a.75.75 0 0 1 .75.75v1h1a.75.75 0 0 1 0 1.5h-1v1a.75.75 0 0 1-1.5 0v-1h-1a.75.75 0 0 1 0-1.5h1v-1A.75.75 0 0 1 10.5 3Z',
+      'M6.75 0h7.5C15.216 0 16 .784 16 1.75v7.5A1.75 1.75 0 0 1 14.25 11h-7.5A1.75 1.75 0 0 1 5 9.25v-7.5C5 .784 5.784 0 6.75 0ZM6.5 1.75v7.5c0 .138.112.25.25.25h7.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25h-7.5a.25.25 0 0 0-.25.25Z',
+      'M1.75 5A1.75 1.75 0 0 0 0 6.75v7.5C0 15.216.784 16 1.75 16h7.5A1.75 1.75 0 0 0 11 14.25v-1.5a.75.75 0 0 0-1.5 0v1.5a.25.25 0 0 1-.25.25h-7.5a.25.25 0 0 1-.25-.25v-7.5a.25.25 0 0 1 .25-.25h1.5a.75.75 0 0 0 0-1.5h-1.5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M14.513 6a.75.75 0 0 1 .75.75v2h1.987a.75.75 0 0 1 0 1.5h-1.987v2a.75.75 0 1 1-1.5 0v-2H11.75a.75.75 0 0 1 0-1.5h2.013v-2a.75.75 0 0 1 .75-.75Z',
+      'M7.024 3.75c0-.966.784-1.75 1.75-1.75H20.25c.966 0 1.75.784 1.75 1.75v11.498a1.75 1.75 0 0 1-1.75 1.75H8.774a1.75 1.75 0 0 1-1.75-1.75Zm1.75-.25a.25.25 0 0 0-.25.25v11.498c0 .139.112.25.25.25H20.25a.25.25 0 0 0 .25-.25V3.75a.25.25 0 0 0-.25-.25Z',
+      'M1.995 10.749a1.75 1.75 0 0 1 1.75-1.751H5.25a.75.75 0 1 1 0 1.5H3.745a.25.25 0 0 0-.25.25L3.5 20.25c0 .138.111.25.25.25h9.5a.25.25 0 0 0 .25-.25v-1.51a.75.75 0 1 1 1.5 0v1.51A1.75 1.75 0 0 1 13.25 22h-9.5A1.75 1.75 0 0 1 2 20.25l-.005-9.501Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const ellipsis: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M0 5.75C0 4.784.784 4 1.75 4h12.5c.966 0 1.75.784 1.75 1.75v4.5A1.75 1.75 0 0 1 14.25 12H1.75A1.75 1.75 0 0 1 0 10.25ZM12 7a1 1 0 1 0 0 2 1 1 0 0 0 0-2ZM7 8a1 1 0 1 0 2 0 1 1 0 0 0-2 0ZM4 7a1 1 0 1 0 0 2 1 1 0 0 0 0-2Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const eye: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8 2c1.981 0 3.671.992 4.933 2.078 1.27 1.091 2.187 2.345 2.637 3.023a1.62 1.62 0 0 1 0 1.798c-.45.678-1.367 1.932-2.637 3.023C11.67 13.008 9.981 14 8 14c-1.981 0-3.671-.992-4.933-2.078C1.797 10.83.88 9.576.43 8.898a1.62 1.62 0 0 1 0-1.798c.45-.677 1.367-1.931 2.637-3.022C4.33 2.992 6.019 2 8 2ZM1.679 7.932a.12.12 0 0 0 0 .136c.411.622 1.241 1.75 2.366 2.717C5.176 11.758 6.527 12.5 8 12.5c1.473 0 2.825-.742 3.955-1.715 1.124-.967 1.954-2.096 2.366-2.717a.12.12 0 0 0 0-.136c-.412-.621-1.242-1.75-2.366-2.717C10.824 4.242 9.473 3.5 8 3.5c-1.473 0-2.825.742-3.955 1.715-1.124.967-1.954 2.096-2.366 2.717ZM8 10a2 2 0 1 1-.001-3.999A2 2 0 0 1 8 10Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M15.5 12a3.5 3.5 0 1 1-7 0 3.5 3.5 0 0 1 7 0Z',
+      'M12 3.5c3.432 0 6.124 1.534 8.054 3.241 1.926 1.703 3.132 3.61 3.616 4.46a1.6 1.6 0 0 1 0 1.598c-.484.85-1.69 2.757-3.616 4.461-1.929 1.706-4.622 3.24-8.054 3.24-3.432 0-6.124-1.534-8.054-3.24C2.02 15.558.814 13.65.33 12.8a1.6 1.6 0 0 1 0-1.598c.484-.85 1.69-2.757 3.616-4.462C5.875 5.034 8.568 3.5 12 3.5ZM1.633 11.945a.115.115 0 0 0-.017.055c.001.02.006.039.017.056.441.774 1.551 2.527 3.307 4.08C6.691 17.685 9.045 19 12 19c2.955 0 5.31-1.315 7.06-2.864 1.756-1.553 2.866-3.306 3.307-4.08a.111.111 0 0 0 .017-.056.111.111 0 0 0-.017-.056c-.441-.773-1.551-2.527-3.307-4.08C17.309 6.315 14.955 5 12 5 9.045 5 6.69 6.314 4.94 7.865c-1.756 1.552-2.866 3.306-3.307 4.08Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const eyeClosed: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M.143 2.31a.75.75 0 0 1 1.047-.167l14.5 10.5a.75.75 0 1 1-.88 1.214l-2.248-1.628C11.346 13.19 9.792 14 8 14c-1.981 0-3.67-.992-4.933-2.078C1.797 10.832.88 9.577.43 8.9a1.619 1.619 0 0 1 0-1.797c.353-.533.995-1.42 1.868-2.305L.31 3.357A.75.75 0 0 1 .143 2.31Zm1.536 5.622A.12.12 0 0 0 1.657 8c0 .021.006.045.022.068.412.621 1.242 1.75 2.366 2.717C5.175 11.758 6.527 12.5 8 12.5c1.195 0 2.31-.488 3.29-1.191L9.063 9.695A2 2 0 0 1 6.058 7.52L3.529 5.688a14.207 14.207 0 0 0-1.85 2.244ZM8 3.5c-.516 0-1.017.09-1.499.251a.75.75 0 1 1-.473-1.423A6.207 6.207 0 0 1 8 2c1.981 0 3.67.992 4.933 2.078 1.27 1.091 2.187 2.345 2.637 3.023a1.62 1.62 0 0 1 0 1.798c-.11.166-.248.365-.41.587a.75.75 0 1 1-1.21-.887c.148-.201.272-.382.371-.53a.119.119 0 0 0 0-.137c-.412-.621-1.242-1.75-2.366-2.717C10.825 4.242 9.473 3.5 8 3.5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M8.052 5.837A9.715 9.715 0 0 1 12 5c2.955 0 5.309 1.315 7.06 2.864 1.756 1.553 2.866 3.307 3.307 4.08a.11.11 0 0 1 .016.055.122.122 0 0 1-.017.06 16.766 16.766 0 0 1-1.53 2.218.75.75 0 1 0 1.163.946 18.253 18.253 0 0 0 1.67-2.42 1.607 1.607 0 0 0 .001-1.602c-.485-.85-1.69-2.757-3.616-4.46C18.124 5.034 15.432 3.5 12 3.5c-1.695 0-3.215.374-4.552.963a.75.75 0 0 0 .604 1.373Zm11.114 12.15C17.328 19.38 14.933 20.5 12 20.5c-3.432 0-6.125-1.534-8.054-3.24C2.02 15.556.814 13.648.33 12.798a1.606 1.606 0 0 1 .001-1.6A18.283 18.283 0 0 1 3.648 7.01L1.317 5.362a.75.75 0 1 1 .866-1.224l20.5 14.5a.75.75 0 1 1-.866 1.224ZM4.902 7.898c-1.73 1.541-2.828 3.273-3.268 4.044a.112.112 0 0 0-.017.059c0 .015.003.034.016.055.441.774 1.551 2.527 3.307 4.08C6.69 17.685 9.045 19 12 19c2.334 0 4.29-.82 5.874-1.927l-3.516-2.487a3.5 3.5 0 0 1-5.583-3.949L4.902 7.899Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const feedDiscussion: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16ZM4 5v5a1 1 0 0 0 1 1h1v1.5a.5.5 0 0 0 .854.354L8.707 11H11a1 1 0 0 0 1-1V5a1 1 0 0 0-1-1H5a1 1 0 0 0-1 1Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const feedForked: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16ZM6 6.928a1.75 1.75 0 1 0-1 0V7.5A1.5 1.5 0 0 0 6.5 9h1v1.072a1.75 1.75 0 1 0 1 0V9h1A1.5 1.5 0 0 0 11 7.5v-.572a1.75 1.75 0 1 0-1 0V7.5a.5.5 0 0 1-.5.5h-3a.5.5 0 0 1-.5-.5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const feedHeart: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm2.33-11.5c-1.22 0-1.83.5-2.323 1.136C7.513 5 6.903 4.5 5.682 4.5c-1.028 0-2.169.784-2.169 2.5 0 1.499 1.493 3.433 3.246 4.517.52.321.89.479 1.248.484.357-.005.728-.163 1.247-.484C11.007 10.433 12.5 8.5 12.5 7c0-1.716-1.14-2.5-2.17-2.5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const feedIssueClosed: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0Zm3.457 6.957a.999.999 0 1 0-1.414-1.414L7.25 8.336 5.957 7.043a.999.999 0 1 0-1.414 1.414l2 2a.999.999 0 0 0 1.414 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const feedIssueDraft: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM3.802 7.334a.75.75 0 0 0-1.482-.233 5.8 5.8 0 0 0 0 1.798.749.749 0 1 0 1.482-.233 4.296 4.296 0 0 1 0-1.332ZM8 2.25a5.8 5.8 0 0 0-.899.07.749.749 0 1 0 .233 1.482 4.296 4.296 0 0 1 1.332 0 .75.75 0 0 0 .233-1.482A5.8 5.8 0 0 0 8 2.25Zm-.666 9.948a.75.75 0 0 0-.233 1.482 5.8 5.8 0 0 0 1.798 0 .749.749 0 1 0-.233-1.482 4.296 4.296 0 0 1-1.332 0Zm6.346-5.097a.749.749 0 1 0-1.482.233 4.296 4.296 0 0 1 0 1.332.75.75 0 0 0 1.482.233 5.8 5.8 0 0 0 0-1.798Zm-8.178-2.54a.75.75 0 0 0-.882-1.213A5.77 5.77 0 0 0 3.348 4.62a.749.749 0 1 0 1.213.882c.263-.361.58-.678.941-.941Zm-.941 5.937a.75.75 0 0 0-1.213.882 5.77 5.77 0 0 0 1.272 1.272.749.749 0 1 0 .882-1.213 4.285 4.285 0 0 1-.941-.941Zm6.819-7.15a.749.749 0 1 0-.882 1.213c.36.263.679.58.941.941a.75.75 0 0 0 1.213-.882 5.77 5.77 0 0 0-1.272-1.272Zm1.272 8.032a.749.749 0 1 0-1.213-.882c-.262.36-.581.679-.941.941a.75.75 0 0 0 .882 1.213 5.77 5.77 0 0 0 1.272-1.272Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const feedIssueOpen: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M3.75 8a4.25 4.25 0 1 1 8.5 0 4.25 4.25 0 0 1-8.5 0ZM9.5 8a1.5 1.5 0 1 0-3.001.001A1.5 1.5 0 0 0 9.5 8Z',
+      'M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-5.75a5.75 5.75 0 1 0 0 11.5 5.75 5.75 0 1 0 0-11.5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const feedIssueReopen: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M.5 8a8 8 0 1 1 16 0 8 8 0 0 1-16 0Zm3.427-4.323a.25.25 0 0 0-.427.177V6c0 .138.112.25.25.25h2.146a.25.25 0 0 0 .177-.427l-.524-.524a4.003 4.003 0 0 1 6.862 1.858.75.75 0 0 0 1.467-.314 5.502 5.502 0 0 0-9.39-2.605Zm9.573 8.469V10a.25.25 0 0 0-.25-.25h-2.146a.25.25 0 0 0-.177.427l.524.524a4.002 4.002 0 0 1-6.862-1.858.75.75 0 0 0-1.467.314 5.502 5.502 0 0 0 9.39 2.605l.561.561a.25.25 0 0 0 .427-.177ZM10 8a1.5 1.5 0 1 0-3.001.001A1.5 1.5 0 0 0 10 8Z',
+    ],
+    h: 16,
+    w: 17,
+  },
+}
+export const feedMerged: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.25-11.25A1.75 1.75 0 1 0 6 6.428v3.144a1.75 1.75 0 1 0 1 0V8.236A2.99 2.99 0 0 0 9 9h.571a1.75 1.75 0 1 0 0-1H9a2 2 0 0 1-1.957-1.586A1.75 1.75 0 0 0 8.25 4.75Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const feedPerson: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const feedPlus: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0Zm1.062 4.312a1 1 0 1 0-2 0v2.75h-2.75a1 1 0 0 0 0 2h2.75v2.75a1 1 0 1 0 2 0v-2.75h2.75a1 1 0 1 0 0-2h-2.75Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const feedPublic: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm4.5.25v3a1 1 0 0 0 1 1h5a1 1 0 0 0 1-1v-3a1 1 0 0 0-1-1H7v-1.5a1.5 1.5 0 0 1 2.443-1.167.75.75 0 0 0 .943-1.166A3 3 0 0 0 5.5 5.75v1.5a1 1 0 0 0-1 1Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const feedPullRequestClosed: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM5.5 12.25A1.75 1.75 0 0 0 6 8.822V6.928A1.752 1.752 0 0 0 5.5 3.5 1.75 1.75 0 0 0 5 6.928v1.894a1.752 1.752 0 0 0 .5 3.428Zm5-5a.5.5 0 0 0-.5.5v1.072a1.752 1.752 0 0 0 .5 3.428 1.75 1.75 0 0 0 .5-3.428V7.75a.5.5 0 0 0-.5-.5Zm1.255-2.763a.5.5 0 0 0-.707-.707l-.53.531-.531-.531a.5.5 0 0 0-.707.707l.531.531-.531.53a.5.5 0 0 0 .707.707l.531-.53.53.53a.5.5 0 0 0 .707-.707l-.53-.53Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const feedPullRequestDraft: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm7.25 2.5c0-.793-.527-1.462-1.25-1.678V6.928A1.752 1.752 0 0 0 5.5 3.5 1.75 1.75 0 0 0 5 6.928v1.894a1.752 1.752 0 0 0 .5 3.428 1.75 1.75 0 0 0 1.75-1.75Zm3.25 1.75a1.75 1.75 0 1 0 .001-3.499 1.75 1.75 0 0 0-.001 3.499Zm0-4.5a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5Zm.75-3.25a.75.75 0 1 0-1.5 0 .75.75 0 0 0 1.5 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const feedPullRequestOpen: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm6.75 2.5c0-.793-.527-1.462-1.25-1.678V6.928A1.752 1.752 0 0 0 5 3.5a1.75 1.75 0 0 0-.5 3.428v1.894A1.752 1.752 0 0 0 5 12.25a1.75 1.75 0 0 0 1.75-1.75Zm3.25-5h.25a.5.5 0 0 1 .5.5v2.822a1.752 1.752 0 0 0 .5 3.428 1.75 1.75 0 0 0 .5-3.428V6a1.5 1.5 0 0 0-1.5-1.5H10V3.129a.25.25 0 0 0-.427-.177L7.702 4.823a.25.25 0 0 0 0 .354l1.871 1.871A.25.25 0 0 0 10 6.871Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const feedRepo: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16ZM5.5 4A1.5 1.5 0 0 0 4 5.5v5c0 .828.5 1.5 1 1.5v-1a1 1 0 0 1 1-1h5v1h-1v1h1.5a.5.5 0 0 0 .5-.5v-7a.5.5 0 0 0-.5-.5Zm.5 7.25v2.514a.25.25 0 0 0 .426.178l.898-.888a.25.25 0 0 1 .352 0l.898.888A.25.25 0 0 0 9 13.764V11H6.25a.25.25 0 0 0-.25.25Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const feedRocket: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm3.031-12a4.38 4.38 0 0 0-3.097 1.283l-.23.229c-.156.157-.308.32-.452.49H5.65a.876.876 0 0 0-.746.417l-.856 1.388a.377.377 0 0 0 .21.556l1.552.477 1.35 1.35.478 1.553a.374.374 0 0 0 .555.21l1.389-.855a.876.876 0 0 0 .416-.746V8.747c.17-.144.333-.295.49-.452l.23-.23A4.379 4.379 0 0 0 12 4.969v-.093A.876.876 0 0 0 11.124 4Zm-5.107 7.144h-.001a.809.809 0 0 0-1.33-.881c-.395.394-.564 1.258-.62 1.62a.12.12 0 0 0 .035.108.12.12 0 0 0 .108.035c.362-.056 1.226-.225 1.62-.619a.803.803 0 0 0 .188-.263Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const feedStar: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.252-12.932a.476.476 0 0 0-.682.195l-1.2 2.432-2.684.39a.477.477 0 0 0-.266.816l1.944 1.892-.46 2.674a.479.479 0 0 0 .694.504L8 10.709l2.4 1.261a.478.478 0 0 0 .694-.504l-.458-2.673L12.578 6.9a.479.479 0 0 0-.265-.815l-2.685-.39-1.2-2.432a.473.473 0 0 0-.176-.195Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const feedTag: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M7.22 6.5a.72.72 0 1 1-1.44 0 .72.72 0 0 1 1.44 0Z',
+      'M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16ZM4 5v3.38c.001.397.159.778.44 1.059l3.211 3.213a1.202 1.202 0 0 0 1.698 0l3.303-3.303a1.202 1.202 0 0 0 0-1.698L9.439 4.44A1.5 1.5 0 0 0 8.379 4H5a1 1 0 0 0-1 1Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const feedTrophy: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M11 5h1v1.146a1 1 0 0 1-.629.928L11 7.223V5ZM5 7.223l-.371-.149A1 1 0 0 1 4 6.146V5h1v2.223Z',
+      'M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16ZM3 5v1.146a2 2 0 0 0 1.257 1.858l.865.346a3.005 3.005 0 0 0 2.294 2.093C7.22 11.404 6.658 12 5.502 12H5.5a.5.5 0 0 0 0 1h5a.5.5 0 0 0 0-1c-1.158 0-1.72-.595-1.916-1.557a3.005 3.005 0 0 0 2.294-2.094l.865-.346A2 2 0 0 0 13 6.146V5a1 1 0 0 0-1-1H4a1 1 0 0 0-1 1Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const file: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M2 1.75C2 .784 2.784 0 3.75 0h6.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16h-9.5A1.75 1.75 0 0 1 2 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h9.5a.25.25 0 0 0 .25-.25V6h-2.75A1.75 1.75 0 0 1 9 4.25V1.5Zm6.75.062V4.25c0 .138.112.25.25.25h2.688l-.011-.013-2.914-2.914-.013-.011Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M3 3a2 2 0 0 1 2-2h9.982a2 2 0 0 1 1.414.586l4.018 4.018A2 2 0 0 1 21 7.018V21a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2Zm2-.5a.5.5 0 0 0-.5.5v18a.5.5 0 0 0 .5.5h14a.5.5 0 0 0 .5-.5V8.5h-4a2 2 0 0 1-2-2v-4Zm10 0v4a.5.5 0 0 0 .5.5h4a.5.5 0 0 0-.146-.336l-4.018-4.018A.5.5 0 0 0 15 2.5Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const fileAdded: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M2 1.75C2 .784 2.784 0 3.75 0h6.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16h-9.5A1.75 1.75 0 0 1 2 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h9.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073Zm4.48 3.758a.75.75 0 0 1 .755.745l.01 1.497h1.497a.75.75 0 0 1 0 1.5H9v1.507a.75.75 0 0 1-1.5 0V9.005l-1.502.01a.75.75 0 0 1-.01-1.5l1.507-.01-.01-1.492a.75.75 0 0 1 .745-.755Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const fileBadge: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M2.75 1.5a.25.25 0 0 0-.25.25v11.5c0 .138.112.25.25.25h3.5a.75.75 0 0 1 0 1.5h-3.5A1.75 1.75 0 0 1 1 13.25V1.75C1 .784 1.784 0 2.75 0h8a1.75 1.75 0 0 1 1.508.862.75.75 0 1 1-1.289.768.25.25 0 0 0-.219-.13h-8Z',
+      'M8 7a3.999 3.999 0 0 1 7.605-1.733 4 4 0 0 1-1.115 4.863l.995 4.973a.75.75 0 0 1-.991.852l-2.409-.876a.248.248 0 0 0-.17 0l-2.409.876a.75.75 0 0 1-.991-.852l.994-4.973A3.994 3.994 0 0 1 8 7Zm4-2.5a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5Zm0 6.5c-.373 0-.745-.051-1.104-.154l-.649 3.243 1.155-.42c.386-.14.81-.14 1.196 0l1.155.42-.649-3.243A4.004 4.004 0 0 1 12 11Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const fileBinary: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M4 1.75C4 .784 4.784 0 5.75 0h5.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v8.586A1.75 1.75 0 0 1 14.25 15h-9a.75.75 0 0 1 0-1.5h9a.25.25 0 0 0 .25-.25V6h-2.75A1.75 1.75 0 0 1 10 4.25V1.5H5.75a.25.25 0 0 0-.25.25v2a.75.75 0 0 1-1.5 0Zm-4 6C0 6.784.784 6 1.75 6h1.5C4.216 6 5 6.784 5 7.75v2.5A1.75 1.75 0 0 1 3.25 12h-1.5A1.75 1.75 0 0 1 0 10.25ZM6.75 6h1.5a.75.75 0 0 1 .75.75v3.75h.75a.75.75 0 0 1 0 1.5h-3a.75.75 0 0 1 0-1.5h.75v-3h-.75a.75.75 0 0 1 0-1.5Zm-5 1.5a.25.25 0 0 0-.25.25v2.5c0 .138.112.25.25.25h1.5a.25.25 0 0 0 .25-.25v-2.5a.25.25 0 0 0-.25-.25Zm9.75-5.938V4.25c0 .138.112.25.25.25h2.688l-.011-.013-2.914-2.914-.013-.011Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M3 3a2 2 0 0 1 2-2h9.982a2 2 0 0 1 1.414.586l4.018 4.018A2 2 0 0 1 21 7.018V21a2 2 0 0 1-2 2H4.75a.75.75 0 0 1 0-1.5H19a.5.5 0 0 0 .5-.5V8.5h-4a2 2 0 0 1-2-2v-4H5a.5.5 0 0 0-.5.5v6.25a.75.75 0 0 1-1.5 0Zm12-.5v4a.5.5 0 0 0 .5.5h4a.5.5 0 0 0-.146-.336l-4.018-4.018A.5.5 0 0 0 15 2.5Z',
+      'M0 13.75C0 12.784.784 12 1.75 12h3c.966 0 1.75.784 1.75 1.75v4a1.75 1.75 0 0 1-1.75 1.75h-3A1.75 1.75 0 0 1 0 17.75Zm1.75-.25a.25.25 0 0 0-.25.25v4c0 .138.112.25.25.25h3a.25.25 0 0 0 .25-.25v-4a.25.25 0 0 0-.25-.25ZM9 12a.75.75 0 0 0 0 1.5h1.5V18H9a.75.75 0 0 0 0 1.5h4.5a.75.75 0 0 0 0-1.5H12v-5.25a.75.75 0 0 0-.75-.75H9Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const fileCode: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M4 1.75C4 .784 4.784 0 5.75 0h5.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v8.586A1.75 1.75 0 0 1 14.25 15h-9a.75.75 0 0 1 0-1.5h9a.25.25 0 0 0 .25-.25V6h-2.75A1.75 1.75 0 0 1 10 4.25V1.5H5.75a.25.25 0 0 0-.25.25v2.5a.75.75 0 0 1-1.5 0Zm1.72 4.97a.75.75 0 0 1 1.06 0l2 2a.75.75 0 0 1 0 1.06l-2 2a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734l1.47-1.47-1.47-1.47a.75.75 0 0 1 0-1.06ZM3.28 7.78 1.81 9.25l1.47 1.47a.751.751 0 0 1-.018 1.042.751.751 0 0 1-1.042.018l-2-2a.75.75 0 0 1 0-1.06l2-2a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042Zm8.22-6.218V4.25c0 .138.112.25.25.25h2.688l-.011-.013-2.914-2.914-.013-.011Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M3 3a2 2 0 0 1 2-2h9.982a2 2 0 0 1 1.414.586l4.018 4.018A2 2 0 0 1 21 7.018V21a2 2 0 0 1-2 2H4.75a.75.75 0 0 1 0-1.5H19a.5.5 0 0 0 .5-.5V8.5h-4a2 2 0 0 1-2-2v-4H5a.5.5 0 0 0-.5.5v6.25a.75.75 0 0 1-1.5 0Zm12-.5v4a.5.5 0 0 0 .5.5h4a.5.5 0 0 0-.146-.336l-4.018-4.018A.5.5 0 0 0 15 2.5Z',
+      'M4.53 12.24a.75.75 0 0 1-.039 1.06l-2.639 2.45 2.64 2.45a.75.75 0 1 1-1.022 1.1l-3.23-3a.75.75 0 0 1 0-1.1l3.23-3a.75.75 0 0 1 1.06.04Zm3.979 1.06a.75.75 0 1 1 1.02-1.1l3.231 3a.75.75 0 0 1 0 1.1l-3.23 3a.75.75 0 1 1-1.021-1.1l2.639-2.45-2.64-2.45Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const fileDiff: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M12.5 6.75a.75.75 0 0 0-1.5 0V9H8.75a.75.75 0 0 0 0 1.5H11v2.25a.75.75 0 0 0 1.5 0V10.5h2.25a.75.75 0 0 0 0-1.5H12.5V6.75ZM8.75 16a.75.75 0 0 0 0 1.5h6a.75.75 0 0 0 0-1.5h-6Z',
+      'M5 1h9.982a2 2 0 0 1 1.414.586l4.018 4.018A2 2 0 0 1 21 7.018V21a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V3a2 2 0 0 1 2-2Zm-.5 2v18a.5.5 0 0 0 .5.5h14a.5.5 0 0 0 .5-.5V7.018a.5.5 0 0 0-.146-.354l-4.018-4.018a.5.5 0 0 0-.354-.146H5a.5.5 0 0 0-.5.5Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const fileDirectory: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M0 2.75C0 1.784.784 1 1.75 1H5c.55 0 1.07.26 1.4.7l.9 1.2a.25.25 0 0 0 .2.1h6.75c.966 0 1.75.784 1.75 1.75v8.5A1.75 1.75 0 0 1 14.25 15H1.75A1.75 1.75 0 0 1 0 13.25Zm1.75-.25a.25.25 0 0 0-.25.25v10.5c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25v-8.5a.25.25 0 0 0-.25-.25H7.5c-.55 0-1.07-.26-1.4-.7l-.9-1.2a.25.25 0 0 0-.2-.1Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M2 4.75C2 3.784 2.784 3 3.75 3h4.971c.58 0 1.12.286 1.447.765l1.404 2.063c.046.069.124.11.207.11h8.471c.966 0 1.75.783 1.75 1.75V19.25A1.75 1.75 0 0 1 20.25 21H3.75A1.75 1.75 0 0 1 2 19.25Zm1.75-.25a.25.25 0 0 0-.25.25v14.5c0 .138.112.25.25.25h16.5a.25.25 0 0 0 .25-.25V7.687a.25.25 0 0 0-.25-.25h-8.471a1.75 1.75 0 0 1-1.447-.765L8.928 4.61a.252.252 0 0 0-.208-.11Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const fileDirectoryFill: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M1.75 1A1.75 1.75 0 0 0 0 2.75v10.5C0 14.216.784 15 1.75 15h12.5A1.75 1.75 0 0 0 16 13.25v-8.5A1.75 1.75 0 0 0 14.25 3H7.5a.25.25 0 0 1-.2-.1l-.9-1.2C6.07 1.26 5.55 1 5 1H1.75Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M2 4.75C2 3.784 2.784 3 3.75 3h4.971c.58 0 1.12.286 1.447.765l1.404 2.063c.046.069.124.11.207.11h8.471c.966 0 1.75.783 1.75 1.75V19.25A1.75 1.75 0 0 1 20.25 21H3.75A1.75 1.75 0 0 1 2 19.25Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const fileDirectoryOpenFill: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M.513 1.513A1.75 1.75 0 0 1 1.75 1h3.5c.55 0 1.07.26 1.4.7l.9 1.2a.25.25 0 0 0 .2.1H13a1 1 0 0 1 1 1v.5H2.75a.75.75 0 0 0 0 1.5h11.978a1 1 0 0 1 .994 1.117L15 13.25A1.75 1.75 0 0 1 13.25 15H1.75A1.75 1.75 0 0 1 0 13.25V2.75c0-.464.184-.91.513-1.237Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const fileDirectorySymlink: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M0 2.75C0 1.784.784 1 1.75 1H5a1.75 1.75 0 0 1 1.4.7l.9 1.2a.25.25 0 0 0 .2.1h6.75c.966 0 1.75.784 1.75 1.75v8.5A1.75 1.75 0 0 1 14.25 15H5.375a.75.75 0 0 1 0-1.5h8.875a.25.25 0 0 0 .25-.25v-8.5a.25.25 0 0 0-.25-.25H7.5a1.75 1.75 0 0 1-1.4-.7l-.9-1.2a.25.25 0 0 0-.2-.1H1.75a.25.25 0 0 0-.25.25v3a.75.75 0 0 1-1.5 0v-3Z',
+      'M1.5 12.237a2.25 2.25 0 0 1 2.262-2.249L4 9.989v1.938c0 .218.26.331.42.183l2.883-2.677a.25.25 0 0 0 0-.366L4.42 6.39a.25.25 0 0 0-.42.183v1.916l-.229-.001A3.75 3.75 0 0 0 0 12.237v1.013a.75.75 0 0 0 1.5 0v-1.013Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M2 4.75C2 3.784 2.784 3 3.75 3h4.971a1.75 1.75 0 0 1 1.447.765l1.404 2.063a.25.25 0 0 0 .207.11h8.471c.966 0 1.75.783 1.75 1.75V19.25A1.75 1.75 0 0 1 20.25 21H4.75a.75.75 0 0 1 0-1.5h15.5a.25.25 0 0 0 .25-.25V7.688a.25.25 0 0 0-.25-.25h-8.471a1.751 1.751 0 0 1-1.447-.766L8.928 4.609a.252.252 0 0 0-.207-.109H3.75a.25.25 0 0 0-.25.25v3.5a.75.75 0 0 1-1.5 0v-3.5Z',
+      'm9.308 12.5-2.104-2.236a.75.75 0 1 1 1.092-1.028l3.294 3.5a.75.75 0 0 1 0 1.028l-3.294 3.5a.75.75 0 1 1-1.092-1.028L9.308 14H4.09a2.59 2.59 0 0 0-2.59 2.59v3.16a.75.75 0 0 1-1.5 0v-3.16a4.09 4.09 0 0 1 4.09-4.09h5.218Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const fileMedia: OcticonSymbolVariants = {
+  '24': {
+    p: [
+      'M21.75 21.5H2.25A1.75 1.75 0 0 1 .5 19.75V4.25c0-.966.784-1.75 1.75-1.75h19.5c.966 0 1.75.784 1.75 1.75v15.5a1.75 1.75 0 0 1-1.75 1.75ZM2.25 4a.25.25 0 0 0-.25.25v15.5c0 .138.112.25.25.25h3.178L14 10.977a1.749 1.749 0 0 1 2.506-.032L22 16.44V4.25a.25.25 0 0 0-.25-.25ZM22 19.75v-1.19l-6.555-6.554a.248.248 0 0 0-.18-.073.247.247 0 0 0-.178.077L7.497 20H21.75a.25.25 0 0 0 .25-.25ZM10.5 9.25a3.25 3.25 0 1 1-6.5 0 3.25 3.25 0 0 1 6.5 0Zm-1.5 0a1.75 1.75 0 1 0-3.501.001A1.75 1.75 0 0 0 9 9.25Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const fileMoved: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M2 1.75C2 .784 2.784 0 3.75 0h6.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16h-3.5a.75.75 0 0 1 0-1.5h3.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073H3.75a.25.25 0 0 0-.25.25v6.5a.75.75 0 0 1-1.5 0v-6.5Z',
+      'm5.427 15.573 3.146-3.146a.25.25 0 0 0 0-.354L5.427 8.927A.25.25 0 0 0 5 9.104V11.5H.75a.75.75 0 0 0 0 1.5H5v2.396c0 .223.27.335.427.177Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const fileRemoved: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M2 1.75C2 .784 2.784 0 3.75 0h6.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16h-9.5A1.75 1.75 0 0 1 2 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h9.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073Zm4.5 6h2.242a.75.75 0 0 1 0 1.5h-2.24l-2.254.015a.75.75 0 0 1-.01-1.5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const fileSubmodule: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M0 2.75C0 1.784.784 1 1.75 1H5c.55 0 1.07.26 1.4.7l.9 1.2a.25.25 0 0 0 .2.1h6.75c.966 0 1.75.784 1.75 1.75v8.5A1.75 1.75 0 0 1 14.25 15H1.75A1.75 1.75 0 0 1 0 13.25Zm9.42 9.36 2.883-2.677a.25.25 0 0 0 0-.366L9.42 6.39a.249.249 0 0 0-.42.183V8.5H4.75a.75.75 0 0 0 0 1.5H9v1.927c0 .218.26.331.42.183Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M2 4.75C2 3.784 2.784 3 3.75 3h4.965a1.75 1.75 0 0 1 1.456.78l1.406 2.109a.25.25 0 0 0 .208.111h8.465c.966 0 1.75.784 1.75 1.75v11.5A1.75 1.75 0 0 1 20.25 21H3.75A1.75 1.75 0 0 1 2 19.25Zm12.78 4.97a.749.749 0 0 0-1.275.326.749.749 0 0 0 .215.734l1.72 1.72H6.75a.75.75 0 0 0 0 1.5h8.69l-1.72 1.72a.749.749 0 0 0 .326 1.275.749.749 0 0 0 .734-.215l3-3a.75.75 0 0 0 0-1.06Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const fileSymlinkFile: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M2 1.75C2 .784 2.784 0 3.75 0h5.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v8.586A1.75 1.75 0 0 1 12.25 15h-7a.75.75 0 0 1 0-1.5h7a.25.25 0 0 0 .25-.25V6H9.75A1.75 1.75 0 0 1 8 4.25V1.5H3.75a.25.25 0 0 0-.25.25V4.5a.75.75 0 0 1-1.5 0Zm-.5 10.487v1.013a.75.75 0 0 1-1.5 0v-1.012a3.748 3.748 0 0 1 3.77-3.749L4 8.49V6.573a.25.25 0 0 1 .42-.183l2.883 2.678a.25.25 0 0 1 0 .366L4.42 12.111a.25.25 0 0 1-.42-.183V9.99l-.238-.003a2.25 2.25 0 0 0-2.262 2.25Zm8-10.675V4.25c0 .138.112.25.25.25h2.688l-.011-.013-2.914-2.914-.013-.011Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M3 3a2 2 0 0 1 2-2h9.982a2 2 0 0 1 1.414.586l4.018 4.018A2 2 0 0 1 21 7.018V21a2 2 0 0 1-2 2H4.75a.75.75 0 0 1 0-1.5H19a.5.5 0 0 0 .5-.5V8.5h-4a2 2 0 0 1-2-2v-4H5a.5.5 0 0 0-.5.5v6.25a.75.75 0 0 1-1.5 0Zm6.308 11.5-2.104-2.236a.751.751 0 0 1 .369-1.255.749.749 0 0 1 .723.227l3.294 3.5a.75.75 0 0 1 0 1.028l-3.294 3.5a.749.749 0 0 1-1.275-.293.751.751 0 0 1 .183-.735L9.308 16H4.09a2.59 2.59 0 0 0-2.59 2.59v3.16a.75.75 0 0 1-1.5 0v-3.16a4.09 4.09 0 0 1 4.09-4.09ZM15 2.5v4a.5.5 0 0 0 .5.5h4a.5.5 0 0 0-.146-.336l-4.018-4.018A.5.5 0 0 0 15 2.5Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const fileZip: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M3.5 1.75v11.5c0 .09.048.173.126.217a.75.75 0 0 1-.752 1.298A1.748 1.748 0 0 1 2 13.25V1.75C2 .784 2.784 0 3.75 0h5.586c.464 0 .909.185 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v8.586A1.75 1.75 0 0 1 12.25 15h-.5a.75.75 0 0 1 0-1.5h.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177L9.513 1.573a.25.25 0 0 0-.177-.073H7.25a.75.75 0 0 1 0 1.5h-.5a.75.75 0 0 1 0-1.5h-3a.25.25 0 0 0-.25.25Zm3.75 8.75h.5c.966 0 1.75.784 1.75 1.75v3a.75.75 0 0 1-.75.75h-2.5a.75.75 0 0 1-.75-.75v-3c0-.966.784-1.75 1.75-1.75ZM6 5.25a.75.75 0 0 1 .75-.75h.5a.75.75 0 0 1 0 1.5h-.5A.75.75 0 0 1 6 5.25Zm.75 2.25h.5a.75.75 0 0 1 0 1.5h-.5a.75.75 0 0 1 0-1.5ZM8 6.75A.75.75 0 0 1 8.75 6h.5a.75.75 0 0 1 0 1.5h-.5A.75.75 0 0 1 8 6.75ZM8.75 3h.5a.75.75 0 0 1 0 1.5h-.5a.75.75 0 0 1 0-1.5ZM8 9.75A.75.75 0 0 1 8.75 9h.5a.75.75 0 0 1 0 1.5h-.5A.75.75 0 0 1 8 9.75Zm-1 2.5v2.25h1v-2.25a.25.25 0 0 0-.25-.25h-.5a.25.25 0 0 0-.25.25Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M5 2.5a.5.5 0 0 0-.5.5v18a.5.5 0 0 0 .5.5h1.75a.75.75 0 0 1 0 1.5H5a2 2 0 0 1-2-2V3a2 2 0 0 1 2-2h9.982a2 2 0 0 1 1.414.586l4.018 4.018A2 2 0 0 1 21 7.018V21a2 2 0 0 1-2 2h-2.75a.75.75 0 0 1 0-1.5H19a.5.5 0 0 0 .5-.5V7.018a.5.5 0 0 0-.146-.354l-4.018-4.018a.5.5 0 0 0-.354-.146H5Z',
+      'M11.5 15.75a.75.75 0 0 1 .75-.75h1a.75.75 0 0 1 0 1.5h-1a.75.75 0 0 1-.75-.75Zm.75-3.75a.75.75 0 0 0 0 1.5h1a.75.75 0 0 0 0-1.5h-1Zm-.75-2.25a.75.75 0 0 1 .75-.75h1a.75.75 0 0 1 0 1.5h-1a.75.75 0 0 1-.75-.75ZM12.25 6a.75.75 0 0 0 0 1.5h1a.75.75 0 0 0 0-1.5h-1Zm-.75-2.25a.75.75 0 0 1 .75-.75h1a.75.75 0 0 1 0 1.5h-1a.75.75 0 0 1-.75-.75ZM9.75 13.5a.75.75 0 0 0 0 1.5h1a.75.75 0 0 0 0-1.5h-1ZM9 11.25a.75.75 0 0 1 .75-.75h1a.75.75 0 0 1 0 1.5h-1a.75.75 0 0 1-.75-.75Zm.75-3.75a.75.75 0 0 0 0 1.5h1a.75.75 0 0 0 0-1.5h-1ZM9 5.25a.75.75 0 0 1 .75-.75h1a.75.75 0 0 1 0 1.5h-1A.75.75 0 0 1 9 5.25ZM11 17h1a2 2 0 0 1 2 2v4.25a.75.75 0 0 1-.75.75h-3.5a.75.75 0 0 1-.75-.75V19a2 2 0 0 1 2-2Zm-.5 2v3.5h2V19a.5.5 0 0 0-.5-.5h-1a.5.5 0 0 0-.5.5Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const filter: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M.75 3h14.5a.75.75 0 0 1 0 1.5H.75a.75.75 0 0 1 0-1.5ZM3 7.75A.75.75 0 0 1 3.75 7h8.5a.75.75 0 0 1 0 1.5h-8.5A.75.75 0 0 1 3 7.75Zm3 4a.75.75 0 0 1 .75-.75h2.5a.75.75 0 0 1 0 1.5h-2.5a.75.75 0 0 1-.75-.75Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M2.75 6a.75.75 0 0 0 0 1.5h18.5a.75.75 0 0 0 0-1.5H2.75ZM6 11.75a.75.75 0 0 1 .75-.75h10.5a.75.75 0 0 1 0 1.5H6.75a.75.75 0 0 1-.75-.75Zm4 4.938a.75.75 0 0 1 .75-.75h2.5a.75.75 0 0 1 0 1.5h-2.5a.75.75 0 0 1-.75-.75Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const filterRemove: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M14.384 4.57a.752.752 0 0 0 1.061 0 .752.752 0 0 0 0-1.061l-.884-.884.883-.884A.75.75 0 0 0 14.384.68l-.884.884-.884-.884a.75.75 0 0 0-1.06 1.061l.883.884-.883.884a.75.75 0 0 0 1.06 1.061l.884-.884.884.884ZM.75 3a.75.75 0 0 0 0 1.5H9A.75.75 0 0 0 9 3H.75ZM3 7.75A.75.75 0 0 1 3.75 7h8.5a.75.75 0 0 1 0 1.5h-8.5A.75.75 0 0 1 3 7.75Zm3 4a.75.75 0 0 1 .75-.75h2.5a.75.75 0 0 1 0 1.5h-2.5a.75.75 0 0 1-.75-.75Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M21.587 9.273a.75.75 0 1 0 1.061-1.061l-1.591-1.591 1.591-1.591a.749.749 0 1 0-1.061-1.06l-1.591 1.591-1.591-1.591a.749.749 0 1 0-1.06 1.06l1.591 1.591-1.591 1.591a.75.75 0 0 0 1.06 1.061l1.591-1.591 1.591 1.591ZM1.75 6a.75.75 0 0 0 0 1.5H14.5a.75.75 0 0 0 0-1.5H1.75ZM5 11.75a.75.75 0 0 1 .75-.75h10.5a.75.75 0 0 1 0 1.5H5.75a.75.75 0 0 1-.75-.75Zm4 4.938a.75.75 0 0 1 .75-.75h2.5a.75.75 0 1 1 0 1.5h-2.5a.75.75 0 0 1-.75-.75Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const fiscalHost: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M10 8a1 1 0 1 0 0-2 1 1 0 0 0 0 2Z',
+      'M4 9.25h-.75a.75.75 0 0 1 0-1.5H4v-1.5h-.75a.75.75 0 0 1 0-1.5H4V3.5a1 1 0 0 1 1-1h7.5a1 1 0 0 1 1 1v7a1 1 0 0 1-1 1H5a1 1 0 0 1-1-1ZM5.5 4v.793a.75.75 0 0 1 0 1.414v1.586a.75.75 0 0 1 0 1.414V10H12V4Z',
+      'M12.75 14.25V14h-9.5v.25a.75.75 0 0 1-1.5 0V14A1.75 1.75 0 0 1 0 12.25V1.75C0 .784.784 0 1.75 0h12.5C15.217 0 16 .784 16 1.75v10.5A1.75 1.75 0 0 1 14.25 14v.25a.75.75 0 0 1-1.5 0ZM1.75 1.5a.25.25 0 0 0-.25.25v10.5c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25V1.75a.25.25 0 0 0-.25-.25Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const flame: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M9.533.753V.752c.217 2.385 1.463 3.626 2.653 4.81C13.37 6.74 14.498 7.863 14.498 10c0 3.5-3 6-6.5 6S1.5 13.512 1.5 10c0-1.298.536-2.56 1.425-3.286.376-.308.862 0 1.035.454C4.46 8.487 5.581 8.419 6 8c.282-.282.341-.811-.003-1.5C4.34 3.187 7.035.75 8.77.146c.39-.137.726.194.763.607ZM7.998 14.5c2.832 0 5-1.98 5-4.5 0-1.463-.68-2.19-1.879-3.383l-.036-.037c-1.013-1.008-2.3-2.29-2.834-4.434-.322.256-.63.579-.864.953-.432.696-.621 1.58-.046 2.73.473.947.67 2.284-.278 3.232-.61.61-1.545.84-2.403.633a2.79 2.79 0 0 1-1.436-.874A3.198 3.198 0 0 0 3 10c0 2.53 2.164 4.5 4.998 4.5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M14.265 1.627c0 3.545 1.869 5.327 3.479 7.021 1.54 1.62 3.006 3.163 3.006 6.102 0 4.812-3.753 8.25-8.565 8.25-4.813 0-8.935-3.421-8.935-8.25 0-2.039.962-4.011 2.509-4.899.305-.175.672.007.803.334C7.563 12.684 8.797 12.64 9.437 12c.388-.387.47-1.116-.004-2.062-2.405-4.812 1.863-8.279 4.2-8.854.336-.082.615.198.632.543ZM12.185 21.5c4.059 0 7.065-2.84 7.065-6.75 0-2.337-1.093-3.489-2.678-5.158l-.021-.023c-1.44-1.517-3.139-3.351-3.649-6.557a6.148 6.148 0 0 0-1.911 1.76c-.787 1.144-1.147 2.633-.216 4.495.603 1.205.777 2.74-.277 3.794-.657.657-1.762 1.1-2.956.586-.752-.324-1.353-.955-1.838-1.79-.567.706-.954 1.74-.954 2.893 0 3.847 3.288 6.75 7.435 6.75Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const fold: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M10.896 2H8.75V.75a.75.75 0 0 0-1.5 0V2H5.104a.25.25 0 0 0-.177.427l2.896 2.896a.25.25 0 0 0 .354 0l2.896-2.896A.25.25 0 0 0 10.896 2ZM8.75 15.25a.75.75 0 0 1-1.5 0V14H5.104a.25.25 0 0 1-.177-.427l2.896-2.896a.25.25 0 0 1 .354 0l2.896 2.896a.25.25 0 0 1-.177.427H8.75v1.25Zm-6.5-6.5a.75.75 0 0 0 0-1.5h-.5a.75.75 0 0 0 0 1.5h.5ZM6 8a.75.75 0 0 1-.75.75h-.5a.75.75 0 0 1 0-1.5h.5A.75.75 0 0 1 6 8Zm2.25.75a.75.75 0 0 0 0-1.5h-.5a.75.75 0 0 0 0 1.5h.5ZM12 8a.75.75 0 0 1-.75.75h-.5a.75.75 0 0 1 0-1.5h.5A.75.75 0 0 1 12 8Zm2.25.75a.75.75 0 0 0 0-1.5h-.5a.75.75 0 0 0 0 1.5h.5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M12 15c.199 0 .389.079.53.22l3.25 3.25a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215L12 16.81l-2.72 2.72a.751.751 0 0 1-1.042-.018.751.751 0 0 1-.018-1.042l3.25-3.25A.749.749 0 0 1 12 15Z',
+      'M12.53 8.78a.75.75 0 0 1-1.06 0L8.22 5.53a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L12 7.19l2.72-2.72a.749.749 0 0 1 1.275.326.749.749 0 0 1-.215.734ZM12 15.75a.75.75 0 0 1 .75.75v5.75a.75.75 0 0 1-1.5 0V16.5a.75.75 0 0 1 .75-.75Z',
+      'M12 8.5a.75.75 0 0 1-.75-.75v-6a.75.75 0 0 1 1.5 0v6a.75.75 0 0 1-.75.75ZM2.75 12a.75.75 0 0 1 .75-.75h1a.75.75 0 0 1 0 1.5h-1a.75.75 0 0 1-.75-.75Zm4 0a.75.75 0 0 1 .75-.75h1a.75.75 0 0 1 0 1.5h-1a.75.75 0 0 1-.75-.75Zm4 0a.75.75 0 0 1 .75-.75h1a.75.75 0 0 1 0 1.5h-1a.75.75 0 0 1-.75-.75Zm4 0a.75.75 0 0 1 .75-.75h1a.75.75 0 0 1 0 1.5h-1a.75.75 0 0 1-.75-.75Zm4 0a.75.75 0 0 1 .75-.75h1a.75.75 0 0 1 0 1.5h-1a.75.75 0 0 1-.75-.75Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const foldDown: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'm8.177 14.323 2.896-2.896a.25.25 0 0 0-.177-.427H8.75V7.764a.75.75 0 1 0-1.5 0V11H5.104a.25.25 0 0 0-.177.427l2.896 2.896a.25.25 0 0 0 .354 0ZM2.25 5a.75.75 0 0 0 0-1.5h-.5a.75.75 0 0 0 0 1.5h.5ZM6 4.25a.75.75 0 0 1-.75.75h-.5a.75.75 0 0 1 0-1.5h.5a.75.75 0 0 1 .75.75ZM8.25 5a.75.75 0 0 0 0-1.5h-.5a.75.75 0 0 0 0 1.5h.5ZM12 4.25a.75.75 0 0 1-.75.75h-.5a.75.75 0 0 1 0-1.5h.5a.75.75 0 0 1 .75.75Zm2.25.75a.75.75 0 0 0 0-1.5h-.5a.75.75 0 0 0 0 1.5h.5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M12 19a.749.749 0 0 1-.53-.22l-3.25-3.25a.749.749 0 0 1 .326-1.275.749.749 0 0 1 .734.215L12 17.19l2.72-2.72a.749.749 0 0 1 1.275.326.749.749 0 0 1-.215.734l-3.25 3.25A.749.749 0 0 1 12 19Z',
+      'M12 18a.75.75 0 0 1-.75-.75v-7.5a.75.75 0 0 1 1.5 0v7.5A.75.75 0 0 1 12 18ZM2.75 6a.75.75 0 0 1 .75-.75h1a.75.75 0 0 1 0 1.5h-1A.75.75 0 0 1 2.75 6Zm4 0a.75.75 0 0 1 .75-.75h1a.75.75 0 0 1 0 1.5h-1A.75.75 0 0 1 6.75 6Zm4 0a.75.75 0 0 1 .75-.75h1a.75.75 0 0 1 0 1.5h-1a.75.75 0 0 1-.75-.75Zm4 0a.75.75 0 0 1 .75-.75h1a.75.75 0 0 1 0 1.5h-1a.75.75 0 0 1-.75-.75Zm4 0a.75.75 0 0 1 .75-.75h1a.75.75 0 0 1 0 1.5h-1a.75.75 0 0 1-.75-.75Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const foldUp: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M7.823 1.677 4.927 4.573A.25.25 0 0 0 5.104 5H7.25v3.236a.75.75 0 1 0 1.5 0V5h2.146a.25.25 0 0 0 .177-.427L8.177 1.677a.25.25 0 0 0-.354 0ZM13.75 11a.75.75 0 0 0 0 1.5h.5a.75.75 0 0 0 0-1.5h-.5Zm-3.75.75a.75.75 0 0 1 .75-.75h.5a.75.75 0 0 1 0 1.5h-.5a.75.75 0 0 1-.75-.75ZM7.75 11a.75.75 0 0 0 0 1.5h.5a.75.75 0 0 0 0-1.5h-.5ZM4 11.75a.75.75 0 0 1 .75-.75h.5a.75.75 0 0 1 0 1.5h-.5a.75.75 0 0 1-.75-.75ZM1.75 11a.75.75 0 0 0 0 1.5h.5a.75.75 0 0 0 0-1.5h-.5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M11.47 5.22a.75.75 0 0 1 1.06 0l3.25 3.25a.751.751 0 0 1-.018 1.042.751.751 0 0 1-1.042.018L12 6.81 9.28 9.53a.751.751 0 0 1-1.042-.018.751.751 0 0 1-.018-1.042Z',
+      'M12 5.5a.75.75 0 0 1 .75.75v8a.75.75 0 0 1-1.5 0v-8A.75.75 0 0 1 12 5.5ZM2.75 18a.75.75 0 0 1 .75-.75h1a.75.75 0 0 1 0 1.5h-1a.75.75 0 0 1-.75-.75Zm4 0a.75.75 0 0 1 .75-.75h1a.75.75 0 0 1 0 1.5h-1a.75.75 0 0 1-.75-.75Zm4 0a.75.75 0 0 1 .75-.75h1a.75.75 0 0 1 0 1.5h-1a.75.75 0 0 1-.75-.75Zm4 0a.75.75 0 0 1 .75-.75h1a.75.75 0 0 1 0 1.5h-1a.75.75 0 0 1-.75-.75Zm4 0a.75.75 0 0 1 .75-.75h1a.75.75 0 0 1 0 1.5h-1a.75.75 0 0 1-.75-.75Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const gear: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8 0a8.2 8.2 0 0 1 .701.031C9.444.095 9.99.645 10.16 1.29l.288 1.107c.018.066.079.158.212.224.231.114.454.243.668.386.123.082.233.09.299.071l1.103-.303c.644-.176 1.392.021 1.82.63.27.385.506.792.704 1.218.315.675.111 1.422-.364 1.891l-.814.806c-.049.048-.098.147-.088.294.016.257.016.515 0 .772-.01.147.038.246.088.294l.814.806c.475.469.679 1.216.364 1.891a7.977 7.977 0 0 1-.704 1.217c-.428.61-1.176.807-1.82.63l-1.102-.302c-.067-.019-.177-.011-.3.071a5.909 5.909 0 0 1-.668.386c-.133.066-.194.158-.211.224l-.29 1.106c-.168.646-.715 1.196-1.458 1.26a8.006 8.006 0 0 1-1.402 0c-.743-.064-1.289-.614-1.458-1.26l-.289-1.106c-.018-.066-.079-.158-.212-.224a5.738 5.738 0 0 1-.668-.386c-.123-.082-.233-.09-.299-.071l-1.103.303c-.644.176-1.392-.021-1.82-.63a8.12 8.12 0 0 1-.704-1.218c-.315-.675-.111-1.422.363-1.891l.815-.806c.05-.048.098-.147.088-.294a6.214 6.214 0 0 1 0-.772c.01-.147-.038-.246-.088-.294l-.815-.806C.635 6.045.431 5.298.746 4.623a7.92 7.92 0 0 1 .704-1.217c.428-.61 1.176-.807 1.82-.63l1.102.302c.067.019.177.011.3-.071.214-.143.437-.272.668-.386.133-.066.194-.158.211-.224l.29-1.106C6.009.645 6.556.095 7.299.03 7.53.01 7.764 0 8 0Zm-.571 1.525c-.036.003-.108.036-.137.146l-.289 1.105c-.147.561-.549.967-.998 1.189-.173.086-.34.183-.5.29-.417.278-.97.423-1.529.27l-1.103-.303c-.109-.03-.175.016-.195.045-.22.312-.412.644-.573.99-.014.031-.021.11.059.19l.815.806c.411.406.562.957.53 1.456a4.709 4.709 0 0 0 0 .582c.032.499-.119 1.05-.53 1.456l-.815.806c-.081.08-.073.159-.059.19.162.346.353.677.573.989.02.03.085.076.195.046l1.102-.303c.56-.153 1.113-.008 1.53.27.161.107.328.204.501.29.447.222.85.629.997 1.189l.289 1.105c.029.109.101.143.137.146a6.6 6.6 0 0 0 1.142 0c.036-.003.108-.036.137-.146l.289-1.105c.147-.561.549-.967.998-1.189.173-.086.34-.183.5-.29.417-.278.97-.423 1.529-.27l1.103.303c.109.029.175-.016.195-.045.22-.313.411-.644.573-.99.014-.031.021-.11-.059-.19l-.815-.806c-.411-.406-.562-.957-.53-1.456a4.709 4.709 0 0 0 0-.582c-.032-.499.119-1.05.53-1.456l.815-.806c.081-.08.073-.159.059-.19a6.464 6.464 0 0 0-.573-.989c-.02-.03-.085-.076-.195-.046l-1.102.303c-.56.153-1.113.008-1.53-.27a4.44 4.44 0 0 0-.501-.29c-.447-.222-.85-.629-.997-1.189l-.289-1.105c-.029-.11-.101-.143-.137-.146a6.6 6.6 0 0 0-1.142 0ZM11 8a3 3 0 1 1-6 0 3 3 0 0 1 6 0ZM9.5 8a1.5 1.5 0 1 0-3.001.001A1.5 1.5 0 0 0 9.5 8Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M16 12a4 4 0 1 1-8 0 4 4 0 0 1 8 0Zm-1.5 0a2.5 2.5 0 1 0-5 0 2.5 2.5 0 0 0 5 0Z',
+      'M12 1c.266 0 .532.009.797.028.763.055 1.345.617 1.512 1.304l.352 1.45c.019.078.09.171.225.221.247.089.49.19.728.302.13.061.246.044.315.002l1.275-.776c.603-.368 1.411-.353 1.99.147.402.349.78.726 1.128 1.129.501.578.515 1.386.147 1.99l-.776 1.274c-.042.069-.058.185.002.315.112.238.213.481.303.728.048.135.142.205.22.225l1.45.352c.687.167 1.249.749 1.303 1.512.038.531.038 1.063 0 1.594-.054.763-.616 1.345-1.303 1.512l-1.45.352c-.078.019-.171.09-.221.225-.089.248-.19.491-.302.728-.061.13-.044.246-.002.315l.776 1.275c.368.603.353 1.411-.147 1.99-.349.402-.726.78-1.129 1.128-.578.501-1.386.515-1.99.147l-1.274-.776c-.069-.042-.185-.058-.314.002a8.606 8.606 0 0 1-.729.303c-.135.048-.205.142-.225.22l-.352 1.45c-.167.687-.749 1.249-1.512 1.303-.531.038-1.063.038-1.594 0-.763-.054-1.345-.616-1.512-1.303l-.352-1.45c-.019-.078-.09-.171-.225-.221a8.138 8.138 0 0 1-.728-.302c-.13-.061-.246-.044-.315-.002l-1.275.776c-.603.368-1.411.353-1.99-.147-.402-.349-.78-.726-1.128-1.129-.501-.578-.515-1.386-.147-1.99l.776-1.274c.042-.069.058-.185-.002-.314a8.606 8.606 0 0 1-.303-.729c-.048-.135-.142-.205-.22-.225l-1.45-.352c-.687-.167-1.249-.749-1.304-1.512a11.158 11.158 0 0 1 0-1.594c.055-.763.617-1.345 1.304-1.512l1.45-.352c.078-.019.171-.09.221-.225.089-.248.19-.491.302-.728.061-.13.044-.246.002-.315l-.776-1.275c-.368-.603-.353-1.411.147-1.99.349-.402.726-.78 1.129-1.128.578-.501 1.386-.515 1.99-.147l1.274.776c.069.042.185.058.315-.002.238-.112.481-.213.728-.303.135-.048.205-.142.225-.22l.352-1.45c.167-.687.749-1.249 1.512-1.304C11.466 1.01 11.732 1 12 1Zm-.69 1.525c-.055.004-.135.05-.161.161l-.353 1.45a1.832 1.832 0 0 1-1.172 1.277 7.147 7.147 0 0 0-.6.249 1.833 1.833 0 0 1-1.734-.074l-1.274-.776c-.098-.06-.186-.036-.228 0a9.774 9.774 0 0 0-.976.976c-.036.042-.06.131 0 .228l.776 1.274c.314.529.342 1.18.074 1.734a7.147 7.147 0 0 0-.249.6 1.831 1.831 0 0 1-1.278 1.173l-1.45.351c-.11.027-.156.107-.16.162a9.63 9.63 0 0 0 0 1.38c.004.055.05.135.161.161l1.45.353a1.832 1.832 0 0 1 1.277 1.172c.074.204.157.404.249.6.268.553.24 1.204-.074 1.733l-.776 1.275c-.06.098-.036.186 0 .228.301.348.628.675.976.976.042.036.131.06.228 0l1.274-.776a1.83 1.83 0 0 1 1.734-.075c.196.093.396.176.6.25a1.831 1.831 0 0 1 1.173 1.278l.351 1.45c.027.11.107.156.162.16a9.63 9.63 0 0 0 1.38 0c.055-.004.135-.05.161-.161l.353-1.45a1.834 1.834 0 0 1 1.172-1.278 6.82 6.82 0 0 0 .6-.248 1.831 1.831 0 0 1 1.733.074l1.275.776c.098.06.186.036.228 0 .348-.301.675-.628.976-.976.036-.042.06-.131 0-.228l-.776-1.275a1.834 1.834 0 0 1-.075-1.733c.093-.196.176-.396.25-.6a1.831 1.831 0 0 1 1.278-1.173l1.45-.351c.11-.027.156-.107.16-.162a9.63 9.63 0 0 0 0-1.38c-.004-.055-.05-.135-.161-.161l-1.45-.353c-.626-.152-1.08-.625-1.278-1.172a6.576 6.576 0 0 0-.248-.6 1.833 1.833 0 0 1 .074-1.734l.776-1.274c.06-.098.036-.186 0-.228a9.774 9.774 0 0 0-.976-.976c-.042-.036-.131-.06-.228 0l-1.275.776a1.831 1.831 0 0 1-1.733.074 6.88 6.88 0 0 0-.6-.249 1.835 1.835 0 0 1-1.173-1.278l-.351-1.45c-.027-.11-.107-.156-.162-.16a9.63 9.63 0 0 0-1.38 0Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const gift: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M2 2.75A2.75 2.75 0 0 1 4.75 0c.983 0 1.873.42 2.57 1.232.268.318.497.668.68 1.042.183-.375.411-.725.68-1.044C9.376.42 10.266 0 11.25 0a2.75 2.75 0 0 1 2.45 4h.55c.966 0 1.75.784 1.75 1.75v2c0 .698-.409 1.301-1 1.582v4.918A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25V9.332C.409 9.05 0 8.448 0 7.75v-2C0 4.784.784 4 1.75 4h.55c-.192-.375-.3-.8-.3-1.25ZM7.25 9.5H2.5v4.75c0 .138.112.25.25.25h4.5Zm1.5 0v5h4.5a.25.25 0 0 0 .25-.25V9.5Zm0-4V8h5.5a.25.25 0 0 0 .25-.25v-2a.25.25 0 0 0-.25-.25Zm-7 0a.25.25 0 0 0-.25.25v2c0 .138.112.25.25.25h5.5V5.5h-5.5Zm3-4a1.25 1.25 0 0 0 0 2.5h2.309c-.233-.818-.542-1.401-.878-1.793-.43-.502-.915-.707-1.431-.707ZM8.941 4h2.309a1.25 1.25 0 0 0 0-2.5c-.516 0-1 .205-1.43.707-.337.392-.646.975-.879 1.793Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M3.75 3.75A3.75 3.75 0 0 1 7.5 0c1.455 0 3.436.901 4.5 3.11C13.064.901 15.044 0 16.5 0a3.75 3.75 0 0 1 3 6h1.75c.966 0 1.75.784 1.75 1.75v2.5c0 .698-.409 1.301-1 1.582v8.418A1.75 1.75 0 0 1 20.25 22H3.75A1.75 1.75 0 0 1 2 20.25v-8.418c-.591-.282-1-.884-1-1.582v-2.5C1 6.784 1.784 6 2.75 6H4.5a3.733 3.733 0 0 1-.75-2.25ZM20.5 12h-7.75v8.5h7.5a.25.25 0 0 0 .25-.25Zm-9.25 8.5V12H3.5v8.25c0 .138.112.25.25.25Zm10-10a.25.25 0 0 0 .25-.25v-2.5a.25.25 0 0 0-.25-.25h-8.5v3Zm-18.5 0h8.5v-3h-8.5a.25.25 0 0 0-.25.25v2.5c0 .138.112.25.25.25Zm16-6.75A2.25 2.25 0 0 0 16.5 1.5c-1.15 0-3.433 1.007-3.72 4.5h3.72a2.25 2.25 0 0 0 2.25-2.25ZM11.22 6c-.287-3.493-2.57-4.5-3.72-4.5a2.25 2.25 0 1 0 0 4.5Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const gitBranch: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M9.5 3.25a2.25 2.25 0 1 1 3 2.122V6A2.5 2.5 0 0 1 10 8.5H6a1 1 0 0 0-1 1v1.128a2.251 2.251 0 1 1-1.5 0V5.372a2.25 2.25 0 1 1 1.5 0v1.836A2.493 2.493 0 0 1 6 7h4a1 1 0 0 0 1-1v-.628A2.25 2.25 0 0 1 9.5 3.25Zm-6 0a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Zm8.25-.75a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5ZM4.25 12a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M15 4.75a3.25 3.25 0 1 1 6.5 0 3.25 3.25 0 0 1-6.5 0ZM2.5 19.25a3.25 3.25 0 1 1 6.5 0 3.25 3.25 0 0 1-6.5 0Zm0-14.5a3.25 3.25 0 1 1 6.5 0 3.25 3.25 0 0 1-6.5 0ZM5.75 6.5a1.75 1.75 0 1 0-.001-3.501A1.75 1.75 0 0 0 5.75 6.5Zm0 14.5a1.75 1.75 0 1 0-.001-3.501A1.75 1.75 0 0 0 5.75 21Zm12.5-14.5a1.75 1.75 0 1 0-.001-3.501A1.75 1.75 0 0 0 18.25 6.5Z',
+      'M5.75 16.75A.75.75 0 0 1 5 16V8a.75.75 0 0 1 1.5 0v8a.75.75 0 0 1-.75.75Z',
+      'M17.5 8.75v-1H19v1a3.75 3.75 0 0 1-3.75 3.75h-7a1.75 1.75 0 0 0-1.75 1.75H5A3.25 3.25 0 0 1 8.25 11h7a2.25 2.25 0 0 0 2.25-2.25Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const gitCommit: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M11.93 8.5a4.002 4.002 0 0 1-7.86 0H.75a.75.75 0 0 1 0-1.5h3.32a4.002 4.002 0 0 1 7.86 0h3.32a.75.75 0 0 1 0 1.5Zm-1.43-.75a2.5 2.5 0 1 0-5 0 2.5 2.5 0 0 0 5 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M16.944 11h4.306a.75.75 0 0 1 0 1.5h-4.306a5.001 5.001 0 0 1-9.888 0H2.75a.75.75 0 0 1 0-1.5h4.306a5.001 5.001 0 0 1 9.888 0Zm-1.444.75a3.5 3.5 0 1 0-7 0 3.5 3.5 0 0 0 7 0Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const gitCompare: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM6 12v-1.646a.25.25 0 0 1 .427-.177l2.396 2.396a.25.25 0 0 1 0 .354l-2.396 2.396A.25.25 0 0 1 6 15.146V13.5H5A2.5 2.5 0 0 1 2.5 11V5.372a2.25 2.25 0 1 1 1.5 0V11a1 1 0 0 0 1 1ZM4 3.25a.75.75 0 1 0-1.5 0 .75.75 0 0 0 1.5 0ZM12.75 12a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M16.5 19.25a3.25 3.25 0 1 1 6.5 0 3.25 3.25 0 0 1-6.5 0Zm3.25-1.75a1.75 1.75 0 1 0 .001 3.501 1.75 1.75 0 0 0-.001-3.501Z',
+      'M13.905 1.72a.75.75 0 0 1 0 1.06L12.685 4h4.065a3.75 3.75 0 0 1 3.75 3.75v8.75a.75.75 0 0 1-1.5 0V7.75a2.25 2.25 0 0 0-2.25-2.25h-4.064l1.22 1.22a.75.75 0 0 1-1.061 1.06l-2.5-2.5a.75.75 0 0 1 0-1.06l2.5-2.5a.75.75 0 0 1 1.06 0ZM7.5 4.75a3.25 3.25 0 1 1-6.5 0 3.25 3.25 0 0 1 6.5 0ZM4.25 6.5a1.75 1.75 0 1 0-.001-3.501A1.75 1.75 0 0 0 4.25 6.5Z',
+      'M10.095 22.28a.75.75 0 0 1 0-1.06l1.22-1.22H7.25a3.75 3.75 0 0 1-3.75-3.75V7.5a.75.75 0 0 1 1.5 0v8.75a2.25 2.25 0 0 0 2.25 2.25h4.064l-1.22-1.22a.748.748 0 0 1 .332-1.265.75.75 0 0 1 .729.205l2.5 2.5a.75.75 0 0 1 0 1.06l-2.5 2.5a.75.75 0 0 1-1.06 0Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const gitMerge: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M5.45 5.154A4.25 4.25 0 0 0 9.25 7.5h1.378a2.251 2.251 0 1 1 0 1.5H9.25A5.734 5.734 0 0 1 5 7.123v3.505a2.25 2.25 0 1 1-1.5 0V5.372a2.25 2.25 0 1 1 1.95-.218ZM4.25 13.5a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5Zm8.5-4.5a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5ZM5 3.25a.75.75 0 1 0 0 .005V3.25Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M15 13.25a3.25 3.25 0 1 1 6.5 0 3.25 3.25 0 0 1-6.5 0Zm-12.5 6a3.25 3.25 0 1 1 6.5 0 3.25 3.25 0 0 1-6.5 0Zm0-14.5a3.25 3.25 0 1 1 6.5 0 3.25 3.25 0 0 1-6.5 0ZM5.75 6.5a1.75 1.75 0 1 0-.001-3.501A1.75 1.75 0 0 0 5.75 6.5Zm0 14.5a1.75 1.75 0 1 0-.001-3.501A1.75 1.75 0 0 0 5.75 21Zm12.5-6a1.75 1.75 0 1 0-.001-3.501A1.75 1.75 0 0 0 18.25 15Z',
+      'M6.5 7.25c0 2.9 2.35 5.25 5.25 5.25h4.5V14h-4.5A6.75 6.75 0 0 1 5 7.25Z',
+      'M5.75 16.75A.75.75 0 0 1 5 16V8a.75.75 0 0 1 1.5 0v8a.75.75 0 0 1-.75.75Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const gitMergeQueue: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M3.75 4.5a1.25 1.25 0 1 0 0-2.5 1.25 1.25 0 0 0 0 2.5ZM3 7.75a.75.75 0 0 1 1.5 0v2.878a2.251 2.251 0 1 1-1.5 0Zm.75 5.75a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5Zm5-7.75a1.25 1.25 0 1 1-2.5 0 1.25 1.25 0 0 1 2.5 0Zm5.75 2.5a2.25 2.25 0 1 1-4.5 0 2.25 2.25 0 0 1 4.5 0Zm-1.5 0a.75.75 0 1 0-1.5 0 .75.75 0 0 0 1.5 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M5.75 6.5a1.75 1.75 0 1 1 .001-3.501A1.75 1.75 0 0 1 5.75 6.5ZM9.5 8.75a1.75 1.75 0 1 1 3.501.001A1.75 1.75 0 0 1 9.5 8.75ZM5.75 22.5a3.25 3.25 0 0 1-.745-6.414A.81.81 0 0 1 5 16v-5a.75.75 0 0 1 1.5 0v5a.81.81 0 0 1-.005.086A3.252 3.252 0 0 1 5.75 22.5ZM4 19.25a1.75 1.75 0 1 0 3.501-.001A1.75 1.75 0 0 0 4 19.25Zm11-6.5a3.25 3.25 0 1 1 6.5 0 3.25 3.25 0 0 1-6.5 0Zm3.25 1.75a1.75 1.75 0 1 0 0-3.5 1.75 1.75 0 0 0 0 3.5Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const gitPullRequest: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M16 19.25a3.25 3.25 0 1 1 6.5 0 3.25 3.25 0 0 1-6.5 0Zm-14.5 0a3.25 3.25 0 1 1 6.5 0 3.25 3.25 0 0 1-6.5 0Zm0-14.5a3.25 3.25 0 1 1 6.5 0 3.25 3.25 0 0 1-6.5 0ZM4.75 3a1.75 1.75 0 1 0 .001 3.501A1.75 1.75 0 0 0 4.75 3Zm0 14.5a1.75 1.75 0 1 0 .001 3.501A1.75 1.75 0 0 0 4.75 17.5Zm14.5 0a1.75 1.75 0 1 0 .001 3.501 1.75 1.75 0 0 0-.001-3.501Z',
+      'M13.405 1.72a.75.75 0 0 1 0 1.06L12.185 4h4.065A3.75 3.75 0 0 1 20 7.75v8.75a.75.75 0 0 1-1.5 0V7.75a2.25 2.25 0 0 0-2.25-2.25h-4.064l1.22 1.22a.75.75 0 0 1-1.061 1.06l-2.5-2.5a.75.75 0 0 1 0-1.06l2.5-2.5a.75.75 0 0 1 1.06 0ZM4.75 7.25A.75.75 0 0 1 5.5 8v8A.75.75 0 0 1 4 16V8a.75.75 0 0 1 .75-.75Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const gitPullRequestClosed: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M3.25 1A2.25 2.25 0 0 1 4 5.372v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.251 2.251 0 0 1 3.25 1Zm9.5 5.5a.75.75 0 0 1 .75.75v3.378a2.251 2.251 0 1 1-1.5 0V7.25a.75.75 0 0 1 .75-.75Zm-2.03-5.273a.75.75 0 0 1 1.06 0l.97.97.97-.97a.748.748 0 0 1 1.265.332.75.75 0 0 1-.205.729l-.97.97.97.97a.751.751 0 0 1-.018 1.042.751.751 0 0 1-1.042.018l-.97-.97-.97.97a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734l.97-.97-.97-.97a.75.75 0 0 1 0-1.06ZM2.5 3.25a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0ZM3.25 12a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm9.5 0a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M22.266 2.711a.75.75 0 1 0-1.061-1.06l-1.983 1.983-1.984-1.983a.75.75 0 1 0-1.06 1.06l1.983 1.983-1.983 1.984a.75.75 0 0 0 1.06 1.06l1.984-1.983 1.983 1.983a.75.75 0 0 0 1.06-1.06l-1.983-1.984 1.984-1.983ZM4.75 1.5a3.25 3.25 0 0 1 .745 6.414A.827.827 0 0 1 5.5 8v8a.827.827 0 0 1-.005.086A3.25 3.25 0 0 1 4.75 22.5a3.25 3.25 0 0 1-.745-6.414A.827.827 0 0 1 4 16V8c0-.029.002-.057.005-.086A3.25 3.25 0 0 1 4.75 1.5ZM16 19.25a3.252 3.252 0 0 1 2.5-3.163V9.625a.75.75 0 0 1 1.5 0v6.462a3.252 3.252 0 0 1-.75 6.413A3.25 3.25 0 0 1 16 19.25ZM3 4.75a1.75 1.75 0 1 0 3.501-.001A1.75 1.75 0 0 0 3 4.75Zm0 14.5a1.75 1.75 0 1 0 3.501-.001A1.75 1.75 0 0 0 3 19.25Zm16.25-1.75a1.75 1.75 0 1 0 .001 3.501 1.75 1.75 0 0 0-.001-3.501Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const gitPullRequestDraft: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M3.25 1A2.25 2.25 0 0 1 4 5.372v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.251 2.251 0 0 1 3.25 1Zm9.5 14a2.25 2.25 0 1 1 0-4.5 2.25 2.25 0 0 1 0 4.5ZM2.5 3.25a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0ZM3.25 12a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm9.5 0a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5ZM14 7.5a1.25 1.25 0 1 1-2.5 0 1.25 1.25 0 0 1 2.5 0Zm0-4.25a1.25 1.25 0 1 1-2.5 0 1.25 1.25 0 0 1 2.5 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M4.75 1.5a3.25 3.25 0 0 1 .745 6.414A.827.827 0 0 1 5.5 8v8a.827.827 0 0 1-.005.086A3.25 3.25 0 0 1 4.75 22.5a3.25 3.25 0 0 1-.745-6.414A.827.827 0 0 1 4 16V8c0-.029.002-.057.005-.086A3.25 3.25 0 0 1 4.75 1.5ZM16 19.25a3.25 3.25 0 1 1 6.5 0 3.25 3.25 0 0 1-6.5 0ZM3 4.75a1.75 1.75 0 1 0 3.501-.001A1.75 1.75 0 0 0 3 4.75Zm0 14.5a1.75 1.75 0 1 0 3.501-.001A1.75 1.75 0 0 0 3 19.25Zm16.25-1.75a1.75 1.75 0 1 0 .001 3.501 1.75 1.75 0 0 0-.001-3.501Zm0-11.5a1.75 1.75 0 1 0 0-3.5 1.75 1.75 0 0 0 0 3.5ZM21 11.25a1.75 1.75 0 1 1-3.5 0 1.75 1.75 0 0 1 3.5 0Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const globe: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM5.78 8.75a9.64 9.64 0 0 0 1.363 4.177c.255.426.542.832.857 1.215.245-.296.551-.705.857-1.215A9.64 9.64 0 0 0 10.22 8.75Zm4.44-1.5a9.64 9.64 0 0 0-1.363-4.177c-.307-.51-.612-.919-.857-1.215a9.927 9.927 0 0 0-.857 1.215A9.64 9.64 0 0 0 5.78 7.25Zm-5.944 1.5H1.543a6.507 6.507 0 0 0 4.666 5.5c-.123-.181-.24-.365-.352-.552-.715-1.192-1.437-2.874-1.581-4.948Zm-2.733-1.5h2.733c.144-2.074.866-3.756 1.58-4.948.12-.197.237-.381.353-.552a6.507 6.507 0 0 0-4.666 5.5Zm10.181 1.5c-.144 2.074-.866 3.756-1.58 4.948-.12.197-.237.381-.353.552a6.507 6.507 0 0 0 4.666-5.5Zm2.733-1.5a6.507 6.507 0 0 0-4.666-5.5c.123.181.24.365.353.552.714 1.192 1.436 2.874 1.58 4.948Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M12 1c6.075 0 11 4.925 11 11s-4.925 11-11 11S1 18.075 1 12 5.925 1 12 1Zm3.241 10.5v-.001c-.1-2.708-.992-4.904-1.89-6.452a13.919 13.919 0 0 0-1.304-1.88L12 3.11l-.047.059c-.354.425-.828 1.06-1.304 1.88-.898 1.547-1.79 3.743-1.89 6.451Zm-12.728 0h4.745c.1-3.037 1.1-5.49 2.093-7.204.39-.672.78-1.233 1.119-1.673C6.11 3.329 2.746 7 2.513 11.5Zm18.974 0C21.254 7 17.89 3.329 13.53 2.623c.339.44.729 1.001 1.119 1.673.993 1.714 1.993 4.167 2.093 7.204ZM8.787 13c.182 2.478 1.02 4.5 1.862 5.953.382.661.818 1.29 1.304 1.88l.047.057.047-.059c.354-.425.828-1.06 1.304-1.88.842-1.451 1.679-3.471 1.862-5.951Zm-1.504 0H2.552a9.505 9.505 0 0 0 7.918 8.377 15.773 15.773 0 0 1-1.119-1.673C8.413 18.085 7.47 15.807 7.283 13Zm9.434 0c-.186 2.807-1.13 5.085-2.068 6.704-.39.672-.78 1.233-1.118 1.673A9.506 9.506 0 0 0 21.447 13Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const goal: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M13.637 2.363h-.001l1.676.335c.09.018.164.084.19.173a.25.25 0 0 1-.062.249l-1.373 1.374a.876.876 0 0 1-.619.256H12.31L9.45 7.611A1.5 1.5 0 1 1 6.5 8a1.501 1.501 0 0 1 1.889-1.449l2.861-2.862V2.552c0-.232.092-.455.256-.619L12.88.559a.25.25 0 0 1 .249-.062c.089.026.155.1.173.19Z',
+      'M2 8a6 6 0 1 0 11.769-1.656.751.751 0 1 1 1.442-.413 7.502 7.502 0 0 1-12.513 7.371A7.501 7.501 0 0 1 10.069.789a.75.75 0 0 1-.413 1.442A6.001 6.001 0 0 0 2 8Z',
+      'M5 8a3.002 3.002 0 0 0 4.699 2.476 3 3 0 0 0 1.28-2.827.748.748 0 0 1 1.045-.782.75.75 0 0 1 .445.61A4.5 4.5 0 1 1 8.516 3.53a.75.75 0 1 1-.17 1.49A3 3 0 0 0 5 8Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M20.172 6.75h-1.861l-4.566 4.564a1.874 1.874 0 1 1-1.06-1.06l4.565-4.565V3.828a.94.94 0 0 1 .275-.664l1.73-1.73a.249.249 0 0 1 .25-.063c.089.026.155.1.173.191l.46 2.301 2.3.46c.09.018.164.084.19.173a.25.25 0 0 1-.062.249l-1.731 1.73a.937.937 0 0 1-.663.275Z',
+      'M2.625 12A9.375 9.375 0 0 0 12 21.375 9.375 9.375 0 0 0 21.375 12c0-.898-.126-1.766-.361-2.587A.75.75 0 0 1 22.455 9c.274.954.42 1.96.42 3 0 6.006-4.869 10.875-10.875 10.875S1.125 18.006 1.125 12 5.994 1.125 12 1.125c1.015-.001 2.024.14 3 .419a.75.75 0 1 1-.413 1.442A9.39 9.39 0 0 0 12 2.625 9.375 9.375 0 0 0 2.625 12Z',
+      'M7.125 12a4.874 4.874 0 1 0 9.717-.569.748.748 0 0 1 1.047-.798c.251.112.42.351.442.625a6.373 6.373 0 0 1-10.836 5.253 6.376 6.376 0 0 1 5.236-10.844.75.75 0 1 1-.17 1.49A4.876 4.876 0 0 0 7.125 12Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const grabber: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M10 13a1 1 0 1 1 0-2 1 1 0 0 1 0 2Zm0-4a1 1 0 1 1 0-2 1 1 0 0 1 0 2Zm-4 4a1 1 0 1 1 0-2 1 1 0 0 1 0 2Zm5-9a1 1 0 1 1-2 0 1 1 0 0 1 2 0ZM7 8a1 1 0 1 1-2 0 1 1 0 0 1 2 0ZM6 5a1 1 0 1 1 0-2 1 1 0 0 1 0 2Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M9 13a1 1 0 1 1 0-2 1 1 0 0 1 0 2Zm7-1a1 1 0 1 1-2 0 1 1 0 0 1 2 0ZM9 8a1 1 0 1 1 0-2 1 1 0 0 1 0 2Zm7-1a1 1 0 1 1-2 0 1 1 0 0 1 2 0ZM9 18a1 1 0 1 1 0-2 1 1 0 0 1 0 2Zm6 0a1 1 0 1 1 0-2 1 1 0 0 1 0 2Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const graph: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M1.5 1.75V13.5h13.75a.75.75 0 0 1 0 1.5H.75a.75.75 0 0 1-.75-.75V1.75a.75.75 0 0 1 1.5 0Zm14.28 2.53-5.25 5.25a.75.75 0 0 1-1.06 0L7 7.06 4.28 9.78a.751.751 0 0 1-1.042-.018.751.751 0 0 1-.018-1.042l3.25-3.25a.75.75 0 0 1 1.06 0L10 7.94l4.72-4.72a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M2.5 2.75a.75.75 0 0 0-1.5 0v18.5c0 .414.336.75.75.75H20a.75.75 0 0 0 0-1.5H2.5V2.75Z',
+      'M22.28 7.78a.75.75 0 0 0-1.06-1.06l-5.72 5.72-3.72-3.72a.75.75 0 0 0-1.06 0l-6 6a.75.75 0 1 0 1.06 1.06l5.47-5.47 3.72 3.72a.75.75 0 0 0 1.06 0l6.25-6.25Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const hash: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M6.368 1.01a.75.75 0 0 1 .623.859L6.57 4.5h3.98l.46-2.868a.75.75 0 0 1 1.48.237L12.07 4.5h2.18a.75.75 0 0 1 0 1.5h-2.42l-.64 4h2.56a.75.75 0 0 1 0 1.5h-2.8l-.46 2.869a.75.75 0 0 1-1.48-.237l.42-2.632H5.45l-.46 2.869a.75.75 0 0 1-1.48-.237l.42-2.632H1.75a.75.75 0 0 1 0-1.5h2.42l.64-4H2.25a.75.75 0 0 1 0-1.5h2.8l.46-2.868a.75.75 0 0 1 .858-.622ZM9.67 10l.64-4H6.33l-.64 4Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M9.618 1.76a.75.75 0 0 1 .623.859L9.46 7.5h6.48l.82-5.118a.75.75 0 0 1 1.48.237L17.46 7.5h3.79a.75.75 0 0 1 0 1.5h-4.03l-.96 6h3.99a.75.75 0 0 1 0 1.5h-4.23l-.78 4.869a.75.75 0 0 1-1.48-.237l.74-4.632H8.02l-.78 4.869a.75.75 0 0 1-1.48-.237L6.5 16.5H2.745a.75.75 0 0 1 0-1.5H6.74l.96-6H3.75a.75.75 0 0 1 0-1.5h4.19l.82-5.118a.75.75 0 0 1 .858-.622ZM14.741 15l.96-6H9.22l-.96 6Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const heading: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M3.75 2a.75.75 0 0 1 .75.75V7h7V2.75a.75.75 0 0 1 1.5 0v10.5a.75.75 0 0 1-1.5 0V8.5h-7v4.75a.75.75 0 0 1-1.5 0V2.75A.75.75 0 0 1 3.75 2Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M6.25 4a.75.75 0 0 1 .75.75V11h10V4.75a.75.75 0 0 1 1.5 0v14.5a.75.75 0 0 1-1.5 0V12.5H7v6.75a.75.75 0 0 1-1.5 0V4.75A.75.75 0 0 1 6.25 4Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const heart: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'm8 14.25.345.666a.75.75 0 0 1-.69 0l-.008-.004-.018-.01a7.152 7.152 0 0 1-.31-.17 22.055 22.055 0 0 1-3.434-2.414C2.045 10.731 0 8.35 0 5.5 0 2.836 2.086 1 4.25 1 5.797 1 7.153 1.802 8 3.02 8.847 1.802 10.203 1 11.75 1 13.914 1 16 2.836 16 5.5c0 2.85-2.045 5.231-3.885 6.818a22.066 22.066 0 0 1-3.744 2.584l-.018.01-.006.003h-.002ZM4.25 2.5c-1.336 0-2.75 1.164-2.75 3 0 2.15 1.58 4.144 3.365 5.682A20.58 20.58 0 0 0 8 13.393a20.58 20.58 0 0 0 3.135-2.211C12.92 9.644 14.5 7.65 14.5 5.5c0-1.836-1.414-3-2.75-3-1.373 0-2.609.986-3.029 2.456a.749.749 0 0 1-1.442 0C6.859 3.486 5.623 2.5 4.25 2.5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'm12 20.703.343.667a.748.748 0 0 1-.686 0l-.003-.002-.007-.003-.025-.013a31.138 31.138 0 0 1-5.233-3.576C3.8 15.573 1 12.332 1 8.514v-.001C1 5.053 3.829 2.5 6.736 2.5 9.03 2.5 10.881 3.726 12 5.605 13.12 3.726 14.97 2.5 17.264 2.5 20.17 2.5 23 5.052 23 8.514c0 3.818-2.801 7.06-5.389 9.262a31.148 31.148 0 0 1-5.233 3.576l-.025.013-.007.003-.002.001ZM6.736 4C4.657 4 2.5 5.88 2.5 8.514c0 3.107 2.324 5.96 4.861 8.12a29.655 29.655 0 0 0 4.566 3.175l.073.041.073-.04c.271-.153.661-.38 1.13-.674.94-.588 2.19-1.441 3.436-2.502 2.537-2.16 4.861-5.013 4.861-8.12C21.5 5.88 19.343 4 17.264 4c-2.106 0-3.801 1.389-4.553 3.643a.751.751 0 0 1-1.422 0C10.537 5.389 8.841 4 6.736 4Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const heartFill: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M7.655 14.916v-.001h-.002l-.006-.003-.018-.01a22.066 22.066 0 0 1-3.744-2.584C2.045 10.731 0 8.35 0 5.5 0 2.836 2.086 1 4.25 1 5.797 1 7.153 1.802 8 3.02 8.847 1.802 10.203 1 11.75 1 13.914 1 16 2.836 16 5.5c0 2.85-2.044 5.231-3.886 6.818a22.094 22.094 0 0 1-3.433 2.414 7.152 7.152 0 0 1-.31.17l-.018.01-.008.004a.75.75 0 0 1-.69 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M14 20.408c-.492.308-.903.546-1.192.709-.153.086-.308.17-.463.252h-.002a.75.75 0 0 1-.686 0 16.709 16.709 0 0 1-.465-.252 31.147 31.147 0 0 1-4.803-3.34C3.8 15.572 1 12.331 1 8.513 1 5.052 3.829 2.5 6.736 2.5 9.03 2.5 10.881 3.726 12 5.605 13.12 3.726 14.97 2.5 17.264 2.5 20.17 2.5 23 5.052 23 8.514c0 3.818-2.801 7.06-5.389 9.262A31.146 31.146 0 0 1 14 20.408Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const history: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'm.427 1.927 1.215 1.215a8.002 8.002 0 1 1-1.6 5.685.75.75 0 1 1 1.493-.154 6.5 6.5 0 1 0 1.18-4.458l1.358 1.358A.25.25 0 0 1 3.896 6H.25A.25.25 0 0 1 0 5.75V2.104a.25.25 0 0 1 .427-.177ZM7.75 4a.75.75 0 0 1 .75.75v2.992l2.028.812a.75.75 0 0 1-.557 1.392l-2.5-1A.751.751 0 0 1 7 8.25v-3.5A.75.75 0 0 1 7.75 4Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M11.998 2.5A9.503 9.503 0 0 0 3.378 8H5.75a.75.75 0 0 1 0 1.5H2a1 1 0 0 1-1-1V4.75a.75.75 0 0 1 1.5 0v1.697A10.997 10.997 0 0 1 11.998 1C18.074 1 23 5.925 23 12s-4.926 11-11.002 11C6.014 23 1.146 18.223 1 12.275a.75.75 0 0 1 1.5-.037 9.5 9.5 0 0 0 9.498 9.262c5.248 0 9.502-4.253 9.502-9.5s-4.254-9.5-9.502-9.5Z',
+      'M12.5 7.25a.75.75 0 0 0-1.5 0v5.5c0 .27.144.518.378.651l3.5 2a.75.75 0 0 0 .744-1.302L12.5 12.315V7.25Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const home: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M6.906.664a1.749 1.749 0 0 1 2.187 0l5.25 4.2c.415.332.657.835.657 1.367v7.019A1.75 1.75 0 0 1 13.25 15h-3.5a.75.75 0 0 1-.75-.75V9H7v5.25a.75.75 0 0 1-.75.75h-3.5A1.75 1.75 0 0 1 1 13.25V6.23c0-.531.242-1.034.657-1.366l5.25-4.2Zm1.25 1.171a.25.25 0 0 0-.312 0l-5.25 4.2a.25.25 0 0 0-.094.196v7.019c0 .138.112.25.25.25H5.5V8.25a.75.75 0 0 1 .75-.75h3.5a.75.75 0 0 1 .75.75v5.25h2.75a.25.25 0 0 0 .25-.25V6.23a.25.25 0 0 0-.094-.195Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M11.03 2.59a1.501 1.501 0 0 1 1.94 0l7.5 6.363a1.5 1.5 0 0 1 .53 1.144V19.5a1.5 1.5 0 0 1-1.5 1.5h-5.75a.75.75 0 0 1-.75-.75V14h-2v6.25a.75.75 0 0 1-.75.75H4.5A1.5 1.5 0 0 1 3 19.5v-9.403c0-.44.194-.859.53-1.144ZM12 3.734l-7.5 6.363V19.5h5v-6.25a.75.75 0 0 1 .75-.75h3.5a.75.75 0 0 1 .75.75v6.25h5v-9.403Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const homeFill: OcticonSymbolVariants = {
+  '24': {
+    p: [
+      'M12.97 2.59a1.5 1.5 0 0 0-1.94 0l-7.5 6.363A1.5 1.5 0 0 0 3 10.097V19.5A1.5 1.5 0 0 0 4.5 21h4.75a.75.75 0 0 0 .75-.75V14h4v6.25c0 .414.336.75.75.75h4.75a1.5 1.5 0 0 0 1.5-1.5v-9.403a1.5 1.5 0 0 0-.53-1.144l-7.5-6.363Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const horizontalRule: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M0 7.75A.75.75 0 0 1 .75 7h14.5a.75.75 0 0 1 0 1.5H.75A.75.75 0 0 1 0 7.75Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M2 12.75a.75.75 0 0 1 .75-.75h18.5a.75.75 0 0 1 0 1.5H2.75a.75.75 0 0 1-.75-.75Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const hourglass: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M2.75 1h10.5a.75.75 0 0 1 0 1.5h-.75v1.25a4.75 4.75 0 0 1-1.9 3.8l-.333.25a.25.25 0 0 0 0 .4l.333.25a4.75 4.75 0 0 1 1.9 3.8v1.25h.75a.75.75 0 0 1 0 1.5H2.75a.75.75 0 0 1 0-1.5h.75v-1.25a4.75 4.75 0 0 1 1.9-3.8l.333-.25a.25.25 0 0 0 0-.4L5.4 7.55a4.75 4.75 0 0 1-1.9-3.8V2.5h-.75a.75.75 0 0 1 0-1.5ZM11 2.5H5v1.25c0 1.023.482 1.986 1.3 2.6l.333.25c.934.7.934 2.1 0 2.8l-.333.25a3.251 3.251 0 0 0-1.3 2.6v1.25h6v-1.25a3.251 3.251 0 0 0-1.3-2.6l-.333-.25a1.748 1.748 0 0 1 0-2.8l.333-.25a3.251 3.251 0 0 0 1.3-2.6Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M4.75 2h14.5a.75.75 0 0 1 0 1.5h-.75v2.982a4.75 4.75 0 0 1-2.215 4.017l-2.044 1.29a.25.25 0 0 0 0 .422l2.044 1.29a4.75 4.75 0 0 1 2.215 4.017V20.5h.75a.75.75 0 0 1 0 1.5H4.75a.75.75 0 0 1 0-1.5h.75v-2.982a4.75 4.75 0 0 1 2.215-4.017l2.044-1.29a.25.25 0 0 0 0-.422l-2.044-1.29A4.75 4.75 0 0 1 5.5 6.482V3.5h-.75a.75.75 0 0 1 0-1.5ZM17 3.5H7v2.982A3.25 3.25 0 0 0 8.516 9.23l2.044 1.29a1.75 1.75 0 0 1 0 2.96l-2.044 1.29A3.25 3.25 0 0 0 7 17.518V20.5h10v-2.982a3.25 3.25 0 0 0-1.516-2.748l-2.044-1.29a1.75 1.75 0 0 1 0-2.96l2.044-1.29A3.25 3.25 0 0 0 17 6.482Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const hubot: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M0 8a8 8 0 0 1 16 0v5.25a.75.75 0 0 1-1.5 0V8a6.5 6.5 0 1 0-13 0v5.25a.75.75 0 0 1-1.5 0Zm3-1.25C3 5.784 3.784 5 4.75 5h6.5c.966 0 1.75.784 1.75 1.75v1.5A1.75 1.75 0 0 1 11.25 10h-6.5A1.75 1.75 0 0 1 3 8.25Zm1.47-.53a.75.75 0 0 0 0 1.06l1.5 1.5a.75.75 0 0 0 1.06 0L8 7.81l.97.97a.75.75 0 0 0 1.06 0l1.5-1.5a.749.749 0 0 0-.326-1.275.749.749 0 0 0-.734.215l-.97.97-.97-.97a.75.75 0 0 0-1.06 0l-.97.97-.97-.97a.75.75 0 0 0-1.06 0Zm1.03 6.03a.75.75 0 0 1 .75-.75h3.5a.75.75 0 0 1 0 1.5h-3.5a.75.75 0 0 1-.75-.75Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M0 13C0 6.373 5.373 1 12 1s12 5.373 12 12v8.657a.75.75 0 0 1-1.5 0V13c0-5.799-4.701-10.5-10.5-10.5S1.5 7.201 1.5 13v8.657a.75.75 0 0 1-1.5 0V13Z',
+      'M8 19.75a.75.75 0 0 1 .75-.75h6.5a.75.75 0 0 1 0 1.5h-6.5a.75.75 0 0 1-.75-.75ZM5.25 9.5h13.5c.966 0 1.75.784 1.75 1.75v3.5a1.75 1.75 0 0 1-1.75 1.75H5.25a1.75 1.75 0 0 1-1.75-1.75v-3.5c0-.966.784-1.75 1.75-1.75Zm.22 1.47a.75.75 0 0 0 0 1.06l3 3a.75.75 0 0 0 1.06 0L12 12.56l2.47 2.47a.75.75 0 0 0 1.06 0l3-3a.749.749 0 0 0-.326-1.275.749.749 0 0 0-.734.215L15 13.44l-2.47-2.47a.75.75 0 0 0-1.06 0L9 13.44l-2.47-2.47a.75.75 0 0 0-1.06 0Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const idBadge: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M3 7.5a.5.5 0 0 1 .5-.5h2a.5.5 0 0 1 .5.5v3a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1-.5-.5v-3Zm10 .25a.75.75 0 0 1-.75.75h-4.5a.75.75 0 0 1 0-1.5h4.5a.75.75 0 0 1 .75.75ZM10.25 11a.75.75 0 0 0 0-1.5h-2.5a.75.75 0 0 0 0 1.5h2.5Z',
+      'M7.25 0h1.5c.966 0 1.75.784 1.75 1.75V3h3.75c.966 0 1.75.784 1.75 1.75v8.5A1.75 1.75 0 0 1 14.25 15H1.75A1.75 1.75 0 0 1 0 13.25v-8.5C0 3.784.784 3 1.75 3H5.5V1.75C5.5.784 6.284 0 7.25 0Zm3.232 4.5A1.75 1.75 0 0 1 8.75 6h-1.5a1.75 1.75 0 0 1-1.732-1.5H1.75a.25.25 0 0 0-.25.25v8.5c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25v-8.5a.25.25 0 0 0-.25-.25ZM7 1.75v2.5c0 .138.112.25.25.25h1.5A.25.25 0 0 0 9 4.25v-2.5a.25.25 0 0 0-.25-.25h-1.5a.25.25 0 0 0-.25.25Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const image: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M16 13.25A1.75 1.75 0 0 1 14.25 15H1.75A1.75 1.75 0 0 1 0 13.25V2.75C0 1.784.784 1 1.75 1h12.5c.966 0 1.75.784 1.75 1.75ZM1.75 2.5a.25.25 0 0 0-.25.25v10.5c0 .138.112.25.25.25h.94l.03-.03 6.077-6.078a1.75 1.75 0 0 1 2.412-.06L14.5 10.31V2.75a.25.25 0 0 0-.25-.25Zm12.5 11a.25.25 0 0 0 .25-.25v-.917l-4.298-3.889a.25.25 0 0 0-.344.009L4.81 13.5ZM7 6a2 2 0 1 1-3.999.001A2 2 0 0 1 7 6ZM5.5 6a.5.5 0 1 0-1 0 .5.5 0 0 0 1 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M4.75 3h14.5c.966 0 1.75.784 1.75 1.75v14.5A1.75 1.75 0 0 1 19.25 21H4.75A1.75 1.75 0 0 1 3 19.25V4.75C3 3.784 3.784 3 4.75 3Zm14.5 1.5H4.75a.25.25 0 0 0-.25.25v14.5c0 .138.112.25.25.25h.19l9.823-9.823a1.75 1.75 0 0 1 2.475 0l2.262 2.262V4.75a.25.25 0 0 0-.25-.25Zm.25 9.56-3.323-3.323a.25.25 0 0 0-.354 0L7.061 19.5H19.25a.25.25 0 0 0 .25-.25ZM8.5 11a2.5 2.5 0 1 1 0-5 2.5 2.5 0 0 1 0 5Zm0-1.5a1 1 0 1 0 0-2 1 1 0 0 0 0 2Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const inbox: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M2.8 2.06A1.75 1.75 0 0 1 4.41 1h7.18c.7 0 1.333.417 1.61 1.06l2.74 6.395c.04.093.06.194.06.295v4.5A1.75 1.75 0 0 1 14.25 15H1.75A1.75 1.75 0 0 1 0 13.25v-4.5c0-.101.02-.202.06-.295Zm1.61.44a.25.25 0 0 0-.23.152L1.887 8H4.75a.75.75 0 0 1 .6.3L6.625 10h2.75l1.275-1.7a.75.75 0 0 1 .6-.3h2.863L11.82 2.652a.25.25 0 0 0-.23-.152Zm10.09 7h-2.875l-1.275 1.7a.75.75 0 0 1-.6.3h-3.5a.75.75 0 0 1-.6-.3L4.375 9.5H1.5v3.75c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M4.801 3.57A1.75 1.75 0 0 1 6.414 2.5h11.174c.702 0 1.337.42 1.611 1.067l3.741 8.828c.04.092.06.192.06.293v7.562A1.75 1.75 0 0 1 21.25 22H2.75A1.75 1.75 0 0 1 1 20.25v-7.5c0-.1.02-.199.059-.291L4.8 3.571ZM6.414 4a.25.25 0 0 0-.23.153L2.88 12H8a.75.75 0 0 1 .648.372L10.18 15h3.638l1.533-2.628a.75.75 0 0 1 .64-.372l5.13-.051-3.304-7.797a.25.25 0 0 0-.23-.152ZM21.5 13.445l-5.067.05-1.535 2.633a.75.75 0 0 1-.648.372h-4.5a.75.75 0 0 1-.648-.372L7.57 13.5H2.5v6.75c0 .138.112.25.25.25h18.5a.25.25 0 0 0 .25-.25Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const infinity: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8 6.984c.59-.533 1.204-1.066 1.825-1.493.797-.548 1.7-.991 2.675-.991C14.414 4.5 16 6.086 16 8s-1.586 3.5-3.5 3.5c-.975 0-1.878-.444-2.675-.991-.621-.427-1.235-.96-1.825-1.493-.59.533-1.204 1.066-1.825 1.493-.797.547-1.7.991-2.675.991C1.586 11.5 0 9.914 0 8s1.586-3.5 3.5-3.5c.975 0 1.878.443 2.675.991.621.427 1.235.96 1.825 1.493ZM9.114 8c.536.483 1.052.922 1.56 1.273.704.483 1.3.727 1.826.727 1.086 0 2-.914 2-2 0-1.086-.914-2-2-2-.525 0-1.122.244-1.825.727-.51.35-1.025.79-1.561 1.273ZM3.5 6c-1.086 0-2 .914-2 2 0 1.086.914 2 2 2 .525 0 1.122-.244 1.825-.727.51-.35 1.025-.79 1.561-1.273-.536-.483-1.052-.922-1.56-1.273C4.621 6.244 4.025 6 3.5 6Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M12 11.16c.887-.933 1.813-1.865 2.78-2.6C15.952 7.668 17.267 7 18.75 7 21.657 7 24 9.615 24 12.25s-2.343 5.25-5.25 5.25c-1.483 0-2.798-.668-3.97-1.56-.967-.735-1.893-1.667-2.78-2.6-.887.933-1.813 1.865-2.78 2.6-1.172.892-2.487 1.56-3.97 1.56C2.343 17.5 0 14.885 0 12.25S2.343 7 5.25 7c1.483 0 2.798.667 3.97 1.56.967.735 1.893 1.667 2.78 2.6ZM5.25 8.5c-2.032 0-3.75 1.895-3.75 3.75S3.218 16 5.25 16c1.017 0 2.014-.457 3.062-1.253.89-.678 1.758-1.554 2.655-2.497-.897-.943-1.765-1.82-2.655-2.497C7.264 8.957 6.267 8.5 5.25 8.5Zm7.783 3.75c.897.943 1.765 1.82 2.655 2.497C16.736 15.543 17.733 16 18.75 16c2.032 0 3.75-1.895 3.75-3.75S20.782 8.5 18.75 8.5c-1.017 0-2.014.457-3.062 1.253-.89.678-1.758 1.554-2.655 2.497Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const info: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.5 7.75A.75.75 0 0 1 7.25 7h1a.75.75 0 0 1 .75.75v2.75h.25a.75.75 0 0 1 0 1.5h-2a.75.75 0 0 1 0-1.5h.25v-2h-.25a.75.75 0 0 1-.75-.75ZM8 6a1 1 0 1 1 0-2 1 1 0 0 1 0 2Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M13 7.5a1 1 0 1 1-2 0 1 1 0 0 1 2 0Zm-3 3.75a.75.75 0 0 1 .75-.75h1.5a.75.75 0 0 1 .75.75v4.25h.75a.75.75 0 0 1 0 1.5h-3a.75.75 0 0 1 0-1.5h.75V12h-.75a.75.75 0 0 1-.75-.75Z',
+      'M12 1c6.075 0 11 4.925 11 11s-4.925 11-11 11S1 18.075 1 12 5.925 1 12 1ZM2.5 12a9.5 9.5 0 0 0 9.5 9.5 9.5 9.5 0 0 0 9.5-9.5A9.5 9.5 0 0 0 12 2.5 9.5 9.5 0 0 0 2.5 12Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const issueClosed: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M11.28 6.78a.75.75 0 0 0-1.06-1.06L7.25 8.69 5.78 7.22a.75.75 0 0 0-1.06 1.06l2 2a.75.75 0 0 0 1.06 0l3.5-3.5Z',
+      'M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0Zm-1.5 0a6.5 6.5 0 1 0-13 0 6.5 6.5 0 0 0 13 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M17.28 9.28a.75.75 0 0 0-1.06-1.06l-5.97 5.97-2.47-2.47a.75.75 0 0 0-1.06 1.06l3 3a.75.75 0 0 0 1.06 0l6.5-6.5Z',
+      'M12 1c6.075 0 11 4.925 11 11s-4.925 11-11 11S1 18.075 1 12 5.925 1 12 1ZM2.5 12a9.5 9.5 0 0 0 9.5 9.5 9.5 9.5 0 0 0 9.5-9.5A9.5 9.5 0 0 0 12 2.5 9.5 9.5 0 0 0 2.5 12Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const issueDraft: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M14.307 11.655a.75.75 0 0 1 .165 1.048 8.05 8.05 0 0 1-1.769 1.77.75.75 0 0 1-.883-1.214 6.552 6.552 0 0 0 1.44-1.439.75.75 0 0 1 1.047-.165Zm-2.652-9.962a.75.75 0 0 1 1.048-.165 8.05 8.05 0 0 1 1.77 1.769.75.75 0 0 1-1.214.883 6.552 6.552 0 0 0-1.439-1.44.75.75 0 0 1-.165-1.047ZM6.749.097a8.074 8.074 0 0 1 2.502 0 .75.75 0 1 1-.233 1.482 6.558 6.558 0 0 0-2.036 0A.751.751 0 0 1 6.749.097ZM.955 6.125a.75.75 0 0 1 .624.857 6.558 6.558 0 0 0 0 2.036.75.75 0 1 1-1.482.233 8.074 8.074 0 0 1 0-2.502.75.75 0 0 1 .858-.624Zm14.09 0a.75.75 0 0 1 .858.624c.13.829.13 1.673 0 2.502a.75.75 0 1 1-1.482-.233 6.558 6.558 0 0 0 0-2.036.75.75 0 0 1 .624-.857Zm-8.92 8.92a.75.75 0 0 1 .857-.624 6.558 6.558 0 0 0 2.036 0 .75.75 0 1 1 .233 1.482c-.829.13-1.673.13-2.502 0a.75.75 0 0 1-.624-.858Zm-4.432-3.39a.75.75 0 0 1 1.048.165 6.552 6.552 0 0 0 1.439 1.44.751.751 0 0 1-.883 1.212 8.05 8.05 0 0 1-1.77-1.769.75.75 0 0 1 .166-1.048Zm2.652-9.962A.75.75 0 0 1 4.18 2.74a6.556 6.556 0 0 0-1.44 1.44.751.751 0 0 1-1.212-.883 8.05 8.05 0 0 1 1.769-1.77.75.75 0 0 1 1.048.166Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M17.32 3.205a.75.75 0 0 1 1.046-.177 11.056 11.056 0 0 1 2.605 2.606.75.75 0 1 1-1.222.869 9.554 9.554 0 0 0-2.252-2.252.75.75 0 0 1-.177-1.046Zm3.475 14.115a.75.75 0 0 1 .176 1.046 11.07 11.07 0 0 1-2.605 2.605.75.75 0 1 1-.869-1.222 9.554 9.554 0 0 0 2.252-2.252.75.75 0 0 1 1.046-.177ZM2.018 9.543a.75.75 0 0 1 .615.864 9.571 9.571 0 0 0 0 3.186.75.75 0 1 1-1.48.25 11.07 11.07 0 0 1 0-3.686.75.75 0 0 1 .865-.614Zm7.525 12.439a.75.75 0 0 1 .864-.615 9.571 9.571 0 0 0 3.186 0 .75.75 0 1 1 .25 1.48 11.07 11.07 0 0 1-3.686 0 .75.75 0 0 1-.614-.865ZM6.68 3.205a.75.75 0 0 1-.177 1.046A9.558 9.558 0 0 0 4.25 6.503a.75.75 0 1 1-1.223-.87 11.056 11.056 0 0 1 2.606-2.605.75.75 0 0 1 1.046.177ZM3.205 17.32a.75.75 0 0 1 1.046.177 9.554 9.554 0 0 0 2.252 2.252.75.75 0 1 1-.87 1.223 11.056 11.056 0 0 1-2.605-2.606.75.75 0 0 1 .177-1.046Zm6.952-16.166a11.07 11.07 0 0 1 3.686 0 .75.75 0 0 1-.25 1.479 9.571 9.571 0 0 0-3.186 0 .75.75 0 1 1-.25-1.48Zm11.825 8.389a.75.75 0 0 1 .864.614 11.07 11.07 0 0 1 0 3.686.75.75 0 0 1-1.479-.25 9.571 9.571 0 0 0 0-3.186.75.75 0 0 1 .615-.864Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const issueOpened: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z',
+      'M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M12 1c6.075 0 11 4.925 11 11s-4.925 11-11 11S1 18.075 1 12 5.925 1 12 1ZM2.5 12a9.5 9.5 0 0 0 9.5 9.5 9.5 9.5 0 0 0 9.5-9.5A9.5 9.5 0 0 0 12 2.5 9.5 9.5 0 0 0 2.5 12Zm9.5 2a2 2 0 1 1-.001-3.999A2 2 0 0 1 12 14Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const issueReopened: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M5.029 2.217a6.5 6.5 0 0 1 9.437 5.11.75.75 0 1 0 1.492-.154 8 8 0 0 0-14.315-4.03L.427 1.927A.25.25 0 0 0 0 2.104V5.75A.25.25 0 0 0 .25 6h3.646a.25.25 0 0 0 .177-.427L2.715 4.215a6.491 6.491 0 0 1 2.314-1.998ZM1.262 8.169a.75.75 0 0 0-1.22.658 8.001 8.001 0 0 0 14.315 4.03l1.216 1.216a.25.25 0 0 0 .427-.177V10.25a.25.25 0 0 0-.25-.25h-3.646a.25.25 0 0 0-.177.427l1.358 1.358a6.501 6.501 0 0 1-11.751-3.11.75.75 0 0 0-.272-.506Z',
+      'M9.06 9.06a1.5 1.5 0 1 1-2.12-2.12 1.5 1.5 0 0 1 2.12 2.12Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M3.38 8A9.502 9.502 0 0 1 12 2.5a9.502 9.502 0 0 1 9.215 7.182.75.75 0 1 0 1.456-.364C21.473 4.539 17.15 1 12 1a10.995 10.995 0 0 0-9.5 5.452V4.75a.75.75 0 0 0-1.5 0V8.5a1 1 0 0 0 1 1h3.75a.75.75 0 0 0 0-1.5H3.38Zm-.595 6.318a.75.75 0 0 0-1.455.364C2.527 19.461 6.85 23 12 23c4.052 0 7.592-2.191 9.5-5.451v1.701a.75.75 0 0 0 1.5 0V15.5a1 1 0 0 0-1-1h-3.75a.75.75 0 0 0 0 1.5h2.37A9.502 9.502 0 0 1 12 21.5c-4.446 0-8.181-3.055-9.215-7.182Z',
+      'M13.414 13.414a2 2 0 1 1-2.828-2.828 2 2 0 0 1 2.828 2.828Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const issueTrackedBy: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M1.5 8a6.5 6.5 0 0 1 13 0A.75.75 0 0 0 16 8a8 8 0 1 0-8 8 .75.75 0 0 0 0-1.5A6.5 6.5 0 0 1 1.5 8Z',
+      'M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Zm3.573 5.823-2.896-2.896a.25.25 0 0 1 0-.354l2.896-2.896a.25.25 0 0 1 .427.177V11.5h3.25a.75.75 0 0 1 0 1.5H12v2.146a.25.25 0 0 1-.427.177Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M12 2.5a9.5 9.5 0 1 0 0 19 .75.75 0 0 1 0 1.5C5.925 23 1 18.075 1 12S5.925 1 12 1s11 4.925 11 11a.75.75 0 0 1-1.5 0A9.5 9.5 0 0 0 12 2.5Z',
+      'm13.759 17.48 3.728 3.314a.308.308 0 0 0 .513-.23V18h4.25a.75.75 0 0 0 0-1.5H18v-2.564a.308.308 0 0 0-.513-.23L13.76 17.02a.308.308 0 0 0 0 .46ZM12 14a2 2 0 1 0 0-4 2 2 0 0 0 0 4Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const issueTracks: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M1.5 8a6.5 6.5 0 0 1 13 0A.75.75 0 0 0 16 8a8 8 0 1 0-8 8 .75.75 0 0 0 0-1.5A6.5 6.5 0 0 1 1.5 8Z',
+      'M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Zm1.5 1.75a.75.75 0 0 1 .75-.75h5a.75.75 0 0 1 0 1.5h-5a.75.75 0 0 1-.75-.75Zm2.75 2.25a.75.75 0 0 0 0 1.5h3a.75.75 0 0 0 0-1.5h-3Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M2.5 12a9.5 9.5 0 1 1 19 0 .75.75 0 0 0 1.5 0c0-6.075-4.925-11-11-11S1 5.925 1 12s4.925 11 11 11a.75.75 0 0 0 0-1.5A9.5 9.5 0 0 1 2.5 12Z',
+      'M12 14a2 2 0 1 0 0-4 2 2 0 0 0 0 4Zm2.5 2.75a.75.75 0 0 1 .75-.75h7a.75.75 0 0 1 0 1.5h-7a.75.75 0 0 1-.75-.75Zm3.75 2.75a.75.75 0 0 0 0 1.5h4a.75.75 0 0 0 0-1.5h-4Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const italic: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M6 2.75A.75.75 0 0 1 6.75 2h6.5a.75.75 0 0 1 0 1.5h-2.505l-3.858 9H9.25a.75.75 0 0 1 0 1.5h-6.5a.75.75 0 0 1 0-1.5h2.505l3.858-9H6.75A.75.75 0 0 1 6 2.75Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M10 4.75a.75.75 0 0 1 .75-.75h8.5a.75.75 0 0 1 0 1.5h-3.514l-5.828 13h3.342a.75.75 0 0 1 0 1.5h-8.5a.75.75 0 0 1 0-1.5h3.514l5.828-13H10.75a.75.75 0 0 1-.75-.75Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const iterations: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M2.5 7.25a4.75 4.75 0 0 1 9.5 0 .75.75 0 0 0 1.5 0 6.25 6.25 0 1 0-6.25 6.25H12v2.146c0 .223.27.335.427.177l2.896-2.896a.25.25 0 0 0 0-.354l-2.896-2.896a.25.25 0 0 0-.427.177V12H7.25A4.75 4.75 0 0 1 2.5 7.25Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M2.5 10.5a8 8 0 1 1 16 0 .75.75 0 0 0 1.5 0 9.5 9.5 0 1 0-9.5 9.5h10.94l-2.72 2.72a.75.75 0 1 0 1.06 1.06l3.735-3.735c.44-.439.44-1.151 0-1.59L19.78 14.72a.75.75 0 0 0-1.06 1.06l2.72 2.72H10.5a8 8 0 0 1-8-8Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const kebabHorizontal: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8 9a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3ZM1.5 9a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Zm13 0a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M20 14a2 2 0 1 1-.001-3.999A2 2 0 0 1 20 14ZM6 12a2 2 0 1 1-3.999.001A2 2 0 0 1 6 12Zm8 0a2 2 0 1 1-3.999.001A2 2 0 0 1 14 12Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const key: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M10.5 0a5.499 5.499 0 1 1-1.288 10.848l-.932.932a.749.749 0 0 1-.53.22H7v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22H5v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22h-2A1.75 1.75 0 0 1 0 14.25v-2c0-.199.079-.389.22-.53l4.932-4.932A5.5 5.5 0 0 1 10.5 0Zm-4 5.5c-.001.431.069.86.205 1.269a.75.75 0 0 1-.181.768L1.5 12.56v1.69c0 .138.112.25.25.25h1.69l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l1.023-1.025a.75.75 0 0 1 .768-.18A4 4 0 1 0 6.5 5.5ZM11 6a1 1 0 1 1 0-2 1 1 0 0 1 0 2Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M16.75 8.5a1.25 1.25 0 1 0 0-2.5 1.25 1.25 0 0 0 0 2.5Z',
+      'M15.75 0a8.25 8.25 0 1 1-2.541 16.101l-1.636 1.636a1.744 1.744 0 0 1-1.237.513H9.25a.25.25 0 0 0-.25.25v1.448a.876.876 0 0 1-.256.619l-.214.213a.75.75 0 0 1-.545.22H5.25a.25.25 0 0 0-.25.25v1A1.75 1.75 0 0 1 3.25 24h-1.5A1.75 1.75 0 0 1 0 22.25v-2.836c0-.464.185-.908.513-1.236l7.386-7.388A8.249 8.249 0 0 1 15.75 0ZM9 8.25a6.733 6.733 0 0 0 .463 2.462.75.75 0 0 1-.168.804l-7.722 7.721a.25.25 0 0 0-.073.177v2.836c0 .138.112.25.25.25h1.5a.25.25 0 0 0 .25-.25v-1c0-.966.784-1.75 1.75-1.75H7.5v-1c0-.966.784-1.75 1.75-1.75h1.086a.25.25 0 0 0 .177-.073l1.971-1.972a.75.75 0 0 1 .804-.168A6.75 6.75 0 1 0 9 8.25Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const keyAsterisk: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M0 2.75A2.75 2.75 0 0 1 2.75 0h10.5A2.75 2.75 0 0 1 16 2.75v10.5A2.75 2.75 0 0 1 13.25 16H2.75A2.75 2.75 0 0 1 0 13.25ZM2.75 1.5c-.69 0-1.25.56-1.25 1.25v10.5c0 .69.56 1.25 1.25 1.25h10.5c.69 0 1.25-.56 1.25-1.25V2.75c0-.69-.56-1.25-1.25-1.25Z',
+      'M8 4a.75.75 0 0 1 .75.75V6.7l1.69-.975a.75.75 0 0 1 .75 1.3L9.5 8l1.69.976a.75.75 0 0 1-.75 1.298L8.75 9.3v1.951a.75.75 0 0 1-1.5 0V9.299l-1.69.976a.75.75 0 0 1-.75-1.3L6.5 8l-1.69-.975a.75.75 0 0 1 .75-1.3l1.69.976V4.75A.75.75 0 0 1 8 4Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const law: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8.75.75V2h.985c.304 0 .603.08.867.231l1.29.736c.038.022.08.033.124.033h2.234a.75.75 0 0 1 0 1.5h-.427l2.111 4.692a.75.75 0 0 1-.154.838l-.53-.53.529.531-.001.002-.002.002-.006.006-.006.005-.01.01-.045.04c-.21.176-.441.327-.686.45C14.556 10.78 13.88 11 13 11a4.498 4.498 0 0 1-2.023-.454 3.544 3.544 0 0 1-.686-.45l-.045-.04-.016-.015-.006-.006-.004-.004v-.001a.75.75 0 0 1-.154-.838L12.178 4.5h-.162c-.305 0-.604-.079-.868-.231l-1.29-.736a.245.245 0 0 0-.124-.033H8.75V13h2.5a.75.75 0 0 1 0 1.5h-6.5a.75.75 0 0 1 0-1.5h2.5V3.5h-.984a.245.245 0 0 0-.124.033l-1.289.737c-.265.15-.564.23-.869.23h-.162l2.112 4.692a.75.75 0 0 1-.154.838l-.53-.53.529.531-.001.002-.002.002-.006.006-.016.015-.045.04c-.21.176-.441.327-.686.45C4.556 10.78 3.88 11 3 11a4.498 4.498 0 0 1-2.023-.454 3.544 3.544 0 0 1-.686-.45l-.045-.04-.016-.015-.006-.006-.004-.004v-.001a.75.75 0 0 1-.154-.838L2.178 4.5H1.75a.75.75 0 0 1 0-1.5h2.234a.249.249 0 0 0 .125-.033l1.288-.737c.265-.15.564-.23.869-.23h.984V.75a.75.75 0 0 1 1.5 0Zm2.945 8.477c.285.135.718.273 1.305.273s1.02-.138 1.305-.273L13 6.327Zm-10 0c.285.135.718.273 1.305.273s1.02-.138 1.305-.273L3 6.327Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M12.75 2.75V4.5h1.975c.351 0 .694.106.984.303l1.697 1.154c.041.028.09.043.14.043h4.102a.75.75 0 0 1 0 1.5H20.07l3.366 7.68a.749.749 0 0 1-.23.896c-.1.074-.203.143-.31.206a6.296 6.296 0 0 1-.79.399 7.349 7.349 0 0 1-2.856.569 7.343 7.343 0 0 1-2.855-.568 6.205 6.205 0 0 1-.79-.4 3.205 3.205 0 0 1-.307-.202l-.005-.004a.749.749 0 0 1-.23-.896l3.368-7.68h-.886c-.351 0-.694-.106-.984-.303l-1.697-1.154a.246.246 0 0 0-.14-.043H12.75v14.5h4.487a.75.75 0 0 1 0 1.5H6.763a.75.75 0 0 1 0-1.5h4.487V6H9.275a.249.249 0 0 0-.14.043L7.439 7.197c-.29.197-.633.303-.984.303h-.886l3.368 7.68a.75.75 0 0 1-.209.878c-.08.065-.16.126-.31.223a6.077 6.077 0 0 1-.792.433 6.924 6.924 0 0 1-2.876.62 6.913 6.913 0 0 1-2.876-.62 6.077 6.077 0 0 1-.792-.433 3.483 3.483 0 0 1-.309-.221.762.762 0 0 1-.21-.88L3.93 7.5H2.353a.75.75 0 0 1 0-1.5h4.102c.05 0 .099-.015.141-.043l1.695-1.154c.29-.198.634-.303.985-.303h1.974V2.75a.75.75 0 0 1 1.5 0ZM2.193 15.198a5.414 5.414 0 0 0 2.557.635 5.414 5.414 0 0 0 2.557-.635L4.75 9.368Zm14.51-.024c.082.04.174.083.275.126.53.223 1.305.45 2.272.45a5.847 5.847 0 0 0 2.547-.576L19.25 9.367Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const lightBulb: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8 1.5c-2.363 0-4 1.69-4 3.75 0 .984.424 1.625.984 2.304l.214.253c.223.264.47.556.673.848.284.411.537.896.621 1.49a.75.75 0 0 1-1.484.211c-.04-.282-.163-.547-.37-.847a8.456 8.456 0 0 0-.542-.68c-.084-.1-.173-.205-.268-.32C3.201 7.75 2.5 6.766 2.5 5.25 2.5 2.31 4.863 0 8 0s5.5 2.31 5.5 5.25c0 1.516-.701 2.5-1.328 3.259-.095.115-.184.22-.268.319-.207.245-.383.453-.541.681-.208.3-.33.565-.37.847a.751.751 0 0 1-1.485-.212c.084-.593.337-1.078.621-1.489.203-.292.45-.584.673-.848.075-.088.147-.173.213-.253.561-.679.985-1.32.985-2.304 0-2.06-1.637-3.75-4-3.75ZM5.75 12h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1 0-1.5ZM6 15.25a.75.75 0 0 1 .75-.75h2.5a.75.75 0 0 1 0 1.5h-2.5a.75.75 0 0 1-.75-.75Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M12 2.5c-3.81 0-6.5 2.743-6.5 6.119 0 1.536.632 2.572 1.425 3.56.172.215.347.422.527.635l.096.112c.21.25.427.508.63.774.404.531.783 1.128.995 1.834a.75.75 0 0 1-1.436.432c-.138-.46-.397-.89-.753-1.357a18.111 18.111 0 0 0-.582-.714l-.092-.11c-.18-.212-.37-.436-.555-.667C4.87 12.016 4 10.651 4 8.618 4 4.363 7.415 1 12 1s8 3.362 8 7.619c0 2.032-.87 3.397-1.755 4.5-.185.23-.375.454-.555.667l-.092.109c-.21.248-.405.481-.582.714-.356.467-.615.898-.753 1.357a.751.751 0 0 1-1.437-.432c.213-.706.592-1.303.997-1.834.202-.266.419-.524.63-.774l.095-.112c.18-.213.355-.42.527-.634.793-.99 1.425-2.025 1.425-3.561C18.5 5.243 15.81 2.5 12 2.5ZM8.75 18h6.5a.75.75 0 0 1 0 1.5h-6.5a.75.75 0 0 1 0-1.5Zm.75 3.75a.75.75 0 0 1 .75-.75h3.5a.75.75 0 0 1 0 1.5h-3.5a.75.75 0 0 1-.75-.75Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const link: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'm7.775 3.275 1.25-1.25a3.5 3.5 0 1 1 4.95 4.95l-2.5 2.5a3.5 3.5 0 0 1-4.95 0 .751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018 1.998 1.998 0 0 0 2.83 0l2.5-2.5a2.002 2.002 0 0 0-2.83-2.83l-1.25 1.25a.751.751 0 0 1-1.042-.018.751.751 0 0 1-.018-1.042Zm-4.69 9.64a1.998 1.998 0 0 0 2.83 0l1.25-1.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042l-1.25 1.25a3.5 3.5 0 1 1-4.95-4.95l2.5-2.5a3.5 3.5 0 0 1 4.95 0 .751.751 0 0 1-.018 1.042.751.751 0 0 1-1.042.018 1.998 1.998 0 0 0-2.83 0l-2.5 2.5a1.998 1.998 0 0 0 0 2.83Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M14.78 3.653a3.936 3.936 0 1 1 5.567 5.567l-3.627 3.627a3.936 3.936 0 0 1-5.88-.353.75.75 0 0 0-1.18.928 5.436 5.436 0 0 0 8.12.486l3.628-3.628a5.436 5.436 0 1 0-7.688-7.688l-3 3a.75.75 0 0 0 1.06 1.061l3-3Z',
+      'M7.28 11.153a3.936 3.936 0 0 1 5.88.353.75.75 0 0 0 1.18-.928 5.436 5.436 0 0 0-8.12-.486L2.592 13.72a5.436 5.436 0 1 0 7.688 7.688l3-3a.75.75 0 1 0-1.06-1.06l-3 3a3.936 3.936 0 0 1-5.567-5.568l3.627-3.627Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const linkExternal: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M3.75 2h3.5a.75.75 0 0 1 0 1.5h-3.5a.25.25 0 0 0-.25.25v8.5c0 .138.112.25.25.25h8.5a.25.25 0 0 0 .25-.25v-3.5a.75.75 0 0 1 1.5 0v3.5A1.75 1.75 0 0 1 12.25 14h-8.5A1.75 1.75 0 0 1 2 12.25v-8.5C2 2.784 2.784 2 3.75 2Zm6.854-1h4.146a.25.25 0 0 1 .25.25v4.146a.25.25 0 0 1-.427.177L13.03 4.03 9.28 7.78a.751.751 0 0 1-1.042-.018.751.751 0 0 1-.018-1.042l3.75-3.75-1.543-1.543A.25.25 0 0 1 10.604 1Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M15.5 2.25a.75.75 0 0 1 .75-.75h5.5a.75.75 0 0 1 .75.75v5.5a.75.75 0 0 1-1.5 0V4.06l-6.22 6.22a.75.75 0 1 1-1.06-1.06L19.94 3h-3.69a.75.75 0 0 1-.75-.75Z',
+      'M2.5 4.25c0-.966.784-1.75 1.75-1.75h8.5a.75.75 0 0 1 0 1.5h-8.5a.25.25 0 0 0-.25.25v15.5c0 .138.112.25.25.25h15.5a.25.25 0 0 0 .25-.25v-8.5a.75.75 0 0 1 1.5 0v8.5a1.75 1.75 0 0 1-1.75 1.75H4.25a1.75 1.75 0 0 1-1.75-1.75V4.25Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const listOrdered: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M5 3.25a.75.75 0 0 1 .75-.75h8.5a.75.75 0 0 1 0 1.5h-8.5A.75.75 0 0 1 5 3.25Zm0 5a.75.75 0 0 1 .75-.75h8.5a.75.75 0 0 1 0 1.5h-8.5A.75.75 0 0 1 5 8.25Zm0 5a.75.75 0 0 1 .75-.75h8.5a.75.75 0 0 1 0 1.5h-8.5a.75.75 0 0 1-.75-.75ZM.924 10.32a.5.5 0 0 1-.851-.525l.001-.001.001-.002.002-.004.007-.011c.097-.144.215-.273.348-.384.228-.19.588-.392 1.068-.392.468 0 .858.181 1.126.484.259.294.377.673.377 1.038 0 .987-.686 1.495-1.156 1.845l-.047.035c-.303.225-.522.4-.654.597h1.357a.5.5 0 0 1 0 1H.5a.5.5 0 0 1-.5-.5c0-1.005.692-1.52 1.167-1.875l.035-.025c.531-.396.8-.625.8-1.078a.57.57 0 0 0-.128-.376C1.806 10.068 1.695 10 1.5 10a.658.658 0 0 0-.429.163.835.835 0 0 0-.144.153ZM2.003 2.5V6h.503a.5.5 0 0 1 0 1H.5a.5.5 0 0 1 0-1h.503V3.308l-.28.14a.5.5 0 0 1-.446-.895l1.003-.5a.5.5 0 0 1 .723.447Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M3.604 3.089A.75.75 0 0 1 4 3.75V8.5h.75a.75.75 0 0 1 0 1.5h-3a.75.75 0 1 1 0-1.5h.75V5.151l-.334.223a.75.75 0 0 1-.832-1.248l1.5-1a.75.75 0 0 1 .77-.037ZM8.75 5.5a.75.75 0 0 0 0 1.5h11.5a.75.75 0 0 0 0-1.5H8.75Zm0 6a.75.75 0 0 0 0 1.5h11.5a.75.75 0 0 0 0-1.5H8.75Zm0 6a.75.75 0 0 0 0 1.5h11.5a.75.75 0 0 0 0-1.5H8.75ZM5.5 15.75c0-.704-.271-1.286-.72-1.686a2.302 2.302 0 0 0-1.53-.564c-.535 0-1.094.178-1.53.565-.449.399-.72.982-.72 1.685a.75.75 0 0 0 1.5 0c0-.296.104-.464.217-.564A.805.805 0 0 1 3.25 15c.215 0 .406.072.533.185.113.101.217.268.217.565 0 .332-.069.48-.21.657-.092.113-.216.24-.403.419l-.147.14c-.152.144-.33.313-.52.504l-1.5 1.5a.75.75 0 0 0-.22.53v.25c0 .414.336.75.75.75H5A.75.75 0 0 0 5 19H3.31l.47-.47c.176-.176.333-.324.48-.465l.165-.156a5.98 5.98 0 0 0 .536-.566c.358-.447.539-.925.539-1.593Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const listUnordered: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M5.75 2.5h8.5a.75.75 0 0 1 0 1.5h-8.5a.75.75 0 0 1 0-1.5Zm0 5h8.5a.75.75 0 0 1 0 1.5h-8.5a.75.75 0 0 1 0-1.5Zm0 5h8.5a.75.75 0 0 1 0 1.5h-8.5a.75.75 0 0 1 0-1.5ZM2 14a1 1 0 1 1 0-2 1 1 0 0 1 0 2Zm1-6a1 1 0 1 1-2 0 1 1 0 0 1 2 0ZM2 4a1 1 0 1 1 0-2 1 1 0 0 1 0 2Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M8.75 5.5h11.5a.75.75 0 0 1 0 1.5H8.75a.75.75 0 0 1 0-1.5Zm0 6h11.5a.75.75 0 0 1 0 1.5H8.75a.75.75 0 0 1 0-1.5Zm0 6h11.5a.75.75 0 0 1 0 1.5H8.75a.75.75 0 0 1 0-1.5ZM5 12a1 1 0 1 1-2 0 1 1 0 0 1 2 0ZM4 7a1 1 0 1 1 0-2 1 1 0 0 1 0 2Zm0 12a1 1 0 1 1 0-2 1 1 0 0 1 0 2Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const location: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'm12.596 11.596-3.535 3.536a1.5 1.5 0 0 1-2.122 0l-3.535-3.536a6.5 6.5 0 1 1 9.192-9.193 6.5 6.5 0 0 1 0 9.193Zm-1.06-8.132v-.001a5 5 0 1 0-7.072 7.072L8 14.07l3.536-3.534a5 5 0 0 0 0-7.072ZM8 9a2 2 0 1 1-.001-3.999A2 2 0 0 1 8 9Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M12 13.5a2.5 2.5 0 1 0 0-5 2.5 2.5 0 0 0 0 5Z',
+      'M19.071 3.429h.001c3.905 3.905 3.905 10.237 0 14.142l-5.403 5.403a2.36 2.36 0 0 1-3.336 0l-5.375-5.375-.028-.028c-3.905-3.905-3.905-10.237 0-14.142 3.904-3.905 10.236-3.905 14.141 0ZM5.99 4.489v.001a8.5 8.5 0 0 0 0 12.02l.023.024.002.002 5.378 5.378a.859.859 0 0 0 1.214 0l5.403-5.404a8.5 8.5 0 0 0-.043-11.977A8.5 8.5 0 0 0 5.99 4.489Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const lock: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M4 4a4 4 0 0 1 8 0v2h.25c.966 0 1.75.784 1.75 1.75v5.5A1.75 1.75 0 0 1 12.25 15h-8.5A1.75 1.75 0 0 1 2 13.25v-5.5C2 6.784 2.784 6 3.75 6H4Zm8.25 3.5h-8.5a.25.25 0 0 0-.25.25v5.5c0 .138.112.25.25.25h8.5a.25.25 0 0 0 .25-.25v-5.5a.25.25 0 0 0-.25-.25ZM10.5 6V4a2.5 2.5 0 1 0-5 0v2Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M6 9V7.25C6 3.845 8.503 1 12 1s6 2.845 6 6.25V9h.5a2.5 2.5 0 0 1 2.5 2.5v8a2.5 2.5 0 0 1-2.5 2.5h-13A2.5 2.5 0 0 1 3 19.5v-8A2.5 2.5 0 0 1 5.5 9Zm-1.5 2.5v8a1 1 0 0 0 1 1h13a1 1 0 0 0 1-1v-8a1 1 0 0 0-1-1h-13a1 1 0 0 0-1 1Zm3-4.25V9h9V7.25c0-2.67-1.922-4.75-4.5-4.75-2.578 0-4.5 2.08-4.5 4.75Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const log: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M5 8.25a.75.75 0 0 1 .75-.75h4a.75.75 0 0 1 0 1.5h-4A.75.75 0 0 1 5 8.25ZM4 10.5A.75.75 0 0 0 4 12h4a.75.75 0 0 0 0-1.5H4Z',
+      'M13-.005c1.654 0 3 1.328 3 3 0 .982-.338 1.933-.783 2.818-.443.879-1.028 1.758-1.582 2.588l-.011.017c-.568.853-1.104 1.659-1.501 2.446-.398.789-.623 1.494-.623 2.136a1.5 1.5 0 1 0 2.333-1.248.75.75 0 0 1 .834-1.246A3 3 0 0 1 13 16H3a3 3 0 0 1-3-3c0-1.582.891-3.135 1.777-4.506.209-.322.418-.637.623-.946.473-.709.923-1.386 1.287-2.048H2.51c-.576 0-1.381-.133-1.907-.783A2.68 2.68 0 0 1 0 2.995a3 3 0 0 1 3-3Zm0 1.5a1.5 1.5 0 0 0-1.5 1.5c0 .476.223.834.667 1.132A.75.75 0 0 1 11.75 5.5H5.368c-.467 1.003-1.141 2.015-1.773 2.963-.192.289-.381.571-.558.845C2.13 10.711 1.5 11.916 1.5 13A1.5 1.5 0 0 0 3 14.5h7.401A2.989 2.989 0 0 1 10 13c0-.979.338-1.928.784-2.812.441-.874 1.023-1.748 1.575-2.576l.017-.026c.568-.853 1.103-1.658 1.501-2.448.398-.79.623-1.497.623-2.143 0-.838-.669-1.5-1.5-1.5Zm-10 0a1.5 1.5 0 0 0-1.5 1.5c0 .321.1.569.27.778.097.12.325.227.74.227h7.674A2.737 2.737 0 0 1 10 2.995c0-.546.146-1.059.401-1.5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M9.197 10a.75.75 0 0 0 0 1.5h6.5a.75.75 0 0 0 0-1.5h-6.5Zm-2.382 4a.75.75 0 0 0 0 1.5h6.5a.75.75 0 0 0 0-1.5h-6.5Zm-1.581 4a.75.75 0 0 0 0 1.5h6.5a.75.75 0 0 0 0-1.5h-6.5Z',
+      'M4.125 0h15.75a4.11 4.11 0 0 1 2.92 1.205A4.11 4.11 0 0 1 24 4.125c0 1.384-.476 2.794-1.128 4.16-.652 1.365-1.515 2.757-2.352 4.104l-.008.013c-.849 1.368-1.669 2.691-2.28 3.97-.614 1.283-.982 2.45-.982 3.503a2.625 2.625 0 1 0 4.083-2.183.75.75 0 1 1 .834-1.247A4.126 4.126 0 0 1 19.875 24H4.5a4.125 4.125 0 0 1-4.125-4.125c0-2.234 1.258-4.656 2.59-6.902.348-.586.702-1.162 1.05-1.728.8-1.304 1.567-2.553 2.144-3.738H3.39c-.823 0-1.886-.193-2.567-1.035A3.647 3.647 0 0 1 0 4.125 4.125 4.125 0 0 1 4.125 0ZM15.75 19.875c0-1.38.476-2.786 1.128-4.15.649-1.358 1.509-2.743 2.343-4.086l.017-.028c.849-1.367 1.669-2.692 2.28-3.972.614-1.285.982-2.457.982-3.514A2.615 2.615 0 0 0 19.875 1.5a2.625 2.625 0 0 0-2.625 2.625c0 .865.421 1.509 1.167 2.009A.75.75 0 0 1 18 7.507H7.812c-.65 1.483-1.624 3.069-2.577 4.619-.334.544-.666 1.083-.98 1.612-1.355 2.287-2.38 4.371-2.38 6.137A2.625 2.625 0 0 0 4.5 22.5h12.193a4.108 4.108 0 0 1-.943-2.625ZM1.5 4.125c-.01.511.163 1.008.487 1.403.254.313.74.479 1.402.479h12.86a3.648 3.648 0 0 1-.499-1.882 4.11 4.11 0 0 1 .943-2.625H4.125A2.625 2.625 0 0 0 1.5 4.125Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const logoGist: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M4.7 8.73v-1h3.52v5.69c-.78.37-1.95.64-3.59.64C1.11 14.06 0 11.37 0 8.03 0 4.69 1.13 2 4.63 2c1.62 0 2.64.33 3.28.66v1.05c-1.22-.5-2-.73-3.28-.73-2.57 0-3.48 2.21-3.48 5.06 0 2.85.91 5.05 3.47 5.05.89 0 1.98-.07 2.53-.34V8.73Zm10.98.69h.03c2.22.2 2.75.95 2.75 2.23 0 1.21-.76 2.41-3.14 2.41-.75 0-1.83-.19-2.33-.39v-.94c.47.17 1.22.36 2.33.36 1.62 0 2.06-.69 2.06-1.42 0-.71-.22-1.21-1.77-1.34-2.26-.2-2.73-1-2.73-2.08 0-1.11.72-2.31 2.92-2.31.73 0 1.56.09 2.25.39v.94c-.61-.2-1.22-.36-2.27-.36-1.55 0-1.88.57-1.88 1.34 0 .69.28 1.04 1.78 1.17Zm8.58-3.33v.85h-2.42v4.87c0 .95.53 1.34 1.5 1.34.2 0 .42 0 .61-.03v.89c-.17.03-.5.05-.69.05-1.31 0-2.5-.6-2.5-2.13v-5H19.2v-.48l1.56-.44V3.9l1.08-.31v2.5h2.42Zm-13.17-.03v6.41c0 .54.19.7.67.7v.89c-1.14 0-1.72-.47-1.72-1.72V6.06h1.05Zm.25-2.33c0 .44-.34.78-.78.78a.76.76 0 0 1-.77-.78c0-.44.32-.78.77-.78s.78.34.78.78Z',
+    ],
+    h: 16,
+    w: 25,
+  },
+}
+export const logoGithub: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8.81 7.35v5.74c0 .04-.01.11-.06.13 0 0-1.25.89-3.31.89-2.49 0-5.44-.78-5.44-5.92S2.58 1.99 5.1 2c2.18 0 3.06.49 3.2.58.04.05.06.09.06.14L7.94 4.5c0 .09-.09.2-.2.17-.36-.11-.9-.33-2.17-.33-1.47 0-3.05.42-3.05 3.73s1.5 3.7 2.58 3.7c.92 0 1.25-.11 1.25-.11v-2.3H4.88c-.11 0-.19-.08-.19-.17V7.35c0-.09.08-.17.19-.17h3.74c.11 0 .19.08.19.17Zm35.85 2.33c0 3.43-1.11 4.41-3.05 4.41-1.64 0-2.52-.83-2.52-.83s-.04.46-.09.52c-.03.06-.08.08-.14.08h-1.48c-.1 0-.19-.08-.19-.17l.02-11.11c0-.09.08-.17.17-.17h2.13c.09 0 .17.08.17.17v3.77s.82-.53 2.02-.53l-.01-.02c1.2 0 2.97.45 2.97 3.88ZM27.68 2.43c.09 0 .17.08.17.17v11.11c0 .09-.08.17-.17.17h-2.13c-.09 0-.17-.08-.17-.17l.02-4.75h-3.31v4.75c0 .09-.08.17-.17.17h-2.13c-.08 0-.17-.08-.17-.17V2.6c0-.09.08-.17.17-.17h2.13c.09 0 .17.08.17.17v4.09h3.31V2.6c0-.09.08-.17.17-.17Zm8.26 3.64c.11 0 .19.08.19.17l-.02 7.47c0 .09-.06.17-.17.17H34.6c-.07 0-.14-.04-.16-.09-.03-.06-.08-.45-.08-.45s-1.13.77-2.52.77c-1.69 0-2.92-.55-2.92-2.75V6.25c0-.09.08-.17.17-.17h2.14c.09 0 .17.08.17.17V11c0 .75.22 1.09.97 1.09s1.3-.39 1.3-.39V6.26c0-.11.06-.19.17-.19Zm-17.406 5.971h.005a.177.177 0 0 1 .141.179v1.5c0 .07-.03.14-.09.16-.1.05-.74.22-1.27.22-1.16 0-2.86-.25-2.86-2.69V8.13h-1.11c-.09 0-.17-.08-.17-.19V6.58c0-.08.05-.15.13-.17.07-.01 1.16-.28 1.16-.28V3.96c0-.08.05-.13.14-.13h2.16c.09 0 .14.05.14.13v2.11h1.59c.08 0 .16.08.16.17v1.7c0 .11-.07.19-.16.19h-1.59v3.131c0 .47.27.83 1.05.83.247 0 .481-.049.574-.05ZM12.24 6.06c.09 0 .17.08.17.17v7.37c0 .18-.05.27-.25.27h-1.92c-.17 0-.3-.07-.3-.27V6.26c0-.11.08-.2.17-.2Zm29.99 3.78c0-1.81-.73-2.05-1.5-1.97-.6.04-1.08.34-1.08.34v3.52s.49.34 1.22.36c1.03.03 1.36-.34 1.36-2.25ZM11.19 2.68c.75 0 1.36.61 1.36 1.38 0 .77-.61 1.38-1.36 1.38-.77 0-1.38-.61-1.38-1.38 0-.77.61-1.38 1.38-1.38Zm7.34 9.35v.001l.01.01h-.001l-.005-.001v.001c-.009-.001-.015-.011-.024-.011Z',
+    ],
+    h: 16,
+    w: 45,
+  },
+}
+export const mail: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M1.75 2h12.5c.966 0 1.75.784 1.75 1.75v8.5A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25v-8.5C0 2.784.784 2 1.75 2ZM1.5 12.251c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25V5.809L8.38 9.397a.75.75 0 0 1-.76 0L1.5 5.809v6.442Zm13-8.181v-.32a.25.25 0 0 0-.25-.25H1.75a.25.25 0 0 0-.25.25v.32L8 7.88Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M1.75 3h20.5c.966 0 1.75.784 1.75 1.75v14a1.75 1.75 0 0 1-1.75 1.75H1.75A1.75 1.75 0 0 1 0 18.75v-14C0 3.784.784 3 1.75 3ZM1.5 7.412V18.75c0 .138.112.25.25.25h20.5a.25.25 0 0 0 .25-.25V7.412l-9.52 6.433c-.592.4-1.368.4-1.96 0Zm0-2.662v.852l10.36 7a.25.25 0 0 0 .28 0l10.36-7V4.75a.25.25 0 0 0-.25-.25H1.75a.25.25 0 0 0-.25.25Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const markGithub: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const markdown: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M14.85 3c.63 0 1.15.52 1.14 1.15v7.7c0 .63-.51 1.15-1.15 1.15H1.15C.52 13 0 12.48 0 11.84V4.15C0 3.52.52 3 1.15 3ZM9 11V5H7L5.5 7 4 5H2v6h2V8l1.5 1.92L7 8v3Zm2.99.5L14.5 8H13V5h-2v3H9.5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const megaphone: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M3.25 9a.75.75 0 0 1 .75.75c0 2.142.456 3.828.733 4.653a.122.122 0 0 0 .05.064.212.212 0 0 0 .117.033h1.31c.085 0 .18-.042.258-.152a.45.45 0 0 0 .075-.366A16.743 16.743 0 0 1 6 9.75a.75.75 0 0 1 1.5 0c0 1.588.25 2.926.494 3.85.293 1.113-.504 2.4-1.783 2.4H4.9c-.686 0-1.35-.41-1.589-1.12A16.4 16.4 0 0 1 2.5 9.75.75.75 0 0 1 3.25 9Z',
+      'M0 6a4 4 0 0 1 4-4h2.75a.75.75 0 0 1 .75.75v6.5a.75.75 0 0 1-.75.75H4a4 4 0 0 1-4-4Zm4-2.5a2.5 2.5 0 1 0 0 5h2v-5Z',
+      'M15.59.082A.75.75 0 0 1 16 .75v10.5a.75.75 0 0 1-1.189.608l-.002-.001h.001l-.014-.01a5.775 5.775 0 0 0-.422-.25 10.63 10.63 0 0 0-1.469-.64C11.576 10.484 9.536 10 6.75 10a.75.75 0 0 1 0-1.5c2.964 0 5.174.516 6.658 1.043.423.151.787.302 1.092.443V2.014c-.305.14-.669.292-1.092.443C11.924 2.984 9.713 3.5 6.75 3.5a.75.75 0 0 1 0-1.5c2.786 0 4.826-.484 6.155-.957.665-.236 1.154-.47 1.47-.64.144-.077.284-.161.421-.25l.014-.01a.75.75 0 0 1 .78-.061Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M22 1.75v14.5a.75.75 0 0 1-.399.662c-.384.204-.783-.035-1.139-.248l-.003-.002c-.09-.054-.177-.107-.261-.15a15.53 15.53 0 0 0-2-.849c-1.738-.607-4.321-1.223-7.703-1.251a.833.833 0 0 1 .005.088c0 2.279.494 4.279.906 5.547.368 1.131-.438 2.453-1.732 2.453H7.661c-.696 0-1.36-.42-1.6-1.129C5.684 20.255 5 17.811 5 14.75v-.457A5.5 5.5 0 0 1 6.5 3.5h3.75c3.505 0 6.175-.61 7.955-1.21a15.88 15.88 0 0 0 2.002-.82 9.21 9.21 0 0 0 .49-.262c.048-.028.095-.055.142-.085A.751.751 0 0 1 22 1.75ZM10.5 12.912c3.564.029 6.313.678 8.193 1.335.737.258 1.34.517 1.807.74V2.993c-.467.216-1.073.467-1.815.718-1.878.634-4.624 1.26-8.185 1.288ZM6.5 5a4 4 0 0 0 0 8H9V5Zm0 9.75c0 2.847.638 5.123.982 6.141.018.051.074.109.179.109h2.013c.087 0 .179-.043.249-.147a.396.396 0 0 0 .057-.343C9.537 19.148 9 16.986 9 14.5H6.5Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const mention: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M4.75 2.37a6.501 6.501 0 0 0 6.5 11.26.75.75 0 0 1 .75 1.298A7.999 7.999 0 0 1 .989 4.148 8 8 0 0 1 16 7.75v1.5a2.75 2.75 0 0 1-5.072 1.475 3.999 3.999 0 0 1-6.65-4.19A4 4 0 0 1 12 8v1.25a1.25 1.25 0 0 0 2.5 0V7.867a6.5 6.5 0 0 0-9.75-5.496ZM10.5 8a2.5 2.5 0 1 0-5 0 2.5 2.5 0 0 0 5 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M20.226 7.25c-2.623-4.542-8.432-6.098-12.974-3.475-4.543 2.622-6.099 8.431-3.477 12.974 2.623 4.542 8.431 6.099 12.974 3.477a.75.75 0 0 1 .75 1.299c-5.26 3.037-11.987 1.235-15.024-4.026C-.562 12.24 1.24 5.512 6.501 2.475 11.76-.562 18.488 1.24 21.525 6.501a10.959 10.959 0 0 1 1.455 4.826c.013.056.02.113.02.173v2.25a3.5 3.5 0 0 1-6.623 1.581 5.5 5.5 0 1 1 1.112-3.682.802.802 0 0 1 .011.129v1.972a2 2 0 1 0 4 0v-1.766a9.456 9.456 0 0 0-1.274-4.733ZM16 12a4 4 0 1 0-8 0 4 4 0 0 0 8 0Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const meter: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8 1.5a6.5 6.5 0 1 0 6.016 4.035.75.75 0 0 1 1.388-.57 8 8 0 1 1-4.37-4.37.75.75 0 1 1-.569 1.389A6.473 6.473 0 0 0 8 1.5Zm6.28.22a.75.75 0 0 1 0 1.06l-4.063 4.064a2.5 2.5 0 1 1-1.06-1.06L13.22 1.72a.75.75 0 0 1 1.06 0ZM7 8a1 1 0 1 0 2 0 1 1 0 0 0-2 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const milestone: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M7.75 0a.75.75 0 0 1 .75.75V3h3.634c.414 0 .814.147 1.13.414l2.07 1.75a1.75 1.75 0 0 1 0 2.672l-2.07 1.75a1.75 1.75 0 0 1-1.13.414H8.5v5.25a.75.75 0 0 1-1.5 0V10H2.75A1.75 1.75 0 0 1 1 8.25v-3.5C1 3.784 1.784 3 2.75 3H7V.75A.75.75 0 0 1 7.75 0Zm4.384 8.5a.25.25 0 0 0 .161-.06l2.07-1.75a.248.248 0 0 0 0-.38l-2.07-1.75a.25.25 0 0 0-.161-.06H2.75a.25.25 0 0 0-.25.25v3.5c0 .138.112.25.25.25h9.384Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M11.75 1a.75.75 0 0 1 .75.75V4h6.532c.42 0 .826.15 1.143.425l3.187 2.75a1.75 1.75 0 0 1 0 2.65l-3.187 2.75a1.75 1.75 0 0 1-1.143.425H12.5v9.25a.75.75 0 0 1-1.5 0V13H3.75A1.75 1.75 0 0 1 2 11.25v-5.5C2 4.783 2.784 4 3.75 4H11V1.75a.75.75 0 0 1 .75-.75Zm7.282 4.5H3.75a.25.25 0 0 0-.25.25v5.5c0 .138.112.25.25.25h15.282c.06 0 .118-.021.163-.06l3.188-2.75a.248.248 0 0 0 0-.38l-3.188-2.75a.249.249 0 0 0-.163-.06Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const mirror: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M15.547 3.061A.75.75 0 0 1 16 3.75v8.5a.751.751 0 0 1-1.265.545l-4.5-4.25a.75.75 0 0 1 0-1.09l4.5-4.25a.75.75 0 0 1 .812-.144ZM0 12.25v-8.5a.751.751 0 0 1 1.265-.545l4.5 4.25a.75.75 0 0 1 0 1.09l-4.5 4.25A.75.75 0 0 1 0 12.25Zm1.5-6.76v5.02L4.158 8ZM11.842 8l2.658 2.51V5.49ZM8 4a.75.75 0 0 1 .75.75v.5a.75.75 0 0 1-1.5 0v-.5A.75.75 0 0 1 8 4Zm.75-2.25v.5a.75.75 0 0 1-1.5 0v-.5a.75.75 0 0 1 1.5 0Zm0 6v.5a.75.75 0 0 1-1.5 0v-.5a.75.75 0 0 1 1.5 0ZM8 10a.75.75 0 0 1 .75.75v.5a.75.75 0 0 1-1.5 0v-.5A.75.75 0 0 1 8 10Zm0 3a.75.75 0 0 1 .75.75v.5a.75.75 0 0 1-1.5 0v-.5A.75.75 0 0 1 8 13Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M21.553 6.064A.75.75 0 0 1 22 6.75v10.5a.75.75 0 0 1-1.256.554l-5.75-5.25a.748.748 0 0 1 0-1.108l5.75-5.25a.75.75 0 0 1 .809-.132ZM2.447 17.936A.75.75 0 0 1 2 17.25V6.75a.75.75 0 0 1 1.256-.554l5.75 5.25a.748.748 0 0 1 0 1.108l-5.75 5.25a.75.75 0 0 1-.809.132ZM7.387 12 3.5 8.45v7.1L7.388 12Zm9.226 0 3.887 3.55v-7.1L16.612 12ZM12 2.75a.75.75 0 0 1 .75.75v1a.75.75 0 0 1-1.5 0v-1a.75.75 0 0 1 .75-.75Zm0 4a.75.75 0 0 1 .75.75v1a.75.75 0 0 1-1.5 0v-1a.75.75 0 0 1 .75-.75Zm0 8a.75.75 0 0 1 .75.75v1a.75.75 0 0 1-1.5 0v-1a.75.75 0 0 1 .75-.75Zm0 4a.75.75 0 0 1 .75.75v1a.75.75 0 0 1-1.5 0v-1a.75.75 0 0 1 .75-.75Zm0-8a.75.75 0 0 1 .75.75v1a.75.75 0 0 1-1.5 0v-1a.75.75 0 0 1 .75-.75Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const moon: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M9.598 1.591a.749.749 0 0 1 .785-.175 7.001 7.001 0 1 1-8.967 8.967.75.75 0 0 1 .961-.96 5.5 5.5 0 0 0 7.046-7.046.75.75 0 0 1 .175-.786Zm1.616 1.945a7 7 0 0 1-7.678 7.678 5.499 5.499 0 1 0 7.678-7.678Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M14.768 3.96v.001l-.002-.005a9.08 9.08 0 0 0-.218-.779c-.13-.394.21-.8.602-.67.29.096.575.205.855.328l.01.005A10.002 10.002 0 0 1 12 22a10.002 10.002 0 0 1-9.162-5.985l-.004-.01a9.722 9.722 0 0 1-.329-.855c-.13-.392.277-.732.67-.602.257.084.517.157.78.218l.004.002A9 9 0 0 0 14.999 6a9.09 9.09 0 0 0-.231-2.04ZM16.5 6c0 5.799-4.701 10.5-10.5 10.5-.426 0-.847-.026-1.26-.075A8.5 8.5 0 1 0 16.425 4.74c.05.413.075.833.075 1.259Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const mortarBoard: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M7.693 1.066a.747.747 0 0 1 .614 0l7.25 3.25a.75.75 0 0 1 0 1.368L13 6.831v2.794c0 1.024-.81 1.749-1.66 2.173-.893.447-2.075.702-3.34.702-.278 0-.55-.012-.816-.036a.75.75 0 0 1 .133-1.494c.22.02.45.03.683.03 1.082 0 2.025-.221 2.67-.543.69-.345.83-.682.83-.832V7.503L8.307 8.934a.747.747 0 0 1-.614 0L4 7.28v1.663c.296.105.575.275.812.512.438.438.688 1.059.688 1.796v3a.75.75 0 0 1-.75.75h-3a.75.75 0 0 1-.75-.75v-3c0-.737.25-1.358.688-1.796.237-.237.516-.407.812-.512V6.606L.443 5.684a.75.75 0 0 1 0-1.368ZM2.583 5 8 7.428 13.416 5 8 2.572ZM2.5 11.25v2.25H4v-2.25c0-.388-.125-.611-.25-.735a.697.697 0 0 0-.5-.203.707.707 0 0 0-.5.203c-.125.124-.25.347-.25.735Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M12.292 2.06v-.001l11.25 4.75a.749.749 0 0 1 0 1.382L19 10.108V15a.75.75 0 0 1-.11.391h-.001a2.84 2.84 0 0 1-.392.482c-.249.256-.625.58-1.163.896-1.08.638-2.776 1.23-5.334 1.23-.673 0-1.286-.041-1.846-.113a.75.75 0 0 1 .192-1.487c.492.063 1.042.1 1.654.1 2.317 0 3.746-.533 4.572-1.021.31-.178.596-.397.849-.65l.079-.085V10.74l-5.208 2.2a.75.75 0 0 1-.584 0L5.75 10.424v3.17c.502.129.96.391 1.327.758.579.578.923 1.41.923 2.428v4.5a.761.761 0 0 1-.345.634 2.157 2.157 0 0 1-.21.117 3.923 3.923 0 0 1-.52.213A6.121 6.121 0 0 1 5 22.532a6.092 6.092 0 0 1-1.925-.288 4.065 4.065 0 0 1-.52-.213 1.816 1.816 0 0 1-.22-.124.757.757 0 0 1-.335-.624v-4.5c0-1.02.344-1.85.923-2.43a2.904 2.904 0 0 1 1.327-.757V9.793L.458 8.19a.75.75 0 0 1 0-1.38l11.25-4.75a.75.75 0 0 1 .584 0ZM12 11.436 21.322 7.5 12 3.564 2.678 7.5ZM5 15c-.377 0-.745.141-1.017.413-.265.265-.483.7-.483 1.368v4.022c.299.105.797.228 1.5.228s1.201-.123 1.5-.228V16.78c0-.669-.218-1.103-.483-1.368A1.433 1.433 0 0 0 5 15Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const moveToBottom: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M7.47 10.78a.749.749 0 0 0 1.06 0l3.75-3.75a.749.749 0 1 0-1.06-1.06L8.75 8.439V1.75a.75.75 0 0 0-1.5 0v6.689L4.78 5.97a.749.749 0 1 0-1.06 1.06l3.75 3.75ZM3.75 13a.75.75 0 0 0 0 1.5h8.5a.75.75 0 0 0 0-1.5h-8.5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M4 21.25a.75.75 0 0 1 .75-.75h14.5a.75.75 0 0 1 0 1.5H4.75a.75.75 0 0 1-.75-.75ZM5.22 9.97a.749.749 0 0 1 1.06 0l4.97 4.969V2.75a.75.75 0 0 1 1.5 0v12.189l4.97-4.969a.749.749 0 1 1 1.06 1.06l-6.25 6.25a.749.749 0 0 1-1.06 0l-6.25-6.25a.749.749 0 0 1 0-1.06Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const moveToEnd: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'm10.78 8.53-3.75 3.75a.749.749 0 1 1-1.06-1.06l2.469-2.47H1.75a.75.75 0 0 1 0-1.5h6.689L5.97 4.78a.749.749 0 1 1 1.06-1.06l3.75 3.75a.749.749 0 0 1 0 1.06ZM13 12.25v-8.5a.75.75 0 0 1 1.5 0v8.5a.75.75 0 0 1-1.5 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M11.22 5.22a.749.749 0 0 1 1.06 0l6.25 6.25a.749.749 0 0 1 0 1.06l-6.25 6.25a.749.749 0 1 1-1.06-1.06l4.969-4.97H1.75a.75.75 0 0 1 0-1.5h14.439L11.22 6.28a.749.749 0 0 1 0-1.06Zm10.03-1.47a.75.75 0 0 1 .75.75v15a.75.75 0 0 1-1.5 0v-15a.75.75 0 0 1 .75-.75Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const moveToStart: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M5.22 7.47a.749.749 0 0 0 0 1.06l3.75 3.75a.749.749 0 1 0 1.06-1.06L7.561 8.75h6.689a.75.75 0 0 0 0-1.5H7.561l2.469-2.47a.749.749 0 1 0-1.06-1.06L5.22 7.47ZM3 3.75a.75.75 0 0 0-1.5 0v8.5a.75.75 0 0 0 1.5 0v-8.5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M12.78 18.78a.749.749 0 0 1-1.06 0l-6.25-6.25a.749.749 0 0 1 0-1.06l6.25-6.25a.749.749 0 1 1 1.06 1.06l-4.969 4.97H22.25a.75.75 0 0 1 0 1.5H7.811l4.969 4.97a.749.749 0 0 1 0 1.06ZM2.75 3.75a.75.75 0 0 1 .75.75v15a.75.75 0 0 1-1.5 0v-15a.75.75 0 0 1 .75-.75Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const moveToTop: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M3 2.25a.75.75 0 0 1 .75-.75h8.5a.75.75 0 0 1 0 1.5h-8.5A.75.75 0 0 1 3 2.25Zm5.53 2.97 3.75 3.75a.749.749 0 1 1-1.06 1.06L8.75 7.561v6.689a.75.75 0 0 1-1.5 0V7.561L4.78 10.03a.749.749 0 1 1-1.06-1.06l3.75-3.75a.749.749 0 0 1 1.06 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M4.75 3.5a.75.75 0 0 1 0-1.5h14.5a.75.75 0 0 1 0 1.5H4.75Zm.47 9.47a.749.749 0 1 0 1.06 1.06l4.97-4.969V21.25a.75.75 0 0 0 1.5 0V9.061l4.97 4.969a.749.749 0 1 0 1.06-1.06l-6.25-6.25a.749.749 0 0 0-1.06 0l-6.25 6.25Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const multiSelect: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M5.75 7.5h7.5a.75.75 0 0 1 0 1.5h-7.5a.75.75 0 0 1 0-1.5Zm0 5h7.5a.75.75 0 0 1 0 1.5h-7.5a.75.75 0 0 1 0-1.5Zm-4-10h6.5a.75.75 0 0 1 0 1.5h-6.5a.75.75 0 0 1 0-1.5ZM2 14a1 1 0 1 1 0-2 1 1 0 0 1 0 2Zm1-6a1 1 0 1 1-2 0 1 1 0 0 1 2 0Zm10.314-3.082L11.07 2.417A.25.25 0 0 1 11.256 2h4.488a.25.25 0 0 1 .186.417l-2.244 2.5a.25.25 0 0 1-.372 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M8.75 11.5h11.5a.75.75 0 0 1 0 1.5H8.75a.75.75 0 0 1 0-1.5Zm0 6h11.5a.75.75 0 0 1 0 1.5H8.75a.75.75 0 0 1 0-1.5Zm-5-12h10a.75.75 0 0 1 0 1.5h-10a.75.75 0 0 1 0-1.5ZM5 12a1 1 0 1 1-2 0 1 1 0 0 1 2 0Zm-1 7a1 1 0 1 1 0-2 1 1 0 0 1 0 2ZM19.309 7.918l-2.245-2.501A.25.25 0 0 1 17.25 5h4.49a.25.25 0 0 1 .185.417l-2.244 2.5a.25.25 0 0 1-.372 0Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const mute: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8 2.75v10.5a.751.751 0 0 1-1.238.57L3.473 11H1.75A1.75 1.75 0 0 1 0 9.25v-2.5C0 5.784.784 5 1.75 5h1.722l3.29-2.82A.75.75 0 0 1 8 2.75Zm3.28 2.47L13 6.94l1.72-1.72a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L14.06 8l1.72 1.72a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215L13 9.06l-1.72 1.72a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734L11.94 8l-1.72-1.72a.749.749 0 0 1 .326-1.275.749.749 0 0 1 .734.215Zm-7.042 1.1a.752.752 0 0 1-.488.18h-2a.25.25 0 0 0-.25.25v2.5c0 .138.112.25.25.25h2c.179 0 .352.064.488.18L6.5 11.62V4.38Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M12 3.75v16.5a.75.75 0 0 1-1.255.555L5.46 16H2.75A1.75 1.75 0 0 1 1 14.25v-4.5C1 8.784 1.784 8 2.75 8h2.71l5.285-4.805A.75.75 0 0 1 12 3.75ZM6.255 9.305a.748.748 0 0 1-.505.195h-3a.25.25 0 0 0-.25.25v4.5c0 .138.112.25.25.25h3c.187 0 .367.069.505.195l4.245 3.86V5.445ZM16.28 8.22a.75.75 0 1 0-1.06 1.06L17.94 12l-2.72 2.72a.75.75 0 1 0 1.06 1.06L19 13.06l2.72 2.72a.75.75 0 1 0 1.06-1.06L20.06 12l2.72-2.72a.75.75 0 0 0-1.06-1.06L19 10.94l-2.72-2.72Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const noEntry: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M4.25 7.25a.75.75 0 0 0 0 1.5h7.5a.75.75 0 0 0 0-1.5h-7.5Z',
+      'M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0Zm-1.5 0a6.5 6.5 0 1 0-13 0 6.5 6.5 0 0 0 13 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M12 1c6.075 0 11 4.925 11 11s-4.925 11-11 11S1 18.075 1 12 5.925 1 12 1ZM2.5 12a9.5 9.5 0 0 0 9.5 9.5 9.5 9.5 0 0 0 9.5-9.5A9.5 9.5 0 0 0 12 2.5 9.5 9.5 0 0 0 2.5 12Zm15.75.75H5.75a.75.75 0 0 1 0-1.5h12.5a.75.75 0 0 1 0 1.5Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const noEntryFill: OcticonSymbolVariants = {
+  '12': { p: ['M6 0a6 6 0 1 1 0 12A6 6 0 0 1 6 0Zm3 5H3v2h6Z'], h: 12, w: 12 },
+}
+export const northStar: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8.5.75a.75.75 0 0 0-1.5 0v5.19L4.391 3.33a.75.75 0 1 0-1.06 1.061L5.939 7H.75a.75.75 0 0 0 0 1.5h5.19l-2.61 2.609a.75.75 0 1 0 1.061 1.06L7 9.561v5.189a.75.75 0 0 0 1.5 0V9.56l2.609 2.61a.75.75 0 1 0 1.06-1.061L9.561 8.5h5.189a.75.75 0 0 0 0-1.5H9.56l2.61-2.609a.75.75 0 0 0-1.061-1.06L8.5 5.939V.75Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M12.5 1.25a.75.75 0 0 0-1.5 0v8.69L6.447 5.385a.75.75 0 1 0-1.061 1.06L9.94 11H1.25a.75.75 0 0 0 0 1.5h8.69l-4.554 4.553a.75.75 0 0 0 1.06 1.061L11 13.561v8.689a.75.75 0 0 0 1.5 0v-8.69l4.553 4.554a.75.75 0 0 0 1.061-1.06L13.561 12.5h8.689a.75.75 0 0 0 0-1.5h-8.69l4.554-4.553a.75.75 0 1 0-1.06-1.061L12.5 9.939V1.25Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const note: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M0 3.75C0 2.784.784 2 1.75 2h12.5c.966 0 1.75.784 1.75 1.75v8.5A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25Zm1.75-.25a.25.25 0 0 0-.25.25v8.5c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25v-8.5a.25.25 0 0 0-.25-.25ZM3.5 6.25a.75.75 0 0 1 .75-.75h7a.75.75 0 0 1 0 1.5h-7a.75.75 0 0 1-.75-.75Zm.75 2.25h4a.75.75 0 0 1 0 1.5h-4a.75.75 0 0 1 0-1.5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M0 4.75C0 3.784.784 3 1.75 3h20.5c.966 0 1.75.784 1.75 1.75v14.5A1.75 1.75 0 0 1 22.25 21H1.75A1.75 1.75 0 0 1 0 19.25Zm1.75-.25a.25.25 0 0 0-.25.25v14.5c0 .138.112.25.25.25h20.5a.25.25 0 0 0 .25-.25V4.75a.25.25 0 0 0-.25-.25Z',
+      'M5 8.75A.75.75 0 0 1 5.75 8h11.5a.75.75 0 0 1 0 1.5H5.75A.75.75 0 0 1 5 8.75Zm0 4a.75.75 0 0 1 .75-.75h5.5a.75.75 0 0 1 0 1.5h-5.5a.75.75 0 0 1-.75-.75Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const number: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M9 4.75A.75.75 0 0 1 9.75 4h4a.75.75 0 0 1 .53 1.28l-1.89 1.892c.312.076.604.18.867.319.742.391 1.244 1.063 1.244 2.005 0 .653-.231 1.208-.629 1.627-.386.408-.894.653-1.408.777-1.01.243-2.225.063-3.124-.527a.751.751 0 0 1 .822-1.254c.534.35 1.32.474 1.951.322.306-.073.53-.201.67-.349.129-.136.218-.32.218-.596 0-.308-.123-.509-.444-.678-.373-.197-.98-.318-1.806-.318a.75.75 0 0 1-.53-1.28l1.72-1.72H9.75A.75.75 0 0 1 9 4.75Zm-3.587 5.763c-.35-.05-.77.113-.983.572a.75.75 0 1 1-1.36-.632c.508-1.094 1.589-1.565 2.558-1.425 1 .145 1.872.945 1.872 2.222 0 1.433-1.088 2.192-1.79 2.681-.308.216-.571.397-.772.573H7a.75.75 0 0 1 0 1.5H3.75a.75.75 0 0 1-.75-.75c0-.69.3-1.211.67-1.61.348-.372.8-.676 1.15-.92.8-.56 1.18-.904 1.18-1.474 0-.473-.267-.69-.587-.737ZM5.604.089A.75.75 0 0 1 6 .75v4.77h.711a.75.75 0 0 1 0 1.5H3.759a.75.75 0 0 1 0-1.5H4.5V2.15l-.334.223a.75.75 0 0 1-.832-1.248l1.5-1a.75.75 0 0 1 .77-.037Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M13.003 7.754a.75.75 0 0 1 .75-.75h5.232a.75.75 0 0 1 .53 1.28l-2.776 2.777c.55.097 1.057.253 1.492.483.905.477 1.504 1.284 1.504 2.418 0 .966-.471 1.75-1.172 2.27-.687.511-1.587.77-2.521.77-1.367 0-2.274-.528-2.667-.756a.75.75 0 0 1 .755-1.297c.331.193.953.553 1.912.553.673 0 1.243-.188 1.627-.473.37-.275.566-.635.566-1.067 0-.5-.219-.836-.703-1.091-.538-.284-1.375-.443-2.471-.443a.75.75 0 0 1-.53-1.28l2.643-2.644h-3.421a.75.75 0 0 1-.75-.75ZM7.88 15.215a1.4 1.4 0 0 0-1.446.83.75.75 0 0 1-1.37-.61 2.899 2.899 0 0 1 2.986-1.71c.589.06 1.139.323 1.557.743.434.446.685 1.058.685 1.778 0 1.641-1.254 2.437-2.12 2.986-.538.341-1.18.694-1.495 1.273H9.75a.75.75 0 0 1 0 1.5h-4a.75.75 0 0 1-.75-.75c0-1.799 1.337-2.63 2.243-3.21 1.032-.659 1.55-1.031 1.55-1.8 0-.355-.116-.584-.26-.732a1.071 1.071 0 0 0-.652-.298Zm.234-13.121a.75.75 0 0 1 .386.656V9h1.252a.75.75 0 0 1 0 1.5H5.75a.75.75 0 0 1 0-1.5H7V4.103l-.853.533a.749.749 0 1 1-.795-1.272l2-1.25a.749.749 0 0 1 .762-.02Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const organization: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M1.75 16A1.75 1.75 0 0 1 0 14.25V1.75C0 .784.784 0 1.75 0h8.5C11.216 0 12 .784 12 1.75v12.5c0 .085-.006.168-.018.25h2.268a.25.25 0 0 0 .25-.25V8.285a.25.25 0 0 0-.111-.208l-1.055-.703a.749.749 0 1 1 .832-1.248l1.055.703c.487.325.779.871.779 1.456v5.965A1.75 1.75 0 0 1 14.25 16h-3.5a.766.766 0 0 1-.197-.026c-.099.017-.2.026-.303.026h-3a.75.75 0 0 1-.75-.75V14h-1v1.25a.75.75 0 0 1-.75.75Zm-.25-1.75c0 .138.112.25.25.25H4v-1.25a.75.75 0 0 1 .75-.75h2.5a.75.75 0 0 1 .75.75v1.25h2.25a.25.25 0 0 0 .25-.25V1.75a.25.25 0 0 0-.25-.25h-8.5a.25.25 0 0 0-.25.25ZM3.75 6h.5a.75.75 0 0 1 0 1.5h-.5a.75.75 0 0 1 0-1.5ZM3 3.75A.75.75 0 0 1 3.75 3h.5a.75.75 0 0 1 0 1.5h-.5A.75.75 0 0 1 3 3.75Zm4 3A.75.75 0 0 1 7.75 6h.5a.75.75 0 0 1 0 1.5h-.5A.75.75 0 0 1 7 6.75ZM7.75 3h.5a.75.75 0 0 1 0 1.5h-.5a.75.75 0 0 1 0-1.5ZM3 9.75A.75.75 0 0 1 3.75 9h.5a.75.75 0 0 1 0 1.5h-.5A.75.75 0 0 1 3 9.75ZM7.75 9h.5a.75.75 0 0 1 0 1.5h-.5a.75.75 0 0 1 0-1.5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M6.25 12a.75.75 0 0 0 0 1.5h.5a.75.75 0 0 0 0-1.5h-.5ZM5.5 9.25a.75.75 0 0 1 .75-.75h.5a.75.75 0 0 1 0 1.5h-.5a.75.75 0 0 1-.75-.75ZM6.25 5a.75.75 0 0 0 0 1.5h.5a.75.75 0 0 0 0-1.5h-.5ZM9 12.75a.75.75 0 0 1 .75-.75h.5a.75.75 0 0 1 0 1.5h-.5a.75.75 0 0 1-.75-.75Zm.75-4.25a.75.75 0 0 0 0 1.5h.5a.75.75 0 0 0 0-1.5h-.5ZM9 5.75A.75.75 0 0 1 9.75 5h.5a.75.75 0 0 1 0 1.5h-.5A.75.75 0 0 1 9 5.75ZM13.25 12a.75.75 0 0 0 0 1.5h.5a.75.75 0 0 0 0-1.5h-.5Zm-.75-2.75a.75.75 0 0 1 .75-.75h.5a.75.75 0 0 1 0 1.5h-.5a.75.75 0 0 1-.75-.75ZM13.25 5a.75.75 0 0 0 0 1.5h.5a.75.75 0 0 0 0-1.5h-.5Z',
+      'M2 20V3a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v17c0 .173-.022.34-.063.5H20a.5.5 0 0 0 .5-.5v-8a.5.5 0 0 0-.2-.4l-.5-.375a.75.75 0 0 1 .9-1.2l.5.375c.504.378.8.97.8 1.6v8a2 2 0 0 1-2 2h-3.562a.767.767 0 0 1-.166-.018c-.089.012-.18.018-.272.018h-3.75a.75.75 0 0 1-.75-.75V19h-3v2.25a.75.75 0 0 1-.75.75H4a2 2 0 0 1-2-2Zm2 .5h3v-2.25a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 .75.75v2.25h3a.5.5 0 0 0 .5-.5V3a.5.5 0 0 0-.5-.5H4a.5.5 0 0 0-.5.5v17a.5.5 0 0 0 .5.5Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const package_: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'm8.878.392 5.25 3.045c.54.314.872.89.872 1.514v6.098a1.75 1.75 0 0 1-.872 1.514l-5.25 3.045a1.75 1.75 0 0 1-1.756 0l-5.25-3.045A1.75 1.75 0 0 1 1 11.049V4.951c0-.624.332-1.201.872-1.514L7.122.392a1.75 1.75 0 0 1 1.756 0ZM7.875 1.69l-4.63 2.685L8 7.133l4.755-2.758-4.63-2.685a.248.248 0 0 0-.25 0ZM2.5 5.677v5.372c0 .09.047.171.125.216l4.625 2.683V8.432Zm6.25 8.271 4.625-2.683a.25.25 0 0 0 .125-.216V5.677L8.75 8.432Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M12.876.64V.639l8.25 4.763c.541.313.875.89.875 1.515v9.525a1.75 1.75 0 0 1-.875 1.516l-8.25 4.762a1.748 1.748 0 0 1-1.75 0l-8.25-4.763a1.75 1.75 0 0 1-.875-1.515V6.917c0-.625.334-1.202.875-1.515L11.126.64a1.748 1.748 0 0 1 1.75 0Zm-1 1.298L4.251 6.34l7.75 4.474 7.75-4.474-7.625-4.402a.248.248 0 0 0-.25 0Zm.875 19.123 7.625-4.402a.25.25 0 0 0 .125-.216V7.639l-7.75 4.474ZM3.501 7.64v8.803c0 .09.048.172.125.216l7.625 4.402v-8.947Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const packageDependencies: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M6.122.392a1.75 1.75 0 0 1 1.756 0l5.25 3.045c.54.313.872.89.872 1.514V7.25a.75.75 0 0 1-1.5 0V5.677L7.75 8.432v6.384a1 1 0 0 1-1.502.865L.872 12.563A1.75 1.75 0 0 1 0 11.049V4.951c0-.624.332-1.2.872-1.514ZM7.125 1.69a.248.248 0 0 0-.25 0l-4.63 2.685L7 7.133l4.755-2.758ZM1.5 11.049a.25.25 0 0 0 .125.216l4.625 2.683V8.432L1.5 5.677Zm11.672-.282L11.999 12h3.251a.75.75 0 0 1 0 1.5h-3.251l1.173 1.233a.75.75 0 1 1-1.087 1.034l-2.378-2.5a.75.75 0 0 1 0-1.034l2.378-2.5a.75.75 0 0 1 1.087 1.034Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M9.126.64a1.748 1.748 0 0 1 1.75 0l8.25 4.762c.103.06.199.128.286.206a.75.75 0 0 1 .554.96c.023.113.035.23.035.35v3.332a.75.75 0 0 1-1.5 0V7.64l-7.75 4.474V22.36a.75.75 0 0 1-1.125.65l-8.75-5.052a1.75 1.75 0 0 1-.875-1.515V6.917c0-.119.012-.236.035-.35a.749.749 0 0 1 .554-.96c.088-.078.184-.146.286-.205L9.126.639Zm.875 10.173v.001l7.75-4.474-7.625-4.402a.248.248 0 0 0-.25 0L2.251 6.34Zm-8.5-3.175v8.803c0 .09.048.172.125.216l7.625 4.402v-8.947Z',
+      'm16.617 17.5 2.895-2.702a.75.75 0 0 0-1.024-1.096l-4.285 4a.75.75 0 0 0 0 1.096l4.285 4a.75.75 0 1 0 1.024-1.096L16.617 19h6.633a.75.75 0 0 0 0-1.5h-6.633Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const packageDependents: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M6.122.392a1.75 1.75 0 0 1 1.756 0l5.25 3.045c.54.313.872.89.872 1.514V7.25a.75.75 0 0 1-1.5 0V5.677L7.75 8.432v6.384a1 1 0 0 1-1.502.865L.872 12.563A1.75 1.75 0 0 1 0 11.049V4.951c0-.624.332-1.2.872-1.514ZM7.125 1.69a.248.248 0 0 0-.25 0l-4.63 2.685L7 7.133l4.755-2.758ZM1.5 11.049a.25.25 0 0 0 .125.216l4.625 2.683V8.432L1.5 5.677Zm10.828 3.684 1.173-1.233H10.25a.75.75 0 0 1 0-1.5h3.251l-1.173-1.233a.75.75 0 1 1 1.087-1.034l2.378 2.5a.75.75 0 0 1 0 1.034l-2.378 2.5a.75.75 0 0 1-1.087-1.034Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M9.126.64a1.748 1.748 0 0 1 1.75 0l8.25 4.762c.103.06.199.128.286.206a.75.75 0 0 1 .554.96c.023.113.035.23.035.35v3.332a.75.75 0 0 1-1.5 0V7.64l-7.75 4.474V22.36a.75.75 0 0 1-1.125.65l-8.75-5.052a1.75 1.75 0 0 1-.875-1.515V6.917c0-.119.012-.236.035-.35a.749.749 0 0 1 .554-.96c.088-.078.184-.146.286-.205L9.126.639Zm.875 10.173v.001l7.75-4.474-7.625-4.402a.248.248 0 0 0-.25 0L2.251 6.34Zm-8.5-3.175v8.803c0 .09.048.172.125.216l7.625 4.402v-8.947Z',
+      'm21.347 17.5-2.894-2.702a.75.75 0 1 1 1.023-1.096l4.286 4a.75.75 0 0 1 0 1.096l-4.286 4a.75.75 0 1 1-1.023-1.096L21.347 19h-6.633a.75.75 0 0 1 0-1.5h6.633Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const paintbrush: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M11.134 1.535c.7-.509 1.416-.942 2.076-1.155.649-.21 1.463-.267 2.069.34.603.601.568 1.411.368 2.07-.202.668-.624 1.39-1.125 2.096-1.011 1.424-2.496 2.987-3.775 4.249-1.098 1.084-2.132 1.839-3.04 2.3a3.744 3.744 0 0 1-1.055 3.217c-.431.431-1.065.691-1.657.861-.614.177-1.294.287-1.914.357A21.151 21.151 0 0 1 .797 16H.743l.007-.75H.749L.742 16a.75.75 0 0 1-.743-.742l.743-.008-.742.007v-.054a21.25 21.25 0 0 1 .13-2.284c.067-.647.187-1.287.358-1.914.17-.591.43-1.226.86-1.657a3.746 3.746 0 0 1 3.227-1.054c.466-.893 1.225-1.907 2.314-2.982 1.271-1.255 2.833-2.75 4.245-3.777ZM1.62 13.089c-.051.464-.086.929-.104 1.395.466-.018.932-.053 1.396-.104a10.511 10.511 0 0 0 1.668-.309c.526-.151.856-.325 1.011-.48a2.25 2.25 0 1 0-3.182-3.182c-.155.155-.329.485-.48 1.01a10.515 10.515 0 0 0-.309 1.67Zm10.396-10.34c-1.224.89-2.605 2.189-3.822 3.384l1.718 1.718c1.21-1.205 2.51-2.597 3.387-3.833.47-.662.78-1.227.912-1.662.134-.444.032-.551.009-.575h-.001V1.78c-.014-.014-.113-.113-.548.027-.432.14-.995.462-1.655.942Zm-4.832 7.266-.001.001a9.859 9.859 0 0 0 1.63-1.142L7.155 7.216a9.7 9.7 0 0 0-1.161 1.607c.482.302.889.71 1.19 1.192Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const paperAirplane: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M.989 8 .064 2.68a1.342 1.342 0 0 1 1.85-1.462l13.402 5.744a1.13 1.13 0 0 1 0 2.076L1.913 14.782a1.343 1.343 0 0 1-1.85-1.463L.99 8Zm.603-5.288L2.38 7.25h4.87a.75.75 0 0 1 0 1.5H2.38l-.788 4.538L13.929 8Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M1.513 1.96a1.374 1.374 0 0 1 1.499-.21l19.335 9.215a1.147 1.147 0 0 1 0 2.07L3.012 22.25a1.374 1.374 0 0 1-1.947-1.46L2.49 12 1.065 3.21a1.375 1.375 0 0 1 .448-1.25Zm2.375 10.79-1.304 8.042L21.031 12 2.584 3.208l1.304 8.042h7.362a.75.75 0 0 1 0 1.5Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const paperclip: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M12.212 3.02a1.753 1.753 0 0 0-2.478.003l-5.83 5.83a3.007 3.007 0 0 0-.88 2.127c0 .795.315 1.551.88 2.116.567.567 1.333.89 2.126.89.79 0 1.548-.321 2.116-.89l5.48-5.48a.75.75 0 0 1 1.061 1.06l-5.48 5.48a4.492 4.492 0 0 1-3.177 1.33c-1.2 0-2.345-.487-3.187-1.33a4.483 4.483 0 0 1-1.32-3.177c0-1.195.475-2.341 1.32-3.186l5.83-5.83a3.25 3.25 0 0 1 5.553 2.297c0 .863-.343 1.691-.953 2.301L7.439 12.39c-.375.377-.884.59-1.416.593a1.998 1.998 0 0 1-1.412-.593 1.992 1.992 0 0 1 0-2.828l5.48-5.48a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042l-5.48 5.48a.492.492 0 0 0 0 .707.499.499 0 0 0 .352.154.51.51 0 0 0 .356-.154l5.833-5.827a1.755 1.755 0 0 0 0-2.481Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M19.187 3.588a2.75 2.75 0 0 0-3.889 0L5.575 13.31a4.5 4.5 0 0 0 6.364 6.364l8.662-8.662a.75.75 0 0 1 1.061 1.06L13 20.735a6 6 0 0 1-8.485-8.485l9.723-9.723a4.247 4.247 0 0 1 4.124-1.139 4.247 4.247 0 0 1 3.025 3.025 4.247 4.247 0 0 1-1.139 4.124l-9.193 9.193a2.64 2.64 0 0 1-1.858.779 2.626 2.626 0 0 1-1.854-.779c-.196-.196-.338-.47-.43-.726a2.822 2.822 0 0 1-.168-.946c0-.7.284-1.373.775-1.864l8.132-8.131a.749.749 0 0 1 1.275.326.749.749 0 0 1-.215.734l-8.131 8.132a1.148 1.148 0 0 0-.336.803c.003.204.053.405.146.587.01.018.018.028.02.032.22.215.501.332.786.332.29 0 .58-.121.798-.34l9.192-9.192a2.75 2.75 0 0 0 0-3.89Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const passkeyFill: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M2.743 4.757a3.757 3.757 0 1 1 5.851 3.119 5.991 5.991 0 0 1 2.15 1.383c.17.17.257.405.258.646.003.598.001 1.197 0 1.795L11 12.778v.721a.5.5 0 0 1-.5.5H1.221a.749.749 0 0 1-.714-.784 6.004 6.004 0 0 1 3.899-5.339 3.754 3.754 0 0 1-1.663-3.119Z',
+      'M15.75 6.875c0 .874-.448 1.643-1.127 2.09a.265.265 0 0 0-.123.22v.59c0 .067-.026.13-.073.177l-.356.356a.125.125 0 0 0 0 .177l.356.356c.047.047.073.11.073.176v.231c0 .067-.026.13-.073.177l-.356.356a.125.125 0 0 0 0 .177l.356.356c.047.047.073.11.073.177v.287a.247.247 0 0 1-.065.168l-.8.88a.52.52 0 0 1-.77 0l-.8-.88a.247.247 0 0 1-.065-.168V9.185a.264.264 0 0 0-.123-.22 2.5 2.5 0 1 1 3.873-2.09ZM14 6.5a.75.75 0 1 0-1.5 0 .75.75 0 0 0 1.5 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M9.496 2a5.25 5.25 0 0 0-2.519 9.857A9.006 9.006 0 0 0 .5 20.228a.751.751 0 0 0 .728.772h5.257c3.338.001 6.677.002 10.015 0a.5.5 0 0 0 .5-.5v-4.669a.95.95 0 0 0-.171-.551 9.02 9.02 0 0 0-4.814-3.423A5.25 5.25 0 0 0 9.496 2Z',
+      'M23.625 10.313c0 1.31-.672 2.464-1.691 3.134a.398.398 0 0 0-.184.33v.886a.372.372 0 0 1-.11.265l-.534.534a.188.188 0 0 0 0 .265l.534.534c.071.07.11.166.11.265v.347a.374.374 0 0 1-.11.265l-.534.534a.188.188 0 0 0 0 .265l.534.534a.37.37 0 0 1 .11.265v.431a.379.379 0 0 1-.097.253l-1.2 1.319a.781.781 0 0 1-1.156 0l-1.2-1.319a.379.379 0 0 1-.097-.253v-5.39a.398.398 0 0 0-.184-.33 3.75 3.75 0 1 1 5.809-3.134ZM21 9.75a1.125 1.125 0 1 0-2.25 0 1.125 1.125 0 0 0 2.25 0Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const paste: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M3.626 3.533a.249.249 0 0 0-.126.217v9.5c0 .138.112.25.25.25h8.5a.25.25 0 0 0 .25-.25v-9.5a.249.249 0 0 0-.126-.217.75.75 0 0 1 .752-1.298c.541.313.874.89.874 1.515v9.5A1.75 1.75 0 0 1 12.25 15h-8.5A1.75 1.75 0 0 1 2 13.25v-9.5c0-.625.333-1.202.874-1.515a.75.75 0 0 1 .752 1.298ZM5.75 1h4.5a.75.75 0 0 1 .75.75v3a.75.75 0 0 1-.75.75h-4.5A.75.75 0 0 1 5 4.75v-3A.75.75 0 0 1 5.75 1Zm.75 3h3V2.5h-3Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M5.962 2.513a.75.75 0 0 1-.475.949l-.816.272a.25.25 0 0 0-.171.237V21.25c0 .138.112.25.25.25h14.5a.25.25 0 0 0 .25-.25V3.97a.25.25 0 0 0-.17-.236l-.817-.272a.75.75 0 0 1 .474-1.424l.816.273A1.751 1.751 0 0 1 21 3.97v17.28A1.75 1.75 0 0 1 19.25 23H4.75A1.75 1.75 0 0 1 3 21.25V3.97a1.75 1.75 0 0 1 1.197-1.66l.816-.272a.75.75 0 0 1 .949.475Z',
+      'M7 1.75C7 .784 7.784 0 8.75 0h6.5C16.216 0 17 .784 17 1.75v1.5A1.75 1.75 0 0 1 15.25 5h-6.5A1.75 1.75 0 0 1 7 3.25Zm1.75-.25a.25.25 0 0 0-.25.25v1.5c0 .138.112.25.25.25h6.5a.25.25 0 0 0 .25-.25v-1.5a.25.25 0 0 0-.25-.25Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const pencil: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M11.013 1.427a1.75 1.75 0 0 1 2.474 0l1.086 1.086a1.75 1.75 0 0 1 0 2.474l-8.61 8.61c-.21.21-.47.364-.756.445l-3.251.93a.75.75 0 0 1-.927-.928l.929-3.25c.081-.286.235-.547.445-.758l8.61-8.61Zm.176 4.823L9.75 4.81l-6.286 6.287a.253.253 0 0 0-.064.108l-.558 1.953 1.953-.558a.253.253 0 0 0 .108-.064Zm1.238-3.763a.25.25 0 0 0-.354 0L10.811 3.75l1.439 1.44 1.263-1.263a.25.25 0 0 0 0-.354Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M17.263 2.177a1.75 1.75 0 0 1 2.474 0l2.586 2.586a1.75 1.75 0 0 1 0 2.474L19.53 10.03l-.012.013L8.69 20.378a1.753 1.753 0 0 1-.699.409l-5.523 1.68a.748.748 0 0 1-.747-.188.748.748 0 0 1-.188-.747l1.673-5.5a1.75 1.75 0 0 1 .466-.756L14.476 4.963ZM4.708 16.361a.26.26 0 0 0-.067.108l-1.264 4.154 4.177-1.271a.253.253 0 0 0 .1-.059l10.273-9.806-2.94-2.939-10.279 9.813ZM19 8.44l2.263-2.262a.25.25 0 0 0 0-.354l-2.586-2.586a.25.25 0 0 0-.354 0L16.061 5.5Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const people: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M2 5.5a3.5 3.5 0 1 1 5.898 2.549 5.508 5.508 0 0 1 3.034 4.084.75.75 0 1 1-1.482.235 4 4 0 0 0-7.9 0 .75.75 0 0 1-1.482-.236A5.507 5.507 0 0 1 3.102 8.05 3.493 3.493 0 0 1 2 5.5ZM11 4a3.001 3.001 0 0 1 2.22 5.018 5.01 5.01 0 0 1 2.56 3.012.749.749 0 0 1-.885.954.752.752 0 0 1-.549-.514 3.507 3.507 0 0 0-2.522-2.372.75.75 0 0 1-.574-.73v-.352a.75.75 0 0 1 .416-.672A1.5 1.5 0 0 0 11 5.5.75.75 0 0 1 11 4Zm-5.5-.5a2 2 0 1 0-.001 3.999A2 2 0 0 0 5.5 3.5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M3.5 8a5.5 5.5 0 1 1 8.596 4.547 9.005 9.005 0 0 1 5.9 8.18.751.751 0 0 1-1.5.045 7.5 7.5 0 0 0-14.993 0 .75.75 0 0 1-1.499-.044 9.005 9.005 0 0 1 5.9-8.181A5.496 5.496 0 0 1 3.5 8ZM9 4a4 4 0 1 0 0 8 4 4 0 0 0 0-8Zm8.29 4c-.148 0-.292.01-.434.03a.75.75 0 1 1-.212-1.484 4.53 4.53 0 0 1 3.38 8.097 6.69 6.69 0 0 1 3.956 6.107.75.75 0 0 1-1.5 0 5.193 5.193 0 0 0-3.696-4.972l-.534-.16v-1.676l.41-.209A3.03 3.03 0 0 0 17.29 8Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const person: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M10.561 8.073a6.005 6.005 0 0 1 3.432 5.142.75.75 0 1 1-1.498.07 4.5 4.5 0 0 0-8.99 0 .75.75 0 0 1-1.498-.07 6.004 6.004 0 0 1 3.431-5.142 3.999 3.999 0 1 1 5.123 0ZM10.5 5a2.5 2.5 0 1 0-5 0 2.5 2.5 0 0 0 5 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M12 2.5a5.5 5.5 0 0 1 3.096 10.047 9.005 9.005 0 0 1 5.9 8.181.75.75 0 1 1-1.499.044 7.5 7.5 0 0 0-14.993 0 .75.75 0 0 1-1.5-.045 9.005 9.005 0 0 1 5.9-8.18A5.5 5.5 0 0 1 12 2.5ZM8 8a4 4 0 1 0 8 0 4 4 0 0 0-8 0Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const personAdd: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M7.9 8.548h-.001a5.528 5.528 0 0 1 3.1 4.659.75.75 0 1 1-1.498.086A4.01 4.01 0 0 0 5.5 9.5a4.01 4.01 0 0 0-4.001 3.793.75.75 0 1 1-1.498-.085 5.527 5.527 0 0 1 3.1-4.66 3.5 3.5 0 1 1 4.799 0ZM13.25 0a.75.75 0 0 1 .75.75V2h1.25a.75.75 0 0 1 0 1.5H14v1.25a.75.75 0 0 1-1.5 0V3.5h-1.25a.75.75 0 0 1 0-1.5h1.25V.75a.75.75 0 0 1 .75-.75ZM5.5 4a2 2 0 1 0-.001 3.999A2 2 0 0 0 5.5 4Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M4 9.5a5 5 0 1 1 7.916 4.062 7.973 7.973 0 0 1 5.018 7.166.75.75 0 1 1-1.499.044 6.469 6.469 0 0 0-12.932 0 .75.75 0 0 1-1.499-.044 7.972 7.972 0 0 1 5.059-7.181A4.994 4.994 0 0 1 4 9.5ZM9 6a3.5 3.5 0 1 0 0 7 3.5 3.5 0 0 0 0-7Zm10.25-5a.75.75 0 0 1 .75.75V4h2.25a.75.75 0 0 1 0 1.5H20v2.25a.75.75 0 0 1-1.5 0V5.5h-2.25a.75.75 0 0 1 0-1.5h2.25V1.75a.75.75 0 0 1 .75-.75Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const personFill: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M4.243 4.757a3.757 3.757 0 1 1 5.851 3.119 6.006 6.006 0 0 1 3.9 5.339.75.75 0 0 1-.715.784H2.721a.75.75 0 0 1-.714-.784 6.006 6.006 0 0 1 3.9-5.34 3.753 3.753 0 0 1-1.664-3.118Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M12 2.5a5.25 5.25 0 0 0-2.519 9.857 9.005 9.005 0 0 0-6.477 8.37.75.75 0 0 0 .727.773H20.27a.75.75 0 0 0 .727-.772 9.005 9.005 0 0 0-6.477-8.37A5.25 5.25 0 0 0 12 2.5Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const pin: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'm11.294.984 3.722 3.722a1.75 1.75 0 0 1-.504 2.826l-1.327.613a3.089 3.089 0 0 0-1.707 2.084l-.584 2.454c-.317 1.332-1.972 1.8-2.94.832L5.75 11.311 1.78 15.28a.749.749 0 1 1-1.06-1.06l3.969-3.97-2.204-2.204c-.968-.968-.5-2.623.832-2.94l2.454-.584a3.08 3.08 0 0 0 2.084-1.707l.613-1.327a1.75 1.75 0 0 1 2.826-.504ZM6.283 9.723l2.732 2.731a.25.25 0 0 0 .42-.119l.584-2.454a4.586 4.586 0 0 1 2.537-3.098l1.328-.613a.25.25 0 0 0 .072-.404l-3.722-3.722a.25.25 0 0 0-.404.072l-.613 1.328a4.584 4.584 0 0 1-3.098 2.537l-2.454.584a.25.25 0 0 0-.119.42l2.731 2.732Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'm16.114 1.553 6.333 6.333a1.75 1.75 0 0 1-.603 2.869l-1.63.633a5.67 5.67 0 0 0-3.395 3.725l-1.131 3.959a1.75 1.75 0 0 1-2.92.757L9 16.061l-5.595 5.594a.749.749 0 1 1-1.06-1.06L7.939 15l-3.768-3.768a1.75 1.75 0 0 1 .757-2.92l3.959-1.131a5.666 5.666 0 0 0 3.725-3.395l.633-1.63a1.75 1.75 0 0 1 2.869-.603ZM5.232 10.171l8.597 8.597a.25.25 0 0 0 .417-.108l1.131-3.959A7.17 7.17 0 0 1 19.67 9.99l1.63-.634a.25.25 0 0 0 .086-.409l-6.333-6.333a.25.25 0 0 0-.409.086l-.634 1.63a7.17 7.17 0 0 1-4.711 4.293L5.34 9.754a.25.25 0 0 0-.108.417Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const pinSlash: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'm1.655.595 13.75 13.75q.22.219.22.53 0 .311-.22.53-.219.22-.53.22-.311 0-.53-.22L.595 1.655q-.22-.219-.22-.53 0-.311.22-.53.219-.22.53-.22.311 0 .53.22ZM.72 14.22l4.5-4.5q.219-.22.53-.22.311 0 .53.22.22.219.22.53 0 .311-.22.53l-4.5 4.5q-.219.22-.53.22-.311 0-.53-.22-.22-.219-.22-.53 0-.311.22-.53Z',
+      'm5.424 6.146-1.759.419q-.143.034-.183.175-.04.141.064.245l5.469 5.469q.104.104.245.064.141-.04.175-.183l.359-1.509q.072-.302.337-.465.264-.163.567-.091.302.072.465.337.162.264.09.567l-.359 1.509q-.238.999-1.226 1.278-.988.28-1.714-.446L2.485 8.046q-.726-.726-.446-1.714.279-.988 1.278-1.226l1.759-.419q.303-.072.567.091.265.163.337.465.072.302-.091.567-.163.264-.465.336ZM7.47 3.47q.155-.156.247-.355l.751-1.627Q8.851.659 9.75.498q.899-.16 1.544.486l3.722 3.722q.646.645.486 1.544-.161.899-.99 1.282l-1.627.751q-.199.092-.355.247-.219.22-.53.22-.311 0-.53-.22-.22-.219-.22-.53 0-.311.22-.53.344-.345.787-.549l1.627-.751q.118-.055.141-.183.023-.128-.069-.221l-3.722-3.722q-.092-.092-.221-.069-.128.023-.183.141l-.751 1.627q-.204.443-.549.787-.219.22-.53.22-.311 0-.53-.22-.22-.219-.22-.53 0-.311.22-.53Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M2.345 20.595 8.47 14.47q.219-.22.53-.22.311 0 .53.22.22.219.22.53 0 .311-.22.53l-6.125 6.125q-.219.22-.53.22-.311 0-.53-.22-.22-.219-.22-.53 0-.311.22-.53Z',
+      'm16.72 11.97.358-.358a6.738 6.738 0 0 1 2.326-1.518l1.896-.738a.25.25 0 0 0 .086-.409l-6.333-6.333a.25.25 0 0 0-.409.086l-.521 1.34a8.663 8.663 0 0 1-2.243 3.265.75.75 0 0 1-1.01-1.11 7.132 7.132 0 0 0 1.854-2.699l.521-1.34a1.75 1.75 0 0 1 2.869-.603l6.333 6.333a1.75 1.75 0 0 1-.603 2.869l-1.896.737a5.26 5.26 0 0 0-1.81 1.18l-.358.358a.749.749 0 1 1-1.06-1.06Zm-12.549-.738a1.75 1.75 0 0 1 .757-2.92l3.366-.962.412 1.443-3.366.961a.25.25 0 0 0-.108.417l8.597 8.597a.25.25 0 0 0 .417-.108l.961-3.366 1.443.412-.962 3.366a1.75 1.75 0 0 1-2.92.757Z',
+      'm3.405 2.095 18.75 18.75q.22.219.22.53 0 .311-.22.53-.219.22-.53.22-.311 0-.53-.22L2.345 3.155q-.22-.219-.22-.53 0-.311.22-.53.219-.22.53-.22.311 0 .53.22Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const pivotColumn: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M0 1.75C0 .784.784 0 1.75 0h12.5C15.217 0 16 .784 16 1.75v5.5a.75.75 0 0 1-1.5 0V6.5h-8v8h.75a.75.75 0 0 1 0 1.5h-5.5A1.75 1.75 0 0 1 0 14.25ZM1.5 6.5v7.75c0 .138.112.25.25.25H5v-8Zm5-1.5h8V1.75a.25.25 0 0 0-.25-.25H6.5ZM5 5V1.5H1.75a.25.25 0 0 0-.25.25V5Z',
+      'm11.017 9.89-2.882 2.677a.249.249 0 0 0 0 .366l2.882 2.677a.25.25 0 0 0 .421-.183V13.5H12.5A3.5 3.5 0 0 0 16 10a.75.75 0 0 0-1.5 0 2 2 0 0 1-2 2h-1.062v-1.927a.25.25 0 0 0-.421-.183Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M2 3.75C2 2.783 2.783 2 3.75 2h16.5c.966 0 1.75.783 1.75 1.75V10a.75.75 0 0 1-1.5 0V8.75H8.75V20.5H10a.75.75 0 0 1 0 1.5H3.75A1.75 1.75 0 0 1 2 20.25Zm6.75-.25v3.75H20.5v-3.5a.25.25 0 0 0-.25-.25Zm-1.5 17V8.75H3.5v11.5c0 .138.112.25.25.25ZM3.5 7.25h3.75V3.5h-3.5a.25.25 0 0 0-.25.25Z',
+      'M21.25 12.312a.75.75 0 0 1 .75.75v2.626a3.75 3.75 0 0 1-3.75 3.75h-3.502l2.032 2.032a.749.749 0 1 1-1.06 1.06l-3.25-3.25a.749.749 0 0 1 0-1.06l3.25-3.25a.749.749 0 1 1 1.06 1.06l-1.907 1.908h3.377a2.25 2.25 0 0 0 2.25-2.25v-2.626a.75.75 0 0 1 .75-.75Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const play: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Zm4.879-2.773 4.264 2.559a.25.25 0 0 1 0 .428l-4.264 2.559A.25.25 0 0 1 6 10.559V5.442a.25.25 0 0 1 .379-.215Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M9.5 15.584V8.416a.5.5 0 0 1 .77-.42l5.576 3.583a.5.5 0 0 1 0 .842l-5.576 3.584a.5.5 0 0 1-.77-.42Z',
+      'M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12Zm11-9.5A9.5 9.5 0 0 0 2.5 12a9.5 9.5 0 0 0 9.5 9.5 9.5 9.5 0 0 0 9.5-9.5A9.5 9.5 0 0 0 12 2.5Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const plug: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M4 8H2.5a1 1 0 0 0-1 1v5.25a.75.75 0 0 1-1.5 0V9a2.5 2.5 0 0 1 2.5-2.5H4V5.133a1.75 1.75 0 0 1 1.533-1.737l2.831-.353.76-.913c.332-.4.825-.63 1.344-.63h.782c.966 0 1.75.784 1.75 1.75V4h2.25a.75.75 0 0 1 0 1.5H13v4h2.25a.75.75 0 0 1 0 1.5H13v.75a1.75 1.75 0 0 1-1.75 1.75h-.782c-.519 0-1.012-.23-1.344-.63l-.761-.912-2.83-.354A1.75 1.75 0 0 1 4 9.867Zm6.276-4.91-.95 1.14a.753.753 0 0 1-.483.265l-3.124.39a.25.25 0 0 0-.219.248v4.734c0 .126.094.233.219.249l3.124.39a.752.752 0 0 1 .483.264l.95 1.14a.25.25 0 0 0 .192.09h.782a.25.25 0 0 0 .25-.25v-8.5a.25.25 0 0 0-.25-.25h-.782a.25.25 0 0 0-.192.09Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M7 11.5H2.938c-.794 0-1.438.644-1.438 1.437v8.313a.75.75 0 0 1-1.5 0v-8.312A2.939 2.939 0 0 1 2.937 10H7V6.151c0-.897.678-1.648 1.57-1.74l6.055-.626 1.006-1.174A1.752 1.752 0 0 1 16.96 2h1.29c.966 0 1.75.784 1.75 1.75V6h3.25a.75.75 0 0 1 0 1.5H20V14h3.25a.75.75 0 0 1 0 1.5H20v2.25a1.75 1.75 0 0 1-1.75 1.75h-1.29a1.75 1.75 0 0 1-1.329-.611l-1.006-1.174-6.055-.627A1.749 1.749 0 0 1 7 15.348Zm9.77-7.913v.001l-1.201 1.4a.75.75 0 0 1-.492.258l-6.353.657a.25.25 0 0 0-.224.249v9.196a.25.25 0 0 0 .224.249l6.353.657c.191.02.368.112.493.258l1.2 1.401a.252.252 0 0 0 .19.087h1.29a.25.25 0 0 0 .25-.25v-14a.25.25 0 0 0-.25-.25h-1.29a.252.252 0 0 0-.19.087Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const plus: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M7.75 2a.75.75 0 0 1 .75.75V7h4.25a.75.75 0 0 1 0 1.5H8.5v4.25a.75.75 0 0 1-1.5 0V8.5H2.75a.75.75 0 0 1 0-1.5H7V2.75A.75.75 0 0 1 7.75 2Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M11.75 4.5a.75.75 0 0 1 .75.75V11h5.75a.75.75 0 0 1 0 1.5H12.5v5.75a.75.75 0 0 1-1.5 0V12.5H5.25a.75.75 0 0 1 0-1.5H11V5.25a.75.75 0 0 1 .75-.75Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const plusCircle: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Zm7.25-3.25v2.5h2.5a.75.75 0 0 1 0 1.5h-2.5v2.5a.75.75 0 0 1-1.5 0v-2.5h-2.5a.75.75 0 0 1 0-1.5h2.5v-2.5a.75.75 0 0 1 1.5 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M12.75 7.75a.75.75 0 0 0-1.5 0v3.5h-3.5a.75.75 0 0 0 0 1.5h3.5v3.5a.75.75 0 0 0 1.5 0v-3.5h3.5a.75.75 0 0 0 0-1.5h-3.5v-3.5Z',
+      'M12 1c6.075 0 11 4.925 11 11s-4.925 11-11 11S1 18.075 1 12 5.925 1 12 1ZM2.5 12a9.5 9.5 0 0 0 9.5 9.5 9.5 9.5 0 0 0 9.5-9.5A9.5 9.5 0 0 0 12 2.5 9.5 9.5 0 0 0 2.5 12Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const project: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M1.75 0h12.5C15.216 0 16 .784 16 1.75v12.5A1.75 1.75 0 0 1 14.25 16H1.75A1.75 1.75 0 0 1 0 14.25V1.75C0 .784.784 0 1.75 0ZM1.5 1.75v12.5c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25V1.75a.25.25 0 0 0-.25-.25H1.75a.25.25 0 0 0-.25.25ZM11.75 3a.75.75 0 0 1 .75.75v7.5a.75.75 0 0 1-1.5 0v-7.5a.75.75 0 0 1 .75-.75Zm-8.25.75a.75.75 0 0 1 1.5 0v5.5a.75.75 0 0 1-1.5 0ZM8 3a.75.75 0 0 1 .75.75v3.5a.75.75 0 0 1-1.5 0v-3.5A.75.75 0 0 1 8 3Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M7.25 6a.75.75 0 0 0-.75.75v7.5a.75.75 0 0 0 1.5 0v-7.5A.75.75 0 0 0 7.25 6ZM12 6a.75.75 0 0 0-.75.75v4.5a.75.75 0 0 0 1.5 0v-4.5A.75.75 0 0 0 12 6Zm4 .75a.75.75 0 0 1 1.5 0v9.5a.75.75 0 0 1-1.5 0v-9.5Z',
+      'M3.75 2h16.5c.966 0 1.75.784 1.75 1.75v16.5A1.75 1.75 0 0 1 20.25 22H3.75A1.75 1.75 0 0 1 2 20.25V3.75C2 2.784 2.784 2 3.75 2ZM3.5 3.75v16.5c0 .138.112.25.25.25h16.5a.25.25 0 0 0 .25-.25V3.75a.25.25 0 0 0-.25-.25H3.75a.25.25 0 0 0-.25.25Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const projectRoadmap: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M4.75 7a.75.75 0 0 0 0 1.5h4.5a.75.75 0 0 0 0-1.5h-4.5ZM5 4.75A.75.75 0 0 1 5.75 4h5.5a.75.75 0 0 1 0 1.5h-5.5A.75.75 0 0 1 5 4.75ZM6.75 10a.75.75 0 0 0 0 1.5h4.5a.75.75 0 0 0 0-1.5h-4.5Z',
+      'M0 1.75C0 .784.784 0 1.75 0h12.5C15.216 0 16 .784 16 1.75v12.5A1.75 1.75 0 0 1 14.25 16H1.75A1.75 1.75 0 0 1 0 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25V1.75a.25.25 0 0 0-.25-.25Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M8.75 7a.75.75 0 0 0 0 1.5h7.5a.75.75 0 0 0 0-1.5h-7.5ZM7 11.75a.75.75 0 0 1 .75-.75h6.5a.75.75 0 0 1 0 1.5h-6.5a.75.75 0 0 1-.75-.75ZM9.75 15a.75.75 0 0 0 0 1.5h6.5a.75.75 0 0 0 0-1.5h-6.5Z',
+      'M2 3.75C2 2.784 2.784 2 3.75 2h16.5c.966 0 1.75.784 1.75 1.75v16.5A1.75 1.75 0 0 1 20.25 22H3.75A1.75 1.75 0 0 1 2 20.25Zm1.75-.25a.25.25 0 0 0-.25.25v16.5c0 .138.112.25.25.25h16.5a.25.25 0 0 0 .25-.25V3.75a.25.25 0 0 0-.25-.25Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const projectSymlink: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M0 1.75C0 .784.784 0 1.75 0h12.5C15.216 0 16 .784 16 1.75v12.5A1.75 1.75 0 0 1 14.25 16h-8.5a.75.75 0 0 1 0-1.5h8.5a.25.25 0 0 0 .25-.25V6.5h-13v1.75a.75.75 0 0 1-1.5 0ZM6.5 5h8V1.75a.25.25 0 0 0-.25-.25H6.5Zm-5 0H5V1.5H1.75a.25.25 0 0 0-.25.25Z',
+      'M1.5 13.737a2.25 2.25 0 0 1 2.262-2.25L4 11.49v1.938c0 .218.26.331.42.183l2.883-2.677a.25.25 0 0 0 0-.366L4.42 7.89a.25.25 0 0 0-.42.183V9.99l-.23-.001A3.75 3.75 0 0 0 0 13.738v1.012a.75.75 0 0 0 1.5 0v-1.013Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M2 3.75C2 2.784 2.784 2 3.75 2h16.5c.966 0 1.75.784 1.75 1.75v16.5A1.75 1.75 0 0 1 20.25 22H9.75a.75.75 0 0 1 0-1.5h10.5a.25.25 0 0 0 .25-.25V9h-17v3A.75.75 0 0 1 2 12ZM9 7.5h11.5V3.75a.25.25 0 0 0-.25-.25H9Zm-5.5 0h4v-4H3.75a.25.25 0 0 0-.25.25Z',
+      'm9.308 14.5-2.104-2.236a.75.75 0 1 1 1.092-1.028l3.294 3.5a.75.75 0 0 1 0 1.028l-3.294 3.5a.75.75 0 1 1-1.092-1.028L9.308 16H6.09a2.59 2.59 0 0 0-2.59 2.59v2.66a.75.75 0 0 1-1.5 0v-2.66a4.09 4.09 0 0 1 4.09-4.09h3.218Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const projectTemplate: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M1.5 1.75v1.562a.75.75 0 1 1-1.5 0V1.75C0 .784.784 0 1.75 0h1.562a.75.75 0 1 1 0 1.5H1.75a.25.25 0 0 0-.25.25ZM6.438 0h3.124a.75.75 0 1 1 0 1.5H6.438a.75.75 0 1 1 0-1.5Zm6.25 0h1.562C15.217 0 16 .784 16 1.75v1.562a.75.75 0 1 1-1.5 0V1.75a.25.25 0 0 0-.25-.25h-1.562a.75.75 0 1 1 0-1.5ZM1.5 6.438v3.124a.75.75 0 1 1-1.5 0V6.438a.75.75 0 1 1 1.5 0Zm14.5 0v3.124a.75.75 0 1 1-1.5 0V6.438a.75.75 0 1 1 1.5 0Zm-14.5 6.25v1.562c0 .138.112.25.25.25h1.562a.75.75 0 1 1 0 1.5H1.75A1.75 1.75 0 0 1 0 14.25v-1.562a.75.75 0 1 1 1.5 0Zm14.5 0v1.562A1.75 1.75 0 0 1 14.25 16h-1.562a.75.75 0 1 1 0-1.5h1.562a.25.25 0 0 0 .25-.25v-1.562a.75.75 0 1 1 1.5 0ZM6.438 14.5h3.124a.75.75 0 1 1 0 1.5H6.438a.75.75 0 1 1 0-1.5ZM6.5 3v1A.75.75 0 0 1 5 4V3a.75.75 0 0 1 1.5 0ZM2.25 5.75A.75.75 0 0 1 3 5h1a.75.75 0 0 1 0 1.5H3a.75.75 0 0 1-.75-.75Zm4.5 0A.75.75 0 0 1 7.5 5h1a.75.75 0 0 1 0 1.5h-1a.75.75 0 0 1-.75-.75Zm-1 1a.75.75 0 0 1 .75.75v1a.75.75 0 0 1-1.5 0v-1a.75.75 0 0 1 .75-.75Zm.75 4v2.5a.75.75 0 0 1-1.5 0v-2.5a.75.75 0 0 1 1.5 0Zm3.5-5a.75.75 0 0 1 .75-.75h2.5a.75.75 0 0 1 0 1.5h-2.5a.75.75 0 0 1-.75-.75Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M3.75 3.5a.25.25 0 0 0-.25.25v2.062a.75.75 0 1 1-1.5 0V3.75C2 2.783 2.783 2 3.75 2h2.062a.75.75 0 1 1 0 1.5Zm13.688-.75a.75.75 0 0 1 .75-.75h2.062c.966 0 1.75.783 1.75 1.75v2.062a.75.75 0 1 1-1.5 0V3.75a.25.25 0 0 0-.25-.25h-2.062a.75.75 0 0 1-.75-.75ZM2.75 17.438a.75.75 0 0 1 .75.75v2.062c0 .138.112.25.25.25h2.062a.75.75 0 1 1 0 1.5H3.75A1.75 1.75 0 0 1 2 20.25v-2.062a.75.75 0 0 1 .75-.75Zm18.5 0a.75.75 0 0 1 .75.75v2.062A1.75 1.75 0 0 1 20.25 22h-2.062a.75.75 0 1 1 0-1.5h2.062a.25.25 0 0 0 .25-.25v-2.062a.75.75 0 0 1 .75-.75Zm-18.5-8.25a.75.75 0 0 1 .75.75v4.124a.75.75 0 1 1-1.5 0V9.938a.75.75 0 0 1 .75-.75ZM9.188 2.75a.75.75 0 0 1 .75-.75h4.124a.75.75 0 1 1 0 1.5H9.938a.75.75 0 0 1-.75-.75Zm0 18.5a.75.75 0 0 1 .75-.75h4.124a.75.75 0 1 1 0 1.5H9.938a.75.75 0 0 1-.75-.75ZM21.25 9.188a.75.75 0 0 1 .75.75v4.124a.75.75 0 1 1-1.5 0V9.938a.75.75 0 0 1 .75-.75ZM3.75 8.25a.75.75 0 0 1 .75-.75h2a.75.75 0 0 1 0 1.5h-2a.75.75 0 0 1-.75-.75Zm5.5 0A.75.75 0 0 1 10 7.5h2A.75.75 0 0 1 12 9h-2a.75.75 0 0 1-.75-.75Zm-1-4.5A.75.75 0 0 1 9 4.5v2a.75.75 0 0 1-1.5 0v-2a.75.75 0 0 1 .75-.75Zm0 5.5A.75.75 0 0 1 9 10v2a.75.75 0 0 1-1.5 0v-2a.75.75 0 0 1 .75-.75Zm0 4.75a.75.75 0 0 1 .75.75v4a.75.75 0 0 1-1.5 0v-4a.75.75 0 0 1 .75-.75ZM14 8.25a.75.75 0 0 1 .75-.75h4a.75.75 0 0 1 0 1.5h-4a.75.75 0 0 1-.75-.75Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const pulse: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M6 2c.306 0 .582.187.696.471L10 10.731l1.304-3.26A.751.751 0 0 1 12 7h3.25a.75.75 0 0 1 0 1.5h-2.742l-1.812 4.528a.751.751 0 0 1-1.392 0L6 4.77 4.696 8.03A.75.75 0 0 1 4 8.5H.75a.75.75 0 0 1 0-1.5h2.742l1.812-4.529A.751.751 0 0 1 6 2Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M9.002 2.5a.75.75 0 0 1 .691.464l6.302 15.305 2.56-6.301a.75.75 0 0 1 .695-.468h4a.75.75 0 0 1 0 1.5h-3.495l-3.06 7.532a.75.75 0 0 1-1.389.004L8.997 5.21l-3.054 7.329A.75.75 0 0 1 5.25 13H.75a.75.75 0 0 1 0-1.5h4l3.558-8.538a.75.75 0 0 1 .694-.462Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const question: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M10.97 8.265a1.45 1.45 0 0 0-.487.57.75.75 0 0 1-1.341-.67c.2-.402.513-.826.997-1.148C10.627 6.69 11.244 6.5 12 6.5c.658 0 1.369.195 1.934.619a2.45 2.45 0 0 1 1.004 2.006c0 1.033-.513 1.72-1.027 2.215-.19.183-.399.358-.579.508l-.147.123a4.329 4.329 0 0 0-.435.409v1.37a.75.75 0 1 1-1.5 0v-1.473c0-.237.067-.504.247-.736.22-.28.486-.517.718-.714l.183-.153.001-.001c.172-.143.324-.27.47-.412.368-.355.569-.676.569-1.136a.953.953 0 0 0-.404-.806C12.766 8.118 12.384 8 12 8c-.494 0-.814.121-1.03.265ZM13 17a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z',
+      'M12 1c6.075 0 11 4.925 11 11s-4.925 11-11 11S1 18.075 1 12 5.925 1 12 1ZM2.5 12a9.5 9.5 0 0 0 9.5 9.5 9.5 9.5 0 0 0 9.5-9.5A9.5 9.5 0 0 0 12 2.5 9.5 9.5 0 0 0 2.5 12Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const quote: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M1.75 2.5h10.5a.75.75 0 0 1 0 1.5H1.75a.75.75 0 0 1 0-1.5Zm4 5h8.5a.75.75 0 0 1 0 1.5h-8.5a.75.75 0 0 1 0-1.5Zm0 5h8.5a.75.75 0 0 1 0 1.5h-8.5a.75.75 0 0 1 0-1.5ZM2.5 7.75v6a.75.75 0 0 1-1.5 0v-6a.75.75 0 0 1 1.5 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M3 6.25a.75.75 0 0 1 .75-.75h13.5a.75.75 0 0 1 0 1.5H3.75A.75.75 0 0 1 3 6.25Zm5 6.063a.75.75 0 0 1 .75-.75h11.5a.75.75 0 0 1 0 1.5H8.75a.75.75 0 0 1-.75-.75Zm0 5.937a.75.75 0 0 1 .75-.75h11.5a.75.75 0 0 1 0 1.5H8.75a.75.75 0 0 1-.75-.75ZM3.75 11a.75.75 0 0 1 .75.75v7a.75.75 0 0 1-1.5 0v-7a.75.75 0 0 1 .75-.75Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const read: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M10.89 1.767a2.252 2.252 0 0 1 2.22 0l9.75 5.525A2.25 2.25 0 0 1 24 9.249v9.501A2.25 2.25 0 0 1 21.75 21H2.25A2.25 2.25 0 0 1 0 18.75v-9.5c0-.81.435-1.558 1.14-1.958Zm1.48 1.305a.75.75 0 0 0-.74 0l-9.316 5.28 7.41 4.233a3.75 3.75 0 0 1 4.553 0l7.41-4.234-9.317-5.28ZM20.65 19.5l-7.26-5.704a2.25 2.25 0 0 0-2.78 0L3.35 19.5Zm1.85-9.886-6.95 3.971 6.663 5.236c.089.07.161.159.21.26a.745.745 0 0 0 .077-.331ZM8.45 13.585 1.5 9.614v9.136c0 .119.028.23.076.33a.744.744 0 0 1 .21-.259Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const redo: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M14.78 6.28a.749.749 0 0 0 0-1.06l-3.5-3.5a.749.749 0 1 0-1.06 1.06L12.439 5H5.251l-.001.007L5.251 5a.8.8 0 0 0-.171.019A4.501 4.501 0 0 0 5.5 14h1.704a.75.75 0 0 0 0-1.5H5.5a3 3 0 1 1 0-6h6.939L10.22 8.72a.749.749 0 1 0 1.06 1.06l3.5-3.5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const relFilePath: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M13.94 3.045a.75.75 0 0 0-1.38-.59l-4.5 10.5a.75.75 0 1 0 1.38.59l4.5-10.5ZM5 11.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M19.564 4.42a.75.75 0 0 0-1.378-.59l-6.75 15.75a.75.75 0 0 0 1.378.59l6.75-15.75ZM7 18.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const reply: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M6.78 1.97a.75.75 0 0 1 0 1.06L3.81 6h6.44A4.75 4.75 0 0 1 15 10.75v2.5a.75.75 0 0 1-1.5 0v-2.5a3.25 3.25 0 0 0-3.25-3.25H3.81l2.97 2.97a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215L1.47 7.28a.75.75 0 0 1 0-1.06l4.25-4.25a.75.75 0 0 1 1.06 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M10.53 5.03a.75.75 0 1 0-1.06-1.06l-6.25 6.25a.75.75 0 0 0 0 1.06l6.25 6.25a.75.75 0 1 0 1.06-1.06L5.56 11.5H17a3.248 3.248 0 0 1 3.25 3.248v4.502a.75.75 0 0 0 1.5 0v-4.502A4.748 4.748 0 0 0 17 10H5.56l4.97-4.97Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const repo: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M2 2.5A2.5 2.5 0 0 1 4.5 0h8.75a.75.75 0 0 1 .75.75v12.5a.75.75 0 0 1-.75.75h-2.5a.75.75 0 0 1 0-1.5h1.75v-2h-8a1 1 0 0 0-.714 1.7.75.75 0 1 1-1.072 1.05A2.495 2.495 0 0 1 2 11.5Zm10.5-1h-8a1 1 0 0 0-1 1v6.708A2.486 2.486 0 0 1 4.5 9h8ZM5 12.25a.25.25 0 0 1 .25-.25h3.5a.25.25 0 0 1 .25.25v3.25a.25.25 0 0 1-.4.2l-1.45-1.087a.249.249 0 0 0-.3 0L5.4 15.7a.25.25 0 0 1-.4-.2Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M3 2.75A2.75 2.75 0 0 1 5.75 0h14.5a.75.75 0 0 1 .75.75v20.5a.75.75 0 0 1-.75.75h-6a.75.75 0 0 1 0-1.5h5.25v-4H6A1.5 1.5 0 0 0 4.5 18v.75c0 .716.43 1.334 1.05 1.605a.75.75 0 0 1-.6 1.374A3.251 3.251 0 0 1 3 18.75ZM19.5 1.5H5.75c-.69 0-1.25.56-1.25 1.25v12.651A2.989 2.989 0 0 1 6 15h13.5Z',
+      'M7 18.25a.25.25 0 0 1 .25-.25h5a.25.25 0 0 1 .25.25v5.01a.25.25 0 0 1-.397.201l-2.206-1.604a.25.25 0 0 0-.294 0L7.397 23.46a.25.25 0 0 1-.397-.2v-5.01Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const repoClone: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M3.5 0A2.5 2.5 0 0 0 1 2.5v9A2.5 2.5 0 0 0 3.5 14h2.75a.75.75 0 0 0 0-1.5H3.5a1 1 0 0 1 0-2h2.75a.75.75 0 0 0 0-1.5H3.5c-.356 0-.694.074-1 .208V2.5a1 1 0 0 1 1-1h8v2.75a.75.75 0 0 0 1.5 0V.75a.75.75 0 0 0-.75-.75H3.5Z',
+      'M8 8.058C8 7.023 8.75 6 9.887 6h5.363a.75.75 0 0 1 .75.75v8.5a.75.75 0 0 1-.75.75h-5A2.25 2.25 0 0 1 8 13.75Zm6.5 3.442v-4H9.887c-.07 0-.156.031-.238.125a.663.663 0 0 0-.149.433v3.57c.235-.083.487-.128.75-.128Zm-5 2.25c0 .414.336.75.75.75h4.25V13h-4.25a.75.75 0 0 0-.75.75Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M4.375.375a2.5 2.5 0 0 0-2.5 2.5v15.25a2.5 2.5 0 0 0 2.5 2.5h5.187a.75.75 0 1 0 0-1.5H4.375a1 1 0 0 1-1-1v-1.75a1 1 0 0 1 1-1h5.687a.75.75 0 1 0 0-1.5H4.375c-.356 0-.694.074-1 .208V2.875a1 1 0 0 1 1-1h13.25v5.25a.75.75 0 0 0 1.5 0v-6a.75.75 0 0 0-.75-.75h-14Z',
+      'M12.375 12.087c0-1.396 1.005-2.712 2.456-2.712h8.044a.75.75 0 0 1 .75.75v12.75a.75.75 0 0 1-.75.75h-7.5a3 3 0 0 1-3-3Zm9.75 5.538v-6.75h-7.294c-.433 0-.956.441-.956 1.212v5.939a2.989 2.989 0 0 1 1.5-.401Zm-8.25 3a1.5 1.5 0 0 0 1.5 1.5h6.75v-3h-6.75a1.5 1.5 0 0 0-1.5 1.5Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const repoDeleted: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M1 2.5A2.5 2.5 0 0 1 3.5 0h8.75a.75.75 0 0 1 .75.75v7.5a.75.75 0 0 1-1.5 0V1.5h-8a1 1 0 0 0-1 1v6.708A2.492 2.492 0 0 1 3.5 9h4.75a.75.75 0 0 1 0 1.5H3.5a1 1 0 1 0 0 2h4.75a.75.75 0 0 1 0 1.5H3.5A2.5 2.5 0 0 1 1 11.5v-9Z',
+      'M11.28 10.22a.75.75 0 1 0-1.06 1.06L11.94 13l-1.72 1.72a.75.75 0 1 0 1.06 1.06L13 14.06l1.72 1.72a.75.75 0 1 0 1.06-1.06L14.06 13l1.72-1.72a.75.75 0 1 0-1.06-1.06L13 11.94l-1.72-1.72Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const repoForked: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M5 5.372v.878c0 .414.336.75.75.75h4.5a.75.75 0 0 0 .75-.75v-.878a2.25 2.25 0 1 1 1.5 0v.878a2.25 2.25 0 0 1-2.25 2.25h-1.5v2.128a2.251 2.251 0 1 1-1.5 0V8.5h-1.5A2.25 2.25 0 0 1 3.5 6.25v-.878a2.25 2.25 0 1 1 1.5 0ZM5 3.25a.75.75 0 1 0-1.5 0 .75.75 0 0 0 1.5 0Zm6.75.75a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5Zm-3 8.75a.75.75 0 1 0-1.5 0 .75.75 0 0 0 1.5 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M8.75 19.25a3.25 3.25 0 1 1 6.5 0 3.25 3.25 0 0 1-6.5 0ZM15 4.75a3.25 3.25 0 1 1 6.5 0 3.25 3.25 0 0 1-6.5 0Zm-12.5 0a3.25 3.25 0 1 1 6.5 0 3.25 3.25 0 0 1-6.5 0ZM5.75 6.5a1.75 1.75 0 1 0-.001-3.501A1.75 1.75 0 0 0 5.75 6.5ZM12 21a1.75 1.75 0 1 0-.001-3.501A1.75 1.75 0 0 0 12 21Zm6.25-14.5a1.75 1.75 0 1 0-.001-3.501A1.75 1.75 0 0 0 18.25 6.5Z',
+      'M6.5 7.75v1A2.25 2.25 0 0 0 8.75 11h6.5a2.25 2.25 0 0 0 2.25-2.25v-1H19v1a3.75 3.75 0 0 1-3.75 3.75h-6.5A3.75 3.75 0 0 1 5 8.75v-1Z',
+      'M11.25 16.25v-5h1.5v5h-1.5Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const repoLocked: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M1 2.5A2.5 2.5 0 0 1 3.5 0h8.75a.75.75 0 0 1 .75.75v3.5a.75.75 0 0 1-1.5 0V1.5h-8a1 1 0 0 0-1 1v6.708A2.492 2.492 0 0 1 3.5 9h2.75a.75.75 0 0 1 0 1.5H3.5a1 1 0 1 0 0 2h2.75a.75.75 0 0 1 0 1.5H3.5A2.5 2.5 0 0 1 1 11.5v-9Z',
+      'M9 10.168V9a3 3 0 1 1 6 0v1.168c.591.281 1 .884 1 1.582v2.5A1.75 1.75 0 0 1 14.25 16h-4.5A1.75 1.75 0 0 1 8 14.25v-2.5c0-.698.409-1.3 1-1.582ZM13.5 10V9a1.5 1.5 0 0 0-3 0v1Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M2 2.75A2.75 2.75 0 0 1 4.75 0h14.5a.75.75 0 0 1 .75.75v8a.75.75 0 0 1-1.5 0V1.5H4.75c-.69 0-1.25.56-1.25 1.25v12.651A2.987 2.987 0 0 1 5 15h6.25a.75.75 0 0 1 0 1.5H5A1.5 1.5 0 0 0 3.5 18v1.25c0 .69.56 1.25 1.25 1.25h6a.75.75 0 0 1 0 1.5h-6A2.75 2.75 0 0 1 2 19.25V2.75Z',
+      'M15 14.5a3.5 3.5 0 1 1 7 0V16h.25c.966 0 1.75.784 1.75 1.75v4.5A1.75 1.75 0 0 1 22.25 24h-7.5A1.75 1.75 0 0 1 13 22.25v-4.5c0-.966.784-1.75 1.75-1.75H15Zm3.5-2a2 2 0 0 0-2 2V16h4v-1.5a2 2 0 0 0-2-2Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const repoPull: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M1 2.5A2.5 2.5 0 0 1 3.5 0h8.75a.75.75 0 0 1 .75.75V6a.75.75 0 0 1-1.5 0V1.5h-8a1 1 0 0 0-1 1v6.708A2.486 2.486 0 0 1 3.5 9h3a.75.75 0 0 1 0 1.5h-3a1 1 0 0 0 0 2h3a.75.75 0 0 1 0 1.5h-3A2.5 2.5 0 0 1 1 11.5v-9Z',
+      'M12.21 13.479a.75.75 0 1 0 1.061 1.061l2.504-2.505a.75.75 0 0 0 0-1.061L13.271 8.47a.75.75 0 0 0-1.061 1.06l1.224 1.225H8.75a.75.75 0 1 0 0 1.5h4.685l-1.225 1.224Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M1.875 2.875a2.5 2.5 0 0 1 2.5-2.5h14a.75.75 0 0 1 .75.75v9.125a.75.75 0 0 1-1.5 0V1.875H4.375a1 1 0 0 0-1 1v11.208a2.486 2.486 0 0 1 1-.208h5.937a.75.75 0 1 1 0 1.5H4.375a1 1 0 0 0-1 1v1.75a1 1 0 0 0 1 1h6a.75.75 0 0 1 0 1.5h-6a2.5 2.5 0 0 1-2.5-2.5V2.875Z',
+      'M18.643 20.484a.749.749 0 1 0 1.061 1.06l3.757-3.757a.75.75 0 0 0 0-1.06l-3.757-3.757a.75.75 0 0 0-1.061 1.06l2.476 2.477H13a.75.75 0 0 0 0 1.5h8.12l-2.477 2.477Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const repoPush: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M1 2.5A2.5 2.5 0 0 1 3.5 0h8.75a.75.75 0 0 1 .75.75v3.5a.75.75 0 0 1-1.5 0V1.5h-8a1 1 0 0 0-1 1v6.708A2.493 2.493 0 0 1 3.5 9h3.25a.75.75 0 0 1 0 1.5H3.5a1 1 0 0 0 0 2h5.75a.75.75 0 0 1 0 1.5H3.5A2.5 2.5 0 0 1 1 11.5Zm13.23 7.79h-.001l-1.224-1.224v6.184a.75.75 0 0 1-1.5 0V9.066L10.28 10.29a.75.75 0 0 1-1.06-1.061l2.505-2.504a.75.75 0 0 1 1.06 0L15.29 9.23a.751.751 0 0 1-.018 1.042.751.751 0 0 1-1.042.018Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M4.75 0A2.75 2.75 0 0 0 2 2.75v16.5A2.75 2.75 0 0 0 4.75 22h11a.75.75 0 0 0 0-1.5h-11c-.69 0-1.25-.56-1.25-1.25V18A1.5 1.5 0 0 1 5 16.5h7.25a.75.75 0 0 0 0-1.5H5c-.546 0-1.059.146-1.5.401V2.75c0-.69.56-1.25 1.25-1.25H18.5v7a.75.75 0 0 0 1.5 0V.75a.75.75 0 0 0-.75-.75H4.75Z',
+      'm20 13.903 2.202 2.359a.75.75 0 0 0 1.096-1.024l-3.5-3.75a.75.75 0 0 0-1.096 0l-3.5 3.75a.75.75 0 1 0 1.096 1.024l2.202-2.36v9.348a.75.75 0 0 0 1.5 0v-9.347Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const repoTemplate: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M13.25 8a.75.75 0 0 1 .75.75v4.5a.75.75 0 0 1-.75.75h-2.5a.75.75 0 0 1 0-1.5h1.75v-2h-.75a.75.75 0 0 1 0-1.5h.75v-.25a.75.75 0 0 1 .75-.75ZM5 12.25a.25.25 0 0 1 .25-.25h3.5a.25.25 0 0 1 .25.25v3.25a.25.25 0 0 1-.4.2l-1.45-1.087a.249.249 0 0 0-.3 0L5.4 15.7a.25.25 0 0 1-.4-.2ZM2.75 8a.75.75 0 0 1 .75.75v.268c.083-.012.166-.018.25-.018h.5a.75.75 0 0 1 0 1.5h-.5a.25.25 0 0 0-.25.25v.75c0 .28.114.532.3.714a.75.75 0 1 1-1.05 1.072A2.495 2.495 0 0 1 2 11.5V8.75A.75.75 0 0 1 2.75 8ZM11 .75a.75.75 0 0 1 .75-.75h1.5a.75.75 0 0 1 .75.75v1.5a.75.75 0 0 1-1.5 0V1.5h-.75A.75.75 0 0 1 11 .75Zm-5 0A.75.75 0 0 1 6.75 0h2.5a.75.75 0 0 1 0 1.5h-2.5A.75.75 0 0 1 6 .75Zm0 9A.75.75 0 0 1 6.75 9h2.5a.75.75 0 0 1 0 1.5h-2.5A.75.75 0 0 1 6 9.75ZM4.992.662a.75.75 0 0 1-.636.848c-.436.063-.783.41-.846.846a.751.751 0 0 1-1.485-.212A2.501 2.501 0 0 1 4.144.025a.75.75 0 0 1 .848.637ZM2.75 4a.75.75 0 0 1 .75.75v1.5a.75.75 0 0 1-1.5 0v-1.5A.75.75 0 0 1 2.75 4Zm10.5 0a.75.75 0 0 1 .75.75v1.5a.75.75 0 0 1-1.5 0v-1.5a.75.75 0 0 1 .75-.75Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M5.75 0A2.75 2.75 0 0 0 3 2.75v1a.75.75 0 0 0 1.5 0v-1c0-.69.56-1.25 1.25-1.25h1a.75.75 0 0 0 0-1.5h-1Zm4 0a.75.75 0 0 0 0 1.5h4.5a.75.75 0 0 0 0-1.5h-4.5Zm7.5 0a.75.75 0 0 0 0 1.5h2.25v2.25a.75.75 0 0 0 1.5 0v-3a.75.75 0 0 0-.75-.75h-3ZM4.5 6.5a.75.75 0 0 0-1.5 0v3.75a.75.75 0 0 0 1.5 0V6.5Zm16.5 0a.75.75 0 0 0-1.5 0v3.75a.75.75 0 0 0 1.5 0V6.5ZM4.5 13.25a.75.75 0 0 0-1.5 0v5.5a3.25 3.25 0 0 0 1.95 2.98.75.75 0 1 0 .6-1.375A1.75 1.75 0 0 1 4.5 18.75V18A1.5 1.5 0 0 1 6 16.5h.75a.75.75 0 0 0 0-1.5H6c-.546 0-1.059.146-1.5.401V13.25Zm16.5 0a.75.75 0 0 0-1.5 0V15h-2.25a.75.75 0 0 0 0 1.5h2.25v4h-5.25a.75.75 0 0 0 0 1.5h6a.75.75 0 0 0 .75-.75v-8ZM9.75 15a.75.75 0 0 0 0 1.5h4.5a.75.75 0 0 0 0-1.5h-4.5Zm-2.353 8.461A.25.25 0 0 1 7 23.26v-5.01a.25.25 0 0 1 .25-.25h5a.25.25 0 0 1 .25.25v5.01a.25.25 0 0 1-.397.201l-2.206-1.604a.25.25 0 0 0-.294 0L7.397 23.46Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const report: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M0 1.75C0 .784.784 0 1.75 0h12.5C15.216 0 16 .784 16 1.75v9.5A1.75 1.75 0 0 1 14.25 13H8.06l-2.573 2.573A1.458 1.458 0 0 1 3 14.543V13H1.75A1.75 1.75 0 0 1 0 11.25Zm1.75-.25a.25.25 0 0 0-.25.25v9.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h6.5a.25.25 0 0 0 .25-.25v-9.5a.25.25 0 0 0-.25-.25Zm7 2.25v2.5a.75.75 0 0 1-1.5 0v-2.5a.75.75 0 0 1 1.5 0ZM9 9a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M1.5 4.25c0-.966.784-1.75 1.75-1.75h17.5c.966 0 1.75.784 1.75 1.75v12.5a1.75 1.75 0 0 1-1.75 1.75h-9.586a.25.25 0 0 0-.177.073l-3.5 3.5A1.458 1.458 0 0 1 5 21.043V18.5H3.25a1.75 1.75 0 0 1-1.75-1.75ZM3.25 4a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h2.5a.75.75 0 0 1 .75.75v3.19l3.427-3.427A1.75 1.75 0 0 1 11.164 17h9.586a.25.25 0 0 0 .25-.25V4.25a.25.25 0 0 0-.25-.25ZM12 6a.75.75 0 0 1 .75.75v4a.75.75 0 0 1-1.5 0v-4A.75.75 0 0 1 12 6Zm0 9a1 1 0 1 1 0-2 1 1 0 0 1 0 2Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const rocket: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M14.064 0h.186C15.216 0 16 .784 16 1.75v.186a8.752 8.752 0 0 1-2.564 6.186l-.458.459c-.314.314-.641.616-.979.904v3.207c0 .608-.315 1.172-.833 1.49l-2.774 1.707a.749.749 0 0 1-1.11-.418l-.954-3.102a1.214 1.214 0 0 1-.145-.125L3.754 9.816a1.218 1.218 0 0 1-.124-.145L.528 8.717a.749.749 0 0 1-.418-1.11l1.71-2.774A1.748 1.748 0 0 1 3.31 4h3.204c.288-.338.59-.665.904-.979l.459-.458A8.749 8.749 0 0 1 14.064 0ZM8.938 3.623h-.002l-.458.458c-.76.76-1.437 1.598-2.02 2.5l-1.5 2.317 2.143 2.143 2.317-1.5c.902-.583 1.74-1.26 2.499-2.02l.459-.458a7.25 7.25 0 0 0 2.123-5.127V1.75a.25.25 0 0 0-.25-.25h-.186a7.249 7.249 0 0 0-5.125 2.123ZM3.56 14.56c-.732.732-2.334 1.045-3.005 1.148a.234.234 0 0 1-.201-.064.234.234 0 0 1-.064-.201c.103-.671.416-2.273 1.15-3.003a1.502 1.502 0 1 1 2.12 2.12Zm6.94-3.935c-.088.06-.177.118-.266.175l-2.35 1.521.548 1.783 1.949-1.2a.25.25 0 0 0 .119-.213ZM3.678 8.116 5.2 5.766c.058-.09.117-.178.176-.266H3.309a.25.25 0 0 0-.213.119l-1.2 1.95ZM12 5a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M20.322.75h1.176a1.75 1.75 0 0 1 1.75 1.749v1.177a10.75 10.75 0 0 1-2.925 7.374l-1.228 1.304a23.699 23.699 0 0 1-1.596 1.542v5.038c0 .615-.323 1.184-.85 1.5l-4.514 2.709a.75.75 0 0 1-1.12-.488l-.963-4.572a1.305 1.305 0 0 1-.14-.129L8.04 15.96l-1.994-1.873a1.305 1.305 0 0 1-.129-.14l-4.571-.963a.75.75 0 0 1-.49-1.12l2.71-4.514c.316-.527.885-.85 1.5-.85h5.037a23.668 23.668 0 0 1 1.542-1.594l1.304-1.23A10.753 10.753 0 0 1 20.321.75Zm-6.344 4.018v-.001l-1.304 1.23a22.275 22.275 0 0 0-3.255 3.851l-2.193 3.29 1.859 1.744a.545.545 0 0 1 .034.034l1.743 1.858 3.288-2.192a22.263 22.263 0 0 0 3.854-3.257l1.228-1.303a9.251 9.251 0 0 0 2.517-6.346V2.5a.25.25 0 0 0-.25-.25h-1.177a9.252 9.252 0 0 0-6.344 2.518ZM6.5 21c-1.209 1.209-3.901 1.445-4.743 1.49a.236.236 0 0 1-.18-.067.236.236 0 0 1-.067-.18c.045-.842.281-3.534 1.49-4.743.9-.9 2.6-.9 3.5 0 .9.9.9 2.6 0 3.5Zm-.592-8.588L8.17 9.017c.23-.346.47-.685.717-1.017H5.066a.25.25 0 0 0-.214.121l-2.167 3.612ZM16 15.112c-.333.248-.672.487-1.018.718l-3.393 2.262.678 3.223 3.612-2.167a.25.25 0 0 0 .121-.214ZM17.5 8a1.5 1.5 0 1 1-3.001-.001A1.5 1.5 0 0 1 17.5 8Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const rows: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M16 10.75v2.5A1.75 1.75 0 0 1 14.25 15H1.75A1.75 1.75 0 0 1 0 13.25v-2.5C0 9.784.784 9 1.75 9h12.5c.966 0 1.75.784 1.75 1.75Zm0-8v2.5A1.75 1.75 0 0 1 14.25 7H1.75A1.75 1.75 0 0 1 0 5.25v-2.5C0 1.784.784 1 1.75 1h12.5c.966 0 1.75.784 1.75 1.75Zm-1.75-.25H1.75a.25.25 0 0 0-.25.25v2.5c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25v-2.5a.25.25 0 0 0-.25-.25Zm0 8H1.75a.25.25 0 0 0-.25.25v2.5c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25v-2.5a.25.25 0 0 0-.25-.25Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M22 3.75v5.5A1.75 1.75 0 0 1 20.25 11H3.75A1.75 1.75 0 0 1 2 9.25v-5.5C2 2.784 2.784 2 3.75 2h16.5c.966 0 1.75.784 1.75 1.75Zm0 11v5.5A1.75 1.75 0 0 1 20.25 22H3.75A1.75 1.75 0 0 1 2 20.25v-5.5c0-.966.784-1.75 1.75-1.75h16.5c.966 0 1.75.784 1.75 1.75ZM20.25 3.5H3.75a.25.25 0 0 0-.25.25v5.5c0 .138.112.25.25.25h16.5a.25.25 0 0 0 .25-.25v-5.5a.25.25 0 0 0-.25-.25Zm0 11H3.75a.25.25 0 0 0-.25.25v5.5c0 .138.112.25.25.25h16.5a.25.25 0 0 0 .25-.25v-5.5a.25.25 0 0 0-.25-.25Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const rss: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M2.002 2.725a.75.75 0 0 1 .797-.699C8.79 2.42 13.58 7.21 13.974 13.201a.75.75 0 0 1-1.497.098 10.502 10.502 0 0 0-9.776-9.776.747.747 0 0 1-.7-.798ZM2.84 7.05h-.002a7.002 7.002 0 0 1 6.113 6.111.75.75 0 0 1-1.49.178 5.503 5.503 0 0 0-4.8-4.8.75.75 0 0 1 .179-1.489ZM2 13a1 1 0 1 1 2 0 1 1 0 0 1-2 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M3.5 3.25a.75.75 0 0 1 .75-.75C14.053 2.5 22 10.447 22 20.25a.75.75 0 0 1-1.5 0C20.5 11.275 13.225 4 4.25 4a.75.75 0 0 1-.75-.75Zm.75 6.25C10.187 9.5 15 14.313 15 20.25a.75.75 0 0 1-1.5 0A9.25 9.25 0 0 0 4.25 11a.75.75 0 0 1 0-1.5ZM3.5 19a2 2 0 1 1 3.999-.001A2 2 0 0 1 3.5 19Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const ruby: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M3.637 2.291A.748.748 0 0 1 4.23 2h7.54c.232 0 .451.107.593.291l3.48 4.5a.75.75 0 0 1-.072.999l-7.25 7a.75.75 0 0 1-1.042 0l-7.25-7a.75.75 0 0 1-.072-.999ZM4.598 3.5 1.754 7.177 8 13.207l6.246-6.03L11.402 3.5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M5.873 3.26A.748.748 0 0 1 6.44 3h11.31c.223 0 .434.099.576.27l5 6a.75.75 0 0 1-.028.992l-10.75 11.5a.75.75 0 0 1-1.096 0l-10.75-11.5a.75.75 0 0 1-.02-1.003l5.19-6Zm.91 1.24L2.258 9.73 12 20.153l9.75-10.43L17.399 4.5Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const screenFull: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M1.75 10a.75.75 0 0 1 .75.75v2.5c0 .138.112.25.25.25h2.5a.75.75 0 0 1 0 1.5h-2.5A1.75 1.75 0 0 1 1 13.25v-2.5a.75.75 0 0 1 .75-.75Zm12.5 0a.75.75 0 0 1 .75.75v2.5A1.75 1.75 0 0 1 13.25 15h-2.5a.75.75 0 0 1 0-1.5h2.5a.25.25 0 0 0 .25-.25v-2.5a.75.75 0 0 1 .75-.75ZM2.75 2.5a.25.25 0 0 0-.25.25v2.5a.75.75 0 0 1-1.5 0v-2.5C1 1.784 1.784 1 2.75 1h2.5a.75.75 0 0 1 0 1.5ZM10 1.75a.75.75 0 0 1 .75-.75h2.5c.966 0 1.75.784 1.75 1.75v2.5a.75.75 0 0 1-1.5 0v-2.5a.25.25 0 0 0-.25-.25h-2.5a.75.75 0 0 1-.75-.75Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M3.75 15a.75.75 0 0 1 .75.75v3.5c0 .138.112.25.25.25h3.5a.75.75 0 0 1 0 1.5h-3.5A1.75 1.75 0 0 1 3 19.25v-3.5a.75.75 0 0 1 .75-.75Zm16.5 0a.75.75 0 0 1 .75.75v3.5A1.75 1.75 0 0 1 19.25 21h-3.5a.75.75 0 0 1 0-1.5h3.5a.25.25 0 0 0 .25-.25v-3.5a.75.75 0 0 1 .75-.75ZM4.75 4.5a.25.25 0 0 0-.25.25v3.5a.75.75 0 0 1-1.5 0v-3.5C3 3.784 3.784 3 4.75 3h3.5a.75.75 0 0 1 0 1.5ZM15 3.75a.75.75 0 0 1 .75-.75h3.5c.966 0 1.75.784 1.75 1.75v3.5a.75.75 0 0 1-1.5 0v-3.5a.25.25 0 0 0-.25-.25h-3.5a.75.75 0 0 1-.75-.75Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const screenNormal: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M10.75 1a.75.75 0 0 1 .75.75v2.5c0 .138.112.25.25.25h2.5a.75.75 0 0 1 0 1.5h-2.5A1.75 1.75 0 0 1 10 4.25v-2.5a.75.75 0 0 1 .75-.75Zm-5.5 0a.75.75 0 0 1 .75.75v2.5A1.75 1.75 0 0 1 4.25 6h-2.5a.75.75 0 0 1 0-1.5h2.5a.25.25 0 0 0 .25-.25v-2.5A.75.75 0 0 1 5.25 1ZM1 10.75a.75.75 0 0 1 .75-.75h2.5c.966 0 1.75.784 1.75 1.75v2.5a.75.75 0 0 1-1.5 0v-2.5a.25.25 0 0 0-.25-.25h-2.5a.75.75 0 0 1-.75-.75Zm9 1c0-.966.784-1.75 1.75-1.75h2.5a.75.75 0 0 1 0 1.5h-2.5a.25.25 0 0 0-.25.25v2.5a.75.75 0 0 1-1.5 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M15.75 3a.75.75 0 0 1 .75.75v3.5c0 .138.112.25.25.25h3.5a.75.75 0 0 1 0 1.5h-3.5A1.75 1.75 0 0 1 15 7.25v-3.5a.75.75 0 0 1 .75-.75Zm-7.5 0a.75.75 0 0 1 .75.75v3.5A1.75 1.75 0 0 1 7.25 9h-3.5a.75.75 0 0 1 0-1.5h3.5a.25.25 0 0 0 .25-.25v-3.5A.75.75 0 0 1 8.25 3ZM3 15.75a.75.75 0 0 1 .75-.75h3.5c.966 0 1.75.784 1.75 1.75v3.5a.75.75 0 0 1-1.5 0v-3.5a.25.25 0 0 0-.25-.25h-3.5a.75.75 0 0 1-.75-.75Zm12 1c0-.966.784-1.75 1.75-1.75h3.5a.75.75 0 0 1 0 1.5h-3.5a.25.25 0 0 0-.25.25v3.5a.75.75 0 0 1-1.5 0Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const search: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M10.68 11.74a6 6 0 0 1-7.922-8.982 6 6 0 0 1 8.982 7.922l3.04 3.04a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215ZM11.5 7a4.499 4.499 0 1 0-8.997 0A4.499 4.499 0 0 0 11.5 7Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M10.25 2a8.25 8.25 0 0 1 6.34 13.53l5.69 5.69a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215l-5.69-5.69A8.25 8.25 0 1 1 10.25 2ZM3.5 10.25a6.75 6.75 0 1 0 13.5 0 6.75 6.75 0 0 0-13.5 0Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const server: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M1.75 1h12.5c.966 0 1.75.784 1.75 1.75v4c0 .372-.116.717-.314 1 .198.283.314.628.314 1v4a1.75 1.75 0 0 1-1.75 1.75H1.75A1.75 1.75 0 0 1 0 12.75v-4c0-.358.109-.707.314-1a1.739 1.739 0 0 1-.314-1v-4C0 1.784.784 1 1.75 1ZM1.5 2.75v4c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25v-4a.25.25 0 0 0-.25-.25H1.75a.25.25 0 0 0-.25.25Zm.25 5.75a.25.25 0 0 0-.25.25v4c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25v-4a.25.25 0 0 0-.25-.25ZM7 4.75A.75.75 0 0 1 7.75 4h4.5a.75.75 0 0 1 0 1.5h-4.5A.75.75 0 0 1 7 4.75ZM7.75 10h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1 0-1.5ZM3 4.75A.75.75 0 0 1 3.75 4h.5a.75.75 0 0 1 0 1.5h-.5A.75.75 0 0 1 3 4.75ZM3.75 10h.5a.75.75 0 0 1 0 1.5h-.5a.75.75 0 0 1 0-1.5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M10.75 6.5a.75.75 0 0 0 0 1.5h6.5a.75.75 0 0 0 0-1.5h-6.5ZM6 7.25a.75.75 0 0 1 .75-.75h.5a.75.75 0 0 1 0 1.5h-.5A.75.75 0 0 1 6 7.25Zm4 9a.75.75 0 0 1 .75-.75h6.5a.75.75 0 0 1 0 1.5h-6.5a.75.75 0 0 1-.75-.75Zm-3.25-.75a.75.75 0 0 0 0 1.5h.5a.75.75 0 0 0 0-1.5h-.5Z',
+      'M3.25 2h17.5c.966 0 1.75.784 1.75 1.75v7c0 .372-.116.716-.314 1 .198.284.314.628.314 1v7a1.75 1.75 0 0 1-1.75 1.75H3.25a1.75 1.75 0 0 1-1.75-1.75v-7c0-.358.109-.707.314-1a1.741 1.741 0 0 1-.314-1v-7C1.5 2.784 2.284 2 3.25 2Zm0 10.5a.25.25 0 0 0-.25.25v7c0 .138.112.25.25.25h17.5a.25.25 0 0 0 .25-.25v-7a.25.25 0 0 0-.25-.25Zm0-1.5h17.5a.25.25 0 0 0 .25-.25v-7a.25.25 0 0 0-.25-.25H3.25a.25.25 0 0 0-.25.25v7c0 .138.112.25.25.25Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const share: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M3.75 6.5a.25.25 0 0 0-.25.25v6.5c0 .138.112.25.25.25h8.5a.25.25 0 0 0 .25-.25v-6.5a.25.25 0 0 0-.25-.25h-1a.75.75 0 0 1 0-1.5h1c.966 0 1.75.784 1.75 1.75v6.5A1.75 1.75 0 0 1 12.25 15h-8.5A1.75 1.75 0 0 1 2 13.25v-6.5C2 5.784 2.784 5 3.75 5h1a.75.75 0 0 1 0 1.5ZM7.823.177a.25.25 0 0 1 .354 0l2.896 2.896a.25.25 0 0 1-.177.427H8.75v5.75a.75.75 0 0 1-1.5 0V3.5H5.104a.25.25 0 0 1-.177-.427Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M5.5 9.75v10.5c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25V9.75a.25.25 0 0 0-.25-.25h-2.5a.75.75 0 0 1 0-1.5h2.5c.966 0 1.75.784 1.75 1.75v10.5A1.75 1.75 0 0 1 18.25 22H5.75A1.75 1.75 0 0 1 4 20.25V9.75C4 8.784 4.784 8 5.75 8h2.5a.75.75 0 0 1 0 1.5h-2.5a.25.25 0 0 0-.25.25Zm7.03-8.53 3.25 3.25a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215l-1.97-1.97v10.69a.75.75 0 0 1-1.5 0V3.56L9.28 5.53a.751.751 0 0 1-1.042-.018.751.751 0 0 1-.018-1.042l3.25-3.25a.75.75 0 0 1 1.06 0Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const shareAndroid: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M15 3a3 3 0 0 1-5.175 2.066l-3.92 2.179a2.994 2.994 0 0 1 0 1.51l3.92 2.179a3 3 0 1 1-.73 1.31l-3.92-2.178a3 3 0 1 1 0-4.133l3.92-2.178A3 3 0 1 1 15 3Zm-1.5 10a1.5 1.5 0 1 0-3.001.001A1.5 1.5 0 0 0 13.5 13Zm-9-5a1.5 1.5 0 1 0-3.001.001A1.5 1.5 0 0 0 4.5 8Zm9-5a1.5 1.5 0 1 0-3.001.001A1.5 1.5 0 0 0 13.5 3Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M20 5.5a3.498 3.498 0 0 1-6.062 2.385l-5.112 3.021a3.498 3.498 0 0 1 0 2.188l5.112 3.021a3.5 3.5 0 1 1-.764 1.29l-5.112-3.02a3.499 3.499 0 1 1-3.843-5.642 3.499 3.499 0 0 1 3.843.872l5.112-3.021A3.5 3.5 0 1 1 20 5.5Zm-1.5 13a2 2 0 1 0-3.999-.001 2 2 0 0 0 3.999.001Zm0-13a2 2 0 1 0-3.999-.001A2 2 0 0 0 18.5 5.5ZM5.5 14a2 2 0 1 0 .001-3.999A2 2 0 0 0 5.5 14Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const shield: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M7.467.133a1.748 1.748 0 0 1 1.066 0l5.25 1.68A1.75 1.75 0 0 1 15 3.48V7c0 1.566-.32 3.182-1.303 4.682-.983 1.498-2.585 2.813-5.032 3.855a1.697 1.697 0 0 1-1.33 0c-2.447-1.042-4.049-2.357-5.032-3.855C1.32 10.182 1 8.566 1 7V3.48a1.75 1.75 0 0 1 1.217-1.667Zm.61 1.429a.25.25 0 0 0-.153 0l-5.25 1.68a.25.25 0 0 0-.174.238V7c0 1.358.275 2.666 1.057 3.86.784 1.194 2.121 2.34 4.366 3.297a.196.196 0 0 0 .154 0c2.245-.956 3.582-2.104 4.366-3.298C13.225 9.666 13.5 8.36 13.5 7V3.48a.251.251 0 0 0-.174-.237l-5.25-1.68ZM8.75 4.75v3a.75.75 0 0 1-1.5 0v-3a.75.75 0 0 1 1.5 0ZM9 10.5a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M13 15.5a1 1 0 1 1-2 0 1 1 0 0 1 2 0Zm-.25-8.25a.75.75 0 0 0-1.5 0v4.5a.75.75 0 0 0 1.5 0v-4.5Z',
+      'M11.46.637a1.748 1.748 0 0 1 1.08 0l8.25 2.675A1.75 1.75 0 0 1 22 4.976V10c0 6.19-3.77 10.705-9.401 12.83a1.704 1.704 0 0 1-1.198 0C5.771 20.704 2 16.19 2 10V4.976c0-.76.49-1.43 1.21-1.664Zm.617 1.426a.253.253 0 0 0-.154 0L3.673 4.74a.25.25 0 0 0-.173.237V10c0 5.461 3.28 9.483 8.43 11.426a.199.199 0 0 0 .14 0C17.22 19.483 20.5 15.46 20.5 10V4.976a.25.25 0 0 0-.173-.237Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const shieldCheck: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'm8.533.133 5.25 1.68A1.75 1.75 0 0 1 15 3.48V7c0 1.566-.32 3.182-1.303 4.682-.983 1.498-2.585 2.813-5.032 3.855a1.697 1.697 0 0 1-1.33 0c-2.447-1.042-4.049-2.357-5.032-3.855C1.32 10.182 1 8.566 1 7V3.48a1.75 1.75 0 0 1 1.217-1.667l5.25-1.68a1.748 1.748 0 0 1 1.066 0Zm-.61 1.429.001.001-5.25 1.68a.251.251 0 0 0-.174.237V7c0 1.36.275 2.666 1.057 3.859.784 1.194 2.121 2.342 4.366 3.298a.196.196 0 0 0 .154 0c2.245-.957 3.582-2.103 4.366-3.297C13.225 9.666 13.5 8.358 13.5 7V3.48a.25.25 0 0 0-.174-.238l-5.25-1.68a.25.25 0 0 0-.153 0ZM11.28 6.28l-3.5 3.5a.75.75 0 0 1-1.06 0l-1.5-1.5a.749.749 0 0 1 .326-1.275.749.749 0 0 1 .734.215l.97.97 2.97-2.97a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M16.53 9.78a.75.75 0 0 0-1.06-1.06L11 13.19l-1.97-1.97a.75.75 0 0 0-1.06 1.06l2.5 2.5a.75.75 0 0 0 1.06 0l5-5Z',
+      'm12.54.637 8.25 2.675A1.75 1.75 0 0 1 22 4.976V10c0 6.19-3.771 10.704-9.401 12.83a1.704 1.704 0 0 1-1.198 0C5.77 20.705 2 16.19 2 10V4.976c0-.758.489-1.43 1.21-1.664L11.46.637a1.748 1.748 0 0 1 1.08 0Zm-.617 1.426-8.25 2.676a.249.249 0 0 0-.173.237V10c0 5.46 3.28 9.483 8.43 11.426a.199.199 0 0 0 .14 0C17.22 19.483 20.5 15.461 20.5 10V4.976a.25.25 0 0 0-.173-.237l-8.25-2.676a.253.253 0 0 0-.154 0Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const shieldLock: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'm8.533.133 5.25 1.68A1.75 1.75 0 0 1 15 3.48V7c0 1.566-.32 3.182-1.303 4.682-.983 1.498-2.585 2.813-5.032 3.855a1.697 1.697 0 0 1-1.33 0c-2.447-1.042-4.049-2.357-5.032-3.855C1.32 10.182 1 8.566 1 7V3.48a1.75 1.75 0 0 1 1.217-1.667l5.25-1.68a1.748 1.748 0 0 1 1.066 0Zm-.61 1.429.001.001-5.25 1.68a.251.251 0 0 0-.174.237V7c0 1.36.275 2.666 1.057 3.859.784 1.194 2.121 2.342 4.366 3.298a.196.196 0 0 0 .154 0c2.245-.957 3.582-2.103 4.366-3.297C13.225 9.666 13.5 8.358 13.5 7V3.48a.25.25 0 0 0-.174-.238l-5.25-1.68a.25.25 0 0 0-.153 0ZM9.5 6.5c0 .536-.286 1.032-.75 1.3v2.45a.75.75 0 0 1-1.5 0V7.8A1.5 1.5 0 1 1 9.5 6.5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M11.46 1.137a1.748 1.748 0 0 1 1.08 0l8.25 2.675A1.75 1.75 0 0 1 22 5.476V10.5c0 6.19-3.77 10.705-9.401 12.83a1.704 1.704 0 0 1-1.198 0C5.771 21.204 2 16.69 2 10.5V5.476c0-.76.49-1.43 1.21-1.664Zm.617 1.426a.253.253 0 0 0-.154 0L3.673 5.24a.25.25 0 0 0-.173.237V10.5c0 5.461 3.28 9.483 8.43 11.426a.199.199 0 0 0 .14 0c5.15-1.943 8.43-5.965 8.43-11.426V5.476a.25.25 0 0 0-.173-.237ZM13 12.232V15a1 1 0 0 1-2 0v-2.768a2 2 0 1 1 2 0Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const shieldSlash: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8.533.133a1.75 1.75 0 0 0-1.066 0l-2.091.67a.75.75 0 0 0 .457 1.428l2.09-.67a.25.25 0 0 1 .153 0l5.25 1.68a.25.25 0 0 1 .174.239V7c0 .233-.008.464-.025.694a.75.75 0 1 0 1.495.112c.02-.27.03-.538.03-.806V3.48a1.75 1.75 0 0 0-1.217-1.667L8.533.133ZM1 2.857l-.69-.5a.75.75 0 1 1 .88-1.214l14.5 10.5a.75.75 0 1 1-.88 1.214l-1.282-.928c-.995 1.397-2.553 2.624-4.864 3.608-.425.181-.905.18-1.329 0-2.447-1.042-4.049-2.356-5.032-3.855C1.32 10.182 1 8.566 1 7Zm1.5 1.086V7c0 1.358.275 2.666 1.057 3.86.784 1.194 2.121 2.34 4.366 3.297.05.02.106.02.153 0 2.127-.905 3.439-1.982 4.237-3.108Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M12.54 1.137a1.748 1.748 0 0 0-1.08 0L6.018 2.905a.75.75 0 1 0 .464 1.427l5.441-1.768a.239.239 0 0 1 .154 0l8.25 2.675a.249.249 0 0 1 .173.237V10.5c0 1.284-.24 2.83-.696 3.971a.75.75 0 1 0 1.392.557C21.74 13.67 22 11.927 22 10.5V5.476a1.75 1.75 0 0 0-1.21-1.664l-8.25-2.675ZM2.017 4.843l-.974-.748a.751.751 0 0 1 .914-1.19l20.5 15.75a.751.751 0 0 1-.914 1.19l-2.012-1.546-.702.852-.008.009a.07.07 0 0 1-.008.01c-1.603 1.821-3.731 3.223-6.214 4.16a1.699 1.699 0 0 1-1.198-.001C5.771 21.205 2 16.689 2 10.5V5c0-.054.006-.107.017-.157ZM3.5 5.982V10.5c0 5.461 3.281 9.483 8.431 11.426a.193.193 0 0 0 .138 0c2.283-.861 4.192-2.131 5.61-3.738l.662-.803Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const shieldX: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'm8.533.133 5.25 1.68A1.75 1.75 0 0 1 15 3.48V7c0 1.566-.32 3.182-1.303 4.682-.983 1.498-2.585 2.813-5.032 3.855a1.697 1.697 0 0 1-1.33 0c-2.447-1.042-4.049-2.357-5.032-3.855C1.32 10.182 1 8.566 1 7V3.48a1.75 1.75 0 0 1 1.217-1.667l5.25-1.68a1.748 1.748 0 0 1 1.066 0Zm-.61 1.429.001.001-5.25 1.68a.251.251 0 0 0-.174.237V7c0 1.36.275 2.666 1.057 3.859.784 1.194 2.121 2.342 4.366 3.298a.196.196 0 0 0 .154 0c2.245-.957 3.582-2.103 4.366-3.297C13.225 9.666 13.5 8.358 13.5 7V3.48a.25.25 0 0 0-.174-.238l-5.25-1.68a.25.25 0 0 0-.153 0ZM6.78 5.22 8 6.44l1.22-1.22a.749.749 0 0 1 1.275.326.749.749 0 0 1-.215.734L9.06 7.5l1.22 1.22a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215L8 8.56 6.78 9.78a.751.751 0 0 1-1.042-.018.751.751 0 0 1-.018-1.042L6.94 7.5 5.72 6.28a.749.749 0 0 1 .326-1.275.749.749 0 0 1 .734.215Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M9.28 7.72a.75.75 0 0 0-1.06 1.06l2.72 2.72-2.72 2.72a.75.75 0 1 0 1.06 1.06L12 12.56l2.72 2.72a.75.75 0 1 0 1.06-1.06l-2.72-2.72 2.72-2.72a.75.75 0 0 0-1.06-1.06L12 10.44 9.28 7.72Z',
+      'm12.54.637 8.25 2.675A1.75 1.75 0 0 1 22 4.976V10c0 6.19-3.771 10.704-9.401 12.83a1.704 1.704 0 0 1-1.198 0C5.77 20.705 2 16.19 2 10V4.976c0-.758.489-1.43 1.21-1.664L11.46.637a1.748 1.748 0 0 1 1.08 0Zm-.617 1.426-8.25 2.676a.249.249 0 0 0-.173.237V10c0 5.46 3.28 9.483 8.43 11.426a.199.199 0 0 0 .14 0C17.22 19.483 20.5 15.461 20.5 10V4.976a.25.25 0 0 0-.173-.237l-8.25-2.676a.253.253 0 0 0-.154 0Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const sidebarCollapse: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M6.823 7.823a.25.25 0 0 1 0 .354l-2.396 2.396A.25.25 0 0 1 4 10.396V5.604a.25.25 0 0 1 .427-.177Z',
+      'M1.75 0h12.5C15.216 0 16 .784 16 1.75v12.5A1.75 1.75 0 0 1 14.25 16H1.75A1.75 1.75 0 0 1 0 14.25V1.75C0 .784.784 0 1.75 0ZM1.5 1.75v12.5c0 .138.112.25.25.25H9.5v-13H1.75a.25.25 0 0 0-.25.25ZM11 14.5h3.25a.25.25 0 0 0 .25-.25V1.75a.25.25 0 0 0-.25-.25H11Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M7.22 14.47 9.69 12 7.22 9.53a.749.749 0 0 1 .326-1.275.749.749 0 0 1 .734.215l3 3a.75.75 0 0 1 0 1.06l-3 3a.751.751 0 0 1-1.042-.018.751.751 0 0 1-.018-1.042Z',
+      'M3.75 2h16.5c.966 0 1.75.784 1.75 1.75v16.5A1.75 1.75 0 0 1 20.25 22H3.75A1.75 1.75 0 0 1 2 20.25V3.75C2 2.784 2.784 2 3.75 2ZM3.5 3.75v16.5c0 .138.112.25.25.25H15v-17H3.75a.25.25 0 0 0-.25.25Zm13 16.75h3.75a.25.25 0 0 0 .25-.25V3.75a.25.25 0 0 0-.25-.25H16.5Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const sidebarExpand: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'm4.177 7.823 2.396-2.396A.25.25 0 0 1 7 5.604v4.792a.25.25 0 0 1-.427.177L4.177 8.177a.25.25 0 0 1 0-.354Z',
+      'M0 1.75C0 .784.784 0 1.75 0h12.5C15.216 0 16 .784 16 1.75v12.5A1.75 1.75 0 0 1 14.25 16H1.75A1.75 1.75 0 0 1 0 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25H9.5v-13Zm12.5 13a.25.25 0 0 0 .25-.25V1.75a.25.25 0 0 0-.25-.25H11v13Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M11.28 9.53 8.81 12l2.47 2.47a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215l-3-3a.75.75 0 0 1 0-1.06l3-3a.749.749 0 0 1 1.275.326.749.749 0 0 1-.215.734Z',
+      'M3.75 2h16.5c.966 0 1.75.784 1.75 1.75v16.5A1.75 1.75 0 0 1 20.25 22H3.75A1.75 1.75 0 0 1 2 20.25V3.75C2 2.784 2.784 2 3.75 2ZM3.5 3.75v16.5c0 .138.112.25.25.25H15v-17H3.75a.25.25 0 0 0-.25.25Zm13 16.75h3.75a.25.25 0 0 0 .25-.25V3.75a.25.25 0 0 0-.25-.25H16.5Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const signIn: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M2 2.75C2 1.784 2.784 1 3.75 1h2.5a.75.75 0 0 1 0 1.5h-2.5a.25.25 0 0 0-.25.25v10.5c0 .138.112.25.25.25h2.5a.75.75 0 0 1 0 1.5h-2.5A1.75 1.75 0 0 1 2 13.25Zm6.56 4.5h5.69a.75.75 0 0 1 0 1.5H8.56l1.97 1.97a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215L6.22 8.53a.75.75 0 0 1 0-1.06l3.25-3.25a.749.749 0 0 1 1.275.326.749.749 0 0 1-.215.734Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M3 3.25c0-.966.784-1.75 1.75-1.75h5.5a.75.75 0 0 1 0 1.5h-5.5a.25.25 0 0 0-.25.25v17.5c0 .138.112.25.25.25h5.5a.75.75 0 0 1 0 1.5h-5.5A1.75 1.75 0 0 1 3 20.75Zm9.994 9.5 3.3 3.484a.75.75 0 0 1-1.088 1.032l-4.5-4.75a.75.75 0 0 1 0-1.032l4.5-4.75a.75.75 0 0 1 1.088 1.032l-3.3 3.484h8.256a.75.75 0 0 1 0 1.5Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const signOut: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M2 2.75C2 1.784 2.784 1 3.75 1h2.5a.75.75 0 0 1 0 1.5h-2.5a.25.25 0 0 0-.25.25v10.5c0 .138.112.25.25.25h2.5a.75.75 0 0 1 0 1.5h-2.5A1.75 1.75 0 0 1 2 13.25Zm10.44 4.5-1.97-1.97a.749.749 0 0 1 .326-1.275.749.749 0 0 1 .734.215l3.25 3.25a.75.75 0 0 1 0 1.06l-3.25 3.25a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734l1.97-1.97H6.75a.75.75 0 0 1 0-1.5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M3 3.25c0-.966.784-1.75 1.75-1.75h5.5a.75.75 0 0 1 0 1.5h-5.5a.25.25 0 0 0-.25.25v17.5c0 .138.112.25.25.25h5.5a.75.75 0 0 1 0 1.5h-5.5A1.75 1.75 0 0 1 3 20.75Zm16.006 9.5H10.75a.75.75 0 0 1 0-1.5h8.256l-3.3-3.484a.75.75 0 0 1 1.088-1.032l4.5 4.75a.75.75 0 0 1 0 1.032l-4.5 4.75a.75.75 0 0 1-1.088-1.032Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const singleSelect: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'm5.06 7.356 2.795 2.833c.08.081.21.081.29 0l2.794-2.833c.13-.131.038-.356-.145-.356H5.206c-.183 0-.275.225-.145.356Z',
+      'M1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v10.5A1.75 1.75 0 0 1 13.25 15H2.75A1.75 1.75 0 0 1 1 13.25Zm1.75-.25a.25.25 0 0 0-.25.25v10.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V2.75a.25.25 0 0 0-.25-.25Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'm7.854 10.854 3.792 3.792a.5.5 0 0 0 .708 0l3.793-3.792a.5.5 0 0 0-.354-.854H8.207a.5.5 0 0 0-.353.854Z',
+      'M2 3.75C2 2.784 2.784 2 3.75 2h16.5c.966 0 1.75.784 1.75 1.75v16.5A1.75 1.75 0 0 1 20.25 22H3.75A1.75 1.75 0 0 1 2 20.25Zm1.75-.25a.25.25 0 0 0-.25.25v16.5c0 .138.112.25.25.25h16.5a.25.25 0 0 0 .25-.25V3.75a.25.25 0 0 0-.25-.25Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const skip: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Zm9.78-2.22-5.5 5.5a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734l5.5-5.5a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M17.28 7.78a.75.75 0 0 0-1.06-1.06l-9.5 9.5a.75.75 0 1 0 1.06 1.06l9.5-9.5Z',
+      'M12 1c6.075 0 11 4.925 11 11s-4.925 11-11 11S1 18.075 1 12 5.925 1 12 1ZM2.5 12a9.5 9.5 0 0 0 9.5 9.5 9.5 9.5 0 0 0 9.5-9.5A9.5 9.5 0 0 0 12 2.5 9.5 9.5 0 0 0 2.5 12Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const skipFill: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm11.333-2.167a.825.825 0 0 0-1.166-1.166l-5.5 5.5a.825.825 0 0 0 1.166 1.166Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12Zm16.333-4.167a.825.825 0 0 0-1.166-1.166l-9.5 9.5a.825.825 0 0 0 1.166 1.166Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const sliders: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M15 2.75a.75.75 0 0 1-.75.75h-4a.75.75 0 0 1 0-1.5h4a.75.75 0 0 1 .75.75Zm-8.5.75v1.25a.75.75 0 0 0 1.5 0v-4a.75.75 0 0 0-1.5 0V2H1.75a.75.75 0 0 0 0 1.5H6.5Zm1.25 5.25a.75.75 0 0 0 0-1.5h-6a.75.75 0 0 0 0 1.5h6ZM15 8a.75.75 0 0 1-.75.75H11.5V10a.75.75 0 1 1-1.5 0V6a.75.75 0 0 1 1.5 0v1.25h2.75A.75.75 0 0 1 15 8Zm-9 5.25v-2a.75.75 0 0 0-1.5 0v1.25H1.75a.75.75 0 0 0 0 1.5H4.5v1.25a.75.75 0 0 0 1.5 0v-2Zm9 0a.75.75 0 0 1-.75.75h-6a.75.75 0 0 1 0-1.5h6a.75.75 0 0 1 .75.75Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const smiley: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Zm3.82 1.636a.75.75 0 0 1 1.038.175l.007.009c.103.118.22.222.35.31.264.178.683.37 1.285.37.602 0 1.02-.192 1.285-.371.13-.088.247-.192.35-.31l.007-.008a.75.75 0 0 1 1.222.87l-.022-.015c.02.013.021.015.021.015v.001l-.001.002-.002.003-.005.007-.014.019a2.066 2.066 0 0 1-.184.213c-.16.166-.338.316-.53.445-.63.418-1.37.638-2.127.629-.946 0-1.652-.308-2.126-.63a3.331 3.331 0 0 1-.715-.657l-.014-.02-.005-.006-.002-.003v-.002h-.001l.613-.432-.614.43a.75.75 0 0 1 .183-1.044ZM12 7a1 1 0 1 1-2 0 1 1 0 0 1 2 0ZM5 8a1 1 0 1 1 0-2 1 1 0 0 1 0 2Zm5.25 2.25.592.416a97.71 97.71 0 0 0-.592-.416Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M8.456 14.494a.75.75 0 0 1 1.068.17 3.08 3.08 0 0 0 .572.492A3.381 3.381 0 0 0 12 15.72c.855 0 1.487-.283 1.904-.562a3.081 3.081 0 0 0 .572-.492l.021-.026a.75.75 0 0 1 1.197.905l-.027.034c-.013.016-.03.038-.052.063-.044.05-.105.119-.184.198a4.569 4.569 0 0 1-.695.566A4.88 4.88 0 0 1 12 17.22a4.88 4.88 0 0 1-2.736-.814 4.57 4.57 0 0 1-.695-.566 3.253 3.253 0 0 1-.236-.261c-.259-.332-.223-.824.123-1.084Z',
+      'M12 1c6.075 0 11 4.925 11 11s-4.925 11-11 11S1 18.075 1 12 5.925 1 12 1ZM2.5 12a9.5 9.5 0 0 0 9.5 9.5 9.5 9.5 0 0 0 9.5-9.5A9.5 9.5 0 0 0 12 2.5 9.5 9.5 0 0 0 2.5 12Z',
+      'M9 10.75a1.25 1.25 0 1 1-2.5 0 1.25 1.25 0 0 1 2.5 0ZM16.25 12a1.25 1.25 0 1 0 0-2.5 1.25 1.25 0 0 0 0 2.5Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const sortAsc: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'm12.927 2.573 3 3A.25.25 0 0 1 15.75 6H13.5v6.75a.75.75 0 0 1-1.5 0V6H9.75a.25.25 0 0 1-.177-.427l3-3a.25.25 0 0 1 .354 0ZM0 12.25a.75.75 0 0 1 .75-.75h7.5a.75.75 0 0 1 0 1.5H.75a.75.75 0 0 1-.75-.75Zm0-4a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5H.75A.75.75 0 0 1 0 8.25Zm0-4a.75.75 0 0 1 .75-.75h2.5a.75.75 0 0 1 0 1.5H.75A.75.75 0 0 1 0 4.25Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M18.5 17.25a.75.75 0 0 1-1.5 0V7.56l-2.22 2.22a.75.75 0 1 1-1.06-1.06l3.5-3.5a.75.75 0 0 1 1.06 0l3.5 3.5a.75.75 0 0 1-1.06 1.06L18.5 7.56v9.69Zm-15.75.25a.75.75 0 0 1 0-1.5h9.5a.75.75 0 0 1 0 1.5h-9.5Zm0-5a.75.75 0 0 1 0-1.5h5.5a.75.75 0 0 1 0 1.5h-5.5Zm0-5a.75.75 0 0 1 0-1.5h3.5a.75.75 0 0 1 0 1.5h-3.5Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const sortDesc: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M0 4.25a.75.75 0 0 1 .75-.75h7.5a.75.75 0 0 1 0 1.5H.75A.75.75 0 0 1 0 4.25Zm0 4a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5H.75A.75.75 0 0 1 0 8.25Zm0 4a.75.75 0 0 1 .75-.75h2.5a.75.75 0 0 1 0 1.5H.75a.75.75 0 0 1-.75-.75ZM13.5 10h2.25a.25.25 0 0 1 .177.427l-3 3a.25.25 0 0 1-.354 0l-3-3A.25.25 0 0 1 9.75 10H12V3.75a.75.75 0 0 1 1.5 0V10Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M18.5 16.44V6.75a.75.75 0 0 0-1.5 0v9.69l-2.22-2.22a.75.75 0 1 0-1.06 1.06l3.5 3.5a.75.75 0 0 0 1.06 0l3.5-3.5a.75.75 0 1 0-1.06-1.06l-2.22 2.22ZM2 7.25a.75.75 0 0 1 .75-.75h9.5a.75.75 0 0 1 0 1.5h-9.5A.75.75 0 0 1 2 7.25Zm0 5a.75.75 0 0 1 .75-.75h5.5a.75.75 0 0 1 0 1.5h-5.5a.75.75 0 0 1-.75-.75Zm0 5a.75.75 0 0 1 .75-.75h3.5a.75.75 0 0 1 0 1.5h-3.5a.75.75 0 0 1-.75-.75Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const sparkleFill: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M7.53 1.282a.5.5 0 0 1 .94 0l.478 1.306a7.492 7.492 0 0 0 4.464 4.464l1.305.478a.5.5 0 0 1 0 .94l-1.305.478a7.492 7.492 0 0 0-4.464 4.464l-.478 1.305a.5.5 0 0 1-.94 0l-.478-1.305a7.492 7.492 0 0 0-4.464-4.464L1.282 8.47a.5.5 0 0 1 0-.94l1.306-.478a7.492 7.492 0 0 0 4.464-4.464Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const sponsorTiers: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M10.586 1C12.268 1 13.5 2.37 13.5 4.25c0 1.745-.996 3.359-2.622 4.831-.166.15-.336.297-.509.438l1.116 5.584a.75.75 0 0 1-.991.852l-2.409-.876a.25.25 0 0 0-.17 0l-2.409.876a.75.75 0 0 1-.991-.852L5.63 9.519a13.78 13.78 0 0 1-.51-.438C3.497 7.609 2.5 5.995 2.5 4.25 2.5 2.37 3.732 1 5.414 1c.963 0 1.843.403 2.474 1.073L8 2.198l.112-.125a3.385 3.385 0 0 1 2.283-1.068L10.586 1Zm-3.621 9.495-.718 3.594 1.155-.42a1.75 1.75 0 0 1 1.028-.051l.168.051 1.154.42-.718-3.592c-.199.13-.37.235-.505.314l-.169.097a.75.75 0 0 1-.72 0 9.54 9.54 0 0 1-.515-.308l-.16-.105ZM10.586 2.5c-.863 0-1.611.58-1.866 1.459-.209.721-1.231.721-1.44 0C7.025 3.08 6.277 2.5 5.414 2.5 4.598 2.5 4 3.165 4 4.25c0 1.23.786 2.504 2.128 3.719.49.443 1.018.846 1.546 1.198l.325.21.076-.047.251-.163a13.341 13.341 0 0 0 1.546-1.198C11.214 6.754 12 5.479 12 4.25c0-1.085-.598-1.75-1.414-1.75Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M16.004 1.25C18.311 1.25 20 3.128 20 5.75c0 2.292-1.23 4.464-3.295 6.485-.481.47-.98.909-1.482 1.31l.265 1.32 1.375 7.5a.75.75 0 0 1-.982.844l-3.512-1.207a.75.75 0 0 0-.488 0L8.37 23.209a.75.75 0 0 1-.982-.844l1.378-7.512.261-1.309c-.5-.4-1-.838-1.481-1.31C5.479 10.215 4.25 8.043 4.25 5.75c0-2.622 1.689-4.5 3.996-4.5 1.55 0 2.947.752 3.832 1.967l.047.067.047-.067a4.726 4.726 0 0 1 3.612-1.962l.22-.005ZM13.89 14.531c-.418.285-.828.542-1.218.77l-.18.103a.75.75 0 0 1-.734 0l-.071-.04-.46-.272c-.282-.173-.573-.36-.868-.562l-.121.605-1.145 6.239 2.3-.79a2.248 2.248 0 0 1 1.284-.054l.18.053 2.299.79-1.141-6.226-.125-.616ZM16.004 2.75c-1.464 0-2.731.983-3.159 2.459-.209.721-1.231.721-1.44 0-.428-1.476-1.695-2.459-3.16-2.459-1.44 0-2.495 1.173-2.495 3 0 1.811 1.039 3.647 2.844 5.412a19.624 19.624 0 0 0 3.734 2.84l-.019-.011-.184-.111.147-.088a19.81 19.81 0 0 0 3.015-2.278l.37-.352C17.46 9.397 18.5 7.561 18.5 5.75c0-1.827-1.055-3-2.496-3Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const square: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M4 5.75C4 4.784 4.784 4 5.75 4h4.5c.966 0 1.75.784 1.75 1.75v4.5A1.75 1.75 0 0 1 10.25 12h-4.5A1.75 1.75 0 0 1 4 10.25Zm1.75-.25a.25.25 0 0 0-.25.25v4.5c0 .138.112.25.25.25h4.5a.25.25 0 0 0 .25-.25v-4.5a.25.25 0 0 0-.25-.25Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M6 7.75C6 6.784 6.784 6 7.75 6h8.5c.966 0 1.75.784 1.75 1.75v8.5A1.75 1.75 0 0 1 16.25 18h-8.5A1.75 1.75 0 0 1 6 16.25Zm1.75-.25a.25.25 0 0 0-.25.25v8.5c0 .138.112.25.25.25h8.5a.25.25 0 0 0 .25-.25v-8.5a.25.25 0 0 0-.25-.25Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const squareFill: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M5.75 4h4.5c.966 0 1.75.784 1.75 1.75v4.5A1.75 1.75 0 0 1 10.25 12h-4.5A1.75 1.75 0 0 1 4 10.25v-4.5C4 4.784 4.784 4 5.75 4Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M7.75 6h8.5c.966 0 1.75.784 1.75 1.75v8.5A1.75 1.75 0 0 1 16.25 18h-8.5A1.75 1.75 0 0 1 6 16.25v-8.5C6 6.784 6.784 6 7.75 6Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const squirrel: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M3.499.75a.75.75 0 0 1 1.5 0v.996C5.9 2.903 6.793 3.65 7.662 4.376l.24.202c-.036-.694.055-1.422.426-2.163C9.1.873 10.794-.045 12.622.26 14.408.558 16 1.94 16 4.25c0 1.278-.954 2.575-2.44 2.734l.146.508.065.22c.203.701.412 1.455.476 2.226.142 1.707-.4 3.03-1.487 3.898C11.714 14.671 10.27 15 8.75 15h-6a.75.75 0 0 1 0-1.5h1.376a4.484 4.484 0 0 1-.563-1.191 3.835 3.835 0 0 1-.05-2.063 4.647 4.647 0 0 1-2.025-.293.75.75 0 0 1 .525-1.406c1.357.507 2.376-.006 2.698-.318l.009-.01a.747.747 0 0 1 1.06 0 .748.748 0 0 1-.012 1.074c-.912.92-.992 1.835-.768 2.586.221.74.745 1.337 1.196 1.621H8.75c1.343 0 2.398-.296 3.074-.836.635-.507 1.036-1.31.928-2.602-.05-.603-.216-1.224-.422-1.93l-.064-.221c-.12-.407-.246-.84-.353-1.29a2.425 2.425 0 0 1-.507-.441 3.075 3.075 0 0 1-.633-1.248.75.75 0 0 1 1.455-.364c.046.185.144.436.31.627.146.168.353.305.712.305.738 0 1.25-.615 1.25-1.25 0-1.47-.95-2.315-2.123-2.51-1.172-.196-2.227.387-2.706 1.345-.46.92-.27 1.774.019 3.062l.042.19a.884.884 0 0 1 .01.05c.348.443.666.949.94 1.553a.75.75 0 1 1-1.365.62c-.553-1.217-1.32-1.94-2.3-2.768L6.7 5.527c-.814-.68-1.75-1.462-2.692-2.619a3.737 3.737 0 0 0-1.023.88c-.406.495-.663 1.036-.722 1.508.116.122.306.21.591.239.388.038.797-.06 1.032-.19a.75.75 0 0 1 .728 1.31c-.515.287-1.23.439-1.906.373-.682-.067-1.473-.38-1.879-1.193L.75 5.677V5.5c0-.984.48-1.94 1.077-2.664.46-.559 1.05-1.055 1.673-1.353V.75Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M18.377 3.49c-1.862-.31-3.718.62-4.456 2.095-.428.857-.691 1.624-.728 2.361-.035.71.138 1.444.67 2.252.644.854 1.199 1.913 1.608 3.346a.75.75 0 1 1-1.442.412c-.353-1.236-.82-2.135-1.372-2.865l-.008-.01c-.53-.698-1.14-1.242-1.807-1.778a50.724 50.724 0 0 0-.667-.524C9.024 7.884 7.71 6.863 6.471 5.16c-.59.287-1.248.798-1.806 1.454-.665.78-1.097 1.66-1.158 2.446.246.36.685.61 1.246.715.643.12 1.278.015 1.633-.182a.75.75 0 1 1 .728 1.311c-.723.402-1.728.516-2.637.346-.916-.172-1.898-.667-2.398-1.666L2 9.427V9.25c0-1.323.678-2.615 1.523-3.607.7-.824 1.59-1.528 2.477-1.917V2.75a.75.75 0 1 1 1.5 0v1.27c1.154 1.67 2.363 2.612 3.568 3.551.207.162.415.323.621.489.001-.063.003-.126.006-.188.052-1.034.414-2.017.884-2.958 1.06-2.118 3.594-3.313 6.044-2.904 1.225.204 2.329.795 3.125 1.748C22.546 4.713 23 5.988 23 7.5c0 1.496-.913 3.255-2.688 3.652.838 1.699 1.438 3.768 1.181 5.697-.269 2.017-1.04 3.615-2.582 4.675C17.409 22.558 15.288 23 12.5 23H4.75a.75.75 0 0 1 0-1.5h2.322c-.58-.701-.998-1.578-1.223-2.471-.327-1.3-.297-2.786.265-4.131-.92.091-1.985-.02-3.126-.445a.75.75 0 1 1 .524-1.406c1.964.733 3.428.266 4.045-.19.068-.06.137-.12.208-.18a.745.745 0 0 1 .861-.076.746.746 0 0 1 .32.368.752.752 0 0 1-.173.819c-.077.076-.16.15-.252.221-1.322 1.234-1.62 3.055-1.218 4.654.438 1.737 1.574 2.833 2.69 2.837H12.5c2.674 0 4.429-.433 5.56-1.212 1.094-.752 1.715-1.904 1.946-3.637.236-1.768-.445-3.845-1.407-5.529a.576.576 0 0 1-.012-.02 3.557 3.557 0 0 1-1.553-.94c-.556-.565-.89-1.243-1.012-1.73a.75.75 0 0 1 1.456-.364c.057.231.26.67.626 1.043.35.357.822.623 1.443.623 1.172 0 1.953-1.058 1.953-2.234 0-1.205-.357-2.127-.903-2.78-.547-.654-1.318-1.08-2.22-1.23Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const stack: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M7.122.392a1.75 1.75 0 0 1 1.756 0l5.003 2.902c.83.481.83 1.68 0 2.162L8.878 8.358a1.75 1.75 0 0 1-1.756 0L2.119 5.456a1.251 1.251 0 0 1 0-2.162ZM8.125 1.69a.248.248 0 0 0-.25 0l-4.63 2.685 4.63 2.685a.248.248 0 0 0 .25 0l4.63-2.685ZM1.601 7.789a.75.75 0 0 1 1.025-.273l5.249 3.044a.248.248 0 0 0 .25 0l5.249-3.044a.75.75 0 0 1 .752 1.298l-5.248 3.044a1.75 1.75 0 0 1-1.756 0L1.874 8.814A.75.75 0 0 1 1.6 7.789Zm0 3.5a.75.75 0 0 1 1.025-.273l5.249 3.044a.248.248 0 0 0 .25 0l5.249-3.044a.75.75 0 0 1 .752 1.298l-5.248 3.044a1.75 1.75 0 0 1-1.756 0l-5.248-3.044a.75.75 0 0 1-.273-1.025Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M11.063 1.456a1.749 1.749 0 0 1 1.874 0l8.383 5.316a1.751 1.751 0 0 1 0 2.956l-8.383 5.316a1.749 1.749 0 0 1-1.874 0L2.68 9.728a1.751 1.751 0 0 1 0-2.956Zm1.071 1.267a.25.25 0 0 0-.268 0L3.483 8.039a.25.25 0 0 0 0 .422l8.383 5.316a.25.25 0 0 0 .268 0l8.383-5.316a.25.25 0 0 0 0-.422Z',
+      'M1.867 12.324a.75.75 0 0 1 1.035-.232l8.964 5.685a.25.25 0 0 0 .268 0l8.964-5.685a.75.75 0 0 1 .804 1.267l-8.965 5.685a1.749 1.749 0 0 1-1.874 0l-8.965-5.685a.75.75 0 0 1-.231-1.035Z',
+      'M1.867 16.324a.75.75 0 0 1 1.035-.232l8.964 5.685a.25.25 0 0 0 .268 0l8.964-5.685a.75.75 0 0 1 .804 1.267l-8.965 5.685a1.749 1.749 0 0 1-1.874 0l-8.965-5.685a.75.75 0 0 1-.231-1.035Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const star: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8 .25a.75.75 0 0 1 .673.418l1.882 3.815 4.21.612a.75.75 0 0 1 .416 1.279l-3.046 2.97.719 4.192a.751.751 0 0 1-1.088.791L8 12.347l-3.766 1.98a.75.75 0 0 1-1.088-.79l.72-4.194L.818 6.374a.75.75 0 0 1 .416-1.28l4.21-.611L7.327.668A.75.75 0 0 1 8 .25Zm0 2.445L6.615 5.5a.75.75 0 0 1-.564.41l-3.097.45 2.24 2.184a.75.75 0 0 1 .216.664l-.528 3.084 2.769-1.456a.75.75 0 0 1 .698 0l2.77 1.456-.53-3.084a.75.75 0 0 1 .216-.664l2.24-2.183-3.096-.45a.75.75 0 0 1-.564-.41L8 2.694Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M12 .25a.75.75 0 0 1 .673.418l3.058 6.197 6.839.994a.75.75 0 0 1 .415 1.279l-4.948 4.823 1.168 6.811a.751.751 0 0 1-1.088.791L12 18.347l-6.117 3.216a.75.75 0 0 1-1.088-.79l1.168-6.812-4.948-4.823a.75.75 0 0 1 .416-1.28l6.838-.993L11.328.668A.75.75 0 0 1 12 .25Zm0 2.445L9.44 7.882a.75.75 0 0 1-.565.41l-5.725.832 4.143 4.038a.748.748 0 0 1 .215.664l-.978 5.702 5.121-2.692a.75.75 0 0 1 .698 0l5.12 2.692-.977-5.702a.748.748 0 0 1 .215-.664l4.143-4.038-5.725-.831a.75.75 0 0 1-.565-.41L12 2.694Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const starFill: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8 .25a.75.75 0 0 1 .673.418l1.882 3.815 4.21.612a.75.75 0 0 1 .416 1.279l-3.046 2.97.719 4.192a.751.751 0 0 1-1.088.791L8 12.347l-3.766 1.98a.75.75 0 0 1-1.088-.79l.72-4.194L.818 6.374a.75.75 0 0 1 .416-1.28l4.21-.611L7.327.668A.75.75 0 0 1 8 .25Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'm12.672.668 3.059 6.197 6.838.993a.75.75 0 0 1 .416 1.28l-4.948 4.823 1.168 6.812a.75.75 0 0 1-1.088.79L12 18.347l-6.116 3.216a.75.75 0 0 1-1.088-.791l1.168-6.811-4.948-4.823a.749.749 0 0 1 .416-1.279l6.838-.994L11.327.668a.75.75 0 0 1 1.345 0Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const stop: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M4.47.22A.749.749 0 0 1 5 0h6c.199 0 .389.079.53.22l4.25 4.25c.141.14.22.331.22.53v6a.749.749 0 0 1-.22.53l-4.25 4.25A.749.749 0 0 1 11 16H5a.749.749 0 0 1-.53-.22L.22 11.53A.749.749 0 0 1 0 11V5c0-.199.079-.389.22-.53Zm.84 1.28L1.5 5.31v5.38l3.81 3.81h5.38l3.81-3.81V5.31L10.69 1.5ZM8 4a.75.75 0 0 1 .75.75v3.5a.75.75 0 0 1-1.5 0v-3.5A.75.75 0 0 1 8 4Zm0 8a1 1 0 1 1 0-2 1 1 0 0 1 0 2Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M12 7a.75.75 0 0 1 .75.75v4.5a.75.75 0 0 1-1.5 0v-4.5A.75.75 0 0 1 12 7Zm0 10a1 1 0 1 0 0-2 1 1 0 0 0 0 2Z',
+      'M7.328 1.47a.749.749 0 0 1 .53-.22h8.284c.199 0 .389.079.53.22l5.858 5.858c.141.14.22.33.22.53v8.284a.749.749 0 0 1-.22.53l-5.858 5.858a.749.749 0 0 1-.53.22H7.858a.749.749 0 0 1-.53-.22L1.47 16.672a.749.749 0 0 1-.22-.53V7.858c0-.199.079-.389.22-.53Zm.84 1.28L2.75 8.169v7.662l5.419 5.419h7.662l5.419-5.418V8.168L15.832 2.75Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const stopwatch: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M5.75.75A.75.75 0 0 1 6.5 0h3a.75.75 0 0 1 0 1.5h-.75v1l-.001.041a6.724 6.724 0 0 1 3.464 1.435l.007-.006.75-.75a.749.749 0 0 1 1.275.326.749.749 0 0 1-.215.734l-.75.75-.006.007a6.75 6.75 0 1 1-10.548 0L2.72 5.03l-.75-.75a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018l.75.75.007.006A6.72 6.72 0 0 1 7.25 2.541V1.5H6.5a.75.75 0 0 1-.75-.75ZM8 14.5a5.25 5.25 0 1 0-.001-10.501A5.25 5.25 0 0 0 8 14.5Zm.389-6.7 1.33-1.33a.75.75 0 1 1 1.061 1.06L9.45 8.861A1.503 1.503 0 0 1 8 10.75a1.499 1.499 0 1 1 .389-2.95Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M10.25 0h3.5a.75.75 0 0 1 0 1.5h-1v1.278a9.954 9.954 0 0 1 5.636 2.276L19.72 3.72a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042l-1.315 1.316A9.959 9.959 0 0 1 22 12.75c0 5.523-4.477 10-10 10s-10-4.477-10-10a9.959 9.959 0 0 1 2.535-6.654L3.22 4.78a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018l1.335 1.334a9.958 9.958 0 0 1 5.635-2.276V1.5h-1a.75.75 0 0 1 0-1.5ZM12 21.25a8.5 8.5 0 1 0-.001-17.001A8.5 8.5 0 0 0 12 21.25Zm4.03-12.53a.75.75 0 0 1 0 1.06l-2.381 2.382a1.75 1.75 0 1 1-1.06-1.06l2.38-2.382a.75.75 0 0 1 1.061 0Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const strikethrough: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M11.055 8.5c.524.536.815 1.257.811 2.007a3.133 3.133 0 0 1-1.12 2.408C9.948 13.597 8.748 14 7.096 14c-1.706 0-3.104-.607-3.902-1.377a.751.751 0 0 1 1.042-1.079c.48.463 1.487.956 2.86.956 1.422 0 2.232-.346 2.676-.726.435-.372.594-.839.594-1.267 0-.472-.208-.857-.647-1.197-.448-.346-1.116-.623-1.951-.81H1.75a.75.75 0 0 1 0-1.5h12.5a.75.75 0 0 1 0 1.5ZM7.581 3.25c-2.036 0-2.778 1.082-2.778 1.786 0 .055.002.107.006.157a.75.75 0 0 1-1.496.114 3.506 3.506 0 0 1-.01-.271c0-1.832 1.75-3.286 4.278-3.286 1.418 0 2.721.58 3.514 1.093a.75.75 0 1 1-.814 1.26c-.64-.414-1.662-.853-2.7-.853Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'm16.533 12.5.054.043c.93.75 1.538 1.77 1.538 3.066a4.13 4.13 0 0 1-1.479 3.177c-1.058.904-2.679 1.464-4.974 1.464-2.35 0-4.252-.837-5.318-1.865a.75.75 0 1 1 1.042-1.08c.747.722 2.258 1.445 4.276 1.445 2.065 0 3.296-.504 3.999-1.105a2.63 2.63 0 0 0 .954-2.036c0-.764-.337-1.38-.979-1.898-.649-.523-1.598-.931-2.76-1.211H3.75a.75.75 0 0 1 0-1.5h16.5a.75.75 0 0 1 0 1.5ZM12.36 5C9.37 5 8.105 6.613 8.105 7.848c0 .411.072.744.193 1.02a.75.75 0 0 1-1.373.603 3.988 3.988 0 0 1-.32-1.623c0-2.363 2.271-4.348 5.755-4.348 1.931 0 3.722.794 4.814 1.5a.75.75 0 1 1-.814 1.26c-.94-.607-2.448-1.26-4-1.26Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const sun: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8 12a4 4 0 1 1 0-8 4 4 0 0 1 0 8Zm0-1.5a2.5 2.5 0 1 0 0-5 2.5 2.5 0 0 0 0 5Zm5.657-8.157a.75.75 0 0 1 0 1.061l-1.061 1.06a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734l1.06-1.06a.75.75 0 0 1 1.06 0Zm-9.193 9.193a.75.75 0 0 1 0 1.06l-1.06 1.061a.75.75 0 1 1-1.061-1.06l1.06-1.061a.75.75 0 0 1 1.061 0ZM8 0a.75.75 0 0 1 .75.75v1.5a.75.75 0 0 1-1.5 0V.75A.75.75 0 0 1 8 0ZM3 8a.75.75 0 0 1-.75.75H.75a.75.75 0 0 1 0-1.5h1.5A.75.75 0 0 1 3 8Zm13 0a.75.75 0 0 1-.75.75h-1.5a.75.75 0 0 1 0-1.5h1.5A.75.75 0 0 1 16 8Zm-8 5a.75.75 0 0 1 .75.75v1.5a.75.75 0 0 1-1.5 0v-1.5A.75.75 0 0 1 8 13Zm3.536-1.464a.75.75 0 0 1 1.06 0l1.061 1.06a.75.75 0 0 1-1.06 1.061l-1.061-1.06a.75.75 0 0 1 0-1.061ZM2.343 2.343a.75.75 0 0 1 1.061 0l1.06 1.061a.751.751 0 0 1-.018 1.042.751.751 0 0 1-1.042.018l-1.06-1.06a.75.75 0 0 1 0-1.06Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M12 19a7 7 0 1 1 0-14 7 7 0 0 1 0 14Zm0-1.5a5.5 5.5 0 1 0 0-11 5.5 5.5 0 1 0 0 11Zm-5.657.157a.75.75 0 0 1 0 1.06l-1.768 1.768a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734l1.767-1.768a.75.75 0 0 1 1.061 0ZM3.515 3.515a.75.75 0 0 1 1.06 0l1.768 1.768a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215L3.515 4.575a.75.75 0 0 1 0-1.06ZM12 0a.75.75 0 0 1 .75.75v2.5a.75.75 0 0 1-1.5 0V.75A.75.75 0 0 1 12 0ZM4 12a.75.75 0 0 1-.75.75H.75a.75.75 0 0 1 0-1.5h2.5A.75.75 0 0 1 4 12Zm8 8a.75.75 0 0 1 .75.75v2.5a.75.75 0 0 1-1.5 0v-2.5A.75.75 0 0 1 12 20Zm12-8a.75.75 0 0 1-.75.75h-2.5a.75.75 0 0 1 0-1.5h2.5A.75.75 0 0 1 24 12Zm-6.343 5.657a.75.75 0 0 1 1.06 0l1.768 1.768a.751.751 0 0 1-.018 1.042.751.751 0 0 1-1.042.018l-1.768-1.767a.75.75 0 0 1 0-1.061Zm2.828-14.142a.75.75 0 0 1 0 1.06l-1.768 1.768a.751.751 0 0 1-1.042-.018.751.751 0 0 1-.018-1.042l1.767-1.768a.75.75 0 0 1 1.061 0Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const sync: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M1.705 8.005a.75.75 0 0 1 .834.656 5.5 5.5 0 0 0 9.592 2.97l-1.204-1.204a.25.25 0 0 1 .177-.427h3.646a.25.25 0 0 1 .25.25v3.646a.25.25 0 0 1-.427.177l-1.38-1.38A7.002 7.002 0 0 1 1.05 8.84a.75.75 0 0 1 .656-.834ZM8 2.5a5.487 5.487 0 0 0-4.131 1.869l1.204 1.204A.25.25 0 0 1 4.896 6H1.25A.25.25 0 0 1 1 5.75V2.104a.25.25 0 0 1 .427-.177l1.38 1.38A7.002 7.002 0 0 1 14.95 7.16a.75.75 0 0 1-1.49.178A5.5 5.5 0 0 0 8 2.5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M3.38 8A9.502 9.502 0 0 1 12 2.5a9.502 9.502 0 0 1 9.215 7.182.75.75 0 1 0 1.456-.364C21.473 4.539 17.15 1 12 1a10.995 10.995 0 0 0-9.5 5.452V4.75a.75.75 0 0 0-1.5 0V8.5a1 1 0 0 0 1 1h3.75a.75.75 0 0 0 0-1.5H3.38Zm-.595 6.318a.75.75 0 0 0-1.455.364C2.527 19.461 6.85 23 12 23c4.052 0 7.592-2.191 9.5-5.451v1.701a.75.75 0 0 0 1.5 0V15.5a1 1 0 0 0-1-1h-3.75a.75.75 0 0 0 0 1.5h2.37A9.502 9.502 0 0 1 12 21.5c-4.446 0-8.181-3.055-9.215-7.182Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const tab: OcticonSymbolVariants = {
+  '24': {
+    p: [
+      'M22 4.25a.75.75 0 0 0-1.5 0v15a.75.75 0 0 0 1.5 0v-15Zm-9.72 14.28a.75.75 0 1 1-1.06-1.06l4.97-4.97H1.75a.75.75 0 0 1 0-1.5h14.44l-4.97-4.97a.75.75 0 0 1 1.06-1.06l6.25 6.25a.75.75 0 0 1 0 1.06l-6.25 6.25Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const tabExternal: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M3.25 4a.25.25 0 0 0-.25.25v9a.75.75 0 0 1-.75.75H.75a.75.75 0 0 1 0-1.5h.75V4.25c0-.966.784-1.75 1.75-1.75h9.5c.966 0 1.75.784 1.75 1.75v8.25h.75a.75.75 0 0 1 0 1.5h-1.5a.75.75 0 0 1-.75-.75v-9a.25.25 0 0 0-.25-.25h-9.5Z',
+      'm7.97 7.97-2.75 2.75a.75.75 0 1 0 1.06 1.06l2.75-2.75 1.543 1.543a.25.25 0 0 0 .427-.177V6.25a.25.25 0 0 0-.25-.25H6.604a.25.25 0 0 0-.177.427L7.97 7.97Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const table: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M0 1.75C0 .784.784 0 1.75 0h12.5C15.216 0 16 .784 16 1.75v12.5A1.75 1.75 0 0 1 14.25 16H1.75A1.75 1.75 0 0 1 0 14.25ZM6.5 6.5v8h7.75a.25.25 0 0 0 .25-.25V6.5Zm8-1.5V1.75a.25.25 0 0 0-.25-.25H6.5V5Zm-13 1.5v7.75c0 .138.112.25.25.25H5v-8ZM5 5V1.5H1.75a.25.25 0 0 0-.25.25V5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M2 3.75C2 2.784 2.784 2 3.75 2h16.5c.966 0 1.75.784 1.75 1.75v16.5A1.75 1.75 0 0 1 20.25 22H3.75A1.75 1.75 0 0 1 2 20.25ZM9 9v11.5h11.25a.25.25 0 0 0 .25-.25V9Zm11.5-1.5V3.75a.25.25 0 0 0-.25-.25H9v4ZM3.5 9v11.25c0 .138.112.25.25.25H7.5V9Zm4-1.5v-4H3.75a.25.25 0 0 0-.25.25V7.5Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const tag: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M1 7.775V2.75C1 1.784 1.784 1 2.75 1h5.025c.464 0 .91.184 1.238.513l6.25 6.25a1.75 1.75 0 0 1 0 2.474l-5.026 5.026a1.75 1.75 0 0 1-2.474 0l-6.25-6.25A1.752 1.752 0 0 1 1 7.775Zm1.5 0c0 .066.026.13.073.177l6.25 6.25a.25.25 0 0 0 .354 0l5.025-5.025a.25.25 0 0 0 0-.354l-6.25-6.25a.25.25 0 0 0-.177-.073H2.75a.25.25 0 0 0-.25.25ZM6 5a1 1 0 1 1 0 2 1 1 0 0 1 0-2Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M7.75 6.5a1.25 1.25 0 1 0 0 2.5 1.25 1.25 0 0 0 0-2.5Z',
+      'M2.5 1h8.44a1.5 1.5 0 0 1 1.06.44l10.25 10.25a1.5 1.5 0 0 1 0 2.12l-8.44 8.44a1.5 1.5 0 0 1-2.12 0L1.44 12A1.497 1.497 0 0 1 1 10.94V2.5A1.5 1.5 0 0 1 2.5 1Zm0 1.5v8.44l10.25 10.25 8.44-8.44L10.94 2.5Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const tasklist: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M2 2h4a1 1 0 0 1 1 1v4a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1V3a1 1 0 0 1 1-1Zm4.655 8.595a.75.75 0 0 1 0 1.06L4.03 14.28a.75.75 0 0 1-1.06 0l-1.5-1.5a.749.749 0 0 1 .326-1.275.749.749 0 0 1 .734.215l.97.97 2.095-2.095a.75.75 0 0 1 1.06 0ZM9.75 2.5h5.5a.75.75 0 0 1 0 1.5h-5.5a.75.75 0 0 1 0-1.5Zm0 5h5.5a.75.75 0 0 1 0 1.5h-5.5a.75.75 0 0 1 0-1.5Zm0 5h5.5a.75.75 0 0 1 0 1.5h-5.5a.75.75 0 0 1 0-1.5Zm-7.25-9v3h3v-3Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M3 6a1 1 0 0 1 1-1h5a1 1 0 0 1 1 1v5a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1Zm1.5 4.5h4v-4h-4Zm8.25-5a.75.75 0 0 0 0 1.5h7.5a.75.75 0 0 0 0-1.5h-7.5Zm0 6a.75.75 0 0 0 0 1.5h7.5a.75.75 0 0 0 0-1.5h-7.5Zm0 6a.75.75 0 0 0 0 1.5h7.5a.75.75 0 0 0 0-1.5h-7.5Zm-2.97-2.53a.75.75 0 0 1 0 1.06l-3.5 3.5a.75.75 0 0 1-1.06 0l-2-2a.75.75 0 1 1 1.06-1.06l1.47 1.47 2.97-2.97a.75.75 0 0 1 1.06 0Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const telescope: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M14.184 1.143v-.001l1.422 2.464a1.75 1.75 0 0 1-.757 2.451L3.104 11.713a1.75 1.75 0 0 1-2.275-.702l-.447-.775a1.75 1.75 0 0 1 .53-2.32L11.682.573a1.748 1.748 0 0 1 2.502.57Zm-4.709 9.32h-.001l2.644 3.863a.75.75 0 1 1-1.238.848l-1.881-2.75v2.826a.75.75 0 0 1-1.5 0v-2.826l-1.881 2.75a.75.75 0 1 1-1.238-.848l2.049-2.992a.746.746 0 0 1 .293-.253l1.809-.87a.749.749 0 0 1 .944.252ZM9.436 3.92h-.001l-4.97 3.39.942 1.63 5.42-2.61Zm3.091-2.108h.001l-1.85 1.26 1.505 2.605 2.016-.97a.247.247 0 0 0 .13-.151.247.247 0 0 0-.022-.199l-1.422-2.464a.253.253 0 0 0-.161-.119.254.254 0 0 0-.197.038ZM1.756 9.157a.25.25 0 0 0-.075.33l.447.775a.25.25 0 0 0 .325.1l1.598-.769-.83-1.436-1.465 1Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M.408 15.13a2 2 0 0 1 .59-2.642L17.038 1.33a1.999 1.999 0 0 1 2.85.602l2.828 4.644a2 2 0 0 1-.851 2.847l-17.762 8.43a2 2 0 0 1-2.59-.807Zm5.263-4.066 1.987 3.44 8.712-4.135-2.857-4.76Zm12.06-1.34.001-.001 3.49-1.656a.498.498 0 0 0 .212-.712l-2.826-4.644a.503.503 0 0 0-.713-.151l-3.148 2.19Zm-13.295 2.2L1.854 13.72a.5.5 0 0 0-.147.66l1.105 1.915a.5.5 0 0 0 .648.201l2.838-1.347ZM17.155 22.87a.75.75 0 0 0 .226-1.036l-4-6.239a.75.75 0 0 0-.941-.278l-2.75 1.25a.75.75 0 0 0-.318.274l-3.25 4.989a.75.75 0 0 0 1.256.819l3.131-4.806.51-.232v5.64a.75.75 0 1 0 1.5 0v-6.22l3.6 5.613a.75.75 0 0 0 1.036.226Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const telescopeFill: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M11.905.42a1.5 1.5 0 0 1 2.144.49l1.692 2.93a1.5 1.5 0 0 1-.649 2.102L2.895 11.815a1.5 1.5 0 0 1-1.95-.602l-.68-1.176a1.5 1.5 0 0 1 .455-1.99L11.905.422Zm-3.374 9.79a.75.75 0 0 1 .944.253l2.644 3.864a.751.751 0 0 1-1.238.847L9 12.424v2.826a.75.75 0 0 1-1.5 0v-2.826l-1.881 2.75a.75.75 0 1 1-1.238-.848l2.048-2.992a.752.752 0 0 1 .293-.252l1.81-.871Zm2.476-3.965v-.001l1.356-.653-1.52-2.631-1.243.848ZM3.279 8.119l.835 1.445 1.355-.653-.947-1.64Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M17.155 22.87a.75.75 0 0 0 .226-1.036l-4-6.239a.75.75 0 0 0-.941-.277l-2.75 1.25a.75.75 0 0 0-.318.273l-3.25 4.989a.75.75 0 0 0 1.256.819l3.131-4.806.51-.232v5.64a.75.75 0 1 0 1.5 0v-6.22l3.6 5.613a.75.75 0 0 0 1.036.226ZM.408 15.13a2 2 0 0 1 .59-2.642L17.038 1.33a1.999 1.999 0 0 1 2.85.602l2.828 4.644a2 2 0 0 1-.851 2.847l-17.762 8.43a2 2 0 0 1-2.59-.807Zm13.105-9.521 2.857 4.76 1.361-.646-2.984-4.973Zm-7.842 5.455-1.235.86 1.862 3.225 1.36-.645Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const terminal: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M0 2.75C0 1.784.784 1 1.75 1h12.5c.966 0 1.75.784 1.75 1.75v10.5A1.75 1.75 0 0 1 14.25 15H1.75A1.75 1.75 0 0 1 0 13.25Zm1.75-.25a.25.25 0 0 0-.25.25v10.5c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25V2.75a.25.25 0 0 0-.25-.25ZM7.25 8a.749.749 0 0 1-.22.53l-2.25 2.25a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734L5.44 8 3.72 6.28a.749.749 0 0 1 .326-1.275.749.749 0 0 1 .734.215l2.25 2.25c.141.14.22.331.22.53Zm1.5 1.5h3a.75.75 0 0 1 0 1.5h-3a.75.75 0 0 1 0-1.5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M9.25 12a.75.75 0 0 1-.22.53l-2.75 2.75a.75.75 0 0 1-1.06-1.06L7.44 12 5.22 9.78a.75.75 0 1 1 1.06-1.06l2.75 2.75c.141.14.22.331.22.53Zm2 2a.75.75 0 0 0 0 1.5h5a.75.75 0 0 0 0-1.5h-5Z',
+      'M0 4.75C0 3.784.784 3 1.75 3h20.5c.966 0 1.75.784 1.75 1.75v14.5A1.75 1.75 0 0 1 22.25 21H1.75A1.75 1.75 0 0 1 0 19.25Zm1.75-.25a.25.25 0 0 0-.25.25v14.5c0 .138.112.25.25.25h20.5a.25.25 0 0 0 .25-.25V4.75a.25.25 0 0 0-.25-.25Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const threeBars: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M1 2.75A.75.75 0 0 1 1.75 2h12.5a.75.75 0 0 1 0 1.5H1.75A.75.75 0 0 1 1 2.75Zm0 5A.75.75 0 0 1 1.75 7h12.5a.75.75 0 0 1 0 1.5H1.75A.75.75 0 0 1 1 7.75ZM1.75 12h12.5a.75.75 0 0 1 0 1.5H1.75a.75.75 0 0 1 0-1.5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const thumbsdown: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M7.083 15.986c-.763-.087-1.499-.295-2.011-.884-.504-.581-.655-1.378-.655-2.299 0-.468.087-1.12.157-1.638l.015-.112H3.167c-.603 0-1.174-.086-1.669-.334a2.415 2.415 0 0 1-1.136-1.2c-.454-.998-.438-2.447-.188-4.316l.04-.306C.32 4.108.41 3.424.526 2.864c.132-.63.316-1.209.669-1.672C1.947.205 3.211.053 4.917.053c1.848 0 3.234.332 4.388.652l.474.133c.658.187 1.201.341 1.726.415a1.75 1.75 0 0 1 1.662-1.2h1c.966 0 1.75.784 1.75 1.75v7.5a1.75 1.75 0 0 1-1.75 1.75h-1a1.75 1.75 0 0 1-1.514-.872c-.259.105-.59.268-.919.508-.671.491-1.317 1.285-1.317 2.614v.5c0 1.201-.994 2.336-2.334 2.183Zm4.334-13.232c-.706-.089-1.39-.284-2.072-.479l-.441-.125c-1.096-.304-2.335-.597-3.987-.597-1.794 0-2.28.222-2.529.548-.147.193-.275.505-.393 1.07-.105.502-.188 1.124-.295 1.93l-.04.3c-.25 1.882-.19 2.933.067 3.497a.923.923 0 0 0 .443.48c.208.104.52.175.997.175h1.75c.685 0 1.295.577 1.205 1.335-.022.192-.049.39-.075.586-.066.488-.13.97-.13 1.329 0 .808.144 1.15.288 1.316.137.157.401.303 1.048.377.307.035.664-.237.664-.693v-.5c0-1.922.978-3.127 1.932-3.825a5.878 5.878 0 0 1 1.568-.809Zm1.75 6.798h1a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25h-1a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M12.596 21.957c-1.301.092-2.303-.986-2.303-2.206v-1.053c0-2.666-1.813-3.785-2.774-4.2a1.884 1.884 0 0 0-.523-.13A1.75 1.75 0 0 1 5.25 16h-1.5A1.75 1.75 0 0 1 2 14.25V3.75C2 2.784 2.784 2 3.75 2h1.5a1.75 1.75 0 0 1 1.742 1.58c.838-.06 1.667-.296 2.69-.586l.602-.17C11.748 2.419 13.497 2 15.828 2c2.188 0 3.693.204 4.583 1.372.422.554.65 1.255.816 2.05.148.708.262 1.57.396 2.58l.051.39c.319 2.386.328 4.18-.223 5.394-.293.644-.743 1.125-1.355 1.431-.59.296-1.284.404-2.036.404h-2.05l.056.429c.025.18.05.372.076.572.06.483.117 1.006.117 1.438 0 1.245-.222 2.253-.92 2.942-.684.674-1.668.879-2.743.955ZM7 5.082v7.779c.383.025.759.113 1.113.26 1.192.514 3.68 2.027 3.68 5.577v1.053c0 .436.347.734.698.71 1.021-.072 1.52-.258 1.795-.528.26-.256.473-.748.473-1.873 0-.328-.045-.768-.105-1.25l-.07-.527c-.04-.297-.079-.59-.105-.834-.082-.758.53-1.328 1.211-1.328h2.37c.625 0 1.06-.092 1.365-.245.285-.142.5-.359.66-.711.355-.78.422-2.176.102-4.574l-.05-.385c-.137-1.027-.243-1.827-.379-2.477-.152-.73-.324-1.165-.54-1.448-.386-.507-1.113-.781-3.39-.781-2.136 0-3.736.379-5.142.771-.191.052-.38.106-.568.16-1.039.296-2.059.587-3.118.651ZM3.75 3.5a.25.25 0 0 0-.25.25v10.5c0 .138.112.25.25.25h1.5a.25.25 0 0 0 .25-.25V3.75a.25.25 0 0 0-.25-.25Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const thumbsup: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M8.834.066c.763.087 1.5.295 2.01.884.505.581.656 1.378.656 2.3 0 .467-.087 1.119-.157 1.637L11.328 5h1.422c.603 0 1.174.085 1.668.333.508.254.911.679 1.137 1.2.453.998.438 2.447.188 4.316l-.04.306c-.105.79-.195 1.473-.313 2.033-.131.63-.315 1.209-.668 1.672C13.97 15.847 12.706 16 11 16c-1.848 0-3.234-.333-4.388-.653-.165-.045-.323-.09-.475-.133-.658-.186-1.2-.34-1.725-.415A1.75 1.75 0 0 1 2.75 16h-1A1.75 1.75 0 0 1 0 14.25v-7.5C0 5.784.784 5 1.75 5h1a1.75 1.75 0 0 1 1.514.872c.258-.105.59-.268.918-.508C5.853 4.874 6.5 4.079 6.5 2.75v-.5c0-1.202.994-2.337 2.334-2.184ZM4.5 13.3c.705.088 1.39.284 2.072.478l.441.125c1.096.305 2.334.598 3.987.598 1.794 0 2.28-.223 2.528-.549.147-.193.276-.505.394-1.07.105-.502.188-1.124.295-1.93l.04-.3c.25-1.882.189-2.933-.068-3.497a.921.921 0 0 0-.442-.48c-.208-.104-.52-.174-.997-.174H11c-.686 0-1.295-.577-1.206-1.336.023-.192.05-.39.076-.586.065-.488.13-.97.13-1.328 0-.809-.144-1.15-.288-1.316-.137-.158-.402-.304-1.048-.378C8.357 1.521 8 1.793 8 2.25v.5c0 1.922-.978 3.128-1.933 3.825a5.831 5.831 0 0 1-1.567.81ZM2.75 6.5h-1a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h1a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M12.596 2.043c1.075.076 2.059.281 2.743.956.698.688.92 1.696.92 2.941 0 .432-.057.955-.117 1.438-.026.2-.051.392-.076.572l-.056.429h2.05c.752 0 1.446.108 2.036.404.612.306 1.062.787 1.355 1.431.551 1.214.542 3.008.223 5.394l-.051.39c-.134 1.01-.248 1.872-.396 2.58-.166.795-.394 1.496-.816 2.05-.89 1.168-2.395 1.372-4.583 1.372-2.331 0-4.08-.418-5.544-.824l-.602-.17c-1.023-.29-1.852-.526-2.69-.586A1.75 1.75 0 0 1 5.25 22h-1.5A1.75 1.75 0 0 1 2 20.25V9.75C2 8.784 2.784 8 3.75 8h1.5a1.75 1.75 0 0 1 1.746 1.633 1.85 1.85 0 0 0 .523-.131c.961-.415 2.774-1.534 2.774-4.2V4.249c0-1.22 1.002-2.298 2.303-2.206ZM7 18.918c1.059.064 2.079.355 3.118.652l.568.16c1.406.39 3.006.77 5.142.77 2.277 0 3.004-.274 3.39-.781.216-.283.388-.718.54-1.448.136-.65.242-1.45.379-2.477l.05-.384c.32-2.4.253-3.795-.102-4.575-.16-.352-.375-.568-.66-.711-.305-.153-.74-.245-1.365-.245h-2.37c-.681 0-1.293-.57-1.211-1.328.026-.243.065-.537.105-.834l.07-.527c.06-.482.105-.921.105-1.25 0-1.125-.213-1.617-.473-1.873-.275-.27-.774-.455-1.795-.528-.351-.024-.698.274-.698.71v1.053c0 3.55-2.488 5.063-3.68 5.577-.372.16-.754.232-1.113.26ZM3.75 20.5h1.5a.25.25 0 0 0 .25-.25V9.75a.25.25 0 0 0-.25-.25h-1.5a.25.25 0 0 0-.25.25v10.5c0 .138.112.25.25.25Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const tools: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M5.433 2.304A4.492 4.492 0 0 0 3.5 6c0 1.598.832 3.002 2.09 3.802.518.328.929.923.902 1.64v.008l-.164 3.337a.75.75 0 1 1-1.498-.073l.163-3.33c.002-.085-.05-.216-.207-.316A5.996 5.996 0 0 1 2 6a5.993 5.993 0 0 1 2.567-4.92 1.482 1.482 0 0 1 1.673-.04c.462.296.76.827.76 1.423v2.82c0 .082.041.16.11.206l.75.51a.25.25 0 0 0 .28 0l.75-.51A.249.249 0 0 0 9 5.282V2.463c0-.596.298-1.127.76-1.423a1.482 1.482 0 0 1 1.673.04A5.993 5.993 0 0 1 14 6a5.996 5.996 0 0 1-2.786 5.068c-.157.1-.209.23-.207.315l.163 3.33a.752.752 0 0 1-1.094.714.75.75 0 0 1-.404-.64l-.164-3.345c-.027-.717.384-1.312.902-1.64A4.495 4.495 0 0 0 12.5 6a4.492 4.492 0 0 0-1.933-3.696c-.024.017-.067.067-.067.16v2.818a1.75 1.75 0 0 1-.767 1.448l-.75.51a1.75 1.75 0 0 1-1.966 0l-.75-.51A1.75 1.75 0 0 1 5.5 5.282V2.463c0-.092-.043-.142-.067-.159Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M7.875 2.292a.114.114 0 0 0-.032.018A7.239 7.239 0 0 0 4.75 8.25a7.248 7.248 0 0 0 3.654 6.297c.57.327.982.955.941 1.682v.002l-.317 6.058a.75.75 0 1 1-1.498-.078l.317-6.062v-.004c.006-.09-.047-.215-.188-.296A8.749 8.749 0 0 1 3.25 8.25a8.738 8.738 0 0 1 3.732-7.169 1.547 1.547 0 0 1 1.709-.064c.484.292.809.835.809 1.46v4.714a.25.25 0 0 0 .119.213l2.25 1.385c.08.05.182.05.262 0l2.25-1.385a.25.25 0 0 0 .119-.213V2.478c0-.626.325-1.169.81-1.461a1.547 1.547 0 0 1 1.708.064 8.741 8.741 0 0 1 3.732 7.17 8.747 8.747 0 0 1-4.41 7.598c-.14.081-.193.206-.188.296v.004l.318 6.062a.75.75 0 1 1-1.498.078l-.317-6.058v-.002c-.041-.727.37-1.355.94-1.682A7.247 7.247 0 0 0 19.25 8.25a7.239 7.239 0 0 0-3.093-5.94.114.114 0 0 0-.032-.018l-.01-.001c-.003 0-.014 0-.031.01-.036.022-.084.079-.084.177V7.19c0 .608-.315 1.172-.833 1.49l-2.25 1.385a1.75 1.75 0 0 1-1.834 0l-2.25-1.384A1.752 1.752 0 0 1 8 7.192V2.477c0-.098-.048-.155-.084-.176a.068.068 0 0 0-.031-.011l-.01.001Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const trackedByClosedCompleted: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M1.5 8a6.5 6.5 0 1 1 13 0A.75.75 0 0 0 16 8a8 8 0 1 0-8 8 .75.75 0 0 0 0-1.5A6.5 6.5 0 0 1 1.5 8Z',
+      'm8.677 12.427 2.896 2.896a.25.25 0 0 0 .427-.177V13h3.25a.75.75 0 0 0 0-1.5H12V9.354a.25.25 0 0 0-.427-.177l-2.896 2.896a.25.25 0 0 0 0 .354ZM11.28 6.78a.749.749 0 1 0-1.06-1.06L7.25 8.689 5.78 7.22a.749.749 0 1 0-1.06 1.06l2 2a.749.749 0 0 0 1.06 0l3.5-3.5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M12 2.5A9.5 9.5 0 0 0 2.5 12a9.5 9.5 0 0 0 9.5 9.5.75.75 0 0 1 0 1.5C5.925 23 1 18.075 1 12S5.925 1 12 1s11 4.925 11 11a.75.75 0 0 1-1.5 0A9.5 9.5 0 0 0 12 2.5Z',
+      'm13.759 17.48 3.728 3.314a.308.308 0 0 0 .513-.23V18h4.25a.75.75 0 0 0 0-1.5H18v-2.564a.308.308 0 0 0-.513-.23l-3.728 3.314a.307.307 0 0 0 0 .46Zm3.521-8.2a.749.749 0 1 0-1.06-1.06l-5.97 5.969-2.47-2.469a.749.749 0 1 0-1.06 1.06l3 3a.749.749 0 0 0 1.06 0l6.5-6.5Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const trackedByClosedNotPlanned: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M1.5 8a6.5 6.5 0 1 1 13 0A.75.75 0 0 0 16 8a8 8 0 1 0-8 8 .75.75 0 0 0 0-1.5A6.5 6.5 0 0 1 1.5 8Z',
+      'm8.677 12.427 2.896 2.896a.25.25 0 0 0 .427-.177V13h3.25a.75.75 0 0 0 0-1.5H12V9.354a.25.25 0 0 0-.427-.177l-2.896 2.896a.25.25 0 0 0 0 .354ZM11.28 5.78a.749.749 0 1 0-1.06-1.06l-5.5 5.5a.749.749 0 1 0 1.06 1.06l5.5-5.5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M12 2.5A9.5 9.5 0 0 0 2.5 12a9.5 9.5 0 0 0 9.5 9.5.75.75 0 0 1 0 1.5C5.925 23 1 18.075 1 12S5.925 1 12 1s11 4.925 11 11a.75.75 0 0 1-1.5 0A9.5 9.5 0 0 0 12 2.5Z',
+      'm13.759 17.48 3.728 3.314a.308.308 0 0 0 .513-.23V18h4.25a.75.75 0 0 0 0-1.5H18v-2.564a.308.308 0 0 0-.513-.23l-3.728 3.314a.307.307 0 0 0 0 .46Zm3.521-9.7a.749.749 0 1 0-1.06-1.06l-9.5 9.5a.749.749 0 1 0 1.06 1.06l9.5-9.5Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const trash: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M11 1.75V3h2.25a.75.75 0 0 1 0 1.5H2.75a.75.75 0 0 1 0-1.5H5V1.75C5 .784 5.784 0 6.75 0h2.5C10.216 0 11 .784 11 1.75ZM4.496 6.675l.66 6.6a.25.25 0 0 0 .249.225h5.19a.25.25 0 0 0 .249-.225l.66-6.6a.75.75 0 0 1 1.492.149l-.66 6.6A1.748 1.748 0 0 1 10.595 15h-5.19a1.75 1.75 0 0 1-1.741-1.575l-.66-6.6a.75.75 0 1 1 1.492-.15ZM6.5 1.75V3h3V1.75a.25.25 0 0 0-.25-.25h-2.5a.25.25 0 0 0-.25.25Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M16 1.75V3h5.25a.75.75 0 0 1 0 1.5H2.75a.75.75 0 0 1 0-1.5H8V1.75C8 .784 8.784 0 9.75 0h4.5C15.216 0 16 .784 16 1.75Zm-6.5 0V3h5V1.75a.25.25 0 0 0-.25-.25h-4.5a.25.25 0 0 0-.25.25ZM4.997 6.178a.75.75 0 1 0-1.493.144L4.916 20.92a1.75 1.75 0 0 0 1.742 1.58h10.684a1.75 1.75 0 0 0 1.742-1.581l1.413-14.597a.75.75 0 0 0-1.494-.144l-1.412 14.596a.25.25 0 0 1-.249.226H6.658a.25.25 0 0 1-.249-.226L4.997 6.178Z',
+      'M9.206 7.501a.75.75 0 0 1 .793.705l.5 8.5A.75.75 0 1 1 9 16.794l-.5-8.5a.75.75 0 0 1 .705-.793Zm6.293.793A.75.75 0 1 0 14 8.206l-.5 8.5a.75.75 0 0 0 1.498.088l.5-8.5Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const triangleDown: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'm4.427 7.427 3.396 3.396a.25.25 0 0 0 .354 0l3.396-3.396A.25.25 0 0 0 11.396 7H4.604a.25.25 0 0 0-.177.427Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M11.646 15.146 5.854 9.354a.5.5 0 0 1 .353-.854h11.586a.5.5 0 0 1 .353.854l-5.793 5.792a.5.5 0 0 1-.707 0Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const triangleLeft: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M9.573 4.427 6.177 7.823a.25.25 0 0 0 0 .354l3.396 3.396a.25.25 0 0 0 .427-.177V4.604a.25.25 0 0 0-.427-.177Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'm8.854 11.646 5.792-5.792a.5.5 0 0 1 .854.353v11.586a.5.5 0 0 1-.854.353l-5.792-5.792a.5.5 0 0 1 0-.708Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const triangleRight: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'm6.427 4.427 3.396 3.396a.25.25 0 0 1 0 .354l-3.396 3.396A.25.25 0 0 1 6 11.396V4.604a.25.25 0 0 1 .427-.177Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'm15.146 12.354-5.792 5.792a.5.5 0 0 1-.854-.353V6.207a.5.5 0 0 1 .854-.353l5.792 5.792a.5.5 0 0 1 0 .708Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const triangleUp: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'm4.427 9.573 3.396-3.396a.25.25 0 0 1 .354 0l3.396 3.396a.25.25 0 0 1-.177.427H4.604a.25.25 0 0 1-.177-.427Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'm12.354 8.854 5.792 5.792a.5.5 0 0 1-.353.854H6.207a.5.5 0 0 1-.353-.854l5.792-5.792a.5.5 0 0 1 .708 0Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const trophy: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M3.217 6.962A3.75 3.75 0 0 1 0 3.25v-.5C0 1.784.784 1 1.75 1h1.356c.228-.585.796-1 1.462-1h6.864c.647 0 1.227.397 1.462 1h1.356c.966 0 1.75.784 1.75 1.75v.5a3.75 3.75 0 0 1-3.217 3.712 5.014 5.014 0 0 1-2.771 3.117l.144 1.446c.005.05.03.12.114.204.086.087.217.17.373.227.283.103.618.274.89.568.285.31.467.723.467 1.226v.75h1.25a.75.75 0 0 1 0 1.5H2.75a.75.75 0 0 1 0-1.5H4v-.75c0-.503.182-.916.468-1.226.27-.294.606-.465.889-.568.139-.048.266-.126.373-.227.084-.085.109-.153.114-.204l.144-1.446a5.015 5.015 0 0 1-2.77-3.117ZM4.5 1.568V5.5a3.5 3.5 0 1 0 7 0V1.568a.068.068 0 0 0-.068-.068H4.568a.068.068 0 0 0-.068.068Zm2.957 8.902-.12 1.204c-.093.925-.858 1.47-1.467 1.691a.766.766 0 0 0-.3.176c-.037.04-.07.093-.07.21v.75h5v-.75c0-.117-.033-.17-.07-.21a.766.766 0 0 0-.3-.176c-.609-.221-1.374-.766-1.466-1.69l-.12-1.204a5.064 5.064 0 0 1-1.087 0ZM13 2.5v2.872a2.25 2.25 0 0 0 1.5-2.122v-.5a.25.25 0 0 0-.25-.25H13Zm-10 0H1.75a.25.25 0 0 0-.25.25v.5c0 .98.626 1.813 1.5 2.122Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M5.09 10.121A5.251 5.251 0 0 1 1 5V3.75C1 2.784 1.784 2 2.75 2h2.364c.236-.586.81-1 1.48-1h10.812c.67 0 1.244.414 1.48 1h2.489c.966 0 1.75.784 1.75 1.75V5a5.252 5.252 0 0 1-4.219 5.149 7.01 7.01 0 0 1-4.644 5.478l.231 3.003a.5.5 0 0 0 .034.031c.079.065.303.203.836.282.838.124 1.637.81 1.637 1.807v.75h2.25a.75.75 0 0 1 0 1.5H4.75a.75.75 0 0 1 0-1.5H7v-.75c0-.996.8-1.683 1.637-1.807.533-.08.757-.217.836-.282a.5.5 0 0 0 .034-.031l.231-3.003A7.012 7.012 0 0 1 5.09 10.12ZM6.5 2.594V9a5.5 5.5 0 1 0 11 0V2.594a.094.094 0 0 0-.094-.094H6.594a.094.094 0 0 0-.094.094Zm4.717 13.363-.215 2.793-.001.021-.003.043a1.212 1.212 0 0 1-.022.147c-.05.237-.194.567-.553.86-.348.286-.853.5-1.566.605a.478.478 0 0 0-.274.136.264.264 0 0 0-.083.188v.75h7v-.75a.264.264 0 0 0-.083-.188.478.478 0 0 0-.274-.136c-.713-.105-1.218-.32-1.567-.604-.358-.294-.502-.624-.552-.86a1.22 1.22 0 0 1-.025-.19l-.001-.022-.215-2.793a7.069 7.069 0 0 1-1.566 0ZM19 8.578A3.751 3.751 0 0 0 21.625 5V3.75a.25.25 0 0 0-.25-.25H19ZM5 3.5H2.75a.25.25 0 0 0-.25.25V5A3.752 3.752 0 0 0 5 8.537Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const typography: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M6.71 10H2.332l-.874 2.498a.75.75 0 0 1-1.415-.496l3.39-9.688a1.217 1.217 0 0 1 2.302.018l3.227 9.681a.75.75 0 0 1-1.423.474Zm3.13-4.358C10.53 4.374 11.87 4 13 4c1.5 0 3 .939 3 2.601v5.649a.75.75 0 0 1-1.448.275C13.995 12.82 13.3 13 12.5 13c-.77 0-1.514-.231-2.078-.709-.577-.488-.922-1.199-.922-2.041 0-.694.265-1.411.887-1.944C11 7.78 11.88 7.5 13 7.5h1.5v-.899c0-.54-.5-1.101-1.5-1.101-.869 0-1.528.282-1.84.858a.75.75 0 1 1-1.32-.716ZM6.21 8.5 4.574 3.594 2.857 8.5Zm8.29.5H13c-.881 0-1.375.22-1.637.444-.253.217-.363.5-.363.806 0 .408.155.697.39.896.249.21.63.354 1.11.354.732 0 1.26-.209 1.588-.449.35-.257.412-.495.412-.551Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M10.414 15H3.586l-1.631 4.505a.75.75 0 1 1-1.41-.51l5.08-14.03a1.463 1.463 0 0 1 2.75 0l5.08 14.03a.75.75 0 1 1-1.411.51Zm4.532-5.098c.913-1.683 2.703-2.205 4.284-2.205 1.047 0 2.084.312 2.878.885.801.577 1.392 1.455 1.392 2.548v8.12a.75.75 0 0 1-1.5 0v-.06l-.044.025c-.893.52-2.096.785-3.451.785-1.051 0-2.048-.315-2.795-.948-.76-.643-1.217-1.578-1.217-2.702 0-.919.349-1.861 1.168-2.563.81-.694 2-1.087 3.569-1.087H22v-1.57c0-.503-.263-.967-.769-1.332-.513-.37-1.235-.6-2.001-.6-1.319 0-2.429.43-2.966 1.42a.75.75 0 0 1-1.318-.716ZM9.87 13.5 7 5.572 4.13 13.5Zm12.13.7h-2.77c-1.331 0-2.134.333-2.593.726a1.822 1.822 0 0 0-.644 1.424c0 .689.267 1.203.686 1.557.43.365 1.065.593 1.826.593 1.183 0 2.102-.235 2.697-.581.582-.34.798-.74.798-1.134Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const undo: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M1.22 6.28a.749.749 0 0 1 0-1.06l3.5-3.5a.749.749 0 1 1 1.06 1.06L3.561 5h7.188l.001.007L10.749 5c.058 0 .116.007.171.019A4.501 4.501 0 0 1 10.5 14H8.796a.75.75 0 0 1 0-1.5H10.5a3 3 0 1 0 0-6H3.561L5.78 8.72a.749.749 0 1 1-1.06 1.06l-3.5-3.5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const unfold: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'm8.177.677 2.896 2.896a.25.25 0 0 1-.177.427H8.75v1.25a.75.75 0 0 1-1.5 0V4H5.104a.25.25 0 0 1-.177-.427L7.823.677a.25.25 0 0 1 .354 0ZM7.25 10.75a.75.75 0 0 1 1.5 0V12h2.146a.25.25 0 0 1 .177.427l-2.896 2.896a.25.25 0 0 1-.354 0l-2.896-2.896A.25.25 0 0 1 5.104 12H7.25v-1.25Zm-5-2a.75.75 0 0 0 0-1.5h-.5a.75.75 0 0 0 0 1.5h.5ZM6 8a.75.75 0 0 1-.75.75h-.5a.75.75 0 0 1 0-1.5h.5A.75.75 0 0 1 6 8Zm2.25.75a.75.75 0 0 0 0-1.5h-.5a.75.75 0 0 0 0 1.5h.5ZM12 8a.75.75 0 0 1-.75.75h-.5a.75.75 0 0 1 0-1.5h.5A.75.75 0 0 1 12 8Zm2.25.75a.75.75 0 0 0 0-1.5h-.5a.75.75 0 0 0 0 1.5h.5Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M12 23a.749.749 0 0 1-.53-.22l-3.25-3.25a.749.749 0 0 1 .326-1.275.749.749 0 0 1 .734.215L12 21.19l2.72-2.72a.749.749 0 0 1 1.275.326.749.749 0 0 1-.215.734l-3.25 3.25A.749.749 0 0 1 12 23Z',
+      'M11.47 1.22a.75.75 0 0 1 1.06 0l3.25 3.25a.751.751 0 0 1-.018 1.042.751.751 0 0 1-1.042.018L12 2.81 9.28 5.53a.751.751 0 0 1-1.042-.018.751.751 0 0 1-.018-1.042ZM12 22.25a.75.75 0 0 1-.75-.75v-5.75a.75.75 0 0 1 1.5 0v5.75a.75.75 0 0 1-.75.75ZM2.75 12a.75.75 0 0 1 .75-.75h1a.75.75 0 0 1 0 1.5h-1a.75.75 0 0 1-.75-.75Zm4 0a.75.75 0 0 1 .75-.75h1a.75.75 0 0 1 0 1.5h-1a.75.75 0 0 1-.75-.75Zm4 0a.75.75 0 0 1 .75-.75h1a.75.75 0 0 1 0 1.5h-1a.75.75 0 0 1-.75-.75Zm4 0a.75.75 0 0 1 .75-.75h1a.75.75 0 0 1 0 1.5h-1a.75.75 0 0 1-.75-.75Zm4 0a.75.75 0 0 1 .75-.75h1a.75.75 0 0 1 0 1.5h-1a.75.75 0 0 1-.75-.75Z',
+      'M12 1.5a.75.75 0 0 1 .75.75v6a.75.75 0 0 1-1.5 0v-6A.75.75 0 0 1 12 1.5Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const unlink: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M12.914 5.914a2 2 0 0 0-2.828-2.828l-.837.837a.75.75 0 1 1-1.06-1.061l.836-.837a3.5 3.5 0 1 1 4.95 4.95l-.195.194a.75.75 0 0 1-1.06-1.06l.194-.195Zm-1.87 3.482a.759.759 0 0 1-.07.079c-.63.63-1.468 1.108-2.343 1.263-.89.159-1.86-.017-2.606-.763a.75.75 0 1 1 1.06-1.06c.329.327.767.438 1.284.347.493-.088 1.018-.36 1.445-.752l-1.247-.897a.709.709 0 0 1-.01-.008l-.295-.212c-.94-.597-1.984-.499-2.676.193l-2.5 2.5a2 2 0 1 0 2.828 2.828l.837-.836a.75.75 0 0 1 1.06 1.06l-.836.837a3.5 3.5 0 0 1-4.95-4.95l2.5-2.5a3.472 3.472 0 0 1 1.354-.848L2.312 3.109a.75.75 0 0 1 .876-1.218l5.93 4.27c.115.074.226.155.335.24l6.235 4.49a.75.75 0 0 1-.876 1.218l-3.768-2.713Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M20.347 3.653a3.936 3.936 0 0 0-5.567 0l-1.75 1.75a.75.75 0 0 1-1.06-1.06l1.75-1.75a5.436 5.436 0 0 1 7.688 7.687l-1.564 1.564a.75.75 0 0 1-1.06-1.06l1.563-1.564a3.936 3.936 0 0 0 0-5.567ZM9.786 12.369a.75.75 0 0 1 1.053.125c.096.122.2.24.314.353 1.348 1.348 3.386 1.587 4.89.658l-3.922-2.858a.745.745 0 0 1-.057-.037c-1.419-1.013-3.454-.787-4.784.543L3.653 14.78a3.936 3.936 0 0 0 5.567 5.567l3-3a.75.75 0 1 1 1.06 1.06l-3 3a5.436 5.436 0 1 1-7.688-7.687l3.628-3.628a5.517 5.517 0 0 1 3.014-1.547l-7.05-5.136a.75.75 0 0 1 .883-1.213l20.25 14.75a.75.75 0 0 1-.884 1.213l-5.109-3.722c-2.155 1.709-5.278 1.425-7.232-.53a5.491 5.491 0 0 1-.431-.485.75.75 0 0 1 .125-1.053Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const unlock: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M5.5 4v2h7A1.5 1.5 0 0 1 14 7.5v6a1.5 1.5 0 0 1-1.5 1.5h-9A1.5 1.5 0 0 1 2 13.5v-6A1.5 1.5 0 0 1 3.499 6H4V4a4 4 0 0 1 7.371-2.154.75.75 0 0 1-1.264.808A2.5 2.5 0 0 0 5.5 4Zm-2 3.5v6h9v-6h-9Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M7.5 7.25V9h11a2.5 2.5 0 0 1 2.5 2.5v8a2.5 2.5 0 0 1-2.5 2.5h-13A2.5 2.5 0 0 1 3 19.5v-8A2.5 2.5 0 0 1 5.5 9H6V7.25C6 3.845 8.503 1 12 1c2.792 0 4.971 1.825 5.718 4.31a.75.75 0 1 1-1.436.432C15.71 3.84 14.079 2.5 12 2.5c-2.578 0-4.5 2.08-4.5 4.75Zm-3 4.25v8a1 1 0 0 0 1 1h13a1 1 0 0 0 1-1v-8a1 1 0 0 0-1-1h-13a1 1 0 0 0-1 1Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const unmute: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M7.563 2.069A.75.75 0 0 1 8 2.75v10.5a.751.751 0 0 1-1.238.57L3.472 11H1.75A1.75 1.75 0 0 1 0 9.25v-2.5C0 5.784.784 5 1.75 5h1.723l3.289-2.82a.75.75 0 0 1 .801-.111ZM6.5 4.38 4.238 6.319a.748.748 0 0 1-.488.181h-2a.25.25 0 0 0-.25.25v2.5c0 .138.112.25.25.25h2c.179 0 .352.064.488.18L6.5 11.62Zm6.096-2.038a.75.75 0 0 1 1.06 0 8 8 0 0 1 0 11.314.751.751 0 0 1-1.042-.018.751.751 0 0 1-.018-1.042 6.5 6.5 0 0 0 0-9.193.75.75 0 0 1 0-1.06Zm-1.06 2.121-.001.001a5 5 0 0 1 0 7.07.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734 3.5 3.5 0 0 0 0-4.95.75.75 0 1 1 1.061-1.061Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M11.553 3.064A.75.75 0 0 1 12 3.75v16.5a.75.75 0 0 1-1.255.555L5.46 16H2.75A1.75 1.75 0 0 1 1 14.25v-4.5C1 8.784 1.784 8 2.75 8h2.71l5.285-4.805a.752.752 0 0 1 .808-.13ZM10.5 5.445l-4.245 3.86a.748.748 0 0 1-.505.195h-3a.25.25 0 0 0-.25.25v4.5c0 .138.112.25.25.25h3c.187 0 .367.069.505.195l4.245 3.86Zm8.218-1.223a.75.75 0 0 1 1.06 0c4.296 4.296 4.296 11.26 0 15.556a.75.75 0 0 1-1.06-1.06 9.5 9.5 0 0 0 0-13.436.75.75 0 0 1 0-1.06Z',
+      'M16.243 7.757a.75.75 0 1 0-1.061 1.061 4.5 4.5 0 0 1 0 6.364.75.75 0 0 0 1.06 1.06 6 6 0 0 0 0-8.485Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const unread: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M10.5 3.5H1.75a.25.25 0 0 0-.25.25v.32L8 7.88l3.02-1.77a.75.75 0 0 1 .758 1.295L8.379 9.397a.75.75 0 0 1-.758 0L1.5 5.809v6.441c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25v-4.5a.75.75 0 0 1 1.5 0v4.5A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V4.513a.75.75 0 0 1 0-.027V3.75C0 2.784.784 2 1.75 2h8.75a.75.75 0 0 1 0 1.5Z',
+      'M14 6a2 2 0 1 0 0-4 2 2 0 0 0 0 4Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M1.75 4.5a.25.25 0 0 0-.25.25v.852l10.36 7a.25.25 0 0 0 .28 0l5.69-3.845A.75.75 0 0 1 18.67 10l-5.69 3.845c-.592.4-1.368.4-1.96 0L1.5 7.412V19.25c0 .138.112.25.25.25h20.5a.25.25 0 0 0 .25-.25v-8.5a.75.75 0 0 1 1.5 0v8.5A1.75 1.75 0 0 1 22.25 21H1.75A1.75 1.75 0 0 1 0 19.25V4.75C0 3.784.784 3 1.75 3h15.5a.75.75 0 0 1 0 1.5H1.75Z',
+      'M24 5.5a2.5 2.5 0 1 1-5 0 2.5 2.5 0 0 1 5 0Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const unverified: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M6.415.52a2.677 2.677 0 0 1 3.17 0l.928.68c.153.113.33.186.518.215l1.138.175a2.678 2.678 0 0 1 2.241 2.24l.175 1.138c.029.187.102.365.215.518l.68.928a2.677 2.677 0 0 1 0 3.17l-.68.928a1.186 1.186 0 0 0-.215.518l-.175 1.138a2.678 2.678 0 0 1-2.241 2.241l-1.138.175a1.186 1.186 0 0 0-.518.215l-.928.68a2.677 2.677 0 0 1-3.17 0l-.928-.68a1.186 1.186 0 0 0-.518-.215L3.83 14.41a2.678 2.678 0 0 1-2.24-2.24l-.175-1.138a1.186 1.186 0 0 0-.215-.518l-.68-.928a2.677 2.677 0 0 1 0-3.17l.68-.928a1.17 1.17 0 0 0 .215-.518l.175-1.14a2.678 2.678 0 0 1 2.24-2.24l1.138-.175c.187-.029.365-.102.518-.215l.928-.68Zm2.282 1.209a1.18 1.18 0 0 0-1.394 0l-.928.68a2.67 2.67 0 0 1-1.18.489l-1.136.174a1.18 1.18 0 0 0-.987.987l-.174 1.137a2.67 2.67 0 0 1-.489 1.18l-.68.927c-.305.415-.305.98 0 1.394l.68.928c.256.348.423.752.489 1.18l.174 1.136c.078.51.478.909.987.987l1.137.174c.427.066.831.233 1.18.489l.927.68c.415.305.98.305 1.394 0l.928-.68a2.67 2.67 0 0 1 1.18-.489l1.136-.174c.51-.078.909-.478.987-.987l.174-1.137c.066-.427.233-.831.489-1.18l.68-.927c.305-.415.305-.98 0-1.394l-.68-.928a2.67 2.67 0 0 1-.489-1.18l-.174-1.136a1.18 1.18 0 0 0-.987-.987l-1.137-.174a2.67 2.67 0 0 1-1.18-.489ZM6.92 6.085h.001a.75.75 0 0 1-1.342-.67c.169-.339.436-.701.849-.977C6.846 4.16 7.369 4 8 4a2.76 2.76 0 0 1 1.638.525c.502.377.862.965.862 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.109-.073.22-.139.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M13 16.5a1 1 0 1 1-2 0 1 1 0 0 1 2 0Zm-2.517-7.665c.112-.223.268-.424.488-.57C11.186 8.12 11.506 8 12 8c.384 0 .766.118 1.034.319a.953.953 0 0 1 .403.806c0 .48-.218.81-.62 1.186a9.293 9.293 0 0 1-.409.354 19.8 19.8 0 0 0-.294.249c-.246.213-.524.474-.738.795l-.126.19V13.5a.75.75 0 0 0 1.5 0v-1.12c.09-.1.203-.208.347-.333.063-.055.14-.119.222-.187.166-.14.358-.3.52-.452.536-.5 1.098-1.2 1.098-2.283a2.45 2.45 0 0 0-1.003-2.006C13.37 6.695 12.658 6.5 12 6.5c-.756 0-1.373.191-1.861.517a2.944 2.944 0 0 0-.997 1.148.75.75 0 0 0 1.341.67Z',
+      'M9.864 1.2a3.61 3.61 0 0 1 4.272 0l1.375 1.01c.274.2.593.333.929.384l1.686.259a3.61 3.61 0 0 1 3.021 3.02l.259 1.687c.051.336.183.655.384.929l1.01 1.375a3.61 3.61 0 0 1 0 4.272l-1.01 1.375a2.106 2.106 0 0 0-.384.929l-.259 1.686a3.61 3.61 0 0 1-3.02 3.021l-1.687.259a2.106 2.106 0 0 0-.929.384l-1.375 1.01a3.61 3.61 0 0 1-4.272 0l-1.375-1.01a2.106 2.106 0 0 0-.929-.384l-1.686-.259a3.61 3.61 0 0 1-3.021-3.02l-.259-1.687a2.106 2.106 0 0 0-.384-.929L1.2 14.136a3.61 3.61 0 0 1 0-4.272l1.01-1.375c.201-.274.333-.593.384-.929l.259-1.686a3.61 3.61 0 0 1 3.02-3.021l1.687-.259c.336-.051.655-.183.929-.384Zm3.384 1.209a2.11 2.11 0 0 0-2.496 0l-1.376 1.01a3.61 3.61 0 0 1-1.589.658l-1.686.258a2.111 2.111 0 0 0-1.766 1.766l-.258 1.686a3.614 3.614 0 0 1-.658 1.59l-1.01 1.375a2.11 2.11 0 0 0 0 2.496l1.01 1.376a3.61 3.61 0 0 1 .658 1.589l.258 1.686a2.11 2.11 0 0 0 1.766 1.765l1.686.26a3.613 3.613 0 0 1 1.59.657l1.375 1.01a2.11 2.11 0 0 0 2.496 0l1.376-1.01a3.61 3.61 0 0 1 1.589-.658l1.686-.258a2.11 2.11 0 0 0 1.765-1.766l.26-1.686a3.613 3.613 0 0 1 .657-1.59l1.01-1.375a2.11 2.11 0 0 0 0-2.496l-1.01-1.376a3.61 3.61 0 0 1-.658-1.589l-.258-1.686a2.111 2.111 0 0 0-1.766-1.766l-1.686-.258a3.614 3.614 0 0 1-1.59-.658Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const upload: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M2.75 14A1.75 1.75 0 0 1 1 12.25v-2.5a.75.75 0 0 1 1.5 0v2.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25v-2.5a.75.75 0 0 1 1.5 0v2.5A1.75 1.75 0 0 1 13.25 14Z',
+      'M11.78 4.72a.749.749 0 1 1-1.06 1.06L8.75 3.811V9.5a.75.75 0 0 1-1.5 0V3.811L5.28 5.78a.749.749 0 1 1-1.06-1.06l3.25-3.25a.749.749 0 0 1 1.06 0l3.25 3.25Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M4 20.25V18a.75.75 0 0 1 1.5 0v2.25c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25V18a.75.75 0 0 1 1.5 0v2.25A1.75 1.75 0 0 1 18.25 22H5.75A1.75 1.75 0 0 1 4 20.25Z',
+      'M5.22 9.53a.749.749 0 0 1 0-1.06l6.25-6.25a.749.749 0 0 1 1.06 0l6.25 6.25a.749.749 0 1 1-1.06 1.06l-4.97-4.969V16.75a.75.75 0 0 1-1.5 0V4.561L6.28 9.53a.749.749 0 0 1-1.06 0Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const verified: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'm9.585.52.929.68c.153.112.331.186.518.215l1.138.175a2.678 2.678 0 0 1 2.24 2.24l.174 1.139c.029.187.103.365.215.518l.68.928a2.677 2.677 0 0 1 0 3.17l-.68.928a1.174 1.174 0 0 0-.215.518l-.175 1.138a2.678 2.678 0 0 1-2.241 2.241l-1.138.175a1.17 1.17 0 0 0-.518.215l-.928.68a2.677 2.677 0 0 1-3.17 0l-.928-.68a1.174 1.174 0 0 0-.518-.215L3.83 14.41a2.678 2.678 0 0 1-2.24-2.24l-.175-1.138a1.17 1.17 0 0 0-.215-.518l-.68-.928a2.677 2.677 0 0 1 0-3.17l.68-.928c.112-.153.186-.331.215-.518l.175-1.14a2.678 2.678 0 0 1 2.24-2.24l1.139-.175c.187-.029.365-.103.518-.215l.928-.68a2.677 2.677 0 0 1 3.17 0ZM7.303 1.728l-.927.68a2.67 2.67 0 0 1-1.18.489l-1.137.174a1.179 1.179 0 0 0-.987.987l-.174 1.136a2.677 2.677 0 0 1-.489 1.18l-.68.928a1.18 1.18 0 0 0 0 1.394l.68.927c.256.348.424.753.489 1.18l.174 1.137c.078.509.478.909.987.987l1.136.174a2.67 2.67 0 0 1 1.18.489l.928.68c.414.305.979.305 1.394 0l.927-.68a2.67 2.67 0 0 1 1.18-.489l1.137-.174a1.18 1.18 0 0 0 .987-.987l.174-1.136a2.67 2.67 0 0 1 .489-1.18l.68-.928a1.176 1.176 0 0 0 0-1.394l-.68-.927a2.686 2.686 0 0 1-.489-1.18l-.174-1.137a1.179 1.179 0 0 0-.987-.987l-1.136-.174a2.677 2.677 0 0 1-1.18-.489l-.928-.68a1.176 1.176 0 0 0-1.394 0ZM11.28 6.78l-3.75 3.75a.75.75 0 0 1-1.06 0L4.72 8.78a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L7 8.94l3.22-3.22a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M17.03 9.78a.75.75 0 0 0-1.06-1.06l-5.47 5.47-2.47-2.47a.75.75 0 0 0-1.06 1.06l3 3a.75.75 0 0 0 1.06 0l6-6Z',
+      'm14.136 1.2 1.375 1.01c.274.201.593.333.929.384l1.687.259a3.61 3.61 0 0 1 3.02 3.021l.259 1.686c.051.336.183.655.384.929l1.01 1.375a3.61 3.61 0 0 1 0 4.272l-1.01 1.375a2.106 2.106 0 0 0-.384.929l-.259 1.687a3.61 3.61 0 0 1-3.021 3.02l-1.686.259a2.106 2.106 0 0 0-.929.384l-1.375 1.01a3.61 3.61 0 0 1-4.272 0l-1.375-1.01a2.106 2.106 0 0 0-.929-.384l-1.687-.259a3.61 3.61 0 0 1-3.02-3.021l-.259-1.686a2.117 2.117 0 0 0-.384-.929L1.2 14.136a3.61 3.61 0 0 1 0-4.272l1.01-1.375c.201-.274.333-.593.384-.929l.259-1.687a3.61 3.61 0 0 1 3.021-3.02l1.686-.259c.336-.051.655-.183.929-.384L9.864 1.2a3.61 3.61 0 0 1 4.272 0Zm-3.384 1.209-1.375 1.01a3.614 3.614 0 0 1-1.59.658l-1.686.258a2.111 2.111 0 0 0-1.766 1.766l-.258 1.686a3.61 3.61 0 0 1-.658 1.589l-1.01 1.376a2.11 2.11 0 0 0 0 2.496l1.01 1.375c.344.469.57 1.015.658 1.59l.258 1.686c.14.911.855 1.626 1.766 1.766l1.686.258a3.61 3.61 0 0 1 1.589.658l1.376 1.01a2.11 2.11 0 0 0 2.496 0l1.375-1.01a3.613 3.613 0 0 1 1.59-.657l1.686-.26a2.11 2.11 0 0 0 1.766-1.765l.258-1.686a3.61 3.61 0 0 1 .658-1.589l1.01-1.376a2.11 2.11 0 0 0 0-2.496l-1.01-1.375a3.613 3.613 0 0 1-.657-1.59l-.26-1.686a2.11 2.11 0 0 0-1.765-1.766l-1.686-.258a3.61 3.61 0 0 1-1.589-.658l-1.376-1.01a2.11 2.11 0 0 0-2.496 0Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const versions: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M7.75 14A1.75 1.75 0 0 1 6 12.25v-8.5C6 2.784 6.784 2 7.75 2h6.5c.966 0 1.75.784 1.75 1.75v8.5A1.75 1.75 0 0 1 14.25 14Zm-.25-1.75c0 .138.112.25.25.25h6.5a.25.25 0 0 0 .25-.25v-8.5a.25.25 0 0 0-.25-.25h-6.5a.25.25 0 0 0-.25.25ZM4.9 3.508a.75.75 0 0 1-.274 1.025.249.249 0 0 0-.126.217v6.5c0 .09.048.173.126.217a.75.75 0 0 1-.752 1.298A1.75 1.75 0 0 1 3 11.25v-6.5c0-.649.353-1.214.874-1.516a.75.75 0 0 1 1.025.274ZM1.625 5.533h.001a.249.249 0 0 0-.126.217v4.5c0 .09.048.173.126.217a.75.75 0 0 1-.752 1.298A1.748 1.748 0 0 1 0 10.25v-4.5a1.748 1.748 0 0 1 .873-1.516.75.75 0 1 1 .752 1.299Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M10 22a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h11a2 2 0 0 1 2 2v16a2 2 0 0 1-2 2Zm-.5-2a.5.5 0 0 0 .5.5h11a.5.5 0 0 0 .5-.5V4a.5.5 0 0 0-.5-.5H10a.5.5 0 0 0-.5.5ZM6.17 4.165a.75.75 0 0 1-.335 1.006c-.228.114-.295.177-.315.201a.035.035 0 0 0-.008.016.423.423 0 0 0-.012.112v13c0 .07.008.102.012.112a.03.03 0 0 0 .008.016c.02.024.087.087.315.201a.749.749 0 1 1-.67 1.342c-.272-.136-.58-.315-.81-.598C4.1 19.259 4 18.893 4 18.5v-13c0-.393.1-.759.355-1.073.23-.283.538-.462.81-.598a.75.75 0 0 1 1.006.336ZM2.15 5.624a.75.75 0 0 1-.274 1.025c-.15.087-.257.17-.32.245C1.5 6.96 1.5 6.99 1.5 7v10c0 .01 0 .04.056.106.063.074.17.158.32.245a.75.75 0 0 1-.752 1.298C.73 18.421 0 17.907 0 17V7c0-.907.73-1.42 1.124-1.65a.75.75 0 0 1 1.025.274Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const video: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M0 3.75C0 2.784.784 2 1.75 2h12.5c.966 0 1.75.784 1.75 1.75v8.5A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25Zm1.75-.25a.25.25 0 0 0-.25.25v8.5c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25v-8.5a.25.25 0 0 0-.25-.25Z',
+      'M6 10.559V5.442a.25.25 0 0 1 .379-.215l4.264 2.559a.25.25 0 0 1 0 .428l-4.264 2.559A.25.25 0 0 1 6 10.559Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M0 4.75C0 3.784.784 3 1.75 3h20.5c.966 0 1.75.784 1.75 1.75v14.5A1.75 1.75 0 0 1 22.25 21H1.75A1.75 1.75 0 0 1 0 19.25Zm1.75-.25a.25.25 0 0 0-.25.25v14.5c0 .138.112.25.25.25h20.5a.25.25 0 0 0 .25-.25V4.75a.25.25 0 0 0-.25-.25Z',
+      'M9 15.584V8.416a.5.5 0 0 1 .77-.42l5.576 3.583a.5.5 0 0 1 0 .842L9.77 16.005a.5.5 0 0 1-.77-.42Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const webhook: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M5.5 4.25a2.25 2.25 0 0 1 4.5 0 .75.75 0 0 0 1.5 0 3.75 3.75 0 1 0-6.14 2.889l-2.272 4.258a.75.75 0 0 0 1.324.706L7 7.25a.75.75 0 0 0-.309-1.015A2.25 2.25 0 0 1 5.5 4.25Z',
+      'M7.364 3.607a.75.75 0 0 1 1.03.257l2.608 4.349a3.75 3.75 0 1 1-.628 6.785.75.75 0 0 1 .752-1.299 2.25 2.25 0 1 0-.033-3.88.75.75 0 0 1-1.03-.256L7.107 4.636a.75.75 0 0 1 .257-1.03Z',
+      'M2.9 8.776A.75.75 0 0 1 2.625 9.8 2.25 2.25 0 1 0 6 11.75a.75.75 0 0 1 .75-.751h5.5a.75.75 0 0 1 0 1.5H7.425a3.751 3.751 0 1 1-5.55-3.998.75.75 0 0 1 1.024.274Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+}
+export const workflow: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M0 1.75C0 .784.784 0 1.75 0h3.5C6.216 0 7 .784 7 1.75v3.5A1.75 1.75 0 0 1 5.25 7H4v4a1 1 0 0 0 1 1h4v-1.25C9 9.784 9.784 9 10.75 9h3.5c.966 0 1.75.784 1.75 1.75v3.5A1.75 1.75 0 0 1 14.25 16h-3.5A1.75 1.75 0 0 1 9 14.25v-.75H5A2.5 2.5 0 0 1 2.5 11V7h-.75A1.75 1.75 0 0 1 0 5.25Zm1.75-.25a.25.25 0 0 0-.25.25v3.5c0 .138.112.25.25.25h3.5a.25.25 0 0 0 .25-.25v-3.5a.25.25 0 0 0-.25-.25Zm9 9a.25.25 0 0 0-.25.25v3.5c0 .138.112.25.25.25h3.5a.25.25 0 0 0 .25-.25v-3.5a.25.25 0 0 0-.25-.25Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M1 3a2 2 0 0 1 2-2h6.5a2 2 0 0 1 2 2v6.5a2 2 0 0 1-2 2H7v4.063C7 16.355 7.644 17 8.438 17H12.5v-2.5a2 2 0 0 1 2-2H21a2 2 0 0 1 2 2V21a2 2 0 0 1-2 2h-6.5a2 2 0 0 1-2-2v-2.5H8.437A2.939 2.939 0 0 1 5.5 15.562V11.5H3a2 2 0 0 1-2-2Zm2-.5a.5.5 0 0 0-.5.5v6.5a.5.5 0 0 0 .5.5h6.5a.5.5 0 0 0 .5-.5V3a.5.5 0 0 0-.5-.5ZM14.5 14a.5.5 0 0 0-.5.5V21a.5.5 0 0 0 .5.5H21a.5.5 0 0 0 .5-.5v-6.5a.5.5 0 0 0-.5-.5Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const x: OcticonSymbolVariants = {
+  '12': {
+    p: [
+      'M2.22 2.22a.749.749 0 0 1 1.06 0L6 4.939 8.72 2.22a.749.749 0 1 1 1.06 1.06L7.061 6 9.78 8.72a.749.749 0 1 1-1.06 1.06L6 7.061 3.28 9.78a.749.749 0 1 1-1.06-1.06L4.939 6 2.22 3.28a.749.749 0 0 1 0-1.06Z',
+    ],
+    h: 12,
+    w: 12,
+  },
+  '16': {
+    p: [
+      'M3.72 3.72a.75.75 0 0 1 1.06 0L8 6.94l3.22-3.22a.749.749 0 0 1 1.275.326.749.749 0 0 1-.215.734L9.06 8l3.22 3.22a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215L8 9.06l-3.22 3.22a.751.751 0 0 1-1.042-.018.751.751 0 0 1-.018-1.042L6.94 8 3.72 4.78a.75.75 0 0 1 0-1.06Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M5.72 5.72a.75.75 0 0 1 1.06 0L12 10.94l5.22-5.22a.749.749 0 0 1 1.275.326.749.749 0 0 1-.215.734L13.06 12l5.22 5.22a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215L12 13.06l-5.22 5.22a.751.751 0 0 1-1.042-.018.751.751 0 0 1-.018-1.042L10.94 12 5.72 6.78a.75.75 0 0 1 0-1.06Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const xCircle: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M2.344 2.343h-.001a8 8 0 0 1 11.314 11.314A8.002 8.002 0 0 1 .234 10.089a8 8 0 0 1 2.11-7.746Zm1.06 10.253a6.5 6.5 0 1 0 9.108-9.275 6.5 6.5 0 0 0-9.108 9.275ZM6.03 4.97 8 6.94l1.97-1.97a.749.749 0 0 1 1.275.326.749.749 0 0 1-.215.734L9.06 8l1.97 1.97a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215L8 9.06l-1.97 1.97a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734L6.94 8 4.97 6.03a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M9.036 7.976a.75.75 0 0 0-1.06 1.06L10.939 12l-2.963 2.963a.75.75 0 1 0 1.06 1.06L12 13.06l2.963 2.964a.75.75 0 0 0 1.061-1.06L13.061 12l2.963-2.964a.75.75 0 1 0-1.06-1.06L12 10.939 9.036 7.976Z',
+      'M12 1c6.075 0 11 4.925 11 11s-4.925 11-11 11S1 18.075 1 12 5.925 1 12 1ZM2.5 12a9.5 9.5 0 0 0 9.5 9.5 9.5 9.5 0 0 0 9.5-9.5A9.5 9.5 0 0 0 12 2.5 9.5 9.5 0 0 0 2.5 12Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const xCircleFill: OcticonSymbolVariants = {
+  '12': {
+    p: [
+      'M1.757 10.243a6.001 6.001 0 1 1 8.488-8.486 6.001 6.001 0 0 1-8.488 8.486ZM6 4.763l-2-2L2.763 4l2 2-2 2L4 9.237l2-2 2 2L9.237 8l-2-2 2-2L8 2.763Z',
+    ],
+    h: 12,
+    w: 12,
+  },
+  '16': {
+    p: [
+      'M2.343 13.657A8 8 0 1 1 13.658 2.343 8 8 0 0 1 2.343 13.657ZM6.03 4.97a.751.751 0 0 0-1.042.018.751.751 0 0 0-.018 1.042L6.94 8 4.97 9.97a.749.749 0 0 0 .326 1.275.749.749 0 0 0 .734-.215L8 9.06l1.97 1.97a.749.749 0 0 0 1.275-.326.749.749 0 0 0-.215-.734L9.06 8l1.97-1.97a.749.749 0 0 0-.326-1.275.749.749 0 0 0-.734.215L8 6.94Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12Zm8.036-4.024a.751.751 0 0 0-1.042.018.751.751 0 0 0-.018 1.042L10.939 12l-2.963 2.963a.749.749 0 0 0 .326 1.275.749.749 0 0 0 .734-.215L12 13.06l2.963 2.964a.75.75 0 0 0 1.061-1.06L13.061 12l2.963-2.964a.749.749 0 0 0-.326-1.275.749.749 0 0 0-.734.215L12 10.939Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const zap: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M9.504.43a1.516 1.516 0 0 1 2.437 1.713L10.415 5.5h2.123c1.57 0 2.346 1.909 1.22 3.004l-7.34 7.142a1.249 1.249 0 0 1-.871.354h-.302a1.25 1.25 0 0 1-1.157-1.723L5.633 10.5H3.462c-1.57 0-2.346-1.909-1.22-3.004L9.503.429Zm1.047 1.074L3.286 8.571A.25.25 0 0 0 3.462 9H6.75a.75.75 0 0 1 .694 1.034l-1.713 4.188 6.982-6.793A.25.25 0 0 0 12.538 7H9.25a.75.75 0 0 1-.683-1.06l2.008-4.418.003-.006a.036.036 0 0 0-.004-.009l-.006-.006-.008-.001c-.003 0-.006.002-.009.004Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M15.716 1.329a1.341 1.341 0 0 1 2.109 1.55L15.147 9h4.161c1.623 0 2.372 2.016 1.143 3.075L8.102 22.721a1.148 1.148 0 0 1-1.81-1.317L8.996 15H4.674c-1.619 0-2.37-2.008-1.148-3.07l12.19-10.6Zm.452 1.595L4.51 13.061a.25.25 0 0 0 .164.439h5.45a.749.749 0 0 1 .692 1.041l-2.559 6.066 11.215-9.668a.25.25 0 0 0-.164-.439H14a.75.75 0 0 1-.687-1.05Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const zoomIn: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M3.75 7.5a.75.75 0 0 1 .75-.75h2.25V4.5a.75.75 0 0 1 1.5 0v2.25h2.25a.75.75 0 0 1 0 1.5H8.25v2.25a.75.75 0 0 1-1.5 0V8.25H4.5a.75.75 0 0 1-.75-.75Z',
+      'M7.5 0a7.5 7.5 0 0 1 5.807 12.247l2.473 2.473a.749.749 0 1 1-1.06 1.06l-2.473-2.473A7.5 7.5 0 1 1 7.5 0Zm-6 7.5a6 6 0 1 0 12 0 6 6 0 0 0-12 0Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M10.5 5.75a.75.75 0 0 1 .75.75v3.25h3.25a.75.75 0 0 1 0 1.5h-3.25v3.25a.75.75 0 0 1-1.5 0v-3.25H6.5a.75.75 0 0 1 0-1.5h3.25V6.5a.75.75 0 0 1 .75-.75Z',
+      'M0 10.5C0 4.701 4.701 0 10.5 0S21 4.701 21 10.5c0 2.63-.967 5.033-2.564 6.875l4.344 4.345a.749.749 0 1 1-1.06 1.06l-4.345-4.344A10.459 10.459 0 0 1 10.5 21C4.701 21 0 16.299 0 10.5Zm10.5-9a9 9 0 0 0-9 9 9 9 0 0 0 9 9 9 9 0 0 0 9-9 9 9 0 0 0-9-9Z',
+    ],
+    h: 24,
+    w: 24,
+  },
+}
+export const zoomOut: OcticonSymbolVariants = {
+  '16': {
+    p: [
+      'M4.5 6.75h6a.75.75 0 0 1 0 1.5h-6a.75.75 0 0 1 0-1.5Z',
+      'M0 7.5a7.5 7.5 0 1 1 13.307 4.747l2.473 2.473a.749.749 0 1 1-1.06 1.06l-2.473-2.473A7.5 7.5 0 0 1 0 7.5Zm7.5-6a6 6 0 1 0 0 12 6 6 0 0 0 0-12Z',
+    ],
+    h: 16,
+    w: 16,
+  },
+  '24': {
+    p: [
+      'M14.5 11.25a.75.75 0 0 0 0-1.5h-8a.75.75 0 0 0 0 1.5h8Z',
+      'M0 10.5C0 4.701 4.701 0 10.5 0S21 4.701 21 10.5c0 2.63-.967 5.033-2.564 6.875l4.344 4.345a.749.749 0 1 1-1.06 1.06l-4.345-4.344A10.459 10.459 0 0 1 10.5 21C4.701 21 0 16.299 0 10.5Zm10.5-9a9 9 0 0 0-9 9 9 9 0 0 0 9 9 9 9 0 0 0 9-9 9 9 0 0 0-9-9Z',
+    ],
+    h: 24,
+    w: 24,
+  },
 }
diff --git a/app/src/ui/octicons/repository.ts b/app/src/ui/octicons/repository.ts
index 9c11b62ef4d..0515e84e355 100644
--- a/app/src/ui/octicons/repository.ts
+++ b/app/src/ui/octicons/repository.ts
@@ -1,4 +1,4 @@
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import * as octicons from '../octicons/octicons.generated'
 import { Repository } from '../../models/repository'
 import { CloningRepository } from '../../models/cloning-repository'
 
@@ -7,24 +7,24 @@ import { CloningRepository } from '../../models/cloning-repository'
  */
 export function iconForRepository(repository: Repository | CloningRepository) {
   if (repository instanceof CloningRepository) {
-    return OcticonSymbol.desktopDownload
+    return octicons.desktopDownload
   }
 
   if (repository.missing) {
-    return OcticonSymbol.alert
+    return octicons.alert
   }
 
   const gitHubRepo = repository.gitHubRepository
   if (!gitHubRepo) {
-    return OcticonSymbol.deviceDesktop
+    return octicons.deviceDesktop
   }
 
   if (gitHubRepo.isPrivate) {
-    return OcticonSymbol.lock
+    return octicons.lock
   }
   if (gitHubRepo.fork) {
-    return OcticonSymbol.repoForked
+    return octicons.repoForked
   }
 
-  return OcticonSymbol.repo
+  return octicons.repo
 }
diff --git a/app/src/ui/octicons/status.ts b/app/src/ui/octicons/status.ts
index 56c444d1a80..6de5e5cf17c 100644
--- a/app/src/ui/octicons/status.ts
+++ b/app/src/ui/octicons/status.ts
@@ -3,8 +3,8 @@ import {
   AppFileStatus,
   isConflictWithMarkers,
 } from '../../models/status'
-import * as OcticonSymbol from './octicons.generated'
-import { OcticonSymbolType } from '../octicons'
+import * as octicons from './octicons.generated'
+import { OcticonSymbol } from '../octicons'
 import { assertNever } from '../../lib/fatal-error'
 
 /**
@@ -13,25 +13,25 @@ import { assertNever } from '../../lib/fatal-error'
  *
  * Used in file lists.
  */
-export function iconForStatus(status: AppFileStatus): OcticonSymbolType {
+export function iconForStatus(status: AppFileStatus): OcticonSymbol {
   switch (status.kind) {
     case AppFileStatusKind.New:
     case AppFileStatusKind.Untracked:
-      return OcticonSymbol.diffAdded
+      return octicons.diffAdded
     case AppFileStatusKind.Modified:
-      return OcticonSymbol.diffModified
+      return octicons.diffModified
     case AppFileStatusKind.Deleted:
-      return OcticonSymbol.diffRemoved
+      return octicons.diffRemoved
     case AppFileStatusKind.Renamed:
-      return OcticonSymbol.diffRenamed
+      return octicons.diffRenamed
     case AppFileStatusKind.Conflicted:
       if (isConflictWithMarkers(status)) {
         const conflictsCount = status.conflictMarkerCount
-        return conflictsCount > 0 ? OcticonSymbol.alert : OcticonSymbol.check
+        return conflictsCount > 0 ? octicons.alert : octicons.check
       }
-      return OcticonSymbol.alert
+      return octicons.alert
     case AppFileStatusKind.Copied:
-      return OcticonSymbol.diffAdded
+      return octicons.diffAdded
     default:
       return assertNever(status, `Unknown file status ${status}`)
   }
diff --git a/app/src/ui/octicons/sync-clockwise.ts b/app/src/ui/octicons/sync-clockwise.ts
index 7cf5a78ad4f..e09143b04b4 100644
--- a/app/src/ui/octicons/sync-clockwise.ts
+++ b/app/src/ui/octicons/sync-clockwise.ts
@@ -1,17 +1,17 @@
-import { OcticonSymbolType } from './octicons.generated'
+import { OcticonSymbolVariant } from '.'
 
 /**
  * An horizontally flipped (i.e `scaleX(-1)`) but otherwise unmodified version of
  * the `sync` octicon.
  */
-export const syncClockwise: OcticonSymbolType = {
+export const syncClockwise: OcticonSymbolVariant = {
   w: 16,
   h: 16,
-  d:
+  p: [
     'M8 2.5c1.645 0 3.123.722 4.131 1.869l-1.204 1.204a.25.25 0 0 0 .177.427h3.646a.25.25 ' +
-    '0 0 0 .25-.25V2.104a.25.25 0 0 0-.427-.177l-1.38 1.38A7.001 7.001 0 0 0 1.05 7.16a.75.75 ' +
-    '0 1 0 1.49.178A5.501 5.501 0 0 1 8 2.5zm6.294 5.505a.75.75 0 0 0-.833.656 5.501 5.501 ' +
-    '0 0 1-9.592 2.97l1.204-1.204A.25.25 0 0 0 4.896 10H1.25a.25.25 0 0 0-.25.25v3.646c0 ' +
-    '.223.27.335.427.177l1.38-1.38A7.001 7.001 0 0 0 14.95 8.84a.75.75 0 0 0-.657-.834z',
-  fr: 'evenodd',
+      '0 0 0 .25-.25V2.104a.25.25 0 0 0-.427-.177l-1.38 1.38A7.001 7.001 0 0 0 1.05 7.16a.75.75 ' +
+      '0 1 0 1.49.178A5.501 5.501 0 0 1 8 2.5zm6.294 5.505a.75.75 0 0 0-.833.656 5.501 5.501 ' +
+      '0 0 1-9.592 2.97l1.204-1.204A.25.25 0 0 0 4.896 10H1.25a.25.25 0 0 0-.25.25v3.646c0 ' +
+      '.223.27.335.427.177l1.38-1.38A7.001 7.001 0 0 0 14.95 8.84a.75.75 0 0 0-.657-.834z',
+  ],
 }
diff --git a/app/src/ui/open-pull-request/open-pull-request-dialog.tsx b/app/src/ui/open-pull-request/open-pull-request-dialog.tsx
new file mode 100644
index 00000000000..e6433daf8e4
--- /dev/null
+++ b/app/src/ui/open-pull-request/open-pull-request-dialog.tsx
@@ -0,0 +1,292 @@
+import * as React from 'react'
+import { IConstrainedValue, IPullRequestState } from '../../lib/app-state'
+import { getDotComAPIEndpoint } from '../../lib/api'
+import { Branch } from '../../models/branch'
+import { ImageDiffType } from '../../models/diff'
+import { Repository } from '../../models/repository'
+import { DialogFooter, OkCancelButtonGroup, Dialog } from '../dialog'
+import { Dispatcher } from '../dispatcher'
+import { Ref } from '../lib/ref'
+import { Octicon } from '../octicons'
+import * as octicons from '../octicons/octicons.generated'
+import {
+  OpenPullRequestDialogHeader,
+  OpenPullRequestDialogId,
+} from './open-pull-request-header'
+import { PullRequestFilesChanged } from './pull-request-files-changed'
+import { PullRequestMergeStatus } from './pull-request-merge-status'
+import { ComputedAction } from '../../models/computed-action'
+
+interface IOpenPullRequestDialogProps {
+  readonly repository: Repository
+  readonly dispatcher: Dispatcher
+
+  /**
+   * The IRepositoryState.pullRequestState
+   */
+  readonly pullRequestState: IPullRequestState
+
+  /**
+   * The currently checked out branch
+   */
+  readonly currentBranch: Branch
+
+  /**
+   * See IBranchesState.defaultBranch
+   */
+  readonly defaultBranch: Branch | null
+
+  /**
+   * Branches in the repo with the repo's default remote
+   *
+   * We only want branches that are also on dotcom such that, when we ask a user
+   * to create a pull request, the base branch also exists on dotcom.
+   */
+  readonly prBaseBranches: ReadonlyArray<Branch>
+
+  /**
+   * Recent branches with the repo's default remote
+   *
+   * We only want branches that are also on dotcom such that, when we ask a user
+   * to create a pull request, the base branch also exists on dotcom.
+   */
+  readonly prRecentBaseBranches: ReadonlyArray<Branch>
+
+  /** Whether we should display side by side diffs. */
+  readonly showSideBySideDiff: boolean
+
+  /** Whether we should hide whitespace in diff. */
+  readonly hideWhitespaceInDiff: boolean
+
+  /** The type of image diff to display. */
+  readonly imageDiffType: ImageDiffType
+
+  /** Label for selected external editor */
+  readonly externalEditorLabel?: string
+
+  /**
+   * Callback to open a selected file using the configured external editor
+   *
+   * @param fullPath The full path to the file on disk
+   */
+  readonly onOpenInExternalEditor: (fullPath: string) => void
+
+  /** Width to use for the files list pane in the files changed view */
+  readonly fileListWidth: IConstrainedValue
+
+  /** If the latest commit of the pull request is not local, this will contain
+   * it's SHA  */
+  readonly nonLocalCommitSHA: string | null
+
+  /** Whether the current branch already has a pull request*/
+  readonly currentBranchHasPullRequest: boolean
+
+  /** Called to dismiss the dialog */
+  readonly onDismissed: () => void
+}
+
+/** The component for start a pull request. */
+export class OpenPullRequestDialog extends React.Component<IOpenPullRequestDialogProps> {
+  private onCreatePullRequest = () => {
+    const { currentBranchHasPullRequest, dispatcher, repository, onDismissed } =
+      this.props
+
+    if (currentBranchHasPullRequest) {
+      dispatcher.showPullRequest(repository)
+    } else {
+      const { baseBranch } = this.props.pullRequestState
+      dispatcher.createPullRequest(repository, baseBranch ?? undefined)
+      dispatcher.incrementMetric('createPullRequestCount')
+      dispatcher.incrementMetric('createPullRequestFromPreviewCount')
+    }
+
+    onDismissed()
+  }
+
+  private onBranchChange = (branch: Branch) => {
+    const { repository } = this.props
+    this.props.dispatcher.updatePullRequestBaseBranch(repository, branch)
+  }
+
+  private renderHeader() {
+    const {
+      currentBranch,
+      pullRequestState,
+      defaultBranch,
+      prBaseBranches,
+      prRecentBaseBranches,
+    } = this.props
+    const { baseBranch, commitSHAs } = pullRequestState
+    return (
+      <OpenPullRequestDialogHeader
+        repository={this.props.repository}
+        baseBranch={baseBranch}
+        currentBranch={currentBranch}
+        defaultBranch={defaultBranch}
+        prBaseBranches={prBaseBranches}
+        prRecentBaseBranches={prRecentBaseBranches}
+        commitCount={commitSHAs?.length ?? 0}
+        onBranchChange={this.onBranchChange}
+        onDismissed={this.props.onDismissed}
+      />
+    )
+  }
+
+  private renderContent() {
+    return (
+      <div className="open-pull-request-content">
+        {this.renderNoChanges()}
+        {this.renderNoDefaultBranch()}
+        {this.renderFilesChanged()}
+      </div>
+    )
+  }
+
+  private renderFilesChanged() {
+    const {
+      dispatcher,
+      externalEditorLabel,
+      hideWhitespaceInDiff,
+      imageDiffType,
+      pullRequestState,
+      repository,
+      fileListWidth,
+      nonLocalCommitSHA,
+    } = this.props
+    const { commitSelection } = pullRequestState
+    if (commitSelection === null) {
+      // type checking - will render no default branch message
+      return
+    }
+
+    const { diff, file, changesetData, shas } = commitSelection
+    const { files } = changesetData
+
+    if (shas.length === 0) {
+      return
+    }
+
+    return (
+      <PullRequestFilesChanged
+        diff={diff}
+        dispatcher={dispatcher}
+        externalEditorLabel={externalEditorLabel}
+        fileListWidth={fileListWidth}
+        files={files}
+        hideWhitespaceInDiff={hideWhitespaceInDiff}
+        imageDiffType={imageDiffType}
+        nonLocalCommitSHA={nonLocalCommitSHA}
+        selectedFile={file}
+        showSideBySideDiff={this.props.showSideBySideDiff}
+        repository={repository}
+        onOpenInExternalEditor={this.props.onOpenInExternalEditor}
+      />
+    )
+  }
+
+  private renderNoChanges() {
+    const { pullRequestState, currentBranch } = this.props
+    const { commitSelection, baseBranch, mergeStatus } = pullRequestState
+    if (commitSelection === null || baseBranch === null) {
+      // type checking - will render no default branch message
+      return
+    }
+
+    const { shas } = commitSelection
+    if (shas.length !== 0) {
+      return
+    }
+    const hasMergeBase = mergeStatus?.kind !== ComputedAction.Invalid
+    const message = hasMergeBase ? (
+      <>
+        <Ref>{baseBranch.name}</Ref> is up to date with all commits from{' '}
+        <Ref>{currentBranch.name}</Ref>.
+      </>
+    ) : (
+      <>
+        <Ref>{baseBranch.name}</Ref> and <Ref>{currentBranch.name}</Ref> are
+        entirely different commit histories.
+      </>
+    )
+    return (
+      <div className="open-pull-request-message">
+        <div>
+          <Octicon symbol={octicons.gitPullRequest} />
+          <h3>There are no changes.</h3>
+          {message}
+        </div>
+      </div>
+    )
+  }
+
+  private renderNoDefaultBranch() {
+    const { baseBranch } = this.props.pullRequestState
+
+    if (baseBranch !== null) {
+      return
+    }
+
+    return (
+      <div className="open-pull-request-message">
+        <div>
+          <Octicon symbol={octicons.gitPullRequest} />
+          <h3>Could not find a default branch to compare against.</h3>
+          Select a base branch above.
+        </div>
+      </div>
+    )
+  }
+
+  private renderFooter() {
+    const { currentBranchHasPullRequest, pullRequestState, repository } =
+      this.props
+    const { mergeStatus, commitSHAs } = pullRequestState
+    const gitHubRepository = repository.gitHubRepository
+    const isEnterprise =
+      gitHubRepository && gitHubRepository.endpoint !== getDotComAPIEndpoint()
+
+    const viewCreate = currentBranchHasPullRequest ? 'View' : ' Create'
+    const buttonTitle = `${viewCreate} pull request on GitHub${
+      isEnterprise ? ' Enterprise' : ''
+    }.`
+
+    const okButton = (
+      <>
+        {currentBranchHasPullRequest && (
+          <Octicon symbol={octicons.linkExternal} />
+        )}
+        {__DARWIN__
+          ? `${viewCreate} Pull Request`
+          : `${viewCreate} pull request`}
+      </>
+    )
+
+    return (
+      <DialogFooter>
+        <PullRequestMergeStatus mergeStatus={mergeStatus} />
+
+        <OkCancelButtonGroup
+          okButtonText={okButton}
+          okButtonTitle={buttonTitle}
+          cancelButtonText="Cancel"
+          okButtonDisabled={commitSHAs === null || commitSHAs.length === 0}
+        />
+      </DialogFooter>
+    )
+  }
+
+  public render() {
+    return (
+      <Dialog
+        titleId={OpenPullRequestDialogId}
+        className="open-pull-request"
+        onSubmit={this.onCreatePullRequest}
+        onDismissed={this.props.onDismissed}
+      >
+        {this.renderHeader()}
+        {this.renderContent()}
+        {this.renderFooter()}
+      </Dialog>
+    )
+  }
+}
diff --git a/app/src/ui/open-pull-request/open-pull-request-header.tsx b/app/src/ui/open-pull-request/open-pull-request-header.tsx
new file mode 100644
index 00000000000..60bc81490e8
--- /dev/null
+++ b/app/src/ui/open-pull-request/open-pull-request-header.tsx
@@ -0,0 +1,105 @@
+import * as React from 'react'
+import { Branch } from '../../models/branch'
+import { BranchSelect } from '../branches/branch-select'
+import { DialogHeader } from '../dialog/header'
+import { Ref } from '../lib/ref'
+import { Repository } from '../../models/repository'
+
+export const OpenPullRequestDialogId = 'Dialog_Open_Pull_Request'
+
+interface IOpenPullRequestDialogHeaderProps {
+  readonly repository: Repository
+
+  /** The base branch of the pull request */
+  readonly baseBranch: Branch | null
+
+  /** The branch of the pull request */
+  readonly currentBranch: Branch
+
+  /**
+   * See IBranchesState.defaultBranch
+   */
+  readonly defaultBranch: Branch | null
+
+  /**
+   * Branches in the repo with the repo's default remote
+   *
+   * We only want branches that are also on dotcom such that, when we ask a user
+   * to create a pull request, the base branch also exists on dotcom.
+   */
+  readonly prBaseBranches: ReadonlyArray<Branch>
+
+  /**
+   * Recent branches with the repo's default remote
+   *
+   * We only want branches that are also on dotcom such that, when we ask a user
+   * to create a pull request, the base branch also exists on dotcom.
+   */
+  readonly prRecentBaseBranches: ReadonlyArray<Branch>
+
+  /** The count of commits of the pull request */
+  readonly commitCount: number
+
+  /** When the branch selection changes */
+  readonly onBranchChange: (branch: Branch) => void
+
+  /**
+   * Event triggered when the dialog is dismissed by the user in the
+   * ways described in the dismissable prop.
+   */
+  readonly onDismissed?: () => void
+}
+
+/**
+ * A header component for the open pull request dialog. Made to house the
+ * base branch dropdown and merge details common to all pull request views.
+ */
+export class OpenPullRequestDialogHeader extends React.Component<IOpenPullRequestDialogHeaderProps> {
+  public constructor(props: IOpenPullRequestDialogHeaderProps) {
+    super(props)
+  }
+
+  public render() {
+    const title = __DARWIN__ ? 'Open a Pull Request' : 'Open a pull request'
+    const {
+      baseBranch,
+      currentBranch,
+      defaultBranch,
+      prBaseBranches,
+      prRecentBaseBranches,
+      commitCount,
+      onBranchChange,
+      onDismissed,
+    } = this.props
+    const commits = `${commitCount} commit${commitCount > 1 ? 's' : ''}`
+
+    return (
+      <DialogHeader
+        title={title}
+        titleId={OpenPullRequestDialogId}
+        onCloseButtonClick={onDismissed}
+      >
+        <div className="break"></div>
+        <div className="base-branch-details">
+          Merge {commits} into{' '}
+          <BranchSelect
+            repository={this.props.repository}
+            branch={baseBranch}
+            defaultBranch={defaultBranch}
+            currentBranch={currentBranch}
+            allBranches={prBaseBranches}
+            recentBranches={prRecentBaseBranches}
+            onChange={onBranchChange}
+            noBranchesMessage={
+              <>
+                <p>Sorry, I can't find that remote branch.</p>
+                <p>You can only open pull requests against remote branches.</p>
+              </>
+            }
+          />{' '}
+          from <Ref>{currentBranch.name}</Ref>.
+        </div>
+      </DialogHeader>
+    )
+  }
+}
diff --git a/app/src/ui/open-pull-request/pull-request-files-changed.tsx b/app/src/ui/open-pull-request/pull-request-files-changed.tsx
new file mode 100644
index 00000000000..afdbfa4b481
--- /dev/null
+++ b/app/src/ui/open-pull-request/pull-request-files-changed.tsx
@@ -0,0 +1,324 @@
+import * as React from 'react'
+import * as Path from 'path'
+import { IDiff, ImageDiffType } from '../../models/diff'
+import { Repository } from '../../models/repository'
+import { CommittedFileChange } from '../../models/status'
+import { SeamlessDiffSwitcher } from '../diff/seamless-diff-switcher'
+import { Dispatcher } from '../dispatcher'
+import { openFile } from '../lib/open-file'
+import { Resizable } from '../resizable'
+import { FileList } from '../history/file-list'
+import { IMenuItem, showContextualMenu } from '../../lib/menu-item'
+import { pathExists } from '../lib/path-exists'
+import {
+  CopyFilePathLabel,
+  CopyRelativeFilePathLabel,
+  DefaultEditorLabel,
+  isSafeFileExtension,
+  OpenWithDefaultProgramLabel,
+  RevealInFileManagerLabel,
+} from '../lib/context-menu'
+import { revealInFileManager } from '../../lib/app-shell'
+import { clipboard } from 'electron'
+import { IConstrainedValue } from '../../lib/app-state'
+import { clamp } from '../../lib/clamp'
+import { getDotComAPIEndpoint } from '../../lib/api'
+import { createCommitURL } from '../../lib/commit-url'
+import { DiffOptions } from '../diff/diff-options'
+
+interface IPullRequestFilesChangedProps {
+  readonly repository: Repository
+  readonly dispatcher: Dispatcher
+
+  /** The file whose diff should be displayed. */
+  readonly selectedFile: CommittedFileChange | null
+
+  /** The files changed in the pull request. */
+  readonly files: ReadonlyArray<CommittedFileChange>
+
+  /** The diff that should be rendered */
+  readonly diff: IDiff | null
+
+  /** The type of image diff to display. */
+  readonly imageDiffType: ImageDiffType
+
+  /** Whether we should display side by side diffs. */
+  readonly showSideBySideDiff: boolean
+
+  /** Whether we should hide whitespace in diff. */
+  readonly hideWhitespaceInDiff: boolean
+
+  /** Label for selected external editor */
+  readonly externalEditorLabel?: string
+
+  /** Width to use for the files list pane */
+  readonly fileListWidth: IConstrainedValue
+
+  /** If the latest commit of the pull request is not local, this will contain
+   * it's SHA  */
+  readonly nonLocalCommitSHA: string | null
+
+  /**
+   * Callback to open a selected file using the configured external editor
+   *
+   * @param fullPath The full path to the file on disk
+   */
+  readonly onOpenInExternalEditor: (fullPath: string) => void
+}
+
+interface IPullRequestFilesChangedState {
+  readonly showSideBySideDiff: boolean
+}
+
+/**
+ * A component for viewing the file changes for a pull request.
+ */
+export class PullRequestFilesChanged extends React.Component<
+  IPullRequestFilesChangedProps,
+  IPullRequestFilesChangedState
+> {
+  public constructor(props: IPullRequestFilesChangedProps) {
+    super(props)
+
+    this.state = { showSideBySideDiff: props.showSideBySideDiff }
+  }
+
+  private onOpenFile = (path: string) => {
+    const fullPath = Path.join(this.props.repository.path, path)
+    this.onOpenBinaryFile(fullPath)
+  }
+
+  /**
+   * Opens a binary file in an the system-assigned application for
+   * said file type.
+   */
+  private onOpenBinaryFile = (fullPath: string) => {
+    openFile(fullPath, this.props.dispatcher)
+  }
+
+  /** Called when the user changes the hide whitespace in diffs setting. */
+  private onHideWhitespaceInDiffChanged = (hideWhitespaceInDiff: boolean) => {
+    const { selectedFile } = this.props
+    return this.props.dispatcher.onHideWhitespaceInPullRequestDiffChanged(
+      hideWhitespaceInDiff,
+      this.props.repository,
+      selectedFile
+    )
+  }
+
+  private onShowSideBySideDiffChanged = (showSideBySideDiff: boolean) => {
+    this.setState({ showSideBySideDiff })
+  }
+
+  private onDiffOptionsOpened = () => {
+    this.props.dispatcher.incrementMetric('diffOptionsViewedCount')
+  }
+
+  /**
+   * Called when the user is viewing an image diff and requests
+   * to change the diff presentation mode.
+   */
+  private onChangeImageDiffType = (imageDiffType: ImageDiffType) => {
+    this.props.dispatcher.changeImageDiffType(imageDiffType)
+  }
+
+  private onFileListResize = (width: number) => {
+    this.props.dispatcher.setPullRequestFileListWidth(width)
+  }
+
+  private onFileListSizeReset = () => {
+    this.props.dispatcher.resetPullRequestFileListWidth()
+  }
+
+  private onViewOnGitHub = (file: CommittedFileChange) => {
+    const { nonLocalCommitSHA, repository, dispatcher } = this.props
+    const { gitHubRepository } = repository
+
+    if (gitHubRepository === null || nonLocalCommitSHA === null) {
+      return
+    }
+
+    const commitURL = createCommitURL(
+      gitHubRepository,
+      nonLocalCommitSHA,
+      file.path
+    )
+
+    if (commitURL === null) {
+      return
+    }
+
+    dispatcher.openInBrowser(commitURL)
+  }
+
+  private onFileContextMenu = async (
+    file: CommittedFileChange,
+    event: React.MouseEvent<HTMLDivElement>
+  ) => {
+    event.preventDefault()
+
+    const { repository } = this.props
+
+    const fullPath = Path.join(repository.path, file.path)
+    const fileExistsOnDisk = await pathExists(fullPath)
+    if (!fileExistsOnDisk) {
+      showContextualMenu([
+        {
+          label: __DARWIN__
+            ? 'File Does Not Exist on Disk'
+            : 'File does not exist on disk',
+          enabled: false,
+        },
+      ])
+      return
+    }
+
+    const { externalEditorLabel, dispatcher } = this.props
+
+    const extension = Path.extname(file.path)
+    const isSafeExtension = isSafeFileExtension(extension)
+    const openInExternalEditor =
+      externalEditorLabel !== undefined
+        ? `Open in ${externalEditorLabel}`
+        : DefaultEditorLabel
+
+    const items: IMenuItem[] = [
+      {
+        label: RevealInFileManagerLabel,
+        action: () => revealInFileManager(repository, file.path),
+        enabled: fileExistsOnDisk,
+      },
+      {
+        label: openInExternalEditor,
+        action: () => dispatcher.openInExternalEditor(fullPath),
+        enabled: fileExistsOnDisk,
+      },
+      {
+        label: OpenWithDefaultProgramLabel,
+        action: () => this.onOpenFile(file.path),
+        enabled: isSafeExtension && fileExistsOnDisk,
+      },
+      { type: 'separator' },
+      {
+        label: CopyFilePathLabel,
+        action: () => clipboard.writeText(fullPath),
+      },
+      {
+        label: CopyRelativeFilePathLabel,
+        action: () => clipboard.writeText(Path.normalize(file.path)),
+      },
+      { type: 'separator' },
+    ]
+
+    const { nonLocalCommitSHA } = this.props
+    const { gitHubRepository } = repository
+    const isEnterprise =
+      gitHubRepository && gitHubRepository.endpoint !== getDotComAPIEndpoint()
+
+    items.push({
+      label: `View on GitHub${isEnterprise ? ' Enterprise' : ''}`,
+      action: () => this.onViewOnGitHub(file),
+      enabled: nonLocalCommitSHA !== null && gitHubRepository !== null,
+    })
+
+    showContextualMenu(items)
+  }
+
+  private onFileSelected = (file: CommittedFileChange) => {
+    this.props.dispatcher.changePullRequestFileSelection(
+      this.props.repository,
+      file
+    )
+  }
+
+  private onRowDoubleClick = (row: number) => {
+    const files = this.props.files
+    const file = files[row]
+
+    this.props.onOpenInExternalEditor(file.path)
+  }
+
+  private renderHeader() {
+    const { hideWhitespaceInDiff } = this.props
+    const { showSideBySideDiff } = this.state
+    return (
+      <div className="files-changed-header">
+        <div className="commits-displayed">
+          Showing changes from all commits
+        </div>
+        <DiffOptions
+          isInteractiveDiff={false}
+          hideWhitespaceChanges={hideWhitespaceInDiff}
+          onHideWhitespaceChangesChanged={this.onHideWhitespaceInDiffChanged}
+          showSideBySideDiff={showSideBySideDiff}
+          onShowSideBySideDiffChanged={this.onShowSideBySideDiffChanged}
+          onDiffOptionsOpened={this.onDiffOptionsOpened}
+        />
+      </div>
+    )
+  }
+
+  private renderFileList() {
+    const { files, selectedFile, fileListWidth } = this.props
+
+    return (
+      <Resizable
+        width={fileListWidth.value}
+        minimumWidth={fileListWidth.min}
+        maximumWidth={fileListWidth.max}
+        onResize={this.onFileListResize}
+        onReset={this.onFileListSizeReset}
+        description="Pull request file list"
+      >
+        <FileList
+          files={files}
+          onSelectedFileChanged={this.onFileSelected}
+          selectedFile={selectedFile}
+          availableWidth={clamp(fileListWidth)}
+          onContextMenu={this.onFileContextMenu}
+          onRowDoubleClick={this.onRowDoubleClick}
+        />
+      </Resizable>
+    )
+  }
+
+  private renderDiff() {
+    const { selectedFile } = this.props
+
+    if (selectedFile === null) {
+      return
+    }
+
+    const { diff, repository, imageDiffType, hideWhitespaceInDiff } = this.props
+
+    const { showSideBySideDiff } = this.state
+
+    return (
+      <SeamlessDiffSwitcher
+        repository={repository}
+        imageDiffType={imageDiffType}
+        file={selectedFile}
+        diff={diff}
+        readOnly={true}
+        hideWhitespaceInDiff={hideWhitespaceInDiff}
+        showSideBySideDiff={showSideBySideDiff}
+        showDiffCheckMarks={false}
+        onOpenBinaryFile={this.onOpenBinaryFile}
+        onChangeImageDiffType={this.onChangeImageDiffType}
+        onHideWhitespaceInDiffChanged={this.onHideWhitespaceInDiffChanged}
+      />
+    )
+  }
+
+  public render() {
+    return (
+      <div className="pull-request-files-changed">
+        {this.renderHeader()}
+        <div className="files-diff-viewer">
+          {this.renderFileList()}
+          {this.renderDiff()}
+        </div>
+      </div>
+    )
+  }
+}
diff --git a/app/src/ui/open-pull-request/pull-request-merge-status.tsx b/app/src/ui/open-pull-request/pull-request-merge-status.tsx
new file mode 100644
index 00000000000..0b2f19d8cc1
--- /dev/null
+++ b/app/src/ui/open-pull-request/pull-request-merge-status.tsx
@@ -0,0 +1,68 @@
+import * as React from 'react'
+import { assertNever } from '../../lib/fatal-error'
+import { ComputedAction } from '../../models/computed-action'
+import { MergeTreeResult } from '../../models/merge'
+import { Octicon } from '../octicons'
+import * as octicons from '../octicons/octicons.generated'
+
+interface IPullRequestMergeStatusProps {
+  /** The result of merging the pull request branch into the base branch */
+  readonly mergeStatus: MergeTreeResult | null
+}
+
+/** The component to display message about the result of merging the pull
+ * request. */
+export class PullRequestMergeStatus extends React.Component<IPullRequestMergeStatusProps> {
+  private getMergeStatusDescription = () => {
+    const { mergeStatus } = this.props
+    if (mergeStatus === null) {
+      return ''
+    }
+
+    const { kind } = mergeStatus
+    switch (kind) {
+      case ComputedAction.Loading:
+        return (
+          <span className="pr-merge-status-loading">
+            <strong>Checking mergeability&hellip;</strong> Don’t worry, you can
+            still create the pull request.
+          </span>
+        )
+      case ComputedAction.Invalid:
+        return (
+          <span className="pr-merge-status-invalid">
+            <strong>Error checking merge status.</strong> Unable to merge
+            unrelated histories in this repository
+          </span>
+        )
+      case ComputedAction.Clean:
+        return (
+          <span className="pr-merge-status-clean">
+            <strong>
+              <Octicon symbol={octicons.check} /> Able to merge.
+            </strong>{' '}
+            These branches can be automatically merged.
+          </span>
+        )
+      case ComputedAction.Conflicts:
+        return (
+          <span className="pr-merge-status-conflicts">
+            <strong>
+              <Octicon symbol={octicons.x} /> Can't automatically merge.
+            </strong>{' '}
+            Don’t worry, you can still create the pull request.
+          </span>
+        )
+      default:
+        return assertNever(kind, `Unknown merge status kind of ${kind}.`)
+    }
+  }
+
+  public render() {
+    return (
+      <div className="pull-request-merge-status">
+        {this.getMergeStatusDescription()}
+      </div>
+    )
+  }
+}
diff --git a/app/src/ui/preferences/accessibility.tsx b/app/src/ui/preferences/accessibility.tsx
new file mode 100644
index 00000000000..3f64caab997
--- /dev/null
+++ b/app/src/ui/preferences/accessibility.tsx
@@ -0,0 +1,90 @@
+import * as React from 'react'
+import { DialogContent } from '../dialog'
+import { Checkbox, CheckboxValue } from '../lib/checkbox'
+
+interface IAccessibilityPreferencesProps {
+  readonly underlineLinks: boolean
+  readonly onUnderlineLinksChanged: (value: boolean) => void
+
+  readonly showDiffCheckMarks: boolean
+  readonly onShowDiffCheckMarksChanged: (value: boolean) => void
+}
+
+export class Accessibility extends React.Component<
+  IAccessibilityPreferencesProps,
+  {}
+> {
+  public constructor(props: IAccessibilityPreferencesProps) {
+    super(props)
+  }
+
+  public render() {
+    return (
+      <DialogContent>
+        <div className="advanced-section">
+          <h2>Accessibility</h2>
+          <Checkbox
+            label="Underline links"
+            value={
+              this.props.underlineLinks ? CheckboxValue.On : CheckboxValue.Off
+            }
+            onChange={this.onUnderlineLinksChanged}
+            ariaDescribedBy="underline-setting-description"
+          />
+          <p
+            id="underline-setting-description"
+            className="git-settings-description"
+          >
+            When enabled, GitHub Desktop will underline links in commit
+            messages, comments, and other text fields. This can help make links
+            easier to distinguish. {this.renderExampleLink()}
+          </p>
+
+          <Checkbox
+            label="Show check marks in the diff"
+            value={
+              this.props.showDiffCheckMarks
+                ? CheckboxValue.On
+                : CheckboxValue.Off
+            }
+            onChange={this.onShowDiffCheckMarksChanged}
+            ariaDescribedBy="diff-checkmarks-setting-description"
+          />
+          <p
+            id="diff-checkmarks-setting-description"
+            className="git-settings-description"
+          >
+            When enabled, check marks will be displayed along side the line
+            numbers and groups of line numbers in the diff when committing. When
+            disabled, the line number controls will be less prominent.
+          </p>
+        </div>
+      </DialogContent>
+    )
+  }
+
+  private renderExampleLink() {
+    // The example link is rendered with inline style to override the global setting.
+    const style = {
+      textDecoration: this.props.underlineLinks ? 'underline' : 'none',
+    }
+
+    return (
+      <span className="link-button-component" style={style}>
+        This is an example link
+      </span>
+    )
+  }
+
+  private onUnderlineLinksChanged = (
+    event: React.FormEvent<HTMLInputElement>
+  ) => {
+    this.props.onUnderlineLinksChanged(event.currentTarget.checked)
+  }
+
+  private onShowDiffCheckMarksChanged = (
+    event: React.FormEvent<HTMLInputElement>
+  ) => {
+    this.props.onShowDiffCheckMarksChanged(event.currentTarget.checked)
+  }
+}
diff --git a/app/src/ui/preferences/accounts.tsx b/app/src/ui/preferences/accounts.tsx
index ecd13d7d6a3..0d961e2c426 100644
--- a/app/src/ui/preferences/accounts.tsx
+++ b/app/src/ui/preferences/accounts.tsx
@@ -5,7 +5,7 @@ import { lookupPreferredEmail } from '../../lib/email'
 import { assertNever } from '../../lib/fatal-error'
 import { Button } from '../lib/button'
 import { Row } from '../lib/row'
-import { DialogContent } from '../dialog'
+import { DialogContent, DialogPreferredFocusClassName } from '../dialog'
 import { Avatar } from '../lib/avatar'
 import { CallToAction } from '../lib/call-to-action'
 
@@ -29,18 +29,21 @@ export class Accounts extends React.Component<IAccountsProps, {}> {
       <DialogContent className="accounts-tab">
         <h2>GitHub.com</h2>
         {this.props.dotComAccount
-          ? this.renderAccount(this.props.dotComAccount)
+          ? this.renderAccount(this.props.dotComAccount, SignInType.DotCom)
           : this.renderSignIn(SignInType.DotCom)}
 
         <h2>GitHub Enterprise</h2>
         {this.props.enterpriseAccount
-          ? this.renderAccount(this.props.enterpriseAccount)
+          ? this.renderAccount(
+              this.props.enterpriseAccount,
+              SignInType.Enterprise
+            )
           : this.renderSignIn(SignInType.Enterprise)}
       </DialogContent>
     )
   }
 
-  private renderAccount(account: Account) {
+  private renderAccount(account: Account, type: SignInType) {
     const avatarUser: IAvatarUser = {
       name: account.name,
       email: lookupPreferredEmail(account),
@@ -48,15 +51,30 @@ export class Accounts extends React.Component<IAccountsProps, {}> {
       endpoint: account.endpoint,
     }
 
+    const accountTypeLabel =
+      type === SignInType.DotCom ? 'GitHub.com' : 'GitHub Enterprise'
+
+    const accounts = [
+      ...(this.props.dotComAccount ? [this.props.dotComAccount] : []),
+      ...(this.props.enterpriseAccount ? [this.props.enterpriseAccount] : []),
+    ]
+
+    // The DotCom account is shown first, so its sign in/out button should be
+    // focused initially when the dialog is opened.
+    const className =
+      type === SignInType.DotCom ? DialogPreferredFocusClassName : undefined
+
     return (
       <Row className="account-info">
-        <Avatar user={avatarUser} />
-        <div className="user-info">
-          <div className="name">{account.name}</div>
-          <div className="login">@{account.login}</div>
+        <div className="user-info-container">
+          <Avatar accounts={accounts} user={avatarUser} />
+          <div className="user-info">
+            <div className="name">{account.name}</div>
+            <div className="login">@{account.login}</div>
+          </div>
         </div>
-        <Button onClick={this.logout(account)}>
-          {__DARWIN__ ? 'Sign Out' : 'Sign out'}
+        <Button onClick={this.logout(account)} className={className}>
+          {__DARWIN__ ? 'Sign Out of' : 'Sign out of'} {accountTypeLabel}
         </Button>
       </Row>
     )
@@ -71,13 +89,16 @@ export class Accounts extends React.Component<IAccountsProps, {}> {
   }
 
   private renderSignIn(type: SignInType) {
-    const signInTitle = __DARWIN__ ? 'Sign In' : 'Sign in'
+    const signInTitle = __DARWIN__ ? 'Sign Into' : 'Sign into'
     switch (type) {
       case SignInType.DotCom: {
         return (
           <CallToAction
-            actionTitle={signInTitle}
+            actionTitle={signInTitle + ' GitHub.com'}
             onAction={this.onDotComSignIn}
+            // The DotCom account is shown first, so its sign in/out button should be
+            // focused initially when the dialog is opened.
+            buttonClassName={DialogPreferredFocusClassName}
           >
             <div>
               Sign in to your GitHub.com account to access your repositories.
@@ -88,12 +109,12 @@ export class Accounts extends React.Component<IAccountsProps, {}> {
       case SignInType.Enterprise:
         return (
           <CallToAction
-            actionTitle={signInTitle}
+            actionTitle={signInTitle + ' GitHub Enterprise'}
             onAction={this.onEnterpriseSignIn}
           >
             <div>
-              If you have a GitHub Enterprise or AE account at work, sign in to
-              it to get access to your repositories.
+              If you are using GitHub Enterprise at work, sign in to it to get
+              access to your repositories.
             </div>
           </CallToAction>
         )
diff --git a/app/src/ui/preferences/advanced.tsx b/app/src/ui/preferences/advanced.tsx
index ce93745a41c..d27fb62c2e4 100644
--- a/app/src/ui/preferences/advanced.tsx
+++ b/app/src/ui/preferences/advanced.tsx
@@ -3,42 +3,23 @@ import { DialogContent } from '../dialog'
 import { Checkbox, CheckboxValue } from '../lib/checkbox'
 import { LinkButton } from '../lib/link-button'
 import { SamplesURL } from '../../lib/stats'
-import { UncommittedChangesStrategy } from '../../models/uncommitted-changes-strategy'
-import { RadioButton } from '../lib/radio-button'
 import { isWindowsOpenSSHAvailable } from '../../lib/ssh/ssh'
-import { enableHighSignalNotifications } from '../../lib/feature-flag'
-import {
-  getNotificationSettingsUrl,
-  supportsNotifications,
-  supportsNotificationsPermissionRequest,
-} from 'desktop-notifications'
-import {
-  getNotificationsPermission,
-  requestNotificationsPermission,
-} from '../main-process-proxy'
 
 interface IAdvancedPreferencesProps {
   readonly useWindowsOpenSSH: boolean
   readonly optOutOfUsageTracking: boolean
-  readonly notificationsEnabled: boolean
-  readonly uncommittedChangesStrategy: UncommittedChangesStrategy
+  readonly useExternalCredentialHelper: boolean
   readonly repositoryIndicatorsEnabled: boolean
   readonly onUseWindowsOpenSSHChanged: (checked: boolean) => void
-  readonly onNotificationsEnabledChanged: (checked: boolean) => void
   readonly onOptOutofReportingChanged: (checked: boolean) => void
-  readonly onUncommittedChangesStrategyChanged: (
-    value: UncommittedChangesStrategy
-  ) => void
+  readonly onUseExternalCredentialHelperChanged: (checked: boolean) => void
   readonly onRepositoryIndicatorsEnabledChanged: (enabled: boolean) => void
 }
 
 interface IAdvancedPreferencesState {
   readonly optOutOfUsageTracking: boolean
-  readonly uncommittedChangesStrategy: UncommittedChangesStrategy
   readonly canUseWindowsSSH: boolean
-  readonly suggestGrantNotificationPermission: boolean
-  readonly warnNotificationsDenied: boolean
-  readonly suggestConfigureNotifications: boolean
+  readonly useExternalCredentialHelper: boolean
 }
 
 export class Advanced extends React.Component<
@@ -50,17 +31,13 @@ export class Advanced extends React.Component<
 
     this.state = {
       optOutOfUsageTracking: this.props.optOutOfUsageTracking,
-      uncommittedChangesStrategy: this.props.uncommittedChangesStrategy,
       canUseWindowsSSH: false,
-      suggestGrantNotificationPermission: false,
-      warnNotificationsDenied: false,
-      suggestConfigureNotifications: false,
+      useExternalCredentialHelper: this.props.useExternalCredentialHelper,
     }
   }
 
   public componentDidMount() {
     this.checkSSHAvailability()
-    this.updateNotificationsState()
   }
 
   private async checkSSHAvailability() {
@@ -76,11 +53,13 @@ export class Advanced extends React.Component<
     this.props.onOptOutofReportingChanged(value)
   }
 
-  private onUncommittedChangesStrategyChanged = (
-    value: UncommittedChangesStrategy
+  private onUseExternalCredentialHelperChanged = (
+    event: React.FormEvent<HTMLInputElement>
   ) => {
-    this.setState({ uncommittedChangesStrategy: value })
-    this.props.onUncommittedChangesStrategyChanged(value)
+    const value = event.currentTarget.checked
+
+    this.setState({ useExternalCredentialHelper: value })
+    this.props.onUseExternalCredentialHelperChanged(value)
   }
 
   private onRepositoryIndicatorsEnabledChanged = (
@@ -95,12 +74,6 @@ export class Advanced extends React.Component<
     this.props.onUseWindowsOpenSSHChanged(event.currentTarget.checked)
   }
 
-  private onNotificationsEnabledChanged = (
-    event: React.FormEvent<HTMLInputElement>
-  ) => {
-    this.props.onNotificationsEnabledChanged(event.currentTarget.checked)
-  }
-
   private reportDesktopUsageLabel() {
     return (
       <span>
@@ -113,57 +86,34 @@ export class Advanced extends React.Component<
   public render() {
     return (
       <DialogContent>
-        <div className="advanced-section">
-          <h2>If I have changes and I switch branches...</h2>
-
-          <RadioButton
-            value={UncommittedChangesStrategy.AskForConfirmation}
-            checked={
-              this.state.uncommittedChangesStrategy ===
-              UncommittedChangesStrategy.AskForConfirmation
-            }
-            label="Ask me where I want the changes to go"
-            onSelected={this.onUncommittedChangesStrategyChanged}
-          />
-
-          <RadioButton
-            value={UncommittedChangesStrategy.MoveToNewBranch}
-            checked={
-              this.state.uncommittedChangesStrategy ===
-              UncommittedChangesStrategy.MoveToNewBranch
-            }
-            label="Always bring my changes to my new branch"
-            onSelected={this.onUncommittedChangesStrategyChanged}
-          />
-
-          <RadioButton
-            value={UncommittedChangesStrategy.StashOnCurrentBranch}
-            checked={
-              this.state.uncommittedChangesStrategy ===
-              UncommittedChangesStrategy.StashOnCurrentBranch
-            }
-            label="Always stash and leave my changes on the current branch"
-            onSelected={this.onUncommittedChangesStrategyChanged}
-          />
-        </div>
         <div className="advanced-section">
           <h2>Background updates</h2>
           <Checkbox
-            label="Periodically fetch and refresh status of all repositories"
+            label="Show status icons in the repository list"
             value={
               this.props.repositoryIndicatorsEnabled
                 ? CheckboxValue.On
                 : CheckboxValue.Off
             }
             onChange={this.onRepositoryIndicatorsEnabledChanged}
+            ariaDescribedBy="periodic-fetch-description"
           />
-          <p className="git-settings-description">
-            Allows the display of up-to-date status indicators in the repository
-            list. Disabling this may improve performance with many repositories.
-          </p>
+          <div
+            id="periodic-fetch-description"
+            className="git-settings-description"
+          >
+            <p>
+              These icons indicate which repositories have local or remote
+              changes, and require the periodic fetching of repositories that
+              are not currently selected.
+            </p>
+            <p>
+              Turning this off will not stop the periodic fetching of your
+              currently selected repository, but may improve overall app
+              performance for users with many repositories.
+            </p>
+          </div>
         </div>
-        {this.renderSSHSettings()}
-        {this.renderNotificationsSettings()}
         <div className="advanced-section">
           <h2>Usage</h2>
           <Checkbox
@@ -176,6 +126,33 @@ export class Advanced extends React.Component<
             onChange={this.onReportingOptOutChanged}
           />
         </div>
+        <h2>Network and credentials</h2>
+        {this.renderSSHSettings()}
+        <div className="advanced-section">
+          <Checkbox
+            label={'Use Git Credential Manager'}
+            value={
+              this.state.useExternalCredentialHelper
+                ? CheckboxValue.On
+                : CheckboxValue.Off
+            }
+            onChange={this.onUseExternalCredentialHelperChanged}
+            ariaDescribedBy="use-external-credential-helper-description"
+          />
+          <div
+            id="use-external-credential-helper-description"
+            className="git-settings-description"
+          >
+            <p>
+              Use{' '}
+              <LinkButton uri="https://gh.io/gcm">
+                Git Credential Manager{' '}
+              </LinkButton>{' '}
+              for private repositories outside of GitHub.com. This feature is
+              experimental and subject to change.
+            </p>
+          </div>
+        </div>
       </DialogContent>
     )
   }
@@ -187,7 +164,6 @@ export class Advanced extends React.Component<
 
     return (
       <div className="advanced-section">
-        <h2>SSH</h2>
         <Checkbox
           label="Use system OpenSSH (recommended)"
           value={
@@ -198,108 +174,4 @@ export class Advanced extends React.Component<
       </div>
     )
   }
-
-  private renderNotificationsSettings() {
-    if (!enableHighSignalNotifications()) {
-      return null
-    }
-
-    return (
-      <div className="advanced-section">
-        <h2>Notifications</h2>
-        <Checkbox
-          label="Enable notifications"
-          value={
-            this.props.notificationsEnabled
-              ? CheckboxValue.On
-              : CheckboxValue.Off
-          }
-          onChange={this.onNotificationsEnabledChanged}
-        />
-        <p className="git-settings-description">
-          Allows the display of notifications when high-signal events take place
-          in the current repository.{this.renderNotificationHint()}
-        </p>
-      </div>
-    )
-  }
-
-  private onGrantNotificationPermission = async () => {
-    await requestNotificationsPermission()
-    this.updateNotificationsState()
-  }
-
-  private async updateNotificationsState() {
-    const notificationsPermission = await getNotificationsPermission()
-    this.setState({
-      suggestGrantNotificationPermission:
-        supportsNotificationsPermissionRequest() &&
-        notificationsPermission === 'default',
-      warnNotificationsDenied: notificationsPermission === 'denied',
-      suggestConfigureNotifications: notificationsPermission === 'granted',
-    })
-  }
-
-  private renderNotificationHint() {
-    // No need to bother the user if their environment doesn't support our
-    // notifications or if they've been explicitly disabled.
-    if (!supportsNotifications() || !this.props.notificationsEnabled) {
-      return null
-    }
-
-    const {
-      suggestGrantNotificationPermission,
-      warnNotificationsDenied,
-      suggestConfigureNotifications,
-    } = this.state
-
-    if (suggestGrantNotificationPermission) {
-      return (
-        <>
-          {' '}
-          You need to{' '}
-          <LinkButton onClick={this.onGrantNotificationPermission}>
-            grant permission
-          </LinkButton>{' '}
-          to display these notifications from GitHub Desktop.
-        </>
-      )
-    }
-
-    const notificationSettingsURL = getNotificationSettingsUrl()
-
-    if (notificationSettingsURL === null) {
-      return null
-    }
-
-    if (warnNotificationsDenied) {
-      return (
-        <>
-          <br />
-          <br />
-          <span className="warning-icon">⚠️</span> GitHub Desktop has no
-          permission to display notifications. Please, enable them in the{' '}
-          <LinkButton uri={notificationSettingsURL}>
-            Notifications Settings
-          </LinkButton>
-          .
-        </>
-      )
-    }
-
-    const verb = suggestConfigureNotifications
-      ? 'properly configured'
-      : 'enabled'
-
-    return (
-      <>
-        {' '}
-        Make sure notifications are {verb} for GitHub Desktop in the{' '}
-        <LinkButton uri={notificationSettingsURL}>
-          Notifications Settings
-        </LinkButton>
-        .
-      </>
-    )
-  }
 }
diff --git a/app/src/ui/preferences/appearance.tsx b/app/src/ui/preferences/appearance.tsx
index 4e84d73d332..9bbab2de6b7 100644
--- a/app/src/ui/preferences/appearance.tsx
+++ b/app/src/ui/preferences/appearance.tsx
@@ -3,57 +3,26 @@ import {
   ApplicationTheme,
   supportsSystemThemeChanges,
   getCurrentlyAppliedTheme,
-  ICustomTheme,
 } from '../lib/application-theme'
 import { Row } from '../lib/row'
 import { DialogContent } from '../dialog'
-import {
-  VerticalSegmentedControl,
-  ISegmentedItem,
-} from '../lib/vertical-segmented-control'
-import { CustomThemeSelector } from './custom-theme-selector'
-import { enableHighContrastTheme } from '../../lib/feature-flag'
+import { RadioGroup } from '../lib/radio-group'
+import { Select } from '../lib/select'
+import { encodePathAsUrl } from '../../lib/path'
+import { tabSizeDefault } from '../../lib/stores/app-store'
 
 interface IAppearanceProps {
   readonly selectedTheme: ApplicationTheme
-  readonly customTheme?: ICustomTheme
   readonly onSelectedThemeChanged: (theme: ApplicationTheme) => void
-  readonly onCustomThemeChanged: (theme: ICustomTheme) => void
+  readonly selectedTabSize: number
+  readonly onSelectedTabSizeChanged: (tabSize: number) => void
 }
 
 interface IAppearanceState {
   readonly selectedTheme: ApplicationTheme | null
+  readonly selectedTabSize: number
 }
 
-const systemTheme: ISegmentedItem<ApplicationTheme> = {
-  title: 'System',
-  description: 'Automatically switch theme to match system theme',
-  key: ApplicationTheme.System,
-}
-
-const themes: ReadonlyArray<ISegmentedItem<ApplicationTheme>> = [
-  {
-    title: 'Light',
-    description: 'The default theme of GitHub Desktop',
-    key: ApplicationTheme.Light,
-  },
-  {
-    title: 'Dark',
-    description: 'GitHub Desktop is for you too, creatures of the night',
-    key: ApplicationTheme.Dark,
-  },
-  ...(enableHighContrastTheme()
-    ? [
-        {
-          title: 'High Contrast',
-          description: 'Customizable High Contrast Theme',
-          key: ApplicationTheme.HighContrast,
-        },
-      ]
-    : []),
-  ...(supportsSystemThemeChanges() ? [systemTheme] : []),
-]
-
 export class Appearance extends React.Component<
   IAppearanceProps,
   IAppearanceState
@@ -65,7 +34,10 @@ export class Appearance extends React.Component<
       props.selectedTheme !== ApplicationTheme.System ||
       supportsSystemThemeChanges()
 
-    this.state = { selectedTheme: usePropTheme ? props.selectedTheme : null }
+    this.state = {
+      selectedTheme: usePropTheme ? props.selectedTheme : null,
+      selectedTabSize: props.selectedTabSize,
+    }
 
     if (!usePropTheme) {
       this.initializeSelectedTheme()
@@ -73,7 +45,7 @@ export class Appearance extends React.Component<
   }
 
   public async componentDidUpdate(prevProps: IAppearanceProps) {
-    if (prevProps.selectedTheme === this.props.selectedTheme) {
+    if (prevProps === this.props) {
       return
     }
 
@@ -85,49 +57,120 @@ export class Appearance extends React.Component<
       ? this.props.selectedTheme
       : await getCurrentlyAppliedTheme()
 
-    this.setState({ selectedTheme })
+    const selectedTabSize = this.props.selectedTabSize
+
+    this.setState({ selectedTheme, selectedTabSize })
   }
 
   private initializeSelectedTheme = async () => {
     const selectedTheme = await getCurrentlyAppliedTheme()
-    this.setState({ selectedTheme })
+    const selectedTabSize = this.props.selectedTabSize
+    this.setState({ selectedTheme, selectedTabSize })
   }
 
   private onSelectedThemeChanged = (theme: ApplicationTheme) => {
     this.props.onSelectedThemeChanged(theme)
   }
 
-  private onCustomThemeChanged = (theme: ICustomTheme) => {
-    this.props.onCustomThemeChanged(theme)
+  private onSelectedTabSizeChanged = (
+    event: React.FormEvent<HTMLSelectElement>
+  ) => {
+    this.props.onSelectedTabSizeChanged(parseInt(event.currentTarget.value))
   }
 
-  public render() {
-    const { selectedTheme } = this.state
+  public renderThemeSwatch = (theme: ApplicationTheme) => {
+    const darkThemeImage = encodePathAsUrl(__dirname, 'static/ghd_dark.svg')
+    const lightThemeImage = encodePathAsUrl(__dirname, 'static/ghd_light.svg')
+
+    switch (theme) {
+      case ApplicationTheme.Light:
+        return (
+          <span>
+            <img src={lightThemeImage} alt="" />
+            <span className="theme-value-label">Light</span>
+          </span>
+        )
+      case ApplicationTheme.Dark:
+        return (
+          <span>
+            <img src={darkThemeImage} alt="" />
+            <span className="theme-value-label">Dark</span>
+          </span>
+        )
+      case ApplicationTheme.System:
+        /** Why three images? The system theme swatch uses the first image
+         * positioned relatively to get the label container size and uses the
+         * second and third positioned absolutely over first and third one
+         * clipped in half to render a split dark and light theme swatch. */
+        return (
+          <span>
+            <span className="system-theme-swatch">
+              <img src={lightThemeImage} alt="" />
+              <img src={lightThemeImage} alt="" />
+              <img src={darkThemeImage} alt="" />
+            </span>
+            <span className="theme-value-label">System</span>
+          </span>
+        )
+    }
+  }
+
+  private renderSelectedTheme() {
+    const selectedTheme = this.state.selectedTheme
 
     if (selectedTheme == null) {
-      return (
-        <DialogContent>
-          <Row>Loading system theme</Row>
-        </DialogContent>
-      )
+      return <Row>Loading system theme</Row>
     }
 
+    const themes = [
+      ApplicationTheme.Light,
+      ApplicationTheme.Dark,
+      ...(supportsSystemThemeChanges() ? [ApplicationTheme.System] : []),
+    ]
+
+    return (
+      <div className="appearance-section">
+        <h2 id="theme-heading">Theme</h2>
+
+        <RadioGroup<ApplicationTheme>
+          ariaLabelledBy="theme-heading"
+          className="theme-selector"
+          selectedKey={selectedTheme}
+          radioButtonKeys={themes}
+          onSelectionChanged={this.onSelectedThemeChanged}
+          renderRadioButtonLabelContents={this.renderThemeSwatch}
+        />
+      </div>
+    )
+  }
+
+  private renderSelectedTabSize() {
+    const availableTabSizes: number[] = [1, 2, 3, 4, 5, 6, 8, 10, 12]
+
+    return (
+      <div className="appearance-section">
+        <h2 id="diff-heading">{'Diff'}</h2>
+
+        <Select
+          value={this.state.selectedTabSize.toString()}
+          label={__DARWIN__ ? 'Tab Size' : 'Tab size'}
+          onChange={this.onSelectedTabSizeChanged}
+        >
+          {availableTabSizes.map(n => (
+            <option key={n} value={n}>
+              {n === tabSizeDefault ? `${n} (default)` : n}
+            </option>
+          ))}
+        </Select>
+      </div>
+    )
+  }
+
+  public render() {
     return (
       <DialogContent>
-        <Row>
-          <VerticalSegmentedControl
-            items={themes}
-            selectedKey={selectedTheme}
-            onSelectionChanged={this.onSelectedThemeChanged}
-          />
-        </Row>
-        <Row>
-          <CustomThemeSelector
-            onCustomThemeChanged={this.onCustomThemeChanged}
-            selectedTheme={selectedTheme}
-            customTheme={this.props.customTheme}
-          />
-        </Row>
+        {this.renderSelectedTheme()}
+        {this.renderSelectedTabSize()}
       </DialogContent>
     )
   }
diff --git a/app/src/ui/preferences/custom-integration-form.tsx b/app/src/ui/preferences/custom-integration-form.tsx
new file mode 100644
index 00000000000..688f6098fc4
--- /dev/null
+++ b/app/src/ui/preferences/custom-integration-form.tsx
@@ -0,0 +1,209 @@
+import * as React from 'react'
+import { TextBox } from '../lib/text-box'
+import { Button } from '../lib/button'
+import { showOpenDialog } from '../main-process-proxy'
+import { InputError } from '../lib/input-description/input-error'
+import {
+  checkTargetPathArgument,
+  validateCustomIntegrationPath,
+  parseCustomIntegrationArguments,
+  TargetPathArgument,
+} from '../../lib/custom-integration'
+
+interface ICustomIntegrationFormProps {
+  /** ID used to prefix the IDs of some child elements */
+  readonly id: string
+  readonly path: string
+  readonly arguments: string
+  readonly onPathChanged: (path: string, bundleID?: string) => void
+  readonly onArgumentsChanged: (args: string) => void
+}
+
+interface ICustomIntegrationFormState {
+  readonly path: string
+  readonly arguments: string
+  /** Whether or not the current path is valid */
+  readonly isValidPath: boolean
+  /** Whether or not to show a warning for an invalid path */
+  readonly showNonValidPathWarning: boolean
+  /** Whether or not the current arguments are valid */
+  readonly isValidArgs: boolean
+  /** Whether or not to show an error for invalid arguments */
+  readonly showNonValidArgsError: boolean
+  /**
+   * Whether or not to show an error for missing target path placeholder among
+   * the arguments.
+   */
+  readonly showNoRepoPathArgError: boolean
+}
+
+/** A form for configuring a custom integration, with a path and arguments. */
+export class CustomIntegrationForm extends React.Component<
+  ICustomIntegrationFormProps,
+  ICustomIntegrationFormState
+> {
+  private pathInputRef = React.createRef<TextBox>()
+
+  public constructor(props: ICustomIntegrationFormProps) {
+    super(props)
+
+    this.state = {
+      path: props.path,
+      arguments: props.arguments,
+      isValidPath: false,
+      showNonValidPathWarning: false,
+      isValidArgs: false,
+      showNonValidArgsError: false,
+      showNoRepoPathArgError: false,
+    }
+  }
+
+  /** Focuses the path text box. */
+  public focus() {
+    this.pathInputRef.current?.focus()
+  }
+
+  public render() {
+    return (
+      <div className="custom-integration-form-container">
+        <div className="custom-integration-form-path-container">
+          <TextBox
+            label="Path"
+            value={this.state.path}
+            ref={this.pathInputRef}
+            onValueChanged={this.onPathChanged}
+            placeholder="Path to executable"
+            ariaDescribedBy={`${this.props.id}-custom-integration-path-error`}
+          />
+          <Button onClick={this.onChoosePath}>Choose…</Button>
+        </div>
+        {this.renderPathErrors()}
+        <TextBox
+          label="Arguments"
+          value={this.state.arguments}
+          onValueChanged={this.onParamsChanged}
+          placeholder="Command line arguments"
+          ariaDescribedBy={`${this.props.id}-custom-integration-args-error`}
+        />
+        {this.renderArgsErrors()}
+      </div>
+    )
+  }
+
+  private renderPathErrors() {
+    if (this.state.isValidPath || !this.state.showNonValidPathWarning) {
+      return null
+    }
+
+    const errorDescription =
+      'This path does not appear to be a valid executable.'
+
+    return (
+      <div className="custom-integration-form-error">
+        <InputError
+          id={`${this.props.id}-custom-integration-path-error`}
+          trackedUserInput={this.state.path}
+          ariaLiveMessage={errorDescription}
+        >
+          {errorDescription}
+        </InputError>
+      </div>
+    )
+  }
+
+  private renderArgsErrors() {
+    if (
+      this.state.isValidArgs ||
+      (!this.state.showNoRepoPathArgError && !this.state.showNonValidArgsError)
+    ) {
+      return null
+    }
+
+    const errorDescription = this.state.showNonValidArgsError
+      ? 'These arguments are not valid.'
+      : `Arguments must include the target path placeholder (${TargetPathArgument}).`
+
+    return (
+      <div className="custom-integration-form-error">
+        <InputError
+          id={`${this.props.id}-custom-integration-args-error`}
+          trackedUserInput={this.state.path}
+          ariaLiveMessage={errorDescription}
+        >
+          {errorDescription}
+        </InputError>
+      </div>
+    )
+  }
+
+  private onChoosePath = async () => {
+    // On macOS we also want to allow selecting directories, since apps on macOS
+    // are usually directories (e.g. apps on /Applications).
+    const path = await showOpenDialog({
+      properties: __DARWIN__ ? ['openFile', 'openDirectory'] : ['openFile'],
+    })
+
+    if (path === null) {
+      return
+    }
+
+    this.updatePath(path)
+  }
+
+  private async updatePath(path: string) {
+    this.setState({ path, isValidPath: false })
+
+    const result = await validateCustomIntegrationPath(path)
+
+    this.setState({
+      isValidPath: result.isValid,
+      showNonValidPathWarning: !result.isValid,
+    })
+
+    if (result.isValid) {
+      this.props.onPathChanged(path, result.bundleID)
+    }
+  }
+
+  private onPathChanged = (path: string) => {
+    this.updatePath(path)
+  }
+
+  private updateArguments(args: string) {
+    try {
+      const argv = parseCustomIntegrationArguments(args)
+
+      if (!checkTargetPathArgument(argv)) {
+        this.setState({
+          arguments: args,
+          isValidArgs: false,
+          showNonValidArgsError: false,
+          showNoRepoPathArgError: true,
+        })
+        return
+      }
+
+      this.setState({
+        arguments: args,
+        isValidArgs: true,
+        showNonValidArgsError: false,
+        showNoRepoPathArgError: false,
+      })
+
+      this.props.onArgumentsChanged(args)
+    } catch (e) {
+      log.error('Failed to parse custom integration arguments:', e)
+
+      this.setState({
+        arguments: args,
+        isValidArgs: false,
+        showNonValidArgsError: true,
+        showNoRepoPathArgError: false,
+      })
+    }
+  }
+
+  private onParamsChanged = (params: string) => {
+    this.updateArguments(params)
+  }
+}
diff --git a/app/src/ui/preferences/custom-theme-selector.tsx b/app/src/ui/preferences/custom-theme-selector.tsx
deleted file mode 100644
index 0811d6223c3..00000000000
--- a/app/src/ui/preferences/custom-theme-selector.tsx
+++ /dev/null
@@ -1,191 +0,0 @@
-import * as React from 'react'
-import { ApplicationTheme, ICustomTheme } from '../lib/application-theme'
-import { SketchPicker } from 'react-color'
-import { Button } from '../lib/button'
-import { Octicon, syncClockwise } from '../octicons'
-import { enableCustomizeTheme } from '../../lib/feature-flag'
-import { CustomThemeDefaults } from '../lib/custom-theme'
-
-interface ICustomThemeSelectorProps {
-  readonly selectedTheme: ApplicationTheme
-  readonly customTheme?: ICustomTheme
-  readonly onCustomThemeChanged: (customTheme: ICustomTheme) => void
-}
-
-interface ICustomThemeSelectorState {
-  readonly customTheme?: ICustomTheme
-  readonly selectedThemeOptionColor: keyof ICustomTheme
-  readonly isPopoverOpen: boolean
-  readonly popoverBottom: string
-  readonly popoverLeft: string
-}
-
-export class CustomThemeSelector extends React.Component<
-  ICustomThemeSelectorProps,
-  ICustomThemeSelectorState
-> {
-  public constructor(props: ICustomThemeSelectorProps) {
-    super(props)
-
-    this.state = {
-      customTheme: this.getDefaultCustomTheme(),
-      isPopoverOpen: false,
-      selectedThemeOptionColor: 'background',
-      popoverBottom: '500px',
-      popoverLeft: '275px',
-    }
-  }
-
-  private isCustom = (): boolean => {
-    return (
-      this.props.selectedTheme === ApplicationTheme.HighContrast &&
-      enableCustomizeTheme()
-    )
-  }
-
-  private getDefaultCustomTheme = (): ICustomTheme => {
-    const { customTheme } = this.props
-    const defaultTheme =
-      customTheme === undefined
-        ? CustomThemeDefaults[ApplicationTheme.HighContrast]
-        : customTheme
-
-    if (customTheme === undefined) {
-      this.props.onCustomThemeChanged(defaultTheme)
-    }
-
-    return defaultTheme
-  }
-
-  private onThemeChange = (color: { hex: string }) => {
-    this.closePopover()
-    if (this.state.customTheme === undefined) {
-      log.error(
-        '[onThemeChange] - customTheme not defined. This should not be possible.'
-      )
-      return
-    }
-
-    this.setState({
-      customTheme: {
-        ...this.state.customTheme,
-        [this.state.selectedThemeOptionColor]: color.hex,
-      },
-    })
-    this.props.onCustomThemeChanged(this.state.customTheme)
-  }
-
-  private openPopover = () => {
-    if (this.state === null || this.state.isPopoverOpen === true) {
-      return
-    }
-
-    this.setState({ isPopoverOpen: true })
-  }
-
-  private closePopover = () => {
-    if (this.state === null || this.state.isPopoverOpen === false) {
-      return
-    }
-
-    this.setState({ isPopoverOpen: false })
-  }
-
-  private onSwatchClick = (selectedThemeOptionColor: keyof ICustomTheme) => {
-    return (event: any) => {
-      const popoverBottom = `${event.currentTarget.offsetTop - 300}px`
-      const popoverLeft = `${event.currentTarget.offsetLeft + 50}px`
-      this.setState({ selectedThemeOptionColor, popoverBottom, popoverLeft })
-      this.openPopover()
-    }
-  }
-
-  private onResetToDefaults = () => {
-    this.setState({
-      customTheme: CustomThemeDefaults[ApplicationTheme.HighContrast],
-    })
-    this.props.onCustomThemeChanged(
-      CustomThemeDefaults[ApplicationTheme.HighContrast]
-    )
-  }
-
-  private renderPopover() {
-    if (this.state === null || !this.state.isPopoverOpen) {
-      return
-    }
-
-    if (this.state.customTheme === undefined) {
-      log.error(
-        '[onThemeChange] - customTheme not defined. This should not be possible.'
-      )
-      return
-    }
-
-    const styles = {
-      bottom: this.state.popoverBottom,
-      left: this.state.popoverLeft,
-    }
-
-    return (
-      <div className="color-picker-container" style={styles}>
-        <SketchPicker
-          color={this.state.customTheme[this.state.selectedThemeOptionColor]}
-          onChangeComplete={this.onThemeChange}
-        ></SketchPicker>
-      </div>
-    )
-  }
-
-  private renderThemeOptions = () => {
-    const customTheme =
-      this.state.customTheme === undefined
-        ? this.getDefaultCustomTheme()
-        : this.state.customTheme
-
-    const themePropTitleMap = new Map([
-      ['background', 'Background'],
-      ['border', 'Border'],
-      ['text', 'Text'],
-      ['activeItem', 'Active'],
-      ['activeText', 'Active Text'],
-    ])
-
-    return Object.entries(customTheme).map(([key, value], i) => {
-      const keyTyped = key as keyof ICustomTheme
-      return (
-        <div key={i} className="swatch-box">
-          <div
-            className="theme-option-swatch"
-            onClick={this.onSwatchClick(keyTyped)}
-            style={{
-              backgroundColor: value,
-            }}
-          ></div>
-          <div className="theme-option-title">{themePropTitleMap.get(key)}</div>
-        </div>
-      )
-    })
-  }
-
-  public render() {
-    if (!this.isCustom()) {
-      return null
-    }
-
-    return (
-      <div className="custom-theme-selector">
-        <div className="custom-theme-selecter-header">
-          <h2>Customize:</h2>
-          <Button
-            onClick={this.onResetToDefaults}
-            tooltip="Reset to High Contrast defaults"
-          >
-            <Octicon symbol={syncClockwise} />
-          </Button>
-        </div>
-        <div className="swatch-options">{this.renderThemeOptions()}</div>
-        {this.renderPopover()}
-      </div>
-    )
-  }
-}
diff --git a/app/src/ui/preferences/git.tsx b/app/src/ui/preferences/git.tsx
index ab8eee9f1d0..52d487d83c2 100644
--- a/app/src/ui/preferences/git.tsx
+++ b/app/src/ui/preferences/git.tsx
@@ -1,9 +1,8 @@
 import * as React from 'react'
 import { DialogContent } from '../dialog'
-import { SuggestedBranchNames } from '../../lib/helpers/default-branch'
 import { RefNameTextBox } from '../lib/ref-name-text-box'
 import { Ref } from '../lib/ref'
-import { RadioButton } from '../lib/radio-button'
+import { LinkButton } from '../lib/link-button'
 import { Account } from '../../models/account'
 import { GitConfigUserForm } from '../lib/git-config-user-form'
 
@@ -11,6 +10,7 @@ interface IGitProps {
   readonly name: string
   readonly email: string
   readonly defaultBranch: string
+  readonly isLoadingGitConfig: boolean
 
   readonly dotComAccount: Account | null
   readonly enterpriseAccount: Account | null
@@ -18,46 +18,11 @@ interface IGitProps {
   readonly onNameChanged: (name: string) => void
   readonly onEmailChanged: (email: string) => void
   readonly onDefaultBranchChanged: (defaultBranch: string) => void
-}
 
-interface IGitState {
-  /**
-   * True if the default branch setting is not one of the suggestions.
-   * It's used to display the "Other" text box that allows the user to
-   * enter a custom branch name.
-   */
-  readonly defaultBranchIsOther: boolean
+  readonly onEditGlobalGitConfig: () => void
 }
 
-// This will be the prepopulated branch name on the "other" input
-// field when the user selects it.
-const OtherNameForDefaultBranch = ''
-
-export class Git extends React.Component<IGitProps, IGitState> {
-  private defaultBranchInputRef = React.createRef<RefNameTextBox>()
-
-  public constructor(props: IGitProps) {
-    super(props)
-
-    this.state = {
-      defaultBranchIsOther: !SuggestedBranchNames.includes(
-        this.props.defaultBranch
-      ),
-    }
-  }
-
-  public componentDidUpdate(prevProps: IGitProps) {
-    // Focus the text input that allows the user to enter a custom
-    // branch name when the user has selected "Other...".
-    if (
-      this.props.defaultBranch !== prevProps.defaultBranch &&
-      this.props.defaultBranch === OtherNameForDefaultBranch &&
-      this.defaultBranchInputRef.current !== null
-    ) {
-      this.defaultBranchInputRef.current.focus()
-    }
-  }
-
+export class Git extends React.Component<IGitProps> {
   public render() {
     return (
       <DialogContent>
@@ -72,6 +37,7 @@ export class Git extends React.Component<IGitProps, IGitState> {
       <GitConfigUserForm
         email={this.props.email}
         name={this.props.name}
+        isLoadingGitConfig={this.props.isLoadingGitConfig}
         enterpriseAccount={this.props.enterpriseAccount}
         dotComAccount={this.props.dotComAccount}
         onEmailChanged={this.props.onEmailChanged}
@@ -80,82 +46,35 @@ export class Git extends React.Component<IGitProps, IGitState> {
     )
   }
 
-  private renderWarningMessage = (
-    sanitizedBranchName: string,
-    proposedBranchName: string
-  ) => {
-    if (sanitizedBranchName === '') {
-      return (
-        <>
-          <Ref>{proposedBranchName}</Ref> is an invalid branch name.
-        </>
-      )
-    }
-
-    return (
-      <>
-        Will be saved as <Ref>{sanitizedBranchName}</Ref>.
-      </>
-    )
-  }
-
   private renderDefaultBranchSetting() {
-    const { defaultBranchIsOther } = this.state
-
     return (
       <div className="default-branch-component">
-        <h2>Default branch name for new repositories</h2>
-
-        {SuggestedBranchNames.map((branchName: string) => (
-          <RadioButton
-            key={branchName}
-            checked={
-              !defaultBranchIsOther && this.props.defaultBranch === branchName
-            }
-            value={branchName}
-            label={branchName}
-            onSelected={this.onDefaultBranchChanged}
-          />
-        ))}
-        <RadioButton
-          key={OtherNameForDefaultBranch}
-          checked={defaultBranchIsOther}
-          value={OtherNameForDefaultBranch}
-          label="Other…"
-          onSelected={this.onDefaultBranchChanged}
+        <h2 id="default-branch-heading">
+          Default branch name for new repositories
+        </h2>
+
+        <RefNameTextBox
+          initialValue={this.props.defaultBranch}
+          onValueChange={this.props.onDefaultBranchChanged}
+          ariaLabelledBy={'default-branch-heading'}
+          ariaDescribedBy="default-branch-description"
+          warningMessageVerb="saved"
         />
 
-        {defaultBranchIsOther && (
-          <RefNameTextBox
-            initialValue={this.props.defaultBranch}
-            renderWarningMessage={this.renderWarningMessage}
-            onValueChange={this.props.onDefaultBranchChanged}
-            ref={this.defaultBranchInputRef}
-          />
-        )}
+        <p id="default-branch-description" className="git-settings-description">
+          GitHub's default branch name is <Ref>main</Ref>. You may want to
+          change it due to different workflows, or because your integrations
+          still require the historical default branch name of <Ref>master</Ref>.
+        </p>
 
         <p className="git-settings-description">
-          These preferences will edit your global Git config.
+          These preferences will{' '}
+          <LinkButton onClick={this.props.onEditGlobalGitConfig}>
+            edit your global Git config file
+          </LinkButton>
+          .
         </p>
       </div>
     )
   }
-
-  /**
-   * Handler to make sure that we show/hide the text box to enter a custom
-   * branch name when the user clicks on one of the radio buttons.
-   *
-   * We don't want to call this handler on changes to the text box since that
-   * will cause the text box to be hidden if the user types a branch name
-   * that starts with one of the suggested branch names (e.g `mainXYZ`).
-   *
-   * @param defaultBranch string the selected default branch
-   */
-  private onDefaultBranchChanged = (defaultBranch: string) => {
-    this.setState({
-      defaultBranchIsOther: !SuggestedBranchNames.includes(defaultBranch),
-    })
-
-    this.props.onDefaultBranchChanged(defaultBranch)
-  }
 }
diff --git a/app/src/ui/preferences/integrations.tsx b/app/src/ui/preferences/integrations.tsx
index 212ae87aabd..51061c8a942 100644
--- a/app/src/ui/preferences/integrations.tsx
+++ b/app/src/ui/preferences/integrations.tsx
@@ -5,31 +5,55 @@ import { Row } from '../../ui/lib/row'
 import { Select } from '../lib/select'
 import { Shell, parse as parseShell } from '../../lib/shells'
 import { suggestedExternalEditor } from '../../lib/editors/shared'
+import { CustomIntegrationForm } from './custom-integration-form'
+import { ICustomIntegration } from '../../lib/custom-integration'
+import { enableCustomIntegration } from '../../lib/feature-flag'
+
+const CustomIntegrationValue = 'other'
 
 interface IIntegrationsPreferencesProps {
   readonly availableEditors: ReadonlyArray<string>
   readonly selectedExternalEditor: string | null
   readonly availableShells: ReadonlyArray<Shell>
   readonly selectedShell: Shell
+  readonly useCustomEditor: boolean
+  readonly customEditor: ICustomIntegration
+  readonly useCustomShell: boolean
+  readonly customShell: ICustomIntegration
   readonly onSelectedEditorChanged: (editor: string) => void
   readonly onSelectedShellChanged: (shell: Shell) => void
+  readonly onUseCustomEditorChanged: (useCustomEditor: boolean) => void
+  readonly onCustomEditorChanged: (customEditor: ICustomIntegration) => void
+  readonly onUseCustomShellChanged: (useCustomShell: boolean) => void
+  readonly onCustomShellChanged: (customShell: ICustomIntegration) => void
 }
 
 interface IIntegrationsPreferencesState {
   readonly selectedExternalEditor: string | null
   readonly selectedShell: Shell
+  readonly useCustomEditor: boolean
+  readonly customEditor: ICustomIntegration
+  readonly useCustomShell: boolean
+  readonly customShell: ICustomIntegration
 }
 
 export class Integrations extends React.Component<
   IIntegrationsPreferencesProps,
   IIntegrationsPreferencesState
 > {
+  private customEditorFormRef = React.createRef<CustomIntegrationForm>()
+  private customShellFormRef = React.createRef<CustomIntegrationForm>()
+
   public constructor(props: IIntegrationsPreferencesProps) {
     super(props)
 
     this.state = {
       selectedExternalEditor: this.props.selectedExternalEditor,
       selectedShell: this.props.selectedShell,
+      useCustomEditor: this.props.useCustomEditor,
+      customEditor: this.props.customEditor,
+      useCustomShell: this.props.useCustomShell,
+      customShell: this.props.customShell,
     }
   }
 
@@ -64,30 +88,102 @@ export class Integrations extends React.Component<
     })
   }
 
+  public componentDidMount(): void {
+    if (enableCustomIntegration()) {
+      const {
+        availableEditors,
+        availableShells,
+        useCustomEditor,
+        useCustomShell,
+      } = this.props
+
+      // When there are no available editors or shells, the `Select` component
+      // will have the custom editor or shell already selected, but we need
+      // to handle that as initial value, otherwise the custom integration
+      // form won't be rendered.
+
+      if (availableEditors.length === 0 && !useCustomEditor) {
+        this.setSelectedEditor(CustomIntegrationValue)
+      }
+
+      if (availableShells.length === 0 && !useCustomShell) {
+        this.setSelectedShell(CustomIntegrationValue)
+      }
+    }
+  }
+
+  public componentDidUpdate(
+    prevProps: IIntegrationsPreferencesProps,
+    prevState: IIntegrationsPreferencesState
+  ): void {
+    // When the user switches to the custom editor or shell, we want to focus the
+    // path input field.
+    if (!prevState.useCustomEditor && this.state.useCustomEditor) {
+      this.customEditorFormRef.current?.focus()
+    }
+
+    if (!prevState.useCustomShell && this.state.useCustomShell) {
+      this.customShellFormRef.current?.focus()
+    }
+  }
+
   private onSelectedEditorChanged = (
     event: React.FormEvent<HTMLSelectElement>
   ) => {
     const value = event.currentTarget.value
-    if (value) {
-      this.setState({ selectedExternalEditor: value })
-      this.props.onSelectedEditorChanged(value)
+    if (!value) {
+      return
+    }
+
+    this.setSelectedEditor(value)
+  }
+
+  private setSelectedEditor = (editor: string) => {
+    if (editor === CustomIntegrationValue) {
+      this.setState({ useCustomEditor: true })
+      this.props.onUseCustomEditorChanged(true)
+    } else {
+      this.setState({
+        useCustomEditor: false,
+        selectedExternalEditor: editor,
+      })
+      this.props.onUseCustomEditorChanged(false)
+      this.props.onSelectedEditorChanged(editor)
     }
   }
 
   private onSelectedShellChanged = (
     event: React.FormEvent<HTMLSelectElement>
   ) => {
-    const value = parseShell(event.currentTarget.value)
-    this.setState({ selectedShell: value })
-    this.props.onSelectedShellChanged(value)
+    const value = event.currentTarget.value
+    if (!value) {
+      return
+    }
+
+    this.setSelectedShell(value)
+  }
+
+  private setSelectedShell = (shell: string) => {
+    if (shell === CustomIntegrationValue) {
+      this.setState({ useCustomShell: true })
+      this.props.onUseCustomShellChanged(true)
+    } else {
+      const parsedValue = parseShell(shell)
+      this.setState({
+        useCustomShell: false,
+        selectedShell: parsedValue,
+      })
+      this.props.onSelectedShellChanged(parsedValue)
+      this.props.onUseCustomShellChanged(false)
+    }
   }
 
   private renderExternalEditor() {
     const options = this.props.availableEditors
-    const selectedEditor = this.state.selectedExternalEditor
+    const { selectedExternalEditor, useCustomEditor } = this.state
     const label = __DARWIN__ ? 'External Editor' : 'External editor'
 
-    if (options.length === 0) {
+    if (!enableCustomIntegration() && options.length === 0) {
       // this is emulating the <Select/> component's UI so the styles are
       // consistent for either case.
       //
@@ -108,8 +204,13 @@ export class Integrations extends React.Component<
 
     return (
       <Select
-        label={label}
-        value={selectedEditor ? selectedEditor : undefined}
+        label={enableCustomIntegration() ? undefined : label}
+        aria-label="External editor"
+        value={
+          useCustomEditor
+            ? CustomIntegrationValue
+            : selectedExternalEditor ?? undefined
+        }
         onChange={this.onSelectedEditorChanged}
       >
         {options.map(n => (
@@ -117,16 +218,83 @@ export class Integrations extends React.Component<
             {n}
           </option>
         ))}
+        {enableCustomIntegration() && (
+          <option key={CustomIntegrationValue} value={CustomIntegrationValue}>
+            {__DARWIN__
+              ? 'Configure Custom Editor…'
+              : 'Configure custom editor…'}
+          </option>
+        )}
       </Select>
     )
   }
+
+  private renderNoExternalEditorHint() {
+    const options = this.props.availableEditors
+    if (options.length > 0) {
+      return null
+    }
+
+    return (
+      <Row>
+        <div className="no-options-found">
+          <span>
+            No other editors found.{' '}
+            <LinkButton uri={suggestedExternalEditor.url}>
+              Install {suggestedExternalEditor.name}?
+            </LinkButton>
+          </span>
+        </div>
+      </Row>
+    )
+  }
+
+  private renderCustomExternalEditor() {
+    return (
+      <Row>
+        <CustomIntegrationForm
+          id="custom-editor"
+          ref={this.customEditorFormRef}
+          path={this.state.customEditor.path ?? ''}
+          arguments={this.state.customEditor.arguments}
+          onPathChanged={this.onCustomEditorPathChanged}
+          onArgumentsChanged={this.onCustomEditorArgumentsChanged}
+        />
+      </Row>
+    )
+  }
+
+  private onCustomEditorPathChanged = (path: string, bundleID?: string) => {
+    const customEditor: ICustomIntegration = {
+      path,
+      bundleID,
+      arguments: this.state.customEditor.arguments ?? [],
+    }
+
+    this.setState({ customEditor })
+    this.props.onCustomEditorChanged(customEditor)
+  }
+
+  private onCustomEditorArgumentsChanged = (args: string) => {
+    const customEditor: ICustomIntegration = {
+      path: this.state.customEditor.path,
+      bundleID: this.state.customEditor.bundleID,
+      arguments: args,
+    }
+
+    this.setState({ customEditor })
+    this.props.onCustomEditorChanged(customEditor)
+  }
+
   private renderSelectedShell() {
     const options = this.props.availableShells
+    const { selectedShell, useCustomShell } = this.state
 
     return (
       <Select
-        label="Shell"
-        value={this.state.selectedShell}
+        label={enableCustomIntegration() ? undefined : 'Shell'}
+        aria-label="Shell"
+        value={useCustomShell ? CustomIntegrationValue : selectedShell}
         onChange={this.onSelectedShellChanged}
       >
         {options.map(n => (
@@ -134,16 +302,80 @@ export class Integrations extends React.Component<
             {n}
           </option>
         ))}
+        {enableCustomIntegration() && (
+          <option key={CustomIntegrationValue} value={CustomIntegrationValue}>
+            {__DARWIN__ ? 'Configure Custom Shell…' : 'Configure custom shell…'}
+          </option>
+        )}
       </Select>
     )
   }
 
+  private renderCustomShell() {
+    return (
+      <Row>
+        <CustomIntegrationForm
+          id="custom-shell"
+          ref={this.customShellFormRef}
+          path={this.state.customShell.path}
+          arguments={this.state.customShell.arguments}
+          onPathChanged={this.onCustomShellPathChanged}
+          onArgumentsChanged={this.onCustomShellArgumentsChanged}
+        />
+      </Row>
+    )
+  }
+
+  private onCustomShellPathChanged = (path: string, bundleID?: string) => {
+    const customShell: ICustomIntegration = {
+      path,
+      bundleID,
+      arguments: this.state.customShell.arguments ?? [],
+    }
+
+    this.setState({ customShell })
+    this.props.onCustomShellChanged(customShell)
+  }
+
+  private onCustomShellArgumentsChanged = (args: string) => {
+    const customShell: ICustomIntegration = {
+      path: this.state.customShell.path ?? '',
+      bundleID: this.state.customShell.bundleID,
+      arguments: args,
+    }
+
+    this.setState({ customShell })
+    this.props.onCustomShellChanged(customShell)
+  }
+
   public render() {
+    if (!enableCustomIntegration()) {
+      return (
+        <DialogContent>
+          <h2>Applications</h2>
+          <Row>{this.renderExternalEditor()}</Row>
+          <Row>{this.renderSelectedShell()}</Row>
+        </DialogContent>
+      )
+    }
+
     return (
       <DialogContent>
-        <h2>Applications</h2>
-        <Row>{this.renderExternalEditor()}</Row>
-        <Row>{this.renderSelectedShell()}</Row>
+        <fieldset>
+          <legend>
+            <h2>{__DARWIN__ ? 'External Editor' : 'External editor'}</h2>
+          </legend>
+          <Row>{this.renderExternalEditor()}</Row>
+          {this.state.useCustomEditor && this.renderCustomExternalEditor()}
+          {this.renderNoExternalEditorHint()}
+        </fieldset>
+        <fieldset>
+          <legend>
+            <h2>Shell</h2>
+          </legend>
+          <Row>{this.renderSelectedShell()}</Row>
+          {this.state.useCustomShell && this.renderCustomShell()}
+        </fieldset>
       </DialogContent>
     )
   }
diff --git a/app/src/ui/preferences/notifications.tsx b/app/src/ui/preferences/notifications.tsx
new file mode 100644
index 00000000000..6ed64a8057b
--- /dev/null
+++ b/app/src/ui/preferences/notifications.tsx
@@ -0,0 +1,149 @@
+import * as React from 'react'
+import { DialogContent } from '../dialog'
+import { Checkbox, CheckboxValue } from '../lib/checkbox'
+import { LinkButton } from '../lib/link-button'
+import {
+  getNotificationSettingsUrl,
+  supportsNotifications,
+  supportsNotificationsPermissionRequest,
+} from 'desktop-notifications'
+import {
+  getNotificationsPermission,
+  requestNotificationsPermission,
+} from '../main-process-proxy'
+
+interface INotificationPreferencesProps {
+  readonly notificationsEnabled: boolean
+  readonly onNotificationsEnabledChanged: (checked: boolean) => void
+}
+
+interface INotificationPreferencesState {
+  readonly suggestGrantNotificationPermission: boolean
+  readonly warnNotificationsDenied: boolean
+  readonly suggestConfigureNotifications: boolean
+}
+
+export class Notifications extends React.Component<
+  INotificationPreferencesProps,
+  INotificationPreferencesState
+> {
+  public constructor(props: INotificationPreferencesProps) {
+    super(props)
+
+    this.state = {
+      suggestGrantNotificationPermission: false,
+      warnNotificationsDenied: false,
+      suggestConfigureNotifications: false,
+    }
+  }
+
+  public componentDidMount() {
+    this.updateNotificationsState()
+  }
+
+  private onNotificationsEnabledChanged = (
+    event: React.FormEvent<HTMLInputElement>
+  ) => {
+    this.props.onNotificationsEnabledChanged(event.currentTarget.checked)
+  }
+
+  public render() {
+    return (
+      <DialogContent>
+        <div className="advanced-section">
+          <h2>Notifications</h2>
+          <Checkbox
+            label="Enable notifications"
+            value={
+              this.props.notificationsEnabled
+                ? CheckboxValue.On
+                : CheckboxValue.Off
+            }
+            onChange={this.onNotificationsEnabledChanged}
+          />
+          <p className="git-settings-description">
+            Allows the display of notifications when high-signal events take
+            place in the current repository.{this.renderNotificationHint()}
+          </p>
+        </div>
+      </DialogContent>
+    )
+  }
+
+  private onGrantNotificationPermission = async () => {
+    await requestNotificationsPermission()
+    this.updateNotificationsState()
+  }
+
+  private async updateNotificationsState() {
+    const notificationsPermission = await getNotificationsPermission()
+    this.setState({
+      suggestGrantNotificationPermission:
+        supportsNotificationsPermissionRequest() &&
+        notificationsPermission === 'default',
+      warnNotificationsDenied: notificationsPermission === 'denied',
+      suggestConfigureNotifications: notificationsPermission === 'granted',
+    })
+  }
+
+  private renderNotificationHint() {
+    // No need to bother the user if their environment doesn't support our
+    // notifications or if they've been explicitly disabled.
+    if (!supportsNotifications() || !this.props.notificationsEnabled) {
+      return null
+    }
+
+    const {
+      suggestGrantNotificationPermission,
+      warnNotificationsDenied,
+      suggestConfigureNotifications,
+    } = this.state
+
+    if (suggestGrantNotificationPermission) {
+      return (
+        <>
+          {' '}
+          You need to{' '}
+          <LinkButton onClick={this.onGrantNotificationPermission}>
+            grant permission
+          </LinkButton>{' '}
+          to display these notifications from GitHub Desktop.
+        </>
+      )
+    }
+
+    const notificationSettingsURL = getNotificationSettingsUrl()
+
+    if (notificationSettingsURL === null) {
+      return null
+    }
+
+    if (warnNotificationsDenied) {
+      return (
+        <div className="setting-hint-warning">
+          <span className="warning-icon">⚠️</span> GitHub Desktop has no
+          permission to display notifications. Please, enable them in the{' '}
+          <LinkButton uri={notificationSettingsURL}>
+            Notifications Settings
+          </LinkButton>
+          .
+        </div>
+      )
+    }
+
+    const verb = suggestConfigureNotifications
+      ? 'properly configured'
+      : 'enabled'
+
+    return (
+      <>
+        {' '}
+        Make sure notifications are {verb} for GitHub Desktop in the{' '}
+        <LinkButton uri={notificationSettingsURL}>
+          Notifications Settings
+        </LinkButton>
+        .
+      </>
+    )
+  }
+}
diff --git a/app/src/ui/preferences/preferences.tsx b/app/src/ui/preferences/preferences.tsx
index fb730ea15d3..485da893886 100644
--- a/app/src/ui/preferences/preferences.tsx
+++ b/app/src/ui/preferences/preferences.tsx
@@ -20,7 +20,7 @@ import {
   InvalidGitAuthorNameMessage,
 } from '../lib/identifier-rules'
 import { Appearance } from './appearance'
-import { ApplicationTheme, ICustomTheme } from '../lib/application-theme'
+import { ApplicationTheme } from '../lib/application-theme'
 import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group'
 import { Integrations } from './integrations'
 import {
@@ -28,7 +28,7 @@ import {
   defaultUncommittedChangesStrategy,
 } from '../../models/uncommitted-changes-strategy'
 import { Octicon } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import * as octicons from '../octicons/octicons.generated'
 import {
   isConfigFileLockError,
   parseConfigLockFilePathFromError,
@@ -40,6 +40,13 @@ import {
 } from '../../lib/helpers/default-branch'
 import { Prompts } from './prompts'
 import { Repository } from '../../models/repository'
+import { Notifications } from './notifications'
+import { Accessibility } from './accessibility'
+import {
+  ICustomIntegration,
+  TargetPathArgument,
+  isValidCustomIntegration,
+} from '../../lib/custom-integration'
 
 interface IPreferencesProps {
   readonly dispatcher: Dispatcher
@@ -48,19 +55,32 @@ interface IPreferencesProps {
   readonly repository: Repository | null
   readonly onDismissed: () => void
   readonly useWindowsOpenSSH: boolean
+  readonly showCommitLengthWarning: boolean
   readonly notificationsEnabled: boolean
   readonly optOutOfUsageTracking: boolean
+  readonly useExternalCredentialHelper: boolean
   readonly initialSelectedTab?: PreferencesTab
   readonly confirmRepositoryRemoval: boolean
   readonly confirmDiscardChanges: boolean
   readonly confirmDiscardChangesPermanently: boolean
+  readonly confirmDiscardStash: boolean
+  readonly confirmCheckoutCommit: boolean
   readonly confirmForcePush: boolean
+  readonly confirmUndoCommit: boolean
+  readonly askForConfirmationOnCommitFilteredChanges: boolean
   readonly uncommittedChangesStrategy: UncommittedChangesStrategy
   readonly selectedExternalEditor: string | null
   readonly selectedShell: Shell
   readonly selectedTheme: ApplicationTheme
-  readonly customTheme?: ICustomTheme
+  readonly selectedTabSize: number
+  readonly useCustomEditor: boolean
+  readonly customEditor: ICustomIntegration | null
+  readonly useCustomShell: boolean
+  readonly customShell: ICustomIntegration | null
   readonly repositoryIndicatorsEnabled: boolean
+  readonly onEditGlobalGitConfig: () => void
+  readonly underlineLinks: boolean
+  readonly showDiffCheckMarks: boolean
 }
 
 interface IPreferencesState {
@@ -73,17 +93,28 @@ interface IPreferencesState {
   readonly initialDefaultBranch: string | null
   readonly disallowedCharactersMessage: string | null
   readonly useWindowsOpenSSH: boolean
+  readonly showCommitLengthWarning: boolean
   readonly notificationsEnabled: boolean
   readonly optOutOfUsageTracking: boolean
+  readonly useExternalCredentialHelper: boolean
   readonly confirmRepositoryRemoval: boolean
   readonly confirmDiscardChanges: boolean
   readonly confirmDiscardChangesPermanently: boolean
+  readonly confirmDiscardStash: boolean
+  readonly confirmCheckoutCommit: boolean
   readonly confirmForcePush: boolean
+  readonly confirmUndoCommit: boolean
+  readonly askForConfirmationOnCommitFilteredChanges: boolean
   readonly uncommittedChangesStrategy: UncommittedChangesStrategy
   readonly availableEditors: ReadonlyArray<string>
+  readonly useCustomEditor: boolean
+  readonly customEditor: ICustomIntegration
+  readonly useCustomShell: boolean
+  readonly customShell: ICustomIntegration
   readonly selectedExternalEditor: string | null
   readonly availableShells: ReadonlyArray<Shell>
   readonly selectedShell: Shell
+
   /**
    * If unable to save Git configuration values (name, email)
    * due to an existing configuration lock file this property
@@ -93,6 +124,25 @@ interface IPreferencesState {
    */
   readonly existingLockFilePath?: string
   readonly repositoryIndicatorsEnabled: boolean
+
+  readonly initiallySelectedTheme: ApplicationTheme
+  readonly initiallySelectedTabSize: number
+
+  readonly isLoadingGitConfig: boolean
+
+  readonly underlineLinks: boolean
+
+  readonly showDiffCheckMarks: boolean
+}
+
+/**
+ * Default custom integration values to coalesce with. We can't make up a path
+ * nor a bundle ID, but we can at least provide a default argument.
+ */
+const DefaultCustomIntegration: ICustomIntegration = {
+  path: '',
+  bundleID: undefined,
+  arguments: TargetPathArgument,
 }
 
 /** The app-level preferences component. */
@@ -113,18 +163,33 @@ export class Preferences extends React.Component<
       initialDefaultBranch: null,
       disallowedCharactersMessage: null,
       availableEditors: [],
+      useCustomEditor: this.props.useCustomEditor,
+      customEditor: this.props.customEditor ?? DefaultCustomIntegration,
+      useCustomShell: this.props.useCustomShell,
+      customShell: this.props.customShell ?? DefaultCustomIntegration,
       useWindowsOpenSSH: false,
+      showCommitLengthWarning: false,
       notificationsEnabled: true,
       optOutOfUsageTracking: false,
+      useExternalCredentialHelper: false,
       confirmRepositoryRemoval: false,
       confirmDiscardChanges: false,
       confirmDiscardChangesPermanently: false,
+      confirmDiscardStash: false,
+      confirmCheckoutCommit: false,
       confirmForcePush: false,
+      confirmUndoCommit: false,
+      askForConfirmationOnCommitFilteredChanges: false,
       uncommittedChangesStrategy: defaultUncommittedChangesStrategy,
       selectedExternalEditor: this.props.selectedExternalEditor,
       availableShells: [],
       selectedShell: this.props.selectedShell,
       repositoryIndicatorsEnabled: this.props.repositoryIndicatorsEnabled,
+      initiallySelectedTheme: this.props.selectedTheme,
+      initiallySelectedTabSize: this.props.selectedTabSize,
+      isLoadingGitConfig: true,
+      underlineLinks: this.props.underlineLinks,
+      showDiffCheckMarks: this.props.showDiffCheckMarks,
     }
   }
 
@@ -158,8 +223,8 @@ export class Preferences extends React.Component<
       getAvailableShells(),
     ])
 
-    const availableEditors = editors.map(e => e.editor)
-    const availableShells = shells.map(e => e.shell)
+    const availableEditors = editors.map(e => e.editor) ?? null
+    const availableShells = shells.map(e => e.shell) ?? null
 
     this.setState({
       committerName,
@@ -169,25 +234,48 @@ export class Preferences extends React.Component<
       initialCommitterEmail,
       initialDefaultBranch,
       useWindowsOpenSSH: this.props.useWindowsOpenSSH,
+      showCommitLengthWarning: this.props.showCommitLengthWarning,
       notificationsEnabled: this.props.notificationsEnabled,
       optOutOfUsageTracking: this.props.optOutOfUsageTracking,
+      useExternalCredentialHelper: this.props.useExternalCredentialHelper,
       confirmRepositoryRemoval: this.props.confirmRepositoryRemoval,
       confirmDiscardChanges: this.props.confirmDiscardChanges,
       confirmDiscardChangesPermanently:
         this.props.confirmDiscardChangesPermanently,
+      confirmDiscardStash: this.props.confirmDiscardStash,
+      confirmCheckoutCommit: this.props.confirmCheckoutCommit,
       confirmForcePush: this.props.confirmForcePush,
+      confirmUndoCommit: this.props.confirmUndoCommit,
+      askForConfirmationOnCommitFilteredChanges:
+        this.props.askForConfirmationOnCommitFilteredChanges,
       uncommittedChangesStrategy: this.props.uncommittedChangesStrategy,
       availableShells,
       availableEditors,
+      useCustomEditor: this.props.useCustomEditor,
+      customEditor: this.props.customEditor ?? DefaultCustomIntegration,
+      useCustomShell: this.props.useCustomShell,
+      customShell: this.props.customShell ?? DefaultCustomIntegration,
+      isLoadingGitConfig: false,
     })
   }
 
+  private onCancel = () => {
+    if (this.state.initiallySelectedTheme !== this.props.selectedTheme) {
+      this.onSelectedThemeChanged(this.state.initiallySelectedTheme)
+    }
+    if (this.state.initiallySelectedTabSize !== this.props.selectedTabSize) {
+      this.onSelectedTabSizeChanged(this.state.initiallySelectedTabSize)
+    }
+
+    this.props.onDismissed()
+  }
+
   public render() {
     return (
       <Dialog
         id="preferences"
-        title={__DARWIN__ ? 'Preferences' : 'Options'}
-        onDismissed={this.props.onDismissed}
+        title={__DARWIN__ ? 'Settings' : 'Options'}
+        onDismissed={this.onCancel}
         onSubmit={this.onSave}
       >
         <div className="preferences-container">
@@ -197,30 +285,38 @@ export class Preferences extends React.Component<
             selectedIndex={this.state.selectedIndex}
             type={TabBarType.Vertical}
           >
-            <span>
-              <Octicon className="icon" symbol={OcticonSymbol.home} />
+            <span id={this.getTabId(PreferencesTab.Accounts)}>
+              <Octicon className="icon" symbol={octicons.home} />
               Accounts
             </span>
-            <span>
-              <Octicon className="icon" symbol={OcticonSymbol.person} />
+            <span id={this.getTabId(PreferencesTab.Integrations)}>
+              <Octicon className="icon" symbol={octicons.person} />
               Integrations
             </span>
-            <span>
-              <Octicon className="icon" symbol={OcticonSymbol.gitCommit} />
+            <span id={this.getTabId(PreferencesTab.Git)}>
+              <Octicon className="icon" symbol={octicons.gitCommit} />
               Git
             </span>
-            <span>
-              <Octicon className="icon" symbol={OcticonSymbol.paintbrush} />
+            <span id={this.getTabId(PreferencesTab.Appearance)}>
+              <Octicon className="icon" symbol={octicons.paintbrush} />
               Appearance
             </span>
-            <span>
-              <Octicon className="icon" symbol={OcticonSymbol.question} />
+            <span id={this.getTabId(PreferencesTab.Notifications)}>
+              <Octicon className="icon" symbol={octicons.bell} />
+              Notifications
+            </span>
+            <span id={this.getTabId(PreferencesTab.Prompts)}>
+              <Octicon className="icon" symbol={octicons.question} />
               Prompts
             </span>
-            <span>
-              <Octicon className="icon" symbol={OcticonSymbol.settings} />
+            <span id={this.getTabId(PreferencesTab.Advanced)}>
+              <Octicon className="icon" symbol={octicons.gear} />
               Advanced
             </span>
+            <span id={this.getTabId(PreferencesTab.Accessibility)}>
+              <Octicon className="icon" symbol={octicons.accessibility} />
+              Accessibility
+            </span>
           </TabBar>
 
           {this.renderActiveTab()}
@@ -230,6 +326,40 @@ export class Preferences extends React.Component<
     )
   }
 
+  private getTabId = (tab: PreferencesTab) => {
+    let suffix
+    switch (tab) {
+      case PreferencesTab.Accounts:
+        suffix = 'accounts'
+        break
+      case PreferencesTab.Integrations:
+        suffix = 'integrations'
+        break
+      case PreferencesTab.Git:
+        suffix = 'git'
+        break
+      case PreferencesTab.Appearance:
+        suffix = 'appearance'
+        break
+      case PreferencesTab.Notifications:
+        suffix = 'notifications'
+        break
+      case PreferencesTab.Prompts:
+        suffix = 'prompts'
+        break
+      case PreferencesTab.Advanced:
+        suffix = 'advanced'
+        break
+      case PreferencesTab.Accessibility:
+        suffix = 'accessibility'
+        break
+      default:
+        return assertNever(tab, `Unknown tab type: ${tab}`)
+    }
+
+    return `preferences-tab-${suffix}`
+  }
+
   private onDotComSignIn = () => {
     this.props.onDismissed()
     this.props.dispatcher.showDotComSignInDialog()
@@ -276,7 +406,15 @@ export class Preferences extends React.Component<
             onSelectedEditorChanged={this.onSelectedEditorChanged}
             availableShells={this.state.availableShells}
             selectedShell={this.state.selectedShell}
+            useCustomEditor={this.state.useCustomEditor}
+            customEditor={this.state.customEditor}
+            useCustomShell={this.state.useCustomShell}
+            customShell={this.state.customShell}
             onSelectedShellChanged={this.onSelectedShellChanged}
+            onUseCustomEditorChanged={this.onUseCustomEditorChanged}
+            onCustomEditorChanged={this.onCustomEditorChanged}
+            onUseCustomShellChanged={this.onUseCustomShellChanged}
+            onCustomShellChanged={this.onCustomShellChanged}
           />
         )
         break
@@ -306,6 +444,8 @@ export class Preferences extends React.Component<
               onNameChanged={this.onCommitterNameChanged}
               onEmailChanged={this.onCommitterEmailChanged}
               onDefaultBranchChanged={this.onDefaultBranchChanged}
+              isLoadingGitConfig={this.state.isLoadingGitConfig}
+              onEditGlobalGitConfig={this.props.onEditGlobalGitConfig}
             />
           </>
         )
@@ -315,9 +455,17 @@ export class Preferences extends React.Component<
         View = (
           <Appearance
             selectedTheme={this.props.selectedTheme}
-            customTheme={this.props.customTheme}
             onSelectedThemeChanged={this.onSelectedThemeChanged}
-            onCustomThemeChanged={this.onCustomThemeChanged}
+            selectedTabSize={this.props.selectedTabSize}
+            onSelectedTabSizeChanged={this.onSelectedTabSizeChanged}
+          />
+        )
+        break
+      case PreferencesTab.Notifications:
+        View = (
+          <Notifications
+            notificationsEnabled={this.state.notificationsEnabled}
+            onNotificationsEnabledChanged={this.onNotificationsEnabledChanged}
           />
         )
         break
@@ -329,15 +477,35 @@ export class Preferences extends React.Component<
             confirmDiscardChangesPermanently={
               this.state.confirmDiscardChangesPermanently
             }
+            confirmDiscardStash={this.state.confirmDiscardStash}
+            confirmCheckoutCommit={this.state.confirmCheckoutCommit}
             confirmForcePush={this.state.confirmForcePush}
+            confirmUndoCommit={this.state.confirmUndoCommit}
+            askForConfirmationOnCommitFilteredChanges={
+              this.state.askForConfirmationOnCommitFilteredChanges
+            }
             onConfirmRepositoryRemovalChanged={
               this.onConfirmRepositoryRemovalChanged
             }
             onConfirmDiscardChangesChanged={this.onConfirmDiscardChangesChanged}
+            onConfirmDiscardStashChanged={this.onConfirmDiscardStashChanged}
+            onConfirmCheckoutCommitChanged={this.onConfirmCheckoutCommitChanged}
             onConfirmForcePushChanged={this.onConfirmForcePushChanged}
             onConfirmDiscardChangesPermanentlyChanged={
               this.onConfirmDiscardChangesPermanentlyChanged
             }
+            onConfirmUndoCommitChanged={this.onConfirmUndoCommitChanged}
+            onAskForConfirmationOnCommitFilteredChanges={
+              this.onAskForConfirmationOnCommitFilteredChanges
+            }
+            uncommittedChangesStrategy={this.state.uncommittedChangesStrategy}
+            onUncommittedChangesStrategyChanged={
+              this.onUncommittedChangesStrategyChanged
+            }
+            showCommitLengthWarning={this.state.showCommitLengthWarning}
+            onShowCommitLengthWarningChanged={
+              this.onShowCommitLengthWarningChanged
+            }
           />
         )
         break
@@ -346,15 +514,13 @@ export class Preferences extends React.Component<
         View = (
           <Advanced
             useWindowsOpenSSH={this.state.useWindowsOpenSSH}
-            notificationsEnabled={this.state.notificationsEnabled}
             optOutOfUsageTracking={this.state.optOutOfUsageTracking}
+            useExternalCredentialHelper={this.state.useExternalCredentialHelper}
             repositoryIndicatorsEnabled={this.state.repositoryIndicatorsEnabled}
-            uncommittedChangesStrategy={this.state.uncommittedChangesStrategy}
             onUseWindowsOpenSSHChanged={this.onUseWindowsOpenSSHChanged}
-            onNotificationsEnabledChanged={this.onNotificationsEnabledChanged}
             onOptOutofReportingChanged={this.onOptOutofReportingChanged}
-            onUncommittedChangesStrategyChanged={
-              this.onUncommittedChangesStrategyChanged
+            onUseExternalCredentialHelperChanged={
+              this.onUseExternalCredentialHelperChanged
             }
             onRepositoryIndicatorsEnabledChanged={
               this.onRepositoryIndicatorsEnabledChanged
@@ -363,11 +529,29 @@ export class Preferences extends React.Component<
         )
         break
       }
+      case PreferencesTab.Accessibility:
+        View = (
+          <Accessibility
+            underlineLinks={this.state.underlineLinks}
+            showDiffCheckMarks={this.state.showDiffCheckMarks}
+            onShowDiffCheckMarksChanged={this.onShowDiffCheckMarksChanged}
+            onUnderlineLinksChanged={this.onUnderlineLinksChanged}
+          />
+        )
+        break
       default:
         return assertNever(index, `Unknown tab index: ${index}`)
     }
 
-    return <div className="tab-container">{View}</div>
+    return (
+      <div
+        className="tab-container"
+        role="tabpanel"
+        aria-labelledby={this.getTabId(index)}
+      >
+        {View}
+      </div>
+    )
   }
 
   private onRepositoryIndicatorsEnabledChanged = (
@@ -388,6 +572,12 @@ export class Preferences extends React.Component<
     this.setState({ useWindowsOpenSSH })
   }
 
+  private onShowCommitLengthWarningChanged = (
+    showCommitLengthWarning: boolean
+  ) => {
+    this.setState({ showCommitLengthWarning })
+  }
+
   private onNotificationsEnabledChanged = (notificationsEnabled: boolean) => {
     this.setState({ notificationsEnabled })
   }
@@ -396,6 +586,10 @@ export class Preferences extends React.Component<
     this.setState({ optOutOfUsageTracking: value })
   }
 
+  private onUseExternalCredentialHelperChanged = (value: boolean) => {
+    this.setState({ useExternalCredentialHelper: value })
+  }
+
   private onConfirmRepositoryRemovalChanged = (value: boolean) => {
     this.setState({ confirmRepositoryRemoval: value })
   }
@@ -404,6 +598,14 @@ export class Preferences extends React.Component<
     this.setState({ confirmDiscardChanges: value })
   }
 
+  private onConfirmDiscardStashChanged = (value: boolean) => {
+    this.setState({ confirmDiscardStash: value })
+  }
+
+  private onConfirmCheckoutCommitChanged = (value: boolean) => {
+    this.setState({ confirmCheckoutCommit: value })
+  }
+
   private onConfirmDiscardChangesPermanentlyChanged = (value: boolean) => {
     this.setState({ confirmDiscardChangesPermanently: value })
   }
@@ -412,6 +614,14 @@ export class Preferences extends React.Component<
     this.setState({ confirmForcePush: value })
   }
 
+  private onConfirmUndoCommitChanged = (value: boolean) => {
+    this.setState({ confirmUndoCommit: value })
+  }
+
+  private onAskForConfirmationOnCommitFilteredChanges = (value: boolean) => {
+    this.setState({ askForConfirmationOnCommitFilteredChanges: value })
+  }
+
   private onUncommittedChangesStrategyChanged = (
     uncommittedChangesStrategy: UncommittedChangesStrategy
   ) => {
@@ -443,41 +653,54 @@ export class Preferences extends React.Component<
     this.setState({ selectedShell: shell })
   }
 
+  private onUseCustomEditorChanged = (useCustomEditor: boolean) => {
+    this.setState({ useCustomEditor })
+  }
+
+  private onCustomEditorChanged = (customEditor: ICustomIntegration) => {
+    this.setState({ customEditor })
+  }
+
+  private onUseCustomShellChanged = (useCustomShell: boolean) => {
+    this.setState({ useCustomShell })
+  }
+
+  private onCustomShellChanged = (customShell: ICustomIntegration) => {
+    this.setState({ customShell })
+  }
+
   private onSelectedThemeChanged = (theme: ApplicationTheme) => {
     this.props.dispatcher.setSelectedTheme(theme)
   }
 
-  private onCustomThemeChanged = (theme: ICustomTheme) => {
-    this.props.dispatcher.setCustomTheme(theme)
+  private onUnderlineLinksChanged = (underlineLinks: boolean) => {
+    this.setState({ underlineLinks })
+  }
+
+  private onShowDiffCheckMarksChanged = (showDiffCheckMarks: boolean) => {
+    this.setState({ showDiffCheckMarks })
+  }
+
+  private onSelectedTabSizeChanged = (tabSize: number) => {
+    this.props.dispatcher.setSelectedTabSize(tabSize)
   }
 
   private renderFooter() {
     const hasDisabledError = this.state.disallowedCharactersMessage != null
 
-    const index = this.state.selectedIndex
-    switch (index) {
-      case PreferencesTab.Accounts:
-      case PreferencesTab.Appearance:
-        return null
-      case PreferencesTab.Integrations:
-      case PreferencesTab.Advanced:
-      case PreferencesTab.Prompts:
-      case PreferencesTab.Git: {
-        return (
-          <DialogFooter>
-            <OkCancelButtonGroup
-              okButtonText="Save"
-              okButtonDisabled={hasDisabledError}
-            />
-          </DialogFooter>
-        )
-      }
-      default:
-        return assertNever(index, `Unknown tab index: ${index}`)
-    }
+    return (
+      <DialogFooter>
+        <OkCancelButtonGroup
+          okButtonText="Save"
+          okButtonDisabled={hasDisabledError}
+        />
+      </DialogFooter>
+    )
   }
 
   private onSave = async () => {
+    const { dispatcher } = this.props
+
     try {
       let shouldRefreshAuthor = false
 
@@ -492,7 +715,7 @@ export class Preferences extends React.Component<
       }
 
       if (this.props.repository !== null && shouldRefreshAuthor) {
-        this.props.dispatcher.refreshAuthor(this.props.repository)
+        dispatcher.refreshAuthor(this.props.repository)
       }
 
       // If the entered default branch is empty, we don't store it and keep
@@ -513,7 +736,7 @@ export class Preferences extends React.Component<
         this.props.repositoryIndicatorsEnabled !==
         this.state.repositoryIndicatorsEnabled
       ) {
-        this.props.dispatcher.setRepositoryIndicatorsEnabled(
+        dispatcher.setRepositoryIndicatorsEnabled(
           this.state.repositoryIndicatorsEnabled
         )
       }
@@ -531,44 +754,80 @@ export class Preferences extends React.Component<
       }
 
       this.props.onDismissed()
-      this.props.dispatcher.postError(e)
+      dispatcher.postError(e)
       return
     }
 
-    this.props.dispatcher.setUseWindowsOpenSSH(this.state.useWindowsOpenSSH)
-    this.props.dispatcher.setNotificationsEnabled(
-      this.state.notificationsEnabled
+    dispatcher.setUseWindowsOpenSSH(this.state.useWindowsOpenSSH)
+    dispatcher.setShowCommitLengthWarning(this.state.showCommitLengthWarning)
+    dispatcher.setNotificationsEnabled(this.state.notificationsEnabled)
+
+    await dispatcher.setStatsOptOut(this.state.optOutOfUsageTracking, false)
+
+    const { useCustomEditor, customEditor, useCustomShell, customShell } =
+      this.state
+
+    const isValidCustomEditor =
+      customEditor && (await isValidCustomIntegration(customEditor))
+    dispatcher.setUseCustomEditor(useCustomEditor && isValidCustomEditor)
+    if (isValidCustomEditor) {
+      dispatcher.setCustomEditor(customEditor)
+    }
+
+    const isValidCustomShell =
+      customShell && (await isValidCustomIntegration(customShell))
+    dispatcher.setUseCustomShell(useCustomShell && isValidCustomShell)
+    if (isValidCustomShell) {
+      dispatcher.setCustomShell(customShell)
+    }
+
+    if (
+      this.props.useExternalCredentialHelper !==
+      this.state.useExternalCredentialHelper
+    ) {
+      dispatcher.setUseExternalCredentialHelper(
+        this.state.useExternalCredentialHelper
+      )
+    }
+
+    await dispatcher.setConfirmRepoRemovalSetting(
+      this.state.confirmRepositoryRemoval
     )
 
-    await this.props.dispatcher.setStatsOptOut(
-      this.state.optOutOfUsageTracking,
-      false
+    await dispatcher.setConfirmForcePushSetting(this.state.confirmForcePush)
+
+    await dispatcher.setConfirmDiscardStashSetting(
+      this.state.confirmDiscardStash
     )
-    await this.props.dispatcher.setConfirmRepoRemovalSetting(
-      this.state.confirmRepositoryRemoval
+
+    await dispatcher.setConfirmCheckoutCommitSetting(
+      this.state.confirmCheckoutCommit
     )
 
-    await this.props.dispatcher.setConfirmForcePushSetting(
-      this.state.confirmForcePush
+    await dispatcher.setConfirmUndoCommitSetting(this.state.confirmUndoCommit)
+    await dispatcher.setConfirmCommitFilteredChanges(
+      this.state.askForConfirmationOnCommitFilteredChanges
     )
 
     if (this.state.selectedExternalEditor) {
-      await this.props.dispatcher.setExternalEditor(
-        this.state.selectedExternalEditor
-      )
+      await dispatcher.setExternalEditor(this.state.selectedExternalEditor)
     }
-    await this.props.dispatcher.setShell(this.state.selectedShell)
-    await this.props.dispatcher.setConfirmDiscardChangesSetting(
+    await dispatcher.setShell(this.state.selectedShell)
+    await dispatcher.setConfirmDiscardChangesSetting(
       this.state.confirmDiscardChanges
     )
-    await this.props.dispatcher.setConfirmDiscardChangesPermanentlySetting(
+    await dispatcher.setConfirmDiscardChangesPermanentlySetting(
       this.state.confirmDiscardChangesPermanently
     )
 
-    await this.props.dispatcher.setUncommittedChangesStrategySetting(
+    await dispatcher.setUncommittedChangesStrategySetting(
       this.state.uncommittedChangesStrategy
     )
 
+    dispatcher.setUnderlineLinksSetting(this.state.underlineLinks)
+
+    dispatcher.setDiffCheckMarksSetting(this.state.showDiffCheckMarks)
+
     this.props.onDismissed()
   }
 
diff --git a/app/src/ui/preferences/prompts.tsx b/app/src/ui/preferences/prompts.tsx
index 9abdd991c63..dd1c103fd9f 100644
--- a/app/src/ui/preferences/prompts.tsx
+++ b/app/src/ui/preferences/prompts.tsx
@@ -1,23 +1,45 @@
 import * as React from 'react'
+import { UncommittedChangesStrategy } from '../../models/uncommitted-changes-strategy'
 import { DialogContent } from '../dialog'
 import { Checkbox, CheckboxValue } from '../lib/checkbox'
+import { RadioGroup } from '../lib/radio-group'
+import { assertNever } from '../../lib/fatal-error'
 
 interface IPromptsPreferencesProps {
   readonly confirmRepositoryRemoval: boolean
   readonly confirmDiscardChanges: boolean
   readonly confirmDiscardChangesPermanently: boolean
+  readonly confirmDiscardStash: boolean
+  readonly confirmCheckoutCommit: boolean
   readonly confirmForcePush: boolean
+  readonly confirmUndoCommit: boolean
+  readonly askForConfirmationOnCommitFilteredChanges: boolean
+  readonly showCommitLengthWarning: boolean
+  readonly uncommittedChangesStrategy: UncommittedChangesStrategy
   readonly onConfirmDiscardChangesChanged: (checked: boolean) => void
   readonly onConfirmDiscardChangesPermanentlyChanged: (checked: boolean) => void
+  readonly onConfirmDiscardStashChanged: (checked: boolean) => void
+  readonly onConfirmCheckoutCommitChanged: (checked: boolean) => void
   readonly onConfirmRepositoryRemovalChanged: (checked: boolean) => void
   readonly onConfirmForcePushChanged: (checked: boolean) => void
+  readonly onConfirmUndoCommitChanged: (checked: boolean) => void
+  readonly onShowCommitLengthWarningChanged: (checked: boolean) => void
+  readonly onUncommittedChangesStrategyChanged: (
+    value: UncommittedChangesStrategy
+  ) => void
+  readonly onAskForConfirmationOnCommitFilteredChanges: (value: boolean) => void
 }
 
 interface IPromptsPreferencesState {
   readonly confirmRepositoryRemoval: boolean
   readonly confirmDiscardChanges: boolean
   readonly confirmDiscardChangesPermanently: boolean
+  readonly confirmDiscardStash: boolean
+  readonly confirmCheckoutCommit: boolean
   readonly confirmForcePush: boolean
+  readonly confirmUndoCommit: boolean
+  readonly askForConfirmationOnCommitFilteredChanges: boolean
+  readonly uncommittedChangesStrategy: UncommittedChangesStrategy
 }
 
 export class Prompts extends React.Component<
@@ -32,7 +54,13 @@ export class Prompts extends React.Component<
       confirmDiscardChanges: this.props.confirmDiscardChanges,
       confirmDiscardChangesPermanently:
         this.props.confirmDiscardChangesPermanently,
+      confirmDiscardStash: this.props.confirmDiscardStash,
+      confirmCheckoutCommit: this.props.confirmCheckoutCommit,
       confirmForcePush: this.props.confirmForcePush,
+      confirmUndoCommit: this.props.confirmUndoCommit,
+      uncommittedChangesStrategy: this.props.uncommittedChangesStrategy,
+      askForConfirmationOnCommitFilteredChanges:
+        this.props.askForConfirmationOnCommitFilteredChanges,
     }
   }
 
@@ -54,6 +82,24 @@ export class Prompts extends React.Component<
     this.props.onConfirmDiscardChangesPermanentlyChanged(value)
   }
 
+  private onConfirmDiscardStashChanged = (
+    event: React.FormEvent<HTMLInputElement>
+  ) => {
+    const value = event.currentTarget.checked
+
+    this.setState({ confirmDiscardStash: value })
+    this.props.onConfirmDiscardStashChanged(value)
+  }
+
+  private onConfirmCheckoutCommitChanged = (
+    event: React.FormEvent<HTMLInputElement>
+  ) => {
+    const value = event.currentTarget.checked
+
+    this.setState({ confirmCheckoutCommit: value })
+    this.props.onConfirmCheckoutCommitChanged(value)
+  }
+
   private onConfirmForcePushChanged = (
     event: React.FormEvent<HTMLInputElement>
   ) => {
@@ -63,6 +109,24 @@ export class Prompts extends React.Component<
     this.props.onConfirmForcePushChanged(value)
   }
 
+  private onConfirmUndoCommitChanged = (
+    event: React.FormEvent<HTMLInputElement>
+  ) => {
+    const value = event.currentTarget.checked
+
+    this.setState({ confirmUndoCommit: value })
+    this.props.onConfirmUndoCommitChanged(value)
+  }
+
+  private onAskForConfirmationOnCommitFilteredChanges = (
+    event: React.FormEvent<HTMLInputElement>
+  ) => {
+    const value = event.currentTarget.checked
+
+    this.setState({ askForConfirmationOnCommitFilteredChanges: value })
+    this.props.onAskForConfirmationOnCommitFilteredChanges(value)
+  }
+
   private onConfirmRepositoryRemovalChanged = (
     event: React.FormEvent<HTMLInputElement>
   ) => {
@@ -72,44 +136,155 @@ export class Prompts extends React.Component<
     this.props.onConfirmRepositoryRemovalChanged(value)
   }
 
+  private onUncommittedChangesStrategyChanged = (
+    value: UncommittedChangesStrategy
+  ) => {
+    this.setState({ uncommittedChangesStrategy: value })
+    this.props.onUncommittedChangesStrategyChanged(value)
+  }
+
+  private onShowCommitLengthWarningChanged = (
+    event: React.FormEvent<HTMLInputElement>
+  ) => {
+    this.props.onShowCommitLengthWarningChanged(event.currentTarget.checked)
+  }
+
+  private renderSwitchBranchOptionLabel = (key: UncommittedChangesStrategy) => {
+    switch (key) {
+      case UncommittedChangesStrategy.AskForConfirmation:
+        return 'Ask me where I want the changes to go'
+      case UncommittedChangesStrategy.MoveToNewBranch:
+        return 'Always bring my changes to my new branch'
+      case UncommittedChangesStrategy.StashOnCurrentBranch:
+        return 'Always stash and leave my changes on the current branch'
+      default:
+        return assertNever(key, `Unknown uncommitted changes strategy: ${key}`)
+    }
+  }
+
+  private renderSwitchBranchOptions = () => {
+    const options = [
+      UncommittedChangesStrategy.AskForConfirmation,
+      UncommittedChangesStrategy.MoveToNewBranch,
+      UncommittedChangesStrategy.StashOnCurrentBranch,
+    ]
+
+    const selectedKey =
+      options.find(o => o === this.state.uncommittedChangesStrategy) ??
+      UncommittedChangesStrategy.AskForConfirmation
+
+    return (
+      <div className="advanced-section">
+        <h2 id="switch-branch-heading">
+          If I have changes and I switch branches...
+        </h2>
+
+        <RadioGroup<UncommittedChangesStrategy>
+          ariaLabelledBy="switch-branch-heading"
+          selectedKey={selectedKey}
+          radioButtonKeys={options}
+          onSelectionChanged={this.onUncommittedChangesStrategyChanged}
+          renderRadioButtonLabelContents={this.renderSwitchBranchOptionLabel}
+        />
+      </div>
+    )
+  }
+
   public render() {
     return (
       <DialogContent>
-        <h2>Show a confirmation dialog before...</h2>
-        <Checkbox
-          label="Removing repositories"
-          value={
-            this.state.confirmRepositoryRemoval
-              ? CheckboxValue.On
-              : CheckboxValue.Off
-          }
-          onChange={this.onConfirmRepositoryRemovalChanged}
-        />
-        <Checkbox
-          label="Discarding changes"
-          value={
-            this.state.confirmDiscardChanges
-              ? CheckboxValue.On
-              : CheckboxValue.Off
-          }
-          onChange={this.onConfirmDiscardChangesChanged}
-        />
-        <Checkbox
-          label="Discarding changes permanently"
-          value={
-            this.state.confirmDiscardChangesPermanently
-              ? CheckboxValue.On
-              : CheckboxValue.Off
-          }
-          onChange={this.onConfirmDiscardChangesPermanentlyChanged}
-        />
-        <Checkbox
-          label="Force pushing"
-          value={
-            this.state.confirmForcePush ? CheckboxValue.On : CheckboxValue.Off
-          }
-          onChange={this.onConfirmForcePushChanged}
-        />
+        <div className="advanced-section">
+          <h2 id="show-confirm-dialog-heading">
+            Show a confirmation dialog before...
+          </h2>
+          <div role="group" aria-labelledby="show-confirm-dialog-heading">
+            <Checkbox
+              label="Removing repositories"
+              value={
+                this.state.confirmRepositoryRemoval
+                  ? CheckboxValue.On
+                  : CheckboxValue.Off
+              }
+              onChange={this.onConfirmRepositoryRemovalChanged}
+            />
+            <Checkbox
+              label="Discarding changes"
+              value={
+                this.state.confirmDiscardChanges
+                  ? CheckboxValue.On
+                  : CheckboxValue.Off
+              }
+              onChange={this.onConfirmDiscardChangesChanged}
+            />
+            <Checkbox
+              label="Discarding changes permanently"
+              value={
+                this.state.confirmDiscardChangesPermanently
+                  ? CheckboxValue.On
+                  : CheckboxValue.Off
+              }
+              onChange={this.onConfirmDiscardChangesPermanentlyChanged}
+            />
+            <Checkbox
+              label="Discarding stash"
+              value={
+                this.state.confirmDiscardStash
+                  ? CheckboxValue.On
+                  : CheckboxValue.Off
+              }
+              onChange={this.onConfirmDiscardStashChanged}
+            />
+            <Checkbox
+              label="Checking out a commit"
+              value={
+                this.state.confirmCheckoutCommit
+                  ? CheckboxValue.On
+                  : CheckboxValue.Off
+              }
+              onChange={this.onConfirmCheckoutCommitChanged}
+            />
+            <Checkbox
+              label="Force pushing"
+              value={
+                this.state.confirmForcePush
+                  ? CheckboxValue.On
+                  : CheckboxValue.Off
+              }
+              onChange={this.onConfirmForcePushChanged}
+            />
+            <Checkbox
+              label="Undo commit"
+              value={
+                this.state.confirmUndoCommit
+                  ? CheckboxValue.On
+                  : CheckboxValue.Off
+              }
+              onChange={this.onConfirmUndoCommitChanged}
+            />
+            <Checkbox
+              label="Committing changes hidden by filter"
+              value={
+                this.state.askForConfirmationOnCommitFilteredChanges
+                  ? CheckboxValue.On
+                  : CheckboxValue.Off
+              }
+              onChange={this.onAskForConfirmationOnCommitFilteredChanges}
+            />
+          </div>
+        </div>
+        {this.renderSwitchBranchOptions()}
+        <div className="advanced-section">
+          <h2>Commit Length</h2>
+          <Checkbox
+            label="Show commit length warning"
+            value={
+              this.props.showCommitLengthWarning
+                ? CheckboxValue.On
+                : CheckboxValue.Off
+            }
+            onChange={this.onShowCommitLengthWarningChanged}
+          />
+        </div>
       </DialogContent>
     )
   }
diff --git a/app/src/ui/publish-repository/publish-repository.tsx b/app/src/ui/publish-repository/publish-repository.tsx
index 9b9355b93ea..337e17d5ba2 100644
--- a/app/src/ui/publish-repository/publish-repository.tsx
+++ b/app/src/ui/publish-repository/publish-repository.tsx
@@ -9,7 +9,7 @@ import { merge } from '../../lib/merge'
 import { caseInsensitiveCompare } from '../../lib/compare'
 import { sanitizedRepositoryName } from '../add-repository/sanitized-repository-name'
 import { Octicon } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import * as octicons from '../octicons/octicons.generated'
 import { RepositoryPublicationSettings } from '../../models/publish-settings'
 
 interface IPublishRepositoryProps {
@@ -184,7 +184,7 @@ export class PublishRepository extends React.Component<
 
     return (
       <Row className="warning-helper-text">
-        <Octicon symbol={OcticonSymbol.alert} />
+        <Octicon symbol={octicons.alert} />
         Will be created as {sanitizedName}
       </Row>
     )
diff --git a/app/src/ui/publish-repository/publish.tsx b/app/src/ui/publish-repository/publish.tsx
index fb580a467af..e16bc764a93 100644
--- a/app/src/ui/publish-repository/publish.tsx
+++ b/app/src/ui/publish-repository/publish.tsx
@@ -139,16 +139,23 @@ export class Publish extends React.Component<IPublishProps, IPublishState> {
           onTabClicked={this.onTabClicked}
           selectedIndex={this.state.currentTab}
         >
-          <span>GitHub.com</span>
-          <span>GitHub Enterprise</span>
+          <span id="dotcom-tab">GitHub.com</span>
+          <span id="enterprise-tab">GitHub Enterprise</span>
         </TabBar>
 
         {currentTabState.error ? (
           <DialogError>{currentTabState.error.message}</DialogError>
         ) : null}
 
-        {this.renderContent()}
-        {this.renderFooter()}
+        <div
+          role="tabpanel"
+          aria-labelledby={
+            currentTabState.kind === 'dotcom' ? 'dotcom-tab' : 'enterprise-tab'
+          }
+        >
+          {this.renderContent()}
+          {this.renderFooter()}
+        </div>
       </Dialog>
     )
   }
@@ -235,8 +242,8 @@ export class Publish extends React.Component<IPublishProps, IPublishState> {
             onAction={this.signInEnterprise}
           >
             <div>
-              If you have a GitHub Enterprise or AE account at work, sign in to
-              it to get access to your repositories.
+              If you are using GitHub Enterprise at work, sign in to it to get
+              access to your repositories.
             </div>
           </CallToAction>
         )
diff --git a/app/src/ui/pull-request-quick-view.tsx b/app/src/ui/pull-request-quick-view.tsx
index 02f2e20c4af..e46c8cd977a 100644
--- a/app/src/ui/pull-request-quick-view.tsx
+++ b/app/src/ui/pull-request-quick-view.tsx
@@ -6,8 +6,9 @@ import { Dispatcher } from './dispatcher'
 import { Button } from './lib/button'
 import { SandboxedMarkdown } from './lib/sandboxed-markdown'
 import { Octicon } from './octicons'
-import * as OcticonSymbol from './octicons/octicons.generated'
+import * as octicons from './octicons/octicons.generated'
 import classNames from 'classnames'
+import { Emoji } from '../lib/emoji'
 
 /**
  * The max height of the visible quick view card is 556 (500 for scrollable
@@ -33,7 +34,9 @@ interface IPullRequestQuickViewProps {
   readonly onMouseLeave: () => void
 
   /** Map from the emoji shortcut (e.g., :+1:) to the image's local path. */
-  readonly emoji: Map<string, string>
+  readonly emoji: Map<string, Emoji>
+
+  readonly underlineLinks: boolean
 }
 
 interface IPullRequestQuickViewState {
@@ -158,11 +161,15 @@ export class PullRequestQuickView extends React.Component<
   private renderHeader = (): JSX.Element => {
     return (
       <header className="header">
-        <Octicon symbol={OcticonSymbol.listUnordered} />
+        <Octicon symbol={octicons.listUnordered} />
         <div className="action-needed">Review requested</div>
-        <Button className="button-with-icon" onClick={this.onViewOnGitHub}>
+        <Button
+          className="button-with-icon"
+          onClick={this.onViewOnGitHub}
+          role="link"
+        >
           View on GitHub
-          <Octicon symbol={OcticonSymbol.linkExternal} />
+          <Octicon symbol={octicons.linkExternal} />
         </Button>
       </header>
     )
@@ -174,9 +181,7 @@ export class PullRequestQuickView extends React.Component<
         <Octicon
           className="icon"
           symbol={
-            isDraft
-              ? OcticonSymbol.gitPullRequestDraft
-              : OcticonSymbol.gitPullRequest
+            isDraft ? octicons.gitPullRequestDraft : octicons.gitPullRequest
           }
         />
         <span className="state">{isDraft ? 'Draft' : 'Open'}</span>
@@ -211,6 +216,8 @@ export class PullRequestQuickView extends React.Component<
           markdownContext={'PullRequest'}
           onMarkdownLinkClicked={this.onMarkdownLinkClicked}
           onMarkdownParsed={this.onMarkdownParsed}
+          underlineLinks={this.props.underlineLinks}
+          ariaLabel="Pull request markdown body"
         />
       </div>
     )
diff --git a/app/src/ui/push-needs-pull/push-needs-pull-warning.tsx b/app/src/ui/push-needs-pull/push-needs-pull-warning.tsx
index 0d756adff8c..b844b49cca5 100644
--- a/app/src/ui/push-needs-pull/push-needs-pull-warning.tsx
+++ b/app/src/ui/push-needs-pull/push-needs-pull-warning.tsx
@@ -33,7 +33,7 @@ export class PushNeedsPullWarning extends React.Component<
         title={
           __DARWIN__ ? 'Newer Commits on Remote' : 'Newer commits on remote'
         }
-        dismissable={!this.state.isLoading}
+        dismissDisabled={this.state.isLoading}
         disabled={this.state.isLoading}
         onDismissed={this.props.onDismissed}
         onSubmit={this.onFetch}
diff --git a/app/src/ui/rebase/confirm-force-push.tsx b/app/src/ui/rebase/confirm-force-push.tsx
index 9f887838fe5..e2fe1149a48 100644
--- a/app/src/ui/rebase/confirm-force-push.tsx
+++ b/app/src/ui/rebase/confirm-force-push.tsx
@@ -37,7 +37,7 @@ export class ConfirmForcePush extends React.Component<
     return (
       <Dialog
         title="Are you sure you want to force push?"
-        dismissable={!this.state.isLoading}
+        dismissDisabled={this.state.isLoading}
         onDismissed={this.props.onDismissed}
         onSubmit={this.onForcePush}
         type="warning"
diff --git a/app/src/ui/relative-time.tsx b/app/src/ui/relative-time.tsx
index 6afd8bf10cf..728668dcea9 100644
--- a/app/src/ui/relative-time.tsx
+++ b/app/src/ui/relative-time.tsx
@@ -10,14 +10,6 @@ interface IRelativeTimeProps {
    */
   readonly date: Date
 
-  /**
-   * For relative durations, use abbreviated units
-   * ('m' instead of 'minutes', 'd' instead of 'days')
-   *
-   * Defaults to `false`
-   */
-  readonly abbreviate?: boolean
-
   /**
    * By default the RelativeTime component will start displaying a compact
    * absolute date if the date is more than one week ago. Setting `onlyRelative`
@@ -43,6 +35,62 @@ const DAY = HOUR * 24
 //  http://stackoverflow.com/a/16314807
 const MAX_INTERVAL = 2147483647
 
+type RelativeTimeInfo = {
+  absoluteText: string
+  relativeText: string
+  duration?: number
+}
+
+export function getRelativeTimeInfoFromDate(
+  then: Date,
+  onlyRelative: boolean = true
+): RelativeTimeInfo {
+  const diff = then.getTime() - Date.now()
+  const duration = Math.abs(diff)
+
+  const absoluteText = formatDate(then, {
+    dateStyle: 'full',
+    timeStyle: 'short',
+  })
+
+  const relativeText = formatRelative(diff)
+
+  // Future date, let's just show as absolute and reschedule. If it's less
+  // than a minute into the future we'll treat it as 'just now'.
+  if (diff > 0 && duration > MINUTE) {
+    return {
+      absoluteText,
+      relativeText: formatDate(then, {
+        dateStyle: 'medium',
+        timeStyle: 'short',
+      }),
+      duration,
+    }
+  } else if (duration < MINUTE) {
+    return {
+      absoluteText,
+      relativeText: 'just now',
+      duration: MINUTE - duration,
+    }
+  } else if (duration < HOUR) {
+    return { absoluteText, relativeText, duration: MINUTE }
+  } else if (duration < DAY) {
+    return { absoluteText, relativeText, duration: HOUR }
+  } else if (duration < 7 * DAY) {
+    return { absoluteText, relativeText, duration: 6 * HOUR }
+  } else {
+    if (onlyRelative) {
+      return { absoluteText, relativeText, duration: 6 * HOUR }
+    } else {
+      // More than a week ago, just the date will suffice
+      return {
+        absoluteText,
+        relativeText: formatDate(then, { dateStyle: 'medium' }),
+      }
+    }
+  }
+}
+
 /**
  * An auto-updating component rendering a relative time in human readable form.
  *
@@ -89,42 +137,13 @@ export class RelativeTime extends React.Component<
   private updateWithDate(then: Date) {
     const { onlyRelative } = this.props
 
-    const diff = then.getTime() - Date.now()
-    const duration = Math.abs(diff)
+    const { absoluteText, relativeText, duration } =
+      getRelativeTimeInfoFromDate(then, onlyRelative)
 
-    const absoluteText = formatDate(then, {
-      dateStyle: 'full',
-      timeStyle: 'short',
-    })
-
-    const relativeText = formatRelative(diff)
-
-    // Future date, let's just show as absolute and reschedule. If it's less
-    // than a minute into the future we'll treat it as 'just now'.
-    if (diff > 0 && duration > MINUTE) {
-      this.updateAndSchedule(
-        absoluteText,
-        formatDate(then, { dateStyle: 'medium', timeStyle: 'short' }),
-        duration
-      )
-    } else if (duration < MINUTE) {
-      this.updateAndSchedule(absoluteText, 'just now', MINUTE - duration)
-    } else if (duration < HOUR) {
-      this.updateAndSchedule(absoluteText, relativeText, MINUTE)
-    } else if (duration < DAY) {
-      this.updateAndSchedule(absoluteText, relativeText, HOUR)
-    } else if (duration < 7 * DAY) {
-      this.updateAndSchedule(absoluteText, relativeText, 6 * HOUR)
+    if (duration !== undefined) {
+      this.updateAndSchedule(absoluteText, relativeText, duration)
     } else {
-      if (onlyRelative) {
-        this.updateAndSchedule(absoluteText, relativeText, 6 * HOUR)
-      } else {
-        // More than a week ago, just the date will suffice
-        this.setState({
-          absoluteText,
-          relativeText: formatDate(then, { dateStyle: 'medium' }),
-        })
-      }
+      this.setState({ absoluteText, relativeText })
     }
   }
 
diff --git a/app/src/ui/release-notes/release-notes-dialog.tsx b/app/src/ui/release-notes/release-notes-dialog.tsx
index c09468abd54..87ee6e08c9e 100644
--- a/app/src/ui/release-notes/release-notes-dialog.tsx
+++ b/app/src/ui/release-notes/release-notes-dialog.tsx
@@ -8,17 +8,15 @@ import { shell } from '../../lib/app-shell'
 import { ReleaseNotesUri } from '../lib/releases'
 import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group'
 import { DesktopFakeRepository } from '../../lib/desktop-fake-repository'
-import {
-  ReleaseNoteHeaderLeftUri,
-  ReleaseNoteHeaderRightUri,
-} from '../../lib/release-notes'
 import { SandboxedMarkdown } from '../lib/sandboxed-markdown'
 import { Button } from '../lib/button'
+import { Emoji } from '../../lib/emoji'
 
 interface IReleaseNotesProps {
   readonly onDismissed: () => void
-  readonly emoji: Map<string, string>
+  readonly emoji: Map<string, Emoji>
   readonly newReleases: ReadonlyArray<ReleaseSummary>
+  readonly underlineLinks: boolean
 }
 
 /**
@@ -122,6 +120,8 @@ export class ReleaseNotes extends React.Component<IReleaseNotesProps, {}> {
         markdown={pretext[0].message}
         emoji={this.props.emoji}
         onMarkdownLinkClicked={this.onMarkdownLinkClicked}
+        underlineLinks={this.props.underlineLinks}
+        ariaLabel="Release notes generated from markdown"
       />
     )
   }
@@ -168,20 +168,10 @@ export class ReleaseNotes extends React.Component<IReleaseNotesProps, {}> {
         : this.drawSingleColumnLayout(release)
 
     const dialogHeader = (
-      <div className="release-notes-header">
-        <img
-          className="release-note-graphic-left"
-          src={ReleaseNoteHeaderLeftUri}
-        />
-        <div className="title">
-          <p className="version">Version {latestVersion}</p>
-          <p className="date">{datePublished}</p>
-        </div>
-        <img
-          className="release-note-graphic-right"
-          src={ReleaseNoteHeaderRightUri}
-        />
-      </div>
+      <>
+        <span className="version">Version {latestVersion}</span>
+        <span className="date">{datePublished}</span>
+      </>
     )
 
     return (
diff --git a/app/src/ui/remove-repository/confirm-remove-repository.tsx b/app/src/ui/remove-repository/confirm-remove-repository.tsx
index 9c779ea6faa..85d9a763f8d 100644
--- a/app/src/ui/remove-repository/confirm-remove-repository.tsx
+++ b/app/src/ui/remove-repository/confirm-remove-repository.tsx
@@ -58,7 +58,7 @@ export class ConfirmRemoveRepository extends React.Component<
         key="remove-repository-confirmation"
         type="warning"
         title={__DARWIN__ ? 'Remove Repository' : 'Remove repository'}
-        dismissable={isRemovingRepository ? false : true}
+        dismissDisabled={isRemovingRepository}
         loading={isRemovingRepository}
         disabled={isRemovingRepository}
         onDismissed={this.props.onDismissed}
@@ -69,11 +69,12 @@ export class ConfirmRemoveRepository extends React.Component<
             Are you sure you want to remove the repository "
             {this.props.repository.name}" from GitHub Desktop?
           </p>
-          <p className="description">
-            The repository will be removed from GitHub Desktop:
-            <br />
-            <Ref>{this.props.repository.path}</Ref>
-          </p>
+          <div className="description">
+            <p>The repository will be removed from GitHub Desktop:</p>
+            <p>
+              <Ref>{this.props.repository.path}</Ref>
+            </p>
+          </div>
 
           <div>
             <Checkbox
diff --git a/app/src/ui/rename-branch/rename-branch-dialog.tsx b/app/src/ui/rename-branch/rename-branch-dialog.tsx
index f87f466e98a..8738b448ee6 100644
--- a/app/src/ui/rename-branch/rename-branch-dialog.tsx
+++ b/app/src/ui/rename-branch/rename-branch-dialog.tsx
@@ -4,11 +4,7 @@ import { Dispatcher } from '../dispatcher'
 import { Repository } from '../../models/repository'
 import { Branch } from '../../models/branch'
 import { Dialog, DialogContent, DialogFooter } from '../dialog'
-import {
-  renderBranchHasRemoteWarning,
-  renderStashWillBeLostWarning,
-} from '../lib/branch-name-warnings'
-import { IStashEntry } from '../../models/stash-entry'
+import { renderBranchHasRemoteWarning } from '../lib/branch-name-warnings'
 import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group'
 import { RefNameTextBox } from '../lib/ref-name-text-box'
 
@@ -17,7 +13,6 @@ interface IRenameBranchProps {
   readonly onDismissed: () => void
   readonly repository: Repository
   readonly branch: Branch
-  readonly stash: IStashEntry | null
 }
 
 interface IRenameBranchState {
@@ -41,15 +36,15 @@ export class RenameBranch extends React.Component<
         title={__DARWIN__ ? 'Rename Branch' : 'Rename branch'}
         onDismissed={this.props.onDismissed}
         onSubmit={this.renameBranch}
+        focusCloseButtonOnOpen={true}
       >
         <DialogContent>
+          {renderBranchHasRemoteWarning(this.props.branch)}
           <RefNameTextBox
             label="Name"
             initialValue={this.props.branch.name}
             onValueChange={this.onNameChange}
           />
-          {renderBranchHasRemoteWarning(this.props.branch)}
-          {renderStashWillBeLostWarning(this.props.stash)}
         </DialogContent>
 
         <DialogFooter>
diff --git a/app/src/ui/repositories-list/repositories-list.tsx b/app/src/ui/repositories-list/repositories-list.tsx
index 1de1f28f295..9dddead9696 100644
--- a/app/src/ui/repositories-list/repositories-list.tsx
+++ b/app/src/ui/repositories-list/repositories-list.tsx
@@ -9,19 +9,22 @@ import {
   KnownRepositoryGroup,
   makeRecentRepositoriesGroup,
 } from './group-repositories'
-import { FilterList, IFilterListGroup } from '../lib/filter-list'
+import { IFilterListGroup } from '../lib/filter-list'
 import { IMatches } from '../../lib/fuzzy-find'
 import { ILocalRepositoryState, Repository } from '../../models/repository'
 import { Dispatcher } from '../dispatcher'
 import { Button } from '../lib/button'
 import { Octicon } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import * as octicons from '../octicons/octicons.generated'
 import { showContextualMenu } from '../../lib/menu-item'
 import { IMenuItem } from '../../lib/menu-item'
 import { PopupType } from '../../models/popup'
 import { encodePathAsUrl } from '../../lib/path'
 import { TooltippedContent } from '../lib/tooltipped-content'
 import memoizeOne from 'memoize-one'
+import { KeyboardShortcut } from '../keyboard-shortcut/keyboard-shortcut'
+import { generateRepositoryListContextMenu } from '../repositories-list/repository-list-item-context-menu'
+import { SectionFilterList } from '../lib/section-filter-list'
 
 const BlankSlateImage = encodePathAsUrl(__dirname, 'static/empty-no-repo.svg')
 
@@ -63,7 +66,7 @@ interface IRepositoriesListProps {
   readonly externalEditorLabel?: string
 
   /** The label for the user's preferred shell. */
-  readonly shellLabel: string
+  readonly shellLabel?: string
 
   /** The callback to fire when the filter text has changed */
   readonly onFilterTextChanged: (text: string) => void
@@ -74,6 +77,10 @@ interface IRepositoriesListProps {
   readonly dispatcher: Dispatcher
 }
 
+interface IRepositoriesListState {
+  readonly newRepositoryMenuExpanded: boolean
+}
+
 const RowHeight = 29
 
 /**
@@ -100,7 +107,7 @@ function findMatchingListItem(
 /** The list of user-added repositories. */
 export class RepositoriesList extends React.Component<
   IRepositoriesListProps,
-  {}
+  IRepositoriesListState
 > {
   /**
    * A memoized function for grouping repositories for display
@@ -129,6 +136,14 @@ export class RepositoriesList extends React.Component<
    */
   private getSelectedListItem = memoizeOne(findMatchingListItem)
 
+  public constructor(props: IRepositoriesListProps) {
+    super(props)
+
+    this.state = {
+      newRepositoryMenuExpanded: false,
+    }
+  }
+
   private renderItem = (item: IRepositoryListItem, matches: IMatches) => {
     const repository = item.repository
     return (
@@ -136,18 +151,6 @@ export class RepositoriesList extends React.Component<
         key={repository.id}
         repository={repository}
         needsDisambiguation={item.needsDisambiguation}
-        askForConfirmationOnRemoveRepository={
-          this.props.askForConfirmationOnRemoveRepository
-        }
-        onRemoveRepository={this.props.onRemoveRepository}
-        onShowRepository={this.props.onShowRepository}
-        onViewOnGitHub={this.props.onViewOnGitHub}
-        onOpenInShell={this.props.onOpenInShell}
-        onOpenInExternalEditor={this.props.onOpenInExternalEditor}
-        onChangeRepositoryAlias={this.onChangeRepositoryAlias}
-        onRemoveRepositoryAlias={this.onRemoveRepositoryAlias}
-        externalEditorLabel={this.props.externalEditorLabel}
-        shellLabel={this.props.shellLabel}
         matches={matches}
         aheadBehind={item.aheadBehind}
         changedFilesCount={item.changedFilesCount}
@@ -192,6 +195,36 @@ export class RepositoriesList extends React.Component<
     this.props.onSelectionChanged(item.repository)
   }
 
+  private onItemContextMenu = (
+    item: IRepositoryListItem,
+    event: React.MouseEvent<HTMLDivElement>
+  ) => {
+    event.preventDefault()
+
+    const items = generateRepositoryListContextMenu({
+      onRemoveRepository: this.props.onRemoveRepository,
+      onShowRepository: this.props.onShowRepository,
+      onOpenInShell: this.props.onOpenInShell,
+      onOpenInExternalEditor: this.props.onOpenInExternalEditor,
+      askForConfirmationOnRemoveRepository:
+        this.props.askForConfirmationOnRemoveRepository,
+      externalEditorLabel: this.props.externalEditorLabel,
+      onChangeRepositoryAlias: this.onChangeRepositoryAlias,
+      onRemoveRepositoryAlias: this.onRemoveRepositoryAlias,
+      onViewOnGitHub: this.props.onViewOnGitHub,
+      repository: item.repository,
+      shellLabel: this.props.shellLabel,
+    })
+
+    showContextualMenu(items)
+  }
+
+  private getItemAriaLabel = (item: IRepositoryListItem) => item.repository.name
+  private getGroupAriaLabelGetter =
+    (groups: ReadonlyArray<IFilterListGroup<IRepositoryListItem>>) =>
+    (group: number) =>
+      groups[group].identifier
+
   public render() {
     const baseGroups = this.getRepositoryGroups(
       this.props.repositories,
@@ -217,7 +250,7 @@ export class RepositoriesList extends React.Component<
 
     return (
       <div className="repository-list">
-        <FilterList<IRepositoryListItem>
+        <SectionFilterList<IRepositoryListItem>
           rowHeight={RowHeight}
           selectedItem={selectedItem}
           filterText={this.props.filterText}
@@ -232,6 +265,9 @@ export class RepositoriesList extends React.Component<
             repositories: this.props.repositories,
             filterText: this.props.filterText,
           }}
+          onItemContextMenu={this.onItemContextMenu}
+          getGroupAriaLabel={this.getGroupAriaLabelGetter(groups)}
+          getItemAriaLabel={this.getItemAriaLabel}
         />
       </div>
     )
@@ -242,9 +278,10 @@ export class RepositoriesList extends React.Component<
       <Button
         className="new-repository-button"
         onClick={this.onNewRepositoryButtonClick}
+        ariaExpanded={this.state.newRepositoryMenuExpanded}
       >
         Add
-        <Octicon symbol={OcticonSymbol.triangleDown} />
+        <Octicon symbol={octicons.triangleDown} />
       </Button>
     )
   }
@@ -252,53 +289,27 @@ export class RepositoriesList extends React.Component<
   private renderNoItems = () => {
     return (
       <div className="no-items no-results-found">
-        <img src={BlankSlateImage} className="blankslate-image" />
+        <img src={BlankSlateImage} className="blankslate-image" alt="" />
         <div className="title">Sorry, I can't find that repository</div>
 
         <div className="protip">
-          ProTip! Press {this.renderAddLocalShortcut()} to quickly add a local
-          repository, and {this.renderCloneRepositoryShortcut()} to clone from
-          anywhere within the app
+          ProTip! Press{' '}
+          <div className="kbd-shortcut">
+            <KeyboardShortcut darwinKeys={['⌘', 'O']} keys={['Ctrl', 'O']} />
+          </div>{' '}
+          to quickly add a local repository, and{' '}
+          <div className="kbd-shortcut">
+            <KeyboardShortcut
+              darwinKeys={['⇧', '⌘', 'O']}
+              keys={['Ctrl', 'Shift', 'O']}
+            />
+          </div>{' '}
+          to clone from anywhere within the app
         </div>
       </div>
     )
   }
 
-  private renderAddLocalShortcut() {
-    if (__DARWIN__) {
-      return (
-        <div className="kbd-shortcut">
-          <kbd>⌘</kbd>
-          <kbd>O</kbd>
-        </div>
-      )
-    } else {
-      return (
-        <div className="kbd-shortcut">
-          <kbd>Ctrl</kbd> + <kbd>O</kbd>
-        </div>
-      )
-    }
-  }
-
-  private renderCloneRepositoryShortcut() {
-    if (__DARWIN__) {
-      return (
-        <div className="kbd-shortcut">
-          <kbd>⇧</kbd>
-          <kbd>⌘</kbd>
-          <kbd>O</kbd>
-        </div>
-      )
-    } else {
-      return (
-        <div className="kbd-shortcut">
-          <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>O</kbd>
-        </div>
-      )
-    }
-  }
-
   private onNewRepositoryButtonClick = () => {
     const items: IMenuItem[] = [
       {
@@ -317,7 +328,10 @@ export class RepositoriesList extends React.Component<
       },
     ]
 
-    showContextualMenu(items)
+    this.setState({ newRepositoryMenuExpanded: true })
+    showContextualMenu(items).then(() => {
+      this.setState({ newRepositoryMenuExpanded: false })
+    })
   }
 
   private onCloneRepository = () => {
diff --git a/app/src/ui/repositories-list/repository-list-item-context-menu.ts b/app/src/ui/repositories-list/repository-list-item-context-menu.ts
new file mode 100644
index 00000000000..6ee52c5351a
--- /dev/null
+++ b/app/src/ui/repositories-list/repository-list-item-context-menu.ts
@@ -0,0 +1,105 @@
+import { Repository } from '../../models/repository'
+import { IMenuItem } from '../../lib/menu-item'
+import { Repositoryish } from './group-repositories'
+import { clipboard } from 'electron'
+import {
+  RevealInFileManagerLabel,
+  DefaultEditorLabel,
+  DefaultShellLabel,
+} from '../lib/context-menu'
+
+interface IRepositoryListItemContextMenuConfig {
+  repository: Repositoryish
+  shellLabel: string | undefined
+  externalEditorLabel: string | undefined
+  askForConfirmationOnRemoveRepository: boolean
+  onViewOnGitHub: (repository: Repositoryish) => void
+  onOpenInShell: (repository: Repositoryish) => void
+  onShowRepository: (repository: Repositoryish) => void
+  onOpenInExternalEditor: (repository: Repositoryish) => void
+  onRemoveRepository: (repository: Repositoryish) => void
+  onChangeRepositoryAlias: (repository: Repository) => void
+  onRemoveRepositoryAlias: (repository: Repository) => void
+}
+
+export const generateRepositoryListContextMenu = (
+  config: IRepositoryListItemContextMenuConfig
+) => {
+  const { repository } = config
+  const missing = repository instanceof Repository && repository.missing
+  const github =
+    repository instanceof Repository && repository.gitHubRepository != null
+  const openInExternalEditor = config.externalEditorLabel
+    ? `Open in ${config.externalEditorLabel}`
+    : DefaultEditorLabel
+  const openInShell = config.shellLabel
+    ? `Open in ${config.shellLabel}`
+    : DefaultShellLabel
+
+  const items: ReadonlyArray<IMenuItem> = [
+    ...buildAliasMenuItems(config),
+    {
+      label: __DARWIN__ ? 'Copy Repo Name' : 'Copy repo name',
+      action: () => clipboard.writeText(repository.name),
+    },
+    {
+      label: __DARWIN__ ? 'Copy Repo Path' : 'Copy repo path',
+      action: () => clipboard.writeText(repository.path),
+    },
+    { type: 'separator' },
+    {
+      label: 'View on GitHub',
+      action: () => config.onViewOnGitHub(repository),
+      enabled: github,
+    },
+    {
+      label: openInShell,
+      action: () => config.onOpenInShell(repository),
+      enabled: !missing,
+    },
+    {
+      label: RevealInFileManagerLabel,
+      action: () => config.onShowRepository(repository),
+      enabled: !missing,
+    },
+    {
+      label: openInExternalEditor,
+      action: () => config.onOpenInExternalEditor(repository),
+      enabled: !missing,
+    },
+    { type: 'separator' },
+    {
+      label: config.askForConfirmationOnRemoveRepository ? 'Remove…' : 'Remove',
+      action: () => config.onRemoveRepository(repository),
+    },
+  ]
+
+  return items
+}
+
+const buildAliasMenuItems = (
+  config: IRepositoryListItemContextMenuConfig
+): ReadonlyArray<IMenuItem> => {
+  const { repository } = config
+
+  if (!(repository instanceof Repository)) {
+    return []
+  }
+
+  const verb = repository.alias == null ? 'Create' : 'Change'
+  const items: Array<IMenuItem> = [
+    {
+      label: __DARWIN__ ? `${verb} Alias` : `${verb} alias`,
+      action: () => config.onChangeRepositoryAlias(repository),
+    },
+  ]
+
+  if (repository.alias !== null) {
+    items.push({
+      label: __DARWIN__ ? 'Remove Alias' : 'Remove alias',
+      action: () => config.onRemoveRepositoryAlias(repository),
+    })
+  }
+
+  return items
+}
diff --git a/app/src/ui/repositories-list/repository-list-item.tsx b/app/src/ui/repositories-list/repository-list-item.tsx
index d912b5769c2..a41b3675993 100644
--- a/app/src/ui/repositories-list/repository-list-item.tsx
+++ b/app/src/ui/repositories-list/repository-list-item.tsx
@@ -1,20 +1,12 @@
 import * as React from 'react'
-import { clipboard } from 'electron'
 
 import { Repository } from '../../models/repository'
 import { Octicon, iconForRepository } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
-import { showContextualMenu } from '../../lib/menu-item'
+import * as octicons from '../octicons/octicons.generated'
 import { Repositoryish } from './group-repositories'
-import { IMenuItem } from '../../lib/menu-item'
 import { HighlightText } from '../lib/highlight-text'
 import { IMatches } from '../../lib/fuzzy-find'
 import { IAheadBehind } from '../../models/branch'
-import {
-  RevealInFileManagerLabel,
-  DefaultEditorLabel,
-} from '../lib/context-menu'
-import { enableRepositoryAliases } from '../../lib/feature-flag'
 import classNames from 'classnames'
 import { createObservableRef } from '../lib/observable-ref'
 import { Tooltip } from '../lib/tooltip'
@@ -23,39 +15,9 @@ import { TooltippedContent } from '../lib/tooltipped-content'
 interface IRepositoryListItemProps {
   readonly repository: Repositoryish
 
-  /** Whether the user has enabled the setting to confirm removing a repository from the app */
-  readonly askForConfirmationOnRemoveRepository: boolean
-
-  /** Called when the repository should be removed. */
-  readonly onRemoveRepository: (repository: Repositoryish) => void
-
-  /** Called when the repository should be shown in Finder/Explorer/File Manager. */
-  readonly onShowRepository: (repository: Repositoryish) => void
-
-  /** Called when the repository should be opened on GitHub in the default web browser. */
-  readonly onViewOnGitHub: (repository: Repositoryish) => void
-
-  /** Called when the repository should be shown in the shell. */
-  readonly onOpenInShell: (repository: Repositoryish) => void
-
-  /** Called when the repository should be opened in an external editor */
-  readonly onOpenInExternalEditor: (repository: Repositoryish) => void
-
-  /** Called when the repository alias should be changed */
-  readonly onChangeRepositoryAlias: (repository: Repository) => void
-
-  /** Called when the repository alias should be removed */
-  readonly onRemoveRepositoryAlias: (repository: Repository) => void
-
-  /** The current external editor selected by the user */
-  readonly externalEditorLabel?: string
-
   /** Does the repository need to be disambiguated in the list? */
   readonly needsDisambiguation: boolean
 
-  /** The label for the user's preferred shell. */
-  readonly shellLabel: string
-
   /** The characters in the repository name to highlight */
   readonly matches: IMatches
 
@@ -92,11 +54,7 @@ export class RepositoryListItem extends React.Component<
     })
 
     return (
-      <div
-        onContextMenu={this.onContextMenu}
-        className="repository-list-item"
-        ref={this.listItemRef}
-      >
+      <div className="repository-list-item" ref={this.listItemRef}>
         <Tooltip target={this.listItemRef}>{this.renderTooltip()}</Tooltip>
 
         <Octicon
@@ -150,125 +108,6 @@ export class RepositoryListItem extends React.Component<
       return true
     }
   }
-
-  private onContextMenu = (event: React.MouseEvent<any>) => {
-    event.preventDefault()
-
-    const repository = this.props.repository
-    const missing = repository instanceof Repository && repository.missing
-    const github =
-      repository instanceof Repository && repository.gitHubRepository != null
-    const openInExternalEditor = this.props.externalEditorLabel
-      ? `Open in ${this.props.externalEditorLabel}`
-      : DefaultEditorLabel
-
-    const items: ReadonlyArray<IMenuItem> = [
-      ...this.buildAliasMenuItems(),
-      {
-        label: __DARWIN__ ? 'Copy Repo Name' : 'Copy repo name',
-        action: this.copyNameToClipboard,
-      },
-      {
-        label: __DARWIN__ ? 'Copy Repo Path' : 'Copy repo path',
-        action: this.copyPathToClipboard,
-      },
-      { type: 'separator' },
-      {
-        label: 'View on GitHub',
-        action: this.viewOnGitHub,
-        enabled: github,
-      },
-      {
-        label: `Open in ${this.props.shellLabel}`,
-        action: this.openInShell,
-        enabled: !missing,
-      },
-      {
-        label: RevealInFileManagerLabel,
-        action: this.showRepository,
-        enabled: !missing,
-      },
-      {
-        label: openInExternalEditor,
-        action: this.openInExternalEditor,
-        enabled: !missing,
-      },
-      { type: 'separator' },
-      {
-        label: this.props.askForConfirmationOnRemoveRepository
-          ? 'Remove…'
-          : 'Remove',
-        action: this.removeRepository,
-      },
-    ]
-
-    showContextualMenu(items)
-  }
-
-  private buildAliasMenuItems(): ReadonlyArray<IMenuItem> {
-    const repository = this.props.repository
-
-    if (!(repository instanceof Repository) || !enableRepositoryAliases()) {
-      return []
-    }
-
-    const verb = repository.alias == null ? 'Create' : 'Change'
-    const items: Array<IMenuItem> = [
-      {
-        label: __DARWIN__ ? `${verb} Alias` : `${verb} alias`,
-        action: this.changeAlias,
-      },
-    ]
-
-    if (repository.alias !== null) {
-      items.push({
-        label: __DARWIN__ ? 'Remove Alias' : 'Remove alias',
-        action: this.removeAlias,
-      })
-    }
-
-    return items
-  }
-
-  private removeRepository = () => {
-    this.props.onRemoveRepository(this.props.repository)
-  }
-
-  private showRepository = () => {
-    this.props.onShowRepository(this.props.repository)
-  }
-
-  private viewOnGitHub = () => {
-    this.props.onViewOnGitHub(this.props.repository)
-  }
-
-  private openInShell = () => {
-    this.props.onOpenInShell(this.props.repository)
-  }
-
-  private openInExternalEditor = () => {
-    this.props.onOpenInExternalEditor(this.props.repository)
-  }
-
-  private changeAlias = () => {
-    if (this.props.repository instanceof Repository) {
-      this.props.onChangeRepositoryAlias(this.props.repository)
-    }
-  }
-
-  private removeAlias = () => {
-    if (this.props.repository instanceof Repository) {
-      this.props.onRemoveRepositoryAlias(this.props.repository)
-    }
-  }
-
-  private copyNameToClipboard = () => {
-    clipboard.writeText(this.props.repository.name)
-  }
-
-  private copyPathToClipboard = () => {
-    clipboard.writeText(this.props.repository.path)
-  }
 }
 
 const renderRepoIndicators: React.FunctionComponent<{
@@ -297,10 +136,14 @@ const renderAheadBehindIndicator = (aheadBehind: IAheadBehind) => {
     'its tracked branch.'
 
   return (
-    <div className="ahead-behind" title={aheadBehindTooltip}>
-      {ahead > 0 && <Octicon symbol={OcticonSymbol.arrowUp} />}
-      {behind > 0 && <Octicon symbol={OcticonSymbol.arrowDown} />}
-    </div>
+    <TooltippedContent
+      className="ahead-behind"
+      tagName="div"
+      tooltip={aheadBehindTooltip}
+    >
+      {ahead > 0 && <Octicon symbol={octicons.arrowUp} />}
+      {behind > 0 && <Octicon symbol={octicons.arrowDown} />}
+    </TooltippedContent>
   )
 }
 
@@ -310,7 +153,7 @@ const renderChangesIndicator = () => {
       className="change-indicator-wrapper"
       tooltip="There are uncommitted changes in this repository"
     >
-      <Octicon symbol={OcticonSymbol.dotFill} />
+      <Octicon symbol={octicons.dotFill} />
     </TooltippedContent>
   )
 }
diff --git a/app/src/ui/repository-rules/repo-rules-failure-list.tsx b/app/src/ui/repository-rules/repo-rules-failure-list.tsx
new file mode 100644
index 00000000000..1f608060f0e
--- /dev/null
+++ b/app/src/ui/repository-rules/repo-rules-failure-list.tsx
@@ -0,0 +1,83 @@
+import * as React from 'react'
+import { GitHubRepository } from '../../models/github-repository'
+import {
+  RepoRulesMetadataFailure,
+  RepoRulesMetadataFailures,
+} from '../../models/repo-rules'
+import { RepoRulesetsForBranchLink } from './repo-rulesets-for-branch-link'
+import { RepoRulesetLink } from './repo-ruleset-link'
+
+interface IRepoRulesMetadataFailureListProps {
+  readonly repository: GitHubRepository
+  readonly branch: string
+  readonly failures: RepoRulesMetadataFailures
+
+  /**
+   * Text that will come before the standard text, should be the name of the rule
+   * that's being checked. For example, "The email in your global Git config" or
+   * "This commit message".
+   */
+  readonly leadingText: string | JSX.Element
+}
+
+/**
+ * Returns a standard message for failed repo metadata rules.
+ */
+export class RepoRulesMetadataFailureList extends React.Component<IRepoRulesMetadataFailureListProps> {
+  public render() {
+    const { repository, branch, failures, leadingText } = this.props
+
+    const totalFails = failures.failed.length + failures.bypassed.length
+    let endText: string
+    if (failures.status === 'bypass') {
+      endText = `, but you can bypass ${
+        totalFails === 1 ? 'it' : 'them'
+      }. Proceed with caution!`
+    } else {
+      endText = '.'
+    }
+
+    const rulesText = __DARWIN__ ? 'Rules' : 'rules'
+
+    return (
+      <div className="repo-rules-failure-list-component">
+        <p>
+          {leadingText} fails {totalFails} rule{totalFails > 1 ? 's' : ''}
+          {endText}{' '}
+          <RepoRulesetsForBranchLink repository={repository} branch={branch}>
+            View all rulesets for this branch.
+          </RepoRulesetsForBranchLink>
+        </p>
+        {failures.failed.length > 0 && (
+          <div className="repo-rule-list">
+            <strong>Failed {rulesText}:</strong>
+            {this.renderRuleFailureList(failures.failed)}
+          </div>
+        )}
+        {failures.bypassed.length > 0 && (
+          <div className="repo-rule-list">
+            <strong>Bypassed {rulesText}:</strong>
+            {this.renderRuleFailureList(failures.bypassed)}
+          </div>
+        )}
+      </div>
+    )
+  }
+
+  private renderRuleFailureList(failures: RepoRulesMetadataFailure[]) {
+    return (
+      <ul>
+        {failures.map(f => (
+          <li key={`${f.description}-${f.rulesetId}`}>
+            <RepoRulesetLink
+              repository={this.props.repository}
+              rulesetId={f.rulesetId}
+            >
+              {f.description}
+            </RepoRulesetLink>
+          </li>
+        ))}
+      </ul>
+    )
+  }
+}
diff --git a/app/src/ui/repository-rules/repo-ruleset-link.tsx b/app/src/ui/repository-rules/repo-ruleset-link.tsx
new file mode 100644
index 00000000000..b7ef024e92a
--- /dev/null
+++ b/app/src/ui/repository-rules/repo-ruleset-link.tsx
@@ -0,0 +1,29 @@
+import * as React from 'react'
+import { GitHubRepository } from '../../models/github-repository'
+import { LinkButton } from '../lib/link-button'
+
+interface IRepoRulesetLinkProps {
+  readonly repository: GitHubRepository
+  readonly rulesetId: number
+}
+
+/**
+ * Returns a LinkButton to the webpage for the ruleset with the
+ * provided ID within the provided repo.
+ */
+export class RepoRulesetLink extends React.Component<
+  IRepoRulesetLinkProps,
+  {}
+> {
+  public render() {
+    const { repository, rulesetId, children } = this.props
+
+    const link = `${repository.htmlURL}/rules/${rulesetId}`
+
+    return (
+      <LinkButton uri={link} className="repo-ruleset-link">
+        {children}
+      </LinkButton>
+    )
+  }
+}
diff --git a/app/src/ui/repository-rules/repo-rulesets-for-branch-link.tsx b/app/src/ui/repository-rules/repo-rulesets-for-branch-link.tsx
new file mode 100644
index 00000000000..5be49a61215
--- /dev/null
+++ b/app/src/ui/repository-rules/repo-rulesets-for-branch-link.tsx
@@ -0,0 +1,35 @@
+import * as React from 'react'
+import { GitHubRepository } from '../../models/github-repository'
+import { LinkButton } from '../lib/link-button'
+
+interface IRepoRulesetsForBranchLinkProps {
+  readonly repository: GitHubRepository | null
+  readonly branch: string | null
+}
+
+/**
+ * Returns a LinkButton to the rulesets page for the given repository and branch. Returns
+ * the raw children with no link if the repository or branch are null.
+ */
+export class RepoRulesetsForBranchLink extends React.Component<
+  IRepoRulesetsForBranchLinkProps,
+  {}
+> {
+  public render() {
+    const { repository, branch, children } = this.props
+
+    if (!repository || !branch) {
+      return children
+    }
+
+    const link = `${repository.htmlURL}/rules/?ref=${encodeURIComponent(
+      'refs/heads/' + branch
+    )}`
+
+    return (
+      <LinkButton uri={link} className="repo-rulesets-for-branch-link">
+        {children}
+      </LinkButton>
+    )
+  }
+}
diff --git a/app/src/ui/repository-settings/fork-contribution-target-description.tsx b/app/src/ui/repository-settings/fork-contribution-target-description.tsx
index 95d53e0c829..9a6cccf8c1c 100644
--- a/app/src/ui/repository-settings/fork-contribution-target-description.tsx
+++ b/app/src/ui/repository-settings/fork-contribution-target-description.tsx
@@ -25,7 +25,7 @@ export function ForkSettingsDescription(props: IForkSettingsDescription) {
         Issues will be created in <strong>{targetRepository.fullName}</strong>.
       </li>
       <li>
-        "View on Github" will open <strong>{targetRepository.fullName}</strong>{' '}
+        "View on GitHub" will open <strong>{targetRepository.fullName}</strong>{' '}
         in the browser.
       </li>
       <li>
diff --git a/app/src/ui/repository-settings/fork-settings.tsx b/app/src/ui/repository-settings/fork-settings.tsx
index d68284a14ff..2aeb1e7dd78 100644
--- a/app/src/ui/repository-settings/fork-settings.tsx
+++ b/app/src/ui/repository-settings/fork-settings.tsx
@@ -3,7 +3,8 @@ import { DialogContent } from '../dialog'
 import { ForkContributionTarget } from '../../models/workflow-preferences'
 import { RepositoryWithForkedGitHubRepository } from '../../models/repository'
 import { ForkSettingsDescription } from './fork-contribution-target-description'
-import { RadioButton } from '../lib/radio-button'
+import { RadioGroup } from '../lib/radio-group'
+import { assertNever } from '../../lib/fatal-error'
 
 interface IForkSettingsProps {
   readonly forkContributionTarget: ForkContributionTarget
@@ -15,27 +16,33 @@ interface IForkSettingsProps {
 
 /** A view for creating or modifying the repository's gitignore file */
 export class ForkSettings extends React.Component<IForkSettingsProps, {}> {
+  private renderForkOptionsLabel = (key: ForkContributionTarget) => {
+    switch (key) {
+      case ForkContributionTarget.Parent:
+        return 'To contribute to the parent repository'
+      case ForkContributionTarget.Self:
+        return 'For my own purposes'
+      default:
+        return assertNever(key, `Unknown fork contribution target: ${key}`)
+    }
+  }
+
   public render() {
+    const options = [ForkContributionTarget.Parent, ForkContributionTarget.Self]
+    const selectionOption =
+      options.find(o => o === this.props.forkContributionTarget) ??
+      ForkContributionTarget.Parent
+
     return (
       <DialogContent>
-        <h2>I'll be using this fork…</h2>
-
-        <RadioButton
-          value={ForkContributionTarget.Parent}
-          checked={
-            this.props.forkContributionTarget === ForkContributionTarget.Parent
-          }
-          label="To contribute to the parent repository"
-          onSelected={this.onForkContributionTargetChanged}
-        />
+        <h2 id="fork-usage-heading">I'll be using this fork…</h2>
 
-        <RadioButton
-          value={ForkContributionTarget.Self}
-          checked={
-            this.props.forkContributionTarget === ForkContributionTarget.Self
-          }
-          label="For my own purposes"
-          onSelected={this.onForkContributionTargetChanged}
+        <RadioGroup<ForkContributionTarget>
+          ariaLabelledBy="fork-usage-heading"
+          selectedKey={selectionOption}
+          radioButtonKeys={options}
+          onSelectionChanged={this.onForkContributionTargetChanged}
+          renderRadioButtonLabelContents={this.renderForkOptionsLabel}
         />
 
         <ForkSettingsDescription
diff --git a/app/src/ui/repository-settings/git-config.tsx b/app/src/ui/repository-settings/git-config.tsx
index 7247e82ef8b..d8968ef37bc 100644
--- a/app/src/ui/repository-settings/git-config.tsx
+++ b/app/src/ui/repository-settings/git-config.tsx
@@ -4,7 +4,8 @@ import { Account } from '../../models/account'
 import { GitConfigUserForm } from '../lib/git-config-user-form'
 import { getDotComAPIEndpoint } from '../../lib/api'
 import { Row } from '../lib/row'
-import { RadioButton } from '../lib/radio-button'
+import { RadioGroup } from '../lib/radio-group'
+import { assertNever } from '../../lib/fatal-error'
 
 interface IGitConfigProps {
   readonly account: Account | null
@@ -14,6 +15,7 @@ interface IGitConfigProps {
   readonly email: string
   readonly globalName: string
   readonly globalEmail: string
+  readonly isLoadingGitConfig: boolean
 
   readonly onGitConfigLocationChanged: (value: GitConfigLocation) => void
   readonly onNameChanged: (name: string) => void
@@ -31,6 +33,17 @@ export class GitConfig extends React.Component<IGitConfigProps> {
     this.props.onGitConfigLocationChanged(value)
   }
 
+  private renderConfigOptionLabel = (key: GitConfigLocation) => {
+    switch (key) {
+      case GitConfigLocation.Global:
+        return 'Use my global Git config'
+      case GitConfigLocation.Local:
+        return 'Use a local Git config'
+      default:
+        return assertNever(key, `Unknown git config location: ${key}`)
+    }
+  }
+
   public render() {
     const isDotComAccount =
       this.props.account !== null &&
@@ -38,29 +51,23 @@ export class GitConfig extends React.Component<IGitConfigProps> {
     const enterpriseAccount = isDotComAccount ? null : this.props.account
     const dotComAccount = isDotComAccount ? this.props.account : null
 
+    const configOptions = [GitConfigLocation.Global, GitConfigLocation.Local]
+    const selectionOption =
+      configOptions.find(o => o === this.props.gitConfigLocation) ??
+      GitConfigLocation.Global
+
     return (
       <DialogContent>
         <div className="advanced-section">
-          <h2>For this repository I wish to</h2>
+          <h2 id="git-config-heading">For this repository I wish to</h2>
           <Row>
-            <div>
-              <RadioButton
-                label="Use my global Git config"
-                checked={
-                  this.props.gitConfigLocation === GitConfigLocation.Global
-                }
-                value={GitConfigLocation.Global}
-                onSelected={this.onGitConfigLocationChanged}
-              />
-              <RadioButton
-                label="Use a local Git config"
-                checked={
-                  this.props.gitConfigLocation === GitConfigLocation.Local
-                }
-                value={GitConfigLocation.Local}
-                onSelected={this.onGitConfigLocationChanged}
-              />
-            </div>
+            <RadioGroup<GitConfigLocation>
+              ariaLabelledBy="git-config-heading"
+              selectedKey={selectionOption}
+              radioButtonKeys={configOptions}
+              onSelectionChanged={this.onGitConfigLocationChanged}
+              renderRadioButtonLabelContents={this.renderConfigOptionLabel}
+            />
           </Row>
           <GitConfigUserForm
             email={
@@ -78,6 +85,7 @@ export class GitConfig extends React.Component<IGitConfigProps> {
             disabled={this.props.gitConfigLocation === GitConfigLocation.Global}
             onEmailChanged={this.props.onEmailChanged}
             onNameChanged={this.props.onNameChanged}
+            isLoadingGitConfig={this.props.isLoadingGitConfig}
           />
         </div>
       </DialogContent>
diff --git a/app/src/ui/repository-settings/git-ignore.tsx b/app/src/ui/repository-settings/git-ignore.tsx
index 76172246a24..8bc1df63940 100644
--- a/app/src/ui/repository-settings/git-ignore.tsx
+++ b/app/src/ui/repository-settings/git-ignore.tsx
@@ -15,20 +15,22 @@ export class GitIgnore extends React.Component<IGitIgnoreProps, {}> {
   public render() {
     return (
       <DialogContent>
-        <p>
+        <p id="ignored-files-description">
           Editing <Ref>.gitignore</Ref>. This file specifies intentionally
           untracked files that Git should ignore. Files already tracked by Git
           are not affected.{' '}
           <LinkButton onClick={this.props.onShowExamples}>
-            Learn more
+            Learn more about gitignore files
           </LinkButton>
         </p>
 
         <TextArea
+          ariaLabel="Ignored files"
+          ariaDescribedBy="ignored-files-description"
           placeholder="Ignored files"
           value={this.props.text || ''}
           onValueChanged={this.props.onIgnoreTextChanged}
-          rows={6}
+          textareaClassName="gitignore"
         />
       </DialogContent>
     )
diff --git a/app/src/ui/repository-settings/no-remote.tsx b/app/src/ui/repository-settings/no-remote.tsx
index a9ed19c55cd..66d93673fbb 100644
--- a/app/src/ui/repository-settings/no-remote.tsx
+++ b/app/src/ui/repository-settings/no-remote.tsx
@@ -16,10 +16,11 @@ export class NoRemote extends React.Component<INoRemoteProps, {}> {
     return (
       <DialogContent>
         <CallToAction actionTitle="Publish" onAction={this.props.onPublish}>
-          <div>
+          <div className="no-remote-publish-message">
             Publish your repository to GitHub. Need help?{' '}
-            <LinkButton uri={HelpURL}>Learn more</LinkButton> about remote
-            repositories.
+            <LinkButton uri={HelpURL}>
+              Learn more about remote repositories.
+            </LinkButton>
           </div>
         </CallToAction>
       </DialogContent>
diff --git a/app/src/ui/repository-settings/remote.tsx b/app/src/ui/repository-settings/remote.tsx
index e229e4382c5..ebfe7fe51fe 100644
--- a/app/src/ui/repository-settings/remote.tsx
+++ b/app/src/ui/repository-settings/remote.tsx
@@ -17,9 +17,13 @@ export class Remote extends React.Component<IRemoteProps, {}> {
     const remote = this.props.remote
     return (
       <DialogContent>
-        <p>Primary remote repository ({remote.name})</p>
         <TextBox
           placeholder="Remote URL"
+          label={
+            __DARWIN__
+              ? `Primary Remote Repository (${remote.name}) URL`
+              : `Primary remote repository (${remote.name}) URL`
+          }
           value={remote.url}
           onValueChanged={this.props.onRemoteUrlChanged}
         />
diff --git a/app/src/ui/repository-settings/repository-settings.tsx b/app/src/ui/repository-settings/repository-settings.tsx
index 57fa3b6069d..003525d40ef 100644
--- a/app/src/ui/repository-settings/repository-settings.tsx
+++ b/app/src/ui/repository-settings/repository-settings.tsx
@@ -29,6 +29,8 @@ import {
   InvalidGitAuthorNameMessage,
 } from '../lib/identifier-rules'
 import { Account } from '../../models/account'
+import { Octicon } from '../octicons'
+import * as octicons from '../octicons/octicons.generated'
 
 interface IRepositorySettingsProps {
   readonly initialSelectedTab?: RepositorySettingsTab
@@ -63,6 +65,7 @@ interface IRepositorySettingsState {
   readonly initialCommitterEmail: string | null
   readonly errors?: ReadonlyArray<JSX.Element | string>
   readonly forkContributionTarget: ForkContributionTarget
+  readonly isLoadingGitConfig: boolean
 }
 
 export class RepositorySettings extends React.Component<
@@ -89,6 +92,7 @@ export class RepositorySettings extends React.Component<
       initialGitConfigLocation: GitConfigLocation.Global,
       initialCommitterName: null,
       initialCommitterEmail: null,
+      isLoadingGitConfig: true,
     }
   }
 
@@ -141,6 +145,7 @@ export class RepositorySettings extends React.Component<
       initialGitConfigLocation: gitConfigLocation,
       initialCommitterName: localCommitterName,
       initialCommitterEmail: localCommitterEmail,
+      isLoadingGitConfig: false,
     })
   }
 
@@ -178,38 +183,38 @@ export class RepositorySettings extends React.Component<
             selectedIndex={this.state.selectedTab}
             type={TabBarType.Vertical}
           >
-            <span>Remote</span>
-            <span>{__DARWIN__ ? 'Ignored Files' : 'Ignored files'}</span>
-            <span>{__DARWIN__ ? 'Git Config' : 'Git config'}</span>
+            <span>
+              <Octicon className="icon" symbol={octicons.server} />
+              Remote
+            </span>
+            <span>
+              <Octicon className="icon" symbol={octicons.file} />
+              {__DARWIN__ ? 'Ignored Files' : 'Ignored files'}
+            </span>
+            <span>
+              <Octicon className="icon" symbol={octicons.gitCommit} />
+              {__DARWIN__ ? 'Git Config' : 'Git config'}
+            </span>
             {showForkSettings && (
-              <span>{__DARWIN__ ? 'Fork Behavior' : 'Fork behavior'}</span>
+              <span>
+                <Octicon className="icon" symbol={octicons.repoForked} />
+                {__DARWIN__ ? 'Fork Behavior' : 'Fork behavior'}
+              </span>
             )}
           </TabBar>
 
           <div className="active-tab">{this.renderActiveTab()}</div>
         </div>
-        {this.renderFooter()}
+        <DialogFooter>
+          <OkCancelButtonGroup
+            okButtonText="Save"
+            okButtonDisabled={this.state.saveDisabled}
+          />
+        </DialogFooter>
       </Dialog>
     )
   }
 
-  private renderFooter() {
-    const tab = this.state.selectedTab
-    const remote = this.state.remote
-    if (tab === RepositorySettingsTab.Remote && !remote) {
-      return null
-    }
-
-    return (
-      <DialogFooter>
-        <OkCancelButtonGroup
-          okButtonText="Save"
-          okButtonDisabled={this.state.saveDisabled}
-        />
-      </DialogFooter>
-    )
-  }
-
   private renderActiveTab() {
     const tab = this.state.selectedTab
     switch (tab) {
@@ -263,6 +268,7 @@ export class RepositorySettings extends React.Component<
             globalEmail={this.state.globalCommitterEmail}
             onNameChanged={this.onCommitterNameChanged}
             onEmailChanged={this.onCommitterEmailChanged}
+            isLoadingGitConfig={this.state.isLoadingGitConfig}
           />
         )
       }
@@ -288,12 +294,14 @@ export class RepositorySettings extends React.Component<
     const errors = new Array<JSX.Element | string>()
 
     if (this.state.remote && this.props.remote) {
-      if (this.state.remote.url !== this.props.remote.url) {
+      const trimmedUrl = this.state.remote.url.trim()
+
+      if (trimmedUrl !== this.props.remote.url) {
         try {
           await this.props.dispatcher.setRemoteURL(
             this.props.repository,
             this.props.remote.name,
-            this.state.remote.url
+            trimmedUrl
           )
         } catch (e) {
           log.error(
diff --git a/app/src/ui/repository.tsx b/app/src/ui/repository.tsx
index 9d9ac732c0e..2ee6862d77f 100644
--- a/app/src/ui/repository.tsx
+++ b/app/src/ui/repository.tsx
@@ -31,14 +31,15 @@ import { openFile } from './lib/open-file'
 import { AheadBehindStore } from '../lib/stores/ahead-behind-store'
 import { dragAndDropManager } from '../lib/drag-and-drop-manager'
 import { DragType } from '../models/drag-drop'
-import { MultiCommitOperationKind } from '../models/multi-commit-operation'
+import { PullRequestSuggestedNextAction } from '../models/pull-request'
 import { clamp } from '../lib/clamp'
+import { Emoji } from '../lib/emoji'
 
 interface IRepositoryViewProps {
   readonly repository: Repository
   readonly state: IRepositoryState
   readonly dispatcher: Dispatcher
-  readonly emoji: Map<string, string>
+  readonly emoji: Map<string, Emoji>
   readonly sidebarWidth: IConstrainedValue
   readonly commitSummaryWidth: IConstrainedValue
   readonly stashedFilesWidth: IConstrainedValue
@@ -49,9 +50,14 @@ interface IRepositoryViewProps {
   readonly hideWhitespaceInChangesDiff: boolean
   readonly hideWhitespaceInHistoryDiff: boolean
   readonly showSideBySideDiff: boolean
+  readonly showDiffCheckMarks: boolean
   readonly askForConfirmationOnDiscardChanges: boolean
+  readonly askForConfirmationOnCommitFilteredChanges: boolean
+  readonly askForConfirmationOnDiscardStash: boolean
+  readonly askForConfirmationOnCheckoutCommit: boolean
   readonly focusCommitMessage: boolean
   readonly commitSpellcheckEnabled: boolean
+  readonly showCommitLengthWarning: boolean
   readonly accounts: ReadonlyArray<Account>
 
   /**
@@ -66,6 +72,14 @@ interface IRepositoryViewProps {
    */
   readonly isShowingFoldout: boolean
 
+  /**
+   * Whether or not the user has a configured (explicitly,
+   * or automatically) external editor. Used to
+   * determine whether or not to render the action for
+   * opening the repository in an external editor.
+   */
+  readonly isExternalEditorAvailable: boolean
+
   /** The name of the currently selected external editor */
   readonly externalEditorLabel?: string
 
@@ -92,6 +106,9 @@ interface IRepositoryViewProps {
     repository: Repository,
     commits: ReadonlyArray<CommitOneLine>
   ) => void
+
+  /** The user's preference of pull request suggested next action to use **/
+  readonly pullRequestSuggestedNextAction?: PullRequestSuggestedNextAction
 }
 
 interface IRepositoryViewState {
@@ -115,6 +132,12 @@ export class RepositoryView extends React.Component<
   // the Compare list is rendered.
   private forceCompareListScrollTop: boolean = false
 
+  private readonly changesSidebarRef = React.createRef<ChangesSidebar>()
+  private readonly compareSidebarRef = React.createRef<CompareSidebar>()
+
+  private focusHistoryNeeded: boolean = false
+  private focusChangesNeeded: boolean = false
+
   public constructor(props: IRepositoryViewProps) {
     super(props)
 
@@ -124,6 +147,14 @@ export class RepositoryView extends React.Component<
     }
   }
 
+  public setFocusHistoryNeeded(): void {
+    this.focusHistoryNeeded = true
+  }
+
+  public setFocusChangesNeeded(): void {
+    this.focusChangesNeeded = true
+  }
+
   public scrollCompareListToTop(): void {
     this.forceCompareListScrollTop = true
 
@@ -159,12 +190,12 @@ export class RepositoryView extends React.Component<
 
     return (
       <TabBar selectedIndex={selectedTab} onTabClicked={this.onTabClicked}>
-        <span className="with-indicator">
+        <span className="with-indicator" id="changes-tab">
           <span>Changes</span>
           {this.renderChangesBadge()}
         </span>
 
-        <div className="with-indicator">
+        <div className="with-indicator" id="history-tab">
           <span>History</span>
         </div>
       </TabBar>
@@ -201,9 +232,11 @@ export class RepositoryView extends React.Component<
 
     return (
       <ChangesSidebar
+        ref={this.changesSidebarRef}
         repository={this.props.repository}
         dispatcher={this.props.dispatcher}
         changes={this.props.state.changesState}
+        aheadBehind={this.props.state.aheadBehind}
         branch={branchName}
         commitAuthor={this.props.state.commitAuthor}
         emoji={this.props.emoji}
@@ -218,7 +251,12 @@ export class RepositoryView extends React.Component<
         askForConfirmationOnDiscardChanges={
           this.props.askForConfirmationOnDiscardChanges
         }
+        askForConfirmationOnCommitFilteredChanges={
+          this.props.askForConfirmationOnCommitFilteredChanges
+        }
         accounts={this.props.accounts}
+        isShowingModal={this.props.isShowingModal}
+        isShowingFoldout={this.props.isShowingFoldout}
         externalEditorLabel={this.props.externalEditorLabel}
         onOpenInExternalEditor={this.props.onOpenInExternalEditor}
         onChangesListScrolled={this.onChangesListScrolled}
@@ -227,6 +265,7 @@ export class RepositoryView extends React.Component<
           this.props.currentTutorialStep === TutorialStep.MakeCommit
         }
         commitSpellcheckEnabled={this.props.commitSpellcheckEnabled}
+        showCommitLengthWarning={this.props.showCommitLengthWarning}
       />
     )
   }
@@ -247,10 +286,6 @@ export class RepositoryView extends React.Component<
     } = state
     const { tip } = branchesState
     const currentBranch = tip.kind === TipState.Valid ? tip.branch : null
-    const isCherryPickInProgress =
-      mcos !== null &&
-      mcos.operationDetail.kind === MultiCommitOperationKind.CherryPick
-
     const scrollTop =
       this.forceCompareListScrollTop ||
       this.previousSection === RepositorySectionTab.Changes
@@ -261,10 +296,12 @@ export class RepositoryView extends React.Component<
 
     return (
       <CompareSidebar
+        ref={this.compareSidebarRef}
         repository={repository}
         isLocalRepository={remote === null}
         compareState={compareState}
         selectedCommitShas={shas}
+        shasToHighlight={compareState.shasToHighlight}
         currentBranch={currentBranch}
         emoji={emoji}
         commitLookup={commitLookup}
@@ -279,7 +316,11 @@ export class RepositoryView extends React.Component<
         compareListScrollTop={scrollTop}
         tagsToPush={tagsToPush}
         aheadBehindStore={aheadBehindStore}
-        isCherryPickInProgress={isCherryPickInProgress}
+        isMultiCommitOperationInProgress={mcos !== null}
+        askForConfirmationOnCheckoutCommit={
+          this.props.askForConfirmationOnCheckoutCommit
+        }
+        accounts={this.props.accounts}
       />
     )
   }
@@ -314,6 +355,7 @@ export class RepositoryView extends React.Component<
           minimumWidth={this.props.sidebarWidth.min}
           onReset={this.handleSidebarWidthReset}
           onResize={this.handleSidebarResize}
+          description="Repository sidebar"
         >
           {this.renderTabs()}
           {this.renderSidebarContents()}
@@ -335,8 +377,7 @@ export class RepositoryView extends React.Component<
 
   private renderStashedChangesContent(): JSX.Element | null {
     const { changesState } = this.props.state
-    const { selection, stashEntry, workingDirectory } = changesState
-    const isWorkingTreeClean = workingDirectory.files.length === 0
+    const { selection, stashEntry } = changesState
 
     if (selection.kind !== ChangesSelectionKind.Stash || stashEntry === null) {
       return null
@@ -352,11 +393,15 @@ export class RepositoryView extends React.Component<
           fileListWidth={this.props.stashedFilesWidth}
           repository={this.props.repository}
           dispatcher={this.props.dispatcher}
-          isWorkingTreeClean={isWorkingTreeClean}
+          askForConfirmationOnDiscardStash={
+            this.props.askForConfirmationOnDiscardStash
+          }
           showSideBySideDiff={this.props.showSideBySideDiff}
           onOpenBinaryFile={this.onOpenBinaryFile}
+          onOpenSubmodule={this.onOpenSubmodule}
           onChangeImageDiffType={this.onChangeImageDiffType}
           onHideWhitespaceInDiffChanged={this.onHideWhitespaceInDiffChanged}
+          onOpenInExternalEditor={this.props.onOpenInExternalEditor}
         />
       )
     }
@@ -373,7 +418,8 @@ export class RepositoryView extends React.Component<
 
   private renderContentForHistory(): JSX.Element {
     const { commitSelection, commitLookup, localCommitSHAs } = this.props.state
-    const { changesetData, file, diff, shas, isContiguous } = commitSelection
+    const { changesetData, file, diff, shas, shasInDiff, isContiguous } =
+      commitSelection
 
     const selectedCommits = []
     for (const sha of shas) {
@@ -390,9 +436,9 @@ export class RepositoryView extends React.Component<
     return (
       <SelectedCommits
         repository={this.props.repository}
-        isLocalRepository={this.props.state.remote === null}
         dispatcher={this.props.dispatcher}
         selectedCommits={selectedCommits}
+        shasInDiff={shasInDiff}
         isContiguous={isContiguous}
         localCommitSHAs={localCommitSHAs}
         changesetData={changesetData}
@@ -407,23 +453,39 @@ export class RepositoryView extends React.Component<
         hideWhitespaceInDiff={this.props.hideWhitespaceInHistoryDiff}
         showSideBySideDiff={this.props.showSideBySideDiff}
         onOpenBinaryFile={this.onOpenBinaryFile}
+        onOpenSubmodule={this.onOpenSubmodule}
         onChangeImageDiffType={this.onChangeImageDiffType}
         onDiffOptionsOpened={this.onDiffOptionsOpened}
         showDragOverlay={showDragOverlay}
+        accounts={this.props.accounts}
       />
     )
   }
 
   private onDiffOptionsOpened = () => {
-    this.props.dispatcher.recordDiffOptionsViewed()
+    this.props.dispatcher.incrementMetric('diffOptionsViewedCount')
+  }
+
+  private onTutorialCompletionAnnounced = () => {
+    this.props.dispatcher.markTutorialCompletionAsAnnounced(
+      this.props.repository
+    )
   }
 
   private renderTutorialPane(): JSX.Element {
-    if (this.props.currentTutorialStep === TutorialStep.AllDone) {
+    if (
+      [TutorialStep.AllDone, TutorialStep.Announced].includes(
+        this.props.currentTutorialStep
+      )
+    ) {
       return (
         <TutorialDone
           dispatcher={this.props.dispatcher}
           repository={this.props.repository}
+          tutorialCompletionAnnounced={
+            this.props.currentTutorialStep === TutorialStep.Announced
+          }
+          onTutorialCompletionAnnounced={this.onTutorialCompletionAnnounced}
         />
       )
     } else {
@@ -455,10 +517,11 @@ export class RepositoryView extends React.Component<
             appMenu={this.props.appMenu}
             repository={this.props.repository}
             repositoryState={this.props.state}
-            isExternalEditorAvailable={
-              this.props.externalEditorLabel !== undefined
-            }
+            isExternalEditorAvailable={this.props.isExternalEditorAvailable}
             dispatcher={this.props.dispatcher}
+            pullRequestSuggestedNextAction={
+              this.props.pullRequestSuggestedNextAction
+            }
           />
         )
       }
@@ -483,7 +546,9 @@ export class RepositoryView extends React.Component<
           imageDiffType={this.props.imageDiffType}
           hideWhitespaceInDiff={this.props.hideWhitespaceInChangesDiff}
           showSideBySideDiff={this.props.showSideBySideDiff}
+          showDiffCheckMarks={this.props.showDiffCheckMarks}
           onOpenBinaryFile={this.onOpenBinaryFile}
+          onOpenSubmodule={this.onOpenSubmodule}
           onChangeImageDiffType={this.onChangeImageDiffType}
           askForConfirmationOnDiscardChanges={
             this.props.askForConfirmationOnDiscardChanges
@@ -498,6 +563,11 @@ export class RepositoryView extends React.Component<
     openFile(fullPath, this.props.dispatcher)
   }
 
+  private onOpenSubmodule = (fullPath: string) => {
+    this.props.dispatcher.incrementMetric('openSubmoduleFromDiffCount')
+    this.props.dispatcher.openOrAddRepository(fullPath)
+  }
+
   private onChangeImageDiffType = (imageDiffType: ImageDiffType) => {
     this.props.dispatcher.changeImageDiffType(imageDiffType)
   }
@@ -543,6 +613,18 @@ export class RepositoryView extends React.Component<
     window.removeEventListener('keydown', this.onGlobalKeyDown)
   }
 
+  public componentDidUpdate(): void {
+    if (this.focusChangesNeeded) {
+      this.focusChangesNeeded = false
+      this.changesSidebarRef.current?.focus()
+    }
+
+    if (this.focusHistoryNeeded) {
+      this.focusHistoryNeeded = false
+      this.compareSidebarRef.current?.focusHistory()
+    }
+  }
+
   private onGlobalKeyDown = (event: KeyboardEvent) => {
     if (event.defaultPrevented) {
       return
diff --git a/app/src/ui/reset/warning-before-reset.tsx b/app/src/ui/reset/warning-before-reset.tsx
index 5c6ff560225..dd6c4eb3218 100644
--- a/app/src/ui/reset/warning-before-reset.tsx
+++ b/app/src/ui/reset/warning-before-reset.tsx
@@ -42,9 +42,11 @@ export class WarningBeforeReset extends React.Component<
         disabled={this.state.isLoading}
         onSubmit={this.onSubmit}
         onDismissed={this.props.onDismissed}
+        role="alertdialog"
+        ariaDescribedBy="reset-warning-message"
       >
         <DialogContent>
-          <Row>
+          <Row id="reset-warning-message">
             You have changes in progress. Resetting to a previous commit might
             result in some of these changes being lost. Do you want to continue
             anyway?
diff --git a/app/src/ui/resizable/resizable.tsx b/app/src/ui/resizable/resizable.tsx
index 344eb5bd4dd..fa8d3db6daf 100644
--- a/app/src/ui/resizable/resizable.tsx
+++ b/app/src/ui/resizable/resizable.tsx
@@ -1,8 +1,25 @@
+/* eslint-disable jsx-a11y/no-static-element-interactions */
 import * as React from 'react'
 import { clamp } from '../../lib/clamp'
+import { AriaLiveContainer } from '../accessibility/aria-live-container'
 
-const DefaultMaxWidth = 350
-const DefaultMinWidth = 200
+export const DefaultMaxWidth = 350
+export const DefaultMinWidth = 200
+
+/** This class is assigned to the containing div of the element and used in
+ * determining whether the resizable is focused. */
+export const resizableComponentClass = 'resizable-component'
+
+export enum ResizeDirection {
+  Increase = 'Increase',
+  Decrease = 'Decrease',
+}
+
+export interface IResizableState {
+  /** The message that is announced to screen reader users to inform them of
+   * resizable panel state */
+  readonly resizeMessage: string
+}
 
 /**
  * Component abstracting a resizable panel.
@@ -10,10 +27,19 @@ const DefaultMinWidth = 200
  * Note: this component is pure, consumers must subscribe to the
  * onResize and onReset event and update the width prop accordingly.
  */
-export class Resizable extends React.Component<IResizableProps> {
+export class Resizable extends React.Component<
+  IResizableProps,
+  IResizableState
+> {
+  private resizeContainer: HTMLDivElement | null = null
   private startWidth: number | null = null
   private startX: number | null = null
 
+  public constructor(props: IResizableProps) {
+    super(props)
+    this.state = { resizeMessage: '' }
+  }
+
   /**
    * Returns the current width as determined by props.
    *
@@ -58,6 +84,9 @@ export class Resizable extends React.Component<IResizableProps> {
     const deltaX = e.clientX - this.startX
     const newWidth = this.startWidth + deltaX
 
+    this.updateResizeMessage(
+      deltaX > 0 ? ResizeDirection.Increase : ResizeDirection.Decrease
+    )
     this.props.onResize(this.clampWidth(newWidth))
     e.preventDefault()
   }
@@ -76,6 +105,88 @@ export class Resizable extends React.Component<IResizableProps> {
     e.preventDefault()
   }
 
+  /**
+   * Handler for when a user uses keyboard shortcuts to increase the size the
+   * active resizable
+   */
+  private handleMenuResizeEventIncrease = (
+    ev?: Event | React.SyntheticEvent<unknown>
+  ) => {
+    this.handleMenuResizeEvent(ResizeDirection.Increase)
+    ev?.preventDefault()
+  }
+
+  /**
+   * Handler for when a user uses keyboard shortcuts to decrease the size the
+   * active resizable
+   */
+  private handleMenuResizeEventDecrease = (
+    ev?: Event | React.SyntheticEvent<unknown>
+  ) => {
+    this.handleMenuResizeEvent(ResizeDirection.Decrease)
+    ev?.preventDefault()
+  }
+
+  /**
+   * Handler for when a user uses keyboard shortcuts to resize the size the
+   * active resizable
+   */
+  private handleMenuResizeEvent(resizeDirection: ResizeDirection) {
+    const { width } = this.props
+    const changedWidth =
+      resizeDirection === ResizeDirection.Decrease ? width - 5 : width + 5
+
+    const newWidth = this.clampWidth(changedWidth)
+
+    this.updateResizeMessage(resizeDirection)
+    this.props.onResize(this.clampWidth(newWidth))
+  }
+
+  /**
+   * Adds and removes listeners for custom events fired when user users keyboard
+   * to resize the active resizable
+   */
+  private onResizableRef = (ref: HTMLDivElement | null) => {
+    if (ref === null) {
+      this.resizeContainer?.removeEventListener(
+        'increase-active-resizable-width',
+        this.handleMenuResizeEventIncrease
+      )
+      this.resizeContainer?.removeEventListener(
+        'decrease-active-resizable-width',
+        this.handleMenuResizeEventDecrease
+      )
+    } else {
+      ref.addEventListener(
+        'increase-active-resizable-width',
+        this.handleMenuResizeEventIncrease
+      )
+      ref.addEventListener(
+        'decrease-active-resizable-width',
+        this.handleMenuResizeEventDecrease
+      )
+    }
+    this.resizeContainer = ref
+  }
+
+  private getResizePercentage() {
+    const minWidth = this.props.minimumWidth ?? 0
+    const maxWidth = this.props.maximumWidth ?? DefaultMaxWidth
+    return Math.round(
+      ((this.getCurrentWidth() - minWidth) / (maxWidth - minWidth)) * 100
+    )
+  }
+
+  private updateResizeMessage(direction: ResizeDirection) {
+    const directionMessage =
+      direction === ResizeDirection.Increase ? 'increased' : 'decreased'
+    this.setState({
+      resizeMessage: `${
+        this.props.description
+      } width ${directionMessage}. Set to ${this.getResizePercentage()}%`,
+    })
+  }
+
   public render() {
     const style: React.CSSProperties = {
       width: this.getCurrentWidth(),
@@ -84,13 +195,22 @@ export class Resizable extends React.Component<IResizableProps> {
     }
 
     return (
-      <div id={this.props.id} className="resizable-component" style={style}>
+      <div
+        id={this.props.id}
+        className={resizableComponentClass}
+        style={style}
+        ref={this.onResizableRef}
+      >
         {this.props.children}
         <div
           onMouseDown={this.handleDragStart}
           onDoubleClick={this.props.onReset}
           className="resize-handle"
         />
+        <AriaLiveContainer
+          message={this.state.resizeMessage}
+          trackedUserInput={this.state.resizeMessage}
+        />
       </div>
     )
   }
@@ -115,6 +235,9 @@ export interface IResizableProps {
   /** The optional ID for the root element. */
   readonly id?: string
 
+  /** Used to describe which resizable was updated to screen reader users */
+  readonly description: string
+
   /**
    * Handler called when the width of the component has changed
    * through an explicit resize event (dragging the handle).
diff --git a/app/src/ui/saml-reauth-required/saml-reauth-required.tsx b/app/src/ui/saml-reauth-required/saml-reauth-required.tsx
index abe5e814a3b..ddadf07dad4 100644
--- a/app/src/ui/saml-reauth-required/saml-reauth-required.tsx
+++ b/app/src/ui/saml-reauth-required/saml-reauth-required.tsx
@@ -2,8 +2,8 @@ import * as React from 'react'
 import { Dialog, DialogContent, DialogFooter } from '../dialog'
 import { Dispatcher } from '../dispatcher'
 import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group'
-import { getDotComAPIEndpoint } from '../../lib/api'
 import { RetryAction } from '../../models/retry-actions'
+import { SignInResult } from '../../lib/stores'
 
 const okButtonText = __DARWIN__ ? 'Continue in Browser' : 'Continue in browser'
 
@@ -66,16 +66,14 @@ export class SAMLReauthRequiredDialog extends React.Component<
 
   private onSignIn = async () => {
     this.setState({ loading: true })
+    const { dispatcher, endpoint } = this.props
 
-    if (this.props.endpoint === getDotComAPIEndpoint()) {
-      await this.props.dispatcher.beginDotComSignIn()
-    } else {
-      await this.props.dispatcher.beginEnterpriseSignIn()
-    }
-    await this.props.dispatcher.requestBrowserAuthentication()
+    const result = await new Promise<SignInResult>(async resolve => {
+      dispatcher.beginBrowserBasedSignIn(endpoint, resolve)
+    })
 
-    if (this.props.retryAction !== undefined) {
-      this.props.dispatcher.performRetry(this.props.retryAction)
+    if (result.kind === 'success' && this.props.retryAction) {
+      dispatcher.performRetry(this.props.retryAction)
     }
 
     this.props.onDismissed()
diff --git a/app/src/ui/sign-in/sign-in.tsx b/app/src/ui/sign-in/sign-in.tsx
index ea7bfdbdae9..d9ab5d2d542 100644
--- a/app/src/ui/sign-in/sign-in.tsx
+++ b/app/src/ui/sign-in/sign-in.tsx
@@ -5,32 +5,27 @@ import {
   SignInStep,
   IEndpointEntryState,
   IAuthenticationState,
-  ITwoFactorAuthenticationState,
+  IExistingAccountWarning,
 } from '../../lib/stores'
 import { assertNever } from '../../lib/fatal-error'
-import { LinkButton } from '../lib/link-button'
-import { Octicon } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
 import { Row } from '../lib/row'
 import { TextBox } from '../lib/text-box'
 import { Dialog, DialogError, DialogContent, DialogFooter } from '../dialog'
 
-import { getWelcomeMessage } from '../../lib/2fa'
-import { getDotComAPIEndpoint } from '../../lib/api'
 import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group'
-import { Button } from '../lib/button'
+import { Ref } from '../lib/ref'
+import { getHTMLURL } from '../../lib/api'
 
 interface ISignInProps {
   readonly dispatcher: Dispatcher
   readonly signInState: SignInState | null
   readonly onDismissed: () => void
+  readonly isCredentialHelperSignIn?: boolean
+  readonly credentialHelperUrl?: string
 }
 
 interface ISignInState {
   readonly endpoint: string
-  readonly username: string
-  readonly password: string
-  readonly otpToken: string
 }
 
 const SignInWithBrowserTitle = __DARWIN__
@@ -39,15 +34,34 @@ const SignInWithBrowserTitle = __DARWIN__
 
 const DefaultTitle = 'Sign in'
 
+const browserSignInInfoContent = (
+  <p>
+    Your browser will redirect you back to GitHub Desktop once you've signed in.
+    If your browser asks for your permission to launch GitHub Desktop, please
+    allow it.
+  </p>
+)
+
 export class SignIn extends React.Component<ISignInProps, ISignInState> {
+  private readonly dialogRef = React.createRef<Dialog>()
+
   public constructor(props: ISignInProps) {
     super(props)
 
     this.state = {
       endpoint: '',
-      username: '',
-      password: '',
-      otpToken: '',
+    }
+  }
+
+  public componentDidUpdate(prevProps: ISignInProps) {
+    // Whenever the sign in step changes we replace the dialog contents which
+    // means we need to re-focus the first suitable child element as it's
+    // essentially a "new" dialog we're showing only the dialog component itself
+    // doesn't know that.
+    if (prevProps.signInState !== null && this.props.signInState !== null) {
+      if (prevProps.signInState.kind !== this.props.signInState.kind) {
+        this.dialogRef.current?.focusFirstSuitableChild()
+      }
     }
   }
 
@@ -75,18 +89,13 @@ export class SignIn extends React.Component<ISignInProps, ISignInState> {
       case SignInStep.EndpointEntry:
         this.props.dispatcher.setSignInEndpoint(this.state.endpoint)
         break
-      case SignInStep.Authentication:
-        if (!state.supportsBasicAuth) {
-          this.props.dispatcher.requestBrowserAuthentication()
-        } else {
-          this.props.dispatcher.setSignInCredentials(
-            this.state.username,
-            this.state.password
-          )
-        }
+      case SignInStep.ExistingAccountWarning:
+        this.props.dispatcher
+          .removeAccount(state.existingAccount)
+          .then(() => this.props.dispatcher.setSignInEndpoint(state.endpoint))
         break
-      case SignInStep.TwoFactorAuthentication:
-        this.props.dispatcher.setSignInOTP(this.state.otpToken)
+      case SignInStep.Authentication:
+        this.props.dispatcher.requestBrowserAuthentication()
         break
       case SignInStep.Success:
         this.onDismissed()
@@ -100,22 +109,6 @@ export class SignIn extends React.Component<ISignInProps, ISignInState> {
     this.setState({ endpoint })
   }
 
-  private onUsernameChanged = (username: string) => {
-    this.setState({ username })
-  }
-
-  private onPasswordChanged = (password: string) => {
-    this.setState({ password })
-  }
-
-  private onOTPTokenChanged = (otpToken: string) => {
-    this.setState({ otpToken })
-  }
-
-  private onSignInWithBrowser = () => {
-    this.props.dispatcher.requestBrowserAuthentication()
-  }
-
   private renderFooter(): JSX.Element | null {
     const state = this.props.signInState
 
@@ -127,29 +120,20 @@ export class SignIn extends React.Component<ISignInProps, ISignInState> {
 
     let primaryButtonText: string
     const stepKind = state.kind
+    const continueWithBrowserLabel = __DARWIN__
+      ? 'Continue With Browser'
+      : 'Continue with browser'
 
     switch (state.kind) {
       case SignInStep.EndpointEntry:
         disableSubmit = this.state.endpoint.length === 0
         primaryButtonText = 'Continue'
         break
-      case SignInStep.TwoFactorAuthentication:
-        // ensure user has entered non-whitespace characters
-        const codeProvided = /\S+/.test(this.state.otpToken)
-        disableSubmit = !codeProvided
-        primaryButtonText = 'Sign in'
+      case SignInStep.ExistingAccountWarning:
+        primaryButtonText = continueWithBrowserLabel
         break
       case SignInStep.Authentication:
-        if (!state.supportsBasicAuth) {
-          primaryButtonText = __DARWIN__
-            ? 'Continue With Browser'
-            : 'Continue with browser'
-        } else {
-          const validUserName = this.state.username.length > 0
-          const validPassword = this.state.password.length > 0
-          disableSubmit = !validUserName || !validPassword
-          primaryButtonText = 'Sign in'
-        }
+        primaryButtonText = continueWithBrowserLabel
         break
       default:
         return assertNever(state, `Unknown sign in step ${stepKind}`)
@@ -160,11 +144,26 @@ export class SignIn extends React.Component<ISignInProps, ISignInState> {
         <OkCancelButtonGroup
           okButtonText={primaryButtonText}
           okButtonDisabled={disableSubmit}
+          onCancelButtonClick={this.onDismissed}
         />
       </DialogFooter>
     )
   }
 
+  private renderExistingAccountWarningStep(state: IExistingAccountWarning) {
+    return (
+      <DialogContent>
+        <p className="existing-account-warning">
+          You're already signed in to{' '}
+          <Ref>{new URL(getHTMLURL(state.endpoint)).host}</Ref> with the account{' '}
+          <Ref>{state.existingAccount.login}</Ref>. If you continue, you will
+          first be signed out.
+        </p>
+        {browserSignInInfoContent}
+      </DialogContent>
+    )
+  }
+
   private renderEndpointEntryStep(state: IEndpointEntryState) {
     return (
       <DialogContent>
@@ -181,95 +180,18 @@ export class SignIn extends React.Component<ISignInProps, ISignInState> {
   }
 
   private renderAuthenticationStep(state: IAuthenticationState) {
-    if (!state.supportsBasicAuth) {
-      if (state.endpoint === getDotComAPIEndpoint()) {
-        return (
-          <DialogContent>
-            <p>
-              To improve the security of your account, GitHub now requires you
-              to sign in through your browser.
-            </p>
-            <p>
-              Your browser will redirect you back to GitHub Desktop once you've
-              signed in. If your browser asks for your permission to launch
-              GitHub Desktop please allow it to.
-            </p>
-          </DialogContent>
-        )
-      } else {
-        return (
-          <DialogContent>
-            <p>
-              Your GitHub Enterprise instance requires you to sign in with your
-              browser.
-            </p>
-          </DialogContent>
-        )
-      }
-    }
+    const credentialHelperInfo =
+      this.props.isCredentialHelperSignIn && this.props.credentialHelperUrl ? (
+        <p>
+          Git requesting credentials to access{' '}
+          <Ref>{this.props.credentialHelperUrl}</Ref>.
+        </p>
+      ) : undefined
 
-    const disableSubmit = state.loading
-
-    return (
-      <DialogContent>
-        <Row className="sign-in-with-browser">
-          <Button
-            className="button-with-icon button-component-primary"
-            onClick={this.onSignInWithBrowser}
-            disabled={disableSubmit}
-          >
-            Sign in using your browser
-            <Octicon symbol={OcticonSymbol.linkExternal} />
-          </Button>
-        </Row>
-
-        <div className="horizontal-rule">
-          <span className="horizontal-rule-content">or</span>
-        </div>
-
-        <Row>
-          <TextBox
-            label="Username or email address"
-            value={this.state.username}
-            onValueChanged={this.onUsernameChanged}
-          />
-        </Row>
-        <Row>
-          <TextBox
-            label="Password"
-            value={this.state.password}
-            type="password"
-            onValueChanged={this.onPasswordChanged}
-          />
-        </Row>
-        <Row>
-          <LinkButton
-            className="forgot-password-link-sign-in"
-            uri={state.forgotPasswordUrl}
-          >
-            Forgot password?
-          </LinkButton>
-        </Row>
-      </DialogContent>
-    )
-  }
-
-  private renderTwoFactorAuthenticationStep(
-    state: ITwoFactorAuthenticationState
-  ) {
     return (
       <DialogContent>
-        <p>{getWelcomeMessage(state.type)}</p>
-        <Row>
-          <TextBox
-            label="Authentication code"
-            value={this.state.otpToken}
-            onValueChanged={this.onOTPTokenChanged}
-            labelLinkText={`What's this?`}
-            labelLinkUri="https://help.github.com/articles/providing-your-2fa-authentication-code/"
-            autoFocus={true}
-          />
-        </Row>
+        {credentialHelperInfo}
+        {browserSignInInfoContent}
       </DialogContent>
     )
   }
@@ -286,10 +208,10 @@ export class SignIn extends React.Component<ISignInProps, ISignInState> {
     switch (state.kind) {
       case SignInStep.EndpointEntry:
         return this.renderEndpointEntryStep(state)
+      case SignInStep.ExistingAccountWarning:
+        return this.renderExistingAccountWarningStep(state)
       case SignInStep.Authentication:
         return this.renderAuthenticationStep(state)
-      case SignInStep.TwoFactorAuthentication:
-        return this.renderTwoFactorAuthenticationStep(state)
       case SignInStep.Success:
         return null
       default:
@@ -311,9 +233,7 @@ export class SignIn extends React.Component<ISignInProps, ISignInState> {
     ) : null
 
     const title =
-      this.props.signInState &&
-      this.props.signInState.kind === SignInStep.Authentication &&
-      !this.props.signInState.supportsBasicAuth
+      this.props.signInState.kind === SignInStep.Authentication
         ? SignInWithBrowserTitle
         : DefaultTitle
 
@@ -325,6 +245,7 @@ export class SignIn extends React.Component<ISignInProps, ISignInState> {
         onDismissed={this.onDismissed}
         onSubmit={this.onSubmit}
         loading={state.loading}
+        ref={this.dialogRef}
       >
         {errors}
         {this.renderStep()}
diff --git a/app/src/ui/ssh/add-ssh-host.tsx b/app/src/ui/ssh/add-ssh-host.tsx
index d3128cada02..1b10ebe4257 100644
--- a/app/src/ui/ssh/add-ssh-host.tsx
+++ b/app/src/ui/ssh/add-ssh-host.tsx
@@ -1,6 +1,5 @@
 import * as React from 'react'
 import { Dialog, DialogContent, DialogFooter } from '../dialog'
-import { Row } from '../lib/row'
 import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group'
 
 interface IAddSSHHostProps {
@@ -22,18 +21,17 @@ export class AddSSHHost extends React.Component<IAddSSHHostProps> {
         id="add-ssh-host"
         type="normal"
         title="SSH Host"
-        dismissable={false}
+        backdropDismissable={false}
         onSubmit={this.onSubmit}
-        onDismissed={this.props.onDismissed}
+        onDismissed={this.onCancel}
       >
         <DialogContent>
-          <Row>
+          <p>
             The authenticity of host '{this.props.host} ({this.props.ip})' can't
             be established. {this.props.keyType} key fingerprint is{' '}
             {this.props.fingerprint}.
-            <br />
-            Are you sure you want to continue connecting?
-          </Row>
+          </p>
+          <p>Are you sure you want to continue connecting?</p>
         </DialogContent>
         <DialogFooter>
           <OkCancelButtonGroup
diff --git a/app/src/ui/ssh/ssh-key-passphrase.tsx b/app/src/ui/ssh/ssh-key-passphrase.tsx
index 7ece2a7a88d..ab815c801c2 100644
--- a/app/src/ui/ssh/ssh-key-passphrase.tsx
+++ b/app/src/ui/ssh/ssh-key-passphrase.tsx
@@ -2,8 +2,8 @@ import * as React from 'react'
 import { Dialog, DialogContent, DialogFooter } from '../dialog'
 import { Row } from '../lib/row'
 import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group'
-import { TextBox } from '../lib/text-box'
 import { Checkbox, CheckboxValue } from '../lib/checkbox'
+import { PasswordTextBox } from '../lib/password-text-box'
 
 interface ISSHKeyPassphraseProps {
   readonly keyPath: string
@@ -37,16 +37,15 @@ export class SSHKeyPassphrase extends React.Component<
         id="ssh-key-passphrase"
         type="normal"
         title="SSH Key Passphrase"
-        dismissable={false}
+        backdropDismissable={false}
         onSubmit={this.onSubmit}
-        onDismissed={this.props.onDismissed}
+        onDismissed={this.onCancel}
       >
         <DialogContent>
           <Row>
-            <TextBox
+            <PasswordTextBox
               label={`Enter passphrase for key '${this.props.keyPath}':`}
               value={this.state.passphrase}
-              type="password"
               onValueChanged={this.onValueChanged}
             />
           </Row>
diff --git a/app/src/ui/ssh/ssh-user-password.tsx b/app/src/ui/ssh/ssh-user-password.tsx
index c78b9fe175e..00815126679 100644
--- a/app/src/ui/ssh/ssh-user-password.tsx
+++ b/app/src/ui/ssh/ssh-user-password.tsx
@@ -2,8 +2,8 @@ import * as React from 'react'
 import { Dialog, DialogContent, DialogFooter } from '../dialog'
 import { Row } from '../lib/row'
 import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group'
-import { TextBox } from '../lib/text-box'
 import { Checkbox, CheckboxValue } from '../lib/checkbox'
+import { PasswordTextBox } from '../lib/password-text-box'
 
 interface ISSHUserPasswordProps {
   readonly username: string
@@ -37,16 +37,15 @@ export class SSHUserPassword extends React.Component<
         id="ssh-user-password"
         type="normal"
         title="SSH User Password"
-        dismissable={false}
+        backdropDismissable={false}
         onSubmit={this.onSubmit}
-        onDismissed={this.props.onDismissed}
+        onDismissed={this.onCancel}
       >
         <DialogContent>
           <Row>
-            <TextBox
+            <PasswordTextBox
               label={`Enter password for '${this.props.username}':`}
               value={this.state.password}
-              type="password"
               onValueChanged={this.onValueChanged}
             />
           </Row>
diff --git a/app/src/ui/stash-changes/overwrite-stashed-changes-dialog.tsx b/app/src/ui/stash-changes/overwrite-stashed-changes-dialog.tsx
index 73ff14546f6..024ea18ec1f 100644
--- a/app/src/ui/stash-changes/overwrite-stashed-changes-dialog.tsx
+++ b/app/src/ui/stash-changes/overwrite-stashed-changes-dialog.tsx
@@ -42,9 +42,11 @@ export class OverwriteStash extends React.Component<
         disabled={this.state.isLoading}
         onSubmit={this.onSubmit}
         onDismissed={this.props.onDismissed}
+        role="alertdialog"
+        ariaDescribedBy="overwrite-stash-warning-message"
       >
         <DialogContent>
-          <Row>
+          <Row id="overwrite-stash-warning-message">
             Are you sure you want to proceed? This will overwrite your existing
             stash with your current changes.
           </Row>
diff --git a/app/src/ui/stash-changes/stash-and-switch-branch-dialog.tsx b/app/src/ui/stash-changes/stash-and-switch-branch-dialog.tsx
index 7b53caae39c..08a610a69ea 100644
--- a/app/src/ui/stash-changes/stash-and-switch-branch-dialog.tsx
+++ b/app/src/ui/stash-changes/stash-and-switch-branch-dialog.tsx
@@ -7,7 +7,7 @@ import { Row } from '../lib/row'
 import { Branch } from '../../models/branch'
 import { UncommittedChangesStrategy } from '../../models/uncommitted-changes-strategy'
 import { Octicon } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import * as octicons from '../octicons/octicons.generated'
 import { PopupType } from '../../models/popup'
 import { startTimer } from '../lib/timing'
 import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group'
@@ -88,7 +88,7 @@ export class StashAndSwitchBranch extends React.Component<
 
     return (
       <Row>
-        <Octicon symbol={OcticonSymbol.alert} /> Your current stash will be
+        <Octicon symbol={octicons.alert} /> Your current stash will be
         overwritten by creating a new stash
       </Row>
     )
diff --git a/app/src/ui/stashing/confirm-discard-stash.tsx b/app/src/ui/stashing/confirm-discard-stash.tsx
index 29917743a19..71f0c573598 100644
--- a/app/src/ui/stashing/confirm-discard-stash.tsx
+++ b/app/src/ui/stashing/confirm-discard-stash.tsx
@@ -5,16 +5,19 @@ import { Dispatcher } from '../dispatcher'
 import { Row } from '../lib/row'
 import { IStashEntry } from '../../models/stash-entry'
 import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group'
+import { Checkbox, CheckboxValue } from '../lib/checkbox'
 
 interface IConfirmDiscardStashProps {
   readonly dispatcher: Dispatcher
   readonly repository: Repository
   readonly stash: IStashEntry
+  readonly askForConfirmationOnDiscardStash: boolean
   readonly onDismissed: () => void
 }
 
 interface IConfirmDiscardStashState {
   readonly isDiscarding: boolean
+  readonly confirmDiscardStash: boolean
 }
 /**
  * Dialog to confirm dropping a stash
@@ -28,6 +31,7 @@ export class ConfirmDiscardStashDialog extends React.Component<
 
     this.state = {
       isDiscarding: false,
+      confirmDiscardStash: props.askForConfirmationOnDiscardStash,
     }
   }
 
@@ -43,9 +47,24 @@ export class ConfirmDiscardStashDialog extends React.Component<
         disabled={this.state.isDiscarding}
         onSubmit={this.onSubmit}
         onDismissed={this.props.onDismissed}
+        role="alertdialog"
+        ariaDescribedBy="discard-stash-warning-message"
       >
         <DialogContent>
-          <Row>Are you sure you want to discard these stashed changes?</Row>
+          <Row id="discard-stash-warning-message">
+            Are you sure you want to discard these stashed changes?
+          </Row>
+          <Row>
+            <Checkbox
+              label="Do not show this message again"
+              value={
+                this.state.confirmDiscardStash
+                  ? CheckboxValue.Off
+                  : CheckboxValue.On
+              }
+              onChange={this.onAskForConfirmationOnDiscardStashChanged}
+            />
+          </Row>
         </DialogContent>
         <DialogFooter>
           <OkCancelButtonGroup destructive={true} okButtonText="Discard" />
@@ -54,6 +73,14 @@ export class ConfirmDiscardStashDialog extends React.Component<
     )
   }
 
+  private onAskForConfirmationOnDiscardStashChanged = (
+    event: React.FormEvent<HTMLInputElement>
+  ) => {
+    const value = !event.currentTarget.checked
+
+    this.setState({ confirmDiscardStash: value })
+  }
+
   private onSubmit = async () => {
     const { dispatcher, repository, stash, onDismissed } = this.props
 
@@ -62,6 +89,7 @@ export class ConfirmDiscardStashDialog extends React.Component<
     })
 
     try {
+      dispatcher.setConfirmDiscardStashSetting(this.state.confirmDiscardStash)
       await dispatcher.dropStash(repository, stash)
     } finally {
       this.setState({
diff --git a/app/src/ui/stashing/stash-diff-header.tsx b/app/src/ui/stashing/stash-diff-header.tsx
index b631a559bae..4e8d04f51e9 100644
--- a/app/src/ui/stashing/stash-diff-header.tsx
+++ b/app/src/ui/stashing/stash-diff-header.tsx
@@ -3,19 +3,19 @@ import { IStashEntry } from '../../models/stash-entry'
 import { Dispatcher } from '../dispatcher'
 import { Repository } from '../../models/repository'
 import { PopupType } from '../../models/popup'
-import { Octicon } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
 import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group'
+import { ErrorWithMetadata } from '../../lib/error-with-metadata'
 
 interface IStashDiffHeaderProps {
   readonly stashEntry: IStashEntry
   readonly repository: Repository
   readonly dispatcher: Dispatcher
-  readonly isWorkingTreeClean: boolean
+  readonly askForConfirmationOnDiscardStash: boolean
 }
 
 interface IStashDiffHeaderState {
   readonly isRestoring: boolean
+  readonly isDiscarding: boolean
 }
 
 /**
@@ -31,12 +31,12 @@ export class StashDiffHeader extends React.Component<
 
     this.state = {
       isRestoring: false,
+      isDiscarding: false,
     }
   }
 
   public render() {
-    const { isWorkingTreeClean } = this.props
-    const { isRestoring } = this.state
+    const { isRestoring, isDiscarding } = this.state
 
     return (
       <div className="header">
@@ -44,56 +44,66 @@ export class StashDiffHeader extends React.Component<
         <div className="row">
           <OkCancelButtonGroup
             okButtonText="Restore"
-            okButtonDisabled={isRestoring || !isWorkingTreeClean}
+            okButtonDisabled={isRestoring || isDiscarding}
             onOkButtonClick={this.onRestoreClick}
             cancelButtonText="Discard"
-            cancelButtonDisabled={isRestoring}
+            cancelButtonDisabled={isRestoring || isDiscarding}
             onCancelButtonClick={this.onDiscardClick}
+            okButtonAriaDescribedBy="restore-description"
           />
-          {this.renderExplanatoryText()}
+          <div className="explanatory-text" id="restore-description">
+            <span className="text">
+              <strong>Restore</strong> will move your stashed files to the
+              Changes list.
+            </span>
+          </div>
         </div>
       </div>
     )
   }
 
-  private renderExplanatoryText() {
-    const { isWorkingTreeClean } = this.props
-
-    if (isWorkingTreeClean || this.state.isRestoring) {
-      return (
-        <div className="explanatory-text">
-          <span className="text">
-            <strong>Restore</strong> will move your stashed files to the Changes
-            list.
-          </span>
-        </div>
-      )
-    }
+  private onDiscardClick = async () => {
+    const {
+      dispatcher,
+      repository,
+      stashEntry,
+      askForConfirmationOnDiscardStash,
+    } = this.props
 
-    return (
-      <div className="explanatory-text">
-        <Octicon symbol={OcticonSymbol.alert} />
-        <span className="text">
-          Unable to restore stash when changes are present on your branch.
-        </span>
-      </div>
-    )
-  }
+    if (!askForConfirmationOnDiscardStash) {
+      this.setState({
+        isDiscarding: true,
+      })
 
-  private onDiscardClick = () => {
-    const { dispatcher, repository, stashEntry } = this.props
-    dispatcher.showPopup({
-      type: PopupType.ConfirmDiscardStash,
-      stash: stashEntry,
-      repository,
-    })
+      try {
+        await dispatcher.dropStash(repository, stashEntry)
+      } finally {
+        this.setState({
+          isDiscarding: false,
+        })
+      }
+    } else {
+      dispatcher.showPopup({
+        type: PopupType.ConfirmDiscardStash,
+        stash: stashEntry,
+        repository,
+      })
+    }
   }
 
   private onRestoreClick = async () => {
     const { dispatcher, repository, stashEntry } = this.props
 
-    this.setState({ isRestoring: true }, () => {
-      dispatcher.popStash(repository, stashEntry)
-    })
+    try {
+      this.setState({ isRestoring: true })
+      await dispatcher.popStash(repository, stashEntry)
+    } catch (err) {
+      const errorWithMetadata = new ErrorWithMetadata(err, {
+        repository: repository,
+      })
+      dispatcher.postError(errorWithMetadata)
+    } finally {
+      this.setState({ isRestoring: false })
+    }
   }
 }
diff --git a/app/src/ui/stashing/stash-diff-viewer.tsx b/app/src/ui/stashing/stash-diff-viewer.tsx
index 5334ee9b25c..93000c75612 100644
--- a/app/src/ui/stashing/stash-diff-viewer.tsx
+++ b/app/src/ui/stashing/stash-diff-viewer.tsx
@@ -27,12 +27,12 @@ interface IStashDiffViewerProps {
   readonly repository: Repository
   readonly dispatcher: Dispatcher
 
+  /** Should the app propt the user to confirm a discard stash */
+  readonly askForConfirmationOnDiscardStash: boolean
+
   /** Whether we should display side by side diffs. */
   readonly showSideBySideDiff: boolean
 
-  /** Are there any uncommitted changes */
-  readonly isWorkingTreeClean: boolean
-
   /**
    * Called when the user requests to open a binary file in an the
    * system-assigned application for said file type.
@@ -47,8 +47,21 @@ interface IStashDiffViewerProps {
 
   /** Called when the user changes the hide whitespace in diffs setting. */
   readonly onHideWhitespaceInDiffChanged: (checked: boolean) => void
+
+  /** Called when the user requests to open a submodule. */
+  readonly onOpenSubmodule: (fullPath: string) => void
+
+  /**
+   * Called to open a file using the user's configured applications
+   *
+   * @param path The path of the file relative to the root of the repository
+   */
+  readonly onOpenInExternalEditor: (path: string) => void
 }
 
+/// Id of the stash diff viewer
+export const StashDiffViewerId = 'stash-diff-viewer'
+
 /**
  * Component to display a selected stash's file list and diffs
  *
@@ -58,11 +71,23 @@ export class StashDiffViewer extends React.PureComponent<IStashDiffViewerProps>
   private onSelectedFileChanged = (file: CommittedFileChange) =>
     this.props.dispatcher.selectStashedFile(this.props.repository, file)
 
+  private onRowDoubleClick = (row: number) => {
+    const files = this.getFiles()
+    const file = files[row]
+
+    this.props.onOpenInExternalEditor(file.path)
+  }
+
   private onResize = (width: number) =>
     this.props.dispatcher.setStashedFilesWidth(width)
 
   private onReset = () => this.props.dispatcher.resetStashedFilesWidth()
 
+  private getFiles = () =>
+    this.props.stashEntry.files.kind === StashedChangesLoadStates.Loaded
+      ? this.props.stashEntry.files.files
+      : new Array<CommittedFileChange>()
+
   public render() {
     const {
       stashEntry,
@@ -71,15 +96,12 @@ export class StashDiffViewer extends React.PureComponent<IStashDiffViewerProps>
       repository,
       dispatcher,
       imageDiffType,
-      isWorkingTreeClean,
       fileListWidth,
       onOpenBinaryFile,
       onChangeImageDiffType,
+      onOpenSubmodule,
     } = this.props
-    const files =
-      stashEntry.files.kind === StashedChangesLoadStates.Loaded
-        ? stashEntry.files.files
-        : new Array<CommittedFileChange>()
+    const files = this.getFiles()
 
     const diffComponent =
       selectedStashedFile !== null ? (
@@ -90,24 +112,28 @@ export class StashDiffViewer extends React.PureComponent<IStashDiffViewerProps>
           diff={stashedFileDiff}
           imageDiffType={imageDiffType}
           hideWhitespaceInDiff={false}
+          showDiffCheckMarks={false}
           showSideBySideDiff={this.props.showSideBySideDiff}
           onOpenBinaryFile={onOpenBinaryFile}
           onChangeImageDiffType={onChangeImageDiffType}
           onHideWhitespaceInDiffChanged={
             this.props.onHideWhitespaceInDiffChanged
           }
+          onOpenSubmodule={onOpenSubmodule}
         />
       ) : null
 
     const availableWidth = clamp(fileListWidth)
 
     return (
-      <section id="stash-diff-viewer">
+      <section id={StashDiffViewerId}>
         <StashDiffHeader
           stashEntry={stashEntry}
           repository={repository}
           dispatcher={dispatcher}
-          isWorkingTreeClean={isWorkingTreeClean}
+          askForConfirmationOnDiscardStash={
+            this.props.askForConfirmationOnDiscardStash
+          }
         />
         <div className="commit-details">
           <Resizable
@@ -116,12 +142,14 @@ export class StashDiffViewer extends React.PureComponent<IStashDiffViewerProps>
             maximumWidth={fileListWidth.max}
             onResize={this.onResize}
             onReset={this.onReset}
+            description="Stash file list"
           >
             <FileList
               files={files}
               onSelectedFileChanged={this.onSelectedFileChanged}
               selectedFile={selectedStashedFile}
               availableWidth={availableWidth}
+              onRowDoubleClick={this.onRowDoubleClick}
             />
           </Resizable>
           {diffComponent}
diff --git a/app/src/ui/suggested-actions/dropdown-suggested-action.tsx b/app/src/ui/suggested-actions/dropdown-suggested-action.tsx
new file mode 100644
index 00000000000..261c7be8db7
--- /dev/null
+++ b/app/src/ui/suggested-actions/dropdown-suggested-action.tsx
@@ -0,0 +1,164 @@
+import * as React from 'react'
+import {
+  DropdownSelectButton,
+  IDropdownSelectButtonOption,
+} from '../dropdown-select-button'
+import { MenuIDs } from '../../models/menu-ids'
+import { executeMenuItemById } from '../main-process-proxy'
+import { sendNonFatalException } from '../../lib/helpers/non-fatal-exception'
+import classNames from 'classnames'
+
+export interface IDropdownSuggestedActionOption
+  extends IDropdownSelectButtonOption {
+  /**
+   * The title, or "header" text for a suggested
+   * action.
+   */
+  readonly title?: string
+
+  /**
+   * A text or set of elements used to present information
+   * to the user about how and where to access the action
+   * outside of the suggested action.
+   */
+  readonly discoverabilityContent?: string | JSX.Element
+
+  /**
+   * A callback which is invoked when the user clicks
+   * or activates the action using their keyboard.
+   */
+  readonly onClick?: (e: React.MouseEvent<HTMLButtonElement>) => void
+
+  /**
+   * Whether or not the action should be disabled. Disabling
+   * the action means that the button will no longer be
+   * clickable.
+   */
+  readonly disabled?: boolean
+
+  /**
+   * An image to illustrate what this component's action does
+   */
+  readonly image?: JSX.Element
+
+  /**
+   * The id of the menu item backing this action.
+   * When the action is invoked the menu item specified
+   * by this id will be executed.
+   */
+  readonly menuItemId?: MenuIDs
+}
+
+export interface IDropdownSuggestedActionProps {
+  /** The possible suggested next actions to select from
+   *
+   * This component assumes this is not an empty array.
+   */
+  readonly suggestedActions: ReadonlyArray<IDropdownSuggestedActionOption>
+
+  /** The value of the selected next action to initialize the component with */
+  readonly selectedActionValue?: string
+
+  readonly onSuggestedActionChanged: (action: string) => void
+
+  /**
+   * An optional additional class name to set in order to be able to apply
+   * specific styles to the dropdown suggested next action
+   */
+  readonly className?: string
+}
+
+interface IDropdownSuggestedActionState {
+  readonly selectedActionValue: string
+}
+
+export class DropdownSuggestedAction extends React.Component<
+  IDropdownSuggestedActionProps,
+  IDropdownSuggestedActionState
+> {
+  private get selectedAction() {
+    const selectedAction = this.props.suggestedActions.find(
+      a => a.id === this.state.selectedActionValue
+    )
+    if (selectedAction === undefined) {
+      // Shouldn't happen .. but if it did we don't want to crash app, but we want to tell dev what is up
+      sendNonFatalException(
+        'NoSuggestedActionsProvided',
+        new Error(
+          'The DropdownSuggestedActions component was provided an empty array. It requires an array of at least one item.'
+        )
+      )
+    }
+    return selectedAction
+  }
+
+  public constructor(props: IDropdownSuggestedActionProps) {
+    super(props)
+
+    const { selectedActionValue, suggestedActions } = props
+    const firstActionValue = suggestedActions[0].id
+
+    this.state = {
+      selectedActionValue: selectedActionValue ?? firstActionValue,
+    }
+  }
+
+  private onActionSelectionChange = (option: IDropdownSelectButtonOption) => {
+    this.setState({ selectedActionValue: option.id })
+    this.props.onSuggestedActionChanged(option.id)
+  }
+
+  private onActionSubmitted = (e: React.MouseEvent<HTMLButtonElement>) => {
+    if (this.selectedAction === undefined) {
+      // Just a type check
+      return
+    }
+
+    const { onClick, menuItemId } = this.selectedAction
+    onClick?.(e)
+
+    if (!e.defaultPrevented && menuItemId !== undefined) {
+      executeMenuItemById(menuItemId)
+    }
+  }
+
+  public render() {
+    if (this.selectedAction === undefined) {
+      // Just a type check
+      return
+    }
+
+    const { description, image, discoverabilityContent, disabled, id, title } =
+      this.selectedAction
+
+    const className = classNames(
+      'suggested-action',
+      'primary',
+      this.props.className
+    )
+
+    return (
+      <div className={className}>
+        {image && <div className="image-wrapper">{image}</div>}
+        <div className="text-wrapper">
+          <h2>{title}</h2>
+          {description && <p className="description">{description}</p>}
+          {discoverabilityContent && (
+            <p className="discoverability">{discoverabilityContent}</p>
+          )}
+        </div>
+        <DropdownSelectButton
+          checkedOption={id}
+          options={this.props.suggestedActions.map(({ label, id }) => ({
+            label,
+            id,
+          }))}
+          disabled={disabled}
+          dropdownAriaLabel="Suggested actions for this branch"
+          onCheckedOptionChange={this.onActionSelectionChange}
+          onSubmit={this.onActionSubmitted}
+        />
+      </div>
+    )
+  }
+}
diff --git a/app/src/ui/test-notifications/test-notifications.tsx b/app/src/ui/test-notifications/test-notifications.tsx
new file mode 100644
index 00000000000..c4eaa82797c
--- /dev/null
+++ b/app/src/ui/test-notifications/test-notifications.tsx
@@ -0,0 +1,802 @@
+import classNames from 'classnames'
+import React from 'react'
+import { getHTMLURL, IAPIComment } from '../../lib/api'
+import { assertNever } from '../../lib/fatal-error'
+import { NotificationsDebugStore } from '../../lib/stores/notifications-debug-store'
+import {
+  ValidNotificationPullRequestReview,
+  ValidNotificationPullRequestReviewState,
+} from '../../lib/valid-notification-pull-request-review'
+import { PullRequest } from '../../models/pull-request'
+import { RepositoryWithGitHubRepository } from '../../models/repository'
+import {
+  Dialog,
+  DialogContent,
+  DialogFooter,
+  OkCancelButtonGroup,
+} from '../dialog'
+import { Dispatcher } from '../dispatcher'
+import { Button } from '../lib/button'
+import { RowIndexPath } from '../lib/list/list-row-index-path'
+import { SectionList } from '../lib/list/section-list'
+import { Loading } from '../lib/loading'
+import { getPullRequestReviewStateIcon } from '../notifications/pull-request-review-helpers'
+import { Octicon } from '../octicons'
+import * as octicons from '../octicons/octicons.generated'
+import {
+  getNotificationSettingsUrl,
+  getNotificationsPermission,
+  requestNotificationsPermission,
+  supportsNotificationsPermissionRequest,
+} from 'desktop-notifications'
+import { LinkButton } from '../lib/link-button'
+
+enum TestNotificationType {
+  PullRequestReview,
+  PullRequestComment,
+  ChecksFailed,
+}
+
+enum TestNotificationStepKind {
+  SelectPullRequest,
+  SelectPullRequestReview,
+  SelectPullRequestComment,
+}
+
+type TestNotificationFlow = {
+  readonly type: TestNotificationType
+  readonly steps: ReadonlyArray<TestNotificationStepKind>
+}
+
+const TestNotificationFlows: ReadonlyArray<TestNotificationFlow> = [
+  {
+    type: TestNotificationType.PullRequestReview,
+    steps: [
+      TestNotificationStepKind.SelectPullRequest,
+      TestNotificationStepKind.SelectPullRequestReview,
+    ],
+  },
+  {
+    type: TestNotificationType.PullRequestComment,
+    steps: [
+      TestNotificationStepKind.SelectPullRequest,
+      TestNotificationStepKind.SelectPullRequestComment,
+    ],
+  },
+  {
+    type: TestNotificationType.ChecksFailed,
+    steps: [TestNotificationStepKind.SelectPullRequest],
+  },
+]
+
+type TestNotificationStepSelectPullRequestResult = {
+  readonly kind: TestNotificationStepKind.SelectPullRequest
+  readonly pullRequest: PullRequest
+}
+type TestNotificationStepSelectPullRequestReviewResult = {
+  readonly kind: TestNotificationStepKind.SelectPullRequestReview
+  readonly review: ValidNotificationPullRequestReview
+}
+type TestNotificationStepSelectPullRequestCommentResult = {
+  readonly kind: TestNotificationStepKind.SelectPullRequestComment
+  readonly comment: IAPIComment
+  readonly isIssueComment: boolean
+}
+
+type TestNotificationStepResultMap = Map<
+  TestNotificationStepKind.SelectPullRequest,
+  TestNotificationStepSelectPullRequestResult
+> &
+  Map<
+    TestNotificationStepKind.SelectPullRequestReview,
+    TestNotificationStepSelectPullRequestReviewResult
+  > &
+  Map<
+    TestNotificationStepKind.SelectPullRequestComment,
+    TestNotificationStepSelectPullRequestCommentResult
+  >
+
+interface ITestNotificationsState {
+  readonly selectedFlow: TestNotificationFlow | null
+  readonly stepResults: TestNotificationStepResultMap
+  readonly loading: boolean
+  readonly pullRequests: ReadonlyArray<PullRequest>
+  readonly reviews: ReadonlyArray<ValidNotificationPullRequestReview>
+  readonly comments: ReadonlyArray<IAPIComment>
+  readonly selectedRows: ReadonlyArray<RowIndexPath>
+
+  readonly suggestGrantNotificationPermission: boolean
+  readonly warnNotificationsDenied: boolean
+  readonly suggestConfigureNotifications: boolean
+}
+
+interface ITestNotificationsProps {
+  readonly dispatcher: Dispatcher
+  readonly notificationsDebugStore: NotificationsDebugStore
+  readonly repository: RepositoryWithGitHubRepository
+  readonly onDismissed: () => void
+}
+
+class TestNotificationItemRowContent extends React.Component<{
+  readonly leftAccessory?: JSX.Element
+  readonly html_url?: string
+  readonly dispatcher: Dispatcher
+}> {
+  public render() {
+    const { leftAccessory, html_url, children } = this.props
+
+    return (
+      <div className="row-content">
+        {leftAccessory && <div className="left-accessory">{leftAccessory}</div>}
+        <div className="main-content">{children}</div>
+        {html_url && (
+          <div className="right-accessory">
+            <Button onClick={this.onExternalLinkClick} role="link">
+              <Octicon symbol={octicons.linkExternal} />
+            </Button>
+          </div>
+        )}
+      </div>
+    )
+  }
+
+  private onExternalLinkClick = (e: React.MouseEvent<HTMLButtonElement>) => {
+    const { dispatcher, html_url } = this.props
+
+    if (html_url === undefined) {
+      return
+    }
+
+    e.stopPropagation()
+    dispatcher.openInBrowser(html_url)
+  }
+}
+
+export class TestNotifications extends React.Component<
+  ITestNotificationsProps,
+  ITestNotificationsState
+> {
+  public constructor(props: ITestNotificationsProps) {
+    super(props)
+
+    this.state = {
+      selectedFlow: null,
+      stepResults: new Map(),
+      loading: false,
+      pullRequests: [],
+      reviews: [],
+      comments: [],
+      selectedRows: [],
+      suggestGrantNotificationPermission: false,
+      warnNotificationsDenied: false,
+      suggestConfigureNotifications: false,
+    }
+  }
+
+  public componentDidMount() {
+    this.updateNotificationsState()
+  }
+
+  private async updateNotificationsState() {
+    const notificationsPermission = await getNotificationsPermission()
+    this.setState({
+      suggestGrantNotificationPermission:
+        supportsNotificationsPermissionRequest() &&
+        notificationsPermission === 'default',
+      warnNotificationsDenied: notificationsPermission === 'denied',
+      suggestConfigureNotifications: notificationsPermission === 'granted',
+    })
+  }
+
+  private onGrantNotificationPermission = async () => {
+    await requestNotificationsPermission()
+    this.updateNotificationsState()
+  }
+
+  private renderNotificationHint() {
+    const {
+      suggestGrantNotificationPermission,
+      warnNotificationsDenied,
+      suggestConfigureNotifications,
+    } = this.state
+
+    if (suggestGrantNotificationPermission) {
+      return (
+        <>
+          {' '}
+          You need to{' '}
+          <LinkButton onClick={this.onGrantNotificationPermission}>
+            grant permission
+          </LinkButton>{' '}
+          to display these notifications from GitHub Desktop.
+        </>
+      )
+    }
+
+    const notificationSettingsURL = getNotificationSettingsUrl()
+
+    if (notificationSettingsURL === null) {
+      return null
+    }
+
+    if (warnNotificationsDenied) {
+      return (
+        <>
+          <span className="warning-icon">⚠️</span> GitHub Desktop has no
+          permission to display notifications. Please, enable them in the{' '}
+          <LinkButton uri={notificationSettingsURL}>
+            Notifications Settings
+          </LinkButton>
+          .
+        </>
+      )
+    }
+
+    const verb = suggestConfigureNotifications
+      ? 'properly configured'
+      : 'enabled'
+
+    return (
+      <>
+        Make sure notifications are {verb} for GitHub Desktop in the{' '}
+        <LinkButton uri={notificationSettingsURL}>
+          Notifications Settings
+        </LinkButton>
+        .
+      </>
+    )
+  }
+
+  private getTypeFriendlyName(type?: TestNotificationType): string {
+    const titleMap = new Map<TestNotificationType, string>([
+      [TestNotificationType.PullRequestReview, 'Pull Request Review'],
+      [TestNotificationType.PullRequestComment, 'Pull Request Comment'],
+      [TestNotificationType.ChecksFailed, 'Pull Request Checks Failed'],
+    ])
+
+    return (
+      titleMap.get(
+        type ??
+          this.state.selectedFlow?.type ??
+          TestNotificationType.PullRequestReview
+      ) ?? ''
+    )
+  }
+
+  private renderNotificationType = (
+    type: TestNotificationType
+  ): JSX.Element => {
+    return (
+      <Button onClick={this.getOnNotificationTypeClick(type)}>
+        {this.getTypeFriendlyName(type)}
+      </Button>
+    )
+  }
+
+  private getOnNotificationTypeClick = (type: TestNotificationType) => () => {
+    const selectedFlow =
+      TestNotificationFlows.find(f => f.type === type) ?? null
+
+    this.setState(
+      {
+        selectedFlow,
+      },
+      () => {
+        this.prepareForNextStep()
+      }
+    )
+  }
+
+  private doFinalAction() {
+    const selectedFlow = this.state.selectedFlow
+
+    if (selectedFlow === null) {
+      return
+    }
+
+    switch (selectedFlow.type) {
+      case TestNotificationType.PullRequestReview: {
+        const pullRequestNumber = this.getPullRequest()
+        const review = this.getReview()
+
+        if (pullRequestNumber === null || review === null) {
+          return
+        }
+
+        this.props.notificationsDebugStore.simulatePullRequestReviewNotification(
+          this.props.repository.gitHubRepository,
+          pullRequestNumber,
+          review
+        )
+        break
+      }
+      case TestNotificationType.PullRequestComment: {
+        const pullRequest = this.getPullRequest()
+        const commentInfo = this.getCommentInfo()
+
+        if (pullRequest === null || commentInfo === null) {
+          return
+        }
+
+        const { comment, isIssueComment } = commentInfo
+
+        this.props.notificationsDebugStore.simulatePullRequestCommentNotification(
+          this.props.repository.gitHubRepository,
+          pullRequest,
+          comment,
+          isIssueComment
+        )
+        break
+      }
+      case TestNotificationType.ChecksFailed: {
+        const pullRequest = this.getPullRequest()
+
+        if (pullRequest === null) {
+          return
+        }
+
+        this.props.notificationsDebugStore.simulatePullRequestChecksFailed(
+          this.props.repository,
+          pullRequest,
+          this.props.dispatcher
+        )
+        break
+      }
+      default:
+        assertNever(selectedFlow.type, `Unknown flow type: ${selectedFlow}`)
+    }
+  }
+
+  private prepareForNextStep() {
+    const nextStep = this.state.selectedFlow?.steps[this.state.stepResults.size]
+
+    if (nextStep === undefined) {
+      this.doFinalAction()
+      this.back()
+      return
+    }
+
+    switch (nextStep) {
+      case TestNotificationStepKind.SelectPullRequest: {
+        this.setState({
+          loading: true,
+        })
+
+        this.props.notificationsDebugStore
+          .getPullRequests(this.props.repository, {
+            filterByComments:
+              this.state.selectedFlow?.type ===
+              TestNotificationType.PullRequestComment,
+            filterByReviews:
+              this.state.selectedFlow?.type ===
+              TestNotificationType.PullRequestReview,
+          })
+          .then(pullRequests => {
+            this.setState({
+              pullRequests,
+              selectedRows: [],
+              loading: false,
+            })
+          })
+        break
+      }
+      case TestNotificationStepKind.SelectPullRequestReview: {
+        this.setState({
+          loading: true,
+        })
+
+        const pullRequest = this.getPullRequest()
+
+        if (pullRequest === null) {
+          return
+        }
+
+        this.props.notificationsDebugStore
+          .getPullRequestReviews(
+            this.props.repository,
+            pullRequest.pullRequestNumber
+          )
+          .then(reviews => {
+            this.setState({
+              reviews,
+              selectedRows: [],
+              loading: false,
+            })
+          })
+        break
+      }
+      case TestNotificationStepKind.SelectPullRequestComment: {
+        this.setState({
+          loading: true,
+        })
+
+        const pullRequest = this.getPullRequest()
+
+        if (pullRequest === null) {
+          return
+        }
+
+        this.props.notificationsDebugStore
+          .getPullRequestComments(
+            this.props.repository,
+            pullRequest.pullRequestNumber
+          )
+          .then(comments => {
+            this.setState({
+              comments,
+              selectedRows: [],
+              loading: false,
+            })
+          })
+        break
+      }
+      default:
+        assertNever(nextStep, `Unknown step: ${nextStep}`)
+    }
+  }
+
+  private getPullRequest(): PullRequest | null {
+    const pullRequestResult = this.state.stepResults.get(
+      TestNotificationStepKind.SelectPullRequest
+    )
+
+    if (pullRequestResult === undefined) {
+      return null
+    }
+
+    return pullRequestResult.pullRequest
+  }
+
+  private getReview(): ValidNotificationPullRequestReview | null {
+    const reviewResult = this.state.stepResults.get(
+      TestNotificationStepKind.SelectPullRequestReview
+    )
+
+    if (reviewResult === undefined) {
+      return null
+    }
+
+    return reviewResult.review
+  }
+
+  private getCommentInfo() {
+    const commentResult = this.state.stepResults.get(
+      TestNotificationStepKind.SelectPullRequestComment
+    )
+
+    if (commentResult === undefined) {
+      return null
+    }
+
+    return {
+      comment: commentResult.comment,
+      isIssueComment: commentResult.isIssueComment,
+    }
+  }
+
+  private renderCurrentStep() {
+    if (this.state.selectedFlow === null) {
+      return (
+        <div>
+          <p>Select the type of notification to display:</p>
+          <div className="notification-type-list">
+            {this.renderNotificationType(
+              TestNotificationType.PullRequestReview
+            )}
+            {this.renderNotificationType(
+              TestNotificationType.PullRequestComment
+            )}
+            {this.renderNotificationType(TestNotificationType.ChecksFailed)}
+          </div>
+        </div>
+      )
+    }
+
+    const currentStep = this.state.selectedFlow.steps.at(
+      this.state.stepResults.size
+    )
+
+    if (currentStep === undefined) {
+      return <p>Done!</p>
+    }
+
+    switch (currentStep) {
+      case TestNotificationStepKind.SelectPullRequest:
+        return this.renderSelectPullRequest()
+      case TestNotificationStepKind.SelectPullRequestReview:
+        return this.renderSelectPullRequestReview()
+      case TestNotificationStepKind.SelectPullRequestComment:
+        return this.renderSelectPullRequestComment()
+      default:
+        return assertNever(currentStep, `Unknown step: ${currentStep}`)
+    }
+  }
+
+  private renderSelectPullRequest() {
+    if (this.state.loading) {
+      return <Loading />
+    }
+
+    const { pullRequests, selectedRows } = this.state
+
+    if (pullRequests.length === 0) {
+      return <p>No pull requests found</p>
+    }
+
+    return (
+      <div>
+        Pull requests for {this.getTypeFriendlyName()}:
+        <SectionList
+          rowHeight={40}
+          rowCount={[pullRequests.length]}
+          rowRenderer={this.renderPullRequestRow}
+          selectedRows={selectedRows}
+          onRowClick={this.onPullRequestRowClick}
+          onSelectedRowChanged={this.onSelectedRowChanged}
+        />
+      </div>
+    )
+  }
+
+  private onPullRequestRowClick = (indexPath: RowIndexPath) => {
+    const pullRequest = this.state.pullRequests[indexPath.row]
+    const stepResults = this.state.stepResults
+    stepResults.set(TestNotificationStepKind.SelectPullRequest, {
+      kind: TestNotificationStepKind.SelectPullRequest,
+      pullRequest: pullRequest,
+    })
+
+    this.setState(
+      {
+        stepResults,
+      },
+      () => {
+        this.prepareForNextStep()
+      }
+    )
+  }
+
+  private renderSelectPullRequestReview() {
+    if (this.state.loading) {
+      return <Loading />
+    }
+
+    const { reviews, selectedRows } = this.state
+
+    if (reviews.length === 0) {
+      return <p>No reviews found</p>
+    }
+
+    return (
+      <div>
+        Reviews:
+        <SectionList
+          rowHeight={40}
+          rowCount={[reviews.length]}
+          rowRenderer={this.renderPullRequestReviewRow}
+          selectedRows={selectedRows}
+          onRowClick={this.onPullRequestReviewRowClick}
+          onSelectedRowChanged={this.onSelectedRowChanged}
+        />
+      </div>
+    )
+  }
+
+  private onSelectedRowChanged = (selectedRow: RowIndexPath) => {
+    this.setState({
+      selectedRows: [selectedRow],
+    })
+  }
+
+  private onPullRequestReviewRowClick = (indexPath: RowIndexPath) => {
+    const review = this.state.reviews[indexPath.row]
+    const stepResults = this.state.stepResults
+    stepResults.set(TestNotificationStepKind.SelectPullRequestReview, {
+      kind: TestNotificationStepKind.SelectPullRequestReview,
+      review: review,
+    })
+
+    this.setState(
+      {
+        stepResults,
+      },
+      () => {
+        this.prepareForNextStep()
+      }
+    )
+  }
+
+  private renderSelectPullRequestComment() {
+    if (this.state.loading) {
+      return <Loading />
+    }
+
+    const { comments, selectedRows } = this.state
+
+    if (comments.length === 0) {
+      return <p>No comments found</p>
+    }
+
+    return (
+      <div>
+        Comments:
+        <SectionList
+          rowHeight={40}
+          rowCount={[comments.length]}
+          rowRenderer={this.renderPullRequestCommentRow}
+          selectedRows={selectedRows}
+          onRowClick={this.onPullRequestCommentRowClick}
+          onSelectedRowChanged={this.onSelectedRowChanged}
+        />
+      </div>
+    )
+  }
+
+  private onPullRequestCommentRowClick = (indexPath: RowIndexPath) => {
+    const comment = this.state.comments[indexPath.row]
+    const stepResults = this.state.stepResults
+    stepResults.set(TestNotificationStepKind.SelectPullRequestComment, {
+      kind: TestNotificationStepKind.SelectPullRequestComment,
+      comment: comment,
+      isIssueComment: comment.html_url.includes('#issuecomment-'),
+    })
+
+    this.setState(
+      {
+        stepResults,
+      },
+      () => {
+        this.prepareForNextStep()
+      }
+    )
+  }
+
+  private renderPullRequestCommentRow = (indexPath: RowIndexPath) => {
+    const comment = this.state.comments[indexPath.row]
+    return (
+      <TestNotificationItemRowContent
+        dispatcher={this.props.dispatcher}
+        html_url={comment.html_url}
+        leftAccessory={this.renderReviewStateIcon('COMMENTED')}
+      >
+        {comment.body}
+        <br />
+        by <i>{comment.user.login}</i>
+      </TestNotificationItemRowContent>
+    )
+  }
+
+  private renderPullRequestReviewRow = (indexPath: RowIndexPath) => {
+    const review = this.state.reviews[indexPath.row]
+
+    return (
+      <TestNotificationItemRowContent
+        dispatcher={this.props.dispatcher}
+        html_url={review.html_url}
+        leftAccessory={this.renderReviewStateIcon(review.state)}
+      >
+        {review.body || <i>Review without body</i>}
+        <br />
+        by <i>{review.user.login}</i>
+      </TestNotificationItemRowContent>
+    )
+  }
+
+  private renderReviewStateIcon = (
+    state: ValidNotificationPullRequestReviewState
+  ) => {
+    const icon = getPullRequestReviewStateIcon(state)
+    return (
+      <div className={classNames('review-icon-container', icon.className)}>
+        <Octicon symbol={icon.symbol} />
+      </div>
+    )
+  }
+
+  private renderPullRequestRow = (indexPath: RowIndexPath) => {
+    const pullRequest = this.state.pullRequests[indexPath.row]
+    const repository = this.props.repository.gitHubRepository
+    const endpointHtmlUrl = getHTMLURL(repository.endpoint)
+    const htmlURL = `${endpointHtmlUrl}/${repository.owner.login}/${repository.name}/pull/${pullRequest.pullRequestNumber}`
+
+    return (
+      <TestNotificationItemRowContent
+        dispatcher={this.props.dispatcher}
+        html_url={htmlURL}
+        leftAccessory={this.renderPullRequestStateIcon(pullRequest)}
+      >
+        <b>
+          #{pullRequest.pullRequestNumber}
+          {pullRequest.draft ? ' (Draft)' : ''}:
+        </b>{' '}
+        {pullRequest.title} <br />
+        by <i>{pullRequest.author}</i>
+      </TestNotificationItemRowContent>
+    )
+  }
+
+  private renderPullRequestStateIcon = (
+    pullRequest: PullRequest
+  ): JSX.Element => {
+    return (
+      <Octicon
+        className={pullRequest.draft ? 'pr-draft-icon' : 'pr-icon'}
+        symbol={
+          pullRequest.draft
+            ? octicons.gitPullRequestDraft
+            : octicons.gitPullRequest
+        }
+      />
+    )
+  }
+
+  public render() {
+    return (
+      <Dialog
+        id="test-notifications"
+        title="Test Notifications"
+        onSubmit={this.props.onDismissed}
+        onDismissed={this.props.onDismissed}
+      >
+        <DialogContent>
+          <p>{this.renderNotificationHint()}</p>
+          {this.renderCurrentStep()}
+        </DialogContent>
+        <DialogFooter>
+          <OkCancelButtonGroup
+            okButtonText="Close"
+            okButtonDisabled={false}
+            cancelButtonDisabled={false}
+            cancelButtonVisible={this.state.selectedFlow !== null}
+            cancelButtonText="Back"
+            onCancelButtonClick={this.onBack}
+          />
+        </DialogFooter>
+      </Dialog>
+    )
+  }
+
+  private onBack = (event: React.MouseEvent<HTMLButtonElement>) => {
+    this.back()
+    event.preventDefault()
+  }
+
+  private back() {
+    const { selectedFlow, stepResults } = this.state
+    if (selectedFlow === null) {
+      return
+    }
+
+    if (stepResults.size === 0) {
+      this.setState(
+        {
+          selectedFlow: null,
+          stepResults: new Map(),
+        },
+        () => {
+          this.prepareForNextStep()
+        }
+      )
+    }
+
+    const steps = selectedFlow.steps
+    const lastStep = steps.at(stepResults.size - 1)
+    if (lastStep === undefined) {
+      return
+    }
+
+    const newStepResults: Map<TestNotificationStepKind, any> = new Map(
+      stepResults
+    )
+    newStepResults.delete(lastStep)
+
+    this.setState(
+      {
+        stepResults: newStepResults as TestNotificationStepResultMap,
+      },
+      () => {
+        this.prepareForNextStep()
+      }
+    )
+  }
+}
diff --git a/app/src/ui/thank-you/thank-you.tsx b/app/src/ui/thank-you/thank-you.tsx
index cf01fa28b8a..d4c2c281f17 100644
--- a/app/src/ui/thank-you/thank-you.tsx
+++ b/app/src/ui/thank-you/thank-you.tsx
@@ -1,22 +1,29 @@
 import * as React from 'react'
 import { DesktopFakeRepository } from '../../lib/desktop-fake-repository'
-import {
-  ReleaseNoteHeaderLeftUri,
-  ReleaseNoteHeaderRightUri,
-} from '../../lib/release-notes'
 import { ReleaseNote } from '../../models/release-notes'
 import { Dialog, DialogContent } from '../dialog'
 import { RichText } from '../lib/rich-text'
+import Confetti from 'react-confetti'
+import { Emoji } from '../../lib/emoji'
 
 interface IThankYouProps {
   readonly onDismissed: () => void
-  readonly emoji: Map<string, string>
+  readonly emoji: Map<string, Emoji>
   readonly userContributions: ReadonlyArray<ReleaseNote>
   readonly friendlyName: string
   readonly latestVersion: string | null
 }
 
-export class ThankYou extends React.Component<IThankYouProps, {}> {
+interface IThankYouState {
+  readonly confettiHost?: HTMLDialogElement
+  readonly confettiRect?: DOMRect
+}
+
+export class ThankYou extends React.Component<IThankYouProps, IThankYouState> {
+  public constructor(props: IThankYouProps) {
+    super(props)
+    this.state = {}
+  }
   private renderList(
     releaseEntries: ReadonlyArray<ReleaseNote>
   ): JSX.Element | null {
@@ -46,44 +53,40 @@ export class ThankYou extends React.Component<IThankYouProps, {}> {
     )
   }
 
-  private renderConfetti(): JSX.Element | null {
-    const confetti = new Array<JSX.Element>()
+  private renderConfetti() {
+    const { confettiHost } = this.state
+    if (confettiHost) {
+      const { left, top } = this.state.confettiRect ?? { left: 0, top: 0 }
 
-    const howMuchConfetti = 750
-    for (let i = 0; i < howMuchConfetti; i++) {
-      confetti.push(<div key={i} className="confetti"></div>)
+      return (
+        <Confetti
+          recycle={false}
+          numberOfPieces={750}
+          width={window.innerWidth}
+          height={window.innerHeight}
+          style={{ left, top }}
+        />
+      )
     }
 
-    return <>{confetti}</>
+    return undefined
   }
 
-  public render() {
-    const dialogHeader = (
-      <div className="release-notes-header">
-        <div className="header-graphics">
-          <img
-            className="release-note-graphic-left"
-            src={ReleaseNoteHeaderLeftUri}
-          />
-          <div className="img-space"></div>
-          <img
-            className="release-note-graphic-right"
-            src={ReleaseNoteHeaderRightUri}
-          />
-        </div>
-        <div className="title">
-          <div className="thank-you">
-            Thank you {this.props.friendlyName}!{' '}
-            <RichText
-              text={':tada:'}
-              emoji={this.props.emoji}
-              renderUrlsAsLinks={true}
-            />
-          </div>
-        </div>
-      </div>
-    )
+  private updateConfettiRect = (e: Event) => {
+    if (e.currentTarget instanceof HTMLElement) {
+      const { offsetLeft: x, offsetTop: y } = e.currentTarget
+      const { innerWidth: w, innerHeight: h } = window
+      const confettiRect = new DOMRect(-Math.round(x), -Math.round(y), w, h)
+      this.setState({ confettiRect })
+    }
+  }
 
+  private onDialogRef = (dialog: HTMLDialogElement | null) => {
+    this.setState({ confettiHost: dialog ?? undefined })
+    dialog?.addEventListener('dialog-show', this.updateConfettiRect)
+  }
+
+  public render() {
     const version =
       this.props.latestVersion !== null ? ` ${this.props.latestVersion}` : ''
     const thankYouNote = (
@@ -98,7 +101,8 @@ export class ThankYou extends React.Component<IThankYouProps, {}> {
       <Dialog
         id="thank-you-notes"
         onDismissed={this.props.onDismissed}
-        title={dialogHeader}
+        title={`Thank you ${this.props.friendlyName}! 🎉`}
+        onDialogRef={this.onDialogRef}
       >
         <DialogContent>
           <div className="container">
@@ -107,13 +111,7 @@ export class ThankYou extends React.Component<IThankYouProps, {}> {
             <div className="contributions">
               {this.renderList(this.props.userContributions)}
             </div>
-            <div
-              className="confetti-container"
-              onClick={this.props.onDismissed}
-            >
-              {this.renderConfetti()}
-            </div>
-            <div className="footer"></div>
+            {this.renderConfetti()}
           </div>
         </DialogContent>
       </Dialog>
diff --git a/app/src/ui/toolbar/branch-dropdown.tsx b/app/src/ui/toolbar/branch-dropdown.tsx
index 1d1dd53c0df..7ad501d08b2 100644
--- a/app/src/ui/toolbar/branch-dropdown.tsx
+++ b/app/src/ui/toolbar/branch-dropdown.tsx
@@ -1,12 +1,14 @@
 import * as React from 'react'
 import { Dispatcher } from '../dispatcher'
-import * as OcticonSymbol from '../octicons/octicons.generated'
-import { syncClockwise } from '../octicons'
+import * as octicons from '../octicons/octicons.generated'
+import { OcticonSymbol, syncClockwise } from '../octicons'
 import { Repository } from '../../models/repository'
+import { Resizable } from '../resizable'
 import { TipState } from '../../models/tip'
 import { ToolbarDropdown, DropdownState } from './dropdown'
 import {
   FoldoutType,
+  IConstrainedValue,
   IRepositoryState,
   isRebaseConflictState,
 } from '../../lib/app-state'
@@ -19,6 +21,12 @@ import { dragAndDropManager } from '../../lib/drag-and-drop-manager'
 import { DragType } from '../../models/drag-drop'
 import { CICheckRunPopover } from '../check-runs/ci-check-run-popover'
 import { TooltipTarget } from '../lib/tooltip'
+import { BranchType, Branch } from '../../models/branch'
+import { PopupType } from '../../models/popup'
+import { generateBranchContextMenuItems } from '../branches/branch-list-item-context-menu'
+import { showContextualMenu } from '../../lib/menu-item'
+import { Emoji } from '../../lib/emoji'
+import { enableResizingToolbarButtons } from '../../lib/feature-flag'
 
 interface IBranchDropdownProps {
   readonly dispatcher: Dispatcher
@@ -29,6 +37,9 @@ interface IBranchDropdownProps {
   /** The current repository state as derived from AppState */
   readonly repositoryState: IRepositoryState
 
+  /** The width of the resizable branch dropdown button, as derived from AppState. */
+  readonly branchDropdownWidth: IConstrainedValue
+
   /** Whether or not the branch dropdown is currently open */
   readonly isOpen: boolean
 
@@ -58,25 +69,25 @@ interface IBranchDropdownProps {
   readonly showCIStatusPopover: boolean
 
   /** Map from the emoji shortcut (e.g., :+1:) to the image's local path. */
-  readonly emoji: Map<string, string>
-}
-interface IBranchDropdownState {
-  readonly badgeBottom: number
+  readonly emoji: Map<string, Emoji>
+
+  /** Whether the dropdown will trap focus or not. Defaults to true.
+   *
+   * Example of usage: If a dropdown is open and then a dialog subsequently, the
+   * focus trap logic will stop propagation of the focus event to the dialog.
+   * Thus, we want to disable this when dialogs are open since they will be
+   * using the dialog focus management.
+   */
+  readonly enableFocusTrap: boolean
+
+  readonly underlineLinks: boolean
 }
 
 /**
  * A drop down for selecting the currently checked out branch.
  */
-export class BranchDropdown extends React.Component<
-  IBranchDropdownProps,
-  IBranchDropdownState
-> {
-  public constructor(props: IBranchDropdownProps) {
-    super(props)
-    this.state = {
-      badgeBottom: 0,
-    }
-  }
+export class BranchDropdown extends React.Component<IBranchDropdownProps> {
+  private badgeRef: HTMLElement | null = null
 
   private renderBranchFoldout = (): JSX.Element | null => {
     const repositoryState = this.props.repositoryState
@@ -84,7 +95,6 @@ export class BranchDropdown extends React.Component<
 
     const tip = repositoryState.branchesState.tip
     const currentBranch = tip.kind === TipState.Valid ? tip.branch : null
-
     return (
       <BranchesContainer
         allBranches={branchesState.allBranches}
@@ -98,6 +108,9 @@ export class BranchDropdown extends React.Component<
         currentPullRequest={this.props.currentPullRequest}
         isLoadingPullRequests={this.props.isLoadingPullRequests}
         emoji={this.props.emoji}
+        onDeleteBranch={this.onDeleteBranch}
+        onRenameBranch={this.onRenameBranch}
+        underlineLinks={this.props.underlineLinks}
       />
     )
   }
@@ -112,14 +125,14 @@ export class BranchDropdown extends React.Component<
   }
 
   public render() {
-    const { repositoryState } = this.props
+    const { repositoryState, enableFocusTrap } = this.props
     const { branchesState, checkoutProgress, changesState } = repositoryState
     const { tip } = branchesState
     const { conflictState } = changesState
 
     const tipKind = tip.kind
 
-    let icon: OcticonSymbol.OcticonSymbolType = OcticonSymbol.gitBranch
+    let icon: OcticonSymbol = octicons.gitBranch
     let iconClassName: string | undefined = undefined
     let title: string
     let description = __DARWIN__ ? 'Current Branch' : 'Current branch'
@@ -128,7 +141,7 @@ export class BranchDropdown extends React.Component<
     let tooltip: string
 
     if (this.props.currentPullRequest) {
-      icon = OcticonSymbol.gitPullRequest
+      icon = octicons.gitPullRequest
     }
 
     if (tip.kind === TipState.Unknown) {
@@ -143,7 +156,7 @@ export class BranchDropdown extends React.Component<
     } else if (tip.kind === TipState.Detached) {
       title = `On ${tip.currentSha.substring(0, 7)}`
       tooltip = 'Currently on a detached HEAD'
-      icon = OcticonSymbol.gitCommit
+      icon = octicons.gitCommit
       description = 'Detached HEAD'
     } else if (tip.kind === TipState.Valid) {
       title = tooltip = tip.branch.name
@@ -154,15 +167,15 @@ export class BranchDropdown extends React.Component<
     let progressValue: number | undefined = undefined
 
     if (checkoutProgress) {
-      title = checkoutProgress.targetBranch
-      description = __DARWIN__ ? 'Switching to Branch' : 'Switching to branch'
+      title = checkoutProgress.target
+      description = checkoutProgress.description
 
       if (checkoutProgress.value > 0) {
         const friendlyProgress = Math.round(checkoutProgress.value * 100)
         description = `${description} (${friendlyProgress}%)`
       }
 
-      tooltip = `Switching to ${checkoutProgress.targetBranch}`
+      tooltip = `Checking out ${checkoutProgress.target}`
       progressValue = checkoutProgress.value
       icon = syncClockwise
       iconClassName = 'spin'
@@ -170,7 +183,7 @@ export class BranchDropdown extends React.Component<
     } else if (conflictState !== null && isRebaseConflictState(conflictState)) {
       title = conflictState.targetBranch
       description = 'Rebasing branch'
-      icon = OcticonSymbol.gitBranch
+      icon = octicons.gitBranch
       canOpen = false
       disabled = true
       tooltip = `Rebasing ${conflictState.targetBranch}`
@@ -178,37 +191,96 @@ export class BranchDropdown extends React.Component<
 
     const isOpen = this.props.isOpen
     const currentState: DropdownState = isOpen && canOpen ? 'open' : 'closed'
-    const buttonClassName = classNames('nudge-arrow', {
+    const buttonClassName = classNames('branch-toolbar-button', 'nudge-arrow', {
       'nudge-arrow-up': this.props.shouldNudge,
     })
 
+    if (!enableResizingToolbarButtons()) {
+      return (
+        <>
+          <ToolbarDropdown
+            className="branch-button"
+            icon={icon}
+            iconClassName={iconClassName}
+            title={title}
+            description={description}
+            onContextMenu={this.onBranchToolbarButtonContextMenu}
+            tooltip={isOpen ? undefined : tooltip}
+            onDropdownStateChanged={this.onDropDownStateChanged}
+            dropdownContentRenderer={this.renderBranchFoldout}
+            dropdownState={currentState}
+            disabled={disabled}
+            showDisclosureArrow={canOpen}
+            progressValue={progressValue}
+            buttonClassName={buttonClassName}
+            onMouseEnter={this.onMouseEnter}
+            onlyShowTooltipWhenOverflowed={true}
+            isOverflowed={isDescriptionOverflowed}
+            enableFocusTrap={enableFocusTrap}
+          >
+            {this.renderPullRequestInfo()}
+          </ToolbarDropdown>
+          {this.props.showCIStatusPopover && this.renderPopover()}
+        </>
+      )
+    }
+
+    // Properties to override the default foldout style for the branch dropdown.
+    // The min width of the foldout is different from `branchDropdownWidth.min`
+    // because the branches list foldout min width we want set to 365px instead.
+    const foldoutStyleOverrides: React.CSSProperties = {
+      width: this.props.branchDropdownWidth.value,
+      maxWidth: this.props.branchDropdownWidth.max,
+      minWidth: 365,
+    }
+
     return (
       <>
-        <ToolbarDropdown
-          className="branch-button"
-          icon={icon}
-          iconClassName={iconClassName}
-          title={title}
-          description={description}
-          tooltip={isOpen ? undefined : tooltip}
-          onDropdownStateChanged={this.onDropDownStateChanged}
-          dropdownContentRenderer={this.renderBranchFoldout}
-          dropdownState={currentState}
-          disabled={disabled}
-          showDisclosureArrow={canOpen}
-          progressValue={progressValue}
-          buttonClassName={buttonClassName}
-          onMouseEnter={this.onMouseEnter}
-          onlyShowTooltipWhenOverflowed={true}
-          isOverflowed={isDescriptionOverflowed}
+        <Resizable
+          width={this.props.branchDropdownWidth.value}
+          onReset={this.onReset}
+          onResize={this.onResize}
+          maximumWidth={this.props.branchDropdownWidth.max}
+          minimumWidth={this.props.branchDropdownWidth.min}
+          description="Current branch dropdown button"
         >
-          {this.renderPullRequestInfo()}
-        </ToolbarDropdown>
-        {this.props.showCIStatusPopover && this.renderPopover()}
+          <ToolbarDropdown
+            className="branch-button"
+            icon={icon}
+            iconClassName={iconClassName}
+            title={title}
+            description={description}
+            foldoutStyleOverrides={foldoutStyleOverrides}
+            onContextMenu={this.onBranchToolbarButtonContextMenu}
+            tooltip={isOpen ? undefined : tooltip}
+            onDropdownStateChanged={this.onDropDownStateChanged}
+            dropdownContentRenderer={this.renderBranchFoldout}
+            dropdownState={currentState}
+            disabled={disabled}
+            showDisclosureArrow={canOpen}
+            progressValue={progressValue}
+            buttonClassName={buttonClassName}
+            onMouseEnter={this.onMouseEnter}
+            onlyShowTooltipWhenOverflowed={true}
+            isOverflowed={isDescriptionOverflowed}
+            enableFocusTrap={enableFocusTrap}
+          >
+            {this.renderPullRequestInfo()}
+          </ToolbarDropdown>
+          {this.props.showCIStatusPopover && this.renderPopover()}
+        </Resizable>
       </>
     )
   }
 
+  private onResize = (width: number) => {
+    this.props.dispatcher.setBranchDropdownWidth(width)
+  }
+
+  private onReset = () => {
+    this.props.dispatcher.resetBranchDropdownWidth()
+  }
+
   /**
    * Method to capture when the mouse is over the branch dropdown button.
    *
@@ -222,6 +294,89 @@ export class BranchDropdown extends React.Component<
     }
   }
 
+  private onBranchToolbarButtonContextMenu = (
+    event: React.MouseEvent<HTMLButtonElement>
+  ): void => {
+    event.preventDefault()
+
+    const { tip } = this.props.repositoryState.branchesState
+
+    if (tip.kind !== TipState.Valid) {
+      return
+    }
+
+    const items = generateBranchContextMenuItems({
+      name: tip.branch.name,
+      isLocal: tip.branch.type === BranchType.Local,
+      onRenameBranch: this.onRenameBranch,
+      onViewPullRequestOnGitHub: this.props.currentPullRequest
+        ? this.onViewPullRequestOnGithub
+        : undefined,
+      onDeleteBranch: this.onDeleteBranch,
+    })
+
+    showContextualMenu(items)
+  }
+
+  private getBranchWithName(branchName: string): Branch | undefined {
+    return this.props.repositoryState.branchesState.allBranches.find(
+      branch => branch.name === branchName
+    )
+  }
+
+  private onRenameBranch = (branchName: string) => {
+    const branch = this.getBranchWithName(branchName)
+
+    if (branch === undefined) {
+      return
+    }
+
+    this.props.dispatcher.showPopup({
+      type: PopupType.RenameBranch,
+      repository: this.props.repository,
+      branch,
+    })
+  }
+
+  private onViewPullRequestOnGithub = () => {
+    const pr = this.props.currentPullRequest
+
+    if (pr === null) {
+      return
+    }
+
+    this.props.dispatcher.showPullRequestByPR(pr)
+  }
+
+  private onDeleteBranch = async (branchName: string) => {
+    const branch = this.getBranchWithName(branchName)
+    const { dispatcher, repository } = this.props
+
+    if (branch === undefined) {
+      return
+    }
+
+    if (branch.type === BranchType.Remote) {
+      dispatcher.showPopup({
+        type: PopupType.DeleteRemoteBranch,
+        repository,
+        branch,
+      })
+      return
+    }
+
+    const aheadBehind = await dispatcher.getBranchAheadBehind(
+      repository,
+      branch
+    )
+    dispatcher.showPopup({
+      type: PopupType.DeleteBranch,
+      repository,
+      branch,
+      existsOnRemote: aheadBehind !== null,
+    })
+  }
+
   private onBadgeClick = () => {
     // The badge can't be clicked while the CI status popover is shown, because
     // in that case the Popover component will recognize the "click outside"
@@ -230,10 +385,6 @@ export class BranchDropdown extends React.Component<
     this.openPopover()
   }
 
-  private updateBadgeBottomPosition = (badgeBottom: number) => {
-    this.setState({ badgeBottom })
-  }
-
   private openPopover = () => {
     this.props.dispatcher.setShowCIStatusPopover(true)
   }
@@ -285,12 +436,16 @@ export class BranchDropdown extends React.Component<
         dispatcher={this.props.dispatcher}
         repository={pr.base.gitHubRepository}
         branchName={currentBranchName}
-        badgeBottom={this.state.badgeBottom}
+        anchor={this.badgeRef}
         closePopover={this.closePopover}
       />
     )
   }
 
+  private onBadgeRef = (ref: HTMLButtonElement | null) => {
+    this.badgeRef = ref
+  }
+
   private renderPullRequestInfo() {
     const pr = this.props.currentPullRequest
 
@@ -303,8 +458,9 @@ export class BranchDropdown extends React.Component<
         number={pr.pullRequestNumber}
         dispatcher={this.props.dispatcher}
         repository={pr.base.gitHubRepository}
+        onBadgeRef={this.onBadgeRef}
         onBadgeClick={this.onBadgeClick}
-        onBadgeBottomPositionUpdate={this.updateBadgeBottomPosition}
+        showCIStatusPopover={this.props.showCIStatusPopover}
       />
     )
   }
diff --git a/app/src/ui/toolbar/button.tsx b/app/src/ui/toolbar/button.tsx
index d6ee1189e50..f04f89419f2 100644
--- a/app/src/ui/toolbar/button.tsx
+++ b/app/src/ui/toolbar/button.tsx
@@ -1,11 +1,14 @@
+/* eslint-disable jsx-a11y/no-static-element-interactions */
 import * as React from 'react'
-import { Octicon, OcticonSymbolType } from '../octicons'
+import { Octicon, OcticonSymbol } from '../octicons'
 import classNames from 'classnames'
 import { assertNever } from '../../lib/fatal-error'
 import { Button } from '../lib/button'
 import { clamp } from '../../lib/clamp'
 import { createObservableRef } from '../lib/observable-ref'
 import { Tooltip, TooltipDirection, TooltipTarget } from '../lib/tooltip'
+import { AriaHasPopupType } from '../lib/aria-types'
+import { enableResizingToolbarButtons } from '../../lib/feature-flag'
 
 /** The button style. */
 export enum ToolbarButtonStyle {
@@ -27,7 +30,7 @@ export interface IToolbarButtonProps {
   readonly tooltip?: string
 
   /** An optional symbol to be displayed next to the button text */
-  readonly icon?: OcticonSymbolType
+  readonly icon?: OcticonSymbol
 
   /** The class name for the icon element. */
   readonly iconClassName?: string
@@ -38,6 +41,13 @@ export interface IToolbarButtonProps {
    */
   readonly onClick?: (event: React.MouseEvent<HTMLButtonElement>) => void
 
+  /**
+   * An optional event handler for when the button's context menu
+   * is activated by a pointer event or by hitting the menu key
+   * while focused.
+   */
+  readonly onContextMenu?: (event: React.MouseEvent<HTMLButtonElement>) => void
+
   /**
    * A function that's called when the user hovers over the button with
    * a pointer device.
@@ -100,6 +110,14 @@ export interface IToolbarButtonProps {
 
   readonly role?: string
   readonly ariaExpanded?: boolean
+  readonly ariaHaspopup?: AriaHasPopupType
+
+  /**
+   * Typically the contents of a button serve the purpose of describing the
+   * buttons use. However, ariaLabel can be used if the contents do not suffice.
+   * Such as when a button wraps an image and there is no text.
+   */
+  readonly ariaLabel?: string
 
   /**
    * Whether to only show the tooltip when the tooltip target overflows its
@@ -172,6 +190,7 @@ export class ToolbarButton extends React.Component<IToolbarButtonProps, {}> {
     const className = classNames(
       'toolbar-button',
       { 'has-progress': this.props.progressValue !== undefined },
+      { resizable: enableResizingToolbarButtons() },
       this.props.className
     )
 
@@ -206,12 +225,15 @@ export class ToolbarButton extends React.Component<IToolbarButtonProps, {}> {
         )}
         <Button
           onClick={this.onClick}
+          onContextMenu={this.props.onContextMenu}
           ref={this.onButtonRef}
           disabled={this.props.disabled}
           onMouseEnter={this.props.onMouseEnter}
           tabIndex={this.props.tabIndex}
           role={this.props.role}
           ariaExpanded={this.props.ariaExpanded}
+          ariaHaspopup={this.props.ariaHaspopup}
+          ariaLabel={this.props.ariaLabel}
         >
           {progress}
           {icon}
diff --git a/app/src/ui/toolbar/dropdown.tsx b/app/src/ui/toolbar/dropdown.tsx
index c95b8392f33..f2b33011c80 100644
--- a/app/src/ui/toolbar/dropdown.tsx
+++ b/app/src/ui/toolbar/dropdown.tsx
@@ -1,6 +1,8 @@
+/* eslint-disable jsx-a11y/no-static-element-interactions */
+/* eslint-disable jsx-a11y/click-events-have-key-events */
 import * as React from 'react'
-import { Octicon, OcticonSymbolType } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import { Octicon, OcticonSymbol } from '../octicons'
+import * as octicons from '../octicons/octicons.generated'
 import { assertNever } from '../../lib/fatal-error'
 import { ToolbarButton, ToolbarButtonStyle } from './button'
 import { rectEquals } from '../lib/rect'
@@ -8,10 +10,31 @@ import classNames from 'classnames'
 import FocusTrap from 'focus-trap-react'
 import { Options as FocusTrapOptions } from 'focus-trap'
 import { TooltipTarget } from '../lib/tooltip'
+import { AriaHasPopupType } from '../lib/aria-types'
+import { enableResizingToolbarButtons } from '../../lib/feature-flag'
 
 export type DropdownState = 'open' | 'closed'
 
+/** Represents the style of the dropdown */
+export enum ToolbarDropdownStyle {
+  /**
+   * The dropdown is rendered as a single button and, when expanded, takes the
+   * full height of the window.
+   */
+  Foldout,
+
+  /**
+   * The dropdown is rendered as two buttons: one is the toolbar button itself,
+   * and the other one is the expand/collapse button.
+   * When expanded, it only takes the height of the content.
+   */
+  MultiOption,
+}
+
 export interface IToolbarDropdownProps {
+  /** The style of the dropdown. Default: Foldout */
+  readonly dropdownStyle?: ToolbarDropdownStyle
+
   /** The primary button text, describing its function */
   readonly title?: string
 
@@ -22,7 +45,7 @@ export interface IToolbarDropdownProps {
   readonly tooltip?: string
 
   /** An optional symbol to be displayed next to the button text */
-  readonly icon?: OcticonSymbolType
+  readonly icon?: OcticonSymbol
 
   /**
    * The state for of the drop down button.
@@ -65,6 +88,15 @@ export interface IToolbarDropdownProps {
    */
   readonly dropdownContentRenderer: () => JSX.Element | null
 
+  /**
+   * A callback which is invoked when the button's context menu
+   * is activated. The source event is passed along and can be
+   * used to prevent the default action or stop the event from bubbling.
+   */
+  readonly onContextMenu?: (event: React.MouseEvent<HTMLButtonElement>) => void
+
+  readonly onClick?: (event: React.MouseEvent<HTMLButtonElement>) => void
+
   /**
    * A function that's called whenever something is dragged over the
    * dropdown.
@@ -83,15 +115,34 @@ export interface IToolbarDropdownProps {
   /** The button's style. Defaults to `ToolbarButtonStyle.Standard`. */
   readonly style?: ToolbarButtonStyle
 
-  /** Whether the dropdown will trap focus or not. Defaults to true. */
+  /** Whether the dropdown will trap focus or not. Defaults to true.
+   *
+   * Example of usage: If a dropdown is open and then a dialog subsequently, the
+   * focus trap logic will stop propagation of the focus event to the dialog.
+   * Thus, we want to disable this when dialogs are open since they will be
+   * using the HTML build in dialog focus management.
+   */
   readonly enableFocusTrap?: boolean
 
   /**
-   * Sets the styles for the dropdown's foldout. Useful for custom positioning
-   * and sizes.
+   * Sets the styles for the dropdown's foldout, replacing the defaults.
+   * Useful for custom positioning and sizes.
+   *
+   * Note: If this property is set, the default positioning, size, and
+   * `foldoutStyleOverrides` property are all ignored.
    */
   readonly foldoutStyle?: React.CSSProperties
 
+  /**
+   * Sets additional styles that add to or override the default foldout style.
+   *
+   * Use as an alternative to `foldoutStyle`, when only certain properties need
+   * to be customized and the default style and placement should still apply.
+   *
+   * Note: If `foldoutStyle` is set, this property is ignored.
+   */
+  readonly foldoutStyleOverrides?: React.CSSProperties
+
   /**
    * Whether the button should displays its disclosure arrow. Defaults to true.
    */
@@ -138,6 +189,7 @@ export interface IToolbarDropdownProps {
 
   readonly role?: string
   readonly buttonRole?: string
+  readonly buttonAriaHaspopup?: AriaHasPopupType
 
   /** Classes to be appended to `ToolbarButton` component */
   readonly buttonClassName?: string
@@ -163,6 +215,19 @@ export interface IToolbarDropdownProps {
    * the tooltip.
    */
   readonly isOverflowed?: ((target: TooltipTarget) => boolean) | boolean
+
+  /**
+   * Typically the contents of a button serve the purpose of describing the
+   * buttons use. However, ariaLabel can be used if the contents do not suffice.
+   * Such as when a button wraps an image and there is no text.
+   */
+  readonly ariaLabel?: string
+
+  /** Whether or not the focus trap should return focus to the activating button  */
+  readonly returnFocusOnDeactivate?: boolean
+
+  /** Callback fro when the focus trap deactivates */
+  readonly onDropdownFocusTrapDeactivate?: () => void
 }
 
 interface IToolbarDropdownState {
@@ -176,7 +241,8 @@ export class ToolbarDropdown extends React.Component<
   IToolbarDropdownProps,
   IToolbarDropdownState
 > {
-  private innerButton: ToolbarButton | null = null
+  private innerButton = React.createRef<ToolbarButton>()
+  private rootDiv = React.createRef<HTMLDivElement>()
   private focusTrapOptions: FocusTrapOptions
 
   public constructor(props: IToolbarDropdownProps) {
@@ -190,6 +256,8 @@ export class ToolbarDropdown extends React.Component<
       // we would lose the "source" of the event (keyboard vs pointer).
       clickOutsideDeactivates: false,
       escapeDeactivates: false,
+      returnFocusOnDeactivate: this.props.returnFocusOnDeactivate,
+      onDeactivate: this.props.onDropdownFocusTrapDeactivate,
     }
   }
 
@@ -197,13 +265,13 @@ export class ToolbarDropdown extends React.Component<
     return this.props.dropdownState === 'open'
   }
 
-  private dropdownIcon(state: DropdownState): OcticonSymbolType {
+  private dropdownIcon(state: DropdownState): OcticonSymbol {
     // @TODO: Remake triangle octicon in a 12px version,
     // right now it's scaled badly on normal dpi monitors.
     if (state === 'open') {
-      return OcticonSymbol.triangleUp
+      return octicons.triangleUp
     } else if (state === 'closed') {
-      return OcticonSymbol.triangleDown
+      return octicons.triangleDown
     } else {
       return assertNever(state, `Unknown dropdown state ${state}`)
     }
@@ -215,13 +283,28 @@ export class ToolbarDropdown extends React.Component<
     }
 
     const state = this.props.dropdownState
-
-    return (
+    const dropdownIcon = (
       <Octicon symbol={this.dropdownIcon(state)} className="dropdownArrow" />
     )
+
+    return this.props.dropdownStyle === ToolbarDropdownStyle.MultiOption ? (
+      <ToolbarButton
+        className="toolbar-dropdown-arrow-button"
+        onClick={this.onToggleDropdownClick}
+        ariaExpanded={this.isOpen}
+        ariaHaspopup={true}
+        ariaLabel={this.props.ariaLabel}
+      >
+        {dropdownIcon}
+      </ToolbarButton>
+    ) : (
+      dropdownIcon
+    )
   }
 
-  private onClick = (event: React.MouseEvent<HTMLButtonElement>) => {
+  private onToggleDropdownClick = (
+    event: React.MouseEvent<HTMLButtonElement>
+  ) => {
     const newState: DropdownState =
       this.props.dropdownState === 'open' ? 'closed' : 'open'
 
@@ -238,9 +321,22 @@ export class ToolbarDropdown extends React.Component<
     this.props.onDropdownStateChanged(newState, source)
   }
 
+  private onMainButtonClick = (event: React.MouseEvent<HTMLButtonElement>) => {
+    if (this.props.dropdownStyle === ToolbarDropdownStyle.MultiOption) {
+      this.props.onClick?.(event)
+      return
+    }
+
+    this.onToggleDropdownClick(event)
+  }
+
+  private onContextMenu = (event: React.MouseEvent<HTMLButtonElement>) => {
+    this.props.onContextMenu?.(event)
+  }
+
   private updateClientRectIfNecessary() {
-    if (this.props.dropdownState === 'open' && this.innerButton) {
-      const newRect = this.innerButton.getButtonBoundingClientRect()
+    if (this.props.dropdownState === 'open' && this.rootDiv.current) {
+      const newRect = this.rootDiv.current.getBoundingClientRect()
       if (newRect) {
         const currentRect = this.state.clientRect
 
@@ -255,10 +351,6 @@ export class ToolbarDropdown extends React.Component<
     this.updateClientRectIfNecessary()
   }
 
-  public componentWillUnmount() {
-    this.innerButton = null
-  }
-
   public componentDidUpdate() {
     this.updateClientRectIfNecessary()
   }
@@ -274,7 +366,7 @@ export class ToolbarDropdown extends React.Component<
     }
 
     return {
-      position: 'absolute',
+      position: enableResizingToolbarButtons() ? 'fixed' : 'absolute',
       top: rect.bottom,
       left: 0,
       width: '100%',
@@ -283,6 +375,7 @@ export class ToolbarDropdown extends React.Component<
   }
 
   private getFoldoutStyle(): React.CSSProperties | undefined {
+    // if `foldoutStyle` is set, ignore default style and `foldoutStyleOverrides`
     if (this.props.foldoutStyle) {
       return this.props.foldoutStyle
     }
@@ -292,12 +385,20 @@ export class ToolbarDropdown extends React.Component<
       return undefined
     }
 
+    const heightStyle: React.CSSProperties =
+      this.props.dropdownStyle === ToolbarDropdownStyle.MultiOption
+        ? { maxHeight: '100%', width: rect.width }
+        : { height: '100%', minWidth: rect.width }
+
+    const overrides: React.CSSProperties =
+      this.props.foldoutStyleOverrides ?? {}
+
     return {
       position: 'absolute',
       marginLeft: rect.left,
-      minWidth: rect.width,
-      height: '100%',
       top: 0,
+      ...heightStyle,
+      ...overrides,
     }
   }
 
@@ -341,45 +442,44 @@ export class ToolbarDropdown extends React.Component<
     )
   }
 
-  private onRef = (ref: ToolbarButton | null) => {
-    this.innerButton = ref
-  }
-
   /**
    * Programmatically move keyboard focus to the button element.
    */
   public focusButton = () => {
-    if (this.innerButton) {
-      this.innerButton.focusButton()
+    if (this.innerButton.current) {
+      this.innerButton.current.focusButton()
     }
   }
 
   public render() {
     const className = classNames(
       'toolbar-dropdown',
+      { resizable: enableResizingToolbarButtons() },
+      this.props.dropdownStyle === ToolbarDropdownStyle.MultiOption
+        ? 'multi-option-style'
+        : 'foldout-style',
       this.props.dropdownState,
       this.props.className
     )
 
-    const ariaExpanded = this.props.dropdownState === 'open' ? 'true' : 'false'
-
     return (
       <div
         className={className}
         onKeyDown={this.props.onKeyDown}
         role={this.props.role}
-        aria-expanded={ariaExpanded}
         onDragOver={this.props.onDragOver}
+        ref={this.rootDiv}
       >
         {this.renderDropdownContents()}
         <ToolbarButton
           className={this.props.buttonClassName}
-          ref={this.onRef}
+          ref={this.innerButton}
           icon={this.props.icon}
           title={this.props.title}
           description={this.props.description}
           tooltip={this.props.tooltip}
-          onClick={this.onClick}
+          onClick={this.onMainButtonClick}
+          onContextMenu={this.onContextMenu}
           onMouseEnter={this.props.onMouseEnter}
           style={this.props.style}
           iconClassName={this.props.iconClassName}
@@ -391,10 +491,19 @@ export class ToolbarDropdown extends React.Component<
             this.props.onlyShowTooltipWhenOverflowed
           }
           isOverflowed={this.props.isOverflowed}
+          ariaExpanded={
+            this.props.dropdownStyle === ToolbarDropdownStyle.MultiOption
+              ? undefined
+              : this.isOpen
+          }
+          ariaHaspopup={this.props.buttonAriaHaspopup}
         >
           {this.props.children}
-          {this.renderDropdownArrow()}
+          {this.props.dropdownStyle !== ToolbarDropdownStyle.MultiOption &&
+            this.renderDropdownArrow()}
         </ToolbarButton>
+        {this.props.dropdownStyle === ToolbarDropdownStyle.MultiOption &&
+          this.renderDropdownArrow()}
       </div>
     )
   }
diff --git a/app/src/ui/toolbar/push-pull-button-dropdown.tsx b/app/src/ui/toolbar/push-pull-button-dropdown.tsx
new file mode 100644
index 00000000000..053b8bd404b
--- /dev/null
+++ b/app/src/ui/toolbar/push-pull-button-dropdown.tsx
@@ -0,0 +1,129 @@
+import React from 'react'
+import { Button } from '../lib/button'
+import { Octicon, syncClockwise } from '../octicons'
+import {
+  DropdownItem,
+  DropdownItemClassName,
+  DropdownItemType,
+  forcePushIcon,
+} from './push-pull-button'
+
+interface IPushPullButtonDropDownProps {
+  readonly itemTypes: ReadonlyArray<DropdownItemType>
+  /** The name of the remote. */
+  readonly remoteName: string | null
+
+  /** Will the app prompt the user to confirm a force push? */
+  readonly askForConfirmationOnForcePush: boolean
+
+  readonly fetch: () => void
+  readonly forcePushWithLease: () => void
+}
+
+export class PushPullButtonDropDown extends React.Component<IPushPullButtonDropDownProps> {
+  private buttonsContainerRef: HTMLDivElement | null = null
+
+  public componentDidMount() {
+    window.addEventListener('keydown', this.onDropdownKeyDown)
+  }
+
+  public componentWillUnmount() {
+    window.removeEventListener('keydown', this.onDropdownKeyDown)
+  }
+
+  private onButtonsContainerRef = (ref: HTMLDivElement | null) => {
+    this.buttonsContainerRef = ref
+  }
+
+  private onDropdownKeyDown = (event: KeyboardEvent) => {
+    // Allow using Up and Down arrow keys to navigate the dropdown items
+    // (equivalent to Tab and Shift+Tab)
+    if (event.key !== 'ArrowDown' && event.key !== 'ArrowUp') {
+      return
+    }
+
+    event.preventDefault()
+    const items = this.buttonsContainerRef?.querySelectorAll<HTMLElement>(
+      `.${DropdownItemClassName}`
+    )
+
+    if (items === undefined) {
+      return
+    }
+
+    const focusedItem =
+      this.buttonsContainerRef?.querySelector<HTMLElement>(':focus')
+    if (!focusedItem) {
+      return
+    }
+
+    const focusedIndex = Array.from(items).indexOf(focusedItem)
+    const nextIndex =
+      event.key === 'ArrowDown' ? focusedIndex + 1 : focusedIndex - 1
+    // http://javascript.about.com/od/problemsolving/a/modulobug.htm
+    const nextItem = items[(nextIndex + items.length) % items.length]
+    nextItem?.focus()
+  }
+
+  private getDropdownItemWithType(type: DropdownItemType): DropdownItem {
+    const { remoteName } = this.props
+
+    switch (type) {
+      case DropdownItemType.Fetch:
+        return {
+          title: `Fetch ${remoteName}`,
+          description: `Fetch the latest changes from ${remoteName}`,
+          action: this.props.fetch,
+          icon: syncClockwise,
+        }
+      case DropdownItemType.ForcePush: {
+        const forcePushWarning = this.props
+          .askForConfirmationOnForcePush ? null : (
+          <div className="warning">
+            <span className="warning-title">Warning:</span> A force push will
+            rewrite history on the remote. Any collaborators working on this
+            branch will need to reset their own local branch to match the
+            history of the remote.
+          </div>
+        )
+        return {
+          title: `Force push ${remoteName}`,
+          description: (
+            <>
+              Overwrite any changes on {remoteName} with your local changes
+              {forcePushWarning}
+            </>
+          ),
+          action: this.props.forcePushWithLease,
+          icon: forcePushIcon,
+        }
+      }
+    }
+  }
+
+  public renderDropdownItem = (type: DropdownItemType) => {
+    const item = this.getDropdownItemWithType(type)
+    return (
+      <Button
+        className={DropdownItemClassName}
+        key={type}
+        onClick={item.action}
+      >
+        <Octicon symbol={item.icon} />
+        <div className="text-container">
+          <div className="title">{item.title}</div>
+          <div className="detail">{item.description}</div>
+        </div>
+      </Button>
+    )
+  }
+
+  public render() {
+    const { itemTypes } = this.props
+    return (
+      <div className="push-pull-dropdown" ref={this.onButtonsContainerRef}>
+        {itemTypes.map(this.renderDropdownItem)}
+      </div>
+    )
+  }
+}
diff --git a/app/src/ui/toolbar/push-pull-button.tsx b/app/src/ui/toolbar/push-pull-button.tsx
index 8cbce44c3db..866bc406b58 100644
--- a/app/src/ui/toolbar/push-pull-button.tsx
+++ b/app/src/ui/toolbar/push-pull-button.tsx
@@ -5,14 +5,33 @@ import { Repository } from '../../models/repository'
 import { IAheadBehind } from '../../models/branch'
 import { TipState } from '../../models/tip'
 import { FetchType } from '../../models/fetch'
+import { Resizable } from '../resizable'
 
 import { Dispatcher } from '../dispatcher'
-import { Octicon, syncClockwise } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import {
+  Octicon,
+  OcticonSymbol,
+  OcticonSymbolVariant,
+  syncClockwise,
+} from '../octicons'
+import * as octicons from '../octicons/octicons.generated'
 import { RelativeTime } from '../relative-time'
 
 import { ToolbarButton, ToolbarButtonStyle } from './button'
 import classNames from 'classnames'
+import {
+  DropdownState,
+  IToolbarDropdownProps,
+  ToolbarDropdown,
+  ToolbarDropdownStyle,
+} from './dropdown'
+import { FoldoutType, IConstrainedValue } from '../../lib/app-state'
+import { ForcePushBranchState } from '../../lib/rebase'
+import { PushPullButtonDropDown } from './push-pull-button-dropdown'
+import { AriaLiveContainer } from '../accessibility/aria-live-container'
+import { enableResizingToolbarButtons } from '../../lib/feature-flag'
+
+export const DropdownItemClassName = 'push-pull-dropdown-item'
 
 interface IPushPullButtonProps {
   /**
@@ -52,8 +71,8 @@ interface IPushPullButtonProps {
   /** Is the detached HEAD state related to a rebase or not? */
   readonly rebaseInProgress: boolean
 
-  /** If the current branch has been rebased, the user is permitted to force-push */
-  readonly isForcePush: boolean
+  /** Force push state of the current branch */
+  readonly forcePushBranchState: ForcePushBranchState
 
   /** Whether this component should show its onboarding tutorial nudge arrow */
   readonly shouldNudge: boolean
@@ -62,6 +81,51 @@ interface IPushPullButtonProps {
    * The number of tags that would get pushed if the user performed a push.
    */
   readonly numTagsToPush: number
+
+  /** Whether or not the push-pull dropdown is currently open */
+  readonly isDropdownOpen: boolean
+
+  /** Will the app prompt the user to confirm a force push? */
+  readonly askForConfirmationOnForcePush: boolean
+
+  /** Whether the dropdown will trap focus or not. Defaults to true.
+   *
+   * Example of usage: If a dropdown is open and then a dialog subsequently, the
+   * focus trap logic will stop propagation of the focus event to the dialog.
+   * Thus, we want to disable this when dialogs are open since they will be
+   * using the dialog focus management.
+   */
+  readonly enableFocusTrap: boolean
+
+  /** The width of the resizable push/pull button, as derived from AppState. */
+  readonly pushPullButtonWidth: IConstrainedValue
+
+  /**
+   * An event handler for when the drop down is opened, or closed, by a pointer
+   * event or by pressing the space or enter key while focused.
+   *
+   * @param state    - The new state of the drop down
+   */
+  readonly onDropdownStateChanged: (state: DropdownState) => void
+}
+
+type ActionInProgress = 'push' | 'pull' | 'fetch' | 'force push'
+
+interface IPushPullButtonState {
+  readonly screenReaderStateMessage: string | null
+  readonly actionInProgress: ActionInProgress | null
+}
+
+export enum DropdownItemType {
+  Fetch = 'fetch',
+  ForcePush = 'force-push',
+}
+
+export type DropdownItem = {
+  readonly title: string
+  readonly description: string | JSX.Element
+  readonly action: () => void
+  readonly icon: OcticonSymbol
 }
 
 function renderAheadBehind(aheadBehind: IAheadBehind, numTagsToPush: number) {
@@ -75,7 +139,7 @@ function renderAheadBehind(aheadBehind: IAheadBehind, numTagsToPush: number) {
     content.push(
       <span key="ahead">
         {ahead + numTagsToPush}
-        <Octicon symbol={OcticonSymbol.arrowUp} />
+        <Octicon symbol={octicons.arrowUp} />
       </span>
     )
   }
@@ -84,7 +148,7 @@ function renderAheadBehind(aheadBehind: IAheadBehind, numTagsToPush: number) {
     content.push(
       <span key="behind">
         {behind}
-        <Octicon symbol={OcticonSymbol.arrowDown} />
+        <Octicon symbol={octicons.arrowDown} />
       </span>
     )
   }
@@ -104,220 +168,270 @@ function renderLastFetched(lastFetched: Date | null): JSX.Element | string {
   }
 }
 
-/** The common props for all button states */
-const defaultProps = {
-  className: 'push-pull-button',
-  style: ToolbarButtonStyle.Subtitle,
-}
-
-function progressButton(progress: Progress, networkActionInProgress: boolean) {
-  return (
-    <ToolbarButton
-      {...defaultProps}
-      title={progress.title}
-      description={progress.description || 'Hang on…'}
-      progressValue={progress.value}
-      icon={syncClockwise}
-      iconClassName={networkActionInProgress ? 'spin' : ''}
-      tooltip={progress.description}
-      disabled={true}
-    />
-  )
-}
-
-function publishRepositoryButton(onClick: () => void) {
-  return (
-    <ToolbarButton
-      {...defaultProps}
-      title="Publish repository"
-      description="Publish this repository to GitHub"
-      className="push-pull-button"
-      icon={OcticonSymbol.upload}
-      style={ToolbarButtonStyle.Subtitle}
-      onClick={onClick}
-    />
-  )
-}
-
-function unbornRepositoryButton() {
-  return (
-    <ToolbarButton
-      {...defaultProps}
-      title="Publish branch"
-      description="Cannot publish unborn HEAD"
-      icon={OcticonSymbol.upload}
-      disabled={true}
-    />
-  )
-}
-
-function detachedHeadButton(rebaseInProgress: boolean) {
-  const description = rebaseInProgress
-    ? 'Rebase in progress'
-    : 'Cannot publish detached HEAD'
-
-  return (
-    <ToolbarButton
-      {...defaultProps}
-      title="Publish branch"
-      description={description}
-      icon={OcticonSymbol.upload}
-      disabled={true}
-    />
-  )
-}
-
-function publishBranchButton(
-  isGitHub: boolean,
-  onClick: () => void,
-  shouldNudge: boolean
-) {
-  const description = isGitHub
-    ? 'Publish this branch to GitHub'
-    : 'Publish this branch to the remote'
-
-  const className = classNames(defaultProps.className, 'nudge-arrow', {
-    'nudge-arrow-up': shouldNudge,
-  })
-
-  return (
-    <ToolbarButton
-      {...defaultProps}
-      title="Publish branch"
-      description={description}
-      icon={OcticonSymbol.upload}
-      onClick={onClick}
-      className={className}
-    />
-  )
-}
-
-function fetchButton(
-  remoteName: string,
-  aheadBehind: IAheadBehind,
-  numTagsToPush: number,
-  lastFetched: Date | null,
-  onClick: () => void
-) {
-  const title = `Fetch ${remoteName}`
-  return (
-    <ToolbarButton
-      {...defaultProps}
-      title={title}
-      description={renderLastFetched(lastFetched)}
-      icon={syncClockwise}
-      onClick={onClick}
-    >
-      {renderAheadBehind(aheadBehind, numTagsToPush)}
-    </ToolbarButton>
-  )
-}
-
-function pullButton(
-  remoteName: string,
-  aheadBehind: IAheadBehind,
-  numTagsToPush: number,
-  lastFetched: Date | null,
-  pullWithRebase: boolean,
-  onClick: () => void
-) {
-  const title = pullWithRebase
-    ? `Pull ${remoteName} with rebase`
-    : `Pull ${remoteName}`
-
-  return (
-    <ToolbarButton
-      {...defaultProps}
-      title={title}
-      description={renderLastFetched(lastFetched)}
-      icon={OcticonSymbol.arrowDown}
-      onClick={onClick}
-    >
-      {renderAheadBehind(aheadBehind, numTagsToPush)}
-    </ToolbarButton>
-  )
-}
-
-function pushButton(
-  remoteName: string,
-  aheadBehind: IAheadBehind,
-  numTagsToPush: number,
-  lastFetched: Date | null,
-  onClick: () => void
-) {
-  return (
-    <ToolbarButton
-      {...defaultProps}
-      title={`Push ${remoteName}`}
-      description={renderLastFetched(lastFetched)}
-      icon={OcticonSymbol.arrowUp}
-      onClick={onClick}
-    >
-      {renderAheadBehind(aheadBehind, numTagsToPush)}
-    </ToolbarButton>
-  )
-}
-
 /**
  * This represents the "double arrow" icon used to show a force-push, and is a
  * less complicated icon than the generated Octicon from the `octicons` package.
  */
-const forcePushIcon: OcticonSymbol.OcticonSymbolType = {
+export const forcePushIcon: OcticonSymbolVariant = {
   w: 10,
   h: 16,
-  d:
+  p: [
     'M0 6a.75.75 0 0 0 .974.714L4.469 3.22a.75.75 0 0 1 1.06 0l3.478 3.478a.75.75 ' +
-    '0 0 0 .772-1.228L5.53 1.22a.75.75 0 0 0-1.06 0L.22 5.47A.75.75 0 0 0 0 6zm0 ' +
-    '3a.75.75 0 0 0 1.28.53l2.97-2.97V14a.75.75 0 1 0 1.5 0V6.56l2.97 2.97a.75.75 ' +
-    '0 0 0 1.06-1.06L5.53 4.22a.75.75 0 0 0-1.06 0L.22 8.47A.75.75 0 0 0 0 9z',
-  fr: 'evenodd',
-}
-
-function forcePushButton(
-  remoteName: string,
-  aheadBehind: IAheadBehind,
-  numTagsToPush: number,
-  lastFetched: Date | null,
-  onClick: () => void
-) {
-  return (
-    <ToolbarButton
-      {...defaultProps}
-      title={`Force push ${remoteName}`}
-      description={renderLastFetched(lastFetched)}
-      icon={forcePushIcon}
-      onClick={onClick}
-    >
-      {renderAheadBehind(aheadBehind, numTagsToPush)}
-    </ToolbarButton>
-  )
+      '0 0 0 .772-1.228L5.53 1.22a.75.75 0 0 0-1.06 0L.22 5.47A.75.75 0 0 0 0 6zm0 ' +
+      '3a.75.75 0 0 0 1.28.53l2.97-2.97V14a.75.75 0 1 0 1.5 0V6.56l2.97 2.97a.75.75 ' +
+      '0 0 0 1.06-1.06L5.53 4.22a.75.75 0 0 0-1.06 0L.22 8.47A.75.75 0 0 0 0 9z',
+  ],
 }
 
 /**
  * A button which pushes, pulls, or updates depending on the state of the
  * repository.
  */
-export class PushPullButton extends React.Component<IPushPullButtonProps, {}> {
+export class PushPullButton extends React.Component<
+  IPushPullButtonProps,
+  IPushPullButtonState
+> {
+  public constructor(props: IPushPullButtonProps) {
+    super(props)
+    this.state = {
+      screenReaderStateMessage: null,
+      actionInProgress: null,
+    }
+  }
+
+  public componentDidUpdate(prevProps: IPushPullButtonProps) {
+    const progressChanged =
+      (this.props.progress !== null && prevProps.progress == null) ||
+      this.props.progress?.title !== prevProps.progress?.title
+
+    const progressComplete =
+      this.props.progress === null && prevProps.progress !== null
+
+    if (progressChanged) {
+      this.setScreenReaderLoadingStateMessage()
+    }
+
+    if (progressComplete) {
+      this.setState({
+        screenReaderStateMessage: `${
+          this.state.actionInProgress ?? 'Pull, push, or fetch'
+        } complete`,
+        actionInProgress: null,
+      })
+    }
+  }
+
+  private isPullPushFetchProgress(kind: string): kind is ActionInProgress {
+    return kind === 'push' || kind === 'pull' || kind === 'fetch'
+  }
+
+  private setScreenReaderLoadingStateMessage() {
+    const { progress } = this.props
+
+    if (progress === null) {
+      return
+    }
+
+    const { description, title, kind } = progress
+    const screenReaderStateMessage = `${title} ${description ?? 'Hang on…'}`
+    const actionInProgress: ActionInProgress | null =
+      this.state.actionInProgress === null && this.isPullPushFetchProgress(kind)
+        ? kind
+        : this.state.actionInProgress
+
+    this.setState({ screenReaderStateMessage, actionInProgress })
+  }
+
+  /** The common props for all button states */
+  private defaultButtonProps() {
+    return {
+      className: 'push-pull-button',
+      style: ToolbarButtonStyle.Subtitle,
+    }
+  }
+
+  /** The common props for all dropdown states */
+  private defaultDropdownProps(): Omit<
+    IToolbarDropdownProps,
+    'dropdownContentRenderer'
+  > {
+    return {
+      buttonClassName: 'push-pull-button',
+      style: ToolbarButtonStyle.Subtitle,
+      dropdownStyle: ToolbarDropdownStyle.MultiOption,
+      ariaLabel: 'Push, pull, fetch options',
+      dropdownState: this.props.isDropdownOpen ? 'open' : 'closed',
+      enableFocusTrap: this.props.enableFocusTrap,
+      onDropdownStateChanged: this.props.onDropdownStateChanged,
+    }
+  }
+
+  private closeDropdown() {
+    this.props.dispatcher.closeFoldout(FoldoutType.PushPull)
+  }
+
   private push = () => {
+    this.closeDropdown()
     this.props.dispatcher.push(this.props.repository)
   }
 
+  /**
+   * The dropdown focus trap has logic to set the document.ActiveElement to the
+   * html element (in this case the dropdown button) that was clicked to
+   * activate the focus trap. It also has a returnFocusOnDeactivate prop that is
+   * true by default, but can be set to false to prevent this behavior.
+   *
+   * In the case of force push that opens a confirm dialog, we want to set the
+   * focus to the aria live container and therefore we set
+   * returnFocusOnDeactivate to false. We also provided the onDeactivate
+   * callback of the focus trap to set that focus. See more details in
+   * setScreenReaderStateMessageFocus()
+   *
+   * @returns true - (default behavior) if not force push, or if force and confirmation is off
+   * @returns false -if force push and confirmation is on, so we can manage focus ourselves
+   * */
+  private returnFocusOnDeactivate = () => {
+    const isForcePushOptionAvailable =
+      this.props.forcePushBranchState !== ForcePushBranchState.NotAvailable
+
+    return (
+      !isForcePushOptionAvailable || !this.props.askForConfirmationOnForcePush
+    )
+  }
+
+  /**
+   * In the case of force push that opens a confirm dialog, we want to set the
+   * focus to the aria live container and we do so on the onDeactivate callback
+   * of the focus trap to set that focus. Additionally, we set
+   * returnFocusOnDeactivate to false to prevent the dropdowns focus traps
+   * default focus management.  See more details in
+   * setScreenReaderStateMessageFocus()*/
+  private onDropdownFocusTrapDeactivate = () => {
+    if (this.returnFocusOnDeactivate()) {
+      return
+    }
+
+    this.setScreenReaderStateMessageFocus()
+  }
+
+  /**
+   * This is a hack to get the screen reader to read the message after the force
+   * push confirm dialog closes.
+   *
+   * Problem: The dialog component sets the focus back to what ever was in the
+   * `document.ActiveElement` when the dialog was opened. However the active
+   * element is the force push button that is replaced with the fetch button.
+   * Thus, the force push element is no longer present when the dialog closes
+   * and the focus defaults to the document body. This means the sr message is
+   * not read.
+   *
+   * Solution: Set the `document.ActiveElement` to an element containing the sr
+   * element before opening the dialog so that it returns the focus to an
+   * element containing the sr. You can do this by calling the `focus` element
+   * of a tab focusable element hence adding the tab index.
+   *
+   * Other notes: If I set the focus to the sr element directly, it causes the
+   * message to be read twice.
+   */
+  private setScreenReaderStateMessageFocus() {
+    const srElement = document.getElementById('push-pull-button-state')
+    if (srElement) {
+      srElement.tabIndex = -1
+      srElement.focus()
+    }
+  }
+
   private forcePushWithLease = () => {
+    this.closeDropdown()
+
+    this.setScreenReaderStateMessageFocus()
     this.props.dispatcher.confirmOrForcePush(this.props.repository)
+
+    this.setState({ actionInProgress: 'force push' })
   }
 
   private pull = () => {
+    this.closeDropdown()
     this.props.dispatcher.pull(this.props.repository)
   }
 
   private fetch = () => {
+    this.closeDropdown()
+
     this.props.dispatcher.fetch(
       this.props.repository,
       FetchType.UserInitiatedTask
     )
   }
 
+  /**
+   * Handler called when the width of the push/pull button has changed
+   * through an explicit resize event to the given width.
+   *
+   * @param width The new width of resizable button.
+   */
+  private onResize = (width: number) => {
+    this.props.dispatcher.setPushPullButtonWidth(width)
+  }
+
+  /**
+   * Handler called when the resizable push/pull button has been
+   * asked to restore its original width.
+   */
+  private onReset = () => {
+    this.props.dispatcher.resetPushPullButtonWidth()
+  }
+
+  private getDropdownContentRenderer(
+    itemTypes: ReadonlyArray<DropdownItemType>
+  ) {
+    return () => {
+      return (
+        <PushPullButtonDropDown
+          itemTypes={itemTypes}
+          remoteName={this.props.remoteName}
+          fetch={this.fetch}
+          forcePushWithLease={this.forcePushWithLease}
+          askForConfirmationOnForcePush={
+            this.props.askForConfirmationOnForcePush
+          }
+        />
+      )
+    }
+  }
+
   public render() {
+    if (!enableResizingToolbarButtons()) {
+      return (
+        <>
+          {this.renderButton()}
+          <span id="push-pull-button-state">
+            <AriaLiveContainer message={this.state.screenReaderStateMessage} />
+          </span>
+        </>
+      )
+    }
+
+    return (
+      <>
+        <Resizable
+          width={this.props.pushPullButtonWidth.value}
+          onReset={this.onReset}
+          onResize={this.onResize}
+          maximumWidth={this.props.pushPullButtonWidth.max}
+          minimumWidth={this.props.pushPullButtonWidth.min}
+          description="Push pull button"
+        >
+          {this.renderButton()}
+          <span id="push-pull-button-state">
+            <AriaLiveContainer message={this.state.screenReaderStateMessage} />
+          </span>
+        </Resizable>
+      </>
+    )
+  }
+
+  private renderButton() {
     const {
       progress,
       networkActionInProgress,
@@ -329,28 +443,28 @@ export class PushPullButton extends React.Component<IPushPullButtonProps, {}> {
       rebaseInProgress,
       lastFetched,
       pullWithRebase,
-      isForcePush,
+      forcePushBranchState,
     } = this.props
 
     if (progress !== null) {
-      return progressButton(progress, networkActionInProgress)
+      return this.progressButton(progress, networkActionInProgress)
     }
 
     if (remoteName === null) {
-      return publishRepositoryButton(this.push)
+      return this.publishRepositoryButton(this.push)
     }
 
     if (tipState === TipState.Unborn) {
-      return unbornRepositoryButton()
+      return this.unbornRepositoryButton()
     }
 
     if (tipState === TipState.Detached) {
-      return detachedHeadButton(rebaseInProgress)
+      return this.detachedHeadButton(rebaseInProgress)
     }
 
     if (aheadBehind === null) {
       const isGitHubRepository = repository.gitHubRepository !== null
-      return publishBranchButton(
+      return this.publishBranchButton(
         isGitHubRepository,
         this.push,
         this.props.shouldNudge
@@ -360,17 +474,11 @@ export class PushPullButton extends React.Component<IPushPullButtonProps, {}> {
     const { ahead, behind } = aheadBehind
 
     if (ahead === 0 && behind === 0 && numTagsToPush === 0) {
-      return fetchButton(
-        remoteName,
-        aheadBehind,
-        numTagsToPush,
-        lastFetched,
-        this.fetch
-      )
+      return this.fetchButton(remoteName, lastFetched, this.fetch)
     }
 
-    if (isForcePush) {
-      return forcePushButton(
+    if (forcePushBranchState === ForcePushBranchState.Recommended) {
+      return this.forcePushButton(
         remoteName,
         aheadBehind,
         numTagsToPush,
@@ -380,17 +488,18 @@ export class PushPullButton extends React.Component<IPushPullButtonProps, {}> {
     }
 
     if (behind > 0) {
-      return pullButton(
+      return this.pullButton(
         remoteName,
         aheadBehind,
         numTagsToPush,
         lastFetched,
         pullWithRebase || false,
+        forcePushBranchState,
         this.pull
       )
     }
 
-    return pushButton(
+    return this.pushButton(
       remoteName,
       aheadBehind,
       numTagsToPush,
@@ -398,4 +507,193 @@ export class PushPullButton extends React.Component<IPushPullButtonProps, {}> {
       this.push
     )
   }
+
+  private progressButton(progress: Progress, networkActionInProgress: boolean) {
+    return (
+      <ToolbarButton
+        {...this.defaultButtonProps()}
+        title={progress.title}
+        description={progress.description || 'Hang on…'}
+        progressValue={progress.value}
+        icon={syncClockwise}
+        iconClassName={networkActionInProgress ? 'spin' : ''}
+        tooltip={progress.description}
+        disabled={true}
+      />
+    )
+  }
+
+  private publishRepositoryButton(onClick: () => void) {
+    return (
+      <ToolbarButton
+        {...this.defaultButtonProps()}
+        title="Publish repository"
+        description="Publish this repository to GitHub"
+        className="push-pull-button"
+        icon={octicons.upload}
+        style={ToolbarButtonStyle.Subtitle}
+        onClick={onClick}
+      />
+    )
+  }
+
+  private unbornRepositoryButton() {
+    return (
+      <ToolbarButton
+        {...this.defaultButtonProps()}
+        title="Publish branch"
+        description="Cannot publish: no commits"
+        icon={octicons.upload}
+        disabled={true}
+      />
+    )
+  }
+
+  private detachedHeadButton(rebaseInProgress: boolean) {
+    const description = rebaseInProgress
+      ? 'Rebase in progress'
+      : 'Cannot publish detached HEAD'
+
+    return (
+      <ToolbarButton
+        {...this.defaultButtonProps()}
+        title="Publish branch"
+        description={description}
+        icon={octicons.upload}
+        disabled={true}
+      />
+    )
+  }
+
+  private publishBranchButton(
+    isGitHub: boolean,
+    onClick: () => void,
+    shouldNudge: boolean
+  ) {
+    const description = isGitHub
+      ? 'Publish this branch to GitHub'
+      : 'Publish this branch to the remote'
+
+    const className = classNames(
+      this.defaultDropdownProps().className,
+      'nudge-arrow',
+      {
+        'nudge-arrow-up': shouldNudge,
+      }
+    )
+
+    return (
+      <ToolbarDropdown
+        {...this.defaultDropdownProps()}
+        title="Publish branch"
+        description={description}
+        icon={octicons.upload}
+        onClick={onClick}
+        className={className}
+        dropdownContentRenderer={this.getDropdownContentRenderer([
+          DropdownItemType.Fetch,
+        ])}
+      />
+    )
+  }
+
+  private fetchButton(
+    remoteName: string,
+    lastFetched: Date | null,
+    onClick: () => void
+  ) {
+    const title = `Fetch ${remoteName}`
+    return (
+      <ToolbarButton
+        {...this.defaultButtonProps()}
+        title={title}
+        description={renderLastFetched(lastFetched)}
+        icon={syncClockwise}
+        onClick={onClick}
+      />
+    )
+  }
+
+  private pullButton(
+    remoteName: string,
+    aheadBehind: IAheadBehind,
+    numTagsToPush: number,
+    lastFetched: Date | null,
+    pullWithRebase: boolean,
+    forcePushBranchState: ForcePushBranchState,
+    onClick: () => void
+  ) {
+    const title = pullWithRebase
+      ? `Pull ${remoteName} with rebase`
+      : `Pull ${remoteName}`
+
+    const dropdownItemTypes = [DropdownItemType.Fetch]
+
+    if (forcePushBranchState !== ForcePushBranchState.NotAvailable) {
+      dropdownItemTypes.push(DropdownItemType.ForcePush)
+    }
+
+    return (
+      <ToolbarDropdown
+        {...this.defaultDropdownProps()}
+        title={title}
+        description={renderLastFetched(lastFetched)}
+        icon={octicons.arrowDown}
+        onClick={onClick}
+        dropdownContentRenderer={this.getDropdownContentRenderer(
+          dropdownItemTypes
+        )}
+        returnFocusOnDeactivate={this.returnFocusOnDeactivate()}
+        onDropdownFocusTrapDeactivate={this.onDropdownFocusTrapDeactivate}
+      >
+        {renderAheadBehind(aheadBehind, numTagsToPush)}
+      </ToolbarDropdown>
+    )
+  }
+
+  private pushButton(
+    remoteName: string,
+    aheadBehind: IAheadBehind,
+    numTagsToPush: number,
+    lastFetched: Date | null,
+    onClick: () => void
+  ) {
+    return (
+      <ToolbarDropdown
+        {...this.defaultDropdownProps()}
+        title={`Push ${remoteName}`}
+        description={renderLastFetched(lastFetched)}
+        icon={octicons.arrowUp}
+        onClick={onClick}
+        dropdownContentRenderer={this.getDropdownContentRenderer([
+          DropdownItemType.Fetch,
+        ])}
+      >
+        {renderAheadBehind(aheadBehind, numTagsToPush)}
+      </ToolbarDropdown>
+    )
+  }
+
+  private forcePushButton(
+    remoteName: string,
+    aheadBehind: IAheadBehind,
+    numTagsToPush: number,
+    lastFetched: Date | null,
+    onClick: () => void
+  ) {
+    return (
+      <ToolbarDropdown
+        {...this.defaultDropdownProps()}
+        title={`Force push ${remoteName}`}
+        description={renderLastFetched(lastFetched)}
+        icon={forcePushIcon}
+        onClick={onClick}
+        dropdownContentRenderer={this.getDropdownContentRenderer([
+          DropdownItemType.Fetch,
+        ])}
+      >
+        {renderAheadBehind(aheadBehind, numTagsToPush)}
+      </ToolbarDropdown>
+    )
+  }
 }
diff --git a/app/src/ui/toolbar/revert-progress.tsx b/app/src/ui/toolbar/revert-progress.tsx
index ec3ec944d44..9abeb3e50f9 100644
--- a/app/src/ui/toolbar/revert-progress.tsx
+++ b/app/src/ui/toolbar/revert-progress.tsx
@@ -2,28 +2,83 @@ import * as React from 'react'
 import { IRevertProgress } from '../../models/progress'
 import { ToolbarButton, ToolbarButtonStyle } from './button'
 import { syncClockwise } from '../octicons'
+import { enableResizingToolbarButtons } from '../../lib/feature-flag'
+import { Resizable } from '../resizable'
+import { IConstrainedValue } from '../../lib/app-state'
+import { Dispatcher } from '../dispatcher'
 
 interface IRevertProgressProps {
   /** Progress information associated with the current operation */
   readonly progress: IRevertProgress
+
+  /** The width of the resizable push/pull button, as derived from AppState. */
+  readonly width: IConstrainedValue
+
+  /** The global dispatcher, to invoke repository operations. */
+  readonly dispatcher: Dispatcher
 }
 
 /** Display revert progress in the toolbar. */
 export class RevertProgress extends React.Component<IRevertProgressProps, {}> {
+  /**
+   * Handler called when the width of the button has changed
+   * through an explicit resize event to the given width.
+   *
+   * @param width The new width of resizable button.
+   */
+  private onResize = (width: number) => {
+    // The Revert button is rendered instead of the Push/Pull button, so we use it's width
+    this.props.dispatcher.setPushPullButtonWidth(width)
+  }
+
+  /**
+   * Handler called when the resizable button has been
+   * asked to restore its original width.
+   */
+  private onReset = () => {
+    // The Revert button is rendered instead of the Push/Pull button, so we use it's width
+    this.props.dispatcher.resetPushPullButtonWidth()
+  }
+
   public render() {
     const progress = this.props.progress
     const title = progress.title || 'Hang on…'
+
+    if (!enableResizingToolbarButtons()) {
+      return (
+        <ToolbarButton
+          title="Reverting…"
+          description={title}
+          progressValue={progress.value}
+          className="revert-progress"
+          icon={syncClockwise}
+          iconClassName="spin"
+          style={ToolbarButtonStyle.Subtitle}
+          disabled={true}
+        />
+      )
+    }
+
     return (
-      <ToolbarButton
-        title="Reverting…"
-        description={title}
-        progressValue={progress.value}
-        className="revert-progress"
-        icon={syncClockwise}
-        iconClassName="spin"
-        style={ToolbarButtonStyle.Subtitle}
-        disabled={true}
-      />
+      <Resizable
+        width={this.props.width.value}
+        onReset={this.onReset}
+        onResize={this.onResize}
+        maximumWidth={this.props.width.max}
+        minimumWidth={this.props.width.min}
+        description="Revert progress button"
+      >
+        <ToolbarButton
+          title="Reverting…"
+          description={title}
+          progressValue={progress.value}
+          className="revert-progress"
+          icon={syncClockwise}
+          iconClassName="spin"
+          style={ToolbarButtonStyle.Subtitle}
+          disabled={true}
+        />
+      </Resizable>
     )
   }
 }
diff --git a/app/src/ui/tutorial/done.tsx b/app/src/ui/tutorial/done.tsx
index 79421508ef2..4441835a8c3 100644
--- a/app/src/ui/tutorial/done.tsx
+++ b/app/src/ui/tutorial/done.tsx
@@ -5,7 +5,7 @@ import { Dispatcher } from '../dispatcher'
 import { Repository } from '../../models/repository'
 import { PopupType } from '../../models/popup'
 import { Octicon } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import * as octicons from '../octicons/octicons.generated'
 import { SuggestedAction } from '../suggested-actions'
 import { SuggestedActionGroup } from '../suggested-actions'
 
@@ -14,9 +14,9 @@ const ClappingHandsImage = encodePathAsUrl(
   'static/admin-mentoring.svg'
 )
 
-const TelescopeOcticon = <Octicon symbol={OcticonSymbol.telescope} />
-const PlusOcticon = <Octicon symbol={OcticonSymbol.plus} />
-const FileDirectoryOcticon = <Octicon symbol={OcticonSymbol.fileDirectory} />
+const TelescopeOcticon = <Octicon symbol={octicons.telescope} />
+const PlusOcticon = <Octicon symbol={octicons.plus} />
+const FileDirectoryOcticon = <Octicon symbol={octicons.fileDirectory} />
 
 interface ITutorialDoneProps {
   readonly dispatcher: Dispatcher
@@ -25,21 +25,52 @@ interface ITutorialDoneProps {
    * The currently selected repository
    */
   readonly repository: Repository
+
+  /**
+   * If this has not happened, the tuturial completion header will be focused so
+   * that it can be read by screen readers. The purpose of tracking this is so
+   * the focus does not repeatedly get moved to this header if user is navigating
+   * between repositories or history and changes view after completing the tutorial.
+   */
+  readonly tutorialCompletionAnnounced: boolean
+
+  /**
+   * Called when the tutorial completion header has been focused and read by
+   * screen readers
+   */
+  readonly onTutorialCompletionAnnounced: () => void
 }
+
 export class TutorialDone extends React.Component<ITutorialDoneProps, {}> {
+  private header = React.createRef<HTMLHeadingElement>()
+
+  public componentDidMount() {
+    if (this.header.current && !this.props.tutorialCompletionAnnounced) {
+      // Add the header into the tab order so that it can be focused
+      this.header.current.tabIndex = 0
+      this.header.current?.focus()
+      this.props.onTutorialCompletionAnnounced()
+      this.header.current.tabIndex = -1
+    }
+  }
+
   public render() {
     return (
       <div id="tutorial-done">
         <div className="content">
           <div className="header">
             <div className="text">
-              <h1>You're done!</h1>
+              <h1 ref={this.header}>You're done!</h1>
               <p>
                 You’ve learned the basics on how to use GitHub Desktop. Here are
                 some suggestions for what to do next.
               </p>
             </div>
-            <img src={ClappingHandsImage} className="image" />
+            <img
+              src={ClappingHandsImage}
+              className="image"
+              alt="Hands clapping"
+            />
           </div>
           <SuggestedActionGroup>
             <SuggestedAction
diff --git a/app/src/ui/tutorial/tutorial-panel.tsx b/app/src/ui/tutorial/tutorial-panel.tsx
index 326972e09fa..cdf0b7ccdba 100644
--- a/app/src/ui/tutorial/tutorial-panel.tsx
+++ b/app/src/ui/tutorial/tutorial-panel.tsx
@@ -5,7 +5,7 @@ import { Button } from '../lib/button'
 import { Repository } from '../../models/repository'
 import { Dispatcher } from '../dispatcher'
 import { Octicon } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import * as octicons from '../octicons/octicons.generated'
 import {
   ValidTutorialStep,
   TutorialStep,
@@ -17,6 +17,7 @@ import { PreferencesTab } from '../../models/preferences'
 import { Ref } from '../lib/ref'
 import { suggestedExternalEditor } from '../../lib/editors/shared'
 import { TutorialStepInstructions } from './tutorial-step-instruction'
+import { KeyboardShortcut } from '../keyboard-shortcut/keyboard-shortcut'
 
 const TutorialPanelImage = encodePathAsUrl(
   __dirname,
@@ -63,7 +64,16 @@ export class TutorialPanel extends React.Component<
   }
 
   private openPullRequest = () => {
-    this.props.dispatcher.createPullRequest(this.props.repository)
+    // This will cause the tutorial pull request step to close first.
+    this.props.dispatcher.markPullRequestTutorialStepAsComplete(
+      this.props.repository
+    )
+
+    // wait for the tutorial step to close before opening the PR, so that the
+    // focusing of the "You're Done!" header is not interupted.
+    setTimeout(() => {
+      this.props.dispatcher.createPullRequest(this.props.repository)
+    }, 500)
   }
 
   private skipEditorInstall = () => {
@@ -100,7 +110,7 @@ export class TutorialPanel extends React.Component<
       <div className="tutorial-panel-component panel">
         <div className="titleArea">
           <h3>Get started</h3>
-          <img src={TutorialPanelImage} />
+          <img src={TutorialPanelImage} alt="Partially checked check list" />
         </div>
         <ol>
           <TutorialStepInstructions
@@ -144,7 +154,7 @@ export class TutorialPanel extends React.Component<
                 <strong>{this.props.resolvedExternalEditor}</strong>. You can
                 change your preferred editor in{' '}
                 <LinkButton onClick={this.onPreferencesClick}>
-                  {__DARWIN__ ? 'Preferences' : 'options'}
+                  {__DARWIN__ ? 'Settings' : 'options'}
                 </LinkButton>
               </p>
             )}
@@ -163,19 +173,10 @@ export class TutorialPanel extends React.Component<
               clicking "${__DARWIN__ ? 'New Branch' : 'New branch'}".`}
             </p>
             <div className="action">
-              {__DARWIN__ ? (
-                <>
-                  <kbd>⌘</kbd>
-                  <kbd>⇧</kbd>
-                  <kbd>N</kbd>
-                </>
-              ) : (
-                <>
-                  <kbd>Ctrl</kbd>
-                  <kbd>Shift</kbd>
-                  <kbd>N</kbd>
-                </>
-              )}
+              <KeyboardShortcut
+                darwinKeys={['⌘', '⇧', 'N']}
+                keys={['Ctrl', 'Shift', 'N']}
+              />
             </div>
           </TutorialStepInstructions>
           <TutorialStepInstructions
@@ -198,19 +199,10 @@ export class TutorialPanel extends React.Component<
                 <Button onClick={this.openTutorialFileInEditor}>
                   {__DARWIN__ ? 'Open Editor' : 'Open editor'}
                 </Button>
-                {__DARWIN__ ? (
-                  <>
-                    <kbd>⌘</kbd>
-                    <kbd>⇧</kbd>
-                    <kbd>A</kbd>
-                  </>
-                ) : (
-                  <>
-                    <kbd>Ctrl</kbd>
-                    <kbd>Shift</kbd>
-                    <kbd>A</kbd>
-                  </>
-                )}
+                <KeyboardShortcut
+                  darwinKeys={['⌘', '⇧', 'A']}
+                  keys={['Ctrl', 'Shift', 'A']}
+                />
               </div>
             )}
           </TutorialStepInstructions>
@@ -243,17 +235,7 @@ export class TutorialPanel extends React.Component<
               top bar.
             </p>
             <div className="action">
-              {__DARWIN__ ? (
-                <>
-                  <kbd>⌘</kbd>
-                  <kbd>P</kbd>
-                </>
-              ) : (
-                <>
-                  <kbd>Ctrl</kbd>
-                  <kbd>P</kbd>
-                </>
-              )}
+              <KeyboardShortcut darwinKeys={['⌘', 'P']} keys={['Ctrl', 'P']} />
             </div>
           </TutorialStepInstructions>
           <TutorialStepInstructions
@@ -272,21 +254,11 @@ export class TutorialPanel extends React.Component<
               private.
             </p>
             <div className="action">
-              <Button onClick={this.openPullRequest}>
+              <Button onClick={this.openPullRequest} role="link">
                 {__DARWIN__ ? 'Open Pull Request' : 'Open pull request'}
-                <Octicon symbol={OcticonSymbol.linkExternal} />
+                <Octicon symbol={octicons.linkExternal} />
               </Button>
-              {__DARWIN__ ? (
-                <>
-                  <kbd>⌘</kbd>
-                  <kbd>R</kbd>
-                </>
-              ) : (
-                <>
-                  <kbd>Ctrl</kbd>
-                  <kbd>R</kbd>
-                </>
-              )}
+              <KeyboardShortcut darwinKeys={['⌘', 'R']} keys={['Ctrl', 'R']} />
             </div>
           </TutorialStepInstructions>
         </ol>
@@ -306,7 +278,7 @@ export class TutorialPanel extends React.Component<
   private onPreferencesClick = () => {
     this.props.dispatcher.showPopup({
       type: PopupType.Preferences,
-      initialSelectedTab: PreferencesTab.Advanced,
+      initialSelectedTab: PreferencesTab.Integrations,
     })
   }
 }
diff --git a/app/src/ui/tutorial/tutorial-step-instruction.tsx b/app/src/ui/tutorial/tutorial-step-instruction.tsx
index 25f7a0668e2..43e727f1312 100644
--- a/app/src/ui/tutorial/tutorial-step-instruction.tsx
+++ b/app/src/ui/tutorial/tutorial-step-instruction.tsx
@@ -1,10 +1,12 @@
+/* eslint-disable jsx-a11y/no-noninteractive-element-interactions */
+/* eslint-disable jsx-a11y/click-events-have-key-events */
 import * as React from 'react'
 import {
   ValidTutorialStep,
   orderedTutorialSteps,
 } from '../../models/tutorial-step'
 import { Octicon } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import * as octicons from '../octicons/octicons.generated'
 
 interface ITutorialStepInstructionsProps {
   /** Text displayed to summarize this step */
@@ -56,7 +58,7 @@ export class TutorialStepInstructions extends React.Component<ITutorialStepInstr
           {shouldShowSkipLink ? (
             this.props.skipLinkButton
           ) : (
-            <Octicon symbol={OcticonSymbol.chevronDown} />
+            <Octicon symbol={octicons.chevronDown} />
           )}
         </span>
       </summary>
@@ -67,7 +69,7 @@ export class TutorialStepInstructions extends React.Component<ITutorialStepInstr
     if (this.props.isComplete(this.props.sectionId)) {
       return (
         <div className="green-circle">
-          <Octicon symbol={OcticonSymbol.check} />
+          <Octicon symbol={octicons.check} />
         </div>
       )
     }
diff --git a/app/src/ui/tutorial/welcome.tsx b/app/src/ui/tutorial/welcome.tsx
index 16d3b013467..9e3bdc2e95a 100644
--- a/app/src/ui/tutorial/welcome.tsx
+++ b/app/src/ui/tutorial/welcome.tsx
@@ -25,20 +25,23 @@ export class TutorialWelcome extends React.Component {
         </div>
         <ul className="definitions">
           <li>
-            <img src={CodeImage} />
+            <img src={CodeImage} alt="Html syntax icon" />
             <p>
               <strong>Git</strong> is the version control system.
             </p>
           </li>
           <li>
-            <img src={TeamDiscussionImage} />
+            <img
+              src={TeamDiscussionImage}
+              alt="People with discussion bubbles overhead"
+            />
             <p>
               <strong>GitHub</strong> is where you store your code and
               collaborate with others.
             </p>
           </li>
           <li>
-            <img src={CloudServerImage} />
+            <img src={CloudServerImage} alt="Server stack with cloud" />
             <p>
               <strong>GitHub Desktop</strong> helps you work with GitHub
               locally.
diff --git a/app/src/ui/ui-view.tsx b/app/src/ui/ui-view.tsx
index 2fdfd740322..8a3440f4c02 100644
--- a/app/src/ui/ui-view.tsx
+++ b/app/src/ui/ui-view.tsx
@@ -1,6 +1,11 @@
 import * as React from 'react'
 import classNames from 'classnames'
 
+interface IUIViewProps {
+  readonly id: string
+  readonly className?: string
+}
+
 /**
  * High order component for housing a View.
  *
@@ -14,11 +19,15 @@ import classNames from 'classnames'
  * Examples of what's not a View include the Changes and History tabs
  * as these are contained within the <Repository /> view
  */
-export class UiView extends React.Component<React.HTMLProps<HTMLDivElement>> {
+export class UiView extends React.Component<IUIViewProps> {
   public render() {
-    const className = classNames(this.props.className, 'ui-view')
-    const props = { ...this.props, className }
+    const { id, className, children } = this.props
+    const cn = classNames(className, 'ui-view')
 
-    return <div {...props}>{this.props.children}</div>
+    return (
+      <div id={id} className={cn}>
+        {children}
+      </div>
+    )
   }
 }
diff --git a/app/src/ui/undo/warn-local-changes-before-undo.tsx b/app/src/ui/undo/warn-local-changes-before-undo.tsx
index cb0d49f85a3..78e71427bd0 100644
--- a/app/src/ui/undo/warn-local-changes-before-undo.tsx
+++ b/app/src/ui/undo/warn-local-changes-before-undo.tsx
@@ -3,6 +3,7 @@ import { Dialog, DialogContent, DialogFooter } from '../dialog'
 import { Repository } from '../../models/repository'
 import { Dispatcher } from '../dispatcher'
 import { Row } from '../lib/row'
+import { Checkbox, CheckboxValue } from '../lib/checkbox'
 import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group'
 import { Commit } from '../../models/commit'
 
@@ -11,11 +12,13 @@ interface IWarnLocalChangesBeforeUndoProps {
   readonly repository: Repository
   readonly commit: Commit
   readonly isWorkingDirectoryClean: boolean
+  readonly confirmUndoCommit: boolean
   readonly onDismissed: () => void
 }
 
 interface IWarnLocalChangesBeforeUndoState {
   readonly isLoading: boolean
+  readonly confirmUndoCommit: boolean
 }
 
 /**
@@ -28,7 +31,10 @@ export class WarnLocalChangesBeforeUndo extends React.Component<
 > {
   public constructor(props: IWarnLocalChangesBeforeUndoProps) {
     super(props)
-    this.state = { isLoading: false }
+    this.state = {
+      isLoading: false,
+      confirmUndoCommit: props.confirmUndoCommit,
+    }
   }
 
   public render() {
@@ -43,10 +49,10 @@ export class WarnLocalChangesBeforeUndo extends React.Component<
         disabled={this.state.isLoading}
         onSubmit={this.onSubmit}
         onDismissed={this.props.onDismissed}
+        role="alertdialog"
+        ariaDescribedBy="undo-warning-message"
       >
-        <DialogContent>
-          <Row>{this.getWarningText()}</Row>
-        </DialogContent>
+        {this.getWarningDialog()}
         <DialogFooter>
           <OkCancelButtonGroup destructive={true} okButtonText="Continue" />
         </DialogFooter>
@@ -54,40 +60,50 @@ export class WarnLocalChangesBeforeUndo extends React.Component<
     )
   }
 
-  private getWarningText() {
-    if (
-      this.props.commit.isMergeCommit &&
-      !this.props.isWorkingDirectoryClean
-    ) {
-      return (
-        <>
-          You have changes in progress. Undoing the merge commit might result in
-          some of these changes being lost.
-          <br />
-          <br />
-          {this.getMergeCommitUndoWarningText()}
-          <br />
-          <br />
-          Do you want to continue anyway?
-        </>
-      )
-    } else if (this.props.commit.isMergeCommit) {
-      return (
-        <>
-          {this.getMergeCommitUndoWarningText()}
-          <br />
-          <br />
-          Do you want to continue anyway?
-        </>
-      )
-    } else {
-      return (
-        <>
+  private getWarningDialog() {
+    if (this.props.commit.isMergeCommit) {
+      return this.getMergeCommitWarningDialog()
+    }
+    return (
+      <DialogContent>
+        <Row id="undo-warning-message">
           You have changes in progress. Undoing the commit might result in some
           of these changes being lost. Do you want to continue anyway?
-        </>
+        </Row>
+        <Row>
+          <Checkbox
+            label="Do not show this message again"
+            value={
+              this.state.confirmUndoCommit
+                ? CheckboxValue.Off
+                : CheckboxValue.On
+            }
+            onChange={this.onConfirmUndoCommitChanged}
+          />
+        </Row>
+      </DialogContent>
+    )
+  }
+
+  private getMergeCommitWarningDialog() {
+    if (this.props.isWorkingDirectoryClean) {
+      return (
+        <DialogContent>
+          <p>{this.getMergeCommitUndoWarningText()}</p>
+          <p>Do you want to continue anyway?</p>
+        </DialogContent>
       )
     }
+    return (
+      <DialogContent>
+        <p>
+          You have changes in progress. Undoing the merge commit might result in
+          some of these changes being lost.
+        </p>
+        <p>{this.getMergeCommitUndoWarningText()}</p>
+        <p>Do you want to continue anyway?</p>
+      </DialogContent>
+    )
   }
 
   private getMergeCommitUndoWarningText() {
@@ -102,6 +118,7 @@ export class WarnLocalChangesBeforeUndo extends React.Component<
     this.setState({ isLoading: true })
 
     try {
+      dispatcher.setConfirmUndoCommitSetting(this.state.confirmUndoCommit)
       await dispatcher.undoCommit(repository, commit, false)
     } finally {
       this.setState({ isLoading: false })
@@ -109,4 +126,12 @@ export class WarnLocalChangesBeforeUndo extends React.Component<
 
     onDismissed()
   }
+
+  private onConfirmUndoCommitChanged = (
+    event: React.FormEvent<HTMLInputElement>
+  ) => {
+    const value = !event.currentTarget.checked
+
+    this.setState({ confirmUndoCommit: value })
+  }
 }
diff --git a/app/src/ui/unknown-authors/unknown-authors-dialog.tsx b/app/src/ui/unknown-authors/unknown-authors-dialog.tsx
new file mode 100644
index 00000000000..99ef2961842
--- /dev/null
+++ b/app/src/ui/unknown-authors/unknown-authors-dialog.tsx
@@ -0,0 +1,79 @@
+import * as React from 'react'
+
+import { Dialog, DialogContent, DialogFooter } from '../dialog'
+import { PathText } from '../lib/path-text'
+import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group'
+import { UnknownAuthor } from '../../models/author'
+
+interface IUnknownAuthorsProps {
+  readonly authors: ReadonlyArray<UnknownAuthor>
+  readonly onCommit: () => void
+  readonly onDismissed: () => void
+}
+
+/**
+ * Don't list more than this number of authors.
+ */
+const MaxAuthorsToList = 10
+
+/** A component to confirm commit when unknown co-authors were added. */
+export class UnknownAuthors extends React.Component<IUnknownAuthorsProps> {
+  public constructor(props: IUnknownAuthorsProps) {
+    super(props)
+  }
+
+  public render() {
+    return (
+      <Dialog
+        id="unknown-authors"
+        title={__DARWIN__ ? 'Unknown Co-Authors' : 'Unknown co-authors'}
+        onDismissed={this.props.onDismissed}
+        onSubmit={this.commit}
+        type="warning"
+      >
+        <DialogContent>{this.renderAuthorList()}</DialogContent>
+
+        <DialogFooter>
+          <OkCancelButtonGroup
+            destructive={true}
+            okButtonText={__DARWIN__ ? 'Commit Anyway' : 'Commit anyway'}
+          />
+        </DialogFooter>
+      </Dialog>
+    )
+  }
+
+  private renderAuthorList() {
+    if (this.props.authors.length > MaxAuthorsToList) {
+      return (
+        <p>
+          {this.props.authors.length} users weren't found and won't be added as
+          co-authors of this commit. Are you sure you want to commit?
+        </p>
+      )
+    } else {
+      return (
+        <div>
+          <p>
+            These users weren't found and won't be added as co-authors of this
+            commit. Are you sure you want to commit?
+          </p>
+          <div className="author-list">
+            <ul>
+              {this.props.authors.map(a => (
+                <li key={a.username}>
+                  <PathText path={a.username} />
+                </li>
+              ))}
+            </ul>
+          </div>
+        </div>
+      )
+    }
+  }
+
+  private commit = async () => {
+    this.props.onCommit()
+    this.props.onDismissed()
+  }
+}
diff --git a/app/src/ui/welcome/configure-git.tsx b/app/src/ui/welcome/configure-git.tsx
index 60adb54ae84..533d0fa1536 100644
--- a/app/src/ui/welcome/configure-git.tsx
+++ b/app/src/ui/welcome/configure-git.tsx
@@ -14,7 +14,7 @@ interface IConfigureGitProps {
 export class ConfigureGit extends React.Component<IConfigureGitProps, {}> {
   public render() {
     return (
-      <div id="configure-git">
+      <section id="configure-git" aria-label="Configure Git">
         <h1 className="welcome-title">Configure Git</h1>
         <p className="welcome-text">
           This is used to identify the commits you create. Anyone will be able
@@ -28,7 +28,7 @@ export class ConfigureGit extends React.Component<IConfigureGitProps, {}> {
         >
           <Button onClick={this.cancel}>Cancel</Button>
         </ConfigureGitUser>
-      </div>
+      </section>
     )
   }
 
diff --git a/app/src/ui/welcome/sign-in-enterprise.tsx b/app/src/ui/welcome/sign-in-enterprise.tsx
index 696294043fa..3a71a1f0a2c 100644
--- a/app/src/ui/welcome/sign-in-enterprise.tsx
+++ b/app/src/ui/welcome/sign-in-enterprise.tsx
@@ -24,13 +24,16 @@ export class SignInEnterprise extends React.Component<
     }
 
     return (
-      <div id="sign-in-enterprise">
+      <section
+        id="sign-in-enterprise"
+        aria-label="Sign in to your GitHub Enterprise"
+      >
         <h1 className="welcome-title">Sign in to your GitHub Enterprise</h1>
 
         <SignIn signInState={state} dispatcher={this.props.dispatcher}>
           <Button onClick={this.cancel}>Cancel</Button>
         </SignIn>
-      </div>
+      </section>
     )
   }
 
diff --git a/app/src/ui/welcome/start.tsx b/app/src/ui/welcome/start.tsx
index 625b6b29d3d..7669398fee4 100644
--- a/app/src/ui/welcome/start.tsx
+++ b/app/src/ui/welcome/start.tsx
@@ -3,7 +3,7 @@ import { WelcomeStep } from './welcome'
 import { LinkButton } from '../lib/link-button'
 import { Dispatcher } from '../dispatcher'
 import { Octicon } from '../octicons'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import * as octicons from '../octicons/octicons.generated'
 import { Button } from '../lib/button'
 import { Loading } from '../lib/loading'
 import { BrowserRedirectMessage } from '../lib/authentication-form'
@@ -26,15 +26,49 @@ interface IStartProps {
 export class Start extends React.Component<IStartProps, {}> {
   public render() {
     return (
-      <div id="start">
-        <h1 className="welcome-title">Welcome to GitHub&nbsp;Desktop</h1>
-        {!this.props.loadingBrowserAuth ? (
-          <>
-            <p className="welcome-text">
-              GitHub Desktop is a seamless way to contribute to projects on
-              GitHub and GitHub Enterprise. Sign in below to get started with
-              your existing projects.
-            </p>
+      <section
+        id="start"
+        aria-label="Welcome to GitHub Desktop"
+        aria-describedby="start-description"
+      >
+        <div className="start-content">
+          <h1 className="welcome-title">
+            Welcome to <span>GitHub Desktop</span>
+          </h1>
+          {!this.props.loadingBrowserAuth ? (
+            <>
+              <p id="start-description" className="welcome-text">
+                GitHub Desktop is a seamless way to contribute to projects on
+                GitHub and GitHub Enterprise. Sign in below to get started with
+                your existing projects.
+              </p>
+            </>
+          ) : (
+            <p>{BrowserRedirectMessage}</p>
+          )}
+
+          <div className="welcome-main-buttons">
+            <Button
+              type="submit"
+              className="button-with-icon"
+              disabled={this.props.loadingBrowserAuth}
+              onClick={this.signInWithBrowser}
+              autoFocus={true}
+              role="link"
+            >
+              {this.props.loadingBrowserAuth && <Loading />}
+              Sign in to GitHub.com
+              <Octicon symbol={octicons.linkExternal} />
+            </Button>
+            {this.props.loadingBrowserAuth ? (
+              <Button onClick={this.cancelBrowserAuth}>Cancel</Button>
+            ) : (
+              <Button onClick={this.signInToEnterprise}>
+                Sign in to GitHub Enterprise
+              </Button>
+            )}
+          </div>
+          <div className="skip-action-container">
             <p className="welcome-text">
               New to GitHub?{' '}
               <LinkButton
@@ -44,51 +78,32 @@ export class Start extends React.Component<IStartProps, {}> {
                 Create your free account.
               </LinkButton>
             </p>
-          </>
-        ) : (
-          <p>{BrowserRedirectMessage}</p>
-        )}
-
-        <div className="welcome-main-buttons">
-          <Button
-            type="submit"
-            className="button-with-icon"
-            disabled={this.props.loadingBrowserAuth}
-            onClick={this.signInWithBrowser}
-          >
-            {this.props.loadingBrowserAuth && <Loading />}
-            Sign in to GitHub.com
-            <Octicon symbol={OcticonSymbol.linkExternal} />
-          </Button>
-          {this.props.loadingBrowserAuth ? (
-            <Button onClick={this.cancelBrowserAuth}>Cancel</Button>
-          ) : (
-            <Button onClick={this.signInToEnterprise}>
-              Sign in to GitHub Enterprise
-            </Button>
-          )}
-        </div>
-        <div className="skip-action-container">
-          <LinkButton className="skip-button" onClick={this.skip}>
-            Skip this step
-          </LinkButton>
+            <LinkButton className="skip-button" onClick={this.skip}>
+              Skip this step
+            </LinkButton>
+          </div>
         </div>
-        <div className="welcome-start-disclaimer-container">
-          By creating an account, you agree to the{' '}
-          <LinkButton uri={'https://github.com/site/terms'}>
-            Terms of Service
-          </LinkButton>
-          . For more information about GitHub's privacy practices, see the{' '}
-          <LinkButton uri={'https://github.com/site/privacy'}>
-            GitHub Privacy Statement
-          </LinkButton>
-          .<br />
-          <br />
-          GitHub Desktop sends usage metrics to improve the product and inform
-          feature decisions. Read more about what metrics are sent and how we
-          use them <LinkButton uri={SamplesURL}>here</LinkButton>.
+
+        <div className="start-footer">
+          <p>
+            By creating an account, you agree to the{' '}
+            <LinkButton uri={'https://github.com/site/terms'}>
+              Terms of Service
+            </LinkButton>
+            . For more information about GitHub's privacy practices, see the{' '}
+            <LinkButton uri={'https://github.com/site/privacy'}>
+              GitHub Privacy Statement.
+            </LinkButton>
+          </p>
+          <p>
+            GitHub Desktop sends usage metrics to improve the product and inform
+            feature decisions.{' '}
+            <LinkButton uri={SamplesURL}>
+              Learn more about user metrics.
+            </LinkButton>
+          </p>
         </div>
-      </div>
+      </section>
     )
   }
 
diff --git a/app/src/ui/welcome/welcome.tsx b/app/src/ui/welcome/welcome.tsx
index a81b2281ebe..ccbe952d443 100644
--- a/app/src/ui/welcome/welcome.tsx
+++ b/app/src/ui/welcome/welcome.tsx
@@ -21,7 +21,6 @@ export enum WelcomeStep {
 
 interface IWelcomeProps {
   readonly dispatcher: Dispatcher
-  readonly optOut: boolean
   readonly accounts: ReadonlyArray<Account>
   readonly signInState: SignInState | null
 }
@@ -203,16 +202,21 @@ export class Welcome extends React.Component<IWelcomeProps, IWelcomeState> {
         <div className="welcome-left">
           <div className="welcome-content">
             {this.getComponentForCurrentStep()}
-            <img className="welcome-graphic-top" src={WelcomeLeftTopImageUri} />
+            <img
+              className="welcome-graphic-top"
+              src={WelcomeLeftTopImageUri}
+              alt=""
+            />
             <img
               className="welcome-graphic-bottom"
               src={WelcomeLeftBottomImageUri}
+              alt=""
             />
           </div>
         </div>
 
         <div className="welcome-right">
-          <img className="welcome-graphic" src={WelcomeRightImageUri} />
+          <img className="welcome-graphic" src={WelcomeRightImageUri} alt="" />
         </div>
       </UiView>
     )
diff --git a/app/src/ui/window/full-screen-info.tsx b/app/src/ui/window/full-screen-info.tsx
index 671e9269f36..6c09cb3b83b 100644
--- a/app/src/ui/window/full-screen-info.tsx
+++ b/app/src/ui/window/full-screen-info.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react'
 import { TransitionGroup, CSSTransition } from 'react-transition-group'
 import { WindowState } from '../../lib/window-state'
+import { KeyboardShortcut } from '../keyboard-shortcut/keyboard-shortcut'
 
 interface IFullScreenInfoProps {
   readonly windowState: WindowState | null
@@ -143,8 +144,6 @@ export class FullScreenInfo extends React.Component<
       return null
     }
 
-    const kbdShortcut = __DARWIN__ ? '⌃⌘F' : 'F11'
-
     return (
       <CSSTransition
         classNames="toast-animation"
@@ -154,7 +153,8 @@ export class FullScreenInfo extends React.Component<
         timeout={toastTransitionTimeout}
       >
         <div key="notification" className="toast-notification">
-          Press <kbd>{kbdShortcut}</kbd> to exit fullscreen
+          Press <KeyboardShortcut darwinKeys={['^', '⌘', 'F']} keys={['F11']} />{' '}
+          to exit fullscreen
         </div>
       </CSSTransition>
     )
diff --git a/app/src/ui/window/title-bar.tsx b/app/src/ui/window/title-bar.tsx
index 06ce23af472..b6fe9b7c041 100644
--- a/app/src/ui/window/title-bar.tsx
+++ b/app/src/ui/window/title-bar.tsx
@@ -3,7 +3,7 @@ import memoizeOne from 'memoize-one'
 import { WindowState } from '../../lib/window-state'
 import { WindowControls } from './window-controls'
 import { Octicon } from '../octicons/octicon'
-import * as OcticonSymbol from '../octicons/octicons.generated'
+import * as octicons from '../octicons/octicons.generated'
 import { isMacOSBigSurOrLater } from '../../lib/get-os'
 import {
   getAppleActionOnDoubleClick,
@@ -103,7 +103,7 @@ export class TitleBar extends React.Component<ITitleBarProps> {
       this.props.titleBarStyle === 'light' ? 'light-title-bar' : ''
 
     const appIcon = this.props.showAppIcon ? (
-      <Octicon className="app-icon" symbol={OcticonSymbol.markGithub} />
+      <Octicon className="app-icon" symbol={octicons.markGithub} />
     ) : null
 
     const onTitlebarDoubleClick = __DARWIN__
diff --git a/app/src/ui/window/window-controls.tsx b/app/src/ui/window/window-controls.tsx
index b9f888481ce..a98aef33062 100644
--- a/app/src/ui/window/window-controls.tsx
+++ b/app/src/ui/window/window-controls.tsx
@@ -9,6 +9,7 @@ import {
   restoreWindow,
 } from '../main-process-proxy'
 import * as ipcRenderer from '../../lib/ipc-renderer'
+import { Button } from '../lib/button'
 
 // These paths are all drawn to a 10x10 view box and replicate the symbols
 // seen on Windows 10 window controls.
@@ -96,17 +97,19 @@ export class WindowControls extends React.Component<{}, IWindowControlState> {
     const title = name[0].toUpperCase() + name.substring(1)
 
     return (
-      <button
-        aria-label={name}
-        title={title}
+      <Button
+        ariaLabel={title}
+        ariaHidden={true}
         tabIndex={-1}
         className={className}
         onClick={onClick}
+        tooltip={title}
+        tooltipClassName="window-controls-tooltip"
       >
         <svg aria-hidden="true" version="1.1" width="10" height="10">
           <path d={path} />
         </svg>
-      </button>
+      </Button>
     )
   }
 
diff --git a/app/src/ui/workflow-push-rejected/workflow-push-rejected.tsx b/app/src/ui/workflow-push-rejected/workflow-push-rejected.tsx
index 3e2de15f1ce..ec946859113 100644
--- a/app/src/ui/workflow-push-rejected/workflow-push-rejected.tsx
+++ b/app/src/ui/workflow-push-rejected/workflow-push-rejected.tsx
@@ -4,7 +4,7 @@ import { Dispatcher } from '../dispatcher'
 import { Ref } from '../lib/ref'
 import { RepositoryWithGitHubRepository } from '../../models/repository'
 import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group'
-import { getDotComAPIEndpoint } from '../../lib/api'
+import { SignInResult } from '../../lib/stores'
 
 const okButtonText = __DARWIN__ ? 'Continue in Browser' : 'Continue in browser'
 
@@ -65,16 +65,14 @@ export class WorkflowPushRejectedDialog extends React.Component<
     const { repository, dispatcher } = this.props
     const { endpoint } = repository.gitHubRepository
 
-    if (endpoint === getDotComAPIEndpoint()) {
-      await dispatcher.beginDotComSignIn()
-    } else {
-      await dispatcher.beginEnterpriseSignIn()
-      await dispatcher.setSignInEndpoint(endpoint)
-    }
+    const result = await new Promise<SignInResult>(async resolve => {
+      dispatcher.beginBrowserBasedSignIn(endpoint, resolve)
+    })
 
-    await dispatcher.requestBrowserAuthentication()
+    if (result.kind === 'success') {
+      dispatcher.push(repository)
+    }
 
-    dispatcher.push(repository)
     this.props.onDismissed()
   }
 }
diff --git a/app/static/common/choosealicense.com b/app/static/common/choosealicense.com
index d4edd144873..aed28f9933c 160000
--- a/app/static/common/choosealicense.com
+++ b/app/static/common/choosealicense.com
@@ -1 +1 @@
-Subproject commit d4edd14487305505af3eab98e364b9d2a86c5eec
+Subproject commit aed28f9933c9e8435c0f1d07aa563c0a830859bc
diff --git a/app/static/common/ghd_dark.svg b/app/static/common/ghd_dark.svg
new file mode 100644
index 00000000000..5b9a1164f23
--- /dev/null
+++ b/app/static/common/ghd_dark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="228" height="120" fill="none"><g clip-path="url(#a)"><path fill="#25292E" d="M0 0h228v120H0V0Z"/><path fill="#2E5B30" d="M233 21H49v12h184V21ZM233 33H49v12h184V33Z" opacity=".3"/><path fill="#681C1C" d="M233 45H49v12h184V45ZM233 57H49v12h184V57Z" opacity=".3"/><path fill="#1E2125" d="M0 0h228v21H0z"/><rect width="28" height="3" x="15" y="6" fill="#4B535D" rx="1.5"/><rect width="28" height="3" x="15" y="11" fill="#4B535D" rx="1.5"/><rect width="6" height="6" x="5" y="7" fill="#4B535D" rx="3"/><rect width="28" height="3" x="65" y="6" fill="#4B535D" rx="1.5"/><rect width="28" height="3" x="65" y="11" fill="#4B535D" rx="1.5"/><rect width="6" height="6" x="55" y="7" fill="#4B535D" rx="3"/><rect width="28" height="3" x="115" y="6" fill="#4B535D" rx="1.5"/><rect width="28" height="3" x="115" y="11" fill="#4B535D" rx="1.5"/><rect width="6" height="6" x="105" y="7" fill="#4B535D" rx="3"/><path fill="#1E2125" d="M0 88h49v32H0z"/><rect width="42" height="5" x="3" y="90" fill="#121212" rx="2"/><rect width="42" height="5" x="3" y="25" fill="#4B535D" rx="2"/><rect width="42" height="5" x="3" y="31" fill="#4B535D" rx="2"/><rect width="42" height="5" x="3" y="37" fill="#4B535D" rx="2"/><rect width="42" height="14" x="3" y="97" fill="#121212" rx="2"/><rect width="42" height="5" x="3" y="113" fill="#2B64CF" rx="2"/><path fill="#1E2125" d="M48 21h1v99h-1z"/><rect width="105" height="7" x="53" y="35" fill="#2E5B30" rx="3.5"/><rect width="55" height="7" x="53" y="47" fill="#681C1C" rx="3.5"/><rect width="76" height="7" x="53" y="59" fill="#681C1C" rx="3.5"/><rect width="55" height="6" x="54" y="24" fill="#2E5B30" rx="3"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h228v120H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/app/static/common/ghd_light.svg b/app/static/common/ghd_light.svg
new file mode 100644
index 00000000000..94bf1ab30f6
--- /dev/null
+++ b/app/static/common/ghd_light.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="228" height="120" fill="none"><g clip-path="url(#a)"><path fill="#fff" d="M0 0h228v120H0V0Z"/><path fill="#34D058" d="M233 21H49v12h184V21ZM233 33H49v12h184V33Z" opacity=".3"/><path fill="#D73A49" d="M233 45H49v12h184V45ZM233 57H49v12h184V57Z" opacity=".3"/><path fill="#1E2125" d="M0 0h228v21H0z"/><rect width="28" height="3" x="15" y="6" fill="#4B535D" rx="1.5"/><rect width="28" height="3" x="15" y="11" fill="#4B535D" rx="1.5"/><rect width="6" height="6" x="5" y="7" fill="#4B535D" rx="3"/><rect width="28" height="3" x="65" y="6" fill="#4B535D" rx="1.5"/><rect width="28" height="3" x="65" y="11" fill="#4B535D" rx="1.5"/><rect width="6" height="6" x="55" y="7" fill="#4B535D" rx="3"/><rect width="28" height="3" x="115" y="6" fill="#4B535D" rx="1.5"/><rect width="28" height="3" x="115" y="11" fill="#4B535D" rx="1.5"/><rect width="6" height="6" x="105" y="7" fill="#4B535D" rx="3"/><path fill="#F6F8FA" d="M0 88h49v32H0z"/><rect width="41" height="4" x="3.5" y="90.5" fill="#fff" stroke="#D9D9D9" rx="1.5"/><rect width="42" height="5" x="3" y="25" fill="#D1D5DA" rx="2"/><rect width="42" height="5" x="3" y="31" fill="#D1D5DA" rx="2"/><rect width="42" height="5" x="3" y="37" fill="#D1D5DA" rx="2"/><rect width="41" height="13" x="3.5" y="97.5" fill="#fff" stroke="#D9D9D9" rx="1.5"/><rect width="42" height="5" x="3" y="113" fill="#2B64CF" rx="2"/><path fill="#D9D9D9" d="M48 21h1v99h-1z"/><rect width="105" height="7" x="53" y="35" fill="#34D058" rx="3.5"/><rect width="55" height="7" x="53" y="47" fill="#D73A49" rx="3.5"/><rect width="76" height="7" x="53" y="59" fill="#D73A49" rx="3.5"/><rect width="55" height="6" x="54" y="24" fill="#34D058" rx="3"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h228v120H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/app/static/common/gitignore b/app/static/common/gitignore
index e89e0439043..4488915eec0 160000
--- a/app/static/common/gitignore
+++ b/app/static/common/gitignore
@@ -1 +1 @@
-Subproject commit e89e04390435f1e7628740d7b4ce1fe65ac218fd
+Subproject commit 4488915eec0b3a45b5c63ead28f286819c0917de
diff --git a/app/static/common/release-note-header-right.svg b/app/static/common/release-note-header-right.svg
index 6340e3eaa69..2d82e031492 100644
--- a/app/static/common/release-note-header-right.svg
+++ b/app/static/common/release-note-header-right.svg
@@ -11,10 +11,12 @@
             <path d="M111.535,13.767 C111.535,13.3436424 111.191358,13 110.767,13 C110.343549,13 110,13.343736 110,13.767 C110,14.1911704 110.343455,14.535 110.767,14.535 C111.191451,14.535 111.535,14.1912641 111.535,13.767 Z M112.535,13.767 C112.535,14.7434269 111.743858,15.535 110.767,15.535 C109.790926,15.535 109,14.7432113 109,13.767 C109,12.7915732 109.791142,12 110.767,12 C111.743642,12 112.535,12.7913576 112.535,13.767 Z" fill="#C9DEF2"></path>
             <path d="M88.5,67.5 L90,67.5 L90,68.5 L88.5,68.5 L88.5,70 L87.5,70 L87.5,68.5 L86,68.5 L86,67.5 L87.5,67.5 L87.5,66 L88.5,66 L88.5,67.5 Z" fill="#C9DEF2"></path>
             <path d="M142.016,72.008 C142.016,71.4517457 141.564461,71 141.008,71 C140.452142,71 140,71.4521424 140,72.008 C140,72.5644611 140.451746,73.016 141.008,73.016 C141.564858,73.016 142.016,72.5648576 142.016,72.008 Z M143.016,72.008 C143.016,73.1171424 142.117142,74.016 141.008,74.016 C139.899563,74.016 139,73.1168484 139,72.008 C139,70.8998576 139.899858,70 141.008,70 C142.116848,70 143.016,70.8995635 143.016,72.008 Z" fill="#C9DEF2"></path>
-            <path d="M139.005775,42.9942247 L138,41.1551784 L136.994225,42.9942247 L135.155178,44 L136.994225,45.0057753 L138,46.8448216 L139.005775,45.0057753 L140.844822,44 L139.005775,42.9942247 Z M143,44 L139.76773,45.76773 L138,49 L136.23227,45.76773 L133,44 L136.23227,42.23227 L138,39 L139.76773,42.23227 L143,44 Z M139.840401,42.3651471 L139.634853,42.1595994 L139.76773,42.23227 L139.840401,42.3651471 Z" fill="#C9DEF2"></path>
+            <g transform="translate(0 -30)">
+              <path d="M139.005775,42.9942247 L138,41.1551784 L136.994225,42.9942247 L135.155178,44 L136.994225,45.0057753 L138,46.8448216 L139.005775,45.0057753 L140.844822,44 L139.005775,42.9942247 Z M143,44 L139.76773,45.76773 L138,49 L136.23227,45.76773 L133,44 L136.23227,42.23227 L138,39 L139.76773,42.23227 L143,44 Z M139.840401,42.3651471 L139.634853,42.1595994 L139.76773,42.23227 L139.840401,42.3651471 Z" fill="#C9DEF2"></path>
+            </g>
             <path d="M121.720444,54.279556 L120,51.133748 L118.279556,54.279556 L115.133748,56 L118.279556,57.7204439 L120,60.866252 L121.720444,57.7204439 L124.866252,56 L121.720444,54.279556 Z M127,56 L122.474822,58.474822 L120,63 L117.525178,58.474822 L113,56 L117.525178,53.5251779 L120,49 L122.474822,53.5251779 L127,56 Z" fill="#C9DEF2"></path>
             <path d="M54.9691035,34.7254742 L54.8077827,34.7497316 C54.2456747,34.7497316 53.8735538,34.2535704 54.1248747,33.7582603 L56.1367154,28.3271151 L50.7837495,30.3069791 C50.2969392,30.6317304 49.7118643,30.127811 49.7118643,29.6538132 L49.7361217,29.4924924 L49.8405926,29.152962 C47.8413546,29.9129289 45.548494,31.1836039 43.9956645,32.7364334 C41.5883951,35.1437028 41.4347631,38.326082 43.7430329,40.6343592 C46.0517046,42.9430308 49.3162163,42.7865132 51.6409513,40.3817283 C53.1615432,38.8611307 54.4115747,36.6309139 55.1764325,34.6616807 L54.9691035,34.7254742 Z M50.4436278,28.9291509 C50.4705976,28.928755 50.495846,28.9230435 50.5180916,28.9110555 C50.5057008,28.9151858 50.4932927,28.9193385 50.4808677,28.9235135 L50.4436278,28.9291509 Z M56.4224079,27.5558626 C56.4119997,27.5766789 56.4038929,27.5987544 56.3980374,27.6216529 L56.4224079,27.5558626 Z M56.4984208,33.6400731 C56.5974897,33.8382109 56.5969824,34.0808135 56.4821979,34.2804753 C55.7137168,36.5523565 54.2728382,39.301367 52.4232365,41.1508654 C49.6917865,43.9765033 45.7238851,44.1667451 42.9672654,41.4101254 C40.2129321,38.6557832 40.4000121,34.7805521 43.2198976,31.9606666 C45.0962125,30.0843517 47.8851661,28.6322524 50.0993058,27.9000172 C50.6496453,27.6248475 51.1458064,27.9969683 51.1458064,28.5590763 L51.121549,28.7203971 L51.0201976,29.0497894 L56.4701246,27.034063 L56.6604143,27 C57.200592,27 57.7194078,27.4150527 57.427533,27.9914713 L55.4083398,33.4424651 L55.6604354,33.3648972 C55.9713065,33.1901292 56.3452757,33.3337827 56.4984208,33.6400731 Z M47.3564312,41.1883573 C45.0071345,41.1883573 43.1026533,39.2838761 43.1026533,36.9345795 C43.1026533,34.5852828 45.0071345,32.6808016 47.3564312,32.6808016 C49.7057278,32.6808016 51.6102091,34.5852828 51.6102091,36.9345795 C51.6102091,39.2838761 49.7057278,41.1883573 47.3564312,41.1883573 Z M47.3564312,40.0912573 C49.0998162,40.0912573 50.513109,38.6779645 50.513109,36.9345795 C50.513109,35.1911944 49.0998162,33.7779016 47.3564312,33.7779016 C45.6130461,33.7779016 44.1997533,35.1911944 44.1997533,36.9345795 C44.1997533,38.6779645 45.6130461,40.0912573 47.3564312,40.0912573 Z" fill="#CFE5FF"></path>
             <path d="M6.40799454,19.7606609 C6.86785286,19.4156863 7.49864298,18.8494598 8.13008712,18.2178675 C8.76153125,17.5862752 9.32762496,16.9553371 9.67251869,16.4953709 C9.83679914,16.276279 9.83679914,15.6852229 9.67251869,15.466131 C9.32762496,15.0061648 8.76153125,14.3752266 8.13008712,13.7436344 C7.49864298,13.1120421 6.86785286,12.5458156 6.40799454,12.200841 C6.18895395,12.036522 5.59803654,12.036522 5.37899595,12.200841 C4.91913763,12.5458156 4.2883475,13.1120421 3.65690337,13.7436344 C3.02545923,14.3752266 2.45936553,15.0061648 2.11447179,15.466131 C1.95019135,15.6852229 1.95019135,16.276279 2.11447179,16.4953709 C2.45936553,16.9553371 3.02545923,17.5862752 3.65690337,18.2178675 C4.2883475,18.8494598 4.91913763,19.4156863 5.37899595,19.7606609 C5.59803654,19.9249799 6.18895395,19.9249799 6.40799454,19.7606609 Z M8.51392882,19.3775916 C7.98411623,19.8862015 7.47355503,20.3326781 7.06610016,20.638341 C6.76821656,20.8618061 6.52370095,21.0132084 6.31740747,21.0892291 C6.17536459,21.1415729 6.02860201,21.1600653 5.89349524,21.1433211 C5.75838848,21.1600653 5.61162589,21.1415729 5.46958301,21.0892291 C5.26328954,21.0132084 5.01877392,20.8618061 4.72089032,20.638341 C4.21358423,20.2577721 3.54644515,19.6589171 2.88131845,18.9936344 C2.21619176,18.3283516 1.6174772,17.6610561 1.23699763,17.153631 C1.01358493,16.8556775 0.862218119,16.6111045 0.786215259,16.4047626 C0.733883672,16.2626864 0.715395676,16.1158894 0.732135954,15.9807509 C0.715395676,15.8456125 0.733883672,15.6988155 0.786215259,15.5567393 C0.862218119,15.3503974 1.01358493,15.1058244 1.23699763,14.8078709 C1.54332479,14.3993389 1.99111164,13.887179 2.50112636,13.3558733 L0,10.7615419 L0.78955043,10 L3.27699268,12.5801374 C3.8053993,12.0730926 4.31444326,11.6280677 4.72089032,11.3231609 C5.01877392,11.0996958 5.26328954,10.9482935 5.46958301,10.8722728 C5.61162589,10.819929 5.75838848,10.8014366 5.89349524,10.8181808 C6.02860201,10.8014366 6.17536459,10.819929 6.31740747,10.8722728 C6.52370095,10.9482935 6.76821656,11.0996958 7.06610016,11.3231609 C7.57340626,11.7037298 8.24054534,12.3025848 8.90567203,12.9678675 C9.57079873,13.6331502 10.1695133,14.3004458 10.5499929,14.8078709 C10.7734056,15.1058244 10.9247724,15.3503974 11.0007752,15.5567393 C11.0531068,15.6988155 11.0715948,15.8456125 11.0548545,15.9807509 C11.0715948,16.1158894 11.0531068,16.2626864 11.0007752,16.4047626 C10.9247724,16.6111045 10.7734056,16.8556775 10.5499929,17.153631 C10.2443967,17.5611881 9.79801518,18.0718791 9.28951426,18.6018253 L11.8800001,21.1928634 L11.1044235,21.9686385 L8.51392882,19.3775916 Z" fill="#CFE5FF"></path>
         </g>
     </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/app/static/index.html b/app/static/index.html
index 1050ab59474..d6fcca07d82 100644
--- a/app/static/index.html
+++ b/app/static/index.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <title>GitHub Desktop</title>
     <meta charset="UTF-8" />
   </head>
   <body>
diff --git a/app/styles/_globals.scss b/app/styles/_globals.scss
index 4c6db6b7719..827f78a7b79 100644
--- a/app/styles/_globals.scss
+++ b/app/styles/_globals.scss
@@ -58,18 +58,16 @@ body {
   background-color: var(--background-color);
 }
 
-:not(input):not(textarea) {
+:not(input, textarea) {
   &,
   &::after,
   &::before {
-    -webkit-user-select: none;
     user-select: none;
     cursor: default;
   }
 }
 
 .selectable-text {
-  -webkit-user-select: text;
   user-select: text;
   cursor: auto;
 }
@@ -142,23 +140,17 @@ button {
   left: 0;
 }
 
-// We're using a polyfill for the upcoming CSS4 `:focus-ring` pseudo-selector.
-// This allows us to not have to override default accessibility driven focus
-// styles for buttons in the case when a user clicks on a button. This also
-// gives better visiblity to individuals who navigate with the keyboard.
-//
-// See:
-//   https://github.com/WICG/focus-ring
-//   Focus Ring! -- A11ycasts #16: https://youtu.be/ilj2P5-5CjI
-:focus:not(.focus-ring) {
+// By default we don't want to show the focus ring on elements unless the focus
+// occurred as a result of keyboard navigation.
+:focus {
   outline: none;
 }
 
-// http://stackoverflow.com/questions/7538771/what-is-webkit-focus-ring-color
-:focus {
+:focus-visible {
   outline: auto;
   outline-color: var(--focus-color);
 }
+
 .more-dropdown {
   color: var(--text-color) !important;
   margin-left: var(--spacing);
@@ -187,7 +179,10 @@ kbd {
   text-align: center;
   min-width: 1.5em;
 
-  &:not(:last-child) {
-    margin-right: 2px;
+  @include darwin {
+    // On macOS, kbd elements are not separated by a +, so let's add a margin
+    &:not(:last-child) {
+      margin-right: 2px;
+    }
   }
 }
diff --git a/app/styles/_mixins.scss b/app/styles/_mixins.scss
index afc00e71bce..2547663981e 100644
--- a/app/styles/_mixins.scss
+++ b/app/styles/_mixins.scss
@@ -4,5 +4,3 @@
 @import 'mixins/textboxish';
 @import 'mixins/checkboard-background';
 @import 'mixins/close-button';
-@import 'mixins/list-item';
-@import 'mixins/high-contrast';
diff --git a/app/styles/_type.scss b/app/styles/_type.scss
index e603c67be24..29ac797cd97 100644
--- a/app/styles/_type.scss
+++ b/app/styles/_type.scss
@@ -6,3 +6,7 @@
   font-size: var(--font-size-sm);
   color: var(--text-secondary-color);
 }
+
+.underline-links a {
+  text-decoration: underline;
+}
diff --git a/app/styles/_ui.scss b/app/styles/_ui.scss
index 2c9d0f098a3..7a0ce429eb0 100644
--- a/app/styles/_ui.scss
+++ b/app/styles/_ui.scss
@@ -21,6 +21,7 @@
 @import 'ui/toolbar/toolbar';
 @import 'ui/toolbar/button';
 @import 'ui/toolbar/dropdown';
+@import 'ui/toolbar/push-pull-button';
 @import 'ui/tab-bar';
 @import 'ui/panel';
 @import 'ui/popup';
@@ -37,6 +38,7 @@
 @import 'ui/configure-git-user';
 @import 'ui/form';
 @import 'ui/text-box';
+@import 'ui/password-text-box';
 @import 'ui/ref-name-text-box';
 @import 'ui/radio-button';
 @import 'ui/button';
@@ -93,9 +95,16 @@
 @import 'ui/check-runs/_ci-check-run-list';
 @import 'ui/check-runs/_ci-check-run-popover';
 @import 'ui/check-runs/ci-check-run-job-steps';
+@import 'ui/check-runs/_ci-check-run-no-steps';
+@import 'ui/check-runs/ci-check-run-step-header';
 @import 'ui/_pull-request-checks-failed';
-@import 'ui/_pull-request-review';
 @import 'ui/_sandboxed-markdown';
 @import 'ui/_pull-request-quick-view';
 @import 'ui/discard-changes-retry';
 @import 'ui/_git-email-not-found-warning';
+@import 'ui/_branch-select';
+@import 'ui/_popover-dropdown';
+@import 'ui/_pull-request-files-changed';
+@import 'ui/_pull-request-merge-status';
+@import 'ui/_input-description';
+@import 'ui/repository-rules/_repo-rules-failure-list';
diff --git a/app/styles/_variables.scss b/app/styles/_variables.scss
index 4f3f85cb1d1..98fe19c9a71 100644
--- a/app/styles/_variables.scss
+++ b/app/styles/_variables.scss
@@ -12,11 +12,11 @@
 $overlay-background-color: rgba(0, 0, 0, 0.4);
 
 :root {
-  --color-new: #{$green};
-  --color-deleted: #{$red};
-  --color-modified: #{$yellow-700};
+  --color-new: #{$green-600};
+  --color-deleted: #{$red-600};
+  --color-modified: #{darken($yellow-700, 10%)};
   --color-renamed: #{$blue};
-  --color-conflicted: #{$orange};
+  --color-conflicted: #{$orange-600};
 
   --text-color: #{$gray-900};
   --text-secondary-color: #{$gray-500};
@@ -29,13 +29,15 @@ $overlay-background-color: rgba(0, 0, 0, 0.4);
   --button-border-radius: 6px;
   --button-hover-background: #{lighten($blue, 5%)};
   --button-text-color: #{$white};
-  --button-focus-border-color: #{$blue-600};
+  --button-focus-border-color: #{$blue-100};
 
-  --link-button-color: #{$blue};
+  --link-button-color: #{lighten($blue, 5%)};
   --link-button-hover-color: #{$blue-600};
   --link-button-selected-hover-color: #{$blue-200};
 
-  --secondary-button-background: #{$gray-000};
+  --secondary-button-background: #{$gray-100};
+  --secondary-button-border-color: var(--box-border-contrast-color);
+  --secondary-button-hover-border-color: var(--box-border-contrast-color);
   --secondary-button-hover-background: #{$white};
   --secondary-button-text-color: var(--text-color);
   --secondary-button-focus-shadow-color: #{rgba($gray-200, 0.75)};
@@ -48,6 +50,15 @@ $overlay-background-color: rgba(0, 0, 0, 0.4);
   --badge-icon-color: #{$white};
   --warning-badge-icon-color: #{$orange};
 
+  // Colors used for icons that are inside an input box
+  --input-icon-warning-color: #{$yellow-800};
+  --input-icon-error-color: #{$red-600};
+  --input-icon-hover-background-color: #{$gray-100};
+
+  // Colors used for icons in the commit message warning/error area
+  --commit-message-icon-warning-color: var(--input-icon-warning-color);
+  --commit-message-icon-error-color: var(--input-icon-error-color);
+
   // Typography
   //
   // Font, line-height, and color for body text, headings, and more.
@@ -81,7 +92,7 @@ $overlay-background-color: rgba(0, 0, 0, 0.4);
    * Background color for custom scroll bars.
    * The color is applied to the thumb part of the scrollbar.
    *
-   * Note: Only applies to win32 platforms
+   * Note: Only applies to win32 and linux platforms
    */
   --scroll-bar-thumb-background-color: rgba(0, 0, 0, 0.2);
 
@@ -89,7 +100,7 @@ $overlay-background-color: rgba(0, 0, 0, 0.4);
    * Background color for custom scroll bars in their active state.
    * The color is applied to the thumb part of the scrollbar.
    *
-   * Note: Only applies to win32 platforms
+   * Note: Only applies to win32 and linux platforms
    */
   --scroll-bar-thumb-background-color-active: rgba(0, 0, 0, 0.5);
 
@@ -113,6 +124,9 @@ $overlay-background-color: rgba(0, 0, 0, 0.4);
    * Border color for boxes.
    */
   --box-border-color: #{$gray-200};
+
+  // darkened version of gray-400 to get 3:1 contrast ratio against --box-alt-background-color
+  --box-border-contrast-color: #{darken($gray-400, 5%)};
   --box-border-accent-color: #{$blue};
 
   /**
@@ -173,6 +187,21 @@ $overlay-background-color: rgba(0, 0, 0, 0.4);
    */
   --box-overflow-shadow-background: #{linear-gradient(180deg, rgba($white, 0) 0%, rgba($white, 1) 90%, rgba($white, 1) 100%)};
 
+  /**
+   * Gradient used to indicate that content is overflowing, intended
+   * for use when content can be expanded through other means than
+   * scrolling. Used in conjuction with background-size, background-attachment, background-repeat.
+   */
+  --no-shadow-top: #{linear-gradient($white, rgba(255, 255, 255, 0))};
+  --no-shadow-bottom: #{linear-gradient(rgba(255, 255, 255, 0), $white)};
+  --top-shadow: #{linear-gradient(0deg, rgba($white, 0) 0%, rgba($gray-200, 0.6) 90%, rgba($gray-200, 1) 100%)};
+  --bottom-shadow: #{linear-gradient(180deg, rgba($white, 0) 0%, rgba($gray-200, 0.6) 90%, rgba($gray-200, 1) 100%) 0 100%};
+  --box-overflow-shadow-background-two: #{var(--no-shadow-top), var(--no-shadow-bottom) 0 100%, var(--top-shadow), var(--bottom-shadow)};
+
+  /**
+   * Text color for selected boxes with active keyboard focus
+   */
+
   /**
    * Placeholder color for input boxes
    */
@@ -185,11 +214,10 @@ $overlay-background-color: rgba(0, 0, 0, 0.4);
   --co-author-tag-border-color: #{$blue-200};
 
   /**
-   * Author input (co-authors)
+   * Commit warning badge icon
    */
   --commit-warning-badge-background-color: #{$gray-000};
-  --commit-warning-badge-border-color: #{$gray-300};
-  --commit-warning-badge-icon-color: var(--warning-badge-icon-color);
+  --commit-warning-badge-border: #{$gray-300};
 
   /**
    * The height of the title bar area on Win32 platforms
@@ -218,6 +246,7 @@ $overlay-background-color: rgba(0, 0, 0, 0.4);
   // similar value than Chrome's default outline border radius.
   --outlined-border-radius: 3px;
   --base-border: 1px solid var(--box-border-color);
+  --contrast-border: 1px solid var(--box-border-contrast-color);
 
   --shadow-color: rgba(71, 83, 95, 0.19);
   --base-box-shadow: 0 2px 7px var(--shadow-color);
@@ -248,6 +277,11 @@ $overlay-background-color: rgba(0, 0, 0, 0.4);
   --toolbar-button-focus-progress-color: #{$gray-700};
   --toolbar-button-hover-progress-color: #{$gray-700};
   --toolbar-dropdown-open-progress-color: #{$gray-200};
+  --toolbar-dropdown-text-warning-color: #{$orange-800};
+  --toolbar-dropdown-text-hover-color: var(--box-hover-text-color);
+
+  --toolbar-tooltip-background-color: #{$gray-800};
+  --toolbar-tooltip-shadow-color: black;
 
   /**
    * App menu bar colors (Windows/Linux only)
@@ -293,8 +327,9 @@ $overlay-background-color: rgba(0, 0, 0, 0.4);
   --list-item-selected-active-badge-background-color: #{$white};
   --list-item-hover-background-color: #{$gray-100};
 
-  /** Win32 has custom scrol bars, see _scroll.scss */
+  /** Windows/Linux have custom scrollbars, see _scroll.scss */
   --win32-scroll-bar-size: 10px;
+  --linux-scroll-bar-size: 10px;
 
   /**
    * The z-index for tooltips. Nothing should be higher, but other z-indexes can
@@ -328,12 +363,7 @@ $overlay-background-color: rgba(0, 0, 0, 0.4);
 
   /** The highlight color used for focus rings and focus box shadows */
   --focus-color: #{$blue};
-
-  /**
-   * An alternative focus color to use when the background color of
-   * the focused element is the same as the regular focus color.
-   */
-  --alt-focus-color: #{$blue-800};
+  --diff-linenumber-focus-color: #{$blue-600};
 
   /**
    * Variables for form elements
@@ -385,7 +415,7 @@ $overlay-background-color: rgba(0, 0, 0, 0.4);
   --diff-hunk-border-color: #{$blue-200};
   --diff-hunk-gutter-color: #{darken($blue-200, 5%)};
   --diff-hunk-gutter-background-color: #{$blue-100};
-  --diff-hunk-text-color: #{$gray};
+  --diff-hunk-text-color: #{$gray-600};
 
   --diff-hover-background-color: #{$blue-300};
   --diff-hover-border-color: #{$blue-400};
@@ -404,6 +434,7 @@ $overlay-background-color: rgba(0, 0, 0, 0.4);
 
   --diff-empty-row-background-color: #{$gray-000};
   --diff-empty-row-gutter-background-color: var(--diff-empty-row-background-color);
+  --diff-empty-hunk-handle: #{$gray-300};
 
   // Syntax highlighting text colors
   --syntax-variable-color: #6f42c1;
@@ -418,6 +449,7 @@ $overlay-background-color: rgba(0, 0, 0, 0.4);
   --syntax-attribute-color: #6f42c1;
   --syntax-link-color: #032f62;
   --syntax-header-color: #0000ff;
+  --syntax-quote-color: #1a7e31;
 
   // Note that this duration *must* match the `UndoCommitAnimationTimeout`
   // specified in `changes/index.tsx`.
@@ -429,17 +461,31 @@ $overlay-background-color: rgba(0, 0, 0, 0.4);
   --form-error-border-color: #{$red-200};
   --form-error-text-color: #{$red-800};
 
+  --dialog-banner-success-background: #{$green-100};
+  --dialog-banner-success-border-color: #{$green-300};
+  --dialog-banner-success-text-color: #{$green-800};
+
+  // Inline form errors, displayed after the input field
+  --input-warning-text-color: var(--dialog-warning-color);
+  --input-error-text-color: #{$red-800};
+
   /** Overlay is used as a background for both modals and foldouts */
   --overlay-background-color: #{$overlay-background-color};
 
   /** Dialog */
-  --dialog-warning-color: #{$yellow-600};
+  --dialog-warning-color: #{$yellow-800};
   --dialog-information-color: #{$blue-400};
   --dialog-error-color: #{$red};
 
+  /** Banner */
+  --banner-warning-background: #{$yellow-100};
+  --banner-warning-text-color: var(--text-color);
+  --banner-warning-link-color: #046ee7;
+  --banner-warning-icon-color: #{darken($yellow-700, 10%)};
+
   /** File warning */
-  --file-warning-background-color: #{$yellow-200};
-  --file-warning-color: #{$yellow-800};
+  --file-warning-background-color: #{$yellow-100};
+  --file-warning-color: #{darken($yellow-700, 10%)};
   --file-warning-border-color: #{rgba($yellow-700, 0.4)};
 
   /** Tooltips */
@@ -449,6 +495,7 @@ $overlay-background-color: rgba(0, 0, 0, 0.4);
 
   /** Inline paths and code */
   --path-segment-background: #{$blue-000};
+  --path-segment-background-focus: #{darken($blue-000, 5%)};
   --path-segment-padding: var(--spacing-third);
 
   // http://easings.net/#easeOutBack
@@ -466,7 +513,7 @@ $overlay-background-color: rgba(0, 0, 0, 0.4);
   /** merge/rebase status indicators */
   --status-pending-color: #{$yellow-700};
   --status-error-color: #{$red-500};
-  --status-success-color: #{$green-500};
+  --status-success-color: #1a7f37;
 
   // PR status icon colors
   --pr-open-icon-color: #{$green-500};
diff --git a/app/styles/desktop.scss b/app/styles/desktop.scss
index 953c872deca..3a8c3b0ce9a 100644
--- a/app/styles/desktop.scss
+++ b/app/styles/desktop.scss
@@ -2,7 +2,6 @@
 
 @import 'variables';
 @import 'themes/dark';
-@import 'themes/high-contrast';
 
 @import 'mixins';
 
diff --git a/app/styles/mixins/_close-button.scss b/app/styles/mixins/_close-button.scss
index e0bf14cbb8d..b03a6fb389d 100644
--- a/app/styles/mixins/_close-button.scss
+++ b/app/styles/mixins/_close-button.scss
@@ -27,9 +27,5 @@
     &:hover {
       color: var(--text-color);
     }
-
-    &:focus {
-      outline: 0;
-    }
   }
 }
diff --git a/app/styles/mixins/_high-contrast.scss b/app/styles/mixins/_high-contrast.scss
deleted file mode 100644
index c68b61574f2..00000000000
--- a/app/styles/mixins/_high-contrast.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-// A mixin which takes a content block that should only
-// be applied when we are using the high-contrast theme
-@mixin high-contrast {
-  body.theme-high-contrast & {
-    @content;
-  }
-}
diff --git a/app/styles/mixins/_list-item.scss b/app/styles/mixins/_list-item.scss
deleted file mode 100644
index 0761d7f9b3f..00000000000
--- a/app/styles/mixins/_list-item.scss
+++ /dev/null
@@ -1,28 +0,0 @@
-@mixin list-item {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-
-  width: 100%;
-  height: 100%;
-
-  &.selected {
-    --text-color: var(--box-selected-text-color);
-    --text-secondary-color: var(--box-selected-text-color);
-
-    color: var(--text-color);
-    background-color: var(--box-selected-background-color);
-  }
-
-  &:focus {
-    outline: none;
-  }
-
-  &:not(.not-selectable):hover {
-    background: var(--list-item-hover-background-color);
-    @include high-contrast {
-      color: var(--hc-active-text-color);
-      border: var(--hc-hover-border);
-    }
-  }
-}
diff --git a/app/styles/mixins/_platform.scss b/app/styles/mixins/_platform.scss
index 0191bdd2dcc..b3c7bd55584 100644
--- a/app/styles/mixins/_platform.scss
+++ b/app/styles/mixins/_platform.scss
@@ -41,3 +41,25 @@
     @content;
   }
 }
+
+// A mixin which takes a content block that should only
+// be applied when the current (real or emulated) operating
+// system is Linux.
+//
+// This helper mixin is useful in so far that it allows us
+// to keep platform specific styles next to cross-platform
+// styles instead of splitting them out and possibly forgetting
+// about them.
+@mixin linux {
+  body.platform-linux & {
+    @content;
+  }
+}
+
+// An exact copy of the linux mixin except that it allows for
+// writing base-level rules
+@mixin linux-context {
+  body.platform-linux {
+    @content;
+  }
+}
diff --git a/app/styles/mixins/_textboxish.scss b/app/styles/mixins/_textboxish.scss
index 37e275230ac..07e68d757d0 100644
--- a/app/styles/mixins/_textboxish.scss
+++ b/app/styles/mixins/_textboxish.scss
@@ -5,7 +5,7 @@
 // It's a mix in because the styles are shared between inputs
 // and select components.
 @mixin textboxish {
-  border: 1px solid var(--box-border-color);
+  border: var(--contrast-border);
   border-radius: var(--border-radius);
   background: var(--box-background-color);
   color: currentColor;
@@ -21,6 +21,10 @@
   &::-webkit-input-placeholder {
     color: var(--box-placeholder-color);
   }
+
+  &:disabled {
+    @include textboxish-disabled-styles;
+  }
 }
 
 @mixin textboxish-focus-styles {
@@ -33,9 +37,3 @@
   background: var(--box-alt-background-color);
   color: var(--text-secondary-color);
 }
-
-@mixin textboxish-disabled {
-  &:disabled {
-    @include textboxish-disabled-styles;
-  }
-}
diff --git a/app/styles/themes/_dark.scss b/app/styles/themes/_dark.scss
index 492bd9b3391..290c97ad9ce 100644
--- a/app/styles/themes/_dark.scss
+++ b/app/styles/themes/_dark.scss
@@ -10,6 +10,9 @@
 // See https://developer.mozilla.org/en-US/docs/Web/CSS/@media/prefers-color-scheme
 // https://www.electronjs.org/docs/api/native-theme#nativethemethemesource
 
+// This blue passes WCAG 2 guidelines with $gray-100 fg and $gray-900 bg.
+$link-color: #2e8fff;
+
 body.theme-dark {
   --color-new: #{$green};
   --color-deleted: #{$red};
@@ -17,7 +20,7 @@ body.theme-dark {
   --color-renamed: #{$blue};
   --color-conflicted: #{$orange};
 
-  --text-color: #{$gray-300};
+  --text-color: #{$gray-100};
   --text-secondary-color: #{$gray-400};
   --text-secondary-color-muted: #{darken($gray-500, 10%)};
   --background-color: #{$gray-900};
@@ -27,11 +30,13 @@ body.theme-dark {
   --button-text-color: #{$white};
   --button-focus-border-color: #{$blue-600};
 
-  --link-button-color: #{lighten($blue-400, 3%)};
-  --link-button-hover-color: #{$blue-400};
-  --link-button-selected-hover-color: #{$blue-300};
+  --link-button-color: #{$link-color};
+  --link-button-hover-color: #{lighten($link-color, 3%)};
+  --link-button-selected-hover-color: #{$link-color};
 
   --secondary-button-background: #{$gray-800};
+  --secondary-button-border-color: var(--box-border-contrast-color);
+  --secondary-button-hover-border-color: #{$gray-300};
   --secondary-button-hover-background: var(--secondary-button-background);
   --secondary-button-text-color: var(--text-color);
   --secondary-button-focus-shadow-color: #{rgba($gray-200, 0.75)};
@@ -43,11 +48,20 @@ body.theme-dark {
    */
   --badge-icon-color: #{$gray-300};
 
+  // Colors used for icons that are inside an input box
+  --input-icon-warning-color: #{$yellow-600};
+  --input-icon-error-color: #{$red-400};
+  --input-icon-hover-background-color: #{$gray-800};
+
+  // Colors used for icons in the commit message warning/error area
+  --commit-message-icon-warning-color: var(--input-icon-warning-color);
+  --commit-message-icon-error-color: var(--input-icon-error-color);
+
   /**
    * Background color for custom scroll bars.
    * The color is applied to the thumb part of the scrollbar.
    *
-   * Note: Only applies to win32 platforms
+   * Note: Only applies to win32 and linux platforms
    */
   --scroll-bar-thumb-background-color: rgba(255, 255, 255, 0.2);
 
@@ -55,7 +69,7 @@ body.theme-dark {
    * Background color for custom scroll bars in their active state.
    * The color is applied to the thumb part of the scrollbar.
    *
-   * Note: Only applies to win32 platforms
+   * Note: Only applies to win32 and linux platforms
    */
   --scroll-bar-thumb-background-color-active: rgba(255, 255, 255, 0.5);
 
@@ -67,7 +81,7 @@ body.theme-dark {
   // to decide what states to support (active selection, selection, etc).
 
   --box-background-color: #{darken($gray-900, 3%)};
-  --box-alt-background-color: #{$gray-800};
+  --box-alt-background-color: #{lighten($gray-900, 3%)};
 
   /**
    * Background color for skeleton or "loading" boxes
@@ -79,6 +93,10 @@ body.theme-dark {
    * Border color for boxes.
    */
   --box-border-color: #141414;
+
+  // slightly lighter of gray-500 to get 3:1 contrast ratio against
+  // --box-alt-background-color
+  --box-border-contrast-color: #{lighten($gray-500, 3%)};
   --box-border-accent-color: #{$blue};
 
   /**
@@ -134,6 +152,17 @@ body.theme-dark {
    */
   --box-overflow-shadow-background: #{linear-gradient(180deg, rgba($gray-900, 0) 0%, rgba($gray-900, 1) 90%, rgba($gray-900, 1) 100%)};
 
+  /**
+   * Gradient used to indicate that content is overflowing, intended
+   * for use when content can be expanded through other means than
+   * scrolling. Used in conjuction with background-size, background-attachment, background-repeat.
+   */
+  --no-shadow-top: #{linear-gradient($gray-900, rgba(255, 255, 255, 0))};
+  --no-shadow-bottom: #{linear-gradient(rgba(255, 255, 255, 0), $gray-900)};
+  --top-shadow: #{linear-gradient(0deg, rgba($gray-900, 0) 0%, rgba(black, 0.6) 90%, rgba(black, 1) 100%)};
+  --bottom-shadow: #{linear-gradient(180deg, rgba($gray-900, 0) 0%, rgba(black, 0.6) 90%, rgba(black, 1) 100%) 0 100%};
+  --box-overflow-shadow-background-two: #{var(--no-shadow-top), var(--no-shadow-bottom) 0 100%, var(--top-shadow), var(--bottom-shadow)};
+
   /**
    * Placeholder color for input boxes
    */
@@ -145,7 +174,14 @@ body.theme-dark {
   --co-author-tag-background-color: #{$blue-800};
   --co-author-tag-border-color: #{$blue-700};
 
+  /**
+   * Commit warning badge icon
+   */
+  --commit-warning-badge-background-color: #{$gray-900};
+  --commit-warning-badge-border-color: #{$gray-700};
+
   --base-border: 1px solid var(--box-border-color);
+  --contrast-border: 1px solid var(--box-border-contrast-color);
 
   --shadow-color: #{rgba(black, 0.5)};
   --base-box-shadow: 0 2px 7px var(--shadow-color);
@@ -174,6 +210,11 @@ body.theme-dark {
   --toolbar-button-focus-progress-color: #{$gray-700};
   --toolbar-button-hover-progress-color: #{$gray-700};
   --toolbar-dropdown-open-progress-color: #{$gray-200};
+  --toolbar-dropdown-text-warning-color: #{$orange-600};
+  --toolbar-dropdown-text-hover-color: #{$white};
+
+  --toolbar-tooltip-background-color: #{$gray-800};
+  --toolbar-tooltip-shadow-color: black;
 
   /**
     * App menu bar colors (Windows/Linux only)
@@ -228,12 +269,7 @@ body.theme-dark {
 
   /** The highlight color used for focus rings and focus box shadows */
   --focus-color: #{$blue};
-
-  /**
-   * An alternative focus color to use when the background color of
-   * the focused element is the same as the regular focus color.
-   */
-  --alt-focus-color: #{$blue-800};
+  --diff-linenumber-focus-color: #{$blue-200};
 
   /**
    * Variables for form elements
@@ -301,6 +337,7 @@ body.theme-dark {
 
   --diff-empty-row-background-color: #{darken($gray-900, 1%)};
   --diff-empty-row-gutter-background-color: var(--diff-gutter-background-color);
+  --diff-empty-hunk-handle: #{$gray-700};
 
   // Syntax highlighting text colors
   --syntax-variable-color: #{$purple-300};
@@ -315,6 +352,7 @@ body.theme-dark {
   --syntax-attribute-color: #{$purple-300};
   --syntax-link-color: #{$blue-300};
   --syntax-header-color: #{$red-300};
+  --syntax-quote-color: #{$green-400};
 
   // Colors for form errors
   --error-color: #{$red};
@@ -322,6 +360,14 @@ body.theme-dark {
   --form-error-border-color: #{$red-900};
   --form-error-text-color: var(--text-color);
 
+  --dialog-banner-success-background: rgba(22, 92, 38, 0.7);
+  --dialog-banner-success-border-color: #{$green-800};
+  --dialog-banner-success-text-color: var(--text-color);
+
+  // Inline form errors, displayed after the input field
+  --input-warning-text-color: var(--dialog-warning-color);
+  --input-error-text-color: #{$red-300};
+
   /** Overlay is used as a background for both modals and foldouts */
   --overlay-background-color: rgba(0, 0, 0, 0.5);
 
@@ -330,6 +376,12 @@ body.theme-dark {
   --dialog-information-color: #{$blue-400};
   --dialog-error-color: #{$red-600};
 
+  /** Banner */
+  --banner-warning-background: #272216;
+  --banner-warning-text-color: var(--text-color);
+  --banner-warning-link-color: #6682ff;
+  --banner-warning-icon-color: #{$yellow-700};
+
   /** File warning */
   --file-warning-background-color: #{rgba($yellow-900, 0.4)};
   --file-warning-color: #{$yellow-700};
@@ -342,6 +394,7 @@ body.theme-dark {
 
   /** Inline paths and code */
   --path-segment-background: #{$gray-700};
+  --path-segment-background-focus: #{lighten($gray-700, 5%)};
 
   .blankslate-image {
     filter: #{'invert()'} grayscale(1) brightness(8) contrast(0.6);
diff --git a/app/styles/themes/_high-contrast.scss b/app/styles/themes/_high-contrast.scss
deleted file mode 100644
index 2e721bae12c..00000000000
--- a/app/styles/themes/_high-contrast.scss
+++ /dev/null
@@ -1,77 +0,0 @@
-body.theme-high-contrast {
-  // A small set of colors used to flatten ux and improve contrast
-  --hc-background-color: #090c11;
-  --hc-secondary-background-color: #323946;
-  --hc-border-color: #7a828e;
-  --hc-text-color: #f0f3f6;
-  --hc-active-item-color: #9ea7b3;
-  --hc-secondary-active-item-color: #596069;
-  --hc-active-text-color: #090c11;
-  --hc-diff-add-border-color: green;
-  --hc-diff-delete-border-color: crimson;
-
-  // background/text
-  --background-color: var(--hc-background-color);
-  --text-color: var(--hc-text-color);
-  --text-secondary-color: var(--hc-text-color);
-
-  //border
-  --hc-hover-border: 2px solid var(--hc-border-color);
-
-  /// tab-bar
-  --tab-bar-active-color: var(--hc-active-item-color);
-  --tab-bar-hover-background-color: var(--hc-secondary-background-color);
-
-  // box
-  --box-selected-active-border: var(--hc-hover-border);
-  --box-background-color: var(--hc-background-color);
-  --box-alt-background-color: var(--hc-background-color);
-  --box-border-color: var(--hc-border-color);
-  --box-selected-background-color: var(--hc-secondary-active-item-color);
-  --box-selected-text-color: var(--hc-active-text-color);
-  --box-selected-active-background-color: var(--hc-active-item-color);
-  --box-selected-active-text-color: var(--hc-active-text-color);
-  --box-placeholder-color: var(--hc-text-color);
-
-  // button
-  --button-background: var(--hc-active-item-color);
-  --button-text-color: var(--hc-active-text-color);
-  --secondary-button-background: var(--hc-background-color);
-  --secondary-button-text-color: var(--hc-text-color);
-  --button-hover-background: var(--hc-secondary-active-item-color);
-  --secondary-button-hover-background: var(--hc-secondary-background-color);
-
-  // menu
-  --app-menu-button-hover-background-color: var(--hc-secondary-background-color);
-
-  // toolbar
-  --toolbar-button-focus-background-color: var(--hc-secondary-background-color);
-  --toolbar-button-hover-background-color: var(--hc-secondary-background-color);
-  --toolbar-button-active-border-color: var(--hc-border-color);
-  --toolbar-background-color: var(--hc-background-color);
-  --toolbar-button-secondary-color: var(--hc-text-color);
-
-  // list
-  --list-item-hover-background-color: var(--hc-secondary-active-item-color);
-
-  // diff
-  --hc-diff-add-border: 1px solid var(--hc-diff-add-border-color);
-  --hc-diff-delete-border: 1px solid var(--hc-diff-delete-border-color);
-
-  --diff-hunk-gutter-background-color: var(--hc-background-color);
-  --diff-text-color: var(--hc-text-color);
-  --diff-line-number-color: var(--hc-text-color);
-  --diff-gutter-background-color: var(--hc-background-color);
-  --diff-hunk-background-color: var(--hc-background-color);
-  --diff-empty-row-background-color: var(--hc-secondary-background-color);
-  --diff-border-color: var(--hc-border-color);
-
-  // PR review colors
-  --pr-timeline-line-color: #7a828e;
-  --pr-changes-requested-icon-color: #0a0c10;
-  --pr-changes-requested-icon-background-color: #ff6a69;
-  --pr-approved-icon-color: #0a0c10;
-  --pr-approved-icon-background-color: #09b43a;
-  --pr-commented-icon-color: #f0f3f6;
-  --pr-commented-icon-background-color: #272b33;
-}
diff --git a/app/styles/ui/_about.scss b/app/styles/ui/_about.scss
index 3be68a590ef..a887f20c689 100644
--- a/app/styles/ui/_about.scss
+++ b/app/styles/ui/_about.scss
@@ -5,10 +5,14 @@ dialog#about {
     }
 
     p,
-    h2 {
+    h1 {
       text-align: center;
     }
 
+    h1 {
+      font-size: var(--font-size-md);
+    }
+
     // The version, EULA link, and acknowledgements are conceptually two lines
     // in a paragraph but we don't have a great way of modelling that now
     // (and don't you say <br/>) so we'll just kill off the bottom margin.
@@ -16,6 +20,19 @@ dialog#about {
       margin-bottom: 0;
     }
 
+    p.terms-and-license {
+      // A11y: WCAG SC 2.58 states that "The size of the target for pointer
+      // inputs is at least 24 by 24 CSS pixels, except, if target is in a
+      // sentence or its size is otherwise constrained by the line-height of
+      // non-target text." Our links typically are in a sentence and therefore are
+      // 18px due to our text line-height. In this case, the links are stand
+      // alone and therefore do not meet this exception criteria. This adds the 3px top and bottom
+      // to give us that required 24px height.
+      .link-button-component {
+        padding: 3px;
+      }
+    }
+
     .version-text {
       cursor: pointer;
       .octicon {
diff --git a/app/styles/ui/_add-repository.scss b/app/styles/ui/_add-repository.scss
index b92030d6777..bbdc52b1694 100644
--- a/app/styles/ui/_add-repository.scss
+++ b/app/styles/ui/_add-repository.scss
@@ -9,11 +9,16 @@
 }
 
 .clone-github-repo {
-  height: 250px;
+  height: calc(100vh - 400px);
+  max-height: 250px;
 
-  &.filter-list .filter-field-row {
-    margin: var(--spacing-double);
-    margin-bottom: var(--spacing);
+  &.filter-list {
+    max-width: 100%;
+
+    .filter-field-row {
+      margin: var(--spacing-double);
+      margin-bottom: var(--spacing);
+    }
   }
 
   .clone-repository-list {
@@ -54,6 +59,10 @@
 
   &.clone-generic-repository-content {
     padding: var(--spacing-double);
+
+    .clone-url-textbox-label p {
+      margin: 0;
+    }
   }
 }
 
@@ -64,4 +73,10 @@
     border-top: var(--base-border);
     padding: var(--spacing-double);
   }
+
+  .dialog-content {
+    > .row-component:not(:last-child) {
+      margin-bottom: 0;
+    }
+  }
 }
diff --git a/app/styles/ui/_app-menu.scss b/app/styles/ui/_app-menu.scss
index cb1c63565a4..c24daf65f56 100644
--- a/app/styles/ui/_app-menu.scss
+++ b/app/styles/ui/_app-menu.scss
@@ -1,34 +1,13 @@
 @import '../mixins';
 
 #app-menu-foldout {
-  height: 100%;
   display: flex;
+  max-height: 95%; // When at 100%, can cause some brief shifting of components
 }
 
 .menu-pane {
-  height: 100%;
-  width: 240px;
-
-  // Custom widths for some menus since we don't have
-  // auto-sizeable foldouts at the moment (or rather we
-  // do but our List implementation prevents them from
-  // working). See #3547 for an example.
-  &.menu-pane-branch {
-    width: 275px;
-  }
-
-  &.menu-pane-edit {
-    width: 175px;
-  }
-
-  &.menu-pane-help {
-    width: 220px;
-  }
-
-  &.menu-pane-file {
-    width: 205px;
-  }
-
+  overflow-y: auto;
+  padding-bottom: var(--spacing-half);
   // Open panes (except the first one) should have a border on their
   // right hand side to create a divider between them and their parent
   // menu.
@@ -36,20 +15,8 @@
     border-left: var(--base-border);
   }
 
-  &:not(:last-child) {
-    // We want list items in previous menus to behave as if they have focus
-    // even though they don't, ie we want the selected+focus state
-    // to be in effect for all parent selected menu items as well as
-    // the current
-    .list-item {
-      &.selected {
-        --text-color: var(--box-selected-active-text-color);
-        --text-secondary-color: var(--box-selected-active-text-color);
-
-        color: var(--text-color);
-        background-color: var(--box-selected-active-background-color);
-      }
-    }
+  &:focus {
+    outline: none;
   }
 
   // No focus outline for the list itself. When the app menu is opened without
@@ -62,15 +29,21 @@
   .menu-item {
     display: flex;
     align-items: center;
-
-    height: 100%;
-    width: 100%;
     min-width: 0;
+    height: 30px;
 
     &.disabled {
       opacity: 0.3;
     }
 
+    &.selected {
+      --text-color: var(--box-selected-active-text-color);
+      --text-secondary-color: var(--box-selected-active-text-color);
+
+      color: var(--text-color);
+      background-color: var(--box-selected-active-background-color);
+    }
+
     .label {
       flex-grow: 1;
       margin-left: var(--spacing-double);
diff --git a/app/styles/ui/_app.scss b/app/styles/ui/_app.scss
index 57b33b4af0c..ff0abc36a52 100644
--- a/app/styles/ui/_app.scss
+++ b/app/styles/ui/_app.scss
@@ -83,30 +83,26 @@
       }
     }
 
-    // 'squashing-enabled' class is due to feature flagging. If feature flag is
-    // removed, we could move .list-item block up under the #commit-list above
-    &.squashing-enabled {
-      // When NOT comparing a branch, the #commit-list is a direct child of
-      // .compare-commit-list which is a direct child of #compare-view and we
-      // only want this highlighting to take effect when not comparing branches.
-      // Note: there is another .compare-commit-list higher up when comparing so
-      // the direct child selector is important.
-      #compare-view {
-        > .compare-commit-list {
-          > #commit-list {
-            .list-item:not(.selected) {
-              .commit:hover {
-                --text-color: var(--box-selected-active-text-color);
-                --text-secondary-color: var(--box-selected-active-text-color);
-
-                color: var(--text-color);
-                background-color: var(--box-selected-active-background-color);
-              }
+    // When NOT comparing a branch, the #commit-list is a direct child of
+    // .compare-commit-list which is a direct child of #compare-view and we
+    // only want this highlighting to take effect when not comparing branches.
+    // Note: there is another .compare-commit-list higher up when comparing so
+    // the direct child selector is important.
+    #compare-view {
+      > .compare-commit-list {
+        > #commit-list {
+          .list-item:not(.selected) {
+            .commit:hover {
+              --text-color: var(--box-selected-active-text-color);
+              --text-secondary-color: var(--box-selected-active-text-color);
+
+              color: var(--text-color);
+              background-color: var(--box-selected-active-background-color);
+            }
 
-              .commit {
-                div {
-                  pointer-events: none;
-                }
+            .commit {
+              div {
+                pointer-events: none;
               }
             }
           }
@@ -115,3 +111,13 @@
     }
   }
 }
+
+.sr-only {
+  clip: rect(0 0 0 0);
+  clip-path: inset(50%);
+  height: 1px;
+  overflow: hidden;
+  position: absolute;
+  white-space: nowrap;
+  width: 1px;
+}
diff --git a/app/styles/ui/_author-input.scss b/app/styles/ui/_author-input.scss
index 9bd310cb477..c77ee46dc8d 100644
--- a/app/styles/ui/_author-input.scss
+++ b/app/styles/ui/_author-input.scss
@@ -1,62 +1,126 @@
 @import '../mixins';
 
 .author-input-component {
-  &.disabled .CodeMirror {
+  &.disabled {
     @include textboxish-disabled-styles;
   }
 
-  .CodeMirror {
+  input {
+    border: none;
+    background: none;
+    box-shadow: none;
+    width: 100%;
+
+    &:focus {
+      outline: none;
+      border: none;
+      box-shadow: none;
+    }
+  }
+
+  .shadow-input {
     @include textboxish;
+    position: absolute;
+    opacity: 0;
+    z-index: -1;
+    width: fit-content;
+  }
+
+  .added-author-container {
+    display: contents;
+  }
+
+  .autocompletion-container {
+    cursor: text;
+  }
+
+  @include textboxish;
+
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  align-items: baseline;
 
-    border-top-left-radius: 0;
-    border-top-right-radius: 0;
-    border-top: 0;
-    height: auto;
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+  border-top: 0;
 
-    .label {
-      color: var(--text-secondary-color);
+  height: auto;
+
+  .label {
+    color: var(--text-secondary-color);
+  }
+
+  .handle {
+    border-radius: var(--border-radius);
+    border: 1px solid var(--co-author-tag-border-color);
+    background: var(--co-author-tag-background-color);
+    padding: 1px 2px;
+    margin: 0px 2px;
+    cursor: pointer;
+
+    * {
+      cursor: pointer;
+    }
+
+    svg {
+      cursor: pointer;
     }
 
-    .placeholder {
-      color: var(--text-secondary-color);
-      cursor: text;
+    &.progress {
+      background: transparent;
     }
 
-    .handle {
-      border-radius: var(--border-radius);
-      border: 1px solid var(--co-author-tag-border-color);
-      background: var(--co-author-tag-background-color);
-      padding: 1px 2px;
-      margin: 0px 2px;
+    &.error {
+      background: var(--form-error-background);
+      color: var(--form-error-text-color);
+      border-color: var(--form-error-border-color);
 
-      &.progress {
-        background: transparent;
+      svg.icon {
+        padding-bottom: 2px;
       }
+    }
 
-      &.error {
-        background: var(--form-error-background);
-        color: var(--form-error-text-color);
-        border-color: var(--form-error-border-color);
+    &.focused {
+      background: var(--box-selected-active-background-color);
+      border-color: var(--co-author-tag-selected-border-color);
+      color: var(--box-selected-active-text-color);
+    }
 
-        svg {
-          padding-bottom: 2px;
-        }
+    &.progress,
+    &.error {
+      svg.icon {
+        height: 9px;
+        margin-left: 3px;
+        margin-right: 3px;
+        vertical-align: middle;
+        fill: currentColor;
       }
+    }
+
+    > button {
+      -webkit-appearance: none;
+      font-family: inherit;
+      background: transparent;
+      border: none;
+      padding: 0;
+      margin: 0;
+      outline: none;
+
+      color: inherit;
 
-      &.progress,
-      &.error {
-        svg {
-          height: 9px;
-          margin-left: 3px;
-          margin-right: 3px;
-          vertical-align: middle;
-          fill: currentColor;
-        }
+      svg.delete {
+        height: 16px;
+        margin-left: 3px;
+        margin-right: 3px;
+        margin-bottom: 1px;
+        vertical-align: middle;
+        fill: currentColor;
       }
     }
   }
 
-  .CodeMirror-focused {
+  &:focus-within {
     @include textboxish-focus-styles;
     border-top-width: 1px;
     border-top-style: solid;
diff --git a/app/styles/ui/_autocompletion.scss b/app/styles/ui/_autocompletion.scss
index 192f1fd8eaf..fa6c77aa3e1 100644
--- a/app/styles/ui/_autocompletion.scss
+++ b/app/styles/ui/_autocompletion.scss
@@ -4,45 +4,19 @@
   position: relative;
   display: flex;
   flex-direction: column;
-}
-
-.CodeMirror-hints {
-  list-style: none;
-  flex-direction: column;
-  padding: 0;
-  max-height: 100px;
-
-  // hack to position the dialog a little better than the
-  // default codemirror position.
-  transform: translate(0, -15px);
-  overflow-y: auto;
 
-  li {
-    flex-shrink: 0;
-    height: 29px;
-    padding: 0 var(--spacing);
-  }
-
-  // We can't replicate the nice scrollbars that we have in
-  // the regular autocomplete popup since that's based on List
-  // and this CodeMirror stuff is just an unordered list.
-  // The autocomplete popup is not intended to be used with
-  // a pointer-device anyway so not being able to mouse-wheel
-  // through it shouldn't be a big deal
-  @include win32 {
-    overflow-y: hidden;
-  }
+  // Overflow must be hidden to prevent the "invisible caret" to generate an
+  // horizontal scrollbar when, due to scrolling, that caret is outside the
+  // visible area.
+  overflow: hidden;
 }
 
 .autocompletion-popup {
   overflow: hidden; // To get those sweet rounded corners
 }
 
-.autocompletion-popup,
-.CodeMirror-hints {
+.autocompletion-popup {
   display: flex;
-  position: absolute;
-  z-index: var(--popup-z-index);
   width: 250px;
 
   border-radius: var(--border-radius);
@@ -69,8 +43,7 @@
       border-top: var(--base-border);
     }
 
-    &.selected,
-    &.CodeMirror-hint-active {
+    &.selected {
       --text-color: var(--box-selected-active-text-color);
       --text-secondary-color: var(--box-selected-active-text-color);
 
@@ -78,8 +51,7 @@
       background-color: var(--box-selected-active-background-color);
       border-top-color: var(--box-selected-active-background-color);
 
-      & + .list-item,
-      & + .CodeMirror-hint-active {
+      & + .list-item {
         border-top-color: var(--box-selected-active-background-color);
       }
     }
@@ -112,6 +84,7 @@
       flex-shrink: 0;
       height: 20px;
       width: 20px;
+      font-size: 15px;
       margin-right: var(--spacing-half);
     }
 
@@ -130,7 +103,7 @@
     width: 100%;
 
     .number {
-      margin-right: var(--spacing-half);
+      color: var(--text-secondary-color);
     }
 
     .title {
@@ -172,14 +145,3 @@
     }
   }
 }
-
-.author-input-component {
-  ul.CodeMirror-hints {
-    margin-top: var(--spacing-double);
-    padding: 0;
-    li {
-      margin-bottom: auto;
-      padding-left: var(--spacing);
-    }
-  }
-}
diff --git a/app/styles/ui/_avatar.scss b/app/styles/ui/_avatar.scss
index a5e7843bece..53cfbea671a 100644
--- a/app/styles/ui/_avatar.scss
+++ b/app/styles/ui/_avatar.scss
@@ -3,6 +3,8 @@
 }
 
 .avatar-container {
+  display: flex;
+  align-items: center;
   line-height: 0;
 }
 
diff --git a/app/styles/ui/_banners.scss b/app/styles/ui/_banners.scss
index 4fb62eb852c..ec1aedca619 100644
--- a/app/styles/ui/_banners.scss
+++ b/app/styles/ui/_banners.scss
@@ -2,6 +2,7 @@
 @import 'banners/conflicts';
 @import 'banners/update-available';
 @import 'banners/open_thank_you_card';
+@import 'banners/accessibility-settings';
 
 .banner {
   $banner-height: 30px;
@@ -22,7 +23,6 @@
   .contents {
     display: flex;
     flex-wrap: nowrap;
-    overflow: hidden;
     align-content: center;
     justify-content: left;
     align-items: center;
@@ -31,21 +31,26 @@
     display: flex;
     flex-shrink: 0;
     flex-grow: 0;
-    width: 16px;
-    height: 16px;
+
     margin-right: var(--spacing);
     margin-left: var(--spacing);
-    background: transparent;
-
-    color: var(--text-secondary-color);
-
-    &:hover {
-      color: var(--text-color);
-    }
 
     &:focus {
       outline: 0;
     }
+
+    button {
+      width: 16px;
+      height: 16px;
+      border: 0;
+      padding: 0;
+      color: var(--text-secondary-color);
+      background: transparent;
+
+      &:hover {
+        color: var(--text-color);
+      }
+    }
   }
 
   // animations for entering and leaving
@@ -70,4 +75,11 @@
       transition: height 225ms ease-in-out 175ms, opacity 175ms ease-in;
     }
   }
+
+  // When zooming, give the banner more space to display.
+  @media (max-width: 960px) {
+    height: auto;
+    padding-top: var(--spacing-half);
+    padding-bottom: var(--spacing-half);
+  }
 }
diff --git a/app/styles/ui/_branch-select.scss b/app/styles/ui/_branch-select.scss
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/app/styles/ui/_branches.scss b/app/styles/ui/_branches.scss
index 10cd2f22229..81b4aa73883 100644
--- a/app/styles/ui/_branches.scss
+++ b/app/styles/ui/_branches.scss
@@ -15,6 +15,24 @@
     min-height: 0;
   }
 
+  &.resizable {
+    width: 100%;
+
+    .branches-list {
+      width: 100%;
+
+      &-item {
+        .name {
+          max-width: unset;
+        }
+      }
+    }
+
+    .no-pull-requests {
+      margin: var(--spacing) auto;
+    }
+  }
+
   .branches-list-item {
     height: 100%;
 
@@ -31,6 +49,11 @@
   }
 }
 
+.branches-container-panel {
+  display: flex;
+  flex: 1;
+}
+
 .pull-request-tab {
   display: flex;
   flex-direction: row;
diff --git a/app/styles/ui/_button.scss b/app/styles/ui/_button.scss
index c6f7449bffb..d95e71a10b2 100644
--- a/app/styles/ui/_button.scss
+++ b/app/styles/ui/_button.scss
@@ -10,7 +10,7 @@
 
   padding: 0 var(--spacing);
 
-  border: var(--base-border);
+  border: 1px solid var(--secondary-button-border-color);
   height: var(--button-height);
 
   color: var(--secondary-button-text-color);
@@ -19,18 +19,12 @@
   border-radius: var(--button-border-radius);
 
   &:not([aria-disabled='true']):hover {
-    @include high-contrast {
-      border-width: 2px;
-    }
-
-    border-color: var(--secondary-button-focus-border-color);
+    border-color: var(--secondary-button-hover-border-color);
     background-color: var(--secondary-button-hover-background);
   }
 
   &:focus {
-    background-color: var(--secondary-button-hover-background);
-    border-color: var(--secondary-button-focus-border-color);
-    box-shadow: 0 0 0 1px var(--secondary-button-focus-shadow-color);
+    outline-offset: 4px;
   }
 
   &[aria-disabled='true'] {
@@ -58,9 +52,9 @@
   }
 
   &:focus {
-    border: 1px solid var(--button-focus-border-color);
     background-color: var(--button-hover-background);
-    box-shadow: 0 0 0 2px var(--text-field-focus-shadow-color);
+    border-color: var(--button-background);
+    outline-offset: 4px;
   }
 }
 
@@ -126,3 +120,8 @@
     z-index: 1;
   }
 }
+
+.button-component.copy-button .octicon {
+  height: 12px;
+  width: 12px;
+}
diff --git a/app/styles/ui/_changes.scss b/app/styles/ui/_changes.scss
index 7fe0715ce4c..6c9aad63435 100644
--- a/app/styles/ui/_changes.scss
+++ b/app/styles/ui/_changes.scss
@@ -2,7 +2,7 @@
 @import 'changes/continue-rebase';
 @import 'changes/changes-list';
 @import 'changes/undo-commit';
-@import 'changes/changes-view';
-@import 'changes/no-changes';
+@import 'changes/changes-interstitial';
 @import 'changes/oversized-files-warning';
 @import 'changes/commit-warning';
+@import 'changes/submodule-diff';
diff --git a/app/styles/ui/_checkbox.scss b/app/styles/ui/_checkbox.scss
index 5ce0365a0bf..72f093121b6 100644
--- a/app/styles/ui/_checkbox.scss
+++ b/app/styles/ui/_checkbox.scss
@@ -10,12 +10,5 @@
     &:not(:last-child) {
       margin-right: var(--spacing-half);
     }
-
-    &:focus {
-      // Don't know why but on Windows this is necessary to
-      // not have a 1px gap around the checkbox on the right
-      // hand side. I'm guessing it's the same on mac?
-      outline-offset: -1px;
-    }
   }
 }
diff --git a/app/styles/ui/_cloneable-repository-filter-list.scss b/app/styles/ui/_cloneable-repository-filter-list.scss
index 08e62a51c11..dd974ac1113 100644
--- a/app/styles/ui/_cloneable-repository-filter-list.scss
+++ b/app/styles/ui/_cloneable-repository-filter-list.scss
@@ -16,4 +16,20 @@
       color: var(--text-secondary-color);
     }
   }
+
+  .clone-repository-list-item {
+    .name {
+      flex-grow: 1;
+    }
+
+    .archived {
+      flex-shrink: 0;
+      margin-left: var(--spacing-half);
+      font-size: var(--font-size-xs);
+      border: var(--contrast-border);
+      padding: 1px 3px;
+      border-radius: var(--border-radius);
+      text-transform: uppercase;
+    }
+  }
 }
diff --git a/app/styles/ui/_commit-details.scss b/app/styles/ui/_commit-details.scss
index 519e7afd2e4..e4a81e6a793 100644
--- a/app/styles/ui/_commit-details.scss
+++ b/app/styles/ui/_commit-details.scss
@@ -5,6 +5,7 @@
   flex-direction: row;
   flex: 1;
   overflow: hidden;
+  min-height: 150px;
 
   .fill-window {
     // necessary for "no files in commit" view to
@@ -12,24 +13,14 @@
     border-right: var(--base-border);
   }
 
-  .panel {
-    display: flex;
-    flex: 1;
-
-    &.empty,
-    &.renamed,
-    &.binary {
-      justify-content: center;
-      align-items: center;
-    }
-    &.large-diff {
-      margin: var(--spacing-double);
-      text-align: center;
-      justify-content: initial;
-
-      .blankslate-image {
-        max-height: 150px;
-      }
-    }
+  .file-list-header {
+    background: var(--box-alt-background-color);
+    border-bottom: 1px solid var(--box-border-color);
+    border-right: var(--base-border);
+    height: 30px;
+    line-height: 30px;
+    flex: 0 0 auto;
+    padding: 0 var(--spacing);
+    text-align: center;
   }
 }
diff --git a/app/styles/ui/_commit-message-avatar.scss b/app/styles/ui/_commit-message-avatar.scss
index 1302bdf96c6..abafec04153 100644
--- a/app/styles/ui/_commit-message-avatar.scss
+++ b/app/styles/ui/_commit-message-avatar.scss
@@ -1,6 +1,35 @@
 .commit-message-avatar-component {
   // With this, the popover's absolute position will be relative to its parent
   position: relative;
+  width: var(--text-field-height);
+  height: var(--text-field-height);
+
+  .avatar-button {
+    // override default button styles
+    overflow: inherit;
+    text-overflow: inherit;
+    white-space: inherit;
+    font-family: inherit;
+    font-size: inherit;
+    padding: inherit;
+    border: none;
+    height: inherit;
+    color: inherit;
+    background-color: none;
+
+    border-radius: 50%;
+
+    .avatar-container,
+    .avatar {
+      flex-shrink: 0;
+      width: 100%;
+      height: 100%;
+    }
+  }
+
+  .toggletip {
+    margin-right: var(--spacing-half);
+  }
 
   .warning-badge {
     background-color: var(--commit-warning-badge-background-color);
@@ -13,20 +42,22 @@
     border-radius: 9px;
 
     > svg {
-      color: var(--commit-warning-badge-icon-color);
       height: 10px;
       // With width=100%, the icon will be centered horizontally
       width: 100%;
+      vertical-align: middle;
     }
-  }
 
-  label {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
+    &.warning > svg {
+      color: var(--input-icon-warning-color);
+    }
+
+    &.error > svg {
+      color: var(--input-icon-error-color);
+    }
   }
 
-  h3 {
+  label {
     display: flex;
     flex-direction: row;
     align-items: center;
@@ -43,6 +74,11 @@
 
   .button-row {
     justify-content: flex-end;
+
+    button {
+      min-width: 120px;
+      margin-right: var(--spacing-half);
+    }
   }
 
   .secondary-text {
@@ -61,10 +97,10 @@
       margin-bottom: var(--spacing);
     }
 
-    position: absolute;
-    margin-left: 21px;
-    bottom: 13px;
-
     width: 300px;
   }
+
+  .link-button-component {
+    display: inline;
+  }
 }
diff --git a/app/styles/ui/_configure-git-user.scss b/app/styles/ui/_configure-git-user.scss
index 7d20bdb7c6a..a9072a1ab39 100644
--- a/app/styles/ui/_configure-git-user.scss
+++ b/app/styles/ui/_configure-git-user.scss
@@ -1,6 +1,15 @@
 #configure-git-user {
   .form-component {
     margin: var(--spacing-double) 0;
+
+    // prevents jumpiness when switching between manual and github account options
+    .sign-in-form-inputs {
+      min-height: 150px;
+    }
+
+    .text-box-component {
+      flex: unset;
+    }
   }
 
   .config-lock-file-exists-component {
@@ -30,8 +39,13 @@
     .commit {
       font-size: var(--font-size);
       padding: var(--spacing-half) var(--spacing);
-      width: 280px;
+      width: 100%;
+      max-width: 280px;
       border-bottom: none;
     }
   }
+
+  .git-config-loading {
+    color: var(--text-secondary-color);
+  }
 }
diff --git a/app/styles/ui/_dialog.scss b/app/styles/ui/_dialog.scss
index ff6ead9c4a8..63d7375030d 100644
--- a/app/styles/ui/_dialog.scss
+++ b/app/styles/ui/_dialog.scss
@@ -1,7 +1,5 @@
 @import '../mixins';
-@import 'dialogs/merge';
 @import 'dialogs/conflicts';
-@import 'dialogs/rebase';
 @import 'dialogs/progress-dialog';
 @import 'dialogs/abort-merge';
 @import 'dialogs/push-needs-pull';
@@ -19,13 +17,24 @@
 @import 'dialogs/commit-message';
 @import 'dialogs/choose-branch';
 @import 'dialogs/ci-check-run-rerun';
+@import 'dialogs/unreachable-commits';
+@import 'dialogs/open-pull-request';
+@import 'dialogs/installing-update';
+@import 'dialogs/test-notifications';
+@import 'dialogs/pull-request-comment-like';
+@import 'dialogs/unknown-authors';
+@import 'dialogs/icon_preview';
 
 // The styles herein attempt to follow a flow where margins are only applied
 // to the bottom of elements (with the exception of the last child). This to
 // allow easy layout using generalized components and elements such as <Row>
 // and <p>.
 dialog {
+  display: flex;
+  flex-direction: column;
+
   overflow: unset;
+
   // These are the 24px versions of the alert and stop octicons
   // from oction v10.0.0
   //
@@ -123,14 +132,28 @@ dialog {
     opacity: 1;
   }
 
+  &:not([open]) {
+    display: none;
+  }
+
   // The dialog embeds a fieldset as the first child of the form element
   // in order to be able to disable all form elements and buttons in one
   // swoop. This resets all styles for that fieldset.
-  & > form > fieldset {
-    border: 0;
-    margin: 0;
-    padding: 0;
-    min-width: 0;
+  & > form {
+    min-height: 0;
+    height: 100%;
+    & > fieldset {
+      border: 0;
+      margin: 0;
+      padding: 0;
+      min-width: 0;
+      min-height: 0;
+      max-height: 100%;
+      height: 100%;
+
+      display: flex;
+      flex-direction: column;
+    }
   }
 
   .dialog-header {
@@ -191,7 +214,7 @@ dialog {
       }
 
       &:focus {
-        outline: 0;
+        outline-offset: 3px;
       }
     }
     @include close-button;
@@ -322,9 +345,9 @@ dialog {
     }
   }
 
-  // Inline error component rendered at the top of the dialog just below
+  // Dialog banner components rendered at the top of the dialog just below
   // the header (if the dialog has one).
-  .dialog-error {
+  .dialog-banner {
     display: flex;
     padding: var(--spacing);
     align-items: center;
@@ -334,10 +357,6 @@ dialog {
     // while still forcing line breaks if necessary.
     white-space: pre-wrap;
 
-    background: var(--form-error-background);
-    border-bottom: 1px solid var(--form-error-border-color);
-    color: var(--form-error-text-color);
-
     > .octicon {
       flex-grow: 0;
       flex-shrink: 0;
@@ -348,6 +367,20 @@ dialog {
       overflow-wrap: break-word;
       overflow-x: hidden;
     }
+
+    &.dialog-error {
+      color: var(--form-error-text-color);
+      background: var(--form-error-background);
+      border-bottom: 1px solid var(--form-error-border-color);
+      border-top: 1px solid var(--form-error-border-color);
+    }
+
+    &.dialog-success {
+      color: var(--dialog-banner-success-text-color);
+      background: var(--dialog-banner-success-background);
+      border-top: 1px solid var(--dialog-banner-success-border-color);
+      border-bottom: 1px solid var(--dialog-banner-success-border-color);
+    }
   }
 
   &#app-error {
@@ -379,15 +412,157 @@ dialog {
     }
   }
 
+  // The following media queries ensure that the dialog content is accessible
+  // when zoomed in
+  @media (max-height: 550px) {
+    .dialog-content,
+    .tab-bar,
+    .tab-container {
+      overflow-y: auto;
+      max-height: calc(100vh - 150px) !important;
+    }
+
+    &#publish-repository {
+      .dialog-content {
+        max-height: calc(100vh - 175px);
+      }
+    }
+
+    &#repository-settings,
+    &#preferences {
+      .dialog-content {
+        min-height: calc(100vh - 150px) !important;
+      }
+    }
+
+    &#choose-branch {
+      .dialog-content {
+        overflow-y: unset;
+        max-height: calc(100vh - 194px);
+      }
+      .filter-list-container {
+        overflow-y: auto;
+        max-height: calc(100vh - 230px);
+      }
+      .branches-list {
+        height: calc(100vh - 194px);
+      }
+    }
+
+    &.clone-repository {
+      .dialog-header,
+      .dialog-footer {
+        padding-top: var(--spacing);
+        padding-bottom: var(--spacing);
+      }
+
+      .dialog-content {
+        overflow-y: unset;
+        min-height: calc(100vh - 158px);
+
+        .row-component {
+          margin-bottom: 0px;
+        }
+
+        .local-path-field {
+          padding-top: var(--spacing);
+          padding-bottom: var(--spacing);
+        }
+
+        .clone-github-repo {
+          height: calc(100vh - 225px);
+          max-height: unset;
+        }
+      }
+    }
+
+    &#pull-request-checks-failed {
+      .dialog-content {
+        overflow-y: unset;
+        min-height: unset;
+
+        .ci-check-run-dialog-container {
+          height: calc(100vh - 225px);
+          max-height: unset;
+        }
+      }
+
+      .dialog-header,
+      .dialog-footer {
+        padding-top: var(--spacing);
+        padding-bottom: var(--spacing);
+      }
+
+      .dialog-footer {
+        > .row-component {
+          display: block;
+          .footer-question {
+            margin-bottom: var(--spacing);
+          }
+        }
+      }
+    }
+
+    &.open-pull-request {
+      max-height: calc(100vh - var(--spacing-double));
+
+      .open-pull-request-content {
+        overflow-y: auto;
+        min-height: calc(100vh - 250px);
+        padding: 0;
+
+        .pull-request-files-changed {
+          border: none;
+          border-radius: unset;
+        }
+      }
+
+      .dialog-header,
+      .dialog-footer {
+        padding-top: var(--spacing);
+        padding-bottom: var(--spacing);
+      }
+    }
+
+    &#release-notes {
+      .dialog-content {
+        max-height: calc(100vh - 200px) !important;
+      }
+    }
+  }
+
+  @media (max-width: 600px) {
+    min-width: calc(100% - var(--spacing-double)) !important;
+    max-width: calc(100% - var(--spacing-double)) !important;
+
+    &#release-notes {
+      .container {
+        flex-direction: column;
+      }
+    }
+  }
+
   &#preferences {
     width: 600px;
+
+    .dialog-content {
+      min-height: 410px;
+    }
   }
+
   &#about {
     width: 450px;
   }
+
   &#create-repository {
     width: 400px;
+
+    #create-repo-path-msg {
+      margin-bottom: var(--spacing);
+      margin-top: calc(-1 * var(--spacing));
+    }
   }
+
   &#create-branch {
     width: 400px;
     .link-button-component {
@@ -419,6 +594,11 @@ dialog {
     .description {
       color: var(--text-secondary-color);
       font-size: var(--font-size-sm);
+      margin-bottom: var(--spacing);
+
+      p {
+        margin: 0;
+      }
     }
   }
 
@@ -434,6 +614,12 @@ dialog {
       }
     }
 
+    .existing-account-warning {
+      .ref-component {
+        word-break: break-word;
+      }
+    }
+
     .forgot-password-row,
     .what-is-this-row {
       font-size: var(--font-size-sm);
@@ -458,7 +644,7 @@ dialog {
   }
 
   &#pull-request-checks-failed {
-    max-width: none;
+    max-width: calc(100% - var(--spacing-double));
     width: 910px;
   }
 
diff --git a/app/styles/ui/_diff-options.scss b/app/styles/ui/_diff-options.scss
index f15c1bbd714..df163d08c40 100644
--- a/app/styles/ui/_diff-options.scss
+++ b/app/styles/ui/_diff-options.scss
@@ -20,6 +20,10 @@
       color: var(--text-secondary-color);
     }
 
+    &:focus {
+      outline-offset: 3px;
+    }
+
     .octicon {
       margin-right: 0;
     }
@@ -52,21 +56,35 @@
     align-items: center;
   }
 
-  section + section {
-    margin-top: var(--spacing);
+  legend {
+    margin-top: 0px;
+    margin-bottom: 0.5rem;
+    font-weight: bold;
+    padding: 0px;
   }
 
-  section.button-group {
+  fieldset {
+    border: none;
+    margin: 0px;
+    padding: 0px;
+
+    margin-top: 0.5em;
+    &:not(:last-child) {
+      margin-bottom: 0.5em;
+    }
+  }
+
+  fieldset.button-group {
     display: flex;
     flex-direction: row;
   }
 
-  .popover-component {
-    position: absolute;
-    left: 28px;
-    margin-left: -250px;
-    top: 27px;
+  .secondary-text {
+    margin-top: 0.5em;
+    margin-bottom: 0.5em;
+  }
 
+  .popover-component {
     width: 250px;
   }
 }
diff --git a/app/styles/ui/_diff.scss b/app/styles/ui/_diff.scss
index 63df67d42b8..fe53e50aa7a 100644
--- a/app/styles/ui/_diff.scss
+++ b/app/styles/ui/_diff.scss
@@ -104,7 +104,6 @@
   }
 
   .popover-component.whitespace-hint {
-    position: absolute;
     width: 225px;
   }
 }
@@ -131,31 +130,37 @@
     top: 0;
   }
 
-  .hunk-expand-up-handle {
-    position: absolute;
-    height: 50%;
-    width: 100%;
-    right: 0;
-    bottom: 0;
-    text-align: center;
-  }
+  .hunk-expander {
+    overflow: inherit;
+    text-overflow: inherit;
+    white-space: inherit;
+    font-family: inherit;
+    font-size: inherit;
+    padding: inherit;
+    border: none;
+    height: inherit;
+    color: inherit;
+    background-color: inherit;
 
-  .hunk-expand-down-handle {
     position: absolute;
-    height: 50%;
-    width: 100%;
     right: 0;
-    top: 0;
-    text-align: center;
-  }
-
-  .hunk-expand-whole-handle {
-    position: absolute;
-    height: 100%;
     width: 100%;
-    right: 0;
-    bottom: 0;
     text-align: center;
+
+    &.hunk-expand-up-handle {
+      height: 50%;
+      bottom: 0;
+    }
+
+    &.hunk-expand-down-handle {
+      height: 50%;
+      top: 0;
+    }
+
+    &.hunk-expand-whole-handle {
+      height: 100%;
+      bottom: 0;
+    }
   }
 
   &:not(.includeable) {
@@ -275,39 +280,10 @@
 .CodeMirror-linebackground {
   &.diff-add {
     background: var(--diff-add-background-color);
-
-    @include high-contrast {
-      border-right: var(--hc-diff-add-border);
-      border-left: var(--hc-diff-add-border);
-      margin-top: 1px;
-
-      &.is-first {
-        margin-top: 1px;
-        border-top: var(--hc-diff-add-border);
-      }
-
-      &.is-last {
-        border-bottom: var(--hc-diff-add-border);
-      }
-    }
   }
 
   &.diff-delete {
     background: var(--diff-delete-background-color);
-
-    @include high-contrast {
-      border-right: var(--hc-diff-delete-border);
-      border-left: var(--hc-diff-delete-border);
-
-      &.is-first {
-        margin-top: 1px;
-        border-top: var(--hc-diff-delete-border);
-      }
-
-      &.is-last {
-        border-bottom: var(--hc-diff-delete-border);
-      }
-    }
   }
 
   &.diff-context {
@@ -707,6 +683,10 @@
     color: inherit;
   }
 
+  .cm-quote {
+    color: var(--syntax-quote-color);
+  }
+
   .cm-variable-2,
   .cm-variable-3 {
     color: var(--syntax-alt-variable-color);
@@ -752,6 +732,12 @@
     color: var(--syntax-header-color);
   }
 
+  .cm-m-cmake {
+    &.cm-def {
+      color: var(--syntax-atom-color);
+    }
+  }
+
   .cm-m-css {
     &.cm-property {
       color: var(--syntax-atom-color);
@@ -770,6 +756,12 @@
     }
   }
 
+  .cm-m-toml {
+    &.cm-string.cm-property {
+      color: var(--syntax-string-color);
+    }
+  }
+
   // Intra line markings takes precedence over syntax highlighting.
   .cm-diff-delete-inner {
     color: var(--diff-delete-text-color) !important;
@@ -788,6 +780,38 @@
   overflow: hidden;
   position: relative;
 
+  .panel {
+    padding-top: var(--spacing);
+
+    display: flex;
+    flex: 1;
+
+    &.empty,
+    &.renamed,
+    &.binary {
+      justify-content: center;
+      align-items: center;
+    }
+    &.large-diff {
+      margin: var(--spacing-double);
+      text-align: center;
+      justify-content: initial;
+
+      .blankslate-image {
+        max-height: 150px;
+      }
+
+      .description {
+        margin-top: var(--spacing);
+        margin-bottom: var(--spacing);
+
+        p {
+          margin: 0;
+        }
+      }
+    }
+  }
+
   .loading-indicator {
     position: absolute;
     top: 50%;
@@ -797,7 +821,7 @@
     pointer-events: none;
   }
 
-  .hidden-bidi-chars-warning {
+  .diff-contents-warning-container {
     background-color: var(--file-warning-background-color);
     padding: var(--spacing) var(--spacing-double);
     border-bottom: var(--file-warning-border-color) solid 1px;
@@ -811,6 +835,13 @@
     a.link-button-component {
       display: unset;
     }
+
+    // Separate warning items
+    .diff-contents-warning:not(:last-child) {
+      margin-bottom: var(--spacing);
+      border-bottom: var(--file-warning-border-color) solid 1px;
+      padding-bottom: var(--spacing);
+    }
   }
 
   // When loading a diff
@@ -850,4 +881,62 @@
       }
     }
   }
+
+  // When focus moves to the virtualized grid, we want to show a focus ring.
+  &:has(.ReactVirtualized__Grid:focus-visible) {
+    outline: 2px solid var(--focus-color);
+    border-radius: var(--border-radius);
+
+    // Move the content over to make room for the focus ring
+    margin-right: 2px;
+    margin-bottom: 2px;
+  }
+}
+
+.diff-container {
+  display: flex;
+  flex-direction: column;
+  flex-grow: 1;
+  min-width: 0;
+  max-height: 100%;
+
+  .header {
+    span {
+      user-select: text;
+    }
+
+    background: var(--box-alt-background-color);
+    border-bottom: 1px solid var(--diff-border-color);
+
+    display: flex;
+    flex-direction: row;
+    flex-shrink: 0;
+    flex-grow: 0;
+    align-items: center;
+
+    padding: var(--spacing-half) var(--spacing);
+
+    @include octicon-status;
+
+    .diff-options-component {
+      margin-right: var(--spacing-half);
+      flex-shrink: 0;
+    }
+
+    .octicon.status {
+      flex-shrink: 0;
+      vertical-align: text-bottom;
+      position: relative;
+      align-self: center;
+      flex-shrink: 0;
+    }
+
+    .line-endings {
+      margin-right: var(--spacing-half);
+    }
+
+    .open-merge-tool {
+      margin-right: var(--spacing-half);
+    }
+  }
 }
diff --git a/app/styles/ui/_dropdown-select-button.scss b/app/styles/ui/_dropdown-select-button.scss
index a4d25cec096..870b8fecba1 100644
--- a/app/styles/ui/_dropdown-select-button.scss
+++ b/app/styles/ui/_dropdown-select-button.scss
@@ -1,6 +1,10 @@
 .dropdown-select-button {
   position: relative;
 
+  .dropdown-button-wrappers {
+    display: flex;
+  }
+
   &.open-bottom {
     .invoke-button {
       border-bottom-left-radius: 0;
@@ -13,7 +17,6 @@
     .dropdown-select-button-options {
       border-top-right-radius: 0;
       border-top-left-radius: 0;
-      border-top: none;
     }
   }
 
@@ -29,24 +32,20 @@
     .dropdown-select-button-options {
       border-bottom-right-radius: 0;
       border-bottom-left-radius: 0;
-      border-bottom: none;
     }
   }
 
   .invoke-button {
-    width: 88%;
     display: inline;
     border-bottom-right-radius: 0;
     border-top-right-radius: 0;
     margin-right: 0;
-    float: left;
     height: 30px;
-    // counter balances center for the 12% dropdown button
-    padding-left: 12% !important;
+    flex-grow: 1;
   }
 
   .dropdown-button {
-    width: 12%;
+    min-width: 30px;
     padding: var(--spacing-half);
     margin: 0;
     border-bottom-left-radius: 0;
@@ -79,35 +78,43 @@
     color: var(--text-color);
     background-color: var(--box-alt-background-color);
     background-clip: padding-box;
-    border: 1px solid var(--box-border-color);
     border-radius: var(--border-radius);
     z-index: 100;
     box-shadow: var(--base-box-shadow);
-    width: 99.9%;
-
-    ul {
-      padding: 0;
-      margin: 0;
-
-      li {
-        list-style-type: none;
-        padding: var(--spacing) var(--spacing-double);
-        padding-left: var(--spacing-triple);
-        border-bottom: 1px solid var(--box-border-color);
-
-        .option-description {
-          color: var(--text-secondary-color);
-          font-size: var(--font-size-sm);
-        }
-
-        .selected-option-indicator {
-          position: absolute;
-          left: var(--spacing);
-        }
+    width: 100%;
+    padding: 0;
+    margin: 0;
+    outline: 1px solid var(--box-border-color);
+
+    .menu-pane {
+      padding-bottom: 0;
+    }
+
+    .menu-item {
+      border-bottom: 1px solid var(--box-border-color);
+      height: auto;
+      padding: var(--spacing) var(--spacing-double);
+      padding-left: var(--spacing-triple);
+      align-items: normal;
+      border-radius: 0;
+
+      &:focus-visible {
+        outline: none;
+      }
+
+      .label {
+        margin-left: 0;
+        white-space: inherit;
+      }
+
+      .option-description {
+        color: var(--text-secondary-color);
+        font-size: var(--font-size-sm);
       }
 
-      li:hover {
-        background-color: var(--box-selected-background-color);
+      .icon {
+        position: absolute;
+        left: var(--spacing);
       }
     }
   }
diff --git a/app/styles/ui/_errors.scss b/app/styles/ui/_errors.scss
index 52fb127396b..7a68a4940e5 100644
--- a/app/styles/ui/_errors.scss
+++ b/app/styles/ui/_errors.scss
@@ -2,7 +2,7 @@
   background: var(--form-error-background);
   border: 1px solid var(--form-error-border-color);
   border-radius: var(--border-radius);
-  color: var(--error-color);
+  color: var(--text-color);
   font-size: var(--font-size-sm);
   padding: var(--spacing-half);
 }
diff --git a/app/styles/ui/_foldout.scss b/app/styles/ui/_foldout.scss
index 6d9e33fb061..6d566f094b0 100644
--- a/app/styles/ui/_foldout.scss
+++ b/app/styles/ui/_foldout.scss
@@ -19,10 +19,5 @@
   .foldout {
     background: var(--background-color);
     color: var(--text-color);
-
-    @include high-contrast {
-      border: 1px solid var(--hc-border-color);
-      overflow: hidden;
-    }
   }
 }
diff --git a/app/styles/ui/_git-email-not-found-warning.scss b/app/styles/ui/_git-email-not-found-warning.scss
index 7de748cf35f..eb80e770a50 100644
--- a/app/styles/ui/_git-email-not-found-warning.scss
+++ b/app/styles/ui/_git-email-not-found-warning.scss
@@ -2,4 +2,22 @@
   .warning-icon {
     color: var(--warning-badge-icon-color);
   }
+
+  .link-button-component {
+    display: inline;
+  }
+
+  .green-circle {
+    background-color: var(--color-new);
+    color: var(--background-color);
+    border-radius: 50%;
+    height: 12px;
+    width: 12px;
+    display: inline-flex;
+    margin-right: var(--spacing-half);
+
+    .octicon {
+      height: 12px;
+    }
+  }
 }
diff --git a/app/styles/ui/_history.scss b/app/styles/ui/_history.scss
index ef9bcf4d145..749adce0317 100644
--- a/app/styles/ui/_history.scss
+++ b/app/styles/ui/_history.scss
@@ -1,5 +1,6 @@
 @import 'history/history';
 @import 'history/commit-list';
 @import 'history/commit-summary';
+@import 'history/expandable-commit-summary';
 @import 'history/file-list';
 @import 'history/multiple_commits_selected';
diff --git a/app/styles/ui/_input-description.scss b/app/styles/ui/_input-description.scss
new file mode 100644
index 00000000000..febd4d8d3ee
--- /dev/null
+++ b/app/styles/ui/_input-description.scss
@@ -0,0 +1,31 @@
+.input-description {
+  font-size: var(--font-size-sm);
+  display: flex;
+  flex-direction: row;
+
+  .input-description-content p {
+    margin: 0;
+  }
+
+  .octicon {
+    margin-right: var(--spacing-half);
+  }
+
+  &.input-description-warning {
+    color: var(--text-secondary-color);
+  }
+
+  &.input-description-warning {
+    .octicon {
+      fill: var(--input-warning-text-color);
+    }
+  }
+
+  &.input-description-error {
+    color: var(--input-error-text-color);
+
+    .octicon {
+      fill: var(--input-error-text-color);
+    }
+  }
+}
diff --git a/app/styles/ui/_list.scss b/app/styles/ui/_list.scss
index 0a3a31ab3e5..98a4b8301e9 100644
--- a/app/styles/ui/_list.scss
+++ b/app/styles/ui/_list.scss
@@ -16,6 +16,18 @@
   .ReactVirtualized__Grid {
     background: var(--background-color);
   }
+
+  .keyboard-insertion-element {
+    display: block;
+    position: fixed;
+    z-index: 1000;
+  }
+
+  .overlay {
+    position: fixed;
+    z-index: var(--drag-overlay-z-index);
+    background: var(--overlay-background-color);
+  }
 }
 
 @include win32-context {
@@ -64,19 +76,45 @@
 
 .list-focus-container {
   // The selected items must act as the focused element when inside
-  &.focus-within .list-item.selected {
+  &.focus-within .list-item.selected:not(.in-keyboard-insertion-mode) {
     --text-color: var(--box-selected-active-text-color);
     --text-secondary-color: var(--box-selected-active-text-color);
 
     color: var(--text-color);
     background-color: var(--box-selected-active-background-color);
-
-    @include high-contrast {
-      border: var(--box-selected-active-border);
-    }
   }
 }
 
 .list-item {
-  @include list-item;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+
+  width: 100%;
+  height: 100%;
+
+  &.selected {
+    --text-color: var(--box-selected-text-color);
+    --text-secondary-color: var(--box-selected-text-color);
+
+    color: var(--text-color);
+    background-color: var(--box-selected-background-color);
+  }
+
+  &:focus {
+    outline: none;
+  }
+
+  &:not(.not-selectable):hover {
+    background: var(--list-item-hover-background-color);
+  }
+
+  .list-item-content-wrapper {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+
+    width: 100%;
+    height: 100%;
+  }
 }
diff --git a/app/styles/ui/_no-branches.scss b/app/styles/ui/_no-branches.scss
index 6b5dc0fcfdb..c720e5d4572 100644
--- a/app/styles/ui/_no-branches.scss
+++ b/app/styles/ui/_no-branches.scss
@@ -1,8 +1,11 @@
 .no-branches {
+  width: 365px;
+  margin: var(--spacing) auto;
   display: flex;
   flex: 1;
   flex-direction: column;
   align-items: center;
+  text-align: center;
 
   padding: var(--spacing);
 
@@ -31,4 +34,18 @@
     text-align: center;
     font-size: var(--font-size-sm);
   }
+
+  p {
+    margin: 0;
+  }
+}
+
+.branches-container {
+  &.resizable {
+    .no-branches {
+      width: 365px;
+      margin: var(--spacing) auto;
+      flex: none;
+    }
+  }
 }
diff --git a/app/styles/ui/_no-repositories.scss b/app/styles/ui/_no-repositories.scss
index e55f8ac711c..bae3278f344 100644
--- a/app/styles/ui/_no-repositories.scss
+++ b/app/styles/ui/_no-repositories.scss
@@ -3,6 +3,13 @@
   padding: calc(var(--spacing) * 6);
   align-items: center;
 
+  > section {
+    display: flex;
+    flex-direction: column;
+    flex-grow: 1;
+    min-width: 0;
+  }
+
   header {
     align-self: flex-start;
     margin-bottom: var(--spacing-quad);
@@ -43,13 +50,12 @@
       }
     }
 
-    ul.button-group {
-      list-style-type: none;
+    .button-group {
       margin: 0;
       padding: 0;
       flex-grow: 1;
 
-      li {
+      span {
         margin-bottom: var(--spacing);
         width: 100%;
 
diff --git a/app/styles/ui/_octicons.scss b/app/styles/ui/_octicons.scss
index 8f546e40384..78ac21189bd 100644
--- a/app/styles/ui/_octicons.scss
+++ b/app/styles/ui/_octicons.scss
@@ -1,11 +1,5 @@
 svg.octicon {
   /* https://css-tricks.com/cascading-svg-fill-color/ */
   fill: currentColor;
-
-  /* Only height is specified here since not every Octicon is a 16px wide.
-  Forcing a width of 16px would result in some blurry icons showing up.
-  Instead, let's imply width: auto; instead. */
-  height: 16px;
-
   flex-shrink: 0;
 }
diff --git a/app/styles/ui/_password-text-box.scss b/app/styles/ui/_password-text-box.scss
new file mode 100644
index 00000000000..4f982df3396
--- /dev/null
+++ b/app/styles/ui/_password-text-box.scss
@@ -0,0 +1,36 @@
+.password-text-box {
+  position: relative;
+  margin-bottom: 0;
+  display: flex;
+  flex-grow: 1;
+
+  .text-box-component {
+    input {
+      padding-right: var(--spacing-triple);
+    }
+    margin-bottom: 0 !important;
+  }
+
+  button {
+    position: absolute;
+    bottom: 0;
+    right: 0;
+    width: 16px;
+    margin-right: 0 !important;
+    height: var(--text-field-height);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding: 0 15px !important;
+    color: var(--text-secondary-color);
+
+    // Removing the default button styles
+    overflow: inherit;
+    text-overflow: inherit;
+    white-space: inherit;
+    font-family: inherit;
+    font-size: inherit;
+    border: none;
+    background-color: inherit !important;
+  }
+}
diff --git a/app/styles/ui/_popover-dropdown.scss b/app/styles/ui/_popover-dropdown.scss
new file mode 100644
index 00000000000..12b8c17ff55
--- /dev/null
+++ b/app/styles/ui/_popover-dropdown.scss
@@ -0,0 +1,49 @@
+.popover-dropdown-component {
+  display: inline-flex;
+
+  .button-content,
+  .popover-dropdown-button-label {
+    font-weight: var(--font-weight-semibold);
+  }
+
+  .popover-dropdown-button-label {
+    color: var(--text-secondary-color);
+    margin: 0 var(--spacing-half);
+  }
+
+  .popover-dropdown-popover {
+    min-height: 200px;
+    width: 365px;
+
+    .popover-content {
+      padding: 0;
+    }
+
+    .popover-dropdown-wrapper {
+      display: flex;
+      flex-direction: column;
+      height: 100%;
+    }
+
+    .popover-dropdown-header {
+      padding: var(--spacing);
+      display: flex;
+      border-bottom: var(--base-border);
+
+      h3 {
+        margin-bottom: 0;
+        font-size: var(--font-size);
+      }
+
+      .close {
+        margin-right: 0;
+      }
+    }
+
+    .popover-dropdown-content {
+      display: flex;
+      flex-grow: 1;
+      min-height: 0;
+    }
+  }
+}
diff --git a/app/styles/ui/_popover.scss b/app/styles/ui/_popover.scss
index 23907d3003e..f3577274c59 100644
--- a/app/styles/ui/_popover.scss
+++ b/app/styles/ui/_popover.scss
@@ -2,31 +2,16 @@
   font-size: var(--font-size);
   font-family: var(--font-family-sans-serif);
 
-  z-index: var(--foldout-z-index);
-
   background: var(--background-color);
   color: var(--text-color);
   border-radius: var(--border-radius);
   border: var(--base-border);
 
-  padding: var(--spacing-double);
-
   box-shadow: var(--base-box-shadow);
 
-  &::before,
-  &::after {
-    position: absolute;
-    display: inline-block;
-    content: '';
-    pointer-events: none;
-  }
-
-  &::before {
-    border: 8px solid transparent;
-  }
-
-  &::after {
-    border: 7px solid transparent;
+  .popover-content {
+    padding: var(--spacing-double);
+    border-radius: var(--border-radius);
   }
 
   & > p:first-of-type,
@@ -87,123 +72,17 @@
   }
 }
 
-// Carets
-.popover-component.popover-caret-top-right {
-  &::before,
-  &::after {
-    right: 20px;
-  }
-
-  &::before {
-    top: -16px;
-    margin-right: -9px;
-    border-bottom-color: var(--box-border-color);
-  }
-
-  &::after {
-    top: -14px;
-    margin-right: -8px;
-    border-bottom-color: var(--background-color);
-  }
-}
-
-.popover-component.popover-caret-top-left {
-  &::before,
-  &::after {
-    left: 20px;
-  }
-
-  &::before {
-    top: -16px;
-    margin-right: -9px;
-    border-bottom-color: var(--box-border-color);
-  }
-
-  &::after {
-    top: -14px;
-    margin-right: -8px;
-    border-bottom-color: var(--background-color);
-  }
-}
-
-.popover-component.popover-caret-top {
-  &::before,
-  &::after {
-    position: absolute;
-    left: 50%;
-    display: inline-block;
-    content: '';
-    pointer-events: none;
-  }
-
-  &::before {
-    top: -16px;
-    margin-right: -9px;
-    border: 8px solid transparent;
-    border-bottom-color: var(--box-border-color);
+.popover-tip {
+  * {
+    border-style: solid;
+    border-color: transparent;
   }
 
-  &::after {
-    top: -14px;
-    margin-right: -8px;
-    border: 7px solid transparent;
-    border-bottom-color: var(--background-color);
-  }
-}
-
-.popover-component.popover-caret-left-top {
-  &::before,
-  &::after {
-    top: 20px;
-  }
-
-  &::before {
-    left: -16px;
-    margin-top: -9px;
-    border-right-color: var(--box-border-color);
-  }
-
-  &::after {
-    left: -14px;
-    margin-top: -8px;
+  .popover-tip-background {
     border-right-color: var(--background-color);
   }
-}
-
-.popover-component.popover-caret-left-bottom {
-  &::before,
-  &::after {
-    bottom: 20px;
-  }
 
-  &::before {
-    left: -16px;
-    margin-bottom: -9px;
+  .popover-tip-border {
     border-right-color: var(--box-border-color);
   }
-
-  &::after {
-    left: -14px;
-    margin-bottom: -8px;
-    border-right-color: var(--background-color);
-  }
-}
-
-.popover-component.popover-caret-right-top {
-  &::before,
-  &::after {
-    top: 20px;
-  }
-
-  &::before {
-    right: -16px;
-    margin-top: -9px;
-    border-left-color: var(--box-border-color);
-  }
-
-  &::after {
-    right: -14px;
-    margin-top: -8px;
-    border-left-color: var(--background-color);
-  }
 }
diff --git a/app/styles/ui/_preferences.scss b/app/styles/ui/_preferences.scss
index 257c3bc2a85..de1a051d245 100644
--- a/app/styles/ui/_preferences.scss
+++ b/app/styles/ui/_preferences.scss
@@ -6,6 +6,14 @@
       flex: 1;
     }
 
+    fieldset {
+      border: none;
+      margin-left: 0;
+      margin-right: 0;
+      padding-left: 0;
+      padding-right: 0;
+    }
+
     .advanced-section {
       &:not(:last-child) {
         margin-bottom: var(--spacing);
@@ -19,6 +27,10 @@
         margin-top: var(--spacing);
       }
 
+      .setting-hint-warning {
+        margin-top: var(--spacing);
+      }
+
       .warning-icon {
         color: var(--warning-badge-icon-color);
       }
@@ -33,6 +45,12 @@
 
   .accounts-tab {
     .account-info {
+      .user-info-container {
+        display: flex;
+        flex-grow: 1;
+        gap: var(--spacing);
+      }
+
       .avatar {
         // 32px for the image + 2 on each side for the base border.
         width: 34px;
@@ -54,6 +72,29 @@
         }
       }
     }
+
+    @media (max-width: 600px) {
+      .account-info {
+        flex-direction: column;
+
+        .user-info-container {
+          margin-bottom: var(--spacing);
+        }
+
+        .button-component {
+          align-self: normal;
+        }
+      }
+    }
+
+    .call-to-action {
+      display: block;
+
+      .button-component {
+        margin-top: var(--spacing);
+        margin-left: 0;
+      }
+    }
   }
 
   .no-options-found {
@@ -72,6 +113,10 @@
     .ref-name-text-box {
       margin-top: var(--spacing);
     }
+
+    #default-branch-description {
+      margin-top: var(--spacing);
+    }
   }
 
   .git-settings-description {
@@ -79,6 +124,71 @@
     font-size: var(--font-size-sm);
     color: var(--text-secondary-color);
   }
+
+  .theme-selector {
+    display: flex;
+    flex-wrap: wrap;
+    margin: 0 calc(var(--spacing-half) * -1);
+
+    .radio-button-component {
+      display: block;
+      flex-shrink: 0;
+      padding: var(--spacing-half);
+      position: relative;
+      width: 50%;
+      margin: 0;
+
+      input[type='radio'] {
+        position: absolute;
+        left: calc(var(--spacing) + var(--spacing-half));
+        margin-top: calc(54.5%);
+
+        &:checked + label {
+          border-color: var(--box-selected-active-background-color);
+        }
+      }
+
+      label {
+        border-radius: var(--border-radius);
+        border: var(--base-border);
+        float: left;
+        overflow: hidden;
+        padding-bottom: var(--spacing-half);
+        width: 100%;
+        margin: 0;
+
+        .theme-value-label {
+          margin-left: calc(var(--spacing-triple));
+        }
+
+        img {
+          width: 100%;
+          border-bottom: var(--base-border);
+          margin-bottom: var(--spacing-half);
+          display: block;
+        }
+
+        .system-theme-swatch {
+          width: 100%;
+          position: relative;
+          display: block;
+
+          img {
+            position: absolute;
+            top: 0;
+
+            &:first-child {
+              position: inherit;
+            }
+
+            &:last-child {
+              clip-path: polygon(50% 0, 100% 0%, 100% 100%, 50% 100%);
+            }
+          }
+        }
+      }
+    }
+  }
 }
 
 #external-editor-error {
@@ -89,6 +199,19 @@
   }
 }
 
+.custom-integration-form-container {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+
+  gap: var(--spacing-half);
+
+  .custom-integration-form-path-container {
+    display: flex;
+    gap: var(--spacing);
+  }
+}
+
 .custom-theme-selector {
   .custom-theme-selecter-header {
     display: flex;
diff --git a/app/styles/ui/_pull-request-badge.scss b/app/styles/ui/_pull-request-badge.scss
index 56a967e4a08..ac755898081 100644
--- a/app/styles/ui/_pull-request-badge.scss
+++ b/app/styles/ui/_pull-request-badge.scss
@@ -27,10 +27,18 @@
 
   border-radius: var(--border-radius);
   border-width: 0;
+  border: none;
 
   margin-right: var(--spacing);
   padding: var(--spacing-half);
 
+  // remove regular button styles
+  font-size: inherit;
+  overflow: visible;
+  text-overflow: inherit;
+  font-family: inherit;
+  color: inherit;
+
   .number {
     font-size: var(--font-size-sm);
 
diff --git a/app/styles/ui/_pull-request-checks-failed.scss b/app/styles/ui/_pull-request-checks-failed.scss
index b3644c1fc9b..1a828fe9718 100644
--- a/app/styles/ui/_pull-request-checks-failed.scss
+++ b/app/styles/ui/_pull-request-checks-failed.scss
@@ -3,6 +3,11 @@
     height: unset;
   }
 
+  .ci-check-rerun {
+    margin-left: var(--spacing);
+    margin-right: var(--spacing);
+  }
+
   .ci-check-run-dialog-header {
     display: flex;
     flex-direction: row;
@@ -16,12 +21,12 @@
     }
 
     .title-container {
+      min-width: 0;
       flex-grow: 1;
 
       .pr-title {
-        display: flex;
-        column-gap: 4px;
-        align-items: center;
+        display: inline-block;
+        white-space: normal;
         font-weight: normal;
         font-size: var(--font-size);
 
@@ -88,39 +93,33 @@
 
         .ci-check-list-item {
           padding-left: var(--spacing);
+
+          .check-run-header-buttons {
+            right: var(--spacing-half);
+          }
         }
       }
 
       .ci-check-run-job-steps-container {
         width: 60%;
         overflow-y: auto;
+        padding: var(--spacing);
+        background-color: var(--box-alt-background-color);
 
         .ci-check-run-job-steps-list {
           border: none;
-        }
+          margin: 0px;
+          padding: 0px;
 
-        .no-steps-to-display {
-          display: flex;
-          padding: var(--spacing-double);
-          align-items: center;
-          height: 100%;
-
-          .text {
-            flex: 1;
-            margin-right: var(--spacing);
-
-            div {
-              margin-top: var(--spacing);
-            }
+          .ci-check-run-job-step {
+            margin: 0px;
+            padding: 0px;
           }
+        }
 
-          .blankslate-image {
-            flex: 0;
-            height: 140px;
-            width: 146px;
-            min-width: 140px;
-            min-height: 146px;
-            align-self: flex-end;
+        .ci-check-run-no-steps {
+          img {
+            height: 80%;
           }
         }
 
diff --git a/app/styles/ui/_pull-request-files-changed.scss b/app/styles/ui/_pull-request-files-changed.scss
new file mode 100644
index 00000000000..55d72dadbdc
--- /dev/null
+++ b/app/styles/ui/_pull-request-files-changed.scss
@@ -0,0 +1,29 @@
+.pull-request-files-changed {
+  display: flex;
+  flex-direction: column;
+  min-height: 0;
+  flex-grow: 1;
+
+  border: var(--base-border);
+  border-radius: var(--border-radius);
+
+  .files-changed-header {
+    padding: var(--spacing);
+    border-bottom: var(--base-border);
+    display: flex;
+
+    .commits-displayed {
+      flex-grow: 1;
+    }
+  }
+
+  .files-diff-viewer {
+    display: flex;
+    min-height: 0;
+    flex-grow: 1;
+  }
+
+  .file-list {
+    border-right: var(--base-border);
+  }
+}
diff --git a/app/styles/ui/_pull-request-merge-status.scss b/app/styles/ui/_pull-request-merge-status.scss
new file mode 100644
index 00000000000..f9d3377ae66
--- /dev/null
+++ b/app/styles/ui/_pull-request-merge-status.scss
@@ -0,0 +1,31 @@
+.pull-request-merge-status {
+  flex-grow: 1;
+  color: var(--text-secondary-color);
+
+  .octicon {
+    vertical-align: text-bottom;
+  }
+
+  strong {
+    font-weight: var(--font-weight-semibold);
+  }
+
+  .pr-merge-status-loading {
+    strong {
+      color: var(--file-warning-color);
+    }
+  }
+
+  .pr-merge-status-invalid,
+  .pr-merge-status-conflicts {
+    strong {
+      color: var(--status-error-color);
+    }
+  }
+
+  .pr-merge-status-clean {
+    strong {
+      color: var(--status-success-color);
+    }
+  }
+}
diff --git a/app/styles/ui/_repository-list.scss b/app/styles/ui/_repository-list.scss
index 044b1b8aa38..6adfa2d5b65 100644
--- a/app/styles/ui/_repository-list.scss
+++ b/app/styles/ui/_repository-list.scss
@@ -193,6 +193,12 @@
           background: var(--list-item-selected-active-badge-background-color);
           color: var(--list-item-selected-active-badge-color);
         }
+
+        .change-indicator-wrapper {
+          .octicon {
+            color: var(--text-color);
+          }
+        }
       }
     }
 
diff --git a/app/styles/ui/_repository.scss b/app/styles/ui/_repository.scss
index 8f3449950ab..b5f60ac6fc1 100644
--- a/app/styles/ui/_repository.scss
+++ b/app/styles/ui/_repository.scss
@@ -26,6 +26,7 @@
       height: 100%;
       flex: 1 1 auto;
       min-height: 0;
+      overflow-y: auto;
     }
   }
 }
diff --git a/app/styles/ui/_scroll.scss b/app/styles/ui/_scroll.scss
index 30f477b7296..6d7f5152e77 100644
--- a/app/styles/ui/_scroll.scss
+++ b/app/styles/ui/_scroll.scss
@@ -59,3 +59,40 @@
     }
   }
 }
+
+@include linux-context {
+  // Linux scrollbars need styled, too
+  ::-webkit-scrollbar {
+    width: var(--linux-scroll-bar-size);
+    height: var(--linux-scroll-bar-size);
+    background: transparent;
+    cursor: pointer;
+
+    &-thumb {
+      background-color: var(--scroll-bar-thumb-background-color);
+      border-radius: var(--linux-scroll-bar-size);
+
+      // This little hack allows us to have a slim scroll bar
+      // with a bigger hit area. The scroll bar width/height
+      // is 10px but we're cutting off 6px using clipping so
+      // that it appears as if it's actually only 4px.
+      border-color: transparent;
+      border-style: solid;
+      border-width: 3px;
+      background-clip: padding-box;
+
+      // ...and when it's pressed we'll up the contrast
+      &:active {
+        background-color: var(--scroll-bar-thumb-background-color-active);
+      }
+
+      // When someone hovers over, or presses the bar we'll expand it to 8px
+      &:hover,
+      &:active {
+        border-width: 1px;
+        background-color: var(--scroll-bar-thumb-background-color-active);
+        cursor: pointer;
+      }
+    }
+  }
+}
diff --git a/app/styles/ui/_select.scss b/app/styles/ui/_select.scss
index f7105f82e08..b636f0b2961 100644
--- a/app/styles/ui/_select.scss
+++ b/app/styles/ui/_select.scss
@@ -17,7 +17,6 @@
   select {
     // Make the select look like a text box.
     @include textboxish;
-    @include textboxish-disabled;
 
     // Don't include the default padding from textboxish, it's too much
     padding: 0;
diff --git a/app/styles/ui/_side-by-side-diff.scss b/app/styles/ui/_side-by-side-diff.scss
index 028c67912a4..1e3401bfdae 100644
--- a/app/styles/ui/_side-by-side-diff.scss
+++ b/app/styles/ui/_side-by-side-diff.scss
@@ -1,16 +1,32 @@
 .side-by-side-diff-container {
   --width-line-number: 55px;
 
+  --hunk-handle-width-with-check-all: 16px;
+  --hunk-handle-width: 4px;
+
+  display: flex;
+  flex-direction: column;
   width: 100%;
   overflow: hidden;
   flex-grow: 1;
-  user-select: contain;
   position: relative;
 
+  &,
+  * {
+    cursor: text;
+    user-select: text;
+  }
+
+  .sr-only {
+    user-select: none;
+  }
+
+  // See https://github.com/desktop/desktop/pull/15128#issuecomment-1232689068
+  &:not(:focus-within) .content,
   &.selecting-before .after,
   &.selecting-after .before {
-    span,
-    div {
+    &,
+    * {
       user-select: none;
     }
   }
@@ -21,16 +37,34 @@
         flex-direction: row-reverse;
         border-right: none;
       }
-    }
 
-    .before .line-number {
-      border-right-width: 2px;
-      border-right-style: solid;
-    }
+      &.context .before {
+        border-right: calc(var(--hunk-handle-width) / 2) solid var(--diff-border-color);
+      }
 
-    .after .line-number {
-      border-left-width: 2px;
-      border-left-style: solid;
+      &.context .after {
+        border-right: calc(var(--hunk-handle-width) / 2) solid var(--diff-border-color);
+      }
+
+      &.has-check-all-control.context .before {
+        border-right: calc(var(--hunk-handle-width-with-check-all) / 2) solid var(--diff-border-color);
+      }
+
+      &.has-check-all-control.context .after {
+        border-left: calc(var(--hunk-handle-width-with-check-all) / 2) solid var(--diff-border-color);
+      }
+
+      &.has-check-all-control {
+        .hunk-expansion-handle {
+          padding-left: calc(var(--hunk-handle-width-with-check-all) / 2);
+          padding-right: calc(var(--hunk-handle-width-with-check-all) / 2);
+        }
+      }
+
+      .hunk-expansion-handle {
+        padding-left: calc(var(--hunk-handle-width) / 2);
+        padding-right: calc(var(--hunk-handle-width) / 2);
+      }
     }
   }
 
@@ -38,7 +72,6 @@
     display: flex;
     flex-direction: column;
     flex-grow: 1;
-    height: 100%;
     width: 100%;
     font-family: var(--font-family-monospace);
     font-size: var(--font-size-sm);
@@ -55,255 +88,350 @@
   }
 
   .row {
-    .popover-component.whitespace-hint {
-      position: fixed;
-      width: 275px;
-    }
-  }
-
-  .row .line-number {
-    width: var(--width-line-number);
-    flex-shrink: 0;
-    background: var(--diff-gutter-background-color);
-    color: var(--diff-line-number-color);
     display: flex;
-    box-sizing: content-box;
+    flex-direction: row;
+    line-height: 20px;
     position: relative;
+    height: 100%;
 
-    span {
-      flex: 1;
-      user-select: none;
-      padding: 0 var(--spacing-half);
-      overflow: hidden;
-      text-overflow: ellipsis;
-      // Workaround to show the ellipsis at the beginning of
-      // the line number when it's too long.
-      direction: rtl;
+    // Allow right-clicks to go through the octicons to their parent
+    .line-number .octicon,
+    .hunk-handle .octicon {
+      pointer-events: none;
     }
 
-    &.selectable {
-      &.hoverable span {
-        cursor: pointer;
+    &.hunk-info {
+      background: var(--diff-hunk-background-color);
+      color: var(--diff-hunk-text-color);
+      align-items: center;
+
+      .line-number {
+        background: var(--diff-hunk-background-color);
+        border-color: var(--diff-border-color);
       }
+    }
 
-      &.line-selected {
-        background: var(--diff-selected-background-color);
-        color: var(--diff-selected-text-color);
-        border-color: var(--diff-selected-border-color);
+    &.added .before,
+    &.deleted .after {
+      background: var(--diff-empty-row-background-color);
 
-        &.hoverable:hover,
-        &.hover {
-          background: var(--diff-hover-background-color);
-          color: var(--diff-hover-text-color);
-          border-color: var(--diff-hover-border-color);
-        }
+      .line-number {
+        background: var(--diff-empty-row-gutter-background-color);
+        border-color: var(--diff-border-color);
       }
     }
-  }
 
-  .row .hunk-expansion-handle {
-    width: var(--width-line-number);
-    flex-shrink: 0;
-    background: var(--diff-hunk-background-color);
-    color: var(--diff-hunk-text-color);
-    display: flex;
-    box-sizing: content-box;
+    &.context .before,
+    &.context .after {
+      background: var(--diff-background-color);
+      color: var(--diff-text-color);
 
-    span {
-      width: 100%;
-      height: 100%;
-      padding: 0 var(--spacing-half);
+      .line-number {
+        background: var(--diff-gutter-background-color);
+        border-color: var(--diff-border-color);
+      }
+    }
+
+    .before,
+    .after {
+      width: 50%;
       display: flex;
-      align-items: center;
-      justify-content: center;
-      padding: 4px 0;
+      flex-direction: row;
+      position: relative;
     }
 
-    &.selectable.hoverable {
-      * {
-        cursor: pointer;
+    .before {
+      color: var(--diff-delete-text-color);
+      background: var(--diff-delete-background-color);
+
+      .line-number {
+        background: var(--diff-delete-gutter-background-color);
+        border-color: var(--diff-delete-border-color);
       }
 
-      &:hover {
-        background: var(--diff-hover-background-color);
-        border-color: var(--diff-hover-border-color);
-        color: var(--diff-hover-text-color);
+      .selectable {
+        &.hoverable:hover {
+          border-color: var(--diff-delete-hover-border-color);
+        }
+
+        &.hoverable:hover,
+        &.hoverable:hover label,
+        &.hover,
+        &.hover label,
+        input:focus-visible + label {
+          background: var(--diff-delete-hover-background-color);
+          color: var(--diff-delete-hover-text-color);
+          border-color: var(--diff-delete-hover-border-color);
+        }
       }
     }
-  }
 
-  .hunk-handle {
-    position: absolute;
-    height: 100%;
-    width: 20px;
-    left: calc(50% - 10px);
-    top: 0;
+    .after {
+      color: var(--diff-add-text-color);
+      background: var(--diff-add-background-color);
 
-    &.hoverable {
-      cursor: pointer;
-    }
-  }
+      .line-number {
+        background: var(--diff-add-gutter-background-color);
+        border-color: var(--diff-add-border-color);
+      }
 
-  .content {
-    padding-left: var(--spacing);
-    white-space: pre-wrap;
-    overflow-y: auto;
-    flex-grow: 1;
-    word-break: break-all;
+      .selectable {
+        &.hoverable:hover {
+          border-color: var(--diff-add-hover-border-color);
+        }
 
-    &,
-    * {
-      cursor: text;
-      user-select: text;
+        &.hoverable:hover,
+        &.hoverable:hover label,
+        &.hover,
+        &.hover label,
+        input:focus-visible + label {
+          background: var(--diff-add-hover-background-color);
+          color: var(--diff-add-hover-text-color);
+          border-color: var(--diff-add-hover-border-color);
+        }
+      }
     }
 
-    &:before {
-      content: ' ';
-      padding-right: var(--spacing);
+    input:focus-visible + label.hunk-handle.selected {
+      background: var(--diff-hover-background-color);
     }
 
-    .octicon {
-      height: 8px;
-      fill: var(--error-color);
-      display: inline-block;
-      margin-left: 3px;
-      margin-bottom: -1px;
+    input:focus-visible + label.hunk-handle {
+      .focus-handle {
+        outline: 2px solid var(--diff-linenumber-focus-color);
+        outline-offset: 3px;
+      }
     }
-  }
 
-  .before,
-  .after {
-    width: 50%;
-    display: flex;
-    flex-direction: row;
-    position: relative;
-  }
+    .hunk-handle-place-holder,
+    .hunk-handle {
+      width: var(--hunk-handle-width);
+      height: 100%;
+      background-color: var(--diff-empty-hunk-handle);
 
-  .before {
-    color: var(--diff-delete-text-color);
-    background: var(--diff-delete-background-color);
+      &.selected {
+        background-color: var(--diff-selected-border-color);
+      }
+    }
 
-    @include high-contrast {
-      border-right: var(--hc-diff-delete-border);
-      border-left: var(--hc-diff-delete-border);
+    .hunk-handle {
+      position: absolute;
+      display: flex;
+      left: calc(50% - var(--hunk-handle-width) / 2);
+      color: white;
+      padding-top: 3px;
+      text-align: center;
+      user-select: none;
 
-      &.is-first {
-        border-top: var(--hc-diff-delete-border);
+      * {
+        user-select: none;
       }
 
-      &.is-last {
-        border-bottom: var(--hc-diff-delete-border);
+      .focus-handle {
+        border-radius: var(--border-radius);
+        height: calc(100% + 4px);
+        width: 100%;
+        margin-top: -4px;
+        padding-top: 3px;
       }
-    }
 
-    .line-number {
-      background: var(--diff-delete-gutter-background-color);
-      border-color: var(--diff-delete-border-color);
-    }
+      .octicon {
+        height: 12px;
+      }
 
-    .selectable.hoverable:hover,
-    .selectable.hover {
-      background: var(--diff-delete-hover-background-color);
-      color: var(--diff-delete-hover-text-color);
-      border-color: var(--diff-delete-hover-border-color);
+      * {
+        cursor: pointer;
+      }
     }
-  }
-
-  .after {
-    color: var(--diff-add-text-color);
-    background: var(--diff-add-background-color);
 
-    @include high-contrast {
-      border-left: var(--hc-diff-add-border);
-      border-right: var(--hc-diff-add-border);
+    &.has-check-all-control {
+      .hunk-handle-place-holder,
+      .hunk-handle {
+        width: var(--hunk-handle-width-with-check-all);
+      }
 
-      &.is-first {
-        border-top: var(--hc-diff-add-border);
+      .hunk-handle {
+        left: calc(50% - var(--hunk-handle-width-with-check-all) / 2);
       }
 
-      &.is-last {
-        border-bottom: var(--hc-diff-add-border);
+      input:focus-visible + label.hunk-handle {
+        .focus-handle {
+          outline-offset: -3px;
+        }
       }
     }
 
-    .line-number {
-      background: var(--diff-add-gutter-background-color);
-      border-color: var(--diff-add-border-color);
-    }
+    .hunk-handle {
+      z-index: 1;
+
+      &.hoverable {
+        cursor: pointer;
+      }
 
-    .selectable.hoverable:hover,
-    .selectable.hover {
-      background: var(--diff-add-hover-background-color);
-      color: var(--diff-add-hover-text-color);
-      border-color: var(--diff-add-hover-border-color);
+      .increased-hover-surface {
+        position: absolute;
+        margin-left: -5px;
+        width: 15px;
+        z-index: 1;
+        cursor: pointer;
+      }
     }
-  }
 
-  .row {
-    display: flex;
-    flex-direction: row;
-    line-height: 20px;
-    position: relative;
+    &.modified {
+      .increased-hover-surface {
+        width: 20px;
+        margin-left: -8px;
+      }
+    }
 
-    &.hunk-info {
+    .hunk-expansion-handle {
+      button {
+        overflow: inherit;
+        text-overflow: inherit;
+        white-space: inherit;
+        font-family: inherit;
+        font-size: inherit;
+        border: none;
+        height: inherit;
+        color: inherit;
+        background-color: inherit;
+        width: calc(100% - 2px);
+        height: calc(100% - var(--spacing));
+        padding: 0px;
+        padding-top: 4px;
+        padding-bottom: 1px;
+        margin: 1px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        outline-offset: 0;
+      }
+      width: var(--width-line-number);
+      flex-shrink: 0;
       background: var(--diff-hunk-background-color);
       color: var(--diff-hunk-text-color);
-      align-items: center;
+      display: flex;
+      box-sizing: content-box;
 
-      div,
-      span {
-        user-select: none;
-        cursor: default;
-      }
+      &.selectable.hoverable {
+        * {
+          cursor: pointer;
+        }
 
-      .line-number {
-        background: var(--diff-hunk-background-color);
-        border-color: var(--diff-border-color);
+        &:hover {
+          background: var(--diff-hover-background-color);
+          border-color: var(--diff-hover-border-color);
+          color: var(--diff-hover-text-color);
+        }
       }
     }
 
-    &.added .before,
-    &.deleted .after {
-      background: var(--diff-empty-row-background-color);
+    .line-number {
+      width: var(--width-line-number);
+      flex-shrink: 0;
+      background: var(--diff-gutter-background-color);
+      color: var(--diff-line-number-color);
+      display: flex;
+      box-sizing: content-box;
+      position: relative;
 
-      @include high-contrast {
-        border: none;
+      input {
+        user-select: none;
       }
 
-      .line-number {
-        background: var(--diff-empty-row-gutter-background-color);
-        border-color: var(--diff-border-color);
-      }
-    }
+      label {
+        width: 100%;
+        display: flex;
+        border-color: inherit;
+        border-radius: var(--border-radius);
+
+        .line-number-check {
+          display: flex;
+          justify-content: center;
+          width: 20px;
+          flex-shrink: 0;
+          padding-top: 3.5px;
+
+          .octicon {
+            height: 12px;
+          }
+        }
 
-    &.added,
-    &.modified {
-      .after .content:before {
-        content: '+';
+        span {
+          flex: 1;
+          user-select: none;
+          padding: 0 var(--spacing-half);
+          overflow: hidden;
+          text-overflow: ellipsis;
+          // Workaround to show the ellipsis at the beginning of
+          // the line number when it's too long.
+          direction: rtl;
+        }
       }
-    }
 
-    &.deleted,
-    &.modified {
-      .before .content:before {
-        content: '-';
+      &.selectable {
+        input:focus-visible + label {
+          outline: 2px solid var(--diff-linenumber-focus-color);
+          outline-offset: -3px;
+        }
+
+        .line-number-check,
+        .line-number-check .octicon,
+        .line-number-check .octicon path,
+        &.hoverable span {
+          cursor: pointer;
+        }
+
+        &.line-selected {
+          border-color: var(--diff-selected-border-color);
+          background: var(--diff-selected-background-color);
+
+          label {
+            background: var(--diff-selected-background-color);
+            color: var(--diff-selected-text-color);
+            border-color: var(--diff-selected-border-color);
+          }
+
+          &.hoverable:hover {
+            border-color: var(--diff-hover-border-color);
+          }
+
+          &.hoverable:hover,
+          &.hoverable:hover label,
+          &.hover,
+          &.hover label,
+          input:focus-visible + label {
+            background: var(--diff-hover-background-color);
+            color: var(--diff-hover-text-color);
+            border-color: var(--diff-hover-border-color);
+          }
+        }
       }
     }
 
-    &.context .before,
-    &.context .after {
-      background: var(--diff-background-color);
-      color: var(--diff-text-color);
+    .content {
+      display: flex;
+      white-space: pre-wrap;
+      overflow-y: auto;
+      flex-grow: 1;
+      word-break: break-all;
 
-      @include high-contrast {
-        border: none;
+      .prefix {
+        user-select: none;
       }
 
-      .line-number {
-        background: var(--diff-gutter-background-color);
-        border-color: var(--diff-border-color);
+      .octicon {
+        height: 8px;
+        fill: var(--error-color);
+        display: inline-block;
+        margin-left: 3px;
+        margin-bottom: -1px;
       }
     }
+
+    .popover-component.whitespace-hint {
+      width: 275px;
+    }
   }
 
   &.unified-diff {
@@ -315,13 +443,34 @@
         flex-direction: row;
       }
 
+      &.hunk-info {
+        .line-number {
+          background: var(--diff-hunk-gutter-background-color);
+          border-color: var(--diff-hunk-border-color);
+        }
+        .hunk-expansion-handle {
+          background: var(--diff-hunk-gutter-background-color);
+          border-right-width: 1px;
+          border-right-style: solid;
+          border-color: var(--diff-hunk-gutter-background-color);
+          align-self: stretch;
+          align-items: center;
+
+          &.selectable:hover {
+            border-color: var(--diff-hover-background-color);
+          }
+        }
+      }
+
       .hunk-handle {
-        left: 100px;
+        left: 0;
       }
 
-      &.hunk-info .line-number {
-        background: var(--diff-hunk-gutter-background-color);
-        border-color: var(--diff-hunk-border-color);
+      &.context .before {
+        margin-right: 0;
+      }
+      &.context .after {
+        margin-left: 0;
       }
 
       .line-number {
@@ -330,7 +479,7 @@
         border-right-width: 1px;
         border-right-style: solid;
 
-        span:first-child {
+        span:first-of-type {
           border-right-width: 1px;
           border-right-style: solid;
           border-color: inherit;
@@ -342,8 +491,21 @@
       }
     }
 
-    &.editable .row .line-number {
-      border-right-width: 4px;
+    &.editable {
+      .row {
+        &.context .before,
+        &.context .after {
+          border-right: none;
+        }
+
+        &.context {
+          border-left: var(--hunk-handle-width) solid var(--diff-border-color);
+        }
+
+        &.has-check-all-control.context {
+          border-left: var(--hunk-handle-width-with-check-all) solid var(--diff-border-color);
+        }
+      }
     }
   }
 
diff --git a/app/styles/ui/_tab-bar.scss b/app/styles/ui/_tab-bar.scss
index aaf6f7e4f21..31b86d5d415 100644
--- a/app/styles/ui/_tab-bar.scss
+++ b/app/styles/ui/_tab-bar.scss
@@ -14,11 +14,6 @@
   &-item {
     // Reset styles from global buttons
     border: none;
-
-    @include high-contrast {
-      border: 2px solid var(--hc-background-color);
-    }
-
     box-shadow: none;
     color: var(--text-color);
     background: var(--background-color);
@@ -53,21 +48,10 @@
     // one.
     &.selected {
       box-shadow: inset 0 -3px 0px var(--tab-bar-active-color);
-
-      @include high-contrast {
-        box-shadow: inset 0 -3px 0px var(--tab-bar-active-color);
-        background-color: var(--hc-active-item-color);
-        color: var(--hc-active-text-color);
-      }
     }
 
     &:hover {
       background: var(--tab-bar-hover-background-color);
-
-      @include high-contrast {
-        border: var(--hc-hover-border);
-        color: var(--text-color);
-      }
     }
 
     .with-indicator {
@@ -92,7 +76,7 @@
       line-height: 1;
     }
 
-    &.focus-ring {
+    &:focus-visible {
       outline-offset: -4px;
     }
 
@@ -142,9 +126,9 @@
     border-radius: var(--border-radius);
     min-width: 150px;
 
-    &:focus {
+    &:focus-visible {
       border-radius: var(--outlined-border-radius);
-      outline-color: var(--alt-focus-color);
+      outline-offset: 3px;
     }
 
     // Center item contest horizontally and vertically
@@ -177,10 +161,6 @@
 
       &:hover {
         background: var(--tab-bar-hover-background-color);
-
-        @include high-contrast {
-          border: var(--hc-hover-border);
-        }
       }
     }
 
diff --git a/app/styles/ui/_text-area.scss b/app/styles/ui/_text-area.scss
index e94059f5bad..585e54dd629 100644
--- a/app/styles/ui/_text-area.scss
+++ b/app/styles/ui/_text-area.scss
@@ -7,7 +7,10 @@
 
   textarea {
     @include textboxish;
-    @include textboxish-disabled;
+
+    &:read-only {
+      @include textboxish-disabled-styles;
+    }
 
     height: auto;
     resize: none;
diff --git a/app/styles/ui/_text-box.scss b/app/styles/ui/_text-box.scss
index 6b293233414..32cebdd8842 100644
--- a/app/styles/ui/_text-box.scss
+++ b/app/styles/ui/_text-box.scss
@@ -4,33 +4,19 @@
   display: flex;
   flex-direction: column;
   flex: 1;
+  position: relative;
 
-  .label-container {
-    display: flex;
-
-    label {
-      @include ellipsis;
-      flex-grow: 1;
-    }
-
-    .link-label {
-      @include ellipsis;
-
-      justify-content: flex-end;
-      flex-shrink: 0;
-      flex-grow: 0;
-    }
-
+  & > label {
+    overflow-wrap: anywhere;
     margin-bottom: var(--spacing-third);
   }
 
-  :invalid {
-    border-color: var(--error-color);
-  }
-
   input {
     @include textboxish;
-    @include textboxish-disabled;
+
+    &:read-only {
+      @include textboxish-disabled-styles;
+    }
 
     // Customize the "clear" icon on search text inputs to match our
     // theme icons and colors.
@@ -51,4 +37,36 @@
       -webkit-mask-repeat: no-repeat;
     }
   }
+
+  &.display-clear-button input {
+    padding-inline-end: var(--text-field-height);
+  }
+
+  &.display-prefixed-icon input {
+    padding-left: var(--text-field-height);
+  }
+
+  .prefixed-icon {
+    position: absolute;
+    top: var(--spacing-half);
+    left: var(--spacing-half);
+    color: var(--text-secondary-color);
+  }
+
+  button.clear-button {
+    position: absolute;
+    right: 1px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border: 0;
+    background: none;
+    width: var(--text-field-height);
+    height: var(--text-field-height);
+    color: var(--text-color);
+  }
+
+  &:not(.no-invalid-state) :not(:focus):invalid {
+    border-color: var(--error-color);
+  }
 }
diff --git a/app/styles/ui/_vertical-segmented-control.scss b/app/styles/ui/_vertical-segmented-control.scss
index fe86359b7cc..f022eac9a8e 100644
--- a/app/styles/ui/_vertical-segmented-control.scss
+++ b/app/styles/ui/_vertical-segmented-control.scss
@@ -77,7 +77,7 @@ fieldset.vertical-segmented-control {
       }
     }
 
-    &:focus li {
+    &:focus-visible li {
       &:first-child {
         border-top-left-radius: var(--outlined-border-radius);
         border-top-right-radius: var(--outlined-border-radius);
diff --git a/app/styles/ui/_welcome.scss b/app/styles/ui/_welcome.scss
index fb25c1667a2..ce851d05627 100644
--- a/app/styles/ui/_welcome.scss
+++ b/app/styles/ui/_welcome.scss
@@ -1,17 +1,75 @@
 #welcome {
+  // This is used to scale the font and inputs so that they are bigger on large
+  // screens. Before, we used the `zoom` property, but that was causing issues
+  // with the layout when zooming in/out.
+  --welcome-scale: 1;
+
+  @media screen and (min-width: 1366px) and (min-height: 700px) {
+    --welcome-scale: 1.2;
+  }
+
+  @media screen and (min-width: 1400px) and (min-height: 725px) {
+    --welcome-scale: 1.3;
+  }
+
+  @media screen and (min-width: 1600px) and (min-height: 750px) {
+    --welcome-scale: 1.4;
+  }
+
+  @media screen and (min-width: 1800px) and (min-height: 775px) {
+    --welcome-scale: 1.5;
+  }
+
+  --welcome-font-size: calc(var(--font-size) * var(--welcome-scale));
+  --welcome-font-size-sm: calc(var(--font-size-sm) * var(--welcome-scale));
+  --welcome-font-size-md: calc(var(--font-size-md) * var(--welcome-scale));
+  --welcome-font-size-xxl: calc(var(--font-size-xxl) * var(--welcome-scale));
+
   // Override the height of some components to make them bigger. The new height
   // is platform specific and defined as --welcome-item-height
-  --text-field-height: var(--welcome-item-height);
-  --button-height: var(--welcome-item-height);
+  --text-field-height: calc(var(--welcome-item-height) * var(--welcome-scale));
+  --button-height: calc(var(--welcome-item-height) * var(--welcome-scale));
+  --radio-control-radius: calc(13px * var(--welcome-scale));
+
+  --welcome-content-width: calc(500px * var(--welcome-scale));
+  --avatar-size: calc(16px * var(--welcome-scale));
 
   align-items: stretch;
   justify-content: center;
   flex-direction: row;
-  font-size: var(--font-size-md);
+  font-size: var(--welcome-font-size-md);
 
-  #start {
-    display: flex;
-    flex-direction: column;
+  input[type='radio'] {
+    width: var(--radio-control-radius);
+    height: var(--radio-control-radius);
+  }
+
+  #configure-git {
+    flex-grow: 1;
+    justify-content: center;
+
+    #configure-git-user {
+      padding-bottom: var(--spacing);
+      #commit-list.commit-list-example {
+        .commit {
+          font-size: var(--welcome-font-size);
+        }
+        .header,
+        .byline {
+          font-size: var(--welcome-font-size-sm);
+        }
+
+        .avatar {
+          width: var(--avatar-size);
+          height: var(--avatar-size);
+        }
+
+        .AvatarStack.AvatarStack--small {
+          width: calc(var(--avatar-size) + 5px);
+          height: var(--avatar-size);
+        }
+      }
+    }
   }
 
   .actions {
@@ -38,6 +96,10 @@
   #sign-in-enterprise {
     .sign-in-form {
       margin-top: 0;
+
+      > button {
+        margin-right: 0;
+      }
     }
 
     .sign-in-footer {
@@ -69,7 +131,7 @@
   input,
   button,
   select {
-    font-size: var(--font-size-md);
+    font-size: var(--welcome-font-size-md);
   }
 
   input {
@@ -112,10 +174,6 @@
     font-weight: var(--font-weight-semibold);
   }
 
-  .basic-auth-link {
-    font-size: var(--font-size);
-  }
-
   .welcome-main-buttons {
     margin-top: var(--spacing-quad);
 
@@ -123,6 +181,11 @@
       padding-left: var(--spacing-double);
       padding-right: var(--spacing-double);
       margin: 0 var(--spacing-double) var(--spacing) 0;
+
+      // Allows the button to take of full-width of the container when wrapped.
+      @media screen and (max-width: 600px) {
+        margin-right: 0;
+      }
     }
 
     .octicon.spin {
@@ -138,18 +201,17 @@
 }
 
 .welcome-title {
-  font-size: var(--font-size-xxl);
+  font-size: var(--welcome-font-size-xxl);
   font-weight: var(--font-weight-light);
   line-height: 1.25;
   margin-bottom: var(--spacing);
-}
 
-.welcome-text {
-  margin: var(--spacing) 0;
+  span {
+    display: inline-block;
+  }
 }
 
-.welcome-button {
-  font-weight: var(--font-weight-semibold);
+.welcome-text {
   margin: var(--spacing) 0;
 }
 
@@ -157,11 +219,6 @@
   width: 100%;
 }
 
-.welcome-left {
-  flex-grow: 1;
-  width: 60%;
-}
-
 .welcome-right {
   flex-grow: 1;
   width: 40%;
@@ -170,8 +227,21 @@
 .welcome-left {
   display: flex;
   align-items: center;
+  width: 60%;
   padding: var(--spacing-quad);
   position: relative;
+  height: 100vh;
+  overflow-y: auto;
+
+  .welcome-content {
+    max-width: var(--welcome-content-width);
+    width: 100%;
+
+    section {
+      // allows scrolling of flex containers
+      max-height: 100vh;
+    }
+  }
 
   .welcome-graphic-bottom {
     position: absolute;
@@ -196,21 +266,31 @@
     // I hate this but we'll have to live with it for beta.
     z-index: -1;
   }
+}
 
-  @media screen and (min-width: 1366px) {
-    zoom: 1.2;
-  }
-
-  @media screen and (min-width: 1400px) {
-    zoom: 1.3;
-  }
+#start {
+  // makes up for the padding on the welcome-left that is applied to all welcome screens
+  // Having a min-height makes the start-footer be able to flex to take up the remaining vertical space
+  min-height: calc(100vh - 2 * var(--spacing-quad));
+  display: flex;
+  flex-direction: column;
 
-  @media screen and (min-width: 1600px) {
-    zoom: 1.4;
+  .start-content {
+    // Make content take of remaining height of container besides the footer.
+    flex-grow: 1;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    // The footer is ~100px tall in 100% zoom, this makes it so that the
+    // start-content is centered vertically on the screen for default zoom levels.
+    // Other levels, we are more concerned about not clipping then visual
+    // centering.
+    margin-top: 100px;
   }
 
-  @media screen and (min-width: 1800px) {
-    zoom: 1.5;
+  .start-footer {
+    font-size: var(--welcome-font-size-sm);
+    color: var(--text-secondary-color);
   }
 }
 
@@ -238,22 +318,6 @@
   }
 }
 
-.welcome-start-disclaimer-container {
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  padding: 0 var(--spacing-quad) var(--spacing-quad) var(--spacing-quad);
-  font-size: var(--font-size-sm);
-  color: var(--text-secondary-color);
-}
-
-.welcome-content {
-  justify-content: center;
-  max-width: 500px;
-  width: 100%;
-}
-
 .forgot-password-link {
   align-self: center;
   margin-left: var(--spacing);
diff --git a/app/styles/ui/banners/_accessibility-settings.scss b/app/styles/ui/banners/_accessibility-settings.scss
new file mode 100644
index 00000000000..3cb11af7a78
--- /dev/null
+++ b/app/styles/ui/banners/_accessibility-settings.scss
@@ -0,0 +1,8 @@
+#accessibility-settings-banner {
+  .contents {
+    .octicon {
+      margin-right: var(--spacing);
+      fill: var(--dialog-information-color);
+    }
+  }
+}
diff --git a/app/styles/ui/banners/_conflicts.scss b/app/styles/ui/banners/_conflicts.scss
index c7cf08bab15..c833a2b429c 100644
--- a/app/styles/ui/banners/_conflicts.scss
+++ b/app/styles/ui/banners/_conflicts.scss
@@ -5,12 +5,10 @@
   .banner-message {
     span {
       max-width: 100%;
-      overflow-x: hidden;
       text-overflow: ellipsis;
       white-space: nowrap;
       margin: 0 1ex;
     }
-    overflow-x: hidden;
     display: flex;
     flex: 1 1 auto;
   }
diff --git a/app/styles/ui/banners/_successful.scss b/app/styles/ui/banners/_successful.scss
index 793f35f001e..1960e485438 100644
--- a/app/styles/ui/banners/_successful.scss
+++ b/app/styles/ui/banners/_successful.scss
@@ -1,4 +1,5 @@
-#successful {
+#successful,
+#successful-merge {
   .banner-message {
     span {
       max-width: 100%;
@@ -6,22 +7,16 @@
       text-overflow: ellipsis;
       white-space: nowrap;
     }
-    overflow-x: hidden;
     display: flex;
     flex: 1 1 auto;
   }
 
   .green-circle {
-    background-color: var(--color-new);
-    color: var(--background-color);
-    border-radius: 50%;
-    height: 16px;
-    width: 16px;
+    color: var(--color-new);
     display: flex;
     justify-content: center;
     align-items: center;
     margin-right: var(--spacing);
-    display: flex;
     flex-shrink: 0;
     flex-grow: 0;
   }
diff --git a/app/styles/ui/banners/_update-available.scss b/app/styles/ui/banners/_update-available.scss
index 2e1abd9aedf..c0d1e36073a 100644
--- a/app/styles/ui/banners/_update-available.scss
+++ b/app/styles/ui/banners/_update-available.scss
@@ -1,10 +1,21 @@
 #update-available {
-  .download-icon {
+  .download-icon,
+  .warning-icon {
     margin-right: var(--spacing);
+    color: var(--banner-warning-icon-color);
   }
 
   .banner-emoji {
     display: inline-block;
     margin-right: var(--spacing-half);
   }
+
+  &.priority {
+    background-color: var(--banner-warning-background);
+    color: var(--banner-warning-text-color);
+
+    a {
+      color: var(--banner-warning-link-color);
+    }
+  }
 }
diff --git a/app/styles/ui/changes/_no-changes.scss b/app/styles/ui/changes/_changes-interstitial.scss
similarity index 85%
rename from app/styles/ui/changes/_no-changes.scss
rename to app/styles/ui/changes/_changes-interstitial.scss
index 8d4e1e8478a..d07cb1783ce 100644
--- a/app/styles/ui/changes/_no-changes.scss
+++ b/app/styles/ui/changes/_changes-interstitial.scss
@@ -1,4 +1,4 @@
-#no-changes {
+.changes-interstitial {
   padding: var(--spacing-quad);
   width: 100%;
   min-height: 100%;
@@ -8,7 +8,7 @@
   overflow-y: auto;
   overflow-x: hidden;
 
-  .header {
+  .interstitial-header {
     display: flex;
     flex-direction: row;
 
@@ -45,6 +45,14 @@
     max-width: 600px;
   }
 
+  .pull-request-action {
+    .dropdown-select-button {
+      .invoke-button {
+        min-width: 150px;
+      }
+    }
+  }
+
   /** Lessen the padding at 1.5x zoom and above  **/
   @media screen and (max-width: 640px) {
     padding: var(--spacing-double);
diff --git a/app/styles/ui/changes/_changes-list.scss b/app/styles/ui/changes/_changes-list.scss
index de9daa4b111..04da2900335 100644
--- a/app/styles/ui/changes/_changes-list.scss
+++ b/app/styles/ui/changes/_changes-list.scss
@@ -9,66 +9,7 @@
   flex-grow: 1;
   display: flex;
   flex-direction: column;
-  min-height: 0;
-
-  .stashed-changes-button {
-    @include ellipsis;
-    min-height: 29px;
-
-    display: flex;
-    align-items: center;
-    flex-grow: 1;
-    padding: 0 var(--spacing);
-    width: 100%;
-
-    // Chrome on Windows ignores the body element
-    // font-family and uses Arial so we redefine
-    // it here
-    font-family: var(--font-family-sans-serif);
-    font-size: var(--font-size);
-
-    padding: 0 var(--spacing);
-
-    color: var(--secondary-button-text-color);
-    background-color: var(--secondary-button-background);
-
-    border: none;
-    border-top: var(--base-border);
-    box-shadow: none;
-    z-index: 0;
-
-    &:disabled {
-      opacity: 0.6;
-    }
-
-    &:hover,
-    &:focus {
-      background-color: var(--secondary-button-hover-background);
-      background: var(--box-selected-background-color);
-    }
-    &.selected,
-    &.selected:hover {
-      color: var(--box-selected-active-text-color);
-      background-color: var(--box-selected-active-background-color);
-      .stack-icon {
-        fill: var(--box-selected-active-text-color);
-      }
-    }
-
-    .stack-icon {
-      fill: var(--color-modified);
-    }
-
-    .text {
-      flex-grow: 1;
-      margin: 0 var(--spacing-half);
-      text-align: start;
-    }
-
-    .octicon {
-      flex-shrink: 0;
-    }
-  }
+  min-height: 100px;
 
   .header {
     background: var(--box-alt-background-color);
@@ -104,6 +45,65 @@
   }
 }
 
+.stashed-changes-button {
+  @include ellipsis;
+  min-height: 29px;
+
+  display: flex;
+  align-items: center;
+  flex-grow: 1;
+  padding: 0 var(--spacing);
+  width: 100%;
+
+  // Chrome on Windows ignores the body element
+  // font-family and uses Arial so we redefine
+  // it here
+  font-family: var(--font-family-sans-serif);
+  font-size: var(--font-size);
+
+  padding: 0 var(--spacing);
+
+  color: var(--secondary-button-text-color);
+  background-color: var(--secondary-button-background);
+
+  border: none;
+  border-top: var(--base-border);
+  box-shadow: none;
+  z-index: 0;
+
+  &:disabled {
+    opacity: 0.6;
+  }
+
+  &:hover,
+  &:focus {
+    background-color: var(--secondary-button-hover-background);
+    background: var(--box-selected-background-color);
+  }
+  &.selected,
+  &.selected:hover {
+    color: var(--box-selected-active-text-color);
+    background-color: var(--box-selected-active-background-color);
+    .stack-icon {
+      fill: var(--box-selected-active-text-color);
+    }
+  }
+
+  .stack-icon {
+    fill: var(--color-modified);
+  }
+
+  .text {
+    flex-grow: 1;
+    margin: 0 var(--spacing-half);
+    text-align: start;
+  }
+
+  .octicon {
+    flex-shrink: 0;
+  }
+}
+
 .undo-enter {
   max-height: 0;
   overflow: hidden;
diff --git a/app/styles/ui/changes/_changes-view.scss b/app/styles/ui/changes/_changes-view.scss
deleted file mode 100644
index 381151d7cd7..00000000000
--- a/app/styles/ui/changes/_changes-view.scss
+++ /dev/null
@@ -1,68 +0,0 @@
-.changed-file {
-  display: flex;
-  flex-direction: column;
-  flex-grow: 1;
-  min-width: 0;
-  max-height: 100%;
-
-  .header {
-    span {
-      user-select: text;
-    }
-
-    background: var(--box-alt-background-color);
-    border-bottom: 1px solid var(--diff-border-color);
-
-    display: flex;
-    flex-direction: row;
-    flex-shrink: 0;
-    flex-grow: 0;
-    align-items: center;
-
-    padding: var(--spacing-half) var(--spacing);
-
-    @include octicon-status;
-
-    .diff-options-component {
-      margin-right: var(--spacing-half);
-      flex-shrink: 0;
-    }
-
-    .octicon.status {
-      flex-shrink: 0;
-      vertical-align: text-bottom;
-      position: relative;
-      align-self: center;
-      flex-shrink: 0;
-    }
-
-    .line-endings {
-      margin-right: var(--spacing-half);
-    }
-
-    .open-merge-tool {
-      margin-right: var(--spacing-half);
-    }
-  }
-
-  .panel {
-    display: flex;
-    flex: 1;
-
-    &.empty,
-    &.renamed,
-    &.binary {
-      justify-content: center;
-      align-items: center;
-    }
-    &.large-diff {
-      margin: var(--spacing-double);
-      text-align: center;
-      justify-content: initial;
-
-      .blankslate-image {
-        max-height: 150px;
-      }
-    }
-  }
-}
diff --git a/app/styles/ui/changes/_commit-message.scss b/app/styles/ui/changes/_commit-message.scss
index c9cf7d7fc4f..02970c9eabb 100644
--- a/app/styles/ui/changes/_commit-message.scss
+++ b/app/styles/ui/changes/_commit-message.scss
@@ -9,12 +9,14 @@
 
   display: flex;
   background-color: var(--box-alt-background-color);
+
   padding: var(--spacing);
 
   .summary {
     position: relative;
     display: flex;
     flex-direction: row;
+    column-gap: var(--spacing-half);
 
     .summary-field {
       flex: 1;
@@ -25,24 +27,20 @@
       }
     }
 
-    .avatar {
-      flex-shrink: 0;
-      width: var(--text-field-height);
-      height: var(--text-field-height);
-      margin-right: var(--spacing-half);
-    }
-
-    &.with-length-hint input {
+    &.with-trailing-icon input {
       padding-right: 20px;
     }
 
-    .length-hint {
+    .length-hint,
+    .commit-message-failure-hint {
+      $distanceFromEdge: 2px;
+
       position: absolute;
-      top: 0;
+      top: $distanceFromEdge;
       right: 0;
       width: 16px;
-      margin-right: 4px;
-      height: var(--text-field-height);
+      margin-right: $distanceFromEdge;
+      height: calc(var(--text-field-height) - #{2 * $distanceFromEdge});
       display: flex;
       justify-content: center;
       align-items: center;
@@ -51,6 +49,29 @@
         height: 12px;
       }
     }
+
+    .commit-message-failure-hint {
+      border: none;
+      background: none;
+
+      &:hover {
+        background: var(--input-icon-hover-background-color);
+      }
+
+      .warning-icon {
+        color: var(--input-icon-warning-color);
+      }
+
+      .error-icon {
+        color: var(--input-icon-error-color);
+      }
+    }
+  }
+
+  .popover-component {
+    // a width of 300px causes more jarring movement when going from 2
+    // failed rules to 1 and the user can bypass, so use a slightly smaller amount
+    width: 298px;
   }
 
   &.with-co-authors .description-focus-container {
@@ -67,6 +88,10 @@
     &:hover {
       color: var(--text-color);
     }
+
+    &:focus {
+      outline-offset: 2px;
+    }
   }
 
   &.with-co-authors .co-authors-toggle {
@@ -84,13 +109,17 @@
     .description-field textarea {
       min-height: 80px;
 
+      @media (max-height: 500px) {
+        min-height: 10px;
+      }
+
       border-bottom-left-radius: 0;
       border-bottom-right-radius: 0;
     }
   }
 
   .description-focus-container {
-    border: 1px solid var(--box-border-color);
+    border: var(--contrast-border);
     border-radius: var(--border-radius);
     background: var(--background-color);
     // Fake that we're a text-box
@@ -156,6 +185,7 @@
     .co-authors-toggle {
       // button reset styles
       border: none;
+      border-radius: 0px;
       -webkit-appearance: none;
       background: transparent;
       padding: 0;
@@ -168,23 +198,12 @@
       width: 18px;
       cursor: pointer;
 
-      &:after {
-        content: attr(aria-label);
-        position: absolute;
-        margin-left: 3px;
-        margin-top: 1px;
-        font-size: var(--font-size-sm);
-        color: var(--text-secondary-color);
-        opacity: 0;
-        transition: 150ms all ease-in-out;
-        pointer-events: none;
-      }
-
       &:disabled {
         pointer-events: none;
       }
 
-      &:hover {
+      &:hover,
+      &:focus-visible {
         &:after {
           opacity: 1;
         }
diff --git a/app/styles/ui/changes/_commit-warning.scss b/app/styles/ui/changes/_commit-warning.scss
index 6799cb78b68..a4257458bc9 100644
--- a/app/styles/ui/changes/_commit-warning.scss
+++ b/app/styles/ui/changes/_commit-warning.scss
@@ -1,14 +1,12 @@
 @import '../../mixins';
 
 .commit-warning-component {
-  border-top: 1px solid var(--box-border-color);
   flex-direction: column;
   flex-shrink: 0;
-  margin-top: auto;
+  margin-top: var(--spacing-half);
 
   display: flex;
   background-color: var(--box-alt-background-color);
-  padding-top: var(--spacing);
 
   .warning-message {
     margin-bottom: 0;
@@ -27,13 +25,18 @@
     text-align: center;
 
     .warning-icon,
-    .information-icon {
-      color: var(--dialog-warning-color);
+    .information-icon,
+    .error-icon {
+      color: var(--commit-message-icon-error-color);
 
       &.information-icon {
         color: var(--dialog-information-color);
       }
 
+      &.warning-icon {
+        color: var(--commit-message-icon-warning-color);
+      }
+
       background: var(--box-alt-background-color);
       border-width: 0 var(--spacing-half);
       border: solid transparent;
diff --git a/app/styles/ui/changes/_submodule-diff.scss b/app/styles/ui/changes/_submodule-diff.scss
new file mode 100644
index 00000000000..9bbe2c89b76
--- /dev/null
+++ b/app/styles/ui/changes/_submodule-diff.scss
@@ -0,0 +1,57 @@
+.submodule-diff {
+  .item {
+    display: flex;
+    flex-direction: row;
+    align-items: flex-start;
+    width: 100%;
+    font-size: var(--font-size-md);
+    gap: 0.25em;
+    margin-bottom: 1em;
+
+    .content {
+      flex: 1;
+    }
+
+    .octicon {
+      margin-top: 0.2em;
+
+      &.info-icon {
+        color: var(--dialog-information-color);
+      }
+
+      &.modified-icon {
+        color: var(--color-modified);
+      }
+
+      &.added-icon {
+        color: var(--color-new);
+      }
+
+      &.deleted-icon {
+        color: var(--color-deleted);
+      }
+
+      &.untracked-icon {
+        color: var(--color-deleted);
+      }
+    }
+  }
+
+  .copy-button {
+    // Removing default button styles
+    background: transparent;
+    border: none;
+    padding: 0;
+    height: auto;
+    min-width: 16px;
+
+    .octicon {
+      // Reverting margin-top change from .item .octicon
+      margin-top: revert;
+    }
+
+    :hover {
+      color: var(--text-secondary-color);
+    }
+  }
+}
diff --git a/app/styles/ui/check-runs/_ci-check-run-job-steps.scss b/app/styles/ui/check-runs/_ci-check-run-job-steps.scss
index 9f3ad809540..05eab7b3881 100644
--- a/app/styles/ui/check-runs/_ci-check-run-job-steps.scss
+++ b/app/styles/ui/check-runs/_ci-check-run-job-steps.scss
@@ -1,42 +1,71 @@
 .ci-check-run-job-steps-list {
   overflow-y: auto;
-  border-bottom: var(--base-border);
+  margin: 0px;
+  padding: 0px;
 
   .ci-check-run-job-step {
     background-color: var(--box-alt-background-color);
 
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    width: 100%;
+    height: 100%;
+
     // This is the height of a check run step and check run group header so that
     // when a first failed step is scroll into view it doesn't end up under the
     // sticky headers (which are like fixed headers)
     scroll-margin-top: 72px;
 
     .job-step-duration {
+      text-align: right;
       color: var(--text-secondary-color);
     }
 
-    &:hover {
-      /* 100% is baseline so 95% is 5% darker */
-      filter: brightness(95%);
-    }
-
-    .job-step-name span {
-      &:hover {
-        color: var(--link-button-color);
-        cursor: pointer !important;
-      }
-    }
-
     .job-step-status-symbol,
     .job-step-duration {
       padding: var(--spacing-half) var(--spacing);
       margin-top: 2px;
     }
 
+    .job-step-status-symbol {
+      padding-left: 0px;
+    }
+
     .job-step-name {
       flex-grow: 1;
       text-overflow: ellipsis;
       white-space: nowrap;
       overflow: hidden;
+
+      span {
+        cursor: pointer !important;
+      }
+    }
+
+    .button-component {
+      // Remove button styles
+      border: 1px solid var(--box-alt-background-color);
+      height: 100%;
+      text-align: unset;
+      background: inherit;
+
+      &:focus {
+        outline-offset: 0px;
+        border: 1px solid var(--secondary-button-hover-border-color);
+      }
+
+      &:hover,
+      &:focus-visible,
+      &:not([aria-disabled='true']):hover {
+        border: 1px solid var(--secondary-button-hover-border-color);
+        background: var(--box-selected-background-color);
+      }
+    }
+
+    .view-check-externally {
+      color: var(--text-secondary-color);
+      padding: var(--spacing-half);
     }
   }
 }
diff --git a/app/styles/ui/check-runs/_ci-check-run-list-item.scss b/app/styles/ui/check-runs/_ci-check-run-list-item.scss
index 9a0c63a47f6..45fbe714d87 100644
--- a/app/styles/ui/check-runs/_ci-check-run-list-item.scss
+++ b/app/styles/ui/check-runs/_ci-check-run-list-item.scss
@@ -1,8 +1,11 @@
 .ci-check-list-item {
   display: flex;
   width: 100%;
+  border: none;
   border-bottom: var(--base-border);
-  height: auto;
+  flex-direction: row;
+  align-items: center;
+  background-color: var(--background-color);
 
   &.condensed {
     border-bottom: none;
@@ -21,49 +24,25 @@
     background-color: var(--background-color);
     top: 29px;
     z-index: var(--list-sticky-header-second-level-z-index);
-  }
-
-  &.selected .ci-check-name span.isLink {
-    &:hover {
-      color: var(--link-button-selected-hover-color);
-      cursor: pointer !important;
-    }
-  }
 
-  &:not(.selected) .ci-check-name span.isLink {
+    &:focus-visible,
     &:hover {
-      color: var(--link-button-color);
-      cursor: pointer !important;
+      background-color: var(--background-color);
     }
   }
 
-  .ci-check-status-symbol {
-    margin: 0 var(--spacing-half);
-  }
-
-  .ci-check-status-symbol,
-  .job-step-toggled-indicator,
-  .job-rerun {
-    padding: var(--spacing);
-    padding-top: calc(var(--spacing-half) * 3);
-  }
-
   .job-step-toggled-indicator {
-    padding-left: 0px;
     color: var(--text-secondary-color);
+    margin-right: var(--spacing-half);
   }
 
-  .job-rerun {
-    color: var(--text-secondary-color);
-
-    &.not-action-job {
-      color: var(--text-secondary-color-muted);
-    }
+  .ci-check-status-symbol {
+    margin: calc(var(--spacing) * 1.5) 0;
   }
 
   .ci-check-list-item-detail {
     flex: 1;
-    margin: auto;
+    margin: auto var(--spacing);
     overflow-x: hidden;
   }
 
@@ -72,6 +51,8 @@
     text-overflow: ellipsis;
     white-space: nowrap;
     overflow: hidden;
+    font-size: inherit;
+    margin: 0;
   }
 
   .ci-check-description {
@@ -86,4 +67,45 @@
     width: 250px;
     height: 12px;
   }
+
+  &.button-component {
+    // Remove default button styles
+    height: 100%;
+    border-radius: unset;
+    text-align: unset;
+
+    &:focus {
+      outline-offset: 0px;
+    }
+
+    &:hover,
+    &:focus-visible,
+    &:not([aria-disabled='true']):hover {
+      border-color: var(--box-border-color);
+      background: var(--box-selected-background-color);
+    }
+
+    &.selected {
+      background: var(--box-selected-background-color);
+
+      &:focus {
+        color: var(--box-selected-active-text-color);
+        background: var(--box-selected-active-background-color);
+
+        .ci-check-description {
+          color: var(--box-selected-active-text-color);
+        }
+      }
+    }
+  }
+}
+
+.ci-steps-container {
+  background-color: var(--box-alt-background-color);
+  padding: var(--spacing);
+  border-bottom: var(--base-border);
+
+  &.no-steps {
+    height: 150px;
+  }
 }
diff --git a/app/styles/ui/check-runs/_ci-check-run-list.scss b/app/styles/ui/check-runs/_ci-check-run-list.scss
index cdfd05042f0..9fdbcd03dab 100644
--- a/app/styles/ui/check-runs/_ci-check-run-list.scss
+++ b/app/styles/ui/check-runs/_ci-check-run-list.scss
@@ -11,6 +11,14 @@
     }
   }
 
+  .ci-check-run-list-group {
+    h2 {
+      margin: 0;
+      font-size: inherit;
+      font-weight: inherit;
+    }
+  }
+
   .ci-check-run-list-group-header {
     position: sticky;
     top: 0;
diff --git a/app/styles/ui/check-runs/_ci-check-run-no-steps.scss b/app/styles/ui/check-runs/_ci-check-run-no-steps.scss
new file mode 100644
index 00000000000..4b4b3cd72e9
--- /dev/null
+++ b/app/styles/ui/check-runs/_ci-check-run-no-steps.scss
@@ -0,0 +1,18 @@
+.ci-check-run-no-steps {
+  display: flex;
+  padding: var(--spacing-double);
+  align-items: center;
+  height: 100%;
+
+  img {
+    height: 125%;
+    margin-left: var(--spacing-double);
+    flex: 1;
+  }
+
+  .button-component {
+    margin-top: var(--spacing);
+    display: flex;
+    align-items: center;
+  }
+}
diff --git a/app/styles/ui/check-runs/_ci-check-run-popover.scss b/app/styles/ui/check-runs/_ci-check-run-popover.scss
index 56828f8cb83..7d0b8aedc1d 100644
--- a/app/styles/ui/check-runs/_ci-check-run-popover.scss
+++ b/app/styles/ui/check-runs/_ci-check-run-popover.scss
@@ -1,16 +1,22 @@
 .ci-check-list-popover {
   .popover-component {
-    position: absolute;
-    padding: 0px;
     width: 440px;
-    top: 60;
-    margin-left: -302px;
 
-    &::after {
-      border-bottom-color: var(--box-alt-background-color);
+    .popover-content {
+      padding: 0px;
+    }
+
+    .popover-tip-background {
+      border-right-color: var(--box-alt-background-color);
     }
   }
 
+  .ci-check-run-list-wrapper {
+    display: flex;
+    flex-direction: column;
+    max-height: inherit;
+  }
+
   .ci-check-run-list-header {
     background-color: var(--box-alt-background-color);
     border-bottom: var(--base-border);
@@ -23,15 +29,18 @@
     .ci-check-run-list-title-container {
       flex: 1;
       align-items: center;
+
       .title {
         font-weight: var(--font-weight-semibold);
+        font-size: var(--font-size-md);
+        margin: 0;
 
         .failure {
           color: $red-500;
         }
 
         .pending {
-          color: $yellow-700;
+          color: darken($yellow-700, 10%);
         }
       }
 
@@ -79,7 +88,7 @@
         > .waiting,
         > .requested,
         > .pending {
-          fill: $yellow-700;
+          fill: darken($yellow-700, 10%);
         }
 
         > .success {
diff --git a/app/styles/ui/check-runs/_ci-check-run-step-header.scss b/app/styles/ui/check-runs/_ci-check-run-step-header.scss
new file mode 100644
index 00000000000..b57993a8cd7
--- /dev/null
+++ b/app/styles/ui/check-runs/_ci-check-run-step-header.scss
@@ -0,0 +1,36 @@
+.ci-check-run-steps-header {
+  display: flex;
+  justify-content: end;
+  border-bottom: 1px solid var(--box-skeleton-background-color);
+
+  h4 {
+    flex-grow: 1;
+    font-weight: var(--font-weight-semibold);
+    margin-bottom: 3px;
+    color: var(--text-secondary-color);
+  }
+
+  .button-component {
+    // Remove default button styles
+    border: 1px solid var(--box-alt-background-color);
+    background: inherit;
+    height: 100%;
+    text-align: unset;
+    margin-bottom: 2px;
+
+    padding: var(--spacing-half);
+    color: var(--text-secondary-color);
+
+    &:focus {
+      outline-offset: 0px;
+      border: 1px solid var(--secondary-button-hover-border-color);
+    }
+
+    &:hover,
+    &:focus-visible,
+    &:not([aria-disabled='true']):hover {
+      border: 1px solid var(--secondary-button-hover-border-color);
+      background: var(--box-selected-background-color);
+    }
+  }
+}
diff --git a/app/styles/ui/dialogs/_choose-branch.scss b/app/styles/ui/dialogs/_choose-branch.scss
index d5fe6031f11..04c1b796e06 100644
--- a/app/styles/ui/dialogs/_choose-branch.scss
+++ b/app/styles/ui/dialogs/_choose-branch.scss
@@ -24,9 +24,9 @@ dialog#choose-branch {
     .filter-field-row {
       margin: 0;
       border-bottom: var(--base-border);
+      padding: 0 var(--spacing-double);
 
       .filter-list-filter-field {
-        padding: 0 var(--spacing-double);
         padding-bottom: var(--spacing);
       }
     }
diff --git a/app/styles/ui/dialogs/_commit-message.scss b/app/styles/ui/dialogs/_commit-message.scss
index bb3a59523ef..0d4fe1d7284 100644
--- a/app/styles/ui/dialogs/_commit-message.scss
+++ b/app/styles/ui/dialogs/_commit-message.scss
@@ -16,4 +16,13 @@ dialog#commit-message-dialog {
       }
     }
   }
+
+  .commit-message-avatar-component {
+    height: 50px;
+    width: 50px;
+  }
+
+  label {
+    margin-bottom: var(--spacing-third);
+  }
 }
diff --git a/app/styles/ui/dialogs/_conflicts.scss b/app/styles/ui/dialogs/_conflicts.scss
index 7c8d4029797..668dcc9b570 100644
--- a/app/styles/ui/dialogs/_conflicts.scss
+++ b/app/styles/ui/dialogs/_conflicts.scss
@@ -28,7 +28,8 @@ dialog#conflicts-dialog {
 
   ul {
     list-style: none;
-    padding: 0;
+    padding: 0 var(--spacing-double);
+    margin: 0 calc(-1 * var(--spacing-double));
     max-height: 285px;
     overflow-y: auto;
 
@@ -53,8 +54,9 @@ dialog#conflicts-dialog {
       .column-left {
         display: flex;
         flex-flow: column nowrap;
+        flex-grow: 1;
+        min-width: 0;
         align-items: start;
-        max-width: 50%;
         padding-right: var(--spacing);
 
         .path-text-component {
@@ -66,7 +68,7 @@ dialog#conflicts-dialog {
       .action-buttons {
         margin-left: auto;
         flex-shrink: 0;
-        flex: 0 1 auto;
+        flex: 0 0 auto;
         display: flex;
         align-items: center;
         justify-content: center;
@@ -76,11 +78,17 @@ dialog#conflicts-dialog {
         }
       }
 
+      .undo-button {
+        align-self: center;
+        margin-right: var(--spacing-half);
+        flex: 0 0 auto;
+      }
+
       .green-circle:last-child {
         margin-left: auto;
-        margin-top: var(--spacing);
         flex-shrink: 0;
-        flex: 0 1 auto;
+        flex: 0 0 auto;
+        align-self: center;
       }
     }
 
@@ -114,6 +122,7 @@ dialog#conflicts-dialog {
     .octicon {
       width: 10px;
       height: 14px;
+      pointer-events: none;
     }
   }
 }
diff --git a/app/styles/ui/dialogs/_icon_preview.scss b/app/styles/ui/dialogs/_icon_preview.scss
new file mode 100644
index 00000000000..fef845eb153
--- /dev/null
+++ b/app/styles/ui/dialogs/_icon_preview.scss
@@ -0,0 +1,58 @@
+@import '../../../styles/variables';
+
+#octicons-preview-dialog {
+  height: auto;
+
+  .dialog-content {
+    overflow-y: auto;
+  }
+
+  .octicons-preview-list {
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+
+    & > li {
+      margin: 0 0 var(--spacing-double);
+      padding: 0;
+
+      h2 {
+        margin: 0 0 var(--spacing-third);
+        padding: 0;
+      }
+
+      & > ul {
+        align-items: flex-end;
+        display: flex;
+        flex-direction: row;
+        gap: var(--spacing);
+        justify-content: flex-start;
+        list-style-type: none;
+        margin: 0;
+        padding: 0;
+
+        & > li {
+          align-items: center;
+          background-color: var(--box-alt-background-color);
+          border-radius: var(--border-radius);
+          display: flex;
+          flex-direction: column;
+          gap: var(--spacing-half);
+          margin: 0;
+          padding-bottom: var(--spacing-half);
+          padding-left: var(--spacing);
+          padding-right: var(--spacing);
+          padding-top: var(--spacing);
+
+          .octicon {
+            vertical-align: text-bottom;
+          }
+
+          .small {
+            display: block;
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/app/styles/ui/dialogs/_installing-update.scss b/app/styles/ui/dialogs/_installing-update.scss
new file mode 100644
index 00000000000..07e424e165c
--- /dev/null
+++ b/app/styles/ui/dialogs/_installing-update.scss
@@ -0,0 +1,7 @@
+#installing-update {
+  max-width: 400px;
+
+  .updating-message {
+    align-items: center;
+  }
+}
diff --git a/app/styles/ui/dialogs/_merge.scss b/app/styles/ui/dialogs/_merge.scss
deleted file mode 100644
index cd0817d1b4f..00000000000
--- a/app/styles/ui/dialogs/_merge.scss
+++ /dev/null
@@ -1,51 +0,0 @@
-@import '../../mixins';
-
-dialog#merge {
-  width: 450px;
-
-  .branches-list {
-    height: 300px;
-  }
-
-  // We're faking it so that the filter text box appears to reside
-  // withing the header even though our current component structure
-  // make it extremely hard to do so.
-  .dialog-header {
-    border-bottom: none;
-
-    h1 {
-      font-weight: var(--font-weight-light);
-    }
-  }
-
-  .dialog-content {
-    padding: 0;
-
-    .filter-field-row {
-      margin: 0;
-      border-bottom: var(--base-border);
-
-      .filter-list-filter-field {
-        padding: 0 var(--spacing-double);
-        padding-bottom: var(--spacing);
-      }
-    }
-
-    .list-item {
-      padding: 0 var(--spacing-double);
-
-      .filter-list-group-header,
-      .branches-list-item {
-        padding: 0;
-      }
-    }
-  }
-
-  .dialog-footer {
-    button[type='submit'] {
-      height: auto;
-      width: 100%;
-      padding: var(--spacing-half);
-    }
-  }
-}
diff --git a/app/styles/ui/dialogs/_open-pull-request.scss b/app/styles/ui/dialogs/_open-pull-request.scss
new file mode 100644
index 00000000000..785448073fd
--- /dev/null
+++ b/app/styles/ui/dialogs/_open-pull-request.scss
@@ -0,0 +1,64 @@
+.open-pull-request {
+  width: 100%;
+  height: 100%;
+  max-width: calc(100% - var(--spacing-double) * 4);
+  max-height: calc(100% - var(--spacing-double) * 4);
+
+  div.dialog-header {
+    padding-bottom: var(--spacing);
+
+    h1 {
+      width: auto;
+    }
+
+    height: auto;
+    flex-wrap: wrap;
+
+    .break {
+      flex-basis: 100%;
+      height: 0;
+      padding: var(--spacing-half);
+    }
+  }
+
+  .open-pull-request-content {
+    padding: var(--spacing);
+    display: flex;
+    flex-direction: column;
+    min-height: 200px;
+    flex-grow: 1;
+  }
+
+  .open-pull-request-message {
+    height: 100%;
+    display: flex;
+    align-items: center;
+    text-align: center;
+    justify-content: center;
+    padding: var(--spacing-double);
+  }
+
+  .dialog-footer {
+    flex-direction: row;
+
+    .button-group {
+      .octicon {
+        margin-right: var(--spacing-half);
+      }
+    }
+  }
+
+  .pull-request-merge-status {
+    flex-grow: 1;
+  }
+
+  @media (max-width: 600px) {
+    .dialog-footer {
+      flex-direction: column;
+    }
+
+    .pull-request-merge-status {
+      margin-bottom: var(--spacing);
+    }
+  }
+}
diff --git a/app/styles/ui/_pull-request-review.scss b/app/styles/ui/dialogs/_pull-request-comment-like.scss
similarity index 92%
rename from app/styles/ui/_pull-request-review.scss
rename to app/styles/ui/dialogs/_pull-request-comment-like.scss
index 99cd84c151c..b3fde49bd2e 100644
--- a/app/styles/ui/_pull-request-review.scss
+++ b/app/styles/ui/dialogs/_pull-request-comment-like.scss
@@ -1,4 +1,5 @@
-#pull-request-review {
+#pull-request-review,
+#pull-request-comment {
   --avatar-size: 40px;
   min-width: 500px;
 
@@ -6,7 +7,7 @@
     height: unset;
   }
 
-  .pull-request-review-dialog-header {
+  .pull-request-comment-like-dialog-header {
     display: flex;
     flex-direction: row;
     align-items: center;
@@ -23,9 +24,8 @@
     }
 
     .pr-title {
-      display: flex;
-      column-gap: var(--spacing-half);
-      align-items: center;
+      display: inline-block;
+      white-space: normal;
 
       .pr-number {
         font-weight: normal;
@@ -44,7 +44,7 @@
     max-height: 300px;
     overflow: auto;
 
-    .review-container {
+    .comment-container {
       .timeline-line {
         width: 1px;
         height: 24px;
@@ -101,9 +101,7 @@
           }
 
           .link-button-component {
-            color: unset;
-
-            &.reviewer {
+            &.author {
               font-weight: bold;
             }
           }
@@ -152,8 +150,8 @@
             display: inline-block;
             content: '';
             pointer-events: none;
-            border: 7.5px solid transparent;
-            left: 7px;
+            border: 8px solid transparent;
+            left: 6px;
           }
 
           &::before {
diff --git a/app/styles/ui/dialogs/_rebase.scss b/app/styles/ui/dialogs/_rebase.scss
deleted file mode 100644
index 671c3a4d8e5..00000000000
--- a/app/styles/ui/dialogs/_rebase.scss
+++ /dev/null
@@ -1,51 +0,0 @@
-@import '../../mixins';
-
-dialog#rebase {
-  width: 450px;
-
-  .branches-list {
-    height: 300px;
-  }
-
-  // We're faking it so that the filter text box appears to reside
-  // withing the header even though our current component structure
-  // make it extremely hard to do so.
-  .dialog-header {
-    border-bottom: none;
-
-    h1 {
-      font-weight: var(--font-weight-light);
-    }
-  }
-
-  .dialog-content {
-    padding: 0;
-
-    .filter-field-row {
-      margin: 0;
-      border-bottom: var(--base-border);
-
-      .filter-list-filter-field {
-        padding: 0 var(--spacing-double);
-        padding-bottom: var(--spacing);
-      }
-    }
-
-    .list-item {
-      padding: 0 var(--spacing-double);
-
-      .filter-list-group-header,
-      .branches-list-item {
-        padding: 0;
-      }
-    }
-  }
-
-  .dialog-footer {
-    button[type='submit'] {
-      height: auto;
-      width: 100%;
-      padding: var(--spacing-half);
-    }
-  }
-}
diff --git a/app/styles/ui/dialogs/_release-notes.scss b/app/styles/ui/dialogs/_release-notes.scss
index a05e14994ef..99ed47c968d 100644
--- a/app/styles/ui/dialogs/_release-notes.scss
+++ b/app/styles/ui/dialogs/_release-notes.scss
@@ -14,41 +14,18 @@
 
   .dialog-header {
     height: 100px;
-    position: relative;
 
-    .release-notes-header {
-      display: flex;
-      position: absolute;
-      top: 0;
-      right: 0;
-      bottom: 0;
-      left: 0;
-      padding: 0 var(--spacing-double);
-    }
-
-    .release-note-graphic-left {
-      margin-right: 20px;
-    }
+    background: url('../static/common/release-note-header-left.svg') no-repeat left var(--spacing-double) top var(--spacing-half) / auto 90px,
+      url('../static/common/release-note-header-right.svg') no-repeat right var(--spacing-double) top var(--spacing-half) / auto 90px;
 
-    .release-note-graphic-right {
-      margin-left: 20px;
-    }
-
-    .title {
+    h1 {
       display: flex;
       flex-direction: column;
-      flex-grow: 1;
-      justify-content: center;
       text-align: center;
 
-      p {
-        margin: 0;
-      }
-
       .version {
         font-size: 14px;
         font-weight: var(--font-weight-semibold);
-        margin-bottom: 0;
       }
 
       .date {
@@ -78,7 +55,6 @@
   }
 
   .container {
-    width: 675px;
     display: flex;
     flex-direction: row;
     overflow-x: hidden;
diff --git a/app/styles/ui/dialogs/_repository-settings.scss b/app/styles/ui/dialogs/_repository-settings.scss
index 0f00e842512..20421018c0a 100644
--- a/app/styles/ui/dialogs/_repository-settings.scss
+++ b/app/styles/ui/dialogs/_repository-settings.scss
@@ -1,6 +1,10 @@
 #repository-settings {
   width: 600px;
 
+  .dialog-content {
+    min-height: 305px;
+  }
+
   .no-remote {
     justify-content: space-between;
 
@@ -31,4 +35,14 @@
       margin-bottom: 0;
     }
   }
+
+  .no-remote-publish-message {
+    .link-button-component {
+      display: inline;
+    }
+  }
+
+  textarea.gitignore {
+    height: 130px;
+  }
 }
diff --git a/app/styles/ui/dialogs/_test-notifications.scss b/app/styles/ui/dialogs/_test-notifications.scss
new file mode 100644
index 00000000000..00cb1cfa012
--- /dev/null
+++ b/app/styles/ui/dialogs/_test-notifications.scss
@@ -0,0 +1,75 @@
+#test-notifications {
+  .notification-type-list {
+    display: flex;
+    flex-direction: column;
+    row-gap: var(--spacing-half);
+  }
+
+  .list {
+    height: 200px;
+
+    .row-content {
+      width: 100%;
+      display: flex;
+      flex-direction: row;
+
+      .left-accessory {
+        flex-grow: 0;
+        flex-shrink: 0;
+        align-self: center;
+        margin-right: 10px;
+      }
+
+      .main-content {
+        flex-grow: 1;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
+      }
+
+      .right-accessory {
+        flex-grow: 0;
+        flex-shrink: 0;
+        align-self: center;
+        margin-left: 10px;
+      }
+    }
+  }
+
+  .review-icon-container {
+    border-radius: 50%;
+    width: 30px;
+    height: 30px;
+    margin: 0;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    .octicon {
+      width: 16px;
+      height: 16px;
+      text-align: center;
+    }
+
+    &.pr-review-approved {
+      color: var(--pr-approved-icon-color);
+      background-color: var(--pr-approved-icon-background-color);
+    }
+    &.pr-review-changes-requested {
+      color: var(--pr-changes-requested-icon-color);
+      background-color: var(--pr-changes-requested-icon-background-color);
+    }
+    &.pr-review-commented {
+      color: var(--pr-commented-icon-color);
+      background-color: var(--pr-commented-icon-background-color);
+    }
+  }
+
+  .pr-icon {
+    color: var(--pr-open-icon-color);
+  }
+
+  .pr-draft-icon {
+    color: var(--pr-draft-icon-color);
+  }
+}
diff --git a/app/styles/ui/dialogs/_thank-you.scss b/app/styles/ui/dialogs/_thank-you.scss
index 02e91187e84..cca8d0cfd70 100644
--- a/app/styles/ui/dialogs/_thank-you.scss
+++ b/app/styles/ui/dialogs/_thank-you.scss
@@ -13,54 +13,10 @@
   .dialog-header {
     height: 88px;
     position: relative;
+    text-align: center;
 
-    .release-notes-header {
-      position: absolute;
-      top: 0;
-      right: 0;
-      bottom: 0;
-      left: 0;
-      padding: 0 var(--spacing-double);
-    }
-
-    .header-graphics {
-      display: flex;
-
-      .img-space {
-        flex-grow: 2;
-        display: flex;
-      }
-    }
-
-    .release-note-graphic-left {
-      margin-right: 20px;
-    }
-
-    .release-note-graphic-right {
-      margin-left: 20px;
-    }
-
-    .title {
-      text-align: center;
-      position: absolute;
-      width: 100%;
-      top: 0;
-      left: 0;
-      padding-top: 6%;
-
-      .thank-you-note {
-        font-size: var(--font-size-md);
-        font-weight: normal;
-      }
-
-      .thank-you {
-        font-size: var(--font-size-md);
-        font-weight: var(--font-weight-semibold);
-        div {
-          display: inline;
-        }
-      }
-    }
+    background: url('../static/common/release-note-header-left.svg') no-repeat left var(--spacing-double) top var(--spacing-half) / auto 78px,
+      url('../static/common/release-note-header-right.svg') no-repeat right var(--spacing-double) top var(--spacing-half) / auto 78px;
   }
 
   ul {
@@ -79,23 +35,10 @@
   }
 
   .container {
-    width: 600px;
-    padding-left: 72px;
-    padding-right: 72px;
-    padding-top: var(--spacing-triple);
-    padding-bottom: var(--spacing-triple);
+    padding: var(--spacing-triple) 72px;
     overflow-x: hidden;
     overflow-y: auto;
 
-    .footer {
-      position: fixed;
-      height: var(--spacing-triple);
-      width: 95%;
-      bottom: 0;
-      left: 0;
-      background-color: var(--background-color);
-    }
-
     .section {
       padding-bottom: var(--spacing-triple);
     }
@@ -116,55 +59,4 @@
       padding-bottom: var(--spacing-triple);
     }
   }
-
-  .confetti-container {
-    position: absolute;
-    width: 110vw;
-    height: 110vh;
-    top: -50vh;
-    left: -33vw;
-    animation: remove-confetti-container 0s ease-in 4s forwards;
-    animation-iteration-count: 1;
-    animation-fill-mode: forwards;
-  }
-
-  @keyframes remove-confetti-container {
-    to {
-      width: 0;
-      height: 0;
-      overflow: hidden;
-    }
-  }
-
-  .confetti {
-    position: absolute;
-  }
-
-  $colors: (#e7001b, #ffe600, #0ebd25, #0f2679, #e21bd2);
-
-  @for $i from 0 through 750 {
-    $w: random(8);
-    $l: random(100);
-
-    .confetti:nth-child(#{$i}) {
-      width: #{$w}px;
-      height: #{$w * 0.4}px;
-      background-color: nth($colors, random(5));
-      top: -10%;
-      left: unquote($l + '%');
-      opacity: random() + 0.5;
-      transform: rotate(#{random() * 360}deg);
-      animation-name: falling-#{$i};
-      animation-duration: unquote(5 + random() + 's');
-      animation-delay: unquote('-' + random() + 's');
-      animation-iteration-count: 1;
-    }
-
-    @keyframes falling-#{$i} {
-      100% {
-        top: 110%;
-        left: unquote($l + random(15) + '%');
-      }
-    }
-  }
 }
diff --git a/app/styles/ui/dialogs/_unknown-authors.scss b/app/styles/ui/dialogs/_unknown-authors.scss
new file mode 100644
index 00000000000..d85f7130812
--- /dev/null
+++ b/app/styles/ui/dialogs/_unknown-authors.scss
@@ -0,0 +1,21 @@
+#unknown-authors {
+  .dialog-content .author-list {
+    max-height: 175px;
+    overflow-y: auto;
+
+    ul {
+      list-style: none;
+      margin: var(--spacing) 0;
+      padding: 0;
+
+      li {
+        padding-left: 0;
+        margin-bottom: 0;
+      }
+    }
+  }
+
+  .path-text-component {
+    font-family: var(--font-family-monospace);
+  }
+}
diff --git a/app/styles/ui/dialogs/_unreachable-commits.scss b/app/styles/ui/dialogs/_unreachable-commits.scss
new file mode 100644
index 00000000000..e824c9dc99d
--- /dev/null
+++ b/app/styles/ui/dialogs/_unreachable-commits.scss
@@ -0,0 +1,15 @@
+.unreachable-commits {
+  max-width: 400px;
+
+  .unreachable-commit-list {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    min-height: 160px;
+  }
+
+  .message {
+    padding: var(--spacing);
+    border-bottom: var(--base-border);
+  }
+}
diff --git a/app/styles/ui/drag-elements/_commit-drag-element.scss b/app/styles/ui/drag-elements/_commit-drag-element.scss
index 6e753204dd4..cb403c83a3c 100644
--- a/app/styles/ui/drag-elements/_commit-drag-element.scss
+++ b/app/styles/ui/drag-elements/_commit-drag-element.scss
@@ -32,7 +32,6 @@
       font-size: 11px;
       position: absolute;
       top: -22px;
-      left: 20px;
       display: flex;
       align-items: center;
       justify-content: center;
@@ -41,6 +40,10 @@
     }
   }
 
+  &:not(.in-keyboard-insertion-mode) .commit-box .count {
+    left: 20px;
+  }
+
   .tool-tip-contents {
     position: absolute;
     bottom: -35px;
@@ -90,3 +93,7 @@
     box-shadow: 1px 1px 1px 1px var(--box-border-color);
   }
 }
+
+.keyboard-insertion-element #commit-drag-element {
+  position: relative;
+}
diff --git a/app/styles/ui/history/_commit-list.scss b/app/styles/ui/history/_commit-list.scss
index 083f095fc9b..0178698725c 100644
--- a/app/styles/ui/history/_commit-list.scss
+++ b/app/styles/ui/history/_commit-list.scss
@@ -6,34 +6,13 @@
   flex: 1;
   min-height: 0;
 
-  .popover-component {
-    position: absolute;
-    left: 100%;
-    top: 73px;
-    width: 284px;
-
-    .call-to-action-bubble {
-      font-weight: var(--font-weight-semibold);
-      display: inline-block;
-      font-size: var(--font-size-xs);
-      border: 1px solid var(--call-to-action-bubble-border-color);
-      color: var(--call-to-action-bubble-color);
-      padding: 1px 5px;
-      border-radius: var(--border-radius);
-      margin-left: var(--spacing-third);
-    }
-    img {
-      width: 100%;
-    }
-  }
-
   .draggable,
   .commit {
     width: 100%;
     height: 100%;
   }
 
-  .list-item.selected {
+  .list-item.selected:not(.in-keyboard-insertion-mode) {
     .commit {
       .unpushed-indicator {
         background: var(--list-item-selected-badge-background-color);
@@ -52,7 +31,23 @@
     }
   }
 
-  .focus-within {
+  &.has-highlighted-commits {
+    .list-item {
+      transition: opacity 0.5s;
+
+      &:not(.highlighted) {
+        opacity: 30%;
+      }
+    }
+  }
+
+  &:not(.has-highlighted-commits) {
+    .list-item {
+      transition: opacity 0.25s;
+    }
+  }
+
+  .focus-within:not(.in-keyboard-insertion-mode) {
     .list-item.selected {
       .commit {
         .unpushed-indicator {
@@ -74,10 +69,28 @@
     }
   }
 
-  @include high-contrast {
-    .list-item:hover {
-      .commit {
-        color: var(--text-color);
+  .list-item.selected-for-keyboard-insertion {
+    .commit {
+      color: var(--box-selected-text-color);
+      background-color: var(--box-selected-background-color);
+
+      .byline {
+        color: var(--box-selected-text-color);
+      }
+    }
+  }
+
+  .reorder-commits-hint-popover {
+    background-color: var(--background-color);
+    border: var(--base-border);
+    border-radius: var(--border-radius);
+    padding: var(--spacing);
+
+    p {
+      margin: var(--spacing-half) 0;
+
+      &:last-child {
+        margin-bottom: 0;
       }
     }
   }
diff --git a/app/styles/ui/history/_commit-summary.scss b/app/styles/ui/history/_commit-summary.scss
index 704ba0762e8..0a96a3f78ab 100644
--- a/app/styles/ui/history/_commit-summary.scss
+++ b/app/styles/ui/history/_commit-summary.scss
@@ -16,6 +16,13 @@
     width: 75px;
     top: var(--spacing);
     right: var(--spacing);
+    background: transparent;
+    padding: 0;
+    border: none;
+    color: var(--text-color);
+    font-size: inherit;
+    font-weight: normal;
+    font-family: inherit;
 
     svg {
       vertical-align: text-top;
@@ -27,6 +34,7 @@
     .commit-summary-description-scroll-view {
       max-height: 400px;
       overflow: auto;
+      display: revert;
 
       &:before {
         content: none;
@@ -60,6 +68,21 @@
       }
     }
   }
+
+  .commit-unreachable-info {
+    padding: var(--spacing-half) var(--spacing);
+    border-bottom: var(--base-border);
+    display: flex;
+    align-items: center;
+
+    .octicon {
+      margin-right: var(--spacing-half);
+    }
+
+    .link-button-component {
+      margin-right: var(--spacing-half);
+    }
+  }
 }
 
 // NOTE: This isn't a real class, it's an SCSS hack to allow us to only write
@@ -103,9 +126,11 @@
 
   &-description-scroll-view {
     overflow: hidden;
-    // The extra pixel makes the space align up with the commit list.
-    max-height: 69px;
     flex: 1;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    // Maximum amount of commit description lines to show before collapsing
+    -webkit-line-clamp: 3;
   }
 
   // Enable text selection inside the title and description elements.
@@ -157,7 +182,7 @@
       vertical-align: bottom; // For some reason, `bottom` places the text in the middle
     }
 
-    .sha {
+    .selectable {
       user-select: text;
     }
 
diff --git a/app/styles/ui/history/_expandable-commit-summary.scss b/app/styles/ui/history/_expandable-commit-summary.scss
new file mode 100644
index 00000000000..95526189ac2
--- /dev/null
+++ b/app/styles/ui/history/_expandable-commit-summary.scss
@@ -0,0 +1,264 @@
+@import '../../mixins';
+
+#expandable-commit-summary {
+  display: flex;
+  flex-direction: column;
+  min-height: 0;
+  border-bottom: var(--base-border);
+
+  .beneath-summary {
+    overflow-y: auto;
+    padding: var(--spacing);
+    padding-top: 0;
+    padding-bottom: var(--spacing-half);
+  }
+
+  .ecs-title {
+    font-size: var(--font-size-md);
+    font-weight: var(--font-weight-semibold);
+    line-height: 16px;
+    word-wrap: break-word;
+    display: flex;
+    padding: var(--spacing);
+    padding-bottom: var(--spacing-half);
+
+    .commits-in-diff {
+      margin-left: var(--spacing-half);
+    }
+
+    &.empty-summary {
+      color: var(--text-secondary-color);
+    }
+
+    .expander {
+      background: transparent;
+      padding: 0;
+      border: none;
+      color: var(--text-color);
+      font-size: inherit;
+      font-weight: normal;
+      font-family: inherit;
+      margin-left: var(--spacing);
+      height: auto;
+
+      svg {
+        vertical-align: text-top;
+      }
+    }
+  }
+
+  .ecs-description {
+    display: flex;
+    position: relative;
+    min-height: 10px;
+    padding-bottom: var(--spacing-half);
+
+    .ecs-description-scroll-view {
+      overflow: hidden;
+      overflow-y: auto;
+      flex: 1;
+    }
+
+    .ecs-description-text {
+      font-family: var(--font-family-monospace);
+      font-size: var(--font-size-sm);
+      word-wrap: break-word;
+      white-space: pre-wrap;
+      min-height: 0;
+    }
+  }
+
+  .ecs-meta {
+    display: flex;
+    flex-wrap: wrap;
+
+    .ecs-meta-item {
+      display: flex;
+      margin-right: var(--spacing);
+      font-size: var(--font-size-sm);
+      align-items: center;
+
+      &.authors {
+        margin-left: 0;
+
+        .avatar {
+          width: 16px;
+          height: 16px;
+        }
+
+        .author {
+          .avatar-container {
+            margin-right: 4px;
+          }
+        }
+      }
+
+      &.commit-ref {
+        .ref {
+          padding-left: var(--spacing-half);
+        }
+
+        .copy-button {
+          margin-left: var(--spacing-half);
+
+          // Removing default button styles
+          background: transparent;
+          border: none;
+          padding: 0;
+          height: auto;
+          min-width: 16px;
+
+          :hover {
+            color: var(--text-secondary-color);
+          }
+        }
+      }
+
+      &.lines-added-deleted {
+        div {
+          padding-right: var(--spacing-half);
+        }
+
+        .lines-added {
+          color: var(--color-new);
+        }
+
+        .lines-deleted {
+          color: var(--color-deleted);
+        }
+      }
+
+      &.tags {
+        flex-shrink: 1;
+        min-width: 0;
+
+        .octicon {
+          padding-right: var(--spacing-half);
+        }
+
+        span {
+          @include ellipsis;
+        }
+      }
+    }
+  }
+
+  .beneath-summary {
+    display: flex;
+    flex-direction: column;
+  }
+
+  .ecs-description-text {
+    background: var(--box-alt-background-color);
+    padding: var(--spacing-half);
+  }
+
+  &:not(.expanded) {
+    .ecs-description-scroll-view {
+      max-height: 80px;
+      min-height: 30px;
+    }
+  }
+
+  &.expanded {
+    .beneath-summary {
+      background: var(--box-overflow-shadow-background-two);
+      background-repeat: no-repeat;
+      background-size: 100% 20px, 100% 20px, 100% 10px, 100% 10px;
+      background-attachment: local, local, scroll, scroll;
+    }
+
+    .ecs-meta {
+      display: block;
+
+      .ecs-meta-item {
+        margin-bottom: var(--spacing-half);
+        align-items: unset;
+        margin-right: 0;
+
+        &:last-child {
+          margin-bottom: 0;
+        }
+
+        &.authors {
+          display: block;
+
+          .author {
+            margin-bottom: 2px;
+            display: flex;
+
+            div {
+              &:last-child {
+                overflow-wrap: anywhere;
+              }
+            }
+          }
+        }
+
+        &.commit-ref {
+          .ref {
+            overflow-wrap: anywhere;
+          }
+        }
+
+        &.lines-added-deleted {
+          .lines-added {
+            padding-left: var(--spacing-half);
+          }
+        }
+
+        &.tags {
+          span {
+            white-space: normal;
+          }
+        }
+      }
+    }
+  }
+
+  .commit-unreachable-info {
+    display: flex;
+    align-items: center;
+    padding: var(--spacing);
+    padding-top: 0;
+
+    .octicon {
+      margin-right: var(--spacing-half);
+    }
+
+    .link-button-component {
+      margin-right: var(--spacing-half);
+    }
+  }
+
+  .selectable {
+    user-select: text;
+    cursor: text;
+
+    * {
+      user-select: unset;
+      pointer-events: unset;
+      cursor: text;
+    }
+  }
+}
+
+// This make it so there is not a double scroll bar when zoomed in on a very
+// small screen.
+@media (max-width: 650px) {
+  #expandable-commit-summary {
+    &.expanded {
+      .beneath-summary {
+        display: block;
+      }
+
+      .ecs-description {
+        height: auto;
+
+        .ecs-description-text {
+          background: rgba(#959da5, 0.1);
+        }
+      }
+    }
+  }
+}
diff --git a/app/styles/ui/onboarding-tutorial/_right-panel.scss b/app/styles/ui/onboarding-tutorial/_right-panel.scss
index b88ef0f83f3..dadf5e87393 100644
--- a/app/styles/ui/onboarding-tutorial/_right-panel.scss
+++ b/app/styles/ui/onboarding-tutorial/_right-panel.scss
@@ -57,7 +57,7 @@
     font-weight: var(--font-weight-semibold);
 
     .summary-text {
-      opacity: 0.5;
+      color: var(--text-secondary-color);
     }
     .hang-right {
       margin-left: auto;
@@ -116,7 +116,7 @@
   details[open] summary {
     margin-bottom: var(--spacing);
     .summary-text {
-      opacity: 1;
+      color: var(--text-color);
     }
     // we only want to do this if its an (chevron) octicon
     .hang-right .octicon {
diff --git a/app/styles/ui/repository-rules/_repo-rules-failure-list.scss b/app/styles/ui/repository-rules/_repo-rules-failure-list.scss
new file mode 100644
index 00000000000..394c3ad89b2
--- /dev/null
+++ b/app/styles/ui/repository-rules/_repo-rules-failure-list.scss
@@ -0,0 +1,5 @@
+.repo-rules-failure-list-component {
+  ul {
+    padding-inline-start: var(--spacing-double);
+  }
+}
diff --git a/app/styles/ui/toolbar/_button.scss b/app/styles/ui/toolbar/_button.scss
index 5d981d5d293..b99a33ab433 100644
--- a/app/styles/ui/toolbar/_button.scss
+++ b/app/styles/ui/toolbar/_button.scss
@@ -1,4 +1,8 @@
 .toolbar-button {
+  display: flex;
+  flex-direction: row;
+  align-items: stretch;
+
   // Make sure the contents shrink beyond their intrinsic width
   // See https://css-tricks.com/flexbox-truncated-text/
   min-width: 0;
@@ -11,6 +15,11 @@
   // above all the other content.
   position: relative;
 
+  .toolbar-dropdown-button {
+    width: 40px;
+    height: 49px;
+  }
+
   // General button behavior, mostly resets.
   // For the button content styling see second button style. Note that we
   // explicitly use > here to only target the direct descendant button since
@@ -34,7 +43,7 @@
     &:focus {
       background-color: var(--toolbar-button-focus-background-color);
 
-      // Prevent the focus-ring from getting clipped by UI elements
+      // Prevent the focus ring from getting clipped by UI elements
       // outside of the toolbar
       outline-offset: -4px;
 
@@ -47,8 +56,7 @@
       }
 
       // Focused but not through keyboard navigation
-      &:not(.focus-ring) {
-        outline: none;
+      &:not(:focus-visible) {
         background-color: var(--toolbar-button-background-color);
 
         .progress {
diff --git a/app/styles/ui/toolbar/_dropdown.scss b/app/styles/ui/toolbar/_dropdown.scss
index 85dcbceb318..8aae10e03b0 100644
--- a/app/styles/ui/toolbar/_dropdown.scss
+++ b/app/styles/ui/toolbar/_dropdown.scss
@@ -3,13 +3,26 @@
   // See https://css-tricks.com/flexbox-truncated-text/
   min-width: 0;
 
+  display: flex;
+  flex-direction: row;
+
+  &.resizable {
+    // Fill the available height of the parent
+    flex-grow: 1;
+  }
+
   & > .toolbar-button {
     width: 100%;
     height: 100%;
   }
 
+  & .toolbar-dropdown-arrow-button {
+    width: 39px;
+  }
+
   &.open {
-    & > .toolbar-button > button {
+    &.foldout-style > .toolbar-button > button,
+    &.multi-option-style > .toolbar-dropdown-arrow-button > button {
       color: var(--toolbar-button-active-color);
       background-color: var(--toolbar-button-active-background-color);
 
diff --git a/app/styles/ui/toolbar/_push-pull-button.scss b/app/styles/ui/toolbar/_push-pull-button.scss
new file mode 100644
index 00000000000..c883e3e10c2
--- /dev/null
+++ b/app/styles/ui/toolbar/_push-pull-button.scss
@@ -0,0 +1,67 @@
+.push-pull-dropdown {
+  display: flex;
+  flex-direction: column;
+  margin-top: 1px;
+  z-index: 0;
+  max-width: 100%;
+
+  .push-pull-dropdown-item {
+    display: flex;
+    flex-direction: row;
+    height: fit-content;
+    padding: 10px;
+    gap: 10px;
+    color: var(--text-color);
+    background-color: var(--box-background-color);
+    white-space: normal;
+
+    // Unset styles from Button component
+    text-align: unset;
+    border: unset;
+    border-radius: unset;
+    box-shadow: unset !important;
+
+    .octicon {
+      height: 16px;
+      width: 16px;
+    }
+
+    // Override background on focus to keep the default color
+    &:focus {
+      background-color: var(--box-background-color);
+    }
+
+    &:hover {
+      background-color: var(--box-hover-background-color) !important;
+      color: var(--toolbar-dropdown-text-hover-color) !important;
+    }
+
+    &:not(:last-child) {
+      // Enforce this bottom border style even in focused state
+      border-bottom: 1px solid var(--box-border-color) !important;
+    }
+
+    .text-container {
+      display: flex;
+      flex-direction: column;
+      row-gap: 3px;
+
+      .title {
+        font-weight: 600;
+      }
+
+      .detail {
+        color: var(--text-secondary-color);
+
+        .warning {
+          color: var(--toolbar-dropdown-text-warning-color);
+          margin-top: var(--spacing);
+
+          .warning-title {
+            font-weight: 600;
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/app/styles/ui/toolbar/_toolbar.scss b/app/styles/ui/toolbar/_toolbar.scss
index 454df483a02..95a5b222caf 100644
--- a/app/styles/ui/toolbar/_toolbar.scss
+++ b/app/styles/ui/toolbar/_toolbar.scss
@@ -27,25 +27,45 @@
     flex-shrink: 0;
 
     & > :last-child {
+      // Redundant when `.resizable` is used, remove when
+      // enableResizingToolbarButtons() is removed.
       flex-grow: 1;
     }
   }
 
   .toolbar-button {
-    &.push-pull-button {
-      width: 230px;
+    &.resizable {
+      // Fill the available height of the parent
+      flex-grow: 1;
+      max-height: var(--toolbar-height);
     }
-  }
 
-  .toolbar-dropdown {
-    &.branch-button {
+    &.push-pull-button {
       width: 230px;
+
+      &.resizable {
+        width: 100%;
+      }
     }
-  }
+    &.branch-toolbar-button {
+      width: 230px;
 
-  .toolbar-button {
+      &.resizable {
+        width: 100%;
+      }
+    }
     &.revert-progress {
       width: 230px;
+
+      &.resizable {
+        width: 100%;
+      }
+    }
+    &.toolbar-dropdown-arrow-button {
+      width: 39px;
+      &.resizable {
+        flex-shrink: 0;
+      }
     }
   }
 }
diff --git a/app/styles/ui/window/_app-menu-bar.scss b/app/styles/ui/window/_app-menu-bar.scss
index 419ec0bccd4..d68cf5be29f 100644
--- a/app/styles/ui/window/_app-menu-bar.scss
+++ b/app/styles/ui/window/_app-menu-bar.scss
@@ -56,15 +56,5 @@
 
       pointer-events: all;
     }
-
-    .menu-item:hover {
-      &:not(.disabled) {
-        --text-color: var(--box-selected-active-text-color);
-        --text-secondary-color: var(--box-selected-active-text-color);
-
-        color: var(--text-color);
-        background-color: var(--box-selected-active-background-color);
-      }
-    }
   }
 }
diff --git a/app/styles/ui/window/_tooltips.scss b/app/styles/ui/window/_tooltips.scss
index daed043727b..6925500aeb9 100644
--- a/app/styles/ui/window/_tooltips.scss
+++ b/app/styles/ui/window/_tooltips.scss
@@ -1,7 +1,7 @@
 body > .tooltip,
 .tooltip-host > .tooltip {
   display: flex;
-  position: fixed;
+  position: absolute;
   left: 0;
   top: 0;
   z-index: var(--tooltip-z-index);
@@ -11,6 +11,7 @@ body > .tooltip,
   max-width: 300px;
 
   word-wrap: break-word;
+  word-break: break-word;
   overflow-wrap: break-word;
 
   background-color: var(--tooltip-background-color);
@@ -154,7 +155,7 @@ body > .tooltip,
     flex-direction: row;
     padding: var(--spacing-half) 0;
 
-    img {
+    .avatar {
       width: 32px;
       height: 32px;
       margin-right: var(--spacing);
@@ -192,10 +193,42 @@ body > .tooltip,
         color: var(--color-deleted);
       }
 
+      .files-renamed-icon {
+        color: var(--color-renamed);
+      }
+
       .octicon {
         margin-right: var(--spacing-third);
         vertical-align: bottom; // For some reason, `bottom` places the text in the middle
       }
     }
   }
+
+  &.window-controls-tooltip {
+    background-color: var(--toolbar-tooltip-background-color);
+    box-shadow: 0 8px 24px var(--toolbar-tooltip-shadow-color);
+
+    &::before {
+      border-bottom-color: var(--toolbar-tooltip-background-color);
+    }
+  }
+}
+
+.tooltip-host {
+  // Tooltips are positioned absolutely relative to their hosts so the hosts
+  // need to be position: relative or position: absolute.
+  position: relative;
+}
+
+button.toggletip {
+  // override default button styles
+  overflow: inherit;
+  text-overflow: inherit;
+  white-space: inherit;
+  font-family: inherit;
+  font-size: inherit;
+  padding: inherit;
+  border: none;
+  color: inherit;
+  background-color: inherit;
 }
diff --git a/app/test/esm-transformer.js b/app/test/esm-transformer.js
new file mode 100644
index 00000000000..381151b9616
--- /dev/null
+++ b/app/test/esm-transformer.js
@@ -0,0 +1,15 @@
+// Replaces jest-esm-transformer which is apparently no longer maintained, see
+// https://github.com/ActuallyACat/jest-esm-transformer/pull/9
+const babel = require('@babel/core')
+
+module.exports = {
+  process(src) {
+    const options = {
+      babelrc: false,
+      compact: false,
+      plugins: [require.resolve('@babel/plugin-transform-modules-commonjs')],
+    }
+
+    return babel.transform(src, options)
+  },
+}
diff --git a/app/test/fake-stats-post.ts b/app/test/fake-stats-post.ts
new file mode 100644
index 00000000000..f841a5a5dee
--- /dev/null
+++ b/app/test/fake-stats-post.ts
@@ -0,0 +1,2 @@
+export const fakePost = (data: Record<string, any>): Promise<Response> =>
+  Promise.reject(new Error('Stat requests prohibited during testing'))
diff --git a/app/test/fixtures/clone-with-progress-output b/app/test/fixtures/clone-with-progress-output
new file mode 100644
index 00000000000..872c0b693f5
--- /dev/null
+++ b/app/test/fixtures/clone-with-progress-output
@@ -0,0 +1,8 @@
+Cloning into 'linux'...
+remote: Enumerating objects: 10460014        
remote: Enumerating objects: 10460179, done.        
+remote: Counting objects:   0% (1/165)        
remote: Counting objects:   1% (2/165)        
remote: Counting objects:   2% (4/165)        
remote: Counting objects:   3% (5/165)        
remote: Counting objects:   4% (7/165)        
remote: Counting objects:   5% (9/165)        
remote: Counting objects:   6% (10/165)        
remote: Counting objects:   7% (12/165)        
remote: Counting objects:   8% (14/165)        
remote: Counting objects:   9% (15/165)        
remote: Counting objects:  10% (17/165)        
remote: Counting objects:  11% (19/165)        
remote: Counting objects:  12% (20/165)        
remote: Counting objects:  13% (22/165)        
remote: Counting objects:  14% (24/165)        
remote: Counting objects:  15% (25/165)        
remote: Counting objects:  16% (27/165)        
remote: Counting objects:  17% (29/165)        
remote: Counting objects:  18% (30/165)        
remote: Counting objects:  19% (32/165)        
remote: Counting objects:  20% (33/165)        
remote: Counting objects:  21% (35/165)        
remote: Counting objects:  22% (37/165)        
remote: Counting objects:  23% (38/165)        
remote: Counting objects:  24% (40/165)        
remote: Counting objects:  25% (42/165)        
remote: Counting objects:  26% (43/165)        
remote: Counting objects:  27% (45/165)        
remote: Counting objects:  28% (47/165)        
remote: Counting objects:  29% (48/165)        
remote: Counting objects:  30% (50/165)        
remote: Counting objects:  31% (52/165)        
remote: Counting objects:  32% (53/165)        
remote: Counting objects:  33% (55/165)        
remote: Counting objects:  34% (57/165)        
remote: Counting objects:  35% (58/165)        
remote: Counting objects:  36% (60/165)        
remote: Counting objects:  37% (62/165)        
remote: Counting objects:  38% (63/165)        
remote: Counting objects:  39% (65/165)        
remote: Counting objects:  40% (66/165)        
remote: Counting objects:  41% (68/165)        
remote: Counting objects:  42% (70/165)        
remote: Counting objects:  43% (71/165)        
remote: Counting objects:  44% (73/165)        
remote: Counting objects:  45% (75/165)        
remote: Counting objects:  46% (76/165)        
remote: Counting objects:  47% (78/165)        
remote: Counting objects:  48% (80/165)        
remote: Counting objects:  49% (81/165)        
remote: Counting objects:  50% (83/165)        
remote: Counting objects:  51% (85/165)        
remote: Counting objects:  52% (86/165)        
remote: Counting objects:  53% (88/165)        
remote: Counting objects:  54% (90/165)        
remote: Counting objects:  55% (91/165)        
remote: Counting objects:  56% (93/165)        
remote: Counting objects:  57% (95/165)        
remote: Counting objects:  58% (96/165)        
remote: Counting objects:  59% (98/165)        
remote: Counting objects:  60% (99/165)        
remote: Counting objects:  61% (101/165)        
remote: Counting objects:  62% (103/165)        
remote: Counting objects:  63% (104/165)        
remote: Counting objects:  64% (106/165)        
remote: Counting objects:  65% (108/165)        
remote: Counting objects:  66% (109/165)        
remote: Counting objects:  67% (111/165)        
remote: Counting objects:  68% (113/165)        
remote: Counting objects:  69% (114/165)        
remote: Counting objects:  70% (116/165)        
remote: Counting objects:  71% (118/165)        
remote: Counting objects:  72% (119/165)        
remote: Counting objects:  73% (121/165)        
remote: Counting objects:  74% (123/165)        
remote: Counting objects:  75% (124/165)        
remote: Counting objects:  76% (126/165)        
remote: Counting objects:  77% (128/165)        
remote: Counting objects:  78% (129/165)        
remote: Counting objects:  79% (131/165)        
remote: Counting objects:  80% (132/165)        
remote: Counting objects:  81% (134/165)        
remote: Counting objects:  82% (136/165)        
remote: Counting objects:  83% (137/165)        
remote: Counting objects:  84% (139/165)        
remote: Counting objects:  85% (141/165)        
remote: Counting objects:  86% (142/165)        
remote: Counting objects:  87% (144/165)        
remote: Counting objects:  88% (146/165)        
remote: Counting objects:  89% (147/165)        
remote: Counting objects:  90% (149/165)        
remote: Counting objects:  91% (151/165)        
remote: Counting objects:  92% (152/165)        
remote: Counting objects:  93% (154/165)        
remote: Counting objects:  94% (156/165)        
remote: Counting objects:  95% (157/165)        
remote: Counting objects:  96% (159/165)        
remote: Counting objects:  97% (161/165)        
remote: Counting objects:  98% (162/165)        
remote: Counting objects:  99% (164/165)        
remote: Counting objects: 100% (165/165)        
remote: Counting objects: 100% (165/165), done.        
+remote: Compressing objects:   0% (1/106)        
remote: Compressing objects:   1% (2/106)        
remote: Compressing objects:   2% (3/106)        
remote: Compressing objects:   3% (4/106)        
remote: Compressing objects:   4% (5/106)        
remote: Compressing objects:   5% (6/106)        
remote: Compressing objects:   6% (7/106)        
remote: Compressing objects:   7% (8/106)        
remote: Compressing objects:   8% (9/106)        
remote: Compressing objects:   9% (10/106)        
remote: Compressing objects:  10% (11/106)        
remote: Compressing objects:  11% (12/106)        
remote: Compressing objects:  12% (13/106)        
remote: Compressing objects:  13% (14/106)        
remote: Compressing objects:  14% (15/106)        
remote: Compressing objects:  15% (16/106)        
remote: Compressing objects:  16% (17/106)        
remote: Compressing objects:  17% (19/106)        
remote: Compressing objects:  18% (20/106)        
remote: Compressing objects:  19% (21/106)        
remote: Compressing objects:  20% (22/106)        
remote: Compressing objects:  21% (23/106)        
remote: Compressing objects:  22% (24/106)        
remote: Compressing objects:  23% (25/106)        
remote: Compressing objects:  24% (26/106)        
remote: Compressing objects:  25% (27/106)        
remote: Compressing objects:  26% (28/106)        
remote: Compressing objects:  27% (29/106)        
remote: Compressing objects:  28% (30/106)        
remote: Compressing objects:  29% (31/106)        
remote: Compressing objects:  30% (32/106)        
remote: Compressing objects:  31% (33/106)        
remote: Compressing objects:  32% (34/106)        
remote: Compressing objects:  33% (35/106)        
remote: Compressing objects:  34% (37/106)        
remote: Compressing objects:  35% (38/106)        
remote: Compressing objects:  36% (39/106)        
remote: Compressing objects:  37% (40/106)        
remote: Compressing objects:  38% (41/106)        
remote: Compressing objects:  39% (42/106)        
remote: Compressing objects:  40% (43/106)        
remote: Compressing objects:  41% (44/106)        
remote: Compressing objects:  42% (45/106)        
remote: Compressing objects:  43% (46/106)        
remote: Compressing objects:  44% (47/106)        
remote: Compressing objects:  45% (48/106)        
remote: Compressing objects:  46% (49/106)        
remote: Compressing objects:  47% (50/106)        
remote: Compressing objects:  48% (51/106)        
remote: Compressing objects:  49% (52/106)        
remote: Compressing objects:  50% (53/106)        
remote: Compressing objects:  51% (55/106)        
remote: Compressing objects:  52% (56/106)        
remote: Compressing objects:  53% (57/106)        
remote: Compressing objects:  54% (58/106)        
remote: Compressing objects:  55% (59/106)        
remote: Compressing objects:  56% (60/106)        
remote: Compressing objects:  57% (61/106)        
remote: Compressing objects:  58% (62/106)        
remote: Compressing objects:  59% (63/106)        
remote: Compressing objects:  60% (64/106)        
remote: Compressing objects:  61% (65/106)        
remote: Compressing objects:  62% (66/106)        
remote: Compressing objects:  63% (67/106)        
remote: Compressing objects:  64% (68/106)        
remote: Compressing objects:  65% (69/106)        
remote: Compressing objects:  66% (70/106)        
remote: Compressing objects:  67% (72/106)        
remote: Compressing objects:  68% (73/106)        
remote: Compressing objects:  69% (74/106)        
remote: Compressing objects:  70% (75/106)        
remote: Compressing objects:  71% (76/106)        
remote: Compressing objects:  72% (77/106)        
remote: Compressing objects:  73% (78/106)        
remote: Compressing objects:  74% (79/106)        
remote: Compressing objects:  75% (80/106)        
remote: Compressing objects:  76% (81/106)        
remote: Compressing objects:  77% (82/106)        
remote: Compressing objects:  78% (83/106)        
remote: Compressing objects:  79% (84/106)        
remote: Compressing objects:  80% (85/106)        
remote: Compressing objects:  81% (86/106)        
remote: Compressing objects:  82% (87/106)        
remote: Compressing objects:  83% (88/106)        
remote: Compressing objects:  84% (90/106)        
remote: Compressing objects:  85% (91/106)        
remote: Compressing objects:  86% (92/106)        
remote: Compressing objects:  87% (93/106)        
remote: Compressing objects:  88% (94/106)        
remote: Compressing objects:  89% (95/106)        
remote: Compressing objects:  90% (96/106)        
remote: Compressing objects:  91% (97/106)        
remote: Compressing objects:  92% (98/106)        
remote: Compressing objects:  93% (99/106)        
remote: Compressing objects:  94% (100/106)        
remote: Compressing objects:  95% (101/106)        
remote: Compressing objects:  96% (102/106)        
remote: Compressing objects:  97% (103/106)        
remote: Compressing objects:  98% (104/106)        
remote: Compressing objects:  99% (105/106)        
remote: Compressing objects: 100% (106/106)        
remote: Compressing objects: 100% (106/106), done.        
+Receiving objects:   0% (1/10460179)
Receiving objects:   0% (20006/10460179), 5.75 MiB | 11.43 MiB/s
Receiving objects:   0% (40866/10460179), 16.60 MiB | 11.04 MiB/s
Receiving objects:   0% (61178/10460179), 27.89 MiB | 11.13 MiB/s
Receiving objects:   0% (81677/10460179), 38.35 MiB | 10.94 MiB/s
Receiving objects:   0% (104442/10460179), 49.60 MiB | 11.01 MiB/s
Receiving objects:   1% (104602/10460179), 49.60 MiB | 11.01 MiB/s
Receiving objects:   1% (123874/10460179), 60.31 MiB | 10.87 MiB/s
Receiving objects:   1% (145708/10460179), 71.35 MiB | 10.90 MiB/s
Receiving objects:   1% (165738/10460179), 82.45 MiB | 10.89 MiB/s
Receiving objects:   1% (174600/10460179), 91.74 MiB | 9.29 MiB/s 
Receiving objects:   1% (181279/10460179), 94.96 MiB | 7.55 MiB/s
Receiving objects:   1% (187007/10460179), 96.34 MiB | 6.71 MiB/s
Receiving objects:   1% (203439/10460179), 102.45 MiB | 5.52 MiB/s
Receiving objects:   2% (209204/10460179), 107.84 MiB | 5.49 MiB/s
Receiving objects:   2% (222235/10460179), 112.92 MiB | 5.58 MiB/s
Receiving objects:   2% (232479/10460179), 120.07 MiB | 5.82 MiB/s
Receiving objects:   2% (238284/10460179), 124.65 MiB | 5.99 MiB/s
Receiving objects:   2% (244987/10460179), 128.08 MiB | 6.05 MiB/s
Receiving objects:   2% (264783/10460179), 133.77 MiB | 6.32 MiB/s
Receiving objects:   2% (286141/10460179), 144.84 MiB | 6.44 MiB/s
Receiving objects:   2% (308098/10460179), 155.68 MiB | 7.58 MiB/s
Receiving objects:   3% (313806/10460179), 161.36 MiB | 8.36 MiB/s
Receiving objects:   3% (330105/10460179), 166.92 MiB | 9.28 MiB/s
Receiving objects:   3% (352154/10460179), 177.89 MiB | 11.06 MiB/s
Receiving objects:   3% (375377/10460179), 189.13 MiB | 11.07 MiB/s
Receiving objects:   3% (396422/10460179), 200.07 MiB | 11.04 MiB/s
Receiving objects:   3% (418212/10460179), 210.81 MiB | 10.98 MiB/s
Receiving objects:   4% (418408/10460179), 210.81 MiB | 10.98 MiB/s
Receiving objects:   4% (429924/10460179), 217.28 MiB | 9.67 MiB/s 
Receiving objects:   4% (452778/10460179), 228.68 MiB | 9.74 MiB/s
Receiving objects:   4% (475268/10460179), 239.91 MiB | 9.74 MiB/s
Receiving objects:   4% (498299/10460179), 250.80 MiB | 9.76 MiB/s
Receiving objects:   4% (521633/10460179), 262.09 MiB | 10.14 MiB/s
Receiving objects:   5% (523009/10460179), 262.09 MiB | 10.14 MiB/s
Receiving objects:   5% (543634/10460179), 272.59 MiB | 10.98 MiB/s
Receiving objects:   5% (566117/10460179), 283.11 MiB | 10.83 MiB/s
Receiving objects:   5% (587978/10460179), 293.71 MiB | 10.72 MiB/s
Receiving objects:   5% (613894/10460179), 304.72 MiB | 10.71 MiB/s
Receiving objects:   6% (627611/10460179), 310.32 MiB | 10.72 MiB/s
Receiving objects:   6% (631273/10460179), 314.32 MiB | 10.47 MiB/s
Receiving objects:   6% (635926/10460179), 316.91 MiB | 8.66 MiB/s 
Receiving objects:   6% (646024/10460179), 319.93 MiB | 6.89 MiB/s
Receiving objects:   6% (670391/10460179), 331.22 MiB | 6.98 MiB/s
Receiving objects:   6% (684173/10460179), 338.53 MiB | 6.08 MiB/s
Receiving objects:   6% (708799/10460179), 348.39 MiB | 7.16 MiB/s
Receiving objects:   7% (732213/10460179), 353.94 MiB | 8.08 MiB/s
Receiving objects:   7% (734742/10460179), 359.53 MiB | 8.99 MiB/s
Receiving objects:   7% (760750/10460179), 370.54 MiB | 9.86 MiB/s
Receiving objects:   7% (787186/10460179), 381.76 MiB | 10.13 MiB/s
Receiving objects:   7% (813439/10460179), 392.77 MiB | 11.08 MiB/s
Receiving objects:   8% (836815/10460179), 398.43 MiB | 11.10 MiB/s
Receiving objects:   8% (840796/10460179), 403.98 MiB | 11.11 MiB/s
Receiving objects:   8% (868482/10460179), 414.87 MiB | 11.06 MiB/s
Receiving objects:   8% (896295/10460179), 426.13 MiB | 11.09 MiB/s
Receiving objects:   8% (914412/10460179), 433.88 MiB | 10.31 MiB/s
Receiving objects:   8% (921402/10460179), 436.71 MiB | 8.41 MiB/s 
Receiving objects:   8% (932259/10460179), 438.41 MiB | 7.51 MiB/s
Receiving objects:   9% (941417/10460179), 441.26 MiB | 6.92 MiB/s
Receiving objects:   9% (960006/10460179), 452.11 MiB | 6.85 MiB/s
Receiving objects:   9% (969357/10460179), 457.86 MiB | 5.68 MiB/s
Receiving objects:   9% (984896/10460179), 463.67 MiB | 6.40 MiB/s
Receiving objects:   9% (1001339/10460179), 474.79 MiB | 8.24 MiB/s
Receiving objects:   9% (1018282/10460179), 485.60 MiB | 9.66 MiB/s
Receiving objects:   9% (1035854/10460179), 496.89 MiB | 9.78 MiB/s
Receiving objects:  10% (1046018/10460179), 502.46 MiB | 10.11 MiB/s
Receiving objects:  10% (1054194/10460179), 507.70 MiB | 11.06 MiB/s
Receiving objects:  10% (1071535/10460179), 519.00 MiB | 11.06 MiB/s
Receiving objects:  10% (1088509/10460179), 529.93 MiB | 11.02 MiB/s
Receiving objects:  10% (1105808/10460179), 540.85 MiB | 10.99 MiB/s
Receiving objects:  10% (1123237/10460179), 551.73 MiB | 10.94 MiB/s
Receiving objects:  10% (1136781/10460179), 562.00 MiB | 10.78 MiB/s
Receiving objects:  10% (1142686/10460179), 567.38 MiB | 9.24 MiB/s 
Receiving objects:  10% (1146683/10460179), 570.28 MiB | 7.52 MiB/s
Receiving objects:  11% (1150620/10460179), 571.75 MiB | 6.59 MiB/s
Receiving objects:  11% (1160587/10460179), 577.58 MiB | 6.65 MiB/s
Receiving objects:  11% (1177334/10460179), 588.40 MiB | 6.61 MiB/s
Receiving objects:  11% (1190776/10460179), 596.15 MiB | 6.59 MiB/s
Receiving objects:  11% (1208157/10460179), 607.07 MiB | 8.29 MiB/s
Receiving objects:  11% (1225819/10460179), 618.18 MiB | 10.20 MiB/s
Receiving objects:  11% (1243226/10460179), 628.96 MiB | 10.06 MiB/s
Receiving objects:  12% (1255222/10460179), 634.63 MiB | 10.21 MiB/s
Receiving objects:  12% (1261055/10460179), 640.17 MiB | 11.03 MiB/s
Receiving objects:  12% (1279303/10460179), 651.04 MiB | 11.02 MiB/s
Receiving objects:  12% (1298677/10460179), 662.16 MiB | 11.00 MiB/s
Receiving objects:  12% (1312427/10460179), 673.24 MiB | 11.03 MiB/s
Receiving objects:  12% (1316803/10460179), 683.00 MiB | 10.74 MiB/s
Receiving objects:  12% (1318938/10460179), 692.76 MiB | 10.50 MiB/s
Receiving objects:  12% (1320379/10460179), 702.10 MiB | 10.09 MiB/s
Receiving objects:  12% (1321217/10460179), 706.15 MiB | 8.41 MiB/s 
Receiving objects:  12% (1323057/10460179), 709.42 MiB | 6.82 MiB/s
Receiving objects:  12% (1325993/10460179), 712.57 MiB | 5.21 MiB/s
Receiving objects:  12% (1329628/10460179), 716.66 MiB | 5.08 MiB/s
Receiving objects:  12% (1334329/10460179), 727.67 MiB | 5.44 MiB/s
Receiving objects:  12% (1339414/10460179), 737.81 MiB | 6.85 MiB/s
Receiving objects:  12% (1347797/10460179), 748.61 MiB | 8.56 MiB/s
Receiving objects:  12% (1355034/10460179), 758.76 MiB | 10.19 MiB/s
Receiving objects:  13% (1359824/10460179), 769.63 MiB | 10.46 MiB/s
Receiving objects:  13% (1362204/10460179), 769.63 MiB | 10.46 MiB/s
Receiving objects:  13% (1367589/10460179), 780.37 MiB | 10.45 MiB/s
Receiving objects:  13% (1371119/10460179), 790.52 MiB | 10.45 MiB/s
Receiving objects:  13% (1374302/10460179), 801.46 MiB | 10.48 MiB/s
Receiving objects:  13% (1374421/10460179), 812.23 MiB | 10.66 MiB/s
Receiving objects:  13% (1374566/10460179), 822.80 MiB | 10.55 MiB/s
Receiving objects:  13% (1376250/10460179), 833.42 MiB | 10.56 MiB/s
Receiving objects:  13% (1378515/10460179), 840.55 MiB | 9.61 MiB/s 
Receiving objects:  13% (1379427/10460179), 843.72 MiB | 7.84 MiB/s
Receiving objects:  13% (1380455/10460179), 846.61 MiB | 6.13 MiB/s
Receiving objects:  13% (1383040/10460179), 854.14 MiB | 5.46 MiB/s
Receiving objects:  13% (1386367/10460179), 864.48 MiB | 5.52 MiB/s
Receiving objects:  13% (1389154/10460179), 875.32 MiB | 7.26 MiB/s
Receiving objects:  13% (1391381/10460179), 885.83 MiB | 8.98 MiB/s
Receiving objects:  13% (1393641/10460179), 896.79 MiB | 10.50 MiB/s
Receiving objects:  13% (1396524/10460179), 907.52 MiB | 10.60 MiB/s
Receiving objects:  13% (1398769/10460179), 915.86 MiB | 10.06 MiB/s
Receiving objects:  13% (1401841/10460179), 924.88 MiB | 9.67 MiB/s 
Receiving objects:  13% (1404656/10460179), 935.73 MiB | 9.75 MiB/s
Receiving objects:  13% (1407929/10460179), 946.57 MiB | 9.76 MiB/s
Receiving objects:  13% (1413597/10460179), 957.59 MiB | 10.14 MiB/s
Receiving objects:  13% (1415906/10460179), 967.50 MiB | 10.35 MiB/s
Receiving objects:  13% (1417199/10460179), 972.50 MiB | 9.07 MiB/s 
Receiving objects:  13% (1418507/10460179), 975.46 MiB | 7.27 MiB/s
Receiving objects:  13% (1419295/10460179), 978.39 MiB | 5.58 MiB/s
Receiving objects:  13% (1423437/10460179), 983.96 MiB | 5.58 MiB/s
Receiving objects:  13% (1431582/10460179), 993.40 MiB | 5.48 MiB/s
Receiving objects:  13% (1436477/10460179), 1004.14 MiB | 6.88 MiB/s
Receiving objects:  13% (1440405/10460179), 1015.40 MiB | 8.75 MiB/s
Receiving objects:  13% (1444383/10460179), 1.00 GiB | 10.65 MiB/s  
Receiving objects:  13% (1448915/10460179), 1.01 GiB | 11.00 MiB/s
Receiving objects:  13% (1454989/10460179), 1.02 GiB | 11.05 MiB/s
Receiving objects:  13% (1459371/10460179), 1.03 GiB | 11.04 MiB/s
Receiving objects:  13% (1462345/10460179), 1.04 GiB | 10.98 MiB/s
Receiving objects:  13% (1463947/10460179), 1.05 GiB | 10.86 MiB/s
Receiving objects:  14% (1464426/10460179), 1.06 GiB | 10.85 MiB/s
Receiving objects:  14% (1466752/10460179), 1.06 GiB | 10.84 MiB/s
Receiving objects:  14% (1468943/10460179), 1.07 GiB | 10.83 MiB/s
Receiving objects:  14% (1470245/10460179), 1.08 GiB | 10.32 MiB/s
Receiving objects:  14% (1470724/10460179), 1.08 GiB | 8.39 MiB/s 
Receiving objects:  14% (1471199/10460179), 1.09 GiB | 6.54 MiB/s
Receiving objects:  14% (1472977/10460179), 1.09 GiB | 5.10 MiB/s
Receiving objects:  14% (1475487/10460179), 1.10 GiB | 5.36 MiB/s
Receiving objects:  14% (1478358/10460179), 1.11 GiB | 6.64 MiB/s
Receiving objects:  14% (1481205/10460179), 1.12 GiB | 8.58 MiB/s
Receiving objects:  14% (1484613/10460179), 1.13 GiB | 10.44 MiB/s
Receiving objects:  14% (1489884/10460179), 1.14 GiB | 11.07 MiB/s
Receiving objects:  14% (1494504/10460179), 1.16 GiB | 11.03 MiB/s
Receiving objects:  14% (1498700/10460179), 1.17 GiB | 11.07 MiB/s
Receiving objects:  14% (1505359/10460179), 1.18 GiB | 11.05 MiB/s
Receiving objects:  14% (1512823/10460179), 1.19 GiB | 11.09 MiB/s
Receiving objects:  14% (1517729/10460179), 1.20 GiB | 11.13 MiB/s
Receiving objects:  14% (1521167/10460179), 1.21 GiB | 11.08 MiB/s
Receiving objects:  14% (1523982/10460179), 1.22 GiB | 10.66 MiB/s
Receiving objects:  14% (1524933/10460179), 1.22 GiB | 8.92 MiB/s 
Receiving objects:  14% (1525777/10460179), 1.23 GiB | 7.22 MiB/s
Receiving objects:  14% (1527337/10460179), 1.23 GiB | 6.43 MiB/s
Receiving objects:  14% (1530942/10460179), 1.24 GiB | 6.20 MiB/s
Receiving objects:  14% (1536142/10460179), 1.25 GiB | 6.58 MiB/s
Receiving objects:  14% (1541545/10460179), 1.26 GiB | 8.28 MiB/s
Receiving objects:  14% (1544956/10460179), 1.27 GiB | 9.95 MiB/s
Receiving objects:  14% (1551047/10460179), 1.28 GiB | 11.09 MiB/s
Receiving objects:  14% (1562055/10460179), 1.29 GiB | 11.09 MiB/s
Receiving objects:  14% (1565605/10460179), 1.30 GiB | 11.12 MiB/s
Receiving objects:  14% (1567848/10460179), 1.31 GiB | 11.09 MiB/s
Receiving objects:  15% (1569027/10460179), 1.32 GiB | 11.11 MiB/s
Receiving objects:  15% (1569815/10460179), 1.32 GiB | 11.10 MiB/s
Receiving objects:  15% (1571538/10460179), 1.34 GiB | 11.08 MiB/s
Receiving objects:  15% (1573356/10460179), 1.35 GiB | 11.07 MiB/s
Receiving objects:  15% (1575159/10460179), 1.36 GiB | 10.94 MiB/s
Receiving objects:  15% (1575675/10460179), 1.36 GiB | 8.88 MiB/s 
Receiving objects:  15% (1576051/10460179), 1.36 GiB | 7.83 MiB/s
Receiving objects:  15% (1576902/10460179), 1.37 GiB | 6.06 MiB/s
Receiving objects:  15% (1582722/10460179), 1.38 GiB | 5.80 MiB/s
Receiving objects:  15% (1590496/10460179), 1.39 GiB | 6.19 MiB/s
Receiving objects:  15% (1597843/10460179), 1.40 GiB | 7.97 MiB/s
Receiving objects:  15% (1602121/10460179), 1.41 GiB | 9.93 MiB/s
Receiving objects:  15% (1604905/10460179), 1.42 GiB | 11.08 MiB/s
Receiving objects:  15% (1609234/10460179), 1.43 GiB | 11.08 MiB/s
Receiving objects:  15% (1612717/10460179), 1.44 GiB | 11.09 MiB/s
Receiving objects:  15% (1616029/10460179), 1.45 GiB | 11.08 MiB/s
Receiving objects:  15% (1618539/10460179), 1.46 GiB | 11.08 MiB/s
Receiving objects:  15% (1621795/10460179), 1.48 GiB | 11.07 MiB/s
Receiving objects:  15% (1624665/10460179), 1.49 GiB | 11.07 MiB/s
Receiving objects:  15% (1628646/10460179), 1.50 GiB | 10.97 MiB/s
Receiving objects:  15% (1629715/10460179), 1.50 GiB | 9.55 MiB/s 
Receiving objects:  15% (1630727/10460179), 1.51 GiB | 7.80 MiB/s
Receiving objects:  15% (1631688/10460179), 1.51 GiB | 6.06 MiB/s
Receiving objects:  15% (1637005/10460179), 1.52 GiB | 6.10 MiB/s
Receiving objects:  15% (1640464/10460179), 1.53 GiB | 6.60 MiB/s
Receiving objects:  15% (1645131/10460179), 1.54 GiB | 8.38 MiB/s
Receiving objects:  15% (1650054/10460179), 1.55 GiB | 10.09 MiB/s
Receiving objects:  15% (1652734/10460179), 1.56 GiB | 10.98 MiB/s
Receiving objects:  15% (1655771/10460179), 1.57 GiB | 10.97 MiB/s
Receiving objects:  15% (1659831/10460179), 1.58 GiB | 11.04 MiB/s
Receiving objects:  15% (1662031/10460179), 1.59 GiB | 11.03 MiB/s
Receiving objects:  15% (1663956/10460179), 1.61 GiB | 11.07 MiB/s
Receiving objects:  15% (1665884/10460179), 1.62 GiB | 10.99 MiB/s
Receiving objects:  15% (1667922/10460179), 1.63 GiB | 10.92 MiB/s
Receiving objects:  15% (1671721/10460179), 1.64 GiB | 10.55 MiB/s
Receiving objects:  16% (1673629/10460179), 1.64 GiB | 10.23 MiB/s
Receiving objects:  16% (1674178/10460179), 1.64 GiB | 9.38 MiB/s 
Receiving objects:  16% (1675749/10460179), 1.65 GiB | 7.61 MiB/s
Receiving objects:  16% (1676890/10460179), 1.65 GiB | 5.94 MiB/s
Receiving objects:  16% (1679320/10460179), 1.65 GiB | 5.71 MiB/s
Receiving objects:  16% (1681288/10460179), 1.66 GiB | 5.97 MiB/s
Receiving objects:  16% (1683970/10460179), 1.67 GiB | 7.09 MiB/s
Receiving objects:  16% (1685988/10460179), 1.68 GiB | 8.86 MiB/s
Receiving objects:  16% (1688081/10460179), 1.70 GiB | 10.63 MiB/s
Receiving objects:  16% (1690135/10460179), 1.71 GiB | 10.89 MiB/s
Receiving objects:  16% (1692008/10460179), 1.72 GiB | 11.05 MiB/s
Receiving objects:  16% (1694457/10460179), 1.73 GiB | 11.05 MiB/s
Receiving objects:  16% (1696650/10460179), 1.74 GiB | 10.99 MiB/s
Receiving objects:  16% (1700107/10460179), 1.75 GiB | 11.04 MiB/s
Receiving objects:  16% (1701459/10460179), 1.76 GiB | 10.92 MiB/s
Receiving objects:  16% (1703801/10460179), 1.77 GiB | 10.95 MiB/s
Receiving objects:  16% (1706517/10460179), 1.78 GiB | 10.34 MiB/s
Receiving objects:  16% (1709863/10460179), 1.78 GiB | 8.58 MiB/s 
Receiving objects:  16% (1713887/10460179), 1.79 GiB | 6.93 MiB/s
Receiving objects:  16% (1723301/10460179), 1.79 GiB | 6.20 MiB/s
Receiving objects:  16% (1732419/10460179), 1.80 GiB | 5.88 MiB/s
Receiving objects:  16% (1738438/10460179), 1.81 GiB | 7.18 MiB/s
Receiving objects:  16% (1744543/10460179), 1.82 GiB | 8.48 MiB/s
Receiving objects:  16% (1748295/10460179), 1.83 GiB | 9.54 MiB/s
Receiving objects:  16% (1751828/10460179), 1.84 GiB | 9.01 MiB/s
Receiving objects:  16% (1757076/10460179), 1.85 GiB | 9.13 MiB/s
Receiving objects:  16% (1763397/10460179), 1.86 GiB | 9.37 MiB/s
Receiving objects:  16% (1768300/10460179), 1.87 GiB | 9.64 MiB/s
Receiving objects:  16% (1776670/10460179), 1.88 GiB | 10.36 MiB/s
Receiving objects:  17% (1778231/10460179), 1.88 GiB | 10.36 MiB/s
Receiving objects:  17% (1782776/10460179), 1.89 GiB | 10.43 MiB/s
Receiving objects:  17% (1788454/10460179), 1.90 GiB | 10.46 MiB/s
Receiving objects:  17% (1789500/10460179), 1.90 GiB | 9.23 MiB/s 
Receiving objects:  17% (1790268/10460179), 1.91 GiB | 7.45 MiB/s
Receiving objects:  17% (1791225/10460179), 1.91 GiB | 5.98 MiB/s
Receiving objects:  17% (1794027/10460179), 1.92 GiB | 5.32 MiB/s
Receiving objects:  17% (1799362/10460179), 1.93 GiB | 5.67 MiB/s
Receiving objects:  17% (1807647/10460179), 1.94 GiB | 6.82 MiB/s
Receiving objects:  17% (1811522/10460179), 1.94 GiB | 8.08 MiB/s
Receiving objects:  17% (1815992/10460179), 1.95 GiB | 9.39 MiB/s
Receiving objects:  17% (1819550/10460179), 1.96 GiB | 9.24 MiB/s
Receiving objects:  17% (1824123/10460179), 1.97 GiB | 9.47 MiB/s
Receiving objects:  17% (1830322/10460179), 1.99 GiB | 10.27 MiB/s
Receiving objects:  17% (1835448/10460179), 2.00 GiB | 10.73 MiB/s
Receiving objects:  17% (1841523/10460179), 2.01 GiB | 10.94 MiB/s
Receiving objects:  17% (1846310/10460179), 2.02 GiB | 10.93 MiB/s
Receiving objects:  17% (1850400/10460179), 2.03 GiB | 10.54 MiB/s
Receiving objects:  17% (1853534/10460179), 2.03 GiB | 9.26 MiB/s 
Receiving objects:  17% (1856411/10460179), 2.03 GiB | 8.36 MiB/s
Receiving objects:  17% (1860121/10460179), 2.04 GiB | 6.59 MiB/s
Receiving objects:  17% (1867790/10460179), 2.04 GiB | 5.68 MiB/s
Receiving objects:  17% (1873949/10460179), 2.05 GiB | 5.99 MiB/s
Receiving objects:  17% (1879918/10460179), 2.06 GiB | 6.94 MiB/s
Receiving objects:  18% (1882833/10460179), 2.07 GiB | 7.82 MiB/s
Receiving objects:  18% (1886678/10460179), 2.08 GiB | 8.77 MiB/s
Receiving objects:  18% (1892874/10460179), 2.08 GiB | 10.30 MiB/s
Receiving objects:  18% (1898730/10460179), 2.09 GiB | 9.95 MiB/s 
Receiving objects:  18% (1906384/10460179), 2.10 GiB | 9.83 MiB/s
Receiving objects:  18% (1913323/10460179), 2.11 GiB | 9.99 MiB/s
Receiving objects:  18% (1916103/10460179), 2.12 GiB | 9.83 MiB/s
Receiving objects:  18% (1923251/10460179), 2.13 GiB | 10.46 MiB/s
Receiving objects:  18% (1926752/10460179), 2.14 GiB | 10.60 MiB/s
Receiving objects:  18% (1930420/10460179), 2.16 GiB | 10.63 MiB/s
Receiving objects:  18% (1932078/10460179), 2.16 GiB | 9.99 MiB/s 
Receiving objects:  18% (1932946/10460179), 2.17 GiB | 8.08 MiB/s
Receiving objects:  18% (1934678/10460179), 2.17 GiB | 6.40 MiB/s
Receiving objects:  18% (1938706/10460179), 2.17 GiB | 5.59 MiB/s
Receiving objects:  18% (1942633/10460179), 2.18 GiB | 5.23 MiB/s
Receiving objects:  18% (1948430/10460179), 2.19 GiB | 5.66 MiB/s
Receiving objects:  18% (1953122/10460179), 2.20 GiB | 7.39 MiB/s
Receiving objects:  18% (1958205/10460179), 2.21 GiB | 9.14 MiB/s
Receiving objects:  18% (1960576/10460179), 2.22 GiB | 10.09 MiB/s
Receiving objects:  18% (1963853/10460179), 2.23 GiB | 10.08 MiB/s
Receiving objects:  18% (1966563/10460179), 2.24 GiB | 9.93 MiB/s 
Receiving objects:  18% (1968739/10460179), 2.25 GiB | 10.15 MiB/s
Receiving objects:  18% (1970232/10460179), 2.26 GiB | 9.99 MiB/s 
Receiving objects:  18% (1972242/10460179), 2.27 GiB | 10.18 MiB/s
Receiving objects:  18% (1974175/10460179), 2.28 GiB | 10.01 MiB/s
Receiving objects:  18% (1976074/10460179), 2.29 GiB | 10.08 MiB/s
Receiving objects:  18% (1977298/10460179), 2.29 GiB | 8.82 MiB/s 
Receiving objects:  18% (1978703/10460179), 2.30 GiB | 7.25 MiB/s
Receiving objects:  18% (1980181/10460179), 2.30 GiB | 5.68 MiB/s
Receiving objects:  18% (1985779/10460179), 2.31 GiB | 5.58 MiB/s
Receiving objects:  19% (1987435/10460179), 2.31 GiB | 5.70 MiB/s
Receiving objects:  19% (1991409/10460179), 2.32 GiB | 5.98 MiB/s
Receiving objects:  19% (1995520/10460179), 2.33 GiB | 7.63 MiB/s
Receiving objects:  19% (2000494/10460179), 2.34 GiB | 9.33 MiB/s
Receiving objects:  19% (2006174/10460179), 2.35 GiB | 10.41 MiB/s
Receiving objects:  19% (2010729/10460179), 2.36 GiB | 10.13 MiB/s
Receiving objects:  19% (2015555/10460179), 2.37 GiB | 10.20 MiB/s
Receiving objects:  19% (2020270/10460179), 2.38 GiB | 10.11 MiB/s
Receiving objects:  19% (2024921/10460179), 2.39 GiB | 10.18 MiB/s
Receiving objects:  19% (2028428/10460179), 2.40 GiB | 10.03 MiB/s
Receiving objects:  19% (2031331/10460179), 2.41 GiB | 10.29 MiB/s
Receiving objects:  19% (2033693/10460179), 2.42 GiB | 9.79 MiB/s 
Receiving objects:  19% (2034862/10460179), 2.42 GiB | 8.08 MiB/s
Receiving objects:  19% (2035892/10460179), 2.42 GiB | 6.43 MiB/s
Receiving objects:  19% (2037696/10460179), 2.42 GiB | 5.71 MiB/s
Receiving objects:  19% (2041137/10460179), 2.43 GiB | 5.04 MiB/s
Receiving objects:  19% (2044193/10460179), 2.44 GiB | 5.45 MiB/s
Receiving objects:  19% (2046304/10460179), 2.45 GiB | 7.16 MiB/s
Receiving objects:  19% (2050677/10460179), 2.46 GiB | 8.90 MiB/s
Receiving objects:  19% (2056412/10460179), 2.47 GiB | 10.20 MiB/s
Receiving objects:  19% (2062963/10460179), 2.48 GiB | 10.26 MiB/s
Receiving objects:  19% (2067902/10460179), 2.49 GiB | 10.11 MiB/s
Receiving objects:  19% (2075016/10460179), 2.50 GiB | 10.31 MiB/s
Receiving objects:  19% (2081296/10460179), 2.51 GiB | 10.07 MiB/s
Receiving objects:  19% (2087357/10460179), 2.52 GiB | 10.32 MiB/s
Receiving objects:  20% (2092036/10460179), 2.53 GiB | 10.08 MiB/s
Receiving objects:  20% (2094628/10460179), 2.53 GiB | 10.08 MiB/s
Receiving objects:  20% (2101971/10460179), 2.54 GiB | 10.19 MiB/s
Receiving objects:  20% (2104803/10460179), 2.55 GiB | 8.81 MiB/s 
Receiving objects:  20% (2106884/10460179), 2.55 GiB | 7.11 MiB/s
Receiving objects:  20% (2108100/10460179), 2.55 GiB | 5.24 MiB/s
Receiving objects:  20% (2109568/10460179), 2.55 GiB | 3.40 MiB/s
Receiving objects:  20% (2110525/10460179), 2.55 GiB | 1.98 MiB/s
Receiving objects:  20% (2112959/10460179), 2.56 GiB | 2.23 MiB/s
Receiving objects:  20% (2119067/10460179), 2.57 GiB | 3.33 MiB/s
Receiving objects:  20% (2125800/10460179), 2.58 GiB | 5.11 MiB/s
Receiving objects:  20% (2132287/10460179), 2.59 GiB | 7.27 MiB/s
Receiving objects:  20% (2138779/10460179), 2.60 GiB | 9.06 MiB/s
Receiving objects:  20% (2146373/10460179), 2.61 GiB | 10.07 MiB/s
Receiving objects:  20% (2155470/10460179), 2.62 GiB | 10.34 MiB/s
Receiving objects:  20% (2164248/10460179), 2.63 GiB | 10.45 MiB/s
Receiving objects:  20% (2170216/10460179), 2.64 GiB | 10.20 MiB/s
Receiving objects:  20% (2175896/10460179), 2.65 GiB | 10.02 MiB/s
Receiving objects:  20% (2178470/10460179), 2.65 GiB | 8.35 MiB/s 
Receiving objects:  20% (2179769/10460179), 2.65 GiB | 6.55 MiB/s
Receiving objects:  20% (2182439/10460179), 2.65 GiB | 5.69 MiB/s
Receiving objects:  20% (2195581/10460179), 2.66 GiB | 5.39 MiB/s
Receiving objects:  21% (2196638/10460179), 2.67 GiB | 5.44 MiB/s
Receiving objects:  21% (2203222/10460179), 2.67 GiB | 5.44 MiB/s
Receiving objects:  21% (2210679/10460179), 2.68 GiB | 7.17 MiB/s
Receiving objects:  21% (2218567/10460179), 2.69 GiB | 8.94 MiB/s
Receiving objects:  21% (2228975/10460179), 2.70 GiB | 10.46 MiB/s
Receiving objects:  21% (2235286/10460179), 2.71 GiB | 10.39 MiB/s
Receiving objects:  21% (2241697/10460179), 2.72 GiB | 10.53 MiB/s
Receiving objects:  21% (2249961/10460179), 2.73 GiB | 10.36 MiB/s
Receiving objects:  21% (2265365/10460179), 2.74 GiB | 10.44 MiB/s
Receiving objects:  21% (2275097/10460179), 2.75 GiB | 10.29 MiB/s
Receiving objects:  21% (2286512/10460179), 2.76 GiB | 10.19 MiB/s
Receiving objects:  21% (2293694/10460179), 2.77 GiB | 9.80 MiB/s 
Receiving objects:  21% (2296249/10460179), 2.78 GiB | 8.50 MiB/s
Receiving objects:  21% (2298701/10460179), 2.78 GiB | 6.83 MiB/s
Receiving objects:  21% (2300479/10460179), 2.78 GiB | 5.41 MiB/s
Receiving objects:  22% (2301240/10460179), 2.78 GiB | 5.41 MiB/s
Receiving objects:  22% (2307914/10460179), 2.79 GiB | 5.11 MiB/s
Receiving objects:  22% (2315480/10460179), 2.80 GiB | 5.71 MiB/s
Receiving objects:  22% (2321993/10460179), 2.81 GiB | 7.30 MiB/s
Receiving objects:  22% (2328353/10460179), 2.82 GiB | 8.99 MiB/s
Receiving objects:  22% (2332342/10460179), 2.83 GiB | 10.01 MiB/s
Receiving objects:  22% (2343698/10460179), 2.84 GiB | 9.90 MiB/s 
Receiving objects:  22% (2354695/10460179), 2.85 GiB | 9.99 MiB/s
Receiving objects:  22% (2365150/10460179), 2.86 GiB | 10.14 MiB/s
Receiving objects:  22% (2374991/10460179), 2.87 GiB | 10.10 MiB/s
Receiving objects:  22% (2383642/10460179), 2.88 GiB | 10.40 MiB/s
Receiving objects:  22% (2392430/10460179), 2.89 GiB | 10.03 MiB/s
Receiving objects:  22% (2403762/10460179), 2.90 GiB | 9.56 MiB/s 
Receiving objects:  23% (2405842/10460179), 2.90 GiB | 9.56 MiB/s
Receiving objects:  23% (2414493/10460179), 2.90 GiB | 9.25 MiB/s
Receiving objects:  23% (2418754/10460179), 2.91 GiB | 7.57 MiB/s
Receiving objects:  23% (2420778/10460179), 2.91 GiB | 5.93 MiB/s
Receiving objects:  23% (2425177/10460179), 2.91 GiB | 5.01 MiB/s
Receiving objects:  23% (2435684/10460179), 2.92 GiB | 5.18 MiB/s
Receiving objects:  23% (2445230/10460179), 2.93 GiB | 5.52 MiB/s
Receiving objects:  23% (2454679/10460179), 2.94 GiB | 7.09 MiB/s
Receiving objects:  23% (2465143/10460179), 2.95 GiB | 8.90 MiB/s
Receiving objects:  23% (2470888/10460179), 2.96 GiB | 10.49 MiB/s
Receiving objects:  23% (2479353/10460179), 2.97 GiB | 10.43 MiB/s
Receiving objects:  23% (2485399/10460179), 2.98 GiB | 10.27 MiB/s
Receiving objects:  23% (2497549/10460179), 2.99 GiB | 10.30 MiB/s
Receiving objects:  24% (2510443/10460179), 3.00 GiB | 10.25 MiB/s
Receiving objects:  24% (2511388/10460179), 3.00 GiB | 10.25 MiB/s
Receiving objects:  24% (2526222/10460179), 3.01 GiB | 10.41 MiB/s
Receiving objects:  24% (2536117/10460179), 3.02 GiB | 10.41 MiB/s
Receiving objects:  24% (2547581/10460179), 3.03 GiB | 10.53 MiB/s
Receiving objects:  24% (2557112/10460179), 3.04 GiB | 10.56 MiB/s
Receiving objects:  24% (2559361/10460179), 3.05 GiB | 9.39 MiB/s 
Receiving objects:  24% (2563027/10460179), 3.05 GiB | 7.65 MiB/s
Receiving objects:  24% (2567371/10460179), 3.05 GiB | 6.07 MiB/s
Receiving objects:  24% (2578199/10460179), 3.06 GiB | 5.78 MiB/s
Receiving objects:  24% (2586732/10460179), 3.07 GiB | 5.88 MiB/s
Receiving objects:  24% (2595955/10460179), 3.08 GiB | 7.53 MiB/s
Receiving objects:  24% (2604469/10460179), 3.09 GiB | 9.24 MiB/s
Receiving objects:  24% (2612981/10460179), 3.10 GiB | 10.16 MiB/s
Receiving objects:  25% (2615045/10460179), 3.10 GiB | 10.16 MiB/s
Receiving objects:  25% (2624480/10460179), 3.11 GiB | 10.26 MiB/s
Receiving objects:  25% (2634804/10460179), 3.12 GiB | 10.20 MiB/s
Receiving objects:  25% (2641825/10460179), 3.13 GiB | 10.33 MiB/s
Receiving objects:  25% (2647670/10460179), 3.14 GiB | 10.14 MiB/s
Receiving objects:  25% (2653600/10460179), 3.15 GiB | 10.41 MiB/s
Receiving objects:  25% (2663257/10460179), 3.16 GiB | 10.18 MiB/s
Receiving objects:  25% (2676713/10460179), 3.17 GiB | 10.24 MiB/s
Receiving objects:  25% (2688432/10460179), 3.18 GiB | 10.24 MiB/s
Receiving objects:  25% (2692164/10460179), 3.19 GiB | 8.77 MiB/s 
Receiving objects:  25% (2697139/10460179), 3.19 GiB | 7.14 MiB/s
Receiving objects:  25% (2701798/10460179), 3.19 GiB | 5.60 MiB/s
Receiving objects:  25% (2714215/10460179), 3.20 GiB | 5.61 MiB/s
Receiving objects:  26% (2719647/10460179), 3.20 GiB | 5.59 MiB/s
Receiving objects:  26% (2726564/10460179), 3.21 GiB | 5.55 MiB/s
Receiving objects:  26% (2744026/10460179), 3.22 GiB | 7.09 MiB/s
Receiving objects:  26% (2752456/10460179), 3.23 GiB | 8.80 MiB/s
Receiving objects:  26% (2761499/10460179), 3.24 GiB | 10.54 MiB/s
Receiving objects:  26% (2773655/10460179), 3.25 GiB | 10.51 MiB/s
Receiving objects:  26% (2787663/10460179), 3.26 GiB | 10.46 MiB/s
Receiving objects:  26% (2799513/10460179), 3.27 GiB | 10.55 MiB/s
Receiving objects:  26% (2807359/10460179), 3.28 GiB | 10.42 MiB/s
Receiving objects:  26% (2817455/10460179), 3.29 GiB | 10.44 MiB/s
Receiving objects:  27% (2824249/10460179), 3.30 GiB | 10.27 MiB/s
Receiving objects:  27% (2826741/10460179), 3.30 GiB | 10.27 MiB/s
Receiving objects:  27% (2836208/10460179), 3.31 GiB | 10.22 MiB/s
Receiving objects:  27% (2840973/10460179), 3.32 GiB | 9.89 MiB/s 
Receiving objects:  27% (2844164/10460179), 3.32 GiB | 8.52 MiB/s
Receiving objects:  27% (2845467/10460179), 3.33 GiB | 6.72 MiB/s
Receiving objects:  27% (2847134/10460179), 3.33 GiB | 5.26 MiB/s
Receiving objects:  27% (2856499/10460179), 3.34 GiB | 4.97 MiB/s
Receiving objects:  27% (2873728/10460179), 3.35 GiB | 5.80 MiB/s
Receiving objects:  27% (2891026/10460179), 3.36 GiB | 7.34 MiB/s
Receiving objects:  27% (2923600/10460179), 3.37 GiB | 9.15 MiB/s
Receiving objects:  28% (2928851/10460179), 3.37 GiB | 9.99 MiB/s
Receiving objects:  28% (2934821/10460179), 3.38 GiB | 10.02 MiB/s
Receiving objects:  28% (2936065/10460179), 3.38 GiB | 7.87 MiB/s 
Receiving objects:  28% (2938863/10460179), 3.38 GiB | 6.11 MiB/s
Receiving objects:  28% (2952298/10460179), 3.39 GiB | 4.84 MiB/s
Receiving objects:  28% (2957098/10460179), 3.39 GiB | 3.84 MiB/s
Receiving objects:  28% (2975618/10460179), 3.39 GiB | 3.29 MiB/s
Receiving objects:  28% (2994028/10460179), 3.40 GiB | 5.16 MiB/s
Receiving objects:  28% (3008049/10460179), 3.41 GiB | 7.16 MiB/s
Receiving objects:  28% (3016888/10460179), 3.42 GiB | 8.08 MiB/s
Receiving objects:  28% (3022741/10460179), 3.43 GiB | 7.81 MiB/s
Receiving objects:  28% (3027991/10460179), 3.43 GiB | 6.68 MiB/s
Receiving objects:  29% (3033452/10460179), 3.43 GiB | 5.94 MiB/s
Receiving objects:  29% (3044238/10460179), 3.44 GiB | 5.81 MiB/s
Receiving objects:  29% (3060466/10460179), 3.44 GiB | 5.65 MiB/s
Receiving objects:  29% (3079383/10460179), 3.46 GiB | 7.07 MiB/s
Receiving objects:  29% (3099876/10460179), 3.46 GiB | 8.53 MiB/s
Receiving objects:  29% (3117428/10460179), 3.48 GiB | 10.17 MiB/s
Receiving objects:  29% (3136182/10460179), 3.49 GiB | 10.38 MiB/s
Receiving objects:  30% (3138054/10460179), 3.49 GiB | 10.38 MiB/s
Receiving objects:  30% (3156738/10460179), 3.50 GiB | 10.38 MiB/s
Receiving objects:  30% (3175275/10460179), 3.51 GiB | 10.29 MiB/s
Receiving objects:  30% (3200164/10460179), 3.52 GiB | 10.38 MiB/s
Receiving objects:  30% (3218652/10460179), 3.53 GiB | 10.26 MiB/s
Receiving objects:  30% (3225717/10460179), 3.54 GiB | 10.13 MiB/s
Receiving objects:  30% (3231674/10460179), 3.55 GiB | 10.32 MiB/s
Receiving objects:  30% (3237201/10460179), 3.55 GiB | 9.75 MiB/s 
Receiving objects:  30% (3239423/10460179), 3.56 GiB | 8.01 MiB/s
Receiving objects:  30% (3241507/10460179), 3.56 GiB | 6.23 MiB/s
Receiving objects:  31% (3242656/10460179), 3.56 GiB | 5.45 MiB/s
Receiving objects:  31% (3245906/10460179), 3.56 GiB | 4.97 MiB/s
Receiving objects:  31% (3257775/10460179), 3.57 GiB | 5.03 MiB/s
Receiving objects:  31% (3270860/10460179), 3.58 GiB | 6.20 MiB/s
Receiving objects:  31% (3289139/10460179), 3.59 GiB | 7.85 MiB/s
Receiving objects:  31% (3298156/10460179), 3.60 GiB | 9.61 MiB/s
Receiving objects:  31% (3326450/10460179), 3.61 GiB | 10.17 MiB/s
Receiving objects:  31% (3344983/10460179), 3.62 GiB | 10.05 MiB/s
Receiving objects:  32% (3347258/10460179), 3.62 GiB | 10.05 MiB/s
Receiving objects:  32% (3358321/10460179), 3.63 GiB | 10.25 MiB/s
Receiving objects:  32% (3375244/10460179), 3.64 GiB | 10.23 MiB/s
Receiving objects:  32% (3393764/10460179), 3.65 GiB | 10.39 MiB/s
Receiving objects:  32% (3410337/10460179), 3.66 GiB | 10.26 MiB/s
Receiving objects:  32% (3428653/10460179), 3.67 GiB | 10.50 MiB/s
Receiving objects:  32% (3441401/10460179), 3.68 GiB | 10.07 MiB/s
Receiving objects:  32% (3447510/10460179), 3.69 GiB | 8.51 MiB/s 
Receiving objects:  33% (3451860/10460179), 3.69 GiB | 6.70 MiB/s
Receiving objects:  33% (3452883/10460179), 3.69 GiB | 6.70 MiB/s
Receiving objects:  33% (3458075/10460179), 3.69 GiB | 5.04 MiB/s
Receiving objects:  33% (3476075/10460179), 3.70 GiB | 5.02 MiB/s
Receiving objects:  33% (3489901/10460179), 3.71 GiB | 5.43 MiB/s
Receiving objects:  33% (3501936/10460179), 3.72 GiB | 6.98 MiB/s
Receiving objects:  33% (3518011/10460179), 3.73 GiB | 8.86 MiB/s
Receiving objects:  33% (3533276/10460179), 3.74 GiB | 10.49 MiB/s
Receiving objects:  34% (3556461/10460179), 3.75 GiB | 10.54 MiB/s
Receiving objects:  34% (3563457/10460179), 3.75 GiB | 10.54 MiB/s
Receiving objects:  34% (3585237/10460179), 3.76 GiB | 10.35 MiB/s
Receiving objects:  34% (3595974/10460179), 3.77 GiB | 10.47 MiB/s
Receiving objects:  34% (3605115/10460179), 3.78 GiB | 10.31 MiB/s
Receiving objects:  34% (3614062/10460179), 3.79 GiB | 10.48 MiB/s
Receiving objects:  34% (3625242/10460179), 3.80 GiB | 10.43 MiB/s
Receiving objects:  34% (3637395/10460179), 3.81 GiB | 10.43 MiB/s
Receiving objects:  34% (3647995/10460179), 3.82 GiB | 10.28 MiB/s
Receiving objects:  34% (3653599/10460179), 3.82 GiB | 8.85 MiB/s 
Receiving objects:  34% (3659093/10460179), 3.83 GiB | 7.17 MiB/s
Receiving objects:  35% (3661063/10460179), 3.83 GiB | 6.35 MiB/s
Receiving objects:  35% (3664092/10460179), 3.83 GiB | 5.53 MiB/s
Receiving objects:  35% (3675324/10460179), 3.84 GiB | 5.45 MiB/s
Receiving objects:  35% (3685588/10460179), 3.85 GiB | 5.96 MiB/s
Receiving objects:  35% (3696316/10460179), 3.86 GiB | 7.50 MiB/s
Receiving objects:  35% (3706556/10460179), 3.87 GiB | 9.18 MiB/s
Receiving objects:  35% (3721024/10460179), 3.88 GiB | 10.27 MiB/s
Receiving objects:  35% (3733885/10460179), 3.89 GiB | 10.14 MiB/s
Receiving objects:  35% (3753296/10460179), 3.90 GiB | 10.42 MiB/s
Receiving objects:  36% (3765665/10460179), 3.90 GiB | 10.38 MiB/s
Receiving objects:  36% (3783302/10460179), 3.91 GiB | 10.24 MiB/s
Receiving objects:  36% (3796167/10460179), 3.92 GiB | 10.42 MiB/s
Receiving objects:  36% (3807219/10460179), 3.93 GiB | 10.19 MiB/s
Receiving objects:  36% (3817264/10460179), 3.94 GiB | 10.32 MiB/s
Receiving objects:  36% (3830807/10460179), 3.95 GiB | 10.12 MiB/s
Receiving objects:  36% (3853892/10460179), 3.96 GiB | 9.64 MiB/s 
Receiving objects:  36% (3858063/10460179), 3.96 GiB | 7.87 MiB/s
Receiving objects:  36% (3863995/10460179), 3.96 GiB | 6.32 MiB/s
Receiving objects:  37% (3870267/10460179), 3.96 GiB | 5.42 MiB/s
Receiving objects:  37% (3874412/10460179), 3.96 GiB | 5.42 MiB/s
Receiving objects:  37% (3887008/10460179), 3.97 GiB | 5.71 MiB/s
Receiving objects:  37% (3906247/10460179), 3.98 GiB | 6.17 MiB/s
Receiving objects:  37% (3926778/10460179), 3.99 GiB | 7.70 MiB/s
Receiving objects:  37% (3942855/10460179), 4.00 GiB | 9.42 MiB/s
Receiving objects:  37% (3961969/10460179), 4.01 GiB | 10.24 MiB/s
Receiving objects:  38% (3974869/10460179), 4.02 GiB | 10.05 MiB/s
Receiving objects:  38% (3976929/10460179), 4.02 GiB | 10.05 MiB/s
Receiving objects:  38% (3996698/10460179), 4.03 GiB | 10.47 MiB/s
Receiving objects:  38% (4015652/10460179), 4.04 GiB | 10.33 MiB/s
Receiving objects:  38% (4037663/10460179), 4.05 GiB | 10.39 MiB/s
Receiving objects:  38% (4054723/10460179), 4.06 GiB | 10.16 MiB/s
Receiving objects:  38% (4071540/10460179), 4.07 GiB | 10.22 MiB/s
Receiving objects:  39% (4079470/10460179), 4.08 GiB | 9.97 MiB/s 
Receiving objects:  39% (4085704/10460179), 4.08 GiB | 9.97 MiB/s
Receiving objects:  39% (4092158/10460179), 4.09 GiB | 8.21 MiB/s
Receiving objects:  39% (4094938/10460179), 4.09 GiB | 7.47 MiB/s
Receiving objects:  39% (4099311/10460179), 4.10 GiB | 5.80 MiB/s
Receiving objects:  39% (4117923/10460179), 4.10 GiB | 5.46 MiB/s
Receiving objects:  39% (4133547/10460179), 4.11 GiB | 5.67 MiB/s
Receiving objects:  39% (4159362/10460179), 4.12 GiB | 7.04 MiB/s
Receiving objects:  40% (4184072/10460179), 4.13 GiB | 8.67 MiB/s
Receiving objects:  40% (4185492/10460179), 4.13 GiB | 8.67 MiB/s
Receiving objects:  40% (4204479/10460179), 4.14 GiB | 10.11 MiB/s
Receiving objects:  40% (4218016/10460179), 4.15 GiB | 9.95 MiB/s 
Receiving objects:  40% (4239026/10460179), 4.16 GiB | 10.28 MiB/s
Receiving objects:  40% (4257249/10460179), 4.17 GiB | 10.15 MiB/s
Receiving objects:  40% (4276024/10460179), 4.18 GiB | 10.38 MiB/s
Receiving objects:  41% (4288674/10460179), 4.19 GiB | 10.33 MiB/s
Receiving objects:  41% (4292395/10460179), 4.19 GiB | 10.33 MiB/s
Receiving objects:  41% (4309632/10460179), 4.20 GiB | 10.42 MiB/s
Receiving objects:  41% (4329342/10460179), 4.21 GiB | 10.40 MiB/s
Receiving objects:  41% (4345116/10460179), 4.22 GiB | 10.40 MiB/s
Receiving objects:  41% (4352636/10460179), 4.23 GiB | 9.32 MiB/s 
Receiving objects:  41% (4357521/10460179), 4.23 GiB | 7.63 MiB/s
Receiving objects:  41% (4361928/10460179), 4.24 GiB | 5.95 MiB/s
Receiving objects:  41% (4392107/10460179), 4.25 GiB | 5.71 MiB/s
Receiving objects:  42% (4393276/10460179), 4.25 GiB | 5.71 MiB/s
Receiving objects:  42% (4411070/10460179), 4.25 GiB | 5.83 MiB/s
Receiving objects:  42% (4429766/10460179), 4.26 GiB | 7.42 MiB/s
Receiving objects:  42% (4449792/10460179), 4.27 GiB | 8.97 MiB/s
Receiving objects:  42% (4476740/10460179), 4.28 GiB | 10.15 MiB/s
Receiving objects:  43% (4497877/10460179), 4.29 GiB | 10.06 MiB/s
Receiving objects:  43% (4507679/10460179), 4.29 GiB | 10.25 MiB/s
Receiving objects:  43% (4533928/10460179), 4.30 GiB | 10.02 MiB/s
Receiving objects:  43% (4555314/10460179), 4.31 GiB | 10.29 MiB/s
Receiving objects:  43% (4578802/10460179), 4.32 GiB | 10.16 MiB/s
Receiving objects:  44% (4602479/10460179), 4.33 GiB | 10.20 MiB/s
Receiving objects:  44% (4610461/10460179), 4.33 GiB | 10.33 MiB/s
Receiving objects:  44% (4626315/10460179), 4.34 GiB | 10.22 MiB/s
Receiving objects:  44% (4656005/10460179), 4.35 GiB | 10.17 MiB/s
Receiving objects:  45% (4707081/10460179), 4.36 GiB | 9.76 MiB/s 
Receiving objects:  45% (4710012/10460179), 4.36 GiB | 9.76 MiB/s
Receiving objects:  45% (4730566/10460179), 4.37 GiB | 8.01 MiB/s
Receiving objects:  45% (4747926/10460179), 4.37 GiB | 6.35 MiB/s
Receiving objects:  45% (4768559/10460179), 4.37 GiB | 5.61 MiB/s
Receiving objects:  46% (4811683/10460179), 4.37 GiB | 5.03 MiB/s
Receiving objects:  46% (4853145/10460179), 4.38 GiB | 5.18 MiB/s
Receiving objects:  47% (4916285/10460179), 4.39 GiB | 5.63 MiB/s
Receiving objects:  47% (4933638/10460179), 4.39 GiB | 5.63 MiB/s
Receiving objects:  47% (5010416/10460179), 4.40 GiB | 7.26 MiB/s
Receiving objects:  48% (5020886/10460179), 4.40 GiB | 7.26 MiB/s
Receiving objects:  48% (5100631/10460179), 4.41 GiB | 9.08 MiB/s
Receiving objects:  49% (5125488/10460179), 4.41 GiB | 9.93 MiB/s
Receiving objects:  49% (5194162/10460179), 4.42 GiB | 10.46 MiB/s
Receiving objects:  50% (5230090/10460179), 4.42 GiB | 10.57 MiB/s
Receiving objects:  50% (5278688/10460179), 4.43 GiB | 10.54 MiB/s
Receiving objects:  51% (5334692/10460179), 4.43 GiB | 10.42 MiB/s
Receiving objects:  51% (5373687/10460179), 4.44 GiB | 10.47 MiB/s
Receiving objects:  52% (5439294/10460179), 4.45 GiB | 10.39 MiB/s
Receiving objects:  52% (5440744/10460179), 4.45 GiB | 10.39 MiB/s
Receiving objects:  52% (5529361/10460179), 4.46 GiB | 10.30 MiB/s
Receiving objects:  53% (5543895/10460179), 4.46 GiB | 10.36 MiB/s
Receiving objects:  53% (5579978/10460179), 4.47 GiB | 10.29 MiB/s
Receiving objects:  53% (5614152/10460179), 4.48 GiB | 10.38 MiB/s
Receiving objects:  53% (5639733/10460179), 4.49 GiB | 9.96 MiB/s 
Receiving objects:  54% (5648497/10460179), 4.49 GiB | 8.50 MiB/s
Receiving objects:  54% (5650067/10460179), 4.49 GiB | 8.50 MiB/s
Receiving objects:  54% (5657232/10460179), 4.49 GiB | 6.73 MiB/s
Receiving objects:  54% (5672211/10460179), 4.50 GiB | 4.98 MiB/s
Receiving objects:  54% (5709954/10460179), 4.51 GiB | 5.09 MiB/s
Receiving objects:  55% (5753099/10460179), 4.51 GiB | 5.31 MiB/s
Receiving objects:  55% (5761146/10460179), 4.52 GiB | 5.97 MiB/s
Receiving objects:  55% (5801069/10460179), 4.53 GiB | 7.61 MiB/s
Receiving objects:  55% (5845274/10460179), 4.54 GiB | 9.49 MiB/s
Receiving objects:  56% (5857701/10460179), 4.54 GiB | 9.49 MiB/s
Receiving objects:  56% (5892079/10460179), 4.55 GiB | 10.24 MiB/s
Receiving objects:  56% (5939652/10460179), 4.56 GiB | 10.32 MiB/s
Receiving objects:  57% (5962303/10460179), 4.56 GiB | 10.19 MiB/s
Receiving objects:  57% (5985391/10460179), 4.57 GiB | 10.34 MiB/s
Receiving objects:  57% (6037915/10460179), 4.58 GiB | 10.36 MiB/s
Receiving objects:  58% (6066904/10460179), 4.58 GiB | 10.26 MiB/s
Receiving objects:  58% (6112807/10460179), 4.59 GiB | 10.35 MiB/s
Receiving objects:  59% (6171506/10460179), 4.59 GiB | 10.43 MiB/s
Receiving objects:  59% (6206598/10460179), 4.60 GiB | 10.27 MiB/s
Receiving objects:  60% (6276108/10460179), 4.60 GiB | 10.28 MiB/s
Receiving objects:  60% (6319287/10460179), 4.61 GiB | 10.33 MiB/s
Receiving objects:  61% (6380710/10460179), 4.61 GiB | 10.29 MiB/s
Receiving objects:  61% (6402661/10460179), 4.62 GiB | 9.94 MiB/s 
Receiving objects:  61% (6426181/10460179), 4.62 GiB | 8.41 MiB/s
Receiving objects:  61% (6447821/10460179), 4.62 GiB | 6.61 MiB/s
Receiving objects:  61% (6468421/10460179), 4.63 GiB | 5.03 MiB/s
Receiving objects:  62% (6485311/10460179), 4.63 GiB | 5.03 MiB/s
Receiving objects:  62% (6536791/10460179), 4.63 GiB | 5.11 MiB/s
Receiving objects:  63% (6589913/10460179), 4.64 GiB | 5.38 MiB/s
Receiving objects:  63% (6622689/10460179), 4.64 GiB | 5.38 MiB/s
Receiving objects:  64% (6694515/10460179), 4.65 GiB | 7.03 MiB/s
Receiving objects:  64% (6700818/10460179), 4.65 GiB | 7.03 MiB/s
Receiving objects:  64% (6774333/10460179), 4.66 GiB | 8.69 MiB/s
Receiving objects:  65% (6799117/10460179), 4.67 GiB | 9.58 MiB/s
Receiving objects:  65% (6834966/10460179), 4.67 GiB | 10.44 MiB/s
Receiving objects:  66% (6903719/10460179), 4.68 GiB | 10.50 MiB/s
Receiving objects:  66% (6913213/10460179), 4.68 GiB | 10.50 MiB/s
Receiving objects:  66% (6983811/10460179), 4.69 GiB | 10.34 MiB/s
Receiving objects:  67% (7008320/10460179), 4.70 GiB | 10.34 MiB/s
Receiving objects:  67% (7059807/10460179), 4.70 GiB | 10.35 MiB/s
Receiving objects:  68% (7112922/10460179), 4.71 GiB | 10.14 MiB/s
Receiving objects:  68% (7146290/10460179), 4.71 GiB | 10.14 MiB/s
Receiving objects:  69% (7217524/10460179), 4.72 GiB | 10.28 MiB/s
Receiving objects:  69% (7233897/10460179), 4.72 GiB | 10.28 MiB/s
Receiving objects:  70% (7322126/10460179), 4.73 GiB | 10.21 MiB/s
Receiving objects:  70% (7333133/10460179), 4.73 GiB | 10.21 MiB/s
Receiving objects:  70% (7425592/10460179), 4.74 GiB | 10.25 MiB/s
Receiving objects:  71% (7426728/10460179), 4.74 GiB | 10.25 MiB/s
Receiving objects:  71% (7456245/10460179), 4.75 GiB | 9.29 MiB/s 
Receiving objects:  71% (7485780/10460179), 4.75 GiB | 7.64 MiB/s
Receiving objects:  71% (7516399/10460179), 4.75 GiB | 5.98 MiB/s
Receiving objects:  72% (7531329/10460179), 4.75 GiB | 5.98 MiB/s
Receiving objects:  72% (7609823/10460179), 4.76 GiB | 5.75 MiB/s
Receiving objects:  73% (7635931/10460179), 4.77 GiB | 5.73 MiB/s
Receiving objects:  73% (7720475/10460179), 4.77 GiB | 5.97 MiB/s
Receiving objects:  74% (7740533/10460179), 4.77 GiB | 5.97 MiB/s
Receiving objects:  74% (7800719/10460179), 4.78 GiB | 7.69 MiB/s
Receiving objects:  75% (7845135/10460179), 4.79 GiB | 8.36 MiB/s
Receiving objects:  75% (7869697/10460179), 4.79 GiB | 9.18 MiB/s
Receiving objects:  76% (7949737/10460179), 4.80 GiB | 10.28 MiB/s
Receiving objects:  76% (7952198/10460179), 4.80 GiB | 10.28 MiB/s
Receiving objects:  76% (8028047/10460179), 4.81 GiB | 10.24 MiB/s
Receiving objects:  77% (8054338/10460179), 4.82 GiB | 10.30 MiB/s
Receiving objects:  77% (8105990/10460179), 4.82 GiB | 10.29 MiB/s
Receiving objects:  78% (8158940/10460179), 4.83 GiB | 10.17 MiB/s
Receiving objects:  78% (8187190/10460179), 4.83 GiB | 10.25 MiB/s
Receiving objects:  79% (8263542/10460179), 4.84 GiB | 10.30 MiB/s
Receiving objects:  79% (8280775/10460179), 4.84 GiB | 10.30 MiB/s
Receiving objects:  80% (8368144/10460179), 4.85 GiB | 10.08 MiB/s
Receiving objects:  80% (8388862/10460179), 4.85 GiB | 10.08 MiB/s
Receiving objects:  81% (8472745/10460179), 4.86 GiB | 10.22 MiB/s
Receiving objects:  81% (8480165/10460179), 4.86 GiB | 10.22 MiB/s
Receiving objects:  81% (8547925/10460179), 4.87 GiB | 9.65 MiB/s 
Receiving objects:  81% (8572284/10460179), 4.88 GiB | 8.21 MiB/s
Receiving objects:  82% (8577347/10460179), 4.88 GiB | 8.21 MiB/s
Receiving objects:  82% (8596209/10460179), 4.88 GiB | 6.45 MiB/s
Receiving objects:  82% (8618421/10460179), 4.88 GiB | 4.70 MiB/s
Receiving objects:  82% (8677875/10460179), 4.89 GiB | 4.04 MiB/s
Receiving objects:  83% (8681949/10460179), 4.89 GiB | 4.04 MiB/s
Receiving objects:  83% (8776667/10460179), 4.90 GiB | 4.76 MiB/s
Receiving objects:  84% (8786551/10460179), 4.90 GiB | 4.76 MiB/s
Receiving objects:  84% (8872836/10460179), 4.90 GiB | 6.16 MiB/s
Receiving objects:  85% (8891153/10460179), 4.90 GiB | 6.16 MiB/s
Receiving objects:  85% (8976282/10460179), 4.91 GiB | 7.83 MiB/s
Receiving objects:  86% (8995754/10460179), 4.91 GiB | 7.83 MiB/s
Receiving objects:  86% (9086897/10460179), 4.92 GiB | 8.84 MiB/s
Receiving objects:  87% (9100356/10460179), 4.92 GiB | 8.84 MiB/s
Receiving objects:  87% (9177228/10460179), 4.93 GiB | 8.79 MiB/s
Receiving objects:  88% (9204958/10460179), 4.93 GiB | 8.79 MiB/s
Receiving objects:  88% (9257502/10460179), 4.94 GiB | 8.08 MiB/s
Receiving objects:  89% (9309560/10460179), 4.94 GiB | 7.89 MiB/s
Receiving objects:  89% (9337135/10460179), 4.94 GiB | 7.71 MiB/s
Receiving objects:  90% (9414162/10460179), 4.95 GiB | 7.56 MiB/s
Receiving objects:  90% (9425861/10460179), 4.95 GiB | 7.13 MiB/s
Receiving objects:  90% (9517980/10460179), 4.96 GiB | 7.23 MiB/s
Receiving objects:  91% (9518763/10460179), 4.96 GiB | 7.23 MiB/s
Receiving objects:  91% (9606753/10460179), 4.97 GiB | 7.29 MiB/s
Receiving objects:  92% (9623365/10460179), 4.97 GiB | 7.29 MiB/s
Receiving objects:  92% (9705669/10460179), 4.98 GiB | 8.14 MiB/s
Receiving objects:  93% (9727967/10460179), 4.98 GiB | 8.14 MiB/s
Receiving objects:  93% (9778820/10460179), 4.98 GiB | 7.85 MiB/s
Receiving objects:  93% (9796945/10460179), 4.98 GiB | 6.68 MiB/s
Receiving objects:  93% (9816210/10460179), 4.98 GiB | 5.97 MiB/s
Receiving objects:  94% (9832569/10460179), 4.99 GiB | 4.48 MiB/s
Receiving objects:  94% (9843609/10460179), 4.99 GiB | 4.48 MiB/s
Receiving objects:  94% (9912011/10460179), 4.99 GiB | 3.80 MiB/s
Receiving objects:  95% (9937171/10460179), 5.00 GiB | 3.82 MiB/s
Receiving objects:  95% (9999353/10460179), 5.00 GiB | 4.27 MiB/s
Receiving objects:  96% (10041772/10460179), 5.01 GiB | 5.22 MiB/s
Receiving objects:  96% (10088961/10460179), 5.01 GiB | 6.03 MiB/s
Receiving objects:  97% (10146374/10460179), 5.01 GiB | 6.71 MiB/s
Receiving objects:  97% (10194852/10460179), 5.02 GiB | 7.60 MiB/s
Receiving objects:  98% (10250976/10460179), 5.02 GiB | 8.66 MiB/s
Receiving objects:  98% (10278697/10460179), 5.03 GiB | 9.16 MiB/s
Receiving objects:  98% (10355206/10460179), 5.04 GiB | 9.07 MiB/s
Receiving objects:  99% (10355578/10460179), 5.04 GiB | 9.07 MiB/s
Receiving objects:  99% (10421641/10460179), 5.04 GiB | 8.66 MiB/s
remote: Total 10460179 (delta 94), reused 70 (delta 59), pack-reused 10460014 (from 1)        
+Receiving objects: 100% (10460179/10460179), 5.05 GiB | 8.08 MiB/s
Receiving objects: 100% (10460179/10460179), 5.05 GiB | 8.72 MiB/s, done.
+Resolving deltas:   0% (0/8517403)
Resolving deltas:   1% (85175/8517403)
Resolving deltas:   1% (88539/8517403)
Resolving deltas:   2% (170349/8517403)
Resolving deltas:   2% (177339/8517403)
Resolving deltas:   2% (255171/8517403)
Resolving deltas:   3% (255524/8517403)
Resolving deltas:   3% (314653/8517403)
Resolving deltas:   4% (340697/8517403)
Resolving deltas:   4% (352384/8517403)
Resolving deltas:   4% (406598/8517403)
Resolving deltas:   5% (425871/8517403)
Resolving deltas:   5% (454579/8517403)
Resolving deltas:   5% (495124/8517403)
Resolving deltas:   6% (511045/8517403)
Resolving deltas:   6% (560659/8517403)
Resolving deltas:   7% (596219/8517403)
Resolving deltas:   7% (616708/8517403)
Resolving deltas:   8% (681393/8517403)
Resolving deltas:   8% (687228/8517403)
Resolving deltas:   8% (735302/8517403)
Resolving deltas:   9% (766569/8517403)
Resolving deltas:   9% (776498/8517403)
Resolving deltas:   9% (813985/8517403)
Resolving deltas:  10% (851742/8517403)
Resolving deltas:  10% (870312/8517403)
Resolving deltas:  10% (880215/8517403)
Resolving deltas:  11% (936916/8517403)
Resolving deltas:  11% (942837/8517403)
Resolving deltas:  11% (1002185/8517403)
Resolving deltas:  12% (1022089/8517403)
Resolving deltas:  12% (1035751/8517403)
Resolving deltas:  12% (1081234/8517403)
Resolving deltas:  13% (1107263/8517403)
Resolving deltas:  13% (1120557/8517403)
Resolving deltas:  13% (1162463/8517403)
Resolving deltas:  14% (1192438/8517403)
Resolving deltas:  14% (1199718/8517403)
Resolving deltas:  14% (1238239/8517403)
Resolving deltas:  15% (1277611/8517403)
Resolving deltas:  15% (1286302/8517403)
Resolving deltas:  15% (1324060/8517403)
Resolving deltas:  16% (1362785/8517403)
Resolving deltas:  16% (1379627/8517403)
Resolving deltas:  16% (1434272/8517403)
Resolving deltas:  17% (1447959/8517403)
Resolving deltas:  17% (1488479/8517403)
Resolving deltas:  18% (1533133/8517403)
Resolving deltas:  18% (1538054/8517403)
Resolving deltas:  18% (1589357/8517403)
Resolving deltas:  19% (1618307/8517403)
Resolving deltas:  19% (1661724/8517403)
Resolving deltas:  20% (1703481/8517403)
Resolving deltas:  20% (1737366/8517403)
Resolving deltas:  21% (1788655/8517403)
Resolving deltas:  21% (1793961/8517403)
Resolving deltas:  21% (1846998/8517403)
Resolving deltas:  22% (1873829/8517403)
Resolving deltas:  22% (1894978/8517403)
Resolving deltas:  22% (1950036/8517403)
Resolving deltas:  23% (1959003/8517403)
Resolving deltas:  23% (1994151/8517403)
Resolving deltas:  24% (2044177/8517403)
Resolving deltas:  24% (2056029/8517403)
Resolving deltas:  24% (2103631/8517403)
Resolving deltas:  25% (2129351/8517403)
Resolving deltas:  25% (2157484/8517403)
Resolving deltas:  26% (2214525/8517403)
Resolving deltas:  26% (2234104/8517403)
Resolving deltas:  26% (2291147/8517403)
Resolving deltas:  27% (2299700/8517403)
Resolving deltas:  27% (2350701/8517403)
Resolving deltas:  28% (2384874/8517403)
Resolving deltas:  28% (2411008/8517403)
Resolving deltas:  28% (2465168/8517403)
Resolving deltas:  29% (2470047/8517403)
Resolving deltas:  29% (2540474/8517403)
Resolving deltas:  30% (2555221/8517403)
Resolving deltas:  30% (2606763/8517403)
Resolving deltas:  31% (2640395/8517403)
Resolving deltas:  31% (2693978/8517403)
Resolving deltas:  32% (2725569/8517403)
Resolving deltas:  33% (2810743/8517403)
Resolving deltas:  33% (2819664/8517403)
Resolving deltas:  34% (2895918/8517403)
Resolving deltas:  34% (2897026/8517403)
Resolving deltas:  35% (2981093/8517403)
Resolving deltas:  35% (2985867/8517403)
Resolving deltas:  35% (3058202/8517403)
Resolving deltas:  36% (3066266/8517403)
Resolving deltas:  36% (3136072/8517403)
Resolving deltas:  37% (3151440/8517403)
Resolving deltas:  37% (3226722/8517403)
Resolving deltas:  38% (3236616/8517403)
Resolving deltas:  38% (3320596/8517403)
Resolving deltas:  39% (3321789/8517403)
Resolving deltas:  40% (3406962/8517403)
Resolving deltas:  40% (3435380/8517403)
Resolving deltas:  41% (3492138/8517403)
Resolving deltas:  41% (3538104/8517403)
Resolving deltas:  42% (3577310/8517403)
Resolving deltas:  43% (3662484/8517403)
Resolving deltas:  43% (3669560/8517403)
Resolving deltas:  44% (3747658/8517403)
Resolving deltas:  44% (3763638/8517403)
Resolving deltas:  45% (3832832/8517403)
Resolving deltas:  45% (3865233/8517403)
Resolving deltas:  46% (3918006/8517403)
Resolving deltas:  46% (3974485/8517403)
Resolving deltas:  47% (4003180/8517403)
Resolving deltas:  47% (4071580/8517403)
Resolving deltas:  48% (4088354/8517403)
Resolving deltas:  48% (4153787/8517403)
Resolving deltas:  49% (4173528/8517403)
Resolving deltas:  50% (4258702/8517403)
Resolving deltas:  50% (4286890/8517403)
Resolving deltas:  51% (4343876/8517403)
Resolving deltas:  51% (4402059/8517403)
Resolving deltas:  52% (4429050/8517403)
Resolving deltas:  52% (4494444/8517403)
Resolving deltas:  53% (4514224/8517403)
Resolving deltas:  54% (4599398/8517403)
Resolving deltas:  54% (4627630/8517403)
Resolving deltas:  55% (4684572/8517403)
Resolving deltas:  56% (4769746/8517403)
Resolving deltas:  56% (4792540/8517403)
Resolving deltas:  57% (4854920/8517403)
Resolving deltas:  57% (4897292/8517403)
Resolving deltas:  58% (4940094/8517403)
Resolving deltas:  58% (5024796/8517403)
Resolving deltas:  59% (5025268/8517403)
Resolving deltas:  60% (5110442/8517403)
Resolving deltas:  60% (5135094/8517403)
Resolving deltas:  61% (5195616/8517403)
Resolving deltas:  61% (5212327/8517403)
Resolving deltas:  62% (5280790/8517403)
Resolving deltas:  62% (5298792/8517403)
Resolving deltas:  63% (5365966/8517403)
Resolving deltas:  63% (5392881/8517403)
Resolving deltas:  64% (5451138/8517403)
Resolving deltas:  64% (5509290/8517403)
Resolving deltas:  65% (5536312/8517403)
Resolving deltas:  66% (5621486/8517403)
Resolving deltas:  66% (5638116/8517403)
Resolving deltas:  67% (5706661/8517403)
Resolving deltas:  67% (5778558/8517403)
Resolving deltas:  68% (5791835/8517403)
Resolving deltas:  69% (5877009/8517403)
Resolving deltas:  69% (5899695/8517403)
Resolving deltas:  70% (5962183/8517403)
Resolving deltas:  70% (6042798/8517403)
Resolving deltas:  71% (6047357/8517403)
Resolving deltas:  72% (6132531/8517403)
Resolving deltas:  73% (6217705/8517403)
Resolving deltas:  73% (6222294/8517403)
Resolving deltas:  74% (6302880/8517403)
Resolving deltas:  74% (6384917/8517403)
Resolving deltas:  75% (6388053/8517403)
Resolving deltas:  76% (6473227/8517403)
Resolving deltas:  76% (6513224/8517403)
Resolving deltas:  77% (6558401/8517403)
Resolving deltas:  78% (6643575/8517403)
Resolving deltas:  78% (6718357/8517403)
Resolving deltas:  79% (6728749/8517403)
Resolving deltas:  80% (6813923/8517403)
Resolving deltas:  81% (6899097/8517403)
Resolving deltas:  81% (6915140/8517403)
Resolving deltas:  82% (6984271/8517403)
Resolving deltas:  83% (7069445/8517403)
Resolving deltas:  83% (7118670/8517403)
Resolving deltas:  84% (7154619/8517403)
Resolving deltas:  85% (7239793/8517403)
Resolving deltas:  85% (7324246/8517403)
Resolving deltas:  86% (7324967/8517403)
Resolving deltas:  87% (7410141/8517403)
Resolving deltas:  88% (7495315/8517403)
Resolving deltas:  88% (7507845/8517403)
Resolving deltas:  89% (7580489/8517403)
Resolving deltas:  90% (7665663/8517403)
Resolving deltas:  90% (7714977/8517403)
Resolving deltas:  91% (7750837/8517403)
Resolving deltas:  92% (7836011/8517403)
Resolving deltas:  92% (7893871/8517403)
Resolving deltas:  93% (7921185/8517403)
Resolving deltas:  94% (8006359/8517403)
Resolving deltas:  95% (8091533/8517403)
Resolving deltas:  95% (8120051/8517403)
Resolving deltas:  96% (8176707/8517403)
Resolving deltas:  97% (8261881/8517403)
Resolving deltas:  98% (8347055/8517403)
Resolving deltas:  98% (8375852/8517403)
Resolving deltas:  99% (8432229/8517403)
Resolving deltas: 100% (8517403/8517403)
Resolving deltas: 100% (8517403/8517403), done.
+Updating files:   7% (6283/86676)
Updating files:   8% (6935/86676)
Updating files:   9% (7801/86676)
Updating files:  10% (8668/86676)
Updating files:  11% (9535/86676)
Updating files:  12% (10402/86676)
Updating files:  13% (11268/86676)
Updating files:  14% (12135/86676)
Updating files:  14% (12538/86676)
Updating files:  15% (13002/86676)
Updating files:  16% (13869/86676)
Updating files:  17% (14735/86676)
Updating files:  18% (15602/86676)
Updating files:  19% (16469/86676)
Updating files:  20% (17336/86676)
Updating files:  21% (18202/86676)
Updating files:  21% (18928/86676)
Updating files:  22% (19069/86676)
Updating files:  23% (19936/86676)
Updating files:  24% (20803/86676)
Updating files:  25% (21669/86676)
Updating files:  26% (22536/86676)
Updating files:  27% (23403/86676)
Updating files:  28% (24270/86676)
Updating files:  29% (25137/86676)
Updating files:  29% (25477/86676)
Updating files:  30% (26003/86676)
Updating files:  31% (26870/86676)
Updating files:  32% (27737/86676)
Updating files:  33% (28604/86676)
Updating files:  34% (29470/86676)
Updating files:  35% (30337/86676)
Updating files:  36% (31204/86676)
Updating files:  36% (31276/86676)
Updating files:  37% (32071/86676)
Updating files:  38% (32937/86676)
Updating files:  39% (33804/86676)
Updating files:  40% (34671/86676)
Updating files:  40% (34742/86676)
Updating files:  41% (35538/86676)
Updating files:  42% (36404/86676)
Updating files:  43% (37271/86676)
Updating files:  43% (37475/86676)
Updating files:  44% (38138/86676)
Updating files:  45% (39005/86676)
Updating files:  46% (39871/86676)
Updating files:  47% (40738/86676)
Updating files:  48% (41605/86676)
Updating files:  49% (42472/86676)
Updating files:  49% (42803/86676)
Updating files:  50% (43338/86676)
Updating files:  51% (44205/86676)
Updating files:  52% (45072/86676)
Updating files:  53% (45939/86676)
Updating files:  54% (46806/86676)
Updating files:  54% (47545/86676)
Updating files:  55% (47672/86676)
Updating files:  56% (48539/86676)
Updating files:  57% (49406/86676)
Updating files:  58% (50273/86676)
Updating files:  58% (51131/86676)
Updating files:  59% (51139/86676)
Updating files:  60% (52006/86676)
Updating files:  61% (52873/86676)
Updating files:  62% (53740/86676)
Updating files:  63% (54606/86676)
Updating files:  63% (54879/86676)
Updating files:  64% (55473/86676)
Updating files:  65% (56340/86676)
Updating files:  66% (57207/86676)
Updating files:  67% (58073/86676)
Updating files:  68% (58940/86676)
Updating files:  69% (59807/86676)
Updating files:  69% (60014/86676)
Updating files:  70% (60674/86676)
Updating files:  71% (61540/86676)
Updating files:  72% (62407/86676)
Updating files:  73% (63274/86676)
Updating files:  74% (64141/86676)
Updating files:  75% (65007/86676)
Updating files:  75% (65607/86676)
Updating files:  76% (65874/86676)
Updating files:  77% (66741/86676)
Updating files:  78% (67608/86676)
Updating files:  79% (68475/86676)
Updating files:  80% (69341/86676)
Updating files:  81% (70208/86676)
Updating files:  82% (71075/86676)
Updating files:  83% (71942/86676)
Updating files:  83% (71982/86676)
Updating files:  84% (72808/86676)
Updating files:  85% (73675/86676)
Updating files:  86% (74542/86676)
Updating files:  87% (75409/86676)
Updating files:  88% (76275/86676)
Updating files:  89% (77142/86676)
Updating files:  89% (77769/86676)
Updating files:  90% (78009/86676)
Updating files:  91% (78876/86676)
Updating files:  92% (79742/86676)
Updating files:  93% (80609/86676)
Updating files:  94% (81476/86676)
Updating files:  95% (82343/86676)
Updating files:  96% (83209/86676)
Updating files:  96% (83609/86676)
Updating files:  97% (84076/86676)
Updating files:  98% (84943/86676)
Updating files:  99% (85810/86676)
Updating files: 100% (86676/86676)
Updating files: 100% (86676/86676), done.
diff --git a/app/test/fixtures/merge-parser/desktop/failed-merge-master-into-stale-branch-really.txt b/app/test/fixtures/merge-parser/desktop/failed-merge-master-into-stale-branch-really.txt
deleted file mode 100644
index 24827c3c4f4..00000000000
--- a/app/test/fixtures/merge-parser/desktop/failed-merge-master-into-stale-branch-really.txt
+++ /dev/null
@@ -1,27968 +0,0 @@
-added in remote
-  their  100644 796fcffcd129e9594b5d578f18893807a5dfd4e8 .babelrc
-@@ -0,0 +1,3 @@
-+{
-+  "plugins": ["syntax-dynamic-import"]
-+}
-merged
-  result 100644 1ec8067f831c1ed1de768f65d3f2df91c43b29ae .eslintrc.yml
-  our    100644 f724d1b1129c863e41f4e78d2b1a200c0aea07e7 .eslintrc.yml
-@@ -66,6 +66,9 @@
-   eqeqeq:
-     - error
-     - smart
-+  strict:
-+    - error
-+    - global
-
-   ###########
-   # SPECIAL #
-@@ -79,7 +82,15 @@
-     - selector: ExportDefaultDeclaration
-       message: Use of default exports is forbidden
-
-+overrides:
-+  - files: '*.d.ts'
-+    rules:
-+      strict:
-+        - error
-+        - never
-+
- parserOptions:
-   sourceType: module
-   ecmaFeatures:
-     jsx: true
-+
-merged
-  result 100644 59072918c96565e2427754f755ca662d7b067423 .github/CONTRIBUTING.md
-  our    100644 9d5b8dd9584adfcadfca0e70c747b3519a315309 .github/CONTRIBUTING.md
-@@ -72,15 +72,15 @@
-
- Bugs are tracked as [GitHub issues](https://guides.github.com/features/issues/).
-
--Simply create an issue on the [GitHub Desktop issue tracker](https://github.com/desktop/desktop/issues)
--and fill out the provided [issue template](ISSUE_TEMPLATE.md).
-+Simply create an issue on the [GitHub Desktop issue tracker](https://github.com/desktop/desktop/issues/new?template=bug_report.md)
-+and fill out the provided issue template.
-
- The information we are interested in includes:
-
-  - details about your environment - which build, which operating system
-  - details about reproducing the issue - what steps to take, what happens, how
-    often it happens
-- - other relevant information - log files, screenshots, etc.
-+ - other relevant information - log files, screenshots, etc
-
- ### Suggesting Enhancements
-
-@@ -107,20 +107,21 @@
-
- Enhancement suggestions are tracked as [GitHub issues](https://guides.github.com/features/issues/).
-
--Simply create an issue on the [GitHub Desktop issue tracker](https://github.com/desktop/desktop/issues)
--and provide the following information:
-+Simply create an issue on the [GitHub Desktop issue tracker](https://github.com/desktop/desktop/issues/new?template=feature_request.md)
-+and fill out the provided issue template.
-
--* **Use a clear and descriptive title** for the issue to identify the
--  suggestion.
--* **Provide a step-by-step description of the suggested enhancement** in as
--  much detail as possible. This additional context helps the maintainers to
--  understand the enhancement from your perspective
--* **Explain why this enhancement would be useful** to GitHub Desktop users.
-+Some additional advice:
-+
-+* **Use a clear and descriptive title** for the feature request
-+* **Provide a step-by-step description of the suggested enhancement**
-+  This additional context helps the maintainers understand the enhancement from
-+  your perspective
-+* **Explain why this enhancement would be useful** to GitHub Desktop users
- * **Include screenshots and animated GIFs** if relevant to help you demonstrate
-   the steps or point out the part of GitHub Desktop which the suggestion is
-   related to. You can use [this tool](http://www.cockos.com/licecap/) to record
--  GIFs on macOS and Windows.
--* **List some other applications where this enhancement exists, if applicable.**
-+  GIFs on macOS and Windows
-+* **List some other applications where this enhancement exists, if applicable**
-
- ### Help Wanted
-
-@@ -148,27 +149,30 @@
-
- | Label name | :mag_right: | Description |
- | --- | --- | --- |
--| `enhancement` | [search](https://github.com/desktop/desktop/labels/enhancement) | Feature requests. |
--| `bug` | [search](https://github.com/desktop/desktop/labels/bug)  | Confirmed bugs or reports that are very likely to be bugs. |
--| `more-information-needed` | [search](https://github.com/desktop/desktop/labels/more-information-needed) | More information needs to be collected about these problems or feature requests (e.g. steps to reproduce). |
--| `reviewer-needs-to-reproduce` | [search](https://github.com/desktop/desktop/labels/reviewer-needs-to-reproduce)  | Likely bugs, but haven't been reliably reproduced by a reviewer. |
--| `stale` | [search](https://github.com/desktop/desktop/labels/stale) | Issues that are inactive and marked to be closed. |
--| `macOS` | [search](https://github.com/desktop/desktop/labels/macOS)  | Issues specific to macOS users. |
--| `Windows` | [search](https://github.com/desktop/desktop/labels/Windows)  | Issues specific to Windows users. |
--| `codemirror` | [search](https://github.com/desktop/desktop/labels/codemirror)  | Issues related to our use of [CodeMirror](https://codemirror.net/) that may require upstream fixes. |
--| `electron` | [search](https://github.com/desktop/desktop/labels/electron) | Issues related to our use of [Electron](https://electron.atom.io) that may require upstream fixes. |
-+| `enhancement` | [search](https://github.com/desktop/desktop/labels/enhancement) | Feature requests |
-+| `bug` | [search](https://github.com/desktop/desktop/labels/bug)  | Confirmed bugs or reports that are very likely to be bugs |
-+| `more-information-needed` | [search](https://github.com/desktop/desktop/labels/more-information-needed) | More information needs to be collected about these problems or feature requests (e.g. steps to reproduce) |
-+| `reviewer-needs-to-reproduce` | [search](https://github.com/desktop/desktop/labels/reviewer-needs-to-reproduce)  | Potential bugs that still need to be reliably reproduced by a reviewer |
-+| `stale` | [search](https://github.com/desktop/desktop/labels/stale) | Issues that are inactive and marked to be closed |
-+| `macOS` | [search](https://github.com/desktop/desktop/labels/macOS)  | Issues specific to macOS users |
-+| `Windows` | [search](https://github.com/desktop/desktop/labels/Windows)  | Issues specific to Windows users |
-+| `codemirror` | [search](https://github.com/desktop/desktop/labels/codemirror)  | Issues related to our use of [CodeMirror](https://codemirror.net/) that may require upstream fixes |
-+| `electron` | [search](https://github.com/desktop/desktop/labels/electron) | Issues related to our use of [Electron](https://electron.atom.io) that may require upstream fixes |
-+| `themes` | [search](https://github.com/desktop/desktop/labels/themes) | Issues related the light or dark themes that ship in Desktop |
-+| `user-research` | [search](https://github.com/desktop/desktop/labels/user-research) | Issues that might benefit from user interviews, validations, and/or usability testing |
-+| `integrations` | [search](https://github.com/desktop/desktop/labels/integrations) | Issues related to editor and shell integrations that ship in Desktop |
-
- #### Topics
-
- | Label name | :mag_right: | Description |
- | --- | --- | --- |
--| `help wanted` | [search](https://github.com/desktop/desktop/labels/help%20wanted)  | Issues marked as ideal for external contributors. |
--| `tech-debt` | [search](https://github.com/desktop/desktop/labels/tech-debt) | Issues related to code or architecture decisions. |
--| `needs-design-input` | [search](https://github.com/desktop/desktop/labels/needs-design-input)  | Issues that require design input from the core team before the work can be started. |
-+| `help wanted` | [search](https://github.com/desktop/desktop/labels/help%20wanted)  | Issues marked as ideal for external contributors |
-+| `tech-debt` | [search](https://github.com/desktop/desktop/labels/tech-debt) | Issues related to code or architecture decisions |
-+| `needs-design-input` | [search](https://github.com/desktop/desktop/labels/needs-design-input)  | Issues that require design input from the core team before the work can be started |
-
- #### Workflow
-
- | Label name | :mag_right: | Description |
- | --- | --- | --- |
--| `infrastructure` | [search](https://github.com/desktop/desktop/labels/infrastructure) | Pull requests not related to the core application - documentation, dependencies, tooling, etc. |
--| `ready-for-review` | [search](https://github.com/desktop/desktop/labels/ready-for-review)  | Pull Requests that are ready to be reviewed by the maintainers. |
-+| `infrastructure` | [search](https://github.com/desktop/desktop/labels/infrastructure) | Pull requests not related to the core application - documentation, dependencies, tooling, etc |
-+| `ready-for-review` | [search](https://github.com/desktop/desktop/labels/ready-for-review)  | Pull Requests that are ready to be reviewed by the maintainers |
-added in remote
-  their  100644 56219510678c2797ba48167a1e1d912ccf843eac .github/ISSUE_TEMPLATE/bug_report.md
-@@ -0,0 +1,71 @@
-+---
-+name: 🐛 Bug report
-+about: Report a problem encountered while using GitHub Desktop
-+
-+---
-+
-+<!--
-+First and foremost, we’d like to thank you for taking the time to contribute to our project. Before submitting your issue, please follow these steps:
-+
-+1. Familiarize yourself with our contributing guide:
-+	* https://github.com/desktop/desktop/blob/master/.github/CONTRIBUTING.md#contributing-to-github-desktop
-+2. Check if your issue (and sometimes workaround) is in the known-issues doc:
-+	* https://github.com/desktop/desktop/blob/master/docs/known-issues.md
-+3. Make sure your issue isn’t a duplicate of another issue
-+4. If you have made it to this step, go ahead and fill out the template below
-+-->
-+
-+## Description
-+<!--
-+Provide a detailed description of the behavior you're seeing or the behavior you'd like to see **below** this comment.
-+-->
-+
-+
-+## Version
-+<!--
-+Place the version of GitHub Desktop you have installed **below** this comment. This is displayed under the 'About GitHub Desktop' menu item. If you are running from source, include the commit by running `git rev-parse HEAD` from the local repository.
-+-->
-+* GitHub Desktop:
-+<!--
-+Place the version of your operating system **below** this comment. The operating system you are running on may also help with reproducing the issue. If you are on macOS, launch 'About This Mac' and write down the OS version listed. If you are on Windows, open 'Command Prompt' and attach the output of this command: 'cmd /c ver'
-+-->
-+* Operating system:
-+
-+
-+## Steps to Reproduce
-+<!--
-+List the steps to reproduce your issue **below** this comment
-+ex,
-+1. `step 1`
-+2. `step 2`
-+3. `and so on…`
-+-->
-+
-+### Expected Behavior
-+<!-- What you expected to happen -->
-+
-+### Actual Behavior
-+<!-- What actually happens -->
-+
-+
-+## Additional Information
-+<!--
-+Place any additional information, configuration, or data that might be necessary to reproduce the issue **below** this comment.
-+
-+If you have screen shots or gifs that demonstrate the issue, please include them.
-+
-+If the issue involves a specific public repository, including the information about it will make it easier to recreate the issue.
-+
-+If you are dealing with a performance issue or regression, attaching a Timeline profile of the task will help the developers understand the runtime behavior of the application on your machine.
-+https://github.com/desktop/desktop/blob/master/docs/contributing/timeline-profile.md
-+-->
-+
-+### Logs
-+<!--
-+Attach your log file (You can simply drag your file here to insert it) to this issue. Please make sure the generated link to your log file is **below** this comment section otherwise it will not appear when you submit your issue.
-+
-+macOS logs location: `~/Library/Application Support/GitHub Desktop/logs/*.desktop.production.log`
-+Windows logs location: `%APPDATA%\GitHub Desktop\logs\*.desktop.production.log`
-+
-+The log files are organized by date, so see if anything was generated for today's date.
-+-->
-added in remote
-  their  100644 7c297531a2dd774e2b066ddc50384a12f5e8e034 .github/ISSUE_TEMPLATE/feature_request.md
-@@ -0,0 +1,17 @@
-+---
-+name: 🎉 Feature request
-+about: Suggest an idea to improve GitHub Desktop
-+---
-+
-+**Is your feature request related to a problem? Please describe.**
-+A clear and concise description of what the problem is. Ex. I have an issue when [...]
-+
-+**Describe the solution you'd like**
-+A clear and concise description of what you want to happen. Add any considered drawbacks.
-+
-+**Describe alternatives you've considered**
-+A clear and concise description of any alternative solutions or features you've considered.
-+
-+**Teachability, Documentation, Adoption, Migration Strategy**
-+If you can, explain how users will be able to use this. This will help the core team understand how the feature would work, and assist with future work like documentation.
-+Screenshots or mockups here are a great help!
-\ No newline at end of file
-removed in remote
-  base   100644 65c8c0a5f5c37299d369ce4811128ae829368d2d .github/ISSUE_TEMPLATE.md
-  our    100644 65c8c0a5f5c37299d369ce4811128ae829368d2d .github/ISSUE_TEMPLATE.md
-@@ -1,65 +0,0 @@
--<!--
--First and foremost, we’d like to thank you for taking the time to contribute to our project. Before submitting your issue, please follow these steps:
--
--1. Familiarize yourself with our contributing guide:
--	* https://github.com/desktop/desktop/blob/master/CONTRIBUTING.md#contributing-to-github-desktop
--2. Check if your issue (and sometimes workaround) is in the known-issues doc:
--	* https://github.com/desktop/desktop/blob/master/docs/known-issues.md
--3. Make sure your issue isn’t a duplicate of another issue
--4. If you have made it to this step, go ahead and fill out the template below
---->
--
--## Description
--<!--
--Provide a detailed description of the behavior you're seeing or the behavior you'd like to see **below** this comment.
---->
--
--
--## Version
--<!--
--Place the version of GitHub Desktop you have installed **below** this comment. This is displayed under the 'About GitHub Desktop' menu item. If you are running from source, include the commit by running `git rev-parse HEAD` from the local repository.
---->
--* GitHub Desktop:
--<!--
--Place the version of your operating system **below** this comment. The operating system you are running on may also help with reproducing the issue. If you are on macOS, launch 'About This Mac' and write down the OS version listed. If you are on Windows, open 'Command Prompt' and attach the output of this command: 'cmd /c ver'
---->
--* Operating system:
--
--
--## Steps to Reproduce
--<!--
--List the steps to reproduce your issue **below** this comment
--ex,
--1. `step 1`
--2. `step 2`
--3. `and so on…`
---->
--
--### Expected Behavior
--<!-- What you expected to happen -->
--
--### Actual Behavior
--<!-- What actually happens -->
--
--
--## Additional Information
--<!--
--Place any additional information, configuration, or data that might be necessary to reproduce the issue **below** this comment.
--
--If you have screen shots or gifs that demonstrate the issue, please include them.
--
--If the issue involves a specific public repository, including the information about it will make it easier to recreate the issue.
--
--If you are dealing with a performance issue or regression, attaching a Timeline profile of the task will help the developers understand the runtime behavior of the application on your machine.
--https://github.com/desktop/desktop/blob/master/docs/contributing/timeline-profile.md
---->
--
--### Logs
--<!--
--Attach your log file (You can simply drag your file here to insert it) to this issue. Please make sure the generated link to your log file is **below** this comment section otherwise it will not appear when you submit your issue.
--
--macOS logs location: `~/Library/Application Support/GitHub Desktop/logs/*.desktop.production.log`
--Windows logs location: `%APPDATA%\GitHub Desktop\logs\*.desktop.production.log`
--
--The log files are organized by date, so see if anything was generated for today's date.
---->
-merged
-  result 100644 63a2cc1a341c354faf7c4979d2fffb86d5e93501 .gitignore
-  our    100644 de84018cf2395164cee116bb3a01759e6cf3c41a .gitignore
-@@ -9,3 +9,4 @@
- .idea/
- .vs/
- .eslintcache
-+*.iml
-merged
-  result 100644 dba04c1e1786b2c5f953ebf2c24c6fcc615c2d9a .node-version
-  our    100644 32c861f970d80180ef7668a04d5e3ce61bbd706e .node-version
-@@ -1 +1 @@
--8.9.2
-+8.11.3
-merged
-  result 100644 ab983e8df0a9388373270ef9d669c8806ec4ccf9 .prettierrc.yml
-  our    100644 a99d2fbed4d8d42c708293ed1a1d310b3ff27c5a .prettierrc.yml
-@@ -2,3 +2,8 @@
- trailingComma: es5
- semi: false
- proseWrap: always
-+
-+overrides:
-+- files: "*.scss"
-+  options:
-+    printWidth: 200
-\ No newline at end of file
-merged
-  result 100644 fde223649b6eef6edf60d8726f22ddd799873819 .travis.yml
-  our    100644 15b264ab77bd3f42b71b4f5f9072b455a964ca95 .travis.yml
-@@ -38,7 +38,7 @@
-
- language: node_js
- node_js:
--  - "8.9.0"
-+  - "8.11.0"
-
- cache:
-   yarn: true
-@@ -50,7 +50,7 @@
-     - $HOME/.cache/electron-builder
-
- before_install:
--  - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.3.2
-+  - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.5.1
-   - export PATH=$HOME/.yarn/bin:$PATH
-
- install:
-merged
-  result 100644 2de5029d6613dc9f507cd891b707d66e78b68851 README.md
-  our    100644 574e4d56ae5ca7982571359a903164b85027cf81 README.md
-@@ -3,6 +3,7 @@
- [![Travis](https://img.shields.io/travis/desktop/desktop.svg?style=flat-square&label=Travis+CI)](https://travis-ci.org/desktop/desktop)
- [![CircleCI](https://img.shields.io/circleci/project/github/desktop/desktop.svg?style=flat-square&label=CircleCI)](https://circleci.com/gh/desktop/desktop)
- [![AppVeyor Build Status](https://img.shields.io/appveyor/ci/github-windows/desktop/master.svg?style=flat-square&label=AppVeyor&logo=appveyor)](https://ci.appveyor.com/project/github-windows/desktop/branch/master)
-+[![VSTS Build Status](https://github.visualstudio.com/_apis/public/build/definitions/845028c2-21f3-4eb1-80b9-215d3e9b1d08/3/badge)](https://github.visualstudio.com/Desktop/_build/index?definitionId=3)
- [![license](https://img.shields.io/github/license/desktop/desktop.svg?style=flat-square)](https://github.com/desktop/desktop/blob/master/LICENSE)
- ![90+% TypeScript](https://img.shields.io/github/languages/top/desktop/desktop.svg?style=flat-square&colorB=green)
-
-@@ -51,8 +52,8 @@
- There is also a list of [known issues](https://github.com/desktop/desktop/blob/master/docs/known-issues.md)
- that are being tracked against Desktop, and some of these issues have workarounds.
-
--If you can't find an issue that matches what you're seeing, open a [new issue](https://github.com/desktop/desktop/issues/new)
--and fill out the template to provide us with enough information to investigate
-+If you can't find an issue that matches what you're seeing, open a [new issue](https://github.com/desktop/desktop/issues/new/choose),
-+choose the right template and provide us with enough information to investigate
- further.
-
- ## How can I contribute to GitHub Desktop?
-merged
-  result 100644 f7a365459e5cee710b2f3156119a6a2b2ff65a7d app/.npmrc
-  our    100644 3b80cccbdce21610474a65dcdc28c309d819e278 app/.npmrc
-@@ -1,4 +1,4 @@
- runtime = electron
- disturl = https://atom.io/download/electron
--target = 1.8.3
-+target = 1.8.7
- arch = x64
-removed in remote
-  base   100644 996444dc72a75f727b5f5e62cac72e4fe4a21302 app/app-info.d.ts
-  our    100644 996444dc72a75f727b5f5e62cac72e4fe4a21302 app/app-info.d.ts
-@@ -1,2 +0,0 @@
--export function getReplacements(): {}
--export function getCLICommands(): string[]
-removed in remote
-  base   100644 53ac0bb5d571c6f678ac4794df6004fed9c17cd7 app/app-info.js
-  our    100644 53ac0bb5d571c6f678ac4794df6004fed9c17cd7 app/app-info.js
-@@ -1,50 +0,0 @@
--'use strict'
--
--const fs = require('fs')
--const path = require('path')
--
--const gitInfo = require('./git-info')
--const distInfo = require('../script/dist-info')
--
--const projectRoot = path.join(__dirname, '..')
--
--const devClientId = '3a723b10ac5575cc5bb9'
--const devClientSecret = '22c34d87789a365981ed921352a7b9a8c3f69d54'
--
--const channel = distInfo.getReleaseChannel()
--
--function getCLICommands() {
--  return (
--    // eslint-disable-next-line no-sync
--    fs
--      .readdirSync(path.resolve(projectRoot, 'app', 'src', 'cli', 'commands'))
--      .filter(name => name.endsWith('.ts'))
--      .map(name => name.replace(/\.ts$/, ''))
--  )
--}
--
--function s(text) {
--  return JSON.stringify(text)
--}
--
--function getReplacements() {
--  return {
--    __OAUTH_CLIENT_ID__: s(process.env.DESKTOP_OAUTH_CLIENT_ID || devClientId),
--    __OAUTH_SECRET__: s(
--      process.env.DESKTOP_OAUTH_CLIENT_SECRET || devClientSecret
--    ),
--    __DARWIN__: process.platform === 'darwin',
--    __WIN32__: process.platform === 'win32',
--    __LINUX__: process.platform === 'linux',
--    __DEV__: channel === 'development',
--    __RELEASE_CHANNEL__: s(channel),
--    __UPDATES_URL__: s(distInfo.getUpdatesURL()),
--    __SHA__: s(gitInfo.getSHA()),
--    __CLI_COMMANDS__: s(getCLICommands()),
--    'process.platform': s(process.platform),
--    'process.env.NODE_ENV': s(process.env.NODE_ENV || 'development'),
--    'process.env.TEST_ENV': s(process.env.TEST_ENV),
--  }
--}
--
--module.exports = { getReplacements, getCLICommands }
-added in remote
-  their  100644 bb6679dfc6714a548b27c030dd653216c7e19833 app/app-info.ts
-@@ -0,0 +1,44 @@
-+import * as fs from 'fs'
-+import * as Path from 'path'
-+
-+import { getSHA } from './git-info'
-+import { getUpdatesURL, getReleaseChannel } from '../script/dist-info'
-+
-+const projectRoot = Path.dirname(__dirname)
-+
-+const devClientId = '3a723b10ac5575cc5bb9'
-+const devClientSecret = '22c34d87789a365981ed921352a7b9a8c3f69d54'
-+
-+const channel = getReleaseChannel()
-+
-+export function getCLICommands() {
-+  return (
-+    // eslint-disable-next-line no-sync
-+    fs
-+      .readdirSync(Path.resolve(projectRoot, 'app', 'src', 'cli', 'commands'))
-+      .filter(name => name.endsWith('.ts'))
-+      .map(name => name.replace(/\.ts$/, ''))
-+  )
-+}
-+
-+const s = JSON.stringify
-+
-+export function getReplacements() {
-+  return {
-+    __OAUTH_CLIENT_ID__: s(process.env.DESKTOP_OAUTH_CLIENT_ID || devClientId),
-+    __OAUTH_SECRET__: s(
-+      process.env.DESKTOP_OAUTH_CLIENT_SECRET || devClientSecret
-+    ),
-+    __DARWIN__: process.platform === 'darwin',
-+    __WIN32__: process.platform === 'win32',
-+    __LINUX__: process.platform === 'linux',
-+    __DEV__: channel === 'development',
-+    __RELEASE_CHANNEL__: s(channel),
-+    __UPDATES_URL__: s(getUpdatesURL()),
-+    __SHA__: s(getSHA()),
-+    __CLI_COMMANDS__: s(getCLICommands()),
-+    'process.platform': s(process.platform),
-+    'process.env.NODE_ENV': s(process.env.NODE_ENV || 'development'),
-+    'process.env.TEST_ENV': s(process.env.TEST_ENV),
-+  }
-+}
-removed in remote
-  base   100644 db784cfd0f0a6592eb885f2049f8afc835d6e910 app/git-info.d.ts
-  our    100644 db784cfd0f0a6592eb885f2049f8afc835d6e910 app/git-info.d.ts
-@@ -1 +0,0 @@
--export function getSHA(): string
-removed in remote
-  base   100644 4e9e8240c199c8ad4b02c7453d746c07e9e77502 app/git-info.js
-  our    100644 4e9e8240c199c8ad4b02c7453d746c07e9e77502 app/git-info.js
-@@ -1,93 +0,0 @@
--'use strict'
--
--const fs = require('fs')
--const path = require('path')
--
--/**
-- * Attempt to find a ref in the .git/packed-refs file, which is often
-- * created by Git as part of cleaning up loose refs in the repository.
-- *
-- * Will return null if the packed-refs file is missing.
-- * Will throw an error if the entry is not found in the packed-refs file
-- *
-- * @param {string} gitDir The path to the Git repository's .git directory
-- * @param {string} ref    A qualified git ref such as 'refs/heads/master'
-- */
--function readPackedRefsFile(gitDir, ref) {
--  const packedRefsPath = path.join(gitDir, 'packed-refs')
--
--  try {
--    // eslint-disable-next-line no-sync
--    fs.statSync(packedRefsPath)
--  } catch (err) {
--    // fail quietly if packed-refs not found
--    return null
--  }
--
--  // eslint-disable-next-line no-sync
--  const packedRefsContents = fs.readFileSync(packedRefsPath)
--
--  // we need to build up the regex on the fly using the ref
--  const refRe = new RegExp('([a-f0-9]{40}) ' + ref)
--  const packedRefMatch = refRe.exec(packedRefsContents)
--
--  if (!packedRefMatch) {
--    throw new Error(`Could not find ref entry in .git/packed-refs file: ${ref}`)
--  }
--  return packedRefMatch[1]
--}
--
--/**
-- * Attempt to dereference the given ref without requiring a Git environment
-- * to be present. Note that this method will not be able to dereference packed
-- * refs but should suffice for simple refs like 'HEAD'.
-- *
-- * Will throw an error for unborn HEAD.
-- *
-- * @param {string} gitDir The path to the Git repository's .git directory
-- * @param {string} ref    A qualified git ref such as 'HEAD' or 'refs/heads/master'
-- */
--function revParse(gitDir, ref) {
--  const refPath = path.join(gitDir, ref)
--
--  try {
--    // eslint-disable-next-line no-sync
--    fs.statSync(refPath)
--  } catch (err) {
--    const packedRefMatch = readPackedRefsFile(gitDir, ref)
--    if (packedRefMatch) {
--      return packedRefMatch
--    }
--
--    throw new Error(
--      `Could not de-reference HEAD to SHA, ref does not exist on disk: ${refPath}`
--    )
--  }
--  // eslint-disable-next-line no-sync
--  const refContents = fs.readFileSync(refPath)
--  const refRe = /^([a-f0-9]{40})|(?:ref: (refs\/.*))$/m
--  const refMatch = refRe.exec(refContents)
--
--  if (!refMatch) {
--    throw new Error(
--      `Could not de-reference HEAD to SHA, invalid ref in ${refPath}: ${refContents}`
--    )
--  }
--
--  return refMatch[1] || revParse(gitDir, refMatch[2])
--}
--
--function getSHA() {
--  // CircleCI does some funny stuff where HEAD points to an packed ref, but
--  // luckily it gives us the SHA we want in the environment.
--  const circleSHA = process.env.CIRCLE_SHA1
--  if (circleSHA) {
--    return circleSHA
--  }
--
--  return revParse(path.resolve(__dirname, '../.git'), 'HEAD')
--}
--
--module.exports = {
--  getSHA,
--}
-added in remote
-  their  100644 1bf399b381dab7c260c1dc4126025c7ab1a437af app/git-info.ts
-@@ -0,0 +1,88 @@
-+import * as Fs from 'fs'
-+import * as Path from 'path'
-+
-+/**
-+ * Attempt to find a ref in the .git/packed-refs file, which is often
-+ * created by Git as part of cleaning up loose refs in the repository.
-+ *
-+ * Will return null if the packed-refs file is missing.
-+ * Will throw an error if the entry is not found in the packed-refs file
-+ *
-+ * @param gitDir The path to the Git repository's .git directory
-+ * @param ref    A qualified git ref such as 'refs/heads/master'
-+ */
-+function readPackedRefsFile(gitDir: string, ref: string) {
-+  const packedRefsPath = Path.join(gitDir, 'packed-refs')
-+
-+  try {
-+    // eslint-disable-next-line no-sync
-+    Fs.statSync(packedRefsPath)
-+  } catch (err) {
-+    // fail quietly if packed-refs not found
-+    return null
-+  }
-+
-+  // eslint-disable-next-line no-sync
-+  const packedRefsContents = Fs.readFileSync(packedRefsPath, 'utf8')
-+
-+  // we need to build up the regex on the fly using the ref
-+  const refRe = new RegExp('([a-f0-9]{40}) ' + ref)
-+  const packedRefMatch = refRe.exec(packedRefsContents)
-+
-+  if (!packedRefMatch) {
-+    throw new Error(`Could not find ref entry in .git/packed-refs file: ${ref}`)
-+  }
-+  return packedRefMatch[1]
-+}
-+
-+/**
-+ * Attempt to dereference the given ref without requiring a Git environment
-+ * to be present. Note that this method will not be able to dereference packed
-+ * refs but should suffice for simple refs like 'HEAD'.
-+ *
-+ * Will throw an error for unborn HEAD.
-+ *
-+ * @param   gitDir The path to the Git repository's .git directory
-+ * @param   ref    A qualified git ref such as 'HEAD' or 'refs/heads/master'
-+ * @returns        The ref SHA
-+ */
-+function revParse(gitDir: string, ref: string): string {
-+  const refPath = Path.join(gitDir, ref)
-+
-+  try {
-+    // eslint-disable-next-line no-sync
-+    Fs.statSync(refPath)
-+  } catch (err) {
-+    const packedRefMatch = readPackedRefsFile(gitDir, ref)
-+    if (packedRefMatch) {
-+      return packedRefMatch
-+    }
-+
-+    throw new Error(
-+      `Could not de-reference HEAD to SHA, ref does not exist on disk: ${refPath}`
-+    )
-+  }
-+  // eslint-disable-next-line no-sync
-+  const refContents = Fs.readFileSync(refPath, 'utf8')
-+  const refRe = /^([a-f0-9]{40})|(?:ref: (refs\/.*))$/m
-+  const refMatch = refRe.exec(refContents)
-+
-+  if (!refMatch) {
-+    throw new Error(
-+      `Could not de-reference HEAD to SHA, invalid ref in ${refPath}: ${refContents}`
-+    )
-+  }
-+
-+  return refMatch[1] || revParse(gitDir, refMatch[2])
-+}
-+
-+export function getSHA() {
-+  // CircleCI does some funny stuff where HEAD points to an packed ref, but
-+  // luckily it gives us the SHA we want in the environment.
-+  const circleSHA = process.env.CIRCLE_SHA1
-+  if (circleSHA != null) {
-+    return circleSHA
-+  }
-+
-+  return revParse(Path.resolve(__dirname, '../.git'), 'HEAD')
-+}
-removed in remote
-  base   100644 5f169d7f8e0a82168c2c13ea3ba71b5b101f0c73 app/package-info.d.ts
-  our    100644 5f169d7f8e0a82168c2c13ea3ba71b5b101f0c73 app/package-info.d.ts
-@@ -1,4 +0,0 @@
--export function getProductName(): string
--export function getCompanyName(): string
--export function getVersion(): string
--export function getBundleID(): string
-removed in remote
-  base   100644 b63ebe090392d9f6829519ac340cbba3901300cb app/package-info.js
-  our    100644 b63ebe090392d9f6829519ac340cbba3901300cb app/package-info.js
-@@ -1,33 +0,0 @@
--'use strict'
--
--const path = require('path')
--
--const projectRoot = __dirname
--// eslint-disable-next-line import/no-dynamic-require
--const appPackage = require(path.join(projectRoot, 'package.json'))
--
--function getProductName() {
--  const productName = appPackage.productName
--  return process.env.NODE_ENV === 'development'
--    ? `${productName}-dev`
--    : productName
--}
--
--function getCompanyName() {
--  return appPackage.companyName
--}
--
--function getVersion() {
--  return appPackage.version
--}
--
--function getBundleID() {
--  return appPackage.bundleID
--}
--
--module.exports = {
--  getProductName,
--  getCompanyName,
--  getVersion,
--  getBundleID,
--}
-added in remote
-  their  100644 ec6e40fb46f6554d62823e5f27a8743de594acff app/package-info.ts
-@@ -0,0 +1,20 @@
-+const appPackage: Record<string, string> = require('./package.json')
-+
-+export function getProductName() {
-+  const productName = appPackage.productName
-+  return process.env.NODE_ENV === 'development'
-+    ? `${productName}-dev`
-+    : productName
-+}
-+
-+export function getCompanyName() {
-+  return appPackage.companyName
-+}
-+
-+export function getVersion() {
-+  return appPackage.version
-+}
-+
-+export function getBundleID() {
-+  return appPackage.bundleID
-+}
-merged
-  result 100644 8a1178e723ae9609c53f3bcc8b0d06771b3de809 app/package.json
-  our    100644 0ec1aae7a11244ccf59f08de5e97e1824f63fc85 app/package.json
-@@ -3,7 +3,7 @@
-   "productName": "GitHub Desktop",
-   "bundleID": "com.github.GitHubClient",
-   "companyName": "GitHub, Inc.",
--  "version": "1.1.2-beta1",
-+  "version": "1.2.7-test1",
-   "main": "./main.js",
-   "repository": {
-     "type": "git",
-@@ -25,23 +25,23 @@
-     "codemirror-mode-elixir": "1.1.1",
-     "deep-equal": "^1.0.1",
-     "dexie": "^2.0.0",
--    "dugite": "1.61.0",
-+    "dugite": "^1.67.0",
-     "electron-window-state": "^4.0.2",
-     "event-kit": "^2.0.0",
-     "file-uri-to-path": "0.0.2",
-     "file-url": "^2.0.2",
--    "front-matter": "^2.1.2",
--    "fs-extra": "^2.1.2",
-+    "fs-extra": "^6.0.0",
-     "fuzzaldrin-plus": "^0.6.0",
-     "keytar": "^4.0.4",
-     "moment": "^2.17.1",
-     "mri": "^1.1.0",
-     "primer-support": "^4.0.0",
--    "react": "^16.2.0",
-+    "queue": "^4.4.2",
-+    "react": "^16.3.2",
-     "react-addons-shallow-compare": "^15.6.2",
--    "react-dom": "^16.2.0",
-+    "react-dom": "^16.3.2",
-     "react-transition-group": "^1.2.0",
--    "react-virtualized": "^9.18.5",
-+    "react-virtualized": "^9.20.0",
-     "registry-js": "^1.0.7",
-     "runas": "^3.1.1",
-     "source-map-support": "^0.4.15",
-@@ -59,7 +59,6 @@
-     "devtron": "^1.4.0",
-     "electron-debug": "^1.1.0",
-     "electron-devtools-installer": "^2.2.3",
--    "style-loader": "^0.13.2",
-     "temp": "^0.8.3",
-     "webpack-hot-middleware": "^2.10.0"
-   }
-merged
-  result 100644 e427588f02a3f1fd3d89705d05dedc0fe2ccfbfb app/src/ask-pass/ask-pass.ts
-  our    100644 537e5a421b8fac3f1bc529212cd0bd1ad86330b6 app/src/ask-pass/ask-pass.ts
-@@ -5,16 +5,16 @@
- export async function responseForPrompt(
-   prompt: string
- ): Promise<string | null> {
--  const username: string | null = process.env.DESKTOP_USERNAME
--  if (!username || !username.length) {
-+  const username = process.env.DESKTOP_USERNAME
-+  if (username == null || username.length === 0) {
-     return null
-   }
-
-   if (prompt.startsWith('Username')) {
-     return username
-   } else if (prompt.startsWith('Password')) {
--    const endpoint: string | null = process.env.DESKTOP_ENDPOINT
--    if (!endpoint || !endpoint.length) {
-+    const endpoint = process.env.DESKTOP_ENDPOINT
-+    if (endpoint == null || endpoint.length === 0) {
-       return null
-     }
-
-removed in remote
-  base   100644 66965ffb5ca93dbeaa3562652443adc8c8dd4715 app/src/cli/dev-commands-global.js
-  our    100644 66965ffb5ca93dbeaa3562652443adc8c8dd4715 app/src/cli/dev-commands-global.js
-@@ -1,3 +0,0 @@
--const appInfo = require('../../../app/app-info')
--
--global.__CLI_COMMANDS__ = appInfo.getCLICommands()
-added in remote
-  their  100644 2199e5e0c456edb57048a02298f9925eb4953327 app/src/cli/dev-commands-global.ts
-@@ -0,0 +1,4 @@
-+import { getCLICommands } from '../../../app/app-info'
-+
-+const g: any = global
-+g.__CLI_COMMANDS__ = getCLICommands()
-merged
-  result 100644 d6887c4c182d239a574563f5a552b6c44bab229d app/src/highlighter/globals.d.ts
-  our    100644 a639311f88f661769bc71af8d6a36e20b314709d app/src/highlighter/globals.d.ts
-@@ -251,3 +251,128 @@
- declare module 'codemirror/addon/runmode/runmode.node.js' {
-   export = CodeMirror
- }
-+
-+declare module 'codemirror-mode-elixir'
-+
-+// find app/node_modules/codemirror/mode -iname *.js | cut -d '/' -f 3- | cut -d '.' -f 1 | sed -e "s/^/declare module '/" | sed -e "s/$/'/"
-+declare module 'codemirror/mode/scheme/scheme'
-+declare module 'codemirror/mode/modelica/modelica'
-+declare module 'codemirror/mode/idl/idl'
-+declare module 'codemirror/mode/pascal/pascal'
-+declare module 'codemirror/mode/nsis/nsis'
-+declare module 'codemirror/mode/haml/haml'
-+declare module 'codemirror/mode/toml/toml'
-+declare module 'codemirror/mode/pig/pig'
-+declare module 'codemirror/mode/gas/gas'
-+declare module 'codemirror/mode/go/go'
-+declare module 'codemirror/mode/apl/apl'
-+declare module 'codemirror/mode/textile/textile'
-+declare module 'codemirror/mode/turtle/turtle'
-+declare module 'codemirror/mode/sparql/sparql'
-+declare module 'codemirror/mode/troff/troff'
-+declare module 'codemirror/mode/cmake/cmake'
-+declare module 'codemirror/mode/htmlembedded/htmlembedded'
-+declare module 'codemirror/mode/xquery/xquery'
-+declare module 'codemirror/mode/python/python'
-+declare module 'codemirror/mode/css/css'
-+declare module 'codemirror/mode/clojure/clojure'
-+declare module 'codemirror/mode/spreadsheet/spreadsheet'
-+declare module 'codemirror/mode/asn.1/asn.1'
-+declare module 'codemirror/mode/z80/z80'
-+declare module 'codemirror/mode/jinja2/jinja2'
-+declare module 'codemirror/mode/gherkin/gherkin'
-+declare module 'codemirror/mode/asterisk/asterisk'
-+declare module 'codemirror/mode/dockerfile/dockerfile'
-+declare module 'codemirror/mode/dart/dart'
-+declare module 'codemirror/mode/shell/shell'
-+declare module 'codemirror/mode/yacas/yacas'
-+declare module 'codemirror/mode/markdown/markdown'
-+declare module 'codemirror/mode/haxe/haxe'
-+declare module 'codemirror/mode/soy/soy'
-+declare module 'codemirror/mode/perl/perl'
-+declare module 'codemirror/mode/smalltalk/smalltalk'
-+declare module 'codemirror/mode/dylan/dylan'
-+declare module 'codemirror/mode/stylus/stylus'
-+declare module 'codemirror/mode/vue/vue'
-+declare module 'codemirror/mode/rust/rust'
-+declare module 'codemirror/mode/rst/rst'
-+declare module 'codemirror/mode/tiddlywiki/tiddlywiki'
-+declare module 'codemirror/mode/pug/pug'
-+declare module 'codemirror/mode/erlang/erlang'
-+declare module 'codemirror/mode/r/r'
-+declare module 'codemirror/mode/mathematica/mathematica'
-+declare module 'codemirror/mode/yaml-frontmatter/yaml-frontmatter'
-+declare module 'codemirror/mode/diff/diff'
-+declare module 'codemirror/mode/elm/elm'
-+declare module 'codemirror/mode/crystal/crystal'
-+declare module 'codemirror/mode/cypher/cypher'
-+declare module 'codemirror/mode/htmlmixed/htmlmixed'
-+declare module 'codemirror/mode/ebnf/ebnf'
-+declare module 'codemirror/mode/webidl/webidl'
-+declare module 'codemirror/mode/smarty/smarty'
-+declare module 'codemirror/mode/stex/stex'
-+declare module 'codemirror/mode/haskell/haskell'
-+declare module 'codemirror/mode/factor/factor'
-+declare module 'codemirror/mode/php/php'
-+declare module 'codemirror/mode/pegjs/pegjs'
-+declare module 'codemirror/mode/lua/lua'
-+declare module 'codemirror/mode/velocity/velocity'
-+declare module 'codemirror/mode/xml/xml'
-+declare module 'codemirror/mode/solr/solr'
-+declare module 'codemirror/mode/mbox/mbox'
-+declare module 'codemirror/mode/mllike/mllike'
-+declare module 'codemirror/mode/vb/vb'
-+declare module 'codemirror/mode/powershell/powershell'
-+declare module 'codemirror/mode/tornado/tornado'
-+declare module 'codemirror/mode/vhdl/vhdl'
-+declare module 'codemirror/mode/tiki/tiki'
-+declare module 'codemirror/mode/clike/clike'
-+declare module 'codemirror/mode/tcl/tcl'
-+declare module 'codemirror/mode/brainfuck/brainfuck'
-+declare module 'codemirror/mode/ttcn/ttcn'
-+declare module 'codemirror/mode/dtd/dtd'
-+declare module 'codemirror/mode/octave/octave'
-+declare module 'codemirror/mode/properties/properties'
-+declare module 'codemirror/mode/verilog/verilog'
-+declare module 'codemirror/mode/handlebars/handlebars'
-+declare module 'codemirror/mode/nginx/nginx'
-+declare module 'codemirror/mode/http/http'
-+declare module 'codemirror/mode/asciiarmor/asciiarmor'
-+declare module 'codemirror/mode/swift/swift'
-+declare module 'codemirror/mode/meta'
-+declare module 'codemirror/mode/sas/sas'
-+declare module 'codemirror/mode/sieve/sieve'
-+declare module 'codemirror/mode/livescript/livescript'
-+declare module 'codemirror/mode/commonlisp/commonlisp'
-+declare module 'codemirror/mode/fcl/fcl'
-+declare module 'codemirror/mode/yaml/yaml'
-+declare module 'codemirror/mode/fortran/fortran'
-+declare module 'codemirror/mode/julia/julia'
-+declare module 'codemirror/mode/oz/oz'
-+declare module 'codemirror/mode/groovy/groovy'
-+declare module 'codemirror/mode/coffeescript/coffeescript'
-+declare module 'codemirror/mode/slim/slim'
-+declare module 'codemirror/mode/javascript/javascript'
-+declare module 'codemirror/mode/mscgen/mscgen'
-+declare module 'codemirror/mode/twig/twig'
-+declare module 'codemirror/mode/eiffel/eiffel'
-+declare module 'codemirror/mode/cobol/cobol'
-+declare module 'codemirror/mode/sass/sass'
-+declare module 'codemirror/mode/rpm/rpm'
-+declare module 'codemirror/mode/mumps/mumps'
-+declare module 'codemirror/mode/vbscript/vbscript'
-+declare module 'codemirror/mode/ttcn-cfg/ttcn-cfg'
-+declare module 'codemirror/mode/forth/forth'
-+declare module 'codemirror/mode/puppet/puppet'
-+declare module 'codemirror/mode/django/django'
-+declare module 'codemirror/mode/d/d'
-+declare module 'codemirror/mode/q/q'
-+declare module 'codemirror/mode/jsx/jsx'
-+declare module 'codemirror/mode/protobuf/protobuf'
-+declare module 'codemirror/mode/gfm/gfm'
-+declare module 'codemirror/mode/ecl/ecl'
-+declare module 'codemirror/mode/ruby/ruby'
-+declare module 'codemirror/mode/mirc/mirc'
-+declare module 'codemirror/mode/haskell-literate/haskell-literate'
-+declare module 'codemirror/mode/ntriples/ntriples'
-+declare module 'codemirror/mode/sql/sql'
-merged
-  result 100644 cb77ca464e7d706ddd17c526debdac45e670cf4f app/src/highlighter/index.ts
-  our    100644 998448323560f91d6522bad31da1dc4317501f5d app/src/highlighter/index.ts
-@@ -11,106 +11,250 @@
-
- import { ITokens, IHighlightRequest } from '../lib/highlighter/types'
-
-+/**
-+ * A mode definition object is used to map a certain file
-+ * extension to a mode loader (see the documentation for
-+ * the install property).
-+ */
-+interface IModeDefinition {
-+  /**
-+   * A function that, when called, will attempt to asynchronously
-+   * load the required modules for a particular mode. This function
-+   * is idempotent and can be called multiple times with no adverse
-+   * effect.
-+   */
-+  readonly install: () => Promise<void>
-+
-+  /**
-+   * A map between file extensions (including the leading dot, i.e.
-+   * ".jpeg") and the selected mime type to use when highlighting
-+   * that extension as specified in the CodeMirror mode itself.
-+   */
-+  readonly extensions: {
-+    readonly [key: string]: string
-+  }
-+}
-+
-+/**
-+ * Array describing all currently supported modes and the file extensions
-+ * that they cover.
-+ */
-+const modes: ReadonlyArray<IModeDefinition> = [
-+  {
-+    install: () => import('codemirror/mode/javascript/javascript'),
-+    extensions: {
-+      '.ts': 'text/typescript',
-+      '.js': 'text/javascript',
-+      '.json': 'application/json',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/coffeescript/coffeescript'),
-+    extensions: {
-+      '.coffee': 'text/x-coffeescript',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/jsx/jsx'),
-+    extensions: {
-+      '.tsx': 'text/typescript-jsx',
-+      '.jsx': 'text/jsx',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/htmlmixed/htmlmixed'),
-+    extensions: {
-+      '.html': 'text/html',
-+      '.htm': 'text/html',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/htmlembedded/htmlembedded'),
-+    extensions: {
-+      '.jsp': 'application/x-jsp',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/css/css'),
-+    extensions: {
-+      '.css': 'text/css',
-+      '.scss': 'text/x-scss',
-+      '.less': 'text/x-less',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/vue/vue'),
-+    extensions: {
-+      '.vue': 'text/x-vue',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/markdown/markdown'),
-+    extensions: {
-+      '.markdown': 'text/x-markdown',
-+      '.md': 'text/x-markdown',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/yaml/yaml'),
-+    extensions: {
-+      '.yaml': 'text/yaml',
-+      '.yml': 'text/yaml',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/xml/xml'),
-+    extensions: {
-+      '.xml': 'text/xml',
-+      '.xaml': 'text/xml',
-+      '.csproj': 'text/xml',
-+      '.fsproj': 'text/xml',
-+      '.vcxproj': 'text/xml',
-+      '.vbproj': 'text/xml',
-+      '.svg': 'text/xml',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/clike/clike'),
-+    extensions: {
-+      '.m': 'text/x-objectivec',
-+      '.scala': 'text/x-scala',
-+      '.sc': 'text/x-scala',
-+      '.cs': 'text/x-csharp',
-+      '.cake': 'text/x-csharp',
-+      '.java': 'text/x-java',
-+      '.c': 'text/x-c',
-+      '.h': 'text/x-c',
-+      '.cpp': 'text/x-c++src',
-+      '.hpp': 'text/x-c++src',
-+      '.kt': 'text/x-kotlin',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/mllike/mllike'),
-+    extensions: {
-+      '.ml': 'text/x-ocaml',
-+      '.fs': 'text/x-fsharp',
-+      '.fsx': 'text/x-fsharp',
-+      '.fsi': 'text/x-fsharp',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/swift/swift'),
-+    extensions: {
-+      '.swift': 'text/x-swift',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/shell/shell'),
-+    extensions: {
-+      '.sh': 'text/x-sh',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/sql/sql'),
-+    extensions: {
-+      '.sql': 'text/x-sql',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/cypher/cypher'),
-+    extensions: {
-+      '.cql': 'application/x-cypher-query',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/go/go'),
-+    extensions: {
-+      '.go': 'text/x-go',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/perl/perl'),
-+    extensions: {
-+      '.pl': 'text/x-perl',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/php/php'),
-+    extensions: {
-+      '.php': 'application/x-httpd-php',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/python/python'),
-+    extensions: {
-+      '.py': 'text/x-python',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/ruby/ruby'),
-+    extensions: {
-+      '.rb': 'text/x-ruby',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/clojure/clojure'),
-+    extensions: {
-+      '.clj': 'text/x-clojure',
-+      '.cljc': 'text/x-clojure',
-+      '.cljs': 'text/x-clojure',
-+      '.edn': 'text/x-clojure',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/rust/rust'),
-+    extensions: {
-+      '.rs': 'text/x-rustsrc',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror-mode-elixir'),
-+    extensions: {
-+      '.ex': 'text/x-elixir',
-+      '.exs': 'text/x-elixir',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/haxe/haxe'),
-+    extensions: {
-+      '.hx': 'text/x-haxe',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/r/r'),
-+    extensions: {
-+      '.r': 'text/x-rsrc',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/powershell/powershell'),
-+    extensions: {
-+      '.ps1': 'application/x-powershell',
-+    },
-+  },
-+]
-+
-+/**
-+ * A map between file extensions and mime types, see
-+ * the 'extensions' property on the IModeDefinition interface
-+ * for more information
-+ */
- const extensionMIMEMap = new Map<string, string>()
-
--import 'codemirror/mode/javascript/javascript'
--extensionMIMEMap.set('.ts', 'text/typescript')
--extensionMIMEMap.set('.js', 'text/javascript')
--extensionMIMEMap.set('.json', 'application/json')
--
--import 'codemirror/mode/coffeescript/coffeescript'
--extensionMIMEMap.set('.coffee', 'text/x-coffeescript')
--
--import 'codemirror/mode/jsx/jsx'
--extensionMIMEMap.set('.tsx', 'text/typescript-jsx')
--extensionMIMEMap.set('.jsx', 'text/jsx')
--
--import 'codemirror/mode/htmlmixed/htmlmixed'
--extensionMIMEMap.set('.html', 'text/html')
--extensionMIMEMap.set('.htm', 'text/html')
--
--import 'codemirror/mode/css/css'
--extensionMIMEMap.set('.css', 'text/css')
--extensionMIMEMap.set('.scss', 'text/x-scss')
--extensionMIMEMap.set('.less', 'text/x-less')
--
--import 'codemirror/mode/vue/vue'
--extensionMIMEMap.set('.vue', 'text/x-vue')
--
--import 'codemirror/mode/markdown/markdown'
--extensionMIMEMap.set('.markdown', 'text/x-markdown')
--extensionMIMEMap.set('.md', 'text/x-markdown')
--
--import 'codemirror/mode/yaml/yaml'
--extensionMIMEMap.set('.yaml', 'text/yaml')
--extensionMIMEMap.set('.yml', 'text/yaml')
--
--import 'codemirror/mode/xml/xml'
--extensionMIMEMap.set('.xml', 'text/xml')
--extensionMIMEMap.set('.xaml', 'text/xml')
--extensionMIMEMap.set('.csproj', 'text/xml')
--extensionMIMEMap.set('.fsproj', 'text/xml')
--extensionMIMEMap.set('.vcxproj', 'text/xml')
--extensionMIMEMap.set('.vbproj', 'text/xml')
--extensionMIMEMap.set('.svg', 'text/xml')
--
--import 'codemirror/mode/clike/clike'
--extensionMIMEMap.set('.m', 'text/x-objectivec')
--extensionMIMEMap.set('.scala', 'text/x-scala')
--extensionMIMEMap.set('.sc', 'text/x-scala')
--extensionMIMEMap.set('.cs', 'text/x-csharp')
--extensionMIMEMap.set('.java', 'text/x-java')
--extensionMIMEMap.set('.c', 'text/x-c')
--extensionMIMEMap.set('.h', 'text/x-c')
--extensionMIMEMap.set('.cpp', 'text/x-c++src')
--extensionMIMEMap.set('.hpp', 'text/x-c++src')
--extensionMIMEMap.set('.kt', 'text/x-kotlin')
--
--import 'codemirror/mode/mllike/mllike'
--extensionMIMEMap.set('.ml', 'text/x-ocaml')
--extensionMIMEMap.set('.fs', 'text/x-fsharp')
--extensionMIMEMap.set('.fsx', 'text/x-fsharp')
--extensionMIMEMap.set('.fsi', 'text/x-fsharp')
--
--import 'codemirror/mode/swift/swift'
--extensionMIMEMap.set('.swift', 'text/x-swift')
--
--import 'codemirror/mode/shell/shell'
--extensionMIMEMap.set('.sh', 'text/x-sh')
--
--import 'codemirror/mode/sql/sql'
--extensionMIMEMap.set('.sql', 'text/x-sql')
--
--import 'codemirror/mode/cypher/cypher'
--extensionMIMEMap.set('.cql', 'application/x-cypher-query')
--
--import 'codemirror/mode/go/go'
--extensionMIMEMap.set('.go', 'text/x-go')
--
--import 'codemirror/mode/perl/perl'
--extensionMIMEMap.set('.pl', 'text/x-perl')
--
--import 'codemirror/mode/php/php'
--extensionMIMEMap.set('.php', 'application/x-httpd-php')
--
--import 'codemirror/mode/python/python'
--extensionMIMEMap.set('.py', 'text/x-python')
--
--import 'codemirror/mode/ruby/ruby'
--extensionMIMEMap.set('.rb', 'text/x-ruby')
--
--import 'codemirror/mode/clojure/clojure'
--extensionMIMEMap.set('.clj', 'text/x-clojure')
--extensionMIMEMap.set('.cljc', 'text/x-clojure')
--extensionMIMEMap.set('.cljs', 'text/x-clojure')
--extensionMIMEMap.set('.edn', 'text/x-clojure')
--
--import 'codemirror/mode/rust/rust'
--extensionMIMEMap.set('.rs', 'text/x-rustsrc')
--
--import 'codemirror-mode-elixir'
--extensionMIMEMap.set('.ex', 'text/x-elixir')
--extensionMIMEMap.set('.exs', 'text/x-elixir')
-+/**
-+ * A map between mime types and mode definitions. See the
-+ * documentation for the IModeDefinition interface
-+ * for more information
-+ */
-+const mimeModeMap = new Map<string, IModeDefinition>()
-+
-+for (const mode of modes) {
-+  for (const [extension, mimeType] of Object.entries(mode.extensions)) {
-+    extensionMIMEMap.set(extension, mimeType)
-+    mimeModeMap.set(mimeType, mode)
-+  }
-+}
-
- function guessMimeType(contents: string) {
-   if (contents.startsWith('<?xml')) {
-@@ -144,14 +288,25 @@
-   return null
- }
-
--function detectMode(request: IHighlightRequest): CodeMirror.Mode<{}> | null {
-+async function detectMode(
-+  request: IHighlightRequest
-+): Promise<CodeMirror.Mode<{}> | null> {
-   const mimeType =
--    extensionMIMEMap.get(request.extension) || guessMimeType(request.contents)
-+    extensionMIMEMap.get(request.extension.toLowerCase()) ||
-+    guessMimeType(request.contents)
-
-   if (!mimeType) {
-     return null
-   }
-
-+  const modeDefinition = mimeModeMap.get(mimeType)
-+
-+  if (modeDefinition === undefined) {
-+    return null
-+  }
-+
-+  await modeDefinition.install()
-+
-   return getMode({}, mimeType) || null
- }
-
-@@ -213,14 +368,14 @@
-   throw new Error(`Mode ${getModeName(mode)} failed to advance stream.`)
- }
-
--onmessage = (ev: MessageEvent) => {
-+onmessage = async (ev: MessageEvent) => {
-   const request = ev.data as IHighlightRequest
-
-   const tabSize = request.tabSize || 4
-   const contents = request.contents
-   const addModeClass = request.addModeClass === true
-
--  const mode = detectMode(request)
-+  const mode = await detectMode(request)
-
-   if (!mode) {
-     postMessage({})
-merged
-  result 100644 28bceee1eb85ee67e5615f600cd692fd1286c44b app/src/highlighter/tsconfig.json
-  our    100644 ac72a2f6877ed0b4f8a01b2e6cdf721c2ad59ccf app/src/highlighter/tsconfig.json
-@@ -1,6 +1,6 @@
- {
-   "compilerOptions": {
--    "module": "commonjs",
-+    "module": "esnext",
-     "moduleResolution": "node",
-     "target": "es2017",
-     "noImplicitReturns": true,
-merged
-  result 100644 e315e51baf72a2f8735ae86ea485b0e6d5bebeed app/src/lib/app-shell.ts
-  our    100644 1fd1d56b84996afc63dce165e2dda4f5b8e20d94 app/src/lib/app-shell.ts
-@@ -1,4 +1,7 @@
- import { shell as electronShell, ipcRenderer } from 'electron'
-+import * as Path from 'path'
-+
-+import { Repository } from '../models/repository'
-
- export interface IAppShell {
-   readonly moveItemToTrash: (path: string) => boolean
-@@ -28,3 +31,14 @@
-   },
-   openItem: electronShell.openItem,
- }
-+
-+/**
-+ * Reveals a file from a repository in the native file manager.
-+ *
-+ * @param repository The currently active repository instance
-+ * @param path The path of the file relative to the root of the repository
-+ */
-+export function revealInFileManager(repository: Repository, path: string) {
-+  const fullyQualifiedFilePath = Path.join(repository.path, path)
-+  return shell.showItemInFolder(fullyQualifiedFilePath)
-+}
-merged
-  result 100644 711a4f16bab17ee49c4dd510d5a575cf149f5a5c app/src/lib/app-state.ts
-  our    100644 c329944f04e7a0db1cdd5851028416024f3c5c16 app/src/lib/app-state.ts
-@@ -1,9 +1,9 @@
- import { Account } from '../models/account'
- import { CommitIdentity } from '../models/commit-identity'
- import { IDiff } from '../models/diff'
--import { Repository } from '../models/repository'
--import { IAheadBehind } from './git'
--import { Branch } from '../models/branch'
-+import { Repository, ILocalRepositoryState } from '../models/repository'
-+
-+import { Branch, IAheadBehind } from '../models/branch'
- import { Tip } from '../models/tip'
- import { Commit } from '../models/commit'
- import {
-@@ -26,9 +26,10 @@
- import { BranchesTab } from '../models/branches-tab'
- import { PullRequest } from '../models/pull-request'
- import { IAuthor } from '../models/author'
-+import { ComparisonCache } from './comparison-cache'
-+import { ApplicationTheme } from '../ui/lib/application-theme'
-
- export { ICommitMessage }
--export { IAheadBehind }
-
- export enum SelectionType {
-   Repository,
-@@ -67,8 +68,16 @@
- /** All of the shared app state. */
- export interface IAppState {
-   readonly accounts: ReadonlyArray<Account>
-+  /**
-+   * The current list of repositories tracked in the application
-+   */
-   readonly repositories: ReadonlyArray<Repository | CloningRepository>
-
-+  /**
-+   * A cache of the latest repository state values, keyed by the repository id
-+   */
-+  readonly localRepositoryStateLookup: Map<number, ILocalRepositoryState>
-+
-   readonly selectedState: PossibleSelections | null
-
-   /**
-@@ -178,6 +187,11 @@
-
-   /** The currently selected tab for the Branches foldout. */
-   readonly selectedBranchesTab: BranchesTab
-+
-+  /** Show the diverging notification banner */
-+  readonly isDivergingBranchBannerVisible: boolean
-+  /** The currently selected appearance (aka theme) */
-+  readonly selectedTheme: ApplicationTheme
- }
-
- export enum PopupType {
-@@ -208,6 +222,7 @@
-   LFSAttributeMismatch,
-   UpstreamAlreadyExists,
-   DeletePullRequest,
-+  MergeConflicts,
- }
-
- export type Popup =
-@@ -222,9 +237,14 @@
-       type: PopupType.ConfirmDiscardChanges
-       repository: Repository
-       files: ReadonlyArray<WorkingDirectoryFileChange>
-+      showDiscardChangesSetting?: boolean
-     }
-   | { type: PopupType.Preferences; initialSelectedTab?: PreferencesTab }
--  | { type: PopupType.MergeBranch; repository: Repository }
-+  | {
-+      type: PopupType.MergeBranch
-+      repository: Repository
-+      branch?: Branch
-+    }
-   | { type: PopupType.RepositorySettings; repository: Repository }
-   | { type: PopupType.AddRepository; path?: string }
-   | { type: PopupType.CreateRepository; path?: string }
-@@ -281,6 +301,7 @@
-       branch: Branch
-       pullRequest: PullRequest
-     }
-+  | { type: PopupType.MergeConflicts; repository: Repository }
-
- export enum FoldoutType {
-   Repository,
-@@ -315,7 +336,7 @@
-   | { type: FoldoutType.AddMenu }
-   | AppMenuFoldout
-
--export enum RepositorySection {
-+export enum RepositorySectionTab {
-   Changes,
-   History,
- }
-@@ -323,7 +344,8 @@
- export interface IRepositoryState {
-   readonly historyState: IHistoryState
-   readonly changesState: IChangesState
--  readonly selectedSection: RepositorySection
-+  readonly compareState: ICompareState
-+  readonly selectedSection: RepositorySectionTab
-
-   /**
-    * The name and email that will be used for the author info
-@@ -559,10 +581,10 @@
-   readonly workingDirectory: WorkingDirectoryStatus
-
-   /**
--   * The ID of the selected file. The file itself can be looked up in
-+   * The ID of the selected files. The files themselves can be looked up in
-    * `workingDirectory`.
-    */
--  readonly selectedFileID: string | null
-+  readonly selectedFileIDs: string[]
-
-   readonly diff: IDiff | null
-
-@@ -590,3 +612,105 @@
-    */
-   readonly coAuthors: ReadonlyArray<IAuthor>
- }
-+
-+export enum ComparisonView {
-+  None = 'none',
-+  Ahead = 'ahead',
-+  Behind = 'behind',
-+}
-+
-+/**
-+ * The default comparison state is to display the history for the current
-+ * branch.
-+ */
-+export interface IDisplayHistory {
-+  readonly kind: ComparisonView.None
-+}
-+
-+/**
-+ * When the user has chosen another branch to compare, using their current
-+ * branch as the base branch.
-+ */
-+export interface ICompareBranch {
-+  /** The chosen comparison mode determines which commits to show */
-+  readonly kind: ComparisonView.Ahead | ComparisonView.Behind
-+
-+  /** The branch to compare against the base branch */
-+  readonly comparisonBranch: Branch
-+
-+  /** The number of commits the selected branch is ahead/behind the current branch */
-+  readonly aheadBehind: IAheadBehind
-+}
-+
-+export interface ICompareState {
-+  /** The current state of the compare form, based on user input */
-+  readonly formState: IDisplayHistory | ICompareBranch
-+
-+  /** Whether the branch list should be expanded or hidden */
-+  readonly showBranchList: boolean
-+
-+  /** The text entered into the compare branch filter text box */
-+  readonly filterText: string
-+
-+  /** The SHAs of commits to render in the compare list */
-+  readonly commitSHAs: ReadonlyArray<string>
-+
-+  /** A list of all branches (remote and local) currently in the repository. */
-+  readonly allBranches: ReadonlyArray<Branch>
-+
-+  /**
-+   * A list of zero to a few (at time of writing 5 but check loadRecentBranches
-+   * in git-store for definitive answer) branches that have been checked out
-+   * recently. This list is compiled by reading the reflog and tracking branch
-+   * switches over the last couple of thousand reflog entries.
-+   */
-+  readonly recentBranches: ReadonlyArray<Branch>
-+
-+  /**
-+   * The default branch for a given repository. Most commonly this
-+   * will be the 'master' branch but GitHub users are able to change
-+   * their default branch in the web UI.
-+   */
-+  readonly defaultBranch: Branch | null
-+
-+  /**
-+   * A local cache of ahead/behind computations to compare other refs to the current branch
-+   */
-+  readonly aheadBehindCache: ComparisonCache
-+
-+  /**
-+   * The best candidate branch to compare the current branch to.
-+   * Also includes the ahead/behind info for the inferred branch
-+   * relative to the current branch.
-+   */
-+  readonly inferredComparisonBranch: {
-+    branch: Branch | null
-+    aheadBehind: IAheadBehind | null
-+  }
-+}
-+
-+export interface ICompareFormUpdate {
-+  /** The updated filter text to set */
-+  readonly filterText: string
-+
-+  /** Thew new state of the branches list */
-+  readonly showBranchList: boolean
-+}
-+
-+export enum CompareActionKind {
-+  History = 'History',
-+  Branch = 'Branch',
-+}
-+
-+/**
-+ * An action to send to the application store to update the compare state
-+ */
-+export type CompareAction =
-+  | {
-+      readonly kind: CompareActionKind.History
-+    }
-+  | {
-+      readonly kind: CompareActionKind.Branch
-+      readonly branch: Branch
-+      readonly mode: ComparisonView.Ahead | ComparisonView.Behind
-+    }
-added in remote
-  their  100644 9745def3e5a5e6046e8f8ea32a90a530172dd312 app/src/lib/comparison-cache.ts
-@@ -0,0 +1,29 @@
-+import { IAheadBehind } from '../models/branch'
-+import { revSymmetricDifference } from '../lib/git'
-+
-+export class ComparisonCache {
-+  private backingStore = new Map<string, IAheadBehind>()
-+
-+  public set(from: string, to: string, value: IAheadBehind) {
-+    const key = revSymmetricDifference(from, to)
-+    this.backingStore.set(key, value)
-+  }
-+
-+  public get(from: string, to: string) {
-+    const key = revSymmetricDifference(from, to)
-+    return this.backingStore.get(key) || null
-+  }
-+
-+  public has(from: string, to: string) {
-+    const key = revSymmetricDifference(from, to)
-+    return this.backingStore.has(key)
-+  }
-+
-+  public get size() {
-+    return this.backingStore.size
-+  }
-+
-+  public clear() {
-+    this.backingStore.clear()
-+  }
-+}
-merged
-  result 100644 6989ac27cc613156ffcb3cf61e2e33863a75d3cd app/src/lib/dispatcher/dispatcher.ts
-  our    100644 bd55d7427357a36ac24db03b82d32fa9cebe5ac7 app/src/lib/dispatcher/dispatcher.ts
-@@ -11,12 +11,14 @@
- } from '../../models/status'
- import { DiffSelection } from '../../models/diff'
- import {
--  RepositorySection,
-+  RepositorySectionTab,
-   Popup,
-   PopupType,
-   Foldout,
-   FoldoutType,
-   ImageDiffType,
-+  CompareAction,
-+  ICompareFormUpdate,
- } from '../app-state'
- import { AppStore } from '../stores/app-store'
- import { CloningRepository } from '../../models/cloning-repository'
-@@ -54,6 +56,8 @@
- import { PullRequest } from '../../models/pull-request'
- import { IAuthor } from '../../models/author'
- import { ITrailer } from '../git/interpret-trailers'
-+import { isGitRepository } from '../git'
-+import { ApplicationTheme } from '../../ui/lib/application-theme'
-
- /**
-  * An error handler function.
-@@ -109,11 +113,6 @@
-     return this.appStore._updateRepositoryMissing(repository, missing)
-   }
-
--  /** Load the history for the repository. */
--  public loadHistory(repository: Repository): Promise<void> {
--    return this.appStore._loadHistory(repository)
--  }
--
-   /** Load the next batch of history for the repository. */
-   public loadNextHistoryBatch(repository: Repository): Promise<void> {
-     return this.appStore._loadNextHistoryBatch(repository)
-@@ -177,7 +176,7 @@
-   /** Change the selected section in the repository. */
-   public changeRepositorySection(
-     repository: Repository,
--    section: RepositorySection
-+    section: RepositorySectionTab
-   ): Promise<void> {
-     return this.appStore._changeRepositorySection(repository, section)
-   }
-@@ -185,9 +184,9 @@
-   /** Change the currently selected file in Changes. */
-   public changeChangesSelection(
-     repository: Repository,
--    selectedFile: WorkingDirectoryFileChange
-+    selectedFiles: WorkingDirectoryFileChange[]
-   ): Promise<void> {
--    return this.appStore._changeChangesSelection(repository, selectedFile)
-+    return this.appStore._changeChangesSelection(repository, selectedFiles)
-   }
-
-   /**
-@@ -460,6 +459,13 @@
-   }
-
-   /**
-+   * Set the divering branch notification banner's visibility
-+   */
-+  public setDivergingBranchBannerVisibility(isVisible: boolean) {
-+    return this.appStore._setDivergingBranchBannerVisibility(isVisible)
-+  }
-+
-+  /**
-    * Reset the width of the repository sidebar to its default
-    * value. This affects the changes and history sidebar
-    * as well as the first toolbar section which contains
-@@ -585,7 +591,10 @@
-   }
-
-   /** Add the pattern to the repository's gitignore. */
--  public ignore(repository: Repository, pattern: string): Promise<void> {
-+  public ignore(
-+    repository: Repository,
-+    pattern: string | string[]
-+  ): Promise<void> {
-     return this.appStore._ignore(repository, pattern)
-   }
-
-@@ -602,9 +611,11 @@
-     }
-   }
-
--  /** Opens a Git repository in the user provided program */
--  public async openInExternalEditor(path: string): Promise<void> {
--    return this.appStore._openInExternalEditor(path)
-+  /**
-+   * Opens a path in the external editor selected by the user.
-+   */
-+  public async openInExternalEditor(fullPath: string): Promise<void> {
-+    return this.appStore._openInExternalEditor(fullPath)
-   }
-
-   /**
-@@ -843,13 +854,22 @@
-         // this ensures we use the repository root, if it is actually a repository
-         // otherwise we consider it an untracked repository
-         const path = (await validatedRepositoryPath(action.path)) || action.path
--
-         const state = this.appStore.getState()
--        const existingRepository = matchExistingRepository(
-+        let existingRepository = matchExistingRepository(
-           state.repositories,
-           path
-         )
-
-+        // in case this is valid git repository, there is no need to ask
-+        // user for confirmation and it can be added automatically
-+        if (existingRepository == null) {
-+          const isRepository = await isGitRepository(path)
-+          if (isRepository) {
-+            const addedRepositories = await this.addRepositories([path])
-+            existingRepository = addedRepositories[0]
-+          }
-+        }
-+
-         if (existingRepository) {
-           await this.selectRepository(existingRepository)
-         } else {
-@@ -879,10 +899,6 @@
-
-   /**
-    * Sets the user's preference so that confirmation to discard changes is not asked
--   *
--   * @param {boolean} value
--   * @returns {Promise<void>}
--   * @memberof Dispatcher
-    */
-   public setConfirmDiscardChangesSetting(value: boolean): Promise<void> {
-     return this.appStore._setConfirmDiscardChangesSetting(value)
-@@ -902,32 +918,38 @@
-     return this.appStore._setShell(shell)
-   }
-
--  /**
--   * Reveals a file from a repository in the native file manager.
--   * @param repository The currently active repository instance
--   * @param path The path of the file relative to the root of the repository
--   */
--  public revealInFileManager(repository: Repository, path: string) {
--    const normalized = Path.join(repository.path, path)
--    return shell.showItemInFolder(normalized)
--  }
--
-   private async handleCloneInDesktopOptions(
-     repository: Repository,
-     action: IOpenRepositoryFromURLAction
-   ): Promise<void> {
-     const { filepath, pr, branch } = action
-
--    if (pr && branch) {
-+    if (pr != null && branch != null) {
-       // we need to refetch for a forked PR and check that out
-       await this.fetchRefspec(repository, `pull/${pr}/head:${branch}`)
-     }
-
--    if (branch) {
-+    if (pr == null && branch != null) {
-+      const state = this.appStore.getRepositoryState(repository)
-+      const branches = state.branchesState.allBranches
-+
-+      // I don't want to invoke Git functionality from the dispatcher, which
-+      // would help by using getDefaultRemote here to get the definitive ref,
-+      // so this falls back to finding any remote branch matching the name
-+      // received from the "Clone in Desktop" action
-+      const localBranch =
-+        branches.find(b => b.upstreamWithoutRemote === branch) || null
-+
-+      if (localBranch == null) {
-+        await this.fetch(repository, FetchType.BackgroundTask)
-+      }
-+    }
-+
-+    if (branch != null) {
-       await this.checkoutBranch(repository, branch)
-     }
-
--    if (filepath) {
-+    if (filepath != null) {
-       const fullPath = Path.join(repository.path, filepath)
-       // because Windows uses different path separators here
-       const normalized = Path.normalize(fullPath)
-@@ -1148,4 +1170,93 @@
-   ) {
-     return this.appStore._setCoAuthors(repository, coAuthors)
-   }
-+
-+  /**
-+   * Initialze the compare state for the current repository.
-+   */
-+  public initializeCompare(
-+    repository: Repository,
-+    initialAction?: CompareAction
-+  ) {
-+    return this.appStore._initializeCompare(repository, initialAction)
-+  }
-+
-+  /**
-+   * Update the compare state for the current repository
-+   */
-+  public executeCompare(repository: Repository, action: CompareAction) {
-+    return this.appStore._executeCompare(repository, action)
-+  }
-+
-+  /** Update the compare form state for the current repository */
-+  public updateCompareForm<K extends keyof ICompareFormUpdate>(
-+    repository: Repository,
-+    newState: Pick<ICompareFormUpdate, K>
-+  ) {
-+    return this.appStore._updateCompareForm(repository, newState)
-+  }
-+
-+  /**
-+   * Increments the `mergeIntoCurrentBranchMenuCount` metric
-+   */
-+  public recordMenuInitiatedMerge() {
-+    return this.appStore._recordMenuInitiatedMerge()
-+  }
-+
-+  /**
-+   * Increments the `updateFromDefaultBranchMenuCount` metric
-+   */
-+  public recordMenuInitiatedUpdate() {
-+    return this.appStore._recordMenuInitiatedUpdate()
-+  }
-+
-+  /**
-+   * Increments the `mergesInitiatedFromComparison` metric
-+   */
-+  public recordCompareInitiatedMerge() {
-+    return this.appStore._recordCompareInitiatedMerge()
-+  }
-+
-+  /**
-+   * Set the application-wide theme
-+   */
-+  public setSelectedTheme(theme: ApplicationTheme) {
-+    return this.appStore._setSelectedTheme(theme)
-+  }
-+
-+  /**
-+   * Increments either the `repoWithIndicatorClicked` or
-+   * the `repoWithoutIndicatorClicked` metric
-+   */
-+  public recordRepoClicked(repoHasIndicator: boolean) {
-+    return this.appStore._recordRepoClicked(repoHasIndicator)
-+  }
-+
-+  /** The number of times the user dismisses the diverged branch notification
-+   * Increments the `divergingBranchBannerDismissal` metric
-+   */
-+  public recordDivergingBranchBannerDismissal() {
-+    return this.appStore._recordDivergingBranchBannerDismissal()
-+  }
-+
-+  /**
-+   * Increments the `divergingBranchBannerInitiatedCompare` metric
-+   */
-+  public recordDivergingBranchBannerInitiatedCompare() {
-+    return this.appStore._recordDivergingBranchBannerInitiatedCompare()
-+  }
-+
-+  /**
-+   * Increments the `divergingBranchBannerInfluencedMerge` metric
-+   */
-+  public recordDivergingBranchBannerInfluencedMerge() {
-+    return this.appStore._recordDivergingBranchBannerInfluencedMerge()
-+  }
-+
-+  /**
-+   * Increments the `divergingBranchBannerInitatedMerge` metric
-+   */
-+  public recordDivergingBranchBannerInitatedMerge() {
-+    return this.appStore._recordDivergingBranchBannerInitatedMerge()
-+  }
- }
-merged
-  result 100644 ad71f6491a65fc7927e53f0b9d61a0e8c53ed070 app/src/lib/dispatcher/error-handlers.ts
-  our    100644 e4bcde44c63c77e4be9175742b2312202cb79018 app/src/lib/dispatcher/error-handlers.ts
-@@ -246,6 +246,50 @@
- }
-
- /**
-+ * Handler for detecting when a merge conflict is reported to direct the user
-+ * to a different dialog than the generic Git error dialog.
-+ */
-+export async function mergeConflictHandler(
-+  error: Error,
-+  dispatcher: Dispatcher
-+): Promise<Error | null> {
-+  const e = asErrorWithMetadata(error)
-+  if (!e) {
-+    return error
-+  }
-+
-+  const gitError = asGitError(e.underlyingError)
-+  if (!gitError) {
-+    return error
-+  }
-+
-+  const dugiteError = gitError.result.gitError
-+  if (!dugiteError) {
-+    return error
-+  }
-+
-+  if (dugiteError !== DugiteError.MergeConflicts) {
-+    return error
-+  }
-+
-+  const repository = e.metadata.repository
-+  if (!repository) {
-+    return error
-+  }
-+
-+  if (!(repository instanceof Repository)) {
-+    return error
-+  }
-+
-+  dispatcher.showPopup({
-+    type: PopupType.MergeConflicts,
-+    repository,
-+  })
-+
-+  return null
-+}
-+
-+/**
-  * Handler for when we attempt to install the global LFS filters and LFS throws
-  * an error.
-  */
-merged
-  result 100644 396f15cea083d101fb676c2b851376917b67b1a8 app/src/lib/editors/darwin.ts
-  our    100644 830d42cfa11aea16cec5fa79dbc8b87e4ffb56aa app/src/lib/editors/darwin.ts
-@@ -1,10 +1,11 @@
- import * as Path from 'path'
--import { pathExists } from '../file-system'
-+import { pathExists } from 'fs-extra'
- import { IFoundEditor } from './found-editor'
- import { assertNever } from '../fatal-error'
-
- export enum ExternalEditor {
-   Atom = 'Atom',
-+  MacVim = 'MacVim',
-   VisualStudioCode = 'Visual Studio Code',
-   VisualStudioCodeInsiders = 'Visual Studio Code (Insiders)',
-   SublimeText = 'Sublime Text',
-@@ -12,12 +13,17 @@
-   PhpStorm = 'PhpStorm',
-   RubyMine = 'RubyMine',
-   TextMate = 'TextMate',
-+  Brackets = 'Brackets',
-+  WebStorm = 'WebStorm',
- }
-
- export function parse(label: string): ExternalEditor | null {
-   if (label === ExternalEditor.Atom) {
-     return ExternalEditor.Atom
-   }
-+  if (label === ExternalEditor.MacVim) {
-+    return ExternalEditor.MacVim
-+  }
-   if (label === ExternalEditor.VisualStudioCode) {
-     return ExternalEditor.VisualStudioCode
-   }
-@@ -39,6 +45,12 @@
-   if (label === ExternalEditor.TextMate) {
-     return ExternalEditor.TextMate
-   }
-+  if (label === ExternalEditor.Brackets) {
-+    return ExternalEditor.Brackets
-+  }
-+  if (label === ExternalEditor.WebStorm) {
-+    return ExternalEditor.WebStorm
-+  }
-   return null
- }
-
-@@ -51,6 +63,8 @@
-   switch (editor) {
-     case ExternalEditor.Atom:
-       return ['com.github.atom']
-+    case ExternalEditor.MacVim:
-+      return ['org.vim.MacVim']
-     case ExternalEditor.VisualStudioCode:
-       return ['com.microsoft.VSCode']
-     case ExternalEditor.VisualStudioCodeInsiders:
-@@ -65,6 +79,10 @@
-       return ['com.jetbrains.RubyMine']
-     case ExternalEditor.TextMate:
-       return ['com.macromates.TextMate']
-+    case ExternalEditor.Brackets:
-+      return ['io.brackets.appshell']
-+    case ExternalEditor.WebStorm:
-+      return ['com.jetbrains.WebStorm']
-     default:
-       return assertNever(editor, `Unknown external editor: ${editor}`)
-   }
-@@ -87,6 +105,8 @@
-         'bin',
-         'code'
-       )
-+    case ExternalEditor.MacVim:
-+      return Path.join(installPath, 'Contents', 'MacOS', 'MacVim')
-     case ExternalEditor.SublimeText:
-       return Path.join(installPath, 'Contents', 'SharedSupport', 'bin', 'subl')
-     case ExternalEditor.BBEdit:
-@@ -97,6 +117,10 @@
-       return Path.join(installPath, 'Contents', 'MacOS', 'rubymine')
-     case ExternalEditor.TextMate:
-       return Path.join(installPath, 'Contents', 'Resources', 'mate')
-+    case ExternalEditor.Brackets:
-+      return Path.join(installPath, 'Contents', 'MacOS', 'Brackets')
-+    case ExternalEditor.WebStorm:
-+      return Path.join(installPath, 'Contents', 'MacOS', 'WebStorm')
-     default:
-       return assertNever(editor, `Unknown external editor: ${editor}`)
-   }
-@@ -133,6 +157,7 @@
-
-   const [
-     atomPath,
-+    macVimPath,
-     codePath,
-     codeInsidersPath,
-     sublimePath,
-@@ -140,8 +165,11 @@
-     phpStormPath,
-     rubyMinePath,
-     textMatePath,
-+    bracketsPath,
-+    webStormPath,
-   ] = await Promise.all([
-     findApplication(ExternalEditor.Atom),
-+    findApplication(ExternalEditor.MacVim),
-     findApplication(ExternalEditor.VisualStudioCode),
-     findApplication(ExternalEditor.VisualStudioCodeInsiders),
-     findApplication(ExternalEditor.SublimeText),
-@@ -149,12 +177,18 @@
-     findApplication(ExternalEditor.PhpStorm),
-     findApplication(ExternalEditor.RubyMine),
-     findApplication(ExternalEditor.TextMate),
-+    findApplication(ExternalEditor.Brackets),
-+    findApplication(ExternalEditor.WebStorm),
-   ])
-
-   if (atomPath) {
-     results.push({ editor: ExternalEditor.Atom, path: atomPath })
-   }
-
-+  if (macVimPath) {
-+    results.push({ editor: ExternalEditor.MacVim, path: macVimPath })
-+  }
-+
-   if (codePath) {
-     results.push({ editor: ExternalEditor.VisualStudioCode, path: codePath })
-   }
-@@ -186,5 +220,13 @@
-     results.push({ editor: ExternalEditor.TextMate, path: textMatePath })
-   }
-
-+  if (bracketsPath) {
-+    results.push({ editor: ExternalEditor.Brackets, path: bracketsPath })
-+  }
-+
-+  if (webStormPath) {
-+    results.push({ editor: ExternalEditor.WebStorm, path: webStormPath })
-+  }
-+
-   return results
- }
-merged
-  result 100644 14fcc4b0ea50c3d49e60a2f61796f87d9edaaec4 app/src/lib/editors/launch.ts
-  our    100644 71e53504e0c9701cec78d2c5fd6dbefed636537e app/src/lib/editors/launch.ts
-@@ -1,15 +1,15 @@
- import { spawn } from 'child_process'
--import { pathExists } from '../file-system'
-+import { pathExists } from 'fs-extra'
- import { ExternalEditorError, FoundEditor } from './shared'
-
- /**
-- * Open a given folder in the desired external editor.
-+ * Open a given file or folder in the desired external editor.
-  *
-- * @param path The folder to pass as an argument when launching the editor.
-+ * @param fullPath A folder or file path to pass as an argument when launching the editor.
-  * @param editor The external editor to launch.
-  */
- export async function launchExternalEditor(
--  path: string,
-+  fullPath: string,
-   editor: FoundEditor
- ): Promise<void> {
-   const editorPath = editor.path
-@@ -24,5 +24,5 @@
-     )
-   }
-
--  spawn(editorPath, [path])
-+  spawn(editorPath, [fullPath])
- }
-merged
-  result 100644 61446be3534a72d03d35e5f535726b1d369508ed app/src/lib/editors/linux.ts
-  our    100644 a338bd034876cad8e313ca505f0764220e4b3600 app/src/lib/editors/linux.ts
-@@ -1,5 +1,6 @@
-+import { pathExists } from 'fs-extra'
-+
- import { IFoundEditor } from './found-editor'
--import { pathExists } from '../file-system'
- import { assertNever } from '../fatal-error'
-
- export enum ExternalEditor {
-merged
-  result 100644 fbc6a4cc3563a6085b030129507ee04749354b37 app/src/lib/editors/win32.ts
-  our    100644 06c6ea78811e4a48e1f82201e7b7826ea48dd564 app/src/lib/editors/win32.ts
-@@ -7,7 +7,7 @@
-   RegistryValueType,
- } from 'registry-js'
-
--import { pathExists } from '../file-system'
-+import { pathExists } from 'fs-extra'
- import { IFoundEditor } from './found-editor'
-
- import { assertNever } from '../fatal-error'
-merged
-  result 100644 be95c011127ed3931f5b6fe25a4afe37f46c593e app/src/lib/fatal-error.ts
-  our    100644 a54e675b9e3ce44b64e2a17668c095e9d903770e app/src/lib/fatal-error.ts
-@@ -9,11 +9,11 @@
-  * If the type system is bypassed or this method will throw an exception
-  * using the second parameter as the message.
-  *
-- * @param {x}       Placeholder parameter in order to leverage the type
-+ * @param x         Placeholder parameter in order to leverage the type
-  *                  system. Pass the variable which has been type narrowed
-  *                  in an exhaustive check.
-  *
-- * @param {message} The message to be used in the runtime exception.
-+ * @param message   The message to be used in the runtime exception.
-  *
-  */
- export function assertNever(x: never, message: string): never {
-merged
-  result 100644 a709cc9f974b35dc9a357b3b8ca94677b01d1092 app/src/lib/feature-flag.ts
-  our    100644 64f061a69053457ba9ad6ca62c78bc534f3b6d57 app/src/lib/feature-flag.ts
-@@ -14,7 +14,7 @@
-     return true
-   }
-
--  if (process.env.GITHUB_DESKTOP_PREVIEW_FEATURES) {
-+  if (process.env.GITHUB_DESKTOP_PREVIEW_FEATURES === '1') {
-     return true
-   }
-
-@@ -22,16 +22,22 @@
- }
-
- /** Should the app enable beta features? */
-+//@ts-ignore: this will be used again in the future
- function enableBetaFeatures(): boolean {
-   return enableDevelopmentFeatures() || __RELEASE_CHANNEL__ === 'beta'
- }
-
--/** Should the new Compare view be enabled? */
--export function enableCompareBranch(): boolean {
-+/** Should merge tool integration be enabled? */
-+export function enableMergeTool(): boolean {
-+  return enableDevelopmentFeatures()
-+}
-+
-+/** Should the Notification of Diverging From Default Branch (NDDB) feature be enabled? */
-+export function enableNotificationOfBranchUpdates(): boolean {
-   return enableBetaFeatures()
- }
-
--/** Should merge tool integration be enabled? */
--export function enableMergeTool(): boolean {
-+/** Should the repository list display info indicators? */
-+export function enableRepoInfoIndicators(): boolean {
-   return enableDevelopmentFeatures()
- }
-merged
-  result 100644 a696107c681c84a8da5190495b8d23ee51f935e9 app/src/lib/file-system.ts
-  our    100644 185776306e2fc257862b11ad55f92cadb113eb66 app/src/lib/file-system.ts
-@@ -1,4 +1,4 @@
--import * as Fs from 'fs-extra'
-+import * as FSE from 'fs-extra'
- import * as Os from 'os'
- import * as Path from 'path'
- import { Disposable } from 'event-kit'
-@@ -6,63 +6,14 @@
-
- const byline = require('byline')
-
--/** Create directory using basic Fs.mkdir but ignores
-- * the error thrown when directory already exists.
-- * All other errors must be handled by caller.
-- *
-- * @param directoryPath the path of the directory the caller wants to create.
-- */
--export function mkdirIfNeeded(directoryPath: string): Promise<void> {
--  return new Promise<void>((resolve, reject) => {
--    Fs.mkdir(directoryPath, err => {
--      if (err && err.code !== 'EEXIST') {
--        reject(err)
--        return
--      }
--      resolve()
--    })
--  })
--}
--
--/*
-- * Write a file using the standard fs.writeFile API, but wrapped in a promise.
-- *
-- * @param path the path to the file on disk
-- * @param data the contents of the file to write
-- * @param options the default Fs.writeFile options
-- */
--export function writeFile(
--  path: string,
--  data: any,
--  options: { encoding?: string; mode?: number; flag?: string } = {}
--): Promise<void> {
--  return new Promise<void>((resolve, reject) => {
--    Fs.writeFile(path, data, options, err => {
--      if (err) {
--        reject(err)
--      } else {
--        resolve()
--      }
--    })
--  })
--}
--
- /**
-  * Get a path to a temp file using the given name. Note that the file itself
-  * will not be created.
-  */
--export function getTempFilePath(name: string): Promise<string> {
--  return new Promise<string>((resolve, reject) => {
--    const tempDir = Path.join(Os.tmpdir(), `${name}-`)
--    Fs.mkdtemp(tempDir, (err, directory) => {
--      if (err) {
--        reject(err)
--      } else {
--        const fullPath = Path.join(directory, name)
--        resolve(fullPath)
--      }
--    })
--  })
-+export async function getTempFilePath(name: string): Promise<string> {
-+  const tempDir = Path.join(Os.tmpdir(), `${name}-`)
-+  const directory = await FSE.mkdtemp(tempDir)
-+  return Path.join(directory, name)
- }
-
- /**
-@@ -101,23 +52,6 @@
-   })
- }
-
--/*
-- * Helper function to promisify and simplify fs.stat.
-- *
-- * @param path Path to check for existence.
-- */
--export function pathExists(path: string): Promise<boolean> {
--  return new Promise<boolean>((resolve, reject) => {
--    Fs.stat(path, (error, stats) => {
--      if (error) {
--        resolve(false)
--      } else {
--        resolve(true)
--      }
--    })
--  })
--}
--
- /**
-  * Asynchronous readFile - Asynchronously reads the entire contents of a file.
-  *
-@@ -141,7 +75,7 @@
- ): Promise<Buffer | string> {
-   return new Promise<string | Buffer>((resolve, reject) => {
-     options = options || { flag: 'r' }
--    Fs.readFile(filename, options, (err, data) => {
-+    FSE.readFile(filename, options, (err, data) => {
-       if (err) {
-         reject(err)
-       } else {
-@@ -169,7 +103,7 @@
-     const chunks = new Array<Buffer>()
-     let total = 0
-
--    Fs.createReadStream(path, { start, end })
-+    FSE.createReadStream(path, { start, end })
-       .on('data', (chunk: Buffer) => {
-         chunks.push(chunk)
-         total += chunk.length
-merged
-  result 100644 7ade1dfc6be6bbfd8149dfb41a77caded99e26c0 app/src/lib/fuzzy-find.ts
-  our    100644 0eaf1391d7ca722e5bc57bd57cccecc35f68e126 app/src/lib/fuzzy-find.ts
-@@ -12,36 +12,48 @@
-   return fuzzAldrin.score(str, query, undefined, options) / maxScore
- }
-
-+export interface IMatches {
-+  readonly title: ReadonlyArray<number>
-+  readonly subtitle: ReadonlyArray<number>
-+}
-+
- export interface IMatch<T> {
-   /** `0 <= score <= 1` */
-   score: number
-   item: T
--  matches: ReadonlyArray<number>
-+  matches: IMatches
- }
-
--export type KeyFunction<T> = (item: T) => string
-+export type KeyFunction<T> = (item: T) => ReadonlyArray<string>
-
- export function match<T, _K extends keyof T>(
-   query: string,
-   items: ReadonlyArray<T>,
--  getKey: _K | KeyFunction<T>
-+  getKey: KeyFunction<T>
- ): ReadonlyArray<IMatch<T>> {
-   // matching `query` against itself is a perfect match.
-   const maxScore = score(query, query, 1)
-   const result = items
-     .map((item): IMatch<T> => {
--      const key: string =
--        typeof getKey === 'function'
--          ? (getKey as KeyFunction<T>)(item)
--          : String(item[getKey])
-+      const matches: Array<ReadonlyArray<number>> = []
-+      const itemTextArray = getKey(item)
-+      itemTextArray.forEach(text => {
-+        matches.push(fuzzAldrin.match(text, query, undefined, options))
-+      })
-
-       return {
--        score: score(key, query, maxScore),
-+        score: score(itemTextArray.join(''), query, maxScore),
-         item,
--        matches: fuzzAldrin.match(key, query, undefined, options),
-+        matches: {
-+          title: matches[0],
-+          subtitle: matches.length > 1 ? matches[1] : [],
-+        },
-       }
-     })
--    .filter(({ matches }) => matches.length > 0)
-+    .filter(
-+      ({ matches }) => matches.title.length > 0 || matches.subtitle.length > 0
-+    )
-     .sort(({ score: left }, { score: right }) => compareDescending(left, right))
-+
-   return result
- }
-merged
-  result 100644 35f7c40e561385a93aea0741a57c129bf257a68d app/src/lib/git/core.ts
-  our    100644 37970522f470e82f498549b87c8d69c886bf8675 app/src/lib/git/core.ts
-@@ -81,17 +81,17 @@
- /**
-  * Shell out to git with the given arguments, at the given path.
-  *
-- * @param {args}             The arguments to pass to `git`.
-+ * @param args             The arguments to pass to `git`.
-  *
-- * @param {path}             The working directory path for the execution of the
-- *                           command.
-+ * @param path             The working directory path for the execution of the
-+ *                         command.
-  *
-- * @param {name}             The name for the command based on its caller's
-- *                           context. This will be used for performance
-- *                           measurements and debugging.
-+ * @param name             The name for the command based on its caller's
-+ *                         context. This will be used for performance
-+ *                         measurements and debugging.
-  *
-- * @param {options}          Configuration options for the execution of git,
-- *                           see IGitExecutionOptions for more information.
-+ * @param options          Configuration options for the execution of git,
-+ *                         see IGitExecutionOptions for more information.
-  *
-  * Returns the result. If the command exits with a code not in
-  * `successExitCodes` or an error not in `expectedErrors`, a `GitError` will be
-@@ -247,6 +247,14 @@
-       return 'The push was rejected by the remote server because a required status check has not been satisfied.'
-     case DugiteError.BranchRenameFailed:
-       return 'The branch could not be renamed.'
-+    case DugiteError.PathDoesNotExist:
-+      return 'The path does not exist on disk.'
-+    case DugiteError.InvalidObjectName:
-+      return 'The object was not found in the Git repository.'
-+    case DugiteError.OutsideRepository:
-+      return 'This path is not a valid path inside the repository.'
-+    case DugiteError.LockFileAlreadyExists:
-+      return 'A lock file already exists in the repository, which blocks this operation from completing.'
-     default:
-       return assertNever(error, `Unknown error: ${error}`)
-   }
-merged
-  result 100644 9f960230f3855e6a05f0ae2024a119e6bf720a88 app/src/lib/git/description.ts
-  our    100644 0468f171d5553c74bc9196bbd89c240ac253b3d1 app/src/lib/git/description.ts
-@@ -1,5 +1,5 @@
- import * as Path from 'path'
--import * as Fs from 'fs'
-+import * as FSE from 'fs-extra'
-
- const GitDescriptionPath = '.git/description'
-
-@@ -12,22 +12,15 @@
- ): Promise<string> {
-   const path = Path.join(repositoryPath, GitDescriptionPath)
-
--  return new Promise<string>((resolve, reject) => {
--    Fs.readFile(path, 'utf8', (err, data) => {
--      if (err) {
--        /** No .git/description file existed, just return an empty one. */
--        resolve('')
--        return
--      }
--
--      if (data === DefaultGitDescription) {
--        resolve('')
--        return
--      }
--
--      resolve(data)
--    })
--  })
-+  try {
-+    const data = await FSE.readFile(path, 'utf8')
-+    if (data === DefaultGitDescription) {
-+      return ''
-+    }
-+    return data
-+  } catch (err) {
-+    return ''
-+  }
- }
-
- /** Write a .git/description file to the repository. */
-@@ -36,14 +29,5 @@
-   description: string
- ): Promise<void> {
-   const fullPath = Path.join(repositoryPath, GitDescriptionPath)
--
--  return new Promise<void>((resolve, reject) => {
--    Fs.writeFile(fullPath, description, err => {
--      if (err) {
--        reject(err)
--      } else {
--        resolve()
--      }
--    })
--  })
-+  await FSE.writeFile(fullPath, description)
- }
-merged
-  result 100644 c7b70925514f334e2076ddb67f208c2f3f12672f app/src/lib/git/diff.ts
-  our    100644 be540d047988bd54344edfed49aa5e5ad2a4ae52 app/src/lib/git/diff.ts
-@@ -44,7 +44,7 @@
-  * The longest line length we should try to display. If a diff has a line longer
-  * than this, we probably shouldn't attempt it
-  */
--const MaxLineLength = 500000
-+const MaxCharactersPerLine = 5000
-
- /**
-  * Utility function to check whether parsing this buffer is going to cause
-@@ -65,7 +65,7 @@
- function isDiffTooLarge(diff: IRawDiff) {
-   for (const hunk of diff.hunks) {
-     for (const line of hunk.lines) {
--      if (line.text.length > MaxLineLength) {
-+      if (line.text.length > MaxCharactersPerLine) {
-         return true
-       }
-     }
-@@ -84,6 +84,7 @@
-   '.gif',
-   '.ico',
-   '.webp',
-+  '.bmp',
- ])
-
- /**
-@@ -267,9 +268,9 @@
-   commitish: string,
-   lineEndingsChange?: LineEndingsChange
- ): Promise<IDiff> {
--  if (diff.isBinary) {
--    const extension = Path.extname(file.path)
-+  const extension = Path.extname(file.path).toLowerCase()
-
-+  if (diff.isBinary) {
-     // some extension we don't know how to parse, never mind
-     if (!imageFileExtensions.has(extension)) {
-       return {
-@@ -307,6 +308,9 @@
-   if (extension === '.webp') {
-     return 'image/webp'
-   }
-+  if (extension === '.bmp') {
-+    return 'image/bmp'
-+  }
-
-   // fallback value as per the spec
-   return 'text/plain'
-@@ -405,7 +409,11 @@
- ): Promise<Image> {
-   const extension = Path.extname(path)
-   const contents = await getBlobContents(repository, commitish, path)
--  return new Image(contents.toString('base64'), getMediaType(extension))
-+  return new Image(
-+    contents.toString('base64'),
-+    getMediaType(extension),
-+    contents.length
-+  )
- }
- /**
-  * Retrieve the binary contents of a blob from the working directory
-@@ -425,6 +433,7 @@
-   )
-   return new Image(
-     contents.toString('base64'),
--    getMediaType(Path.extname(file.path))
-+    getMediaType(Path.extname(file.path)),
-+    contents.length
-   )
- }
-merged
-  result 100644 fe76c1c138388cc995fcb26283c9619d2c47cdf2 app/src/lib/git/index.ts
-  our    100644 e5cb2e11f5be7e44292fa768f1971cca56b88440 app/src/lib/git/index.ts
-@@ -5,6 +5,7 @@
- export * from './commit'
- export * from './config'
- export * from './core'
-+export * from './description'
- export * from './diff'
- export * from './fetch'
- export * from './for-each-ref'
-merged
-  result 100644 b5ff0aa56eda967e9740dce0effc2d759c248634 app/src/lib/git/refs.ts
-  our    100644 4227634cb2503fed378f64d1e28ff7f41216f944 app/src/lib/git/refs.ts
-@@ -1,3 +1,6 @@
-+import { git } from './core'
-+import { Repository } from '../../models/repository'
-+
- /**
-  * Format a local branch in the ref syntax, ensuring situations when the branch
-  * is ambiguous are handled.
-@@ -19,3 +22,37 @@
-     return `refs/heads/${name}`
-   }
- }
-+
-+/**
-+ * Read a symbolic ref from the repository.
-+ *
-+ * Symbolic refs are used to point to other refs, similar to how symlinks work
-+ * for files. Because refs can be removed easily from a Git repository,
-+ * symbolic refs should only be used when absolutely necessary.
-+ *
-+ * @param repository The repository to lookup
-+ * @param ref The symbolic ref to resolve
-+ *
-+ * @returns the canonical ref, if found, or `null` if `ref` cannot be found or
-+ *          is not a symbolic ref
-+ */
-+export async function getSymbolicRef(
-+  repository: Repository,
-+  ref: string
-+): Promise<string | null> {
-+  const result = await git(
-+    ['symbolic-ref', '-q', ref],
-+    repository.path,
-+    'getSymbolicRef',
-+    {
-+      successExitCodes: new Set([0, 128]),
-+    }
-+  )
-+
-+  if (result.exitCode === 128) {
-+    // ref was not a symbolic ref or ref does not exist
-+    return null
-+  }
-+
-+  return result.stdout.trim()
-+}
-merged
-  result 100644 3f1e4abe01f964c4aa4b46ec41185ef132ec2c8a app/src/lib/git/rev-list.ts
-  our    100644 ce2b9ab3f38d37bcf3a74d6bb159ef3ab0257083 app/src/lib/git/rev-list.ts
-@@ -1,12 +1,36 @@
- import { GitError } from 'dugite'
- import { git } from './core'
- import { Repository } from '../../models/repository'
--import { Branch, BranchType } from '../../models/branch'
-+import { Branch, BranchType, IAheadBehind } from '../../models/branch'
-
--/** The number of commits a revision range is ahead/behind. */
--export interface IAheadBehind {
--  readonly ahead: number
--  readonly behind: number
-+/**
-+ * Convert two refs into the Git range syntax representing the set of commits
-+ * that are reachable from `to` but excluding those that are reachable from
-+ * `from`.
-+ *
-+ * Each parameter can be the commit SHA or a ref name, or specify an empty
-+ * string to represent HEAD.
-+ *
-+ * @param from The start of the range
-+ * @param to The end of the range
-+ */
-+export function revRange(from: string, to: string) {
-+  return `${from}..${to}`
-+}
-+
-+/**
-+ * Convert two refs into the Git symmetric difference syntax, which represents
-+ * the set of commits that are reachable from either `from` or `to` but not
-+ * from both.
-+ *
-+ * Each parameter can be the commit SHA or a ref name, or you can use an empty
-+ * string to represent HEAD.
-+ *
-+ * @param from The start of the range
-+ * @param to The end of the range
-+ */
-+export function revSymmetricDifference(from: string, to: string) {
-+  return `${from}...${to}`
- }
-
- /** Calculate the number of commits the range is ahead and behind. */
-@@ -64,6 +88,6 @@
-   // NB: The three dot form means we'll go all the way back to the merge base
-   // of the branch and its upstream. Practically this is important for seeing
-   // "through" merges.
--  const range = `${branch.name}...${upstream}`
-+  const range = revSymmetricDifference(branch.name, upstream)
-   return getAheadBehind(repository, range)
- }
-merged
-  result 100644 bc5a94f3cc8efd6c3f497b96d1379064021f0ced app/src/lib/git/status.ts
-  our    100644 886824ef09bccde31746939b3ad97e2d993918d7 app/src/lib/git/status.ts
-@@ -9,7 +9,7 @@
- import { parsePorcelainStatus, mapStatus } from '../status-parser'
- import { DiffSelectionType, DiffSelection } from '../../models/diff'
- import { Repository } from '../../models/repository'
--import { IAheadBehind } from './rev-list'
-+import { IAheadBehind } from '../../models/branch'
- import { fatalError } from '../../lib/fatal-error'
-
- /** The encapsulation of the result from 'git status' */
-@@ -62,7 +62,9 @@
-     'getStatus'
-   )
-
--  const files = new Array<WorkingDirectoryFileChange>()
-+  // Map of files keyed on their paths.
-+  // Note, map maintains insertion order
-+  const files = new Map<string, WorkingDirectoryFileChange>()
-
-   let currentBranch: string | undefined = undefined
-   let currentUpstreamBranch: string | undefined = undefined
-@@ -90,10 +92,7 @@
-         // same path, we should ensure that we only draw one entry in the
-         // changes list - see if an entry already exists for this path and
-         // remove it if found
--        const existingEntry = files.findIndex(p => p.path === entry.path)
--        if (existingEntry > -1) {
--          files.splice(existingEntry, 1)
--        }
-+        files.delete(entry.path)
-       }
-
-       // for now we just poke at the existing summary
-@@ -102,7 +101,8 @@
-         DiffSelectionType.All
-       )
-
--      files.push(
-+      files.set(
-+        entry.path,
-         new WorkingDirectoryFileChange(
-           entry.path,
-           summary,
-@@ -134,7 +134,7 @@
-     }
-   }
-
--  const workingDirectory = WorkingDirectoryStatus.fromFiles(files)
-+  const workingDirectory = WorkingDirectoryStatus.fromFiles([...files.values()])
-
-   return {
-     currentBranch,
-merged
-  result 100644 497889aae05c2de60409b2354678563f32994314 app/src/lib/git/submodule.ts
-  our    100644 964fa04fb165bbe2e1bd2628840922ade9b86fd6 app/src/lib/git/submodule.ts
-@@ -1,8 +1,9 @@
-+import * as Path from 'path'
-+import { pathExists } from 'fs-extra'
-+
- import { git } from './core'
- import { Repository } from '../../models/repository'
- import { SubmoduleEntry } from '../../models/submodule'
--import { pathExists } from '../file-system'
--import * as Path from 'path'
-
- export async function listSubmodules(
-   repository: Repository
-merged
-  result 100644 efb13fb0c1c8db7af2da3feffa6157cdfcffc386 app/src/lib/is-git-on-path.ts
-  our    100644 25f5e58c8ceb7199146a603c42fbb7d88e6c431c app/src/lib/is-git-on-path.ts
-@@ -5,14 +5,13 @@
-   // Modern versions of macOS ship with a Git shim that guides you through
-   // the process of setting everything up. We trust this is available, so
-   // don't worry about looking for it here.
--  // I decide linux user have git too :)
--  if (__DARWIN__ || __LINUX__) {
-+  if (__DARWIN__) {
-     return Promise.resolve(true)
-   }
-
-   // adapted from http://stackoverflow.com/a/34953561/1363815
--  return new Promise<boolean>((resolve, reject) => {
--    if (__WIN32__) {
-+  if (__WIN32__) {
-+    return new Promise<boolean>((resolve, reject) => {
-       const windowsRoot = process.env.SystemRoot || 'C:\\Windows'
-       const wherePath = Path.join(windowsRoot, 'System32', 'where.exe')
-
-@@ -29,9 +28,20 @@
-         resolve(code === 0)
-       })
-       return
--    }
-+    })
-+  }
-+
-+  if (__LINUX__) {
-+    return new Promise<boolean>((resolve, reject) => {
-+      const process = spawn('which', ['git'])
-+
-+      // `which` will return 0 when the executable
-+      // is found under PATH, or 1 if it cannot be found
-+      process.on('close', function(code) {
-+        resolve(code === 0)
-+      })
-+    })
-+  }
-
--    // in case you're on a non-Windows/non-macOS platform
--    resolve(false)
--  })
-+  return Promise.resolve(false)
- }
-merged
-  result 100644 d50be352ff1adc2c799a3f53fd983a2cdcbaa735 app/src/lib/menu-update.ts
-  our    100644 a12e7bdd46fd140f6b2b7ad6b947c9f93f2450b8 app/src/lib/menu-update.ts
-@@ -104,7 +104,7 @@
-   'update-branch',
-   'merge-branch',
-   'view-repository-on-github',
--  'compare-branch',
-+  'compare-on-github',
-   'open-in-shell',
-   'push',
-   'pull',
-@@ -200,6 +200,7 @@
-     'show-history',
-     'show-branches-list',
-     'open-external-editor',
-+    'compare-to-branch',
-   ]
-
-   const menuStateBuilder = new MenuStateBuilder()
-@@ -227,7 +228,7 @@
-     )
-     menuStateBuilder.setEnabled('merge-branch', onBranch)
-     menuStateBuilder.setEnabled(
--      'compare-branch',
-+      'compare-on-github',
-       isHostedOnGitHub && hasPublishedBranch
-     )
-
-@@ -278,10 +279,10 @@
-     menuStateBuilder.disable('delete-branch')
-     menuStateBuilder.disable('update-branch')
-     menuStateBuilder.disable('merge-branch')
--    menuStateBuilder.disable('compare-branch')
-
-     menuStateBuilder.disable('push')
-     menuStateBuilder.disable('pull')
-+    menuStateBuilder.disable('compare-to-branch')
-   }
-   return menuStateBuilder
- }
-merged
-  result 100644 b9e38022ccb3b75ba35fc496a1e77a8857d825f6 app/src/lib/parse-app-url.ts
-  our    100644 e01d63715d1d361dacd2f6a1fa3c1ff44ff12eb4 app/src/lib/parse-app-url.ts
-@@ -13,13 +13,13 @@
-   readonly url: string
-
-   /** the optional branch name which should be checked out. use the default branch otherwise. */
--  readonly branch?: string
-+  readonly branch: string | null
-
-   /** the pull request number, if pull request originates from a fork of the repository */
--  readonly pr?: string
-+  readonly pr: string | null
-
-   /** the file to open after cloning the repository */
--  readonly filepath?: string
-+  readonly filepath: string | null
- }
-
- export interface IOpenRepositoryFromPathAction {
-@@ -40,6 +40,36 @@
-   | IOpenRepositoryFromPathAction
-   | IUnknownAction
-
-+// eslint-disable-next-line typescript/interface-name-prefix
-+interface ParsedUrlQueryWithUndefined {
-+  // `undefined` is added here to ensure we handle the missing querystring key
-+  // See https://github.com/Microsoft/TypeScript/issues/13778 for discussion about
-+  // why this isn't supported natively in TypeScript
-+  [key: string]: string | string[] | undefined
-+}
-+
-+/**
-+ * Parse the URL to find a given key in the querystring text.
-+ *
-+ * @param url The source URL containing querystring key-value pairs
-+ * @param key The key to look for in the querystring
-+ */
-+function getQueryStringValue(
-+  query: ParsedUrlQueryWithUndefined,
-+  key: string
-+): string | null {
-+  const value = query[key]
-+  if (value == null) {
-+    return null
-+  }
-+
-+  if (Array.isArray(value)) {
-+    return value[0]
-+  }
-+
-+  return value
-+}
-+
- export function parseAppURL(url: string): URLActionType {
-   const parsedURL = URL.parse(url, true)
-   const hostname = parsedURL.hostname
-@@ -48,9 +78,16 @@
-     return unknown
-   }
-
-+  const query = parsedURL.query
-+
-   const actionName = hostname.toLowerCase()
-   if (actionName === 'oauth') {
--    return { name: 'oauth', code: parsedURL.query.code }
-+    const code = getQueryStringValue(query, 'code')
-+    if (code != null) {
-+      return { name: 'oauth', code }
-+    } else {
-+      return unknown
-+    }
-   }
-
-   // we require something resembling a URL first
-@@ -70,28 +107,23 @@
-     // suffix the remote URL with `.git`, for backwards compatibility
-     const url = `${probablyAURL}.git`
-
--    const queryString = parsedURL.query
-+    const pr = getQueryStringValue(query, 'pr')
-+    const branch = getQueryStringValue(query, 'branch')
-+    const filepath = getQueryStringValue(query, 'filepath')
-
--    const pr = queryString.pr
--    const branch = queryString.branch
--    const filepath = queryString.filepath
--
--    if (pr) {
--      // if anything other than a number is used for the PR value, exit
-+    if (pr != null) {
-       if (!/^\d+$/.test(pr)) {
-         return unknown
-       }
-
-       // we also expect the branch for a forked PR to be a given ref format
--      if (!/^pr\/\d+$/.test(branch)) {
-+      if (branch != null && !/^pr\/\d+$/.test(branch)) {
-         return unknown
-       }
-     }
-
--    if (branch) {
--      if (testForInvalidChars(branch)) {
--        return unknown
--      }
-+    if (branch != null && testForInvalidChars(branch)) {
-+      return unknown
-     }
-
-     return {
-added in remote
-  their  100644 e53daf16a90439aa5a1aa9c6a1c5736f39274eda app/src/lib/process/win32.ts
-@@ -0,0 +1,90 @@
-+import { spawn as spawnInternal } from 'child_process'
-+import * as Path from 'path'
-+
-+/** Get the path segments in the user's `Path`. */
-+export async function getPathSegments(): Promise<ReadonlyArray<string>> {
-+  let powershellPath: string
-+  const systemRoot = process.env.SystemRoot
-+  if (systemRoot != null) {
-+    const system32Path = Path.join(systemRoot, 'System32')
-+    powershellPath = Path.join(
-+      system32Path,
-+      'WindowsPowerShell',
-+      'v1.0',
-+      'powershell.exe'
-+    )
-+  } else {
-+    powershellPath = 'powershell.exe'
-+  }
-+
-+  const args = [
-+    '-noprofile',
-+    '-ExecutionPolicy',
-+    'RemoteSigned',
-+    '-command',
-+    // Set encoding and execute the command, capture the output, and return it
-+    // via .NET's console in order to have consistent UTF-8 encoding.
-+    // See http://stackoverflow.com/questions/22349139/utf-8-output-from-powershell
-+    // to address https://github.com/atom/atom/issues/5063
-+    `
-+      [Console]::OutputEncoding=[System.Text.Encoding]::UTF8
-+      $output=[environment]::GetEnvironmentVariable('Path', 'User')
-+      [Console]::WriteLine($output)
-+    `,
-+  ]
-+
-+  const stdout = await spawn(powershellPath, args)
-+  const pathOutput = stdout.replace(/^\s+|\s+$/g, '')
-+  return pathOutput.split(/;+/).filter(segment => segment.length)
-+}
-+
-+/** Set the user's `Path`. */
-+export async function setPathSegments(
-+  paths: ReadonlyArray<string>
-+): Promise<void> {
-+  let setxPath: string
-+  const systemRoot = process.env['SystemRoot']
-+  if (systemRoot) {
-+    const system32Path = Path.join(systemRoot, 'System32')
-+    setxPath = Path.join(system32Path, 'setx.exe')
-+  } else {
-+    setxPath = 'setx.exe'
-+  }
-+
-+  await spawn(setxPath, ['Path', paths.join(';')])
-+}
-+
-+/** Spawn a command with arguments and capture its output. */
-+export function spawn(
-+  command: string,
-+  args: ReadonlyArray<string>
-+): Promise<string> {
-+  try {
-+    const child = spawnInternal(command, args as string[])
-+    return new Promise<string>((resolve, reject) => {
-+      let stdout = ''
-+      child.stdout.on('data', data => {
-+        stdout += data
-+      })
-+
-+      child.on('close', code => {
-+        if (code === 0) {
-+          resolve(stdout)
-+        } else {
-+          reject(new Error(`Command "${command} ${args}" failed: "${stdout}"`))
-+        }
-+      })
-+
-+      child.on('error', (err: Error) => {
-+        reject(err)
-+      })
-+
-+      // This is necessary if using Powershell 2 on Windows 7 to get the events
-+      // to raise.
-+      // See http://stackoverflow.com/questions/9155289/calling-powershell-from-nodejs
-+      child.stdin.end()
-+    })
-+  } catch (error) {
-+    return Promise.reject(error)
-+  }
-+}
-merged
-  result 100644 f3e30a75fd83483f4729f3239ffd2bf3b780a7fd app/src/lib/progress/from-process.ts
-  our    100644 574666eff35b9d7681971fbb405c2bac00c106a0 app/src/lib/progress/from-process.ts
-@@ -1,5 +1,6 @@
- import { ChildProcess } from 'child_process'
- import * as Fs from 'fs'
-+import * as Path from 'path'
- import * as byline from 'byline'
-
- import { GitProgressParser, IGitProgress, IGitOutput } from './git'
-@@ -23,8 +24,13 @@
-   let lfsProgressPath = null
-   let env = {}
-   if (options.trackLFSProgress) {
--    lfsProgressPath = await createLFSProgressFile()
--    env = { GIT_LFS_PROGRESS: lfsProgressPath }
-+    try {
-+      lfsProgressPath = await createLFSProgressFile()
-+      env = { GIT_LFS_PROGRESS: lfsProgressPath }
-+    } catch (e) {
-+      log.error('Error writing LFS progress file', e)
-+      env = { GIT_LFS_PROGRESS: null }
-+    }
-   }
-
-   return merge(options, {
-@@ -57,9 +63,17 @@
-
-       process.on('close', () => {
-         disposable.dispose()
--        // NB: We don't really care about errors deleting the file, but Node
--        // gets kinda bothered if we don't provide a callback.
--        Fs.unlink(lfsProgressPath, () => {})
-+        // the order of these callbacks is important because
-+        //  - unlink can only be done on files
-+        //  - rmdir can only be done when the directory is empty
-+        //  - we don't want to surface errors to the user if something goes
-+        //    wrong (these files can stay in TEMP and be cleaned up eventually)
-+        Fs.unlink(lfsProgressPath, err => {
-+          if (err == null) {
-+            const directory = Path.dirname(lfsProgressPath)
-+            Fs.rmdir(directory, () => {})
-+          }
-+        })
-       })
-     }
-
-merged
-  result 100644 466a25723137239fd49be2906d25e300ad5fa913 app/src/lib/progress/lfs.ts
-  our    100644 3b054c35fb65185af0628abc0d445ae6a1296b30 app/src/lib/progress/lfs.ts
-@@ -1,19 +1,12 @@
--import * as Fs from 'fs'
-+import * as FSE from 'fs-extra'
- import { getTempFilePath } from '../file-system'
- import { IGitProgress, IGitProgressInfo, IGitOutput } from './git'
-
- /** Create the Git LFS progress reporting file and return the path. */
- export async function createLFSProgressFile(): Promise<string> {
-   const path = await getTempFilePath('GitHubDesktop-lfs-progress')
--  return new Promise<string>((resolve, reject) => {
--    Fs.writeFile(path, '', err => {
--      if (err) {
--        reject(err)
--      } else {
--        resolve(path)
--      }
--    })
--  })
-+  await FSE.ensureFile(path)
-+  return path
- }
-
- // The regex for parsing LFS progress lines. See
-merged
-  result 100644 df0a7f7ff234a7c89d0b2480c70661b30e5d90bd app/src/lib/remote-parsing.ts
-  our    100644 21114f701d33070680ccedbfcbd4b563dd3117cc app/src/lib/remote-parsing.ts
-@@ -1,4 +1,8 @@
-+type Protocol = 'ssh' | 'https'
-+
- interface IGitRemoteURL {
-+  readonly protocol: Protocol
-+
-   /** The hostname of the remote. */
-   readonly hostname: string
-
-@@ -15,21 +19,33 @@
-   readonly name: string | null
- }
-
-+// Examples:
-+// https://github.com/octocat/Hello-World.git
-+// https://github.com/octocat/Hello-World.git/
-+// git@github.com:octocat/Hello-World.git
-+// git:github.com/octocat/Hello-World.git
-+const remoteRegexes: ReadonlyArray<{ protocol: Protocol; regex: RegExp }> = [
-+  {
-+    protocol: 'https',
-+    regex: new RegExp('^https?://(?:.+@)?(.+)/(.+)/(.+?)(?:/|.git/?)?$'),
-+  },
-+  {
-+    protocol: 'ssh',
-+    regex: new RegExp('^git@(.+):(.+)/(.+?)(?:/|.git)?$'),
-+  },
-+  {
-+    protocol: 'ssh',
-+    regex: new RegExp('^git:(.+)/(.+)/(.+?)(?:/|.git)?$'),
-+  },
-+  {
-+    protocol: 'ssh',
-+    regex: new RegExp('^ssh://git@(.+)/(.+)/(.+?)(?:/|.git)?$'),
-+  },
-+]
-+
- /** Parse the remote information from URL. */
- export function parseRemote(url: string): IGitRemoteURL | null {
--  // Examples:
--  // https://github.com/octocat/Hello-World.git
--  // https://github.com/octocat/Hello-World.git/
--  // git@github.com:octocat/Hello-World.git
--  // git:github.com/octocat/Hello-World.git
--  const regexes = [
--    new RegExp('^https?://(?:.+@)?(.+)/(.+)/(.+?)(?:/|.git/?)?$'),
--    new RegExp('^git@(.+):(.+)/(.+?)(?:/|.git)?$'),
--    new RegExp('^git:(.+)/(.+)/(.+?)(?:/|.git)?$'),
--    new RegExp('^ssh://git@(.+)/(.+)/(.+?)(?:/|.git)?$'),
--  ]
--
--  for (const regex of regexes) {
-+  for (const { protocol, regex } of remoteRegexes) {
-     const result = url.match(regex)
-     if (!result) {
-       continue
-@@ -39,7 +55,7 @@
-     const owner = result[2]
-     const name = result[3]
-     if (hostname) {
--      return { hostname, owner, name }
-+      return { protocol, hostname, owner, name }
-     }
-   }
-
-merged
-  result 100644 63d2fe120af3eaaafc7fe69f833f40cd5e6b477e app/src/lib/shells/darwin.ts
-  our    100644 00a9aa293632a29b5bd02d296907bf9cdb3ffde5 app/src/lib/shells/darwin.ts
-@@ -8,6 +8,7 @@
-   Terminal = 'Terminal',
-   Hyper = 'Hyper',
-   iTerm2 = 'iTerm2',
-+  PowerShellCore = 'PowerShell Core',
- }
-
- export const Default = Shell.Terminal
-@@ -25,6 +26,10 @@
-     return Shell.iTerm2
-   }
-
-+  if (label === Shell.PowerShellCore) {
-+    return Shell.PowerShellCore
-+  }
-+
-   return Default
- }
-
-@@ -36,6 +41,8 @@
-       return 'com.googlecode.iterm2'
-     case Shell.Hyper:
-       return 'co.zeit.hyper'
-+    case Shell.PowerShellCore:
-+      return 'com.microsoft.powershell'
-     default:
-       return assertNever(shell, `Unknown shell: ${shell}`)
-   }
-@@ -54,10 +61,16 @@
- export async function getAvailableShells(): Promise<
-   ReadonlyArray<IFoundShell<Shell>>
- > {
--  const [terminalPath, hyperPath, iTermPath] = await Promise.all([
-+  const [
-+    terminalPath,
-+    hyperPath,
-+    iTermPath,
-+    powerShellCorePath,
-+  ] = await Promise.all([
-     getShellPath(Shell.Terminal),
-     getShellPath(Shell.Hyper),
-     getShellPath(Shell.iTerm2),
-+    getShellPath(Shell.PowerShellCore),
-   ])
-
-   const shells: Array<IFoundShell<Shell>> = []
-@@ -73,6 +86,10 @@
-     shells.push({ shell: Shell.iTerm2, path: iTermPath })
-   }
-
-+  if (powerShellCorePath) {
-+    shells.push({ shell: Shell.PowerShellCore, path: powerShellCorePath })
-+  }
-+
-   return shells
- }
-
-merged
-  result 100644 afc28e5ff68afd9388d5e17690d30eccc4ac1b75 app/src/lib/shells/linux.ts
-  our    100644 d1effa798ba21a6f706771f25cd9dfb957f0c7d0 app/src/lib/shells/linux.ts
-@@ -1,5 +1,5 @@
- import { spawn, ChildProcess } from 'child_process'
--import { pathExists } from '../file-system'
-+import { pathExists } from 'fs-extra'
- import { assertNever } from '../fatal-error'
- import { IFoundShell } from './found-shell'
-
-merged
-  result 100644 0fef473ed40b7b043f025d9677ebb724939d0a8f app/src/lib/shells/shared.ts
-  our    100644 bc82735e7a7928d8280b488af550e97acbe8ab65 app/src/lib/shells/shared.ts
-@@ -1,9 +1,9 @@
- import { ChildProcess } from 'child_process'
-+import { pathExists } from 'fs-extra'
-
- import * as Darwin from './darwin'
- import * as Win32 from './win32'
- import * as Linux from './linux'
--import { pathExists } from '../file-system'
- import { IFoundShell } from './found-shell'
- import { ShellError } from './error'
-
-merged
-  result 100644 9bfcb28a39ebb3d774a2995d510e3a4ece676b3a app/src/lib/shells/win32.ts
-  our    100644 94056bbd3c70887c371b620f95e77efeafb04518 app/src/lib/shells/win32.ts
-@@ -1,14 +1,15 @@
- import { spawn, ChildProcess } from 'child_process'
- import * as Path from 'path'
- import { enumerateValues, HKEY, RegistryValueType } from 'registry-js'
-+import { pathExists } from 'fs-extra'
-
--import { pathExists } from '../file-system'
- import { assertNever } from '../fatal-error'
- import { IFoundShell } from './found-shell'
-
- export enum Shell {
-   Cmd = 'Command Prompt',
-   PowerShell = 'PowerShell',
-+  PowerShellCore = 'PowerShell Core',
-   Hyper = 'Hyper',
-   GitBash = 'Git Bash',
- }
-@@ -24,6 +25,10 @@
-     return Shell.PowerShell
-   }
-
-+  if (label === Shell.PowerShellCore) {
-+    return Shell.PowerShellCore
-+  }
-+
-   if (label === Shell.Hyper) {
-     return Shell.Hyper
-   }
-@@ -53,6 +58,14 @@
-     })
-   }
-
-+  const powerShellCorePath = await findPowerShellCore()
-+  if (powerShellCorePath != null) {
-+    shells.push({
-+      shell: Shell.PowerShellCore,
-+      path: powerShellCorePath,
-+    })
-+  }
-+
-   const hyperPath = await findHyper()
-   if (hyperPath != null) {
-     shells.push({
-@@ -111,6 +124,32 @@
-   return null
- }
-
-+async function findPowerShellCore(): Promise<string | null> {
-+  const powerShellCore = enumerateValues(
-+    HKEY.HKEY_LOCAL_MACHINE,
-+    'Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\pwsh.exe'
-+  )
-+
-+  if (powerShellCore.length === 0) {
-+    return null
-+  }
-+
-+  const first = powerShellCore[0]
-+  if (first.type === RegistryValueType.REG_SZ) {
-+    const path = first.data
-+
-+    if (await pathExists(path)) {
-+      return path
-+    } else {
-+      log.debug(
-+        `[PowerShellCore] registry entry found but does not exist at '${path}'`
-+      )
-+    }
-+  }
-+
-+  return null
-+}
-+
- async function findHyper(): Promise<string | null> {
-   const hyper = enumerateValues(
-     HKEY.HKEY_CURRENT_USER,
-@@ -128,11 +167,19 @@
-     // This regex is designed to get the path to the version-specific Hyper.
-     // commandPieces = ['"{installationPath}\app-x.x.x\Hyper.exe"', '"', '{installationPath}\app-x.x.x\Hyper.exe', ...]
-     const commandPieces = first.data.match(/(["'])(.*?)\1/)
-+    const localAppData = process.env.LocalAppData
-+
-     const path = commandPieces
-       ? commandPieces[2]
--      : process.env.LocalAppData.concat('\\hyper\\Hyper.exe') // fall back to the launcher in install root
-+      : localAppData != null
-+        ? localAppData.concat('\\hyper\\Hyper.exe')
-+        : null // fall back to the launcher in install root
-
--    if (await pathExists(path)) {
-+    if (path == null) {
-+      log.debug(
-+        `[Hyper] LOCALAPPDATA environment variable is unset, aborting fallback behavior`
-+      )
-+    } else if (await pathExists(path)) {
-       return path
-     } else {
-       log.debug(`[Hyper] registry entry found but does not exist at '${path}'`)
-@@ -181,6 +228,12 @@
-         shell: true,
-         cwd: path,
-       })
-+    case Shell.PowerShellCore:
-+      const psCoreCommand = `"Set-Location -LiteralPath '${path}'"`
-+      return spawn('START', ['pwsh', '-NoExit', '-Command', psCoreCommand], {
-+        shell: true,
-+        cwd: path,
-+      })
-     case Shell.Hyper:
-       const hyperPath = `"${foundShell.path}"`
-       log.info(`launching ${shell} at path: ${hyperPath}`)
-merged
-  result 100644 1a92eadda10120ed9ba6bec97c2fc0a752509fc2 app/src/lib/stats/stats-database.ts
-  our    100644 7911de79718900503165ac9ef13670da8c71cdc5 app/src/lib/stats/stats-database.ts
-@@ -40,6 +40,47 @@
-
-   /** The number of commits created with one or more co-authors. */
-   readonly coAuthoredCommits: number
-+
-+  /** The number of times a branch is compared to an arbitrary branch */
-+  readonly branchComparisons: number
-+
-+  /** The number of times a branch is compared to `master` */
-+  readonly defaultBranchComparisons: number
-+
-+  /** The number of times a merge is initiated in the `compare` sidebar */
-+  readonly mergesInitiatedFromComparison: number
-+
-+  /** The number of times the `Branch -> Update From Default Branch` menu item is used */
-+  readonly updateFromDefaultBranchMenuCount: number
-+
-+  /** The number of times the `Branch -> Merge Into Current Branch` menu item is used */
-+  readonly mergeIntoCurrentBranchMenuCount: number
-+
-+  /** The number of times the user checks out a branch using the PR menu */
-+  readonly prBranchCheckouts: number
-+
-+  /** The numbers of times a repo with indicators is clicked on repo list view */
-+  readonly repoWithIndicatorClicked: number
-+  /** The numbers of times a repo without indicators is clicked on repo list view */
-+  readonly repoWithoutIndicatorClicked: number
-+
-+  /** The number of times the user dismisses the diverged branch notification */
-+  readonly divergingBranchBannerDismissal: number
-+
-+  /** The number of times the user merges from the diverged branch notification merge CTA button */
-+  readonly divergingBranchBannerInitatedMerge: number
-+
-+  /** The number of times the user compares from the diverged branch notification compare CTA button */
-+  readonly divergingBranchBannerInitiatedCompare: number
-+
-+  /**
-+   * The number of times the user merges from the compare view after getting to that state
-+   * from the diverged branch notification compare CTA button
-+   */
-+  readonly divergingBranchBannerInfluencedMerge: number
-+
-+  /** The number of times the diverged branch notification is displayed */
-+  readonly divergingBranchBannerDisplayed: number
- }
-
- export class StatsDatabase extends Dexie {
-merged
-  result 100644 3866dcb7f85658b385e8d34e610a3f2321d9fbd8 app/src/lib/stats/stats-store.ts
-  our    100644 10e9a39560a0f09260217f2d9e598e9bbaf63613 app/src/lib/stats/stats-store.ts
-@@ -7,6 +7,7 @@
- import { getGUID } from './get-guid'
- import { Repository } from '../../models/repository'
- import { merge } from '../../lib/merge'
-+import { getPersistedThemeName } from '../../ui/lib/application-theme'
-
- const StatsEndpoint = 'https://central.github.com/api/usage/desktop'
-
-@@ -29,6 +30,19 @@
-   partialCommits: 0,
-   openShellCount: 0,
-   coAuthoredCommits: 0,
-+  branchComparisons: 0,
-+  defaultBranchComparisons: 0,
-+  mergesInitiatedFromComparison: 0,
-+  updateFromDefaultBranchMenuCount: 0,
-+  mergeIntoCurrentBranchMenuCount: 0,
-+  prBranchCheckouts: 0,
-+  repoWithIndicatorClicked: 0,
-+  repoWithoutIndicatorClicked: 0,
-+  divergingBranchBannerDismissal: 0,
-+  divergingBranchBannerInitatedMerge: 0,
-+  divergingBranchBannerInitiatedCompare: 0,
-+  divergingBranchBannerInfluencedMerge: 0,
-+  divergingBranchBannerDisplayed: 0,
- }
-
- interface ICalculatedStats {
-@@ -56,6 +70,12 @@
-   /** Is the user logged in with an Enterprise account? */
-   readonly enterpriseAccount: boolean
-
-+  /**
-+   * The name of the currently selected theme/application
-+   * appearance as set at time of stats submission.
-+   */
-+  readonly theme: string
-+
-   readonly eventType: 'usage'
- }
-
-@@ -171,6 +191,7 @@
-       version: getVersion(),
-       osVersion: getOS(),
-       platform: process.platform,
-+      theme: getPersistedThemeName(),
-       ...launchStats,
-       ...dailyMeasures,
-       ...userType,
-@@ -294,6 +315,59 @@
-     }))
-   }
-
-+  /** Record that a branch comparison has been made */
-+  public recordBranchComparison(): Promise<void> {
-+    return this.updateDailyMeasures(m => ({
-+      branchComparisons: m.branchComparisons + 1,
-+    }))
-+  }
-+
-+  /** Record that a branch comparison has been made to the `master` branch */
-+  public recordDefaultBranchComparison(): Promise<void> {
-+    return this.updateDailyMeasures(m => ({
-+      defaultBranchComparisons: m.defaultBranchComparisons + 1,
-+    }))
-+  }
-+
-+  /** Record that a merge has been initiated from the `compare` sidebar */
-+  public recordCompareInitiatedMerge(): Promise<void> {
-+    return this.updateDailyMeasures(m => ({
-+      mergesInitiatedFromComparison: m.mergesInitiatedFromComparison + 1,
-+    }))
-+  }
-+
-+  /** Record that a merge has been initiated from the `Branch -> Update From Default Branch` menu item */
-+  public recordMenuInitiatedUpdate(): Promise<void> {
-+    return this.updateDailyMeasures(m => ({
-+      updateFromDefaultBranchMenuCount: m.updateFromDefaultBranchMenuCount + 1,
-+    }))
-+  }
-+
-+  /** Record that a merge has been initiated from the `Branch -> Merge Into Current Branch` menu item */
-+  public recordMenuInitiatedMerge(): Promise<void> {
-+    return this.updateDailyMeasures(m => ({
-+      mergeIntoCurrentBranchMenuCount: m.mergeIntoCurrentBranchMenuCount + 1,
-+    }))
-+  }
-+
-+  /** Record that the user checked out a PR branch */
-+  public recordPRBranchCheckout(): Promise<void> {
-+    return this.updateDailyMeasures(m => ({
-+      prBranchCheckouts: m.prBranchCheckouts + 1,
-+    }))
-+  }
-+
-+  public recordRepoClicked(repoHasIndicator: boolean): Promise<void> {
-+    if (repoHasIndicator) {
-+      return this.updateDailyMeasures(m => ({
-+        repoWithIndicatorClicked: m.repoWithIndicatorClicked + 1,
-+      }))
-+    }
-+    return this.updateDailyMeasures(m => ({
-+      repoWithoutIndicatorClicked: m.repoWithoutIndicatorClicked + 1,
-+    }))
-+  }
-+
-   /** Set whether the user has opted out of stats reporting. */
-   public async setOptOut(optOut: boolean): Promise<void> {
-     const changed = this.optOut !== optOut
-@@ -312,6 +386,47 @@
-     return this.optOut
-   }
-
-+  /** Record that user dismissed diverging branch notification */
-+  public async recordDivergingBranchBannerDismissal(): Promise<void> {
-+    return this.updateDailyMeasures(m => ({
-+      divergingBranchBannerDismissal: m.divergingBranchBannerDismissal + 1,
-+    }))
-+  }
-+
-+  /** Record that user initiated a merge from within the notification banner */
-+  public async recordDivergingBranchBannerInitatedMerge(): Promise<void> {
-+    return this.updateDailyMeasures(m => ({
-+      divergingBranchBannerInitatedMerge:
-+        m.divergingBranchBannerInitatedMerge + 1,
-+    }))
-+  }
-+
-+  /** Record that user initiated a compare from within the notification banner */
-+  public async recordDivergingBranchBannerInitiatedCompare(): Promise<void> {
-+    return this.updateDailyMeasures(m => ({
-+      divergingBranchBannerInitiatedCompare:
-+        m.divergingBranchBannerInitiatedCompare + 1,
-+    }))
-+  }
-+
-+  /**
-+   * Record that user initiated a merge after getting to compare view
-+   * from within notificatio banner
-+   */
-+  public async recordDivergingBranchBannerInfluencedMerge(): Promise<void> {
-+    return this.updateDailyMeasures(m => ({
-+      divergingBranchBannerInfluencedMerge:
-+        m.divergingBranchBannerInfluencedMerge + 1,
-+    }))
-+  }
-+
-+  /** Record that the user was shown the notification banner */
-+  public async recordDivergingBranchBannerDisplayed(): Promise<void> {
-+    return this.updateDailyMeasures(m => ({
-+      divergingBranchBannerDisplayed: m.divergingBranchBannerDisplayed + 1,
-+    }))
-+  }
-+
-   /** Post some data to our stats endpoint. */
-   private post(body: object): Promise<Response> {
-     const options: RequestInit = {
-merged
-  result 100644 f11d691b980015ca4a257c25f28433f4a7514376 app/src/lib/stores/accounts-store.ts
-  our    100644 7b2bcf64296d13ab933c90d71368479c79c92e69 app/src/lib/stores/accounts-store.ts
-@@ -213,7 +213,7 @@
- async function updatedAccount(account: Account): Promise<Account> {
-   if (!account.token) {
-     return fatalError(
--      `Cannot update an account which doesn't have a token: ${account}`
-+      `Cannot update an account which doesn't have a token: ${account.login}`
-     )
-   }
-
-merged
-  result 100644 ee571b467f678151f67ef1ea677ecd440ff28df8 app/src/lib/stores/app-store.ts
-  our    100644 9f98922eb0685739d0e3a1ca94059e260529c827 app/src/lib/stores/app-store.ts
-@@ -3,7 +3,7 @@
-   IRepositoryState,
-   IHistoryState,
-   IAppState,
--  RepositorySection,
-+  RepositorySectionTab,
-   IChangesState,
-   Popup,
-   PopupType,
-@@ -17,9 +17,16 @@
-   ImageDiffType,
-   IRevertProgress,
-   IFetchProgress,
-+  ICompareState,
-+  ComparisonView,
-+  CompareAction,
-+  CompareActionKind,
-+  IDisplayHistory,
-+  ICompareBranch,
-+  ICompareFormUpdate,
- } from '../app-state'
- import { Account } from '../../models/account'
--import { Repository } from '../../models/repository'
-+import { Repository, ILocalRepositoryState } from '../../models/repository'
- import { GitHubRepository } from '../../models/github-repository'
- import {
-   CommittedFileChange,
-@@ -34,7 +41,11 @@
- } from '../../lib/repository-matching'
- import { API, getAccountForEndpoint, IAPIUser } from '../../lib/api'
- import { caseInsensitiveCompare } from '../compare'
--import { Branch, BranchType } from '../../models/branch'
-+import {
-+  Branch,
-+  eligibleForFastForward,
-+  IAheadBehind,
-+} from '../../models/branch'
- import { TipState } from '../../models/tip'
- import { CloningRepository } from '../../models/cloning-repository'
- import { Commit } from '../../models/commit'
-@@ -121,6 +132,15 @@
- import * as QueryString from 'querystring'
- import { IRemote, ForkedRemotePrefix } from '../../models/remote'
- import { IAuthor } from '../../models/author'
-+import { ComparisonCache } from '../comparison-cache'
-+import { AheadBehindUpdater } from './helpers/ahead-behind-updater'
-+import { enableRepoInfoIndicators } from '../feature-flag'
-+import { inferComparisonBranch } from './helpers/infer-comparison-branch'
-+import {
-+  ApplicationTheme,
-+  getPersistedTheme,
-+  setPersistedTheme,
-+} from '../../ui/lib/application-theme'
-
- /**
-  * Enum used by fetch to determine if
-@@ -131,6 +151,13 @@
-   UserInitiatedTask,
- }
-
-+/**
-+ * As fast-forwarding local branches is proportional to the number of local
-+ * branches, and is run after every fetch/push/pull, this is skipped when the
-+ * number of eligible branches is greater than a given threshold.
-+ */
-+const FastForwardBranchesThreshold = 20
-+
- const LastSelectedRepositoryIDKey = 'last-selected-repository-id'
-
- const defaultSidebarWidth: number = 250
-@@ -166,6 +193,9 @@
-   /** The pull request updater for the currently selected repository */
-   private currentPullRequestUpdater: PullRequestUpdater | null = null
-
-+  /** The ahead/behind updater or the currently selected repository */
-+  private currentAheadBehindUpdater: AheadBehindUpdater | null = null
-+
-   private repositoryState = new Map<string, IRepositoryState>()
-   private showWelcomeFlow = false
-   private currentPopup: Popup | null = null
-@@ -179,6 +209,11 @@
-     string,
-     RepositorySettingsStore
-   >()
-+
-+  private readonly localRepositoryStateLookup = new Map<
-+    number,
-+    ILocalRepositoryState
-+  >()
-   public readonly gitHubUserStore: GitHubUserStore
-   private readonly cloningRepositoriesStore: CloningRepositoriesStore
-   private readonly emojiStore: EmojiStore
-@@ -235,9 +270,11 @@
-     | ((repository: Repository | null) => void)
-     | null = null
-
--  private selectedCloneRepositoryTab: CloneRepositoryTab = CloneRepositoryTab.DotCom
-+  private selectedCloneRepositoryTab = CloneRepositoryTab.DotCom
-
-   private selectedBranchesTab = BranchesTab.Branches
-+  private selectedTheme = ApplicationTheme.Light
-+  private isDivergingBranchBannerVisible = false
-
-   public constructor(
-     gitHubUserStore: GitHubUserStore,
-@@ -319,8 +356,7 @@
-     this.accountsStore.onDidError(error => this.emitError(error))
-
-     this.repositoriesStore.onDidUpdate(async () => {
--      const repositories = await this.repositoriesStore.getAll()
--      this.repositories = repositories
-+      this.repositories = await this.repositoriesStore.getAll()
-       this.updateRepositorySelectionAfterRepositoriesChanged()
-       this.emitUpdate()
-     })
-@@ -395,14 +431,14 @@
-         workingDirectory: WorkingDirectoryStatus.fromFiles(
-           new Array<WorkingDirectoryFileChange>()
-         ),
--        selectedFileID: null,
-+        selectedFileIDs: [],
-         diff: null,
-         contextualCommitMessage: null,
-         commitMessage: null,
-         coAuthors: [],
-         showCoAuthoredBy: false,
-       },
--      selectedSection: RepositorySection.Changes,
-+      selectedSection: RepositorySectionTab.Changes,
-       branchesState: {
-         tip: { kind: TipState.Unknown },
-         defaultBranch: null,
-@@ -412,6 +448,17 @@
-         currentPullRequest: null,
-         isLoadingPullRequests: false,
-       },
-+      compareState: {
-+        formState: { kind: ComparisonView.None },
-+        showBranchList: false,
-+        filterText: '',
-+        commitSHAs: [],
-+        aheadBehindCache: new ComparisonCache(),
-+        allBranches: new Array<Branch>(),
-+        recentBranches: new Array<Branch>(),
-+        defaultBranch: null,
-+        inferredComparisonBranch: { branch: null, aheadBehind: null },
-+      },
-       commitAuthor: null,
-       gitHubUsers: new Map<string, IGitHubUser>(),
-       commitLookup: new Map<string, Commit>(),
-@@ -462,6 +509,18 @@
-     })
-   }
-
-+  private updateCompareState<K extends keyof ICompareState>(
-+    repository: Repository,
-+    fn: (state: ICompareState) => Pick<ICompareState, K>
-+  ) {
-+    this.updateRepositoryState(repository, state => {
-+      const compareState = state.compareState
-+      const newValues = fn(compareState)
-+
-+      return { compareState: merge(compareState, newValues) }
-+    })
-+  }
-+
-   private updateChangesState<K extends keyof IChangesState>(
-     repository: Repository,
-     fn: (changesState: IChangesState) => Pick<IChangesState, K>
-@@ -526,6 +585,7 @@
-         ...this.repositories,
-         ...this.cloningRepositoriesStore.repositories,
-       ],
-+      localRepositoryStateLookup: this.localRepositoryStateLookup,
-       windowState: this.windowState,
-       windowZoomFactor: this.windowZoomFactor,
-       appIsFocused: this.appIsFocused,
-@@ -550,6 +610,8 @@
-       repositoryFilterText: this.repositoryFilterText,
-       selectedCloneRepositoryTab: this.selectedCloneRepositoryTab,
-       selectedBranchesTab: this.selectedBranchesTab,
-+      isDivergingBranchBannerVisible: this.isDivergingBranchBannerVisible,
-+      selectedTheme: this.selectedTheme,
-     }
-   }
-
-@@ -629,8 +691,12 @@
-     return store
-   }
-
--  /** This shouldn't be called directly. See `Dispatcher`. */
--  public async _loadHistory(repository: Repository): Promise<void> {
-+  /**
-+   * TODO:
-+   * This is some legacy code that no longer works with the new Compare tab.
-+   * Need to investigate porting this to "refresh" the Compare tab state.
-+   */
-+  private async _loadHistory(repository: Repository): Promise<void> {
-     const gitStore = this.getGitStore(repository)
-     await gitStore.loadHistory()
-
-@@ -657,10 +723,247 @@
-     this.emitUpdate()
-   }
-
-+  private startAheadBehindUpdater(repository: Repository) {
-+    if (this.currentAheadBehindUpdater != null) {
-+      fatalError(
-+        `An ahead/behind updater is already active and cannot start updating on ${
-+          repository.name
-+        }`
-+      )
-+
-+      return
-+    }
-+
-+    const updater = new AheadBehindUpdater(repository, aheadBehindCache => {
-+      this.updateCompareState(repository, state => ({
-+        aheadBehindCache,
-+      }))
-+      this.emitUpdate()
-+    })
-+
-+    this.currentAheadBehindUpdater = updater
-+
-+    this.currentAheadBehindUpdater.start()
-+  }
-+
-+  private stopAheadBehindUpdate() {
-+    const updater = this.currentAheadBehindUpdater
-+
-+    if (updater != null) {
-+      updater.stop()
-+      this.currentAheadBehindUpdater = null
-+    }
-+  }
-+
-+  /** This shouldn't be called directly. See `Dispatcher`. */
-+  public async _initializeCompare(
-+    repository: Repository,
-+    initialAction?: CompareAction
-+  ) {
-+    log.debug('[AppStore] initializing compare state')
-+
-+    const state = this.getRepositoryState(repository)
-+
-+    const { branchesState, compareState } = state
-+    const { tip, currentPullRequest } = branchesState
-+    const currentBranch = tip.kind === TipState.Valid ? tip.branch : null
-+
-+    const allBranches =
-+      currentBranch != null
-+        ? branchesState.allBranches.filter(b => b.name !== currentBranch.name)
-+        : branchesState.allBranches
-+    const recentBranches = currentBranch
-+      ? branchesState.recentBranches.filter(b => b.name !== currentBranch.name)
-+      : branchesState.recentBranches
-+
-+    const cachedDefaultBranch = branchesState.defaultBranch
-+
-+    // only include the default branch when comparing if the user is not on the default branch
-+    // and it also exists in the repository
-+    const defaultBranch =
-+      currentBranch != null &&
-+      cachedDefaultBranch != null &&
-+      currentBranch.name !== cachedDefaultBranch.name
-+        ? cachedDefaultBranch
-+        : null
-+
-+    let inferredBranch: Branch | null = null
-+    let aheadBehindOfInferredBranch: IAheadBehind | null = null
-+    if (tip.kind === TipState.Valid && compareState.aheadBehindCache !== null) {
-+      inferredBranch = await inferComparisonBranch(
-+        repository,
-+        allBranches,
-+        currentPullRequest,
-+        tip.branch,
-+        getRemotes,
-+        compareState.aheadBehindCache
-+      )
-+
-+      if (inferredBranch !== null) {
-+        aheadBehindOfInferredBranch = compareState.aheadBehindCache.get(
-+          tip.branch.tip.sha,
-+          inferredBranch.tip.sha
-+        )
-+      }
-+    }
-+
-+    this.updateCompareState(repository, state => ({
-+      allBranches,
-+      recentBranches,
-+      defaultBranch,
-+      inferredComparisonBranch: {
-+        branch: inferredBranch,
-+        aheadBehind: aheadBehindOfInferredBranch,
-+      },
-+    }))
-+
-+    // we only want to show the banner when the the number
-+    // commits behind has changed since the last it was visible
-+    if (
-+      inferredBranch !== null &&
-+      aheadBehindOfInferredBranch !== null &&
-+      aheadBehindOfInferredBranch.behind > 0
-+    ) {
-+      const prevInferredBranchState =
-+        state.compareState.inferredComparisonBranch
-+      if (
-+        prevInferredBranchState.aheadBehind === null ||
-+        prevInferredBranchState.aheadBehind.behind !==
-+          aheadBehindOfInferredBranch.behind
-+      ) {
-+        this._setDivergingBranchBannerVisibility(true)
-+      }
-+    } else if (
-+      inferComparisonBranch !== null ||
-+      aheadBehindOfInferredBranch === null
-+    ) {
-+      this._setDivergingBranchBannerVisibility(false)
-+    }
-+
-+    const cachedState = compareState.formState
-+    const action =
-+      initialAction != null ? initialAction : getInitialAction(cachedState)
-+    this._executeCompare(repository, action)
-+
-+    if (currentBranch != null && this.currentAheadBehindUpdater != null) {
-+      this.currentAheadBehindUpdater.schedule(currentBranch, allBranches)
-+    }
-+  }
-+
-+  /** This shouldn't be called directly. See `Dispatcher`. */
-+  public async _executeCompare(
-+    repository: Repository,
-+    action: CompareAction
-+  ): Promise<void> {
-+    const gitStore = this.getGitStore(repository)
-+    const kind = action.kind
-+
-+    if (action.kind === CompareActionKind.History) {
-+      await gitStore.loadHistory()
-+
-+      const repoState = this.getRepositoryState(repository).historyState
-+      const commits = repoState.history
-+
-+      this.updateCompareState(repository, state => ({
-+        formState: {
-+          kind: ComparisonView.None,
-+        },
-+        commitSHAs: commits,
-+      }))
-+      return this.emitUpdate()
-+    } else if (action.kind === CompareActionKind.Branch) {
-+      const comparisonBranch = action.branch
-+      const compare = await gitStore.getCompareCommits(
-+        comparisonBranch,
-+        action.mode
-+      )
-+
-+      this.statsStore.recordBranchComparison()
-+      const { branchesState } = this.getRepositoryState(repository)
-+
-+      if (
-+        branchesState.defaultBranch !== null &&
-+        comparisonBranch.name === branchesState.defaultBranch.name
-+      ) {
-+        this.statsStore.recordDefaultBranchComparison()
-+      }
-+
-+      if (compare !== null) {
-+        const { ahead, behind } = compare
-+        const aheadBehind = { ahead, behind }
-+
-+        this.updateCompareState(repository, s => ({
-+          formState: {
-+            comparisonBranch,
-+            kind: action.mode,
-+            aheadBehind,
-+          },
-+          commitSHAs: compare.commits.map(commit => commit.sha),
-+          filterText: comparisonBranch.name,
-+        }))
-+
-+        const tip = gitStore.tip
-+
-+        let currentSha: string | null = null
-+
-+        if (tip.kind === TipState.Valid) {
-+          currentSha = tip.branch.tip.sha
-+        } else if (tip.kind === TipState.Detached) {
-+          currentSha = tip.currentSha
-+        }
-+
-+        if (this.currentAheadBehindUpdater != null && currentSha != null) {
-+          const from =
-+            action.mode === ComparisonView.Ahead
-+              ? comparisonBranch.tip.sha
-+              : currentSha
-+          const to =
-+            action.mode === ComparisonView.Ahead
-+              ? currentSha
-+              : comparisonBranch.tip.sha
-+
-+          this.currentAheadBehindUpdater.insert(from, to, aheadBehind)
-+        }
-+
-+        return this.emitUpdate()
-+      }
-+    } else {
-+      return assertNever(action, `Unknown action: ${kind}`)
-+    }
-+  }
-+
-+  /** This shouldn't be called directly. See `Dispatcher`. */
-+  public _updateCompareForm<K extends keyof ICompareFormUpdate>(
-+    repository: Repository,
-+    newState: Pick<ICompareFormUpdate, K>
-+  ) {
-+    this.updateCompareState(repository, state => {
-+      return merge(state, newState)
-+    })
-+
-+    this.emitUpdate()
-+  }
-+
-   /** This shouldn't be called directly. See `Dispatcher`. */
--  public _loadNextHistoryBatch(repository: Repository): Promise<void> {
-+  public async _loadNextHistoryBatch(repository: Repository): Promise<void> {
-     const gitStore = this.getGitStore(repository)
--    return gitStore.loadNextHistoryBatch()
-+
-+    const state = this.getRepositoryState(repository)
-+    const { formState } = state.compareState
-+    if (formState.kind === ComparisonView.None) {
-+      const commits = state.compareState.commitSHAs
-+      const lastCommitSha = commits[commits.length - 1]
-+
-+      const newCommits = await gitStore.loadCommitBatch(lastCommitSha)
-+      if (newCommits == null) {
-+        return
-+      }
-+
-+      this.updateCompareState(repository, state => ({
-+        commitSHAs: commits.concat(newCommits),
-+      }))
-+      this.emitUpdate()
-+    }
-   }
-
-   /** This shouldn't be called directly. See `Dispatcher`. */
-@@ -860,10 +1163,12 @@
-     // ensures we clean up the existing background fetcher correctly (if set)
-     this.stopBackgroundFetching()
-     this.stopPullRequestUpdater()
-+    this.stopAheadBehindUpdate()
-
-     this.startBackgroundFetching(repository, !previouslySelectedRepository)
-     this.startPullRequestUpdater(repository)
-
-+    this.startAheadBehindUpdater(repository)
-     this.refreshMentionables(repository)
-
-     this.addUpstreamRemoteIfNeeded(repository)
-@@ -1081,9 +1386,12 @@
-         ? imageDiffTypeDefault
-         : parseInt(imageDiffTypeValue)
-
-+    this.selectedTheme = getPersistedTheme()
-+
-     this.emitUpdateNow()
-
-     this.accountsStore.refresh()
-+    this.refreshAllRepositories()
-   }
-
-   private async getSelectedExternalEditor(): Promise<ExternalEditor | null> {
-@@ -1231,24 +1539,39 @@
-         })
-         .sort((x, y) => caseInsensitiveCompare(x.path, y.path))
-
--      const workingDirectory = WorkingDirectoryStatus.fromFiles(mergedFiles)
-+      // Collect all the currently available file ids into a set to avoid O(N)
-+      // lookups using .find on the mergedFiles array.
-+      const mergedFileIds = new Set(mergedFiles.map(x => x.id))
-
--      let selectedFileID = state.selectedFileID
--      const matchedFile = mergedFiles.find(x => x.id === selectedFileID)
-+      // The previously selected files might not be available in the working
-+      // directory any more due to having been committed or discarded so we'll
-+      // do a pass over and filter out any selected files that aren't available.
-+      let selectedFileIDs = state.selectedFileIDs.filter(id =>
-+        mergedFileIds.has(id)
-+      )
-
--      // Select the first file if we don't have anything selected.
--      if ((!selectedFileID || !matchedFile) && mergedFiles.length) {
--        selectedFileID = mergedFiles[0].id || null
-+      // Select the first file if we don't have anything selected and we
-+      // have something to select.
-+      if (selectedFileIDs.length === 0 && mergedFiles.length > 0) {
-+        selectedFileIDs = [mergedFiles[0].id]
-       }
-
--      // The file selection could have changed if the previously selected file
--      // is no longer selectable (it was reverted or committed) but if it hasn't
--      // changed we can reuse the diff.
--      const sameSelectedFileExists = state.selectedFileID
--        ? workingDirectory.findFileWithID(state.selectedFileID)
--        : null
--      const diff = sameSelectedFileExists ? state.diff : null
--      return { workingDirectory, selectedFileID, diff }
-+      // The file selection could have changed if the previously selected files
-+      // are no longer selectable (they were discarded or committed) but if they
-+      // were not changed we can reuse the diff. Note, however that we only render
-+      // a diff when a single file is selected. If the previous selection was
-+      // a single file with the same id as the current selection we can keep the
-+      // diff we had, if not we'll clear it.
-+      const workingDirectory = WorkingDirectoryStatus.fromFiles(mergedFiles)
-+
-+      const diff =
-+        selectedFileIDs.length === 1 &&
-+        state.selectedFileIDs.length === 1 &&
-+        state.selectedFileIDs[0] === selectedFileIDs[0]
-+          ? state.diff
-+          : null
-+
-+      return { workingDirectory, selectedFileIDs, diff }
-     })
-     this.emitUpdate()
-
-@@ -1258,14 +1581,14 @@
-   /** This shouldn't be called directly. See `Dispatcher`. */
-   public async _changeRepositorySection(
-     repository: Repository,
--    selectedSection: RepositorySection
-+    selectedSection: RepositorySectionTab
-   ): Promise<void> {
-     this.updateRepositoryState(repository, state => ({ selectedSection }))
-     this.emitUpdate()
-
--    if (selectedSection === RepositorySection.History) {
-+    if (selectedSection === RepositorySectionTab.History) {
-       return this.refreshHistorySection(repository)
--    } else if (selectedSection === RepositorySection.Changes) {
-+    } else if (selectedSection === RepositorySectionTab.Changes) {
-       return this.refreshChangesSection(repository, {
-         includingStatus: true,
-         clearPartialState: false,
-@@ -1276,10 +1599,10 @@
-   /** This shouldn't be called directly. See `Dispatcher`. */
-   public async _changeChangesSelection(
-     repository: Repository,
--    selectedFile: WorkingDirectoryFileChange | null
-+    selectedFiles: WorkingDirectoryFileChange[]
-   ): Promise<void> {
-     this.updateChangesState(repository, state => ({
--      selectedFileID: selectedFile ? selectedFile.id : null,
-+      selectedFileIDs: selectedFiles.map(file => file.id),
-       diff: null,
-     }))
-     this.emitUpdate()
-@@ -1297,15 +1620,23 @@
-   ): Promise<void> {
-     const stateBeforeLoad = this.getRepositoryState(repository)
-     const changesStateBeforeLoad = stateBeforeLoad.changesState
--    const selectedFileIDBeforeLoad = changesStateBeforeLoad.selectedFileID
--    if (!selectedFileIDBeforeLoad) {
-+    const selectedFileIDsBeforeLoad = changesStateBeforeLoad.selectedFileIDs
-+
-+    // We only render diffs when a single file is selected.
-+    if (selectedFileIDsBeforeLoad.length !== 1) {
-+      if (changesStateBeforeLoad.diff !== null) {
-+        this.updateChangesState(repository, state => ({ diff: null }))
-+        this.emitUpdate()
-+      }
-       return
-     }
-
-+    const selectedFileIdBeforeLoad = selectedFileIDsBeforeLoad[0]
-     const selectedFileBeforeLoad = changesStateBeforeLoad.workingDirectory.findFileWithID(
--      selectedFileIDBeforeLoad
-+      selectedFileIdBeforeLoad
-     )
--    if (!selectedFileBeforeLoad) {
-+
-+    if (selectedFileBeforeLoad === null) {
-       return
-     }
-
-@@ -1316,21 +1647,24 @@
-
-     const stateAfterLoad = this.getRepositoryState(repository)
-     const changesState = stateAfterLoad.changesState
--    const selectedFileID = changesState.selectedFileID
-
--    // A different file could have been selected while we were loading the diff
--    // in which case we no longer care about the diff we just loaded.
--    if (!selectedFileID) {
-+    // A different file (or files) could have been selected while we were
-+    // loading the diff in which case we no longer care about the diff we
-+    // just loaded.
-+    if (changesState.selectedFileIDs.length !== 1) {
-       return
-     }
--    if (selectedFileID !== selectedFileIDBeforeLoad) {
-+
-+    const selectedFileID = changesState.selectedFileIDs[0]
-+
-+    if (selectedFileID !== selectedFileIdBeforeLoad) {
-       return
-     }
-
-     const currentlySelectedFile = changesState.workingDirectory.findFileWithID(
-       selectedFileID
-     )
--    if (!currentlySelectedFile) {
-+    if (currentlySelectedFile === null) {
-       return
-     }
-
-@@ -1453,8 +1787,8 @@
-       )
-
-       const workingDirectory = WorkingDirectoryStatus.fromFiles(newFiles)
--      const diff = state.selectedFileID ? state.diff : null
--      return { workingDirectory, diff }
-+
-+      return { workingDirectory }
-     })
-
-     this.emitUpdate()
-@@ -1494,9 +1828,9 @@
-     const section = state.selectedSection
-     let refreshSectionPromise: Promise<void>
-
--    if (section === RepositorySection.History) {
-+    if (section === RepositorySectionTab.History) {
-       refreshSectionPromise = this.refreshHistorySection(repository)
--    } else if (section === RepositorySection.Changes) {
-+    } else if (section === RepositorySectionTab.Changes) {
-       refreshSectionPromise = this.refreshChangesSection(repository, {
-         includingStatus: false,
-         clearPartialState: false,
-@@ -1515,6 +1849,46 @@
-
-     this._updateCurrentPullRequest(repository)
-     this.updateMenuItemLabels(repository)
-+    this._initializeCompare(repository)
-+    this.refreshRepositoryState([repository])
-+  }
-+
-+  public refreshAllRepositories() {
-+    return this.refreshRepositoryState(this.repositories)
-+  }
-+
-+  private async refreshRepositoryState(
-+    repositories: ReadonlyArray<Repository>
-+  ): Promise<void> {
-+    if (!enableRepoInfoIndicators()) {
-+      return
-+    }
-+
-+    const promises = []
-+
-+    for (const repo of repositories) {
-+      promises.push(
-+        this.withAuthenticatingUser(repo, async (repo, account) => {
-+          const gitStore = this.getGitStore(repo)
-+          const lookup = this.localRepositoryStateLookup
-+          if (this.shouldBackgroundFetch(repo)) {
-+            await gitStore.fetch(account, true)
-+          }
-+
-+          const status = await gitStore.loadStatus()
-+          if (status !== null) {
-+            lookup.set(repo.id, {
-+              aheadBehind: gitStore.aheadBehind,
-+              changedFilesCount: status.workingDirectory.files.length,
-+            })
-+          }
-+        })
-+      )
-+    }
-+
-+    await Promise.all(promises)
-+
-+    this.emitUpdate()
-   }
-
-   /**
-@@ -1703,6 +2077,7 @@
-       await this._refreshRepository(repository)
-     } finally {
-       this.updateCheckoutProgress(repository, null)
-+      this._initializeCompare(repository, { kind: CompareActionKind.History })
-     }
-
-     return repository
-@@ -1919,7 +2294,7 @@
-         const refreshWeight = 0.1
-
-         // Scale pull and fetch weights to be between 0 and 0.9.
--        const scale = 1 / (pushWeight + fetchWeight) * (1 - refreshWeight)
-+        const scale = (1 / (pushWeight + fetchWeight)) * (1 - refreshWeight)
-
-         pushWeight *= scale
-         fetchWeight *= scale
-@@ -2103,7 +2478,7 @@
-           const refreshWeight = 0.1
-
-           // Scale pull and fetch weights to be between 0 and 0.9.
--          const scale = 1 / (pullWeight + fetchWeight) * (1 - refreshWeight)
-+          const scale = (1 / (pullWeight + fetchWeight)) * (1 - refreshWeight)
-
-           pullWeight *= scale
-           fetchWeight *= scale
-@@ -2163,18 +2538,24 @@
-     const currentBranchName =
-       tip.kind === TipState.Valid ? tip.branch.name : null
-
--    // A branch is only eligible for being fast forwarded if:
--    //  1. It's local.
--    //  2. It's not the current branch.
--    //  3. It has an upstream.
--    //  4. It's not ahead of its upstream.
--    const eligibleBranches = branches.filter(b => {
--      return (
--        b.type === BranchType.Local &&
--        b.name !== currentBranchName &&
--        b.upstream
-+    let eligibleBranches = branches.filter(b =>
-+      eligibleForFastForward(b, currentBranchName)
-+    )
-+
-+    if (eligibleBranches.length >= FastForwardBranchesThreshold) {
-+      log.info(
-+        `skipping fast-forward for all branches as there are ${
-+          eligibleBranches.length
-+        } local branches - this will run again when there are less than ${FastForwardBranchesThreshold} local branches tracking remotes`
-       )
--    })
-+
-+      const defaultBranch = state.branchesState.defaultBranch
-+      eligibleBranches =
-+        defaultBranch != null &&
-+        eligibleForFastForward(defaultBranch, currentBranchName)
-+          ? [defaultBranch]
-+          : []
-+    }
-
-     for (const branch of eligibleBranches) {
-       const aheadBehind = await getBranchAheadBehind(repository, branch)
-@@ -2183,6 +2564,8 @@
-       }
-
-       const { ahead, behind } = aheadBehind
-+      // Only perform the fast forward if the branch is behind it's upstream
-+      // branch and has no local commits.
-       if (ahead === 0 && behind > 0) {
-         // At this point we're guaranteed this is non-null since we've filtered
-         // out any branches will null upstreams above when creating
-@@ -2575,14 +2958,14 @@
-     return shell.openExternal(url)
-   }
-
--  /** Takes a repository path and opens it using the user's configured editor */
--  public async _openInExternalEditor(path: string): Promise<void> {
-+  /** Open a path to a repository or file using the user's configured editor */
-+  public async _openInExternalEditor(fullPath: string): Promise<void> {
-     const selectedExternalEditor =
-       this.getState().selectedExternalEditor || null
-
-     try {
-       const match = await findEditorOrDefault(selectedExternalEditor)
--      await launchExternalEditor(path, match)
-+      await launchExternalEditor(fullPath, match)
-     } catch (error) {
-       this.emitError(error)
-     }
-@@ -2668,6 +3051,18 @@
-     this.emitUpdate()
-   }
-
-+  public _setDivergingBranchBannerVisibility(visible: boolean) {
-+    if (this.isDivergingBranchBannerVisible !== visible) {
-+      this.isDivergingBranchBannerVisible = visible
-+
-+      if (visible) {
-+        this._recordDivergingBranchBannerDisplayed()
-+      }
-+
-+      this.emitUpdate()
-+    }
-+  }
-+
-   public _reportStats() {
-     return this.statsStore.reportStats(this.accounts, this.repositories)
-   }
-@@ -2676,7 +3071,10 @@
-     return this.statsStore.recordLaunchStats(stats)
-   }
-
--  public async _ignore(repository: Repository, pattern: string): Promise<void> {
-+  public async _ignore(
-+    repository: Repository,
-+    pattern: string | string[]
-+  ): Promise<void> {
-     const repoSettingsStore = this.getRepositorySettingsStore(repository)
-
-     await repoSettingsStore.ignore(pattern)
-@@ -3283,16 +3681,25 @@
-       head.gitHubRepository.cloneURL === gitHubRepository.cloneURL
-
-     if (isRefInThisRepo) {
--      // We need to fetch FIRST because someone may have created a PR since the last fetch
-       const defaultRemote = await getDefaultRemote(repository)
--      // TODO: I think we could skip this fetch if we know that we have the branch locally
--      // already. That way we'd match the behavior of checking out a branch.
--      if (defaultRemote) {
--        await this._fetchRemote(
--          repository,
--          defaultRemote,
--          FetchType.UserInitiatedTask
--        )
-+      // if we don't have a default remote here, it's probably going
-+      // to just crash and burn on checkout, but that's okay
-+      if (defaultRemote != null) {
-+        // the remote ref will be something like `origin/my-cool-branch`
-+        const remoteRef = `${defaultRemote.name}/${head.ref}`
-+        const gitStore = this.getGitStore(repository)
-+
-+        const remoteRefExists =
-+          gitStore.allBranches.find(branch => branch.name === remoteRef) != null
-+
-+        // only try a fetch here if we can't find the ref
-+        if (!remoteRefExists) {
-+          await this._fetchRemote(
-+            repository,
-+            defaultRemote,
-+            FetchType.UserInitiatedTask
-+          )
-+        }
-       }
-       await this._checkoutBranch(repository, head.ref)
-     } else if (head.gitHubRepository != null) {
-@@ -3316,7 +3723,7 @@
-         )
-
-         log.error(error.message)
--        this.emitError(error)
-+        return this.emitError(error)
-       }
-
-       await this._fetchRemote(repository, remote, FetchType.UserInitiatedTask)
-@@ -3338,6 +3745,8 @@
-
-       await this._checkoutBranch(repository, localBranchName)
-     }
-+
-+    this.statsStore.recordPRBranchCheckout()
-   }
-
-   /**
-@@ -3365,8 +3774,104 @@
-     this.getGitStore(repository).setCoAuthors(coAuthors)
-     return Promise.resolve()
-   }
-+
-+  /**
-+   * Increments the `mergeIntoCurrentBranchMenuCount` metric
-+   */
-+  public _recordMenuInitiatedMerge() {
-+    this.statsStore.recordMenuInitiatedMerge()
-+  }
-+
-+  /**
-+   * Increments the `updateFromDefaultBranchMenuCount` metric
-+   */
-+  public _recordMenuInitiatedUpdate() {
-+    this.statsStore.recordMenuInitiatedUpdate()
-+  }
-+
-+  /**
-+   * Increments the `mergesInitiatedFromComparison` metric
-+   */
-+  public _recordCompareInitiatedMerge() {
-+    this.statsStore.recordCompareInitiatedMerge()
-+  }
-+
-+  /**
-+   * Set the application-wide theme
-+   */
-+  public _setSelectedTheme(theme: ApplicationTheme) {
-+    setPersistedTheme(theme)
-+    this.selectedTheme = theme
-+    this.emitUpdate()
-+
-+    return Promise.resolve()
-+  }
-+
-+  /**
-+   * Increments either the `repoWithIndicatorClicked` or
-+   * the `repoWithoutIndicatorClicked` metric
-+   */
-+  public _recordRepoClicked(repoHasIndicator: boolean) {
-+    this.statsStore.recordRepoClicked(repoHasIndicator)
-+  }
-+
-+  /** The number of times the user dismisses the diverged branch notification
-+   * Increments the `divergingBranchBannerDismissal` metric
-+   */
-+  public _recordDivergingBranchBannerDismissal() {
-+    this.statsStore.recordDivergingBranchBannerDismissal()
-+  }
-+
-+  /**
-+   * Increments the `divergingBranchBannerDisplayed` metric
-+   */
-+  public _recordDivergingBranchBannerDisplayed() {
-+    this.statsStore.recordDivergingBranchBannerDisplayed()
-+  }
-+
-+  /**
-+   * Increments the `divergingBranchBannerInitiatedCompare` metric
-+   */
-+  public _recordDivergingBranchBannerInitiatedCompare() {
-+    this.statsStore.recordDivergingBranchBannerInitiatedCompare()
-+  }
-+
-+  /**
-+   * Increments the `divergingBranchBannerInfluencedMerge` metric
-+   */
-+  public _recordDivergingBranchBannerInfluencedMerge() {
-+    this.statsStore.recordDivergingBranchBannerInfluencedMerge()
-+  }
-+
-+  /**
-+   * Increments the `divergingBranchBannerInitatedMerge` metric
-+   */
-+  public _recordDivergingBranchBannerInitatedMerge() {
-+    this.statsStore.recordDivergingBranchBannerInitatedMerge()
-+  }
- }
-
- function forkPullRequestRemoteName(remoteName: string) {
-   return `${ForkedRemotePrefix}${remoteName}`
- }
-+
-+/**
-+ * Map the cached state of the compare view to an action
-+ * to perform which is then used to compute the compare
-+ * view contents.
-+ */
-+function getInitialAction(
-+  cachedState: IDisplayHistory | ICompareBranch
-+): CompareAction {
-+  if (cachedState.kind === ComparisonView.None) {
-+    return {
-+      kind: CompareActionKind.History,
-+    }
-+  }
-+
-+  return {
-+    kind: CompareActionKind.Branch,
-+    branch: cachedState.comparisonBranch,
-+    mode: cachedState.kind,
-+  }
-+}
-merged
-  result 100644 f448ce132d5fa114bc19fbf191a3c0026b4e202a app/src/lib/stores/git-store.ts
-  our    100644 d3b2a0b254bf08c1768c0f56d4b7602873766d56 app/src/lib/stores/git-store.ts
-@@ -3,11 +3,16 @@
- import { Disposable } from 'event-kit'
- import { Repository } from '../../models/repository'
- import { WorkingDirectoryFileChange, AppFileStatus } from '../../models/status'
--import { Branch, BranchType } from '../../models/branch'
-+import {
-+  Branch,
-+  BranchType,
-+  IAheadBehind,
-+  ICompareResult,
-+} from '../../models/branch'
- import { Tip, TipState } from '../../models/tip'
- import { Commit } from '../../models/commit'
- import { IRemote } from '../../models/remote'
--import { IFetchProgress, IRevertProgress } from '../app-state'
-+import { IFetchProgress, IRevertProgress, ComparisonView } from '../app-state'
-
- import { IAppShell } from '../app-shell'
- import { ErrorWithMetadata, IErrorMetadata } from '../error-with-metadata'
-@@ -24,7 +29,6 @@
-   getRecentBranches,
-   getBranches,
-   deleteRef,
--  IAheadBehind,
-   getCommits,
-   merge,
-   setRemoteURL,
-@@ -47,6 +51,10 @@
-   getTrailerSeparatorCharacters,
-   parseSingleUnfoldedTrailer,
-   isCoAuthoredByTrailer,
-+  getAheadBehind,
-+  revRange,
-+  revSymmetricDifference,
-+  getSymbolicRef,
- } from '../git'
- import { IGitAccount } from '../git/authentication'
- import { RetryAction, RetryActionType } from '../retry-actions'
-@@ -150,8 +158,10 @@
-
-     this.requestsInFight.add(LoadingHistoryRequestKey)
-
-+    const range = revRange('HEAD', mergeBase)
-+
-     const commits = await this.performFailableOperation(() =>
--      getCommits(this.repository, `HEAD..${mergeBase}`, CommitBatchSize)
-+      getCommits(this.repository, range, CommitBatchSize)
-     )
-     if (commits == null) {
-       return
-@@ -173,11 +183,8 @@
-       this._history = [...commits.map(c => c.sha), ...remainingHistory]
-     }
-
--    this.storeCommits(commits)
--
-+    this.storeCommits(commits, true)
-     this.requestsInFight.delete(LoadingHistoryRequestKey)
--
--    this.emitNewCommitsLoaded(commits)
-     this.emitUpdate()
-   }
-
-@@ -214,11 +221,8 @@
-     }
-
-     this._history = [...commits.map(c => c.sha), ...existingHistory]
--    this.storeCommits(commits)
--
-+    this.storeCommits(commits, true)
-     this.requestsInFight.delete(LoadingHistoryRequestKey)
--
--    this.emitNewCommitsLoaded(commits)
-     this.emitUpdate()
-   }
-
-@@ -248,12 +252,35 @@
-     }
-
-     this._history = this._history.concat(commits.map(c => c.sha))
--    this.storeCommits(commits)
-+    this.storeCommits(commits, true)
-+    this.requestsInFight.delete(requestKey)
-+    this.emitUpdate()
-+  }
-+
-+  /** Load a batch of commits from the repository, using the last known commit in the list. */
-+  public async loadCommitBatch(lastSHA: string) {
-+    if (this.requestsInFight.has(LoadingHistoryRequestKey)) {
-+      return null
-+    }
-+
-+    const requestKey = `history/compare/${lastSHA}`
-+    if (this.requestsInFight.has(requestKey)) {
-+      return null
-+    }
-+
-+    this.requestsInFight.add(requestKey)
-+
-+    const commits = await this.performFailableOperation(() =>
-+      getCommits(this.repository, `${lastSHA}^`, CommitBatchSize)
-+    )
-
-     this.requestsInFight.delete(requestKey)
-+    if (!commits) {
-+      return null
-+    }
-
--    this.emitNewCommitsLoaded(commits)
--    this.emitUpdate()
-+    this.storeCommits(commits, false)
-+    return commits.map(c => c.sha)
-   }
-
-   /** The list of ordered SHAs. */
-@@ -332,24 +359,51 @@
-     return allBranchesWithUpstream
-   }
-
--  private refreshDefaultBranch() {
--    let defaultBranchName: string | null = 'master'
--    const gitHubRepository = this.repository.gitHubRepository
--    if (gitHubRepository && gitHubRepository.defaultBranch) {
--      defaultBranchName = gitHubRepository.defaultBranch
-+  private async refreshDefaultBranch() {
-+    const defaultBranchName = await this.resolveDefaultBranch()
-+
-+    // Find the default branch among all of our branches, giving
-+    // priority to local branches by sorting them before remotes
-+    this._defaultBranch =
-+      this._allBranches
-+        .filter(b => b.name === defaultBranchName)
-+        .sort((x, y) => compare(x.type, y.type))
-+        .shift() || null
-+  }
-+
-+  /**
-+   * Resolve the default branch name for the current repository,
-+   * using the available API data, remote information or branch
-+   * name conventionns.
-+   */
-+  private async resolveDefaultBranch(): Promise<string> {
-+    const { gitHubRepository } = this.repository
-+    if (gitHubRepository && gitHubRepository.defaultBranch != null) {
-+      return gitHubRepository.defaultBranch
-     }
-
--    if (defaultBranchName) {
--      // Find the default branch among all of our branches, giving
--      // priority to local branches by sorting them before remotes
--      this._defaultBranch =
--        this._allBranches
--          .filter(b => b.name === defaultBranchName)
--          .sort((x, y) => compare(x.type, y.type))
--          .shift() || null
--    } else {
--      this._defaultBranch = null
-+    if (this.remote != null) {
-+      // the Git server should use [remote]/HEAD to advertise
-+      // it's default branch, so see if it exists and matches
-+      // a valid branch on the remote and attempt to use that
-+      const remoteNamespace = `refs/remotes/${this.remote.name}/`
-+      const match = await getSymbolicRef(
-+        this.repository,
-+        `${remoteNamespace}HEAD`
-+      )
-+      if (
-+        match != null &&
-+        match.length > remoteNamespace.length &&
-+        match.startsWith(remoteNamespace)
-+      ) {
-+        // strip out everything related to the remote because this
-+        // is likely to be a tracked branch locally
-+        // e.g. `master`, `develop`, etc
-+        return match.substr(remoteNamespace.length)
-+      }
-     }
-+
-+    return 'master'
-   }
-
-   private refreshRecentBranches(
-@@ -416,9 +470,9 @@
-
-     let localCommits: ReadonlyArray<Commit> | undefined
-     if (branch.upstream) {
--      const revRange = `${branch.upstream}..${branch.name}`
-+      const range = revRange(branch.upstream, branch.name)
-       localCommits = await this.performFailableOperation(() =>
--        getCommits(this.repository, revRange, CommitBatchSize)
-+        getCommits(this.repository, range, CommitBatchSize)
-       )
-     } else {
-       localCommits = await this.performFailableOperation(() =>
-@@ -447,10 +501,17 @@
-   }
-
-   /** Store the given commits. */
--  private storeCommits(commits: ReadonlyArray<Commit>) {
-+  private storeCommits(
-+    commits: ReadonlyArray<Commit>,
-+    emitUpdate: boolean = false
-+  ) {
-     for (const commit of commits) {
-       this.commitLookup.set(commit.sha, commit)
-     }
-+
-+    if (emitUpdate) {
-+      this.emitNewCommitsLoaded(commits)
-+    }
-   }
-
-   private async undoFirstCommit(
-@@ -1238,4 +1299,50 @@
-       setRemoteURL(this.repository, UpstreamRemoteName, url)
-     )
-   }
-+
-+  /**
-+   * Returns the commits associated with `branch` and ahead/behind info;
-+   */
-+  public async getCompareCommits(
-+    branch: Branch,
-+    compareType: ComparisonView.Ahead | ComparisonView.Behind
-+  ): Promise<ICompareResult | null> {
-+    if (this.tip.kind !== TipState.Valid) {
-+      return null
-+    }
-+
-+    const base = this.tip.branch
-+    const aheadBehind = await getAheadBehind(
-+      this.repository,
-+      revSymmetricDifference(base.name, branch.name)
-+    )
-+
-+    if (aheadBehind == null) {
-+      return null
-+    }
-+
-+    const revisionRange =
-+      compareType === ComparisonView.Ahead
-+        ? revRange(branch.name, base.name)
-+        : revRange(base.name, branch.name)
-+    const commitsToLoad =
-+      compareType === ComparisonView.Ahead
-+        ? aheadBehind.ahead
-+        : aheadBehind.behind
-+    const commits = await getCommits(
-+      this.repository,
-+      revisionRange,
-+      commitsToLoad
-+    )
-+
-+    if (commits.length > 0) {
-+      this.storeCommits(commits, true)
-+    }
-+
-+    return {
-+      commits,
-+      ahead: aheadBehind.ahead,
-+      behind: aheadBehind.behind,
-+    }
-+  }
- }
-added in remote
-  their  100644 2f4ef7dade5922f6825e9c4d3b0dd19216a44bb3 app/src/lib/stores/helpers/ahead-behind-updater.ts
-@@ -0,0 +1,125 @@
-+const queue: (config: QueueConfig) => Queue = require('queue')
-+import { revSymmetricDifference } from '../../../lib/git'
-+
-+// eslint-disable-next-line typescript/interface-name-prefix
-+interface QueueConfig {
-+  // Max number of jobs the queue should process concurrently, defaults to Infinity.
-+  readonly concurrency: number
-+  // Ensures the queue is always running if jobs are available.
-+  // Useful in situations where you are using a queue only for concurrency control.
-+  readonly autostart: boolean
-+}
-+
-+// eslint-disable-next-line typescript/interface-name-prefix
-+interface Queue extends NodeJS.EventEmitter {
-+  readonly length: number
-+
-+  start(): void
-+  end(): void
-+  push<T>(
-+    func: (callback: (error: Error | null, result: T) => void) => void
-+  ): void
-+}
-+
-+import { Repository } from '../../../models/repository'
-+import { getAheadBehind } from '../../../lib/git'
-+import { Branch, IAheadBehind } from '../../../models/branch'
-+import { ComparisonCache } from '../../comparison-cache'
-+
-+export class AheadBehindUpdater {
-+  private comparisonCache = new ComparisonCache()
-+
-+  private aheadBehindQueue = queue({
-+    concurrency: 1,
-+    autostart: true,
-+  })
-+
-+  public constructor(
-+    private repository: Repository,
-+    private onCacheUpdate: (cache: ComparisonCache) => void
-+  ) {}
-+
-+  public start() {
-+    this.aheadBehindQueue.on('success', (result: IAheadBehind | null) => {
-+      if (result != null) {
-+        this.onCacheUpdate(this.comparisonCache)
-+      }
-+    })
-+
-+    this.aheadBehindQueue.on('error', (err: Error) => {
-+      log.debug(
-+        '[AheadBehindUpdater] an error with the queue was reported',
-+        err
-+      )
-+    })
-+
-+    this.aheadBehindQueue.on('end', (err?: Error) => {
-+      if (err != null) {
-+        log.debug(`[AheadBehindUpdater] ended with an error`, err)
-+      }
-+    })
-+
-+    this.aheadBehindQueue.start()
-+  }
-+
-+  public stop() {
-+    this.aheadBehindQueue.end()
-+  }
-+
-+  private executeTask = (
-+    from: string,
-+    to: string,
-+    callback: (error: Error | null, result: IAheadBehind | null) => void
-+  ) => {
-+    if (this.comparisonCache.has(from, to)) {
-+      return
-+    }
-+
-+    const range = revSymmetricDifference(from, to)
-+    getAheadBehind(this.repository, range).then(result => {
-+      if (result != null) {
-+        this.comparisonCache.set(from, to, result)
-+      } else {
-+        log.debug(
-+          `[AheadBehindUpdater] unable to cache '${range}' as no result returned`
-+        )
-+      }
-+      callback(null, result)
-+    })
-+  }
-+
-+  public insert(from: string, to: string, value: IAheadBehind) {
-+    if (this.comparisonCache.has(from, to)) {
-+      return
-+    }
-+
-+    this.comparisonCache.set(from, to, value)
-+  }
-+
-+  public schedule(currentBranch: Branch, branches: ReadonlyArray<Branch>) {
-+    // remove any queued work to prioritize this new set of tasks
-+    this.aheadBehindQueue.end()
-+
-+    const from = currentBranch.tip.sha
-+
-+    const branchesNotInCache = branches
-+      .map(b => b.tip.sha)
-+      .filter(to => !this.comparisonCache.has(from, to))
-+
-+    const newRefsToCompare = new Set<string>(branchesNotInCache)
-+
-+    log.debug(
-+      `[AheadBehindUpdater] - found ${
-+        newRefsToCompare.size
-+      } comparisons to perform`
-+    )
-+
-+    for (const sha of newRefsToCompare) {
-+      this.aheadBehindQueue.push<IAheadBehind | null>(callback =>
-+        requestIdleCallback(() => {
-+          this.executeTask(from, sha, callback)
-+        })
-+      )
-+    }
-+  }
-+}
-added in remote
-  their  100644 6209dbef0a2ebc954b665597db7311541fdd197c app/src/lib/stores/helpers/infer-comparison-branch.ts
-@@ -0,0 +1,149 @@
-+import { Branch } from '../../../models/branch'
-+import { PullRequest } from '../../../models/pull-request'
-+import { GitHubRepository } from '../../../models/github-repository'
-+import { IRemote } from '../../../models/remote'
-+import { Repository } from '../../../models/repository'
-+import { ComparisonCache } from '../../comparison-cache'
-+
-+type RemotesGetter = (repository: Repository) => Promise<ReadonlyArray<IRemote>>
-+
-+/**
-+ * Infers which branch to use as the comparison branch
-+ *
-+ * The branch returned is determined by the following conditions:
-+ * 1. Given a pull request -> target branch of PR
-+ * 2. Given a forked repository -> default branch on `upstream`
-+ * 3. Given a hosted repository -> default branch on `origin`
-+ * 4. Fallback -> `master` branch
-+ *
-+ * @param repository The repository the branch belongs to
-+ * @param branches The list of all branches for the repository
-+ * @param currentPullRequest The pull request to use for finding the branch
-+ * @param currentBranch The branch we want the parent of
-+ * @param getRemotes callback used to get all remotes for the current repository
-+ * @param comparisonCache cache used to get the number of commits ahead/behind the current branch is from another branch
-+ */
-+export async function inferComparisonBranch(
-+  repository: Repository,
-+  branches: ReadonlyArray<Branch>,
-+  currentPullRequest: PullRequest | null,
-+  currentBranch: Branch | null,
-+  getRemotes: RemotesGetter,
-+  comparisonCache: ComparisonCache
-+): Promise<Branch | null> {
-+  if (currentPullRequest !== null) {
-+    return getTargetBranchOfPullRequest(branches, currentPullRequest)
-+  }
-+
-+  const ghRepo = repository.gitHubRepository
-+  if (ghRepo !== null) {
-+    return ghRepo.fork === true && currentBranch !== null
-+      ? getDefaultBranchOfFork(
-+          repository,
-+          branches,
-+          currentBranch,
-+          getRemotes,
-+          comparisonCache
-+        )
-+      : getDefaultBranchOfGitHubRepo(branches, ghRepo)
-+  }
-+
-+  return getMasterBranch(branches)
-+}
-+
-+function getMasterBranch(branches: ReadonlyArray<Branch>): Branch | null {
-+  return findBranch(branches, 'master')
-+}
-+
-+function getDefaultBranchOfGitHubRepo(
-+  branches: ReadonlyArray<Branch>,
-+  ghRepository: GitHubRepository
-+): Branch | null {
-+  if (ghRepository.defaultBranch === null) {
-+    return null
-+  }
-+
-+  return findBranch(branches, ghRepository.defaultBranch)
-+}
-+
-+function getTargetBranchOfPullRequest(
-+  branches: ReadonlyArray<Branch>,
-+  pr: PullRequest
-+): Branch | null {
-+  return findBranch(branches, pr.base.ref)
-+}
-+
-+/**
-+ * For `inferComparisonBranch` case where inferring for a forked repository
-+ *
-+ * Returns the default branch of the fork if it's ahead of `currentBranch`.
-+ * Otherwise, the default branch of the parent is returned.
-+ */
-+async function getDefaultBranchOfFork(
-+  repository: Repository,
-+  branches: ReadonlyArray<Branch>,
-+  currentBranch: Branch,
-+  getRemotes: RemotesGetter,
-+  comparisonCache: ComparisonCache
-+): Promise<Branch | null> {
-+  // this is guaranteed to exist since this function
-+  // is only called if the ghRepo is not null
-+  const ghRepo = repository.gitHubRepository!
-+  const defaultBranch = getDefaultBranchOfGitHubRepo(branches, ghRepo)
-+  if (defaultBranch === null) {
-+    return getMasterBranch(branches)
-+  }
-+
-+  const aheadBehind = comparisonCache.get(
-+    currentBranch.tip.sha,
-+    defaultBranch.tip.sha
-+  )
-+
-+  // we want to return the default branch of the fork if it's ahead
-+  // of the current branch; see https://github.com/desktop/desktop/issues/4766#issue-325764371
-+  if (aheadBehind !== null && aheadBehind.ahead > 0) {
-+    return defaultBranch
-+  }
-+
-+  const potentialDefault = await getDefaultBranchOfForkedGitHubRepo(
-+    repository,
-+    branches,
-+    getRemotes
-+  )
-+
-+  return potentialDefault
-+}
-+
-+async function getDefaultBranchOfForkedGitHubRepo(
-+  repository: Repository,
-+  branches: ReadonlyArray<Branch>,
-+  getRemotes: RemotesGetter
-+): Promise<Branch | null> {
-+  const parentRepo =
-+    repository.gitHubRepository !== null
-+      ? repository.gitHubRepository.parent
-+      : null
-+
-+  if (parentRepo === null) {
-+    return null
-+  }
-+
-+  const remotes = await getRemotes(repository)
-+  const remote = remotes.find(r => r.url === parentRepo.cloneURL)
-+
-+  if (remote === undefined) {
-+    log.warn(`Could not find remote with URL ${parentRepo.cloneURL}.`)
-+    return null
-+  }
-+
-+  const branchToFind = `${remote.name}/${parentRepo.defaultBranch}`
-+
-+  return findBranch(branches, branchToFind)
-+}
-+
-+function findBranch(
-+  branches: ReadonlyArray<Branch>,
-+  name: string
-+): Branch | null {
-+  return branches.find(b => b.name === name) || null
-+}
-merged
-  result 100644 d9edf0247ea7c33ae2b508f876aa977d8a81d6d4 app/src/lib/stores/pull-request-store.ts
-  our    100644 1feeeb2600084a5b31ad70f91d96038d1c405539 app/src/lib/stores/pull-request-store.ts
-@@ -67,7 +67,6 @@
-       this.emitUpdate(githubRepo)
-     } catch (error) {
-       log.warn(`Error refreshing pull requests for '${repository.name}'`, error)
--      this.emitError(error)
-     } finally {
-       this.updateActiveFetchCount(githubRepo, Decrement)
-     }
-@@ -104,7 +103,11 @@
-   ): Promise<void> {
-     const prs = await this.fetchPullRequestsFromCache(repository)
-
--    await this.fetchAndCachePullRequestStatus(prs, repository, account)
-+    try {
-+      await this.fetchAndCachePullRequestStatus(prs, repository, account)
-+    } catch (e) {
-+      log.warn('Error updating pull request statuses', e)
-+    }
-   }
-
-   /** Gets the pull requests against the given repository. */
-@@ -293,6 +296,7 @@
-       return {
-         id: x.id,
-         state: x.state,
-+        description: x.description,
-       }
-     })
-
-merged
-  result 100644 9eb2eaebe8b63f5219a301f0c68eb2d0a96d2fea app/src/lib/stores/repository-settings-store.ts
-  our    100644 ce2118f6066face1e430be4ad265a220a669fcf8 app/src/lib/stores/repository-settings-store.ts
-@@ -75,12 +75,15 @@
-   }
-
-   /** Ignore the given path or pattern. */
--  public async ignore(pattern: string): Promise<void> {
-+  public async ignore(patterns: string | string[]): Promise<void> {
-     const text = (await this.readGitIgnore()) || ''
-     const repository = this._repository
-     const currentContents = await formatGitIgnoreContents(text, repository)
-+
-+    const newPatternText =
-+      patterns instanceof Array ? patterns.join('\n') : patterns
-     const newText = await formatGitIgnoreContents(
--      `${currentContents}${pattern}`,
-+      `${currentContents}${newPatternText}`,
-       repository
-     )
-
-merged
-  result 100644 f05a774461b4caac6f3ad908b6090078f0de8419 app/src/lib/tailer.ts
-  our    100644 08d5dbe9e54073674bb101a4c8c7c331eb5d1105 app/src/lib/tailer.ts
-@@ -1,4 +1,4 @@
--import * as Fs from 'fs-extra'
-+import * as Fs from 'fs'
- import { Emitter, Disposable } from 'event-kit'
-
- interface ICurrentFileTailState {
-merged
-  result 100644 d2fd1a247c9132a86ae1a23a948c51adff797eca app/src/main-process/log.ts
-  our    100644 74719f439d29c061cd698d7b7dc9b46127a6b326 app/src/main-process/log.ts
-@@ -3,7 +3,7 @@
-
- import { getLogDirectoryPath } from '../lib/logging/get-log-path'
- import { LogLevel } from '../lib/logging/log-level'
--import { mkdirIfNeeded } from '../lib/file-system'
-+import { ensureDir } from 'fs-extra'
-
- require('winston-daily-rotate-file')
-
-@@ -73,7 +73,7 @@
-   loggerPromise = new Promise<winston.LogMethod>((resolve, reject) => {
-     const logDirectory = getLogDirectoryPath()
-
--    mkdirIfNeeded(logDirectory)
-+    ensureDir(logDirectory)
-       .then(() => {
-         try {
-           const logger = initializeWinston(getLogFilePath(logDirectory))
-merged
-  result 100644 946271baeebe98fdf6b79d970b68d6255fc40289 app/src/main-process/main.ts
-  our    100644 c5def55874da156c018edb81e03c9fc2e1ddbe90 app/src/main-process/main.ts
-@@ -170,6 +170,13 @@
-   }
- }
-
-+if (process.env.GITHUB_DESKTOP_DISABLE_HARDWARE_ACCELERATION) {
-+  log.info(
-+    `GITHUB_DESKTOP_DISABLE_HARDWARE_ACCELERATION environment variable set, disabling hardware acceleration`
-+  )
-+  app.disableHardwareAcceleration()
-+}
-+
- app.on('ready', () => {
-   if (isDuplicateInstance || handlingSquirrelEvent) {
-     return
-@@ -400,14 +407,24 @@
-   const window = new AppWindow()
-
-   if (__DEV__) {
--    const installer = require('electron-devtools-installer')
-+    const {
-+      default: installExtension,
-+      REACT_DEVELOPER_TOOLS,
-+      REACT_PERF,
-+    } = require('electron-devtools-installer')
-+
-     require('electron-debug')({ showDevTools: true })
-
--    const extensions = ['REACT_DEVELOPER_TOOLS', 'REACT_PERF']
-+    const ChromeLens = {
-+      id: 'idikgljglpfilbhaboonnpnnincjhjkd',
-+      electron: '>=1.2.1',
-+    }
-+
-+    const extensions = [REACT_DEVELOPER_TOOLS, REACT_PERF, ChromeLens]
-
--    for (const name of extensions) {
-+    for (const extension of extensions) {
-       try {
--        installer.default(installer[name])
-+        installExtension(extension)
-       } catch (e) {}
-     }
-   }
-merged
-  result 100644 7ec8c001136d655a2ecce3d56b9a6804762172fa app/src/main-process/menu/build-default-menu.ts
-  our    100644 e23a8e9a3b6cd377b7be7cc89ec15dae2d4c6da2 app/src/main-process/menu/build-default-menu.ts
-@@ -2,7 +2,7 @@
- import { ensureItemIds } from './ensure-item-ids'
- import { MenuEvent } from './menu-event'
- import { getLogDirectoryPath } from '../../lib/logging/get-log-path'
--import { mkdirIfNeeded } from '../../lib/file-system'
-+import { ensureDir } from 'fs-extra'
-
- import { log } from '../log'
- import { openDirectorySafe } from '../shell'
-@@ -114,7 +114,11 @@
-       { role: 'cut', label: __DARWIN__ ? 'Cut' : 'Cu&t' },
-       { role: 'copy', label: __DARWIN__ ? 'Copy' : '&Copy' },
-       { role: 'paste', label: __DARWIN__ ? 'Paste' : '&Paste' },
--      { role: 'selectall', label: __DARWIN__ ? 'Select All' : 'Select &all' },
-+      {
-+        label: __DARWIN__ ? 'Select All' : 'Select &all',
-+        accelerator: 'CmdOrCtrl+A',
-+        click: emit('select-all'),
-+      },
-     ],
-   })
-
-@@ -125,13 +129,13 @@
-         label: __DARWIN__ ? 'Show Changes' : '&Changes',
-         id: 'show-changes',
-         accelerator: 'CmdOrCtrl+1',
--        click: emit('select-changes'),
-+        click: emit('show-changes'),
-       },
-       {
-         label: __DARWIN__ ? 'Show History' : '&History',
-         id: 'show-history',
-         accelerator: 'CmdOrCtrl+2',
--        click: emit('select-history'),
-+        click: emit('show-history'),
-       },
-       {
-         label: __DARWIN__ ? 'Show Repository List' : 'Repository &list',
-@@ -285,6 +289,12 @@
-         click: emit('update-branch'),
-       },
-       {
-+        label: __DARWIN__ ? 'Compare to Branch' : '&Compare to branch',
-+        id: 'compare-to-branch',
-+        accelerator: 'CmdOrCtrl+Shift+B',
-+        click: emit('compare-to-branch'),
-+      },
-+      {
-         label: __DARWIN__
-           ? 'Merge Into Current Branch…'
-           : '&Merge into current branch…',
-@@ -294,10 +304,10 @@
-       },
-       separator,
-       {
--        label: __DARWIN__ ? 'Compare on GitHub' : '&Compare on GitHub',
--        id: 'compare-branch',
-+        label: __DARWIN__ ? 'Compare on GitHub' : 'Compare on &GitHub',
-+        id: 'compare-on-github',
-         accelerator: 'CmdOrCtrl+Shift+C',
--        click: emit('compare-branch'),
-+        click: emit('compare-on-github'),
-       },
-       {
-         label: pullRequestLabel,
-@@ -324,7 +334,7 @@
-   const submitIssueItem: Electron.MenuItemConstructorOptions = {
-     label: __DARWIN__ ? 'Report Issue…' : 'Report issue…',
-     click() {
--      shell.openExternal('https://github.com/desktop/desktop/issues/new')
-+      shell.openExternal('https://github.com/desktop/desktop/issues/new/choose')
-     },
-   }
-
-@@ -346,13 +356,15 @@
-
-   const showLogsLabel = __DARWIN__
-     ? 'Show Logs in Finder'
--    : __WIN32__ ? 'S&how logs in Explorer' : 'S&how logs in your File Manager'
-+    : __WIN32__
-+      ? 'S&how logs in Explorer'
-+      : 'S&how logs in your File Manager'
-
-   const showLogsItem: Electron.MenuItemConstructorOptions = {
-     label: showLogsLabel,
-     click() {
-       const logPath = getLogDirectoryPath()
--      mkdirIfNeeded(logPath)
-+      ensureDir(logPath)
-         .then(() => {
-           openDirectorySafe(logPath)
-         })
-merged
-  result 100644 a0568e66362057b90a91743f0aa68d083d286744 app/src/main-process/menu/menu-event.ts
-  our    100644 530863955062bb7a426d8f4cb55b7ba2890f4294 app/src/main-process/menu/menu-event.ts
-@@ -1,8 +1,8 @@
- export type MenuEvent =
-   | 'push'
-   | 'pull'
--  | 'select-changes'
--  | 'select-history'
-+  | 'show-changes'
-+  | 'show-history'
-   | 'add-local-repository'
-   | 'create-branch'
-   | 'show-branches'
-@@ -14,10 +14,11 @@
-   | 'choose-repository'
-   | 'open-working-directory'
-   | 'update-branch'
-+  | 'compare-to-branch'
-   | 'merge-branch'
-   | 'show-repository-settings'
-   | 'open-in-shell'
--  | 'compare-branch'
-+  | 'compare-on-github'
-   | 'view-repository-on-github'
-   | 'clone-repository'
-   | 'show-about'
-@@ -25,3 +26,4 @@
-   | 'open-pull-request'
-   | 'install-cli'
-   | 'open-external-editor'
-+  | 'select-all'
-merged
-  result 100644 3435bb2d1a982289132aabf4d0bbfea55730c644 app/src/main-process/menu/menu-ids.ts
-  our    100644 016034d30cd14a867effcf1b5142c320e786aab6 app/src/main-process/menu/menu-ids.ts
-@@ -5,7 +5,7 @@
-   | 'update-branch'
-   | 'merge-branch'
-   | 'view-repository-on-github'
--  | 'compare-branch'
-+  | 'compare-on-github'
-   | 'open-in-shell'
-   | 'push'
-   | 'pull'
-@@ -25,3 +25,4 @@
-   | 'clone-repository'
-   | 'about'
-   | 'create-pull-request'
-+  | 'compare-to-branch'
-merged
-  result 100644 5f8bcfd5aa2b2f30f81fe1cd9a2973bcc9b9f14f app/src/main-process/squirrel-updater.ts
-  our    100644 d91124b5c21b55938e5e07f48cbf194bf6ba5df6 app/src/main-process/squirrel-updater.ts
-@@ -1,7 +1,8 @@
--import * as ChildProcess from 'child_process'
- import * as Path from 'path'
- import * as Os from 'os'
--import { pathExists, mkdirIfNeeded, writeFile } from '../lib/file-system'
-+
-+import { pathExists, ensureDir, writeFile } from 'fs-extra'
-+import { spawn, getPathSegments, setPathSegments } from '../lib/process/win32'
-
- const appFolder = Path.resolve(process.execPath, '..')
- const rootAppDir = Path.resolve(appFolder, '..')
-@@ -46,7 +47,7 @@
-
- async function installCLI(): Promise<void> {
-   const binPath = getBinPath()
--  await mkdirIfNeeded(binPath)
-+  await ensureDir(binPath)
-   await writeBatchScriptCLITrampoline(binPath)
-   await writeShellScriptCLITrampoline(binPath)
-   const paths = await getPathSegments()
-@@ -79,7 +80,7 @@
-  * rewrite the trampoline to point to the new, version-specific path. Bingo
-  * bango Bob's your uncle.
-  */
--async function writeBatchScriptCLITrampoline(binPath: string): Promise<void> {
-+function writeBatchScriptCLITrampoline(binPath: string): Promise<void> {
-   const versionedPath = resolveVersionedPath(
-     binPath,
-     'resources/app/static/github.bat'
-@@ -91,7 +92,7 @@
-   return writeFile(trampolinePath, trampoline)
- }
-
--async function writeShellScriptCLITrampoline(binPath: string): Promise<void> {
-+function writeShellScriptCLITrampoline(binPath: string): Promise<void> {
-   const versionedPath = resolveVersionedPath(
-     binPath,
-     'resources/app/static/github.sh'
-@@ -153,86 +154,3 @@
-     return createShortcut(['StartMenu', 'Desktop'])
-   }
- }
--
--/** Get the path segments in the user's `Path`. */
--async function getPathSegments(): Promise<ReadonlyArray<string>> {
--  let powershellPath: string
--  const systemRoot = process.env['SystemRoot']
--  if (systemRoot) {
--    const system32Path = Path.join(process.env.SystemRoot, 'System32')
--    powershellPath = Path.join(
--      system32Path,
--      'WindowsPowerShell',
--      'v1.0',
--      'powershell.exe'
--    )
--  } else {
--    powershellPath = 'powershell.exe'
--  }
--
--  const args = [
--    '-noprofile',
--    '-ExecutionPolicy',
--    'RemoteSigned',
--    '-command',
--    // Set encoding and execute the command, capture the output, and return it
--    // via .NET's console in order to have consistent UTF-8 encoding.
--    // See http://stackoverflow.com/questions/22349139/utf-8-output-from-powershell
--    // to address https://github.com/atom/atom/issues/5063
--    `
--      [Console]::OutputEncoding=[System.Text.Encoding]::UTF8
--      $output=[environment]::GetEnvironmentVariable('Path', 'User')
--      [Console]::WriteLine($output)
--    `,
--  ]
--
--  const stdout = await spawn(powershellPath, args)
--  const pathOutput = stdout.replace(/^\s+|\s+$/g, '')
--  return pathOutput.split(/;+/).filter(segment => segment.length)
--}
--
--/** Set the user's `Path`. */
--async function setPathSegments(paths: ReadonlyArray<string>): Promise<void> {
--  let setxPath: string
--  const systemRoot = process.env['SystemRoot']
--  if (systemRoot) {
--    const system32Path = Path.join(systemRoot, 'System32')
--    setxPath = Path.join(system32Path, 'setx.exe')
--  } else {
--    setxPath = 'setx.exe'
--  }
--
--  await spawn(setxPath, ['Path', paths.join(';')])
--}
--
--/** Spawn a command with arguments and capture its output. */
--function spawn(command: string, args: ReadonlyArray<string>): Promise<string> {
--  try {
--    const child = ChildProcess.spawn(command, args as string[])
--    return new Promise<string>((resolve, reject) => {
--      let stdout = ''
--      child.stdout.on('data', data => {
--        stdout += data
--      })
--
--      child.on('close', code => {
--        if (code === 0) {
--          resolve(stdout)
--        } else {
--          reject(new Error(`Command "${command} ${args}" failed: "${stdout}"`))
--        }
--      })
--
--      child.on('error', (err: Error) => {
--        reject(err)
--      })
--
--      // This is necessary if using Powershell 2 on Windows 7 to get the events
--      // to raise.
--      // See http://stackoverflow.com/questions/9155289/calling-powershell-from-nodejs
--      child.stdin.end()
--    })
--  } catch (error) {
--    return Promise.reject(error)
--  }
--}
-merged
-  result 100644 f7e88ccf95c03ecb3df22ba8bbcd817652a83fe0 app/src/models/branch.ts
-  our    100644 1a16bdd23db314c080802efa3f454878ac0eae63 app/src/models/branch.ts
-@@ -8,6 +8,39 @@
-   Remote = 1,
- }
-
-+/** The number of commits a revision range is ahead/behind. */
-+export interface IAheadBehind {
-+  readonly ahead: number
-+  readonly behind: number
-+}
-+
-+/** The result of comparing two refs in a repository. */
-+export interface ICompareResult extends IAheadBehind {
-+  readonly commits: ReadonlyArray<Commit>
-+}
-+
-+/**
-+ * Check if a branch is eligible for beign fast forarded.
-+ *
-+ * Requirements:
-+ *   1. It's local.
-+ *   2. It's not the current branch.
-+ *   3. It has an upstream.
-+ *
-+ * @param branch The branch to validate
-+ * @param currentBranchName The current branch in the repository
-+ */
-+export function eligibleForFastForward(
-+  branch: Branch,
-+  currentBranchName: string | null
-+): boolean {
-+  return (
-+    branch.type === BranchType.Local &&
-+    branch.name !== currentBranchName &&
-+    branch.upstream != null
-+  )
-+}
-+
- /** A branch as loaded from Git. */
- export class Branch {
-   /** The short name of the branch. E.g., `master`. */
-merged
-  result 100644 09b508aa3d46107e1f7bfdb7d23ec7e572146082 app/src/models/commit.ts
-  our    100644 a6eb444fb8650f5e8e351782b02aced729e4933b app/src/models/commit.ts
-@@ -118,7 +118,7 @@
-
-     if (this.committer.name === 'GitHub Enterprise') {
-       const host = new URL(endpoint).host.toLowerCase()
--      return email === `noreply@${host}`
-+      return email.endsWith(`@${host}`)
-     }
-
-     return false
-added in remote
-  their  100644 25149364d06e0118a724af12a46e1d9e39fa94d6 app/src/models/diff/diff-data.ts
-@@ -0,0 +1,100 @@
-+import { DiffHunk } from './raw-diff'
-+import { Image } from './image'
-+/**
-+ * V8 has a limit on the size of string it can create, and unless we want to
-+ * trigger an unhandled exception we need to do the encoding conversion by hand
-+ */
-+export const maximumDiffStringSize = 268435441
-+
-+export enum DiffType {
-+  /** Changes to a text file, which may be partially selected for commit */
-+  Text,
-+  /** Changes to a file with a known extension, which can be viewed in the app */
-+  Image,
-+  /** Changes to an unknown file format, which Git is unable to present in a human-friendly format */
-+  Binary,
-+  /** Change to a repository which is included as a submodule of this repository */
-+  Submodule,
-+  /** Diff is large enough to degrade ux if rendered */
-+  LargeText,
-+  /** Diff that will not be rendered */
-+  Unrenderable,
-+}
-+
-+type LineEnding = 'CR' | 'LF' | 'CRLF'
-+
-+export type LineEndingsChange = {
-+  from: LineEnding
-+  to: LineEnding
-+}
-+
-+/** Parse the line ending string into an enum value (or `null` if unknown) */
-+export function parseLineEndingText(text: string): LineEnding | null {
-+  const input = text.trim()
-+  switch (input) {
-+    case 'CR':
-+      return 'CR'
-+    case 'LF':
-+      return 'LF'
-+    case 'CRLF':
-+      return 'CRLF'
-+    default:
-+      return null
-+  }
-+}
-+
-+/**
-+ * Data returned as part of a textual diff from Desktop
-+ */
-+interface ITextDiffData {
-+  /** The unified text diff - including headers and context */
-+  readonly text: string
-+  /** The diff contents organized by hunk - how the git CLI outputs to the caller */
-+  readonly hunks: ReadonlyArray<DiffHunk>
-+  /** A warning from Git that the line endings have changed in this file and will affect the commit */
-+  readonly lineEndingsChange?: LineEndingsChange
-+}
-+
-+export interface ITextDiff extends ITextDiffData {
-+  readonly kind: DiffType.Text
-+}
-+
-+/**
-+ * Data returned as part of an image diff in Desktop
-+ */
-+export interface IImageDiff {
-+  readonly kind: DiffType.Image
-+
-+  /**
-+   * The previous image, if the file was modified or deleted
-+   *
-+   * Will be undefined for an added image
-+   */
-+  readonly previous?: Image
-+  /**
-+   * The current image, if the file was added or modified
-+   *
-+   * Will be undefined for a deleted image
-+   */
-+  readonly current?: Image
-+}
-+
-+export interface IBinaryDiff {
-+  readonly kind: DiffType.Binary
-+}
-+
-+export interface ILargeTextDiff extends ITextDiffData {
-+  readonly kind: DiffType.LargeText
-+}
-+
-+export interface IUnrenderableDiff {
-+  readonly kind: DiffType.Unrenderable
-+}
-+
-+/** The union of diff types that can be rendered in Desktop */
-+export type IDiff =
-+  | ITextDiff
-+  | IImageDiff
-+  | IBinaryDiff
-+  | ILargeTextDiff
-+  | IUnrenderableDiff
-added in remote
-  their  100644 c67a37739d99c6a375e9f4e5675a3b48eb8031ea app/src/models/diff/diff-line.ts
-@@ -0,0 +1,49 @@
-+/** indicate what a line in the diff represents */
-+export enum DiffLineType {
-+  Context,
-+  Add,
-+  Delete,
-+  Hunk,
-+}
-+
-+/** track details related to each line in the diff */
-+export class DiffLine {
-+  public readonly text: string
-+  public readonly type: DiffLineType
-+  public readonly oldLineNumber: number | null
-+  public readonly newLineNumber: number | null
-+  public readonly noTrailingNewLine: boolean
-+
-+  public constructor(
-+    text: string,
-+    type: DiffLineType,
-+    oldLineNumber: number | null,
-+    newLineNuber: number | null,
-+    noTrailingNewLine: boolean = false
-+  ) {
-+    this.text = text
-+    this.type = type
-+    this.oldLineNumber = oldLineNumber
-+    this.newLineNumber = newLineNuber
-+    this.noTrailingNewLine = noTrailingNewLine
-+  }
-+
-+  public withNoTrailingNewLine(noTrailingNewLine: boolean): DiffLine {
-+    return new DiffLine(
-+      this.text,
-+      this.type,
-+      this.oldLineNumber,
-+      this.newLineNumber,
-+      noTrailingNewLine
-+    )
-+  }
-+
-+  public isIncludeableLine() {
-+    return this.type === DiffLineType.Add || this.type === DiffLineType.Delete
-+  }
-+
-+  /** The content of the line, i.e., without the line type marker. */
-+  public get content(): string {
-+    return this.text.substr(1)
-+  }
-+}
-added in remote
-  their  100644 e93f04b45de5a0329772d8ff16c2b5a33afedc3f app/src/models/diff/diff-selection.ts
-@@ -0,0 +1,291 @@
-+import { assertNever } from '../../lib/fatal-error'
-+
-+/**
-+ * The state of a file's diff selection
-+ */
-+export enum DiffSelectionType {
-+  /** The entire file should be committed */
-+  All,
-+  /** A subset of lines in the file have been selected for committing */
-+  Partial,
-+  /** The file should be excluded from committing */
-+  None,
-+}
-+
-+/**
-+ * Utility function which determines whether a boolean selection state
-+ * matches the given DiffSelectionType. A true selection state matches
-+ * DiffSelectionType.All, a false selection state matches
-+ * DiffSelectionType.None and if the selection type is partial there's
-+ * never a match.
-+ */
-+function typeMatchesSelection(
-+  selectionType: DiffSelectionType,
-+  selected: boolean
-+): boolean {
-+  switch (selectionType) {
-+    case DiffSelectionType.All:
-+      return selected
-+    case DiffSelectionType.None:
-+      return !selected
-+    case DiffSelectionType.Partial:
-+      return false
-+    default:
-+      return assertNever(
-+        selectionType,
-+        `Unknown selection type ${selectionType}`
-+      )
-+  }
-+}
-+
-+/**
-+ * An immutable, efficient, storage object for tracking selections of indexable
-+ * lines. While general purpose by design this is currently used exclusively for
-+ * tracking selected lines in modified files in the working directory.
-+ *
-+ * This class starts out with an initial (or default) selection state, ie
-+ * either all lines are selected by default or no lines are selected by default.
-+ *
-+ * The selection can then be transformed by marking a line or a range of lines
-+ * as selected or not selected. Internally the class maintains a list of lines
-+ * whose selection state has diverged from the default selection state.
-+ */
-+export class DiffSelection {
-+  private readonly defaultSelectionType:
-+    | DiffSelectionType.All
-+    | DiffSelectionType.None
-+
-+  /* Any line numbers where the selection differs from the default state. */
-+  private readonly divergingLines: Set<number> | null
-+
-+  /* Optional set of line numbers which can be selected. */
-+  private readonly selectableLines: Set<number> | null
-+
-+  /**
-+   * Initialize a new selection instance where either all lines are selected by default
-+   * or not lines are selected by default.
-+   */
-+  public static fromInitialSelection(
-+    initialSelection: DiffSelectionType.All | DiffSelectionType.None
-+  ): DiffSelection {
-+    if (
-+      initialSelection !== DiffSelectionType.All &&
-+      initialSelection !== DiffSelectionType.None
-+    ) {
-+      return assertNever(
-+        initialSelection,
-+        'Can only instantiate a DiffSelection with All or None as the initial selection'
-+      )
-+    }
-+
-+    return new DiffSelection(initialSelection, null, null)
-+  }
-+
-+  private constructor(
-+    defaultSelectionType: DiffSelectionType.All | DiffSelectionType.None,
-+    divergingLines: Set<number> | null,
-+    selectableLines: Set<number> | null
-+  ) {
-+    this.defaultSelectionType = defaultSelectionType
-+    this.divergingLines = divergingLines || null
-+    this.selectableLines = selectableLines || null
-+  }
-+
-+  /** Returns a value indicating the computed overall state of the selection */
-+  public getSelectionType(): DiffSelectionType {
-+    const divergingLines = this.divergingLines
-+    const selectableLines = this.selectableLines
-+
-+    // No diverging lines, happy path. Either all lines are selected or none are.
-+    if (!divergingLines) {
-+      return this.defaultSelectionType
-+    }
-+    if (divergingLines.size === 0) {
-+      return this.defaultSelectionType
-+    }
-+
-+    // If we know which lines are selectable we need to check that
-+    // all lines are divergent and return the inverse of default selection.
-+    // To avoid loopting through the set that often our happy path is
-+    // if there's a size mismatch.
-+    if (selectableLines && selectableLines.size === divergingLines.size) {
-+      const allSelectableLinesAreDivergent = [...selectableLines].every(i =>
-+        divergingLines.has(i)
-+      )
-+
-+      if (allSelectableLinesAreDivergent) {
-+        return this.defaultSelectionType === DiffSelectionType.All
-+          ? DiffSelectionType.None
-+          : DiffSelectionType.All
-+      }
-+    }
-+
-+    // Note that without any selectable lines we'll report partial selection
-+    // as long as we have any diverging lines since we have no way of knowing
-+    // if _all_ lines are divergent or not
-+    return DiffSelectionType.Partial
-+  }
-+
-+  /** Returns a value indicating wether the given line number is selected or not */
-+  public isSelected(lineIndex: number): boolean {
-+    const lineIsDivergent =
-+      !!this.divergingLines && this.divergingLines.has(lineIndex)
-+
-+    if (this.defaultSelectionType === DiffSelectionType.All) {
-+      return !lineIsDivergent
-+    } else if (this.defaultSelectionType === DiffSelectionType.None) {
-+      return lineIsDivergent
-+    } else {
-+      return assertNever(
-+        this.defaultSelectionType,
-+        `Unknown base selection type ${this.defaultSelectionType}`
-+      )
-+    }
-+  }
-+
-+  /**
-+   * Returns a value indicating wether the given line number is selectable.
-+   * A line not being selectable usually means it's a hunk header or a context
-+   * line.
-+   */
-+  public isSelectable(lineIndex: number): boolean {
-+    return this.selectableLines ? this.selectableLines.has(lineIndex) : true
-+  }
-+
-+  /**
-+   * Returns a copy of this selection instance with the provided
-+   * line selection update.
-+   *
-+   * @param lineIndex The index (line number) of the line which should
-+   *                 be selected or unselected.
-+   *
-+   * @param selected Whether the given line number should be marked
-+   *                 as selected or not.
-+   */
-+  public withLineSelection(
-+    lineIndex: number,
-+    selected: boolean
-+  ): DiffSelection {
-+    return this.withRangeSelection(lineIndex, 1, selected)
-+  }
-+
-+  /**
-+   * Returns a copy of this selection instance with the provided
-+   * line selection update. This is similar to the withLineSelection
-+   * method except that it allows updating the selection state of
-+   * a range of lines at once. Use this if you ever need to modify
-+   * the selection state of more than one line at a time as it's
-+   * more efficient.
-+   *
-+   * @param from     The line index (inclusive) from where to start
-+   *                 updating the line selection state.
-+   *
-+   * @param to       The number of lines for which to update the
-+   *                 selection state. A value of zero means no lines
-+   *                 are updated and a value of 1 means only the
-+   *                 line given by lineIndex will be updated.
-+   *
-+   * @param selected Whether the lines should be marked as selected
-+   *                 or not.
-+   */
-+  // Lower inclusive, upper exclusive. Same as substring
-+  public withRangeSelection(
-+    from: number,
-+    length: number,
-+    selected: boolean
-+  ): DiffSelection {
-+    const computedSelectionType = this.getSelectionType()
-+    const to = from + length
-+
-+    // Nothing for us to do here. This state is when all lines are already
-+    // selected and we're being asked to select more or when no lines are
-+    // selected and we're being asked to unselect something.
-+    if (typeMatchesSelection(computedSelectionType, selected)) {
-+      return this
-+    }
-+
-+    if (computedSelectionType === DiffSelectionType.Partial) {
-+      const newDivergingLines = new Set<number>(this.divergingLines!)
-+
-+      if (typeMatchesSelection(this.defaultSelectionType, selected)) {
-+        for (let i = from; i < to; i++) {
-+          newDivergingLines.delete(i)
-+        }
-+      } else {
-+        for (let i = from; i < to; i++) {
-+          // Ensure it's selectable
-+          if (this.isSelectable(i)) {
-+            newDivergingLines.add(i)
-+          }
-+        }
-+      }
-+
-+      return new DiffSelection(
-+        this.defaultSelectionType,
-+        newDivergingLines.size === 0 ? null : newDivergingLines,
-+        this.selectableLines
-+      )
-+    } else {
-+      const newDivergingLines = new Set<number>()
-+      for (let i = from; i < to; i++) {
-+        if (this.isSelectable(i)) {
-+          newDivergingLines.add(i)
-+        }
-+      }
-+
-+      return new DiffSelection(
-+        computedSelectionType,
-+        newDivergingLines,
-+        this.selectableLines
-+      )
-+    }
-+  }
-+
-+  /**
-+   * Returns a copy of this selection instance where the selection state
-+   * of the specified line has been toggled (inverted).
-+   *
-+   * @param lineIndex The index (line number) of the line which should
-+   *                 be selected or unselected.
-+   */
-+  public withToggleLineSelection(lineIndex: number): DiffSelection {
-+    return this.withLineSelection(lineIndex, !this.isSelected(lineIndex))
-+  }
-+
-+  /**
-+   * Returns a copy of this selection instance with all lines selected.
-+   */
-+  public withSelectAll(): DiffSelection {
-+    return new DiffSelection(DiffSelectionType.All, null, this.selectableLines)
-+  }
-+
-+  /**
-+   * Returns a copy of this selection instance with no lines selected.
-+   */
-+  public withSelectNone(): DiffSelection {
-+    return new DiffSelection(DiffSelectionType.None, null, this.selectableLines)
-+  }
-+
-+  /**
-+   * Returns a copy of this selection instance with a specified set of
-+   * selecable lines. By default a DiffSelection instance allows selecting
-+   * all lines (in fact, it has no notion of how many lines exists or what
-+   * it is that is being selected).
-+   *
-+   * If the selection instance lacks a set of selectable lines it can not
-+   * supply an accurate value from getSelectionType when the selection of
-+   * all lines have diverged from the default state (since it doesn't know
-+   * what all lines mean).
-+   */
-+  public withSelectableLines(selectableLines: Set<number>) {
-+    const divergingLines = this.divergingLines
-+      ? new Set([...this.divergingLines].filter(x => selectableLines.has(x)))
-+      : null
-+
-+    return new DiffSelection(
-+      this.defaultSelectionType,
-+      divergingLines,
-+      selectableLines
-+    )
-+  }
-+}
-added in remote
-  their  100644 ec1f951bc9326443ec440600c4c2edcf51e5f4f5 app/src/models/diff/image.ts
-@@ -0,0 +1,25 @@
-+/**
-+ * A container for holding an image for display in the application
-+ */
-+export class Image {
-+  /**
-+   * The base64 encoded contents of the image
-+   */
-+  public readonly contents: string
-+
-+  /**
-+   * The data URI media type, so the browser can render the image correctly
-+   */
-+  public readonly mediaType: string
-+
-+  /**
-+   * Size of the file in bytes
-+   */
-+  public readonly bytes: number
-+
-+  public constructor(contents: string, mediaType: string, bytes: number) {
-+    this.contents = contents
-+    this.mediaType = mediaType
-+    this.bytes = bytes
-+  }
-+}
-added in remote
-  their  100644 ff04279f640811cae78963c899aa24f987d2bd30 app/src/models/diff/index.ts
-@@ -0,0 +1,5 @@
-+export * from './diff-data'
-+export * from './diff-line'
-+export * from './diff-selection'
-+export * from './image'
-+export * from './raw-diff'
-added in remote
-  their  100644 3182bf4a9cd153fa9d0a33937c7001a783ed140f app/src/models/diff/raw-diff.ts
-@@ -0,0 +1,87 @@
-+import { DiffLine } from './diff-line'
-+
-+/** each diff is made up of a number of hunks */
-+export class DiffHunk {
-+  /** details from the diff hunk header about the line start and patch length */
-+  public readonly header: DiffHunkHeader
-+  /** the contents - context and changes - of the diff setion */
-+  public readonly lines: ReadonlyArray<DiffLine>
-+  /** the diff hunk's start position in the overall file diff */
-+  public readonly unifiedDiffStart: number
-+  /** the diff hunk's end position in the overall file diff */
-+  public readonly unifiedDiffEnd: number
-+
-+  public constructor(
-+    header: DiffHunkHeader,
-+    lines: ReadonlyArray<DiffLine>,
-+    unifiedDiffStart: number,
-+    unifiedDiffEnd: number
-+  ) {
-+    this.header = header
-+    this.unifiedDiffStart = unifiedDiffStart
-+    this.unifiedDiffEnd = unifiedDiffEnd
-+    this.lines = lines
-+  }
-+}
-+
-+/** details about the start and end of a diff hunk */
-+export class DiffHunkHeader {
-+  /** The line in the old (or original) file where this diff hunk starts */
-+  public readonly oldStartLine: number
-+
-+  /** The number of lines in the old (or original) file that this diff hunk covers */
-+  public readonly oldLineCount: number
-+
-+  /** The line in the new file where this diff hunk starts */
-+  public readonly newStartLine: number
-+
-+  /** The number of lines in the new file that this diff hunk covers */
-+  public readonly newLineCount: number
-+
-+  public constructor(
-+    oldStartLine: number,
-+    oldLineCount: number,
-+    newStartLine: number,
-+    newLineCount: number,
-+    sectionHeading?: string | null
-+  ) {
-+    this.oldStartLine = oldStartLine
-+    this.oldLineCount = oldLineCount
-+    this.newStartLine = newStartLine
-+    this.newLineCount = newLineCount
-+  }
-+}
-+
-+/** the contents of a diff generated by Git */
-+export interface IRawDiff {
-+  /**
-+   * The plain text contents of the diff header. This contains
-+   * everything from the start of the diff up until the first
-+   * hunk header starts. Note that this does not include a trailing
-+   * newline.
-+   */
-+  readonly header: string
-+
-+  /**
-+   * The plain text contents of the diff. This contains everything
-+   * after the diff header until the last character in the diff.
-+   *
-+   * Note that this does not include a trailing newline nor does
-+   * it include diff 'no newline at end of file' comments. For
-+   * no-newline information, consult the DiffLine noTrailingNewLine
-+   * property.
-+   */
-+  readonly contents: string
-+
-+  /**
-+   * Each hunk in the diff with information about start, and end
-+   * positions, lines and line statuses.
-+   */
-+  readonly hunks: ReadonlyArray<DiffHunk>
-+
-+  /**
-+   * Whether or not the unified diff indicates that the contents
-+   * could not be diffed due to one of the versions being binary.
-+   */
-+  readonly isBinary: boolean
-+}
-removed in remote
-  base   100644 a87d16ff4a97dc592dfabe66a69a340629d70ea8 app/src/models/diff.ts
-  our    100644 a87d16ff4a97dc592dfabe66a69a340629d70ea8 app/src/models/diff.ts
-@@ -1,571 +0,0 @@
--import { assertNever } from '../lib/fatal-error'
--
--/**
-- * V8 has a limit on the size of string it can create, and unless we want to
-- * trigger an unhandled exception we need to do the encoding conversion by hand
-- */
--export const maximumDiffStringSize = 268435441
--
--/**
-- * A container for holding an image for display in the application
-- */
--export class Image {
--  /**
--   * The base64 encoded contents of the image
--   */
--  public readonly contents: string
--
--  /**
--   * The data URI media type, so the browser can render the image correctly
--   */
--  public readonly mediaType: string
--
--  public constructor(contents: string, mediaType: string) {
--    this.contents = contents
--    this.mediaType = mediaType
--  }
--}
--
--/** each diff is made up of a number of hunks */
--export class DiffHunk {
--  /** details from the diff hunk header about the line start and patch length */
--  public readonly header: DiffHunkHeader
--  /** the contents - context and changes - of the diff setion */
--  public readonly lines: ReadonlyArray<DiffLine>
--  /** the diff hunk's start position in the overall file diff */
--  public readonly unifiedDiffStart: number
--  /** the diff hunk's end position in the overall file diff */
--  public readonly unifiedDiffEnd: number
--
--  public constructor(
--    header: DiffHunkHeader,
--    lines: ReadonlyArray<DiffLine>,
--    unifiedDiffStart: number,
--    unifiedDiffEnd: number
--  ) {
--    this.header = header
--    this.unifiedDiffStart = unifiedDiffStart
--    this.unifiedDiffEnd = unifiedDiffEnd
--    this.lines = lines
--  }
--}
--
--export enum DiffType {
--  /** Changes to a text file, which may be partially selected for commit */
--  Text,
--  /** Changes to files of a known format, which can be viewed in the app */
--  Image,
--  /** Changes to an unknown file format, which Git is unable to present in a human-friendly format */
--  Binary,
--  /** Change to a repository which is included as a submodule of this repository */
--  Submodule,
--  /** Diff is large enough to degrade ux if rendered */
--  LargeText,
--  /** Diff that will not be rendered */
--  Unrenderable,
--}
--
--/** indicate what a line in the diff represents */
--export enum DiffLineType {
--  Context,
--  Add,
--  Delete,
--  Hunk,
--}
--
--type LineEnding = 'CR' | 'LF' | 'CRLF'
--
--export type LineEndingsChange = {
--  from: LineEnding
--  to: LineEnding
--}
--
--/** Parse the line ending string into an enum value (or `null` if unknown) */
--export function parseLineEndingText(text: string): LineEnding | null {
--  const input = text.trim()
--  switch (input) {
--    case 'CR':
--      return 'CR'
--    case 'LF':
--      return 'LF'
--    case 'CRLF':
--      return 'CRLF'
--    default:
--      return null
--  }
--}
--
--export interface ITextDiff {
--  readonly kind: DiffType.Text
--  /** The unified text diff - including headers and context */
--  readonly text: string
--  /** The diff contents organized by hunk - how the git CLI outputs to the caller */
--  readonly hunks: ReadonlyArray<DiffHunk>
--  /** A warning from Git that the line endings have changed in this file and will affect the commit */
--  readonly lineEndingsChange?: LineEndingsChange
--}
--
--export interface IImageDiff {
--  readonly kind: DiffType.Image
--  /**
--   * The previous image, if the file was modified or deleted
--   *
--   * Will be undefined for an added image
--   */
--  readonly previous?: Image
--  /**
--   * The current image, if the file was added or modified
--   *
--   * Will be undefined for a deleted image
--   */
--  readonly current?: Image
--}
--
--export interface IBinaryDiff {
--  readonly kind: DiffType.Binary
--}
--
--export interface ILargeTextDiff {
--  readonly kind: DiffType.LargeText
--  /** The unified text diff - including headers and context */
--  readonly text: string
--  /** The diff contents organized by hunk - how the git CLI outputs to the caller */
--  readonly hunks: ReadonlyArray<DiffHunk>
--  /** A warning from Git that the line endings have changed in this file and will affect the commit */
--  readonly lineEndingsChange?: LineEndingsChange
--}
--
--export interface IUnrenderableDiff {
--  readonly kind: DiffType.Unrenderable
--}
--
--/** The union of diff types that can be rendered in Desktop */
--export type IDiff =
--  | ITextDiff
--  | IImageDiff
--  | IBinaryDiff
--  | ILargeTextDiff
--  | IUnrenderableDiff
--
--/** track details related to each line in the diff */
--export class DiffLine {
--  public readonly text: string
--  public readonly type: DiffLineType
--  public readonly oldLineNumber: number | null
--  public readonly newLineNumber: number | null
--  public readonly noTrailingNewLine: boolean
--
--  public constructor(
--    text: string,
--    type: DiffLineType,
--    oldLineNumber: number | null,
--    newLineNuber: number | null,
--    noTrailingNewLine: boolean = false
--  ) {
--    this.text = text
--    this.type = type
--    this.oldLineNumber = oldLineNumber
--    this.newLineNumber = newLineNuber
--    this.noTrailingNewLine = noTrailingNewLine
--  }
--
--  public withNoTrailingNewLine(noTrailingNewLine: boolean): DiffLine {
--    return new DiffLine(
--      this.text,
--      this.type,
--      this.oldLineNumber,
--      this.newLineNumber,
--      noTrailingNewLine
--    )
--  }
--
--  public isIncludeableLine() {
--    return this.type === DiffLineType.Add || this.type === DiffLineType.Delete
--  }
--
--  /** The content of the line, i.e., without the line type marker. */
--  public get content(): string {
--    return this.text.substr(1)
--  }
--}
--
--/** details about the start and end of a diff hunk */
--export class DiffHunkHeader {
--  /** The line in the old (or original) file where this diff hunk starts */
--  public readonly oldStartLine: number
--
--  /** The number of lines in the old (or original) file that this diff hunk covers */
--  public readonly oldLineCount: number
--
--  /** The line in the new file where this diff hunk starts */
--  public readonly newStartLine: number
--
--  /** The number of lines in the new file that this diff hunk covers */
--  public readonly newLineCount: number
--
--  public constructor(
--    oldStartLine: number,
--    oldLineCount: number,
--    newStartLine: number,
--    newLineCount: number,
--    sectionHeading?: string | null
--  ) {
--    this.oldStartLine = oldStartLine
--    this.oldLineCount = oldLineCount
--    this.newStartLine = newStartLine
--    this.newLineCount = newLineCount
--  }
--}
--
--export class FileSummary {
--  /**
--   * The number of lines added as part of this change.
--   *
--   * If the file is a binary change, this value is undefined.
--   */
--  public readonly added?: number
--  /**
--   * The number of lines removed as part of this change.
--   *
--   * If the file is a binary change, this value is undefined.
--   */
--  public readonly removed?: number
--
--  /**
--   * The path to this change, relative to the submodule root
--   */
--  public readonly path: string
--
--  public constructor(
--    path: string,
--    added: number | undefined,
--    removed: number | undefined
--  ) {
--    this.path = path
--    this.added = added
--    this.removed = removed
--  }
--
--  /** An ID for the file change. */
--  public get id(): string {
--    return `${this.added}+${this.removed}+${this.path}`
--  }
--}
--
--/** the contents of a diff generated by Git */
--export interface IRawDiff {
--  /**
--   * The plain text contents of the diff header. This contains
--   * everything from the start of the diff up until the first
--   * hunk header starts. Note that this does not include a trailing
--   * newline.
--   */
--  readonly header: string
--
--  /**
--   * The plain text contents of the diff. This contains everything
--   * after the diff header until the last character in the diff.
--   *
--   * Note that this does not include a trailing newline nor does
--   * it include diff 'no newline at end of file' comments. For
--   * no-newline information, consult the DiffLine noTrailingNewLine
--   * property.
--   */
--  readonly contents: string
--
--  /**
--   * Each hunk in the diff with information about start, and end
--   * positions, lines and line statuses.
--   */
--  readonly hunks: ReadonlyArray<DiffHunk>
--
--  /**
--   * Whether or not the unified diff indicates that the contents
--   * could not be diffed due to one of the versions being binary.
--   */
--  readonly isBinary: boolean
--}
--
--export enum DiffSelectionType {
--  All,
--  Partial,
--  None,
--}
--
--/**
-- * Utility function which determines whether a boolean selection state
-- * matches the given DiffSelectionType. A true selection state matches
-- * DiffSelectionType.All, a false selection state matches
-- * DiffSelectionType.None and if the selection type is partial there's
-- * never a match.
-- */
--function typeMatchesSelection(
--  selectionType: DiffSelectionType,
--  selected: boolean
--): boolean {
--  switch (selectionType) {
--    case DiffSelectionType.All:
--      return selected
--    case DiffSelectionType.None:
--      return !selected
--    case DiffSelectionType.Partial:
--      return false
--    default:
--      return assertNever(
--        selectionType,
--        `Unknown selection type ${selectionType}`
--      )
--  }
--}
--
--/**
-- * An immutable, efficient, storage object for tracking selections of indexable
-- * lines. While general purpose by design this is currently used exclusively for
-- * tracking selected lines in modified files in the working directory.
-- *
-- * This class starts out with an initial (or default) selection state, ie
-- * either all lines are selected by default or no lines are selected by default.
-- *
-- * The selection can then be transformed by marking a line or a range of lines
-- * as selected or not selected. Internally the class maintains a list of lines
-- * whose selection state has diverged from the default selection state.
-- */
--export class DiffSelection {
--  private readonly defaultSelectionType:
--    | DiffSelectionType.All
--    | DiffSelectionType.None
--
--  /* Any line numbers where the selection differs from the default state. */
--  private readonly divergingLines: Set<number> | null
--
--  /* Optional set of line numbers which can be selected. */
--  private readonly selectableLines: Set<number> | null
--
--  /**
--   * Initialize a new selection instance where either all lines are selected by default
--   * or not lines are selected by default.
--   */
--  public static fromInitialSelection(
--    initialSelection: DiffSelectionType.All | DiffSelectionType.None
--  ): DiffSelection {
--    if (
--      initialSelection !== DiffSelectionType.All &&
--      initialSelection !== DiffSelectionType.None
--    ) {
--      return assertNever(
--        initialSelection,
--        'Can only instantiate a DiffSelection with All or None as the initial selection'
--      )
--    }
--
--    return new DiffSelection(initialSelection, null, null)
--  }
--
--  private constructor(
--    defaultSelectionType: DiffSelectionType.All | DiffSelectionType.None,
--    divergingLines: Set<number> | null,
--    selectableLines: Set<number> | null
--  ) {
--    this.defaultSelectionType = defaultSelectionType
--    this.divergingLines = divergingLines || null
--    this.selectableLines = selectableLines || null
--  }
--
--  /** Returns a value indicating the computed overall state of the selection */
--  public getSelectionType(): DiffSelectionType {
--    const divergingLines = this.divergingLines
--    const selectableLines = this.selectableLines
--
--    // No diverging lines, happy path. Either all lines are selected or none are.
--    if (!divergingLines) {
--      return this.defaultSelectionType
--    }
--    if (divergingLines.size === 0) {
--      return this.defaultSelectionType
--    }
--
--    // If we know which lines are selectable we need to check that
--    // all lines are divergent and return the inverse of default selection.
--    // To avoid loopting through the set that often our happy path is
--    // if there's a size mismatch.
--    if (selectableLines && selectableLines.size === divergingLines.size) {
--      const allSelectableLinesAreDivergent = [...selectableLines].every(i =>
--        divergingLines.has(i)
--      )
--
--      if (allSelectableLinesAreDivergent) {
--        return this.defaultSelectionType === DiffSelectionType.All
--          ? DiffSelectionType.None
--          : DiffSelectionType.All
--      }
--    }
--
--    // Note that without any selectable lines we'll report partial selection
--    // as long as we have any diverging lines since we have no way of knowing
--    // if _all_ lines are divergent or not
--    return DiffSelectionType.Partial
--  }
--
--  /** Returns a value indicating wether the given line number is selected or not */
--  public isSelected(lineIndex: number): boolean {
--    const lineIsDivergent =
--      !!this.divergingLines && this.divergingLines.has(lineIndex)
--
--    if (this.defaultSelectionType === DiffSelectionType.All) {
--      return !lineIsDivergent
--    } else if (this.defaultSelectionType === DiffSelectionType.None) {
--      return lineIsDivergent
--    } else {
--      return assertNever(
--        this.defaultSelectionType,
--        `Unknown base selection type ${this.defaultSelectionType}`
--      )
--    }
--  }
--
--  /**
--   * Returns a value indicating wether the given line number is selectable.
--   * A line not being selectable usually means it's a hunk header or a context
--   * line.
--   */
--  public isSelectable(lineIndex: number): boolean {
--    return this.selectableLines ? this.selectableLines.has(lineIndex) : true
--  }
--
--  /**
--   * Returns a copy of this selection instance with the provided
--   * line selection update.
--   *
--   * @param lineIndex The index (line number) of the line which should
--   *                 be selected or unselected.
--   *
--   * @param selected Whether the given line number should be marked
--   *                 as selected or not.
--   */
--  public withLineSelection(
--    lineIndex: number,
--    selected: boolean
--  ): DiffSelection {
--    return this.withRangeSelection(lineIndex, 1, selected)
--  }
--
--  /**
--   * Returns a copy of this selection instance with the provided
--   * line selection update. This is similar to the withLineSelection
--   * method except that it allows updating the selection state of
--   * a range of lines at once. Use this if you ever need to modify
--   * the selection state of more than one line at a time as it's
--   * more efficient.
--   *
--   * @param from     The line index (inclusive) from where to start
--   *                 updating the line selection state.
--   *
--   * @param to       The number of lines for which to update the
--   *                 selection state. A value of zero means no lines
--   *                 are updated and a value of 1 means only the
--   *                 line given by lineIndex will be updated.
--   *
--   * @param selected Whether the lines should be marked as selected
--   *                 or not.
--   */
--  // Lower inclusive, upper exclusive. Same as substring
--  public withRangeSelection(
--    from: number,
--    length: number,
--    selected: boolean
--  ): DiffSelection {
--    const computedSelectionType = this.getSelectionType()
--    const to = from + length
--
--    // Nothing for us to do here. This state is when all lines are already
--    // selected and we're being asked to select more or when no lines are
--    // selected and we're being asked to unselect something.
--    if (typeMatchesSelection(computedSelectionType, selected)) {
--      return this
--    }
--
--    if (computedSelectionType === DiffSelectionType.Partial) {
--      const newDivergingLines = new Set<number>(this.divergingLines!)
--
--      if (typeMatchesSelection(this.defaultSelectionType, selected)) {
--        for (let i = from; i < to; i++) {
--          newDivergingLines.delete(i)
--        }
--      } else {
--        for (let i = from; i < to; i++) {
--          // Ensure it's selectable
--          if (this.isSelectable(i)) {
--            newDivergingLines.add(i)
--          }
--        }
--      }
--
--      return new DiffSelection(
--        this.defaultSelectionType,
--        newDivergingLines.size === 0 ? null : newDivergingLines,
--        this.selectableLines
--      )
--    } else {
--      const newDivergingLines = new Set<number>()
--      for (let i = from; i < to; i++) {
--        if (this.isSelectable(i)) {
--          newDivergingLines.add(i)
--        }
--      }
--
--      return new DiffSelection(
--        computedSelectionType,
--        newDivergingLines,
--        this.selectableLines
--      )
--    }
--  }
--
--  /**
--   * Returns a copy of this selection instance where the selection state
--   * of the specified line has been toggled (inverted).
--   *
--   * @param lineIndex The index (line number) of the line which should
--   *                 be selected or unselected.
--   */
--  public withToggleLineSelection(lineIndex: number): DiffSelection {
--    return this.withLineSelection(lineIndex, !this.isSelected(lineIndex))
--  }
--
--  /**
--   * Returns a copy of this selection instance with all lines selected.
--   */
--  public withSelectAll(): DiffSelection {
--    return new DiffSelection(DiffSelectionType.All, null, this.selectableLines)
--  }
--
--  /**
--   * Returns a copy of this selection instance with no lines selected.
--   */
--  public withSelectNone(): DiffSelection {
--    return new DiffSelection(DiffSelectionType.None, null, this.selectableLines)
--  }
--
--  /**
--   * Returns a copy of this selection instance with a specified set of
--   * selecable lines. By default a DiffSelection instance allows selecting
--   * all lines (in fact, it has no notion of how many lines exists or what
--   * it is that is being selected).
--   *
--   * If the selection instance lacks a set of selectable lines it can not
--   * supply an accurate value from getSelectionType when the selection of
--   * all lines have diverged from the default state (since it doesn't know
--   * what all lines mean).
--   */
--  public withSelectableLines(selectableLines: Set<number>) {
--    const divergingLines = this.divergingLines
--      ? new Set([...this.divergingLines].filter(x => selectableLines.has(x)))
--      : null
--
--    return new DiffSelection(
--      this.defaultSelectionType,
--      divergingLines,
--      selectableLines
--    )
--  }
--}
-merged
-  result 100644 60eb2b935fefe06923b8c583082cb80e3d1ab546 app/src/models/preferences.ts
-  our    100644 1e6d2e9845d5a06be700bd1a32d3c3d9f9624450 app/src/models/preferences.ts
-@@ -1,5 +1,6 @@
- export enum PreferencesTab {
-   Accounts = 0,
--  Git,
--  Advanced,
-+  Git = 1,
-+  Appearance = 2,
-+  Advanced = 3,
- }
-merged
-  result 100644 45aab006e858dbd9f456c01363c261af3c19e3d1 app/src/models/pull-request.ts
-  our    100644 a9a31a307d1ff252471481ad1b74adc64164f566 app/src/models/pull-request.ts
-@@ -29,6 +29,7 @@
- export interface ICommitStatus {
-   readonly id: number
-   readonly state: APIRefState
-+  readonly description: string
- }
-
- export class PullRequestStatus {
-merged
-  result 100644 6a4b61f9fe2be4768d09c5ba220b92bac6e36e4a app/src/models/repository.ts
-  our    100644 0602a86788419c4d0be13a0de4f8c5ac6b37a368 app/src/models/repository.ts
-@@ -1,6 +1,19 @@
- import * as Path from 'path'
-
- import { GitHubRepository } from './github-repository'
-+import { IAheadBehind } from './branch'
-+
-+function getBaseName(path: string): string {
-+  const baseName = Path.basename(path)
-+
-+  if (baseName.length === 0) {
-+    // the repository is at the root of the drive
-+    // -> show the full path here to show _something_
-+    return path
-+  }
-+
-+  return baseName
-+}
-
- /** A local repository. */
- export class Repository {
-@@ -21,8 +34,7 @@
-   ) {
-     this.path = path
-     this.gitHubRepository = gitHubRepository
--    this.name =
--      (gitHubRepository && gitHubRepository.name) || Path.basename(path)
-+    this.name = (gitHubRepository && gitHubRepository.name) || getBaseName(path)
-     this.id = id
-     this.missing = missing
-   }
-@@ -40,3 +52,18 @@
-       ${this.name}`
-   }
- }
-+
-+/**
-+ * A snapshot for the local state for a given repository
-+ */
-+export interface ILocalRepositoryState {
-+  /**
-+   * The ahead/behind count for the current branch, or `null` if no tracking
-+   * branch found.
-+   */
-+  readonly aheadBehind: IAheadBehind | null
-+  /**
-+   * The number of uncommitted changes currently in the repository.
-+   */
-+  readonly changedFilesCount: number
-+}
-merged
-  result 100644 54aa27904efa1f49453cd0037982138833b7f1cb app/src/models/status.ts
-  our    100644 c3c2f71e62048e24ae2152ec5bb51a37b4ec08b7 app/src/models/status.ts
-@@ -144,15 +144,14 @@
-   /** the status of the change to the file */
-   public readonly status: AppFileStatus
-
-+  /** An ID for the file change. */
-+  public readonly id: string
-+
-   public constructor(path: string, status: AppFileStatus, oldPath?: string) {
-     this.path = path
-     this.status = status
-     this.oldPath = oldPath
--  }
--
--  /** An ID for the file change. */
--  public get id(): string {
--    return `${this.status}+${this.path}`
-+    this.id = `${this.status}+${this.path}`
-   }
- }
-
-@@ -222,9 +221,9 @@
-   /**
-    * The list of changes in the repository's working directory
-    */
--  public readonly files: ReadonlyArray<WorkingDirectoryFileChange> = new Array<
--    WorkingDirectoryFileChange
--  >()
-+  public readonly files: ReadonlyArray<WorkingDirectoryFileChange> = []
-+
-+  private readonly fileIxById = new Map<string, number>()
-
-   /**
-    * Update the include checkbox state of the form
-@@ -245,6 +244,8 @@
-     includeAll: boolean | null
-   ) {
-     this.files = files
-+    files.forEach((f, ix) => this.fileIxById.set(f.id, ix))
-+
-     this.includeAll = includeAll
-   }
-
-@@ -258,7 +259,14 @@
-
-   /** Find the file with the given ID. */
-   public findFileWithID(id: string): WorkingDirectoryFileChange | null {
--    return this.files.find(f => f.id === id) || null
-+    const ix = this.fileIxById.get(id)
-+    return ix !== undefined ? this.files[ix] || null : null
-+  }
-+
-+  /** Find the index of the file with the given ID. Returns -1 if not found */
-+  public findFileIndexByID(id: string): number {
-+    const ix = this.fileIxById.get(id)
-+    return ix !== undefined ? ix : -1
-   }
- }
-
-merged
-  result 100644 0211c0b5855afc22280ee81441d290e4daf89f0e app/src/ui/add-repository/create-repository.tsx
-  our    100644 3d86dfd7278adf32d3ce543d8f78f9c4f6933522 app/src/ui/add-repository/create-repository.tsx
-@@ -28,7 +28,6 @@
- import { Octicon, OcticonSymbol } from '../octicons'
- import { LinkButton } from '../lib/link-button'
- import { PopupType } from '../../lib/app-state'
--import { pathExists } from '../../lib/file-system'
-
- /** The sentinel value used to indicate no gitignore should be used. */
- const NoGitIgnoreValue = 'None'
-@@ -150,25 +149,13 @@
-     this.setState({ isRepository, path })
-   }
-
--  private ensureDirectory(directory: string): Promise<void> {
--    return new Promise<void>((resolve, reject) => {
--      FSE.ensureDir(directory, err => {
--        if (err) {
--          return reject(err)
--        }
--
--        return resolve()
--      })
--    })
--  }
--
-   private resolveRepositoryRoot = async (): Promise<string> => {
-     const currentPath = this.state.path
-     if (this.props.initialPath && this.props.initialPath === currentPath) {
-       // if the user provided an initial path and didn't change it, we should
-       // validate it is an existing path and use that for the repository
-       try {
--        await this.ensureDirectory(currentPath)
-+        await FSE.ensureDir(currentPath)
-         return currentPath
-       } catch {}
-     }
-@@ -180,7 +167,7 @@
-     const fullPath = await this.resolveRepositoryRoot()
-
-     try {
--      await this.ensureDirectory(fullPath)
-+      await FSE.ensureDir(fullPath)
-       this.setState({ isValidPath: true })
-     } catch (e) {
-       if (e.code === 'EACCES' && e.errno === -13) {
-@@ -274,7 +261,7 @@
-
-     try {
-       const gitAttributes = Path.join(fullPath, '.gitattributes')
--      const gitAttributesExists = await pathExists(gitAttributes)
-+      const gitAttributesExists = await FSE.pathExists(gitAttributes)
-       if (!gitAttributesExists) {
-         await writeGitAttributes(fullPath)
-       }
-merged
-  result 100644 b273f0970ff626d4e8860c494a658b879c78503a app/src/ui/add-repository/git-attributes.ts
-  our    100644 d7e6abfb0bd7eeaaa62ff68f64385814404a2cf4 app/src/ui/add-repository/git-attributes.ts
-@@ -1,21 +1,12 @@
--import * as FS from 'fs'
--import * as Path from 'path'
-+import { writeFile } from 'fs-extra'
-+import { join } from 'path'
-
- /**
-  * Write the .gitAttributes file to the given repository
-  */
--export function writeGitAttributes(path: string): Promise<void> {
--  return new Promise<void>((resolve, reject) => {
--    const fullPath = Path.join(path, '.gitattributes')
--    const contents =
--      '# Auto detect text files and perform LF normalization\n* text=auto\n'
--
--    FS.writeFile(fullPath, contents, err => {
--      if (err) {
--        reject(err)
--      } else {
--        resolve()
--      }
--    })
--  })
-+export async function writeGitAttributes(path: string): Promise<void> {
-+  const fullPath = join(path, '.gitattributes')
-+  const contents =
-+    '# Auto detect text files and perform LF normalization\n* text=auto\n'
-+  await writeFile(fullPath, contents)
- }
-merged
-  result 100644 50809884f9200b94ab3e33a7b9ca96211cb72a25 app/src/ui/add-repository/gitignores.ts
-  our    100644 14b5e0408ca2ae8146e03d585d52e9f963963607 app/src/ui/add-repository/gitignores.ts
-@@ -1,5 +1,5 @@
- import * as Path from 'path'
--import * as Fs from 'fs'
-+import { readdir, writeFile, readFile } from 'fs-extra'
-
- const GitIgnoreExtension = '.gitignore'
-
-@@ -7,31 +7,22 @@
-
- let cachedGitIgnores: Map<string, string> | null = null
-
--function getCachedGitIgnores(): Promise<Map<string, string>> {
--  if (cachedGitIgnores) {
--    return Promise.resolve(cachedGitIgnores)
-+async function getCachedGitIgnores(): Promise<Map<string, string>> {
-+  if (cachedGitIgnores != null) {
-+    return cachedGitIgnores
-   } else {
--    return new Promise((resolve, reject) => {
--      Fs.readdir(root, (err, files) => {
--        if (err) {
--          reject(err)
--        } else {
--          const ignoreFiles = files.filter(file =>
--            file.endsWith(GitIgnoreExtension)
--          )
--
--          cachedGitIgnores = new Map()
--          for (const file of ignoreFiles) {
--            cachedGitIgnores.set(
--              Path.basename(file, GitIgnoreExtension),
--              Path.join(root, file)
--            )
--          }
-+    const files = await readdir(root)
-+    const ignoreFiles = files.filter(file => file.endsWith(GitIgnoreExtension))
-+
-+    cachedGitIgnores = new Map()
-+    for (const file of ignoreFiles) {
-+      cachedGitIgnores.set(
-+        Path.basename(file, GitIgnoreExtension),
-+        Path.join(root, file)
-+      )
-+    }
-
--          resolve(cachedGitIgnores)
--        }
--      })
--    })
-+    return cachedGitIgnores
-   }
- }
-
-@@ -45,25 +36,14 @@
- async function getGitIgnoreText(name: string): Promise<string> {
-   const gitIgnores = await getCachedGitIgnores()
-
--  return new Promise<string>((resolve, reject) => {
--    const path = gitIgnores.get(name)
--    if (!path) {
--      reject(
--        new Error(
--          `Unknown gitignore: ${name}. Only names returned from getGitIgnoreNames() can be used.`
--        )
--      )
--      return
--    }
-+  const path = gitIgnores.get(name)
-+  if (!path) {
-+    throw new Error(
-+      `Unknown gitignore: ${name}. Only names returned from getGitIgnoreNames() can be used.`
-+    )
-+  }
-
--    Fs.readFile(path, 'utf8', (err, data) => {
--      if (err) {
--        reject(err)
--      } else {
--        resolve(data)
--      }
--    })
--  })
-+  return await readFile(path, 'utf8')
- }
-
- /** Write the named gitignore to the repository. */
-@@ -72,16 +52,6 @@
-   name: string
- ): Promise<void> {
-   const fullPath = Path.join(repositoryPath, '.gitignore')
--
-   const text = await getGitIgnoreText(name)
--
--  return new Promise<void>((resolve, reject) => {
--    Fs.writeFile(fullPath, text, err => {
--      if (err) {
--        reject(err)
--      } else {
--        resolve()
--      }
--    })
--  })
-+  await writeFile(fullPath, text)
- }
-merged
-  result 100644 5bde560824e8c0b373e32c78a53dbc59473a8bdf app/src/ui/add-repository/licenses.ts
-  our    100644 faaef147afa4701451223362977b28ce2faa385f app/src/ui/add-repository/licenses.ts
-@@ -1,32 +1,13 @@
- import * as Path from 'path'
--import * as Fs from 'fs'
--
--interface IFrontMatterResult<T> {
--  readonly attributes: T
--  readonly body: string
--}
--
--const frontMatter: <T>(
--  path: string
--) => IFrontMatterResult<T> = require('front-matter')
--
--interface IChooseALicense {
--  readonly title: string
--  readonly nickname?: string
--  readonly featured?: boolean
--  readonly hidden?: boolean
--}
-+import { writeFile, readFile } from 'fs-extra'
-
- export interface ILicense {
-   /** The human-readable name. */
-   readonly name: string
--
-   /** Is the license featured? */
-   readonly featured: boolean
--
-   /** The actual text of the license. */
-   readonly body: string
--
-   /** Whether to hide the license from the standard list */
-   readonly hidden: boolean
- }
-@@ -39,65 +20,32 @@
-   readonly year: string
- }
-
--const root = Path.join(__dirname, 'static', 'choosealicense.com', '_licenses')
--
- let cachedLicenses: ReadonlyArray<ILicense> | null = null
-
--function readFileAsync(path: string): Promise<string> {
--  return new Promise((resolve, reject) => {
--    Fs.readFile(path, 'utf8', (err, data) => {
--      if (err) {
--        reject(err)
--      } else {
--        resolve(data)
--      }
--    })
--  })
--}
--
- /** Get the available licenses. */
--export function getLicenses(): Promise<ReadonlyArray<ILicense>> {
--  if (cachedLicenses) {
--    return Promise.resolve(cachedLicenses)
-+export async function getLicenses(): Promise<ReadonlyArray<ILicense>> {
-+  if (cachedLicenses != null) {
-+    return cachedLicenses
-   } else {
--    return new Promise((resolve, reject) => {
--      Fs.readdir(root, async (err, files) => {
--        if (err) {
--          reject(err)
--        } else {
--          const licenses = new Array<ILicense>()
--          for (const file of files) {
--            const fullPath = Path.join(root, file)
--            const contents = await readFileAsync(fullPath)
--            const result = frontMatter<IChooseALicense>(contents)
--            const license: ILicense = {
--              name: result.attributes.nickname || result.attributes.title,
--              featured: result.attributes.featured || false,
--              hidden:
--                result.attributes.hidden === undefined ||
--                result.attributes.hidden,
--              body: result.body.trim(),
--            }
--
--            if (!license.hidden) {
--              licenses.push(license)
--            }
--          }
--
--          cachedLicenses = licenses.sort((a, b) => {
--            if (a.featured) {
--              return -1
--            }
--            if (b.featured) {
--              return 1
--            }
--            return a.name.localeCompare(b.name)
--          })
--
--          resolve(cachedLicenses)
--        }
--      })
-+    const licensesMetadataPath = Path.join(
-+      __dirname,
-+      'static',
-+      'available-licenses.json'
-+    )
-+    const json = await readFile(licensesMetadataPath, 'utf8')
-+    const licenses: Array<ILicense> = JSON.parse(json)
-+
-+    cachedLicenses = licenses.sort((a, b) => {
-+      if (a.featured) {
-+        return -1
-+      }
-+      if (b.featured) {
-+        return 1
-+      }
-+      return a.name.localeCompare(b.name)
-     })
-+
-+    return cachedLicenses
-   }
- }
-
-@@ -127,29 +75,21 @@
- }
-
- /** Write the license to the the repository at the given path. */
--export function writeLicense(
-+export async function writeLicense(
-   repositoryPath: string,
-   license: ILicense,
-   fields: ILicenseFields
- ): Promise<void> {
-   const fullPath = Path.join(repositoryPath, 'LICENSE')
-
--  return new Promise<void>((resolve, reject) => {
--    const tokens: ReadonlyArray<keyof ILicenseFields> = [
--      'fullname',
--      'email',
--      'project',
--      'description',
--      'year',
--    ]
--    const body = replaceTokens(license.body, tokens, fields)
-+  const tokens: ReadonlyArray<keyof ILicenseFields> = [
-+    'fullname',
-+    'email',
-+    'project',
-+    'description',
-+    'year',
-+  ]
-
--    Fs.writeFile(fullPath, body, err => {
--      if (err) {
--        reject(err)
--      } else {
--        resolve()
--      }
--    })
--  })
-+  const body = replaceTokens(license.body, tokens, fields)
-+  await writeFile(fullPath, body)
- }
-merged
-  result 100644 f05ce45411eea70997e13c55b77d039e2aa1aa8a app/src/ui/add-repository/write-default-readme.ts
-  our    100644 a9ee5d9ef7fc5782a321218da5ad12f8d34d00d3 app/src/ui/add-repository/write-default-readme.ts
-@@ -1,4 +1,4 @@
--import * as FS from 'fs'
-+import { writeFile } from 'fs-extra'
- import * as Path from 'path'
-
- const DefaultReadmeName = 'README.md'
-@@ -10,16 +10,11 @@
- /**
-  * Write the default README to the repository with the given name at the path.
-  */
--export function writeDefaultReadme(path: string, name: string): Promise<void> {
--  return new Promise<void>((resolve, reject) => {
--    const fullPath = Path.join(path, DefaultReadmeName)
--    const contents = defaultReadmeContents(name)
--    FS.writeFile(fullPath, contents, err => {
--      if (err) {
--        reject(err)
--      } else {
--        resolve()
--      }
--    })
--  })
-+export async function writeDefaultReadme(
-+  path: string,
-+  name: string
-+): Promise<void> {
-+  const fullPath = Path.join(path, DefaultReadmeName)
-+  const contents = defaultReadmeContents(name)
-+  await writeFile(fullPath, contents)
- }
-merged
-  result 100644 6a7921a17b2a7c87f83e400e06329fc525ad046e app/src/ui/app-menu/menu-pane.tsx
-  our    100644 d7e43d00cd07bd5561699a12da541ef471cb3b55 app/src/ui/app-menu/menu-pane.tsx
-@@ -180,7 +180,7 @@
-     }
-   }
-
--  private onSelectionChanged = (row: number, source: SelectionSource) => {
-+  private onSelectedRowChanged = (row: number, source: SelectionSource) => {
-     const item = this.state.items[row]
-     this.props.onSelectionChanged(this.props.depth, item, source)
-   }
-@@ -276,9 +276,9 @@
-           rowCount={this.state.items.length}
-           rowHeight={this.rowHeight}
-           rowRenderer={this.renderMenuItem}
--          selectedRow={this.state.selectedIndex}
-+          selectedRows={[this.state.selectedIndex]}
-           onRowClick={this.onRowClick}
--          onSelectionChanged={this.onSelectionChanged}
-+          onSelectedRowChanged={this.onSelectedRowChanged}
-           canSelectRow={this.canSelectRow}
-           onRowKeyDown={this.onRowKeyDown}
-           invalidationProps={this.state.items}
-added in remote
-  their  100644 eab8b92d267a41b8ab8c40c65e3237393641ccfc app/src/ui/app-theme.tsx
-@@ -0,0 +1,59 @@
-+import * as React from 'react'
-+import { ApplicationTheme, getThemeName } from './lib/application-theme'
-+
-+interface IAppThemeProps {
-+  readonly theme: ApplicationTheme
-+}
-+
-+/**
-+ * A pseudo-component responsible for adding the applicable CSS
-+ * class names to the body tag in order to apply the currently
-+ * selected theme.
-+ *
-+ * This component is a PureComponent, meaning that it'll only
-+ * render when its props changes (shallow comparison).
-+ *
-+ * This component does not render anything into the DOM, it's
-+ * purely (a)busing the component lifecycle to manipulate the
-+ * body class list.
-+ */
-+export class AppTheme extends React.PureComponent<IAppThemeProps> {
-+  public componentDidMount() {
-+    this.ensureTheme()
-+  }
-+
-+  public componentDidUpdate() {
-+    this.ensureTheme()
-+  }
-+
-+  public componentWillUnmount() {
-+    this.clearThemes()
-+  }
-+
-+  private ensureTheme() {
-+    const newThemeClassName = `theme-${getThemeName(this.props.theme)}`
-+    const body = document.body
-+
-+    if (body.classList.contains(newThemeClassName)) {
-+      return
-+    }
-+
-+    this.clearThemes()
-+
-+    body.classList.add(newThemeClassName)
-+  }
-+
-+  private clearThemes() {
-+    const body = document.body
-+
-+    for (const className of body.classList) {
-+      if (className.startsWith('theme-')) {
-+        body.classList.remove(className)
-+      }
-+    }
-+  }
-+
-+  public render() {
-+    return null
-+  }
-+}
-merged
-  result 100644 7355227d8f5b8d4c7153b94c7da59781e776bd0d app/src/ui/app.tsx
-  our    100644 0349874c603d03e5db59f73672f53d9b9f74f464 app/src/ui/app.tsx
-@@ -1,14 +1,15 @@
- import * as React from 'react'
--import { ipcRenderer } from 'electron'
-+import { ipcRenderer, remote } from 'electron'
- import { CSSTransitionGroup } from 'react-transition-group'
-
- import {
-   IAppState,
--  RepositorySection,
-+  RepositorySectionTab,
-   Popup,
-   PopupType,
-   FoldoutType,
-   SelectionType,
-+  CompareActionKind,
- } from '../lib/app-state'
- import { Dispatcher } from '../lib/dispatcher'
- import { AppStore } from '../lib/stores'
-@@ -85,12 +86,17 @@
- import { InitializeLFS, AttributeMismatch } from './lfs'
- import { UpstreamAlreadyExists } from './upstream-already-exists'
- import { DeletePullRequest } from './delete-branch/delete-pull-request-dialog'
-+import { MergeConflictsWarning } from './merge-conflicts'
-+import { AppTheme } from './app-theme'
-+import { ApplicationTheme } from './lib/application-theme'
-
- /** The interval at which we should check for updates. */
- const UpdateCheckInterval = 1000 * 60 * 60 * 4
-
- const SendStatsInterval = 1000 * 60 * 60 * 4
-
-+const updateRepoInfoInterval = 1000 * 60 * 5
-+
- interface IAppProps {
-   readonly dispatcher: Dispatcher
-   readonly appStore: AppStore
-@@ -145,6 +151,10 @@
-         },
-         { timeout: ReadyDelay }
-       )
-+
-+      window.setInterval(() => {
-+        this.props.appStore.refreshAllRepositories()
-+      }, updateRepoInfoInterval)
-     })
-
-     this.state = props.appStore.getState()
-@@ -241,10 +251,10 @@
-         return this.push()
-       case 'pull':
-         return this.pull()
--      case 'select-changes':
--        return this.selectChanges()
--      case 'select-history':
--        return this.selectHistory()
-+      case 'show-changes':
-+        return this.showChanges()
-+      case 'show-history':
-+        return this.showHistory()
-       case 'choose-repository':
-         return this.chooseRepository()
-       case 'add-local-repository':
-@@ -265,16 +275,23 @@
-         return this.props.dispatcher.showPopup({ type: PopupType.Preferences })
-       case 'open-working-directory':
-         return this.openCurrentRepositoryWorkingDirectory()
--      case 'update-branch':
-+      case 'update-branch': {
-+        this.props.dispatcher.recordMenuInitiatedUpdate()
-         return this.updateBranch()
--      case 'merge-branch':
-+      }
-+      case 'compare-to-branch': {
-+        return this.showHistory(true)
-+      }
-+      case 'merge-branch': {
-+        this.props.dispatcher.recordMenuInitiatedMerge()
-         return this.mergeBranch()
-+      }
-       case 'show-repository-settings':
-         return this.showRepositorySettings()
-       case 'view-repository-on-github':
-         return this.viewRepositoryOnGitHub()
--      case 'compare-branch':
--        return this.compareBranch()
-+      case 'compare-on-github':
-+        return this.compareBranchOnDotcom()
-       case 'open-in-shell':
-         return this.openCurrentRepositoryInShell()
-       case 'clone-repository':
-@@ -290,11 +307,31 @@
-         return this.props.dispatcher.installCLI()
-       case 'open-external-editor':
-         return this.openCurrentRepositoryInExternalEditor()
-+      case 'select-all':
-+        return this.selectAll()
-     }
-
-     return assertNever(name, `Unknown menu event name: ${name}`)
-   }
-
-+  /**
-+   * Handler for the 'select-all' menu event, dispatches
-+   * a custom DOM event originating from the element which
-+   * currently has keyboard focus. Components have a chance
-+   * to intercept this event and implement their own 'select
-+   * all' logic.
-+   */
-+  private selectAll() {
-+    const event = new CustomEvent('select-all', {
-+      bubbles: true,
-+      cancelable: true,
-+    })
-+
-+    if (document.activeElement.dispatchEvent(event)) {
-+      remote.getCurrentWebContents().selectAll()
-+    }
-+  }
-+
-   private boomtown() {
-     setImmediate(() => {
-       throw new Error('Boomtown!')
-@@ -360,7 +397,7 @@
-     })
-   }
-
--  private compareBranch() {
-+  private compareBranchOnDotcom() {
-     const htmlURL = this.getCurrentRepositoryGitHubURL()
-     if (!htmlURL) {
-       return
-@@ -461,20 +498,30 @@
-     this.props.dispatcher.showPopup({ type: PopupType.About })
-   }
-
--  private selectChanges() {
-+  private async showHistory(showBranchList: boolean = false) {
-     const state = this.state.selectedState
-     if (state == null || state.type !== SelectionType.Repository) {
-       return
-     }
-
--    this.props.dispatcher.closeCurrentFoldout()
--    this.props.dispatcher.changeRepositorySection(
-+    await this.props.dispatcher.closeCurrentFoldout()
-+
-+    await this.props.dispatcher.initializeCompare(state.repository, {
-+      kind: CompareActionKind.History,
-+    })
-+
-+    await this.props.dispatcher.changeRepositorySection(
-       state.repository,
--      RepositorySection.Changes
-+      RepositorySectionTab.History
-     )
-+
-+    await this.props.dispatcher.updateCompareForm(state.repository, {
-+      filterText: '',
-+      showBranchList,
-+    })
-   }
-
--  private selectHistory() {
-+  private showChanges() {
-     const state = this.state.selectedState
-     if (state == null || state.type !== SelectionType.Repository) {
-       return
-@@ -483,7 +530,7 @@
-     this.props.dispatcher.closeCurrentFoldout()
-     this.props.dispatcher.changeRepositorySection(
-       state.repository,
--      RepositorySection.History
-+      RepositorySectionTab.Changes
-     )
-   }
-
-@@ -934,6 +981,11 @@
-           />
-         )
-       case PopupType.ConfirmDiscardChanges:
-+        const showSetting =
-+          popup.showDiscardChangesSetting === undefined
-+            ? true
-+            : popup.showDiscardChangesSetting
-+
-         return (
-           <DiscardChanges
-             key="discard-changes"
-@@ -943,6 +995,7 @@
-             confirmDiscardChanges={
-               this.state.askForConfirmationOnDiscardChanges
-             }
-+            showDiscardChangesSetting={showSetting}
-             onDismissed={this.onPopupDismissed}
-             onConfirmDiscardChangesChanged={this.onConfirmDiscardChangesChanged}
-           />
-@@ -965,10 +1018,11 @@
-             enterpriseAccount={this.getEnterpriseAccount()}
-             onDismissed={this.onPopupDismissed}
-             selectedShell={this.state.selectedShell}
-+            selectedTheme={this.state.selectedTheme}
-           />
-         )
-       case PopupType.MergeBranch: {
--        const repository = popup.repository
-+        const { repository, branch } = popup
-         const state = this.props.appStore.getRepositoryState(repository)
-
-         const tip = state.branchesState.tip
-@@ -983,6 +1037,7 @@
-             defaultBranch={state.branchesState.defaultBranch}
-             recentBranches={state.branchesState.recentBranches}
-             currentBranch={currentBranch}
-+            initialBranch={branch}
-             onDismissed={this.onPopupDismissed}
-           />
-         )
-@@ -1204,6 +1259,14 @@
-             pullRequest={popup.pullRequest}
-           />
-         )
-+      case PopupType.MergeConflicts:
-+        return (
-+          <MergeConflictsWarning
-+            dispatcher={this.props.dispatcher}
-+            repository={popup.repository}
-+            onDismissed={this.onPopupDismissed}
-+          />
-+        )
-       default:
-         return assertNever(popup, `Unknown popup type: ${popup}`)
-     }
-@@ -1337,12 +1400,17 @@
-         selectedRepository={selectedRepository}
-         onSelectionChanged={this.onSelectionChanged}
-         repositories={this.state.repositories}
-+        localRepositoryStateLookup={this.state.localRepositoryStateLookup}
-+        askForConfirmationOnRemoveRepository={
-+          this.state.askForConfirmationOnRepositoryRemoval
-+        }
-         onRemoveRepository={this.removeRepository}
-         onOpenInShell={this.openInShell}
-         onShowRepository={this.showRepository}
-         onOpenInExternalEditor={this.openInExternalEditor}
-         externalEditorLabel={externalEditorLabel}
-         shellLabel={shellLabel}
-+        dispatcher={this.props.dispatcher}
-       />
-     )
-   }
-@@ -1355,8 +1423,8 @@
-     this.props.dispatcher.openShell(repository.path)
-   }
-
--  private openFileInExternalEditor = (path: string) => {
--    this.props.dispatcher.openInExternalEditor(path)
-+  private openFileInExternalEditor = (fullPath: string) => {
-+    this.props.dispatcher.openInExternalEditor(fullPath)
-   }
-
-   private openInExternalEditor = (
-@@ -1409,6 +1477,8 @@
-
-     const currentState: DropdownState = isOpen ? 'open' : 'closed'
-
-+    const tooltip = repository && !isOpen ? repository.path : undefined
-+
-     const foldoutStyle: React.CSSProperties = {
-       position: 'absolute',
-       marginLeft: 0,
-@@ -1422,6 +1492,7 @@
-         icon={icon}
-         title={title}
-         description={__DARWIN__ ? 'Current Repository' : 'Current repository'}
-+        tooltip={tooltip}
-         foldoutStyle={foldoutStyle}
-         onDropdownStateChanged={this.onRepositoryDropdownStateChanged}
-         dropdownContentRenderer={this.renderRepositoryList}
-@@ -1594,26 +1665,27 @@
-     }
-
-     if (selectedState.type === SelectionType.Repository) {
--      const externalEditorLabel = this.state.selectedExternalEditor
-+      const externalEditorLabel = state.selectedExternalEditor
-
-       return (
-         <RepositoryView
-           repository={selectedState.repository}
-           state={selectedState.state}
-           dispatcher={this.props.dispatcher}
--          emoji={this.state.emoji}
--          sidebarWidth={this.state.sidebarWidth}
--          commitSummaryWidth={this.state.commitSummaryWidth}
-+          emoji={state.emoji}
-+          sidebarWidth={state.sidebarWidth}
-+          commitSummaryWidth={state.commitSummaryWidth}
-           issuesStore={this.props.appStore.issuesStore}
-           gitHubUserStore={this.props.appStore.gitHubUserStore}
-           onViewCommitOnGitHub={this.onViewCommitOnGitHub}
--          imageDiffType={this.state.imageDiffType}
-+          imageDiffType={state.imageDiffType}
-           askForConfirmationOnDiscardChanges={
--            this.state.askForConfirmationOnDiscardChanges
-+            state.askForConfirmationOnDiscardChanges
-           }
--          accounts={this.state.accounts}
-+          accounts={state.accounts}
-           externalEditorLabel={externalEditorLabel}
-           onOpenInExternalEditor={this.openFileInExternalEditor}
-+          isDivergingBranchBannerVisible={state.isDivergingBranchBannerVisible}
-         />
-       )
-     } else if (selectedState.type === SelectionType.CloningRepository) {
-@@ -1652,8 +1724,13 @@
-
-     const className = this.state.appIsFocused ? 'focused' : 'blurred'
-
-+    const currentTheme = this.state.showWelcomeFlow
-+      ? ApplicationTheme.Light
-+      : this.state.selectedTheme
-+
-     return (
-       <div id="desktop-app-chrome" className={className}>
-+        <AppTheme theme={currentTheme} />
-         {this.renderTitlebar()}
-         {this.state.showWelcomeFlow
-           ? this.renderWelcomeFlow()
-merged
-  result 100644 ffb19e643f39201e7668941e3125223f6319fdd7 app/src/ui/autocompletion/autocompleting-text-input.tsx
-  our    100644 fa4fe8265157ad6e485388bac030717e2e634543 app/src/ui/autocompletion/autocompleting-text-input.tsx
-@@ -1,5 +1,10 @@
- import * as React from 'react'
--import { List, SelectionSource } from '../lib/list'
-+import {
-+  List,
-+  SelectionSource,
-+  findNextSelectableRow,
-+  SelectionDirection,
-+} from '../lib/list'
- import { IAutocompletionProvider } from './index'
- import { fatalError } from '../../lib/fatal-error'
- import * as classNames from 'classnames'
-@@ -28,6 +33,9 @@
-   /** Disabled state for input field. */
-   readonly disabled?: boolean
-
-+  /** Indicates if input field should be required */
-+  readonly isRequired?: boolean
-+
-   /**
-    * Called when the user changes the value in the input field.
-    */
-@@ -96,7 +104,6 @@
-   IAutocompletingTextInputState<Object>
- > {
-   private element: ElementType | null = null
--  private autocompletionList: List | null = null
-
-   /** The identifier for each autocompletion request. */
-   private autocompletionRequestID = 0
-@@ -122,10 +129,6 @@
-     )
-   }
-
--  private storeAutocompletionListRef = (ref: List | null) => {
--    this.autocompletionList = ref
--  }
--
-   private renderAutocompletions() {
-     const state = this.state.autocompletionState
-     if (!state) {
-@@ -180,17 +183,16 @@
-     return (
-       <div className={className} style={{ top, left, height }}>
-         <List
--          ref={this.storeAutocompletionListRef}
-           rowCount={items.length}
-           rowHeight={RowHeight}
--          selectedRow={selectedRow}
-+          selectedRows={[selectedRow]}
-           rowRenderer={this.renderItem}
-           scrollToRow={selectedRow}
-           selectOnHover={true}
-           focusOnHover={false}
-           onRowMouseDown={this.onRowMouseDown}
-           onRowClick={this.insertCompletionOnClick}
--          onSelectionChanged={this.onSelectionChanged}
-+          onSelectedRowChanged={this.onSelectedRowChanged}
-           invalidationProps={searchText}
-         />
-       </div>
-@@ -211,7 +213,7 @@
-     }
-   }
-
--  private onSelectionChanged = (row: number, source: SelectionSource) => {
-+  private onSelectedRowChanged = (row: number, source: SelectionSource) => {
-     const currentAutoCompletionState = this.state.autocompletionState
-
-     if (!currentAutoCompletionState) {
-@@ -270,6 +272,7 @@
-       onBlur: this.onBlur,
-       onContextMenu: this.onContextMenu,
-       disabled: this.props.disabled,
-+      'aria-required': this.props.isRequired ? true : false,
-     }
-
-     return React.createElement<React.HTMLAttributes<ElementType>, ElementType>(
-@@ -363,7 +366,7 @@
-
-   private getMovementDirection(
-     event: React.KeyboardEvent<any>
--  ): 'up' | 'down' | null {
-+  ): SelectionDirection | null {
-     switch (event.key) {
-       case 'ArrowUp':
-         return 'up'
-@@ -401,11 +404,12 @@
-     const direction = this.getMovementDirection(event)
-     if (direction) {
-       event.preventDefault()
-+      const rowCount = currentAutoCompletionState.items.length
-
--      const nextRow = this.autocompletionList!.nextSelectableRow(
-+      const nextRow = findNextSelectableRow(rowCount, {
-         direction,
--        selectedRow
--      )
-+        row: selectedRow,
-+      })
-
-       if (nextRow !== null) {
-         const newSelectedItem = currentAutoCompletionState.items[nextRow]
-added in remote
-  their  100644 474f18ccb67239743953eda7f33488769a615c05 app/src/ui/branches/branch-list-item.tsx
-@@ -0,0 +1,49 @@
-+import * as React from 'react'
-+import * as moment from 'moment'
-+
-+import { IMatches } from '../../lib/fuzzy-find'
-+
-+import { Octicon, OcticonSymbol } from '../octicons'
-+import { HighlightText } from '../lib/highlight-text'
-+
-+interface IBranchListItemProps {
-+  /** The name of the branch */
-+  readonly name: string
-+
-+  /** Specifies whether this item is currently selected */
-+  readonly isCurrentBranch: boolean
-+
-+  /** The date may be null if we haven't loaded the tip commit yet. */
-+  readonly lastCommitDate: Date | null
-+
-+  /** The characters in the branch name to highlight */
-+  readonly matches: IMatches
-+}
-+
-+/** The branch component. */
-+export class BranchListItem extends React.Component<IBranchListItemProps, {}> {
-+  public render() {
-+    const lastCommitDate = this.props.lastCommitDate
-+    const isCurrentBranch = this.props.isCurrentBranch
-+    const name = this.props.name
-+
-+    const date = lastCommitDate ? moment(lastCommitDate).fromNow() : ''
-+    const icon = isCurrentBranch ? OcticonSymbol.check : OcticonSymbol.gitBranch
-+    const infoTitle = isCurrentBranch
-+      ? 'Current branch'
-+      : lastCommitDate
-+        ? lastCommitDate.toString()
-+        : ''
-+    return (
-+      <div className="branches-list-item">
-+        <Octicon className="icon" symbol={icon} />
-+        <div className="name" title={name}>
-+          <HighlightText text={name} highlight={this.props.matches.title} />
-+        </div>
-+        <div className="description" title={infoTitle}>
-+          {date}
-+        </div>
-+      </div>
-+    )
-+  }
-+}
-merged
-  result 100644 d64fb68c7b730c7a0bbccfb64e4a8acf364fd5e9 app/src/ui/branches/branch-list.tsx
-  our    100644 32bcadc42b0cd4c81a0fadc6da4c43b862a2c902 app/src/ui/branches/branch-list.tsx
-@@ -1,27 +1,24 @@
- import * as React from 'react'
-+
- import { Branch } from '../../models/branch'
--import {
--  groupBranches,
--  IBranchListItem,
--  BranchGroupIdentifier,
--} from './group-branches'
--import { BranchListItem } from './branch'
-+
-+import { assertNever } from '../../lib/fatal-error'
-+
- import {
-   FilterList,
-   IFilterListGroup,
-   SelectionSource,
- } from '../lib/filter-list'
--import { assertNever } from '../../lib/fatal-error'
-+import { IMatches } from '../../lib/fuzzy-find'
- import { Button } from '../lib/button'
--import { NoBranches } from './no-branches'
-+import { TextBox } from '../lib/text-box'
-
--/**
-- * TS can't parse generic specialization in JSX, so we have to alias it here
-- * with the generic type. See https://github.com/Microsoft/TypeScript/issues/6395.
-- */
--const BranchesFilterList: new () => FilterList<
--  IBranchListItem
--> = FilterList as any
-+import {
-+  groupBranches,
-+  IBranchListItem,
-+  BranchGroupIdentifier,
-+} from './group-branches'
-+import { NoBranches } from './no-branches'
-
- const RowHeight = 30
-
-@@ -91,6 +88,16 @@
-    * to prepopulate the new branch name field.
-    */
-   readonly onCreateNewBranch?: (name: string) => void
-+
-+  readonly textbox?: TextBox
-+
-+  /**
-+   * Render function to apply to each branch in the list
-+   */
-+  readonly renderBranch: (
-+    item: IBranchListItem,
-+    matches: IMatches
-+  ) => JSX.Element
- }
-
- interface IBranchListState {
-@@ -138,30 +145,77 @@
-   IBranchListProps,
-   IBranchListState
- > {
-+  private branchFilterList: FilterList<IBranchListItem> | null = null
-+
-   public constructor(props: IBranchListProps) {
-     super(props)
-     this.state = createState(props)
-   }
-
--  private renderItem = (
--    item: IBranchListItem,
--    matches: ReadonlyArray<number>
--  ) => {
--    const branch = item.branch
--    const commit = branch.tip
--    const currentBranchName = this.props.currentBranch
--      ? this.props.currentBranch.name
--      : null
-+  public componentWillReceiveProps(nextProps: IBranchListProps) {
-+    this.setState(createState(nextProps))
-+  }
-+
-+  public selectFirstItem(focus: boolean = false) {
-+    if (this.branchFilterList !== null) {
-+      this.branchFilterList.selectFirstItem(focus)
-+    }
-+  }
-+
-+  public render() {
-     return (
--      <BranchListItem
--        name={branch.name}
--        isCurrentBranch={branch.name === currentBranchName}
--        lastCommitDate={commit ? commit.author.date : null}
--        matches={matches}
-+      <FilterList<IBranchListItem>
-+        ref={this.onBranchesFilterListRef}
-+        className="branches-list"
-+        rowHeight={RowHeight}
-+        filterText={this.props.filterText}
-+        onFilterTextChanged={this.props.onFilterTextChanged}
-+        onFilterKeyDown={this.props.onFilterKeyDown}
-+        selectedItem={this.state.selectedItem}
-+        renderItem={this.renderItem}
-+        renderGroupHeader={this.renderGroupHeader}
-+        onItemClick={this.onItemClick}
-+        onSelectionChanged={this.onSelectionChanged}
-+        groups={this.state.groups}
-+        invalidationProps={this.props.allBranches}
-+        renderPostFilter={this.onRenderNewButton}
-+        renderNoItems={this.onRenderNoItems}
-+        filterTextBox={this.props.textbox}
-       />
-     )
-   }
-
-+  private onBranchesFilterListRef = (
-+    filterList: FilterList<IBranchListItem> | null
-+  ) => {
-+    this.branchFilterList = filterList
-+  }
-+
-+  private renderItem = (item: IBranchListItem, matches: IMatches) => {
-+    return this.props.renderBranch(item, matches)
-+  }
-+
-+  private parseHeader(label: string): BranchGroupIdentifier | null {
-+    switch (label) {
-+      case 'default':
-+      case 'recent':
-+      case 'other':
-+        return label
-+      default:
-+        return null
-+    }
-+  }
-+
-+  private renderGroupHeader = (label: string) => {
-+    const identifier = this.parseHeader(label)
-+
-+    return identifier !== null ? (
-+      <div className="branches-list-content filter-list-group-header">
-+        {this.getGroupLabel(identifier)}
-+      </div>
-+    ) : null
-+  }
-+
-   private getGroupLabel(identifier: BranchGroupIdentifier) {
-     if (identifier === 'default') {
-       return __DARWIN__ ? 'Default Branch' : 'Default branch'
-@@ -174,15 +228,23 @@
-     }
-   }
-
--  private renderGroupHeader = (id: string) => {
--    const identifier = id as BranchGroupIdentifier
-+  private onRenderNoItems = () => {
-     return (
--      <div className="branches-list-content filter-list-group-header">
--        {this.getGroupLabel(identifier)}
--      </div>
-+      <NoBranches
-+        onCreateNewBranch={this.onCreateNewBranch}
-+        canCreateNewBranch={this.props.canCreateNewBranch}
-+      />
-     )
-   }
-
-+  private onRenderNewButton = () => {
-+    return this.props.canCreateNewBranch ? (
-+      <Button className="new-branch-button" onClick={this.onCreateNewBranch}>
-+        {__DARWIN__ ? 'New Branch' : 'New branch'}
-+      </Button>
-+    ) : null
-+  }
-+
-   private onItemClick = (item: IBranchListItem) => {
-     if (this.props.onItemClick) {
-       this.props.onItemClick(item.branch)
-@@ -201,52 +263,6 @@
-     }
-   }
-
--  public componentWillReceiveProps(nextProps: IBranchListProps) {
--    this.setState(createState(nextProps))
--  }
--
--  public render() {
--    return (
--      <BranchesFilterList
--        className="branches-list"
--        rowHeight={RowHeight}
--        filterText={this.props.filterText}
--        onFilterTextChanged={this.props.onFilterTextChanged}
--        onFilterKeyDown={this.props.onFilterKeyDown}
--        selectedItem={this.state.selectedItem}
--        renderItem={this.renderItem}
--        renderGroupHeader={this.renderGroupHeader}
--        onItemClick={this.onItemClick}
--        onSelectionChanged={this.onSelectionChanged}
--        groups={this.state.groups}
--        invalidationProps={this.props.allBranches}
--        renderPostFilter={this.renderNewButton}
--        renderNoItems={this.renderNoItems}
--      />
--    )
--  }
--
--  private renderNoItems = () => {
--    return (
--      <NoBranches
--        onCreateNewBranch={this.onCreateNewBranch}
--        canCreateNewBranch={this.props.canCreateNewBranch}
--      />
--    )
--  }
--
--  private renderNewButton = () => {
--    if (this.props.canCreateNewBranch) {
--      return (
--        <Button className="new-branch-button" onClick={this.onCreateNewBranch}>
--          {__DARWIN__ ? 'New Branch' : 'New branch'}
--        </Button>
--      )
--    } else {
--      return null
--    }
--  }
--
-   private onCreateNewBranch = () => {
-     if (this.props.onCreateNewBranch) {
-       this.props.onCreateNewBranch(this.props.filterText)
-added in remote
-  their  100644 dd27f7b0f40a3be55aa8a51cd83f116cf289c7e6 app/src/ui/branches/branch-renderer.tsx
-@@ -0,0 +1,25 @@
-+import * as React from 'react'
-+
-+import { Branch } from '../../models/branch'
-+
-+import { IBranchListItem } from './group-branches'
-+import { BranchListItem } from './branch-list-item'
-+import { IMatches } from '../../lib/fuzzy-find'
-+
-+export function renderDefaultBranch(
-+  item: IBranchListItem,
-+  matches: IMatches,
-+  currentBranch: Branch | null
-+): JSX.Element {
-+  const branch = item.branch
-+  const commit = branch.tip
-+  const currentBranchName = currentBranch ? currentBranch.name : null
-+  return (
-+    <BranchListItem
-+      name={branch.name}
-+      isCurrentBranch={branch.name === currentBranchName}
-+      lastCommitDate={commit ? commit.author.date : null}
-+      matches={matches}
-+    />
-+  )
-+}
-removed in remote
-  base   100644 a0b819ee744d244551744b38bdf6cc5ab5cfd9bf app/src/ui/branches/branch.tsx
-  our    100644 a0b819ee744d244551744b38bdf6cc5ab5cfd9bf app/src/ui/branches/branch.tsx
-@@ -1,42 +0,0 @@
--import * as React from 'react'
--import * as moment from 'moment'
--
--import { Octicon, OcticonSymbol } from '../octicons'
--import { HighlightText } from '../lib/highlight-text'
--
--interface IBranchProps {
--  readonly name: string
--  readonly isCurrentBranch: boolean
--
--  /** The date may be null if we haven't loaded the tip commit yet. */
--  readonly lastCommitDate: Date | null
--
--  /** The characters in the branch name to highlight */
--  readonly matches: ReadonlyArray<number>
--}
--
--/** The branch component. */
--export class BranchListItem extends React.Component<IBranchProps, {}> {
--  public render() {
--    const lastCommitDate = this.props.lastCommitDate
--    const isCurrentBranch = this.props.isCurrentBranch
--    const name = this.props.name
--
--    const date = lastCommitDate ? moment(lastCommitDate).fromNow() : ''
--    const icon = isCurrentBranch ? OcticonSymbol.check : OcticonSymbol.gitBranch
--    const infoTitle = isCurrentBranch
--      ? 'Current branch'
--      : lastCommitDate ? lastCommitDate.toString() : ''
--    return (
--      <div className="branches-list-item">
--        <Octicon className="icon" symbol={icon} />
--        <div className="name" title={name}>
--          <HighlightText text={name} highlight={this.props.matches} />
--        </div>
--        <div className="description" title={infoTitle}>
--          {date}
--        </div>
--      </div>
--    )
--  }
--}
-merged
-  result 100644 13f691705648f0b7a0f7303372de8f2db79f3d76 app/src/ui/branches/branches-container.tsx
-  our    100644 2f69f46fba8a6dfaa8628742c9c00631c32b24c3 app/src/ui/branches/branches-container.tsx
-@@ -1,16 +1,23 @@
- import * as React from 'react'
--import { Dispatcher } from '../../lib/dispatcher'
--import { FoldoutType, PopupType } from '../../lib/app-state'
-+import { CSSTransitionGroup } from 'react-transition-group'
-+
-+import { PullRequest } from '../../models/pull-request'
- import { Repository } from '../../models/repository'
- import { Branch } from '../../models/branch'
--import { BranchList } from './branch-list'
--import { TabBar } from '../tab-bar'
- import { BranchesTab } from '../../models/branches-tab'
-+
-+import { Dispatcher } from '../../lib/dispatcher'
-+import { FoldoutType, PopupType } from '../../lib/app-state'
- import { assertNever } from '../../lib/fatal-error'
-+
-+import { TabBar } from '../tab-bar'
-+
-+import { BranchList } from './branch-list'
- import { PullRequestList } from './pull-request-list'
- import { PullRequestsLoading } from './pull-requests-loading'
--import { PullRequest } from '../../models/pull-request'
--import { CSSTransitionGroup } from 'react-transition-group'
-+import { IBranchListItem } from './group-branches'
-+import { renderDefaultBranch } from './branch-renderer'
-+import { IMatches } from '../../lib/fuzzy-find'
-
- const PullRequestsLoadingCrossFadeInTimeout = 300
- const PullRequestsLoadingCrossFadeOutTimeout = 200
-@@ -91,6 +98,10 @@
-     )
-   }
-
-+  private renderBranch = (item: IBranchListItem, matches: IMatches) => {
-+    return renderDefaultBranch(item, matches, this.props.currentBranch)
-+  }
-+
-   private renderSelectedTab() {
-     let tab = this.props.selectedTab
-     if (!this.props.repository.gitHubRepository) {
-@@ -112,6 +123,7 @@
-             onSelectionChanged={this.onBranchSelectionChanged}
-             canCreateNewBranch={true}
-             onCreateNewBranch={this.onCreateBranchWithName}
-+            renderBranch={this.renderBranch}
-           />
-         )
-
-merged
-  result 100644 7451fb01e997e0bfbc31e57c3e69d5f34ae179ea app/src/ui/branches/ci-status.tsx
-  our    100644 1f7ff2736a141923c6fb9112cfd5f398896acf1e app/src/ui/branches/ci-status.tsx
-@@ -4,6 +4,7 @@
- import { assertNever } from '../../lib/fatal-error'
- import * as classNames from 'classnames'
- import { PullRequestStatus } from '../../models/pull-request'
-+import { getPRStatusSummary } from './pull-request-status'
-
- interface ICIStatusProps {
-   /** The classname for the underlying element. */
-@@ -17,7 +18,7 @@
- export class CIStatus extends React.Component<ICIStatusProps, {}> {
-   public render() {
-     const status = this.props.status
--    const ciTitle = generateStatusHistory(status)
-+    const title = getPRStatusSummary(status)
-     const state = status.state
-
-     return (
-@@ -28,25 +29,12 @@
-           this.props.className
-         )}
-         symbol={getSymbolForState(state)}
--        title={ciTitle}
-+        title={title}
-       />
-     )
-   }
- }
-
--function generateStatusHistory(prStatus: PullRequestStatus): string {
--  const statusCount = prStatus.statuses.length || 0
--
--  if (statusCount === 0) {
--    return prStatus.state.toUpperCase()
--  } else {
--    const successCount = prStatus.statuses.filter(x => x.state === 'success')
--      .length
--
--    return `${successCount}/${statusCount} checks OK`
--  }
--}
--
- function getSymbolForState(state: APIRefState): OcticonSymbol {
-   switch (state) {
-     case 'pending':
-merged
-  result 100644 f4953500cb984957451e61da094929c0254c811d app/src/ui/branches/group-branches.ts
-  our    100644 2fd74251410406f3439b9e4e709abb36b13b8dd8 app/src/ui/branches/group-branches.ts
-@@ -4,7 +4,7 @@
- export type BranchGroupIdentifier = 'default' | 'recent' | 'other'
-
- export interface IBranchListItem extends IFilterListItem {
--  readonly text: string
-+  readonly text: ReadonlyArray<string>
-   readonly id: string
-   readonly branch: Branch
- }
-@@ -22,7 +22,7 @@
-       identifier: 'default',
-       items: [
-         {
--          text: defaultBranch.name,
-+          text: [defaultBranch.name],
-           id: defaultBranch.name,
-           branch: defaultBranch,
-         },
-@@ -40,7 +40,7 @@
-
-     for (const branch of recentBranchesWithoutDefault) {
-       recentBranches.push({
--        text: branch.name,
-+        text: [branch.name],
-         id: branch.name,
-         branch,
-       })
-@@ -57,7 +57,7 @@
-     b => b.name !== defaultBranchName && !recentBranchNames.has(b.name)
-   )
-   const remainingItems = remainingBranches.map(b => ({
--    text: b.name,
-+    text: [b.name],
-     id: b.name,
-     branch: b,
-   }))
-merged
-  result 100644 bcb647c13a47252579f1da58a3632ba021373dd8 app/src/ui/branches/index.ts
-  our    100644 a62107b46da20b86867baa54600fa7cbc8f9eb41 app/src/ui/branches/index.ts
-@@ -2,4 +2,6 @@
- export { BranchList } from './branch-list'
- export { BranchesContainer } from './branches-container'
- export { PullRequestBadge } from './pull-request-badge'
--export { groupBranches } from './group-branches'
-+export { groupBranches, IBranchListItem } from './group-branches'
-+export { BranchListItem } from './branch-list-item'
-+export { renderDefaultBranch } from './branch-renderer'
-merged
-  result 100644 65a3baac5401a65b19efd6017970323efc6fc8fa app/src/ui/branches/no-branches.tsx
-  our    100644 b6f86111727f7f6fb160bb9f2a6ed052d339dca8 app/src/ui/branches/no-branches.tsx
-@@ -43,13 +43,7 @@
-       )
-     }
-
--    return (
--      <div className="no-branches">
--        <img src={BlankSlateImage} className="blankslate-image" />
--
--        <div className="title">Sorry, I can't find that branch</div>
--      </div>
--    )
-+    return <div className="no-branches">Sorry, I can't find that branch</div>
-   }
-
-   private renderShortcut() {
-merged
-  result 100644 075b2904f501296734519cbb19ed658a9f168a05 app/src/ui/branches/pull-request-list-item.tsx
-  our    100644 b89deea91855c4909ea7801c74d3978b0e398d1a app/src/ui/branches/pull-request-list-item.tsx
-@@ -5,6 +5,7 @@
- import { CIStatus } from './ci-status'
- import { PullRequestStatus } from '../../models/pull-request'
- import { HighlightText } from '../lib/highlight-text'
-+import { IMatches } from '../../lib/fuzzy-find'
-
- export interface IPullRequestListItemProps {
-   /** The title. */
-@@ -32,7 +33,7 @@
-   readonly loading?: boolean
-
-   /** The characters in the PR title to highlight */
--  readonly matches: ReadonlyArray<number>
-+  readonly matches: IMatches
- }
-
- /** Pull requests as rendered in the Pull Requests list. */
-@@ -51,7 +52,7 @@
-   public render() {
-     const title = this.props.loading === true ? undefined : this.props.title
-     const subtitle = this.getSubtitle()
--
-+    const matches = this.props.matches
-     const className = classNames('pull-request-item', {
-       loading: this.props.loading === true,
-     })
-@@ -61,10 +62,10 @@
-         <Octicon className="icon" symbol={OcticonSymbol.gitPullRequest} />
-         <div className="info">
-           <div className="title" title={title}>
--            <HighlightText text={title || ''} highlight={this.props.matches} />
-+            <HighlightText text={title || ''} highlight={matches.title} />
-           </div>
-           <div className="subtitle" title={subtitle}>
--            {subtitle}
-+            <HighlightText text={subtitle || ''} highlight={matches.subtitle} />
-           </div>
-         </div>
-         {this.renderPullRequestStatus()}
-merged
-  result 100644 484112784b83cd0d9be46284b3a1fb1b877894b2 app/src/ui/branches/pull-request-list.tsx
-  our    100644 1f9009ad85604378e350167422ee4056fad94c1c app/src/ui/branches/pull-request-list.tsx
-@@ -1,4 +1,5 @@
- import * as React from 'react'
-+import * as moment from 'moment'
- import {
-   FilterList,
-   IFilterListGroup,
-@@ -8,21 +9,14 @@
- import { PullRequestListItem } from './pull-request-list-item'
- import { PullRequest, PullRequestStatus } from '../../models/pull-request'
- import { NoPullRequests } from './no-pull-requests'
-+import { IMatches } from '../../lib/fuzzy-find'
-
- interface IPullRequestListItem extends IFilterListItem {
-   readonly id: string
--  readonly text: string
-+  readonly text: ReadonlyArray<string>
-   readonly pullRequest: PullRequest
- }
-
--/**
-- * TS can't parse generic specialization in JSX, so we have to alias it here
-- * with the generic type. See https://github.com/Microsoft/TypeScript/issues/6395.
-- */
--const PullRequestFilterList: new () => FilterList<
--  IPullRequestListItem
--> = FilterList as any
--
- export const RowHeight = 47
-
- interface IPullRequestListProps {
-@@ -126,7 +120,7 @@
-
-   public render() {
-     return (
--      <PullRequestFilterList
-+      <FilterList<IPullRequestListItem>
-         className="pull-request-list"
-         rowHeight={RowHeight}
-         groups={this.state.groupedItems}
-@@ -157,7 +151,7 @@
-
-   private renderPullRequest = (
-     item: IPullRequestListItem,
--    matches: ReadonlyArray<number>
-+    matches: IMatches
-   ) => {
-     const pr = item.pullRequest
-     const refStatuses = pr.status != null ? pr.status.statuses : []
-@@ -203,11 +197,16 @@
-   }
- }
-
-+function getSubtitle(pr: PullRequest) {
-+  const timeAgo = moment(pr.created).fromNow()
-+  return `#${pr.number} opened ${timeAgo} by ${pr.author}`
-+}
-+
- function createListItems(
-   pullRequests: ReadonlyArray<PullRequest>
- ): IFilterListGroup<IPullRequestListItem> {
-   const items = pullRequests.map(pr => ({
--    text: pr.title,
-+    text: [pr.title, getSubtitle(pr)],
-     id: pr.number.toString(),
-     pullRequest: pr,
-   }))
-added in remote
-  their  100644 54db06f6493895ecd48deef8273b206d613d60e2 app/src/ui/branches/pull-request-status.ts
-@@ -0,0 +1,48 @@
-+import { PullRequestStatus, ICommitStatus } from '../../models/pull-request'
-+import { APIRefState } from '../../lib/api'
-+import { assertNever } from '../../lib/fatal-error'
-+
-+function formatState(state: APIRefState): string {
-+  switch (state) {
-+    case 'failure':
-+      return 'Commit status: failed'
-+    case 'pending':
-+    case 'success':
-+      return `Commit status: ${state}`
-+
-+    default:
-+      return assertNever(state, `Unknown APIRefState value: ${state}`)
-+  }
-+}
-+
-+function formatSingleStatus(status: ICommitStatus) {
-+  const word = status.state
-+  const sentenceCaseWord =
-+    word.charAt(0).toUpperCase() + word.substring(1, word.length)
-+
-+  return `${sentenceCaseWord}: ${status.description}`
-+}
-+
-+/**
-+ * Convert the Pull Request status to an app-friendly string.
-+ *
-+ * If the pull request contains commit statuses, this method will compute
-+ * the number of successful statuses. Oteherwise, it will fall back
-+ * to the `state` value reported by the GitHub API.
-+ */
-+export function getPRStatusSummary(prStatus: PullRequestStatus): string {
-+  const statusCount = prStatus.statuses.length || 0
-+
-+  if (statusCount === 0) {
-+    return formatState(prStatus.state)
-+  }
-+
-+  if (statusCount === 1) {
-+    return formatSingleStatus(prStatus.statuses[0])
-+  }
-+
-+  const successCount = prStatus.statuses.filter(x => x.state === 'success')
-+    .length
-+
-+  return `${successCount}/${statusCount} checks OK`
-+}
-merged
-  result 100644 6965fcba858e40dc9bebce9bd3f18f369bde8ae3 app/src/ui/branches/pull-requests-loading.tsx
-  our    100644 55f55e50c3c466ac8f51c62622a11dae48b16ea1 app/src/ui/branches/pull-requests-loading.tsx
-@@ -8,21 +8,13 @@
-
- const FacadeCount = 6
-
--/**
-- * TS can't parse generic specialization in JSX, so we have to alias it here
-- * with the generic type. See https://github.com/Microsoft/TypeScript/issues/6395.
-- */
--const PullRequestsLoadingList: new () => FilterList<
--  IFilterListItem
--> = FilterList as any
--
- const prLoadingItemProps: IPullRequestListItemProps = {
-   loading: true,
-   author: '',
-   created: new Date(0),
-   number: 0,
-   title: '',
--  matches: [],
-+  matches: { title: [], subtitle: [] },
-   status: {
-     sha: '4b825dc642cb6eb9a060e54bf8d69288fbee4904',
-     totalCount: 1,
-@@ -38,7 +30,7 @@
-     const items: Array<IFilterListItem> = []
-     for (let i = 0; i < FacadeCount; i++) {
-       items.push({
--        text: '',
-+        text: [''],
-         id: i.toString(),
-       })
-     }
-@@ -51,7 +43,7 @@
-     ]
-
-     return (
--      <PullRequestsLoadingList
-+      <FilterList<IFilterListItem>
-         className="pull-request-list"
-         rowHeight={RowHeight}
-         groups={groups}
-merged
-  result 100644 5e20b50a00f1033a845d4faf66cd584088157811 app/src/ui/changes/changed-file.tsx
-  our    100644 3bb750a806ac20d6733638b383d80bd8dc9719b6 app/src/ui/changes/changed-file.tsx
-@@ -17,7 +17,7 @@
-   readonly onContextMenu: (
-     path: string,
-     status: AppFileStatus,
--    event: React.MouseEvent<any>
-+    event: React.MouseEvent<HTMLDivElement>
-   ) => void
- }
-
-merged
-  result 100644 e92f60ef1e0ceb5edca52df2ec9a0ba4f404eee8 app/src/ui/changes/changes-list.tsx
-  our    100644 0519a49d3e52c4ce4be705f752ca036f6160faf6 app/src/ui/changes/changes-list.tsx
-@@ -1,39 +1,44 @@
- import * as React from 'react'
- import * as Path from 'path'
-
--import { CommitMessage } from './commit-message'
--import { ChangedFile } from './changed-file'
--import { List, ClickSource } from '../lib/list'
-+import { ICommitMessage } from '../../lib/app-state'
-+import { IGitHubUser } from '../../lib/databases'
-+import { Dispatcher } from '../../lib/dispatcher'
-+import { ITrailer } from '../../lib/git/interpret-trailers'
-+import { IMenuItem } from '../../lib/menu-item'
-+import { revealInFileManager } from '../../lib/app-shell'
- import {
-+  AppFileStatus,
-   WorkingDirectoryStatus,
-   WorkingDirectoryFileChange,
--  AppFileStatus,
- } from '../../models/status'
- import { DiffSelectionType } from '../../models/diff'
- import { CommitIdentity } from '../../models/commit-identity'
-+import { Repository } from '../../models/repository'
-+import { IAuthor } from '../../models/author'
-+import { List, ClickSource } from '../lib/list'
- import { Checkbox, CheckboxValue } from '../lib/checkbox'
--import { ICommitMessage } from '../../lib/app-state'
--import { IGitHubUser } from '../../lib/databases'
--import { Dispatcher } from '../../lib/dispatcher'
-+import {
-+  isSafeFileExtension,
-+  DefaultEditorLabel,
-+  RevealInFileManagerLabel,
-+  OpenWithDefaultProgramLabel,
-+} from '../lib/context-menu'
-+import { CommitMessage } from './commit-message'
-+import { ChangedFile } from './changed-file'
- import { IAutocompletionProvider } from '../autocompletion'
--import { Repository } from '../../models/repository'
- import { showContextualMenu } from '../main-process-proxy'
--import { IAuthor } from '../../models/author'
--import { ITrailer } from '../../lib/git/interpret-trailers'
--import { IMenuItem } from '../../lib/menu-item'
-+import { arrayEquals } from '../../lib/equality'
-
- const RowHeight = 29
--const RestrictedFileExtensions = ['.cmd', '.exe', '.bat', '.sh']
--const defaultEditorLabel = __DARWIN__
--  ? 'Open in External Editor'
--  : 'Open in external editor'
-+
- const GitIgnoreFileName = '.gitignore'
-
- interface IChangesListProps {
-   readonly repository: Repository
-   readonly workingDirectory: WorkingDirectoryStatus
--  readonly selectedFileID: string | null
--  readonly onFileSelectionChanged: (row: number) => void
-+  readonly selectedFileIDs: string[]
-+  readonly onFileSelectionChanged: (rows: ReadonlyArray<number>) => void
-   readonly onIncludeChanged: (path: string, include: boolean) => void
-   readonly onSelectAll: (selectAll: boolean) => void
-   readonly onCreateCommit: (
-@@ -42,17 +47,12 @@
-     trailers?: ReadonlyArray<ITrailer>
-   ) => Promise<boolean>
-   readonly onDiscardChanges: (file: WorkingDirectoryFileChange) => void
-+  readonly askForConfirmationOnDiscardChanges: boolean
-   readonly onDiscardAllChanges: (
-     files: ReadonlyArray<WorkingDirectoryFileChange>
-   ) => void
-
-   /**
--   * Called to reveal a file in the native file manager.
--   * @param path The path of the file relative to the root of the repository
--   */
--  readonly onRevealInFileManager: (path: string) => void
--
--  /**
-    * Called to open a file it its default application
-    * @param path The path of the file relative to the root of the repository
-    */
-@@ -69,7 +69,6 @@
-    * List Props for documentation.
-    */
-   readonly onRowClick?: (row: number, source: ClickSource) => void
--
-   readonly commitMessage: ICommitMessage | null
-   readonly contextualCommitMessage: ICommitMessage | null
-
-@@ -77,7 +76,7 @@
-   readonly autocompletionProviders: ReadonlyArray<IAutocompletionProvider<any>>
-
-   /** Called when the given pattern should be ignored. */
--  readonly onIgnore: (pattern: string) => void
-+  readonly onIgnore: (pattern: string | string[]) => void
-
-   /**
-    * Whether or not to show a field for adding co-authors to
-@@ -98,13 +97,58 @@
-   readonly externalEditorLabel?: string
-
-   /**
--   * Called to open a file using the user's configured applications
--   * @param path The path of the file relative to the root of the repository
-+   * Callback to open a selected file using the configured external editor
-+   *
-+   * @param fullPath The full path to the file on disk
-    */
--  readonly onOpenInExternalEditor: (path: string) => void
-+  readonly onOpenInExternalEditor: (fullPath: string) => void
- }
-
--export class ChangesList extends React.Component<IChangesListProps, {}> {
-+interface IChangesState {
-+  readonly selectedRows: ReadonlyArray<number>
-+}
-+
-+function getSelectedRowsFromProps(
-+  props: IChangesListProps
-+): ReadonlyArray<number> {
-+  const selectedFileIDs = props.selectedFileIDs
-+  const selectedRows = []
-+
-+  for (const id of selectedFileIDs) {
-+    const ix = props.workingDirectory.findFileIndexByID(id)
-+    if (ix !== -1) {
-+      selectedRows.push(ix)
-+    }
-+  }
-+
-+  return selectedRows
-+}
-+
-+export class ChangesList extends React.Component<
-+  IChangesListProps,
-+  IChangesState
-+> {
-+  public constructor(props: IChangesListProps) {
-+    super(props)
-+    this.state = {
-+      selectedRows: getSelectedRowsFromProps(props),
-+    }
-+  }
-+
-+  public componentWillReceiveProps(nextProps: IChangesListProps) {
-+    // No need to update state unless we haven't done it yet or the
-+    // selected file id list has changed.
-+    if (
-+      !arrayEquals(nextProps.selectedFileIDs, this.props.selectedFileIDs) ||
-+      !arrayEquals(
-+        nextProps.workingDirectory.files,
-+        this.props.workingDirectory.files
-+      )
-+    ) {
-+      this.setState({ selectedRows: getSelectedRowsFromProps(nextProps) })
-+    }
-+  }
-+
-   private onIncludeAllChanged = (event: React.FormEvent<HTMLInputElement>) => {
-     const include = event.currentTarget.checked
-     this.props.onSelectAll(include)
-@@ -117,7 +161,9 @@
-     const includeAll =
-       selection === DiffSelectionType.All
-         ? true
--        : selection === DiffSelectionType.None ? false : null
-+        : selection === DiffSelectionType.None
-+          ? false
-+          : null
-
-     return (
-       <ChangedFile
-@@ -126,9 +172,9 @@
-         oldPath={file.oldPath}
-         include={includeAll}
-         key={file.id}
-+        onContextMenu={this.onItemContextMenu}
-         onIncludeChanged={this.props.onIncludeChanged}
-         availableWidth={this.props.availableWidth}
--        onContextMenu={this.onItemContextMenu}
-       />
-     )
-   }
-@@ -148,14 +194,43 @@
-     this.props.onDiscardAllChanges(this.props.workingDirectory.files)
-   }
-
--  private onDiscardChanges = (path: string) => {
-+  private onDiscardChanges = (files: ReadonlyArray<string>) => {
-     const workingDirectory = this.props.workingDirectory
--    const file = workingDirectory.files.find(f => f.path === path)
--    if (!file) {
--      return
-+
-+    if (files.length === 1) {
-+      const modifiedFile = workingDirectory.files.find(f => f.path === files[0])
-+
-+      if (modifiedFile != null) {
-+        this.props.onDiscardChanges(modifiedFile)
-+      }
-+    } else {
-+      const modifiedFiles = new Array<WorkingDirectoryFileChange>()
-+
-+      files.forEach(file => {
-+        const modifiedFile = workingDirectory.files.find(f => f.path === file)
-+
-+        if (modifiedFile != null) {
-+          modifiedFiles.push(modifiedFile)
-+        }
-+      })
-+
-+      if (modifiedFiles.length > 0) {
-+        this.props.onDiscardAllChanges(modifiedFiles)
-+      }
-     }
-+  }
-
--    this.props.onDiscardChanges(file)
-+  private getDiscardChangesMenuItemLabel = (files: ReadonlyArray<string>) => {
-+    const label =
-+      files.length === 1
-+        ? __DARWIN__
-+          ? `Discard Changes`
-+          : `Discard changes`
-+        : __DARWIN__
-+          ? `Discard ${files.length} Selected Changes`
-+          : `Discard ${files.length} selected changes`
-+
-+    return this.props.askForConfirmationOnDiscardChanges ? `${label}…` : label
-   }
-
-   private onContextMenu = (event: React.MouseEvent<any>) => {
-@@ -175,64 +250,97 @@
-   private onItemContextMenu = (
-     path: string,
-     status: AppFileStatus,
--    event: React.MouseEvent<any>
-+    event: React.MouseEvent<HTMLDivElement>
-   ) => {
-     event.preventDefault()
-
-     const extension = Path.extname(path)
--    const fileName = Path.basename(path)
--    const isSafeExtension = __WIN32__
--      ? RestrictedFileExtensions.indexOf(extension.toLowerCase()) === -1
--      : true
--    const revealInFileManagerLabel = __DARWIN__
--      ? 'Reveal in Finder'
--      : __WIN32__ ? 'Show in Explorer' : 'Show in your File Manager'
-+    const isSafeExtension = isSafeFileExtension(extension)
-     const openInExternalEditor = this.props.externalEditorLabel
-       ? `Open in ${this.props.externalEditorLabel}`
--      : defaultEditorLabel
-+      : DefaultEditorLabel
-+
-+    const wd = this.props.workingDirectory
-+    const selectedFiles = new Array<WorkingDirectoryFileChange>()
-+    const paths = new Array<string>()
-+    const extensions = new Set<string>()
-+
-+    this.props.selectedFileIDs.forEach(fileID => {
-+      const newFile = wd.findFileWithID(fileID)
-+      if (newFile) {
-+        selectedFiles.push(newFile)
-+        paths.push(newFile.path)
-+
-+        const extension = Path.extname(newFile.path)
-+        if (extension.length) {
-+          extensions.add(extension)
-+        }
-+      }
-+    })
-+
-     const items: IMenuItem[] = [
-       {
--        label: __DARWIN__ ? 'Discard Changes…' : 'Discard changes…',
--        action: () => this.onDiscardChanges(path),
-+        label: this.getDiscardChangesMenuItemLabel(paths),
-+        action: () => this.onDiscardChanges(paths),
-       },
-       {
-         label: __DARWIN__ ? 'Discard All Changes…' : 'Discard all changes…',
-         action: () => this.onDiscardAllChanges(),
-       },
-       { type: 'separator' },
--      {
--        label: 'Ignore',
--        action: () => this.props.onIgnore(path),
--        enabled: fileName !== GitIgnoreFileName,
--      },
-     ]
-
--    if (extension.length) {
-+    if (paths.length === 1) {
-+      items.push({
-+        label: __DARWIN__ ? 'Ignore File' : 'Ignore file',
-+        action: () => this.props.onIgnore(path),
-+        enabled: Path.basename(path) !== GitIgnoreFileName,
-+      })
-+    } else if (paths.length > 1) {
-       items.push({
--        label: __DARWIN__
--          ? `Ignore All ${extension} Files`
--          : `Ignore all ${extension} files`,
--        action: () => this.props.onIgnore(`*${extension}`),
--        enabled: fileName !== GitIgnoreFileName,
-+        label: `Ignore ${paths.length} selected files`,
-+        action: () => {
-+          // Filter out any .gitignores that happens to be selected, ignoring
-+          // those doesn't make sense.
-+          this.props.onIgnore(
-+            paths.filter(path => Path.basename(path) !== GitIgnoreFileName)
-+          )
-+        },
-+        // Enable this action as long as there's something selected which isn't
-+        // a .gitignore file.
-+        enabled: paths.some(path => Path.basename(path) !== GitIgnoreFileName),
-       })
-     }
-
-+    // Five menu items should be enough for everyone
-+    Array.from(extensions)
-+      .slice(0, 5)
-+      .forEach(extension => {
-+        items.push({
-+          label: __DARWIN__
-+            ? `Ignore All ${extension} Files`
-+            : `Ignore all ${extension} files`,
-+          action: () => this.props.onIgnore(`*${extension}`),
-+        })
-+      })
-+
-     items.push(
-       { type: 'separator' },
-       {
--        label: revealInFileManagerLabel,
--        action: () => this.props.onRevealInFileManager(path),
-+        label: RevealInFileManagerLabel,
-+        action: () => revealInFileManager(this.props.repository, path),
-         enabled: status !== AppFileStatus.Deleted,
-       },
-       {
-         label: openInExternalEditor,
--        action: () => this.props.onOpenInExternalEditor(path),
-+        action: () => {
-+          const fullPath = Path.join(this.props.repository.path, path)
-+          this.props.onOpenInExternalEditor(fullPath)
-+        },
-         enabled: isSafeExtension && status !== AppFileStatus.Deleted,
-       },
-       {
--        label: __DARWIN__
--          ? 'Open with Default Program'
--          : 'Open with default program',
-+        label: OpenWithDefaultProgramLabel,
-         action: () => this.props.onOpenItem(path),
-         enabled: isSafeExtension && status !== AppFileStatus.Deleted,
-       }
-@@ -243,9 +351,6 @@
-
-   public render() {
-     const fileList = this.props.workingDirectory.files
--    const selectedRow = fileList.findIndex(
--      file => file.id === this.props.selectedFileID
--    )
-     const fileCount = fileList.length
-     const filesPlural = fileCount === 1 ? 'file' : 'files'
-     const filesDescription = `${fileCount} changed ${filesPlural}`
-@@ -268,7 +373,8 @@
-           rowCount={this.props.workingDirectory.files.length}
-           rowHeight={RowHeight}
-           rowRenderer={this.renderRow}
--          selectedRow={selectedRow}
-+          selectedRows={this.state.selectedRows}
-+          selectionMode="multi"
-           onSelectionChanged={this.props.onFileSelectionChanged}
-           invalidationProps={this.props.workingDirectory}
-           onRowClick={this.props.onRowClick}
-merged
-  result 100644 0a0e18fc9f4c8956a648726827dc496f3d5f98db app/src/ui/changes/commit-message.tsx
-  our    100644 5ea583fb1898ce0a5637a81c7d29dfcf835f8309 app/src/ui/changes/commit-message.tsx
-@@ -343,8 +343,12 @@
-
-   private get toggleCoAuthorsText(): string {
-     return this.props.showCoAuthoredBy
--      ? __DARWIN__ ? 'Remove Co-Authors' : 'Remove co-authors'
--      : __DARWIN__ ? 'Add Co-Authors' : 'Add co-authors'
-+      ? __DARWIN__
-+        ? 'Remove Co-Authors'
-+        : 'Remove co-authors'
-+      : __DARWIN__
-+        ? 'Add Co-Authors'
-+        : 'Add co-authors'
-   }
-
-   private getAddRemoveCoAuthorsMenuItem(): IMenuItem {
-@@ -491,8 +495,9 @@
-           {this.renderAvatar()}
-
-           <AutocompletingInput
-+            isRequired={true}
-             className="summary-field"
--            placeholder="Summary"
-+            placeholder="Summary (required)"
-             value={this.state.summary}
-             onValueChanged={this.onSummaryChanged}
-             autocompletionProviders={this.props.autocompletionProviders}
-added in remote
-  their  100644 cb84fdd59ab575c56de3c3411ba9c9fc989bf26d app/src/ui/changes/files-changed-badge.tsx
-@@ -0,0 +1,24 @@
-+import * as React from 'react'
-+
-+interface IFilesChangedBadgeProps {
-+  readonly filesChangedCount: number
-+}
-+
-+/** The number that can be displayed as a specific value */
-+const MaximumChangesCount = 300
-+
-+/** Displays number of files that have changed */
-+export class FilesChangedBadge extends React.Component<
-+  IFilesChangedBadgeProps,
-+  {}
-+> {
-+  public render() {
-+    const filesChangedCount = this.props.filesChangedCount
-+    const badgeCount =
-+      filesChangedCount > MaximumChangesCount
-+        ? `${MaximumChangesCount}+`
-+        : filesChangedCount
-+
-+    return <span className="counter">{badgeCount}</span>
-+  }
-+}
-added in remote
-  their  100644 185bc1b81106f809ad63e79d4b3adf97946f68ce app/src/ui/changes/multiple-selection.tsx
-@@ -0,0 +1,26 @@
-+import * as React from 'react'
-+import { encodePathAsUrl } from '../../lib/path'
-+
-+const BlankSlateImage = encodePathAsUrl(
-+  __dirname,
-+  'static/multiple-files-selected.svg'
-+)
-+
-+interface IMultipleSelectionProps {
-+  /** Called when the user chooses to open the repository. */
-+  readonly count: number
-+}
-+/** The component to display when there are no local changes. */
-+export class MultipleSelection extends React.Component<
-+  IMultipleSelectionProps,
-+  {}
-+> {
-+  public render() {
-+    return (
-+      <div className="panel blankslate" id="no-changes">
-+        <img src={BlankSlateImage} className="blankslate-image" />
-+        <div>{this.props.count} files selected</div>
-+      </div>
-+    )
-+  }
-+}
-merged
-  result 100644 090ffa423a170c926a8b7fdcd04748ff3bd2d416 app/src/ui/changes/no-changes.tsx
-  our    100644 0184f2d912257317c527a0b019d070ee191f17c4 app/src/ui/changes/no-changes.tsx
-@@ -1,6 +1,9 @@
- import * as React from 'react'
--import { LinkButton } from '../lib/link-button'
-+
- import { encodePathAsUrl } from '../../lib/path'
-+import { revealInFileManager } from '../../lib/app-shell'
-+import { Repository } from '../../models/repository'
-+import { LinkButton } from '../lib/link-button'
-
- const BlankSlateImage = encodePathAsUrl(
-   __dirname,
-@@ -8,8 +11,7 @@
- )
-
- interface INoChangesProps {
--  /** Called when the user chooses to open the repository. */
--  readonly onOpenRepository: () => void
-+  readonly repository: Repository
- }
-
- /** The component to display when there are no local changes. */
-@@ -17,7 +19,9 @@
-   public render() {
-     const opener = __DARWIN__
-       ? 'Finder'
--      : __WIN32__ ? 'Explorer' : 'your File Manager'
-+      : __WIN32__
-+        ? 'Explorer'
-+        : 'your File Manager'
-     return (
-       <div className="panel blankslate" id="no-changes">
-         <img src={BlankSlateImage} className="blankslate-image" />
-@@ -33,6 +37,6 @@
-   }
-
-   private open = () => {
--    this.props.onOpenRepository()
-+    revealInFileManager(this.props.repository, '')
-   }
- }
-merged
-  result 100644 ff1760bbd4b1a3d5ea8ac084b1282e99b2ea288b app/src/ui/changes/sidebar.tsx
-  our    100644 c6fc23660a5320772101aa310315dc9bca822d5c app/src/ui/changes/sidebar.tsx
-@@ -52,10 +52,11 @@
-   readonly externalEditorLabel?: string
-
-   /**
--   * Called to open a file using the user's configured applications
--   * @param path The path of the file relative to the root of the repository
-+   * Callback to open a selected file using the configured external editor
-+   *
-+   * @param fullPath The full path to the file on disk
-    */
--  readonly onOpenInExternalEditor: (path: string) => void
-+  readonly onOpenInExternalEditor: (fullPath: string) => void
- }
-
- export class ChangesSidebar extends React.Component<IChangesSidebarProps, {}> {
-@@ -124,9 +125,9 @@
-     )
-   }
-
--  private onFileSelectionChanged = (row: number) => {
--    const file = this.props.changes.workingDirectory.files[row]
--    this.props.dispatcher.changeChangesSelection(this.props.repository, file)
-+  private onFileSelectionChanged = (rows: ReadonlyArray<number>) => {
-+    const files = rows.map(i => this.props.changes.workingDirectory.files[i])
-+    this.props.dispatcher.changeChangesSelection(this.props.repository, files)
-   }
-
-   private onIncludeChanged = (path: string, include: boolean) => {
-@@ -169,30 +170,19 @@
-   private onDiscardAllChanges = (
-     files: ReadonlyArray<WorkingDirectoryFileChange>
-   ) => {
--    if (!this.props.askForConfirmationOnDiscardChanges) {
--      this.props.dispatcher.discardChanges(this.props.repository, files)
--    } else {
--      this.props.dispatcher.showPopup({
--        type: PopupType.ConfirmDiscardChanges,
--        repository: this.props.repository,
--        files,
--      })
--    }
-+    this.props.dispatcher.showPopup({
-+      type: PopupType.ConfirmDiscardChanges,
-+      repository: this.props.repository,
-+      showDiscardChangesSetting: false,
-+      files,
-+    })
-   }
-
--  private onIgnore = (pattern: string) => {
-+  private onIgnore = (pattern: string | string[]) => {
-     this.props.dispatcher.ignore(this.props.repository, pattern)
-   }
-
-   /**
--   * Reveals a file from a repository in the native file manager.
--   * @param path The path of the file relative to the root of the repository
--   */
--  private onRevealInFileManager = (path: string) => {
--    this.props.dispatcher.revealInFileManager(this.props.repository, path)
--  }
--
--  /**
-    * Open file with default application.
-    * @param path The path of the file relative to the root of the repository
-    */
-@@ -229,11 +219,18 @@
-    * Handles click events from the List item container, note that this is
-    * Not the same thing as the element returned by the row renderer in ChangesList
-    */
--  private onChangedItemClick = (row: number, source: ClickSource) => {
-+  private onChangedItemClick = (
-+    rows: number | number[],
-+    source: ClickSource
-+  ) => {
-     // Toggle selection when user presses the spacebar or enter while focused
--    // on a list item
-+    // on a list item or on the list's container
-     if (source.kind === 'keyboard') {
--      this.onToggleInclude(row)
-+      if (rows instanceof Array) {
-+        rows.forEach(row => this.onToggleInclude(row))
-+      } else {
-+        this.onToggleInclude(rows)
-+      }
-     }
-   }
-
-@@ -274,7 +271,7 @@
-
-   public render() {
-     const changesState = this.props.changes
--    const selectedFileID = changesState.selectedFileID
-+    const selectedFileIDs = changesState.selectedFileIDs
-
-     // TODO: I think user will expect the avatar to match that which
-     // they have configured in GitHub.com as well as GHE so when we add
-@@ -292,14 +289,16 @@
-           dispatcher={this.props.dispatcher}
-           repository={this.props.repository}
-           workingDirectory={changesState.workingDirectory}
--          selectedFileID={selectedFileID}
-+          selectedFileIDs={selectedFileIDs}
-           onFileSelectionChanged={this.onFileSelectionChanged}
-           onCreateCommit={this.onCreateCommit}
-           onIncludeChanged={this.onIncludeChanged}
-           onSelectAll={this.onSelectAll}
-           onDiscardChanges={this.onDiscardChanges}
-+          askForConfirmationOnDiscardChanges={
-+            this.props.askForConfirmationOnDiscardChanges
-+          }
-           onDiscardAllChanges={this.onDiscardAllChanges}
--          onRevealInFileManager={this.onRevealInFileManager}
-           onOpenItem={this.onOpenItem}
-           onRowClick={this.onChangedItemClick}
-           commitAuthor={this.props.commitAuthor}
-merged
-  result 100644 81bb2d3dc71f42c419af98460238b7063d80badd app/src/ui/clone-repository/clone-github-repository.tsx
-  our    100644 e546634cdd499994bb68f6f3ed1d56e956b4bc45 app/src/ui/clone-repository/clone-github-repository.tsx
-@@ -10,6 +10,7 @@
- import { FilterList } from '../lib/filter-list'
- import { API } from '../../lib/api'
- import { IFilterListGroup } from '../lib/filter-list'
-+import { IMatches } from '../../lib/fuzzy-find'
- import {
-   ICloneableRepositoryListItem,
-   groupRepositories,
-@@ -204,13 +205,13 @@
-
-   private renderItem = (
-     item: ICloneableRepositoryListItem,
--    matches: ReadonlyArray<number>
-+    matches: IMatches
-   ) => {
-     return (
-       <div className="clone-repository-list-item">
-         <Octicon className="icon" symbol={item.icon} />
--        <div className="name" title={item.text}>
--          <HighlightText text={item.text} highlight={matches} />
-+        <div className="name" title={item.text[0]}>
-+          <HighlightText text={item.text[0]} highlight={matches.title} />
-         </div>
-       </div>
-     )
-merged
-  result 100644 e8132c67eee073fe0faec333fa15a273e811d960 app/src/ui/clone-repository/clone-repository.tsx
-  our    100644 b4e9cbd7caed04fee894293ace81b6f332f1b6ea app/src/ui/clone-repository/clone-repository.tsx
-@@ -1,6 +1,8 @@
- import * as Path from 'path'
- import * as React from 'react'
- import { remote } from 'electron'
-+import { pathExists } from 'fs-extra'
-+
- import { Button } from '../lib/button'
- import { ButtonGroup } from '../lib/button-group'
- import { Dispatcher } from '../../lib/dispatcher'
-@@ -17,7 +19,7 @@
- import { CloneRepositoryTab } from '../../models/clone-repository-tab'
- import { CloneGenericRepository } from './clone-generic-repository'
- import { CloneGithubRepository } from './clone-github-repository'
--import { pathExists } from '../../lib/file-system'
-+
- import { assertNever } from '../../lib/fatal-error'
- import { CallToAction } from '../lib/call-to-action'
-
-merged
-  result 100644 b7412f2d5dd94cba15f7a987e719915969a75f6e app/src/ui/clone-repository/group-repositories.ts
-  our    100644 d14189ae128a22845dc39ec28b62ae2e108a42ba app/src/ui/clone-repository/group-repositories.ts
-@@ -11,7 +11,7 @@
-   readonly id: string
-
-   /** The search text. */
--  readonly text: string
-+  readonly text: ReadonlyArray<string>
-
-   /** The name of the repository. */
-   readonly name: string
-@@ -43,7 +43,7 @@
-
-       return {
-         id: repo.html_url,
--        text: `${repo.owner.login}/${repo.name}`,
-+        text: [`${repo.owner.login}/${repo.name}`],
-         url: repo.clone_url,
-         name: repo.name,
-         icon,
-merged
-  result 100644 9f7be035e77bad03025c737279092ba7598a0816 app/src/ui/diff/binary-file.tsx
-  our    100644 81c0dcd6e5fe3e4fd3fec3e5a8dcdff5b3167656 app/src/ui/diff/binary-file.tsx
-@@ -5,6 +5,8 @@
- import { openFile } from '../../lib/open-file'
- import { Dispatcher } from '../../lib/dispatcher/dispatcher'
-
-+import { LinkButton } from '../lib/link-button'
-+
- interface IBinaryFileProps {
-   readonly repository: Repository
-   readonly path: string
-@@ -13,7 +15,7 @@
-
- /** represents the default view for a file that we cannot render a diff for */
- export class BinaryFile extends React.Component<IBinaryFileProps, {}> {
--  private handleClick = (e: React.MouseEvent<HTMLAnchorElement>) => {
-+  private open = () => {
-     const fullPath = Path.join(this.props.repository.path, this.props.path)
-     openFile(fullPath, this.props.dispatcher)
-   }
-@@ -23,9 +25,9 @@
-       <div className="panel binary" id="diff">
-         <div className="image-header">This binary file has changed.</div>
-         <div className="image-header">
--          <a href="#" onClick={this.handleClick}>
-+          <LinkButton onClick={this.open}>
-             Open file in external program.
--          </a>
-+          </LinkButton>
-         </div>
-       </div>
-     )
-merged
-  result 100644 dc40c8309be3d5fb88ce7c549d18e0a218138062 app/src/ui/diff/diff-explorer.ts
-  our    100644 3ee24b252827ef7e376d781a6925ef1d1bf00a40 app/src/ui/diff/diff-explorer.ts
-@@ -1,13 +1,13 @@
--import { DiffLine, DiffHunk, ITextDiff } from '../../models/diff'
-+import { DiffLine, DiffHunk } from '../../models/diff'
-
- /**
-  * Locate the diff hunk for the given (absolute) line number in the diff.
-  */
- export function diffHunkForIndex(
--  diff: ITextDiff,
-+  hunks: ReadonlyArray<DiffHunk>,
-   index: number
- ): DiffHunk | null {
--  const hunk = diff.hunks.find(h => {
-+  const hunk = hunks.find(h => {
-     return index >= h.unifiedDiffStart && index <= h.unifiedDiffEnd
-   })
-   return hunk || null
-@@ -17,10 +17,10 @@
-  * Locate the diff line for the given (absolute) line number in the diff.
-  */
- export function diffLineForIndex(
--  diff: ITextDiff,
-+  hunks: ReadonlyArray<DiffHunk>,
-   index: number
- ): DiffLine | null {
--  const hunk = diffHunkForIndex(diff, index)
-+  const hunk = diffHunkForIndex(hunks, index)
-   if (!hunk) {
-     return null
-   }
-@@ -31,10 +31,10 @@
- /** Get the line number as represented in the diff text itself. */
- export function lineNumberForDiffLine(
-   diffLine: DiffLine,
--  diff: ITextDiff
-+  hunks: ReadonlyArray<DiffHunk>
- ): number {
-   let lineOffset = 0
--  for (const hunk of diff.hunks) {
-+  for (const hunk of hunks) {
-     const index = hunk.lines.indexOf(diffLine)
-     if (index > -1) {
-       return index + lineOffset
-@@ -51,10 +51,10 @@
-  * should be displayed as interactive, as a hunk is not granular enough
-  */
- export function findInteractiveDiffRange(
--  diff: ITextDiff,
-+  hunks: ReadonlyArray<DiffHunk>,
-   index: number
- ): { start: number; end: number } | null {
--  const hunk = diffHunkForIndex(diff, index)
-+  const hunk = diffHunkForIndex(hunks, index)
-   if (!hunk) {
-     return null
-   }
-merged
-  result 100644 fc770e214454b6980005a0f84ae50a9a1ca5d322 app/src/ui/diff/diff-line-gutter.tsx
-  our    100644 352915a1f60aafefce6fe604e3b32b325148ae69 app/src/ui/diff/diff-line-gutter.tsx
-@@ -1,5 +1,5 @@
- import * as React from 'react'
--import { ITextDiff, DiffLine, DiffLineType } from '../../models/diff'
-+import { DiffHunk, DiffLine, DiffLineType } from '../../models/diff'
- import { diffHunkForIndex, findInteractiveDiffRange } from './diff-explorer'
- import { hoverCssClass, selectedLineClass } from './selection/selection'
- import { assertNever } from '../../lib/fatal-error'
-@@ -30,7 +30,7 @@
-   /**
-    * The diff currently displayed in the app
-    */
--  readonly diff: ITextDiff
-+  readonly hunks: ReadonlyArray<DiffHunk>
-
-   /**
-    * Callback to apply hover effect to specific lines in the diff
-@@ -55,7 +55,7 @@
-    */
-   readonly onMouseDown: (
-     index: number,
--    diff: ITextDiff,
-+    hunks: ReadonlyArray<DiffHunk>,
-     isRangeSelection: boolean
-   ) => void
-
-@@ -183,7 +183,7 @@
-
-   private updateHoverState(isRangeSelection: boolean, isActive: boolean) {
-     if (isRangeSelection) {
--      const range = findInteractiveDiffRange(this.props.diff, this.props.index)
-+      const range = findInteractiveDiffRange(this.props.hunks, this.props.index)
-       if (!range) {
-         console.error('unable to find range for given index in diff')
-         return
-@@ -210,7 +210,7 @@
-   private mouseMoveHandler = (ev: MouseEvent) => {
-     ev.preventDefault()
-
--    const hunk = diffHunkForIndex(this.props.diff, this.props.index)
-+    const hunk = diffHunkForIndex(this.props.hunks, this.props.index)
-     if (!hunk) {
-       console.error('unable to find hunk for given line in diff')
-       return
-@@ -219,7 +219,7 @@
-     const isRangeSelection = isMouseCursorNearEdge(ev)
-     const isSelectionActive = this.props.isSelectionEnabled()
-
--    const range = findInteractiveDiffRange(this.props.diff, this.props.index)
-+    const range = findInteractiveDiffRange(this.props.hunks, this.props.index)
-     if (!range) {
-       console.error('unable to find range for given index in diff')
-       return
-@@ -241,7 +241,7 @@
-   private mouseDownHandler = (ev: MouseEvent) => {
-     ev.preventDefault()
-     const isRangeSelection = isMouseCursorNearEdge(ev)
--    this.props.onMouseDown(this.props.index, this.props.diff, isRangeSelection)
-+    this.props.onMouseDown(this.props.index, this.props.hunks, isRangeSelection)
-   }
-
-   private applyEventHandlers = (elem: HTMLSpanElement | null) => {
-merged
-  result 100644 f36e0e4c22d67391c497dcea94021c47fbbc6a61 app/src/ui/diff/diff-syntax-mode.ts
-  our    100644 d4f02e6c2ed4f9295eef2dbf64aba1c0ec9cfc74 app/src/ui/diff/diff-syntax-mode.ts
-@@ -1,4 +1,4 @@
--import { ITextDiff, DiffLine } from '../../models/diff'
-+import { DiffHunk, DiffLine } from '../../models/diff'
- import * as CodeMirror from 'codemirror'
- import { diffLineForIndex } from './diff-explorer'
- import { ITokens } from '../../lib/highlighter/types'
-@@ -9,7 +9,7 @@
-   /**
-    * The unified diff representing the change
-    */
--  readonly diff: ITextDiff
-+  readonly hunks: ReadonlyArray<DiffHunk>
-
-   /**
-    * Tokens returned from the highlighter for the 'before'
-@@ -80,16 +80,16 @@
- export class DiffSyntaxMode {
-   public static readonly ModeName = 'github-diff-syntax'
-
--  private readonly diff?: ITextDiff
-+  private readonly hunks?: ReadonlyArray<DiffHunk>
-   private readonly oldTokens?: ITokens
-   private readonly newTokens?: ITokens
-
-   public constructor(
--    diff?: ITextDiff,
-+    hunks?: ReadonlyArray<DiffHunk>,
-     oldTokens?: ITokens,
-     newTokens?: ITokens
-   ) {
--    this.diff = diff
-+    this.hunks = hunks
-     this.oldTokens = oldTokens
-     this.newTokens = newTokens
-   }
-@@ -125,11 +125,11 @@
-     // This happens when the mode is running without tokens, in this
-     // case there's really nothing more for us to do than what we've
-     // already done above to deal with the diff line marker.
--    if (!this.diff) {
-+    if (this.hunks == null) {
-       return skipLine(stream, state)
-     }
-
--    const diffLine = diffLineForIndex(this.diff, state.diffLineIndex)
-+    const diffLine = diffLineForIndex(this.hunks, state.diffLineIndex)
-
-     if (!diffLine) {
-       return skipLine(stream, state)
-@@ -181,7 +181,7 @@
-   }
-
-   return new DiffSyntaxMode(
--    modeOptions.diff,
-+    modeOptions.hunks,
-     modeOptions.oldTokens,
-     modeOptions.newTokens
-   )
-merged
-  result 100644 7c53bfbb331587afae9c40fa77ad4a1849862f53 app/src/ui/diff/image-diffs/deleted-image-diff.tsx
-  our    100644 100c204b222ee1c211c495cf5774d61af6e9a9f1 app/src/ui/diff/image-diffs/deleted-image-diff.tsx
-@@ -1,7 +1,7 @@
- import * as React from 'react'
-
- import { Image } from '../../../models/diff'
--import { DiffImage } from './diff-image'
-+import { ImageContainer } from './image-container'
-
- interface IDeletedImageDiffProps {
-   readonly previous: Image
-@@ -17,7 +17,7 @@
-       <div className="panel image" id="diff">
-         <div className="image-diff-previous">
-           <div className="image-diff-header">Deleted</div>
--          <DiffImage image={this.props.previous} />
-+          <ImageContainer image={this.props.previous} />
-         </div>
-       </div>
-     )
-removed in remote
-  base   100644 67ff04efa95b3fe39f2e6d791501325575a01dda app/src/ui/diff/image-diffs/diff-image.tsx
-  our    100644 67ff04efa95b3fe39f2e6d791501325575a01dda app/src/ui/diff/image-diffs/diff-image.tsx
-@@ -1,28 +0,0 @@
--import * as React from 'react'
--
--import { Image } from '../../../models/diff'
--
--interface IImageProps {
--  readonly image: Image
--
--  readonly style?: React.CSSProperties
--
--  readonly onElementLoad?: (img: HTMLImageElement) => void
--}
--
--export class DiffImage extends React.Component<IImageProps, {}> {
--  public render() {
--    const image = this.props.image
--    const imageSource = `data:${image.mediaType};base64,${image.contents}`
--
--    return (
--      <img src={imageSource} style={this.props.style} onLoad={this.onLoad} />
--    )
--  }
--
--  private onLoad = (e: React.SyntheticEvent<HTMLImageElement>) => {
--    if (this.props.onElementLoad) {
--      this.props.onElementLoad(e.currentTarget)
--    }
--  }
--}
-merged
-  result 100644 a5bf0078cc777a1299e2fd0a994ea22e7f4e2ee4 app/src/ui/diff/image-diffs/difference-blend.tsx
-  our    100644 a2e1e7a2bd40cd3103502b06e735ac8d0e05be7a app/src/ui/diff/image-diffs/difference-blend.tsx
-@@ -1,5 +1,5 @@
- import * as React from 'react'
--import { DiffImage } from './diff-image'
-+import { ImageContainer } from './image-container'
- import { ICommonImageDiffProperties } from './modified-image-diff'
-
- export class DifferenceBlend extends React.Component<
-@@ -22,7 +22,7 @@
-         <div className="sizing-container">
-           <div className="image-container" style={style}>
-             <div className="image-diff-previous">
--              <DiffImage
-+              <ImageContainer
-                 image={this.props.previous}
-                 onElementLoad={this.props.onPreviousImageLoad}
-                 style={maxSize}
-@@ -30,7 +30,7 @@
-             </div>
-
-             <div className="image-diff-current">
--              <DiffImage
-+              <ImageContainer
-                 image={this.props.current}
-                 onElementLoad={this.props.onCurrentImageLoad}
-                 style={{
-added in remote
-  their  100644 f386dd026ea4d48ee9269f19f2a14971ff443bcd app/src/ui/diff/image-diffs/image-container.tsx
-@@ -0,0 +1,31 @@
-+import * as React from 'react'
-+
-+import { Image } from '../../../models/diff'
-+
-+interface IImageProps {
-+  /** The image contents to render */
-+  readonly image: Image
-+
-+  /** Optional styles to apply to the image container */
-+  readonly style?: React.CSSProperties
-+
-+  /** callback to fire after the image has been loaded */
-+  readonly onElementLoad?: (img: HTMLImageElement) => void
-+}
-+
-+export class ImageContainer extends React.Component<IImageProps, {}> {
-+  public render() {
-+    const image = this.props.image
-+    const imageSource = `data:${image.mediaType};base64,${image.contents}`
-+
-+    return (
-+      <img src={imageSource} style={this.props.style} onLoad={this.onLoad} />
-+    )
-+  }
-+
-+  private onLoad = (e: React.SyntheticEvent<HTMLImageElement>) => {
-+    if (this.props.onElementLoad) {
-+      this.props.onElementLoad(e.currentTarget)
-+    }
-+  }
-+}
-merged
-  result 100644 72df75e401ac62f8a6dd1db8febe5c703e2719f4 app/src/ui/diff/image-diffs/new-image-diff.tsx
-  our    100644 2f089e3cea9dc0357a79e44e705e11b5f56ff5b3 app/src/ui/diff/image-diffs/new-image-diff.tsx
-@@ -1,7 +1,7 @@
- import * as React from 'react'
-
- import { Image } from '../../../models/diff'
--import { DiffImage } from './diff-image'
-+import { ImageContainer } from './image-container'
-
- interface INewImageDiffProps {
-   readonly current: Image
-@@ -14,7 +14,7 @@
-       <div className="panel image" id="diff">
-         <div className="image-diff-current">
-           <div className="image-diff-header">Added</div>
--          <DiffImage image={this.props.current} />
-+          <ImageContainer image={this.props.current} />
-         </div>
-       </div>
-     )
-merged
-  result 100644 4e23bc6c3f0c1317cb751c3767325753b2e108ba app/src/ui/diff/image-diffs/onion-skin.tsx
-  our    100644 fd55c2e19b5edb2849cf28c270f109f2c5e29b6a app/src/ui/diff/image-diffs/onion-skin.tsx
-@@ -1,6 +1,6 @@
- import * as React from 'react'
- import { ICommonImageDiffProperties } from './modified-image-diff'
--import { DiffImage } from './diff-image'
-+import { ImageContainer } from './image-container'
-
- interface IOnionSkinState {
-   readonly crossfade: number
-@@ -32,7 +32,7 @@
-         <div className="sizing-container" ref={this.props.onContainerRef}>
-           <div className="image-container" style={style}>
-             <div className="image-diff-previous" style={style}>
--              <DiffImage
-+              <ImageContainer
-                 image={this.props.previous}
-                 onElementLoad={this.props.onPreviousImageLoad}
-                 style={maxSize}
-@@ -46,7 +46,7 @@
-                 opacity: this.state.crossfade,
-               }}
-             >
--              <DiffImage
-+              <ImageContainer
-                 image={this.props.current}
-                 onElementLoad={this.props.onCurrentImageLoad}
-                 style={maxSize}
-merged
-  result 100644 15f3635eca7dc317535634f3b6a2425108039574 app/src/ui/diff/image-diffs/swipe.tsx
-  our    100644 3521bfb7f464e480630b10b9f2a49b947501b436 app/src/ui/diff/image-diffs/swipe.tsx
-@@ -1,6 +1,6 @@
- import * as React from 'react'
- import { ICommonImageDiffProperties } from './modified-image-diff'
--import { DiffImage } from './diff-image'
-+import { ImageContainer } from './image-container'
-
- /** How much bigger the slider should be than the images. */
- const SliderOverflow = 14
-@@ -35,7 +35,7 @@
-         <div className="sizing-container" ref={this.props.onContainerRef}>
-           <div className="image-container" style={style}>
-             <div className="image-diff-current" style={style}>
--              <DiffImage
-+              <ImageContainer
-                 image={this.props.current}
-                 onElementLoad={this.props.onCurrentImageLoad}
-                 style={maxSize}
-@@ -49,7 +49,7 @@
-               }}
-             >
-               <div className="image-diff-previous" style={style}>
--                <DiffImage
-+                <ImageContainer
-                   image={this.props.previous}
-                   onElementLoad={this.props.onPreviousImageLoad}
-                   style={maxSize}
-merged
-  result 100644 8120d22a6487dd73d1da4fa2b4bb7515593c24cb app/src/ui/diff/image-diffs/two-up.tsx
-  our    100644 b7ddc388ed938aabd72200af704a3aefccdf7ba6 app/src/ui/diff/image-diffs/two-up.tsx
-@@ -1,7 +1,9 @@
- import * as React from 'react'
--import { DiffImage } from './diff-image'
-+import { ImageContainer } from './image-container'
- import { ICommonImageDiffProperties } from './modified-image-diff'
- import { ISize } from './sizing'
-+import { formatBytes, Sign } from '../../lib/bytes'
-+import * as classNames from 'classnames'
-
- /**
-  * The height of the Deleted/Added labels at the top and the image dimension
-@@ -27,40 +29,69 @@
-       ),
-       maxHeight: this.props.maxSize.height - ControlsHeight,
-     }
-+    const percentDiff = (previous: number, current: number) => {
-+      const diff = Math.round((100 * (current - previous)) / previous)
-+      const sign = diff > 0 ? '+' : ''
-+      return sign + diff + '%'
-+    }
-
-     const zeroSize = { width: 0, height: 0 }
-     const previousImageSize = this.props.previousImageSize || zeroSize
-     const currentImageSize = this.props.currentImageSize || zeroSize
-+    const diffPercent = percentDiff(
-+      this.props.previous.bytes,
-+      this.props.current.bytes
-+    )
-+    const diffBytes = this.props.current.bytes - this.props.previous.bytes
-
-     return (
--      <div className="image-diff-two-up" ref={this.props.onContainerRef}>
--        <div className="image-diff-previous">
--          <div className="image-diff-header">Deleted</div>
--          <DiffImage
--            image={this.props.previous}
--            onElementLoad={this.props.onPreviousImageLoad}
--            style={style}
--          />
-+      <div className="image-diff-container" ref={this.props.onContainerRef}>
-+        <div className="image-diff-two-up">
-+          <div className="image-diff-previous">
-+            <div className="image-diff-header">Deleted</div>
-+            <ImageContainer
-+              image={this.props.previous}
-+              onElementLoad={this.props.onPreviousImageLoad}
-+              style={style}
-+            />
-
--          <div className="image-diff-footer">
--            <span className="strong">W:</span> {previousImageSize.width}px |{' '}
--            <span className="strong">H:</span> {previousImageSize.height}px
-+            <div className="image-diff-footer">
-+              <span className="strong">W:</span> {previousImageSize.width}px |{' '}
-+              <span className="strong">H:</span> {previousImageSize.height}px |{' '}
-+              <span className="strong">Size:</span>{' '}
-+              {formatBytes(this.props.previous.bytes)}
-+            </div>
-           </div>
--        </div>
-
--        <div className="image-diff-current">
--          <div className="image-diff-header">Added</div>
--          <DiffImage
--            image={this.props.current}
--            onElementLoad={this.props.onCurrentImageLoad}
--            style={style}
--          />
-+          <div className="image-diff-current">
-+            <div className="image-diff-header">Added</div>
-+            <ImageContainer
-+              image={this.props.current}
-+              onElementLoad={this.props.onCurrentImageLoad}
-+              style={style}
-+            />
-
--          <div className="image-diff-footer">
--            <span className="strong">W:</span> {currentImageSize.width}px |{' '}
--            <span className="strong">H:</span> {currentImageSize.height}px
-+            <div className="image-diff-footer">
-+              <span className="strong">W:</span> {currentImageSize.width}px |{' '}
-+              <span className="strong">H:</span> {currentImageSize.height}px |{' '}
-+              <span className="strong">Size:</span>{' '}
-+              {formatBytes(this.props.current.bytes)}
-+            </div>
-           </div>
-         </div>
-+        <div className="image-diff-summary">
-+          Diff:{' '}
-+          <span
-+            className={classNames({
-+              added: diffBytes > 0,
-+              removed: diffBytes < 0,
-+            })}
-+          >
-+            {diffBytes !== 0
-+              ? `${formatBytes(diffBytes, Sign.Forced)} (${diffPercent})`
-+              : 'No size difference'}
-+          </span>
-+        </div>
-       </div>
-     )
-   }
-merged
-  result 100644 8695c640dc0a5184c74a112f131a2e2a07ef572d app/src/ui/diff/index.tsx
-  our    100644 4c035cd8232f41eb5911c3407db12ac26112844d app/src/ui/diff/index.tsx
-@@ -1,22 +1,12 @@
--import { clipboard } from 'electron'
- import * as React from 'react'
--import * as ReactDOM from 'react-dom'
--import * as Path from 'path'
--import { Disposable } from 'event-kit'
-+import { Editor } from 'codemirror'
-
- import { assertNever } from '../../lib/fatal-error'
--import {
--  NewImageDiff,
--  ModifiedImageDiff,
--  DeletedImageDiff,
--} from './image-diffs'
--import { BinaryFile } from './binary-file'
--
--import { Editor } from 'codemirror'
--import { CodeMirrorHost } from './code-mirror-host'
--import { Repository } from '../../models/repository'
- import { encodePathAsUrl } from '../../lib/path'
- import { ImageDiffType } from '../../lib/app-state'
-+import { Dispatcher } from '../../lib/dispatcher/dispatcher'
-+
-+import { Repository } from '../../models/repository'
- import {
-   CommittedFileChange,
-   WorkingDirectoryFileChange,
-@@ -28,257 +18,29 @@
-   IDiff,
-   IImageDiff,
-   ITextDiff,
--  DiffLine,
--  DiffLineType,
-   ILargeTextDiff,
- } from '../../models/diff'
--import { Dispatcher } from '../../lib/dispatcher/dispatcher'
--
--import {
--  diffLineForIndex,
--  diffHunkForIndex,
--  findInteractiveDiffRange,
--  lineNumberForDiffLine,
--} from './diff-explorer'
--import { DiffLineGutter } from './diff-line-gutter'
--import { IEditorConfigurationExtra } from './editor-configuration-extra'
--import { ISelectionStrategy } from './selection/selection-strategy'
--import { DragDropSelection } from './selection/drag-drop-selection-strategy'
--import { RangeSelection } from './selection/range-selection-strategy'
--import { Octicon, OcticonSymbol } from '../octicons'
--
--import { fatalError } from '../../lib/fatal-error'
-
--import { RangeSelectionSizePixels } from './edge-detection'
--import { relativeChanges } from './changed-range'
--import { getPartialBlobContents } from '../../lib/git/show'
--import { readPartialFile } from '../../lib/file-system'
--
--import { DiffSyntaxMode, IDiffSyntaxModeSpec } from './diff-syntax-mode'
--import { highlight } from '../../lib/highlighter/worker'
--import { ITokens } from '../../lib/highlighter/types'
- import { Button } from '../lib/button'
-
--/** The longest line for which we'd try to calculate a line diff. */
--const MaxIntraLineDiffStringLength = 4096
--
--/** The maximum number of bytes we'll process for highlighting. */
--const MaxHighlightContentLength = 256 * 1024
-+import {
-+  NewImageDiff,
-+  ModifiedImageDiff,
-+  DeletedImageDiff,
-+} from './image-diffs'
-+import { BinaryFile } from './binary-file'
-+import { diffLineForIndex } from './diff-explorer'
-+import { DiffLineGutter } from './diff-line-gutter'
-+import { DiffSyntaxMode } from './diff-syntax-mode'
-
--// This is a custom version of the no-newline octicon that's exactly as
--// tall as it needs to be (8px) which helps with aligning it on the line.
--const narrowNoNewlineSymbol = new OcticonSymbol(
--  16,
--  8,
--  'm 16,1 0,3 c 0,0.55 -0.45,1 -1,1 l -3,0 0,2 -3,-3 3,-3 0,2 2,0 0,-2 2,0 z M 8,4 C 8,6.2 6.2,8 4,8 1.8,8 0,6.2 0,4 0,1.8 1.8,0 4,0 6.2,0 8,1.8 8,4 Z M 1.5,5.66 5.66,1.5 C 5.18,1.19 4.61,1 4,1 2.34,1 1,2.34 1,4 1,4.61 1.19,5.17 1.5,5.66 Z M 7,4 C 7,3.39 6.81,2.83 6.5,2.34 L 2.34,6.5 C 2.82,6.81 3.39,7 4,7 5.66,7 7,5.66 7,4 Z'
--)
-+import { ISelectionStrategy } from './selection/selection-strategy'
-+import { TextDiff } from './text-diff'
-
- // image used when no diff is displayed
- const NoDiffImage = encodePathAsUrl(__dirname, 'static/ufo-alert.svg')
-
- type ChangedFile = WorkingDirectoryFileChange | CommittedFileChange
-
--interface ILineFilters {
--  readonly oldLineFilter: Array<number>
--  readonly newLineFilter: Array<number>
--}
--
--interface IFileContents {
--  readonly file: ChangedFile
--  readonly oldContents: Buffer
--  readonly newContents: Buffer
--}
--
--interface IFileTokens {
--  readonly oldTokens: ITokens
--  readonly newTokens: ITokens
--}
--
--async function getOldFileContent(
--  repository: Repository,
--  file: ChangedFile
--): Promise<Buffer> {
--  if (file.status === AppFileStatus.New) {
--    return new Buffer(0)
--  }
--
--  let commitish
--
--  if (file instanceof WorkingDirectoryFileChange) {
--    // If we pass an empty string here we get the contents
--    // that are in the index. But since we call diff with
--    // --no-index (see diff.ts) we need to look at what's
--    // actually committed to get the appropriate content.
--    commitish = 'HEAD'
--  } else if (file instanceof CommittedFileChange) {
--    commitish = `${file.commitish}^`
--  } else {
--    return assertNever(file, 'Unknown file change type')
--  }
--
--  return getPartialBlobContents(
--    repository,
--    commitish,
--    file.oldPath || file.path,
--    MaxHighlightContentLength
--  )
--}
--
--async function getNewFileContent(
--  repository: Repository,
--  file: ChangedFile
--): Promise<Buffer> {
--  if (file.status === AppFileStatus.Deleted) {
--    return new Buffer(0)
--  }
--
--  if (file instanceof WorkingDirectoryFileChange) {
--    return readPartialFile(
--      Path.join(repository.path, file.path),
--      0,
--      MaxHighlightContentLength - 1
--    )
--  } else if (file instanceof CommittedFileChange) {
--    return getPartialBlobContents(
--      repository,
--      file.commitish,
--      file.path,
--      MaxHighlightContentLength
--    )
--  }
--
--  return assertNever(file, 'Unknown file change type')
--}
--
--async function getFileContents(
--  repo: Repository,
--  file: ChangedFile,
--  lineFilters: ILineFilters
--): Promise<IFileContents> {
--  const oldContentsPromise = lineFilters.oldLineFilter.length
--    ? getOldFileContent(repo, file)
--    : Promise.resolve(new Buffer(0))
--
--  const newContentsPromise = lineFilters.newLineFilter.length
--    ? getNewFileContent(repo, file)
--    : Promise.resolve(new Buffer(0))
--
--  const [oldContents, newContents] = await Promise.all([
--    oldContentsPromise.catch(e => {
--      log.error('Could not load old contents for syntax highlighting', e)
--      return new Buffer(0)
--    }),
--    newContentsPromise.catch(e => {
--      log.error('Could not load new contents for syntax highlighting', e)
--      return new Buffer(0)
--    }),
--  ])
--
--  return { file, oldContents, newContents }
--}
--
--/**
-- * Figure out which lines we need to have tokenized in
-- * both the old and new version of the file.
-- */
--function getLineFilters(diff: ITextDiff): ILineFilters {
--  const oldLineFilter = new Array<number>()
--  const newLineFilter = new Array<number>()
--
--  const diffLines = new Array<DiffLine>()
--
--  let anyAdded = false
--  let anyDeleted = false
--
--  for (const hunk of diff.hunks) {
--    for (const line of hunk.lines) {
--      anyAdded = anyAdded || line.type === DiffLineType.Add
--      anyDeleted = anyDeleted || line.type === DiffLineType.Delete
--      diffLines.push(line)
--    }
--  }
--
--  for (const line of diffLines) {
--    // So this might need a little explaining. What we're trying
--    // to achieve here is if the diff contains only additions or
--    // only deletions we'll source all the highlighted lines from
--    // either the before or after file. That way we can completely
--    // disregard loading, and highlighting, the other version.
--    if (line.oldLineNumber !== null && line.newLineNumber !== null) {
--      if (anyAdded && !anyDeleted) {
--        newLineFilter.push(line.newLineNumber - 1)
--      } else {
--        oldLineFilter.push(line.oldLineNumber - 1)
--      }
--    } else {
--      // If there's a mix (meaning we'll have to read from both
--      // anyway) we'll prioritize the old version since
--      // that's immutable and less likely to be the subject of a
--      // race condition when someone rapidly modifies the file on
--      // disk.
--      if (line.oldLineNumber !== null) {
--        oldLineFilter.push(line.oldLineNumber - 1)
--      } else if (line.newLineNumber !== null) {
--        newLineFilter.push(line.newLineNumber - 1)
--      }
--    }
--  }
--
--  return { oldLineFilter, newLineFilter }
--}
--
--async function highlightContents(
--  contents: IFileContents,
--  tabSize: number,
--  lineFilters: ILineFilters
--): Promise<IFileTokens> {
--  const { file, oldContents, newContents } = contents
--
--  const [oldTokens, newTokens] = await Promise.all([
--    highlight(
--      oldContents.toString('utf8'),
--      Path.extname(file.oldPath || file.path),
--      tabSize,
--      lineFilters.oldLineFilter
--    ).catch(e => {
--      log.error('Highlighter worked failed for old contents', e)
--      return {}
--    }),
--    highlight(
--      newContents.toString('utf8'),
--      Path.extname(file.path),
--      tabSize,
--      lineFilters.newLineFilter
--    ).catch(e => {
--      log.error('Highlighter worked failed for new contents', e)
--      return {}
--    }),
--  ])
--
--  return { oldTokens, newTokens }
--}
--
--/**
-- * Checks to see if any key parameters in the props object that are used
-- * when performing highlighting has changed. This is used to determine
-- * whether highlighting should abort in between asynchronous operations
-- * due to some factor (like which file is currently selected) have changed
-- * and thus rendering the in-flight highlighting data useless.
-- */
--function highlightParametersEqual(newProps: IDiffProps, prevProps: IDiffProps) {
--  if (newProps === prevProps) {
--    return true
--  }
--
--  return (
--    newProps.file.path === prevProps.file.path &&
--    newProps.file.oldPath === prevProps.file.oldPath &&
--    newProps.diff.kind === DiffType.Text &&
--    prevProps.diff.kind === DiffType.Text &&
--    newProps.diff.text === prevProps.diff.text
--  )
--}
--
- /** The props for the Diff component. */
- interface IDiffProps {
-   readonly repository: Repository
-@@ -313,21 +75,6 @@
- /** A component which renders a diff for a file. */
- export class Diff extends React.Component<IDiffProps, IDiffState> {
-   private codeMirror: Editor | null = null
--  private gutterWidth: number | null = null
--
--  /**
--   * We store the scroll position before reloading the same diff so that we can
--   * restore it when we're done. If we're not reloading the same diff, this'll
--   * be null.
--   */
--  private scrollPositionToRestore: { left: number; top: number } | null = null
--
--  /**
--   * A mapping from CodeMirror line handles to disposables which, when disposed
--   * cleans up any line gutter components and events associated with that line.
--   * See renderLine for more information.
--   */
--  private readonly lineCleanup = new Map<any, Disposable>()
-
-   /**
-    * Maintain the current state of the user interacting with the diff gutter
-@@ -348,27 +95,7 @@
-   }
-
-   public componentWillReceiveProps(nextProps: IDiffProps) {
--    // If we're reloading the same file, we want to save the current scroll
--    // position and restore it after the diff's been updated.
--    const sameFile =
--      nextProps.file &&
--      this.props.file &&
--      nextProps.file.id === this.props.file.id
--
--    // Happy path, if the text hasn't changed we won't re-render
--    // and subsequently won't have to restore the scroll position.
--    const textHasChanged = nextProps.diff !== this.props.diff
--
-     const codeMirror = this.codeMirror
--    if (codeMirror && sameFile && textHasChanged) {
--      const scrollInfo = codeMirror.getScrollInfo()
--      this.scrollPositionToRestore = {
--        left: scrollInfo.left,
--        top: scrollInfo.top,
--      }
--    } else {
--      this.scrollPositionToRestore = null
--    }
-
-     if (
-       codeMirror &&
-@@ -394,8 +121,6 @@
-         return
-       }
-
--      this.gutterWidth = null
--
-       const diff = nextProps.diff
-       this.cachedGutterElements.forEach((element, index) => {
-         if (!element) {
-@@ -404,7 +129,7 @@
-         }
-
-         if (diff.kind === DiffType.Text) {
--          const line = diffLineForIndex(diff, index)
-+          const line = diffLineForIndex(diff.hunks, index)
-           const isIncludable = line ? line.isIncludeableLine() : false
-           const isSelected = selection.isSelected(index) && isIncludable
-           element.setSelected(isSelected)
-@@ -413,179 +138,26 @@
-     }
-   }
-
--  public componentWillUnmount() {
--    this.dispose()
--  }
--
--  public componentDidUpdate(prevProps: IDiffProps) {
--    const diff = this.props.diff
--    if (diff === prevProps.diff) {
--      return
--    }
--
--    if (
--      prevProps.diff.kind === DiffType.Text &&
--      diff.kind === DiffType.Text &&
--      diff.text === prevProps.diff.text
--    ) {
--      return
--    }
--
--    if (diff.kind === DiffType.Text && this.codeMirror) {
--      this.codeMirror.setOption('mode', { name: DiffSyntaxMode.ModeName })
--    }
--
--    this.initDiffSyntaxMode()
--  }
--
--  public componentDidMount() {
--    if (this.props.diff.kind === DiffType.Text) {
--      this.initDiffSyntaxMode()
--    }
--  }
--
-   public render() {
--    return this.renderDiff(this.props.diff)
--  }
--
--  public async initDiffSyntaxMode() {
--    const cm = this.codeMirror
--    const file = this.props.file
-     const diff = this.props.diff
--    const repo = this.props.repository
--
--    if (!cm || diff.kind !== DiffType.Text) {
--      return
--    }
--
--    // Store the current props to that we can see if anything
--    // changes from underneath us as we're making asynchronous
--    // operations that makes our data stale or useless.
--    const propsSnapshot = this.props
--
--    const lineFilters = getLineFilters(diff)
--    const contents = await getFileContents(repo, file, lineFilters)
--
--    if (!highlightParametersEqual(this.props, propsSnapshot)) {
--      return
--    }
--
--    const tsOpt = cm.getOption('tabSize')
--    const tabSize = typeof tsOpt === 'number' ? tsOpt : 4
--
--    const tokens = await highlightContents(contents, tabSize, lineFilters)
--
--    if (!highlightParametersEqual(this.props, propsSnapshot)) {
--      return
--    }
-
--    const spec: IDiffSyntaxModeSpec = {
--      name: DiffSyntaxMode.ModeName,
--      diff,
--      oldTokens: tokens.oldTokens,
--      newTokens: tokens.newTokens,
--    }
--
--    cm.setOption('mode', spec)
--  }
--
--  private dispose() {
--    this.codeMirror = null
--
--    this.lineCleanup.forEach(disposable => disposable.dispose())
--    this.lineCleanup.clear()
--
--    document.removeEventListener('mouseup', this.onDocumentMouseUp)
--  }
--
--  /**
--   * compute the diff gutter width based on what's been rendered in the browser
--   */
--  private getAndCacheGutterWidth = (): number | null => {
--    if (this.gutterWidth) {
--      return this.gutterWidth
--    }
--
--    if (this.codeMirror) {
--      // as getWidth will return 0 for elements that are offscreen, this code
--      // will look for the first row of the current viewport, which should be
--      // onscreen
--      const viewport = this.codeMirror.getScrollInfo()
--      const top = viewport.top
--
--      const row = this.codeMirror.lineAtHeight(top, 'local')
--      const element = this.cachedGutterElements.get(row)
--
--      if (!element) {
--        console.error(
--          `unable to find element at ${row}, should probably look into that`
--        )
--        return null
--      }
--
--      this.gutterWidth = element.getWidth()
--
--      if (this.gutterWidth === 0) {
--        console.error(
--          `element at row ${row} does not have a width, should probably look into that`
--        )
--      }
--    }
--
--    return this.gutterWidth
--  }
--
--  private updateRangeHoverState = (
--    start: number,
--    end: number,
--    show: boolean
--  ) => {
--    for (let i = start; i <= end; i++) {
--      this.hoverLine(i, show)
--    }
--  }
--
--  private hoverLine = (row: number, include: boolean) => {
--    const element = this.cachedGutterElements.get(row)
--
--    // element may not be drawn by the editor, so updating it isn't necessary
--    if (element) {
--      element.setHover(include)
--    }
--  }
--
--  /**
--   * start a selection gesture based on the current interation
--   */
--  private startSelection = (
--    file: WorkingDirectoryFileChange,
--    diff: ITextDiff,
--    index: number,
--    isRangeSelection: boolean
--  ) => {
--    const snapshot = file.selection
--    const selected = snapshot.isSelected(index)
--    const desiredSelection = !selected
--
--    if (isRangeSelection) {
--      const range = findInteractiveDiffRange(diff, index)
--      if (!range) {
--        console.error('unable to find range for given line in diff')
--        return
-+    switch (diff.kind) {
-+      case DiffType.Text:
-+        return this.renderText(diff)
-+      case DiffType.Binary:
-+        return this.renderBinaryFile()
-+      case DiffType.Image:
-+        return this.renderImage(diff)
-+      case DiffType.LargeText: {
-+        return this.state.forceShowLargeDiff
-+          ? this.renderLargeText(diff)
-+          : this.renderLargeTextDiff()
-       }
--
--      this.selection = new RangeSelection(
--        range.start,
--        range.end,
--        desiredSelection,
--        snapshot
--      )
--    } else {
--      this.selection = new DragDropSelection(index, desiredSelection, snapshot)
-+      case DiffType.Unrenderable:
-+        return this.renderUnrenderableDiff()
-+      default:
-+        return assertNever(diff, `Unsupported diff type: ${diff}`)
-     }
--
--    this.selection.paint(this.cachedGutterElements)
--    document.addEventListener('mouseup', this.onDocumentMouseUp)
-   }
-
-   /**
-@@ -618,332 +190,6 @@
-     this.selection = null
-   }
-
--  private onGutterMouseDown = (
--    index: number,
--    diff: ITextDiff,
--    isRangeSelection: boolean
--  ) => {
--    if (!(this.props.file instanceof WorkingDirectoryFileChange)) {
--      fatalError(
--        'must not start selection when selected file is not a WorkingDirectoryFileChange'
--      )
--      return
--    }
--
--    if (isRangeSelection) {
--      const hunk = diffHunkForIndex(diff, index)
--      if (!hunk) {
--        console.error('unable to find hunk for given line in diff')
--      }
--    }
--    this.startSelection(this.props.file, diff, index, isRangeSelection)
--  }
--
--  private onGutterMouseMove = (index: number) => {
--    if (!this.selection) {
--      return
--    }
--
--    this.selection.update(index)
--    this.selection.paint(this.cachedGutterElements)
--  }
--
--  private onDiffTextMouseMove = (
--    ev: MouseEvent,
--    diff: ITextDiff,
--    index: number
--  ) => {
--    const isActive = this.isMouseCursorNearGutter(ev)
--    if (isActive === null) {
--      return
--    }
--
--    const diffLine = diffLineForIndex(diff, index)
--    if (!diffLine) {
--      return
--    }
--
--    if (!diffLine.isIncludeableLine()) {
--      return
--    }
--
--    const range = findInteractiveDiffRange(diff, index)
--    if (!range) {
--      console.error('unable to find range for given index in diff')
--      return
--    }
--
--    this.updateRangeHoverState(range.start, range.end, isActive)
--  }
--
--  private onDiffTextMouseDown = (
--    ev: MouseEvent,
--    diff: ITextDiff,
--    index: number
--  ) => {
--    const isActive = this.isMouseCursorNearGutter(ev)
--
--    if (isActive) {
--      // this line is important because it prevents the codemirror editor
--      // from handling the event and resetting the scroll position.
--      // it doesn't do this when you click on elements in the gutter,
--      // which is an amazing joke to have placed upon me right now
--      ev.preventDefault()
--
--      if (!(this.props.file instanceof WorkingDirectoryFileChange)) {
--        fatalError(
--          'must not start selection when selected file is not a WorkingDirectoryFileChange'
--        )
--        return
--      }
--
--      this.startSelection(this.props.file, diff, index, true)
--    }
--  }
--
--  private onDiffTextMouseLeave = (
--    ev: MouseEvent,
--    diff: ITextDiff,
--    index: number
--  ) => {
--    const range = findInteractiveDiffRange(diff, index)
--    if (!range) {
--      console.error('unable to find range for given index in diff')
--      return
--    }
--
--    this.updateRangeHoverState(range.start, range.end, false)
--  }
--
--  private isMouseCursorNearGutter = (ev: MouseEvent): boolean | null => {
--    const width = this.getAndCacheGutterWidth()
--
--    if (!width) {
--      // should fail earlier than this with a helpful error message
--      return null
--    }
--
--    const deltaX = ev.layerX - width
--    return deltaX >= 0 && deltaX <= RangeSelectionSizePixels
--  }
--
--  private renderLine = (instance: any, line: any, element: HTMLElement) => {
--    const existingLineDisposable = this.lineCleanup.get(line)
--
--    // If we can find the line in our cleanup list that means the line is
--    // being re-rendered. Agains, CodeMirror doesn't fire the 'delete' event
--    // when this happens.
--    if (existingLineDisposable) {
--      existingLineDisposable.dispose()
--      this.lineCleanup.delete(line)
--    }
--
--    const diff = this.props.diff
--    if (diff.kind !== DiffType.Text) {
--      return
--    }
--
--    const index = instance.getLineNumber(line) as number
--
--    const diffLine = diffLineForIndex(diff, index)
--    if (diffLine) {
--      const diffLineElement = element.children[0] as HTMLSpanElement
--
--      let noNewlineReactContainer: HTMLSpanElement | null = null
--
--      if (diffLine.noTrailingNewLine) {
--        noNewlineReactContainer = document.createElement('span')
--        noNewlineReactContainer.setAttribute(
--          'title',
--          'No newline at end of file'
--        )
--        ReactDOM.render(
--          <Octicon symbol={narrowNoNewlineSymbol} className="no-newline" />,
--          noNewlineReactContainer
--        )
--        diffLineElement.appendChild(noNewlineReactContainer)
--      }
--
--      const gutterReactContainer = document.createElement('span')
--
--      let isIncluded = false
--      if (this.props.file instanceof WorkingDirectoryFileChange) {
--        isIncluded = this.props.file.selection.isSelected(index)
--      }
--
--      const cache = this.cachedGutterElements
--
--      ReactDOM.render(
--        <DiffLineGutter
--          line={diffLine}
--          isIncluded={isIncluded}
--          index={index}
--          readOnly={this.props.readOnly}
--          diff={diff}
--          updateRangeHoverState={this.updateRangeHoverState}
--          isSelectionEnabled={this.isSelectionEnabled}
--          onMouseDown={this.onGutterMouseDown}
--          onMouseMove={this.onGutterMouseMove}
--        />,
--        gutterReactContainer,
--        function(this: DiffLineGutter) {
--          if (this !== undefined) {
--            cache.set(index, this)
--          }
--        }
--      )
--
--      const onMouseMoveLine: (ev: MouseEvent) => void = ev => {
--        this.onDiffTextMouseMove(ev, diff, index)
--      }
--
--      const onMouseDownLine: (ev: MouseEvent) => void = ev => {
--        this.onDiffTextMouseDown(ev, diff, index)
--      }
--
--      const onMouseLeaveLine: (ev: MouseEvent) => void = ev => {
--        this.onDiffTextMouseLeave(ev, diff, index)
--      }
--
--      if (!this.props.readOnly) {
--        diffLineElement.addEventListener('mousemove', onMouseMoveLine)
--        diffLineElement.addEventListener('mousedown', onMouseDownLine)
--        diffLineElement.addEventListener('mouseleave', onMouseLeaveLine)
--      }
--
--      element.insertBefore(gutterReactContainer, diffLineElement)
--
--      // Hack(ish?). In order to be a real good citizen we need to unsubscribe from
--      // the line delete event once we've been called once or the component has been
--      // unmounted. In the latter case it's _probably_ not strictly necessary since
--      // the only thing gc rooted by the event should be isolated and eligble for
--      // collection. But let's be extra cautious I guess.
--      //
--      // The only way to unsubscribe is to pass the exact same function given to the
--      // 'on' function to the 'off' so we need a reference to ourselves, basically.
--      let deleteHandler: () => void // eslint-disable-line prefer-const
--
--      // Since we manually render a react component we have to take care of unmounting
--      // it or else we'll leak memory. This disposable will unmount the component.
--      //
--      // See https://facebook.github.io/react/blog/2015/10/01/react-render-and-top-level-api.html
--      const gutterCleanup = new Disposable(() => {
--        this.cachedGutterElements.delete(index)
--
--        ReactDOM.unmountComponentAtNode(gutterReactContainer)
--
--        if (noNewlineReactContainer) {
--          ReactDOM.unmountComponentAtNode(noNewlineReactContainer)
--        }
--
--        if (!this.props.readOnly) {
--          diffLineElement.removeEventListener('mousemove', onMouseMoveLine)
--          diffLineElement.removeEventListener('mousedown', onMouseDownLine)
--          diffLineElement.removeEventListener('mouseleave', onMouseLeaveLine)
--        }
--
--        line.off('delete', deleteHandler)
--      })
--
--      // Add the cleanup disposable to our list of disposables so that we clean up when
--      // this component is unmounted or when the line is re-rendered. When either of that
--      // happens the line 'delete' event doesn't  fire.
--      this.lineCleanup.set(line, gutterCleanup)
--
--      // If the line delete event fires we dispose of the disposable (disposing is
--      // idempotent)
--      deleteHandler = () => {
--        const disp = this.lineCleanup.get(line)
--        if (disp) {
--          this.lineCleanup.delete(line)
--          disp.dispose()
--        }
--      }
--      line.on('delete', deleteHandler)
--    }
--  }
--
--  private isSelectionEnabled = () => {
--    return this.selection == null
--  }
--
--  private restoreScrollPosition(cm: Editor) {
--    const scrollPosition = this.scrollPositionToRestore
--    if (cm && scrollPosition) {
--      cm.scrollTo(scrollPosition.left, scrollPosition.top)
--    }
--  }
--
--  private markIntraLineChanges(codeMirror: Editor, diff: ITextDiff) {
--    for (const hunk of diff.hunks) {
--      const additions = hunk.lines.filter(l => l.type === DiffLineType.Add)
--      const deletions = hunk.lines.filter(l => l.type === DiffLineType.Delete)
--      if (additions.length !== deletions.length) {
--        continue
--      }
--
--      for (let i = 0; i < additions.length; i++) {
--        const addLine = additions[i]
--        const deleteLine = deletions[i]
--        if (
--          addLine.text.length > MaxIntraLineDiffStringLength ||
--          deleteLine.text.length > MaxIntraLineDiffStringLength
--        ) {
--          continue
--        }
--
--        const changeRanges = relativeChanges(
--          addLine.content,
--          deleteLine.content
--        )
--        const addRange = changeRanges.stringARange
--        if (addRange.length > 0) {
--          const addLineNumber = lineNumberForDiffLine(addLine, diff)
--          if (addLineNumber > -1) {
--            const addFrom = {
--              line: addLineNumber,
--              ch: addRange.location + 1,
--            }
--            const addTo = {
--              line: addLineNumber,
--              ch: addRange.location + addRange.length + 1,
--            }
--            codeMirror
--              .getDoc()
--              .markText(addFrom, addTo, { className: 'cm-diff-add-inner' })
--          }
--        }
--
--        const deleteRange = changeRanges.stringBRange
--        if (deleteRange.length > 0) {
--          const deleteLineNumber = lineNumberForDiffLine(deleteLine, diff)
--          if (deleteLineNumber > -1) {
--            const deleteFrom = {
--              line: deleteLineNumber,
--              ch: deleteRange.location + 1,
--            }
--            const deleteTo = {
--              line: deleteLineNumber,
--              ch: deleteRange.location + deleteRange.length + 1,
--            }
--            codeMirror.getDoc().markText(deleteFrom, deleteTo, {
--              className: 'cm-diff-delete-inner',
--            })
--          }
--        }
--      }
--    }
--  }
--
--  private onChanges = (cm: Editor) => {
--    this.restoreScrollPosition(cm)
--
--    const diff = this.props.diff
--    if (diff.kind === DiffType.Text) {
--      this.markIntraLineChanges(cm, diff)
--    }
--  }
--
-   private onChangeImageDiffType = (type: ImageDiffType) => {
-     this.props.dispatcher.changeImageDiffType(type)
-   }
-@@ -977,7 +223,7 @@
-   private renderLargeTextDiff() {
-     return (
-       <div className="panel empty large-diff">
--        <img src={NoDiffImage} />
-+        <img src={NoDiffImage} className="blankslate-image" />
-         <p>
-           The diff is too large to be displayed by default.
-           <br />
-@@ -1003,8 +249,8 @@
-   private renderLargeText(diff: ILargeTextDiff) {
-     // guaranteed to be set since this function won't be called if text or hunks are null
-     const textDiff: ITextDiff = {
--      text: diff.text!,
--      hunks: diff.hunks!,
-+      text: diff.text,
-+      hunks: diff.hunks,
-       kind: DiffType.Text,
-       lineEndingsChange: diff.lineEndingsChange,
-     }
-@@ -1043,107 +289,18 @@
-   }
-
-   private renderTextDiff(diff: ITextDiff) {
--    const options: IEditorConfigurationExtra = {
--      lineNumbers: false,
--      readOnly: true,
--      showCursorWhenSelecting: false,
--      cursorBlinkRate: -1,
--      lineWrapping: true,
--      mode: { name: DiffSyntaxMode.ModeName },
--      // Make sure CodeMirror doesn't capture Tab and thus destroy tab navigation
--      extraKeys: { Tab: false },
--      scrollbarStyle: __DARWIN__ ? 'simple' : 'native',
--      styleSelectedText: true,
--      lineSeparator: '\n',
--      specialChars: /[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b-\u200f\u2028\u2029\ufeff]/,
--    }
--
--    // If the text looks like it could have been formatted using Windows
--    // line endings (\r\n) we need to massage it a bit before we hand it
--    // off to CodeMirror. That's because CodeMirror has two ways of splitting
--    // lines, one is the built in which splits on \n, \r\n and \r. The last
--    // one is important because that will match carriage return characters
--    // inside a diff line. The other way is when consumers supply the
--    // lineSeparator option. That option only takes a string meaning we can
--    // either make it split on '\r\n', '\n' or '\r' but not what we would like
--    // to do, namely '\r?\n'. We want to keep CR characters inside of a diff
--    // line so that we can mark them using the specialChars attribute so
--    // we convert all \r\n to \n and remove any trailing \r character.
--    const text =
--      diff.text.indexOf('\r') !== -1
--        ? diff.text
--            // Capture the \r if followed by (positive lookahead) a \n or
--            // the end of the string. Note that this does not capture the \n.
--            .replace(/\r(?=\n|$)/g, '')
--        : diff.text
--
-     return (
--      <CodeMirrorHost
--        className="diff-code-mirror"
--        value={text}
--        options={options}
--        isSelectionEnabled={this.isSelectionEnabled}
--        onChanges={this.onChanges}
--        onRenderLine={this.renderLine}
--        ref={this.getAndStoreCodeMirrorInstance}
--        onCopy={this.onCopy}
-+      <TextDiff
-+        repository={this.props.repository}
-+        file={this.props.file}
-+        readOnly={this.props.readOnly}
-+        onIncludeChanged={this.props.onIncludeChanged}
-+        text={diff.text}
-+        hunks={diff.hunks}
-       />
-     )
-   }
-
--  private onCopy = (editor: CodeMirror.Editor, event: Event) => {
--    event.preventDefault()
--
--    // Remove the diff line markers from the copied text. The beginning of the
--    // selection might start within a line, in which case we don't have to trim
--    // the diff type marker. But for selections that span multiple lines, we'll
--    // trim it.
--    const doc = editor.getDoc()
--    const lines = doc.getSelections()
--    const selectionRanges = doc.listSelections()
--    const lineContent: Array<string> = []
--
--    for (let i = 0; i < lines.length; i++) {
--      const range = selectionRanges[i]
--      const content = lines[i]
--      const contentLines = content.split('\n')
--      for (const [i, line] of contentLines.entries()) {
--        if (i === 0 && range.head.ch > 0) {
--          lineContent.push(line)
--        } else {
--          lineContent.push(line.substr(1))
--        }
--      }
--
--      const textWithoutMarkers = lineContent.join('\n')
--      clipboard.writeText(textWithoutMarkers)
--    }
--  }
--
--  private getAndStoreCodeMirrorInstance = (cmh: CodeMirrorHost | null) => {
--    this.codeMirror = cmh === null ? null : cmh.getEditor()
--  }
--
--  private renderDiff(diff: IDiff): JSX.Element | null {
--    switch (diff.kind) {
--      case DiffType.Text:
--        return this.renderText(diff)
--      case DiffType.Binary:
--        return this.renderBinaryFile()
--      case DiffType.Image:
--        return this.renderImage(diff)
--      case DiffType.LargeText: {
--        return this.state.forceShowLargeDiff
--          ? this.renderLargeText(diff)
--          : this.renderLargeTextDiff()
--      }
--      case DiffType.Unrenderable:
--        return this.renderUnrenderableDiff()
--      default:
--        return assertNever(diff, `Unsupported diff type: ${diff}`)
--    }
--  }
--
-   private showLargeDiff = () => {
-     this.setState({ forceShowLargeDiff: true })
-   }
-added in remote
-  their  100644 1ece0b9f0ed9655b30e1319e0b541d63d81d049c app/src/ui/diff/syntax-highlighting/index.ts
-@@ -0,0 +1,201 @@
-+import * as Path from 'path'
-+
-+import { assertNever } from '../../../lib/fatal-error'
-+
-+import { getPartialBlobContents } from '../../../lib/git/show'
-+import { readPartialFile } from '../../../lib/file-system'
-+import { highlight } from '../../../lib/highlighter/worker'
-+import { ITokens } from '../../../lib/highlighter/types'
-+
-+import {
-+  CommittedFileChange,
-+  WorkingDirectoryFileChange,
-+  AppFileStatus,
-+} from '../../../models/status'
-+import { Repository } from '../../../models/repository'
-+import { DiffHunk, DiffLineType, DiffLine } from '../../../models/diff'
-+
-+/** The maximum number of bytes we'll process for highlighting. */
-+const MaxHighlightContentLength = 256 * 1024
-+
-+type ChangedFile = WorkingDirectoryFileChange | CommittedFileChange
-+
-+interface ILineFilters {
-+  readonly oldLineFilter: Array<number>
-+  readonly newLineFilter: Array<number>
-+}
-+
-+interface IFileContents {
-+  readonly file: ChangedFile
-+  readonly oldContents: Buffer
-+  readonly newContents: Buffer
-+}
-+
-+interface IFileTokens {
-+  readonly oldTokens: ITokens
-+  readonly newTokens: ITokens
-+}
-+
-+async function getOldFileContent(
-+  repository: Repository,
-+  file: ChangedFile
-+): Promise<Buffer> {
-+  if (file.status === AppFileStatus.New) {
-+    return new Buffer(0)
-+  }
-+
-+  let commitish
-+
-+  if (file instanceof WorkingDirectoryFileChange) {
-+    // If we pass an empty string here we get the contents
-+    // that are in the index. But since we call diff with
-+    // --no-index (see diff.ts) we need to look at what's
-+    // actually committed to get the appropriate content.
-+    commitish = 'HEAD'
-+  } else if (file instanceof CommittedFileChange) {
-+    commitish = `${file.commitish}^`
-+  } else {
-+    return assertNever(file, 'Unknown file change type')
-+  }
-+
-+  return getPartialBlobContents(
-+    repository,
-+    commitish,
-+    file.oldPath || file.path,
-+    MaxHighlightContentLength
-+  )
-+}
-+
-+async function getNewFileContent(
-+  repository: Repository,
-+  file: ChangedFile
-+): Promise<Buffer> {
-+  if (file.status === AppFileStatus.Deleted) {
-+    return new Buffer(0)
-+  }
-+
-+  if (file instanceof WorkingDirectoryFileChange) {
-+    return readPartialFile(
-+      Path.join(repository.path, file.path),
-+      0,
-+      MaxHighlightContentLength - 1
-+    )
-+  } else if (file instanceof CommittedFileChange) {
-+    return getPartialBlobContents(
-+      repository,
-+      file.commitish,
-+      file.path,
-+      MaxHighlightContentLength
-+    )
-+  }
-+
-+  return assertNever(file, 'Unknown file change type')
-+}
-+
-+export async function getFileContents(
-+  repo: Repository,
-+  file: ChangedFile,
-+  lineFilters: ILineFilters
-+): Promise<IFileContents> {
-+  const oldContentsPromise = lineFilters.oldLineFilter.length
-+    ? getOldFileContent(repo, file)
-+    : Promise.resolve(new Buffer(0))
-+
-+  const newContentsPromise = lineFilters.newLineFilter.length
-+    ? getNewFileContent(repo, file)
-+    : Promise.resolve(new Buffer(0))
-+
-+  const [oldContents, newContents] = await Promise.all([
-+    oldContentsPromise.catch(e => {
-+      log.error('Could not load old contents for syntax highlighting', e)
-+      return new Buffer(0)
-+    }),
-+    newContentsPromise.catch(e => {
-+      log.error('Could not load new contents for syntax highlighting', e)
-+      return new Buffer(0)
-+    }),
-+  ])
-+
-+  return { file, oldContents, newContents }
-+}
-+
-+/**
-+ * Figure out which lines we need to have tokenized in
-+ * both the old and new version of the file.
-+ */
-+export function getLineFilters(hunks: ReadonlyArray<DiffHunk>): ILineFilters {
-+  const oldLineFilter = new Array<number>()
-+  const newLineFilter = new Array<number>()
-+
-+  const diffLines = new Array<DiffLine>()
-+
-+  let anyAdded = false
-+  let anyDeleted = false
-+
-+  for (const hunk of hunks) {
-+    for (const line of hunk.lines) {
-+      anyAdded = anyAdded || line.type === DiffLineType.Add
-+      anyDeleted = anyDeleted || line.type === DiffLineType.Delete
-+      diffLines.push(line)
-+    }
-+  }
-+
-+  for (const line of diffLines) {
-+    // So this might need a little explaining. What we're trying
-+    // to achieve here is if the diff contains only additions or
-+    // only deletions we'll source all the highlighted lines from
-+    // either the before or after file. That way we can completely
-+    // disregard loading, and highlighting, the other version.
-+    if (line.oldLineNumber !== null && line.newLineNumber !== null) {
-+      if (anyAdded && !anyDeleted) {
-+        newLineFilter.push(line.newLineNumber - 1)
-+      } else {
-+        oldLineFilter.push(line.oldLineNumber - 1)
-+      }
-+    } else {
-+      // If there's a mix (meaning we'll have to read from both
-+      // anyway) we'll prioritize the old version since
-+      // that's immutable and less likely to be the subject of a
-+      // race condition when someone rapidly modifies the file on
-+      // disk.
-+      if (line.oldLineNumber !== null) {
-+        oldLineFilter.push(line.oldLineNumber - 1)
-+      } else if (line.newLineNumber !== null) {
-+        newLineFilter.push(line.newLineNumber - 1)
-+      }
-+    }
-+  }
-+
-+  return { oldLineFilter, newLineFilter }
-+}
-+
-+export async function highlightContents(
-+  contents: IFileContents,
-+  tabSize: number,
-+  lineFilters: ILineFilters
-+): Promise<IFileTokens> {
-+  const { file, oldContents, newContents } = contents
-+
-+  const [oldTokens, newTokens] = await Promise.all([
-+    highlight(
-+      oldContents.toString('utf8'),
-+      Path.extname(file.oldPath || file.path),
-+      tabSize,
-+      lineFilters.oldLineFilter
-+    ).catch(e => {
-+      log.error('Highlighter worked failed for old contents', e)
-+      return {}
-+    }),
-+    highlight(
-+      newContents.toString('utf8'),
-+      Path.extname(file.path),
-+      tabSize,
-+      lineFilters.newLineFilter
-+    ).catch(e => {
-+      log.error('Highlighter worked failed for new contents', e)
-+      return {}
-+    }),
-+  ])
-+
-+  return { oldTokens, newTokens }
-+}
-added in remote
-  their  100644 6fec151426449ef33b9603d5c070b906db0d39ce app/src/ui/diff/text-diff.tsx
-@@ -0,0 +1,767 @@
-+import * as React from 'react'
-+import * as ReactDOM from 'react-dom'
-+import { clipboard } from 'electron'
-+import { Editor } from 'codemirror'
-+import { Disposable } from 'event-kit'
-+
-+import { fatalError } from '../../lib/fatal-error'
-+
-+import { DiffHunk, DiffLineType, DiffSelection } from '../../models/diff'
-+import {
-+  WorkingDirectoryFileChange,
-+  CommittedFileChange,
-+} from '../../models/status'
-+
-+import { Octicon, OcticonSymbol } from '../octicons'
-+
-+import { IEditorConfigurationExtra } from './editor-configuration-extra'
-+import { DiffSyntaxMode, IDiffSyntaxModeSpec } from './diff-syntax-mode'
-+import { CodeMirrorHost } from './code-mirror-host'
-+import { DiffLineGutter } from './diff-line-gutter'
-+import {
-+  diffLineForIndex,
-+  diffHunkForIndex,
-+  findInteractiveDiffRange,
-+  lineNumberForDiffLine,
-+} from './diff-explorer'
-+import { RangeSelectionSizePixels } from './edge-detection'
-+
-+import { ISelectionStrategy } from './selection/selection-strategy'
-+import { RangeSelection } from './selection/range-selection-strategy'
-+import { DragDropSelection } from './selection/drag-drop-selection-strategy'
-+
-+import {
-+  getLineFilters,
-+  getFileContents,
-+  highlightContents,
-+} from './syntax-highlighting'
-+import { relativeChanges } from './changed-range'
-+import { Repository } from '../../models/repository'
-+
-+/** The longest line for which we'd try to calculate a line diff. */
-+const MaxIntraLineDiffStringLength = 4096
-+
-+// This is a custom version of the no-newline octicon that's exactly as
-+// tall as it needs to be (8px) which helps with aligning it on the line.
-+const narrowNoNewlineSymbol = new OcticonSymbol(
-+  16,
-+  8,
-+  'm 16,1 0,3 c 0,0.55 -0.45,1 -1,1 l -3,0 0,2 -3,-3 3,-3 0,2 2,0 0,-2 2,0 z M 8,4 C 8,6.2 6.2,8 4,8 1.8,8 0,6.2 0,4 0,1.8 1.8,0 4,0 6.2,0 8,1.8 8,4 Z M 1.5,5.66 5.66,1.5 C 5.18,1.19 4.61,1 4,1 2.34,1 1,2.34 1,4 1,4.61 1.19,5.17 1.5,5.66 Z M 7,4 C 7,3.39 6.81,2.83 6.5,2.34 L 2.34,6.5 C 2.82,6.81 3.39,7 4,7 5.66,7 7,5.66 7,4 Z'
-+)
-+
-+type ChangedFile = WorkingDirectoryFileChange | CommittedFileChange
-+
-+/**
-+ * Checks to see if any key parameters in the props object that are used
-+ * when performing highlighting has changed. This is used to determine
-+ * whether highlighting should abort in between asynchronous operations
-+ * due to some factor (like which file is currently selected) have changed
-+ * and thus rendering the in-flight highlighting data useless.
-+ */
-+function highlightParametersEqual(
-+  newProps: ITextDiffProps,
-+  prevProps: ITextDiffProps
-+) {
-+  if (newProps === prevProps) {
-+    return true
-+  }
-+
-+  return (
-+    newProps.file.path === prevProps.file.path &&
-+    newProps.file.oldPath === prevProps.file.oldPath &&
-+    newProps.text === prevProps.text
-+  )
-+}
-+
-+interface ITextDiffProps {
-+  readonly repository: Repository
-+  readonly file: ChangedFile
-+  readonly readOnly: boolean
-+  readonly onIncludeChanged?: (diffSelection: DiffSelection) => void
-+  readonly text: string
-+  readonly hunks: ReadonlyArray<DiffHunk>
-+}
-+
-+export class TextDiff extends React.Component<ITextDiffProps, {}> {
-+  private codeMirror: Editor | null = null
-+
-+  private gutterWidth: number | null = null
-+
-+  /**
-+   * We store the scroll position before reloading the same diff so that we can
-+   * restore it when we're done. If we're not reloading the same diff, this'll
-+   * be null.
-+   */
-+  private scrollPositionToRestore: { left: number; top: number } | null = null
-+
-+  /**
-+   * A mapping from CodeMirror line handles to disposables which, when disposed
-+   * cleans up any line gutter components and events associated with that line.
-+   * See renderLine for more information.
-+   */
-+  private readonly lineCleanup = new Map<any, Disposable>()
-+
-+  /**
-+   *  a local cache of gutter elements, keyed by the row in the diff
-+   */
-+  private cachedGutterElements = new Map<number, DiffLineGutter>()
-+
-+  /**
-+   * Maintain the current state of the user interacting with the diff gutter
-+   */
-+  private selection: ISelectionStrategy | null = null
-+
-+  private async initDiffSyntaxMode() {
-+    const cm = this.codeMirror
-+    const file = this.props.file
-+    const hunks = this.props.hunks
-+    const repo = this.props.repository
-+
-+    if (!cm) {
-+      return
-+    }
-+
-+    // Store the current props to that we can see if anything
-+    // changes from underneath us as we're making asynchronous
-+    // operations that makes our data stale or useless.
-+    const propsSnapshot = this.props
-+
-+    const lineFilters = getLineFilters(hunks)
-+    const contents = await getFileContents(repo, file, lineFilters)
-+
-+    if (!highlightParametersEqual(this.props, propsSnapshot)) {
-+      return
-+    }
-+
-+    const tsOpt = cm.getOption('tabSize')
-+    const tabSize = typeof tsOpt === 'number' ? tsOpt : 4
-+
-+    const tokens = await highlightContents(contents, tabSize, lineFilters)
-+
-+    if (!highlightParametersEqual(this.props, propsSnapshot)) {
-+      return
-+    }
-+
-+    const spec: IDiffSyntaxModeSpec = {
-+      name: DiffSyntaxMode.ModeName,
-+      hunks: this.props.hunks,
-+      oldTokens: tokens.oldTokens,
-+      newTokens: tokens.newTokens,
-+    }
-+
-+    cm.setOption('mode', spec)
-+  }
-+
-+  private dispose() {
-+    this.codeMirror = null
-+
-+    this.lineCleanup.forEach(disposable => disposable.dispose())
-+    this.lineCleanup.clear()
-+
-+    document.removeEventListener('mouseup', this.onDocumentMouseUp)
-+  }
-+
-+  /**
-+   * compute the diff gutter width based on what's been rendered in the browser
-+   */
-+  private getAndCacheGutterWidth = (): number | null => {
-+    if (this.gutterWidth) {
-+      return this.gutterWidth
-+    }
-+
-+    if (this.codeMirror) {
-+      // as getWidth will return 0 for elements that are offscreen, this code
-+      // will look for the first row of the current viewport, which should be
-+      // onscreen
-+      const viewport = this.codeMirror.getScrollInfo()
-+      const top = viewport.top
-+
-+      const row = this.codeMirror.lineAtHeight(top, 'local')
-+      const element = this.cachedGutterElements.get(row)
-+
-+      if (!element) {
-+        console.error(
-+          `unable to find element at ${row}, should probably look into that`
-+        )
-+        return null
-+      }
-+
-+      this.gutterWidth = element.getWidth()
-+
-+      if (this.gutterWidth === 0) {
-+        console.error(
-+          `element at row ${row} does not have a width, should probably look into that`
-+        )
-+      }
-+    }
-+
-+    return this.gutterWidth
-+  }
-+
-+  private updateRangeHoverState = (
-+    start: number,
-+    end: number,
-+    show: boolean
-+  ) => {
-+    for (let i = start; i <= end; i++) {
-+      this.hoverLine(i, show)
-+    }
-+  }
-+
-+  private hoverLine = (row: number, include: boolean) => {
-+    const element = this.cachedGutterElements.get(row)
-+
-+    // element may not be drawn by the editor, so updating it isn't necessary
-+    if (element) {
-+      element.setHover(include)
-+    }
-+  }
-+
-+  /**
-+   * start a selection gesture based on the current interation
-+   */
-+  private startSelection = (
-+    file: WorkingDirectoryFileChange,
-+    hunks: ReadonlyArray<DiffHunk>,
-+    index: number,
-+    isRangeSelection: boolean
-+  ) => {
-+    const snapshot = file.selection
-+    const selected = snapshot.isSelected(index)
-+    const desiredSelection = !selected
-+
-+    if (isRangeSelection) {
-+      const range = findInteractiveDiffRange(hunks, index)
-+      if (!range) {
-+        console.error('unable to find range for given line in diff')
-+        return
-+      }
-+
-+      this.selection = new RangeSelection(
-+        range.start,
-+        range.end,
-+        desiredSelection,
-+        snapshot
-+      )
-+    } else {
-+      this.selection = new DragDropSelection(index, desiredSelection, snapshot)
-+    }
-+
-+    this.selection.paint(this.cachedGutterElements)
-+    document.addEventListener('mouseup', this.onDocumentMouseUp)
-+  }
-+
-+  /**
-+   * Helper event listener, registered when starting a selection by
-+   * clicking anywhere on or near the gutter. Immediately removes itself
-+   * from the mouseup event on the document element and ends any current
-+   * selection.
-+   *
-+   * TODO: Once Electron upgrades to Chrome 55 we can drop this in favor
-+   * of the 'once' option in addEventListener, see
-+   * https://developer.mozilla.org/en-US/docs/Web/API/EventTarget/addEventListener
-+   */
-+  private onDocumentMouseUp = (ev: MouseEvent) => {
-+    ev.preventDefault()
-+    document.removeEventListener('mouseup', this.onDocumentMouseUp)
-+    this.endSelection()
-+  }
-+
-+  /**
-+   * complete the selection gesture and apply the change to the diff
-+   */
-+  private endSelection = () => {
-+    if (!this.props.onIncludeChanged || !this.selection) {
-+      return
-+    }
-+
-+    this.props.onIncludeChanged(this.selection.done())
-+
-+    // operation is completed, clean this up
-+    this.selection = null
-+  }
-+
-+  private onGutterMouseDown = (
-+    index: number,
-+    hunks: ReadonlyArray<DiffHunk>,
-+    isRangeSelection: boolean
-+  ) => {
-+    if (!(this.props.file instanceof WorkingDirectoryFileChange)) {
-+      fatalError(
-+        'must not start selection when selected file is not a WorkingDirectoryFileChange'
-+      )
-+      return
-+    }
-+
-+    if (isRangeSelection) {
-+      const hunk = diffHunkForIndex(hunks, index)
-+      if (!hunk) {
-+        console.error('unable to find hunk for given line in diff')
-+      }
-+    }
-+    this.startSelection(this.props.file, hunks, index, isRangeSelection)
-+  }
-+
-+  private onGutterMouseMove = (index: number) => {
-+    if (!this.selection) {
-+      return
-+    }
-+
-+    this.selection.update(index)
-+    this.selection.paint(this.cachedGutterElements)
-+  }
-+
-+  private onDiffTextMouseMove = (
-+    ev: MouseEvent,
-+    hunks: ReadonlyArray<DiffHunk>,
-+    index: number
-+  ) => {
-+    const isActive = this.isMouseCursorNearGutter(ev)
-+    if (isActive === null) {
-+      return
-+    }
-+
-+    const diffLine = diffLineForIndex(hunks, index)
-+    if (!diffLine) {
-+      return
-+    }
-+
-+    if (!diffLine.isIncludeableLine()) {
-+      return
-+    }
-+
-+    const range = findInteractiveDiffRange(hunks, index)
-+    if (!range) {
-+      console.error('unable to find range for given index in diff')
-+      return
-+    }
-+
-+    this.updateRangeHoverState(range.start, range.end, isActive)
-+  }
-+
-+  private onDiffTextMouseDown = (
-+    ev: MouseEvent,
-+    hunks: ReadonlyArray<DiffHunk>,
-+    index: number
-+  ) => {
-+    const isActive = this.isMouseCursorNearGutter(ev)
-+
-+    if (isActive) {
-+      // this line is important because it prevents the codemirror editor
-+      // from handling the event and resetting the scroll position.
-+      // it doesn't do this when you click on elements in the gutter,
-+      // which is an amazing joke to have placed upon me right now
-+      ev.preventDefault()
-+
-+      if (!(this.props.file instanceof WorkingDirectoryFileChange)) {
-+        fatalError(
-+          'must not start selection when selected file is not a WorkingDirectoryFileChange'
-+        )
-+        return
-+      }
-+
-+      this.startSelection(this.props.file, hunks, index, true)
-+    }
-+  }
-+
-+  private onDiffTextMouseLeave = (
-+    ev: MouseEvent,
-+    hunks: ReadonlyArray<DiffHunk>,
-+    index: number
-+  ) => {
-+    const range = findInteractiveDiffRange(hunks, index)
-+    if (!range) {
-+      console.error('unable to find range for given index in diff')
-+      return
-+    }
-+
-+    this.updateRangeHoverState(range.start, range.end, false)
-+  }
-+
-+  private isMouseCursorNearGutter = (ev: MouseEvent): boolean | null => {
-+    const width = this.getAndCacheGutterWidth()
-+
-+    if (!width) {
-+      // should fail earlier than this with a helpful error message
-+      return null
-+    }
-+
-+    const deltaX = ev.layerX - width
-+    return deltaX >= 0 && deltaX <= RangeSelectionSizePixels
-+  }
-+
-+  private isSelectionEnabled = () => {
-+    return this.selection == null
-+  }
-+
-+  private restoreScrollPosition(cm: Editor) {
-+    const scrollPosition = this.scrollPositionToRestore
-+    if (cm && scrollPosition) {
-+      cm.scrollTo(scrollPosition.left, scrollPosition.top)
-+    }
-+  }
-+
-+  private renderLine = (instance: any, line: any, element: HTMLElement) => {
-+    const existingLineDisposable = this.lineCleanup.get(line)
-+
-+    // If we can find the line in our cleanup list that means the line is
-+    // being re-rendered. Agains, CodeMirror doesn't fire the 'delete' event
-+    // when this happens.
-+    if (existingLineDisposable) {
-+      existingLineDisposable.dispose()
-+      this.lineCleanup.delete(line)
-+    }
-+
-+    const index = instance.getLineNumber(line) as number
-+
-+    const diffLine = diffLineForIndex(this.props.hunks, index)
-+    if (diffLine) {
-+      const diffLineElement = element.children[0] as HTMLSpanElement
-+
-+      let noNewlineReactContainer: HTMLSpanElement | null = null
-+
-+      if (diffLine.noTrailingNewLine) {
-+        noNewlineReactContainer = document.createElement('span')
-+        noNewlineReactContainer.setAttribute(
-+          'title',
-+          'No newline at end of file'
-+        )
-+        ReactDOM.render(
-+          <Octicon symbol={narrowNoNewlineSymbol} className="no-newline" />,
-+          noNewlineReactContainer
-+        )
-+        diffLineElement.appendChild(noNewlineReactContainer)
-+      }
-+
-+      const gutterReactContainer = document.createElement('span')
-+
-+      let isIncluded = false
-+      if (this.props.file instanceof WorkingDirectoryFileChange) {
-+        isIncluded = this.props.file.selection.isSelected(index)
-+      }
-+
-+      const cache = this.cachedGutterElements
-+
-+      const hunks = this.props.hunks
-+
-+      ReactDOM.render(
-+        <DiffLineGutter
-+          line={diffLine}
-+          isIncluded={isIncluded}
-+          index={index}
-+          readOnly={this.props.readOnly}
-+          hunks={hunks}
-+          updateRangeHoverState={this.updateRangeHoverState}
-+          isSelectionEnabled={this.isSelectionEnabled}
-+          onMouseDown={this.onGutterMouseDown}
-+          onMouseMove={this.onGutterMouseMove}
-+        />,
-+        gutterReactContainer,
-+        function(this: DiffLineGutter) {
-+          if (this !== undefined) {
-+            cache.set(index, this)
-+          }
-+        }
-+      )
-+
-+      const onMouseMoveLine: (ev: MouseEvent) => void = ev => {
-+        this.onDiffTextMouseMove(ev, hunks, index)
-+      }
-+
-+      const onMouseDownLine: (ev: MouseEvent) => void = ev => {
-+        this.onDiffTextMouseDown(ev, hunks, index)
-+      }
-+
-+      const onMouseLeaveLine: (ev: MouseEvent) => void = ev => {
-+        this.onDiffTextMouseLeave(ev, hunks, index)
-+      }
-+
-+      if (!this.props.readOnly) {
-+        diffLineElement.addEventListener('mousemove', onMouseMoveLine)
-+        diffLineElement.addEventListener('mousedown', onMouseDownLine)
-+        diffLineElement.addEventListener('mouseleave', onMouseLeaveLine)
-+      }
-+
-+      element.insertBefore(gutterReactContainer, diffLineElement)
-+
-+      // Hack(ish?). In order to be a real good citizen we need to unsubscribe from
-+      // the line delete event once we've been called once or the component has been
-+      // unmounted. In the latter case it's _probably_ not strictly necessary since
-+      // the only thing gc rooted by the event should be isolated and eligble for
-+      // collection. But let's be extra cautious I guess.
-+      //
-+      // The only way to unsubscribe is to pass the exact same function given to the
-+      // 'on' function to the 'off' so we need a reference to ourselves, basically.
-+      let deleteHandler: () => void // eslint-disable-line prefer-const
-+
-+      // Since we manually render a react component we have to take care of unmounting
-+      // it or else we'll leak memory. This disposable will unmount the component.
-+      //
-+      // See https://facebook.github.io/react/blog/2015/10/01/react-render-and-top-level-api.html
-+      const gutterCleanup = new Disposable(() => {
-+        this.cachedGutterElements.delete(index)
-+
-+        ReactDOM.unmountComponentAtNode(gutterReactContainer)
-+
-+        if (noNewlineReactContainer) {
-+          ReactDOM.unmountComponentAtNode(noNewlineReactContainer)
-+        }
-+
-+        if (!this.props.readOnly) {
-+          diffLineElement.removeEventListener('mousemove', onMouseMoveLine)
-+          diffLineElement.removeEventListener('mousedown', onMouseDownLine)
-+          diffLineElement.removeEventListener('mouseleave', onMouseLeaveLine)
-+        }
-+
-+        line.off('delete', deleteHandler)
-+      })
-+
-+      // Add the cleanup disposable to our list of disposables so that we clean up when
-+      // this component is unmounted or when the line is re-rendered. When either of that
-+      // happens the line 'delete' event doesn't  fire.
-+      this.lineCleanup.set(line, gutterCleanup)
-+
-+      // If the line delete event fires we dispose of the disposable (disposing is
-+      // idempotent)
-+      deleteHandler = () => {
-+        const disp = this.lineCleanup.get(line)
-+        if (disp) {
-+          this.lineCleanup.delete(line)
-+          disp.dispose()
-+        }
-+      }
-+      line.on('delete', deleteHandler)
-+    }
-+  }
-+
-+  private getAndStoreCodeMirrorInstance = (cmh: CodeMirrorHost | null) => {
-+    this.codeMirror = cmh === null ? null : cmh.getEditor()
-+  }
-+
-+  private onCopy = (editor: Editor, event: Event) => {
-+    event.preventDefault()
-+
-+    // Remove the diff line markers from the copied text. The beginning of the
-+    // selection might start within a line, in which case we don't have to trim
-+    // the diff type marker. But for selections that span multiple lines, we'll
-+    // trim it.
-+    const doc = editor.getDoc()
-+    const lines = doc.getSelections()
-+    const selectionRanges = doc.listSelections()
-+    const lineContent: Array<string> = []
-+
-+    for (let i = 0; i < lines.length; i++) {
-+      const range = selectionRanges[i]
-+      const content = lines[i]
-+      const contentLines = content.split('\n')
-+      for (const [i, line] of contentLines.entries()) {
-+        if (i === 0 && range.head.ch > 0) {
-+          lineContent.push(line)
-+        } else {
-+          lineContent.push(line.substr(1))
-+        }
-+      }
-+
-+      const textWithoutMarkers = lineContent.join('\n')
-+      clipboard.writeText(textWithoutMarkers)
-+    }
-+  }
-+
-+  private markIntraLineChanges(
-+    codeMirror: Editor,
-+    hunks: ReadonlyArray<DiffHunk>
-+  ) {
-+    for (const hunk of hunks) {
-+      const additions = hunk.lines.filter(l => l.type === DiffLineType.Add)
-+      const deletions = hunk.lines.filter(l => l.type === DiffLineType.Delete)
-+      if (additions.length !== deletions.length) {
-+        continue
-+      }
-+
-+      for (let i = 0; i < additions.length; i++) {
-+        const addLine = additions[i]
-+        const deleteLine = deletions[i]
-+        if (
-+          addLine.text.length > MaxIntraLineDiffStringLength ||
-+          deleteLine.text.length > MaxIntraLineDiffStringLength
-+        ) {
-+          continue
-+        }
-+
-+        const changeRanges = relativeChanges(
-+          addLine.content,
-+          deleteLine.content
-+        )
-+        const addRange = changeRanges.stringARange
-+        if (addRange.length > 0) {
-+          const addLineNumber = lineNumberForDiffLine(addLine, hunks)
-+          if (addLineNumber > -1) {
-+            const addFrom = {
-+              line: addLineNumber,
-+              ch: addRange.location + 1,
-+            }
-+            const addTo = {
-+              line: addLineNumber,
-+              ch: addRange.location + addRange.length + 1,
-+            }
-+            codeMirror
-+              .getDoc()
-+              .markText(addFrom, addTo, { className: 'cm-diff-add-inner' })
-+          }
-+        }
-+
-+        const deleteRange = changeRanges.stringBRange
-+        if (deleteRange.length > 0) {
-+          const deleteLineNumber = lineNumberForDiffLine(deleteLine, hunks)
-+          if (deleteLineNumber > -1) {
-+            const deleteFrom = {
-+              line: deleteLineNumber,
-+              ch: deleteRange.location + 1,
-+            }
-+            const deleteTo = {
-+              line: deleteLineNumber,
-+              ch: deleteRange.location + deleteRange.length + 1,
-+            }
-+            codeMirror.getDoc().markText(deleteFrom, deleteTo, {
-+              className: 'cm-diff-delete-inner',
-+            })
-+          }
-+        }
-+      }
-+    }
-+  }
-+
-+  private onChanges = (cm: Editor) => {
-+    this.restoreScrollPosition(cm)
-+
-+    this.markIntraLineChanges(cm, this.props.hunks)
-+  }
-+
-+  public componentWillReceiveProps(nextProps: ITextDiffProps) {
-+    // If we're reloading the same file, we want to save the current scroll
-+    // position and restore it after the diff's been updated.
-+    const sameFile =
-+      nextProps.file &&
-+      this.props.file &&
-+      nextProps.file.id === this.props.file.id
-+
-+    // Happy path, if the text hasn't changed we won't re-render
-+    // and subsequently won't have to restore the scroll position.
-+    const textHasChanged = nextProps.text !== this.props.text
-+
-+    const codeMirror = this.codeMirror
-+    if (codeMirror && sameFile && textHasChanged) {
-+      const scrollInfo = codeMirror.getScrollInfo()
-+      this.scrollPositionToRestore = {
-+        left: scrollInfo.left,
-+        top: scrollInfo.top,
-+      }
-+    } else {
-+      this.scrollPositionToRestore = null
-+    }
-+
-+    if (codeMirror && this.props.text !== nextProps.text) {
-+      codeMirror.setOption('mode', { name: DiffSyntaxMode.ModeName })
-+    }
-+
-+    // HACK: This entire section is a hack. Whenever we receive
-+    // props we update all currently visible gutter elements with
-+    // the selection state from the file.
-+    if (nextProps.file instanceof WorkingDirectoryFileChange) {
-+      const selection = nextProps.file.selection
-+      const oldSelection =
-+        this.props.file instanceof WorkingDirectoryFileChange
-+          ? this.props.file.selection
-+          : null
-+
-+      // Nothing has changed
-+      if (oldSelection === selection) {
-+        return
-+      }
-+
-+      this.gutterWidth = null
-+
-+      const hunks = nextProps.hunks
-+      this.cachedGutterElements.forEach((element, index) => {
-+        if (!element) {
-+          console.error('expected DOM element for diff gutter not found')
-+          return
-+        }
-+
-+        const line = diffLineForIndex(hunks, index)
-+        const isIncludable = line ? line.isIncludeableLine() : false
-+        const isSelected = selection.isSelected(index) && isIncludable
-+        element.setSelected(isSelected)
-+      })
-+    }
-+  }
-+
-+  public componentWillUnmount() {
-+    this.dispose()
-+  }
-+
-+  public componentDidUpdate(prevProps: ITextDiffProps) {
-+    if (this.props.text === prevProps.text) {
-+      return
-+    }
-+
-+    if (this.codeMirror) {
-+      this.codeMirror.setOption('mode', { name: DiffSyntaxMode.ModeName })
-+    }
-+
-+    this.initDiffSyntaxMode()
-+  }
-+
-+  public componentDidMount() {
-+    this.initDiffSyntaxMode()
-+  }
-+
-+  public render() {
-+    const options: IEditorConfigurationExtra = {
-+      lineNumbers: false,
-+      readOnly: true,
-+      showCursorWhenSelecting: false,
-+      cursorBlinkRate: -1,
-+      lineWrapping: true,
-+      mode: { name: DiffSyntaxMode.ModeName },
-+      // Make sure CodeMirror doesn't capture Tab and thus destroy tab navigation
-+      extraKeys: { Tab: false },
-+      scrollbarStyle: __DARWIN__ ? 'simple' : 'native',
-+      styleSelectedText: true,
-+      lineSeparator: '\n',
-+      specialChars: /[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b-\u200f\u2028\u2029\ufeff]/,
-+    }
-+
-+    // If the text looks like it could have been formatted using Windows
-+    // line endings (\r\n) we need to massage it a bit before we hand it
-+    // off to CodeMirror. That's because CodeMirror has two ways of splitting
-+    // lines, one is the built in which splits on \n, \r\n and \r. The last
-+    // one is important because that will match carriage return characters
-+    // inside a diff line. The other way is when consumers supply the
-+    // lineSeparator option. That option only takes a string meaning we can
-+    // either make it split on '\r\n', '\n' or '\r' but not what we would like
-+    // to do, namely '\r?\n'. We want to keep CR characters inside of a diff
-+    // line so that we can mark them using the specialChars attribute so
-+    // we convert all \r\n to \n and remove any trailing \r character.
-+    const text =
-+      this.props.text.indexOf('\r') !== -1
-+        ? this.props.text
-+            // Capture the \r if followed by (positive lookahead) a \n or
-+            // the end of the string. Note that this does not capture the \n.
-+            .replace(/\r(?=\n|$)/g, '')
-+        : this.props.text
-+
-+    return (
-+      <CodeMirrorHost
-+        className="diff-code-mirror"
-+        value={text}
-+        options={options}
-+        isSelectionEnabled={this.isSelectionEnabled}
-+        onChanges={this.onChanges}
-+        onRenderLine={this.renderLine}
-+        ref={this.getAndStoreCodeMirrorInstance}
-+        onCopy={this.onCopy}
-+      />
-+    )
-+  }
-+}
-merged
-  result 100644 2554a2b18a26273423e0c5b405f02cfc870a00e4 app/src/ui/discard-changes/discard-changes-dialog.tsx
-  our    100644 78b4d51f4ee8816a057066d15e425e65833d4ef1 app/src/ui/discard-changes/discard-changes-dialog.tsx
-@@ -15,6 +15,12 @@
-   readonly dispatcher: Dispatcher
-   readonly files: ReadonlyArray<WorkingDirectoryFileChange>
-   readonly confirmDiscardChanges: boolean
-+  /**
-+   * Determines whether to show the option
-+   * to ask for confirmation when discarding
-+   * changes
-+   */
-+  readonly showDiscardChangesSetting: boolean
-   readonly onDismissed: () => void
-   readonly onConfirmDiscardChangesChanged: (optOut: boolean) => void
- }
-@@ -65,15 +71,7 @@
-           <p>
-             Changes can be restored by retrieving them from the {trashName}.
-           </p>
--          <Checkbox
--            label="Do not show this message again"
--            value={
--              this.state.confirmDiscardChanges
--                ? CheckboxValue.Off
--                : CheckboxValue.On
--            }
--            onChange={this.onCheckboxChanged}
--          />
-+          {this.renderConfirmDiscardChanges()}
-         </DialogContent>
-
-         <DialogFooter>
-@@ -88,6 +86,27 @@
-     )
-   }
-
-+  private renderConfirmDiscardChanges() {
-+    if (this.props.showDiscardChangesSetting) {
-+      return (
-+        <Checkbox
-+          label="Do not show this message again"
-+          value={
-+            this.state.confirmDiscardChanges
-+              ? CheckboxValue.Off
-+              : CheckboxValue.On
-+          }
-+          onChange={this.onConfirmDiscardChangesChanged}
-+        />
-+      )
-+    } else {
-+      // since we ignore the users option to not show
-+      // confirmation, we don't want to show a checkbox
-+      // that will have no effect
-+      return null
-+    }
-+  }
-+
-   private renderFileList() {
-     if (this.props.files.length > MaxFilesToList) {
-       return (
-@@ -126,7 +145,9 @@
-     this.props.onDismissed()
-   }
-
--  private onCheckboxChanged = (event: React.FormEvent<HTMLInputElement>) => {
-+  private onConfirmDiscardChangesChanged = (
-+    event: React.FormEvent<HTMLInputElement>
-+  ) => {
-     const value = !event.currentTarget.checked
-
-     this.setState({ confirmDiscardChanges: value })
-merged
-  result 100644 3e0e90eccd5a8894b7cce153c15009fe732a39cc app/src/ui/history/commit-list.tsx
-  our    100644 a440227b4ebc22b52f57595a0c3e68129de6bfdf app/src/ui/history/commit-list.tsx
-@@ -12,7 +12,7 @@
-   readonly gitHubRepository: GitHubRepository | null
-
-   /** The list of commits SHAs to display, in order. */
--  readonly commits: ReadonlyArray<string>
-+  readonly commitSHAs: ReadonlyArray<string>
-
-   /** The commits loaded, keyed by their full SHA. */
-   readonly commitLookup: Map<string, Commit>
-@@ -29,6 +29,9 @@
-   /** The list of known local commits for the current branch */
-   readonly localCommitSHAs: ReadonlyArray<string>
-
-+  /** The message to display inside the list when no results are displayed */
-+  readonly emptyListMessage: JSX.Element | string
-+
-   /** Callback which fires when a commit has been selected in the list */
-   readonly onCommitSelected: (commit: Commit) => void
-
-@@ -45,7 +48,7 @@
- /** A component which displays the list of commits. */
- export class CommitList extends React.Component<ICommitListProps, {}> {
-   private renderCommit = (row: number) => {
--    const sha = this.props.commits[row]
-+    const sha = this.props.commitSHAs[row]
-     const commit = this.props.commitLookup.get(sha)
-
-     if (commit == null) {
-@@ -73,8 +76,8 @@
-     )
-   }
-
--  private onRowChanged = (row: number) => {
--    const sha = this.props.commits[row]
-+  private onSelectedRowChanged = (row: number) => {
-+    const sha = this.props.commitSHAs[row]
-     const commit = this.props.commitLookup.get(sha)
-     if (commit) {
-       this.props.onCommitSelected(commit)
-@@ -94,25 +97,27 @@
-       return -1
-     }
-
--    return this.props.commits.findIndex(s => s === sha)
-+    return this.props.commitSHAs.findIndex(s => s === sha)
-   }
-
-   public render() {
--    if (this.props.commits.length === 0) {
--      return <div className="panel blankslate">No history</div>
-+    if (this.props.commitSHAs.length === 0) {
-+      return (
-+        <div className="panel blankslate">{this.props.emptyListMessage}</div>
-+      )
-     }
-
-     return (
-       <div id="commit-list">
-         <List
--          rowCount={this.props.commits.length}
-+          rowCount={this.props.commitSHAs.length}
-           rowHeight={RowHeight}
--          selectedRow={this.rowForSHA(this.props.selectedSHA)}
-+          selectedRows={[this.rowForSHA(this.props.selectedSHA)]}
-           rowRenderer={this.renderCommit}
--          onSelectionChanged={this.onRowChanged}
-+          onSelectedRowChanged={this.onSelectedRowChanged}
-           onScroll={this.onScroll}
-           invalidationProps={{
--            commits: this.props.commits,
-+            commits: this.props.commitSHAs,
-             gitHubUsers: this.props.gitHubUsers,
-           }}
-         />
-added in remote
-  their  100644 16d4efb540d90ba9514f7b5da356f9fa5372e2f6 app/src/ui/history/compare-branch-list-item.tsx
-@@ -0,0 +1,58 @@
-+import * as React from 'react'
-+
-+import { Octicon, OcticonSymbol } from '../octicons'
-+import { HighlightText } from '../lib/highlight-text'
-+import { Branch, IAheadBehind } from '../../models/branch'
-+import { IMatches } from '../../lib/fuzzy-find'
-+
-+interface ICompareBranchListItemProps {
-+  readonly branch: Branch
-+
-+  /** Specifies whether this item is currently selected */
-+  readonly isCurrentBranch: boolean
-+
-+  /** The characters in the branch name to highlight */
-+  readonly matches: IMatches
-+
-+  readonly aheadBehind: IAheadBehind | null
-+}
-+
-+export class CompareBranchListItem extends React.Component<
-+  ICompareBranchListItemProps,
-+  {}
-+> {
-+  public render() {
-+    const isCurrentBranch = this.props.isCurrentBranch
-+    const branch = this.props.branch
-+    const icon = isCurrentBranch ? OcticonSymbol.check : OcticonSymbol.gitBranch
-+
-+    const aheadBehind = this.props.aheadBehind
-+
-+    const aheadBehindElement = aheadBehind ? (
-+      <div className="branch-commit-counter">
-+        <span className="branch-commit-counter-item">
-+          {aheadBehind.behind}
-+          <Octicon className="icon" symbol={OcticonSymbol.arrowDown} />
-+        </span>
-+
-+        <span className="branch-commit-counter-item">
-+          {aheadBehind.ahead}
-+          <Octicon className="icon" symbol={OcticonSymbol.arrowUp} />
-+        </span>
-+      </div>
-+    ) : null
-+
-+    return (
-+      <div className="branches-list-item">
-+        <Octicon className="icon" symbol={icon} />
-+        <div className="name" title={branch.name}>
-+          <HighlightText
-+            text={branch.name}
-+            highlight={this.props.matches.title}
-+          />
-+        </div>
-+        {aheadBehindElement}
-+      </div>
-+    )
-+  }
-+}
-added in remote
-  their  100644 bcdf27db5507a5d1393fd75a4a3d177d41a3e81c app/src/ui/history/compare.tsx
-@@ -0,0 +1,576 @@
-+import * as React from 'react'
-+import { CSSTransitionGroup } from 'react-transition-group'
-+
-+import { IGitHubUser } from '../../lib/databases'
-+import { Commit } from '../../models/commit'
-+import {
-+  ComparisonView,
-+  ICompareState,
-+  CompareActionKind,
-+  ICompareBranch,
-+} from '../../lib/app-state'
-+import { CommitList } from './commit-list'
-+import { Repository } from '../../models/repository'
-+import { Branch } from '../../models/branch'
-+import { Dispatcher } from '../../lib/dispatcher'
-+import { ThrottledScheduler } from '../lib/throttled-scheduler'
-+import { BranchList } from '../branches'
-+import { TextBox } from '../lib/text-box'
-+import { IBranchListItem } from '../branches/group-branches'
-+import { TabBar } from '../tab-bar'
-+import { CompareBranchListItem } from './compare-branch-list-item'
-+import { FancyTextBox } from '../lib/fancy-text-box'
-+import { OcticonSymbol } from '../octicons'
-+import { SelectionSource } from '../lib/filter-list'
-+import { IMatches } from '../../lib/fuzzy-find'
-+import { Ref } from '../lib/ref'
-+import {
-+  NewCommitsBanner,
-+  DismissalReason,
-+} from '../notification/new-commits-banner'
-+import { enableNotificationOfBranchUpdates } from '../../lib/feature-flag'
-+import { MergeCallToAction } from './merge-call-to-action'
-+
-+interface ICompareSidebarProps {
-+  readonly repository: Repository
-+  readonly compareState: ICompareState
-+  readonly gitHubUsers: Map<string, IGitHubUser>
-+  readonly emoji: Map<string, string>
-+  readonly commitLookup: Map<string, Commit>
-+  readonly localCommitSHAs: ReadonlyArray<string>
-+  readonly dispatcher: Dispatcher
-+  readonly currentBranch: Branch | null
-+  readonly isDivergingBranchBannerVisible: boolean
-+  readonly onRevertCommit: (commit: Commit) => void
-+  readonly onViewCommitOnGitHub: (sha: string) => void
-+}
-+
-+interface ICompareSidebarState {
-+  /**
-+   * This branch should only be used when tracking interactions that the user is performing.
-+   *
-+   * For all other cases, use the prop
-+   */
-+  readonly focusedBranch: Branch | null
-+  readonly selectedCommit: Commit | null
-+
-+  /**
-+   * Flag that tracks whether the user interacted with one of the notification's
-+   * "call to action" buttons
-+   */
-+  readonly hasConsumedNotification: boolean
-+}
-+
-+/** If we're within this many rows from the bottom, load the next history batch. */
-+const CloseToBottomThreshold = 10
-+
-+export class CompareSidebar extends React.Component<
-+  ICompareSidebarProps,
-+  ICompareSidebarState
-+> {
-+  private textbox: TextBox | null = null
-+  private readonly loadChangedFilesScheduler = new ThrottledScheduler(200)
-+  private branchList: BranchList | null = null
-+  private loadingMoreCommitsPromise: Promise<void> | null = null
-+
-+  public constructor(props: ICompareSidebarProps) {
-+    super(props)
-+
-+    this.state = {
-+      focusedBranch: null,
-+      selectedCommit: null,
-+      hasConsumedNotification: false,
-+    }
-+  }
-+
-+  public componentWillReceiveProps(nextProps: ICompareSidebarProps) {
-+    const newFormState = nextProps.compareState.formState
-+    const oldFormState = this.props.compareState.formState
-+
-+    if (this.textbox !== null) {
-+      if (
-+        !this.props.compareState.showBranchList &&
-+        nextProps.compareState.showBranchList
-+      ) {
-+        // showBranchList changes from false -> true
-+        //  -> ensure the textbox has focus
-+        this.textbox.focus()
-+      } else if (
-+        this.props.compareState.showBranchList &&
-+        !nextProps.compareState.showBranchList
-+      ) {
-+        // showBranchList changes from true -> false
-+        //  -> ensure the textbox no longer has focus
-+        this.textbox.blur()
-+      }
-+    }
-+
-+    if (
-+      newFormState.kind !== oldFormState.kind &&
-+      newFormState.kind === ComparisonView.None
-+    ) {
-+      this.setState({
-+        focusedBranch: null,
-+      })
-+      return
-+    }
-+
-+    if (
-+      newFormState.kind !== ComparisonView.None &&
-+      oldFormState.kind !== ComparisonView.None
-+    ) {
-+      const oldBranch = oldFormState.comparisonBranch
-+      const newBranch = newFormState.comparisonBranch
-+
-+      if (oldBranch.name !== newBranch.name) {
-+        // ensure the focused branch is in sync with the chosen branch
-+        this.setState({
-+          focusedBranch: newBranch,
-+        })
-+      }
-+    }
-+  }
-+
-+  public componentWillMount() {
-+    this.props.dispatcher.initializeCompare(this.props.repository)
-+  }
-+
-+  public componentWillUnmount() {
-+    this.textbox = null
-+  }
-+
-+  public render() {
-+    const { allBranches, filterText, showBranchList } = this.props.compareState
-+    const placeholderText = getPlaceholderText(this.props.compareState)
-+    const DivergingBannerAnimationTimeout = 300
-+
-+    return (
-+      <div id="compare-view">
-+        <CSSTransitionGroup
-+          transitionName="diverge-banner"
-+          transitionAppear={true}
-+          transitionAppearTimeout={DivergingBannerAnimationTimeout}
-+          transitionEnterTimeout={DivergingBannerAnimationTimeout}
-+          transitionLeaveTimeout={DivergingBannerAnimationTimeout}
-+        >
-+          {this.renderNotificationBanner()}
-+        </CSSTransitionGroup>
-+
-+        <div className="compare-form">
-+          <FancyTextBox
-+            symbol={OcticonSymbol.gitBranch}
-+            type="search"
-+            placeholder={placeholderText}
-+            onFocus={this.onTextBoxFocused}
-+            value={filterText}
-+            disabled={allBranches.length === 0}
-+            onRef={this.onTextBoxRef}
-+            onValueChanged={this.onBranchFilterTextChanged}
-+            onKeyDown={this.onBranchFilterKeyDown}
-+            onSearchCleared={this.handleEscape}
-+          />
-+        </div>
-+
-+        {showBranchList ? this.renderFilterList() : this.renderCommits()}
-+      </div>
-+    )
-+  }
-+
-+  private onBranchesListRef = (branchList: BranchList | null) => {
-+    this.branchList = branchList
-+  }
-+
-+  private renderNotificationBanner() {
-+    if (!enableNotificationOfBranchUpdates()) {
-+      return null
-+    }
-+
-+    if (!this.props.isDivergingBranchBannerVisible) {
-+      return null
-+    }
-+
-+    const { inferredComparisonBranch } = this.props.compareState
-+
-+    return inferredComparisonBranch.branch !== null &&
-+      inferredComparisonBranch.aheadBehind !== null &&
-+      inferredComparisonBranch.aheadBehind.behind > 0 ? (
-+      <div className="diverge-banner-wrapper">
-+        <NewCommitsBanner
-+          dispatcher={this.props.dispatcher}
-+          repository={this.props.repository}
-+          commitsBehindBaseBranch={inferredComparisonBranch.aheadBehind.behind}
-+          baseBranch={inferredComparisonBranch.branch}
-+          onDismiss={this.onNotificationBannerDismissed}
-+        />
-+      </div>
-+    ) : null
-+  }
-+
-+  private renderCommits() {
-+    const formState = this.props.compareState.formState
-+    return (
-+      <div className="compare-commit-list">
-+        {formState.kind === ComparisonView.None
-+          ? this.renderCommitList()
-+          : this.renderTabBar(formState)}
-+      </div>
-+    )
-+  }
-+
-+  private viewHistoryForBranch = () => {
-+    this.props.dispatcher.executeCompare(this.props.repository, {
-+      kind: CompareActionKind.History,
-+    })
-+
-+    this.props.dispatcher.updateCompareForm(this.props.repository, {
-+      showBranchList: false,
-+    })
-+  }
-+
-+  private renderCommitList() {
-+    const { formState, commitSHAs } = this.props.compareState
-+    const selectedCommit = this.state.selectedCommit
-+
-+    let emptyListMessage: string | JSX.Element
-+    if (formState.kind === ComparisonView.None) {
-+      emptyListMessage = 'No history'
-+    } else {
-+      const currentlyComparedBranchName = formState.comparisonBranch.name
-+
-+      emptyListMessage =
-+        formState.kind === ComparisonView.Ahead ? (
-+          <p>
-+            The compared branch (<Ref>{currentlyComparedBranchName}</Ref>) is up
-+            to date with your branch
-+          </p>
-+        ) : (
-+          <p>
-+            Your branch is up to date with the compared branch (<Ref>
-+              {currentlyComparedBranchName}
-+            </Ref>)
-+          </p>
-+        )
-+    }
-+
-+    return (
-+      <CommitList
-+        gitHubRepository={this.props.repository.gitHubRepository}
-+        commitLookup={this.props.commitLookup}
-+        commitSHAs={commitSHAs}
-+        selectedSHA={selectedCommit !== null ? selectedCommit.sha : null}
-+        gitHubUsers={this.props.gitHubUsers}
-+        localCommitSHAs={this.props.localCommitSHAs}
-+        emoji={this.props.emoji}
-+        onViewCommitOnGitHub={this.props.onViewCommitOnGitHub}
-+        onRevertCommit={this.props.onRevertCommit}
-+        onCommitSelected={this.onCommitSelected}
-+        onScroll={this.onScroll}
-+        emptyListMessage={emptyListMessage}
-+      />
-+    )
-+  }
-+
-+  private renderActiveTab() {
-+    const formState = this.props.compareState.formState
-+    return (
-+      <div className="compare-commit-list">
-+        {this.renderCommitList()}
-+        {formState.kind === ComparisonView.Behind
-+          ? this.renderMergeCallToAction(formState)
-+          : null}
-+      </div>
-+    )
-+  }
-+
-+  private renderFilterList() {
-+    const {
-+      defaultBranch,
-+      allBranches,
-+      recentBranches,
-+      filterText,
-+    } = this.props.compareState
-+
-+    return (
-+      <BranchList
-+        ref={this.onBranchesListRef}
-+        defaultBranch={defaultBranch}
-+        currentBranch={this.props.currentBranch}
-+        allBranches={allBranches}
-+        recentBranches={recentBranches}
-+        filterText={filterText}
-+        textbox={this.textbox!}
-+        selectedBranch={this.state.focusedBranch}
-+        canCreateNewBranch={false}
-+        onSelectionChanged={this.onSelectionChanged}
-+        onItemClick={this.onBranchItemClicked}
-+        onFilterTextChanged={this.onBranchFilterTextChanged}
-+        renderBranch={this.renderCompareBranchListItem}
-+      />
-+    )
-+  }
-+
-+  private renderMergeCallToAction(formState: ICompareBranch) {
-+    if (this.props.currentBranch == null) {
-+      return null
-+    }
-+
-+    return (
-+      <MergeCallToAction
-+        repository={this.props.repository}
-+        dispatcher={this.props.dispatcher}
-+        currentBranch={this.props.currentBranch}
-+        formState={formState}
-+        onMerged={this.onMerge}
-+      />
-+    )
-+  }
-+
-+  private onTabClicked = (index: number) => {
-+    const formState = this.props.compareState.formState
-+
-+    if (formState.kind === ComparisonView.None) {
-+      return
-+    }
-+
-+    const mode = index === 0 ? ComparisonView.Behind : ComparisonView.Ahead
-+    const branch = formState.comparisonBranch
-+
-+    this.props.dispatcher.executeCompare(this.props.repository, {
-+      kind: CompareActionKind.Branch,
-+      branch,
-+      mode,
-+    })
-+  }
-+
-+  private renderTabBar(formState: ICompareBranch) {
-+    const selectedTab = formState.kind === ComparisonView.Behind ? 0 : 1
-+
-+    return (
-+      <div className="compare-content">
-+        <TabBar selectedIndex={selectedTab} onTabClicked={this.onTabClicked}>
-+          <span>{`Behind (${formState.aheadBehind.behind})`}</span>
-+          <span>{`Ahead (${formState.aheadBehind.ahead})`}</span>
-+        </TabBar>
-+        {this.renderActiveTab()}
-+      </div>
-+    )
-+  }
-+
-+  private renderCompareBranchListItem = (
-+    item: IBranchListItem,
-+    matches: IMatches
-+  ) => {
-+    const currentBranch = this.props.currentBranch
-+
-+    const currentBranchName = currentBranch != null ? currentBranch.name : null
-+    const branch = item.branch
-+
-+    const aheadBehind = currentBranch
-+      ? this.props.compareState.aheadBehindCache.get(
-+          currentBranch.tip.sha,
-+          branch.tip.sha
-+        )
-+      : null
-+
-+    return (
-+      <CompareBranchListItem
-+        branch={branch}
-+        isCurrentBranch={branch.name === currentBranchName}
-+        matches={matches}
-+        aheadBehind={aheadBehind}
-+      />
-+    )
-+  }
-+
-+  private onBranchFilterKeyDown = (
-+    event: React.KeyboardEvent<HTMLInputElement>
-+  ) => {
-+    const key = event.key
-+
-+    if (key === 'Enter') {
-+      if (this.props.compareState.filterText.length === 0) {
-+        this.handleEscape()
-+      } else {
-+        if (this.state.focusedBranch == null) {
-+          this.viewHistoryForBranch()
-+        } else {
-+          const branch = this.state.focusedBranch
-+
-+          this.props.dispatcher.executeCompare(this.props.repository, {
-+            kind: CompareActionKind.Branch,
-+            branch,
-+            mode: ComparisonView.Behind,
-+          })
-+
-+          this.props.dispatcher.updateCompareForm(this.props.repository, {
-+            filterText: branch.name,
-+          })
-+        }
-+
-+        if (this.textbox) {
-+          this.textbox.blur()
-+        }
-+      }
-+    } else if (key === 'Escape') {
-+      this.handleEscape()
-+    } else if (key === 'ArrowDown') {
-+      if (this.branchList !== null) {
-+        this.branchList.selectFirstItem(true)
-+      }
-+    }
-+  }
-+
-+  private handleEscape = () => {
-+    this.clearFilterState()
-+    if (this.textbox) {
-+      this.textbox.blur()
-+    }
-+  }
-+
-+  private onCommitSelected = (commit: Commit) => {
-+    this.props.dispatcher.changeHistoryCommitSelection(
-+      this.props.repository,
-+      commit.sha
-+    )
-+
-+    this.loadChangedFilesScheduler.queue(() => {
-+      this.props.dispatcher.loadChangedFilesForCurrentSelection(
-+        this.props.repository
-+      )
-+    })
-+
-+    this.setState({ selectedCommit: commit })
-+  }
-+
-+  private onScroll = (start: number, end: number) => {
-+    const compareState = this.props.compareState
-+    const formState = compareState.formState
-+
-+    if (formState.kind !== ComparisonView.None) {
-+      // as the app is currently comparing the current branch to some other
-+      // branch, everything needed should be loaded
-+      return
-+    }
-+
-+    const commits = compareState.commitSHAs
-+    if (commits.length - end <= CloseToBottomThreshold) {
-+      if (this.loadingMoreCommitsPromise != null) {
-+        // as this callback fires for any scroll event we need to guard
-+        // against re-entrant calls to loadNextHistoryBatch
-+        return
-+      }
-+
-+      this.loadingMoreCommitsPromise = this.props.dispatcher
-+        .loadNextHistoryBatch(this.props.repository)
-+        .then(() => {
-+          // deferring unsetting this flag to some time _after_ the commits
-+          // have been appended to prevent eagerly adding more commits due
-+          // to scroll events (which fire indiscriminately)
-+          window.setTimeout(() => {
-+            this.loadingMoreCommitsPromise = null
-+          }, 500)
-+        })
-+    }
-+  }
-+
-+  private onBranchFilterTextChanged = (filterText: string) => {
-+    if (filterText.length === 0) {
-+      this.setState({ focusedBranch: null })
-+    }
-+
-+    this.props.dispatcher.updateCompareForm(this.props.repository, {
-+      filterText,
-+    })
-+  }
-+
-+  private clearFilterState = () => {
-+    this.setState({
-+      focusedBranch: null,
-+    })
-+
-+    this.props.dispatcher.updateCompareForm(this.props.repository, {
-+      filterText: '',
-+    })
-+
-+    this.viewHistoryForBranch()
-+  }
-+
-+  private onBranchItemClicked = (branch: Branch) => {
-+    this.props.dispatcher.executeCompare(this.props.repository, {
-+      branch,
-+      kind: CompareActionKind.Branch,
-+      mode: ComparisonView.Behind,
-+    })
-+
-+    this.setState({
-+      focusedBranch: null,
-+    })
-+
-+    this.props.dispatcher.updateCompareForm(this.props.repository, {
-+      filterText: branch.name,
-+      showBranchList: false,
-+    })
-+  }
-+
-+  private onSelectionChanged = (
-+    branch: Branch | null,
-+    source: SelectionSource
-+  ) => {
-+    if (source.kind === 'mouseclick' && branch != null) {
-+      this.props.dispatcher.executeCompare(this.props.repository, {
-+        branch,
-+        kind: CompareActionKind.Branch,
-+        mode: ComparisonView.Behind,
-+      })
-+    }
-+
-+    this.setState({
-+      focusedBranch: branch,
-+    })
-+  }
-+
-+  private onTextBoxFocused = () => {
-+    this.props.dispatcher.updateCompareForm(this.props.repository, {
-+      showBranchList: true,
-+    })
-+  }
-+
-+  private onTextBoxRef = (textbox: TextBox) => {
-+    this.textbox = textbox
-+  }
-+
-+  private onNotificationBannerDismissed = (reason: DismissalReason) => {
-+    this.props.dispatcher.setDivergingBranchBannerVisibility(false)
-+    this.props.dispatcher.recordDivergingBranchBannerDismissal()
-+
-+    switch (reason) {
-+      case 'close':
-+        this.setState({ hasConsumedNotification: false })
-+        break
-+      case 'compare':
-+      case 'merge':
-+        this.setState({ hasConsumedNotification: true })
-+        break
-+    }
-+  }
-+
-+  private onMerge = () => {
-+    if (this.state.hasConsumedNotification) {
-+      this.props.dispatcher.recordDivergingBranchBannerInfluencedMerge()
-+    }
-+  }
-+}
-+
-+function getPlaceholderText(state: ICompareState) {
-+  const { allBranches, formState } = state
-+
-+  if (allBranches.length === 0) {
-+    return __DARWIN__ ? 'No Branches to Compare' : 'No branches to compare'
-+  } else if (formState.kind === ComparisonView.None) {
-+    return __DARWIN__
-+      ? 'Select Branch to Compare...'
-+      : 'Select branch to compare...'
-+  } else {
-+    return undefined
-+  }
-+}
-merged
-  result 100644 1089df377346334f2f773b466948b625f3c4cab3 app/src/ui/history/file-list.tsx
-  our    100644 458d1749d658b33d17f3dfc497271a59131f9345 app/src/ui/history/file-list.tsx
-@@ -1,18 +1,53 @@
- import * as React from 'react'
-+import * as Path from 'path'
-+import { pathExists } from 'fs-extra'
-+import { revealInFileManager } from '../../lib/app-shell'
-+
- import { FileChange, mapStatus, iconForStatus } from '../../models/status'
-+import { Repository } from '../../models/repository'
-+
- import { PathLabel } from '../lib/path-label'
--import { Octicon } from '../octicons'
-+import {
-+  isSafeFileExtension,
-+  DefaultEditorLabel,
-+  RevealInFileManagerLabel,
-+  OpenWithDefaultProgramLabel,
-+} from '../lib/context-menu'
- import { List } from '../lib/list'
-
-+import { Octicon } from '../octicons'
-+import { showContextualMenu } from '../main-process-proxy'
-+
- interface IFileListProps {
-   readonly files: ReadonlyArray<FileChange>
-   readonly selectedFile: FileChange | null
-   readonly onSelectedFileChanged: (file: FileChange) => void
-   readonly availableWidth: number
-+
-+  /**
-+   * Called to open a file with its default application
-+   * @param path The path of the file relative to the root of the repository
-+   */
-+  readonly onOpenItem: (path: string) => void
-+
-+  /** The name of the currently selected external editor */
-+  readonly externalEditorLabel?: string
-+
-+  /**
-+   * Called to open a file using the user's configured applications
-+   * @param path The path of the file relative to the root of the repository
-+   */
-+  readonly onOpenInExternalEditor: (path: string) => void
-+
-+  /**
-+   * Repository that we use to get the base path and build
-+   * full path for the file in commit to check for file existence
-+   */
-+  readonly repository: Repository
- }
-
- export class FileList extends React.Component<IFileListProps, {}> {
--  private onSelectionChanged = (row: number) => {
-+  private onSelectedRowChanged = (row: number) => {
-     const file = this.props.files[row]
-     this.props.onSelectedFileChanged(file)
-   }
-@@ -32,7 +67,7 @@
-       statusWidth
-
-     return (
--      <div className="file">
-+      <div className="file" onContextMenu={this.onContextMenu}>
-         <PathLabel
-           path={file.path}
-           oldPath={file.oldPath}
-@@ -60,10 +95,59 @@
-           rowRenderer={this.renderFile}
-           rowCount={this.props.files.length}
-           rowHeight={29}
--          selectedRow={this.rowForFile(this.props.selectedFile)}
--          onSelectionChanged={this.onSelectionChanged}
-+          selectedRows={[this.rowForFile(this.props.selectedFile)]}
-+          onSelectedRowChanged={this.onSelectedRowChanged}
-         />
-       </div>
-     )
-   }
-+
-+  private onContextMenu = async (event: React.MouseEvent<HTMLDivElement>) => {
-+    event.preventDefault()
-+
-+    if (this.props.selectedFile == null) {
-+      return
-+    }
-+
-+    const filePath = this.props.selectedFile.path
-+    const fullPath = Path.join(this.props.repository.path, filePath)
-+    const fileExistsOnDisk = await pathExists(fullPath)
-+    if (!fileExistsOnDisk) {
-+      showContextualMenu([
-+        {
-+          label: __DARWIN__
-+            ? 'File Does Not Exist on Disk'
-+            : 'File does not exist on disk',
-+          enabled: false,
-+        },
-+      ])
-+      return
-+    }
-+
-+    const extension = Path.extname(filePath)
-+
-+    const isSafeExtension = isSafeFileExtension(extension)
-+    const openInExternalEditor = this.props.externalEditorLabel
-+      ? `Open in ${this.props.externalEditorLabel}`
-+      : DefaultEditorLabel
-+
-+    const items = [
-+      {
-+        label: RevealInFileManagerLabel,
-+        action: () => revealInFileManager(this.props.repository, filePath),
-+        enabled: fileExistsOnDisk,
-+      },
-+      {
-+        label: openInExternalEditor,
-+        action: () => this.props.onOpenInExternalEditor(fullPath),
-+        enabled: isSafeExtension && fileExistsOnDisk,
-+      },
-+      {
-+        label: OpenWithDefaultProgramLabel,
-+        action: () => this.props.onOpenItem(filePath),
-+        enabled: isSafeExtension && fileExistsOnDisk,
-+      },
-+    ]
-+    showContextualMenu(items)
-+  }
- }
-removed in remote
-  base   100644 7d1e09aa5b1ea18dda23f94daadcfe54a2491b42 app/src/ui/history/history.tsx
-  our    100644 7d1e09aa5b1ea18dda23f94daadcfe54a2491b42 app/src/ui/history/history.tsx
-@@ -1,178 +0,0 @@
--import * as React from 'react'
--import { CommitSummary } from './commit-summary'
--import { Diff } from '../diff'
--import { FileList } from './file-list'
--import { Repository } from '../../models/repository'
--import { CommittedFileChange, FileChange } from '../../models/status'
--import { Commit } from '../../models/commit'
--import { Dispatcher } from '../../lib/dispatcher'
--import {
--  IHistoryState as IAppHistoryState,
--  ImageDiffType,
--} from '../../lib/app-state'
--import { encodePathAsUrl } from '../../lib/path'
--import { ThrottledScheduler } from '../lib/throttled-scheduler'
--import { IGitHubUser } from '../../lib/databases'
--import { Resizable } from '../resizable'
--
--interface IHistoryProps {
--  readonly repository: Repository
--  readonly dispatcher: Dispatcher
--  readonly history: IAppHistoryState
--  readonly emoji: Map<string, string>
--  readonly commits: Map<string, Commit>
--  readonly commitSummaryWidth: number
--  readonly gitHubUsers: Map<string, IGitHubUser>
--  readonly imageDiffType: ImageDiffType
--}
--
--interface IHistoryState {
--  readonly isExpanded: boolean
--}
--
--/** The History component. Contains the commit list, commit summary, and diff. */
--export class History extends React.Component<IHistoryProps, IHistoryState> {
--  private readonly loadChangedFilesScheduler = new ThrottledScheduler(200)
--
--  public constructor(props: IHistoryProps) {
--    super(props)
--
--    this.state = {
--      isExpanded: false,
--    }
--  }
--
--  private onFileSelected = (file: FileChange) => {
--    this.props.dispatcher.changeHistoryFileSelection(
--      this.props.repository,
--      file as CommittedFileChange
--    )
--  }
--
--  public componentWillUpdate(nextProps: IHistoryProps) {
--    // Reset isExpanded if we're switching commits.
--    if (nextProps.history.selection.sha !== this.props.history.selection.sha) {
--      if (this.state.isExpanded) {
--        this.setState({ isExpanded: false })
--      }
--    }
--  }
--
--  public componentWillUnmount() {
--    this.loadChangedFilesScheduler.clear()
--  }
--
--  private renderDiff(commit: Commit | null) {
--    const files = this.props.history.changedFiles
--    const file = this.props.history.selection.file
--    const diff = this.props.history.diff
--
--    if (!diff || !file) {
--      // don't show both 'empty' messages
--      const message = files.length === 0 ? '' : 'No file selected'
--
--      return (
--        <div className="panel blankslate" id="diff">
--          {message}
--        </div>
--      )
--    }
--
--    return (
--      <Diff
--        repository={this.props.repository}
--        imageDiffType={this.props.imageDiffType}
--        file={file}
--        diff={diff}
--        readOnly={true}
--        dispatcher={this.props.dispatcher}
--      />
--    )
--  }
--
--  private renderCommitSummary(commit: Commit) {
--    return (
--      <CommitSummary
--        commit={commit}
--        files={this.props.history.changedFiles}
--        emoji={this.props.emoji}
--        repository={this.props.repository}
--        gitHubUsers={this.props.gitHubUsers}
--        onExpandChanged={this.onExpandChanged}
--        isExpanded={this.state.isExpanded}
--      />
--    )
--  }
--
--  private onExpandChanged = (isExpanded: boolean) => {
--    this.setState({ isExpanded })
--  }
--
--  private onCommitSummaryReset = () => {
--    this.props.dispatcher.resetCommitSummaryWidth()
--  }
--
--  private onCommitSummaryResize = (width: number) => {
--    this.props.dispatcher.setCommitSummaryWidth(width)
--  }
--
--  private renderFileList() {
--    const files = this.props.history.changedFiles
--    if (files.length === 0) {
--      return <div className="fill-window">No files in commit</div>
--    }
--
--    // -1 for right hand side border
--    const availableWidth = this.props.commitSummaryWidth - 1
--
--    return (
--      <FileList
--        files={files}
--        onSelectedFileChanged={this.onFileSelected}
--        selectedFile={this.props.history.selection.file}
--        availableWidth={availableWidth}
--      />
--    )
--  }
--
--  public render() {
--    const sha = this.props.history.selection.sha
--    const commit = sha ? this.props.commits.get(sha) || null : null
--
--    if (!sha || !commit) {
--      return <NoCommitSelected />
--    }
--
--    const className = this.state.isExpanded ? 'expanded' : 'collapsed'
--
--    return (
--      <div id="history" className={className}>
--        {this.renderCommitSummary(commit)}
--        <div id="commit-details">
--          <Resizable
--            width={this.props.commitSummaryWidth}
--            onResize={this.onCommitSummaryResize}
--            onReset={this.onCommitSummaryReset}
--          >
--            {this.renderFileList()}
--          </Resizable>
--          {this.renderDiff(commit)}
--        </div>
--      </div>
--    )
--  }
--}
--
--function NoCommitSelected() {
--  const BlankSlateImage = encodePathAsUrl(
--    __dirname,
--    'static/empty-no-commit.svg'
--  )
--
--  return (
--    <div className="panel blankslate">
--      <img src={BlankSlateImage} className="blankslate-image" />
--      No commit selected
--    </div>
--  )
--}
-merged
-  result 100644 5314aa21a17e6eaad7f73ab8e92c99e6e83f2108 app/src/ui/history/index.ts
-  our    100644 caa18019759a791f9a4e2b42c02a348a0cf36a0d app/src/ui/history/index.ts
-@@ -1,2 +1,2 @@
--export { HistorySidebar } from './sidebar'
--export { History } from './history'
-+export { SelectedCommit } from './selected-commit'
-+export { CompareSidebar } from './compare'
-added in remote
-  their  100644 f43d04c4253b198fd579a2e189a03c4aa13ce472 app/src/ui/history/merge-call-to-action.tsx
-@@ -0,0 +1,87 @@
-+import * as React from 'react'
-+
-+import { CompareActionKind, ICompareBranch } from '../../lib/app-state'
-+import { Repository } from '../../models/repository'
-+import { Branch } from '../../models/branch'
-+import { Dispatcher } from '../../lib/dispatcher'
-+import { Button } from '../lib/button'
-+
-+interface IMergeCallToActionProps {
-+  readonly repository: Repository
-+  readonly dispatcher: Dispatcher
-+  readonly currentBranch: Branch
-+  readonly formState: ICompareBranch
-+
-+  /**
-+   * Callback to execute after a merge has been performed
-+   */
-+  readonly onMerged: () => void
-+}
-+
-+export class MergeCallToAction extends React.Component<
-+  IMergeCallToActionProps,
-+  {}
-+> {
-+  public render() {
-+    const count = this.props.formState.aheadBehind.behind
-+
-+    return (
-+      <div className="merge-cta">
-+        <Button
-+          type="submit"
-+          disabled={count <= 0}
-+          onClick={this.onMergeClicked}
-+        >
-+          Merge into <strong>{this.props.currentBranch.name}</strong>
-+        </Button>
-+
-+        {this.renderMergeDetails(
-+          this.props.formState,
-+          this.props.currentBranch
-+        )}
-+      </div>
-+    )
-+  }
-+
-+  private renderMergeDetails(formState: ICompareBranch, currentBranch: Branch) {
-+    const branch = formState.comparisonBranch
-+    const count = formState.aheadBehind.behind
-+
-+    if (count > 0) {
-+      const pluralized = count === 1 ? 'commit' : 'commits'
-+      return (
-+        <div className="merge-message">
-+          This will merge
-+          <strong>{` ${count} ${pluralized}`}</strong>
-+          {` `}from{` `}
-+          <strong>{branch.name}</strong>
-+          {` `}into{` `}
-+          <strong>{currentBranch.name}</strong>
-+        </div>
-+      )
-+    }
-+
-+    return null
-+  }
-+
-+  private onMergeClicked = async (event: React.MouseEvent<any>) => {
-+    const formState = this.props.formState
-+
-+    this.props.dispatcher.recordCompareInitiatedMerge()
-+
-+    await this.props.dispatcher.mergeBranch(
-+      this.props.repository,
-+      formState.comparisonBranch.name
-+    )
-+
-+    this.props.dispatcher.executeCompare(this.props.repository, {
-+      kind: CompareActionKind.History,
-+    })
-+
-+    this.props.dispatcher.updateCompareForm(this.props.repository, {
-+      showBranchList: false,
-+      filterText: '',
-+    })
-+    this.props.onMerged()
-+  }
-+}
-added in remote
-  their  100644 70a7fdc0fff924c282d71feffe17b638f50a18fd app/src/ui/history/selected-commit.tsx
-@@ -0,0 +1,211 @@
-+import * as React from 'react'
-+import * as Path from 'path'
-+
-+import { CommitSummary } from './commit-summary'
-+import { Diff } from '../diff'
-+import { FileList } from './file-list'
-+import { Repository } from '../../models/repository'
-+import { CommittedFileChange, FileChange } from '../../models/status'
-+import { Commit } from '../../models/commit'
-+import { Dispatcher } from '../../lib/dispatcher'
-+import { ImageDiffType } from '../../lib/app-state'
-+import { encodePathAsUrl } from '../../lib/path'
-+import { ThrottledScheduler } from '../lib/throttled-scheduler'
-+import { IGitHubUser } from '../../lib/databases'
-+import { Resizable } from '../resizable'
-+import { openFile } from '../../lib/open-file'
-+import { IDiff } from '../../models/diff'
-+
-+interface ISelectedCommitProps {
-+  readonly repository: Repository
-+  readonly dispatcher: Dispatcher
-+  readonly emoji: Map<string, string>
-+  readonly selectedCommit: Commit | null
-+  readonly changedFiles: ReadonlyArray<CommittedFileChange>
-+  readonly selectedFile: CommittedFileChange | null
-+  readonly currentDiff: IDiff | null
-+  readonly commitSummaryWidth: number
-+  readonly gitHubUsers: Map<string, IGitHubUser>
-+  readonly selectedDiffType: ImageDiffType
-+  /** The name of the currently selected external editor */
-+  readonly externalEditorLabel?: string
-+
-+  /**
-+   * Called to open a file using the user's configured applications
-+   * @param path The path of the file relative to the root of the repository
-+   */
-+  readonly onOpenInExternalEditor: (path: string) => void
-+}
-+
-+interface ISelectedCommitState {
-+  readonly isExpanded: boolean
-+}
-+
-+/** The History component. Contains the commit list, commit summary, and diff. */
-+export class SelectedCommit extends React.Component<
-+  ISelectedCommitProps,
-+  ISelectedCommitState
-+> {
-+  private readonly loadChangedFilesScheduler = new ThrottledScheduler(200)
-+
-+  public constructor(props: ISelectedCommitProps) {
-+    super(props)
-+
-+    this.state = {
-+      isExpanded: false,
-+    }
-+  }
-+
-+  private onFileSelected = (file: FileChange) => {
-+    this.props.dispatcher.changeHistoryFileSelection(
-+      this.props.repository,
-+      file as CommittedFileChange
-+    )
-+  }
-+
-+  public componentWillUpdate(nextProps: ISelectedCommitProps) {
-+    // reset isExpanded if we're switching commits.
-+    const currentValue = this.props.selectedCommit
-+      ? this.props.selectedCommit.sha
-+      : undefined
-+    const nextValue = nextProps.selectedCommit
-+      ? nextProps.selectedCommit.sha
-+      : undefined
-+
-+    if ((currentValue || nextValue) && currentValue !== nextValue) {
-+      if (this.state.isExpanded) {
-+        this.setState({ isExpanded: false })
-+      }
-+    }
-+  }
-+
-+  public componentWillUnmount() {
-+    this.loadChangedFilesScheduler.clear()
-+  }
-+
-+  private renderDiff() {
-+    const file = this.props.selectedFile
-+    const diff = this.props.currentDiff
-+
-+    if (file == null || diff == null) {
-+      // don't show both 'empty' messages
-+      const message =
-+        this.props.changedFiles.length === 0 ? '' : 'No file selected'
-+
-+      return (
-+        <div className="panel blankslate" id="diff">
-+          {message}
-+        </div>
-+      )
-+    }
-+
-+    return (
-+      <Diff
-+        repository={this.props.repository}
-+        imageDiffType={this.props.selectedDiffType}
-+        file={file}
-+        diff={diff}
-+        readOnly={true}
-+        dispatcher={this.props.dispatcher}
-+      />
-+    )
-+  }
-+
-+  private renderCommitSummary(commit: Commit) {
-+    return (
-+      <CommitSummary
-+        commit={commit}
-+        files={this.props.changedFiles}
-+        emoji={this.props.emoji}
-+        repository={this.props.repository}
-+        gitHubUsers={this.props.gitHubUsers}
-+        onExpandChanged={this.onExpandChanged}
-+        isExpanded={this.state.isExpanded}
-+      />
-+    )
-+  }
-+
-+  private onExpandChanged = (isExpanded: boolean) => {
-+    this.setState({ isExpanded })
-+  }
-+
-+  private onCommitSummaryReset = () => {
-+    this.props.dispatcher.resetCommitSummaryWidth()
-+  }
-+
-+  private onCommitSummaryResize = (width: number) => {
-+    this.props.dispatcher.setCommitSummaryWidth(width)
-+  }
-+
-+  private renderFileList() {
-+    const files = this.props.changedFiles
-+    if (files.length === 0) {
-+      return <div className="fill-window">No files in commit</div>
-+    }
-+
-+    // -1 for right hand side border
-+    const availableWidth = this.props.commitSummaryWidth - 1
-+
-+    return (
-+      <FileList
-+        files={files}
-+        onSelectedFileChanged={this.onFileSelected}
-+        selectedFile={this.props.selectedFile}
-+        availableWidth={availableWidth}
-+        onOpenItem={this.onOpenItem}
-+        externalEditorLabel={this.props.externalEditorLabel}
-+        onOpenInExternalEditor={this.props.onOpenInExternalEditor}
-+        repository={this.props.repository}
-+      />
-+    )
-+  }
-+
-+  /**
-+   * Open file with default application.
-+   * @param path The path of the file relative to the root of the repository
-+   */
-+  private onOpenItem = (path: string) => {
-+    const fullPath = Path.join(this.props.repository.path, path)
-+    openFile(fullPath, this.props.dispatcher)
-+  }
-+
-+  public render() {
-+    const commit = this.props.selectedCommit
-+
-+    if (commit == null) {
-+      return <NoCommitSelected />
-+    }
-+
-+    const className = this.state.isExpanded ? 'expanded' : 'collapsed'
-+
-+    return (
-+      <div id="history" className={className}>
-+        {this.renderCommitSummary(commit)}
-+        <div id="commit-details">
-+          <Resizable
-+            width={this.props.commitSummaryWidth}
-+            onResize={this.onCommitSummaryResize}
-+            onReset={this.onCommitSummaryReset}
-+          >
-+            {this.renderFileList()}
-+          </Resizable>
-+          {this.renderDiff()}
-+        </div>
-+      </div>
-+    )
-+  }
-+}
-+
-+function NoCommitSelected() {
-+  const BlankSlateImage = encodePathAsUrl(
-+    __dirname,
-+    'static/empty-no-commit.svg'
-+  )
-+
-+  return (
-+    <div className="panel blankslate">
-+      <img src={BlankSlateImage} className="blankslate-image" />
-+      No commit selected
-+    </div>
-+  )
-+}
-removed in remote
-  base   100644 5c5a20826435e372f8786d01a203be39bc2046cb app/src/ui/history/sidebar.tsx
-  our    100644 5c5a20826435e372f8786d01a203be39bc2046cb app/src/ui/history/sidebar.tsx
-@@ -1,70 +0,0 @@
--import * as React from 'react'
--import { CommitList } from './commit-list'
--import { Repository } from '../../models/repository'
--import { Commit } from '../../models/commit'
--import { Dispatcher } from '../../lib/dispatcher'
--import { IGitHubUser } from '../../lib/databases'
--import { IHistoryState } from '../../lib/app-state'
--import { ThrottledScheduler } from '../lib/throttled-scheduler'
--
--/** If we're within this many rows from the bottom, load the next history batch. */
--const CloseToBottomThreshold = 10
--
--interface IHistorySidebarProps {
--  readonly repository: Repository
--  readonly dispatcher: Dispatcher
--  readonly history: IHistoryState
--  readonly gitHubUsers: Map<string, IGitHubUser>
--  readonly emoji: Map<string, string>
--  readonly commitLookup: Map<string, Commit>
--  readonly localCommitSHAs: ReadonlyArray<string>
--  readonly onRevertCommit: (commit: Commit) => void
--  readonly onViewCommitOnGitHub: (sha: string) => void
--}
--
--/** The History component. Contains the commit list, commit summary, and diff. */
--export class HistorySidebar extends React.Component<IHistorySidebarProps, {}> {
--  private readonly loadChangedFilesScheduler = new ThrottledScheduler(200)
--
--  private onCommitSelected = (commit: Commit) => {
--    this.props.dispatcher.changeHistoryCommitSelection(
--      this.props.repository,
--      commit.sha
--    )
--
--    this.loadChangedFilesScheduler.queue(() => {
--      this.props.dispatcher.loadChangedFilesForCurrentSelection(
--        this.props.repository
--      )
--    })
--  }
--
--  private onScroll = (start: number, end: number) => {
--    const history = this.props.history.history
--    if (history.length - end <= CloseToBottomThreshold) {
--      this.props.dispatcher.loadNextHistoryBatch(this.props.repository)
--    }
--  }
--
--  public componentWillUnmount() {
--    this.loadChangedFilesScheduler.clear()
--  }
--
--  public render() {
--    return (
--      <CommitList
--        gitHubRepository={this.props.repository.gitHubRepository}
--        commitLookup={this.props.commitLookup}
--        commits={this.props.history.history}
--        selectedSHA={this.props.history.selection.sha}
--        onCommitSelected={this.onCommitSelected}
--        onScroll={this.onScroll}
--        gitHubUsers={this.props.gitHubUsers}
--        emoji={this.props.emoji}
--        localCommitSHAs={this.props.localCommitSHAs}
--        onRevertCommit={this.props.onRevertCommit}
--        onViewCommitOnGitHub={this.props.onViewCommitOnGitHub}
--      />
--    )
--  }
--}
-merged
-  result 100644 e09719d3d34c3169bd68c26a84f6b7040c4d34a1 app/src/ui/index.tsx
-  our    100644 68dedd34f265a41733b16e76f0ce3b07e05f865e app/src/ui/index.tsx
-@@ -12,6 +12,7 @@
-   gitAuthenticationErrorHandler,
-   externalEditorErrorHandler,
-   openShellErrorHandler,
-+  mergeConflictHandler,
-   lfsAttributeMismatchHandler,
-   defaultErrorHandler,
-   missingRepositoryHandler,
-@@ -138,6 +139,7 @@
- dispatcher.registerErrorHandler(upstreamAlreadyExistsHandler)
- dispatcher.registerErrorHandler(externalEditorErrorHandler)
- dispatcher.registerErrorHandler(openShellErrorHandler)
-+dispatcher.registerErrorHandler(mergeConflictHandler)
- dispatcher.registerErrorHandler(lfsAttributeMismatchHandler)
- dispatcher.registerErrorHandler(gitAuthenticationErrorHandler)
- dispatcher.registerErrorHandler(pushNeedsPullHandler)
-added in remote
-  their  100644 ea7e335764dce50a5697270ad74ac61d4df250d3 app/src/ui/lib/application-theme.ts
-@@ -0,0 +1,56 @@
-+import { assertNever } from '../../lib/fatal-error'
-+
-+/**
-+ * A set of the user-selectable appearances (aka themes)
-+ */
-+export enum ApplicationTheme {
-+  Light,
-+  Dark,
-+}
-+
-+/**
-+ * Gets the friendly name of an application theme for use
-+ * in persisting to storage and/or calculating the required
-+ * body class name to set in order to apply the theme.
-+ */
-+export function getThemeName(theme: ApplicationTheme): string {
-+  switch (theme) {
-+    case ApplicationTheme.Light:
-+      return 'light'
-+    case ApplicationTheme.Dark:
-+      return 'dark'
-+    default:
-+      return assertNever(theme, `Unknown theme ${theme}`)
-+  }
-+}
-+
-+// The key under which the currently selected theme is persisted
-+// in localStorage.
-+const applicationThemeKey = 'theme'
-+
-+/**
-+ * Load the currently selected theme from the persistent
-+ * store (localStorage). If no theme is selected the default
-+ * theme will be returned.
-+ */
-+export function getPersistedTheme(): ApplicationTheme {
-+  return localStorage.getItem(applicationThemeKey) === 'dark'
-+    ? ApplicationTheme.Dark
-+    : ApplicationTheme.Light
-+}
-+
-+/**
-+ * Load the name of the currently selected theme from the persistent
-+ * store (localStorage). If no theme is selected the default
-+ * theme name will be returned.
-+ */
-+export function getPersistedThemeName(): string {
-+  return getThemeName(getPersistedTheme())
-+}
-+
-+/**
-+ * Store the given theme in the persistent store (localStorage).
-+ */
-+export function setPersistedTheme(theme: ApplicationTheme) {
-+  localStorage.setItem(applicationThemeKey, getThemeName(theme))
-+}
-merged
-  result 100644 fc57454845110cf3f68a914d768fbd7c0fcb7334 app/src/ui/lib/author-input.tsx
-  our    100644 ce2ac281f54bee2dd43287b02559765a97896d98 app/src/ui/lib/author-input.tsx
-@@ -174,17 +174,6 @@
-   return scanWhile(doc, start, (doc, pos) => !predicate(doc, pos), iter)
- }
-
--/**
-- * Given a cursor position, expand it into a range covering as
-- * long of an autocompletable string as possible.
-- */
--function getHintRangeFromCursor(doc: Doc, cursor: Position) {
--  return {
--    from: scanUntil(doc, cursor, isMarkOrWhitespace, prevPosition),
--    to: scanUntil(doc, cursor, isMarkOrWhitespace, nextPosition),
--  }
--}
--
- function appendTextMarker(
-   cm: Editor,
-   text: string,
-@@ -635,7 +624,10 @@
-     const doc = cm.getDoc()
-     const cursor = doc.getCursor() as Readonly<Position>
-
--    const { from, to } = getHintRangeFromCursor(doc, cursor)
-+    // expand the current cursor position into a range covering as
-+    // long of an autocompletable string as possible.
-+    const from = scanUntil(doc, cursor, isMarkOrWhitespace, prevPosition)
-+    const to = scanUntil(doc, cursor, isMarkOrWhitespace, nextPosition)
-
-     const word = doc.getRange(from, to)
-
-merged
-  result 100644 e67fec4d040e5e4975cb0ae8992ec28f6683df0e app/src/ui/lib/branch-name-warnings.tsx
-  our    100644 f5d37c46294aebe893fe8c432c70b78e9297a20b app/src/ui/lib/branch-name-warnings.tsx
-@@ -1,4 +1,5 @@
- import * as React from 'react'
-+import { Branch } from '../../models/branch'
-
- import { Row } from './row'
- import { Octicon, OcticonSymbol } from '../octicons'
-@@ -30,3 +31,18 @@
-     return null
-   }
- }
-+export function renderBranchHasRemoteWarning(branch: Branch) {
-+  if (branch.upstream != null) {
-+    return (
-+      <Row className="warning-helper-text">
-+        <Octicon symbol={OcticonSymbol.alert} />
-+        <p>
-+          This branch is tracking <Ref>{branch.upstream}</Ref> and renaming this
-+          branch will not change the branch name on the remote.
-+        </p>
-+      </Row>
-+    )
-+  } else {
-+    return null
-+  }
-+}
-added in remote
-  their  100644 3700c8d5f94db7df3f64d2b73d4da9ae0dcad379 app/src/ui/lib/bytes.ts
-@@ -0,0 +1,27 @@
-+/**
-+ * Number sign display mode
-+ */
-+export const enum Sign {
-+  Normal,
-+  Forced,
-+}
-+
-+/**
-+ * Display bytes in human readable format like:
-+ *    23GB
-+ *   -43B
-+ * It's also possible to force sign in order to get the
-+ * plus sign in case of positive numbers like:
-+ *   +23GB
-+ *   -43B
-+ */
-+export const formatBytes = (bytes: number, signType: Sign = Sign.Normal) => {
-+  if (!Number.isFinite(bytes)) {
-+    return 'Unknown'
-+  }
-+  const sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB']
-+  const sizeIndex = Math.floor(Math.log(Math.abs(bytes)) / Math.log(1024))
-+  const sign = signType === Sign.Forced && bytes > 0 ? '+' : ''
-+  const value = Math.round(bytes / Math.pow(1024, sizeIndex))
-+  return `${sign}${value}${sizes[sizeIndex]}`
-+}
-added in remote
-  their  100644 8e64852c77aab8327ec82aee0e7504fd934abe7b app/src/ui/lib/context-menu.ts
-@@ -0,0 +1,21 @@
-+const RestrictedFileExtensions = ['.cmd', '.exe', '.bat', '.sh']
-+export const DefaultEditorLabel = __DARWIN__
-+  ? 'Open in External Editor'
-+  : 'Open in external editor'
-+
-+export const RevealInFileManagerLabel = __DARWIN__
-+  ? 'Reveal in Finder'
-+  : __WIN32__
-+    ? 'Show in Explorer'
-+    : 'Show in your File Manager'
-+
-+export const OpenWithDefaultProgramLabel = __DARWIN__
-+  ? 'Open with Default Program'
-+  : 'Open with default program'
-+
-+export function isSafeFileExtension(extension: string): boolean {
-+  if (__WIN32__) {
-+    return RestrictedFileExtensions.indexOf(extension.toLowerCase()) === -1
-+  }
-+  return true
-+}
-added in remote
-  their  100644 7e0e709f0e2c042f8e122480dc6f4a05460633d4 app/src/ui/lib/fancy-text-box.tsx
-@@ -0,0 +1,73 @@
-+import * as React from 'react'
-+import { Octicon, OcticonSymbol } from '../octicons'
-+import { TextBox, ITextBoxProps } from './text-box'
-+import * as classNames from 'classnames'
-+
-+interface IFancyTextBoxProps extends ITextBoxProps {
-+  /** Icon to render */
-+  readonly symbol: OcticonSymbol
-+
-+  /** Callback used to get a reference to internal TextBox */
-+  readonly onRef: (textbox: TextBox) => void
-+}
-+
-+interface IFancyTextBoxState {
-+  readonly isFocused: boolean
-+}
-+
-+export class FancyTextBox extends React.Component<
-+  IFancyTextBoxProps,
-+  IFancyTextBoxState
-+> {
-+  public constructor(props: IFancyTextBoxProps) {
-+    super(props)
-+
-+    this.state = { isFocused: false }
-+  }
-+
-+  public render() {
-+    const componentCSS = classNames(
-+      'fancy-text-box-component',
-+      this.props.className,
-+      { disabled: this.props.disabled },
-+      { focused: this.state.isFocused }
-+    )
-+    const octiconCSS = classNames('fancy-octicon')
-+
-+    return (
-+      <div className={componentCSS}>
-+        <Octicon className={octiconCSS} symbol={this.props.symbol} />
-+        <TextBox
-+          value={this.props.value}
-+          onFocus={this.onFocus}
-+          onBlur={this.onBlur}
-+          autoFocus={this.props.autoFocus}
-+          disabled={this.props.disabled}
-+          type={this.props.type}
-+          placeholder={this.props.placeholder}
-+          onKeyDown={this.props.onKeyDown}
-+          onValueChanged={this.props.onValueChanged}
-+          onSearchCleared={this.props.onSearchCleared}
-+          tabIndex={this.props.tabIndex}
-+          ref={this.props.onRef}
-+        />
-+      </div>
-+    )
-+  }
-+
-+  private onFocus = () => {
-+    if (this.props.onFocus !== undefined) {
-+      this.props.onFocus()
-+    }
-+
-+    this.setState({ isFocused: true })
-+  }
-+
-+  private onBlur = () => {
-+    if (this.props.onBlur !== undefined) {
-+      this.props.onBlur()
-+    }
-+
-+    this.setState({ isFocused: false })
-+  }
-+}
-merged
-  result 100644 c845440dc0449aaf6b81f86a7a77eb0d3d8d1a8f app/src/ui/lib/filter-list.tsx
-  our    100644 b9bb01a8b42988979f70713fba1d5035438fda4d app/src/ui/lib/filter-list.tsx
-@@ -1,16 +1,20 @@
- import * as React from 'react'
- import * as classnames from 'classnames'
-
--import { List, SelectionSource as ListSelectionSource } from '../lib/list'
-+import {
-+  List,
-+  SelectionSource as ListSelectionSource,
-+  findNextSelectableRow,
-+} from '../lib/list'
- import { TextBox } from '../lib/text-box'
- import { Row } from '../lib/row'
-
--import { match, IMatch } from '../../lib/fuzzy-find'
-+import { match, IMatch, IMatches } from '../../lib/fuzzy-find'
-
- /** An item in the filter list. */
- export interface IFilterListItem {
-   /** The text which represents the item. This is used for filtering. */
--  readonly text: string
-+  readonly text: ReadonlyArray<string>
-
-   /** A unique identifier for the item. */
-   readonly id: string
-@@ -34,7 +38,7 @@
-   readonly kind: 'item'
-   readonly item: T
-   /** Array of indexes in `item.text` that should be highlighted */
--  readonly matches: ReadonlyArray<number>
-+  readonly matches: IMatches
- }
-
- /**
-@@ -59,10 +63,7 @@
-   readonly selectedItem: T | null
-
-   /** Called to render each visible item. */
--  readonly renderItem: (
--    item: T,
--    matches: ReadonlyArray<number>
--  ) => JSX.Element | null
-+  readonly renderItem: (item: T, matches: IMatches) => JSX.Element | null
-
-   /** Called to render header for the group with the given identifier. */
-   readonly renderGroupHeader?: (identifier: string) => JSX.Element | null
-@@ -117,6 +118,14 @@
-
-   /** Called when there are no items to render.  */
-   readonly renderNoItems?: () => JSX.Element | null
-+
-+  /**
-+   * A reference to a TextBox that will be used to control this component.
-+   *
-+   * See https://github.com/desktop/desktop/issues/4317 for refactoring work to
-+   * make this more composable which should make this unnecessary.
-+   */
-+  readonly filterTextBox?: TextBox
- }
-
- interface IFilterListState<T extends IFilterListItem> {
-@@ -151,6 +160,12 @@
-     this.state = createStateUpdate(props)
-   }
-
-+  public componentWillMount() {
-+    if (this.props.filterTextBox !== undefined) {
-+      this.filterTextBox = this.props.filterTextBox
-+    }
-+  }
-+
-   public componentWillReceiveProps(nextProps: IFilterListProps<T>) {
-     this.setState(createStateUpdate(nextProps))
-   }
-@@ -189,29 +204,34 @@
-   }
-
-   public componentDidMount() {
--    if (this.filterTextBox != null) {
-+    if (this.filterTextBox !== null) {
-       this.filterTextBox.selectAll()
-     }
-   }
-
-+  public renderTextBox() {
-+    return (
-+      <TextBox
-+        ref={this.onTextBoxRef}
-+        type="search"
-+        autoFocus={true}
-+        placeholder="Filter"
-+        className="filter-list-filter-field"
-+        onValueChanged={this.onFilterValueChanged}
-+        onKeyDown={this.onKeyDown}
-+        value={this.props.filterText}
-+        disabled={this.props.disabled}
-+      />
-+    )
-+  }
-+
-   public render() {
-     return (
-       <div className={classnames('filter-list', this.props.className)}>
-         {this.props.renderPreList ? this.props.renderPreList() : null}
-
-         <Row className="filter-field-row">
--          <TextBox
--            ref={this.onTextBoxRef}
--            type="search"
--            autoFocus={true}
--            placeholder="Filter"
--            className="filter-list-filter-field"
--            onValueChanged={this.onFilterValueChanged}
--            onKeyDown={this.onKeyDown}
--            value={this.props.filterText}
--            disabled={this.props.disabled}
--          />
--
-+          {this.props.filterTextBox === undefined ? this.renderTextBox() : null}
-           {this.props.renderPostFilter ? this.props.renderPostFilter() : null}
-         </Row>
-
-@@ -220,6 +240,29 @@
-     )
-   }
-
-+  public selectFirstItem(focus: boolean = false) {
-+    if (this.list === null) {
-+      return
-+    }
-+
-+    const next = findNextSelectableRow(
-+      this.state.rows.length,
-+      {
-+        direction: 'down',
-+        row: -1,
-+      },
-+      this.canSelectRow
-+    )
-+
-+    if (next !== null) {
-+      this.setState({ selectedRow: next }, () => {
-+        if (focus && this.list !== null) {
-+          this.list.focus()
-+        }
-+      })
-+    }
-+  }
-+
-   private renderContent() {
-     if (this.state.rows.length === 0 && this.props.renderNoItems) {
-       return this.props.renderNoItems()
-@@ -230,8 +273,8 @@
-           rowCount={this.state.rows.length}
-           rowRenderer={this.renderRow}
-           rowHeight={this.props.rowHeight}
--          selectedRow={this.state.selectedRow}
--          onSelectionChanged={this.onSelectionChanged}
-+          selectedRows={[this.state.selectedRow]}
-+          onSelectedRowChanged={this.onSelectedRowChanged}
-           onRowClick={this.onRowClick}
-           onRowKeyDown={this.onRowKeyDown}
-           canSelectRow={this.canSelectRow}
-@@ -269,7 +312,7 @@
-     }
-   }
-
--  private onSelectionChanged = (index: number, source: SelectionSource) => {
-+  private onSelectedRowChanged = (index: number, source: SelectionSource) => {
-     this.setState({ selectedRow: index })
-
-     if (this.props.onSelectionChanged) {
-@@ -305,8 +348,19 @@
-       return
-     }
-
--    const firstSelectableRow = list.nextSelectableRow('down', -1)
--    const lastSelectableRow = list.nextSelectableRow('up', 0)
-+    const rowCount = this.state.rows.length
-+
-+    const firstSelectableRow = findNextSelectableRow(
-+      rowCount,
-+      { direction: 'down', row: -1 },
-+      this.canSelectRow
-+    )
-+    const lastSelectableRow = findNextSelectableRow(
-+      rowCount,
-+      { direction: 'up', row: 0 },
-+      this.canSelectRow
-+    )
-+
-     let shouldFocus = false
-
-     if (event.key === 'ArrowUp' && row === firstSelectableRow) {
-@@ -341,9 +395,15 @@
-       return
-     }
-
-+    const rowCount = this.state.rows.length
-+
-     if (key === 'ArrowDown') {
--      if (this.state.rows.length > 0) {
--        const selectedRow = list.nextSelectableRow('down', -1)
-+      if (rowCount > 0) {
-+        const selectedRow = findNextSelectableRow(
-+          rowCount,
-+          { direction: 'down', row: -1 },
-+          this.canSelectRow
-+        )
-         if (selectedRow != null) {
-           this.setState({ selectedRow }, () => {
-             list.focus()
-@@ -353,8 +413,12 @@
-
-       event.preventDefault()
-     } else if (key === 'ArrowUp') {
--      if (this.state.rows.length > 0) {
--        const selectedRow = list.nextSelectableRow('up', 0)
-+      if (rowCount > 0) {
-+        const selectedRow = findNextSelectableRow(
-+          rowCount,
-+          { direction: 'up', row: 0 },
-+          this.canSelectRow
-+        )
-         if (selectedRow != null) {
-           this.setState({ selectedRow }, () => {
-             list.focus()
-@@ -365,7 +429,7 @@
-       event.preventDefault()
-     } else if (key === 'Enter') {
-       // no repositories currently displayed, bail out
--      if (!this.state.rows.length) {
-+      if (rowCount === 0) {
-         return event.preventDefault()
-       }
-
-@@ -375,15 +439,25 @@
-         return event.preventDefault()
-       }
-
--      const row = list.nextSelectableRow('down', -1)
-+      const row = findNextSelectableRow(
-+        rowCount,
-+        { direction: 'down', row: -1 },
-+        this.canSelectRow
-+      )
-
--      if (row) {
-+      if (row != null) {
-         this.onRowClick(row)
-       }
-     }
-   }
- }
-
-+export function getText<T extends IFilterListItem>(
-+  item: T
-+): ReadonlyArray<string> {
-+  return item['text']
-+}
-+
- function createStateUpdate<T extends IFilterListItem>(
-   props: IFilterListProps<T>
- ) {
-@@ -392,8 +466,12 @@
-
-   for (const group of props.groups) {
-     const items: ReadonlyArray<IMatch<T>> = filter
--      ? match(filter, group.items, 'text')
--      : group.items.map(item => ({ score: 1, matches: [], item }))
-+      ? match(filter, group.items, getText)
-+      : group.items.map(item => ({
-+          score: 1,
-+          matches: { title: [], subtitle: [] },
-+          item,
-+        }))
-
-     if (!items.length) {
-       continue
-merged
-  result 100644 709940e3ff06be4683e739ccf2696ae16823aaa8 app/src/ui/lib/focus-container.tsx
-  our    100644 8b8d3c828c4c092d1c07ade684131afd70e763a0 app/src/ui/lib/focus-container.tsx
-@@ -4,6 +4,10 @@
- interface IFocusContainerProps {
-   readonly className?: string
-   readonly onClick?: (event: React.MouseEvent<HTMLDivElement>) => void
-+  readonly onKeyDown?: (event: React.KeyboardEvent<HTMLDivElement>) => void
-+
-+  /** Callback used when focus is within container */
-+  readonly onFocusWithinChanged?: (focusWithin: boolean) => void
- }
-
- interface IFocusContainerState {
-@@ -26,20 +30,43 @@
-   IFocusContainerState
- > {
-   private wrapperRef: HTMLDivElement | null = null
-+  private focusWithinChangedTimeoutId: number | null = null
-
-   public constructor(props: IFocusContainerProps) {
-     super(props)
-     this.state = { focusWithin: false }
-   }
-
-+  /**
-+   * Update the focus state of the container, aborting any in-flight animation
-+   *
-+   * @param focusWithin the new focus state of the control
-+   */
-+  private onFocusWithinChanged(focusWithin: boolean) {
-+    this.setState({ focusWithin })
-+
-+    if (this.focusWithinChangedTimeoutId !== null) {
-+      cancelAnimationFrame(this.focusWithinChangedTimeoutId)
-+      this.focusWithinChangedTimeoutId = null
-+    }
-+
-+    this.focusWithinChangedTimeoutId = requestAnimationFrame(() => {
-+      if (this.props.onFocusWithinChanged) {
-+        this.props.onFocusWithinChanged(focusWithin)
-+      }
-+
-+      this.focusWithinChangedTimeoutId = null
-+    })
-+  }
-+
-   private onWrapperRef = (elem: HTMLDivElement) => {
-     if (elem) {
-       elem.addEventListener('focusin', () => {
--        this.setState({ focusWithin: true })
-+        this.onFocusWithinChanged(true)
-       })
-
-       elem.addEventListener('focusout', () => {
--        this.setState({ focusWithin: false })
-+        this.onFocusWithinChanged(false)
-       })
-     }
-
-@@ -52,6 +79,12 @@
-     }
-   }
-
-+  private onKeyDown = (e: React.KeyboardEvent<HTMLDivElement>) => {
-+    if (this.props.onKeyDown) {
-+      this.props.onKeyDown(e)
-+    }
-+  }
-+
-   private onMouseDown = (e: React.MouseEvent<HTMLDivElement>) => {
-     // If someone is clicking on the focuscontainer itself we'll
-     // cancel it, that saves us from having a focusout/in cycle
-@@ -72,6 +105,7 @@
-         ref={this.onWrapperRef}
-         onClick={this.onClick}
-         onMouseDown={this.onMouseDown}
-+        onKeyDown={this.onKeyDown}
-       >
-         {this.props.children}
-       </div>
-merged
-  result 100644 861d4a732ccab52dda47589ad6904afbdd204d56 app/src/ui/lib/list/index.ts
-  our    100644 c1edf1e2d209c6b876ba5deb92af9d75fa5be1a6 app/src/ui/lib/list/index.ts
-@@ -1 +1,2 @@
- export * from './list'
-+export * from './selection'
-merged
-  result 100644 e534ebfd72eb9026d47bcdcd9e3077b295db520a app/src/ui/lib/list/list.tsx
-  our    100644 b802d39f208620ff995e34fe62a149883b81c618 app/src/ui/lib/list/list.tsx
-@@ -1,9 +1,19 @@
- import * as React from 'react'
- import * as ReactDOM from 'react-dom'
- import { Grid, AutoSizer } from 'react-virtualized'
--import { shallowEquals } from '../../../lib/equality'
-+import { shallowEquals, arrayEquals } from '../../../lib/equality'
-+import { FocusContainer } from '../../lib/focus-container'
- import { ListRow } from './list-row'
-+import {
-+  findNextSelectableRow,
-+  SelectionSource,
-+  SelectionDirection,
-+  IMouseClickSource,
-+  IKeyboardSource,
-+  ISelectAllSource,
-+} from './selection'
- import { createUniqueId, releaseUniqueId } from '../../lib/id-pool'
-+import { range } from '../../../lib/range'
-
- /**
-  * Describe the first argument given to the cellRenderer,
-@@ -28,37 +38,6 @@
-   readonly style: React.CSSProperties
- }
-
--/**
-- * Interface describing a user initiated selection change event
-- * originating from a pointer device clicking or pressing on an item.
-- */
--export interface IMouseClickSource {
--  readonly kind: 'mouseclick'
--  readonly event: React.MouseEvent<any>
--}
--
--/**
-- * Interface describing a user initiated selection change event
-- * originating from a pointer device hovering over an item.
-- * Only applicable when selectedOnHover is set.
-- */
--export interface IHoverSource {
--  readonly kind: 'hover'
--  readonly event: React.MouseEvent<any>
--}
--
--/**
-- * Interface describing a user initiated selection change event
-- * originating from a keyboard
-- */
--export interface IKeyboardSource {
--  readonly kind: 'keyboard'
--  readonly event: React.KeyboardEvent<any>
--}
--
--/** A type union of possible sources of a selection changed event */
--export type SelectionSource = IMouseClickSource | IHoverSource | IKeyboardSource
--
- export type ClickSource = IMouseClickSource | IKeyboardSource
-
- interface IListProps {
-@@ -89,11 +68,11 @@
-   readonly rowHeight: number | ((info: { index: number }) => number)
-
-   /**
--   * The currently selected row index. Used to attach a special
--   * selection class on that row container as well as being used
-+   * The currently selected rows indexes. Used to attach a special
-+   * selection class on those row's containers as well as being used
-    * for keyboard selection.
-    */
--  readonly selectedRow: number
-+  readonly selectedRows: ReadonlyArray<number>
-
-   /**
-    * This function will be called when a pointer device is pressed and then
-@@ -111,16 +90,68 @@
-   readonly onRowClick?: (row: number, soure: ClickSource) => void
-
-   /**
-+   * This prop defines the behaviour of the selection of items whithin this list.
-+   *  - 'single' : (default) single list-item selection. [shift] and [ctrl] have
-+   * no effect. Use in combination with one of:
-+   *             onSelectedRowChanged(row: number)
-+   *             onSelectionChanged(rows: number[])
-+   *  - 'range' : allows for selecting continuous ranges. [shift] can be used.
-+   * [ctrl] has no effect. Use in combination with one of:
-+   *             onSelectedRangeChanged(start: number, end: number)
-+   *             onSelectionChanged(rows: number[])
-+   *  - 'multi' : allows range and/or arbitrary selection. [shift] and [ctrl]
-+   * can be used. Use in combination with:
-+   *             onSelectionChanged(rows: number[])
-+   */
-+  readonly selectionMode?: 'single' | 'range' | 'multi'
-+
-+  /**
-    * This function will be called when the selection changes as a result of a
-    * user keyboard or mouse action (i.e. not when props change). This function
-    * will not be invoked when an already selected row is clicked on.
-+   * Use this function when the selectionMode is 'single'
-    *
-    * @param row    - The index of the row that was just selected
-    * @param source - The kind of user action that provoked the change, either
-    *                 a pointer device press, hover (if selectOnHover is set) or
-    *                 a keyboard event (arrow up/down)
-    */
--  readonly onSelectionChanged?: (row: number, source: SelectionSource) => void
-+  readonly onSelectedRowChanged?: (row: number, source: SelectionSource) => void
-+
-+  /**
-+   * This function will be called when the selection changes as a result of a
-+   * user keyboard or mouse action (i.e. not when props change). This function
-+   * will not be invoked when an already selected row is clicked on.
-+   * Index parameters are inclusive
-+   * Use this function when the selectionMode is 'range'
-+   *
-+   * @param start  - The index of the first selected row
-+   * @param end    - The index of the last selected row
-+   * @param source - The kind of user action that provoked the change, either
-+   *                 a pointer device press, hover (if selectOnHover is set) or
-+   *                 a keyboard event (arrow up/down)
-+   */
-+  readonly onSelectedRangeChanged?: (
-+    start: number,
-+    end: number,
-+    source: SelectionSource
-+  ) => void
-+
-+  /**
-+   * This function will be called when the selection changes as a result of a
-+   * user keyboard or mouse action (i.e. not when props change). This function
-+   * will not be invoked when an already selected row is clicked on.
-+   * Use this function for any selectionMode
-+   *
-+   * @param rows   - The indexes of the row(s) that are part of the selection
-+   * @param source - The kind of user action that provoked the change, either
-+   *                 a pointer device press, hover (if selectOnHover is set) or
-+   *                 a keyboard event (arrow up/down)
-+   */
-+  readonly onSelectionChanged?: (
-+    rows: ReadonlyArray<number>,
-+    source: SelectionSource
-+  ) => void
-
-   /**
-    * A handler called whenever a key down event is received on the
-@@ -185,6 +216,21 @@
-   readonly rowIdPrefix?: string
- }
-
-+/**
-+ * Create an array with row indices between firstRow and lastRow (inclusive).
-+ *
-+ * This is essentially a range function with the explicit behavior of
-+ * inclusive upper and lower bound.
-+ */
-+function createSelectionBetween(
-+  firstRow: number,
-+  lastRow: number
-+): ReadonlyArray<number> {
-+  // range is upper bound exclusive
-+  const end = lastRow > firstRow ? lastRow + 1 : lastRow - 1
-+  return range(firstRow, end)
-+}
-+
- export class List extends React.Component<IListProps, IListState> {
-   private focusItem: HTMLDivElement | null = null
-   private fakeScroll: HTMLDivElement | null = null
-@@ -254,13 +300,53 @@
-     }
-   }
-
-+  private onSelectAll = (event: Event) => {
-+    const selectionMode = this.props.selectionMode
-+
-+    if (selectionMode !== 'range' && selectionMode !== 'multi') {
-+      return
-+    }
-+
-+    event.preventDefault()
-+
-+    if (this.props.rowCount <= 0) {
-+      return
-+    }
-+
-+    const source: ISelectAllSource = { kind: 'select-all' }
-+    const firstRow = 0
-+    const lastRow = this.props.rowCount - 1
-+
-+    if (this.props.onSelectionChanged) {
-+      const newSelection = createSelectionBetween(firstRow, lastRow)
-+      this.props.onSelectionChanged(newSelection, source)
-+    }
-+
-+    if (selectionMode === 'range' && this.props.onSelectedRangeChanged) {
-+      this.props.onSelectedRangeChanged(firstRow, lastRow, source)
-+    }
-+  }
-+
-   private onRef = (element: HTMLDivElement | null) => {
-+    if (element === null && this.list !== null) {
-+      this.list.removeEventListener('select-all', this.onSelectAll)
-+    }
-+
-     this.list = element
-
-+    if (element !== null) {
-+      // This is a custom event that desktop emits through <App />
-+      // when the user selects the Edit > Select all menu item. We
-+      // hijack it and select all list items rather than let it bubble
-+      // to electron's default behavior which is to select all selectable
-+      // text in the renderer.
-+      element.addEventListener('select-all', this.onSelectAll)
-+    }
-+
-     if (this.resizeObserver) {
-       this.resizeObserver.disconnect()
-
--      if (element) {
-+      if (element !== null) {
-         this.resizeObserver.observe(element)
-       } else {
-         this.setState({ width: undefined, height: undefined })
-@@ -269,10 +355,11 @@
-   }
-
-   private handleKeyDown = (event: React.KeyboardEvent<any>) => {
--    const row = this.props.selectedRow
--    if (row >= 0 && this.props.onRowKeyDown) {
--      this.props.onRowKeyDown(row, event)
--    }
-+    this.props.selectedRows.forEach(row => {
-+      if (this.props.onRowKeyDown) {
-+        this.props.onRowKeyDown(row, event)
-+      }
-+    })
-
-     // The consumer is given a change to prevent the default behavior for
-     // keyboard navigation so that they can customize its behavior as needed.
-@@ -281,10 +368,26 @@
-     }
-
-     if (event.key === 'ArrowDown') {
--      this.moveSelection('down', event)
-+      if (
-+        event.shiftKey &&
-+        this.props.selectionMode &&
-+        this.props.selectionMode !== 'single'
-+      ) {
-+        this.addSelection('down', event)
-+      } else {
-+        this.moveSelection('down', event)
-+      }
-       event.preventDefault()
-     } else if (event.key === 'ArrowUp') {
--      this.moveSelection('up', event)
-+      if (
-+        event.shiftKey &&
-+        this.props.selectionMode &&
-+        this.props.selectionMode !== 'single'
-+      ) {
-+        this.addSelection('up', event)
-+      } else {
-+        this.moveSelection('up', event)
-+      }
-       event.preventDefault()
-     }
-   }
-@@ -300,18 +403,37 @@
-     // We give consumers the power to prevent the onRowClick event by subscribing
-     // to the onRowKeyDown event and calling event.preventDefault. This lets
-     // consumers add their own semantics for keyboard presses.
--    if (!event.defaultPrevented && this.props.onRowClick) {
--      if (event.key === 'Enter' || event.key === ' ') {
--        this.props.onRowClick(rowIndex, { kind: 'keyboard', event })
--        event.preventDefault()
--      }
-+    if (
-+      !event.defaultPrevented &&
-+      (event.key === 'Enter' || event.key === ' ')
-+    ) {
-+      this.toggleSelection(event)
-+      event.preventDefault()
-+    }
-+  }
-+
-+  private onKeyDown = (event: React.KeyboardEvent<any>) => {
-+    if (event.key === 'Enter' || event.key === ' ') {
-+      this.toggleSelection(event)
-+      event.preventDefault()
-     }
-   }
-
-+  private toggleSelection = (event: React.KeyboardEvent<any>) => {
-+    this.props.selectedRows.forEach(row => {
-+      if (this.props.onRowClick) {
-+        this.props.onRowClick(row, { kind: 'keyboard', event })
-+      }
-+    })
-+  }
-+
-   private onRowMouseOver = (row: number, event: React.MouseEvent<any>) => {
-     if (this.props.selectOnHover && this.canSelectRow(row)) {
--      if (row !== this.props.selectedRow && this.props.onSelectionChanged) {
--        this.props.onSelectionChanged(row, { kind: 'hover', event })
-+      if (
-+        this.props.selectedRows.includes(row) &&
-+        this.props.onSelectionChanged
-+      ) {
-+        this.props.onSelectionChanged([row], { kind: 'hover', event })
-         // By calling scrollRowToVisible we ensure that hovering over a partially
-         // visible item at the top or bottom of the list scrolls it into view but
-         // more importantly `scrollRowToVisible` automatically manages focus so
-@@ -322,54 +444,76 @@
-     }
-   }
-
--  /**
--   * Determine the next selectable row, given the direction and row. This will
--   * take `canSelectRow` into account.
--   *
--   * Returns null if no row can be selected.
--   */
--  public nextSelectableRow(
--    direction: 'up' | 'down',
--    row: number
--  ): number | null {
--    // If the row we're starting from is outside our list, make sure we start
--    // walking from _just_ outside the list. We'll also need to walk one more
--    // row than we normally would since the first step is just getting us into
--    // the list.
--    const baseRow = Math.min(Math.max(row, -1), this.props.rowCount)
--    const startOutsideList = row < 0 || row >= this.props.rowCount
--    const rowDelta = startOutsideList
--      ? this.props.rowCount + 1
--      : this.props.rowCount
--
--    for (let i = 1; i < rowDelta; i++) {
--      const delta = direction === 'up' ? i * -1 : i
--      // Modulo accounting for negative values, see https://stackoverflow.com/a/4467559
--      const nextRow =
--        (baseRow + delta + this.props.rowCount) % this.props.rowCount
--
--      if (this.canSelectRow(nextRow)) {
--        return nextRow
--      }
-+  /** Convenience method for invoking canSelectRow callback when it exists */
-+  private canSelectRow = (rowIndex: number) => {
-+    return this.props.canSelectRow ? this.props.canSelectRow(rowIndex) : true
-+  }
-+
-+  private addSelection(
-+    direction: SelectionDirection,
-+    event: React.KeyboardEvent<any>
-+  ) {
-+    if (this.props.selectedRows.length === 0) {
-+      return this.moveSelection(direction, event)
-     }
-
--    return null
--  }
-+    const lastSelection = this.props.selectedRows[
-+      this.props.selectedRows.length - 1
-+    ]
-
--  /** Convenience method for invoking canSelectRow callback when it exists */
--  private canSelectRow(rowIndex: number) {
--    return this.props.canSelectRow ? this.props.canSelectRow(rowIndex) : true
-+    const selectionOrigin = this.props.selectedRows[0]
-+
-+    const newRow = findNextSelectableRow(
-+      this.props.rowCount,
-+      { direction, row: lastSelection, wrap: false },
-+      this.canSelectRow
-+    )
-+
-+    if (newRow != null) {
-+      if (this.props.onSelectionChanged) {
-+        const newSelection = createSelectionBetween(selectionOrigin, newRow)
-+        this.props.onSelectionChanged(newSelection, { kind: 'keyboard', event })
-+      }
-+
-+      if (
-+        this.props.selectionMode === 'range' &&
-+        this.props.onSelectedRangeChanged
-+      ) {
-+        this.props.onSelectedRangeChanged(selectionOrigin, newRow, {
-+          kind: 'keyboard',
-+          event,
-+        })
-+      }
-+
-+      this.scrollRowToVisible(newRow)
-+    }
-   }
-
-   private moveSelection(
--    direction: 'up' | 'down',
-+    direction: SelectionDirection,
-     event: React.KeyboardEvent<any>
-   ) {
--    const newRow = this.nextSelectableRow(direction, this.props.selectedRow)
-+    const lastSelection =
-+      this.props.selectedRows.length > 0
-+        ? this.props.selectedRows[this.props.selectedRows.length - 1]
-+        : -1
-+
-+    const newRow = findNextSelectableRow(
-+      this.props.rowCount,
-+      { direction, row: lastSelection },
-+      this.canSelectRow
-+    )
-
-     if (newRow != null) {
-       if (this.props.onSelectionChanged) {
--        this.props.onSelectionChanged(newRow, { kind: 'keyboard', event })
-+        this.props.onSelectionChanged([newRow], { kind: 'keyboard', event })
-+      }
-+
-+      if (this.props.onSelectedRowChanged) {
-+        this.props.onSelectedRowChanged(newRow, {
-+          kind: 'keyboard',
-+          event,
-+        })
-       }
-
-       this.scrollRowToVisible(newRow)
-@@ -407,8 +551,11 @@
-         this.state.height !== prevState.height
-
-       if (!gridHasUpdatedAlready) {
--        const selectedRowChanged =
--          prevProps.selectedRow !== this.props.selectedRow
-+        const selectedRowChanged = !arrayEquals(
-+          prevProps.selectedRows,
-+          this.props.selectedRows
-+        )
-+
-         const invalidationPropsChanged = !shallowEquals(
-           prevProps.invalidationProps,
-           this.props.invalidationProps
-@@ -452,13 +599,13 @@
-   private renderRow = (params: IRowRendererParams) => {
-     const rowIndex = params.rowIndex
-     const selectable = this.canSelectRow(rowIndex)
--    const selected = rowIndex === this.props.selectedRow
-+    const selected = this.props.selectedRows.indexOf(rowIndex) !== -1
-     const focused = rowIndex === this.focusRow
-
-     // An unselectable row shouldn't be focusable
-     let tabIndex: number | undefined = undefined
-     if (selectable) {
--      tabIndex = selected ? 0 : -1
-+      tabIndex = selected && this.props.selectedRows[0] === rowIndex ? 0 : -1
-     }
-
-     // We only need to keep a reference to the focused element
-@@ -509,9 +656,12 @@
-       )
-     }
-
-+    // we select the last item from the selection array for this prop
-     const activeDescendant =
--      this.props.selectedRow !== -1 && this.state.rowIdPrefix
--        ? `${this.state.rowIdPrefix}-${this.props.selectedRow}`
-+      this.props.selectedRows.length && this.state.rowIdPrefix
-+        ? `${this.state.rowIdPrefix}-${
-+            this.props.selectedRows[this.props.selectedRows.length - 1]
-+          }`
-         : undefined
-
-     const role = this.props.ariaMode === 'menu' ? 'menu' : 'listbox'
-@@ -534,13 +684,18 @@
-    * Renders the react-virtualized Grid component and optionally
-    * a fake scroll bar component if running on Windows.
-    *
--   * @param {width} - The width of the Grid as given by AutoSizer
--   * @param {height} - The height of the Grid as given by AutoSizer
-+   * @param width - The width of the Grid as given by AutoSizer
-+   * @param height - The height of the Grid as given by AutoSizer
-    *
-    */
-   private renderContents(width: number, height: number) {
-     if (__WIN32__) {
--      return [this.renderGrid(width, height), this.renderFakeScroll(height)]
-+      return (
-+        <>
-+          {this.renderGrid(width, height)}
-+          {this.renderFakeScroll(height)}
-+        </>
-+      )
-     }
-
-     return this.renderGrid(width, height)
-@@ -557,8 +712,8 @@
-   /**
-    * Renders the react-virtualized Grid component
-    *
--   * @param {width} - The width of the Grid as given by AutoSizer
--   * @param {height} - The height of the Grid as given by AutoSizer
-+   * @param width - The width of the Grid as given by AutoSizer
-+   * @param height - The height of the Grid as given by AutoSizer
-    */
-   private renderGrid(width: number, height: number) {
-     let scrollToRow = this.props.scrollToRow
-@@ -572,28 +727,32 @@
-     // the list itself needs to be focusable so that you can reach
-     // it with keyboard navigation and select an item.
-     const tabIndex =
--      this.props.selectedRow < 0 && this.props.rowCount > 0 ? 0 : -1
-+      this.props.selectedRows.length < 1 && this.props.rowCount > 0 ? 0 : -1
-
-     return (
--      <Grid
--        aria-label={''}
--        key="grid"
--        role={''}
--        ref={this.onGridRef}
--        autoContainerWidth={true}
--        width={width}
--        height={height}
--        columnWidth={width}
--        columnCount={1}
--        rowCount={this.props.rowCount}
--        rowHeight={this.props.rowHeight}
--        cellRenderer={this.renderRow}
--        onScroll={this.onScroll}
--        scrollToRow={scrollToRow}
--        overscanRowCount={4}
--        style={this.gridStyle}
--        tabIndex={tabIndex}
--      />
-+      <FocusContainer
-+        className="list-focus-container"
-+        onKeyDown={this.onKeyDown}
-+      >
-+        <Grid
-+          aria-label={''}
-+          role={''}
-+          ref={this.onGridRef}
-+          autoContainerWidth={true}
-+          width={width}
-+          height={height}
-+          columnWidth={width}
-+          columnCount={1}
-+          rowCount={this.props.rowCount}
-+          rowHeight={this.props.rowHeight}
-+          cellRenderer={this.renderRow}
-+          onScroll={this.onScroll}
-+          scrollToRow={scrollToRow}
-+          overscanRowCount={4}
-+          style={this.gridStyle}
-+          tabIndex={tabIndex}
-+        />
-+      </FocusContainer>
-     )
-   }
-
-@@ -608,7 +767,7 @@
-    * be coupled with styling that hides scroll bars on Grid
-    * and accurately positions the fake scroll bar.
-    *
--   * @param {height} - The height of the Grid as given by AutoSizer
-+   * @param height The height of the Grid as given by AutoSizer
-    *
-    */
-   private renderFakeScroll(height: number) {
-@@ -624,7 +783,6 @@
-
-     return (
-       <div
--        key="fake-scroll"
-         className="fake-scroll"
-         ref={this.onFakeScrollRef}
-         style={{ height }}
-@@ -652,7 +810,7 @@
-
-     if (this.grid) {
-       const element = ReactDOM.findDOMNode(this.grid)
--      if (element) {
-+      if (element instanceof Element) {
-         element.scrollTop = e.currentTarget.scrollTop
-       }
-     }
-@@ -664,8 +822,90 @@
-         this.props.onRowMouseDown(row, event)
-       }
-
--      if (row !== this.props.selectedRow && this.props.onSelectionChanged) {
--        this.props.onSelectionChanged(row, { kind: 'mouseclick', event })
-+      // macOS allow emulating a right click by holding down the ctrl key while
-+      // performing a "normal" click.
-+      const isRightClick =
-+        event.button === 2 ||
-+        (__DARWIN__ && event.button === 0 && event.ctrlKey)
-+
-+      // prevent the right-click event from changing the selection if not necessary
-+      if (isRightClick && this.props.selectedRows.includes(row)) {
-+        return
-+      }
-+
-+      const multiSelectKey = __DARWIN__ ? event.metaKey : event.ctrlKey
-+
-+      if (
-+        event.shiftKey &&
-+        this.props.selectedRows.length &&
-+        this.props.selectionMode &&
-+        this.props.selectionMode !== 'single'
-+      ) {
-+        /*
-+         * if [shift] is pressed and selectionMode is different than 'single',
-+         * select all in-between first selection and current row
-+         */
-+        const selectionOrigin = this.props.selectedRows[0]
-+
-+        if (this.props.onSelectionChanged) {
-+          const newSelection = createSelectionBetween(selectionOrigin, row)
-+          this.props.onSelectionChanged(newSelection, {
-+            kind: 'mouseclick',
-+            event,
-+          })
-+        }
-+        if (
-+          this.props.selectionMode === 'range' &&
-+          this.props.onSelectedRangeChanged
-+        ) {
-+          this.props.onSelectedRangeChanged(selectionOrigin, row, {
-+            kind: 'mouseclick',
-+            event,
-+          })
-+        }
-+      } else if (multiSelectKey && this.props.selectionMode === 'multi') {
-+        /*
-+         * if [ctrl] is pressed and selectionMode is 'multi',
-+         * toggle selection of the targeted row
-+         */
-+        if (this.props.onSelectionChanged) {
-+          let newSelection: ReadonlyArray<number>
-+          if (this.props.selectedRows.includes(row)) {
-+            // remove the ability to deselect the last item
-+            if (this.props.selectedRows.length === 1) {
-+              return
-+            }
-+            newSelection = this.props.selectedRows.filter(ix => ix !== row)
-+          } else {
-+            newSelection = [...this.props.selectedRows, row]
-+          }
-+
-+          this.props.onSelectionChanged(newSelection, {
-+            kind: 'mouseclick',
-+            event,
-+          })
-+        }
-+      } else if (
-+        this.props.selectedRows.length !== 1 ||
-+        (this.props.selectedRows.length === 1 &&
-+          row !== this.props.selectedRows[0])
-+      ) {
-+        /*
-+         * if no special key is pressed, and that the selection is different,
-+         * single selection occurs
-+         */
-+        if (this.props.onSelectionChanged) {
-+          this.props.onSelectionChanged([row], { kind: 'mouseclick', event })
-+        }
-+        if (this.props.onSelectedRangeChanged) {
-+          this.props.onSelectedRangeChanged(row, row, {
-+            kind: 'mouseclick',
-+            event,
-+          })
-+        }
-+        if (this.props.onSelectedRowChanged) {
-+          this.props.onSelectedRowChanged(row, { kind: 'mouseclick', event })
-+        }
-       }
-     }
-   }
-@@ -717,10 +957,13 @@
-    */
-   public focus() {
-     if (
--      this.props.selectedRow >= 0 &&
--      this.props.selectedRow < this.props.rowCount
-+      this.props.selectedRows.length > 0 &&
-+      this.props.selectedRows[this.props.selectedRows.length - 1] <
-+        this.props.rowCount
-     ) {
--      this.scrollRowToVisible(this.props.selectedRow)
-+      this.scrollRowToVisible(
-+        this.props.selectedRows[this.props.selectedRows.length - 1]
-+      )
-     } else {
-       if (this.grid) {
-         const element = ReactDOM.findDOMNode(this.grid) as HTMLDivElement
-added in remote
-  their  100644 e508ad7bd721169b3f96558a76f7e5a32bcf8a71 app/src/ui/lib/list/selection.ts
-@@ -0,0 +1,142 @@
-+import * as React from 'react'
-+
-+export type SelectionDirection = 'up' | 'down'
-+
-+interface ISelectRowAction {
-+  /**
-+   * The vertical direction use when searching for a selectable row.
-+   */
-+  readonly direction: SelectionDirection
-+
-+  /**
-+   * The starting row index to search from.
-+   */
-+  readonly row: number
-+
-+  /**
-+   * A flag to indicate or not to look beyond the last or first
-+   * row (depending on direction) such that given the last row and
-+   * a downward direction will consider the first row as a
-+   * candidate or given the first row and an upward direction
-+   * will consider the last row as a candidate.
-+   *
-+   * Defaults to true if not set.
-+   */
-+  readonly wrap?: boolean
-+}
-+
-+/**
-+ * Interface describing a user initiated selection change event
-+ * originating from a pointer device clicking or pressing on an item.
-+ */
-+export interface IMouseClickSource {
-+  readonly kind: 'mouseclick'
-+  readonly event: React.MouseEvent<any>
-+}
-+
-+/**
-+ * Interface describing a user initiated selection change event
-+ * originating from a pointer device hovering over an item.
-+ * Only applicable when selectedOnHover is set.
-+ */
-+export interface IHoverSource {
-+  readonly kind: 'hover'
-+  readonly event: React.MouseEvent<any>
-+}
-+
-+/**
-+ * Interface describing a user initiated selection change event
-+ * originating from a keyboard
-+ */
-+export interface IKeyboardSource {
-+  readonly kind: 'keyboard'
-+  readonly event: React.KeyboardEvent<any>
-+}
-+
-+/**
-+ * Interface describing a user initiated selection of all list
-+ * items (usually by clicking the Edit > Select all menu item in
-+ * the application window). This is highly specific to GitHub Desktop
-+ */
-+export interface ISelectAllSource {
-+  readonly kind: 'select-all'
-+}
-+
-+/** A type union of possible sources of a selection changed event */
-+export type SelectionSource =
-+  | IMouseClickSource
-+  | IHoverSource
-+  | IKeyboardSource
-+  | ISelectAllSource
-+
-+/**
-+ * Determine the next selectable row, given the direction and a starting
-+ * row index. Whether a row is selectable or not is determined using
-+ * the `canSelectRow` function, which defaults to true if not provided.
-+ *
-+ * Returns null if no row can be selected or if the only selectable row is
-+ * identical to the given row parameter.
-+ */
-+export function findNextSelectableRow(
-+  rowCount: number,
-+  action: ISelectRowAction,
-+  canSelectRow: (row: number) => boolean = row => true
-+): number | null {
-+  if (rowCount === 0) {
-+    return null
-+  }
-+
-+  const { direction, row } = action
-+  const wrap = action.wrap === undefined ? true : action.wrap
-+
-+  // Ensure the row value is in the range between 0 and rowCount - 1
-+  //
-+  // If the row falls outside this range, use the direction
-+  // given to choose a suitable value:
-+  //
-+  //  - move in an upward direction -> select last row
-+  //  - move in a downward direction -> select first row
-+  //
-+  let currentRow =
-+    row < 0 || row >= rowCount ? (direction === 'up' ? rowCount - 1 : 0) : row
-+
-+  // handle specific case from switching from filter text to list
-+  //
-+  // locking currentRow to [0,rowCount) above means that the below loops
-+  // will skip over the first entry
-+  if (direction === 'down' && row === -1) {
-+    currentRow = -1
-+  }
-+
-+  const delta = direction === 'up' ? -1 : 1
-+
-+  // Iterate through all rows (starting offset from the
-+  // given row and ending on and including the given row)
-+  for (let i = 0; i < rowCount; i++) {
-+    currentRow += delta
-+
-+    if (currentRow >= rowCount) {
-+      // We've hit rock bottom, wrap around to the top
-+      // if we're allowed to or give up.
-+      if (wrap) {
-+        currentRow = 0
-+      } else {
-+        break
-+      }
-+    } else if (currentRow < 0) {
-+      // We've reached the top, wrap around to the bottom
-+      // if we're allowed to or give up
-+      if (wrap) {
-+        currentRow = rowCount - 1
-+      } else {
-+        break
-+      }
-+    }
-+
-+    if (row !== currentRow && canSelectRow(currentRow)) {
-+      return currentRow
-+    }
-+  }
-+
-+  return null
-+}
-merged
-  result 100644 d99f339f0d967a2ba0f2d644345ead21bc38e5ba app/src/ui/lib/text-box.tsx
-  our    100644 eb0d0735615b2dfce3311a6dae577bdf93ba84cb app/src/ui/lib/text-box.tsx
-@@ -4,7 +4,7 @@
- import { LinkButton } from './link-button'
- import { showContextualMenu } from '../main-process-proxy'
-
--interface ITextBoxProps {
-+export interface ITextBoxProps {
-   /** The label for the input field. */
-   readonly label?: string | JSX.Element
-
-@@ -74,6 +74,21 @@
-
-   /** The tab index of the input element. */
-   readonly tabIndex?: number
-+
-+  /**
-+   * Callback used when the component is focused.
-+   */
-+  readonly onFocus?: () => void
-+
-+  /**
-+   * Callback used when the component loses focus.
-+   */
-+  readonly onBlur?: () => void
-+
-+  /**
-+   * Callback used when the user has cleared the search text.
-+   */
-+  readonly onSearchCleared?: () => void
- }
-
- interface ITextBoxState {
-@@ -128,11 +143,18 @@
-    * (i.e. if it's not disabled explicitly or implicitly through for example a fieldset).
-    */
-   public focus() {
--    if (this.inputElement === null) {
--      return
-+    if (this.inputElement !== null) {
-+      this.inputElement.focus()
-     }
-+  }
-
--    this.inputElement.focus()
-+  /**
-+   * Programmatically removes keyboard focus from the inner text input element
-+   */
-+  public blur() {
-+    if (this.inputElement !== null) {
-+      this.inputElement.blur()
-+    }
-   }
-
-   private onChange = (event: React.FormEvent<HTMLInputElement>) => {
-@@ -145,8 +167,33 @@
-     })
-   }
-
-+  private onSearchTextCleared = () => {
-+    if (this.props.onSearchCleared != null) {
-+      this.props.onSearchCleared()
-+    }
-+  }
-+
-+  /**
-+   * The search event here is a Chrome and Safari specific event that is
-+   * only reported for input[type=search] elements.
-+   *
-+   * Source: http://help.dottoro.com/ljdvxmhr.php
-+   *
-+   * TODO: can we hook into the warning API of React to report on incorrect usage
-+   * when you set a `onSearchCleared` callback prop but don't use a `type=search`
-+   * input - because this won't set an event handler.
-+   *
-+   */
-   private onInputRef = (element: HTMLInputElement | null) => {
-+    if (this.inputElement != null && this.props.type === 'search') {
-+      this.inputElement.removeEventListener('search', this.onSearchTextCleared)
-+    }
-+
-     this.inputElement = element
-+
-+    if (this.inputElement != null && this.props.type === 'search') {
-+      this.inputElement.addEventListener('search', this.onSearchTextCleared)
-+    }
-   }
-
-   private renderLabelLink() {
-@@ -184,8 +231,10 @@
-   }
-
-   private onKeyDown = (event: React.KeyboardEvent<HTMLInputElement>) => {
-+    const value = this.state.value
-+
-     if (
--      this.state.value !== '' &&
-+      value !== '' &&
-       this.props.type === 'search' &&
-       event.key === 'Escape'
-     ) {
-@@ -197,6 +246,17 @@
-       if (this.props.onValueChanged) {
-         this.props.onValueChanged(value)
-       }
-+    } else if (
-+      this.props.type === 'search' &&
-+      event.key === 'Escape' &&
-+      value === ''
-+    ) {
-+      if (this.props.onBlur) {
-+        this.props.onBlur()
-+        if (this.inputElement !== null) {
-+          this.inputElement.blur()
-+        }
-+      }
-     }
-
-     if (this.props.onKeyDown !== undefined) {
-@@ -215,6 +275,8 @@
-         <input
-           id={inputId}
-           ref={this.onInputRef}
-+          onFocus={this.onFocus}
-+          onBlur={this.onBlur}
-           autoFocus={this.props.autoFocus}
-           disabled={this.props.disabled}
-           type={this.props.type}
-@@ -228,4 +290,16 @@
-       </div>
-     )
-   }
-+
-+  private onFocus = (event: React.FocusEvent<HTMLInputElement>) => {
-+    if (!this.props.autoFocus && this.props.onFocus !== undefined) {
-+      this.props.onFocus()
-+    }
-+  }
-+
-+  private onBlur = (event: React.FocusEvent<HTMLInputElement>) => {
-+    if (this.props.onBlur !== undefined) {
-+      this.props.onBlur()
-+    }
-+  }
- }
-merged
-  result 100644 eb960cbb3550362276de8faca04b1ee76ceeeb7d app/src/ui/lib/throttled-scheduler.ts
-  our    100644 51483eacd05ac47e8e0f0294f02716133e190a78 app/src/ui/lib/throttled-scheduler.ts
-@@ -6,7 +6,7 @@
-   /**
-    * Initialize a new instance of the ThrottledScheduler class
-    *
--   * @param {delay} - The minimum interval between invocations
-+   * @param delay The minimum interval between invocations
-    *                  of callbacks.
-    */
-   public constructor(delay: number) {
-merged
-  result 100644 6a7e6976257ec16e58a7331db61b40096a9bde08 app/src/ui/merge-branch/merge.tsx
-  our    100644 ccf9cd14a0406216b970ab0f7e5a98bec880171d app/src/ui/merge-branch/merge.tsx
-@@ -1,12 +1,18 @@
- import * as React from 'react'
--import { Button } from '../lib/button'
-+
-+import { getAheadBehind } from '../../lib/git'
- import { Dispatcher } from '../../lib/dispatcher'
-+
- import { Branch } from '../../models/branch'
- import { Repository } from '../../models/repository'
--import { getAheadBehind } from '../../lib/git'
-+
-+import { Button } from '../lib/button'
- import { ButtonGroup } from '../lib/button-group'
-+
- import { Dialog, DialogContent, DialogFooter } from '../dialog'
--import { BranchList } from '../branches'
-+import { BranchList, IBranchListItem, renderDefaultBranch } from '../branches'
-+import { revSymmetricDifference } from '../../lib/git'
-+import { IMatches } from '../../lib/fuzzy-find'
-
- interface IMergeProps {
-   readonly dispatcher: Dispatcher
-@@ -33,6 +39,11 @@
-   readonly recentBranches: ReadonlyArray<Branch>
-
-   /**
-+   * The branch to select when the merge dialog is opened
-+   */
-+  readonly initialBranch?: Branch
-+
-+  /**
-    * A function that's called when the dialog is dismissed by the user in the
-    * ways described in the Dialog component's dismissable prop.
-    */
-@@ -59,12 +70,10 @@
-   public constructor(props: IMergeProps) {
-     super(props)
-
--    const currentBranch = props.currentBranch
--    const defaultBranch = props.defaultBranch
-+    const selectedBranch = this.resolveSelectedBranch()
-
-     this.state = {
--      // Select the default branch unless that's currently checked out
--      selectedBranch: currentBranch === defaultBranch ? null : defaultBranch,
-+      selectedBranch,
-       commitCount: undefined,
-       filterText: '',
-     }
-@@ -128,6 +137,10 @@
-     )
-   }
-
-+  private renderBranch = (item: IBranchListItem, matches: IMatches) => {
-+    return renderDefaultBranch(item, matches, this.props.currentBranch)
-+  }
-+
-   public render() {
-     const selectedBranch = this.state.selectedBranch
-     const currentBranch = this.props.currentBranch
-@@ -156,6 +169,7 @@
-             selectedBranch={selectedBranch}
-             onSelectionChanged={this.onSelectionChanged}
-             canCreateNewBranch={false}
-+            renderBranch={this.renderBranch}
-           />
-         </DialogContent>
-         <DialogFooter>
-@@ -172,7 +186,7 @@
-   }
-
-   private async updateCommitCount(branch: Branch) {
--    const range = `...${branch.name}`
-+    const range = revSymmetricDifference('', branch.name)
-     const aheadBehind = await getAheadBehind(this.props.repository, range)
-     const commitCount = aheadBehind ? aheadBehind.behind : 0
-
-@@ -193,4 +207,21 @@
-     this.props.dispatcher.mergeBranch(this.props.repository, branch.name)
-     this.props.dispatcher.closePopup()
-   }
-+
-+  /**
-+   * Returns the branch to use as the selected branch
-+   *
-+   * The initial branch is used if passed
-+   * otherwise, the default branch will be used iff it's
-+   * not the currently checked out branch
-+   */
-+  private resolveSelectedBranch() {
-+    const { currentBranch, defaultBranch, initialBranch } = this.props
-+
-+    if (initialBranch !== undefined) {
-+      return initialBranch
-+    }
-+
-+    return currentBranch === defaultBranch ? null : defaultBranch
-+  }
- }
-added in remote
-  their  100644 994e1b5f87e28b721ae596a604deb0ff02f5e377 app/src/ui/merge-conflicts/index.ts
-@@ -0,0 +1 @@
-+export * from './merge-conflicts-warning'
-added in remote
-  their  100644 866251dcc5479cdce56345e42689d894ad96e243 app/src/ui/merge-conflicts/merge-conflicts-warning.tsx
-@@ -0,0 +1,54 @@
-+import * as React from 'react'
-+import { Button } from '../lib/button'
-+import { ButtonGroup } from '../lib/button-group'
-+import { Dialog, DialogContent, DialogFooter } from '../dialog'
-+import { Dispatcher } from '../../lib/dispatcher'
-+import { RepositorySectionTab } from '../../lib/app-state'
-+import { Repository } from '../../models/repository'
-+
-+interface IMergeConflictsWarningProps {
-+  readonly dispatcher: Dispatcher
-+  readonly repository: Repository
-+  readonly onDismissed: () => void
-+}
-+
-+export class MergeConflictsWarning extends React.Component<
-+  IMergeConflictsWarningProps,
-+  {}
-+> {
-+  private onSubmit = () => {
-+    this.props.dispatcher.changeRepositorySection(
-+      this.props.repository,
-+      RepositorySectionTab.Changes
-+    )
-+    this.props.onDismissed()
-+  }
-+
-+  public render() {
-+    return (
-+      <Dialog
-+        id="merge-conflicts-warning"
-+        title={__DARWIN__ ? 'Merge Conflicts Found' : 'Merge conflicts found'}
-+        onDismissed={this.props.onDismissed}
-+        onSubmit={this.onSubmit}
-+      >
-+        <DialogContent>
-+          <p>Conflicts were detected as part of the last merge operation.</p>
-+          <p>
-+            You will need to view and resolve these conflicts via your editor or
-+            shell before finishing and creating the merge commit.
-+          </p>
-+        </DialogContent>
-+
-+        <DialogFooter>
-+          <ButtonGroup>
-+            <Button type="submit">
-+              {__DARWIN__ ? 'View Conflicts' : 'View conflicts'}
-+            </Button>
-+            <Button onClick={this.props.onDismissed}>Close</Button>
-+          </ButtonGroup>
-+        </DialogFooter>
-+      </Dialog>
-+    )
-+  }
-+}
-added in remote
-  their  100644 292e9594562025347221742f225faa4c5188009d app/src/ui/notification/new-commits-banner.tsx
-@@ -0,0 +1,119 @@
-+import * as React from 'react'
-+import { Ref } from '../lib/ref'
-+import { Octicon, OcticonSymbol } from '../octicons'
-+import { Branch } from '../../models/branch'
-+import { Button } from '../lib/button'
-+import { Dispatcher } from '../../lib/dispatcher'
-+import { Repository } from '../../models/repository'
-+import {
-+  CompareActionKind,
-+  ComparisonView,
-+  PopupType,
-+} from '../../lib/app-state'
-+
-+export type DismissalReason = 'close' | 'compare' | 'merge'
-+
-+interface INewCommitsBannerProps {
-+  readonly dispatcher: Dispatcher
-+
-+  readonly repository: Repository
-+
-+  /**
-+   * The number of commits behind base branch
-+   */
-+  readonly commitsBehindBaseBranch: number
-+
-+  /**
-+   * The target branch that will accept commits
-+   * from the current branch
-+   */
-+  readonly baseBranch: Branch
-+
-+  /**
-+   * Callback used to dismiss the banner
-+   */
-+  readonly onDismiss: (reason: DismissalReason) => void
-+}
-+
-+/**
-+ * Banner used to notify user that their branch is a number of commits behind the base branch
-+ */
-+export class NewCommitsBanner extends React.Component<
-+  INewCommitsBannerProps,
-+  {}
-+> {
-+  public render() {
-+    const pluralize = this.props.commitsBehindBaseBranch > 1
-+
-+    return (
-+      <div className="notification-banner diverge-banner">
-+        <Octicon
-+          symbol={OcticonSymbol.lightBulb}
-+          className="notification-icon"
-+        />
-+
-+        <div className="notification-banner-content">
-+          <div className="notification-banner-content-body">
-+            <p>
-+              We have noticed that your branch is{' '}
-+              <strong>
-+                {this.props.commitsBehindBaseBranch} commit{pluralize
-+                  ? 's'
-+                  : ''}
-+              </strong>{' '}
-+              behind <Ref>{this.props.baseBranch.name}</Ref>.
-+            </p>
-+          </div>
-+          <div>
-+            <Button className="small-button" onClick={this.onComparedClicked}>
-+              View commits
-+            </Button>
-+            <Button
-+              className="small-button"
-+              type="submit"
-+              onClick={this.onMergeClicked}
-+            >
-+              Merge...
-+            </Button>
-+          </div>
-+        </div>
-+
-+        <a
-+          className="close"
-+          aria-label="Dismiss banner"
-+          onClick={this.onDismissed}
-+        >
-+          <Octicon symbol={OcticonSymbol.x} />
-+        </a>
-+      </div>
-+    )
-+  }
-+
-+  private onDismissed = () => {
-+    this.props.onDismiss('close')
-+  }
-+
-+  private onComparedClicked = () => {
-+    const { repository, dispatcher } = this.props
-+
-+    dispatcher.executeCompare(repository, {
-+      kind: CompareActionKind.Branch,
-+      branch: this.props.baseBranch,
-+      mode: ComparisonView.Behind,
-+    })
-+    dispatcher.recordDivergingBranchBannerInitiatedCompare()
-+    this.props.onDismiss('compare')
-+  }
-+
-+  private onMergeClicked = () => {
-+    const { repository, dispatcher } = this.props
-+
-+    dispatcher.showPopup({
-+      type: PopupType.MergeBranch,
-+      branch: this.props.baseBranch,
-+      repository,
-+    })
-+    dispatcher.recordDivergingBranchBannerInitatedMerge()
-+    this.props.onDismiss('merge')
-+  }
-+}
-added in remote
-  their  100644 461f079df545b3f64329fb9b73d8484c1ad0792d app/src/ui/preferences/appearance.tsx
-@@ -0,0 +1,49 @@
-+import * as React from 'react'
-+import { DialogContent } from '../dialog'
-+import {
-+  VerticalSegmentedControl,
-+  ISegmentedItem,
-+} from '../lib/vertical-segmented-control'
-+import { ApplicationTheme } from '../lib/application-theme'
-+import { fatalError } from '../../lib/fatal-error'
-+
-+interface IAppearanceProps {
-+  readonly selectedTheme: ApplicationTheme
-+  readonly onSelectedThemeChanged: (theme: ApplicationTheme) => void
-+}
-+
-+const themes: ReadonlyArray<ISegmentedItem> = [
-+  { title: 'Light', description: 'The default theme of GitHub Desktop' },
-+  {
-+    title: 'Dark (beta)',
-+    description:
-+      'A beta version of our dark theme. Still under development. Please report any issues you may find to our issue tracker.',
-+  },
-+]
-+
-+export class Appearance extends React.Component<IAppearanceProps, {}> {
-+  private onSelectedThemeChanged = (index: number) => {
-+    if (index === 0) {
-+      this.props.onSelectedThemeChanged(ApplicationTheme.Light)
-+    } else if (index === 1) {
-+      this.props.onSelectedThemeChanged(ApplicationTheme.Dark)
-+    } else {
-+      fatalError(`Unknown theme index ${index}`)
-+    }
-+  }
-+
-+  public render() {
-+    const selectedIndex =
-+      this.props.selectedTheme === ApplicationTheme.Dark ? 1 : 0
-+
-+    return (
-+      <DialogContent>
-+        <VerticalSegmentedControl
-+          items={themes}
-+          selectedIndex={selectedIndex}
-+          onSelectionChanged={this.onSelectedThemeChanged}
-+        />
-+      </DialogContent>
-+    )
-+  }
-+}
-merged
-  result 100644 95db24f350ede1c020f0629457aa6ff90b2b6d90 app/src/ui/preferences/preferences.tsx
-  our    100644 e26aab501de9210761f4d41ed2f05f1f7c516da8 app/src/ui/preferences/preferences.tsx
-@@ -21,6 +21,8 @@
- import { Shell, getAvailableShells } from '../../lib/shells'
- import { getAvailableEditors } from '../../lib/editors/lookup'
- import { disallowedCharacters } from './identifier-rules'
-+import { Appearance } from './appearance'
-+import { ApplicationTheme } from '../lib/application-theme'
-
- interface IPreferencesProps {
-   readonly dispatcher: Dispatcher
-@@ -33,6 +35,7 @@
-   readonly confirmDiscardChanges: boolean
-   readonly selectedExternalEditor?: ExternalEditor
-   readonly selectedShell: Shell
-+  readonly selectedTheme: ApplicationTheme
- }
-
- interface IPreferencesState {
-@@ -134,6 +137,7 @@
-         >
-           <span>Accounts</span>
-           <span>Git</span>
-+          <span>Appearance</span>
-           <span>Advanced</span>
-         </TabBar>
-
-@@ -203,6 +207,13 @@
-           />
-         )
-       }
-+      case PreferencesTab.Appearance:
-+        return (
-+          <Appearance
-+            selectedTheme={this.props.selectedTheme}
-+            onSelectedThemeChanged={this.onSelectedThemeChanged}
-+          />
-+        )
-       case PreferencesTab.Advanced: {
-         return (
-           <Advanced
-@@ -269,12 +280,17 @@
-     this.setState({ selectedShell: shell })
-   }
-
-+  private onSelectedThemeChanged = (theme: ApplicationTheme) => {
-+    this.props.dispatcher.setSelectedTheme(theme)
-+  }
-+
-   private renderFooter() {
-     const hasDisabledError = this.state.disallowedCharactersMessage != null
-
-     const index = this.state.selectedIndex
-     switch (index) {
-       case PreferencesTab.Accounts:
-+      case PreferencesTab.Appearance:
-         return null
-       case PreferencesTab.Advanced:
-       case PreferencesTab.Git: {
-merged
-  result 100644 ffbdef89f9f0f16e966a7d27c2db06bd897c3db6 app/src/ui/publish-repository/publish.tsx
-  our    100644 dbb16e8d0667b3c7f6a9514dda9d6ec8354fe75d app/src/ui/publish-repository/publish.tsx
-@@ -13,7 +13,7 @@
- import { getDotComAPIEndpoint } from '../../lib/api'
- import { assertNever, fatalError } from '../../lib/fatal-error'
- import { CallToAction } from '../lib/call-to-action'
--import { getGitDescription } from '../../lib/git/description'
-+import { getGitDescription } from '../../lib/git'
-
- enum PublishTab {
-   DotCom = 0,
-merged
-  result 100644 036558085db62e6798f39f0d0f7fdd38b7fca5f1 app/src/ui/rename-branch/rename-branch-dialog.tsx
-  our    100644 30deb34b0cdc3ac313cbdde5418abcc33bb4a22c app/src/ui/rename-branch/rename-branch-dialog.tsx
-@@ -9,7 +9,10 @@
- import { Button } from '../lib/button'
- import { ButtonGroup } from '../lib/button-group'
- import { Dialog, DialogContent, DialogFooter } from '../dialog'
--import { renderBranchNameWarning } from '../lib/branch-name-warnings'
-+import {
-+  renderBranchNameWarning,
-+  renderBranchHasRemoteWarning,
-+} from '../lib/branch-name-warnings'
-
- interface IRenameBranchProps {
-   readonly dispatcher: Dispatcher
-@@ -54,6 +57,7 @@
-             this.state.newName,
-             sanitizedBranchName(this.state.newName)
-           )}
-+          {renderBranchHasRemoteWarning(this.props.branch)}
-         </DialogContent>
-
-         <DialogFooter>
-merged
-  result 100644 9e6e38681ef352ce76fa65fea817492a6aef088f app/src/ui/repositories-list/group-repositories.ts
-  our    100644 18baeebd67753abfd4d4547921f30c8bef878511 app/src/ui/repositories-list/group-repositories.ts
-@@ -1,22 +1,31 @@
--import { Repository } from '../../models/repository'
-+import { Repository, ILocalRepositoryState } from '../../models/repository'
- import { CloningRepository } from '../../models/cloning-repository'
- import { getDotComAPIEndpoint } from '../../lib/api'
- import { caseInsensitiveCompare } from '../../lib/compare'
- import { IFilterListGroup, IFilterListItem } from '../lib/filter-list'
-+import { IAheadBehind } from '../../models/branch'
-
- export type RepositoryGroupIdentifier = 'github' | 'enterprise' | 'other'
-
- export type Repositoryish = Repository | CloningRepository
-
- export interface IRepositoryListItem extends IFilterListItem {
--  readonly text: string
-+  readonly text: ReadonlyArray<string>
-   readonly id: string
-   readonly repository: Repositoryish
-   readonly needsDisambiguation: boolean
-+  readonly aheadBehind: IAheadBehind | null
-+  readonly changedFilesCount: number
-+}
-+
-+const fallbackValue = {
-+  changedFilesCount: 0,
-+  aheadBehind: null,
- }
-
- export function groupRepositories(
--  repositories: ReadonlyArray<Repositoryish>
-+  repositories: ReadonlyArray<Repositoryish>,
-+  localRepositoryStateLookup: Map<number, ILocalRepositoryState>
- ): ReadonlyArray<IFilterListGroup<IRepositoryListItem>> {
-   const grouped = new Map<RepositoryGroupIdentifier, Repositoryish[]>()
-   for (const repository of repositories) {
-@@ -59,11 +68,15 @@
-     repositories.sort((x, y) => caseInsensitiveCompare(x.name, y.name))
-     const items: ReadonlyArray<IRepositoryListItem> = repositories.map(r => {
-       const nameCount = names.get(r.name) || 0
-+      const { aheadBehind, changedFilesCount } =
-+        localRepositoryStateLookup.get(r.id) || fallbackValue
-       return {
--        text: r.name,
-+        text: [r.name],
-         id: r.id.toString(),
-         repository: r,
-         needsDisambiguation: nameCount > 1,
-+        aheadBehind,
-+        changedFilesCount,
-       }
-     })
-
-merged
-  result 100644 e4ca588b503842ff6df4517d209f5fc5537d4a11 app/src/ui/repositories-list/repositories-list.tsx
-  our    100644 07ff55df057daaa50bdeec7aaaaafce35d03d1a2 app/src/ui/repositories-list/repositories-list.tsx
-@@ -8,23 +8,25 @@
-   RepositoryGroupIdentifier,
- } from './group-repositories'
- import { FilterList } from '../lib/filter-list'
-+import { IMatches } from '../../lib/fuzzy-find'
- import { assertNever } from '../../lib/fatal-error'
--
--/**
-- * TS can't parse generic specialization in JSX, so we have to alias it here
-- * with the generic type. See https://github.com/Microsoft/TypeScript/issues/6395.
-- */
--const RepositoryFilterList: new () => FilterList<
--  IRepositoryListItem
--> = FilterList as any
-+import { ILocalRepositoryState } from '../../models/repository'
-+import { enableRepoInfoIndicators } from '../../lib/feature-flag'
-+import { Dispatcher } from '../../lib/dispatcher'
-
- interface IRepositoriesListProps {
-   readonly selectedRepository: Repositoryish | null
-   readonly repositories: ReadonlyArray<Repositoryish>
-
-+  /** A cache of the latest repository state values, keyed by the repository id */
-+  readonly localRepositoryStateLookup: Map<number, ILocalRepositoryState>
-+
-   /** Called when a repository has been selected. */
-   readonly onSelectionChanged: (repository: Repositoryish) => void
-
-+  /** Whether the user has enabled the setting to confirm removing a repository from the app */
-+  readonly askForConfirmationOnRemoveRepository: boolean
-+
-   /** Called when the repository should be removed. */
-   readonly onRemoveRepository: (repository: Repositoryish) => void
-
-@@ -48,6 +50,8 @@
-
-   /** The text entered by the user to filter their repository list */
-   readonly filterText: string
-+
-+  readonly dispatcher: Dispatcher
- }
-
- const RowHeight = 29
-@@ -57,16 +61,16 @@
-   IRepositoriesListProps,
-   {}
- > {
--  private renderItem = (
--    item: IRepositoryListItem,
--    matches: ReadonlyArray<number>
--  ) => {
-+  private renderItem = (item: IRepositoryListItem, matches: IMatches) => {
-     const repository = item.repository
-     return (
-       <RepositoryListItem
-         key={repository.id}
-         repository={repository}
-         needsDisambiguation={item.needsDisambiguation}
-+        askForConfirmationOnRemoveRepository={
-+          this.props.askForConfirmationOnRemoveRepository
-+        }
-         onRemoveRepository={this.props.onRemoveRepository}
-         onShowRepository={this.props.onShowRepository}
-         onOpenInShell={this.props.onOpenInShell}
-@@ -74,6 +78,8 @@
-         externalEditorLabel={this.props.externalEditorLabel}
-         shellLabel={this.props.shellLabel}
-         matches={matches}
-+        aheadBehind={item.aheadBehind}
-+        changedFilesCount={item.changedFilesCount}
-       />
-     )
-   }
-@@ -101,6 +107,14 @@
-   }
-
-   private onItemClick = (item: IRepositoryListItem) => {
-+    if (enableRepoInfoIndicators()) {
-+      const hasIndicator =
-+        item.changedFilesCount > 0 ||
-+        (item.aheadBehind !== null
-+          ? item.aheadBehind.ahead > 0 || item.aheadBehind.behind > 0
-+          : false)
-+      this.props.dispatcher.recordRepoClicked(hasIndicator)
-+    }
-     this.props.onSelectionChanged(item.repository)
-   }
-
-@@ -109,7 +123,10 @@
-       return this.noRepositories()
-     }
-
--    const groups = groupRepositories(this.props.repositories)
-+    const groups = groupRepositories(
-+      this.props.repositories,
-+      this.props.localRepositoryStateLookup
-+    )
-
-     let selectedItem: IRepositoryListItem | null = null
-     const selectedRepository = this.props.selectedRepository
-@@ -129,7 +146,7 @@
-
-     return (
-       <div className="repository-list">
--        <RepositoryFilterList
-+        <FilterList<IRepositoryListItem>
-           rowHeight={RowHeight}
-           selectedItem={selectedItem}
-           filterText={this.props.filterText}
-merged
-  result 100644 6ca3c771c795eba242cc4b795e3a3b0bbb4c7488 app/src/ui/repositories-list/repository-list-item.tsx
-  our    100644 8a3459beeeb3be1978c9c1f3a4aefe8f497007fb app/src/ui/repositories-list/repository-list-item.tsx
-@@ -1,10 +1,12 @@
- import * as React from 'react'
- import { Repository } from '../../models/repository'
--import { Octicon, iconForRepository } from '../octicons'
-+import { Octicon, iconForRepository, OcticonSymbol } from '../octicons'
- import { showContextualMenu } from '../main-process-proxy'
- import { Repositoryish } from './group-repositories'
- import { IMenuItem } from '../../lib/menu-item'
- import { HighlightText } from '../lib/highlight-text'
-+import { IMatches } from '../../lib/fuzzy-find'
-+import { IAheadBehind } from '../../models/branch'
-
- const defaultEditorLabel = __DARWIN__
-   ? 'Open in External Editor'
-@@ -13,6 +15,9 @@
- interface IRepositoryListItemProps {
-   readonly repository: Repositoryish
-
-+  /** Whether the user has enabled the setting to confirm removing a repository from the app */
-+  readonly askForConfirmationOnRemoveRepository: boolean
-+
-   /** Called when the repository should be removed. */
-   readonly onRemoveRepository: (repository: Repositoryish) => void
-
-@@ -35,7 +40,13 @@
-   readonly shellLabel: string
-
-   /** The characters in the repository name to highlight */
--  readonly matches: ReadonlyArray<number>
-+  readonly matches: IMatches
-+
-+  /** Number of commits this local repo branch is behind or ahead of its remote brance */
-+  readonly aheadBehind: IAheadBehind | null
-+
-+  /** Number of uncommitted changes */
-+  readonly changedFilesCount: number
- }
-
- /** A repository item. */
-@@ -48,7 +59,37 @@
-     const path = repository.path
-     const gitHubRepo =
-       repository instanceof Repository ? repository.gitHubRepository : null
--    const tooltip = gitHubRepo
-+    const hasChanges = this.props.changedFilesCount > 0
-+    const renderAheadBehindIndicator = () => {
-+      if (
-+        !(repository instanceof Repository) ||
-+        this.props.aheadBehind === null
-+      ) {
-+        return null
-+      }
-+      const { ahead, behind } = this.props.aheadBehind
-+      if (ahead === 0 && behind === 0) {
-+        return null
-+      }
-+      const commitGrammar = (commitNum: number) =>
-+        `${commitNum} commit${commitNum > 1 ? 's' : ''}` // english is hard
-+      const aheadBehindTooltip =
-+        'The currently checked out branch is' +
-+        (behind ? ` ${commitGrammar(behind)} behind ` : '') +
-+        (behind && ahead ? 'and' : '') +
-+        (ahead ? ` ${commitGrammar(ahead)} ahead of ` : '') +
-+        'its tracked branch.'
-+
-+      return (
-+        <div className="ahead-behind" title={aheadBehindTooltip}>
-+          {ahead > 0 ? <Octicon symbol={OcticonSymbol.arrowSmallUp} /> : null}
-+          {behind > 0 ? (
-+            <Octicon symbol={OcticonSymbol.arrowSmallDown} />
-+          ) : null}
-+        </div>
-+      )
-+    }
-+    const repoTooltip = gitHubRepo
-       ? gitHubRepo.fullName + '\n' + gitHubRepo.htmlURL + '\n' + path
-       : path
-
-@@ -58,20 +99,30 @@
-     }
-
-     return (
--      <div
--        onContextMenu={this.onContextMenu}
--        className="repository-list-item"
--        title={tooltip}
--      >
-+      <div onContextMenu={this.onContextMenu} className="repository-list-item">
-+        <div
-+          className="change-indicator-wrapper"
-+          title={
-+            hasChanges ? 'There are uncommitted changes in this repository' : ''
-+          }
-+        >
-+          {hasChanges ? (
-+            <Octicon
-+              className="change-indicator"
-+              symbol={OcticonSymbol.primitiveDot}
-+            />
-+          ) : null}
-+        </div>
-         <Octicon symbol={iconForRepository(repository)} />
--
--        <div className="name">
-+        <div className="name" title={repoTooltip}>
-           {prefix ? <span className="prefix">{prefix}</span> : null}
-           <HighlightText
-             text={repository.name}
--            highlight={this.props.matches}
-+            highlight={this.props.matches.title}
-           />
-         </div>
-+
-+        {renderAheadBehindIndicator()}
-       </div>
-     )
-   }
-@@ -101,7 +152,9 @@
-
-     const showRepositoryLabel = __DARWIN__
-       ? 'Show in Finder'
--      : __WIN32__ ? 'Show in Explorer' : 'Show in your File Manager'
-+      : __WIN32__
-+        ? 'Show in Explorer'
-+        : 'Show in your File Manager'
-
-     const items: ReadonlyArray<IMenuItem> = [
-       {
-@@ -121,7 +174,9 @@
-       },
-       { type: 'separator' },
-       {
--        label: 'Remove',
-+        label: this.props.askForConfirmationOnRemoveRepository
-+          ? 'Remove…'
-+          : 'Remove',
-         action: this.removeRepository,
-       },
-     ]
-merged
-  result 100644 e58c21864cb0ef80f8d9edc3a5f278674a560cdd app/src/ui/repository.tsx
-  our    100644 a96947579eba87694e2e84bfba57b1e4814b9ad6 app/src/ui/repository.tsx
-@@ -5,26 +5,30 @@
- import { UiView } from './ui-view'
- import { Changes, ChangesSidebar } from './changes'
- import { NoChanges } from './changes/no-changes'
--import { History, HistorySidebar } from './history'
-+import { MultipleSelection } from './changes/multiple-selection'
-+import { FilesChangedBadge } from './changes/files-changed-badge'
-+import { SelectedCommit, CompareSidebar } from './history'
- import { Resizable } from './resizable'
- import { TabBar } from './tab-bar'
- import {
--  IRepositoryState as IRepositoryModelState,
--  RepositorySection,
-+  IRepositoryState,
-+  RepositorySectionTab,
-   ImageDiffType,
- } from '../lib/app-state'
- import { Dispatcher } from '../lib/dispatcher'
- import { IssuesStore, GitHubUserStore } from '../lib/stores'
- import { assertNever } from '../lib/fatal-error'
--import { Octicon, OcticonSymbol } from './octicons'
- import { Account } from '../models/account'
-+import { enableNotificationOfBranchUpdates } from '../lib/feature-flag'
-+import { FocusContainer } from './lib/focus-container'
-+import { OcticonSymbol, Octicon } from './octicons'
-
- /** The widest the sidebar can be with the minimum window size. */
- const MaxSidebarWidth = 495
-
--interface IRepositoryProps {
-+interface IRepositoryViewProps {
-   readonly repository: Repo
--  readonly state: IRepositoryModelState
-+  readonly state: IRepositoryState
-   readonly dispatcher: Dispatcher
-   readonly emoji: Map<string, string>
-   readonly sidebarWidth: number
-@@ -40,10 +44,21 @@
-   readonly externalEditorLabel?: string
-
-   /**
--   * Called to open a file using the user's configured applications
--   * @param path The path of the file relative to the root of the repository
-+   * Callback to open a selected file using the configured external editor
-+   *
-+   * @param fullPath The full path to the file on disk
-    */
--  readonly onOpenInExternalEditor: (path: string) => void
-+  readonly onOpenInExternalEditor: (fullPath: string) => void
-+
-+  /**
-+   * Determines if the notification banner and associated dot
-+   * on this history tab will be rendered
-+   */
-+  readonly isDivergingBranchBannerVisible: boolean
-+}
-+
-+interface IRepositoryViewState {
-+  readonly sidebarHasFocusWithin: boolean
- }
-
- const enum Tab {
-@@ -51,12 +66,32 @@
-   History = 1,
- }
-
--export class RepositoryView extends React.Component<IRepositoryProps, {}> {
-+export class RepositoryView extends React.Component<
-+  IRepositoryViewProps,
-+  IRepositoryViewState
-+> {
-+  public constructor(props: IRepositoryViewProps) {
-+    super(props)
-+
-+    this.state = {
-+      sidebarHasFocusWithin: false,
-+    }
-+  }
-+
-+  private renderChangesBadge(): JSX.Element | null {
-+    const filesChangedCount = this.props.state.changesState.workingDirectory
-+      .files.length
-+
-+    if (filesChangedCount <= 0) {
-+      return null
-+    }
-+
-+    return <FilesChangedBadge filesChangedCount={filesChangedCount} />
-+  }
-+
-   private renderTabs(): JSX.Element {
--    const hasChanges =
--      this.props.state.changesState.workingDirectory.files.length > 0
-     const selectedTab =
--      this.props.state.selectedSection === RepositorySection.Changes
-+      this.props.state.selectedSection === RepositorySectionTab.Changes
-         ? Tab.Changes
-         : Tab.History
-
-@@ -64,14 +99,19 @@
-       <TabBar selectedIndex={selectedTab} onTabClicked={this.onTabClicked}>
-         <span className="with-indicator">
-           <span>Changes</span>
--          {hasChanges ? (
-+          {this.renderChangesBadge()}
-+        </span>
-+
-+        <div className="with-indicator">
-+          <span>History</span>
-+          {enableNotificationOfBranchUpdates() &&
-+          this.props.isDivergingBranchBannerVisible ? (
-             <Octicon
-               className="indicator"
-               symbol={OcticonSymbol.primitiveDot}
-             />
-           ) : null}
--        </span>
--        <span>History</span>
-+        </div>
-       </TabBar>
-     )
-   }
-@@ -116,18 +156,25 @@
-     )
-   }
-
--  private renderHistorySidebar(): JSX.Element {
-+  private renderCompareSidebar(): JSX.Element {
-+    const tip = this.props.state.branchesState.tip
-+    const currentBranch = tip.kind === TipState.Valid ? tip.branch : null
-+
-     return (
--      <HistorySidebar
-+      <CompareSidebar
-         repository={this.props.repository}
--        dispatcher={this.props.dispatcher}
--        history={this.props.state.historyState}
-+        compareState={this.props.state.compareState}
-+        currentBranch={currentBranch}
-         gitHubUsers={this.props.state.gitHubUsers}
-         emoji={this.props.emoji}
-         commitLookup={this.props.state.commitLookup}
-         localCommitSHAs={this.props.state.localCommitSHAs}
-+        dispatcher={this.props.dispatcher}
-         onRevertCommit={this.onRevertCommit}
-         onViewCommitOnGitHub={this.props.onViewCommitOnGitHub}
-+        isDivergingBranchBannerVisible={
-+          this.props.isDivergingBranchBannerVisible
-+        }
-       />
-     )
-   }
-@@ -135,10 +182,10 @@
-   private renderSidebarContents(): JSX.Element {
-     const selectedSection = this.props.state.selectedSection
-
--    if (selectedSection === RepositorySection.Changes) {
-+    if (selectedSection === RepositorySectionTab.Changes) {
-       return this.renderChangesSidebar()
--    } else if (selectedSection === RepositorySection.History) {
--      return this.renderHistorySidebar()
-+    } else if (selectedSection === RepositorySectionTab.History) {
-+      return this.renderCompareSidebar()
-     } else {
-       return assertNever(selectedSection, 'Unknown repository section')
-     }
-@@ -154,57 +201,92 @@
-
-   private renderSidebar(): JSX.Element {
-     return (
--      <Resizable
--        id="repository-sidebar"
--        width={this.props.sidebarWidth}
--        onReset={this.handleSidebarWidthReset}
--        onResize={this.handleSidebarResize}
--        maximumWidth={MaxSidebarWidth}
--      >
--        {this.renderTabs()}
--        {this.renderSidebarContents()}
--      </Resizable>
-+      <FocusContainer onFocusWithinChanged={this.onSidebarFocusWithinChanged}>
-+        <Resizable
-+          id="repository-sidebar"
-+          width={this.props.sidebarWidth}
-+          onReset={this.handleSidebarWidthReset}
-+          onResize={this.handleSidebarResize}
-+          maximumWidth={MaxSidebarWidth}
-+        >
-+          {this.renderTabs()}
-+          {this.renderSidebarContents()}
-+        </Resizable>
-+      </FocusContainer>
-     )
-   }
-
--  private renderContent(): JSX.Element {
-+  private onSidebarFocusWithinChanged = (sidebarHasFocusWithin: boolean) => {
-+    // this lets us know that focus is somewhere within the sidebar
-+    this.setState({ sidebarHasFocusWithin })
-+
-+    if (
-+      sidebarHasFocusWithin === false &&
-+      this.props.state.selectedSection === RepositorySectionTab.History
-+    ) {
-+      this.props.dispatcher.updateCompareForm(this.props.repository, {
-+        showBranchList: false,
-+      })
-+    }
-+  }
-+
-+  private renderContent(): JSX.Element | null {
-     const selectedSection = this.props.state.selectedSection
-
--    if (selectedSection === RepositorySection.Changes) {
-+    if (selectedSection === RepositorySectionTab.Changes) {
-       const changesState = this.props.state.changesState
--      const selectedFileID = changesState.selectedFileID
--      const selectedFile = selectedFileID
--        ? changesState.workingDirectory.findFileWithID(selectedFileID)
--        : null
--      const diff = changesState.diff
-+      const selectedFileIDs = changesState.selectedFileIDs
-+
-+      if (selectedFileIDs.length > 1) {
-+        return <MultipleSelection count={selectedFileIDs.length} />
-+      }
-+
-       if (
--        !changesState.workingDirectory.files.length ||
--        !selectedFile ||
--        !diff
-+        changesState.workingDirectory.files.length === 0 ||
-+        selectedFileIDs.length === 0 ||
-+        changesState.diff === null
-       ) {
--        return <NoChanges onOpenRepository={this.openRepository} />
-+        return <NoChanges repository={this.props.repository} />
-       } else {
-+        const workingDirectory = changesState.workingDirectory
-+        const selectedFile = workingDirectory.findFileWithID(selectedFileIDs[0])
-+
-+        if (!selectedFile) {
-+          return null
-+        }
-+
-         return (
-           <Changes
-             repository={this.props.repository}
-             dispatcher={this.props.dispatcher}
-             file={selectedFile}
--            diff={diff}
-+            diff={changesState.diff}
-             imageDiffType={this.props.imageDiffType}
-           />
-         )
-       }
--    } else if (selectedSection === RepositorySection.History) {
-+    } else if (selectedSection === RepositorySectionTab.History) {
-+      const { historyState } = this.props.state
-+
-+      const sha = historyState.selection.sha
-+
-+      const selectedCommit =
-+        sha != null ? this.props.state.commitLookup.get(sha) || null : null
-+
-       return (
--        <History
-+        <SelectedCommit
-           repository={this.props.repository}
-           dispatcher={this.props.dispatcher}
--          history={this.props.state.historyState}
-+          selectedCommit={selectedCommit}
-+          changedFiles={historyState.changedFiles}
-+          selectedFile={historyState.selection.file}
-+          currentDiff={historyState.diff}
-           emoji={this.props.emoji}
--          commits={this.props.state.commitLookup}
-           commitSummaryWidth={this.props.commitSummaryWidth}
-           gitHubUsers={this.props.state.gitHubUsers}
--          imageDiffType={this.props.imageDiffType}
-+          selectedDiffType={this.props.imageDiffType}
-+          externalEditorLabel={this.props.externalEditorLabel}
-+          onOpenInExternalEditor={this.props.onOpenInExternalEditor}
-         />
-       )
-     } else {
-@@ -221,10 +303,6 @@
-     )
-   }
-
--  private openRepository = () => {
--    this.props.dispatcher.revealInFileManager(this.props.repository, '')
--  }
--
-   private onRevertCommit = (commit: Commit) => {
-     this.props.dispatcher.revertCommit(this.props.repository, commit)
-   }
-@@ -235,9 +313,9 @@
-     // as there's only two tabs.
-     if (e.ctrlKey && e.key === 'Tab') {
-       const section =
--        this.props.state.selectedSection === RepositorySection.History
--          ? RepositorySection.Changes
--          : RepositorySection.History
-+        this.props.state.selectedSection === RepositorySectionTab.History
-+          ? RepositorySectionTab.Changes
-+          : RepositorySectionTab.History
-
-       this.props.dispatcher.changeRepositorySection(
-         this.props.repository,
-@@ -250,8 +328,9 @@
-   private onTabClicked = (tab: Tab) => {
-     const section =
-       tab === Tab.History
--        ? RepositorySection.History
--        : RepositorySection.Changes
-+        ? RepositorySectionTab.History
-+        : RepositorySectionTab.Changes
-+
-     this.props.dispatcher.changeRepositorySection(
-       this.props.repository,
-       section
-merged
-  result 100644 598a0cabc7864df6db50781101811dedf580a766 app/src/ui/resizable/resizable.tsx
-  our    100644 e565705f992ba7d7bd86bdcb4a577dec86ca0714 app/src/ui/resizable/resizable.tsx
-@@ -9,8 +9,8 @@
- export class Resizable extends React.Component<IResizableProps, {}> {
-   public static defaultProps: IResizableProps = {
-     width: 250,
--    minimumWidth: 150,
-     maximumWidth: 350,
-+    minimumWidth: 200,
-   }
-
-   private startWidth: number | null = null
-@@ -96,8 +96,8 @@
-   public render() {
-     const style: React.CSSProperties = {
-       width: this.getCurrentWidth(),
--      maximumWidth: this.props.maximumWidth,
--      minimumWidth: this.props.minimumWidth,
-+      maxWidth: this.props.maximumWidth,
-+      minWidth: this.props.minimumWidth,
-     }
-
-     return (
-merged
-  result 100644 ac499b9891bcd8714b42b66a5d2ff2a003a09a8f app/src/ui/toolbar/push-pull-button.tsx
-  our    100644 b2e039b53887ee7cc2d3325232edcfb08a70ed7e app/src/ui/toolbar/push-pull-button.tsx
-@@ -1,9 +1,10 @@
- import * as React from 'react'
- import { ToolbarButton, ToolbarButtonStyle } from './button'
--import { IAheadBehind, Progress } from '../../lib/app-state'
-+import { Progress } from '../../lib/app-state'
- import { Dispatcher } from '../../lib/dispatcher'
- import { Octicon, OcticonSymbol } from '../octicons'
- import { Repository } from '../../models/repository'
-+import { IAheadBehind } from '../../models/branch'
- import { TipState } from '../../models/tip'
- import { RelativeTime } from '../relative-time'
- import { FetchType } from '../../lib/stores/index'
-merged
-  result 100644 82f0e853181e3bf4cab092bd28785970c4c492d9 app/src/ui/updates/update-available.tsx
-  our    100644 3054daf31cb24e5c2f9804c31515163e7bbaad76 app/src/ui/updates/update-available.tsx
-@@ -25,7 +25,10 @@
-           An updated version of GitHub Desktop is available and will be
-           installed at the next launch. See{' '}
-           <LinkButton uri={this.props.releaseNotesLink}>what's new</LinkButton>{' '}
--          or <LinkButton onClick={this.updateNow}>restart now</LinkButton>.
-+          or{' '}
-+          <LinkButton onClick={this.updateNow}>
-+            restart GitHub Desktop
-+          </LinkButton>.
-         </span>
-
-         <a className="close" onClick={this.dismiss}>
-merged
-  result 160000 d247be923e48ba4d02cf76dba79f0460d2f1a9a8 app/static/common/choosealicense.com
-  our    160000 fe965f16f6f690d40a738e75a46fad3f41f5daa3 app/static/common/choosealicense.com
-merged
-  result 160000 18e28746b0862059dbee8694fd366a679cb812fb app/static/common/gitignore
-  our    160000 690a433b668348c33087d34fafe2155ebe8bb4cf app/static/common/gitignore
-added in remote
-  their  100644 b78f57622a54a50d820cb145c0f9a61a66bb9a39 app/static/common/multiple-files-selected.svg
-@@ -0,0 +1 @@
-+<svg width="379" height="177" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path d="M197.32 102.94c-4.942-3.055-6.222-9.461-6.222-9.461s-1.508 4.63-6.239 5.955l.82 2.576 5.972 1.53 5.67-.6z" fill="#F7F8F9"/><path d="M197.32 102.94c-4.942-3.055-6.222-9.461-6.222-9.461s-1.508 4.63-6.239 5.955l.82 2.576 5.972 1.53 5.67-.6z" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/><path d="M180.128 100.758s-2.555-2.233-1.364-7.111c0 0 7.512 10.492 18.556 9.294 0 0-6.758 3.825-17.192-2.183" fill="#F7F8F9"/><path d="M180.128 100.758s-2.555-2.233-1.364-7.111c0 0 7.512 10.492 18.556 9.294 0 0-6.758 3.825-17.192-2.183z" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/><path d="M151.694 125.297c4.3-.344 7.773 3.36 7.773 3.36s.84-4.515-2.6-5.733l-6.436-.798 1.263 3.17z" fill="#F7F8F9"/><path d="M151.694 125.297c4.3-.344 7.773 3.36 7.773 3.36s.84-4.515-2.6-5.733l-6.436-.798 1.263 3.17z" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/><path d="M140.158 124.575s5.554.012 9.503 3.883c0 0 2.866-6.41 7.206-5.534 0 0-13.92-6.12-16.709 1.65" fill="#F7F8F9"/><path d="M140.158 124.575s5.554.012 9.503 3.883c0 0 2.866-6.41 7.206-5.534 0 0-13.92-6.12-16.709 1.65z" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/><path d="M219.598 172.051c0 2.566-17.221 4.644-38.463 4.644-21.243 0-38.464-2.078-38.464-4.644 0-2.566 17.22-4.646 38.464-4.646 21.242 0 38.463 2.08 38.463 4.646" fill="#EBF1F9"/><path d="M206.767 165.495l-4.4 1.912" fill="#F7F8F9"/><path d="M206.767 165.495l-4.4 1.912M160.369 166.06l1.084.39s2.663-1.184 4.693-1.263" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/><path d="M153.726 166.45s2.851 1.195 4.942 1.989" fill="#F7F8F9"/><path d="M153.726 166.45s2.851 1.195 4.942 1.989M178.012 167.444s3.319-.037 5.367.994c0 0 1.27-1.115 4.157-2.064" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/><path d="M189.255 169.08s-2.344.943-3.359 1.974" fill="#F7F8F9"/><path d="M189.255 169.08s-2.344.943-3.359 1.974" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/><path d="M170.982 169.08s1.41.006 3.048.593" fill="#F7F8F9"/><path d="M170.982 169.08s1.41.006 3.048.593" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/><path d="M171.024 169.99c-3.018.657-9.34 3.284-9.34 3.284l-7.757-3.794c-.359-6.275-2.012-25.022-2.012-25.022s12.428 2.772 18.103.657c0 0 4.598 2.406 10.128 2.48 0 0-1.005 2.553-.933 3.502 0 0 2.155.655 3.232.655l-.719-7.804.72-.44-1.366-.363s5.316-1.751 8.333-4.889c0 0 8.692-.73 18.749-5.69 0 0-1.222 3.43-4.454 6.711l4.814 1.096-2.156 30.858-7.4 3.21s-5.314-2.335-9.913-3.21l-5.961 3.575s-3.951-1.969-12.068-3.502v-1.313z" fill="#F7F8F9"/><path d="M171.024 169.99c-3.018.657-9.34 3.284-9.34 3.284l-7.757-3.794c-.359-6.275-2.012-25.022-2.012-25.022s12.428 2.772 18.103.657c0 0 4.598 2.406 10.128 2.48 0 0-1.005 2.553-.933 3.502 0 0 2.155.655 3.232.655l-.719-7.804.72-.44-1.366-.363s5.316-1.751 8.333-4.889c0 0 8.692-.73 18.749-5.69 0 0-1.222 3.43-4.454 6.711l4.814 1.096-2.156 30.858-7.4 3.21s-5.314-2.335-9.913-3.21l-5.961 3.575s-3.951-1.969-12.068-3.502v-1.313z" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/><path d="M151.916 144.457s4.885 5.472 9.41 6.93c0 0 10.846.804 18.82-3.792" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/><path d="M161.685 173.274l-.359-10.58-1.077.732s-2.946-1.606-4.598-5.618c0 0 2.946 2.116 5.315 2.188l.36-8.608" fill="#F7F8F9"/><path d="M161.685 173.274l-.359-10.58-1.077.732s-2.946-1.606-4.598-5.618c0 0 2.946 2.116 5.315 2.188l.36-8.608" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/><path fill="#F7F8F9" d="M208.521 140.373l-8.573 4.757-9.99-1.398"/><path stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round" d="M208.521 140.373l-8.573 4.757-9.99-1.398"/><path d="M198.967 174.44s.825-18.21.981-29.31" fill="#F7F8F9"/><path d="M198.967 174.44s.825-18.21.981-29.31M192.298 147.587c3.826-.158 7.579 1.348 7.579 1.348s3.35-3.012 5.536-3.012" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/><path d="M207.685 152.344l-3.13 1.342" fill="#F7F8F9"/><path d="M207.685 152.344l-3.13 1.342M192.298 162.33s5.03 1.43 7.16 2.382l1.115-.476M189.054 171.231l1.604-17.143-6.79 3.568-.777 17.15" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/><path d="M174.445 153.686l-4.864 3.335s4.996-.395 14.286.635" fill="#F7F8F9"/><path d="M174.445 153.686l-4.864 3.335s4.996-.395 14.286.635" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/><path d="M190.658 154.088l-1.332-.402" fill="#F7F8F9"/><path d="M190.658 154.088l-1.332-.402" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/><path d="M171.024 169.99s-.351-9.084-1.443-12.969" fill="#F7F8F9"/><path d="M171.024 169.99s-.351-9.084-1.443-12.969" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/><path d="M161.326 162.695s4.718-2.922 8.711-3.545c0 0-5.27-.46-9.07.847" fill="#F7F8F9"/><path d="M161.326 162.695s4.718-2.922 8.711-3.545c0 0-5.27-.46-9.07.847M154.748 152.344s5.07 1.897 6.399 3.327c0 0 4.062-1.503 6.716-1.583" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/><g><path d="M152.875 154.441s1.873.4 3.512 1.35" fill="#F7F8F9"/><path d="M152.875 154.441s1.873.4 3.512 1.35" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/></g><g><path d="M170.302 160.955s3.338-.049 5.915.427" fill="#F7F8F9"/><path d="M170.302 160.955s3.338-.049 5.915.427" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/></g><g><path d="M190.066 160.418s-1.203.726-2.374 1.438" fill="#F7F8F9"/><path d="M190.066 160.418s-1.203.726-2.374 1.438" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/></g><path d="M192.298 155.671s5.778.4 8.275 3.016c0 0 1.508-2.141 2.745-3.57l-3.65 1.23s-3.78-1.076-7.37-.676" fill="#F7F8F9"/><path d="M192.298 155.671s5.778.4 8.275 3.016c0 0 1.508-2.141 2.745-3.57l-3.65 1.23s-3.78-1.076-7.37-.676zM179.213 151.097s-4.09.236-7.603.345c0 0 3.525 3.993 11.481 5.58 0 0 3.664-2.067 7.567-4.006 0 0-3.857-.268-8.213-1.264" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/><g><path d="M203.708 139.278s-1.34 1.65-1.652 1.889c0 0-9.01 3.734-19.611 2.342" fill="#F7F8F9"/><path d="M203.708 139.278s-1.34 1.65-1.652 1.889c0 0-9.01 3.734-19.611 2.342" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/></g><g stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"><path d="M136.408 165.104v-96.18" stroke-dasharray="2.519,3.358"/><path d="M136.408 65.77v-2.365M158.914 54.606l1.616 1.715"/><path d="M164.822 60.874l103.005 109.28" stroke-dasharray="2.505,3.34"/><path d="M136.408 173.775v-2.364M269.974 172.431l1.618 1.717"/></g><g stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"><path d="M154.625 26.459l-33.393 12.697-5.629-14.138c-3.588-9.011.978-19.16 10.2-22.666 9.22-3.508 19.603.957 23.193 9.968l5.629 14.139zM121.488 25.577c-4-8.257-.22-16.892 8.623-19.166M162 32.48l-42.04 15.987-3.052-7.665 42.04-15.986zM156.973 29.979l-18.86 7.17M154.706 40.656l-23.716 9.02-3.085-4.23 26.15-9.943zM139.27 54.494c.284 1.396-.642 2.75-2.069 3.028-1.427.277-2.813-.626-3.099-2.022-.283-1.395.643-2.75 2.07-3.029 1.427-.277 2.815.629 3.099 2.023zM136.172 52.472l-.902-4.425M156.44 47.007c.756 1.214.36 2.798-.884 3.536s-2.865.351-3.62-.865c-.755-1.216-.358-2.798.886-3.538 1.242-.736 2.865-.349 3.618.867zM152.822 46.14l-2.395-3.855"/></g><path d="M74.118 40.066l-.847-2.758a.686.686 0 0 1 0-.406l.847-2.76a.692.692 0 0 0-.863-.865l-2.751.85a.68.68 0 0 1-.406 0l-2.749-.85a.692.692 0 0 0-.864.866l.846 2.759a.686.686 0 0 1 0 .406l-.846 2.758a.693.693 0 0 0 .864.867l2.75-.85a.68.68 0 0 1 .405 0l2.75.85a.692.692 0 0 0 .864-.867z" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/><g stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"><path d="M196.115 16.524l6.092 6.11M196.115 22.634l6.092-6.11"/></g><path d="M336.838.97c.887 0 1.604.72 1.604 1.61 0 .887-.717 1.608-1.604 1.608a1.606 1.606 0 0 1-1.604-1.608c0-.89.718-1.61 1.604-1.61zM276.908 103.22l-1.347-2.55a.687.687 0 0 0-.287-.289l-2.543-1.349a.693.693 0 0 1 0-1.224l2.543-1.35a.684.684 0 0 0 .287-.288l1.347-2.55a.69.69 0 0 1 1.221 0l1.346 2.55a.692.692 0 0 0 .286.288l2.544 1.35c.49.26.49.963 0 1.224l-2.544 1.35a.695.695 0 0 0-.286.288l-1.346 2.55a.69.69 0 0 1-1.221 0zM318.571 154.413v8.64M322.88 158.733h-8.617" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/><g stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"><path d="M87.815 67.417l-2.337 2.344M94.316 60.897L91.98 63.24M87.815 67.417a2.94 2.94 0 0 0 4.164 0 2.959 2.959 0 0 0 0-4.176 2.938 2.938 0 0 0-4.164 0 2.959 2.959 0 0 0 0 4.176z"/></g><path d="M35.913 19.09c0 1.031-.833 1.869-1.864 1.869a1.866 1.866 0 0 1-1.863-1.87c0-1.03.834-1.868 1.863-1.868 1.03 0 1.864.838 1.864 1.868zM264.036 2.58c0 1.03-.833 1.868-1.864 1.868a1.867 1.867 0 0 1-1.862-1.868c0-1.033.835-1.87 1.862-1.87 1.03 0 1.864.837 1.864 1.87zM346.306 107.981l-.995-1.887-1.882-.998 1.882-.998.995-1.888.996 1.888 1.881.998-1.881.998zM242.525 60.162c-.887 0-1.604.72-1.604 1.609 0 .888.718 1.609 1.604 1.609.886 0 1.604-.721 1.604-1.609 0-.89-.718-1.609-1.604-1.609zM83.826 96.327v4.186M85.912 98.42H81.74M5.168 120.64a2.22 2.22 0 0 1-2.217 2.224 2.22 2.22 0 0 1-2.217-2.223c0-1.227.994-2.224 2.217-2.224a2.22 2.22 0 0 1 2.217 2.224zM36.927 154.445l-.996-1.887-1.881-.998 1.881-1 .996-1.886.995 1.886 1.882 1-1.882.998zM45.862 84.256l1.355-.419 1.357.42-.418-1.362.418-1.36-1.357.418-1.355-.417.417 1.36zM10.5 61.149l3.604 1.977-3.604 1.977-1.972 3.615-1.971-3.615-3.605-1.977 3.605-1.977 1.971-3.616zM377.062 61.77l1.154 3.955-3.942-1.159-3.944 1.16 1.156-3.955-1.156-3.956 3.944 1.16 3.942-1.16zM303.997 23.625c10.875 0 19.693 8.842 19.693 19.752 0 10.906-8.818 19.749-19.693 19.749-10.876 0-19.692-8.843-19.692-19.75 0-10.909 8.816-19.751 19.692-19.751zM315.852 34.503a32.8 32.8 0 0 0 1.44-5.697" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/><path d="M303.523 50.936c3.38-2.371 6.283-5.409 8.563-8.853a34.853 34.853 0 0 0 1.801-3.05M296.332 54.827c.76-.29 1.508-.613 2.243-.962M289.47 56.71a33.651 33.651 0 0 0 3.078-.65M291.072 52.983c7.25-2.203 13.647-7.11 18.055-13.364M285.813 36.545a33.538 33.538 0 0 0 5.268-3.959M292.922 36.295a33.407 33.407 0 0 0 8.112-10.005M307.19 62.737c4.283-1.988 8.072-4.98 11.14-8.567M319.426 41.837c.122-.273.243-.544.358-.818M301.33 59.432c5.65-2.29 10.552-6.276 14.222-11.133a36.555 36.555 0 0 0 2.816-4.33M295.37 61.134a28.366 28.366 0 0 0 3.61-.862M318.523 49.072c2.11-3.096 3.659-6.521 4.666-10.13M299.576 62.623a33.442 33.442 0 0 0 9.83-4.497M305.86 35.41a33.723 33.723 0 0 0 4.573-10.704M300.735 41.56a32.647 32.647 0 0 0 1.948-2.014M285.382 49.831a33.477 33.477 0 0 0 4.05-1.231M305.96 26.367c.328-.832.624-1.678.887-2.535M298.23 38.03c2.394-2.26 4.543-4.841 5.941-7.846M294.652 41.102a68.23 68.23 0 0 0 1.6-1.313M284.512 46.233a33.515 33.515 0 0 0 7.747-3.508M288.219 39.775a30.348 30.348 0 0 1-3.843 1.936" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/></g></svg>
-\ No newline at end of file
-merged
-  result 100644 b1af174b6d02934b6e9b5f29051ccc89c28454ad app/styles/_globals.scss
-  our    100644 bd56fae88ff49ce2925253e0e5444f48d93a6c5b app/styles/_globals.scss
-@@ -115,6 +115,7 @@
-   align-items: center;
-   justify-content: center;
-   text-align: center;
-+  padding: var(--spacing);
- }
-
- // Stretches an element to fill the entire window (such as an overlay)
-merged
-  result 100644 2547663981e9047637d8e4edf9b40db74c9d5c51 app/styles/_mixins.scss
-  our    100644 2c54d4b7728a6487ddd3f6fd4ac7d7c641b10459 app/styles/_mixins.scss
-@@ -3,3 +3,4 @@
- @import 'mixins/octicon-status';
- @import 'mixins/textboxish';
- @import 'mixins/checkboard-background';
-+@import 'mixins/close-button';
-merged
-  result 100644 fe75df3631a5a6b0a4f5c1fc08ec016a19917524 app/styles/_ui.scss
-  our    100644 bc30cbb3646a0a92d2c552e53b0bca7865ccd9f7 app/styles/_ui.scss
-@@ -64,3 +64,5 @@
- @import 'ui/author-input';
- @import 'ui/avatar-stack';
- @import 'ui/commit-attribution';
-+@import 'ui/fancy-text-box';
-+@import 'ui/notification-banner';
-merged
-  result 100644 e9cb993ff22775125bb8a2e21a27d8b596619870 app/styles/_variables.scss
-  our    100644 120c6de98e0e7f66eb9d0d0fced3c8fcfbb627ea app/styles/_variables.scss
-@@ -5,6 +5,12 @@
- // Primer colors, see https://github.com/primer/primer-css/blob/master/modules/primer-support/lib/variables/color-system.scss
- @import '~primer-support/lib/variables/color-system.scss';
-
-+// Extracted as a SCSS variable so that we can define the --overlay-background-color
-+// on both the :root and the ::backdrop scope. The ::backdrop pseudo-element
-+// doesn't inherit :root, see
-+// https://bugs.chromium.org/p/chromium/issues/detail?id=594096
-+$overlay-background-color: rgba(0, 0, 0, 0.4);
-+
- :root {
-   --color-new: $green;
-   --color-deleted: $red;
-@@ -14,7 +20,6 @@
-
-   --text-color: $gray-900;
-   --text-secondary-color: $gray-500;
--  --text-tertiary-color: $gray-400;
-   --background-color: $white;
-
-   --button-height: 25px;
-@@ -26,6 +31,7 @@
-   --button-focus-border-color: $blue-600;
-
-   --link-button-color: $blue;
-+  --link-button-hover-color: $blue-600;
-
-   --secondary-button-background: $gray-000;
-   --secondary-button-hover-background: $white;
-@@ -36,11 +42,8 @@
-   // Typography
-   //
-   // Font, line-height, and color for body text, headings, and more.
--  --font-family-sans-serif: -apple-system, BlinkMacSystemFont, 'Segoe UI',
--    'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans',
--    'Helvetica Neue', Arial, sans-serif;
--  --font-family-monospace: Menlo, Monaco, Consolas, 'Liberation Mono',
--    'Courier New', monospace;
-+  --font-family-sans-serif: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', Arial, sans-serif;
-+  --font-family-monospace: Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New', monospace;
-
-   /**
-    * Font weight to use for semibold text
-@@ -86,12 +89,14 @@
-   // or an item in a tab control header. It's up to each implementation
-   // to decide what states to support (active selection, selection, etc).
-
-+  --box-background-color: var(--background-color);
-   --box-alt-background-color: $gray-100;
-
-   /**
-    * Background color for skeleton or "loading" boxes
-    */
-   --box-skeleton-background-color: $gray-200;
-+  --skeleton-background-gradient: -webkit-linear-gradient(left, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.5) 50%, rgba(255, 255, 255, 0) 100%);
-
-   /**
-    * Border color for boxes.
-@@ -145,6 +150,19 @@
-   --box-selected-active-border-color: $gray-400;
-
-   /**
-+   * Gradient used to indicate that content is overflowing, intended
-+   * for use when content can be expanded through other means than
-+   * scrolling.
-+   */
-+  --box-overflow-shadow-background: linear-gradient(180deg, rgba($white, 0) 0%, rgba($white, 1) 90%, rgba($white, 1) 100%);
-+
-+  /**
-+   * Author input (co-authors)
-+   */
-+  --co-author-tag-background-color: $blue-000;
-+  --co-author-tag-border-color: $blue-200;
-+
-+  /**
-    * The height of the title bar area on Win32 platforms
-    * If changed, update titleBarHeight in 'app/src/ui/dialog/dialog.tsx'
-   */
-@@ -173,6 +191,7 @@
-   --toolbar-height: 50px;
-
-   --toolbar-background-color: $gray-900;
-+  --toolbar-border-color: $gray-900;
-   --toolbar-text-color: $white;
-   --toolbar-text-secondary-color: $gray-300;
-
-@@ -196,10 +215,48 @@
-   --toolbar-button-hover-progress-color: $gray-700;
-   --toolbar-dropdown-open-progress-color: $gray-200;
-
-+  /**
-+   * App menu bar colors (Windows/Linux only)
-+   */
-+  --app-menu-button-color: var(--toolbar-text-color);
-+  --app-menu-button-hover-color: var(--toolbar-button-hover-color);
-+  --app-menu-button-hover-background-color: var(--toolbar-button-hover-background-color);
-+  --app-menu-button-active-color: var(--toolbar-button-active-color);
-+  --app-menu-button-active-background-color: var(--toolbar-button-active-background-color);
-+  --app-menu-pane-color: var(--text-color);
-+  --app-menu-pane-secondary-color: var(--text-secondary-color);
-+  --app-menu-pane-background-color: var(--toolbar-button-active-background-color);
-+  --app-menu-divider-color: var(--box-border-color);
-+
-+  /**
-+    * Background color for badges inside of toolbar buttons.
-+    * Examples of badges are the ahead/behind bubble in the
-+    * push/pull button and the PR badge in the branch drop
-+    * down button.
-+    */
-+  --toolbar-badge-background-color: $gray-600;
-+  --toolbar-badge-active-background-color: $gray-200;
-+
-   --tab-bar-height: 29px;
-   --tab-bar-active-color: $blue;
-   --tab-bar-background-color: $white;
-
-+  /** Count bubble colors when used inside of a tab bar item */
-+  --tab-bar-count-color: var(--text-color);
-+  --tab-bar-count-background-color: $gray-200;
-+
-+  /**
-+    * Badge colors when used inside of list items.
-+    * Example of this is the change indicators inside
-+    * of the repository list.
-+    */
-+  --list-item-badge-color: $gray-800;
-+  --list-item-badge-background-color: $gray-200;
-+  --list-item-selected-badge-color: $gray-900;
-+  --list-item-selected-badge-background-color: $gray-300;
-+  --list-item-selected-active-badge-color: $gray-900;
-+  --list-item-selected-active-badge-background-color: $white;
-+
-   /** Win32 has custom scrol bars, see _scroll.scss */
-   --win32-scroll-bar-size: 10px;
-
-@@ -215,6 +272,14 @@
-   --popup-overlay-z-index: calc(var(--popup-z-index) - 1);
-   --foldout-z-index: calc(var(--popup-z-index) - 2);
-
-+  /**
-+   * Toast notifications are shown temporarily for things like the zoom
-+   * percentage changing or the app toggling between full screen and normal
-+   * window mode.
-+   */
-+  --toast-notification-color: $gray-000;
-+  --toast-notification-background-color: rgba($gray-900, 0.6);
-+
-   /** The highlight color used for focus rings and focus box shadows */
-   --focus-color: $blue;
-
-@@ -233,6 +298,7 @@
-   --diff-text-color: $gray-900;
-   --diff-border-color: $gray-200;
-   --diff-gutter-color: $gray-200;
-+  --diff-gutter-background-color: var(--background-color);
-
-   --diff-line-number-color: $gray-700;
-   --diff-line-number-column-width: 50px;
-@@ -277,30 +343,45 @@
-   --diff-delete-hover-gutter-color: $red-300;
-   --diff-delete-hover-text-color: var(--text-color);
-
-+  // Syntax highlighting text colors
-+  --syntax-variable-color: #6f42c1;
-+  --syntax-alt-variable-color: #24292e;
-+  --syntax-keyword-color: #d73a49;
-+  --syntax-atom-color: #005cc5;
-+  --syntax-string-color: #032f62;
-+  --syntax-qualifier-color: #6f42c1;
-+  --syntax-type-color: #d73a49;
-+  --syntax-comment-color: $gray-500;
-+  --syntax-tag-color: #22863a;
-+  --syntax-attribute-color: #6f42c1;
-+  --syntax-link-color: #032f62;
-+
-   // Note that this duration *must* match the `UndoCommitAnimationTimeout`
-   // specified in `changes/index.tsx`.
-   --undo-animation-duration: 500ms;
-
--  /**
--   * Ahead/behind view
--   */
--  --ahead-behind-background-color: $gray-500;
--
-   // Colors for form errors
-   --error-color: $red;
-   --form-error-background: $red-100;
-   --form-error-border-color: $red-200;
-   --form-error-text-color: $red-800;
-
-+  /** Overlay is used as a background for both modals and foldouts */
-+  --overlay-background-color: $overlay-background-color;
-+
-   /** Dialog */
-   --dialog-warning-color: $yellow-600;
--  --dialog-warning-text-color: $yellow-800;
-   --dialog-error-color: $red;
-
-   /** Inline paths and code */
-   --path-segment-background: $blue-000;
-   --path-segment-padding: var(--spacing-third);
-
-+  /** Diverging notification banner colors */
-+  --notification-banner-background: $blue-000;
-+  --notification-banner-border-color: $blue-200;
-+  --notification-ref-background: rgba(255, 255, 255, 0.75);
-+
-   // http://easings.net/#easeOutBack
-   --easing-ease-out-back: cubic-bezier(0.175, 0.885, 0.32, 1.275);
-
-@@ -310,3 +391,7 @@
-   // http://easings.net/#easeOutQuint
-   --easing-ease-out-quint: cubic-bezier(0.23, 1, 0.32, 1);
- }
-+
-+::backdrop {
-+  --overlay-background-color: $overlay-background-color;
-+}
-merged
-  result 100644 3a8c3b0ce9abb4b883fdc4f28ada9ac3a70b2f2e app/styles/desktop.scss
-  our    100644 4a9623e6216173633dc9aa838abbce73b361f6bb app/styles/desktop.scss
-@@ -1,6 +1,8 @@
- @import 'vendor';
-
- @import 'variables';
-+@import 'themes/dark';
-+
- @import 'mixins';
-
- @import 'globals';
-added in remote
-  their  100644 e0bf14cbb8dd2a3366da0ad586f3b2bbb7cb1165 app/styles/mixins/_close-button.scss
-@@ -0,0 +1,35 @@
-+@mixin close-button {
-+  .close {
-+    flex-shrink: 0;
-+
-+    border: 0;
-+    height: 16px;
-+    width: 16px;
-+
-+    // Set the left margin to auto so that flexbox positions the button
-+    // on the right hand side of the dialog and add a -10px right hand
-+    // side margin to put the button where it should be (we use a double
-+    // margin for the header itself).
-+    margin: 0 calc(var(--spacing) * -1) 0 auto;
-+    padding: 0;
-+    background: transparent;
-+
-+    color: var(--text-secondary-color);
-+    cursor: pointer;
-+
-+    // Let the button deal with all mouse events.
-+    // Without this the octicon resets the cursor when
-+    // hovering over the <path>.
-+    .octicon {
-+      pointer-events: none;
-+    }
-+
-+    &:hover {
-+      color: var(--text-color);
-+    }
-+
-+    &:focus {
-+      outline: 0;
-+    }
-+  }
-+}
-merged
-  result 100644 f470c0de0fc68ce5dbe838698274008bdd827ff1 app/styles/mixins/_textboxish.scss
-  our    100644 37764480c283ce673dca3c64fa4e317a88804cfc app/styles/mixins/_textboxish.scss
-@@ -7,6 +7,7 @@
- @mixin textboxish {
-   border: 1px solid var(--box-border-color);
-   border-radius: var(--border-radius);
-+  background: var(--box-background-color);
-   color: currentColor;
-   font-size: var(--font-size);
-   font-family: var(--font-family-sans-serif);
-added in remote
-  their  100644 e26d91d058178a03378c4c4761703355f1aaff81 app/styles/themes/_dark.scss
-@@ -0,0 +1,305 @@
-+// Variables
-+//
-+// This files contains CSS variables accessible to all selectors
-+
-+// Primer colors, see https://github.com/primer/primer-css/blob/master/modules/primer-support/lib/variables/color-system.scss
-+@import '~primer-support/lib/variables/color-system.scss';
-+
-+body.theme-dark {
-+  --color-new: $green;
-+  --color-deleted: $red;
-+  --color-modified: $yellow-700;
-+  --color-renamed: $blue;
-+  --color-conflicted: $orange;
-+
-+  --text-color: $gray-300;
-+  --text-secondary-color: $gray-400;
-+  --background-color: $gray-900;
-+
-+  --button-background: $blue;
-+  --button-hover-background: lighten($blue, 5%);
-+  --button-text-color: $white;
-+  --button-focus-border-color: $blue-600;
-+
-+  --link-button-color: lighten($blue-400, 3%);
-+  --link-button-hover-color: $blue-400;
-+
-+  --secondary-button-background: $gray-800;
-+  --secondary-button-hover-background: var(--secondary-button-background);
-+  --secondary-button-text-color: var(--text-color);
-+  --secondary-button-focus-shadow-color: rgba($gray-200, 0.75);
-+  --secondary-button-focus-border-color: $gray-300;
-+
-+  /**
-+   * Background color for custom scroll bars.
-+   * The color is applied to the thumb part of the scrollbar.
-+   *
-+   * Note: Only applies to win32 platforms
-+   */
-+  --scroll-bar-thumb-background-color: rgba(0, 0, 0, 0.7);
-+
-+  /**
-+   * Background color for custom scroll bars in their active state.
-+   * The color is applied to the thumb part of the scrollbar.
-+   *
-+   * Note: Only applies to win32 platforms
-+   */
-+  --scroll-bar-thumb-background-color-active: rgba(0, 0, 0, 0.8);
-+
-+  // Box
-+  //
-+  // We use the term 'box' here to refer to a very high-level generic
-+  // component that fits many use cases. A 'box' might be a list item
-+  // or an item in a tab control header. It's up to each implementation
-+  // to decide what states to support (active selection, selection, etc).
-+
-+  --box-background-color: darken($gray-900, 3%);
-+  --box-alt-background-color: $gray-800;
-+
-+  /**
-+   * Background color for skeleton or "loading" boxes
-+   */
-+  --box-skeleton-background-color: $gray-700;
-+  --skeleton-background-gradient: -webkit-linear-gradient(left, rgba(36, 41, 46, 0) 0%, rgba(36, 41, 46, 0.5) 50%, rgba(36, 41, 46, 0) 100%);
-+
-+  /**
-+   * Border color for boxes.
-+   */
-+  --box-border-color: #141414;
-+  --box-border-accent-color: $blue;
-+
-+  /**
-+   * Background color for selected boxes without keyboard focus
-+   */
-+  --box-selected-background-color: $gray-700;
-+
-+  /**
-+   * Text color for when a user hovers over a boxe with a
-+   * pointing device. Should not be used by boxes that doesn't
-+   * implement a hover state since this will conflict with
-+   * selection and active selection
-+   */
-+  --box-hover-text-color: var(--text-color);
-+
-+  /**
-+   * Background color for when a user hovers over a boxe with a
-+   * pointing device. Should not be used by boxes that doesn't
-+   * implement a hover state since this will conflict with
-+   * selection and active selection
-+   */
-+
-+  /**
-+   * Text color for selected boxes without keyboard focus
-+   */
-+  --box-selected-text-color: var(--text-color);
-+
-+  /**
-+   * Border color for selected boxes without keyboard focus
-+   */
-+  --box-selected-border-color: $gray-400;
-+
-+  /**
-+   * Background color for selected boxes with active keyboard focus
-+   */
-+  --box-selected-active-background-color: $blue;
-+
-+  /**
-+   * Text color for selected boxes with active keyboard focus
-+   */
-+  --box-selected-active-text-color: $white;
-+
-+  /**
-+   * Border color for selected boxes with active keyboard focus
-+   */
-+  --box-selected-active-border-color: $gray-400;
-+
-+  /**
-+   * Gradient used to indicate that content is overflowing, intended
-+   * for use when content can be expanded through other means than
-+   * scrolling.
-+   */
-+  --box-overflow-shadow-background: linear-gradient(180deg, rgba($gray-900, 0) 0%, rgba($gray-900, 1) 90%, rgba($gray-900, 1) 100%);
-+
-+  /**
-+   * Author input (co-authors)
-+   */
-+  --co-author-tag-background-color: $blue-800;
-+  --co-author-tag-border-color: $blue-700;
-+
-+  --base-border: 1px solid var(--box-border-color);
-+
-+  --shadow-color: rgba(black, 0.5);
-+  --base-box-shadow: 0 2px 7px var(--shadow-color);
-+
-+  --toolbar-background-color: darken($gray-900, 3%);
-+  --toolbar-border-color: var(--box-border-color);
-+  --toolbar-text-color: var(--text-color);
-+  --toolbar-text-secondary-color: var(--text-secondary-color);
-+
-+  --toolbar-button-color: var(--toolbar-text-color);
-+  --toolbar-button-background-color: transparent;
-+  --toolbar-button-border-color: var(--box-border-color);
-+  --toolbar-button-secondary-color: var(--toolbar-text-secondary-color);
-+
-+  --toolbar-button-hover-color: $white;
-+  --toolbar-button-hover-background-color: $gray-800;
-+  --toolbar-button-hover-border-color: var(--toolbar-button-border-color);
-+
-+  --toolbar-button-focus-background-color: $gray-800;
-+
-+  --toolbar-button-active-color: var(--text-color);
-+  --toolbar-button-active-background-color: var(--background-color);
-+  --toolbar-button-active-border-color: var(--box-border-color);
-+
-+  --toolbar-button-progress-color: $gray-800;
-+  --toolbar-button-focus-progress-color: $gray-700;
-+  --toolbar-button-hover-progress-color: $gray-700;
-+  --toolbar-dropdown-open-progress-color: $gray-200;
-+
-+  /**
-+    * App menu bar colors (Windows/Linux only)
-+    */
-+  --app-menu-button-color: var(--toolbar-text-color);
-+  --app-menu-button-hover-color: var(--toolbar-button-hover-color);
-+  --app-menu-button-hover-background-color: var(--toolbar-button-hover-background-color);
-+  --app-menu-button-active-color: var(--text-color);
-+  --app-menu-button-active-background-color: $gray-800;
-+  --app-menu-pane-color: var(--text-color);
-+  --app-menu-pane-secondary-color: var(--text-secondary-color);
-+  --app-menu-pane-background-color: $gray-800;
-+  --app-menu-divider-color: $gray-600;
-+
-+  /**
-+   * Background color for badges inside of toolbar buttons.
-+   * Examples of badges are the ahead/behind bubble in the
-+   * push/pull button and the PR badge in the branch drop
-+   * down button.
-+   */
-+  --toolbar-badge-background-color: $gray-700;
-+  --toolbar-badge-active-background-color: $gray-700;
-+
-+  --tab-bar-active-color: $blue;
-+  --tab-bar-background-color: var(--box-background-color);
-+
-+  /** Count bubble colors when used inside of a tab bar item */
-+  --tab-bar-count-color: var(--text-color);
-+  --tab-bar-count-background-color: $gray-700;
-+
-+  /**
-+    * Badge colors when used inside of list items.
-+    * Example of this is the ahead/behind indicators inside
-+    * of the repository list.
-+    */
-+  --list-item-badge-color: var(--text-color);
-+  --list-item-badge-background-color: $gray-600;
-+  --list-item-selected-badge-color: $white;
-+  --list-item-selected-badge-background-color: $gray-500;
-+  --list-item-selected-active-badge-color: $gray-900;
-+  --list-item-selected-active-badge-background-color: $white;
-+
-+  /**
-+   * Toast notifications are shown temporarily for things like the zoom
-+   * percentage changing or the app toggling between full screen and normal
-+   * window mode.
-+   */
-+  --toast-notification-color: var(--text-color);
-+  --toast-notification-background-color: rgba(black, 0.8);
-+
-+  /** The highlight color used for focus rings and focus box shadows */
-+  --focus-color: $blue;
-+
-+  /**
-+   * Variables for form elements
-+   */
-+  --text-field-focus-shadow-color: rgba($blue, 0.25);
-+
-+  /**
-+   * Diff view
-+   */
-+
-+  --diff-text-color: var(--text-color);
-+  --diff-border-color: $gray-800;
-+  --diff-gutter-color: $gray-800;
-+  --diff-gutter-background-color: darken($gray-900, 3%);
-+
-+  --diff-line-number-color: var(--text-secondary-color);
-+  --diff-line-number-column-width: 50px;
-+
-+  --diff-selected-background-color: $blue-700;
-+  --diff-selected-border-color: $blue-600;
-+  --diff-selected-gutter-color: $blue-600;
-+  --diff-selected-text-color: var(--text-color);
-+
-+  --diff-add-background-color: darken($green-900, 10%);
-+  --diff-add-border-color: darken($green-900, 10%);
-+  --diff-add-gutter-color: darken($green-900, 10%);
-+  --diff-add-gutter-background-color: darken($green-900, 13%);
-+  --diff-add-inner-background-color: $green-900;
-+  --diff-add-text-color: var(--diff-text-color);
-+
-+  --diff-delete-background-color: darken($red-900, 15%);
-+  --diff-delete-border-color: darken($red-900, 10%);
-+  --diff-delete-gutter-color: darken($red-900, 10%);
-+  --diff-delete-gutter-background-color: darken($red-900, 20%);
-+  --diff-delete-inner-background-color: $red-700;
-+  --diff-delete-text-color: $red-100;
-+
-+  --diff-hunk-background-color: darken($gray-900, 3%);
-+  --diff-hunk-border-color: lighten($gray-900, 3%);
-+  --diff-hunk-gutter-color: lighten($gray-900, 3%);
-+  --diff-hunk-gutter-background-color: darken($gray-900, 6%);
-+  --diff-hunk-text-color: var(--text-secondary-color);
-+
-+  --diff-hover-background-color: $blue-500;
-+  --diff-hover-border-color: $blue-400;
-+  --diff-hover-gutter-color: $blue-400;
-+  --diff-hover-text-color: var(--diff-text-color);
-+
-+  --diff-add-hover-background-color: $green-900;
-+  --diff-add-hover-border-color: $green-700;
-+  --diff-add-hover-gutter-color: $green-700;
-+  --diff-add-hover-text-color: var(--text-color);
-+
-+  --diff-delete-hover-background-color: $red-800;
-+  --diff-delete-hover-border-color: $red-700;
-+  --diff-delete-hover-gutter-color: $red-700;
-+  --diff-delete-hover-text-color: var(--text-color);
-+
-+  // Syntax highlighting text colors
-+  --syntax-variable-color: $purple-300;
-+  --syntax-alt-variable-color: $blue-300;
-+  --syntax-keyword-color: $red-300;
-+  --syntax-atom-color: $blue-300;
-+  --syntax-string-color: $orange-300;
-+  --syntax-qualifier-color: $purple-300;
-+  --syntax-type-color: $red-300;
-+  --syntax-comment-color: $gray-400;
-+  --syntax-tag-color: $green-400;
-+  --syntax-attribute-color: $purple-300;
-+  --syntax-link-color: $blue-300;
-+
-+  // Colors for form errors
-+  --error-color: $red;
-+  --form-error-background: darken($red-900, 3%);
-+  --form-error-border-color: $red-900;
-+  --form-error-text-color: var(--text-color);
-+
-+  /** Overlay is used as a background for both modals and foldouts */
-+  --overlay-background-color: rgba(0, 0, 0, 0.5);
-+
-+  /** Dialog */
-+  --dialog-warning-color: $yellow-600;
-+  --dialog-error-color: $red-600;
-+
-+  /** Inline paths and code */
-+  --path-segment-background: $gray-700;
-+
-+  .blankslate-image {
-+    filter: #{'invert()'} grayscale(1) brightness(8) contrast(0.6);
-+  }
-+
-+  /** Diverging notification banner colors */
-+  --notification-banner-background: $gray-800;
-+  --notification-banner-border-color: $gray-700;
-+  --notification-ref-background: $gray-700;
-+}
-merged
-  result 100644 118f40d4344ca7c4768e080dc7c5efb558a6e508 app/styles/ui/_app-menu.scss
-  our    100644 3e0f853f19041341b3f99da4a54a9198c68956ba app/styles/ui/_app-menu.scss
-@@ -116,6 +116,6 @@
-     width: 100%;
-     border: none;
-     height: 1px;
--    border-bottom: var(--base-border);
-+    border-bottom: 1px solid var(--app-menu-divider-color);
-   }
- }
-merged
-  result 100644 c1acae40fa98cefd4b9acd874bc3f9564610a6b3 app/styles/ui/_author-input.scss
-  our    100644 7f410ba422cc224a1bf1a644770a555b04eacd29 app/styles/ui/_author-input.scss
-@@ -24,8 +24,8 @@
-
-     .handle {
-       border-radius: 3px;
--      border: 1px solid #c3e1ff;
--      background: #f0f8ff;
-+      border: 1px solid var(--co-author-tag-border-color);
-+      background: var(--co-author-tag-background-color);
-       padding: 1px 1px;
-       margin: 0px 2px;
-
-merged
-  result 100644 b9a9ae211132ba7784f37322c2cb317e9c2aa871 app/styles/ui/_branches.scss
-  our    100644 8b437422d7971232a5209b075f6a7a4aac650780 app/styles/ui/_branches.scss
-@@ -24,8 +24,8 @@
-   .count {
-     display: flex;
-
--    background: $gray-200;
--    color: var(--text-color);
-+    background: var(--tab-bar-count-background-color);
-+    color: var(--tab-bar-count-color);
-
-     margin-left: var(--spacing-half);
-
-@@ -162,12 +162,7 @@
-       }
-
-       &::after {
--        background: -webkit-linear-gradient(
--          left,
--          rgba(255, 255, 255, 0) 0%,
--          rgba(255, 255, 255, 0.5) 50%,
--          rgba(255, 255, 255, 0) 100%
--        );
-+        background: var(--skeleton-background-gradient);
-         content: '';
-         display: block;
-         height: 100%;
-merged
-  result 100644 97ca39a21b639ebe4d0b8aa70608843319f304fb app/styles/ui/_button.scss
-  our    100644 584328bba42bf1267b5fc2b72da5863699ebe8e3 app/styles/ui/_button.scss
-@@ -1,4 +1,7 @@
-+@import '../mixins';
-+
- .button-component {
-+  @include ellipsis;
-   // Chrome on Windows ignores the body element
-   // font-family and uses Arial so we redefine
-   // it here
-merged
-  result 100644 64c4ffecb0394f2d298707dc3791dd719539172b app/styles/ui/_codemirror.scss
-  our    100644 aa9c9bb39f6132a7a359f95ab612ed96c6442e09 app/styles/ui/_codemirror.scss
-@@ -25,6 +25,15 @@
-   background: inherit;
- }
-
-+.CodeMirror-simplescroll-horizontal,
-+.CodeMirror-simplescroll-vertical {
-+  background: var(--box-alt-background-color);
-+  div {
-+    background: var(--scroll-bar-thumb-background-color);
-+    border: none;
-+  }
-+}
-+
- // Windows has custom scroll bars, see _scroll.scss
- @include win32-context {
-   .CodeMirror {
-merged
-  result 100644 94b86d54fb9b0314deb1ef48cc9e1466578ed390 app/styles/ui/_dialog.scss
-  our    100644 e496a16bd915366f9b11d9d0e63a21a8732099f4 app/styles/ui/_dialog.scss
-@@ -53,7 +53,7 @@
-       transition: transform 250ms var(--easing-ease-out-back);
-
-       &::backdrop {
--        opacity: 0.4;
-+        opacity: 1;
-         transition: opacity 100ms ease-in;
-       }
-     }
-@@ -64,15 +64,14 @@
-       pointer-events: none;
-
-       &::backdrop {
--        opacity: 0.4;
-+        opacity: 1;
-       }
-     }
-
-     &-leave-active {
-       opacity: 0.01;
-       transform: scale(0.25);
--      transition: opacity 100ms ease-in,
--        transform 100ms var(--easing-ease-in-back);
-+      transition: opacity 100ms ease-in, transform 100ms var(--easing-ease-in-back);
-
-       &::backdrop {
-         opacity: 0.01;
-@@ -82,8 +81,8 @@
-   }
-
-   &::backdrop {
--    background: #000;
--    opacity: 0.4;
-+    background: var(--overlay-background-color);
-+    opacity: 1;
-   }
-
-   // The dialog embeds a fieldset as the first child of the form element
-@@ -120,39 +119,7 @@
-       @include ellipsis;
-     }
-
--    .close {
--      flex-shrink: 0;
--
--      border: 0;
--      height: 16px;
--      width: 16px;
--
--      // Set the left margin to auto so that flexbox positions the button
--      // on the right hand side of the dialog and add a -10px right hand
--      // side margin to put the button where it should be (we use a double
--      // margin for the header itself).
--      margin: 0 calc(var(--spacing) * -1) 0 auto;
--      padding: 0;
--      background: transparent;
--
--      color: var(--text-secondary-color);
--      cursor: pointer;
--
--      // Let the button deal with all mouse events.
--      // Without this the octicon resets the cursor when
--      // hovering over the <path>.
--      .octicon {
--        pointer-events: none;
--      }
--
--      &:hover {
--        color: var(--text-color);
--      }
--
--      &:focus {
--        outline: 0;
--      }
--    }
-+    @include close-button;
-   }
-
-   &.warning,
-@@ -168,10 +135,7 @@
-       // Ensure that the dialog contents always have room for the icon,
-       // account for two double spacers at top and bottom plus the 5px
-       // icon offset (margin-top) and the size of the icon itself.
--      min-height: calc(
--        var(--spacing-double) * 2 + var(--spacing-half) +
--          var(--dialog-icon-size)
--      );
-+      min-height: calc(var(--spacing-double) * 2 + var(--spacing-half) + var(--dialog-icon-size));
-
-       // We're creating an opaque 24 by 24px div with the background color
-       // that we want the icon to appear in and then apply the icon path
-merged
-  result 100644 8b9383b267f661b394b29143bae31d8f6d73aa73 app/styles/ui/_diff.scss
-  our    100644 3dca4de7170d06beb799c8fa23c07c350ca0afa9 app/styles/ui/_diff.scss
-@@ -9,6 +9,7 @@
- .diff-code-mirror .CodeMirror {
-   height: 100%;
-   color: var(--diff-text-color);
-+  background: var(--background-color);
-   font-size: var(--font-size-sm);
-   font-family: var(--font-family-monospace);
-
-@@ -61,6 +62,7 @@
- .diff-line-gutter {
-   display: flex;
-   height: 100%;
-+  background: var(--diff-gutter-background-color);
-
-   &.diff-add {
-     background: var(--diff-add-gutter-background-color);
-@@ -95,8 +97,25 @@
-   text-align: right;
- }
-
--.diff-add {
--  background: var(--diff-add-background-color);
-+.CodeMirror-linebackground {
-+  &.diff-add {
-+    background: var(--diff-add-background-color);
-+  }
-+
-+  &.diff-delete {
-+    background: var(--diff-delete-background-color);
-+  }
-+
-+  &.diff-context {
-+    background: var(--background-color);
-+  }
-+
-+  &.diff-hunk {
-+    background: var(--diff-hunk-background-color);
-+  }
-+}
-+
-+.CodeMirror pre.diff-add {
-   color: var(--diff-add-text-color);
-   padding: 0;
-
-@@ -109,8 +128,7 @@
-   }
- }
-
--.diff-delete {
--  background: var(--diff-delete-background-color);
-+.CodeMirror pre.diff-delete {
-   color: var(--diff-delete-text-color);
-   padding: 0;
-
-@@ -123,9 +141,8 @@
-   }
- }
-
--.diff-context {
--  background: var(--background-color);
--  color: var(--diff-context-text-color);
-+.CodeMirror pre.diff-context {
-+  color: var(--diff-text-color);
-   padding: 0;
-
-   .diff-line-number {
-@@ -159,11 +176,10 @@
- }
-
- .cm-diff-context {
--  color: var(--diff-context-text-color);
-+  color: var(--diff-text-color);
- }
-
--.diff-hunk {
--  background: var(--diff-hunk-background-color);
-+.CodeMirror pre.diff-hunk {
-   color: var(--diff-hunk-text-color);
-   padding: 0;
-
-@@ -176,7 +192,7 @@
-   }
- }
-
--.diff-line-selected {
-+.CodeMirror pre.CodeMirror-line .diff-line-selected {
-   .diff-line-number {
-     background: var(--diff-selected-background-color);
-     border-color: var(--diff-selected-border-color);
-@@ -188,7 +204,7 @@
-   }
- }
-
--.diff-line-hover {
-+.CodeMirror pre.CodeMirror-line .diff-line-hover {
-   .diff-line-number {
-     background: var(--diff-hover-background-color);
-     border-color: var(--diff-hover-border-color);
-@@ -246,15 +262,6 @@
-   padding: 0;
- }
- // ***************************************************************************************************************************
--#diff a {
--  text-decoration: none;
--  margin-left: var(--spacing-half);
--}
--
--#diff a:link {
--  color: (orange);
--}
--
- .panel.image {
-   display: flex;
-   flex: 1;
-@@ -295,17 +302,36 @@
-   }
- }
-
--.image-diff-two-up {
-+.image-diff-container {
-   display: flex;
-   flex: 1;
-   justify-content: center;
-   align-items: center;
-+  flex-direction: column;
-
--  .image-diff-previous {
--    margin-right: 7.5px;
-+  .image-diff-two-up {
-+    display: flex;
-+    align-items: center;
-+
-+    .image-diff-previous {
-+      margin-right: var(--spacing-half);
-+      margin-bottom: var(--spacing-half);
-+    }
-+    .image-diff-current {
-+      margin-left: var(--spacing-half);
-+      margin-bottom: var(--spacing-half);
-+    }
-   }
--  .image-diff-current {
--    margin-left: 7.5px;
-+
-+  .image-diff-summary {
-+    color: var(--text-secondary-color);
-+    font-weight: var(--font-weight-semibold);
-+    .added {
-+      color: var(--color-new);
-+    }
-+    .removed {
-+      color: var(--color-deleted);
-+    }
-   }
- }
-
-@@ -436,15 +462,15 @@
- // https://github.com/primer/github-syntax-light/blob/5aeffad2559647286080328436156c4904a9785b/lib/github-light.css
- .cm-s-default {
-   .cm-variable {
--    color: #6f42c1;
-+    color: var(--syntax-variable-color);
-   }
-
-   .cm-keyword {
--    color: #d73a49;
-+    color: var(--syntax-keyword-color);
-   }
-
-   .cm-atom {
--    color: #005cc5;
-+    color: var(--syntax-atom-color);
-   }
-   .cm-number {
-     color: inherit;
-@@ -456,25 +482,25 @@
-
-   .cm-variable-2,
-   .cm-variable-3 {
--    color: #24292e;
-+    color: var(--syntax-alt-variable-color);
-   }
-   .cm-comment,
-   .cm-meta {
--    color: $gray-500;
-+    color: var(--syntax-comment-color);
-   }
-   .cm-string,
-   .cm-string-2 {
--    color: #032f62;
-+    color: var(--syntax-string-color);
-
-     &.cm-property {
-       color: inherit;
-     }
-   }
-   .cm-qualifier {
--    color: #6f42c1;
-+    color: var(--syntax-qualifier-color);
-   }
-   .cm-type {
--    color: #d73a49;
-+    color: var(--syntax-type-color);
-   }
-   .cm-builtin {
-     color: inherit;
-@@ -483,17 +509,17 @@
-     color: inherit;
-   }
-   .cm-tag {
--    color: #22863a;
-+    color: var(--syntax-tag-color);
-   }
-   .cm-attribute {
--    color: #6f42c1;
-+    color: var(--syntax-attribute-color);
-   }
-   .cm-hr {
-     color: inherit;
-   }
-   .cm-link {
-     text-decoration: underline;
--    color: #032f62;
-+    color: var(--syntax-link-color);
-   }
-
-   // Intra line markings takes precedence over syntax highlighting.
-@@ -507,19 +533,19 @@
-
-   .cm-m-css {
-     &.cm-property {
--      color: #005cc5;
-+      color: var(--syntax-atom-color);
-     }
-   }
-
-   .cm-m-shell {
-     &.cm-builtin {
--      color: #005cc5;
-+      color: var(--syntax-atom-color);
-     }
-   }
-
-   .cm-m-javascript {
-     &.cm-type {
--      color: #6f42c1;
-+      color: var(--syntax-variable-color);
-     }
-   }
- }
-added in remote
-  their  100644 479e9f6732ddc2b29c19b24585f4bb315001226a app/styles/ui/_fancy-text-box.scss
-@@ -0,0 +1,41 @@
-+@import '../mixins';
-+
-+.fancy-text-box-component {
-+  background: var(--box-background-color);
-+  display: flex;
-+  align-items: center;
-+  border: var(--base-border);
-+  border-radius: var(--border-radius);
-+
-+  .fancy-octicon {
-+    height: var(--text-field-height);
-+    padding: var(--spacing-half) 0 var(--spacing-half) 7px;
-+    border-right: none;
-+    border-radius: var(--border-radius) 0 0 var(--border-radius);
-+    opacity: 0.5;
-+    transition: opacity 0.2s ease;
-+  }
-+
-+  &.focused {
-+    @include textboxish-focus-styles;
-+
-+    .fancy-octicon {
-+      opacity: 1;
-+    }
-+  }
-+
-+  input {
-+    border-left: none;
-+    border-radius: 0 var(--border-radius) var(--border-radius) 0;
-+    border: none;
-+    box-shadow: none;
-+
-+    &:focus {
-+      box-shadow: none;
-+    }
-+  }
-+
-+  &.disabled {
-+    background: var(--box-alt-background-color);
-+  }
-+}
-merged
-  result 100644 8d0a73f26a35a260372d33c7dfe4ff8b5d1339a8 app/styles/ui/_file-list.scss
-  our    100644 e144976834ba00ee6d0a7f0840de601c6361830e app/styles/ui/_file-list.scss
-@@ -11,12 +11,15 @@
-     border-bottom: var(--base-border);
-   }
-
--  // Only use special colors for the change type icons when
--  // the list item doesn't have active focus. If it does we
--  // fall back to using the ambient foreground color of the
--  // list item.
--  .list-item:not(:focus) {
--    @include octicon-status;
-+  .list-focus-container {
-+    // Default to using status aware colors for the change type
-+    // octicons (i.e. green for added, yellowish for modified etc)
-+    // but fall back to picking up the ambient text color when the
-+    // list item is both focused and selected.
-+    &.focus-within .list-item:not(.selected),
-+    &:not(.focus-within) .list-item {
-+      @include octicon-status;
-+    }
-   }
-
-   .file {
-merged
-  result 100644 6d566f094b0851eb8e5875fc9b74a6ec847985e2 app/styles/ui/_foldout.scss
-  our    100644 862730a600bd4c8f8550cc85c363796164440dfa app/styles/ui/_foldout.scss
-@@ -12,8 +12,7 @@
-       box-shadow: none;
-     }
-
--    background: black;
--    opacity: 0.4;
-+    background: var(--overlay-background-color);
-     height: 100%;
-   }
-
-merged
-  result 100644 7b3fc84057d9f29f2c281fa3e52cb7eb6e066501 app/styles/ui/_list.scss
-  our    100644 1caa93d31e19fb970d33836afcdb72aebca4aad6 app/styles/ui/_list.scss
-@@ -62,6 +62,17 @@
-   }
- }
-
-+.list-focus-container {
-+  // The selected items must act as the focused element when inside
-+  &.focus-within .list-item.selected {
-+    --text-color: var(--box-selected-active-text-color);
-+    --text-secondary-color: var(--box-selected-active-text-color);
-+
-+    color: var(--text-color);
-+    background-color: var(--box-selected-active-background-color);
-+  }
-+}
-+
- .list-item {
-   display: flex;
-   flex-direction: row;
-@@ -76,14 +87,6 @@
-
-     color: var(--text-color);
-     background-color: var(--box-selected-background-color);
--
--    &:focus {
--      --text-color: var(--box-selected-active-text-color);
--      --text-secondary-color: var(--box-selected-active-text-color);
--
--      color: var(--text-color);
--      background-color: var(--box-selected-active-background-color);
--    }
-   }
-
-   &:focus {
-added in remote
-  their  100644 ec2aae86b8d44d23f35f56cb9684489301016d6b app/styles/ui/_notification-banner.scss
-@@ -0,0 +1,102 @@
-+@import '../mixins';
-+
-+.notification-banner + .compare-form {
-+  border-top: var(--base-border);
-+}
-+
-+.notification-banner {
-+  background: var(--notification-banner-background);
-+  border: var(--base-border);
-+  border-color: var(--notification-banner-border-color);
-+  border-radius: var(--border-radius);
-+  display: flex;
-+  padding: var(--spacing);
-+  position: relative;
-+
-+  .notification-icon {
-+    margin-right: var(--spacing-half);
-+  }
-+
-+  &-content {
-+    display: flex;
-+    flex-wrap: wrap;
-+
-+    p {
-+      flex-grow: 1;
-+      font-size: var(--font-size-sm);
-+      margin: 0;
-+      padding-right: var(--spacing-double); // Extra space for the close button
-+
-+      & + p {
-+        margin-top: var(--spacing-half);
-+      }
-+    }
-+  }
-+
-+  @include close-button;
-+
-+  .ref-component {
-+    background: var(--notification-ref-background);
-+    word-break: normal;
-+  }
-+
-+  .close {
-+    position: absolute;
-+    margin: 0;
-+    top: var(--spacing);
-+    right: var(--spacing);
-+    text-align: center;
-+
-+    .octicon {
-+      height: 12px;
-+    }
-+  }
-+}
-+
-+.diverge-banner {
-+  margin: var(--spacing-half);
-+  overflow: hidden;
-+
-+  &-enter {
-+    max-height: 0;
-+    opacity: 0;
-+
-+    &-active {
-+      max-height: 200px;
-+      opacity: 1;
-+      transition: all var(--undo-animation-duration) cubic-bezier(0, 0, 0.2, 1);
-+    }
-+  }
-+
-+  &-leave {
-+    max-height: 200px;
-+
-+    &-active {
-+      max-height: 0;
-+      opacity: 1;
-+      transition: max-height 300ms cubic-bezier(0.4, 0, 0.2, 1);
-+
-+      .diverge-banner {
-+        transform: translateX(-102%);
-+        opacity: 0;
-+        transition: all 180ms cubic-bezier(0.4, 0, 1, 1);
-+      }
-+    }
-+  }
-+
-+  &-wrapper {
-+    overflow: hidden;
-+    box-shadow: inset 0 -1px var(--box-border-color);
-+  }
-+}
-+
-+.notification-banner-content-body {
-+  margin-bottom: var(--spacing-half);
-+}
-+
-+.notification-banner-content {
-+  .button-component {
-+    margin-top: var(--spacing-half);
-+    margin-right: var(--spacing-half);
-+  }
-+}
-merged
-  result 100644 8f546e403848d75eee71d9c9cfadf10861721ea0 app/styles/ui/_octicons.scss
-  our    100644 215063877dc976dfb22c47f98829eb38c20d9bd1 app/styles/ui/_octicons.scss
-@@ -6,4 +6,6 @@
-   Forcing a width of 16px would result in some blurry icons showing up.
-   Instead, let's imply width: auto; instead. */
-   height: 16px;
-+
-+  flex-shrink: 0;
- }
-merged
-  result 100644 7a372fc2ba926c3532af77143dd008fa32fb4d3a app/styles/ui/_progress.scss
-  our    100644 0f1d4611ca18a0222d8408f2fba2f066fc73e2a5 app/styles/ui/_progress.scss
-@@ -12,13 +12,7 @@
-   }
-
-   &:indeterminate {
--    background-image: -webkit-linear-gradient(
--      -45deg,
--      transparent 33%,
--      var(--text-color) 33%,
--      var(--text-color) 66%,
--      transparent 66%
--    );
-+    background-image: -webkit-linear-gradient(-45deg, transparent 33%, var(--text-color) 33%, var(--text-color) 66%, transparent 66%);
-     background-size: 25px 10px, 100% 100%, 100% 100%;
-
-     -webkit-animation: progress-indeterminate-animation 5s linear infinite;
-merged
-  result 100644 babfdd92b2ced6ebdff2052231e4dea8a3d3b576 app/styles/ui/_pull-request-badge.scss
-  our    100644 479c5dc5f32bef83b9e68e7b8f2739733f4da45f app/styles/ui/_pull-request-badge.scss
-@@ -1,9 +1,9 @@
- .toolbar-dropdown.open .pr-badge {
--  background: $gray-200;
-+  background: var(--toolbar-badge-active-background-color);
- }
-
- .toolbar-dropdown:not(.open) .pr-badge {
--  background: $gray-700;
-+  background: var(--toolbar-badge-background-color);
- }
-
- .pr-badge {
-merged
-  result 100644 eddec3b4d0f749f111f14d559b64cb6d06e2a97f app/styles/ui/_ref.scss
-  our    100644 6c6ae06ccf808f2fbe03949d3ac21f696563a97d app/styles/ui/_ref.scss
-@@ -5,4 +5,5 @@
-   border: var(--path-segment-background);
-   border-radius: var(--border-radius);
-   padding: var(--path-segment-padding);
-+  word-break: break-all;
- }
-merged
-  result 100644 157e36f8a6d1951007c2c6c8f17b69d30f96b0c7 app/styles/ui/_repository-list.scss
-  our    100644 14dc39f723c7e6750bd1aeb7eca236863e48a320 app/styles/ui/_repository-list.scss
-@@ -50,7 +50,7 @@
-       @include ellipsis;
-
-       .prefix {
--        color: var(--text-tertiary-color);
-+        color: var(--text-secondary-color);
-       }
-
-       /* Used to highlight substring matches in filtered lists */
-@@ -61,6 +61,43 @@
-         color: currentColor;
-       }
-     }
-+
-+    .change-indicator {
-+      color: var(--tab-bar-active-color);
-+      margin-right: 0;
-+      width: auto;
-+    }
-+
-+    .change-indicator-wrapper {
-+      display: flex;
-+      min-width: 12px;
-+    }
-+
-+    .ahead-behind {
-+      height: 16px;
-+      background: var(--list-item-badge-background-color);
-+      color: var(--list-item-badge-color);
-+      align-items: center;
-+      margin-left: auto;
-+
-+      // Perfectly round semi circle ends with real tight
-+      // padding on either side. Now in two flavors!
-+      @include darwin {
-+        height: 12px;
-+        line-height: 12px;
-+      }
-+
-+      @include win32 {
-+        height: 13px;
-+        line-height: 13px;
-+      }
-+
-+      .octicon {
-+        margin: 0;
-+        height: 20px;
-+        width: 12px;
-+      }
-+    }
-   }
-
-   .sidebar-message {
-@@ -71,3 +108,31 @@
-     text-align: center;
-   }
- }
-+
-+.list-focus-container {
-+  /** Ahead/behind badge colors when list item is selected but not focused */
-+  .list-item.selected {
-+    .repository-list-item {
-+      .ahead-behind {
-+        background: var(--list-item-selected-badge-background-color);
-+        color: var(--list-item-selected-badge-color);
-+      }
-+    }
-+  }
-+
-+  &.focus-within {
-+    /** Ahead/behind badge colors when list item is selected and focused */
-+    .list-item.selected {
-+      .repository-list-item {
-+        .ahead-behind {
-+          background: var(--list-item-selected-active-badge-background-color);
-+          color: var(--list-item-selected-active-badge-color);
-+        }
-+      }
-+    }
-+
-+    .change-indicator {
-+      color: var(--text-color);
-+    }
-+  }
-+}
-merged
-  result 100644 19452e95365b7649095eb5dec6929dfbcf0a56ed app/styles/ui/_repository.scss
-  our    100644 7bc7ca7f0af55bf92b7abef8be065dadcfe5e06e app/styles/ui/_repository.scss
-@@ -6,6 +6,10 @@
-   flex-direction: row;
-   flex: 1;
-
-+  > .focus-container {
-+    display: flex;
-+  }
-+
-   &-sidebar {
-     display: flex;
-     flex-direction: column;
-merged
-  result 100644 d03e102280205b3d5932443b87f86ae495b967c8 app/styles/ui/_select.scss
-  our    100644 49aaeff05480031aef8493b66d05c59ae970ecc0 app/styles/ui/_select.scss
-@@ -10,27 +10,16 @@
-     margin-bottom: var(--spacing-third);
-   }
-
--  // Select boxes look absolutely horrible on Windows so we'll make them
--  // look as good as we possibly can. There's nothing we can do about the
--  // drop down itself but at least we can style the base element a bit.
--  @include win32 {
--    select {
--      // Get rid of all default UA styling, we can do better
--      -webkit-appearance: none;
-+  // Custom styles for select components because a) they look horrible
-+  // on Windows and b) because we need them to inherit colors and other
-+  // appearance from our global variables. Therefore we treat them more
-+  // or less exactly as a text box.
-+  select {
-+    // Make the select look like a text box.
-+    @include textboxish;
-+    @include textboxish-disabled;
-
--      // Make the select look like a text box.
--      @include textboxish;
--      @include textboxish-disabled;
--
--      // Add back the arrow that got removed with appearance: none.
--      // This is a custom version of the triangle-down octicon that was
--      // adapted to be 8 by 5px. The gif is in 2x and the background-size
--      // scales it back down so that we can have crisp arrows on high-dpi
--      // displays. The path is M 0,0 4,5 8,0 Z and the color is #6a737d.
--      background-image: url('data:image/gif;base64,R0lGODlhEAAKAMQAAGpzff///8PHy6arsXqCi46UnN7g4vHy8/v7+253gYuSmm12gO/w8dve4Pz8/KassniAicfLzwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAAAAAAALAAAAAAQAAoAAAUw4ACMZFk+TmGugIIEB8GSEBPcRjIvze1HM4FvKDI9hsNUyYUcxka1JjLHkzYFwmYIADs=');
--      background-size: 8px 5px;
--      background-repeat: no-repeat;
--      background-position: right var(--spacing-half) center;
--    }
-+    // Don't include the default padding from textboxish, it's too much
-+    padding: 0;
-   }
- }
-merged
-  result 100644 43d02373aff313ef9b39f22eb06c69042edeae78 app/styles/ui/_tab-bar.scss
-  our    100644 1bffcaff9a286153de4d40b1384bc42499839078 app/styles/ui/_tab-bar.scss
-@@ -51,6 +51,17 @@
-       margin-left: 4px;
-       margin-top: 1px;
-     }
-+
-+    .counter {
-+      color: var(--tab-bar-count-color);
-+      background-color: var(--tab-bar-count-background-color);
-+      margin-left: 4px;
-+      padding: 2px 5px;
-+      font-size: var(--font-size-xs);
-+      font-weight: var(--font-weight-semibold);
-+      border-radius: 20px;
-+      line-height: 1;
-+    }
-   }
-
-   &.switch &-item {
-merged
-  result 100644 94ed12c8ef668212eaa0f41d6f741a8cc444b2da app/styles/ui/changes/_changes-view.scss
-  our    100644 65c5af2ea88cf23e747e2b83a4de02734e02ec5a app/styles/ui/changes/_changes-view.scss
-@@ -59,6 +59,10 @@
-       margin: var(--spacing-double);
-       text-align: center;
-       justify-content: initial;
-+
-+      .blankslate-image {
-+        max-height: 150px;
-+      }
-     }
-   }
- }
-merged
-  result 100644 44b4d80ba3b31ba74550bd24a221b8b5a30b162c app/styles/ui/changes/_commit-message.scss
-  our    100644 68a0917a3d144cf8e5d26609b5abc54013f7d66e app/styles/ui/changes/_commit-message.scss
-@@ -45,18 +45,18 @@
-   }
-
-   .co-authors-toggle {
--    color: $gray-500;
-+    color: var(--text-secondary-color);
-
-     &:hover {
--      color: $gray-900;
-+      color: var(--text-color);
-     }
-   }
-
-   &.with-co-authors .co-authors-toggle {
--    color: $blue-400;
-+    color: var(--link-button-color);
-
-     &:hover {
--      color: $blue-600;
-+      color: var(--link-button-hover-color);
-     }
-   }
-
-@@ -91,11 +91,7 @@
-         width: 100%;
-         bottom: 0px;
-         height: 5px;
--        background: linear-gradient(
--          to bottom,
--          rgba(0, 0, 0, 0) 0%,
--          rgba(0, 0, 0, 0.1) 100%
--        );
-+        background: linear-gradient(to bottom, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0.1) 100%);
-         border-bottom: var(--base-border);
-       }
-     }
-@@ -119,6 +115,7 @@
-
-     .action-bar {
-       padding: var(--spacing-half);
-+      background: var(--box-background-color);
-
-       // We're not faking being a textbox any more
-       cursor: default;
-merged
-  result 100644 afc47457356923945b1b56e34a7eb176b19e7adb app/styles/ui/history/_commit-summary.scss
-  our    100644 da6d9942c041f863fd8e5aa0dc74a2e8a8788277 app/styles/ui/history/_commit-summary.scss
-@@ -41,6 +41,21 @@
-     .commit-summary-description {
-       padding-right: 100px;
-     }
-+
-+    // When the description area can be, but isn't yet, expanded
-+    // we'll add a small shadow towards the bottom to hint that
-+    // there's more content available.
-+    &:not(.expanded) {
-+      .commit-summary-description:before {
-+        content: '';
-+        background: var(--box-overflow-shadow-background);
-+        position: absolute;
-+        height: 30px;
-+        bottom: 0px;
-+        width: 100%;
-+        pointer-events: none;
-+      }
-+    }
-   }
- }
-
-@@ -76,21 +91,6 @@
-     // The extra pixel makes the space align up with the commit list.
-     max-height: 61px;
-     flex: 1;
--
--    &:before {
--      content: '';
--      background: linear-gradient(
--        180deg,
--        rgba(255, 255, 255, 0) 0px,
--        rgba(255, 255, 255, 0) 40px,
--        rgba(255, 255, 255, 0.5) 40px,
--        white 60px
--      );
--      position: absolute;
--      height: 100%;
--      width: 100%;
--      pointer-events: none;
--    }
-   }
-
-   // Enable text selection inside the title and description elements.
-merged
-  result 100644 58cea508b02182fa4f45daf88643d33c3b2dd020 app/styles/ui/history/_history.scss
-  our    100644 4e36c11fb44d43f2f8a8cb661820f2143f0f513c app/styles/ui/history/_history.scss
-@@ -46,6 +46,114 @@
-       margin: var(--spacing-double);
-       text-align: center;
-       justify-content: initial;
-+
-+      .blankslate-image {
-+        max-height: 150px;
-+      }
-+    }
-+  }
-+}
-+
-+#compare-view {
-+  display: flex;
-+  flex-direction: column;
-+  flex: 1;
-+
-+  .compare-form {
-+    background: var(--box-alt-background-color);
-+    flex: initial;
-+    padding: var(--spacing-half);
-+    border-bottom: var(--base-border);
-+  }
-+
-+  .compare-commit-list {
-+    flex: 1;
-+    display: flex;
-+    flex-direction: column;
-+  }
-+
-+  .merge-cta {
-+    border-top: var(--base-border);
-+    display: flex;
-+    flex-direction: column;
-+    font-size: var(--font-size-sm);
-+    text-align: center;
-+    padding: var(--spacing);
-+  }
-+
-+  .merge-message {
-+    margin-top: var(--spacing);
-+  }
-+
-+  .no-branches {
-+    color: var(--text-secondary-color);
-+    margin-top: var(--spacing-double);
-+  }
-+
-+  .branch-commit-counter {
-+    color: var(--text-secondary-color);
-+    display: flex;
-+    justify-content: flex-end;
-+    flex: 1;
-+    font-size: var(--font-size-sm);
-+
-+    &-item {
-+      display: flex;
-+      align-items: center;
-+
-+      &:first-child {
-+        margin-right: var(--spacing-half);
-+      }
-+    }
-+
-+    .octicon {
-+      fill: var(--text-secondary-color);
-+      width: 8px;
-+      margin-left: 1px;
-+
-+      &:last-child {
-+        margin-right: 0;
-+      }
-+    }
-+  }
-+
-+  .tab-bar {
-+    padding: var(--spacing-half);
-+    border-bottom: var(--base-border);
-+    height: initial;
-+
-+    &-item {
-+      box-shadow: none;
-+      background: var(--tab-bar-background-color);
-+      border: var(--base-border);
-+
-+      &:first-of-type {
-+        border-radius: var(--border-radius) 0 0 var(--border-radius);
-+      }
-+
-+      &:last-of-type {
-+        border-radius: 0 var(--border-radius) var(--border-radius) 0;
-+      }
-+
-+      &.selected {
-+        background: var(--box-selected-active-background-color);
-+        border-color: var(--box-border-accent-color);
-+        color: var(--box-selected-active-text-color);
-+      }
-+    }
-+  }
-+
-+  .select-component {
-+    flex-grow: 0;
-+  }
-+
-+  .compare-content {
-+    display: flex;
-+    height: 100%;
-+    flex-direction: column;
-+
-+    .ref-component {
-+      word-break: break-word;
-     }
-   }
- }
-merged
-  result 100644 5cf34011a143e1112e833a2ba33f5d35a182088a app/styles/ui/toolbar/_toolbar.scss
-  our    100644 15433dbad68211b728ccfe0accfc3dc90955c1cf app/styles/ui/toolbar/_toolbar.scss
-@@ -3,6 +3,7 @@
- /** A React component holding the main application toolbar component. */
- #desktop-app-toolbar {
-   height: var(--toolbar-height);
-+  border-bottom: 1px solid var(--toolbar-border-color);
-
-   display: flex;
-   flex-direction: row;
-@@ -63,7 +64,7 @@
- .ahead-behind {
-   display: flex;
-
--  background: var(--ahead-behind-background-color);
-+  background: var(--toolbar-badge-background-color);
-
-   // Perfectly round semi circle ends with real tight
-   // padding on either side. Now in two flavors!
-merged
-  result 100644 419ec0bccd48a36eeace41e2a86c10861ebb2943 app/styles/ui/window/_app-menu-bar.scss
-  our    100644 dee56f6f0fff77036d78caa38bafeb385e572bf4 app/styles/ui/window/_app-menu-bar.scss
-@@ -10,12 +10,19 @@
-     }
-   }
-
-+  .toolbar-dropdown.open > .toolbar-button > button {
-+    background-color: var(--app-menu-button-active-background-color);
-+    color: var(--app-menu-button-active-color);
-+  }
-+
-   .toolbar-dropdown:not(.open) > .toolbar-button > button {
--    color: var(--toolbar-text-color);
-+    color: var(--app-menu-button-color);
-+    background: transparent;
-
-     &:hover,
-     &:focus {
--      color: var(--toolbar-button-color);
-+      color: var(--app-menu-button-hover-color);
-+      background: var(--app-menu-button-hover-background-color);
-     }
-   }
-
-@@ -39,8 +46,25 @@
-     pointer-events: none;
-
-     .menu-pane {
-+      --background-color: var(--app-menu-pane-background-color);
-       background: var(--background-color);
-+
-+      --text-color: var(--app-menu-pane-color);
-+      color: var(--text-color);
-+
-+      --text-secondary-color: var(--app-menu-pane-secondary-color);
-+
-       pointer-events: all;
-     }
-+
-+    .menu-item:hover {
-+      &:not(.disabled) {
-+        --text-color: var(--box-selected-active-text-color);
-+        --text-secondary-color: var(--box-selected-active-text-color);
-+
-+        color: var(--text-color);
-+        background-color: var(--box-selected-active-background-color);
-+      }
-+    }
-   }
- }
-merged
-  result 100644 69f1e178d8523dc79986e345766ace7b3aa278c2 app/styles/ui/window/_toast-notification.scss
-  our    100644 965026fe769810b727cc768025c568ede86e918b app/styles/ui/window/_toast-notification.scss
-@@ -14,8 +14,8 @@
-   .toast-notification {
-     padding: var(--spacing) var(--spacing-double);
-     min-width: 100px;
--    background: rgba($gray-900, 0.6);
--    color: $gray-000;
-+    background: var(--toast-notification-background-color);
-+    color: var(--toast-notification-color);
-     text-align: center;
-     border-radius: 100px;
-     font-size: var(--font-size-md);
-merged
-  result 100644 0e9a54a357e4abc1b90c957b3f2b5b9d770d63a9 app/styles/ui/window/_zoom-info.scss
-  our    100644 0c6db84cbb5f535dedef4192e2e914f5ab4ce20d app/styles/ui/window/_zoom-info.scss
-@@ -14,8 +14,8 @@
-   & > div {
-     padding: var(--spacing);
-     min-width: 100px;
--    background: rgba($gray-900, 0.6);
--    color: $gray-000;
-+    background: var(--toast-notification-background-color);
-+    color: var(--toast-notification-color);
-     text-align: center;
-     border-radius: 100px;
-     font-size: var(--font-size-md);
-removed in remote
-  base   100755 a5d7b84a673458d14d9aab082183a1968c2c7492 app/test/fixtures/submodule-basic-setup/_git/modules/foo/submodule/hooks/applypatch-msg.sample
-  our    100755 a5d7b84a673458d14d9aab082183a1968c2c7492 app/test/fixtures/submodule-basic-setup/_git/modules/foo/submodule/hooks/applypatch-msg.sample
-@@ -1,15 +0,0 @@
--#!/bin/sh
--#
--# An example hook script to check the commit log message taken by
--# applypatch from an e-mail message.
--#
--# The hook should exit with non-zero status after issuing an
--# appropriate message if it wants to stop the commit.  The hook is
--# allowed to edit the commit message file.
--#
--# To enable this hook, rename this file to "applypatch-msg".
--
--. git-sh-setup
--commitmsg="$(git rev-parse --git-path hooks/commit-msg)"
--test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"}
--:
-removed in remote
-  base   100755 b58d1184a9d43a39c0d95f32453efc78581877d6 app/test/fixtures/submodule-basic-setup/_git/modules/foo/submodule/hooks/commit-msg.sample
-  our    100755 b58d1184a9d43a39c0d95f32453efc78581877d6 app/test/fixtures/submodule-basic-setup/_git/modules/foo/submodule/hooks/commit-msg.sample
-@@ -1,24 +0,0 @@
--#!/bin/sh
--#
--# An example hook script to check the commit log message.
--# Called by "git commit" with one argument, the name of the file
--# that has the commit message.  The hook should exit with non-zero
--# status after issuing an appropriate message if it wants to stop the
--# commit.  The hook is allowed to edit the commit message file.
--#
--# To enable this hook, rename this file to "commit-msg".
--
--# Uncomment the below to add a Signed-off-by line to the message.
--# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
--# hook is more suited to it.
--#
--# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
--# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
--
--# This example catches duplicate Signed-off-by lines.
--
--test "" = "$(grep '^Signed-off-by: ' "$1" |
--	 sort | uniq -c | sed -e '/^[ 	]*1[ 	]/d')" || {
--	echo >&2 Duplicate Signed-off-by lines.
--	exit 1
--}
-removed in remote
-  base   100755 ec17ec1939b7c3e86b7cb6c0c4de6b0818a7e75e app/test/fixtures/submodule-basic-setup/_git/modules/foo/submodule/hooks/post-update.sample
-  our    100755 ec17ec1939b7c3e86b7cb6c0c4de6b0818a7e75e app/test/fixtures/submodule-basic-setup/_git/modules/foo/submodule/hooks/post-update.sample
-@@ -1,8 +0,0 @@
--#!/bin/sh
--#
--# An example hook script to prepare a packed repository for use over
--# dumb transports.
--#
--# To enable this hook, rename this file to "post-update".
--
--exec git update-server-info
-removed in remote
-  base   100755 4142082bcb939bbc17985a69ba748491ac6b62a5 app/test/fixtures/submodule-basic-setup/_git/modules/foo/submodule/hooks/pre-applypatch.sample
-  our    100755 4142082bcb939bbc17985a69ba748491ac6b62a5 app/test/fixtures/submodule-basic-setup/_git/modules/foo/submodule/hooks/pre-applypatch.sample
-@@ -1,14 +0,0 @@
--#!/bin/sh
--#
--# An example hook script to verify what is about to be committed
--# by applypatch from an e-mail message.
--#
--# The hook should exit with non-zero status after issuing an
--# appropriate message if it wants to stop the commit.
--#
--# To enable this hook, rename this file to "pre-applypatch".
--
--. git-sh-setup
--precommit="$(git rev-parse --git-path hooks/pre-commit)"
--test -x "$precommit" && exec "$precommit" ${1+"$@"}
--:
-removed in remote
-  base   100755 68d62d5446d963dc69006ad9a83907c6690f92c1 app/test/fixtures/submodule-basic-setup/_git/modules/foo/submodule/hooks/pre-commit.sample
-  our    100755 68d62d5446d963dc69006ad9a83907c6690f92c1 app/test/fixtures/submodule-basic-setup/_git/modules/foo/submodule/hooks/pre-commit.sample
-@@ -1,49 +0,0 @@
--#!/bin/sh
--#
--# An example hook script to verify what is about to be committed.
--# Called by "git commit" with no arguments.  The hook should
--# exit with non-zero status after issuing an appropriate message if
--# it wants to stop the commit.
--#
--# To enable this hook, rename this file to "pre-commit".
--
--if git rev-parse --verify HEAD >/dev/null 2>&1
--then
--	against=HEAD
--else
--	# Initial commit: diff against an empty tree object
--	against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
--fi
--
--# If you want to allow non-ASCII filenames set this variable to true.
--allownonascii=$(git config --bool hooks.allownonascii)
--
--# Redirect output to stderr.
--exec 1>&2
--
--# Cross platform projects tend to avoid non-ASCII filenames; prevent
--# them from being added to the repository. We exploit the fact that the
--# printable range starts at the space character and ends with tilde.
--if [ "$allownonascii" != "true" ] &&
--	# Note that the use of brackets around a tr range is ok here, (it's
--	# even required, for portability to Solaris 10's /usr/bin/tr), since
--	# the square bracket bytes happen to fall in the designated range.
--	test $(git diff --cached --name-only --diff-filter=A -z $against |
--	  LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
--then
--	cat <<\EOF
--Error: Attempt to add a non-ASCII file name.
--
--This can cause problems if you want to work with people on other platforms.
--
--To be portable it is advisable to rename the file.
--
--If you know what you are doing you can disable this check using:
--
--  git config hooks.allownonascii true
--EOF
--	exit 1
--fi
--
--# If there are whitespace errors, print the offending file names and fail.
--exec git diff-index --check --cached $against --
-removed in remote
-  base   100755 6187dbf4390fc6e28445dd3d988aefb9d1111988 app/test/fixtures/submodule-basic-setup/_git/modules/foo/submodule/hooks/pre-push.sample
-  our    100755 6187dbf4390fc6e28445dd3d988aefb9d1111988 app/test/fixtures/submodule-basic-setup/_git/modules/foo/submodule/hooks/pre-push.sample
-@@ -1,53 +0,0 @@
--#!/bin/sh
--
--# An example hook script to verify what is about to be pushed.  Called by "git
--# push" after it has checked the remote status, but before anything has been
--# pushed.  If this script exits with a non-zero status nothing will be pushed.
--#
--# This hook is called with the following parameters:
--#
--# $1 -- Name of the remote to which the push is being done
--# $2 -- URL to which the push is being done
--#
--# If pushing without using a named remote those arguments will be equal.
--#
--# Information about the commits which are being pushed is supplied as lines to
--# the standard input in the form:
--#
--#   <local ref> <local sha1> <remote ref> <remote sha1>
--#
--# This sample shows how to prevent push of commits where the log message starts
--# with "WIP" (work in progress).
--
--remote="$1"
--url="$2"
--
--z40=0000000000000000000000000000000000000000
--
--while read local_ref local_sha remote_ref remote_sha
--do
--	if [ "$local_sha" = $z40 ]
--	then
--		# Handle delete
--		:
--	else
--		if [ "$remote_sha" = $z40 ]
--		then
--			# New branch, examine all commits
--			range="$local_sha"
--		else
--			# Update to existing branch, examine new commits
--			range="$remote_sha..$local_sha"
--		fi
--
--		# Check for WIP commit
--		commit=`git rev-list -n 1 --grep '^WIP' "$range"`
--		if [ -n "$commit" ]
--		then
--			echo >&2 "Found WIP commit in $local_ref, not pushing"
--			exit 1
--		fi
--	fi
--done
--
--exit 0
-removed in remote
-  base   100755 6cbef5c370d8c3486ca85423dd70440c5e0a2aa2 app/test/fixtures/submodule-basic-setup/_git/modules/foo/submodule/hooks/pre-rebase.sample
-  our    100755 6cbef5c370d8c3486ca85423dd70440c5e0a2aa2 app/test/fixtures/submodule-basic-setup/_git/modules/foo/submodule/hooks/pre-rebase.sample
-@@ -1,169 +0,0 @@
--#!/bin/sh
--#
--# Copyright (c) 2006, 2008 Junio C Hamano
--#
--# The "pre-rebase" hook is run just before "git rebase" starts doing
--# its job, and can prevent the command from running by exiting with
--# non-zero status.
--#
--# The hook is called with the following parameters:
--#
--# $1 -- the upstream the series was forked from.
--# $2 -- the branch being rebased (or empty when rebasing the current branch).
--#
--# This sample shows how to prevent topic branches that are already
--# merged to 'next' branch from getting rebased, because allowing it
--# would result in rebasing already published history.
--
--publish=next
--basebranch="$1"
--if test "$#" = 2
--then
--	topic="refs/heads/$2"
--else
--	topic=`git symbolic-ref HEAD` ||
--	exit 0 ;# we do not interrupt rebasing detached HEAD
--fi
--
--case "$topic" in
--refs/heads/??/*)
--	;;
--*)
--	exit 0 ;# we do not interrupt others.
--	;;
--esac
--
--# Now we are dealing with a topic branch being rebased
--# on top of master.  Is it OK to rebase it?
--
--# Does the topic really exist?
--git show-ref -q "$topic" || {
--	echo >&2 "No such branch $topic"
--	exit 1
--}
--
--# Is topic fully merged to master?
--not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
--if test -z "$not_in_master"
--then
--	echo >&2 "$topic is fully merged to master; better remove it."
--	exit 1 ;# we could allow it, but there is no point.
--fi
--
--# Is topic ever merged to next?  If so you should not be rebasing it.
--only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
--only_next_2=`git rev-list ^master           ${publish} | sort`
--if test "$only_next_1" = "$only_next_2"
--then
--	not_in_topic=`git rev-list "^$topic" master`
--	if test -z "$not_in_topic"
--	then
--		echo >&2 "$topic is already up to date with master"
--		exit 1 ;# we could allow it, but there is no point.
--	else
--		exit 0
--	fi
--else
--	not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
--	/usr/bin/perl -e '
--		my $topic = $ARGV[0];
--		my $msg = "* $topic has commits already merged to public branch:\n";
--		my (%not_in_next) = map {
--			/^([0-9a-f]+) /;
--			($1 => 1);
--		} split(/\n/, $ARGV[1]);
--		for my $elem (map {
--				/^([0-9a-f]+) (.*)$/;
--				[$1 => $2];
--			} split(/\n/, $ARGV[2])) {
--			if (!exists $not_in_next{$elem->[0]}) {
--				if ($msg) {
--					print STDERR $msg;
--					undef $msg;
--				}
--				print STDERR " $elem->[1]\n";
--			}
--		}
--	' "$topic" "$not_in_next" "$not_in_master"
--	exit 1
--fi
--
--<<\DOC_END
--
--This sample hook safeguards topic branches that have been
--published from being rewound.
--
--The workflow assumed here is:
--
-- * Once a topic branch forks from "master", "master" is never
--   merged into it again (either directly or indirectly).
--
-- * Once a topic branch is fully cooked and merged into "master",
--   it is deleted.  If you need to build on top of it to correct
--   earlier mistakes, a new topic branch is created by forking at
--   the tip of the "master".  This is not strictly necessary, but
--   it makes it easier to keep your history simple.
--
-- * Whenever you need to test or publish your changes to topic
--   branches, merge them into "next" branch.
--
--The script, being an example, hardcodes the publish branch name
--to be "next", but it is trivial to make it configurable via
--$GIT_DIR/config mechanism.
--
--With this workflow, you would want to know:
--
--(1) ... if a topic branch has ever been merged to "next".  Young
--    topic branches can have stupid mistakes you would rather
--    clean up before publishing, and things that have not been
--    merged into other branches can be easily rebased without
--    affecting other people.  But once it is published, you would
--    not want to rewind it.
--
--(2) ... if a topic branch has been fully merged to "master".
--    Then you can delete it.  More importantly, you should not
--    build on top of it -- other people may already want to
--    change things related to the topic as patches against your
--    "master", so if you need further changes, it is better to
--    fork the topic (perhaps with the same name) afresh from the
--    tip of "master".
--
--Let's look at this example:
--
--		   o---o---o---o---o---o---o---o---o---o "next"
--		  /       /           /           /
--		 /   a---a---b A     /           /
--		/   /               /           /
--	       /   /   c---c---c---c B         /
--	      /   /   /             \         /
--	     /   /   /   b---b C     \       /
--	    /   /   /   /             \     /
--    ---o---o---o---o---o---o---o---o---o---o---o "master"
--
--
--A, B and C are topic branches.
--
-- * A has one fix since it was merged up to "next".
--
-- * B has finished.  It has been fully merged up to "master" and "next",
--   and is ready to be deleted.
--
-- * C has not merged to "next" at all.
--
--We would want to allow C to be rebased, refuse A, and encourage
--B to be deleted.
--
--To compute (1):
--
--	git rev-list ^master ^topic next
--	git rev-list ^master        next
--
--	if these match, topic has not merged in next at all.
--
--To compute (2):
--
--	git rev-list master..topic
--
--	if this is empty, it is fully merged to "master".
--
--DOC_END
-removed in remote
-  base   100755 a1fd29ec14823d8bc4a8d1a2cfe35451580f5118 app/test/fixtures/submodule-basic-setup/_git/modules/foo/submodule/hooks/pre-receive.sample
-  our    100755 a1fd29ec14823d8bc4a8d1a2cfe35451580f5118 app/test/fixtures/submodule-basic-setup/_git/modules/foo/submodule/hooks/pre-receive.sample
-@@ -1,24 +0,0 @@
--#!/bin/sh
--#
--# An example hook script to make use of push options.
--# The example simply echoes all push options that start with 'echoback='
--# and rejects all pushes when the "reject" push option is used.
--#
--# To enable this hook, rename this file to "pre-receive".
--
--if test -n "$GIT_PUSH_OPTION_COUNT"
--then
--	i=0
--	while test "$i" -lt "$GIT_PUSH_OPTION_COUNT"
--	do
--		eval "value=\$GIT_PUSH_OPTION_$i"
--		case "$value" in
--		echoback=*)
--			echo "echo from the pre-receive-hook: ${value#*=}" >&2
--			;;
--		reject)
--			exit 1
--		esac
--		i=$((i + 1))
--	done
--fi
-removed in remote
-  base   100755 10fa14c5ab0134436e2ae435138bf921eb477c60 app/test/fixtures/submodule-basic-setup/_git/modules/foo/submodule/hooks/prepare-commit-msg.sample
-  our    100755 10fa14c5ab0134436e2ae435138bf921eb477c60 app/test/fixtures/submodule-basic-setup/_git/modules/foo/submodule/hooks/prepare-commit-msg.sample
-@@ -1,42 +0,0 @@
--#!/bin/sh
--#
--# An example hook script to prepare the commit log message.
--# Called by "git commit" with the name of the file that has the
--# commit message, followed by the description of the commit
--# message's source.  The hook's purpose is to edit the commit
--# message file.  If the hook fails with a non-zero status,
--# the commit is aborted.
--#
--# To enable this hook, rename this file to "prepare-commit-msg".
--
--# This hook includes three examples. The first one removes the
--# "# Please enter the commit message..." help message.
--#
--# The second includes the output of "git diff --name-status -r"
--# into the message, just before the "git status" output.  It is
--# commented because it doesn't cope with --amend or with squashed
--# commits.
--#
--# The third example adds a Signed-off-by line to the message, that can
--# still be edited.  This is rarely a good idea.
--
--COMMIT_MSG_FILE=$1
--COMMIT_SOURCE=$2
--SHA1=$3
--
--/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE"
--
--# case "$COMMIT_SOURCE,$SHA1" in
--#  ,|template,)
--#    /usr/bin/perl -i.bak -pe '
--#       print "\n" . `git diff --cached --name-status -r`
--# 	 if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;;
--#  *) ;;
--# esac
--
--# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
--# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE"
--# if test -z "$COMMIT_SOURCE"
--# then
--#   /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE"
--# fi
-removed in remote
-  base   100755 80ba94135cc378364af9d3cb2450df48e51faf2c app/test/fixtures/submodule-basic-setup/_git/modules/foo/submodule/hooks/update.sample
-  our    100755 80ba94135cc378364af9d3cb2450df48e51faf2c app/test/fixtures/submodule-basic-setup/_git/modules/foo/submodule/hooks/update.sample
-@@ -1,128 +0,0 @@
--#!/bin/sh
--#
--# An example hook script to block unannotated tags from entering.
--# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
--#
--# To enable this hook, rename this file to "update".
--#
--# Config
--# ------
--# hooks.allowunannotated
--#   This boolean sets whether unannotated tags will be allowed into the
--#   repository.  By default they won't be.
--# hooks.allowdeletetag
--#   This boolean sets whether deleting tags will be allowed in the
--#   repository.  By default they won't be.
--# hooks.allowmodifytag
--#   This boolean sets whether a tag may be modified after creation. By default
--#   it won't be.
--# hooks.allowdeletebranch
--#   This boolean sets whether deleting branches will be allowed in the
--#   repository.  By default they won't be.
--# hooks.denycreatebranch
--#   This boolean sets whether remotely creating branches will be denied
--#   in the repository.  By default this is allowed.
--#
--
--# --- Command line
--refname="$1"
--oldrev="$2"
--newrev="$3"
--
--# --- Safety check
--if [ -z "$GIT_DIR" ]; then
--	echo "Don't run this script from the command line." >&2
--	echo " (if you want, you could supply GIT_DIR then run" >&2
--	echo "  $0 <ref> <oldrev> <newrev>)" >&2
--	exit 1
--fi
--
--if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
--	echo "usage: $0 <ref> <oldrev> <newrev>" >&2
--	exit 1
--fi
--
--# --- Config
--allowunannotated=$(git config --bool hooks.allowunannotated)
--allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
--denycreatebranch=$(git config --bool hooks.denycreatebranch)
--allowdeletetag=$(git config --bool hooks.allowdeletetag)
--allowmodifytag=$(git config --bool hooks.allowmodifytag)
--
--# check for no description
--projectdesc=$(sed -e '1q' "$GIT_DIR/description")
--case "$projectdesc" in
--"Unnamed repository"* | "")
--	echo "*** Project description file hasn't been set" >&2
--	exit 1
--	;;
--esac
--
--# --- Check types
--# if $newrev is 0000...0000, it's a commit to delete a ref.
--zero="0000000000000000000000000000000000000000"
--if [ "$newrev" = "$zero" ]; then
--	newrev_type=delete
--else
--	newrev_type=$(git cat-file -t $newrev)
--fi
--
--case "$refname","$newrev_type" in
--	refs/tags/*,commit)
--		# un-annotated tag
--		short_refname=${refname##refs/tags/}
--		if [ "$allowunannotated" != "true" ]; then
--			echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
--			echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
--			exit 1
--		fi
--		;;
--	refs/tags/*,delete)
--		# delete tag
--		if [ "$allowdeletetag" != "true" ]; then
--			echo "*** Deleting a tag is not allowed in this repository" >&2
--			exit 1
--		fi
--		;;
--	refs/tags/*,tag)
--		# annotated tag
--		if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
--		then
--			echo "*** Tag '$refname' already exists." >&2
--			echo "*** Modifying a tag is not allowed in this repository." >&2
--			exit 1
--		fi
--		;;
--	refs/heads/*,commit)
--		# branch
--		if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
--			echo "*** Creating a branch is not allowed in this repository" >&2
--			exit 1
--		fi
--		;;
--	refs/heads/*,delete)
--		# delete branch
--		if [ "$allowdeletebranch" != "true" ]; then
--			echo "*** Deleting a branch is not allowed in this repository" >&2
--			exit 1
--		fi
--		;;
--	refs/remotes/*,commit)
--		# tracking branch
--		;;
--	refs/remotes/*,delete)
--		# delete tracking branch
--		if [ "$allowdeletebranch" != "true" ]; then
--			echo "*** Deleting a tracking branch is not allowed in this repository" >&2
--			exit 1
--		fi
--		;;
--	*)
--		# Anything else (is there anything else?)
--		echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
--		exit 1
--		;;
--esac
--
--# --- Finished
--exit 0
-merged
-  result 100644 c6c9857c1f579b979bb63020edfeee5cd8c1c3b2 app/test/helpers/repositories.ts
-  our    100644 684c5668ef4b431203378ee88185530b2bb7cf6f app/test/helpers/repositories.ts
-@@ -23,7 +23,9 @@
-  *
-  * @returns The path to the set up fixture repository.
-  */
--export function setupFixtureRepository(repositoryName: string): string {
-+export async function setupFixtureRepository(
-+  repositoryName: string
-+): Promise<string> {
-   const testRepoFixturePath = Path.join(
-     __dirname,
-     '..',
-@@ -31,9 +33,9 @@
-     repositoryName
-   )
-   const testRepoPath = _temp.mkdirSync('desktop-git-test-')
--  FSE.copySync(testRepoFixturePath, testRepoPath)
-+  await FSE.copy(testRepoFixturePath, testRepoPath)
-
--  FSE.renameSync(
-+  await FSE.rename(
-     Path.join(testRepoPath, '_git'),
-     Path.join(testRepoPath, '.git')
-   )
-@@ -49,11 +51,11 @@
-     entry => Path.basename(entry.path) === '_git'
-   )
-
--  submodules.forEach(entry => {
--    const directory = Path.dirname(entry.path)
-+  for (const submodule of submodules) {
-+    const directory = Path.dirname(submodule.path)
-     const newPath = Path.join(directory, '.git')
--    FSE.renameSync(entry.path, newPath)
--  })
-+    await FSE.rename(submodule.path, newPath)
-+  }
-
-   return testRepoPath
- }
-@@ -84,19 +86,19 @@
-   const repo = await setupEmptyRepository()
-   const filePath = Path.join(repo.path, 'foo')
-
--  FSE.writeFileSync(filePath, '')
-+  await FSE.writeFile(filePath, '')
-   await GitProcess.exec(['add', 'foo'], repo.path)
-   await GitProcess.exec(['commit', '-m', 'Commit'], repo.path)
-
-   await GitProcess.exec(['branch', 'other-branch'], repo.path)
-
--  FSE.writeFileSync(filePath, 'b1')
-+  await FSE.writeFile(filePath, 'b1')
-   await GitProcess.exec(['add', 'foo'], repo.path)
-   await GitProcess.exec(['commit', '-m', 'Commit'], repo.path)
-
-   await GitProcess.exec(['checkout', 'other-branch'], repo.path)
-
--  FSE.writeFileSync(filePath, 'b2')
-+  await FSE.writeFile(filePath, 'b2')
-   await GitProcess.exec(['add', 'foo'], repo.path)
-   await GitProcess.exec(['commit', '-m', 'Commit'], repo.path)
-
-merged
-  result 100644 32e6cc0b6bac7d1adf6b538418ecc086354b1b67 app/test/unit/app-store-test.ts
-  our    100644 bd8253abfa8404e42377b4b26ffe52f11269f273 app/test/unit/app-store-test.ts
-@@ -1,9 +1,7 @@
--/* eslint-disable no-sync */
--
--import { expect } from 'chai'
-+import { expect, AssertionError } from 'chai'
-
- import * as Path from 'path'
--import * as Fs from 'fs'
-+import * as FSE from 'fs-extra'
- import { GitProcess } from 'dugite'
-
- import {
-@@ -30,7 +28,7 @@
- import { StatsStore } from '../../src/lib/stats'
-
- import {
--  RepositorySection,
-+  RepositorySectionTab,
-   SelectionType,
-   IRepositoryState,
- } from '../../src/lib/app-state'
-@@ -91,15 +89,15 @@
-   describe('undo first commit', () => {
-     function getAppState(appStore: AppStore): IRepositoryState {
-       const selectedState = appStore.getState().selectedState
--      if (!selectedState) {
--        throw new chai.AssertionError('No selected state for AppStore')
-+      if (selectedState == null) {
-+        throw new AssertionError('No selected state for AppStore')
-       }
-
-       switch (selectedState.type) {
-         case SelectionType.Repository:
-           return selectedState.state
-         default:
--          throw new chai.AssertionError(
-+          throw new AssertionError(
-             `Got selected state of type ${
-               selectedState.type
-             } which is not supported.`
-@@ -116,7 +114,7 @@
-       const file = 'README.md'
-       const filePath = Path.join(repo.path, file)
-
--      Fs.writeFileSync(filePath, 'SOME WORDS GO HERE\n')
-+      await FSE.writeFile(filePath, 'SOME WORDS GO HERE\n')
-
-       await GitProcess.exec(['add', file], repo.path)
-       await GitProcess.exec(['commit', '-m', 'added file'], repo.path)
-@@ -135,7 +133,7 @@
-       await appStore._selectRepository(repository)
-       await appStore._changeRepositorySection(
-         repository,
--        RepositorySection.Changes
-+        RepositorySectionTab.Changes
-       )
-
-       let state = getAppState(appStore)
-added in remote
-  their  100644 3b6e1598c0431836c3eb4416278702dcfb36fc7a app/test/unit/fuzzy-find-test.ts
-@@ -0,0 +1,47 @@
-+import { expect } from 'chai'
-+
-+import { match } from '../../src/lib/fuzzy-find'
-+import { getText } from '../../src/ui/lib/filter-list'
-+describe('fuzzy find', () => {
-+  const items = [
-+    {
-+      id: '300',
-+      text: ['add fix for ...', 'opened 5 days ago by bob'],
-+    },
-+    {
-+      id: '500',
-+      text: ['add support', '#4653 opened 3 days ago by damaneice '],
-+    },
-+    {
-+      id: '500',
-+      text: ['add an awesome feature', '#7564 opened 10 days ago by ... '],
-+    },
-+  ]
-+
-+  it('should find matching item when searching by pull request number', () => {
-+    const results = match('4653', items, getText)
-+
-+    expect(results.length).to.equal(1)
-+    expect(results[0].item['text'].join('')).to.include('4653')
-+  })
-+
-+  it('should find matching item when searching by author', () => {
-+    const results = match('damaneice', items, getText)
-+
-+    expect(results.length).to.equal(1)
-+    expect(results[0].item['text'].join('')).to.include('damaneice')
-+  })
-+
-+  it('should find matching item when by title', () => {
-+    const results = match('awesome feature', items, getText)
-+
-+    expect(results.length).to.equal(1)
-+    expect(results[0].item['text'].join('')).to.include('awesome feature')
-+  })
-+
-+  it('should find nothing', () => {
-+    const results = match('$%^', items, getText)
-+
-+    expect(results.length).to.equal(0)
-+  })
-+})
-merged
-  result 100644 e02161f0a2678543f55f2c71f1a61103faa56c1b app/test/unit/git-store-test.ts
-  our    100644 b69dfb902e2537440f7b72b9537c1de1aaf8b113 app/test/unit/git-store-test.ts
-@@ -1,7 +1,5 @@
--/* eslint-disable no-sync */
--
- import { expect } from 'chai'
--import * as Fs from 'fs'
-+import * as FSE from 'fs-extra'
- import * as Path from 'path'
- import { GitProcess } from 'dugite'
-
-@@ -26,18 +24,18 @@
-     const readmeFile = 'README.md'
-     const readmeFilePath = Path.join(repo.path, readmeFile)
-
--    Fs.writeFileSync(readmeFilePath, 'SOME WORDS GO HERE\n')
-+    await FSE.writeFile(readmeFilePath, 'SOME WORDS GO HERE\n')
-
-     const licenseFile = 'LICENSE.md'
-     const licenseFilePath = Path.join(repo.path, licenseFile)
-
--    Fs.writeFileSync(licenseFilePath, 'SOME WORDS GO HERE\n')
-+    await FSE.writeFile(licenseFilePath, 'SOME WORDS GO HERE\n')
-
-     // commit the readme file but leave the license
-     await GitProcess.exec(['add', readmeFile], repo.path)
-     await GitProcess.exec(['commit', '-m', 'added readme file'], repo.path)
-
--    Fs.writeFileSync(readmeFilePath, 'WRITING SOME NEW WORDS\n')
-+    await FSE.writeFile(readmeFilePath, 'WRITING SOME NEW WORDS\n')
-     // setup requires knowing about the current tip
-     await gitStore.loadStatus()
-
-@@ -65,7 +63,7 @@
-     const renamedFile = 'NEW-README.md'
-     const filePath = Path.join(repo.path, file)
-
--    Fs.writeFileSync(filePath, 'SOME WORDS GO HERE\n')
-+    await FSE.writeFile(filePath, 'SOME WORDS GO HERE\n')
-
-     // commit the file, and then rename it
-     await GitProcess.exec(['add', file], repo.path)
-@@ -96,7 +94,7 @@
-       const file = 'README.md'
-       const filePath = Path.join(repo.path, file)
-
--      Fs.writeFileSync(filePath, 'SOME WORDS GO HERE\n')
-+      await FSE.writeFile(filePath, 'SOME WORDS GO HERE\n')
-
-       await GitProcess.exec(['add', file], repo.path)
-       await GitProcess.exec(['commit', '-m', commitMessage], repo.path)
-@@ -199,7 +197,7 @@
-       const file = 'README.md'
-       const filePath = Path.join(repo.path, file)
-
--      Fs.writeFileSync(filePath, 'SOME WORDS GO HERE\n')
-+      await FSE.writeFile(filePath, 'SOME WORDS GO HERE\n')
-
-       let status = await getStatus(repo!)
-       let files = status.workingDirectory.files
-merged
-  result 100644 b8af7e5f1bcd0c13b909dfa237c7d3378bcc683f app/test/unit/git/commit-test.ts
-  our    100644 b5ac688e52bb47f381388bb2ae97547c3766deb5 app/test/unit/git/commit-test.ts
-@@ -1,6 +1,6 @@
--/* eslint-disable no-sync */
--
- import * as path from 'path'
-+import * as FSE from 'fs-extra'
-+
- import { expect } from 'chai'
-
- import { Repository } from '../../../src/models/repository'
-@@ -31,8 +31,6 @@
-   DiffType,
- } from '../../../src/models/diff'
-
--import * as fs from 'fs-extra'
--
- async function getTextDiff(
-   repo: Repository,
-   file: WorkingDirectoryFileChange
-@@ -46,13 +44,16 @@
-   let repository: Repository | null = null
-
-   beforeEach(async () => {
--    const testRepoPath = setupFixtureRepository('test-repo')
-+    const testRepoPath = await setupFixtureRepository('test-repo')
-     repository = new Repository(testRepoPath, -1, null, false)
-   })
-
-   describe('createCommit normal', () => {
-     it('commits the given files', async () => {
--      fs.writeFileSync(path.join(repository!.path, 'README.md'), 'Hi world\n')
-+      await FSE.writeFile(
-+        path.join(repository!.path, 'README.md'),
-+        'Hi world\n'
-+      )
-
-       let status = await getStatus(repository!)
-       let files = status.workingDirectory.files
-@@ -70,7 +71,10 @@
-     })
-
-     it('commit does not strip commentary by default', async () => {
--      fs.writeFileSync(path.join(repository!.path, 'README.md'), 'Hi world\n')
-+      await FSE.writeFile(
-+        path.join(repository!.path, 'README.md'),
-+        'Hi world\n'
-+      )
-
-       const status = await getStatus(repository!)
-       const files = status.workingDirectory.files
-@@ -91,8 +95,8 @@
-     it('can commit for empty repository', async () => {
-       const repo = await setupEmptyRepository()
-
--      fs.writeFileSync(path.join(repo.path, 'foo'), 'foo\n')
--      fs.writeFileSync(path.join(repo.path, 'bar'), 'bar\n')
-+      await FSE.writeFile(path.join(repo.path, 'foo'), 'foo\n')
-+      await FSE.writeFile(path.join(repo.path, 'bar'), 'bar\n')
-
-       const status = await getStatus(repo)
-       const files = status.workingDirectory.files
-@@ -124,7 +128,7 @@
-     it('can commit renames', async () => {
-       const repo = await setupEmptyRepository()
-
--      fs.writeFileSync(path.join(repo.path, 'foo'), 'foo\n')
-+      await FSE.writeFile(path.join(repo.path, 'foo'), 'foo\n')
-
-       await GitProcess.exec(['add', 'foo'], repo.path)
-       await GitProcess.exec(['commit', '-m', 'Initial commit'], repo.path)
-@@ -147,7 +151,7 @@
-
-   describe('createCommit partials', () => {
-     beforeEach(async () => {
--      const testRepoPath = setupFixtureRepository('repo-with-changes')
-+      const testRepoPath = await setupFixtureRepository('repo-with-changes')
-       repository = new Repository(testRepoPath, -1, null, false)
-     })
-
-@@ -383,13 +387,13 @@
-     it('can commit renames with modifications', async () => {
-       const repo = await setupEmptyRepository()
-
--      fs.writeFileSync(path.join(repo.path, 'foo'), 'foo\n')
-+      await FSE.writeFile(path.join(repo.path, 'foo'), 'foo\n')
-
-       await GitProcess.exec(['add', 'foo'], repo.path)
-       await GitProcess.exec(['commit', '-m', 'Initial commit'], repo.path)
-       await GitProcess.exec(['mv', 'foo', 'bar'], repo.path)
-
--      fs.writeFileSync(path.join(repo.path, 'bar'), 'bar\n')
-+      await FSE.writeFile(path.join(repo.path, 'bar'), 'bar\n')
-
-       const status = await getStatus(repo)
-       const files = status.workingDirectory.files
-@@ -411,13 +415,13 @@
-     it('can commit renames with partially selected modifications', async () => {
-       const repo = await setupEmptyRepository()
-
--      fs.writeFileSync(path.join(repo.path, 'foo'), 'line1\n')
-+      await FSE.writeFile(path.join(repo.path, 'foo'), 'line1\n')
-
-       await GitProcess.exec(['add', 'foo'], repo.path)
-       await GitProcess.exec(['commit', '-m', 'Initial commit'], repo.path)
-       await GitProcess.exec(['mv', 'foo', 'bar'], repo.path)
-
--      fs.writeFileSync(path.join(repo.path, 'bar'), 'line1\nline2\nline3\n')
-+      await FSE.writeFile(path.join(repo.path, 'bar'), 'line1\nline2\nline3\n')
-
-       const status = await getStatus(repo)
-       const files = status.workingDirectory.files
-@@ -454,10 +458,12 @@
-       const repo = await setupConflictedRepo()
-       const filePath = path.join(repo.path, 'foo')
-
--      const inMerge = fs.existsSync(path.join(repo.path, '.git', 'MERGE_HEAD'))
-+      const inMerge = await FSE.pathExists(
-+        path.join(repo.path, '.git', 'MERGE_HEAD')
-+      )
-       expect(inMerge).to.equal(true)
-
--      fs.writeFileSync(filePath, 'b1b2')
-+      await FSE.writeFile(filePath, 'b1b2')
-
-       const status = await getStatus(repo)
-       const files = status.workingDirectory.files
-@@ -485,12 +491,12 @@
-       const firstPath = path.join(repo.path, 'first')
-       const secondPath = path.join(repo.path, 'second')
-
--      fs.writeFileSync(firstPath, 'line1\n')
--      fs.writeFileSync(secondPath, 'line2\n')
-+      await FSE.writeFile(firstPath, 'line1\n')
-+      await FSE.writeFile(secondPath, 'line2\n')
-
-       await GitProcess.exec(['add', '.'], repo.path)
-
--      fs.unlinkSync(firstPath)
-+      await FSE.unlink(firstPath)
-
-       status = await getStatus(repo)
-       files = status.workingDirectory.files
-@@ -519,14 +525,14 @@
-       const repo = await setupEmptyRepository()
-
-       const firstPath = path.join(repo.path, 'first')
--      fs.writeFileSync(firstPath, 'line1\n')
-+      await FSE.writeFile(firstPath, 'line1\n')
-
-       await GitProcess.exec(['add', 'first'], repo.path)
-       await GitProcess.exec(['commit', '-am', 'commit first file'], repo.path)
-       await GitProcess.exec(['rm', '--cached', 'first'], repo.path)
-
-       // if the text is now different, everything is fine
--      fs.writeFileSync(firstPath, 'line2\n')
-+      await FSE.writeFile(firstPath, 'line2\n')
-
-       status = await getStatus(repo)
-       files = status.workingDirectory.files
-merged
-  result 100644 d72e598b34da70f1894844dffc261776e7134a67 app/test/unit/git/config-test.ts
-  our    100644 15317f86c3ba7276aff4b60a3953977a2faeb366 app/test/unit/git/config-test.ts
-@@ -1,5 +1,3 @@
--/* eslint-disable no-sync */
--
- import { expect } from 'chai'
-
- import { Repository } from '../../../src/models/repository'
-@@ -15,8 +13,8 @@
- describe('git/config', () => {
-   let repository: Repository | null = null
-
--  beforeEach(() => {
--    const testRepoPath = setupFixtureRepository('test-repo')
-+  beforeEach(async () => {
-+    const testRepoPath = await setupFixtureRepository('test-repo')
-     repository = new Repository(testRepoPath, -1, null, false)
-   })
-
-merged
-  result 100644 9102d54e4ff407253f9f43fc45f7947c8e9bd28f app/test/unit/git/core-test.ts
-  our    100644 31f49752ce15852eb636a19c18f289d48fa9e745 app/test/unit/git/core-test.ts
-@@ -1,5 +1,3 @@
--/* eslint-disable no-sync */
--
- import { expect } from 'chai'
- import { GitError } from 'dugite'
-
-@@ -10,8 +8,8 @@
- describe('git/core', () => {
-   let repository: Repository | null = null
-
--  beforeEach(() => {
--    const testRepoPath = setupFixtureRepository('test-repo')
-+  beforeEach(async () => {
-+    const testRepoPath = await setupFixtureRepository('test-repo')
-     repository = new Repository(testRepoPath, -1, null, false)
-   })
-
-added in remote
-  their  100644 1ed66bd68f5c8720ca2034726118003654d19391 app/test/unit/git/description-test.ts
-@@ -0,0 +1,35 @@
-+import { expect } from 'chai'
-+import * as FSE from 'fs-extra'
-+import * as Path from 'path'
-+
-+import { getGitDescription } from '../../../src/lib/git'
-+import { setupEmptyRepository } from '../../helpers/repositories'
-+
-+describe('git/description', () => {
-+  describe('getGitDescription', () => {
-+    it('returns empty for an initialized repository', async () => {
-+      const repo = await setupEmptyRepository()
-+      const actual = await getGitDescription(repo.path)
-+      expect(actual).equals('')
-+    })
-+
-+    it('returns empty when path is missing', async () => {
-+      const repo = await setupEmptyRepository()
-+      const path = Path.join(repo.path, '.git', 'description')
-+      await FSE.unlink(path)
-+
-+      const actual = await getGitDescription(repo.path)
-+      expect(actual).equals('')
-+    })
-+
-+    it('reads the custom text', async () => {
-+      const expected = 'this is a repository description'
-+      const repo = await setupEmptyRepository()
-+      const path = Path.join(repo.path, '.git', 'description')
-+      await FSE.writeFile(path, expected)
-+
-+      const actual = await getGitDescription(repo.path)
-+      expect(actual).equals(expected)
-+    })
-+  })
-+})
-merged
-  result 100644 70828b75f4fb7701c613f210cfcd5a077c1e6160 app/test/unit/git/diff-test.ts
-  our    100644 e51e778ec9c2cf88a9eeed5a4b7201e8ddbca64f app/test/unit/git/diff-test.ts
-@@ -1,9 +1,7 @@
--/* eslint-disable no-sync */
--
- import { expect } from 'chai'
-
- import * as path from 'path'
--import * as fs from 'fs-extra'
-+import * as FSE from 'fs-extra'
-
- import { Repository } from '../../../src/models/repository'
- import {
-@@ -43,8 +41,8 @@
- describe('git/diff', () => {
-   let repository: Repository | null = null
-
--  beforeEach(() => {
--    const testRepoPath = setupFixtureRepository('repo-with-image-changes')
-+  beforeEach(async () => {
-+    const testRepoPath = await setupFixtureRepository('repo-with-image-changes')
-     repository = new Repository(testRepoPath, -1, null, false)
-   })
-
-@@ -135,7 +133,7 @@
-     })
-
-     it('changes for text are not set', async () => {
--      const testRepoPath = setupFixtureRepository('repo-with-changes')
-+      const testRepoPath = await setupFixtureRepository('repo-with-changes')
-       repository = new Repository(testRepoPath, -1, null, false)
-
-       const diffSelection = DiffSelection.fromInitialSelection(
-@@ -153,8 +151,8 @@
-   })
-
-   describe('getWorkingDirectoryDiff', () => {
--    beforeEach(() => {
--      const testRepoPath = setupFixtureRepository('repo-with-changes')
-+    beforeEach(async () => {
-+      const testRepoPath = await setupFixtureRepository('repo-with-changes')
-       repository = new Repository(testRepoPath, -1, null, false)
-     })
-
-@@ -260,7 +258,7 @@
-     it('is empty for a renamed file', async () => {
-       const repo = await setupEmptyRepository()
-
--      fs.writeFileSync(path.join(repo.path, 'foo'), 'foo\n')
-+      await FSE.writeFile(path.join(repo.path, 'foo'), 'foo\n')
-
-       await GitProcess.exec(['add', 'foo'], repo.path)
-       await GitProcess.exec(['commit', '-m', 'Initial commit'], repo.path)
-@@ -283,13 +281,13 @@
-     it('only shows modifications after move for a renamed and modified file', async () => {
-       const repo = await setupEmptyRepository()
-
--      fs.writeFileSync(path.join(repo.path, 'foo'), 'foo\n')
-+      await FSE.writeFile(path.join(repo.path, 'foo'), 'foo\n')
-
-       await GitProcess.exec(['add', 'foo'], repo.path)
-       await GitProcess.exec(['commit', '-m', 'Initial commit'], repo.path)
-       await GitProcess.exec(['mv', 'foo', 'bar'], repo.path)
-
--      fs.writeFileSync(path.join(repo.path, 'bar'), 'bar\n')
-+      await FSE.writeFile(path.join(repo.path, 'bar'), 'bar\n')
-
-       const status = await getStatus(repo)
-       const files = status.workingDirectory.files
-@@ -309,11 +307,14 @@
-     it('handles unborn repository with mixed state', async () => {
-       const repo = await setupEmptyRepository()
-
--      fs.writeFileSync(path.join(repo.path, 'foo'), 'WRITING THE FIRST LINE\n')
-+      await FSE.writeFile(
-+        path.join(repo.path, 'foo'),
-+        'WRITING THE FIRST LINE\n'
-+      )
-
-       await GitProcess.exec(['add', 'foo'], repo.path)
-
--      fs.writeFileSync(path.join(repo.path, 'foo'), 'WRITING OVER THE TOP\n')
-+      await FSE.writeFile(path.join(repo.path, 'foo'), 'WRITING OVER THE TOP\n')
-
-       const status = await getStatus(repo)
-       const files = status.workingDirectory.files
-@@ -337,7 +338,7 @@
-
-       let lineEnding = '\r\n'
-
--      fs.writeFileSync(
-+      await FSE.writeFile(
-         filePath,
-         `WRITING MANY LINES ${lineEnding} USING THIS LINE ENDING ${lineEnding} TO SHOW THAT GIT${lineEnding} WILL INSERT IT WITHOUT CHANGING THING ${lineEnding} HA HA BUSINESS`
-       )
-@@ -351,7 +352,7 @@
-       await GitProcess.exec(['config', 'core.autocrlf', 'true'], repo.path)
-       lineEnding = '\n\n'
-
--      fs.writeFileSync(
-+      await FSE.writeFile(
-         filePath,
-         `WRITING MANY LINES ${lineEnding} USING THIS LINE ENDING ${lineEnding} TO SHOW THAT GIT${lineEnding} WILL INSERT IT WITHOUT CHANGING THING ${lineEnding} HA HA BUSINESS`
-       )
-@@ -375,7 +376,7 @@
-       const filePath = path.join(repo.path, 'foo')
-
-       const testString = 'here are some cool characters: • é  漢字'
--      fs.writeFileSync(filePath, testString)
-+      await FSE.writeFile(filePath, testString)
-
-       const status = await getStatus(repo)
-       const files = status.workingDirectory.files
-merged
-  result 100644 49b5c229ff03e3bb85d45773693b29bcf664cfa0 app/test/unit/git/for-each-ref-test.ts
-  our    100644 489ff8c45295f4effd89131fe26c32b9caeb4686 app/test/unit/git/for-each-ref-test.ts
-@@ -10,8 +10,8 @@
- describe('git/for-each-ref', () => {
-   let repository: Repository | null = null
-
--  beforeEach(() => {
--    const testRepoPath = setupFixtureRepository('repo-with-many-refs')
-+  beforeEach(async () => {
-+    const testRepoPath = await setupFixtureRepository('repo-with-many-refs')
-     repository = new Repository(testRepoPath, -1, null, false)
-   })
-
-added in remote
-  their  100644 efa84e67645f24f1b4905d9815b78c84b1debcb5 app/test/unit/git/git-attributes-test.ts
-@@ -0,0 +1,18 @@
-+import { expect } from 'chai'
-+import * as FSE from 'fs-extra'
-+import * as Path from 'path'
-+
-+import { setupEmptyRepository } from '../../helpers/repositories'
-+import { writeGitAttributes } from '../../../src/ui/add-repository/git-attributes'
-+
-+describe('git/git-attributes', () => {
-+  describe('writeGitAttributes', () => {
-+    it('initializes a .gitattributes file', async () => {
-+      const repo = await setupEmptyRepository()
-+      await writeGitAttributes(repo.path)
-+      const expectedPath = Path.join(repo.path, '.gitattributes')
-+      const contents = await FSE.readFile(expectedPath, 'utf8')
-+      expect(contents).to.contain('* text=auto')
-+    })
-+  })
-+})
-merged
-  result 100644 4b5b3f160a0264cf66886c0aa339b1fad38181b1 app/test/unit/git/log-test.ts
-  our    100644 ad903fd317c8097f5cb62d13f559c282be3f0e55 app/test/unit/git/log-test.ts
-@@ -1,5 +1,3 @@
--/* eslint-disable no-sync */
--
- import { expect } from 'chai'
-
- import { Repository } from '../../../src/models/repository'
-@@ -11,8 +9,8 @@
- describe('git/log', () => {
-   let repository: Repository | null = null
-
--  beforeEach(() => {
--    const testRepoPath = setupFixtureRepository('test-repo')
-+  beforeEach(async () => {
-+    const testRepoPath = await setupFixtureRepository('test-repo')
-     repository = new Repository(testRepoPath, -1, null, false)
-   })
-
-@@ -48,7 +46,9 @@
-     })
-
-     it('detects renames', async () => {
--      const testRepoPath = setupFixtureRepository('rename-history-detection')
-+      const testRepoPath = await setupFixtureRepository(
-+        'rename-history-detection'
-+      )
-       repository = new Repository(testRepoPath, -1, null, false)
-
-       const first = await getChangedFiles(repository, '55bdecb')
-@@ -65,7 +65,9 @@
-     })
-
-     it('detect copies', async () => {
--      const testRepoPath = setupFixtureRepository('copies-history-detection')
-+      const testRepoPath = await setupFixtureRepository(
-+        'copies-history-detection'
-+      )
-       repository = new Repository(testRepoPath, -1, null, false)
-
-       // ensure the test repository is configured to detect copies
-merged
-  result 100644 26ef5a516cc51061106a84706a4b53aba7a4bae5 app/test/unit/git/reflog-test.ts
-  our    100644 753f89bdff58df67c59ada62fd5318e25de1f0c9 app/test/unit/git/reflog-test.ts
-@@ -1,5 +1,3 @@
--/* eslint-disable no-sync */
--
- import { expect } from 'chai'
-
- import { Repository } from '../../../src/models/repository'
-@@ -28,8 +26,8 @@
- describe('git/reflog', () => {
-   let repository: Repository | null = null
-
--  beforeEach(() => {
--    const testRepoPath = setupFixtureRepository('test-repo')
-+  beforeEach(async () => {
-+    const testRepoPath = await setupFixtureRepository('test-repo')
-     repository = new Repository(testRepoPath, -1, null, false)
-   })
-
-merged
-  result 100644 ec4c2f0abae62b3b2e24b3d1f8d4c026202866ae app/test/unit/git/remote-test.ts
-  our    100644 0c31a4654bc26c2af1888154faf1ed1c5b074f9e app/test/unit/git/remote-test.ts
-@@ -1,5 +1,3 @@
--/* eslint-disable no-sync */
--
- import { expect } from 'chai'
-
- import { Repository } from '../../../src/models/repository'
-@@ -17,7 +15,9 @@
- describe('git/remote', () => {
-   describe('getRemotes', () => {
-     it('should return both remotes', async () => {
--      const testRepoPath = setupFixtureRepository('repo-with-multiple-remotes')
-+      const testRepoPath = await setupFixtureRepository(
-+        'repo-with-multiple-remotes'
-+      )
-       const repository = new Repository(testRepoPath, -1, null, false)
-
-       // NB: We don't check for exact URL equality because CircleCI's git config
-@@ -36,7 +36,9 @@
-
-   describe('getDefaultRemote', () => {
-     it('returns origin when multiple remotes found', async () => {
--      const testRepoPath = setupFixtureRepository('repo-with-multiple-remotes')
-+      const testRepoPath = await setupFixtureRepository(
-+        'repo-with-multiple-remotes'
-+      )
-       const repository = new Repository(testRepoPath, -1, null, false)
-
-       const result = await getDefaultRemote(repository)
-@@ -45,7 +47,9 @@
-     })
-
-     it('returns something when origin removed', async () => {
--      const testRepoPath = setupFixtureRepository('repo-with-multiple-remotes')
-+      const testRepoPath = await setupFixtureRepository(
-+        'repo-with-multiple-remotes'
-+      )
-       const repository = new Repository(testRepoPath, -1, null, false)
-       await removeRemote(repository, 'origin')
-
-merged
-  result 100644 ae434a7ebf90e34582704265a7bee208e3ee30e1 app/test/unit/git/reset-test.ts
-  our    100644 de0b8ecb1767d94f933eb81fdb46f8030e0ed0d1 app/test/unit/git/reset-test.ts
-@@ -1,5 +1,3 @@
--/* eslint-disable no-sync */
--
- import * as path from 'path'
- import { expect } from 'chai'
-
-@@ -9,13 +7,13 @@
- import { setupFixtureRepository } from '../../helpers/repositories'
- import { GitProcess } from 'dugite'
-
--import * as fs from 'fs-extra'
-+import * as FSE from 'fs-extra'
-
- describe('git/reset', () => {
-   let repository: Repository | null = null
-
--  beforeEach(() => {
--    const testRepoPath = setupFixtureRepository('test-repo')
-+  beforeEach(async () => {
-+    const testRepoPath = await setupFixtureRepository('test-repo')
-     repository = new Repository(testRepoPath, -1, null, false)
-   })
-
-@@ -25,7 +23,7 @@
-       const fileName = 'README.md'
-       const filePath = path.join(repoPath, fileName)
-
--      fs.writeFileSync(filePath, 'Hi world\n')
-+      await FSE.writeFile(filePath, 'Hi world\n')
-
-       await reset(repository!, GitResetMode.Hard, 'HEAD')
-
-@@ -35,17 +33,17 @@
-   })
-
-   describe('resetPaths', () => {
--    it('resets discarded staged file', async () => {
-+    it.skip('resets discarded staged file', async () => {
-       const repoPath = repository!.path
-       const fileName = 'README.md'
-       const filePath = path.join(repoPath, fileName)
-
-       // modify the file
--      fs.writeFileSync(filePath, 'Hi world\n')
-+      await FSE.writeFile(filePath, 'Hi world\n')
-
-       // stage the file, then delete it to mimic discarding
-       GitProcess.exec(['add', fileName], repoPath)
--      fs.unlinkSync(filePath)
-+      await FSE.unlink(filePath)
-
-       await resetPaths(repository!, GitResetMode.Mixed, 'HEAD', [filePath])
-
-merged
-  result 100644 9f59f8eafa96145f5a0182713ae312a61d5633c6 app/test/unit/git/rev-parse-test.ts
-  our    100644 2fe66109a93a488e1d52f361aa11b5fd03ab6c4d app/test/unit/git/rev-parse-test.ts
-@@ -1,7 +1,5 @@
--/* eslint-disable no-sync */
--
- import * as path from 'path'
--import * as Fs from 'fs'
-+import * as FSE from 'fs-extra'
- import * as os from 'os'
- import { expect } from 'chai'
-
-@@ -16,8 +14,8 @@
- describe('git/rev-parse', () => {
-   let repository: Repository | null = null
-
--  beforeEach(() => {
--    const testRepoPath = setupFixtureRepository('test-repo')
-+  beforeEach(async () => {
-+    const testRepoPath = await setupFixtureRepository('test-repo')
-     repository = new Repository(testRepoPath, -1, null, false)
-   })
-
-@@ -39,10 +37,7 @@
-       expect(result).to.equal(repository!.path)
-
-       const subdirPath = path.join(repository!.path, 'subdir')
--
--      await new Promise<void>((resolve, reject) => {
--        Fs.mkdir(subdirPath, e => (e ? reject(e) : resolve()))
--      })
-+      await FSE.mkdir(subdirPath)
-
-       const subDirResult = await getTopLevelWorkingDirectory(repository!.path)
-       expect(subDirResult).to.equal(repository!.path)
-merged
-  result 100644 b70094de837ed6cb2305e65414cd7c4c3403edc0 app/test/unit/git/status-test.ts
-  our    100644 59e49a131e79925c8b8307125053a59d2970ba4e app/test/unit/git/status-test.ts
-@@ -1,7 +1,7 @@
--/* eslint-disable no-sync */
--
- import * as path from 'path'
- import { expect } from 'chai'
-+import * as FSE from 'fs-extra'
-+import { GitProcess } from 'dugite'
-
- import { Repository } from '../../../src/models/repository'
- import { getStatus } from '../../../src/lib/git/status'
-@@ -10,21 +10,21 @@
-   setupEmptyRepository,
- } from '../../helpers/repositories'
- import { AppFileStatus } from '../../../src/models/status'
--import { GitProcess } from 'dugite'
--
--import * as fs from 'fs-extra'
-
- describe('git/status', () => {
-   let repository: Repository | null = null
-
--  beforeEach(() => {
--    const testRepoPath = setupFixtureRepository('test-repo')
-+  beforeEach(async () => {
-+    const testRepoPath = await setupFixtureRepository('test-repo')
-     repository = new Repository(testRepoPath, -1, null, false)
-   })
-
-   describe('getStatus', () => {
-     it('parses changed files', async () => {
--      fs.writeFileSync(path.join(repository!.path, 'README.md'), 'Hi world\n')
-+      await FSE.writeFile(
-+        path.join(repository!.path, 'README.md'),
-+        'Hi world\n'
-+      )
-
-       const status = await getStatus(repository!)
-       const files = status.workingDirectory.files
-@@ -44,7 +44,7 @@
-     it('reflects renames', async () => {
-       const repo = await setupEmptyRepository()
-
--      fs.writeFileSync(path.join(repo.path, 'foo'), 'foo\n')
-+      await FSE.writeFile(path.join(repo.path, 'foo'), 'foo\n')
-
-       await GitProcess.exec(['add', 'foo'], repo.path)
-       await GitProcess.exec(['commit', '-m', 'Initial commit'], repo.path)
-merged
-  result 100644 458f70ab3e9d3c2a72710726ed0ccf67f9644e7c app/test/unit/git/submodule-test.ts
-  our    100644 c03c4406fbdfec1ca3d327273d6fa3bf9fe4c17d app/test/unit/git/submodule-test.ts
-@@ -12,7 +12,7 @@
- describe('git/submodule', () => {
-   describe('listSubmodules', () => {
-     it('returns the submodule entry', async () => {
--      const testRepoPath = setupFixtureRepository('submodule-basic-setup')
-+      const testRepoPath = await setupFixtureRepository('submodule-basic-setup')
-       const repository = new Repository(testRepoPath, -1, null, false)
-       const result = await listSubmodules(repository)
-       expect(result.length).to.equal(1)
-@@ -22,7 +22,7 @@
-     })
-
-     it('returns the expected tag', async () => {
--      const testRepoPath = setupFixtureRepository('submodule-basic-setup')
-+      const testRepoPath = await setupFixtureRepository('submodule-basic-setup')
-       const repository = new Repository(testRepoPath, -1, null, false)
-
-       const submodulePath = path.join(testRepoPath, 'foo', 'submodule')
-@@ -49,7 +49,7 @@
-
-   describe('resetSubmodulePaths', () => {
-     it('update submodule to original commit', async () => {
--      const testRepoPath = setupFixtureRepository('submodule-basic-setup')
-+      const testRepoPath = await setupFixtureRepository('submodule-basic-setup')
-       const repository = new Repository(testRepoPath, -1, null, false)
-
-       const submodulePath = path.join(testRepoPath, 'foo', 'submodule')
-added in remote
-  their  100644 b4f8bad4223c7ca09f796baa5b5bcc5da2d75cac app/test/unit/infer-comparison-branch-test.ts
-@@ -0,0 +1,205 @@
-+import { expect } from 'chai'
-+import { inferComparisonBranch } from '../../src/lib/stores/helpers/infer-comparison-branch'
-+import { Branch, BranchType } from '../../src/models/branch'
-+import { Commit } from '../../src/models/commit'
-+import { CommitIdentity } from '../../src/models/commit-identity'
-+import { GitHubRepository } from '../../src/models/github-repository'
-+import { Owner } from '../../src/models/owner'
-+import { PullRequest, PullRequestRef } from '../../src/models/pull-request'
-+import { Repository } from '../../src/models/repository'
-+import { IRemote } from '../../src/models/remote'
-+import { ComparisonCache } from '../../src/lib/comparison-cache'
-+
-+function createTestCommit(sha: string) {
-+  return new Commit(
-+    sha,
-+    '',
-+    '',
-+    new CommitIdentity('tester', 'tester@test.com', new Date()),
-+    new CommitIdentity('tester', 'tester@test.com', new Date()),
-+    [],
-+    []
-+  )
-+}
-+
-+function createTestBranch(
-+  name: string,
-+  sha: string,
-+  remote: string | null = null
-+) {
-+  return new Branch(name, remote, createTestCommit(sha), BranchType.Local)
-+}
-+
-+function createTestGhRepo(
-+  name: string,
-+  defaultBranch: string | null = null,
-+  parent: GitHubRepository | null = null
-+) {
-+  return new GitHubRepository(
-+    name,
-+    new Owner('', '', null),
-+    null,
-+    false,
-+    '',
-+    `${
-+      defaultBranch !== null && defaultBranch.indexOf('/') !== -1
-+        ? defaultBranch.split('/')[1]
-+        : defaultBranch
-+    }`,
-+    `${name.indexOf('/') !== -1 ? name.split('/')[1] : name}.git`,
-+    parent
-+  )
-+}
-+
-+function createTestPrRef(
-+  branch: Branch,
-+  ghRepo: GitHubRepository | null = null
-+) {
-+  return new PullRequestRef(branch.name, branch.tip.sha, ghRepo)
-+}
-+
-+function createTestPr(head: PullRequestRef, base: PullRequestRef) {
-+  return new PullRequest(-1, new Date(), null, '', 1, head, base, '')
-+}
-+
-+function createTestRepo(ghRepo: GitHubRepository | null = null) {
-+  return new Repository('', -1, ghRepo, false)
-+}
-+
-+function mockGetRemotes(repo: Repository): Promise<ReadonlyArray<IRemote>> {
-+  return Promise.resolve([])
-+}
-+
-+describe('inferComparisonBranch', () => {
-+  const branches = [
-+    createTestBranch('master', '0', 'origin'),
-+    createTestBranch('dev', '1', 'origin'),
-+    createTestBranch('staging', '2', 'origin'),
-+    createTestBranch('default', '3', 'origin'),
-+    createTestBranch('head', '4', 'origin'),
-+    createTestBranch('upstream/base', '5', 'upstream'),
-+    createTestBranch('fork', '6', 'origin'),
-+  ]
-+  const comparisonCache = new ComparisonCache()
-+
-+  beforeEach(() => {
-+    comparisonCache.clear()
-+  })
-+
-+  it('Returns the master branch when given unhosted repo', async () => {
-+    const repo = createTestRepo()
-+    const branch = await inferComparisonBranch(
-+      repo,
-+      branches,
-+      null,
-+      null,
-+      mockGetRemotes,
-+      comparisonCache
-+    )
-+
-+    expect(branch).is.not.null
-+    expect(branch!.tip.sha).to.equal('0')
-+  })
-+
-+  it('Returns the default branch of a GitHub repository', async () => {
-+    const ghRepo: GitHubRepository = createTestGhRepo('test', 'default')
-+    const repo = createTestRepo(ghRepo)
-+
-+    const branch = await inferComparisonBranch(
-+      repo,
-+      branches,
-+      null,
-+      null,
-+      mockGetRemotes,
-+      comparisonCache
-+    )
-+
-+    expect(branch).is.not.null
-+    expect(branch!.name).to.equal('default')
-+  })
-+
-+  it('Returns the branch associated with the PR', async () => {
-+    const ghRepo: GitHubRepository = createTestGhRepo('test', 'default')
-+    const repo = createTestRepo(ghRepo)
-+    const head = createTestPrRef(branches[4])
-+    const base = createTestPrRef(branches[5])
-+    const pr: PullRequest = createTestPr(head, base)
-+
-+    const branch = await inferComparisonBranch(
-+      repo,
-+      branches,
-+      pr,
-+      null,
-+      mockGetRemotes,
-+      comparisonCache
-+    )
-+
-+    expect(branch).is.not.null
-+    expect(branch!.upstream).to.equal(branches[5].upstream)
-+  })
-+
-+  it('Returns the default branch of the fork if it is ahead of the current branch', async () => {
-+    const currentBranch = branches[3]
-+    const defaultBranch = branches[6]
-+    const parent = createTestGhRepo('parent', 'parent')
-+    const fork = createTestGhRepo('fork', 'fork', parent)
-+    const repo = createTestRepo(fork)
-+
-+    comparisonCache.set(currentBranch.tip.sha, defaultBranch.tip.sha, {
-+      ahead: 1,
-+      behind: 0,
-+    })
-+
-+    const branch = await inferComparisonBranch(
-+      repo,
-+      branches,
-+      null,
-+      currentBranch,
-+      mockGetRemotes,
-+      comparisonCache
-+    )
-+
-+    expect(branch).is.not.null
-+    expect(branch!.name).to.equal(defaultBranch.name)
-+  })
-+
-+  it("Returns the default branch of the fork's parent branch if the fork is not ahead of the current branch", async () => {
-+    const defaultBranchOfParent = branches[5]
-+    const defaultBranchOfFork = branches[4]
-+    const parent = createTestGhRepo(
-+      'parent',
-+      defaultBranchOfParent.nameWithoutRemote
-+    )
-+    const fork = createTestGhRepo('fork', defaultBranchOfFork.name, parent)
-+    const repo = createTestRepo(fork)
-+    const mockGetRemotes = (repo: Repository) => {
-+      const remotes: ReadonlyArray<IRemote> = [
-+        { name: 'origin', url: fork.cloneURL! },
-+        { name: 'upstream', url: parent.cloneURL! },
-+      ]
-+
-+      return Promise.resolve(remotes)
-+    }
-+
-+    comparisonCache.set(
-+      defaultBranchOfParent.tip.sha,
-+      defaultBranchOfFork.tip.sha,
-+      {
-+        ahead: 0,
-+        behind: 0,
-+      }
-+    )
-+
-+    const branch = await inferComparisonBranch(
-+      repo,
-+      branches,
-+      null,
-+      defaultBranchOfParent,
-+      mockGetRemotes,
-+      comparisonCache
-+    )
-+
-+    expect(branch).is.not.null
-+    expect(branch!.upstream).to.equal(defaultBranchOfParent.upstream)
-+  })
-+})
-added in remote
-  their  100644 dcebafa9c3051466b9d3347eb6ae9d827c796b0d app/test/unit/list-selection-test.ts
-@@ -0,0 +1,52 @@
-+import { expect } from 'chai'
-+
-+import { findNextSelectableRow } from '../../src/ui/lib/list/selection'
-+
-+describe('list-selection', () => {
-+  describe('findNextSelectableRow', () => {
-+    const rowCount = 5
-+
-+    it('returns first row when selecting down outside list (filter text)', () => {
-+      const selectedRow = findNextSelectableRow(rowCount, {
-+        direction: 'down',
-+        row: -1,
-+      })
-+      expect(selectedRow).to.equal(0)
-+    })
-+
-+    it('returns first selectable row when header is first', () => {
-+      const selectedRow = findNextSelectableRow(
-+        rowCount,
-+        {
-+          direction: 'down',
-+          row: -1,
-+        },
-+        row => {
-+          if (row === 0) {
-+            return false
-+          } else {
-+            return true
-+          }
-+        }
-+      )
-+      expect(selectedRow).to.equal(1)
-+    })
-+
-+    it('returns first row when selecting down from last row', () => {
-+      const lastRow = rowCount - 1
-+      const selectedRow = findNextSelectableRow(rowCount, {
-+        direction: 'down',
-+        row: lastRow,
-+      })
-+      expect(selectedRow).to.equal(0)
-+    })
-+
-+    it('returns last row when selecting up from top row', () => {
-+      const selectedRow = findNextSelectableRow(rowCount, {
-+        direction: 'up',
-+        row: 0,
-+      })
-+      expect(selectedRow).to.equal(4)
-+    })
-+  })
-+})
-merged
-  result 100644 c0b463a119f370007a15b53596eef661434e881a app/test/unit/patch-formatter-test.ts
-  our    100644 6a71395ab06843a86f54daca408878c6e8c603c6 app/test/unit/patch-formatter-test.ts
-@@ -1,9 +1,7 @@
--/* eslint-disable no-sync */
--
- import { expect } from 'chai'
-
- import * as Path from 'path'
--import * as FS from 'fs'
-+import * as FSE from 'fs-extra'
-
- import { Repository } from '../../src/models/repository'
- import {
-@@ -36,8 +34,8 @@
-   let repository: Repository | null = null
-
-   describe('formatPatchesForModifiedFile', () => {
--    beforeEach(() => {
--      const testRepoPath = setupFixtureRepository('repo-with-changes')
-+    beforeEach(async () => {
-+      const testRepoPath = await setupFixtureRepository('repo-with-changes')
-       repository = new Repository(testRepoPath, -1, null, false)
-     })
-
-@@ -161,7 +159,7 @@
-
-     it(`creates the right patch when an addition is selected but preceding deletions aren't`, async () => {
-       const modifiedFile = 'modified-file.md'
--      FS.writeFileSync(Path.join(repository!.path, modifiedFile), 'line 1\n')
-+      await FSE.writeFile(Path.join(repository!.path, modifiedFile), 'line 1\n')
-
-       const unselectedFile = DiffSelection.fromInitialSelection(
-         DiffSelectionType.None
-merged
-  result 100644 9cbf74cc7f09f42177a0ffa21b8dadf6a5cb408e app/test/unit/progress/clone-test.ts
-  our    100644 7c54590d069085e654f33a1d2d57765c2bf0cf0a app/test/unit/progress/clone-test.ts
-@@ -36,21 +36,21 @@
-         'remote: Compressing objects:  45% (10/22)'
-       )
-       expect(compressing.kind).to.equal('progress')
--      expect(compressing.percent).to.be.closeTo(10 / 22 * 0.1, 0.01)
-+      expect(compressing.percent).to.be.closeTo((10 / 22) * 0.1, 0.01)
-
-       const receiving = parser.parse(
-         'Receiving objects:  17% (4808/28282), 3.30 MiB | 1.29 MiB/s'
-       )
-       expect(receiving.kind).to.equal('progress')
--      expect(receiving.percent).to.be.closeTo(0.1 + 4808 / 28282 * 0.6, 0.01)
-+      expect(receiving.percent).to.be.closeTo(0.1 + (4808 / 28282) * 0.6, 0.01)
-
-       const resolving = parser.parse('Resolving deltas:  89% (18063/20263)')
-       expect(resolving.kind).to.equal('progress')
--      expect(resolving.percent).to.be.closeTo(0.7 + 18063 / 20263 * 0.1, 0.01)
-+      expect(resolving.percent).to.be.closeTo(0.7 + (18063 / 20263) * 0.1, 0.01)
-
-       const checkingOut = parser.parse('Checking out files: 100% (579/579)')
-       expect(checkingOut.kind).to.equal('progress')
--      expect(checkingOut.percent).to.be.closeTo(0.8 + 579 / 579 * 0.2, 0.01)
-+      expect(checkingOut.percent).to.be.closeTo(0.8 + (579 / 579) * 0.2, 0.01)
-     })
-
-     it('ignores wrong order', () => {
-added in remote
-  their  100644 1e72cf509cf524cdf0acea77b04f2bd6298fc33e app/test/unit/pull-request-status-test.ts
-@@ -0,0 +1,91 @@
-+import { expect } from 'chai'
-+
-+import { APIRefState } from '../../src/lib/api'
-+import { getPRStatusSummary } from '../../src/ui/branches/pull-request-status'
-+
-+const failure: APIRefState = 'failure'
-+const pending: APIRefState = 'pending'
-+const success: APIRefState = 'success'
-+
-+describe('pull request status', () => {
-+  it('uses the state when no statuses found', () => {
-+    const prStatus = {
-+      pullRequestNumber: 23,
-+      state: success,
-+      totalCount: 0,
-+      sha: '',
-+      statuses: [],
-+    }
-+    expect(getPRStatusSummary(prStatus)).to.equal('Commit status: success')
-+  })
-+
-+  it('changes the failure message to something more friendly', () => {
-+    const prStatus = {
-+      pullRequestNumber: 23,
-+      state: failure,
-+      totalCount: 0,
-+      sha: '',
-+      statuses: [],
-+    }
-+    expect(getPRStatusSummary(prStatus)).to.equal('Commit status: failed')
-+  })
-+
-+  it('reads the statuses when they are populated', () => {
-+    const prStatus = {
-+      pullRequestNumber: 23,
-+      state: success,
-+      totalCount: 2,
-+      sha: '',
-+      statuses: [
-+        { id: 1, state: success, description: 'first' },
-+        { id: 2, state: success, description: 'second' },
-+      ],
-+    }
-+    expect(getPRStatusSummary(prStatus)).to.equal('2/2 checks OK')
-+  })
-+
-+  it('a successful status shows the description', () => {
-+    const prStatus = {
-+      pullRequestNumber: 23,
-+      state: success,
-+      totalCount: 2,
-+      sha: '',
-+      statuses: [
-+        { id: 1, state: success, description: 'The Travis CI build passed' },
-+      ],
-+    }
-+    expect(getPRStatusSummary(prStatus)).to.equal(
-+      'Success: The Travis CI build passed'
-+    )
-+  })
-+
-+  it('an error status shows the description', () => {
-+    const prStatus = {
-+      pullRequestNumber: 23,
-+      state: success,
-+      totalCount: 2,
-+      sha: '',
-+      statuses: [
-+        { id: 1, state: failure, description: 'The Travis CI build failed' },
-+      ],
-+    }
-+    expect(getPRStatusSummary(prStatus)).to.equal(
-+      'Failure: The Travis CI build failed'
-+    )
-+  })
-+
-+  it('only counts the successful statuses', () => {
-+    const prStatus = {
-+      pullRequestNumber: 23,
-+      state: success,
-+      totalCount: 3,
-+      sha: '',
-+      statuses: [
-+        { id: 1, state: success, description: 'first' },
-+        { id: 2, state: pending, description: 'second' },
-+        { id: 2, state: pending, description: 'third' },
-+      ],
-+    }
-+    expect(getPRStatusSummary(prStatus)).to.equal('1/3 checks OK')
-+  })
-+})
-merged
-  result 100644 8c3c9ac4c1b7875569c8d7d44dec79ca7047423d app/test/unit/repositories-list-grouping-test.ts
-  our    100644 8c87f50afeab077a2eec435baab02e4db2417b4f app/test/unit/repositories-list-grouping-test.ts
-@@ -1,7 +1,7 @@
- import { expect } from 'chai'
-
- import { groupRepositories } from '../../src/ui/repositories-list/group-repositories'
--import { Repository } from '../../src/models/repository'
-+import { Repository, ILocalRepositoryState } from '../../src/models/repository'
- import { GitHubRepository } from '../../src/models/github-repository'
- import { Owner } from '../../src/models/owner'
- import { getDotComAPIEndpoint } from '../../src/lib/api'
-@@ -28,8 +28,10 @@
-     ),
-   ]
-
-+  const cache = new Map<number, ILocalRepositoryState>()
-+
-   it('groups repositories by GitHub/Enterprise/Other', () => {
--    const grouped = groupRepositories(repositories)
-+    const grouped = groupRepositories(repositories, cache)
-     expect(grouped.length).to.equal(3)
-
-     expect(grouped[0].identifier).to.equal('github')
-@@ -68,7 +70,10 @@
-     )
-     const repoZ = new Repository('z', 3, null, false)
-
--    const grouped = groupRepositories([repoC, repoB, repoZ, repoD, repoA])
-+    const grouped = groupRepositories(
-+      [repoC, repoB, repoZ, repoD, repoA],
-+      cache
-+    )
-     expect(grouped.length).to.equal(2)
-
-     expect(grouped[0].identifier).to.equal('github')
-@@ -119,20 +124,20 @@
-       false
-     )
-
--    const grouped = groupRepositories([repoA, repoB, repoC])
-+    const grouped = groupRepositories([repoA, repoB, repoC], cache)
-     expect(grouped.length).to.equal(1)
-
-     expect(grouped[0].identifier).to.equal('github')
-     expect(grouped[0].items.length).to.equal(3)
-
-     const items = grouped[0].items
--    expect(items[0].text).to.equal('cool-repo')
-+    expect(items[0].text[0]).to.equal('cool-repo')
-     expect(items[0].needsDisambiguation).to.equal(false)
-
--    expect(items[1].text).to.equal('repo')
-+    expect(items[1].text[0]).to.equal('repo')
-     expect(items[1].needsDisambiguation).to.equal(true)
-
--    expect(items[2].text).to.equal('repo')
-+    expect(items[2].text[0]).to.equal('repo')
-     expect(items[2].needsDisambiguation).to.equal(true)
-   })
- })
-merged
-  result 100644 2500924fc3357ff64eb65408ada24ec216b734ef app/test/unit/repository-settings-store-test.ts
-  our    100644 a0af361ddcda5e966fcae87cfe23274833ff3095 app/test/unit/repository-settings-store-test.ts
-@@ -1,6 +1,4 @@
--/* eslint-disable no-sync */
--
--import * as FS from 'fs'
-+import * as FSE from 'fs-extra'
- import * as Path from 'path'
- import { GitProcess } from 'dugite'
- import { expect } from 'chai'
-@@ -8,7 +6,6 @@
- import { RepositorySettingsStore } from '../../src/lib/stores'
- import { setupEmptyRepository } from '../helpers/repositories'
- import { getStatus } from '../../src/lib/git'
--import { pathExists } from '../../src/lib/file-system'
-
- describe('RepositorySettingsStore', () => {
-   it('can create a gitignore file', async () => {
-@@ -20,7 +17,7 @@
-     await sut.saveGitIgnore('node_modules\n')
-
-     // Make sure file exists on FS
--    const exists = await pathExists(`${path}/.gitignore`)
-+    const exists = await FSE.pathExists(`${path}/.gitignore`)
-
-     expect(exists).is.true
-   })
-@@ -30,14 +27,14 @@
-     const path = repo.path
-
-     const ignoreFile = `${path}/.gitignore`
--    FS.writeFileSync(ignoreFile, 'node_modules\n')
-+    await FSE.writeFile(ignoreFile, 'node_modules\n')
-
-     const sut = new RepositorySettingsStore(repo)
-
-     // update gitignore file to be empty
-     await sut.saveGitIgnore('')
-
--    const exists = await pathExists(ignoreFile)
-+    const exists = await FSE.pathExists(ignoreFile)
-     expect(exists).is.false
-   })
-
-@@ -54,7 +51,7 @@
-     // Create a txt file
-     const file = Path.join(repo.path, 'a.txt')
-
--    FS.writeFileSync(file, 'thrvbnmerkl;,iuw')
-+    await FSE.writeFile(file, 'thrvbnmerkl;,iuw')
-
-     // Check status of repo
-     const status = await getStatus(repo)
-merged
-  result 100644 133e5af7e5501c236aeb4c8601f36046ad052609 app/test/unit/repository-test.ts
-  our    100644 1d0e7171ba217432250ae87d691596276db579e9 app/test/unit/repository-test.ts
-@@ -9,5 +9,11 @@
-       const repository = new Repository(repoPath, -1, null, false)
-       expect(repository.name).to.equal('path')
-     })
-+
-+    it('handles repository at root of the drive', async () => {
-+      const repoPath = 'T:\\'
-+      const repository = new Repository(repoPath, -1, null, false)
-+      expect(repository.name).to.equal('T:\\')
-+    })
-   })
- })
-merged
-  result 100644 bbcf0ab0fd2e7a0f0528335e7a18a965fb1a464b app/test/unit/validated-repository-path-test.ts
-  our    100644 a8625f261275cbe39f142f52e51de14e1b1619fb app/test/unit/validated-repository-path-test.ts
-@@ -7,7 +7,7 @@
-
- describe('validatedRepositoryPath', () => {
-   it('returns the path to the repository', async () => {
--    const testRepoPath = setupFixtureRepository('test-repo')
-+    const testRepoPath = await setupFixtureRepository('test-repo')
-     const result = await validatedRepositoryPath(testRepoPath)
-     expect(result).to.equal(testRepoPath)
-   })
-removed in remote
-  base   100644 20da10ea8edc60b7201685b8ce2659593bc0dc0a app/webpack.common.js
-  our    100644 20da10ea8edc60b7201685b8ce2659593bc0dc0a app/webpack.common.js
-@@ -1,205 +0,0 @@
--'use strict'
--
--const path = require('path')
--const Fs = require('fs')
--const HtmlWebpackPlugin = require('html-webpack-plugin')
--const CleanWebpackPlugin = require('clean-webpack-plugin')
--const webpack = require('webpack')
--const merge = require('webpack-merge')
--const appInfo = require('./app-info')
--const packageInfo = require('./package-info')
--const distInfo = require('../script/dist-info')
--
--const channel = distInfo.getReleaseChannel()
--
--const externals = ['7zip']
--if (channel === 'development') {
--  externals.push('devtron')
--}
--
--const outputDir = 'out'
--const replacements = appInfo.getReplacements()
--
--const commonConfig = {
--  externals: externals,
--  output: {
--    filename: '[name].js',
--    path: path.resolve(__dirname, '..', outputDir),
--    libraryTarget: 'commonjs2',
--  },
--  module: {
--    rules: [
--      {
--        test: /\.tsx?$/,
--        include: path.resolve(__dirname, 'src'),
--        use: [
--          {
--            loader: 'awesome-typescript-loader',
--            options: {
--              useBabel: true,
--              useCache: true,
--            },
--          },
--        ],
--        exclude: /node_modules/,
--      },
--      {
--        test: /\.node$/,
--        use: [
--          { loader: 'node-native-loader', options: { name: '[name].[ext]' } },
--        ],
--      },
--    ],
--  },
--  plugins: [
--    new CleanWebpackPlugin([outputDir], { verbose: false }),
--    // This saves us a bunch of bytes by pruning locales (which we don't use)
--    // from moment.
--    new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
--    new webpack.NoEmitOnErrorsPlugin(),
--  ],
--  resolve: {
--    extensions: ['.js', '.ts', '.tsx'],
--    modules: [path.resolve(__dirname, 'node_modules/')],
--  },
--  node: {
--    __dirname: false,
--    __filename: false,
--  },
--}
--
--const mainConfig = merge({}, commonConfig, {
--  entry: { main: path.resolve(__dirname, 'src/main-process/main') },
--  target: 'electron-main',
--  plugins: [
--    new webpack.DefinePlugin(
--      Object.assign({}, replacements, {
--        __PROCESS_KIND__: JSON.stringify('main'),
--      })
--    ),
--  ],
--})
--
--const rendererConfig = merge({}, commonConfig, {
--  entry: { renderer: path.resolve(__dirname, 'src/ui/index') },
--  target: 'electron-renderer',
--  module: {
--    rules: [
--      {
--        test: /\.(jpe?g|png|gif|ico)$/,
--        use: ['file?name=[path][name].[ext]'],
--      },
--    ],
--  },
--  plugins: [
--    new HtmlWebpackPlugin({
--      template: path.join(__dirname, 'static', 'index.html'),
--      chunks: ['renderer'],
--    }),
--    new webpack.DefinePlugin(
--      Object.assign({}, replacements, {
--        __PROCESS_KIND__: JSON.stringify('ui'),
--      })
--    ),
--  ],
--})
--
--const askPassConfig = merge({}, commonConfig, {
--  entry: { 'ask-pass': path.resolve(__dirname, 'src/ask-pass/main') },
--  target: 'node',
--  plugins: [
--    new webpack.DefinePlugin(
--      Object.assign({}, replacements, {
--        __PROCESS_KIND__: JSON.stringify('askpass'),
--      })
--    ),
--  ],
--})
--
--const crashConfig = merge({}, commonConfig, {
--  entry: { crash: path.resolve(__dirname, 'src/crash/index') },
--  target: 'electron-renderer',
--  plugins: [
--    new HtmlWebpackPlugin({
--      title: 'GitHub Desktop',
--      filename: 'crash.html',
--      chunks: ['crash'],
--    }),
--    new webpack.DefinePlugin(
--      Object.assign({}, replacements, {
--        __PROCESS_KIND__: JSON.stringify('crash'),
--      })
--    ),
--  ],
--})
--
--const cliConfig = merge({}, commonConfig, {
--  entry: { cli: path.resolve(__dirname, 'src/cli/main') },
--  target: 'node',
--  plugins: [
--    new webpack.DefinePlugin(
--      Object.assign({}, replacements, {
--        __PROCESS_KIND__: JSON.stringify('cli'),
--      })
--    ),
--  ],
--})
--
--const highlighterConfig = merge({}, commonConfig, {
--  entry: { highlighter: path.resolve(__dirname, 'src/highlighter/index') },
--  output: { libraryTarget: 'var' },
--  target: 'webworker',
--  plugins: [
--    new webpack.DefinePlugin(
--      Object.assign({}, replacements, {
--        __PROCESS_KIND__: JSON.stringify('highlighter'),
--      })
--    ),
--  ],
--  resolve: {
--    // We don't want to bundle all of CodeMirror in the highlighter. A web
--    // worker doesn't have access to the DOM and most of CodeMirror's core
--    // code is useless to us in that context. So instead we use this super
--    // nifty subset of codemirror that defines the minimal context needed
--    // to run a mode inside of node. Now, we're not running in node
--    // but CodeMirror doesn't have to know about that.
--    alias: {
--      codemirror$: 'codemirror/addon/runmode/runmode.node.js',
--      '../lib/codemirror$': '../addon/runmode/runmode.node.js',
--      '../../lib/codemirror$': '../../addon/runmode/runmode.node.js',
--      '../../addon/runmode/runmode$': '../../addon/runmode/runmode.node.js',
--    },
--  },
--})
--
--highlighterConfig.module.rules = [
--  {
--    test: /\.ts$/,
--    include: path.resolve(__dirname, 'src/highlighter'),
--    use: [
--      {
--        loader: 'awesome-typescript-loader',
--        options: {
--          useBabel: true,
--          useCache: true,
--          configFileName: path.resolve(
--            __dirname,
--            'src/highlighter/tsconfig.json'
--          ),
--        },
--      },
--    ],
--    exclude: /node_modules/,
--  },
--]
--
--module.exports = {
--  main: mainConfig,
--  renderer: rendererConfig,
--  askPass: askPassConfig,
--  crash: crashConfig,
--  cli: cliConfig,
--  highlighter: highlighterConfig,
--  replacements: replacements,
--  externals: commonConfig.externals,
--}
-added in remote
-  their  100644 1022f36fa215969400d025fd13ce117793d98ddd app/webpack.common.ts
-@@ -0,0 +1,219 @@
-+import * as path from 'path'
-+import * as HtmlWebpackPlugin from 'html-webpack-plugin'
-+import * as CleanWebpackPlugin from 'clean-webpack-plugin'
-+import * as webpack from 'webpack'
-+import * as merge from 'webpack-merge'
-+import { getReleaseChannel } from '../script/dist-info'
-+import { getReplacements } from './app-info'
-+
-+const channel = getReleaseChannel()
-+
-+export const externals = ['7zip']
-+if (channel === 'development') {
-+  externals.push('devtron')
-+}
-+
-+const outputDir = 'out'
-+export const replacements = getReplacements()
-+
-+const commonConfig: webpack.Configuration = {
-+  externals: externals,
-+  output: {
-+    filename: '[name].js',
-+    path: path.resolve(__dirname, '..', outputDir),
-+    libraryTarget: 'commonjs2',
-+  },
-+  module: {
-+    rules: [
-+      {
-+        test: /\.tsx?$/,
-+        include: path.resolve(__dirname, 'src'),
-+        use: [
-+          {
-+            loader: 'awesome-typescript-loader',
-+            options: {
-+              useBabel: true,
-+              useCache: true,
-+            },
-+          },
-+        ],
-+        exclude: /node_modules/,
-+      },
-+      {
-+        test: /\.node$/,
-+        loader: 'awesome-node-loader',
-+        options: {
-+          name: '[name].[ext]',
-+        },
-+      },
-+    ],
-+  },
-+  plugins: [
-+    new CleanWebpackPlugin([outputDir], { verbose: false }),
-+    // This saves us a bunch of bytes by pruning locales (which we don't use)
-+    // from moment.
-+    new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
-+    new webpack.NoEmitOnErrorsPlugin(),
-+  ],
-+  resolve: {
-+    extensions: ['.js', '.ts', '.tsx'],
-+    modules: [path.resolve(__dirname, 'node_modules/')],
-+  },
-+  node: {
-+    __dirname: false,
-+    __filename: false,
-+  },
-+}
-+
-+export const main = merge({}, commonConfig, {
-+  entry: { main: path.resolve(__dirname, 'src/main-process/main') },
-+  target: 'electron-main',
-+  plugins: [
-+    new webpack.DefinePlugin(
-+      Object.assign({}, replacements, {
-+        __PROCESS_KIND__: JSON.stringify('main'),
-+      })
-+    ),
-+  ],
-+})
-+
-+export const renderer = merge({}, commonConfig, {
-+  entry: { renderer: path.resolve(__dirname, 'src/ui/index') },
-+  target: 'electron-renderer',
-+  module: {
-+    rules: [
-+      {
-+        test: /\.(jpe?g|png|gif|ico)$/,
-+        use: ['file?name=[path][name].[ext]'],
-+      },
-+    ],
-+  },
-+  plugins: [
-+    new HtmlWebpackPlugin({
-+      template: path.join(__dirname, 'static', 'index.html'),
-+      chunks: ['renderer'],
-+    }),
-+    new webpack.DefinePlugin(
-+      Object.assign({}, replacements, {
-+        __PROCESS_KIND__: JSON.stringify('ui'),
-+      })
-+    ),
-+  ],
-+})
-+
-+export const askPass = merge({}, commonConfig, {
-+  entry: { 'ask-pass': path.resolve(__dirname, 'src/ask-pass/main') },
-+  target: 'node',
-+  plugins: [
-+    new webpack.DefinePlugin(
-+      Object.assign({}, replacements, {
-+        __PROCESS_KIND__: JSON.stringify('askpass'),
-+      })
-+    ),
-+  ],
-+})
-+
-+export const crash = merge({}, commonConfig, {
-+  entry: { crash: path.resolve(__dirname, 'src/crash/index') },
-+  target: 'electron-renderer',
-+  plugins: [
-+    new HtmlWebpackPlugin({
-+      title: 'GitHub Desktop',
-+      filename: 'crash.html',
-+      chunks: ['crash'],
-+    }),
-+    new webpack.DefinePlugin(
-+      Object.assign({}, replacements, {
-+        __PROCESS_KIND__: JSON.stringify('crash'),
-+      })
-+    ),
-+  ],
-+})
-+
-+export const cli = merge({}, commonConfig, {
-+  entry: { cli: path.resolve(__dirname, 'src/cli/main') },
-+  target: 'node',
-+  plugins: [
-+    new webpack.DefinePlugin(
-+      Object.assign({}, replacements, {
-+        __PROCESS_KIND__: JSON.stringify('cli'),
-+      })
-+    ),
-+  ],
-+})
-+
-+export const highlighter = merge({}, commonConfig, {
-+  entry: { highlighter: path.resolve(__dirname, 'src/highlighter/index') },
-+  output: {
-+    libraryTarget: 'var',
-+    chunkFilename: 'highlighter/[name].js',
-+  },
-+  optimization: {
-+    namedChunks: true,
-+    splitChunks: {
-+      cacheGroups: {
-+        modes: {
-+          enforce: true,
-+          name: (mod, chunks) => {
-+            const builtInMode = /node_modules\/codemirror\/mode\/(\w+)\//.exec(
-+              mod.resource
-+            )
-+            if (builtInMode) {
-+              return `mode/${builtInMode[1]}`
-+            }
-+            const external = /node_modules\/codemirror-mode-(\w+)\//.exec(
-+              mod.resource
-+            )
-+            if (external) {
-+              return `ext/${external[1]}`
-+            }
-+            return 'common'
-+          },
-+        },
-+      },
-+    },
-+  },
-+  target: 'webworker',
-+  plugins: [
-+    new webpack.DefinePlugin(
-+      Object.assign({}, replacements, {
-+        __PROCESS_KIND__: JSON.stringify('highlighter'),
-+      })
-+    ),
-+  ],
-+  resolve: {
-+    // We don't want to bundle all of CodeMirror in the highlighter. A web
-+    // worker doesn't have access to the DOM and most of CodeMirror's core
-+    // code is useless to us in that context. So instead we use this super
-+    // nifty subset of codemirror that defines the minimal context needed
-+    // to run a mode inside of node. Now, we're not running in node
-+    // but CodeMirror doesn't have to know about that.
-+    alias: {
-+      codemirror$: 'codemirror/addon/runmode/runmode.node.js',
-+      '../lib/codemirror$': '../addon/runmode/runmode.node.js',
-+      '../../lib/codemirror$': '../../addon/runmode/runmode.node.js',
-+      '../../addon/runmode/runmode$': '../../addon/runmode/runmode.node.js',
-+    },
-+  },
-+})
-+
-+highlighter.module!.rules = [
-+  {
-+    test: /\.ts$/,
-+    include: path.resolve(__dirname, 'src/highlighter'),
-+    use: [
-+      {
-+        loader: 'awesome-typescript-loader',
-+        options: {
-+          useBabel: true,
-+          useCache: true,
-+          configFileName: path.resolve(
-+            __dirname,
-+            'src/highlighter/tsconfig.json'
-+          ),
-+        },
-+      },
-+    ],
-+    exclude: /node_modules/,
-+  },
-+]
-removed in remote
-  base   100644 aab57ac31250a9a96cd3297a5df761e08ec7c180 app/webpack.development.js
-  our    100644 aab57ac31250a9a96cd3297a5df761e08ec7c180 app/webpack.development.js
-@@ -1,62 +0,0 @@
--'use strict'
--
--const common = require('./webpack.common')
--
--const webpack = require('webpack')
--const merge = require('webpack-merge')
--
--const config = {
--  devtool: 'source-map',
--}
--
--const mainConfig = merge({}, common.main, config)
--const askPassConfig = merge({}, common.askPass, config)
--const cliConfig = merge({}, common.cli, config)
--const highlighterConfig = merge({}, common.highlighter, config)
--
--const rendererConfig = merge({}, common.renderer, config, {
--  entry: {
--    renderer: [
--      'webpack-hot-middleware/client?path=http://localhost:3000/__webpack_hmr',
--      common.renderer.entry.renderer,
--    ],
--  },
--  output: {
--    publicPath: 'http://localhost:3000/build/',
--  },
--  module: {
--    rules: [
--      // This will cause the compiled CSS (and sourceMap) to be
--      // embedded within the compiled javascript bundle and added
--      // as a blob:// uri at runtime.
--      {
--        test: /\.(scss|css)$/,
--        use: ['style-loader', 'css-loader?sourceMap', 'sass-loader?sourceMap'],
--      },
--    ],
--  },
--  plugins: [new webpack.HotModuleReplacementPlugin()],
--})
--
--const crashConfig = merge({}, common.crash, config, {
--  module: {
--    rules: [
--      // This will cause the compiled CSS (and sourceMap) to be
--      // embedded within the compiled javascript bundle and added
--      // as a blob:// uri at runtime.
--      {
--        test: /\.(scss|css)$/,
--        use: ['style-loader', 'css-loader?sourceMap', 'sass-loader?sourceMap'],
--      },
--    ],
--  },
--})
--
--module.exports = [
--  mainConfig,
--  rendererConfig,
--  askPassConfig,
--  crashConfig,
--  cliConfig,
--  highlighterConfig,
--]
-added in remote
-  their  100644 85601e4b9f45f7a6177f1598e7e42f8f9f2563d8 app/webpack.development.ts
-@@ -0,0 +1,77 @@
-+import * as common from './webpack.common'
-+
-+import * as webpack from 'webpack'
-+import * as merge from 'webpack-merge'
-+
-+const config: webpack.Configuration = {
-+  mode: 'development',
-+  devtool: 'source-map',
-+}
-+
-+const mainConfig = merge({}, common.main, config)
-+const askPassConfig = merge({}, common.askPass, config)
-+const cliConfig = merge({}, common.cli, config)
-+const highlighterConfig = merge({}, common.highlighter, config)
-+
-+// TODO:
-+// if we have a PORT environment variable set and running `yarn start` we also
-+// need to update this script to use the same port when building because this
-+// is currently hard-coded.
-+
-+const webpackHotModuleReloadUrl =
-+  'webpack-hot-middleware/client?path=http://localhost:3000/__webpack_hmr'
-+
-+const getRendererEntryPoint = () => {
-+  const entry = common.renderer.entry as webpack.Entry
-+  if (entry == null) {
-+    throw new Error(
-+      `Unable to resolve entry point. Check webpack.common.ts and try again`
-+    )
-+  }
-+
-+  return entry.renderer as string
-+}
-+
-+const rendererConfig = merge({}, common.renderer, config, {
-+  entry: {
-+    renderer: [webpackHotModuleReloadUrl, getRendererEntryPoint()],
-+  },
-+  output: {
-+    publicPath: 'http://localhost:3000/build/',
-+  },
-+  module: {
-+    rules: [
-+      // This will cause the compiled CSS (and sourceMap) to be
-+      // embedded within the compiled javascript bundle and added
-+      // as a blob:// uri at runtime.
-+      {
-+        test: /\.(scss|css)$/,
-+        use: ['style-loader', 'css-loader?sourceMap', 'sass-loader?sourceMap'],
-+      },
-+    ],
-+  },
-+  plugins: [new webpack.HotModuleReplacementPlugin()],
-+})
-+
-+const crashConfig = merge({}, common.crash, config, {
-+  module: {
-+    rules: [
-+      // This will cause the compiled CSS (and sourceMap) to be
-+      // embedded within the compiled javascript bundle and added
-+      // as a blob:// uri at runtime.
-+      {
-+        test: /\.(scss|css)$/,
-+        use: ['style-loader', 'css-loader?sourceMap', 'sass-loader?sourceMap'],
-+      },
-+    ],
-+  },
-+})
-+
-+export = [
-+  mainConfig,
-+  rendererConfig,
-+  askPassConfig,
-+  crashConfig,
-+  cliConfig,
-+  highlighterConfig,
-+]
-removed in remote
-  base   100644 1d053b4165d86beb66a65a0cc983e3c6433e6096 app/webpack.production.js
-  our    100644 1d053b4165d86beb66a65a0cc983e3c6433e6096 app/webpack.production.js
-@@ -1,86 +0,0 @@
--'use strict'
--
--const common = require('./webpack.common')
--
--const webpack = require('webpack')
--const merge = require('webpack-merge')
--const ExtractTextPlugin = require('extract-text-webpack-plugin')
--const BabelPlugin = require('babel-webpack-plugin')
--
--const config = {
--  devtool: 'source-map',
--  plugins: [
--    new BabelPlugin({
--      test: /\.js$/,
--      sourceMaps: true,
--      compact: true,
--      minified: true,
--      comments: false,
--      presets: [
--        [
--          'minify',
--          {
--            evaluate: false,
--          },
--        ],
--      ],
--    }),
--    new webpack.optimize.ModuleConcatenationPlugin(),
--  ],
--}
--
--const mainConfig = merge({}, common.main, config)
--const askPassConfig = merge({}, common.askPass, config)
--const cliConfig = merge({}, common.cli, config)
--const highlighterConfig = merge({}, common.highlighter, config)
--
--const rendererConfig = merge({}, common.renderer, config, {
--  module: {
--    rules: [
--      // This will cause the compiled CSS to be output to a
--      // styles.css and a <link rel="stylesheet"> tag to be
--      // appended to the index.html HEAD at compile time
--      {
--        test: /\.(scss|css)$/,
--        use: ExtractTextPlugin.extract({
--          fallback: 'style-loader',
--          use: ['css-loader', 'sass-loader'],
--        }),
--      },
--    ],
--  },
--  plugins: [
--    // Necessary to be able to use ExtractTextPlugin as a loader.
--    new ExtractTextPlugin('ui.css'),
--  ],
--})
--
--const crashConfig = merge({}, common.crash, config, {
--  module: {
--    rules: [
--      // This will cause the compiled CSS to be output to a
--      // styles.css and a <link rel="stylesheet"> tag to be
--      // appended to the index.html HEAD at compile time
--      {
--        test: /\.(scss|css)$/,
--        use: ExtractTextPlugin.extract({
--          fallback: 'style-loader',
--          use: ['css-loader', 'sass-loader'],
--        }),
--      },
--    ],
--  },
--  plugins: [
--    // Necessary to be able to use ExtractTextPlugin as a loader.
--    new ExtractTextPlugin('crash.css'),
--  ],
--})
--
--module.exports = [
--  mainConfig,
--  rendererConfig,
--  askPassConfig,
--  crashConfig,
--  cliConfig,
--  highlighterConfig,
--]
-added in remote
-  their  100644 5ceca0028e592b33b03c18605f4eb67a3c69ecaf app/webpack.production.ts
-@@ -0,0 +1,75 @@
-+import * as common from './webpack.common'
-+
-+import * as webpack from 'webpack'
-+import * as merge from 'webpack-merge'
-+import * as MiniCssExtractPlugin from 'mini-css-extract-plugin'
-+import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer'
-+const MinifyPlugin = require('babel-minify-webpack-plugin')
-+
-+const config: webpack.Configuration = {
-+  mode: 'production',
-+  devtool: 'source-map',
-+  optimization: {
-+    minimizer: [new MinifyPlugin()],
-+  },
-+}
-+
-+const mainConfig = merge({}, common.main, config)
-+const askPassConfig = merge({}, common.askPass, config)
-+const cliConfig = merge({}, common.cli, config)
-+const highlighterConfig = merge({}, common.highlighter, config)
-+
-+const rendererConfig = merge({}, common.renderer, config, {
-+  module: {
-+    rules: [
-+      // This will cause the compiled CSS to be output to a
-+      // styles.css and a <link rel="stylesheet"> tag to be
-+      // appended to the index.html HEAD at compile time
-+      {
-+        test: /\.(scss|css)$/,
-+        use: [MiniCssExtractPlugin.loader, 'css-loader', 'sass-loader'],
-+      },
-+    ],
-+  },
-+  plugins: [
-+    // Necessary to be able to use MiniCssExtractPlugin as a loader.
-+    new MiniCssExtractPlugin({ filename: 'renderer.css' }),
-+    new BundleAnalyzerPlugin({
-+      // this generates the static HTML file to view afterwards, rather
-+      // than disrupting the user
-+      analyzerMode: 'static',
-+      openAnalyzer: false,
-+      // we can't emit this directly to the dist directory because the
-+      // build script immediately blows away dist after webpack is done
-+      // compiling the source into bundles
-+      reportFilename: 'renderer.report.html',
-+    }),
-+  ],
-+})
-+
-+const crashConfig = merge({}, common.crash, config, {
-+  module: {
-+    rules: [
-+      // This will cause the compiled CSS to be output to a
-+      // styles.css and a <link rel="stylesheet"> tag to be
-+      // appended to the index.html HEAD at compile time
-+      {
-+        test: /\.(scss|css)$/,
-+        use: [MiniCssExtractPlugin.loader, 'css-loader', 'sass-loader'],
-+      },
-+    ],
-+  },
-+  plugins: [
-+    // Necessary to be able to use MiniCssExtractPlugin as a loader.
-+    new MiniCssExtractPlugin({ filename: 'crash.css' }),
-+  ],
-+})
-+
-+export = [
-+  mainConfig,
-+  rendererConfig,
-+  askPassConfig,
-+  crashConfig,
-+  cliConfig,
-+  highlighterConfig,
-+]
-merged
-  result 100644 1bfea3d3a8c831597a2bba1db9d15bdf1f470765 app/yarn.lock
-  our    100644 32c446515d5906010e9d52842742a9a913e42c16 app/yarn.lock
-@@ -43,12 +43,6 @@
-   dependencies:
-     execa "^0.4.0"
-
--argparse@^1.0.7:
--  version "1.0.9"
--  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
--  dependencies:
--    sprintf-js "~1.0.2"
--
- asap@~2.0.3:
-   version "2.0.6"
-   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
-@@ -94,22 +88,6 @@
-   dependencies:
-     tweetnacl "^0.14.3"
-
--big.js@^3.1.3:
--  version "3.2.0"
--  resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
--
--boom@4.x.x:
--  version "4.3.1"
--  resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31"
--  dependencies:
--    hoek "4.x.x"
--
--boom@5.x.x:
--  version "5.2.0"
--  resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02"
--  dependencies:
--    hoek "4.x.x"
--
- brace-expansion@^1.1.7:
-   version "1.1.8"
-   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
-@@ -212,12 +190,6 @@
-   version "0.0.2"
-   resolved "https://registry.yarnpkg.com/cross-unzip/-/cross-unzip-0.0.2.tgz#5183bc47a09559befcf98cc4657964999359372f"
-
--cryptiles@3.x.x:
--  version "3.1.2"
--  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"
--  dependencies:
--    boom "5.x.x"
--
- cycle@1.0.x:
-   version "1.0.3"
-   resolved "https://registry.yarnpkg.com/cycle/-/cycle-1.0.3.tgz#21e80b2be8580f98b468f379430662b046c34ad2"
-@@ -266,14 +238,14 @@
-   version "2.0.0"
-   resolved "https://registry.yarnpkg.com/dom-matches/-/dom-matches-2.0.0.tgz#d2728b416a87533980eb089b848d253cf23a758c"
-
--dugite@1.61.0:
--  version "1.61.0"
--  resolved "https://registry.yarnpkg.com/dugite/-/dugite-1.61.0.tgz#d5dad047af478c1312f8b791eb56d9935e6fc47d"
-+dugite@^1.67.0:
-+  version "1.67.0"
-+  resolved "https://registry.yarnpkg.com/dugite/-/dugite-1.67.0.tgz#389f95051aa1fb2bc78dcee4294f913ae3438c47"
-   dependencies:
-     checksum "^0.1.1"
-     mkdirp "^0.5.1"
-     progress "^2.0.0"
--    request "^2.83.0"
-+    request "^2.86.0"
-     rimraf "^2.5.4"
-     tar "^4.0.2"
-
-@@ -324,10 +296,6 @@
-     jsonfile "^2.2.3"
-     mkdirp "^0.5.1"
-
--emojis-list@^2.0.0:
--  version "2.1.0"
--  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
--
- encoding@^0.1.11:
-   version "0.1.12"
-   resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
-@@ -338,10 +306,6 @@
-   version "1.0.5"
-   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-
--esprima@^4.0.0:
--  version "4.0.0"
--  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
--
- event-kit@^2.0.0:
-   version "2.4.0"
-   resolved "https://registry.yarnpkg.com/event-kit/-/event-kit-2.4.0.tgz#718aaf22df76670024ad66922483e1bba0544f33"
-@@ -409,18 +373,13 @@
-     combined-stream "^1.0.5"
-     mime-types "^2.1.12"
-
--front-matter@^2.1.2:
--  version "2.2.0"
--  resolved "https://registry.yarnpkg.com/front-matter/-/front-matter-2.2.0.tgz#35205f67522430b1213ef26149ecb068579fe38a"
--  dependencies:
--    js-yaml "^3.4.6"
--
--fs-extra@^2.1.2:
--  version "2.1.2"
--  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-2.1.2.tgz#046c70163cef9aad46b0e4a7fa467fb22d71de35"
-+fs-extra@^6.0.0:
-+  version "6.0.0"
-+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-6.0.0.tgz#0f0afb290bb3deb87978da816fcd3c7797f3a817"
-   dependencies:
-     graceful-fs "^4.1.2"
--    jsonfile "^2.1.0"
-+    jsonfile "^4.0.0"
-+    universalify "^0.1.0"
-
- fs-minipass@^1.2.3:
-   version "1.2.3"
-@@ -472,23 +431,10 @@
-   version "2.0.0"
-   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
-
--hawk@~6.0.2:
--  version "6.0.2"
--  resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038"
--  dependencies:
--    boom "4.x.x"
--    cryptiles "3.x.x"
--    hoek "4.x.x"
--    sntp "2.x.x"
--
- highlight.js@^9.3.0:
-   version "9.12.0"
-   resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.12.0.tgz#e6d9dbe57cbefe60751f02af336195870c90c01e"
-
--hoek@4.x.x:
--  version "4.2.0"
--  resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d"
--
- html-entities@^1.2.0:
-   version "1.2.1"
-   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
-@@ -516,7 +462,7 @@
-     once "^1.3.0"
-     wrappy "1"
-
--inherits@2:
-+inherits@2, inherits@~2.0.0:
-   version "2.0.3"
-   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-
-@@ -547,13 +493,6 @@
-   version "3.0.2"
-   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
-
--js-yaml@^3.4.6:
--  version "3.10.0"
--  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc"
--  dependencies:
--    argparse "^1.0.7"
--    esprima "^4.0.0"
--
- jsbn@~0.1.0:
-   version "0.1.1"
-   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-@@ -570,16 +509,18 @@
-   version "5.0.1"
-   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-
--json5@^0.5.0:
--  version "0.5.1"
--  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
--
--jsonfile@^2.1.0, jsonfile@^2.2.3:
-+jsonfile@^2.2.3:
-   version "2.4.0"
-   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
-   optionalDependencies:
-     graceful-fs "^4.1.6"
-
-+jsonfile@^4.0.0:
-+  version "4.0.0"
-+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
-+  optionalDependencies:
-+    graceful-fs "^4.1.6"
-+
- jsprim@^1.2.2:
-   version "1.4.1"
-   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
-@@ -603,14 +544,6 @@
-   dependencies:
-     nan "2.5.1"
-
--loader-utils@^1.0.2:
--  version "1.1.0"
--  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
--  dependencies:
--    big.js "^3.1.3"
--    emojis-list "^2.0.0"
--    json5 "^0.5.0"
--
- loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.0, loose-envify@^1.3.1:
-   version "1.3.1"
-   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
-@@ -777,6 +710,12 @@
-   version "0.2.0"
-   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
-
-+queue@^4.4.2:
-+  version "4.4.2"
-+  resolved "https://registry.yarnpkg.com/queue/-/queue-4.4.2.tgz#5a9733d9a8b8bd1b36e934bc9c55ab89b28e29c7"
-+  dependencies:
-+    inherits "~2.0.0"
-+
- react-addons-shallow-compare@^15.6.2:
-   version "15.6.2"
-   resolved "https://registry.yarnpkg.com/react-addons-shallow-compare/-/react-addons-shallow-compare-15.6.2.tgz#198a00b91fc37623db64a28fd17b596ba362702f"
-@@ -784,15 +723,19 @@
-     fbjs "^0.8.4"
-     object-assign "^4.1.0"
-
--react-dom@^16.2.0:
--  version "16.2.0"
--  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.2.0.tgz#69003178601c0ca19b709b33a83369fe6124c044"
-+react-dom@^16.3.2:
-+  version "16.3.2"
-+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.3.2.tgz#cb90f107e09536d683d84ed5d4888e9640e0e4df"
-   dependencies:
-     fbjs "^0.8.16"
-     loose-envify "^1.1.0"
-     object-assign "^4.1.1"
-     prop-types "^15.6.0"
-
-+react-lifecycles-compat@^3.0.4:
-+  version "3.0.4"
-+  resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
-+
- react-transition-group@^1.2.0:
-   version "1.2.1"
-   resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-1.2.1.tgz#e11f72b257f921b213229a774df46612346c7ca6"
-@@ -803,19 +746,20 @@
-     prop-types "^15.5.6"
-     warning "^3.0.0"
-
--react-virtualized@^9.18.5:
--  version "9.18.5"
--  resolved "https://registry.yarnpkg.com/react-virtualized/-/react-virtualized-9.18.5.tgz#42dd390ebaa7ea809bfcaf775d39872641679b89"
-+react-virtualized@^9.20.0:
-+  version "9.20.0"
-+  resolved "https://registry.yarnpkg.com/react-virtualized/-/react-virtualized-9.20.0.tgz#b024992cc857c1a1b2884a019ac52ed686cd690b"
-   dependencies:
-     babel-runtime "^6.26.0"
-     classnames "^2.2.3"
-     dom-helpers "^2.4.0 || ^3.0.0"
-     loose-envify "^1.3.0"
-     prop-types "^15.6.0"
-+    react-lifecycles-compat "^3.0.4"
-
--react@^16.2.0:
--  version "16.2.0"
--  resolved "https://registry.yarnpkg.com/react/-/react-16.2.0.tgz#a31bd2dab89bff65d42134fa187f24d054c273ba"
-+react@^16.3.2:
-+  version "16.3.2"
-+  resolved "https://registry.yarnpkg.com/react/-/react-16.3.2.tgz#fdc8420398533a1e58872f59091b272ce2f91ea9"
-   dependencies:
-     fbjs "^0.8.16"
-     loose-envify "^1.1.0"
-@@ -832,9 +776,9 @@
-   dependencies:
-     nan "^2.8.0"
-
--request@^2.83.0:
--  version "2.83.0"
--  resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
-+request@^2.86.0:
-+  version "2.87.0"
-+  resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e"
-   dependencies:
-     aws-sign2 "~0.7.0"
-     aws4 "^1.6.0"
-@@ -844,7 +788,6 @@
-     forever-agent "~0.6.1"
-     form-data "~2.3.1"
-     har-validator "~5.0.3"
--    hawk "~6.0.2"
-     http-signature "~1.2.0"
-     is-typedarray "~1.0.0"
-     isstream "~0.1.2"
-@@ -854,7 +797,6 @@
-     performance-now "^2.1.0"
-     qs "~6.5.1"
-     safe-buffer "^5.1.1"
--    stringstream "~0.0.5"
-     tough-cookie "~2.3.3"
-     tunnel-agent "^0.6.0"
-     uuid "^3.1.0"
-@@ -887,12 +829,6 @@
-   version "1.0.5"
-   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
-
--sntp@2.x.x:
--  version "2.1.0"
--  resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8"
--  dependencies:
--    hoek "4.x.x"
--
- source-map-support@^0.4.15:
-   version "0.4.18"
-   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
-@@ -903,10 +839,6 @@
-   version "0.5.7"
-   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-
--sprintf-js@~1.0.2:
--  version "1.0.3"
--  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
--
- sshpk@^1.7.0:
-   version "1.13.1"
-   resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3"
-@@ -925,10 +857,6 @@
-   version "0.0.10"
-   resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
-
--stringstream@~0.0.5:
--  version "0.0.5"
--  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
--
- strip-ansi@^3.0.0:
-   version "3.0.1"
-   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-@@ -945,12 +873,6 @@
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
-
--style-loader@^0.13.2:
--  version "0.13.2"
--  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.13.2.tgz#74533384cf698c7104c7951150b49717adc2f3bb"
--  dependencies:
--    loader-utils "^1.0.2"
--
- supports-color@^4.0.0:
-   version "4.4.0"
-   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.4.0.tgz#883f7ddabc165142b2a61427f3352ded195d1a3e"
-@@ -999,6 +921,10 @@
-   version "0.7.14"
-   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.14.tgz#110d53fa4c3f326c121292bbeac904d2e03387ca"
-
-+universalify@^0.1.0:
-+  version "0.1.1"
-+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.1.tgz#fa71badd4437af4c148841e3b3b165f9e9e590b7"
-+
- untildify@^3.0.2:
-   version "3.0.2"
-   resolved "https://registry.yarnpkg.com/untildify/-/untildify-3.0.2.tgz#7f1f302055b3fea0f3e81dc78eb36766cb65e3f1"
-merged
-  result 100644 5185c7d6e7e86cafdb3aec94115c1120c9e776a2 appveyor.yml
-  our    100644 e9a9426356bf8465dbdc277c0ee9a2fb876e5e67 appveyor.yml
-@@ -4,7 +4,7 @@
-   - x64
-
- environment:
--  nodejs_version: "8.9.0"
-+  nodejs_version: "8.11"
-
- cache:
-   - .eslintcache
-merged
-  result 100644 6e0feab6683b3ff164dfee68d69eb6fdd5478b53 changelog.json
-  our    100644 061dd96a1d5f2e461c954e4a3e42398dfd8fc837 changelog.json
-@@ -1,5 +1,194 @@
- {
-   "releases": {
-+    "1.2.7-test1": [
-+      "Sanity check deployment for refactored scripts"
-+    ],
-+    "1.2.7-beta0": [
-+      "[Fixed] Visual indicator for upcoming feature should not be shown - #5026"
-+    ],
-+    "1.2.6": [
-+      "[Fixed] Visual indicator for upcoming feature should not be shown - #5026"
-+    ],
-+    "1.2.6-beta0": [
-+      "[Fixed] Feature flag for upcoming feature not applied correctly - #5024"
-+    ],
-+    "1.2.5": [
-+      "[Fixed] Feature flag for upcoming feature not applied correctly - #5024"
-+    ],
-+    "1.2.4": [
-+      "[New] Dark Theme preview - #4849",
-+      "[Added] Syntax highlighting for Cake files - #4935. Thanks @say25!",
-+      "[Added] WebStorm support for macOS - #4841. Thanks @mrsimonfletcher!",
-+      "[Fixed] Compare tab appends older commits when scrolling to bottom of list - #4964",
-+      "[Fixed] Remove temporary directory after Git LFS operation completes - #4414",
-+      "[Fixed] Unable to compare when two branches exist - #4947 #4730",
-+      "[Fixed] Unhandled errors when refreshing pull requests fails - #4844 #4866",
-+      "[Improved] Remove context menu needs to hint if a dialog will be shown - #4975",
-+      "[Improved] Upgrade embedded Git LFS - #4602 #4745",
-+      "[Improved] Update banner message clarifies that only Desktop needs to be restarted - #4891. Thanks @KennethSweezy!",
-+      "[Improved] Discard Changes context menu entry should contain ellipses when user needs to confirm - #4846. Thanks @yongdamsh!",
-+      "[Improved] Initializing syntax highlighting components - #4764",
-+      "[Improved] Only show overflow shadow when description overflows - #4898",
-+      "[Improved] Changes tab displays number of changed files instead of dot - #4772. Thanks @yongdamsh!"
-+    ],
-+    "1.2.4-beta5": [
-+
-+    ],
-+    "1.2.4-beta4": [
-+      "[Fixed] Compare tab appends older commits when scrolling to bottom of list - #4964",
-+      "[Fixed] Remove temporary directory after Git LFS operation completes - #4414",
-+      "[Improved] Remove context menu needs to hint if a dialog will be shown - #4975",
-+      "[Improved] Upgrade embedded Git LFS - #4602 #4745"
-+    ],
-+    "1.2.4-test1": [
-+      "Confirming latest Git LFS version addresses reported issues"
-+    ],
-+    "1.2.4-beta3": [
-+      "[Added] WebStorm support for macOS - #4841. Thanks @mrsimonfletcher!",
-+      "[Improved] Update banner message clarifies that only Desktop needs to be restarted - #4891. Thanks @KennethSweezy!"
-+    ],
-+    "1.2.4-beta2": [
-+    ],
-+    "1.2.4-beta1": [
-+      "[New] Dark Theme preview - #4849",
-+      "[Added] Syntax highlighting for Cake files - #4935. Thanks @say25!",
-+      "[Fixed] Unable to compare when two branches exist - #4947 #4730",
-+      "[Fixed] Unhandled errors when refreshing pull requests fails - #4844 #4866",
-+      "[Improved] Discard Changes context menu entry should contain ellipses when user needs to confirm - #4846. Thanks @yongdamsh!",
-+      "[Improved] Initializing syntax highlighting components - #4764",
-+      "[Improved] Only show overflow shadow when description overflows - #4898",
-+      "[Improved] Changes tab displays number of changed files instead of dot - #4772. Thanks @yongdamsh!"
-+    ],
-+    "1.2.3": [
-+      "[Fixed] No autocomplete when searching for co-authors - #4847",
-+      "[Fixed] Error when checking out a PR from a fork - #4842"
-+    ],
-+    "1.2.3-beta1": [
-+      "[Fixed] No autocomplete when searching for co-authors - #4847",
-+      "[Fixed] Error when checking out a PR from a fork - #4842"
-+    ],
-+    "1.2.3-test1": [
-+      "Confirming switch from uglify-es to babel-minify addresses minification issue - #4871"
-+    ],
-+    "1.2.2": [
-+      "[Fixed] Make cURL/schannel default to using the Windows certificate store - #4817",
-+      "[Fixed] Restore text selection highlighting in diffs - #4818"
-+    ],
-+    "1.2.2-beta1": [
-+      "[Fixed] Make cURL/schannel default to using the Windows certificate store - #4817",
-+      "[Fixed] Text selection highlighting in diffs is back - #4818"
-+    ],
-+    "1.2.1": [
-+      "[Added] Brackets support for macOS - #4608. Thanks @3raxton!",
-+      "[Added] Pull request number and author are included in fuzzy-find filtering - #4653. Thanks @damaneice!",
-+      "[Fixed] Decreased the max line length limit - #3740. Thanks @sagaragarwal94!",
-+      "[Fixed] Updated embedded Git to 2.17.1 to address upstream security issue - #4791",
-+      "[Improved] Display the difference in file size of an image in the diff view - #4380. Thanks @ggajos!"
-+    ],
-+    "1.2.1-test1": [
-+      "Upgraded embedded Git to 2.17.0"
-+    ],
-+    "1.2.1-beta1": [
-+      "[Added] Brackets support for macOS - #4608. Thanks @3raxton!",
-+      "[Added] Pull request number and author are included in fuzzy-find filtering - #4653. Thanks @damaneice!",
-+      "[Fixed] Decreased the max line length limit - #3740. Thanks @sagaragarwal94!",
-+      "[Fixed] Updated embedded Git to 2.17.1 to address upstream security issue - #4791",
-+      "[Improved] Display the difference in file size of an image in the diff view - #4380. Thanks @ggajos!"
-+    ],
-+    "1.2.1-beta0": [
-+
-+    ],
-+    "1.1.2-test6": [
-+      "Testing the Webpack v4 output from the project"
-+    ],
-+    "1.2.0": [
-+      "[New] History now has ability to compare to another branch and merge outstanding commits",
-+      "[New] Support for selecting more than one file in the changes list - #1712. Thanks @icosamuel!",
-+      "[New] Render bitmap images in diffs - #4367. Thanks @MagicMarvMan!",
-+      "[Added] Add PowerShell Core support for Windows and macOS - #3791. Thanks @saschanaz!",
-+      "[Added] Add MacVim support for macOS - #4532. Thanks @johnelliott!",
-+      "[Added] Syntax highlighting for JavaServer Pages (JSP) - #4470. Thanks @damaneice!",
-+      "[Added] Syntax highlighting for Haxe files - #4445. Thanks @Gama11!",
-+      "[Added] Syntax highlighting for R files - #4455. Thanks @say25!",
-+      "[Fixed] 'Open in Shell' on Linux ensures Git is on PATH - #4619. Thanks @ziggy42!",
-+      "[Fixed] Pressing 'Enter' on filtered Pull Request does not checkout - #4673",
-+      "[Fixed] Alert icon shrinks in rename dialog when branch name is long - #4566",
-+      "[Fixed] 'Open in Desktop' performs fetch to ensure branch exists before checkout - #3006",
-+      "[Fixed] 'Open in Default Program' on Windows changes the window title - #4446",
-+      "[Fixed] Skip fast-forwarding when there are many eligible local branches - #4392",
-+      "[Fixed] Image diffs not working for files with upper-case file extension - #4466",
-+      "[Fixed] Syntax highlighting not working for files with upper-case file extension - #4462. Thanks @say25!",
-+      "[Fixed] Error when creating Git LFS progress causes clone to fail - #4307. Thanks @MagicMarvMan!",
-+      "[Fixed] 'Open File in External Editor' always opens a new instance - #4381",
-+      "[Fixed] 'Select All' shortcut now works for changes list - #3821",
-+      "[Improved] Automatically add valid repository when using command line interface - #4513. Thanks @ggajos!",
-+      "[Improved] Always fast-forward the default branch - #4506",
-+      "[Improved] Warn when trying to rename a published branch - #4035. Thanks @agisilaos!",
-+      "[Improved] Added context menu for files in commit history - #2845. Thanks @crea7or",
-+      "[Improved] Discarding all changes always prompts for confirmation - #4459",
-+      "[Improved] Getting list of changed files is now more efficient when dealing with thousands of files - #4443",
-+      "[Improved] Checking out a Pull Request may skip unnecessary fetch - #4068. Thanks @agisilaos!",
-+      "[Improved] Commit summary now has a hint to indicate why committing is disabled - #4429.",
-+      "[Improved] Pull request status text now matches format on GitHub - #3521",
-+      "[Improved] Add escape hatch to disable hardware acceleration when launching - #3921"
-+    ],
-+    "1.1.2-beta7": [
-+    ],
-+    "1.1.2-beta6": [
-+      "[Added] Add MacVim support for macOS - #4532. Thanks @johnelliott!",
-+      "[Fixed] Open in Shell on Linux ensures Git is available on the user's PATH - #4619. Thanks @ziggy42!",
-+      "[Fixed] Keyboard focus issues when navigating Pull Request list - #4673",
-+      "[Improved] Automatically add valid repository when using command line interface - #4513. Thanks @ggajos!"
-+    ],
-+    "1.1.2-test5": [
-+      "Actually upgrading fs-extra to v6 in the app"
-+    ],
-+    "1.1.2-test4": [
-+      "Upgrading fs-extra to v6"
-+    ],
-+    "1.1.2-beta5": [
-+      "[Added] Syntax highlighting for JavaServer Pages (JSP) - #4470. Thanks @damaneice!",
-+      "[Fixed] Prevent icon from shrinking in rename dialog - #4566"
-+    ],
-+    "1.1.2-beta4": [
-+      "[New] New Compare tab allowing visualization of the relationship between branches",
-+      "[New] Support for selecting more than one file in the changes list - #1712. Thanks @icosamuel!",
-+      "[Fixed] 'Select All' shortcut now works for changes list - #3821",
-+      "[Improved] Always fast-forward the default branch - #4506",
-+      "[Improved] Warn when trying to rename a published branch - #4035. Thanks @agisilaos!",
-+      "[Improved] Added context menu for files in commit history - #2845. Thanks @crea7or",
-+      "[Improved] Discarding all changes always prompts for confirmation - #4459"
-+    ],
-+    "1.1.2-beta3": [
-+      "[Added] Syntax highlighting for Haxe files - #4445. Thanks @Gama11!",
-+      "[Added] Syntax highlighting for R files - #4455. Thanks @say25!",
-+      "[Fixed] Fetch to ensure \"Open in Desktop\" has a branch to checkout - #3006",
-+      "[Fixed] Handle the click event when opening a binary file - #4446",
-+      "[Fixed] Skip fast-forwarding when there are a lot of eligible local branches - #4392",
-+      "[Fixed] Image diffs not working for files with upper-case file extension - #4466",
-+      "[Fixed] Syntax highlighting not working for files with upper-case file extension - #4462. Thanks @say25!",
-+      "[Improved] Getting list of changed files is now more efficient when dealing with thousands of files - #4443",
-+      "[Improved] Checking out a Pull Request may skip unnecessary fetch - #4068. Thanks @agisilaos!",
-+      "[Improved] Commit summary now has a hint to indicate why committing is disabled - #4429."
-+    ],
-+    "1.1.2-test3": [
-+      "[New] Comparison Branch demo build"
-+    ],
-+    "1.1.2-test2": [
-+      "Refactoring the diff internals to potentially land some SVG improvements"
-+    ],
-+    "1.1.2-test1": [
-+      "Refactoring the diff internals to potentially land some SVG improvements"
-+    ],
-+    "1.1.2-beta2": [
-+      "[New] Render bitmap images in diffs - #4367. Thanks @MagicMarvMan!",
-+      "[New] Add PowerShell Core support for Windows and macOS - #3791. Thanks @saschanaz!",
-+      "[Fixed] Error when creating Git LFS progress causes clone to fail - #4307. Thanks @MagicMarvMan!",
-+      "[Fixed] 'Open File in External Editor' does not use existing window - #4381",
-+      "[Fixed] Always ask for confirmation when discarding all changes - #4423",
-+      "[Improved] Pull request status text now matches format on GitHub - #3521",
-+      "[Improved] Add escape hatch to disable hardware acceleration when launching - #3921"
-+    ],
-     "1.1.2-beta1": [
-
-     ],
-merged
-  result 100644 19865d13f3ab50d13c233da23115035bf423212e circle.yml
-  our    100644 6dc532103b44f2896468ac6d61f4b4db4d2394f7 circle.yml
-@@ -20,12 +20,12 @@
-     - brew update
-     # uninstall Node 6 which is shipped by default on Circle
-     - brew uninstall node
--    # install latest Node LTS (8.9.3 as of writing)
-+    # install latest Node LTS (8.11.* as of writing)
-     - brew install node@8 --force
-     # everything is terrible, but we must march on
-     - brew link --overwrite node@8 --force
-     # workaround for yarn installation issue
--    - curl -o- -L https://yarnpkg.com/install.sh | TERM=xterm bash
-+    - curl -o- -L https://yarnpkg.com/install.sh | TERM=xterm bash -s -- --version 1.5.1
-
-   override:
-     - yarn install --force
-merged
-  result 100644 85f2237dba6b5f8296b3fe7c9214125fb1ab8291 docs/README.md
-  our    100644 1b5837911492e094338cbe0808ba278c35d4ed08 docs/README.md
-@@ -28,7 +28,7 @@
-     releases
-  - **[Issue Triage](process/issue-triage.md)** - how we address issues reported
-     by users
-- - **[Review Process](process/reviews.md)** - how we review contributions
-+ - **[Pull Request Triage](process/pull-request-triage.md)** - how contributions are reviewed
-  - **[Releasing Updates](process/releasing-updates.md)** - how we deploy things
-
- ## Technical
-merged
-  result 100644 e6d7547da4874c319f72d7264d11e060f2270d41 docs/contributing/setup.md
-  our    100644 5b9cda4685280976fbfceb7265cab922d7b508b3 docs/contributing/setup.md
-@@ -6,13 +6,13 @@
-
- ### macOS
-
-- - [Node.js v8.9.0](https://nodejs.org/dist/v8.9.0/)
-+ - [Node.js v8.11.2](https://nodejs.org/dist/v8.11.2/)
-  - [Python 2.7](https://www.python.org/downloads/mac-osx/)
-  - Xcode and Xcode Command Line Tools (Xcode -> Preferences -> Downloads)
-
- ### Windows
-
-- - [Node.js v8.9.0](https://nodejs.org/dist/v8.9.0/)
-+ - [Node.js v8.11.2](https://nodejs.org/dist/v8.11.2/)
-     - *Make sure you allow the Node.js installer to add node to the PATH.*
-  - [Python 2.7](https://www.python.org/downloads/windows/)
-     - *Let Python install into the default suggested path (`c:\Python27`), otherwise you'll have
-@@ -32,7 +32,7 @@
-
- ### Fedora 26
-
--First, add the NodeJS package repository.
-+First, add the NodeJS package repository for 8.x.
-
- ```shellsession
- $ curl --silent --location https://rpm.nodesource.com/setup_8.x | sudo bash -
-@@ -67,7 +67,7 @@
- $ sudo apt install curl
- ```
-
--Then add the NodeJS package repository:
-+Then add the NodeJS package repository for 8.x:
-
- ```shellsession
- $ curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash -
-@@ -95,35 +95,45 @@
- on setup there.
- * Instead of running `yarn` to get all required dependencies on your machine, you will
- instead need to run `script/install-arm64-deps.sh`.
-+* Before building with `yarn build:dev` or `yarn build:prod`, you will need to
-+set the environment variable `TARGET_ARCH` to `arm64` eg:
-+```shellsession
-+export TARGET_ARCH=arm64
-+```
-
--## Verification
-+## Install Yarn
-
--With these things installed, open a shell and install `yarn` (you might need
--to `sudo` here depending on how Node was installed):
-+After doing this setup, you also need to install `yarn` as Desktop uses
-+this for managing packages instead of NPM. **Do not install `yarn` through
-+NPM**. Refer to the [install instructions](https://yarnpkg.com/en/docs/install)
-+for your OS.
-
--```shellsession
--$ npm install -g yarn@1.3.2
--```
-+This is important because `yarn` uses lock files to pin dependencies. If you
-+find yourself changing packages, this will prevent mismatches in versions
-+between machines.
-+
-+If you're not familiar with `yarn`, please read [this document](./working-with-packages.md)
-+to help familiarize yourself with how to do the common package tasks that are
-+relevant to Desktop.
-
--This is important because yarn uses lock files to pin dependencies. If you find
--yourself changing packages, this will prevent mismatches in versions between machines.
-+## Verification
-
--Then validate you have these commands available and that the versions look similar:
-+Then verify you have these commands available in your shell and that the found
-+versions look similar to the below output:
-
- ```shellsession
- $ node -v
--v7.8.0
-+v8.11.2
-
- $ yarn -v
--1.2.0
-+1.5.1
-
- $ python --version
- Python 2.7.13
- ```
-
--There are also [additional resources](tooling.md) to
--configure your favorite editor to work nicely with the GitHub Desktop
--repository.
-+There are also [additional resources](tooling.md) to configure your favorite
-+editor to work nicely with the GitHub Desktop repository.
-
- ## Building Desktop
-
-@@ -133,7 +143,7 @@
- * Run `yarn` to get all required dependencies on your machine.
- * Run `yarn build:dev` to create a development build of the app.
- * Run `yarn start` to launch the application. Changes will be compiled in the
--  background. The app can then be reloaded to see the changes (Ctrl/Command+R).
-+  background. The app can then be reloaded to see the changes (<kbd>Ctrl/Command+Alt+R</kbd>).
-
- **Optional Tip**: On macOS and Linux, you can use `screen` to avoid filling your terminal with logging output:
-
-@@ -156,25 +166,15 @@
- ## Running tests
-
- - `yarn test` - Runs all unit and integration tests
--- `yarn test:unit` - Runs all unit tests
-+- `yarn test:unit` - Runs all unit tests (add `--debug` to open Chrome Dev Tools while running tests)
- - `yarn test:integration` - Runs all integration tests
-
--**Pro Tip:** If you're only interested in the results of a single test and don't
--wish to run the entire test suite to see it you can pass along a search string
--in order to only run the tests that match that string.
--
--```shellsession
--$ yarn test:unit -- --grep CloneProgressParser
--```
--
--This example will run all test names containing `CloneProgressParser`.
--
- ## Debugging
-
- Electron ships with Chrome Dev Tools to assist with debugging, profiling and
- other measurement tools.
-
--1. Run the command `npm start` to launch the app
-+1. Run the command `yarn start` to launch the app
- 2. Under the **View** menu, select **Toggle Developer Tools**
-
- When running the app in development mode,
-@@ -193,7 +193,7 @@
-
- You're almost there! Here's a couple of things we recommend you read next:
-
-- - [Help Wanted](../../.github/CONTRIBUTING.md#help-wanted) - we've marked some tasks in
--   the backlog that are ideal for external contributors
-- - [Code Reviews](../process/reviews.md) - some notes on how the team does
--   code reviews
-+ - [Help Wanted](../../.github/CONTRIBUTING.md#help-wanted) - we've marked some
-+   tasks in the backlog that are ideal for external contributors
-+ - [Notes for Contributors](../process/notes-for-contributors.md) - some notes
-+   for new contributors getting started
-merged
-  result 100644 68616f214de0f1dfb283dee8a0d503eabf3374f2 docs/contributing/styleguide.md
-  our    100644 3dd9587dfcc10f13be634b635aa26bee01b894ea docs/contributing/styleguide.md
-@@ -41,7 +41,7 @@
-
- The [`Dispatcher`](https://github.com/desktop/desktop/blob/master/app/src/lib/dispatcher/dispatcher.ts)
- is the entry point for most interactions with the application which update state,
--and for most usages this work is then delegated to the [`AppStore`](https://github.com/desktop/desktop/blob/master/app/src/lib/dispatcher/app-store.ts).
-+and for most usages this work is then delegated to the [`AppStore`](https://github.com/desktop/desktop/blob/master/app/src/lib/stores/app-store.ts).
- Due to this coupling, we need to discourage callers directly manipulating
- specific methods in the `AppStore` unless there's a compelling reason.
-
-merged
-  result 100644 265fc7e708fdeb51902542f01f6dc5ab7fcf1272 docs/known-issues.md
-  our    100644 6260d6cfcc30bb19e986dc534dd64471b05506a3 docs/known-issues.md
-@@ -14,7 +14,7 @@
-
- ### My issue is not listed here?
-
--Please check the [open](https://github.com/desktop/desktop/labels/bug) and [closed](https://github.com/desktop/desktop/issues?q=is%3Aclosed+label%3Abug) bugs in the issue tracker for the details of your bug. If you can't find it, or if you're not sure, open a [new issue](https://github.com/desktop/desktop/issues/new).
-+Please check the [open](https://github.com/desktop/desktop/labels/bug) and [closed](https://github.com/desktop/desktop/issues?q=is%3Aclosed+label%3Abug) bugs in the issue tracker for the details of your bug. If you can't find it, or if you're not sure, open a [new issue](https://github.com/desktop/desktop/issues/new?template=bug_report.md).
-
- ## macOS
-
-@@ -118,3 +118,9 @@
- Enabling Mandatory ASLR affects the MSYS2 core library, which is relied upon by Git for Windows to emulate process forking.
-
- **Not supported:** this is an upstream limitation of MSYS2, and it is recommend that you either disable Mandatory ASLR or whitelist all executables under `<Git>\usr\bin` which depend on MSYS2.
-+
-+### I get a black screen when launching Desktop
-+
-+Electron enables hardware accelerated graphics by default, but some graphics cards have issues with hardware acceleration which means the application will launch successfully but it will be a black screen.
-+
-+**Workaround:** if you set the `GITHUB_DESKTOP_DISABLE_HARDWARE_ACCELERATION` environment variable to any value and launch Desktop again it will disable hardware acceleration on launch, so the application is usable.
-\ No newline at end of file
-added in remote
-  their  100644 1fd166574ae526e79f25a6163285059d9f837946 docs/process/notes-for-contributors.md
-@@ -0,0 +1,37 @@
-+## Notes for Contributors
-+
-+### Work-in-Progress
-+
-+We recommend open pull requests early - ideally as soon as you have something to
-+show. This is especially helpful for large pieces of work, as continuous
-+integration tests are run earlier on, and regressions can be caught before
-+humans get involved.
-+
-+Until the code is ready for review, you can prefix the PR title with [WIP] to
-+indicate that it's under development.
-+
-+### Use Task Lists
-+
-+If you are working through a list of tasks as part of a pull request, listing
-+those tasks and indicating when they have been completed helps reviewers to
-+understand quickly what's changed.
-+
-+### Keep The Commit History Tidy
-+
-+We're not that fussy about the history, but to make reviewing easier here's
-+some general tips:
-+
-+ - make small, meaningful and logical commits - these make the review process easier
-+ - [write good commit messages](https://chris.beams.io/posts/git-commit/) -
-+   these help the reviewer to understand the changes
-+ - keep up to date with `master` - not only does this address potential merge
-+   conflicts, it ensures you're integrating with the latest code
-+
-+When merging, we prefer you merge `master` into your branch, but for small
-+PRs a rebase is fine.
-+
-+### These Things Take Time
-+
-+Our team is distributed around the world, and often we like to get their
-+feedback for specific areas of the codebase. And even with minor changes, we often like to let
-+them sit for a while and give everyone a chance to provide their input.
-added in remote
-  their  100644 4c2d1f5be688335f169fe3e3b466e96883b2913f docs/process/pull-request-triage.md
-@@ -0,0 +1,100 @@
-+# Pull Request Triage
-+
-+This document outlines how the Desktop team handles pull requests, to ensure
-+a consistent process for contributions from the core team and the community.
-+
-+## The Review Process
-+
-+1. **Contributor** opens pull request.
-+1. When it's ready for review, add a comment to the pull request.
-+1. A member of the reviewer team will give it a quick look over and
-+   add the `ready-for-review` label.
-+1. A **reviewer** with bandwidth will appear.
-+1. **Reviewer** assigns the PR to themselves.
-+1. **Reviewer** leaves line comments with suggestions or questions.
-+1. When the **reviewer** is done they comment on the PR with an emoji, meme,
-+   pokémon, or words to that effect.
-+1. The **contributor** responds to feedback, makes changes, etc.
-+1. When the **contributor** is ready for the **reviewer** to re-review, they
-+   comment on the PR with an emoji, meme, pokémon or words to that effect.
-+1. Goto 6 until both parties are happy with the PR.
-+1. The **reviewer** hits the big green merge button and deletes the branch (if
-+    applicable).
-+
-+Merged contributions are first published to the beta channel (we aim to publish
-+new versions weekly if contributions are availlable) before then being
-+published to the production channel (we aim to publish new versions on a monthly
-+cadence).
-+
-+### When The Review Is Done
-+
-+We're using GitHub's review tools to co-ordinate feedback, and we like to be
-+methodical with our reviews, so you'll probably end up with one of two results:
-+
-+ - **Approved**: nothing else to do; the contribution is great! :gem:
-+ - **Request Changes**: there are things to address; reviewer provides details :memo:
-+
-+Reviews can take a few iterations, especially for large contributions. Don't
-+be disheartened if you feel it takes time - we just want to ensure each
-+contribution is high-quality and that any outstanding questions are resolved,
-+captured or documented for posterity.
-+
-+### Assignees
-+
-+The reviewers team uses the **Assignee** field to indicate who "owns" the review
-+process for a contribution. While others can add their reviews to a pull request -
-+and large features will likely have multiple reviewers - it's up to the assignee
-+to take charge of the process and see it through to the end.
-+
-+If a reviewer is feeling overloaded, or if a review has stalled, the reviewer may
-+remove themselves from a pull request. This helps others know where they can help
-+out to share the load.
-+
-+### Everyone Reviews
-+
-+While everyone has their own domain expertise around the codebase, we encourage
-+people to share the load of reviews and reviewing areas of the codebase that
-+aren't as familiar. This spreads knowledge across the team
-+
-+### 24 Hours Cooling Off
-+
-+After being approved, most contributions will remain in this state for at least
-+24 hours before merging. The review team does this to ensure everyone on the team,
-+who are normally spread around the world, has a chance to provide feedback about
-+the changes.
-+
-+### No Self-Merges
-+
-+We encourage a strong review culture, and contributors should not merge their
-+own PRs unless there are exceptional reasons.
-+
-+Examples of exceptional situations:
-+
-+- [#2733](https://github.com/desktop/desktop/pull/2733) was pinning a dependency
-+  that affected our continuous integration tests by installing the incorrect
-+  version
-+
-+- [#4319](https://github.com/desktop/desktop/pull/4319) was a minor packaging
-+  change introduced unexpectedly on `master` but would affect everyone when they
-+  updated their local repositories.
-+
-+These should be called out by the merging person with a `#jolo` - "Josh Only
-+Lives Once" - to acknowledge to everyone that they're bypassing the review
-+process, and the reasons for doing that.
-+
-+### Stale Pull Requests
-+
-+A reviewer will return to an **open and reviewed** pull request if, after 14
-+days:
-+
-+ - no response has been received from the contributor, or
-+ - no new commits have been made to the pull request
-+
-+This is done to ensure we keep the number of reviews under control.
-+
-+The reviewer should ask if the contributor is still interested in working on
-+this, and indicate that they are welcome to open a fresh pull request later if
-+they lack the time currently to continue on.
-+
-+If it's agreed to put this contribution on hold, or if no feedback is
-+received after 3 days, the pull request will be closed.
-merged
-  result 100644 268eeb03374d21788fd404ce2b1398f8fafd53a2 docs/process/releasing-updates.md
-  our    100644 bf564284a648d40cfd836cff85fe41a788edd31a docs/process/releasing-updates.md
-@@ -135,7 +135,7 @@
-
- We're using `.release` with a bang so that we don't have to wait for any current CI on the branch to finish. This might feel a little wrong, but it's OK since making the release itself will also run CI.
-
--If you're releasing a `production` update, release a `beta` update for the next version too, so that beta users are on the latest release.
-+If you're releasing a `production` update, release a `beta` update for the next version too, so that beta users are on the latest release. For example, if the version just released to production is `1.2.0` then the beta release should be `1.2.1-beta0` to indicate there are no new changes on top of what's currently on `production`.
-
- ### 4. Check for Completed Release
-
-removed in remote
-  base   100644 bac857303b48b6efb4fd0ddf4c8b07d6d3b64477 docs/process/reviews.md
-  our    100644 bac857303b48b6efb4fd0ddf4c8b07d6d3b64477 docs/process/reviews.md
-@@ -1,93 +0,0 @@
--# The Review Process
--
--This is the typical flow:
--
--1. **Contributor** opens pull request.
--1. When it's ready for review, they comment on it saying so.
--1. A member of the maintainer team will give it a quick look over and
--   add the `ready-for-review` label.
--1. Suddenly a wild **reviewer** appears!
--1. **Reviewer** assigns the PR to themselves.
--1. **Reviewer** leaves line comments with suggestions or questions.
--1. When the **reviewer** is done they comment on the PR with an emoji, meme,
--   pokémon, or words to that effect.
--1. The **contributor** responds to feedback, makes changes, etc.
--1. When the **contributor** is ready for the **reviewer** to re-review, they
--   comment on the PR with an emoji, meme, pokémon or words to that effect.
--1. Goto 6 until both parties are happy with the PR.
--1. The **reviewer** hits the big green merge button and deletes the branch (if
--    applicable).
--
--The rest of this document goes into more details around this flow.
--
--## Notes for Contributors
--
--### Work-in-Progress
--
--We recommend open pull requests early - ideally as soon as you have something to
--show. This is especially helpful for large pieces of work, as continuous
--integration tests are run earlier on, and regressions can be caught before
--humans get involved.
--
--Until the code is ready for review, you can prefix the PR title with [WIP] to
--indicate that it's under development.
--
--### Use Task Lists
--
--If you are working through a list of tasks as part of a pull request, listing
--those tasks and indicating when they have been completed helps reviewers to
--understand quickly what's changed.
--
--### Keep The Commit History Tidy
--
--We're not that fussy about the history, but to make reviewing easier here's
--some general tips:
--
-- - make small, meaningful and logical commits - these make the review process easier
-- - [write good commit messages](https://chris.beams.io/posts/git-commit/) -
--   these help the reviewer to understand the changes
-- - keep up to date with `master` - not only does this address potential merge
--   conflicts, it ensures you're integrating with the latest code
--
--When merging, we prefer you merge `master` into your branch, but for small
--PRs a rebase is fine.
--
--### At Least One Assignee
--
--While many people can be involved with a review, there's generally one person
--who eventually approves the pull request and merges. They'll be assigned to the
--pull request early on, so we can easily verify every active pull request has a
--reviewer.
--
--### When The Review Is Done
--
--We're using GitHub's review tools to co-ordinate feedback, and we like to be
--methodical with our reviews, so you'll probably end up with one of two results:
--
-- - **Approved**: nothing else to do; the reviewer merges
-- - **Request Changes**: there are things to address; reviewer provides details
--
--Reviews can take a few iterations, especially for large contributions. Don't
--be disheartened if you feel it takes time - we just want to ensure each
--contribution is high-quality and that any outstanding questions are resolved,
--captured or documented for posterity.
--
--### These Things Take Time
--
--Our team is distributed around the world, and often we like to get their
--feedback for specific areas. And even with minor changes, we often like to let
--them sit for a while and give everyone a chance to provide their input.
--
--## Other Rules
--
--## No Self-Merges
--
--Even for minor changes, we discourage people from merging their own pull
--requests.
--
--## Everyone Reviews
--
--While everyone has their own domain expertise around the codebase, we encourage
--people to share the load of reviews and reviewing areas of the codebase that
--aren't as familiar. This spreads knowledge across the team
--
-merged
-  result 100644 8e82f6aa314a7abf83144610e658942287d27eb4 docs/process/testing.md
-  our    100644 28e3af154f93357a29a5f0e0321ef13332ca957b docs/process/testing.md
-@@ -215,6 +215,8 @@
-     - [ ] `Cancel` button closes modal
-     - [ ] Protected branches cannot be deleted
-   - [ ] Update from Default Branch (cannot be master; Mac: `⇧⌘U`; Windows: `Ctrl+Shift+U`)
-+  - [ ] Compare to Branch (Mac: `⇧⌘B`; Windows: `Ctrl+Shift+B`)
-+    - [ ] Takes you to the history tab with the input selected so you can directly choose a branch
-   - [ ] Merge into Current Branch (Mac: `⇧⌘M`; Windows: `Ctrl+Shift+M`)
-     - [ ] Use can filter existing branches
-     - [ ] User can select branch, other than current
-@@ -272,8 +274,8 @@
-   - [ ] Panes can be resized horizontally, and contents resize to take the full width
-     - [ ] Quitting Desktop and relaunching remembers sizes
-
--### Compare tab
--  - [ ] Compare (was History) tab shows commits on your current branch by default
-+### History tab
-+  - [ ] History tab shows commits on your current branch by default
-     - [ ] All commits listed in chronological order, with avatar, date and name; list is scrollable with arrow keys enabled
-       - [ ] Right clicking any commit shows options: Revert, Copy SHA, View on GitHub
-       - [ ] Hover shows file name in tooltip
-@@ -285,6 +287,20 @@
-         - [ ] After successful merge, tab counts update and merge button is disabled
-         - [ ] Merge conflict results in dialog shown directing user to commit view
-
-+### Relationship between branches
-+  - [ ] Clicking in field with placeholder text `Select Branch to Compare…` shows a list of all branches and their number of commits ahead and behind the currently checked out branch
-+  - [ ] Pressing `esc` key clears the current filter
-+  - [ ] Filtering for branch name that doesn't exist shows "Sorry, I can't find that branch"
-+  - [ ] Selecting a branch from the list populates the tab with that branch comparison data
-+    - [ ] Behind tab is shown by default
-+      - [ ] See number of commits behind in tab header
-+      - [ ] If more than 0 commits behind, a list of commits are shown in reverse chronological order
-+      - [ ] See button to merge into current branch (button disabled if 0 commits behind)
-+      - [ ] Clicking the merge button shows merge conflicts if any, or successfully merges the commit(s)
-+      - [ ] After merging, the comparison branch is 0 commits behind
-+    - [ ] Ahead tab is on the right-hand side
-+      - [ ] If more than 0 commits ahead, a list of commits are shown in reverse chronological order
-+
- ### Diffs tab
-   - [ ] All commits have avatar, selectable SHA, # of files changed, commit message, commit description (optional)
-     - [ ] Long commit descriptions can be toggled with expand/collapse icon
-@@ -310,7 +326,8 @@
-     - [ ] `Push` with number of commits badge is decremented or reverts to `Fetch origin`
-   - [ ] `Undo` button disabled if user is pushing commit
-   - [ ] User can publish a new repo with no commits (aka unborn repo/branch)
--  - [ ] User can make new branch the default branch, by making the intial commit on the new branch.
-+  - [ ] User can make new branch the default branch, by making the intial commit on the new branch.
-+  - [ ] User can select individual files to commit at a time
-
- ### Co-authoring
-   - [ ] clicking co-author icon toggles co-author field; or right-click within commit area
-@@ -373,7 +390,7 @@
- ### Github.com
-   - [ ] If Desktop linked to .com (/settings/applications), the Desktop icon should show on File Revisions tab for all Pull Requests.
-     - [ ] Clicking the "computer icon" opens from a Pull Request page opens the branch on Desktop
--  - [ ] `Open is Desktop` button under a repo's `Clone and Download` button should open repo in Desktop
-+  - [ ] `Open in Desktop` button under a repo's `Clone and Download` button should open repo in Desktop
-   - [ ] If private email is enabled (http://github.com/settings/emails), user is blocked from pushing to all associated repositories on Desktop?
-   - [ ] If user updates name in Settings, change should reflect in Preferences
-
-@@ -393,17 +410,9 @@
- ### Security
-  - [ ] `Untrusted server` warning surfaced if GitHub cannot verify the identity of `api.github.com`; user can `Cancel` or `Continue`
-
-+
- ### TBD placeholder (WIP)
--- Merge tool for conflicted files
--- Conflicted files vs changed files
--- Relationship between branches
--  - Commit/Compare tabs now occupy left pane
--    - Compare tab shows branch dropdown
--      - Choose a branch from the list (same order as branch list? current branch present?) or user filter; `ESC` clears filter
--       - Once branch selected, quantity of commits behind surfaced; matches commits shown
--         - `Merge X commits` button is activated
--           - Merge conflict count surfaced below button if relevant
--           - Clicking `Merge` button merges all shown commits
--    - Commit history present, chronological order, descending
--- Show Git LFS (Cloning, Committing, Checking out, Reverting, Switching branches)
--- Report Git LFS (Cloning, Pushing, Pulling, Switching branches, Reverting)
-+  - Merge tool for conflicted files
-+  - Conflicted files vs changed files
-+  - Show Git LFS (Cloning, Committing, Checking out, Reverting, Switching branches)
-+  - Report Git LFS (Cloning, Pushing, Pulling, Switching branches, Reverting)
-added in remote
-  their  100644 10459559490b110ff84127440cbbc8070a71f320 docs/technical/discard-changes.md
-@@ -0,0 +1,41 @@
-+# Discard Changes
-+
-+The `Discard Changes` feature allows users to clean up uncommitted changes from
-+a repository, and has evolved over time to support different workflows.
-+
-+## Implementation
-+
-+As the implementation details of this may change over time, this section will
-+instead describe the high-level flow of the implementation.
-+
-+You can view a reference of this function [here](https://github.com/desktop/desktop/blob/2b111155914cb44824b39ee197deed23bb825a1a/app/src/lib/stores/git-store.ts#L1066).
-+
-+The `Discard Changes` flow is composed of multiple steps.
-+
-+### Moving Files to Trash
-+
-+Electron provides the [`shell.moveItemToTrash(fullPath)`](https://electronjs.org/docs/api/shell#shellmoveitemtotrashfullpath)
-+API to manage moving files into the OS-specific trash.
-+
-+Desktop uses this API to move _all new or modified files_ out from the
-+repository as a way to preserve changes, in case the user wishes to recover
-+them later. Files moved to the Trash are moved over as-is, so ensure you have
-+the ability to view hidden files if you wish to recover files that are prefixed
-+with `.`.
-+
-+### Reset Paths
-+
-+The next step is identifying any files that have been listed for discard that
-+are also staged in the index. While Desktop doesn't stage files itself, a user
-+might be using other tools alongside Desktop, so this is a sanity check before
-+proceeding to the next stage.
-+
-+**Git CLI equivalent**: `git reset HEAD -- [path]`
-+
-+### Checkout Paths
-+
-+The last step is to replace the modified files in the working directory with
-+whatever is currently in the index - this ensures that Desktop only replaces
-+files that the user has chosen to discard.
-+
-+**Git CLI equivalent**: `git checkout-index -f -u -- [path]`
-merged
-  result 100644 29e7d36057950d884bd046bbe958c6329d2bf877 docs/technical/editor-integration.md
-  our    100644 7eae1dc4e64282e2f51e3012da408314bb28d269 docs/technical/editor-integration.md
-@@ -1,7 +1,7 @@
- # "Open External Editor" integration
-
- GitHub Desktop supports the user choosing an external program to open their
--local repositories, and this is available from the top-level **Repository** menu
-+local repositories, and this is available from the top-level **Repository** menu
- or when right-clicking on a repository in the sidebar.
-
- ### My favourite editor XYZ isn't supported!
-@@ -205,12 +205,17 @@
- These editors are currently supported:
-
-  - [Atom](https://atom.io/)
-+ - [MacVim](https://macvim-dev.github.io/macvim/)
-  - [Visual Studio Code](https://code.visualstudio.com/) - both stable and Insiders channel
-  - [Sublime Text](https://www.sublimetext.com/)
-  - [BBEdit](http://www.barebones.com/products/bbedit/)
-  - [PhpStorm](https://www.jetbrains.com/phpstorm/)
-  - [RubyMine](https://www.jetbrains.com/rubymine/)
-  - [TextMate](https://macromates.com)
-+ - [Brackets](http://brackets.io/)
-+     - To use Brackets the Command Line shortcut must be installed.
-+       - This can be done by opening Brackets, choosing File > Install Command Line Shortcut
-+ - [WebStorm](https://www.jetbrains.com/webstorm/)
-
- These are defined in an enum at the top of the file:
-
-@@ -218,6 +223,7 @@
-
- export enum ExternalEditor {
-   Atom = 'Atom',
-+  MacVim = 'MacVim',
-   VisualStudioCode = 'Visual Studio Code',
-   VisualStudioCodeInsiders = 'Visual Studio Code (Insiders)',
-   SublimeText = 'Sublime Text',
-@@ -225,6 +231,8 @@
-   PhpStorm = 'PhpStorm',
-   RubyMine = 'RubyMine',
-   TextMate = 'TextMate',
-+  Brackets = 'Brackets',
-+  WebStorm = 'WebStorm',
- }
- ```
-
-merged
-  result 100644 7d8f4be31c11ad21552dbebfde4c9e7fe02c50c9 docs/technical/feature-flagging.md
-  our    100644 3528b827f8657b3ef30659605b96356d36362ced docs/technical/feature-flagging.md
-@@ -50,10 +50,10 @@
- ## How to test
-
- **Opting-in for preview features**
--1. Set the `GITHUB_DESKTOP_PREVIEW_FEATURES` environment variable to any value
-+1. Set the `GITHUB_DESKTOP_PREVIEW_FEATURES` environment variable to `1`
- 1. Restart GitHub Desktop
-
--Don't have that environment variable?
-+Don't have that environment variable?
- No worries, simply create it. (here's a [handy guide](https://www.schrodinger.com/kb/1842) for doing that on most major OSs).
-
- **Opting-out for preview features**
-merged
-  result 100644 348333d12c84aba9cf5ec7404d91e9a8c2816d07 docs/technical/placeholders.md
-  our    100644 3264bc826adeac79be5573e87f2765c1dd8a4f60 docs/technical/placeholders.md
-@@ -29,7 +29,7 @@
-
- ### Replacements
-
--The replacements defined for Desktop are found in [`app/app-info.js`](https://github.com/desktop/desktop/blob/master/app/app-info.js)
-+The replacements defined for Desktop are found in [`app/app-info.ts`](https://github.com/desktop/desktop/blob/master/app/app-info.ts)
- as a hash of key-value pairs.
-
- ```ts
-merged
-  result 100644 ec1f940bd847054000a5e38f06e6b665799e8c10 docs/technical/shell-integration.md
-  our    100644 9ddeb7ae5be00a841b49590b1966b84660000a77 docs/technical/shell-integration.md
-@@ -25,6 +25,7 @@
-
-  - Command Prompt (cmd)
-  - PowerShell
-+ - [PowerShell Core](https://github.com/powershell/powershell/)
-  - [Hyper](https://hyper.sh/)
-  - Git Bash (from [Git for Windows](https://git-for-windows.github.io/))
-
-@@ -34,6 +35,7 @@
- export enum Shell {
-   Cmd = 'Command Prompt',
-   PowerShell = 'PowerShell',
-+  PowerShellCore = 'PowerShell Core',
-   Hyper = 'Hyper',
-   GitBash = 'Git Bash',
- }
-@@ -117,13 +119,14 @@
-
- ## macOS
-
--The source for the macOS shell integration is found in [`app/src/lib/shells/darwin.ts`](https://github.com/desktop/desktop/blob/master/app/src/lib/shell/darwin.ts).
-+The source for the macOS shell integration is found in [`app/src/lib/shells/darwin.ts`](https://github.com/desktop/desktop/blob/master/app/src/lib/shells/darwin.ts).
-
- These shells are currently supported:
-
-  - Terminal
-  - [Hyper](https://hyper.sh/)
-  - [iTerm2](https://www.iterm2.com/)
-+ - [PowerShell Core](https://github.com/powershell/powershell/)
-
- These are defined in an enum at the top of the file:
-
-@@ -132,6 +135,7 @@
-   Terminal = 'Terminal',
-   Hyper = 'Hyper',
-   iTerm2 = 'iTerm2',
-+  PowerShellCore = 'PowerShell Core',
- }
- ```
-
-@@ -159,10 +163,16 @@
- export async function getAvailableShells(): Promise<
-   ReadonlyArray<IFoundShell<Shell>>
- > {
--  const [terminalPath, hyperPath, iTermPath] = await Promise.all([
-+  const [
-+    terminalPath,
-+    hyperPath,
-+    iTermPath,
-+    powerShellCorePath,
-+  ] = await Promise.all([
-     getShellPath(Shell.Terminal),
-     getShellPath(Shell.Hyper),
-     getShellPath(Shell.iTerm2),
-+    getShellPath(Shell.PowerShellCore),
-   ])
-
-   // other code
-@@ -194,7 +204,7 @@
-
- ## Linux
-
--The source for the Linux shell integration is found in [`app/src/lib/shells/linux.ts`](https://github.com/desktop/desktop/blob/master/app/src/lib/shell/linux.ts).
-+The source for the Linux shell integration is found in [`app/src/lib/shells/linux.ts`](https://github.com/desktop/desktop/blob/master/app/src/lib/shells/linux.ts).
-
- These shells are currently supported:
-
-@@ -238,7 +248,13 @@
- export async function getAvailableShells(): Promise<
-   ReadonlyArray<IFoundShell<Shell>>
- > {
--  const [gnomeTerminalPath, tilixPath] = await Promise.all([
-+  const [
-+    gnomeTerminalPath,
-+    tilixPath,
-+    urxvtPath,
-+    konsolePath,
-+    xtermPath,
-+  ] = await Promise.all([
-     getShellPath(Shell.Gnome),
-     getShellPath(Shell.Tilix),
-     getShellPath(Shell.Urxvt),
-merged
-  result 100644 51b1541b7f0f67eef996aa5e53e8cc204767184f docs/technical/syntax-highlighting.md
-  our    100644 35f4bc1d7dc42db2bcfe7ba638f3b5eaa4a7ec1f docs/technical/syntax-highlighting.md
-@@ -8,7 +8,7 @@
-
- We currently support syntax highlighting for the following languages.
-
--JavaScript, JSON, TypeScript, Coffeescript, HTML, CSS, SCSS, LESS, VUE, Markdown, Yaml, XML, Objective-C, Scala, C#, Java, C, C++, Kotlin, Ocaml, F#, sh/bash, Swift, SQL, CYPHER, Go, Perl, PHP, Python, Ruby, Clojure, Rust, Elixir
-+JavaScript, JSON, TypeScript, Coffeescript, HTML, CSS, SCSS, LESS, VUE, Markdown, Yaml, XML, Objective-C, Scala, C#, Java, C, C++, Kotlin, Ocaml, F#, sh/bash, Swift, SQL, CYPHER, Go, Perl, PHP, Python, Ruby, Clojure, Rust, Elixir, Haxe, R, JavaServer Pages, PowerShell
-
- This list was never meant to be exhaustive, we expect to add more languages going forward but this seemed like a good first step.
-
-merged
-  result 100644 24218535cd0fa338ea3b7a8a32e7b458b6811b44 eslint-rules/insecure-random.js
-  our    100644 710ff6f58b2b9abf091c4353b1264456baeb1fb3 eslint-rules/insecure-random.js
-@@ -1,5 +1,6 @@
--// strings from https://github.com/Microsoft/tslint-microsoft-contrib/blob/b720cd9/src/insecureRandomRule.ts
-+'use strict'
-
-+// strings from https://github.com/Microsoft/tslint-microsoft-contrib/blob/b720cd9/src/insecureRandomRule.ts
- const MATH_FAIL_STRING =
-   'Math.random produces insecure random numbers. ' +
-   'Use crypto.randomBytes() or window.crypto.getRandomValues() instead'
-changed in both
-  base   100644 dc892d10739ef87c70391aedcfdc3241753eebbb package.json
-  our    100644 a230a49de70c920a24d34b1af9952a17b72e7a1c package.json
-  their  100644 461f60af798d32097510dcd519c5cdd4b860771e package.json
-@@ -5,11 +5,12 @@
-   },
-   "description": "GitHub Desktop build dependencies",
-   "scripts": {
--    "cli": "ts-node --require ./app/test/globals.ts --require ./app/src/cli/dev-commands-global.js app/src/cli/main.ts",
--    "test:integration": "cross-env TEST_ENV=1 ELECTRON_NO_ATTACH_CONSOLE=1 xvfb-maybe mocha -t 30000 --require ts-node/register app/test/integration/*.ts",
--    "test:unit": "cross-env GIT_AUTHOR_NAME=\"Joe Bloggs\" GIT_AUTHOR_EMAIL=\"joe.bloggs@somewhere.com\" GIT_COMMITTER_NAME=\"Joe Bloggs\" GIT_COMMITTER_EMAIL=\"joe.bloggs@somewhere.com\" TEST_ENV=1 ELECTRON_NO_ATTACH_CONSOLE=1 xvfb-maybe electron-mocha -t 10000 --renderer --require ts-node/register --require ./app/test/globals.ts app/test/unit/*.{ts,tsx} app/test/unit/**/*.{ts,tsx}",
-+    "cli": "ts-node --require ./app/test/globals.ts --require ./app/src/cli/dev-commands-global.ts app/src/cli/main.ts",
-+    "test:integration": "cross-env TEST_ENV=1 ELECTRON_NO_ATTACH_CONSOLE=1 xvfb-maybe --auto-servernum -- mocha -t 30000 --require ts-node/register app/test/integration/*.ts",
-+    "test:unit": "ts-node script/unit-tests.ts",
-     "test:script": "mocha -t 10000 --require ts-node/register script/changelog/test/*.ts",
-     "test": "yarn test:unit && yarn test:script && yarn test:integration",
-+<<<<<<< .our
-     "test:setup": "ts-node script/test-setup.ts",
-     "test:review": "ts-node script/test-review.ts",
-     "postinstall": "yarn install-app && yarn install-changelog && yarn update-submodules && yarn compile:tslint",
-@@ -23,20 +24,31 @@
-     "compile:prod": "cross-env NODE_ENV=production parallel-webpack --config app/webpack.production.js",
-     "build:dev": "yarn compile:dev && cross-env NODE_ENV=development ts-node script/build.ts",
-     "build:prod": "yarn compile:prod && cross-env NODE_ENV=production ts-node script/build.ts",
-+=======
-+    "test:setup": "ts-node -P script/tsconfig.json script/test-setup.ts",
-+    "test:review": "ts-node  -P script/tsconfig.json script/test-review.ts",
-+    "postinstall": "cd app && yarn install --force && cd .. && git submodule update --recursive --init && yarn compile:tslint && yarn compile:script",
-+    "start": "cross-env NODE_ENV=development ts-node -P script/tsconfig.json script/start.ts",
-+    "start:prod": "cross-env NODE_ENV=production ts-node -P script/tsconfig.json script/start.ts",
-+    "compile:dev": "cross-env NODE_ENV=development parallel-webpack --config app/webpack.development.ts",
-+    "compile:prod": "cross-env NODE_ENV=production parallel-webpack --config app/webpack.production.ts",
-+    "build:dev": "yarn compile:dev && cross-env NODE_ENV=development ts-node -P script/tsconfig.json script/build.ts",
-+    "build:prod": "yarn compile:prod && cross-env NODE_ENV=production ts-node -P script/tsconfig.json script/build.ts",
-+>>>>>>> .their
-     "package": "ts-node -P script/tsconfig.json script/package.ts",
--    "generate-octicons": "ts-node script/generate-octicons.ts",
-+    "generate-octicons": "ts-node -P script/tsconfig.json script/generate-octicons.ts",
-     "clean:tslint": "rimraf tslint-rules/*.js",
--    "compile:tslint": "tsc -p tslint-rules",
--    "compile:script": "tsc -p script",
-+    "compile:tslint": "tsc -P tslint-rules",
-+    "compile:script": "tsc -P script/tsconfig.json",
-     "lint": "yarn lint:src && yarn lint:prettier",
-     "lint:fix": "yarn lint:src:fix && yarn lint:prettier --fix",
-     "lint:prettier": "ts-node script/prettier.ts",
-     "lint:src": "yarn tslint && yarn eslint-check && yarn eslint",
-     "lint:src:fix": "yarn tslint --fix && yarn eslint --fix",
--    "tslint": "tslint ./{script,tslint-rules}/*.ts ./app/{src,typings,test}/**/*.{ts,tsx}",
--    "eslint": "ts-node script/eslint.ts",
-+    "tslint": "tslint -p .",
-+    "eslint": "ts-node -P script/tsconfig.json script/eslint.ts",
-     "eslint-check": "eslint --print-config .eslintrc.* | eslint-config-prettier-check",
--    "publish": "node script/publish",
-+    "publish": "ts-node -P script/tsconfig.json script/publish.ts",
-     "clean-slate": "rimraf out node_modules app/node_modules && yarn",
-     "rebuild-hard:dev": "yarn clean-slate && yarn build:dev",
-     "rebuild-hard:prod": "yarn clean-slate && yarn build:prod",
-@@ -51,61 +63,63 @@
-   },
-   "license": "MIT",
-   "engines": {
--    "node": ">= 7",
--    "yarn": ">= 1.2.0"
-+    "node": ">= 8.10",
-+    "yarn": ">= 1.5.0"
-   },
-   "dependencies": {
-     "ajv": "^6.4.0",
--    "awesome-typescript-loader": "^3.4.0",
-+    "awesome-node-loader": "^1.1.0",
-+    "awesome-typescript-loader": "^5.0.0",
-     "aws-sdk": "^2.23.0",
--    "babel-core": "^6.24.1",
--    "babel-minify": "^0.2.0",
--    "babel-webpack-plugin": "^0.1.1",
-+    "babel-core": "^6.26.3",
-+    "babel-minify-webpack-plugin": "^0.3.1",
-+    "babel-plugin-syntax-dynamic-import": "^6.18.0",
-     "chai": "^4.1.1",
-     "chai-as-promised": "^7.1.1",
-     "chai-datetime": "^1.4.1",
-     "chalk": "^2.2.0",
--    "clean-webpack-plugin": "^0.1.16",
-+    "clean-webpack-plugin": "^0.1.19",
-     "cross-env": "^5.0.5",
--    "css-loader": "^0.28.5",
-+    "css-loader": "^0.28.11",
-     "eslint": "^4.19.1",
-     "eslint-config-prettier": "^2.9.0",
-     "eslint-plugin-babel": "^4.1.2",
-     "eslint-plugin-json": "^1.2.0",
-     "eslint-plugin-prettier": "^2.6.0",
-     "eslint-plugin-react": "^7.7.0",
--    "eslint-plugin-typescript": "^0.10.0",
-+    "eslint-plugin-typescript": "^0.12.0",
-     "express": "^4.15.0",
--    "extract-text-webpack-plugin": "^3.0.0",
--    "fs-extra": "^2.1.2",
--    "html-webpack-plugin": "^2.30.1",
-+    "front-matter": "^2.3.0",
-+    "fs-extra": "^6.0.0",
-+    "html-webpack-plugin": "^3.2.0",
-     "json-pretty": "^0.0.1",
-     "klaw-sync": "^3.0.0",
-     "legal-eagle": "0.15.0",
-+    "mini-css-extract-plugin": "^0.4.0",
-     "mocha": "^5.0.4",
--    "node-native-loader": "^1.1.1",
-     "node-sass": "^4.7.2",
-     "octicons": "^7.0.1",
--    "parallel-webpack": "^2.1.0",
--    "prettier": "1.11.1",
-+    "parallel-webpack": "^2.3.0",
-+    "prettier": "1.13.0",
-     "request": "^2.72.0",
-     "rimraf": "^2.5.2",
--    "sass-loader": "^6.0.6",
-+    "sass-loader": "^7.0.1",
-     "semver": "^5.5.0",
-     "spectron": "^3.8.0",
--    "style-loader": "^0.19.1",
-+    "style-loader": "^0.21.0",
-     "to-camel-case": "^1.0.0",
-     "ts-node": "^5.0.1",
-     "tslint": "^5.9.1",
-     "tslint-config-prettier": "^1.10.0",
-     "tslint-microsoft-contrib": "^5.0.3",
-     "tslint-react": "^3.5.1",
--    "typescript": "^2.8.1",
--    "typescript-eslint-parser": "^14.0.0",
--    "webpack": "^3.10.0",
--    "webpack-dev-middleware": "^2.0.3",
--    "webpack-hot-middleware": "^2.21.0",
--    "webpack-merge": "^4.1.0",
-+    "typescript": "^2.9.1",
-+    "typescript-eslint-parser": "^16.0.0",
-+    "webpack": "^4.8.3",
-+    "webpack-bundle-analyzer": "^2.13.0",
-+    "webpack-dev-middleware": "^3.1.3",
-+    "webpack-hot-middleware": "^2.22.2",
-+    "webpack-merge": "^4.1.2",
-     "xml2js": "^0.4.16",
-     "xvfb-maybe": "^0.2.1"
-   },
-@@ -114,21 +128,28 @@
-     "@types/chai": "^4.1.2",
-     "@types/chai-datetime": "^0.0.31",
-     "@types/classnames": "^2.2.2",
-+    "@types/clean-webpack-plugin": "^0.1.2",
-     "@types/codemirror": "0.0.55",
-     "@types/electron-packager": "^10.1.0",
-     "@types/electron-winstaller": "^2.6.0",
-     "@types/event-kit": "^1.2.28",
-+    "@types/express": "^4.11.0",
-+    "@types/extract-text-webpack-plugin": "^3.0.3",
-     "@types/file-url": "^2.0.0",
--    "@types/fs-extra": "2.1.0",
-+    "@types/fs-extra": "^5.0.2",
-     "@types/fuzzaldrin-plus": "^0.0.1",
-+    "@types/html-webpack-plugin": "^2.30.3",
-     "@types/keytar": "^4.0.0",
-+    "@types/legal-eagle": "^0.15.0",
-+    "@types/mini-css-extract-plugin": "^0.2.0",
-     "@types/mocha": "^2.2.48",
-     "@types/mri": "^1.1.0",
--    "@types/node": "^7.0.18",
--    "@types/react": "^16.0.40",
--    "@types/react-dom": "^16.0.4",
-+    "@types/node": "^8.10.4",
-+    "@types/react": "^16.3.16",
-+    "@types/react-dom": "^16.0.5",
-     "@types/react-transition-group": "1.1.1",
-     "@types/react-virtualized": "^9.7.12",
-+    "@types/request": "^2.0.9",
-     "@types/semver": "^5.5.0",
-     "@types/strip-ansi": "^3.0.0",
-     "@types/temp": "^0.8.29",
-@@ -137,9 +158,14 @@
-     "@types/ua-parser-js": "^0.7.30",
-     "@types/untildify": "^3.0.0",
-     "@types/uuid": "^3.4.0",
-+    "@types/webpack": "^4.4.0",
-+    "@types/webpack-bundle-analyzer": "^2.9.2",
-+    "@types/webpack-dev-middleware": "^2.0.1",
-+    "@types/webpack-hot-middleware": "^2.16.3",
-+    "@types/webpack-merge": "^4.1.3",
-     "@types/winston": "^2.2.0",
-     "@types/xml2js": "^0.4.0",
--    "electron": "1.8.3",
-+    "electron": "1.8.7",
-     "electron-builder": "20.2.0",
-     "electron-mocha": "^6.0.1",
-     "electron-packager": "^11.0.0",
-merged
-  result 100644 793329336d0e4e7086d8a4856cc3e404b6d33528 script/.eslintrc.yml
-  our    100644 cb8912301f224a449793498cd95802cb6161ee31 script/.eslintrc.yml
-@@ -1,4 +1,3 @@
- rules:
-   unicorn/no-process-exit: off
-   import/no-commonjs: off
--  no-sync: off
-merged
-  result 100755 a76c37cc7ddbf18efa4c1cbbd3e5aba7f4ce6678 script/build.ts
-  our    100755 c1e7dfd7e04705645c003fc4d315617e68abc846 script/build.ts
-@@ -1,4 +1,3 @@
--/* tslint:disable:no-sync-functions */
- /* eslint-disable no-sync */
- /// <reference path="./globals.d.ts" />
-
-@@ -7,7 +6,34 @@
- import * as fs from 'fs-extra'
- import * as packager from 'electron-packager'
-
--const legalEagle: LegalEagle = require('legal-eagle')
-+import { licenseOverrides } from './license-overrides'
-+
-+import { externals } from '../app/webpack.common'
-+
-+import * as legalEagle from 'legal-eagle'
-+
-+interface IFrontMatterResult<T> {
-+  readonly attributes: T
-+  readonly body: string
-+}
-+
-+interface IChooseALicense {
-+  readonly title: string
-+  readonly nickname?: string
-+  readonly featured?: boolean
-+  readonly hidden?: boolean
-+}
-+
-+export interface ILicense {
-+  readonly name: string
-+  readonly featured: boolean
-+  readonly body: string
-+  readonly hidden: boolean
-+}
-+
-+const frontMatter: <T>(
-+  path: string
-+) => IFrontMatterResult<T> = require('front-matter')
-
- import {
-   getBundleID,
-@@ -37,6 +63,11 @@
- console.log('Copying static resources…')
- copyStaticResources()
-
-+console.log('Parsing license metadata…')
-+generateLicenseMetadata(outRoot)
-+
-+moveAnalysisFiles()
-+
- const isFork = process.env.CIRCLE_PR_USERNAME
- if (process.platform === 'darwin' && process.env.CIRCLECI && !isFork) {
-   console.log('Setting up keychain…')
-@@ -95,10 +126,24 @@
-     )
-   }
-
-+  const toPackageArch = (targetArch: string | undefined): packager.arch => {
-+    if (targetArch === undefined) {
-+      return 'x64'
-+    }
-+
-+    if (targetArch === 'arm64' || targetArch === 'x64') {
-+      return targetArch
-+    }
-+
-+    throw new Error(
-+      `Building Desktop for architecture '${targetArch}'  is not supported`
-+    )
-+  }
-+
-   const options: packager.Options & IPackageAdditionalOptions = {
-     name: getExecutableName(),
-     platform: toPackagePlatform(process.platform),
--    arch: process.env.TARGET_ARCH || 'x64',
-+    arch: toPackageArch(process.env.TARGET_ARCH),
-     asar: false, // TODO: Probably wanna enable this down the road.
-     out: getDistRoot(),
-     icon: path.join(projectRoot, 'app', 'static', 'logos', 'icon-logo'),
-@@ -175,7 +220,23 @@
-   if (fs.existsSync(platformSpecific)) {
-     fs.copySync(platformSpecific, destination)
-   }
--  fs.copySync(common, destination, { clobber: false })
-+  fs.copySync(common, destination, { overwrite: false })
-+}
-+
-+function moveAnalysisFiles() {
-+  const rendererReport = 'renderer.report.html'
-+  const analysisSource = path.join(outRoot, rendererReport)
-+  if (fs.existsSync(analysisSource)) {
-+    const distRoot = getDistRoot()
-+    const destination = path.join(distRoot, rendererReport)
-+    fs.mkdirpSync(distRoot)
-+    // there's no moveSync API here, so let's do it the old fashioned way
-+    //
-+    // unlinkSync below ensures that the analysis file isn't bundled into
-+    // the app by accident
-+    fs.copySync(analysisSource, destination, { overwrite: true })
-+    fs.unlinkSync(analysisSource)
-+  }
- }
-
- function copyDependencies() {
-@@ -186,9 +247,6 @@
-     'package.json'
-   ))
-
--  // eslint-disable-next-line import/no-dynamic-require
--  const commonConfig = require(path.resolve(__dirname, '../app/webpack.common'))
--  const externals = commonConfig.externals
-   const oldDependencies = originalPackage.dependencies
-   const newDependencies: PackageLookup = {}
-
-@@ -296,7 +354,6 @@
- function updateLicenseDump(callback: (err: Error | null) => void) {
-   const appRoot = path.join(projectRoot, 'app')
-   const outPath = path.join(outRoot, 'static', 'licenses.json')
--  const licenseOverrides: LicenseLookup = require('./license-overrides')
-
-   legalEagle(
-     { path: appRoot, overrides: licenseOverrides, omitPermissive: true },
-@@ -353,3 +410,54 @@
-     }
-   )
- }
-+
-+function generateLicenseMetadata(outRoot: string) {
-+  const chooseALicense = path.join(outRoot, 'static', 'choosealicense.com')
-+  const licensesDir = path.join(chooseALicense, '_licenses')
-+
-+  const files = fs.readdirSync(licensesDir)
-+
-+  const licenses = new Array<ILicense>()
-+  for (const file of files) {
-+    const fullPath = path.join(licensesDir, file)
-+    const contents = fs.readFileSync(fullPath, 'utf8')
-+    const result = frontMatter<IChooseALicense>(contents)
-+    const license: ILicense = {
-+      name: result.attributes.nickname || result.attributes.title,
-+      featured: result.attributes.featured || false,
-+      hidden:
-+        result.attributes.hidden === undefined || result.attributes.hidden,
-+      body: result.body.trim(),
-+    }
-+
-+    if (!license.hidden) {
-+      licenses.push(license)
-+    }
-+  }
-+
-+  const licensePayload = path.join(outRoot, 'static', 'available-licenses.json')
-+  const text = JSON.stringify(licenses)
-+  fs.writeFileSync(licensePayload, text, 'utf8')
-+
-+  // embed the license alongside the generated license payload
-+  const chooseALicenseLicense = path.join(chooseALicense, 'LICENSE.md')
-+  const licenseDestination = path.join(
-+    outRoot,
-+    'static',
-+    'LICENSE.choosealicense.md'
-+  )
-+
-+  const licenseText = fs.readFileSync(chooseALicenseLicense, 'utf8')
-+  const licenseWithHeader = `GitHub Desktop uses licensing information provided by choosealicense.com.
-+
-+The bundle in available-licenses.json has been generated from a source list provided at https://github.com/github/choosealicense.com, which is made available under the below license:
-+
-+------------
-+
-+${licenseText}`
-+
-+  fs.writeFileSync(licenseDestination, licenseWithHeader, 'utf8')
-+
-+  // sweep up the choosealicense directory as the important bits have been bundled in the app
-+  fs.removeSync(chooseALicense)
-+}
-changed in both
-  base   100644 b0a88cf77391d915e28566a1695cbf31c2ab7bbb script/changelog/parser.ts
-  our    100644 ff08e0ef253ffb980b0ed57114f9fefea05d7fc1 script/changelog/parser.ts
-  their  100644 aad3c838c2d7931127adbc843bdd83ccda5968a1 script/changelog/parser.ts
-@@ -116,6 +116,7 @@
-   const root = Path.dirname(Path.dirname(__dirname))
-   const changelogPath = Path.join(root, 'changelog.json')
-
-+  // eslint-disable-next-line no-sync
-   const buffer = Fs.readFileSync(changelogPath)
-   const changelogText = buffer.toString()
-
-removed in remote
-  base   100644 ad4855567fb5e193b74292af394786561793577f script/debug
-  our    100644 ad4855567fb5e193b74292af394786561793577f script/debug
-@@ -1,29 +0,0 @@
--#!/usr/bin/env node
--
--'use strict'
--
--const express = require('express')
--const webpack = require('webpack')
--const config = require('../app/webpack.development')
--const server = express()
--const compiler = webpack(config)
--const port = process.env.PORT || 3000
--
--server.use(
--  require('webpack-dev-middleware')(compiler, {
--    publicPath: config.output.publicPath,
--    noInfo: true,
--  })
--)
--
--server.use(require('webpack-hot-middleware')(compiler))
--
--server.listen(port, 'localhost', err => {
--  if (err) {
--    console.log(err)
--    process.exit(1)
--    return
--  }
--
--  console.log(`Server running at http://localhost:${port}`)
--})
-removed in remote
-  base   100644 761dea8563e41854304fb72b473ef14d0ead525f script/dist-info.d.ts
-  our    100644 761dea8563e41854304fb72b473ef14d0ead525f script/dist-info.d.ts
-@@ -1,20 +0,0 @@
--export function getDistRoot(): string
--export function getDistPath(): string
--export function getOSXZipName(): string
--export function getOSXZipPath(): string
--export function getWindowsInstallerName(): string
--export function getWindowsInstallerPath(): string
--export function getWindowsStandaloneName(): string
--export function getWindowsStandalonePath(): string
--export function getWindowsFullNugetPackageName(): string
--export function getWindowsFullNugetPackagePath(): string
--export function getWindowsIdentifierName(): string
--export function getBundleSizes(): { rendererSize: number; mainSize: number }
--export function getReleaseChannel(): string | null
--export function getReleaseSHA(): string | null
--export function getUpdatesURL(): string
--export function getWindowsDeltaNugetPackageName(): string
--export function getWindowsDeltaNugetPackagePath(): string
--export function shouldMakeDelta(): boolean
--export function getReleaseBranchName(): string
--export function getExecutableName(): string
-removed in remote
-  base   100644 b516179431c4275fa3a02610faa699fab1241710 script/dist-info.js
-  our    100644 b516179431c4275fa3a02610faa699fab1241710 script/dist-info.js
-@@ -1,163 +0,0 @@
--'use strict'
--
--const path = require('path')
--const fs = require('fs')
--const os = require('os')
--
--const packageInfo = require('../app/package-info')
--const productName = packageInfo.getProductName()
--const version = packageInfo.getVersion()
--
--const projectRoot = path.join(__dirname, '..')
--
--function getDistRoot() {
--  return path.join(projectRoot, 'dist')
--}
--
--function getDistPath() {
--  return path.join(
--    getDistRoot(),
--    `${getExecutableName()}-${process.platform}-${os.arch()}`
--  )
--}
--
--function getExecutableName() {
--  const suffix = process.env.NODE_ENV === 'development' ? '-dev' : ''
--
--  if (process.platform === 'win32') {
--    return `${getWindowsIdentifierName()}${suffix}`
--  } else if (process.platform === 'linux') {
--    return 'desktop'
--  } else {
--    return productName
--  }
--}
--
--function getOSXZipName() {
--  return `${productName}.zip`
--}
--
--function getOSXZipPath() {
--  return path.join(getDistPath(), '..', getOSXZipName())
--}
--
--function getWindowsInstallerName() {
--  const productName = getExecutableName()
--  return `${productName}Setup.msi`
--}
--
--function getWindowsInstallerPath() {
--  return path.join(getDistPath(), '..', 'installer', getWindowsInstallerName())
--}
--
--function getWindowsStandaloneName() {
--  const productName = getExecutableName()
--  return `${productName}Setup.exe`
--}
--
--function getWindowsStandalonePath() {
--  return path.join(getDistPath(), '..', 'installer', getWindowsStandaloneName())
--}
--
--function getWindowsFullNugetPackageName() {
--  return `${getWindowsIdentifierName()}-${version}-full.nupkg`
--}
--
--function getWindowsFullNugetPackagePath() {
--  return path.join(
--    getDistPath(),
--    '..',
--    'installer',
--    getWindowsFullNugetPackageName()
--  )
--}
--
--function getWindowsDeltaNugetPackageName() {
--  return `${getWindowsIdentifierName()}-${version}-delta.nupkg`
--}
--
--function getWindowsDeltaNugetPackagePath() {
--  return path.join(
--    getDistPath(),
--    '..',
--    'installer',
--    getWindowsDeltaNugetPackageName()
--  )
--}
--
--function getWindowsIdentifierName() {
--  return 'GitHubDesktop'
--}
--
--function getBundleSizes() {
--  const rendererStats = fs.statSync(
--    path.join(projectRoot, 'out', 'renderer.js')
--  )
--  const mainStats = fs.statSync(path.join(projectRoot, 'out', 'main.js'))
--  return { rendererSize: rendererStats.size, mainSize: mainStats.size }
--}
--
--function getReleaseBranchName() {
--  let branchName
--  if (process.platform === 'darwin') {
--    branchName = process.env.CIRCLE_BRANCH
--  } else if (process.platform === 'win32') {
--    branchName = process.env.APPVEYOR_REPO_BRANCH
--  }
--
--  return branchName || ''
--}
--
--function getReleaseChannel() {
--  // Branch name format: __release-CHANNEL-DEPLOY_ID
--  const pieces = getReleaseBranchName().split('-')
--  if (pieces.length < 3 || pieces[0] !== '__release') {
--    return process.env.NODE_ENV || 'development'
--  }
--
--  return pieces[1]
--}
--
--function getReleaseSHA() {
--  // Branch name format: __release-CHANNEL-DEPLOY_ID
--  const pieces = getReleaseBranchName().split('-')
--  if (pieces.length < 3 || pieces[0] !== '__release') {
--    return null
--  }
--
--  return pieces[2]
--}
--
--function getUpdatesURL() {
--  return `https://central.github.com/api/deployments/desktop/desktop/latest?version=${version}&env=${getReleaseChannel()}`
--}
--
--function shouldMakeDelta() {
--  // Only production and beta channels include deltas. Test releases aren't
--  // necessarily sequential so deltas wouldn't make sense.
--  const channelsWithDeltas = ['production', 'beta']
--  return channelsWithDeltas.indexOf(getReleaseChannel()) > -1
--}
--
--module.exports = {
--  getDistRoot,
--  getDistPath,
--  getOSXZipName,
--  getOSXZipPath,
--  getWindowsInstallerName,
--  getWindowsInstallerPath,
--  getWindowsStandaloneName,
--  getWindowsStandalonePath,
--  getWindowsFullNugetPackageName,
--  getWindowsFullNugetPackagePath,
--  getWindowsIdentifierName,
--  getBundleSizes,
--  getReleaseChannel,
--  getReleaseSHA,
--  getUpdatesURL,
--  getWindowsDeltaNugetPackageName,
--  getWindowsDeltaNugetPackagePath,
--  shouldMakeDelta,
--  getReleaseBranchName,
--  getExecutableName,
--}
-added in remote
-  their  100644 8661aa1a9becdd6f0f77dc9101c6eb665295544d script/dist-info.ts
-@@ -0,0 +1,137 @@
-+import * as Path from 'path'
-+import * as Fs from 'fs'
-+
-+import { getProductName, getVersion } from '../app/package-info'
-+
-+const productName = getProductName()
-+const version = getVersion()
-+
-+const projectRoot = Path.join(__dirname, '..')
-+
-+export function getDistRoot() {
-+  return Path.join(projectRoot, 'dist')
-+}
-+
-+export function getDistPath() {
-+  return Path.join(
-+    getDistRoot(),
-+    `${getExecutableName()}-${process.platform}-x64`
-+  )
-+}
-+
-+export function getExecutableName() {
-+  const suffix = process.env.NODE_ENV === 'development' ? '-dev' : ''
-+
-+  if (process.platform === 'win32') {
-+    return `${getWindowsIdentifierName()}${suffix}`
-+  } else if (process.platform === 'linux') {
-+    return 'desktop'
-+  } else {
-+    return productName
-+  }
-+}
-+
-+export function getOSXZipName() {
-+  return `${productName}.zip`
-+}
-+
-+export function getOSXZipPath() {
-+  return Path.join(getDistPath(), '..', getOSXZipName())
-+}
-+
-+export function getWindowsInstallerName() {
-+  const productName = getExecutableName()
-+  return `${productName}Setup.msi`
-+}
-+
-+export function getWindowsInstallerPath() {
-+  return Path.join(getDistPath(), '..', 'installer', getWindowsInstallerName())
-+}
-+
-+export function getWindowsStandaloneName() {
-+  const productName = getExecutableName()
-+  return `${productName}Setup.exe`
-+}
-+
-+export function getWindowsStandalonePath() {
-+  return Path.join(getDistPath(), '..', 'installer', getWindowsStandaloneName())
-+}
-+
-+export function getWindowsFullNugetPackageName() {
-+  return `${getWindowsIdentifierName()}-${version}-full.nupkg`
-+}
-+
-+export function getWindowsFullNugetPackagePath() {
-+  return Path.join(
-+    getDistPath(),
-+    '..',
-+    'installer',
-+    getWindowsFullNugetPackageName()
-+  )
-+}
-+
-+export function getWindowsDeltaNugetPackageName() {
-+  return `${getWindowsIdentifierName()}-${version}-delta.nupkg`
-+}
-+
-+export function getWindowsDeltaNugetPackagePath() {
-+  return Path.join(
-+    getDistPath(),
-+    '..',
-+    'installer',
-+    getWindowsDeltaNugetPackageName()
-+  )
-+}
-+
-+export function getWindowsIdentifierName() {
-+  return 'GitHubDesktop'
-+}
-+
-+export function getBundleSizes() {
-+  // eslint-disable-next-line no-sync
-+  const rendererStats = Fs.statSync(
-+    Path.join(projectRoot, 'out', 'renderer.js')
-+  )
-+  // eslint-disable-next-line no-sync
-+  const mainStats = Fs.statSync(Path.join(projectRoot, 'out', 'main.js'))
-+  return { rendererSize: rendererStats.size, mainSize: mainStats.size }
-+}
-+
-+export function getReleaseBranchName(): string {
-+  return (
-+    process.env.CIRCLE_BRANCH || // macOS
-+    process.env.APPVEYOR_REPO_BRANCH || // Windows
-+    ''
-+  )
-+}
-+
-+export function getReleaseChannel() {
-+  // Branch name format: __release-CHANNEL-DEPLOY_ID
-+  const pieces = getReleaseBranchName().split('-')
-+  if (pieces.length < 3 || pieces[0] !== '__release') {
-+    return process.env.NODE_ENV || 'development'
-+  }
-+
-+  return pieces[1]
-+}
-+
-+export function getReleaseSHA() {
-+  // Branch name format: __release-CHANNEL-DEPLOY_ID
-+  const pieces = getReleaseBranchName().split('-')
-+  if (pieces.length < 3 || pieces[0] !== '__release') {
-+    return null
-+  }
-+
-+  return pieces[2]
-+}
-+
-+export function getUpdatesURL() {
-+  return `https://central.github.com/api/deployments/desktop/desktop/latest?version=${version}&env=${getReleaseChannel()}`
-+}
-+
-+export function shouldMakeDelta() {
-+  // Only production and beta channels include deltas. Test releases aren't
-+  // necessarily sequential so deltas wouldn't make sense.
-+  const channelsWithDeltas = ['production', 'beta']
-+  return channelsWithDeltas.indexOf(getReleaseChannel()) > -1
-+}
-merged
-  result 100644 c71f2850346b76957d6eb4312308b15714d08361 script/eslint.ts
-  our    100644 953deb6d112573e32a78fd54bc428c723508a788 script/eslint.ts
-@@ -16,7 +16,7 @@
- const report = eslint.executeOnFiles([
-   './{script,eslint-rules}/**/*.{j,t}s?(x)',
-   './tslint-rules/**/*.ts',
--  './app/*.js',
-+  './app/*.ts',
-   './app/{src,typings,test}/**/*.{j,t}s?(x)',
-   './changelog.json',
- ])
-merged
-  result 100644 bb3b7645eac13fe68f14a1e2b6b95e522d234648 script/globals.d.ts
-  our    100644 d9ee18180f09bbb636b084a49eac223aa170eb71 script/globals.d.ts
-@@ -6,63 +6,6 @@
-   devDependencies: PackageLookup
- }
-
--// type declarations for legal-eagle
--type LicenseLookup = {
--  [key: string]: LicenseEntry
--}
--
--type LegalEagleOptions = {
--  path: string
--  overrides: LicenseLookup
--  omitPermissive?: boolean
--}
--
--type LicenseEntry = {
--  license: string
--  source: string
--  repository: string
--  sourceText: string
--}
--
--type LegalEagle = (
--  options: LegalEagleOptions,
--  callback: (error: Error | null, summary: LicenseLookup) => void
--) => void
--
--// type declarations for electron-installer-redhat
--type RedhatOptions = {
--  src: string
--  dest: string
--  arch: string
--}
--
--type ElectronInstallerRedhat = (
--  options: RedhatOptions,
--  callback: (error: Error | null) => void
--) => void
--
--// type declarations for electron-installer-debian
--type DebianOptions = {
--  src: string
--  dest: string
--  arch: string
--}
--
--type ElectronInstallerDebian = (
--  options: DebianOptions,
--  callback: (error: Error | null) => void
--) => void
--
--// type declarations for electron-installer-appimage
--type AppImageOptions = {
--  dir: string
--  targetArch: string
--}
--
--type ElectronInstallerAppImage = {
--  default: (options: AppImageOptions) => Promise<void>
--}
--
- declare namespace NodeJS {
-   // eslint-disable-next-line typescript/interface-name-prefix
-   interface Process extends EventEmitter {
-removed in remote
-  base   100644 92a4128288d1d86d9eca15d695a8cb8d846bcb58 script/license-overrides.js
-  our    100644 92a4128288d1d86d9eca15d695a8cb8d846bcb58 script/license-overrides.js
-@@ -1,45 +0,0 @@
--module.exports = {
--  'cycle@1.0.3': {
--    repository: 'git+ssh://git@github.com/dscape/cycle',
--    license: 'Public Domain',
--    source:
--      'cycle.js header comment at https://github.com/dscape/cycle/blob/ab67ce90e8fa2efdb8f21074661366ec56f6a724/cycle.js',
--    sourceText:
--      'Public Domain.\n\nNO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.',
--  },
--
--  'json-schema@0.2.3': {
--    repository: 'git+ssh://git@github.com/kriszyp/json-schema',
--    license: 'BSD',
--    source:
--      'README.md at https://github.com/kriszyp/json-schema/tree/24c4ed1b2359ab457a00e90606a777c2962ecd3b',
--    sourceText:
--      'Code is licensed under the AFL or BSD 3-Clause license as part of the Persevere project which is administered under the Dojo foundation, and all contributions require a Dojo CLA.',
--  },
--
--  'wicg-focus-ring@1.0.1': {
--    repository: 'git+https://github.com/WICG/focus-ring',
--    license: 'MIT',
--    source:
--      'https://github.com/WICG/focus-ring/blob/4df78f379e4c7dbaa1a5e4ff25cf1b56700b24ee/LICENSE.md',
--    sourceText: `This work is being provided by the copyright holders under the following license.
--
--License
--
--By obtaining and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions.
--
--Permission to copy, modify, and distribute this work, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the work or portions thereof, including modifications:
--
--* The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.
--* Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, the W3C Software and Document Short Notice should be included.
--* Notice of any changes or modifications, through a copyright statement on the new code or document such as "This software or document includes material copied from or derived from [title and URI of the W3C document]. Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
--
--Disclaimers
--
--THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
--
--COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
--
--The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the work without specific, written prior permission. Title to copyright in this work will at all times remain with copyright holders.`,
--  },
--}
-added in remote
-  their  100644 03fdf69fd8b91f2bd0d89f4f124473a4f2affff5 script/license-overrides.ts
-@@ -0,0 +1,47 @@
-+import { LicenseLookup } from 'legal-eagle'
-+
-+export const licenseOverrides: LicenseLookup = {
-+  'cycle@1.0.3': {
-+    repository: 'git+ssh://git@github.com/dscape/cycle',
-+    license: 'Public Domain',
-+    source:
-+      'cycle.js header comment at https://github.com/dscape/cycle/blob/ab67ce90e8fa2efdb8f21074661366ec56f6a724/cycle.js',
-+    sourceText:
-+      'Public Domain.\n\nNO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.',
-+  },
-+
-+  'json-schema@0.2.3': {
-+    repository: 'git+ssh://git@github.com/kriszyp/json-schema',
-+    license: 'BSD',
-+    source:
-+      'README.md at https://github.com/kriszyp/json-schema/tree/24c4ed1b2359ab457a00e90606a777c2962ecd3b',
-+    sourceText:
-+      'Code is licensed under the AFL or BSD 3-Clause license as part of the Persevere project which is administered under the Dojo foundation, and all contributions require a Dojo CLA.',
-+  },
-+
-+  'wicg-focus-ring@1.0.1': {
-+    repository: 'git+https://github.com/WICG/focus-ring',
-+    license: 'MIT',
-+    source:
-+      'https://github.com/WICG/focus-ring/blob/4df78f379e4c7dbaa1a5e4ff25cf1b56700b24ee/LICENSE.md',
-+    sourceText: `This work is being provided by the copyright holders under the following license.
-+
-+License
-+
-+By obtaining and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions.
-+
-+Permission to copy, modify, and distribute this work, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the work or portions thereof, including modifications:
-+
-+* The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.
-+* Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, the W3C Software and Document Short Notice should be included.
-+* Notice of any changes or modifications, through a copyright statement on the new code or document such as "This software or document includes material copied from or derived from [title and URI of the W3C document]. Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
-+
-+Disclaimers
-+
-+THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-+
-+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
-+
-+The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the work without specific, written prior permission. Title to copyright in this work will at all times remain with copyright holders.`,
-+  },
-+}
-merged
-  result 100644 4f340bd02953a3f1dbcadde80836e441a1d4c69c script/prettier.ts
-  our    100644 146c1fcc48a0541fe8d79bf5245d94c06b3b832e script/prettier.ts
-@@ -11,7 +11,12 @@
- const prettier = process.platform === 'win32' ? 'prettier.cmd' : 'prettier'
- const prettierPath = Path.join(root, 'node_modules', '.bin', prettier)
-
--const args = ['**/*.scss', '--list-different']
-+const args = [
-+  '**/*.scss',
-+  'app/**/*.{ts,tsx}',
-+  'script/**/*.ts',
-+  '--list-different',
-+]
-
- if (shouldFix) {
-   args.push('--write')
-removed in remote
-  base   100644 68800a13155c68afc965da100c263aad461916a8 script/publish
-  our    100644 68800a13155c68afc965da100c263aad461916a8 script/publish
-@@ -1,200 +0,0 @@
--#!/usr/bin/env node
--
--'use strict'
--
--const TEST_PUBLISH = false
--const PUBLISH_CHANNELS = ['production', 'test', 'beta']
--const distInfo = require('./dist-info')
--const gitInfo = require('../app/git-info')
--const packageInfo = require('../app/package-info')
--
--if (PUBLISH_CHANNELS.indexOf(distInfo.getReleaseChannel()) < 0) {
--  console.log('Not a publishable build. Skipping publish.')
--  process.exit(0)
--}
--
--const releaseSHA = distInfo.getReleaseSHA()
--if (!releaseSHA) {
--  console.log(`No release SHA found for build. Skipping publish.`)
--  process.exit(0)
--}
--
--const currentTipSHA = gitInfo.getSHA()
--if (
--  !currentTipSHA ||
--  !currentTipSHA.toUpperCase().startsWith(releaseSHA.toUpperCase())
--) {
--  console.log(
--    `Current tip '${currentTipSHA}' does not match release SHA '${releaseSHA}'. Skipping publish.`
--  )
--  process.exit(0)
--}
--
--const fs = require('fs')
--const cp = require('child_process')
--const AWS = require('aws-sdk')
--const crypto = require('crypto')
--const request = require('request')
--
--console.log('Packaging…')
--cp.execSync('yarn package')
--
--let sha = ''
--if (process.platform === 'darwin') {
--  sha = process.env.CIRCLE_SHA1
--} else if (process.platform === 'win32') {
--  sha = process.env.APPVEYOR_REPO_COMMIT
--}
--
--sha = sha.substr(0, 8)
--
--console.log('Uploading…')
--
--let uploadPromise = null
--if (process.platform === 'darwin') {
--  uploadPromise = uploadOSXAssets()
--} else if (process.platform === 'win32') {
--  uploadPromise = uploadWindowsAssets()
--} else {
--  console.error(`I dunno how to publish a release for ${process.platform} :(`)
--  process.exit(1)
--}
--
--uploadPromise
--  .then(artifacts => {
--    const names = artifacts.map(function(item, index) {
--      return item.name
--    })
--    console.log(`Uploaded artifacts: ${names}`)
--    return updateDeploy(artifacts)
--  })
--  .catch(e => {
--    console.error(`Publishing failed: ${e}`)
--    process.exit(1)
--  })
--
--function uploadOSXAssets() {
--  const uploads = [upload(distInfo.getOSXZipName(), distInfo.getOSXZipPath())]
--  return Promise.all(uploads)
--}
--
--function uploadWindowsAssets() {
--  const uploads = [
--    upload(
--      distInfo.getWindowsInstallerName(),
--      distInfo.getWindowsInstallerPath()
--    ),
--    upload(
--      distInfo.getWindowsStandaloneName(),
--      distInfo.getWindowsStandalonePath()
--    ),
--    upload(
--      distInfo.getWindowsFullNugetPackageName(),
--      distInfo.getWindowsFullNugetPackagePath()
--    ),
--  ]
--
--  if (distInfo.shouldMakeDelta()) {
--    uploads.push(
--      upload(
--        distInfo.getWindowsDeltaNugetPackageName(),
--        distInfo.getWindowsDeltaNugetPackagePath()
--      )
--    )
--  }
--
--  return Promise.all(uploads)
--}
--
--function upload(assetName, assetPath) {
--  const s3Info = {
--    accessKeyId: process.env.S3_KEY,
--    secretAccessKey: process.env.S3_SECRET,
--  }
--  const s3 = new AWS.S3(s3Info)
--
--  const bucket = process.env.S3_BUCKET
--  const key = `releases/${packageInfo.getVersion()}-${sha}/${assetName.replace(
--    / /g,
--    ''
--  )}`
--  const url = `https://s3.amazonaws.com/${bucket}/${key}`
--
--  const uploadParams = {
--    Bucket: bucket,
--    ACL: 'public-read',
--    Key: key,
--    Body: fs.createReadStream(assetPath),
--  }
--
--  return new Promise((resolve, reject) => {
--    s3.upload(uploadParams, (error, data) => {
--      if (error) {
--        reject(error)
--      } else {
--        const stats = fs.statSync(assetPath)
--        const hash = crypto.createHash('sha1')
--        const input = fs.createReadStream(assetPath)
--
--        hash.on('finish', () => {
--          const sha = hash.read().toString('hex')
--          resolve({ name: assetName, url, size: stats['size'], sha })
--        })
--
--        input.pipe(hash)
--      }
--    })
--  })
--}
--
--function createSignature(body) {
--  const hmac = crypto.createHmac('sha1', process.env.DEPLOYMENT_SECRET)
--  hmac.update(JSON.stringify(body))
--  return `sha1=${hmac.digest('hex')}`
--}
--
--function updateDeploy(artifacts) {
--  const { rendererSize, mainSize } = distInfo.getBundleSizes()
--  const body = {
--    context: process.platform,
--    branch_name: distInfo.getReleaseBranchName(),
--    artifacts,
--    stats: {
--      platform: process.platform,
--      rendererBundleSize: rendererSize,
--      mainBundleSize: mainSize,
--    },
--  }
--  const signature = createSignature(body)
--  const options = {
--    method: 'POST',
--    url: 'https://central.github.com/api/deploy_built',
--    headers: {
--      'X-Hub-Signature': signature,
--    },
--    json: true,
--    body,
--  }
--
--  return new Promise((resolve, reject) => {
--    request(options, (error, response, body) => {
--      if (error) {
--        reject(error)
--        return
--      }
--
--      if (response.statusCode !== 200) {
--        reject(
--          new Error(
--            `Received a non-200 response (${response.statusCode}): ${JSON.stringify(
--              body
--            )}`
--          )
--        )
--        return
--      }
--
--      resolve()
--    })
--  })
--}
-added in remote
-  their  100644 4d6fbd455197c1eaf2b4279aa43467b07e669937 script/publish.ts
-@@ -0,0 +1,222 @@
-+const PUBLISH_CHANNELS = ['production', 'test', 'beta']
-+import * as distInfo from './dist-info'
-+import * as gitInfo from '../app/git-info'
-+import * as packageInfo from '../app/package-info'
-+
-+if (PUBLISH_CHANNELS.indexOf(distInfo.getReleaseChannel()) < 0) {
-+  console.log('Not a publishable build. Skipping publish.')
-+  process.exit(0)
-+}
-+
-+const releaseSHA = distInfo.getReleaseSHA()
-+if (releaseSHA == null) {
-+  console.log(`No release SHA found for build. Skipping publish.`)
-+  process.exit(0)
-+}
-+
-+const currentTipSHA = gitInfo.getSHA()
-+if (!currentTipSHA.toUpperCase().startsWith(releaseSHA!.toUpperCase())) {
-+  console.log(
-+    `Current tip '${currentTipSHA}' does not match release SHA '${releaseSHA}'. Skipping publish.`
-+  )
-+  process.exit(0)
-+}
-+
-+import * as Fs from 'fs'
-+import { execSync } from 'child_process'
-+import * as AWS from 'aws-sdk'
-+import * as Crypto from 'crypto'
-+import * as request from 'request'
-+
-+console.log('Packaging…')
-+execSync('yarn package')
-+
-+function getSha() {
-+  if (process.platform === 'darwin' && process.env.CIRCLE_SHA1 != null) {
-+    return process.env.CIRCLE_SHA1
-+  } else if (
-+    process.platform === 'win32' &&
-+    process.env.APPVEYOR_REPO_COMMIT != null
-+  ) {
-+    return process.env.APPVEYOR_REPO_COMMIT
-+  }
-+
-+  throw new Error(
-+    `Unable to get the SHA for the current platform. Check the vendor docs for the desired environment variables.`
-+  )
-+}
-+
-+const sha = getSha().substr(0, 8)
-+
-+function getSecret() {
-+  if (process.env.DEPLOYMENT_SECRET != null) {
-+    return process.env.DEPLOYMENT_SECRET
-+  }
-+
-+  throw new Error(
-+    `Unable to get deployment seret environment variable. Deployment aborting...`
-+  )
-+}
-+
-+console.log('Uploading…')
-+
-+let uploadPromise = null
-+if (process.platform === 'darwin') {
-+  uploadPromise = uploadOSXAssets()
-+} else if (process.platform === 'win32') {
-+  uploadPromise = uploadWindowsAssets()
-+} else {
-+  console.error(`I dunno how to publish a release for ${process.platform} :(`)
-+  process.exit(1)
-+}
-+
-+uploadPromise!
-+  .then(artifacts => {
-+    const names = artifacts.map(function(item, index) {
-+      return item.name
-+    })
-+    console.log(`Uploaded artifacts: ${names}`)
-+    return updateDeploy(artifacts, getSecret())
-+  })
-+  .catch(e => {
-+    console.error(`Publishing failed: ${e}`)
-+    process.exit(1)
-+  })
-+
-+function uploadOSXAssets() {
-+  const uploads = [upload(distInfo.getOSXZipName(), distInfo.getOSXZipPath())]
-+  return Promise.all(uploads)
-+}
-+
-+function uploadWindowsAssets() {
-+  const uploads = [
-+    upload(
-+      distInfo.getWindowsInstallerName(),
-+      distInfo.getWindowsInstallerPath()
-+    ),
-+    upload(
-+      distInfo.getWindowsStandaloneName(),
-+      distInfo.getWindowsStandalonePath()
-+    ),
-+    upload(
-+      distInfo.getWindowsFullNugetPackageName(),
-+      distInfo.getWindowsFullNugetPackagePath()
-+    ),
-+  ]
-+
-+  if (distInfo.shouldMakeDelta()) {
-+    uploads.push(
-+      upload(
-+        distInfo.getWindowsDeltaNugetPackageName(),
-+        distInfo.getWindowsDeltaNugetPackagePath()
-+      )
-+    )
-+  }
-+
-+  return Promise.all(uploads)
-+}
-+
-+interface IUploadResult {
-+  name: string
-+  url: string
-+  size: number
-+  sha: string
-+}
-+
-+function upload(assetName: string, assetPath: string) {
-+  const s3Info = {
-+    accessKeyId: process.env.S3_KEY,
-+    secretAccessKey: process.env.S3_SECRET,
-+  }
-+  const s3 = new AWS.S3(s3Info)
-+
-+  const bucket = process.env.S3_BUCKET || ''
-+  const key = `releases/${packageInfo.getVersion()}-${sha}/${assetName.replace(
-+    / /g,
-+    ''
-+  )}`
-+  const url = `https://s3.amazonaws.com/${bucket}/${key}`
-+
-+  const uploadParams = {
-+    Bucket: bucket,
-+    ACL: 'public-read',
-+    Key: key,
-+    Body: Fs.createReadStream(assetPath),
-+  }
-+
-+  return new Promise<IUploadResult>((resolve, reject) => {
-+    s3.upload(
-+      uploadParams,
-+      (error: Error, data: AWS.S3.ManagedUpload.SendData) => {
-+        if (error != null) {
-+          reject(error)
-+        } else {
-+          // eslint-disable-next-line no-sync
-+          const stats = Fs.statSync(assetPath)
-+          const hash = Crypto.createHash('sha1')
-+          hash.setEncoding('hex')
-+          const input = Fs.createReadStream(assetPath)
-+
-+          hash.on('finish', () => {
-+            const sha = hash.read() as string
-+            resolve({ name: assetName, url, size: stats['size'], sha })
-+          })
-+
-+          input.pipe(hash)
-+        }
-+      }
-+    )
-+  })
-+}
-+
-+function createSignature(body: any, secret: string) {
-+  const hmac = Crypto.createHmac('sha1', secret)
-+  hmac.update(JSON.stringify(body))
-+  return `sha1=${hmac.digest('hex')}`
-+}
-+
-+function updateDeploy(artifacts: ReadonlyArray<IUploadResult>, secret: string) {
-+  const { rendererSize, mainSize } = distInfo.getBundleSizes()
-+  const body = {
-+    context: process.platform,
-+    branch_name: distInfo.getReleaseBranchName(),
-+    artifacts,
-+    stats: {
-+      platform: process.platform,
-+      rendererBundleSize: rendererSize,
-+      mainBundleSize: mainSize,
-+    },
-+  }
-+  const signature = createSignature(body, secret)
-+  const options = {
-+    method: 'POST',
-+    url: 'https://central.github.com/api/deploy_built',
-+    headers: {
-+      'X-Hub-Signature': signature,
-+    },
-+    json: true,
-+    body,
-+  }
-+
-+  return new Promise((resolve, reject) => {
-+    request(options, (error, response, body) => {
-+      if (error) {
-+        reject(error)
-+        return
-+      }
-+
-+      if (response.statusCode !== 200) {
-+        reject(
-+          new Error(
-+            `Received a non-200 response (${
-+              response.statusCode
-+            }): ${JSON.stringify(body)}`
-+          )
-+        )
-+        return
-+      }
-+
-+      resolve()
-+    })
-+  })
-+}
-merged
-  result 100644 903faa6e50dc2fafc46924b0438baa3b9e6f634b script/review-logs.ts
-  our    100644 68ca321f41b2e29ff3393e3d9a6abd62c560c699 script/review-logs.ts
-@@ -8,7 +8,13 @@
-
- function getUserDataPath() {
-   if (process.platform === 'win32') {
--    return path.join(process.env.APPDATA, getExecutableName())
-+    if (process.env.APPDATA) {
-+      return path.join(process.env.APPDATA, getExecutableName())
-+    } else {
-+      throw new Error(
-+        `Unable to find the application data directory on Windows :(`
-+      )
-+    }
-   } else if (process.platform === 'darwin') {
-     const home = os.homedir()
-     return path.join(home, 'Library', 'Application Support', getProductName())
-removed in remote
-  base   100644 77bf79b8ff282fb277c0f780772d8f30eca82e7d script/run.js
-  our    100644 77bf79b8ff282fb277c0f780772d8f30eca82e7d script/run.js
-@@ -1,46 +0,0 @@
--'use strict'
--
--const path = require('path')
--const cp = require('child_process')
--const fs = require('fs')
--const distInfo = require('./dist-info')
--
--const distPath = distInfo.getDistPath()
--const productName = distInfo.getExecutableName()
--
--let binaryPath = ''
--if (process.platform === 'darwin') {
--  binaryPath = path.join(
--    distPath,
--    `${productName}.app`,
--    'Contents',
--    'MacOS',
--    `${productName}`
--  )
--} else if (process.platform === 'win32') {
--  binaryPath = path.join(distPath, `${productName}.exe`)
--} else if (process.platform === 'linux') {
--  binaryPath = path.join(distPath, productName)
--} else {
--  console.error(`I dunno how to run on ${process.platform} ${process.arch} :(`)
--  process.exit(1)
--}
--
--module.exports = function(spawnOptions) {
--  try {
--    const stats = fs.statSync(binaryPath)
--    if (!stats.isFile()) {
--      return null
--    }
--  } catch (e) {
--    return null
--  }
--
--  const opts = Object.assign({}, spawnOptions)
--
--  opts.env = Object.assign(opts.env || {}, process.env, {
--    NODE_ENV: 'development',
--  })
--
--  return cp.spawn(binaryPath, [], opts)
--}
-added in remote
-  their  100644 6551aefb22d8539c0c733a0a3dbd436b4e88fa51 script/run.ts
-@@ -0,0 +1,45 @@
-+import { join } from 'path'
-+import { spawn, SpawnOptions } from 'child_process'
-+import * as Fs from 'fs'
-+import { getDistPath, getExecutableName } from './dist-info'
-+
-+const distPath = getDistPath()
-+const productName = getExecutableName()
-+
-+let binaryPath = ''
-+if (process.platform === 'darwin') {
-+  binaryPath = join(
-+    distPath,
-+    `${productName}.app`,
-+    'Contents',
-+    'MacOS',
-+    `${productName}`
-+  )
-+} else if (process.platform === 'win32') {
-+  binaryPath = join(distPath, `${productName}.exe`)
-+} else if (process.platform === 'linux') {
-+  binaryPath = join(distPath, productName)
-+} else {
-+  console.error(`I dunno how to run on ${process.platform} ${process.arch} :(`)
-+  process.exit(1)
-+}
-+
-+export function run(spawnOptions: SpawnOptions) {
-+  try {
-+    // eslint-disable-next-line no-sync
-+    const stats = Fs.statSync(binaryPath)
-+    if (!stats.isFile()) {
-+      return null
-+    }
-+  } catch (e) {
-+    return null
-+  }
-+
-+  const opts = Object.assign({}, spawnOptions)
-+
-+  opts.env = Object.assign(opts.env || {}, process.env, {
-+    NODE_ENV: 'development',
-+  })
-+
-+  return spawn(binaryPath, [], opts)
-+}
-removed in remote
-  base   100644 e2fdac76cfc9f9f60ad2e6163a08a7da7cc6a336 script/start
-  our    100644 e2fdac76cfc9f9f60ad2e6163a08a7da7cc6a336 script/start
-@@ -1,53 +0,0 @@
--#!/usr/bin/env node
--
--'use strict'
--
--const run = require('./run')
--const express = require('express')
--const webpack = require('webpack')
--const configs = require('../app/webpack.development')
--
--function startApp() {
--  const runningApp = run({ stdio: 'inherit' })
--  if (!runningApp) {
--    console.error(
--      "Couldn't launch the app. You probably need to build it first. Run `yarn build:dev`."
--    )
--    process.exit(1)
--  }
--
--  runningApp.on('close', () => {
--    process.exit(0)
--  })
--}
--
--if (process.env.NODE_ENV === 'production') {
--  startApp()
--  return
--}
--
--const [mainConfig, rendererConfig, askPassConfig] = configs
--
--const server = express()
--const compiler = webpack(rendererConfig)
--const port = process.env.PORT || 3000
--
--server.use(
--  require('webpack-dev-middleware')(compiler, {
--    publicPath: rendererConfig.output.publicPath,
--    noInfo: true,
--  })
--)
--
--server.use(require('webpack-hot-middleware')(compiler))
--
--server.listen(port, 'localhost', err => {
--  if (err) {
--    console.log(err)
--    process.exit(1)
--    return
--  }
--
--  console.log(`Server running at http://localhost:${port}`)
--  startApp()
--})
-added in remote
-  their  100644 96fdc173cf1566aef93aff0b05bdbe08daa597ef script/start.ts
-@@ -0,0 +1,72 @@
-+import * as express from 'express'
-+import * as webpack from 'webpack'
-+import * as devMiddleware from 'webpack-dev-middleware'
-+import * as hotMiddleware from 'webpack-hot-middleware'
-+
-+import { forceUnwrap as u } from '../app/src/lib/fatal-error'
-+
-+import configs = require('../app/webpack.development')
-+
-+import { run } from './run'
-+
-+function getPortOrDefault() {
-+  const port = process.env.PORT
-+  if (port != null) {
-+    const result = parseInt(port)
-+    if (isNaN(result)) {
-+      throw new Error(`Unable to parse '${port}' into valid number`)
-+    }
-+    return result
-+  }
-+
-+  return 3000
-+}
-+
-+function startApp() {
-+  const runningApp = run({ stdio: 'inherit' })
-+  if (runningApp == null) {
-+    console.error(
-+      "Couldn't launch the app. You probably need to build it first. Run `yarn build:dev`."
-+    )
-+    process.exit(1)
-+    return
-+  }
-+
-+  runningApp.on('close', () => {
-+    process.exit(0)
-+  })
-+}
-+
-+if (process.env.NODE_ENV === 'production') {
-+  startApp()
-+} else {
-+  const rendererConfig = configs[1]
-+
-+  const server = express()
-+  const compiler = webpack(rendererConfig)
-+  const port = getPortOrDefault()
-+
-+  const message = 'Could not find public path from configuration'
-+  server.use(
-+    devMiddleware(compiler, {
-+      publicPath: u(
-+        message,
-+        u(message, u(message, rendererConfig).output).publicPath
-+      ),
-+      logLevel: 'error',
-+    })
-+  )
-+
-+  server.use(hotMiddleware(compiler))
-+
-+  server.listen(port, 'localhost', (err: Error | null) => {
-+    if (err) {
-+      console.log(err)
-+      process.exit(1)
-+      return
-+    }
-+
-+    console.log(`Server running at http://localhost:${port}`)
-+    startApp()
-+  })
-+}
-merged
-  result 100644 5542fdd0d59adecb94be7f9b26f60659a899a77f script/tsconfig.json
-  our    100644 14dd9e3066f9076b88a5096328332f218696513d script/tsconfig.json
-@@ -3,14 +3,12 @@
-     "module": "commonjs",
-     "moduleResolution": "node",
-     "target": "es6",
--    "noImplicitAny": true,
-     "noImplicitReturns": true,
--    "noImplicitThis": true,
-     "noFallthroughCasesInSwitch": true,
-     "noUnusedLocals": true,
--    "strictNullChecks": true,
-     "sourceMap": false,
--    "noEmit": true
-+    "noEmit": true,
-+    "strict": true,
-   },
-   "compileOnSave": false
- }
-added in remote
-  their  100644 67afebf6479af930fa36dc6216880f9810e08abe script/unit-tests.ts
-@@ -0,0 +1,98 @@
-+#!/usr/bin/env ts-node
-+
-+import * as Path from 'path'
-+import { spawnSync, SpawnSyncOptions } from 'child_process'
-+
-+const environmentVariables = {
-+  // setting commit information so that tests don't need to rely on global config
-+  GIT_AUTHOR_NAME: 'Joe Bloggs',
-+  GIT_AUTHOR_EMAIL: 'joe.bloggs@somewhere.com',
-+  GIT_COMMITTER_NAME: 'Joe Bloggs',
-+  GIT_COMMITTER_EMAIL: 'joe.bloggs@somewhere.com',
-+  // signalling to dugite to use the bundled Git environment
-+  TEST_ENV: '1',
-+  // ensuring Electron doesn't attach to the current console session (Windows only)
-+  ELECTRON_NO_ATTACH_CONSOLE: '1',
-+}
-+
-+const env = { ...process.env, ...environmentVariables }
-+
-+// ensure commands are executed from the root of the repository
-+const repositoryRoot = Path.dirname(__dirname)
-+
-+const options: SpawnSyncOptions = {
-+  cwd: repositoryRoot,
-+  env,
-+  // ensure stdout/stderr is propagated to the parent process so the test results
-+  // are displayed to the user
-+  stdio: 'inherit',
-+}
-+
-+const electronMocha =
-+  process.platform === 'win32' ? 'electron-mocha.cmd' : 'electron-mocha'
-+
-+const electronMochaPath = Path.join(
-+  repositoryRoot,
-+  'node_modules',
-+  '.bin',
-+  electronMocha
-+)
-+
-+const electronMochaArgs = [
-+  // timeout for 10s
-+  '-t',
-+  '10000',
-+  // ensure tests are run within a renderer process
-+  '--renderer',
-+  '--require',
-+  'ts-node/register',
-+  '--require',
-+  './app/test/globals.ts',
-+  'app/test/unit/*.{ts,tsx}',
-+  'app/test/unit/**/*.{ts,tsx}',
-+]
-+
-+const shouldDebug = process.argv.indexOf('--debug') > -1
-+
-+if (shouldDebug) {
-+  electronMochaArgs.push('--debug')
-+}
-+
-+let exitCode = -1
-+
-+if (process.platform === 'linux') {
-+  // xvfb-maybe wraps xvfb-run to ensure Electron tests are run within the
-+  // context where the DISPLAY environment variable is set. It only runs on
-+  // Linux and is designed for CI scenarios, but this is making the whole
-+  // thing more explicit than the previous inline usage in package.json
-+  const xvfbMaybe = Path.join(
-+    repositoryRoot,
-+    'node_modules',
-+    '.bin',
-+    'xvfb-maybe'
-+  )
-+
-+  const args = [
-+    // on Travis there may be a problem with the default display being
-+    // unavailable -  this ensures we use a free server number
-+    '--auto-servernum',
-+    '--',
-+    // and then we pass through the test runner commands
-+    electronMochaPath,
-+    ...electronMochaArgs,
-+  ]
-+
-+  console.log(`spawing xvfb-maybe with args: ${args.join(' ')}`)
-+
-+  const { status } = spawnSync(xvfbMaybe, args, options)
-+  exitCode = status
-+} else {
-+  console.log(
-+    `spawing electron-mocha with args: ${electronMochaArgs.join(' ')}`
-+  )
-+
-+  const { status } = spawnSync(electronMochaPath, electronMochaArgs, options)
-+  exitCode = status
-+}
-+
-+process.exitCode = exitCode
-merged
-  result 100644 d9481a63e89bd672307df8f1048caa69ee6276a9 script/validate-changelog.ts
-  our    100644 99d3cf95c36c9a4c5fa58f5c5e2138fb7c281dec script/validate-changelog.ts
-@@ -36,6 +36,7 @@
- const repositoryRoot = Path.dirname(__dirname)
- const changelogPath = Path.join(repositoryRoot, 'changelog.json')
-
-+// eslint-disable-next-line no-sync
- const changelog = Fs.readFileSync(changelogPath, 'utf8')
-
- let changelogObj = null
-merged
-  result 100644 3162be12e327f202d1aab8c198ad93c33ff738c9 tsconfig.json
-  our    100644 277ed46c185a8c539e2c44a06c4c539a248d2577 tsconfig.json
-@@ -9,9 +9,14 @@
-     "sourceMap": true,
-     "jsx": "react",
-     "strict": true,
-+    "noEmit": true,
-     "outDir": "./out"
-   },
--  "include": ["app/**/*.ts", "app/**/*.tsx", "app/**/*.d.tsx"],
-+  "include": [
-+    "app/**/*.ts",
-+    "app/**/*.tsx",
-+    "app/**/*.d.tsx"
-+  ],
-   "exclude": [
-     "node_modules",
-     "app/node_modules",
-added in remote
-  their  100644 cea9476153ecf2e440e28d7b84dc334a433fd12d vsts.yml
-@@ -0,0 +1,62 @@
-+phases:
-+- phase: Windows
-+  queue: Hosted VS2017
-+  steps:
-+  - task: NodeTool@0
-+    inputs:
-+      versionSpec: "8.11.1"
-+  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-+    inputs:
-+      versionSpec: "1.5.1"
-+  - script: |
-+       yarn install --force
-+    name: Install
-+  - script: |
-+      yarn lint && yarn build:prod
-+    name: Build
-+  - script: |
-+      yarn test:setup && yarn test
-+    name: Test
-+
-+- phase: Linux
-+  queue: Hosted Linux Preview
-+  steps:
-+  - script: |
-+      apt-get update
-+      apt-get install -y --no-install-recommends libsecret-1-dev xvfb fakeroot dpkg rpm xz-utils xorriso zsync libxss1 libgconf2-4
-+  - task: NodeTool@0
-+    inputs:
-+      versionSpec: "8.11.1"
-+  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-+    inputs:
-+      versionSpec: "1.5.1"
-+  - script: |
-+       yarn install --force
-+    name: Install
-+  - script: |
-+       yarn lint && yarn build:prod
-+    name: Build
-+  - script: |
-+       export DISPLAY=':99.0'
-+       Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
-+       yarn test:setup && yarn test
-+    name: Test
-+
-+- phase: macOS
-+  queue: Hosted macOS Preview
-+  steps:
-+  - task: NodeTool@0
-+    inputs:
-+      versionSpec: "8.11.1"
-+  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-+    inputs:
-+      versionSpec: "1.5.1"
-+  - script: |
-+      yarn install --force
-+    name: Install
-+  - script: |
-+       yarn lint && yarn build:prod
-+    name: Build
-+  - script: |
-+      yarn test:setup && yarn test
-+    name: Test
-merged
-  result 100644 518ebd962c3152899bf04a5ae668a826085179c5 yarn.lock
-  our    100644 b62b02a9d580648aaf19776890ce70c967670310 yarn.lock
-@@ -22,6 +22,13 @@
-     "7zip-bin-mac" "~1.0.1"
-     "7zip-bin-win" "~2.2.0"
-
-+"@types/body-parser@*":
-+  version "1.16.8"
-+  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.16.8.tgz#687ec34140624a3bec2b1a8ea9268478ae8f3be3"
-+  dependencies:
-+    "@types/express" "*"
-+    "@types/node" "*"
-+
- "@types/byline@^4.2.31":
-   version "4.2.31"
-   resolved "https://registry.yarnpkg.com/@types/byline/-/byline-4.2.31.tgz#0e61fcb9c03e047d21c4496554c7116297ab60cd"
-@@ -46,10 +53,26 @@
-   version "2.2.3"
-   resolved "https://registry.yarnpkg.com/@types/classnames/-/classnames-2.2.3.tgz#3f0ff6873da793870e20a260cada55982f38a9e5"
-
-+"@types/clean-css@*":
-+  version "3.4.30"
-+  resolved "https://registry.yarnpkg.com/@types/clean-css/-/clean-css-3.4.30.tgz#0052c136f5248002428e3638b37de4a39818641d"
-+
-+"@types/clean-webpack-plugin@^0.1.2":
-+  version "0.1.2"
-+  resolved "https://registry.yarnpkg.com/@types/clean-webpack-plugin/-/clean-webpack-plugin-0.1.2.tgz#f3c9d97dd397a9db86ba6b9b245ca0eedf88f3b2"
-+  dependencies:
-+    "@types/webpack" "*"
-+
- "@types/codemirror@0.0.55":
-   version "0.0.55"
-   resolved "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-0.0.55.tgz#f4292b7a5f33b2aab509501c3db7e45d19a7c057"
-
-+"@types/connect@*":
-+  version "3.4.31"
-+  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.31.tgz#1f92d6b117ecc05076c49ecd024f7976e528bad9"
-+  dependencies:
-+    "@types/node" "*"
-+
- "@types/electron-packager@^10.1.0":
-   version "10.1.0"
-   resolved "https://registry.yarnpkg.com/@types/electron-packager/-/electron-packager-10.1.0.tgz#8d61ef76a2676936c59d14392a9c0c1853405953"
-@@ -64,13 +87,39 @@
-   version "1.2.32"
-   resolved "https://registry.yarnpkg.com/@types/event-kit/-/event-kit-1.2.32.tgz#068cbdc69e8c969afae8c9f6e3a51ea4b1b5522e"
-
-+"@types/express-serve-static-core@*":
-+  version "4.11.0"
-+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.11.0.tgz#aaaf472777191c3e56ec7aa160034c6b55ebdd59"
-+  dependencies:
-+    "@types/node" "*"
-+
-+"@types/express@*", "@types/express@^4.11.0":
-+  version "4.11.0"
-+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.11.0.tgz#234d65280af917cb290634b7a8d6bcac24aecbad"
-+  dependencies:
-+    "@types/body-parser" "*"
-+    "@types/express-serve-static-core" "*"
-+    "@types/serve-static" "*"
-+
-+"@types/extract-text-webpack-plugin@^3.0.3":
-+  version "3.0.3"
-+  resolved "https://registry.yarnpkg.com/@types/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.3.tgz#b4ef831c7ea7bc0585ccabc61e8b0d6cd69fccc3"
-+  dependencies:
-+    "@types/webpack" "*"
-+
- "@types/file-url@^2.0.0":
-   version "2.0.0"
-   resolved "https://registry.yarnpkg.com/@types/file-url/-/file-url-2.0.0.tgz#23d00a219b5064d903d4baa0cf7558692ea0eeb6"
-
--"@types/fs-extra@2.1.0":
--  version "2.1.0"
--  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-2.1.0.tgz#8b350239c0455d92b8d3c626edac193860ff395f"
-+"@types/form-data@*":
-+  version "2.2.1"
-+  resolved "https://registry.yarnpkg.com/@types/form-data/-/form-data-2.2.1.tgz#ee2b3b8eaa11c0938289953606b745b738c54b1e"
-+  dependencies:
-+    "@types/node" "*"
-+
-+"@types/fs-extra@^5.0.2":
-+  version "5.0.2"
-+  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-5.0.2.tgz#235a7e2b56452cc0a6a4809b53e1d1eaffff9c96"
-   dependencies:
-     "@types/node" "*"
-
-@@ -78,10 +127,49 @@
-   version "0.0.1"
-   resolved "https://registry.yarnpkg.com/@types/fuzzaldrin-plus/-/fuzzaldrin-plus-0.0.1.tgz#bfe5e25bc5b4066848171baf7a8aaf30e267d30a"
-
-+"@types/html-minifier@*":
-+  version "1.1.30"
-+  resolved "https://registry.yarnpkg.com/@types/html-minifier/-/html-minifier-1.1.30.tgz#3b3817c27df23922f7b5aa87eff45b3ab934aec9"
-+  dependencies:
-+    "@types/clean-css" "*"
-+    "@types/relateurl" "*"
-+    "@types/uglify-js" "*"
-+
-+"@types/html-webpack-plugin@^2.30.3":
-+  version "2.30.3"
-+  resolved "https://registry.yarnpkg.com/@types/html-webpack-plugin/-/html-webpack-plugin-2.30.3.tgz#848baba8e35010c6ef6d36b04174820b9d884583"
-+  dependencies:
-+    "@types/html-minifier" "*"
-+    "@types/webpack" "*"
-+
- "@types/keytar@^4.0.0":
-   version "4.0.1"
-   resolved "https://registry.yarnpkg.com/@types/keytar/-/keytar-4.0.1.tgz#e2cf6405dc33861424e59b67516c66d2cf7bc21b"
-
-+"@types/legal-eagle@^0.15.0":
-+  version "0.15.0"
-+  resolved "https://registry.yarnpkg.com/@types/legal-eagle/-/legal-eagle-0.15.0.tgz#3a3cf08edca425ffaf9518304c4f1efddea36e42"
-+
-+"@types/loglevel@*":
-+  version "1.5.3"
-+  resolved "https://registry.yarnpkg.com/@types/loglevel/-/loglevel-1.5.3.tgz#adfce55383edc5998a2170ad581b3e23d6adb5b8"
-+
-+"@types/memory-fs@*":
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/@types/memory-fs/-/memory-fs-0.3.0.tgz#847596a94f9a9688a2e342f4017fcc0050e8e2da"
-+  dependencies:
-+    "@types/node" "*"
-+
-+"@types/mime@*":
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.0.tgz#5a7306e367c539b9f6543499de8dd519fac37a8b"
-+
-+"@types/mini-css-extract-plugin@^0.2.0":
-+  version "0.2.0"
-+  resolved "https://registry.yarnpkg.com/@types/mini-css-extract-plugin/-/mini-css-extract-plugin-0.2.0.tgz#afb037dbbd76f6c13803927c2751d194188b5d47"
-+  dependencies:
-+    "@types/webpack" "*"
-+
- "@types/mocha@^2.2.48":
-   version "2.2.48"
-   resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.48.tgz#3523b126a0b049482e1c3c11877460f76622ffab"
-@@ -94,21 +182,21 @@
-   version "8.0.47"
-   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.47.tgz#968e596f91acd59069054558a00708c445ca30c2"
-
--"@types/node@^7.0.18":
--  version "7.0.46"
--  resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.46.tgz#c3dedd25558c676b3d6303e51799abb9c3f8f314"
--
- "@types/node@^8.0.24":
--  version "8.5.10"
--  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.5.10.tgz#49bd3637125dea5f55d7d1e8f51efd6cb835e1f7"
-+  version "8.10.1"
-+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.1.tgz#aac98b810c50568054486f2bb8c486d824713be8"
-+
-+"@types/node@^8.10.4":
-+  version "8.10.4"
-+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.4.tgz#d3ca40ee884c853e2b786ee73096726ec59a5b31"
-
- "@types/prop-types@*":
-   version "15.5.2"
-   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.5.2.tgz#3c6b8dceb2906cc87fe4358e809f9d20c8d59be1"
-
--"@types/react-dom@^16.0.4":
--  version "16.0.4"
--  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.0.4.tgz#2e8fd45f5443780ed49bf2cdd9809e6091177a7d"
-+"@types/react-dom@^16.0.5":
-+  version "16.0.6"
-+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.0.6.tgz#f1a65a4e7be8ed5d123f8b3b9eacc913e35a1a3c"
-   dependencies:
-     "@types/node" "*"
-     "@types/react" "*"
-@@ -120,24 +208,52 @@
-     "@types/react" "*"
-
- "@types/react-virtualized@^9.7.12":
--  version "9.7.12"
--  resolved "https://registry.yarnpkg.com/@types/react-virtualized/-/react-virtualized-9.7.12.tgz#3dc212c0f94c9e9eab2fe7cb5a23db18ba2d1ee1"
-+  version "9.7.14"
-+  resolved "https://registry.yarnpkg.com/@types/react-virtualized/-/react-virtualized-9.7.14.tgz#4ce4b1f4a8d242edf317c7f798852788150a0040"
-   dependencies:
-     "@types/prop-types" "*"
-     "@types/react" "*"
-
--"@types/react@*", "@types/react@^16.0.40":
--  version "16.0.40"
--  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.0.40.tgz#caabc2296886f40b67f6fc80f0f3464476461df9"
-+"@types/react@*", "@types/react@^16.3.16":
-+  version "16.3.16"
-+  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.3.16.tgz#78fc44a90b45701f50c8a7008f733680ba51fc86"
-+  dependencies:
-+    csstype "^2.2.0"
-+
-+"@types/relateurl@*":
-+  version "0.2.28"
-+  resolved "https://registry.yarnpkg.com/@types/relateurl/-/relateurl-0.2.28.tgz#6bda7db8653fa62643f5ee69e9f69c11a392e3a6"
-+
-+"@types/request@^2.0.9":
-+  version "2.0.9"
-+  resolved "https://registry.yarnpkg.com/@types/request/-/request-2.0.9.tgz#125b8a60d8a439e8d87e6d1335c61cccdc18343a"
-+  dependencies:
-+    "@types/form-data" "*"
-+    "@types/node" "*"
-
- "@types/semver@^5.5.0":
-   version "5.5.0"
-   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45"
-
-+"@types/serve-static@*":
-+  version "1.13.1"
-+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.1.tgz#1d2801fa635d274cd97d4ec07e26b21b44127492"
-+  dependencies:
-+    "@types/express-serve-static-core" "*"
-+    "@types/mime" "*"
-+
-+"@types/source-map@*":
-+  version "0.5.1"
-+  resolved "https://registry.yarnpkg.com/@types/source-map/-/source-map-0.5.1.tgz#7e74db5d06ab373a712356eebfaea2fad0ea2367"
-+
- "@types/strip-ansi@^3.0.0":
-   version "3.0.0"
-   resolved "https://registry.yarnpkg.com/@types/strip-ansi/-/strip-ansi-3.0.0.tgz#9b63d453a6b54aa849182207711a08be8eea48ae"
-
-+"@types/tapable@*":
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.2.tgz#e13182e1b69871a422d7863e11a4a6f5b814a4bd"
-+
- "@types/temp@^0.8.29":
-   version "0.8.31"
-   resolved "https://registry.yarnpkg.com/@types/temp/-/temp-0.8.31.tgz#8518b6fb4c7d7cf106c78e5d88d3cff88d508f97"
-@@ -156,6 +272,12 @@
-   version "0.7.32"
-   resolved "https://registry.yarnpkg.com/@types/ua-parser-js/-/ua-parser-js-0.7.32.tgz#8827d451d6702307248073b5d98aa9293d02b5e5"
-
-+"@types/uglify-js@*":
-+  version "2.6.29"
-+  resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-2.6.29.tgz#521347f69e20201d218f5991ae66e10878afcf1a"
-+  dependencies:
-+    "@types/source-map" "*"
-+
- "@types/untildify@^3.0.0":
-   version "3.0.0"
-   resolved "https://registry.yarnpkg.com/@types/untildify/-/untildify-3.0.0.tgz#cd3e6624e46ccf292d3823fb48fa90dda0deaec0"
-@@ -166,6 +288,43 @@
-   dependencies:
-     "@types/node" "*"
-
-+"@types/webpack-bundle-analyzer@^2.9.2":
-+  version "2.9.2"
-+  resolved "https://registry.yarnpkg.com/@types/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.9.2.tgz#a3f9f4dd8bc3025550001a1704cfd31125773f40"
-+  dependencies:
-+    "@types/webpack" "*"
-+
-+"@types/webpack-dev-middleware@^2.0.1":
-+  version "2.0.1"
-+  resolved "https://registry.yarnpkg.com/@types/webpack-dev-middleware/-/webpack-dev-middleware-2.0.1.tgz#516d953602d9e8ac72ca1196969969d580d4b0a6"
-+  dependencies:
-+    "@types/connect" "*"
-+    "@types/loglevel" "*"
-+    "@types/memory-fs" "*"
-+    "@types/webpack" "*"
-+
-+"@types/webpack-hot-middleware@^2.16.3":
-+  version "2.16.3"
-+  resolved "https://registry.yarnpkg.com/@types/webpack-hot-middleware/-/webpack-hot-middleware-2.16.3.tgz#c262ab826afae16030c15049e3c997849f9c8461"
-+  dependencies:
-+    "@types/connect" "*"
-+    "@types/webpack" "*"
-+
-+"@types/webpack-merge@^4.1.3":
-+  version "4.1.3"
-+  resolved "https://registry.yarnpkg.com/@types/webpack-merge/-/webpack-merge-4.1.3.tgz#e6af0f2a0f20a86ac83d7da84a2e454063121ad4"
-+  dependencies:
-+    "@types/webpack" "*"
-+
-+"@types/webpack@*", "@types/webpack@^4.4.0":
-+  version "4.4.0"
-+  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.4.0.tgz#c0551b772be241d786c0548812dd75a932f8efb4"
-+  dependencies:
-+    "@types/node" "*"
-+    "@types/tapable" "*"
-+    "@types/uglify-js" "*"
-+    source-map "^0.6.0"
-+
- "@types/winston@^2.2.0":
-   version "2.3.7"
-   resolved "https://registry.yarnpkg.com/@types/winston/-/winston-2.3.7.tgz#2ea18b2dc772d459b6af0f587447704df31afec2"
-@@ -178,6 +337,122 @@
-   dependencies:
-     "@types/node" "*"
-
-+"@webassemblyjs/ast@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.4.3.tgz#3b3f6fced944d8660273347533e6d4d315b5934a"
-+  dependencies:
-+    "@webassemblyjs/helper-wasm-bytecode" "1.4.3"
-+    "@webassemblyjs/wast-parser" "1.4.3"
-+    debug "^3.1.0"
-+    webassemblyjs "1.4.3"
-+
-+"@webassemblyjs/floating-point-hex-parser@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.4.3.tgz#f5aee4c376a717c74264d7bacada981e7e44faad"
-+
-+"@webassemblyjs/helper-buffer@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.4.3.tgz#0434b55958519bf503697d3824857b1dea80b729"
-+  dependencies:
-+    debug "^3.1.0"
-+
-+"@webassemblyjs/helper-code-frame@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.4.3.tgz#f1349ca3e01a8e29ee2098c770773ef97af43641"
-+  dependencies:
-+    "@webassemblyjs/wast-printer" "1.4.3"
-+
-+"@webassemblyjs/helper-fsm@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.4.3.tgz#65a921db48fb43e868f17b27497870bdcae22b79"
-+
-+"@webassemblyjs/helper-wasm-bytecode@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.4.3.tgz#0e5b4b5418e33f8a26e940b7809862828c3721a5"
-+
-+"@webassemblyjs/helper-wasm-section@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.4.3.tgz#9ceedd53a3f152c3412e072887ade668d0b1acbf"
-+  dependencies:
-+    "@webassemblyjs/ast" "1.4.3"
-+    "@webassemblyjs/helper-buffer" "1.4.3"
-+    "@webassemblyjs/helper-wasm-bytecode" "1.4.3"
-+    "@webassemblyjs/wasm-gen" "1.4.3"
-+    debug "^3.1.0"
-+
-+"@webassemblyjs/leb128@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.4.3.tgz#5a5e5949dbb5adfe3ae95664d0439927ac557fb8"
-+  dependencies:
-+    leb "^0.3.0"
-+
-+"@webassemblyjs/validation@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/validation/-/validation-1.4.3.tgz#9e66c9b3079d7bbcf2070c1bf52a54af2a09aac9"
-+  dependencies:
-+    "@webassemblyjs/ast" "1.4.3"
-+
-+"@webassemblyjs/wasm-edit@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.4.3.tgz#87febd565e0ffb5ae25f6495bb3958d17aa0a779"
-+  dependencies:
-+    "@webassemblyjs/ast" "1.4.3"
-+    "@webassemblyjs/helper-buffer" "1.4.3"
-+    "@webassemblyjs/helper-wasm-bytecode" "1.4.3"
-+    "@webassemblyjs/helper-wasm-section" "1.4.3"
-+    "@webassemblyjs/wasm-gen" "1.4.3"
-+    "@webassemblyjs/wasm-opt" "1.4.3"
-+    "@webassemblyjs/wasm-parser" "1.4.3"
-+    "@webassemblyjs/wast-printer" "1.4.3"
-+    debug "^3.1.0"
-+
-+"@webassemblyjs/wasm-gen@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.4.3.tgz#8553164d0154a6be8f74d653d7ab355f73240aa4"
-+  dependencies:
-+    "@webassemblyjs/ast" "1.4.3"
-+    "@webassemblyjs/helper-wasm-bytecode" "1.4.3"
-+    "@webassemblyjs/leb128" "1.4.3"
-+
-+"@webassemblyjs/wasm-opt@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.4.3.tgz#26c7a23bfb136aa405b1d3410e63408ec60894b8"
-+  dependencies:
-+    "@webassemblyjs/ast" "1.4.3"
-+    "@webassemblyjs/helper-buffer" "1.4.3"
-+    "@webassemblyjs/wasm-gen" "1.4.3"
-+    "@webassemblyjs/wasm-parser" "1.4.3"
-+    debug "^3.1.0"
-+
-+"@webassemblyjs/wasm-parser@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.4.3.tgz#7ddd3e408f8542647ed612019cfb780830993698"
-+  dependencies:
-+    "@webassemblyjs/ast" "1.4.3"
-+    "@webassemblyjs/helper-wasm-bytecode" "1.4.3"
-+    "@webassemblyjs/leb128" "1.4.3"
-+    "@webassemblyjs/wasm-parser" "1.4.3"
-+    webassemblyjs "1.4.3"
-+
-+"@webassemblyjs/wast-parser@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.4.3.tgz#3250402e2c5ed53dbe2233c9de1fe1f9f0d51745"
-+  dependencies:
-+    "@webassemblyjs/ast" "1.4.3"
-+    "@webassemblyjs/floating-point-hex-parser" "1.4.3"
-+    "@webassemblyjs/helper-code-frame" "1.4.3"
-+    "@webassemblyjs/helper-fsm" "1.4.3"
-+    long "^3.2.0"
-+    webassemblyjs "1.4.3"
-+
-+"@webassemblyjs/wast-printer@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.4.3.tgz#3d59aa8d0252d6814a3ef4e6d2a34c9ded3904e0"
-+  dependencies:
-+    "@webassemblyjs/ast" "1.4.3"
-+    "@webassemblyjs/wast-parser" "1.4.3"
-+    long "^3.2.0"
-+
- abbrev@1:
-   version "1.1.1"
-   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-@@ -189,11 +464,18 @@
-     mime-types "~2.1.16"
-     negotiator "0.6.1"
-
--acorn-dynamic-import@^2.0.0:
--  version "2.0.2"
--  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4"
-+accepts@~1.3.5:
-+  version "1.3.5"
-+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
-+  dependencies:
-+    mime-types "~2.1.18"
-+    negotiator "0.6.1"
-+
-+acorn-dynamic-import@^3.0.0:
-+  version "3.0.0"
-+  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz#901ceee4c7faaef7e07ad2a47e890675da50a278"
-   dependencies:
--    acorn "^4.0.3"
-+    acorn "^5.0.0"
-
- acorn-jsx@^3.0.0:
-   version "3.0.1"
-@@ -205,23 +487,15 @@
-   version "3.3.0"
-   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
-
--acorn@^4.0.3:
--  version "4.0.13"
--  resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
--
- acorn@^5.0.0:
-   version "5.2.1"
-   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.2.1.tgz#317ac7821826c22c702d66189ab8359675f135d7"
-
--acorn@^5.5.0:
-+acorn@^5.3.0, acorn@^5.5.0:
-   version "5.5.3"
-   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.3.tgz#f473dd47e0277a08e28e9bec5aeeb04751f0b8c9"
-
--ajv-keywords@^1.1.1:
--  version "1.5.1"
--  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
--
--ajv-keywords@^2.0.0, ajv-keywords@^2.1.0:
-+ajv-keywords@^2.1.0:
-   version "2.1.1"
-   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
-
-@@ -229,14 +503,14 @@
-   version "3.1.0"
-   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.1.0.tgz#ac2b27939c543e95d2c06e7f7f5c27be4aa543be"
-
--ajv@^4.7.0, ajv@^4.9.1, ajv@^4.9.2:
-+ajv@^4.9.1, ajv@^4.9.2:
-   version "4.11.8"
-   resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
-   dependencies:
-     co "^4.6.0"
-     json-stable-stringify "^1.0.1"
-
--ajv@^5.0.0, ajv@^5.1.0, ajv@^5.1.5, ajv@^5.2.3:
-+ajv@^5.1.0, ajv@^5.2.3:
-   version "5.3.0"
-   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.3.0.tgz#4414ff74a50879c208ee5fdc826e32c303549eda"
-   dependencies:
-@@ -254,6 +528,15 @@
-     fast-json-stable-stringify "^2.0.0"
-     json-schema-traverse "^0.3.0"
-
-+ajv@^6.1.0:
-+  version "6.5.0"
-+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.0.tgz#4c8affdf80887d8f132c9c52ab8a2dc4d0b7b24c"
-+  dependencies:
-+    fast-deep-equal "^2.0.1"
-+    fast-json-stable-stringify "^2.0.0"
-+    json-schema-traverse "^0.3.0"
-+    uri-js "^4.2.1"
-+
- ajv@^6.1.1:
-   version "6.2.0"
-   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.2.0.tgz#afac295bbaa0152449e522742e4547c1ae9328d2"
-@@ -271,14 +554,6 @@
-     json-schema-traverse "^0.3.0"
-     uri-js "^3.0.2"
-
--align-text@^0.1.1, align-text@^0.1.3:
--  version "0.1.4"
--  resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
--  dependencies:
--    kind-of "^3.0.2"
--    longest "^1.0.1"
--    repeat-string "^1.5.2"
--
- alphanum-sort@^1.0.1, alphanum-sort@^1.0.2:
-   version "1.0.2"
-   resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
-@@ -323,29 +598,59 @@
-   dependencies:
-     color-convert "^1.9.0"
-
-+ansi-styles@^3.2.1:
-+  version "3.2.1"
-+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-+  dependencies:
-+    color-convert "^1.9.0"
-+
- any-promise@^1.0.0:
-   version "1.3.0"
-   resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
-
--anymatch@^1.3.0:
--  version "1.3.2"
--  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
-+anymatch@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
-   dependencies:
--    micromatch "^2.1.5"
--    normalize-path "^2.0.0"
-+    micromatch "^3.1.4"
-+    normalize-path "^2.1.1"
-
- app-builder-bin-linux@1.5.0:
-   version "1.5.0"
-   resolved "https://registry.yarnpkg.com/app-builder-bin-linux/-/app-builder-bin-linux-1.5.0.tgz#c22df1ab9ee7fb0270ec27a3c8a6993966ea4220"
-
-+app-builder-bin-linux@1.6.0:
-+  version "1.6.0"
-+  resolved "https://registry.yarnpkg.com/app-builder-bin-linux/-/app-builder-bin-linux-1.6.0.tgz#d7731d7988b8a740e74d591cbd565f168a266111"
-+
-+app-builder-bin-linux@1.8.4:
-+  version "1.8.4"
-+  resolved "https://registry.yarnpkg.com/app-builder-bin-linux/-/app-builder-bin-linux-1.8.4.tgz#9fa4f4f6af21f147cdedc69279940134c77d297f"
-+
- app-builder-bin-mac@1.5.0:
-   version "1.5.0"
-   resolved "https://registry.yarnpkg.com/app-builder-bin-mac/-/app-builder-bin-mac-1.5.0.tgz#40821128a1f20e0559f1fca71a59ecab81bb59b5"
-
-+app-builder-bin-mac@1.6.0:
-+  version "1.6.0"
-+  resolved "https://registry.yarnpkg.com/app-builder-bin-mac/-/app-builder-bin-mac-1.6.0.tgz#c976da70796d67aeb7134a57899636f2581d1c67"
-+
-+app-builder-bin-mac@1.8.4:
-+  version "1.8.4"
-+  resolved "https://registry.yarnpkg.com/app-builder-bin-mac/-/app-builder-bin-mac-1.8.4.tgz#abd35353167b037a15353fe44c84b0b17045d12f"
-+
- app-builder-bin-win@1.5.0:
-   version "1.5.0"
-   resolved "https://registry.yarnpkg.com/app-builder-bin-win/-/app-builder-bin-win-1.5.0.tgz#0a12437d825ac89fc2357e8be0ba855f54c083e9"
-
-+app-builder-bin-win@1.6.0:
-+  version "1.6.0"
-+  resolved "https://registry.yarnpkg.com/app-builder-bin-win/-/app-builder-bin-win-1.6.0.tgz#528ef96430d519c270b4de260bea0ddc70df1733"
-+
-+app-builder-bin-win@1.8.4:
-+  version "1.8.4"
-+  resolved "https://registry.yarnpkg.com/app-builder-bin-win/-/app-builder-bin-win-1.8.4.tgz#ba5f7a7d8ae48d32c400691b3c45f6f746c27748"
-+
- app-builder-bin@1.5.0:
-   version "1.5.0"
-   resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.5.0.tgz#dc768af9704876959c68af5456ef31f67a4663fe"
-@@ -354,7 +659,23 @@
-     app-builder-bin-mac "1.5.0"
-     app-builder-bin-win "1.5.0"
-
--aproba@^1.0.3:
-+app-builder-bin@1.6.0:
-+  version "1.6.0"
-+  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.6.0.tgz#c0e88a488d4c23c2e7fe0bbfb70c1d61165be206"
-+  optionalDependencies:
-+    app-builder-bin-linux "1.6.0"
-+    app-builder-bin-mac "1.6.0"
-+    app-builder-bin-win "1.6.0"
-+
-+app-builder-bin@1.8.4:
-+  version "1.8.4"
-+  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.8.4.tgz#ca8fd02209c2e0681de97fdb4c559d93381cc812"
-+  optionalDependencies:
-+    app-builder-bin-linux "1.8.4"
-+    app-builder-bin-mac "1.8.4"
-+    app-builder-bin-win "1.8.4"
-+
-+aproba@^1.0.3, aproba@^1.1.1:
-   version "1.2.0"
-   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
-
-@@ -396,17 +717,11 @@
-   dependencies:
-     sprintf-js "~1.0.2"
-
--arr-diff@^2.0.0:
--  version "2.0.0"
--  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
--  dependencies:
--    arr-flatten "^1.0.1"
--
- arr-diff@^4.0.0:
-   version "4.0.0"
-   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
-
--arr-flatten@^1.0.1, arr-flatten@^1.1.0:
-+arr-flatten@^1.1.0:
-   version "1.1.0"
-   resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
-
-@@ -439,10 +754,6 @@
-   version "1.0.3"
-   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-
--array-unique@^0.2.1:
--  version "0.2.1"
--  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
--
- array-unique@^0.3.2:
-   version "0.3.2"
-   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
-@@ -510,6 +821,10 @@
-   version "1.0.2"
-   resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.0.2.tgz#13ca515d86206da0bac66e834dd397d87581094c"
-
-+assign-symbols@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
-+
- async-each@^1.0.0:
-   version "1.0.1"
-   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
-@@ -522,7 +837,11 @@
-   version "0.1.3"
-   resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
-
--async@^2.0.0, async@^2.1.2, async@^2.1.5, async@^2.4.1:
-+async-limiter@~1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
-+
-+async@^2.0.0:
-   version "2.5.0"
-   resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d"
-   dependencies:
-@@ -555,18 +874,23 @@
-     postcss "^5.2.16"
-     postcss-value-parser "^3.2.3"
-
--awesome-typescript-loader@^3.4.0:
--  version "3.4.0"
--  resolved "https://registry.yarnpkg.com/awesome-typescript-loader/-/awesome-typescript-loader-3.4.0.tgz#aed2c83af614d617d11e3ec368ac3befb55d002f"
-+awesome-node-loader@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/awesome-node-loader/-/awesome-node-loader-1.1.0.tgz#95cf054ec2fa233c38f29ce18cc59b0ef0c002db"
-   dependencies:
--    colors "^1.1.2"
--    enhanced-resolve "3.3.0"
-     loader-utils "^1.1.0"
--    lodash "^4.17.4"
--    micromatch "^3.0.3"
-+
-+awesome-typescript-loader@^5.0.0:
-+  version "5.0.0"
-+  resolved "https://registry.yarnpkg.com/awesome-typescript-loader/-/awesome-typescript-loader-5.0.0.tgz#130c304ae52a60933f15d93f7629003b483fa8b1"
-+  dependencies:
-+    chalk "^2.3.1"
-+    enhanced-resolve "^4.0.0"
-+    loader-utils "^1.1.0"
-+    lodash "^4.17.5"
-+    micromatch "^3.1.9"
-     mkdirp "^0.5.1"
--    object-assign "^4.1.1"
--    source-map-support "^0.4.15"
-+    source-map-support "^0.5.3"
-
- aws-sdk@^2.23.0:
-   version "2.142.0"
-@@ -595,7 +919,7 @@
-   version "1.6.0"
-   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
-
--babel-code-frame@^6.11.0, babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
-+babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
-   version "6.26.0"
-   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
-   dependencies:
-@@ -603,7 +927,7 @@
-     esutils "^2.0.2"
-     js-tokens "^3.0.2"
-
--babel-core@^6.22.1, babel-core@^6.24.1, babel-core@^6.26.0:
-+babel-core@^6.26.0:
-   version "6.26.0"
-   resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.0.tgz#af32f78b31a6fcef119c87b0fd8d9753f03a0bb8"
-   dependencies:
-@@ -627,6 +951,30 @@
-     slash "^1.0.0"
-     source-map "^0.5.6"
-
-+babel-core@^6.26.3:
-+  version "6.26.3"
-+  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207"
-+  dependencies:
-+    babel-code-frame "^6.26.0"
-+    babel-generator "^6.26.0"
-+    babel-helpers "^6.24.1"
-+    babel-messages "^6.23.0"
-+    babel-register "^6.26.0"
-+    babel-runtime "^6.26.0"
-+    babel-template "^6.26.0"
-+    babel-traverse "^6.26.0"
-+    babel-types "^6.26.0"
-+    babylon "^6.18.0"
-+    convert-source-map "^1.5.1"
-+    debug "^2.6.9"
-+    json5 "^0.5.1"
-+    lodash "^4.17.4"
-+    minimatch "^3.0.4"
-+    path-is-absolute "^1.0.1"
-+    private "^0.1.8"
-+    slash "^1.0.0"
-+    source-map "^0.5.7"
-+
- babel-generator@^6.26.0:
-   version "6.26.0"
-   resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.0.tgz#ac1ae20070b79f6e3ca1d3269613053774f20dc5"
-@@ -640,33 +988,33 @@
-     source-map "^0.5.6"
-     trim-right "^1.0.1"
-
--babel-helper-evaluate-path@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-helper-evaluate-path/-/babel-helper-evaluate-path-0.2.0.tgz#0bb2eb01996c0cef53c5e8405e999fe4a0244c08"
-+babel-helper-evaluate-path@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/babel-helper-evaluate-path/-/babel-helper-evaluate-path-0.3.0.tgz#2439545e0b6eae5b7f49b790acbebd6b9a73df20"
-
--babel-helper-flip-expressions@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-helper-flip-expressions/-/babel-helper-flip-expressions-0.2.0.tgz#160d2090a3d9f9c64a750905321a0bc218f884ec"
-+babel-helper-flip-expressions@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/babel-helper-flip-expressions/-/babel-helper-flip-expressions-0.3.0.tgz#f5b6394bd5219b43cf8f7b201535ed540c6e7fa2"
-
- babel-helper-is-nodes-equiv@^0.0.1:
-   version "0.0.1"
-   resolved "https://registry.yarnpkg.com/babel-helper-is-nodes-equiv/-/babel-helper-is-nodes-equiv-0.0.1.tgz#34e9b300b1479ddd98ec77ea0bbe9342dfe39684"
-
--babel-helper-is-void-0@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-helper-is-void-0/-/babel-helper-is-void-0-0.2.0.tgz#6ed0ada8a9b1c5b6e88af6b47c1b3b5c080860eb"
-+babel-helper-is-void-0@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/babel-helper-is-void-0/-/babel-helper-is-void-0-0.3.0.tgz#95570d20bd27b2206f68083ae9980ee7003d8fe7"
-
--babel-helper-mark-eval-scopes@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-helper-mark-eval-scopes/-/babel-helper-mark-eval-scopes-0.2.0.tgz#7648aaf2ec92aae9b09a20ad91e8df5e1fcc94b2"
-+babel-helper-mark-eval-scopes@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/babel-helper-mark-eval-scopes/-/babel-helper-mark-eval-scopes-0.3.0.tgz#b4731314fdd7a89091271a5213b4e12d236e29e8"
-
--babel-helper-remove-or-void@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-helper-remove-or-void/-/babel-helper-remove-or-void-0.2.0.tgz#8e46ad5b30560d57d7510b3fd93f332ee7c67386"
-+babel-helper-remove-or-void@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/babel-helper-remove-or-void/-/babel-helper-remove-or-void-0.3.0.tgz#f43c86147c8fcc395a9528cbb31e7ff49d7e16e3"
-
--babel-helper-to-multiple-sequence-expressions@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-helper-to-multiple-sequence-expressions/-/babel-helper-to-multiple-sequence-expressions-0.2.0.tgz#d1a419634c6cb301f27858c659167cfee0a9d318"
-+babel-helper-to-multiple-sequence-expressions@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/babel-helper-to-multiple-sequence-expressions/-/babel-helper-to-multiple-sequence-expressions-0.3.0.tgz#8da2275ccc26995566118f7213abfd9af7214427"
-
- babel-helpers@^6.24.1:
-   version "6.24.1"
-@@ -681,156 +1029,157 @@
-   dependencies:
-     babel-runtime "^6.22.0"
-
--babel-minify@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-minify/-/babel-minify-0.2.0.tgz#36d381fee4002d7949dd5d796e74800336057d67"
-+babel-minify-webpack-plugin@^0.3.1:
-+  version "0.3.1"
-+  resolved "https://registry.yarnpkg.com/babel-minify-webpack-plugin/-/babel-minify-webpack-plugin-0.3.1.tgz#292aa240af190e2dcadf4f684d6d84d179b6d5a4"
-   dependencies:
--    babel-core "^6.24.1"
--    babel-preset-minify "^0.2.0"
--    fs-readdir-recursive "^1.0.0"
--    mkdirp "^0.5.1"
--    util.promisify "^1.0.0"
--    yargs-parser "^5.0.0"
-+    babel-core "^6.26.0"
-+    babel-preset-minify "^0.3.0"
-+    webpack-sources "^1.0.1"
-
--babel-plugin-minify-builtins@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-plugin-minify-builtins/-/babel-plugin-minify-builtins-0.2.0.tgz#317f824b0907210b6348671bb040ca072e2e0c82"
-+babel-plugin-minify-builtins@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-builtins/-/babel-plugin-minify-builtins-0.3.0.tgz#4740117a6a784063aaf8f092989cf9e4bd484860"
-   dependencies:
--    babel-helper-evaluate-path "^0.2.0"
-+    babel-helper-evaluate-path "^0.3.0"
-
--babel-plugin-minify-constant-folding@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-plugin-minify-constant-folding/-/babel-plugin-minify-constant-folding-0.2.0.tgz#8c70b528b2eb7c13e94d95c8789077d4cdbc3970"
-+babel-plugin-minify-constant-folding@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-constant-folding/-/babel-plugin-minify-constant-folding-0.3.0.tgz#687e40336bd4ddd921e0e197f0006235ac184bb9"
-   dependencies:
--    babel-helper-evaluate-path "^0.2.0"
-+    babel-helper-evaluate-path "^0.3.0"
-
--babel-plugin-minify-dead-code-elimination@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-plugin-minify-dead-code-elimination/-/babel-plugin-minify-dead-code-elimination-0.2.0.tgz#e8025ee10a1e5e4f202633a6928ce892c33747e3"
-+babel-plugin-minify-dead-code-elimination@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-dead-code-elimination/-/babel-plugin-minify-dead-code-elimination-0.3.0.tgz#a323f686c404b824186ba5583cf7996cac81719e"
-   dependencies:
--    babel-helper-evaluate-path "^0.2.0"
--    babel-helper-mark-eval-scopes "^0.2.0"
--    babel-helper-remove-or-void "^0.2.0"
-+    babel-helper-evaluate-path "^0.3.0"
-+    babel-helper-mark-eval-scopes "^0.3.0"
-+    babel-helper-remove-or-void "^0.3.0"
-     lodash.some "^4.6.0"
-
--babel-plugin-minify-flip-comparisons@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-plugin-minify-flip-comparisons/-/babel-plugin-minify-flip-comparisons-0.2.0.tgz#0c9c8e93155c8f09dedad8118b634c259f709ef5"
-+babel-plugin-minify-flip-comparisons@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-flip-comparisons/-/babel-plugin-minify-flip-comparisons-0.3.0.tgz#6627893a409c9f30ef7f2c89e0c6eea7ee97ddc4"
-   dependencies:
--    babel-helper-is-void-0 "^0.2.0"
-+    babel-helper-is-void-0 "^0.3.0"
-
--babel-plugin-minify-guarded-expressions@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-plugin-minify-guarded-expressions/-/babel-plugin-minify-guarded-expressions-0.2.0.tgz#8a8c950040fce3e258a12e6eb21eab94ad7235ab"
-+babel-plugin-minify-guarded-expressions@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-guarded-expressions/-/babel-plugin-minify-guarded-expressions-0.3.0.tgz#2552d96189ef45d9a463f1a6b5e4fa110703ac8d"
-   dependencies:
--    babel-helper-flip-expressions "^0.2.0"
-+    babel-helper-flip-expressions "^0.3.0"
-
--babel-plugin-minify-infinity@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-plugin-minify-infinity/-/babel-plugin-minify-infinity-0.2.0.tgz#30960c615ddbc657c045bb00a1d8eb4af257cf03"
-+babel-plugin-minify-infinity@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-infinity/-/babel-plugin-minify-infinity-0.3.0.tgz#c5ec0edd433517cf31b3af17077c202beb48bbe7"
-
--babel-plugin-minify-mangle-names@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-plugin-minify-mangle-names/-/babel-plugin-minify-mangle-names-0.2.0.tgz#719892297ff0106a6ec1a4b0fc062f1f8b6a8529"
-+babel-plugin-minify-mangle-names@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-mangle-names/-/babel-plugin-minify-mangle-names-0.3.0.tgz#f28561bad0dd2f0380816816bb946e219b3b6135"
-   dependencies:
--    babel-helper-mark-eval-scopes "^0.2.0"
-+    babel-helper-mark-eval-scopes "^0.3.0"
-
--babel-plugin-minify-numeric-literals@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-plugin-minify-numeric-literals/-/babel-plugin-minify-numeric-literals-0.2.0.tgz#5746e851700167a380c05e93f289a7070459a0d1"
-+babel-plugin-minify-numeric-literals@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-numeric-literals/-/babel-plugin-minify-numeric-literals-0.3.0.tgz#b57734a612e8a592005407323c321119f27d4b40"
-
--babel-plugin-minify-replace@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-plugin-minify-replace/-/babel-plugin-minify-replace-0.2.0.tgz#3c1f06bc4e6d3e301eacb763edc1be611efc39b0"
-+babel-plugin-minify-replace@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-replace/-/babel-plugin-minify-replace-0.3.0.tgz#980125bbf7cbb5a637439de9d0b1b030a4693893"
-
--babel-plugin-minify-simplify@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-plugin-minify-simplify/-/babel-plugin-minify-simplify-0.2.0.tgz#21ceec4857100c5476d7cef121f351156e5c9bc0"
-+babel-plugin-minify-simplify@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-simplify/-/babel-plugin-minify-simplify-0.3.0.tgz#14574cc74d21c81d3060fafa041010028189f11b"
-   dependencies:
--    babel-helper-flip-expressions "^0.2.0"
-+    babel-helper-flip-expressions "^0.3.0"
-     babel-helper-is-nodes-equiv "^0.0.1"
--    babel-helper-to-multiple-sequence-expressions "^0.2.0"
-+    babel-helper-to-multiple-sequence-expressions "^0.3.0"
-
--babel-plugin-minify-type-constructors@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-plugin-minify-type-constructors/-/babel-plugin-minify-type-constructors-0.2.0.tgz#7f3b6458be0863cfd59e9985bed6d134aa7a2e17"
-+babel-plugin-minify-type-constructors@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-type-constructors/-/babel-plugin-minify-type-constructors-0.3.0.tgz#7f5a86ef322c4746364e3c591b8514eeafea6ad4"
-   dependencies:
--    babel-helper-is-void-0 "^0.2.0"
-+    babel-helper-is-void-0 "^0.3.0"
-
--babel-plugin-transform-inline-consecutive-adds@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-plugin-transform-inline-consecutive-adds/-/babel-plugin-transform-inline-consecutive-adds-0.2.0.tgz#15dae78921057f4004f8eafd79e15ddc5f12f426"
-+babel-plugin-syntax-dynamic-import@^6.18.0:
-+  version "6.18.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz#8d6a26229c83745a9982a441051572caa179b1da"
-
--babel-plugin-transform-member-expression-literals@^6.8.5:
--  version "6.8.5"
--  resolved "https://registry.yarnpkg.com/babel-plugin-transform-member-expression-literals/-/babel-plugin-transform-member-expression-literals-6.8.5.tgz#e06ae305cf48d819822e93a70d79269f04d89eec"
-+babel-plugin-transform-inline-consecutive-adds@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-inline-consecutive-adds/-/babel-plugin-transform-inline-consecutive-adds-0.3.0.tgz#f07d93689c0002ed2b2b62969bdd99f734e03f57"
-+
-+babel-plugin-transform-member-expression-literals@^6.9.0:
-+  version "6.9.4"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-member-expression-literals/-/babel-plugin-transform-member-expression-literals-6.9.4.tgz#37039c9a0c3313a39495faac2ff3a6b5b9d038bf"
-
--babel-plugin-transform-merge-sibling-variables@^6.8.6:
--  version "6.8.6"
--  resolved "https://registry.yarnpkg.com/babel-plugin-transform-merge-sibling-variables/-/babel-plugin-transform-merge-sibling-variables-6.8.6.tgz#6d21efa5ee4981f71657fae716f9594bb2622aef"
-+babel-plugin-transform-merge-sibling-variables@^6.9.0:
-+  version "6.9.4"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-merge-sibling-variables/-/babel-plugin-transform-merge-sibling-variables-6.9.4.tgz#85b422fc3377b449c9d1cde44087203532401dae"
-
--babel-plugin-transform-minify-booleans@^6.8.3:
--  version "6.8.3"
--  resolved "https://registry.yarnpkg.com/babel-plugin-transform-minify-booleans/-/babel-plugin-transform-minify-booleans-6.8.3.tgz#5906ed776d3718250519abf1bace44b0b613ddf9"
-+babel-plugin-transform-minify-booleans@^6.9.0:
-+  version "6.9.4"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-minify-booleans/-/babel-plugin-transform-minify-booleans-6.9.4.tgz#acbb3e56a3555dd23928e4b582d285162dd2b198"
-
--babel-plugin-transform-property-literals@^6.8.5:
--  version "6.8.5"
--  resolved "https://registry.yarnpkg.com/babel-plugin-transform-property-literals/-/babel-plugin-transform-property-literals-6.8.5.tgz#67ed5930b34805443452c8b9690c7ebe1e206c40"
-+babel-plugin-transform-property-literals@^6.9.0:
-+  version "6.9.4"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-property-literals/-/babel-plugin-transform-property-literals-6.9.4.tgz#98c1d21e255736573f93ece54459f6ce24985d39"
-   dependencies:
-     esutils "^2.0.2"
-
--babel-plugin-transform-regexp-constructors@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regexp-constructors/-/babel-plugin-transform-regexp-constructors-0.2.0.tgz#6aa5dd0acc515db4be929bbcec4ed4c946c534a3"
-+babel-plugin-transform-regexp-constructors@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regexp-constructors/-/babel-plugin-transform-regexp-constructors-0.3.0.tgz#9bb2c8dd082271a5cb1b3a441a7c52e8fd07e0f5"
-
--babel-plugin-transform-remove-console@^6.8.5:
--  version "6.8.5"
--  resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.8.5.tgz#fde9d2d3d725530b0fadd8d31078402410386810"
-+babel-plugin-transform-remove-console@^6.9.0:
-+  version "6.9.4"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.9.4.tgz#b980360c067384e24b357a588d807d3c83527780"
-
--babel-plugin-transform-remove-debugger@^6.8.5:
--  version "6.8.5"
--  resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-debugger/-/babel-plugin-transform-remove-debugger-6.8.5.tgz#809584d412bf918f071fdf41e1fdb15ea89cdcd5"
-+babel-plugin-transform-remove-debugger@^6.9.0:
-+  version "6.9.4"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-debugger/-/babel-plugin-transform-remove-debugger-6.9.4.tgz#42b727631c97978e1eb2d199a7aec84a18339ef2"
-
--babel-plugin-transform-remove-undefined@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-undefined/-/babel-plugin-transform-remove-undefined-0.2.0.tgz#94f052062054c707e8d094acefe79416b63452b1"
-+babel-plugin-transform-remove-undefined@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-undefined/-/babel-plugin-transform-remove-undefined-0.3.0.tgz#03f5f0071867781e9beabbc7b77bf8095fd3f3ec"
-   dependencies:
--    babel-helper-evaluate-path "^0.2.0"
-+    babel-helper-evaluate-path "^0.3.0"
-
--babel-plugin-transform-simplify-comparison-operators@^6.8.5:
--  version "6.8.5"
--  resolved "https://registry.yarnpkg.com/babel-plugin-transform-simplify-comparison-operators/-/babel-plugin-transform-simplify-comparison-operators-6.8.5.tgz#a838786baf40cc33a93b95ae09e05591227e43bf"
-+babel-plugin-transform-simplify-comparison-operators@^6.9.0:
-+  version "6.9.4"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-simplify-comparison-operators/-/babel-plugin-transform-simplify-comparison-operators-6.9.4.tgz#f62afe096cab0e1f68a2d753fdf283888471ceb9"
-
--babel-plugin-transform-undefined-to-void@^6.8.3:
--  version "6.8.3"
--  resolved "https://registry.yarnpkg.com/babel-plugin-transform-undefined-to-void/-/babel-plugin-transform-undefined-to-void-6.8.3.tgz#fc52707f6ee1ddc71bb91b0d314fbefdeef9beb4"
-+babel-plugin-transform-undefined-to-void@^6.9.0:
-+  version "6.9.4"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-undefined-to-void/-/babel-plugin-transform-undefined-to-void-6.9.4.tgz#be241ca81404030678b748717322b89d0c8fe280"
-
--babel-preset-minify@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-preset-minify/-/babel-preset-minify-0.2.0.tgz#006566552d9b83834472273f306c0131062a0acc"
--  dependencies:
--    babel-plugin-minify-builtins "^0.2.0"
--    babel-plugin-minify-constant-folding "^0.2.0"
--    babel-plugin-minify-dead-code-elimination "^0.2.0"
--    babel-plugin-minify-flip-comparisons "^0.2.0"
--    babel-plugin-minify-guarded-expressions "^0.2.0"
--    babel-plugin-minify-infinity "^0.2.0"
--    babel-plugin-minify-mangle-names "^0.2.0"
--    babel-plugin-minify-numeric-literals "^0.2.0"
--    babel-plugin-minify-replace "^0.2.0"
--    babel-plugin-minify-simplify "^0.2.0"
--    babel-plugin-minify-type-constructors "^0.2.0"
--    babel-plugin-transform-inline-consecutive-adds "^0.2.0"
--    babel-plugin-transform-member-expression-literals "^6.8.5"
--    babel-plugin-transform-merge-sibling-variables "^6.8.6"
--    babel-plugin-transform-minify-booleans "^6.8.3"
--    babel-plugin-transform-property-literals "^6.8.5"
--    babel-plugin-transform-regexp-constructors "^0.2.0"
--    babel-plugin-transform-remove-console "^6.8.5"
--    babel-plugin-transform-remove-debugger "^6.8.5"
--    babel-plugin-transform-remove-undefined "^0.2.0"
--    babel-plugin-transform-simplify-comparison-operators "^6.8.5"
--    babel-plugin-transform-undefined-to-void "^6.8.3"
-+babel-preset-minify@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/babel-preset-minify/-/babel-preset-minify-0.3.0.tgz#7db64afa75f16f6e06c0aa5f25195f6f36784d77"
-+  dependencies:
-+    babel-plugin-minify-builtins "^0.3.0"
-+    babel-plugin-minify-constant-folding "^0.3.0"
-+    babel-plugin-minify-dead-code-elimination "^0.3.0"
-+    babel-plugin-minify-flip-comparisons "^0.3.0"
-+    babel-plugin-minify-guarded-expressions "^0.3.0"
-+    babel-plugin-minify-infinity "^0.3.0"
-+    babel-plugin-minify-mangle-names "^0.3.0"
-+    babel-plugin-minify-numeric-literals "^0.3.0"
-+    babel-plugin-minify-replace "^0.3.0"
-+    babel-plugin-minify-simplify "^0.3.0"
-+    babel-plugin-minify-type-constructors "^0.3.0"
-+    babel-plugin-transform-inline-consecutive-adds "^0.3.0"
-+    babel-plugin-transform-member-expression-literals "^6.9.0"
-+    babel-plugin-transform-merge-sibling-variables "^6.9.0"
-+    babel-plugin-transform-minify-booleans "^6.9.0"
-+    babel-plugin-transform-property-literals "^6.9.0"
-+    babel-plugin-transform-regexp-constructors "^0.3.0"
-+    babel-plugin-transform-remove-console "^6.9.0"
-+    babel-plugin-transform-remove-debugger "^6.9.0"
-+    babel-plugin-transform-remove-undefined "^0.3.0"
-+    babel-plugin-transform-simplify-comparison-operators "^6.9.0"
-+    babel-plugin-transform-undefined-to-void "^6.9.0"
-     lodash.isplainobject "^4.0.6"
-
- babel-register@^6.26.0:
-@@ -892,15 +1241,6 @@
-     lodash "^4.17.4"
-     to-fast-properties "^1.0.3"
-
--babel-webpack-plugin@^0.1.1:
--  version "0.1.1"
--  resolved "https://registry.yarnpkg.com/babel-webpack-plugin/-/babel-webpack-plugin-0.1.1.tgz#ab9f3c427d1574456caa33024f1bdb7b2848460c"
--  dependencies:
--    babel-core "^6.22.1"
--    source-map "^0.5.6"
--    webpack "^2.2.0"
--    webpack-sources "^0.1.4"
--
- babylon@^6.18.0:
-   version "6.18.0"
-   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
-@@ -939,6 +1279,14 @@
-   dependencies:
-     tweetnacl "^0.14.3"
-
-+bfj-node4@^5.2.0:
-+  version "5.3.1"
-+  resolved "https://registry.yarnpkg.com/bfj-node4/-/bfj-node4-5.3.1.tgz#e23d8b27057f1d0214fc561142ad9db998f26830"
-+  dependencies:
-+    bluebird "^3.5.1"
-+    check-types "^7.3.0"
-+    tryer "^1.0.0"
-+
- big.js@^3.1.3:
-   version "3.2.0"
-   resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
-@@ -972,7 +1320,7 @@
-   dependencies:
-     bluebird "^3.5.1"
-
--bluebird@^3.0.6, bluebird@^3.1.1, bluebird@^3.3.4, bluebird@^3.4.7, bluebird@^3.5.0, bluebird@^3.5.1:
-+bluebird@^3.0.6, bluebird@^3.1.1, bluebird@^3.3.4, bluebird@^3.5.0, bluebird@^3.5.1:
-   version "3.5.1"
-   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
-
-@@ -1036,14 +1384,6 @@
-     balanced-match "^1.0.0"
-     concat-map "0.0.1"
-
--braces@^1.8.2:
--  version "1.8.5"
--  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
--  dependencies:
--    expand-range "^1.8.1"
--    preserve "^0.2.0"
--    repeat-element "^1.1.2"
--
- braces@^2.3.0:
-   version "2.3.0"
-   resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.0.tgz#a46941cb5fb492156b3d6a656e06c35364e3e66e"
-@@ -1060,6 +1400,21 @@
-     split-string "^3.0.2"
-     to-regex "^3.0.1"
-
-+braces@^2.3.1:
-+  version "2.3.2"
-+  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
-+  dependencies:
-+    arr-flatten "^1.1.0"
-+    array-unique "^0.3.2"
-+    extend-shallow "^2.0.1"
-+    fill-range "^4.0.0"
-+    isobject "^3.0.1"
-+    repeat-element "^1.1.2"
-+    snapdragon "^0.8.1"
-+    snapdragon-node "^2.0.1"
-+    split-string "^3.0.2"
-+    to-regex "^3.0.1"
-+
- brorand@^1.0.1:
-   version "1.1.0"
-   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
-@@ -1131,6 +1486,10 @@
-   version "0.2.13"
-   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
-
-+buffer-from@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.0.0.tgz#4cb8832d23612589b0406e9e2956c17f06fdf531"
-+
- buffer-xor@^1.0.3:
-   version "1.0.3"
-   resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
-@@ -1147,7 +1506,7 @@
-   version "0.1.1"
-   resolved "https://registry.yarnpkg.com/buffers/-/buffers-0.1.1.tgz#b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb"
-
--builder-util-runtime@4.0.5, builder-util-runtime@^4.0.5:
-+builder-util-runtime@4.0.5:
-   version "4.0.5"
-   resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-4.0.5.tgz#5340cf9886b9283ea6e5b20dc09b5e3e461aef62"
-   dependencies:
-@@ -1156,7 +1515,16 @@
-     fs-extra-p "^4.5.0"
-     sax "^1.2.4"
-
--builder-util@5.6.0, builder-util@^5.6.0:
-+builder-util-runtime@^4.0.5, builder-util-runtime@^4.2.0:
-+  version "4.2.0"
-+  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-4.2.0.tgz#c56aa18d34390143da031c418c9d3a055fbd3522"
-+  dependencies:
-+    bluebird-lst "^1.0.5"
-+    debug "^3.1.0"
-+    fs-extra-p "^4.5.2"
-+    sax "^1.2.4"
-+
-+builder-util@5.6.0:
-   version "5.6.0"
-   resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-5.6.0.tgz#c37c5207cd818531bda819ac836b6d51dfbccd4a"
-   dependencies:
-@@ -1175,6 +1543,44 @@
-     stat-mode "^0.2.2"
-     temp-file "^3.1.1"
-
-+builder-util@5.6.1:
-+  version "5.6.1"
-+  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-5.6.1.tgz#ab90845cb8949ea4ac81da0ce87b8ec3424cdbf9"
-+  dependencies:
-+    "7zip-bin" "~3.1.0"
-+    app-builder-bin "1.6.0"
-+    bluebird-lst "^1.0.5"
-+    builder-util-runtime "^4.0.5"
-+    chalk "^2.3.2"
-+    debug "^3.1.0"
-+    fs-extra-p "^4.5.2"
-+    is-ci "^1.1.0"
-+    js-yaml "^3.10.0"
-+    lazy-val "^1.0.3"
-+    semver "^5.5.0"
-+    source-map-support "^0.5.3"
-+    stat-mode "^0.2.2"
-+    temp-file "^3.1.1"
-+
-+builder-util@^5.6.0:
-+  version "5.7.5"
-+  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-5.7.5.tgz#58f8d2b7a35445c5fb45bff50b39bbed554c9863"
-+  dependencies:
-+    "7zip-bin" "~3.1.0"
-+    app-builder-bin "1.8.4"
-+    bluebird-lst "^1.0.5"
-+    builder-util-runtime "^4.2.0"
-+    chalk "^2.3.2"
-+    debug "^3.1.0"
-+    fs-extra-p "^4.5.2"
-+    is-ci "^1.1.0"
-+    js-yaml "^3.11.0"
-+    lazy-val "^1.0.3"
-+    semver "^5.5.0"
-+    source-map-support "^0.5.4"
-+    stat-mode "^0.2.2"
-+    temp-file "^3.1.1"
-+
- builtin-modules@^1.0.0, builtin-modules@^1.1.1:
-   version "1.1.1"
-   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
-@@ -1187,6 +1593,24 @@
-   version "3.0.0"
-   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
-
-+cacache@^10.0.4:
-+  version "10.0.4"
-+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460"
-+  dependencies:
-+    bluebird "^3.5.1"
-+    chownr "^1.0.1"
-+    glob "^7.1.2"
-+    graceful-fs "^4.1.11"
-+    lru-cache "^4.1.1"
-+    mississippi "^2.0.0"
-+    mkdirp "^0.5.1"
-+    move-concurrently "^1.0.1"
-+    promise-inflight "^1.0.1"
-+    rimraf "^2.6.2"
-+    ssri "^5.2.4"
-+    unique-filename "^1.1.0"
-+    y18n "^4.0.0"
-+
- cache-base@^1.0.1:
-   version "1.0.1"
-   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
-@@ -1225,10 +1649,6 @@
-     camelcase "^2.0.0"
-     map-obj "^1.0.0"
-
--camelcase@^1.0.2:
--  version "1.2.1"
--  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
--
- camelcase@^2.0.0:
-   version "2.1.1"
-   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
-@@ -1266,13 +1686,6 @@
-   version "0.12.0"
-   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-
--center-align@^0.1.1:
--  version "0.1.3"
--  resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
--  dependencies:
--    align-text "^0.1.3"
--    lazy-cache "^1.0.3"
--
- chai-as-promised@^7.1.1:
-   version "7.1.1"
-   resolved "https://registry.yarnpkg.com/chai-as-promised/-/chai-as-promised-7.1.1.tgz#08645d825deb8696ee61725dbf590c012eb00ca0"
-@@ -1320,24 +1733,55 @@
-     escape-string-regexp "^1.0.5"
-     supports-color "^4.0.0"
-
-+chalk@^2.3.1:
-+  version "2.4.1"
-+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
-+  dependencies:
-+    ansi-styles "^3.2.1"
-+    escape-string-regexp "^1.0.5"
-+    supports-color "^5.3.0"
-+
-+chalk@^2.3.2:
-+  version "2.3.2"
-+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65"
-+  dependencies:
-+    ansi-styles "^3.2.1"
-+    escape-string-regexp "^1.0.5"
-+    supports-color "^5.3.0"
-+
- check-error@^1.0.1, check-error@^1.0.2:
-   version "1.0.2"
-   resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
-
--chokidar@^1.7.0:
--  version "1.7.0"
--  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
-+check-types@^7.3.0:
-+  version "7.3.0"
-+  resolved "https://registry.yarnpkg.com/check-types/-/check-types-7.3.0.tgz#468f571a4435c24248f5fd0cb0e8d87c3c341e7d"
-+
-+chokidar@^2.0.2:
-+  version "2.0.3"
-+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.3.tgz#dcbd4f6cbb2a55b4799ba8a840ac527e5f4b1176"
-   dependencies:
--    anymatch "^1.3.0"
-+    anymatch "^2.0.0"
-     async-each "^1.0.0"
--    glob-parent "^2.0.0"
-+    braces "^2.3.0"
-+    glob-parent "^3.1.0"
-     inherits "^2.0.1"
-     is-binary-path "^1.0.0"
--    is-glob "^2.0.0"
-+    is-glob "^4.0.0"
-+    normalize-path "^2.1.1"
-     path-is-absolute "^1.0.0"
-     readdirp "^2.0.0"
-+    upath "^1.0.0"
-   optionalDependencies:
--    fsevents "^1.0.0"
-+    fsevents "^1.1.2"
-+
-+chownr@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
-+
-+chrome-trace-event@^0.1.1:
-+  version "0.1.3"
-+  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-0.1.3.tgz#d395af2d31c87b90a716c831fe326f69768ec084"
-
- chromium-pickle-js@^0.1.0:
-   version "0.1.0"
-@@ -1384,9 +1828,9 @@
-   dependencies:
-     source-map "0.5.x"
-
--clean-webpack-plugin@^0.1.16:
--  version "0.1.17"
--  resolved "https://registry.yarnpkg.com/clean-webpack-plugin/-/clean-webpack-plugin-0.1.17.tgz#71c57242e6d47204d46f809413176e7bed28ec49"
-+clean-webpack-plugin@^0.1.19:
-+  version "0.1.19"
-+  resolved "https://registry.yarnpkg.com/clean-webpack-plugin/-/clean-webpack-plugin-0.1.19.tgz#ceda8bb96b00fe168e9b080272960d20fdcadd6d"
-   dependencies:
-     rimraf "^2.6.1"
-
-@@ -1411,14 +1855,6 @@
-     exit "0.1.2"
-     glob "^7.1.1"
-
--cliui@^2.1.0:
--  version "2.1.0"
--  resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
--  dependencies:
--    center-align "^0.1.1"
--    right-align "^0.1.1"
--    wordwrap "0.0.2"
--
- cliui@^3.2.0:
-   version "3.2.0"
-   resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
-@@ -1435,14 +1871,14 @@
-     strip-ansi "^4.0.0"
-     wrap-ansi "^2.0.0"
-
--clone-deep@^0.3.0:
--  version "0.3.0"
--  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-0.3.0.tgz#348c61ae9cdbe0edfe053d91ff4cc521d790ede8"
-+clone-deep@^2.0.1:
-+  version "2.0.2"
-+  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-2.0.2.tgz#00db3a1e173656730d1188c3d6aced6d7ea97713"
-   dependencies:
-     for-own "^1.0.0"
--    is-plain-object "^2.0.1"
--    kind-of "^3.2.2"
--    shallow-clone "^0.1.2"
-+    is-plain-object "^2.0.4"
-+    kind-of "^6.0.0"
-+    shallow-clone "^1.0.0"
-
- clone@^1.0.2:
-   version "1.0.2"
-@@ -1505,7 +1941,7 @@
-     css-color-names "0.0.4"
-     has "^1.0.1"
-
--colors@^1.1.2, colors@~1.1.2:
-+colors@~1.1.2:
-   version "1.1.2"
-   resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
-
-@@ -1519,10 +1955,18 @@
-   version "2.11.0"
-   resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
-
--commander@^2.12.1, commander@^2.14.1:
-+commander@^2.12.1, commander@^2.13.0, commander@^2.14.1:
-   version "2.15.1"
-   resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
-
-+commander@~2.13.0:
-+  version "2.13.0"
-+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
-+
-+commondir@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
-+
- compare-version@^0.1.2:
-   version "0.1.2"
-   resolved "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz#0162ec2d9351f5ddd59a9202cba935366a725080"
-@@ -1552,6 +1996,15 @@
-     readable-stream "^2.2.2"
-     typedarray "^0.0.6"
-
-+concat-stream@^1.5.0:
-+  version "1.6.2"
-+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
-+  dependencies:
-+    buffer-from "^1.0.0"
-+    inherits "^2.0.3"
-+    readable-stream "^2.2.2"
-+    typedarray "^0.0.6"
-+
- configstore@^3.0.0:
-   version "3.1.1"
-   resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.1.tgz#094ee662ab83fad9917678de114faaea8fcdca90"
-@@ -1589,6 +2042,10 @@
-   version "1.5.0"
-   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
-
-+convert-source-map@^1.5.1:
-+  version "1.5.1"
-+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
-+
- cookie-signature@1.0.6:
-   version "1.0.6"
-   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
-@@ -1597,6 +2054,17 @@
-   version "0.3.1"
-   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
-
-+copy-concurrently@^1.0.0:
-+  version "1.0.5"
-+  resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
-+  dependencies:
-+    aproba "^1.1.1"
-+    fs-write-stream-atomic "^1.0.8"
-+    iferr "^0.1.5"
-+    mkdirp "^0.5.1"
-+    rimraf "^2.5.4"
-+    run-queue "^1.0.0"
-+
- copy-descriptor@^0.1.0:
-   version "0.1.1"
-   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
-@@ -1718,22 +2186,22 @@
-   version "0.0.4"
-   resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
-
--css-loader@^0.28.5:
--  version "0.28.7"
--  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.7.tgz#5f2ee989dd32edd907717f953317656160999c1b"
-+css-loader@^0.28.11:
-+  version "0.28.11"
-+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.11.tgz#c3f9864a700be2711bb5a2462b2389b1a392dab7"
-   dependencies:
--    babel-code-frame "^6.11.0"
-+    babel-code-frame "^6.26.0"
-     css-selector-tokenizer "^0.7.0"
--    cssnano ">=2.6.1 <4"
-+    cssnano "^3.10.0"
-     icss-utils "^2.1.0"
-     loader-utils "^1.0.2"
-     lodash.camelcase "^4.3.0"
--    object-assign "^4.0.1"
-+    object-assign "^4.1.1"
-     postcss "^5.0.6"
--    postcss-modules-extract-imports "^1.0.0"
--    postcss-modules-local-by-default "^1.0.1"
--    postcss-modules-scope "^1.0.0"
--    postcss-modules-values "^1.1.0"
-+    postcss-modules-extract-imports "^1.2.0"
-+    postcss-modules-local-by-default "^1.2.0"
-+    postcss-modules-scope "^1.1.0"
-+    postcss-modules-values "^1.3.0"
-     postcss-value-parser "^3.3.0"
-     source-list-map "^2.0.0"
-
-@@ -1781,7 +2249,7 @@
-   version "0.1.0"
-   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
-
--"cssnano@>=2.6.1 <4":
-+cssnano@^3.10.0:
-   version "3.10.0"
-   resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38"
-   dependencies:
-@@ -1825,6 +2293,10 @@
-     clap "^1.0.9"
-     source-map "^0.5.3"
-
-+csstype@^2.2.0:
-+  version "2.3.0"
-+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.3.0.tgz#062e141c78345cf814da0e0b716ad777931b08af"
-+
- cuint@^0.2.1:
-   version "0.2.2"
-   resolved "https://registry.yarnpkg.com/cuint/-/cuint-0.2.2.tgz#408086d409550c2631155619e9fa7bcadc3b991b"
-@@ -1835,11 +2307,9 @@
-   dependencies:
-     array-find-index "^1.0.1"
-
--d@1:
--  version "1.0.0"
--  resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
--  dependencies:
--    es5-ext "^0.10.9"
-+cyclist@~0.2.2:
-+  version "0.2.2"
-+  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
-
- dashdash@^1.12.0:
-   version "1.14.1"
-@@ -1851,7 +2321,7 @@
-   version "0.1.4"
-   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
-
--debug@2.6.9, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8:
-+debug@2.6.9, debug@^2.1.2, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
-   version "2.6.9"
-   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-   dependencies:
-@@ -1867,7 +2337,7 @@
-   version "1.0.1"
-   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
-
--decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
-+decamelize@^1.1.1, decamelize@^1.1.2:
-   version "1.2.0"
-   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-
-@@ -1924,6 +2394,13 @@
-   dependencies:
-     is-descriptor "^1.0.0"
-
-+define-property@^2.0.2:
-+  version "2.0.2"
-+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
-+  dependencies:
-+    is-descriptor "^1.0.2"
-+    isobject "^3.0.1"
-+
- defined@^1.0.0:
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
-@@ -1952,6 +2429,10 @@
-   version "1.1.1"
-   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359"
-
-+depd@~1.1.2:
-+  version "1.1.2"
-+  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
-+
- des.js@^1.0.0:
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
-@@ -1969,6 +2450,10 @@
-   dependencies:
-     repeating "^2.0.0"
-
-+detect-libc@^1.0.2:
-+  version "1.0.3"
-+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
-+
- dev-null@^0.1.1:
-   version "0.1.1"
-   resolved "https://registry.yarnpkg.com/dev-null/-/dev-null-0.1.1.tgz#5a205ce3c2b2ef77b6238d6ba179eb74c6a0e818"
-@@ -2009,7 +2494,13 @@
-     parse-color "^1.0.0"
-     sanitize-filename "^1.6.1"
-
--doctrine@^2.0.2, doctrine@^2.1.0:
-+doctrine@^2.0.2:
-+  version "2.0.2"
-+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.2.tgz#68f96ce8efc56cc42651f1faadb4f175273b0075"
-+  dependencies:
-+    esutils "^2.0.2"
-+
-+doctrine@^2.1.0:
-   version "2.1.0"
-   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
-   dependencies:
-@@ -2083,6 +2574,19 @@
-   version "0.1.4"
-   resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
-
-+duplexer@^0.1.1:
-+  version "0.1.1"
-+  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
-+
-+duplexify@^3.4.2, duplexify@^3.5.3:
-+  version "3.5.4"
-+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.4.tgz#4bb46c1796eabebeec4ca9a2e66b808cb7a3d8b4"
-+  dependencies:
-+    end-of-stream "^1.0.0"
-+    inherits "^2.0.1"
-+    readable-stream "^2.0.0"
-+    stream-shift "^1.0.0"
-+
- easy-stack@^1.0.0:
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/easy-stack/-/easy-stack-1.0.0.tgz#12c91b3085a37f0baa336e9486eac4bf94e3e788"
-@@ -2101,7 +2605,7 @@
-   version "2.5.7"
-   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.7.tgz#cc872c168880ae3c7189762fd5ffc00896c9518a"
-
--electron-builder-lib@20.2.0, electron-builder-lib@~20.2.0:
-+electron-builder-lib@20.2.0:
-   version "20.2.0"
-   resolved "https://registry.yarnpkg.com/electron-builder-lib/-/electron-builder-lib-20.2.0.tgz#e8dba288cf26858803eb1800da870d7312837bfa"
-   dependencies:
-@@ -2130,6 +2634,35 @@
-     semver "^5.5.0"
-     temp-file "^3.1.1"
-
-+electron-builder-lib@~20.2.0:
-+  version "20.2.1"
-+  resolved "https://registry.yarnpkg.com/electron-builder-lib/-/electron-builder-lib-20.2.1.tgz#ff8dc6ac7f6f3c676fc370ddafb2aba464a17672"
-+  dependencies:
-+    "7zip-bin" "~3.1.0"
-+    app-builder-bin "1.6.0"
-+    async-exit-hook "^2.0.1"
-+    bluebird-lst "^1.0.5"
-+    builder-util "5.6.1"
-+    builder-util-runtime "4.0.5"
-+    chromium-pickle-js "^0.2.0"
-+    debug "^3.1.0"
-+    ejs "^2.5.7"
-+    electron-osx-sign "0.4.8"
-+    electron-publish "20.2.0"
-+    fs-extra-p "^4.5.2"
-+    hosted-git-info "^2.5.0"
-+    is-ci "^1.1.0"
-+    isbinaryfile "^3.0.2"
-+    js-yaml "^3.10.0"
-+    lazy-val "^1.0.3"
-+    minimatch "^3.0.4"
-+    normalize-package-data "^2.4.0"
-+    plist "^2.1.0"
-+    read-config-file "3.0.0"
-+    sanitize-filename "^1.6.1"
-+    semver "^5.5.0"
-+    temp-file "^3.1.1"
-+
- electron-builder@20.2.0:
-   version "20.2.0"
-   resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.2.0.tgz#aaeaa439cb96c9a3d7ffda25b28130327c982982"
-@@ -2231,8 +2764,8 @@
-     plist "^2.1.0"
-
- electron-packager@^11.0.0:
--  version "11.0.0"
--  resolved "https://registry.yarnpkg.com/electron-packager/-/electron-packager-11.0.0.tgz#3150e0efb831b41df40b28186d9baa64bbb2cc52"
-+  version "11.2.0"
-+  resolved "https://registry.yarnpkg.com/electron-packager/-/electron-packager-11.2.0.tgz#facc17d2b92c10da1bfa1d7c5f58f13774571839"
-   dependencies:
-     asar "^0.14.0"
-     debug "^3.0.0"
-@@ -2247,11 +2780,11 @@
-     pify "^3.0.0"
-     plist "^2.0.0"
-     pruner "^0.0.7"
--    rcedit "^0.9.0"
-+    rcedit "^1.0.0"
-     resolve "^1.1.6"
-     sanitize-filename "^1.6.0"
-     semver "^5.3.0"
--    yargs-parser "^8.0.0"
-+    yargs-parser "^9.0.2"
-
- electron-publish@20.2.0:
-   version "20.2.0"
-@@ -2286,9 +2819,9 @@
-     lodash.template "^4.2.2"
-     temp "^0.8.3"
-
--electron@1.8.3:
--  version "1.8.3"
--  resolved "https://registry.yarnpkg.com/electron/-/electron-1.8.3.tgz#001416ea3a25ce594e317cb5531bc41eadd22f7f"
-+electron@1.8.7:
-+  version "1.8.7"
-+  resolved "https://registry.yarnpkg.com/electron/-/electron-1.8.7.tgz#373c1dc4589d7ab4acd49aff8db4a1c0a6c3bcc1"
-   dependencies:
-     "@types/node" "^8.0.24"
-     electron-download "^3.0.1"
-@@ -2314,6 +2847,10 @@
-   version "1.0.1"
-   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.1.tgz#79e3d58655346909fe6f0f45a5de68103b294d20"
-
-+encodeurl@~1.0.2:
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
-+
- encoding@^0.1.11:
-   version "0.1.12"
-   resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
-@@ -2326,23 +2863,19 @@
-   dependencies:
-     once "^1.4.0"
-
--enhanced-resolve@3.3.0:
--  version "3.3.0"
--  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.3.0.tgz#950964ecc7f0332a42321b673b38dc8ff15535b3"
-+end-of-stream@^1.1.0:
-+  version "1.4.1"
-+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
-   dependencies:
--    graceful-fs "^4.1.2"
--    memory-fs "^0.4.0"
--    object-assign "^4.0.1"
--    tapable "^0.2.5"
-+    once "^1.4.0"
-
--enhanced-resolve@^3.3.0, enhanced-resolve@^3.4.0:
--  version "3.4.1"
--  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz#0421e339fd71419b3da13d129b3979040230476e"
-+enhanced-resolve@^4.0.0:
-+  version "4.0.0"
-+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.0.0.tgz#e34a6eaa790f62fccd71d93959f56b2b432db10a"
-   dependencies:
-     graceful-fs "^4.1.2"
-     memory-fs "^0.4.0"
--    object-assign "^4.0.1"
--    tapable "^0.2.7"
-+    tapable "^1.0.0"
-
- entities@1.0:
-   version "1.0.0"
-@@ -2362,6 +2895,12 @@
-   dependencies:
-     prr "~0.0.0"
-
-+errno@~0.1.7:
-+  version "0.1.7"
-+  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
-+  dependencies:
-+    prr "~1.0.1"
-+
- error-ex@^1.2.0:
-   version "1.3.1"
-   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
-@@ -2386,62 +2925,10 @@
-     is-date-object "^1.0.1"
-     is-symbol "^1.0.1"
-
--es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
--  version "0.10.35"
--  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.35.tgz#18ee858ce6a3c45c7d79e91c15fcca9ec568494f"
--  dependencies:
--    es6-iterator "~2.0.1"
--    es6-symbol "~3.1.1"
--
--es6-iterator@^2.0.1, es6-iterator@~2.0.1:
--  version "2.0.3"
--  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
--  dependencies:
--    d "1"
--    es5-ext "^0.10.35"
--    es6-symbol "^3.1.1"
--
--es6-map@^0.1.3:
--  version "0.1.5"
--  resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0"
--  dependencies:
--    d "1"
--    es5-ext "~0.10.14"
--    es6-iterator "~2.0.1"
--    es6-set "~0.1.5"
--    es6-symbol "~3.1.1"
--    event-emitter "~0.3.5"
--
- es6-promise@^4.0.5:
-   version "4.1.1"
-   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.1.1.tgz#8811e90915d9a0dba36274f0b242dbda78f9c92a"
-
--es6-set@~0.1.5:
--  version "0.1.5"
--  resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
--  dependencies:
--    d "1"
--    es5-ext "~0.10.14"
--    es6-iterator "~2.0.1"
--    es6-symbol "3.1.1"
--    event-emitter "~0.3.5"
--
--es6-symbol@3.1.1, es6-symbol@^3.1.1, es6-symbol@~3.1.1:
--  version "3.1.1"
--  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
--  dependencies:
--    d "1"
--    es5-ext "~0.10.14"
--
--es6-weak-map@^2.0.1:
--  version "2.0.2"
--  resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"
--  dependencies:
--    d "1"
--    es5-ext "^0.10.14"
--    es6-iterator "^2.0.1"
--    es6-symbol "^3.1.1"
--
- escape-html@~1.0.3:
-   version "1.0.3"
-   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
-@@ -2450,15 +2937,6 @@
-   version "1.0.5"
-   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-
--escope@^3.6.0:
--  version "3.6.0"
--  resolved "https://registry.yarnpkg.com/escope/-/escope-3.6.0.tgz#e01975e812781a163a6dadfdd80398dc64c889c3"
--  dependencies:
--    es6-map "^0.1.3"
--    es6-weak-map "^2.0.1"
--    esrecurse "^4.1.0"
--    estraverse "^4.1.1"
--
- eslint-config-prettier@^2.9.0:
-   version "2.9.0"
-   resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-2.9.0.tgz#5ecd65174d486c22dff389fe036febf502d468a3"
-@@ -2491,9 +2969,9 @@
-     jsx-ast-utils "^2.0.1"
-     prop-types "^15.6.0"
-
--eslint-plugin-typescript@^0.10.0:
--  version "0.10.0"
--  resolved "https://registry.yarnpkg.com/eslint-plugin-typescript/-/eslint-plugin-typescript-0.10.0.tgz#009a8fcaf0ec7bf68f6fb71576df0d84ebd0b114"
-+eslint-plugin-typescript@^0.12.0:
-+  version "0.12.0"
-+  resolved "https://registry.yarnpkg.com/eslint-plugin-typescript/-/eslint-plugin-typescript-0.12.0.tgz#e23d58cb27fe28e89fc641a1f20e8d862cb99aef"
-   dependencies:
-     requireindex "~1.1.0"
-
-@@ -2591,13 +3069,6 @@
-   version "1.8.1"
-   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
-
--event-emitter@~0.3.5:
--  version "0.3.5"
--  resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
--  dependencies:
--    d "1"
--    es5-ext "~0.10.14"
--
- event-pubsub@4.3.0:
-   version "4.3.0"
-   resolved "https://registry.yarnpkg.com/event-pubsub/-/event-pubsub-4.3.0.tgz#f68d816bc29f1ec02c539dc58c8dd40ce72cb36e"
-@@ -2629,12 +3100,6 @@
-   version "0.1.2"
-   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
-
--expand-brackets@^0.1.4:
--  version "0.1.5"
--  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
--  dependencies:
--    is-posix-bracket "^0.1.0"
--
- expand-brackets@^2.1.4:
-   version "2.1.4"
-   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
-@@ -2647,17 +3112,46 @@
-     snapdragon "^0.8.1"
-     to-regex "^3.0.1"
-
--expand-range@^1.8.1:
--  version "1.8.2"
--  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
-+express@^4.15.0:
-+  version "4.16.2"
-+  resolved "https://registry.yarnpkg.com/express/-/express-4.16.2.tgz#e35c6dfe2d64b7dca0a5cd4f21781be3299e076c"
-   dependencies:
--    fill-range "^2.1.0"
-+    accepts "~1.3.4"
-+    array-flatten "1.1.1"
-+    body-parser "1.18.2"
-+    content-disposition "0.5.2"
-+    content-type "~1.0.4"
-+    cookie "0.3.1"
-+    cookie-signature "1.0.6"
-+    debug "2.6.9"
-+    depd "~1.1.1"
-+    encodeurl "~1.0.1"
-+    escape-html "~1.0.3"
-+    etag "~1.8.1"
-+    finalhandler "1.1.0"
-+    fresh "0.5.2"
-+    merge-descriptors "1.0.1"
-+    methods "~1.1.2"
-+    on-finished "~2.3.0"
-+    parseurl "~1.3.2"
-+    path-to-regexp "0.1.7"
-+    proxy-addr "~2.0.2"
-+    qs "6.5.1"
-+    range-parser "~1.2.0"
-+    safe-buffer "5.1.1"
-+    send "0.16.1"
-+    serve-static "1.13.1"
-+    setprototypeof "1.1.0"
-+    statuses "~1.3.1"
-+    type-is "~1.6.15"
-+    utils-merge "1.0.1"
-+    vary "~1.1.2"
-
--express@^4.15.0:
--  version "4.16.2"
--  resolved "https://registry.yarnpkg.com/express/-/express-4.16.2.tgz#e35c6dfe2d64b7dca0a5cd4f21781be3299e076c"
-+express@^4.16.2:
-+  version "4.16.3"
-+  resolved "https://registry.yarnpkg.com/express/-/express-4.16.3.tgz#6af8a502350db3246ecc4becf6b5a34d22f7ed53"
-   dependencies:
--    accepts "~1.3.4"
-+    accepts "~1.3.5"
-     array-flatten "1.1.1"
-     body-parser "1.18.2"
-     content-disposition "0.5.2"
-@@ -2665,26 +3159,26 @@
-     cookie "0.3.1"
-     cookie-signature "1.0.6"
-     debug "2.6.9"
--    depd "~1.1.1"
--    encodeurl "~1.0.1"
-+    depd "~1.1.2"
-+    encodeurl "~1.0.2"
-     escape-html "~1.0.3"
-     etag "~1.8.1"
--    finalhandler "1.1.0"
-+    finalhandler "1.1.1"
-     fresh "0.5.2"
-     merge-descriptors "1.0.1"
-     methods "~1.1.2"
-     on-finished "~2.3.0"
-     parseurl "~1.3.2"
-     path-to-regexp "0.1.7"
--    proxy-addr "~2.0.2"
-+    proxy-addr "~2.0.3"
-     qs "6.5.1"
-     range-parser "~1.2.0"
-     safe-buffer "5.1.1"
--    send "0.16.1"
--    serve-static "1.13.1"
-+    send "0.16.2"
-+    serve-static "1.13.2"
-     setprototypeof "1.1.0"
--    statuses "~1.3.1"
--    type-is "~1.6.15"
-+    statuses "~1.4.0"
-+    type-is "~1.6.16"
-     utils-merge "1.0.1"
-     vary "~1.1.2"
-
-@@ -2694,6 +3188,13 @@
-   dependencies:
-     is-extendable "^0.1.0"
-
-+extend-shallow@^3.0.2:
-+  version "3.0.2"
-+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
-+  dependencies:
-+    assign-symbols "^1.0.0"
-+    is-extendable "^1.0.1"
-+
- extend@~3.0.0, extend@~3.0.1:
-   version "3.0.1"
-   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
-@@ -2706,15 +3207,9 @@
-     jschardet "^1.4.2"
-     tmp "^0.0.33"
-
--extglob@^0.3.1:
--  version "0.3.2"
--  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
--  dependencies:
--    is-extglob "^1.0.0"
--
--extglob@^2.0.2:
--  version "2.0.2"
--  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.2.tgz#3290f46208db1b2e8eb8be0c94ed9e6ad80edbe2"
-+extglob@^2.0.4:
-+  version "2.0.4"
-+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
-   dependencies:
-     array-unique "^0.3.2"
-     define-property "^1.0.0"
-@@ -2725,15 +3220,6 @@
-     snapdragon "^0.8.1"
-     to-regex "^3.0.1"
-
--extract-text-webpack-plugin@^3.0.0:
--  version "3.0.2"
--  resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.2.tgz#5f043eaa02f9750a9258b78c0a6e0dc1408fb2f7"
--  dependencies:
--    async "^2.4.1"
--    loader-utils "^1.1.0"
--    schema-utils "^0.3.0"
--    webpack-sources "^1.0.1"
--
- extract-zip@^1.0.3, extract-zip@^1.6.5:
-   version "1.6.6"
-   resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.6.tgz#1290ede8d20d0872b429fd3f351ca128ec5ef85c"
-@@ -2751,6 +3237,10 @@
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff"
-
-+fast-deep-equal@^2.0.1:
-+  version "2.0.1"
-+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
-+
- fast-diff@^1.1.1:
-   version "1.1.2"
-   resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.1.2.tgz#4b62c42b8e03de3f848460b639079920695d0154"
-@@ -2798,19 +3288,9 @@
-     flat-cache "^1.2.1"
-     object-assign "^4.0.1"
-
--filename-regex@^2.0.0:
--  version "2.0.1"
--  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
--
--fill-range@^2.1.0:
--  version "2.2.3"
--  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
--  dependencies:
--    is-number "^2.1.0"
--    isobject "^2.0.0"
--    randomatic "^1.1.3"
--    repeat-element "^1.1.2"
--    repeat-string "^1.5.2"
-+filesize@^3.5.11:
-+  version "3.6.1"
-+  resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317"
-
- fill-range@^4.0.0:
-   version "4.0.0"
-@@ -2833,6 +3313,26 @@
-     statuses "~1.3.1"
-     unpipe "~1.0.0"
-
-+finalhandler@1.1.1:
-+  version "1.1.1"
-+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
-+  dependencies:
-+    debug "2.6.9"
-+    encodeurl "~1.0.2"
-+    escape-html "~1.0.3"
-+    on-finished "~2.3.0"
-+    parseurl "~1.3.2"
-+    statuses "~1.4.0"
-+    unpipe "~1.0.0"
-+
-+find-cache-dir@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
-+  dependencies:
-+    commondir "^1.0.1"
-+    make-dir "^1.0.0"
-+    pkg-dir "^2.0.0"
-+
- find-up@^1.0.0:
-   version "1.1.2"
-   resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
-@@ -2859,6 +3359,13 @@
-   version "1.0.2"
-   resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
-
-+flush-write-stream@^1.0.0:
-+  version "1.0.3"
-+  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.3.tgz#c5d586ef38af6097650b49bc41b55fabb19f35bd"
-+  dependencies:
-+    inherits "^2.0.1"
-+    readable-stream "^2.0.4"
-+
- for-in@^0.1.3:
-   version "0.1.8"
-   resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"
-@@ -2867,12 +3374,6 @@
-   version "1.0.2"
-   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-
--for-own@^0.1.4:
--  version "0.1.5"
--  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
--  dependencies:
--    for-in "^1.0.1"
--
- for-own@^1.0.0:
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
-@@ -2917,6 +3418,19 @@
-   version "0.5.2"
-   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
-
-+from2@^2.1.0:
-+  version "2.3.0"
-+  resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
-+  dependencies:
-+    inherits "^2.0.1"
-+    readable-stream "^2.0.0"
-+
-+front-matter@^2.3.0:
-+  version "2.3.0"
-+  resolved "https://registry.yarnpkg.com/front-matter/-/front-matter-2.3.0.tgz#7203af896ce357ee04e2aa45169ea91ed7f67504"
-+  dependencies:
-+    js-yaml "^3.10.0"
-+
- fs-extra-p@^4.5.0:
-   version "4.5.0"
-   resolved "https://registry.yarnpkg.com/fs-extra-p/-/fs-extra-p-4.5.0.tgz#b79f3f3fcc0b5e57b7e7caeb06159f958ef15fe8"
-@@ -2951,7 +3465,7 @@
-     path-is-absolute "^1.0.0"
-     rimraf "^2.2.8"
-
--fs-extra@^2.0.0, fs-extra@^2.1.2:
-+fs-extra@^2.0.0:
-   version "2.1.2"
-   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-2.1.2.tgz#046c70163cef9aad46b0e4a7fa467fb22d71de35"
-   dependencies:
-@@ -2982,30 +3496,41 @@
-     jsonfile "^4.0.0"
-     universalify "^0.1.0"
-
--fs-readdir-recursive@^1.0.0:
--  version "1.0.0"
--  resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.0.0.tgz#8cd1745c8b4f8a29c8caec392476921ba195f560"
-+fs-extra@^6.0.0:
-+  version "6.0.0"
-+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-6.0.0.tgz#0f0afb290bb3deb87978da816fcd3c7797f3a817"
-+  dependencies:
-+    graceful-fs "^4.1.2"
-+    jsonfile "^4.0.0"
-+    universalify "^0.1.0"
-+
-+fs-minipass@^1.2.5:
-+  version "1.2.5"
-+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
-+  dependencies:
-+    minipass "^2.2.1"
-+
-+fs-write-stream-atomic@^1.0.8:
-+  version "1.0.10"
-+  resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
-+  dependencies:
-+    graceful-fs "^4.1.2"
-+    iferr "^0.1.5"
-+    imurmurhash "^0.1.4"
-+    readable-stream "1 || 2"
-
- fs.realpath@^1.0.0:
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-
--fsevents@^1.0.0:
--  version "1.1.2"
--  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.2.tgz#3282b713fb3ad80ede0e9fcf4611b5aa6fc033f4"
--  dependencies:
--    nan "^2.3.0"
--    node-pre-gyp "^0.6.36"
--
--fstream-ignore@^1.0.5:
--  version "1.0.5"
--  resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105"
-+fsevents@^1.1.2:
-+  version "1.2.3"
-+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.3.tgz#08292982e7059f6674c93d8b829c1e8604979ac0"
-   dependencies:
--    fstream "^1.0.0"
--    inherits "2"
--    minimatch "^3.0.0"
-+    nan "^2.9.2"
-+    node-pre-gyp "^0.9.0"
-
--fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2:
-+fstream@^1.0.0, fstream@^1.0.2:
-   version "1.0.11"
-   resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
-   dependencies:
-@@ -3098,18 +3623,12 @@
-   version "1.0.2"
-   resolved "https://registry.yarnpkg.com/github-url-from-username-repo/-/github-url-from-username-repo-1.0.2.tgz#7dd79330d2abe69c10c2cef79714c97215791dfa"
-
--glob-base@^0.3.0:
--  version "0.3.0"
--  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
--  dependencies:
--    glob-parent "^2.0.0"
--    is-glob "^2.0.0"
--
--glob-parent@^2.0.0:
--  version "2.0.0"
--  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
-+glob-parent@^3.1.0:
-+  version "3.1.0"
-+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
-   dependencies:
--    is-glob "^2.0.0"
-+    is-glob "^3.1.0"
-+    path-dirname "^1.0.0"
-
- glob@7.1.2, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1:
-   version "7.1.2"
-@@ -3205,6 +3724,13 @@
-   version "1.10.3"
-   resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.3.tgz#1926ba90cf3edfe2adb4927f5880bc22c66c790f"
-
-+gzip-size@^4.1.0:
-+  version "4.1.0"
-+  resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-4.1.0.tgz#8ae096257eabe7d69c45be2b67c448124ffb517c"
-+  dependencies:
-+    duplexer "^0.1.1"
-+    pify "^3.0.0"
-+
- har-schema@^1.0.5:
-   version "1.0.5"
-   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
-@@ -3250,6 +3776,10 @@
-   version "2.0.0"
-   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
-
-+has-flag@^3.0.0:
-+  version "3.0.0"
-+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-+
- has-unicode@^2.0.0:
-   version "2.0.1"
-   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-@@ -3307,7 +3837,7 @@
-     inherits "^2.0.3"
-     minimalistic-assert "^1.0.0"
-
--hawk@3.1.3, hawk@~3.1.3:
-+hawk@~3.1.3:
-   version "3.1.3"
-   resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
-   dependencies:
-@@ -3381,16 +3911,17 @@
-     relateurl "0.2.x"
-     uglify-js "3.1.x"
-
--html-webpack-plugin@^2.30.1:
--  version "2.30.1"
--  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-2.30.1.tgz#7f9c421b7ea91ec460f56527d78df484ee7537d5"
-+html-webpack-plugin@^3.2.0:
-+  version "3.2.0"
-+  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz#b01abbd723acaaa7b37b6af4492ebda03d9dd37b"
-   dependencies:
--    bluebird "^3.4.7"
-     html-minifier "^3.2.3"
-     loader-utils "^0.2.16"
-     lodash "^4.17.3"
-     pretty-error "^2.0.2"
-+    tapable "^1.0.0"
-     toposort "^1.0.0"
-+    util.promisify "1.0.0"
-
- htmlparser2@3.8.x:
-   version "3.8.3"
-@@ -3444,6 +3975,12 @@
-   version "0.4.19"
-   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
-
-+iconv-lite@^0.4.4:
-+  version "0.4.21"
-+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.21.tgz#c47f8733d02171189ebc4a400f3218d348094798"
-+  dependencies:
-+    safer-buffer "^2.1.0"
-+
- icss-replace-symbols@^1.1.0:
-   version "1.1.0"
-   resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
-@@ -3458,6 +3995,16 @@
-   version "1.1.8"
-   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
-
-+iferr@^0.1.5:
-+  version "0.1.5"
-+  resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
-+
-+ignore-walk@^3.0.1:
-+  version "3.0.1"
-+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
-+  dependencies:
-+    minimatch "^3.0.4"
-+
- ignore@^3.3.3:
-   version "3.3.7"
-   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
-@@ -3544,7 +4091,7 @@
-     strip-ansi "^3.0.0"
-     through "^2.3.6"
-
--interpret@^1.0.0, interpret@^1.0.1:
-+interpret@^1.0.1:
-   version "1.0.4"
-   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.4.tgz#820cdd588b868ffb191a809506d6c9c8f212b1b0"
-
-@@ -3562,6 +4109,10 @@
-   version "1.5.2"
-   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.5.2.tgz#d4b505bde9946987ccf0fc58d9010ff9607e3fa0"
-
-+ipaddr.js@1.6.0:
-+  version "1.6.0"
-+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.6.0.tgz#e3fa357b773da619f26e95f049d055c72796f86b"
-+
- is-absolute-url@^2.0.0:
-   version "2.1.0"
-   resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
-@@ -3572,6 +4123,12 @@
-   dependencies:
-     kind-of "^3.0.2"
-
-+is-accessor-descriptor@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
-+  dependencies:
-+    kind-of "^6.0.0"
-+
- is-arrayish@^0.2.1:
-   version "0.2.1"
-   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-@@ -3582,7 +4139,7 @@
-   dependencies:
-     binary-extensions "^1.0.0"
-
--is-buffer@^1.0.2, is-buffer@^1.1.5:
-+is-buffer@^1.1.5:
-   version "1.1.6"
-   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-
-@@ -3608,6 +4165,12 @@
-   dependencies:
-     kind-of "^3.0.2"
-
-+is-data-descriptor@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
-+  dependencies:
-+    kind-of "^6.0.0"
-+
- is-date-object@^1.0.1:
-   version "1.0.1"
-   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
-@@ -3628,27 +4191,31 @@
-     is-data-descriptor "^0.1.4"
-     kind-of "^5.0.0"
-
--is-dotfile@^1.0.0:
--  version "1.0.3"
--  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
-+is-descriptor@^1.0.2:
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
-+  dependencies:
-+    is-accessor-descriptor "^1.0.0"
-+    is-data-descriptor "^1.0.0"
-+    kind-of "^6.0.2"
-
- is-electron-renderer@^2.0.0:
-   version "2.0.1"
-   resolved "https://registry.yarnpkg.com/is-electron-renderer/-/is-electron-renderer-2.0.1.tgz#a469d056f975697c58c98c6023eb0aa79af895a2"
-
--is-equal-shallow@^0.1.3:
--  version "0.1.3"
--  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
--  dependencies:
--    is-primitive "^2.0.0"
--
- is-extendable@^0.1.0, is-extendable@^0.1.1:
-   version "0.1.1"
-   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
-
--is-extglob@^1.0.0:
--  version "1.0.0"
--  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
-+is-extendable@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
-+  dependencies:
-+    is-plain-object "^2.0.4"
-+
-+is-extglob@^2.1.0, is-extglob@^2.1.1:
-+  version "2.1.1"
-+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-
- is-finite@^1.0.0:
-   version "1.0.2"
-@@ -3666,11 +4233,17 @@
-   version "2.0.0"
-   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-
--is-glob@^2.0.0, is-glob@^2.0.1:
--  version "2.0.1"
--  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
-+is-glob@^3.1.0:
-+  version "3.1.0"
-+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
-   dependencies:
--    is-extglob "^1.0.0"
-+    is-extglob "^2.1.0"
-+
-+is-glob@^4.0.0:
-+  version "4.0.0"
-+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0"
-+  dependencies:
-+    is-extglob "^2.1.1"
-
- is-installed-globally@^0.1.0:
-   version "0.1.0"
-@@ -3692,27 +4265,25 @@
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4"
-
--is-number@^2.1.0:
--  version "2.1.0"
--  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
--  dependencies:
--    kind-of "^3.0.2"
--
- is-number@^3.0.0:
-   version "3.0.0"
-   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
-   dependencies:
-     kind-of "^3.0.2"
-
-+is-number@^4.0.0:
-+  version "4.0.0"
-+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
-+
- is-obj@^1.0.0:
-   version "1.0.1"
-   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
-
--is-odd@^1.0.0:
--  version "1.0.0"
--  resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-1.0.0.tgz#3b8a932eb028b3775c39bb09e91767accdb69088"
-+is-odd@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-2.0.0.tgz#7646624671fd7ea558ccd9a2795182f2958f1b24"
-   dependencies:
--    is-number "^3.0.0"
-+    is-number "^4.0.0"
-
- is-path-cwd@^1.0.0:
-   version "1.0.0"
-@@ -3734,20 +4305,12 @@
-   version "1.1.0"
-   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
-
--is-plain-object@^2.0.1, is-plain-object@^2.0.3:
-+is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
-   version "2.0.4"
-   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
-   dependencies:
-     isobject "^3.0.1"
-
--is-posix-bracket@^0.1.0:
--  version "0.1.1"
--  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
--
--is-primitive@^2.0.0:
--  version "2.0.0"
--  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
--
- is-promise@^2.1.0:
-   version "2.1.0"
-   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
-@@ -3806,6 +4369,10 @@
-   version "1.0.1"
-   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.1.tgz#310db70f742d259a16a369202b51af84233310d9"
-
-+is-windows@^1.0.2:
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
-+
- isarray@0.0.1:
-   version "0.0.1"
-   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-@@ -3880,7 +4447,7 @@
-     argparse "^1.0.7"
-     esprima "^4.0.0"
-
--js-yaml@^3.7.0:
-+js-yaml@^3.11.0, js-yaml@^3.7.0:
-   version "3.11.0"
-   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.11.0.tgz#597c1a8bd57152f26d622ce4117851a51f5ebaef"
-   dependencies:
-@@ -3923,10 +4490,6 @@
-     shelljs "0.3.x"
-     strip-json-comments "1.0.x"
-
--json-loader@^0.5.4:
--  version "0.5.7"
--  resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d"
--
- json-parse-helpfulerror@^1.0.2:
-   version "1.0.3"
-   resolved "https://registry.yarnpkg.com/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz#13f14ce02eed4e981297b64eb9e3b932e2dd13dc"
-@@ -3998,13 +4561,7 @@
-   dependencies:
-     array-includes "^3.0.3"
-
--kind-of@^2.0.1:
--  version "2.0.1"
--  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-2.0.1.tgz#018ec7a4ce7e3a86cb9141be519d24c8faa981b5"
--  dependencies:
--    is-buffer "^1.0.2"
--
--kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0, kind-of@^3.2.2:
-+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
-   version "3.2.2"
-   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
-   dependencies:
-@@ -4016,7 +4573,7 @@
-   dependencies:
-     is-buffer "^1.1.5"
-
--kind-of@^5.0.0, kind-of@^5.0.2:
-+kind-of@^5.0.0:
-   version "5.1.0"
-   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
-
-@@ -4024,6 +4581,10 @@
-   version "6.0.0"
-   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.0.tgz#3606e9e2fa960e7ddaa8898c03804e47e5d66644"
-
-+kind-of@^6.0.2:
-+  version "6.0.2"
-+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
-+
- klaw-sync@^3.0.0:
-   version "3.0.2"
-   resolved "https://registry.yarnpkg.com/klaw-sync/-/klaw-sync-3.0.2.tgz#bf3a5ca463af5aec007201dbe8be7088ef29d067"
-@@ -4042,14 +4603,6 @@
-   dependencies:
-     package-json "^4.0.0"
-
--lazy-cache@^0.2.3:
--  version "0.2.7"
--  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-0.2.7.tgz#7feddf2dcb6edb77d11ef1d117ab5ffdf0ab1b65"
--
--lazy-cache@^1.0.3:
--  version "1.0.4"
--  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
--
- lazy-cache@^2.0.2:
-   version "2.0.2"
-   resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-2.0.2.tgz#b9190a4f913354694840859f8a8f7084d8822264"
-@@ -4072,6 +4625,10 @@
-   dependencies:
-     invert-kv "^1.0.0"
-
-+leb@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/leb/-/leb-0.3.0.tgz#32bee9fad168328d6aea8522d833f4180eed1da3"
-+
- legal-eagle@0.15.0:
-   version "0.15.0"
-   resolved "https://registry.yarnpkg.com/legal-eagle/-/legal-eagle-0.15.0.tgz#826b47475c948543b803a82baa2907a350449e04"
-@@ -4118,7 +4675,7 @@
-     json5 "^0.5.0"
-     object-assign "^4.0.1"
-
--loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.0.3, loader-utils@^1.1.0:
-+loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
-   version "1.1.0"
-   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
-   dependencies:
-@@ -4210,6 +4767,10 @@
-   version "4.17.4"
-   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
-
-+lodash@^4.17.5:
-+  version "4.17.10"
-+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
-+
- log-symbols@^2.1.0:
-   version "2.1.0"
-   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.1.0.tgz#f35fa60e278832b538dc4dddcbb478a45d3e3be6"
-@@ -4220,9 +4781,9 @@
-   version "1.0.1"
-   resolved "https://registry.yarnpkg.com/loglevelnext/-/loglevelnext-1.0.1.tgz#8b17b5a43395338a96c67911a962c44af466d1c8"
-
--longest@^1.0.1:
--  version "1.0.1"
--  resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
-+long@^3.2.0:
-+  version "3.2.0"
-+  resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b"
-
- loose-envify@^1.0.0, loose-envify@^1.3.1:
-   version "1.3.1"
-@@ -4252,6 +4813,13 @@
-     pseudomap "^1.0.2"
-     yallist "^2.1.2"
-
-+lru-cache@^4.1.1:
-+  version "4.1.2"
-+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.2.tgz#45234b2e6e2f2b33da125624c4664929a0224c3f"
-+  dependencies:
-+    pseudomap "^1.0.2"
-+    yallist "^2.1.2"
-+
- macaddress@^0.2.8:
-   version "0.2.8"
-   resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12"
-@@ -4331,41 +4899,23 @@
-   version "1.1.2"
-   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
-
--micromatch@^2.1.5:
--  version "2.3.11"
--  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
--  dependencies:
--    arr-diff "^2.0.0"
--    array-unique "^0.2.1"
--    braces "^1.8.2"
--    expand-brackets "^0.1.4"
--    extglob "^0.3.1"
--    filename-regex "^2.0.0"
--    is-extglob "^1.0.0"
--    is-glob "^2.0.1"
--    kind-of "^3.0.2"
--    normalize-path "^2.0.1"
--    object.omit "^2.0.0"
--    parse-glob "^3.0.4"
--    regex-cache "^0.4.2"
--
--micromatch@^3.0.3:
--  version "3.1.4"
--  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.4.tgz#bb812e741a41f982c854e42b421a7eac458796f4"
-+micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9:
-+  version "3.1.10"
-+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
-   dependencies:
-     arr-diff "^4.0.0"
-     array-unique "^0.3.2"
--    braces "^2.3.0"
--    define-property "^1.0.0"
--    extend-shallow "^2.0.1"
--    extglob "^2.0.2"
-+    braces "^2.3.1"
-+    define-property "^2.0.2"
-+    extend-shallow "^3.0.2"
-+    extglob "^2.0.4"
-     fragment-cache "^0.2.1"
--    kind-of "^6.0.0"
--    nanomatch "^1.2.5"
-+    kind-of "^6.0.2"
-+    nanomatch "^1.2.9"
-     object.pick "^1.3.0"
-     regex-not "^1.0.0"
-     snapdragon "^0.8.1"
--    to-regex "^3.0.1"
-+    to-regex "^3.0.2"
-
- miller-rabin@^4.0.0:
-   version "4.0.1"
-@@ -4378,12 +4928,22 @@
-   version "1.30.0"
-   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
-
-+mime-db@~1.33.0:
-+  version "1.33.0"
-+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
-+
- mime-types@^2.1.12, mime-types@~2.1.15, mime-types@~2.1.16, mime-types@~2.1.17, mime-types@~2.1.7:
-   version "2.1.17"
-   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
-   dependencies:
-     mime-db "~1.30.0"
-
-+mime-types@~2.1.18:
-+  version "2.1.18"
-+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
-+  dependencies:
-+    mime-db "~1.33.0"
-+
- mime@1.4.1:
-   version "1.4.1"
-   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
-@@ -4393,13 +4953,20 @@
-   resolved "https://registry.yarnpkg.com/mime/-/mime-2.1.0.tgz#1022a5ada445aa30686e4059abaea83d0b4e8f9c"
-
- mime@^2.2.0:
--  version "2.2.0"
--  resolved "https://registry.yarnpkg.com/mime/-/mime-2.2.0.tgz#161e541965551d3b549fa1114391e3a3d55b923b"
-+  version "2.2.2"
-+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.2.2.tgz#6b4c109d88031d7b5c23635f5b923da336d79121"
-
- mimic-fn@^1.0.0:
-   version "1.1.0"
-   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
-
-+mini-css-extract-plugin@^0.4.0:
-+  version "0.4.0"
-+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.0.tgz#ff3bf08bee96e618e177c16ca6131bfecef707f9"
-+  dependencies:
-+    loader-utils "^1.1.0"
-+    webpack-sources "^1.1.0"
-+
- minimalistic-assert@^1.0.0:
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3"
-@@ -4426,6 +4993,34 @@
-   version "0.0.10"
-   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
-
-+minipass@^2.2.1, minipass@^2.2.4:
-+  version "2.2.4"
-+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.2.4.tgz#03c824d84551ec38a8d1bb5bc350a5a30a354a40"
-+  dependencies:
-+    safe-buffer "^5.1.1"
-+    yallist "^3.0.0"
-+
-+minizlib@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb"
-+  dependencies:
-+    minipass "^2.2.1"
-+
-+mississippi@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
-+  dependencies:
-+    concat-stream "^1.5.0"
-+    duplexify "^3.4.2"
-+    end-of-stream "^1.1.0"
-+    flush-write-stream "^1.0.0"
-+    from2 "^2.1.0"
-+    parallel-transform "^1.1.0"
-+    pump "^2.0.1"
-+    pumpify "^1.3.3"
-+    stream-each "^1.1.0"
-+    through2 "^2.0.0"
-+
- mixin-deep@^1.2.0:
-   version "1.2.0"
-   resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.2.0.tgz#d02b8c6f8b6d4b8f5982d3fd009c4919851c3fe2"
-@@ -4465,8 +5060,8 @@
-     request "^2.79.0"
-
- mocha@^5.0.1, mocha@^5.0.4:
--  version "5.0.4"
--  resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.0.4.tgz#6b7aa328472da1088e69d47e75925fd3a3bb63c6"
-+  version "5.0.5"
-+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.0.5.tgz#e228e3386b9387a4710007a641f127b00be44b52"
-   dependencies:
-     browser-stdout "1.3.1"
-     commander "2.11.0"
-@@ -4479,6 +5074,17 @@
-     mkdirp "0.5.1"
-     supports-color "4.4.0"
-
-+move-concurrently@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
-+  dependencies:
-+    aproba "^1.1.1"
-+    copy-concurrently "^1.0.0"
-+    fs-write-stream-atomic "^1.0.8"
-+    mkdirp "^0.5.1"
-+    rimraf "^2.5.4"
-+    run-queue "^1.0.3"
-+
- ms@2.0.0:
-   version "2.0.0"
-   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-@@ -4495,21 +5101,26 @@
-     object-assign "^4.0.1"
-     thenify-all "^1.0.0"
-
--nan@^2.3.0, nan@^2.3.2:
-+nan@^2.3.2:
-   version "2.7.0"
-   resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46"
-
--nanomatch@^1.2.5:
--  version "1.2.5"
--  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.5.tgz#5c9ab02475c76676275731b0bf0a7395c624a9c4"
-+nan@^2.9.2:
-+  version "2.10.0"
-+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
-+
-+nanomatch@^1.2.9:
-+  version "1.2.9"
-+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.9.tgz#879f7150cb2dab7a471259066c104eee6e0fa7c2"
-   dependencies:
-     arr-diff "^4.0.0"
-     array-unique "^0.3.2"
--    define-property "^1.0.0"
--    extend-shallow "^2.0.1"
-+    define-property "^2.0.2"
-+    extend-shallow "^3.0.2"
-     fragment-cache "^0.2.1"
--    is-odd "^1.0.0"
--    kind-of "^5.0.2"
-+    is-odd "^2.0.0"
-+    is-windows "^1.0.2"
-+    kind-of "^6.0.2"
-     object.pick "^1.3.0"
-     regex-not "^1.0.0"
-     snapdragon "^0.8.1"
-@@ -4529,10 +5140,22 @@
-   dependencies:
-     xml-char-classes "^1.0.0"
-
-+needle@^2.2.0:
-+  version "2.2.1"
-+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.1.tgz#b5e325bd3aae8c2678902fa296f729455d1d3a7d"
-+  dependencies:
-+    debug "^2.1.2"
-+    iconv-lite "^0.4.4"
-+    sax "^1.2.4"
-+
- negotiator@0.6.1:
-   version "0.6.1"
-   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
-
-+neo-async@^2.5.0:
-+  version "2.5.1"
-+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.1.tgz#acb909e327b1e87ec9ef15f41b8a269512ad41ee"
-+
- no-case@^2.2.0:
-   version "2.3.2"
-   resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac"
-@@ -4600,26 +5223,20 @@
-     util "^0.10.3"
-     vm-browserify "0.0.4"
-
--node-native-loader@^1.1.1:
--  version "1.1.1"
--  resolved "https://registry.yarnpkg.com/node-native-loader/-/node-native-loader-1.1.1.tgz#ff1c2072f795947b3dde1da2f5412451ef564337"
--  dependencies:
--    loader-utils "^1.0.3"
--
--node-pre-gyp@^0.6.36:
--  version "0.6.38"
--  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.38.tgz#e92a20f83416415bb4086f6d1fb78b3da73d113d"
-+node-pre-gyp@^0.9.0:
-+  version "0.9.1"
-+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.9.1.tgz#f11c07516dd92f87199dbc7e1838eab7cd56c9e0"
-   dependencies:
--    hawk "3.1.3"
-+    detect-libc "^1.0.2"
-     mkdirp "^0.5.1"
-+    needle "^2.2.0"
-     nopt "^4.0.1"
-+    npm-packlist "^1.1.6"
-     npmlog "^4.0.2"
-     rc "^1.1.7"
--    request "2.81.0"
-     rimraf "^2.6.1"
-     semver "^5.3.0"
--    tar "^2.2.1"
--    tar-pack "^3.4.0"
-+    tar "^4"
-
- node-sass@^4.7.2:
-   version "4.7.2"
-@@ -4688,7 +5305,7 @@
-     semver "2 || 3 || 4 || 5"
-     validate-npm-package-license "^3.0.1"
-
--normalize-path@^2.0.0, normalize-path@^2.0.1:
-+normalize-path@^2.0.0, normalize-path@^2.1.1:
-   version "2.1.1"
-   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
-   dependencies:
-@@ -4707,10 +5324,21 @@
-     query-string "^4.1.0"
-     sort-keys "^1.0.0"
-
-+npm-bundled@^1.0.1:
-+  version "1.0.3"
-+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.3.tgz#7e71703d973af3370a9591bafe3a63aca0be2308"
-+
- npm-install-package@~2.1.0:
-   version "2.1.0"
-   resolved "https://registry.yarnpkg.com/npm-install-package/-/npm-install-package-2.1.0.tgz#d7efe3cfcd7ab00614b896ea53119dc9ab259125"
-
-+npm-packlist@^1.1.6:
-+  version "1.1.10"
-+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.10.tgz#1039db9e985727e464df066f4cf0ab6ef85c398a"
-+  dependencies:
-+    ignore-walk "^3.0.1"
-+    npm-bundled "^1.0.1"
-+
- npm-run-path@^2.0.0:
-   version "2.0.2"
-   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
-@@ -4789,13 +5417,6 @@
-     define-properties "^1.1.2"
-     es-abstract "^1.5.1"
-
--object.omit@^2.0.0:
--  version "2.0.1"
--  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
--  dependencies:
--    for-own "^0.1.4"
--    is-extendable "^0.1.1"
--
- object.pick@^1.3.0:
-   version "1.3.0"
-   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
-@@ -4814,7 +5435,7 @@
-   dependencies:
-     ee-first "1.1.1"
-
--once@^1.3.0, once@^1.3.3, once@^1.4.0:
-+once@^1.3.0, once@^1.3.1, once@^1.4.0:
-   version "1.4.0"
-   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-   dependencies:
-@@ -4826,6 +5447,10 @@
-   dependencies:
-     mimic-fn "^1.0.0"
-
-+opener@^1.4.3:
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/opener/-/opener-1.4.3.tgz#5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"
-+
- optimist@~0.6.1:
-   version "0.6.1"
-   resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
-@@ -4904,9 +5529,17 @@
-   version "0.2.9"
-   resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
-
--parallel-webpack@^2.1.0:
--  version "2.2.0"
--  resolved "https://registry.yarnpkg.com/parallel-webpack/-/parallel-webpack-2.2.0.tgz#7171440b684444610ba890d32439a33666ab46cb"
-+parallel-transform@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz#d410f065b05da23081fcd10f28854c29bda33b06"
-+  dependencies:
-+    cyclist "~0.2.2"
-+    inherits "^2.0.3"
-+    readable-stream "^2.1.5"
-+
-+parallel-webpack@^2.3.0:
-+  version "2.3.0"
-+  resolved "https://registry.yarnpkg.com/parallel-webpack/-/parallel-webpack-2.3.0.tgz#a614625e25647cea9655918cb80cf829fa674ff8"
-   dependencies:
-     ajv "^4.9.2"
-     bluebird "^3.0.6"
-@@ -4949,15 +5582,6 @@
-   dependencies:
-     color-convert "~0.5.0"
-
--parse-glob@^3.0.4:
--  version "3.0.4"
--  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
--  dependencies:
--    glob-base "^0.3.0"
--    is-dotfile "^1.0.0"
--    is-extglob "^1.0.0"
--    is-glob "^2.0.0"
--
- parse-json@^2.2.0:
-   version "2.2.0"
-   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
-@@ -4976,6 +5600,10 @@
-   version "0.0.0"
-   resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
-
-+path-dirname@^1.0.0:
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
-+
- path-exists@^2.0.0, path-exists@^2.1.0:
-   version "2.1.0"
-   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
-@@ -5064,6 +5692,12 @@
-   version "2.0.4"
-   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-
-+pkg-dir@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
-+  dependencies:
-+    find-up "^2.1.0"
-+
- plist@^2.0.0, plist@^2.1.0:
-   version "2.1.0"
-   resolved "https://registry.yarnpkg.com/plist/-/plist-2.1.0.tgz#57ccdb7a0821df21831217a3cad54e3e146a1025"
-@@ -5206,27 +5840,27 @@
-     postcss "^5.0.14"
-     postcss-selector-parser "^2.0.0"
-
--postcss-modules-extract-imports@^1.0.0:
-+postcss-modules-extract-imports@^1.2.0:
-   version "1.2.0"
-   resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.0.tgz#66140ecece38ef06bf0d3e355d69bf59d141ea85"
-   dependencies:
-     postcss "^6.0.1"
-
--postcss-modules-local-by-default@^1.0.1:
-+postcss-modules-local-by-default@^1.2.0:
-   version "1.2.0"
-   resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069"
-   dependencies:
-     css-selector-tokenizer "^0.7.0"
-     postcss "^6.0.1"
-
--postcss-modules-scope@^1.0.0:
-+postcss-modules-scope@^1.1.0:
-   version "1.1.0"
-   resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90"
-   dependencies:
-     css-selector-tokenizer "^0.7.0"
-     postcss "^6.0.1"
-
--postcss-modules-values@^1.1.0:
-+postcss-modules-values@^1.3.0:
-   version "1.3.0"
-   resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20"
-   dependencies:
-@@ -5338,13 +5972,9 @@
-   version "1.0.4"
-   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
-
--preserve@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
--
--prettier@1.11.1:
--  version "1.11.1"
--  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.11.1.tgz#61e43fc4cd44e68f2b0dfc2c38cd4bb0fccdcc75"
-+prettier@1.13.0:
-+  version "1.13.0"
-+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.0.tgz#054de8d5fb1a4405c845d16183f58a2c301f6f16"
-
- pretty-bytes@^1.0.2:
-   version "1.0.4"
-@@ -5360,7 +5990,7 @@
-     renderkid "^2.0.1"
-     utila "~0.4"
-
--private@^0.1.7:
-+private@^0.1.7, private@^0.1.8:
-   version "0.1.8"
-   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
-
-@@ -5368,6 +5998,10 @@
-   version "1.0.7"
-   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
-
-+process-nextick-args@~2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
-+
- process@^0.11.0:
-   version "0.11.10"
-   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
-@@ -5383,6 +6017,10 @@
-   version "2.0.0"
-   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz#8a1be366bf8fc23db2bd23f10c6fe920b4389d1f"
-
-+promise-inflight@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
-+
- promise@^7.1.1:
-   version "7.3.1"
-   resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
-@@ -5410,10 +6048,21 @@
-     forwarded "~0.1.2"
-     ipaddr.js "1.5.2"
-
-+proxy-addr@~2.0.3:
-+  version "2.0.3"
-+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.3.tgz#355f262505a621646b3130a728eb647e22055341"
-+  dependencies:
-+    forwarded "~0.1.2"
-+    ipaddr.js "1.6.0"
-+
- prr@~0.0.0:
-   version "0.0.0"
-   resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"
-
-+prr@~1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
-+
- pruner@^0.0.7:
-   version "0.0.7"
-   resolved "https://registry.yarnpkg.com/pruner/-/pruner-0.0.7.tgz#345fbcb3e80701163a1d7adf56bac229a5a1e4c1"
-@@ -5434,6 +6083,21 @@
-     parse-asn1 "^5.0.0"
-     randombytes "^2.0.1"
-
-+pump@^2.0.0, pump@^2.0.1:
-+  version "2.0.1"
-+  resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
-+  dependencies:
-+    end-of-stream "^1.1.0"
-+    once "^1.3.1"
-+
-+pumpify@^1.3.3:
-+  version "1.4.0"
-+  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.4.0.tgz#80b7c5df7e24153d03f0e7ac8a05a5d068bd07fb"
-+  dependencies:
-+    duplexify "^3.5.3"
-+    inherits "^2.0.3"
-+    pump "^2.0.0"
-+
- punycode@1.3.2:
-   version "1.3.2"
-   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
-@@ -5477,13 +6141,6 @@
-   version "0.2.0"
-   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
-
--randomatic@^1.1.3:
--  version "1.1.7"
--  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c"
--  dependencies:
--    is-number "^3.0.0"
--    kind-of "^4.0.0"
--
- randombytes@^2.0.0, randombytes@^2.0.1:
-   version "2.0.5"
-   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.5.tgz#dc009a246b8d09a177b4b7a0ae77bc570f4b1b79"
-@@ -5512,9 +6169,9 @@
-     minimist "^1.2.0"
-     strip-json-comments "~2.0.1"
-
--rcedit@^0.9.0:
--  version "0.9.0"
--  resolved "https://registry.yarnpkg.com/rcedit/-/rcedit-0.9.0.tgz#3910df57345399e2b0325f4a519007f89e55ef1c"
-+rcedit@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/rcedit/-/rcedit-1.0.0.tgz#43309ecbc8814f3582fca6b751748cfad66a16a2"
-
- read-config-file@3.0.0:
-   version "3.0.0"
-@@ -5583,6 +6240,18 @@
-     normalize-package-data "^2.3.2"
-     path-type "^2.0.0"
-
-+"readable-stream@1 || 2", readable-stream@^2.0.4, readable-stream@^2.1.5:
-+  version "2.3.6"
-+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
-+  dependencies:
-+    core-util-is "~1.0.0"
-+    inherits "~2.0.3"
-+    isarray "~1.0.0"
-+    process-nextick-args "~2.0.0"
-+    safe-buffer "~5.1.1"
-+    string_decoder "~1.1.1"
-+    util-deprecate "~1.0.1"
-+
- readable-stream@1.0:
-   version "1.0.34"
-   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
-@@ -5610,7 +6279,7 @@
-     isarray "0.0.1"
-     string_decoder "~0.10.x"
-
--readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.2.2, readable-stream@^2.2.6:
-+readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.2.6:
-   version "2.3.3"
-   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
-   dependencies:
-@@ -5673,21 +6342,22 @@
-   version "0.11.0"
-   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz#7e54fe5b5ccd5d6624ea6255c3473be090b802e1"
-
--regex-cache@^0.4.2:
--  version "0.4.4"
--  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
--  dependencies:
--    is-equal-shallow "^0.1.3"
--
- regex-not@^1.0.0:
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.0.tgz#42f83e39771622df826b02af176525d6a5f157f9"
-   dependencies:
-     extend-shallow "^2.0.1"
-
-+regex-not@^1.0.2:
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
-+  dependencies:
-+    extend-shallow "^3.0.2"
-+    safe-regex "^1.1.0"
-+
- regexpp@^1.0.1:
--  version "1.0.1"
--  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-1.0.1.tgz#d857c3a741dce075c2848dcb019a0a975b190d43"
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-1.1.0.tgz#0e3516dd0b7904f413d2d4193dce4618c3a689ab"
-
- regexpu-core@^1.0.0:
-   version "1.0.0"
-@@ -5742,7 +6412,7 @@
-   version "1.1.2"
-   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
-
--repeat-string@^1.5.2, repeat-string@^1.6.1:
-+repeat-string@^1.6.1:
-   version "1.6.1"
-   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-
-@@ -5779,18 +6449,18 @@
-     tunnel-agent "^0.6.0"
-     uuid "^3.1.0"
-
--request@2.81.0, request@~2.81.0:
--  version "2.81.0"
--  resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
-+request@~2.79.0:
-+  version "2.79.0"
-+  resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
-   dependencies:
-     aws-sign2 "~0.6.0"
-     aws4 "^1.2.1"
--    caseless "~0.12.0"
-+    caseless "~0.11.0"
-     combined-stream "~1.0.5"
-     extend "~3.0.0"
-     forever-agent "~0.6.1"
-     form-data "~2.1.1"
--    har-validator "~4.2.1"
-+    har-validator "~2.0.6"
-     hawk "~3.1.3"
-     http-signature "~1.1.0"
-     is-typedarray "~1.0.0"
-@@ -5798,26 +6468,24 @@
-     json-stringify-safe "~5.0.1"
-     mime-types "~2.1.7"
-     oauth-sign "~0.8.1"
--    performance-now "^0.2.0"
--    qs "~6.4.0"
--    safe-buffer "^5.0.1"
-+    qs "~6.3.0"
-     stringstream "~0.0.4"
-     tough-cookie "~2.3.0"
--    tunnel-agent "^0.6.0"
-+    tunnel-agent "~0.4.1"
-     uuid "^3.0.0"
-
--request@~2.79.0:
--  version "2.79.0"
--  resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
-+request@~2.81.0:
-+  version "2.81.0"
-+  resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
-   dependencies:
-     aws-sign2 "~0.6.0"
-     aws4 "^1.2.1"
--    caseless "~0.11.0"
-+    caseless "~0.12.0"
-     combined-stream "~1.0.5"
-     extend "~3.0.0"
-     forever-agent "~0.6.1"
-     form-data "~2.1.1"
--    har-validator "~2.0.6"
-+    har-validator "~4.2.1"
-     hawk "~3.1.3"
-     http-signature "~1.1.0"
-     is-typedarray "~1.0.0"
-@@ -5825,10 +6493,12 @@
-     json-stringify-safe "~5.0.1"
-     mime-types "~2.1.7"
-     oauth-sign "~0.8.1"
--    qs "~6.3.0"
-+    performance-now "^0.2.0"
-+    qs "~6.4.0"
-+    safe-buffer "^5.0.1"
-     stringstream "~0.0.4"
-     tough-cookie "~2.3.0"
--    tunnel-agent "~0.4.1"
-+    tunnel-agent "^0.6.0"
-     uuid "^3.0.0"
-
- require-directory@^2.1.1:
-@@ -5871,17 +6541,15 @@
-     onetime "^2.0.0"
-     signal-exit "^3.0.2"
-
-+ret@~0.1.10:
-+  version "0.1.15"
-+  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
-+
- rgb2hex@~0.1.0:
-   version "0.1.0"
-   resolved "https://registry.yarnpkg.com/rgb2hex/-/rgb2hex-0.1.0.tgz#ccd55f860ae0c5c4ea37504b958e442d8d12325b"
-
--right-align@^0.1.1:
--  version "0.1.3"
--  resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
--  dependencies:
--    align-text "^0.1.1"
--
--rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.5.2, rimraf@^2.6.1:
-+rimraf@2, rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
-   version "2.6.2"
-   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
-   dependencies:
-@@ -5904,6 +6572,12 @@
-   dependencies:
-     is-promise "^2.1.0"
-
-+run-queue@^1.0.0, run-queue@^1.0.3:
-+  version "1.0.3"
-+  resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
-+  dependencies:
-+    aproba "^1.1.1"
-+
- rx-lite-aggregates@^4.0.8:
-   version "4.0.8"
-   resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be"
-@@ -5922,10 +6596,24 @@
-   version "5.1.1"
-   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
-
-+safe-buffer@^5.1.2:
-+  version "5.1.2"
-+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-+
- safe-buffer@~5.0.1:
-   version "5.0.1"
-   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7"
-
-+safe-regex@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
-+  dependencies:
-+    ret "~0.1.10"
-+
-+safer-buffer@^2.1.0:
-+  version "2.1.2"
-+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-+
- sanitize-filename@^1.6.0, sanitize-filename@^1.6.1:
-   version "1.6.1"
-   resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.1.tgz#612da1c96473fa02dccda92dcd5b4ab164a6772a"
-@@ -5941,14 +6629,14 @@
-     scss-tokenizer "^0.2.3"
-     yargs "^7.0.0"
-
--sass-loader@^6.0.6:
--  version "6.0.6"
--  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-6.0.6.tgz#e9d5e6c1f155faa32a4b26d7a9b7107c225e40f9"
-+sass-loader@^7.0.1:
-+  version "7.0.1"
-+  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.0.1.tgz#fd937259ccba3a9cfe0d5f8a98746d48adfcc261"
-   dependencies:
--    async "^2.1.5"
--    clone-deep "^0.3.0"
-+    clone-deep "^2.0.1"
-     loader-utils "^1.0.1"
-     lodash.tail "^4.1.1"
-+    neo-async "^2.5.0"
-     pify "^3.0.0"
-
- sax@1.2.1:
-@@ -5959,11 +6647,12 @@
-   version "1.2.4"
-   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
-
--schema-utils@^0.3.0:
--  version "0.3.0"
--  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf"
-+schema-utils@^0.4.4, schema-utils@^0.4.5:
-+  version "0.4.5"
-+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.5.tgz#21836f0608aac17b78f9e3e24daff14a5ca13a3e"
-   dependencies:
--    ajv "^5.0.0"
-+    ajv "^6.1.0"
-+    ajv-keywords "^3.1.0"
-
- scss-tokenizer@^0.2.3:
-   version "0.2.3"
-@@ -6012,6 +6701,28 @@
-     range-parser "~1.2.0"
-     statuses "~1.3.1"
-
-+send@0.16.2:
-+  version "0.16.2"
-+  resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
-+  dependencies:
-+    debug "2.6.9"
-+    depd "~1.1.2"
-+    destroy "~1.0.4"
-+    encodeurl "~1.0.2"
-+    escape-html "~1.0.3"
-+    etag "~1.8.1"
-+    fresh "0.5.2"
-+    http-errors "~1.6.2"
-+    mime "1.4.1"
-+    ms "2.0.0"
-+    on-finished "~2.3.0"
-+    range-parser "~1.2.0"
-+    statuses "~1.4.0"
-+
-+serialize-javascript@^1.4.0:
-+  version "1.5.0"
-+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.5.0.tgz#1aa336162c88a890ddad5384baebc93a655161fe"
-+
- serve-static@1.13.1:
-   version "1.13.1"
-   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.1.tgz#4c57d53404a761d8f2e7c1e8a18a47dbf278a719"
-@@ -6021,6 +6732,15 @@
-     parseurl "~1.3.2"
-     send "0.16.1"
-
-+serve-static@1.13.2:
-+  version "1.13.2"
-+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
-+  dependencies:
-+    encodeurl "~1.0.2"
-+    escape-html "~1.0.3"
-+    parseurl "~1.3.2"
-+    send "0.16.2"
-+
- set-blocking@^2.0.0, set-blocking@~2.0.0:
-   version "2.0.0"
-   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-@@ -6072,13 +6792,12 @@
-     inherits "^2.0.1"
-     safe-buffer "^5.0.1"
-
--shallow-clone@^0.1.2:
--  version "0.1.2"
--  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-0.1.2.tgz#5909e874ba77106d73ac414cfec1ffca87d97060"
-+shallow-clone@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-1.0.0.tgz#4480cd06e882ef68b2ad88a3ea54832e2c48b571"
-   dependencies:
-     is-extendable "^0.1.1"
--    kind-of "^2.0.1"
--    lazy-cache "^0.2.3"
-+    kind-of "^5.0.0"
-     mixin-object "^2.0.1"
-
- shebang-command@^1.2.0:
-@@ -6168,10 +6887,6 @@
-   version "2.0.0"
-   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
-
--source-list-map@~0.1.7:
--  version "0.1.8"
--  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
--
- source-map-resolve@^0.3.0:
-   version "0.3.1"
-   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.3.1.tgz#610f6122a445b8dd51535a2a71b783dfc1248761"
-@@ -6197,9 +6912,9 @@
-   dependencies:
-     source-map "^0.5.6"
-
--source-map-support@^0.5.3:
--  version "0.5.3"
--  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.3.tgz#2b3d5fff298cfa4d1afd7d4352d569e9a0158e76"
-+source-map-support@^0.5.3, source-map-support@^0.5.4:
-+  version "0.5.4"
-+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.4.tgz#54456efa89caa9270af7cd624cc2f123e51fbae8"
-   dependencies:
-     source-map "^0.6.0"
-
-@@ -6211,7 +6926,7 @@
-   version "0.3.0"
-   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.3.0.tgz#7ecaf13b57bcd09da8a40c5d269db33799d4aaf9"
-
--source-map@0.5.x, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3:
-+source-map@0.5.x, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.3:
-   version "0.5.7"
-   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-
-@@ -6289,6 +7004,12 @@
-     jsbn "~0.1.0"
-     tweetnacl "~0.14.0"
-
-+ssri@^5.2.4:
-+  version "5.3.0"
-+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.3.0.tgz#ba3872c9c6d33a0704a7d71ff045e5ec48999d06"
-+  dependencies:
-+    safe-buffer "^5.1.1"
-+
- stat-mode@^0.2.2:
-   version "0.2.2"
-   resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-0.2.2.tgz#e6c80b623123d7d80cf132ce538f346289072502"
-@@ -6300,7 +7021,7 @@
-     define-property "^0.2.5"
-     object-copy "^0.1.0"
-
--"statuses@>= 1.3.1 < 2":
-+"statuses@>= 1.3.1 < 2", statuses@~1.4.0:
-   version "1.4.0"
-   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
-
-@@ -6321,6 +7042,13 @@
-     inherits "~2.0.1"
-     readable-stream "^2.0.2"
-
-+stream-each@^1.1.0:
-+  version "1.2.2"
-+  resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.2.tgz#8e8c463f91da8991778765873fe4d960d8f616bd"
-+  dependencies:
-+    end-of-stream "^1.1.0"
-+    stream-shift "^1.0.0"
-+
- stream-http@^2.3.1:
-   version "2.7.2"
-   resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.7.2.tgz#40a050ec8dc3b53b33d9909415c02c0bf1abfbad"
-@@ -6331,6 +7059,10 @@
-     to-arraybuffer "^1.0.0"
-     xtend "^4.0.0"
-
-+stream-shift@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
-+
- strict-uri-encode@^1.0.0:
-   version "1.1.0"
-   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
-@@ -6360,6 +7092,12 @@
-   dependencies:
-     safe-buffer "~5.1.0"
-
-+string_decoder@~1.1.1:
-+  version "1.1.1"
-+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-+  dependencies:
-+    safe-buffer "~5.1.0"
-+
- stringstream@~0.0.4, stringstream@~0.0.5:
-   version "0.0.5"
-   resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
-@@ -6404,12 +7142,12 @@
-   version "2.0.1"
-   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-
--style-loader@^0.19.1:
--  version "0.19.1"
--  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.19.1.tgz#591ffc80bcefe268b77c5d9ebc0505d772619f85"
-+style-loader@^0.21.0:
-+  version "0.21.0"
-+  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.21.0.tgz#68c52e5eb2afc9ca92b6274be277ee59aea3a852"
-   dependencies:
--    loader-utils "^1.0.2"
--    schema-utils "^0.3.0"
-+    loader-utils "^1.1.0"
-+    schema-utils "^0.4.5"
-
- sumchecker@^1.2.0:
-   version "1.3.1"
-@@ -6434,18 +7172,24 @@
-   version "2.0.0"
-   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-
--supports-color@^3.1.0, supports-color@^3.1.2, supports-color@^3.2.3, supports-color@~3.2.3:
-+supports-color@^3.1.2, supports-color@^3.2.3, supports-color@~3.2.3:
-   version "3.2.3"
-   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
-   dependencies:
-     has-flag "^1.0.0"
-
--supports-color@^4.0.0, supports-color@^4.2.1, supports-color@^4.4.0:
-+supports-color@^4.0.0, supports-color@^4.4.0:
-   version "4.5.0"
-   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
-   dependencies:
-     has-flag "^2.0.0"
-
-+supports-color@^5.3.0:
-+  version "5.4.0"
-+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
-+  dependencies:
-+    has-flag "^3.0.0"
-+
- svgo@^0.7.0:
-   version "0.7.2"
-   resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
-@@ -6469,22 +7213,9 @@
-     slice-ansi "1.0.0"
-     string-width "^2.1.1"
-
--tapable@^0.2.5, tapable@^0.2.7, tapable@~0.2.5:
--  version "0.2.8"
--  resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.8.tgz#99372a5c999bf2df160afc0d74bed4f47948cd22"
--
--tar-pack@^3.4.0:
--  version "3.4.1"
--  resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f"
--  dependencies:
--    debug "^2.2.0"
--    fstream "^1.0.10"
--    fstream-ignore "^1.0.5"
--    once "^1.3.3"
--    readable-stream "^2.1.4"
--    rimraf "^2.5.1"
--    tar "^2.2.1"
--    uid-number "^0.0.6"
-+tapable@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.0.0.tgz#cbb639d9002eed9c6b5975eb20598d7936f1f9f2"
-
- tar-stream@^1.5.0:
-   version "1.5.4"
-@@ -6495,7 +7226,7 @@
-     readable-stream "^2.0.0"
-     xtend "^4.0.0"
-
--tar@^2.0.0, tar@^2.2.1:
-+tar@^2.0.0:
-   version "2.2.1"
-   resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
-   dependencies:
-@@ -6503,6 +7234,18 @@
-     fstream "^1.0.2"
-     inherits "2"
-
-+tar@^4:
-+  version "4.4.2"
-+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.2.tgz#60685211ba46b38847b1ae7ee1a24d744a2cd462"
-+  dependencies:
-+    chownr "^1.0.1"
-+    fs-minipass "^1.2.5"
-+    minipass "^2.2.4"
-+    minizlib "^1.1.0"
-+    mkdirp "^0.5.0"
-+    safe-buffer "^5.1.2"
-+    yallist "^3.0.2"
-+
- temp-file@^3.1.1:
-   version "3.1.1"
-   resolved "https://registry.yarnpkg.com/temp-file/-/temp-file-3.1.1.tgz#8823649aa4e8a6e419eb71b601a2e4d472b0f24f"
-@@ -6545,6 +7288,13 @@
-   version "0.0.2"
-   resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-0.0.2.tgz#cfedf88e60c00dd9697b61fdd2a8343a9b680eaf"
-
-+through2@^2.0.0:
-+  version "2.0.3"
-+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
-+  dependencies:
-+    readable-stream "^2.1.5"
-+    xtend "~4.0.1"
-+
- through2@~0.2.3:
-   version "0.2.3"
-   resolved "https://registry.yarnpkg.com/through2/-/through2-0.2.3.tgz#eb3284da4ea311b6cc8ace3653748a52abf25a3f"
-@@ -6617,6 +7367,15 @@
-     extend-shallow "^2.0.1"
-     regex-not "^1.0.0"
-
-+to-regex@^3.0.2:
-+  version "3.0.2"
-+  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
-+  dependencies:
-+    define-property "^2.0.2"
-+    extend-shallow "^3.0.2"
-+    regex-not "^1.0.2"
-+    safe-regex "^1.1.0"
-+
- to-space-case@^1.0.0:
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/to-space-case/-/to-space-case-1.0.0.tgz#b052daafb1b2b29dc770cea0163e5ec0ebc9fc17"
-@@ -6663,6 +7422,10 @@
-   dependencies:
-     utf8-byte-length "^1.0.1"
-
-+tryer@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.0.tgz#027b69fa823225e551cace3ef03b11f6ab37c1d7"
-+
- tryit@^1.0.1:
-   version "1.0.3"
-   resolved "https://registry.yarnpkg.com/tryit/-/tryit-1.0.3.tgz#393be730a9446fd1ead6da59a014308f36c289cb"
-@@ -6728,8 +7491,8 @@
-     tslib "^1.7.1"
-
- tsutils@^2.13.1:
--  version "2.22.2"
--  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.22.2.tgz#0b9f3d87aa3eb95bd32d26ce2b88aa329a657951"
-+  version "2.25.1"
-+  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.25.1.tgz#24a46342ab8b174a3fbde632e60dcd11b64982f9"
-   dependencies:
-     tslib "^1.8.1"
-
-@@ -6768,25 +7531,39 @@
-     media-typer "0.3.0"
-     mime-types "~2.1.15"
-
-+type-is@~1.6.16:
-+  version "1.6.16"
-+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
-+  dependencies:
-+    media-typer "0.3.0"
-+    mime-types "~2.1.18"
-+
- typedarray@^0.0.6:
-   version "0.0.6"
-   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
-
--typescript-eslint-parser@^14.0.0:
--  version "14.0.0"
--  resolved "https://registry.yarnpkg.com/typescript-eslint-parser/-/typescript-eslint-parser-14.0.0.tgz#c90a8f541c1d96e5c55e2807c61d154e788520f9"
-+typescript-eslint-parser@^16.0.0:
-+  version "16.0.0"
-+  resolved "https://registry.yarnpkg.com/typescript-eslint-parser/-/typescript-eslint-parser-16.0.0.tgz#14a9ab75932b15af919602faef553c6f0487f352"
-   dependencies:
-     lodash.unescape "4.0.1"
-     semver "5.5.0"
-
--typescript@^2.8.1:
--  version "2.8.1"
--  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.8.1.tgz#6160e4f8f195d5ba81d4876f9c0cc1fbc0820624"
-+typescript@^2.9.1:
-+  version "2.9.1"
-+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.1.tgz#fdb19d2c67a15d11995fd15640e373e09ab09961"
-
- ua-parser-js@^0.7.9:
-   version "0.7.17"
-   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.17.tgz#e9ec5f9498b9ec910e7ae3ac626a805c4d09ecac"
-
-+uglify-es@^3.3.4:
-+  version "3.3.9"
-+  resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677"
-+  dependencies:
-+    commander "~2.13.0"
-+    source-map "~0.6.1"
-+
- uglify-js@3.1.x:
-   version "3.1.6"
-   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.1.6.tgz#918832602036e95d2318e11f27ee8461a8592c5d"
-@@ -6794,30 +7571,18 @@
-     commander "~2.11.0"
-     source-map "~0.6.1"
-
--uglify-js@^2.8.27, uglify-js@^2.8.29:
--  version "2.8.29"
--  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
--  dependencies:
--    source-map "~0.5.1"
--    yargs "~3.10.0"
--  optionalDependencies:
--    uglify-to-browserify "~1.0.0"
--
--uglify-to-browserify@~1.0.0:
--  version "1.0.2"
--  resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
--
--uglifyjs-webpack-plugin@^0.4.6:
--  version "0.4.6"
--  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz#b951f4abb6bd617e66f63eb891498e391763e309"
-+uglifyjs-webpack-plugin@^1.2.4:
-+  version "1.2.5"
-+  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.5.tgz#2ef8387c8f1a903ec5e44fa36f9f3cbdcea67641"
-   dependencies:
--    source-map "^0.5.6"
--    uglify-js "^2.8.29"
--    webpack-sources "^1.0.1"
--
--uid-number@^0.0.6:
--  version "0.0.6"
--  resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
-+    cacache "^10.0.4"
-+    find-cache-dir "^1.0.0"
-+    schema-utils "^0.4.5"
-+    serialize-javascript "^1.4.0"
-+    source-map "^0.6.1"
-+    uglify-es "^3.3.4"
-+    webpack-sources "^1.1.0"
-+    worker-farm "^1.5.2"
-
- underscore@~1.6.0:
-   version "1.6.0"
-@@ -6846,6 +7611,18 @@
-   version "2.0.0"
-   resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
-
-+unique-filename@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.0.tgz#d05f2fe4032560871f30e93cbe735eea201514f3"
-+  dependencies:
-+    unique-slug "^2.0.0"
-+
-+unique-slug@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.0.tgz#db6676e7c7cc0629878ff196097c78855ae9f4ab"
-+  dependencies:
-+    imurmurhash "^0.1.4"
-+
- unique-string@^1.0.0:
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a"
-@@ -6871,6 +7648,10 @@
-   version "2.0.1"
-   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
-
-+upath@^1.0.0:
-+  version "1.0.5"
-+  resolved "https://registry.yarnpkg.com/upath/-/upath-1.0.5.tgz#02cab9ecebe95bbec6d5fc2566325725ab6d1a73"
-+
- update-notifier@^2.3.0:
-   version "2.3.0"
-   resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.3.0.tgz#4e8827a6bb915140ab093559d7014e3ebb837451"
-@@ -6895,13 +7676,19 @@
-   dependencies:
-     punycode "^2.1.0"
-
-+uri-js@^4.2.1:
-+  version "4.2.1"
-+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.1.tgz#4595a80a51f356164e22970df64c7abd6ade9850"
-+  dependencies:
-+    punycode "^2.1.0"
-+
- urix@^0.1.0, urix@~0.1.0:
-   version "0.1.0"
-   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
-
--url-join@^2.0.2:
--  version "2.0.2"
--  resolved "https://registry.yarnpkg.com/url-join/-/url-join-2.0.2.tgz#c072756967ad24b8b59e5741551caac78f50b8b7"
-+url-join@^4.0.0:
-+  version "4.0.0"
-+  resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.0.tgz#4d3340e807d3773bda9991f8305acdcc2a665d2a"
-
- url-parse-lax@^1.0.0:
-   version "1.0.0"
-@@ -6943,7 +7730,7 @@
-   version "1.0.3"
-   resolved "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz#a7c216d267545169637b3b6edc6ca9119e2ff93f"
-
--util.promisify@^1.0.0:
-+util.promisify@1.0.0:
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030"
-   dependencies:
-@@ -7009,18 +7796,28 @@
-   version "0.0.11"
-   resolved "https://registry.yarnpkg.com/walkdir/-/walkdir-0.0.11.tgz#a16d025eb931bd03b52f308caed0f40fcebe9532"
-
--watchpack@^1.3.1, watchpack@^1.4.0:
--  version "1.4.0"
--  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.4.0.tgz#4a1472bcbb952bd0a9bb4036801f954dfb39faac"
-+watchpack@^1.5.0:
-+  version "1.6.0"
-+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
-   dependencies:
--    async "^2.1.2"
--    chokidar "^1.7.0"
-+    chokidar "^2.0.2"
-     graceful-fs "^4.1.2"
-+    neo-async "^2.5.0"
-
- wdio-dot-reporter@~0.0.8:
-   version "0.0.9"
-   resolved "https://registry.yarnpkg.com/wdio-dot-reporter/-/wdio-dot-reporter-0.0.9.tgz#929b2adafd49d6b0534fda068e87319b47e38fe5"
-
-+webassemblyjs@1.4.3:
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/webassemblyjs/-/webassemblyjs-1.4.3.tgz#0591893efb8fbde74498251cbe4b2d83df9239cb"
-+  dependencies:
-+    "@webassemblyjs/ast" "1.4.3"
-+    "@webassemblyjs/validation" "1.4.3"
-+    "@webassemblyjs/wasm-parser" "1.4.3"
-+    "@webassemblyjs/wast-parser" "1.4.3"
-+    long "^3.2.0"
-+
- webdriverio@^4.8.0:
-   version "4.8.0"
-   resolved "https://registry.yarnpkg.com/webdriverio/-/webdriverio-4.8.0.tgz#d52929b749080f89967f6e1614051cbc8172d132"
-@@ -7048,21 +7845,38 @@
-     wdio-dot-reporter "~0.0.8"
-     wgxpath "~1.0.0"
-
--webpack-dev-middleware@^2.0.3:
--  version "2.0.3"
--  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-2.0.3.tgz#44e15480ec58d275417ac4d93a0126c7b72450bd"
-+webpack-bundle-analyzer@^2.13.0:
-+  version "2.13.0"
-+  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.13.0.tgz#8d7db44c3d4844bc911890998e1110514cf12264"
-+  dependencies:
-+    acorn "^5.3.0"
-+    bfj-node4 "^5.2.0"
-+    chalk "^2.3.0"
-+    commander "^2.13.0"
-+    ejs "^2.5.7"
-+    express "^4.16.2"
-+    filesize "^3.5.11"
-+    gzip-size "^4.1.0"
-+    lodash "^4.17.4"
-+    mkdirp "^0.5.1"
-+    opener "^1.4.3"
-+    ws "^4.0.0"
-+
-+webpack-dev-middleware@^3.1.3:
-+  version "3.1.3"
-+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.1.3.tgz#8b32aa43da9ae79368c1bf1183f2b6cf5e1f39ed"
-   dependencies:
-     loud-rejection "^1.6.0"
-     memory-fs "~0.4.1"
-     mime "^2.1.0"
-     path-is-absolute "^1.0.0"
-     range-parser "^1.0.3"
--    url-join "^2.0.2"
-+    url-join "^4.0.0"
-     webpack-log "^1.0.1"
-
--webpack-hot-middleware@^2.21.0:
--  version "2.21.0"
--  resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.21.0.tgz#7b3c113a7a4b301c91e0749573c7aab28b414b52"
-+webpack-hot-middleware@^2.22.2:
-+  version "2.22.2"
-+  resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.22.2.tgz#623b77ce591fcd4e1fb99f18167781443e50afac"
-   dependencies:
-     ansi-html "0.0.7"
-     html-entities "^1.2.0"
-@@ -7078,18 +7892,11 @@
-     loglevelnext "^1.0.1"
-     uuid "^3.1.0"
-
--webpack-merge@^4.1.0:
--  version "4.1.1"
--  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.1.1.tgz#f1197a0a973e69c6fbeeb6d658219aa8c0c13555"
--  dependencies:
--    lodash "^4.17.4"
--
--webpack-sources@^0.1.4:
--  version "0.1.5"
--  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.1.5.tgz#aa1f3abf0f0d74db7111c40e500b84f966640750"
-+webpack-merge@^4.1.2:
-+  version "4.1.2"
-+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.1.2.tgz#5d372dddd3e1e5f8874f5bf5a8e929db09feb216"
-   dependencies:
--    source-list-map "~0.1.7"
--    source-map "~0.5.3"
-+    lodash "^4.17.5"
-
- webpack-sources@^1.0.1:
-   version "1.0.1"
-@@ -7098,58 +7905,39 @@
-     source-list-map "^2.0.0"
-     source-map "~0.5.3"
-
--webpack@^2.2.0:
--  version "2.7.0"
--  resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.7.0.tgz#b2a1226804373ffd3d03ea9c6bd525067034f6b1"
-+webpack-sources@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.1.0.tgz#a101ebae59d6507354d71d8013950a3a8b7a5a54"
-   dependencies:
--    acorn "^5.0.0"
--    acorn-dynamic-import "^2.0.0"
--    ajv "^4.7.0"
--    ajv-keywords "^1.1.1"
--    async "^2.1.2"
--    enhanced-resolve "^3.3.0"
--    interpret "^1.0.0"
--    json-loader "^0.5.4"
--    json5 "^0.5.1"
--    loader-runner "^2.3.0"
--    loader-utils "^0.2.16"
--    memory-fs "~0.4.1"
--    mkdirp "~0.5.0"
--    node-libs-browser "^2.0.0"
--    source-map "^0.5.3"
--    supports-color "^3.1.0"
--    tapable "~0.2.5"
--    uglify-js "^2.8.27"
--    watchpack "^1.3.1"
--    webpack-sources "^1.0.1"
--    yargs "^6.0.0"
-+    source-list-map "^2.0.0"
-+    source-map "~0.6.1"
-
--webpack@^3.10.0:
--  version "3.10.0"
--  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.10.0.tgz#5291b875078cf2abf42bdd23afe3f8f96c17d725"
-+webpack@^4.8.3:
-+  version "4.8.3"
-+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.8.3.tgz#957c8e80000f9e5cc03d775e78b472d8954f4eeb"
-   dependencies:
-+    "@webassemblyjs/ast" "1.4.3"
-+    "@webassemblyjs/wasm-edit" "1.4.3"
-+    "@webassemblyjs/wasm-parser" "1.4.3"
-     acorn "^5.0.0"
--    acorn-dynamic-import "^2.0.0"
--    ajv "^5.1.5"
--    ajv-keywords "^2.0.0"
--    async "^2.1.2"
--    enhanced-resolve "^3.4.0"
--    escope "^3.6.0"
--    interpret "^1.0.0"
--    json-loader "^0.5.4"
--    json5 "^0.5.1"
-+    acorn-dynamic-import "^3.0.0"
-+    ajv "^6.1.0"
-+    ajv-keywords "^3.1.0"
-+    chrome-trace-event "^0.1.1"
-+    enhanced-resolve "^4.0.0"
-+    eslint-scope "^3.7.1"
-     loader-runner "^2.3.0"
-     loader-utils "^1.1.0"
-     memory-fs "~0.4.1"
-+    micromatch "^3.1.8"
-     mkdirp "~0.5.0"
-+    neo-async "^2.5.0"
-     node-libs-browser "^2.0.0"
--    source-map "^0.5.3"
--    supports-color "^4.2.1"
--    tapable "^0.2.7"
--    uglifyjs-webpack-plugin "^0.4.6"
--    watchpack "^1.4.0"
-+    schema-utils "^0.4.4"
-+    tapable "^1.0.0"
-+    uglifyjs-webpack-plugin "^1.2.4"
-+    watchpack "^1.5.0"
-     webpack-sources "^1.0.1"
--    yargs "^8.0.2"
-
- wgxpath@~1.0.0:
-   version "1.0.0"
-@@ -7189,14 +7977,6 @@
-   dependencies:
-     string-width "^1.0.1"
-
--window-size@0.1.0:
--  version "0.1.0"
--  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
--
--wordwrap@0.0.2:
--  version "0.0.2"
--  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
--
- wordwrap@~0.0.2:
-   version "0.0.3"
-   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
-@@ -7212,6 +7992,12 @@
-     errno "^0.1.4"
-     xtend "^4.0.1"
-
-+worker-farm@^1.5.2:
-+  version "1.6.0"
-+  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0"
-+  dependencies:
-+    errno "~0.1.7"
-+
- wrap-ansi@^2.0.0:
-   version "2.1.0"
-   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
-@@ -7237,6 +8023,13 @@
-   dependencies:
-     mkdirp "^0.5.1"
-
-+ws@^4.0.0:
-+  version "4.1.0"
-+  resolved "https://registry.yarnpkg.com/ws/-/ws-4.1.0.tgz#a979b5d7d4da68bf54efe0408967c324869a7289"
-+  dependencies:
-+    async-limiter "~1.0.0"
-+    safe-buffer "~5.1.0"
-+
- xdg-basedir@^3.0.0:
-   version "3.0.0"
-   resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"
-@@ -7277,7 +8070,7 @@
-   version "0.1.27"
-   resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
-
--xtend@^4.0.0, xtend@^4.0.1:
-+xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
-   version "4.0.1"
-   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
-
-@@ -7298,15 +8091,17 @@
-   version "3.2.1"
-   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
-
-+y18n@^4.0.0:
-+  version "4.0.0"
-+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
-+
- yallist@^2.1.2:
-   version "2.1.2"
-   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
-
--yargs-parser@^4.2.0:
--  version "4.2.1"
--  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"
--  dependencies:
--    camelcase "^3.0.0"
-+yallist@^3.0.0, yallist@^3.0.2:
-+  version "3.0.2"
-+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
-
- yargs-parser@^5.0.0:
-   version "5.0.0"
-@@ -7314,18 +8109,6 @@
-   dependencies:
-     camelcase "^3.0.0"
-
--yargs-parser@^7.0.0:
--  version "7.0.0"
--  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
--  dependencies:
--    camelcase "^4.1.0"
--
--yargs-parser@^8.0.0:
--  version "8.0.0"
--  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-8.0.0.tgz#21d476330e5a82279a4b881345bf066102e219c6"
--  dependencies:
--    camelcase "^4.1.0"
--
- yargs-parser@^9.0.2:
-   version "9.0.2"
-   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"
-@@ -7349,24 +8132,6 @@
-     y18n "^3.2.1"
-     yargs-parser "^9.0.2"
-
--yargs@^6.0.0:
--  version "6.6.0"
--  resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
--  dependencies:
--    camelcase "^3.0.0"
--    cliui "^3.2.0"
--    decamelize "^1.1.1"
--    get-caller-file "^1.0.1"
--    os-locale "^1.4.0"
--    read-pkg-up "^1.0.1"
--    require-directory "^2.1.1"
--    require-main-filename "^1.0.1"
--    set-blocking "^2.0.0"
--    string-width "^1.0.2"
--    which-module "^1.0.0"
--    y18n "^3.2.1"
--    yargs-parser "^4.2.0"
--
- yargs@^7.0.0:
-   version "7.1.0"
-   resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
-@@ -7385,33 +8150,6 @@
-     y18n "^3.2.1"
-     yargs-parser "^5.0.0"
-
--yargs@^8.0.2:
--  version "8.0.2"
--  resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360"
--  dependencies:
--    camelcase "^4.1.0"
--    cliui "^3.2.0"
--    decamelize "^1.1.1"
--    get-caller-file "^1.0.1"
--    os-locale "^2.0.0"
--    read-pkg-up "^2.0.0"
--    require-directory "^2.1.1"
--    require-main-filename "^1.0.1"
--    set-blocking "^2.0.0"
--    string-width "^2.0.0"
--    which-module "^2.0.0"
--    y18n "^3.2.1"
--    yargs-parser "^7.0.0"
--
--yargs@~3.10.0:
--  version "3.10.0"
--  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
--  dependencies:
--    camelcase "^1.0.2"
--    cliui "^2.1.0"
--    decamelize "^1.0.0"
--    window-size "0.1.0"
--
- yauzl@2.4.1:
-   version "2.4.1"
-   resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz#9528f442dab1b2284e58b4379bb194e22e0c4005"
diff --git a/app/test/fixtures/merge-parser/desktop/failed-merge-stale-branch-into-master.txt b/app/test/fixtures/merge-parser/desktop/failed-merge-stale-branch-into-master.txt
deleted file mode 100644
index 4143e782258..00000000000
--- a/app/test/fixtures/merge-parser/desktop/failed-merge-stale-branch-into-master.txt
+++ /dev/null
@@ -1,434 +0,0 @@
-added in remote
-  their  100644 a309d474e0ebfbd83ab04a460c27dd2b8906c4e8 .eslintignore
-@@ -0,0 +1,3 @@
-+node_modules
-+app/node_modules/
-+script/changelog/node_modules
-\ No newline at end of file
-merged
-  result 100644 22724fb6c88b57702fe40d191883a455f70b01a1 .prettierignore
-  our    100644 d247d9a68070ec5848c5feb83bddbfab02adbb6c .prettierignore
-@@ -1,16 +1,17 @@
--out/
-+app/static/common
-+app/test/fixtures
- dist/
-+gemoji
- node_modules/
-+out/
-+
- npm-debug.log
- yarn-error.log
--app/node_modules/
-+
- .DS_Store
- .awcache
- .idea/
- .eslintcache
-
--app/static/common
--app/test/fixtures
--gemoji
- *.json
- *.md
-changed in both
-  base   100644 dc892d10739ef87c70391aedcfdc3241753eebbb package.json
-  our    100644 461f60af798d32097510dcd519c5cdd4b860771e package.json
-  their  100644 a230a49de70c920a24d34b1af9952a17b72e7a1c package.json
-@@ -10,6 +10,7 @@
-     "test:unit": "ts-node script/unit-tests.ts",
-     "test:script": "mocha -t 10000 --require ts-node/register script/changelog/test/*.ts",
-     "test": "yarn test:unit && yarn test:script && yarn test:integration",
-+<<<<<<< .our
-     "test:setup": "ts-node -P script/tsconfig.json script/test-setup.ts",
-     "test:review": "ts-node  -P script/tsconfig.json script/test-review.ts",
-     "postinstall": "cd app && yarn install --force && cd .. && git submodule update --recursive --init && yarn compile:tslint && yarn compile:script",
-@@ -19,6 +20,21 @@
-     "compile:prod": "cross-env NODE_ENV=production parallel-webpack --config app/webpack.production.ts",
-     "build:dev": "yarn compile:dev && cross-env NODE_ENV=development ts-node -P script/tsconfig.json script/build.ts",
-     "build:prod": "yarn compile:prod && cross-env NODE_ENV=production ts-node -P script/tsconfig.json script/build.ts",
-+=======
-+    "test:setup": "ts-node script/test-setup.ts",
-+    "test:review": "ts-node script/test-review.ts",
-+    "postinstall": "yarn install-app && yarn install-changelog && yarn update-submodules && yarn compile:tslint",
-+    "install-app": "cd app && yarn install --force && cd ..",
-+    "install-changelog": "cd script/changelog && yarn install && cd ../..",
-+    "update-submodules": "git submodule update --recursive --init",
-+    "start": "cross-env NODE_ENV=development node script/start",
-+    "start:prod": "cross-env NODE_ENV=production node script/start",
-+    "debug": "cross-env NODE_ENV=development node script/debug",
-+    "compile:dev": "cross-env NODE_ENV=development parallel-webpack --config app/webpack.development.js",
-+    "compile:prod": "cross-env NODE_ENV=production parallel-webpack --config app/webpack.production.js",
-+    "build:dev": "yarn compile:dev && cross-env NODE_ENV=development ts-node script/build.ts",
-+    "build:prod": "yarn compile:prod && cross-env NODE_ENV=production ts-node script/build.ts",
-+>>>>>>> .their
-     "package": "ts-node -P script/tsconfig.json script/package.ts",
-     "generate-octicons": "ts-node -P script/tsconfig.json script/generate-octicons.ts",
-     "clean:tslint": "rimraf tslint-rules/*.js",
-merged
-  result 100644 f723edfaa45b088c09cc8feef59b701e163fe639 script/changelog/api.ts
-  our    100644 9cd75d75226643dd9d12c9e42de23c33fdd44a8b script/changelog/api.ts
-@@ -1,60 +1,129 @@
--import * as HTTPS from 'https'
-+const octokit = require('@octokit/rest')({
-+  timeout: 0,
-+  requestMedia: 'application/vnd.github.v3+json',
-+  headers: {
-+    'User-Agent': 'what-the-changelog',
-+  },
-+})
-
--export interface IAPIPR {
-+export interface IDesktopPullRequest {
-   readonly title: string
-   readonly body: string
-+  readonly collaborators: ReadonlySet<string>
-+  readonly commits: ReadonlyArray<string>
- }
-
--type GraphQLResponse = {
--  readonly data: {
--    readonly repository: {
--      readonly pullRequest: IAPIPR
--    }
--  }
-+interface IAPIUser {
-+  readonly login: string
- }
-
--export function fetchPR(id: number): Promise<IAPIPR | null> {
--  return new Promise((resolve, reject) => {
--    const options: HTTPS.RequestOptions = {
--      host: 'api.github.com',
--      protocol: 'https:',
--      path: '/graphql',
--      method: 'POST',
--      headers: {
--        Authorization: `bearer ${process.env.GITHUB_ACCESS_TOKEN}`,
--        'User-Agent': 'what-the-changelog',
--      },
--    }
-+interface IAPIPullRequest {
-+  readonly title: string
-+  readonly body: string
-+  readonly user: IAPIUser
-+}
-+
-+interface IAPICommit {
-+  readonly sha: string
-+  readonly author?: IAPIUser
-+  readonly committer?: IAPIUser
-+}
-
--    const request = HTTPS.request(options, response => {
--      let received = ''
--      response.on('data', chunk => {
--        received += chunk
--      })
--
--      response.on('end', () => {
--        try {
--          const json: GraphQLResponse = JSON.parse(received)
--          const pr = json.data.repository.pullRequest
--          resolve(pr)
--        } catch (e) {
--          resolve(null)
--        }
--      })
-+interface IAPITeam {
-+  readonly name: string
-+  readonly id: number
-+}
-+
-+interface IAPITeamMember {
-+  readonly login: string
-+}
-+
-+// this account is assigned by GitHub as the committer for merged pull requests
-+// and should be excluded from being considered an external contributor
-+const webflowAccount = ['web-flow']
-+
-+export function initialize(token: string) {
-+  octokit.authenticate({
-+    type: 'token',
-+    token,
-+  })
-+}
-+
-+export async function getCoreTeamMembers(): Promise<ReadonlySet<string>> {
-+  try {
-+    let response = await octokit.orgs.getTeams({
-+      org: 'desktop',
-+      per_page: 100,
-     })
-+    const teams: ReadonlyArray<IAPITeam> = response.data
-+    const coreTeam = teams.find(t => t.name === 'Core') || null
-
--    const graphql = `
--{
--  repository(owner: "desktop", name: "desktop") {
--    pullRequest(number: ${id}) {
--      title
--      body
-+    if (coreTeam == null) {
-+      console.error('Unable to find core team on API')
-+      return new Set<string>()
-     }
-+
-+    const id = coreTeam.id
-+
-+    response = await octokit.orgs.getTeamMembers({
-+      id,
-+      role: 'all',
-+      per_page: 100,
-+    })
-+    const members: ReadonlyArray<IAPITeamMember> = response.data
-+
-+    return new Set(members.map(m => m.login).concat(webflowAccount))
-+  } catch (err) {
-+    console.error('API lookup failed for getCoreTeamMembers', err)
-+    return new Set<string>()
-   }
- }
--`
--    request.write(JSON.stringify({ query: graphql }))
-
--    request.end()
--  })
-+export async function fetchPR(id: number): Promise<IDesktopPullRequest | null> {
-+  try {
-+    const pullRequestResponse = await octokit.pullRequests.get({
-+      owner: 'desktop',
-+      repo: 'desktop',
-+      number: id,
-+    })
-+    const { title, body } = pullRequestResponse.data as IAPIPullRequest
-+
-+    let commitsResponse = await octokit.pullRequests.getCommits({
-+      owner: 'desktop',
-+      repo: 'desktop',
-+      number: id,
-+      per_page: 100,
-+    })
-+
-+    let data: Array<IAPICommit> = commitsResponse.data
-+    while (octokit.hasNextPage(commitsResponse)) {
-+      commitsResponse = await octokit.getNextPage(commitsResponse)
-+      data = data.concat(commitsResponse.data)
-+    }
-+
-+    const collaborators = new Set<string>()
-+    const commits = new Array<string>()
-+
-+    for (const commit of data) {
-+      const { sha, author, committer } = commit
-+
-+      commits.push(sha)
-+      if (author != null && !collaborators.has(author.login)) {
-+        collaborators.add(author.login)
-+      }
-+      if (committer != null && !collaborators.has(committer.login)) {
-+        collaborators.add(committer.login)
-+      }
-+    }
-+
-+    return {
-+      title: title,
-+      body: body,
-+      collaborators,
-+      commits,
-+    }
-+  } catch (err) {
-+    console.error('API lookup failed for fetchPR', err)
-+    return null
-+  }
- }
-added in remote
-  their  100644 2b223d9eca4c82f03969d8ca5d9d8a80a270a041 script/changelog/package.json
-@@ -0,0 +1,24 @@
-+{
-+  "name": "changelog",
-+  "repository": {
-+    "type": "git",
-+    "url": "https://github.com/desktop/desktop.git"
-+  },
-+  "description": "GitHub Desktop changelog dependencies",
-+  "author": {
-+    "name": "GitHub, Inc.",
-+    "email": "opensource+desktop@github.com",
-+    "url": "https://desktop.github.com/"
-+  },
-+  "license": "MIT",
-+  "engines": {
-+    "node": ">= 7",
-+    "yarn": ">= 1.2.0"
-+  },
-+  "dependencies": {
-+    "@octokit/rest": "^14.0.8",
-+    "listify": "^1.0.0"
-+  },
-+  "devDependencies": {
-+  }
-+}
-changed in both
-  base   100644 b0a88cf77391d915e28566a1695cbf31c2ab7bbb script/changelog/parser.ts
-  our    100644 aad3c838c2d7931127adbc843bdd83ccda5968a1 script/changelog/parser.ts
-  their  100644 ff08e0ef253ffb980b0ed57114f9fefea05d7fc1 script/changelog/parser.ts
-@@ -2,10 +2,11 @@
- import * as Fs from 'fs'
- import { gt as greaterThan } from 'semver'
-
--import { fetchPR, IAPIPR } from './api'
-+import { fetchPR, IDesktopPullRequest } from './api'
-+
-+const listify: (values: Array<any>) => string = require('listify')
-
- const PlaceholderChangeType = '???'
--const OfficialOwner = 'desktop'
-
- interface IParsedCommit {
-   readonly prID: number
-@@ -53,7 +54,11 @@
-   return issueRef
- }
-
--function getChangelogEntry(commit: IParsedCommit, pr: IAPIPR): string {
-+function getChangelogEntry(
-+  commit: IParsedCommit,
-+  pr: IDesktopPullRequest,
-+  externalContributors: ReadonlySet<string>
-+): string {
-   let type = PlaceholderChangeType
-   const description = capitalized(pr.title)
-
-@@ -66,15 +71,19 @@
-   }
-
-   let attribution = ''
--  if (commit.owner !== OfficialOwner) {
--    attribution = `. Thanks @${commit.owner}!`
-+
-+  if (externalContributors.size > 0) {
-+    const mentions = [...externalContributors].map(c => `@${c}`)
-+    const combinedMentions = listify(mentions)
-+    attribution = `. Thanks ${combinedMentions}!`
-   }
-
-   return `[${type}] ${description} -${issueRef}${attribution}`
- }
-
- export async function convertToChangelogFormat(
--  lines: ReadonlyArray<string>
-+  lines: ReadonlyArray<string>,
-+  coreMembers: ReadonlySet<string>
- ): Promise<ReadonlyArray<string>> {
-   const entries = []
-   for (const line of lines) {
-@@ -85,7 +94,13 @@
-         throw new Error(`Unable to get PR from API: ${commit.prID}`)
-       }
-
--      const entry = getChangelogEntry(commit, pr)
-+      const collaborators = pr.collaborators
-+
-+      const externalContributors = new Set(
-+        [...collaborators].filter(c => !coreMembers.has(c))
-+      )
-+
-+      const entry = getChangelogEntry(commit, pr, externalContributors)
-       entries.push(entry)
-     } catch (e) {
-       console.warn('Unable to parse line, using the full message.', e)
-merged
-  result 100644 8259a4c42f949aa6b07249546bddad9e5a341816 script/changelog/run.ts
-  our    100644 d324476ff6f0b766693c2b4c2aa8656852a3a4f8 script/changelog/run.ts
-@@ -1,4 +1,5 @@
- import { spawn } from './spawn'
-+import { getCoreTeamMembers } from './api'
- import { getLogLines } from './git'
- import { convertToChangelogFormat } from './parser'
- import { sort as semverSort } from 'semver'
-@@ -47,7 +48,8 @@
-     )
-   }
-
-+  const coreMembers = await getCoreTeamMembers()
-   const lines = await getLogLines(previousVersion)
--  const changelogEntries = await convertToChangelogFormat(lines)
-+  const changelogEntries = await convertToChangelogFormat(lines, coreMembers)
-   console.log(jsonStringify(changelogEntries))
- }
-added in remote
-  their  100644 05d54aba4df2a44bee37177eebc9e559e391e602 script/changelog/yarn.lock
-@@ -0,0 +1,48 @@
-+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-+# yarn lockfile v1
-+
-+
-+"@octokit/rest@^14.0.8":
-+  version "14.0.9"
-+  resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-14.0.9.tgz#d5e0a00dcb78901dd7b2ef852acfc0aea7c479ef"
-+  dependencies:
-+    before-after-hook "^1.1.0"
-+    debug "^3.1.0"
-+    is-array-buffer "^1.0.0"
-+    is-stream "^1.1.0"
-+    lodash "^4.17.4"
-+    url-template "^2.0.8"
-+
-+before-after-hook@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-1.1.0.tgz#83165e15a59460d13702cb8febd6a1807896db5a"
-+
-+debug@^3.1.0:
-+  version "3.1.0"
-+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-+  dependencies:
-+    ms "2.0.0"
-+
-+is-array-buffer@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-1.0.0.tgz#f32497a0509d109423f472003f98bab6a8ea34cb"
-+
-+is-stream@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-+
-+listify@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/listify/-/listify-1.0.0.tgz#03ca7ba2d150d4267773f74e57558d1053d2bee3"
-+
-+lodash@^4.17.4:
-+  version "4.17.5"
-+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
-+
-+ms@2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-+
-+url-template@^2.0.8:
-+  version "2.0.8"
-+  resolved "https://registry.yarnpkg.com/url-template/-/url-template-2.0.8.tgz#fc565a3cccbff7730c775f5641f9555791439f21"
-merged
-  result 100644 bcb2b3c76a15cdcae1cdb7f5d26d02e9e8ce9935 script/draft-release/run.ts
-  our    100644 c017ace71061eb0f6db7f42290cb63cca40ab5cb script/draft-release/run.ts
-@@ -6,6 +6,7 @@
-   convertToChangelogFormat,
-   getChangelogEntriesSince,
- } from '../changelog/parser'
-+import { getCoreTeamMembers, initialize } from '../changelog/api'
-
- import { Channel } from './channel'
- import { getNextVersionNumber } from './version'
-@@ -88,7 +89,10 @@
-   if (noChangesFound) {
-     printInstructions(nextVersion, [])
-   } else {
--    const changelogEntries = await convertToChangelogFormat(lines)
-+    initialize(process.env.GITHUB_ACCESS_TOKEN)
-+
-+    const coreMembers = await getCoreTeamMembers()
-+    const changelogEntries = await convertToChangelogFormat(lines, coreMembers)
-
-     console.log("Here's what you should do next:\n")
-
diff --git a/app/test/fixtures/merge-parser/desktop/merge-add-some-context-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-add-some-context-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index ab1459196a2..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-add-some-context-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-changed in both
-  base   100644 461a0bdb996fedc0a40861c61e387fe0d5fad667 app/src/lib/stores/helpers/background-fetcher.ts
-  our    100644 edadf1aea655fa18f9e3264b999dbc4583fed66b app/src/lib/stores/helpers/background-fetcher.ts
-  their  100644 8b61968bcc378722d08b01acc741c193dba0c614 app/src/lib/stores/helpers/background-fetcher.ts
-@@ -1,4 +1,4 @@
--import { Repository } from '../../../models/repository'
-+import { Repository, formatRepositoryName } from '../../../models/repository'
- import { Account } from '../../../models/account'
- import { GitHubRepository } from '../../../models/github-repository'
- import { API } from '../../api'
-@@ -96,11 +96,20 @@
-       try {
-         await this.fetch(this.repository)
-       } catch (e) {
-+<<<<<<< .our
-         const ghRepo = this.repository.gitHubRepository
-         const repoName =
-           ghRepo !== null ? ghRepo.fullName : this.repository.name
- 
-         log.error(`Error performing periodic fetch for '${repoName}'`, e)
-+=======
-+        log.error(
-+          `Error performing periodic fetch for repository '${formatRepositoryName(
-+            this.repository
-+          )}'`,
-+          e
-+        )
-+>>>>>>> .their
-       }
-     }
- 
-changed in both
-  base   100644 6a4b61f9fe2be4768d09c5ba220b92bac6e36e4a app/src/models/repository.ts
-  our    100644 4eb1a58be5e5e17b1a8714be9248b2d332f526e4 app/src/models/repository.ts
-  their  100644 782c50e60421f5fcfe22fecc91fa84fc7be86a02 app/src/models/repository.ts
-@@ -69,6 +69,7 @@
- }
- 
- /**
-+<<<<<<< .our
-  * Returns the owner/name alias if associated with a GitHub repository,
-  * otherwise the folder name that contains the repository
-  */
-@@ -76,4 +77,14 @@
-   const { gitHubRepository } = repository
- 
-   return gitHubRepository !== null ? gitHubRepository.fullName : repository.name
-+=======
-+ * Generate a distinct name for the repository.
-+ */
-+export function formatRepositoryName(repository: Repository) {
-+  if (repository.gitHubRepository !== null) {
-+    return repository.gitHubRepository.fullName
-+  }
-+
-+  return repository.name
-+>>>>>>> .their
- }
diff --git a/app/test/fixtures/merge-parser/desktop/merge-ahead-behind-toggle-spike-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-ahead-behind-toggle-spike-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index 65ad49d752b..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-ahead-behind-toggle-spike-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,838 +0,0 @@
-changed in both
-  base   100644 127d134f2254d76c375b7185af1f42369b62fed0 app/src/lib/app-state.ts
-  our    100644 b30f0fe080d909b81d2fb683ceb8deb365fb0191 app/src/lib/app-state.ts
-  their  100644 f6cb64e0cf4b2fbb859658db3fd65faceb895bde app/src/lib/app-state.ts
-@@ -342,7 +342,12 @@
- }
- 
- export interface IRepositoryState {
-+<<<<<<< .our
-   readonly commitSelection: ICommitSelection
-+=======
-+  readonly historyState: IHistoryState
-+  readonly compareState: ICompareState
-+>>>>>>> .their
-   readonly changesState: IChangesState
-   readonly compareState: ICompareState
-   readonly selectedSection: RepositorySectionTab
-@@ -564,6 +569,36 @@
- export interface ICommitSelection {
-   /** The commit currently selected in the app */
-   readonly sha: string | null
-+<<<<<<< .our
-+=======
-+  readonly file: CommittedFileChange | null
-+}
-+
-+export enum CompareMode {
-+  Default = 'Default',
-+  Ahead = 'Ahead',
-+  Behind = 'Behind',
-+}
-+
-+export interface ICompareState {
-+  readonly selection: IHistorySelection
-+
-+  readonly commits: ReadonlyArray<string>
-+
-+  readonly mode: CompareMode
-+
-+  readonly branch: Branch | null
-+
-+  readonly behindCount: number
-+  readonly aheadCount: number
-+}
-+
-+export interface IHistoryState {
-+  readonly selection: IHistorySelection
-+
-+  /** The ordered SHAs. */
-+  readonly history: ReadonlyArray<string>
-+>>>>>>> .their
- 
-   /** The list of files associated with the current commit */
-   readonly changedFiles: ReadonlyArray<CommittedFileChange>
-changed in both
-  base   100644 9c822d8df65d53f5fbdb6939e203a7ba2e11a58c app/src/lib/dispatcher/dispatcher.ts
-  our    100644 5e56c00e713342e76f5ccba040062e322e8c90cb app/src/lib/dispatcher/dispatcher.ts
-  their  100644 2da1dbbe3c8a2fb7a2a1a916112c7f50d1f9c6cb app/src/lib/dispatcher/dispatcher.ts
-@@ -17,8 +17,12 @@
-   Foldout,
-   FoldoutType,
-   ImageDiffType,
-+<<<<<<< .our
-   CompareAction,
-   ICompareFormUpdate,
-+=======
-+  CompareMode,
-+>>>>>>> .their
- } from '../app-state'
- import { AppStore } from '../stores/app-store'
- import { CloningRepository } from '../../models/cloning-repository'
-@@ -120,6 +124,22 @@
-     return this.appStore._updateRepositoryMissing(repository, missing)
-   }
- 
-+<<<<<<< .our
-+=======
-+  public loadCompareState(
-+    repository: Repository,
-+    branch: Branch | null,
-+    mode: CompareMode
-+  ): Promise<void> {
-+    return this.appStore._loadCompareState(repository, branch, mode)
-+  }
-+
-+  /** Load the history for the repository. */
-+  public loadHistory(repository: Repository): Promise<void> {
-+    return this.appStore._loadHistory(repository)
-+  }
-+
-+>>>>>>> .their
-   /** Load the next batch of history for the repository. */
-   public loadNextCommitBatch(repository: Repository): Promise<void> {
-     return this.appStore._loadNextCommitBatch(repository)
-changed in both
-  base   100644 9a3faa08e8e9cdae8d49ff0ac05118135bf2e291 app/src/lib/feature-flag.ts
-  our    100644 716a3c2396b0db5e84ec87d6529001e633b08700 app/src/lib/feature-flag.ts
-  their  100644 1469cbbf931b1ccdde675c010a03df5aa08988eb app/src/lib/feature-flag.ts
-@@ -27,6 +27,18 @@
-   return enableDevelopmentFeatures() || __RELEASE_CHANNEL__ === 'beta'
- }
- 
-+<<<<<<< .our
-+=======
-+/** Should PR integration be enabled? */
-+export function enablePRIntegration(): boolean {
-+  return enableBetaFeatures()
-+}
-+
-+export function enableCompareTab(): boolean {
-+  return enableDevelopmentFeatures()
-+}
-+
-+>>>>>>> .their
- /** Should merge tool integration be enabled? */
- export function enableMergeTool(): boolean {
-   return enableDevelopmentFeatures()
-changed in both
-  base   100644 ce2b9ab3f38d37bcf3a74d6bb159ef3ab0257083 app/src/lib/git/rev-list.ts
-  our    100644 3f1e4abe01f964c4aa4b46ec41185ef132ec2c8a app/src/lib/git/rev-list.ts
-  their  100644 054b714aa201316976da4403c833ee28a800d077 app/src/lib/git/rev-list.ts
-@@ -1,7 +1,12 @@
- import { GitError } from 'dugite'
- import { git } from './core'
- import { Repository } from '../../models/repository'
-+<<<<<<< .our
- import { Branch, BranchType, IAheadBehind } from '../../models/branch'
-+=======
-+import { Branch, BranchType } from '../../models/branch'
-+import { Commit } from '../../models/commit'
-+>>>>>>> .their
- 
- /**
-  * Convert two refs into the Git range syntax representing the set of commits
-@@ -33,6 +38,12 @@
-   return `${from}...${to}`
- }
- 
-+export interface ICompareResult {
-+  readonly ahead: number
-+  readonly behind: number
-+  readonly commits: ReadonlyArray<Commit>
-+}
-+
- /** Calculate the number of commits the range is ahead and behind. */
- export async function getAheadBehind(
-   repository: Repository,
-changed in both
-  base   100644 c07fbbd73ffd330aebdb9910fb2712d21e331c5a app/src/lib/stores/app-store.ts
-  our    100644 1a4e387e4d192d34abfd0621b4b5ebe8cc34d8d1 app/src/lib/stores/app-store.ts
-  their  100644 be19b43b27a9237958322956866f3ac26e0a5f42 app/src/lib/stores/app-store.ts
-@@ -16,6 +16,7 @@
-   Progress,
-   ImageDiffType,
-   IRevertProgress,
-+<<<<<<< .our
-   IFetchProgress,
-   ICompareState,
-   ComparisonView,
-@@ -25,6 +26,10 @@
-   ICompareBranch,
-   ICompareFormUpdate,
-   ICompareToBranch,
-+=======
-+  CompareMode,
-+  ICompareState,
-+>>>>>>> .their
- } from '../app-state'
- import { Account } from '../../models/account'
- import {
-@@ -439,6 +444,17 @@
-         changedFiles: new Array<CommittedFileChange>(),
-         diff: null,
-       },
-+      compareState: {
-+        selection: {
-+          sha: null,
-+          file: null,
-+        },
-+        branch: null,
-+        mode: CompareMode.Default,
-+        aheadCount: 0,
-+        behindCount: 0,
-+        commits: new Array<string>(),
-+      },
-       changesState: {
-         workingDirectory: WorkingDirectoryStatus.fromFiles(
-           new Array<WorkingDirectoryFileChange>()
-@@ -511,6 +527,20 @@
-   }
- 
-   private updateCompareState<K extends keyof ICompareState>(
-+<<<<<<< .our
-+=======
-+    repository: Repository,
-+    fn: (compareState: ICompareState) => Pick<ICompareState, K>
-+  ) {
-+    this.updateRepositoryState(repository, state => {
-+      const compareState = state.compareState
-+      const newValues = fn(compareState)
-+      return { compareState: merge(compareState, newValues) }
-+    })
-+  }
-+
-+  private updateHistoryState<K extends keyof IHistoryState>(
-+>>>>>>> .their
-     repository: Repository,
-     fn: (state: ICompareState) => Pick<ICompareState, K>
-   ) {
-@@ -700,6 +730,7 @@
-   }
- 
-   /** This shouldn't be called directly. See `Dispatcher`. */
-+<<<<<<< .our
-   public async _changeCommitSelection(
-     repository: Repository,
-     sha: string
-@@ -713,10 +744,53 @@
-       const commitSelection = { sha, file, diff: null, changedFiles }
-       return { commitSelection }
-     })
-+=======
-+  public async _loadCompareState(
-+    repository: Repository,
-+    branch: Branch | null,
-+    mode: CompareMode
-+  ): Promise<void> {
-+    const gitStore = this.getGitStore(repository)
-+
-+    if (mode === CompareMode.Default) {
-+      await gitStore.loadHistory()
-+
-+      const state = this.getRepositoryState(repository).historyState
-+      const commits = state.history
-+
-+      this.updateCompareState(repository, state => ({
-+        mode: mode,
-+        commits: commits,
-+        branch,
-+        aheadCount: 0,
-+        behindCount: 0,
-+      }))
-+    } else {
-+      if (branch == null) {
-+        log.debug(`oops, we can't compare if the branch isn't selected`)
-+        return
-+      }
-+
-+      const compare = await gitStore.getCompareDetails(branch, mode)
-+
-+      if (compare) {
-+        const commits = compare.commits.map(c => c.sha)
-+
-+        this.updateCompareState(repository, state => ({
-+          mode,
-+          commits,
-+          branch,
-+          aheadCount: compare.ahead,
-+          behindCount: compare.behind,
-+        }))
-+      }
-+    }
-+>>>>>>> .their
- 
-     this.emitUpdate()
-   }
- 
-+<<<<<<< .our
-   private updateOrSelectFirstCommit(
-     repository: Repository,
-     commitSHAs: ReadonlyArray<string>
-@@ -725,6 +799,20 @@
-     let selectedSHA = state.commitSelection.sha
-     if (selectedSHA != null) {
-       const index = commitSHAs.findIndex(sha => sha === selectedSHA)
-+=======
-+  /** This shouldn't be called directly. See `Dispatcher`. */
-+  public async _loadHistory(repository: Repository): Promise<void> {
-+    const gitStore = this.getGitStore(repository)
-+    await gitStore.loadHistory()
-+
-+    const state = this.getRepositoryState(repository).historyState
-+    let newSelection = state.selection
-+    const history = state.history
-+    const selectedSHA = state.selection.sha
-+    if (selectedSHA) {
-+      const index = history.findIndex(sha => sha === selectedSHA)
-+      // Our selected SHA disappeared, so clear the selection.
-+>>>>>>> .their
-       if (index < 0) {
-         // selected SHA is not in this list
-         // -> clear the selection in the app state
-changed in both
-  base   100644 d5a9ab172983707278c75f9f73fa2a82527a51fe app/src/lib/stores/git-store.ts
-  our    100644 f8eedeb9d958345be59538b82b1b69cd4326d73b app/src/lib/stores/git-store.ts
-  their  100644 11c74cbb03a3f5eb590071256708432c27f90433 app/src/lib/stores/git-store.ts
-@@ -12,7 +12,11 @@
- import { Tip, TipState } from '../../models/tip'
- import { Commit } from '../../models/commit'
- import { IRemote } from '../../models/remote'
-+<<<<<<< .our
- import { IFetchProgress, IRevertProgress, ComparisonView } from '../app-state'
-+=======
-+import { IFetchProgress, IRevertProgress, CompareMode } from '../app-state'
-+>>>>>>> .their
- 
- import { IAppShell } from '../app-shell'
- import { ErrorWithMetadata, IErrorMetadata } from '../error-with-metadata'
-@@ -29,6 +33,12 @@
-   getRecentBranches,
-   getBranches,
-   deleteRef,
-+<<<<<<< .our
-+=======
-+  IAheadBehind,
-+  getBranchAheadBehind,
-+  getAheadBehind,
-+>>>>>>> .their
-   getCommits,
-   merge,
-   setRemoteURL,
-@@ -50,11 +60,15 @@
-   mergeTrailers,
-   getTrailerSeparatorCharacters,
-   parseSingleUnfoldedTrailer,
-+<<<<<<< .our
-   isCoAuthoredByTrailer,
-   getAheadBehind,
-   revRange,
-   revSymmetricDifference,
-   getSymbolicRef,
-+=======
-+  ICompareResult,
-+>>>>>>> .their
- } from '../git'
- import { IGitAccount } from '../git/authentication'
- import { RetryAction, RetryActionType } from '../retry-actions'
-@@ -890,6 +904,56 @@
-     }
-   }
- 
-+  /** Calculate the ahead/behind for the current branch. */
-+  public async calculateAheadBehindForCurrentBranch(): Promise<void> {
-+    if (this.tip.kind === TipState.Valid) {
-+      const branch = this.tip.branch
-+      this._aheadBehind = await getBranchAheadBehind(this.repository, branch)
-+    }
-+
-+    this.emitUpdate()
-+  }
-+
-+  public async getCompareDetails(
-+    branch: Branch,
-+    mode: CompareMode
-+  ): Promise<ICompareResult | null> {
-+    if (this.tip.kind !== TipState.Valid) {
-+      return null
-+    }
-+
-+    let compare: ICompareResult | null = null
-+
-+    const base = this.tip.branch
-+
-+    const range =
-+      mode === CompareMode.Behind
-+        ? `${base.name}..${branch.name}`
-+        : `${branch.name}..${base.name}`
-+
-+    const commits = await getCommits(this.repository, range, 250)
-+
-+    const aheadBehind = await getAheadBehind(
-+      this.repository,
-+      `${base.name}...${branch.name}`
-+    )
-+
-+    if (aheadBehind) {
-+      compare = {
-+        ahead: aheadBehind.ahead,
-+        behind: aheadBehind.behind,
-+        commits,
-+      }
-+    }
-+
-+    if (commits) {
-+      this.storeCommits(commits)
-+      this.emitNewCommitsLoaded(commits)
-+    }
-+
-+    return compare
-+  }
-+
-   public async loadStatus(): Promise<IStatusResult | null> {
-     const status = await this.performFailableOperation(() =>
-       getStatus(this.repository)
-changed in both
-  base   100644 386fda7ba4818bba12c354f9b59a89893d760283 app/src/ui/history/commit-list.tsx
-  our    100644 3e0e90eccd5a8894b7cce153c15009fe732a39cc app/src/ui/history/commit-list.tsx
-  their  100644 cc0994bd40293e257d7db665dab7185d3f489f6d app/src/ui/history/commit-list.tsx
-@@ -8,6 +8,7 @@
- const RowHeight = 50
- 
- interface ICommitListProps {
-+<<<<<<< .our
-   /** The GitHub repository associated with this commit (if found) */
-   readonly gitHubRepository: GitHubRepository | null
- 
-@@ -18,6 +19,15 @@
-   readonly commitLookup: Map<string, Commit>
- 
-   /** The SHA of the selected commit */
-+=======
-+  readonly onCommitChanged: (commit: Commit) => void
-+  readonly onScroll?: (start: number, end: number) => void
-+  readonly onRevertCommit: (commit: Commit) => void
-+  readonly onViewCommitOnGitHub: (sha: string) => void
-+  readonly repository: Repository
-+  readonly list: ReadonlyArray<string>
-+  readonly commitLookup: Map<string, Commit>
-+>>>>>>> .their
-   readonly selectedSHA: string | null
- 
-   /** The lookup for GitHub users related to this repository */
-@@ -28,6 +38,7 @@
- 
-   /** The list of known local commits for the current branch */
-   readonly localCommitSHAs: ReadonlyArray<string>
-+<<<<<<< .our
- 
-   /** The message to display inside the list when no results are displayed */
-   readonly emptyListMessage: JSX.Element | string
-@@ -43,11 +54,15 @@
- 
-   /** Callback to fire to open a given commit on GitHub */
-   readonly onViewCommitOnGitHub: (sha: string) => void
-+=======
-+  readonly noCommitsMessage: string
-+>>>>>>> .their
- }
- 
- /** A component which displays the list of commits. */
- export class CommitList extends React.Component<ICommitListProps, {}> {
-   private renderCommit = (row: number) => {
-+<<<<<<< .our
-     const sha = this.props.commitSHAs[row]
-     const commit = this.props.commitLookup.get(sha)
- 
-@@ -57,6 +72,13 @@
-           `[CommitList]: the commit '${sha}' does not exist in the cache`
-         )
-       }
-+=======
-+    const sha = this.props.list[row]
-+    const commit = this.props.commitLookup.get(sha)
-+
-+    if (!commit) {
-+      log.debug(`[CommitList] unable to find commit ${sha} in cache`)
-+>>>>>>> .their
-       return null
-     }
- 
-@@ -76,8 +98,13 @@
-     )
-   }
- 
-+<<<<<<< .our
-   private onSelectedRowChanged = (row: number) => {
-     const sha = this.props.commitSHAs[row]
-+=======
-+  private onRowChanged = (row: number) => {
-+    const sha = this.props.list[row]
-+>>>>>>> .their
-     const commit = this.props.commitLookup.get(sha)
-     if (commit) {
-       this.props.onCommitSelected(commit)
-@@ -85,6 +112,10 @@
-   }
- 
-   private onScroll = (scrollTop: number, clientHeight: number) => {
-+    if (this.props.onScroll == null) {
-+      return
-+    }
-+
-     const numberOfRows = Math.ceil(clientHeight / RowHeight)
-     const top = Math.floor(scrollTop / RowHeight)
-     const bottom = top + numberOfRows
-@@ -97,6 +128,7 @@
-       return -1
-     }
- 
-+<<<<<<< .our
-     return this.props.commitSHAs.findIndex(s => s === sha)
-   }
- 
-@@ -104,20 +136,37 @@
-     if (this.props.commitSHAs.length === 0) {
-       return (
-         <div className="panel blankslate">{this.props.emptyListMessage}</div>
-+=======
-+    return this.props.list.findIndex(s => s === sha)
-+  }
-+
-+  public render() {
-+    if (this.props.list.length === 0) {
-+      return (
-+        <div className="panel blankslate">{this.props.noCommitsMessage}</div>
-+>>>>>>> .their
-       )
-     }
- 
-     return (
-       <div id="commit-list">
-         <List
-+<<<<<<< .our
-           rowCount={this.props.commitSHAs.length}
-+=======
-+          rowCount={this.props.list.length}
-+>>>>>>> .their
-           rowHeight={RowHeight}
-           selectedRows={[this.rowForSHA(this.props.selectedSHA)]}
-           rowRenderer={this.renderCommit}
-           onSelectedRowChanged={this.onSelectedRowChanged}
-           onScroll={this.onScroll}
-           invalidationProps={{
-+<<<<<<< .our
-             commits: this.props.commitSHAs,
-+=======
-+            list: this.props.list,
-+>>>>>>> .their
-             gitHubUsers: this.props.gitHubUsers,
-           }}
-         />
-added in remote
-  their  100644 3336dcc56f60b9a4c43323b82839abf6550d2725 app/src/ui/history/compare-sidebar.tsx
-@@ -0,0 +1,169 @@
-+import * as React from 'react'
-+import { CommitList } from './commit-list'
-+import { Repository } from '../../models/repository'
-+import { Commit } from '../../models/commit'
-+import { Dispatcher } from '../../lib/dispatcher'
-+import { IGitHubUser } from '../../lib/databases'
-+import { ICompareState, CompareMode } from '../../lib/app-state'
-+import { ThrottledScheduler } from '../lib/throttled-scheduler'
-+import { TabBar } from '../tab-bar'
-+import { Branch } from '../../models/branch'
-+import { Select } from '../lib/select'
-+
-+interface ICompareSidebarProps {
-+  readonly repository: Repository
-+  readonly dispatcher: Dispatcher
-+  readonly compare: ICompareState
-+  readonly gitHubUsers: Map<string, IGitHubUser>
-+  readonly emoji: Map<string, string>
-+  readonly commitLookup: Map<string, Commit>
-+  readonly branches: ReadonlyArray<Branch>
-+  readonly localCommitSHAs: ReadonlyArray<string>
-+  readonly onRevertCommit: (commit: Commit) => void
-+  readonly onViewCommitOnGitHub: (sha: string) => void
-+}
-+
-+/** The Sidebar component. Contains the branch list, the commit list, and the ability to filter commits. */
-+export class CompareSidebar extends React.Component<ICompareSidebarProps, {}> {
-+  private readonly loadChangedFilesScheduler = new ThrottledScheduler(200)
-+
-+  public constructor() {
-+    super()
-+  }
-+
-+  private onCommitChanged = (commit: Commit) => {
-+    this.props.dispatcher.changeHistoryCommitSelection(
-+      this.props.repository,
-+      commit.sha
-+    )
-+
-+    this.loadChangedFilesScheduler.queue(() => {
-+      this.props.dispatcher.loadChangedFilesForCurrentSelection(
-+        this.props.repository
-+      )
-+    })
-+  }
-+
-+  public componentWillMount() {
-+    this.props.dispatcher.loadCompareState(
-+      this.props.repository,
-+      null,
-+      CompareMode.Default
-+    )
-+  }
-+
-+  public componentWillUnmount() {
-+    this.loadChangedFilesScheduler.clear()
-+  }
-+
-+  private onBranchChange = (event: React.FormEvent<HTMLSelectElement>) => {
-+    const name = event.currentTarget.value
-+    const index = parseInt(name, 10)
-+
-+    if (isNaN(index)) {
-+      log.debug(`oops, we don't have a number?!??!?!`)
-+      return
-+    }
-+
-+    if (index === -1) {
-+      // 'None' is selected, just show history
-+      this.props.dispatcher.loadCompareState(
-+        this.props.repository,
-+        null,
-+        CompareMode.Default
-+      )
-+    } else {
-+      const branch = this.props.branches[index]
-+      if (branch == null) {
-+        log.debug(`oops, can't find branch: '${name}'`)
-+      }
-+
-+      this.props.dispatcher.loadCompareState(
-+        this.props.repository,
-+        branch,
-+        CompareMode.Behind
-+      )
-+    }
-+  }
-+
-+  private onTabClicked = (index: number) => {
-+    const mode: CompareMode =
-+      index === 0 ? CompareMode.Behind : CompareMode.Ahead
-+
-+    this.props.dispatcher.loadCompareState(
-+      this.props.repository,
-+      this.props.compare.branch,
-+      mode
-+    )
-+  }
-+
-+  private renderBranchList(): JSX.Element {
-+    const options = new Array<JSX.Element>()
-+    options.push(
-+      <option value={-1} key={-1}>
-+        None
-+      </option>
-+    )
-+
-+    let selectedIndex = -1
-+    for (const [index, branch] of this.props.branches.entries()) {
-+      if (
-+        this.props.compare.branch &&
-+        this.props.compare.branch.name === branch.name
-+      ) {
-+        selectedIndex = index
-+      }
-+
-+      options.push(
-+        <option value={index} key={branch.name}>
-+          {branch.name}
-+        </option>
-+      )
-+    }
-+
-+    return (
-+      <Select value={selectedIndex.toString()} onChange={this.onBranchChange}>
-+        {options}
-+      </Select>
-+    )
-+  }
-+
-+  private renderTabBar(): JSX.Element | null {
-+    const compare = this.props.compare
-+    if (compare.mode === CompareMode.Default) {
-+      return null
-+    }
-+
-+    const selectedTab = compare.mode === CompareMode.Ahead ? 0 : 1
-+
-+    return (
-+      <TabBar selectedIndex={selectedTab} onTabClicked={this.onTabClicked}>
-+        <span>Behind ({compare.behindCount})</span>
-+        <span>Ahead ({compare.aheadCount})</span>
-+      </TabBar>
-+    )
-+  }
-+  public render() {
-+    const compare = this.props.compare
-+    return (
-+      <div id="compare-view">
-+        {this.renderBranchList()}
-+        {this.renderTabBar()}
-+
-+        <CommitList
-+          repository={this.props.repository}
-+          commitLookup={this.props.commitLookup}
-+          list={compare.commits}
-+          selectedSHA={compare.selection.sha}
-+          onCommitChanged={this.onCommitChanged}
-+          gitHubUsers={this.props.gitHubUsers}
-+          emoji={this.props.emoji}
-+          localCommitSHAs={this.props.localCommitSHAs}
-+          onRevertCommit={this.props.onRevertCommit}
-+          onViewCommitOnGitHub={this.props.onViewCommitOnGitHub}
-+          noCommitsMessage={'No commits'}
-+        />
-+      </div>
-+    )
-+  }
-+}
-changed in both
-  base   100644 caa18019759a791f9a4e2b42c02a348a0cf36a0d app/src/ui/history/index.ts
-  our    100644 5314aa21a17e6eaad7f73ab8e92c99e6e83f2108 app/src/ui/history/index.ts
-  their  100644 fc92ceb826bd180f28e78e008f9c89a550858d9e app/src/ui/history/index.ts
-@@ -1,2 +1,8 @@
-+<<<<<<< .our
- export { SelectedCommit } from './selected-commit'
- export { CompareSidebar } from './compare'
-+=======
-+export { HistorySidebar } from './sidebar'
-+export { History } from './history'
-+export { CompareSidebar } from './compare-sidebar'
-+>>>>>>> .their
-removed in local
-  base   100644 24ee8948d1e538fc58d461106006cb88f899d096 app/src/ui/history/sidebar.tsx
-  their  100644 729e304c5cfe6f032a5198639abcb038a395f5ce app/src/ui/history/sidebar.tsx
-changed in both
-  base   100644 fa95746b3b525b06246015c03db11b35209b8fb1 app/src/ui/repository.tsx
-  our    100644 efb00423012b8da0dfa5e8897acacaeb0a5e648a app/src/ui/repository.tsx
-  their  100644 95f7a860788ad72489106227279578d041393f1c app/src/ui/repository.tsx
-@@ -5,9 +5,13 @@
- import { UiView } from './ui-view'
- import { Changes, ChangesSidebar } from './changes'
- import { NoChanges } from './changes/no-changes'
-+<<<<<<< .our
- import { MultipleSelection } from './changes/multiple-selection'
- import { FilesChangedBadge } from './changes/files-changed-badge'
- import { SelectedCommit, CompareSidebar } from './history'
-+=======
-+import { History, HistorySidebar, CompareSidebar } from './history'
-+>>>>>>> .their
- import { Resizable } from './resizable'
- import { TabBar } from './tab-bar'
- import {
-@@ -19,9 +23,13 @@
- import { IssuesStore, GitHubUserStore } from '../lib/stores'
- import { assertNever } from '../lib/fatal-error'
- import { Account } from '../models/account'
-+<<<<<<< .our
- import { enableNotificationOfBranchUpdates } from '../lib/feature-flag'
- import { FocusContainer } from './lib/focus-container'
- import { OcticonSymbol, Octicon } from './octicons'
-+=======
-+import { enableCompareTab } from '../lib/feature-flag'
-+>>>>>>> .their
- 
- /** The widest the sidebar can be with the minimum window size. */
- const MaxSidebarWidth = 495
-@@ -111,7 +119,12 @@
-               symbol={OcticonSymbol.primitiveDot}
-             />
-           ) : null}
-+<<<<<<< .our
-         </div>
-+=======
-+        </span>
-+        <span>{enableCompareTab() ? 'Compare' : 'History'}</span>
-+>>>>>>> .their
-       </TabBar>
-     )
-   }
-@@ -180,13 +193,37 @@
-     )
-   }
- 
-+  private renderCompareSidebar(): JSX.Element {
-+    return (
-+      <CompareSidebar
-+        repository={this.props.repository}
-+        dispatcher={this.props.dispatcher}
-+        compare={this.props.state.compareState}
-+        gitHubUsers={this.props.state.gitHubUsers}
-+        emoji={this.props.emoji}
-+        commitLookup={this.props.state.commits}
-+        localCommitSHAs={this.props.state.localCommitSHAs}
-+        onRevertCommit={this.onRevertCommit}
-+        onViewCommitOnGitHub={this.props.onViewCommitOnGitHub}
-+        branches={this.props.state.branchesState.allBranches}
-+      />
-+    )
-+  }
-+
-   private renderSidebarContents(): JSX.Element {
-     const selectedSection = this.props.state.selectedSection
- 
-     if (selectedSection === RepositorySectionTab.Changes) {
-       return this.renderChangesSidebar()
-+<<<<<<< .our
-     } else if (selectedSection === RepositorySectionTab.History) {
-       return this.renderCompareSidebar()
-+=======
-+    } else if (selectedSection === RepositorySection.History) {
-+      return enableCompareTab()
-+        ? this.renderCompareSidebar()
-+        : this.renderHistorySidebar()
-+>>>>>>> .their
-     } else {
-       return assertNever(selectedSection, 'Unknown repository section')
-     }
-changed in both
-  base   100644 867751eb28963ba7f852717ead2d03ce1abecff5 app/styles/ui/history/_history.scss
-  our    100644 58cea508b02182fa4f45daf88643d33c3b2dd020 app/styles/ui/history/_history.scss
-  their  100644 0f5e9af48f0d78ed4497fe4d1f91f234c37ae1e5 app/styles/ui/history/_history.scss
-@@ -17,6 +17,31 @@
-   }
- }
- 
-+#compare-view {
-+  display: flex;
-+  flex-direction: column;
-+  flex: 1;
-+
-+  .tab-bar {
-+    flex-grow: 0;
-+
-+    &-item {
-+      background: blue;
-+      color: white;
-+
-+      &.selected {
-+        box-shadow: none;
-+        background: white;
-+        color: blue;
-+      }
-+    }
-+  }
-+
-+  .select-component {
-+    flex-grow: 0;
-+  }
-+}
-+
- #commit-summary-container {
-   flex-grow: 0;
- }
diff --git a/app/test/fixtures/merge-parser/desktop/merge-ask-to-merge-b4-delete-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-ask-to-merge-b4-delete-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index ac5199ea953..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-ask-to-merge-b4-delete-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,127 +0,0 @@
-changed in both
-  base   100644 4391747c418ed9fe66a952d14148542b8166da72 app/src/lib/app-state.ts
-  our    100644 b30f0fe080d909b81d2fb683ceb8deb365fb0191 app/src/lib/app-state.ts
-  their  100644 9560d603f4b04dbf0c39da4dca97fa599266e767 app/src/lib/app-state.ts
-@@ -232,6 +232,7 @@
-       repository: Repository
-       branch: Branch
-       existsOnRemote: boolean
-+      aheadBehind: IAheadBehind | null
-     }
-   | {
-       type: PopupType.ConfirmDiscardChanges
-changed in both
-  base   100644 fa753001aaa85c2f4e7be934fa1b22ccc4ba0da9 app/src/ui/app.tsx
-  our    100644 c38c806e36c237ea70f3cdeee739941530c0c7cd app/src/ui/app.tsx
-  their  100644 4720f6bc902cf560cf83650003adc345a3c06a17 app/src/ui/app.tsx
-@@ -480,9 +480,11 @@
-           pullRequest: currentPullRequest,
-         })
-       } else {
--        const existsOnRemote = state.state.aheadBehind !== null
-+        const aheadBehind = state.state.aheadBehind
-+        const existsOnRemote = aheadBehind !== null
- 
-         this.props.dispatcher.showPopup({
-+          aheadBehind,
-           type: PopupType.DeleteBranch,
-           repository: state.repository,
-           branch: tip.branch,
-@@ -996,7 +998,11 @@
-             branch={popup.branch}
-             existsOnRemote={popup.existsOnRemote}
-             onDismissed={this.onPopupDismissed}
-+<<<<<<< .our
-             onDeleted={this.onBranchDeleted}
-+=======
-+            aheadBehind={popup.aheadBehind}
-+>>>>>>> .their
-           />
-         )
-       case PopupType.ConfirmDiscardChanges:
-changed in both
-  base   100644 da3dac8dfca303eb8512b4031e6da4b6545ba4a7 app/src/ui/delete-branch/delete-branch-dialog.tsx
-  our    100644 b5c948eb5b4bf338b32d13ebf5656729b009a7c9 app/src/ui/delete-branch/delete-branch-dialog.tsx
-  their  100644 5261d661964111a7d1b3dee8a54f8cd1c96f54c7 app/src/ui/delete-branch/delete-branch-dialog.tsx
-@@ -8,12 +8,14 @@
- import { Checkbox, CheckboxValue } from '../lib/checkbox'
- import { Dialog, DialogContent, DialogFooter } from '../dialog'
- import { Ref } from '../lib/ref'
-+import { IAheadBehind } from '../../lib/app-state'
- 
- interface IDeleteBranchProps {
-   readonly dispatcher: Dispatcher
-   readonly repository: Repository
-   readonly branch: Branch
-   readonly existsOnRemote: boolean
-+  readonly aheadBehind: IAheadBehind | null
-   readonly onDismissed: () => void
-   readonly onDeleted: (repository: Repository) => void
- }
-@@ -35,6 +37,42 @@
-   }
- 
-   public render() {
-+    const aheadBehind = this.props.aheadBehind
-+    return aheadBehind !== null && aheadBehind.ahead > 0
-+      ? this.renderDeleteBranchWithUnmergedCommits()
-+      : this.renderDeleteBranch()
-+  }
-+
-+  private renderDeleteBranchWithUnmergedCommits() {
-+    const unmergedCommits = this.props.aheadBehind!.ahead
-+
-+    return (
-+      <Dialog
-+        id="delete-branch"
-+        title={__DARWIN__ ? 'Delete Branch' : 'Delete branch'}
-+        type="warning"
-+        onDismissed={this.props.onDismissed}
-+      >
-+        <DialogContent>
-+          <p>
-+            <Ref>{this.props.branch.name}</Ref> has <em>{unmergedCommits}</em>{' '}
-+            unmerged {unmergedCommits === 1 ? 'commit' : 'commits'}.
-+            <br />
-+            Would you like to merge your changes first?
-+          </p>
-+        </DialogContent>
-+        <DialogFooter>
-+          <ButtonGroup destructive={true}>
-+            <Button type="submit">Cancel</Button>
-+            <Button onClick={this.deleteBranch}>No, Delete</Button>
-+            <Button onClick={this.mergeAndDelete}>Merge</Button>
-+          </ButtonGroup>
-+        </DialogFooter>
-+      </Dialog>
-+    )
-+  }
-+
-+  private renderDeleteBranch() {
-     return (
-       <Dialog
-         id="delete-branch"
-@@ -70,6 +108,9 @@
-               there as well?
-             </strong>
-           </p>
-+          {this.props.aheadBehind && this.props.aheadBehind.ahead > 0 ? (
-+            <p>Unmerged commits</p>
-+          ) : null}
-           <Checkbox
-             label="Yes, delete this branch on the remote"
-             value={
-@@ -105,4 +146,13 @@
- 
-     return dispatcher.closePopup()
-   }
-+
-+  private mergeAndDelete = async () => {
-+    await this.props.dispatcher.mergeBranch(
-+      this.props.repository,
-+      this.props.branch.name
-+    )
-+
-+    this.deleteBranch()
-+  }
- }
diff --git a/app/test/fixtures/merge-parser/desktop/merge-branch-list-context-menu-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-branch-list-context-menu-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index 8ce8be5d38f..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-branch-list-context-menu-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,399 +0,0 @@
-changed in both
-  base   100644 127d134f2254d76c375b7185af1f42369b62fed0 app/src/lib/app-state.ts
-  our    100644 b30f0fe080d909b81d2fb683ceb8deb365fb0191 app/src/lib/app-state.ts
-  their  100644 d6b50d72651124d3a81bab00a6e4e6db3d7a235c app/src/lib/app-state.ts
-@@ -231,7 +231,6 @@
-       type: PopupType.DeleteBranch
-       repository: Repository
-       branch: Branch
--      existsOnRemote: boolean
-     }
-   | {
-       type: PopupType.ConfirmDiscardChanges
-@@ -256,6 +255,7 @@
-       type: PopupType.CreateBranch
-       repository: Repository
-       initialName?: string
-+      initialBranch?: Branch
-     }
-   | { type: PopupType.SignIn }
-   | { type: PopupType.About }
-changed in both
-  base   100644 410fbd6dbd6833f45a8a2523bcc15c2ee62655a8 app/src/lib/git/remote.ts
-  our    100644 7b66498bbdb1a57b4bb465841fb247d2ee2d855a app/src/lib/git/remote.ts
-  their  100644 7d27a42280ceec6a910a852d8d601faec4e26a5c app/src/lib/git/remote.ts
-@@ -1,7 +1,11 @@
- import { git } from './core'
- import { Repository } from '../../models/repository'
- import { IRemote } from '../../models/remote'
-+<<<<<<< .our
- import { findDefaultRemote } from '../stores/helpers/find-default-remote'
-+=======
-+import { Branch } from '../../models/branch'
-+>>>>>>> .their
- 
- /** Get the remote names. */
- export async function getRemotes(
-@@ -71,3 +75,21 @@
- ): Promise<void> {
-   await git(['remote', 'set-url', name, url], repository.path, 'setRemoteURL')
- }
-+
-+export async function checkBranchExistsOnRemote(
-+  repository: Repository,
-+  branch: Branch
-+): Promise<boolean> {
-+  if (branch.upstream == null) {
-+    return false
-+  }
-+
-+  const result = await git(
-+    ['show-ref', '--verify', `refs/remotes/${branch.upstream}`],
-+    repository.path,
-+    'checkBranchExistsOnRemote',
-+    { successExitCodes: new Set([0, 128]) }
-+  )
-+
-+  return result.exitCode === 0
-+}
-changed in both
-  base   100644 700d3f933813e7f847a36b6d4955ef5f10bc88c5 app/src/lib/stores/app-store.ts
-  our    100644 1a4e387e4d192d34abfd0621b4b5ebe8cc34d8d1 app/src/lib/stores/app-store.ts
-  their  100644 96be41b737456250d8c40862f64593fbbeb7c86c app/src/lib/stores/app-store.ts
-@@ -2337,17 +2337,25 @@
-     includeRemote: boolean
-   ): Promise<void> {
-     return this.withAuthenticatingUser(repository, async (repo, account) => {
--      const defaultBranch = this.getRepositoryState(repository).branchesState
--        .defaultBranch
--      if (!defaultBranch) {
--        throw new Error(`No default branch!`)
--      }
--
-+      const state = this.getRepositoryState(repository)
-+      const branchesState = state.branchesState
-       const gitStore = this.getGitStore(repository)
- 
--      await gitStore.performFailableOperation(() =>
--        checkoutBranch(repository, account, defaultBranch)
--      )
-+      // If we are on the branch about to be deleted then checkout the default branch
-+      if (
-+        branchesState.tip.kind === TipState.Valid &&
-+        branchesState.tip.branch.name === branch.name
-+      ) {
-+        const defaultBranch = branchesState.defaultBranch
-+        if (!defaultBranch) {
-+          throw new Error(`No default branch!`)
-+        }
-+
-+        await gitStore.performFailableOperation(() =>
-+          checkoutBranch(repository, account, defaultBranch)
-+        )
-+      }
-+
-       await gitStore.performFailableOperation(() =>
-         deleteBranch(repository, branch, account, includeRemote)
-       )
-changed in both
-  base   100644 ad5d5eba9271c0a3c016320ae691ba2d231ebff1 app/src/ui/app.tsx
-  our    100644 c38c806e36c237ea70f3cdeee739941530c0c7cd app/src/ui/app.tsx
-  their  100644 66fff264a2ab171d481980e7fe2dea6002258633 app/src/ui/app.tsx
-@@ -480,13 +480,10 @@
-           pullRequest: currentPullRequest,
-         })
-       } else {
--        const existsOnRemote = state.state.aheadBehind !== null
--
-         this.props.dispatcher.showPopup({
-           type: PopupType.DeleteBranch,
-           repository: state.repository,
-           branch: tip.branch,
--          existsOnRemote: existsOnRemote,
-         })
-       }
-     }
-@@ -994,7 +991,6 @@
-             dispatcher={this.props.dispatcher}
-             repository={popup.repository}
-             branch={popup.branch}
--            existsOnRemote={popup.existsOnRemote}
-             onDismissed={this.onPopupDismissed}
-             onDeleted={this.onBranchDeleted}
-           />
-@@ -1135,6 +1131,7 @@
-             onDismissed={this.onPopupDismissed}
-             dispatcher={this.props.dispatcher}
-             initialName={popup.initialName || ''}
-+            initialBranch={popup.initialBranch || null}
-           />
-         )
-       }
-changed in both
-  base   100644 ab87ff630fe03d9c24c822f395f086c9b3f50e57 app/src/ui/branches/branch-list.tsx
-  our    100644 f996cca6bcc1348eedd5f3c852bf8652b60f95aa app/src/ui/branches/branch-list.tsx
-  their  100644 171d2fe4f62d9d954f2acc377641cbedfcee050b app/src/ui/branches/branch-list.tsx
-@@ -89,6 +89,7 @@
-    */
-   readonly onCreateNewBranch?: (name: string) => void
- 
-+<<<<<<< .our
-   readonly textbox?: TextBox
- 
-   /**
-@@ -103,6 +104,13 @@
-    * Callback to fire when the items in the filter list are updated
-    */
-   readonly onFilterListResultsChanged?: (resultCount: number) => void
-+=======
-+  /** Can users perform operations on a branch in the list via a context menu? */
-+  readonly canShowBranchContextMenu: boolean
-+
-+  readonly onCreateNewBranchFromStartPoint?: (branch: Branch) => void
-+  readonly onDeleteBranch?: (branch: Branch) => void
-+>>>>>>> .their
- }
- 
- interface IBranchListState {
-@@ -169,6 +177,7 @@
- 
-   public render() {
-     return (
-+<<<<<<< .our
-       <FilterList<IBranchListItem>
-         ref={this.onBranchesFilterListRef}
-         className="branches-list"
-@@ -187,6 +196,19 @@
-         renderNoItems={this.onRenderNoItems}
-         filterTextBox={this.props.textbox}
-         onFilterListResultsChanged={this.props.onFilterListResultsChanged}
-+=======
-+      <BranchListItem
-+        name={branch.name}
-+        branch={branch}
-+        isCurrentBranch={branch.name === currentBranchName}
-+        lastCommitDate={commit ? commit.author.date : null}
-+        filterText={this.props.filterText}
-+        canShowBranchContextMenu={this.props.canShowBranchContextMenu}
-+        onCreateNewBranchFromStartPoint={
-+          this.props.onCreateNewBranchFromStartPoint
-+        }
-+        onDeleteBranch={this.props.onDeleteBranch}
-+>>>>>>> .their
-       />
-     )
-   }
-removed in local
-  base   100644 8bf53381567f66aec89c869080a6b63370255bc9 app/src/ui/branches/branch.tsx
-  their  100644 dd910faed7e44a048ad50cd9b8be32bda1c6b98c app/src/ui/branches/branch.tsx
-changed in both
-  base   100644 cd420b66aae0a2d4b6b67873a7c96615d8d849b7 app/src/ui/branches/branches-container.tsx
-  our    100644 6a5612ae608b20b3a486f139daf4063209bca568 app/src/ui/branches/branches-container.tsx
-  their  100644 0be690e0e17b8145499ab1005ba1db57748dd002 app/src/ui/branches/branches-container.tsx
-@@ -123,7 +123,13 @@
-             onSelectionChanged={this.onBranchSelectionChanged}
-             canCreateNewBranch={true}
-             onCreateNewBranch={this.onCreateBranchWithName}
-+<<<<<<< .our
-             renderBranch={this.renderBranch}
-+=======
-+            canShowBranchContextMenu={true}
-+            onCreateNewBranchFromStartPoint={this.onCreateBranchFromStartPoint}
-+            onDeleteBranch={this.onDeleteBranch}
-+>>>>>>> .their
-           />
-         )
- 
-@@ -214,6 +220,7 @@
-     this.onCreateBranchWithName('')
-   }
- 
-+<<<<<<< .our
-   private onPullRequestFilterTextChanged = (text: string) => {
-     this.setState({ pullRequestFilterText: text })
-   }
-@@ -222,6 +229,25 @@
-     selectedPullRequest: PullRequest | null
-   ) => {
-     this.setState({ selectedPullRequest })
-+=======
-+  private onCreateBranchFromStartPoint = (branch: Branch) => {
-+    this.props.dispatcher.closeFoldout(FoldoutType.Branch)
-+    this.props.dispatcher.showPopup({
-+      type: PopupType.CreateBranch,
-+      repository: this.props.repository,
-+      initialBranch: branch,
-+    })
-+  }
-+
-+  private onDeleteBranch = (branch: Branch) => {
-+    this.props.dispatcher.closeFoldout(FoldoutType.Branch)
-+
-+    this.props.dispatcher.showPopup({
-+      type: PopupType.DeleteBranch,
-+      repository: this.props.repository,
-+      branch: branch,
-+    })
-+>>>>>>> .their
-   }
- 
-   private onCreatePullRequest = () => {
-changed in both
-  base   100644 ab931838d66433189cf4cbb0f620aed220c3541c app/src/ui/create-branch/create-branch-dialog.tsx
-  our    100644 32e07b11abcf52024da6e39cb60a165d3f045b96 app/src/ui/create-branch/create-branch-dialog.tsx
-  their  100644 607b46f8be838ed96095fcb1dd6bfc2a88df73c8 app/src/ui/create-branch/create-branch-dialog.tsx
-@@ -29,11 +29,13 @@
-   readonly defaultBranch: Branch | null
-   readonly allBranches: ReadonlyArray<Branch>
-   readonly initialName: string
-+  readonly initialBranch: Branch | null
- }
- 
- enum StartPoint {
-   CurrentBranch,
-   DefaultBranch,
-+  InitialBranch,
-   Head,
- }
- 
-@@ -81,6 +83,10 @@
-   props: ICreateBranchProps,
-   preferred: StartPoint
- ): StartPoint {
-+  if (props.initialBranch !== null) {
-+    return StartPoint.InitialBranch
-+  }
-+
-   if (preferred === StartPoint.DefaultBranch && props.defaultBranch) {
-     return preferred
-   }
-@@ -144,6 +150,18 @@
-   }
- 
-   private renderBranchSelection() {
-+    if (
-+      this.state.startPoint === StartPoint.InitialBranch &&
-+      this.props.initialBranch !== null
-+    ) {
-+      const initialBranch = this.props.initialBranch
-+      return (
-+        <p>
-+          Your new branch will be based on <Ref>{initialBranch.name}</Ref>.
-+        </p>
-+      )
-+    }
-+
-     const tip = this.state.isCreatingBranch
-       ? this.state.tipAtCreateStart
-       : this.props.tip
-@@ -308,6 +326,11 @@
-       }
- 
-       startPoint = this.props.defaultBranch.name
-+    } else if (
-+      this.state.startPoint === StartPoint.InitialBranch &&
-+      this.props.initialBranch !== null
-+    ) {
-+      startPoint = this.props.initialBranch.name
-     }
- 
-     if (name.length > 0) {
-changed in both
-  base   100644 da3dac8dfca303eb8512b4031e6da4b6545ba4a7 app/src/ui/delete-branch/delete-branch-dialog.tsx
-  our    100644 b5c948eb5b4bf338b32d13ebf5656729b009a7c9 app/src/ui/delete-branch/delete-branch-dialog.tsx
-  their  100644 cee22ba52f34ad99f8f83c2b9ae74cee0a0eeefd app/src/ui/delete-branch/delete-branch-dialog.tsx
-@@ -8,17 +8,18 @@
- import { Checkbox, CheckboxValue } from '../lib/checkbox'
- import { Dialog, DialogContent, DialogFooter } from '../dialog'
- import { Ref } from '../lib/ref'
-+import { checkBranchExistsOnRemote } from '../../lib/git'
- 
- interface IDeleteBranchProps {
-   readonly dispatcher: Dispatcher
-   readonly repository: Repository
-   readonly branch: Branch
--  readonly existsOnRemote: boolean
-   readonly onDismissed: () => void
-   readonly onDeleted: (repository: Repository) => void
- }
- 
- interface IDeleteBranchState {
-+  readonly existsOnRemote: boolean | null
-   readonly includeRemoteBranch: boolean
- }
- 
-@@ -26,14 +27,49 @@
-   IDeleteBranchProps,
-   IDeleteBranchState
- > {
-+  private checkingRemote = false
-+
-   public constructor(props: IDeleteBranchProps) {
-     super(props)
- 
-     this.state = {
-+      existsOnRemote: null,
-       includeRemoteBranch: false,
-     }
-   }
- 
-+  public componentWillReceiveProps(nextProps: IDeleteBranchProps) {
-+    if (this.checkingRemote) {
-+      // a check is being performed, don't start another
-+      return
-+    }
-+
-+    const upstreamChanged =
-+      this.props.branch.upstream !== nextProps.branch.upstream
-+
-+    if (this.state.existsOnRemote == null || upstreamChanged) {
-+      this.checkingRemote = true
-+
-+      checkBranchExistsOnRemote(this.props.repository, this.props.branch)
-+        .then(existsOnRemote => {
-+          this.setState({ existsOnRemote }, () => {
-+            this.checkingRemote = false
-+          })
-+        })
-+        .catch(err => {
-+          log.warn(
-+            `[DeleteBranch] unable to resolve upstream branch: '${
-+              this.props.branch.upstream
-+            }'`,
-+            err
-+          )
-+          this.setState({ existsOnRemote: false }, () => {
-+            this.checkingRemote = false
-+          })
-+        })
-+    }
-+  }
-+
-   public render() {
-     return (
-       <Dialog
-@@ -61,7 +97,7 @@
-   }
- 
-   private renderDeleteOnRemote() {
--    if (this.props.branch.remote && this.props.existsOnRemote) {
-+    if (this.props.branch.remote && this.state.existsOnRemote == true) {
-       return (
-         <div>
-           <p>
-changed in both
-  base   100644 66f1ac9540d0b20783d94a33dc206abae4066abc app/src/ui/merge-branch/merge.tsx
-  our    100644 6a7e6976257ec16e58a7331db61b40096a9bde08 app/src/ui/merge-branch/merge.tsx
-  their  100644 05e3f12681012e8417df4a5dfe10374049c9fd35 app/src/ui/merge-branch/merge.tsx
-@@ -169,7 +169,11 @@
-             selectedBranch={selectedBranch}
-             onSelectionChanged={this.onSelectionChanged}
-             canCreateNewBranch={false}
-+<<<<<<< .our
-             renderBranch={this.renderBranch}
-+=======
-+            canShowBranchContextMenu={false}
-+>>>>>>> .their
-           />
-         </DialogContent>
-         <DialogFooter>
diff --git a/app/test/fixtures/merge-parser/desktop/merge-check-myself-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-check-myself-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index 360d7e380e3..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-check-myself-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-changed in both
-  base   100644 019328fd749b749d0c8241dd48b78a28c3da86ac app/styles/ui/_diff.scss
-  our    100644 372c4e6b8d6af44922f648559b128e98c085134d app/styles/ui/_diff.scss
-  their  100644 6ada10edc2ece1c4ffc7290a954ea7431bab56f0 app/styles/ui/_diff.scss
-@@ -37,9 +37,13 @@
-       // Add a little bit of space to the left of code diff
-       // `padding-left` here means mouse move events are not raised
-       padding-left: var(--spacing-half);
-+<<<<<<< .our
-       padding-top: var(--diff-line-padding-y);
-       padding-bottom: var(--diff-line-padding-y);
-       display: inline-block;
-+=======
-+      align-self: center;
-+>>>>>>> .their
-     }
- 
-     svg.no-newline {
-@@ -210,11 +214,27 @@
-     background: var(--diff-selected-background-color);
-     border-color: var(--diff-selected-border-color);
-     color: var(--diff-selected-text-color);
-+    position: relative;
- 
-     &:last-child {
-       border-color: var(--diff-selected-gutter-color);
-     }
-   }
-+
-+  .before:before {
-+    // https://css-tricks.com/probably-dont-base64-svg/
-+    background: url('data:image/svg+xml;utf,<svg width="12" height="16" viewBox="0 0 12 16" xmlns="http://www.w3.org/2000/svg"><path d="M12 5l-8 8-4-4 1.5-1.5L4 10l6.5-6.5z" fill="#fff" fill-rule="evenodd"/></svg>');
-+    background-size: contain;
-+    background-repeat: no-repeat;
-+    content: "";
-+
-+    height: 12px;
-+    width: 7px;
-+
-+    position: absolute;
-+    left: var(--spacing-half);
-+    top: var(--spacing-half);
-+  }
- }
- 
- .CodeMirror pre.CodeMirror-line .diff-line-hover {
diff --git a/app/test/fixtures/merge-parser/desktop/merge-custom-remotes-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-custom-remotes-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index 8bf5f0e433a..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-custom-remotes-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,347 +0,0 @@
-changed in both
-  base   100644 69f6d89b2b8e4538175e2665b3d8ac7572f352dd app/src/lib/app-state.ts
-  our    100644 b30f0fe080d909b81d2fb683ceb8deb365fb0191 app/src/lib/app-state.ts
-  their  100644 83b4a4082aca001ae313a23682a17d734f41d307 app/src/lib/app-state.ts
-@@ -218,11 +218,15 @@
-   GenericGitAuthentication,
-   ExternalEditorFailed,
-   OpenShellFailed,
-+<<<<<<< .our
-   InitializeLFS,
-   LFSAttributeMismatch,
-   UpstreamAlreadyExists,
-   DeletePullRequest,
-   MergeConflicts,
-+=======
-+  CustomRemote,
-+>>>>>>> .their
- }
- 
- export type Popup =
-@@ -288,6 +292,7 @@
-       openPreferences?: boolean
-     }
-   | { type: PopupType.OpenShellFailed; message: string }
-+<<<<<<< .our
-   | { type: PopupType.InitializeLFS; repositories: ReadonlyArray<Repository> }
-   | { type: PopupType.LFSAttributeMismatch }
-   | {
-@@ -302,6 +307,9 @@
-       pullRequest: PullRequest
-     }
-   | { type: PopupType.MergeConflicts; repository: Repository }
-+=======
-+  | { type: PopupType.CustomRemote; repository: Repository }
-+>>>>>>> .their
- 
- export enum FoldoutType {
-   Repository,
-removed in local
-  base   100644 23643984c62c0f40df503da96f8270bef3184342 app/src/lib/dispatcher/app-store.ts
-  their  100644 ad47b9a6f23c73297ee93eb343189855870394bf app/src/lib/dispatcher/app-store.ts
-changed in both
-  base   100644 17e3db009ef93095824e72a628647dac734e0a6a app/src/lib/dispatcher/dispatcher.ts
-  our    100644 5e56c00e713342e76f5ccba040062e322e8c90cb app/src/lib/dispatcher/dispatcher.ts
-  their  100644 649058ff79bc3b0a79a9e63d802ffa4ba85c606a app/src/lib/dispatcher/dispatcher.ts
-@@ -323,7 +323,7 @@
-   }
- 
-   /** Publish the repository to GitHub with the given properties. */
--  public publishRepository(
-+  public publishGitHubRepository(
-     repository: Repository,
-     name: string,
-     description: string,
-@@ -331,7 +331,7 @@
-     account: Account,
-     org: IAPIUser | null
-   ): Promise<Repository> {
--    return this.appStore._publishRepository(
-+    return this.appStore._publishGitHubRepository(
-       repository,
-       name,
-       description,
-@@ -341,6 +341,11 @@
-     )
-   }
- 
-+  /** Publish the repository to a generic server */
-+  public publishRepository(repository: Repository, url: string) {
-+    return this.appStore._publishRepository(repository, url)
-+  }
-+
-   /**
-    * Post the given error. This will send the error through the standard error
-    * handler machinery.
-changed in both
-  base   100644 448ad8844bdc47187d3bc3b9e922ed3ae043d4b1 app/src/ui/app.tsx
-  our    100644 c38c806e36c237ea70f3cdeee739941530c0c7cd app/src/ui/app.tsx
-  their  100644 c4b6a050bb6c6998ad7a9e44b1437d8b88d379f8 app/src/ui/app.tsx
-@@ -73,7 +73,13 @@
- import { InstallGit } from './install-git'
- import { EditorError } from './editor'
- import { About } from './about'
-+<<<<<<< .our
- import { Publish } from './publish-repository'
-+=======
-+import { getVersion, getName } from './lib/app-proxy'
-+import { shell } from '../lib/dispatcher/app-shell'
-+import { Publish, PublishCustomRemote } from './publish-repository'
-+>>>>>>> .their
- import { Acknowledgements } from './acknowledgements'
- import { UntrustedCertificate } from './untrusted-certificate'
- import { BlankSlateView } from './blank-slate'
-@@ -1242,6 +1248,7 @@
-             showPreferencesDialog={this.onShowAdvancedPreferences}
-           />
-         )
-+<<<<<<< .our
-       case PopupType.InitializeLFS:
-         return (
-           <InitializeLFS
-@@ -1281,6 +1288,11 @@
-       case PopupType.MergeConflicts:
-         return (
-           <MergeConflictsWarning
-+=======
-+      case PopupType.CustomRemote:
-+        return (
-+          <PublishCustomRemote
-+>>>>>>> .their
-             dispatcher={this.props.dispatcher}
-             repository={popup.repository}
-             onDismissed={this.onPopupDismissed}
-merged
-  result 100644 84a3e04a615cc5df1f2b5bdef5e8e279f51036c3 app/src/ui/publish-repository/index.ts
-  our    100644 f5e47702e7106f1090fd4542e41a43160aea84fc app/src/ui/publish-repository/index.ts
-@@ -1 +1,2 @@
- export { Publish } from './publish'
-+export { PublishCustomRemote } from './publish-custom-remote'
-added in remote
-  their  100644 023e9ec75b887bc1ef556b1e0fbad48ec415a173 app/src/ui/publish-repository/publish-custom-remote.tsx
-@@ -0,0 +1,128 @@
-+import * as React from 'react'
-+import { Dialog, DialogContent, DialogFooter, DialogError } from '../dialog'
-+// import { Account } from '../../models/account'
-+import { Button } from '../lib/button'
-+import { ButtonGroup } from '../lib/button-group'
-+import { Row } from '../lib/row'
-+import { TextBox } from '../lib/text-box'
-+import { Dispatcher } from '../../lib/dispatcher/dispatcher'
-+import { PopupType } from '../../lib/app-state'
-+import { Repository } from '../../models/repository'
-+
-+interface IPublishCustomRemoteProps {
-+  /** The user to use for publishing. */
-+  //readonly account: Account
-+
-+  readonly dispatcher: Dispatcher
-+  readonly repository: Repository
-+  readonly onDismissed: () => void
-+}
-+
-+interface IPublishCustomRemoteState {
-+  readonly disabled: boolean
-+  readonly remoteURL: string
-+  readonly errors?: ReadonlyArray<JSX.Element | string>
-+}
-+
-+export class PublishCustomRemote extends React.Component<
-+  IPublishCustomRemoteProps,
-+  IPublishCustomRemoteState
-+> {
-+  public constructor(props: IPublishCustomRemoteProps) {
-+    super(props)
-+
-+    this.state = {
-+      disabled: false,
-+      remoteURL: '',
-+    }
-+  }
-+
-+  public render() {
-+    return (
-+      <Dialog
-+        id="publish-custom-remote"
-+        title={
-+          __DARWIN__ ? 'Publish to Custom Remote' : 'Publish to custom remote'
-+        }
-+        onDismissed={this.props.onDismissed}
-+        onSubmit={this.onSubmit}
-+        disabled={this.state.disabled}
-+      >
-+        {this.renderErrors()}
-+        <DialogContent>
-+          <Row>
-+            <TextBox
-+              label="Primary remote repository (origin) URL"
-+              placeholder="https://github.com/example-org/repo-name.git"
-+              value={this.state.remoteURL}
-+              autoFocus={true}
-+              onChange={this.onURLChanged}
-+            />
-+          </Row>
-+        </DialogContent>
-+        <DialogFooter>
-+          <ButtonGroup>
-+            <Button type="submit" onClick={this.onSubmit}>
-+              {'Save & Publish'}
-+            </Button>
-+            <Button onClick={this.onCancel}>Cancel</Button>
-+          </ButtonGroup>
-+        </DialogFooter>
-+      </Dialog>
-+    )
-+  }
-+
-+  private onSubmit = async () => {
-+    this.setState({ disabled: true, errors: undefined })
-+    const errors = new Array<JSX.Element | string>()
-+
-+    try {
-+      this.props.dispatcher.publishRepository(
-+        this.props.repository,
-+        this.state.remoteURL
-+      )
-+    } catch (err) {
-+      log.error(
-+        `PublishCustomRemote: unable to set remote URL at ${this.state
-+          .remoteURL}`,
-+        err
-+      )
-+
-+      errors.push(err)
-+    }
-+
-+    if (!errors.length) {
-+      this.props.onDismissed()
-+    } else {
-+      this.setState({ disabled: false, errors })
-+    }
-+  }
-+
-+  private onCancel = () => {
-+    this.props.dispatcher.showPopup({
-+      type: PopupType.RepositorySettings,
-+      repository: this.props.repository,
-+    })
-+  }
-+
-+  private onURLChanged = (event: React.FormEvent<HTMLInputElement>) => {
-+    this.setState({ remoteURL: event.currentTarget.value })
-+  }
-+
-+  private renderErrors(): JSX.Element[] | null {
-+    const errors = this.state.errors
-+
-+    if (!errors || !errors.length) {
-+      return null
-+    }
-+
-+    return errors.map((err, ix) => {
-+      const key = `err-${ix}`
-+      return (
-+        <DialogError key={key}>
-+          {err}
-+        </DialogError>
-+      )
-+    })
-+  }
-+}
-changed in both
-  base   100644 e82303171a46f7e6e538ccaaaf1e3d4732c7caec app/src/ui/publish-repository/publish.tsx
-  our    100644 ffbdef89f9f0f16e966a7d27c2db06bd897c3db6 app/src/ui/publish-repository/publish.tsx
-  their  100644 ce385de07594200b72c58b9449625a769680b4cd app/src/ui/publish-repository/publish.tsx
-@@ -223,7 +223,7 @@
-     const settings = this.state.publishSettings
- 
-     try {
--      await this.props.dispatcher.publishRepository(
-+      await this.props.dispatcher.publishGitHubRepository(
-         this.props.repository,
-         settings.name,
-         settings.description,
-merged
-  result 100644 253e05b3b6b6dadfcbd297f717943d188658a734 app/src/ui/repository-settings/no-remote.tsx
-  our    100644 a9ed19c55cd570767b8846f4db799402371f4411 app/src/ui/repository-settings/no-remote.tsx
-@@ -1,28 +1,36 @@
- import * as React from 'react'
--import { DialogContent } from '../dialog'
-+import { DialogContent, DialogFooter } from '../dialog'
-+import { Button } from '../lib/button'
- import { LinkButton } from '../lib/link-button'
--import { CallToAction } from '../lib/call-to-action'
-+import { ButtonGroup } from '../lib/button-group'
- 
- const HelpURL = 'https://help.github.com/articles/about-remote-repositories/'
- 
- interface INoRemoteProps {
--  /** The function to call when the users chooses to publish. */
-+  /** The function to call when the users chooses to publish to github. */
-   readonly onPublish: () => void
-+  readonly onUseCustomRemote: () => void
- }
- 
- /** The component for when a repository has no remote. */
- export class NoRemote extends React.Component<INoRemoteProps, {}> {
-   public render() {
-     return (
--      <DialogContent>
--        <CallToAction actionTitle="Publish" onAction={this.props.onPublish}>
--          <div>
--            Publish your repository to GitHub. Need help?{' '}
--            <LinkButton uri={HelpURL}>Learn more</LinkButton> about remote
--            repositories.
--          </div>
--        </CallToAction>
--      </DialogContent>
-+      <div>
-+        <DialogContent>
-+          Publish your repository to GitHub. Need help?{' '}
-+          <LinkButton uri={HelpURL}>Learn more</LinkButton> about remote
-+          repositories.
-+        </DialogContent>
-+        <DialogFooter>
-+          <ButtonGroup>
-+            <Button onClick={this.props.onUseCustomRemote}>
-+              {__DARWIN__ ? 'Setup Custom Remote' : 'Setup custom remote'}
-+            </Button>
-+            <Button onClick={this.props.onPublish}>Publish to GitHub</Button>
-+          </ButtonGroup>
-+        </DialogFooter>
-+      </div>
-     )
-   }
- }
-changed in both
-  base   100644 b5530eb5e8f11fc058f527837d2d02b797f95242 app/src/ui/repository-settings/repository-settings.tsx
-  our    100644 df6e4cf60b4e535a69c9fc0a585902ada9e70fbb app/src/ui/repository-settings/repository-settings.tsx
-  their  100644 a65a8f8b98ef5dfdcf5c28d69f4fc5093211c1d9 app/src/ui/repository-settings/repository-settings.tsx
-@@ -134,7 +134,12 @@
-             />
-           )
-         } else {
--          return <NoRemote onPublish={this.onPublish} />
-+          return (
-+            <NoRemote
-+              onUseCustomRemote={this.onUseCustomRemote}
-+              onPublish={this.onPublish}
-+            />
-+          )
-         }
-       }
-       case RepositorySettingsTab.IgnoredFiles: {
-@@ -158,6 +163,13 @@
-     })
-   }
- 
-+  private onUseCustomRemote = () => {
-+    this.props.dispatcher.showPopup({
-+      type: PopupType.CustomRemote,
-+      repository: this.props.repository,
-+    })
-+  }
-+
-   private onShowGitIgnoreExamples = () => {
-     this.props.dispatcher.openInBrowser('https://git-scm.com/docs/gitignore')
-   }
diff --git a/app/test/fixtures/merge-parser/desktop/merge-cypress-spike-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-cypress-spike-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index 8ddf6a07e5e..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-cypress-spike-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,3432 +0,0 @@
-added in remote
-  their  100644 0967ef424bce6791893e9a57bb952f80fd536e93 cypress.json
-@@ -0,0 +1 @@
-+{}
-added in remote
-  their  100644 da18d9352a17d427321962199a1fa43b8ab5cfe4 cypress/fixtures/example.json
-@@ -0,0 +1,5 @@
-+{
-+  "name": "Using fixtures to represent data",
-+  "email": "hello@cypress.io",
-+  "body": "Fixtures are a great way to mock data for responses to routes"
-+}
-\ No newline at end of file
-added in remote
-  their  100644 562d88deca0352fa481a766c500cf50f0ebcef5e cypress/integration/test.spec.ts
-@@ -0,0 +1,1497 @@
-+//
-+// **** Kitchen Sink Tests ****
-+//
-+// This app was developed to demonstrate
-+// how to write tests in Cypress utilizing
-+// all of the available commands
-+//
-+// Feel free to modify this spec in your
-+// own application as a jumping off point
-+
-+// Please read our "Introduction to Cypress"
-+// https://on.cypress.io/introduction-to-cypress
-+
-+describe('Kitchen Sink', function () {
-+  it('.should() - assert that <title> is correct', function () {
-+    // https://on.cypress.io/visit
-+    cy.visit('https://example.cypress.io')
-+
-+    // Here we've made our first assertion using a '.should()' command.
-+    // An assertion is comprised of a chainer, subject, and optional value.
-+
-+    // https://on.cypress.io/should
-+    // https://on.cypress.io/and
-+
-+    // https://on.cypress.io/title
-+    cy.title().should('include', 'Kitchen Sink')
-+    //   ↲               ↲            ↲
-+    // subject        chainer      value
-+  })
-+
-+  context('Querying', function () {
-+    beforeEach(function () {
-+      // Visiting our app before each test removes any state build up from
-+      // previous tests. Visiting acts as if we closed a tab and opened a fresh one
-+      cy.visit('https://example.cypress.io/commands/querying')
-+    })
-+
-+    // Let's query for some DOM elements and make assertions
-+    // The most commonly used query is 'cy.get()', you can
-+    // think of this like the '$' in jQuery
-+
-+    it('cy.get() - query DOM elements', function () {
-+      // https://on.cypress.io/get
-+
-+      // Get DOM elements by id
-+      cy.get('#query-btn').should('contain', 'Button')
-+
-+      // Get DOM elements by class
-+      cy.get('.query-btn').should('contain', 'Button')
-+
-+      cy.get('#querying .well>button:first').should('contain', 'Button')
-+      //              ↲
-+      // Use CSS selectors just like jQuery
-+    })
-+
-+    it('cy.contains() - query DOM elements with matching content', function () {
-+      // https://on.cypress.io/contains
-+      cy.get('.query-list')
-+        .contains('bananas').should('have.class', 'third')
-+
-+      // we can pass a regexp to `.contains()`
-+      cy.get('.query-list')
-+        .contains(/^b\w+/).should('have.class', 'third')
-+
-+      cy.get('.query-list')
-+        .contains('apples').should('have.class', 'first')
-+
-+      // passing a selector to contains will yield the selector containing the text
-+      cy.get('#querying')
-+        .contains('ul', 'oranges').should('have.class', 'query-list')
-+
-+      // `.contains()` will favor input[type='submit'],
-+      // button, a, and label over deeper elements inside them
-+      // this will not yield the <span> inside the button,
-+      // but the <button> itself
-+      cy.get('.query-button')
-+        .contains('Save Form').should('have.class', 'btn')
-+    })
-+
-+    it('.within() - query DOM elements within a specific element', function () {
-+      // https://on.cypress.io/within
-+      cy.get('.query-form').within(function () {
-+        cy.get('input:first').should('have.attr', 'placeholder', 'Email')
-+        cy.get('input:last').should('have.attr', 'placeholder', 'Password')
-+      })
-+    })
-+
-+    it('cy.root() - query the root DOM element', function () {
-+      // https://on.cypress.io/root
-+      // By default, root is the document
-+      cy.root().should('match', 'html')
-+
-+      cy.get('.query-ul').within(function () {
-+        // In this within, the root is now the ul DOM element
-+        cy.root().should('have.class', 'query-ul')
-+      })
-+    })
-+  })
-+
-+  context('Traversal', function () {
-+    beforeEach(function () {
-+      cy.visit('https://example.cypress.io/commands/traversal')
-+    })
-+
-+    // Let's query for some DOM elements and make assertions
-+
-+    it('.children() - get child DOM elements', function () {
-+      // https://on.cypress.io/children
-+      cy.get('.traversal-breadcrumb').children('.active')
-+        .should('contain', 'Data')
-+    })
-+
-+    it('.closest() - get closest ancestor DOM element', function () {
-+      // https://on.cypress.io/closest
-+      cy.get('.traversal-badge').closest('ul')
-+        .should('have.class', 'list-group')
-+    })
-+
-+    it('.eq() - get a DOM element at a specific index', function () {
-+      // https://on.cypress.io/eq
-+      cy.get('.traversal-list>li').eq(1).should('contain', 'siamese')
-+    })
-+
-+    it('.filter() - get DOM elements that match the selector', function () {
-+      // https://on.cypress.io/filter
-+      cy.get('.traversal-nav>li').filter('.active').should('contain', 'About')
-+    })
-+
-+    it('.find() - get descendant DOM elements of the selector', function () {
-+      // https://on.cypress.io/find
-+      cy.get('.traversal-pagination').find('li').find('a')
-+        .should('have.length', 7)
-+    })
-+
-+    it('.first() - get first DOM element', function () {
-+      // https://on.cypress.io/first
-+      cy.get('.traversal-table td').first().should('contain', '1')
-+    })
-+
-+    it('.last() - get last DOM element', function () {
-+      // https://on.cypress.io/last
-+      cy.get('.traversal-buttons .btn').last().should('contain', 'Submit')
-+    })
-+
-+    it('.next() - get next sibling DOM element', function () {
-+      // https://on.cypress.io/next
-+      cy.get('.traversal-ul').contains('apples').next().should('contain', 'oranges')
-+    })
-+
-+    it('.nextAll() - get all next sibling DOM elements', function () {
-+      // https://on.cypress.io/nextall
-+      cy.get('.traversal-next-all').contains('oranges')
-+        .nextAll().should('have.length', 3)
-+    })
-+
-+    it('.nextUntil() - get next sibling DOM elements until next el', function () {
-+      // https://on.cypress.io/nextuntil
-+      cy.get('#veggies').nextUntil('#nuts').should('have.length', 3)
-+    })
-+
-+    it('.not() - remove DOM elements from set of DOM elements', function () {
-+      // https://on.cypress.io/not
-+      cy.get('.traversal-disabled .btn').not('[disabled]').should('not.contain', 'Disabled')
-+    })
-+
-+    it('.parent() - get parent DOM element from DOM elements', function () {
-+      // https://on.cypress.io/parent
-+      cy.get('.traversal-mark').parent().should('contain', 'Morbi leo risus')
-+    })
-+
-+    it('.parents() - get parent DOM elements from DOM elements', function () {
-+      // https://on.cypress.io/parents
-+      cy.get('.traversal-cite').parents().should('match', 'blockquote')
-+    })
-+
-+    it('.parentsUntil() - get parent DOM elements from DOM elements until el', function () {
-+      // https://on.cypress.io/parentsuntil
-+      cy.get('.clothes-nav').find('.active').parentsUntil('.clothes-nav')
-+        .should('have.length', 2)
-+    })
-+
-+    it('.prev() - get previous sibling DOM element', function () {
-+      // https://on.cypress.io/prev
-+      cy.get('.birds').find('.active').prev().should('contain', 'Lorikeets')
-+    })
-+
-+    it('.prevAll() - get all previous sibling DOM elements', function () {
-+      // https://on.cypress.io/prevAll
-+      cy.get('.fruits-list').find('.third').prevAll().should('have.length', 2)
-+    })
-+
-+    it('.prevUntil() - get all previous sibling DOM elements until el', function () {
-+      // https://on.cypress.io/prevUntil
-+      cy.get('.foods-list').find('#nuts').prevUntil('#veggies')
-+    })
-+
-+    it('.siblings() - get all sibling DOM elements', function () {
-+      // https://on.cypress.io/siblings
-+      cy.get('.traversal-pills .active').siblings().should('have.length', 2)
-+    })
-+  })
-+
-+  context('Actions', function () {
-+    beforeEach(function () {
-+      cy.visit('https://example.cypress.io/commands/actions')
-+    })
-+
-+    // Let's perform some actions on DOM elements
-+    // https://on.cypress.io/interacting-with-elements
-+
-+    it('.type() - type into a DOM element', function () {
-+      // https://on.cypress.io/type
-+      cy.get('.action-email')
-+        .type('fake@email.com').should('have.value', 'fake@email.com')
-+
-+        // .type() with special character sequences
-+        .type('{leftarrow}{rightarrow}{uparrow}{downarrow}')
-+        .type('{del}{selectall}{backspace}')
-+
-+        // .type() with key modifiers
-+        .type('{alt}{option}') //these are equivalent
-+        .type('{ctrl}{control}') //these are equivalent
-+        .type('{meta}{command}{cmd}') //these are equivalent
-+        .type('{shift}')
-+
-+        // Delay each keypress by 0.1 sec
-+        .type('slow.typing@email.com', { delay: 100 })
-+        .should('have.value', 'slow.typing@email.com')
-+
-+      cy.get('.action-disabled')
-+        // Ignore error checking prior to type
-+        // like whether the input is visible or disabled
-+        .type('disabled error checking', { force: true })
-+        .should('have.value', 'disabled error checking')
-+    })
-+
-+    it('.focus() - focus on a DOM element', function () {
-+      // https://on.cypress.io/focus
-+      cy.get('.action-focus').focus()
-+        .should('have.class', 'focus')
-+        .prev().should('have.attr', 'style', 'color: orange;')
-+    })
-+
-+    it('.blur() - blur off a DOM element', function () {
-+      // https://on.cypress.io/blur
-+      cy.get('.action-blur').type('I\'m about to blur').blur()
-+        .should('have.class', 'error')
-+        .prev().should('have.attr', 'style', 'color: red;')
-+    })
-+
-+    it('.clear() - clears an input or textarea element', function () {
-+      // https://on.cypress.io/clear
-+      cy.get('.action-clear').type('We are going to clear this text')
-+        .should('have.value', 'We are going to clear this text')
-+        .clear()
-+        .should('have.value', '')
-+    })
-+
-+    it('.submit() - submit a form', function () {
-+      // https://on.cypress.io/submit
-+      cy.get('.action-form')
-+        .find('[type="text"]').type('HALFOFF')
-+      cy.get('.action-form').submit()
-+        .next().should('contain', 'Your form has been submitted!')
-+    })
-+
-+    it('.click() - click on a DOM element', function () {
-+      // https://on.cypress.io/click
-+      cy.get('.action-btn').click()
-+
-+      // You can click on 9 specific positions of an element:
-+      //  -----------------------------------
-+      // | topLeft        top       topRight |
-+      // |                                   |
-+      // |                                   |
-+      // |                                   |
-+      // | left          center        right |
-+      // |                                   |
-+      // |                                   |
-+      // |                                   |
-+      // | bottomLeft   bottom   bottomRight |
-+      //  -----------------------------------
-+
-+      // clicking in the center of the element is the default
-+      cy.get('#action-canvas').click()
-+
-+      cy.get('#action-canvas').click('topLeft')
-+      cy.get('#action-canvas').click('top')
-+      cy.get('#action-canvas').click('topRight')
-+      cy.get('#action-canvas').click('left')
-+      cy.get('#action-canvas').click('right')
-+      cy.get('#action-canvas').click('bottomLeft')
-+      cy.get('#action-canvas').click('bottom')
-+      cy.get('#action-canvas').click('bottomRight')
-+
-+      // .click() accepts an x and y coordinate
-+      // that controls where the click occurs :)
-+
-+      cy.get('#action-canvas')
-+        .click(80, 75) // click 80px on x coord and 75px on y coord
-+        .click(170, 75)
-+        .click(80, 165)
-+        .click(100, 185)
-+        .click(125, 190)
-+        .click(150, 185)
-+        .click(170, 165)
-+
-+      // click multiple elements by passing multiple: true
-+      cy.get('.action-labels>.label').click({ multiple: true })
-+
-+      // Ignore error checking prior to clicking
-+      // like whether the element is visible, clickable or disabled
-+      // this button below is covered by another element.
-+      cy.get('.action-opacity>.btn').click({ force: true })
-+    })
-+
-+    it('.dblclick() - double click on a DOM element', function () {
-+      // Our app has a listener on 'dblclick' event in our 'scripts.js'
-+      // that hides the div and shows an input on double click
-+
-+      // https://on.cypress.io/dblclick
-+      cy.get('.action-div').dblclick().should('not.be.visible')
-+      cy.get('.action-input-hidden').should('be.visible')
-+    })
-+
-+    it('cy.check() - check a checkbox or radio element', function () {
-+      // By default, .check() will check all
-+      // matching checkbox or radio elements in succession, one after another
-+
-+      // https://on.cypress.io/check
-+      cy.get('.action-checkboxes [type="checkbox"]').not('[disabled]')
-+        .check().should('be.checked')
-+
-+      cy.get('.action-radios [type="radio"]').not('[disabled]')
-+        .check().should('be.checked')
-+
-+      // .check() accepts a value argument
-+      // that checks only checkboxes or radios
-+      // with matching values
-+      cy.get('.action-radios [type="radio"]').check('radio1').should('be.checked')
-+
-+      // .check() accepts an array of values
-+      // that checks only checkboxes or radios
-+      // with matching values
-+      cy.get('.action-multiple-checkboxes [type="checkbox"]')
-+        .check(['checkbox1', 'checkbox2']).should('be.checked')
-+
-+      // Ignore error checking prior to checking
-+      // like whether the element is visible, clickable or disabled
-+      // this checkbox below is disabled.
-+      cy.get('.action-checkboxes [disabled]')
-+        .check({ force: true }).should('be.checked')
-+
-+      cy.get('.action-radios [type="radio"]')
-+        .check('radio3', { force: true }).should('be.checked')
-+    })
-+
-+    it('.uncheck() - uncheck a checkbox element', function () {
-+      // By default, .uncheck() will uncheck all matching
-+      // checkbox elements in succession, one after another
-+
-+      // https://on.cypress.io/uncheck
-+      cy.get('.action-check [type="checkbox"]')
-+        .not('[disabled]')
-+        .uncheck().should('not.be.checked')
-+
-+      // .uncheck() accepts a value argument
-+      // that unchecks only checkboxes
-+      // with matching values
-+      cy.get('.action-check [type="checkbox"]')
-+        .check('checkbox1')
-+        .uncheck('checkbox1').should('not.be.checked')
-+
-+      // .uncheck() accepts an array of values
-+      // that unchecks only checkboxes or radios
-+      // with matching values
-+      cy.get('.action-check [type="checkbox"]')
-+        .check(['checkbox1', 'checkbox3'])
-+        .uncheck(['checkbox1', 'checkbox3']).should('not.be.checked')
-+
-+      // Ignore error checking prior to unchecking
-+      // like whether the element is visible, clickable or disabled
-+      // this checkbox below is disabled.
-+      cy.get('.action-check [disabled]')
-+        .uncheck({ force: true }).should('not.be.checked')
-+    })
-+
-+    it('.select() - select an option in a <select> element', function () {
-+      // https://on.cypress.io/select
-+
-+      // Select option with matching text content
-+      cy.get('.action-select').select('apples')
-+
-+      // Select option with matching value
-+      cy.get('.action-select').select('fr-bananas')
-+
-+      // Select options with matching text content
-+      cy.get('.action-select-multiple')
-+        .select(['apples', 'oranges', 'bananas'])
-+
-+      // Select options with matching values
-+      cy.get('.action-select-multiple')
-+        .select(['fr-apples', 'fr-oranges', 'fr-bananas'])
-+    })
-+
-+    it('.scrollIntoView() - scroll an element into view', function () {
-+      // https://on.cypress.io/scrollintoview
-+
-+      // normally all of these buttons are hidden, because they're not within
-+      // the viewable area of their parent (we need to scroll to see them)
-+      cy.get('#scroll-horizontal button')
-+        .should('not.be.visible')
-+
-+      // scroll the button into view, as if the user had scrolled
-+      cy.get('#scroll-horizontal button').scrollIntoView()
-+        .should('be.visible')
-+
-+      cy.get('#scroll-vertical button')
-+        .should('not.be.visible')
-+
-+      // Cypress handles the scroll direction needed
-+      cy.get('#scroll-vertical button').scrollIntoView()
-+        .should('be.visible')
-+
-+      cy.get('#scroll-both button')
-+        .should('not.be.visible')
-+
-+      // Cypress knows to scroll to the right and down
-+      cy.get('#scroll-both button').scrollIntoView()
-+        .should('be.visible')
-+    })
-+
-+    it('cy.scrollTo() - scroll the window or element to a position', function () {
-+
-+      // https://on.cypress.io/scrollTo
-+
-+      // You can scroll to 9 specific positions of an element:
-+      //  -----------------------------------
-+      // | topLeft        top       topRight |
-+      // |                                   |
-+      // |                                   |
-+      // |                                   |
-+      // | left          center        right |
-+      // |                                   |
-+      // |                                   |
-+      // |                                   |
-+      // | bottomLeft   bottom   bottomRight |
-+      //  -----------------------------------
-+
-+      // if you chain .scrollTo() off of cy, we will
-+      // scroll the entire window
-+      cy.scrollTo('bottom')
-+
-+      cy.get('#scrollable-horizontal').scrollTo('right')
-+
-+      // or you can scroll to a specific coordinate:
-+      // (x axis, y axis) in pixels
-+      cy.get('#scrollable-vertical').scrollTo(250, 250)
-+
-+      // or you can scroll to a specific percentage
-+      // of the (width, height) of the element
-+      cy.get('#scrollable-both').scrollTo('75%', '25%')
-+
-+      // control the easing of the scroll (default is 'swing')
-+      cy.get('#scrollable-vertical').scrollTo('center', { easing: 'linear' })
-+
-+      // control the duration of the scroll (in ms)
-+      cy.get('#scrollable-both').scrollTo('center', { duration: 2000 })
-+    })
-+
-+    it('.trigger() - trigger an event on a DOM element', function () {
-+      // To interact with a range input (slider), we need to set its value and
-+      // then trigger the appropriate event to signal it has changed
-+
-+      // Here, we invoke jQuery's val() method to set the value
-+      // and trigger the 'change' event
-+
-+      // Note that some implementations may rely on the 'input' event,
-+      // which is fired as a user moves the slider, but is not supported
-+      // by some browsers
-+
-+      // https://on.cypress.io/trigger
-+      cy.get('.trigger-input-range')
-+        .invoke('val', 25)
-+        .trigger('change')
-+        .get('input[type=range]').siblings('p')
-+        .should('have.text', '25')
-+
-+      // See our example recipes for more examples of using trigger
-+      // https://on.cypress.io/examples
-+    })
-+  })
-+
-+  context('Window', function () {
-+    beforeEach(function () {
-+      cy.visit('https://example.cypress.io/commands/window')
-+    })
-+
-+    it('cy.window() - get the global window object', function () {
-+      // https://on.cypress.io/window
-+      cy.window().should('have.property', 'top')
-+    })
-+
-+    it('cy.document() - get the document object', function () {
-+      // https://on.cypress.io/document
-+      cy.document().should('have.property', 'charset').and('eq', 'UTF-8')
-+    })
-+
-+    it('cy.title() - get the title', function () {
-+      // https://on.cypress.io/title
-+      cy.title().should('include', 'Kitchen Sink')
-+    })
-+  })
-+
-+  context('Viewport', function () {
-+    beforeEach(function () {
-+      cy.visit('https://example.cypress.io/commands/viewport')
-+    })
-+
-+    it('cy.viewport() - set the viewport size and dimension', function () {
-+
-+      cy.get('#navbar').should('be.visible')
-+
-+      // https://on.cypress.io/viewport
-+      cy.viewport(320, 480)
-+
-+      // the navbar should have collapse since our screen is smaller
-+      cy.get('#navbar').should('not.be.visible')
-+      cy.get('.navbar-toggle').should('be.visible').click()
-+      cy.get('.nav').find('a').should('be.visible')
-+
-+      // lets see what our app looks like on a super large screen
-+      cy.viewport(2999, 2999)
-+
-+      // cy.viewport() accepts a set of preset sizes
-+      // to easily set the screen to a device's width and height
-+
-+      // We added a cy.wait() between each viewport change so you can see
-+      // the change otherwise it's a little too fast to see :)
-+
-+      cy.viewport('macbook-15')
-+      cy.wait(200)
-+      cy.viewport('macbook-13')
-+      cy.wait(200)
-+      cy.viewport('macbook-11')
-+      cy.wait(200)
-+      cy.viewport('ipad-2')
-+      cy.wait(200)
-+      cy.viewport('ipad-mini')
-+      cy.wait(200)
-+      cy.viewport('iphone-6+')
-+      cy.wait(200)
-+      cy.viewport('iphone-6')
-+      cy.wait(200)
-+      cy.viewport('iphone-5')
-+      cy.wait(200)
-+      cy.viewport('iphone-4')
-+      cy.wait(200)
-+      cy.viewport('iphone-3')
-+      cy.wait(200)
-+
-+      // cy.viewport() accepts an orientation for all presets
-+      // the default orientation is 'portrait'
-+      cy.viewport('ipad-2', 'portrait')
-+      cy.wait(200)
-+      cy.viewport('iphone-4', 'landscape')
-+      cy.wait(200)
-+
-+      // The viewport will be reset back to the default dimensions
-+      // in between tests (the  default is set in cypress.json)
-+    })
-+  })
-+
-+  context('Location', function () {
-+    beforeEach(function () {
-+      cy.visit('https://example.cypress.io/commands/location')
-+    })
-+
-+    // We look at the url to make assertions
-+    // about the page's state
-+
-+    it('cy.hash() - get the current URL hash', function () {
-+      // https://on.cypress.io/hash
-+      cy.hash().should('be.empty')
-+    })
-+
-+    it('cy.location() - get window.location', function () {
-+      // https://on.cypress.io/location
-+      cy.location().should(function (location) {
-+        expect(location.hash).to.be.empty
-+        expect(location.href).to.eq('https://example.cypress.io/commands/location')
-+        expect(location.host).to.eq('example.cypress.io')
-+        expect(location.hostname).to.eq('example.cypress.io')
-+        expect(location.origin).to.eq('https://example.cypress.io')
-+        expect(location.pathname).to.eq('/commands/location')
-+        expect(location.port).to.eq('')
-+        expect(location.protocol).to.eq('https:')
-+        expect(location.search).to.be.empty
-+      })
-+    })
-+
-+    it('cy.url() - get the current URL', function () {
-+      // https://on.cypress.io/url
-+      cy.url().should('eq', 'https://example.cypress.io/commands/location')
-+    })
-+  })
-+
-+  context('Navigation', function () {
-+    beforeEach(function () {
-+      cy.visit('https://example.cypress.io')
-+      cy.get('.navbar-nav').contains('Commands').click()
-+      cy.get('.dropdown-menu').contains('Navigation').click()
-+    })
-+
-+    it('cy.go() - go back or forward in the browser\'s history', function () {
-+      cy.location('pathname').should('include', 'navigation')
-+
-+      // https://on.cypress.io/go
-+      cy.go('back')
-+      cy.location('pathname').should('not.include', 'navigation')
-+
-+      cy.go('forward')
-+      cy.location('pathname').should('include', 'navigation')
-+
-+      // equivalent to clicking back
-+      cy.go(-1)
-+      cy.location('pathname').should('not.include', 'navigation')
-+
-+      // equivalent to clicking forward
-+      cy.go(1)
-+      cy.location('pathname').should('include', 'navigation')
-+    })
-+
-+    it('cy.reload() - reload the page', function () {
-+      // https://on.cypress.io/reload
-+      cy.reload()
-+
-+      // reload the page without using the cache
-+      cy.reload(true)
-+    })
-+
-+    it('cy.visit() - visit a remote url', function () {
-+      // Visit any sub-domain of your current domain
-+      // https://on.cypress.io/visit
-+
-+      // Pass options to the visit
-+      cy.visit('https://example.cypress.io/commands/navigation', {
-+        timeout: 50000, // increase total time for the visit to resolve
-+        onBeforeLoad (contentWindow) {
-+          // contentWindow is the remote page's window object
-+        },
-+        onLoad (contentWindow) {
-+          // contentWindow is the remote page's window object
-+        },
-+      })
-+      })
-+  })
-+
-+  context('Assertions', function () {
-+    beforeEach(function () {
-+      cy.visit('https://example.cypress.io/commands/assertions')
-+    })
-+
-+    describe('Implicit Assertions', function () {
-+
-+      it('.should() - make an assertion about the current subject', function () {
-+        // https://on.cypress.io/should
-+        cy.get('.assertion-table')
-+          .find('tbody tr:last').should('have.class', 'success')
-+      })
-+
-+      it('.and() - chain multiple assertions together', function () {
-+        // https://on.cypress.io/and
-+        cy.get('.assertions-link')
-+          .should('have.class', 'active')
-+          .and('have.attr', 'href')
-+          .and('include', 'cypress.io')
-+      })
-+    })
-+
-+    describe('Explicit Assertions', function () {
-+      // https://on.cypress.io/assertions
-+      it('expect - assert shape of an object', function () {
-+        const person = {
-+          name: 'Joe',
-+          age: 20,
-+        }
-+        expect(person).to.have.all.keys('name', 'age')
-+      })
-+
-+      it('expect - make an assertion about a specified subject', function () {
-+        // We can use Chai's BDD style assertions
-+        expect(true).to.be.true
-+
-+        // Pass a function to should that can have any number
-+        // of explicit assertions within it.
-+        cy.get('.assertions-p').find('p')
-+        .should(function ($p) {
-+          // return an array of texts from all of the p's
-+          let texts = $p.map(function (i, el) {
-+            // https://on.cypress.io/$
-+            return Cypress.$(el).text()
-+          })
-+
-+          // jquery map returns jquery object
-+          // and .get() convert this to simple array
-+          texts = texts.get()
-+
-+          // array should have length of 3
-+          expect(texts).to.have.length(3)
-+
-+          // set this specific subject
-+          expect(texts).to.deep.eq([
-+            'Some text from first p',
-+            'More text from second p',
-+            'And even more text from third p',
-+          ])
-+        })
-+      })
-+    })
-+  })
-+
-+  context('Misc', function () {
-+    beforeEach(function () {
-+      cy.visit('https://example.cypress.io/commands/misc')
-+    })
-+
-+    it('.end() - end the command chain', function () {
-+      // cy.end is useful when you want to end a chain of commands
-+      // and force Cypress to re-query from the root element
-+
-+      // https://on.cypress.io/end
-+      cy.get('.misc-table').within(function () {
-+        // ends the current chain and yields null
-+        cy.contains('Cheryl').click().end()
-+
-+        // queries the entire table again
-+        cy.contains('Charles').click()
-+      })
-+    })
-+
-+    it('cy.exec() - execute a system command', function () {
-+      // cy.exec allows you to execute a system command.
-+      // so you can take actions necessary for your test,
-+      // but outside the scope of Cypress.
-+
-+      // https://on.cypress.io/exec
-+      cy.exec('echo Jane Lane')
-+        .its('stdout').should('contain', 'Jane Lane')
-+
-+      // we can use Cypress.platform string to
-+      // select appropriate command
-+      // https://on.cypress/io/platform
-+      cy.log(`Platform ${Cypress.platform} architecture ${Cypress.arch}`)
-+
-+      if (Cypress.platform === 'win32') {
-+        cy.exec('print cypress.json')
-+          .its('stderr').should('be.empty')
-+      } else {
-+        cy.exec('cat cypress.json')
-+          .its('stderr').should('be.empty')
-+
-+        cy.exec('pwd')
-+          .its('code').should('eq', 0)
-+      }
-+    })
-+
-+    it('cy.focused() - get the DOM element that has focus', function () {
-+      // https://on.cypress.io/focused
-+      cy.get('.misc-form').find('#name').click()
-+      cy.focused().should('have.id', 'name')
-+
-+      cy.get('.misc-form').find('#description').click()
-+      cy.focused().should('have.id', 'description')
-+    })
-+
-+    it('cy.screenshot() - take a screenshot', function () {
-+      // https://on.cypress.io/screenshot
-+      cy.screenshot('my-image')
-+    })
-+
-+    it('cy.wrap() - wrap an object', function () {
-+      // https://on.cypress.io/wrap
-+      cy.wrap({ foo: 'bar' })
-+        .should('have.property', 'foo')
-+        .and('include', 'bar')
-+    })
-+  })
-+
-+  context('Connectors', function () {
-+    beforeEach(function () {
-+      cy.visit('https://example.cypress.io/commands/connectors')
-+    })
-+
-+    it('.each() - iterate over an array of elements', function () {
-+      // https://on.cypress.io/each
-+      cy.get('.connectors-each-ul>li')
-+        .each(function ($el, index, $list) {
-+          console.log($el, index, $list)
-+        })
-+    })
-+
-+    it('.its() - get properties on the current subject', function () {
-+      // https://on.cypress.io/its
-+      cy.get('.connectors-its-ul>li')
-+        // calls the 'length' property yielding that value
-+        .its('length')
-+        .should('be.gt', 2)
-+    })
-+
-+    it('.invoke() - invoke a function on the current subject', function () {
-+      // our div is hidden in our script.js
-+      // $('.connectors-div').hide()
-+
-+      // https://on.cypress.io/invoke
-+      cy.get('.connectors-div').should('be.hidden')
-+
-+        // call the jquery method 'show' on the 'div.container'
-+        .invoke('show')
-+        .should('be.visible')
-+    })
-+
-+    it('.spread() - spread an array as individual args to callback function', function () {
-+      // https://on.cypress.io/spread
-+      let arr = ['foo', 'bar', 'baz']
-+
-+      cy.wrap(arr).spread(function (foo, bar, baz) {
-+        expect(foo).to.eq('foo')
-+        expect(bar).to.eq('bar')
-+        expect(baz).to.eq('baz')
-+      })
-+    })
-+
-+    it('.then() - invoke a callback function with the current subject', function () {
-+      // https://on.cypress.io/then
-+      cy.get('.connectors-list>li').then(function ($lis) {
-+        expect($lis).to.have.length(3)
-+        expect($lis.eq(0)).to.contain('Walk the dog')
-+        expect($lis.eq(1)).to.contain('Feed the cat')
-+        expect($lis.eq(2)).to.contain('Write JavaScript')
-+      })
-+    })
-+  })
-+
-+  context('Aliasing', function () {
-+    beforeEach(function () {
-+      cy.visit('https://example.cypress.io/commands/aliasing')
-+    })
-+
-+    // We alias a DOM element for use later
-+    // We don't have to traverse to the element
-+    // later in our code, we just reference it with @
-+
-+    it('.as() - alias a route or DOM element for later use', function () {
-+      // this is a good use case for an alias,
-+      // we don't want to write this long traversal again
-+
-+      // https://on.cypress.io/as
-+      cy.get('.as-table').find('tbody>tr')
-+        .first().find('td').first().find('button').as('firstBtn')
-+
-+      // maybe do some more testing here...
-+
-+      // when we reference the alias, we place an
-+      // @ in front of it's name
-+      cy.get('@firstBtn').click()
-+
-+      cy.get('@firstBtn')
-+        .should('have.class', 'btn-success')
-+        .and('contain', 'Changed')
-+    })
-+  })
-+
-+  context('Waiting', function () {
-+    beforeEach(function () {
-+      cy.visit('https://example.cypress.io/commands/waiting')
-+    })
-+    // BE CAREFUL of adding unnecessary wait times.
-+
-+    // https://on.cypress.io/wait
-+    it('cy.wait() - wait for a specific amount of time', function () {
-+      cy.get('.wait-input1').type('Wait 1000ms after typing')
-+      cy.wait(1000)
-+      cy.get('.wait-input2').type('Wait 1000ms after typing')
-+      cy.wait(1000)
-+      cy.get('.wait-input3').type('Wait 1000ms after typing')
-+      cy.wait(1000)
-+    })
-+
-+    // Waiting for a specific resource to resolve
-+    // is covered within the cy.route() test below
-+  })
-+
-+  context('Network Requests', function () {
-+    beforeEach(function () {
-+      cy.visit('https://example.cypress.io/commands/network-requests')
-+    })
-+
-+    // Manage AJAX / XHR requests in your app
-+
-+    it('cy.server() - control behavior of network requests and responses', function () {
-+      // https://on.cypress.io/server
-+      cy.server().should(function (server) {
-+        // the default options on server
-+        // you can override any of these options
-+        expect(server.delay).to.eq(0)
-+        expect(server.method).to.eq('GET')
-+        expect(server.status).to.eq(200)
-+        expect(server.headers).to.be.null
-+        expect(server.response).to.be.null
-+        expect(server.onRequest).to.be.undefined
-+        expect(server.onResponse).to.be.undefined
-+        expect(server.onAbort).to.be.undefined
-+
-+        // These options control the server behavior
-+        // affecting all requests
-+
-+        // pass false to disable existing route stubs
-+        expect(server.enable).to.be.true
-+        // forces requests that don't match your routes to 404
-+        expect(server.force404).to.be.false
-+        // whitelists requests from ever being logged or stubbed
-+        expect(server.whitelist).to.be.a('function')
-+      })
-+
-+      cy.server({
-+        method: 'POST',
-+        delay: 1000,
-+        status: 422,
-+        response: {},
-+      })
-+
-+      // any route commands will now inherit the above options
-+      // from the server. anything we pass specifically
-+      // to route will override the defaults though.
-+    })
-+
-+    it('cy.request() - make an XHR request', function () {
-+      // https://on.cypress.io/request
-+      cy.request('https://jsonplaceholder.typicode.com/comments')
-+        .should(function (response) {
-+          expect(response.status).to.eq(200)
-+          expect(response.body).to.have.length(500)
-+          expect(response).to.have.property('headers')
-+          expect(response).to.have.property('duration')
-+        })
-+    })
-+
-+    it('cy.route() - route responses to matching requests', function () {
-+      let message = 'whoa, this comment doesn\'t exist'
-+      cy.server()
-+
-+      // **** GET comments route ****
-+
-+      // https://on.cypress.io/route
-+      cy.route(/comments\/1/).as('getComment')
-+
-+      // we have code that fetches a comment when
-+      // the button is clicked in scripts.js
-+      cy.get('.network-btn').click()
-+
-+      // **** Wait ****
-+
-+      // Wait for a specific resource to resolve
-+      // continuing to the next command
-+
-+      // https://on.cypress.io/wait
-+      cy.wait('@getComment').its('status').should('eq', 200)
-+
-+      // **** POST comment route ****
-+
-+      // Specify the route to listen to method 'POST'
-+      cy.route('POST', '/comments').as('postComment')
-+
-+      // we have code that posts a comment when
-+      // the button is clicked in scripts.js
-+      cy.get('.network-post').click()
-+      cy.wait('@postComment')
-+
-+      // get the route
-+      cy.get('@postComment').then(function (xhr) {
-+        expect(xhr.requestBody).to.include('email')
-+        expect(xhr.requestHeaders).to.have.property('Content-Type')
-+        expect(xhr.responseBody).to.have.property('name', 'Using POST in cy.route()')
-+      })
-+
-+      // **** Stubbed PUT comment route ****
-+      cy.route({
-+        method: 'PUT',
-+        url: /comments\/\d+/,
-+        status: 404,
-+        response: { error: message },
-+        delay: 500,
-+      }).as('putComment')
-+
-+      // we have code that puts a comment when
-+      // the button is clicked in scripts.js
-+      cy.get('.network-put').click()
-+
-+      cy.wait('@putComment')
-+
-+      // our 404 statusCode logic in scripts.js executed
-+      cy.get('.network-put-comment').should('contain', message)
-+    })
-+  })
-+
-+  context('Files', function () {
-+    beforeEach(function () {
-+      cy.visit('https://example.cypress.io/commands/files')
-+    })
-+    it('cy.fixture() - load a fixture', function () {
-+      // Instead of writing a response inline you can
-+      // connect a response with a fixture file
-+      // located in fixtures folder.
-+
-+      cy.server()
-+
-+      // https://on.cypress.io/fixture
-+      cy.fixture('example.json').as('comment')
-+
-+      cy.route(/comments/, '@comment').as('getComment')
-+
-+      // we have code that gets a comment when
-+      // the button is clicked in scripts.js
-+      cy.get('.fixture-btn').click()
-+
-+      cy.wait('@getComment').its('responseBody')
-+        .should('have.property', 'name')
-+        .and('include', 'Using fixtures to represent data')
-+
-+      // you can also just write the fixture in the route
-+      cy.route(/comments/, 'fixture:example.json').as('getComment')
-+
-+      // we have code that gets a comment when
-+      // the button is clicked in scripts.js
-+      cy.get('.fixture-btn').click()
-+
-+      cy.wait('@getComment').its('responseBody')
-+        .should('have.property', 'name')
-+        .and('include', 'Using fixtures to represent data')
-+
-+      // or write fx to represent fixture
-+      // by default it assumes it's .json
-+      cy.route(/comments/, 'fx:example').as('getComment')
-+
-+      // we have code that gets a comment when
-+      // the button is clicked in scripts.js
-+      cy.get('.fixture-btn').click()
-+
-+      cy.wait('@getComment').its('responseBody')
-+        .should('have.property', 'name')
-+        .and('include', 'Using fixtures to represent data')
-+    })
-+
-+    it('cy.readFile() - read a files contents', function () {
-+      // You can read a file and yield its contents
-+      // The filePath is relative to your project's root.
-+
-+      // https://on.cypress.io/readfile
-+      cy.readFile('cypress.json').then(function (json) {
-+        expect(json).to.be.an('object')
-+      })
-+
-+    })
-+
-+    it('cy.writeFile() - write to a file', function () {
-+      // You can write to a file with the specified contents
-+
-+      // Use a response from a request to automatically
-+      // generate a fixture file for use later
-+      cy.request('https://jsonplaceholder.typicode.com/users')
-+        .then(function (response) {
-+          // https://on.cypress.io/writefile
-+          cy.writeFile('cypress/fixtures/users.json', response.body)
-+        })
-+      cy.fixture('users').should(function (users) {
-+        expect(users[0].name).to.exist
-+      })
-+
-+      // JavaScript arrays and objects are stringified and formatted into text.
-+      cy.writeFile('cypress/fixtures/profile.json', {
-+        id: 8739,
-+        name: 'Jane',
-+        email: 'jane@example.com',
-+      })
-+
-+      cy.fixture('profile').should(function (profile) {
-+        expect(profile.name).to.eq('Jane')
-+      })
-+    })
-+  })
-+
-+  context('Local Storage', function () {
-+    beforeEach(function () {
-+      cy.visit('https://example.cypress.io/commands/local-storage')
-+    })
-+    // Although local storage is automatically cleared
-+    // to maintain a clean state in between tests
-+    // sometimes we need to clear the local storage manually
-+
-+    it('cy.clearLocalStorage() - clear all data in local storage', function () {
-+      // https://on.cypress.io/clearlocalstorage
-+      cy.get('.ls-btn').click().should(function () {
-+        expect(localStorage.getItem('prop1')).to.eq('red')
-+        expect(localStorage.getItem('prop2')).to.eq('blue')
-+        expect(localStorage.getItem('prop3')).to.eq('magenta')
-+      })
-+
-+      // clearLocalStorage() yields the localStorage object
-+      cy.clearLocalStorage().should(function (ls) {
-+        expect(ls.getItem('prop1')).to.be.null
-+        expect(ls.getItem('prop2')).to.be.null
-+        expect(ls.getItem('prop3')).to.be.null
-+      })
-+
-+      // **** Clear key matching string in Local Storage ****
-+      cy.get('.ls-btn').click().should(function () {
-+        expect(localStorage.getItem('prop1')).to.eq('red')
-+        expect(localStorage.getItem('prop2')).to.eq('blue')
-+        expect(localStorage.getItem('prop3')).to.eq('magenta')
-+      })
-+
-+      cy.clearLocalStorage('prop1').should(function (ls) {
-+        expect(ls.getItem('prop1')).to.be.null
-+        expect(ls.getItem('prop2')).to.eq('blue')
-+        expect(ls.getItem('prop3')).to.eq('magenta')
-+      })
-+
-+      // **** Clear key's matching regex in Local Storage ****
-+      cy.get('.ls-btn').click().should(function () {
-+        expect(localStorage.getItem('prop1')).to.eq('red')
-+        expect(localStorage.getItem('prop2')).to.eq('blue')
-+        expect(localStorage.getItem('prop3')).to.eq('magenta')
-+      })
-+
-+      cy.clearLocalStorage(/prop1|2/).should(function (ls) {
-+        expect(ls.getItem('prop1')).to.be.null
-+        expect(ls.getItem('prop2')).to.be.null
-+        expect(ls.getItem('prop3')).to.eq('magenta')
-+      })
-+    })
-+  })
-+
-+  context('Cookies', function () {
-+    beforeEach(function () {
-+      Cypress.Cookies.debug(true)
-+
-+      cy.visit('https://example.cypress.io/commands/cookies')
-+
-+      // clear cookies again after visiting to remove
-+      // any 3rd party cookies picked up such as cloudflare
-+      cy.clearCookies()
-+    })
-+
-+    it('cy.getCookie() - get a browser cookie', function () {
-+      // https://on.cypress.io/getcookie
-+      cy.get('#getCookie .set-a-cookie').click()
-+
-+      // cy.getCookie() yields a cookie object
-+      cy.getCookie('token').should('have.property', 'value', '123ABC')
-+    })
-+
-+    it('cy.getCookies() - get browser cookies', function () {
-+      // https://on.cypress.io/getcookies
-+      cy.getCookies().should('be.empty')
-+
-+      cy.get('#getCookies .set-a-cookie').click()
-+
-+      // cy.getCookies() yields an array of cookies
-+      cy.getCookies().should('have.length', 1).should(function (cookies) {
-+
-+        // each cookie has these properties
-+        expect(cookies[0]).to.have.property('name', 'token')
-+        expect(cookies[0]).to.have.property('value', '123ABC')
-+        expect(cookies[0]).to.have.property('httpOnly', false)
-+        expect(cookies[0]).to.have.property('secure', false)
-+        expect(cookies[0]).to.have.property('domain')
-+        expect(cookies[0]).to.have.property('path')
-+      })
-+    })
-+
-+    it('cy.setCookie() - set a browser cookie', function () {
-+      // https://on.cypress.io/setcookie
-+      cy.getCookies().should('be.empty')
-+
-+      cy.setCookie('foo', 'bar')
-+
-+      // cy.getCookie() yields a cookie object
-+      cy.getCookie('foo').should('have.property', 'value', 'bar')
-+    })
-+
-+    it('cy.clearCookie() - clear a browser cookie', function () {
-+      // https://on.cypress.io/clearcookie
-+      cy.getCookie('token').should('be.null')
-+
-+      cy.get('#clearCookie .set-a-cookie').click()
-+
-+      cy.getCookie('token').should('have.property', 'value', '123ABC')
-+
-+      // cy.clearCookies() yields null
-+      cy.clearCookie('token').should('be.null')
-+
-+      cy.getCookie('token').should('be.null')
-+    })
-+
-+    it('cy.clearCookies() - clear browser cookies', function () {
-+      // https://on.cypress.io/clearcookies
-+      cy.getCookies().should('be.empty')
-+
-+      cy.get('#clearCookies .set-a-cookie').click()
-+
-+      cy.getCookies().should('have.length', 1)
-+
-+      // cy.clearCookies() yields null
-+      cy.clearCookies()
-+
-+      cy.getCookies().should('be.empty')
-+    })
-+  })
-+
-+  context('Spies, Stubs, and Clock', function () {
-+    it('cy.spy() - wrap a method in a spy', function () {
-+      // https://on.cypress.io/spy
-+      cy.visit('https://example.cypress.io/commands/spies-stubs-clocks')
-+
-+      let obj = {
-+        foo () {},
-+      }
-+
-+      let spy = cy.spy(obj, 'foo').as('anyArgs')
-+
-+      obj.foo()
-+
-+      expect(spy).to.be.called
-+
-+    })
-+
-+    it('cy.stub() - create a stub and/or replace a function with a stub', function () {
-+      // https://on.cypress.io/stub
-+      cy.visit('https://example.cypress.io/commands/spies-stubs-clocks')
-+
-+      let obj = {
-+        foo () {},
-+      }
-+
-+      let stub = cy.stub(obj, 'foo').as('foo')
-+
-+      obj.foo('foo', 'bar')
-+
-+      expect(stub).to.be.called
-+
-+    })
-+
-+    it('cy.clock() - control time in the browser', function () {
-+      // create the date in UTC so its always the same
-+      // no matter what local timezone the browser is running in
-+      let now = new Date(Date.UTC(2017, 2, 14)).getTime()
-+
-+      // https://on.cypress.io/clock
-+      cy.clock(now)
-+      cy.visit('https://example.cypress.io/commands/spies-stubs-clocks')
-+      cy.get('#clock-div').click()
-+        .should('have.text', '1489449600')
-+    })
-+
-+    it('cy.tick() - move time in the browser', function () {
-+      // create the date in UTC so its always the same
-+      // no matter what local timezone the browser is running in
-+      let now = new Date(Date.UTC(2017, 2, 14)).getTime()
-+
-+      // https://on.cypress.io/tick
-+      cy.clock(now)
-+      cy.visit('https://example.cypress.io/commands/spies-stubs-clocks')
-+      cy.get('#tick-div').click()
-+        .should('have.text', '1489449600')
-+      cy.tick(10000) // 10 seconds passed
-+      cy.get('#tick-div').click()
-+        .should('have.text', '1489449610')
-+    })
-+  })
-+
-+  context('Utilities', function () {
-+    beforeEach(function () {
-+      cy.visit('https://example.cypress.io/utilities')
-+    })
-+
-+    it('Cypress._.method() - call a lodash method', function () {
-+      // use the _.chain, _.map, _.take, and _.value functions
-+      // https://on.cypress.io/_
-+      cy.request('https://jsonplaceholder.typicode.com/users')
-+        .then(function (response) {
-+          let ids = Cypress._.chain(response.body).map('id').take(3).value()
-+
-+          expect(ids).to.deep.eq([1, 2, 3])
-+        })
-+    })
-+
-+    it('Cypress.$(selector) - call a jQuery method', function () {
-+      // https://on.cypress.io/$
-+      let $li = Cypress.$('.utility-jquery li:first')
-+
-+      cy.wrap($li)
-+        .should('not.have.class', 'active')
-+        .click()
-+        .should('have.class', 'active')
-+    })
-+
-+    it('Cypress.moment() - format or parse dates using a moment method', function () {
-+      // use moment's format function
-+      // https://on.cypress.io/cypress-moment
-+      let time = Cypress.moment().utc('2014-04-25T19:38:53.196Z').format('h:mm A')
-+
-+      cy.get('.utility-moment').contains('3:38 PM')
-+        .should('have.class', 'badge')
-+    })
-+
-+    it('Cypress.Blob.method() - blob utilities and base64 string conversion', function () {
-+      cy.get('.utility-blob').then(function ($div) {
-+        // https://on.cypress.io/blob
-+        // https://github.com/nolanlawson/blob-util#imgSrcToDataURL
-+        // get the dataUrl string for the javascript-logo
-+        return Cypress.Blob.imgSrcToDataURL('https://example.cypress.io/assets/img/javascript-logo.png', undefined, 'anonymous')
-+          .then(function (dataUrl) {
-+            // create an <img> element and set its src to the dataUrl
-+            let img = Cypress.$('<img />', { src: dataUrl })
-+            // need to explicitly return cy here since we are initially returning
-+            // the Cypress.Blob.imgSrcToDataURL promise to our test
-+            // append the image
-+            $div.append(img)
-+
-+            cy.get('.utility-blob img').click()
-+            .should('have.attr', 'src', dataUrl)
-+          })
-+      })
-+    })
-+
-+    it('new Cypress.Promise(function) - instantiate a bluebird promise', function () {
-+      // https://on.cypress.io/promise
-+      let waited = false
-+
-+      function waitOneSecond () {
-+        // return a promise that resolves after 1 second
-+        return new Cypress.Promise(function (resolve, reject) {
-+          setTimeout(function () {
-+            // set waited to true
-+            waited = true
-+
-+            // resolve with 'foo' string
-+            resolve('foo')
-+          }, 1000)
-+        })
-+      }
-+
-+      cy.then(function () {
-+        // return a promise to cy.then() that
-+        // is awaited until it resolves
-+        return waitOneSecond().then(function (str) {
-+          expect(str).to.eq('foo')
-+          expect(waited).to.be.true
-+        })
-+      })
-+    })
-+  })
-+
-+
-+  context('Cypress.config()', function () {
-+    beforeEach(function () {
-+      cy.visit('https://example.cypress.io/cypress-api/config')
-+    })
-+
-+    it('Cypress.config() - get and set configuration options', function () {
-+      // https://on.cypress.io/config
-+      let myConfig = Cypress.config()
-+
-+      expect(myConfig).to.have.property('animationDistanceThreshold', 5)
-+      expect(myConfig).to.have.property('baseUrl', null)
-+      expect(myConfig).to.have.property('defaultCommandTimeout', 4000)
-+      expect(myConfig).to.have.property('requestTimeout', 5000)
-+      expect(myConfig).to.have.property('responseTimeout', 30000)
-+      expect(myConfig).to.have.property('viewportHeight', 660)
-+      expect(myConfig).to.have.property('viewportWidth', 1000)
-+      expect(myConfig).to.have.property('pageLoadTimeout', 60000)
-+      expect(myConfig).to.have.property('waitForAnimations', true)
-+
-+      expect(Cypress.config('pageLoadTimeout')).to.eq(60000)
-+
-+      // this will change the config for the rest of your tests!
-+      Cypress.config('pageLoadTimeout', 20000)
-+
-+      expect(Cypress.config('pageLoadTimeout')).to.eq(20000)
-+
-+      Cypress.config('pageLoadTimeout', 60000)
-+    })
-+  })
-+
-+  context('Cypress.env()', function () {
-+    beforeEach(function () {
-+      cy.visit('https://example.cypress.io/cypress-api/env')
-+    })
-+
-+    // We can set environment variables for highly dynamic values
-+
-+    // https://on.cypress.io/environment-variables
-+    it('Cypress.env() - get environment variables', function () {
-+      // https://on.cypress.io/env
-+      // set multiple environment variables
-+      Cypress.env({
-+        host: 'veronica.dev.local',
-+        api_server: 'http://localhost:8888/v1/',
-+      })
-+
-+      // get environment variable
-+      expect(Cypress.env('host')).to.eq('veronica.dev.local')
-+
-+      // set environment variable
-+      Cypress.env('api_server', 'http://localhost:8888/v2/')
-+      expect(Cypress.env('api_server')).to.eq('http://localhost:8888/v2/')
-+
-+      // get all environment variable
-+      expect(Cypress.env()).to.have.property('host', 'veronica.dev.local')
-+      expect(Cypress.env()).to.have.property('api_server', 'http://localhost:8888/v2/')
-+    })
-+  })
-+
-+  context('Cypress.Cookies', function () {
-+    beforeEach(function () {
-+      cy.visit('https://example.cypress.io/cypress-api/cookies')
-+    })
-+
-+    // https://on.cypress.io/cookies
-+    it('Cypress.Cookies.debug() - enable or disable debugging', function () {
-+      Cypress.Cookies.debug(true)
-+
-+      // Cypress will now log in the console when
-+      // cookies are set or cleared
-+      cy.setCookie('fakeCookie', '123ABC')
-+      cy.clearCookie('fakeCookie')
-+      cy.setCookie('fakeCookie', '123ABC')
-+      cy.clearCookie('fakeCookie')
-+      cy.setCookie('fakeCookie', '123ABC')
-+    })
-+
-+    it('Cypress.Cookies.preserveOnce() - preserve cookies by key', function () {
-+      // normally cookies are reset after each test
-+      cy.getCookie('fakeCookie').should('not.be.ok')
-+
-+      // preserving a cookie will not clear it when
-+      // the next test starts
-+      cy.setCookie('lastCookie', '789XYZ')
-+      Cypress.Cookies.preserveOnce('lastCookie')
-+    })
-+
-+    it('Cypress.Cookies.defaults() - set defaults for all cookies', function () {
-+      // now any cookie with the name 'session_id' will
-+      // not be cleared before each new test runs
-+      Cypress.Cookies.defaults({
-+        whitelist: 'session_id',
-+      })
-+    })
-+  })
-+
-+  context('Cypress.dom', function () {
-+    beforeEach(function () {
-+      cy.visit('https://example.cypress.io/cypress-api/dom')
-+    })
-+
-+    // https://on.cypress.io/dom
-+    it('Cypress.dom.isHidden() - determine if a DOM element is hidden', function () {
-+      let hiddenP = Cypress.$('.dom-p p.hidden').get(0)
-+      let visibleP = Cypress.$('.dom-p p.visible').get(0)
-+
-+      // our first paragraph has css class 'hidden'
-+      expect(Cypress.dom.isHidden(hiddenP)).to.be.true
-+      expect(Cypress.dom.isHidden(visibleP)).to.be.false
-+    })
-+  })
-+
-+  context('Cypress.Server', function () {
-+    beforeEach(function () {
-+      cy.visit('https://example.cypress.io/cypress-api/server')
-+    })
-+
-+    // Permanently override server options for
-+    // all instances of cy.server()
-+
-+    // https://on.cypress.io/cypress-server
-+    it('Cypress.Server.defaults() - change default config of server', function () {
-+      Cypress.Server.defaults({
-+        delay: 0,
-+        force404: false,
-+        whitelist (xhr) {
-+          // handle custom logic for whitelisting
-+        },
-+      })
-+    })
-+  })
-+})
-added in remote
-  their  100644 5609d310603b43bf480e9547528c071e176f3a87 cypress/plugins/cy-ts-preprocessor.js
-@@ -0,0 +1,26 @@
-+const wp = require('@cypress/webpack-preprocessor')
-+
-+const webpackOptions = {
-+  resolve: {
-+    extensions: ['.ts', '.js'],
-+  },
-+  module: {
-+    rules: [
-+      {
-+        test: /\\spec.ts$/,
-+        exclude: [/node_modules/],
-+        use: [
-+          {
-+            loader: 'ts-loader',
-+          },
-+        ],
-+      },
-+    ],
-+  },
-+}
-+
-+const options = {
-+  webpackOptions,
-+}
-+
-+module.exports = wp(options)
-added in remote
-  their  100644 78e782f9690a432e6a965b96f7e544f3e5d2c84d cypress/plugins/index.js
-@@ -0,0 +1,5 @@
-+const cypressTypeScriptPreprocessor = require('./cy-ts-preprocessor')
-+
-+module.exports = on => {
-+  on('file:preprocessor', cypressTypeScriptPreprocessor)
-+}
-added in remote
-  their  100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 cypress/support/commands.js
-added in remote
-  their  100644 43c03b759d9bed2d8dbd1d5e65febebdd762e8e8 cypress/support/index.js
-@@ -0,0 +1 @@
-+import './commands'
-changed in both
-  base   100644 90bd4ac9e8510620022275c9bfe5c0ac2ec103ad package.json
-  our    100644 2006bfb748810f6ea8bdbd26edf7c09524a1388a package.json
-  their  100644 f9da3ef35f8fcdc28e4abd360ed78a0fcaf05763 package.json
-@@ -51,9 +51,14 @@
-     "yarn": ">= 1.9"
-   },
-   "dependencies": {
-+<<<<<<< .our
-     "ajv": "^6.4.0",
-     "awesome-node-loader": "^1.1.0",
-     "awesome-typescript-loader": "^5.0.0",
-+=======
-+    "@bahmutov/add-typescript-to-cypress": "^2.0.0",
-+    "awesome-typescript-loader": "^3.4.0",
-+>>>>>>> .their
-     "aws-sdk": "^2.23.0",
-     "babel-core": "^6.26.3",
-     "babel-minify-webpack-plugin": "^0.3.1",
-@@ -64,8 +69,14 @@
-     "chalk": "^2.2.0",
-     "clean-webpack-plugin": "^0.1.19",
-     "cross-env": "^5.0.5",
-+<<<<<<< .our
-     "css-loader": "^0.28.11",
-     "eslint": "^5.2.0",
-+=======
-+    "css-loader": "^0.28.5",
-+    "cypress": "^1.4.2",
-+    "eslint": "^4.15.0",
-+>>>>>>> .their
-     "eslint-config-prettier": "^2.9.0",
-     "eslint-plugin-babel": "^5.1.0",
-     "eslint-plugin-json": "^1.2.1",
-changed in both
-  base   100644 277ed46c185a8c539e2c44a06c4c539a248d2577 tsconfig.json
-  our    100644 3162be12e327f202d1aab8c198ad93c33ff738c9 tsconfig.json
-  their  100644 983810b54a0f2a1f8933aa8a7023fca14e3a3e12 tsconfig.json
-@@ -22,7 +22,8 @@
-     "app/node_modules",
-     "dist",
-     "out",
--    "app/src/highlighter"
-+    "app/src/highlighter",
-+    "app/cypress/**/*.ts"
-   ],
-   "compileOnSave": false
- }
-changed in both
-  base   100644 46a48fb4cc61ec9e3ba6c40fb240926be3efe089 yarn.lock
-  our    100644 45ddb8bf6902bbb22708d844324093dccda26c79 yarn.lock
-  their  100644 b5338cebfd3f4c5d6cc5d7227d8a06ccbf9c1db9 yarn.lock
-@@ -13,6 +13,54 @@
-     "@types/express" "*"
-     "@types/node" "*"
- 
-+"@bahmutov/add-typescript-to-cypress@^2.0.0":
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/@bahmutov/add-typescript-to-cypress/-/add-typescript-to-cypress-2.0.0.tgz#5458b630d1d9d309b10941df8757bb59a5db2abf"
-+  dependencies:
-+    "@cypress/webpack-preprocessor" "1.1.3"
-+    am-i-a-dependency "1.1.2"
-+    chalk "2.3.0"
-+    debug "3.1.0"
-+    shelljs "0.8.0"
-+    terminal-banner "1.1.0"
-+    ts-loader "3.2.0"
-+
-+"@cypress/listr-verbose-renderer@0.4.1":
-+  version "0.4.1"
-+  resolved "https://registry.yarnpkg.com/@cypress/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz#a77492f4b11dcc7c446a34b3e28721afd33c642a"
-+  dependencies:
-+    chalk "^1.1.3"
-+    cli-cursor "^1.0.2"
-+    date-fns "^1.27.2"
-+    figures "^1.7.0"
-+
-+"@cypress/webpack-preprocessor@1.1.3":
-+  version "1.1.3"
-+  resolved "https://registry.yarnpkg.com/@cypress/webpack-preprocessor/-/webpack-preprocessor-1.1.3.tgz#ee216893714c6e89a171ff4a6ffa03893c308c78"
-+  dependencies:
-+    babel-core "6.26.0"
-+    babel-loader "7.1.2"
-+    babel-preset-env "1.6.0"
-+    babel-preset-react "6.24.1"
-+    bluebird "3.5.0"
-+    debug "3.1.0"
-+    lodash.clonedeep "4.5.0"
-+    webpack "3.6.0"
-+
-+"@cypress/xvfb@1.1.3":
-+  version "1.1.3"
-+  resolved "https://registry.yarnpkg.com/@cypress/xvfb/-/xvfb-1.1.3.tgz#6294a7d1feb751f12302248f2089fc534c4acb7f"
-+  dependencies:
-+    lodash.once "^4.1.1"
-+
-+"@types/blob-util@1.3.3":
-+  version "1.3.3"
-+  resolved "https://registry.yarnpkg.com/@types/blob-util/-/blob-util-1.3.3.tgz#adba644ae34f88e1dd9a5864c66ad651caaf628a"
-+
-+"@types/bluebird@3.5.18":
-+  version "3.5.18"
-+  resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.18.tgz#6a60435d4663e290f3709898a4f75014f279c4d6"
-+
- "@types/byline@^4.2.31":
-   version "4.2.31"
-   resolved "https://registry.yarnpkg.com/@types/byline/-/byline-4.2.31.tgz#0e61fcb9c03e047d21c4496554c7116297ab60cd"
-@@ -25,13 +73,30 @@
-   dependencies:
-     "@types/chai" "*"
- 
-+"@types/chai-jquery@1.1.35":
-+  version "1.1.35"
-+  resolved "https://registry.yarnpkg.com/@types/chai-jquery/-/chai-jquery-1.1.35.tgz#9a8f0a39ec0851b2768a8f8c764158c2a2568d04"
-+  dependencies:
-+    "@types/chai" "*"
-+    "@types/jquery" "*"
-+
- "@types/chai@*":
-   version "4.0.4"
-   resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.0.4.tgz#fe86315d9a66827feeb16f73bc954688ec950e18"
- 
-+<<<<<<< .our
- "@types/chai@^4.1.2":
-   version "4.1.2"
-   resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.1.2.tgz#f1af664769cfb50af805431c407425ed619daa21"
-+=======
-+"@types/chai@4.0.8":
-+  version "4.0.8"
-+  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.0.8.tgz#d27600e9ba2f371e08695d90a0fe0408d89c7be7"
-+
-+"@types/chai@^4.0.5":
-+  version "4.0.5"
-+  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.0.5.tgz#b6e250e281b47e0192e236619e9b1afe62fd345c"
-+>>>>>>> .their
- 
- "@types/classnames@^2.2.2":
-   version "2.2.3"
-@@ -109,6 +174,7 @@
-   dependencies:
-     "@types/node" "*"
- 
-+<<<<<<< .our
- "@types/fs-extra@^5.0.2":
-   version "5.0.2"
-   resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-5.0.2.tgz#235a7e2b56452cc0a6a4809b53e1d1eaffff9c96"
-@@ -141,11 +207,21 @@
-   dependencies:
-     "@types/html-minifier" "*"
-     "@types/webpack" "*"
-+=======
-+"@types/jquery@*":
-+  version "3.3.0"
-+  resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.3.0.tgz#6316ac20a1a13c5d521a2dc661befc7184f73f5b"
-+
-+"@types/jquery@3.2.16":
-+  version "3.2.16"
-+  resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.2.16.tgz#04419c404a3194350e7d3f339a90e72c88db3111"
-+>>>>>>> .their
- 
- "@types/keytar@^4.0.0":
-   version "4.0.1"
-   resolved "https://registry.yarnpkg.com/@types/keytar/-/keytar-4.0.1.tgz#e2cf6405dc33861424e59b67516c66d2cf7bc21b"
- 
-+<<<<<<< .our
- "@types/legal-eagle@^0.15.0":
-   version "0.15.0"
-   resolved "https://registry.yarnpkg.com/@types/legal-eagle/-/legal-eagle-0.15.0.tgz#3a3cf08edca425ffaf9518304c4f1efddea36e42"
-@@ -177,6 +253,19 @@
- "@types/mocha@^2.2.48":
-   version "2.2.48"
-   resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.48.tgz#3523b126a0b049482e1c3c11877460f76622ffab"
-+=======
-+"@types/lodash@4.14.87":
-+  version "4.14.87"
-+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.87.tgz#55f92183b048c2c64402afe472f8333f4e319a6b"
-+
-+"@types/minimatch@3.0.1":
-+  version "3.0.1"
-+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.1.tgz#b683eb60be358304ef146f5775db4c0e3696a550"
-+
-+"@types/mocha@2.2.44", "@types/mocha@^2.2.29":
-+  version "2.2.44"
-+  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.44.tgz#1d4a798e53f35212fd5ad4d04050620171cd5b5e"
-+>>>>>>> .their
- 
- "@types/mri@^1.1.0":
-   version "1.1.0"
-@@ -239,6 +328,7 @@
-   version "5.5.0"
-   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45"
- 
-+<<<<<<< .our
- "@types/serve-static@*":
-   version "1.13.1"
-   resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.1.tgz#1d2801fa635d274cd97d4ec07e26b21b44127492"
-@@ -249,6 +339,22 @@
- "@types/source-map@*":
-   version "0.5.1"
-   resolved "https://registry.yarnpkg.com/@types/source-map/-/source-map-0.5.1.tgz#7e74db5d06ab373a712356eebfaea2fad0ea2367"
-+=======
-+"@types/sinon-chai@2.7.29":
-+  version "2.7.29"
-+  resolved "https://registry.yarnpkg.com/@types/sinon-chai/-/sinon-chai-2.7.29.tgz#4db01497e2dd1908b2bd30d1782f456353f5f723"
-+  dependencies:
-+    "@types/chai" "*"
-+    "@types/sinon" "*"
-+
-+"@types/sinon@*":
-+  version "4.1.3"
-+  resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-4.1.3.tgz#2ee25e0e302f31e78a945650a60029e08878eaf8"
-+
-+"@types/sinon@4.0.0":
-+  version "4.0.0"
-+  resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-4.0.0.tgz#9a93ffa4ee1329e85166278a5ed99f81dc4c8362"
-+>>>>>>> .their
- 
- "@types/strip-ansi@^3.0.0":
-   version "3.0.0"
-@@ -554,6 +660,10 @@
-   version "1.0.2"
-   resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
- 
-+am-i-a-dependency@1.1.2:
-+  version "1.1.2"
-+  resolved "https://registry.yarnpkg.com/am-i-a-dependency/-/am-i-a-dependency-1.1.2.tgz#f9d3422304d6f642f821e4c407565035f6167f1f"
-+
- amdefine@>=0.0.4:
-   version "1.0.1"
-   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
-@@ -564,7 +674,7 @@
-   dependencies:
-     string-width "^2.0.0"
- 
--ansi-escapes@^1.1.0:
-+ansi-escapes@^1.0.0, ansi-escapes@^1.1.0:
-   version "1.4.0"
-   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
- 
-@@ -802,11 +912,21 @@
-   version "0.1.3"
-   resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
- 
-+<<<<<<< .our
- async-limiter@~1.0.0:
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
- 
- async@^2.0.0:
-+=======
-+async@2.1.4:
-+  version "2.1.4"
-+  resolved "https://registry.yarnpkg.com/async/-/async-2.1.4.tgz#2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4"
-+  dependencies:
-+    lodash "^4.14.0"
-+
-+async@^2.0.0, async@^2.1.2, async@^2.1.5, async@^2.4.1:
-+>>>>>>> .their
-   version "2.5.0"
-   resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d"
-   dependencies:
-@@ -896,7 +1016,11 @@
-     esutils "^2.0.2"
-     js-tokens "^3.0.2"
- 
-+<<<<<<< .our
- babel-core@^6.26.0:
-+=======
-+babel-core@6.26.0, babel-core@^6.22.1, babel-core@^6.24.1, babel-core@^6.26.0:
-+>>>>>>> .their
-   version "6.26.0"
-   resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.0.tgz#af32f78b31a6fcef119c87b0fd8d9753f03a0bb8"
-   dependencies:
-@@ -957,6 +1081,7 @@
-     source-map "^0.5.6"
-     trim-right "^1.0.1"
- 
-+<<<<<<< .our
- babel-helper-evaluate-path@^0.3.0:
-   version "0.3.0"
-   resolved "https://registry.yarnpkg.com/babel-helper-evaluate-path/-/babel-helper-evaluate-path-0.3.0.tgz#2439545e0b6eae5b7f49b790acbebd6b9a73df20"
-@@ -964,6 +1089,81 @@
- babel-helper-flip-expressions@^0.3.0:
-   version "0.3.0"
-   resolved "https://registry.yarnpkg.com/babel-helper-flip-expressions/-/babel-helper-flip-expressions-0.3.0.tgz#f5b6394bd5219b43cf8f7b201535ed540c6e7fa2"
-+=======
-+babel-helper-builder-binary-assignment-operator-visitor@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664"
-+  dependencies:
-+    babel-helper-explode-assignable-expression "^6.24.1"
-+    babel-runtime "^6.22.0"
-+    babel-types "^6.24.1"
-+
-+babel-helper-builder-react-jsx@^6.24.1:
-+  version "6.26.0"
-+  resolved "https://registry.yarnpkg.com/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.26.0.tgz#39ff8313b75c8b65dceff1f31d383e0ff2a408a0"
-+  dependencies:
-+    babel-runtime "^6.26.0"
-+    babel-types "^6.26.0"
-+    esutils "^2.0.2"
-+
-+babel-helper-call-delegate@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d"
-+  dependencies:
-+    babel-helper-hoist-variables "^6.24.1"
-+    babel-runtime "^6.22.0"
-+    babel-traverse "^6.24.1"
-+    babel-types "^6.24.1"
-+
-+babel-helper-define-map@^6.24.1:
-+  version "6.26.0"
-+  resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz#a5f56dab41a25f97ecb498c7ebaca9819f95be5f"
-+  dependencies:
-+    babel-helper-function-name "^6.24.1"
-+    babel-runtime "^6.26.0"
-+    babel-types "^6.26.0"
-+    lodash "^4.17.4"
-+
-+babel-helper-evaluate-path@^0.2.0:
-+  version "0.2.0"
-+  resolved "https://registry.yarnpkg.com/babel-helper-evaluate-path/-/babel-helper-evaluate-path-0.2.0.tgz#0bb2eb01996c0cef53c5e8405e999fe4a0244c08"
-+
-+babel-helper-explode-assignable-expression@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa"
-+  dependencies:
-+    babel-runtime "^6.22.0"
-+    babel-traverse "^6.24.1"
-+    babel-types "^6.24.1"
-+
-+babel-helper-flip-expressions@^0.2.0:
-+  version "0.2.0"
-+  resolved "https://registry.yarnpkg.com/babel-helper-flip-expressions/-/babel-helper-flip-expressions-0.2.0.tgz#160d2090a3d9f9c64a750905321a0bc218f884ec"
-+>>>>>>> .their
-+
-+babel-helper-function-name@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9"
-+  dependencies:
-+    babel-helper-get-function-arity "^6.24.1"
-+    babel-runtime "^6.22.0"
-+    babel-template "^6.24.1"
-+    babel-traverse "^6.24.1"
-+    babel-types "^6.24.1"
-+
-+babel-helper-get-function-arity@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d"
-+  dependencies:
-+    babel-runtime "^6.22.0"
-+    babel-types "^6.24.1"
-+
-+babel-helper-hoist-variables@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76"
-+  dependencies:
-+    babel-runtime "^6.22.0"
-+    babel-types "^6.24.1"
- 
- babel-helper-is-nodes-equiv@^0.0.1:
-   version "0.0.1"
-@@ -977,6 +1177,7 @@
-   version "0.3.0"
-   resolved "https://registry.yarnpkg.com/babel-helper-mark-eval-scopes/-/babel-helper-mark-eval-scopes-0.3.0.tgz#b4731314fdd7a89091271a5213b4e12d236e29e8"
- 
-+<<<<<<< .our
- babel-helper-remove-or-void@^0.3.0:
-   version "0.3.0"
-   resolved "https://registry.yarnpkg.com/babel-helper-remove-or-void/-/babel-helper-remove-or-void-0.3.0.tgz#f43c86147c8fcc395a9528cbb31e7ff49d7e16e3"
-@@ -984,6 +1185,51 @@
- babel-helper-to-multiple-sequence-expressions@^0.3.0:
-   version "0.3.0"
-   resolved "https://registry.yarnpkg.com/babel-helper-to-multiple-sequence-expressions/-/babel-helper-to-multiple-sequence-expressions-0.3.0.tgz#8da2275ccc26995566118f7213abfd9af7214427"
-+=======
-+babel-helper-optimise-call-expression@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257"
-+  dependencies:
-+    babel-runtime "^6.22.0"
-+    babel-types "^6.24.1"
-+
-+babel-helper-regex@^6.24.1:
-+  version "6.26.0"
-+  resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz#325c59f902f82f24b74faceed0363954f6495e72"
-+  dependencies:
-+    babel-runtime "^6.26.0"
-+    babel-types "^6.26.0"
-+    lodash "^4.17.4"
-+
-+babel-helper-remap-async-to-generator@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b"
-+  dependencies:
-+    babel-helper-function-name "^6.24.1"
-+    babel-runtime "^6.22.0"
-+    babel-template "^6.24.1"
-+    babel-traverse "^6.24.1"
-+    babel-types "^6.24.1"
-+
-+babel-helper-remove-or-void@^0.2.0:
-+  version "0.2.0"
-+  resolved "https://registry.yarnpkg.com/babel-helper-remove-or-void/-/babel-helper-remove-or-void-0.2.0.tgz#8e46ad5b30560d57d7510b3fd93f332ee7c67386"
-+
-+babel-helper-replace-supers@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a"
-+  dependencies:
-+    babel-helper-optimise-call-expression "^6.24.1"
-+    babel-messages "^6.23.0"
-+    babel-runtime "^6.22.0"
-+    babel-template "^6.24.1"
-+    babel-traverse "^6.24.1"
-+    babel-types "^6.24.1"
-+
-+babel-helper-to-multiple-sequence-expressions@^0.2.0:
-+  version "0.2.0"
-+  resolved "https://registry.yarnpkg.com/babel-helper-to-multiple-sequence-expressions/-/babel-helper-to-multiple-sequence-expressions-0.2.0.tgz#d1a419634c6cb301f27858c659167cfee0a9d318"
-+>>>>>>> .their
- 
- babel-helpers@^6.24.1:
-   version "6.24.1"
-@@ -992,6 +1238,14 @@
-     babel-runtime "^6.22.0"
-     babel-template "^6.24.1"
- 
-+babel-loader@7.1.2:
-+  version "7.1.2"
-+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.2.tgz#f6cbe122710f1aa2af4d881c6d5b54358ca24126"
-+  dependencies:
-+    find-cache-dir "^1.0.0"
-+    loader-utils "^1.0.2"
-+    mkdirp "^0.5.1"
-+
- babel-messages@^6.23.0:
-   version "6.23.0"
-   resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
-@@ -1006,9 +1260,21 @@
-     babel-preset-minify "^0.3.0"
-     webpack-sources "^1.0.1"
- 
-+<<<<<<< .our
- babel-plugin-minify-builtins@^0.3.0:
-   version "0.3.0"
-   resolved "https://registry.yarnpkg.com/babel-plugin-minify-builtins/-/babel-plugin-minify-builtins-0.3.0.tgz#4740117a6a784063aaf8f092989cf9e4bd484860"
-+=======
-+babel-plugin-check-es2015-constants@^6.22.0:
-+  version "6.22.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a"
-+  dependencies:
-+    babel-runtime "^6.22.0"
-+
-+babel-plugin-minify-builtins@^0.2.0:
-+  version "0.2.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-builtins/-/babel-plugin-minify-builtins-0.2.0.tgz#317f824b0907210b6348671bb040ca072e2e0c82"
-+>>>>>>> .their
-   dependencies:
-     babel-helper-evaluate-path "^0.3.0"
- 
-@@ -1071,6 +1337,7 @@
-   dependencies:
-     babel-helper-is-void-0 "^0.3.0"
- 
-+<<<<<<< .our
- babel-plugin-syntax-dynamic-import@^6.18.0:
-   version "6.18.0"
-   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz#8d6a26229c83745a9982a441051572caa179b1da"
-@@ -1078,6 +1345,222 @@
- babel-plugin-transform-inline-consecutive-adds@^0.3.0:
-   version "0.3.0"
-   resolved "https://registry.yarnpkg.com/babel-plugin-transform-inline-consecutive-adds/-/babel-plugin-transform-inline-consecutive-adds-0.3.0.tgz#f07d93689c0002ed2b2b62969bdd99f734e03f57"
-+=======
-+babel-plugin-syntax-async-functions@^6.8.0:
-+  version "6.13.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
-+
-+babel-plugin-syntax-exponentiation-operator@^6.8.0:
-+  version "6.13.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de"
-+
-+babel-plugin-syntax-flow@^6.18.0:
-+  version "6.18.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz#4c3ab20a2af26aa20cd25995c398c4eb70310c8d"
-+
-+babel-plugin-syntax-jsx@^6.3.13, babel-plugin-syntax-jsx@^6.8.0:
-+  version "6.18.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"
-+
-+babel-plugin-syntax-trailing-function-commas@^6.22.0:
-+  version "6.22.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3"
-+
-+babel-plugin-transform-async-to-generator@^6.22.0:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761"
-+  dependencies:
-+    babel-helper-remap-async-to-generator "^6.24.1"
-+    babel-plugin-syntax-async-functions "^6.8.0"
-+    babel-runtime "^6.22.0"
-+
-+babel-plugin-transform-es2015-arrow-functions@^6.22.0:
-+  version "6.22.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221"
-+  dependencies:
-+    babel-runtime "^6.22.0"
-+
-+babel-plugin-transform-es2015-block-scoped-functions@^6.22.0:
-+  version "6.22.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141"
-+  dependencies:
-+    babel-runtime "^6.22.0"
-+
-+babel-plugin-transform-es2015-block-scoping@^6.23.0:
-+  version "6.26.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f"
-+  dependencies:
-+    babel-runtime "^6.26.0"
-+    babel-template "^6.26.0"
-+    babel-traverse "^6.26.0"
-+    babel-types "^6.26.0"
-+    lodash "^4.17.4"
-+
-+babel-plugin-transform-es2015-classes@^6.23.0:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db"
-+  dependencies:
-+    babel-helper-define-map "^6.24.1"
-+    babel-helper-function-name "^6.24.1"
-+    babel-helper-optimise-call-expression "^6.24.1"
-+    babel-helper-replace-supers "^6.24.1"
-+    babel-messages "^6.23.0"
-+    babel-runtime "^6.22.0"
-+    babel-template "^6.24.1"
-+    babel-traverse "^6.24.1"
-+    babel-types "^6.24.1"
-+
-+babel-plugin-transform-es2015-computed-properties@^6.22.0:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3"
-+  dependencies:
-+    babel-runtime "^6.22.0"
-+    babel-template "^6.24.1"
-+
-+babel-plugin-transform-es2015-destructuring@^6.23.0:
-+  version "6.23.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d"
-+  dependencies:
-+    babel-runtime "^6.22.0"
-+
-+babel-plugin-transform-es2015-duplicate-keys@^6.22.0:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e"
-+  dependencies:
-+    babel-runtime "^6.22.0"
-+    babel-types "^6.24.1"
-+
-+babel-plugin-transform-es2015-for-of@^6.23.0:
-+  version "6.23.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691"
-+  dependencies:
-+    babel-runtime "^6.22.0"
-+
-+babel-plugin-transform-es2015-function-name@^6.22.0:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b"
-+  dependencies:
-+    babel-helper-function-name "^6.24.1"
-+    babel-runtime "^6.22.0"
-+    babel-types "^6.24.1"
-+
-+babel-plugin-transform-es2015-literals@^6.22.0:
-+  version "6.22.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e"
-+  dependencies:
-+    babel-runtime "^6.22.0"
-+
-+babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015-modules-amd@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154"
-+  dependencies:
-+    babel-plugin-transform-es2015-modules-commonjs "^6.24.1"
-+    babel-runtime "^6.22.0"
-+    babel-template "^6.24.1"
-+
-+babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1:
-+  version "6.26.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz#0d8394029b7dc6abe1a97ef181e00758dd2e5d8a"
-+  dependencies:
-+    babel-plugin-transform-strict-mode "^6.24.1"
-+    babel-runtime "^6.26.0"
-+    babel-template "^6.26.0"
-+    babel-types "^6.26.0"
-+
-+babel-plugin-transform-es2015-modules-systemjs@^6.23.0:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23"
-+  dependencies:
-+    babel-helper-hoist-variables "^6.24.1"
-+    babel-runtime "^6.22.0"
-+    babel-template "^6.24.1"
-+
-+babel-plugin-transform-es2015-modules-umd@^6.23.0:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468"
-+  dependencies:
-+    babel-plugin-transform-es2015-modules-amd "^6.24.1"
-+    babel-runtime "^6.22.0"
-+    babel-template "^6.24.1"
-+
-+babel-plugin-transform-es2015-object-super@^6.22.0:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d"
-+  dependencies:
-+    babel-helper-replace-supers "^6.24.1"
-+    babel-runtime "^6.22.0"
-+
-+babel-plugin-transform-es2015-parameters@^6.23.0:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b"
-+  dependencies:
-+    babel-helper-call-delegate "^6.24.1"
-+    babel-helper-get-function-arity "^6.24.1"
-+    babel-runtime "^6.22.0"
-+    babel-template "^6.24.1"
-+    babel-traverse "^6.24.1"
-+    babel-types "^6.24.1"
-+
-+babel-plugin-transform-es2015-shorthand-properties@^6.22.0:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0"
-+  dependencies:
-+    babel-runtime "^6.22.0"
-+    babel-types "^6.24.1"
-+
-+babel-plugin-transform-es2015-spread@^6.22.0:
-+  version "6.22.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1"
-+  dependencies:
-+    babel-runtime "^6.22.0"
-+
-+babel-plugin-transform-es2015-sticky-regex@^6.22.0:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc"
-+  dependencies:
-+    babel-helper-regex "^6.24.1"
-+    babel-runtime "^6.22.0"
-+    babel-types "^6.24.1"
-+
-+babel-plugin-transform-es2015-template-literals@^6.22.0:
-+  version "6.22.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d"
-+  dependencies:
-+    babel-runtime "^6.22.0"
-+
-+babel-plugin-transform-es2015-typeof-symbol@^6.23.0:
-+  version "6.23.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372"
-+  dependencies:
-+    babel-runtime "^6.22.0"
-+
-+babel-plugin-transform-es2015-unicode-regex@^6.22.0:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9"
-+  dependencies:
-+    babel-helper-regex "^6.24.1"
-+    babel-runtime "^6.22.0"
-+    regexpu-core "^2.0.0"
-+
-+babel-plugin-transform-exponentiation-operator@^6.22.0:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e"
-+  dependencies:
-+    babel-helper-builder-binary-assignment-operator-visitor "^6.24.1"
-+    babel-plugin-syntax-exponentiation-operator "^6.8.0"
-+    babel-runtime "^6.22.0"
-+
-+babel-plugin-transform-flow-strip-types@^6.22.0:
-+  version "6.22.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz#84cb672935d43714fdc32bce84568d87441cf7cf"
-+  dependencies:
-+    babel-plugin-syntax-flow "^6.18.0"
-+    babel-runtime "^6.22.0"
-+
-+babel-plugin-transform-inline-consecutive-adds@^0.2.0:
-+  version "0.2.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-inline-consecutive-adds/-/babel-plugin-transform-inline-consecutive-adds-0.2.0.tgz#15dae78921057f4004f8eafd79e15ddc5f12f426"
-+>>>>>>> .their
- 
- babel-plugin-transform-member-expression-literals@^6.9.0:
-   version "6.9.4"
-@@ -1097,9 +1580,49 @@
-   dependencies:
-     esutils "^2.0.2"
- 
-+<<<<<<< .our
- babel-plugin-transform-regexp-constructors@^0.3.0:
-   version "0.3.0"
-   resolved "https://registry.yarnpkg.com/babel-plugin-transform-regexp-constructors/-/babel-plugin-transform-regexp-constructors-0.3.0.tgz#9bb2c8dd082271a5cb1b3a441a7c52e8fd07e0f5"
-+=======
-+babel-plugin-transform-react-display-name@^6.23.0:
-+  version "6.25.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.25.0.tgz#67e2bf1f1e9c93ab08db96792e05392bf2cc28d1"
-+  dependencies:
-+    babel-runtime "^6.22.0"
-+
-+babel-plugin-transform-react-jsx-self@^6.22.0:
-+  version "6.22.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-self/-/babel-plugin-transform-react-jsx-self-6.22.0.tgz#df6d80a9da2612a121e6ddd7558bcbecf06e636e"
-+  dependencies:
-+    babel-plugin-syntax-jsx "^6.8.0"
-+    babel-runtime "^6.22.0"
-+
-+babel-plugin-transform-react-jsx-source@^6.22.0:
-+  version "6.22.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-source/-/babel-plugin-transform-react-jsx-source-6.22.0.tgz#66ac12153f5cd2d17b3c19268f4bf0197f44ecd6"
-+  dependencies:
-+    babel-plugin-syntax-jsx "^6.8.0"
-+    babel-runtime "^6.22.0"
-+
-+babel-plugin-transform-react-jsx@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz#840a028e7df460dfc3a2d29f0c0d91f6376e66a3"
-+  dependencies:
-+    babel-helper-builder-react-jsx "^6.24.1"
-+    babel-plugin-syntax-jsx "^6.8.0"
-+    babel-runtime "^6.22.0"
-+
-+babel-plugin-transform-regenerator@^6.22.0:
-+  version "6.26.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f"
-+  dependencies:
-+    regenerator-transform "^0.10.0"
-+
-+babel-plugin-transform-regexp-constructors@^0.2.0:
-+  version "0.2.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regexp-constructors/-/babel-plugin-transform-regexp-constructors-0.2.0.tgz#6aa5dd0acc515db4be929bbcec4ed4c946c534a3"
-+>>>>>>> .their
- 
- babel-plugin-transform-remove-console@^6.9.0:
-   version "6.9.4"
-@@ -1119,6 +1642,7 @@
-   version "6.9.4"
-   resolved "https://registry.yarnpkg.com/babel-plugin-transform-simplify-comparison-operators/-/babel-plugin-transform-simplify-comparison-operators-6.9.4.tgz#f62afe096cab0e1f68a2d753fdf283888471ceb9"
- 
-+<<<<<<< .our
- babel-plugin-transform-undefined-to-void@^6.9.0:
-   version "6.9.4"
-   resolved "https://registry.yarnpkg.com/babel-plugin-transform-undefined-to-void/-/babel-plugin-transform-undefined-to-void-6.9.4.tgz#be241ca81404030678b748717322b89d0c8fe280"
-@@ -1149,8 +1673,99 @@
-     babel-plugin-transform-remove-undefined "^0.3.0"
-     babel-plugin-transform-simplify-comparison-operators "^6.9.0"
-     babel-plugin-transform-undefined-to-void "^6.9.0"
-+=======
-+babel-plugin-transform-strict-mode@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758"
-+  dependencies:
-+    babel-runtime "^6.22.0"
-+    babel-types "^6.24.1"
-+
-+babel-plugin-transform-undefined-to-void@^6.8.3:
-+  version "6.8.3"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-undefined-to-void/-/babel-plugin-transform-undefined-to-void-6.8.3.tgz#fc52707f6ee1ddc71bb91b0d314fbefdeef9beb4"
-+
-+babel-preset-env@1.6.0:
-+  version "1.6.0"
-+  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.6.0.tgz#2de1c782a780a0a5d605d199c957596da43c44e4"
-+  dependencies:
-+    babel-plugin-check-es2015-constants "^6.22.0"
-+    babel-plugin-syntax-trailing-function-commas "^6.22.0"
-+    babel-plugin-transform-async-to-generator "^6.22.0"
-+    babel-plugin-transform-es2015-arrow-functions "^6.22.0"
-+    babel-plugin-transform-es2015-block-scoped-functions "^6.22.0"
-+    babel-plugin-transform-es2015-block-scoping "^6.23.0"
-+    babel-plugin-transform-es2015-classes "^6.23.0"
-+    babel-plugin-transform-es2015-computed-properties "^6.22.0"
-+    babel-plugin-transform-es2015-destructuring "^6.23.0"
-+    babel-plugin-transform-es2015-duplicate-keys "^6.22.0"
-+    babel-plugin-transform-es2015-for-of "^6.23.0"
-+    babel-plugin-transform-es2015-function-name "^6.22.0"
-+    babel-plugin-transform-es2015-literals "^6.22.0"
-+    babel-plugin-transform-es2015-modules-amd "^6.22.0"
-+    babel-plugin-transform-es2015-modules-commonjs "^6.23.0"
-+    babel-plugin-transform-es2015-modules-systemjs "^6.23.0"
-+    babel-plugin-transform-es2015-modules-umd "^6.23.0"
-+    babel-plugin-transform-es2015-object-super "^6.22.0"
-+    babel-plugin-transform-es2015-parameters "^6.23.0"
-+    babel-plugin-transform-es2015-shorthand-properties "^6.22.0"
-+    babel-plugin-transform-es2015-spread "^6.22.0"
-+    babel-plugin-transform-es2015-sticky-regex "^6.22.0"
-+    babel-plugin-transform-es2015-template-literals "^6.22.0"
-+    babel-plugin-transform-es2015-typeof-symbol "^6.23.0"
-+    babel-plugin-transform-es2015-unicode-regex "^6.22.0"
-+    babel-plugin-transform-exponentiation-operator "^6.22.0"
-+    babel-plugin-transform-regenerator "^6.22.0"
-+    browserslist "^2.1.2"
-+    invariant "^2.2.2"
-+    semver "^5.3.0"
-+
-+babel-preset-flow@^6.23.0:
-+  version "6.23.0"
-+  resolved "https://registry.yarnpkg.com/babel-preset-flow/-/babel-preset-flow-6.23.0.tgz#e71218887085ae9a24b5be4169affb599816c49d"
-+  dependencies:
-+    babel-plugin-transform-flow-strip-types "^6.22.0"
-+
-+babel-preset-minify@^0.2.0:
-+  version "0.2.0"
-+  resolved "https://registry.yarnpkg.com/babel-preset-minify/-/babel-preset-minify-0.2.0.tgz#006566552d9b83834472273f306c0131062a0acc"
-+  dependencies:
-+    babel-plugin-minify-builtins "^0.2.0"
-+    babel-plugin-minify-constant-folding "^0.2.0"
-+    babel-plugin-minify-dead-code-elimination "^0.2.0"
-+    babel-plugin-minify-flip-comparisons "^0.2.0"
-+    babel-plugin-minify-guarded-expressions "^0.2.0"
-+    babel-plugin-minify-infinity "^0.2.0"
-+    babel-plugin-minify-mangle-names "^0.2.0"
-+    babel-plugin-minify-numeric-literals "^0.2.0"
-+    babel-plugin-minify-replace "^0.2.0"
-+    babel-plugin-minify-simplify "^0.2.0"
-+    babel-plugin-minify-type-constructors "^0.2.0"
-+    babel-plugin-transform-inline-consecutive-adds "^0.2.0"
-+    babel-plugin-transform-member-expression-literals "^6.8.5"
-+    babel-plugin-transform-merge-sibling-variables "^6.8.6"
-+    babel-plugin-transform-minify-booleans "^6.8.3"
-+    babel-plugin-transform-property-literals "^6.8.5"
-+    babel-plugin-transform-regexp-constructors "^0.2.0"
-+    babel-plugin-transform-remove-console "^6.8.5"
-+    babel-plugin-transform-remove-debugger "^6.8.5"
-+    babel-plugin-transform-remove-undefined "^0.2.0"
-+    babel-plugin-transform-simplify-comparison-operators "^6.8.5"
-+    babel-plugin-transform-undefined-to-void "^6.8.3"
-+>>>>>>> .their
-     lodash.isplainobject "^4.0.6"
- 
-+babel-preset-react@6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-preset-react/-/babel-preset-react-6.24.1.tgz#ba69dfaea45fc3ec639b6a4ecea6e17702c91380"
-+  dependencies:
-+    babel-plugin-syntax-jsx "^6.3.13"
-+    babel-plugin-transform-react-display-name "^6.23.0"
-+    babel-plugin-transform-react-jsx "^6.24.1"
-+    babel-plugin-transform-react-jsx-self "^6.22.0"
-+    babel-plugin-transform-react-jsx-source "^6.22.0"
-+    babel-preset-flow "^6.23.0"
-+
- babel-register@^6.26.0:
-   version "6.26.0"
-   resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
-@@ -1163,7 +1778,7 @@
-     mkdirp "^0.5.1"
-     source-map-support "^0.4.15"
- 
--babel-runtime@^6.22.0, babel-runtime@^6.26.0:
-+babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0:
-   version "6.26.0"
-   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
-   dependencies:
-@@ -1187,7 +1802,7 @@
-     babylon "^6.18.0"
-     lodash "^4.17.4"
- 
--babel-traverse@^6.26.0:
-+babel-traverse@^6.24.1, babel-traverse@^6.26.0:
-   version "6.26.0"
-   resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
-   dependencies:
-@@ -1201,7 +1816,7 @@
-     invariant "^2.2.2"
-     lodash "^4.17.4"
- 
--babel-types@^6.26.0:
-+babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0:
-   version "6.26.0"
-   resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
-   dependencies:
-@@ -1293,7 +1908,15 @@
-   dependencies:
-     bluebird "^3.5.1"
- 
-+<<<<<<< .our
- bluebird@^3.0.6, bluebird@^3.1.1, bluebird@^3.3.4, bluebird@^3.5.0, bluebird@^3.5.1:
-+=======
-+bluebird@3.5.0:
-+  version "3.5.0"
-+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c"
-+
-+bluebird@^3.0.6, bluebird@^3.1.1, bluebird@^3.3.4, bluebird@^3.4.7, bluebird@^3.5.0, bluebird@^3.5.1:
-+>>>>>>> .their
-   version "3.5.1"
-   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
- 
-@@ -1455,6 +2078,7 @@
-     caniuse-db "^1.0.30000639"
-     electron-to-chromium "^1.2.7"
- 
-+<<<<<<< .our
- buffer-alloc-unsafe@^1.1.0:
-   version "1.1.0"
-   resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
-@@ -1467,6 +2091,16 @@
-     buffer-fill "^1.0.0"
- 
- buffer-crc32@^0.2.1:
-+=======
-+browserslist@^2.1.2:
-+  version "2.11.3"
-+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.3.tgz#fe36167aed1bbcde4827ebfe71347a2cc70b99b2"
-+  dependencies:
-+    caniuse-lite "^1.0.30000792"
-+    electron-to-chromium "^1.3.30"
-+
-+buffer-crc32@^0.2.1, buffer-crc32@~0.2.3:
-+>>>>>>> .their
-   version "0.2.13"
-   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
- 
-@@ -1619,6 +2253,10 @@
-   version "1.0.30000756"
-   resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000756.tgz#e938a6b991630f30d2263dd3458beb65d362268b"
- 
-+caniuse-lite@^1.0.30000792:
-+  version "1.0.30000808"
-+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000808.tgz#7d759b5518529ea08b6705a19e70dbf401628ffc"
-+
- capture-stack-trace@^1.0.0:
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz#4a6fa07399c26bba47f0b2496b4d0fb408c5550d"
-@@ -1660,6 +2298,22 @@
-   dependencies:
-     traverse ">=0.3.0 <0.4"
- 
-+chalk@2.1.0:
-+  version "2.1.0"
-+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.1.0.tgz#ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e"
-+  dependencies:
-+    ansi-styles "^3.1.0"
-+    escape-string-regexp "^1.0.5"
-+    supports-color "^4.0.0"
-+
-+chalk@2.3.0, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.2.0, chalk@^2.3.0:
-+  version "2.3.0"
-+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba"
-+  dependencies:
-+    ansi-styles "^3.1.0"
-+    escape-string-regexp "^1.0.5"
-+    supports-color "^4.0.0"
-+
- chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
-   version "1.1.3"
-   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-@@ -1670,6 +2324,7 @@
-     strip-ansi "^3.0.0"
-     supports-color "^2.0.0"
- 
-+<<<<<<< .our
- chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.2.0, chalk@^2.3.0:
-   version "2.3.0"
-   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba"
-@@ -1690,10 +2345,13 @@
-   version "0.4.2"
-   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
- 
-+=======
-+>>>>>>> .their
- check-error@^1.0.1, check-error@^1.0.2:
-   version "1.0.2"
-   resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
- 
-+<<<<<<< .our
- check-types@^7.3.0:
-   version "7.3.0"
-   resolved "https://registry.yarnpkg.com/check-types/-/check-types-7.3.0.tgz#468f571a4435c24248f5fd0cb0e8d87c3c341e7d"
-@@ -1701,6 +2359,15 @@
- chokidar@^2.0.2:
-   version "2.0.3"
-   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.3.tgz#dcbd4f6cbb2a55b4799ba8a840ac527e5f4b1176"
-+=======
-+check-more-types@2.24.0:
-+  version "2.24.0"
-+  resolved "https://registry.yarnpkg.com/check-more-types/-/check-more-types-2.24.0.tgz#1420ffb10fd444dcfc79b43891bbfffd32a84600"
-+
-+chokidar@^1.7.0:
-+  version "1.7.0"
-+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
-+>>>>>>> .their
-   dependencies:
-     anymatch "^2.0.0"
-     async-each "^1.0.0"
-@@ -1779,12 +2446,29 @@
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
- 
-+cli-cursor@^1.0.2:
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987"
-+  dependencies:
-+    restore-cursor "^1.0.1"
-+
- cli-cursor@^2.1.0:
-   version "2.1.0"
-   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
-   dependencies:
-     restore-cursor "^2.0.0"
- 
-+cli-spinners@^0.1.2:
-+  version "0.1.2"
-+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-0.1.2.tgz#bb764d88e185fb9e1e6a2a1f19772318f605e31c"
-+
-+cli-truncate@^0.2.1:
-+  version "0.2.1"
-+  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz#9f15cfbb0705005369216c626ac7d05ab90dd574"
-+  dependencies:
-+    slice-ansi "0.0.4"
-+    string-width "^1.0.1"
-+
- cli-width@^2.0.0:
-   version "2.2.0"
-   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
-@@ -1900,6 +2584,7 @@
-   version "2.11.0"
-   resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
- 
-+<<<<<<< .our
- commander@^2.12.1, commander@^2.13.0, commander@^2.14.1:
-   version "2.15.1"
-   resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
-@@ -1907,6 +2592,13 @@
- commander@~2.13.0:
-   version "2.13.0"
-   resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
-+=======
-+common-tags@1.4.0:
-+  version "1.4.0"
-+  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.4.0.tgz#1187be4f3d4cf0c0427d43f74eef1f73501614c0"
-+  dependencies:
-+    babel-runtime "^6.18.0"
-+>>>>>>> .their
- 
- commondir@^1.0.1:
-   version "1.0.1"
-@@ -2258,6 +2950,7 @@
-   dependencies:
-     array-find-index "^1.0.1"
- 
-+<<<<<<< .our
- cycle@1.0.x:
-   version "1.0.3"
-   resolved "https://registry.yarnpkg.com/cycle/-/cycle-1.0.3.tgz#21e80b2be8580f98b468f379430662b046c34ad2"
-@@ -2265,6 +2958,54 @@
- cyclist@~0.2.2:
-   version "0.2.2"
-   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
-+=======
-+cypress@^1.4.2:
-+  version "1.4.2"
-+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-1.4.2.tgz#d957d631617aa87e64a7eae71502f2e175076638"
-+  dependencies:
-+    "@cypress/listr-verbose-renderer" "0.4.1"
-+    "@cypress/xvfb" "1.1.3"
-+    "@types/blob-util" "1.3.3"
-+    "@types/bluebird" "3.5.18"
-+    "@types/chai" "4.0.8"
-+    "@types/chai-jquery" "1.1.35"
-+    "@types/jquery" "3.2.16"
-+    "@types/lodash" "4.14.87"
-+    "@types/minimatch" "3.0.1"
-+    "@types/mocha" "2.2.44"
-+    "@types/sinon" "4.0.0"
-+    "@types/sinon-chai" "2.7.29"
-+    bluebird "3.5.0"
-+    chalk "2.1.0"
-+    check-more-types "2.24.0"
-+    commander "2.11.0"
-+    common-tags "1.4.0"
-+    debug "3.1.0"
-+    extract-zip "1.6.6"
-+    fs-extra "4.0.1"
-+    getos "2.8.4"
-+    glob "7.1.2"
-+    is-ci "1.0.10"
-+    is-installed-globally "0.1.0"
-+    lazy-ass "1.6.0"
-+    listr "0.12.0"
-+    lodash "4.17.4"
-+    minimist "1.2.0"
-+    progress "1.1.8"
-+    ramda "0.24.1"
-+    request "2.81.0"
-+    request-progress "0.3.1"
-+    supports-color "5.1.0"
-+    tmp "0.0.31"
-+    url "0.11.0"
-+    yauzl "2.8.0"
-+
-+d@1:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
-+  dependencies:
-+    es5-ext "^0.10.9"
-+>>>>>>> .their
- 
- dashdash@^1.12.0:
-   version "1.14.1"
-@@ -2272,6 +3013,10 @@
-   dependencies:
-     assert-plus "^1.0.0"
- 
-+date-fns@^1.27.2:
-+  version "1.29.0"
-+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.29.0.tgz#12e609cdcb935127311d04d33334e2960a2a54e6"
-+
- date-now@^0.1.4:
-   version "0.1.4"
-   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
-@@ -2687,6 +3432,10 @@
-   version "1.3.27"
-   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.27.tgz#78ecb8a399066187bb374eede35d9c70565a803d"
- 
-+electron-to-chromium@^1.3.30:
-+  version "1.3.33"
-+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.33.tgz#bf00703d62a7c65238136578c352d6c5c042a545"
-+
- electron-window@^0.8.0:
-   version "0.8.1"
-   resolved "https://registry.yarnpkg.com/electron-window/-/electron-window-0.8.1.tgz#16ca187eb4870b0679274fc8299c5960e6ab2c5e"
-@@ -2712,6 +3461,10 @@
-     electron-download "^3.0.1"
-     extract-zip "^1.0.3"
- 
-+elegant-spinner@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
-+
- elliptic@^6.0.0:
-   version "6.4.0"
-   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df"
-@@ -2748,9 +3501,15 @@
-   dependencies:
-     once "^1.4.0"
- 
-+<<<<<<< .our
- enhanced-resolve@^4.0.0:
-   version "4.0.0"
-   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.0.0.tgz#e34a6eaa790f62fccd71d93959f56b2b432db10a"
-+=======
-+enhanced-resolve@^3.0.0, enhanced-resolve@^3.3.0, enhanced-resolve@^3.4.0:
-+  version "3.4.1"
-+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz#0421e339fd71419b3da13d129b3979040230476e"
-+>>>>>>> .their
-   dependencies:
-     graceful-fs "^4.1.2"
-     memory-fs "^0.4.0"
-@@ -3007,9 +3766,21 @@
-     signal-exit "^3.0.0"
-     strip-eof "^1.0.0"
- 
-+<<<<<<< .our
- exit@0.1.2, exit@0.1.x:
-   version "0.1.2"
-   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
-+=======
-+exit-hook@^1.0.0:
-+  version "1.1.1"
-+  resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
-+
-+expand-brackets@^0.1.4:
-+  version "0.1.5"
-+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
-+  dependencies:
-+    is-posix-bracket "^0.1.0"
-+>>>>>>> .their
- 
- expand-brackets@^2.1.4:
-   version "2.1.4"
-@@ -3139,7 +3910,20 @@
-     snapdragon "^0.8.1"
-     to-regex "^3.0.1"
- 
-+<<<<<<< .our
- extract-zip@^1.0.3, extract-zip@^1.6.5:
-+=======
-+extract-text-webpack-plugin@^3.0.0:
-+  version "3.0.2"
-+  resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.2.tgz#5f043eaa02f9750a9258b78c0a6e0dc1408fb2f7"
-+  dependencies:
-+    async "^2.4.1"
-+    loader-utils "^1.1.0"
-+    schema-utils "^0.3.0"
-+    webpack-sources "^1.0.1"
-+
-+extract-zip@1.6.6, extract-zip@^1.0.3, extract-zip@^1.6.5:
-+>>>>>>> .their
-   version "1.6.6"
-   resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.6.tgz#1290ede8d20d0872b429fd3f351ca128ec5ef85c"
-   dependencies:
-@@ -3186,6 +3970,13 @@
-   dependencies:
-     pend "~1.2.0"
- 
-+figures@^1.7.0:
-+  version "1.7.0"
-+  resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
-+  dependencies:
-+    escape-string-regexp "^1.0.5"
-+    object-assign "^4.1.0"
-+
- figures@^2.0.0:
-   version "2.0.0"
-   resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
-@@ -3224,6 +4015,7 @@
-     statuses "~1.3.1"
-     unpipe "~1.0.0"
- 
-+<<<<<<< .our
- finalhandler@1.1.1:
-   version "1.1.1"
-   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
-@@ -3236,6 +4028,8 @@
-     statuses "~1.4.0"
-     unpipe "~1.0.0"
- 
-+=======
-+>>>>>>> .their
- find-cache-dir@^1.0.0:
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
-@@ -3372,6 +4166,14 @@
-     path-is-absolute "^1.0.0"
-     rimraf "^2.2.8"
- 
-+fs-extra@4.0.1:
-+  version "4.0.1"
-+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.1.tgz#7fc0c6c8957f983f57f306a24e5b9ddd8d0dd880"
-+  dependencies:
-+    graceful-fs "^4.1.2"
-+    jsonfile "^3.0.0"
-+    universalify "^0.1.0"
-+
- fs-extra@^0.30.0:
-   version "0.30.0"
-   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.30.0.tgz#f233ffcc08d4da7d432daa449776989db1df93f0"
-@@ -3542,6 +4344,12 @@
-   version "2.0.6"
-   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
- 
-+getos@2.8.4:
-+  version "2.8.4"
-+  resolved "https://registry.yarnpkg.com/getos/-/getos-2.8.4.tgz#7b8603d3619c28e38cb0fe7a4f63c3acb80d5163"
-+  dependencies:
-+    async "2.1.4"
-+
- getpass@^0.1.1:
-   version "0.1.7"
-   resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-@@ -3963,6 +4771,10 @@
-   dependencies:
-     repeating "^2.0.0"
- 
-+indent-string@^3.0.0:
-+  version "3.2.0"
-+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
-+
- indexes-of@^1.0.1:
-   version "1.0.1"
-   resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
-@@ -4088,9 +4900,15 @@
-   version "1.1.3"
-   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2"
- 
-+<<<<<<< .our
- is-ci@^1.0.10, is-ci@^1.1.0:
-   version "1.1.0"
-   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.1.0.tgz#247e4162e7860cebbdaf30b774d6b0ac7dcfe7a5"
-+=======
-+is-ci@1.0.10, is-ci@^1.0.10:
-+  version "1.0.10"
-+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.0.10.tgz#f739336b2632365061a9d48270cd56ae3369318e"
-+>>>>>>> .their
-   dependencies:
-     ci-info "^1.0.0"
- 
-@@ -4180,7 +4998,7 @@
-   dependencies:
-     is-extglob "^2.1.1"
- 
--is-installed-globally@^0.1.0:
-+is-installed-globally@0.1.0, is-installed-globally@^0.1.0:
-   version "0.1.0"
-   resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz#0dfd98f5a9111716dd535dda6492f67bf3d25a80"
-   dependencies:
-@@ -4479,6 +5297,12 @@
-   optionalDependencies:
-     graceful-fs "^4.1.6"
- 
-+jsonfile@^3.0.0:
-+  version "3.0.1"
-+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz#a5ecc6f65f53f662c4415c7675a0331d0992ec66"
-+  optionalDependencies:
-+    graceful-fs "^4.1.6"
-+
- jsonfile@^4.0.0:
-   version "4.0.0"
-   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
-@@ -4554,6 +5378,21 @@
-   dependencies:
-     package-json "^4.0.0"
- 
-+<<<<<<< .our
-+=======
-+lazy-ass@1.6.0:
-+  version "1.6.0"
-+  resolved "https://registry.yarnpkg.com/lazy-ass/-/lazy-ass-1.6.0.tgz#7999655e8646c17f089fdd187d150d3324d54513"
-+
-+lazy-cache@^0.2.3:
-+  version "0.2.7"
-+  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-0.2.7.tgz#7feddf2dcb6edb77d11ef1d117ab5ffdf0ab1b65"
-+
-+lazy-cache@^1.0.3:
-+  version "1.0.4"
-+  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
-+
-+>>>>>>> .their
- lazy-cache@^2.0.2:
-   version "2.0.2"
-   resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-2.0.2.tgz#b9190a4f913354694840859f8a8f7084d8822264"
-@@ -4594,6 +5433,53 @@
-     prelude-ls "~1.1.2"
-     type-check "~0.3.2"
- 
-+listr-silent-renderer@^1.1.1:
-+  version "1.1.1"
-+  resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e"
-+
-+listr-update-renderer@^0.2.0:
-+  version "0.2.0"
-+  resolved "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.2.0.tgz#ca80e1779b4e70266807e8eed1ad6abe398550f9"
-+  dependencies:
-+    chalk "^1.1.3"
-+    cli-truncate "^0.2.1"
-+    elegant-spinner "^1.0.1"
-+    figures "^1.7.0"
-+    indent-string "^3.0.0"
-+    log-symbols "^1.0.2"
-+    log-update "^1.0.2"
-+    strip-ansi "^3.0.1"
-+
-+listr-verbose-renderer@^0.4.0:
-+  version "0.4.1"
-+  resolved "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz#8206f4cf6d52ddc5827e5fd14989e0e965933a35"
-+  dependencies:
-+    chalk "^1.1.3"
-+    cli-cursor "^1.0.2"
-+    date-fns "^1.27.2"
-+    figures "^1.7.0"
-+
-+listr@0.12.0:
-+  version "0.12.0"
-+  resolved "https://registry.yarnpkg.com/listr/-/listr-0.12.0.tgz#6bce2c0f5603fa49580ea17cd6a00cc0e5fa451a"
-+  dependencies:
-+    chalk "^1.1.3"
-+    cli-truncate "^0.2.1"
-+    figures "^1.7.0"
-+    indent-string "^2.1.0"
-+    is-promise "^2.1.0"
-+    is-stream "^1.1.0"
-+    listr-silent-renderer "^1.1.1"
-+    listr-update-renderer "^0.2.0"
-+    listr-verbose-renderer "^0.4.0"
-+    log-symbols "^1.0.2"
-+    log-update "^1.0.2"
-+    ora "^0.2.3"
-+    p-map "^1.1.1"
-+    rxjs "^5.0.0-beta.11"
-+    stream-to-observable "^0.1.0"
-+    strip-ansi "^3.0.1"
-+
- load-json-file@^1.0.0:
-   version "1.1.0"
-   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
-@@ -4660,7 +5546,7 @@
-   version "4.3.0"
-   resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
- 
--lodash.clonedeep@^4.3.2:
-+lodash.clonedeep@4.5.0, lodash.clonedeep@^4.3.2:
-   version "4.5.0"
-   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
- 
-@@ -4688,6 +5574,10 @@
-   version "4.6.0"
-   resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz#150cf0a16791f5903b8891eab154609274bdea55"
- 
-+lodash.once@^4.1.1:
-+  version "4.1.1"
-+  resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
-+
- lodash.some@^4.6.0:
-   version "4.6.0"
-   resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d"
-@@ -4717,13 +5607,21 @@
-   version "4.5.0"
-   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
- 
--lodash@^4.0.0, lodash@^4.14.0, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.3.0, lodash@^4.8.0, lodash@~4.17.4:
-+lodash@4.17.4, lodash@^4.0.0, lodash@^4.14.0, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.3.0, lodash@^4.8.0, lodash@~4.17.4:
-   version "4.17.4"
-   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
- 
-+<<<<<<< .our
- lodash@^4.17.5, lodash@~4.17.10:
-   version "4.17.10"
-   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
-+=======
-+log-symbols@^1.0.2:
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
-+  dependencies:
-+    chalk "^1.0.0"
-+>>>>>>> .their
- 
- log-symbols@^2.1.0:
-   version "2.1.0"
-@@ -4731,6 +5629,13 @@
-   dependencies:
-     chalk "^2.0.1"
- 
-+log-update@^1.0.2:
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/log-update/-/log-update-1.0.2.tgz#19929f64c4093d2d2e7075a1dad8af59c296b8d1"
-+  dependencies:
-+    ansi-escapes "^1.0.0"
-+    cli-cursor "^1.0.2"
-+
- loglevelnext@^1.0.1:
-   version "1.0.1"
-   resolved "https://registry.yarnpkg.com/loglevelnext/-/loglevelnext-1.0.1.tgz#8b17b5a43395338a96c67911a962c44af466d1c8"
-@@ -4939,7 +5844,7 @@
-   version "0.0.8"
-   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
- 
--minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0:
-+minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0:
-   version "1.2.0"
-   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
- 
-@@ -5372,6 +6277,10 @@
-   dependencies:
-     wrappy "1"
- 
-+onetime@^1.0.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
-+
- onetime@^2.0.0:
-   version "2.0.1"
-   resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
-@@ -5400,6 +6309,15 @@
-     type-check "~0.3.2"
-     wordwrap "~1.0.0"
- 
-+ora@^0.2.3:
-+  version "0.2.3"
-+  resolved "https://registry.yarnpkg.com/ora/-/ora-0.2.3.tgz#37527d220adcd53c39b73571d754156d5db657a4"
-+  dependencies:
-+    chalk "^1.1.1"
-+    cli-cursor "^1.0.2"
-+    cli-spinners "^0.1.2"
-+    object-assign "^4.0.1"
-+
- os-browserify@^0.2.0:
-   version "0.2.1"
-   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.2.1.tgz#63fc4ccee5d2d7763d26bbf8601078e6c2e0044f"
-@@ -5453,6 +6371,7 @@
-   dependencies:
-     p-limit "^1.1.0"
- 
-+<<<<<<< .our
- p-locate@^3.0.0:
-   version "3.0.0"
-   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
-@@ -5462,6 +6381,11 @@
- p-try@^2.0.0:
-   version "2.0.0"
-   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
-+=======
-+p-map@^1.1.1:
-+  version "1.2.0"
-+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
-+>>>>>>> .their
- 
- package-json@^4.0.0:
-   version "4.0.1"
-@@ -5967,7 +6891,11 @@
-     renderkid "^2.0.1"
-     utila "~0.4"
- 
-+<<<<<<< .our
- private@^0.1.7, private@^0.1.8:
-+=======
-+private@^0.1.6, private@^0.1.7:
-+>>>>>>> .their
-   version "0.1.8"
-   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
- 
-@@ -5990,7 +6918,11 @@
-     speedometer "~0.1.2"
-     through2 "~0.2.3"
- 
-+<<<<<<< .our
- progress@^1.1.8:
-+=======
-+progress@1.1.8:
-+>>>>>>> .their
-   version "1.1.8"
-   resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
- 
-@@ -6109,6 +7041,28 @@
-   version "0.2.0"
-   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
- 
-+<<<<<<< .our
-+=======
-+rabin-bindings@~1.7.4:
-+  version "1.7.4"
-+  resolved "https://registry.yarnpkg.com/rabin-bindings/-/rabin-bindings-1.7.4.tgz#174581d3b9a3c1b09ece75dc21f1b4ae0dd79974"
-+  dependencies:
-+    bindings "^1.3.0"
-+    nan "^2.8.0"
-+    prebuild-install "^2.3.0"
-+
-+ramda@0.24.1:
-+  version "0.24.1"
-+  resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.24.1.tgz#c3b7755197f35b8dc3502228262c4c91ddb6b857"
-+
-+randomatic@^1.1.3:
-+  version "1.1.7"
-+  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c"
-+  dependencies:
-+    is-number "^3.0.0"
-+    kind-of "^4.0.0"
-+
-+>>>>>>> .their
- randombytes@^2.0.0, randombytes@^2.0.1:
-   version "2.0.5"
-   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.5.tgz#dc009a246b8d09a177b4b7a0ae77bc570f4b1b79"
-@@ -6278,6 +7232,12 @@
-     readable-stream "^2.0.2"
-     set-immediate-shim "^1.0.1"
- 
-+rechoir@^0.6.2:
-+  version "0.6.2"
-+  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
-+  dependencies:
-+    resolve "^1.1.6"
-+
- redent@^1.0.0:
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
-@@ -6311,6 +7271,23 @@
-   version "0.11.0"
-   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz#7e54fe5b5ccd5d6624ea6255c3473be090b802e1"
- 
-+<<<<<<< .our
-+=======
-+regenerator-transform@^0.10.0:
-+  version "0.10.1"
-+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd"
-+  dependencies:
-+    babel-runtime "^6.18.0"
-+    babel-types "^6.19.0"
-+    private "^0.1.6"
-+
-+regex-cache@^0.4.2:
-+  version "0.4.4"
-+  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
-+  dependencies:
-+    is-equal-shallow "^0.1.3"
-+
-+>>>>>>> .their
- regex-not@^1.0.0:
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.0.tgz#42f83e39771622df826b02af176525d6a5f157f9"
-@@ -6342,6 +7319,14 @@
-     regjsgen "^0.2.0"
-     regjsparser "^0.1.4"
- 
-+regexpu-core@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240"
-+  dependencies:
-+    regenerate "^1.2.1"
-+    regjsgen "^0.2.0"
-+    regjsparser "^0.1.4"
-+
- registry-auth-token@^3.0.1:
-   version "3.3.1"
-   resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.1.tgz#fb0d3289ee0d9ada2cbb52af5dfe66cb070d3006"
-@@ -6397,11 +7382,19 @@
-   dependencies:
-     is-finite "^1.0.0"
- 
-+<<<<<<< .our
- request-progress@^2.0.1:
-   version "2.0.1"
-   resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-2.0.1.tgz#5d36bb57961c673aa5b788dbc8141fdf23b44e08"
-   dependencies:
-     throttleit "^1.0.0"
-+=======
-+request-progress@0.3.1:
-+  version "0.3.1"
-+  resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-0.3.1.tgz#0721c105d8a96ac6b2ce8b2c89ae2d5ecfcf6b3a"
-+  dependencies:
-+    throttleit "~0.0.2"
-+>>>>>>> .their
- 
- request@2, request@^2.45.0, request@^2.72.0, request@^2.79.0, request@^2.81.0:
-   version "2.83.0"
-@@ -6515,6 +7508,13 @@
-   dependencies:
-     path-parse "^1.0.5"
- 
-+restore-cursor@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
-+  dependencies:
-+    exit-hook "^1.0.0"
-+    onetime "^1.0.0"
-+
- restore-cursor@^2.0.0:
-   version "2.0.0"
-   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
-@@ -6563,9 +7563,15 @@
-   version "4.1.0"
-   resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
- 
-+<<<<<<< .our
- rxjs@^5.5.2:
-   version "5.5.11"
-   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.11.tgz#f733027ca43e3bec6b994473be4ab98ad43ced87"
-+=======
-+rxjs@^5.0.0-beta.11:
-+  version "5.5.6"
-+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.6.tgz#e31fb96d6fd2ff1fd84bcea8ae9c02d007179c02"
-+>>>>>>> .their
-   dependencies:
-     symbol-observable "1.0.1"
- 
-@@ -6648,7 +7654,11 @@
-   version "5.4.1"
-   resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
- 
-+<<<<<<< .our
- semver@5.5.0, semver@^5.5.0:
-+=======
-+semver@^5.0.1, semver@^5.5.0:
-+>>>>>>> .their
-   version "5.5.0"
-   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
- 
-@@ -6783,9 +7793,19 @@
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
- 
-+<<<<<<< .our
- shelljs@0.3.x:
-   version "0.3.0"
-   resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.3.0.tgz#3596e6307a781544f591f37da618360f31db57b1"
-+=======
-+shelljs@0.8.0:
-+  version "0.8.0"
-+  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.0.tgz#12f561c52ec5d0d3315af15616c011a18ff80d59"
-+  dependencies:
-+    glob "^7.0.0"
-+    interpret "^1.0.0"
-+    rechoir "^0.6.2"
-+>>>>>>> .their
- 
- signal-exit@^3.0.0, signal-exit@^3.0.2:
-   version "3.0.2"
-@@ -6801,6 +7821,10 @@
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
- 
-+slice-ansi@0.0.4:
-+  version "0.0.4"
-+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
-+
- slice-ansi@1.0.0:
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d"
-@@ -7043,9 +8067,15 @@
-     to-arraybuffer "^1.0.0"
-     xtend "^4.0.0"
- 
-+<<<<<<< .our
- stream-shift@^1.0.0:
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
-+=======
-+stream-to-observable@^0.1.0:
-+  version "0.1.0"
-+  resolved "https://registry.yarnpkg.com/stream-to-observable/-/stream-to-observable-0.1.0.tgz#45bf1d9f2d7dc09bed81f1c307c430e68b84cffe"
-+>>>>>>> .their
- 
- strict-uri-encode@^1.0.0:
-   version "1.1.0"
-@@ -7162,6 +8192,12 @@
-   dependencies:
-     has-flag "^2.0.0"
- 
-+supports-color@5.1.0:
-+  version "5.1.0"
-+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.1.0.tgz#058a021d1b619f7ddf3980d712ea3590ce7de3d5"
-+  dependencies:
-+    has-flag "^2.0.0"
-+
- supports-color@^2.0.0:
-   version "2.0.0"
-   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-@@ -7200,9 +8236,15 @@
-   version "1.0.1"
-   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4"
- 
-+<<<<<<< .our
- table@^4.0.3:
-   version "4.0.3"
-   resolved "https://registry.yarnpkg.com/table/-/table-4.0.3.tgz#00b5e2b602f1794b9acaf9ca908a76386a7813bc"
-+=======
-+table@^4.0.1:
-+  version "4.0.2"
-+  resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36"
-+>>>>>>> .their
-   dependencies:
-     ajv "^6.0.1"
-     ajv-keywords "^3.0.0"
-@@ -7266,11 +8308,35 @@
-   dependencies:
-     execa "^0.7.0"
- 
-+<<<<<<< .our
- text-table@^0.2.0:
-   version "0.2.0"
-   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
- 
- throttleit@0.0.2:
-+=======
-+terminal-banner@1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/terminal-banner/-/terminal-banner-1.1.0.tgz#ef81ce7d9d7e541a81d09eb2c0257c3d5463c3ea"
-+
-+text-table@~0.2.0:
-+  version "0.2.0"
-+  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
-+
-+thenify-all@^1.0.0:
-+  version "1.6.0"
-+  resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"
-+  dependencies:
-+    thenify ">= 3.1.0 < 4"
-+
-+"thenify@>= 3.1.0 < 4":
-+  version "3.3.0"
-+  resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.0.tgz#e69e38a1babe969b0108207978b9f62b88604839"
-+  dependencies:
-+    any-promise "^1.0.0"
-+
-+throttleit@0.0.2, throttleit@~0.0.2:
-+>>>>>>> .their
-   version "0.0.2"
-   resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-0.0.2.tgz#cfedf88e60c00dd9697b61fdd2a8343a9b680eaf"
- 
-@@ -7312,6 +8378,12 @@
-   dependencies:
-     os-tmpdir "~1.0.1"
- 
-+tmp@0.0.31:
-+  version "0.0.31"
-+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.31.tgz#8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"
-+  dependencies:
-+    os-tmpdir "~1.0.1"
-+
- tmp@^0.0.33:
-   version "0.0.33"
-   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
-@@ -7416,9 +8488,24 @@
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.0.tgz#027b69fa823225e551cace3ef03b11f6ab37c1d7"
- 
-+<<<<<<< .our
- ts-node@^7.0.0:
-   version "7.0.0"
-   resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-7.0.0.tgz#a94a13c75e5e1aa6b82814b84c68deb339ba7bff"
-+=======
-+ts-loader@3.2.0:
-+  version "3.2.0"
-+  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-3.2.0.tgz#23211922179b81f7448754b7fdfca45b8374a15a"
-+  dependencies:
-+    chalk "^2.3.0"
-+    enhanced-resolve "^3.0.0"
-+    loader-utils "^1.0.2"
-+    semver "^5.0.1"
-+
-+ts-node@^3.2.0:
-+  version "3.3.0"
-+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-3.3.0.tgz#c13c6a3024e30be1180dd53038fc209289d4bf69"
-+>>>>>>> .their
-   dependencies:
-     arrify "^1.0.0"
-     buffer-from "^1.1.0"
-@@ -7696,7 +8783,7 @@
-     punycode "1.3.2"
-     querystring "0.2.0"
- 
--url@^0.11.0, url@~0.11.0:
-+url@0.11.0, url@^0.11.0, url@~0.11.0:
-   version "0.11.0"
-   resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
-   dependencies:
-@@ -7898,9 +8985,42 @@
-     source-list-map "^2.0.0"
-     source-map "~0.5.3"
- 
-+<<<<<<< .our
- webpack-sources@^1.1.0:
-   version "1.1.0"
-   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.1.0.tgz#a101ebae59d6507354d71d8013950a3a8b7a5a54"
-+=======
-+webpack@3.6.0:
-+  version "3.6.0"
-+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.6.0.tgz#a89a929fbee205d35a4fa2cc487be9cbec8898bc"
-+  dependencies:
-+    acorn "^5.0.0"
-+    acorn-dynamic-import "^2.0.0"
-+    ajv "^5.1.5"
-+    ajv-keywords "^2.0.0"
-+    async "^2.1.2"
-+    enhanced-resolve "^3.4.0"
-+    escope "^3.6.0"
-+    interpret "^1.0.0"
-+    json-loader "^0.5.4"
-+    json5 "^0.5.1"
-+    loader-runner "^2.3.0"
-+    loader-utils "^1.1.0"
-+    memory-fs "~0.4.1"
-+    mkdirp "~0.5.0"
-+    node-libs-browser "^2.0.0"
-+    source-map "^0.5.3"
-+    supports-color "^4.2.1"
-+    tapable "^0.2.7"
-+    uglifyjs-webpack-plugin "^0.4.6"
-+    watchpack "^1.4.0"
-+    webpack-sources "^1.0.1"
-+    yargs "^8.0.2"
-+
-+webpack@^2.2.0:
-+  version "2.7.0"
-+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.7.0.tgz#b2a1226804373ffd3d03ea9c6bd525067034f6b1"
-+>>>>>>> .their
-   dependencies:
-     source-list-map "^2.0.0"
-     source-map "~0.6.1"
-@@ -8170,6 +9290,13 @@
-   dependencies:
-     fd-slicer "~1.0.1"
- 
-+yauzl@2.8.0:
-+  version "2.8.0"
-+  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.8.0.tgz#79450aff22b2a9c5a41ef54e02db907ccfbf9ee2"
-+  dependencies:
-+    buffer-crc32 "~0.2.3"
-+    fd-slicer "~1.0.1"
-+
- yn@^2.0.0:
-   version "2.0.0"
-   resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a"
diff --git a/app/test/fixtures/merge-parser/desktop/merge-dark-handle-colors-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-dark-handle-colors-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index 7d4c9c89db0..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-dark-handle-colors-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-changed in both
-  base   100644 e36247cd551a39899efcd6f2835d023c39f17a20 app/styles/_variables.scss
-  our    100644 6c89a529c5a8dbfefb127f171468af9ae5651141 app/styles/_variables.scss
-  their  100644 d6df99e979ae35224a6767759f74dee365b15eba app/styles/_variables.scss
-@@ -378,6 +378,10 @@
-   --path-segment-background: $blue-000;
-   --path-segment-padding: var(--spacing-third);
- 
-+  /** Co-author colors **/
-+  --handle-background: $blue-000;
-+  --handle-border-color: $blue-200;
-+
-   /** Diverging notification banner colors */
-   --notification-banner-background: $blue-000;
-   --notification-banner-border-color: $blue-200;
-changed in both
-  base   100644 43d39d75f19c242c1630b9ab243f18fcc733c7e5 app/styles/themes/_dark.scss
-  our    100644 663d5cb65e7a6b69154193384801a8c63234744f app/styles/themes/_dark.scss
-  their  100644 50283ed7d75649e199b4921fda025a2981d9944d app/styles/themes/_dark.scss
-@@ -295,6 +295,10 @@
-   /** Inline paths and code */
-   --path-segment-background: $gray-700;
- 
-+  /** Co-author colors **/
-+  --handle-background: rgba($blue-700, .75);
-+  --handle-border-color: rgba($blue-600, .75);
-+
-   .blankslate-image {
-     filter: #{'invert()'} grayscale(1) brightness(8) contrast(0.6);
-   }
-changed in both
-  base   100644 7f410ba422cc224a1bf1a644770a555b04eacd29 app/styles/ui/_author-input.scss
-  our    100644 c1acae40fa98cefd4b9acd874bc3f9564610a6b3 app/styles/ui/_author-input.scss
-  their  100644 a41ccafd5ecde9921e8a7e223fdf21cc5aa0aadd app/styles/ui/_author-input.scss
-@@ -24,8 +24,13 @@
- 
-     .handle {
-       border-radius: 3px;
-+<<<<<<< .our
-       border: 1px solid var(--co-author-tag-border-color);
-       background: var(--co-author-tag-background-color);
-+=======
-+      border: 1px solid var(--handle-border-color);
-+      background: var(--handle-background);
-+>>>>>>> .their
-       padding: 1px 1px;
-       margin: 0px 2px;
- 
diff --git a/app/test/fixtures/merge-parser/desktop/merge-database-field-naming-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-database-field-naming-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index be39572ca23..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-database-field-naming-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,595 +0,0 @@
-merged
-  result 100644 2a0f74dc77543305562cfdb0d7df871b94f4d622 app/src/lib/databases/base-database.ts
-  our    100644 3c62963f65df3f6ff54e368c4b1dfac3b3f8953e app/src/lib/databases/base-database.ts
-@@ -10,11 +10,9 @@
-   }
- 
-   /**
--   * Register the version of the schema only if `targetVersion` is less than
-+   * Register the version of the schema only if `schemaVersion` is less than
-    * `version` or is `undefined`.
-    *
--   * targetVersion - The version of the schema that is being targetted. If not
--   *                 provided, the given version will be registered.
-    * version       - The version being registered.
-    * schema        - The schema to register.
-    * upgrade       - An upgrade function to call after upgrading to the given
-changed in both
-  base   100644 872c7b726ce1803b9a7e9280dab2ce26484e6aa5 app/src/lib/databases/pull-request-database.ts
-  our    100644 7446a4ce1ebf104f7825a7757e6be2beccfbe4ef app/src/lib/databases/pull-request-database.ts
-  their  100644 4c81bea71896008149f396372926584549c4c90d app/src/lib/databases/pull-request-database.ts
-@@ -1,13 +1,18 @@
- import Dexie from 'dexie'
--import { APIRefState, IAPIRefStatusItem } from '../api'
- import { BaseDatabase } from './base-database'
- 
-+export const PullRequestTableName = 'pullRequest'
-+export const PullRequestStatusTableName = 'pullRequestStatus'
-+
-+/** The combined state of a ref. */
-+export type RefState = 'failure' | 'pending' | 'success'
-+
- export interface IPullRequestRef {
-   /**
-    * The database ID of the GitHub repository in which this ref lives. It could
-    * be null if the repository was deleted on the site after the PR was opened.
-    */
--  readonly repoId: number | null
-+  readonly repositoryId: number | null
- 
-   /** The name of the ref. */
-   readonly ref: string
-@@ -16,12 +21,24 @@
-   readonly sha: string
- }
- 
-+export interface ICombinedRefStatus {
-+  readonly id: number
-+  /** The state of the status. */
-+  readonly state: RefState
-+  /** The target URL to associate with this status. */
-+  readonly targetUrl: string
-+  /** A short description of the status. */
-+  readonly description: string
-+  /** A string label to differentiate this status from the status of other systems. */
-+  readonly context: string
-+}
-+
- export interface IPullRequest {
-   /**
-    * The database ID. This will be undefined if the pull request hasn't been
-    * inserted into the DB.
-    */
--  readonly id?: number
-+  readonly _id?: number
- 
-   /** The GitHub PR number. */
-   readonly number: number
-@@ -47,13 +64,13 @@
-    * The database ID. This will be undefined if the status hasn't been inserted
-    * into the DB.
-    */
--  readonly id?: number
-+  readonly _id?: number
- 
-   /** The ID of the pull request in the database. */
-   readonly pullRequestId: number
- 
-   /** The status' state. */
--  readonly state: APIRefState
-+  readonly state: RefState
- 
-   /** The number of statuses represented in this combined status. */
-   readonly totalCount: number
-@@ -66,18 +83,23 @@
-    * if the database object was created prior to status support
-    * being added in #3588
-    */
--  readonly statuses?: ReadonlyArray<IAPIRefStatusItem>
-+  readonly status: ReadonlyArray<ICombinedRefStatus>
- }
- 
- export class PullRequestDatabase extends BaseDatabase {
-+<<<<<<< .our
-   public pullRequests!: Dexie.Table<IPullRequest, number>
-   public pullRequestStatus!: Dexie.Table<IPullRequestStatus, number>
-+=======
-+  public pullRequest: Dexie.Table<IPullRequest, number>
-+  public pullRequestStatus: Dexie.Table<IPullRequestStatus, number>
-+>>>>>>> .their
- 
-   public constructor(name: string, schemaVersion?: number) {
-     super(name, schemaVersion)
- 
-     this.conditionalVersion(1, {
--      pullRequests: 'id++, base.repoId',
-+      pullRequest: 'id++, base.repoId',
-     })
- 
-     this.conditionalVersion(2, {
-@@ -91,22 +113,202 @@
-     // we need to run the upgrade function to ensure we add
-     // a status field to all previous records
-     this.conditionalVersion(4, {}, this.addStatusesField)
-+
-+    // we need to copy data to tmp tables
-+    // so we can clear all indexes
-+    this.conditionalVersion(
-+      5,
-+      {
-+        pullRequestTmp: '_id++, base.repositoryId',
-+        pullRequestStatusTmp: `_id++`,
-+      },
-+      this.moveDataToTmpTables
-+    )
-+
-+    this.conditionalVersion(
-+      6,
-+      {
-+        pullRequest: '_id++, base.repositoryId',
-+        pullRequestStatus: '_id++',
-+      },
-+      this.upgradeFieldNames
-+    )
-   }
- 
-   private addStatusesField = async (transaction: Dexie.Transaction) => {
--    const table = this.pullRequestStatus
-+    const tableName = 'pullRequestStatus'
- 
--    await table.toCollection().modify(async prStatus => {
--      if (prStatus.statuses == null) {
--        const newPrStatus = { statuses: [], ...prStatus }
-+    await transaction
-+      .table(tableName)
-+      .toCollection()
-+      .modify(async prStatus => {
-+        if (prStatus.status == null) {
-+          const newPrStatus = { statuses: [], ...prStatus }
- 
--        await table
--          .where('[sha+pullRequestId]')
--          .equals([prStatus.sha, prStatus.pullRequestId])
--          .delete()
-+          await transaction
-+            .table(tableName)
-+            .where('[sha+pullRequestId]')
-+            .equals([prStatus.sha, prStatus.pullRequestId])
-+            .delete()
- 
--        await table.add(newPrStatus)
--      }
--    })
-+          await transaction.table(tableName).add(newPrStatus)
-+        }
-+      })
-+  }
-+
-+  private moveDataToTmpTables = async (transaction: Dexie.Transaction) => {
-+    console.log('moveDataToTmpTables...')
-+    let tmpTable: string
-+
-+    console.dir(transaction)
-+
-+    try {
-+      tmpTable = 'pullRequestTmp'
-+
-+      const prs = await transaction.table(PullRequestTableName).toArray()
-+      console.log('mapping PR data')
-+      const updatedPrs = prs.map(pr => {
-+        return {
-+          _id: pr.id as number,
-+          number: pr.number as number,
-+          title: pr.title as string,
-+          createdAt: pr.createdAt as string,
-+          head: {
-+            repositoryId: pr.head.repoId,
-+            ref: pr.head.ref,
-+            sha: pr.head.sha,
-+          },
-+          base: {
-+            repositoryId: pr.base.repoId,
-+            ref: pr.base.ref,
-+            sha: pr.base.sha,
-+          },
-+          author: pr.author,
-+        }
-+      })
-+      console.log('adding mapped PR data')
-+      await transaction.table(tmpTable).bulkAdd(updatedPrs)
-+      console.log(`removing PR data from '${PullRequestTableName}'`)
-+      await transaction
-+        .table(PullRequestTableName)
-+        .toCollection()
-+        .delete()
-+    } catch (error) {
-+      console.error(`Failed to transfer 'pullRequest' data: ${error}`)
-+      throw error
-+    }
-+
-+    try {
-+      tmpTable = 'pullRequestStatusTmp'
-+
-+      const prStats = await transaction
-+        .table(PullRequestStatusTableName)
-+        .toArray()
-+      console.log('mapping PR Status data')
-+      const updatedPrStats = prStats.map(prStat => {
-+        return {
-+          _id: prStat.id as number,
-+          pullRequestId: prStat.pullRequestId as number,
-+          state: prStat.state as RefState,
-+          totalCount: prStat.totalCount,
-+          sha: prStat.sha,
-+          status: prStat.map((s: any) => {
-+            return {
-+              id: s.id as number,
-+              state: s.state as RefState,
-+              targetUrl: s.target_url as string,
-+              description: s.description as string,
-+              context: s.context as string,
-+            }
-+          }),
-+        }
-+      })
-+      console.log('adding mapped PR Status data')
-+      await transaction.table(tmpTable).bulkAdd(updatedPrStats)
-+      console.log(
-+        `removing PR Status data from '${PullRequestStatusTableName}'`
-+      )
-+      await transaction
-+        .table(PullRequestStatusTableName)
-+        .toCollection()
-+        .delete()
-+    } catch (error) {
-+      console.error(`Failed to transfer 'pullRequestStatus' data: ${error}`)
-+      throw error
-+    }
-+    console.log('completed')
-+  }
-+
-+  private upgradeFieldNames = async (transaction: Dexie.Transaction) => {
-+    console.log('upgradeFieldNames...')
-+    try {
-+      const oldPRRecords = await transaction.table('pullRequests').toArray()
-+      const newPRRecords: IPullRequest[] = oldPRRecords.map(r => {
-+        return {
-+          _id: r.id as number,
-+          number: r.number as number,
-+          title: r.title as string,
-+          createdAt: r.createdAt as string,
-+          head: {
-+            repositoryId: r.head.repoId as number,
-+            ref: r.head.ref as string,
-+            sha: r.head.sha as string,
-+          },
-+          base: {
-+            repositoryId: r.base.repoId as number,
-+            ref: r.base.ref as string,
-+            sha: r.base.sha as string,
-+          },
-+          author: r.author,
-+        }
-+      })
-+
-+      console.log(`deleting old indexes on '${PullRequestTableName}'`)
-+      await Promise.all(
-+        ['id', 'base.repoId'].map(index =>
-+          transaction.idbtrans
-+            .objectStore(PullRequestTableName)
-+            .deleteIndex(index)
-+        )
-+      )
-+      console.log(`clearing table '${PullRequestTableName}'`)
-+      await transaction.table(PullRequestTableName).clear()
-+      await this.pullRequest.bulkAdd(newPRRecords)
-+    } catch (error) {
-+      log.error(
-+        `Failed to upgrade field names on 'pullRequest' table: ${error}`
-+      )
-+      throw error
-+    }
-+
-+    try {
-+      const oldPrStatusRecords = await transaction
-+        .table('pullRequestStatus')
-+        .toCollection()
-+        .toArray()
-+      const newPrStatusRecords: IPullRequestStatus[] = oldPrStatusRecords.map(
-+        r => {
-+          return {
-+            _id: r.id as number,
-+            pullRequestId: r.pullRequestId as number,
-+            state: r.state as RefState,
-+            totalCount: r.totalCount as number,
-+            sha: r.sha as string,
-+            status: r.statuses as Array<ICombinedRefStatus>,
-+          }
-+        }
-+      )
-+      await transaction
-+        .table('pullRequestStatus')
-+        .toCollection()
-+        .delete()
-+      this.pullRequestStatus.bulkAdd(newPrStatusRecords)
-+    } catch (error) {
-+      log.error(
-+        `Failed to upgrade field names on 'pullRequestStatus' table: ${error}`
-+      )
-+      throw error
-+    }
-+    console.log('completed')
-   }
- }
-changed in both
-  base   100644 51508430ccce1f6f0a378949a0c1abbd5b0fc3f2 app/src/lib/stores/pull-request-store.ts
-  our    100644 d9edf0247ea7c33ae2b508f876aa977d8a81d6d4 app/src/lib/stores/pull-request-store.ts
-  their  100644 751860efd974cba55ff4c5a3fb1524318bd0908d app/src/lib/stores/pull-request-store.ts
-@@ -122,7 +122,7 @@
-       )
-     }
- 
--    const records = await this.pullRequestDatabase.pullRequests
-+    const records = await this.pullRequestDatabase.pullRequest
-       .where('base.repoId')
-       .equals(gitHubRepositoryID)
-       .reverse()
-@@ -131,7 +131,7 @@
-     const result = new Array<PullRequest>()
- 
-     for (const record of records) {
--      const repositoryDbId = record.head.repoId
-+      const repositoryDbId = record.head.repositoryId
-       let githubRepository: GitHubRepository | null = null
- 
-       if (repositoryDbId != null) {
-@@ -144,7 +144,7 @@
-       // fetched the PR from in the first place.
-       const parentRepositoryDbId = forceUnwrap(
-         'A pull request cannot have a null base repo id',
--        record.base.repoId
-+        record.base.repositoryId
-       )
-       const parentGitGubRepository: GitHubRepository | null = await this.repositoryStore.findGitHubRepositoryByID(
-         parentRepositoryDbId
-@@ -158,7 +158,7 @@
-       // database.
-       const pullRequestDbId = forceUnwrap(
-         'PR cannot have a null ID after being retrieved from the database',
--        record.id
-+        record._id
-       )
- 
-       const pullRequestStatus = await this.findPullRequestStatus(
-@@ -270,7 +270,15 @@
-         state: combinedRefStatus.state,
-         totalCount: combinedRefStatus.total_count,
-         sha: pr.head.sha,
--        statuses: combinedRefStatus.statuses,
-+        status: combinedRefStatus.statuses.map(x => {
-+          return {
-+            id: x.id,
-+            state: x.state,
-+            targetUrl: x.target_url,
-+            description: x.description,
-+            context: x.context,
-+          }
-+        }),
-       })
-     }
- 
-@@ -292,7 +300,7 @@
-       return null
-     }
- 
--    const combinedRefStatuses = (result.statuses || []).map(x => {
-+    const combinedRefStatuses = (result.status || []).map(x => {
-       return {
-         id: x.id,
-         state: x.state,
-@@ -321,7 +329,7 @@
-       )
-     }
- 
--    const table = this.pullRequestDatabase.pullRequests
-+    const table = this.pullRequestDatabase.pullRequest
-     const prsToInsert = new Array<IPullRequest>()
- 
-     for (const pr of pullRequestsFromAPI) {
-@@ -374,18 +382,26 @@
-         head: {
-           ref: pr.head.ref,
-           sha: pr.head.sha,
--          repoId: githubRepoDbId,
-+          repositoryId: githubRepoDbId,
-         },
-         base: {
-           ref: pr.base.ref,
-           sha: pr.base.sha,
--          repoId: parentGitHubRepoDbId,
-+          repositoryId: parentGitHubRepoDbId,
-         },
-         author: pr.user.login,
-       })
-     }
- 
-     return this.pullRequestDatabase.transaction('rw', table, async () => {
-+<<<<<<< .our
-+=======
-+      // since all PRs come from the same repository
-+      // using the base repoId of the fist element
-+      // is sufficient here
-+      const repoDbId = prsToInsert[0].base.repositoryId!
-+
-+>>>>>>> .their
-       // we need to delete the stales PRs from the db
-       // so we remove all for a repo to avoid having to
-       // do diffing
-@@ -415,7 +431,7 @@
-         if (record == null) {
-           await table.add(status)
-         } else {
--          await table.put({ id: record.id, ...status })
-+          await table.put({ _id: record._id, ...status })
-         }
-       }
-     })
-merged
-  result 100644 65be61a7ce9118ccb55f8723246c09ad779c791a app/test/unit/pull-request-database-test.ts
-  our    100644 84085903d759de2faabe43e55881fb4e3f2c63e8 app/test/unit/pull-request-database-test.ts
-@@ -2,39 +2,124 @@
- 
- import {
-   PullRequestDatabase,
--  IPullRequestStatus,
-+  PullRequestStatusTableName,
-+  PullRequestTableName,
- } from '../../src/lib/databases'
- 
-+const databaseName = 'TestPullRequestDatabase'
-+const tmpPullRequestTable = 'pullRequestTmp'
-+//const tmpPullRequestStatusTable = 'pullRequestStatusTmp'
-+
- describe('PullRequestDatabase', () => {
--  it("adds statuses key to records that don't have one on upgrade", async () => {
--    const databaseName = 'TestPullRequestDatabase'
--
--    let database = new PullRequestDatabase(databaseName, 3)
--    await database.delete()
--    await database.open()
--
--    const prStatus: IPullRequestStatus = {
--      pullRequestId: 1,
--      state: 'success',
--      totalCount: 1,
--      sha: 'sha',
--    }
--    await database.pullRequestStatus.add(prStatus)
--    const prStatusFromDb = await database.pullRequestStatus.get(1)
--    expect(prStatusFromDb).to.not.be.undefined
--    expect(prStatusFromDb!.pullRequestId).to.equal(prStatus.pullRequestId)
--
--    database.close()
--    database = new PullRequestDatabase(databaseName, 4)
--    await database.open()
--
--    const upgradedPrStatusFromDb = await database.pullRequestStatus.get(1)
--    expect(upgradedPrStatusFromDb).is.not.undefined
--    expect(upgradedPrStatusFromDb!.pullRequestId).to.equal(
--      prStatus.pullRequestId
--    )
--    expect(upgradedPrStatusFromDb!.statuses).is.not.undefined
--
--    await database.delete()
-+  describe('Upgrade', () => {
-+    describe('PullRequestTable', () => {
-+      it.only('renames indexes retaining original data when upgrading to version 4 -> 5 -> 6', async () => {
-+        let database = new PullRequestDatabase(databaseName, 4)
-+        await database.delete()
-+        await database.open()
-+
-+        // untyped because field names have been updated
-+        const pr = {
-+          number: 1,
-+          title: 'title',
-+          createdAt: '2018-01-01',
-+          head: {
-+            repoId: 1,
-+            ref: 'head',
-+            sha: 'head.sha',
-+          },
-+          base: {
-+            repoId: 10,
-+            ref: 'base',
-+            sha: 'base.sha',
-+          },
-+          author: 'me',
-+        }
-+        // We need to opt-out of type checking here since
-+        // the old schema uses an outdated type
-+        const originalTable = database.table(PullRequestTableName)
-+        await originalTable.add(pr)
-+        const prFromDb = await originalTable.get(1)
-+        expect(prFromDb).to.not.be.undefined
-+
-+        database.close()
-+        // we need to run this upgrade first so we can
-+        // clear out indexes; new data is in tmp tables
-+        // at this point
-+        database = new PullRequestDatabase(databaseName, 5)
-+        await database.open()
-+
-+        const tmpTable = database.table(tmpPullRequestTable)
-+        const tmpRecord = await tmpTable.get(1)
-+        expect(tmpRecord).is.not.undefined
-+        expect(tmpRecord.number).to.equal(pr.number)
-+
-+        database.close()
-+        // this is the upgrade we actually care about
-+        // data should be back into normal tables at this point
-+        database = new PullRequestDatabase(databaseName, 6)
-+        await database.open()
-+
-+        // this is a major change, so make sure no data is lost
-+        const upgradedPrFromDb = await database.pullRequest.get(prFromDb.id)
-+        expect(upgradedPrFromDb).is.not.undefined
-+        expect(upgradedPrFromDb!._id).to.equal(1)
-+        expect(upgradedPrFromDb!.number).to.equal(pr.number)
-+        expect(upgradedPrFromDb!.title).to.equal(pr.title)
-+        expect(upgradedPrFromDb!.createdAt).to.equal(pr.createdAt)
-+        expect(upgradedPrFromDb!.head.repositoryId).to.equal(pr.head.repoId)
-+        expect(upgradedPrFromDb!.base.repositoryId).to.equal(pr.base.repoId)
-+        expect(upgradedPrFromDb!.head.ref).to.equal(pr.head.ref)
-+        expect(upgradedPrFromDb!.base.sha).to.equal(pr.base.sha)
-+        expect(upgradedPrFromDb!.author).to.equal(pr.author)
-+
-+        database.close()
-+        await database.delete()
-+      })
-+    })
-+
-+    describe('PullRequestStatusTable', () => {
-+      it('adds default value for the statuses key when upgrading to version 4', async () => {
-+        const databaseName = 'TestPullRequestDatabase'
-+
-+        let database = new PullRequestDatabase(databaseName, 3)
-+        await database.delete()
-+        await database.open()
-+
-+        // insert record that is compatible with v3 of db
-+        const prStatus = {
-+          pullRequestId: 1,
-+          state: 'success',
-+          totalCount: 1,
-+          sha: 'sha',
-+        }
-+        // Cannot use the safety of types here:
-+        // the type is no longer valid with this version of the d
-+        await database.table(PullRequestStatusTableName).add(prStatus)
-+        const prStatusFromDb = await database
-+          .table(PullRequestStatusTableName)
-+          .get(1)
-+        expect(prStatusFromDb).to.not.be.undefined
-+        expect(prStatusFromDb!.pullRequestId).to.equal(prStatus.pullRequestId)
-+
-+        database.close()
-+        // update to v4 of db
-+        database = new PullRequestDatabase(databaseName, 4)
-+        await database.open()
-+
-+        // get the upgraded record from the db
-+        // note: there is no type-safety here
-+        const upgradedPrStatusFromDb = await database
-+          .table(PullRequestStatusTableName)
-+          .get(1)
-+        expect(upgradedPrStatusFromDb).is.not.undefined
-+        expect(upgradedPrStatusFromDb!.pullRequestId).to.equal(
-+          prStatus.pullRequestId
-+        )
-+        expect(upgradedPrStatusFromDb!.statuses).is.not.undefined
-+
-+        await database.delete()
-+      })
-+    })
-   })
- })
diff --git a/app/test/fixtures/merge-parser/desktop/merge-diff-too-large-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-diff-too-large-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index 646e8fbecfd..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-diff-too-large-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,487 +0,0 @@
-changed in both
-  base   100644 b7fc04813074a6cb7cb041abf9f2f656f80bc05d app/src/lib/git/diff.ts
-  our    100644 c7b70925514f334e2076ddb67f208c2f3f12672f app/src/lib/git/diff.ts
-  their  100644 f961cf2783b01412c6a7be9bdd137dfa5f669e90 app/src/lib/git/diff.ts
-@@ -18,7 +18,10 @@
-   LineEndingsChange,
-   parseLineEndingText,
-   ILargeTextDiff,
-+<<<<<<< .our
-   IUnrenderableDiff,
-+=======
-+>>>>>>> .their
- } from '../../models/diff'
- 
- import { spawnAndComplete } from './spawn'
-@@ -32,13 +35,29 @@
-  * This is a hard limit on how big a buffer can be and still be converted into
-  * a string.
-  */
-+<<<<<<< .our
- const MaxDiffBufferSize = 70e6 // 70MB in decimal
-+=======
-+const MaxDiffBufferSize = 268435441 //~268MB
-+>>>>>>> .their
- 
- /**
-  * Where `MaxDiffBufferSize` is a hard limit, this is a suggested limit. Diffs
-  * bigger than this _could_ be displayed but it might cause some slowness.
-  */
-+<<<<<<< .our
- const MaxReasonableDiffSize = MaxDiffBufferSize / 16 // ~4.375MB in decimal
-+=======
-+const MaxReasonableDiffSize = MaxDiffBufferSize / 64 //~4MB
-+
-+/**
-+ * Where `MaxReasonableDiffSize` is a soft limit, and `MaxDiffBufferSize`
-+ * is an absolute limit, this is the MAX number of bytes to read from the
-+ * buffer before _assuming_ the current buffer being read is `MaxDiffBufferSize`.
-+ * This is done so that the UI isn't waiting for the entire buffer to be read.
-+ */
-+const MaxBytesToRead = MaxDiffBufferSize / 8 //~32MB
-+>>>>>>> .their
- 
- /**
-  * The longest line length we should try to display. If a diff has a line longer
-@@ -115,13 +134,26 @@
-     args.push(file.oldPath)
-   }
- 
--  const { output } = await spawnAndComplete(
-+  const { output, didReadAllBytes } = await spawnAndComplete(
-     args,
-     repository.path,
--    'getCommitDiff'
-+    'getCommitDiff',
-+    undefined,
-+    MaxBytesToRead
-   )
-+<<<<<<< .our
- 
-   return buildDiff(output, repository, file, commitish)
-+=======
-+
-+  const largeDiff = buildLargeTextDiff(output, didReadAllBytes)
-+  if (largeDiff != null) {
-+    return largeDiff
-+  }
-+
-+  const diffText = diffFromRawDiffOutput(output)
-+  return convertDiff(repository, file, diffText, commitish)
-+>>>>>>> .their
- }
- 
- /**
-@@ -192,15 +224,31 @@
-     ]
-   }
- 
--  const { output, error } = await spawnAndComplete(
-+  const { output, error, didReadAllBytes } = await spawnAndComplete(
-     args,
-     repository.path,
-     'getWorkingDirectoryDiff',
--    successExitCodes
-+    successExitCodes,
-+    MaxBytesToRead
-   )
-   const lineEndingsChange = parseLineEndingsWarning(error)
- 
-+<<<<<<< .our
-   return buildDiff(output, repository, file, 'HEAD', lineEndingsChange)
-+=======
-+  const largeDiff = buildLargeTextDiff(
-+    output,
-+    didReadAllBytes,
-+    lineEndingsChange
-+  )
-+  if (largeDiff != null) {
-+    return largeDiff
-+  }
-+
-+  const diffText = diffFromRawDiffOutput(output)
-+
-+  return convertDiff(repository, file, diffText, 'HEAD', lineEndingsChange)
-+>>>>>>> .their
- }
- 
- async function getImageDiff(
-@@ -437,3 +485,50 @@
-     contents.length
-   )
- }
-+
-+/**
-+ * Utility function that takes a buffer and outputs
-+ * either a largeTextDiff or null
-+ */
-+function buildLargeTextDiff(
-+  buffer: Buffer,
-+  didReadAllBytes: boolean,
-+  lineEndingsChange?: LineEndingsChange
-+): ILargeTextDiff | null {
-+  if (!didReadAllBytes || !isValidBuffer(buffer)) {
-+    // we know we can't transform this process output into a diff, so let's
-+    // just return a placeholder for now that we can display to the user
-+    // to say we're at the limits of the runtime
-+    return { kind: DiffType.LargeText, length: buffer.length }
-+  }
-+
-+  const diffText = diffFromRawDiffOutput(buffer)
-+
-+  if (isBufferTooLarge(buffer)) {
-+    // we don't want to render by default
-+    // but we keep it as an option by
-+    // passing in text and hunks
-+    const largeTextDiff: ILargeTextDiff = {
-+      kind: DiffType.LargeText,
-+      length: buffer.length,
-+      text: diffText.contents,
-+      hunks: diffText.hunks,
-+      lineEndingsChange,
-+    }
-+
-+    return largeTextDiff
-+  }
-+
-+  if (isDiffTooLarge(diffText)) {
-+    const largeTextDiff: ILargeTextDiff = {
-+      kind: DiffType.LargeText,
-+      text: diffText.contents,
-+      hunks: diffText.hunks,
-+      lineEndingsChange,
-+    }
-+
-+    return largeTextDiff
-+  }
-+
-+  return null
-+}
-changed in both
-  base   100644 d911e4235f5a1e8e056f9d98d4a6fda3d76dcaea app/src/lib/git/spawn.ts
-  our    100644 143168d54995f923711aa352fff4365067b90676 app/src/lib/git/spawn.ts
-  their  100644 79576b0f30fd4b538b4a0c98b1b7a0bb7f68373a app/src/lib/git/spawn.ts
-@@ -4,7 +4,11 @@
- type ProcessOutput = {
-   /** The contents of stdout received from the spawned process */
-   output: Buffer
-+<<<<<<< .our
-   /** The contents of stderr received from the spawned process */
-+=======
-+  didReadAllBytes: boolean
-+>>>>>>> .their
-   error: Buffer
-   /** The exit code returned by the spawned process */
-   exitCode: number
-@@ -38,6 +42,7 @@
-         const process = GitProcess.spawn(args, path)
-         let totalStdoutLength = 0
-         let killSignalSent = false
-+        let didReadAllBytes = true
- 
-         const stdoutChunks = new Array<Buffer>()
-         process.stdout.on('data', (chunk: Buffer) => {
-@@ -53,6 +58,7 @@
-           ) {
-             process.kill()
-             killSignalSent = true
-+            didReadAllBytes = false
-           }
-         })
- 
-@@ -84,6 +90,7 @@
-           if (exitCodes.has(code) || signal) {
-             resolve({
-               output: stdout,
-+              didReadAllBytes,
-               error: stderr,
-               exitCode: code,
-             })
-removed in local
-  base   100644 e4d51575a72468d893a82b6dea7589e4443974c1 app/src/models/diff.ts
-  their  100644 93622965bdfa473e1d9e61e23b2a66270ca1798a app/src/models/diff.ts
-changed in both
-  base   100644 c0d9dfc2ede51b53ffda7330d5bc301a44765f52 app/src/ui/diff/index.tsx
-  our    100644 8695c640dc0a5184c74a112f131a2e2a07ef572d app/src/ui/diff/index.tsx
-  their  100644 d025925faa5170a694e42b0fe8bedde37319fa7f app/src/ui/diff/index.tsx
-@@ -18,6 +18,11 @@
-   IDiff,
-   IImageDiff,
-   ITextDiff,
-+<<<<<<< .our
-+=======
-+  DiffLine,
-+  DiffLineType,
-+>>>>>>> .their
-   ILargeTextDiff,
- } from '../../models/diff'
- 
-@@ -33,12 +38,43 @@
- import { DiffLineGutter } from './diff-line-gutter'
- import { DiffSyntaxMode } from './diff-syntax-mode'
- 
-+<<<<<<< .our
- import { ISelectionStrategy } from './selection/selection-strategy'
- import { TextDiff } from './text-diff'
-+=======
-+import { fatalError } from '../../lib/fatal-error'
-+
-+import { RangeSelectionSizePixels } from './edge-detection'
-+import { relativeChanges } from './changed-range'
-+import { getPartialBlobContents } from '../../lib/git/show'
-+import { readPartialFile } from '../../lib/file-system'
-+
-+import { DiffSyntaxMode, IDiffSyntaxModeSpec } from './diff-syntax-mode'
-+import { highlight } from '../../lib/highlighter/worker'
-+import { ITokens } from '../../lib/highlighter/types'
-+import { Button } from '../lib/button'
-+
-+/** The longest line for which we'd try to calculate a line diff. */
-+const MaxIntraLineDiffStringLength = 4096
-+>>>>>>> .their
-+
-+// image used when no diff is displayed
-+const NoDiffImage = encodePathAsUrl(__dirname, 'static/ufo-alert.svg')
-+
-+<<<<<<< .our
-+=======
-+// This is a custom version of the no-newline octicon that's exactly as
-+// tall as it needs to be (8px) which helps with aligning it on the line.
-+const narrowNoNewlineSymbol = new OcticonSymbol(
-+  16,
-+  8,
-+  'm 16,1 0,3 c 0,0.55 -0.45,1 -1,1 l -3,0 0,2 -3,-3 3,-3 0,2 2,0 0,-2 2,0 z M 8,4 C 8,6.2 6.2,8 4,8 1.8,8 0,6.2 0,4 0,1.8 1.8,0 4,0 6.2,0 8,1.8 8,4 Z M 1.5,5.66 5.66,1.5 C 5.18,1.19 4.61,1 4,1 2.34,1 1,2.34 1,4 1,4.61 1.19,5.17 1.5,5.66 Z M 7,4 C 7,3.39 6.81,2.83 6.5,2.34 L 2.34,6.5 C 2.82,6.81 3.39,7 4,7 5.66,7 7,5.66 7,4 Z'
-+)
- 
- // image used when no diff is displayed
- const NoDiffImage = encodePathAsUrl(__dirname, 'static/ufo-alert.svg')
- 
-+>>>>>>> .their
- type ChangedFile = WorkingDirectoryFileChange | CommittedFileChange
- 
- /** The props for the Diff component. */
-@@ -71,6 +107,21 @@
- interface IDiffState {
-   readonly forceShowLargeDiff: boolean
- }
-+<<<<<<< .our
-+=======
-+
-+/** A component which renders a diff for a file. */
-+export class Diff extends React.Component<IDiffProps, IDiffState> {
-+  private codeMirror: Editor | null
-+  private gutterWidth: number | null
-+
-+  /**
-+   * We store the scroll position before reloading the same diff so that we can
-+   * restore it when we're done. If we're not reloading the same diff, this'll
-+   * be null.
-+   */
-+  private scrollPositionToRestore: { left: number; top: number } | null = null
-+>>>>>>> .their
- 
- /** A component which renders a diff for a file. */
- export class Diff extends React.Component<IDiffProps, IDiffState> {
-@@ -88,6 +139,22 @@
- 
-   public constructor(props: IDiffProps) {
-     super(props)
-+<<<<<<< .our
-+=======
-+
-+    this.state = {
-+      forceShowLargeDiff: false,
-+    }
-+  }
-+
-+  public componentWillReceiveProps(nextProps: IDiffProps) {
-+    // If we're reloading the same file, we want to save the current scroll
-+    // position and restore it after the diff's been updated.
-+    const sameFile =
-+      nextProps.file &&
-+      this.props.file &&
-+      nextProps.file.id === this.props.file.id
-+>>>>>>> .their
- 
-     this.state = {
-       forceShowLargeDiff: false,
-@@ -221,6 +288,65 @@
-   }
- 
-   private renderLargeTextDiff() {
-+<<<<<<< .our
-+=======
-+    return (
-+      <div className="panel empty large-diff">
-+        <img src={NoDiffImage} />
-+        <p>
-+          The diff is too large to be displayed by default.
-+          <br />
-+          You can try to show it anyway, but performance may be negatively
-+          impacted.
-+        </p>
-+        <Button onClick={this.showLargeDiff}>Show diff</Button>
-+      </div>
-+    )
-+  }
-+
-+  private renderDiffTooLarge() {
-+    return (
-+      <div className="panel empty large-diff">
-+        <img src={NoDiffImage} />
-+        <p>The diff is too large to be displayed.</p>
-+      </div>
-+    )
-+  }
-+
-+  private renderLargeText(diff: ILargeTextDiff) {
-+    // gauranteed to be set since this function won't be called if text or hunks are null
-+    const textDiff: ITextDiff = {
-+      text: diff.text!,
-+      hunks: diff.hunks!,
-+      kind: DiffType.Text,
-+      lineEndingsChange: diff.lineEndingsChange,
-+    }
-+
-+    return this.renderTextDiff(textDiff)
-+  }
-+
-+  private renderText(diff: ITextDiff) {
-+    if (diff.hunks.length === 0) {
-+      if (this.props.file.status === AppFileStatus.New) {
-+        return <div className="panel empty">The file is empty</div>
-+      }
-+
-+      if (this.props.file.status === AppFileStatus.Renamed) {
-+        return (
-+          <div className="panel renamed">
-+            The file was renamed but not changed
-+          </div>
-+        )
-+      }
-+
-+      return <div className="panel empty">No content changes found</div>
-+    }
-+
-+    return this.renderTextDiff(diff)
-+  }
-+
-+  private renderBinaryFile() {
-+>>>>>>> .their
-     return (
-       <div className="panel empty large-diff">
-         <img src={NoDiffImage} className="blankslate-image" />
-@@ -258,6 +384,7 @@
-     return this.renderTextDiff(textDiff)
-   }
- 
-+<<<<<<< .our
-   private renderText(diff: ITextDiff) {
-     if (diff.hunks.length === 0) {
-       if (this.props.file.status === AppFileStatus.New) {
-@@ -303,5 +430,36 @@
- 
-   private showLargeDiff = () => {
-     this.setState({ forceShowLargeDiff: true })
-+=======
-+  private renderDiff(diff: IDiff): JSX.Element | null {
-+    switch (diff.kind) {
-+      case DiffType.Text:
-+        return this.renderText(diff)
-+      case DiffType.Binary:
-+        return this.renderBinaryFile()
-+      case DiffType.Image:
-+        return this.renderImage(diff)
-+      case DiffType.LargeText: {
-+        const largeTextDiff = diff as ILargeTextDiff
-+        if (largeTextDiff.hunks == null || largeTextDiff.text == null) {
-+          return this.renderDiffTooLarge()
-+        }
-+
-+        return this.state.forceShowLargeDiff
-+          ? this.renderLargeText(largeTextDiff)
-+          : this.renderLargeTextDiff()
-+      }
-+      default:
-+        return null
-+    }
-+  }
-+
-+  public render() {
-+    return this.renderDiff(this.props.diff)
-+  }
-+
-+  private showLargeDiff = () => {
-+    this.setState({ forceShowLargeDiff: !this.state.forceShowLargeDiff })
-+>>>>>>> .their
-   }
- }
-changed in both
-  base   100644 72a39e960959b860b8f3662b83a83dc4c849afcc app/styles/ui/_blank-slate.scss
-  our    100644 87ceb1fcd23a13f3f1f6a4e56881f01ae7133902 app/styles/ui/_blank-slate.scss
-  their  100644 15b5862c419ad1249d6d9b5ec20aae6a7cdb39e7 app/styles/ui/_blank-slate.scss
-@@ -97,6 +97,17 @@
-   }
- }
- 
-+.blankslate-image {
-+  max-width: 400px;
-+  width: 80%;
-+  flex-grow: 0.6;
-+  // Background image url is set in react since we need to
-+  // calculate it at runtime.
-+  background-repeat: no-repeat;
-+  background-position: center bottom;
-+  background-size: contain;
-+}
-+
- // For all views other than the dedicated blank slate
- // view. Yes, this is confusing.
- .ui-view:not(#blank-slate) .blankslate-image {
-changed in both
-  base   100644 1f4e8010da7360a39efa3147b01bcfb927e4a6a0 app/styles/ui/changes/_changes-view.scss
-  our    100644 94ed12c8ef668212eaa0f41d6f741a8cc444b2da app/styles/ui/changes/_changes-view.scss
-  their  100644 65c5af2ea88cf23e747e2b83a4de02734e02ec5a app/styles/ui/changes/_changes-view.scss
-@@ -59,10 +59,13 @@
-       margin: var(--spacing-double);
-       text-align: center;
-       justify-content: initial;
-+<<<<<<< .our
- 
-       .blankslate-image {
-         max-height: 150px;
-       }
-+=======
-+>>>>>>> .their
-     }
-   }
- }
-changed in both
-  base   100644 867751eb28963ba7f852717ead2d03ce1abecff5 app/styles/ui/history/_history.scss
-  our    100644 58cea508b02182fa4f45daf88643d33c3b2dd020 app/styles/ui/history/_history.scss
-  their  100644 c1638efb77d0655fc644fcf702887a7577365324 app/styles/ui/history/_history.scss
-@@ -42,10 +42,15 @@
-       justify-content: center;
-       align-items: center;
-     }
-+<<<<<<< .our
-+=======
-+
-+>>>>>>> .their
-     &.large-diff {
-       margin: var(--spacing-double);
-       text-align: center;
-       justify-content: initial;
-+<<<<<<< .our
- 
-       .blankslate-image {
-         max-height: 150px;
-@@ -154,6 +159,8 @@
- 
-     .ref-component {
-       word-break: break-word;
-+=======
-+>>>>>>> .their
-     }
-   }
- }
diff --git a/app/test/fixtures/merge-parser/desktop/merge-diverge-prototype-spike-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-diverge-prototype-spike-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index 728f979f509..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-diverge-prototype-spike-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,342 +0,0 @@
-changed in both
-  base   100644 c521e553d1a11b607a994fcbc4d3590c5b7203fc app/src/lib/app-state.ts
-  our    100644 b30f0fe080d909b81d2fb683ceb8deb365fb0191 app/src/lib/app-state.ts
-  their  100644 789cf613e7c1df5994e59a439a137c7c1ed2d9a2 app/src/lib/app-state.ts
-@@ -189,9 +189,13 @@
-   readonly selectedBranchesTab: BranchesTab
- 
-   /** Show the diverging notification banner */
-+<<<<<<< .our
-   readonly isDivergingBranchBannerVisible: boolean
-   /** The currently selected appearance (aka theme) */
-   readonly selectedTheme: ApplicationTheme
-+=======
-+  readonly isDivergingBannerVisible: boolean
-+>>>>>>> .their
- }
- 
- export enum PopupType {
-changed in both
-  base   100644 99a2c7d01fb2ea70977e58590f06fc970284b1d5 app/src/lib/dispatcher/dispatcher.ts
-  our    100644 5e56c00e713342e76f5ccba040062e322e8c90cb app/src/lib/dispatcher/dispatcher.ts
-  their  100644 f3e59ad64ad00e45ed32ae6ed570afc8c3203281 app/src/lib/dispatcher/dispatcher.ts
-@@ -466,10 +466,18 @@
-   }
- 
-   /**
-+<<<<<<< .our
-    * Set the divering branch notification banner's visibility
-    */
-   public setDivergingBranchBannerVisibility(isVisible: boolean) {
-     return this.appStore._setDivergingBranchBannerVisibility(isVisible)
-+=======
-+   * Set the update banner's visibility
-+   */
-+  public setDivergingBannerVisible(isVisible: boolean) {
-+    console.log('hello from dispatcher!!!!!!!')
-+    return this.appStore._setDivergingBannerVisible(isVisible)
-+>>>>>>> .their
-   }
- 
-   /**
-changed in both
-  base   100644 4cee841bc4c314fa326fcd00d2a037b661073822 app/src/lib/stores/app-store.ts
-  our    100644 1a4e387e4d192d34abfd0621b4b5ebe8cc34d8d1 app/src/lib/stores/app-store.ts
-  their  100644 04241406fccef40ca879aad3bda611660ada1919 app/src/lib/stores/app-store.ts
-@@ -291,6 +291,8 @@
-   private selectedTheme = ApplicationTheme.Light
-   private isDivergingBranchBannerVisible = false
- 
-+  private isDivergingBannerVisible: boolean = false
-+
-   public constructor(
-     gitHubUserStore: GitHubUserStore,
-     cloningRepositoriesStore: CloningRepositoriesStore,
-@@ -611,8 +613,12 @@
-       repositoryFilterText: this.repositoryFilterText,
-       selectedCloneRepositoryTab: this.selectedCloneRepositoryTab,
-       selectedBranchesTab: this.selectedBranchesTab,
-+<<<<<<< .our
-       isDivergingBranchBannerVisible: this.isDivergingBranchBannerVisible,
-       selectedTheme: this.selectedTheme,
-+=======
-+      isDivergingBannerVisible: this.isDivergingBannerVisible,
-+>>>>>>> .their
-     }
-   }
- 
-@@ -3186,6 +3192,7 @@
-     this.emitUpdate()
-   }
- 
-+<<<<<<< .our
-   public _setDivergingBranchBannerVisibility(visible: boolean) {
-     if (this.isDivergingBranchBannerVisible !== visible) {
-       this.isDivergingBranchBannerVisible = visible
-@@ -3196,6 +3203,14 @@
- 
-       this.emitUpdate()
-     }
-+=======
-+  public _setDivergingBannerVisible(visibility: boolean) {
-+    console.log('hello from app store!!!!!!!!!!!')
-+
-+    this.isDivergingBannerVisible = visibility
-+
-+    this.emitUpdate()
-+>>>>>>> .their
-   }
- 
-   public _reportStats() {
-changed in both
-  base   100644 d67117115eac84151c211af50ce249ee557c91d5 app/src/ui/app.tsx
-  our    100644 c38c806e36c237ea70f3cdeee739941530c0c7cd app/src/ui/app.tsx
-  their  100644 03aed455ddef0f2d51844ea722adc16e1deb3bd7 app/src/ui/app.tsx
-@@ -1704,7 +1704,11 @@
-           accounts={state.accounts}
-           externalEditorLabel={externalEditorLabel}
-           onOpenInExternalEditor={this.openFileInExternalEditor}
-+<<<<<<< .our
-           isDivergingBranchBannerVisible={state.isDivergingBranchBannerVisible}
-+=======
-+          hasDiverged={this.state.isDivergingBannerVisible}
-+>>>>>>> .their
-         />
-       )
-     } else if (selectedState.type === SelectionType.CloningRepository) {
-changed in both
-  base   100644 2c937c5f439252828e8397251948aacceee8f081 app/src/ui/changes/commit-message.tsx
-  our    100644 0a0e18fc9f4c8956a648726827dc496f3d5f98db app/src/ui/changes/commit-message.tsx
-  their  100644 0fad97ef7ca35381fc99f37f1b2e88ab7b5b57b0 app/src/ui/changes/commit-message.tsx
-@@ -229,6 +229,11 @@
-   }
- 
-   private onSubmit = () => {
-+    setTimeout(() => {
-+        console.log(this)
-+        this.props.dispatcher.setDivergingBannerVisible(true)
-+    }, 2000)
-+
-     this.createCommit()
-   }
- 
-changed in both
-  base   100644 6744747929eeb10cd3e1a1e162d12f05d11612bc app/src/ui/history/compare.tsx
-  our    100644 c0be0e26ce79b9a590edfa3a9fd3718fa58782d4 app/src/ui/history/compare.tsx
-  their  100644 a22e1c207edbc9210db2ac711fedfda6e93fd2b0 app/src/ui/history/compare.tsx
-@@ -24,12 +24,16 @@
- import { SelectionSource } from '../lib/filter-list'
- import { IMatches } from '../../lib/fuzzy-find'
- import { Ref } from '../lib/ref'
-+<<<<<<< .our
- import {
-   NewCommitsBanner,
-   DismissalReason,
- } from '../notification/new-commits-banner'
- import { enableNotificationOfBranchUpdates } from '../../lib/feature-flag'
- import { MergeCallToAction } from './merge-call-to-action'
-+=======
-+import { NotificationBanner } from '../notification-banner';
-+>>>>>>> .their
- 
- interface ICompareSidebarProps {
-   readonly repository: Repository
-@@ -152,6 +156,7 @@
- 
-     return (
-       <div id="compare-view">
-+<<<<<<< .our
-         <CSSTransitionGroup
-           transitionName="diverge-banner"
-           transitionAppear={true}
-@@ -161,6 +166,9 @@
-         >
-           {this.renderNotificationBanner()}
-         </CSSTransitionGroup>
-+=======
-+        <NotificationBanner />
-+>>>>>>> .their
- 
-         <div className="compare-form">
-           <FancyTextBox
-added in remote
-  their  100644 4546992a97ba5b9bd5aef3e6b724a81c6a26b398 app/src/ui/notification-banner/index.tsx
-@@ -0,0 +1,36 @@
-+import * as React from 'react'
-+import { ButtonGroup } from '../lib/button-group';
-+import { Button } from '../lib/button';
-+import { Ref } from '../lib/ref';
-+import { Octicon, OcticonSymbol } from '../octicons';
-+
-+interface INotificationBannerProps {
-+}
-+
-+export class NotificationBanner extends React.Component<INotificationBannerProps, {}> {
-+  public render() {
-+    return (<div className="notification-banner diverge-banner">
-+      <div className="notification-banner-content">
-+        <p>
-+          Your branch is <strong>42 commits</strong> behind <Ref>origin/master</Ref>
-+        </p>
-+
-+        <a className="close" aria-label="Dismiss banner">
-+          <Octicon symbol={OcticonSymbol.x} />
-+        </a>
-+      </div>
-+
-+      <ButtonGroup>
-+        <Button type="submit" onClick={this.noop}>
-+          Merge...
-+        </Button>
-+
-+        <Button onClick={this.noop}>
-+          Compare
-+        </Button>
-+      </ButtonGroup>
-+    </div>)
-+  }
-+
-+  private noop = () => {}
-+}
-changed in both
-  base   100644 f56d583b254f9167699125105c753492fd59fa33 app/src/ui/repository.tsx
-  our    100644 efb00423012b8da0dfa5e8897acacaeb0a5e648a app/src/ui/repository.tsx
-  their  100644 913672d601bbe40dac1fbeaad0e2eb2132388d61 app/src/ui/repository.tsx
-@@ -50,11 +50,15 @@
-    */
-   readonly onOpenInExternalEditor: (fullPath: string) => void
- 
-+<<<<<<< .our
-   /**
-    * Determines if the notification banner and associated dot
-    * on this history tab will be rendered
-    */
-   readonly isDivergingBranchBannerVisible: boolean
-+=======
-+  readonly hasDiverged: boolean
-+>>>>>>> .their
- }
- 
- interface IRepositoryViewState {
-@@ -111,7 +115,22 @@
-               symbol={OcticonSymbol.primitiveDot}
-             />
-           ) : null}
-+<<<<<<< .our
-         </div>
-+=======
-+        </span>
-+
-+        <span className="with-indicator">
-+          <span>History</span>
-+
-+          {this.props.hasDiverged ? (
-+            <Octicon
-+              className="indicator"
-+              symbol={OcticonSymbol.primitiveDot}
-+            />
-+          ) : null}
-+        </span>
-+>>>>>>> .their
-       </TabBar>
-     )
-   }
-changed in both
-  base   100644 2c54d4b7728a6487ddd3f6fd4ac7d7c641b10459 app/styles/_mixins.scss
-  our    100644 2547663981e9047637d8e4edf9b40db74c9d5c51 app/styles/_mixins.scss
-  their  100644 d8eaaa11ac3816418fae454ec2cda3dbb1647425 app/styles/_mixins.scss
-@@ -3,4 +3,8 @@
- @import 'mixins/octicon-status';
- @import 'mixins/textboxish';
- @import 'mixins/checkboard-background';
-+<<<<<<< .our
-+=======
-+
-+>>>>>>> .their
- @import 'mixins/close-button';
-changed in both
-  base   100644 e496a16bd915366f9b11d9d0e63a21a8732099f4 app/styles/ui/_dialog.scss
-  our    100644 94b86d54fb9b0314deb1ef48cc9e1466578ed390 app/styles/ui/_dialog.scss
-  their  100644 971c11206672d1816b1ce06c3629ffd4988e9371 app/styles/ui/_dialog.scss
-added in both
-  our    100644 ec2aae86b8d44d23f35f56cb9684489301016d6b app/styles/ui/_notification-banner.scss
-  their  100644 46736e371cff3d4823c7e53d86d6ad4df0215b7d app/styles/ui/_notification-banner.scss
-@@ -1,5 +1,6 @@
- @import '../mixins';
- 
-+<<<<<<< .our
- .notification-banner + .compare-form {
-   border-top: var(--base-border);
- }
-@@ -30,21 +31,39 @@
-       & + p {
-         margin-top: var(--spacing-half);
-       }
-+=======
-+.notification-banner {
-+  padding: var(--spacing-half);
-+
-+  &-content {
-+    display: flex;
-+
-+    p {
-+      flex-grow: 1;
-+>>>>>>> .their
-     }
-   }
- 
-   @include close-button;
- 
-   .ref-component {
-+<<<<<<< .our
-     background: var(--notification-ref-background);
-+=======
-+>>>>>>> .their
-     word-break: normal;
-   }
- 
-   .close {
-+<<<<<<< .our
-     position: absolute;
-     margin: 0;
-     top: var(--spacing);
-     right: var(--spacing);
-+=======
-+    flex-grow: 0;
-+    margin: 0;
-+>>>>>>> .their
-     text-align: center;
- 
-     .octicon {
-@@ -54,6 +73,7 @@
- }
- 
- .diverge-banner {
-+<<<<<<< .our
-   margin: var(--spacing-half);
-   overflow: hidden;
- 
-@@ -98,5 +118,23 @@
-   .button-component {
-     margin-top: var(--spacing-half);
-     margin-right: var(--spacing-half);
-+=======
-+  p {
-+    margin-top: 0;
-+  }
-+
-+  .button-group {
-+    display: flex;
-+  }
-+
-+  .button-component {
-+    flex: 1;
-+    margin-right: var(--spacing-half);
-+
-+
-+    &:last-of-type {
-+      margin-right: 0;
-+    }
-+>>>>>>> .their
-   }
- }
diff --git a/app/test/fixtures/merge-parser/desktop/merge-drop-back-to-classic-api-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-drop-back-to-classic-api-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index 7b63414ee3d..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-drop-back-to-classic-api-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,434 +0,0 @@
-added in remote
-  their  100644 a309d474e0ebfbd83ab04a460c27dd2b8906c4e8 .eslintignore
-@@ -0,0 +1,3 @@
-+node_modules
-+app/node_modules/
-+script/changelog/node_modules
-\ No newline at end of file
-merged
-  result 100644 22724fb6c88b57702fe40d191883a455f70b01a1 .prettierignore
-  our    100644 d247d9a68070ec5848c5feb83bddbfab02adbb6c .prettierignore
-@@ -1,16 +1,17 @@
--out/
-+app/static/common
-+app/test/fixtures
- dist/
-+gemoji
- node_modules/
-+out/
-+
- npm-debug.log
- yarn-error.log
--app/node_modules/
-+
- .DS_Store
- .awcache
- .idea/
- .eslintcache
- 
--app/static/common
--app/test/fixtures
--gemoji
- *.json
- *.md
-changed in both
-  base   100644 25df97959715b124e8108bef0b086939d7e328c9 package.json
-  our    100644 2006bfb748810f6ea8bdbd26edf7c09524a1388a package.json
-  their  100644 da16d51d663474cc2456eb1920c4d7974e7f82a3 package.json
-@@ -10,6 +10,7 @@
-     "test:unit": "ts-node script/unit-tests.ts",
-     "test:script": "mocha -t 10000 --require ts-node/register script/changelog/test/*.ts",
-     "test": "yarn test:unit && yarn test:script && yarn test:integration",
-+<<<<<<< .our
-     "test:setup": "ts-node -P script/tsconfig.json script/test-setup.ts",
-     "test:review": "ts-node  -P script/tsconfig.json script/test-review.ts",
-     "postinstall": "ts-node -P script/tsconfig.json script/post-install.ts",
-@@ -19,6 +20,20 @@
-     "compile:prod": "cross-env NODE_ENV=production parallel-webpack --config app/webpack.production.ts",
-     "build:dev": "yarn compile:dev && cross-env NODE_ENV=development ts-node -P script/tsconfig.json script/build.ts",
-     "build:prod": "yarn compile:prod && cross-env NODE_ENV=production ts-node -P script/tsconfig.json script/build.ts",
-+=======
-+    "test:setup": "ts-node script/test-setup.ts",
-+    "test:review": "ts-node script/test-review.ts",
-+    "postinstall": "yarn install-app && yarn install-changelog && yarn update-submodules && yarn compile:tslint",
-+    "install-app": "cd app && yarn install --force && cd ..",
-+    "install-changelog": "cd script/changelog && yarn install && cd ../..",
-+    "update-submodules": "git submodule update --recursive --init",
-+    "start": "cross-env NODE_ENV=development node script/start",
-+    "start:prod": "cross-env NODE_ENV=production node script/start",
-+    "compile:dev": "cross-env NODE_ENV=development parallel-webpack --config app/webpack.development.js",
-+    "compile:prod": "cross-env NODE_ENV=production parallel-webpack --config app/webpack.production.js",
-+    "build:dev": "yarn compile:dev && cross-env NODE_ENV=development ts-node script/build.ts",
-+    "build:prod": "yarn compile:prod && cross-env NODE_ENV=production ts-node script/build.ts",
-+>>>>>>> .their
-     "package": "ts-node -P script/tsconfig.json script/package.ts",
-     "generate-octicons": "ts-node -P script/tsconfig.json script/generate-octicons.ts",
-     "clean:tslint": "rimraf tslint-rules/*.js",
-merged
-  result 100644 f723edfaa45b088c09cc8feef59b701e163fe639 script/changelog/api.ts
-  our    100644 9cd75d75226643dd9d12c9e42de23c33fdd44a8b script/changelog/api.ts
-@@ -1,60 +1,129 @@
--import * as HTTPS from 'https'
-+const octokit = require('@octokit/rest')({
-+  timeout: 0,
-+  requestMedia: 'application/vnd.github.v3+json',
-+  headers: {
-+    'User-Agent': 'what-the-changelog',
-+  },
-+})
- 
--export interface IAPIPR {
-+export interface IDesktopPullRequest {
-   readonly title: string
-   readonly body: string
-+  readonly collaborators: ReadonlySet<string>
-+  readonly commits: ReadonlyArray<string>
- }
- 
--type GraphQLResponse = {
--  readonly data: {
--    readonly repository: {
--      readonly pullRequest: IAPIPR
--    }
--  }
-+interface IAPIUser {
-+  readonly login: string
- }
- 
--export function fetchPR(id: number): Promise<IAPIPR | null> {
--  return new Promise((resolve, reject) => {
--    const options: HTTPS.RequestOptions = {
--      host: 'api.github.com',
--      protocol: 'https:',
--      path: '/graphql',
--      method: 'POST',
--      headers: {
--        Authorization: `bearer ${process.env.GITHUB_ACCESS_TOKEN}`,
--        'User-Agent': 'what-the-changelog',
--      },
--    }
-+interface IAPIPullRequest {
-+  readonly title: string
-+  readonly body: string
-+  readonly user: IAPIUser
-+}
-+
-+interface IAPICommit {
-+  readonly sha: string
-+  readonly author?: IAPIUser
-+  readonly committer?: IAPIUser
-+}
- 
--    const request = HTTPS.request(options, response => {
--      let received = ''
--      response.on('data', chunk => {
--        received += chunk
--      })
--
--      response.on('end', () => {
--        try {
--          const json: GraphQLResponse = JSON.parse(received)
--          const pr = json.data.repository.pullRequest
--          resolve(pr)
--        } catch (e) {
--          resolve(null)
--        }
--      })
-+interface IAPITeam {
-+  readonly name: string
-+  readonly id: number
-+}
-+
-+interface IAPITeamMember {
-+  readonly login: string
-+}
-+
-+// this account is assigned by GitHub as the committer for merged pull requests
-+// and should be excluded from being considered an external contributor
-+const webflowAccount = ['web-flow']
-+
-+export function initialize(token: string) {
-+  octokit.authenticate({
-+    type: 'token',
-+    token,
-+  })
-+}
-+
-+export async function getCoreTeamMembers(): Promise<ReadonlySet<string>> {
-+  try {
-+    let response = await octokit.orgs.getTeams({
-+      org: 'desktop',
-+      per_page: 100,
-     })
-+    const teams: ReadonlyArray<IAPITeam> = response.data
-+    const coreTeam = teams.find(t => t.name === 'Core') || null
- 
--    const graphql = `
--{
--  repository(owner: "desktop", name: "desktop") {
--    pullRequest(number: ${id}) {
--      title
--      body
-+    if (coreTeam == null) {
-+      console.error('Unable to find core team on API')
-+      return new Set<string>()
-     }
-+
-+    const id = coreTeam.id
-+
-+    response = await octokit.orgs.getTeamMembers({
-+      id,
-+      role: 'all',
-+      per_page: 100,
-+    })
-+    const members: ReadonlyArray<IAPITeamMember> = response.data
-+
-+    return new Set(members.map(m => m.login).concat(webflowAccount))
-+  } catch (err) {
-+    console.error('API lookup failed for getCoreTeamMembers', err)
-+    return new Set<string>()
-   }
- }
--`
--    request.write(JSON.stringify({ query: graphql }))
- 
--    request.end()
--  })
-+export async function fetchPR(id: number): Promise<IDesktopPullRequest | null> {
-+  try {
-+    const pullRequestResponse = await octokit.pullRequests.get({
-+      owner: 'desktop',
-+      repo: 'desktop',
-+      number: id,
-+    })
-+    const { title, body } = pullRequestResponse.data as IAPIPullRequest
-+
-+    let commitsResponse = await octokit.pullRequests.getCommits({
-+      owner: 'desktop',
-+      repo: 'desktop',
-+      number: id,
-+      per_page: 100,
-+    })
-+
-+    let data: Array<IAPICommit> = commitsResponse.data
-+    while (octokit.hasNextPage(commitsResponse)) {
-+      commitsResponse = await octokit.getNextPage(commitsResponse)
-+      data = data.concat(commitsResponse.data)
-+    }
-+
-+    const collaborators = new Set<string>()
-+    const commits = new Array<string>()
-+
-+    for (const commit of data) {
-+      const { sha, author, committer } = commit
-+
-+      commits.push(sha)
-+      if (author != null && !collaborators.has(author.login)) {
-+        collaborators.add(author.login)
-+      }
-+      if (committer != null && !collaborators.has(committer.login)) {
-+        collaborators.add(committer.login)
-+      }
-+    }
-+
-+    return {
-+      title: title,
-+      body: body,
-+      collaborators,
-+      commits,
-+    }
-+  } catch (err) {
-+    console.error('API lookup failed for fetchPR', err)
-+    return null
-+  }
- }
-added in remote
-  their  100644 2b223d9eca4c82f03969d8ca5d9d8a80a270a041 script/changelog/package.json
-@@ -0,0 +1,24 @@
-+{
-+  "name": "changelog",
-+  "repository": {
-+    "type": "git",
-+    "url": "https://github.com/desktop/desktop.git"
-+  },
-+  "description": "GitHub Desktop changelog dependencies",
-+  "author": {
-+    "name": "GitHub, Inc.",
-+    "email": "opensource+desktop@github.com",
-+    "url": "https://desktop.github.com/"
-+  },
-+  "license": "MIT",
-+  "engines": {
-+    "node": ">= 7",
-+    "yarn": ">= 1.2.0"
-+  },
-+  "dependencies": {
-+    "@octokit/rest": "^14.0.8",
-+    "listify": "^1.0.0"
-+  },
-+  "devDependencies": {
-+  }
-+}
-changed in both
-  base   100644 b0a88cf77391d915e28566a1695cbf31c2ab7bbb script/changelog/parser.ts
-  our    100644 9151c4beab26fe203f7b045e0c32eb99f2da72ce script/changelog/parser.ts
-  their  100644 ff08e0ef253ffb980b0ed57114f9fefea05d7fc1 script/changelog/parser.ts
-@@ -2,10 +2,11 @@
- import * as Fs from 'fs'
- import { gt as greaterThan } from 'semver'
- 
--import { fetchPR, IAPIPR } from './api'
-+import { fetchPR, IDesktopPullRequest } from './api'
-+
-+const listify: (values: Array<any>) => string = require('listify')
- 
- const PlaceholderChangeType = '???'
--const OfficialOwner = 'desktop'
- 
- const ChangelogEntryRegex = /^\[(new|fixed|improved|removed|added)\]\s(.*)/i
- 
-@@ -55,7 +56,11 @@
-   return issueRef
- }
- 
--function getChangelogEntry(commit: IParsedCommit, pr: IAPIPR): string {
-+function getChangelogEntry(
-+  commit: IParsedCommit,
-+  pr: IDesktopPullRequest,
-+  externalContributors: ReadonlySet<string>
-+): string {
-   let type = PlaceholderChangeType
-   const description = capitalized(pr.title)
- 
-@@ -68,15 +73,19 @@
-   }
- 
-   let attribution = ''
--  if (commit.owner !== OfficialOwner) {
--    attribution = `. Thanks @${commit.owner}!`
-+
-+  if (externalContributors.size > 0) {
-+    const mentions = [...externalContributors].map(c => `@${c}`)
-+    const combinedMentions = listify(mentions)
-+    attribution = `. Thanks ${combinedMentions}!`
-   }
- 
-   return `[${type}] ${description} -${issueRef}${attribution}`
- }
- 
- export async function convertToChangelogFormat(
--  lines: ReadonlyArray<string>
-+  lines: ReadonlyArray<string>,
-+  coreMembers: ReadonlySet<string>
- ): Promise<ReadonlyArray<string>> {
-   const entries = []
-   for (const line of lines) {
-@@ -87,7 +96,13 @@
-         throw new Error(`Unable to get PR from API: ${commit.prID}`)
-       }
- 
--      const entry = getChangelogEntry(commit, pr)
-+      const collaborators = pr.collaborators
-+
-+      const externalContributors = new Set(
-+        [...collaborators].filter(c => !coreMembers.has(c))
-+      )
-+
-+      const entry = getChangelogEntry(commit, pr, externalContributors)
-       entries.push(entry)
-     } catch (e) {
-       console.warn('Unable to parse line, using the full message.', e)
-merged
-  result 100644 8259a4c42f949aa6b07249546bddad9e5a341816 script/changelog/run.ts
-  our    100644 d324476ff6f0b766693c2b4c2aa8656852a3a4f8 script/changelog/run.ts
-@@ -1,4 +1,5 @@
- import { spawn } from './spawn'
-+import { getCoreTeamMembers } from './api'
- import { getLogLines } from './git'
- import { convertToChangelogFormat } from './parser'
- import { sort as semverSort } from 'semver'
-@@ -47,7 +48,8 @@
-     )
-   }
- 
-+  const coreMembers = await getCoreTeamMembers()
-   const lines = await getLogLines(previousVersion)
--  const changelogEntries = await convertToChangelogFormat(lines)
-+  const changelogEntries = await convertToChangelogFormat(lines, coreMembers)
-   console.log(jsonStringify(changelogEntries))
- }
-added in remote
-  their  100644 05d54aba4df2a44bee37177eebc9e559e391e602 script/changelog/yarn.lock
-@@ -0,0 +1,48 @@
-+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-+# yarn lockfile v1
-+
-+
-+"@octokit/rest@^14.0.8":
-+  version "14.0.9"
-+  resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-14.0.9.tgz#d5e0a00dcb78901dd7b2ef852acfc0aea7c479ef"
-+  dependencies:
-+    before-after-hook "^1.1.0"
-+    debug "^3.1.0"
-+    is-array-buffer "^1.0.0"
-+    is-stream "^1.1.0"
-+    lodash "^4.17.4"
-+    url-template "^2.0.8"
-+
-+before-after-hook@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-1.1.0.tgz#83165e15a59460d13702cb8febd6a1807896db5a"
-+
-+debug@^3.1.0:
-+  version "3.1.0"
-+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-+  dependencies:
-+    ms "2.0.0"
-+
-+is-array-buffer@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-1.0.0.tgz#f32497a0509d109423f472003f98bab6a8ea34cb"
-+
-+is-stream@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-+
-+listify@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/listify/-/listify-1.0.0.tgz#03ca7ba2d150d4267773f74e57558d1053d2bee3"
-+
-+lodash@^4.17.4:
-+  version "4.17.5"
-+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
-+
-+ms@2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-+
-+url-template@^2.0.8:
-+  version "2.0.8"
-+  resolved "https://registry.yarnpkg.com/url-template/-/url-template-2.0.8.tgz#fc565a3cccbff7730c775f5641f9555791439f21"
-changed in both
-  base   100644 c017ace71061eb0f6db7f42290cb63cca40ab5cb script/draft-release/run.ts
-  our    100644 9c6f2a3aa1c3766de5635266d05f85bf4131e499 script/draft-release/run.ts
-  their  100644 bcb2b3c76a15cdcae1cdb7f5d26d02e9e8ce9935 script/draft-release/run.ts
-@@ -6,6 +6,7 @@
-   convertToChangelogFormat,
-   getChangelogEntriesSince,
- } from '../changelog/parser'
-+import { getCoreTeamMembers, initialize } from '../changelog/api'
- 
- import { Channel } from './channel'
- import { getNextVersionNumber } from './version'
-@@ -88,7 +89,10 @@
-   if (noChangesFound) {
-     printInstructions(nextVersion, [])
-   } else {
--    const changelogEntries = await convertToChangelogFormat(lines)
-+    initialize(process.env.GITHUB_ACCESS_TOKEN)
-+
-+    const coreMembers = await getCoreTeamMembers()
-+    const changelogEntries = await convertToChangelogFormat(lines, coreMembers)
- 
-     console.log("Here's what you should do next:\n")
- 
diff --git a/app/test/fixtures/merge-parser/desktop/merge-experiment-file-watcher-on-lock-file-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-experiment-file-watcher-on-lock-file-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index 502a05723cb..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-experiment-file-watcher-on-lock-file-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,208 +0,0 @@
-changed in both
-  base   100644 dfd9598f71c569e16f2a43e5ea61638af55c7417 app/src/lib/app-state.ts
-  our    100644 b30f0fe080d909b81d2fb683ceb8deb365fb0191 app/src/lib/app-state.ts
-  their  100644 ee5e509a6fae15273535d5e9f076be72dc7dea74 app/src/lib/app-state.ts
-@@ -385,6 +385,9 @@
-   /** Is a commit in progress? */
-   readonly isCommitting: boolean
- 
-+  /** Is the index lockfile currently present in the repository? */
-+  readonly isIndexLocked: boolean
-+
-   /** The date the repository was last fetched. */
-   readonly lastFetched: Date | null
- 
-removed in local
-  base   100644 c73d6ac64904f79320bb3aab8699dd2051c26f34 app/src/lib/dispatcher/app-store.ts
-  their  100644 228a09b7eb27d2a0ed7ffe421a0641b94b3ffca4 app/src/lib/dispatcher/app-store.ts
-added in remote
-  their  100644 daacbb89a9229bdb2cc38953916cb8efcf223cf3 app/src/lib/dispatcher/index-watcher.ts
-@@ -0,0 +1,92 @@
-+import { Repository } from '../../models/repository'
-+import { EventEmitter } from 'events'
-+import * as Path from 'path'
-+import * as Fs from 'fs'
-+
-+/**
-+ * A component designed to monitor the repository filesystem for events
-+ * involving the index.lock file. These events are raised using EventEmitter
-+ * so the application can detect the presence of the lock file and prevent
-+ * the user from committing at this time.
-+ *
-+ * This work leverages knowledge from reading the source of `file-watcher`
-+ * (https://github.com/xpensia/file-watcher/) without requiring the full
-+ * API surface.
-+ */
-+export class IndexWatcher extends EventEmitter {
-+  private readonly gitDir: string
-+
-+  private watcher: Fs.FSWatcher | null
-+
-+  public constructor(repository: Repository) {
-+    super()
-+
-+    this.gitDir = Path.join(repository.path, '.git')
-+  }
-+
-+  public on(
-+    event: 'index-changed',
-+    listener: (isIndexLocked: boolean) => void
-+  ): this {
-+    return super.on(event, listener)
-+  }
-+
-+  private onChanged = (isIndexLocked: boolean) => {
-+    this.emit('index-changed', isIndexLocked)
-+  }
-+
-+  private onChange = (event: string, filename: string) => {
-+    const isValidPath = filename === 'index.lock'
-+    if (!isValidPath) {
-+      return
-+    }
-+
-+    Fs.stat(Path.join(this.gitDir, filename), (err, stats) => {
-+      if (err) {
-+        if (err.code === 'ENOENT') {
-+          this.onChanged(false)
-+        } else {
-+          log.warn('IndexWatcher encounted an unexpected error', err)
-+        }
-+        return
-+      }
-+
-+      if (event === 'rename') {
-+        this.onChanged(true)
-+        return
-+      }
-+
-+      log.warn(`IndexWatcher did not handle event '${event}'`)
-+    })
-+  }
-+
-+  /**
-+   * Start monitoring the git directory for index.lock changes.
-+   *
-+   * Will error if the .git directory doesn't exist, or if the path provided
-+   * isn't a valid repository.
-+   */
-+  public start() {
-+    Fs.stat(this.gitDir, (err, stats) => {
-+      if (err) {
-+        throw err
-+      }
-+
-+      if (!stats.isDirectory()) {
-+        throw new Error('IndexWatcher not configured to watch a directory')
-+      }
-+
-+      this.watcher = Fs.watch(this.gitDir, this.onChange)
-+    })
-+  }
-+
-+  /**
-+   * Stop the watcher and cleanup any internal resources.
-+   */
-+  public stop() {
-+    if (this.watcher) {
-+      this.watcher.close()
-+      this.watcher = null
-+    }
-+  }
-+}
-changed in both
-  base   100644 0eb8418eb61309fccbf76303843a677fd8da9155 app/src/ui/changes/changes-list.tsx
-  our    100644 f785abb2624c245a3387a304168d5fc629e1430e app/src/ui/changes/changes-list.tsx
-  their  100644 f999c5420b7f1df504123231fc9b41266641fd2b app/src/ui/changes/changes-list.tsx
-@@ -63,6 +63,7 @@
-   readonly dispatcher: Dispatcher
-   readonly availableWidth: number
-   readonly isCommitting: boolean
-+  readonly isIndexLocked: boolean
- 
-   /**
-    * Click event handler passed directly to the onRowClick prop of List, see
-@@ -405,8 +406,12 @@
-           contextualCommitMessage={this.props.contextualCommitMessage}
-           autocompletionProviders={this.props.autocompletionProviders}
-           isCommitting={this.props.isCommitting}
-+<<<<<<< .our
-           showCoAuthoredBy={this.props.showCoAuthoredBy}
-           coAuthors={this.props.coAuthors}
-+=======
-+          isIndexLocked={this.props.isIndexLocked}
-+>>>>>>> .their
-         />
-       </div>
-     )
-changed in both
-  base   100644 c620c6fd1f272a657ced3a46eb7f0dede18f1207 app/src/ui/changes/commit-message.tsx
-  our    100644 0a0e18fc9f4c8956a648726827dc496f3d5f98db app/src/ui/changes/commit-message.tsx
-  their  100644 07cbd6984c2fbdfc0dfc7a3d9daa486314f58420 app/src/ui/changes/commit-message.tsx
-@@ -49,6 +49,7 @@
-   readonly dispatcher: Dispatcher
-   readonly autocompletionProviders: ReadonlyArray<IAutocompletionProvider<any>>
-   readonly isCommitting: boolean
-+<<<<<<< .our
- 
-   /**
-    * Whether or not to show a field for adding co-authors to
-@@ -64,6 +65,9 @@
-    * the user has chosen to do so.
-    */
-   readonly coAuthors: ReadonlyArray<IAuthor>
-+=======
-+  readonly isIndexLocked: boolean
-+>>>>>>> .their
- }
- 
- interface ICommitMessageState {
-@@ -470,7 +474,8 @@
- 
-   public render() {
-     const branchName = this.props.branch ? this.props.branch : 'master'
--    const buttonEnabled = this.canCommit() && !this.props.isCommitting
-+    const buttonEnabled =
-+      this.canCommit() && !this.props.isCommitting && !this.props.isIndexLocked
- 
-     const loading = this.props.isCommitting ? <Loading /> : undefined
-     const className = classNames({
-changed in both
-  base   100644 d950085a2ba2550df97783b087eab331cf671410 app/src/ui/changes/sidebar.tsx
-  our    100644 ff1760bbd4b1a3d5ea8ac084b1282e99b2ea288b app/src/ui/changes/sidebar.tsx
-  their  100644 12a7a87c27d9d551e2216ff5709dcf4fa6728d98 app/src/ui/changes/sidebar.tsx
-@@ -46,6 +46,7 @@
-   readonly isCommitting: boolean
-   readonly isPushPullFetchInProgress: boolean
-   readonly gitHubUserStore: GitHubUserStore
-+  readonly isIndexLocked: boolean
-   readonly askForConfirmationOnDiscardChanges: boolean
-   readonly accounts: ReadonlyArray<Account>
-   /** The name of the currently selected external editor */
-@@ -310,10 +311,14 @@
-           availableWidth={this.props.availableWidth}
-           onIgnore={this.onIgnore}
-           isCommitting={this.props.isCommitting}
-+<<<<<<< .our
-           showCoAuthoredBy={this.props.changes.showCoAuthoredBy}
-           coAuthors={this.props.changes.coAuthors}
-           externalEditorLabel={this.props.externalEditorLabel}
-           onOpenInExternalEditor={this.props.onOpenInExternalEditor}
-+=======
-+          isIndexLocked={this.props.isIndexLocked}
-+>>>>>>> .their
-         />
-         {this.renderMostRecentLocalCommit()}
-       </div>
-changed in both
-  base   100644 5a428da019fc9c742d02e758a0503288463be322 app/src/ui/repository.tsx
-  our    100644 efb00423012b8da0dfa5e8897acacaeb0a5e648a app/src/ui/repository.tsx
-  their  100644 043bc5e7ba3cbc056ba3242f20b6dbcf547fd314 app/src/ui/repository.tsx
-@@ -145,6 +145,7 @@
-         availableWidth={availableWidth}
-         gitHubUserStore={this.props.gitHubUserStore}
-         isCommitting={this.props.state.isCommitting}
-+        isIndexLocked={this.props.state.isIndexLocked}
-         isPushPullFetchInProgress={this.props.state.isPushPullFetchInProgress}
-         askForConfirmationOnDiscardChanges={
-           this.props.askForConfirmationOnDiscardChanges
diff --git a/app/test/fixtures/merge-parser/desktop/merge-experimental-ssh-setup-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-experimental-ssh-setup-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index 9f7a09905f8..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-experimental-ssh-setup-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,3013 +0,0 @@
-changed in both
-  base   100644 e4c97b5a507a78e0ae64a236e85f2a97f14a166a app/package.json
-  our    100644 4ec686d8ad22d3aea1ebe4bddd16f4a7447c3acd app/package.json
-  their  100644 959ed4ff23f809e1ed2250f1a705a22c8658c0e8 app/package.json
-@@ -37,6 +37,7 @@
-     "moment": "^2.17.1",
-     "mri": "^1.1.0",
-     "primer-support": "^4.0.0",
-+    "process-exists": "^3.1.0",
-     "queue": "^4.4.2",
-     "react": "^16.3.2",
-     "react-addons-shallow-compare": "^15.6.2",
-changed in both
-  base   100644 d4b62dbf30e18eb25f0eab0014d38984b1e80c6c app/src/lib/api.ts
-  our    100644 e77c79b5d20fbcffe9af534504dac98509135263 app/src/lib/api.ts
-  their  100644 0a507731c02eea0a0511eeddfb8e27ad24cda726 app/src/lib/api.ts
-@@ -25,7 +25,7 @@
- }
- 
- /** The OAuth scopes we need. */
--const Scopes = ['repo', 'user']
-+const Scopes = ['repo', 'user', 'write:public_key']
- 
- enum HttpStatusCode {
-   NotModified = 304,
-@@ -183,6 +183,7 @@
- /** The partial server response when creating a new authorization on behalf of a user */
- interface IAPIAuthorization {
-   readonly token: string
-+  readonly scopes: ReadonlyArray<string>
- }
- 
- /** The response we receive from fetching mentionables. */
-@@ -196,6 +197,16 @@
-   readonly items: ReadonlyArray<T>
- }
- 
-+interface IAPIPublicKey {
-+  id: number
-+  key: string
-+  url: string
-+  title: string
-+  verified: boolean
-+  created_at: string
-+  read_only: boolean
-+}
-+
- /**
-  * Parses the Link header from GitHub and returns the 'next' path
-  * if one is present.
-@@ -232,6 +243,11 @@
-   return date.toISOString().replace(/\.\d{3}Z$/, 'Z')
- }
- 
-+type UserWithTokenScopes = {
-+  user: IAPIUser
-+  scopes: ReadonlyArray<string>
-+}
-+
- /**
-  * An object for making authenticated requests to the GitHub API
-  */
-@@ -280,12 +296,18 @@
-     }
-   }
- 
--  /** Fetch the logged in account. */
--  public async fetchAccount(): Promise<IAPIUser> {
-+  /** Fetch the logged in account and the current scopes associated with the token. */
-+  public async fetchAccount(): Promise<UserWithTokenScopes> {
-     try {
-       const response = await this.request('GET', 'user')
--      const result = await parsedResponse<IAPIUser>(response)
--      return result
-+      const user = await parsedResponse<IAPIUser>(response)
-+      const scopeHeader = response.headers.get('X-OAuth-Scopes')
-+      const scopes =
-+        scopeHeader == null
-+          ? []
-+          : scopeHeader.split(',').map(scope => scope.trim())
-+
-+      return { user, scopes }
-     } catch (e) {
-       log.warn(`fetchAccount: failed with endpoint ${this.endpoint}`, e)
-       throw e
-@@ -577,6 +599,27 @@
-       throw e
-     }
-   }
-+
-+  public async createPublicKey(
-+    title: string,
-+    key: string
-+  ): Promise<IAPIPublicKey | null> {
-+    try {
-+      const response = await this.request('POST', `user/keys`, {
-+        title,
-+        key,
-+      })
-+
-+      if (response.status === 404) {
-+        return null
-+      }
-+
-+      return await parsedResponse<IAPIPublicKey>(response)
-+    } catch (e) {
-+      log.warn(`createPublicKey: failed with endpoint ${this.endpoint}`, e)
-+      throw e
-+    }
-+  }
- }
- 
- export enum AuthorizationResponseKind {
-@@ -711,7 +754,7 @@
- ): Promise<Account> {
-   const api = new API(endpoint, token)
-   try {
--    const user = await api.fetchAccount()
-+    const { user, scopes } = await api.fetchAccount()
-     const emails = await api.fetchEmails()
-     const defaultEmail = emails[0].email || ''
-     const avatarURL = getAvatarWithEnterpriseFallback(
-@@ -726,7 +769,8 @@
-       emails,
-       avatarURL,
-       user.id,
--      user.name || user.login
-+      user.name || user.login,
-+      scopes
-     )
-   } catch (e) {
-     log.warn(`fetchUser: failed with endpoint ${endpoint}`, e)
-changed in both
-  base   100644 86b3c6de0194dc7492ad693937f515e539e85002 app/src/lib/app-state.ts
-  our    100644 b30f0fe080d909b81d2fb683ceb8deb365fb0191 app/src/lib/app-state.ts
-  their  100644 60f91ffa3783d076aaaf5f5b83ee6df48fa3af87 app/src/lib/app-state.ts
-@@ -27,7 +27,11 @@
- import { PullRequest } from '../models/pull-request'
- import { IAuthor } from '../models/author'
- import { ComparisonCache } from './comparison-cache'
-+<<<<<<< .our
- import { ApplicationTheme } from '../ui/lib/application-theme'
-+=======
-+import { TroubleshootingState } from '../models/ssh'
-+>>>>>>> .their
- 
- export { ICommitMessage }
- 
-@@ -89,6 +93,8 @@
-    */
-   readonly signInState: SignInState | null
- 
-+  readonly troubleshootingState: TroubleshootingState | null
-+
-   /**
-    * The current state of the window, ie maximized, minimized full-screen etc.
-    */
-@@ -222,7 +228,11 @@
-   LFSAttributeMismatch,
-   UpstreamAlreadyExists,
-   DeletePullRequest,
-+<<<<<<< .our
-   MergeConflicts,
-+=======
-+  TroubleshootSSH,
-+>>>>>>> .their
- }
- 
- export type Popup =
-@@ -301,7 +311,14 @@
-       branch: Branch
-       pullRequest: PullRequest
-     }
-+<<<<<<< .our
-   | { type: PopupType.MergeConflicts; repository: Repository }
-+=======
-+  | {
-+      type: PopupType.TroubleshootSSH
-+      repository: Repository
-+    }
-+>>>>>>> .their
- 
- export enum FoldoutType {
-   Repository,
-changed in both
-  base   100644 760b02c3045adfd175c5e95574dedb44b6d391b8 app/src/lib/dispatcher/dispatcher.ts
-  our    100644 5e56c00e713342e76f5ccba040062e322e8c90cb app/src/lib/dispatcher/dispatcher.ts
-  their  100644 e5b1337149f1d811958144452169a9a4e26b8947 app/src/lib/dispatcher/dispatcher.ts
-@@ -56,8 +56,12 @@
- import { PullRequest } from '../../models/pull-request'
- import { IAuthor } from '../../models/author'
- import { ITrailer } from '../git/interpret-trailers'
-+<<<<<<< .our
- import { isGitRepository } from '../git'
- import { ApplicationTheme } from '../../ui/lib/application-theme'
-+=======
-+import { IValidateHostState, INoRunningAgentState } from '../../models/ssh'
-+>>>>>>> .their
- 
- /**
-  * An error handler function.
-@@ -1238,6 +1242,7 @@
-     return this.appStore._recordCompareInitiatedMerge()
-   }
- 
-+<<<<<<< .our
-   /**
-    * Set the application-wide theme
-    */
-@@ -1300,5 +1305,35 @@
-    */
-   public recordDivergingBranchBannerInitatedMerge() {
-     return this.appStore._recordDivergingBranchBannerInitatedMerge()
-+=======
-+  public resetTroubleshooting() {
-+    return this.appStore._resetTroubleshooting()
-+  }
-+
-+  public startTroubleshooting(repository: Repository) {
-+    return this.appStore._startTroubleshooting(repository)
-+  }
-+
-+  public validateHost(state: IValidateHostState) {
-+    return this.appStore._validateHost(state)
-+  }
-+
-+  public launchSSHAgent(state: INoRunningAgentState) {
-+    return this.appStore._launchSSHAgent(state)
-+  }
-+
-+  public createSSHKey(
-+    account: Account,
-+    emailAddress: string,
-+    passphrase: string,
-+    outputFile: string
-+  ) {
-+    return this.appStore._createSSHKey(
-+      account,
-+      emailAddress,
-+      passphrase,
-+      outputFile
-+    )
-+>>>>>>> .their
-   }
- }
-changed in both
-  base   100644 e4bcde44c63c77e4be9175742b2312202cb79018 app/src/lib/dispatcher/error-handlers.ts
-  our    100644 850a08047c6abd12850890e02ebd7c4b6085d2ce app/src/lib/dispatcher/error-handlers.ts
-  their  100644 87abc60a0527d53cb5cda45ff2eadc3cde45e320 app/src/lib/dispatcher/error-handlers.ts
-@@ -245,6 +245,45 @@
-   return error
- }
- 
-+export async function sshAuthenticationErrorHandler(
-+  error: Error,
-+  dispatcher: Dispatcher
-+): Promise<Error | null> {
-+  const e = asErrorWithMetadata(error)
-+  if (!e) {
-+    return error
-+  }
-+
-+  const gitError = asGitError(e.underlyingError)
-+  if (!gitError) {
-+    return error
-+  }
-+
-+  const dugiteError = gitError.result.gitError
-+  if (!dugiteError) {
-+    return error
-+  }
-+
-+  const repository = e.metadata.repository
-+  if (!(repository instanceof Repository)) {
-+    return error
-+  }
-+
-+  if (
-+    dugiteError === DugiteError.SSHAuthenticationFailed ||
-+    dugiteError === DugiteError.SSHPermissionDenied ||
-+    dugiteError === DugiteError.SSHRepositoryNotFound
-+  ) {
-+    dispatcher.showPopup({
-+      type: PopupType.TroubleshootSSH,
-+      repository,
-+    })
-+    return null
-+  }
-+
-+  return error
-+}
-+
- /**
-  * Handler for detecting when a merge conflict is reported to direct the user
-  * to a different dialog than the generic Git error dialog.
-changed in both
-  base   100644 e769a502c81a2d83efba958ed0cd6adfb4da8de7 app/src/lib/feature-flag.ts
-  our    100644 716a3c2396b0db5e84ec87d6529001e633b08700 app/src/lib/feature-flag.ts
-  their  100644 52379a9a2bd9f52206d8252ba3073fd4cb055332 app/src/lib/feature-flag.ts
-@@ -41,3 +41,8 @@
- export function enableRepoInfoIndicators(): boolean {
-   return true
- }
-+
-+/** Should Desktop use the new troubleshooting flow */
-+export function enableSSHTroubleshooting(): boolean {
-+  return enableDevelopmentFeatures()
-+}
-added in remote
-  their  100644 67ec5ef544b4aa1f52130a728004e6549699d5ed app/src/lib/find-executable.ts
-@@ -0,0 +1,106 @@
-+import { spawn } from 'child_process'
-+import * as Path from 'path'
-+
-+export function isExecutableOnPath(executableName: string): Promise<boolean> {
-+  // adapted from http://stackoverflow.com/a/34953561/1363815
-+  if (__WIN32__) {
-+    return new Promise<boolean>((resolve, reject) => {
-+      const windowsRoot = process.env.SystemRoot || 'C:\\Windows'
-+      const wherePath = Path.join(windowsRoot, 'System32', 'where.exe')
-+
-+      const cp = spawn(wherePath, [executableName])
-+
-+      cp.on('error', error => {
-+        log.warn('Unable to spawn where.exe', error)
-+        resolve(false)
-+      })
-+
-+      // `where` will return 0 when the executable
-+      // is found under PATH, or 1 if it cannot be found
-+      cp.on('close', function(code) {
-+        resolve(code === 0)
-+      })
-+      return
-+    })
-+  }
-+
-+  if (__LINUX__ || __DARWIN__) {
-+    return new Promise<boolean>((resolve, reject) => {
-+      const process = spawn('which', [executableName])
-+
-+      // `which` will return 0 when the executable
-+      // is found under PATH, or 1 if it cannot be found
-+      process.on('close', function(code) {
-+        resolve(code === 0)
-+      })
-+    })
-+  }
-+
-+  return Promise.resolve(false)
-+}
-+
-+export function findExecutableOnPath(
-+  executableName: string
-+): Promise<string | null> {
-+  // adapted from http://stackoverflow.com/a/34953561/1363815
-+  if (__WIN32__) {
-+    return new Promise<string | null>((resolve, reject) => {
-+      const windowsRoot = process.env.SystemRoot || 'C:\\Windows'
-+      const wherePath = Path.join(windowsRoot, 'System32', 'where.exe')
-+
-+      const stdoutChunks = new Array<Buffer>()
-+      let totalStdoutLength = 0
-+
-+      const cp = spawn(wherePath, [executableName])
-+
-+      cp.stdout.on('data', (chunk: Buffer) => {
-+        stdoutChunks.push(chunk)
-+        totalStdoutLength += chunk.length
-+      })
-+
-+      cp.on('error', error => {
-+        log.warn('Unable to spawn where.exe', error)
-+        resolve(null)
-+      })
-+
-+      // `where` will return 0 when the executable
-+      // is found under PATH, or 1 if it cannot be found
-+      cp.on('close', function(code) {
-+        if (code === 0) {
-+          const stdout = Buffer.concat(stdoutChunks, totalStdoutLength)
-+          resolve(stdout.toString().trim())
-+        } else {
-+          resolve(null)
-+        }
-+      })
-+      return
-+    })
-+  }
-+
-+  if (__LINUX__ || __DARWIN__) {
-+    return new Promise<string | null>((resolve, reject) => {
-+      const cp = spawn('which', [executableName])
-+
-+      const stdoutChunks = new Array<Buffer>()
-+      let totalStdoutLength = 0
-+
-+      cp.stdout.on('data', (chunk: Buffer) => {
-+        stdoutChunks.push(chunk)
-+        totalStdoutLength += chunk.length
-+      })
-+
-+      // `which` will return 0 when the executable
-+      // is found under PATH, or 1 if it cannot be found
-+      cp.on('close', function(code) {
-+        if (code === 0) {
-+          const stdout = Buffer.concat(stdoutChunks, totalStdoutLength)
-+          resolve(stdout.toString().trim())
-+        } else {
-+          resolve(null)
-+        }
-+      })
-+    })
-+  }
-+
-+  return Promise.resolve(null)
-+}
-merged
-  result 100644 2b2c3d048d963952969093e5e38c94ce827169bf app/src/lib/git/authentication.ts
-  our    100644 1b3e09da9e0ab747b09e736a7ba2b66f2eef892d app/src/lib/git/authentication.ts
-@@ -23,6 +23,7 @@
-     // for credentials - even as a fallback
-     GIT_TERMINAL_PROMPT: '0',
-     GIT_TRACE: localStorage.getItem('git-trace') || '0',
-+    GIT_SSH_COMMAND: `ssh -o 'StrictHostKeyChecking=yes'`,
-   }
- 
-   if (!auth) {
-changed in both
-  base   100644 25f5e58c8ceb7199146a603c42fbb7d88e6c431c app/src/lib/is-git-on-path.ts
-  our    100644 efb13fb0c1c8db7af2da3feffa6157cdfcffc386 app/src/lib/is-git-on-path.ts
-  their  100644 fdc939e8402b7dc507bb3ef4f052a34937eb90cc app/src/lib/is-git-on-path.ts
-@@ -1,5 +1,4 @@
--import { spawn } from 'child_process'
--import * as Path from 'path'
-+import { isExecutableOnPath } from './find-executable'
- 
- export function isGitOnPath(): Promise<boolean> {
-   // Modern versions of macOS ship with a Git shim that guides you through
-@@ -9,6 +8,7 @@
-     return Promise.resolve(true)
-   }
- 
-+<<<<<<< .our
-   // adapted from http://stackoverflow.com/a/34953561/1363815
-   if (__WIN32__) {
-     return new Promise<boolean>((resolve, reject) => {
-@@ -44,4 +44,7 @@
-   }
- 
-   return Promise.resolve(false)
-+=======
-+  return isExecutableOnPath('git')
-+>>>>>>> .their
- }
-added in remote
-  their  100644 ea4fc79f187ec4f921bf7600b52adab38e48442f app/src/lib/ssh/error-parsing.ts
-@@ -0,0 +1,36 @@
-+type HostVerificationError = {
-+  host: string
-+  fingerprint: string
-+  rawOutput: string
-+}
-+
-+export function isHostVerificationError(
-+  stderr: string
-+): HostVerificationError | null {
-+  const noValidHostKeyFoundRe = /No RSA host key is known for (.*) and you have requested strict checking/
-+  const hostMatch = noValidHostKeyFoundRe.exec(stderr)
-+
-+  if (hostMatch == null) {
-+    return null
-+  }
-+
-+  const host = hostMatch[1]
-+
-+  const fingerprintRe = /Server host key: (.*) (.*)/
-+  const match = fingerprintRe.exec(stderr)
-+
-+  if (match == null) {
-+    log.debug(`Server host key entry was not found in output from ssh process`)
-+    return null
-+  }
-+
-+  const fingerprint = match[2]
-+  const rawOutput = `The authenticity of host '${host}' can't be established.\nRSA key fingerprint is ${fingerprint}.`
-+
-+  return { host, fingerprint, rawOutput }
-+}
-+
-+export function isPermissionError(stderr: string): boolean {
-+  const permissionDeniedRe = /.*: Permission denied \(publickey\)\./
-+  return permissionDeniedRe.test(stderr)
-+}
-added in remote
-  their  100644 252e103b9ebbbde9bf6352e0c4e495a07ad6d393 app/src/lib/ssh/generate-log-file.ts
-@@ -0,0 +1,29 @@
-+import { remote } from 'electron'
-+import { writeFile } from 'fs'
-+import * as moment from 'moment'
-+
-+export function saveLogFile(stderr: string) {
-+  const timestamp = moment().format('YYYYMMDD-HHmmss')
-+  const defaultPath = `ssh-output-${timestamp}.txt`
-+
-+  return new Promise<void>((resolve, reject) => {
-+    // TODO: null should be a valid argument here
-+    const window: any = null
-+    remote.dialog.showSaveDialog(window, { defaultPath }, filename => {
-+      if (filename == null) {
-+        log.warn(
-+          'TODO: filename returned null, this needs to be in the signature'
-+        )
-+        resolve()
-+      } else {
-+        writeFile(filename, stderr, err => {
-+          if (err) {
-+            reject(err)
-+          } else {
-+            resolve()
-+          }
-+        })
-+      }
-+    })
-+  })
-+}
-added in remote
-  their  100644 c9f1e7e1b70ece7d7159ab02d28cefd6291062e1 app/src/lib/ssh/index.ts
-@@ -0,0 +1,5 @@
-+export * from './error-parsing'
-+export * from './generate-log-file'
-+export * from './ssh-interop'
-+export * from './ssh-environment'
-+export * from './ssh-agent-manager'
-added in remote
-  their  100644 910bad4ec3c76032f4b6e3556e0a068e8ced9c79 app/src/lib/ssh/ssh-agent-manager.ts
-@@ -0,0 +1,124 @@
-+import { exec } from 'child_process'
-+
-+import { findExecutableOnPath } from '../find-executable'
-+
-+const processExists = require('process-exists')
-+
-+export enum AgentStateKind {
-+  NotFound = 'NotFound',
-+  NotStarted = 'NotStarted',
-+  Running = 'Running',
-+}
-+
-+type AgentNotFoundState = {
-+  readonly kind: AgentStateKind.NotFound
-+}
-+
-+type AgentNotStartedState = {
-+  readonly kind: AgentStateKind.NotStarted
-+  readonly executablePath: string
-+}
-+
-+type AgentRunningState = {
-+  readonly kind: AgentStateKind.Running
-+  readonly executablePath: string
-+  readonly env: object
-+}
-+
-+export type AgentState =
-+  | AgentNotFoundState
-+  | AgentNotStartedState
-+  | AgentRunningState
-+
-+type SSHAgentProcess = {
-+  readonly pid: number
-+  readonly env: object
-+}
-+
-+export class SSHAgentManager {
-+  private env: object = {}
-+  private executablePath: string | null = null
-+
-+  public async reset(): Promise<void> {
-+    this.executablePath = await findExecutableOnPath('ssh-agent')
-+  }
-+
-+  public async getState(): Promise<AgentState> {
-+    if (this.executablePath == null) {
-+      return { kind: AgentStateKind.NotFound }
-+    }
-+
-+    const running: boolean = await processExists(
-+      __WIN32__ ? 'ssh-agent.exe' : 'ssh-agent'
-+    )
-+
-+    if (!running) {
-+      return {
-+        kind: AgentStateKind.NotStarted,
-+        executablePath: this.executablePath,
-+      }
-+    }
-+
-+    const existingEnv = process.env
-+    if (
-+      existingEnv.SSH_AUTH_SOCK != null &&
-+      existingEnv.SSH_AGENT_PID != null
-+    ) {
-+      log.debug(
-+        '[SSHAgentManager] found existing environment variables for SSH agent, using that...'
-+      )
-+      this.env = {
-+        SSH_AUTH_SOCK: existingEnv.SSH_AUTH_SOCK,
-+        SSH_AGENT_PID: existingEnv.SSH_AGENT_PID,
-+      }
-+    }
-+
-+    // TODO: get environment variable from shell without needing to poke at this?
-+    // This looks interesting:
-+    // https://github.com/wwalker/ssh-find-agent/blob/master/ssh-find-agent.sh
-+    return {
-+      kind: AgentStateKind.Running,
-+      executablePath: this.executablePath,
-+      env: this.env,
-+    }
-+  }
-+
-+  public async launch(): Promise<SSHAgentProcess> {
-+    if (this.executablePath == null) {
-+      throw new Error(
-+        `Unable to launch when the executable isn't found on the machine`
-+      )
-+    }
-+
-+    return new Promise<SSHAgentProcess>((resolve, reject) => {
-+      let pid = 0
-+      const command = `"${this.executablePath}"`
-+      const sshAgent = exec(command, (error, stdout, stderr) => {
-+        if (error != null) {
-+          reject(error)
-+          return
-+        }
-+
-+        const sshAuthSocketRe = /SSH_AUTH_SOCK=(.*)\; export SSH_AUTH_SOCK;/
-+        const sshAgentPidRe = /SSH_AGENT_PID=(.*)\; export SSH_AGENT_PID;/
-+
-+        const sshAuthSockMatch = sshAuthSocketRe.exec(stdout)
-+        const sshAgentPidMatch = sshAgentPidRe.exec(stdout)
-+
-+        if (sshAuthSockMatch != null && sshAgentPidMatch != null) {
-+          this.env = {
-+            SSH_AUTH_SOCK: sshAuthSockMatch[1],
-+            SSH_AGENT_PID: sshAgentPidMatch[1],
-+          }
-+          resolve({ pid, env: this.env })
-+        } else {
-+          reject('Unable to retrieve environment variables from ssh-agent')
-+        }
-+      })
-+      pid = sshAgent.pid
-+
-+      // TODO: do we need to do this?
-+      sshAgent.unref()
-+    })
-+  }
-+}
-added in remote
-  their  100644 9ad3ef0fd3d7a3f6a2d6d0db037a777f8892bc9c app/src/lib/ssh/ssh-environment.ts
-@@ -0,0 +1,89 @@
-+import * as Path from 'path'
-+import { enumerateValues, HKEY, RegistryValueType } from 'registry-js'
-+import { pathExists } from 'fs-extra'
-+
-+import { isExecutableOnPath } from '../find-executable'
-+import { getPathSegments } from '../process/win32'
-+
-+async function findGitForWindowsInstall(): Promise<string | null> {
-+  const registryPath = enumerateValues(
-+    HKEY.HKEY_LOCAL_MACHINE,
-+    'SOFTWARE\\GitForWindows'
-+  )
-+
-+  if (registryPath.length === 0) {
-+    return null
-+  }
-+
-+  const installPathEntry = registryPath.find(e => e.name === 'InstallPath')
-+  if (installPathEntry && installPathEntry.type === RegistryValueType.REG_SZ) {
-+    const path = Path.join(installPathEntry.data, 'git-bash.exe')
-+
-+    if (await pathExists(path)) {
-+      return installPathEntry.data
-+    } else {
-+      log.debug(
-+        `[hasGitForWindowsInstall] registry entry found but git-bash.exe does not exist at '${path}'`
-+      )
-+    }
-+  }
-+
-+  return null
-+}
-+
-+async function appendToPath(directory: string) {
-+  const paths = await getPathSegments()
-+  const updatedPaths = [...paths, directory]
-+  const path = updatedPaths.join(';')
-+
-+  const env = Object.assign({}, process.env, { path })
-+
-+  if (env.Path != null) {
-+    // this is a stupid win32 hack because `Path` and `path` are distinct keys
-+    // on a Javascript hash, but Windows will choose Path and ignore the other value
-+    delete env.Path
-+  }
-+
-+  return env
-+}
-+
-+export async function getSSHEnvironment(executable: string, env: object = {}) {
-+  // don't even bother checking for macOS as it should be there by default
-+  if (__DARWIN__) {
-+    return Object.assign({}, process.env, env)
-+  }
-+
-+  const found = await isExecutableOnPath(executable)
-+
-+  if (found) {
-+    // no need to setup our own environment, inherit the default
-+    log.debug(
-+      `[getSSHEnvironment] found ${executable} on PATH, no need to tweak the environment`
-+    )
-+    return Object.assign({}, process.env, env)
-+  }
-+
-+  if (__LINUX__) {
-+    log.warn(
-+      '[getSSHEnvironment] TODO: what should we be doing for the Linux support?'
-+    )
-+    return Object.assign({}, process.env, env)
-+  }
-+
-+  const foundGitInstall = await findGitForWindowsInstall()
-+  if (foundGitInstall != null) {
-+    const pathToSSHTools = Path.join(foundGitInstall, 'usr', 'bin')
-+    return appendToPath(pathToSSHTools)
-+  }
-+
-+  const localGitDir = process.env['LOCAL_GIT_DIRECTORY']
-+  if (localGitDir != null) {
-+    const pathToSSHTools = Path.join(localGitDir, 'usr', 'bin')
-+    return appendToPath(pathToSSHTools)
-+  }
-+
-+  log.warn(
-+    '[getSSHEnvironment] unable to find path to the embedded Git installation'
-+  )
-+  return Object.assign({}, process.env, env)
-+}
-added in remote
-  their  100644 03fbed12881a6501b7f3fdf3c3316599d65e8ac1 app/src/lib/ssh/ssh-interop.ts
-@@ -0,0 +1,152 @@
-+import { exec, spawn } from 'child_process'
-+import { getSSHEnvironment } from './ssh-environment'
-+
-+import { createWriteStream } from 'fs'
-+import { homedir } from 'os'
-+import { join } from 'path'
-+
-+import { ensureDir } from 'fs-extra'
-+
-+export async function scanAndWriteToKnownHostsFile(
-+  host: string
-+): Promise<void> {
-+  const sshDir = join(homedir(), '.ssh')
-+  await ensureDir(sshDir)
-+
-+  const command = 'ssh-keyscan'
-+  const env = await getSSHEnvironment(command)
-+
-+  return new Promise<void>((resolve, reject) => {
-+    const keyscan = spawn(command, [host], { shell: true, env })
-+    const knownHostsPath = join(homedir(), '.ssh', 'known_hosts')
-+
-+    keyscan.stdout.pipe(createWriteStream(knownHostsPath))
-+
-+    keyscan.on('error', err => {
-+      log.warn(
-+        'Unable to execute ssh-keyscan and append to known_hosts file',
-+        err
-+      )
-+    })
-+
-+    keyscan.on('close', code => {
-+      if (code !== 0) {
-+        reject(
-+          new Error(
-+            `ssh-keyscan exited with code '${code}' while adding '${host}' which was not expected`
-+          )
-+        )
-+        return
-+      }
-+      resolve()
-+    })
-+  })
-+}
-+
-+type KeyGenResult = {
-+  readonly publicKeyFile: string
-+  readonly privateKeyFile: string
-+}
-+
-+export async function createSSHKey(
-+  emailAddress: string,
-+  passphrase: string,
-+  outputFile: string
-+): Promise<KeyGenResult> {
-+  // TODO: ssh-keygen will block if the file exists - need to handle the situation here
-+  const command = 'ssh-keygen'
-+  const args = `${command} -b 4096 -t rsa -C '${emailAddress}' -N '${passphrase}' -f ${outputFile}`
-+  const env = await getSSHEnvironment(command)
-+  return new Promise<KeyGenResult>((resolve, reject) => {
-+    exec(args, { timeout: 15000, env }, (error, stdout, stderr) => {
-+      if (error != null) {
-+        reject(error)
-+        return
-+      }
-+
-+      const privateKeyFileRe = /Your identification has been saved in (.*)\./
-+      const publicKeyFileRe = /Your public key has been saved in (.*)\./
-+
-+      const privateKeyMatch = privateKeyFileRe.exec(stdout)
-+      const publicKeyMatch = publicKeyFileRe.exec(stdout)
-+
-+      if (privateKeyMatch && publicKeyMatch) {
-+        resolve({
-+          publicKeyFile: publicKeyMatch[1],
-+          privateKeyFile: privateKeyMatch[1],
-+        })
-+      } else {
-+        resolve({ publicKeyFile: '', privateKeyFile: '' })
-+      }
-+    })
-+  })
-+}
-+
-+export async function addToSSHAgent(
-+  privateKeyFile: string,
-+  passphrase: string,
-+  sshEnvironment: object
-+): Promise<void> {
-+  const command = 'ssh-add'
-+  const env = await getSSHEnvironment(command, sshEnvironment)
-+
-+  return new Promise<void>((resolve, reject) => {
-+    const sshAdd = spawn(command, [privateKeyFile], { shell: true, env })
-+
-+    const stdoutBuffers = new Array<Buffer>()
-+    let stdoutLength = 0
-+
-+    sshAdd.stdout.on('data', (chunk: Buffer) => {
-+      stdoutBuffers.push(chunk)
-+      stdoutLength += chunk.length
-+    })
-+
-+    const stderrBuffers = new Array<Buffer>()
-+    let stderrLength = 0
-+    sshAdd.stderr.on('data', (chunk: Buffer) => {
-+      stderrBuffers.push(chunk)
-+      stderrLength += chunk.length
-+    })
-+
-+    if (passphrase.length > 0) {
-+      sshAdd.stdin.end(passphrase)
-+    }
-+
-+    sshAdd.on('close', code => {
-+      const stdout = Buffer.concat(stdoutBuffers, stdoutLength)
-+      const stderr = Buffer.concat(stderrBuffers, stderrLength)
-+
-+      log.debug(`[addToSSHAgent] got stdout: '${stdout}'`)
-+      log.debug(`[addToSSHAgent] got stderr: '${stderr}'`)
-+
-+      debugger
-+
-+      if (code !== 0) {
-+        reject('Probably unable to pass in a passphrase with this coding trick')
-+      }
-+      resolve()
-+    })
-+  })
-+}
-+
-+export async function executeSSHTest(
-+  sshUrl: string,
-+  environmentVariables: object
-+): Promise<string> {
-+  const command = 'ssh'
-+  const env = await getSSHEnvironment(command, environmentVariables)
-+  return new Promise<string>((resolve, reject) => {
-+    exec(
-+      `${command} -Tv  -o 'StrictHostKeyChecking=yes' ${sshUrl}`,
-+      { timeout: 15000, env },
-+      (error, stdout, stderr) => {
-+        if (error != null) {
-+          // TODO: poke at these details, pass them through?
-+          log.warn(`[executeSSHTest] - an error occurred when invoking ssh`)
-+        }
-+
-+        resolve(stderr)
-+      }
-+    )
-+  })
-+}
-merged
-  result 100644 2d268b3d00e80a8fe7cf7aed2af48cfb2720e63d app/src/lib/stores/accounts-store.ts
-  our    100644 f11d691b980015ca4a257c25f28433f4a7514376 app/src/lib/stores/accounts-store.ts
-@@ -43,6 +43,7 @@
-   readonly avatarURL: string
-   readonly id: number
-   readonly name: string
-+  readonly scopes?: ReadonlyArray<string>
- }
- 
- /** The store for logged in accounts. */
-@@ -182,7 +183,8 @@
-         account.emails,
-         account.avatarURL,
-         account.id,
--        account.name
-+        account.name,
-+        account.scopes || []
-       )
- 
-       const key = getKeyForAccount(accountWithoutToken)
-changed in both
-  base   100644 3664497681402ef660531130f999ac3e39892b4d app/src/lib/stores/app-store.ts
-  our    100644 1a4e387e4d192d34abfd0621b4b5ebe8cc34d8d1 app/src/lib/stores/app-store.ts
-  their  100644 c20711bd525012f3195a7cbcbd6eb47b6169bae7 app/src/lib/stores/app-store.ts
-@@ -116,7 +116,12 @@
-   EmojiStore,
-   GitHubUserStore,
-   CloningRepositoriesStore,
-+<<<<<<< .our
- } from '.'
-+=======
-+  TroubleshootingStore,
-+} from '../stores'
-+>>>>>>> .their
- import { validatedRepositoryPath } from './helpers/validated-repository-path'
- import { IGitAccount } from '../git/authentication'
- import { getGenericHostname, getGenericUsername } from '../generic-git-auth'
-@@ -145,6 +150,7 @@
- import { IAuthor } from '../../models/author'
- import { ComparisonCache } from '../comparison-cache'
- import { AheadBehindUpdater } from './helpers/ahead-behind-updater'
-+<<<<<<< .our
- import { enableRepoInfoIndicators } from '../feature-flag'
- import { inferComparisonBranch } from './helpers/infer-comparison-branch'
- import {
-@@ -154,6 +160,10 @@
- } from '../../ui/lib/application-theme'
- import { findAccountForRemoteURL } from '../find-account'
- import { inferLastPushForRepository } from '../infer-last-push-for-repository'
-+=======
-+import { enableCompareSidebar } from '../feature-flag'
-+import { IValidateHostState, INoRunningAgentState } from '../../models/ssh'
-+>>>>>>> .their
- 
- /**
-  * Enum used by fetch to determine if
-@@ -238,6 +248,7 @@
-   private readonly repositoriesStore: RepositoriesStore
-   private readonly statsStore: StatsStore
-   private readonly pullRequestStore: PullRequestStore
-+  private readonly troubleshootingStore: TroubleshootingStore
- 
-   /** The issues store for all repositories. */
-   public get issuesStore(): IssuesStore {
-@@ -300,7 +311,8 @@
-     signInStore: SignInStore,
-     accountsStore: AccountsStore,
-     repositoriesStore: RepositoriesStore,
--    pullRequestStore: PullRequestStore
-+    pullRequestStore: PullRequestStore,
-+    troubleshootingStore: TroubleshootingStore
-   ) {
-     super()
- 
-@@ -313,6 +325,7 @@
-     this.accountsStore = accountsStore
-     this.repositoriesStore = repositoriesStore
-     this.pullRequestStore = pullRequestStore
-+    this.troubleshootingStore = troubleshootingStore
-     this.showWelcomeFlow = !hasShownWelcomeFlow()
- 
-     const window = remote.getCurrentWindow()
-@@ -380,6 +393,11 @@
-     this.pullRequestStore.onDidUpdate(gitHubRepository =>
-       this.onPullRequestStoreUpdated(gitHubRepository)
-     )
-+
-+    this.troubleshootingStore.onDidError(error => this.emitError(error))
-+    this.troubleshootingStore.onDidUpdate(() => {
-+      this.onTroubleshootingStoreDidUpdate()
-+    })
-   }
- 
-   /** Load the emoji from disk. */
-@@ -592,6 +610,7 @@
-       appIsFocused: this.appIsFocused,
-       selectedState: this.getSelectedState(),
-       signInState: this.signInStore.getState(),
-+      troubleshootingState: this.troubleshootingStore.getState(),
-       currentPopup: this.currentPopup,
-       currentFoldout: this.currentFoldout,
-       errors: this.errors,
-@@ -3698,6 +3717,10 @@
-     this.emitUpdate()
-   }
- 
-+  private async onTroubleshootingStoreDidUpdate() {
-+    this.emitUpdate()
-+  }
-+
-   private findAssociatedPullRequest(
-     branch: Branch,
-     pullRequests: ReadonlyArray<PullRequest>,
-@@ -3948,6 +3971,7 @@
-     this.statsStore.recordCompareInitiatedMerge()
-   }
- 
-+<<<<<<< .our
-   /**
-    * Set the application-wide theme
-    */
-@@ -4021,6 +4045,36 @@
-    */
-   public _recordDivergingBranchBannerInitatedMerge() {
-     this.statsStore.recordDivergingBranchBannerInitatedMerge()
-+=======
-+  public _resetTroubleshooting() {
-+    this.troubleshootingStore.reset()
-+  }
-+
-+  public _startTroubleshooting(repository: Repository) {
-+    this.troubleshootingStore.start(repository)
-+  }
-+
-+  public _validateHost(state: IValidateHostState): Promise<void> {
-+    return this.troubleshootingStore.validateHost(state)
-+  }
-+
-+  public _launchSSHAgent(state: INoRunningAgentState): Promise<void> {
-+    return this.troubleshootingStore.launchSSHAgent(state)
-+  }
-+
-+  public _createSSHKey(
-+    account: Account,
-+    emailAddress: string,
-+    passphrase: string,
-+    outputFile: string
-+  ) {
-+    return this.troubleshootingStore.createSSHKey(
-+      account,
-+      emailAddress,
-+      passphrase,
-+      outputFile
-+    )
-+>>>>>>> .their
-   }
- }
- 
-merged
-  result 100644 1cf29fec8cdafb4151239aaef8a87ecc38b1f264 app/src/lib/stores/index.ts
-  our    100644 c81b89a78ad286db4607a8912813e4e384d8e401 app/src/lib/stores/index.ts
-@@ -10,4 +10,5 @@
- export * from './token-store'
- export * from './pull-request-store'
- export * from './repository-settings-store'
-+export * from './troubleshooting-store'
- export { UpstreamRemoteName } from './helpers/find-upstream-remote'
-added in remote
-  their  100644 fc8ceffd9d50ebc729aeb23298d4cf7e3fc59c21 app/src/lib/stores/troubleshooting-store.ts
-@@ -0,0 +1,237 @@
-+import { ipcRenderer } from 'electron'
-+import { readFile } from 'fs-extra'
-+
-+import { TypedBaseStore } from './base-store'
-+import { AccountsStore } from './accounts-store'
-+
-+import {
-+  TroubleshootingState,
-+  TroubleshootingStep,
-+  IValidateHostState,
-+  INoRunningAgentState,
-+} from '../../models/ssh'
-+import { Account, accountHasScope } from '../../models/account'
-+import { Repository } from '../../models/repository'
-+import {
-+  scanAndWriteToKnownHostsFile,
-+  isHostVerificationError,
-+  isPermissionError,
-+  executeSSHTest,
-+  createSSHKey,
-+  addToSSHAgent,
-+  SSHAgentManager,
-+  AgentStateKind,
-+} from '../ssh'
-+import { getRemotes } from '../git'
-+import { parseRemote } from '../remote-parsing'
-+import { API } from '../api'
-+
-+const initialState: TroubleshootingState = {
-+  kind: TroubleshootingStep.WelcomeState,
-+  sshUrl: '',
-+  isLoading: false,
-+}
-+
-+export class TroubleshootingStore extends TypedBaseStore<TroubleshootingState> {
-+  private state = initialState
-+  private accounts: ReadonlyArray<Account> = []
-+  private sshAgentManager = new SSHAgentManager()
-+
-+  public constructor(private accountsStore: AccountsStore) {
-+    super()
-+
-+    this.accountsStore.onDidUpdate(async () => {
-+      const accounts = await this.accountsStore.getAll()
-+      this.accounts = accounts
-+    })
-+  }
-+
-+  /**
-+   * Update the internal state of the store and emit an update
-+   * event.
-+   */
-+  private setState(state: TroubleshootingState) {
-+    this.state = state
-+    this.emitUpdate(this.getState())
-+  }
-+
-+  /**
-+   * Returns the current state of the sign in store or null if
-+   * no sign in process is in flight.
-+   */
-+  public getState(): TroubleshootingState {
-+    return this.state
-+  }
-+
-+  public reset() {
-+    this.setState(initialState)
-+    this.sshAgentManager.reset()
-+  }
-+
-+  public async start(repository: Repository) {
-+    this.setState({
-+      kind: TroubleshootingStep.WelcomeState,
-+      sshUrl: '',
-+      isLoading: true,
-+    })
-+
-+    const remotes = await getRemotes(repository)
-+
-+    const sshRemotes: Array<string> = []
-+    for (const remote of remotes) {
-+      const gitRemote = parseRemote(remote.url)
-+      if (gitRemote != null && gitRemote.protocol === 'ssh') {
-+        sshRemotes.push(gitRemote.hostname)
-+      }
-+    }
-+
-+    // TODO: it'd be nice to know the specific remote associated with this error
-+    // for multi-remote scenarios, but these are less common than the
-+    // single-remote scenario so this isn't a priority. Maybe we can show a UI
-+    // for displaying the remotes to work with, where there are multiple SSH
-+    // remotes?
-+    const sshUrl = `git@${sshRemotes[0]}`
-+    await this.validateSSHConnection(sshUrl)
-+  }
-+
-+  public async validateHost(state: IValidateHostState) {
-+    this.setState({ ...state, isLoading: true })
-+    await scanAndWriteToKnownHostsFile(state.host)
-+    await this.validateSSHConnection(state.sshUrl)
-+  }
-+
-+  public async launchSSHAgent(state: INoRunningAgentState) {
-+    this.setState({ ...state, isLoading: true })
-+
-+    const { pid, env } = await this.sshAgentManager.launch()
-+
-+    // TODO: we should make the main process spawn this process so we can leverage
-+    // the OS to cleanup the process when the main process exits. The alternative
-+    // would be to rely on Electron's lifecycle events but an initial test suggests
-+    // this is Problematic(TM) on Windows at least
-+
-+    ipcRenderer.send('track-new-process', { name: 'ssh-agent', pid })
-+    // TODO: how to pass environment variables through when invoking Git
-+    log.debug(
-+      `[TroubleshootingStore] found environment variables to pass through: '${JSON.stringify(
-+        env
-+      )}'`
-+    )
-+
-+    await this.validateSSHConnection(state.sshUrl)
-+  }
-+
-+  public async createSSHKey(
-+    account: Account,
-+    emailAddress: string,
-+    passphrase: string,
-+    outputFile: string
-+  ) {
-+    const state = this.state
-+    if (state.kind !== TroubleshootingStep.CreateSSHKey) {
-+      return
-+    }
-+
-+    this.setState({
-+      ...state,
-+      isLoading: true,
-+    })
-+
-+    const { publicKeyFile, privateKeyFile } = await createSSHKey(
-+      emailAddress,
-+      passphrase,
-+      outputFile
-+    )
-+
-+    const agentState = await this.sshAgentManager.getState()
-+
-+    if (agentState.kind !== AgentStateKind.Running) {
-+      log.warn(
-+        'Creating an SSH key before ssh-agent is running. This is not the right order. Skipping...'
-+      )
-+      return
-+    }
-+
-+    await addToSSHAgent(privateKeyFile, passphrase, agentState.env)
-+
-+    if (accountHasScope(account, 'write:public_key')) {
-+      const api = new API(account.endpoint, account.token)
-+      const title = 'GitHub Desktop on [MACHINE NAME GOES HERE]'
-+      const keyContents = await readFile(publicKeyFile)
-+      const key = await api.createPublicKey(title, keyContents.toString())
-+      if (key == null) {
-+        log.warn('[TroubleshootingStore] unable to create key through API')
-+        // TODO: error handling for this flow?
-+        return
-+      }
-+      await this.validateSSHConnection(state.sshUrl)
-+    } else {
-+      this.setState({
-+        kind: TroubleshootingStep.AuthorizeAgain,
-+        account: account,
-+      })
-+    }
-+  }
-+
-+  private async validateSSHConnection(sshUrl: string) {
-+    const agentState = await this.sshAgentManager.getState()
-+
-+    if (agentState.kind === AgentStateKind.NotFound) {
-+      // TODO: how to handle this sitatuion?
-+      return
-+    }
-+
-+    const sshAgentLocation = agentState.executablePath
-+
-+    if (agentState.kind === AgentStateKind.NotStarted) {
-+      this.setState({
-+        kind: TroubleshootingStep.NoRunningAgent,
-+        sshAgentLocation,
-+        sshUrl,
-+      })
-+      return
-+    }
-+
-+    const stderr = await executeSSHTest(sshUrl, agentState.env)
-+
-+    const verificationError = isHostVerificationError(stderr)
-+    if (verificationError !== null) {
-+      const { rawOutput, host } = verificationError
-+      this.setState({
-+        kind: TroubleshootingStep.ValidateHost,
-+        rawOutput,
-+        host,
-+        sshUrl,
-+      })
-+      return
-+    }
-+
-+    if (isPermissionError(stderr)) {
-+      // TODO: nail down this flow
-+      //  - if we have existing keys, show and let the user choose
-+      //     - they may wish to skip to instead create a new key
-+      //  - choose a GitHub or GitHub Enterprise account
-+      //     - detect whether these accounts have
-+
-+      const foundKeys = 0
-+
-+      if (foundKeys > 0) {
-+        // TODO: list keys and let the user select a key
-+      } else {
-+        this.setState({
-+          kind: TroubleshootingStep.CreateSSHKey,
-+          accounts: this.accounts,
-+          sshAgentLocation,
-+          sshUrl,
-+        })
-+        return
-+      }
-+      return
-+    }
-+
-+    this.setState({
-+      kind: TroubleshootingStep.Unknown,
-+      error: stderr,
-+    })
-+  }
-+}
-changed in both
-  base   100644 2bbce98d75a6e5e03d9184c46b2af1a43b8fa55a app/src/main-process/main.ts
-  our    100644 a406ea4cd47e8c9a733faee41a125eab3f743aa2 app/src/main-process/main.ts
-  their  100644 deb067ecb23bf35a8fa26ca361098993ac9d98cf app/src/main-process/main.ts
-@@ -2,6 +2,7 @@
- 
- import { app, Menu, ipcMain, BrowserWindow, shell } from 'electron'
- import * as Fs from 'fs'
-+import { exec } from 'child_process'
- 
- import { AppWindow } from './app-window'
- import { buildDefaultMenu, MenuEvent, findMenuItemByID } from './menu'
-@@ -33,6 +34,8 @@
- let preventQuit = false
- let readyTime: number | null = null
- 
-+const spawnedProcessIds = new Array<number>()
-+
- type OnDidLoadFn = (window: AppWindow) => void
- /** See the `onDidLoad` function. */
- let onDidLoadFns: Array<OnDidLoadFn> | null = []
-@@ -376,6 +379,19 @@
-       })
-     }
-   )
-+
-+  ipcMain.on(
-+    'track-new-process',
-+    (
-+      event: Electron.IpcMessageEvent,
-+      { name, pid }: { name: string; pid: number }
-+    ) => {
-+      log.info(
-+        `Process ${name} spawned with pid ${pid} and should be killed when Desktop exits`
-+      )
-+      spawnedProcessIds.push(pid)
-+    }
-+  )
- })
- 
- app.on('activate', () => {
-@@ -403,6 +419,22 @@
-   }
- )
- 
-+app.on('before-quit', () => {
-+  spawnedProcessIds.forEach(pid => {
-+    if (__WIN32__) {
-+      exec(`taskkill /PID ${pid}`, (error, stdout, stderr) => {
-+        if (error != null) {
-+          log.debug(`Unable to terminate process ${pid}, giving up...`)
-+          return
-+        }
-+        log.debug(`Able to terminate process ${pid} successfully...`)
-+      })
-+    } else {
-+      process.kill(pid)
-+    }
-+  })
-+})
-+
- function createWindow() {
-   const window = new AppWindow()
- 
-merged
-  result 100644 37976910efbf23449a3321c5e5424124a40a6247 app/src/models/account.ts
-  our    100644 8400b1e41845964df7e675b460454ac5f90de185 app/src/models/account.ts
-@@ -8,7 +8,7 @@
- export class Account {
-   /** Create an account which can be used to perform unauthenticated API actions */
-   public static anonymous(): Account {
--    return new Account('', getDotComAPIEndpoint(), '', [], '', -1, '')
-+    return new Account('', getDotComAPIEndpoint(), '', [], '', -1, '', [])
-   }
- 
-   public constructor(
-@@ -25,7 +25,9 @@
-     /** The database id for this account */
-     public readonly id: number,
-     /** The friendly name associated with this account */
--    public readonly name: string
-+    public readonly name: string,
-+    /** The OAuth scopes associated with the token */
-+    public readonly scopes: ReadonlyArray<string>
-   ) {}
- 
-   public withToken(token: string): Account {
-@@ -36,7 +38,12 @@
-       this.emails,
-       this.avatarURL,
-       this.id,
--      this.name
-+      this.name,
-+      this.scopes
-     )
-   }
- }
-+
-+export function accountHasScope(account: Account, scope: string) {
-+  return account.scopes.includes(scope)
-+}
-added in remote
-  their  100644 52638bf0d07ab61f48b076487a8fd359076b6242 app/src/models/ssh.ts
-@@ -0,0 +1,58 @@
-+import { Account } from './account'
-+
-+export enum TroubleshootingStep {
-+  WelcomeState = 'WelcomeState',
-+  ValidateHost = 'ValidateHost',
-+  NoRunningAgent = 'NoRunningAgent',
-+  CreateSSHKey = 'CreateSSHKey',
-+  AuthorizeAgain = 'AuthorizeAgain',
-+  Unknown = 'Unknown',
-+}
-+
-+export interface IWelcomeState {
-+  readonly kind: TroubleshootingStep.WelcomeState
-+  readonly sshUrl: string
-+  readonly isLoading?: boolean
-+}
-+
-+export interface IValidateHostState {
-+  readonly kind: TroubleshootingStep.ValidateHost
-+  readonly host: string
-+  readonly rawOutput: string
-+  readonly sshUrl: string
-+  readonly isLoading?: boolean
-+}
-+
-+export interface INoRunningAgentState {
-+  readonly kind: TroubleshootingStep.NoRunningAgent
-+  readonly sshAgentLocation: string
-+  readonly sshUrl: string
-+  readonly isLoading?: boolean
-+}
-+
-+export interface ICreateSSHKeyState {
-+  readonly kind: TroubleshootingStep.CreateSSHKey
-+  readonly accounts: ReadonlyArray<Account>
-+  readonly sshAgentLocation: string
-+  readonly sshUrl: string
-+  readonly isLoading?: boolean
-+}
-+
-+export interface IAuthorizeGitHubAgainState {
-+  readonly kind: TroubleshootingStep.AuthorizeAgain
-+  readonly account: Account
-+  readonly isLoading?: boolean
-+}
-+
-+export interface IUnknownResultState {
-+  readonly kind: TroubleshootingStep.Unknown
-+  readonly error: string
-+}
-+
-+export type TroubleshootingState =
-+  | IWelcomeState
-+  | IValidateHostState
-+  | INoRunningAgentState
-+  | ICreateSSHKeyState
-+  | IAuthorizeGitHubAgainState
-+  | IUnknownResultState
-changed in both
-  base   100644 2cc39415021d56afee6df52411dd5466e5fcb84b app/src/ui/app.tsx
-  our    100644 c38c806e36c237ea70f3cdeee739941530c0c7cd app/src/ui/app.tsx
-  their  100644 596ec900cc14d8e9fe6e79f1dc8fa38869a40330 app/src/ui/app.tsx
-@@ -84,6 +84,7 @@
- import { GenericGitAuthentication } from './generic-git-auth'
- import { ShellError } from './shell'
- import { InitializeLFS, AttributeMismatch } from './lfs'
-+import { TroubleshootSSH } from './ssh'
- import { UpstreamAlreadyExists } from './upstream-already-exists'
- import { DeletePullRequest } from './delete-branch/delete-pull-request-dialog'
- import { MergeConflictsWarning } from './merge-conflicts'
-@@ -1250,6 +1251,21 @@
-             onInitialize={this.initializeLFS}
-           />
-         )
-+      case PopupType.TroubleshootSSH:
-+        const state = this.props.appStore.getState()
-+        if (state.troubleshootingState == null) {
-+          return null
-+        }
-+
-+        return (
-+          <TroubleshootSSH
-+            dispatcher={this.props.dispatcher}
-+            repository={popup.repository}
-+            onDismissed={this.onPopupDismissed}
-+            troubleshootingState={state.troubleshootingState}
-+            signInState={state.signInState}
-+          />
-+        )
-       case PopupType.LFSAttributeMismatch:
-         return (
-           <AttributeMismatch
-changed in both
-  base   100644 68dedd34f265a41733b16e76f0ce3b07e05f865e app/src/ui/index.tsx
-  our    100644 f8f8200917327048c8f002fcfade473dfd6668d1 app/src/ui/index.tsx
-  their  100644 eb14ae24e33a47850d87815b99d3dea2bf302d01 app/src/ui/index.tsx
-@@ -14,6 +14,7 @@
-   openShellErrorHandler,
-   mergeConflictHandler,
-   lfsAttributeMismatchHandler,
-+  sshAuthenticationErrorHandler,
-   defaultErrorHandler,
-   missingRepositoryHandler,
-   backgroundTaskHandler,
-@@ -31,6 +32,7 @@
-   TokenStore,
-   AccountsStore,
-   PullRequestStore,
-+  TroubleshootingStore,
- } from '../lib/stores'
- import { GitHubUserDatabase } from '../lib/databases'
- import { URLActionType } from '../lib/parse-app-url'
-@@ -52,6 +54,8 @@
- } from '../lib/source-map-support'
- import { UiActivityMonitor } from './lib/ui-activity-monitor'
- 
-+import { enableSSHTroubleshooting } from '../lib/feature-flag'
-+
- if (__DEV__) {
-   installDevGlobals()
- }
-@@ -125,6 +129,8 @@
-   repositoriesStore
- )
- 
-+const troubleshootingStore = new TroubleshootingStore(accountsStore)
-+
- const appStore = new AppStore(
-   gitHubUserStore,
-   cloningRepositoriesStore,
-@@ -134,7 +140,8 @@
-   signInStore,
-   accountsStore,
-   repositoriesStore,
--  pullRequestStore
-+  pullRequestStore,
-+  troubleshootingStore
- )
- 
- const dispatcher = new Dispatcher(appStore)
-@@ -145,6 +152,9 @@
- dispatcher.registerErrorHandler(openShellErrorHandler)
- dispatcher.registerErrorHandler(mergeConflictHandler)
- dispatcher.registerErrorHandler(lfsAttributeMismatchHandler)
-+if (enableSSHTroubleshooting()) {
-+  dispatcher.registerErrorHandler(sshAuthenticationErrorHandler)
-+}
- dispatcher.registerErrorHandler(gitAuthenticationErrorHandler)
- dispatcher.registerErrorHandler(pushNeedsPullHandler)
- dispatcher.registerErrorHandler(backgroundTaskHandler)
-added in remote
-  their  100644 53500935a715eec35d7d0c5c2b1eae5e784d914c app/src/ui/ssh/authorize-github-again.tsx
-@@ -0,0 +1,72 @@
-+import * as React from 'react'
-+
-+import { IAuthorizeGitHubAgainState } from '../../models/ssh'
-+
-+import { Button } from '../lib/button'
-+import { ButtonGroup } from '../lib/button-group'
-+import { Loading } from '../lib/loading'
-+import { SignIn } from '../lib/sign-in'
-+
-+import { Dialog, DialogContent, DialogFooter } from '../dialog'
-+
-+import { Dispatcher } from '../../lib/dispatcher'
-+import { SignInState } from '../../lib/stores'
-+
-+interface IAuthorizeGitHubAgainProps {
-+  readonly state: IAuthorizeGitHubAgainState
-+  readonly signInState: SignInState | null
-+  readonly dispatcher: Dispatcher
-+  readonly onDismissed: () => void
-+}
-+
-+export class AuthorizeGitHubAgain extends React.Component<
-+  IAuthorizeGitHubAgainProps,
-+  {}
-+> {
-+  private keepOnKeepingOn = () => {
-+    this.props.onDismissed()
-+  }
-+  public render() {
-+    const { state } = this.props
-+    const disabled = state.isLoading
-+
-+    if (this.props.signInState == null) {
-+      log.warn(`Unable to authorize again because we're not in a valid state`)
-+      return null
-+    }
-+
-+    return (
-+      <Dialog
-+        id="troubleshoot-ssh"
-+        title="Troubleshoot SSH Authentication"
-+        onDismissed={this.props.onDismissed}
-+        onSubmit={this.keepOnKeepingOn}
-+      >
-+        <DialogContent>
-+          <p>
-+            The token associated with the {state.account.login} account ({
-+              state.account.name
-+            }) does not have permission to publish SSH keys for this account.
-+          </p>
-+          <p>To continue, you need to sign in again:</p>
-+
-+          <p>
-+            <SignIn
-+              signInState={this.props.signInState}
-+              dispatcher={this.props.dispatcher}
-+            />
-+          </p>
-+        </DialogContent>
-+        <DialogFooter>
-+          <ButtonGroup>
-+            <Button type="submit" disabled={disabled}>
-+              {state.isLoading ? <Loading /> : null}
-+              Start
-+            </Button>
-+            <Button onClick={this.props.onDismissed}>Cancel</Button>
-+          </ButtonGroup>
-+        </DialogFooter>
-+      </Dialog>
-+    )
-+  }
-+}
-added in remote
-  their  100644 e7842936bed758f6710f673d27cda500e9b681c2 app/src/ui/ssh/index.ts
-@@ -0,0 +1 @@
-+export { TroubleshootSSH } from './troubleshoot-ssh'
-added in remote
-  their  100644 44fea58ca6cec019b36b82434925c9bf9fa77257 app/src/ui/ssh/setup-new-ssh-key.tsx
-@@ -0,0 +1,314 @@
-+import * as React from 'react'
-+import { remote } from 'electron'
-+import * as os from 'os'
-+import * as Path from 'path'
-+
-+import { lookupPreferredEmail } from '../../lib/email'
-+import { IAvatarUser } from '../../models/avatar'
-+import { Account, accountHasScope } from '../../models/account'
-+
-+import { Button } from '../lib/button'
-+import { ButtonGroup } from '../lib/button-group'
-+import { Row } from '../lib/row'
-+import { TextBox } from '../lib/text-box'
-+import { Ref } from '../lib/ref'
-+
-+import { Avatar } from '../lib/avatar'
-+import { Loading } from '../lib/loading'
-+
-+import { Dialog, DialogContent, DialogFooter } from '../dialog'
-+import { List } from '../lib/list'
-+import { Dispatcher } from '../../lib/dispatcher'
-+import { ICreateSSHKeyState } from '../../models/ssh'
-+import { pathExists } from 'fs-extra'
-+import { OcticonSymbol, Octicon } from '../octicons'
-+
-+function getPathForNewSSHKey(fileName: string) {
-+  const homeDir = os.homedir()
-+  return Path.join(homeDir, '.ssh', fileName)
-+}
-+
-+interface ISetupNewSSHKeyProps {
-+  readonly dispatcher: Dispatcher
-+  readonly state: ICreateSSHKeyState
-+  readonly onDismissed: () => void
-+}
-+
-+interface ISetupNewSSHKeyState {
-+  readonly selectedAccount?: number
-+  readonly emailAddress: string
-+  readonly passphrase: string
-+  readonly confirmPassPhrase: string
-+  readonly outputFile: string
-+  readonly outputFileExists: boolean | null
-+}
-+
-+export class SetupNewSSHKey extends React.Component<
-+  ISetupNewSSHKeyProps,
-+  ISetupNewSSHKeyState
-+> {
-+  public constructor(props: ISetupNewSSHKeyProps) {
-+    super(props)
-+
-+    this.state = {
-+      emailAddress: '',
-+      passphrase: '',
-+      confirmPassPhrase: '',
-+      outputFile: getPathForNewSSHKey('github_desktop'),
-+      outputFileExists: null,
-+    }
-+  }
-+
-+  private onContinue = () => {
-+    if (this.state.selectedAccount == null) {
-+      return
-+    }
-+
-+    const account = this.props.state.accounts[this.state.selectedAccount]
-+
-+    this.props.dispatcher.createSSHKey(
-+      account,
-+      this.state.emailAddress,
-+      this.state.passphrase,
-+      this.state.outputFile
-+    )
-+  }
-+
-+  private updateFile = async (outputFile: string) => {
-+    const outputFileExists = await pathExists(outputFile)
-+    this.setState({ outputFile, outputFileExists })
-+  }
-+
-+  private showFilePicker = async () => {
-+    const defaultPath = this.state.outputFile
-+    const window: any = null
-+    remote.dialog.showSaveDialog(
-+      window,
-+      {
-+        defaultPath,
-+      },
-+      async outputFile => {
-+        if (outputFile == null) {
-+          return
-+        }
-+
-+        await this.updateFile(outputFile)
-+      }
-+    )
-+  }
-+
-+  private onEmailAddressChanged = (emailAddress: string) => {
-+    this.setState({ emailAddress })
-+  }
-+
-+  private onPassPhraseChanged = (passphrase: string) => {
-+    this.setState({ passphrase })
-+  }
-+
-+  private onConfirmPassPhraseChanged = (confirmPassPhrase: string) => {
-+    this.setState({ confirmPassPhrase })
-+    // TODO: validate that the passphrase and text are the same
-+  }
-+
-+  private updateState = async (selectedAccount: number) => {
-+    // TODO: validate that this is an entry in the array
-+    const account = this.props.state.accounts[selectedAccount]
-+    const outputFile = getPathForNewSSHKey(`github_desktop_${account.login}`)
-+
-+    await this.updateFile(outputFile)
-+
-+    const email = lookupPreferredEmail(account.emails)
-+    const emailAddress = email == null ? '' : email.email
-+    this.setState({ selectedAccount, emailAddress })
-+  }
-+
-+  private onAccountSelectionChanged = (rows: ReadonlyArray<number>) => {
-+    this.updateState(rows[0])
-+  }
-+
-+  private onAccountRowClick = (row: number) => {
-+    this.updateState(row)
-+  }
-+
-+  private onPathChanged = async (outputFile: string) => {
-+    await this.updateFile(outputFile)
-+  }
-+
-+  private renderTokenWarning(account: Account) {
-+    if (accountHasScope(account, 'write:public_key')) {
-+      return null
-+    }
-+
-+    return (
-+      <div
-+        className="token-alert"
-+        title="The token for this account needs to be upgraded to publish your SSH key"
-+      >
-+        <Octicon symbol={OcticonSymbol.alert} />
-+      </div>
-+    )
-+  }
-+
-+  private renderRow = (index: number) => {
-+    const account = this.props.state.accounts[index]
-+
-+    const found = lookupPreferredEmail(account.emails)
-+    const email = found ? found.email : ''
-+
-+    const avatarUser: IAvatarUser = {
-+      name: account.name,
-+      email: email,
-+      avatarURL: account.avatarURL,
-+    }
-+
-+    return (
-+      <Row className="account-info">
-+        <Avatar user={avatarUser} />
-+        <div className="user-info">
-+          <div className="name">{account.name}</div>
-+          <div className="login">@{account.login}</div>
-+        </div>
-+        {this.renderTokenWarning(account)}
-+      </Row>
-+    )
-+  }
-+
-+  private renderPasswordMismatch = () => {
-+    if (this.state.passphrase === this.state.confirmPassPhrase) {
-+      return null
-+    }
-+
-+    return (
-+      <Row className="warning-helper-text">
-+        <Octicon symbol={OcticonSymbol.alert} />
-+        <p>The passphrase and confirmed passphrase do not match.</p>
-+      </Row>
-+    )
-+  }
-+
-+  private renderExistingKeyWarning = () => {
-+    if (!this.state.outputFileExists) {
-+      return null
-+    }
-+
-+    return (
-+      <Row className="warning-helper-text">
-+        <Octicon symbol={OcticonSymbol.alert} />
-+        <p>
-+          A file already exists at this path. Choose a new path to ensure that
-+          you don't overwrite an existing key.
-+        </p>
-+      </Row>
-+    )
-+  }
-+
-+  public render() {
-+    const isLoading = this.props.state.isLoading
-+
-+    const passphraseMatches =
-+      this.state.passphrase === this.state.confirmPassPhrase
-+
-+    const disabled =
-+      this.state.selectedAccount == null ||
-+      !passphraseMatches ||
-+      this.state.outputFileExists ||
-+      isLoading
-+
-+    const selectedRows =
-+      this.state.selectedAccount == null ? [] : [this.state.selectedAccount]
-+
-+    return (
-+      <Dialog
-+        id="troubleshoot-ssh"
-+        title="Create SSH Key"
-+        onDismissed={this.props.onDismissed}
-+        onSubmit={this.onContinue}
-+      >
-+        <DialogContent>
-+          <Row>Choose an account to associate with the new SSH key:</Row>
-+
-+          <Row>
-+            <div className="account-list-container">
-+              <List
-+                rowRenderer={this.renderRow}
-+                rowCount={this.props.state.accounts.length}
-+                rowHeight={34}
-+                selectedRows={selectedRows}
-+                selectionMode="single"
-+                invalidationProps={this.props.state.accounts}
-+                onSelectionChanged={this.onAccountSelectionChanged}
-+                onRowClick={this.onAccountRowClick}
-+              />
-+            </div>
-+          </Row>
-+          <Row>
-+            <TextBox
-+              value={this.state.emailAddress}
-+              onValueChanged={this.onEmailAddressChanged}
-+              disabled={isLoading}
-+              label="Email address (required)"
-+            />
-+          </Row>
-+          <Row>
-+            <span>
-+              A passphrase is recommended for extra security. Ensure that you
-+              remember this as{' '}
-+              <strong>
-+                a lost or forgotten passphrase cannot be recovered and a new key
-+                must be created
-+              </strong>.
-+            </span>
-+          </Row>
-+          <Row>
-+            <TextBox
-+              value={this.state.passphrase}
-+              onValueChanged={this.onPassPhraseChanged}
-+              disabled={isLoading}
-+              type="password"
-+              label="Passphrase (optional)"
-+            />
-+          </Row>
-+          <Row>
-+            <TextBox
-+              value={this.state.confirmPassPhrase}
-+              onValueChanged={this.onConfirmPassPhraseChanged}
-+              disabled={isLoading}
-+              type="password"
-+              label="Confirm passphrase"
-+            />
-+          </Row>
-+
-+          {this.renderPasswordMismatch()}
-+
-+          <Row>
-+            <TextBox
-+              value={this.state.outputFile}
-+              disabled={isLoading}
-+              onValueChanged={this.onPathChanged}
-+              label={__DARWIN__ ? 'Key Path' : 'Key path'}
-+              placeholder="SSH key path"
-+            />
-+            <Button onClick={this.showFilePicker} disabled={isLoading}>
-+              Choose…
-+            </Button>
-+          </Row>
-+
-+          {this.renderExistingKeyWarning()}
-+
-+          <Row>
-+            This will create an <Ref>RSA</Ref> key of <Ref>4096 bits</Ref>.
-+          </Row>
-+        </DialogContent>
-+        <DialogFooter>
-+          <ButtonGroup>
-+            <Button type="submit" disabled={disabled}>
-+              {isLoading ? <Loading /> : null}
-+              Create
-+            </Button>
-+            <Button onClick={this.props.onDismissed}>Cancel</Button>
-+          </ButtonGroup>
-+        </DialogFooter>
-+      </Dialog>
-+    )
-+  }
-+}
-added in remote
-  their  100644 ceaa8d0e9d9a673f690fabbb19e83022b859fb27 app/src/ui/ssh/start-ssh-agent.tsx
-@@ -0,0 +1,58 @@
-+import * as React from 'react'
-+
-+import { INoRunningAgentState } from '../../models/ssh'
-+
-+import { Dispatcher } from '../../lib/dispatcher'
-+
-+import { Button } from '../lib/button'
-+import { ButtonGroup } from '../lib/button-group'
-+import { Loading } from '../lib/loading'
-+import { Ref } from '../lib/ref'
-+
-+import { Dialog, DialogContent, DialogFooter } from '../dialog'
-+
-+interface IStartSSHAgentProps {
-+  readonly dispatcher: Dispatcher
-+  readonly state: INoRunningAgentState
-+  readonly onDismissed: () => void
-+}
-+
-+export class StartSSHAgent extends React.Component<IStartSSHAgentProps, {}> {
-+  private launchSSHAgent = () => {
-+    this.props.dispatcher.launchSSHAgent(this.props.state)
-+  }
-+
-+  public render() {
-+    const { state } = this.props
-+    const disabled = state.isLoading
-+
-+    return (
-+      <Dialog
-+        id="troubleshoot-ssh"
-+        title="Troubleshoot SSH Authentication"
-+        onDismissed={this.props.onDismissed}
-+        onSubmit={this.launchSSHAgent}
-+      >
-+        <DialogContent>
-+          <p>
-+            A running <Ref>ssh-agent</Ref> process is required to perform
-+            authentication.
-+          </p>
-+          <p>
-+            Do you want to start the <Ref>ssh-agent</Ref> process found at{' '}
-+            <Ref>{state.sshAgentLocation}</Ref>?
-+          </p>
-+        </DialogContent>
-+        <DialogFooter>
-+          <ButtonGroup>
-+            <Button type="submit" disabled={disabled}>
-+              {state.isLoading ? <Loading /> : null}
-+              Start
-+            </Button>
-+            <Button onClick={this.props.onDismissed}>Cancel</Button>
-+          </ButtonGroup>
-+        </DialogFooter>
-+      </Dialog>
-+    )
-+  }
-+}
-added in remote
-  their  100644 9179341ecd05a61f111286a4e11f591343be773c app/src/ui/ssh/troubleshoot-ssh.tsx
-@@ -0,0 +1,89 @@
-+import * as React from 'react'
-+
-+import { Repository } from '../../models/repository'
-+import { TroubleshootingState, TroubleshootingStep } from '../../models/ssh'
-+
-+import { Dispatcher } from '../../lib/dispatcher'
-+import { assertNever } from '../../lib/fatal-error'
-+
-+import { Welcome } from './welcome'
-+import { ValidateHost } from './validate-host'
-+import { UnknownAction } from './unknown-action'
-+import { SetupNewSSHKey } from './setup-new-ssh-key'
-+import { StartSSHAgent } from './start-ssh-agent'
-+import { AuthorizeGitHubAgain } from './authorize-github-again'
-+import { SignInState } from '../../lib/stores'
-+
-+interface ITroubleshootSSHProps {
-+  readonly dispatcher: Dispatcher
-+  readonly repository: Repository
-+  readonly troubleshootingState: TroubleshootingState
-+  readonly signInState: SignInState | null
-+  readonly onDismissed: () => void
-+}
-+
-+export class TroubleshootSSH extends React.Component<
-+  ITroubleshootSSHProps,
-+  {}
-+> {
-+  public componentDidMount() {
-+    this.props.dispatcher.resetTroubleshooting()
-+  }
-+
-+  public render() {
-+    const state = this.props.troubleshootingState
-+    const stepKind = state.kind
-+
-+    switch (state.kind) {
-+      case TroubleshootingStep.WelcomeState:
-+        return (
-+          <Welcome
-+            dispatcher={this.props.dispatcher}
-+            repository={this.props.repository}
-+            state={state}
-+            onDismissed={this.props.onDismissed}
-+          />
-+        )
-+      case TroubleshootingStep.ValidateHost:
-+        return (
-+          <ValidateHost
-+            dispatcher={this.props.dispatcher}
-+            repository={this.props.repository}
-+            state={state}
-+            onDismissed={this.props.onDismissed}
-+          />
-+        )
-+      case TroubleshootingStep.NoRunningAgent:
-+        return (
-+          <StartSSHAgent
-+            dispatcher={this.props.dispatcher}
-+            state={state}
-+            onDismissed={this.props.onDismissed}
-+          />
-+        )
-+      case TroubleshootingStep.CreateSSHKey:
-+        return (
-+          <SetupNewSSHKey
-+            dispatcher={this.props.dispatcher}
-+            state={state}
-+            onDismissed={this.props.onDismissed}
-+          />
-+        )
-+      case TroubleshootingStep.AuthorizeAgain:
-+        return (
-+          <AuthorizeGitHubAgain
-+            state={state}
-+            dispatcher={this.props.dispatcher}
-+            signInState={this.props.signInState}
-+            onDismissed={this.props.onDismissed}
-+          />
-+        )
-+      case TroubleshootingStep.Unknown:
-+        return (
-+          <UnknownAction state={state} onDismissed={this.props.onDismissed} />
-+        )
-+      default:
-+        return assertNever(state, `Unknown troubleshooting step: ${stepKind}`)
-+    }
-+  }
-+}
-added in remote
-  their  100644 8532ff183cc6b9b6683b232a6ec8661d6ae3b699 app/src/ui/ssh/unknown-action.tsx
-@@ -0,0 +1,63 @@
-+import * as React from 'react'
-+
-+import { IUnknownResultState } from '../../models/ssh'
-+
-+import { Button } from '../lib/button'
-+import { ButtonGroup } from '../lib/button-group'
-+import { Dialog, DialogContent, DialogFooter } from '../dialog'
-+import { Octicon, OcticonSymbol } from '../octicons'
-+
-+import { LinkButton } from '../lib/link-button'
-+import { saveLogFile } from '../../lib/ssh'
-+
-+interface IUnknownActionProps {
-+  readonly state: IUnknownResultState
-+  readonly onDismissed: () => void
-+}
-+
-+export class UnknownAction extends React.Component<IUnknownActionProps, {}> {
-+  private saveFile = async () => {
-+    try {
-+      await saveLogFile(this.props.state.error)
-+    } catch (err) {
-+      log.error(
-+        `[saveLogFile] an error occurred while trying to save the log file`,
-+        err
-+      )
-+    }
-+  }
-+
-+  public render() {
-+    return (
-+      <Dialog
-+        id="troubleshoot-ssh"
-+        title="Unable to resolve issue"
-+        onSubmit={this.saveFile}
-+        onDismissed={this.props.onDismissed}
-+      >
-+        <DialogContent>
-+          <p>
-+            Unfortunately Desktop has exhausted all known troubleshooting tricks
-+            for this issue.
-+          </p>
-+          <p>
-+            A trace file has been generated here that will help a human
-+            troubleshoot the issue. Please reach out to the{' '}
-+            <LinkButton uri="https://github.com/desktop/desktop/issues/new">
-+              GitHub Desktop
-+            </LinkButton>{' '}
-+            issue tracker for further support.
-+          </p>
-+        </DialogContent>
-+        <DialogFooter>
-+          <ButtonGroup>
-+            <Button type="submit">
-+              <Octicon symbol={OcticonSymbol.desktopDownload} /> Save log file
-+            </Button>
-+            <Button onClick={this.props.onDismissed}>Close</Button>
-+          </ButtonGroup>
-+        </DialogFooter>
-+      </Dialog>
-+    )
-+  }
-+}
-added in remote
-  their  100644 9231cb67363e7ffbd92d2a1a2b76dcb3bd4b4629 app/src/ui/ssh/validate-host.tsx
-@@ -0,0 +1,59 @@
-+import * as React from 'react'
-+
-+import { Repository } from '../../models/repository'
-+import { IValidateHostState } from '../../models/ssh'
-+
-+import { Dispatcher } from '../../lib/dispatcher'
-+
-+import { Button } from '../lib/button'
-+import { ButtonGroup } from '../lib/button-group'
-+import { Dialog, DialogContent, DialogFooter } from '../dialog'
-+import { Loading } from '../lib/loading'
-+import { LinkButton } from '../lib/link-button'
-+
-+interface IValidateHostProps {
-+  readonly dispatcher: Dispatcher
-+  readonly repository: Repository
-+  readonly state: IValidateHostState
-+  readonly onDismissed: () => void
-+}
-+
-+export class ValidateHost extends React.Component<IValidateHostProps, {}> {
-+  private verifyHost = async () => {
-+    await this.props.dispatcher.validateHost(this.props.state)
-+  }
-+
-+  public render() {
-+    const { state } = this.props
-+    const disabled = state.isLoading
-+    return (
-+      <Dialog
-+        id="troubleshoot-ssh"
-+        title="Verify SSH Server"
-+        onDismissed={this.props.onDismissed}
-+        onSubmit={this.verifyHost}
-+      >
-+        <DialogContent>
-+          <p>A problem was encountered connecting to the host.</p>
-+          <p className="output">{state.rawOutput}</p>
-+          <p>
-+            You will need to verify that this is the correct host to continue.
-+            You can compare the value above with the entries documented in the{' '}
-+            <LinkButton uri="https://help.github.com/articles/testing-your-ssh-connection/">
-+              GitHub help documentation
-+            </LinkButton>.
-+          </p>
-+        </DialogContent>
-+        <DialogFooter>
-+          <ButtonGroup>
-+            <Button type="submit" disabled={disabled}>
-+              {state.isLoading ? <Loading /> : null}
-+              Verify
-+            </Button>
-+            <Button onClick={this.props.onDismissed}>Cancel</Button>
-+          </ButtonGroup>
-+        </DialogFooter>
-+      </Dialog>
-+    )
-+  }
-+}
-added in remote
-  their  100644 2ed044ea2216a1a6d3588de86c210ea465bf6c1e app/src/ui/ssh/welcome.tsx
-@@ -0,0 +1,57 @@
-+import * as React from 'react'
-+
-+import { Repository } from '../../models/repository'
-+import { IWelcomeState } from '../../models/ssh'
-+
-+import { Dispatcher } from '../../lib/dispatcher'
-+
-+import { Button } from '../lib/button'
-+import { ButtonGroup } from '../lib/button-group'
-+import { Dialog, DialogContent, DialogFooter } from '../dialog'
-+import { Loading } from '../lib/loading'
-+
-+interface IWelcomeProps {
-+  readonly dispatcher: Dispatcher
-+  readonly repository: Repository
-+  readonly state: IWelcomeState
-+  readonly onDismissed: () => void
-+}
-+
-+export class Welcome extends React.Component<IWelcomeProps, {}> {
-+  private startTroubleshooting = () => {
-+    this.props.dispatcher.startTroubleshooting(this.props.repository)
-+  }
-+
-+  public render() {
-+    const { state } = this.props
-+    const disabled = state.isLoading
-+
-+    return (
-+      <Dialog
-+        id="troubleshoot-ssh"
-+        title="Troubleshoot SSH Authentication"
-+        onDismissed={this.props.onDismissed}
-+        onSubmit={this.startTroubleshooting}
-+      >
-+        <DialogContent>
-+          <p>
-+            It looks like you are having an issue connecting to an SSH remote.
-+          </p>
-+          <p>
-+            Do you want to troubleshoot your setup to see if Desktop can get
-+            this working?
-+          </p>
-+        </DialogContent>
-+        <DialogFooter>
-+          <ButtonGroup>
-+            <Button type="submit" disabled={disabled}>
-+              {state.isLoading ? <Loading /> : null}
-+              Start
-+            </Button>
-+            <Button onClick={this.props.onDismissed}>Cancel</Button>
-+          </ButtonGroup>
-+        </DialogFooter>
-+      </Dialog>
-+    )
-+  }
-+}
-changed in both
-  base   100644 e496a16bd915366f9b11d9d0e63a21a8732099f4 app/styles/ui/_dialog.scss
-  our    100644 94b86d54fb9b0314deb1ef48cc9e1466578ed390 app/styles/ui/_dialog.scss
-  their  100644 921a624a6a252f6aec33df9f06100fc74c95b4dd app/styles/ui/_dialog.scss
-@@ -2,6 +2,7 @@
- @import 'dialogs/merge';
- @import 'dialogs/publish-repository';
- @import 'dialogs/repository-settings';
-+@import 'dialogs/ssh';
- 
- // The styles herein attempt to follow a flow where margins are only applied
- // to the bottom of elements (with the exception of the last child). This to
-added in remote
-  their  100644 03a7239ef47bbd8846e22c30a9cc6b2863439043 app/styles/ui/dialogs/_ssh.scss
-@@ -0,0 +1,54 @@
-+#troubleshoot-ssh {
-+  .spin {
-+    margin-right: var(--spacing-half);
-+  }
-+
-+  p.output {
-+    -webkit-user-select: auto;
-+    user-select: auto;
-+    cursor: text;
-+
-+    // Preserve newlines and other white space in error messages
-+    // but make sure we wrap if necessary.
-+    white-space: pre-wrap;
-+
-+    background: var(--path-segment-background);
-+    border: var(--path-segment-background);
-+    border-radius: var(--border-radius);
-+
-+    font-family: var(--font-family-monospace);
-+  }
-+
-+  /** A React component holding the currently selected repository's changes */
-+  .account-list-container {
-+    flex-grow: 1;
-+    display: flex;
-+    flex-direction: column;
-+    min-height: 34px;
-+
-+    .account-info {
-+      .avatar {
-+        // 32px for the image + 2 on each side for the base border.
-+        width: 34px;
-+        height: 34px;
-+
-+        border: var(--base-border);
-+
-+        align-self: center;
-+      }
-+
-+      .user-info {
-+        flex-grow: 1;
-+        align-self: flex-start;
-+
-+        .name {
-+          font-weight: var(--font-weight-semibold);
-+          // Tighten it up a little so that the real name and
-+          // username lines up with the avatar.
-+          margin-top: -2px;
-+          margin-bottom: -2px;
-+        }
-+      }
-+    }
-+  }
-+}
-merged
-  result 100644 395b1944d0a67690181911aef0df4204161dfd17 app/test/unit/accounts-store-test.ts
-  our    100644 eed3816fb2f76f373f7ae51c5cfa9132619fb879 app/test/unit/accounts-store-test.ts
-@@ -17,7 +17,7 @@
-     it('contains the added user', async () => {
-       const newAccountLogin = 'joan'
-       await accountsStore!.addAccount(
--        new Account(newAccountLogin, '', 'deadbeef', [], '', 1, '')
-+        new Account(newAccountLogin, '', 'deadbeef', [], '', 1, '', [])
-       )
- 
-       const users = await accountsStore!.getAll()
-changed in both
-  base   100644 11161765e2eda88e549efb9ec50be911f6c76442 app/test/unit/app-store-test.ts
-  our    100644 7c7b2a2600b6cdb77d652940772194805df43425 app/test/unit/app-store-test.ts
-  their  100644 92be09473490e2d370d0426d086ce693623bfe30 app/test/unit/app-store-test.ts
-@@ -14,6 +14,7 @@
-   RepositoriesStore,
-   AccountsStore,
-   PullRequestStore,
-+  TroubleshootingStore,
- } from '../../src/lib/stores'
- import {
-   TestGitHubUserDatabase,
-@@ -62,6 +63,8 @@
-       repositoriesStore
-     )
- 
-+    const troubleshootingStore = new TroubleshootingStore(accountsStore)
-+
-     return new AppStore(
-       new GitHubUserStore(db),
-       new CloningRepositoriesStore(),
-@@ -71,7 +74,8 @@
-       new SignInStore(),
-       accountsStore,
-       repositoriesStore,
--      pullRequestStore
-+      pullRequestStore,
-+      troubleshootingStore
-     )
-   }
- 
-changed in both
-  base   100644 cd15b5fd5314d763ed32ce3dd5d2fa8c9bc2b57e app/test/unit/app-test.tsx
-  our    100644 f5a4bb958cedfdbf76f9144a200a3cfac9613c02 app/test/unit/app-test.tsx
-  their  100644 7d73caeacc66d4c7cec923f7f88346f4979b3525 app/test/unit/app-test.tsx
-@@ -16,6 +16,7 @@
-   RepositoriesStore,
-   AccountsStore,
-   PullRequestStore,
-+  TroubleshootingStore,
- } from '../../src/lib/stores'
- import { InMemoryDispatcher } from '../helpers/in-memory-dispatcher'
- import {
-@@ -59,6 +60,8 @@
-       repositoriesStore
-     )
- 
-+    const troubleshootingStore = new TroubleshootingStore(accountsStore)
-+
-     appStore = new AppStore(
-       new GitHubUserStore(db),
-       new CloningRepositoriesStore(),
-@@ -68,7 +71,8 @@
-       new SignInStore(),
-       accountsStore,
-       repositoriesStore,
--      pullRequestStore
-+      pullRequestStore,
-+      troubleshootingStore
-     )
- 
-     dispatcher = new InMemoryDispatcher(appStore)
-merged
-  result 100644 389d4c4fef56ffe7f38c8fbf93e3cd2c93ca36e0 app/test/unit/repository-matching-test.ts
-  our    100644 abc42b9bb58132839bc3cef0828c66584193b2fc app/test/unit/repository-matching-test.ts
-@@ -10,7 +10,16 @@
-   describe('matchGitHubRepository', () => {
-     it('matches HTTPS URLs', () => {
-       const accounts = [
--        new Account('alovelace', 'https://api.github.com', '', [], '', 1, ''),
-+        new Account(
-+          'alovelace',
-+          'https://api.github.com',
-+          '',
-+          [],
-+          '',
-+          1,
-+          '',
-+          []
-+        ),
-       ]
-       const repo = matchGitHubRepository(
-         accounts,
-@@ -22,7 +31,16 @@
- 
-     it('matches HTTPS URLs without the git extension', () => {
-       const accounts = [
--        new Account('alovelace', 'https://api.github.com', '', [], '', 1, ''),
-+        new Account(
-+          'alovelace',
-+          'https://api.github.com',
-+          '',
-+          [],
-+          '',
-+          1,
-+          '',
-+          []
-+        ),
-       ]
-       const repo = matchGitHubRepository(
-         accounts,
-@@ -34,7 +52,16 @@
- 
-     it('matches git URLs', () => {
-       const accounts = [
--        new Account('alovelace', 'https://api.github.com', '', [], '', 1, ''),
-+        new Account(
-+          'alovelace',
-+          'https://api.github.com',
-+          '',
-+          [],
-+          '',
-+          1,
-+          '',
-+          []
-+        ),
-       ]
-       const repo = matchGitHubRepository(
-         accounts,
-@@ -46,7 +73,16 @@
- 
-     it('matches SSH URLs', () => {
-       const accounts = [
--        new Account('alovelace', 'https://api.github.com', '', [], '', 1, ''),
-+        new Account(
-+          'alovelace',
-+          'https://api.github.com',
-+          '',
-+          [],
-+          '',
-+          1,
-+          '',
-+          []
-+        ),
-       ]
-       const repo = matchGitHubRepository(
-         accounts,
-@@ -65,7 +101,8 @@
-           [],
-           '',
-           1,
--          ''
-+          '',
-+          []
-         ),
-       ]
-       const repo = matchGitHubRepository(
-changed in both
-  base   100644 b017e5071b105d30e40c12577ba965bef3cfa5c2 app/yarn.lock
-  our    100644 cd6294bb698115d3ff652d361f00efbf85c1e781 app/yarn.lock
-  their  100644 f23287610c4f96793e0971118d7c4142cea56961 app/yarn.lock
-@@ -95,6 +95,25 @@
-     balanced-match "^1.0.0"
-     concat-map "0.0.1"
- 
-+buffer-alloc-unsafe@^0.1.0:
-+  version "0.1.1"
-+  resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-0.1.1.tgz#ffe1f67551dd055737de253337bfe853dfab1a6a"
-+
-+buffer-alloc@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.1.0.tgz#05514d33bf1656d3540c684f65b1202e90eca303"
-+  dependencies:
-+    buffer-alloc-unsafe "^0.1.0"
-+    buffer-fill "^0.1.0"
-+
-+buffer-fill@^0.1.0:
-+  version "0.1.1"
-+  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-0.1.1.tgz#76d825c4d6e50e06b7a31eb520c04d08cc235071"
-+
-+buffer-from@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.0.0.tgz#4cb8832d23612589b0406e9e2956c17f06fdf531"
-+
- byline@^5.0.0:
-   version "5.0.0"
-   resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"
-@@ -175,7 +194,7 @@
-   version "2.5.1"
-   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.1.tgz#ae6874dc66937789b80754ff5428df66819ca50b"
- 
--core-util-is@1.0.2:
-+core-util-is@1.0.2, core-util-is@~1.0.0:
-   version "1.0.2"
-   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
- 
-@@ -190,6 +209,27 @@
-   version "0.0.2"
-   resolved "https://registry.yarnpkg.com/cross-unzip/-/cross-unzip-0.0.2.tgz#5183bc47a09559befcf98cc4657964999359372f"
- 
-+<<<<<<< .our
-+=======
-+cryptiles@3.x.x:
-+  version "3.1.2"
-+  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"
-+  dependencies:
-+    boom "5.x.x"
-+
-+csv-parser@^1.6.0:
-+  version "1.12.1"
-+  resolved "https://registry.yarnpkg.com/csv-parser/-/csv-parser-1.12.1.tgz#391e1ef961b1f9dcb4c7c0f82eb450a1bd916158"
-+  dependencies:
-+    buffer-alloc "^1.1.0"
-+    buffer-from "^1.0.0"
-+    generate-function "^1.0.1"
-+    generate-object-property "^1.0.0"
-+    inherits "^2.0.1"
-+    minimist "^1.2.0"
-+    ndjson "^1.4.0"
-+
-+>>>>>>> .their
- cycle@1.0.x:
-   version "1.0.3"
-   resolved "https://registry.yarnpkg.com/cycle/-/cycle-1.0.3.tgz#21e80b2be8580f98b468f379430662b046c34ad2"
-@@ -377,6 +417,13 @@
-     combined-stream "^1.0.5"
-     mime-types "^2.1.12"
- 
-+from2@^2.1.1:
-+  version "2.3.0"
-+  resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
-+  dependencies:
-+    inherits "^2.0.1"
-+    readable-stream "^2.0.0"
-+
- fs-extra@^6.0.0:
-   version "6.0.0"
-   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-6.0.0.tgz#0f0afb290bb3deb87978da816fcd3c7797f3a817"
-@@ -399,6 +446,23 @@
-   version "0.6.0"
-   resolved "https://registry.yarnpkg.com/fuzzaldrin-plus/-/fuzzaldrin-plus-0.6.0.tgz#832f6489fbe876769459599c914a670ec22947ee"
- 
-+generate-function@^1.0.1:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-1.1.0.tgz#54c21b080192b16d9877779c5bb81666e772365f"
-+
-+generate-object-property@^1.0.0:
-+  version "1.2.0"
-+  resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
-+  dependencies:
-+    is-property "^1.0.0"
-+
-+get-stream@^2.1.0:
-+  version "2.3.1"
-+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-2.3.1.tgz#5f38f93f346009666ee0150a054167f91bdd95de"
-+  dependencies:
-+    object-assign "^4.0.1"
-+    pinkie-promise "^2.0.0"
-+
- getpass@^0.1.1:
-   version "0.1.7"
-   resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-@@ -466,10 +530,20 @@
-     once "^1.3.0"
-     wrappy "1"
- 
--inherits@2, inherits@~2.0.0:
-+inherits@2, inherits@^2.0.1, inherits@~2.0.0, inherits@~2.0.3:
-   version "2.0.3"
-   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
- 
-+into-stream@^2.0.0:
-+  version "2.0.1"
-+  resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-2.0.1.tgz#db9b003694453eae091d8a5c84cc11507b781d31"
-+  dependencies:
-+    from2 "^2.1.1"
-+
-+is-property@^1.0.0:
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
-+
- is-stream@^1.0.1, is-stream@^1.1.0:
-   version "1.1.0"
-   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-@@ -478,6 +552,10 @@
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
- 
-+isarray@~1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-+
- isexe@^2.0.0:
-   version "2.0.0"
-   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-@@ -509,7 +587,7 @@
-   version "0.2.3"
-   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
- 
--json-stringify-safe@~5.0.1:
-+json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
-   version "5.0.1"
-   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
- 
-@@ -585,6 +663,10 @@
-   version "0.0.8"
-   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
- 
-+minimist@^1.2.0:
-+  version "1.2.0"
-+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-+
- minipass@^2.2.1:
-   version "2.2.1"
-   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.2.1.tgz#5ada97538b1027b4cf7213432428578cb564011f"
-@@ -627,6 +709,23 @@
-   version "2.8.0"
-   resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a"
- 
-+ndjson@^1.4.0:
-+  version "1.5.0"
-+  resolved "https://registry.yarnpkg.com/ndjson/-/ndjson-1.5.0.tgz#ae603b36b134bcec347b452422b0bf98d5832ec8"
-+  dependencies:
-+    json-stringify-safe "^5.0.1"
-+    minimist "^1.2.0"
-+    split2 "^2.1.0"
-+    through2 "^2.0.3"
-+
-+neat-csv@^2.1.0:
-+  version "2.1.0"
-+  resolved "https://registry.yarnpkg.com/neat-csv/-/neat-csv-2.1.0.tgz#06f58360c4c3b955bd467ddc85ae4511a3907a4c"
-+  dependencies:
-+    csv-parser "^1.6.0"
-+    get-stream "^2.1.0"
-+    into-stream "^2.0.0"
-+
- node-fetch@^1.0.1:
-   version "1.7.3"
-   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
-@@ -676,10 +775,38 @@
-   version "2.1.0"
-   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
- 
-+pify@^2.2.0:
-+  version "2.3.0"
-+  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-+
-+pify@^3.0.0:
-+  version "3.0.0"
-+  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-+
-+pinkie-promise@^2.0.0:
-+  version "2.0.1"
-+  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-+  dependencies:
-+    pinkie "^2.0.0"
-+
-+pinkie@^2.0.0:
-+  version "2.0.4"
-+  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-+
- primer-support@^4.0.0:
-   version "4.3.0"
-   resolved "https://registry.yarnpkg.com/primer-support/-/primer-support-4.3.0.tgz#c470fef8c0bff2ec8a771a0749783c2b388118fe"
- 
-+process-exists@^3.1.0:
-+  version "3.1.0"
-+  resolved "https://registry.yarnpkg.com/process-exists/-/process-exists-3.1.0.tgz#86cae049e1e7b51382690ec9fd8dfd74ff7a17c8"
-+  dependencies:
-+    ps-list "^4.0.0"
-+
-+process-nextick-args@~2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
-+
- progress@^2.0.0:
-   version "2.0.0"
-   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz#8a1be366bf8fc23db2bd23f10c6fe920b4389d1f"
-@@ -698,6 +825,13 @@
-     loose-envify "^1.3.1"
-     object-assign "^4.1.1"
- 
-+ps-list@^4.0.0:
-+  version "4.1.0"
-+  resolved "https://registry.yarnpkg.com/ps-list/-/ps-list-4.1.0.tgz#8ffd6434add37f9dd1a9f19ab1beb42c9db60dae"
-+  dependencies:
-+    pify "^3.0.0"
-+    tasklist "^3.1.0"
-+
- pseudomap@^1.0.2:
-   version "1.0.2"
-   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
-@@ -770,6 +904,18 @@
-     object-assign "^4.1.1"
-     prop-types "^15.6.0"
- 
-+readable-stream@^2.0.0, readable-stream@^2.1.5:
-+  version "2.3.6"
-+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
-+  dependencies:
-+    core-util-is "~1.0.0"
-+    inherits "~2.0.3"
-+    isarray "~1.0.0"
-+    process-nextick-args "~2.0.0"
-+    safe-buffer "~5.1.1"
-+    string_decoder "~1.1.1"
-+    util-deprecate "~1.0.1"
-+
- regenerator-runtime@^0.11.0:
-   version "0.11.0"
-   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz#7e54fe5b5ccd5d6624ea6255c3473be090b802e1"
-@@ -825,6 +971,14 @@
-   version "5.1.1"
-   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
- 
-+safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-+  version "5.1.2"
-+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-+
-+sec@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/sec/-/sec-1.0.0.tgz#033d60a3ad20ecf2e00940d14f97823465774335"
-+
- semver@^5.3.0:
-   version "5.4.1"
-   resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
-@@ -843,6 +997,12 @@
-   version "0.5.7"
-   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
- 
-+split2@^2.1.0:
-+  version "2.2.0"
-+  resolved "https://registry.yarnpkg.com/split2/-/split2-2.2.0.tgz#186b2575bcf83e85b7d18465756238ee4ee42493"
-+  dependencies:
-+    through2 "^2.0.2"
-+
- sshpk@^1.7.0:
-   version "1.13.1"
-   resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3"
-@@ -861,6 +1021,19 @@
-   version "0.0.10"
-   resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
- 
-+<<<<<<< .our
-+=======
-+string_decoder@~1.1.1:
-+  version "1.1.1"
-+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-+  dependencies:
-+    safe-buffer "~5.1.0"
-+
-+stringstream@~0.0.5:
-+  version "0.0.5"
-+  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
-+
-+>>>>>>> .their
- strip-ansi@^3.0.0:
-   version "3.0.1"
-   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-@@ -894,6 +1067,14 @@
-     mkdirp "^0.5.0"
-     yallist "^3.0.2"
- 
-+tasklist@^3.1.0:
-+  version "3.1.0"
-+  resolved "https://registry.yarnpkg.com/tasklist/-/tasklist-3.1.0.tgz#873a98a4e45cbdecfa2c2ee18865353057e63696"
-+  dependencies:
-+    neat-csv "^2.1.0"
-+    pify "^2.2.0"
-+    sec "^1.0.0"
-+
- temp@^0.8.3:
-   version "0.8.3"
-   resolved "https://registry.yarnpkg.com/temp/-/temp-0.8.3.tgz#e0c6bc4d26b903124410e4fed81103014dfc1f59"
-@@ -905,6 +1086,13 @@
-   version "3.0.2"
-   resolved "https://registry.yarnpkg.com/textarea-caret/-/textarea-caret-3.0.2.tgz#f360c48699aa1abf718680a43a31a850665c2caf"
- 
-+through2@^2.0.2, through2@^2.0.3:
-+  version "2.0.3"
-+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
-+  dependencies:
-+    readable-stream "^2.1.5"
-+    xtend "~4.0.1"
-+
- tough-cookie@~2.3.3:
-   version "2.3.3"
-   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561"
-@@ -940,6 +1128,10 @@
-     execa "^0.4.0"
-     mem "^0.1.0"
- 
-+util-deprecate@~1.0.1:
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-+
- uuid@^3.0.1, uuid@^3.1.0:
-   version "3.1.0"
-   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
-@@ -1009,6 +1201,10 @@
-   version "1.0.2"
-   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
- 
-+xtend@~4.0.1:
-+  version "4.0.1"
-+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
-+
- yallist@^2.1.2:
-   version "2.1.2"
-   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
-added in remote
-  their  100644 5b9fe3f8d1195e5d5cf3e5e8d20da8c832f8278a docs/technical/ssh-troubleshooting.md
-@@ -0,0 +1,122 @@
-+# SSH Troubleshooting
-+
-+This document outlines how Desktop inspects the SSH setup to address a number
-+of common issues.
-+
-+## Host Key Verification
-+
-+As part of initializing the SSH connection, `ssh` will check that it knows
-+and trusts the server it is connnecting to. When connecting to an unknown
-+host, `ssh` will prompt to ask if you wish to trust this server:
-+
-+```shellsession
-+$ git fetch --progress --prune origin
-+The authenticity of host 'github.com (192.30.255.112)' can't be established.
-+RSA key fingerprint is SHA256:nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8.
-+Are you sure you want to continue connecting (yes/no)?
-+```
-+
-+Desktop currently doesn't have a way to support interactive processes like
-+this, so we need to hook into some configuration options and manually add this
-+to the known hosts file that SSH uses.
-+
-+To avoid the interactive prompt, adding `StrictHostKeyChecking=yes` as an
-+option to `ssh` ensures that the Git operation will fail rather than hang
-+waiting for user input:
-+
-+```shellsession
-+$ ssh -o StrictHostKeyChecking=yes git@github.com
-+```
-+
-+To trust a new server, you can use `ssh-keygen`:
-+
-+```shellsession
-+$ ssh-keygen github.com >> ~/.ssh/known_hosts
-+```
-+
-+This isn't currently available in `dugite`, but we can leverage either the
-+OpenSSH environment that comes with Windows 10 Fall Creators Update (should
-+be on `PATH`) or the version that comes with Git for Windows (need to add to
-+`PATH`). macOS should have a working SSH setup by default, Linux will likely be
-+in trouble if it's not on `PATH`.
-+
-+## The `ssh-agent` process
-+
-+The `ssh-agent` process is important to the SSH connection process, and needs
-+to be running for the current user to handle SSH authentication on the local
-+machine.
-+
-+If no running `ssh-agent` process is found, Desktop could launch it's own
-+instance of the process and ensure it is killed when Desktop exits. *This is
-+currently out of scope for the proof-of-concept.*
-+
-+As part of launching the `ssh-agent` process, it has a number of environment
-+variables that help other tools integrate with it:
-+
-+```shellsession
-+$ ssh-agent -s
-+SSH_AUTH_SOCK=/var/folders/dc/ww83254d73g8z6lc9y_msm9r0000gn/T//ssh-oerrG9QXPkWr/agent.15063; export SSH_AUTH_SOCK;
-+SSH_AGENT_PID=15064; export SSH_AGENT_PID;
-+echo Agent pid 15064;
-+```
-+
-+Desktop needs to inspect these and pass them through to Git whenever it needs
-+to do anything authentication-related.
-+
-+## Working with SSH keys
-+
-+After verifying the SSH server, and confirming a valid `ssh-agent` process is running,
-+a valid public/private key pair is required that represents the identity of the user.
-+
-+We can see the existing keys by running `ssh-add l`:
-+
-+```
-+$ ssh-all -l
-+4096 SHA256:V+fJ7HbKo3UindVz0x2XlZcZDr5GAd3p4+Ex7NnCCBI /Users/shiftkey/.ssh/id_rsa_new (RSA)
-+```
-+
-+I'm not aware of any CLI tools for identifying available SSH keys, but we can assume
-+with a good degree of confidence that we have pairs of files at `~/.ssh`:
-+
-+```
-+$ ls ~/.ssh/
-+id_rsa         id_rsa.pub     id_rsa_new     id_rsa_new.pub known_hosts
-+```
-+
-+Desktop could list these in the application so that a user may add them to the `ssh-agent`
-+process.
-+
-+We can glean some identity information from the public key file - an email address that
-+was used when it was created - and the name of the file. This should be enough to help
-+the user identify the right key to add.
-+
-+We can tell if a private key requires a passphrase by the header contents. Here's a key
-+that doesn't require a passphrase:
-+
-+```
-+-----BEGIN RSA PRIVATE KEY-----
-+MIIEogIBAAKCAQEA3qKD/4PAc6PMb1yCckTduFl5fA1OpURLR5Z+T4xY1JQt3eTM
-+```
-+
-+And this is the header of a key that requires a passphrase:
-+
-+```
-+-----BEGIN RSA PRIVATE KEY-----
-+Proc-Type: 4,ENCRYPTED
-+DEK-Info: DES-EDE3-CBC,556C1115CDA822F5
-+
-+AHi/3++6PEIBv4kfpM57McyoSAAaT2ECxNOA5DRKxJQ9pr2D3aUeMBaBfWGrxd/Q
-+```
-+
-+## Creating a new public/private key pair
-+
-+If no suitable keys are found, the user should be able to create a new SSH key. This
-+can be done from the command line:
-+
-+```
-+ssh-keygen -q -b 4096 -t rsa -N new_passphrase -f output_keyfile
-+```
-+
-+Desktop should use a naming convention to make it clear that it was the source of the key,
-+to ensure it doesn't interfere with existing keys from other sources. Something
-+like `~/.ssh/github_desktop_[login]` would be radical.
diff --git a/app/test/fixtures/merge-parser/desktop/merge-fancy-text-styles-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-fancy-text-styles-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index 020dc584476..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-fancy-text-styles-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,135 +0,0 @@
-changed in both
-  base   100644 d02e36c9009634ccb346c8a6c1434e7c6f5ad0fd app/src/ui/history/compare-branch-list-item.tsx
-  our    100644 16d4efb540d90ba9514f7b5da356f9fa5372e2f6 app/src/ui/history/compare-branch-list-item.tsx
-  their  100644 2d266eae4e2b9acd270381a0ed475ae313dcbb82 app/src/ui/history/compare-branch-list-item.tsx
-@@ -46,10 +46,21 @@
-       <div className="branches-list-item">
-         <Octicon className="icon" symbol={icon} />
-         <div className="name" title={branch.name}>
-+<<<<<<< .our
-           <HighlightText
-             text={branch.name}
-             highlight={this.props.matches.title}
-           />
-+=======
-+          <HighlightText text={branch.name} highlight={this.props.matches} />
-+        </div>
-+        <div className="branch-commit-counter">
-+          {compareState.behind}
-+          <Octicon className="icon" symbol={OcticonSymbol.arrowDown} />
-+
-+          {compareState.ahead}
-+          <Octicon className="icon" symbol={OcticonSymbol.arrowUp} />
-+>>>>>>> .their
-         </div>
-         {aheadBehindElement}
-       </div>
-changed in both
-  base   100644 139bfeb886fa8e696d4972ab1b03b8b9acf1cb7a app/src/ui/history/compare.tsx
-  our    100644 c0be0e26ce79b9a590edfa3a9fd3718fa58782d4 app/src/ui/history/compare.tsx
-  their  100644 55a17f0b4f3862c9159bb6c23fc2f12272244106 app/src/ui/history/compare.tsx
-@@ -168,8 +168,14 @@
-             type="search"
-             placeholder={placeholderText}
-             onFocus={this.onTextBoxFocused}
-+<<<<<<< .our
-             value={filterText}
-             disabled={allBranches.length === 0}
-+=======
-+            onBlur={this.onTextBoxBlurred}
-+            type="search"
-+            value={this.state.filterText}
-+>>>>>>> .their
-             onRef={this.onTextBoxRef}
-             onValueChanged={this.onBranchFilterTextChanged}
-             onKeyDown={this.onBranchFilterKeyDown}
-@@ -541,10 +547,28 @@
-     })
-   }
- 
-+<<<<<<< .our
-   private onTextBoxFocused = () => {
-     this.props.dispatcher.updateCompareForm(this.props.repository, {
-       showBranchList: true,
-     })
-+=======
-+  private onTextBoxBlurred = () => {
-+    this.setState({ showFilterList: false })
-+
-+    let selectedBranch: Branch | null = this.state.selectedBranch
-+    if (selectedBranch === null) {
-+      return
-+    }
-+
-+    let filterText = this.state.filterText
-+
-+    if (filterText == "") {
-+      this.setState({ selectedBranch: null})
-+    } else {
-+      this.setState({ filterText: selectedBranch.name })
-+    }
-+>>>>>>> .their
-   }
- 
-   private onTextBoxRef = (textbox: TextBox) => {
-changed in both
-  base   100644 4271917183b0f57f7a03ba7349674c28798a2550 app/styles/ui/_fancy-text-box.scss
-  our    100644 479e9f6732ddc2b29c19b24585f4bb315001226a app/styles/ui/_fancy-text-box.scss
-  their  100644 cdda3ebe09db31ac82f504a3b57d17d77cfb6833 app/styles/ui/_fancy-text-box.scss
-@@ -9,11 +9,20 @@
- 
-   .fancy-octicon {
-     height: var(--text-field-height);
-+<<<<<<< .our
-     padding: var(--spacing-half) 0 var(--spacing-half) 7px;
-     border-right: none;
-     border-radius: var(--border-radius) 0 0 var(--border-radius);
-     opacity: 0.5;
-     transition: opacity 0.2s ease;
-+=======
-+    padding: var(--spacing-half) var(--spacing-half) var(--spacing-half) 7px;
-+    border-right: none;
-+    border-radius: var(--border-radius) 0 0 var(--border-radius);
-+
-+    opacity: 0.5;
-+    transition: opacity 0.15s ease;
-+>>>>>>> .their
-   }
- 
-   &.focused {
-@@ -29,6 +38,7 @@
-     border-radius: 0 var(--border-radius) var(--border-radius) 0;
-     border: none;
-     box-shadow: none;
-+    padding-left: 0;
- 
-     &:focus {
-       box-shadow: none;
-changed in both
-  base   100644 22c5f28660a40f9788eeb78f33d6c64e1ad7bfd1 app/styles/ui/history/_history.scss
-  our    100644 58cea508b02182fa4f45daf88643d33c3b2dd020 app/styles/ui/history/_history.scss
-  their  100644 95d8616b58bad57c8fc2c8b2789483b1e42cfce6 app/styles/ui/history/_history.scss
-@@ -94,6 +94,7 @@
-     color: var(--text-secondary-color);
-     display: flex;
-     justify-content: flex-end;
-+<<<<<<< .our
-     flex: 1;
-     font-size: var(--font-size-sm);
- 
-@@ -111,6 +112,15 @@
-       width: 8px;
-       margin-left: 1px;
- 
-+=======
-+    font-size: var(--font-size-sm);
-+    color: var(--text-secondary-color);
-+    flex-grow: 1;
-+
-+    .octicon {
-+      fill: var(--text-secondary-color);
-+
-+>>>>>>> .their
-       &:last-child {
-         margin-right: 0;
-       }
diff --git a/app/test/fixtures/merge-parser/desktop/merge-gimme-the-goods-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-gimme-the-goods-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index 5540d8e229c..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-gimme-the-goods-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-changed in both
-  base   100644 8bf4aa60727c67bb0f9ec9ce46a631ee919daac8 app/src/ui/app.tsx
-  our    100644 c38c806e36c237ea70f3cdeee739941530c0c7cd app/src/ui/app.tsx
-  their  100644 f0f8051c637fbfc7f8d273ad2b92d4c56d725ea0 app/src/ui/app.tsx
-@@ -139,6 +139,7 @@
-   public constructor(props: IAppProps) {
-     super(props)
- 
-+<<<<<<< .our
-     registerContextualMenuActionDispatcher()
- 
-     props.dispatcher.loadInitialState().then(() => {
-@@ -167,6 +168,9 @@
-         }, UpdateRepositoryIndicatorInterval)
-       }, InitialRepositoryIndicatorTimeout)
-     })
-+=======
-+    setTimeout(() => this.props.dispatcher.setUpdateBannerVisibility(true), 3000)
-+>>>>>>> .their
- 
-     this.state = props.appStore.getState()
-     props.appStore.onDidUpdate(state => {
diff --git a/app/test/fixtures/merge-parser/desktop/merge-ignore-should-remove-tracked-files-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-ignore-should-remove-tracked-files-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index 838f1659d6e..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-ignore-should-remove-tracked-files-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,179 +0,0 @@
-changed in both
-  base   100644 38302823efd1dd629fd5d560fb2a67a3cbafc143 app/src/lib/file-system.ts
-  our    100644 a696107c681c84a8da5190495b8d23ee51f935e9 app/src/lib/file-system.ts
-  their  100644 22a97568b80cd2991a010d33d464db2a3e075f65 app/src/lib/file-system.ts
-@@ -86,6 +86,7 @@
- }
- 
- /**
-+<<<<<<< .our
-  * Read a specific region from a file.
-  *
-  * @param path  Path to the file
-@@ -110,5 +111,20 @@
-       })
-       .on('error', reject)
-       .on('end', () => resolve(Buffer.concat(chunks, total)))
-+=======
-+ * Helper function to promisify fs.unlink for deleting a file from disk.
-+ *
-+ * @param path Path to delete from disk.
-+ */
-+export function removeFile(path: string): Promise<void> {
-+  return new Promise<void>((resolve, reject) => {
-+    Fs.unlink(path, error => {
-+      if (error) {
-+        reject(error)
-+      } else {
-+        resolve()
-+      }
-+    })
-+>>>>>>> .their
-   })
- }
-changed in both
-  base   100644 cc8f049009ace9094a0307160770ffdcd0217554 app/src/lib/stores/git-store.ts
-  our    100644 f8eedeb9d958345be59538b82b1b69cd4326d73b app/src/lib/stores/git-store.ts
-  their  100644 a3663f99a48bea061a1ae1a3689c745b31378b21 app/src/lib/stores/git-store.ts
-@@ -19,6 +19,7 @@
- import { structuralEquals } from '../../lib/equality'
- import { compare } from '../../lib/compare'
- import { queueWorkHigh } from '../../lib/queue-work'
-+import { removeFile, pathExists } from '../../lib/file-system'
- 
- import {
-   reset,
-@@ -1120,6 +1121,89 @@
-     this.emitUpdate()
-   }
- 
-+<<<<<<< .our
-+=======
-+  /**
-+   * Read the contents of the repository .gitignore.
-+   *
-+   * Returns a promise which will either be rejected or resolved
-+   * with the contents of the file. If there's no .gitignore file
-+   * in the repository root the promise will resolve with null.
-+   */
-+  public async readGitIgnore(): Promise<string | null> {
-+    const repository = this.repository
-+    const ignorePath = Path.join(repository.path, '.gitignore')
-+
-+    return new Promise<string | null>((resolve, reject) => {
-+      Fs.readFile(ignorePath, 'utf8', (err, data) => {
-+        if (err) {
-+          if (err.code === 'ENOENT') {
-+            resolve(null)
-+          } else {
-+            reject(err)
-+          }
-+        } else {
-+          resolve(data)
-+        }
-+      })
-+    })
-+  }
-+
-+  /**
-+   * Persist the given content to the repository root .gitignore.
-+   *
-+   * If the repository root doesn't contain a .gitignore file one
-+   * will be created, otherwise the current file will be overwritten.
-+   */
-+  public async saveGitIgnore(text: string): Promise<void> {
-+    const repository = this.repository
-+    const ignorePath = Path.join(repository.path, '.gitignore')
-+    const fileContents = await formatGitIgnoreContents(text, repository)
-+
-+    return new Promise<void>((resolve, reject) => {
-+      Fs.writeFile(ignorePath, fileContents, err => {
-+        if (err) {
-+          reject(err)
-+        } else {
-+          resolve()
-+        }
-+      })
-+    })
-+  }
-+
-+  /** Ignore the given path or pattern. */
-+  public async ignore(pattern: string): Promise<void> {
-+    const repository = this.repository
-+
-+    if (pattern.startsWith('*')) {
-+      // TODO: scan filesystem for all entries matching this expression
-+    } else {
-+      const status = await getStatus(repository)
-+      const match = status.workingDirectory.files.find(p => p.path === pattern)
-+      if (match) {
-+        // if we have pending changes against this file, discard it
-+        // using the workflow defined by the user
-+        await this.discardChanges([match])
-+      }
-+
-+      // the file is tracked but has no pending changes, just remove it
-+      const path = Path.join(repository.path, pattern)
-+      const exists = await pathExists(path)
-+      if (exists) {
-+        await removeFile(path)
-+      }
-+    }
-+
-+    const text = (await this.readGitIgnore()) || ''
-+    const currentContents = await formatGitIgnoreContents(text, repository)
-+    const newText = await formatGitIgnoreContents(
-+      `${currentContents}${pattern}`,
-+      repository
-+    )
-+    await this.saveGitIgnore(newText)
-+  }
-+
-+>>>>>>> .their
-   public async discardChanges(
-     files: ReadonlyArray<WorkingDirectoryFileChange>
-   ): Promise<void> {
-changed in both
-  base   100644 27231087354abe691390aa5bacabd63762a47b60 app/test/unit/git-store-test.ts
-  our    100644 916df52e71502aa756ade2e09be78d7398a4c7f0 app/test/unit/git-store-test.ts
-  their  100644 e9b803d0240aad0fd503071fde85aca1aeac0765 app/test/unit/git-store-test.ts
-@@ -68,6 +68,39 @@
-     files = status.workingDirectory.files
- 
-     expect(files.length).to.equal(1)
-+<<<<<<< .our
-+=======
-+    expect(files[0].path).to.equal('README.md')
-+    expect(files[0].status).to.equal(AppFileStatus.Modified)
-+  })
-+
-+  it('discarding a tracked file will remove it from disk', async () => {
-+    const repo = await setupEmptyRepository()
-+    const gitStore = new GitStore(repo, shell)
-+
-+    const relativeFilePath = Path.join('directory', 'README.txt')
-+    const filePath = Path.join(repo.path, relativeFilePath)
-+
-+    Fs.mkdirSync(Path.join(repo.path, 'directory'))
-+
-+    Fs.writeFileSync(filePath, 'SOME WORDS GO HERE\n')
-+
-+    // commit the file so it's tracked
-+    await GitProcess.exec(['add', relativeFilePath], repo.path)
-+    await GitProcess.exec(['commit', '-m', 'added file'], repo.path)
-+
-+    // ignore the tracked file
-+    await gitStore.ignore(relativeFilePath)
-+
-+    const status = await getStatus(repo)
-+    const files = status.workingDirectory.files
-+
-+    expect(files.length).to.equal(2)
-+    expect(files[0].path).equals(relativeFilePath)
-+    expect(files[0].status).equals(AppFileStatus.Deleted)
-+    expect(files[1].path).equals('.gitignore')
-+    expect(files[1].status).equals(AppFileStatus.New)
-+>>>>>>> .their
-   })
- 
-   it('can discard a renamed file', async () => {
diff --git a/app/test/fixtures/merge-parser/desktop/merge-introduce-better-replacements-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-introduce-better-replacements-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index 68187673aaf..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-introduce-better-replacements-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,576 +0,0 @@
-added in remote
-  their  100644 ce778fb8220cf3bb06f2a50def39f74aa683fc7d app/app-info.d.ts
-@@ -0,0 +1,2 @@
-+export function getReplacements(): any
-+export function getCLICommands(): string[]
-added in remote
-  their  100644 e9375cea93e985e937ff8b587b21652a37afb605 app/app-info.js
-@@ -0,0 +1,97 @@
-+'use strict'
-+
-+const fs = require('fs')
-+const path = require('path')
-+
-+const gitInfo = require('./git-info')
-+const distInfo = require('../script/dist-info')
-+
-+const projectRoot = path.join(__dirname, '..')
-+
-+const devClientId = '3a723b10ac5575cc5bb9'
-+const devClientSecret = '22c34d87789a365981ed921352a7b9a8c3f69d54'
-+
-+const channel = distInfo.getReleaseChannel()
-+
-+function getCLICommands() {
-+  return (
-+    // eslint-disable-next-line no-sync
-+    fs
-+      .readdirSync(path.resolve(projectRoot, 'app', 'src', 'cli', 'commands'))
-+      .filter(name => name.endsWith('.ts'))
-+      .map(name => name.replace(/\.ts$/, ''))
-+  )
-+}
-+
-+function s(text) {
-+  return JSON.stringify(text)
-+}
-+
-+function getMenuPlaceholders() {
-+  if (process.platform === 'darwin') {
-+    return {
-+      __MENU_SHOW_LOGS_IN_FILE_MANAGER__: s('Show Logs in Finder'),
-+      __MENU_SHOW_IN_FILE_MANAGER__: s('Show in Finder'),
-+    }
-+  }
-+  if (process.platform === 'win32') {
-+    return {
-+      __MENU_SHOW_LOGS_IN_FILE_MANAGER__: s('S&how Logs in Explorer'),
-+      __MENU_SHOW_IN_FILE_MANAGER__: s('Show in E&xplorer'),
-+    }
-+  }
-+  return {
-+    __MENU_SHOW_LOGS_IN_FILE_MANAGER__: s('Show logs in File Manager'),
-+    __MENU_SHOW_IN_FILE_MANAGER__: s('Show in File Manager'),
-+  }
-+}
-+
-+function getPlatformPlaceholders() {
-+  if (process.platform === 'darwin') {
-+    return {
-+      __LABEL_SHOW_IN_FILE_MANAGER__: s('Show in Finder'),
-+      __LABEL_REVEAL_IN_FILE_MANAGER__: s('Reveal in Finder'),
-+      __LABEL_FILE_MANAGER_NAME__: s('Finder'),
-+    }
-+  }
-+  if (process.platform === 'win32') {
-+    return {
-+      __LABEL_SHOW_IN_FILE_MANAGER__: s('Show in Explorer'),
-+      __LABEL_REVEAL_IN_FILE_MANAGER__: s('Show in Explorer'),
-+      __LABEL_FILE_MANAGER_NAME__: s('Explorer'),
-+    }
-+  }
-+  return {
-+    __LABEL_SHOW_IN_FILE_MANAGER__: s('Show in File Manager'),
-+    __LABEL_REVEAL_IN_FILE_MANAGER__: s('Show in File Manager'),
-+    __LABEL_FILE_MANAGER_NAME__: s('File Manager'),
-+  }
-+}
-+
-+function getReplacements() {
-+  const replacements = {
-+    __OAUTH_CLIENT_ID__: s(process.env.DESKTOP_OAUTH_CLIENT_ID || devClientId),
-+    __OAUTH_SECRET__: s(
-+      process.env.DESKTOP_OAUTH_CLIENT_SECRET || devClientSecret
-+    ),
-+    __DARWIN__: process.platform === 'darwin',
-+    __WIN32__: process.platform === 'win32',
-+    __LINUX__: process.platform === 'linux',
-+    __DEV__: channel === 'development',
-+    __RELEASE_CHANNEL__: s(channel),
-+    __UPDATES_URL__: s(distInfo.getUpdatesURL()),
-+    __SHA__: s(gitInfo.getSHA()),
-+    __CLI_COMMANDS__: s(getCLICommands()),
-+    'process.platform': s(process.platform),
-+    'process.env.NODE_ENV': s(process.env.NODE_ENV || 'development'),
-+    'process.env.TEST_ENV': s(process.env.TEST_ENV),
-+  }
-+
-+  return Object.assign(
-+    replacements,
-+    getMenuPlaceholders(),
-+    getPlatformPlaceholders()
-+  )
-+}
-+
-+module.exports = { getReplacements, getCLICommands }
-added in remote
-  their  100644 db784cfd0f0a6592eb885f2049f8afc835d6e910 app/git-info.d.ts
-@@ -0,0 +1 @@
-+export function getSHA(): string
-added in remote
-  their  100644 ed5b62cd3a8bd2c5eddea48944f85e3716fb2e4e app/git-info.js
-@@ -0,0 +1,45 @@
-+'use strict'
-+
-+const fs = require('fs')
-+const path = require('path')
-+
-+/**
-+ * Attempt to dereference the given ref without requiring a Git environment
-+ * to be present. Note that this method will not be able to dereference packed
-+ * refs but should suffice for simple refs like 'HEAD'.
-+ *
-+ * Will throw an error for unborn HEAD.
-+ *
-+ * @param {string} gitDir The path to the Git repository's .git directory
-+ * @param {string} ref    A qualified git ref such as 'HEAD' or 'refs/heads/master'
-+ */
-+function revParse(gitDir, ref) {
-+  const refPath = path.join(gitDir, ref)
-+  // eslint-disable-next-line no-sync
-+  const refContents = fs.readFileSync(refPath)
-+  const refRe = /^([a-f0-9]{40})|(?:ref: (refs\/.*))$/m
-+  const refMatch = refRe.exec(refContents)
-+
-+  if (!refMatch) {
-+    throw new Error(
-+      `Could not de-reference HEAD to SHA, invalid ref in ${refPath}: ${refContents}`
-+    )
-+  }
-+
-+  return refMatch[1] || revParse(gitDir, refMatch[2])
-+}
-+
-+function getSHA() {
-+  // CircleCI does some funny stuff where HEAD points to an packed ref, but
-+  // luckily it gives us the SHA we want in the environment.
-+  const circleSHA = process.env.CIRCLE_SHA1
-+  if (circleSHA) {
-+    return circleSHA
-+  }
-+
-+  return revParse(path.resolve(__dirname, '../.git'), 'HEAD')
-+}
-+
-+module.exports = {
-+  getSHA,
-+}
-added in remote
-  their  100644 5f169d7f8e0a82168c2c13ea3ba71b5b101f0c73 app/package-info.d.ts
-@@ -0,0 +1,4 @@
-+export function getProductName(): string
-+export function getCompanyName(): string
-+export function getVersion(): string
-+export function getBundleID(): string
-added in remote
-  their  100644 b63ebe090392d9f6829519ac340cbba3901300cb app/package-info.js
-@@ -0,0 +1,33 @@
-+'use strict'
-+
-+const path = require('path')
-+
-+const projectRoot = __dirname
-+// eslint-disable-next-line import/no-dynamic-require
-+const appPackage = require(path.join(projectRoot, 'package.json'))
-+
-+function getProductName() {
-+  const productName = appPackage.productName
-+  return process.env.NODE_ENV === 'development'
-+    ? `${productName}-dev`
-+    : productName
-+}
-+
-+function getCompanyName() {
-+  return appPackage.companyName
-+}
-+
-+function getVersion() {
-+  return appPackage.version
-+}
-+
-+function getBundleID() {
-+  return appPackage.bundleID
-+}
-+
-+module.exports = {
-+  getProductName,
-+  getCompanyName,
-+  getVersion,
-+  getBundleID,
-+}
-removed in local
-  base   100644 a58f983c1c4806ad8157926803f1ab7256857ab6 app/src/cli/dev-commands-global.js
-  their  100644 66965ffb5ca93dbeaa3562652443adc8c8dd4715 app/src/cli/dev-commands-global.js
-changed in both
-  base   100644 3d47d297a07a66a4b8bd3c47a91a7afb05bc89de app/src/lib/globals.d.ts
-  our    100644 fe0ba976e925a57a73938c30e3022a0b0c08fbde app/src/lib/globals.d.ts
-  their  100644 9198f6c831eb62c89c9918398040157af4a61d93 app/src/lib/globals.d.ts
-@@ -47,6 +47,21 @@
-   | 'highlighter'
- 
- /**
-+ * These menu entries are separated because Windows and Linux can use
-+ * accelerators( ??? TODO: that's not the right phrase) to select a
-+ * menu item immediately. They need to be reviewed to ensure no clashes
-+ * wtih other shortcuts.
-+ */
-+declare const __MENU_SHOW_LOGS_IN_FILE_MANAGER__: string
-+declare const __MENU_SHOW_IN_FILE_MANAGER__: string
-+
-+/**
-+ * These labels are placeholders in the UI which are platform-specific
-+ */
-+declare const __LABEL_SHOW_IN_FILE_MANAGER__: string
-+declare const __LABEL_REVEAL_IN_FILE_MANAGER__: string
-+declare const __LABEL_FILE_MANAGER_NAME__: string
-+/**
-  * The DOMHighResTimeStamp type is a double and is used to store a time value.
-  *
-  * The value could be a discrete point in time or the difference in time between
-changed in both
-  base   100644 016352958fee4c32ceec3490f242718d85866eb0 app/src/main-process/menu/build-default-menu.ts
-  our    100644 7ec8c001136d655a2ecce3d56b9a6804762172fa app/src/main-process/menu/build-default-menu.ts
-  their  100644 b90b828c557d054bbb2ca270e124c120059c451e app/src/main-process/menu/build-default-menu.ts
-@@ -239,7 +239,7 @@
-         click: emit('open-in-shell'),
-       },
-       {
--        label: __DARWIN__ ? 'Show in Finder' : 'Show in E&xplorer',
-+        label: __MENU_SHOW_IN_FILE_MANAGER__,
-         id: 'open-working-directory',
-         accelerator: 'CmdOrCtrl+Shift+F',
-         click: emit('open-working-directory'),
-@@ -361,7 +361,11 @@
-       : 'S&how logs in your File Manager'
- 
-   const showLogsItem: Electron.MenuItemConstructorOptions = {
-+<<<<<<< .our
-     label: showLogsLabel,
-+=======
-+    label: __MENU_SHOW_LOGS_IN_FILE_MANAGER__,
-+>>>>>>> .their
-     click() {
-       const logPath = getLogDirectoryPath()
-       ensureDir(logPath)
-changed in both
-  base   100644 c3a83c0d056030cd4c92a23e0d8a2ac38326de32 app/src/ui/changes/changed-file.tsx
-  our    100644 e68da78b55ca434ace46ff94982da3e9897bfb4c app/src/ui/changes/changed-file.tsx
-  their  100644 afba1373ff7fa239c33b089daa5288457375e9f3 app/src/ui/changes/changed-file.tsx
-@@ -85,12 +85,61 @@
-     )
-   }
- 
-+<<<<<<< .our
-   private onContextMenu = (event: React.MouseEvent<HTMLDivElement>) => {
-     this.props.onContextMenu(
-       this.props.id,
-       this.props.path,
-       this.props.status,
-       event
-+=======
-+  private onContextMenu = (event: React.MouseEvent<any>) => {
-+    event.preventDefault()
-+
-+    const extension = Path.extname(this.props.path)
-+    const fileName = Path.basename(this.props.path)
-+    const items: IMenuItem[] = [
-+      {
-+        label: __DARWIN__ ? 'Discard Changes…' : 'Discard changes…',
-+        action: () => this.props.onDiscardChanges(this.props.path),
-+      },
-+      { type: 'separator' },
-+      {
-+        label: 'Ignore',
-+        action: () => this.props.onIgnore(this.props.path),
-+        enabled: fileName !== GitIgnoreFileName,
-+      },
-+    ]
-+
-+    if (extension.length) {
-+      items.push({
-+        label: __DARWIN__
-+          ? `Ignore All ${extension} Files`
-+          : `Ignore all ${extension} files`,
-+        action: () => this.props.onIgnore(`*${extension}`),
-+        enabled: fileName !== GitIgnoreFileName,
-+      })
-+    }
-+
-+    const isSafeExtension = __WIN32__
-+      ? RestrictedFileExtensions.indexOf(extension.toLowerCase()) === -1
-+      : true
-+
-+    items.push(
-+      { type: 'separator' },
-+      {
-+        label: __LABEL_REVEAL_IN_FILE_MANAGER__,
-+        action: () => this.props.onRevealInFileManager(this.props.path),
-+        enabled: this.props.status !== AppFileStatus.Deleted,
-+      },
-+      {
-+        label: __DARWIN__
-+          ? 'Open with Default Program'
-+          : 'Open with default program',
-+        action: () => this.props.onOpenItem(this.props.path),
-+        enabled: isSafeExtension && this.props.status !== AppFileStatus.Deleted,
-+      }
-+>>>>>>> .their
-     )
-   }
- }
-changed in both
-  base   100644 901ac03d27e9d3b6f3a6f56acd7e91afcf61bd02 app/src/ui/changes/no-changes.tsx
-  our    100644 090ffa423a170c926a8b7fdcd04748ff3bd2d416 app/src/ui/changes/no-changes.tsx
-  their  100644 3726d27cd5c5ca5058c8841358aa62f41add47cc app/src/ui/changes/no-changes.tsx
-@@ -17,11 +17,14 @@
- /** The component to display when there are no local changes. */
- export class NoChanges extends React.Component<INoChangesProps, {}> {
-   public render() {
-+<<<<<<< .our
-     const opener = __DARWIN__
-       ? 'Finder'
-       : __WIN32__
-         ? 'Explorer'
-         : 'your File Manager'
-+=======
-+>>>>>>> .their
-     return (
-       <div className="panel blankslate" id="no-changes">
-         <img src={BlankSlateImage} className="blankslate-image" />
-@@ -30,7 +33,7 @@
-         <div>
-           Would you like to{' '}
-           <LinkButton onClick={this.open}>open this repository</LinkButton> in{' '}
--          {opener}?
-+          {__LABEL_FILE_MANAGER_NAME__}?
-         </div>
-       </div>
-     )
-changed in both
-  base   100644 b86cbe8974dc08a9094c6325dc75a8aab4e2c2a6 app/src/ui/repositories-list/repository-list-item.tsx
-  our    100644 6ca3c771c795eba242cc4b795e3a3b0bbb4c7488 app/src/ui/repositories-list/repository-list-item.tsx
-  their  100644 96859e6008e6261735e64176598dac27b55de88f app/src/ui/repositories-list/repository-list-item.tsx
-@@ -163,7 +163,11 @@
-         enabled: !missing,
-       },
-       {
-+<<<<<<< .our
-         label: showRepositoryLabel,
-+=======
-+        label: __LABEL_SHOW_IN_FILE_MANAGER__,
-+>>>>>>> .their
-         action: this.showRepository,
-         enabled: !missing,
-       },
-removed in local
-  base   100644 729101a5c3680282efc1c1b269ca5f691218fc6c app/webpack.common.js
-  their  100644 6e0b7be8dd3b7d756f24723124ec71399226c3b1 app/webpack.common.js
-added in both
-  our    100644 348333d12c84aba9cf5ec7404d91e9a8c2816d07 docs/technical/placeholders.md
-  their  100644 c0f6ec5a0026ef52f8f7826f8a15a72f528a2bc0 docs/technical/placeholders.md
-@@ -29,12 +29,20 @@
- 
- ### Replacements
- 
-+<<<<<<< .our
- The replacements defined for Desktop are found in [`app/app-info.ts`](https://github.com/desktop/desktop/blob/master/app/app-info.ts)
-+=======
-+The replacements defined for Desktop are found in [`app/app-info.js`](https://github.com/desktop/desktop/blob/master/app/app-info.js)
-+>>>>>>> .their
- as a hash of key-value pairs.
- 
- ```ts
- function getReplacements() {
-+<<<<<<< .our
-   return {
-+=======
-+  const replacements = {
-+>>>>>>> .their
-     __OAUTH_CLIENT_ID__: s(process.env.DESKTOP_OAUTH_CLIENT_ID || devClientId),
-     __OAUTH_SECRET__: s(
-       process.env.DESKTOP_OAUTH_CLIENT_SECRET || devClientSecret
-@@ -51,11 +59,20 @@
-     'process.env.NODE_ENV': s(process.env.NODE_ENV || 'development'),
-     'process.env.TEST_ENV': s(process.env.TEST_ENV),
-   }
-+<<<<<<< .our
-+=======
-+
-+  ...
-+>>>>>>> .their
- }
- ```
- 
- This means we can embed values at build time based on the current platform.
-+<<<<<<< .our
- Note the values we are embedding for `__DARWIN__` and `__WIN32__`:
-+=======
-+Note the values we are embeddeding for `__DARWIN__` and `__WIN32__`:
-+>>>>>>> .their
- 
- ```ts
- __DARWIN__: process.platform === 'darwin',
-@@ -118,3 +135,94 @@
- 
- As a convention, globals which should be replaced by Webpack should be prefixed
- and suffixed with two underscores, e.g. `__DEV__`.
-+<<<<<<< .our
-+=======
-+
-+### Platform-specific Menu Items
-+
-+There are a few places in Desktop where a label depends on the platform the
-+app is executing on. For the most part, we use "CamelCase" for labels on macOS
-+and "Sentence case" on Windows and Linux, like this:
-+
-+```ts
-+  {
-+    id: 'view-repository-on-github',
-+    label: __DARWIN__ ? 'View on GitHub' : '&View on GitHub',
-+    accelerator: 'CmdOrCtrl+Shift+G',
-+    click: emit('view-repository-on-github'),
-+  },
-+```
-+
-+Note how the Windows case has a `&` prefixing the `V` - this is so you can
-+select the menu item directly by pressing <kbd>ALT</kbd>, then <kbd>V</kbd>.
-+
-+For situations where a menu item needs to display something unique for each
-+platform, these should be defined as placeholders. The prefix `__MENU_` should
-+be used to group these.
-+
-+The corresponding platform-specific values must be added to [`app/app-info.js`](https://github.com/desktop/desktop/blob/master/app/app-info.js),
-+in the `getMenuPlaceholders()` function:
-+
-+```ts
-+function getMenuPlaceholders() {
-+  if (process.platform === 'darwin') {
-+    return {
-+      __MENU_SHOW_LOGS_IN_FILE_MANAGER__: s('Show Logs in Finder'),
-+      __MENU_SHOW_IN_FILE_MANAGER__: s('Show in Finder'),
-+    }
-+  }
-+
-+  if (process.platform === 'win32') {
-+    return {
-+      __MENU_SHOW_LOGS_IN_FILE_MANAGER__: s('S&how Logs in Explorer'),
-+      __MENU_SHOW_IN_FILE_MANAGER__: s('Show in E&xplorer'),
-+    }
-+  }
-+
-+  // other platforms follow
-+}
-+```
-+
-+Ensure these placeholders also exist as globals under
-+[`app/src/lib/globals.ts`](https://github.com/desktop/desktop/blob/master/app/src/lib/globals.d.ts).
-+
-+
-+```ts
-+/**
-+ * These menu entries are separated because Windows and Linux can use
-+ * chords to select a menu item immediately. They need to be reviewed
-+ * to ensure no clashes wtih other shortcuts.
-+ */
-+declare const __MENU_SHOW_LOGS_IN_FILE_MANAGER__: string
-+declare const __MENU_SHOW_IN_FILE_MANAGER__: string
-+```
-+
-+### Platform-specific Labels
-+
-+For other places in the user interface that will differ per-platform,
-+the `getPlatformPlaceholders()` method should contain all the necessary
-+values:
-+
-+```js
-+function getPlatformPlaceholders() {
-+  if (process.platform === 'darwin') {
-+    return {
-+      __LABEL_SHOW_IN_FILE_MANAGER__: s('Show in Finder'),
-+      __LABEL_REVEAL_IN_FILE_MANAGER__: s('Reveal in Finder'),
-+      __LABEL_FILE_MANAGER_NAME__: s('Finder'),
-+    }
-+  }
-+  if (process.platform === 'win32') {
-+    return {
-+      __LABEL_SHOW_IN_FILE_MANAGER__: s('Show in Explorer'),
-+      __LABEL_REVEAL_IN_FILE_MANAGER__: s('Show in Explorer'),
-+      __LABEL_FILE_MANAGER_NAME__: s('Explorer'),
-+    }
-+  }
-+  // other platforms follow
-+}
-+```
-+
-+These placeholders all use the `__LABEL_` prefix to distinguish them from
-+assist with grouping.
-+>>>>>>> .their
-changed in both
-  base   100755 fdf7384765afe667e3c7ad464e91c4935df2b730 script/build.ts
-  our    100755 7ac3a6cca1891f1f8c80839d46bb4d24e786b9ec script/build.ts
-  their  100755 2de7a081c11075424df87fe4217bc48898304cd8 script/build.ts
-removed in local
-  base   100644 6efaf5dfca90856795f77f2989ad069ca405d2a8 script/dist-info.d.ts
-  their  100644 761dea8563e41854304fb72b473ef14d0ead525f script/dist-info.d.ts
-removed in local
-  base   100644 f86eb9117e0bdef70457ed926ce65438fef6eb5b script/dist-info.js
-  their  100644 d5eb68e16988ef0dcebe7a748f61605243af684f script/dist-info.js
-changed in both
-  base   100644 087d65a5c81208b45beeaf4a481c160e2087edef script/eslint.ts
-  our    100644 c71f2850346b76957d6eb4312308b15714d08361 script/eslint.ts
-  their  100644 7b1691ce918636c3b0591a1ef8f97dad84324960 script/eslint.ts
-@@ -16,7 +16,11 @@
- const report = eslint.executeOnFiles([
-   './{script,eslint-rules}/**/*.{j,t}s?(x)',
-   './tslint-rules/**/*.ts',
-+<<<<<<< .our
-   './app/*.ts',
-+=======
-+  './app/*.js',
-+>>>>>>> .their
-   './app/{src,typings,test}/**/*.{j,t}s?(x)',
-   './changelog.json',
- ])
-changed in both
-  base   100644 baf89215dcf90428d5ab228276c63be1a932debc script/package.ts
-  our    100644 e72d5c172dc7cce7d763ef3579d7df105b2e26a1 script/package.ts
-  their  100644 a25a47e9ca631b6f926b39b6287c666028475826 script/package.ts
-removed in local
-  base   100644 68f1b2a52f7b60c732f580edb12a5e37839976b6 script/publish
-  their  100644 f35bab9d856bd56ef8fdaec3842adb4ba6955087 script/publish
-changed in both
-  base   100644 b0018667cb9ff103bf39eba89bc10622556fba0c script/review-logs.ts
-  our    100644 903faa6e50dc2fafc46924b0438baa3b9e6f634b script/review-logs.ts
-  their  100644 fc301ecd2b18abd63ca90949cdcd7453de26f832 script/review-logs.ts
-@@ -8,6 +8,7 @@
- 
- function getUserDataPath() {
-   if (process.platform === 'win32') {
-+<<<<<<< .our
-     if (process.env.APPDATA) {
-       return path.join(process.env.APPDATA, getExecutableName())
-     } else {
-@@ -15,6 +16,9 @@
-         `Unable to find the application data directory on Windows :(`
-       )
-     }
-+=======
-+    return path.join(process.env.APPDATA, getExecutableName())
-+>>>>>>> .their
-   } else if (process.platform === 'darwin') {
-     const home = os.homedir()
-     return path.join(home, 'Library', 'Application Support', getProductName())
-@@ -26,9 +30,13 @@
-     return path.join(home, '.config', getProductName())
-   } else {
-     throw new Error(
-+<<<<<<< .our
-       `I dunno how to resolve the user data path for ${process.platform} ${
-         process.arch
-       } :(`
-+=======
-+      `I dunno how to resolve the user data path for ${process.platform} ${process.arch} :(`
-+>>>>>>> .their
-     )
-   }
- }
diff --git a/app/test/fixtures/merge-parser/desktop/merge-istanbul-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-istanbul-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index e44652752be..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-istanbul-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,1139 +0,0 @@
-added in remote
-  their  100644 4a2b832008bce10ff9599e6860f11b86d788ead1 app/test/coverage.ts
-@@ -0,0 +1,60 @@
-+'use strict'
-+
-+const glob = require('glob')
-+const { resolve, join } = require('path')
-+const { readFileSync: read, writeFileSync: write } = require('fs')
-+const { hookRequire } = require('istanbul-lib-hook')
-+const { createInstrumenter } = require('istanbul-lib-instrument')
-+
-+const instrumenter = createInstrumenter({ debug: true, esModules: true })
-+const transformer = instrumenter.instrumentSync.bind(instrumenter)
-+let cov = global.__coverage__ = {}
-+
-+const root = resolve(__dirname, '..', '..')
-+const tmpd = resolve(root, '.nyc_output')
-+
-+const pattern = './app/src/**/*.{ts,tsx}'
-+
-+const match = () => {
-+  const map = {}
-+  const fn = function(file) { return map[file] }
-+
-+  fn.files = glob.sync(pattern, { root, realpath: true })
-+  for (let file of fn.files) map[file] = true
-+
-+  return fn
-+}
-+
-+const report = () => {
-+  console.log("REPORTING FOR DUTY")
-+  console.log("hello ", cov)
-+  for (let file of matched.files) {
-+    console.log(file)
-+    if (!cov[file]) {
-+      console.log("no cov for file")
-+      // Files that are not touched by code ran by the test runner is
-+      // manually instrumented, to illustrate the missing coverage.
-+      try {
-+        transformer(read(file, 'utf-8'), file)
-+      }
-+      catch (e) {
-+        console.log(e)
-+      }
-+      console.log("transformed")
-+      cov[file] = instrumenter.lastFileCoverage()
-+      console.log("done")
-+    }
-+  }
-+  console.log("hello ", cov);
-+  write(join(tmpd, `${process.type}.json`), JSON.stringify(cov), 'utf-8')
-+  console.log("finished");
-+}
-+
-+const matched = match()
-+hookRequire(matched, transformer, {})
-+
-+if (process.type === 'browser') {
-+  process.on('exit', report)
-+} else {
-+  window.addEventListener('unload', report)
-+}
-changed in both
-  base   100644 5b095a905f723e9742c47751b9fc5d6cc58258ec package.json
-  our    100644 2006bfb748810f6ea8bdbd26edf7c09524a1388a package.json
-  their  100644 01cb95ffccdf467c2e334655bb49c04c14e862c5 package.json
-@@ -156,6 +156,24 @@
-     "electron-builder": "20.27.1",
-     "electron-mocha": "^6.0.1",
-     "electron-packager": "^12.0.0",
--    "electron-winstaller": "2.5.2"
-+    "electron-winstaller": "2.5.2",
-+    "istanbul": "^0.4.5",
-+    "istanbul-lib-hook": "^1.1.0",
-+    "istanbul-lib-instrument": "^1.10.1",
-+    "nyc": "^12.0.2",
-+    "source-map-support": "^0.5.6"
-+  },
-+  "nyc": {
-+    "extension": [
-+      ".ts",
-+      ".tsx"
-+    ],
-+    "include": [
-+      "app/src"
-+    ],
-+    "reporter": [
-+      "html"
-+    ],
-+    "all": true
-   }
- }
-changed in both
-  base   100644 67afebf6479af930fa36dc6216880f9810e08abe script/unit-tests.ts
-  our    100644 0dabcf8e2c59df98ac65129f793ad52d98697588 script/unit-tests.ts
-  their  100644 0ba2a003690f26b8fe3a9a45ce9d28171ab03cbc script/unit-tests.ts
-@@ -49,9 +49,13 @@
-   '--require',
-   'ts-node/register',
-   '--require',
-+  'source-map-support/register',
-+  '--require',
-   './app/test/globals.ts',
-+  '--require',
-+  './app/test/coverage.ts',
-   'app/test/unit/*.{ts,tsx}',
--  'app/test/unit/**/*.{ts,tsx}',
-+  'app/test/unit/**/*.{ts,tsx}'
- ]
- 
- const shouldDebug = process.argv.indexOf('--debug') > -1
-changed in both
-  base   100644 ebee9944bea9a805e81fb7b86c10d8ad66de2ebf yarn.lock
-  our    100644 45ddb8bf6902bbb22708d844324093dccda26c79 yarn.lock
-  their  100644 b3bbb64f4c7be1020fff28d3427773cb49d74769 yarn.lock
-@@ -6,6 +6,86 @@
-   version "4.0.2"
-   resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-4.0.2.tgz#6abbdc22f33cab742053777a26db2e25ca527179"
- 
-+"@babel/code-frame@7.0.0-beta.51":
-+  version "7.0.0-beta.51"
-+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.51.tgz#bd71d9b192af978df915829d39d4094456439a0c"
-+  dependencies:
-+    "@babel/highlight" "7.0.0-beta.51"
-+
-+"@babel/generator@7.0.0-beta.51":
-+  version "7.0.0-beta.51"
-+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-beta.51.tgz#6c7575ffde761d07485e04baedc0392c6d9e30f6"
-+  dependencies:
-+    "@babel/types" "7.0.0-beta.51"
-+    jsesc "^2.5.1"
-+    lodash "^4.17.5"
-+    source-map "^0.5.0"
-+    trim-right "^1.0.1"
-+
-+"@babel/helper-function-name@7.0.0-beta.51":
-+  version "7.0.0-beta.51"
-+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.51.tgz#21b4874a227cf99ecafcc30a90302da5a2640561"
-+  dependencies:
-+    "@babel/helper-get-function-arity" "7.0.0-beta.51"
-+    "@babel/template" "7.0.0-beta.51"
-+    "@babel/types" "7.0.0-beta.51"
-+
-+"@babel/helper-get-function-arity@7.0.0-beta.51":
-+  version "7.0.0-beta.51"
-+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.51.tgz#3281b2d045af95c172ce91b20825d85ea4676411"
-+  dependencies:
-+    "@babel/types" "7.0.0-beta.51"
-+
-+"@babel/helper-split-export-declaration@7.0.0-beta.51":
-+  version "7.0.0-beta.51"
-+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.51.tgz#8a6c3f66c4d265352fc077484f9f6e80a51ab978"
-+  dependencies:
-+    "@babel/types" "7.0.0-beta.51"
-+
-+"@babel/highlight@7.0.0-beta.51":
-+  version "7.0.0-beta.51"
-+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.51.tgz#e8844ae25a1595ccfd42b89623b4376ca06d225d"
-+  dependencies:
-+    chalk "^2.0.0"
-+    esutils "^2.0.2"
-+    js-tokens "^3.0.0"
-+
-+"@babel/parser@7.0.0-beta.51":
-+  version "7.0.0-beta.51"
-+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.0.0-beta.51.tgz#27cec2df409df60af58270ed8f6aa55409ea86f6"
-+
-+"@babel/template@7.0.0-beta.51":
-+  version "7.0.0-beta.51"
-+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.51.tgz#9602a40aebcf357ae9677e2532ef5fc810f5fbff"
-+  dependencies:
-+    "@babel/code-frame" "7.0.0-beta.51"
-+    "@babel/parser" "7.0.0-beta.51"
-+    "@babel/types" "7.0.0-beta.51"
-+    lodash "^4.17.5"
-+
-+"@babel/traverse@7.0.0-beta.51":
-+  version "7.0.0-beta.51"
-+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.51.tgz#981daf2cec347a6231d3aa1d9e1803b03aaaa4a8"
-+  dependencies:
-+    "@babel/code-frame" "7.0.0-beta.51"
-+    "@babel/generator" "7.0.0-beta.51"
-+    "@babel/helper-function-name" "7.0.0-beta.51"
-+    "@babel/helper-split-export-declaration" "7.0.0-beta.51"
-+    "@babel/parser" "7.0.0-beta.51"
-+    "@babel/types" "7.0.0-beta.51"
-+    debug "^3.1.0"
-+    globals "^11.1.0"
-+    invariant "^2.2.0"
-+    lodash "^4.17.5"
-+
-+"@babel/types@7.0.0-beta.51":
-+  version "7.0.0-beta.51"
-+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.51.tgz#d802b7b543b5836c778aa691797abf00f3d97ea9"
-+  dependencies:
-+    esutils "^2.0.2"
-+    lodash "^4.17.5"
-+    to-fast-properties "^2.0.0"
-+
- "@types/body-parser@*":
-   version "1.16.8"
-   resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.16.8.tgz#687ec34140624a3bec2b1a8ea9268478ae8f3be3"
-@@ -461,6 +541,10 @@
-   version "1.1.1"
-   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
- 
-+abbrev@1.0.x:
-+  version "1.0.9"
-+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135"
-+
- accepts@~1.3.4:
-   version "1.3.4"
-   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.4.tgz#86246758c7dd6d21a6474ff084a4740ec05eb21f"
-@@ -550,6 +634,26 @@
-     json-schema-traverse "^0.3.0"
-     uri-js "^3.0.2"
- 
-+<<<<<<< .our
-+=======
-+ajv@^6.5.1:
-+  version "6.5.2"
-+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.2.tgz#678495f9b82f7cca6be248dd92f59bff5e1f4360"
-+  dependencies:
-+    fast-deep-equal "^2.0.1"
-+    fast-json-stable-stringify "^2.0.0"
-+    json-schema-traverse "^0.4.1"
-+    uri-js "^4.2.1"
-+
-+align-text@^0.1.1, align-text@^0.1.3:
-+  version "0.1.4"
-+  resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
-+  dependencies:
-+    kind-of "^3.0.2"
-+    longest "^1.0.1"
-+    repeat-string "^1.5.2"
-+
-+>>>>>>> .their
- alphanum-sort@^1.0.1, alphanum-sort@^1.0.2:
-   version "1.0.2"
-   resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
-@@ -640,6 +744,12 @@
-     semver "^5.5.0"
-     temp-file "^3.1.3"
- 
-+append-transform@^0.4.0:
-+  version "0.4.0"
-+  resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-0.4.0.tgz#d76ebf8ca94d276e247a36bad44a4b74ab611991"
-+  dependencies:
-+    default-require-extensions "^1.0.0"
-+
- aproba@^1.0.3, aproba@^1.1.1:
-   version "1.2.0"
-   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
-@@ -669,6 +779,10 @@
-     walkdir "^0.0.11"
-     zip-stream "^1.1.0"
- 
-+archy@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
-+
- are-we-there-yet@~1.1.2:
-   version "1.1.4"
-   resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d"
-@@ -723,7 +837,7 @@
-   version "0.3.2"
-   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
- 
--arrify@^1.0.0:
-+arrify@^1.0.0, arrify@^1.0.1:
-   version "1.0.1"
-   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
- 
-@@ -806,6 +920,10 @@
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
- 
-+async@1.x, async@^1.4.0:
-+  version "1.5.2"
-+  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
-+
- async@^2.0.0:
-   version "2.5.0"
-   resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d"
-@@ -944,6 +1062,19 @@
-     slash "^1.0.0"
-     source-map "^0.5.7"
- 
-+babel-generator@^6.18.0:
-+  version "6.26.1"
-+  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
-+  dependencies:
-+    babel-messages "^6.23.0"
-+    babel-runtime "^6.26.0"
-+    babel-types "^6.26.0"
-+    detect-indent "^4.0.0"
-+    jsesc "^1.3.0"
-+    lodash "^4.17.4"
-+    source-map "^0.5.7"
-+    trim-right "^1.0.1"
-+
- babel-generator@^6.26.0:
-   version "6.26.0"
-   resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.0.tgz#ac1ae20070b79f6e3ca1d3269613053774f20dc5"
-@@ -1177,7 +1308,7 @@
-     core-js "^2.4.0"
-     regenerator-runtime "^0.10.0"
- 
--babel-template@^6.24.1, babel-template@^6.26.0:
-+babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.26.0:
-   version "6.26.0"
-   resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
-   dependencies:
-@@ -1187,7 +1318,7 @@
-     babylon "^6.18.0"
-     lodash "^4.17.4"
- 
--babel-traverse@^6.26.0:
-+babel-traverse@^6.18.0, babel-traverse@^6.26.0:
-   version "6.26.0"
-   resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
-   dependencies:
-@@ -1201,7 +1332,7 @@
-     invariant "^2.2.2"
-     lodash "^4.17.4"
- 
--babel-types@^6.26.0:
-+babel-types@^6.18.0, babel-types@^6.26.0:
-   version "6.26.0"
-   resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
-   dependencies:
-@@ -1570,6 +1701,14 @@
-     union-value "^1.0.0"
-     unset-value "^1.0.0"
- 
-+caching-transform@^1.0.0:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/caching-transform/-/caching-transform-1.0.1.tgz#6dbdb2f20f8d8fbce79f3e94e9d1742dcdf5c0a1"
-+  dependencies:
-+    md5-hex "^1.2.0"
-+    mkdirp "^0.5.1"
-+    write-file-atomic "^1.1.4"
-+
- caller-path@^0.1.0:
-   version "0.1.0"
-   resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
-@@ -1594,6 +1733,10 @@
-     camelcase "^2.0.0"
-     map-obj "^1.0.0"
- 
-+camelcase@^1.0.2:
-+  version "1.2.1"
-+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
-+
- camelcase@^2.0.0:
-   version "2.1.1"
-   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
-@@ -1631,6 +1774,13 @@
-   version "0.12.0"
-   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
- 
-+center-align@^0.1.1:
-+  version "0.1.3"
-+  resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
-+  dependencies:
-+    align-text "^0.1.3"
-+    lazy-cache "^1.0.3"
-+
- chai-as-promised@^7.1.1:
-   version "7.1.1"
-   resolved "https://registry.yarnpkg.com/chai-as-promised/-/chai-as-promised-7.1.1.tgz#08645d825deb8696ee61725dbf590c012eb00ca0"
-@@ -1796,6 +1946,14 @@
-     exit "0.1.2"
-     glob "^7.1.1"
- 
-+cliui@^2.1.0:
-+  version "2.1.0"
-+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
-+  dependencies:
-+    center-align "^0.1.1"
-+    right-align "^0.1.1"
-+    wordwrap "0.0.2"
-+
- cliui@^3.2.0:
-   version "3.2.0"
-   resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
-@@ -2080,6 +2238,13 @@
-     lru-cache "^4.0.1"
-     which "^1.2.9"
- 
-+cross-spawn@^4:
-+  version "4.0.2"
-+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41"
-+  dependencies:
-+    lru-cache "^4.0.1"
-+    which "^1.2.9"
-+
- cross-spawn@^5.0.1, cross-spawn@^5.1.0:
-   version "5.1.0"
-   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
-@@ -2276,6 +2441,10 @@
-   version "0.1.4"
-   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
- 
-+debug-log@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/debug-log/-/debug-log-1.0.1.tgz#2307632d4c04382b8df8a32f70b895046d52745f"
-+
- debug@2.6.9, debug@^2.1.2, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
-   version "2.6.9"
-   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-@@ -2292,7 +2461,7 @@
-   version "1.0.1"
-   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
- 
--decamelize@^1.1.1, decamelize@^1.1.2:
-+decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
-   version "1.2.0"
-   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
- 
-@@ -2336,6 +2505,12 @@
-   version "1.3.2"
-   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-1.3.2.tgz#1663691629d4dbfe364fa12a2a4f0aa86aa3a050"
- 
-+default-require-extensions@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-1.0.0.tgz#f37ea15d3e13ffd9b437d33e1a75b5fb97874cb8"
-+  dependencies:
-+    strip-bom "^2.0.0"
-+
- define-properties@^1.1.2:
-   version "1.1.2"
-   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94"
-@@ -2830,6 +3005,17 @@
-   version "1.0.5"
-   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
- 
-+escodegen@1.8.x:
-+  version "1.8.1"
-+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.8.1.tgz#5a5b53af4693110bebb0867aa3430dd3b70a1018"
-+  dependencies:
-+    esprima "^2.7.1"
-+    estraverse "^1.9.1"
-+    esutils "^2.0.2"
-+    optionator "^0.8.1"
-+  optionalDependencies:
-+    source-map "~0.2.0"
-+
- eslint-config-prettier@^2.9.0:
-   version "2.9.0"
-   resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-2.9.0.tgz#5ecd65174d486c22dff389fe036febf502d468a3"
-@@ -2947,7 +3133,7 @@
-     acorn "^5.6.0"
-     acorn-jsx "^4.1.1"
- 
--esprima@^2.6.0:
-+esprima@2.7.x, esprima@^2.6.0, esprima@^2.7.1:
-   version "2.7.3"
-   resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
- 
-@@ -2968,6 +3154,10 @@
-     estraverse "^4.1.0"
-     object-assign "^4.0.1"
- 
-+estraverse@^1.9.1:
-+  version "1.9.3"
-+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44"
-+
- estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1:
-   version "4.2.0"
-   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
-@@ -3236,6 +3426,14 @@
-     statuses "~1.4.0"
-     unpipe "~1.0.0"
- 
-+find-cache-dir@^0.1.1:
-+  version "0.1.1"
-+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-0.1.1.tgz#c8defae57c8a52a8a784f9e31c57c742e993a0b9"
-+  dependencies:
-+    commondir "^1.0.1"
-+    mkdirp "^0.5.1"
-+    pkg-dir "^1.0.0"
-+
- find-cache-dir@^1.0.0:
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
-@@ -3308,6 +3506,13 @@
-   version "2.0.5"
-   resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
- 
-+foreground-child@^1.5.3, foreground-child@^1.5.6:
-+  version "1.5.6"
-+  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-1.5.6.tgz#4fd71ad2dfde96789b980a5c0a295937cb2f5ce9"
-+  dependencies:
-+    cross-spawn "^4"
-+    signal-exit "^3.0.0"
-+
- forever-agent@~0.6.1:
-   version "0.6.1"
-   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-@@ -3555,7 +3760,7 @@
-     is-glob "^3.1.0"
-     path-dirname "^1.0.0"
- 
--glob@7.1.2, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1:
-+glob@7.1.2, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1:
-   version "7.1.2"
-   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
-   dependencies:
-@@ -3566,6 +3771,19 @@
-     once "^1.3.0"
-     path-is-absolute "^1.0.0"
- 
-+<<<<<<< .our
-+=======
-+glob@^5.0.15, glob@^5.0.3:
-+  version "5.0.15"
-+  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
-+  dependencies:
-+    inflight "^1.0.4"
-+    inherits "2"
-+    minimatch "2 || 3"
-+    once "^1.3.0"
-+    path-is-absolute "^1.0.0"
-+
-+>>>>>>> .their
- glob@^6.0.4:
-   version "6.0.4"
-   resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
-@@ -3586,6 +3804,10 @@
-   version "11.7.0"
-   resolved "https://registry.yarnpkg.com/globals/-/globals-11.7.0.tgz#a583faa43055b1aca771914bf68258e2fc125673"
- 
-+globals@^11.1.0:
-+  version "11.7.0"
-+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.7.0.tgz#a583faa43055b1aca771914bf68258e2fc125673"
-+
- globals@^9.18.0:
-   version "9.18.0"
-   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
-@@ -3640,6 +3862,16 @@
-     duplexer "^0.1.1"
-     pify "^3.0.0"
- 
-+handlebars@^4.0.1, handlebars@^4.0.11:
-+  version "4.0.11"
-+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.11.tgz#630a35dfe0294bc281edae6ffc5d329fc7982dcc"
-+  dependencies:
-+    async "^1.4.0"
-+    optimist "^0.6.1"
-+    source-map "^0.4.4"
-+  optionalDependencies:
-+    uglify-js "^2.6"
-+
- har-schema@^1.0.5:
-   version "1.0.5"
-   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
-@@ -4030,6 +4262,12 @@
-   version "1.0.4"
-   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.4.tgz#820cdd588b868ffb191a809506d6c9c8f212b1b0"
- 
-+invariant@^2.2.0:
-+  version "2.2.4"
-+  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
-+  dependencies:
-+    loose-envify "^1.0.0"
-+
- invariant@^2.2.2:
-   version "2.2.2"
-   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
-@@ -4342,6 +4580,88 @@
-   version "0.1.2"
-   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
- 
-+istanbul-lib-coverage@^1.1.2, istanbul-lib-coverage@^1.2.0:
-+  version "1.2.0"
-+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.0.tgz#f7d8f2e42b97e37fe796114cb0f9d68b5e3a4341"
-+
-+istanbul-lib-coverage@^2.0.1:
-+  version "2.0.1"
-+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#2aee0e073ad8c5f6a0b00e0dfbf52b4667472eda"
-+
-+istanbul-lib-hook@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.1.0.tgz#8538d970372cb3716d53e55523dd54b557a8d89b"
-+  dependencies:
-+    append-transform "^0.4.0"
-+
-+istanbul-lib-instrument@^1.10.1:
-+  version "1.10.1"
-+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.1.tgz#724b4b6caceba8692d3f1f9d0727e279c401af7b"
-+  dependencies:
-+    babel-generator "^6.18.0"
-+    babel-template "^6.16.0"
-+    babel-traverse "^6.18.0"
-+    babel-types "^6.18.0"
-+    babylon "^6.18.0"
-+    istanbul-lib-coverage "^1.2.0"
-+    semver "^5.3.0"
-+
-+istanbul-lib-instrument@^2.1.0:
-+  version "2.3.2"
-+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-2.3.2.tgz#b287cbae2b5f65f3567b05e2e29b275eaf92d25e"
-+  dependencies:
-+    "@babel/generator" "7.0.0-beta.51"
-+    "@babel/parser" "7.0.0-beta.51"
-+    "@babel/template" "7.0.0-beta.51"
-+    "@babel/traverse" "7.0.0-beta.51"
-+    "@babel/types" "7.0.0-beta.51"
-+    istanbul-lib-coverage "^2.0.1"
-+    semver "^5.5.0"
-+
-+istanbul-lib-report@^1.1.3:
-+  version "1.1.3"
-+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.3.tgz#2df12188c0fa77990c0d2176d2d0ba3394188259"
-+  dependencies:
-+    istanbul-lib-coverage "^1.1.2"
-+    mkdirp "^0.5.1"
-+    path-parse "^1.0.5"
-+    supports-color "^3.1.2"
-+
-+istanbul-lib-source-maps@^1.2.5:
-+  version "1.2.5"
-+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.5.tgz#ffe6be4e7ab86d3603e4290d54990b14506fc9b1"
-+  dependencies:
-+    debug "^3.1.0"
-+    istanbul-lib-coverage "^1.2.0"
-+    mkdirp "^0.5.1"
-+    rimraf "^2.6.1"
-+    source-map "^0.5.3"
-+
-+istanbul-reports@^1.4.1:
-+  version "1.5.0"
-+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.5.0.tgz#c6c2867fa65f59eb7dcedb7f845dfc76aaee70f9"
-+  dependencies:
-+    handlebars "^4.0.11"
-+
-+istanbul@^0.4.5:
-+  version "0.4.5"
-+  resolved "https://registry.yarnpkg.com/istanbul/-/istanbul-0.4.5.tgz#65c7d73d4c4da84d4f3ac310b918fb0b8033733b"
-+  dependencies:
-+    abbrev "1.0.x"
-+    async "1.x"
-+    escodegen "1.8.x"
-+    esprima "2.7.x"
-+    glob "^5.0.15"
-+    handlebars "^4.0.1"
-+    js-yaml "3.x"
-+    mkdirp "0.5.x"
-+    nopt "3.x"
-+    once "1.x"
-+    resolve "1.1.x"
-+    supports-color "^3.1.0"
-+    which "^1.1.1"
-+    wordwrap "^1.0.0"
-+
- jest-docblock@^21.0.0:
-   version "21.2.0"
-   resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-21.2.0.tgz#51529c3b30d5fd159da60c27ceedc195faf8d414"
-@@ -4368,16 +4688,28 @@
-   version "3.0.2"
-   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
- 
-+<<<<<<< .our
- js-yaml@^3.10.0:
-   version "3.10.0"
-   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc"
-+=======
-+js-yaml@3.x, js-yaml@^3.12.0:
-+  version "3.12.0"
-+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
-+>>>>>>> .their
-   dependencies:
-     argparse "^1.0.7"
-     esprima "^4.0.0"
- 
-+<<<<<<< .our
- js-yaml@^3.11.0, js-yaml@^3.12.0:
-   version "3.12.0"
-   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
-+=======
-+js-yaml@^3.10.0, js-yaml@^3.9.1:
-+  version "3.10.0"
-+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc"
-+>>>>>>> .their
-   dependencies:
-     argparse "^1.0.7"
-     esprima "^4.0.0"
-@@ -4408,6 +4740,10 @@
-   version "1.3.0"
-   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
- 
-+jsesc@^2.5.1:
-+  version "2.5.1"
-+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.1.tgz#e421a2a8e20d6b0819df28908f782526b96dd1fe"
-+
- jsesc@~0.5.0:
-   version "0.5.0"
-   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
-@@ -4554,6 +4890,10 @@
-   dependencies:
-     package-json "^4.0.0"
- 
-+lazy-cache@^1.0.3:
-+  version "1.0.4"
-+  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
-+
- lazy-cache@^2.0.2:
-   version "2.0.2"
-   resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-2.0.2.tgz#b9190a4f913354694840859f8a8f7084d8822264"
-@@ -4739,6 +5079,10 @@
-   version "3.2.0"
-   resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b"
- 
-+longest@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
-+
- loose-envify@^1.0.0, loose-envify@^1.3.1:
-   version "1.3.1"
-   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
-@@ -4806,6 +5150,16 @@
-   version "1.2.17"
-   resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac"
- 
-+md5-hex@^1.2.0:
-+  version "1.3.0"
-+  resolved "https://registry.yarnpkg.com/md5-hex/-/md5-hex-1.3.0.tgz#d2c4afe983c4370662179b8cad145219135046c4"
-+  dependencies:
-+    md5-o-matic "^0.1.1"
-+
-+md5-o-matic@^0.1.1:
-+  version "0.1.1"
-+  resolved "https://registry.yarnpkg.com/md5-o-matic/-/md5-o-matic-0.1.1.tgz#822bccd65e117c514fab176b25945d54100a03c3"
-+
- md5.js@^1.3.4:
-   version "1.3.4"
-   resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d"
-@@ -4849,11 +5203,17 @@
-   version "1.0.1"
-   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
- 
-+merge-source-map@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646"
-+  dependencies:
-+    source-map "^0.6.1"
-+
- methods@~1.1.2:
-   version "1.1.2"
-   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
- 
--micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9:
-+micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9:
-   version "3.1.10"
-   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
-   dependencies:
-@@ -4995,7 +5355,7 @@
-   dependencies:
-     minimist "0.0.8"
- 
--mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
-+mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
-   version "0.5.1"
-   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-   dependencies:
-@@ -5208,7 +5568,7 @@
-     is-promise "~1.0.0"
-     promise "~1.3.0"
- 
--"nopt@2 || 3", nopt@^3.0.1:
-+"nopt@2 || 3", nopt@3.x, nopt@^3.0.1:
-   version "3.0.6"
-   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
-   dependencies:
-@@ -5311,6 +5671,38 @@
-   version "1.0.1"
-   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
- 
-+nyc@^12.0.2:
-+  version "12.0.2"
-+  resolved "https://registry.yarnpkg.com/nyc/-/nyc-12.0.2.tgz#8a4a4ed690966c11ec587ff87eea0c12c974ba99"
-+  dependencies:
-+    archy "^1.0.0"
-+    arrify "^1.0.1"
-+    caching-transform "^1.0.0"
-+    convert-source-map "^1.5.1"
-+    debug-log "^1.0.1"
-+    default-require-extensions "^1.0.0"
-+    find-cache-dir "^0.1.1"
-+    find-up "^2.1.0"
-+    foreground-child "^1.5.3"
-+    glob "^7.0.6"
-+    istanbul-lib-coverage "^1.2.0"
-+    istanbul-lib-hook "^1.1.0"
-+    istanbul-lib-instrument "^2.1.0"
-+    istanbul-lib-report "^1.1.3"
-+    istanbul-lib-source-maps "^1.2.5"
-+    istanbul-reports "^1.4.1"
-+    md5-hex "^1.2.0"
-+    merge-source-map "^1.1.0"
-+    micromatch "^3.1.10"
-+    mkdirp "^0.5.0"
-+    resolve-from "^2.0.0"
-+    rimraf "^2.6.2"
-+    signal-exit "^3.0.1"
-+    spawn-wrap "^1.4.2"
-+    test-exclude "^4.2.0"
-+    yargs "11.1.0"
-+    yargs-parser "^8.0.0"
-+
- oauth-sign@~0.8.1, oauth-sign@~0.8.2:
-   version "0.8.2"
-   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
-@@ -5366,7 +5758,7 @@
-   dependencies:
-     ee-first "1.1.1"
- 
--once@^1.3.0, once@^1.3.1, once@^1.4.0:
-+once@1.x, once@^1.3.0, once@^1.3.1, once@^1.4.0:
-   version "1.4.0"
-   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-   dependencies:
-@@ -5382,14 +5774,14 @@
-   version "1.4.3"
-   resolved "https://registry.yarnpkg.com/opener/-/opener-1.4.3.tgz#5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"
- 
--optimist@~0.6.1:
-+optimist@^0.6.1, optimist@~0.6.1:
-   version "0.6.1"
-   resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
-   dependencies:
-     minimist "~0.0.1"
-     wordwrap "~0.0.2"
- 
--optionator@^0.8.2:
-+optionator@^0.8.1, optionator@^0.8.2:
-   version "0.8.2"
-   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
-   dependencies:
-@@ -5404,7 +5796,7 @@
-   version "0.2.1"
-   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.2.1.tgz#63fc4ccee5d2d7763d26bbf8601078e6c2e0044f"
- 
--os-homedir@^1.0.0:
-+os-homedir@^1.0.0, os-homedir@^1.0.1:
-   version "1.0.2"
-   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
- 
-@@ -5661,6 +6053,12 @@
-   version "2.0.4"
-   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
- 
-+pkg-dir@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4"
-+  dependencies:
-+    find-up "^1.0.0"
-+
- pkg-dir@^2.0.0:
-   version "2.0.0"
-   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
-@@ -6387,7 +6785,7 @@
-   version "1.1.2"
-   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
- 
--repeat-string@^1.6.1:
-+repeat-string@^1.5.2, repeat-string@^1.6.1:
-   version "1.6.1"
-   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
- 
-@@ -6505,10 +6903,18 @@
-   version "1.0.1"
-   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
- 
-+resolve-from@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-2.0.0.tgz#9480ab20e94ffa1d9e80a804c7ea147611966b57"
-+
- resolve-url@^0.2.1, resolve-url@~0.2.1:
-   version "0.2.1"
-   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
- 
-+resolve@1.1.x:
-+  version "1.1.7"
-+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
-+
- resolve@^1.1.6, resolve@^1.3.2:
-   version "1.5.0"
-   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36"
-@@ -6530,6 +6936,12 @@
-   version "0.1.0"
-   resolved "https://registry.yarnpkg.com/rgb2hex/-/rgb2hex-0.1.0.tgz#ccd55f860ae0c5c4ea37504b958e442d8d12325b"
- 
-+right-align@^0.1.1:
-+  version "0.1.3"
-+  resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
-+  dependencies:
-+    align-text "^0.1.1"
-+
- rimraf@2, rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
-   version "2.6.2"
-   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
-@@ -6787,7 +7199,7 @@
-   version "0.3.0"
-   resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.3.0.tgz#3596e6307a781544f591f37da618360f31db57b1"
- 
--signal-exit@^3.0.0, signal-exit@^3.0.2:
-+signal-exit@^3.0.0, signal-exit@^3.0.1, signal-exit@^3.0.2:
-   version "3.0.2"
-   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
- 
-@@ -6807,7 +7219,7 @@
-   dependencies:
-     is-fullwidth-code-point "^2.0.0"
- 
--slide@~1.1.3:
-+slide@^1.1.5, slide@~1.1.3:
-   version "1.1.6"
-   resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
- 
-@@ -6906,7 +7318,7 @@
-   version "0.3.0"
-   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.3.0.tgz#7ecaf13b57bcd09da8a40c5d269db33799d4aaf9"
- 
--source-map@0.5.x, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.3:
-+source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1, source-map@~0.5.3:
-   version "0.5.7"
-   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
- 
-@@ -6916,7 +7328,7 @@
-   dependencies:
-     amdefine ">=0.0.4"
- 
--source-map@^0.4.2:
-+source-map@^0.4.2, source-map@^0.4.4:
-   version "0.4.4"
-   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
-   dependencies:
-@@ -6926,6 +7338,23 @@
-   version "0.6.1"
-   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
- 
-+source-map@~0.2.0:
-+  version "0.2.0"
-+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"
-+  dependencies:
-+    amdefine ">=0.0.4"
-+
-+spawn-wrap@^1.4.2:
-+  version "1.4.2"
-+  resolved "https://registry.yarnpkg.com/spawn-wrap/-/spawn-wrap-1.4.2.tgz#cff58e73a8224617b6561abdc32586ea0c82248c"
-+  dependencies:
-+    foreground-child "^1.5.6"
-+    mkdirp "^0.5.0"
-+    os-homedir "^1.0.1"
-+    rimraf "^2.6.2"
-+    signal-exit "^3.0.2"
-+    which "^1.3.0"
-+
- spdx-correct@~1.0.0:
-   version "1.0.2"
-   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
-@@ -7166,7 +7595,7 @@
-   version "2.0.0"
-   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
- 
--supports-color@^3.1.2, supports-color@^3.2.3, supports-color@~3.2.3:
-+supports-color@^3.1.0, supports-color@^3.1.2, supports-color@^3.2.3, supports-color@~3.2.3:
-   version "3.2.3"
-   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
-   dependencies:
-@@ -7266,7 +7695,21 @@
-   dependencies:
-     execa "^0.7.0"
- 
-+<<<<<<< .our
- text-table@^0.2.0:
-+=======
-+test-exclude@^4.2.0:
-+  version "4.2.1"
-+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.2.1.tgz#dfa222f03480bca69207ca728b37d74b45f724fa"
-+  dependencies:
-+    arrify "^1.0.1"
-+    micromatch "^3.1.8"
-+    object-assign "^4.1.0"
-+    read-pkg-up "^1.0.1"
-+    require-main-filename "^1.0.1"
-+
-+text-table@~0.2.0:
-+>>>>>>> .their
-   version "0.2.0"
-   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
- 
-@@ -7332,6 +7775,10 @@
-   version "1.0.3"
-   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
- 
-+to-fast-properties@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
-+
- to-no-case@^1.0.0:
-   version "1.0.2"
-   resolved "https://registry.yarnpkg.com/to-no-case/-/to-no-case-1.0.2.tgz#c722907164ef6b178132c8e69930212d1b4aa16a"
-@@ -7559,6 +8006,19 @@
-     commander "~2.11.0"
-     source-map "~0.6.1"
- 
-+uglify-js@^2.6:
-+  version "2.8.29"
-+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
-+  dependencies:
-+    source-map "~0.5.1"
-+    yargs "~3.10.0"
-+  optionalDependencies:
-+    uglify-to-browserify "~1.0.0"
-+
-+uglify-to-browserify@~1.0.0:
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
-+
- uglifyjs-webpack-plugin@^1.2.4:
-   version "1.2.5"
-   resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.5.tgz#2ef8387c8f1a903ec5e44fa36f9f3cbdcea67641"
-@@ -7954,7 +8414,11 @@
-   dependencies:
-     isexe "^2.0.0"
- 
-+<<<<<<< .our
- which@^1.2.10:
-+=======
-+which@^1.1.1:
-+>>>>>>> .their
-   version "1.3.1"
-   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-   dependencies:
-@@ -7972,6 +8436,7 @@
-   dependencies:
-     string-width "^1.0.1"
- 
-+<<<<<<< .our
- winston@^2.4.0:
-   version "2.4.3"
-   resolved "https://registry.yarnpkg.com/winston/-/winston-2.4.3.tgz#7a9fdab371b6d3d9b63a592947846d856948c517"
-@@ -7986,11 +8451,24 @@
- wordwrap@~0.0.2:
-   version "0.0.3"
-   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
-+=======
-+window-size@0.1.0:
-+  version "0.1.0"
-+  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
-+>>>>>>> .their
- 
--wordwrap@~1.0.0:
-+wordwrap@0.0.2:
-+  version "0.0.2"
-+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
-+
-+wordwrap@^1.0.0, wordwrap@~1.0.0:
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
- 
-+wordwrap@~0.0.2:
-+  version "0.0.3"
-+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
-+
- worker-farm@^1.3.1:
-   version "1.5.1"
-   resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.5.1.tgz#8e9f4a7da4f3c595aa600903051b969390423fa1"
-@@ -8015,6 +8493,14 @@
-   version "1.0.2"
-   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
- 
-+write-file-atomic@^1.1.4:
-+  version "1.3.4"
-+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-1.3.4.tgz#f807a4f0b1d9e913ae7a48112e6cc3af1991b45f"
-+  dependencies:
-+    graceful-fs "^4.1.11"
-+    imurmurhash "^0.1.4"
-+    slide "^1.1.5"
-+
- write-file-atomic@^2.0.0:
-   version "2.3.0"
-   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab"
-@@ -8129,6 +8615,35 @@
-   dependencies:
-     camelcase "^3.0.0"
- 
-+yargs-parser@^8.0.0:
-+  version "8.1.0"
-+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-8.1.0.tgz#f1376a33b6629a5d063782944da732631e966950"
-+  dependencies:
-+    camelcase "^4.1.0"
-+
-+yargs-parser@^9.0.2:
-+  version "9.0.2"
-+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"
-+  dependencies:
-+    camelcase "^4.1.0"
-+
-+yargs@11.1.0:
-+  version "11.1.0"
-+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.0.tgz#90b869934ed6e871115ea2ff58b03f4724ed2d77"
-+  dependencies:
-+    cliui "^4.0.0"
-+    decamelize "^1.1.1"
-+    find-up "^2.1.0"
-+    get-caller-file "^1.0.1"
-+    os-locale "^2.0.0"
-+    require-directory "^2.1.1"
-+    require-main-filename "^1.0.1"
-+    set-blocking "^2.0.0"
-+    string-width "^2.0.0"
-+    which-module "^2.0.0"
-+    y18n "^3.2.1"
-+    yargs-parser "^9.0.2"
-+
- yargs@^12.0.1:
-   version "12.0.1"
-   resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.1.tgz#6432e56123bb4e7c3562115401e98374060261c2"
-@@ -8164,6 +8679,15 @@
-     y18n "^3.2.1"
-     yargs-parser "^5.0.0"
- 
-+yargs@~3.10.0:
-+  version "3.10.0"
-+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
-+  dependencies:
-+    camelcase "^1.0.2"
-+    cliui "^2.1.0"
-+    decamelize "^1.0.0"
-+    window-size "0.1.0"
-+
- yauzl@2.4.1:
-   version "2.4.1"
-   resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz#9528f442dab1b2284e58b4379bb194e22e0c4005"
diff --git a/app/test/fixtures/merge-parser/desktop/merge-know-when-to-give-up-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-know-when-to-give-up-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index d4634b9cdb9..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-know-when-to-give-up-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,117 +0,0 @@
-changed in both
-  base   100644 b7fc04813074a6cb7cb041abf9f2f656f80bc05d app/src/lib/git/diff.ts
-  our    100644 c7b70925514f334e2076ddb67f208c2f3f12672f app/src/lib/git/diff.ts
-  their  100644 ae8fe832c53bbaf4e756eb43dec1f4d4c94c6ce8 app/src/lib/git/diff.ts
-@@ -41,6 +41,14 @@
- const MaxReasonableDiffSize = MaxDiffBufferSize / 16 // ~4.375MB in decimal
- 
- /**
-+ * Where `MaxReasonableDiffSize` is a soft limit, and `MaxDiffBufferSize`
-+ * is an absolute limit, this is the MAX number of bytes to read from the
-+ * buffer before _assuming_ the current buffer being read is `MaxDiffBufferSize`.
-+ * This is done so that the UI isn't waiting for the entire buffer to be read.
-+ */
-+const MaxBytesToRead = MaxDiffBufferSize / 8 //~32MB
-+
-+/**
-  * The longest line length we should try to display. If a diff has a line longer
-  * than this, we probably shouldn't attempt it
-  */
-@@ -115,11 +123,24 @@
-     args.push(file.oldPath)
-   }
- 
--  const { output } = await spawnAndComplete(
-+  const { output, didReadAllBytes } = await spawnAndComplete(
-     args,
-     repository.path,
--    'getCommitDiff'
-+    'getCommitDiff',
-+    undefined,
-+    MaxBytesToRead
-   )
-+<<<<<<< .our
-+=======
-+  if (!didReadAllBytes || isBufferTooLarge(output)) {
-+    return { kind: DiffType.TooLarge, length: output.length }
-+  }
-+
-+  const diffText = diffFromRawDiffOutput(output)
-+  if (isDiffTooLarge(diffText)) {
-+    return { kind: DiffType.TooLarge, length: output.length }
-+  }
-+>>>>>>> .their
- 
-   return buildDiff(output, repository, file, commitish)
- }
-@@ -192,12 +213,28 @@
-     ]
-   }
- 
--  const { output, error } = await spawnAndComplete(
-+  const { output, error, didReadAllBytes } = await spawnAndComplete(
-     args,
-     repository.path,
-     'getWorkingDirectoryDiff',
--    successExitCodes
-+    successExitCodes,
-+    MaxBytesToRead
-   )
-+<<<<<<< .our
-+=======
-+  if (!didReadAllBytes || isBufferTooLarge(output)) {
-+    // we know we can't transform this process output into a diff, so let's
-+    // just return a placeholder for now that we can display to the user
-+    // to say we're at the limits of the runtime
-+    return { kind: DiffType.TooLarge, length: output.length }
-+  }
-+
-+  const diffText = diffFromRawDiffOutput(output)
-+  if (isDiffTooLarge(diffText)) {
-+    return { kind: DiffType.TooLarge, length: output.length }
-+  }
-+
-+>>>>>>> .their
-   const lineEndingsChange = parseLineEndingsWarning(error)
- 
-   return buildDiff(output, repository, file, 'HEAD', lineEndingsChange)
-changed in both
-  base   100644 d911e4235f5a1e8e056f9d98d4a6fda3d76dcaea app/src/lib/git/spawn.ts
-  our    100644 143168d54995f923711aa352fff4365067b90676 app/src/lib/git/spawn.ts
-  their  100644 79576b0f30fd4b538b4a0c98b1b7a0bb7f68373a app/src/lib/git/spawn.ts
-@@ -4,7 +4,11 @@
- type ProcessOutput = {
-   /** The contents of stdout received from the spawned process */
-   output: Buffer
-+<<<<<<< .our
-   /** The contents of stderr received from the spawned process */
-+=======
-+  didReadAllBytes: boolean
-+>>>>>>> .their
-   error: Buffer
-   /** The exit code returned by the spawned process */
-   exitCode: number
-@@ -38,6 +42,7 @@
-         const process = GitProcess.spawn(args, path)
-         let totalStdoutLength = 0
-         let killSignalSent = false
-+        let didReadAllBytes = true
- 
-         const stdoutChunks = new Array<Buffer>()
-         process.stdout.on('data', (chunk: Buffer) => {
-@@ -53,6 +58,7 @@
-           ) {
-             process.kill()
-             killSignalSent = true
-+            didReadAllBytes = false
-           }
-         })
- 
-@@ -84,6 +90,7 @@
-           if (exitCodes.has(code) || signal) {
-             resolve({
-               output: stdout,
-+              didReadAllBytes,
-               error: stderr,
-               exitCode: code,
-             })
diff --git a/app/test/fixtures/merge-parser/desktop/merge-make-cli-work-under-wsl-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-make-cli-work-under-wsl-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index a1bdabb7ba1..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-make-cli-work-under-wsl-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,95 +0,0 @@
-changed in both
-  base   100644 b13703f3e3796ee821d21e064667c25a04b8b3a0 app/package.json
-  our    100644 4ec686d8ad22d3aea1ebe4bddd16f4a7447c3acd app/package.json
-  their  100644 e9d531afe0249f4443fe4f49b08c15d54c092af7 app/package.json
-@@ -3,7 +3,11 @@
-   "productName": "GitHub Desktop",
-   "bundleID": "com.github.GitHubClient",
-   "companyName": "GitHub, Inc.",
-+<<<<<<< .our
-   "version": "1.3.4",
-+=======
-+  "version": "1.3.3-test10",
-+>>>>>>> .their
-   "main": "./main.js",
-   "repository": {
-     "type": "git",
-merged
-  result 100644 9816ea99ea5d4c3d087ff4c597e475e91d7b39de app/src/main-process/squirrel-updater.ts
-  our    100644 5f8bcfd5aa2b2f30f81fe1cd9a2973bcc9b9f14f app/src/main-process/squirrel-updater.ts
-@@ -66,7 +66,11 @@
- 
- function resolveVersionedPath(binPath: string, relativePath: string): string {
-   const appFolder = Path.resolve(process.execPath, '..')
--  return Path.relative(binPath, Path.join(appFolder, relativePath))
-+  const computedPath = Path.relative(
-+    binPath,
-+    Path.join(appFolder, relativePath)
-+  )
-+  return Path.normalize(computedPath)
- }
- 
- /**
-merged
-  result 100644 cf35271e198c33e39f3944490d0c8620bdecde6a app/static/win32/github.sh
-  our    100644 f0b800ac6aec942dbb1ac6e7dae646097ea194de app/static/win32/github.sh
-@@ -2,7 +2,26 @@
- 
- CONTENTS="$(dirname "$(dirname "$(dirname "$(dirname "$(realpath "$0")")")")")"
- ELECTRON="$CONTENTS/GitHubDesktop.exe"
--CLI="$CONTENTS/Resources/app/cli.js"
-+
-+if grep -q Microsoft /proc/version; then
-+	if [ -x /bin/wslpath ]; then
-+		# On recent WSL builds, we just need to set WSLENV so that
-+		# ELECTRON_RUN_AS_NODE is visible to the win32 process
-+		export WSLENV=ELECTRON_RUN_AS_NODE/w:$WSLENV
-+		CLI=$(wslpath -m "$CONTENTS/resources/app/cli.js")
-+	else
-+		# If running under older WSL, don't pass cli.js to Electron as
-+		# environment vars cannot be transferred from WSL to Windows
-+		# See: https://github.com/Microsoft/BashOnWindows/issues/1363
-+		#      https://github.com/Microsoft/BashOnWindows/issues/1494
-+		"$ELECTRON" "$@"
-+		exit $?
-+	fi
-+elif [ "$(expr substr $(uname -s) 1 9)" == "CYGWIN_NT" ]; then
-+	CLI=$(cygpath -m "$CONTENTS/resources/app/cli.js")
-+else
-+	CLI="$CONTENTS/resources/app/cli.js"
-+fi
- 
- ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
- 
-changed in both
-  base   100644 52bffc3fc39049f5f0ef995bf6f11b9f81e9a5ac changelog.json
-  our    100644 13ed8d504719e064f71338f54d32111020190af5 changelog.json
-  their  100644 b260ca958409aebfedbefd96ed9f2db017d896cc changelog.json
-@@ -1,5 +1,6 @@
- {
-   "releases": {
-+<<<<<<< .our
-     "1.3.4": [
-       "[Improved] Cloning message uses remote repo name not file destination - #5413. Thanks @lisavogtsf!",
-       "[Improved] Support VSCode user scope installation - #5281. Thanks @saschanaz!"
-@@ -15,6 +16,10 @@
-       "[Fixed] 'Clone repository' menu item label is obscured on Windows - #5348. Thanks @Daniel-McCarthy!",
-       "[Fixed] User can toggle files when commit is in progress - #5341. Thanks @masungwon!",
-       "[Improved] Repository indicator background work - #5317 #5326 #5363 #5241 #5320"
-+=======
-+    "1.3.3-test10": [
-+      "Testing command line integration changes to support WSL"
-+>>>>>>> .their
-     ],
-     "1.3.3-beta1": [
-       "[Fixed] Maximize and restore app on Windows does not fill available space - #5033",
-@@ -22,6 +27,9 @@
-       "[Fixed] User can toggle files when commit is in progress - #5341. Thanks @masungwon!",
-       "[Improved] Repository indicator background work - #5317 #5326 #5363 #5241 #5320"
-     ],
-+    "1.3.3-test7": [
-+      "Testing command line integration changes to support WSL"
-+    ],
-     "1.3.3-test6": [
-       "Testing infrastructure changes"
-     ],
diff --git a/app/test/fixtures/merge-parser/desktop/merge-mr-clean-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-mr-clean-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index 33db2357620..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-mr-clean-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,1961 +0,0 @@
-changed in both
-  base   100644 eead3dcf0fdacf7030ad7c485f203f058ebf96bf app/src/lib/databases/pull-request-database.ts
-  our    100644 7446a4ce1ebf104f7825a7757e6be2beccfbe4ef app/src/lib/databases/pull-request-database.ts
-  their  100644 c914a57b5e785438f9475dde8880490601fd47b7 app/src/lib/databases/pull-request-database.ts
-@@ -1,8 +1,21 @@
- import Dexie from 'dexie'
-+<<<<<<< .our
- import { APIRefState, IAPIRefStatusItem } from '../api'
- import { BaseDatabase } from './base-database'
-+=======
-+>>>>>>> .their
- 
--export interface IPullRequestRef {
-+export type RefState = 'failure' | 'pending' | 'success'
-+
-+export interface IRefStatus {
-+  readonly id: number
-+  readonly state: RefState
-+  readonly targetURL: string
-+  readonly description: string
-+  readonly context: string
-+}
-+
-+export interface IRefEntity {
-   /**
-    * The database ID of the GitHub repository in which this ref lives. It could
-    * be null if the repository was deleted on the site after the PR was opened.
-@@ -16,7 +29,7 @@
-   readonly sha: string
- }
- 
--export interface IPullRequest {
-+export interface IPullRequestEntity {
-   /**
-    * The database ID. This will be undefined if the pull request hasn't been
-    * inserted into the DB.
-@@ -33,16 +46,16 @@
-   readonly createdAt: string
- 
-   /** The ref from which the pull request's changes are coming. */
--  readonly head: IPullRequestRef
-+  readonly head: IRefEntity
- 
-   /** The ref which the pull request is targetting. */
--  readonly base: IPullRequestRef
-+  readonly base: IRefEntity
- 
-   /** The login of the author. */
-   readonly author: string
- }
- 
--export interface IPullRequestStatus {
-+export interface IPullRequestStatusEntity {
-   /**
-    * The database ID. This will be undefined if the status hasn't been inserted
-    * into the DB.
-@@ -53,7 +66,7 @@
-   readonly pullRequestId: number
- 
-   /** The status' state. */
--  readonly state: APIRefState
-+  readonly state: 'failure' | 'pending' | 'success'
- 
-   /** The number of statuses represented in this combined status. */
-   readonly totalCount: number
-@@ -66,12 +79,21 @@
-    * if the database object was created prior to status support
-    * being added in #3588
-    */
-+<<<<<<< .our
-   readonly statuses?: ReadonlyArray<IAPIRefStatusItem>
- }
- 
- export class PullRequestDatabase extends BaseDatabase {
-   public pullRequests!: Dexie.Table<IPullRequest, number>
-   public pullRequestStatus!: Dexie.Table<IPullRequestStatus, number>
-+=======
-+  readonly statuses: ReadonlyArray<IRefStatus> | undefined
-+}
-+
-+export class PullRequestDatabase extends Dexie {
-+  public pullRequests: Dexie.Table<IPullRequestEntity, number>
-+  public pullRequestStatus: Dexie.Table<IPullRequestStatusEntity, number>
-+>>>>>>> .their
- 
-   public constructor(name: string, schemaVersion?: number) {
-     super(name, schemaVersion)
-changed in both
-  base   100644 6af2df2cfc1b91598cba2821fff1162a89c901f2 app/src/lib/repository-matching.ts
-  our    100644 320c31614eb7012348f2ae7877bfb5a0b11cf5af app/src/lib/repository-matching.ts
-  their  100644 ffd9c672b3e24afaa09ce84c0d019b78a32bbea4 app/src/lib/repository-matching.ts
-@@ -48,26 +48,25 @@
- ): IMatchedGitHubRepository | null {
-   const htmlURL = getHTMLURL(account.endpoint)
-   const parsed = URL.parse(htmlURL)
--  const host = parsed.hostname
- 
-   const parsedRemote = parseRemote(remote)
-   if (!parsedRemote) {
-     return null
-   }
- 
-+  const host = parsed.hostname
-   const owner = parsedRemote.owner
-   const name = parsedRemote.name
--
-   if (
--    host &&
--    parsedRemote.hostname.toLowerCase() === host.toLowerCase() &&
--    owner &&
--    name
-+    host == null ||
-+    name == null ||
-+    owner == null ||
-+    parsedRemote.hostname.toLocaleLowerCase() !== host.toLocaleLowerCase()
-   ) {
--    return { name, owner, endpoint: account.endpoint }
-+    return null
-   }
- 
--  return null
-+  return { name, owner, endpoint: account.endpoint }
- }
- 
- /**
-changed in both
-  base   100644 700d3f933813e7f847a36b6d4955ef5f10bc88c5 app/src/lib/stores/app-store.ts
-  our    100644 1a4e387e4d192d34abfd0621b4b5ebe8cc34d8d1 app/src/lib/stores/app-store.ts
-  their  100644 e98175838c3c8006048a1876a557d0295c793a85 app/src/lib/stores/app-store.ts
-@@ -2212,9 +2212,9 @@
-     repository: Repository
-   ): Promise<Repository> {
-     const oldGitHubRepository = repository.gitHubRepository
--
-     const matchedGitHubRepository = await this.matchGitHubRepository(repository)
--    if (!matchedGitHubRepository) {
-+
-+    if (matchedGitHubRepository == null) {
-       // TODO: We currently never clear GitHub repository associations (see
-       // https://github.com/desktop/desktop/issues/1144). So we can bail early
-       // at this point.
-@@ -3348,10 +3348,12 @@
-   public async _addRepositories(
-     paths: ReadonlyArray<string>
-   ): Promise<ReadonlyArray<Repository>> {
--    const addedRepositories = new Array<Repository>()
--    const lfsRepositories = new Array<Repository>()
-+    const addedRepositories: Array<Repository> = []
-+    const lfsRepositories: Array<Repository> = []
-+
-     for (const path of paths) {
-       const validatedPath = await validatedRepositoryPath(path)
-+
-       if (validatedPath) {
-         log.info(`[AppStore] adding repository at ${validatedPath} to store`)
- 
-changed in both
-  base   100644 b692ad47edc1ec903fa137c97c0207a46d7dc97a app/src/lib/stores/pull-request-store.ts
-  our    100644 d9edf0247ea7c33ae2b508f876aa977d8a81d6d4 app/src/lib/stores/pull-request-store.ts
-  their  100644 cd86fe5febba7d37db6e7b2ff50acb6797ba6e21 app/src/lib/stores/pull-request-store.ts
-@@ -1,13 +1,14 @@
- import {
-   PullRequestDatabase,
--  IPullRequest,
--  IPullRequestStatus,
-+  IPullRequestEntity,
-+  IPullRequestStatusEntity,
-+  RefState,
-+  IRefStatus,
- } from '../databases'
- import { GitHubRepository } from '../../models/github-repository'
- import { Account } from '../../models/account'
--import { API, IAPIPullRequest } from '../api'
-+import { API, IAPIPullRequest, IAPIRefStatusItem, IAPIRepository } from '../api'
- import { fatalError, forceUnwrap } from '../fatal-error'
--import { RepositoriesStore } from './repositories-store'
- import {
-   PullRequest,
-   PullRequestRef,
-@@ -21,20 +22,77 @@
- const Decrement = (n: number) => n - 1
- const Increment = (n: number) => n + 1
- 
-+const mapAPIToEntityPullRequestStatus = (
-+  prStatus: ReadonlyArray<IAPIRefStatusItem>
-+): ReadonlyArray<IRefStatus> => {
-+  return prStatus.map(apiRefStatus => {
-+    return {
-+      id: apiRefStatus.id,
-+      state: apiRefStatus.state,
-+      targetURL: apiRefStatus.target_url,
-+      description: apiRefStatus.description,
-+      context: apiRefStatus.context,
-+    }
-+  })
-+}
-+
-+const mapAPIToEntityPullRequest = (
-+  pr: IAPIPullRequest,
-+  base: GitHubRepository,
-+  head: GitHubRepository | null = null
-+): IPullRequestEntity => {
-+  return {
-+    number: pr.number,
-+    title: pr.title,
-+    createdAt: pr.created_at,
-+    head: {
-+      ref: pr.head.ref,
-+      sha: pr.head.sha,
-+      repoId: (head && head.dbID) || null,
-+    },
-+    base: {
-+      ref: pr.base.ref,
-+      sha: pr.base.sha,
-+      repoId: base.dbID,
-+    },
-+    author: pr.user.login,
-+  }
-+}
-+
- /** The store for GitHub Pull Requests. */
- export class PullRequestStore extends TypedBaseStore<GitHubRepository> {
-   private readonly pullRequestDatabase: PullRequestDatabase
-+<<<<<<< .our
-   private readonly repositoryStore: RepositoriesStore
-   private readonly activeFetchCountPerRepository = new Map<number, number>()
-+=======
-+  private activeFetchCountPerRepository = new Map<number, number>()
-+  private findOrAddGitHubRepository: (
-+    endpoint: string,
-+    apiRepository: IAPIRepository
-+  ) => Promise<GitHubRepository>
-+  private findGitHubRepositoryById: (
-+    id: number
-+  ) => Promise<GitHubRepository | null>
-+>>>>>>> .their
- 
-   public constructor(
-     db: PullRequestDatabase,
--    repositoriesStore: RepositoriesStore
-+    findOrPutGitHubRepository: (
-+      endpoint: string,
-+      apiRepository: IAPIRepository
-+    ) => Promise<GitHubRepository>,
-+    findGitHubRepositoryById: (id: number) => Promise<GitHubRepository | null>
-   ) {
-     super()
- 
-     this.pullRequestDatabase = db
-+<<<<<<< .our
-     this.repositoryStore = repositoriesStore
-+=======
-+    this.findOrAddGitHubRepository = findOrPutGitHubRepository
-+    this.findGitHubRepositoryById = findGitHubRepositoryById
-+>>>>>>> .their
-   }
- 
-   /** Loads all pull requests against the given repository. */
-@@ -46,27 +104,52 @@
-       'Can only refresh pull requests for GitHub repositories',
-       repository.gitHubRepository
-     )
-+<<<<<<< .our
-     const apiClient = API.fromAccount(account)
-+=======
-+>>>>>>> .their
- 
-     this.updateActiveFetchCount(githubRepo, Increment)
- 
-     try {
-+<<<<<<< .our
-       const apiResult = await apiClient.fetchPullRequests(
-+=======
-+      const api = API.fromAccount(account)
-+      const apiResults = await api.fetchPullRequests(
-+>>>>>>> .their
-         githubRepo.owner.login,
-         githubRepo.name,
-         'open'
-       )
- 
-+<<<<<<< .our
-       await this.cachePullRequests(apiResult, githubRepo)
-+=======
-+      await this.writePRs(apiResults, githubRepo)
-+>>>>>>> .their
- 
-       const prs = await this.fetchPullRequestsFromCache(githubRepo)
- 
-+<<<<<<< .our
-       await this.fetchAndCachePullRequestStatus(prs, githubRepo, account)
-       await this.pruneForkedRemotes(repository, prs)
- 
-       this.emitUpdate(githubRepo)
-     } catch (error) {
-       log.warn(`Error refreshing pull requests for '${repository.name}'`, error)
-+=======
-+      await Promise.all([
-+        this.refreshStatusForPRs(prs, githubRepo, account),
-+        this.pruneForkedRemotes(repository, prs),
-+      ])
-+    } catch (error) {
-+      log.error(
-+        `Error refreshing pull requests for '${repository.name}'`,
-+        error
-+      )
-+      this.emitError(error)
-+>>>>>>> .their
-     } finally {
-       this.updateActiveFetchCount(githubRepo, Decrement)
-     }
-@@ -255,8 +338,14 @@
-     repository: GitHubRepository,
-     account: Account
-   ): Promise<void> {
-+<<<<<<< .our
-     const apiClient = API.fromAccount(account)
-     const statuses: Array<IPullRequestStatus> = []
-+=======
-+    const api = API.fromAccount(account)
-+    const statuses: Array<IPullRequestStatusEntity> = []
-+    const prs: Array<PullRequest> = []
-+>>>>>>> .their
- 
-     for (const pr of pullRequests) {
-       const combinedRefStatus = await apiClient.fetchCombinedRefStatus(
-@@ -267,10 +356,17 @@
- 
-       statuses.push({
-         pullRequestId: pr.id,
-+<<<<<<< .our
-         state: combinedRefStatus.state,
-         totalCount: combinedRefStatus.total_count,
-         sha: pr.head.sha,
-         statuses: combinedRefStatus.statuses,
-+=======
-+        state: apiStatus.state as RefState,
-+        totalCount: apiStatus.total_count,
-+        sha: pr.head.sha,
-+        statuses: mapAPIToEntityPullRequestStatus(apiStatus.statuses),
-+>>>>>>> .their
-       })
-     }
- 
-@@ -313,15 +409,20 @@
-     pullRequestsFromAPI: ReadonlyArray<IAPIPullRequest>,
-     repository: GitHubRepository
-   ): Promise<void> {
-+<<<<<<< .our
-     const repoDbId = repository.dbID
- 
-     if (repoDbId == null) {
-+=======
-+    if (repository.dbID == null) {
-+>>>>>>> .their
-       return fatalError(
-         "Cannot store pull requests for a repository that hasn't been inserted into the database!"
-       )
-     }
- 
-     const table = this.pullRequestDatabase.pullRequests
-+<<<<<<< .our
-     const prsToInsert = new Array<IPullRequest>()
- 
-     for (const pr of pullRequestsFromAPI) {
-@@ -402,6 +503,38 @@
- 
-   private async cachePullRequestStatuses(
-     statuses: Array<IPullRequestStatus>
-+=======
-+    const insertablePRs = new Array<IPullRequestEntity>()
-+    for (const pr of pullRequests) {
-+      // base repo isn't null since that's where we got the PR from
-+      const baseRepo = forceUnwrap(
-+        'A pull request must have a base repository before it can be inserted',
-+        pr.base.repo
-+      )
-+      const base = await this.findOrAddGitHubRepository(
-+        repository.endpoint,
-+        baseRepo
-+      )
-+      const head =
-+        (pr.head.repo &&
-+          (await this.findOrAddGitHubRepository(
-+            repository.endpoint,
-+            pr.head.repo
-+          ))) ||
-+        null
-+      const thingToInsert = mapAPIToEntityPullRequest(pr, base, head)
-+      insertablePRs.push(thingToInsert)
-+    }
-+
-+    await this.pullRequestDatabase.transaction('rw', table, async () => {
-+      await table.clear()
-+      await table.bulkAdd(insertablePRs)
-+    })
-+  }
-+
-+  private async writePRStatus(
-+    statuses: Array<IPullRequestStatusEntity>
-+>>>>>>> .their
-   ): Promise<void> {
-     const table = this.pullRequestDatabase.pullRequestStatus
- 
-@@ -420,4 +553,73 @@
-       }
-     })
-   }
-+<<<<<<< .our
-+=======
-+
-+  /** Gets the pull requests against the given repository. */
-+  public async getPullRequests(
-+    repository: GitHubRepository
-+  ): Promise<ReadonlyArray<PullRequest>> {
-+    const gitHubRepositoryID = repository.dbID
-+
-+    if (!gitHubRepositoryID) {
-+      return fatalError(
-+        "Cannot get pull requests for a repository that hasn't been inserted into the database!"
-+      )
-+    }
-+
-+    const raw = await this.pullRequestDatabase.pullRequests
-+      .where('base.repoId')
-+      .equals(gitHubRepositoryID)
-+      .reverse()
-+      .sortBy('number')
-+
-+    const pullRequests = new Array<PullRequest>()
-+
-+    for (const pr of raw) {
-+      const headId = pr.head.repoId
-+
-+      let head: GitHubRepository | null = null
-+
-+      if (headId) {
-+        head = await this.findGitHubRepositoryById(headId)
-+      }
-+
-+      // We know the base repo ID can't be null since it's the repository we
-+      // fetched the PR from in the first place.
-+      const baseId = forceUnwrap(
-+        'PR cannot have a null base repo id',
-+        pr.base.repoId
-+      )
-+      const base = forceUnwrap(
-+        'PR cannot have a null base repo',
-+        await this.findGitHubRepositoryById(baseId)
-+      )
-+
-+      // We can be certain the PR ID is valid since we just got it from the
-+      // database.
-+      const prID = forceUnwrap(
-+        'PR cannot have a null ID after being retrieved from the database',
-+        pr.id
-+      )
-+
-+      const pullRequestStatus = await this.getPRStatusById(pr.head.sha, prID)
-+
-+      const pullRequest = new PullRequest(
-+        prID,
-+        new Date(pr.createdAt),
-+        pullRequestStatus,
-+        pr.title,
-+        pr.number,
-+        new PullRequestRef(pr.head.ref, pr.head.sha, head),
-+        new PullRequestRef(pr.base.ref, pr.base.sha, base),
-+        pr.author
-+      )
-+
-+      pullRequests.push(pullRequest)
-+    }
-+
-+    return pullRequests
-+  }
-+>>>>>>> .their
- }
-changed in both
-  base   100644 f3314ebfa4a006dfe567e597d9b9874623736798 app/src/lib/stores/repositories-store.ts
-  our    100644 1c0981c70e593bda2422a96ca43b130cedd5db06 app/src/lib/stores/repositories-store.ts
-  their  100644 d4601ff4f24fcb907d7047d938287e0412e26feb app/src/lib/stores/repositories-store.ts
-@@ -6,7 +6,7 @@
- import { Owner } from '../../models/owner'
- import { GitHubRepository } from '../../models/github-repository'
- import { Repository } from '../../models/repository'
--import { fatalError } from '../fatal-error'
-+import { fatalError, forceUnwrap } from '../fatal-error'
- import { IAPIRepository } from '../api'
- import { BaseStore } from './base-store'
- 
-@@ -31,16 +31,20 @@
-       this.db.gitHubRepositories,
-       this.db.owners,
-       async () => {
--        const gitHubRepository = await this.db.gitHubRepositories
-+        const record = await this.db.gitHubRepositories
-           .where('cloneURL')
-           .equals(apiRepository.clone_url)
-           .limit(1)
-           .first()
- 
-+<<<<<<< .our
-         if (gitHubRepository == null) {
-+=======
-+        if (record == null) {
-+>>>>>>> .their
-           return this.putGitHubRepository(endpoint, apiRepository)
-         } else {
--          return this.buildGitHubRepository(gitHubRepository)
-+          return this.buildGitHubRepository(record)
-         }
-       }
-     )
-@@ -51,12 +55,16 @@
-   ): Promise<GitHubRepository> {
-     const owner = await this.db.owners.get(dbRepo.ownerID)
- 
-+<<<<<<< .our
-     if (owner == null) {
-+=======
-+    if (!owner) {
-+>>>>>>> .their
-       throw new Error(`Couldn't find the owner for ${dbRepo.name}`)
-     }
- 
-     let parent: GitHubRepository | null = null
--    if (dbRepo.parentID) {
-+    if (dbRepo.parentID != null) {
-       parent = await this.findGitHubRepositoryByID(dbRepo.parentID)
-     }
- 
-@@ -253,14 +261,19 @@
-     endpoint: string,
-     gitHubRepository: IAPIRepository
-   ): Promise<GitHubRepository> {
--    let parent: GitHubRepository | null = null
--    if (gitHubRepository.parent) {
--      parent = await this.putGitHubRepository(endpoint, gitHubRepository.parent)
-+    let parentRepo: GitHubRepository | null = null
-+
-+    if (gitHubRepository.fork) {
-+      const parent = forceUnwrap(
-+        'A forked repository must have a parent',
-+        gitHubRepository.parent
-+      )
-+
-+      parentRepo = await this.putGitHubRepository(endpoint, parent)
-     }
- 
-     const login = gitHubRepository.owner.login.toLowerCase()
-     const owner = await this.putOwner(endpoint, login)
--
-     const existingRepo = await this.db.gitHubRepositories
-       .where('[ownerID+name]')
-       .equals([owner.id!, gitHubRepository.name])
-@@ -273,13 +286,15 @@
-       htmlURL: gitHubRepository.html_url,
-       defaultBranch: gitHubRepository.default_branch,
-       cloneURL: gitHubRepository.clone_url,
--      parentID: parent ? parent.dbID : null,
-+      parentID: parentRepo ? parentRepo.dbID : null,
-     }
-+
-     if (existingRepo) {
-       updatedGitHubRepo = { ...updatedGitHubRepo, id: existingRepo.id }
-     }
- 
-     const id = await this.db.gitHubRepositories.put(updatedGitHubRepo)
-+
-     return new GitHubRepository(
-       updatedGitHubRepo.name,
-       owner,
-@@ -288,7 +303,7 @@
-       updatedGitHubRepo.htmlURL,
-       updatedGitHubRepo.defaultBranch,
-       updatedGitHubRepo.cloneURL,
--      parent
-+      parentRepo
-     )
-   }
- 
-changed in both
-  base   100644 aa510beef50c878b8639a69157281c7460e868ab app/src/ui/index.tsx
-  our    100644 f8f8200917327048c8f002fcfade473dfd6668d1 app/src/ui/index.tsx
-  their  100644 17edd3e21a277257324770e576786dd04cef3c80 app/src/ui/index.tsx
-@@ -122,7 +122,8 @@
- 
- const pullRequestStore = new PullRequestStore(
-   new PullRequestDatabase('PullRequestDatabase'),
--  repositoriesStore
-+  repositoriesStore.findOrPutGitHubRepository,
-+  repositoriesStore.findGitHubRepositoryByID
- )
- 
- const appStore = new AppStore(
-removed in remote
-  base   100644 eed3816fb2f76f373f7ae51c5cfa9132619fb879 app/test/unit/accounts-store-test.ts
-  our    100644 eed3816fb2f76f373f7ae51c5cfa9132619fb879 app/test/unit/accounts-store-test.ts
-@@ -1,27 +0,0 @@
--import { expect } from 'chai'
--
--import { Account } from '../../src/models/account'
--import { AccountsStore } from '../../src/lib/stores'
--import { InMemoryStore, AsyncInMemoryStore } from '../helpers/stores'
--
--describe('AccountsStore', () => {
--  let accountsStore: AccountsStore | null = null
--  beforeEach(() => {
--    accountsStore = new AccountsStore(
--      new InMemoryStore(),
--      new AsyncInMemoryStore()
--    )
--  })
--
--  describe('adding a new user', () => {
--    it('contains the added user', async () => {
--      const newAccountLogin = 'joan'
--      await accountsStore!.addAccount(
--        new Account(newAccountLogin, '', 'deadbeef', [], '', 1, '')
--      )
--
--      const users = await accountsStore!.getAll()
--      expect(users[0].login).to.equal(newAccountLogin)
--    })
--  })
--})
-removed in remote
-  base   100644 bd8253abfa8404e42377b4b26ffe52f11269f273 app/test/unit/app-store-test.ts
-  our    100644 7c7b2a2600b6cdb77d652940772194805df43425 app/test/unit/app-store-test.ts
-@@ -1,149 +0,0 @@
--import { expect, AssertionError } from 'chai'
--
--import * as Path from 'path'
--import * as FSE from 'fs-extra'
--import { GitProcess } from 'dugite'
--
--import {
--  AppStore,
--  GitHubUserStore,
--  CloningRepositoriesStore,
--  EmojiStore,
--  IssuesStore,
--  SignInStore,
--  RepositoriesStore,
--  AccountsStore,
--  PullRequestStore,
--} from '../../src/lib/stores'
--import {
--  TestGitHubUserDatabase,
--  TestStatsDatabase,
--  TestIssuesDatabase,
--  TestRepositoriesDatabase,
--  TestPullRequestDatabase,
--} from '../helpers/databases'
--import { setupEmptyRepository } from '../helpers/repositories'
--import { InMemoryStore, AsyncInMemoryStore } from '../helpers/stores'
--
--import { StatsStore } from '../../src/lib/stats'
--
--import {
--  RepositorySectionTab,
--  SelectionType,
--  IRepositoryState,
--} from '../../src/lib/app-state'
--import { Repository } from '../../src/models/repository'
--import { Commit } from '../../src/models/commit'
--import { getCommit } from '../../src/lib/git'
--import { TestActivityMonitor } from '../helpers/test-activity-monitor'
--
--describe('AppStore', () => {
--  async function createAppStore(): Promise<AppStore> {
--    const db = new TestGitHubUserDatabase()
--    await db.reset()
--
--    const issuesDb = new TestIssuesDatabase()
--    await issuesDb.reset()
--
--    const statsDb = new TestStatsDatabase()
--    await statsDb.reset()
--
--    const repositoriesDb = new TestRepositoriesDatabase()
--    await repositoriesDb.reset()
--    const repositoriesStore = new RepositoriesStore(repositoriesDb)
--
--    const accountsStore = new AccountsStore(
--      new InMemoryStore(),
--      new AsyncInMemoryStore()
--    )
--
--    const pullRequestStore = new PullRequestStore(
--      new TestPullRequestDatabase(),
--      repositoriesStore
--    )
--
--    return new AppStore(
--      new GitHubUserStore(db),
--      new CloningRepositoriesStore(),
--      new EmojiStore(),
--      new IssuesStore(issuesDb),
--      new StatsStore(statsDb, new TestActivityMonitor()),
--      new SignInStore(),
--      accountsStore,
--      repositoriesStore,
--      pullRequestStore
--    )
--  }
--
--  it('can select a repository', async () => {
--    const appStore = await createAppStore()
--
--    const repo = await setupEmptyRepository()
--
--    await appStore._selectRepository(repo)
--
--    const state = appStore.getState()
--    expect(state.selectedState).is.not.null
--    expect(state.selectedState!.repository.path).to.equal(repo.path)
--  })
--
--  describe('undo first commit', () => {
--    function getAppState(appStore: AppStore): IRepositoryState {
--      const selectedState = appStore.getState().selectedState
--      if (selectedState == null) {
--        throw new AssertionError('No selected state for AppStore')
--      }
--
--      switch (selectedState.type) {
--        case SelectionType.Repository:
--          return selectedState.state
--        default:
--          throw new AssertionError(
--            `Got selected state of type ${
--              selectedState.type
--            } which is not supported.`
--          )
--      }
--    }
--
--    let repo: Repository | null = null
--    let firstCommit: Commit | null = null
--
--    beforeEach(async () => {
--      repo = await setupEmptyRepository()
--
--      const file = 'README.md'
--      const filePath = Path.join(repo.path, file)
--
--      await FSE.writeFile(filePath, 'SOME WORDS GO HERE\n')
--
--      await GitProcess.exec(['add', file], repo.path)
--      await GitProcess.exec(['commit', '-m', 'added file'], repo.path)
--
--      firstCommit = await getCommit(repo, 'master')
--      expect(firstCommit).to.not.equal(null)
--      expect(firstCommit!.parentSHAs.length).to.equal(0)
--    })
--
--    it('clears the undo commit dialog', async () => {
--      const repository = repo!
--
--      const appStore = await createAppStore()
--
--      // select the repository and show the changes view
--      await appStore._selectRepository(repository)
--      await appStore._changeRepositorySection(
--        repository,
--        RepositorySectionTab.Changes
--      )
--
--      let state = getAppState(appStore)
--      expect(state.localCommitSHAs.length).to.equal(1)
--
--      await appStore._undoCommit(repository, firstCommit!)
--
--      state = getAppState(appStore)
--      expect(state.localCommitSHAs).to.be.empty
--    })
--  })
--})
-changed in both
-  base   100644 0bbac36c08afbbd66754513e6f476caf3155de3c app/test/unit/app-test.tsx
-  our    100644 f5a4bb958cedfdbf76f9144a200a3cfac9613c02 app/test/unit/app-test.tsx
-  their  100644 e79103f1df9b5ad5ec5640735a4c2d56fe4905b0 app/test/unit/app-test.tsx
-@@ -56,7 +56,8 @@
- 
-     const pullRequestStore = new PullRequestStore(
-       new TestPullRequestDatabase(),
--      repositoriesStore
-+      repositoriesStore.findOrPutGitHubRepository,
-+      repositoriesStore.findGitHubRepositoryByID
-     )
- 
-     appStore = new AppStore(
-removed in remote
-  base   100644 b69dfb902e2537440f7b72b9537c1de1aaf8b113 app/test/unit/git-store-test.ts
-  our    100644 916df52e71502aa756ade2e09be78d7398a4c7f0 app/test/unit/git-store-test.ts
-@@ -1,226 +0,0 @@
--import { expect } from 'chai'
--import * as FSE from 'fs-extra'
--import * as Path from 'path'
--import { GitProcess } from 'dugite'
--
--import { shell } from '../helpers/test-app-shell'
--import {
--  setupEmptyRepository,
--  setupFixtureRepository,
--  setupConflictedRepo,
--} from '../helpers/repositories'
--import { GitStore } from '../../src/lib/stores'
--import { AppFileStatus } from '../../src/models/status'
--import { Repository } from '../../src/models/repository'
--import { Commit } from '../../src/models/commit'
--import { TipState, IValidBranch } from '../../src/models/tip'
--import { getCommit } from '../../src/lib/git'
--import { getStatusOrThrow } from '../helpers/status'
--
--describe('GitStore', () => {
--  describe('loadCommitBatch', () => {
--    it('includes HEAD when loading commits', async () => {
--      const path = await setupFixtureRepository('repository-with-105-commits')
--      const repo = new Repository(path, -1, null, false)
--      const gitStore = new GitStore(repo, shell)
--
--      const commits = await gitStore.loadCommitBatch('HEAD')
--
--      expect(commits).is.not.null
--      expect(commits!.length).equals(100)
--      expect(commits![0]).equals('708a46eac512c7b2486da2247f116d11a100b611')
--    })
--  })
--
--  it('can discard changes from a repository', async () => {
--    const repo = await setupEmptyRepository()
--    const gitStore = new GitStore(repo, shell)
--
--    const readmeFile = 'README.md'
--    const readmeFilePath = Path.join(repo.path, readmeFile)
--
--    await FSE.writeFile(readmeFilePath, 'SOME WORDS GO HERE\n')
--
--    const licenseFile = 'LICENSE.md'
--    const licenseFilePath = Path.join(repo.path, licenseFile)
--
--    await FSE.writeFile(licenseFilePath, 'SOME WORDS GO HERE\n')
--
--    // commit the readme file but leave the license
--    await GitProcess.exec(['add', readmeFile], repo.path)
--    await GitProcess.exec(['commit', '-m', 'added readme file'], repo.path)
--
--    await FSE.writeFile(readmeFilePath, 'WRITING SOME NEW WORDS\n')
--    // setup requires knowing about the current tip
--    await gitStore.loadStatus()
--
--    let status = await getStatusOrThrow(repo)
--    let files = status.workingDirectory.files
--
--    expect(files.length).to.equal(2)
--    expect(files[0].path).to.equal('README.md')
--    expect(files[0].status).to.equal(AppFileStatus.Modified)
--
--    // discard the LICENSE.md file
--    await gitStore.discardChanges([files[1]])
--
--    status = await getStatusOrThrow(repo)
--    files = status.workingDirectory.files
--
--    expect(files.length).to.equal(1)
--  })
--
--  it('can discard a renamed file', async () => {
--    const repo = await setupEmptyRepository()
--    const gitStore = new GitStore(repo, shell)
--
--    const file = 'README.md'
--    const renamedFile = 'NEW-README.md'
--    const filePath = Path.join(repo.path, file)
--
--    await FSE.writeFile(filePath, 'SOME WORDS GO HERE\n')
--
--    // commit the file, and then rename it
--    await GitProcess.exec(['add', file], repo.path)
--    await GitProcess.exec(['commit', '-m', 'added file'], repo.path)
--    await GitProcess.exec(['mv', file, renamedFile], repo.path)
--
--    const statusBeforeDiscard = await getStatusOrThrow(repo)
--    const filesToDiscard = statusBeforeDiscard.workingDirectory.files
--
--    // discard the renamed file
--    await gitStore.discardChanges(filesToDiscard)
--
--    const status = await getStatusOrThrow(repo)
--    const files = status.workingDirectory.files
--
--    expect(files.length).to.equal(0)
--  })
--
--  describe('undo first commit', () => {
--    let repo: Repository | null = null
--    let firstCommit: Commit | null = null
--
--    const commitMessage = 'added file'
--
--    beforeEach(async () => {
--      repo = await setupEmptyRepository()
--
--      const file = 'README.md'
--      const filePath = Path.join(repo.path, file)
--
--      await FSE.writeFile(filePath, 'SOME WORDS GO HERE\n')
--
--      await GitProcess.exec(['add', file], repo.path)
--      await GitProcess.exec(['commit', '-m', commitMessage], repo.path)
--
--      firstCommit = await getCommit(repo!, 'master')
--      expect(firstCommit).to.not.equal(null)
--      expect(firstCommit!.parentSHAs.length).to.equal(0)
--    })
--
--    it('reports the repository is unborn', async () => {
--      const gitStore = new GitStore(repo!, shell)
--
--      await gitStore.loadStatus()
--      expect(gitStore.tip.kind).to.equal(TipState.Valid)
--
--      await gitStore.undoCommit(firstCommit!)
--
--      const after = await getStatusOrThrow(repo!)
--      expect(after.currentTip).to.be.undefined
--    })
--
--    it('pre-fills the commit message', async () => {
--      const gitStore = new GitStore(repo!, shell)
--
--      await gitStore.undoCommit(firstCommit!)
--
--      const context = gitStore.contextualCommitMessage
--      expect(context).to.not.be.null
--      expect(context!.summary).to.equal(commitMessage)
--    })
--
--    it('clears the undo commit dialog', async () => {
--      const gitStore = new GitStore(repo!, shell)
--
--      await gitStore.loadStatus()
--
--      const tip = gitStore.tip as IValidBranch
--      await gitStore.loadLocalCommits(tip.branch)
--
--      expect(gitStore.localCommitSHAs.length).to.equal(1)
--
--      await gitStore.undoCommit(firstCommit!)
--
--      await gitStore.loadStatus()
--      expect(gitStore.tip.kind).to.equal(TipState.Unborn)
--
--      await gitStore.loadLocalCommits(null)
--
--      expect(gitStore.localCommitSHAs).to.be.empty
--    })
--
--    it('has no staged files', async () => {
--      const gitStore = new GitStore(repo!, shell)
--
--      await gitStore.loadStatus()
--
--      const tip = gitStore.tip as IValidBranch
--      await gitStore.loadLocalCommits(tip.branch)
--
--      expect(gitStore.localCommitSHAs.length).to.equal(1)
--
--      await gitStore.undoCommit(firstCommit!)
--
--      // compare the index state to some other tree-ish
--      // 4b825dc642cb6eb9a060e54bf8d69288fbee4904 is the magic empty tree
--      // if nothing is staged, this should return no entries
--      const result = await GitProcess.exec(
--        [
--          'diff-index',
--          '--name-status',
--          '-z',
--          '4b825dc642cb6eb9a060e54bf8d69288fbee4904',
--        ],
--        repo!.path
--      )
--      expect(result.stdout.length).to.equal(0)
--    })
--  })
--
--  it('hides commented out lines from MERGE_MSG', async () => {
--    const repo = await setupConflictedRepo()
--    const gitStore = new GitStore(repo, shell)
--
--    await gitStore.loadContextualCommitMessage()
--
--    const context = gitStore.contextualCommitMessage
--    expect(context).to.not.be.null
--    expect(context!.summary).to.equal(`Merge branch 'master' into other-branch`)
--    expect(context!.description).to.be.null
--  })
--
--  describe('repository with HEAD file', () => {
--    it('can discard modified change cleanly', async () => {
--      const path = await setupFixtureRepository('repository-with-HEAD-file')
--      const repo = new Repository(path, 1, null, false)
--      const gitStore = new GitStore(repo, shell)
--
--      const file = 'README.md'
--      const filePath = Path.join(repo.path, file)
--
--      await FSE.writeFile(filePath, 'SOME WORDS GO HERE\n')
--
--      let status = await getStatusOrThrow(repo!)
--      let files = status.workingDirectory.files
--      expect(files.length).to.equal(1)
--
--      await gitStore.discardChanges([files[0]])
--
--      status = await getStatusOrThrow(repo)
--      files = status.workingDirectory.files
--      expect(files.length).to.equal(0)
--    })
--  })
--})
-removed in remote
-  base   100644 4f50c70494d77eebb361fea30170605dcfd57f75 app/test/unit/repositories-store-test.ts
-  our    100644 494c842a7b1384406f5afa4b664134c29366ea2b app/test/unit/repositories-store-test.ts
-@@ -1,102 +0,0 @@
--import { expect } from 'chai'
--
--import { RepositoriesStore } from '../../src/lib/stores/repositories-store'
--import { TestRepositoriesDatabase } from '../helpers/databases'
--import { IAPIRepository } from '../../src/lib/api'
--
--describe('RepositoriesStore', () => {
--  let repositoriesStore: RepositoriesStore | null = null
--
--  beforeEach(async () => {
--    const db = new TestRepositoriesDatabase()
--    await db.reset()
--
--    repositoriesStore = new RepositoriesStore(db)
--  })
--
--  describe('adding a new repository', () => {
--    it('contains the added repository', async () => {
--      const repoPath = '/some/cool/path'
--      await repositoriesStore!.addRepository(repoPath)
--
--      const repositories = await repositoriesStore!.getAll()
--      expect(repositories[0].path).to.equal(repoPath)
--    })
--  })
--
--  describe('getting all repositories', () => {
--    it('returns multiple repositories', async () => {
--      await repositoriesStore!.addRepository('/some/cool/path')
--      await repositoriesStore!.addRepository('/some/other/path')
--
--      const repositories = await repositoriesStore!.getAll()
--      expect(repositories.length).to.equal(2)
--    })
--  })
--
--  describe('updating a GitHub repository', () => {
--    const gitHubRepo: IAPIRepository = {
--      clone_url: 'https://github.com/my-user/my-repo',
--      html_url: 'https://github.com/my-user/my-repo',
--      name: 'my-repo',
--      owner: {
--        id: 42,
--        url: 'https://github.com/my-user',
--        login: 'my-user',
--        avatar_url: 'https://github.com/my-user.png',
--        email: 'my-user@users.noreply.github.com',
--        name: 'My User',
--        type: 'User',
--      },
--      private: true,
--      fork: false,
--      default_branch: 'master',
--      parent: null,
--      pushed_at: '1995-12-17T03:24:00',
--    }
--
--    it('adds a new GitHub repository', async () => {
--      const addedRepo = await repositoriesStore!.addRepository(
--        '/some/cool/path'
--      )
--
--      await repositoriesStore!.updateGitHubRepository(
--        addedRepo,
--        'https://api.github.com',
--        gitHubRepo
--      )
--
--      const repositories = await repositoriesStore!.getAll()
--      const repo = repositories[0]
--      expect(repo.gitHubRepository!.private).to.equal(true)
--      expect(repo.gitHubRepository!.fork).to.equal(false)
--      expect(repo.gitHubRepository!.htmlURL).to.equal(
--        'https://github.com/my-user/my-repo'
--      )
--    })
--
--    it('reuses an existing GitHub repository', async () => {
--      const firstRepo = await repositoriesStore!.addRepository(
--        '/some/cool/path'
--      )
--      const updatedFirstRepo = await repositoriesStore!.updateGitHubRepository(
--        firstRepo,
--        'https://api.github.com',
--        gitHubRepo
--      )
--
--      const secondRepo = await repositoriesStore!.addRepository(
--        '/some/other/path'
--      )
--      const updatedSecondRepo = await repositoriesStore!.updateGitHubRepository(
--        secondRepo,
--        'https://api.github.com',
--        gitHubRepo
--      )
--
--      expect(updatedFirstRepo.gitHubRepository!.dbID).to.equal(
--        updatedSecondRepo.gitHubRepository!.dbID
--      )
--    })
--  })
--})
-removed in remote
-  base   100644 c96d616cf971efe5da8283c233918fc7a712c1de app/test/unit/repository-settings-store-test.ts
-  our    100644 b494a61563050dad05675803d60a24c4bd0becce app/test/unit/repository-settings-store-test.ts
-@@ -1,122 +0,0 @@
--import * as FSE from 'fs-extra'
--import * as Path from 'path'
--import { GitProcess } from 'dugite'
--import { expect } from 'chai'
--
--import { RepositorySettingsStore } from '../../src/lib/stores'
--import { setupEmptyRepository } from '../helpers/repositories'
--import { getStatusOrThrow } from '../helpers/status'
--
--describe('RepositorySettingsStore', () => {
--  it('can create a gitignore file', async () => {
--    const repo = await setupEmptyRepository()
--    const path = repo.path
--    const sut = new RepositorySettingsStore(repo)
--
--    // Create git ignore file
--    await sut.saveGitIgnore('node_modules\n')
--
--    // Make sure file exists on FS
--    const exists = await FSE.pathExists(`${path}/.gitignore`)
--
--    expect(exists).is.true
--  })
--
--  it('deletes gitignore file when no entries provided', async () => {
--    const repo = await setupEmptyRepository()
--    const path = repo.path
--
--    const ignoreFile = `${path}/.gitignore`
--    await FSE.writeFile(ignoreFile, 'node_modules\n')
--
--    const sut = new RepositorySettingsStore(repo)
--
--    // update gitignore file to be empty
--    await sut.saveGitIgnore('')
--
--    const exists = await FSE.pathExists(ignoreFile)
--    expect(exists).is.false
--  })
--
--  it('can ignore a file in a repository', async () => {
--    const repo = await setupEmptyRepository()
--    const sut = new RepositorySettingsStore(repo)
--    const path = repo.path
--
--    // Ignore txt files
--    await sut.saveGitIgnore('*.txt\n')
--    await GitProcess.exec(['add', '.gitignore'], path)
--    await GitProcess.exec(['commit', '-m', 'create the ignore file'], path)
--
--    // Create a txt file
--    const file = Path.join(repo.path, 'a.txt')
--
--    await FSE.writeFile(file, 'thrvbnmerkl;,iuw')
--
--    // Check status of repo
--    const status = await getStatusOrThrow(repo)
--    const files = status.workingDirectory.files
--
--    expect(files.length).to.equal(0)
--  })
--
--  describe('autocrlf and safecrlf are true', () => {
--    it('appends CRLF to file', async () => {
--      const repo = await setupEmptyRepository()
--      const sut = new RepositorySettingsStore(repo)
--
--      await GitProcess.exec(
--        ['config', '--local', 'core.autocrlf', 'true'],
--        repo.path
--      )
--      await GitProcess.exec(
--        ['config', '--local', 'core.safecrlf', 'true'],
--        repo.path
--      )
--
--      const path = repo.path
--
--      await sut.saveGitIgnore('node_modules')
--      await GitProcess.exec(['add', '.gitignore'], path)
--
--      const commit = await GitProcess.exec(
--        ['commit', '-m', 'create the ignore file'],
--        path
--      )
--      const contents = await sut.readGitIgnore()
--
--      expect(commit.exitCode).to.equal(0)
--      expect(contents!.endsWith('\r\n'))
--    })
--  })
--
--  describe('autocrlf and safecrlf are unset', () => {
--    it('appends LF to file', async () => {
--      const repo = await setupEmptyRepository()
--      const sut = new RepositorySettingsStore(repo)
--
--      // ensure this repository only ever sticks to LF
--      await GitProcess.exec(['config', '--local', 'core.eol', 'lf'], repo.path)
--
--      // do not do any conversion of line endings when committing
--      await GitProcess.exec(
--        ['config', '--local', 'core.autocrlf', 'input'],
--        repo.path
--      )
--
--      const path = repo.path
--
--      await sut.saveGitIgnore('node_modules')
--      await GitProcess.exec(['add', '.gitignore'], path)
--
--      const commit = await GitProcess.exec(
--        ['commit', '-m', 'create the ignore file'],
--        path
--      )
--      const contents = await sut.readGitIgnore()
--
--      expect(commit.exitCode).to.equal(0)
--      expect(contents!.endsWith('\n'))
--    })
--  })
--})
-added in remote
-  their  100644 3a5a0d3e23ab06bce9d346e875f730dc95558357 app/test/unit/stores/accounts-store-test.ts
-@@ -0,0 +1,27 @@
-+import { expect } from 'chai'
-+
-+import { Account } from '../../../src/models/account'
-+import { AccountsStore } from '../../../src/lib/stores'
-+import { InMemoryStore, AsyncInMemoryStore } from '../../helpers/stores'
-+
-+describe('AccountsStore', () => {
-+  let accountsStore: AccountsStore | null = null
-+  beforeEach(() => {
-+    accountsStore = new AccountsStore(
-+      new InMemoryStore(),
-+      new AsyncInMemoryStore()
-+    )
-+  })
-+
-+  describe('adding a new user', () => {
-+    it('contains the added user', async () => {
-+      const newAccountLogin = 'joan'
-+      await accountsStore!.addAccount(
-+        new Account(newAccountLogin, '', 'deadbeef', [], '', 1, '')
-+      )
-+
-+      const users = await accountsStore!.getAll()
-+      expect(users[0].login).to.equal(newAccountLogin)
-+    })
-+  })
-+})
-added in remote
-  their  100644 5f6d89f86e246507b78f71f823f67dec49b58937 app/test/unit/stores/app-store-test.ts
-@@ -0,0 +1,151 @@
-+/* eslint-disable no-sync */
-+
-+import { expect } from 'chai'
-+
-+import * as Path from 'path'
-+import * as Fs from 'fs'
-+import { GitProcess } from 'dugite'
-+
-+import {
-+  AppStore,
-+  GitHubUserStore,
-+  CloningRepositoriesStore,
-+  EmojiStore,
-+  IssuesStore,
-+  SignInStore,
-+  RepositoriesStore,
-+  AccountsStore,
-+  PullRequestStore,
-+} from '../../../src/lib/stores'
-+import {
-+  TestGitHubUserDatabase,
-+  TestStatsDatabase,
-+  TestIssuesDatabase,
-+  TestRepositoriesDatabase,
-+  TestPullRequestDatabase,
-+} from '../../helpers/databases'
-+import { setupEmptyRepository } from '../../helpers/repositories'
-+import { InMemoryStore, AsyncInMemoryStore } from '../../helpers/stores'
-+
-+import { StatsStore } from '../../../src/lib/stats'
-+
-+import {
-+  RepositorySection,
-+  SelectionType,
-+  IRepositoryState,
-+} from '../../../src/lib/app-state'
-+import { Repository } from '../../../src/models/repository'
-+import { Commit } from '../../../src/models/commit'
-+import { getCommit } from '../../../src/lib/git'
-+
-+describe('AppStore', () => {
-+  async function createAppStore(): Promise<AppStore> {
-+    const db = new TestGitHubUserDatabase()
-+    await db.reset()
-+
-+    const issuesDb = new TestIssuesDatabase()
-+    await issuesDb.reset()
-+
-+    const statsDb = new TestStatsDatabase()
-+    await statsDb.reset()
-+
-+    const repositoriesDb = new TestRepositoriesDatabase()
-+    await repositoriesDb.reset()
-+    const repositoriesStore = new RepositoriesStore(repositoriesDb)
-+
-+    const accountsStore = new AccountsStore(
-+      new InMemoryStore(),
-+      new AsyncInMemoryStore()
-+    )
-+
-+    const pullRequestStore = new PullRequestStore(
-+      new TestPullRequestDatabase(),
-+      repositoriesStore.findOrPutGitHubRepository,
-+      repositoriesStore.findGitHubRepositoryByID
-+    )
-+
-+    return new AppStore(
-+      new GitHubUserStore(db),
-+      new CloningRepositoriesStore(),
-+      new EmojiStore(),
-+      new IssuesStore(issuesDb),
-+      new StatsStore(statsDb),
-+      new SignInStore(),
-+      accountsStore,
-+      repositoriesStore,
-+      pullRequestStore
-+    )
-+  }
-+
-+  it('can select a repository', async () => {
-+    const appStore = await createAppStore()
-+
-+    const repo = await setupEmptyRepository()
-+
-+    await appStore._selectRepository(repo)
-+
-+    const state = appStore.getState()
-+    expect(state.selectedState).is.not.null
-+    expect(state.selectedState!.repository.path).to.equal(repo.path)
-+  })
-+
-+  describe('undo first commit', () => {
-+    function getAppState(appStore: AppStore): IRepositoryState {
-+      const selectedState = appStore.getState().selectedState
-+      if (!selectedState) {
-+        throw new chai.AssertionError('No selected state for AppStore')
-+      }
-+
-+      switch (selectedState.type) {
-+        case SelectionType.Repository:
-+          return selectedState.state
-+        default:
-+          throw new chai.AssertionError(
-+            `Got selected state of type ${
-+              selectedState.type
-+            } which is not supported.`
-+          )
-+      }
-+    }
-+
-+    let repo: Repository | null = null
-+    let firstCommit: Commit | null = null
-+
-+    beforeEach(async () => {
-+      repo = await setupEmptyRepository()
-+
-+      const file = 'README.md'
-+      const filePath = Path.join(repo.path, file)
-+
-+      Fs.writeFileSync(filePath, 'SOME WORDS GO HERE\n')
-+
-+      await GitProcess.exec(['add', file], repo.path)
-+      await GitProcess.exec(['commit', '-m', 'added file'], repo.path)
-+
-+      firstCommit = await getCommit(repo, 'master')
-+      expect(firstCommit).to.not.equal(null)
-+      expect(firstCommit!.parentSHAs.length).to.equal(0)
-+    })
-+
-+    it('clears the undo commit dialog', async () => {
-+      const repository = repo!
-+
-+      const appStore = await createAppStore()
-+
-+      // select the repository and show the changes view
-+      await appStore._selectRepository(repository)
-+      await appStore._changeRepositorySection(
-+        repository,
-+        RepositorySection.Changes
-+      )
-+
-+      let state = getAppState(appStore)
-+      expect(state.localCommitSHAs.length).to.equal(1)
-+
-+      await appStore._undoCommit(repository, firstCommit!)
-+
-+      state = getAppState(appStore)
-+      expect(state.localCommitSHAs).to.be.empty
-+    })
-+  })
-+})
-added in remote
-  their  100644 2799672ba597c9fc173b4994f6140993d664fe0f app/test/unit/stores/git-store-test.ts
-@@ -0,0 +1,215 @@
-+/* eslint-disable no-sync */
-+
-+import { expect } from 'chai'
-+import * as Fs from 'fs'
-+import * as Path from 'path'
-+import { GitProcess } from 'dugite'
-+
-+import { shell } from '../../helpers/test-app-shell'
-+import {
-+  setupEmptyRepository,
-+  setupFixtureRepository,
-+  setupConflictedRepo,
-+} from '../../helpers/repositories'
-+import { GitStore } from '../../../src/lib/stores'
-+import { AppFileStatus } from '../../../src/models/status'
-+import { Repository } from '../../../src/models/repository'
-+import { Commit } from '../../../src/models/commit'
-+import { TipState, IValidBranch } from '../../../src/models/tip'
-+import { getCommit, getStatus } from '../../../src/lib/git'
-+
-+describe('GitStore', () => {
-+  it('can discard changes from a repository', async () => {
-+    const repo = await setupEmptyRepository()
-+    const gitStore = new GitStore(repo, shell)
-+
-+    const readmeFile = 'README.md'
-+    const readmeFilePath = Path.join(repo.path, readmeFile)
-+
-+    Fs.writeFileSync(readmeFilePath, 'SOME WORDS GO HERE\n')
-+
-+    const licenseFile = 'LICENSE.md'
-+    const licenseFilePath = Path.join(repo.path, licenseFile)
-+
-+    Fs.writeFileSync(licenseFilePath, 'SOME WORDS GO HERE\n')
-+
-+    // commit the readme file but leave the license
-+    await GitProcess.exec(['add', readmeFile], repo.path)
-+    await GitProcess.exec(['commit', '-m', 'added readme file'], repo.path)
-+
-+    Fs.writeFileSync(readmeFilePath, 'WRITING SOME NEW WORDS\n')
-+    // setup requires knowing about the current tip
-+    await gitStore.loadStatus()
-+
-+    let status = await getStatus(repo)
-+    let files = status.workingDirectory.files
-+
-+    expect(files.length).to.equal(2)
-+    expect(files[0].path).to.equal('README.md')
-+    expect(files[0].status).to.equal(AppFileStatus.Modified)
-+
-+    // discard the LICENSE.md file
-+    await gitStore.discardChanges([files[1]])
-+
-+    status = await getStatus(repo)
-+    files = status.workingDirectory.files
-+
-+    expect(files.length).to.equal(1)
-+  })
-+
-+  it('can discard a renamed file', async () => {
-+    const repo = await setupEmptyRepository()
-+    const gitStore = new GitStore(repo, shell)
-+
-+    const file = 'README.md'
-+    const renamedFile = 'NEW-README.md'
-+    const filePath = Path.join(repo.path, file)
-+
-+    Fs.writeFileSync(filePath, 'SOME WORDS GO HERE\n')
-+
-+    // commit the file, and then rename it
-+    await GitProcess.exec(['add', file], repo.path)
-+    await GitProcess.exec(['commit', '-m', 'added file'], repo.path)
-+    await GitProcess.exec(['mv', file, renamedFile], repo.path)
-+
-+    const statusBeforeDiscard = await getStatus(repo)
-+    const filesToDiscard = statusBeforeDiscard.workingDirectory.files
-+
-+    // discard the renamed file
-+    await gitStore.discardChanges(filesToDiscard)
-+
-+    const status = await getStatus(repo)
-+    const files = status.workingDirectory.files
-+
-+    expect(files.length).to.equal(0)
-+  })
-+
-+  describe('undo first commit', () => {
-+    let repo: Repository | null = null
-+    let firstCommit: Commit | null = null
-+
-+    const commitMessage = 'added file'
-+
-+    beforeEach(async () => {
-+      repo = await setupEmptyRepository()
-+
-+      const file = 'README.md'
-+      const filePath = Path.join(repo.path, file)
-+
-+      Fs.writeFileSync(filePath, 'SOME WORDS GO HERE\n')
-+
-+      await GitProcess.exec(['add', file], repo.path)
-+      await GitProcess.exec(['commit', '-m', commitMessage], repo.path)
-+
-+      firstCommit = await getCommit(repo!, 'master')
-+      expect(firstCommit).to.not.equal(null)
-+      expect(firstCommit!.parentSHAs.length).to.equal(0)
-+    })
-+
-+    it('reports the repository is unborn', async () => {
-+      const gitStore = new GitStore(repo!, shell)
-+
-+      await gitStore.loadStatus()
-+      expect(gitStore.tip.kind).to.equal(TipState.Valid)
-+
-+      await gitStore.undoCommit(firstCommit!)
-+
-+      const after = await getStatus(repo!)
-+
-+      expect(after).to.not.be.null
-+      expect(after!.currentTip).to.be.undefined
-+    })
-+
-+    it('pre-fills the commit message', async () => {
-+      const gitStore = new GitStore(repo!, shell)
-+
-+      await gitStore.undoCommit(firstCommit!)
-+
-+      const context = gitStore.contextualCommitMessage
-+      expect(context).to.not.be.null
-+      expect(context!.summary).to.equal(commitMessage)
-+    })
-+
-+    it('clears the undo commit dialog', async () => {
-+      const gitStore = new GitStore(repo!, shell)
-+
-+      await gitStore.loadStatus()
-+
-+      const tip = gitStore.tip as IValidBranch
-+      await gitStore.loadLocalCommits(tip.branch)
-+
-+      expect(gitStore.localCommitSHAs.length).to.equal(1)
-+
-+      await gitStore.undoCommit(firstCommit!)
-+
-+      await gitStore.loadStatus()
-+      expect(gitStore.tip.kind).to.equal(TipState.Unborn)
-+
-+      await gitStore.loadLocalCommits(null)
-+
-+      expect(gitStore.localCommitSHAs).to.be.empty
-+    })
-+
-+    it('has no staged files', async () => {
-+      const gitStore = new GitStore(repo!, shell)
-+
-+      await gitStore.loadStatus()
-+
-+      const tip = gitStore.tip as IValidBranch
-+      await gitStore.loadLocalCommits(tip.branch)
-+
-+      expect(gitStore.localCommitSHAs.length).to.equal(1)
-+
-+      await gitStore.undoCommit(firstCommit!)
-+
-+      // compare the index state to some other tree-ish
-+      // 4b825dc642cb6eb9a060e54bf8d69288fbee4904 is the magic empty tree
-+      // if nothing is staged, this should return no entries
-+      const result = await GitProcess.exec(
-+        [
-+          'diff-index',
-+          '--name-status',
-+          '-z',
-+          '4b825dc642cb6eb9a060e54bf8d69288fbee4904',
-+        ],
-+        repo!.path
-+      )
-+      expect(result.stdout.length).to.equal(0)
-+    })
-+  })
-+
-+  it('hides commented out lines from MERGE_MSG', async () => {
-+    const repo = await setupConflictedRepo()
-+    const gitStore = new GitStore(repo, shell)
-+
-+    await gitStore.loadContextualCommitMessage()
-+
-+    const context = gitStore.contextualCommitMessage
-+    expect(context).to.not.be.null
-+    expect(context!.summary).to.equal(`Merge branch 'master' into other-branch`)
-+    expect(context!.description).to.be.null
-+  })
-+
-+  describe('repository with HEAD file', () => {
-+    it('can discard modified change cleanly', async () => {
-+      const path = await setupFixtureRepository('repository-with-HEAD-file')
-+      const repo = new Repository(path, 1, null, false)
-+      const gitStore = new GitStore(repo, shell)
-+
-+      const file = 'README.md'
-+      const filePath = Path.join(repo.path, file)
-+
-+      Fs.writeFileSync(filePath, 'SOME WORDS GO HERE\n')
-+
-+      let status = await getStatus(repo!)
-+      let files = status.workingDirectory.files
-+      expect(files.length).to.equal(1)
-+
-+      await gitStore.discardChanges([files[0]])
-+
-+      status = await getStatus(repo)
-+      files = status.workingDirectory.files
-+      expect(files.length).to.equal(0)
-+    })
-+  })
-+})
-added in remote
-  their  100644 cb5b4dc2d922d6e0291d1dd18496257b2c958945 app/test/unit/stores/pull-request-store-test.ts
-@@ -0,0 +1,84 @@
-+import { expect } from 'chai'
-+
-+import { PullRequestStore } from '../../../src/lib/stores'
-+import {
-+  TestPullRequestDatabase,
-+  TestRepositoriesDatabase,
-+} from '../../helpers/databases'
-+import { Repository } from '../../../src/models/repository'
-+import { Account } from '../../../src/models/account'
-+import { GitHubRepository } from '../../../src/models/github-repository'
-+import { Owner } from '../../../src/models/owner'
-+import { IAPIRepository } from '../../../src/lib/api'
-+
-+const findGitHubRepositoryByIDStub = (
-+  id: number
-+): Promise<GitHubRepository | null> => {
-+  return Promise.resolve(
-+    new GitHubRepository(
-+      '',
-+      new Owner('login', 'endpoint', 1),
-+      1,
-+      false,
-+      null,
-+      null,
-+      null,
-+      null
-+    )
-+  )
-+}
-+
-+const findOrPutGitHubRepositoryStub = (
-+  endpoint: string,
-+  apiRepository: IAPIRepository
-+): Promise<GitHubRepository> => {
-+  return Promise.resolve(
-+    new GitHubRepository(
-+      '',
-+      new Owner('login', 'endpoint', 1),
-+      1,
-+      false,
-+      null,
-+      null,
-+      null,
-+      null
-+    )
-+  )
-+}
-+
-+describe('PullRequestStore', () => {
-+  const account = new Account('tester', '', 'token', [], '', 1, '')
-+  let sut: PullRequestStore | null = null
-+  let repository: Repository | null = null
-+
-+  beforeEach(async () => {
-+    const repositoriesDb = new TestRepositoriesDatabase()
-+    const pullRequestDb = new TestPullRequestDatabase()
-+    await Promise.all([repositoriesDb.reset(), pullRequestDb.reset()])
-+
-+    sut = new PullRequestStore(
-+      pullRequestDb,
-+      findOrPutGitHubRepositoryStub,
-+      findGitHubRepositoryByIDStub
-+    )
-+  })
-+
-+  describe('refreshing pull reqeusts', () => {
-+    it.only('insers new prs', async () => {
-+      await sut!.refreshPullRequests(repository!, account)
-+      const prs = await sut!.getPullRequests(
-+        new GitHubRepository(
-+          '',
-+          new Owner('login', 'endpoint', 1),
-+          1,
-+          false,
-+          null,
-+          null,
-+          null,
-+          null
-+        )
-+      )
-+      expect(prs).is.not.empty
-+    })
-+  })
-+})
-added in remote
-  their  100644 0d221bae3fea70347092c299e47d7e209799d26c app/test/unit/stores/repositories-store-test.ts
-@@ -0,0 +1,101 @@
-+import { expect } from 'chai'
-+
-+import { RepositoriesStore } from '../../../src/lib/stores/repositories-store'
-+import { TestRepositoriesDatabase } from '../../helpers/databases'
-+import { IAPIRepository } from '../../../src/lib/api'
-+
-+describe('RepositoriesStore', () => {
-+  let repositoriesStore: RepositoriesStore | null = null
-+
-+  beforeEach(async () => {
-+    const db = new TestRepositoriesDatabase()
-+    await db.reset()
-+
-+    repositoriesStore = new RepositoriesStore(db)
-+  })
-+
-+  describe('adding a new repository', () => {
-+    it('contains the added repository', async () => {
-+      const repoPath = '/some/cool/path'
-+      await repositoriesStore!.addRepository(repoPath)
-+
-+      const repositories = await repositoriesStore!.getAll()
-+      expect(repositories[0].path).to.equal(repoPath)
-+    })
-+  })
-+
-+  describe('getting all repositories', () => {
-+    it('returns multiple repositories', async () => {
-+      await repositoriesStore!.addRepository('/some/cool/path')
-+      await repositoriesStore!.addRepository('/some/other/path')
-+
-+      const repositories = await repositoriesStore!.getAll()
-+      expect(repositories.length).to.equal(2)
-+    })
-+  })
-+
-+  describe('updating a GitHub repository', () => {
-+    const gitHubRepo: IAPIRepository = {
-+      clone_url: 'https://github.com/my-user/my-repo',
-+      html_url: 'https://github.com/my-user/my-repo',
-+      name: 'my-repo',
-+      owner: {
-+        id: 42,
-+        url: 'https://github.com/my-user',
-+        login: 'my-user',
-+        avatar_url: 'https://github.com/my-user.png',
-+        email: 'my-user@users.noreply.github.com',
-+        name: 'My User',
-+        type: 'User',
-+      },
-+      private: true,
-+      fork: false,
-+      default_branch: 'master',
-+      parent: null,
-+    }
-+
-+    it('adds a new GitHub repository', async () => {
-+      const addedRepo = await repositoriesStore!.addRepository(
-+        '/some/cool/path'
-+      )
-+
-+      await repositoriesStore!.updateGitHubRepository(
-+        addedRepo,
-+        'https://api.github.com',
-+        gitHubRepo
-+      )
-+
-+      const repositories = await repositoriesStore!.getAll()
-+      const repo = repositories[0]
-+      expect(repo.gitHubRepository!.private).to.equal(true)
-+      expect(repo.gitHubRepository!.fork).to.equal(false)
-+      expect(repo.gitHubRepository!.htmlURL).to.equal(
-+        'https://github.com/my-user/my-repo'
-+      )
-+    })
-+
-+    it('reuses an existing GitHub repository', async () => {
-+      const firstRepo = await repositoriesStore!.addRepository(
-+        '/some/cool/path'
-+      )
-+      const updatedFirstRepo = await repositoriesStore!.updateGitHubRepository(
-+        firstRepo,
-+        'https://api.github.com',
-+        gitHubRepo
-+      )
-+
-+      const secondRepo = await repositoriesStore!.addRepository(
-+        '/some/other/path'
-+      )
-+      const updatedSecondRepo = await repositoriesStore!.updateGitHubRepository(
-+        secondRepo,
-+        'https://api.github.com',
-+        gitHubRepo
-+      )
-+
-+      expect(updatedFirstRepo.gitHubRepository!.dbID).to.equal(
-+        updatedSecondRepo.gitHubRepository!.dbID
-+      )
-+    })
-+  })
-+})
-added in remote
-  their  100644 4372375111e1a70687a21fad975651a1a3f5f93a app/test/unit/stores/repository-settings-store-test.ts
-@@ -0,0 +1,109 @@
-+/* eslint-disable no-sync */
-+
-+import * as FS from 'fs'
-+import * as Path from 'path'
-+import { GitProcess } from 'dugite'
-+import { expect } from 'chai'
-+
-+import { RepositorySettingsStore } from '../../../src/lib/stores'
-+import { setupEmptyRepository } from '../../helpers/repositories'
-+import { getStatus } from '../../../src/lib/git'
-+import { pathExists } from '../../../src/lib/file-system'
-+
-+describe('RepositorySettingsStore', () => {
-+  it('can create a gitignore file', async () => {
-+    const repo = await setupEmptyRepository()
-+    const path = repo.path
-+    const sut = new RepositorySettingsStore(repo)
-+
-+    // Create git ignore file
-+    await sut.saveGitIgnore('node_modules\n')
-+
-+    // Make sure file exists on FS
-+    const exists = await pathExists(`${path}/.gitignore`)
-+
-+    expect(exists).is.true
-+  })
-+
-+  it('can ignore a file in a repository', async () => {
-+    const repo = await setupEmptyRepository()
-+    const sut = new RepositorySettingsStore(repo)
-+    const path = repo.path
-+
-+    // Ignore txt files
-+    await sut.saveGitIgnore('*.txt\n')
-+    await GitProcess.exec(['add', '.gitignore'], path)
-+    await GitProcess.exec(['commit', '-m', 'create the ignore file'], path)
-+
-+    // Create a txt file
-+    const file = Path.join(repo.path, 'a.txt')
-+
-+    FS.writeFileSync(file, 'thrvbnmerkl;,iuw')
-+
-+    // Check status of repo
-+    const status = await getStatus(repo)
-+    const files = status.workingDirectory.files
-+
-+    expect(files.length).to.equal(0)
-+  })
-+
-+  describe('autocrlf and safecrlf are true', () => {
-+    it('appends CRLF to file', async () => {
-+      const repo = await setupEmptyRepository()
-+      const sut = new RepositorySettingsStore(repo)
-+
-+      await GitProcess.exec(
-+        ['config', '--local', 'core.autocrlf', 'true'],
-+        repo.path
-+      )
-+      await GitProcess.exec(
-+        ['config', '--local', 'core.safecrlf', 'true'],
-+        repo.path
-+      )
-+
-+      const path = repo.path
-+
-+      await sut.saveGitIgnore('node_modules')
-+      await GitProcess.exec(['add', '.gitignore'], path)
-+
-+      const commit = await GitProcess.exec(
-+        ['commit', '-m', 'create the ignore file'],
-+        path
-+      )
-+      const contents = await sut.readGitIgnore()
-+
-+      expect(commit.exitCode).to.equal(0)
-+      expect(contents!.endsWith('\r\n'))
-+    })
-+  })
-+
-+  describe('autocrlf and safecrlf are unset', () => {
-+    it('appends LF to file', async () => {
-+      const repo = await setupEmptyRepository()
-+      const sut = new RepositorySettingsStore(repo)
-+
-+      // ensure this repository only ever sticks to LF
-+      await GitProcess.exec(['config', '--local', 'core.eol', 'lf'], repo.path)
-+
-+      // do not do any conversion of line endings when committing
-+      await GitProcess.exec(
-+        ['config', '--local', 'core.autocrlf', 'input'],
-+        repo.path
-+      )
-+
-+      const path = repo.path
-+
-+      await sut.saveGitIgnore('node_modules')
-+      await GitProcess.exec(['add', '.gitignore'], path)
-+
-+      const commit = await GitProcess.exec(
-+        ['commit', '-m', 'create the ignore file'],
-+        path
-+      )
-+      const contents = await sut.readGitIgnore()
-+
-+      expect(commit.exitCode).to.equal(0)
-+      expect(contents!.endsWith('\n'))
-+    })
-+  })
-+})
diff --git a/app/test/fixtures/merge-parser/desktop/merge-no-more-dexie-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-no-more-dexie-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index 81db6fe7939..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-no-more-dexie-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,1621 +0,0 @@
-changed in both
-  base   100644 e4c97b5a507a78e0ae64a236e85f2a97f14a166a app/package.json
-  our    100644 4ec686d8ad22d3aea1ebe4bddd16f4a7447c3acd app/package.json
-  their  100644 36077c186aacb4a754ace1aeab392f4d65c8a3e0 app/package.json
-@@ -24,6 +24,7 @@
-     "codemirror": "^5.31.0",
-     "codemirror-mode-elixir": "1.1.1",
-     "deep-equal": "^1.0.1",
-+    "lokijs": "^1.5.3",
-     "dexie": "^2.0.0",
-     "double-ended-queue": "^2.1.0-0",
-     "dugite": "^1.67.0",
-@@ -61,6 +62,7 @@
-     "electron-debug": "^2.0.0",
-     "electron-devtools-installer": "^2.2.4",
-     "temp": "^0.8.3",
--    "webpack-hot-middleware": "^2.10.0"
-+    "webpack-hot-middleware": "^2.10.0",
-+    "@types/lokijs": "1.5.2"
-   }
- }
-added in remote
-  their  100644 600991b61a0b68507cefcc1f4f72fc0049447a3b app/src/database/collections.ts
-@@ -0,0 +1,3 @@
-+export enum Collections {
-+  Repository = 'repository',
-+}
-added in remote
-  their  100644 ab444ae2ecf25c444dceb833bdbc3df77eff5d2d app/src/database/command-query/pull-request.ts
-@@ -0,0 +1,69 @@
-+import {
-+  getGHDatabase,
-+  RepositoryKey,
-+  Collections,
-+  toPullRequestModel,
-+  GHDatabase,
-+} from '..'
-+import { IPullRequestAPIResult } from '../../lib/api'
-+import { IPullRequestStatus } from '../../lib/databases'
-+import { forceUnwrap } from '../../lib/fatal-error'
-+
-+const ghDb = getGHDatabase()
-+
-+async function updatePullRequests(
-+  key: RepositoryKey,
-+  apiResults: ReadonlyArray<IPullRequestAPIResult>,
-+  ghDatabase: GHDatabase = ghDb()
-+): Promise<void> {
-+  const collection = ghDatabase.getCollection(Collections.Repository)
-+  await collection.findAndUpdate({ name: key.name, path: key.path }, d => {
-+    const ghRepo = d.ghRepository
-+    return {
-+      ...d,
-+      ghRepository: {
-+        ...ghRepo,
-+        pullRequests: apiResults.map(toPullRequestModel),
-+      },
-+    }
-+  })
-+
-+  ghDatabase.save()
-+}
-+
-+async function updatePullRequestStatuses(
-+  key: RepositoryKey,
-+  prStatusList: Array<IPullRequestStatus>,
-+  ghDatabase: GHDatabase = ghDb()
-+): Promise<void> {
-+  const collection = ghDatabase.getCollection(Collections.Repository)
-+  const repo = collection.findOne({ name: key.name, path: key.path })
-+
-+  if (repo === null) {
-+    return log.error(
-+      `Repository with key ${key.name}+${key.path} cannot be found`
-+    )
-+  }
-+
-+  const ghRepo = forceUnwrap(
-+    'Cannot update pull request on unpublished repository',
-+    repo.ghRepository
-+  )
-+  const updated = {
-+    ...repo,
-+    ghRepository: {
-+      ...ghRepo,
-+      prStatusList,
-+    },
-+  }
-+
-+  collection.update(updated)
-+  ghDatabase.save()
-+}
-+
-+export const Command = {
-+  updatePullRequests,
-+  updatePullRequestStatuses,
-+}
-+
-+export const Query = {}
-added in remote
-  their  100644 aac17ef31fe7ee555b655c8675e012ffe9cf01eb app/src/database/command-query/repository.ts
-@@ -0,0 +1,197 @@
-+import * as Path from 'path'
-+
-+import {
-+  Collections,
-+  IRepository,
-+  toGHRepositoryModel,
-+  toRepositoryModel,
-+  IGHRepository,
-+  getGHDatabase,
-+  RepositoryKey,
-+  GHDatabase,
-+} from '..'
-+import { IRepositoryAPIResult } from '../../lib/api'
-+
-+const ghDb = getGHDatabase()
-+
-+function repositoryNotFound(key: RepositoryKey) {
-+  return `Repository with key ${key.name}+${key.path} cannot be found`
-+}
-+
-+function repositoryAlreadyExists(key: RepositoryKey) {
-+  return `Repository with key ${key.name}+${key.path} already exists`
-+}
-+
-+function noAssociatedGHRepository(key: RepositoryKey) {
-+  return `Repository with key ${key.name}+${
-+    key.path
-+  } has no associated GH Repositroy`
-+}
-+
-+function associatedGHRepositry(key: RepositoryKey) {
-+  return `Repository with key ${key.name}+${
-+    key.path
-+  } already has an associated GH Repository`
-+}
-+
-+async function addParentGHRepository(
-+  key: RepositoryKey,
-+  endpoint: string,
-+  head: IGHRepository,
-+  base: IGHRepository,
-+  ghDatabase: GHDatabase = ghDb()
-+): Promise<void> {
-+  const collection = ghDatabase.getCollection(Collections.Repository)
-+  const document = collection.findOne({
-+    name: key.name,
-+    path: key.path,
-+  })
-+
-+  if (document === null) {
-+    return log.warn(repositoryNotFound(key))
-+  }
-+
-+  if (document.ghRepository === undefined) {
-+    return log.warn(noAssociatedGHRepository(key))
-+  }
-+
-+  await collection.findAndUpdate(
-+    {
-+      name: key.name,
-+      path: key.path,
-+    },
-+    r => ({
-+      kind: 'repository',
-+      ...r,
-+      ghRepository: {
-+        ...head,
-+        parent: {
-+          ...base,
-+        },
-+      },
-+    })
-+  )
-+
-+  await ghDatabase.save()
-+}
-+
-+async function addGHRepository(
-+  key: RepositoryKey,
-+  ghRepository: IGHRepository,
-+  ghDatabase: GHDatabase = ghDb()
-+): Promise<void> {
-+  const collection = ghDatabase.getCollection(Collections.Repository)
-+  const document = collection.findOne({
-+    name: key.name,
-+    path: key.path,
-+  })
-+
-+  if (document === null) {
-+    return log.warn(repositoryNotFound(key))
-+  }
-+
-+  if (document.ghRepository != null) {
-+    return log.warn(associatedGHRepositry(key))
-+  }
-+
-+  const updated: IRepository & LokiObj = {
-+    ...document,
-+    ghRepository,
-+  }
-+
-+  await collection.update(updated)
-+  await ghDatabase.save()
-+}
-+
-+async function getAll(
-+  ghDatabase: GHDatabase = ghDb()
-+): Promise<ReadonlyArray<IRepository>> {
-+  const collection = ghDatabase.getCollection(Collections.Repository)
-+  const repos = await collection.find().map(toRepositoryModel)
-+
-+  return repos
-+}
-+
-+async function addRepository(
-+  path: string,
-+  ghDatabase: GHDatabase = ghDb()
-+): Promise<void> {
-+  const collection = ghDatabase.getCollection(Collections.Repository)
-+  const key = { name: Path.basename(path), path }
-+  const repo = collection.findOne({ name: key.name, path: key.path })
-+
-+  if (repo !== null) {
-+    return log.warn(repositoryAlreadyExists(key))
-+  }
-+
-+  const newRepo = await collection.insertOne({
-+    kind: 'repository',
-+    name: Path.basename(path),
-+    isMissing: false,
-+    path,
-+  })
-+
-+  if (newRepo === undefined) {
-+    return log.error('Unable to add repository')
-+  }
-+
-+  await ghDatabase.save()
-+}
-+
-+async function updateMissingStatus(
-+  key: RepositoryKey,
-+  isMissing: boolean,
-+  ghDatabase: GHDatabase = ghDb()
-+): Promise<void> {
-+  const collection = ghDatabase.getCollection(Collections.Repository)
-+  await collection.findAndUpdate({ name: key.name, path: key.path }, r => ({
-+    ...r,
-+    isMissing: isMissing,
-+  }))
-+
-+  await ghDatabase.save()
-+}
-+
-+async function updatePath(
-+  key: RepositoryKey,
-+  path: string,
-+  ghDatabase: GHDatabase = ghDb()
-+): Promise<void> {
-+  const collection = ghDatabase.getCollection(Collections.Repository)
-+  await collection.findAndUpdate({ name: key.name, path: key.path }, r => ({
-+    ...r,
-+    path,
-+    isMissing: false,
-+  }))
-+
-+  await ghDatabase.save()
-+}
-+
-+async function updateGHRepository<K extends keyof IRepository>(
-+  key: RepositoryKey,
-+  ghRepository: Pick<IRepository, K>,
-+  ghDatabase: GHDatabase = ghDb()
-+): Promise<void> {
-+  const collection = ghDatabase.getCollection(Collections.Repository)
-+  await collection.findAndUpdate({ name: key.name, path: key.path }, r => ({
-+    ...r,
-+    ghRepository: {
-+      ghRepository,
-+    },
-+  }))
-+
-+  ghDatabase.save()
-+}
-+
-+export const Command = {
-+  addRepository,
-+  addGHRepository,
-+  addParentGHRepository,
-+  updateMissingStatus,
-+  updatePath,
-+  updateGHRepository,
-+}
-+
-+export const Query = {
-+  getAll,
-+}
-added in remote
-  their  100644 b7068815397ad608c53ddfc711d3f410e58ab2bb app/src/database/gh-database.ts
-@@ -0,0 +1,51 @@
-+import * as Loki from 'lokijs'
-+import { Collections, IRepository } from '.'
-+import { assertNever } from '../lib/fatal-error'
-+
-+const DbPath = '/Users/williamshepherd/Desktop/gh.db'
-+
-+export function getGHDatabase() {
-+  let ghDb: GHDatabase | null = null
-+
-+  return function() {
-+    if (ghDb === null) {
-+      ghDb = new GHDatabase(DbPath)
-+    }
-+
-+    return ghDb
-+  }
-+}
-+
-+export class GHDatabase {
-+  private readonly db: Loki
-+
-+  public constructor(path: string) {
-+    this.db = new Loki(path)
-+    this.initCollections()
-+  }
-+
-+  public getCollection(collection: Collections) {
-+    switch (collection) {
-+      case Collections.Repository:
-+        return this.db.getCollection<IRepository>(Collections.Repository)
-+      default:
-+        return assertNever(collection, `unknown collection ${collection}`)
-+    }
-+  }
-+
-+  public async save() {
-+    await this.db.save(this.onSaveError)
-+  }
-+
-+  private initCollections() {
-+    if (this.db.getCollection(Collections.Repository) == null) {
-+      this.db.addCollection<IRepository>(Collections.Repository)
-+    }
-+  }
-+
-+  private onSaveError = (error?: any) => {
-+    if (error != null) {
-+      log.error(error)
-+    }
-+  }
-+}
-added in remote
-  their  100644 2c746de6c43c9928f79b18b1f1a9e25b48167769 app/src/database/helpers.ts
-@@ -0,0 +1,132 @@
-+import * as Path from 'path'
-+import { IUser, IRepository, IGHRepository, IPullRequest } from '.'
-+import { IRepositoryAPIResult, IPullRequestAPIResult } from '../lib/api'
-+
-+export type RepositoryKey = { name: string; path: string }
-+
-+export function keyOf(repository: IRepository): RepositoryKey {
-+  return {
-+    name: repository.name,
-+    path: repository.path,
-+  }
-+}
-+
-+export function getFullName(repository: IGHRepository | IRepository) {
-+  let name: string = repository.name
-+
-+  if (repository.kind === 'repository') {
-+    name =
-+      repository.ghRepository == null
-+        ? repository.name || Path.basename(repository.path)
-+        : `${repository.ghRepository.owner.login}/${repository.name}`
-+  } else if (repository.kind === 'gh-repository') {
-+    name = `${repository.owner.login}/${repository.name}`
-+  }
-+
-+  return name
-+}
-+
-+export function computeUserHash(user: IUser): string {
-+  return `${user.login}+${user.endpoint}+${user.avatarUrl}`
-+}
-+
-+export function computeGHRepositoryHash(ghRepo: IGHRepository): string {
-+  return `${ghRepo.defaultBranch}+
-+      ${ghRepo.isPrivate}+
-+      ${ghRepo.cloneUrl}+
-+      ${ghRepo.name}+
-+      ${ghRepo.htmlUrl}+
-+      ${computeUserHash(ghRepo.owner)}+
-+      ${ghRepo.parent && computeGHRepositoryHash(ghRepo.parent)}`
-+}
-+
-+export function computeRepositoryHash(repo: IRepository): string {
-+  return `${repo.name}+
-+      ${repo.path}+
-+      ${repo.isMissing}+
-+      ${repo.ghRepository && computeGHRepositoryHash(repo.ghRepository)}`
-+}
-+
-+export function isFork(ghRepository: IGHRepository) {
-+  return ghRepository.parent != null
-+}
-+
-+export function getEndpoint(repository: IGHRepository): string {
-+  return repository.owner.endpoint
-+}
-+
-+export function createRepositoryModel(
-+  path: string,
-+  isMissing: boolean = false,
-+  ghRepository?: IGHRepository
-+): IRepository {
-+  const model: IRepository = {
-+    kind: 'repository',
-+    name: (ghRepository && ghRepository.name) || Path.basename(path),
-+    path,
-+    isMissing,
-+    ghRepository,
-+  }
-+
-+  return model
-+}
-+
-+export function toRepositoryModel(document: IRepository & LokiObj) {
-+  const result: IRepository = {
-+    kind: 'repository',
-+    name: document.name,
-+    path: document.path,
-+    isMissing: document.isMissing,
-+    ghRepository: document.ghRepository,
-+  }
-+
-+  return result
-+}
-+
-+export function toGHRepositoryModel(
-+  apiResult: IRepositoryAPIResult,
-+  endpoint?: string
-+): IGHRepository {
-+  const ghRepo: IGHRepository = {
-+    kind: 'gh-repository',
-+    name: apiResult.name,
-+    defaultBranch: apiResult.default_branch,
-+    isPrivate: apiResult.private,
-+    cloneUrl: apiResult.clone_url,
-+    htmlUrl: apiResult.html_url,
-+    owner: {
-+      name: apiResult.owner.name,
-+      login: apiResult.owner.login,
-+      email: apiResult.owner.email,
-+      endpoint: endpoint || '', // what is endpoint?
-+      avatarUrl: apiResult.owner.avatar_url,
-+    },
-+    parent: apiResult.parent && toGHRepositoryModel(apiResult.parent), // where do forked repos get their endpoint from
-+    issues: [],
-+    mentionables: [],
-+    pullRequests: [],
-+  }
-+
-+  return ghRepo
-+}
-+
-+export function toPullRequestModel(
-+  apiResult: IPullRequestAPIResult
-+): IPullRequest {
-+  const model: IPullRequest = {
-+    number: apiResult.number,
-+    title: apiResult.title,
-+    createdAt: apiResult.created_at,
-+    head: {
-+      ref: apiResult.head.ref,
-+      sha: apiResult.head.sha,
-+    },
-+    base: {
-+      ref: apiResult.base.ref,
-+      sha: apiResult.base.sha,
-+    },
-+    author: apiResult.user.login,
-+  }
-+
-+  return model
-+}
-added in remote
-  their  100644 7671ad538e80517882ca29d1051953eff4e2e4c3 app/src/database/index.ts
-@@ -0,0 +1,12 @@
-+export * from './models'
-+export * from './collections'
-+export * from './helpers'
-+export * from './gh-database'
-+export {
-+  Command as RepositoryCommands,
-+  Query as RepositoryQueries,
-+} from './command-query/repository'
-+export {
-+  Command as PullRequestCommands,
-+  Query as PullRequestQueries,
-+} from './command-query/pull-request'
-added in remote
-  their  100644 47c351d6d7cb94d19c659c76961d23d7ad46cf3f app/src/database/models.ts
-@@ -0,0 +1,90 @@
-+export type CIStatus = 'failure' | 'pending' | 'success'
-+
-+export interface IRepository {
-+  readonly kind: 'repository'
-+  readonly name: string
-+  readonly path: string
-+  readonly isMissing: boolean
-+  readonly ghRepository?: IGHRepository
-+}
-+
-+export interface IGHRepository {
-+  readonly kind: 'gh-repository'
-+  readonly name: string
-+  readonly defaultBranch: string
-+  readonly isPrivate: boolean
-+  readonly cloneUrl: string
-+  readonly htmlUrl: string | null
-+  readonly issues: ReadonlyArray<IIssue>
-+  readonly owner: IUser
-+  readonly parent: IGHRepository | null
-+  readonly mentionables: ReadonlyArray<IUser>
-+  readonly pullRequests: ReadonlyArray<IPullRequest>
-+}
-+
-+export interface IIssue {
-+  readonly number: number
-+  readonly title: string
-+  readonly updatedAt: Date
-+}
-+
-+export interface IUser {
-+  readonly name: string | null
-+  readonly login: string //key
-+  readonly email: string | null
-+  readonly endpoint: string //key
-+  readonly avatarUrl: string
-+}
-+
-+export interface IPullRequestStatus {
-+  /** The status' state. */
-+  readonly state: CIStatus
-+
-+  /** The number of statuses represented in this combined status. */
-+  readonly totalCount: number
-+
-+  /** The SHA for which this status applies. */
-+  readonly sha: string
-+
-+  /**
-+   * The list of statuses for this specific ref or undefined
-+   * if the database object was created prior to status support
-+   * being added in #3588
-+   */
-+  readonly statuses?: ReadonlyArray<IPullRequestStatusItem>
-+}
-+
-+export interface IPullRequest {
-+  /** The GitHub PR number. */
-+  readonly number: number
-+
-+  /** The title. */
-+  readonly title: string
-+
-+  /** The string formatted date on which the PR was created. */
-+  readonly createdAt: string
-+
-+  /** The ref from which the pull request's changes are coming. */
-+  readonly head: IPullRequestRef
-+
-+  /** The ref which the pull request is targetting. */
-+  readonly base: IPullRequestRef
-+
-+  /** The login of the author. */
-+  readonly author: string
-+}
-+
-+export interface IPullRequestRef {
-+  /** The name of the ref. */
-+  readonly ref: string
-+
-+  /** The SHA of the ref. */
-+  readonly sha: string
-+}
-+
-+export interface IPullRequestStatusItem {
-+  readonly state: CIStatus
-+  readonly targetUrl: string
-+  readonly description: string
-+  readonly context: string
-+}
-changed in both
-  base   100644 d4b62dbf30e18eb25f0eab0014d38984b1e80c6c app/src/lib/api.ts
-  our    100644 e77c79b5d20fbcffe9af534504dac98509135263 app/src/lib/api.ts
-  their  100644 5c6cfde01ed305e7711bd373cc9a1e9a2c8a54b5 app/src/lib/api.ts
-@@ -38,30 +38,34 @@
- /**
-  * Information about a repository as returned by the GitHub API.
-  */
--export interface IAPIRepository {
-+export interface IRepositoryAPIResult {
-   readonly clone_url: string
-   readonly html_url: string
-   readonly name: string
--  readonly owner: IAPIUser
-+  readonly owner: IUserAPIResult
-   readonly private: boolean
-   readonly fork: boolean
-   readonly default_branch: string
-+<<<<<<< .our
-   readonly pushed_at: string
-   readonly parent: IAPIRepository | null
-+=======
-+  readonly parent: IRepositoryAPIResult | null
-+>>>>>>> .their
- }
- 
- /**
-  * Information about a commit as returned by the GitHub API.
-  */
--export interface IAPICommit {
-+export interface ICommitAPIResult {
-   readonly sha: string
--  readonly author: IAPIUser | null
-+  readonly author: IUserAPIResult | null
- }
- 
- /**
-  * Information about a user as returned by the GitHub API.
-  */
--export interface IAPIUser {
-+export interface IUserAPIResult {
-   readonly id: number
-   readonly url: string
-   readonly login: string
-@@ -82,7 +86,7 @@
- }
- 
- /** The users we get from the mentionables endpoint. */
--export interface IAPIMentionableUser {
-+export interface IMentionableUserAPIResult {
-   readonly avatar_url: string
- 
-   /**
-@@ -106,7 +110,7 @@
- /**
-  * Information about a user's email as returned by the GitHub API.
-  */
--export interface IAPIEmail {
-+export interface IEmailAPIResult {
-   readonly email: string
-   readonly verified: boolean
-   readonly primary: boolean
-@@ -114,7 +118,7 @@
- }
- 
- /** Information about an issue as returned by the GitHub API. */
--export interface IAPIIssue {
-+export interface IIssueAPIResult {
-   readonly number: number
-   readonly title: string
-   readonly state: 'open' | 'closed'
-@@ -128,7 +132,7 @@
-  * The API response for a combined view of a commit
-  * status for a given ref
-  */
--export interface IAPIRefStatusItem {
-+export interface IRefStatusItemAPIResult {
-   readonly state: APIRefState
-   readonly target_url: string
-   readonly description: string
-@@ -137,13 +141,13 @@
- }
- 
- /** The API response to a ref status request. */
--interface IAPIRefStatus {
-+interface IRefStatusAPIResult {
-   readonly state: APIRefState
-   readonly total_count: number
--  readonly statuses: ReadonlyArray<IAPIRefStatusItem>
-+  readonly statuses: ReadonlyArray<IRefStatusItemAPIResult>
- }
- 
--interface IAPIPullRequestRef {
-+interface IPullRequestRefAPIResult {
-   readonly ref: string
-   readonly sha: string
- 
-@@ -151,17 +155,17 @@
-    * The repository in which this ref lives. It could be null if the repository
-    * has been deleted since the PR was opened.
-    */
--  readonly repo: IAPIRepository | null
-+  readonly repo: IRepositoryAPIResult | null
- }
- 
- /** Information about a pull request as returned by the GitHub API. */
--export interface IAPIPullRequest {
-+export interface IPullRequestAPIResult {
-   readonly number: number
-   readonly title: string
-   readonly created_at: string
--  readonly user: IAPIUser
--  readonly head: IAPIPullRequestRef
--  readonly base: IAPIPullRequestRef
-+  readonly user: IUserAPIResult
-+  readonly head: IPullRequestRefAPIResult
-+  readonly base: IPullRequestRefAPIResult
- }
- 
- /** The metadata about a GitHub server. */
-@@ -174,21 +178,21 @@
- }
- 
- /** The server response when handling the OAuth callback (with code) to obtain an access token */
--interface IAPIAccessToken {
-+interface IAccessTokenAPIResult {
-   readonly access_token: string
-   readonly scope: string
-   readonly token_type: string
- }
- 
- /** The partial server response when creating a new authorization on behalf of a user */
--interface IAPIAuthorization {
-+interface IAuthorizationAPIResult {
-   readonly token: string
- }
- 
- /** The response we receive from fetching mentionables. */
--interface IAPIMentionablesResponse {
-+interface IMentionablesResponseAPIResult {
-   readonly etag: string | null
--  readonly users: ReadonlyArray<IAPIMentionableUser>
-+  readonly users: ReadonlyArray<IMentionableUserAPIResult>
- }
- 
- /** The response for search results. */
-@@ -254,14 +258,14 @@
-   public async fetchRepository(
-     owner: string,
-     name: string
--  ): Promise<IAPIRepository | null> {
-+  ): Promise<IRepositoryAPIResult | null> {
-     try {
-       const response = await this.request('GET', `repos/${owner}/${name}`)
-       if (response.status === HttpStatusCode.NotFound) {
-         log.warn(`fetchRepository: '${owner}/${name}' returned a 404`)
-         return null
-       }
--      return await parsedResponse<IAPIRepository>(response)
-+      return await parsedResponse<IRepositoryAPIResult>(response)
-     } catch (e) {
-       log.warn(`fetchRepository: an error occurred for '${owner}/${name}'`, e)
-       return null
-@@ -270,10 +274,10 @@
- 
-   /** Fetch all repos a user has access to. */
-   public async fetchRepositories(): Promise<ReadonlyArray<
--    IAPIRepository
-+    IRepositoryAPIResult
-   > | null> {
-     try {
--      return await this.fetchAll<IAPIRepository>('user/repos')
-+      return await this.fetchAll<IRepositoryAPIResult>('user/repos')
-     } catch (error) {
-       log.warn(`fetchRepositories: ${error}`)
-       return null
-@@ -281,10 +285,10 @@
-   }
- 
-   /** Fetch the logged in account. */
--  public async fetchAccount(): Promise<IAPIUser> {
-+  public async fetchAccount(): Promise<IUserAPIResult> {
-     try {
-       const response = await this.request('GET', 'user')
--      const result = await parsedResponse<IAPIUser>(response)
-+      const result = await parsedResponse<IUserAPIResult>(response)
-       return result
-     } catch (e) {
-       log.warn(`fetchAccount: failed with endpoint ${this.endpoint}`, e)
-@@ -293,10 +297,10 @@
-   }
- 
-   /** Fetch the current user's emails. */
--  public async fetchEmails(): Promise<ReadonlyArray<IAPIEmail>> {
-+  public async fetchEmails(): Promise<ReadonlyArray<IEmailAPIResult>> {
-     try {
-       const response = await this.request('GET', 'user/emails')
--      const result = await parsedResponse<ReadonlyArray<IAPIEmail>>(response)
-+      const result = await parsedResponse<ReadonlyArray<IEmailAPIResult>>(response)
- 
-       return Array.isArray(result) ? result : []
-     } catch (e) {
-@@ -310,7 +314,7 @@
-     owner: string,
-     name: string,
-     sha: string
--  ): Promise<IAPICommit | null> {
-+  ): Promise<ICommitAPIResult | null> {
-     try {
-       const path = `repos/${owner}/${name}/commits/${sha}`
-       const response = await this.request('GET', path)
-@@ -318,7 +322,7 @@
-         log.warn(`fetchCommit: '${path}' returned a 404`)
-         return null
-       }
--      return parsedResponse<IAPICommit>(response)
-+      return parsedResponse<ICommitAPIResult>(response)
-     } catch (e) {
-       log.warn(`fetchCommit: returned an error '${owner}/${name}@${sha}'`, e)
-       return null
-@@ -326,12 +330,12 @@
-   }
- 
-   /** Search for a user with the given public email. */
--  public async searchForUserWithEmail(email: string): Promise<IAPIUser | null> {
-+  public async searchForUserWithEmail(email: string): Promise<IUserAPIResult | null> {
-     try {
-       const params = { q: `${email} in:email type:user` }
-       const url = urlWithQueryString('search/users', params)
-       const response = await this.request('GET', url)
--      const result = await parsedResponse<ISearchResults<IAPIUser>>(response)
-+      const result = await parsedResponse<ISearchResults<IUserAPIResult>>(response)
-       const items = result.items
-       if (items.length) {
-         // The results are sorted by score, best to worst. So the first result
-@@ -347,9 +351,9 @@
-   }
- 
-   /** Fetch all the orgs to which the user belongs. */
--  public async fetchOrgs(): Promise<ReadonlyArray<IAPIUser>> {
-+  public async fetchOrgs(): Promise<ReadonlyArray<IUserAPIResult>> {
-     try {
--      return this.fetchAll<IAPIUser>('user/orgs')
-+      return this.fetchAll<IUserAPIResult>('user/orgs')
-     } catch (e) {
-       log.warn(`fetchOrgs: failed with endpoint ${this.endpoint}`, e)
-       return []
-@@ -358,11 +362,11 @@
- 
-   /** Create a new GitHub repository with the given properties. */
-   public async createRepository(
--    org: IAPIUser | null,
-+    org: IUserAPIResult | null,
-     name: string,
-     description: string,
-     private_: boolean
--  ): Promise<IAPIRepository> {
-+  ): Promise<IRepositoryAPIResult> {
-     try {
-       const apiPath = org ? `orgs/${org.login}/repos` : 'user/repos'
-       const response = await this.request('POST', apiPath, {
-@@ -371,7 +375,7 @@
-         private: private_,
-       })
- 
--      return await parsedResponse<IAPIRepository>(response)
-+      return await parsedResponse<IRepositoryAPIResult>(response)
-     } catch (e) {
-       if (e instanceof APIError) {
-         throw e
-@@ -393,7 +397,7 @@
-     name: string,
-     state: 'open' | 'closed' | 'all',
-     since: Date | null
--  ): Promise<ReadonlyArray<IAPIIssue>> {
-+  ): Promise<ReadonlyArray<IIssueAPIResult>> {
-     const params: { [key: string]: string } = {
-       state,
-     }
-@@ -403,7 +407,7 @@
- 
-     const url = urlWithQueryString(`repos/${owner}/${name}/issues`, params)
-     try {
--      const issues = await this.fetchAll<IAPIIssue>(url)
-+      const issues = await this.fetchAll<IIssueAPIResult>(url)
- 
-       // PRs are issues! But we only want Really Seriously Issues.
-       return issues.filter((i: any) => !i.pullRequest)
-@@ -418,10 +422,10 @@
-     owner: string,
-     name: string,
-     state: 'open' | 'closed' | 'all'
--  ): Promise<ReadonlyArray<IAPIPullRequest>> {
-+  ): Promise<ReadonlyArray<IPullRequestAPIResult>> {
-     const url = urlWithQueryString(`repos/${owner}/${name}/pulls`, { state })
-     try {
--      const prs = await this.fetchAll<IAPIPullRequest>(url)
-+      const prs = await this.fetchAll<IPullRequestAPIResult>(url)
-       return prs
-     } catch (e) {
-       log.warn(`fetchPullRequests: failed for repository ${owner}/${name}`, e)
-@@ -434,11 +438,11 @@
-     owner: string,
-     name: string,
-     ref: string
--  ): Promise<IAPIRefStatus> {
-+  ): Promise<IRefStatusAPIResult> {
-     const path = `repos/${owner}/${name}/commits/${ref}/status`
-     try {
-       const response = await this.request('GET', path)
--      const status = await parsedResponse<IAPIRefStatus>(response)
-+      const status = await parsedResponse<IRefStatusAPIResult>(response)
-       return status
-     } catch (e) {
-       log.warn(
-@@ -523,7 +527,7 @@
-     owner: string,
-     name: string,
-     etag: string | null
--  ): Promise<IAPIMentionablesResponse | null> {
-+  ): Promise<IMentionablesResponseAPIResult | null> {
-     // NB: this custom `Accept` is required for the `mentionables` endpoint.
-     const headers: any = {
-       Accept: 'application/vnd.github.jerry-maguire-preview',
-@@ -545,7 +549,7 @@
-       if (response.status === HttpStatusCode.NotModified) {
-         return null
-       }
--      const users = await parsedResponse<ReadonlyArray<IAPIMentionableUser>>(
-+      const users = await parsedResponse<ReadonlyArray<IMentionableUserAPIResult>>(
-         response
-       )
-       const etag = response.headers.get('etag')
-@@ -560,7 +564,7 @@
-    * Retrieve the public profile information of a user with
-    * a given username.
-    */
--  public async fetchUser(login: string): Promise<IAPIUser | null> {
-+  public async fetchUser(login: string): Promise<IUserAPIResult | null> {
-     try {
-       const response = await this.request(
-         'GET',
-@@ -571,7 +575,7 @@
-         return null
-       }
- 
--      return await parsedResponse<IAPIUser>(response)
-+      return await parsedResponse<IUserAPIResult>(response)
-     } catch (e) {
-       log.warn(`fetchUser: failed with endpoint ${this.endpoint}`, e)
-       throw e
-@@ -637,7 +641,7 @@
-   )
- 
-   try {
--    const result = await parsedResponse<IAPIAuthorization>(response)
-+    const result = await parsedResponse<IAuthorizationAPIResult>(response)
-     if (result) {
-       const token = result.token
-       if (token && typeof token === 'string' && token.length) {
-@@ -874,7 +878,7 @@
-         state: state,
-       }
-     )
--    const result = await parsedResponse<IAPIAccessToken>(response)
-+    const result = await parsedResponse<IAccessTokenAPIResult>(response)
-     return result.access_token
-   } catch (e) {
-     log.warn(`requestOAuthToken: failed with endpoint ${endpoint}`, e)
-merged
-  result 100644 e9f18567505d90c790ed1a9e78cc3d5c7607540d app/src/lib/databases/pull-request-database.ts
-  our    100644 7446a4ce1ebf104f7825a7757e6be2beccfbe4ef app/src/lib/databases/pull-request-database.ts
-@@ -1,5 +1,5 @@
- import Dexie from 'dexie'
--import { APIRefState, IAPIRefStatusItem } from '../api'
-+import { APIRefState, IRefStatusItemAPIResult } from '../api'
- import { BaseDatabase } from './base-database'
- 
- export interface IPullRequestRef {
-@@ -66,7 +66,7 @@
-    * if the database object was created prior to status support
-    * being added in #3588
-    */
--  readonly statuses?: ReadonlyArray<IAPIRefStatusItem>
-+  readonly statuses?: ReadonlyArray<IRefStatusItemAPIResult>
- }
- 
- export class PullRequestDatabase extends BaseDatabase {
-changed in both
-  base   100644 760b02c3045adfd175c5e95574dedb44b6d391b8 app/src/lib/dispatcher/dispatcher.ts
-  our    100644 5e56c00e713342e76f5ccba040062e322e8c90cb app/src/lib/dispatcher/dispatcher.ts
-  their  100644 d3a21040c57d47665e2454cf71f005b4758f9526 app/src/lib/dispatcher/dispatcher.ts
-@@ -25,7 +25,7 @@
- import { Branch } from '../../models/branch'
- import { Commit } from '../../models/commit'
- import { ExternalEditor } from '../../lib/editors'
--import { IAPIUser } from '../../lib/api'
-+import { IUserAPIResult } from '../../lib/api'
- import { GitHubRepository } from '../../models/github-repository'
- import { ICommitMessage } from '../stores/git-store'
- import { executeMenuItem } from '../../ui/main-process-proxy'
-@@ -329,7 +329,7 @@
-     description: string,
-     private_: boolean,
-     account: Account,
--    org: IAPIUser | null
-+    org: IUserAPIResult | null
-   ): Promise<Repository> {
-     return this.appStore._publishRepository(
-       repository,
-merged
-  result 100644 8f5db8c73829182de3f168745e3fa54305542e9d app/src/lib/email.ts
-  our    100644 3ac283444e4f360757ee5da392edc097c37794bc app/src/lib/email.ts
-@@ -1,4 +1,4 @@
--import { IAPIEmail } from './api'
-+import { IEmailAPIResult } from './api'
- 
- /**
-  * Lookup a suitable email address to display in the application, based on the
-@@ -14,8 +14,8 @@
-  * @param emails array of email addresses associated with an account
-  */
- export function lookupPreferredEmail(
--  emails: ReadonlyArray<IAPIEmail>
--): IAPIEmail | null {
-+  emails: ReadonlyArray<IEmailAPIResult>
-+): IEmailAPIResult | null {
-   if (emails.length === 0) {
-     return null
-   }
-@@ -38,7 +38,7 @@
- /**
-  * Is the email public?
-  */
--function isEmailPublic(email: IAPIEmail): boolean {
-+function isEmailPublic(email: IEmailAPIResult): boolean {
-   // If an email doesn't have a visibility setting it means it's coming from an
-   // older Enterprise server which doesn't have the concept of visiblity.
-   return email.visibility === 'public' || !email.visibility
-changed in both
-  base   100644 3664497681402ef660531130f999ac3e39892b4d app/src/lib/stores/app-store.ts
-  our    100644 1a4e387e4d192d34abfd0621b4b5ebe8cc34d8d1 app/src/lib/stores/app-store.ts
-  their  100644 0da783ee96ab4fd9f8643355f356060d44cc2c3b app/src/lib/stores/app-store.ts
-@@ -43,6 +43,7 @@
-   matchGitHubRepository,
-   IMatchedGitHubRepository,
-   repositoryMatchesRemote,
-+<<<<<<< .our
- } from '../repository-matching'
- import {
-   API,
-@@ -51,6 +52,10 @@
-   getDotComAPIEndpoint,
-   getEnterpriseAPIURL,
- } from '../api'
-+=======
-+} from '../../lib/repository-matching'
-+import { API, getAccountForEndpoint, IUserAPIResult } from '../../lib/api'
-+>>>>>>> .their
- import { caseInsensitiveCompare } from '../compare'
- import {
-   Branch,
-@@ -2730,7 +2735,7 @@
-     description: string,
-     private_: boolean,
-     account: Account,
--    org: IAPIUser | null
-+    org: IUserAPIResult | null
-   ): Promise<Repository> {
-     const api = API.fromAccount(account)
-     const apiRepository = await api.createRepository(
-merged
-  result 100644 3468d42c0ef4395a79e75b4cadaf6ca401c80c58 app/src/lib/stores/issues-store.ts
-  our    100644 c4b2992a861aecc044e73eeb318e9675d0ee59e7 app/src/lib/stores/issues-store.ts
-@@ -1,5 +1,5 @@
- import { IssuesDatabase, IIssue } from '../databases/issues-database'
--import { API, IAPIIssue } from '../api'
-+import { API, IIssueAPIResult } from '../api'
- import { Account } from '../../models/account'
- import { GitHubRepository } from '../../models/github-repository'
- import { fatalError } from '../fatal-error'
-@@ -76,7 +76,7 @@
-   }
- 
-   private async storeIssues(
--    issues: ReadonlyArray<IAPIIssue>,
-+    issues: ReadonlyArray<IIssueAPIResult>,
-     repository: GitHubRepository
-   ): Promise<void> {
-     const gitHubRepositoryID = repository.dbID
-changed in both
-  base   100644 23008ccae33cd7a55484a79207c7d3d9543c27d7 app/src/lib/stores/pull-request-store.ts
-  our    100644 d9edf0247ea7c33ae2b508f876aa977d8a81d6d4 app/src/lib/stores/pull-request-store.ts
-  their  100644 f1dde026873fcee9f4de25abc66d8c53329bf9d2 app/src/lib/stores/pull-request-store.ts
-@@ -5,7 +5,7 @@
- } from '../databases'
- import { GitHubRepository } from '../../models/github-repository'
- import { Account } from '../../models/account'
--import { API, IAPIPullRequest } from '../api'
-+import { API, IPullRequestAPIResult } from '../api'
- import { fatalError, forceUnwrap } from '../fatal-error'
- import { RepositoriesStore } from './repositories-store'
- import {
-@@ -310,7 +310,7 @@
-   }
- 
-   private async cachePullRequests(
--    pullRequestsFromAPI: ReadonlyArray<IAPIPullRequest>,
-+    pullRequestsFromAPI: ReadonlyArray<IPullRequestAPIResult>,
-     repository: GitHubRepository
-   ): Promise<void> {
-     const repoDbId = repository.dbID
-merged
-  result 100644 a302a2e6b935b27ccea24b60fb308f019b956b48 app/src/lib/stores/repositories-store.ts
-  our    100644 1c0981c70e593bda2422a96ca43b130cedd5db06 app/src/lib/stores/repositories-store.ts
-@@ -7,7 +7,7 @@
- import { GitHubRepository } from '../../models/github-repository'
- import { Repository } from '../../models/repository'
- import { fatalError } from '../fatal-error'
--import { IAPIRepository } from '../api'
-+import { IRepositoryAPIResult } from '../api'
- import { BaseStore } from './base-store'
- 
- /** The store for local repositories. */
-@@ -23,7 +23,7 @@
-   /** Find the matching GitHub repository or add it if it doesn't exist. */
-   public async upsertGitHubRepository(
-     endpoint: string,
--    apiRepository: IAPIRepository
-+    apiRepository: IRepositoryAPIResult
-   ): Promise<GitHubRepository> {
-     return this.db.transaction(
-       'rw',
-@@ -251,7 +251,7 @@
- 
-   private async putGitHubRepository(
-     endpoint: string,
--    gitHubRepository: IAPIRepository
-+    gitHubRepository: IRepositoryAPIResult
-   ): Promise<GitHubRepository> {
-     let parent: GitHubRepository | null = null
-     if (gitHubRepository.parent) {
-@@ -296,7 +296,7 @@
-   public async updateGitHubRepository(
-     repository: Repository,
-     endpoint: string,
--    gitHubRepository: IAPIRepository
-+    gitHubRepository: IRepositoryAPIResult
-   ): Promise<Repository> {
-     const repoID = repository.id
-     if (!repoID) {
-merged
-  result 100644 aab6a484f467bc265ab4217886451e865db504f2 app/src/models/account.ts
-  our    100644 8400b1e41845964df7e675b460454ac5f90de185 app/src/models/account.ts
-@@ -1,4 +1,4 @@
--import { getDotComAPIEndpoint, IAPIEmail } from '../lib/api'
-+import { getDotComAPIEndpoint, IEmailAPIResult } from '../lib/api'
- 
- /**
-  * A GitHub account, representing the user found on GitHub The Website or GitHub Enterprise.
-@@ -19,7 +19,7 @@
-     /** The access token used to perform operations on behalf of this account */
-     public readonly token: string,
-     /** The current list of email addresses associated with the account */
--    public readonly emails: ReadonlyArray<IAPIEmail>,
-+    public readonly emails: ReadonlyArray<IEmailAPIResult>,
-     /** The profile URL to render for this account */
-     public readonly avatarURL: string,
-     /** The database id for this account */
-changed in both
-  base   100644 d14189ae128a22845dc39ec28b62ae2e108a42ba app/src/ui/clone-repository/group-repositories.ts
-  our    100644 b7412f2d5dd94cba15f7a987e719915969a75f6e app/src/ui/clone-repository/group-repositories.ts
-  their  100644 6cce360d40425ead0bbcc38fd341c00cb77fc1d3 app/src/ui/clone-repository/group-repositories.ts
-@@ -1,4 +1,4 @@
--import { IAPIRepository } from '../../lib/api'
-+import { IRepositoryAPIResult } from '../../lib/api'
- import { IFilterListGroup, IFilterListItem } from '../lib/filter-list'
- import { caseInsensitiveCompare } from '../../lib/compare'
- import { OcticonSymbol } from '../octicons'
-@@ -23,7 +23,7 @@
-   readonly url: string
- }
- 
--function getIcon(gitHubRepo: IAPIRepository): OcticonSymbol {
-+function getIcon(gitHubRepo: IRepositoryAPIResult): OcticonSymbol {
-   if (gitHubRepo.private) {
-     return OcticonSymbol.lock
-   }
-@@ -35,7 +35,7 @@
- }
- 
- function convert(
--  repositories: ReadonlyArray<IAPIRepository>
-+  repositories: ReadonlyArray<IRepositoryAPIResult>
- ): ReadonlyArray<ICloneableRepositoryListItem> {
-   const repos: ReadonlyArray<ICloneableRepositoryListItem> = repositories.map(
-     repo => {
-@@ -55,7 +55,7 @@
- }
- 
- export function groupRepositories(
--  repositories: ReadonlyArray<IAPIRepository>,
-+  repositories: ReadonlyArray<IRepositoryAPIResult>,
-   login: string
- ): ReadonlyArray<IFilterListGroup<ICloneableRepositoryListItem>> {
-   const userRepos = repositories.filter(repo => repo.owner.type === 'User')
-merged
-  result 100644 0046063ad8f56f2b7cb21d2a88898cdc0fa75a91 app/src/ui/publish-repository/publish-repository.tsx
-  our    100644 c14a53943087c492bc981e916b32c2d35eedc78c app/src/ui/publish-repository/publish-repository.tsx
-@@ -1,6 +1,6 @@
- import * as React from 'react'
- import { Account } from '../../models/account'
--import { API, IAPIUser } from '../../lib/api'
-+import { API, IUserAPIResult } from '../../lib/api'
- import { TextBox } from '../lib/text-box'
- import { Select } from '../lib/select'
- import { DialogContent } from '../dialog'
-@@ -33,11 +33,11 @@
-    * The org to which this repository belongs. If null, the repository should be
-    * published as a personal repository.
-    */
--  readonly org: IAPIUser | null
-+  readonly org: IUserAPIResult | null
- }
- 
- interface IPublishRepositoryState {
--  readonly orgs: ReadonlyArray<IAPIUser>
-+  readonly orgs: ReadonlyArray<IUserAPIResult>
- }
- 
- /** The Publish Repository component. */
-@@ -65,7 +65,7 @@
- 
-   private async fetchOrgs(account: Account) {
-     const api = API.fromAccount(account)
--    const orgs = (await api.fetchOrgs()) as Array<IAPIUser>
-+    const orgs = (await api.fetchOrgs()) as Array<IUserAPIResult>
-     orgs.sort((a, b) => caseInsensitiveCompare(a.login, b.login))
-     this.setState({ orgs })
-   }
-merged
-  result 100644 fadc5d62c89aeeb2ac87efb8af09198fbf3d3278 app/test/helpers/databases/index.ts
-  our    100644 3db7bdbaa949fd7f7b318dbe44f1785679b6e126 app/test/helpers/databases/index.ts
-@@ -3,3 +3,4 @@
- export * from './test-repositories-database'
- export * from './test-stats-database'
- export * from './test-pull-request-database'
-+export * from './test-gh-database'
-added in remote
-  their  100644 96dd276a52363919e479191833e5cc846162a201 app/test/helpers/databases/test-gh-database.ts
-@@ -0,0 +1,34 @@
-+import * as FSE from 'fs-extra'
-+import { expect } from 'chai'
-+import { getTestGHDatabase, TestGHDatabasePath } from '../test-gh-database'
-+import { Collections } from '../../../src/database'
-+
-+const testDb = getTestGHDatabase()
-+
-+describe('Database', () => {
-+  describe('Initialization', () => {
-+    it('initializes all collections', () => {
-+      const repos = testDb().getCollection(Collections.Repository)
-+
-+      expect(repos).is.not.null
-+    })
-+  })
-+
-+  describe('Adding data', () => {
-+    it('persists the data to disk', async () => {
-+      const repos = testDb().getCollection(Collections.Repository)
-+      await repos.insertOne({
-+        kind: 'repository',
-+        name: 'test',
-+        path: '~/ghd.test.db',
-+        isMissing: false,
-+      })
-+
-+      await testDb().save()
-+
-+      const exists = FSE.existsSync(TestGHDatabasePath)
-+
-+      expect(exists).is.true
-+    })
-+  })
-+})
-added in remote
-  their  100644 8854265709ca4481c2c13489a6daf6f89e0bc788 app/test/helpers/test-gh-database.ts
-@@ -0,0 +1,15 @@
-+import { GHDatabase } from '../../src/database'
-+
-+export const TestGHDatabasePath = '/Users/iamwillshepherd/Desktop/gh.db.json'
-+
-+export function getTestGHDatabase() {
-+  let ghDb: GHDatabase | null = null
-+
-+  return function() {
-+    if (ghDb === null) {
-+      ghDb = new GHDatabase(TestGHDatabasePath)
-+    }
-+
-+    return ghDb
-+  }
-+}
-added in remote
-  their  100644 7789a4b41a51e928ff54516a9d9988febb824835 app/test/unit/database/repository-command-query-test.ts
-@@ -0,0 +1,166 @@
-+import { expect } from 'chai'
-+import { getTestGHDatabase } from '../../helpers/test-gh-database'
-+import {
-+  RepositoryCommands,
-+  Collections,
-+  RepositoryQueries,
-+  RepositoryKey,
-+  IGHRepository,
-+  IUser,
-+  IRepository,
-+  keyOf,
-+} from '../../../src/database'
-+
-+const testDb = getTestGHDatabase()
-+
-+describe('Repository Commands', () => {
-+  beforeEach(async () => {
-+    const collection = testDb().getCollection(Collections.Repository)
-+    await collection.clear()
-+    await testDb().save()
-+  })
-+
-+  describe('addRepository', () => {
-+    it('adds the repository', async () => {
-+      const testPath = 'test'
-+      await RepositoryCommands.addRepository(testPath, testDb())
-+
-+      const addedRepo = testDb()
-+        .getCollection(Collections.Repository)
-+        .find()
-+
-+      expect(addedRepo.length).to.equal(1)
-+    })
-+
-+    it('performs no-op when given path that already exists', async () => {
-+      const testPath = 'test'
-+      await RepositoryCommands.addRepository(testPath, testDb())
-+      await RepositoryCommands.addRepository(testPath, testDb())
-+
-+      const addedRepo = testDb()
-+        .getCollection(Collections.Repository)
-+        .find()
-+
-+      expect(addedRepo.length).to.equal(1)
-+    })
-+  })
-+
-+  describe('addGHRepository', () => {
-+    it('adds the ghRepository', async () => {
-+      // create new repo
-+      const testPath = 'path'
-+      const key: RepositoryKey = {
-+        name: testPath,
-+        path: testPath,
-+      }
-+
-+      await RepositoryCommands.addRepository(testPath, testDb())
-+
-+      // get repo to add a ghRepository to it
-+      let repo = await testDb()
-+        .getCollection(Collections.Repository)
-+        .findOne({ name: key.name, path: key.path })
-+
-+      expect(repo!.ghRepository).to.be.undefined
-+
-+      // add ghRepository
-+      await RepositoryCommands.addGHRepository(
-+        key,
-+        createGHRepository(),
-+        testDb()
-+      )
-+
-+      // get the new repo
-+      repo = await testDb()
-+        .getCollection(Collections.Repository)
-+        .findOne({ name: key.name, path: key.path })
-+
-+      expect(repo!.ghRepository).to.not.be.undefined
-+    })
-+  })
-+
-+  describe('addParentGHRepository', () => {
-+    it.only('adds gh repository to document', async () => {
-+      const repoToInsert = {
-+        ...createRepository(),
-+        ghRepository: {
-+          ...createGHRepository(),
-+        },
-+      }
-+      const key = keyOf(repoToInsert)
-+      await testDb()
-+        .getCollection(Collections.Repository)
-+        .insertOne(repoToInsert)
-+
-+      testDb().save()
-+
-+      await RepositoryCommands.addParentGHRepository(
-+        key,
-+        '',
-+        createGHRepository(),
-+        createGHRepository(),
-+        testDb()
-+      )
-+
-+      const updatedRepo = await testDb()
-+        .getCollection(Collections.Repository)
-+        .findOne({ name: key.name, path: key.path })
-+
-+      expect(updatedRepo!.ghRepository).to.not.be.undefined
-+    })
-+  })
-+})
-+
-+describe('Repository Queries', () => {
-+  beforeEach(async () => {
-+    const collection = testDb().getCollection(Collections.Repository)
-+    await collection.clear()
-+    await testDb().save()
-+  })
-+
-+  describe('getAll', () => {
-+    it('returns all repositories', async () => {
-+      await RepositoryCommands.addRepository('test-repo-1', testDb())
-+      await RepositoryCommands.addRepository('test-repo-2', testDb())
-+      await RepositoryCommands.addRepository('test-repo-3', testDb())
-+      await RepositoryCommands.addRepository('test-repo-4', testDb())
-+
-+      const repos = await RepositoryQueries.getAll(testDb())
-+
-+      expect(repos.length).to.equal(4)
-+    })
-+  })
-+})
-+
-+function createRepository(): IRepository {
-+  return {
-+    kind: 'repository',
-+    name: 'name',
-+    path: 'path',
-+    isMissing: false,
-+  }
-+}
-+
-+function createGHRepository(): IGHRepository {
-+  const owner: IUser = {
-+    name: null,
-+    login: '',
-+    email: null,
-+    endpoint: '',
-+    avatarUrl: '',
-+  }
-+  const ghRepository: IGHRepository = {
-+    kind: 'gh-repository',
-+    name: '',
-+    defaultBranch: '',
-+    isPrivate: false,
-+    cloneUrl: '',
-+    htmlUrl: '',
-+    issues: [],
-+    owner: owner,
-+    parent: null,
-+    mentionables: [],
-+    pullRequests: [],
-+  }
-+  return ghRepository
-+}
-merged
-  result 100644 51e0b11ff0ba9f9fbbc5b903e884ba9c9fcb00eb app/test/unit/email-test.ts
-  our    100644 55c63b58438949fc7f8a2362f9a990117cc5d936 app/test/unit/email-test.ts
-@@ -1,7 +1,7 @@
- import { expect } from 'chai'
- 
- import { lookupPreferredEmail } from '../../src/lib/email'
--import { IAPIEmail } from '../../src/lib/api'
-+import { IEmailAPIResult } from '../../src/lib/api'
- 
- describe('emails', () => {
-   it('returns null for empty list', () => {
-@@ -9,7 +9,7 @@
-   })
- 
-   it('returns the primary if it has public visibility', () => {
--    const emails: IAPIEmail[] = [
-+    const emails: IEmailAPIResult[] = [
-       {
-         email: 'shiftkey@example.com',
-         primary: false,
-@@ -36,7 +36,7 @@
-   })
- 
-   it('returns the primary if it has null visibility', () => {
--    const emails: IAPIEmail[] = [
-+    const emails: IEmailAPIResult[] = [
-       {
-         email: 'shiftkey@example.com',
-         primary: false,
-@@ -63,7 +63,7 @@
-   })
- 
-   it('returns the noreply if there is no public address', () => {
--    const emails: IAPIEmail[] = [
-+    const emails: IEmailAPIResult[] = [
-       {
-         email: 'shiftkey@example.com',
-         primary: false,
-@@ -90,7 +90,7 @@
-   })
- 
-   it('uses first email if nothing special found', () => {
--    const emails: IAPIEmail[] = [
-+    const emails: IEmailAPIResult[] = [
-       {
-         email: 'shiftkey@example.com',
-         primary: false,
-changed in both
-  base   100644 8034e9a41509ef0bedf3e3cc1a10879c5713939b app/test/unit/repositories-clone-grouping-test.ts
-  our    100644 83c00fb3fa5a862ae8b27e94721b2d5ac962335d app/test/unit/repositories-clone-grouping-test.ts
-  their  100644 927f59189b4c030a5934364e7b662bcd373eab4d app/test/unit/repositories-clone-grouping-test.ts
-@@ -4,7 +4,7 @@
-   groupRepositories,
-   YourRepositoriesIdentifier,
- } from '../../src/ui/clone-repository/group-repositories'
--import { IAPIRepository, IAPIUser } from '../../src/lib/api'
-+import { IRepositoryAPIResult, IUserAPIResult } from '../../src/lib/api'
- 
- const users = {
-   shiftkey: {
-@@ -14,7 +14,7 @@
-     avatar_url: '',
-     name: 'Brendan Forster',
-     type: 'User',
--  } as IAPIUser,
-+  } as IUserAPIResult,
-   desktop: {
-     id: 2,
-     url: '',
-@@ -22,7 +22,7 @@
-     avatar_url: '',
-     name: 'Desktop',
-     type: 'Organization',
--  } as IAPIUser,
-+  } as IUserAPIResult,
-   octokit: {
-     id: 3,
-     url: '',
-@@ -30,12 +30,12 @@
-     avatar_url: '',
-     name: 'Octokit',
-     type: 'Organization',
--  } as IAPIUser,
-+  } as IUserAPIResult,
- }
- 
- describe('clone repository grouping', () => {
-   it('groups repositories by organization', () => {
--    const repositories: Array<IAPIRepository> = [
-+    const repositories: Array<IRepositoryAPIResult> = [
-       {
-         clone_url: '',
-         html_url: '',
-changed in both
-  base   100644 4f50c70494d77eebb361fea30170605dcfd57f75 app/test/unit/repositories-store-test.ts
-  our    100644 494c842a7b1384406f5afa4b664134c29366ea2b app/test/unit/repositories-store-test.ts
-  their  100644 a29ae0bd759983bd2b0561e49afa77901a3ce1d6 app/test/unit/repositories-store-test.ts
-@@ -2,7 +2,7 @@
- 
- import { RepositoriesStore } from '../../src/lib/stores/repositories-store'
- import { TestRepositoriesDatabase } from '../helpers/databases'
--import { IAPIRepository } from '../../src/lib/api'
-+import { IRepositoryAPIResult } from '../../src/lib/api'
- 
- describe('RepositoriesStore', () => {
-   let repositoriesStore: RepositoriesStore | null = null
-@@ -35,7 +35,7 @@
-   })
- 
-   describe('updating a GitHub repository', () => {
--    const gitHubRepo: IAPIRepository = {
-+    const gitHubRepo: IRepositoryAPIResult = {
-       clone_url: 'https://github.com/my-user/my-repo',
-       html_url: 'https://github.com/my-user/my-repo',
-       name: 'my-repo',
-changed in both
-  base   100644 b017e5071b105d30e40c12577ba965bef3cfa5c2 app/yarn.lock
-  our    100644 cd6294bb698115d3ff652d361f00efbf85c1e781 app/yarn.lock
-  their  100644 4c3c5a5dd1c1e3959da17bbfd1bfd78855021857 app/yarn.lock
-@@ -6,6 +6,10 @@
-   version "0.0.6"
-   resolved "https://registry.yarnpkg.com/7zip/-/7zip-0.0.6.tgz#9cafb171af82329490353b4816f03347aa150a30"
- 
-+"@types/lokijs@1.5.2":
-+  version "1.5.2"
-+  resolved "https://registry.yarnpkg.com/@types/lokijs/-/lokijs-1.5.2.tgz#ed228f080033ce1fb16eff4acde65cb9ae0f1bf2"
-+
- accessibility-developer-tools@^2.11.0:
-   version "2.12.0"
-   resolved "https://registry.yarnpkg.com/accessibility-developer-tools/-/accessibility-developer-tools-2.12.0.tgz#3da0cce9d6ec6373964b84f35db7cfc3df7ab514"
-@@ -548,6 +552,21 @@
-   dependencies:
-     nan "2.5.1"
- 
-+<<<<<<< .our
-+=======
-+loader-utils@^1.0.2:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
-+  dependencies:
-+    big.js "^3.1.3"
-+    emojis-list "^2.0.0"
-+    json5 "^0.5.0"
-+
-+lokijs@^1.5.3:
-+  version "1.5.3"
-+  resolved "https://registry.yarnpkg.com/lokijs/-/lokijs-1.5.3.tgz#6952722ffa3049a55a5e1c10ee4a0947a3e5e19b"
-+
-+>>>>>>> .their
- loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.0, loose-envify@^1.3.1:
-   version "1.3.1"
-   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
diff --git a/app/test/fixtures/merge-parser/desktop/merge-not-too-small-now-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-not-too-small-now-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index 4c2fe296536..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-not-too-small-now-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-changed in both
-  base   100644 fa95746b3b525b06246015c03db11b35209b8fb1 app/src/ui/repository.tsx
-  our    100644 efb00423012b8da0dfa5e8897acacaeb0a5e648a app/src/ui/repository.tsx
-  their  100644 4d3531ca19c963bdb06019e6d7343e8cf75b68c9 app/src/ui/repository.tsx
-@@ -26,7 +26,14 @@
- /** The widest the sidebar can be with the minimum window size. */
- const MaxSidebarWidth = 495
- 
-+<<<<<<< .our
- interface IRepositoryViewProps {
-+=======
-+/** The narrowist the sidebar can be with the minumum window size. */
-+const MinSideBarWidth = 225
-+
-+interface IRepositoryProps {
-+>>>>>>> .their
-   readonly repository: Repo
-   readonly state: IRepositoryState
-   readonly dispatcher: Dispatcher
-@@ -202,6 +209,7 @@
- 
-   private renderSidebar(): JSX.Element {
-     return (
-+<<<<<<< .our
-       <FocusContainer onFocusWithinChanged={this.onSidebarFocusWithinChanged}>
-         <Resizable
-           id="repository-sidebar"
-@@ -214,6 +222,19 @@
-           {this.renderSidebarContents()}
-         </Resizable>
-       </FocusContainer>
-+=======
-+      <Resizable
-+        id="repository-sidebar"
-+        width={this.props.sidebarWidth}
-+        onReset={this.handleSidebarWidthReset}
-+        onResize={this.handleSidebarResize}
-+        maximumWidth={MaxSidebarWidth}
-+        minimumWidth={MinSideBarWidth}
-+      >
-+        {this.renderTabs()}
-+        {this.renderSidebarContents()}
-+      </Resizable>
-+>>>>>>> .their
-     )
-   }
- 
diff --git a/app/test/fixtures/merge-parser/desktop/merge-nothing-to-see-here-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-nothing-to-see-here-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index c471d373015..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-nothing-to-see-here-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-changed in both
-  base   100644 454b6d52f2d8373f9222ecf4875ece71ebec3326 app/src/ui/history/compare.tsx
-  our    100644 c0be0e26ce79b9a590edfa3a9fd3718fa58782d4 app/src/ui/history/compare.tsx
-  their  100644 4766dbad1115f99d4df3e95afa61665b8cb5d03f app/src/ui/history/compare.tsx
-@@ -187,11 +187,18 @@
-   }
- 
-   private renderNotificationBanner() {
-+<<<<<<< .our
-     if (!enableNotificationOfBranchUpdates()) {
-       return null
-     }
- 
-     if (!this.props.isDivergingBranchBannerVisible) {
-+=======
-+    if (
-+      !(enableNotificationOfBranchUpdates &&
-+      this.props.isDivergingBranchBannerVisible)
-+    ) {
-+>>>>>>> .their
-       return null
-     }
- 
diff --git a/app/test/fixtures/merge-parser/desktop/merge-overlays-are-the-best-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-overlays-are-the-best-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index c5147387dee..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-overlays-are-the-best-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,113 +0,0 @@
-changed in both
-  base   100644 af19dd9d365b02088b01219e105e23e0146652af app/src/ui/app.tsx
-  our    100644 c38c806e36c237ea70f3cdeee739941530c0c7cd app/src/ui/app.tsx
-  their  100644 d56edf28e3caea7701b5830b921a21768623b84c app/src/ui/app.tsx
-@@ -79,7 +79,15 @@
- import { BlankSlateView } from './blank-slate'
- import { ConfirmRemoveRepository } from './remove-repository'
- import { TermsAndConditions } from './terms-and-conditions'
-+<<<<<<< .our
- import { PushBranchCommits } from './branches'
-+=======
-+import { ZoomInfo } from './window/zoom-info'
-+import { FullScreenInfo } from './window/full-screen-info'
-+import { LfsInfo } from './window/lfs-info'
-+import { PushBranchCommits } from './branches/push-branch-commits'
-+import { Branch } from '../models/branch'
-+>>>>>>> .their
- import { CLIInstalled } from './cli-installed'
- import { GenericGitAuthentication } from './generic-git-auth'
- import { ShellError } from './shell'
-@@ -1373,10 +1381,19 @@
-     return <FullScreenInfo windowState={this.state.windowState} />
-   }
- 
-+<<<<<<< .our
-   private clearError = (error: Error) => this.props.dispatcher.clearError(error)
- 
-   private onConfirmDiscardChangesChanged = (value: boolean) => {
-     this.props.dispatcher.setConfirmDiscardChangesSetting(value)
-+=======
-+  private renderLfsInfo() {
-+    return <LfsInfo />
-+  }
-+
-+  private clearError = (error: Error) => {
-+    this.props.dispatcher.clearError(error)
-+>>>>>>> .their
-   }
- 
-   private renderAppError() {
-@@ -1751,9 +1768,18 @@
-       <div id="desktop-app-chrome" className={className}>
-         <AppTheme theme={currentTheme} />
-         {this.renderTitlebar()}
-+<<<<<<< .our
-         {this.state.showWelcomeFlow
-           ? this.renderWelcomeFlow()
-           : this.renderApp()}
-+=======
-+        {this.state.showWelcomeFlow ? (
-+          this.renderWelcomeFlow()
-+        ) : (
-+          this.renderApp()
-+        )}
-+        {this.renderLfsInfo()}
-+>>>>>>> .their
-         {this.renderZoomInfo()}
-         {this.renderFullScreenInfo()}
-       </div>
-added in remote
-  their  100644 70ab142005052d18540fbfa8c58b9c3fa53e6a72 app/src/ui/window/lfs-info.tsx
-@@ -0,0 +1,19 @@
-+import * as React from 'react'
-+
-+export class LfsInfo extends React.Component {
-+  public render() {
-+    return (
-+      <div className='toast-notification-container lfs-info-container'>
-+        <div className='toast-notification lfs-info'>
-+          <p className='lfs-info-title'>Reverting commit...</p>
-+          <p className='lfs-info-detail'>
-+            Downloading big_picture.psd
-+          </p>
-+          <p className='lfs-info-detail lfs-info-tertiary'>
-+            50/300MB
-+          </p>
-+        </div>
-+      </div>
-+    )
-+  }
-+}
-changed in both
-  base   100644 90a66e96d8ae86db5d645ff31dc5399e5fbdfb2e app/styles/ui/window/_toast-notification.scss
-  our    100644 69f1e178d8523dc79986e345766ace7b3aa278c2 app/styles/ui/window/_toast-notification.scss
-  their  100644 1e6156f57268a4d9225adc531736c061dbbdc4c6 app/styles/ui/window/_toast-notification.scss
-@@ -52,3 +52,27 @@
-     transition: all 250ms ease-out;
-   }
- }
-+
-+.lfs-info-container {
-+  background: rgba(0,0,0,0.20);
-+}
-+
-+.toast-notification.lfs-info {
-+  background: rgba(0,0,0,0.7);
-+  border-radius: var(--border-radius);
-+  font-size: var(--font-size);
-+}
-+
-+.lfs-info-title,
-+.lfs-info-detail {
-+  margin: 0;
-+}
-+
-+.lfs-info-detail {
-+  font-weight: normal;
-+  font-size: var(--font-size-sm);
-+}
-+
-+.lfs-info-tertiary {
-+  opacity: 0.7;
-+}
diff --git a/app/test/fixtures/merge-parser/desktop/merge-p-p-p-prototype-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-p-p-p-prototype-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index 7c213b9668c..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-p-p-p-prototype-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,261 +0,0 @@
-changed in both
-  base   100644 5e4d7ff5edc9a1a5ac7209a71c2e3e1b47b9711e app/src/ui/changes/commit-message.tsx
-  our    100644 0a0e18fc9f4c8956a648726827dc496f3d5f98db app/src/ui/changes/commit-message.tsx
-  their  100644 cd9ac3a59c87bc74d75c7a37ab39ce694c2e55f3 app/src/ui/changes/commit-message.tsx
-@@ -244,6 +244,10 @@
-   }
- 
-   private async createCommit() {
-+    setTimeout(() => {
-+      this.props.dispatcher.setDivergingBannerVisible(true)
-+    }, 3000)
-+
-     const { summary, description } = this.state
- 
-     if (!this.canCommit()) {
-changed in both
-  base   100644 7b6c13edcfe07b4e0d3bc8e034f8c17ae92230ab app/src/ui/history/compare.tsx
-  our    100644 c0be0e26ce79b9a590edfa3a9fd3718fa58782d4 app/src/ui/history/compare.tsx
-  their  100644 ce00358b5cec55c6c3db0fbe96ed568e5eb57eea app/src/ui/history/compare.tsx
-@@ -24,12 +24,17 @@
- import { SelectionSource } from '../lib/filter-list'
- import { IMatches } from '../../lib/fuzzy-find'
- import { Ref } from '../lib/ref'
-+<<<<<<< .our
- import {
-   NewCommitsBanner,
-   DismissalReason,
- } from '../notification/new-commits-banner'
- import { enableNotificationOfBranchUpdates } from '../../lib/feature-flag'
- import { MergeCallToAction } from './merge-call-to-action'
-+=======
-+import { NewCommitsBanner } from '../notification/new-commits-banner'
-+import { CSSTransitionGroup } from 'react-transition-group';
-+>>>>>>> .their
- 
- interface ICompareSidebarProps {
-   readonly repository: Repository
-@@ -148,8 +153,26 @@
-   public render() {
-     const { allBranches, filterText, showBranchList } = this.props.compareState
-     const placeholderText = getPlaceholderText(this.props.compareState)
-+<<<<<<< .our
-     const DivergingBannerAnimationTimeout = 300
- 
-+=======
-+    const DivergingBannerAnimationTimeout = 500
-+    let child: JSX.Element | null = null
-+
-+    if (this.props.compareState.defaultBranch !== null  && this.props.isDivergingBannerVisible == true) {
-+      child = (
-+        <div className="diverge-banner-wrapper">
-+          <NewCommitsBanner
-+            numCommits={4}
-+            branch={this.props.compareState.defaultBranch}
-+            dispatcher={this.props.dispatcher}
-+          />
-+        </div>
-+      )
-+    }
-+
-+>>>>>>> .their
-     return (
-       <div id="compare-view">
-         <CSSTransitionGroup
-@@ -158,8 +181,13 @@
-           transitionAppearTimeout={DivergingBannerAnimationTimeout}
-           transitionEnterTimeout={DivergingBannerAnimationTimeout}
-           transitionLeaveTimeout={DivergingBannerAnimationTimeout}
-+<<<<<<< .our
-         >
-           {this.renderNotificationBanner()}
-+=======
-+          >
-+          {child}
-+>>>>>>> .their
-         </CSSTransitionGroup>
- 
-         <div className="compare-form">
-changed in both
-  base   100644 14032fe4dbf9ac5d26a02694f515e41086a8cc61 app/src/ui/notification/new-commits-banner.tsx
-  our    100644 fe7b1090d835227962410a64e0f95a32cdd45b6c app/src/ui/notification/new-commits-banner.tsx
-  their  100644 80c18ed974663dbfc38a4afa6cedd1413df5da83 app/src/ui/notification/new-commits-banner.tsx
-@@ -2,6 +2,7 @@
- import { Ref } from '../lib/ref'
- import { Octicon, OcticonSymbol } from '../octicons'
- import { Branch } from '../../models/branch'
-+<<<<<<< .our
- import { Button } from '../lib/button'
- import { Dispatcher } from '../../lib/dispatcher'
- import { Repository } from '../../models/repository'
-@@ -33,6 +34,14 @@
-    * Callback used to dismiss the banner
-    */
-   readonly onDismiss: (reason: DismissalReason) => void
-+=======
-+import { Dispatcher } from '../../lib/dispatcher';
-+
-+interface INewCommitsBannerProps {
-+  readonly numCommits: number
-+  readonly branch: Branch
-+  readonly dispatcher: Dispatcher
-+>>>>>>> .their
- }
- 
- /**
-@@ -42,6 +51,10 @@
-   INewCommitsBannerProps,
-   {}
- > {
-+  private onCloseButtonClick = (e: React.MouseEvent<HTMLAnchorElement>) => {
-+    this.props.dispatcher.setDivergingBannerVisible(false)
-+  }
-+
-   public render() {
-     const pluralize = this.props.commitsBehindBaseBranch > 1
- 
-@@ -53,6 +66,7 @@
-         />
- 
-         <div className="notification-banner-content">
-+<<<<<<< .our
-           <div className="notification-banner-content-body">
-             <p>
-               We have noticed that your branch is{' '}
-@@ -84,6 +98,31 @@
-         >
-           <Octicon symbol={OcticonSymbol.x} />
-         </a>
-+=======
-+          <Octicon symbol={OcticonSymbol.lightBulb} className="notification-icon" />
-+
-+          <div>
-+            <p>
-+              Your branch is <strong>{this.props.numCommits} commits</strong>{' '}
-+              behind <Ref>{this.props.branch.name}</Ref>
-+            </p>
-+
-+            <ButtonGroup>
-+              <Button className="small-button" type="submit" onClick={this.noOp}>
-+                Merge...
-+              </Button>
-+
-+              <Button className="small-button" onClick={this.noOp}>
-+                View commits
-+              </Button>
-+            </ButtonGroup>
-+          </div>
-+
-+          <a className="close" onClick={this.onCloseButtonClick} aria-label="Dismiss banner">
-+            <Octicon symbol={OcticonSymbol.x} />
-+          </a>
-+        </div>
-+>>>>>>> .their
-       </div>
-     )
-   }
-changed in both
-  base   100644 120c6de98e0e7f66eb9d0d0fced3c8fcfbb627ea app/styles/_variables.scss
-  our    100644 6c89a529c5a8dbfefb127f171468af9ae5651141 app/styles/_variables.scss
-  their  100644 2e3ff0d12a5fee7774e509740931b44d519556ce app/styles/_variables.scss
-@@ -381,7 +381,11 @@
-   /** Diverging notification banner colors */
-   --notification-banner-background: $blue-000;
-   --notification-banner-border-color: $blue-200;
-+<<<<<<< .our
-   --notification-ref-background: rgba(255, 255, 255, 0.75);
-+=======
-+  --notification-ref-background: rgba(255,255,255, 0.75);
-+>>>>>>> .their
- 
-   // http://easings.net/#easeOutBack
-   --easing-ease-out-back: cubic-bezier(0.175, 0.885, 0.32, 1.275);
-changed in both
-  base   100644 d088f99cd7b0264beea0bd575733b1d81b45de5a app/styles/ui/_notification-banner.scss
-  our    100644 ec2aae86b8d44d23f35f56cb9684489301016d6b app/styles/ui/_notification-banner.scss
-  their  100644 51e0c4d1db459f4db143b1eca11230e3e2fe70ec app/styles/ui/_notification-banner.scss
-@@ -9,7 +9,10 @@
-   border: var(--base-border);
-   border-color: var(--notification-banner-border-color);
-   border-radius: var(--border-radius);
-+<<<<<<< .our
-   display: flex;
-+=======
-+>>>>>>> .their
-   padding: var(--spacing);
-   position: relative;
- 
-@@ -26,10 +29,13 @@
-       font-size: var(--font-size-sm);
-       margin: 0;
-       padding-right: var(--spacing-double); // Extra space for the close button
-+<<<<<<< .our
- 
-       & + p {
-         margin-top: var(--spacing-half);
-       }
-+=======
-+>>>>>>> .their
-     }
-   }
- 
-@@ -59,6 +65,7 @@
- 
-   &-enter {
-     max-height: 0;
-+<<<<<<< .our
-     opacity: 0;
- 
-     &-active {
-@@ -66,6 +73,32 @@
-       opacity: 1;
-       transition: all var(--undo-animation-duration) cubic-bezier(0, 0, 0.2, 1);
-     }
-+=======
-+
-+    &-active {
-+      max-height: 200px;
-+      transition: max-height var(--undo-animation-duration) ease-in;
-+    }
-+  }
-+
-+  &-leave {
-+    max-height: 200px;
-+
-+    &-active {
-+      max-height: 0;
-+      transition: max-height 0.5s ease-out;
-+
-+      .diverge-banner {
-+        transform: translateX(-100%);
-+        transition: transform 0.25s ease-in-out;
-+      }
-+    }
-+  }
-+
-+  &-wrapper {
-+    overflow: hidden;
-+    border-bottom: var(--base-border);
-+>>>>>>> .their
-   }
- 
-   &-leave {
-changed in both
-  base   100644 9a0a98b7f87142b77f8723419d4401b1e63624a9 app/styles/ui/history/_history.scss
-  our    100644 58cea508b02182fa4f45daf88643d33c3b2dd020 app/styles/ui/history/_history.scss
-  their  100644 c30b352d774c42dcb90afa3ee51e6920f24d3608 app/styles/ui/history/_history.scss
-@@ -63,13 +63,13 @@
-     background: var(--box-alt-background-color);
-     flex: initial;
-     padding: var(--spacing-half);
--    border-bottom: var(--base-border);
-   }
- 
-   .compare-commit-list {
-     flex: 1;
-     display: flex;
-     flex-direction: column;
-+    border-top: var(--base-border);
-   }
- 
-   .merge-cta {
diff --git a/app/test/fixtures/merge-parser/desktop/merge-perth-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-perth-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index a85662986b0..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-perth-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,147 +0,0 @@
-removed in local
-  base   100644 c73d6ac64904f79320bb3aab8699dd2051c26f34 app/src/lib/dispatcher/app-store.ts
-  their  100644 7f819e503ef633730d9323720fec769c7b3c490d app/src/lib/dispatcher/app-store.ts
-changed in both
-  base   100644 ebeee25a685c6c35ecab70e48552bfafee484bbe app/src/lib/logging/main/install.ts
-  our    100644 b2a2141977edc35369eb9e5d77ceb946ab0e23a7 app/src/lib/logging/main/install.ts
-  their  100644 0367ee9b85c798ec98a04c05dbd482cf18b829c4 app/src/lib/logging/main/install.ts
-@@ -14,6 +14,10 @@
-     log('info', '[main] ' + formatLogMessage(message, error))
-   },
-   debug(message: string, error?: Error) {
-+    if (__RELEASE_CHANNEL__ !== 'development') {
-+      return
-+    }
-+
-     log('debug', '[main] ' + formatLogMessage(message, error))
-   },
- } as IDesktopLogger
-changed in both
-  base   100644 13da0924748c38d48d64c3c4a87b1cbf08c40d83 app/src/lib/logging/renderer/install.ts
-  our    100644 c4c24ae3dd53be71b91a1b9c22de630d64018cc7 app/src/lib/logging/renderer/install.ts
-  their  100644 f877721958807a3eaf850889e3b1feac8f5504c7 app/src/lib/logging/renderer/install.ts
-@@ -31,6 +31,10 @@
-     console.info(formatLogMessage(message, error))
-   },
-   debug(message: string, error?: Error) {
-+    if (__RELEASE_CHANNEL__ !== 'development') {
-+      return
-+    }
-+
-     log('debug', message, error)
-     console.debug(formatLogMessage(message, error))
-   },
-changed in both
-  base   100644 b530415f847b4f342cddfe700561206cb348954b app/src/ui/app.tsx
-  our    100644 c38c806e36c237ea70f3cdeee739941530c0c7cd app/src/ui/app.tsx
-  their  100644 4994bbc845f8e6e249c4bba1156ea156966bf36e app/src/ui/app.tsx
-@@ -239,9 +239,7 @@
-   }
- 
-   private performDeferredLaunchActions() {
--    // Loading emoji is super important but maybe less important that loading
--    // the app. So defer it until we have some breathing space.
--    this.props.appStore.loadEmoji()
-+    this.props.appStore.loadDeferredState()
- 
-     this.props.dispatcher.reportStats()
-     setInterval(() => this.props.dispatcher.reportStats(), SendStatsInterval)
-changed in both
-  base   100644 eaf0696bc6fe368ab4f493cfcd8436854d7b765e app/src/ui/lib/update-store.ts
-  our    100644 043bd6b6ec57efda2974dff91759487d0537202f app/src/ui/lib/update-store.ts
-  their  100644 4705555385fa26a8732c820b4c24cc5d267ef42f app/src/ui/lib/update-store.ts
-@@ -1,8 +1,5 @@
- import { remote } from 'electron'
- 
--// Given that `autoUpdater` is entirely async anyways, I *think* it's safe to
--// use with `remote`.
--const autoUpdater = remote.autoUpdater
- const lastSuccessfulCheckKey = 'last-successful-update-check'
- 
- import { Emitter, Disposable } from 'event-kit'
-@@ -53,12 +50,13 @@
-       }
-     }
- 
--    autoUpdater.on('error', this.onAutoUpdaterError)
--    autoUpdater.on('checking-for-update', this.onCheckingForUpdate)
--    autoUpdater.on('update-available', this.onUpdateAvailable)
--    autoUpdater.on('update-not-available', this.onUpdateNotAvailable)
--    autoUpdater.on('update-downloaded', this.onUpdateDownloaded)
-+    getAutoUpdater().on('error', this.onAutoUpdaterError)
-+    getAutoUpdater().on('checking-for-update', this.onCheckingForUpdate)
-+    getAutoUpdater().on('update-available', this.onUpdateAvailable)
-+    getAutoUpdater().on('update-not-available', this.onUpdateNotAvailable)
-+    getAutoUpdater().on('update-downloaded', this.onUpdateDownloaded)
- 
-+<<<<<<< .our
-     window.addEventListener('beforeunload', () => {
-       autoUpdater.removeListener('error', this.onAutoUpdaterError)
-       autoUpdater.removeListener(
-@@ -72,6 +70,32 @@
-       )
-       autoUpdater.removeListener('update-downloaded', this.onUpdateDownloaded)
-     })
-+=======
-+    // This seems to prevent tests from cleanly exiting on Appveyor (see
-+    // https://ci.appveyor.com/project/github-windows/desktop/build/1466). So
-+    // let's just avoid it.
-+    if (!process.env.TEST_ENV) {
-+      window.addEventListener('beforeunload', () => {
-+        getAutoUpdater().removeListener('error', this.onAutoUpdaterError)
-+        getAutoUpdater().removeListener(
-+          'checking-for-update',
-+          this.onCheckingForUpdate
-+        )
-+        getAutoUpdater().removeListener(
-+          'update-available',
-+          this.onUpdateAvailable
-+        )
-+        getAutoUpdater().removeListener(
-+          'update-not-available',
-+          this.onUpdateNotAvailable
-+        )
-+        getAutoUpdater().removeListener(
-+          'update-downloaded',
-+          this.onUpdateDownloaded
-+        )
-+      })
-+    }
-+>>>>>>> .their
-   }
- 
-   private touchLastChecked() {
-@@ -161,8 +185,13 @@
-     this.userInitiatedUpdate = !inBackground
- 
-     try {
-+<<<<<<< .our
-       autoUpdater.setFeedURL({ url: __UPDATES_URL__ })
-       autoUpdater.checkForUpdates()
-+=======
-+      getAutoUpdater().setFeedURL(__UPDATES_URL__)
-+      getAutoUpdater().checkForUpdates()
-+>>>>>>> .their
-     } catch (e) {
-       this.emitError(e)
-     }
-@@ -174,8 +203,18 @@
-     // before we call the function to quit.
-     // eslint-disable-next-line no-sync
-     sendWillQuitSync()
--    autoUpdater.quitAndInstall()
-+    getAutoUpdater().quitAndInstall()
-+  }
-+}
-+
-+let autoUpdater_: Electron.AutoUpdater | null = null
-+
-+function getAutoUpdater(): Electron.AutoUpdater {
-+  if (!autoUpdater_) {
-+    autoUpdater_ = remote.autoUpdater
-   }
-+
-+  return autoUpdater_!
- }
- 
- /** The store which contains the current state of the auto updater. */
diff --git a/app/test/fixtures/merge-parser/desktop/merge-poke-at-electron-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-poke-at-electron-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index e25532cb506..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-poke-at-electron-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,813 +0,0 @@
-changed in both
-  base   100644 2cecde52c1e4b8e3aa0313c3780fce9cc4066161 app/.npmrc
-  our    100644 3169cbf51513c96d00aa269ce03a024f499a47d8 app/.npmrc
-  their  100644 abdc4fc3b94178f210cc4fc3988302c4bed1e2c6 app/.npmrc
-@@ -1,4 +1,8 @@
- runtime = electron
- disturl = https://atom.io/download/electron
-+<<<<<<< .our
- target = 2.0.5
-+=======
-+target = 1.6.11
-+>>>>>>> .their
- arch = x64
-changed in both
-  base   100644 bf47089de434c876948ae48cab85a2995530462a app/src/crash/crash-app.tsx
-  our    100644 d74ab08d432e7f3011711b9f5b4a9c82326b861f app/src/crash/crash-app.tsx
-  their  100644 98c0095143ceed7afe574fd926fd18037367f9f6 app/src/crash/crash-app.tsx
-@@ -102,12 +102,18 @@
-       this.setState({ windowState: getWindowState(window) })
-     })
- 
-+<<<<<<< .our
-     ipcRenderer.on(
-       'error',
-       (event: Electron.IpcMessageEvent, crashDetails: ICrashDetails) => {
-         this.setState(crashDetails)
-       }
-     )
-+=======
-+    ipcRenderer.on('error', (event: Electron.IpcMessageEvent, crashDetails: ICrashDetails) => {
-+      this.setState(crashDetails)
-+    })
-+>>>>>>> .their
- 
-     ipcRenderer.send('crash-ready')
-   }
-removed in local
-  base   100644 d29f875f91f14d3399f3ba8c5f4256913ce5e11f app/src/lib/dispatcher/app-store.ts
-  their  100644 853b472fe10d08536fabe3fc37ba781d2cd36a30 app/src/lib/dispatcher/app-store.ts
-changed in both
-  base   100644 9cdf93716561976efbd6c0a0f8765209455da4b1 app/src/lib/dispatcher/dispatcher.ts
-  our    100644 5e56c00e713342e76f5ccba040062e322e8c90cb app/src/lib/dispatcher/dispatcher.ts
-  their  100644 aacb02c83758e786988eecefe1509299d47cd15d app/src/lib/dispatcher/dispatcher.ts
-@@ -81,11 +81,71 @@
- 
-   public constructor(appStore: AppStore) {
-     this.appStore = appStore
-+<<<<<<< .our
-   }
- 
-   /** Load the initial state for the app. */
-   public loadInitialState(): Promise<void> {
-     return this.appStore.loadInitialState()
-+=======
-+
-+    appStore.onDidAuthenticate((user) => {
-+      this.addAccount(user)
-+    })
-+
-+    ipcRenderer.on('shared/did-update', (event: Electron.IpcMessageEvent, args: any[]) => this.onSharedDidUpdate(event, args))
-+  }
-+
-+  public async loadInitialState(): Promise<void> {
-+    const users = await this.loadUsers()
-+    const repositories = await this.loadRepositories()
-+    this.appStore._loadFromSharedProcess(users, repositories, true)
-+  }
-+
-+  private dispatchToSharedProcess<T>(action: Action): Promise<T> {
-+    return this.send(action.name, action)
-+  }
-+
-+  private send<T>(name: string, args: Object): Promise<T> {
-+    return new Promise<T>((resolve, reject) => {
-+
-+      const requestGuid = uuid()
-+      ipcRenderer.once(`shared/response/${requestGuid}`, (event: any, args: any[]) => {
-+        const response: IPCResponse<T> = args[0]
-+        if (response.type === 'result') {
-+          resolve(response.result)
-+        } else {
-+          const errorInfo = response.error
-+          const error = new IPCError(errorInfo.name, errorInfo.message, errorInfo.stack || '')
-+          if (__DEV__) {
-+          }
-+
-+          reject(error)
-+        }
-+      })
-+
-+      ipcRenderer.send('shared/request', [ { guid: requestGuid, name, args } ])
-+    })
-+  }
-+
-+  private onSharedDidUpdate(event: Electron.IpcMessageEvent, args: any[]) {
-+    const state: { repositories: ReadonlyArray<IRepository>, accounts: ReadonlyArray<IAccount> } = args[0].state
-+    const inflatedAccounts = state.accounts.map(Account.fromJSON)
-+    const inflatedRepositories = state.repositories.map(Repository.fromJSON)
-+    this.appStore._loadFromSharedProcess(inflatedAccounts, inflatedRepositories, false)
-+  }
-+
-+  /** Get the users */
-+  private async loadUsers(): Promise<ReadonlyArray<Account>> {
-+    const json = await this.dispatchToSharedProcess<ReadonlyArray<IAccount>>({ name: 'get-accounts' })
-+    return json.map(Account.fromJSON)
-+  }
-+
-+  /** Get the repositories the user has added to the app. */
-+  private async loadRepositories(): Promise<ReadonlyArray<Repository>> {
-+    const json = await this.dispatchToSharedProcess<ReadonlyArray<IRepository>>({ name: 'get-repositories' })
-+    return json.map(Repository.fromJSON)
-+>>>>>>> .their
-   }
- 
-   /**
-changed in both
-  base   100644 f6ac32b3b8b3ec828c89fa4c6db6f083121bb202 app/src/lib/globals.d.ts
-  our    100644 fe0ba976e925a57a73938c30e3022a0b0c08fbde app/src/lib/globals.d.ts
-  their  100644 2eb28637921bd47faf2a10723ed165974c4b89e9 app/src/lib/globals.d.ts
-@@ -32,9 +32,12 @@
- 
- declare const __CLI_COMMANDS__: ReadonlyArray<string>
- 
-+<<<<<<< .our
- /** The URL for Squirrel's updates. */
- declare const __UPDATES_URL__: string
- 
-+=======
-+>>>>>>> .their
- /**
-  * The currently executing process kind, this is specific to desktop
-  * and identifies the processes that we have.
-@@ -75,6 +78,7 @@
-   readonly timeRemaining: () => DOMHighResTimeStamp
- }
- 
-+<<<<<<< .our
- /**
-  * Contains optional configuration parameters for the requestIdleCallback
-  * function.
-@@ -112,6 +116,51 @@
- ): number
- 
- interface IDesktopLogger {
-+=======
-+// these changes should be pushed into the Electron declarations
-+
-+declare namespace NodeJS {
-+  // tslint:disable-next-line:interface-name
-+  interface Process extends EventEmitter {
-+    once(event: 'uncaughtException', listener: (error: Error) => void): this
-+    on(event: 'uncaughtException', listener: (error: Error) => void): this
-+  }
-+}
-+
-+declare namespace Electron {
-+  // tslint:disable-next-line:interface-name
-+  interface MenuItem {
-+    readonly accelerator?: Electron.Accelerator
-+    readonly submenu?: Electron.Menu
-+    readonly role?: string
-+    readonly type: 'normal' | 'separator' | 'submenu' | 'checkbox' | 'radio'
-+  }
-+
-+  // tslint:disable-next-line:interface-name
-+  interface RequestOptions {
-+    readonly method: string
-+    readonly url: string
-+    readonly headers: any
-+  }
-+
-+  type AppleActionOnDoubleClickPref = 'Maximize' | 'Minimize' | 'None'
-+
-+  // tslint:disable-next-line:interface-name
-+  interface SystemPreferences {
-+    getUserDefault(key: 'AppleActionOnDoubleClick', type: 'string'): AppleActionOnDoubleClickPref
-+  }
-+
-+  // these methods have been marked with optional parameters, where we hadn't assumed this before
-+  // tslint:disable-next-line:interface-name
-+  interface App extends EventEmitter {
-+    makeSingleInstance(callback: (argv: string[], workingDirectory: string) => void): boolean
-+
-+    on(event: 'open-url', listener: (event: Electron.Event, url: string) => void): this
-+  }
-+}
-+
-+declare interface IDesktopLogger {
-+>>>>>>> .their
-   /**
-    * Writes a log message at the 'error' level.
-    *
-changed in both
-  base   100644 f5ac8a810391ffca533591ee49e21aea13dcbc01 app/src/lib/shell.ts
-  our    100644 f77c6e295b680a46baafb43a6ecd079b919b109e app/src/lib/shell.ts
-  their  100644 e36aea83aa9b48f38185921e64c366ac516a1784 app/src/lib/shell.ts
-@@ -77,7 +77,8 @@
- 
-     child.on('close', (code: number, signal) => {
-       done = true
--      process.removeListener('exit', cleanup)
-+      const p = process as any
-+      p.removeListener('exit', cleanup)
-       if (buffers.length) {
-         stdout = Buffer.concat(buffers).toString('utf8')
-       }
-changed in both
-  base   100644 0367d7504c8571509d8641ff1632f36fdf25b152 app/src/main-process/app-window.ts
-  our    100644 127b6b7d515d8acf689f1d96cf4c7b078ea2893b app/src/main-process/app-window.ts
-  their  100644 aabfdad495add832deca037239d0e340c427dd12 app/src/main-process/app-window.ts
-@@ -81,6 +81,11 @@
-     // renderer.
-     if (__DARWIN__) {
-       this.window.on('close', e => {
-+
-+        // TODO
-+        // we expected this event to be populated here but it is not
-+        if (!e) { return }
-+
-         if (!quitting) {
-           e.preventDefault()
-           Menu.sendActionToFirstResponder('hide:')
-@@ -147,10 +152,15 @@
-     })
- 
-     // TODO: This should be scoped by the window.
-+<<<<<<< .our
-     ipcMain.once(
-       'renderer-ready',
-       (event: Electron.IpcMessageEvent, readyTime: number) => {
-         this._rendererReadyTime = readyTime
-+=======
-+    ipcMain.once('renderer-ready', (event: Electron.IpcMessageEvent, readyTime: number) => {
-+      this._rendererReadyTime = readyTime
-+>>>>>>> .their
- 
-         this.maybeEmitDidLoad()
-       }
-changed in both
-  base   100644 06d131fbf21ffe73bf8bc370f75c0c817468b637 app/src/main-process/main.ts
-  our    100644 a406ea4cd47e8c9a733faee41a125eab3f743aa2 app/src/main-process/main.ts
-  their  100644 f0473fd41c33a7c7de640fba201b67373ff5920b app/src/main-process/main.ts
-@@ -120,6 +120,11 @@
- app.on('will-finish-launching', () => {
-   // macOS only
-   app.on('open-url', (event, url) => {
-+
-+    // TODO
-+    // both of these parameters we had assumed would be defined
-+    if (!event || !url) { return }
-+
-     event.preventDefault()
-     handleAppURL(url)
-   })
-@@ -204,6 +209,7 @@
-   let menu = buildDefaultMenu()
-   Menu.setApplicationMenu(menu)
- 
-+<<<<<<< .our
-   ipcMain.on(
-     'update-preferred-app-menu-item-labels',
-     (
-@@ -222,6 +228,8 @@
-     }
-   )
- 
-+=======
-+>>>>>>> .their
-   ipcMain.on('menu-event', (event: Electron.IpcMessageEvent, args: any[]) => {
-     const { name }: { name: MenuEvent } = event as any
-     if (mainWindow) {
-@@ -233,9 +241,26 @@
-    * An event sent by the renderer asking that the menu item with the given id
-    * is executed (ie clicked).
-    */
-+<<<<<<< .our
-   ipcMain.on(
-     'execute-menu-item',
-     (event: Electron.IpcMessageEvent, { id }: { id: string }) => {
-+=======
-+  ipcMain.on('execute-menu-item', (event: Electron.IpcMessageEvent, { id }: { id: string }) => {
-+    const menuItem = findMenuItemByID(menu, id)
-+    if (menuItem) {
-+      const window = BrowserWindow.fromWebContents(event.sender)
-+      const fakeEvent = { preventDefault: () => {}, sender: event.sender }
-+      menuItem.click(fakeEvent, window, event.sender)
-+    }
-+  })
-+
-+  ipcMain.on('update-menu-state', (event: Electron.IpcMessageEvent, items: Array<{ id: string, state: IMenuItemState }>) => {
-+    let sendMenuChangedEvent = false
-+
-+    for (const item of items) {
-+      const { id, state } = item
-+>>>>>>> .their
-       const menuItem = findMenuItemByID(menu, id)
-       if (menuItem) {
-         const window = BrowserWindow.fromWebContents(event.sender)
-@@ -279,12 +304,25 @@
-     }
-   )
- 
-+<<<<<<< .our
-   ipcMain.on(
-     'show-contextual-menu',
-     (event: Electron.IpcMessageEvent, items: ReadonlyArray<IMenuItem>) => {
-       const menu = buildContextMenu(items, ix =>
-         event.sender.send('contextual-menu-action', ix)
-       )
-+=======
-+  ipcMain.on('show-contextual-menu', (event: Electron.IpcMessageEvent, items: ReadonlyArray<any>) => {
-+    const menu = new Menu()
-+    const menuItems = items.map((item, i) => {
-+      return new MenuItem({
-+        label: item.label,
-+        click: () => event.sender.send('contextual-menu-action', i),
-+        type: item.type,
-+        enabled: item.enabled,
-+      })
-+    })
-+>>>>>>> .their
- 
-       const window = BrowserWindow.fromWebContents(event.sender)
-       menu.popup({ window })
-@@ -301,6 +339,7 @@
-     }
-   })
- 
-+<<<<<<< .our
-   ipcMain.on(
-     'show-certificate-trust-dialog',
-     (
-@@ -316,9 +355,18 @@
-           window.showCertificateTrustDialog(certificate, message)
-         })
-       }
-+=======
-+  ipcMain.on('show-certificate-trust-dialog', (event: Electron.IpcMessageEvent, { certificate, message }: { certificate: Electron.Certificate, message: string }) => {
-+    // This API's only implemented on macOS right now.
-+    if (__DARWIN__) {
-+      onDidLoad(window => {
-+        window.showCertificateTrustDialog(certificate, message)
-+      })
-+>>>>>>> .their
-     }
-   )
- 
-+<<<<<<< .our
-   ipcMain.on(
-     'log',
-     (event: Electron.IpcMessageEvent, level: LogLevel, message: string) => {
-@@ -376,6 +424,31 @@
-       })
-     }
-   )
-+=======
-+  ipcMain.on('log', (event: Electron.IpcMessageEvent, level: LogLevel, message: string) => {
-+    writeLog(level, message)
-+  })
-+
-+  ipcMain.on('uncaught-exception', (event: Electron.IpcMessageEvent, error: Error) => {
-+    uncaughtException(error)
-+  })
-+
-+  ipcMain.on('send-error-report', (event: Electron.IpcMessageEvent, { error, extra }: { error: Error, extra: { [key: string]: string } }) => {
-+    reportError(error, extra)
-+  })
-+
-+  autoUpdater.on('error', err => {
-+    // TODO
-+    // we expected this event to be populated here but it is not
-+    if (!err) {
-+      return
-+    }
-+
-+    onDidLoad(window => {
-+      window.sendAutoUpdaterError(err)
-+    })
-+  })
-+>>>>>>> .their
- })
- 
- app.on('activate', () => {
-@@ -385,17 +458,40 @@
- })
- 
- app.on('web-contents-created', (event, contents) => {
-+
-+  // TODO
-+  // we expected this event to be populated here but it is not
-+  if (!contents) { return }
-+
-   contents.on('new-window', (event, url) => {
-+
-+    // TODO
-+    // we expected this event to be populated here but it is not
-+    if (!event) { return }
-+
-     // Prevent links or window.open from opening new windows
-     event.preventDefault()
-     log.warn(`Prevented new window to: ${url}`)
-   })
- })
- 
-+<<<<<<< .our
- app.on(
-   'certificate-error',
-   (event, webContents, url, error, certificate, callback) => {
-     callback(false)
-+=======
-+app.on('certificate-error', (event, webContents, url, error, certificate, callback) => {
-+
-+  // TODO
-+  // we expected this event to be populated here but it is not
-+
-+  if (!callback || !certificate || !error || !url) {
-+    return
-+  }
-+
-+  callback(false)
-+>>>>>>> .their
- 
-     onDidLoad(window => {
-       window.sendCertificateError(certificate, error, url)
-changed in both
-  base   100644 490a3a3588751681e05006beeccc79275d8abd79 app/src/main-process/menu/build-default-menu.ts
-  our    100644 7ec8c001136d655a2ecce3d56b9a6804762172fa app/src/main-process/menu/build-default-menu.ts
-  their  100644 e3671806fb873c96717bb896a2b9fac6beb270b7 app/src/main-process/menu/build-default-menu.ts
-@@ -4,6 +4,7 @@
- import { getLogDirectoryPath } from '../../lib/logging/get-log-path'
- import { ensureDir } from 'fs-extra'
- 
-+<<<<<<< .our
- import { log } from '../log'
- import { openDirectorySafe } from '../shell'
- 
-@@ -22,6 +23,9 @@
-   shellLabel: string = defaultShellLabel,
-   pullRequestLabel: string = defaultPullRequestLabel
- ): Electron.Menu {
-+=======
-+export function buildDefaultMenu(sharedProcess: SharedProcess): Electron.Menu {
-+>>>>>>> .their
-   const template = new Array<Electron.MenuItemConstructorOptions>()
-   const separator: Electron.MenuItemConstructorOptions = { type: 'separator' }
- 
-@@ -347,8 +351,13 @@
-     },
-   }
- 
-+<<<<<<< .our
-   const showUserGuides: Electron.MenuItemConstructorOptions = {
-     label: 'Show User Guides',
-+=======
-+  const showLogsItem: Electron.MenuItemConstructorOptions = {
-+    label: __DARWIN__ ? 'Show Logs in Finder' : 'S&how logs in Explorer',
-+>>>>>>> .their
-     click() {
-       shell.openExternal('https://help.github.com/desktop/guides/')
-     },
-changed in both
-  base   100644 ba2f59d5334d7f98a1fd334b52501fc2bc6eb55b app/src/main-process/menu/ensure-item-ids.ts
-  our    100644 70b98c203563f4c9fdb2c59f9a55d91ed872e630 app/src/main-process/menu/ensure-item-ids.ts
-  their  100644 16d55f9b8e18336b301b08e424b1898cd846746c app/src/main-process/menu/ensure-item-ids.ts
-@@ -13,11 +13,15 @@
-  * Note that this does not do anything to prevent the case where items have
-  * explicitly been given duplicate ids.
-  */
-+<<<<<<< .our
- export function ensureItemIds(
-   template: ReadonlyArray<Electron.MenuItemConstructorOptions>,
-   prefix = '@',
-   seenIds = new Set<string>()
- ) {
-+=======
-+export function ensureItemIds(template: ReadonlyArray<Electron.MenuItemConstructorOptions>, prefix = '@', seenIds = new Set<string>()) {
-+>>>>>>> .their
-   for (const item of template) {
-     let counter = 0
-     let id = item.id
-@@ -35,9 +39,13 @@
-     seenIds.add(id)
- 
-     if (item.submenu) {
-+<<<<<<< .our
-       const subMenuTemplate = item.submenu as ReadonlyArray<
-         Electron.MenuItemConstructorOptions
-       >
-+=======
-+      const subMenuTemplate = item.submenu as ReadonlyArray<Electron.MenuItemConstructorOptions>
-+>>>>>>> .their
-       ensureItemIds(subMenuTemplate, item.id, seenIds)
-     }
-   }
-changed in both
-  base   100644 5a2231cecfbbdbccb35226a3ac4269408f169b64 app/src/models/app-menu.ts
-  our    100644 5aaebf59f63ce1bc3d3ff7dca44b2ef668a19b0d app/src/models/app-menu.ts
-  their  100644 27e474d30979f82122d9fc3b70a299c194b7ae8f app/src/models/app-menu.ts
-removed in local
-  base   100644 46e5f5b50a3b1b2ad7f96c2f0c04f0da148fc5f6 app/src/shared-process/communication.ts
-  their  100644 b56ffad7380a096347f6d38f74306925c7904892 app/src/shared-process/communication.ts
-removed in local
-  base   100644 432313c156ec448d02765de169008e03d738c2a2 app/src/shared-process/shared-process.ts
-  their  100644 9c13bf39872c82ef65df1a27e1dcf608ad35fc8a app/src/shared-process/shared-process.ts
-changed in both
-  base   100644 bcf4d1a734aa6217571b14b6f0af97000981b55a app/src/ui/app.tsx
-  our    100644 c38c806e36c237ea70f3cdeee739941530c0c7cd app/src/ui/app.tsx
-  their  100644 f1e27ff69e7c6699631a69294d35d8976dbd0658 app/src/ui/app.tsx
-@@ -177,12 +177,18 @@
-       props.dispatcher.postError(error)
-     })
- 
-+<<<<<<< .our
-     ipcRenderer.on(
-       'menu-event',
-       (event: Electron.IpcMessageEvent, { name }: { name: MenuEvent }) => {
-         this.onMenuEvent(name)
-       }
-     )
-+=======
-+    ipcRenderer.on('menu-event', (event: Electron.IpcMessageEvent, { name }: { name: MenuEvent }) => {
-+      this.onMenuEvent(name)
-+    })
-+>>>>>>> .their
- 
-     updateStore.onDidChange(state => {
-       const status = state.status
-@@ -211,9 +217,16 @@
-         console.info(`Load time: ${stats.loadTime}ms`)
-         console.info(`Renderer ready time: ${stats.rendererReadyTime}ms`)
- 
-+<<<<<<< .our
-         this.props.dispatcher.recordLaunchStats(stats)
-       }
-     )
-+=======
-+    ipcRenderer.on('launch-timing-stats', (event: Electron.IpcMessageEvent, { stats }: { stats: ILaunchStats }) => {
-+      console.info(`App ready time: ${stats.mainReadyTime}ms`)
-+      console.info(`Load time: ${stats.loadTime}ms`)
-+      console.info(`Renderer ready time: ${stats.rendererReadyTime}ms`)
-+>>>>>>> .their
- 
-     ipcRenderer.on(
-       'certificate-error',
-@@ -234,8 +247,18 @@
-     )
-   }
- 
-+<<<<<<< .our
-   public componentWillUnmount() {
-     window.clearInterval(this.updateIntervalHandle)
-+=======
-+    ipcRenderer.on('certificate-error', (event: Electron.IpcMessageEvent, { certificate, error, url }: { certificate: Electron.Certificate, error: string, url: string }) => {
-+      this.props.dispatcher.showPopup({
-+        type: PopupType.UntrustedCertificate,
-+        certificate,
-+        url,
-+      })
-+    })
-+>>>>>>> .their
-   }
- 
-   private performDeferredLaunchActions() {
-changed in both
-  base   100644 349e06c78238860ffddde0c2a56c192b923d96d9 app/src/ui/index.tsx
-  our    100644 f8f8200917327048c8f002fcfade473dfd6668d1 app/src/ui/index.tsx
-  their  100644 9d69fef01d8872138546bb13775dcc75ab71bd8f app/src/ui/index.tsx
-@@ -174,12 +174,18 @@
-   dispatcher.setAppFocusState(false)
- })
- 
-+<<<<<<< .our
- ipcRenderer.on(
-   'url-action',
-   (event: Electron.IpcMessageEvent, { action }: { action: URLActionType }) => {
-     dispatcher.dispatchURLAction(action)
-   }
- )
-+=======
-+ipcRenderer.on('url-action', (event: Electron.IpcMessageEvent, { action }: { action: URLActionType }) => {
-+  dispatcher.dispatchURLAction(action)
-+})
-+>>>>>>> .their
- 
- ReactDOM.render(
-   <App dispatcher={dispatcher} appStore={appStore} startTime={startTime} />,
-changed in both
-  base   100644 ffbeb3a62a9f9f9cc5aceffa8b263d92dd3d4657 app/src/ui/lib/update-store.ts
-  our    100644 043bd6b6ec57efda2974dff91759487d0537202f app/src/ui/lib/update-store.ts
-  their  100644 c9ac3becaf5032297b7fb0430cc40e00691a31c4 app/src/ui/lib/update-store.ts
-@@ -53,7 +53,17 @@
-       }
-     }
- 
-+<<<<<<< .our
-     autoUpdater.on('error', this.onAutoUpdaterError)
-+=======
-+    // We're using our own error event instead of `autoUpdater`s so that we can
-+    // properly serialize the `Error` object for transport over IPC. See
-+    // https://github.com/desktop/desktop/issues/1266.
-+    ipcRenderer.on('auto-updater-error', (event: Electron.IpcMessageEvent, error: Error) => {
-+      this.onAutoUpdaterError(error)
-+    })
-+
-+>>>>>>> .their
-     autoUpdater.on('checking-for-update', this.onCheckingForUpdate)
-     autoUpdater.on('update-available', this.onUpdateAvailable)
-     autoUpdater.on('update-not-available', this.onUpdateNotAvailable)
-changed in both
-  base   100644 029ab5c3684b6a3e60d1d963a0377a59d548739e app/src/ui/main-process-proxy.ts
-  our    100644 3ab029492d92e1c831e2d9ea8307c72e3daab383 app/src/ui/main-process-proxy.ts
-  their  100644 9eb2744a0e2a28002d12edcac65089a4404d6176 app/src/ui/main-process-proxy.ts
-@@ -66,6 +66,7 @@
-  * should be called only once, around app load time.
-  */
- export function registerContextualMenuActionDispatcher() {
-+<<<<<<< .our
-   ipcRenderer.on(
-     'contextual-menu-action',
-     (event: Electron.IpcMessageEvent, index: number) => {
-@@ -82,6 +83,17 @@
-         action()
-         currentContextualMenuItems = null
-       }
-+=======
-+  ipcRenderer.on('contextual-menu-action', (event: Electron.IpcMessageEvent, index: number) => {
-+    if (!currentContextualMenuItems) { return }
-+    if (index >= currentContextualMenuItems.length) { return }
-+
-+    const item = currentContextualMenuItems[index]
-+    const action = item.action
-+    if (action) {
-+      action()
-+      currentContextualMenuItems = null
-+>>>>>>> .their
-     }
-   )
- }
-changed in both
-  base   100644 014cd67343b58a448ac2b3743dbd6b30a2357074 app/src/ui/window/title-bar.tsx
-  our    100644 8fe8df4251980f3b61cd747d621ab0206a88f8c9 app/src/ui/window/title-bar.tsx
-  their  100644 7f47455de9e5e87be61cd78896d07e8cea02b8b6 app/src/ui/window/title-bar.tsx
-@@ -31,6 +31,10 @@
-   readonly style?: React.CSSProperties
- }
- 
-+<<<<<<< .our
-+=======
-+
-+>>>>>>> .their
- function getState(props: ITitleBarProps): ITitleBarState {
-   // See windowZoomFactor in ITitleBarProps, this is only
-   // applicable on macOS.
-@@ -52,10 +56,14 @@
-   }
- 
-   private onTitlebarDoubleClickDarwin = () => {
-+<<<<<<< .our
-     const actionOnDoubleClick = remote.systemPreferences.getUserDefault(
-       'AppleActionOnDoubleClick',
-       'string'
-     )
-+=======
-+    const actionOnDoubleClick = remote.systemPreferences.getUserDefault('AppleActionOnDoubleClick', 'string')
-+>>>>>>> .their
-     const mainWindow = remote.getCurrentWindow()
- 
-     switch (actionOnDoubleClick) {
-changed in both
-  base   100644 42b430f128bbe81af43d6a1eca08aa11eee1159a app/src/ui/window/window-controls.tsx
-  our    100644 06500dcb9df1933061dd5a0b0f238a8ce5f2c4bb app/src/ui/window/window-controls.tsx
-  their  100644 8a2503c29c49147040f159e9640a1069a27ca734 app/src/ui/window/window-controls.tsx
-@@ -50,10 +50,14 @@
-     return nextState.windowState !== this.state.windowState
-   }
- 
-+<<<<<<< .our
-   private onWindowStateChanged = (
-     event: Electron.IpcMessageEvent,
-     args: any
-   ) => {
-+=======
-+  private onWindowStateChanged = (event: Electron.IpcMessageEvent, args: any) => {
-+>>>>>>> .their
-     this.setState({ windowState: args as WindowState })
-   }
- 
-changed in both
-  base   100644 52444d15ac755f2eaf479e2bfa2792121ac14277 app/test/unit/main-process/menu-test.ts
-  our    100644 0b0db198f51c86f465b1e78f32409595952b4e9e app/test/unit/main-process/menu-test.ts
-  their  100644 be1eda7cbb087fa010222b546b891ff136eb67e8 app/test/unit/main-process/menu-test.ts
-@@ -15,9 +15,13 @@
-     })
- 
-     it('assigns ids to items which lack it', () => {
-+<<<<<<< .our
-       const template: Electron.MenuItemConstructorOptions[] = [
-         { label: 'File' },
-       ]
-+=======
-+      const template: Electron.MenuItemConstructorOptions[] = [ { label: 'File' } ]
-+>>>>>>> .their
- 
-       ensureItemIds(template)
- 
-@@ -44,15 +48,23 @@
- 
-       expect(template[0].id).to.equal('foo')
- 
-+<<<<<<< .our
-       const firstSubmenu = template[0]
-         .submenu! as Electron.MenuItemConstructorOptions[]
-+=======
-+      const firstSubmenu = template[0].submenu! as Electron.MenuItemConstructorOptions[]
-+>>>>>>> .their
- 
-       expect(firstSubmenu[0].id).to.equal('foo.Open')
-       expect(firstSubmenu[1].id).to.equal('foo.Close')
-       expect(firstSubmenu[2].id).to.equal('foo.More')
- 
-+<<<<<<< .our
-       const secondSubmenu = firstSubmenu[2]
-         .submenu! as Electron.MenuItemConstructorOptions[]
-+=======
-+      const secondSubmenu = firstSubmenu[2].submenu! as Electron.MenuItemConstructorOptions[]
-+>>>>>>> .their
- 
-       expect(secondSubmenu[0].id).to.equal('foo.More.Even more')
-     })
-changed in both
-  base   100644 c41bdb847b5c540cec431ca1ffd18250ee8bcc7d package.json
-  our    100644 2006bfb748810f6ea8bdbd26edf7c09524a1388a package.json
-  their  100644 000f00feea0bf7627c2db0f4e2e7266ab00dd86e package.json
-@@ -61,6 +61,7 @@
-     "chai": "^4.1.1",
-     "chai-as-promised": "^7.1.1",
-     "chai-datetime": "^1.4.1",
-+<<<<<<< .our
-     "chalk": "^2.2.0",
-     "clean-webpack-plugin": "^0.1.19",
-     "cross-env": "^5.0.5",
-@@ -86,6 +87,26 @@
-     "octicons": "^7.0.1",
-     "parallel-webpack": "^2.3.0",
-     "prettier": "^1.14.2",
-+=======
-+    "clean-webpack-plugin": "^0.1.16",
-+    "cross-env": "^3.2.3",
-+    "css-loader": "^0.26.2",
-+    "electron": "1.6.11",
-+    "electron-mocha": "^3.5.0",
-+    "electron-packager": "8.6.0",
-+    "electron-winstaller": "2.5.2",
-+    "express": "^4.15.0",
-+    "extract-text-webpack-plugin": "^2.1.0",
-+    "fs-extra": "^2.1.2",
-+    "got": "^6.3.0",
-+    "html-webpack-plugin": "^2.28.0",
-+    "klaw-sync": "^1.1.2",
-+    "legal-eagle": "0.15.0",
-+    "mocha": "^3.4.2",
-+    "node-native-loader": "^1.1.1",
-+    "node-sass": "^4.5.2",
-+    "parallel-webpack": "^1.6.1",
-+>>>>>>> .their
-     "request": "^2.72.0",
-     "rimraf": "^2.5.2",
-     "sass-loader": "^7.0.1",
-@@ -109,6 +130,7 @@
-     "xvfb-maybe": "^0.2.1"
-   },
-   "devDependencies": {
-+<<<<<<< .our
-     "@types/byline": "^4.2.31",
-     "@types/chai": "^4.1.2",
-     "@types/chai-datetime": "^0.0.31",
-@@ -118,6 +140,12 @@
-     "@types/double-ended-queue": "^2.1.0",
-     "@types/electron-packager": "^12.0.0",
-     "@types/electron-winstaller": "^2.6.0",
-+=======
-+    "@types/chai": "^3.4.30",
-+    "@types/chai-datetime": "0.0.30",
-+    "@types/classnames": "^0.0.32",
-+    "@types/codemirror": "0.0.38",
-+>>>>>>> .their
-     "@types/event-kit": "^1.2.28",
-     "@types/express": "^4.11.0",
-     "@types/extract-text-webpack-plugin": "^3.0.3",
-@@ -127,6 +155,7 @@
-     "@types/glob": "^5.0.35",
-     "@types/html-webpack-plugin": "^2.30.3",
-     "@types/keytar": "^4.0.0",
-+<<<<<<< .our
-     "@types/legal-eagle": "^0.15.0",
-     "@types/mini-css-extract-plugin": "^0.2.0",
-     "@types/mocha": "^2.2.48",
-@@ -142,6 +171,15 @@
-     "@types/temp": "^0.8.29",
-     "@types/textarea-caret": "^3.0.0",
-     "@types/to-camel-case": "^1.0.0",
-+=======
-+    "@types/mocha": "^2.2.29",
-+    "@types/node": "^7.0.18",
-+    "@types/react": "15.0.23",
-+    "@types/react-addons-test-utils": "^0.14.17",
-+    "@types/react-dom": "^15.5.0",
-+    "@types/react-transition-group": "^1.1.0",
-+    "@types/react-virtualized": "^9.7.0",
-+>>>>>>> .their
-     "@types/ua-parser-js": "^0.7.30",
-     "@types/untildify": "^3.0.0",
-     "@types/uuid": "^3.4.0",
diff --git a/app/test/fixtures/merge-parser/desktop/merge-popup-polish-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-popup-polish-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index 3dd45f49d1b..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-popup-polish-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-removed in local
-  base   100644 e1408349a785c2497c28287524602cbbdd34d182 app/src/ui/delete-branch/index.tsx
-  their  100644 6bd85d0207ddf997b2c8790c99f8eafdd963c23b app/src/ui/delete-branch/index.tsx
-changed in both
-  base   100644 273224c79683bf991d33981212a3bf6272aaad75 app/styles/_variables.scss
-  our    100644 6c89a529c5a8dbfefb127f171468af9ae5651141 app/styles/_variables.scss
-  their  100644 9fe12b87e01b77e93d6f53888489efb532ed9adc app/styles/_variables.scss
-@@ -5,11 +5,30 @@
- // Primer colors, see https://github.com/primer/primer-css/blob/master/modules/primer-support/lib/variables/color-system.scss
- @import '~primer-support/lib/variables/color-system.scss';
- 
-+<<<<<<< .our
- // Extracted as a SCSS variable so that we can define the --overlay-background-color
- // on both the :root and the ::backdrop scope. The ::backdrop pseudo-element
- // doesn't inherit :root, see
- // https://bugs.chromium.org/p/chromium/issues/detail?id=594096
- $overlay-background-color: rgba(0, 0, 0, 0.4);
-+=======
-+  // Colors
-+  //
-+  // These are declared here to let us avoid duplicating color constants
-+  // in variables. It also makes it easier to read and understand what
-+  // color is being used. Note that these variables should _never_ be
-+  // used outside of this scope.
-+  $blue: #4ca6eb;
-+  $orange: #c9510c;
-+  $yellow: #d0b44c;
-+  $red: #bf2b00;
-+  $green: #6cc644;
-+  $darkGray: #5f717f;
-+  $gray: #ccc;
-+  $lightGray: #f2f2f2;
-+  $lighterGray: #f9f9f9;
-+  $white: #fff;
-+>>>>>>> .their
- 
- :root {
-   --color-new: $green;
-@@ -39,6 +58,8 @@
-   --secondary-button-focus-shadow-color: rgba($gray-200, 0.75);
-   --secondary-button-focus-border-color: $gray-300;
- 
-+  --color-danger: $red;
-+
-   // Typography
-   //
-   // Font, line-height, and color for body text, headings, and more.
-removed in local
-  base   100644 06242692dbd6bf6584f50ba8603963c08f409d25 app/styles/ui/_buttons.scss
-  their  100644 1f1ade4696cb90b66b02043a1e1059866e09845c app/styles/ui/_buttons.scss
-changed in both
-  base   100644 d93b03411b128f27c3810989d821c1cd1fbe0861 app/styles/ui/_popup.scss
-  our    100644 a6ae13e4773c3b09e14fc9b93428d0ff1629965f app/styles/ui/_popup.scss
-  their  100644 90e16269a82f9234988e67499c0d0bd65266b9f6 app/styles/ui/_popup.scss
-@@ -30,10 +30,28 @@
-   white-space: pre-wrap;
- }
- 
-+<<<<<<< .our
- .popup-overlay {
-   z-index: var(--popup-overlay-z-index);
- 
-   background: black;
-   opacity: 0.4;
-   height: 100%;
-+=======
-+.popup-content {
-+  padding: var(--spacing);
-+}
-+
-+.popup-actions {
-+  padding: 0 var(--spacing) var(--spacing);
-+  text-align: left;
-+
-+  button {
-+    margin-right: var(--spacing);
-+  }
-+}
-+
-+.popup-title {
-+  font-weight: var(--font-weight-semibold);
-+>>>>>>> .their
- }
diff --git a/app/test/fixtures/merge-parser/desktop/merge-publish-to-a-specific-team-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-publish-to-a-specific-team-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index 82485827a69..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-publish-to-a-specific-team-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,285 +0,0 @@
-changed in both
-  base   100644 d4b62dbf30e18eb25f0eab0014d38984b1e80c6c app/src/lib/api.ts
-  our    100644 e77c79b5d20fbcffe9af534504dac98509135263 app/src/lib/api.ts
-  their  100644 891538bef5ffaae9006e4609c90b072a39626c11 app/src/lib/api.ts
-@@ -81,6 +81,12 @@
-   readonly type: 'User' | 'Organization'
- }
- 
-+export interface IAPITeam {
-+  readonly id: number
-+  /** The identifier for the team */
-+  readonly name: string
-+}
-+
- /** The users we get from the mentionables endpoint. */
- export interface IAPIMentionableUser {
-   readonly avatar_url: string
-@@ -356,19 +362,34 @@
-     }
-   }
- 
-+  public async fetchTeams(org: IAPIUser): Promise<ReadonlyArray<IAPITeam>> {
-+    const url = `orgs/${org.login}/teams`
-+    try {
-+      return this.fetchAll<IAPITeam>(url)
-+    } catch (e) {
-+      log.warn(`fetchTeams: failed with endpoint ${this.endpoint}${url}`, e)
-+      return []
-+    }
-+  }
-+
-   /** Create a new GitHub repository with the given properties. */
-   public async createRepository(
-     org: IAPIUser | null,
-+    team: IAPITeam | null,
-     name: string,
-     description: string,
-     private_: boolean
-   ): Promise<IAPIRepository> {
-     try {
-       const apiPath = org ? `orgs/${org.login}/repos` : 'user/repos'
-+
-+      const team_id = team != null ? team.id : undefined
-+
-       const response = await this.request('POST', apiPath, {
-         name,
-         description,
-         private: private_,
-+        team_id,
-       })
- 
-       return await parsedResponse<IAPIRepository>(response)
-changed in both
-  base   100644 9c822d8df65d53f5fbdb6939e203a7ba2e11a58c app/src/lib/dispatcher/dispatcher.ts
-  our    100644 5e56c00e713342e76f5ccba040062e322e8c90cb app/src/lib/dispatcher/dispatcher.ts
-  their  100644 92fb3a62a96e103d4f865147ef5a9ca8df2716f5 app/src/lib/dispatcher/dispatcher.ts
-@@ -25,7 +25,7 @@
- import { Branch } from '../../models/branch'
- import { Commit } from '../../models/commit'
- import { ExternalEditor } from '../../lib/editors'
--import { IAPIUser } from '../../lib/api'
-+import { IAPIUser, IAPITeam } from '../../lib/api'
- import { GitHubRepository } from '../../models/github-repository'
- import { ICommitMessage } from '../stores/git-store'
- import { executeMenuItem } from '../../ui/main-process-proxy'
-@@ -329,7 +329,8 @@
-     description: string,
-     private_: boolean,
-     account: Account,
--    org: IAPIUser | null
-+    org: IAPIUser | null,
-+    team: IAPITeam | null
-   ): Promise<Repository> {
-     return this.appStore._publishRepository(
-       repository,
-@@ -337,7 +338,8 @@
-       description,
-       private_,
-       account,
--      org
-+      org,
-+      team
-     )
-   }
- 
-changed in both
-  base   100644 1ed8393b2de89d15fe98af5394808815218893ec app/src/lib/stores/app-store.ts
-  our    100644 1a4e387e4d192d34abfd0621b4b5ebe8cc34d8d1 app/src/lib/stores/app-store.ts
-  their  100644 2f587384d3822eb5c702caff56435dc8c92ccc1c app/src/lib/stores/app-store.ts
-@@ -43,6 +43,7 @@
-   matchGitHubRepository,
-   IMatchedGitHubRepository,
-   repositoryMatchesRemote,
-+<<<<<<< .our
- } from '../repository-matching'
- import {
-   API,
-@@ -51,6 +52,10 @@
-   getDotComAPIEndpoint,
-   getEnterpriseAPIURL,
- } from '../api'
-+=======
-+} from '../../lib/repository-matching'
-+import { API, getAccountForEndpoint, IAPIUser, IAPITeam } from '../../lib/api'
-+>>>>>>> .their
- import { caseInsensitiveCompare } from '../compare'
- import {
-   Branch,
-@@ -2730,11 +2735,13 @@
-     description: string,
-     private_: boolean,
-     account: Account,
--    org: IAPIUser | null
-+    org: IAPIUser | null,
-+    team: IAPITeam | null
-   ): Promise<Repository> {
-     const api = API.fromAccount(account)
-     const apiRepository = await api.createRepository(
-       org,
-+      team,
-       name,
-       description,
-       private_
-merged
-  result 100644 52833651f93201ff5b3259035f62a7153969e552 app/src/ui/publish-repository/publish-repository.tsx
-  our    100644 c14a53943087c492bc981e916b32c2d35eedc78c app/src/ui/publish-repository/publish-repository.tsx
-@@ -1,6 +1,6 @@
- import * as React from 'react'
- import { Account } from '../../models/account'
--import { API, IAPIUser } from '../../lib/api'
-+import { API, IAPIUser, IAPITeam } from '../../lib/api'
- import { TextBox } from '../lib/text-box'
- import { Select } from '../lib/select'
- import { DialogContent } from '../dialog'
-@@ -34,10 +34,17 @@
-    * published as a personal repository.
-    */
-   readonly org: IAPIUser | null
-+
-+  /**
-+   * The team which will be granted access to this repository. Only valid when
-+   * publishing a repository to an organization.
-+   */
-+  readonly team: IAPITeam | null
- }
- 
- interface IPublishRepositoryState {
-   readonly orgs: ReadonlyArray<IAPIUser>
-+  readonly teams: ReadonlyArray<IAPITeam>
- }
- 
- /** The Publish Repository component. */
-@@ -48,7 +55,7 @@
-   public constructor(props: IPublishRepositoryProps) {
-     super(props)
- 
--    this.state = { orgs: [] }
-+    this.state = { orgs: [], teams: [] }
-   }
- 
-   public async componentWillMount() {
-@@ -57,7 +64,7 @@
- 
-   public componentWillReceiveProps(nextProps: IPublishRepositoryProps) {
-     if (this.props.account !== nextProps.account) {
--      this.setState({ orgs: [] })
-+      this.setState({ orgs: [], teams: [] })
- 
-       this.fetchOrgs(nextProps.account)
-     }
-@@ -70,6 +77,13 @@
-     this.setState({ orgs })
-   }
- 
-+  private async fetchTeams(account: Account, org: IAPIUser) {
-+    const api = API.fromAccount(account)
-+    const teams = (await api.fetchTeams(org)) as Array<IAPITeam>
-+    teams.sort((a, b) => caseInsensitiveCompare(a.name, b.name))
-+    this.setState({ teams })
-+  }
-+
-   private updateSettings<K extends keyof IPublishRepositorySettings>(
-     subset: Pick<IPublishRepositorySettings, K>
-   ) {
-@@ -94,10 +108,24 @@
-     const value = event.currentTarget.value
-     const index = parseInt(value, 10)
-     if (index < 0 || isNaN(index)) {
--      this.updateSettings({ org: null })
-+      this.updateSettings({ org: null, team: null })
-+      // clear teams
-+      this.setState({ teams: [] })
-     } else {
-       const org = this.state.orgs[index]
--      this.updateSettings({ org })
-+      this.updateSettings({ org, team: null })
-+      this.fetchTeams(this.props.account, org)
-+    }
-+  }
-+
-+  private onTeamChange = (event: React.FormEvent<HTMLSelectElement>) => {
-+    const value = event.currentTarget.value
-+    const index = parseInt(value, 10)
-+    if (index < 0 || isNaN(index)) {
-+      this.updateSettings({ team: null })
-+    } else {
-+      const team = this.state.teams[index]
-+      this.updateSettings({ team })
-     }
-   }
- 
-@@ -138,6 +166,43 @@
-     )
-   }
- 
-+  private renderTeams(): JSX.Element | null {
-+    if (this.state.teams.length === 0) {
-+      return null
-+    }
-+
-+    const options = new Array<JSX.Element>()
-+    options.push(
-+      <option value={-1} key={-1}>
-+        None
-+      </option>
-+    )
-+
-+    let selectedIndex = -1
-+    const selectedOrg = this.props.settings.team
-+    for (const [index, team] of this.state.teams.entries()) {
-+      if (selectedOrg && selectedOrg.id === team.id) {
-+        selectedIndex = index
-+      }
-+
-+      options.push(
-+        <option value={index} key={index}>
-+          {team.name}
-+        </option>
-+      )
-+    }
-+
-+    return (
-+      <Select
-+        label="Team"
-+        value={selectedIndex.toString()}
-+        onChange={this.onTeamChange}
-+      >
-+        {options}
-+      </Select>
-+    )
-+  }
-+
-   public render() {
-     return (
-       <DialogContent>
-@@ -170,6 +235,7 @@
-         </Row>
- 
-         {this.renderOrgs()}
-+        {this.renderTeams()}
-       </DialogContent>
-     )
-   }
-changed in both
-  base   100644 dbb16e8d0667b3c7f6a9514dda9d6ec8354fe75d app/src/ui/publish-repository/publish.tsx
-  our    100644 ffbdef89f9f0f16e966a7d27c2db06bd897c3db6 app/src/ui/publish-repository/publish.tsx
-  their  100644 b7e75c79d8796d670af3f7cd805356b327fcf0e4 app/src/ui/publish-repository/publish.tsx
-@@ -70,6 +70,7 @@
-       description: '',
-       private: true,
-       org: null,
-+      team: null,
-     }
- 
-     this.state = {
-@@ -229,7 +230,8 @@
-         settings.description,
-         settings.private,
-         account,
--        settings.org
-+        settings.org,
-+        settings.team
-       )
- 
-       this.props.onDismissed()
diff --git a/app/test/fixtures/merge-parser/desktop/merge-react-transition-group-upgrade-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-react-transition-group-upgrade-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index 036a19c284b..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-react-transition-group-upgrade-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,545 +0,0 @@
-changed in both
-  base   100644 3d921e1f4edacdac5bd0e20ba7990d6f68480457 app/package.json
-  our    100644 4ec686d8ad22d3aea1ebe4bddd16f4a7447c3acd app/package.json
-  their  100644 53fac1081a0970ea3edaf53218548200c69a95c8 app/package.json
-@@ -40,9 +40,15 @@
-     "queue": "^4.4.2",
-     "react": "^16.3.2",
-     "react-addons-shallow-compare": "^15.6.2",
-+<<<<<<< .our
-     "react-dom": "^16.3.2",
-     "react-transition-group": "^1.2.0",
-     "react-virtualized": "^9.20.0",
-+=======
-+    "react-dom": "^15.6.2",
-+    "react-transition-group": "^2.2.1",
-+    "react-virtualized": "^9.10.1",
-+>>>>>>> .their
-     "registry-js": "^1.0.7",
-     "runas": "^3.1.1",
-     "source-map-support": "^0.4.15",
-merged
-  result 100644 08f476cd44edbd8362a3e75d5b75dec4dca72782 app/src/ui/app-error.tsx
-  our    100644 ef5de9855835684262a20e0db2dce0397dff7fba app/src/ui/app-error.tsx
-@@ -10,7 +10,7 @@
- import { GitError } from '../lib/git/core'
- import { GitError as GitErrorType } from 'dugite'
- import { Popup, PopupType } from '../lib/app-state'
--import { CSSTransitionGroup } from 'react-transition-group'
-+import { CSSTransition } from 'react-transition-group'
- 
- interface IAppErrorProps {
-   /** The list of queued, app-wide, errors  */
-@@ -131,13 +131,7 @@
-     return <p className={className}>{error.message}</p>
-   }
- 
--  private renderDialog() {
--    const error = this.state.error
--
--    if (!error) {
--      return null
--    }
--
-+  private renderDialog(error: Error): JSX.Element {
-     return (
-       <Dialog
-         id="app-error"
-@@ -174,15 +168,22 @@
-   }
- 
-   public render() {
-+    const error = this.state.error
-+    if (error == null) {
-+      return null
-+    }
-+
-     return (
--      <CSSTransitionGroup
--        transitionName="modal"
-+      <CSSTransition
-+        classNames="modal"
-         component="div"
--        transitionEnterTimeout={dialogTransitionEnterTimeout}
--        transitionLeaveTimeout={dialogTransitionLeaveTimeout}
-+        timeout={{
-+          enter: dialogTransitionEnterTimeout,
-+          exit: dialogTransitionLeaveTimeout,
-+        }}
-       >
--        {this.renderDialog()}
--      </CSSTransitionGroup>
-+        {this.renderDialog(error)}
-+      </CSSTransition>
-     )
-   }
- }
-changed in both
-  base   100644 a2acbca598aad851c89baa673c370d6ca9b70455 app/src/ui/app.tsx
-  our    100644 c38c806e36c237ea70f3cdeee739941530c0c7cd app/src/ui/app.tsx
-  their  100644 446d391ade9e86fa866dd0e1205223e3a74391d1 app/src/ui/app.tsx
-@@ -1,6 +1,11 @@
- import * as React from 'react'
-+<<<<<<< .our
- import { ipcRenderer, remote } from 'electron'
- import { CSSTransitionGroup } from 'react-transition-group'
-+=======
-+import { ipcRenderer } from 'electron'
-+import { CSSTransition } from 'react-transition-group'
-+>>>>>>> .their
- 
- import {
-   IAppState,
-@@ -972,8 +977,7 @@
-     }
- 
-     const popup = this.state.currentPopup
--
--    if (!popup) {
-+    if (popup == null) {
-       return null
-     }
- 
-@@ -1353,15 +1357,22 @@
-   }
- 
-   private renderPopup() {
-+    const content = this.currentPopupContent()
-+    if (content == null) {
-+      return null
-+    }
-+
-     return (
--      <CSSTransitionGroup
--        transitionName="modal"
-+      <CSSTransition
-+        classNames="modal"
-         component="div"
--        transitionEnterTimeout={dialogTransitionEnterTimeout}
--        transitionLeaveTimeout={dialogTransitionLeaveTimeout}
-+        timeout={{
-+          enter: dialogTransitionEnterTimeout,
-+          exit: dialogTransitionLeaveTimeout,
-+        }}
-       >
--        {this.currentPopupContent()}
--      </CSSTransitionGroup>
-+        {content}
-+      </CSSTransition>
-     )
-   }
- 
-changed in both
-  base   100644 e1a32ff2d68655613d37d40b216f02948a4a3e54 app/src/ui/branches/branches-container.tsx
-  our    100644 6a5612ae608b20b3a486f139daf4063209bca568 app/src/ui/branches/branches-container.tsx
-  their  100644 b951ac51a543d6fd350c9aa7d9971c84ba35741c app/src/ui/branches/branches-container.tsx
-@@ -15,9 +15,15 @@
- import { BranchList } from './branch-list'
- import { PullRequestList } from './pull-request-list'
- import { PullRequestsLoading } from './pull-requests-loading'
-+<<<<<<< .our
- import { IBranchListItem } from './group-branches'
- import { renderDefaultBranch } from './branch-renderer'
- import { IMatches } from '../../lib/fuzzy-find'
-+=======
-+import { NoPullRequests } from './no-pull-requests'
-+import { PullRequest } from '../../models/pull-request'
-+import { CSSTransition } from 'react-transition-group'
-+>>>>>>> .their
- 
- const PullRequestsLoadingCrossFadeInTimeout = 300
- const PullRequestsLoadingCrossFadeOutTimeout = 200
-@@ -129,15 +135,17 @@
- 
-       case BranchesTab.PullRequests: {
-         return (
--          <CSSTransitionGroup
--            transitionName="cross-fade"
-+          <CSSTransition
-+            classNames="cross-fade"
-             component="div"
-             id="pr-transition-div"
--            transitionEnterTimeout={PullRequestsLoadingCrossFadeInTimeout}
--            transitionLeaveTimeout={PullRequestsLoadingCrossFadeOutTimeout}
-+            timeout={{
-+              enter: PullRequestsLoadingCrossFadeInTimeout,
-+              exit: PullRequestsLoadingCrossFadeOutTimeout,
-+            }}
-           >
-             {this.renderPullRequests()}
--          </CSSTransitionGroup>
-+          </CSSTransition>
-         )
-       }
-     }
-@@ -145,8 +153,25 @@
-     return assertNever(tab, `Unknown Branches tab: ${tab}`)
-   }
- 
-+<<<<<<< .our
-   private renderPullRequests() {
-     if (this.props.isLoadingPullRequests) {
-+=======
-+  private renderPullRequests(): JSX.Element {
-+    const pullRequests = this.props.pullRequests
-+    if (pullRequests.length) {
-+      return (
-+        <PullRequestList
-+          key="pr-list"
-+          pullRequests={pullRequests}
-+          onSelectionChanged={this.onPullRequestSelectionChanged}
-+          selectedPullRequest={this.state.selectedPullRequest}
-+          onItemClick={this.onPullRequestClicked}
-+          onDismiss={this.onDismiss}
-+        />
-+      )
-+    } else if (this.props.isLoadingPullRequests) {
-+>>>>>>> .their
-       return <PullRequestsLoading key="prs-loading" />
-     }
- 
-changed in both
-  base   100644 0702ae42c36af774c86ae52a284de40078cdd939 app/src/ui/changes/sidebar.tsx
-  our    100644 ff1760bbd4b1a3d5ea8ac084b1282e99b2ea288b app/src/ui/changes/sidebar.tsx
-  their  100644 2b24244e5c0a385cc06b6fe9ee7732df20afae33 app/src/ui/changes/sidebar.tsx
-@@ -19,7 +19,7 @@
- } from '../autocompletion'
- import { ClickSource } from '../lib/list'
- import { WorkingDirectoryFileChange } from '../../models/status'
--import { CSSTransitionGroup } from 'react-transition-group'
-+import { CSSTransition } from 'react-transition-group'
- import { openFile } from '../../lib/open-file'
- import { ITrailer } from '../../lib/git/interpret-trailers'
- import { Account } from '../../models/account'
-@@ -242,30 +242,25 @@
-     }
-   }
- 
--  private renderMostRecentLocalCommit() {
-+  private renderMostRecentLocalCommit(): JSX.Element | null {
-     const commit = this.props.mostRecentLocalCommit
--    let child: JSX.Element | null = null
--    if (commit) {
--      child = (
-+    if (commit == null) {
-+      return null
-+    }
-+
-+    return (
-+      <CSSTransition
-+        classNames="undo"
-+        appear={true}
-+        timeout={UndoCommitAnimationTimeout}
-+      >
-         <UndoCommit
-           isPushPullFetchInProgress={this.props.isPushPullFetchInProgress}
-           commit={commit}
-           onUndo={this.onUndo}
-           emoji={this.props.emoji}
-         />
--      )
--    }
--
--    return (
--      <CSSTransitionGroup
--        transitionName="undo"
--        transitionAppear={true}
--        transitionAppearTimeout={UndoCommitAnimationTimeout}
--        transitionEnterTimeout={UndoCommitAnimationTimeout}
--        transitionLeaveTimeout={UndoCommitAnimationTimeout}
--      >
--        {child}
--      </CSSTransitionGroup>
-+      </CSSTransition>
-     )
-   }
- 
-changed in both
-  base   100644 a95c57383963d8c769fb6adcfe11d24f238c4772 app/src/ui/window/full-screen-info.tsx
-  our    100644 72280c87e864846e29096e580b19154017556a2b app/src/ui/window/full-screen-info.tsx
-  their  100644 f9e4a9cad21636bf91a30125011b130f0c605de4 app/src/ui/window/full-screen-info.tsx
-@@ -1,5 +1,5 @@
- import * as React from 'react'
--import { CSSTransitionGroup } from 'react-transition-group'
-+import { CSSTransition } from 'react-transition-group'
- import { WindowState } from '../../lib/window-state'
- 
- interface IFullScreenInfoProps {
-@@ -85,11 +85,7 @@
-     this.setState({ renderTransitionGroup: false })
-   }
- 
--  private renderFullScreenNotification() {
--    if (!this.state.renderInfo) {
--      return null
--    }
--
-+  private renderFullScreenNotification(): JSX.Element {
-     const kbdShortcut = __DARWIN__ ? '⌃⌘F' : 'F11'
- 
-     return (
-@@ -104,19 +100,23 @@
-       return null
-     }
- 
-+    if (!this.state.renderInfo) {
-+      return null
-+    }
-+
-     return (
--      <CSSTransitionGroup
--        className="toast-notification-container"
--        transitionName="toast-animation"
--        component="div"
--        transitionAppear={true}
--        transitionEnter={false}
--        transitionLeave={true}
--        transitionAppearTimeout={transitionAppearDuration}
--        transitionLeaveTimeout={transitionLeaveDuration}
-+      <CSSTransition
-+        classNames="toast-notification-container toast-animation"
-+        appear={true}
-+        enter={false}
-+        exit={true}
-+        timeout={{
-+          enter: transitionAppearDuration,
-+          exit: transitionLeaveDuration,
-+        }}
-       >
-         {this.renderFullScreenNotification()}
--      </CSSTransitionGroup>
-+      </CSSTransition>
-     )
-   }
- }
-merged
-  result 100644 debae9e1c6f12e714654324f7ff3d6ce813a09b6 app/src/ui/window/zoom-info.tsx
-  our    100644 aad4453cc16dd9f16fb2b9a39226d058aab18b4c app/src/ui/window/zoom-info.tsx
-@@ -1,5 +1,5 @@
- import * as React from 'react'
--import { CSSTransitionGroup } from 'react-transition-group'
-+import { CSSTransition } from 'react-transition-group'
- 
- interface IZoomInfoProps {
-   readonly windowZoomFactor: number
-@@ -83,11 +83,7 @@
-     this.setState({ renderTransitionGroup: false })
-   }
- 
--  private renderZoomInfo() {
--    if (!this.state.renderInfo) {
--      return null
--    }
--
-+  private renderZoomInfo(): JSX.Element {
-     const zoomPercent = `${(this.state.windowZoomFactor * 100).toFixed(0)} %`
- 
-     return (
-@@ -102,19 +98,22 @@
-       return null
-     }
- 
-+    if (!this.state.renderInfo) {
-+      return null
-+    }
-+
-     return (
--      <CSSTransitionGroup
-+      <CSSTransition
-         id="window-zoom-info"
--        transitionName={this.state.transitionName}
-+        classNames={this.state.transitionName}
-         component="div"
--        transitionAppear={true}
--        transitionEnter={false}
--        transitionLeave={true}
--        transitionAppearTimeout={transitionDuration}
--        transitionLeaveTimeout={transitionDuration}
-+        appear={true}
-+        enter={false}
-+        exit={true}
-+        timeout={transitionDuration}
-       >
-         {this.renderZoomInfo()}
--      </CSSTransitionGroup>
-+      </CSSTransition>
-     )
-   }
- }
-changed in both
-  base   100644 7054dc0108d02d6120683f328413e7294bbc2bfe app/styles/ui/_branches.scss
-  our    100644 b9a9ae211132ba7784f37322c2cb317e9c2aa871 app/styles/ui/_branches.scss
-  their  100644 0ffa4e5c3ac7b7f1bd940bb975b1f85d32719b33 app/styles/ui/_branches.scss
-@@ -63,11 +63,11 @@
-     transition: opacity 300ms ease-in;
-   }
- 
--  .cross-fade-leave {
-+  .cross-fade-exit {
-     opacity: 1;
-   }
- 
--  .cross-fade-leave.cross-fade-leave-active {
-+  .cross-fade-exit.cross-fade-exit-active {
-     opacity: 0;
-     transition: opacity 200ms ease-in;
-   }
-changed in both
-  base   100644 8452efb173e669e14878c01f74896e865306cda9 app/styles/ui/_dialog.scss
-  our    100644 94b86d54fb9b0314deb1ef48cc9e1466578ed390 app/styles/ui/_dialog.scss
-  their  100644 4618e548a928ddc94a42e4eff6d421d7a9200b37 app/styles/ui/_dialog.scss
-@@ -58,7 +58,7 @@
-       }
-     }
- 
--    &-leave {
-+    &-exit {
-       opacity: 1;
-       transform: scale(1);
-       pointer-events: none;
-@@ -68,7 +68,7 @@
-       }
-     }
- 
--    &-leave-active {
-+    &-exit-active {
-       opacity: 0.01;
-       transform: scale(0.25);
-       transition: opacity 100ms ease-in, transform 100ms var(--easing-ease-in-back);
-changed in both
-  base   100644 12ed30b8537694d2d09c4d3d3ae48825cf327697 app/styles/ui/changes/_changes-list.scss
-  our    100644 0260e1b911a78f4462b998784233f4505a8b1154 app/styles/ui/changes/_changes-list.scss
-  their  100644 87cdb6bfc823a73833fb9aa1c09d162d2a88ba6b app/styles/ui/changes/_changes-list.scss
-@@ -56,11 +56,11 @@
-   transition: max-height var(--undo-animation-duration) ease-in;
- }
- 
--.undo-leave {
-+.undo-exit {
-   max-height: 200px;
- }
- 
--.undo-leave.undo-leave-active {
-+.undo-exit.undo-exit-active {
-   max-height: 0;
- 
-   transition: max-height var(--undo-animation-duration) ease-out;
-changed in both
-  base   100644 90a66e96d8ae86db5d645ff31dc5399e5fbdfb2e app/styles/ui/window/_toast-notification.scss
-  our    100644 69f1e178d8523dc79986e345766ace7b3aa278c2 app/styles/ui/window/_toast-notification.scss
-  their  100644 97e40af25738303d77fff2ec5423a92ba7321a84 app/styles/ui/window/_toast-notification.scss
-@@ -47,8 +47,12 @@
-     transition: all 100ms ease-out;
-   }
- 
-+<<<<<<< .our
-   &-leave-active {
-     opacity: 0;
-     transition: all 250ms ease-out;
-   }
-+=======
-+  &-exit-active { opacity: 0; transition: all 250ms ease-out; }
-+>>>>>>> .their
- }
-changed in both
-  base   100644 4a5aa3684805bbec963628b23480b96772347615 app/styles/ui/window/_zoom-info.scss
-  our    100644 0e9a54a357e4abc1b90c957b3f2b5b9d770d63a9 app/styles/ui/window/_zoom-info.scss
-  their  100644 be95e07e73211407b8424fe58dbac0114f528038 app/styles/ui/window/_zoom-info.scss
-@@ -40,12 +40,17 @@
-     }
-   }
- 
-+<<<<<<< .our
-   .zoom-in,
-   .zoom-out {
-     &-leave-active {
-       opacity: 0;
-       transition: opacity 100ms ease-out;
-     }
-+=======
-+  .zoom-in, .zoom-out {
-+    &-exit-active { opacity: 0; transition: opacity 100ms ease-out; }
-+>>>>>>> .their
-     &-appear-active {
-       transform: scale(1);
-       opacity: 1;
-changed in both
-  base   100644 2e45c4560a31468c69ed80ec86a86848b3611c4a app/yarn.lock
-  our    100644 cd6294bb698115d3ff652d361f00efbf85c1e781 app/yarn.lock
-  their  100644 9355fc6b5cc22da467514d6e14ed7bd59bb748a9 app/yarn.lock
-@@ -690,7 +690,11 @@
-   dependencies:
-     asap "~2.0.3"
- 
-+<<<<<<< .our
- prop-types@^15.5.6, prop-types@^15.6.0:
-+=======
-+prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.8:
-+>>>>>>> .their
-   version "15.6.0"
-   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856"
-   dependencies:
-@@ -740,14 +744,15 @@
-   version "3.0.4"
-   resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
- 
--react-transition-group@^1.2.0:
--  version "1.2.1"
--  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-1.2.1.tgz#e11f72b257f921b213229a774df46612346c7ca6"
-+react-transition-group@^2.2.1:
-+  version "2.2.1"
-+  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.2.1.tgz#e9fb677b79e6455fd391b03823afe84849df4a10"
-   dependencies:
-     chain-function "^1.0.0"
-+    classnames "^2.2.5"
-     dom-helpers "^3.2.0"
-     loose-envify "^1.3.1"
--    prop-types "^15.5.6"
-+    prop-types "^15.5.8"
-     warning "^3.0.0"
- 
- react-virtualized@^9.20.0:
-changed in both
-  base   100644 1320c9a046cf624392543acf1261d554c8d2240f package.json
-  our    100644 2006bfb748810f6ea8bdbd26edf7c09524a1388a package.json
-  their  100644 f72adc2033106fe989c10fb73676531a893c1dc3 package.json
-@@ -131,6 +131,7 @@
-     "@types/mini-css-extract-plugin": "^0.2.0",
-     "@types/mocha": "^2.2.48",
-     "@types/mri": "^1.1.0",
-+<<<<<<< .our
-     "@types/node": "^8.10.4",
-     "@types/react": "^16.3.16",
-     "@types/react-dom": "^16.0.5",
-@@ -138,6 +139,14 @@
-     "@types/react-virtualized": "^9.7.12",
-     "@types/request": "^2.0.9",
-     "@types/semver": "^5.5.0",
-+=======
-+    "@types/node": "^7.0.18",
-+    "@types/react": "^16.0.19",
-+    "@types/react-addons-test-utils": "^0.14.20",
-+    "@types/react-dom": "^16.0.2",
-+    "@types/react-transition-group": "^2.0.6",
-+    "@types/react-virtualized": "^9.7.4",
-+>>>>>>> .their
-     "@types/strip-ansi": "^3.0.0",
-     "@types/temp": "^0.8.29",
-     "@types/textarea-caret": "^3.0.0",
-changed in both
-  base   100644 ac6e09215b6e722b659cfbb95cf0d81538e0f669 yarn.lock
-  our    100644 45ddb8bf6902bbb22708d844324093dccda26c79 yarn.lock
-  their  100644 a360a005900287a46bc597e7a035db2be03416d1 yarn.lock
-@@ -205,9 +205,9 @@
-     "@types/node" "*"
-     "@types/react" "*"
- 
--"@types/react-transition-group@1.1.1":
--  version "1.1.1"
--  resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-1.1.1.tgz#372fd2b4777b96aa983ac15fb5cc0ce150550aeb"
-+"@types/react-transition-group@^2.0.6":
-+  version "2.0.6"
-+  resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-2.0.6.tgz#8903fa2cf540ba454461590bff811a787889617c"
-   dependencies:
-     "@types/react" "*"
- 
diff --git a/app/test/fixtures/merge-parser/desktop/merge-reduce-diff-max-length-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-reduce-diff-max-length-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index a4458d04e05..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-reduce-diff-max-length-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-changed in both
-  base   100644 a4a60d43af58a60992e886cb98ae9807c8df44b8 app/src/lib/git/diff.ts
-  our    100644 c7b70925514f334e2076ddb67f208c2f3f12672f app/src/lib/git/diff.ts
-  their  100644 842836abef030ba1cd9af1eb2ffed893c6540395 app/src/lib/git/diff.ts
-@@ -44,7 +44,11 @@
-  * The longest line length we should try to display. If a diff has a line longer
-  * than this, we probably shouldn't attempt it
-  */
-+<<<<<<< .our
- const MaxCharactersPerLine = 5000
-+=======
-+const MaxLineLength = 5000
-+>>>>>>> .their
- 
- /**
-  * Utility function to check whether parsing this buffer is going to cause
diff --git a/app/test/fixtures/merge-parser/desktop/merge-refactoring-into-discrete-parts-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-refactoring-into-discrete-parts-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index 00f02a3e91a..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-refactoring-into-discrete-parts-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,722 +0,0 @@
-changed in both
-  base   100644 fe48405e5f0bbcfbbd7786e07593c26a1dae33cd app/src/ui/lib/filter-list.tsx
-  our    100644 a625bab6249781a07060095fe6306dfd832f032f app/src/ui/lib/filter-list.tsx
-  their  100644 b18e2fb79f6b4c66454c5b92dd09cf535553c8c3 app/src/ui/lib/filter-list.tsx
-@@ -253,9 +253,18 @@
-   }
- 
-   public selectFirstItem(focus: boolean = false) {
-+<<<<<<< .our
-     if (this.list === null) {
-       return
-     }
-+=======
-+    if (this.list !== null) {
-+      const next = findNextSelectableRow(
-+        this.state.rows.length,
-+        { direction: 'down', row: -1 },
-+        this.canSelectRow
-+      )
-+>>>>>>> .their
- 
-     const next = findNextSelectableRow(
-       this.state.rows.length,
-added in remote
-  their  100644 967fdf80dd5add442b6cf28658aade9673b28645 app/src/ui/lib/list/filter-list.tsx
-@@ -0,0 +1,403 @@
-+import * as React from 'react'
-+import * as classnames from 'classnames'
-+
-+import {
-+  SelectionSource as ListSelectionSource,
-+  findNextSelectableRow,
-+} from '../../lib/list'
-+import { FilterTextBox } from './filter-text-box'
-+import { FilterResults } from './filter-results'
-+import { Row } from '../../lib/row'
-+
-+import { match, IMatch } from '../../../lib/fuzzy-find'
-+
-+/** An item in the filter list. */
-+export interface IFilterListItem {
-+  /** The text which represents the item. This is used for filtering. */
-+  readonly text: string
-+
-+  /** A unique identifier for the item. */
-+  readonly id: string
-+}
-+
-+/** A group of items in the list. */
-+export interface IFilterListGroup<T extends IFilterListItem> {
-+  /** The identifier for this group. */
-+  readonly identifier: string
-+
-+  /** The items in the group. */
-+  readonly items: ReadonlyArray<T>
-+}
-+
-+interface IFlattenedGroup {
-+  readonly kind: 'group'
-+  readonly identifier: string
-+}
-+
-+interface IFlattenedItem<T extends IFilterListItem> {
-+  readonly kind: 'item'
-+  readonly item: T
-+  /** Array of indexes in `item.text` that should be highlighted */
-+  readonly matches: ReadonlyArray<number>
-+}
-+
-+/**
-+ * A row in the list. This is used internally after the user-provided groups are
-+ * flattened.
-+ */
-+type IFilterListRow<T extends IFilterListItem> =
-+  | IFlattenedGroup
-+  | IFlattenedItem<T>
-+
-+interface IFilterListProps<T extends IFilterListItem> {
-+  /** A class name for the wrapping element. */
-+  readonly className?: string
-+
-+  /** The height of the rows. */
-+  readonly rowHeight: number
-+
-+  /** The ordered groups to display in the list. */
-+  readonly groups: ReadonlyArray<IFilterListGroup<T>>
-+
-+  /** The selected item. */
-+  readonly selectedItem: T | null
-+
-+  /** Called to render each visible item. */
-+  readonly renderItem: (
-+    item: T,
-+    matches: ReadonlyArray<number>
-+  ) => JSX.Element | null
-+
-+  /** Called to render header for the group with the given identifier. */
-+  readonly renderGroupHeader?: (identifier: string) => JSX.Element | null
-+
-+  /** Called to render content before/above the filter and list. */
-+  readonly renderPreList?: () => JSX.Element | null
-+
-+  /** Called when an item is clicked. */
-+  readonly onItemClick?: (item: T) => void
-+
-+  /**
-+   * This function will be called when the selection changes as a result of a
-+   * user keyboard or mouse action (i.e. not when props change). This function
-+   * will not be invoked when an already selected row is clicked on.
-+   *
-+   * @param selectedItem - The item that was just selected
-+   * @param source       - The kind of user action that provoked the change,
-+   *                       either a pointer device press, or a keyboard event
-+   *                       (arrow up/down)
-+   */
-+  readonly onSelectionChanged?: (
-+    selectedItem: T | null,
-+    source: SelectionSource
-+  ) => void
-+
-+  /**
-+   * Called when a key down happens in the filter text input. Users have a
-+   * chance to respond or cancel the default behavior by calling
-+   * `preventDefault()`.
-+   */
-+  readonly onFilterKeyDown?: (
-+    event: React.KeyboardEvent<HTMLInputElement>
-+  ) => void
-+
-+  /** The current filter text to use in the form */
-+  readonly filterText?: string
-+
-+  /** Called when the filter text is changed by the user */
-+  readonly onFilterTextChanged?: (text: string) => void
-+
-+  /**
-+   * Whether or not the filter list should allow selection
-+   * and filtering. Defaults to false.
-+   */
-+  readonly disabled?: boolean
-+
-+  /** Any props which should cause a re-render if they change. */
-+  readonly invalidationProps: any
-+
-+  /** Called to render content after the filter. */
-+  readonly renderPostFilter?: () => JSX.Element | null
-+
-+  /** Called when there are no items to render.  */
-+  readonly renderNoItems?: () => JSX.Element | null
-+}
-+
-+interface IFilterListState<T extends IFilterListItem> {
-+  readonly rows: ReadonlyArray<IFilterListRow<T>>
-+  readonly selectedRow: number
-+}
-+
-+/**
-+ * Interface describing a user initiated selection change event
-+ * originating from changing the filter text.
-+ */
-+export interface IFilterSelectionSource {
-+  kind: 'filter'
-+
-+  /** The filter text at the time the selection event was raised.  */
-+  filterText: string
-+}
-+
-+export type SelectionSource = ListSelectionSource | IFilterSelectionSource
-+
-+/** A List which includes the ability to filter based on its contents. */
-+export class FilterList<T extends IFilterListItem> extends React.Component<
-+  IFilterListProps<T>,
-+  IFilterListState<T>
-+> {
-+  private list: FilterResults | null = null
-+  private filterTextBox: FilterTextBox | null = null
-+
-+  public constructor(props: IFilterListProps<T>) {
-+    super(props)
-+
-+    this.state = createStateUpdate(props)
-+  }
-+
-+  public componentWillReceiveProps(nextProps: IFilterListProps<T>) {
-+    this.setState(createStateUpdate(nextProps))
-+  }
-+
-+  public componentDidUpdate(
-+    prevProps: IFilterListProps<T>,
-+    prevState: IFilterListState<T>
-+  ) {
-+    if (this.props.onSelectionChanged) {
-+      const oldSelectedItemId = getItemIdFromRowIndex(
-+        prevState.rows,
-+        prevState.selectedRow
-+      )
-+      const newSelectedItemId = getItemIdFromRowIndex(
-+        this.state.rows,
-+        this.state.selectedRow
-+      )
-+
-+      if (oldSelectedItemId !== newSelectedItemId) {
-+        const propSelectionId = this.props.selectedItem
-+          ? this.props.selectedItem.id
-+          : null
-+
-+        if (propSelectionId !== newSelectedItemId) {
-+          const newSelectedItem = getItemFromRowIndex(
-+            this.state.rows,
-+            this.state.selectedRow
-+          )
-+          this.props.onSelectionChanged(newSelectedItem, {
-+            kind: 'filter',
-+            filterText: this.props.filterText || '',
-+          })
-+        }
-+      }
-+    }
-+  }
-+
-+  public componentDidMount() {
-+    if (this.filterTextBox != null) {
-+      this.filterTextBox.selectAll()
-+    }
-+  }
-+
-+  public render() {
-+    return (
-+      <div className={classnames('filter-list', this.props.className)}>
-+        {this.props.renderPreList ? this.props.renderPreList() : null}
-+
-+        <Row className="filter-field-row">
-+          <FilterTextBox
-+            ref={this.onTextBoxRef}
-+            rowCount={this.state.rows.length}
-+            onMoveToRow={this.onMoveToRow}
-+            filterText={this.props.filterText}
-+            disabled={this.props.disabled}
-+            onFilterTextChanged={this.onFilterValueChanged}
-+            onSelectFirstRow={this.onSelectFirstRow}
-+          />
-+
-+          {this.props.renderPostFilter ? this.props.renderPostFilter() : null}
-+        </Row>
-+
-+        <div className="filter-list-container">{this.renderContent()}</div>
-+      </div>
-+    )
-+  }
-+
-+  private renderContent() {
-+    if (this.state.rows.length === 0 && this.props.renderNoItems) {
-+      return this.props.renderNoItems()
-+    } else {
-+      return (
-+        <FilterResults
-+          ref={this.onListRef}
-+          rowCount={this.state.rows.length}
-+          renderRow={this.renderRow}
-+          onFocusTextBox={this.onFocusTextBox}
-+          rowHeight={this.props.rowHeight}
-+          selectedRows={[this.state.selectedRow]}
-+          onSelectedRowChanged={this.onSelectedRowChanged}
-+          canSelectRow={this.canSelectRow}
-+          invalidationProps={{
-+            ...this.props,
-+            ...this.props.invalidationProps,
-+          }}
-+        />
-+      )
-+    }
-+  }
-+
-+  private onFocusTextBox = () => {
-+    if (this.filterTextBox != null) {
-+      this.filterTextBox.focus()
-+    }
-+  }
-+
-+  private onSelectFirstRow = () => {
-+    const rowCount = this.state.rows.length
-+
-+    const selectedRow = findNextSelectableRow(
-+      rowCount,
-+      { direction: 'down', row: -1 },
-+      this.canSelectRow
-+    )
-+
-+    if (selectedRow != null) {
-+      this.onRowClick(selectedRow)
-+    }
-+  }
-+
-+  private onMoveToRow = (direction: 'down' | 'up', currentRow: number) => {
-+    const rowCount = this.state.rows.length
-+
-+    const selectedRow = findNextSelectableRow(
-+      rowCount,
-+      { direction, row: currentRow },
-+      this.canSelectRow
-+    )
-+    if (selectedRow != null) {
-+      this.setState({ selectedRow }, () => {
-+        if (this.list != null) {
-+          this.list.focus()
-+        }
-+      })
-+    }
-+  }
-+
-+  private onRowClick = (index: number) => {
-+    if (this.props.onItemClick) {
-+      const row = this.state.rows[index]
-+
-+      if (row.kind === 'item') {
-+        this.props.onItemClick(row.item)
-+      }
-+    }
-+  }
-+
-+  private renderRow = (index: number) => {
-+    const row = this.state.rows[index]
-+    if (row.kind === 'item') {
-+      return this.props.renderItem(row.item, row.matches)
-+    } else if (this.props.renderGroupHeader) {
-+      return this.props.renderGroupHeader(row.identifier)
-+    } else {
-+      return null
-+    }
-+  }
-+
-+  private onTextBoxRef = (component: FilterTextBox | null) => {
-+    this.filterTextBox = component
-+  }
-+
-+  private onListRef = (instance: FilterResults | null) => {
-+    this.list = instance
-+  }
-+
-+  private onFilterValueChanged = (text: string) => {
-+    if (this.props.onFilterTextChanged) {
-+      this.props.onFilterTextChanged(text)
-+    }
-+  }
-+
-+  private onSelectedRowChanged = (index: number, source: SelectionSource) => {
-+    this.setState({ selectedRow: index })
-+
-+    if (this.props.onSelectionChanged) {
-+      const row = this.state.rows[index]
-+      if (row.kind === 'item') {
-+        this.props.onSelectionChanged(row.item, source)
-+      }
-+    }
-+  }
-+
-+  private canSelectRow = (index: number) => {
-+    if (this.props.disabled) {
-+      return false
-+    }
-+
-+    const row = this.state.rows[index]
-+    return row.kind === 'item'
-+  }
-+}
-+
-+function createStateUpdate<T extends IFilterListItem>(
-+  props: IFilterListProps<T>
-+) {
-+  const flattenedRows = new Array<IFilterListRow<T>>()
-+  const filter = (props.filterText || '').toLowerCase()
-+
-+  for (const group of props.groups) {
-+    const items: ReadonlyArray<IMatch<T>> = filter
-+      ? match(filter, group.items, 'text')
-+      : group.items.map(item => ({ score: 1, matches: [], item }))
-+
-+    if (!items.length) {
-+      continue
-+    }
-+
-+    if (props.renderGroupHeader) {
-+      flattenedRows.push({ kind: 'group', identifier: group.identifier })
-+    }
-+
-+    for (const { item, matches } of items) {
-+      flattenedRows.push({ kind: 'item', item, matches })
-+    }
-+  }
-+
-+  let selectedRow = -1
-+  const selectedItem = props.selectedItem
-+  if (selectedItem) {
-+    selectedRow = flattenedRows.findIndex(
-+      i => i.kind === 'item' && i.item.id === selectedItem.id
-+    )
-+  }
-+
-+  if (selectedRow < 0 && filter.length) {
-+    // If the selected item isn't in the list (e.g., filtered out), then
-+    // select the first visible item.
-+    selectedRow = flattenedRows.findIndex(i => i.kind === 'item')
-+  }
-+
-+  return { rows: flattenedRows, selectedRow }
-+}
-+
-+function getItemFromRowIndex<T extends IFilterListItem>(
-+  items: ReadonlyArray<IFilterListRow<T>>,
-+  index: number
-+): T | null {
-+  if (index >= 0 && index < items.length) {
-+    const row = items[index]
-+
-+    if (row.kind === 'item') {
-+      return row.item
-+    }
-+  }
-+
-+  return null
-+}
-+
-+function getItemIdFromRowIndex<T extends IFilterListItem>(
-+  items: ReadonlyArray<IFilterListRow<T>>,
-+  index: number
-+): string | null {
-+  const item = getItemFromRowIndex(items, index)
-+  return item ? item.id : null
-+}
-added in remote
-  their  100644 d666cd5c14b87ffda942cd0f3e61275231162d0a app/src/ui/lib/list/filter-results.tsx
-@@ -0,0 +1,115 @@
-+import * as React from 'react'
-+
-+import { List, findNextSelectableRow, SelectionSource } from '../../lib/list'
-+
-+interface IFilterResultProps {
-+  /** The number of rows in the current filtered list */
-+  readonly rowCount: number
-+
-+  /** The set of selected rows in the current filtered list */
-+  readonly selectedRows: ReadonlyArray<number>
-+
-+  /** Callback to fire to render an element in the lists */
-+  readonly renderRow: (index: number) => JSX.Element | null
-+
-+  /** Optional callback to render something when no items are available */
-+  readonly renderNoItems?: () => JSX.Element | null
-+
-+  /** The height of each row in the list. */
-+  readonly rowHeight: number
-+
-+  /** Any props which should cause a re-render if they change. */
-+  readonly invalidationProps: any
-+
-+  /** Callback to fire when the selected row changes */
-+  readonly onSelectedRowChanged?: (
-+    index: number,
-+    source: SelectionSource
-+  ) => void
-+
-+  /**
-+   * Function to validate if the given row can be selected by the user
-+   */
-+  readonly canSelectRow: (index: number) => boolean
-+
-+  /**
-+   * Callback to the parent component that it should focus on the filter text box
-+   */
-+  readonly onFocusTextBox: (event: React.KeyboardEvent<any>) => void
-+}
-+
-+export class FilterResults extends React.Component<IFilterResultProps, {}> {
-+  private list: List | null = null
-+
-+  public render() {
-+    if (this.props.rowCount === 0 && this.props.renderNoItems) {
-+      return this.props.renderNoItems()
-+    } else {
-+      return (
-+        <List
-+          ref={this.onListRef}
-+          rowCount={this.props.rowCount}
-+          rowRenderer={this.props.renderRow}
-+          rowHeight={this.props.rowHeight}
-+          selectedRows={this.props.selectedRows}
-+          onSelectedRowChanged={this.props.onSelectedRowChanged}
-+          onRowClick={this.onRowClick}
-+          onRowKeyDown={this.onRowKeyDown}
-+          canSelectRow={this.props.canSelectRow}
-+          invalidationProps={{
-+            ...this.props,
-+            ...this.props.invalidationProps,
-+          }}
-+        />
-+      )
-+    }
-+  }
-+
-+  private onListRef = (instance: List | null) => {
-+    this.list = instance
-+  }
-+
-+  public focus() {
-+    if (this.list != null) {
-+      this.list.focus()
-+    }
-+  }
-+
-+  private onRowClick = (row: number, source: SelectionSource) => {
-+    if (this.props.onSelectedRowChanged) {
-+      this.props.onSelectedRowChanged(row, source)
-+    }
-+  }
-+
-+  private onRowKeyDown = (row: number, event: React.KeyboardEvent<any>) => {
-+    const list = this.list
-+    if (!list) {
-+      return
-+    }
-+
-+    const rowCount = this.props.rowCount
-+
-+    const firstSelectableRow = findNextSelectableRow(
-+      rowCount,
-+      { direction: 'down', row: -1 },
-+      this.props.canSelectRow
-+    )
-+    const lastSelectableRow = findNextSelectableRow(
-+      rowCount,
-+      { direction: 'up', row: 0 },
-+      this.props.canSelectRow
-+    )
-+
-+    let shouldFocus = false
-+
-+    if (event.key === 'ArrowUp' && row === firstSelectableRow) {
-+      shouldFocus = true
-+    } else if (event.key === 'ArrowDown' && row === lastSelectableRow) {
-+      shouldFocus = true
-+    }
-+
-+    if (shouldFocus) {
-+      this.props.onFocusTextBox(event)
-+    }
-+  }
-+}
-added in remote
-  their  100644 ab64cc861dda12b34a24844da30a659e17092457 app/src/ui/lib/list/filter-text-box.tsx
-@@ -0,0 +1,124 @@
-+import * as React from 'react'
-+
-+import { TextBox } from '../../lib/text-box'
-+
-+import { SelectionDirection } from '../../lib/list'
-+
-+interface IFilterTextBoxProps {
-+  /** The number of rows in the current filtered list */
-+  readonly rowCount: number
-+
-+  /** The current filter text to use in the form */
-+  readonly filterText?: string
-+
-+  /** Called when the filter text is changed by the user */
-+  readonly onFilterTextChanged?: (text: string) => void
-+
-+  /**
-+   * Called when a key down happens in the filter text input. Users have a
-+   * chance to respond or cancel the default behavior by calling
-+   * `preventDefault()`.
-+   */
-+  readonly onKeyDown?: (event: React.KeyboardEvent<HTMLInputElement>) => void
-+
-+  /**
-+   * Whether or not the filter list should allow selection
-+   * and filtering. Defaults to false.
-+   */
-+  readonly disabled?: boolean
-+
-+  /** Called when an item should be focused in the filtered list. */
-+  readonly onMoveToRow: (
-+    direction: SelectionDirection,
-+    currentRow: number
-+  ) => void
-+
-+  /** Called when the parent component should choose the default entry in the filtered list. */
-+  readonly onSelectFirstRow: () => void
-+}
-+
-+/** A List which includes the ability to filter based on its contents. */
-+export class FilterTextBox extends React.Component<IFilterTextBoxProps, {}> {
-+  private textBoxRef: TextBox | null = null
-+
-+  public render() {
-+    return (
-+      <TextBox
-+        ref={this.onTextBoxRef}
-+        type="search"
-+        autoFocus={true}
-+        placeholder="Filter"
-+        className="filter-list-filter-field"
-+        onValueChanged={this.onFilterValueChanged}
-+        onKeyDown={this.onKeyDown}
-+        value={this.props.filterText}
-+        disabled={this.props.disabled}
-+      />
-+    )
-+  }
-+
-+  public focus() {
-+    if (this.textBoxRef != null) {
-+      this.textBoxRef.focus()
-+    }
-+  }
-+
-+  public selectAll() {
-+    if (this.textBoxRef != null) {
-+      this.textBoxRef.selectAll()
-+    }
-+  }
-+
-+  private onTextBoxRef = (textBox: TextBox | null) => {
-+    this.textBoxRef = textBox
-+  }
-+
-+  private onFilterValueChanged = (text: string) => {
-+    if (this.props.onFilterTextChanged) {
-+      this.props.onFilterTextChanged(text)
-+    }
-+  }
-+
-+  private onKeyDown = (event: React.KeyboardEvent<HTMLInputElement>) => {
-+    const key = event.key
-+
-+    if (this.props.onKeyDown) {
-+      this.props.onKeyDown(event)
-+    }
-+
-+    if (event.defaultPrevented) {
-+      return
-+    }
-+
-+    const rowCount = this.props.rowCount
-+
-+    if (key === 'ArrowDown') {
-+      if (rowCount > 0) {
-+        this.props.onMoveToRow('down', -1)
-+      }
-+
-+      event.preventDefault()
-+    } else if (key === 'ArrowUp') {
-+      if (rowCount > 0) {
-+        this.props.onMoveToRow('up', 0)
-+      }
-+
-+      event.preventDefault()
-+    } else if (key === 'Enter') {
-+      // no repositories currently displayed, bail out
-+      if (rowCount === 0) {
-+        return event.preventDefault()
-+      }
-+
-+      const filterText = this.props.filterText
-+
-+      if (filterText !== undefined && !/\S/.test(filterText)) {
-+        return event.preventDefault()
-+      }
-+
-+      if (this.props.onSelectFirstRow) {
-+        this.props.onSelectFirstRow()
-+      }
-+    }
-+  }
-+}
-changed in both
-  base   100644 72a36afa71949e6a0a3d2550c9bcf5a07b731868 app/src/ui/lib/list/list.tsx
-  our    100644 e534ebfd72eb9026d47bcdcd9e3077b295db520a app/src/ui/lib/list/list.tsx
-  their  100644 92779478b46a6e660a1cac230900cbfdd9faac78 app/src/ui/lib/list/list.tsx
-@@ -465,7 +465,11 @@
- 
-     const newRow = findNextSelectableRow(
-       this.props.rowCount,
-+<<<<<<< .our
-       { direction, row: lastSelection, wrap: false },
-+=======
-+      { direction, row: lastSelection },
-+>>>>>>> .their
-       this.canSelectRow
-     )
- 
-@@ -500,7 +504,11 @@
- 
-     const newRow = findNextSelectableRow(
-       this.props.rowCount,
-+<<<<<<< .our
-       { direction, row: lastSelection },
-+=======
-+      { direction, row: lastSelection, wrap: false },
-+>>>>>>> .their
-       this.canSelectRow
-     )
- 
-added in both
-  our    100644 e508ad7bd721169b3f96558a76f7e5a32bcf8a71 app/src/ui/lib/list/selection.ts
-  their  100644 fc006b23b096e3dd5a3d40d1c4b6b20ee553a387 app/src/ui/lib/list/selection.ts
-@@ -100,6 +100,7 @@
-   let currentRow =
-     row < 0 || row >= rowCount ? (direction === 'up' ? rowCount - 1 : 0) : row
- 
-+<<<<<<< .our
-   // handle specific case from switching from filter text to list
-   //
-   // locking currentRow to [0,rowCount) above means that the below loops
-@@ -108,6 +109,8 @@
-     currentRow = -1
-   }
- 
-+=======
-+>>>>>>> .their
-   const delta = direction === 'up' ? -1 : 1
- 
-   // Iterate through all rows (starting offset from the
diff --git a/app/test/fixtures/merge-parser/desktop/merge-remove-remote-with-caution-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-remove-remote-with-caution-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index 704326701fc..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-remove-remote-with-caution-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,288 +0,0 @@
-changed in both
-  base   100644 f90c946fa2c439ffe576db4820b3768a65a1b08e app/src/lib/dispatcher/dispatcher.ts
-  our    100644 5e56c00e713342e76f5ccba040062e322e8c90cb app/src/lib/dispatcher/dispatcher.ts
-  their  100644 16fc744a17f351d7db2bb1e7ae547fe77d3742ff app/src/lib/dispatcher/dispatcher.ts
-@@ -583,6 +583,11 @@
-     return this.appStore._reportStats()
-   }
- 
-+  /** Removes the given remote for the repository */
-+  public removeRemote(repository: Repository, name: string): Promise<void> {
-+    return this.appStore._removeRemote(repository, name)
-+  }
-+
-   /** Changes the URL for the remote that matches the given name  */
-   public setRemoteURL(
-     repository: Repository,
-changed in both
-  base   100644 35616ea966ef4ad7549bac1421f71090fbe1d3e6 app/src/lib/stores/app-store.ts
-  our    100644 1a4e387e4d192d34abfd0621b4b5ebe8cc34d8d1 app/src/lib/stores/app-store.ts
-  their  100644 15cd235220c186f54795bca0d0d2cf8d7cd03cf7 app/src/lib/stores/app-store.ts
-@@ -3067,6 +3067,12 @@
-   }
- 
-   /** This shouldn't be called directly. See `Dispatcher`. */
-+  public _removeRemote(repository: Repository, name: string): Promise<void> {
-+    const gitStore = this.getGitStore(repository)
-+    return gitStore.removeRemote(name)
-+  }
-+
-+  /** This shouldn't be called directly. See `Dispatcher`. */
-   public _setRemoteURL(
-     repository: Repository,
-     name: string,
-changed in both
-  base   100644 cc8f049009ace9094a0307160770ffdcd0217554 app/src/lib/stores/git-store.ts
-  our    100644 f8eedeb9d958345be59538b82b1b69cd4326d73b app/src/lib/stores/git-store.ts
-  their  100644 b431d751c1c7cf6ea3f671d2ea8f28bc3c4a7d35 app/src/lib/stores/git-store.ts
-@@ -31,6 +31,7 @@
-   deleteRef,
-   getCommits,
-   merge,
-+  removeRemote,
-   setRemoteURL,
-   getStatus,
-   IStatusResult,
-@@ -1110,6 +1111,18 @@
-     })
-   }
- 
-+  /** Remove the given remote from the given repository  */
-+  public async removeRemote(name: string): Promise<void> {
-+    await this.performFailableOperation(() =>
-+      removeRemote(this.repository, name)
-+    )
-+
-+    this._remote = null
-+    await this.loadCurrentRemote()
-+
-+    this.emitUpdate()
-+  }
-+
-   /** Changes the URL for the remote that matches the given name  */
-   public async setRemoteURL(name: string, url: string): Promise<void> {
-     await this.performFailableOperation(() =>
-merged
-  result 100644 3208900a9b6bad0f92a9c552289c43ae750e809a app/src/ui/repository-settings/remote.tsx
-  our    100644 5c8ba70c0b00b68c877c28f5786d6f96fbb9532a app/src/ui/repository-settings/remote.tsx
-@@ -1,6 +1,9 @@
- import * as React from 'react'
- import { IRemote } from '../../models/remote'
-+import { Row } from '../lib/row'
- import { TextBox } from '../lib/text-box'
-+import { LinkButton } from '../lib/link-button'
-+import { Octicon, OcticonSymbol } from '../octicons'
- import { DialogContent } from '../dialog'
- 
- interface IRemoteProps {
-@@ -9,21 +12,73 @@
- 
-   /** The function to call when the remote URL is changed by the user. */
-   readonly onRemoteUrlChanged: (url: string) => void
-+
-+  /** The function to call when the user marks the repository for removal */
-+  readonly onRemoteRemoved: () => void
-+
-+  /** A flag to confirm the remote will be removed when saving changes */
-+  readonly remoteDeleted: boolean
- }
- 
- /** The Remote component. */
- export class Remote extends React.Component<IRemoteProps, {}> {
-   public render() {
-     const remote = this.props.remote
-+
-+    if (this.props.remoteDeleted) {
-+      return (
-+        <DialogContent>
-+          <Row className="warning-helper-text">
-+            <Octicon symbol={OcticonSymbol.alert} />
-+            <p>
-+              Removing the <strong>{remote.name}</strong> remote will affect
-+              publishing the repository to your remote server. Press{' '}
-+              <strong>Save</strong> to confirm this change.
-+            </p>
-+          </Row>
-+        </DialogContent>
-+      )
-+    }
-+
-+    const title = `Remove the ${remote.name} remote from this repository`
-     return (
-       <DialogContent>
--        <div>Primary remote repository ({remote.name})</div>
--        <TextBox
--          placeholder="Remote URL"
--          value={remote.url}
--          onValueChanged={this.props.onRemoteUrlChanged}
--        />
-+        <Row>
-+          <div>Primary remote repository ({remote.name})</div>
-+        </Row>
-+        <Row>
-+          <TextBox
-+            placeholder="Remote URL"
-+            value={remote.url}
-+            onValueChanged={this.props.onRemoteUrlChanged}
-+          />
-+          <LinkButton onClick={this.removeRemote} title={title}>
-+            <Octicon symbol={OcticonSymbol.trashcan} />
-+          </LinkButton>
-+        </Row>
-+
-+        {this.renderInvalidUrlWarning()}
-       </DialogContent>
-     )
-   }
-+
-+  private renderInvalidUrlWarning() {
-+    const isValidPath = this.props.remote.url.length > 0
-+
-+    if (isValidPath) {
-+      return null
-+    }
-+
-+    return (
-+      <Row className="error-helper-text">
-+        <Octicon symbol={OcticonSymbol.x} />
-+        <p>You cannot create an empty remote URL.</p>
-+      </Row>
-+    )
-+  }
-+
-+  private removeRemote = () => {
-+    // TODO: propagate this up the chain
-+    this.props.onRemoteRemoved()
-+  }
- }
-changed in both
-  base   100644 ad68721a27fd17b357977ad754663df39fa337ab app/src/ui/repository-settings/repository-settings.tsx
-  our    100644 df6e4cf60b4e535a69c9fc0a585902ada9e70fbb app/src/ui/repository-settings/repository-settings.tsx
-  their  100644 fc03bb01f366eb3490f84ba88db8f0d3dcb6be1b app/src/ui/repository-settings/repository-settings.tsx
-@@ -27,6 +27,7 @@
- interface IRepositorySettingsState {
-   readonly selectedTab: RepositorySettingsTab
-   readonly remote: IRemote | null
-+  readonly remoteDeleted: boolean
-   readonly ignoreText: string | null
-   readonly ignoreTextHasChanged: boolean
-   readonly disabled: boolean
-@@ -43,6 +44,7 @@
-     this.state = {
-       selectedTab: RepositorySettingsTab.Remote,
-       remote: props.remote,
-+      remoteDeleted: false,
-       ignoreText: null,
-       ignoreTextHasChanged: false,
-       disabled: false,
-@@ -106,15 +108,23 @@
- 
-   private renderFooter() {
-     const tab = this.state.selectedTab
-+    if (tab !== RepositorySettingsTab.Remote) {
-+      return null
-+    }
-+
-     const remote = this.state.remote
--    if (tab === RepositorySettingsTab.Remote && !remote) {
-+    if (!remote) {
-       return null
-     }
- 
-+    const disabled = remote.url.length === 0
-+
-     return (
-       <DialogFooter>
-         <ButtonGroup>
--          <Button type="submit">Save</Button>
-+          <Button type="submit" disabled={disabled}>
-+            Save
-+          </Button>
-           <Button onClick={this.props.onDismissed}>Cancel</Button>
-         </ButtonGroup>
-       </DialogFooter>
-@@ -131,6 +141,8 @@
-             <Remote
-               remote={remote}
-               onRemoteUrlChanged={this.onRemoteUrlChanged}
-+              onRemoteRemoved={this.onRemoteRemoved}
-+              remoteDeleted={this.state.remoteDeleted}
-             />
-           )
-         } else {
-@@ -167,21 +179,42 @@
-     const errors = new Array<JSX.Element | string>()
- 
-     if (this.state.remote && this.props.remote) {
--      if (this.state.remote.url !== this.props.remote.url) {
-+      if (this.state.remoteDeleted) {
-         try {
--          await this.props.dispatcher.setRemoteURL(
-+          await this.props.dispatcher.removeRemote(
-             this.props.repository,
--            this.props.remote.name,
--            this.state.remote.url
-+            this.props.remote.name
-           )
-         } catch (e) {
-           log.error(
-+<<<<<<< .our
-             `RepositorySettings: unable to set remote URL at ${
-               this.props.repository.path
-             }`,
-+=======
-+            `RepositorySettings: unable to remove remote at ${this.props
-+              .repository.path}`,
-+>>>>>>> .their
-             e
-           )
--          errors.push(`Failed setting the remote URL: ${e}`)
-+          errors.push(`Failed removing the remote: ${e}`)
-+        }
-+      } else {
-+        if (this.state.remote.url !== this.props.remote.url) {
-+          try {
-+            await this.props.dispatcher.setRemoteURL(
-+              this.props.repository,
-+              this.props.remote.name,
-+              this.state.remote.url
-+            )
-+          } catch (e) {
-+            log.error(
-+              `RepositorySettings: unable to set remote URL at ${this.props
-+                .repository.path}`,
-+              e
-+            )
-+            errors.push(`Failed setting the remote URL: ${e}`)
-+          }
-         }
-       }
-     }
-@@ -221,6 +254,10 @@
-     this.setState({ remote: newRemote })
-   }
- 
-+  private onRemoteRemoved = () => {
-+    this.setState({ remoteDeleted: true })
-+  }
-+
-   private onIgnoreTextChanged = (text: string) => {
-     this.setState({ ignoreText: text, ignoreTextHasChanged: true })
-   }
-changed in both
-  base   100644 8452efb173e669e14878c01f74896e865306cda9 app/styles/ui/_dialog.scss
-  our    100644 94b86d54fb9b0314deb1ef48cc9e1466578ed390 app/styles/ui/_dialog.scss
-  their  100644 9cf3db7cc7ea8b2e7116074e23a87ebdc17fd27e app/styles/ui/_dialog.scss
-@@ -362,3 +362,12 @@
-     margin-right: var(--spacing-half);
-   }
- }
-+
-+.error-helper-text {
-+  font-size: var(--font-size-sm);
-+
-+  .octicon {
-+    fill: var(--dialog-error-color);
-+    margin-right: var(--spacing-half);
-+  }
-+}
diff --git a/app/test/fixtures/merge-parser/desktop/merge-reproduce-minification-issue-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-reproduce-minification-issue-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index 9ce270a5084..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-reproduce-minification-issue-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,305 +0,0 @@
-merged
-  result 100644 f4900c37ac00d3742e619feca84299314005c1e5 .gitignore
-  our    100644 63a2cc1a341c354faf7c4979d2fffb86d5e93501 .gitignore
-@@ -1,4 +1,5 @@
- out/
-+out-repro/
- dist/
- node_modules/
- npm-debug.log
-merged
-  result 100644 8f351133737a768c028df6b9274441ba702cf011 .prettierignore
-  our    100644 d247d9a68070ec5848c5feb83bddbfab02adbb6c .prettierignore
-@@ -1,4 +1,5 @@
- out/
-+out-repro/
- dist/
- node_modules/
- npm-debug.log
-added in remote
-  their  100644 ff5f95e7e6aef0d6f48b7d95d4559da0a46a3ded app/webpack.repro.js
-@@ -0,0 +1,27 @@
-+'use strict'
-+
-+const path = require('path')
-+const webpack = require('webpack')
-+const MinifyPlugin = require('babel-minify-webpack-plugin')
-+
-+module.exports = {
-+  mode: 'none',
-+  plugins: [
-+    new MinifyPlugin(),
-+    new webpack.DefinePlugin({
-+      'process.env.NODE_ENV': JSON.stringify('production'),
-+    }),
-+    new webpack.optimize.ModuleConcatenationPlugin(),
-+    new webpack.NoEmitOnErrorsPlugin(),
-+  ],
-+  entry: './out-repro/ui/lib/author-input.js',
-+  target: 'electron-renderer',
-+  output: {
-+    path: path.resolve(__dirname, '..', 'dist'),
-+    filename: 'author-input.bundle.js',
-+  },
-+  resolve: {
-+    extensions: ['.js', '.ts', '.tsx'],
-+    modules: [path.resolve(__dirname, 'node_modules/')],
-+  },
-+}
-changed in both
-  base   100644 b4df82455d0dcd44363b8ebb6b2c1d5fc4891d44 package.json
-  our    100644 2006bfb748810f6ea8bdbd26edf7c09524a1388a package.json
-  their  100644 02a214a6ad80830c93c0f9878ebd15f965b6d786 package.json
-@@ -38,7 +38,10 @@
-     "rebuild-hard:prod": "yarn clean-slate && yarn build:prod",
-     "changelog": "ts-node script/changelog/index.ts",
-     "draft-release": "ts-node script/draft-release/index.ts",
--    "validate-changelog": "ts-node script/validate-changelog.ts"
-+    "validate-changelog": "ts-node script/validate-changelog.ts",
-+    "build:repro": "tsc -p tsconfig-repro.json",
-+    "bundle:repro": "webpack --config app/webpack.repro.js",
-+    "minify:repro": "uglifyjs --compress --mangle -o ./out-repro/ui/lib/author-input-after.js -- ./out-repro/ui/lib/author-input.js"
-   },
-   "author": {
-     "name": "GitHub, Inc.",
-@@ -155,7 +158,13 @@
-     "electron": "2.0.5",
-     "electron-builder": "20.27.1",
-     "electron-mocha": "^6.0.1",
-+<<<<<<< .our
-     "electron-packager": "^12.0.0",
-     "electron-winstaller": "2.5.2"
-+=======
-+    "electron-packager": "^11.0.0",
-+    "electron-winstaller": "2.5.2",
-+    "webpack-cli": "^3.0.2"
-+>>>>>>> .their
-   }
- }
-added in remote
-  their  100644 a06dcb5a88dce3efb3c8bd9731550e3c536b863d tsconfig-repro.json
-@@ -0,0 +1,26 @@
-+{
-+  "compilerOptions": {
-+    "module": "commonjs",
-+    "moduleResolution": "node",
-+    "target": "es2017",
-+    "noImplicitReturns": true,
-+    "noFallthroughCasesInSwitch": true,
-+    "noUnusedLocals": true,
-+    "sourceMap": true,
-+    "jsx": "react",
-+    "strict": true,
-+    "outDir": "./out-repro"
-+  },
-+  "include": [
-+    "app/src/lib/globals.d.ts",
-+    "app/src/ui/lib/author-input.tsx"
-+  ],
-+  "exclude": [
-+    "node_modules",
-+    "app/node_modules",
-+    "dist",
-+    "out",
-+    "app/src/highlighter"
-+  ],
-+  "compileOnSave": false
-+}
-changed in both
-  base   100644 96d27900c243924d7f9aa7f6ef5b348dcea93af4 yarn.lock
-  our    100644 45ddb8bf6902bbb22708d844324093dccda26c79 yarn.lock
-  their  100644 161de194f715ee122925a08b8c35349cd250029d yarn.lock
-@@ -218,6 +218,7 @@
-     "@types/prop-types" "*"
-     "@types/react" "*"
- 
-+<<<<<<< .our
- "@types/react@*", "@types/react@^16.3.16":
-   version "16.3.16"
-   resolved "https://registry.yarnpkg.com/@types/react/-/react-16.3.16.tgz#78fc44a90b45701f50c8a7008f733680ba51fc86"
-@@ -231,6 +232,11 @@
- "@types/request@^2.0.9":
-   version "2.0.9"
-   resolved "https://registry.yarnpkg.com/@types/request/-/request-2.0.9.tgz#125b8a60d8a439e8d87e6d1335c61cccdc18343a"
-+=======
-+"@types/react@*", "@types/react@16.3.14":
-+  version "16.3.14"
-+  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.3.14.tgz#f90ac6834de172e13ecca430dcb6814744225d36"
-+>>>>>>> .their
-   dependencies:
-     "@types/form-data" "*"
-     "@types/node" "*"
-@@ -3582,9 +3588,19 @@
-   dependencies:
-     ini "^1.3.4"
- 
-+<<<<<<< .our
- globals@^11.7.0:
-   version "11.7.0"
-   resolved "https://registry.yarnpkg.com/globals/-/globals-11.7.0.tgz#a583faa43055b1aca771914bf68258e2fc125673"
-+=======
-+global-modules-path@^2.1.0:
-+  version "2.1.0"
-+  resolved "https://registry.yarnpkg.com/global-modules-path/-/global-modules-path-2.1.0.tgz#923ec524e8726bb0c1a4ed4b8e21e1ff80c88bbb"
-+
-+globals@^11.0.1:
-+  version "11.0.1"
-+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.0.1.tgz#12a87bb010e5154396acc535e1e43fc753b0e5e8"
-+>>>>>>> .their
- 
- globals@^9.18.0:
-   version "9.18.0"
-@@ -3949,6 +3965,13 @@
-   version "2.1.0"
-   resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
- 
-+import-local@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-1.0.0.tgz#5e4ffdc03f4fe6c009c6729beb29631c2f8227bc"
-+  dependencies:
-+    pkg-dir "^2.0.0"
-+    resolve-cwd "^2.0.0"
-+
- imurmurhash@^0.1.4:
-   version "0.1.4"
-   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-@@ -4008,6 +4031,24 @@
-     strip-ansi "^4.0.0"
-     through "^2.3.6"
- 
-+inquirer@^5.2.0:
-+  version "5.2.0"
-+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-5.2.0.tgz#db350c2b73daca77ff1243962e9f22f099685726"
-+  dependencies:
-+    ansi-escapes "^3.0.0"
-+    chalk "^2.0.0"
-+    cli-cursor "^2.1.0"
-+    cli-width "^2.0.0"
-+    external-editor "^2.1.0"
-+    figures "^2.0.0"
-+    lodash "^4.3.0"
-+    mute-stream "0.0.7"
-+    run-async "^2.2.0"
-+    rxjs "^5.5.2"
-+    string-width "^2.1.0"
-+    strip-ansi "^4.0.0"
-+    through "^2.3.6"
-+
- inquirer@~3.0.6:
-   version "3.0.6"
-   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.0.6.tgz#e04aaa9d05b7a3cb9b0f407d04375f0447190347"
-@@ -4030,6 +4071,10 @@
-   version "1.0.4"
-   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.4.tgz#820cdd588b868ffb191a809506d6c9c8f212b1b0"
- 
-+interpret@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
-+
- invariant@^2.2.2:
-   version "2.2.2"
-   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
-@@ -6501,10 +6546,20 @@
-   version "1.1.0"
-   resolved "https://registry.yarnpkg.com/requireindex/-/requireindex-1.1.0.tgz#e5404b81557ef75db6e49c5a72004893fe03e162"
- 
-+resolve-cwd@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
-+  dependencies:
-+    resolve-from "^3.0.0"
-+
- resolve-from@^1.0.0:
-   version "1.0.1"
-   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
- 
-+resolve-from@^3.0.0:
-+  version "3.0.0"
-+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
-+
- resolve-url@^0.2.1, resolve-url@~0.2.1:
-   version "0.2.1"
-   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
-@@ -7178,7 +7233,7 @@
-   dependencies:
-     has-flag "^2.0.0"
- 
--supports-color@^5.3.0:
-+supports-color@^5.3.0, supports-color@^5.4.0:
-   version "5.4.0"
-   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
-   dependencies:
-@@ -7200,9 +7255,15 @@
-   version "1.0.1"
-   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4"
- 
-+<<<<<<< .our
- table@^4.0.3:
-   version "4.0.3"
-   resolved "https://registry.yarnpkg.com/table/-/table-4.0.3.tgz#00b5e2b602f1794b9acaf9ca908a76386a7813bc"
-+=======
-+table@4.0.2:
-+  version "4.0.2"
-+  resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36"
-+>>>>>>> .their
-   dependencies:
-     ajv "^6.0.1"
-     ajv-keywords "^3.0.0"
-@@ -7752,6 +7813,10 @@
-   version "3.1.0"
-   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
- 
-+v8-compile-cache@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.0.tgz#526492e35fc616864284700b7043e01baee09f0a"
-+
- validate-npm-package-license@^3.0.1:
-   version "3.0.1"
-   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"
-@@ -7855,6 +7920,22 @@
-     opener "^1.4.3"
-     ws "^4.0.0"
- 
-+webpack-cli@^3.0.2:
-+  version "3.0.2"
-+  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.0.2.tgz#e48c5662aff8ed5aac3db5f82f51d7f32e50459e"
-+  dependencies:
-+    chalk "^2.4.1"
-+    cross-spawn "^6.0.5"
-+    enhanced-resolve "^4.0.0"
-+    global-modules-path "^2.1.0"
-+    import-local "^1.0.0"
-+    inquirer "^5.2.0"
-+    interpret "^1.1.0"
-+    loader-utils "^1.1.0"
-+    supports-color "^5.4.0"
-+    v8-compile-cache "^2.0.0"
-+    yargs "^11.1.0"
-+
- webpack-dev-middleware@^3.1.3:
-   version "3.1.3"
-   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.1.3.tgz#8b32aa43da9ae79368c1bf1183f2b6cf5e1f39ed"
-@@ -8146,6 +8227,23 @@
-     y18n "^3.2.1 || ^4.0.0"
-     yargs-parser "^10.1.0"
- 
-+yargs@^11.1.0:
-+  version "11.1.0"
-+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.0.tgz#90b869934ed6e871115ea2ff58b03f4724ed2d77"
-+  dependencies:
-+    cliui "^4.0.0"
-+    decamelize "^1.1.1"
-+    find-up "^2.1.0"
-+    get-caller-file "^1.0.1"
-+    os-locale "^2.0.0"
-+    require-directory "^2.1.1"
-+    require-main-filename "^1.0.1"
-+    set-blocking "^2.0.0"
-+    string-width "^2.0.0"
-+    which-module "^2.0.0"
-+    y18n "^3.2.1"
-+    yargs-parser "^9.0.2"
-+
- yargs@^7.0.0:
-   version "7.1.0"
-   resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
diff --git a/app/test/fixtures/merge-parser/desktop/merge-rework-state-for-repositories-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-rework-state-for-repositories-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index 6d4081d7673..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-rework-state-for-repositories-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,886 +0,0 @@
-changed in both
-  base   100644 0f1f72f03c916f554505d816f73ec3f336ff874a app/src/lib/app-state.ts
-  our    100644 b30f0fe080d909b81d2fb683ceb8deb365fb0191 app/src/lib/app-state.ts
-  their  100644 a1faa806de3876ec375b913d275e231a2cbfae41 app/src/lib/app-state.ts
-@@ -1,7 +1,11 @@
- import { Account } from '../models/account'
- import { CommitIdentity } from '../models/commit-identity'
- import { IDiff } from '../models/diff'
-+<<<<<<< .our
- import { Repository, ILocalRepositoryState } from '../models/repository'
-+=======
-+import { Repository, IRepositoryListItem } from '../models/repository'
-+>>>>>>> .their
- 
- import { Branch, IAheadBehind } from '../models/branch'
- import { Tip } from '../models/tip'
-@@ -52,6 +56,10 @@
-   Difference,
- }
- 
-+export interface IRepositoryListState {
-+  readonly repositories: ReadonlyArray<IRepositoryListItem>
-+}
-+
- export type PossibleSelections =
-   | {
-       type: SelectionType.Repository
-@@ -68,10 +76,15 @@
- /** All of the shared app state. */
- export interface IAppState {
-   readonly accounts: ReadonlyArray<Account>
-+<<<<<<< .our
-   /**
-    * The current list of repositories tracked in the application
-    */
-   readonly repositories: ReadonlyArray<Repository | CloningRepository>
-+=======
-+
-+  readonly repositoryList: IRepositoryListState
-+>>>>>>> .their
- 
-   /**
-    * A cache of the latest repository state values, keyed by the repository id
-changed in both
-  base   100644 f7a2f33b4a3e4787f6446ec13c490c0519671b8c app/src/lib/dispatcher/dispatcher.ts
-  our    100644 5e56c00e713342e76f5ccba040062e322e8c90cb app/src/lib/dispatcher/dispatcher.ts
-  their  100644 8ff1e93a00d8036ddc4cdfa83b00ac8c15a1d595 app/src/lib/dispatcher/dispatcher.ts
-@@ -863,7 +863,7 @@
-         const path = (await validatedRepositoryPath(action.path)) || action.path
-         const state = this.appStore.getState()
-         let existingRepository = matchExistingRepository(
--          state.repositories,
-+          state.repositoryList.repositories,
-           path
-         )
- 
-@@ -969,7 +969,7 @@
-     branch: string | null
-   ): Promise<Repository | null> {
-     const state = this.appStore.getState()
--    const repositories = state.repositories
-+    const repositories = state.repositoryList.repositories.map(r => r.source)
-     const existingRepository = repositories.find(r => {
-       if (r instanceof Repository) {
-         const gitHubRepository = r.gitHubRepository
-changed in both
-  base   100644 7ade1dfc6be6bbfd8149dfb41a77caded99e26c0 app/src/lib/fuzzy-find.ts
-  our    100644 fe445459765dc96bdabb09ac7dea1feccc473728 app/src/lib/fuzzy-find.ts
-  their  100644 b1df8e63b1639dcbfbf7ff42604f96cf5ffa64f7 app/src/lib/fuzzy-find.ts
-@@ -1,23 +1,12 @@
- import * as fuzzAldrin from 'fuzzaldrin-plus'
- 
- import { compareDescending } from './compare'
-+import { IMatch } from '../models/filter-list'
- 
- function score(str: string, query: string, maxScore: number) {
-   return fuzzAldrin.score(str, query) / maxScore
- }
- 
--export interface IMatches {
--  readonly title: ReadonlyArray<number>
--  readonly subtitle: ReadonlyArray<number>
--}
--
--export interface IMatch<T> {
--  /** `0 <= score <= 1` */
--  score: number
--  item: T
--  matches: IMatches
--}
--
- export type KeyFunction<T> = (item: T) => ReadonlyArray<string>
- 
- export function match<T, _K extends keyof T>(
-added in remote
-  their  100644 6047ec0bc933c874c56ec75db9a2eb0ac54d086f app/src/lib/group-repositories.ts
-@@ -0,0 +1,79 @@
-+import { Repository } from '../models/repository'
-+import { CloningRepository } from '../models/cloning-repository'
-+import { getDotComAPIEndpoint } from './api'
-+import { caseInsensitiveCompare } from './compare'
-+import { IFilterListGroup, IFilterListItem } from '../models/filter-list'
-+
-+export type RepositoryGroupIdentifier = 'github' | 'enterprise' | 'other'
-+
-+export type Repositoryish = Repository | CloningRepository
-+
-+export interface IRepositoryListItem extends IFilterListItem {
-+  readonly text: ReadonlyArray<string>
-+  readonly id: string
-+  readonly repository: Repositoryish
-+  readonly needsDisambiguation: boolean
-+}
-+
-+export function groupRepositories(
-+  repositories: ReadonlyArray<Repositoryish>
-+): ReadonlyArray<IFilterListGroup<IRepositoryListItem>> {
-+  const grouped = new Map<RepositoryGroupIdentifier, Repositoryish[]>()
-+  for (const repository of repositories) {
-+    const gitHubRepository =
-+      repository instanceof Repository ? repository.gitHubRepository : null
-+    let group: RepositoryGroupIdentifier = 'other'
-+    if (gitHubRepository) {
-+      if (gitHubRepository.endpoint === getDotComAPIEndpoint()) {
-+        group = 'github'
-+      } else {
-+        group = 'enterprise'
-+      }
-+    } else {
-+      group = 'other'
-+    }
-+
-+    let repositories = grouped.get(group)
-+    if (!repositories) {
-+      repositories = new Array<Repository>()
-+      grouped.set(group, repositories)
-+    }
-+
-+    repositories.push(repository)
-+  }
-+
-+  const groups = new Array<IFilterListGroup<IRepositoryListItem>>()
-+
-+  const addGroup = (identifier: RepositoryGroupIdentifier) => {
-+    const repositories = grouped.get(identifier)
-+    if (!repositories || repositories.length === 0) {
-+      return
-+    }
-+
-+    const names = new Map<string, number>()
-+    for (const repository of repositories) {
-+      const existingCount = names.get(repository.name) || 0
-+      names.set(repository.name, existingCount + 1)
-+    }
-+
-+    repositories.sort((x, y) => caseInsensitiveCompare(x.name, y.name))
-+    const items: ReadonlyArray<IRepositoryListItem> = repositories.map(r => {
-+      const nameCount = names.get(r.name) || 0
-+      return {
-+        text: [r.name],
-+        id: r.id.toString(),
-+        repository: r,
-+        needsDisambiguation: nameCount > 1,
-+      }
-+    })
-+
-+    groups.push({ identifier, items })
-+  }
-+
-+  // NB: This ordering reflects the order in the repositories sidebar.
-+  addGroup('github')
-+  addGroup('enterprise')
-+  addGroup('other')
-+
-+  return groups
-+}
-merged
-  result 100644 cfbc4c3fb41fb4d678e3752e33737434470f4387 app/src/lib/repository-matching.ts
-  our    100644 320c31614eb7012348f2ae7877bfb5a0b11cf5af app/src/lib/repository-matching.ts
-@@ -2,7 +2,7 @@
- import * as Path from 'path'
- 
- import { CloningRepository } from '../models/cloning-repository'
--import { Repository } from '../models/repository'
-+import { Repository, IRepositoryListItem } from '../models/repository'
- import { Account } from '../models/account'
- import { IRemote } from '../models/remote'
- import { getHTMLURL } from './api'
-@@ -77,11 +77,11 @@
-  * @param path The path on disk which might be a repository
-  */
- export function matchExistingRepository(
--  repositories: ReadonlyArray<Repository | CloningRepository>,
-+  repositories: ReadonlyArray<IRepositoryListItem>,
-   path: string
- ): Repository | CloningRepository | null {
-   return (
--    repositories.find(r => {
-+    repositories.map(r => r.source).find(r => {
-       if (__WIN32__) {
-         // Windows is guaranteed to be case-insensitive so we can be a
-         // bit more accepting.
-changed in both
-  base   100644 cef55da5f79cf3f422447bb55cb4b9e55162076a app/src/lib/stores/app-store.ts
-  our    100644 1a4e387e4d192d34abfd0621b4b5ebe8cc34d8d1 app/src/lib/stores/app-store.ts
-  their  100644 26c65eda55acf194df477bfa99e8897daa8eadcf app/src/lib/stores/app-store.ts
-@@ -24,7 +24,11 @@
-   IDisplayHistory,
-   ICompareBranch,
-   ICompareFormUpdate,
-+<<<<<<< .our
-   ICompareToBranch,
-+=======
-+  IRepositoryListState,
-+>>>>>>> .their
- } from '../app-state'
- import { Account } from '../../models/account'
- import {
-@@ -544,6 +548,19 @@
-     })
-   }
- 
-+  private getRepositoryListState(): IRepositoryListState {
-+    const allRepos = [
-+      ...this.repositories,
-+      ...this.cloningRepositoriesStore.repositories,
-+    ]
-+
-+    return {
-+      repositories: allRepos.map(source => ({
-+        source,
-+      })),
-+    }
-+  }
-+
-   private getSelectedState(): PossibleSelections | null {
-     const repository = this.selectedRepository
-     if (!repository) {
-@@ -582,11 +599,15 @@
-   public getState(): IAppState {
-     return {
-       accounts: this.accounts,
-+<<<<<<< .our
-       repositories: [
-         ...this.repositories,
-         ...this.cloningRepositoriesStore.repositories,
-       ],
-       localRepositoryStateLookup: this.localRepositoryStateLookup,
-+=======
-+      repositoryList: this.getRepositoryListState(),
-+>>>>>>> .their
-       windowState: this.windowState,
-       windowZoomFactor: this.windowZoomFactor,
-       appIsFocused: this.appIsFocused,
-added in remote
-  their  100644 471a2bbf7f0b40cfb77f041a5adabb83303b1b51 app/src/models/filter-list.ts
-@@ -0,0 +1,41 @@
-+export interface IMatches {
-+  readonly title: ReadonlyArray<number>
-+  readonly subtitle: ReadonlyArray<number>
-+}
-+
-+export interface IMatch<T> {
-+  /** `0 <= score <= 1` */
-+  score: number
-+  item: T
-+  matches: IMatches
-+}
-+
-+/** An item in the filter list. */
-+export interface IFilterListItem {
-+  /** The text which represents the item. This is used for filtering. */
-+  readonly text: ReadonlyArray<string>
-+
-+  /** A unique identifier for the item. */
-+  readonly id: string
-+}
-+
-+/** A group of items in the list. */
-+export interface IFilterListGroup<T extends IFilterListItem> {
-+  /** The identifier for this group. */
-+  readonly identifier: string
-+
-+  /** The items in the group. */
-+  readonly items: ReadonlyArray<T>
-+}
-+
-+export interface IFlattenedGroup {
-+  readonly kind: 'group'
-+  readonly identifier: string
-+}
-+
-+export interface IFlattenedItem<T extends IFilterListItem> {
-+  readonly kind: 'item'
-+  readonly item: T
-+  /** Array of indexes in `item.text` that should be highlighted */
-+  readonly matches: IMatches
-+}
-changed in both
-  base   100644 0602a86788419c4d0be13a0de4f8c5ac6b37a368 app/src/models/repository.ts
-  our    100644 4eb1a58be5e5e17b1a8714be9248b2d332f526e4 app/src/models/repository.ts
-  their  100644 8593e8a9bf907314361c6157df2fc9fa6f253a45 app/src/models/repository.ts
-@@ -1,6 +1,7 @@
- import * as Path from 'path'
- 
- import { GitHubRepository } from './github-repository'
-+<<<<<<< .our
- import { IAheadBehind } from './branch'
- 
- function getBaseName(path: string): string {
-@@ -14,6 +15,9 @@
- 
-   return baseName
- }
-+=======
-+import { CloningRepository } from './cloning-repository'
-+>>>>>>> .their
- 
- /** A local repository. */
- export class Repository {
-@@ -53,6 +57,7 @@
-   }
- }
- 
-+<<<<<<< .our
- /**
-  * A snapshot for the local state for a given repository
-  */
-@@ -76,4 +81,10 @@
-   const { gitHubRepository } = repository
- 
-   return gitHubRepository !== null ? gitHubRepository.fullName : repository.name
-+=======
-+export type Repositoryish = Repository | CloningRepository
-+
-+export interface IRepositoryListItem {
-+  readonly source: Repositoryish
-+>>>>>>> .their
- }
-changed in both
-  base   100644 dbc99e8d5c3c6d7dd14ee7ba7539b1e57f05757a app/src/ui/app.tsx
-  our    100644 c38c806e36c237ea70f3cdeee739941530c0c7cd app/src/ui/app.tsx
-  their  100644 4922d8b238e8e14e03a3228b9f734b88e614dc51 app/src/ui/app.tsx
-@@ -87,10 +87,14 @@
- import { UpstreamAlreadyExists } from './upstream-already-exists'
- import { DeletePullRequest } from './delete-branch/delete-pull-request-dialog'
- import { MergeConflictsWarning } from './merge-conflicts'
-+<<<<<<< .our
- import { AppTheme } from './app-theme'
- import { ApplicationTheme } from './lib/application-theme'
- 
- const MinuteInMilliseconds = 1000 * 60
-+=======
-+import { groupRepositories } from '../lib/group-repositories'
-+>>>>>>> .their
- 
- /** The interval at which we should check for updates. */
- const UpdateCheckInterval = 1000 * 60 * 60 * 4
-@@ -751,7 +755,7 @@
-       const path = (await validatedRepositoryPath(first)) || first
- 
-       const existingRepository = matchExistingRepository(
--        this.state.repositories,
-+        this.state.repositoryList.repositories,
-         path
-       )
- 
-@@ -1412,17 +1416,26 @@
-     const externalEditorLabel = this.state.selectedExternalEditor
-     const shellLabel = this.state.selectedShell
-     const filterText = this.state.repositoryFilterText
-+
-+    const groups = groupRepositories(
-+      this.state.repositoryList.repositories.map(r => r.source)
-+    )
-+
-     return (
-       <RepositoriesList
-         filterText={filterText}
-         onFilterTextChanged={this.onRepositoryFilterTextChanged}
-         selectedRepository={selectedRepository}
-         onSelectionChanged={this.onSelectionChanged}
-+<<<<<<< .our
-         repositories={this.state.repositories}
-         localRepositoryStateLookup={this.state.localRepositoryStateLookup}
-         askForConfirmationOnRemoveRepository={
-           this.state.askForConfirmationOnRepositoryRemoval
-         }
-+=======
-+        groups={groups}
-+>>>>>>> .their
-         onRemoveRepository={this.removeRepository}
-         onOpenInShell={this.openInShell}
-         onShowRepository={this.showRepository}
-@@ -1482,7 +1495,7 @@
-     if (repository) {
-       icon = iconForRepository(repository)
-       title = repository.name
--    } else if (this.state.repositories.length > 0) {
-+    } else if (this.state.repositoryList.repositories.length > 0) {
-       icon = OcticonSymbol.repo
-       title = __DARWIN__ ? 'Select a Repository' : 'Select a repository'
-     } else {
-@@ -1668,7 +1681,7 @@
- 
-   private renderRepository() {
-     const state = this.state
--    if (state.repositories.length < 1) {
-+    if (state.repositoryList.repositories.length < 1) {
-       return (
-         <BlankSlateView
-           onCreate={this.showCreateRepository}
-merged
-  result 100644 4dc52d68274ce071386cb34dda8a2f6f17119962 app/src/ui/branches/branch-list-item.tsx
-  our    100644 474f18ccb67239743953eda7f33488769a615c05 app/src/ui/branches/branch-list-item.tsx
-@@ -1,7 +1,7 @@
- import * as React from 'react'
- import * as moment from 'moment'
- 
--import { IMatches } from '../../lib/fuzzy-find'
-+import { IMatches } from '../../models/filter-list'
- 
- import { Octicon, OcticonSymbol } from '../octicons'
- import { HighlightText } from '../lib/highlight-text'
-changed in both
-  base   100644 c6fd907ca55c1ee3575c15a64b60ef898d259ae9 app/src/ui/branches/branch-list.tsx
-  our    100644 f996cca6bcc1348eedd5f3c852bf8652b60f95aa app/src/ui/branches/branch-list.tsx
-  their  100644 f7ba834036a39cfdffd1b87d044ee03b0e2e5d1d app/src/ui/branches/branch-list.tsx
-@@ -4,12 +4,9 @@
- 
- import { assertNever } from '../../lib/fatal-error'
- 
--import {
--  FilterList,
--  IFilterListGroup,
--  SelectionSource,
--} from '../lib/filter-list'
--import { IMatches } from '../../lib/fuzzy-find'
-+import { IFilterListGroup, IMatches } from '../../models/filter-list'
-+
-+import { FilterList, SelectionSource } from '../lib/filter-list'
- import { Button } from '../lib/button'
- import { TextBox } from '../lib/text-box'
- 
-merged
-  result 100644 6da41ab3f7da5b855ce59e6054c4f82b0ae450ae app/src/ui/branches/branch-renderer.tsx
-  our    100644 dd27f7b0f40a3be55aa8a51cd83f116cf289c7e6 app/src/ui/branches/branch-renderer.tsx
-@@ -1,10 +1,10 @@
- import * as React from 'react'
- 
- import { Branch } from '../../models/branch'
-+import { IMatches } from '../../models/filter-list'
- 
- import { IBranchListItem } from './group-branches'
- import { BranchListItem } from './branch-list-item'
--import { IMatches } from '../../lib/fuzzy-find'
- 
- export function renderDefaultBranch(
-   item: IBranchListItem,
-changed in both
-  base   100644 13f691705648f0b7a0f7303372de8f2db79f3d76 app/src/ui/branches/branches-container.tsx
-  our    100644 6a5612ae608b20b3a486f139daf4063209bca568 app/src/ui/branches/branches-container.tsx
-  their  100644 247643b0608b2ae041337ad2e4c558dfc4c49043 app/src/ui/branches/branches-container.tsx
-@@ -5,6 +5,7 @@
- import { Repository, nameOf } from '../../models/repository'
- import { Branch } from '../../models/branch'
- import { BranchesTab } from '../../models/branches-tab'
-+import { IMatches } from '../../models/filter-list'
- 
- import { Dispatcher } from '../../lib/dispatcher'
- import { FoldoutType, PopupType } from '../../lib/app-state'
-@@ -17,7 +18,6 @@
- import { PullRequestsLoading } from './pull-requests-loading'
- import { IBranchListItem } from './group-branches'
- import { renderDefaultBranch } from './branch-renderer'
--import { IMatches } from '../../lib/fuzzy-find'
- 
- const PullRequestsLoadingCrossFadeInTimeout = 300
- const PullRequestsLoadingCrossFadeOutTimeout = 200
-merged
-  result 100644 2ecee9b32490089b39f44642ef6fca16b7b3ab56 app/src/ui/branches/group-branches.ts
-  our    100644 f4953500cb984957451e61da094929c0254c811d app/src/ui/branches/group-branches.ts
-@@ -1,5 +1,5 @@
- import { Branch } from '../../models/branch'
--import { IFilterListGroup, IFilterListItem } from '../lib/filter-list'
-+import { IFilterListGroup, IFilterListItem } from '../../models/filter-list'
- 
- export type BranchGroupIdentifier = 'default' | 'recent' | 'other'
- 
-merged
-  result 100644 4be30f2736a9018e19fc2b105b3514cabc524c6b app/src/ui/branches/pull-request-list-item.tsx
-  our    100644 075b2904f501296734519cbb19ed658a9f168a05 app/src/ui/branches/pull-request-list-item.tsx
-@@ -5,7 +5,7 @@
- import { CIStatus } from './ci-status'
- import { PullRequestStatus } from '../../models/pull-request'
- import { HighlightText } from '../lib/highlight-text'
--import { IMatches } from '../../lib/fuzzy-find'
-+import { IMatches } from '../../models/filter-list'
- 
- export interface IPullRequestListItemProps {
-   /** The title. */
-changed in both
-  base   100644 ec5384d11e1ccc41654a814bf95443c8159d7c17 app/src/ui/branches/pull-request-list.tsx
-  our    100644 484112784b83cd0d9be46284b3a1fb1b877894b2 app/src/ui/branches/pull-request-list.tsx
-  their  100644 d0cb65d04b4ee72da49baed09c132b059f4af620 app/src/ui/branches/pull-request-list.tsx
-@@ -1,15 +1,15 @@
- import * as React from 'react'
- import * as moment from 'moment'
-+
- import {
--  FilterList,
-+  IMatches,
-   IFilterListGroup,
-   IFilterListItem,
--  SelectionSource,
--} from '../lib/filter-list'
-+} from '../../models/filter-list'
-+import { FilterList, SelectionSource } from '../lib/filter-list'
- import { PullRequestListItem } from './pull-request-list-item'
- import { PullRequest, PullRequestStatus } from '../../models/pull-request'
- import { NoPullRequests } from './no-pull-requests'
--import { IMatches } from '../../lib/fuzzy-find'
- 
- interface IPullRequestListItem extends IFilterListItem {
-   readonly id: string
-changed in both
-  base   100644 bd003b8166b0069ee40ffc86f2ea9593db202001 app/src/ui/branches/pull-requests-loading.tsx
-  our    100644 6965fcba858e40dc9bebce9bd3f18f369bde8ae3 app/src/ui/branches/pull-requests-loading.tsx
-  their  100644 413230dc687126b2536a2c67a32082eda7e06d68 app/src/ui/branches/pull-requests-loading.tsx
-@@ -1,5 +1,6 @@
- import * as React from 'react'
--import { FilterList, IFilterListItem } from '../lib/filter-list'
-+import { IFilterListItem } from '../../models/filter-list'
-+import { FilterList } from '../lib/filter-list'
- import {
-   PullRequestListItem,
-   IPullRequestListItemProps,
-merged
-  result 100644 025849db4722f41ecb84201c726a3cd4986d0235 app/src/ui/clone-repository/clone-github-repository.tsx
-  our    100644 81bb2d3dc71f42c419af98460238b7063d80badd app/src/ui/clone-repository/clone-github-repository.tsx
-@@ -1,6 +1,7 @@
- import * as React from 'react'
- 
- import { Account } from '../../models/account'
-+import { IFilterListGroup, IMatches } from '../../models/filter-list'
- import { DialogContent } from '../dialog'
- import { TextBox } from '../lib/text-box'
- import { Row } from '../lib/row'
-@@ -9,8 +10,6 @@
- import { Octicon } from '../octicons'
- import { FilterList } from '../lib/filter-list'
- import { API } from '../../lib/api'
--import { IFilterListGroup } from '../lib/filter-list'
--import { IMatches } from '../../lib/fuzzy-find'
- import {
-   ICloneableRepositoryListItem,
-   groupRepositories,
-merged
-  result 100644 409a64070c8e30188cda16fff34d038ffb51b8af app/src/ui/clone-repository/group-repositories.ts
-  our    100644 b7412f2d5dd94cba15f7a987e719915969a75f6e app/src/ui/clone-repository/group-repositories.ts
-@@ -1,5 +1,6 @@
-+import { IFilterListGroup, IFilterListItem } from '../../models/filter-list'
-+
- import { IAPIRepository } from '../../lib/api'
--import { IFilterListGroup, IFilterListItem } from '../lib/filter-list'
- import { caseInsensitiveCompare } from '../../lib/compare'
- import { OcticonSymbol } from '../octicons'
- 
-merged
-  result 100644 314c4e3f15fbb4c493a948f1cc22fcf9a3749879 app/src/ui/history/compare-branch-list-item.tsx
-  our    100644 16d4efb540d90ba9514f7b5da356f9fa5372e2f6 app/src/ui/history/compare-branch-list-item.tsx
-@@ -3,7 +3,7 @@
- import { Octicon, OcticonSymbol } from '../octicons'
- import { HighlightText } from '../lib/highlight-text'
- import { Branch, IAheadBehind } from '../../models/branch'
--import { IMatches } from '../../lib/fuzzy-find'
-+import { IMatches } from '../../models/filter-list'
- 
- interface ICompareBranchListItemProps {
-   readonly branch: Branch
-changed in both
-  base   100644 502863ec0901ae8ebc62d75cd84ee11869f5c653 app/src/ui/history/compare.tsx
-  our    100644 c0be0e26ce79b9a590edfa3a9fd3718fa58782d4 app/src/ui/history/compare.tsx
-  their  100644 c5431287ccbdbd63877c1207dc5aad90dedded2b app/src/ui/history/compare.tsx
-@@ -3,6 +3,7 @@
- 
- import { IGitHubUser } from '../../lib/databases'
- import { Commit } from '../../models/commit'
-+import { IMatches } from '../../models/filter-list'
- import {
-   ComparisonView,
-   ICompareState,
-@@ -22,7 +23,7 @@
- import { FancyTextBox } from '../lib/fancy-text-box'
- import { OcticonSymbol } from '../octicons'
- import { SelectionSource } from '../lib/filter-list'
--import { IMatches } from '../../lib/fuzzy-find'
-+
- import { Ref } from '../lib/ref'
- import {
-   NewCommitsBanner,
-changed in both
-  base   100644 c845440dc0449aaf6b81f86a7a77eb0d3d8d1a8f app/src/ui/lib/filter-list.tsx
-  our    100644 a625bab6249781a07060095fe6306dfd832f032f app/src/ui/lib/filter-list.tsx
-  their  100644 3646e167d967db370f232beec160c6d9213dafb0 app/src/ui/lib/filter-list.tsx
-@@ -8,38 +8,15 @@
- } from '../lib/list'
- import { TextBox } from '../lib/text-box'
- import { Row } from '../lib/row'
--
--import { match, IMatch, IMatches } from '../../lib/fuzzy-find'
--
--/** An item in the filter list. */
--export interface IFilterListItem {
--  /** The text which represents the item. This is used for filtering. */
--  readonly text: ReadonlyArray<string>
--
--  /** A unique identifier for the item. */
--  readonly id: string
--}
--
--/** A group of items in the list. */
--export interface IFilterListGroup<T extends IFilterListItem> {
--  /** The identifier for this group. */
--  readonly identifier: string
--
--  /** The items in the group. */
--  readonly items: ReadonlyArray<T>
--}
--
--interface IFlattenedGroup {
--  readonly kind: 'group'
--  readonly identifier: string
--}
--
--interface IFlattenedItem<T extends IFilterListItem> {
--  readonly kind: 'item'
--  readonly item: T
--  /** Array of indexes in `item.text` that should be highlighted */
--  readonly matches: IMatches
--}
-+import {
-+  IFilterListItem,
-+  IFlattenedGroup,
-+  IFlattenedItem,
-+  IFilterListGroup,
-+  IMatches,
-+  IMatch,
-+} from '../../models/filter-list'
-+import { match } from '../../lib/fuzzy-find'
- 
- /**
-  * A row in the list. This is used internally after the user-provided groups are
-changed in both
-  base   100644 b86b84acd2592be32e1e96ba15a6e1c4baa01c61 app/src/ui/merge-branch/merge.tsx
-  our    100644 6a7e6976257ec16e58a7331db61b40096a9bde08 app/src/ui/merge-branch/merge.tsx
-  their  100644 1e2ae1fa7934c87eabfdd36fc7ea54af92ba8edf app/src/ui/merge-branch/merge.tsx
-@@ -5,6 +5,7 @@
- 
- import { Branch } from '../../models/branch'
- import { Repository } from '../../models/repository'
-+import { IMatches } from '../../models/filter-list'
- 
- import { Button } from '../lib/button'
- import { ButtonGroup } from '../lib/button-group'
-@@ -12,7 +13,6 @@
- import { Dialog, DialogContent, DialogFooter } from '../dialog'
- import { BranchList, IBranchListItem, renderDefaultBranch } from '../branches'
- import { revSymmetricDifference } from '../../lib/git'
--import { IMatches } from '../../lib/fuzzy-find'
- 
- interface IMergeProps {
-   readonly dispatcher: Dispatcher
-removed in remote
-  base   100644 7d155f75357c2b37aaf547a4502c6db165116cae app/src/ui/repositories-list/group-repositories.ts
-  our    100644 9e6e38681ef352ce76fa65fea817492a6aef088f app/src/ui/repositories-list/group-repositories.ts
-@@ -1,92 +0,0 @@
--import { Repository, ILocalRepositoryState } from '../../models/repository'
--import { CloningRepository } from '../../models/cloning-repository'
--import { getDotComAPIEndpoint } from '../../lib/api'
--import { caseInsensitiveCompare } from '../../lib/compare'
--import { IFilterListGroup, IFilterListItem } from '../lib/filter-list'
--import { IAheadBehind } from '../../models/branch'
--
--export type RepositoryGroupIdentifier = 'github' | 'enterprise' | 'other'
--
--export type Repositoryish = Repository | CloningRepository
--
--export interface IRepositoryListItem extends IFilterListItem {
--  readonly text: ReadonlyArray<string>
--  readonly id: string
--  readonly repository: Repositoryish
--  readonly needsDisambiguation: boolean
--  readonly aheadBehind: IAheadBehind | null
--  readonly changedFilesCount: number
--}
--
--const fallbackValue = {
--  changedFilesCount: 0,
--  aheadBehind: null,
--}
--
--export function groupRepositories(
--  repositories: ReadonlyArray<Repositoryish>,
--  localRepositoryStateLookup: Map<number, ILocalRepositoryState>
--): ReadonlyArray<IFilterListGroup<IRepositoryListItem>> {
--  const grouped = new Map<RepositoryGroupIdentifier, Repositoryish[]>()
--  for (const repository of repositories) {
--    const gitHubRepository =
--      repository instanceof Repository ? repository.gitHubRepository : null
--    let group: RepositoryGroupIdentifier = 'other'
--    if (gitHubRepository) {
--      if (gitHubRepository.endpoint === getDotComAPIEndpoint()) {
--        group = 'github'
--      } else {
--        group = 'enterprise'
--      }
--    } else {
--      group = 'other'
--    }
--
--    let repositories = grouped.get(group)
--    if (!repositories) {
--      repositories = new Array<Repository>()
--      grouped.set(group, repositories)
--    }
--
--    repositories.push(repository)
--  }
--
--  const groups = new Array<IFilterListGroup<IRepositoryListItem>>()
--
--  const addGroup = (identifier: RepositoryGroupIdentifier) => {
--    const repositories = grouped.get(identifier)
--    if (!repositories || repositories.length === 0) {
--      return
--    }
--
--    const names = new Map<string, number>()
--    for (const repository of repositories) {
--      const existingCount = names.get(repository.name) || 0
--      names.set(repository.name, existingCount + 1)
--    }
--
--    repositories.sort((x, y) => caseInsensitiveCompare(x.name, y.name))
--    const items: ReadonlyArray<IRepositoryListItem> = repositories.map(r => {
--      const nameCount = names.get(r.name) || 0
--      const { aheadBehind, changedFilesCount } =
--        localRepositoryStateLookup.get(r.id) || fallbackValue
--      return {
--        text: [r.name],
--        id: r.id.toString(),
--        repository: r,
--        needsDisambiguation: nameCount > 1,
--        aheadBehind,
--        changedFilesCount,
--      }
--    })
--
--    groups.push({ identifier, items })
--  }
--
--  // NB: This ordering reflects the order in the repositories sidebar.
--  addGroup('github')
--  addGroup('enterprise')
--  addGroup('other')
--
--  return groups
--}
-changed in both
-  base   100644 099975495f19aeb0f19adfcacf11a6f51bc6c4d6 app/src/ui/repositories-list/repositories-list.tsx
-  our    100644 e4ca588b503842ff6df4517d209f5fc5537d4a11 app/src/ui/repositories-list/repositories-list.tsx
-  their  100644 980b0c986ac78fdb0d6ed17f44fb5bb5ee148d8a app/src/ui/repositories-list/repositories-list.tsx
-@@ -1,14 +1,13 @@
- import * as React from 'react'
- 
- import { RepositoryListItem } from './repository-list-item'
-+import { Repositoryish } from '../../models/repository'
- import {
--  groupRepositories,
-   IRepositoryListItem,
--  Repositoryish,
-   RepositoryGroupIdentifier,
--} from './group-repositories'
-+} from '../../lib/group-repositories'
-+import { IFilterListGroup, IMatches } from '../../models/filter-list'
- import { FilterList } from '../lib/filter-list'
--import { IMatches } from '../../lib/fuzzy-find'
- import { assertNever } from '../../lib/fatal-error'
- import { ILocalRepositoryState } from '../../models/repository'
- import { enableRepoInfoIndicators } from '../../lib/feature-flag'
-@@ -16,7 +15,9 @@
- 
- interface IRepositoriesListProps {
-   readonly selectedRepository: Repositoryish | null
--  readonly repositories: ReadonlyArray<Repositoryish>
-+
-+  /** The grouped repositories to display in the list */
-+  readonly groups: ReadonlyArray<IFilterListGroup<IRepositoryListItem>>
- 
-   /** A cache of the latest repository state values, keyed by the repository id */
-   readonly localRepositoryStateLookup: Map<number, ILocalRepositoryState>
-@@ -119,19 +120,26 @@
-   }
- 
-   public render() {
--    if (this.props.repositories.length < 1) {
-+    const repositoryCount = this.props.groups
-+      .map(g => g.items.length)
-+      .reduce((prev, current) => prev + current)
-+
-+    if (repositoryCount < 1) {
-       return this.noRepositories()
-     }
- 
-+<<<<<<< .our
-     const groups = groupRepositories(
-       this.props.repositories,
-       this.props.localRepositoryStateLookup
-     )
- 
-+=======
-+>>>>>>> .their
-     let selectedItem: IRepositoryListItem | null = null
-     const selectedRepository = this.props.selectedRepository
-     if (selectedRepository) {
--      for (const group of groups) {
-+      for (const group of this.props.groups) {
-         selectedItem =
-           group.items.find(i => {
-             const repository = i.repository
-@@ -154,9 +162,9 @@
-           renderItem={this.renderItem}
-           renderGroupHeader={this.renderGroupHeader}
-           onItemClick={this.onItemClick}
--          groups={groups}
-+          groups={this.props.groups}
-           invalidationProps={{
--            repositories: this.props.repositories,
-+            groups: this.props.groups,
-             filterText: this.props.filterText,
-           }}
-         />
-changed in both
-  base   100644 4d6d2718f07e7136c8197bc1c47a8d2bfe8b2d38 app/src/ui/repositories-list/repository-list-item.tsx
-  our    100644 6ca3c771c795eba242cc4b795e3a3b0bbb4c7488 app/src/ui/repositories-list/repository-list-item.tsx
-  their  100644 e4a3aa331427b2bbfcb8b6c4f320e528747277c8 app/src/ui/repositories-list/repository-list-item.tsx
-@@ -1,12 +1,20 @@
- import * as React from 'react'
-+<<<<<<< .our
- import { Repository } from '../../models/repository'
- import { Octicon, iconForRepository, OcticonSymbol } from '../octicons'
-+=======
-+import { Repository, Repositoryish } from '../../models/repository'
-+import { Octicon, iconForRepository } from '../octicons'
-+>>>>>>> .their
- import { showContextualMenu } from '../main-process-proxy'
--import { Repositoryish } from './group-repositories'
- import { IMenuItem } from '../../lib/menu-item'
- import { HighlightText } from '../lib/highlight-text'
-+<<<<<<< .our
- import { IMatches } from '../../lib/fuzzy-find'
- import { IAheadBehind } from '../../models/branch'
-+=======
-+import { IMatches } from '../../models/filter-list'
-+>>>>>>> .their
- 
- const defaultEditorLabel = __DARWIN__
-   ? 'Open in External Editor'
-changed in both
-  base   100644 bf18722fdca8c3cfe0ee6e56f94440876e888175 app/test/unit/repositories-list-grouping-test.ts
-  our    100644 8c3c9ac4c1b7875569c8d7d44dec79ca7047423d app/test/unit/repositories-list-grouping-test.ts
-  their  100644 c01b5360134d88f9326a915d704d5d3ceaef0562 app/test/unit/repositories-list-grouping-test.ts
-@@ -1,7 +1,12 @@
- import { expect } from 'chai'
- 
-+<<<<<<< .our
- import { groupRepositories } from '../../src/ui/repositories-list/group-repositories'
- import { Repository, ILocalRepositoryState } from '../../src/models/repository'
-+=======
-+import { groupRepositories } from '../../src/lib/group-repositories'
-+import { Repository } from '../../src/models/repository'
-+>>>>>>> .their
- import { GitHubRepository } from '../../src/models/github-repository'
- import { Owner } from '../../src/models/owner'
- import { getDotComAPIEndpoint } from '../../src/lib/api'
diff --git a/app/test/fixtures/merge-parser/desktop/merge-selected-compare-commit-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-selected-compare-commit-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index 7bae36146f4..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-selected-compare-commit-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,402 +0,0 @@
-changed in both
-  base   100644 86b3c6de0194dc7492ad693937f515e539e85002 app/src/lib/app-state.ts
-  our    100644 b30f0fe080d909b81d2fb683ceb8deb365fb0191 app/src/lib/app-state.ts
-  their  100644 3e0e9a02ae5c99656f88283a2e811b94e86d5960 app/src/lib/app-state.ts
-@@ -564,8 +564,17 @@
- export interface ICommitSelection {
-   /** The commit currently selected in the app */
-   readonly sha: string | null
-+<<<<<<< .our
- 
-   /** The list of files associated with the current commit */
-+=======
-+  readonly file: CommittedFileChange | null
-+}
-+
-+export interface IHistoryState {
-+  readonly selection: IHistorySelection
-+
-+>>>>>>> .their
-   readonly changedFiles: ReadonlyArray<CommittedFileChange>
- 
-   /** The selected file inside the selected commit */
-@@ -623,6 +632,11 @@
-  */
- export interface IDisplayHistory {
-   readonly kind: ComparisonView.None
-+
-+  readonly selectedCommitSHA: string | null
-+
-+  /** The SHAs of commits to render in the list */
-+  readonly commitSHAs: ReadonlyArray<string>
- }
- 
- /**
-@@ -638,12 +652,18 @@
- 
-   /** The number of commits the selected branch is ahead/behind the current branch */
-   readonly aheadBehind: IAheadBehind
-+
-+  readonly selectedCommitSHA: string | null
-+
-+  /** The SHAs of commits to render in the list */
-+  readonly commitSHAs: ReadonlyArray<string>
- }
- 
- export interface ICompareState {
-   /** The current state of the compare form, based on user input */
-   readonly formState: IDisplayHistory | ICompareBranch
- 
-+<<<<<<< .our
-   /** Whether the branch list should be expanded or hidden */
-   readonly showBranchList: boolean
- 
-@@ -653,6 +673,8 @@
-   /** The SHAs of commits to render in the compare list */
-   readonly commitSHAs: ReadonlyArray<string>
- 
-+=======
-+>>>>>>> .their
-   /** A list of all branches (remote and local) currently in the repository. */
-   readonly allBranches: ReadonlyArray<Branch>
- 
-changed in both
-  base   100644 7660f27c9fa483bd947f1ffde2576ef075b5cf1b app/src/lib/dispatcher/dispatcher.ts
-  our    100644 5e56c00e713342e76f5ccba040062e322e8c90cb app/src/lib/dispatcher/dispatcher.ts
-  their  100644 69eeff384875a8663ab57a5a84ebdb207b5f7795 app/src/lib/dispatcher/dispatcher.ts
-@@ -148,6 +148,13 @@
-     return this.appStore._changeCommitSelection(repository, sha)
-   }
- 
-+  public changeCompareCommitSelection(
-+    repository: Repository,
-+    sha: string
-+  ): Promise<void> {
-+    return this.appStore._changeCompareCommitSelection(repository, sha)
-+  }
-+
-   /**
-    * Change the selected changed file in the history view.
-    *
-changed in both
-  base   100644 913f0d9877d9d1681da13a02004091689e826c67 app/src/lib/stores/app-store.ts
-  our    100644 1a4e387e4d192d34abfd0621b4b5ebe8cc34d8d1 app/src/lib/stores/app-store.ts
-  their  100644 b6383b0080b772a8e9b61fe679fdbe0912f9e93b app/src/lib/stores/app-store.ts
-@@ -461,10 +461,18 @@
-         isLoadingPullRequests: false,
-       },
-       compareState: {
-+<<<<<<< .our
-         formState: { kind: ComparisonView.None },
-         showBranchList: false,
-         filterText: '',
-         commitSHAs: [],
-+=======
-+        formState: {
-+          kind: ComparisonView.None,
-+          selectedCommitSHA: null,
-+          commitSHAs: [],
-+        },
-+>>>>>>> .their
-         aheadBehindCache: new ComparisonCache(),
-         allBranches: new Array<Branch>(),
-         recentBranches: new Array<Branch>(),
-@@ -617,6 +625,21 @@
-   }
- 
-   private onGitStoreUpdated(repository: Repository, gitStore: GitStore) {
-+<<<<<<< .our
-+=======
-+    this.updateCompareState(repository, state => {
-+      if (state.formState.kind === ComparisonView.None) {
-+        return {
-+          formState: { ...state.formState, commitSHAs: gitStore.history },
-+        }
-+      }
-+
-+      // TODO: This is a workaround for Pick<T> expecting at least one
-+      // property, it's ugly and there has to be a workaround for it.
-+      return { formState: state.formState }
-+    })
-+
-+>>>>>>> .their
-     this.updateBranchesState(repository, state => ({
-       tip: gitStore.tip,
-       defaultBranch: gitStore.defaultBranch,
-@@ -700,6 +723,7 @@
-   }
- 
-   /** This shouldn't be called directly. See `Dispatcher`. */
-+<<<<<<< .our
-   public async _changeCommitSelection(
-     repository: Repository,
-     sha: string
-@@ -730,12 +754,35 @@
-         // -> clear the selection in the app state
-         selectedSHA = null
-         this.clearSelectedCommit(repository)
-+=======
-+  public async _loadHistory(repository: Repository): Promise<void> {
-+    const gitStore = this.getGitStore(repository)
-+    await gitStore.loadHistory()
-+
-+    const state = this.getRepositoryState(repository).compareState
-+
-+    if (state.formState.kind === ComparisonView.None) {
-+      const { commitSHAs } = state.formState
-+      let selectedSHA = state.formState.selectedCommitSHA
-+      if (selectedSHA) {
-+        const index = commitSHAs.findIndex(sha => sha === selectedSHA)
-+        // Our selected SHA disappeared, so clear the selection.
-+        if (index < 0) {
-+          selectedSHA = null
-+        }
-+>>>>>>> .their
-       }
--    }
- 
-+<<<<<<< .our
-     if (selectedSHA == null && commitSHAs.length > 0) {
-       this._changeCommitSelection(repository, commitSHAs[0])
-       this._loadChangedFilesForCurrentSelection(repository)
-+=======
-+      if (selectedSHA === null && commitSHAs.length > 0) {
-+        this._changeHistoryCommitSelection(repository, commitSHAs[0])
-+        this._loadChangedFilesForCurrentSelection(repository)
-+      }
-+>>>>>>> .their
-     }
-   }
- 
-@@ -871,20 +918,30 @@
-     const kind = action.kind
- 
-     if (action.kind === CompareActionKind.History) {
-+<<<<<<< .our
-       // load initial group of commits for current branch
-       const commits = await gitStore.loadCommitBatch('HEAD')
- 
-       if (commits === null) {
-         return
-       }
-+=======
-+      await gitStore.loadHistory()
-+      const commits = gitStore.history
-+>>>>>>> .their
- 
-       this.updateCompareState(repository, () => ({
-         formState: {
-           kind: ComparisonView.None,
-+          selectedCommitSHA: commits.length ? commits[0] : null,
-+          commitSHAs: commits,
-         },
-+<<<<<<< .our
-         commitSHAs: commits,
-         filterText: '',
-         showBranchList: false,
-+=======
-+>>>>>>> .their
-       }))
-       this.updateOrSelectFirstCommit(repository, commits)
- 
-@@ -939,7 +996,21 @@
-       commitSHAs,
-     }))
- 
-+<<<<<<< .our
-     const tip = gitStore.tip
-+=======
-+      if (compare !== null) {
-+        const commits = compare.commits.map(commit => commit.sha)
-+        this.updateCompareState(repository, s => ({
-+          formState: {
-+            comparisonBranch,
-+            kind: action.mode,
-+            selectedCommitSHA: commits.length ? commits[0] : null,
-+            aheadBehind: { ahead: compare.ahead, behind: compare.behind },
-+            commitSHAs: commits,
-+          },
-+        }))
-+>>>>>>> .their
- 
-     let currentSha: string | null = null
- 
-@@ -1079,6 +1150,40 @@
-   }
- 
-   /** This shouldn't be called directly. See `Dispatcher`. */
-+<<<<<<< .our
-+=======
-+  public async _changeHistoryCommitSelection(
-+    repository: Repository,
-+    sha: string
-+  ): Promise<void> {
-+    this.updateHistoryState(repository, state => {
-+      const commitChanged = state.selection.sha !== sha
-+      const changedFiles = commitChanged
-+        ? new Array<CommittedFileChange>()
-+        : state.changedFiles
-+      const file = commitChanged ? null : state.selection.file
-+      const selection = { sha, file }
-+      const diff = null
-+
-+      return { selection, changedFiles, diff }
-+    })
-+    this.emitUpdate()
-+  }
-+
-+  /** This shouldn't be called directly. See `Dispatcher`. */
-+  public async _changeCompareCommitSelection(
-+    repository: Repository,
-+    sha: string
-+  ): Promise<void> {
-+    this.updateCompareState(repository, state => {
-+      const newFormState = { ...state.formState, selectedCommitSHA: sha }
-+      return { formState: newFormState }
-+    })
-+    this.emitUpdate()
-+  }
-+
-+  /** This shouldn't be called directly. See `Dispatcher`. */
-+>>>>>>> .their
-   public async _setRepositoryFilterText(text: string): Promise<void> {
-     this.repositoryFilterText = text
-     this.emitUpdate()
-changed in both
-  base   100644 2bb0d1e69b6e6acc7bc7b9b7b8cd79ba486625a8 app/src/ui/history/compare.tsx
-  our    100644 c0be0e26ce79b9a590edfa3a9fd3718fa58782d4 app/src/ui/history/compare.tsx
-  their  100644 cc767f0ad425e2a97efa57513e52ccda7536bd31 app/src/ui/history/compare.tsx
-@@ -53,12 +53,17 @@
-    * For all other cases, use the prop
-    */
-   readonly focusedBranch: Branch | null
-+<<<<<<< .our
- 
-   /**
-    * Flag that tracks whether the user interacted with one of the notification's
-    * "call to action" buttons
-    */
-   readonly hasConsumedNotification: boolean
-+=======
-+  readonly filterText: string
-+  readonly showBranchList: boolean
-+>>>>>>> .their
- }
- 
- /** If we're within this many rows from the bottom, load the next history batch. */
-@@ -79,7 +84,12 @@
- 
-     this.state = {
-       focusedBranch: null,
-+<<<<<<< .our
-       hasConsumedNotification: false,
-+=======
-+      filterText: '',
-+      showBranchList: false,
-+>>>>>>> .their
-     }
-   }
- 
-@@ -238,7 +248,13 @@
-   }
- 
-   private renderCommitList() {
-+<<<<<<< .our
-     const { formState, commitSHAs } = this.props.compareState
-+=======
-+    const compareState = this.props.compareState
-+    const { formState } = compareState
-+    const { commitSHAs, selectedCommitSHA } = formState
-+>>>>>>> .their
- 
-     let emptyListMessage: string | JSX.Element
-     if (formState.kind === ComparisonView.None) {
-@@ -265,7 +281,11 @@
-         gitHubRepository={this.props.repository.gitHubRepository}
-         commitLookup={this.props.commitLookup}
-         commitSHAs={commitSHAs}
-+<<<<<<< .our
-         selectedSHA={this.props.selectedCommitSha}
-+=======
-+        selectedSHA={selectedCommitSHA}
-+>>>>>>> .their
-         gitHubUsers={this.props.gitHubUsers}
-         localCommitSHAs={this.props.localCommitSHAs}
-         emoji={this.props.emoji}
-@@ -447,6 +467,11 @@
-       commit.sha
-     )
- 
-+    this.props.dispatcher.changeCompareCommitSelection(
-+      this.props.repository,
-+      commit.sha
-+    )
-+
-     this.loadChangedFilesScheduler.queue(() => {
-       this.props.dispatcher.loadChangedFilesForCurrentSelection(
-         this.props.repository
-@@ -464,7 +489,7 @@
-       return
-     }
- 
--    const commits = compareState.commitSHAs
-+    const commits = compareState.formState.commitSHAs
-     if (commits.length - end <= CloseToBottomThreshold) {
-       if (this.loadingMoreCommitsPromise != null) {
-         // as this callback fires for any scroll event we need to guard
-removed in local
-  base   100644 0f7ba2c51eb72711ce866811c1cdf6ec2a641439 app/src/ui/history/sidebar.tsx
-  their  100644 0dde562e164abfa27a4dd7bf40a08af7f7a4eb54 app/src/ui/history/sidebar.tsx
-changed in both
-  base   100644 2fe9280cbce5add68c32917de0f29293a5c1f684 app/src/ui/repository.tsx
-  our    100644 efb00423012b8da0dfa5e8897acacaeb0a5e648a app/src/ui/repository.tsx
-  their  100644 9d3ba9d30a822ca2f1cd262769b0e7e7af5e34a1 app/src/ui/repository.tsx
-@@ -14,6 +14,7 @@
-   IRepositoryState,
-   RepositorySectionTab,
-   ImageDiffType,
-+  ComparisonView,
- } from '../lib/app-state'
- import { Dispatcher } from '../lib/dispatcher'
- import { IssuesStore, GitHubUserStore } from '../lib/stores'
-@@ -156,6 +157,31 @@
-     )
-   }
- 
-+<<<<<<< .our
-+=======
-+  private renderHistorySidebar(): JSX.Element | null {
-+    const formState = this.props.state.compareState.formState
-+
-+    if (formState.kind !== ComparisonView.None) {
-+      return null
-+    }
-+
-+    return (
-+      <HistorySidebar
-+        repository={this.props.repository}
-+        dispatcher={this.props.dispatcher}
-+        history={formState}
-+        gitHubUsers={this.props.state.gitHubUsers}
-+        emoji={this.props.emoji}
-+        commitLookup={this.props.state.commitLookup}
-+        localCommitSHAs={this.props.state.localCommitSHAs}
-+        onRevertCommit={this.onRevertCommit}
-+        onViewCommitOnGitHub={this.props.onViewCommitOnGitHub}
-+      />
-+    )
-+  }
-+
-+>>>>>>> .their
-   private renderCompareSidebar(): JSX.Element {
-     const tip = this.props.state.branchesState.tip
-     const currentBranch = tip.kind === TipState.Valid ? tip.branch : null
-@@ -180,7 +206,7 @@
-     )
-   }
- 
--  private renderSidebarContents(): JSX.Element {
-+  private renderSidebarContents(): JSX.Element | null {
-     const selectedSection = this.props.state.selectedSection
- 
-     if (selectedSection === RepositorySectionTab.Changes) {
diff --git a/app/test/fixtures/merge-parser/desktop/merge-selenium-desktop-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-selenium-desktop-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index de24eaa4779..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-selenium-desktop-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,894 +0,0 @@
-removed in local
-  base   100644 5602d04593bc047d4920549bc1db59981d58b263 .github/ISSUE_TEMPLATE/feature_request.md
-  their  100644 9ac98a9ec52032212c8b2611bbcb688d0f7e6e58 .github/ISSUE_TEMPLATE/feature_request.md
-added in remote
-  their  100644 d8f838babad858136432a79366d352f0613ee017 app/test/integration/selenium-launch.ts
-@@ -0,0 +1,73 @@
-+import { expect } from 'chai'
-+
-+import * as webdriver from 'selenium-webdriver'
-+const { findElement, getText, click } = require('selenium-adapter')
-+
-+// SETUP
-+// 0. yarn install
-+// 1. find your desktop binary and update variable below (const DESKTOP_BINARY_LOCATION, ~L22)
-+// 2. change the test's `expect` to equal the name of your first repo in the repo list dropdown (~L53)
-+// 3. make sure you're not running Desktop any more
-+// 4. run: `$ yarn test:selenium`
-+
-+// NOTE
-+// * i might migrate to puppeteer for fun
-+// * selenium-adapter is from a friend's repo (vinsonchuong on github), not needed but it's nice to have around
-+
-+const WAIT_BEFORE_OPEN = 1 // will not scale well! we should do a wait until for a title to appear
-+const WAIT_BEFORE_CLOSE = 0 // in case you want to inspect as you're testing before you lose your spot
-+
-+// NOTE!!! you must locate your desktop app's binary that you want to use. eventually we'll have URL
-+// from central to download, setup, and run tests on (especially if we want this in CI)
-+const DESKTOP_BINARY_LOCATION =
-+  '/Applications/GitHub Desktop.app/Contents/MacOS/GitHub Desktop' // change this according to your machine
-+
-+async function openDesktop() {
-+  const driver = await new webdriver.Builder()
-+    .usingServer('http://localhost:9515')
-+    .withCapabilities({
-+      chromeOptions: { binary: DESKTOP_BINARY_LOCATION },
-+    })
-+    .forBrowser('electron')
-+    .build()
-+
-+  await driver.sleep(WAIT_BEFORE_OPEN * 1000)
-+  return driver
-+}
-+
-+async function closeDesktop(driver: webdriver.WebDriver) {
-+  await driver.sleep(WAIT_BEFORE_CLOSE * 1000)
-+  await driver.quit()
-+}
-+
-+describe('Repository Dropdown', () => {
-+  it('can show repository names', async () => {
-+    // BEFORE EACH (eventually pull out to actual `beforeEach`)
-+    // note: challenge is getting the driver and passing it into each test; especially if we paralellize
-+    const driver = await openDesktop()
-+
-+    // TEST
-+    await openDropdown(driver)
-+    const repositoryItemText = await getFirstRepository(driver)
-+
-+    expect(repositoryItemText).to.equal('adacats') // customized to first repo on *my computer*
-+
-+    // AFTER EACH (eventually pull out to actual `afterEach`)
-+    await closeDesktop(driver)
-+  })
-+})
-+
-+async function openDropdown(driver: webdriver.WebDriver) {
-+  const repositoryDropdown = await findElement(driver, '.button-component')
-+  await click(repositoryDropdown)
-+
-+  await driver.sleep(WAIT_BEFORE_OPEN * 1000) // hacky fix. needs better solution. will not work well on CI
-+}
-+
-+async function getFirstRepository(driver: webdriver.WebDriver) {
-+  const repositoryDropdownElement = await findElement(
-+    driver,
-+    '.repository-list-item'
-+  )
-+  return await getText(repositoryDropdownElement)
-+}
-changed in both
-  base   100644 25df97959715b124e8108bef0b086939d7e328c9 package.json
-  our    100644 2006bfb748810f6ea8bdbd26edf7c09524a1388a package.json
-  their  100644 878c5eae6149d86b6e830469f870b352f98b4861 package.json
-@@ -5,7 +5,12 @@
-   },
-   "description": "GitHub Desktop build dependencies",
-   "scripts": {
-+<<<<<<< .our
-     "cli": "ts-node --require ./app/test/globals.ts --require ./app/src/cli/dev-commands-global.ts app/src/cli/main.ts",
-+=======
-+    "cli": "ts-node --require ./app/test/globals.ts --require ./app/src/cli/dev-commands-global.js app/src/cli/main.ts",
-+    "test:selenium": "./node_modules/.bin/chromedriver & yarn mocha -t 30000 --require ts-node/register app/test/integration/selenium-launch.ts",
-+>>>>>>> .their
-     "test:integration": "cross-env TEST_ENV=1 ELECTRON_NO_ATTACH_CONSOLE=1 xvfb-maybe --auto-servernum -- mocha -t 30000 --require ts-node/register app/test/integration/*.ts",
-     "test:unit": "ts-node script/unit-tests.ts",
-     "test:script": "mocha -t 10000 --require ts-node/register script/changelog/test/*.ts",
-@@ -136,7 +141,11 @@
-     "@types/react-dom": "^16.0.5",
-     "@types/react-transition-group": "1.1.1",
-     "@types/react-virtualized": "^9.7.12",
-+<<<<<<< .our
-     "@types/request": "^2.0.9",
-+=======
-+    "@types/selenium-webdriver": "^3.0.8",
-+>>>>>>> .their
-     "@types/semver": "^5.5.0",
-     "@types/strip-ansi": "^3.0.0",
-     "@types/temp": "^0.8.29",
-@@ -152,10 +161,21 @@
-     "@types/webpack-merge": "^4.1.3",
-     "@types/winston": "^2.2.0",
-     "@types/xml2js": "^0.4.0",
-+<<<<<<< .our
-     "electron": "2.0.5",
-     "electron-builder": "20.27.1",
-     "electron-mocha": "^6.0.1",
-     "electron-packager": "^12.0.0",
-     "electron-winstaller": "2.5.2"
-+=======
-+    "electron": "1.8.3",
-+    "electron-builder": "20.2.0",
-+    "electron-chromedriver": "^2.0.0",
-+    "electron-mocha": "^6.0.1",
-+    "electron-packager": "^11.0.0",
-+    "electron-winstaller": "2.5.2",
-+    "selenium-adapter": "^0.2.7",
-+    "selenium-webdriver": "^4.0.0-alpha.1"
-+>>>>>>> .their
-   }
- }
-changed in both
-  base   100644 3a75632078d5f75640a371d3287e6a15a9e8f3ac yarn.lock
-  our    100644 45ddb8bf6902bbb22708d844324093dccda26c79 yarn.lock
-  their  100644 b2869f6a4030fa90f7e8d13b345a0842fa9824b9 yarn.lock
-@@ -235,6 +235,10 @@
-     "@types/form-data" "*"
-     "@types/node" "*"
- 
-+"@types/selenium-webdriver@^3.0.8":
-+  version "3.0.8"
-+  resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-3.0.8.tgz#83de9dd7aaf25f7fbd967c0d4fcc8112746dbf31"
-+
- "@types/semver@^5.5.0":
-   version "5.5.0"
-   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45"
-@@ -499,9 +503,23 @@
-   version "5.5.3"
-   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.3.tgz#f473dd47e0277a08e28e9bec5aeeb04751f0b8c9"
- 
-+<<<<<<< .our
- ajv-keywords@^3.0.0, ajv-keywords@^3.2.0:
-   version "3.2.0"
-   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
-+=======
-+adm-zip@0.4.7:
-+  version "0.4.7"
-+  resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.7.tgz#8606c2cbf1c426ce8c8ec00174447fd49b6eafc1"
-+
-+ajv-keywords@^1.1.1:
-+  version "1.5.1"
-+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
-+
-+ajv-keywords@^2.0.0, ajv-keywords@^2.1.0:
-+  version "2.1.1"
-+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
-+>>>>>>> .their
- 
- ajv-keywords@^3.1.0:
-   version "3.1.0"
-@@ -1293,7 +1311,15 @@
-   dependencies:
-     bluebird "^3.5.1"
- 
-+<<<<<<< .our
- bluebird@^3.0.6, bluebird@^3.1.1, bluebird@^3.3.4, bluebird@^3.5.0, bluebird@^3.5.1:
-+=======
-+bluebird@3.4.6:
-+  version "3.4.6"
-+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.6.tgz#01da8d821d87813d158967e743d5fe6c62cf8c0f"
-+
-+bluebird@^3.0.6, bluebird@^3.1.1, bluebird@^3.3.4, bluebird@^3.4.7, bluebird@^3.5.0, bluebird@^3.5.1:
-+>>>>>>> .their
-   version "3.5.1"
-   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
- 
-@@ -1301,6 +1327,10 @@
-   version "4.11.8"
-   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
- 
-+bo-selector@0.0.10:
-+  version "0.0.10"
-+  resolved "https://registry.yarnpkg.com/bo-selector/-/bo-selector-0.0.10.tgz#9816dcb00adf374ea87941a863b2acfc026afa3e"
-+
- body-parser@1.18.2:
-   version "1.18.2"
-   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.2.tgz#87678a19d84b47d859b83199bd59bce222b10454"
-@@ -1724,6 +1754,20 @@
-   version "0.1.3"
-   resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-0.1.3.tgz#d395af2d31c87b90a716c831fe326f69768ec084"
- 
-+chownr@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
-+
-+chromedriver@^2.32.3:
-+  version "2.38.3"
-+  resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-2.38.3.tgz#a432a254bc9ed1faa6edfa67cf5d1135aa2468d6"
-+  dependencies:
-+    del "^3.0.0"
-+    extract-zip "^1.6.6"
-+    kew "^0.7.0"
-+    mkdirp "^0.5.1"
-+    request "^2.85.0"
-+
- chromium-pickle-js@^0.1.0:
-   version "0.1.0"
-   resolved "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.1.0.tgz#1d48b107d82126a2f3e211c2ea25f803ba551b21"
-@@ -2018,6 +2062,10 @@
-   version "2.5.1"
-   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.1.tgz#ae6874dc66937789b80754ff5428df66819ca50b"
- 
-+core-js@~2.3.0:
-+  version "2.3.0"
-+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.3.0.tgz#fab83fbb0b2d8dc85fa636c4b9d34c75420c6d65"
-+
- core-util-is@1.0.2, core-util-is@~1.0.0:
-   version "1.0.2"
-   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-@@ -2040,7 +2088,7 @@
-     bn.js "^4.1.0"
-     elliptic "^6.0.0"
- 
--create-error-class@^3.0.0:
-+create-error-class@^3.0.0, create-error-class@^3.0.1:
-   version "3.0.2"
-   resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6"
-   dependencies:
-@@ -2179,6 +2227,13 @@
-     fastparse "^1.1.1"
-     regexpu-core "^1.0.0"
- 
-+css-to-xpath@^0.1.0:
-+  version "0.1.0"
-+  resolved "https://registry.yarnpkg.com/css-to-xpath/-/css-to-xpath-0.1.0.tgz#ac0d1c26cef023f7bd8cf2e1fc1f77134bc70c47"
-+  dependencies:
-+    bo-selector "0.0.10"
-+    xpath-builder "0.0.7"
-+
- css-value@~0.0.1:
-   version "0.0.1"
-   resolved "https://registry.yarnpkg.com/css-value/-/css-value-0.0.1.tgz#5efd6c2eea5ea1fd6b6ac57ec0427b18452424ea"
-@@ -2378,6 +2433,17 @@
-     pinkie-promise "^2.0.0"
-     rimraf "^2.2.8"
- 
-+del@^3.0.0:
-+  version "3.0.0"
-+  resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
-+  dependencies:
-+    globby "^6.1.0"
-+    is-path-cwd "^1.0.0"
-+    is-path-in-cwd "^1.0.0"
-+    p-map "^1.1.1"
-+    pify "^3.0.0"
-+    rimraf "^2.2.8"
-+
- delayed-stream@~1.0.0:
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-@@ -2525,6 +2591,12 @@
-   version "6.0.0"
-   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.0.0.tgz#24e37c041741c5f4b25324958ebbc34bca965935"
- 
-+duplexer2@^0.1.4:
-+  version "0.1.4"
-+  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
-+  dependencies:
-+    readable-stream "^2.0.2"
-+
- duplexer3@^0.1.4:
-   version "0.1.4"
-   resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
-@@ -2582,6 +2654,13 @@
-     update-notifier "^2.5.0"
-     yargs "^12.0.1"
- 
-+electron-chromedriver@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/electron-chromedriver/-/electron-chromedriver-2.0.0.tgz#e63d7f53716e15a5861d691ace522b5c82c186b0"
-+  dependencies:
-+    electron-download "^4.1.0"
-+    extract-zip "^1.6.5"
-+
- electron-chromedriver@~1.8.0:
-   version "1.8.0"
-   resolved "https://registry.yarnpkg.com/electron-chromedriver/-/electron-chromedriver-1.8.0.tgz#901714133cf6f6093d365e1f44a52d99624d8241"
-@@ -2818,10 +2897,47 @@
-   version "4.2.4"
-   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.4.tgz#dc4221c2b16518760bd8c39a52d8f356fc00ed29"
- 
-+es6-promise@^4.0.3:
-+  version "4.2.4"
-+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.4.tgz#dc4221c2b16518760bd8c39a52d8f356fc00ed29"
-+
- es6-promise@^4.0.5:
-   version "4.1.1"
-   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.1.1.tgz#8811e90915d9a0dba36274f0b242dbda78f9c92a"
- 
-+<<<<<<< .our
-+=======
-+es6-promise@~3.0.2:
-+  version "3.0.2"
-+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.0.2.tgz#010d5858423a5f118979665f46486a95c6ee2bb6"
-+
-+es6-set@~0.1.5:
-+  version "0.1.5"
-+  resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
-+  dependencies:
-+    d "1"
-+    es5-ext "~0.10.14"
-+    es6-iterator "~2.0.1"
-+    es6-symbol "3.1.1"
-+    event-emitter "~0.3.5"
-+
-+es6-symbol@3.1.1, es6-symbol@^3.1.1, es6-symbol@~3.1.1:
-+  version "3.1.1"
-+  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
-+  dependencies:
-+    d "1"
-+    es5-ext "~0.10.14"
-+
-+es6-weak-map@^2.0.1:
-+  version "2.0.2"
-+  resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"
-+  dependencies:
-+    d "1"
-+    es5-ext "^0.10.14"
-+    es6-iterator "^2.0.1"
-+    es6-symbol "^3.1.1"
-+
-+>>>>>>> .their
- escape-html@~1.0.3:
-   version "1.0.3"
-   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
-@@ -3139,7 +3255,20 @@
-     snapdragon "^0.8.1"
-     to-regex "^3.0.1"
- 
-+<<<<<<< .our
- extract-zip@^1.0.3, extract-zip@^1.6.5:
-+=======
-+extract-text-webpack-plugin@^3.0.0:
-+  version "3.0.2"
-+  resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.2.tgz#5f043eaa02f9750a9258b78c0a6e0dc1408fb2f7"
-+  dependencies:
-+    async "^2.4.1"
-+    loader-utils "^1.1.0"
-+    schema-utils "^0.3.0"
-+    webpack-sources "^1.0.1"
-+
-+extract-zip@^1.0.3, extract-zip@^1.6.5, extract-zip@^1.6.6:
-+>>>>>>> .their
-   version "1.6.6"
-   resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.6.tgz#1290ede8d20d0872b429fd3f351ca128ec5ef85c"
-   dependencies:
-@@ -3499,6 +3628,15 @@
-   dependencies:
-     globule "^1.0.0"
- 
-+geckodriver@^1.9.0:
-+  version "1.11.0"
-+  resolved "https://registry.yarnpkg.com/geckodriver/-/geckodriver-1.11.0.tgz#2853ccd4f420d347c61542daeed782c87a718687"
-+  dependencies:
-+    adm-zip "0.4.7"
-+    bluebird "3.4.6"
-+    got "5.6.0"
-+    tar "4.0.2"
-+
- generate-function@^2.0.0:
-   version "2.0.0"
-   resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74"
-@@ -3601,6 +3739,16 @@
-     pify "^2.0.0"
-     pinkie-promise "^2.0.0"
- 
-+globby@^6.1.0:
-+  version "6.1.0"
-+  resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
-+  dependencies:
-+    array-union "^1.0.1"
-+    glob "^7.0.3"
-+    object-assign "^4.0.1"
-+    pify "^2.0.0"
-+    pinkie-promise "^2.0.0"
-+
- globule@^1.0.0:
-   version "1.2.0"
-   resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.0.tgz#1dc49c6822dd9e8a2fa00ba2a295006e8664bd09"
-@@ -3609,6 +3757,27 @@
-     lodash "~4.17.4"
-     minimatch "~3.0.2"
- 
-+got@5.6.0:
-+  version "5.6.0"
-+  resolved "https://registry.yarnpkg.com/got/-/got-5.6.0.tgz#bb1d7ee163b78082bbc8eb836f3f395004ea6fbf"
-+  dependencies:
-+    create-error-class "^3.0.1"
-+    duplexer2 "^0.1.4"
-+    is-plain-obj "^1.0.0"
-+    is-redirect "^1.0.0"
-+    is-retry-allowed "^1.0.0"
-+    is-stream "^1.0.0"
-+    lowercase-keys "^1.0.0"
-+    node-status-codes "^1.0.0"
-+    object-assign "^4.0.1"
-+    parse-json "^2.1.0"
-+    pinkie-promise "^2.0.0"
-+    read-all-stream "^3.0.0"
-+    readable-stream "^2.0.5"
-+    timed-out "^2.0.0"
-+    unzip-response "^1.0.0"
-+    url-parse-lax "^1.0.0"
-+
- got@^6.7.1:
-   version "6.7.1"
-   resolved "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
-@@ -3763,7 +3932,11 @@
-     is-stream "^1.0.1"
-     pinkie-promise "^2.0.0"
- 
-+<<<<<<< .our
- hawk@~3.1.3:
-+=======
-+hawk@3.1.3, hawk@~3.1.3:
-+>>>>>>> .their
-   version "3.1.3"
-   resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
-   dependencies:
-@@ -3945,6 +4118,10 @@
-   version "4.0.3"
-   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.3.tgz#e2d58c9654d75b542529fa28d80ac95b29e4f467"
- 
-+immediate@~3.0.5:
-+  version "3.0.6"
-+  resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
-+
- import-lazy@^2.1.0:
-   version "2.1.0"
-   resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
-@@ -4508,10 +4685,32 @@
-   dependencies:
-     array-includes "^3.0.3"
- 
-+<<<<<<< .our
-+kew@^0.7.0:
-+  version "0.7.0"
-+  resolved "https://registry.yarnpkg.com/kew/-/kew-0.7.0.tgz#79d93d2d33363d6fdd2970b335d9141ad591d79b"
-+=======
-+jszip@^3.1.3:
-+  version "3.1.5"
-+  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.1.5.tgz#e3c2a6c6d706ac6e603314036d43cd40beefdf37"
-+  dependencies:
-+    core-js "~2.3.0"
-+    es6-promise "~3.0.2"
-+    lie "~3.1.0"
-+    pako "~1.0.2"
-+    readable-stream "~2.0.6"
-+
- kew@^0.7.0:
-   version "0.7.0"
-   resolved "https://registry.yarnpkg.com/kew/-/kew-0.7.0.tgz#79d93d2d33363d6fdd2970b335d9141ad591d79b"
- 
-+kind-of@^2.0.1:
-+  version "2.0.1"
-+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-2.0.1.tgz#018ec7a4ce7e3a86cb9141be519d24c8faa981b5"
-+  dependencies:
-+    is-buffer "^1.0.2"
-+>>>>>>> .their
-+
- kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
-   version "3.2.2"
-   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
-@@ -4594,6 +4793,12 @@
-     prelude-ls "~1.1.2"
-     type-check "~0.3.2"
- 
-+lie@~3.1.0:
-+  version "3.1.1"
-+  resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e"
-+  dependencies:
-+    immediate "~3.0.5"
-+
- load-json-file@^1.0.0:
-   version "1.1.0"
-   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
-@@ -4947,19 +5152,30 @@
-   version "0.0.10"
-   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
- 
-+<<<<<<< .our
- minipass@^2.2.1, minipass@^2.2.4:
-   version "2.2.4"
-   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.2.4.tgz#03c824d84551ec38a8d1bb5bc350a5a30a354a40"
-+=======
-+minipass@^2.2.1:
-+  version "2.3.0"
-+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.0.tgz#2e11b1c46df7fe7f1afbe9a490280add21ffe384"
-+>>>>>>> .their
-   dependencies:
-     safe-buffer "^5.1.1"
-     yallist "^3.0.0"
- 
-+<<<<<<< .our
- minizlib@^1.1.0:
-+=======
-+minizlib@^1.0.4:
-+>>>>>>> .their
-   version "1.1.0"
-   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb"
-   dependencies:
-     minipass "^2.2.1"
- 
-+<<<<<<< .our
- mississippi@^2.0.0:
-   version "2.0.0"
-   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
-@@ -4975,6 +5191,8 @@
-     stream-each "^1.1.0"
-     through2 "^2.0.0"
- 
-+=======
-+>>>>>>> .their
- mixin-deep@^1.2.0:
-   version "1.2.0"
-   resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.2.0.tgz#d02b8c6f8b6d4b8f5982d3fd009c4919851c3fe2"
-@@ -5201,6 +5419,10 @@
-     stdout-stream "^1.4.0"
-     "true-case-path" "^1.0.2"
- 
-+node-status-codes@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/node-status-codes/-/node-status-codes-1.0.0.tgz#5ae5541d024645d32a58fcddc9ceecea7ae3ac2f"
-+
- nodeify@^1.0.1:
-   version "1.0.1"
-   resolved "https://registry.yarnpkg.com/nodeify/-/nodeify-1.0.1.tgz#64ab69a7bdbaf03ce107b4f0335c87c0b9e91b1d"
-@@ -5453,6 +5675,7 @@
-   dependencies:
-     p-limit "^1.1.0"
- 
-+<<<<<<< .our
- p-locate@^3.0.0:
-   version "3.0.0"
-   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
-@@ -5462,6 +5685,11 @@
- p-try@^2.0.0:
-   version "2.0.0"
-   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
-+=======
-+p-map@^1.1.1:
-+  version "1.2.0"
-+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
-+>>>>>>> .their
- 
- package-json@^4.0.0:
-   version "4.0.1"
-@@ -5476,6 +5704,7 @@
-   version "0.2.9"
-   resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
- 
-+<<<<<<< .our
- parallel-transform@^1.1.0:
-   version "1.1.0"
-   resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz#d410f065b05da23081fcd10f28854c29bda33b06"
-@@ -5487,6 +5716,15 @@
- parallel-webpack@^2.3.0:
-   version "2.3.0"
-   resolved "https://registry.yarnpkg.com/parallel-webpack/-/parallel-webpack-2.3.0.tgz#a614625e25647cea9655918cb80cf829fa674ff8"
-+=======
-+pako@~1.0.2:
-+  version "1.0.6"
-+  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
-+
-+parallel-webpack@^2.1.0:
-+  version "2.2.0"
-+  resolved "https://registry.yarnpkg.com/parallel-webpack/-/parallel-webpack-2.2.0.tgz#7171440b684444610ba890d32439a33666ab46cb"
-+>>>>>>> .their
-   dependencies:
-     ajv "^4.9.2"
-     bluebird "^3.0.6"
-@@ -5529,7 +5767,20 @@
-   dependencies:
-     color-convert "~0.5.0"
- 
-+<<<<<<< .our
- parse-json@^2.2.0:
-+=======
-+parse-glob@^3.0.4:
-+  version "3.0.4"
-+  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
-+  dependencies:
-+    glob-base "^0.3.0"
-+    is-dotfile "^1.0.0"
-+    is-extglob "^1.0.0"
-+    is-glob "^2.0.0"
-+
-+parse-json@^2.1.0, parse-json@^2.2.0:
-+>>>>>>> .their
-   version "2.2.0"
-   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
-   dependencies:
-@@ -5621,6 +5872,7 @@
-   version "2.1.0"
-   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
- 
-+<<<<<<< .our
- phantom@~4.0.1:
-   version "4.0.12"
-   resolved "https://registry.yarnpkg.com/phantom/-/phantom-4.0.12.tgz#78d18cf3f2a76fea4909f6160fcabf2742d7dbf0"
-@@ -5630,6 +5882,9 @@
-     winston "^2.4.0"
- 
- phantomjs-prebuilt@^2.1.16, phantomjs-prebuilt@~2.1.7:
-+=======
-+phantomjs-prebuilt@^2.1.15:
-+>>>>>>> .their
-   version "2.1.16"
-   resolved "https://registry.yarnpkg.com/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.16.tgz#efd212a4a3966d3647684ea8ba788549be2aefef"
-   dependencies:
-@@ -6141,9 +6396,22 @@
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/rcedit/-/rcedit-1.0.0.tgz#43309ecbc8814f3582fca6b751748cfad66a16a2"
- 
-+<<<<<<< .our
- read-config-file@3.1.0:
-   version "3.1.0"
-   resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-3.1.0.tgz#d433283c76f32204d6995542e4a04723db9e8308"
-+=======
-+read-all-stream@^3.0.0:
-+  version "3.1.0"
-+  resolved "https://registry.yarnpkg.com/read-all-stream/-/read-all-stream-3.1.0.tgz#35c3e177f2078ef789ee4bfafa4373074eaef4fa"
-+  dependencies:
-+    pinkie-promise "^2.0.0"
-+    readable-stream "^2.0.0"
-+
-+read-config-file@3.0.0:
-+  version "3.0.0"
-+  resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-3.0.0.tgz#771def5184a7f76abaf6b2c82f20cb983775b8ea"
-+>>>>>>> .their
-   dependencies:
-     ajv "^6.5.2"
-     ajv-keywords "^3.2.0"
-@@ -6260,6 +6528,17 @@
-     string_decoder "~1.0.3"
-     util-deprecate "~1.0.1"
- 
-+readable-stream@~2.0.6:
-+  version "2.0.6"
-+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
-+  dependencies:
-+    core-util-is "~1.0.0"
-+    inherits "~2.0.1"
-+    isarray "~1.0.0"
-+    process-nextick-args "~1.0.6"
-+    string_decoder "~0.10.x"
-+    util-deprecate "~1.0.1"
-+
- readdir-scoped-modules@^1.0.0:
-   version "1.0.2"
-   resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747"
-@@ -6455,9 +6734,42 @@
-     tunnel-agent "~0.4.1"
-     uuid "^3.0.0"
- 
-+<<<<<<< .our
- request@~2.81.0:
-   version "2.81.0"
-   resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
-+=======
-+request@^2.85.0:
-+  version "2.85.0"
-+  resolved "https://registry.yarnpkg.com/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa"
-+  dependencies:
-+    aws-sign2 "~0.7.0"
-+    aws4 "^1.6.0"
-+    caseless "~0.12.0"
-+    combined-stream "~1.0.5"
-+    extend "~3.0.1"
-+    forever-agent "~0.6.1"
-+    form-data "~2.3.1"
-+    har-validator "~5.0.3"
-+    hawk "~6.0.2"
-+    http-signature "~1.2.0"
-+    is-typedarray "~1.0.0"
-+    isstream "~0.1.2"
-+    json-stringify-safe "~5.0.1"
-+    mime-types "~2.1.17"
-+    oauth-sign "~0.8.2"
-+    performance-now "^2.1.0"
-+    qs "~6.5.1"
-+    safe-buffer "^5.1.1"
-+    stringstream "~0.0.5"
-+    tough-cookie "~2.3.3"
-+    tunnel-agent "^0.6.0"
-+    uuid "^3.1.0"
-+
-+request@~2.79.0:
-+  version "2.79.0"
-+  resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
-+>>>>>>> .their
-   dependencies:
-     aws-sign2 "~0.6.0"
-     aws4 "^1.2.1"
-@@ -6530,7 +6842,17 @@
-   version "0.1.0"
-   resolved "https://registry.yarnpkg.com/rgb2hex/-/rgb2hex-0.1.0.tgz#ccd55f860ae0c5c4ea37504b958e442d8d12325b"
- 
-+<<<<<<< .our
- rimraf@2, rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
-+=======
-+right-align@^0.1.1:
-+  version "0.1.3"
-+  resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
-+  dependencies:
-+    align-text "^0.1.1"
-+
-+rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1:
-+>>>>>>> .their
-   version "2.6.2"
-   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
-   dependencies:
-@@ -6638,6 +6960,34 @@
-     js-base64 "^2.1.8"
-     source-map "^0.4.2"
- 
-+selenium-adapter@^0.2.7:
-+  version "0.2.7"
-+  resolved "https://registry.yarnpkg.com/selenium-adapter/-/selenium-adapter-0.2.7.tgz#0f1af0a11d920d416c6eb5f2a8cb27a3142b3b7c"
-+  dependencies:
-+    chromedriver "^2.32.3"
-+    css-to-xpath "^0.1.0"
-+    geckodriver "^1.9.0"
-+    phantomjs-prebuilt "^2.1.15"
-+    selenium-webdriver "^3.5.0"
-+
-+selenium-webdriver@^3.5.0:
-+  version "3.6.0"
-+  resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-3.6.0.tgz#2ba87a1662c020b8988c981ae62cb2a01298eafc"
-+  dependencies:
-+    jszip "^3.1.3"
-+    rimraf "^2.5.4"
-+    tmp "0.0.30"
-+    xml2js "^0.4.17"
-+
-+selenium-webdriver@^4.0.0-alpha.1:
-+  version "4.0.0-alpha.1"
-+  resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-4.0.0-alpha.1.tgz#cc93415e21d2dc1dfd85dfc5f6b55f3ac53933b1"
-+  dependencies:
-+    jszip "^3.1.3"
-+    rimraf "^2.5.4"
-+    tmp "0.0.30"
-+    xml2js "^0.4.17"
-+
- semver-diff@^2.0.0:
-   version "2.1.0"
-   resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"
-@@ -7224,7 +7574,21 @@
-     readable-stream "^2.0.0"
-     xtend "^4.0.0"
- 
-+<<<<<<< .our
- tar@^2.0.0:
-+=======
-+tar@4.0.2:
-+  version "4.0.2"
-+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.0.2.tgz#e8e22bf3eec330e5c616d415a698395e294e8fad"
-+  dependencies:
-+    chownr "^1.0.1"
-+    minipass "^2.2.1"
-+    minizlib "^1.0.4"
-+    mkdirp "^0.5.0"
-+    yallist "^3.0.2"
-+
-+tar@^2.0.0, tar@^2.2.1:
-+>>>>>>> .their
-   version "2.2.1"
-   resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
-   dependencies:
-@@ -7278,6 +7642,7 @@
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c"
- 
-+<<<<<<< .our
- through2@^2.0.0:
-   version "2.0.3"
-   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
-@@ -7285,6 +7650,8 @@
-     readable-stream "^2.1.5"
-     xtend "~4.0.1"
- 
-+=======
-+>>>>>>> .their
- through2@~0.2.3:
-   version "0.2.3"
-   resolved "https://registry.yarnpkg.com/through2/-/through2-0.2.3.tgz#eb3284da4ea311b6cc8ace3653748a52abf25a3f"
-@@ -7296,6 +7663,10 @@
-   version "2.3.8"
-   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
- 
-+timed-out@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-2.0.0.tgz#f38b0ae81d3747d628001f41dafc652ace671c0a"
-+
- timed-out@^4.0.0:
-   version "4.0.1"
-   resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
-@@ -7312,6 +7683,12 @@
-   dependencies:
-     os-tmpdir "~1.0.1"
- 
-+tmp@0.0.30:
-+  version "0.0.30"
-+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.30.tgz#72419d4a8be7d6ce75148fd8b324e593a711c2ed"
-+  dependencies:
-+    os-tmpdir "~1.0.1"
-+
- tmp@^0.0.33:
-   version "0.0.33"
-   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
-@@ -7636,6 +8013,10 @@
-     has-value "^0.3.1"
-     isobject "^3.0.0"
- 
-+unzip-response@^1.0.0:
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-1.0.2.tgz#b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe"
-+
- unzip-response@^2.0.1:
-   version "2.0.1"
-   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
-@@ -7948,7 +8329,7 @@
-   version "2.0.0"
-   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
- 
--which@1, which@^1.2.4, which@^1.2.9, which@^1.3.0:
-+which@1, which@^1.2.10, which@^1.2.4, which@^1.2.9, which@^1.3.0:
-   version "1.3.0"
-   resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
-   dependencies:
-@@ -8051,7 +8432,7 @@
-     sax ">=0.6.0"
-     xmlbuilder "^4.1.0"
- 
--xml2js@^0.4.16:
-+xml2js@^0.4.16, xml2js@^0.4.17:
-   version "0.4.19"
-   resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7"
-   dependencies:
-@@ -8080,11 +8461,19 @@
-   version "0.1.27"
-   resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
- 
-+<<<<<<< .our
- xregexp@4.0.0:
-   version "4.0.0"
-   resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
- 
- xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
-+=======
-+xpath-builder@0.0.7:
-+  version "0.0.7"
-+  resolved "https://registry.yarnpkg.com/xpath-builder/-/xpath-builder-0.0.7.tgz#67d6bbc3f6a320ec317e3e6368c5706b6111deec"
-+
-+xtend@^4.0.0, xtend@^4.0.1:
-+>>>>>>> .their
-   version "4.0.1"
-   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
- 
-@@ -8117,9 +8506,15 @@
-   version "3.0.2"
-   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
- 
-+<<<<<<< .our
- yargs-parser@^10.0.0, yargs-parser@^10.1.0:
-   version "10.1.0"
-   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
-+=======
-+yargs-parser@^4.2.0:
-+  version "4.2.1"
-+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"
-+>>>>>>> .their
-   dependencies:
-     camelcase "^4.1.0"
- 
diff --git a/app/test/fixtures/merge-parser/desktop/merge-shiftkey-yarn-bump-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-shiftkey-yarn-bump-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index e789331fd3f..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-shiftkey-yarn-bump-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,98 +0,0 @@
-changed in both
-  base   100644 fde223649b6eef6edf60d8726f22ddd799873819 .travis.yml
-  our    100644 7e0e74ba2993836baa0a7461123da84818d6a990 .travis.yml
-  their  100644 df10666f88d7c94e6f08caad298af5b6f2ad5d31 .travis.yml
-@@ -48,6 +48,13 @@
-     - .eslintcache
-     - $HOME/.cache/electron-builder
- 
-+<<<<<<< .our
-+=======
-+before_install:
-+  - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.7.0
-+  - export PATH=$HOME/.yarn/bin:$PATH
-+
-+>>>>>>> .their
- install:
-   - yarn install --offline
- 
-removed in local
-  base   100644 19865d13f3ab50d13c233da23115035bf423212e circle.yml
-  their  100644 2f7175ea65c162d0a071a6e84a3993a2f30ff480 circle.yml
-changed in both
-  base   100644 1f98235d11d633403ddaa711926d2a73f53456e0 vsts.yml
-  our    100644 dcf24cca01f5cd69beee03d16eb12c73081b9793 vsts.yml
-  their  100644 8a07441df176251ae82204268f07997e7310cb3e vsts.yml
-@@ -1,4 +1,5 @@
- phases:
-+<<<<<<< .our
-   - phase: Windows
-     queue: Hosted VS2017
-     steps:
-@@ -57,3 +58,66 @@
-       - script: |
-           yarn test:setup && yarn test
-         name: Test
-+=======
-+- phase: Windows
-+  queue: Hosted VS2017
-+  steps:
-+  - task: NodeTool@0
-+    inputs:
-+      versionSpec: "8.11.1"
-+  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-+    inputs:
-+      versionSpec: "1.7.0"
-+  - script: |
-+       yarn install --force
-+    name: Install
-+  - script: |
-+      yarn lint && yarn build:prod
-+    name: Build
-+  - script: |
-+      yarn test:setup && yarn test
-+    name: Test
-+
-+- phase: Linux
-+  queue: Hosted Linux Preview
-+  steps:
-+  - script: |
-+      apt-get update
-+      apt-get install -y --no-install-recommends libsecret-1-dev xvfb fakeroot dpkg rpm xz-utils xorriso zsync libxss1 libgconf2-4 libgtk-3-0
-+  - task: NodeTool@0
-+    inputs:
-+      versionSpec: "8.11.1"
-+  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-+    inputs:
-+      versionSpec: "1.7.0"
-+  - script: |
-+       yarn install --force
-+    name: Install
-+  - script: |
-+       yarn lint && yarn build:prod
-+    name: Build
-+  - script: |
-+       export DISPLAY=':99.0'
-+       Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
-+       yarn test:setup && yarn test
-+    name: Test
-+
-+- phase: macOS
-+  queue: Hosted macOS Preview
-+  steps:
-+  - task: NodeTool@0
-+    inputs:
-+      versionSpec: "8.11.1"
-+  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-+    inputs:
-+      versionSpec: "1.7.0"
-+  - script: |
-+      yarn install --force
-+    name: Install
-+  - script: |
-+       yarn lint && yarn build:prod
-+    name: Build
-+  - script: |
-+      yarn test:setup && yarn test
-+    name: Test
-+>>>>>>> .their
diff --git a/app/test/fixtures/merge-parser/desktop/merge-sms-send-help-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-sms-send-help-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index b0c1916e65a..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-sms-send-help-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,241 +0,0 @@
-changed in both
-  base   100644 d2d4fe241dd73c289adf5eafe191299a25144a88 app/src/ui/dialog/error.tsx
-  our    100644 744a786b47398054587a2eb3c35460ee471cc51f app/src/ui/dialog/error.tsx
-  their  100644 4279d8bada629e97486dbbcef1cbc5c5166cb4f1 app/src/ui/dialog/error.tsx
-@@ -1,7 +1,24 @@
- import * as React from 'react'
- import { Octicon, OcticonSymbol } from '../octicons'
-+import * as classNames from 'classnames'
- 
-+<<<<<<< .our
- interface IDialogErrorProps {}
-+=======
-+interface IDialogErrorProps {
-+  readonly children?: ReadonlyArray<JSX.Element>
-+
-+  /**
-+   * An optional type for the banner displayed.
-+   *
-+   * When passed 'warning', the error message will render with a yellow
-+   * background, black text, and an alert icon.
-+   *
-+   * Defaults to 'error'
-+   */
-+  readonly bannertype?: 'error' | 'warning'
-+}
-+>>>>>>> .their
- 
- /**
-  * A component used for displaying short error messages inline
-@@ -16,10 +33,24 @@
-  */
- export class DialogError extends React.Component<IDialogErrorProps, {}> {
-   public render() {
-+<<<<<<< .our
-     return (
-       <div className="dialog-error">
-         <Octicon symbol={OcticonSymbol.stop} />
-         <div>{this.props.children}</div>
-+=======
-+    const classname = classNames('dialog-error', {
-+        'dialog-warning': this.props.bannertype === 'warning',
-+      })
-+    const octicon = this.props.bannertype === 'warning' ? OcticonSymbol.alert : OcticonSymbol.stop
-+
-+    return (
-+      <div className={classname}>
-+        <Octicon symbol={octicon} />
-+        <div>
-+          {this.props.children}
-+        </div>
-+>>>>>>> .their
-       </div>
-     )
-   }
-changed in both
-  base   100644 29139bdcd2057b471360a3dd21a47b12fbfb13e1 app/src/ui/sign-in/sign-in.tsx
-  our    100644 e4ee46a6fe80cf3c36db4a62459618eadc3fee7e app/src/ui/sign-in/sign-in.tsx
-  their  100644 8af4667dda19e15010f8fe8684cea73ee7df2c85 app/src/ui/sign-in/sign-in.tsx
-@@ -16,7 +16,14 @@
- import { ButtonGroup } from '../lib/button-group'
- import { Dialog, DialogError, DialogContent, DialogFooter } from '../dialog'
- 
-+<<<<<<< .our
- import { getWelcomeMessage } from '../../lib/2fa'
-+=======
-+import {
-+  AuthenticationMode,
-+  getWelcomeMessage,
-+ } from '../../lib/2fa'
-+>>>>>>> .their
- 
- interface ISignInProps {
-   readonly dispatcher: Dispatcher
-@@ -232,12 +239,28 @@
-     )
-   }
- 
-+<<<<<<< .our
-   private renderTwoFactorAuthenticationStep(
-     state: ITwoFactorAuthenticationState
-   ) {
-     return (
-       <DialogContent>
-         <p>{getWelcomeMessage(state.type)}</p>
-+=======
-+  private renderTwoFactorAuthenticationStep(state: ITwoFactorAuthenticationState) {
-+    let resendLink = null
-+
-+    if (state.type === AuthenticationMode.Sms) {
-+      resendLink = <LinkButton className='resend-sms-link'>Resend SMS Code</LinkButton>
-+    }
-+
-+    return (
-+      <DialogContent>
-+        <p>
-+          { getWelcomeMessage(state.type) }
-+        </p>
-+
-+>>>>>>> .their
-         <Row>
-           <TextBox
-             label="Authentication code"
-@@ -248,6 +271,10 @@
-             autoFocus={true}
-           />
-         </Row>
-+
-+        <Row className='resend-sms-link-row'>
-+          {resendLink}
-+        </Row>
-       </DialogContent>
-     )
-   }
-changed in both
-  base   100644 61ce0352a8d13a4b2c8d3df20f73809bf4b04d7b app/styles/_variables.scss
-  our    100644 6c89a529c5a8dbfefb127f171468af9ae5651141 app/styles/_variables.scss
-  their  100644 985dff91b66b71b39c825292712c3db339b117bd app/styles/_variables.scss
-@@ -5,11 +5,36 @@
- // Primer colors, see https://github.com/primer/primer-css/blob/master/modules/primer-support/lib/variables/color-system.scss
- @import '~primer-support/lib/variables/color-system.scss';
- 
-+<<<<<<< .our
- // Extracted as a SCSS variable so that we can define the --overlay-background-color
- // on both the :root and the ::backdrop scope. The ::backdrop pseudo-element
- // doesn't inherit :root, see
- // https://bugs.chromium.org/p/chromium/issues/detail?id=594096
- $overlay-background-color: rgba(0, 0, 0, 0.4);
-+=======
-+  // Colors
-+  //
-+  // These are declared here to let us avoid duplicating color constants
-+  // in variables. It also makes it easier to read and understand what
-+  // color is being used. Note that these variables should _never_ be
-+  // used outside of this scope.
-+  $darkBlue: #005CC5;
-+  $blue: #0366d6;
-+  $yellow: #ffd33d;
-+  $darkYellow: #745d00;
-+  $lightYellow: #fff5b1;
-+  $red: #d73a49;
-+  $lightRed: #f04747;
-+  $green: #28a745;
-+  $orange: #f66a0a;
-+  $black: #24292e;
-+  $darkerGray: #6a737d;
-+  $darkGray: #959da5;
-+  $gray: #E1E4E8;
-+  $lightGray: #F6F8FA;
-+  $lighterGray: #fafbfc;
-+  $white: #fff;
-+>>>>>>> .their
- 
- :root {
-   --color-new: $green;
-@@ -370,6 +395,10 @@
-   /** Overlay is used as a background for both modals and foldouts */
-   --overlay-background-color: $overlay-background-color;
- 
-+  // Colors for form warnings
-+  --warning-color: $darkYellow;
-+  --form-warning-background: $lightYellow;
-+
-   /** Dialog */
-   --dialog-warning-color: $yellow-600;
-   --dialog-error-color: $red;
-changed in both
-  base   100644 58f4e9d43bed5cda813e1b05c87b7bc5e1fed407 app/styles/ui/_dialog.scss
-  our    100644 94b86d54fb9b0314deb1ef48cc9e1466578ed390 app/styles/ui/_dialog.scss
-  their  100644 583b976db4e4d400fe15666cd1447c0b0d16d824 app/styles/ui/_dialog.scss
-@@ -97,8 +97,26 @@
- 
-   .dialog-header {
-     height: 50px;
-+<<<<<<< .our
-     border-bottom: var(--base-border);
- 
-+=======
-+    box-shadow: 0 1px 0 rgba(#000, 0.1);
-+    position: relative;
-+
-+    // There's at most three elements in the header,
-+    //   1. The icon (optional, only for errors, warnings, etc)
-+    //   2. The title, a h1 element which is always present if the
-+    //      header element is visible
-+    //   3. The close button (optional, hidden when dialog isn't dismissable).
-+    //
-+    // In order to correctly center the title in all scenarios we lay out the
-+    // children in a flexbox but we position the icon and close button
-+    // absolutely to the left and right side leaving the h1 all available
-+    // width. We then add a 40px margin on each side of the h1 ensuring that
-+    // even in the scenario where only one of the two optional elements is
-+    // visible the h1 stays centered horizontally.
-+>>>>>>> .their
-     display: flex;
-     flex-direction: row;
-     align-items: center;
-@@ -260,14 +278,24 @@
-     white-space: pre-wrap;
- 
-     background: var(--form-error-background);
-+<<<<<<< .our
-     border-bottom: 1px solid var(--form-error-border-color);
-     color: var(--form-error-text-color);
-+=======
-+    box-shadow: inset 0 -1px 0 rgba(#000, 0.1);
-+    color: var(--error-color);
-+>>>>>>> .their
- 
-     > .octicon {
-       flex-grow: 0;
-       flex-shrink: 0;
-       margin-right: var(--spacing);
-     }
-+
-+    &.dialog-warning {
-+      background: var(--form-warning-background);
-+      color: var(--warning-color);
-+    }
-   }
- 
-   &#app-error {
-@@ -336,6 +364,7 @@
-       justify-content: flex-end;
-     }
- 
-+<<<<<<< .our
-     .forgot-password-link-sign-in {
-       margin-left: auto;
-     }
-@@ -351,6 +380,11 @@
- 
-   &#lfs-attribute-mismatch {
-     width: 400px;
-+=======
-+    .resend-sms-link-row {
-+      margin-top: calc(var(--spacing-half) * -1);
-+    }
-+>>>>>>> .their
-   }
- }
- 
diff --git a/app/test/fixtures/merge-parser/desktop/merge-spike-primer-utility-classes-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-spike-primer-utility-classes-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index a0d2ae2266f..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-spike-primer-utility-classes-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,573 +0,0 @@
-changed in both
-  base   100644 c748c3e92b4e28df2e4f2141eef417fd2d016a31 app/src/ui/changes/changed-file.tsx
-  our    100644 e68da78b55ca434ace46ff94982da3e9897bfb4c app/src/ui/changes/changed-file.tsx
-  their  100644 a2387ab1b092f4e8ea1c43ead1574161d611047d app/src/ui/changes/changed-file.tsx
-@@ -58,6 +58,7 @@
-       statusWidth
- 
-     return (
-+<<<<<<< .our
-       <div className="file" onContextMenu={this.onContextMenu}>
-         <Checkbox
-           // The checkbox doesn't need to be tab reachable since we emulate
-@@ -81,6 +82,16 @@
-           className={'status status-' + fileStatus.toLowerCase()}
-           title={fileStatus}
-         />
-+=======
-+      <div className='changed-file'>
-+          <input
-+            type='checkbox'
-+            checked={this.props.include}
-+            onChange={event => this.handleChange(event)}
-+          />
-+        <span className='path'>{this.props.path}</span>
-+        <span className='ml-3'>{ChangedFile.mapStatus(this.props.status)}</span>
-+>>>>>>> .their
-       </div>
-     )
-   }
-changed in both
-  base   100644 d7585ab50b37f653dbf7b9228f853679547641a7 app/src/ui/changes/changes-list.tsx
-  our    100644 f785abb2624c245a3387a304168d5fc629e1430e app/src/ui/changes/changes-list.tsx
-  their  100644 a95d566a006d39cd1bc6a21cb13d25e7628af080 app/src/ui/changes/changes-list.tsx
-@@ -32,7 +32,11 @@
- 
- const RowHeight = 29
- 
-+<<<<<<< .our
- const GitIgnoreFileName = '.gitignore'
-+=======
-+const RowHeight = 30
-+>>>>>>> .their
- 
- interface IChangesListProps {
-   readonly repository: Repository
-@@ -371,6 +375,7 @@
-       fileCount > 0 && this.includeAllValue !== CheckboxValue.Off
- 
-     return (
-+<<<<<<< .our
-       <div className="changes-list-container file-list">
-         <div className="header" onContextMenu={this.onContextMenu}>
-           <Checkbox
-@@ -379,6 +384,23 @@
-             onChange={this.onIncludeAllChanged}
-             disabled={fileCount === 0 || this.props.isCommitting}
-           />
-+=======
-+      <div className='panel border-right border-top' id='changes-list'>
-+        <div className='border-bottom px-3 py-2 shrink-0' id='select-all'>
-+          <label>
-+            <input
-+              type='checkbox'
-+              checked={includeAll}
-+              onChange={event => this.handleOnChangeEvent(event) }
-+              ref={function(input) {
-+                if (input != null) {
-+                  input.indeterminate = (includeAll === null)
-+                }
-+              }} />
-+
-+              Select all changes
-+          </label>
-+>>>>>>> .their
-         </div>
- 
-         <List
-changed in both
-  base   100644 3a5879808cb9de866276a6714a2577045245416d app/src/ui/changes/commit-message.tsx
-  our    100644 0a0e18fc9f4c8956a648726827dc496f3d5f98db app/src/ui/changes/commit-message.tsx
-  their  100644 4a09a41b5a733400fbb48c0245dd498bd1ba8719 app/src/ui/changes/commit-message.tsx
-@@ -483,6 +483,7 @@
-     })
- 
-     return (
-+<<<<<<< .our
-       <div
-         id="commit-message"
-         role="group"
-@@ -538,6 +539,18 @@
-           </span>
-         </Button>
-       </div>
-+=======
-+      <form className='commit-form border-top bg-alt p-3 shrink-0' onSubmit={event => event.stopPropagation()}>
-+        <input type='text'
-+               placeholder='Commit summary'
-+               value={this.state.title}
-+               onChange={event => this.handleTitleChange(event) } />
-+
-+        <button onClick={event => this.handleSubmit(event)}>
-+          Commit Changes
-+        </button>
-+      </form>
-+>>>>>>> .their
-     )
-   }
- }
-removed in local
-  base   100644 48580b1b4f4897f71599ed209bbaf00c3fb3ef91 app/src/ui/changes/index.tsx
-  their  100644 00da4b52bddb7dc3aa4a1f54ea44d049c24aa437 app/src/ui/changes/index.tsx
-removed in local
-  base   100644 a10ad562938ab69d9877cd497352ba81e3fdebe4 app/src/ui/comparison-graph.tsx
-  their  100644 061f3f0d4f8fc6c90518923cf685c4508d806ebb app/src/ui/comparison-graph.tsx
-removed in local
-  base   100644 0419a26350b7b95a59fd487eb60da8e79dada934 app/src/ui/file-diff.tsx
-  their  100644 8fa328fd68b1dd8526497368522ed9fb5c29d805 app/src/ui/file-diff.tsx
-changed in both
-  base   100644 42899f7977a36794572305edc1de3cc2049055f1 app/src/ui/history/commit-list.tsx
-  our    100644 3e0e90eccd5a8894b7cce153c15009fe732a39cc app/src/ui/history/commit-list.tsx
-  their  100644 10f1ad904ed78aad40e155fbe9ae6ddd12c395a9 app/src/ui/history/commit-list.tsx
-@@ -108,6 +108,7 @@
-     }
- 
-     return (
-+<<<<<<< .our
-       <div id="commit-list">
-         <List
-           rowCount={this.props.commitSHAs.length}
-@@ -121,6 +122,14 @@
-             gitHubUsers: this.props.gitHubUsers,
-           }}
-         />
-+=======
-+      <div className='panel border-top border-right' id='commit-list'>
-+        <List itemCount={this.props.commits.length}
-+              itemHeight={68}
-+              selectedRow={this.rowForCommit(this.props.selectedCommit)}
-+              renderItem={row => this.renderCommit(row)}
-+              onSelectionChanged={row => this.onSelectionChanged(row)}/>
-+>>>>>>> .their
-       </div>
-     )
-   }
-removed in local
-  base   100644 ca6496326f249e933ab558fabe31121a9728607a app/src/ui/history/commit-summary-container.tsx
-  their  100644 3fbd2f352aec0e23c82ab9c9ab5be68a771f3350 app/src/ui/history/commit-summary-container.tsx
-changed in both
-  base   100644 301bc111fef978a96656f45084a79d7da4964be9 app/src/ui/history/commit-summary.tsx
-  our    100644 94bcb37b5e8ed8a8b4b2819e8ee9f0336b1ba0c6 app/src/ui/history/commit-summary.tsx
-  their  100644 3bcc694706ba81ad5b8c0659d3abbbb1860a91c2 app/src/ui/history/commit-summary.tsx
-@@ -283,6 +283,7 @@
-     })
- 
-     return (
-+<<<<<<< .our
-       <div id="commit-summary" className={className}>
-         <div className="commit-summary-header">
-           <RichText
-@@ -319,6 +320,19 @@
-               {filesDescription}
-             </li>
-           </ul>
-+=======
-+      <div className='panel'>
-+        <div className='f3-light border-bottom p-3'>{this.props.summary}</div>
-+        <div className='ff-monospace border-bottom p-3 hide-when-empty'>
-+          {this.props.body}
-+        </div>
-+        <div className='files'>
-+          <List renderItem={row => this.renderFile(row)}
-+                itemCount={this.props.files.length}
-+                itemHeight={30}
-+                selectedRow={this.rowForFile(this.props.selectedFile)}
-+                onSelectionChanged={row => this.onSelectionChanged(row)}/>
-+>>>>>>> .their
-         </div>
- 
-         {this.renderDescription()}
-removed in local
-  base   100644 ec707aa2b8fa810e44c97cb96a92be0c06f4f608 app/src/ui/history/index.tsx
-  their  100644 9dbac19a0eeecff3b5f16f4da5f8ca6d02cc684b app/src/ui/history/index.tsx
-removed in local
-  base   100644 76210097d11622b60cb03493f6d798f9c1892fda app/src/ui/list.tsx
-  their  100644 97a93276ea7985df54399734e2e2b8e0352043b6 app/src/ui/list.tsx
-removed in local
-  base   100644 f834f529d76df02393f51f230fa36eeedd41329f app/src/ui/repositories-list/index.tsx
-  their  100644 7332f7bfa29e3774c98aa8e75cb0b7b1b2dc65e6 app/src/ui/repositories-list/index.tsx
-changed in both
-  base   100644 5cf59add65285cfea3a285539fadbc54eadd8cdd app/src/ui/repositories-list/repository-list-item.tsx
-  our    100644 6ca3c771c795eba242cc4b795e3a3b0bbb4c7488 app/src/ui/repositories-list/repository-list-item.tsx
-  their  100644 2ae63d5c33a26b08f571c7978dcdf8df702961f6 app/src/ui/repositories-list/repository-list-item.tsx
-@@ -99,6 +99,7 @@
-     }
- 
-     return (
-+<<<<<<< .our
-       <div onContextMenu={this.onContextMenu} className="repository-list-item">
-         <div
-           className="change-indicator-wrapper"
-@@ -113,6 +114,9 @@
-             />
-           ) : null}
-         </div>
-+=======
-+      <div className='repository-list-item pl-3' title={tooltip}>
-+>>>>>>> .their
-         <Octicon symbol={iconForRepository(repository)} />
-         <div className="name" title={repoTooltip}>
-           {prefix ? <span className="prefix">{prefix}</span> : null}
-changed in both
-  base   100644 3cb96ddf5cdb4d58761c9eab3241d5e6116a3063 app/src/ui/repository.tsx
-  our    100644 efb00423012b8da0dfa5e8897acacaeb0a5e648a app/src/ui/repository.tsx
-  their  100644 5d3ab7ec90a61ff5dae0e4a6cad00f5d0a3a38b7 app/src/ui/repository.tsx
-@@ -132,6 +132,7 @@
-     const availableWidth = this.props.sidebarWidth - 1
- 
-     return (
-+<<<<<<< .our
-       <ChangesSidebar
-         repository={this.props.repository}
-         dispatcher={this.props.dispatcher}
-@@ -153,6 +154,11 @@
-         externalEditorLabel={this.props.externalEditorLabel}
-         onOpenInExternalEditor={this.props.onOpenInExternalEditor}
-       />
-+=======
-+      <div className='blankslate bg-alt'>
-+        <p className='f3-light'>No repo selected!</p>
-+      </div>
-+>>>>>>> .their
-     )
-   }
- 
-changed in both
-  base   100644 ce026cf68ce6abe09e1d2401eefa066b4482f7b3 app/styles/_globals.scss
-  our    100644 b1af174b6d02934b6e9b5f29051ccc89c28454ad app/styles/_globals.scss
-  their  100644 fbd2446a05a95168f36d8bc0aa0dc668c4962d5e app/styles/_globals.scss
-@@ -107,6 +107,7 @@
-   width: 100%;
- }
- 
-+<<<<<<< .our
- .blankslate {
-   background: var(--box-alt-background-color);
-   color: var(--text-secondary-color);
-@@ -159,4 +160,24 @@
- 
- .brutalism {
-   background: salmon;
-+=======
-+.shrink-0 {
-+  flex-shrink: 0 !important;
-+}
-+
-+.hide-when-empty:empty {
-+  display: none !important;
-+}
-+
-+.bg-alt {
-+  background-color: var(--box-alt-background-color) !important;
-+}
-+
-+.blankslate {
-+  display: flex;
-+  flex: 1;
-+  align-items: center;
-+  justify-content: center;
-+  text-align: center;
-+>>>>>>> .their
- }
-added in remote
-  their  100644 2a5c09a88668942f9c392b29a55fa6a003985836 app/styles/_primer-helpers.scss
-@@ -0,0 +1,34 @@
-+@import "~primer-support/index.scss";
-+
-+// We need to import each utility file manually since webpack breaks when
-+// trying to use `@import "~primer-utilities/index.scss";` because the import
-+// statement doesn't know where `"primer-utilities/index.scss"` exists.
-+//
-+// https://github.com/primer/utilities/blob/master/index.scss
-+// https://github.com/jtangelder/sass-loader#imports
-+
-+@import "~primer-utilities/lib/border.scss";
-+@import "~primer-utilities/lib/colors.scss";
-+@import "~primer-utilities/lib/layout.scss";
-+@import "~primer-utilities/lib/margin.scss";
-+@import "~primer-utilities/lib/padding.scss";
-+@import "~primer-utilities/lib/typography.scss";
-+
-+// TODO: Remove when the next version of primer is released
-+//
-+// Porting utilities these font-weigth utilties until primer gets updated
-+// https://github.com/primer/utilities/blob/master/lib/typography.scss
-+//
-+// load missing variables
-+// https://github.com/primer/support/blob/master/lib/variables.scss#L122
-+$h00-size: 48px !default;
-+$h0-size: 40px !default;
-+$font-weight-light: 300 !default;
-+//
-+// Type utils with light weight that match type scale
-+.f00-light { font-size: $h00-size !important; font-weight: $font-weight-light !important; }
-+.f0-light { font-size: $h0-size !important; font-weight: $font-weight-light !important; }
-+.f1-light { font-size: $h1-size !important; font-weight: $font-weight-light !important; }
-+.f2-light { font-size: $h2-size !important; font-weight: $font-weight-light !important; }
-+// Same size and weight as .lead but without color property
-+.f3-light { font-size: $h3-size !important; font-weight: $font-weight-light !important; }
-changed in both
-  base   100644 bfc830f7d9ff507f9e18a4b808ad29c6819b0402 app/styles/_type.scss
-  our    100644 e603c67be24cd76693db032111917284a78939cb app/styles/_type.scss
-  their  100644 bb30ff8c8c109b086e7ee4470a945fc4ab639cc4 app/styles/_type.scss
-@@ -2,7 +2,12 @@
- // Typography
- //
- 
-+<<<<<<< .our
- .byline {
-   font-size: var(--font-size-sm);
-   color: var(--text-secondary-color);
-+=======
-+.ff-monospace {
-+  font-family: var(--font-family-monospace) !important;
-+>>>>>>> .their
- }
-changed in both
-  base   100644 9ae4fd4799e3c721661ffb503a9ec256cebfb39a app/styles/_ui.scss
-  our    100644 fe75df3631a5a6b0a4f5c1fc08ec016a19917524 app/styles/_ui.scss
-  their  100644 4d82345499983ab5cd78f698b15feac9226554eb app/styles/_ui.scss
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- @import 'ui/app';
- @import 'ui/app-menu';
- @import 'ui/scroll';
-@@ -66,3 +67,24 @@
- @import 'ui/commit-attribution';
- @import 'ui/fancy-text-box';
- @import 'ui/notification-banner';
-+=======
-+@import "ui/app";
-+@import "ui/forms";
-+@import "ui/buttons";
-+@import "ui/scroll";
-+@import "ui/window/title-bar";
-+@import "ui/octicons";
-+@import "ui/sidebar";
-+@import "ui/list";
-+@import "ui/repository-list";
-+@import "ui/changes-list";
-+@import "ui/commit-summary";
-+@import "ui/commit-list";
-+@import "ui/commit-message";
-+@import "ui/comparison-graph";
-+@import "ui/file-diff";
-+@import "ui/repository";
-+@import "ui/toolbar";
-+@import "ui/segmented-control";
-+@import "ui/panel";
-+>>>>>>> .their
-changed in both
-  base   100644 567d939074cd222abd2c789dcb514c742f4929ed app/styles/_variables.scss
-  our    100644 6c89a529c5a8dbfefb127f171468af9ae5651141 app/styles/_variables.scss
-  their  100644 25bf8afb64f2143ab89c337ab59bea34596eb1f2 app/styles/_variables.scss
-@@ -18,8 +18,26 @@
-   --color-renamed: $blue;
-   --color-conflicted: $orange;
- 
-+<<<<<<< .our
-   --text-color: $gray-900;
-   --text-secondary-color: $gray-500;
-+=======
-+  // Colors
-+  //
-+  // These are declared here to let us avoid duplicating color constants
-+  // in variables. It also makes it easier to read and understand what
-+  // color is being used. Note that these variables should _never_ be
-+  // used outside of this scope.
-+  $blue: #4ca6eb;
-+  $darkGray: #5f717f;
-+  $orange: #c9510c;
-+  $gray: #C6CACC;
-+  $lightGray: #E3E7E9;
-+  $lighterGray: #f9f9f9;
-+  $white: #fff;
-+
-+  --text-color: $darkGray;
-+>>>>>>> .their
-   --background-color: $white;
- 
-   --button-height: 25px;
-@@ -33,11 +51,17 @@
-   --link-button-color: $blue;
-   --link-button-hover-color: $blue-600;
- 
-+<<<<<<< .our
-   --secondary-button-background: $gray-000;
-   --secondary-button-hover-background: $white;
-   --secondary-button-text-color: var(--text-color);
-   --secondary-button-focus-shadow-color: rgba($gray-200, 0.75);
-   --secondary-button-focus-border-color: $gray-300;
-+=======
-+  --button-border-color: $gray;
-+  --button-background: $white;
-+  --button-hover-background: $white;
-+>>>>>>> .their
- 
-   // Typography
-   //
-@@ -101,7 +125,11 @@
-   /**
-    * Border color for boxes.
-    */
-+<<<<<<< .our
-   --box-border-color: $gray-200;
-+=======
-+  --box-border-color: $lightGray;
-+>>>>>>> .their
-   --box-border-accent-color: $blue;
- 
-   /**
-changed in both
-  base   100644 dec2cc2936adb4bc212b670bb0abe7bd49076e61 app/styles/desktop.scss
-  our    100644 3a8c3b0ce9abb4b883fdc4f28ada9ac3a70b2f2e app/styles/desktop.scss
-  their  100644 a6fa210cec9f0541b6c674e6598af150cd41bc16 app/styles/desktop.scss
-@@ -1,7 +1,16 @@
-+<<<<<<< .our
- @import 'vendor';
- 
- @import 'variables';
- @import 'themes/dark';
-+=======
-+@import "variables";
-+@import "primer-helpers";
-+@import "mixins";
-+
-+@import "globals";
-+@import "type";
-+>>>>>>> .their
- 
- @import 'mixins';
- 
-removed in local
-  base   100644 e032ce4f42477c866af6cadaf6c5b9951a8f0ac9 app/styles/ui/_buttons.scss
-  their  100644 2e7abff7c6c41966c0933caed30e9104f3a0adc4 app/styles/ui/_buttons.scss
-removed in local
-  base   100644 a081b438b5478c014c51324d3c8c47785f375046 app/styles/ui/_changes-list.scss
-  their  100644 a2850081288ebf3331f33450e2a2db1f49c19d03 app/styles/ui/_changes-list.scss
-removed in remote
-  base   100644 1087e76feb599ac50ddd50838c820c78517255a5 app/styles/ui/_changes.scss
-  our    100644 de2ffe80b995654b81e8336fd2535bac0fb67820 app/styles/ui/_changes.scss
-@@ -1,6 +0,0 @@
--@import 'changes/commit-message';
--@import 'changes/changes-list';
--@import 'changes/sidebar';
--@import 'changes/undo-commit';
--@import 'changes/changes-view';
--@import 'changes/no-changes';
-removed in local
-  base   100644 59ab5270f83362169e656c4181e89d3e4e8063aa app/styles/ui/_commit-list.scss
-  their  100644 a394b502004840b6fb5af75e4604a1b45c93099f app/styles/ui/_commit-list.scss
-removed in local
-  base   100644 e435a162aff1d73e9fa1bb92e695e700b1a7a1a3 app/styles/ui/_commit-message.scss
-  their  100644 ef9ae4430409bd16b91944ae498d7dd2c1a693c1 app/styles/ui/_commit-message.scss
-removed in local
-  base   100644 73a3547e959414f490cd1c7de0c3d454bc469c12 app/styles/ui/_commit-summary.scss
-  their  100644 b5be34b04a1733b21ab828fde60a7f529c458df9 app/styles/ui/_commit-summary.scss
-removed in local
-  base   100644 2a7fead7d16da6f69892f5358b3f0784a7121090 app/styles/ui/_comparison-graph.scss
-  their  100644 6847ae73aca6f83c1c72b58e27a6c38acf637599 app/styles/ui/_comparison-graph.scss
-removed in local
-  base   100644 ad8fb1f792dee66e0dcd90f0f81fd6ead395c090 app/styles/ui/_file-diff.scss
-  their  100644 c3cde7598ff4ef66603593d7eb473cc991fc9b58 app/styles/ui/_file-diff.scss
-removed in remote
-  base   100644 d621b3b1bd9bac193c06757e568cfbcc78e25707 app/styles/ui/_history.scss
-  our    100644 3be2e7a8361b043848a95566478c6416c8a4516d app/styles/ui/_history.scss
-@@ -1,4 +0,0 @@
--@import 'history/history';
--@import 'history/commit-list';
--@import 'history/commit-summary';
--@import 'history/file-list';
-added in both
-  our    100644 e19b802ece2262b43808c25e54eb70fde647626a app/styles/ui/_panel.scss
-  their  100644 3b010cc7d21173271ec7090025c66ffa3daa8f37 app/styles/ui/_panel.scss
-@@ -3,3 +3,12 @@
-   flex-direction: column;
-   flex: 1;
- }
-+<<<<<<< .our
-+=======
-+
-+.panel-container {
-+  display: flex;
-+  flex-direction: row;
-+  flex: 1;
-+}
-+>>>>>>> .their
-changed in both
-  base   100644 489625412bf51611a04eebc31c8e758b0f0517e4 app/styles/ui/_repository-list.scss
-  our    100644 157e36f8a6d1951007c2c6c8f17b69d30f96b0c7 app/styles/ui/_repository-list.scss
-  their  100644 48a6e62b75f58f0f1bcb419bc708a11b394fe7ad app/styles/ui/_repository-list.scss
-@@ -21,7 +21,10 @@
-    * and one <div class='name'> holding the repository name.
-    */
-   .repository-list-item {
-+<<<<<<< .our
-     padding: 0 var(--spacing);
-+=======
-+>>>>>>> .their
- 
-     // Layout the icon and repository name horizontally
-     display: flex;
-@@ -119,6 +122,7 @@
-       }
-     }
-   }
-+<<<<<<< .our
- 
-   &.focus-within {
-     /** Ahead/behind badge colors when list item is selected and focused */
-@@ -135,4 +139,6 @@
-       color: var(--text-color);
-     }
-   }
-+=======
-+>>>>>>> .their
- }
-changed in both
-  base   100644 e0c7b8a4bbc131e2b4b4ef9e1871d345acffd302 package.json
-  our    100644 2006bfb748810f6ea8bdbd26edf7c09524a1388a package.json
-  their  100644 51fb2bbe6a0a92d6c3c9b207281e1d5e0a349d25 package.json
-@@ -51,6 +51,7 @@
-     "yarn": ">= 1.9"
-   },
-   "dependencies": {
-+<<<<<<< .our
-     "ajv": "^6.4.0",
-     "awesome-node-loader": "^1.1.0",
-     "awesome-typescript-loader": "^5.0.0",
-@@ -86,6 +87,34 @@
-     "octicons": "^7.0.1",
-     "parallel-webpack": "^2.3.0",
-     "prettier": "^1.14.2",
-+=======
-+    "aws-sdk": "^2.3.15",
-+    "babel-core": "^6.7.6",
-+    "babel-loader": "^6.2.4",
-+    "babel-plugin-react-transform": "^2.0.2",
-+    "babel-plugin-transform-runtime": "^6.8.0",
-+    "babel-preset-es2015": "^6.6.0",
-+    "babel-preset-react": "^6.5.0",
-+    "babel-preset-react-hmre": "^1.1.1",
-+    "babel-preset-stage-0": "^6.5.0",
-+    "chai": "^3.5.0",
-+    "cross-env": "^1.0.8",
-+    "css-loader": "^0.23.1",
-+    "electron-mocha": "2.1.0",
-+    "electron-packager": "^7.2.0",
-+    "electron-prebuilt": "1.3.1",
-+    "electron-winstaller": "^2.3.0",
-+    "express": "^4.13.4",
-+    "extract-text-webpack-plugin": "^1.0.1",
-+    "fs-extra": "^0.30.0",
-+    "got": "^6.3.0",
-+    "html-webpack-plugin": "^2.21.0",
-+    "mocha": "^2.4.5",
-+    "node-sass": "^3.7.0",
-+    "primer-support": "^0.5.0",
-+    "primer-utilities": "^0.5.0",
-+    "react-transform-hmr": "^1.0.4",
-+>>>>>>> .their
-     "request": "^2.72.0",
-     "rimraf": "^2.5.2",
-     "sass-loader": "^7.0.1",
diff --git a/app/test/fixtures/merge-parser/desktop/merge-submodule-diff-on-top-of-diff-changes-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-submodule-diff-on-top-of-diff-changes-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index ea66036dec6..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-submodule-diff-on-top-of-diff-changes-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,1664 +0,0 @@
-changed in both
-  base   100644 595c4ccc42a67e036909be3572ab1131e6cd1935 app/src/lib/app-state.ts
-  our    100644 b30f0fe080d909b81d2fb683ceb8deb365fb0191 app/src/lib/app-state.ts
-  their  100644 4601ec5e4074819945b51b57518f924111e115a5 app/src/lib/app-state.ts
-@@ -1,10 +1,16 @@
- import { Account } from '../models/account'
- import { CommitIdentity } from '../models/commit-identity'
- import { IDiff } from '../models/diff'
-+<<<<<<< .our
- import { Repository, ILocalRepositoryState } from '../models/repository'
- 
- import { Branch, IAheadBehind } from '../models/branch'
- import { Tip } from '../models/tip'
-+=======
-+import { Repository } from '../models/repository'
-+import { IAheadBehind } from './git'
-+import { Branch } from '../models/branch'
-+>>>>>>> .their
- import { Commit } from '../models/commit'
- import {
-   CommittedFileChange,
-@@ -571,12 +577,20 @@
-   /** The selected file inside the selected commit */
-   readonly file: CommittedFileChange | null
- 
-+<<<<<<< .our
-   /** The diff of the currently-selected file */
-+=======
-+>>>>>>> .their
-   readonly diff: IDiff | null
- }
- 
- export interface IChangesState {
-   readonly workingDirectory: WorkingDirectoryStatus
-+<<<<<<< .our
-+=======
-+  readonly selectedFile: WorkingDirectoryFileChange | null
-+  readonly diff: IDiff | null
-+>>>>>>> .their
- 
-   /**
-    * The ID of the selected files. The files themselves can be looked up in
-changed in both
-  base   100644 5681db4dacf0b40c8272b8e9e5dd06ebc239cd60 app/src/lib/diff-parser.ts
-  our    100644 d8312b68a2839cd36ba6507b023bede53368a654 app/src/lib/diff-parser.ts
-  their  100644 8e3ebe94815c40ea4c1f6fd46b6b3f9c1f1e0990 app/src/lib/diff-parser.ts
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- import {
-   IRawDiff,
-   DiffHunk,
-@@ -5,6 +6,9 @@
-   DiffLine,
-   DiffLineType,
- } from '../models/diff'
-+=======
-+import { IRawDiff, DiffHunk, DiffHunkHeader, DiffLine, DiffLineType } from '../models/diff'
-+>>>>>>> .their
- import { assertNever } from '../lib/fatal-error'
- 
- // https://en.wikipedia.org/wiki/Diff_utility
-@@ -373,6 +377,10 @@
-    *             diffs.
-    */
-   public parse(text: string): IRawDiff {
-+<<<<<<< .our
-+=======
-+
-+>>>>>>> .their
-     this.text = text
- 
-     try {
-@@ -383,11 +391,25 @@
- 
-       // empty diff
-       if (!headerInfo) {
-+<<<<<<< .our
-         return { header, contents: '', hunks: [], isBinary: false }
-       }
- 
-       if (headerInfo.isBinary) {
-         return { header, contents: '', hunks: [], isBinary: true }
-+=======
-+        return {
-+          hunks: [],
-+          isBinary: false,
-+        }
-+      }
-+
-+      if (headerInfo.isBinary) {
-+        return {
-+          hunks: [],
-+          isBinary: true,
-+        }
-+>>>>>>> .their
-       }
- 
-       const hunks = new Array<DiffHunk>()
-@@ -399,6 +421,7 @@
-         linesConsumed += hunk.lines.length
-       } while (this.peek())
- 
-+<<<<<<< .our
-       const contents = this.text
-         .substring(headerEnd + 1, this.le)
-         // Note that this simply returns a reference to the
-@@ -407,6 +430,12 @@
-         .replace(/\n\\ No newline at end of file/g, '')
- 
-       return { header, contents, hunks, isBinary: headerInfo.isBinary }
-+=======
-+      return {
-+        hunks,
-+        isBinary: headerInfo.isBinary,
-+      }
-+>>>>>>> .their
-     } finally {
-       this.reset()
-     }
-removed in local
-  base   100644 4844d41b832a89c74a083b9503a1bad1329bc7d8 app/src/lib/dispatcher/app-store.ts
-  their  100644 2e2358a1d3b3a91ac26d1e83a9ea37b5a9babdbc app/src/lib/dispatcher/app-store.ts
-changed in both
-  base   100644 fcdf978c8b65d7d75655455af3799fd77e894bd4 app/src/lib/git/apply.ts
-  our    100644 57f2df6dd951c6129d9da4ea5809b3e26b6a764c app/src/lib/git/apply.ts
-  their  100644 99472b37aff6fd6ef970be7d22ff1e5369074d05 app/src/lib/git/apply.ts
-@@ -1,5 +1,9 @@
- import { git } from './core'
-+<<<<<<< .our
- import { AppFileStatus, WorkingDirectoryFileChange } from '../../models/status'
-+=======
-+import { FileStatus, WorkingDirectoryFileChange } from '../../models/status'
-+>>>>>>> .their
- import { DiffType } from '../../models/diff'
- import { Repository } from '../../models/repository'
- import { getWorkingDirectoryDiff } from './diff'
-changed in both
-  base   100644 ae50139e7823fd04a2e47f11d0ae428a959fd93a app/src/lib/git/diff.ts
-  our    100644 c7b70925514f334e2076ddb67f208c2f3f12672f app/src/lib/git/diff.ts
-  their  100644 5d54e2ba1a5b991dd4f4edabdbb064c5c15c4d3c app/src/lib/git/diff.ts
-@@ -4,6 +4,7 @@
- import { getBlobContents } from './show'
- 
- import { Repository } from '../../models/repository'
-+<<<<<<< .our
- import {
-   WorkingDirectoryFileChange,
-   FileChange,
-@@ -22,6 +23,12 @@
- } from '../../models/diff'
- 
- import { spawnAndComplete } from './spawn'
-+=======
-+import { WorkingDirectoryFileChange, FileChange, FileStatus } from '../../models/status'
-+import { DiffType, IRawDiff, IDiff, IImageDiff, Image, FileSummary, DiffHunk } from '../../models/diff'
-+
-+import { getSubmoduleDetails } from '../../lib/git/submodule'
-+>>>>>>> .their
- 
- import { DiffParser } from '../diff-parser'
- 
-@@ -93,6 +100,7 @@
-  * @param commitish A commit SHA or some other identifier that ultimately dereferences
-  *                  to a commit.
-  */
-+<<<<<<< .our
- export async function getCommitDiff(
-   repository: Repository,
-   file: FileChange,
-@@ -114,6 +122,9 @@
-   if (file.oldPath != null) {
-     args.push(file.oldPath)
-   }
-+=======
-+export function getCommitDiff(repository: Repository, file: FileChange, commitish: string): Promise<IDiff> {
-+>>>>>>> .their
- 
-   const { output } = await spawnAndComplete(
-     args,
-@@ -121,7 +132,13 @@
-     'getCommitDiff'
-   )
- 
-+<<<<<<< .our
-   return buildDiff(output, repository, file, commitish)
-+=======
-+  return git(args, repository.path, 'getCommitDiff')
-+    .then(value => diffFromRawDiffOutput(value.stdout))
-+    .then(diff => convertDiff(repository, file, diff, commitish))
-+>>>>>>> .their
- }
- 
- /**
-@@ -129,11 +146,17 @@
-  * compared against HEAD if it's tracked, if not it'll be compared to an empty file meaning
-  * that all content in the file will be treated as additions.
-  */
-+<<<<<<< .our
- export async function getWorkingDirectoryDiff(
-   repository: Repository,
-   file: WorkingDirectoryFileChange
- ): Promise<IDiff> {
-   let successExitCodes: Set<number> | undefined
-+=======
-+export function getWorkingDirectoryDiff(repository: Repository, file: WorkingDirectoryFileChange): Promise<IDiff> {
-+
-+  let opts: IGitExecutionOptions | undefined
-+>>>>>>> .their
-   let args: Array<string>
- 
-   // `--no-ext-diff` should be provided wherever we invoke `git diff` so that any
-@@ -180,6 +203,7 @@
-       file.path,
-     ]
-   } else {
-+<<<<<<< .our
-     args = [
-       'diff',
-       'HEAD',
-@@ -208,6 +232,17 @@
-   file: FileChange,
-   commitish: string
- ): Promise<IImageDiff> {
-+=======
-+    args = [ 'diff', 'HEAD', '--patch-with-raw', '-z', '--', file.path ]
-+  }
-+
-+  return git(args, repository.path, 'getWorkingDirectoryDiff', opts)
-+    .then(value => diffFromRawDiffOutput(value.stdout))
-+    .then(diff => convertDiff(repository, file, diff, 'HEAD'))
-+}
-+
-+async function getImageDiff(repository: Repository, file: FileChange, commitish: string): Promise<IImageDiff> {
-+>>>>>>> .their
-   let current: Image | undefined = undefined
-   let previous: Image | undefined = undefined
- 
-@@ -216,7 +251,11 @@
-     // No idea what to do about this, a conflicted binary (presumably) file.
-     // Ideally we'd show all three versions and let the user pick but that's
-     // a bit out of scope for now.
-+<<<<<<< .our
-     if (file.status === AppFileStatus.Conflicted) {
-+=======
-+    if (file.status === FileStatus.Conflicted) {
-+>>>>>>> .their
-       return { kind: DiffType.Image }
-     }
- 
-@@ -261,6 +300,7 @@
-   }
- }
- 
-+<<<<<<< .our
- export async function convertDiff(
-   repository: Repository,
-   file: FileChange,
-@@ -271,6 +311,37 @@
-   const extension = Path.extname(file.path).toLowerCase()
- 
-   if (diff.isBinary) {
-+=======
-+/**
-+ * normalize the line endings in the diff so that the CodeMirror editor
-+ * will display the unified diff correctly
-+ */
-+function formatLineEnding(text: string): string {
-+  if (text.endsWith('\n')) {
-+    return text
-+  } else if (text.endsWith('\r')) {
-+    return text + '\n'
-+  } else {
-+    return text + '\r\n'
-+  }
-+}
-+
-+function diffMatchesSubmoduleChange(hunk: DiffHunk): boolean {
-+  // for any sort of submodule change, the first line should match this format
-+  const line = hunk.lines[1]
-+  const match = /[\+\-]Subproject commit ([a-z0-9]{40})/.exec(line.text)
-+  // no need to look at the found hash, just looking for the equivalent format
-+  if (match) {
-+    return true
-+  }
-+  return false
-+}
-+
-+export async function convertDiff(repository: Repository, file: FileChange, diff: IRawDiff, commitish: string): Promise<IDiff> {
-+  if (diff.isBinary) {
-+    const extension = Path.extname(file.path)
-+
-+>>>>>>> .their
-     // some extension we don't know how to parse, never mind
-     if (!imageFileExtensions.has(extension)) {
-       return {
-@@ -281,11 +352,59 @@
-     }
-   }
- 
-+<<<<<<< .our
-   return {
-     kind: DiffType.Text,
-     text: diff.contents,
-     hunks: diff.hunks,
-     lineEndingsChange,
-+=======
-+  if (diff.hunks.length === 1) {
-+
-+    const hunk = diff.hunks[0]
-+
-+    if (hunk.lines.length <= 3) {
-+
-+      const maybeSubmodule = diffMatchesSubmoduleChange(hunk)
-+
-+      if (maybeSubmodule) {
-+
-+        // TODO: what about renaming a submodule? Would that be handled here?
-+        const result = await getSubmoduleDetails(repository, file, commitish)
-+
-+        if (result) {
-+          const name = Path.basename(file.path)
-+          const type = result.type
-+          const from = result.from
-+          const to = result.to
-+
-+          const changes = from && to
-+            ? await getSubmoduleDiff(repository, file, from, to)
-+            : undefined
-+
-+          return {
-+            kind: DiffType.Submodule,
-+            type,
-+            from,
-+            to,
-+            name,
-+            changes,
-+          }
-+        }
-+      }
-+    }
-+  }
-+
-+  let diffText = ''
-+  diff.hunks.forEach(hunk => {
-+    hunk.lines.forEach(l => diffText += formatLineEnding(l.text))
-+  })
-+
-+  return {
-+    kind: DiffType.Text,
-+    text: diffText,
-+    hunks: diff.hunks,
-+>>>>>>> .their
-   }
- }
- 
-@@ -352,11 +471,15 @@
-  *
-  * Parses the output from a diff-like command that uses `--path-with-raw`
-  */
-+<<<<<<< .our
- function diffFromRawDiffOutput(output: Buffer): IRawDiff {
-   // for now we just assume the diff is UTF-8, but given we have the raw buffer
-   // we can try and convert this into other encodings in the future
-   const result = output.toString('utf-8')
- 
-+=======
-+function diffFromRawDiffOutput(result: string): IRawDiff {
-+>>>>>>> .their
-   const pieces = result.split('\0')
-   const parser = new DiffParser()
-   return parser.parse(pieces[pieces.length - 1])
-@@ -393,6 +516,38 @@
-   return convertDiff(repository, file, diff, commitish, lineEndingsChange)
- }
- 
-+function tryParseInt(text: string): number | undefined {
-+  const value = parseInt(text, 10)
-+  return isNaN(value) ? undefined : value
-+}
-+
-+export async function getSubmoduleDiff(repository: Repository, file: FileChange, from: string, to: string): Promise<ReadonlyArray<FileSummary>> {
-+  const args = [ 'diff', '--numstat', '-z', `${from}..${to}` ]
-+  const submodulePath = Path.join(repository.path, file.path)
-+
-+  const diffStats = await git(args, submodulePath, 'getSubmoduleDiff')
-+  const output = diffStats.stdout
-+
-+  const results: Array<FileSummary> = [ ]
-+
-+  const lines = output.split('\0')
-+
-+  for (let i = 0; i < lines.length; i++) {
-+    const line = lines[i]
-+    const entries = line.split('\t')
-+
-+    if (entries.length === 3) {
-+      const added = tryParseInt(entries[0])
-+      const removed = tryParseInt(entries[1])
-+      const path = entries[2].trim().replace('\0', '')
-+
-+      results.push(new FileSummary(path, added, removed))
-+    }
-+  }
-+
-+  return results
-+}
-+
- /**
-  * Retrieve the binary contents of a blob from the object database
-  *
-added in both
-  our    100644 497889aae05c2de60409b2354678563f32994314 app/src/lib/git/submodule.ts
-  their  100644 efb0efe2bbb460832f610eb016e05f58b3c68bda app/src/lib/git/submodule.ts
-@@ -1,4 +1,5 @@
- import * as Path from 'path'
-+<<<<<<< .our
- import { pathExists } from 'fs-extra'
- 
- import { git } from './core'
-@@ -88,3 +89,130 @@
-     )
-   }
- }
-+=======
-+
-+import { git } from './core'
-+import { Repository } from '../../models/repository'
-+import { FileStatus, FileChange, WorkingDirectoryFileChange } from '../../models/status'
-+import { mapStatus } from './status'
-+
-+// TODO: docs
-+
-+export class SubmoduleChange {
-+
-+  public readonly path: string
-+
-+  public readonly from?: string
-+
-+  public readonly to?: string
-+
-+  public readonly type: FileStatus
-+}
-+
-+const zeroSha = /0{7,40}/
-+const submoduleMode = '160000'
-+
-+// NOTE:
-+// as of Git 2.11, abbreviated SHAs may be more than 7 characters
-+// we probably need to revisit some places where we do this trimming
-+// ourselves - e.g. `commit-summary.tsx`
-+function formatSha(text: string): string {
-+  return text.slice(0, 7)
-+}
-+
-+/**
-+ * Map the found identifier to a object id in the Git database
-+ *
-+ * @returns the 40-character OID if the object exists, or undefined if the
-+ * found input is '0000000000000000000000000000000000000000' which
-+ * represents a non-existent object.
-+ */
-+function getIdentifier(input: string): string | undefined {
-+  if (zeroSha.test(input)) {
-+    return undefined
-+  }
-+  return formatSha(input)
-+}
-+
-+const submoduleEntryRegex = /Submodule .* ([a-z0-9]{7,40})..([a-z0-9]{7,40})\:/
-+
-+async function getSubmoduleDetailsWorkingDirectory(repository: Repository, file: WorkingDirectoryFileChange): Promise<SubmoduleChange | null> {
-+
-+  if (file.status === FileStatus.New) {
-+    // if the submodule has not been staged elsewhere, it's not going to appear
-+    // in any of the `git submodule summary` calls - so let's poke at it here
-+    const submodulePath = Path.join(repository.path, file.path)
-+
-+    const result = await git([ 'show-ref', 'HEAD' ], submodulePath, 'submodule-workdir-untracked')
-+
-+    const output = result.stdout
-+    const tokens = output.split(' ')
-+
-+    const tip = tokens[0]
-+
-+    const path = file.path
-+    const type = file.status
-+    const from = undefined
-+    const to = tip
-+    return { path, from, to, type }
-+  } else {
-+    const result = await git([ 'diff', '--submodule', '-z', '--', file.path ], repository.path, 'submodule-workdir-tracked')
-+
-+    const match = submoduleEntryRegex.exec(result.stdout)
-+    if (match) {
-+      const path = file.path
-+      const type = file.status
-+      const from = getIdentifier(match[1])
-+      const to = getIdentifier(match[2])
-+      return { path, from, to, type }
-+    }
-+
-+    return null
-+  }
-+}
-+
-+async function getSubmoduleDetailsHistory(repository: Repository, file: FileChange, committish: string): Promise<SubmoduleChange | null> {
-+
-+  const range = `${committish}~1..${committish}`
-+  // TODO: control formatting betterer here?
-+  const result = await git([ 'diff-tree', '--raw', '-z', range, '--', file.path ], repository.path, 'submodule-history')
-+
-+  // the expected format here is a row like this:
-+  // :000000 160000 0000000000000000000000000000000000000000 f1a74d299b28b4278d6127fbb3e9cc7aeedc153f A	friendly-bassoon
-+  //
-+  // index 0 is the empty string before the first semi-colon, skip it
-+  const line = result.stdout.substr(1)
-+  // \0 separates path from diff stats
-+  const tokens = line.split('\0')
-+  const inputs = tokens[0].split(' ')
-+  const path = tokens[1]
-+
-+  // the first two values are the mode for the change
-+  // if either of these values is 160000, we have a submodule change
-+  if (inputs[0] === submoduleMode || inputs[1] === submoduleMode) {
-+    const from = getIdentifier(inputs[2])
-+    const to = getIdentifier(inputs[3])
-+    const type = mapStatus(inputs[4])
-+    return { path, from, to, type }
-+  }
-+
-+  return null
-+}
-+
-+/**
-+ * Retrieve the submodule list for the current repository.
-+ *
-+ * For historical commits, use `git diff-tree` as this works independent of the
-+ * .gitmodules state.
-+ *
-+ * For working directory changes, use `git submodule summary` as the .gitmodules
-+ * state can be relied on for tracking changes.
-+ */
-+export async function getSubmoduleDetails(repository: Repository, file: FileChange, committish: string): Promise<SubmoduleChange | null> {
-+  if (file instanceof WorkingDirectoryFileChange) {
-+    return getSubmoduleDetailsWorkingDirectory(repository, file)
-+  } else {
-+    return getSubmoduleDetailsHistory(repository, file, committish)
-+  }
-+}
-+>>>>>>> .their
-changed in both
-  base   100644 89bc05d61dc8e935503d1c57fd962a7edd5654de app/src/lib/patch-formatter.ts
-  our    100644 07394cb099e9aa88821fa27c76986f91e7c86007 app/src/lib/patch-formatter.ts
-  their  100644 15945ecc933d4f324d7231f625b341b1675e2fb4 app/src/lib/patch-formatter.ts
-@@ -1,5 +1,9 @@
- import { assertNever } from '../lib/fatal-error'
-+<<<<<<< .our
- import { WorkingDirectoryFileChange, AppFileStatus } from '../models/status'
-+=======
-+import { WorkingDirectoryFileChange, FileStatus } from '../models/status'
-+>>>>>>> .their
- import { DiffLineType, ITextDiff } from '../models/diff'
- 
- /**
-@@ -114,10 +118,14 @@
-  *
-  * @param diff  The source diff
-  */
-+<<<<<<< .our
- export function formatPatch(
-   file: WorkingDirectoryFileChange,
-   diff: ITextDiff
- ): string {
-+=======
-+export function formatPatch(file: WorkingDirectoryFileChange, diff: ITextDiff): string {
-+>>>>>>> .their
-   let patch = ''
- 
-   diff.hunks.forEach((hunk, hunkIndex) => {
-removed in local
-  base   100644 8e1278e78e0dfe9067cfa506261d342c74ae94f8 app/src/models/diff.ts
-  their  100644 d6f40a61ae4fae061485ecc00454a87ee3bc52cf app/src/models/diff.ts
-added in both
-  our    100644 dc40c8309be3d5fb88ce7c549d18e0a218138062 app/src/ui/diff/diff-explorer.ts
-  their  100644 15fc1c1dbbc1f6745f8449df16b05a354e842cb0 app/src/ui/diff/diff-explorer.ts
-@@ -1,13 +1,22 @@
-+<<<<<<< .our
- import { DiffLine, DiffHunk } from '../../models/diff'
-+=======
-+import { DiffLine, DiffHunk, ITextDiff } from '../../models/diff'
-+>>>>>>> .their
- 
- /**
-  * Locate the diff hunk for the given (absolute) line number in the diff.
-  */
-+<<<<<<< .our
- export function diffHunkForIndex(
-   hunks: ReadonlyArray<DiffHunk>,
-   index: number
- ): DiffHunk | null {
-   const hunk = hunks.find(h => {
-+=======
-+export function diffHunkForIndex(diff: ITextDiff, index: number): DiffHunk | null {
-+  const hunk = diff.hunks.find(h => {
-+>>>>>>> .their
-     return index >= h.unifiedDiffStart && index <= h.unifiedDiffEnd
-   })
-   return hunk || null
-@@ -16,6 +25,7 @@
- /**
-  * Locate the diff line for the given (absolute) line number in the diff.
-  */
-+<<<<<<< .our
- export function diffLineForIndex(
-   hunks: ReadonlyArray<DiffHunk>,
-   index: number
-@@ -92,3 +102,11 @@
- 
-   return { start, end }
- }
-+=======
-+export function diffLineForIndex(diff: ITextDiff, index: number): DiffLine | null {
-+  const hunk = diffHunkForIndex(diff, index)
-+  if (!hunk) { return null }
-+
-+  return hunk.lines[index - hunk.unifiedDiffStart] || null
-+}
-+>>>>>>> .their
-changed in both
-  base   100644 3e516b6d4f3d61bfd9ee4f1cf169b1f7daaf8527 app/src/ui/diff/diff-line-gutter.tsx
-  our    100644 de4e6d59229013efd700fa8ab59fdabd09a5054b app/src/ui/diff/diff-line-gutter.tsx
-  their  100644 9dc3b00bbe2647df1093590982d14f7b730e6a37 app/src/ui/diff/diff-line-gutter.tsx
-@@ -1,6 +1,11 @@
- import * as React from 'react'
-+<<<<<<< .our
- import { DiffHunk, DiffLine, DiffLineType } from '../../models/diff'
- import { diffHunkForIndex, findInteractiveDiffRange } from './diff-explorer'
-+=======
-+import { ITextDiff, DiffHunk, DiffLine, DiffLineType } from '../../models/diff'
-+import { diffHunkForIndex } from './diff-explorer'
-+>>>>>>> .their
- import { hoverCssClass, selectedLineClass } from './selection/selection'
- import { assertNever } from '../../lib/fatal-error'
- import * as classNames from 'classnames'
-@@ -30,7 +35,11 @@
-   /**
-    * The diff currently displayed in the app
-    */
-+<<<<<<< .our
-   readonly hunks: ReadonlyArray<DiffHunk>
-+=======
-+  readonly diff: ITextDiff
-+>>>>>>> .their
- 
-   /**
-    * Callback to apply hover effect to specific lines in the diff
-@@ -203,14 +212,37 @@
- 
-   private mouseLeaveHandler = (ev: MouseEvent) => {
-     ev.preventDefault()
-+<<<<<<< .our
-     const isRangeSelection = isMouseCursorNearEdge(ev)
-     this.updateHoverState(isRangeSelection, false)
-+=======
-+
-+    const isHunkSelection = isMouseInHunkSelectionZone(ev)
-+    this.updateHoverState(isHunkSelection, false)
-+  }
-+
-+  private updateHoverState(isHunkSelection: boolean, isActive: boolean) {
-+    if (isHunkSelection) {
-+      const hunk = diffHunkForIndex(this.props.diff, this.props.index)
-+      if (!hunk) {
-+        console.error('unable to find hunk for given line in diff')
-+        return
-+      }
-+      this.props.updateHunkHoverState(hunk, isActive)
-+    } else {
-+      this.setHover(isActive)
-+    }
-+>>>>>>> .their
-   }
- 
-   private mouseMoveHandler = (ev: MouseEvent) => {
-     ev.preventDefault()
- 
-+<<<<<<< .our
-     const hunk = diffHunkForIndex(this.props.hunks, this.props.index)
-+=======
-+    const hunk = diffHunkForIndex(this.props.diff, this.props.index)
-+>>>>>>> .their
-     if (!hunk) {
-       console.error('unable to find hunk for given line in diff')
-       return
-changed in both
-  base   100644 611f7bbe5cd13b46da78feabc6c1f0264266862a app/src/ui/diff/index.tsx
-  our    100644 8695c640dc0a5184c74a112f131a2e2a07ef572d app/src/ui/diff/index.tsx
-  their  100644 279bcb59b65d4b90754eb67db81a79729f423f37 app/src/ui/diff/index.tsx
-@@ -1,6 +1,19 @@
- import * as React from 'react'
-+<<<<<<< .our
-+=======
-+import * as ReactDOM from 'react-dom'
-+import { Disposable } from 'event-kit'
-+
-+import { NewImageDiff } from './new-image-diff'
-+import { ModifiedImageDiff } from './modified-image-diff'
-+import { DeletedImageDiff } from './deleted-image-diff'
-+import { BinaryFile } from './binary-file'
-+import { SubmoduleDiff } from './submodule-diff'
-+
-+>>>>>>> .their
- import { Editor } from 'codemirror'
- 
-+<<<<<<< .our
- import { assertNever } from '../../lib/fatal-error'
- import { encodePathAsUrl } from '../../lib/path'
- import { ImageDiffType } from '../../lib/app-state'
-@@ -30,17 +43,27 @@
- } from './image-diffs'
- import { BinaryFile } from './binary-file'
- import { diffLineForIndex } from './diff-explorer'
-+=======
-+import { FileChange, WorkingDirectoryFileChange, FileStatus } from '../../models/status'
-+import { DiffHunk, DiffSelection, DiffType, IDiff, IImageDiff, ITextDiff, ISubmoduleDiff } from '../../models/diff'
-+import { Dispatcher } from '../../lib/dispatcher/dispatcher'
-+
-+import { diffLineForIndex, diffHunkForIndex } from './diff-explorer'
-+>>>>>>> .their
- import { DiffLineGutter } from './diff-line-gutter'
- import { DiffSyntaxMode } from './diff-syntax-mode'
- 
- import { ISelectionStrategy } from './selection/selection-strategy'
- import { TextDiff } from './text-diff'
- 
-+<<<<<<< .our
- // image used when no diff is displayed
- const NoDiffImage = encodePathAsUrl(__dirname, 'static/ufo-alert.svg')
- 
- type ChangedFile = WorkingDirectoryFileChange | CommittedFileChange
- 
-+=======
-+>>>>>>> .their
- /** The props for the Diff component. */
- interface IDiffProps {
-   readonly repository: Repository
-@@ -129,7 +152,11 @@
-         }
- 
-         if (diff.kind === DiffType.Text) {
-+<<<<<<< .our
-           const line = diffLineForIndex(diff.hunks, index)
-+=======
-+          const line = diffLineForIndex(diff, index)
-+>>>>>>> .their
-           const isIncludable = line ? line.isIncludeableLine() : false
-           const isSelected = selection.isSelected(index) && isIncludable
-           element.setSelected(isSelected)
-@@ -190,8 +217,42 @@
-     this.selection = null
-   }
- 
-+<<<<<<< .our
-   private onChangeImageDiffType = (type: ImageDiffType) => {
-     this.props.dispatcher.changeImageDiffType(type)
-+=======
-+  private onMouseDown = (index: number, isHunkSelection: boolean) => {
-+    if (!(this.props.file instanceof WorkingDirectoryFileChange)) {
-+      fatalError('must not start selection when selected file is not a WorkingDirectoryFileChange')
-+      return
-+    }
-+
-+    const diff = this.props.diff
-+    if (diff.kind !== DiffType.Text) {
-+      // text diffs are the only ones that can handle selection
-+      return
-+    }
-+
-+    const snapshot = this.props.file.selection
-+    const selected = snapshot.isSelected(index)
-+    const desiredSelection = !selected
-+
-+    if (isHunkSelection) {
-+      const hunk = diffHunkForIndex(diff, index)
-+      if (!hunk) {
-+        console.error('unable to find hunk for given line in diff')
-+        return
-+      }
-+
-+      const start = hunk.unifiedDiffStart
-+      const end = hunk.unifiedDiffEnd
-+      this.selection = new HunkSelection(start, end, desiredSelection, snapshot)
-+    } else {
-+      this.selection = new DragDropSelection(index, desiredSelection, snapshot)
-+    }
-+
-+    this.selection.paint(this.cachedGutterElements)
-+>>>>>>> .their
-   }
- 
-   private renderImage(imageDiff: IImageDiff) {
-@@ -210,11 +271,96 @@
-       return <NewImageDiff current={imageDiff.current} />
-     }
- 
-+<<<<<<< .our
-     if (
-       imageDiff.previous &&
-       this.props.file.status === AppFileStatus.Deleted
-     ) {
-       return <DeletedImageDiff previous={imageDiff.previous} />
-+=======
-+    const diff = this.props.diff
-+    if (diff.kind !== DiffType.Text) {
-+      return
-+    }
-+
-+    const index = instance.getLineNumber(line) as number
-+    const hunk = diffHunkForIndex(diff, index)
-+    if (hunk) {
-+      const relativeIndex = index - hunk.unifiedDiffStart
-+      const diffLine = hunk.lines[relativeIndex]
-+      if (diffLine) {
-+        const diffLineElement = element.children[0] as HTMLSpanElement
-+
-+        const reactContainer = document.createElement('span')
-+
-+        let isIncluded = false
-+        if (this.props.file instanceof WorkingDirectoryFileChange) {
-+          isIncluded = this.props.file.selection.isSelected(index)
-+        }
-+
-+        const cache = this.cachedGutterElements
-+
-+        ReactDOM.render(
-+          <DiffLineGutter
-+            line={diffLine}
-+            isIncluded={isIncluded}
-+            index={index}
-+            readOnly={this.props.readOnly}
-+            diff={diff}
-+            updateHunkHoverState={this.updateHunkHoverState}
-+            isSelectionEnabled={this.isSelectionEnabled}
-+            onMouseUp={this.onMouseUp}
-+            onMouseDown={this.onMouseDown}
-+            onMouseMove={this.onMouseMove} />,
-+          reactContainer,
-+          function (this: DiffLineGutter) {
-+            if (this !== undefined) {
-+              cache.set(index, this)
-+            }
-+          }
-+        )
-+
-+        element.insertBefore(reactContainer, diffLineElement)
-+
-+        // Hack(ish?). In order to be a real good citizen we need to unsubscribe from
-+        // the line delete event once we've been called once or the component has been
-+        // unmounted. In the latter case it's _probably_ not strictly necessary since
-+        // the only thing gc rooted by the event should be isolated and eligble for
-+        // collection. But let's be extra cautious I guess.
-+        //
-+        // The only way to unsubscribe is to pass the exact same function given to the
-+        // 'on' function to the 'off' so we need a reference to ourselves, basically.
-+        let deleteHandler: () => void
-+
-+        // Since we manually render a react component we have to take care of unmounting
-+        // it or else we'll leak memory. This disposable will unmount the component.
-+        //
-+        // See https://facebook.github.io/react/blog/2015/10/01/react-render-and-top-level-api.html
-+        const gutterCleanup = new Disposable(() => {
-+          this.cachedGutterElements.delete(index)
-+
-+          ReactDOM.unmountComponentAtNode(reactContainer)
-+
-+          line.off('delete', deleteHandler)
-+        })
-+
-+        // Add the cleanup disposable to our list of disposables so that we clean up when
-+        // this component is unmounted or when the line is re-rendered. When either of that
-+        // happens the line 'delete' event doesn't  fire.
-+        this.lineCleanup.set(line, gutterCleanup)
-+
-+        // If the line delete event fires we dispose of the disposable (disposing is
-+        // idempotent)
-+        deleteHandler = () => {
-+          const disp = this.lineCleanup.get(line)
-+          if (disp) {
-+            this.lineCleanup.delete(line)
-+            disp.dispose()
-+          }
-+        }
-+        line.on('delete', deleteHandler)
-+      }
-+>>>>>>> .their
-     }
- 
-     return null
-@@ -246,6 +392,7 @@
-     )
-   }
- 
-+<<<<<<< .our
-   private renderLargeText(diff: ILargeTextDiff) {
-     // guaranteed to be set since this function won't be called if text or hunks are null
-     const textDiff: ITextDiff = {
-@@ -253,11 +400,27 @@
-       hunks: diff.hunks,
-       kind: DiffType.Text,
-       lineEndingsChange: diff.lineEndingsChange,
-+=======
-+  private renderImage(imageDiff: IImageDiff) {
-+    if (imageDiff.current && imageDiff.previous) {
-+      return <ModifiedImageDiff
-+                current={imageDiff.current}
-+                previous={imageDiff.previous} />
-+    }
-+
-+    if (imageDiff.current && this.props.file.status === FileStatus.New) {
-+      return <NewImageDiff current={imageDiff.current} />
-+    }
-+
-+    if (imageDiff.previous && this.props.file.status === FileStatus.Deleted) {
-+      return <DeletedImageDiff previous={imageDiff.previous} />
-+>>>>>>> .their
-     }
- 
-     return this.renderTextDiff(textDiff)
-   }
- 
-+<<<<<<< .our
-   private renderText(diff: ITextDiff) {
-     if (diff.hunks.length === 0) {
-       if (this.props.file.status === AppFileStatus.New) {
-@@ -299,6 +462,72 @@
-         hunks={diff.hunks}
-       />
-     )
-+=======
-+  private renderBinaryFile() {
-+    return <BinaryFile path={this.props.file.path}
-+                    repository={this.props.repository}
-+                    dispatcher={this.props.dispatcher} />
-+  }
-+
-+  private renderSubmoduleDiff(diff: ISubmoduleDiff) {
-+    return <SubmoduleDiff name={diff.name}
-+                          type={diff.type}
-+                          from={diff.from}
-+                          to={diff.to}
-+                          changes={diff.changes}  />
-+  }
-+
-+  private renderTextDiff(diff: ITextDiff) {
-+      const options: IEditorConfigurationExtra = {
-+        lineNumbers: false,
-+        readOnly: true,
-+        showCursorWhenSelecting: false,
-+        cursorBlinkRate: -1,
-+        lineWrapping: localStorage.getItem('soft-wrap-is-best-wrap') ? true : false,
-+        // Make sure CodeMirror doesn't capture Tab and thus destroy tab navigation
-+        extraKeys: { Tab: false },
-+        scrollbarStyle: __DARWIN__ ? 'simple' : 'native',
-+        mode: getDiffMode(),
-+      }
-+
-+      return (
-+        <CodeMirrorHost
-+          className='diff-code-mirror'
-+          value={diff.text}
-+          options={options}
-+          isSelectionEnabled={this.isSelectionEnabled}
-+          onChanges={this.onChanges}
-+          onRenderLine={this.renderLine}
-+          ref={this.getAndStoreCodeMirrorInstance}
-+        />
-+      )
-+  }
-+
-+  private getAndStoreCodeMirrorInstance = (cmh: CodeMirrorHost) => {
-+    this.codeMirror = cmh === null ? null : cmh.getEditor()
-+  }
-+
-+  public render() {
-+    const diff = this.props.diff
-+
-+    if (diff.kind === DiffType.Image) {
-+      return this.renderImage(diff)
-+    }
-+
-+    if (diff.kind === DiffType.Binary) {
-+      return this.renderBinaryFile()
-+    }
-+
-+    if (diff.kind === DiffType.Text) {
-+      return this.renderTextDiff(diff)
-+    }
-+
-+    if (diff.kind === DiffType.Submodule) {
-+      return this.renderSubmoduleDiff(diff)
-+    }
-+
-+    return null
-+>>>>>>> .their
-   }
- 
-   private showLargeDiff = () => {
-added in remote
-  their  100644 3ec848da728a2dd4ce1688ceae1f87cb00aa29d8 app/src/ui/diff/submodule-diff.tsx
-@@ -0,0 +1,68 @@
-+import * as React from 'react'
-+
-+import { Octicon, OcticonSymbol } from '../octicons'
-+import { FileSummary } from '../../models/diff'
-+import { FileStatus } from '../../models/status'
-+
-+interface ISubmoduleDiffProps {
-+  readonly changes?: ReadonlyArray<FileSummary>
-+  readonly name: string
-+  readonly type: FileStatus
-+  readonly from?: string
-+  readonly to?: string
-+}
-+
-+/** A component to render when a new image has been added to the repository */
-+export class SubmoduleDiff extends React.Component<ISubmoduleDiffProps, void> {
-+
-+  public render() {
-+
-+    if (this.props.type === FileStatus.New || this.props.type === FileStatus.Deleted) {
-+      const action = this.props.type === FileStatus.New
-+        ? 'added at'
-+        : 'removed from'
-+
-+      // when removing or adding a submodule, only one SHA is available
-+      const sha = this.props.type === FileStatus.New
-+        ? this.props.to
-+        : this.props.from
-+
-+      if (!sha) {
-+        console.error('the submodule diff should have specified a SHA but it didn\'t, look into this')
-+      }
-+
-+      return <div className='panel' id='diff'>
-+        <div className='submodule-header'>
-+          <Octicon symbol={OcticonSymbol.fileSubmodule} /> Submodule {this.props.name} {action} {sha}
-+        </div>
-+      </div>
-+    }
-+
-+    const message = this.props.changes
-+      ? `${this.props.changes.length} ${this.props.changes.length > 1 ? 'files' : 'file'}`
-+      : `from ${this.props.from} to ${this.props.to}`
-+
-+    const changes = this.props.changes || [ ]
-+
-+    return <div className='panel' id='diff'>
-+      <div className='submodule-header'>
-+        <Octicon symbol={OcticonSymbol.fileSubmodule} /> Submodule {this.props.name} updated {message}
-+      </div>
-+
-+      <table className='submodule-changes'>
-+        <tbody>
-+          {changes.map(f =>
-+            <tr className='entry' key={f.id}>
-+              <td className='stats'>
-+                <span className='added'>+{f.added}</span>
-+                <span className='removed'> -{f.removed}</span>
-+              </td>
-+              <td className='icon'><Octicon symbol={OcticonSymbol.diffModified} /></td>
-+              <td className='path'>{f.path}</td>
-+            </tr>
-+          )}
-+        </tbody>
-+      </table>
-+    </div>
-+  }
-+}
-changed in both
-  base   100644 e6c3b8f49a2b24e7478e4fbf5c6ebc507f5279be app/styles/_variables.scss
-  our    100644 6c89a529c5a8dbfefb127f171468af9ae5651141 app/styles/_variables.scss
-  their  100644 a11f9adbcecf5e114799353a54e7a7339e18128b app/styles/_variables.scss
-@@ -333,6 +333,7 @@
-   --diff-hover-gutter-color: $blue-400;
-   --diff-hover-text-color: var(--background-color);
- 
-+<<<<<<< .our
-   --diff-add-hover-background-color: $green-300;
-   --diff-add-hover-border-color: $green-400;
-   --diff-add-hover-gutter-color: $green-400;
-@@ -356,6 +357,10 @@
-   --syntax-attribute-color: #6f42c1;
-   --syntax-link-color: #032f62;
-   --syntax-header-color: #0000ff;
-+=======
-+  --diff-submodule-add-text-color: #55a532;
-+  --diff-submodule-remove-text-color: #bd2c00;
-+>>>>>>> .their
- 
-   // Note that this duration *must* match the `UndoCommitAnimationTimeout`
-   // specified in `changes/index.tsx`.
-changed in both
-  base   100644 fe2b84bd34f381a033b197d20aaefa97e9bf8487 app/styles/ui/_diff.scss
-  our    100644 372c4e6b8d6af44922f648559b128e98c085134d app/styles/ui/_diff.scss
-  their  100644 963a4fa2f1f92344c241f4fc9085833ac3feaa45 app/styles/ui/_diff.scss
-@@ -565,3 +565,38 @@
-     }
-   }
- }
-+// ***************************************************************************************************************************
-+
-+#diff .submodule-header {
-+  margin: var(--spacing-half) var(--spacing);
-+
-+  .octicon {
-+    vertical-align: text-top;
-+  }
-+}
-+
-+#diff .submodule-changes {
-+  margin: 0px var(--spacing-triple);
-+
-+  .stats {
-+    text-align: right;
-+    padding-right: var(--spacing);
-+    box-sizing: border-box
-+  }
-+
-+  .added {
-+    color: var(--diff-submodule-add-text-color);
-+  }
-+
-+  .removed {
-+    color: var(--diff-submodule-remove-text-color);
-+  }
-+
-+  .icon {
-+    color: var(--color-modified);
-+
-+    .octicon {
-+      vertical-align: text-top;
-+    }
-+  }
-+}
-\ No newline at end of file
-removed in local
-  base   100644 54351aef2f622a952d5f9e76430fdd381745ed60 app/test/fixture-helper.ts
-  their  100644 d5b53ec32b23c5dea5e84be3fdad21dfa582062d app/test/fixture-helper.ts
-added in remote
-  their  100644 a681274e61ddc6f5ce99462d47db6f334b2ef804 app/test/fixtures/repository-with-submodule-change/.gitmodules
-@@ -0,0 +1,3 @@
-+[submodule "friendly-bassoon"]
-+	path = friendly-bassoon
-+	url = https://github.com/shiftkey/friendly-bassoon.git
-added in remote
-  their  100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 app/test/fixtures/repository-with-submodule-change/README.md
-added in remote
-  their  100644 099b35e7ee7aee17705fe449b5479a80de42a46b app/test/fixtures/repository-with-submodule-change/_git/COMMIT_EDITMSG
-@@ -0,0 +1 @@
-+added submodule
-added in remote
-  their  100644 cb089cd89a7d7686d284d8761201649346b5aa1c app/test/fixtures/repository-with-submodule-change/_git/HEAD
-@@ -0,0 +1 @@
-+ref: refs/heads/master
-added in remote
-  their  100644 638e1db7272faf93c1dbe1d5601211df798235e6 app/test/fixtures/repository-with-submodule-change/_git/config
-@@ -0,0 +1,9 @@
-+[core]
-+	repositoryformatversion = 0
-+	filemode = true
-+	bare = false
-+	logallrefupdates = true
-+	ignorecase = true
-+	precomposeunicode = true
-+[submodule "friendly-bassoon"]
-+	url = https://github.com/shiftkey/friendly-bassoon.git
-added in remote
-  their  100644 498b267a8c7812490d6479839c5577eaaec79d62 app/test/fixtures/repository-with-submodule-change/_git/description
-@@ -0,0 +1 @@
-+Unnamed repository; edit this file 'description' to name the repository.
-added in remote
-  their  100644 002b960c2105f2920e2e4d36638eaca5736a09e9 app/test/fixtures/repository-with-submodule-change/_git/index
-@@ -0,0 +1,2 @@
-+DIRC+�/���ŭ�?)-O�����fW�+M����W��%������8�
-\ No newline at end of file
-added in remote
-  their  100644 a5196d1be8fb59edf8062bef36d3a602e0812139 app/test/fixtures/repository-with-submodule-change/_git/info/exclude
-@@ -0,0 +1,6 @@
-+# git ls-files --others --exclude-from=.git/info/exclude
-+# Lines that start with '#' are comments.
-+# For a project mostly in C, the following would be a good set of
-+# exclude patterns (uncomment them if you want to use them):
-+# *.[oa]
-+# *~
-added in remote
-  their  100644 9ea85a1ed5c989f698dc54d47e9b1f629ef6c352 app/test/fixtures/repository-with-submodule-change/_git/logs/HEAD
-@@ -0,0 +1,2 @@
-+0000000000000000000000000000000000000000 3d86799509ebef82896e96bf175cc2aa22b5c3cc Brendan Forster <brendan@github.com> 1480641798 +1100	commit (initial): create empty file
-+3d86799509ebef82896e96bf175cc2aa22b5c3cc 2b0eed7db3ab39050a3bc71888b2ed3fe77802e2 Brendan Forster <brendan@github.com> 1480641906 +1100	commit: added submodule
-added in remote
-  their  100644 9ea85a1ed5c989f698dc54d47e9b1f629ef6c352 app/test/fixtures/repository-with-submodule-change/_git/logs/refs/heads/master
-@@ -0,0 +1,2 @@
-+0000000000000000000000000000000000000000 3d86799509ebef82896e96bf175cc2aa22b5c3cc Brendan Forster <brendan@github.com> 1480641798 +1100	commit (initial): create empty file
-+3d86799509ebef82896e96bf175cc2aa22b5c3cc 2b0eed7db3ab39050a3bc71888b2ed3fe77802e2 Brendan Forster <brendan@github.com> 1480641906 +1100	commit: added submodule
-added in remote
-  their  100644 d9060fa013fa103fcc4f2f723f8360dbe08e9415 app/test/fixtures/repository-with-submodule-change/_git/modules/friendly-bassoon/FETCH_HEAD
-@@ -0,0 +1 @@
-+f1a74d299b28b4278d6127fbb3e9cc7aeedc153f		branch 'master' of https://github.com/shiftkey/friendly-bassoon
-added in remote
-  their  100644 cb089cd89a7d7686d284d8761201649346b5aa1c app/test/fixtures/repository-with-submodule-change/_git/modules/friendly-bassoon/HEAD
-@@ -0,0 +1 @@
-+ref: refs/heads/master
-added in remote
-  their  100644 fbf6dff08db39d3e3a25baa082900310039533e9 app/test/fixtures/repository-with-submodule-change/_git/modules/friendly-bassoon/ORIG_HEAD
-@@ -0,0 +1 @@
-+ba7ba0bfa67c309b09835bd9b96198b5b19a5b16
-added in remote
-  their  100644 f042bd0069421510841216504515b990f41c559f app/test/fixtures/repository-with-submodule-change/_git/modules/friendly-bassoon/config
-@@ -0,0 +1,14 @@
-+[core]
-+	repositoryformatversion = 0
-+	filemode = true
-+	bare = false
-+	logallrefupdates = true
-+	worktree = ../../../friendly-bassoon
-+	ignorecase = true
-+	precomposeunicode = true
-+[remote "origin"]
-+	url = https://github.com/shiftkey/friendly-bassoon.git
-+	fetch = +refs/heads/*:refs/remotes/origin/*
-+[branch "master"]
-+	remote = origin
-+	merge = refs/heads/master
-added in remote
-  their  100644 498b267a8c7812490d6479839c5577eaaec79d62 app/test/fixtures/repository-with-submodule-change/_git/modules/friendly-bassoon/description
-@@ -0,0 +1 @@
-+Unnamed repository; edit this file 'description' to name the repository.
-added in remote
-  their  100644 639854c84156b7f99a172c48178aa1da16fd804e app/test/fixtures/repository-with-submodule-change/_git/modules/friendly-bassoon/index
-@@ -0,0 +1,3 @@
-+DIRC+.gitignore+�E6�XY[KU��N�;�CS�F���
���|��	�,�
-\ No newline at end of file
-added in remote
-  their  100644 a5196d1be8fb59edf8062bef36d3a602e0812139 app/test/fixtures/repository-with-submodule-change/_git/modules/friendly-bassoon/info/exclude
-@@ -0,0 +1,6 @@
-+# git ls-files --others --exclude-from=.git/info/exclude
-+# Lines that start with '#' are comments.
-+# For a project mostly in C, the following would be a good set of
-+# exclude patterns (uncomment them if you want to use them):
-+# *.[oa]
-+# *~
-added in remote
-  their  100644 27de224e90d50b4e2e3018258f09645377548292 app/test/fixtures/repository-with-submodule-change/_git/modules/friendly-bassoon/logs/HEAD
-@@ -0,0 +1,2 @@
-+0000000000000000000000000000000000000000 ba7ba0bfa67c309b09835bd9b96198b5b19a5b16 Brendan Forster <brendan@github.com> 1480641858 +1100	clone: from https://github.com/shiftkey/friendly-bassoon.git
-+ba7ba0bfa67c309b09835bd9b96198b5b19a5b16 f1a74d299b28b4278d6127fbb3e9cc7aeedc153f Brendan Forster <brendan@github.com> 1480642009 +1100	pull: Fast-forward
-added in remote
-  their  100644 27de224e90d50b4e2e3018258f09645377548292 app/test/fixtures/repository-with-submodule-change/_git/modules/friendly-bassoon/logs/refs/heads/master
-@@ -0,0 +1,2 @@
-+0000000000000000000000000000000000000000 ba7ba0bfa67c309b09835bd9b96198b5b19a5b16 Brendan Forster <brendan@github.com> 1480641858 +1100	clone: from https://github.com/shiftkey/friendly-bassoon.git
-+ba7ba0bfa67c309b09835bd9b96198b5b19a5b16 f1a74d299b28b4278d6127fbb3e9cc7aeedc153f Brendan Forster <brendan@github.com> 1480642009 +1100	pull: Fast-forward
-added in remote
-  their  100644 2305d374cbaafed2ce6e898c1c7407f0516fea18 app/test/fixtures/repository-with-submodule-change/_git/modules/friendly-bassoon/logs/refs/remotes/origin/HEAD
-@@ -0,0 +1 @@
-+0000000000000000000000000000000000000000 ba7ba0bfa67c309b09835bd9b96198b5b19a5b16 Brendan Forster <brendan@github.com> 1480641858 +1100	clone: from https://github.com/shiftkey/friendly-bassoon.git
-added in remote
-  their  100644 b89ad60ec3fc350b6af7909cc3289b7bae40b432 app/test/fixtures/repository-with-submodule-change/_git/modules/friendly-bassoon/logs/refs/remotes/origin/master
-@@ -0,0 +1 @@
-+ba7ba0bfa67c309b09835bd9b96198b5b19a5b16 f1a74d299b28b4278d6127fbb3e9cc7aeedc153f Brendan Forster <brendan@github.com> 1480642001 +1100	fetch: fast-forward
-added in remote
-  their  100644 f61734b707b45193a84dd0793677a2bc965a3a27 app/test/fixtures/repository-with-submodule-change/_git/modules/friendly-bassoon/objects/0b/a8a7e4e260ae93d17a2178a906663faccc712b
-@@ -0,0 +1 @@
-+x
+)JMU044`040031Q�K�,�L��/Je���B��핢l[�+N�}��������/ؕaU�ݚG-2�������r���� WG_W���m:w�k4�P������)��k�
��0q
-\ No newline at end of file
-added in remote
-  their  100644 0cc886813b8b1769630710cb632ca43fae648143 app/test/fixtures/repository-with-submodule-change/_git/modules/friendly-bassoon/objects/0f/91ecbd640e30969a56cefde559edeba9e11bed
-@@ -0,0 +1 @@
-+x
K��OR05bPVH+�L�Kɩ�MJ,.������M���KW(��MUH�H�KO-V(�W(�HUH��I�
-\ No newline at end of file
-added in remote
-  their  100644 6c4a10db08799ff493a350f72e1d5a1c9066590d app/test/fixtures/repository-with-submodule-change/_git/modules/friendly-bassoon/objects/aa/83dd7cfec538e10256998af78d4550a9a543a0
-@@ -0,0 +1,3 @@
-+x
]RK��0�ٿb��VB��=�Ro��U�8����WG�i���c�l�JH���5nF���ӷ�O[.!ӭ��"$6�w������3�<=��USWO�뼲��ʞ�s�L�ʪ������"�R`zh��U�@=��YY����t�Z�"���q����*l�vδ�F<�L;���k�z=*~P��n��I���	�ܯ��`fV9ou0"�S;�]�p��I����#�|v� ��d:݇�Zl��f�n���
��=v�P\����/ƂS�HA����_uKO��A�[D.T.�9��D;��vBJ;:��-��T�C%(��8�K�֚�����N�ī�1������x��Ľ,`q����
�8B�n�!/Ƌ�;�nn����z�����6�à*R���
���OX+Z�y���M������+4?��'���`U� |[f�a��q�Kx�
-+k��|��2���
�3�Ka�D�Ad������\�
3-P(��<�eT@�eQ1�O6�y*��mY.�k���
-\ No newline at end of file
-added in remote
-  their  100644 4c692a070a3f7a99d6b73253857afb98dc47e07d app/test/fixtures/repository-with-submodule-change/_git/modules/friendly-bassoon/objects/b6/2cddc72880f8275efd8ae2d931ca13e55bad8b
-@@ -0,0 +1 @@
-+x
K��OR0�`PVH+�L�Kɩ�MJ,.���
-\ No newline at end of file
-added in remote
-  their  100644 2219f006c10506658c5f5de1e78059036ad9fda4 app/test/fixtures/repository-with-submodule-change/_git/modules/friendly-bassoon/objects/ba/7ba0bfa67c309b09835bd9b96198b5b19a5b16
-@@ -0,0 +1,3 @@
-+x
��A
-+�0E]��d&
�Dą�1&�h6����Jo�����.K�@���F	�թe���X�AFd��))%O6Y�\ܚ�I
-+�k�tmp�;��r��xJu�
-\ No newline at end of file
-added in remote
-  their  100644 5adaa29679d1f16b2af71ed877d6ab1251deaad6 app/test/fixtures/repository-with-submodule-change/_git/modules/friendly-bassoon/objects/d6/4508360b9d58595b4b550c9b06bf4eb53b1eb6
-@@ -0,0 +1 @@
-+x
+)JMU044`040031Q�K�,�L��/Je���B��핢l[�+N�}��������/ؕaU�ݚG-2�������r���� WG_W����o���L�v���ȷ�W>�~
-\ No newline at end of file
-added in remote
-  their  100644 d3f7260795dd57806098295aeba31896553d5f2a app/test/fixtures/repository-with-submodule-change/_git/modules/friendly-bassoon/objects/f1/a74d299b28b4278d6127fbb3e9cc7aeedc153f
-@@ -0,0 +1,2 @@
-+x
}�Aj�0E��)f�X�H`B��5�Il���Ȅ�>*�w����yY�Jǣ�բJ�Ya�;FH�%,Dx`��UH�p�#]+!���Nc��
-+����L��۸.nuʅ>[��J_�<��>ns�6Ƽ��X�ζ�������׿��{
k.�����u�\ғn�&-�{TGJ
-\ No newline at end of file
-added in remote
-  their  100644 f9f31686ca7aba1cdc075b687cb2b7a634d0017a app/test/fixtures/repository-with-submodule-change/_git/modules/friendly-bassoon/objects/f8/05e810e5c6e087791506b4e721958de3574ae4
-@@ -0,0 +1,2 @@
-+x
=���0�=�M�(�F����&�'ӟ���"��SL<��Mwf��
-+��o1�����*m�GIjQ�
-\ No newline at end of file
-added in remote
-  their  100644 2908b3e468a38f1099d3772d58d7bf4bd860938f app/test/fixtures/repository-with-submodule-change/_git/modules/friendly-bassoon/packed-refs
-@@ -0,0 +1,2 @@
-+# pack-refs with: peeled fully-peeled 
-+ba7ba0bfa67c309b09835bd9b96198b5b19a5b16 refs/remotes/origin/master
-added in remote
-  their  100644 b15db3b0fa3e514577be6ee9d422d2640602f09e app/test/fixtures/repository-with-submodule-change/_git/modules/friendly-bassoon/refs/heads/master
-@@ -0,0 +1 @@
-+f1a74d299b28b4278d6127fbb3e9cc7aeedc153f
-added in remote
-  their  100644 6efe28fff834a94fbc20cac51fe9cd65ecc78d43 app/test/fixtures/repository-with-submodule-change/_git/modules/friendly-bassoon/refs/remotes/origin/HEAD
-@@ -0,0 +1 @@
-+ref: refs/remotes/origin/master
-added in remote
-  their  100644 b15db3b0fa3e514577be6ee9d422d2640602f09e app/test/fixtures/repository-with-submodule-change/_git/modules/friendly-bassoon/refs/remotes/origin/master
-@@ -0,0 +1 @@
-+f1a74d299b28b4278d6127fbb3e9cc7aeedc153f
-added in remote
-  their  100644 095a034a4f32bf06147462f1cba9372b0ee00f41 app/test/fixtures/repository-with-submodule-change/_git/objects/2b/0eed7db3ab39050a3bc71888b2ed3fe77802e2
-@@ -0,0 +1 @@
-+x
��Aj�0
-\ No newline at end of file
-added in remote
-  their  100644 8a65b437fe5091113b67449b099cc0a13cf73c19 app/test/fixtures/repository-with-submodule-change/_git/objects/3d/86799509ebef82896e96bf175cc2aa22b5c3cc
-@@ -0,0 +1,3 @@
-+x
��A
-+�0+�U��H����v�m�G��8�	��َ}L�7�K�k�u�n��T*�.�E�-�R�g �s�G"D�������M��* ��o�����>�
-\ No newline at end of file
-added in remote
-  their  100644 6a2e3bd70bd0a3a591a81f554af268c9df0e3ac6 app/test/fixtures/repository-with-submodule-change/_git/objects/96/2f9afa84c5adb23f292d4ffac8f5ebce6657e6
-@@ -0,0 +1 @@
-+x
+)JMU042`040031Q�K�,��O)�I-fX֨�x���s3�t�o�{��`�*rut�u��Max6���M�9{wk�+��q�IO�DC3 PH+�L�Kɩ�MJ,.���c�U�`���ٜ��7w&�غqV�
-\ No newline at end of file
-added in remote
-  their  100644 0c1dd4b0f7faec0d272efa31b733251d93418df0 app/test/fixtures/repository-with-submodule-change/_git/objects/a6/81274e61ddc6f5ce99462d47db6f334b2ef804
-@@ -0,0 +1,2 @@
-+x
]�;� @]��]	�&��8X
!�%��^g���������
-+�hKr��ot�Mu����7)��A-�UR�7�<0g��>#�ぷ�=_����H~��*�
-\ No newline at end of file
-added in remote
-  their  100644 711223894375fe1186ac5bfffdc48fb1fa1e65cc app/test/fixtures/repository-with-submodule-change/_git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
-@@ -0,0 +1 @@
-+x
K��OR0`
-\ No newline at end of file
-added in remote
-  their  100644 91fccd447fe1ae44bda5ac217479c40ea5879984 app/test/fixtures/repository-with-submodule-change/_git/objects/f9/3e3a1a1525fb5b91020da86e44810c87a2d7bc
-@@ -0,0 +1 @@
-+x
+)JMU06g040031Qrut�u��Max6���M�9{wk�+��q�IO�D
-\ No newline at end of file
-added in remote
-  their  100644 c8ac18d211a6983ed81b0e01e3ee099eb3bcea13 app/test/fixtures/repository-with-submodule-change/_git/refs/heads/master
-@@ -0,0 +1 @@
-+2b0eed7db3ab39050a3bc71888b2ed3fe77802e2
-added in remote
-  their  100644 f805e810e5c6e087791506b4e721958de3574ae4 app/test/fixtures/repository-with-submodule-change/friendly-bassoon/.gitignore
-@@ -0,0 +1,33 @@
-+# Object files
-+*.o
-+*.ko
-+*.obj
-+*.elf
-+
-+# Precompiled Headers
-+*.gch
-+*.pch
-+
-+# Libraries
-+*.lib
-+*.a
-+*.la
-+*.lo
-+
-+# Shared objects (inc. Windows DLLs)
-+*.dll
-+*.so
-+*.so.*
-+*.dylib
-+
-+# Executables
-+*.exe
-+*.out
-+*.app
-+*.i*86
-+*.x86_64
-+*.hex
-+
-+# Debug files
-+*.dSYM/
-+*.su
-added in remote
-  their  100644 aa83dd7cfec538e10256998af78d4550a9a543a0 app/test/fixtures/repository-with-submodule-change/friendly-bassoon/LICENSE
-@@ -0,0 +1,21 @@
-+MIT License
-+
-+Copyright (c) 2016 Brendan Forster
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy
-+of this software and associated documentation files (the "Software"), to deal
-+in the Software without restriction, including without limitation the rights
-+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+copies of the Software, and to permit persons to whom the Software is
-+furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in all
-+copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-+SOFTWARE.
-added in remote
-  their  100644 0f91ecbd640e30969a56cefde559edeba9e11bed app/test/fixtures/repository-with-submodule-change/friendly-bassoon/README.md
-@@ -0,0 +1,3 @@
-+# friendly-bassoon
-+
-+making some changes to the file
-added in remote
-  their  100644 605d03273508c7eea710bdd641f902153da0082c app/test/fixtures/repository-with-submodule-change/friendly-bassoon/_git
-@@ -0,0 +1 @@
-+gitdir: ../.git/modules/friendly-bassoon
-changed in both
-  base   100644 d00f5af6dd1e2536018d5d11e4ae8396320e30e8 app/test/unit/git/commit-test.ts
-  our    100644 82db4554497e52551ddf6d5f89e004c8bd81738f app/test/unit/git/commit-test.ts
-  their  100644 977e497505ea4ba2da8c13e9dbcef446e84323fa app/test/unit/git/commit-test.ts
-@@ -12,11 +12,18 @@
-   getWorkingDirectoryDiff,
- } from '../../../src/lib/git'
- 
-+<<<<<<< .our
- import {
-   setupFixtureRepository,
-   setupEmptyRepository,
-   setupConflictedRepo,
- } from '../../helpers/repositories'
-+=======
-+import { setupFixtureRepository, setupEmptyRepository } from '../../fixture-helper'
-+import { GitProcess } from 'git-kitchen-sink'
-+import { FileStatus, WorkingDirectoryFileChange } from '../../../src/models/status'
-+import { DiffSelectionType, DiffSelection, ITextDiff, DiffType } from '../../../src/models/diff'
-+>>>>>>> .their
- 
- import { GitProcess } from 'dugite'
- import {
-@@ -40,6 +47,12 @@
-   return diff as ITextDiff
- }
- 
-+async function getTextDiff(repo: Repository, file: WorkingDirectoryFileChange): Promise<ITextDiff> {
-+  const diff = await getWorkingDirectoryDiff(repo, file)
-+  expect(diff.kind === DiffType.Text)
-+  return diff as ITextDiff
-+}
-+
- describe('git/commit', () => {
-   let repository: Repository | null = null
- 
-@@ -201,6 +214,7 @@
- 
-       const modifiedFile = 'modified-file.md'
- 
-+<<<<<<< .our
-       const unselectedFile = DiffSelection.fromInitialSelection(
-         DiffSelectionType.None
-       )
-@@ -219,6 +233,16 @@
-         diff.hunks[0].unifiedDiffEnd - diff.hunks[0].unifiedDiffStart,
-         false
-       )
-+=======
-+      const unselectedFile = DiffSelection.fromInitialSelection(DiffSelectionType.None)
-+      const file = new WorkingDirectoryFileChange(modifiedFile, FileStatus.Modified, unselectedFile)
-+
-+      const diff = await getTextDiff(repository!, file)
-+
-+      const selection = DiffSelection
-+        .fromInitialSelection(DiffSelectionType.All)
-+        .withRangeSelection(diff.hunks[0].unifiedDiffStart, diff.hunks[0].unifiedDiffEnd - diff.hunks[0].unifiedDiffStart, false)
-+>>>>>>> .their
- 
-       const updatedFile = file.withSelection(selection)
- 
-@@ -294,6 +318,7 @@
- 
-       const modifiedFile = 'modified-file.md'
- 
-+<<<<<<< .our
-       const unselectedFile = DiffSelection.fromInitialSelection(
-         DiffSelectionType.None
-       )
-@@ -318,6 +343,18 @@
-         AppFileStatus.Modified,
-         selection
-       )
-+=======
-+      const unselectedFile = DiffSelection.fromInitialSelection(DiffSelectionType.None)
-+      const file = new WorkingDirectoryFileChange(modifiedFile, FileStatus.Modified, unselectedFile)
-+
-+      const diff = await getTextDiff(repository!, file)
-+
-+      const selection = DiffSelection
-+        .fromInitialSelection(DiffSelectionType.All)
-+        .withRangeSelection(diff.hunks[1].unifiedDiffStart, diff.hunks[1].unifiedDiffEnd - diff.hunks[1].unifiedDiffStart, false)
-+
-+      const updatedFile = new WorkingDirectoryFileChange(modifiedFile, FileStatus.Modified, selection)
-+>>>>>>> .their
- 
-       // commit just this change, ignore everything else
-       await createCommit(repository!, 'title', [updatedFile])
-@@ -442,10 +479,14 @@
- 
-       expect(statusAfter.workingDirectory.files.length).to.equal(1)
- 
-+<<<<<<< .our
-       const diff = await getTextDiff(
-         repo,
-         statusAfter.workingDirectory.files[0]
-       )
-+=======
-+      const diff = await getTextDiff(repo, statusAfter.workingDirectory.files[0])
-+>>>>>>> .their
- 
-       expect(diff.hunks.length).to.equal(1)
-       expect(diff.hunks[0].lines.length).to.equal(4)
-removed in local
-  base   100644 f85846560a0779faeac9def00f4fa86c4f519306 app/test/unit/git/git-diff-tests.ts
-  their  100644 f52b530461f4813e99a271848f4de7cd38f09ca1 app/test/unit/git/git-diff-tests.ts
-changed in both
-  base   100644 0214e9738c4d7118d5371bd86da609fffcda67c7 app/test/unit/patch-formatter-test.ts
-  our    100644 c0b463a119f370007a15b53596eef661434e881a app/test/unit/patch-formatter-test.ts
-  their  100644 9b89c3124c8aba3e6fc5491408fe3823919994a2 app/test/unit/patch-formatter-test.ts
-@@ -4,6 +4,7 @@
- import * as FSE from 'fs-extra'
- 
- import { Repository } from '../../src/models/repository'
-+<<<<<<< .our
- import {
-   WorkingDirectoryFileChange,
-   FileChange,
-@@ -25,6 +26,20 @@
-   const rawDiff = parser.parse(diff)
-   const repository = new Repository('', -1, null, false)
-   const fileChange = new FileChange('file.txt', AppFileStatus.Modified)
-+=======
-+import { WorkingDirectoryFileChange, FileChange, FileStatus } from '../../src/models/status'
-+import { DiffSelection, DiffSelectionType, ITextDiff, DiffType } from '../../src/models/diff'
-+import { DiffParser } from '../../src/lib/diff-parser'
-+import { formatPatch } from '../../src/lib/patch-formatter'
-+import { getWorkingDirectoryDiff, convertDiff } from '../../src/lib/git'
-+import { setupFixtureRepository } from '../fixture-helper'
-+
-+async function parseDiff(diff: string): Promise<ITextDiff> {
-+  const parser = new DiffParser()
-+  const rawDiff =  parser.parse(diff)
-+  const repository = new Repository('', -1)
-+  const fileChange = new FileChange('file.txt', FileStatus.Modified)
-+>>>>>>> .their
-   const output = await convertDiff(repository, fileChange, rawDiff, 'HEAD')
-   expect(output.kind === DiffType.Text)
-   return output as ITextDiff
-@@ -58,6 +73,7 @@
-       const textDiff = diff as ITextDiff
-       const second = textDiff.hunks[1]
- 
-+<<<<<<< .our
-       const selection = DiffSelection.fromInitialSelection(
-         DiffSelectionType.All
-       ).withRangeSelection(
-@@ -65,6 +81,11 @@
-         second.unifiedDiffEnd - second.unifiedDiffStart,
-         false
-       )
-+=======
-+      const selection = DiffSelection
-+        .fromInitialSelection(DiffSelectionType.All)
-+        .withRangeSelection(second.unifiedDiffStart, second.unifiedDiffEnd - second.unifiedDiffStart, false)
-+>>>>>>> .their
- 
-       const updatedFile = new WorkingDirectoryFileChange(
-         modifiedFile,
-@@ -96,6 +117,13 @@
- 
-       const textDiff = diff as ITextDiff
-       const first = textDiff.hunks[0]
-+<<<<<<< .our
-+=======
-+
-+      const selection = DiffSelection
-+        .fromInitialSelection(DiffSelectionType.All)
-+        .withRangeSelection(first.unifiedDiffStart, first.unifiedDiffEnd - first.unifiedDiffStart, false)
-+>>>>>>> .their
- 
-       const selection = DiffSelection.fromInitialSelection(
-         DiffSelectionType.All
-@@ -105,12 +133,15 @@
-         false
-       )
- 
-+<<<<<<< .our
-       const updatedFile = new WorkingDirectoryFileChange(
-         modifiedFile,
-         AppFileStatus.Modified,
-         selection
-       )
- 
-+=======
-+>>>>>>> .their
-       const patch = formatPatch(updatedFile, textDiff)
- 
-       expect(patch).to.have.string('--- a/modified-file.md\n')
-@@ -133,6 +164,7 @@
-       const diff = await getWorkingDirectoryDiff(repository!, file)
- 
-       expect(diff.kind === DiffType.Text)
-+<<<<<<< .our
- 
-       const textDiff = diff as ITextDiff
-       const second = textDiff.hunks[1]
-@@ -150,6 +182,17 @@
-         selection
-       )
- 
-+=======
-+
-+      const textDiff = diff as ITextDiff
-+      const second = textDiff.hunks[1]
-+
-+      const selection = DiffSelection
-+        .fromInitialSelection(DiffSelectionType.All)
-+        .withRangeSelection(second.unifiedDiffStart, second.unifiedDiffEnd - second.unifiedDiffStart, false)
-+      const updatedFile = new WorkingDirectoryFileChange(modifiedFile, FileStatus.Modified, selection)
-+
-+>>>>>>> .their
-       const patch = formatPatch(updatedFile, textDiff)
- 
-       expect(patch).to.have.string('--- a/modified-file.md\n')
-@@ -235,7 +278,11 @@
-       expect(patch).to.equal(expectedPatch)
-     })
- 
-+<<<<<<< .our
-     it("doesn't include unselected added lines as context", async () => {
-+=======
-+    it('doesn\'t include unselected added lines as context', async () => {
-+>>>>>>> .their
-       const rawDiff = [
-         '--- a/file.md',
-         '+++ b/file.md',
diff --git a/app/test/fixtures/merge-parser/desktop/merge-vanilla-mocha-into-offline-mode-y-u-no-work.txt b/app/test/fixtures/merge-parser/desktop/merge-vanilla-mocha-into-offline-mode-y-u-no-work.txt
deleted file mode 100644
index d001298d0a6..00000000000
--- a/app/test/fixtures/merge-parser/desktop/merge-vanilla-mocha-into-offline-mode-y-u-no-work.txt
+++ /dev/null
@@ -1,1169 +0,0 @@
-added in remote
-  their  100644 e84ab4e6f3cb9a03e6c851fd2150d898345e7a71 app/test/helpers/fake-electron.ts
-@@ -0,0 +1,8 @@
-+import * as sinon from 'sinon'
-+
-+export const shell = sinon.fake()
-+export const remote = {
-+  autoUpdater: {
-+    on: sinon.fake(),
-+  },
-+}
-added in remote
-  their  100644 fff0e4201755967df54676c30db37ad0f7546e90 app/test/helpers/mocking.ts
-@@ -0,0 +1,20 @@
-+import * as sinon from 'sinon'
-+import rewiremock from 'rewiremock/node'
-+
-+import 'core-js'
-+
-+require('jsdom-global')()
-+
-+rewiremock('electron').by('./fake-electron.ts')
-+rewiremock.enable()
-+
-+import { Headers, Request, Response, FetchError } from 'node-fetch'
-+
-+global.Headers = Headers
-+global.Request = Request
-+global.Response = Response
-+global.FetchError = FetchError
-+
-+global.localStorage = {
-+  getItem: sinon.fake(),
-+}
-merged
-  result 100644 f4438719674cc3795be74665efb7671892aa92ef app/yarn.lock
-  our    100644 cd6294bb698115d3ff652d361f00efbf85c1e781 app/yarn.lock
-@@ -223,8 +223,8 @@
-     humanize-plus "^1.8.1"
- 
- dexie@^2.0.0:
--  version "2.0.0"
--  resolved "https://registry.yarnpkg.com/dexie/-/dexie-2.0.0.tgz#d3ad7b7aa29e8de82ea4a8e09a4ccbfa80213f0d"
-+  version "2.0.4"
-+  resolved "https://registry.yarnpkg.com/dexie/-/dexie-2.0.4.tgz#6027a5e05879424e8f9979d8c14e7420f27e3a11"
- 
- dom-classlist@^1.0.1:
-   version "1.0.1"
-changed in both
-  base   100644 8db07d17ce96651a9515f2c1aea7ca9f02a20c6d package.json
-  our    100644 2006bfb748810f6ea8bdbd26edf7c09524a1388a package.json
-  their  100644 43ed8db007e7545e74497f30e42ae197d42183f9 package.json
-@@ -7,8 +7,8 @@
-   "scripts": {
-     "cli": "ts-node --require ./app/test/globals.ts --require ./app/src/cli/dev-commands-global.ts app/src/cli/main.ts",
-     "test:integration": "cross-env TEST_ENV=1 ELECTRON_NO_ATTACH_CONSOLE=1 xvfb-maybe --auto-servernum -- mocha -t 30000 --require ts-node/register app/test/integration/*.ts",
--    "test:unit": "ts-node script/unit-tests.ts",
--    "test:script": "mocha -t 10000 --require ts-node/register script/changelog/test/*.ts",
-+    "test:unit": "yarn cross-env TEST_ENV=1 ts-mocha -t 1000 -r app/test/globals.ts -r app/test/helpers/mocking.ts 'app/test/unit/**/*.ts{,x}'",
-+    "test:script": "mocha -P ./tsonfig.json -t 10000 --require ts-node/register script/changelog/test/*.ts",
-     "test": "yarn test:unit && yarn test:script && yarn test:integration",
-     "test:setup": "ts-node -P script/tsconfig.json script/test-setup.ts",
-     "test:review": "ts-node  -P script/tsconfig.json script/test-review.ts",
-@@ -138,6 +138,7 @@
-     "@types/react-virtualized": "^9.7.12",
-     "@types/request": "^2.0.9",
-     "@types/semver": "^5.5.0",
-+    "@types/sinon": "^5.0.1",
-     "@types/strip-ansi": "^3.0.0",
-     "@types/temp": "^0.8.29",
-     "@types/textarea-caret": "^3.0.0",
-@@ -152,10 +153,17 @@
-     "@types/webpack-merge": "^4.1.3",
-     "@types/winston": "^2.2.0",
-     "@types/xml2js": "^0.4.0",
-+    "core-js": "^2.5.7",
-     "electron": "2.0.5",
-     "electron-builder": "20.27.1",
-     "electron-mocha": "^6.0.1",
-     "electron-packager": "^12.0.0",
--    "electron-winstaller": "2.5.2"
-+    "electron-winstaller": "2.5.2",
-+    "jsdom": "^11.12.0",
-+    "jsdom-global": "^3.0.2",
-+    "node-fetch": "^2.2.0",
-+    "rewiremock": "^3.7.7",
-+    "sinon": "^6.1.5",
-+    "ts-mocha": "^2.0.0"
-   }
- }
-changed in both
-  base   100644 f882d0c97d785b6cdbe161e15e6951c7d010ecc9 yarn.lock
-  our    100644 45ddb8bf6902bbb22708d844324093dccda26c79 yarn.lock
-  their  100644 51e3b8cf296c315d74bf16f35dbc9ced276ea67b yarn.lock
-@@ -6,6 +6,22 @@
-   version "4.0.2"
-   resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-4.0.2.tgz#6abbdc22f33cab742053777a26db2e25ca527179"
- 
-+"@sinonjs/commons@^1.0.1":
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.0.2.tgz#3e0ac737781627b8844257fadc3d803997d0526e"
-+  dependencies:
-+    type-detect "4.0.8"
-+
-+"@sinonjs/formatio@^2.0.0":
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/@sinonjs/formatio/-/formatio-2.0.0.tgz#84db7e9eb5531df18a8c5e0bfb6e449e55e654b2"
-+  dependencies:
-+    samsam "1.3.0"
-+
-+"@sinonjs/samsam@^2.0.0":
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-2.0.0.tgz#9163742ac35c12d3602dece74317643b35db6a80"
-+
- "@types/body-parser@*":
-   version "1.16.8"
-   resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.16.8.tgz#687ec34140624a3bec2b1a8ea9268478ae8f3be3"
-@@ -142,6 +158,10 @@
-     "@types/html-minifier" "*"
-     "@types/webpack" "*"
- 
-+"@types/json5@^0.0.29":
-+  version "0.0.29"
-+  resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
-+
- "@types/keytar@^4.0.0":
-   version "4.0.1"
-   resolved "https://registry.yarnpkg.com/@types/keytar/-/keytar-4.0.1.tgz#e2cf6405dc33861424e59b67516c66d2cf7bc21b"
-@@ -246,6 +266,10 @@
-     "@types/express-serve-static-core" "*"
-     "@types/mime" "*"
- 
-+"@types/sinon@^5.0.1":
-+  version "5.0.1"
-+  resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-5.0.1.tgz#a15b36ec42f1f53166617491feabd1734cb03e21"
-+
- "@types/source-map@*":
-   version "0.5.1"
-   resolved "https://registry.yarnpkg.com/@types/source-map/-/source-map-0.5.1.tgz#7e74db5d06ab373a712356eebfaea2fad0ea2367"
-@@ -457,6 +481,14 @@
-     "@webassemblyjs/wast-parser" "1.4.3"
-     long "^3.2.0"
- 
-+abab@^1.0.4:
-+  version "1.0.4"
-+  resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e"
-+
-+abab@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.0.tgz#aba0ab4c5eee2d4c79d3487d85450fb2376ebb0f"
-+
- abbrev@1:
-   version "1.1.1"
-   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-@@ -481,6 +513,12 @@
-   dependencies:
-     acorn "^5.0.0"
- 
-+acorn-globals@^4.1.0:
-+  version "4.1.0"
-+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.1.0.tgz#ab716025dbe17c54d3ef81d32ece2b2d99fe2538"
-+  dependencies:
-+    acorn "^5.0.0"
-+
- acorn-jsx@^4.1.1:
-   version "4.1.1"
-   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-4.1.1.tgz#e8e41e48ea2fe0c896740610ab6a4ffd8add225e"
-@@ -491,7 +529,7 @@
-   version "5.2.1"
-   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.2.1.tgz#317ac7821826c22c702d66189ab8359675f135d7"
- 
--acorn@^5.0.3, acorn@^5.6.0:
-+acorn@^5.0.3, acorn@^5.5.3, acorn@^5.6.0:
-   version "5.7.1"
-   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.1.tgz#f095829297706a7c9776958c0afc8930a9b9d9d8"
- 
-@@ -523,7 +561,20 @@
-     fast-json-stable-stringify "^2.0.0"
-     json-schema-traverse "^0.3.0"
- 
-+<<<<<<< .our
- ajv@^6.0.1, ajv@^6.5.0, ajv@^6.5.2:
-+=======
-+ajv@^5.3.0:
-+  version "5.5.2"
-+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
-+  dependencies:
-+    co "^4.6.0"
-+    fast-deep-equal "^1.0.0"
-+    fast-json-stable-stringify "^2.0.0"
-+    json-schema-traverse "^0.3.0"
-+
-+ajv@^6.0.1, ajv@^6.5.0, ajv@^6.5.1:
-+>>>>>>> .their
-   version "6.5.2"
-   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.2.tgz#678495f9b82f7cca6be248dd92f59bff5e1f4360"
-   dependencies:
-@@ -694,6 +745,10 @@
-   version "3.1.0"
-   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
- 
-+array-equal@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
-+
- array-find-index@^1.0.1:
-   version "1.0.2"
-   resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
-@@ -888,6 +943,10 @@
-   version "1.6.0"
-   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
- 
-+aws4@^1.8.0:
-+  version "1.8.0"
-+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
-+
- babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
-   version "6.26.0"
-   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
-@@ -1392,6 +1451,10 @@
-   version "1.1.0"
-   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
- 
-+browser-process-hrtime@^0.1.2:
-+  version "0.1.2"
-+  resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.2.tgz#425d68a58d3447f02a04aa894187fce8af8b7b8e"
-+
- browser-stdout@1.3.1:
-   version "1.3.1"
-   resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
-@@ -1448,6 +1511,12 @@
-   dependencies:
-     pako "~0.2.0"
- 
-+browserify-zlib@^0.2.0:
-+  version "0.2.0"
-+  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
-+  dependencies:
-+    pako "~1.0.5"
-+
- browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
-   version "1.7.7"
-   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"
-@@ -1890,6 +1959,12 @@
-   version "1.1.2"
-   resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
- 
-+combined-stream@1.0.6, combined-stream@~1.0.6:
-+  version "1.0.6"
-+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
-+  dependencies:
-+    delayed-stream "~1.0.0"
-+
- combined-stream@^1.0.5, combined-stream@~1.0.5:
-   version "1.0.5"
-   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
-@@ -1912,6 +1987,10 @@
-   version "1.0.1"
-   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
- 
-+compare-module-exports@^2.0.0:
-+  version "2.0.1"
-+  resolved "https://registry.yarnpkg.com/compare-module-exports/-/compare-module-exports-2.0.1.tgz#0f733a8407554a512fb10e4a0aceec6787df4696"
-+
- compare-version@^0.1.2:
-   version "0.1.2"
-   resolved "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz#0162ec2d9351f5ddd59a9202cba935366a725080"
-@@ -2018,6 +2097,10 @@
-   version "2.5.1"
-   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.1.tgz#ae6874dc66937789b80754ff5428df66819ca50b"
- 
-+core-js@^2.5.7:
-+  version "2.5.7"
-+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e"
-+
- core-util-is@1.0.2, core-util-is@~1.0.0:
-   version "1.0.2"
-   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-@@ -2244,6 +2327,16 @@
-     clap "^1.0.9"
-     source-map "^0.5.3"
- 
-+cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
-+  version "0.3.4"
-+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.4.tgz#8cd52e8a3acfd68d3aed38ee0a640177d2f9d797"
-+
-+cssstyle@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.0.0.tgz#79b16d51ec5591faec60e688891f15d2a5705129"
-+  dependencies:
-+    cssom "0.3.x"
-+
- csstype@^2.2.0:
-   version "2.3.0"
-   resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.3.0.tgz#062e141c78345cf814da0e0b716ad777931b08af"
-@@ -2272,6 +2365,14 @@
-   dependencies:
-     assert-plus "^1.0.0"
- 
-+data-urls@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-1.0.0.tgz#24802de4e81c298ea8a9388bb0d8e461c774684f"
-+  dependencies:
-+    abab "^1.0.4"
-+    whatwg-mimetype "^2.0.0"
-+    whatwg-url "^6.4.0"
-+
- date-now@^0.1.4:
-   version "0.1.4"
-   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
-@@ -2332,6 +2433,10 @@
-   version "0.1.3"
-   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
- 
-+deepmerge@^2.0.1:
-+  version "2.1.1"
-+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.1.1.tgz#e862b4e45ea0555072bf51e7fd0d9845170ae768"
-+
- deepmerge@~1.3.2:
-   version "1.3.2"
-   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-1.3.2.tgz#1663691629d4dbfe364fa12a2a4f0aa86aa3a050"
-@@ -2426,7 +2531,7 @@
-     asap "^2.0.0"
-     wrappy "1"
- 
--diff@3.5.0:
-+diff@3.5.0, diff@^3.5.0:
-   version "3.5.0"
-   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
- 
-@@ -2486,6 +2591,12 @@
-   version "1.1.3"
-   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
- 
-+domexception@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90"
-+  dependencies:
-+    webidl-conversions "^4.0.2"
-+
- domhandler@2.1:
-   version "2.1.0"
-   resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.1.0.tgz#d2646f5e57f6c3bab11cf6cb05d3c0acf7412594"
-@@ -2830,6 +2941,17 @@
-   version "1.0.5"
-   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
- 
-+escodegen@^1.9.1:
-+  version "1.11.0"
-+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.0.tgz#b27a9389481d5bfd5bec76f7bb1eb3f8f4556589"
-+  dependencies:
-+    esprima "^3.1.3"
-+    estraverse "^4.2.0"
-+    esutils "^2.0.2"
-+    optionator "^0.8.1"
-+  optionalDependencies:
-+    source-map "~0.6.1"
-+
- eslint-config-prettier@^2.9.0:
-   version "2.9.0"
-   resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-2.9.0.tgz#5ecd65174d486c22dff389fe036febf502d468a3"
-@@ -2951,6 +3073,10 @@
-   version "2.7.3"
-   resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
- 
-+esprima@^3.1.3:
-+  version "3.1.3"
-+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
-+
- esprima@^4.0.0:
-   version "4.0.0"
-   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
-@@ -2968,7 +3094,7 @@
-     estraverse "^4.1.0"
-     object-assign "^4.0.1"
- 
--estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1:
-+estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
-   version "4.2.0"
-   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
- 
-@@ -3110,6 +3236,10 @@
-   version "3.0.1"
-   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
- 
-+extend@~3.0.2:
-+  version "3.0.2"
-+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-+
- external-editor@^2.0.1:
-   version "2.0.5"
-   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.0.5.tgz#52c249a3981b9ba187c7cacf5beb50bf1d91a6bc"
-@@ -3328,6 +3458,14 @@
-     combined-stream "^1.0.5"
-     mime-types "^2.1.12"
- 
-+form-data@~2.3.2:
-+  version "2.3.2"
-+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
-+  dependencies:
-+    asynckit "^0.4.0"
-+    combined-stream "1.0.6"
-+    mime-types "^2.1.12"
-+
- forwarded@~0.1.2:
-   version "0.1.2"
-   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
-@@ -3671,6 +3809,13 @@
-     ajv "^5.1.0"
-     har-schema "^2.0.0"
- 
-+har-validator@~5.1.0:
-+  version "5.1.0"
-+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.0.tgz#44657f5688a22cfd4b72486e81b3a3fb11742c29"
-+  dependencies:
-+    ajv "^5.3.0"
-+    har-schema "^2.0.0"
-+
- has-ansi@^2.0.0:
-   version "2.0.0"
-   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-@@ -3824,6 +3969,12 @@
-   version "1.1.1"
-   resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.1.tgz#668b93776eaae55ebde8f3ad464b307a4963625e"
- 
-+html-encoding-sniffer@^1.0.2:
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz#e70d84b94da53aa375e11fe3a351be6642ca46f8"
-+  dependencies:
-+    whatwg-encoding "^1.0.1"
-+
- html-entities@^1.2.0:
-   version "1.2.1"
-   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
-@@ -3901,11 +4052,15 @@
-   version "0.0.1"
-   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-0.0.1.tgz#3f91365cabe60b77ed0ebba24b454e3e09d95a82"
- 
-+https-browserify@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
-+
- iconv-lite@0.4.19, iconv-lite@^0.4.17:
-   version "0.4.19"
-   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
- 
--iconv-lite@^0.4.23:
-+iconv-lite@0.4.23, iconv-lite@^0.4.23:
-   version "0.4.23"
-   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
-   dependencies:
-@@ -4404,6 +4559,41 @@
-   version "1.6.0"
-   resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-1.6.0.tgz#c7d1a71edcff2839db2f9ec30fc5d5ebd3c1a678"
- 
-+jsdom-global@^3.0.2:
-+  version "3.0.2"
-+  resolved "https://registry.yarnpkg.com/jsdom-global/-/jsdom-global-3.0.2.tgz#6bd299c13b0c4626b2da2c0393cd4385d606acb9"
-+
-+jsdom@^11.12.0:
-+  version "11.12.0"
-+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.12.0.tgz#1a80d40ddd378a1de59656e9e6dc5a3ba8657bc8"
-+  dependencies:
-+    abab "^2.0.0"
-+    acorn "^5.5.3"
-+    acorn-globals "^4.1.0"
-+    array-equal "^1.0.0"
-+    cssom ">= 0.3.2 < 0.4.0"
-+    cssstyle "^1.0.0"
-+    data-urls "^1.0.0"
-+    domexception "^1.0.1"
-+    escodegen "^1.9.1"
-+    html-encoding-sniffer "^1.0.2"
-+    left-pad "^1.3.0"
-+    nwsapi "^2.0.7"
-+    parse5 "4.0.0"
-+    pn "^1.1.0"
-+    request "^2.87.0"
-+    request-promise-native "^1.0.5"
-+    sax "^1.2.4"
-+    symbol-tree "^3.2.2"
-+    tough-cookie "^2.3.4"
-+    w3c-hr-time "^1.0.1"
-+    webidl-conversions "^4.0.2"
-+    whatwg-encoding "^1.0.3"
-+    whatwg-mimetype "^2.1.0"
-+    whatwg-url "^6.4.1"
-+    ws "^5.2.0"
-+    xml-name-validator "^3.0.0"
-+
- jsesc@^1.3.0:
-   version "1.3.0"
-   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
-@@ -4508,6 +4698,10 @@
-   dependencies:
-     array-includes "^3.0.3"
- 
-+just-extend@^1.1.27:
-+  version "1.1.27"
-+  resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-1.1.27.tgz#ec6e79410ff914e472652abfa0e603c03d60e905"
-+
- kew@^0.7.0:
-   version "0.7.0"
-   resolved "https://registry.yarnpkg.com/kew/-/kew-0.7.0.tgz#79d93d2d33363d6fdd2970b335d9141ad591d79b"
-@@ -4580,6 +4774,10 @@
-   version "0.3.0"
-   resolved "https://registry.yarnpkg.com/leb/-/leb-0.3.0.tgz#32bee9fad168328d6aea8522d833f4180eed1da3"
- 
-+left-pad@^1.3.0:
-+  version "1.3.0"
-+  resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e"
-+
- legal-eagle@0.16.0:
-   version "0.16.0"
-   resolved "https://registry.yarnpkg.com/legal-eagle/-/legal-eagle-0.16.0.tgz#bd3d136dd1b761a540bad898ace68f4009412575"
-@@ -4672,7 +4870,7 @@
-   version "4.4.0"
-   resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
- 
--lodash.get@^4.0.0:
-+lodash.get@^4.0.0, lodash.get@^4.4.2:
-   version "4.4.2"
-   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
- 
-@@ -4692,11 +4890,15 @@
-   version "4.6.0"
-   resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d"
- 
-+lodash.sortby@^4.7.0:
-+  version "4.7.0"
-+  resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
-+
- lodash.tail@^4.1.1:
-   version "4.1.1"
-   resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
- 
--lodash.template@^4.2.2:
-+lodash.template@^4.2.2, lodash.template@^4.4.0:
-   version "4.4.0"
-   resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
-   dependencies:
-@@ -4721,7 +4923,7 @@
-   version "4.17.4"
-   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
- 
--lodash@^4.17.5, lodash@~4.17.10:
-+lodash@^4.13.1, lodash@^4.17.5, lodash@~4.17.10:
-   version "4.17.10"
-   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
- 
-@@ -4735,6 +4937,10 @@
-   version "1.0.1"
-   resolved "https://registry.yarnpkg.com/loglevelnext/-/loglevelnext-1.0.1.tgz#8b17b5a43395338a96c67911a962c44af466d1c8"
- 
-+lolex@^2.3.2, lolex@^2.7.1:
-+  version "2.7.1"
-+  resolved "https://registry.yarnpkg.com/lolex/-/lolex-2.7.1.tgz#e40a8c4d1f14b536aa03e42a537c7adbaf0c20be"
-+
- long@^3.2.0:
-   version "3.2.0"
-   resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b"
-@@ -4886,6 +5092,10 @@
-   version "1.33.0"
-   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
- 
-+mime-db@~1.35.0:
-+  version "1.35.0"
-+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.35.0.tgz#0569d657466491283709663ad379a99b90d9ab47"
-+
- mime-types@^2.1.12, mime-types@~2.1.15, mime-types@~2.1.16, mime-types@~2.1.17, mime-types@~2.1.7:
-   version "2.1.17"
-   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
-@@ -4898,6 +5108,12 @@
-   dependencies:
-     mime-db "~1.33.0"
- 
-+mime-types@~2.1.19:
-+  version "2.1.19"
-+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.19.tgz#71e464537a7ef81c15f2db9d97e913fc0ff606f0"
-+  dependencies:
-+    mime-db "~1.35.0"
-+
- mime@1.4.1:
-   version "1.4.1"
-   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
-@@ -5102,12 +5318,26 @@
-   version "1.0.4"
-   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.4.tgz#d93962f6c52f2c1558c0fbda6d512819f1efe1c4"
- 
-+nise@^1.4.2:
-+  version "1.4.2"
-+  resolved "https://registry.yarnpkg.com/nise/-/nise-1.4.2.tgz#a9a3800e3994994af9e452333d549d60f72b8e8c"
-+  dependencies:
-+    "@sinonjs/formatio" "^2.0.0"
-+    just-extend "^1.1.27"
-+    lolex "^2.3.2"
-+    path-to-regexp "^1.7.0"
-+    text-encoding "^0.6.4"
-+
- no-case@^2.2.0:
-   version "2.3.2"
-   resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac"
-   dependencies:
-     lower-case "^1.1.1"
- 
-+node-fetch@^2.2.0:
-+  version "2.2.0"
-+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.2.0.tgz#4ee79bde909262f9775f731e3656d0db55ced5b5"
-+
- node-gyp@^3.3.1:
-   version "3.6.2"
-   resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.6.2.tgz#9bfbe54562286284838e750eac05295853fa1c60"
-@@ -5162,6 +5392,34 @@
-     util "^0.10.3"
-     vm-browserify "0.0.4"
- 
-+node-libs-browser@^2.1.0:
-+  version "2.1.0"
-+  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.1.0.tgz#5f94263d404f6e44767d726901fff05478d600df"
-+  dependencies:
-+    assert "^1.1.1"
-+    browserify-zlib "^0.2.0"
-+    buffer "^4.3.0"
-+    console-browserify "^1.1.0"
-+    constants-browserify "^1.0.0"
-+    crypto-browserify "^3.11.0"
-+    domain-browser "^1.1.1"
-+    events "^1.0.0"
-+    https-browserify "^1.0.0"
-+    os-browserify "^0.3.0"
-+    path-browserify "0.0.0"
-+    process "^0.11.10"
-+    punycode "^1.2.4"
-+    querystring-es3 "^0.2.0"
-+    readable-stream "^2.3.3"
-+    stream-browserify "^2.0.1"
-+    stream-http "^2.7.2"
-+    string_decoder "^1.0.0"
-+    timers-browserify "^2.0.4"
-+    tty-browserify "0.0.0"
-+    url "^0.11.0"
-+    util "^0.10.3"
-+    vm-browserify "0.0.4"
-+
- node-pre-gyp@^0.9.0:
-   version "0.9.1"
-   resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.9.1.tgz#f11c07516dd92f87199dbc7e1838eab7cd56c9e0"
-@@ -5311,10 +5569,18 @@
-   version "1.0.1"
-   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
- 
-+nwsapi@^2.0.7:
-+  version "2.0.8"
-+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.0.8.tgz#e3603579b7e162b3dbedae4fb24e46f771d8fa24"
-+
- oauth-sign@~0.8.1, oauth-sign@~0.8.2:
-   version "0.8.2"
-   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
- 
-+oauth-sign@~0.9.0:
-+  version "0.9.0"
-+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
-+
- object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
-   version "4.1.1"
-   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-@@ -5389,7 +5655,7 @@
-     minimist "~0.0.1"
-     wordwrap "~0.0.2"
- 
--optionator@^0.8.2:
-+optionator@^0.8.1, optionator@^0.8.2:
-   version "0.8.2"
-   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
-   dependencies:
-@@ -5404,6 +5670,10 @@
-   version "0.2.1"
-   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.2.1.tgz#63fc4ccee5d2d7763d26bbf8601078e6c2e0044f"
- 
-+os-browserify@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
-+
- os-homedir@^1.0.0:
-   version "1.0.2"
-   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-@@ -5476,6 +5746,10 @@
-   version "0.2.9"
-   resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
- 
-+pako@~1.0.5:
-+  version "1.0.6"
-+  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
-+
- parallel-transform@^1.1.0:
-   version "1.1.0"
-   resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz#d410f065b05da23081fcd10f28854c29bda33b06"
-@@ -5535,6 +5809,10 @@
-   dependencies:
-     error-ex "^1.2.0"
- 
-+parse5@4.0.0:
-+  version "4.0.0"
-+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
-+
- parseurl@~1.3.2:
-   version "1.3.2"
-   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
-@@ -5581,6 +5859,12 @@
-   version "0.1.7"
-   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
- 
-+path-to-regexp@^1.7.0:
-+  version "1.7.0"
-+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d"
-+  dependencies:
-+    isarray "0.0.1"
-+
- path-type@^1.0.0:
-   version "1.1.0"
-   resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
-@@ -5691,6 +5975,10 @@
-   version "7.0.0"
-   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
- 
-+pn@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
-+
- posix-character-classes@^0.1.0:
-   version "0.1.1"
-   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
-@@ -5979,7 +6267,7 @@
-   version "2.0.0"
-   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
- 
--process@^0.11.0:
-+process@^0.11.0, process@^0.11.10:
-   version "0.11.10"
-   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
- 
-@@ -6041,6 +6329,10 @@
-   version "1.0.2"
-   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
- 
-+psl@^1.1.24:
-+  version "1.1.29"
-+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67"
-+
- public-encrypt@^4.0.0:
-   version "4.0.0"
-   resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.0.tgz#39f699f3a46560dd5ebacbca693caf7c65c18cc6"
-@@ -6094,6 +6386,10 @@
-   version "6.4.0"
-   resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
- 
-+qs@~6.5.2:
-+  version "6.5.2"
-+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
-+
- query-string@^4.1.0:
-   version "4.3.4"
-   resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
-@@ -6209,7 +6505,7 @@
-     normalize-package-data "^2.3.2"
-     path-type "^2.0.0"
- 
--"readable-stream@1 || 2", readable-stream@^2.0.4, readable-stream@^2.1.5:
-+"readable-stream@1 || 2", readable-stream@^2.0.4, readable-stream@^2.1.5, readable-stream@^2.3.3, readable-stream@^2.3.6:
-   version "2.3.6"
-   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
-   dependencies:
-@@ -6403,6 +6699,20 @@
-   dependencies:
-     throttleit "^1.0.0"
- 
-+request-promise-core@1.1.1:
-+  version "1.1.1"
-+  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.1.tgz#3eee00b2c5aa83239cfb04c5700da36f81cd08b6"
-+  dependencies:
-+    lodash "^4.13.1"
-+
-+request-promise-native@^1.0.5:
-+  version "1.0.5"
-+  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.5.tgz#5281770f68e0c9719e5163fd3fab482215f4fda5"
-+  dependencies:
-+    request-promise-core "1.1.1"
-+    stealthy-require "^1.1.0"
-+    tough-cookie ">=2.3.3"
-+
- request@2, request@^2.45.0, request@^2.72.0, request@^2.79.0, request@^2.81.0:
-   version "2.83.0"
-   resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
-@@ -6430,6 +6740,31 @@
-     tunnel-agent "^0.6.0"
-     uuid "^3.1.0"
- 
-+request@^2.87.0:
-+  version "2.88.0"
-+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
-+  dependencies:
-+    aws-sign2 "~0.7.0"
-+    aws4 "^1.8.0"
-+    caseless "~0.12.0"
-+    combined-stream "~1.0.6"
-+    extend "~3.0.2"
-+    forever-agent "~0.6.1"
-+    form-data "~2.3.2"
-+    har-validator "~5.1.0"
-+    http-signature "~1.2.0"
-+    is-typedarray "~1.0.0"
-+    isstream "~0.1.2"
-+    json-stringify-safe "~5.0.1"
-+    mime-types "~2.1.19"
-+    oauth-sign "~0.9.0"
-+    performance-now "^2.1.0"
-+    qs "~6.5.2"
-+    safe-buffer "^5.1.2"
-+    tough-cookie "~2.4.3"
-+    tunnel-agent "^0.6.0"
-+    uuid "^3.3.2"
-+
- request@~2.79.0:
-   version "2.79.0"
-   resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
-@@ -6526,6 +6861,18 @@
-   version "0.1.15"
-   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
- 
-+rewiremock@^3.7.7:
-+  version "3.7.7"
-+  resolved "https://registry.yarnpkg.com/rewiremock/-/rewiremock-3.7.7.tgz#a3ce37f9cd8131329e3ddf9f7708147d5cb86524"
-+  dependencies:
-+    compare-module-exports "^2.0.0"
-+    lodash.some "^4.6.0"
-+    lodash.template "^4.4.0"
-+    node-libs-browser "^2.1.0"
-+    path-parse "^1.0.5"
-+    wipe-node-cache "^1.1.0"
-+    wipe-webpack-cache "^1.0.3"
-+
- rgb2hex@~0.1.0:
-   version "0.1.0"
-   resolved "https://registry.yarnpkg.com/rgb2hex/-/rgb2hex-0.1.0.tgz#ccd55f860ae0c5c4ea37504b958e442d8d12325b"
-@@ -6591,6 +6938,10 @@
-   version "2.1.2"
-   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
- 
-+samsam@1.3.0:
-+  version "1.3.0"
-+  resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.3.0.tgz#8d1d9350e25622da30de3e44ba692b5221ab7c50"
-+
- sanitize-filename@^1.6.0, sanitize-filename@^1.6.1:
-   version "1.6.1"
-   resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.1.tgz#612da1c96473fa02dccda92dcd5b4ab164a6772a"
-@@ -6797,6 +7148,20 @@
-   dependencies:
-     string-width "^1.0.1"
- 
-+sinon@^6.1.5:
-+  version "6.1.5"
-+  resolved "https://registry.yarnpkg.com/sinon/-/sinon-6.1.5.tgz#41451502d43cd5ffb9d051fbf507952400e81d09"
-+  dependencies:
-+    "@sinonjs/commons" "^1.0.1"
-+    "@sinonjs/formatio" "^2.0.0"
-+    "@sinonjs/samsam" "^2.0.0"
-+    diff "^3.5.0"
-+    lodash.get "^4.4.2"
-+    lolex "^2.7.1"
-+    nise "^1.4.2"
-+    supports-color "^5.4.0"
-+    type-detect "^4.0.8"
-+
- slash@^1.0.0:
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
-@@ -7019,6 +7384,10 @@
-   dependencies:
-     readable-stream "^2.0.1"
- 
-+stealthy-require@^1.1.0:
-+  version "1.1.1"
-+  resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
-+
- stream-browserify@^2.0.1:
-   version "2.0.1"
-   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
-@@ -7043,6 +7412,25 @@
-     to-arraybuffer "^1.0.0"
-     xtend "^4.0.0"
- 
-+<<<<<<< .our
-+=======
-+stream-http@^2.7.2:
-+  version "2.8.3"
-+  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
-+  dependencies:
-+    builtin-status-codes "^3.0.0"
-+    inherits "^2.0.1"
-+    readable-stream "^2.3.6"
-+    to-arraybuffer "^1.0.0"
-+    xtend "^4.0.0"
-+
-+stream-json@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/stream-json/-/stream-json-1.1.0.tgz#0a91e84e3cfb017f2446d9023025694982c99e89"
-+  dependencies:
-+    stream-chain "^2.0.3"
-+
-+>>>>>>> .their
- stream-shift@^1.0.0:
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
-@@ -7080,15 +7468,15 @@
-   version "0.10.31"
-   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
- 
--string_decoder@~1.0.3:
--  version "1.0.3"
--  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
-+string_decoder@^1.0.0, string_decoder@~1.1.1:
-+  version "1.1.1"
-+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-   dependencies:
-     safe-buffer "~5.1.0"
- 
--string_decoder@~1.1.1:
--  version "1.1.1"
--  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-+string_decoder@~1.0.3:
-+  version "1.0.3"
-+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
-   dependencies:
-     safe-buffer "~5.1.0"
- 
-@@ -7178,7 +7566,7 @@
-   dependencies:
-     has-flag "^2.0.0"
- 
--supports-color@^5.3.0:
-+supports-color@^5.3.0, supports-color@^5.4.0:
-   version "5.4.0"
-   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
-   dependencies:
-@@ -7200,6 +7588,10 @@
-   version "1.0.1"
-   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4"
- 
-+symbol-tree@^3.2.2:
-+  version "3.2.2"
-+  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
-+
- table@^4.0.3:
-   version "4.0.3"
-   resolved "https://registry.yarnpkg.com/table/-/table-4.0.3.tgz#00b5e2b602f1794b9acaf9ca908a76386a7813bc"
-@@ -7266,6 +7658,10 @@
-   dependencies:
-     execa "^0.7.0"
- 
-+text-encoding@^0.6.4:
-+  version "0.6.4"
-+  resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.6.4.tgz#e399a982257a276dae428bb92845cb71bdc26d19"
-+
- text-table@^0.2.0:
-   version "0.2.0"
-   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
-@@ -7306,6 +7702,12 @@
-   dependencies:
-     setimmediate "^1.0.4"
- 
-+timers-browserify@^2.0.4:
-+  version "2.0.10"
-+  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.10.tgz#1d28e3d2aadf1d5a5996c4e9f95601cd053480ae"
-+  dependencies:
-+    setimmediate "^1.0.4"
-+
- tmp@0.0.28:
-   version "0.0.28"
-   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.28.tgz#172735b7f614ea7af39664fa84cf0de4e515d120"
-@@ -7382,12 +7784,25 @@
-   dependencies:
-     nopt "~1.0.10"
- 
-+tough-cookie@>=2.3.3, tough-cookie@^2.3.4, tough-cookie@~2.4.3:
-+  version "2.4.3"
-+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
-+  dependencies:
-+    psl "^1.1.24"
-+    punycode "^1.4.1"
-+
- tough-cookie@~2.3.0, tough-cookie@~2.3.3:
-   version "2.3.3"
-   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561"
-   dependencies:
-     punycode "^1.4.1"
- 
-+tr46@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
-+  dependencies:
-+    punycode "^2.1.0"
-+
- "traverse@>=0.3.0 <0.4":
-   version "0.3.9"
-   resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.3.9.tgz#717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9"
-@@ -7416,9 +7831,36 @@
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.0.tgz#027b69fa823225e551cace3ef03b11f6ab37c1d7"
- 
-+<<<<<<< .our
- ts-node@^7.0.0:
-   version "7.0.0"
-   resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-7.0.0.tgz#a94a13c75e5e1aa6b82814b84c68deb339ba7bff"
-+=======
-+ts-mocha@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/ts-mocha/-/ts-mocha-2.0.0.tgz#0dbd3cd04671df9933b9303b4aa46347573c5635"
-+  dependencies:
-+    ts-node "7.0.0"
-+  optionalDependencies:
-+    tsconfig-paths "^3.5.0"
-+
-+ts-node@7.0.0:
-+  version "7.0.0"
-+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-7.0.0.tgz#a94a13c75e5e1aa6b82814b84c68deb339ba7bff"
-+  dependencies:
-+    arrify "^1.0.0"
-+    buffer-from "^1.1.0"
-+    diff "^3.1.0"
-+    make-error "^1.1.1"
-+    minimist "^1.2.0"
-+    mkdirp "^0.5.1"
-+    source-map-support "^0.5.6"
-+    yn "^2.0.0"
-+
-+ts-node@^5.0.1:
-+  version "5.0.1"
-+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-5.0.1.tgz#78e5d1cb3f704de1b641e43b76be2d4094f06f81"
-+>>>>>>> .their
-   dependencies:
-     arrify "^1.0.0"
-     buffer-from "^1.1.0"
-@@ -7429,6 +7871,16 @@
-     source-map-support "^0.5.6"
-     yn "^2.0.0"
- 
-+tsconfig-paths@^3.5.0:
-+  version "3.5.0"
-+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.5.0.tgz#a447c7721e49281af97343d9a850864e949a0b51"
-+  dependencies:
-+    "@types/json5" "^0.0.29"
-+    deepmerge "^2.0.1"
-+    json5 "^1.0.1"
-+    minimist "^1.2.0"
-+    strip-bom "^3.0.0"
-+
- tslib@^1.7.1:
-   version "1.8.0"
-   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.8.0.tgz#dc604ebad64bcbf696d613da6c954aa0e7ea1eb6"
-@@ -7512,6 +7964,10 @@
-   dependencies:
-     prelude-ls "~1.1.2"
- 
-+type-detect@4.0.8, type-detect@^4.0.8:
-+  version "4.0.8"
-+  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
-+
- type-detect@^4.0.0:
-   version "4.0.3"
-   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.3.tgz#0e3f2670b44099b0b46c284d136a7ef49c74c2ea"
-@@ -7752,6 +8208,10 @@
-   version "3.1.0"
-   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
- 
-+uuid@^3.3.2:
-+  version "3.3.2"
-+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
-+
- validate-npm-package-license@^3.0.1:
-   version "3.0.1"
-   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"
-@@ -7785,6 +8245,12 @@
-   dependencies:
-     indexof "0.0.1"
- 
-+w3c-hr-time@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz#82ac2bff63d950ea9e3189a58a65625fedf19045"
-+  dependencies:
-+    browser-process-hrtime "^0.1.2"
-+
- walkdir@^0.0.11:
-   version "0.0.11"
-   resolved "https://registry.yarnpkg.com/walkdir/-/walkdir-0.0.11.tgz#a16d025eb931bd03b52f308caed0f40fcebe9532"
-@@ -7838,6 +8304,10 @@
-     wdio-dot-reporter "~0.0.8"
-     wgxpath "~1.0.0"
- 
-+webidl-conversions@^4.0.2:
-+  version "4.0.2"
-+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
-+
- webpack-bundle-analyzer@^2.13.0:
-   version "2.13.0"
-   resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.13.0.tgz#8d7db44c3d4844bc911890998e1110514cf12264"
-@@ -7936,6 +8406,24 @@
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/wgxpath/-/wgxpath-1.0.0.tgz#eef8a4b9d558cc495ad3a9a2b751597ecd9af690"
- 
-+whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3:
-+  version "1.0.4"
-+  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.4.tgz#63fb016b7435b795d9025632c086a5209dbd2621"
-+  dependencies:
-+    iconv-lite "0.4.23"
-+
-+whatwg-mimetype@^2.0.0, whatwg-mimetype@^2.1.0:
-+  version "2.1.0"
-+  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.1.0.tgz#f0f21d76cbba72362eb609dbed2a30cd17fcc7d4"
-+
-+whatwg-url@^6.4.0, whatwg-url@^6.4.1:
-+  version "6.5.0"
-+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.5.0.tgz#f2df02bff176fd65070df74ad5ccbb5a199965a8"
-+  dependencies:
-+    lodash.sortby "^4.7.0"
-+    tr46 "^1.0.1"
-+    webidl-conversions "^4.0.2"
-+
- whet.extend@~0.9.9:
-   version "0.9.9"
-   resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"
-@@ -7983,6 +8471,14 @@
-     isstream "0.1.x"
-     stack-trace "0.0.x"
- 
-+wipe-node-cache@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/wipe-node-cache/-/wipe-node-cache-1.1.0.tgz#cd407904d81f0a76e536a9376ed1b82800dc837c"
-+
-+wipe-webpack-cache@^1.0.3:
-+  version "1.0.3"
-+  resolved "https://registry.yarnpkg.com/wipe-webpack-cache/-/wipe-webpack-cache-1.0.3.tgz#cac81dbba9223d14b46fb88e5e56f5eaa70a8776"
-+
- wordwrap@~0.0.2:
-   version "0.0.3"
-   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
-@@ -8036,6 +8532,12 @@
-     async-limiter "~1.0.0"
-     safe-buffer "~5.1.0"
- 
-+ws@^5.2.0:
-+  version "5.2.2"
-+  resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.2.tgz#dffef14866b8e8dc9133582514d1befaf96e980f"
-+  dependencies:
-+    async-limiter "~1.0.0"
-+
- xdg-basedir@^3.0.0:
-   version "3.0.0"
-   resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"
-@@ -8044,6 +8546,10 @@
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/xml-char-classes/-/xml-char-classes-1.0.0.tgz#64657848a20ffc5df583a42ad8a277b4512bbc4d"
- 
-+xml-name-validator@^3.0.0:
-+  version "3.0.0"
-+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
-+
- xml2js@0.4.17:
-   version "0.4.17"
-   resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.17.tgz#17be93eaae3f3b779359c795b419705a8817e868"
diff --git a/app/test/fixtures/merge-parser/desktop/valid-merge-master-into-script-upgrade.txt b/app/test/fixtures/merge-parser/desktop/valid-merge-master-into-script-upgrade.txt
deleted file mode 100644
index 682e9872f4f..00000000000
--- a/app/test/fixtures/merge-parser/desktop/valid-merge-master-into-script-upgrade.txt
+++ /dev/null
@@ -1,903 +0,0 @@
-merged
-  result 100644 b5349c7c5e60dd396af3a4977b0684bcd69d7cfe app/package.json
-  our    100644 530138f765a7c89ac3e0b31cc78047926364323a app/package.json
-@@ -3,7 +3,7 @@
-   "productName": "GitHub Desktop",
-   "bundleID": "com.github.GitHubClient",
-   "companyName": "GitHub, Inc.",
--  "version": "1.1.2-beta6",
-+  "version": "1.1.2-beta7",
-   "main": "./main.js",
-   "repository": {
-     "type": "git",
-merged
-  result 100644 2f9cf6d58beb7abf74b241c52c4deed1155c7e98 app/src/lib/app-state.ts
-  our    100644 5382e869682845ac92aee17c4ebcb0609749ab88 app/src/lib/app-state.ts
-@@ -318,11 +318,18 @@
-   | { type: FoldoutType.AddMenu }
-   | AppMenuFoldout
- 
--export enum RepositorySection {
-+export enum RepositorySectionTab {
-   Changes,
-   History,
- }
- 
-+export type RepositorySection =
-+  | { selectedTab: RepositorySectionTab.Changes }
-+  | {
-+      selectedTab: RepositorySectionTab.History
-+      shouldFocusBranchList?: boolean
-+    }
-+
- export interface IRepositoryState {
-   readonly historyState: IHistoryState
-   readonly changesState: IChangesState
-merged
-  result 100644 22b6ea7eef95cb48385e88add7643839925d07c4 app/src/lib/menu-update.ts
-  our    100644 3db472be9c029edd019dbe29d8dfebda25fdb6e3 app/src/lib/menu-update.ts
-@@ -104,7 +104,7 @@
-   'update-branch',
-   'merge-branch',
-   'view-repository-on-github',
--  'compare-branch',
-+  'compare-on-github',
-   'open-in-shell',
-   'push',
-   'pull',
-@@ -200,6 +200,7 @@
-     'show-history',
-     'show-branches-list',
-     'open-external-editor',
-+    'compare-to-branch',
-   ]
- 
-   const menuStateBuilder = new MenuStateBuilder()
-@@ -227,7 +228,7 @@
-     )
-     menuStateBuilder.setEnabled('merge-branch', onBranch)
-     menuStateBuilder.setEnabled(
--      'compare-branch',
-+      'compare-on-github',
-       isHostedOnGitHub && hasPublishedBranch
-     )
- 
-@@ -278,10 +279,10 @@
-     menuStateBuilder.disable('delete-branch')
-     menuStateBuilder.disable('update-branch')
-     menuStateBuilder.disable('merge-branch')
--    menuStateBuilder.disable('compare-branch')
- 
-     menuStateBuilder.disable('push')
-     menuStateBuilder.disable('pull')
-+    menuStateBuilder.disable('compare-to-branch')
-   }
-   return menuStateBuilder
- }
-merged
-  result 100644 4cee841bc4c314fa326fcd00d2a037b661073822 app/src/lib/stores/app-store.ts
-  our    100644 3664497681402ef660531130f999ac3e39892b4d app/src/lib/stores/app-store.ts
-@@ -3,7 +3,7 @@
-   IRepositoryState,
-   IHistoryState,
-   IAppState,
--  RepositorySection,
-+  RepositorySectionTab,
-   IChangesState,
-   Popup,
-   PopupType,
-@@ -23,6 +23,7 @@
-   CompareActionKind,
-   IDisplayHistory,
-   ICompareBranch,
-+  RepositorySection,
- } from '../app-state'
- import { Account } from '../../models/account'
- import { Repository } from '../../models/repository'
-@@ -421,7 +422,7 @@
-         coAuthors: [],
-         showCoAuthoredBy: false,
-       },
--      selectedSection: RepositorySection.Changes,
-+      selectedSection: { selectedTab: RepositorySectionTab.Changes },
-       branchesState: {
-         tip: { kind: TipState.Unknown },
-         defaultBranch: null,
-@@ -1486,9 +1487,9 @@
-     this.updateRepositoryState(repository, state => ({ selectedSection }))
-     this.emitUpdate()
- 
--    if (selectedSection === RepositorySection.History) {
-+    if (selectedSection.selectedTab === RepositorySectionTab.History) {
-       return this.refreshHistorySection(repository)
--    } else if (selectedSection === RepositorySection.Changes) {
-+    } else if (selectedSection.selectedTab === RepositorySectionTab.Changes) {
-       return this.refreshChangesSection(repository, {
-         includingStatus: true,
-         clearPartialState: false,
-@@ -1728,9 +1729,9 @@
-     const section = state.selectedSection
-     let refreshSectionPromise: Promise<void>
- 
--    if (section === RepositorySection.History) {
-+    if (section.selectedTab === RepositorySectionTab.History) {
-       refreshSectionPromise = this.refreshHistorySection(repository)
--    } else if (section === RepositorySection.Changes) {
-+    } else if (section.selectedTab === RepositorySectionTab.Changes) {
-       refreshSectionPromise = this.refreshChangesSection(repository, {
-         includingStatus: false,
-         clearPartialState: false,
-merged
-  result 100644 dff54e1df436eca06f803e56a2c700192a68c1cf app/src/main-process/menu/build-default-menu.ts
-  our    100644 f73c46b1ab5a571eba85dca0885ad2caf0d05e0d app/src/main-process/menu/build-default-menu.ts
-@@ -6,6 +6,7 @@
- 
- import { log } from '../log'
- import { openDirectorySafe } from '../shell'
-+import { enableCompareSidebar } from '../../lib/feature-flag'
- 
- const defaultEditorLabel = __DARWIN__
-   ? 'Open in External Editor'
-@@ -289,6 +290,13 @@
-         click: emit('update-branch'),
-       },
-       {
-+        label: __DARWIN__ ? 'Compare to Branch' : '&Compare to branch',
-+        id: 'compare-to-branch',
-+        accelerator: 'CmdOrCtrl+Shift+B',
-+        click: emit('compare-to-branch'),
-+        visible: enableCompareSidebar(),
-+      },
-+      {
-         label: __DARWIN__
-           ? 'Merge Into Current Branch…'
-           : '&Merge into current branch…',
-@@ -298,10 +306,10 @@
-       },
-       separator,
-       {
--        label: __DARWIN__ ? 'Compare on GitHub' : '&Compare on GitHub',
--        id: 'compare-branch',
-+        label: __DARWIN__ ? 'Compare on GitHub' : 'Compare on &GitHub',
-+        id: 'compare-on-github',
-         accelerator: 'CmdOrCtrl+Shift+C',
--        click: emit('compare-branch'),
-+        click: emit('compare-on-github'),
-       },
-       {
-         label: pullRequestLabel,
-merged
-  result 100644 8cc13deea5f3f8d74873101c9081ecbe276096a8 app/src/main-process/menu/menu-event.ts
-  our    100644 8e175de4d092b861c197b0cc4ac15be0e32a406f app/src/main-process/menu/menu-event.ts
-@@ -14,10 +14,11 @@
-   | 'choose-repository'
-   | 'open-working-directory'
-   | 'update-branch'
-+  | 'compare-to-branch'
-   | 'merge-branch'
-   | 'show-repository-settings'
-   | 'open-in-shell'
--  | 'compare-branch'
-+  | 'compare-on-github'
-   | 'view-repository-on-github'
-   | 'clone-repository'
-   | 'show-about'
-merged
-  result 100644 b920b03154f5bd06aee18172e0dcdb18d5bfe473 app/src/main-process/menu/menu-ids.ts
-  our    100644 5b579fb99a93d40f063d3a027effd7171e24584d app/src/main-process/menu/menu-ids.ts
-@@ -5,7 +5,7 @@
-   | 'update-branch'
-   | 'merge-branch'
-   | 'view-repository-on-github'
--  | 'compare-branch'
-+  | 'compare-on-github'
-   | 'open-in-shell'
-   | 'push'
-   | 'pull'
-@@ -25,3 +25,4 @@
-   | 'clone-repository'
-   | 'about'
-   | 'create-pull-request'
-+  | 'compare-to-branch'
-merged
-  result 100644 f16d51fe525218882768fff0889dc5f8079e04b3 app/src/ui/app.tsx
-  our    100644 c80c3d7daa71f7643b743afb65e5d6fa4297adfe app/src/ui/app.tsx
-@@ -4,7 +4,7 @@
- 
- import {
-   IAppState,
--  RepositorySection,
-+  RepositorySectionTab,
-   Popup,
-   PopupType,
-   FoldoutType,
-@@ -270,6 +270,9 @@
-         this.props.dispatcher.recordMenuInitiatedUpdate()
-         return this.updateBranch()
-       }
-+      case 'compare-to-branch': {
-+        return this.showHistory(true)
-+      }
-       case 'merge-branch': {
-         this.props.dispatcher.recordMenuInitiatedMerge()
-         return this.mergeBranch()
-@@ -278,8 +281,8 @@
-         return this.showRepositorySettings()
-       case 'view-repository-on-github':
-         return this.viewRepositoryOnGitHub()
--      case 'compare-branch':
--        return this.compareBranch()
-+      case 'compare-on-github':
-+        return this.compareBranchOnDotcom()
-       case 'open-in-shell':
-         return this.openCurrentRepositoryInShell()
-       case 'clone-repository':
-@@ -385,7 +388,7 @@
-     })
-   }
- 
--  private compareBranch() {
-+  private compareBranchOnDotcom() {
-     const htmlURL = this.getCurrentRepositoryGitHubURL()
-     if (!htmlURL) {
-       return
-@@ -486,30 +489,30 @@
-     this.props.dispatcher.showPopup({ type: PopupType.About })
-   }
- 
--  private createCommit() {
-+  private showHistory(shouldFocusBranchList: boolean = false) {
-     const state = this.state.selectedState
-     if (state == null || state.type !== SelectionType.Repository) {
-       return
-     }
- 
-     this.props.dispatcher.closeCurrentFoldout()
--    this.props.dispatcher.changeRepositorySection(
--      state.repository,
--      RepositorySection.Changes
--    )
-+
-+    this.props.dispatcher.changeRepositorySection(state.repository, {
-+      selectedTab: RepositorySectionTab.History,
-+      shouldFocusBranchList,
-+    })
-   }
- 
--  private showHistory() {
-+  private createCommit() {
-     const state = this.state.selectedState
-     if (state == null || state.type !== SelectionType.Repository) {
-       return
-     }
- 
-     this.props.dispatcher.closeCurrentFoldout()
--    this.props.dispatcher.changeRepositorySection(
--      state.repository,
--      RepositorySection.History
--    )
-+    this.props.dispatcher.changeRepositorySection(state.repository, {
-+      selectedTab: RepositorySectionTab.Changes,
-+    })
-   }
- 
-   private chooseRepository() {
-merged
-  result 100644 5767695ddcbb64acdff6868a158f8ee6f1ae7795 app/src/ui/branches/branch-list-item.tsx
-  our    100644 5ce11ddd900487909cec10cb7abff7d498a3ecac app/src/ui/branches/branch-list-item.tsx
-@@ -1,12 +1,19 @@
- import * as React from 'react'
- import * as moment from 'moment'
-+import * as classNames from 'classnames'
- 
--import { Octicon, OcticonSymbol } from '../octicons'
-+import { Branch } from '../../models/branch'
-+
-+import { IMenuItem } from '../../lib/menu-item'
- import { HighlightText } from '../lib/highlight-text'
- 
-+import { showContextualMenu } from '../main-process-proxy'
-+import { Octicon, OcticonSymbol } from '../octicons'
-+import { enableCompareSidebar } from '../../lib/feature-flag'
-+
- interface IBranchListItemProps {
-   /** The name of the branch */
--  readonly name: string
-+  readonly branch: Branch
- 
-   /** Specifies whether this item is currently selected */
-   readonly isCurrentBranch: boolean
-@@ -16,29 +23,84 @@
- 
-   /** The characters in the branch name to highlight */
-   readonly matches: ReadonlyArray<number>
--}
- 
-+  /**
-+   * Callback to fire when the user wants to compare to this branch.
-+   *
-+   * If this is not specified, kebab element will not be rendered.
-+   */
-+  readonly onCompareToBranch?: (branch: Branch) => void
-+}
- /** The branch component. */
- export class BranchListItem extends React.Component<IBranchListItemProps, {}> {
-+  private onContextMenu = (event: React.MouseEvent<any>) => {
-+    event.preventDefault()
-+    event.stopPropagation()
-+
-+    const items: IMenuItem[] = [
-+      {
-+        label: 'Compare to this branch',
-+        action: () => {
-+          if (this.props.onCompareToBranch) {
-+            this.props.onCompareToBranch(this.props.branch)
-+          }
-+        },
-+      },
-+    ]
-+
-+    showContextualMenu(items)
-+  }
-+
-+  private renderKebab = (lastCommitDate: Date | null, infoTitle: string) => {
-+    if (this.props.onCompareToBranch == null) {
-+      return null
-+    }
-+
-+    if (!enableCompareSidebar()) {
-+      return null
-+    }
-+
-+    return (
-+      <div className="branches-list-item-menu" title={infoTitle}>
-+        <div className="branch-menu-wrapper" onClick={this.onContextMenu}>
-+          <Octicon symbol={OcticonSymbol.kebabHorizontal} />
-+        </div>
-+      </div>
-+    )
-+  }
-+
-   public render() {
-     const lastCommitDate = this.props.lastCommitDate
-     const isCurrentBranch = this.props.isCurrentBranch
--    const name = this.props.name
-+    const name = this.props.branch.name
- 
-     const date = lastCommitDate ? moment(lastCommitDate).fromNow() : ''
-     const icon = isCurrentBranch ? OcticonSymbol.check : OcticonSymbol.gitBranch
-     const infoTitle = isCurrentBranch
-       ? 'Current branch'
-       : lastCommitDate ? lastCommitDate.toString() : ''
-+
-+    const enableKebabEffect =
-+      enableCompareSidebar() &&
-+      !isCurrentBranch &&
-+      this.props.onCompareToBranch != null
-+
-+    const className = classNames('branches-list-item', {
-+      'kebab-effect': enableKebabEffect,
-+    })
-+
-     return (
--      <div className="branches-list-item">
-+      <div className={className}>
-         <Octicon className="icon" symbol={icon} />
-         <div className="name" title={name}>
-           <HighlightText text={name} highlight={this.props.matches} />
-         </div>
-+
-         <div className="description" title={infoTitle}>
-           {date}
-         </div>
-+
-+        {this.renderKebab(lastCommitDate, infoTitle)}
-       </div>
-     )
-   }
-merged
-  result 100644 292ba973e860f3355a07d5e065c48375de1c310b app/src/ui/branches/branch-renderer.tsx
-  our    100644 f42659ed79888d2c70f22251464d169c46333d83 app/src/ui/branches/branch-renderer.tsx
-@@ -8,17 +8,19 @@
- export function renderDefaultBranch(
-   item: IBranchListItem,
-   matches: ReadonlyArray<number>,
--  currentBranch: Branch | null
-+  currentBranch: Branch | null,
-+  onCompareToBranch?: (branch: Branch) => void
- ): JSX.Element {
-   const branch = item.branch
-   const commit = branch.tip
-   const currentBranchName = currentBranch ? currentBranch.name : null
-   return (
-     <BranchListItem
--      name={branch.name}
-+      branch={branch}
-       isCurrentBranch={branch.name === currentBranchName}
-       lastCommitDate={commit ? commit.author.date : null}
-       matches={matches}
-+      onCompareToBranch={onCompareToBranch}
-     />
-   )
- }
-merged
-  result 100644 5d911045738fda18f7ba387bee8506a1636956bc app/src/ui/branches/branches-container.tsx
-  our    100644 f08de18102ffb24add928e0ce726b0a8fdd7457b app/src/ui/branches/branches-container.tsx
-@@ -7,7 +7,13 @@
- import { BranchesTab } from '../../models/branches-tab'
- 
- import { Dispatcher } from '../../lib/dispatcher'
--import { FoldoutType, PopupType } from '../../lib/app-state'
-+import {
-+  FoldoutType,
-+  PopupType,
-+  CompareActionKind,
-+  ComparisonView,
-+  RepositorySectionTab,
-+} from '../../lib/app-state'
- import { assertNever } from '../../lib/fatal-error'
- 
- import { TabBar } from '../tab-bar'
-@@ -97,11 +103,28 @@
-     )
-   }
- 
-+  private onCompareToBranch = async (branch: Branch) => {
-+    await this.props.dispatcher.initializeCompare(this.props.repository, {
-+      kind: CompareActionKind.Branch,
-+      branch,
-+      mode: ComparisonView.Behind,
-+    })
-+    await this.props.dispatcher.changeRepositorySection(this.props.repository, {
-+      selectedTab: RepositorySectionTab.History,
-+    })
-+    await this.props.dispatcher.closeFoldout(FoldoutType.Branch)
-+  }
-+
-   private renderBranch = (
-     item: IBranchListItem,
-     matches: ReadonlyArray<number>
-   ) => {
--    return renderDefaultBranch(item, matches, this.props.currentBranch)
-+    return renderDefaultBranch(
-+      item,
-+      matches,
-+      this.props.currentBranch,
-+      this.onCompareToBranch
-+    )
-   }
- 
-   private renderSelectedTab() {
-merged
-  result 100644 7847e0708feff2e0a3104e0f98840da2944919df app/src/ui/history/compare.tsx
-  our    100644 353aec44fd01563221794684d9c30fa54019686d app/src/ui/history/compare.tsx
-@@ -33,6 +33,11 @@
-   readonly dispatcher: Dispatcher
-   readonly currentBranch: Branch | null
-   readonly sidebarHasFocusWithin: boolean
-+
-+  /**
-+   * Shows the branch list when the component is loaded
-+   */
-+  readonly initialShowBranchList: boolean
-   readonly onRevertCommit: (commit: Commit) => void
-   readonly onViewCommitOnGitHub: (sha: string) => void
- }
-@@ -63,10 +68,17 @@
-   public constructor(props: ICompareSidebarProps) {
-     super(props)
- 
-+    const formState = props.compareState.formState
-+
-+    const filterText =
-+      formState.kind === ComparisonView.None
-+        ? ''
-+        : formState.comparisonBranch.name
-+
-     this.state = {
-       focusedBranch: null,
--      filterText: '',
--      showBranchList: false,
-+      filterText,
-+      showBranchList: props.initialShowBranchList,
-       selectedCommit: null,
-     }
-   }
-@@ -84,7 +96,7 @@
-       return
-     }
- 
--    if (!hasFormStateChanged && newFormState.kind !== ComparisonView.None) {
-+    if (newFormState.kind !== ComparisonView.None) {
-       // ensure the filter text is in sync with the comparison branch
-       const branch = newFormState.comparisonBranch
- 
-@@ -132,6 +144,7 @@
-             onRef={this.onTextBoxRef}
-             onValueChanged={this.onBranchFilterTextChanged}
-             onKeyDown={this.onBranchFilterKeyDown}
-+            onSearchCleared={this.onSearchCleared}
-           />
-         </div>
- 
-@@ -142,6 +155,10 @@
-     )
-   }
- 
-+  private onSearchCleared = () => {
-+    this.handleEscape()
-+  }
-+
-   private onBranchesListRef = (branchList: BranchList | null) => {
-     this.branchList = branchList
-   }
-@@ -273,7 +290,8 @@
-         <div className="merge-message">
-           This will merge
-           <strong>{` ${count} ${pluralized}`}</strong>
--          {` `}from{` `}
-+          <br />
-+          from{` `}
-           <strong>{branch.name}</strong>
-           {` `}into{` `}
-           <strong>{currentBranch.name}</strong>
-merged
-  result 100644 ad88a9b7996ea014994a13b187e2752d883ef61a app/src/ui/index.tsx
-  our    100644 e09719d3d34c3169bd68c26a84f6b7040c4d34a1 app/src/ui/index.tsx
-@@ -50,6 +50,7 @@
-   enableSourceMaps,
-   withSourceMappedStack,
- } from '../lib/source-map-support'
-+import { enableCompareSidebar } from '../lib/feature-flag'
- 
- if (__DEV__) {
-   installDevGlobals()
-@@ -139,7 +140,9 @@
- dispatcher.registerErrorHandler(upstreamAlreadyExistsHandler)
- dispatcher.registerErrorHandler(externalEditorErrorHandler)
- dispatcher.registerErrorHandler(openShellErrorHandler)
--dispatcher.registerErrorHandler(mergeConflictHandler)
-+if (enableCompareSidebar()) {
-+  dispatcher.registerErrorHandler(mergeConflictHandler)
-+}
- dispatcher.registerErrorHandler(lfsAttributeMismatchHandler)
- dispatcher.registerErrorHandler(gitAuthenticationErrorHandler)
- dispatcher.registerErrorHandler(pushNeedsPullHandler)
-merged
-  result 100644 7e0e709f0e2c042f8e122480dc6f4a05460633d4 app/src/ui/lib/fancy-text-box.tsx
-  our    100644 6df9115db9a0aeacd505b2fb8240433391229e3c app/src/ui/lib/fancy-text-box.tsx
-@@ -47,6 +47,7 @@
-           placeholder={this.props.placeholder}
-           onKeyDown={this.props.onKeyDown}
-           onValueChanged={this.props.onValueChanged}
-+          onSearchCleared={this.props.onSearchCleared}
-           tabIndex={this.props.tabIndex}
-           ref={this.props.onRef}
-         />
-merged
-  result 100644 a7340d5ff2ec3d5eb79dfe531a6dbce60eb7ab03 app/src/ui/lib/filter-list.tsx
-  our    100644 77cee6a28a6f7a75649844e1af52c5598547e633 app/src/ui/lib/filter-list.tsx
-@@ -244,19 +244,25 @@
-   }
- 
-   public selectFirstItem(focus: boolean = false) {
--    if (this.list !== null) {
--      const next = findNextSelectableRow(this.state.rows.length, {
-+    if (this.list === null) {
-+      return
-+    }
-+
-+    const next = findNextSelectableRow(
-+      this.state.rows.length,
-+      {
-         direction: 'down',
-         row: -1,
--      })
--
--      if (next !== null) {
--        this.setState({ selectedRow: next })
--      }
-+      },
-+      this.canSelectRow
-+    )
- 
--      if (focus) {
--        this.list.focus()
--      }
-+    if (next !== null) {
-+      this.setState({ selectedRow: next }, () => {
-+        if (focus && this.list !== null) {
-+          this.list.focus()
-+        }
-+      })
-     }
-   }
- 
-merged
-  result 100644 d99f339f0d967a2ba0f2d644345ead21bc38e5ba app/src/ui/lib/text-box.tsx
-  our    100644 66bfac13bd43aaa38cac461cd0a48bd47c66fa29 app/src/ui/lib/text-box.tsx
-@@ -84,6 +84,11 @@
-    * Callback used when the component loses focus.
-    */
-   readonly onBlur?: () => void
-+
-+  /**
-+   * Callback used when the user has cleared the search text.
-+   */
-+  readonly onSearchCleared?: () => void
- }
- 
- interface ITextBoxState {
-@@ -162,8 +167,33 @@
-     })
-   }
- 
-+  private onSearchTextCleared = () => {
-+    if (this.props.onSearchCleared != null) {
-+      this.props.onSearchCleared()
-+    }
-+  }
-+
-+  /**
-+   * The search event here is a Chrome and Safari specific event that is
-+   * only reported for input[type=search] elements.
-+   *
-+   * Source: http://help.dottoro.com/ljdvxmhr.php
-+   *
-+   * TODO: can we hook into the warning API of React to report on incorrect usage
-+   * when you set a `onSearchCleared` callback prop but don't use a `type=search`
-+   * input - because this won't set an event handler.
-+   *
-+   */
-   private onInputRef = (element: HTMLInputElement | null) => {
-+    if (this.inputElement != null && this.props.type === 'search') {
-+      this.inputElement.removeEventListener('search', this.onSearchTextCleared)
-+    }
-+
-     this.inputElement = element
-+
-+    if (this.inputElement != null && this.props.type === 'search') {
-+      this.inputElement.addEventListener('search', this.onSearchTextCleared)
-+    }
-   }
- 
-   private renderLabelLink() {
-merged
-  result 100644 a3b6556013c00f4521932e03bf32044fc404eb9c app/src/ui/merge-conflicts/merge-conflicts-warning.tsx
-  our    100644 fc7cf8351657a4d7be73ce9248306c414d5ddbb3 app/src/ui/merge-conflicts/merge-conflicts-warning.tsx
-@@ -3,7 +3,7 @@
- import { ButtonGroup } from '../lib/button-group'
- import { Dialog, DialogContent, DialogFooter } from '../dialog'
- import { Dispatcher } from '../../lib/dispatcher'
--import { RepositorySection } from '../../lib/app-state'
-+import { RepositorySectionTab } from '../../lib/app-state'
- import { Repository } from '../../models/repository'
- 
- interface IMergeConflictsWarningProps {
-@@ -17,10 +17,9 @@
-   {}
- > {
-   private onSubmit = () => {
--    this.props.dispatcher.changeRepositorySection(
--      this.props.repository,
--      RepositorySection.Changes
--    )
-+    this.props.dispatcher.changeRepositorySection(this.props.repository, {
-+      selectedTab: RepositorySectionTab.Changes,
-+    })
-     this.props.onDismissed()
-   }
- 
-merged
-  result 100644 530e5ec3069faa47bceabedc36bce50656b2c4d3 app/src/ui/repository.tsx
-  our    100644 0148c3c16e7f2c3b26a1e7b674f3ceb6d438a34b app/src/ui/repository.tsx
-@@ -11,8 +11,9 @@
- import { TabBar } from './tab-bar'
- import {
-   IRepositoryState,
--  RepositorySection,
-+  RepositorySectionTab,
-   ImageDiffType,
-+  RepositorySection,
- } from '../lib/app-state'
- import { Dispatcher } from '../lib/dispatcher'
- import { IssuesStore, GitHubUserStore } from '../lib/stores'
-@@ -76,7 +77,8 @@
-     const hasChanges =
-       this.props.state.changesState.workingDirectory.files.length > 0
-     const selectedTab =
--      this.props.state.selectedSection === RepositorySection.Changes
-+      this.props.state.selectedSection.selectedTab ===
-+      RepositorySectionTab.Changes
-         ? Tab.Changes
-         : Tab.History
- 
-@@ -155,6 +157,11 @@
-   private renderCompareSidebar(): JSX.Element {
-     const tip = this.props.state.branchesState.tip
-     const currentBranch = tip.kind === TipState.Valid ? tip.branch : null
-+    const selectedSection = this.props.state.selectedSection
-+    const focusBranchSelector =
-+      selectedSection.selectedTab === RepositorySectionTab.History
-+        ? selectedSection.shouldFocusBranchList || false
-+        : false
- 
-     return (
-       <CompareSidebar
-@@ -169,6 +176,7 @@
-         onRevertCommit={this.onRevertCommit}
-         onViewCommitOnGitHub={this.props.onViewCommitOnGitHub}
-         sidebarHasFocusWithin={this.state.sidebarHasFocusWithin}
-+        initialShowBranchList={focusBranchSelector}
-       />
-     )
-   }
-@@ -176,9 +184,9 @@
-   private renderSidebarContents(): JSX.Element {
-     const selectedSection = this.props.state.selectedSection
- 
--    if (selectedSection === RepositorySection.Changes) {
-+    if (selectedSection.selectedTab === RepositorySectionTab.Changes) {
-       return this.renderChangesSidebar()
--    } else if (selectedSection === RepositorySection.History) {
-+    } else if (selectedSection.selectedTab === RepositorySectionTab.History) {
-       return enableCompareSidebar()
-         ? this.renderCompareSidebar()
-         : this.renderHistorySidebar()
-@@ -220,7 +228,7 @@
-   private renderContent(): JSX.Element | null {
-     const selectedSection = this.props.state.selectedSection
- 
--    if (selectedSection === RepositorySection.Changes) {
-+    if (selectedSection.selectedTab === RepositorySectionTab.Changes) {
-       const changesState = this.props.state.changesState
-       const selectedFileIDs = changesState.selectedFileIDs
- 
-@@ -252,7 +260,7 @@
-           />
-         )
-       }
--    } else if (selectedSection === RepositorySection.History) {
-+    } else if (selectedSection.selectedTab === RepositorySectionTab.History) {
-       return (
-         <History
-           repository={this.props.repository}
-@@ -290,10 +298,14 @@
-     // about the shift key here, we can get away with that as long
-     // as there's only two tabs.
-     if (e.ctrlKey && e.key === 'Tab') {
--      const section =
--        this.props.state.selectedSection === RepositorySection.History
--          ? RepositorySection.Changes
--          : RepositorySection.History
-+      const section: RepositorySection =
-+        this.props.state.selectedSection.selectedTab ===
-+        RepositorySectionTab.History
-+          ? { selectedTab: RepositorySectionTab.Changes }
-+          : {
-+              selectedTab: RepositorySectionTab.History,
-+              shouldFocusBranchList: false,
-+            }
- 
-       this.props.dispatcher.changeRepositorySection(
-         this.props.repository,
-@@ -304,10 +316,14 @@
-   }
- 
-   private onTabClicked = (tab: Tab) => {
--    const section =
-+    const section: RepositorySection =
-       tab === Tab.History
--        ? RepositorySection.History
--        : RepositorySection.Changes
-+        ? {
-+            selectedTab: RepositorySectionTab.History,
-+            shouldFocusBranchList: false,
-+          }
-+        : { selectedTab: RepositorySectionTab.Changes }
-+
-     this.props.dispatcher.changeRepositorySection(
-       this.props.repository,
-       section
-merged
-  result 100644 aa55a4afe2dbcf81388d5d4a68bbcef237edf516 app/styles/ui/_branches.scss
-  our    100644 8b437422d7971232a5209b075f6a7a4aac650780 app/styles/ui/_branches.scss
-@@ -190,15 +190,12 @@
- 
- .branches-list {
-   &-item {
--    padding: 0 var(--spacing);
--  }
--
--  &-item {
-     display: flex;
-     flex-direction: row;
-     min-width: 0;
-     flex-grow: 1;
-     align-items: center;
-+    padding: 0 var(--spacing);
- 
-     .icon {
-       margin-right: var(--spacing-half);
-@@ -221,6 +218,44 @@
-       }
-     }
- 
-+    .branches-list-item-menu {
-+      display: none;
-+    }
-+
-+    &.kebab-effect:hover {
-+      .description {
-+        display: none;
-+      }
-+
-+      .branches-list-item-menu {
-+        display: flex;
-+        flex-grow: 1;
-+        justify-content: flex-end;
-+      }
-+
-+      .branch-menu-wrapper {
-+        display: flex;
-+        margin: var(--spacing);
-+        margin-right: 0;
-+        padding: 0 var(--spacing);
-+        border-radius: var(--border-radius);
-+        transition: background 0.15s;
-+
-+        .octicon {
-+          fill: var(--text-secondary-color);
-+          transition: fill 0.15s;
-+        }
-+
-+        &:hover {
-+          background: rgba($gray-500, 0.2);
-+
-+          .octicon {
-+            fill: var(--text-color);
-+          }
-+        }
-+      }
-+    }
-+
-     .description {
-       margin-right: var(--spacing-half);
-       color: var(--text-secondary-color);
-merged
-  result 100644 ef1599638c6d327a99a8043a83e57cd9d102d41b app/test/unit/app-store-test.ts
-  our    100644 11161765e2eda88e549efb9ec50be911f6c76442 app/test/unit/app-store-test.ts
-@@ -28,7 +28,7 @@
- import { StatsStore } from '../../src/lib/stats'
- 
- import {
--  RepositorySection,
-+  RepositorySectionTab,
-   SelectionType,
-   IRepositoryState,
- } from '../../src/lib/app-state'
-@@ -131,10 +131,9 @@
- 
-       // select the repository and show the changes view
-       await appStore._selectRepository(repository)
--      await appStore._changeRepositorySection(
--        repository,
--        RepositorySection.Changes
--      )
-+      await appStore._changeRepositorySection(repository, {
-+        selectedTab: RepositorySectionTab.Changes,
-+      })
- 
-       let state = getAppState(appStore)
-       expect(state.localCommitSHAs.length).to.equal(1)
-merged
-  result 100644 c93e0568e69be37dc41420115d61f995f91b61ea changelog.json
-  our    100644 26d03c2e5abb64530a6274d877b1db7e9313236d changelog.json
-@@ -1,5 +1,7 @@
- {
-   "releases": {
-+    "1.1.2-beta7": [
-+    ],
-     "1.1.2-beta6": [
-       "[Added] Add MacVim support for macOS - #4532. Thanks @johnelliott!",
-       "[Fixed] Open in Shell on Linux ensures Git is available on the user's PATH - #4619. Thanks @ziggy42!",
diff --git a/app/test/fixtures/merge-parser/electron/merge-1-3-x-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-1-3-x-into-master.txt
deleted file mode 100644
index e70db3d1f9e..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-1-3-x-into-master.txt
+++ /dev/null
@@ -1,1599 +0,0 @@
-changed in both
-  base   100644 ef5ae30a840566e1f66ffb4e6e95b043275f95b3 atom/browser/native_window_views.cc
-  our    100644 0dba39942f92d54ba34db7709b73012055680d94 atom/browser/native_window_views.cc
-  their  100644 8e9e434d5a90dd446ec6615aaddc0ce2847a66ff atom/browser/native_window_views.cc
-@@ -99,11 +99,36 @@
- 
- }  // namespace
- 
-+<<<<<<< .our
- NativeWindowViews::NativeWindowViews(const mate::Dictionary& options,
-                                      NativeWindow* parent)
-     : NativeWindow(options, parent),
-       root_view_(new RootView(this)),
-       keyboard_event_handler_(new views::UnhandledKeyboardEventHandler) {
-+=======
-+NativeWindowViews::NativeWindowViews(
-+    brightray::InspectableWebContents* web_contents,
-+    const mate::Dictionary& options,
-+    NativeWindow* parent)
-+    : NativeWindow(web_contents, options, parent),
-+      window_(new views::Widget),
-+      web_view_(inspectable_web_contents()->GetView()->GetView()),
-+      menu_bar_autohide_(false),
-+      menu_bar_visible_(false),
-+      menu_bar_alt_pressed_(false),
-+#if defined(OS_WIN)
-+      checked_for_a11y_support_(false),
-+      thick_frame_(true),
-+#endif
-+      keyboard_event_handler_(new views::UnhandledKeyboardEventHandler),
-+      disable_count_(0),
-+      use_content_size_(false),
-+      movable_(true),
-+      resizable_(true),
-+      maximizable_(true),
-+      minimizable_(true),
-+      fullscreenable_(true) {
-+>>>>>>> .their
-   options.Get(options::kTitle, &title_);
- 
-   bool menu_bar_autohide;
-changed in both
-  base   100644 d0d45fc53594e07521c2cd1f89cfc17e618707d7 atom/browser/native_window_views.h
-  our    100644 ef1e4413ca879980e46f301bccd6c8fe2b1a4611 atom/browser/native_window_views.h
-  their  100644 6118e2f9e3732cdb255554aa14a1de73950384e4 atom/browser/native_window_views.h
-@@ -16,6 +16,8 @@
- #include "atom/browser/ui/win/message_handler_delegate.h"
- #include "atom/browser/ui/win/taskbar_host.h"
- #include "base/win/scoped_gdi_object.h"
-+#include "ui/base/win/accessibility_misc_utils.h"
-+#include <UIAutomationCoreApi.h>
- #endif
- 
- namespace views {
-@@ -241,7 +243,11 @@
-   TaskbarHost taskbar_host_;
- 
-   // Memoized version of a11y check
-+<<<<<<< .our
-   bool checked_for_a11y_support_ = false;
-+=======
-+  bool checked_for_a11y_support_;
-+>>>>>>> .their
- 
-   // Whether to show the WS_THICKFRAME style.
-   bool thick_frame_ = true;
-changed in both
-  base   100644 bb6d9858f04555598df6a4001ecae26b52dbee1f atom/browser/native_window_views_win.cc
-  our    100644 0e61d18b915924eb3d3d14e40d1cbbd199631bed atom/browser/native_window_views_win.cc
-  their  100644 85230addb0c1d50f8223fa994ea0fe37268e856c atom/browser/native_window_views_win.cc
-@@ -159,12 +159,20 @@
-     // because we still want Chromium to handle returning the actual
-     // accessibility object.
-     case WM_GETOBJECT: {
-+<<<<<<< .our
-       if (checked_for_a11y_support_)
-         return false;
- 
-       const DWORD obj_id = static_cast<DWORD>(l_param);
- 
-       if (obj_id != static_cast<DWORD>(OBJID_CLIENT)) {
-+=======
-+      if (checked_for_a11y_support_) return false;
-+
-+      const DWORD obj_id = static_cast<DWORD>(l_param);
-+
-+      if (obj_id != OBJID_CLIENT) {
-+>>>>>>> .their
-         return false;
-       }
- 
-@@ -174,7 +182,11 @@
- 
-       checked_for_a11y_support_ = true;
- 
-+<<<<<<< .our
-       auto* const axState = content::BrowserAccessibilityState::GetInstance();
-+=======
-+      const auto axState = content::BrowserAccessibilityState::GetInstance();
-+>>>>>>> .their
-       if (axState && !axState->IsAccessibleBrowser()) {
-         axState->OnScreenReaderDetected();
-         Browser::Get()->OnAccessibilitySupportChanged();
-changed in both
-  base   100644 bb9a9b5a6375fd5afd8df6df5be777437b43b59c atom/browser/resources/mac/Info.plist
-  our    100644 9094f0f7335edf833d51f688851e6a105de60433 atom/browser/resources/mac/Info.plist
-  their  100644 6c1509e3c0482ec44f943d7e2adea3826b1ad05b atom/browser/resources/mac/Info.plist
-@@ -17,9 +17,15 @@
-   <key>CFBundleIconFile</key>
-   <string>electron.icns</string>
-   <key>CFBundleVersion</key>
-+<<<<<<< .our
-   <string>4.0.0</string>
-   <key>CFBundleShortVersionString</key>
-   <string>4.0.0</string>
-+=======
-+  <string>1.3.15</string>
-+  <key>CFBundleShortVersionString</key>
-+  <string>1.3.15</string>
-+>>>>>>> .their
-   <key>LSApplicationCategoryType</key>
-   <string>public.app-category.developer-tools</string>
-   <key>LSMinimumSystemVersion</key>
-changed in both
-  base   100644 599d8b694994ea399e991e7aa85150c84c079785 atom/browser/resources/win/atom.rc
-  our    100644 c0bd831e8bddf10180f75cd40694831e2e98622d atom/browser/resources/win/atom.rc
-  their  100644 8b925d8fe7bf1d0a746432bd240b0b447ab2c5be atom/browser/resources/win/atom.rc
-@@ -56,8 +56,13 @@
- //
- 
- VS_VERSION_INFO VERSIONINFO
-+<<<<<<< .our
-  FILEVERSION 4,0,0,20180821
-  PRODUCTVERSION 4,0,0,20180821
-+=======
-+ FILEVERSION 1,3,15,0
-+ PRODUCTVERSION 1,3,15,0
-+>>>>>>> .their
-  FILEFLAGSMASK 0x3fL
- #ifdef _DEBUG
-  FILEFLAGS 0x1L
-@@ -74,12 +79,20 @@
-         BEGIN
-             VALUE "CompanyName", "GitHub, Inc."
-             VALUE "FileDescription", "Electron"
-+<<<<<<< .our
-             VALUE "FileVersion", "4.0.0"
-+=======
-+            VALUE "FileVersion", "1.3.15"
-+>>>>>>> .their
-             VALUE "InternalName", "electron.exe"
-             VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
-             VALUE "OriginalFilename", "electron.exe"
-             VALUE "ProductName", "Electron"
-+<<<<<<< .our
-             VALUE "ProductVersion", "4.0.0"
-+=======
-+            VALUE "ProductVersion", "1.3.15"
-+>>>>>>> .their
-             VALUE "SquirrelAwareVersion", "1"
-         END
-     END
-changed in both
-  base   100644 7b7655c6cd2e0661a45968636737f5ab3b70467f atom/common/api/atom_api_v8_util.cc
-  our    100644 3d80db0c0a4cdbb4c7a78fa7e4266fc6fc87193f atom/common/api/atom_api_v8_util.cc
-  their  100644 ddb1075586c1eefaad73789b42e124f00548d939 atom/common/api/atom_api_v8_util.cc
-@@ -94,6 +94,7 @@
-   isolate->GetHeapProfiler()->TakeHeapSnapshot();
- }
- 
-+<<<<<<< .our
- void RequestGarbageCollectionForTesting(v8::Isolate* isolate) {
-   isolate->RequestGarbageCollectionForTesting(
-       v8::Isolate::GarbageCollectionType::kFullGarbageCollection);
-@@ -107,6 +108,14 @@
-                 v8::Local<v8::Value> unused,
-                 v8::Local<v8::Context> context,
-                 void* priv) {
-+=======
-+bool IsSameOrigin(const GURL& l, const GURL& r) {
-+  return url::Origin(l).IsSameOriginWith(url::Origin(r));
-+}
-+
-+void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
-+                v8::Local<v8::Context> context, void* priv) {
-+>>>>>>> .their
-   mate::Dictionary dict(context->GetIsolate(), exports);
-   dict.SetMethod("getHiddenValue", &GetHiddenValue);
-   dict.SetMethod("setHiddenValue", &SetHiddenValue);
-@@ -116,11 +125,16 @@
-   dict.SetMethod("setRemoteCallbackFreer", &atom::RemoteCallbackFreer::BindTo);
-   dict.SetMethod("setRemoteObjectFreer", &atom::RemoteObjectFreer::BindTo);
-   dict.SetMethod("createIDWeakMap", &atom::api::KeyWeakMap<int32_t>::Create);
-+<<<<<<< .our
-   dict.SetMethod(
-       "createDoubleIDWeakMap",
-       &atom::api::KeyWeakMap<std::pair<std::string, int32_t>>::Create);
-   dict.SetMethod("requestGarbageCollectionForTesting",
-                  &RequestGarbageCollectionForTesting);
-+=======
-+  dict.SetMethod("createDoubleIDWeakMap",
-+                 &atom::api::KeyWeakMap<std::pair<int32_t, int32_t>>::Create);
-+>>>>>>> .their
-   dict.SetMethod("isSameOrigin", &IsSameOrigin);
- }
- 
-changed in both
-  base   100644 a27cb04a4b137f053065b935eab3e1fa6f537d70 atom/common/atom_version.h
-  our    100644 65e7d19911559a40b1b258319df5fe0fa180354f atom/common/atom_version.h
-  their  100644 94554df10c372f62787e459f3cd451eff54cf561 atom/common/atom_version.h
-@@ -5,10 +5,22 @@
- #ifndef ATOM_COMMON_ATOM_VERSION_H_
- #define ATOM_COMMON_ATOM_VERSION_H_
- 
-+<<<<<<< .our
- #define ATOM_MAJOR_VERSION 4
- #define ATOM_MINOR_VERSION 0
- #define ATOM_PATCH_VERSION 0
- #define ATOM_PRE_RELEASE_VERSION -nightly.20180821
-+=======
-+#define ATOM_MAJOR_VERSION 1
-+#define ATOM_MINOR_VERSION 3
-+#define ATOM_PATCH_VERSION 15
-+
-+#define ATOM_VERSION_IS_RELEASE 1
-+
-+#ifndef ATOM_TAG
-+# define ATOM_TAG ""
-+#endif
-+>>>>>>> .their
- 
- #ifndef ATOM_STRINGIFY
- #define ATOM_STRINGIFY(n) ATOM_STRINGIFY_HELPER(n)
-changed in both
-  base   100644 dd28ad7a97b3fc9d45428ca28b8c363d5d7b1339 atom/renderer/api/atom_api_web_frame.cc
-  our    100644 f0f7ef249d73876f7107d3d3865e8fc71ee33945 atom/renderer/api/atom_api_web_frame.cc
-  their  100644 8e6d1c15e1f35902963f0558d126077b15d272bf atom/renderer/api/atom_api_web_frame.cc
-@@ -179,12 +179,26 @@
- }
- 
- void WebFrame::SetVisualZoomLevelLimits(double min_level, double max_level) {
-+<<<<<<< .our
-   web_frame_->View()->SetDefaultPageScaleLimits(min_level, max_level);
-   web_frame_->View()->SetIgnoreViewportTagScaleLimits(true);
- }
- 
- void WebFrame::SetLayoutZoomLevelLimits(double min_level, double max_level) {
-   web_frame_->View()->ZoomLimitsChanged(min_level, max_level);
-+=======
-+  web_frame_->view()->setDefaultPageScaleLimits(min_level, max_level);
-+}
-+
-+void WebFrame::SetLayoutZoomLevelLimits(double min_level, double max_level) {
-+  web_frame_->view()->zoomLimitsChanged(min_level, max_level);
-+}
-+
-+v8::Local<v8::Value> WebFrame::RegisterEmbedderCustomElement(
-+    const base::string16& name, v8::Local<v8::Object> options) {
-+  blink::WebExceptionCode c = 0;
-+  return web_frame_->document().registerEmbedderCustomElement(name, options, c);
-+>>>>>>> .their
- }
- 
- v8::Local<v8::Value> WebFrame::RegisterEmbedderCustomElement(
-@@ -510,6 +524,7 @@
-                  &WebFrame::SetIsolatedWorldHumanReadableName)
-       .SetMethod("getResourceUsage", &WebFrame::GetResourceUsage)
-       .SetMethod("clearCache", &WebFrame::ClearCache)
-+<<<<<<< .our
-       .SetMethod("getFrameForSelector", &WebFrame::GetFrameForSelector)
-       .SetMethod("findFrameByName", &WebFrame::FindFrameByName)
-       .SetProperty("opener", &WebFrame::Opener)
-@@ -519,6 +534,10 @@
-       .SetProperty("nextSibling", &WebFrame::NextSibling)
-       .SetProperty("routingId", &WebFrame::RoutingId)
-       .SetMethod("findFrameByRoutingId", &WebFrame::FindFrameByRoutingId);
-+=======
-+      // TODO(kevinsawicki): Remove in 2.0, deprecate before then with warnings
-+      .SetMethod("setZoomLevelLimits", &WebFrame::SetVisualZoomLevelLimits);
-+>>>>>>> .their
- }
- 
- }  // namespace api
-changed in both
-  base   100644 7b2401dd4077b5e7a067b54dd2a4bead9f1d9ca3 atom/renderer/api/atom_api_web_frame.h
-  our    100644 4cc6386abcb41cfa29fdc002f6fb267329bb112d atom/renderer/api/atom_api_web_frame.h
-  their  100644 c2706708beab5bdc1fa5f98cfa11a306611100ad atom/renderer/api/atom_api_web_frame.h
-changed in both
-  base   100644 52eba31d0aee456320d7e64bb1d0671fb97d02a1 common.gypi
-  our    100644 676d1e904127066e4a3d313106f15406fcbed8b6 common.gypi
-  their  100644 61946656dd8432f337fff7af308e672aaf815ae2 common.gypi
-changed in both
-  base   100644 235c044c81e52314468ba1775f9fcaae7541962d docs/api/web-contents.md
-  our    100644 8990fe2e97ab62eafdd3f7a4eb8ee782415124c5 docs/api/web-contents.md
-  their  100644 016daa345fc636144eb830111ff499635d024c96 docs/api/web-contents.md
-@@ -873,6 +873,17 @@
- * `minimumLevel` Number
- * `maximumLevel` Number
- 
-+<<<<<<< .our
-+=======
-+**Deprecated:** Call `setVisualZoomLevelLimits` instead to set the visual zoom
-+level limits. This method will be removed in Electron 2.0.
-+
-+#### `contents.setVisualZoomLevelLimits(minimumLevel, maximumLevel)`
-+
-+* `minimumLevel` Number
-+* `maximumLevel` Number
-+
-+>>>>>>> .their
- Sets the maximum and minimum pinch-to-zoom level.
- 
- #### `contents.setLayoutZoomLevelLimits(minimumLevel, maximumLevel)`
-changed in both
-  base   100644 8a0e1dd6a9b1b4f83b30701d3b8e05e049d6a56b docs/api/web-frame.md
-  our    100644 989060ef3e50c5d93db1a914997f1d190edf3cf5 docs/api/web-frame.md
-  their  100644 062c3310d5d1f879ee5ace8b0e672f8fb7910df5 docs/api/web-frame.md
-@@ -55,6 +55,24 @@
- * `minimumLevel` Number
- * `maximumLevel` Number
- 
-+<<<<<<< .our
-+=======
-+**Deprecated:** Call `setVisualZoomLevelLimits` instead to set the visual zoom
-+level limits. This method will be removed in Electron 2.0.
-+
-+### `webFrame.setVisualZoomLevelLimits(minimumLevel, maximumLevel)`
-+
-+* `minimumLevel` Number
-+* `maximumLevel` Number
-+
-+Sets the maximum and minimum pinch-to-zoom level.
-+
-+### `webFrame.setLayoutZoomLevelLimits(minimumLevel, maximumLevel)`
-+
-+* `minimumLevel` Number
-+* `maximumLevel` Number
-+
-+>>>>>>> .their
- Sets the maximum and minimum layout-based (i.e. non-visual) zoom level.
- 
- ### `webFrame.setSpellCheckProvider(language, autoCorrectWord, provider)`
-removed in local
-  base   100644 896fd07000b38da3e7df62464670a8a65ac53868 docs/tutorial/planned-breaking-changes.md
-  their  100644 525ffecb81702a2fbd9d6152ba247decf85b39fe docs/tutorial/planned-breaking-changes.md
-changed in both
-  base   100644 6cf495afbc1fde1ef313db9834170084c131b31d electron.gyp
-  our    100644 944ddab2a3fd879044e31677e4bac2843fffbdee electron.gyp
-  their  100644 26793815ace126ff4f0bef84af4c1c786b3cd8b3 electron.gyp
-@@ -4,8 +4,12 @@
-     'product_name%': 'Electron',
-     'company_name%': 'GitHub, Inc',
-     'company_abbr%': 'github',
-+<<<<<<< .our
-     'version%': '4.0.0-nightly.20180821',
-     'js2c_input_dir': '<(SHARED_INTERMEDIATE_DIR)/js2c',
-+=======
-+    'version%': '1.3.15',
-+>>>>>>> .their
-   },
-   'includes': [
-     'features.gypi',
-@@ -371,9 +375,13 @@
-               '-lcomdlg32.lib',
-               '-lwininet.lib',
-               '-lwinmm.lib',
-+<<<<<<< .our
-               '-lcrypt32.lib',
-               '-luiautomationcore.lib',
-               '-lPropsys.lib'
-+=======
-+              '-luiautomationcore.lib',
-+>>>>>>> .their
-             ],
-           },
-           'dependencies': [
-changed in both
-  base   100644 c6ad57321baacf5277cfef75e7f1e5683dacbcc4 lib/browser/api/app.js
-  our    100644 66f6ae651acf10fb19b8ec068fc5280850dd3d91 lib/browser/api/app.js
-  their  100644 8e7760593bde28502b681a1f71703979098e2790 lib/browser/api/app.js
-changed in both
-  base   100644 ecfdda05f8db327ffc7c846136126d072848a6eb lib/browser/api/browser-window.js
-  our    100644 cb523496d65c7018c30054621cfdeb1281f9db6a lib/browser/api/browser-window.js
-  their  100644 703fdcbfb450ce850e5ad8f7319eed355312e065 lib/browser/api/browser-window.js
-@@ -217,9 +217,12 @@
-   },
-   capturePage (...args) {
-     return this.webContents.capturePage(...args)
-+<<<<<<< .our
-   },
-   setTouchBar (touchBar) {
-     electron.TouchBar._setOnWindow(touchBar, this)
-+=======
-+>>>>>>> .their
-   }
- })
- 
-changed in both
-  base   100644 d24a1f98a7d8c27a9cec0c00d9fdb4553dd3d90f lib/browser/api/dialog.js
-  our    100644 d7545a7687a6c168a79c09c9e7866af05d336d12 lib/browser/api/dialog.js
-  their  100644 5002c18b150e0574d03215f331172e6d6609109b lib/browser/api/dialog.js
-@@ -73,9 +73,13 @@
- module.exports = {
-   showOpenDialog: function (...args) {
-     checkAppInitialized()
-+<<<<<<< .our
- 
-     let [window, options, callback] = parseArgs(...args)
- 
-+=======
-+    let [window, options, callback] = parseArgs(...args)
-+>>>>>>> .their
-     if (options == null) {
-       options = {
-         title: 'Open',
-@@ -136,9 +140,13 @@
- 
-   showSaveDialog: function (...args) {
-     checkAppInitialized()
-+<<<<<<< .our
- 
-     let [window, options, callback] = parseArgs(...args)
- 
-+=======
-+    let [window, options, callback] = parseArgs(...args)
-+>>>>>>> .their
-     if (options == null) {
-       options = {
-         title: 'Save'
-@@ -194,9 +202,13 @@
- 
-   showMessageBox: function (...args) {
-     checkAppInitialized()
-+<<<<<<< .our
- 
-     let [window, options, callback] = parseArgs(...args)
- 
-+=======
-+    let [window, options, callback] = parseArgs(...args)
-+>>>>>>> .their
-     if (options == null) {
-       options = {
-         type: 'none'
-@@ -281,6 +293,7 @@
- 
-   showErrorBox: function (...args) {
-     return binding.showErrorBox(...args)
-+<<<<<<< .our
-   },
- 
-   showCertificateTrustDialog: function (...args) {
-@@ -302,6 +315,8 @@
-     }
- 
-     return binding.showCertificateTrustDialog(window, certificate, message, callback)
-+=======
-+>>>>>>> .their
-   }
- }
- 
-changed in both
-  base   100644 33ce779521fa4dd869872733405529662e1818c0 lib/browser/api/navigation-controller.js
-  our    100644 7eb21ddb3ea9c8bcec994e2fc8bcbcf6be4b82f0 lib/browser/api/navigation-controller.js
-  their  100644 0bccf0c6dcc5b70048566bf008fcfa41969f2610 lib/browser/api/navigation-controller.js
-changed in both
-  base   100644 560b323d619bcdc9a8b842b4cd771125f0640d3a lib/browser/api/web-contents.js
-  our    100644 8f5bd037b14d05db7396bb8b5de1a29fdef167ae lib/browser/api/web-contents.js
-  their  100644 53c6c0f15ff9fad632dbe4bcbaa38b7ec52772c6 lib/browser/api/web-contents.js
-@@ -109,7 +109,19 @@
-   'insertCSS',
-   'insertText',
-   'setLayoutZoomLevelLimits',
-+<<<<<<< .our
-   'setVisualZoomLevelLimits'
-+=======
-+  'setVisualZoomLevelLimits',
-+  'setZoomFactor',
-+  'setZoomLevel',
-+  // TODO(kevinsawicki): Remove in 2.0, deprecate before then with warnings
-+  'setZoomLevelLimits'
-+]
-+const webFrameMethodsWithResult = [
-+  'getZoomFactor',
-+  'getZoomLevel'
-+>>>>>>> .their
- ]
- const webFrameMethodsWithResult = []
- 
-@@ -313,6 +325,16 @@
-     this.reload()
-   })
- 
-+<<<<<<< .our
-+=======
-+  // Delays the page-title-updated event to next tick.
-+  this.on('-page-title-updated', function (...args) {
-+    setImmediate(() => {
-+      this.emit('page-title-updated', ...args)
-+    })
-+  })
-+
-+>>>>>>> .their
-   app.emit('web-contents-created', {}, this)
- }
- 
-changed in both
-  base   100644 776ab91fec96619f04fbd4cff2d27a6dde736096 lib/browser/guest-window-manager.js
-  our    100644 7253c1942b0956ae6b9b0c80a23470fc26669b8a lib/browser/guest-window-manager.js
-  their  100644 7e8bf2e5652cf6c88e8d3d7e8b248f791b91009c lib/browser/guest-window-manager.js
-@@ -2,7 +2,10 @@
- 
- const {BrowserWindow, ipcMain, webContents} = require('electron')
- const {isSameOrigin} = process.atomBinding('v8_util')
-+<<<<<<< .our
- const parseFeaturesString = require('../common/parse-features-string')
-+=======
-+>>>>>>> .their
- 
- const hasProp = {}.hasOwnProperty
- const frameToGuest = new Map()
-@@ -102,6 +105,7 @@
-   return guestId
- }
- 
-+<<<<<<< .our
- // Create a new guest created by |embedder| with |options|.
- const createGuest = function (embedder, url, referrer, frameName, options, postData) {
-   let guest = frameToGuest.get(frameName)
-@@ -158,6 +162,8 @@
-   return setupGuest(embedder, frameName, guest, options)
- }
- 
-+=======
-+>>>>>>> .their
- const getGuestWindow = function (guestContents) {
-   let guestWindow = BrowserWindow.fromWebContents(guestContents)
-   if (guestWindow == null) {
-@@ -180,6 +186,7 @@
- // The W3C does not have anything on this, but from my understanding of the
- // security model of |window.opener|, this should be fine.
- const canAccessWindow = function (sender, target) {
-+<<<<<<< .our
-   return (target.getLastWebPreferences().openerId === sender.id) ||
-          (sender.getLastWebPreferences().nodeIntegration === true) ||
-          isSameOrigin(sender.getURL(), target.getURL())
-@@ -254,6 +261,15 @@
- ipcMain.on('ELECTRON_GUEST_WINDOW_MANAGER_INTERNAL_WINDOW_OPEN', function (event, url, referrer,
-                                                                   frameName, disposition, options,
-                                                                   additionalFeatures, postData) {
-+=======
-+  return (target.getWebPreferences().openerId === sender.id) ||
-+         (sender.getWebPreferences().nodeIntegration === true) ||
-+         isSameOrigin(sender.getURL(), target.getURL())
-+}
-+
-+// Routed window.open messages.
-+ipcMain.on('ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_OPEN', function (event, url, frameName, disposition, options) {
-+>>>>>>> .their
-   options = mergeBrowserWindowOptions(event.sender, options)
-   event.sender.emit('new-window', event, url, frameName, disposition, options, additionalFeatures, referrer)
-   const {newGuest} = event
-@@ -318,7 +334,11 @@
-   // The W3C does not seem to have word on how postMessage should work when the
-   // origins do not match, so we do not do |canAccessWindow| check here since
-   // postMessage across origins is useful and not harmful.
-+<<<<<<< .our
-   if (targetOrigin === '*' || isSameOrigin(guestContents.getURL(), targetOrigin)) {
-+=======
-+  if (guestContents.getURL().indexOf(targetOrigin) === 0 || targetOrigin === '*') {
-+>>>>>>> .their
-     const sourceId = event.sender.id
-     guestContents.send('ELECTRON_GUEST_WINDOW_POSTMESSAGE', sourceId, message, sourceOrigin)
-   }
-changed in both
-  base   100644 fb1688d0cc74a75b3299768d79df625893591a24 lib/browser/init.js
-  our    100644 bed3d912ab8be3ca4f21de04e801bb42dc12a528 lib/browser/init.js
-  their  100644 56d4f0f7ae7599339ae979c5ad9231a5948b8e4d lib/browser/init.js
-changed in both
-  base   100644 1917c65e655836872e72cf1588bbaeedf4b2a099 lib/browser/objects-registry.js
-  our    100644 f03a23d2f6910d6555bb9469180d1b60b94bc313 lib/browser/objects-registry.js
-  their  100644 b26374219f4530ad8d50ecc326b9d2ca5257900c lib/browser/objects-registry.js
-@@ -26,11 +26,19 @@
-     const id = this.saveToStorage(obj)
- 
-     // Add object to the set of referenced objects.
-+<<<<<<< .our
-     const ownerKey = getOwnerKey(webContents, contextId)
-     let owner = this.owners[ownerKey]
-     if (!owner) {
-       owner = this.owners[ownerKey] = new Set()
-       this.registerDeleteListener(webContents, contextId)
-+=======
-+    const webContentsId = webContents.getId()
-+    let owner = this.owners[webContentsId]
-+    if (!owner) {
-+      owner = this.owners[webContentsId] = new Set()
-+      this.registerDeleteListener(webContents, webContentsId)
-+>>>>>>> .their
-     }
-     if (!owner.has(id)) {
-       owner.add(id)
-@@ -101,6 +109,7 @@
-     }
-   }
- 
-+<<<<<<< .our
-   // Private: Clear the storage when renderer process is destroyed.
-   registerDeleteListener (webContents, contextId) {
-     const processId = webContents.getProcessId()
-@@ -108,6 +117,14 @@
-       if (deletedProcessId === processId) {
-         webContents.removeListener('render-view-deleted', listener)
-         this.clear(webContents, contextId)
-+=======
-+  // Private: Clear the storage when webContents is reloaded/navigated.
-+  registerDeleteListener (webContents, webContentsId) {
-+    const listener = (event, deletedProcessId) => {
-+      if (deletedProcessId === webContentsId) {
-+        webContents.removeListener('render-view-deleted', listener)
-+        this.clear(webContentsId)
-+>>>>>>> .their
-       }
-     }
-     webContents.on('render-view-deleted', listener)
-changed in both
-  base   100644 31e5a37732c709cf7843756b0f96d1d558a6babf lib/browser/rpc-server.js
-  our    100644 ff9f77321de3a4145946b67f3fe2a597f98e2510 lib/browser/rpc-server.js
-  their  100644 06e6f3be87c2b23bfd56d25022bd5814fa9e4b2c lib/browser/rpc-server.js
-@@ -431,6 +431,7 @@
-   }
- })
- 
-+<<<<<<< .our
- // Implements window.close()
- ipcMain.on('ELECTRON_BROWSER_WINDOW_CLOSE', function (event) {
-   const window = event.sender.getOwnerBrowserWindow()
-@@ -463,3 +464,35 @@
-     }
-   }
- })
-+=======
-+// Implements window.alert(message, title)
-+ipcMain.on('ELECTRON_BROWSER_WINDOW_ALERT', function (event, message, title) {
-+  if (message == null) message = ''
-+  if (title == null) title = ''
-+
-+  event.returnValue = electron.dialog.showMessageBox(event.sender.getOwnerBrowserWindow(), {
-+    message: `${message}`,
-+    title: `${title}`,
-+    buttons: ['OK']
-+  })
-+})
-+
-+// Implements window.confirm(message, title)
-+ipcMain.on('ELECTRON_BROWSER_WINDOW_CONFIRM', function (event, message, title) {
-+  if (message == null) message = ''
-+  if (title == null) title = ''
-+
-+  event.returnValue = !electron.dialog.showMessageBox(event.sender.getOwnerBrowserWindow(), {
-+    message: `${message}`,
-+    title: `${title}`,
-+    buttons: ['OK', 'Cancel'],
-+    cancelId: 1
-+  })
-+})
-+
-+// Implements window.close()
-+ipcMain.on('ELECTRON_BROWSER_WINDOW_CLOSE', function (event) {
-+  event.sender.getOwnerBrowserWindow().close()
-+  event.returnValue = null
-+})
-+>>>>>>> .their
-changed in both
-  base   100644 459c392bc1888bda82a666eec21d0bb56162374a lib/common/api/callbacks-registry.js
-  our    100644 6a1c63b20413753eeb9c5f8d190a9f5d2f303d22 lib/common/api/callbacks-registry.js
-  their  100644 126694d154e47e848cb0783975272c912ea81537 lib/common/api/callbacks-registry.js
-@@ -40,7 +40,12 @@
-   }
- 
-   get (id) {
-+<<<<<<< .our
-     return this.callbacks[id] || function () {}
-+=======
-+    var ref
-+    return (ref = this.callbacks[id]) != null ? ref : function () {}
-+>>>>>>> .their
-   }
- 
-   apply (id, ...args) {
-changed in both
-  base   100644 0ffd97a7c53967ac8e2f547228b72a6a05f81d75 lib/common/init.js
-  our    100644 b424768414b857b485bd5e29bfce504de6f1d749 lib/common/init.js
-  their  100644 127e5e337eb0b41993df960346014fe9222cc894 lib/common/init.js
-@@ -1,7 +1,21 @@
- const timers = require('timers')
- const util = require('util')
- 
-+<<<<<<< .our
- process.atomBinding = require('./atom-binding-setup')(process.binding, process.type)
-+=======
-+const {binding} = process
-+
-+process.atomBinding = function (name) {
-+  try {
-+    return binding('atom_' + process.type + '_' + name)
-+  } catch (error) {
-+    if (/No such module/.test(error.message)) {
-+      return binding('atom_common_' + name)
-+    }
-+  }
-+}
-+>>>>>>> .their
- 
- // setImmediate and process.nextTick makes use of uv_check and uv_prepare to
- // run the callbacks, however since we only run uv loop on requests, the
-changed in both
-  base   100644 a3a4443413d32d46a57f4a9667f7b5c0b86abcdb lib/renderer/api/remote.js
-  our    100644 59117f8f2dd977fc1817a6b1d540b616ddcb0dae lib/renderer/api/remote.js
-  their  100644 c3c8e3b89cd1458c6cfae6940bd9ff8ea54e3605 lib/renderer/api/remote.js
-@@ -104,7 +104,11 @@
- // Populate object's members from descriptors.
- // The |ref| will be kept referenced by |members|.
- // This matches |getObjectMemebers| in rpc-server.
-+<<<<<<< .our
- function setObjectMembers (ref, object, metaId, members) {
-+=======
-+const setObjectMembers = function (ref, object, metaId, members) {
-+>>>>>>> .their
-   if (!Array.isArray(members)) return
- 
-   for (let member of members) {
-@@ -113,11 +117,22 @@
-     let descriptor = { enumerable: member.enumerable }
-     if (member.type === 'method') {
-       const remoteMemberFunction = function (...args) {
-+<<<<<<< .our
-         let command
-         if (this && this.constructor === remoteMemberFunction) {
-           command = 'ELECTRON_BROWSER_MEMBER_CONSTRUCTOR'
-         } else {
-           command = 'ELECTRON_BROWSER_MEMBER_CALL'
-+=======
-+        if (this && this.constructor === remoteMemberFunction) {
-+          // Constructor call.
-+          let ret = ipcRenderer.sendSync('ELECTRON_BROWSER_MEMBER_CONSTRUCTOR', metaId, member.name, wrapArgs(args))
-+          return metaToValue(ret)
-+        } else {
-+          // Call member function.
-+          let ret = ipcRenderer.sendSync('ELECTRON_BROWSER_MEMBER_CALL', metaId, member.name, wrapArgs(args))
-+          return metaToValue(ret)
-+>>>>>>> .their
-         }
-         const ret = ipcRenderer.sendSync(command, contextId, metaId, member.name, wrapArgs(args))
-         return metaToValue(ret)
-@@ -208,6 +223,7 @@
- }
- 
- // Convert meta data from browser into real value.
-+<<<<<<< .our
- function metaToValue (meta) {
-   const types = {
-     value: () => meta.value,
-@@ -218,6 +234,56 @@
-     date: () => new Date(meta.value),
-     exception: () => { throw metaToException(meta) }
-   }
-+=======
-+const metaToValue = function (meta) {
-+  var el, i, len, ref1, results, ret
-+  switch (meta.type) {
-+    case 'value':
-+      return meta.value
-+    case 'array':
-+      ref1 = meta.members
-+      results = []
-+      for (i = 0, len = ref1.length; i < len; i++) {
-+        el = ref1[i]
-+        results.push(metaToValue(el))
-+      }
-+      return results
-+    case 'buffer':
-+      return Buffer.from(meta.value)
-+    case 'promise':
-+      return Promise.resolve({
-+        then: metaToValue(meta.then)
-+      })
-+    case 'error':
-+      return metaToPlainObject(meta)
-+    case 'date':
-+      return new Date(meta.value)
-+    case 'exception':
-+      throw new Error(meta.message + '\n' + meta.stack)
-+    default:
-+      if (remoteObjectCache.has(meta.id)) return remoteObjectCache.get(meta.id)
-+
-+      if (meta.type === 'function') {
-+        // A shadow class to represent the remote function object.
-+        let remoteFunction = function (...args) {
-+          if (this && this.constructor === remoteFunction) {
-+            // Constructor call.
-+            let obj = ipcRenderer.sendSync('ELECTRON_BROWSER_CONSTRUCTOR', meta.id, wrapArgs(args))
-+            // Returning object in constructor will replace constructed object
-+            // with the returned object.
-+            // http://stackoverflow.com/questions/1978049/what-values-can-a-constructor-return-to-avoid-returning-this
-+            return metaToValue(obj)
-+          } else {
-+            // Function call.
-+            let obj = ipcRenderer.sendSync('ELECTRON_BROWSER_FUNCTION_CALL', meta.id, wrapArgs(args))
-+            return metaToValue(obj)
-+          }
-+        }
-+        ret = remoteFunction
-+      } else {
-+        ret = {}
-+      }
-+>>>>>>> .their
- 
-   if (meta.type in types) {
-     return types[meta.type]()
-changed in both
-  base   100644 2356a81dda2ef366a22837825eb847aa8bcfdc3b lib/renderer/init.js
-  our    100644 2470a5e8be80e770b0c03f6a439a71e72ae12a1b lib/renderer/init.js
-  their  100644 5cee59059a2c1c9c736b77c55ecf0ebe772ff80b lib/renderer/init.js
-@@ -26,6 +26,7 @@
- 
- // Use electron module after everything is ready.
- 
-+<<<<<<< .our
- const {
-   warnAboutNodeWithRemoteContent,
-   warnAboutDisabledWebSecurity,
-@@ -39,6 +40,23 @@
- } = require('./security-warnings')
- 
- require('./web-frame-init')()
-+=======
-+// Call webFrame method.
-+electron.ipcRenderer.on('ELECTRON_INTERNAL_RENDERER_WEB_FRAME_METHOD', (event, method, args) => {
-+  electron.webFrame[method](...args)
-+})
-+
-+electron.ipcRenderer.on('ELECTRON_INTERNAL_RENDERER_SYNC_WEB_FRAME_METHOD', (event, requestId, method, args) => {
-+  const result = electron.webFrame[method](...args)
-+  event.sender.send(`ELECTRON_INTERNAL_BROWSER_SYNC_WEB_FRAME_RESPONSE_${requestId}`, result)
-+})
-+
-+electron.ipcRenderer.on('ELECTRON_INTERNAL_RENDERER_ASYNC_WEB_FRAME_METHOD', (event, requestId, method, args) => {
-+  electron.webFrame[method](...args, function (result) {
-+    event.sender.send(`ELECTRON_INTERNAL_BROWSER_ASYNC_WEB_FRAME_RESPONSE_${requestId}`, result)
-+  })
-+})
-+>>>>>>> .their
- 
- // Process command line arguments.
- let nodeIntegration = 'false'
-changed in both
-  base   100644 29cf9f5acaec7093d4cdfb3987c0a892aa348ec6 lib/renderer/override.js
-  our    100644 fdeb6605a5cc5cae194ef9d31265b73b893822eb lib/renderer/override.js
-  their  100644 db35904f95236f7ece5bdafd8858eefd46a81ba1 lib/renderer/override.js
-@@ -1,9 +1,251 @@
- 'use strict'
- 
- const {ipcRenderer} = require('electron')
-+<<<<<<< .our
- 
- const {guestInstanceId, openerId} = process
- const hiddenPage = process.argv.includes('--hidden-page')
- const usesNativeWindowOpen = process.argv.includes('--native-window-open')
- 
- require('./window-setup')(ipcRenderer, guestInstanceId, openerId, hiddenPage, usesNativeWindowOpen)
-+=======
-+
-+const {defineProperty} = Object
-+
-+// Helper function to resolve relative url.
-+const a = window.top.document.createElement('a')
-+const resolveURL = function (url) {
-+  a.href = url
-+  return a.href
-+}
-+
-+// Window object returned by "window.open".
-+const BrowserWindowProxy = (function () {
-+  BrowserWindowProxy.proxies = {}
-+
-+  BrowserWindowProxy.getOrCreate = function (guestId) {
-+    let proxy = this.proxies[guestId]
-+    if (proxy == null) {
-+      proxy = new BrowserWindowProxy(guestId)
-+      this.proxies[guestId] = proxy
-+    }
-+    return proxy
-+  }
-+
-+  BrowserWindowProxy.remove = function (guestId) {
-+    delete this.proxies[guestId]
-+  }
-+
-+  function BrowserWindowProxy (guestId1) {
-+    defineProperty(this, 'guestId', {
-+      configurable: false,
-+      enumerable: true,
-+      writeable: false,
-+      value: guestId1
-+    })
-+
-+    this.closed = false
-+    ipcRenderer.once('ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_CLOSED_' + this.guestId, () => {
-+      BrowserWindowProxy.remove(this.guestId)
-+      this.closed = true
-+    })
-+  }
-+
-+  BrowserWindowProxy.prototype.close = function () {
-+    ipcRenderer.send('ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_CLOSE', this.guestId)
-+  }
-+
-+  BrowserWindowProxy.prototype.focus = function () {
-+    ipcRenderer.send('ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_METHOD', this.guestId, 'focus')
-+  }
-+
-+  BrowserWindowProxy.prototype.blur = function () {
-+    ipcRenderer.send('ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_METHOD', this.guestId, 'blur')
-+  }
-+
-+  BrowserWindowProxy.prototype.print = function () {
-+    ipcRenderer.send('ELECTRON_GUEST_WINDOW_MANAGER_WEB_CONTENTS_METHOD', this.guestId, 'print')
-+  }
-+
-+  defineProperty(BrowserWindowProxy.prototype, 'location', {
-+    get: function () {
-+      return ipcRenderer.sendSync('ELECTRON_GUEST_WINDOW_MANAGER_WEB_CONTENTS_METHOD_SYNC', this.guestId, 'getURL')
-+    },
-+    set: function (url) {
-+      url = resolveURL(url)
-+      return ipcRenderer.sendSync('ELECTRON_GUEST_WINDOW_MANAGER_WEB_CONTENTS_METHOD_SYNC', this.guestId, 'loadURL', url)
-+    }
-+  })
-+
-+  BrowserWindowProxy.prototype.postMessage = function (message, targetOrigin) {
-+    if (targetOrigin == null) {
-+      targetOrigin = '*'
-+    }
-+    ipcRenderer.send('ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_POSTMESSAGE', this.guestId, message, targetOrigin, window.location.origin)
-+  }
-+
-+  BrowserWindowProxy.prototype['eval'] = function (...args) {
-+    ipcRenderer.send('ELECTRON_GUEST_WINDOW_MANAGER_WEB_CONTENTS_METHOD', this.guestId, 'executeJavaScript', ...args)
-+  }
-+
-+  return BrowserWindowProxy
-+})()
-+
-+if (process.guestInstanceId == null) {
-+  // Override default window.close.
-+  window.close = function () {
-+    ipcRenderer.sendSync('ELECTRON_BROWSER_WINDOW_CLOSE')
-+  }
-+}
-+
-+// Make the browser window or guest view emit "new-window" event.
-+window.open = function (url, frameName, features) {
-+  var feature, guestId, i, j, len, len1, name, options, ref1, ref2, value
-+  if (frameName == null) {
-+    frameName = ''
-+  }
-+  if (features == null) {
-+    features = ''
-+  }
-+  options = {}
-+
-+  const ints = ['x', 'y', 'width', 'height', 'minWidth', 'maxWidth', 'minHeight', 'maxHeight', 'zoomFactor']
-+  const webPreferences = ['zoomFactor', 'nodeIntegration', 'preload']
-+  const disposition = 'new-window'
-+
-+  // Make sure to get rid of excessive whitespace in the property name
-+  ref1 = features.split(/,\s*/)
-+  for (i = 0, len = ref1.length; i < len; i++) {
-+    feature = ref1[i]
-+    ref2 = feature.split(/\s*=/)
-+    name = ref2[0]
-+    value = ref2[1]
-+    value = value === 'yes' || value === '1' ? true : value === 'no' || value === '0' ? false : value
-+    if (webPreferences.includes(name)) {
-+      if (options.webPreferences == null) {
-+        options.webPreferences = {}
-+      }
-+      options.webPreferences[name] = value
-+    } else {
-+      options[name] = value
-+    }
-+  }
-+  if (options.left) {
-+    if (options.x == null) {
-+      options.x = options.left
-+    }
-+  }
-+  if (options.top) {
-+    if (options.y == null) {
-+      options.y = options.top
-+    }
-+  }
-+  if (options.title == null) {
-+    options.title = frameName
-+  }
-+  if (options.width == null) {
-+    options.width = 800
-+  }
-+  if (options.height == null) {
-+    options.height = 600
-+  }
-+
-+  // Resolve relative urls.
-+  if (url == null || url === '') {
-+    url = 'about:blank'
-+  } else {
-+    url = resolveURL(url)
-+  }
-+  for (j = 0, len1 = ints.length; j < len1; j++) {
-+    name = ints[j]
-+    if (options[name] != null) {
-+      options[name] = parseInt(options[name], 10)
-+    }
-+  }
-+  guestId = ipcRenderer.sendSync('ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_OPEN', url, frameName, disposition, options)
-+  if (guestId) {
-+    return BrowserWindowProxy.getOrCreate(guestId)
-+  } else {
-+    return null
-+  }
-+}
-+
-+window.alert = function (message, title) {
-+  ipcRenderer.sendSync('ELECTRON_BROWSER_WINDOW_ALERT', message, title)
-+}
-+
-+window.confirm = function (message, title) {
-+  return ipcRenderer.sendSync('ELECTRON_BROWSER_WINDOW_CONFIRM', message, title)
-+}
-+
-+// But we do not support prompt().
-+window.prompt = function () {
-+  throw new Error('prompt() is and will not be supported.')
-+}
-+
-+if (process.openerId != null) {
-+  window.opener = BrowserWindowProxy.getOrCreate(process.openerId)
-+}
-+
-+ipcRenderer.on('ELECTRON_GUEST_WINDOW_POSTMESSAGE', function (event, sourceId, message, sourceOrigin) {
-+  // Manually dispatch event instead of using postMessage because we also need to
-+  // set event.source.
-+  event = document.createEvent('Event')
-+  event.initEvent('message', false, false)
-+  event.data = message
-+  event.origin = sourceOrigin
-+  event.source = BrowserWindowProxy.getOrCreate(sourceId)
-+  window.dispatchEvent(event)
-+})
-+
-+// Forward history operations to browser.
-+var sendHistoryOperation = function (...args) {
-+  ipcRenderer.send('ELECTRON_NAVIGATION_CONTROLLER', ...args)
-+}
-+
-+var getHistoryOperation = function (...args) {
-+  return ipcRenderer.sendSync('ELECTRON_SYNC_NAVIGATION_CONTROLLER', ...args)
-+}
-+
-+window.history.back = function () {
-+  sendHistoryOperation('goBack')
-+}
-+
-+window.history.forward = function () {
-+  sendHistoryOperation('goForward')
-+}
-+
-+window.history.go = function (offset) {
-+  sendHistoryOperation('goToOffset', offset)
-+}
-+
-+defineProperty(window.history, 'length', {
-+  get: function () {
-+    return getHistoryOperation('length')
-+  }
-+})
-+
-+// The initial visibilityState.
-+let cachedVisibilityState = process.argv.includes('--hidden-page') ? 'hidden' : 'visible'
-+
-+// Subscribe to visibilityState changes.
-+ipcRenderer.on('ELECTRON_RENDERER_WINDOW_VISIBILITY_CHANGE', function (event, visibilityState) {
-+  if (cachedVisibilityState !== visibilityState) {
-+    cachedVisibilityState = visibilityState
-+    document.dispatchEvent(new Event('visibilitychange'))
-+  }
-+})
-+
-+// Make document.hidden and document.visibilityState return the correct value.
-+defineProperty(document, 'hidden', {
-+  get: function () {
-+    return cachedVisibilityState !== 'visible'
-+  }
-+})
-+
-+defineProperty(document, 'visibilityState', {
-+  get: function () {
-+    return cachedVisibilityState
-+  }
-+})
-+>>>>>>> .their
-changed in both
-  base   100644 fed0275b90760d4bcdd58bee880f949e0f409528 lib/renderer/web-view/guest-view-internal.js
-  our    100644 6e42c769b70e5223fe97397f87144ec342882f8d lib/renderer/web-view/guest-view-internal.js
-  their  100644 f6eb244a6848825eed05100e62ca2477a178d222 lib/renderer/web-view/guest-view-internal.js
-@@ -47,6 +47,15 @@
- const dispatchEvent = function (webView, eventName, eventKey, ...args) {
-   if (DEPRECATED_EVENTS[eventName] != null) {
-     dispatchEvent(webView, DEPRECATED_EVENTS[eventName], eventKey, ...args)
-+<<<<<<< .our
-+=======
-+  }
-+  domEvent = new Event(eventName)
-+  ref1 = WEB_VIEW_EVENTS[eventKey]
-+  for (i = j = 0, len = ref1.length; j < len; i = ++j) {
-+    f = ref1[i]
-+    domEvent[f] = args[i]
-+>>>>>>> .their
-   }
-   const domEvent = new Event(eventName)
-   WEB_VIEW_EVENTS[eventKey].forEach((prop, index) => {
-@@ -60,6 +69,7 @@
- 
- module.exports = {
-   registerEvents: function (webView, viewInstanceId) {
-+<<<<<<< .our
-     ipcRenderer.on(`ELECTRON_GUEST_VIEW_INTERNAL_DESTROY_GUEST-${viewInstanceId}`, function () {
-       webView.guestInstanceId = undefined
-       webView.reset()
-@@ -68,6 +78,9 @@
-     })
- 
-     ipcRenderer.on(`ELECTRON_GUEST_VIEW_INTERNAL_DISPATCH_EVENT-${viewInstanceId}`, function (event, eventName, ...args) {
-+=======
-+    ipcRenderer.on('ELECTRON_GUEST_VIEW_INTERNAL_DISPATCH_EVENT-' + viewInstanceId, function (event, eventName, ...args) {
-+>>>>>>> .their
-       dispatchEvent(webView, eventName, eventName, ...args)
-     })
- 
-changed in both
-  base   100644 6e5e81798544104d9f46cd1e9d95e7bbff2da92c lib/renderer/web-view/web-view.js
-  our    100644 574a2b545597f9d1c05ec9b7147585063e90ae89 lib/renderer/web-view/web-view.js
-  their  100644 ab8d6996c8961aefec86c37387d635ccd3b8653b lib/renderer/web-view/web-view.js
-@@ -319,7 +319,15 @@
-     'send',
-     'sendInputEvent',
-     'setLayoutZoomLevelLimits',
-+<<<<<<< .our
-     'setVisualZoomLevelLimits'
-+=======
-+    'setVisualZoomLevelLimits',
-+    'setZoomFactor',
-+    'setZoomLevel',
-+    // TODO(kevinsawicki): Remove in 2.0, deprecate before then with warnings
-+    'setZoomLevelLimits'
-+>>>>>>> .their
-   ]
- 
-   // Forward proto.foo* method calls to WebViewImpl.foo*.
-@@ -340,7 +348,11 @@
-   const createNonBlockHandler = function (m) {
-     return function (...args) {
-       const internal = v8Util.getHiddenValue(this, 'internal')
-+<<<<<<< .our
-       ipcRenderer.send('ELECTRON_BROWSER_ASYNC_CALL_TO_GUEST_VIEW', contextId, null, internal.guestInstanceId, m, ...args)
-+=======
-+      return ipcRenderer.send('ELECTRON_BROWSER_ASYNC_CALL_TO_GUEST_VIEW', null, internal.guestInstanceId, m, ...args)
-+>>>>>>> .their
-     }
-   }
-   for (const method of nonblockMethods) {
-changed in both
-  base   100644 bd7087e76707e1d1460a39917feba7bd0db74a4e package.json
-  our    100644 c081cd89450cd50efba1ec280ff1349a96ea3ce0 package.json
-  their  100644 a9e59235971454035fff313ee6a8cca91355966c package.json
-@@ -1,8 +1,12 @@
- {
-   "name": "electron",
-+<<<<<<< .our
-   "version": "4.0.0-nightly.20180821",
-   "repository": "https://github.com/electron/electron",
-   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
-+=======
-+  "version": "1.3.15",
-+>>>>>>> .their
-   "devDependencies": {
-     "asar": "^0.11.0",
-     "browserify": "^13.1.0",
-added in both
-  our    100755 0704b703fe1243fb4c8246cd09dcd209083a6fbf script/cibuild-linux
-  their  100755 22f15936ae34a5793754c071f9fe25b3d3ac5c5b script/cibuild-linux
-@@ -5,12 +5,23 @@
-   Bump* ) export ELECTRON_RELEASE=1 ;;
- esac
- 
-+<<<<<<< .our
-+=======
-+set +x
-+
-+export ELECTRON_GITHUB_TOKEN="$BUILD_ELECTRON_ELECTRON_GITHUB_TOKEN"
-+export ELECTRON_S3_BUCKET="$BUILD_ELECTRON_ELECTRON_S3_BUCKET"
-+export ELECTRON_S3_ACCESS_KEY="$BUILD_ELECTRON_ELECTRON_S3_ACCESS_KEY"
-+export ELECTRON_S3_SECRET_KEY="$BUILD_ELECTRON_ELECTRON_S3_SECRET_KEY"
-+
-+>>>>>>> .their
- if [[ -z "${ELECTRON_RELEASE}" ]]; then
-   echo "Generating Linux $TARGET_ARCH debug build"
- else
-   echo "Generating Linux $TARGET_ARCH release build"
- fi
- 
-+<<<<<<< .our
- set +x
- set -e
- set -o pipefail
-@@ -35,3 +46,8 @@
-   --volume "$PWD":/workspace/electron \
-   --workdir /workspace/electron \
-   electron-linux script/cibuild
-+=======
-+set -x
-+
-+script/cibuild
-+>>>>>>> .their
-changed in both
-  base   100644 5ea60fcf539a6e0bcc534b1eee9efbe424bca5d3 script/lib/config.py
-  our    100644 9ad0fbc680e5ecdeb8c13d0f0d6678bbba7d9031 script/lib/config.py
-  their  100644 d2be141a0c0037cf3bde77a57cc3ceb5525b3448 script/lib/config.py
-@@ -13,6 +13,11 @@
- 
- BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \
-     'https://s3.amazonaws.com/github-janky-artifacts/libchromiumcontent'
-+<<<<<<< .our
-+=======
-+LIBCHROMIUMCONTENT_COMMIT = os.getenv('LIBCHROMIUMCONTENT_COMMIT') or \
-+    'e93c6a82d7ab1e3b97a294200186d7254ad3f868'
-+>>>>>>> .their
- 
- PLATFORM = {
-   'cygwin': 'win32',
-removed in local
-  base   100644 ac5d06ad787a168824152c2a43b81cc447c1416d spec/api-ipc-spec.js
-  their  100644 22148c665732c074a8a435cf9edd81c196d2bf15 spec/api-ipc-spec.js
-changed in both
-  base   100644 a41bc477018fbc4aa1c5b23ba9cdaf21e3837412 spec/api-web-frame-spec.js
-  our    100644 b8fd10b5d3f1319640fb209c707c758d0a0403d2 spec/api-web-frame-spec.js
-  their  100644 3d7a7d316f8bd4b8bfa53d84df2b77f6335c6991 spec/api-web-frame-spec.js
-@@ -15,11 +15,14 @@
- 
- describe('webFrame module', function () {
-   var fixtures = path.resolve(__dirname, 'fixtures')
-+<<<<<<< .our
-   var w = null
- 
-   afterEach(function () {
-     return closeWindow(w).then(function () { w = null })
-   })
-+=======
-+>>>>>>> .their
- 
-   describe('webFrame.registerURLSchemeAsPrivileged', function () {
-     it('supports fetch api by default', function (done) {
-@@ -145,6 +148,7 @@
-     })
-   })
- 
-+<<<<<<< .our
-   it('calls a spellcheck provider', async () => {
-     w = new BrowserWindow({show: false})
-     w.loadURL(`file://${fixtures}/pages/webframe-spell-check.html`)
-@@ -157,5 +161,13 @@
-     }
-     const [, text] = await spellCheckerFeedback
-     expect(text).to.equal(misspelledWord)
-+=======
-+  it('supports setting the visual and layout zoom level limits', function () {
-+    assert.doesNotThrow(function () {
-+      webFrame.setZoomLevelLimits(1, 100)
-+      webFrame.setVisualZoomLevelLimits(1, 50)
-+      webFrame.setLayoutZoomLevelLimits(0, 25)
-+    })
-+>>>>>>> .their
-   })
- })
-changed in both
-  base   100644 e26cba87c38bf456925cb019452a5c43937b1c05 spec/chromium-spec.js
-  our    100644 d90269769d269e4054d25cba4b6c4ac8a1929aa6 spec/chromium-spec.js
-  their  100644 f4d8f4068b13aa8748e4fb640509889ce3ad1dc7 spec/chromium-spec.js
-@@ -4,10 +4,17 @@
- const path = require('path')
- const ws = require('ws')
- const url = require('url')
-+<<<<<<< .our
- const ChildProcess = require('child_process')
- const {ipcRenderer, remote} = require('electron')
- const {closeWindow} = require('./window-helpers')
- const {app, BrowserWindow, ipcMain, protocol, session, webContents} = remote
-+=======
-+const remote = require('electron').remote
-+
-+const {BrowserWindow, protocol, session, webContents} = remote
-+
-+>>>>>>> .their
- const isCI = remote.getGlobal('isCi')
- const features = process.atomBinding('features')
- 
-@@ -103,8 +110,15 @@
-     })
-   })
- 
-+<<<<<<< .our
-   describe('navigator.mediaDevices', () => {
-     if (isCI) return
-+=======
-+  describe('navigator.mediaDevices', function () {
-+    if (isCI) {
-+      return
-+    }
-+>>>>>>> .their
- 
-     it('can return labels of enumerated devices', (done) => {
-       navigator.mediaDevices.enumerateDevices().then((devices) => {
-@@ -478,6 +492,7 @@
-         window.open('', {toString: null})
-       }, /Cannot convert object to primitive value/)
- 
-+<<<<<<< .our
-       assert.throws(() => {
-         window.open('', '', {toString: 3})
-       }, /Cannot convert object to primitive value/)
-@@ -491,6 +506,13 @@
-         done()
-       })
-       b = window.open('', 'hello')
-+=======
-+    let url = 'file://' + fixtures + '/pages/window-opener.html'
-+    let w = null
-+
-+    afterEach(function () {
-+      if (w) w.destroy()
-+>>>>>>> .their
-     })
- 
-     it('does not throw an exception when the frameName is a built-in object property', (done) => {
-@@ -524,9 +546,15 @@
-       w.loadURL(url)
-     })
- 
-+<<<<<<< .our
-     it('is not null for window opened by window.open', (done) => {
-       let b
-       listener = (event) => {
-+=======
-+    it('is not null for window opened by window.open', function (done) {
-+      let b
-+      listener = function (event) {
-+>>>>>>> .their
-         assert.equal(event.data, 'object')
-         b.close()
-         done()
-@@ -536,11 +564,18 @@
-     })
-   })
- 
-+<<<<<<< .our
-   describe('window.opener access from BrowserWindow', () => {
-+=======
-+  describe('window.opener access from BrowserWindow', function () {
-+    this.timeout(10000)
-+
-+>>>>>>> .their
-     const scheme = 'other'
-     let url = `${scheme}://${fixtures}/pages/window-opener-location.html`
-     let w = null
- 
-+<<<<<<< .our
-     before((done) => {
-       protocol.registerFileProtocol(scheme, (request, callback) => {
-         callback(`${fixtures}/pages/window-opener-location.html`)
-@@ -557,24 +592,60 @@
- 
-     it('does nothing when origin of current window does not match opener', (done) => {
-       listener = (event) => {
-+=======
-+    before(function (done) {
-+      protocol.registerFileProtocol(scheme, function (request, callback) {
-+        callback(`${fixtures}/pages/window-opener-location.html`)
-+      }, function (error) {
-+        done(error)
-+      })
-+    })
-+
-+    after(function () {
-+      protocol.unregisterProtocol(scheme)
-+    })
-+
-+    afterEach(function () {
-+      w.close()
-+    })
-+
-+    it('does nothing when origin of current window does not match opener', function (done) {
-+      listener = function (event) {
-+>>>>>>> .their
-         assert.equal(event.data, undefined)
-         done()
-       }
-       window.addEventListener('message', listener)
-+<<<<<<< .our
-       w = window.open(url, '', 'show=no,nodeIntegration=no')
-     })
- 
-     it('works when origin matches', (done) => {
-       listener = (event) => {
-+=======
-+      w = window.open(url, '', 'show=no')
-+    })
-+
-+    it('works when origin matches', function (done) {
-+      listener = function (event) {
-+>>>>>>> .their
-         assert.equal(event.data, location.href)
-         done()
-       }
-       window.addEventListener('message', listener)
-+<<<<<<< .our
-       w = window.open(`file://${fixtures}/pages/window-opener-location.html`, '', 'show=no,nodeIntegration=no')
-     })
- 
-     it('works when origin does not match opener but has node integration', (done) => {
-       listener = (event) => {
-+=======
-+      w = window.open(`file://${fixtures}/pages/window-opener-location.html`, '', 'show=no')
-+    })
-+
-+    it('works when origin does not match opener but has node integration', function (done) {
-+      listener = function (event) {
-+>>>>>>> .their
-         assert.equal(event.data, location.href)
-         done()
-       }
-@@ -583,12 +654,19 @@
-     })
-   })
- 
-+<<<<<<< .our
-   describe('window.opener access from <webview>', () => {
-+=======
-+  describe('window.opener access from <webview>', function () {
-+    this.timeout(10000)
-+
-+>>>>>>> .their
-     const scheme = 'other'
-     const srcPath = `${fixtures}/pages/webview-opener-postMessage.html`
-     const pageURL = `file://${fixtures}/pages/window-opener-location.html`
-     let webview = null
- 
-+<<<<<<< .our
-     before((done) => {
-       protocol.registerFileProtocol(scheme, (request, callback) => {
-         callback(srcPath)
-@@ -606,6 +684,27 @@
-     it('does nothing when origin of webview src URL does not match opener', (done) => {
-       webview = new WebView()
-       webview.addEventListener('console-message', (e) => {
-+=======
-+    before(function (done) {
-+      protocol.registerFileProtocol(scheme, function (request, callback) {
-+        callback(srcPath)
-+      }, function (error) {
-+        done(error)
-+      })
-+    })
-+
-+    after(function () {
-+      protocol.unregisterProtocol(scheme)
-+    })
-+
-+    afterEach(function () {
-+      if (webview != null) webview.remove()
-+    })
-+
-+    it('does nothing when origin of webview src URL does not match opener', function (done) {
-+      webview = new WebView()
-+      webview.addEventListener('console-message', function (e) {
-+>>>>>>> .their
-         assert.equal(e.message, 'null')
-         done()
-       })
-@@ -621,9 +720,15 @@
-       document.body.appendChild(webview)
-     })
- 
-+<<<<<<< .our
-     it('works when origin matches', (done) => {
-       webview = new WebView()
-       webview.addEventListener('console-message', (e) => {
-+=======
-+    it('works when origin matches', function (done) {
-+      webview = new WebView()
-+      webview.addEventListener('console-message', function (e) {
-+>>>>>>> .their
-         assert.equal(e.message, webview.src)
-         done()
-       })
-@@ -639,9 +744,15 @@
-       document.body.appendChild(webview)
-     })
- 
-+<<<<<<< .our
-     it('works when origin does not match opener but has node integration', (done) => {
-       webview = new WebView()
-       webview.addEventListener('console-message', (e) => {
-+=======
-+    it('works when origin does not match opener but has node integration', function (done) {
-+      webview = new WebView()
-+      webview.addEventListener('console-message', function (e) {
-+>>>>>>> .their
-         webview.remove()
-         assert.equal(e.message, webview.src)
-         done()
-@@ -660,10 +771,18 @@
-     })
-   })
- 
-+<<<<<<< .our
-   describe('window.postMessage', () => {
-     it('sets the source and origin correctly', (done) => {
-       let b
-       listener = (event) => {
-+=======
-+  describe('window.postMessage', function () {
-+    it('sets the source and origin correctly', function (done) {
-+      var b, sourceId
-+      sourceId = remote.getCurrentWindow().id
-+      listener = function (event) {
-+>>>>>>> .their
-         window.removeEventListener('message', listener)
-         b.close()
-         const message = JSON.parse(event.data)
-added in both
-  our    100644 bfc281eb4298c7df89b1dd379b9ac958efd20edd spec/fixtures/api/render-view-deleted.html
-  their  100644 5c996c1988ef60215784bab216801f7ecdff1393 spec/fixtures/api/render-view-deleted.html
-@@ -17,7 +17,11 @@
-       }
- 
-       // This should trigger a dereference and a remote getURL call should fail
-+<<<<<<< .our
-       contents.emit('render-view-deleted', {}, contents.getProcessId())
-+=======
-+      contents.emit('render-view-deleted', {}, contents.getId())
-+>>>>>>> .their
-       try {
-         contents.getURL()
-         ipcRenderer.send('error-message', 'No error thrown')
-changed in both
-  base   100644 f2c45b0a71b4620d0665d956fd2311ebcba5ae5d spec/modules-spec.js
-  our    100644 b996b8f4839bff2160bffb69e55263b16a4178d7 spec/modules-spec.js
-  their  100644 601e40d050b8cd196be6c1c8f8936c67d518cad3 spec/modules-spec.js
-@@ -90,6 +90,7 @@
-     })
-   })
- 
-+<<<<<<< .our
-   describe('Module._nodeModulePaths', () => {
-     describe('when the path is inside the resources path', () => {
-       it('does not include paths outside of the resources path', () => {
-@@ -160,6 +161,15 @@
-         const result = await w.webContents.executeJavaScript('typeof require("q").when')
-         assert.equal(result, 'function')
-       })
-+=======
-+  describe('when the path is outside the resources path', function () {
-+    it('includes paths outside of the resources path', function () {
-+      let modulePath = path.resolve('/foo')
-+      assert.deepEqual(Module._nodeModulePaths(modulePath), [
-+        path.join(modulePath, 'node_modules'),
-+        path.resolve('/node_modules')
-+      ])
-+>>>>>>> .their
-     })
-   })
- })
-removed in local
-  base   160000 554946c7873bbc6930779c871fe230856575049a vendor/brightray
-  their  160000 ee26c5218eeec199c54c92a7517a72d2dbd0adbf vendor/brightray
-changed in both
-  base   160000 ee8c429deaee0adeeef069c3ad34c0defe53a567 vendor/node
-  our    160000 ece0a06ac8147efb5b5af431c21f312f1884616e vendor/node
-  their  160000 c47e9bf9011de682d07c82f7f610a467f30cca60 vendor/node
diff --git a/app/test/fixtures/merge-parser/electron/merge-1-4-x-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-1-4-x-into-master.txt
deleted file mode 100644
index 4772e171f6e..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-1-4-x-into-master.txt
+++ /dev/null
@@ -1,208 +0,0 @@
-changed in both
-  base   100644 f69fbc5c40409a1db7a3f8353bfffe46a21d6054 atom/browser/resources/mac/Info.plist
-  our    100644 9094f0f7335edf833d51f688851e6a105de60433 atom/browser/resources/mac/Info.plist
-  their  100644 2dd8bc646cff3869557549a39477e30022e6cfdd atom/browser/resources/mac/Info.plist
-@@ -17,9 +17,15 @@
-   <key>CFBundleIconFile</key>
-   <string>electron.icns</string>
-   <key>CFBundleVersion</key>
-+<<<<<<< .our
-   <string>4.0.0</string>
-   <key>CFBundleShortVersionString</key>
-   <string>4.0.0</string>
-+=======
-+  <string>1.4.16</string>
-+  <key>CFBundleShortVersionString</key>
-+  <string>1.4.16</string>
-+>>>>>>> .their
-   <key>LSApplicationCategoryType</key>
-   <string>public.app-category.developer-tools</string>
-   <key>LSMinimumSystemVersion</key>
-changed in both
-  base   100644 c7a067984484d859db564046a9aba048b6979929 atom/browser/resources/win/atom.rc
-  our    100644 c0bd831e8bddf10180f75cd40694831e2e98622d atom/browser/resources/win/atom.rc
-  their  100644 f799ec4fe0defad29259d64ffdbe503bf768ef39 atom/browser/resources/win/atom.rc
-@@ -56,8 +56,13 @@
- //
- 
- VS_VERSION_INFO VERSIONINFO
-+<<<<<<< .our
-  FILEVERSION 4,0,0,20180821
-  PRODUCTVERSION 4,0,0,20180821
-+=======
-+ FILEVERSION 1,4,16,0
-+ PRODUCTVERSION 1,4,16,0
-+>>>>>>> .their
-  FILEFLAGSMASK 0x3fL
- #ifdef _DEBUG
-  FILEFLAGS 0x1L
-@@ -74,12 +79,20 @@
-         BEGIN
-             VALUE "CompanyName", "GitHub, Inc."
-             VALUE "FileDescription", "Electron"
-+<<<<<<< .our
-             VALUE "FileVersion", "4.0.0"
-+=======
-+            VALUE "FileVersion", "1.4.16"
-+>>>>>>> .their
-             VALUE "InternalName", "electron.exe"
-             VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
-             VALUE "OriginalFilename", "electron.exe"
-             VALUE "ProductName", "Electron"
-+<<<<<<< .our
-             VALUE "ProductVersion", "4.0.0"
-+=======
-+            VALUE "ProductVersion", "1.4.16"
-+>>>>>>> .their
-             VALUE "SquirrelAwareVersion", "1"
-         END
-     END
-changed in both
-  base   100644 f073afb5621ce56baa578a4f1737ebac7cc5389a atom/common/atom_version.h
-  our    100644 65e7d19911559a40b1b258319df5fe0fa180354f atom/common/atom_version.h
-  their  100644 c8e49bdb3cc7d395b80c8af73e901c4644645f0e atom/common/atom_version.h
-@@ -5,10 +5,22 @@
- #ifndef ATOM_COMMON_ATOM_VERSION_H_
- #define ATOM_COMMON_ATOM_VERSION_H_
- 
-+<<<<<<< .our
- #define ATOM_MAJOR_VERSION 4
- #define ATOM_MINOR_VERSION 0
- #define ATOM_PATCH_VERSION 0
- #define ATOM_PRE_RELEASE_VERSION -nightly.20180821
-+=======
-+#define ATOM_MAJOR_VERSION 1
-+#define ATOM_MINOR_VERSION 4
-+#define ATOM_PATCH_VERSION 16
-+
-+#define ATOM_VERSION_IS_RELEASE 1
-+
-+#ifndef ATOM_TAG
-+# define ATOM_TAG ""
-+#endif
-+>>>>>>> .their
- 
- #ifndef ATOM_STRINGIFY
- #define ATOM_STRINGIFY(n) ATOM_STRINGIFY_HELPER(n)
-changed in both
-  base   100644 87971055e68f42b5d9dcc8fe035205531ba201ef chromium_src/chrome/browser/printing/print_job.cc
-  our    100644 80d9cc3c21a12b8256618405050f80bb6c2f08e4 chromium_src/chrome/browser/printing/print_job.cc
-  their  100644 15a618df428142b11c7127cece08b48da1465642 chromium_src/chrome/browser/printing/print_job.cc
-@@ -282,6 +282,7 @@
-       base::Bind(&PrintJob::OnPdfPageConverted, this));
- }
- 
-+<<<<<<< .our
- void PrintJob::OnPdfPageConverted(int page_number,
-                                   float scale_factor,
-                                   std::unique_ptr<MetafilePlayer> metafile) {
-@@ -289,11 +290,21 @@
-   if (!document_.get() || !metafile || page_number < 0 ||
-       static_cast<size_t>(page_number) >= pdf_page_mapping_.size()) {
-     pdf_conversion_state_.reset();
-+=======
-+void PrintJob::OnPdfToEmfPageConverted(int page_number,
-+                                       float scale_factor,
-+                                       std::unique_ptr<MetafilePlayer> emf) {
-+  DCHECK(ptd_to_emf_state_);
-+  if (!document_.get() || !emf || page_number < 0 ||
-+      static_cast<size_t>(page_number) >= pdf_page_mapping_.size()) {
-+    ptd_to_emf_state_.reset();
-+>>>>>>> .their
-     Cancel();
-     return;
-   }
- 
-   // Update the rendered document. It will send notifications to the listener.
-+<<<<<<< .our
-   document_->SetPage(pdf_page_mapping_[page_number], std::move(metafile),
-                      scale_factor, pdf_conversion_state_->page_size(),
-                      pdf_conversion_state_->content_area());
-@@ -317,6 +328,16 @@
-                 : PdfRenderSettings::Mode::POSTSCRIPT_LEVEL3);
-   pdf_conversion_state_->Start(
-       bytes, settings, base::Bind(&PrintJob::OnPdfConversionStarted, this));
-+=======
-+  document_->SetPage(pdf_page_mapping_[page_number],
-+                     std::move(emf),
-+                     scale_factor,
-+                     ptd_to_emf_state_->page_size(),
-+                     ptd_to_emf_state_->content_area());
-+
-+  ptd_to_emf_state_->GetMorePages(
-+      base::Bind(&PrintJob::OnPdfToEmfPageConverted, this));
-+>>>>>>> .their
- }
- 
- #endif  // defined(OS_WIN)
-changed in both
-  base   100644 420622a7e96861345b1cbffb54188bd8488e8ac6 chromium_src/chrome/browser/printing/print_job.h
-  our    100644 e5e5f44d6c50c6c7fd00591caec9cb4f8e1387dd chromium_src/chrome/browser/printing/print_job.h
-  their  100644 d4445e1bb1b87d965b64e411eb98702326fb9c86 chromium_src/chrome/browser/printing/print_job.h
-@@ -96,7 +96,11 @@
- #if defined(OS_WIN)
-   // Let the PrintJob know the 0-based |page_number| of a given printed page.
-   void AppendPrintedPage(int page_number);
-+<<<<<<< .our
- 
-+=======
-+  
-+>>>>>>> .their
-   void StartPdfToEmfConversion(
-       const scoped_refptr<base::RefCountedMemory>& bytes,
-       const gfx::Size& page_size,
-@@ -161,10 +165,17 @@
-   bool is_canceling_;
- 
- #if defined(OS_WIN)
-+<<<<<<< .our
-   class PdfConversionState;
-   std::unique_ptr<PdfConversionState> pdf_conversion_state_;
-   std::vector<int> pdf_page_mapping_;
- #endif  // defined(OS_WIN)
-+=======
-+  class PdfToEmfState;
-+  std::unique_ptr<PdfToEmfState> ptd_to_emf_state_;
-+  std::vector<int> pdf_page_mapping_;
-+#endif  // OS_WIN
-+>>>>>>> .their
- 
-   // Used at shutdown so that we can quit a nested message loop.
-   base::WeakPtrFactory<PrintJob> quit_factory_;
-changed in both
-  base   100644 0638bd5c4d445e21c9678d47a949f1fa1b0480fe chromium_src/chrome/browser/printing/print_view_manager_base.cc
-  our    100644 3c7055a6f4c0f411049aebcf66ff9fba196d8b9f chromium_src/chrome/browser/printing/print_view_manager_base.cc
-  their  100644 df52e206e1ee7ba05552e054e26871ecc0da8b38 chromium_src/chrome/browser/printing/print_view_manager_base.cc
-changed in both
-  base   100644 f9a3bf75766c25ee01e831dec59586913ada9ce6 electron.gyp
-  our    100644 944ddab2a3fd879044e31677e4bac2843fffbdee electron.gyp
-  their  100644 a26fa80cd496b553a045c557d669a77f2702dda7 electron.gyp
-@@ -4,7 +4,11 @@
-     'product_name%': 'Electron',
-     'company_name%': 'GitHub, Inc',
-     'company_abbr%': 'github',
-+<<<<<<< .our
-     'version%': '4.0.0-nightly.20180821',
-+=======
-+    'version%': '1.4.16',
-+>>>>>>> .their
-     'js2c_input_dir': '<(SHARED_INTERMEDIATE_DIR)/js2c',
-   },
-   'includes': [
-changed in both
-  base   100644 e090c24befb0bc19711d7a37719de7102f1d5033 package.json
-  our    100644 c081cd89450cd50efba1ec280ff1349a96ea3ce0 package.json
-  their  100644 b1ce03d92ee6b4a0dd88b8b4ebad41dcc4e68938 package.json
-@@ -1,8 +1,12 @@
- {
-   "name": "electron",
-+<<<<<<< .our
-   "version": "4.0.0-nightly.20180821",
-   "repository": "https://github.com/electron/electron",
-   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
-+=======
-+  "version": "1.4.16",
-+>>>>>>> .their
-   "devDependencies": {
-     "asar": "^0.11.0",
-     "browserify": "^13.1.0",
diff --git a/app/test/fixtures/merge-parser/electron/merge-1-6-x-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-1-6-x-into-master.txt
deleted file mode 100644
index b1e72fd6c91..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-1-6-x-into-master.txt
+++ /dev/null
@@ -1,4383 +0,0 @@
-added in both
-  our    100644 6d44d618aabcce04c60344f2274dec5b0c2a1f68 .circleci/config.yml
-  their  100644 ab085246d001aa13fbfb587c63bd64c63b7ca1ce .circleci/config.yml
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- notify-slack-failure: &notify-slack-failure
-   run:
-     name: Send a slack notification on failure
-@@ -348,10 +349,13 @@
-   docker:
-     - image: electronbuilds/electron:0.0.8
-   <<: *build-steps
-+=======
-+>>>>>>> .their
- 
- version: 2
- jobs:
-   electron-linux-arm:
-+<<<<<<< .our
-     environment:
-       TARGET_ARCH: arm
-     <<: *build-defaults
-@@ -668,12 +672,211 @@
-       GN_EXTRA_ARGS: 'is_mas_build = true'
-     <<: *gn-mac-build-machine
-     <<: *gn-mac-build-steps
-+=======
-+    docker:
-+      - image: electronbuilds/electron:0.0.4
-+        environment:
-+          TARGET_ARCH: arm
-+    resource_class: 2xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+  electron-linux-ia32:
-+    docker:
-+      - image: electronbuilds/electron:0.0.4
-+        environment:
-+          TARGET_ARCH: ia32
-+    resource_class: xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+  electron-linux-x64:
-+    docker:
-+      - image: electronbuilds/electron:0.0.4
-+        environment:
-+          TARGET_ARCH: x64
-+          DISPLAY: ':99.0'
-+    resource_class: xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Setup for headless testing
-+          command: sh -e /etc/init.d/xvfb start
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                mkdir junit
-+                script/test.py --ci --rebuild_native_modules
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+>>>>>>> .their
- 
- workflows:
-   version: 2
-   build-arm:
-     jobs:
-       - electron-linux-arm
-+<<<<<<< .our
-       - electron-linux-arm-test:
-           requires:
-             - electron-linux-arm
-@@ -683,12 +886,15 @@
-       - electron-linux-arm64-test:
-           requires:
-             - electron-linux-arm64
-+=======
-+>>>>>>> .their
-   build-ia32:
-     jobs:
-       - electron-linux-ia32
-   build-x64:
-     jobs:
-       - electron-linux-x64
-+<<<<<<< .our
-   build-osx-x64:
-     jobs:
-       - electron-osx-x64
-@@ -745,3 +951,5 @@
-       - electron-gn-linux-arm64-release-fyi
-       - electron-gn-mas-release-fyi
-       - electron-gn-osx-release-fyi
-+=======
-+>>>>>>> .their
-removed in remote
-  base   100644 b093d2a2126ea5e5a74712c103159f14f20e0ca2 appveyor.yml
-  our    100644 67a2b2124619d866f67d849f57f3548ba28be26a appveyor.yml
-@@ -1,73 +0,0 @@
--version: 1.0.{build}
--branches:
--  except:
--  - /^release$|^release-\d-\d-x$/
--build_cloud: electron-16
--image: electron-16-vs2017-15.4.5
--environment:
--  DISABLE_CRASH_REPORTER_TESTS: true
--build_script:
--- ps: >-
--    if(($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME -split "/")[0] -eq ($env:APPVEYOR_REPO_NAME -split "/")[0]) {
--      Write-warning "Skipping PR build for branch"; Exit-AppveyorBuild
--    } else {
--      Add-Path "$env:ProgramFiles (x86)\Windows Kits\10\Debuggers\x64"
--      $env:path = "$env:ProgramFiles (x86)\Windows Kits\10\Debuggers\x64;$env:path"
--      if($env:APPVEYOR_SCHEDULED_BUILD -eq 'True')  {
--        $env:RUN_RELEASE_BUILD = "1"
--      }
--      $Message = (git log --format=%B -n 1 HEAD) | Out-String
--      if ((Test-Path Env:\RUN_RELEASE_BUILD)) {
--        $env:ELECTRON_RELEASE = '1'
--        Write-Output "release build triggered from api"
--      }
--      if ((Test-Path Env:\ELECTRON_RELEASE)) {
--        Write-Output "Running release build"
--        python script\bootstrap.py --target_arch=$env:TARGET_ARCH
--        python script\build.py -c R
--        python script\create-dist.py
--      } else {
--        Write-Output "Running debug build"
--        python script\bootstrap.py --target_arch=$env:TARGET_ARCH --dev
--        python script\build.py -c D
--      }
--      if ($? -ne 'True') {
--        throw "Build failed with exit code $?"
--      } else {
--        "Build succeeded."
--      }
--      Push-AppveyorArtifact out
--    }
--test_script:
--- ps: >-
--    if (Test-Path Env:\ELECTRON_RELEASE) {
--      Write-Output "Skipping tests for release build"
--    } else {
--      Write-Output "Running tests for debug build"
--      python script\test.py --ci --rebuild_native_modules
--      if ($LASTEXITCODE -ne '0') {
--        throw "Tests failed with exit code $LASTEXITCODE"
--      } else {
--        Write-Output "Tests succeeded."
--      }
--      python script\verify-ffmpeg.py
--      if ($LASTEXITCODE -ne '0') {
--        throw "Verify ffmpeg failed with exit code $LASTEXITCODE"
--      } else {
--        "Verify ffmpeg succeeded."
--      }
--    }
--artifacts:
--- path: test-results.xml
--  name: test-results.xml
--deploy_script:
--- ps: >-
--    if (Test-Path Env:\ELECTRON_RELEASE) {
--      if (Test-Path Env:\RUN_RELEASE_BUILD) {
--        Write-Output "Uploading Electron release distribution to s3"
--        & python script\upload.py --upload_to_s3
--      } else {
--        Write-Output "Uploading Electron release distribution to github releases"
--        & python script\upload.py
--      }
--    }
-changed in both
-  base   100644 e1603fa5942f7b000c3385648530255032e775a2 atom/app/atom_library_main.h
-  our    100644 2c7a27caa20a411558010c3c58bd78e7850c0737 atom/app/atom_library_main.h
-  their  100644 63d285bb5e4838578d23505d7738c9ac88575df1 atom/app/atom_library_main.h
-@@ -9,7 +9,12 @@
- 
- #if defined(OS_MACOSX)
- extern "C" {
-+<<<<<<< .our
- __attribute__((visibility("default"))) int AtomMain(int argc, char* argv[]);
-+=======
-+__attribute__((visibility("default")))
-+int AtomMain(int argc, char* argv[]);
-+>>>>>>> .their
- 
- #ifdef ENABLE_RUN_AS_NODE
- __attribute__((visibility("default"))) int AtomInitializeICUandStartNode(
-changed in both
-  base   100644 7ee7522934689937f7be7b0f866134bf611c7d69 atom/app/atom_library_main.mm
-  our    100644 57a519fcd0db28548ea75034cf92191161183385 atom/app/atom_library_main.mm
-  their  100644 ae096acd4a931d397e285643d36580625dde14bf atom/app/atom_library_main.mm
-@@ -14,6 +14,10 @@
- #include "brightray/common/mac/main_application_bundle.h"
- #include "content/public/app/content_main.h"
- 
-+<<<<<<< .our
-+=======
-+#if defined(OS_MACOSX)
-+>>>>>>> .their
- int AtomMain(int argc, char* argv[]) {
-   atom::AtomMainDelegate delegate;
-   content::ContentMainParams params(&delegate);
-changed in both
-  base   100644 9c255db5fb278c21a4e657513e6d9a3d53d397da atom/app/atom_main.cc
-  our    100644 fc77100d9acb58221c35f364c4db7866a44d347d atom/app/atom_main.cc
-  their  100644 59cd6801e52aebcd81959df7ed2f4eccdc555f30 atom/app/atom_main.cc
-@@ -71,7 +71,11 @@
- 
- #ifdef _DEBUG
-   // Don't display assert dialog boxes in CI test runs
-+<<<<<<< .our
-   static const char* kCI = "ELECTRON_CI";
-+=======
-+  static const auto kCI = "ELECTRON_CI";
-+>>>>>>> .their
-   bool is_ci = IsEnvSet(kCI);
-   if (!is_ci) {
-     for (int i = 0; i < arguments.argc; ++i) {
-@@ -88,6 +92,13 @@
- 
-     _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG | _CRTDBG_MODE_FILE);
-     _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);
-+<<<<<<< .our
-+=======
-+
-+    _set_error_mode(_OUT_TO_STDERR);
-+  }
-+#endif
-+>>>>>>> .their
- 
-     _set_error_mode(_OUT_TO_STDERR);
-   }
-@@ -103,6 +114,7 @@
-   if (run_as_node || !IsEnvSet("ELECTRON_NO_ATTACH_CONSOLE"))
-     base::RouteStdioToConsole(false);
- 
-+<<<<<<< .our
- #ifndef DEBUG
-   // Chromium has its own TLS subsystem which supports automatic destruction
-   // of thread-local data, and also depends on memory allocation routines
-@@ -121,6 +133,8 @@
- #endif
- 
- #ifdef ENABLE_RUN_AS_NODE
-+=======
-+>>>>>>> .their
-   if (run_as_node) {
-     std::vector<char*> argv(arguments.argc);
-     std::transform(
-@@ -132,10 +146,14 @@
-     auto ret = atom::NodeMain(argv.size(), argv.data());
-     std::for_each(argv.begin(), argv.end(), free);
-     return ret;
-+<<<<<<< .our
-   }
- #endif
- 
-   if (IsEnvSet("ELECTRON_INTERNAL_CRASH_SERVICE")) {
-+=======
-+  } else if (IsEnvSet("ELECTRON_INTERNAL_CRASH_SERVICE")) {
-+>>>>>>> .their
-     return crash_service::Main(cmd);
-   }
- 
-@@ -156,7 +174,10 @@
- #elif defined(OS_LINUX)  // defined(OS_WIN)
- 
- int main(int argc, char* argv[]) {
-+<<<<<<< .our
- #ifdef ENABLE_RUN_AS_NODE
-+=======
-+>>>>>>> .their
-   if (IsEnvSet(kRunAsNode)) {
-     base::i18n::InitializeICU();
-     base::AtExitManager atexit_manager;
-@@ -175,7 +196,10 @@
- #else  // defined(OS_LINUX)
- 
- int main(int argc, char* argv[]) {
-+<<<<<<< .our
- #ifdef ENABLE_RUN_AS_NODE
-+=======
-+>>>>>>> .their
-   if (IsEnvSet(kRunAsNode)) {
-     return AtomInitializeICUandStartNode(argc, argv);
-   }
-added in both
-  our    100644 23e870cf4a32aecfc246a81edad46971b4456a55 atom/app/command_line_args.cc
-  their  100644 1cd98bb5f1acf24a7a00ffd264d7e1551d6a7c90 atom/app/command_line_args.cc
-@@ -2,15 +2,30 @@
- // Use of this source code is governed by the MIT license that can be
- // found in the LICENSE file.
- 
-+<<<<<<< .our
- #include "atom/app/command_line_args.h"
- 
-+=======
-+#include <string>
-+
-+#include "atom/app/command_line_args.h"
-+
-+#include "base/strings/string_util.h"
-+#include "base/strings/utf_string_conversions.h"
-+#include "content/public/common/content_switches.h"
-+
-+>>>>>>> .their
- namespace {
- 
- bool IsUrlArg(const base::CommandLine::CharType* arg) {
-   // the first character must be a letter for this to be a URL
-   auto c = *arg;
-   if (('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z')) {
-+<<<<<<< .our
-     for (auto* p = arg + 1; *p; ++p) {
-+=======
-+    for (auto p = arg + 1; *p; ++p) {
-+>>>>>>> .their
-       c = *p;
- 
-       // colon indicates that the argument starts with a URI scheme
-@@ -31,12 +46,1368 @@
-   return false;
- }
- 
-+<<<<<<< .our
-+=======
-+const char* blacklist[] = {
-+  // node
-+  "inspect",
-+  "inspect-brk",
-+
-+  // chromium switches:
-+  // find ./ -name "*switches.cc" \
-+  //   | xargs grep -P --no-filename "\"\S+\";" \
-+  //   | perl -pe 's|^.*?"(\S+)";|  "$1",|' \
-+  //   | sort | uniq
-+  "?",
-+  "0",
-+  "accept-resource-provider",
-+  "account-consistency",
-+  "adaboost",
-+  "aec-refined-adaptive-filter",
-+  "agc-startup-min-volume",
-+  "aggressive",
-+  "aggressive-cache-discard",
-+  "aggressive-tab-discard",
-+  "all",
-+  "allarticles",
-+  "allow-cross-origin-auth-prompt",
-+  "allow-external-pages",
-+  "allow-failed-policy-fetch-for-test",
-+  "allow-file-access-from-files",
-+  "allow-hidden-media-playback",
-+  "allow-http-background-page",
-+  "allow-http-screen-capture",
-+  "allow-insecure-localhost",
-+  "allow-legacy-extension-manifests",
-+  "allow-loopback-in-peer-connection",
-+  "allow-nacl-crxfs-api",
-+  "allow-nacl-file-handle-api",
-+  "allow-nacl-socket-api",
-+  "allow-no-sandbox-job",
-+  "allow-outdated-plugins",
-+  "allow-ra-in-dev-mode",
-+  "allow-running-insecure-content",
-+  "allow-sandbox-debugging",
-+  "allow-silent-push",
-+  "all-toolchains",
-+  "alsa-check-close-timeout",
-+  "alsa-enable-upsampling",
-+  "alsa-fixed-output-sample-rate",
-+  "alsa-input-device",
-+  "alsa-mute-device-name",
-+  "alsa-mute-element-name",
-+  "alsa-output-avail-min",
-+  "alsa-output-buffer-size",
-+  "alsa-output-device",
-+  "alsa-output-period-size",
-+  "alsa-output-start-threshold",
-+  "alsa-volume-device-name",
-+  "alsa-volume-element-name",
-+  "also-emit-success-logs",
-+  "alternative",
-+  "always-authorize-plugins",
-+  "always-on",
-+  "alwaystrue",
-+  "always-use-complex-text",
-+  "amd-switchable",
-+  "android-fonts-path",
-+  "android-stderr-port",
-+  "android-stdin-port",
-+  "android-stdout-port",
-+  "angle",
-+  "app",
-+  "app-auto-launched",
-+  "app-id",
-+  "apple",
-+  "app-mode-auth-code",
-+  "app-mode-oauth-token",
-+  "app-mode-oem-manifest",
-+  "apps-gallery-download-url",
-+  "apps-gallery-update-url",
-+  "apps-gallery-url",
-+  "app-shell-allow-roaming",
-+  "app-shell-host-window-size",
-+  "app-shell-preferred-network",
-+  "app-shell-refresh-token",
-+  "app-shell-user",
-+  "apps-keep-chrome-alive-in-tests",
-+  "arc-availability",
-+  "arc-available",
-+  "arc-start-mode",
-+  "arc-transition-migration-required",
-+  "args",
-+  "artifacts-dir",
-+  "ash-constrain-pointer-to-root",
-+  "ash-debug-shortcuts",
-+  "ash-dev-shortcuts",
-+  "ash-disable-smooth-screen-rotation",
-+  "ash-disable-tablet-autohide-titlebars",
-+  "ash-disable-touch-exploration-mode",
-+  "ash-enable-magnifier-key-scroller",
-+  "ash-enable-mirrored-screen",
-+  "ash-enable-night-light",
-+  "ash-enable-palette-on-all-displays",
-+  "ash-enable-scale-settings-tray",
-+  "ash-enable-software-mirroring",
-+  "ash-enable-unified-desktop",
-+  "ash-estimated-presentation-delay",
-+  "ash-hide-notifications-for-factory",
-+  "ash-host-window-bounds",
-+  "ash-shelf-color",
-+  "ash-shelf-color-scheme",
-+  "ash-touch-hud",
-+  "ash-webui-init",
-+  "attestation-server",
-+  "audio-buffer-size",
-+  "audio-output-channels",
-+  "aura-legacy-power-button",
-+  "auth-ext-path",
-+  "auth-server-whitelist",
-+  "auth-spnego-account-type",
-+  "auto",
-+  "auto-open-devtools-for-tabs",
-+  "autoplay-policy",
-+  "auto-select-desktop-capture-source",
-+  "blink-settings",
-+  "bootstrap",
-+  "browser",
-+  "browser-startup-dialog",
-+  "browser-subprocess-path",
-+  "browser-test",
-+  "bwsi",
-+  "bypass-app-banner-engagement-checks",
-+  "canvas-msaa-sample-count",
-+  "cast-initial-screen-height",
-+  "cast-initial-screen-width",
-+  "cc-layer-tree-test-long-timeout",
-+  "cc-layer-tree-test-no-timeout",
-+  "cc-rebaseline-pixeltests",
-+  "cellular-first",
-+  "cellular-only",
-+  "check-for-update-interval",
-+  "check-layout-test-sys-deps",
-+  "child-wallpaper-large",
-+  "child-wallpaper-small",
-+  "chrome-home-swipe-logic",
-+  "ChromeOSMemoryPressureHandling",
-+  "cipher-suite-blacklist",
-+  "clamshell",
-+  "class",
-+  "clear-token-service",
-+  "cloud-print-file",
-+  "cloud-print-file-type",
-+  "cloud-print-job-title",
-+  "cloud-print-print-ticket",
-+  "cloud-print-setup-proxy",
-+  "cloud-print-url",
-+  "cloud-print-xmpp-endpoint",
-+  "color",
-+  "compensate-for-unstable-pinch-zoom",
-+  "compile-shader-always-succeeds",
-+  "component-updater",
-+  "connectivity-check-url",
-+  "conservative",
-+  "content-image-texture-target",
-+  "content-shell-host-window-size",
-+  "controller",
-+  "crash-dumps-dir",
-+  "crash-on-failure",
-+  "crash-on-hang-threads",
-+  "crashpad-handler",
-+  "crash-server-url",
-+  "crash-test",
-+  "create-browser-on-startup-for-tests",
-+  "cros-gaia-api-v1",
-+  "crosh-command",
-+  "cros-region",
-+  "cros-regions-mode",
-+  "cryptauth-http-host",
-+  "custom-devtools-frontend",
-+  "custom-launcher-page",
-+  "custom_summary",
-+  "d3d11",
-+  "d3d9",
-+  "d3d-support",
-+  "daemon",
-+  "dark_muted",
-+  "dark_vibrant",
-+  "data-path",
-+  "data-reduction-proxy-config-url",
-+  "data-reduction-proxy-experiment",
-+  "data-reduction-proxy-http-proxies",
-+  "data-reduction-proxy-lo-fi",
-+  "data-reduction-proxy-pingback-url",
-+  "data-reduction-proxy-secure-proxy-check-url",
-+  "data-reduction-proxy-server-experiments-disabled",
-+  "dbus-stub",
-+  "debug-devtools",
-+  "debug-enable-frame-toggle",
-+  "debug-packed-apps",
-+  "debug-print",
-+  "default",
-+  "default-background-color",
-+  "default-tile-height",
-+  "default-tile-width",
-+  "default-wallpaper-is-oem",
-+  "default-wallpaper-large",
-+  "default-wallpaper-small",
-+  "demo",
-+  "derelict-detection-timeout",
-+  "derelict-idle-timeout",
-+  "desktop",
-+  "desktop-window-1080p",
-+  "deterministic-fetch",
-+  "device-management-url",
-+  "device-scale-factor",
-+  "devtools-flags",
-+  "diagnostics",
-+  "diagnostics-format",
-+  "diagnostics-recovery",
-+  "dice",
-+  "dice_fix_auth_errors",
-+  "disable",
-+  "disable-2d-canvas-clip-aa",
-+  "disable-2d-canvas-image-chromium",
-+  "disable-3d-apis",
-+  "disable-accelerated-2d-canvas",
-+  "disable-accelerated-jpeg-decoding",
-+  "disable-accelerated-mjpeg-decode",
-+  "disable-accelerated-video-decode",
-+  "disable-appcontainer",
-+  "disable-app-info-dialog-mac",
-+  "disable-app-list-dismiss-on-blur",
-+  "disable-app-window-cycling",
-+  "disable-arc-data-wipe",
-+  "disable-arc-opt-in-verification",
-+  "disable-audio-support-for-desktop-share",
-+  "disable-avfoundation-overlays",
-+  "disable-backgrounding-occluded-windows",
-+  "disable-background-networking",
-+  "disable-background-timer-throttling",
-+  "disable-backing-store-limit",
-+  "disable-blink-features",
-+  "disable-boot-animation",
-+  "disable-breakpad",
-+  "disable-browser-task-scheduler",
-+  "disable-bundled-ppapi-flash",
-+  "disable-canvas-aa",
-+  "disable-captive-portal-bypass-proxy",
-+  "disable-cast-streaming-hw-encoding",
-+  "disable-checker-imaging",
-+  "disable-clear-browsing-data-counters",
-+  "disable-client-side-phishing-detection",
-+  "disable-cloud-import",
-+  "disable-component-cloud-policy",
-+  "disable-component-extensions-with-background-pages",
-+  "disable-component-update",
-+  "disable-composited-antialiasing",
-+  "disable-contextual-search",
-+  "disabled",
-+  "disable-d3d11",
-+  "disable-databases",
-+  "disable-datasaver-prompt",
-+  "disable-default-apps",
-+  "disable-demo-mode",
-+  "disable-device-disabling",
-+  "disable-device-discovery-notifications",
-+  "disable-dinosaur-easter-egg",
-+  "disable-direct-composition",
-+  "disable-direct-composition-layers",
-+  "disable-directwrite-for-ui",
-+  "disable-display-list-2d-canvas",
-+  "disable-distance-field-text",
-+  "disabled-new-style-notification",
-+  "disable-domain-blocking-for-3d-apis",
-+  "disable-domain-reliability",
-+  "disable-drive-search-in-app-launcher",
-+  "disable-dwm-composition",
-+  "disable-encryption-migration",
-+  "disable-eol-notification",
-+  "disable-es3-apis",
-+  "disable-es3-gl-context",
-+  "disable-extensions",
-+  "disable-extensions-except",
-+  "disable-extensions-file-access-check",
-+  "disable-extensions-http-throttling",
-+  "disable-features",
-+  "disable-field-trial-config",
-+  "disable-file-manager-touch-mode",
-+  "disable-file-system",
-+  "disable-flash-3d",
-+  "disable-flash-stage3d",
-+  "disable-fullscreen-low-power-mode",
-+  "disable-fullscreen-tab-detaching",
-+  "disable-gaia-services",
-+  "disable-gesture-editing",
-+  "disable-gesture-requirement-for-presentation",
-+  "disable-gesture-typing",
-+  "disable-gl-drawing-for-tests",
-+  "disable-gl-error-limit",
-+  "disable-gl-extensions",
-+  "disable-glsl-translator",
-+  "disable-gpu",
-+  "disable-gpu-compositing",
-+  "disable-gpu-driver-bug-workarounds",
-+  "disable-gpu-early-init",
-+  "disable-gpu-memory-buffer-compositor-resources",
-+  "disable-gpu-memory-buffer-video-frames",
-+  "disable-gpu-process-crash-limit",
-+  "disable-gpu-program-cache",
-+  "disable-gpu-rasterization",
-+  "disable-gpu-sandbox",
-+  "disable-gpu-shader-disk-cache",
-+  "disable-gpu-vsync",
-+  "disable-gpu-watchdog",
-+  "disable-hang-monitor",
-+  "disable-hid-detection-on-oobe",
-+  "disable-histogram-customizer",
-+  "disable-hosted-app-shim-creation",
-+  "disable-hosted-apps-in-windows",
-+  "disable-infobars",
-+  "disable-in-process-stack-traces",
-+  "disable-input-ime-api",
-+  "disable-input-view",
-+  "disable-ios-password-suggestions",
-+  "disable-javascript-harmony-shipping",
-+  "disable-kill-after-bad-ipc",
-+  "disable-lcd-text",
-+  "disable-legacy-window",
-+  "disable-local-storage",
-+  "disable-lock-screen-apps",
-+  "disable-logging",
-+  "disable-logging-redirect",
-+  "disable-login-animations",
-+  "disable-login-screen-apps",
-+  "disable-low-end-device-mode",
-+  "disable-low-latency-dxva",
-+  "disable-low-res-tiling",
-+  "disable-machine-cert-request",
-+  "disable-mac-overlays",
-+  "disable-mac-views-native-app-windows",
-+  "disable-main-frame-before-activation",
-+  "disable-md-error-screen",
-+  "disable-md-oobe",
-+  "disable-media-session-api",
-+  "disable-media-suspend",
-+  "disable-merge-key-char-events",
-+  "disable-mojo-local-storage",
-+  "disable-mojo-renderer",
-+  "disable-mtp-write-support",
-+  "disable-multi-display-layout",
-+  "disable-namespace-sandbox",
-+  "disable-native-gpu-memory-buffers",
-+  "disable-network-portal-notification",
-+  "disable-new-korean-ime",
-+  "disable-new-virtual-keyboard-behavior",
-+  "disable-new-zip-unpacker",
-+  "disable-notifications",
-+  "disable-ntp-most-likely-favicons-from-server",
-+  "disable-ntp-popular-sites",
-+  "disable-nv12-dxgi-video",
-+  "disable-offer-store-unmasked-wallet-cards",
-+  "disable-offer-upload-credit-cards",
-+  "disable-office-editing-component-extension",
-+  "disable-offline-auto-reload",
-+  "disable-offline-auto-reload-visible-only",
-+  "disable-origin-trial-controlled-blink-features",
-+  "disable-overscroll-edge-effect",
-+  "disable-panel-fitting",
-+  "disable-partial-raster",
-+  "disable-password-generation",
-+  "disable-pepper-3d",
-+  "disable-pepper-3d-image-chromium",
-+  "disable-permission-action-reporting",
-+  "disable-permissions-api",
-+  "disable-per-user-timezone",
-+  "disable-physical-keyboard-autocorrect",
-+  "disable-pinch",
-+  "disable-pnacl-crash-throttling",
-+  "disable-popup-blocking",
-+  "disable-prefer-compositing-to-lcd-text",
-+  "disable-presentation-api",
-+  "disable-print-preview",
-+  "disable-prompt-on-repost",
-+  "disable-proximity-auth-bluetooth-low-energy-discovery",
-+  "disable-pull-to-refresh-effect",
-+  "disable-push-api-background-mode",
-+  "disable-reading-from-canvas",
-+  "disable-remote-core-animation",
-+  "disable-remote-fonts",
-+  "disable-remote-playback-api",
-+  "disable-renderer-accessibility",
-+  "disable-renderer-backgrounding",
-+  "disable-resize-lock",
-+  "disable-rgba-4444-textures",
-+  "disable-rollback-option",
-+  "disable-rtc-smoothness-algorithm",
-+  "disable-screen-orientation-lock",
-+  "disable-search-geolocation-disclosure",
-+  "disable-seccomp-filter-sandbox",
-+  "disable-setuid-sandbox",
-+  "disable-shader-name-hashing",
-+  "disable-shared-workers",
-+  "disable-signin-promo",
-+  "disable-signin-scoped-device-id",
-+  "disable-single-click-autofill",
-+  "disable-skia-runtime-opts",
-+  "disable-slimming-paint-invalidation",
-+  "disable-slim-navigation-manager",
-+  "disable-smooth-scrolling",
-+  "disable-software-rasterizer",
-+  "disable-speech-api",
-+  "disable-suggestions-ui",
-+  "disable-surface-references",
-+  "disable-sync",
-+  "disable-sync-app-list",
-+  "disable-sync-types",
-+  "disable-system-timezone-automatic-detection",
-+  "disable-tab-for-desktop-share",
-+  "disable-third-party-keyboard-workaround",
-+  "disable-threaded-animation",
-+  "disable-threaded-compositing",
-+  "disable-threaded-scrolling",
-+  "disable-timeouts-for-profiling",
-+  "disable-touch-adjustment",
-+  "disable-touch-drag-drop",
-+  "disable-translate-new-ux",
-+  "disable-usb-keyboard-detect",
-+  "disable-v8-idle-tasks",
-+  "disable-vaapi-accelerated-video-encode",
-+  "disable-virtual-keyboard-overscroll",
-+  "disable-voice-input",
-+  "disable-volume-adjust-sound",
-+  "disable-wake-on-wifi",
-+  "disable-webgl",
-+  "disable-webgl-image-chromium",
-+  "disable-web-notification-custom-layouts",
-+  "disable-webrtc-encryption",
-+  "disable-webrtc-hw-decoding",
-+  "disable-webrtc-hw-encoding",
-+  "disable-web-security",
-+  "disable-win32k-lockdown",
-+  "disable-xss-auditor",
-+  "disable-zero-browsers-open-for-tests",
-+  "disable-zero-copy",
-+  "disable-zero-copy-dxgi-video",
-+  "disallow-non-exact-resource-reuse",
-+  "disk-cache-dir",
-+  "disk-cache-size",
-+  "display",
-+  "dmg-device",
-+  "dns-log-details",
-+  "document-user-activation-required",
-+  "dom-automation",
-+  "dotfile",
-+  "draft",
-+  "draw-view-bounds-rects",
-+  "duck-flash",
-+  "dump-blink-runtime-call-stats",
-+  "dump-browser-histograms",
-+  "dump-dom",
-+  "eafe-path",
-+  "eafe-url",
-+  "easy-unlock-app-path",
-+  "edge-touch-filtering",
-+  "egl",
-+  "elevate",
-+  "embedded-extension-options",
-+  "emphasize-titles-in-omnibox-dropdown",
-+  "emulate-shader-precision",
-+  "enable-accelerated-2d-canvas",
-+  "enable-accelerated-vpx-decode",
-+  "enable-accessibility-tab-switcher",
-+  "enable-adaptive-selection-handle-orientation",
-+  "enable-aggressive-domstorage-flushing",
-+  "enable-android-wallpapers-app",
-+  "enable-appcontainer",
-+  "enable-app-info-dialog-mac",
-+  "enable-app-list",
-+  "enable-app-window-cycling",
-+  "enable-arc",
-+  "enable-arc-oobe-optin",
-+  "enable-async-event-targeting",
-+  "enable-audio-debug-recordings-from-extension",
-+  "enable-audio-focus",
-+  "enable-automation",
-+  "enable-background-fetch-persistence",
-+  "enable-benchmarking",
-+  "enable-ble-advertising-in-apps",
-+  "enable-blink-features",
-+  "enable-bookmark-undo",
-+  "enable-browser-side-navigation",
-+  "enable-browser-task-scheduler",
-+  "enable-cast-receiver",
-+  "enable-checker-imaging",
-+  "enable-chromevox-arc-support",
-+  "enable-clear-browsing-data-counters",
-+  "enable-cloud-print-proxy",
-+  "enable-cloud-print-xps",
-+  "enable-consumer-kiosk",
-+  "enable-contextual-search",
-+  "enable-crash-reporter",
-+  "enable-crash-reporter-for-testing",
-+  "enable-crx-hash-check",
-+  "enabled",
-+  "enabled-2g",
-+  "enabled-3g",
-+  "enable-data-reduction-proxy-bypass-warning",
-+  "enable-data-reduction-proxy-force-pingback",
-+  "enable-data-reduction-proxy-lite-page",
-+  "enable-data-reduction-proxy-savings-promo",
-+  "enable-datasaver-prompt",
-+  "enable-device-discovery-notifications",
-+  "enable-devtools-experiments",
-+  "enable-direct-composition-layers",
-+  "enable-display-list-2d-canvas",
-+  "enable-distance-field-text",
-+  "enable-distillability-service",
-+  "enabled-new-style-notification",
-+  "enable-domain-reliability",
-+  "enable-dom-distiller",
-+  "enable-drive-search-in-app-launcher",
-+  "enable-drm-atomic",
-+  "enabled-slow2g",
-+  "enable-embedded-extension-options",
-+  "enable-encryption-migration",
-+  "enable-encryption-selection",
-+  "enable-es3-apis",
-+  "enable-exclusive-audio",
-+  "enable-experimental-accessibility-features",
-+  "enable-experimental-canvas-features",
-+  "enable-experimental-extension-apis",
-+  "enable-experimental-fullscreen-exit-ui",
-+  "enable-experimental-input-view-features",
-+  "enable-experimental-web-platform-features",
-+  "enable-extension-activity-logging",
-+  "enable-extension-activity-log-testing",
-+  "enable-extension-assets-sharing",
-+  "enable-external-drive-rename",
-+  "enable-fast-unload",
-+  "enable-features",
-+  "enable-file-manager-touch-mode",
-+  "enable-first-run-ui-transitions",
-+  "enable-floating-virtual-keyboard",
-+  "enable-font-antialiasing",
-+  "enable-fullscreen-tab-detaching",
-+  "enable-fullscreen-toolbar-reveal",
-+  "enable-google-branded-context-menu",
-+  "enable-gpu-async-worker-context",
-+  "enable-gpu-benchmarking",
-+  "enable-gpu-client-logging",
-+  "enable-gpu-client-tracing",
-+  "enable-gpu-command-logging",
-+  "enable-gpu-debugging",
-+  "enable-gpu-driver-debug-logging",
-+  "enable-gpu-memory-buffer-compositor-resources",
-+  "enable-gpu-memory-buffer-video-frames",
-+  "enable-gpu-rasterization",
-+  "enable-gpu-service-logging",
-+  "enable-gpu-service-tracing",
-+  "enable-hardware-overlays",
-+  "enable-harfbuzz-rendertext",
-+  "enable-heap-profiling",
-+  "enable-hosted-app-quit-notification",
-+  "enable-hosted-apps-in-windows",
-+  "enable-hotword-hardware",
-+  "enable-hung-renderer-infobar",
-+  "enable-inband-text-tracks",
-+  "enable-input-ime-api",
-+  "enable-instant-tethering",
-+  "enable-internal-media-session",
-+  "enable-ios-handoff-to-other-devices",
-+  "enable-layer-lists",
-+  "enable-lcd-text",
-+  "enable-leak-detection",
-+  "enable-local-file-accesses",
-+  "enable-local-sync-backend",
-+  "enable-logging",
-+  "enable-longpress-drag-selection",
-+  "enable-low-end-device-mode",
-+  "enable-low-res-tiling",
-+  "enable-mac-views-native-app-windows",
-+  "enable-main-frame-before-activation",
-+  "enable-md-feedback",
-+  "enable-media-suspend",
-+  "enable-merge-key-char-events",
-+  "enable-message-center-always-scroll-up-upon-notification-removal",
-+  "enable-nacl",
-+  "enable-nacl-debug",
-+  "enable-nacl-nonsfi-mode",
-+  "enable-native-gpu-memory-buffers",
-+  "enable-natural-scroll-default",
-+  "enable-navigation-tracing",
-+  "enable-net-benchmarking",
-+  "enable-network-information-downlink-max",
-+  "enable-network-portal-notification",
-+  "enable-new-app-menu-icon",
-+  "enable-ntp-most-likely-favicons-from-server",
-+  "enable-ntp-popular-sites",
-+  "enable-ntp-search-engine-country-detection",
-+  "enable-offer-store-unmasked-wallet-cards",
-+  "enable-offer-upload-credit-cards",
-+  "enable-offline-auto-reload",
-+  "enable-offline-auto-reload-visible-only",
-+  "enable-oop-rasterization",
-+  "enable-osk-overscroll",
-+  "enable-override-bookmarks-ui",
-+  "enable-partial-raster",
-+  "enable-password-generation",
-+  "enable-pepper-testing",
-+  "enable-permission-action-reporting",
-+  "enable-physical-keyboard-autocorrect",
-+  "enable-picture-in-picture",
-+  "enable-pinch",
-+  "enable-pixel-canvas-recording",
-+  "enable-pixel-output-in-tests",
-+  "enable-plugin-placeholder-testing",
-+  "enable-potentially-annoying-security-features",
-+  "enable-power-overlay",
-+  "enable-precise-memory-info",
-+  "enable-prefer-compositing-to-lcd-text",
-+  "enable-print-browser",
-+  "enable-print-preview-register-promos",
-+  "enable-profile-shortcut-manager",
-+  "enable-profiling",
-+  "enable-push-api-background-mode",
-+  "enable-refresh-token-annotation-request",
-+  "enable-request-tablet-site",
-+  "enable-rgba-4444-textures",
-+  "enable-sandbox",
-+  "enable-sandbox-logging",
-+  "enable-screenshot-testing-with-mode",
-+  "enable-scripts-require-action",
-+  "enable-scroll-prediction",
-+  "enable-service-manager-tracing",
-+  "enable-sgi-video-sync",
-+  "enable-signin-promo",
-+  "enable-single-click-autofill",
-+  "enable-site-settings",
-+  "enable-skia-benchmarking",
-+  "enable-slimming-paint-invalidation",
-+  "enable-slimming-paint-v2",
-+  "enable-slim-navigation-manager",
-+  "enable-smooth-scrolling",
-+  "enable-spatial-navigation",
-+  "enable-spdy-proxy-auth",
-+  "enable-speech-dispatcher",
-+  "enable-spelling-feedback-field-trial",
-+  "enable-spotlight-actions",
-+  "enable-stats-collection-bindings",
-+  "enable-stats-table",
-+  "enable-strict-mixed-content-checking",
-+  "enable-strict-powerful-feature-restrictions",
-+  "enable-suggestions-ui",
-+  "enable-suggestions-with-substring-match",
-+  "enable-supervised-user-managed-bookmarks-folder",
-+  "enable-surface-synchronization",
-+  "enable-swap-buffers-with-bounds",
-+  "enable-sync-app-list",
-+  "enable-sync-articles",
-+  "enable-tab-audio-muting",
-+  "enable-tablet-splitview",
-+  "enable-tcp-fastopen",
-+  "enable-third-party-keyboard-workaround",
-+  "enable-threaded-compositing",
-+  "enable-threaded-texture-mailboxes",
-+  "enable-tile-compression",
-+  "enable-touch-calibration-setting",
-+  "enable-touch-drag-drop",
-+  "enable-touchpad-three-finger-click",
-+  "enable-touchview",
-+  "enable-trace-app-source",
-+  "enable-tracing",
-+  "enable-tracing-output",
-+  "enable-translate-new-ux",
-+  "enable-ui-devtools",
-+  "enable-usermedia-screen-capturing",
-+  "enable-user-metrics",
-+  "enable-use-zoom-for-dsf",
-+  "enable-video-player-chromecast-support",
-+  "enable-viewport",
-+  "enable-virtual-keyboard",
-+  "enable-voice-interaction",
-+  "enable-vtune-support",
-+  "enable-vulkan",
-+  "enable-wayland-server",
-+  "enable-webfonts-intervention-trigger",
-+  "enable-webfonts-intervention-v2",
-+  "enable-webgl-draft-extensions",
-+  "enable-webgl-image-chromium",
-+  "enable-web-notification-custom-layouts",
-+  "enable-webrtc-event-logging-from-extension",
-+  "enable-webrtc-srtp-aes-gcm",
-+  "enable-webrtc-srtp-encrypted-headers",
-+  "enable-webrtc-stun-origin",
-+  "enable-webview-variations",
-+  "enable-webvr",
-+  "enable-wifi-credential-sync",
-+  "enable-win7-webrtc-hw-h264-decoding",
-+  "enable-zero-copy",
-+  "enable-zip-archiver-on-file-manager",
-+  "encode-binary",
-+  "enforce",
-+  "enforce-gl-minimums",
-+  "enforce_strict",
-+  "enforce-webrtc-ip-permission-check",
-+  "enterprise-disable-arc",
-+  "enterprise-enable-forced-re-enrollment",
-+  "enterprise-enable-license-type-selection",
-+  "enterprise-enable-zero-touch-enrollment",
-+  "enterprise-enrollment-initial-modulus",
-+  "enterprise-enrollment-modulus-limit",
-+  "error-console",
-+  "evaluate_capability",
-+  "evaluate-type",
-+  "experiment",
-+  "explicitly-allowed-ports",
-+  "expose-internals-for-testing",
-+  "extension-content-verification",
-+  "extension-process",
-+  "extensions-install-verification",
-+  "extensions-multi-account",
-+  "extensions-not-webstore",
-+  "extensions-on-chrome-urls",
-+  "extensions-update-frequency",
-+  "extra-search-query-params",
-+  "fail-on-unused-args",
-+  "fake-variations-channel",
-+  "false",
-+  "fast",
-+  "fast-start",
-+  "feedback-server",
-+  "field-trial-handle",
-+  "first-exec-after-boot",
-+  "flag-switches-begin",
-+  "flag-switches-end",
-+  "font-cache-shared-handle",
-+  "force-android-app-mode",
-+  "force-app-mode",
-+  "force-clamshell-power-button",
-+  "force-color-profile",
-+  "force-desktop-ios-promotion",
-+  "force-device-scale-factor",
-+  "force-dev-mode-highlighting",
-+  "force-display-list-2d-canvas",
-+  "force-effective-connection-type",
-+  "force-enable-metrics-reporting",
-+  "force-enable-stylus-tools",
-+  "force-fieldtrial-params",
-+  "force-fieldtrials",
-+  "force-first-run",
-+  "force-first-run-ui",
-+  "force-gpu-mem-available-mb",
-+  "force-gpu-rasterization",
-+  "force-happiness-tracking-system",
-+  "force-load-easy-unlock-app-in-tests",
-+  "force-local-ntp",
-+  "force-login-manager-in-tests",
-+  "force-mediafoundation",
-+  "force-overlay-fullscreen-video",
-+  "force-password-reauth",
-+  "force-pnacl-subzero",
-+  "force-presentation-receiver-for-testing",
-+  "force-renderer-accessibility",
-+  "force-show-update-menu-badge",
-+  "force-show-update-menu-item",
-+  "force-system-compositor-mode",
-+  "force-tablet-mode",
-+  "force-text-direction",
-+  "force-ui-direction",
-+  "force-variation-ids",
-+  "force-video-overlays",
-+  "force-wave-audio",
-+  "force-webrtc-ip-handling-policy",
-+  "full-memory-crash-report",
-+  "gaia-url",
-+  "gcm-checkin-url",
-+  "gcm-mcs-endpoint",
-+  "gcm-registration-url",
-+  "generate-accessibility-test-expectations",
-+  "gl",
-+  "gl-composited-overlay-candidate-quad-border",
-+  "gles",
-+  "gl-shader-interm-output",
-+  "golden-screenshots-dir",
-+  "google-apis-url",
-+  "google-base-url",
-+  "google-doodle-url",
-+  "google-url",
-+  "gpu-active-device-id",
-+  "gpu-active-vendor-id",
-+  "gpu-device-id",
-+  "gpu-driver-date",
-+  "gpu-driver-vendor",
-+  "gpu-driver-version",
-+  "gpu-launcher",
-+  "gpu-no-complete-info-collection",
-+  "gpu-no-context-lost",
-+  "gpu-process",
-+  "gpu-program-cache-size-kb",
-+  "gpu-rasterization-msaa-sample-count",
-+  "gpu-sandbox-allow-sysv-shm",
-+  "gpu-sandbox-failures-fatal",
-+  "gpu-sandbox-start-early",
-+  "gpu-secondary-device-ids",
-+  "gpu-secondary-vendor-ids",
-+  "gpu-startup-dialog",
-+  "gpu-testing-device-id",
-+  "gpu-testing-driver-date",
-+  "gpu-testing-gl-renderer",
-+  "gpu-testing-gl-vendor",
-+  "gpu-testing-gl-version",
-+  "gpu-testing-os-version",
-+  "gpu-testing-secondary-device-ids",
-+  "gpu-testing-secondary-vendor-ids",
-+  "gpu-testing-vendor-id",
-+  "gpu-vendor-id",
-+  "graphics-buffer-count",
-+  "guest-wallpaper-large",
-+  "guest-wallpaper-small",
-+  "h",
-+  "has-chromeos-diamond-key",
-+  "has-chromeos-keyboard",
-+  "has-internal-stylus",
-+  "headless",
-+  "help",
-+  "hide",
-+  "hide-icons",
-+  "hide-scrollbars",
-+  "history-entry-requires-user-gesture",
-+  "homedir",
-+  "homepage",
-+  "host",
-+  "host-pairing-oobe",
-+  "host-resolver-rules",
-+  "icu-data-dir",
-+  "ignore-autocomplete-off-autofill",
-+  "ignore-autoplay-restrictions",
-+  "ignore-certificate-errors",
-+  "ignore-certificate-errors-spki-list",
-+  "ignore-gpu-blacklist",
-+  "ignore-urlfetcher-cert-requests",
-+  "ignore-user-profile-mapping-for-tests",
-+  "incognito",
-+  "in-process-gpu",
-+  "input",
-+  "install-chrome-app",
-+  "install-supervised-user-whitelists",
-+  "instant-process",
-+  "invalidation-use-gcm-channel",
-+  "ipc-connection-timeout",
-+  "ipc-dump-directory",
-+  "ipc-fuzzer-testcase",
-+  "isolate-origins",
-+  "isolate-sites-for-testing",
-+  "is-running-in-mash",
-+  "javascript-harmony",
-+  "js-flags",
-+  "keep-alive-for-test",
-+  "kiosk",
-+  "kiosk-printing",
-+  "lang",
-+  "last-launched-app",
-+  "layer",
-+  "light_muted",
-+  "light_vibrant",
-+  "limit-fps",
-+  "load-and-launch-app",
-+  "load-apps",
-+  "load-extension",
-+  "load-media-router-component-extension",
-+  "local-heuristics-only-for-password-generation",
-+  "local-ntp-reload",
-+  "local-sync-backend-dir",
-+  "log-gpu-control-list-decisions",
-+  "login-manager",
-+  "login-profile",
-+  "login-user",
-+  "log-level",
-+  "log-net-log",
-+  "loopback-i2s-bits",
-+  "loopback-i2s-bus-name",
-+  "loopback-i2s-channels",
-+  "loopback-i2s-rate-hz",
-+  "lso-url",
-+  "ltr",
-+  "main-frame-resizes-are-orientation-changes",
-+  "make-chrome-default",
-+  "make-default-browser",
-+  "managed-user-id",
-+  "managed-user-sync-token",
-+  "markdown",
-+  "market-url-for-testing",
-+  "mark-non-secure-as",
-+  "mash",
-+  "material",
-+  "material-design-ink-drop-animation-speed",
-+  "material-hybrid",
-+  "max-gum-fps",
-+  "max-output-volume-dba1m",
-+  "max-untiled-layer-height",
-+  "max-untiled-layer-width",
-+  "media-cache-size",
-+  "memlog",
-+  "memory-pressure-off",
-+  "memory-pressure-thresholds",
-+  "memory-pressure-thresholds-mb",
-+  "mem-pressure-system-reserved-kb",
-+  "message-center-changes-while-open",
-+  "method",
-+  "metrics-client-id",
-+  "metrics-recording-only",
-+  "mhtml-generator-option",
-+  "mirror",
-+  "mock",
-+  "mojo-local-storage",
-+  "mojo-pipe-token",
-+  "monitoring-destination-id",
-+  "mse-audio-buffer-size-limit",
-+  "mse-video-buffer-size-limit",
-+  "mus",
-+  "mus-config",
-+  "mute-audio",
-+  "nacl-broker",
-+  "nacl-dangerous-no-sandbox-nonsfi",
-+  "nacl-debug-mask",
-+  "nacl-gdb",
-+  "nacl-gdb-script",
-+  "nacl-loader",
-+  "nacl-loader-nonsfi",
-+  "native",
-+  "native-crx-bindings",
-+  "need-arc-migration-policy-check",
-+  "netifs-to-ignore",
-+  "net-log-capture-mode",
-+  "network-country-iso",
-+  "network-settings-config",
-+  "new-window",
-+  "nocolor",
-+  "no-default-browser-check",
-+  "noerrdialogs",
-+  "no-experiments",
-+  "no-first-run",
-+  "no-managed-user-acknowledgment-check",
-+  "none",
-+  "no-network-profile-warning",
-+  "non-material",
-+  "non-secure",
-+  "non-secure-after-editing",
-+  "non-secure-while-incognito",
-+  "non-secure-while-incognito-or-editing",
-+  "no-pings",
-+  "no-proxy-server",
-+  "no-referrers",
-+  "normal_muted",
-+  "normal_vibrant",
-+  "no-sandbox",
-+  "no-service-autorun",
-+  "no-session-id",
-+  "no-startup-window",
-+  "note-taking-app-ids",
-+  "no-user-gesture-required",
-+  "no-wifi",
-+  "no-zygote",
-+  "ntp-snippets-add-incomplete",
-+  "null",
-+  "num-raster-threads",
-+  "oauth2-client-id",
-+  "oauth2-client-secret",
-+  "off",
-+  "on",
-+  "oobe-bootstrapping-master",
-+  "oobe-force-show-screen",
-+  "oobe-guest-session",
-+  "oobe-skip-postlogin",
-+  "oobe-timer-interval",
-+  "open-ash",
-+  "opengraph",
-+  "original-process-start-time",
-+  "origin-trial-disabled-features",
-+  "origin-trial-disabled-tokens",
-+  "origin-trial-public-key",
-+  "osmesa",
-+  "output",
-+  "override",
-+  "override-metrics-upload-url",
-+  "override-plugin-power-saver-for-testing",
-+  "override-use-software-gl-for-tests",
-+  "overscroll-history-navigation",
-+  "overscroll-start-threshold",
-+  "ozone-dump-file",
-+  "ozone-platform",
-+  "pack-extension",
-+  "pack-extension-key",
-+  "parent-profile",
-+  "parent-window",
-+  "passive-listeners-default",
-+  "password-store",
-+  "permission-request-api-scope",
-+  "permission-request-api-url",
-+  "ppapi",
-+  "ppapi-antialiased-text-enabled",
-+  "ppapi-broker",
-+  "ppapi-flash-args",
-+  "ppapi-flash-path",
-+  "ppapi-flash-version",
-+  "ppapi-in-process",
-+  "ppapi-plugin-launcher",
-+  "ppapi-startup-dialog",
-+  "ppapi-subpixel-rendering-setting",
-+  "/prefetch:1",
-+  "/prefetch:2",
-+  "/prefetch:3",
-+  "/prefetch:4",
-+  "/prefetch:5",
-+  "/prefetch:6",
-+  "/prefetch:8",
-+  "previous-app",
-+  "primary",
-+  "print-to-pdf",
-+  "privet-ipv6-only",
-+  "process-per-site",
-+  "process-per-tab",
-+  "product-version",
-+  "profile-directory",
-+  "profiler-timing",
-+  "profiling-at-start",
-+  "profiling-file",
-+  "profiling-flush",
-+  "progress-bar-animation",
-+  "progress-bar-completion",
-+  "prompt-for-external-extensions",
-+  "proxy-auto-detect",
-+  "proxy-bypass-list",
-+  "proxy-pac-url",
-+  "proxy-server",
-+  "pull-to-refresh",
-+  "q",
-+  "rdp_desktop_session",
-+  "reader-mode-feedback",
-+  "reader-mode-heuristics",
-+  "rebaseline-pixel-tests",
-+  "record-type",
-+  "reduced-referrer-granularity",
-+  "reduce-security-for-testing",
-+  "register-font-files",
-+  "register-pepper-plugins",
-+  "relauncher",
-+  "remote-debugging-address",
-+  "remote-debugging-port",
-+  "remote-debugging-socket-fd",
-+  "remote-debugging-socket-name",
-+  "remote-debugging-targets",
-+  "renderer",
-+  "renderer-client-id",
-+  "renderer-cmd-prefix",
-+  "renderer-process-limit",
-+  "renderer-startup-dialog",
-+  "renderer-wait-for-java-debugger",
-+  "renderpass",
-+  "repl",
-+  "report-vp9-as-an-unsupported-mime-type",
-+  "require-audio-hardware-for-testing",
-+  "reset-app-list-install-state",
-+  "reset-variation-state",
-+  "restore-last-session",
-+  "root",
-+  "root-layer-scrolls",
-+  "rtl",
-+  "run-all-compositor-stages-before-draw",
-+  "run-layout-test",
-+  "runtime-deps-list-file",
-+  "safebrowsing-disable-auto-update",
-+  "safebrowsing-disable-download-protection",
-+  "safebrowsing-disable-extension-blacklist",
-+  "safebrowsing-manual-download-blacklist",
-+  "SafeSites",
-+  "sandbox-ipc",
-+  "save-page-as-mhtml",
-+  "screen-config",
-+  "screenshot",
-+  "script-executable",
-+  "scripts-require-action",
-+  "search-provider-logo-url",
-+  "secondary",
-+  "secondary-display-layout",
-+  "secondary-ui-md",
-+  "service",
-+  "service-manager",
-+  "service-name",
-+  "service-pipe-token",
-+  "service-request-channel-token",
-+  "service-runner",
-+  "shared-files",
-+  "shill-stub",
-+  "show-app-list",
-+  "show-autofill-signatures",
-+  "show-autofill-type-predictions",
-+  "show-cert-link",
-+  "show-component-extension-options",
-+  "show-composited-layer-borders",
-+  "show-fps-counter",
-+  "show-icons",
-+  "show-layer-animation-bounds",
-+  "show-login-dev-overlay",
-+  "show-mac-overlay-borders",
-+  "show-md-login",
-+  "show-non-md-login",
-+  "show-overdraw-feedback",
-+  "show-paint-rects",
-+  "show-property-changed-rects",
-+  "show-saved-copy",
-+  "show-screenspace-rects",
-+  "show-surface-damage-rects",
-+  "silent-debugger-extension-api",
-+  "silent-launch",
-+  "simulate-critical-update",
-+  "simulate-elevated-recovery",
-+  "simulate-outdated",
-+  "simulate-outdated-no-au",
-+  "simulate-upgrade",
-+  "single-process",
-+  "site-per-process",
-+  "skip-gpu-data-loading",
-+  "skip-nostore-all",
-+  "skip-nostore-main",
-+  "skip-reencoding-on-skp-capture",
-+  "slow",
-+  "slow-connections-only",
-+  "slow-down-compositing-scale-factor",
-+  "slow-down-raster-scale-factor",
-+  "sms-test-messages",
-+  "spdy-proxy-auth-fallback",
-+  "spdy-proxy-auth-origin",
-+  "spdy-proxy-auth-value",
-+  "spelling-service-feedback-interval-seconds",
-+  "spelling-service-feedback-url",
-+  "spurious-power-button-accel-count",
-+  "spurious-power-button-keyboard-accel",
-+  "spurious-power-button-lid-angle-change",
-+  "spurious-power-button-screen-accel",
-+  "spurious-power-button-window",
-+  "ssl-key-log-file",
-+  "ssl-version-max",
-+  "ssl-version-min",
-+  "stable-release-mode",
-+  "started",
-+  "start-fullscreen",
-+  "start-maximized",
-+  "start-stack-profiler",
-+  "stub",
-+  "stub-cros-settings",
-+  "surface",
-+  "swiftshader",
-+  "swiftshader-webgl",
-+  "sync-allow-insecure-xmpp-connection",
-+  "sync-deferred-startup-timeout-seconds",
-+  "sync-disable-deferred-startup",
-+  "sync-enable-get-update-avoidance",
-+  "sync-notification-host-port",
-+  "sync-on-draw-hardware",
-+  "sync-short-initial-retry-override",
-+  "sync-short-nudge-delay-for-test",
-+  "sync-url",
-+  "system-developer-mode",
-+  "system-log-upload-frequency",
-+  "tab-management-experiment-type-disabled",
-+  "tab-management-experiment-type-elderberry",
-+  "task-manager-show-extra-renderers",
-+  "task-profiler",
-+  "team-drives",
-+  "test-auto-update-ui",
-+  "test-child-process",
-+  "test-cros-gaia-id-migration",
-+  "test-do-not-initialize-icu",
-+  "test-encryption-migration-ui",
-+  "test-gl-lib",
-+  "testing-fixed-http-port",
-+  "testing-fixed-https-port",
-+  "test-launcher-batch-limit",
-+  "test-launcher-bot-mode",
-+  "test-launcher-debug-launcher",
-+  "test-launcher-filter-file",
-+  "test-launcher-force-run-broken-tests",
-+  "test-launcher-jobs",
-+  "test-launcher-list-tests",
-+  "test-launcher-output",
-+  "test-launcher-print-test-stdio",
-+  "test-launcher-print-writable-path",
-+  "test-launcher-retry-limit",
-+  "test-launcher-shard-index",
-+  "test-launcher-summary-output",
-+  "test-launcher-test-part-results-limit",
-+  "test-launcher-timeout",
-+  "test-launcher-total-shards",
-+  "test-launcher-trace",
-+  "test-name",
-+  "test-tiny-timeout",
-+  "test-type",
-+  "tether-stub",
-+  "third-party-doodle-url",
-+  "threads",
-+  "time",
-+  "timeout",
-+  "tls1",
-+  "tls1.1",
-+  "tls1.2",
-+  "tls1.3",
-+  "tls13-variant",
-+  "top-chrome-md",
-+  "top-controls-hide-threshold",
-+  "top-controls-show-threshold",
-+  "touch-calibration",
-+  "touch-devices",
-+  "touch-events",
-+  "touch-noise-filtering",
-+  "touch-selection-strategy",
-+  "touch_view",
-+  "trace-config-file",
-+  "trace-export-events-to-etw",
-+  "tracelog",
-+  "trace-shutdown",
-+  "trace-shutdown-file",
-+  "trace-startup",
-+  "trace-startup-duration",
-+  "trace-startup-file",
-+  "trace-to-console",
-+  "trace-to-file",
-+  "trace-to-file-name",
-+  "trace-upload-url",
-+  "translate-ranker-model-url",
-+  "translate-script-url",
-+  "translate-security-origin",
-+  "true",
-+  "trusted-download-sources",
-+  "try-chrome-again",
-+  "try-supported-channel-layouts",
-+  "type",
-+  "ui-disable-partial-swap",
-+  "ui-enable-layer-lists",
-+  "ui-enable-rgba-4444-textures",
-+  "ui-enable-zero-copy",
-+  "ui-prioritize-in-gpu-process",
-+  "ui-show-composited-layer-borders",
-+  "ui-show-fps-counter",
-+  "ui-show-layer-animation-bounds",
-+  "ui-show-paint-rects",
-+  "ui-show-property-changed-rects",
-+  "ui-show-screenspace-rects",
-+  "ui-show-surface-damage-rects",
-+  "ui-slow-animations",
-+  "ui-test-action-max-timeout",
-+  "ui-test-action-timeout",
-+  "uninstall",
-+  "unlimited-storage",
-+  "unsafely-allow-protected-media-identifier-for-domain",
-+  "unsafely-treat-insecure-origin-as-secure",
-+  "unsafe-pac-url",
-+  "use-angle",
-+  "use-cras",
-+  "use-fake-device-for-media-stream",
-+  "use-fake-jpeg-decode-accelerator",
-+  "use-fake-ui-for-media-stream",
-+  "use-file-for-fake-audio-capture",
-+  "use-file-for-fake-video-capture",
-+  "use-first-display-as-internal",
-+  "use-gl",
-+  "use-gpu-in-tests",
-+  "use-ime-service",
-+  "use-mobile-user-agent",
-+  "use-mock-keychain",
-+  "use-passthrough-cmd-decoder",
-+  "user-agent",
-+  "user-always-affiliated",
-+  "user-data-dir",
-+  "user-gesture-required",
-+  "user-gesture-required-for-cross-origin",
-+  "use-skia-renderer",
-+  "use-system-default-printer",
-+  "use-test-config",
-+  "use-viz-hit-test",
-+  "utility",
-+  "utility-allowed-dir",
-+  "utility-cmd-prefix",
-+  "utility-run-elevated",
-+  "utility-sandbox-type",
-+  "utility-startup-dialog",
-+  "v",
-+  "v2-sandbox",
-+  "v2-sandbox-enabled",
-+  "v8-cache-options",
-+  "v8-cache-strategies-for-cache-storage",
-+  "validate-crx",
-+  "validate-input-event-stream",
-+  "variations-override-country",
-+  "variations-server-url",
-+  "version",
-+  "video-image-texture-target",
-+  "video-threads",
-+  "video-underflow-threshold-ms",
-+  "virtual-time-budget",
-+  "vmodule",
-+  "voice-interaction-supported-locales",
-+  "wait-for-debugger",
-+  "wait-for-debugger-children",
-+  "wake-on-wifi-packet",
-+  "wallet-service-use-sandbox",
-+  "watcher",
-+  "waveout-buffers",
-+  "webapk-server-url",
-+  "webrtc-stun-probe-trial",
-+  "webview-enable-safebrowsing-support",
-+  "webview-sandboxed-renderer",
-+  "whitelisted-extension-id",
-+  "window-position",
-+  "windows10-custom-titlebar",
-+  "window-size",
-+  "window-workspace",
-+  "winhttp-proxy-resolver",
-+  "win-jumplist-action",
-+  "wm-window-animations-disabled",
-+  "yield-between-content-script-runs",
-+  "zygote",
-+  "zygote-cmd-prefix"
-+};
-+
-+bool IsBlacklistedArg(const base::CommandLine::CharType* arg) {
-+#if defined(OS_WIN)
-+  const auto converted = base::WideToUTF8(arg);
-+  const char* a = converted.c_str();
-+#else
-+  const char* a = arg;
-+#endif
-+
-+  static const char* prefixes[] = {"--", "-", "/"};
-+
-+  int prefix_length = 0;
-+  for (auto& prefix : prefixes) {
-+    if (base::StartsWith(a, prefix, base::CompareCase::SENSITIVE)) {
-+      prefix_length = strlen(prefix);
-+      break;
-+    }
-+  }
-+
-+  if (prefix_length > 0) {
-+    a += prefix_length;
-+    std::string switch_name =
-+        base::ToLowerASCII(base::StringPiece(a, strcspn(a, "=")));
-+    for (auto& item : blacklist) {
-+      if (switch_name == item)
-+        return true;
-+    }
-+  }
-+
-+  return false;
-+}
-+
-+>>>>>>> .their
- }  // namespace
- 
- namespace atom {
- 
- bool CheckCommandLineArguments(int argc, base::CommandLine::CharType** argv) {
-   const base::CommandLine::StringType dashdash(2, '-');
-+<<<<<<< .our
-   bool block_args = false;
-   for (int i = 0; i < argc; ++i) {
-     if (argv[i] == dashdash)
-@@ -45,6 +1416,17 @@
-       return false;
-     } else if (IsUrlArg(argv[i])) {
-       block_args = true;
-+=======
-+  bool block_blacklisted_args = false;
-+  for (int i = 0; i < argc; ++i) {
-+    if (argv[i] == dashdash)
-+      break;
-+    if (block_blacklisted_args) {
-+      if (IsBlacklistedArg(argv[i]))
-+        return false;
-+    } else if (IsUrlArg(argv[i])) {
-+      block_blacklisted_args = true;
-+>>>>>>> .their
-     }
-   }
-   return true;
-added in both
-  our    100644 2c0acc1648ff3b4bc574f000643069f8ef8e94bb atom/app/command_line_args.h
-  their  100644 1f5fd756868898e7a304c754d89625059d36441f atom/app/command_line_args.h
-@@ -14,3 +14,7 @@
- }  // namespace atom
- 
- #endif  // ATOM_APP_COMMAND_LINE_ARGS_H_
-+<<<<<<< .our
-+=======
-+
-+>>>>>>> .their
-changed in both
-  base   100644 1024bb0c6ccbe529f8302e1d08cf48ce147ff364 atom/browser/api/atom_api_app.cc
-  our    100644 089a2b63d1bae3afebea925582a3aac81ddeaa4f atom/browser/api/atom_api_app.cc
-  their  100644 03a6fd0c745a88dfe470e4235a3efcc25cdd37e1 atom/browser/api/atom_api_app.cc
-changed in both
-  base   100644 77c3212e2e02cbfd1187c630cd6c04942a7fc14a atom/browser/atom_browser_client.cc
-  our    100644 57c4ee582405e6d501ec23940ccb10689ecd64a1 atom/browser/atom_browser_client.cc
-  their  100644 af4de9f924b98b659722cd9ef4e22b9e7652ce30 atom/browser/atom_browser_client.cc
-@@ -27,6 +27,7 @@
- #include "base/command_line.h"
- #include "base/environment.h"
- #include "base/files/file_util.h"
-+#include "base/path_service.h"
- #include "base/stl_util.h"
- #include "base/strings/string_number_conversions.h"
- #include "base/strings/string_util.h"
-@@ -41,7 +42,10 @@
- #include "content/public/browser/site_instance.h"
- #include "content/public/browser/web_contents.h"
- #include "content/public/common/content_paths.h"
-+<<<<<<< .our
- #include "content/public/common/content_switches.h"
-+=======
-+>>>>>>> .their
- #include "content/public/common/url_constants.h"
- #include "content/public/common/web_preferences.h"
- #include "net/ssl/ssl_cert_request_info.h"
-@@ -296,6 +300,7 @@
-     base::CommandLine* command_line,
-     int process_id) {
-   // Make sure we're about to launch a known executable
-+<<<<<<< .our
-   {
-     base::FilePath child_path;
-     PathService::Get(content::CHILD_PROCESS_EXE, &child_path);
-@@ -307,6 +312,14 @@
-   std::string process_type =
-       command_line->GetSwitchValueASCII(::switches::kProcessType);
-   if (process_type != ::switches::kRendererProcess)
-+=======
-+  base::FilePath child_path;
-+  PathService::Get(content::CHILD_PROCESS_EXE, &child_path);
-+  CHECK(base::MakeAbsoluteFilePath(command_line->GetProgram()) == child_path);
-+
-+  std::string process_type = command_line->GetSwitchValueASCII("type");
-+  if (process_type != "renderer")
-+>>>>>>> .their
-     return;
- 
-   // Copy following switches to child process.
-changed in both
-  base   100644 abd2fb53f1e2ad7b6df9f25f216b5ccb9d6dc7c6 atom/browser/atom_resource_dispatcher_host_delegate.cc
-  our    100644 934b0ebaa49b711490c58fc73b91985633cba439 atom/browser/atom_resource_dispatcher_host_delegate.cc
-  their  100644 12038ff1bf501dffa1df6512d7a66cfa3666bd29 atom/browser/atom_resource_dispatcher_host_delegate.cc
-@@ -5,13 +5,24 @@
- #include "atom/browser/atom_resource_dispatcher_host_delegate.h"
- 
- #include "atom/browser/atom_browser_context.h"
-+<<<<<<< .our
- #include "atom/browser/web_contents_permission_helper.h"
- #include "atom/browser/web_contents_preferences.h"
-+=======
-+#include "atom/browser/login_handler.h"
-+#include "atom/browser/web_contents_permission_helper.h"
-+#include "atom/browser/web_contents_preferences.h"
-+#include "atom/common/atom_constants.h"
-+>>>>>>> .their
- #include "atom/common/platform_util.h"
- #include "base/strings/utf_string_conversions.h"
- #include "content/public/browser/browser_thread.h"
- #include "content/public/browser/download_manager.h"
-+<<<<<<< .our
- #include "content/public/browser/render_frame_host.h"
-+=======
-+#include "content/public/browser/stream_info.h"
-+>>>>>>> .their
- #include "net/base/escape.h"
- #include "url/gurl.h"
- 
-@@ -69,6 +80,7 @@
-   if (!web_contents)
-     return;
- 
-+<<<<<<< .our
-   auto* web_preferences = WebContentsPreferences::From(web_contents);
-   if (!web_preferences || !web_preferences->IsEnabled(options::kPlugins)) {
-     auto* browser_context = web_contents->GetBrowserContext();
-@@ -78,6 +90,16 @@
-     download_manager->DownloadUrl(
-         content::DownloadUrlParameters::CreateForWebContentsMainFrame(
-             web_contents, original_url, NO_TRAFFIC_ANNOTATION_YET));
-+=======
-+  if (!WebContentsPreferences::IsPluginsEnabled(web_contents)) {
-+    auto browser_context = web_contents->GetBrowserContext();
-+    auto download_manager =
-+      content::BrowserContext::GetDownloadManager(browser_context);
-+
-+    download_manager->DownloadUrl(
-+        content::DownloadUrlParameters::CreateForWebContentsMainFrame(
-+            web_contents, original_url));
-+>>>>>>> .their
-     return;
-   }
- 
-changed in both
-  base   100644 9610d80693b1670f696f82812442419504d61454 atom/browser/relauncher.cc
-  our    100644 35c6785e3d87d21eaea27ad5818434d870326047 atom/browser/relauncher.cc
-  their  100644 9dfb6edd06661f302ca7498a2ba34f0ce70c938b atom/browser/relauncher.cc
-changed in both
-  base   100644 d260d2e71f37054b1d948ae5ace28bbfd557cc7d atom/browser/resources/mac/Info.plist
-  our    100644 9094f0f7335edf833d51f688851e6a105de60433 atom/browser/resources/mac/Info.plist
-  their  100644 f752915815a454c7bd99b1c285c7438e3303261a atom/browser/resources/mac/Info.plist
-@@ -17,9 +17,15 @@
-   <key>CFBundleIconFile</key>
-   <string>electron.icns</string>
-   <key>CFBundleVersion</key>
-+<<<<<<< .our
-   <string>4.0.0</string>
-   <key>CFBundleShortVersionString</key>
-   <string>4.0.0</string>
-+=======
-+  <string>1.6.18</string>
-+  <key>CFBundleShortVersionString</key>
-+  <string>1.6.18</string>
-+>>>>>>> .their
-   <key>LSApplicationCategoryType</key>
-   <string>public.app-category.developer-tools</string>
-   <key>LSMinimumSystemVersion</key>
-changed in both
-  base   100644 de126c8f957c96561b27cfa62212ac1d2f3ea36c atom/browser/resources/win/atom.rc
-  our    100644 c0bd831e8bddf10180f75cd40694831e2e98622d atom/browser/resources/win/atom.rc
-  their  100644 b7bed46340edf0b11522421b793d3e9b3be8c205 atom/browser/resources/win/atom.rc
-@@ -56,8 +56,13 @@
- //
- 
- VS_VERSION_INFO VERSIONINFO
-+<<<<<<< .our
-  FILEVERSION 4,0,0,20180821
-  PRODUCTVERSION 4,0,0,20180821
-+=======
-+ FILEVERSION 1,6,18,0
-+ PRODUCTVERSION 1,6,18,0
-+>>>>>>> .their
-  FILEFLAGSMASK 0x3fL
- #ifdef _DEBUG
-  FILEFLAGS 0x1L
-@@ -74,12 +79,20 @@
-         BEGIN
-             VALUE "CompanyName", "GitHub, Inc."
-             VALUE "FileDescription", "Electron"
-+<<<<<<< .our
-             VALUE "FileVersion", "4.0.0"
-+=======
-+            VALUE "FileVersion", "1.6.18"
-+>>>>>>> .their
-             VALUE "InternalName", "electron.exe"
-             VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
-             VALUE "OriginalFilename", "electron.exe"
-             VALUE "ProductName", "Electron"
-+<<<<<<< .our
-             VALUE "ProductVersion", "4.0.0"
-+=======
-+            VALUE "ProductVersion", "1.6.18"
-+>>>>>>> .their
-             VALUE "SquirrelAwareVersion", "1"
-         END
-     END
-changed in both
-  base   100644 266d10b96db9b8fb553f94027a9bc871008e5c38 atom/browser/ui/views/global_menu_bar_x11.cc
-  our    100644 656bd8f991f87c06a240cdc09a3bfcd500d1c1c8 atom/browser/ui/views/global_menu_bar_x11.cc
-  their  100644 b3f37880ce8b302c5a805e81c62d1b52df1a99c0 atom/browser/ui/views/global_menu_bar_x11.cc
-@@ -159,9 +159,15 @@
- std::string GetMenuModelStatus(AtomMenuModel* model) {
-   std::string ret;
-   for (int i = 0; i < model->GetItemCount(); ++i) {
-+<<<<<<< .our
-     int status = model->GetTypeAt(i) | (model->IsVisibleAt(i) << 3) |
-                  (model->IsEnabledAt(i) << 4) |
-                  (model->IsItemCheckedAt(i) << 5);
-+=======
-+    int status = model->GetTypeAt(i) | (model->IsVisibleAt(i) << 3)
-+                                     | (model->IsEnabledAt(i) << 4)
-+                                     | (model->IsItemCheckedAt(i) << 5);
-+>>>>>>> .their
-     ret += base::StringPrintf(
-         "%s-%X\n", base::UTF16ToUTF8(model->GetLabelAt(i)).c_str(), status);
-   }
-changed in both
-  base   100644 7bb8605039a10e0c98d75559052a3f7701f1e9c1 atom/browser/web_contents_preferences.cc
-  our    100644 c21c93383155091a7481cdd4e741cefad90a4a55 atom/browser/web_contents_preferences.cc
-  their  100644 14e82398ccf86316cf2df336a583d143475a77d2 atom/browser/web_contents_preferences.cc
-@@ -334,10 +334,44 @@
-     }
-   }
- 
-+<<<<<<< .our
-   // We are appending args to a webContents so let's save the current state
-   // of our preferences object so that during the lifetime of the WebContents
-   // we can fetch the options used to initally configure the WebContents
-   last_preference_ = preference_.Clone();
-+=======
-+  if (window) {
-+    bool visible = window->IsVisible() && !window->IsMinimized();
-+    if (!visible)  // Default state is visible.
-+      command_line->AppendSwitch(switches::kHiddenPage);
-+  }
-+}
-+
-+bool WebContentsPreferences::IsPreferenceEnabled(
-+    const std::string& attribute_name,
-+    content::WebContents* web_contents) {
-+  WebContentsPreferences* self;
-+  if (!web_contents)
-+    return false;
-+
-+  self = FromWebContents(web_contents);
-+  if (!self)
-+    return false;
-+
-+  base::DictionaryValue& web_preferences = self->web_preferences_;
-+  bool bool_value = false;
-+  web_preferences.GetBoolean(attribute_name, &bool_value);
-+  return bool_value;
-+}
-+
-+bool WebContentsPreferences::IsSandboxed(content::WebContents* web_contents) {
-+  return IsPreferenceEnabled("sandbox", web_contents);
-+}
-+
-+bool WebContentsPreferences::IsPluginsEnabled(
-+    content::WebContents* web_contents) {
-+  return IsPreferenceEnabled("plugins", web_contents);
-+>>>>>>> .their
- }
- 
- void WebContentsPreferences::OverrideWebkitPrefs(
-changed in both
-  base   100644 f6e44c51b10abbd3cf3c5c8b94956347a029e521 atom/browser/web_contents_preferences.h
-  our    100644 d835347afcd259f473f95271a2c19e42afcc6f2b atom/browser/web_contents_preferences.h
-  their  100644 607b4223852c3e7cd1e58e3812285f235699d3cb atom/browser/web_contents_preferences.h
-@@ -29,8 +29,27 @@
- class WebContentsPreferences
-     : public content::WebContentsUserData<WebContentsPreferences> {
-  public:
-+<<<<<<< .our
-   // Get self from WebContents.
-   static WebContentsPreferences* From(content::WebContents* web_contents);
-+=======
-+  // Get WebContents according to process ID.
-+  // FIXME(zcbenz): This method does not belong here.
-+  static content::WebContents* GetWebContentsFromProcessID(int process_id);
-+
-+  // Append command paramters according to |web_contents|'s preferences.
-+  static void AppendExtraCommandLineSwitches(
-+      content::WebContents* web_contents, base::CommandLine* command_line);
-+
-+  static bool IsPreferenceEnabled(const std::string& attribute_name,
-+                                  content::WebContents* web_contents);
-+  static bool IsSandboxed(content::WebContents* web_contents);
-+  static bool IsPluginsEnabled(content::WebContents* web_contents);
-+
-+  // Modify the WebPreferences according to |web_contents|'s preferences.
-+  static void OverrideWebkitPrefs(
-+      content::WebContents* web_contents, content::WebPreferences* prefs);
-+>>>>>>> .their
- 
-   WebContentsPreferences(content::WebContents* web_contents,
-                          const mate::Dictionary& web_preferences);
-changed in both
-  base   100644 08880ffe4a3591d9010f55ef18ce288e69101fe1 atom/common/atom_command_line.cc
-  our    100644 287e43f75fef778948ef9acdac8b9a7edfe07d0a atom/common/atom_command_line.cc
-  their  100644 54420b533a6b2600a87c95645b73bc01fbf0122f atom/common/atom_command_line.cc
-changed in both
-  base   100644 5e7df1040f829acfc43130f307f41c3819b258c5 atom/common/atom_version.h
-  our    100644 65e7d19911559a40b1b258319df5fe0fa180354f atom/common/atom_version.h
-  their  100644 d4aefe90dd22ed5d783ab5ec42ef2b7593c47180 atom/common/atom_version.h
-@@ -5,10 +5,22 @@
- #ifndef ATOM_COMMON_ATOM_VERSION_H_
- #define ATOM_COMMON_ATOM_VERSION_H_
- 
-+<<<<<<< .our
- #define ATOM_MAJOR_VERSION 4
- #define ATOM_MINOR_VERSION 0
- #define ATOM_PATCH_VERSION 0
- #define ATOM_PRE_RELEASE_VERSION -nightly.20180821
-+=======
-+#define ATOM_MAJOR_VERSION 1
-+#define ATOM_MINOR_VERSION 6
-+#define ATOM_PATCH_VERSION 18
-+
-+#define ATOM_VERSION_IS_RELEASE 1
-+
-+#ifndef ATOM_TAG
-+# define ATOM_TAG ""
-+#endif
-+>>>>>>> .their
- 
- #ifndef ATOM_STRINGIFY
- #define ATOM_STRINGIFY(n) ATOM_STRINGIFY_HELPER(n)
-changed in both
-  base   100644 ae757b1da88331bf904df6e2198d5aa222a4149b atom/common/node_bindings.cc
-  our    100644 e6aded2e661af919c2d89c2f9bd46b4921d4aec4 atom/common/node_bindings.cc
-  their  100644 b5f1379059e24aa6b9823d1ed011ee8907a312d5 atom/common/node_bindings.cc
-@@ -228,8 +228,12 @@
- }
- 
- node::Environment* NodeBindings::CreateEnvironment(
-+<<<<<<< .our
-     v8::Handle<v8::Context> context,
-     node::MultiIsolatePlatform* platform) {
-+=======
-+    v8::Handle<v8::Context> context) {
-+>>>>>>> .their
- #if defined(OS_WIN)
-   auto& atom_args = AtomCommandLine::argv();
-   std::vector<std::string> args(atom_args.size());
-@@ -255,8 +259,13 @@
-   base::FilePath resources_path = GetResourcesPath(browser_env_ == BROWSER);
-   base::FilePath script_path =
-       resources_path.Append(FILE_PATH_LITERAL("electron.asar"))
-+<<<<<<< .our
-           .Append(process_type)
-           .Append(FILE_PATH_LITERAL("init.js"));
-+=======
-+                    .Append(process_type)
-+                    .Append(FILE_PATH_LITERAL("init.js"));
-+>>>>>>> .their
-   args.insert(args.begin() + 1, script_path.AsUTF8Unsafe());
- 
-   std::unique_ptr<const char* []> c_argv = StringVectorToArgArray(args);
-changed in both
-  base   100644 f103b89391d3bc54d364e48c39f45e971c15dbe8 atom/renderer/api/atom_api_web_frame.cc
-  our    100644 f0f7ef249d73876f7107d3d3865e8fc71ee33945 atom/renderer/api/atom_api_web_frame.cc
-  their  100644 0bc9e6ea4e81e33b183f11222999846faacc12c6 atom/renderer/api/atom_api_web_frame.cc
-@@ -282,9 +282,18 @@
- }
- 
- void WebFrame::InsertText(const std::string& text) {
-+<<<<<<< .our
-   web_frame_->FrameWidget()->GetActiveWebInputMethodController()->CommitText(
-       blink::WebString::FromUTF8(text),
-       blink::WebVector<blink::WebImeTextSpan>(), blink::WebRange(), 0);
-+=======
-+  web_frame_->frameWidget()
-+            ->getActiveWebInputMethodController()
-+            ->commitText(blink::WebString::fromUTF8(text),
-+                         blink::WebVector<blink::WebCompositionUnderline>(),
-+                         blink::WebRange(),
-+                         0);
-+>>>>>>> .their
- }
- 
- void WebFrame::InsertCSS(const std::string& css) {
-changed in both
-  base   100644 5dafe084ce279a8b1b761d8cb7b7aa9c4469c504 atom/renderer/atom_renderer_client.cc
-  our    100644 204f17c2cf0d2d4ec4a71bdbecfcd1cbdc5fc8be atom/renderer/atom_renderer_client.cc
-  their  100644 f8744b7be8236b5bb200654aa28bb6f653d3a479 atom/renderer/atom_renderer_client.cc
-changed in both
-  base   100644 cf537474af244ef281567dc03879ca88400340c5 docs/api/app.md
-  our    100644 14dc557e237404cbbd5bcebabb0e65486dc36926 docs/api/app.md
-  their  100644 614989dc99c609075fb7d34782cffc237b141db6 docs/api/app.md
-@@ -773,6 +773,8 @@
- 
- Returns `Boolean`
- 
-+Returns `Boolean`.
-+
- This method makes your application a Single Instance Application - instead of
- allowing multiple instances of your app to run, this will ensure that only a
- single instance of your app is running, and other instances signal this
-changed in both
-  base   100644 3b7e6f9b9bf39edf56e18c0c9bd533ecc460593e docs/api/browser-view.md
-  our    100644 ee1780942db5565c9c9a9e3a4139345c413e1eb9 docs/api/browser-view.md
-  their  100644 2779beebfab48dec68181111ed9b63ea30be9cad docs/api/browser-view.md
-@@ -72,6 +72,7 @@
- ### Instance Methods
- 
- Objects created with `new BrowserView` have the following instance methods:
-+<<<<<<< .our
- 
- #### `view.destroy()`
- 
-@@ -82,6 +83,8 @@
- #### `view.isDestroyed()`
- 
- Returns `Boolean` - Whether the view is destroyed.
-+=======
-+>>>>>>> .their
- 
- #### `view.setAutoResize(options)` _Experimental_
- 
-changed in both
-  base   100644 8fcc3f8213d0b2c79b97d368574e5cd6f1efb273 docs/api/browser-window.md
-  our    100644 dff61dd336f047cf2f6f06228b2df2b98ff2304d docs/api/browser-window.md
-  their  100644 cf46fac8ea4ee5eb81ff74b72b6356cefa61e2be docs/api/browser-window.md
-@@ -1165,7 +1165,11 @@
-   * `httpReferrer` (String | [Referrer](structures/referrer.md)) (optional) - An HTTP Referrer url.
-   * `userAgent` String (optional) - A user agent originating the request.
-   * `extraHeaders` String (optional) - Extra headers separated by "\n"
-+<<<<<<< .our
-   * `postData` ([UploadRawData[]](structures/upload-raw-data.md) | [UploadFile[]](structures/upload-file.md) | [UploadBlob[]](structures/upload-blob.md)) (optional)
-+=======
-+  * `postData` ([UploadRawData[]](structures/upload-raw-data.md) | [UploadFile[]](structures/upload-file.md) | [UploadFileSystem[]](structures/upload-file-system.md) | [UploadBlob[]](structures/upload-blob.md)) - (optional)
-+>>>>>>> .their
-   * `baseURLForDataURL` String (optional) - Base url (with trailing path separator) for files to be loaded by the data url. This is needed only if the specified `url` is a data url and needs to load other files.
- 
- Same as `webContents.loadURL(url[, options])`.
-changed in both
-  base   100644 da496436b324dfc0ad670cd6634c6eb91664b089 docs/api/native-image.md
-  our    100644 d2951b5b273d3803d46b370d5652669b0349442f docs/api/native-image.md
-  their  100644 8163c23396250bd997c080a00ddcfc2e72a32392 docs/api/native-image.md
-changed in both
-  base   100644 69c67f16cc82eab6bd9c9adbe8dd9a229598f5f2 docs/api/structures/memory-info.md
-  our    100644 fe0b7d4d7efc965c2435af3e4fe5580f5867a8f3 docs/api/structures/memory-info.md
-  their  100644 f6b9d17aaa19749f48d81241adc41638cb90fd67 docs/api/structures/memory-info.md
-changed in both
-  base   100644 98b1cbd2f24196747ea01690456cabec37c5070f docs/api/web-contents.md
-  our    100644 8990fe2e97ab62eafdd3f7a4eb8ee782415124c5 docs/api/web-contents.md
-  their  100644 965c6e4df4769f7cd16cbcbe32c3e9baeca0e7ba docs/api/web-contents.md
-@@ -633,8 +633,13 @@
- * `options` Object (optional)
-   * `httpReferrer` (String | [Referrer](structures/referrer.md)) (optional) - An HTTP Referrer url.
-   * `userAgent` String (optional) - A user agent originating the request.
-+<<<<<<< .our
-   * `extraHeaders` String (optional) - Extra headers separated by "\n".
-   * `postData` ([UploadRawData[]](structures/upload-raw-data.md) | [UploadFile[]](structures/upload-file.md) | [UploadBlob[]](structures/upload-blob.md)) (optional)
-+=======
-+  * `extraHeaders` String (optional) - Extra headers separated by "\n"
-+  * `postData` ([UploadRawData[]](structures/upload-raw-data.md) | [UploadFile[]](structures/upload-file.md) | [UploadFileSystem[]](structures/upload-file-system.md) | [UploadBlob[]](structures/upload-blob.md)) - (optional)
-+>>>>>>> .their
-   * `baseURLForDataURL` String (optional) - Base url (with trailing path separator) for files to be loaded by the data url. This is needed only if the specified `url` is a data url and needs to load other files.
- 
- Loads the `url` in the window. The `url` must contain the protocol prefix,
-changed in both
-  base   100644 1da5679c18ad9b86fb354b934efc850b82cd99fc docs/api/webview-tag.md
-  our    100644 8dc16b4a4e92ad132c7722ac400e2be851723f9b docs/api/webview-tag.md
-  their  100644 8c5ce3ddd15567e763ccd103cfe866b9332f4d45 docs/api/webview-tag.md
-@@ -266,7 +266,11 @@
-   * `httpReferrer` (String | [Referrer](structures/referrer.md)) (optional) - An HTTP Referrer url.
-   * `userAgent` String (optional) - A user agent originating the request.
-   * `extraHeaders` String (optional) - Extra headers separated by "\n"
-+<<<<<<< .our
-   * `postData` ([UploadRawData[]](structures/upload-raw-data.md) | [UploadFile[]](structures/upload-file.md) | [UploadBlob[]](structures/upload-blob.md)) (optional)
-+=======
-+  * `postData` ([UploadRawData[]](structures/upload-raw-data.md) | [UploadFile[]](structures/upload-file.md) | [UploadFileSystem[]](structures/upload-file-system.md) | [UploadBlob[]](structures/upload-blob.md)) - (optional)
-+>>>>>>> .their
-   * `baseURLForDataURL` String (optional) - Base url (with trailing path separator) for files to be loaded by the data url. This is needed only if the specified `url` is a data url and needs to load other files.
- 
- Loads the `url` in the webview, the `url` must contain the protocol prefix,
-@@ -469,6 +473,7 @@
- 
- * `text` String - Content to be searched, must not be empty.
- * `options` Object (optional)
-+<<<<<<< .our
-   * `forward` Boolean (optional) - Whether to search forward or backward, defaults to `true`.
-   * `findNext` Boolean (optional) - Whether the operation is first request or a follow up,
-     defaults to `false`.
-@@ -477,6 +482,16 @@
-   * `wordStart` Boolean (optional) - Whether to look only at the start of words.
-     defaults to `false`.
-   * `medialCapitalAsWordStart` Boolean (optional) - When combined with `wordStart`,
-+=======
-+  * `forward` Boolean - (optional) Whether to search forward or backward, defaults to `true`.
-+  * `findNext` Boolean - (optional) Whether the operation is first request or a follow up,
-+    defaults to `false`.
-+  * `matchCase` Boolean - (optional) Whether search should be case-sensitive,
-+    defaults to `false`.
-+  * `wordStart` Boolean - (optional) Whether to look only at the start of words.
-+    defaults to `false`.
-+  * `medialCapitalAsWordStart` Boolean - (optional) When combined with `wordStart`,
-+>>>>>>> .their
-     accepts a match in the middle of a word if the match begins with an
-     uppercase letter followed by a lowercase or non-letter.
-     Accepts several other intra-word matches, defaults to `false`.
-changed in both
-  base   100644 5987a5b541a4c048c88689a15fa158a65d595761 electron.gyp
-  our    100644 944ddab2a3fd879044e31677e4bac2843fffbdee electron.gyp
-  their  100644 2cf6bd03301819081502b7ea4d6b91a31a2e3e01 electron.gyp
-@@ -4,7 +4,11 @@
-     'product_name%': 'Electron',
-     'company_name%': 'GitHub, Inc',
-     'company_abbr%': 'github',
-+<<<<<<< .our
-     'version%': '4.0.0-nightly.20180821',
-+=======
-+    'version%': '1.6.18',
-+>>>>>>> .their
-     'js2c_input_dir': '<(SHARED_INTERMEDIATE_DIR)/js2c',
-   },
-   'includes': [
-changed in both
-  base   100644 8408b273e660abe6dddc9f84c90adb2bff42171e filenames.gypi
-  our    100644 f57860558f06b7e5d8a50f48cfc7e53044df0bc6 filenames.gypi
-  their  100644 05103b458f292c4327162130853a6562569afece filenames.gypi
-@@ -114,6 +114,11 @@
-       'atom/app/atom_main_delegate_mac.mm',
-       'atom/app/command_line_args.cc',
-       'atom/app/command_line_args.h',
-+<<<<<<< .our
-+=======
-+      'atom/app/node_main.cc',
-+      'atom/app/node_main.h',
-+>>>>>>> .their
-       'atom/app/uv_task_runner.cc',
-       'atom/app/uv_task_runner.h',
-       'atom/browser/api/atom_api_app.cc',
-changed in both
-  base   100644 d1ca60280e9371c3c6697081079b8c97f0b66629 lib/browser/api/app.js
-  our    100644 66f6ae651acf10fb19b8ec068fc5280850dd3d91 lib/browser/api/app.js
-  their  100644 8564c1394d7e85c1a05c84e039d7467cfd95f11c lib/browser/api/app.js
-@@ -78,6 +78,14 @@
-   }
- }
- 
-+// end-of-life support warning. goodbye, `electron/1-6-x` ...
-+console.warn(
-+  'Electron 1.6.x has reached the end of its support cycle.\n',
-+  'Developers are encouraged to upgrade their applications to a newer series.\n',
-+  'Read about newer series at https://electronjs.org/releases .\n',
-+  'Read about Electron support at https://electronjs.org/docs/tutorial/support#supported-versions .'
-+)
-+
- if (process.platform === 'linux') {
-   app.launcher = {
-     setBadgeCount: bindings.unityLauncherSetBadgeCount,
-changed in both
-  base   100644 55b8372f52cf485ea5f812baed5f48296bacb962 lib/browser/api/auto-updater/auto-updater-win.js
-  our    100644 7fead4aabb4a8768db4e4d3bc13da4927cf3c42e lib/browser/api/auto-updater/auto-updater-win.js
-  their  100644 fced1258797756160d28cd1a16e0e5515d39bf5b lib/browser/api/auto-updater/auto-updater-win.js
-changed in both
-  base   100644 4783a9dd98852f303fe50e6fd03dabdecd6d0693 lib/browser/api/auto-updater/squirrel-update-win.js
-  our    100644 fecf7958cd0afd54e978f011f5f87eea751faf6d lib/browser/api/auto-updater/squirrel-update-win.js
-  their  100644 60345f1a1abead139d280b14457e558c6467de45 lib/browser/api/auto-updater/squirrel-update-win.js
-changed in both
-  base   100644 8d543f2d7d3003de981a3067eedecf12887c4eed lib/browser/rpc-server.js
-  our    100644 ff9f77321de3a4145946b67f3fe2a597f98e2510 lib/browser/rpc-server.js
-  their  100644 815298d3d9de8af137f8b3c7a5cf6dd47c5d66c8 lib/browser/rpc-server.js
-@@ -387,12 +387,21 @@
-   objectsRegistry.remove(event.sender, contextId, id)
- })
- 
-+<<<<<<< .our
- ipcMain.on('ELECTRON_BROWSER_CONTEXT_RELEASE', (event, contextId) => {
-   objectsRegistry.clear(event.sender, contextId)
-   event.returnValue = null
- })
- 
- ipcMain.on('ELECTRON_BROWSER_GUEST_WEB_CONTENTS', function (event, contextId, guestInstanceId) {
-+=======
-+ipcMain.on('ELECTRON_BROWSER_CONTEXT_RELEASE', (e) => {
-+  objectsRegistry.clear(e.sender.getId())
-+  e.returnValue = null
-+})
-+
-+ipcMain.on('ELECTRON_BROWSER_GUEST_WEB_CONTENTS', function (event, guestInstanceId) {
-+>>>>>>> .their
-   try {
-     let guestViewManager = require('./guest-view-manager')
-     event.returnValue = valueToMeta(event.sender, contextId, guestViewManager.getGuest(guestInstanceId))
-changed in both
-  base   100644 5e790133d383a5cb413030ecdee9049507960828 lib/renderer/api/remote.js
-  our    100644 59117f8f2dd977fc1817a6b1d540b616ddcb0dae lib/renderer/api/remote.js
-  their  100644 fdc95cdb5cdd66e503f605e1456a040cb7bc465c lib/renderer/api/remote.js
-@@ -293,10 +293,20 @@
-   callbacksRegistry.remove(id)
- })
- 
-+<<<<<<< .our
- exports.require = (module) => {
-   const command = 'ELECTRON_BROWSER_REQUIRE'
-   const meta = ipcRenderer.sendSync(command, contextId, module)
-   return metaToValue(meta)
-+=======
-+process.on('exit', () => {
-+  ipcRenderer.sendSync('ELECTRON_BROWSER_CONTEXT_RELEASE')
-+})
-+
-+// Get remote module.
-+exports.require = function (module) {
-+  return metaToValue(ipcRenderer.sendSync('ELECTRON_BROWSER_REQUIRE', module))
-+>>>>>>> .their
- }
- 
- // Alias to remote.require('electron').xxx.
-added in both
-  our    100755 48cdef8f1988b6d3d6ab27a7adc598108c2e987d npm/cli.js
-  their  100755 bfe2c11be311eff92a95b576d04d08db4a29f52b npm/cli.js
-@@ -8,6 +8,7 @@
- child.on('close', function (code) {
-   process.exit(code)
- })
-+<<<<<<< .our
- 
- const handleTerminationSignal = function (signal) {
-   process.on(signal, function signalHandler () {
-@@ -19,3 +20,5 @@
- 
- handleTerminationSignal('SIGINT')
- handleTerminationSignal('SIGTERM')
-+=======
-+>>>>>>> .their
-added in both
-  our    100644 b33c9b493f3bbbbc47a945b0ef0d19d003ced3b6 npm/index.js
-  their  100644 eb480b9e01dd1cae541ebb8295ce7a766beb38a0 npm/index.js
-@@ -3,6 +3,7 @@
- 
- var pathFile = path.join(__dirname, 'path.txt')
- 
-+<<<<<<< .our
- function getElectronPath () {
-   if (fs.existsSync(pathFile)) {
-     var executablePath = fs.readFileSync(pathFile, 'utf-8')
-@@ -16,3 +17,10 @@
- }
- 
- module.exports = getElectronPath()
-+=======
-+if (fs.existsSync(pathFile)) {
-+  module.exports = path.join(__dirname, fs.readFileSync(pathFile, 'utf-8'))
-+} else {
-+  throw new Error('Electron failed to install correctly, please delete node_modules/electron and try installing again')
-+}
-+>>>>>>> .their
-added in both
-  our    100755 ed208de247ef151147c58d9efc4af9519e983f86 npm/install.js
-  their  100755 3a93295f35db537f92c7599518ee798bf70852ed npm/install.js
-@@ -1,6 +1,11 @@
- #!/usr/bin/env node
- 
-+<<<<<<< .our
- var version = require('./package').version
-+=======
-+// maintainer note - x.y.z-ab version in package.json -> x.y.z
-+var version = require('./package').version.replace(/-.*/, '')
-+>>>>>>> .their
- 
- var fs = require('fs')
- var os = require('os')
-@@ -17,9 +22,13 @@
- 
- var platformPath = getPlatformPath()
- 
-+<<<<<<< .our
- var electronPath = process.env.ELECTRON_OVERRIDE_DIST_PATH || path.join(__dirname, 'dist', platformPath)
- 
- if (installedVersion === version && fs.existsSync(electronPath)) {
-+=======
-+if (installedVersion === version && fs.existsSync(path.join(__dirname, platformPath))) {
-+>>>>>>> .their
-   process.exit(0)
- }
- 
-@@ -31,7 +40,11 @@
-   arch: process.env.npm_config_arch,
-   strictSSL: process.env.npm_config_strict_ssl === 'true',
-   force: process.env.force_no_cache === 'true',
-+<<<<<<< .our
-   quiet: process.env.npm_config_loglevel === 'silent' || process.env.CI
-+=======
-+  quiet: ['info', 'verbose', 'silly', 'http'].indexOf(process.env.npm_config_loglevel) === -1
-+>>>>>>> .their
- }, extractFile)
- 
- // unzips and makes path.txt point at the correct executable
-@@ -54,12 +67,21 @@
- 
-   switch (platform) {
-     case 'darwin':
-+<<<<<<< .our
-       return 'Electron.app/Contents/MacOS/Electron'
-     case 'freebsd':
-     case 'linux':
-       return 'electron'
-     case 'win32':
-       return 'electron.exe'
-+=======
-+      return 'dist/Electron.app/Contents/MacOS/Electron'
-+    case 'freebsd':
-+    case 'linux':
-+      return 'dist/electron'
-+    case 'win32':
-+      return 'dist/electron.exe'
-+>>>>>>> .their
-     default:
-       throw new Error('Electron builds are not available on platform: ' + platform)
-   }
-added in both
-  our    100644 788f4681727fa501a87262d16ccbe6186ed74818 npm/package.json
-  their  100644 87935105dca77cfbb830ae4e4db76ce65d99f0e3 npm/package.json
-@@ -11,8 +11,13 @@
-   "main": "index.js",
-   "types": "electron.d.ts",
-   "dependencies": {
-+<<<<<<< .our
-     "@types/node": "^8.0.24",
-     "electron-download": "^4.1.0",
-+=======
-+    "@types/node": "^7.0.18",
-+    "electron-download": "^3.0.1",
-+>>>>>>> .their
-     "extract-zip": "^1.0.3"
-   },
-   "devDependencies": {
-@@ -22,8 +27,11 @@
-   },
-   "directories": {
-     "test": "test"
-+<<<<<<< .our
-   },
-   "engines": {
-     "node": ">= 4.0"
-+=======
-+>>>>>>> .their
-   }
- }
-changed in both
-  base   100644 a6ab2737818e36c514576ae34ef6dc88a5b7b5e2 package.json
-  our    100644 c081cd89450cd50efba1ec280ff1349a96ea3ce0 package.json
-  their  100644 6efecd9c6aa915c7ef83f6732684d1f9d4125310 package.json
-@@ -1,5 +1,6 @@
- {
-   "name": "electron",
-+<<<<<<< .our
-   "version": "4.0.0-nightly.20180821",
-   "repository": "https://github.com/electron/electron",
-   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
-@@ -31,6 +32,28 @@
-     "standard-markdown": "^4.0.0",
-     "sumchecker": "^2.0.2",
-     "temp": "^0.8.3"
-+=======
-+  "version": "1.6.18",
-+  "devDependencies": {
-+    "asar": "^0.11.0",
-+    "browserify": "^13.1.0",
-+    "colors": "^1.1.2",
-+    "dugite": "^1.57.0",
-+    "electabul": "~0.0.4",
-+    "electron-docs-linter": "^2.3.3",
-+    "electron-typescript-definitions": "1.2.7",
-+    "github": "^9.2.0",
-+    "heads": "^1.3.0",
-+    "minimist": "^1.2.0",
-+    "nugget": "^2.0.1",
-+    "request": "*",
-+    "standard": "^8.4.0",
-+    "standard-markdown": "^2.1.1",
-+    "sumchecker": "^2.0.2"
-+  },
-+  "optionalDependencies": {
-+    "runas": "^3.0.0"
-+>>>>>>> .their
-   },
-   "standard": {
-     "ignore": [
-@@ -59,6 +82,7 @@
-     "clang-format": "find atom/ brightray/ chromium_src/ -iname *.h -o -iname *.cc -o -iname *.mm | xargs clang-format -i",
-     "coverage": "npm run instrument-code-coverage && npm test -- --use_instrumented_asar",
-     "instrument-code-coverage": "electabul instrument --input-path ./lib --output-path ./out/coverage/electron.asar",
-+<<<<<<< .our
-     "lint": "npm run lint:js && npm run lint:cpp && npm run lint:clang-format && npm run lint:py && npm run lint:docs",
-     "lint:js": "standard && cd spec && standard",
-     "lint:clang-format": "python script/run-clang-format.py -r -c atom/ chromium_src/ brightray/ || (echo \"\\nCode not formatted correctly.\" && exit 1)",
-@@ -75,6 +99,17 @@
-     "precommit": "python script/run-clang-format.py -r -c atom/ chromium_src/ brightray/ && npm run lint:js && remark docs -qf || (echo \"Code not formatted correctly.\" && exit 1)",
-     "prepack": "check-for-leaks",
-     "prepush": "check-for-leaks",
-+=======
-+    "lint": "npm run lint-js && npm run lint-cpp && npm run lint-py && npm run lint-api-docs-js && npm run lint-api-docs",
-+    "lint-js": "standard && cd spec && standard",
-+    "lint-cpp": "python ./script/cpplint.py",
-+    "lint-py": "python ./script/pylint.py",
-+    "lint-api-docs-js": "standard-markdown docs && standard-markdown docs-translations",
-+    "lint-api-docs": "electron-docs-linter",
-+    "create-api-json": "electron-docs-linter docs --outfile=out/electron-api.json --version=$npm_package_version",
-+    "create-typescript-definitions": "npm run create-api-json && electron-typescript-definitions --in=out/electron-api.json --out=out/electron.d.ts",
-+    "preinstall": "node -e 'process.exit(0)'",
-+>>>>>>> .their
-     "prepare-release": "node ./script/prepare-release.js",
-     "prerelease": "python ./script/bootstrap.py -v --dev && npm run build",
-     "release": "node ./script/release.js",
-changed in both
-  base   100755 4db30b71fca9996003fe44a71fa9d81499677bd2 script/bump-version.py
-  our    100755 564adb2116312b0f6d0351096bd89cb373cd3bab script/bump-version.py
-  their  100755 f7a78a6da63c56eeed78edd7b81362a35bcfea0b script/bump-version.py
-@@ -103,10 +103,14 @@
-     update_package_json(version, suffix)
-     tag_version(version, suffix)
- 
-+<<<<<<< .our
-   print 'Bumped to version: {0}'.format(version + suffix)
- 
- def not_reached():
-   raise Exception('Unreachable code was reached')
-+=======
-+  print 'Bumped to version: {0}'.format(version)
-+>>>>>>> .their
- 
- def increase_version(versions, index):
-   for i in range(index + 1, 4):
-added in both
-  our    100644 be9f9597387f5f8b7bfddc61c202f32ce4c6d478 script/ci-release-build.js
-  their  100644 0335f1b0afd118d6166cf2a963633d3924cdf385 script/ci-release-build.js
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- require('dotenv-safe').load()
- 
- const assert = require('assert')
-@@ -21,6 +22,22 @@
- const vstsJobs = [
-   'electron-release-mas-x64',
-   'electron-release-osx-x64'
-+=======
-+const assert = require('assert')
-+const request = require('request')
-+const buildAppVeyorURL = 'https://windows-ci.electronjs.org/api/builds'
-+const jenkinsServer = 'https://mac-ci.electronjs.org'
-+
-+const circleCIJobs = [
-+  'electron-linux-arm',
-+  'electron-linux-ia32',
-+  'electron-linux-x64'
-+]
-+
-+const jenkinsJobs = [
-+  'electron-mas-x64-release',
-+  'electron-osx-x64-release'
-+>>>>>>> .their
- ]
- 
- async function makeRequest (requestOptions, parseResponse) {
-@@ -34,6 +51,7 @@
-           resolve(body)
-         }
-       } else {
-+<<<<<<< .our
-         console.error('Error occurred while requesting:', requestOptions.url)
-         if (parseResponse) {
-           try {
-@@ -41,6 +59,10 @@
-           } catch (err) {
-             console.log('Error: ', `(status ${res.statusCode})`, err || res.body, requestOptions)
-           }
-+=======
-+        if (parseResponse) {
-+          console.log('Error: ', `(status ${res.statusCode})`, err || JSON.parse(res.body), requestOptions)
-+>>>>>>> .their
-         } else {
-           console.log('Error: ', `(status ${res.statusCode})`, err || res.body, requestOptions)
-         }
-@@ -50,7 +72,12 @@
-   })
- }
- 
-+<<<<<<< .our
- async function circleCIcall (buildUrl, targetBranch, job, options) {
-+=======
-+async function circleCIcall (buildUrl, targetBranch, job, ghRelease) {
-+  assert(process.env.CIRCLE_TOKEN, 'CIRCLE_TOKEN not found in environment')
-+>>>>>>> .their
-   console.log(`Triggering CircleCI to run build job: ${job} on branch: ${targetBranch} with release flag.`)
-   let buildRequest = {
-     'build_parameters': {
-@@ -58,16 +85,23 @@
-     }
-   }
- 
-+<<<<<<< .our
-   if (options.ghRelease) {
-+=======
-+  if (ghRelease) {
-+>>>>>>> .their
-     buildRequest.build_parameters.ELECTRON_RELEASE = 1
-   } else {
-     buildRequest.build_parameters.RUN_RELEASE_BUILD = 'true'
-   }
- 
-+<<<<<<< .our
-   if (options.automaticRelease) {
-     buildRequest.build_parameters.AUTO_RELEASE = 'true'
-   }
- 
-+=======
-+>>>>>>> .their
-   let circleResponse = await makeRequest({
-     method: 'POST',
-     url: buildUrl,
-@@ -79,6 +113,7 @@
-   }, true).catch(err => {
-     console.log('Error calling CircleCI:', err)
-   })
-+<<<<<<< .our
-   console.log(`CircleCI release build request for ${job} successful.  Check ${circleResponse.build_url} for status.`)
- }
- 
-@@ -97,15 +132,29 @@
-   let environmentVariables = {}
- 
-   if (options.ghRelease) {
-+=======
-+  console.log(`Check ${circleResponse.build_url} for status. (${job})`)
-+}
-+
-+async function buildAppVeyor (targetBranch, ghRelease) {
-+  console.log(`Triggering AppVeyor to run build on branch: ${targetBranch} with release flag.`)
-+  assert(process.env.APPVEYOR_TOKEN, 'APPVEYOR_TOKEN not found in environment')
-+  let environmentVariables = {}
-+
-+  if (ghRelease) {
-+>>>>>>> .their
-     environmentVariables.ELECTRON_RELEASE = 1
-   } else {
-     environmentVariables.RUN_RELEASE_BUILD = 'true'
-   }
- 
-+<<<<<<< .our
-   if (options.automaticRelease) {
-     environmentVariables.AUTO_RELEASE = 'true'
-   }
- 
-+=======
-+>>>>>>> .their
-   const requestOpts = {
-     url: buildAppVeyorURL,
-     auth: {
-@@ -116,7 +165,11 @@
-     },
-     body: JSON.stringify({
-       accountName: 'AppVeyor',
-+<<<<<<< .our
-       projectSlug: appVeyorJobs[job],
-+=======
-+      projectSlug: 'electron',
-+>>>>>>> .their
-       branch: targetBranch,
-       environmentVariables
-     }),
-@@ -125,6 +178,7 @@
-   let appVeyorResponse = await makeRequest(requestOpts, true).catch(err => {
-     console.log('Error calling AppVeyor:', err)
-   })
-+<<<<<<< .our
-   const buildUrl = `https://windows-ci.electronjs.org/project/AppVeyor/${appVeyorJobs[job]}/build/${appVeyorResponse.version}`
-   console.log(`AppVeyor release build request for ${job} successful.  Check build status at ${buildUrl}`)
- }
-@@ -200,12 +254,89 @@
-     console.log(`Error calling VSTS for job ${build.name}`, err)
-   })
-   console.log(`VSTS release build request for ${build.name} successful. Check ${vstsResponse._links.web.href} for status.`)
-+=======
-+  const buildUrl = `https://windows-ci.electronjs.org/project/AppVeyor/electron/build/${appVeyorResponse.version}`
-+  console.log(`AppVeyor release build request successful.  Check build status at ${buildUrl}`)
-+}
-+
-+function buildCircleCI (targetBranch, ghRelease, job) {
-+  const circleBuildUrl = `https://circleci.com/api/v1.1/project/github/electron/electron/tree/${targetBranch}?circle-token=${process.env.CIRCLE_TOKEN}`
-+  if (job) {
-+    assert(circleCIJobs.includes(job), `Unknown CI job name: ${job}.`)
-+    circleCIcall(circleBuildUrl, targetBranch, job, ghRelease)
-+  } else {
-+    circleCIJobs.forEach((job) => circleCIcall(circleBuildUrl, targetBranch, job, ghRelease))
-+  }
-+}
-+
-+async function buildJenkins (targetBranch, ghRelease, job) {
-+  assert(process.env.JENKINS_AUTH_TOKEN, 'JENKINS_AUTH_TOKEN not found in environment')
-+  assert(process.env.JENKINS_BUILD_TOKEN, 'JENKINS_BUILD_TOKEN not found in environment')
-+  let jenkinsCrumb = await getJenkinsCrumb()
-+
-+  if (job) {
-+    assert(jenkinsJobs.includes(job), `Unknown CI job name: ${job}.`)
-+    callJenkinsBuild(job, jenkinsCrumb, targetBranch, ghRelease)
-+  } else {
-+    jenkinsJobs.forEach((job) => {
-+      callJenkinsBuild(job, jenkinsCrumb, targetBranch, ghRelease)
-+    })
-+  }
-+}
-+
-+async function callJenkins (path, requestParameters, requestHeaders) {
-+  let requestOptions = {
-+    url: `${jenkinsServer}/${path}`,
-+    auth: {
-+      user: 'build',
-+      pass: process.env.JENKINS_AUTH_TOKEN
-+    },
-+    qs: requestParameters
-+  }
-+  if (requestHeaders) {
-+    requestOptions.headers = requestHeaders
-+  }
-+  let jenkinsResponse = await makeRequest(requestOptions).catch(err => {
-+    console.log(`Error calling Jenkins:`, err)
-+  })
-+  return jenkinsResponse
-+}
-+
-+async function callJenkinsBuild (job, jenkinsCrumb, targetBranch, ghRelease) {
-+  console.log(`Triggering Jenkins to run build job: ${job} on branch: ${targetBranch} with release flag.`)
-+  let jenkinsParams = {
-+    token: process.env.JENKINS_BUILD_TOKEN,
-+    BRANCH: targetBranch
-+  }
-+  if (!ghRelease) {
-+    jenkinsParams.RUN_RELEASE_BUILD = 1
-+  }
-+  await callJenkins(`job/${job}/buildWithParameters`, jenkinsParams, jenkinsCrumb)
-+    .catch(err => {
-+      console.log(`Error calling Jenkins build`, err)
-+    })
-+  let buildUrl = `${jenkinsServer}/job/${job}/lastBuild/`
-+  console.log(`Jenkins build request successful.  Check build status at ${buildUrl}.`)
-+}
-+
-+async function getJenkinsCrumb () {
-+  let crumbResponse = await callJenkins('crumbIssuer/api/xml', {
-+    xpath: 'concat(//crumbRequestField,":",//crumb)'
-+  }).catch(err => {
-+    console.log(`Error getting jenkins crumb:`, err)
-+  })
-+  let crumbDetails = crumbResponse.split(':')
-+  let crumbHeader = {}
-+  crumbHeader[crumbDetails[0]] = crumbDetails[1]
-+  return crumbHeader
-+>>>>>>> .their
- }
- 
- function runRelease (targetBranch, options) {
-   if (options.ci) {
-     switch (options.ci) {
-       case 'CircleCI': {
-+<<<<<<< .our
-         buildCircleCI(targetBranch, options)
-         break
-       }
-@@ -226,12 +357,31 @@
-     buildCircleCI(targetBranch, options)
-     buildAppVeyor(targetBranch, options)
-     buildVSTS(targetBranch, options)
-+=======
-+        buildCircleCI(targetBranch, options.ghRelease, options.job)
-+        break
-+      }
-+      case 'AppVeyor': {
-+        buildAppVeyor(targetBranch, options.ghRelease)
-+        break
-+      }
-+      case 'Jenkins': {
-+        buildJenkins(targetBranch, options.ghRelease, options.job)
-+        break
-+      }
-+    }
-+  } else {
-+    buildCircleCI(targetBranch, options.ghRelease, options.job)
-+    buildAppVeyor(targetBranch, options.ghRelease)
-+    buildJenkins(targetBranch, options.ghRelease, options.job)
-+>>>>>>> .their
-   }
- }
- 
- module.exports = runRelease
- 
- if (require.main === module) {
-+<<<<<<< .our
-   const args = require('minimist')(process.argv.slice(2), {
-     boolean: ['ghRelease', 'automaticRelease']
-   })
-@@ -239,6 +389,13 @@
-   if (args._.length < 1) {
-     console.log(`Trigger CI to build release builds of electron.
-     Usage: ci-release-build.js [--job=CI_JOB_NAME] [--ci=CircleCI|AppVeyor|VSTS] [--ghRelease] [--automaticRelease] TARGET_BRANCH
-+=======
-+  const args = require('minimist')(process.argv.slice(2))
-+  const targetBranch = args._[0]
-+  if (args._.length < 1) {
-+    console.log(`Trigger CI to build release builds of electron.
-+    Usage: ci-release-build.js [--job=CI_JOB_NAME] [--ci=CircleCI|AppVeyor|Jenkins] [--ghRelease] TARGET_BRANCH
-+>>>>>>> .their
-     `)
-     process.exit(0)
-   }
-changed in both
-  base   100755 f523fa1af5fa2aea22381d5eb443b7e9c51ffea3 script/cibuild
-  our    100755 758dc2c794e642430ab6a0d966e7a41863be947c script/cibuild
-  their  100755 7d7bdb5a65114e6f38db35f8e060c4385b52564a script/cibuild
-@@ -57,6 +57,18 @@
-   if os.environ.has_key('TARGET_ARCH'):
-     target_arch = os.environ['TARGET_ARCH']
- 
-+<<<<<<< .our
-+=======
-+  is_travis = (os.getenv('TRAVIS') == 'true')
-+  if is_travis and PLATFORM == 'linux':
-+    print 'Setup travis CI'
-+    execute(['sudo', 'apt-get', 'update'])
-+    deps = LINUX_DEPS
-+    if target_arch == 'arm':
-+      deps += LINUX_DEPS_ARM
-+    execute(['sudo', 'apt-get', 'install'] + deps)
-+
-+>>>>>>> .their
-   if PLATFORM == 'linux' and target_arch == 'x64':
-     os.environ['DISPLAY'] = ':99.0'
-     execute(['sh', '-e', '/etc/init.d/xvfb', 'start'])
-@@ -72,8 +84,13 @@
-   os.environ['PATH'] = os.path.pathsep.join([node_bin_dir,
-                                              os.environ.get('PATH', '')])
- 
-+<<<<<<< .our
-   is_release = os.environ.get('ELECTRON_RELEASE', '') == '1'
-   args = ['--target_arch=' + target_arch]
-+=======
-+  is_release = os.environ.has_key('ELECTRON_RELEASE')
-+  args = ['--target_arch=' + target_arch, '-v']
-+>>>>>>> .their
-   if not is_release:
-     args += ['--dev']
-   run_script('bootstrap.py', args)
-changed in both
-  base   100644 5818571089ff51c8090fc58a598f56f075c2809b script/lib/config.py
-  our    100644 9ad0fbc680e5ecdeb8c13d0f0d6678bbba7d9031 script/lib/config.py
-  their  100644 bab9dc213c39421e643bf31d286bc4f787df8d4a script/lib/config.py
-@@ -13,6 +13,11 @@
- 
- BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \
-     'https://s3.amazonaws.com/github-janky-artifacts/libchromiumcontent'
-+<<<<<<< .our
-+=======
-+LIBCHROMIUMCONTENT_COMMIT = os.getenv('LIBCHROMIUMCONTENT_COMMIT') or \
-+    '19ca886975716c02d6de9fd41b8297a4e1774be2'
-+>>>>>>> .their
- 
- PLATFORM = {
-   'cygwin': 'win32',
-added in remote
-  their  100755 0c776e03d65f01bdaa9a7faaf810d130f586ed08 script/merge-release.js
-@@ -0,0 +1,116 @@
-+#!/usr/bin/env node
-+
-+require('colors')
-+const assert = require('assert')
-+const branchToRelease = process.argv[2]
-+const fail = '\u2717'.red
-+const { GitProcess, GitError } = require('dugite')
-+const pass = '\u2713'.green
-+const path = require('path')
-+const pkg = require('../package.json')
-+
-+assert(process.env.ELECTRON_GITHUB_TOKEN, 'ELECTRON_GITHUB_TOKEN not found in environment')
-+if (!branchToRelease) {
-+  console.log(`Usage: merge-release branch`)
-+  process.exit(1)
-+}
-+const gitDir = path.resolve(__dirname, '..')
-+
-+async function callGit (args, errorMessage, successMessage) {
-+  let gitResult = await GitProcess.exec(args, gitDir)
-+  if (gitResult.exitCode === 0) {
-+    console.log(`${pass} ${successMessage}`)
-+    return true
-+  } else {
-+    console.log(`${fail} ${errorMessage} ${gitResult.stderr}`)
-+    process.exit(1)
-+  }
-+}
-+
-+async function checkoutBranch (branchName) {
-+  console.log(`Checking out ${branchName}.`)
-+  let errorMessage = `Error checking out branch ${branchName}:`
-+  let successMessage = `Successfully checked out branch ${branchName}.`
-+  return callGit(['checkout', branchName], errorMessage, successMessage)
-+}
-+
-+async function commitMerge () {
-+  console.log(`Committing the merge for v${pkg.version}`)
-+  let errorMessage = `Error committing merge:`
-+  let successMessage = `Successfully committed the merge for v${pkg.version}`
-+  let gitArgs = ['commit', '-m', `v${pkg.version}`]
-+  return callGit(gitArgs, errorMessage, successMessage)
-+}
-+
-+async function mergeReleaseIntoBranch (branchName) {
-+  console.log(`Merging release branch into ${branchName}.`)
-+  let mergeArgs = ['merge', 'release-1-6-x', '--squash']
-+  let mergeDetails = await GitProcess.exec(mergeArgs, gitDir)
-+  if (mergeDetails.exitCode === 0) {
-+    return true
-+  } else {
-+    const error = GitProcess.parseError(mergeDetails.stderr)
-+    if (error === GitError.MergeConflicts) {
-+      console.log(`${fail} Could not merge release branch into ${branchName} ` +
-+        `due to merge conflicts.`)
-+      return false
-+    } else {
-+      console.log(`${fail} Could not merge release branch into ${branchName} ` +
-+        `due to an error: ${mergeDetails.stderr}.`)
-+      process.exit(1)
-+    }
-+  }
-+}
-+
-+async function pushBranch (branchName) {
-+  console.log(`Pushing branch ${branchName}.`)
-+  let pushArgs = ['push', 'origin', branchName]
-+  let errorMessage = `Could not push branch ${branchName} due to an error:`
-+  let successMessage = `Successfully pushed branch ${branchName}.`
-+  return callGit(pushArgs, errorMessage, successMessage)
-+}
-+
-+async function pull () {
-+  console.log(`Performing a git pull`)
-+  let errorMessage = `Could not pull due to an error:`
-+  let successMessage = `Successfully performed a git pull`
-+  return callGit(['pull'], errorMessage, successMessage)
-+}
-+
-+async function rebase (targetBranch) {
-+  console.log(`Rebasing release branch from ${targetBranch}`)
-+  let errorMessage = `Could not rebase due to an error:`
-+  let successMessage = `Successfully rebased release branch from ` +
-+    `${targetBranch}`
-+  return callGit(['rebase', targetBranch], errorMessage, successMessage)
-+}
-+
-+async function mergeRelease () {
-+  await checkoutBranch(branchToRelease)
-+  let mergeSuccess = await mergeReleaseIntoBranch(branchToRelease)
-+  if (mergeSuccess) {
-+    console.log(`${pass} Successfully merged release branch into ` +
-+      `${branchToRelease}.`)
-+    await commitMerge()
-+    let pushSuccess = await pushBranch(branchToRelease)
-+    if (pushSuccess) {
-+      console.log(`${pass} Success!!! ${branchToRelease} now has the latest release!`)
-+    }
-+  } else {
-+    console.log(`Trying rebase of ${branchToRelease} into release branch.`)
-+    await pull()
-+    await checkoutBranch('release-1-6-x')
-+    let rebaseResult = await rebase(branchToRelease)
-+    if (rebaseResult) {
-+      let pushResult = pushBranch('HEAD')
-+      if (pushResult) {
-+        console.log(`Rebase of ${branchToRelease} into release branch was ` +
-+          `successful.  Let release builds run and then try this step again.`)
-+      }
-+      // Exit as failure so release doesn't continue
-+      process.exit(1)
-+    }
-+  }
-+}
-+
-+mergeRelease()
-added in both
-  our    100755 72a28b719bf1ff7770692caef86c76746c4d8edf script/prepare-release.js
-  their  100755 21d924c32105a12115d653c359e3c2df8a4cca69 script/prepare-release.js
-@@ -1,5 +1,6 @@
- #!/usr/bin/env node
- 
-+<<<<<<< .our
- if (!process.env.CI) require('dotenv-safe').load()
- require('colors')
- const args = require('minimist')(process.argv.slice(2), {
-@@ -9,20 +10,40 @@
- const { execSync } = require('child_process')
- const fail = '\u2717'.red
- const { GitProcess } = require('dugite')
-+=======
-+require('colors')
-+const args = require('minimist')(process.argv.slice(2))
-+const assert = require('assert')
-+const ciReleaseBuild = require('./ci-release-build')
-+const { execSync } = require('child_process')
-+const fail = '\u2717'.red
-+const { GitProcess, GitError } = require('dugite')
-+>>>>>>> .their
- const GitHub = require('github')
- const pass = '\u2713'.green
- const path = require('path')
- const pkg = require('../package.json')
-+<<<<<<< .our
- const readline = require('readline')
- const versionType = args._[0]
- const targetRepo = versionType === 'nightly' ? 'nightlies' : 'electron'
-+=======
-+const versionType = args._[0]
-+>>>>>>> .their
- 
- // TODO (future) automatically determine version based on conventional commits
- // via conventional-recommended-bump
- 
-+<<<<<<< .our
- if (!versionType && !args.notesOnly) {
-   console.log(`Usage: prepare-release versionType [stable | beta | nightly]` +
-      ` (--stable) (--notesOnly) (--automaticRelease) (--branch)`)
-+=======
-+assert(process.env.ELECTRON_GITHUB_TOKEN, 'ELECTRON_GITHUB_TOKEN not found in environment')
-+if (!versionType && !args.notesOnly) {
-+  console.log(`Usage: prepare-release versionType [major | minor | patch ]` +
-+     ` (--notesOnly)`)
-+>>>>>>> .their
-   process.exit(1)
- }
- 
-@@ -30,6 +51,7 @@
- const gitDir = path.resolve(__dirname, '..')
- github.authenticate({type: 'token', token: process.env.ELECTRON_GITHUB_TOKEN})
- 
-+<<<<<<< .our
- async function getNewVersion (dryRun) {
-   if (!dryRun) {
-     console.log(`Bumping for new "${versionType}" version.`)
-@@ -42,10 +64,38 @@
-   if (dryRun) {
-     scriptArgs.push('--dry-run')
-   }
-+=======
-+async function createReleaseBranch () {
-+  console.log(`Creating release branch.`)
-+  let checkoutDetails = await GitProcess.exec([ 'checkout', '-b', 'release-1-6-x' ], gitDir)
-+  if (checkoutDetails.exitCode === 0) {
-+    console.log(`${pass} Successfully created the release branch.`)
-+  } else {
-+    const error = GitProcess.parseError(checkoutDetails.stderr)
-+    if (error === GitError.BranchAlreadyExists) {
-+      console.log(`${fail} Release branch already exists, aborting prepare ` +
-+        `release process.`)
-+    } else {
-+      console.log(`${fail} Error creating release branch: ` +
-+        `${checkoutDetails.stderr}`)
-+    }
-+    process.exit(1)
-+  }
-+}
-+
-+function getNewVersion () {
-+  console.log(`Bumping for new "${versionType}" version.`)
-+  let bumpScript = path.join(__dirname, 'bump-version.py')
-+  let scriptArgs = [bumpScript, `${versionType}`]
-+  if (args.stable) {
-+    scriptArgs.push('--stable')
-+  }
-+>>>>>>> .their
-   try {
-     let bumpVersion = execSync(scriptArgs.join(' '), {encoding: 'UTF-8'})
-     bumpVersion = bumpVersion.substr(bumpVersion.indexOf(':') + 1).trim()
-     let newVersion = `v${bumpVersion}`
-+<<<<<<< .our
-     if (!dryRun) {
-       console.log(`${pass} Successfully bumped version to ${newVersion}`)
-     }
-@@ -53,6 +103,12 @@
-   } catch (err) {
-     console.log(`${fail} Could not bump version, error was:`, err)
-     throw err
-+=======
-+    console.log(`${pass} Successfully bumped version to ${newVersion}`)
-+    return newVersion
-+  } catch (err) {
-+    console.log(`${fail} Could not bump version, error was:`, err)
-+>>>>>>> .their
-   }
- }
- 
-@@ -74,6 +130,7 @@
- }
- 
- async function getReleaseNotes (currentBranch) {
-+<<<<<<< .our
-   if (versionType === 'nightly') {
-     return 'Nightlies do not get release notes, please compare tags for info'
-   }
-@@ -94,10 +151,25 @@
-   let commitComparison = await github.repos.compareCommits(githubOpts)
-     .catch(err => {
-       console.log(`${fail} Error checking for commits from ${pkg.version} to ` +
-+=======
-+  console.log(`Generating release notes for ${currentBranch}.`)
-+  let githubOpts = {
-+    owner: 'electron',
-+    repo: 'electron',
-+    base: `v${pkg.version}`,
-+    head: currentBranch
-+  }
-+  let releaseNotes = '(placeholder)\n'
-+  console.log(`Checking for commits from ${pkg.version} to ${currentBranch}`)
-+  let commitComparison = await github.repos.compareCommits(githubOpts)
-+    .catch(err => {
-+      console.log(`{$fail} Error checking for commits from ${pkg.version} to ` +
-+>>>>>>> .their
-         `${currentBranch}`, err)
-       process.exit(1)
-     })
- 
-+<<<<<<< .our
-   if (commitComparison.data.commits.length === 0) {
-     console.log(`${pass} There are no commits from ${pkg.version} to ` +
-       `${currentBranch}, skipping release.`)
-@@ -137,16 +209,32 @@
-     }
-   })
-   console.log(`${pass} Done generating release notes for ${currentBranch}. Found ${prCount} PRs.`)
-+=======
-+  commitComparison.data.commits.forEach(commitEntry => {
-+    let commitMessage = commitEntry.commit.message
-+    if (commitMessage.toLowerCase().indexOf('merge') > -1) {
-+      releaseNotes += `${commitMessage} \n`
-+    }
-+  })
-+  console.log(`${pass} Done generating release notes for ${currentBranch}.`)
-+>>>>>>> .their
-   return releaseNotes
- }
- 
- async function createRelease (branchToTarget, isBeta) {
-   let releaseNotes = await getReleaseNotes(branchToTarget)
-+<<<<<<< .our
-   let newVersion = await getNewVersion()
-   await tagRelease(newVersion)
-   const githubOpts = {
-     owner: 'electron',
-     repo: targetRepo
-+=======
-+  let newVersion = getNewVersion()
-+  const githubOpts = {
-+    owner: 'electron',
-+    repo: 'electron'
-+>>>>>>> .their
-   }
-   console.log(`Checking for existing draft release.`)
-   let releases = await github.repos.getReleases(githubOpts)
-@@ -161,6 +249,7 @@
-     process.exit(1)
-   }
-   console.log(`${pass} A draft release does not exist; creating one.`)
-+<<<<<<< .our
-   githubOpts.draft = true
-   githubOpts.name = `electron ${newVersion}`
-   if (isBeta) {
-@@ -182,6 +271,21 @@
-   }
-   githubOpts.tag_name = newVersion
-   githubOpts.target_commitish = newVersion.indexOf('nightly') !== -1 ? 'master' : branchToTarget
-+=======
-+  githubOpts.body = releaseNotes
-+  githubOpts.draft = true
-+  githubOpts.name = `electron ${newVersion}`
-+  if (isBeta) {
-+    githubOpts.body = `Note: This is a beta release.  Please file new issues ` +
-+      `for any bugs you find in it.\n \n This release is published to npm ` +
-+      `under the beta tag and can be installed via npm install electron@beta, ` +
-+      `or npm i electron@${newVersion.substr(1)}.`
-+    githubOpts.name = `${githubOpts.name}`
-+    githubOpts.prerelease = true
-+  }
-+  githubOpts.tag_name = newVersion
-+  githubOpts.target_commitish = branchToTarget
-+>>>>>>> .their
-   await github.repos.createRelease(githubOpts)
-     .catch(err => {
-       console.log(`${fail} Error creating new release: `, err)
-@@ -190,6 +294,7 @@
-   console.log(`${pass} Draft release for ${newVersion} has been created.`)
- }
- 
-+<<<<<<< .our
- async function pushRelease (branch) {
-   let pushDetails = await GitProcess.exec(['push', 'origin', `HEAD:${branch}`, '--follow-tags'], gitDir)
-   if (pushDetails.exitCode === 0) {
-@@ -197,11 +302,21 @@
-       `release builds to finish before running "npm run release".`)
-   } else {
-     console.log(`${fail} Error pushing the release: ` +
-+=======
-+async function pushRelease () {
-+  let pushDetails = await GitProcess.exec(['push', 'origin', 'HEAD'], gitDir)
-+  if (pushDetails.exitCode === 0) {
-+    console.log(`${pass} Successfully pushed the release branch.  Wait for ` +
-+      `release builds to finish before running "npm run release".`)
-+  } else {
-+    console.log(`${fail} Error pushing the release branch: ` +
-+>>>>>>> .their
-         `${pushDetails.stderr}`)
-     process.exit(1)
-   }
- }
- 
-+<<<<<<< .our
- async function runReleaseBuilds (branch) {
-   await ciReleaseBuild(branch, {
-     ghRelease: true,
-@@ -278,6 +393,24 @@
-         process.exit(1)
-       }
-     }
-+=======
-+async function runReleaseBuilds () {
-+  await ciReleaseBuild('release-1-6-x', {
-+    ghRelease: true
-+  })
-+}
-+
-+async function prepareRelease (isBeta, notesOnly) {
-+  let currentBranch = await getCurrentBranch(gitDir)
-+  if (notesOnly) {
-+    let releaseNotes = await getReleaseNotes(currentBranch)
-+    console.log(`Draft release notes are: ${releaseNotes}`)
-+  } else {
-+    await createReleaseBranch()
-+    await createRelease(currentBranch, isBeta)
-+    await pushRelease()
-+    await runReleaseBuilds()
-+>>>>>>> .their
-   }
- }
- 
-added in remote
-  their  100755 78b63933009cf47cc50130dabaa8fe6f5f73b30f script/prerelease.js
-@@ -0,0 +1,112 @@
-+#!/usr/bin/env node
-+
-+require('colors')
-+const assert = require('assert')
-+const GitHub = require('github')
-+const heads = require('heads')
-+const pkg = require('../package.json')
-+const pass = '\u2713'.green
-+const fail = '\u2717'.red
-+let failureCount = 0
-+
-+assert(process.env.ELECTRON_GITHUB_TOKEN, 'ELECTRON_GITHUB_TOKEN not found in environment')
-+
-+const github = new GitHub()
-+github.authenticate({type: 'token', token: process.env.ELECTRON_GITHUB_TOKEN})
-+github.repos.getReleases({owner: 'electron', repo: 'electron'})
-+  .then(res => {
-+    const releases = res.data
-+    const drafts = releases
-+      .filter(release => release.draft) // comment out for testing
-+      // .filter(release => release.tag_name === 'v1.7.5') // uncomment for testing
-+
-+    check(drafts.length === 1, 'one draft exists', true)
-+    const draft = drafts[0]
-+
-+    check(draft.tag_name === `v${pkg.version}`, `draft release version matches local package.json (v${pkg.version})`)
-+    check(draft.prerelease, 'draft is a prerelease')
-+    check(draft.body.length > 50 && !draft.body.includes('(placeholder)'), 'draft has release notes')
-+
-+    const requiredAssets = assetsForVersion(draft.tag_name).sort()
-+    const extantAssets = draft.assets.map(asset => asset.name).sort()
-+
-+    requiredAssets.forEach(asset => {
-+      check(extantAssets.includes(asset), asset)
-+    })
-+
-+    const s3Urls = s3UrlsForVersion(draft.tag_name)
-+    heads(s3Urls)
-+      .then(results => {
-+        results.forEach((result, i) => {
-+          check(result === 200, s3Urls[i])
-+        })
-+
-+        process.exit(failureCount > 0 ? 1 : 0)
-+      })
-+      .catch(err => {
-+        console.error('Error making HEAD requests for S3 assets')
-+        console.error(err)
-+        process.exit(1)
-+      })
-+  })
-+
-+function check (condition, statement, exitIfFail = false) {
-+  if (condition) {
-+    console.log(`${pass} ${statement}`)
-+  } else {
-+    failureCount++
-+    console.log(`${fail} ${statement}`)
-+    if (exitIfFail) process.exit(1)
-+  }
-+}
-+
-+function assetsForVersion (version) {
-+  const patterns = [
-+    'electron-{{VERSION}}-darwin-x64-dsym.zip',
-+    'electron-{{VERSION}}-darwin-x64-symbols.zip',
-+    'electron-{{VERSION}}-darwin-x64.zip',
-+    'electron-{{VERSION}}-linux-arm-symbols.zip',
-+    'electron-{{VERSION}}-linux-arm.zip',
-+    'electron-{{VERSION}}-linux-armv7l-symbols.zip',
-+    'electron-{{VERSION}}-linux-armv7l.zip',
-+    'electron-{{VERSION}}-linux-ia32-symbols.zip',
-+    'electron-{{VERSION}}-linux-ia32.zip',
-+    'electron-{{VERSION}}-linux-x64-symbols.zip',
-+    'electron-{{VERSION}}-linux-x64.zip',
-+    'electron-{{VERSION}}-mas-x64-dsym.zip',
-+    'electron-{{VERSION}}-mas-x64-symbols.zip',
-+    'electron-{{VERSION}}-mas-x64.zip',
-+    'electron-{{VERSION}}-win32-ia32-pdb.zip',
-+    'electron-{{VERSION}}-win32-ia32-symbols.zip',
-+    'electron-{{VERSION}}-win32-ia32.zip',
-+    'electron-{{VERSION}}-win32-x64-pdb.zip',
-+    'electron-{{VERSION}}-win32-x64-symbols.zip',
-+    'electron-{{VERSION}}-win32-x64.zip',
-+    'electron-api.json',
-+    'electron.d.ts',
-+    'ffmpeg-{{VERSION}}-darwin-x64.zip',
-+    'ffmpeg-{{VERSION}}-linux-arm.zip',
-+    'ffmpeg-{{VERSION}}-linux-armv7l.zip',
-+    'ffmpeg-{{VERSION}}-linux-ia32.zip',
-+    'ffmpeg-{{VERSION}}-linux-x64.zip',
-+    'ffmpeg-{{VERSION}}-mas-x64.zip',
-+    'ffmpeg-{{VERSION}}-win32-ia32.zip',
-+    'ffmpeg-{{VERSION}}-win32-x64.zip'
-+  ]
-+  return patterns.map(pattern => pattern.replace(/{{VERSION}}/g, version))
-+}
-+
-+function s3UrlsForVersion (version) {
-+  const bucket = 'https://gh-contractor-zcbenz.s3.amazonaws.com/'
-+  const patterns = [
-+    'atom-shell/dist/{{VERSION}}/iojs-{{VERSION}}-headers.tar.gz',
-+    'atom-shell/dist/{{VERSION}}/iojs-{{VERSION}}.tar.gz',
-+    'atom-shell/dist/{{VERSION}}/node-{{VERSION}}.tar.gz',
-+    'atom-shell/dist/{{VERSION}}/node.lib',
-+    'atom-shell/dist/{{VERSION}}/win-x64/iojs.lib',
-+    'atom-shell/dist/{{VERSION}}/win-x86/iojs.lib',
-+    'atom-shell/dist/{{VERSION}}/x64/node.lib',
-+    'atom-shell/dist/index.json'
-+  ]
-+  return patterns.map(pattern => bucket + pattern.replace(/{{VERSION}}/g, version))
-+}
-added in both
-  our    100644 27290c513bb28d9bd394575d833f1e6786e3b479 script/publish-to-npm.js
-  their  100644 21960455cfe96fa3a6ba7802747666772febf9ea script/publish-to-npm.js
-@@ -3,6 +3,7 @@
- const path = require('path')
- const childProcess = require('child_process')
- const GitHubApi = require('github')
-+<<<<<<< .our
- const {GitProcess} = require('dugite')
- const request = require('request')
- const rootPackageJson = require('../package.json')
-@@ -12,6 +13,12 @@
-   process.exit(1)
- }
- 
-+=======
-+const request = require('request')
-+const assert = require('assert')
-+const rootPackageJson = require('../package.json')
-+
-+>>>>>>> .their
- const github = new GitHubApi({
-   // debug: true,
-   headers: { 'User-Agent': 'electron-npm-publisher' },
-@@ -26,8 +33,12 @@
-   'index.js',
-   'install.js',
-   'package.json',
-+<<<<<<< .our
-   'README.md',
-   'LICENSE'
-+=======
-+  'README.md'
-+>>>>>>> .their
- ]
- 
- const jsonFields = [
-@@ -55,10 +66,16 @@
-   tempDir = dirPath
-   // copy files from `/npm` to temp directory
-   files.forEach((name) => {
-+<<<<<<< .our
-     const noThirdSegment = name === 'README.md' || name === 'LICENSE'
-     fs.writeFileSync(
-       path.join(tempDir, name),
-       fs.readFileSync(path.join(__dirname, '..', noThirdSegment ? '' : 'npm', name))
-+=======
-+    fs.writeFileSync(
-+      path.join(tempDir, name),
-+      fs.readFileSync(path.join(__dirname, '..', name === 'README.md' ? '' : 'npm', name))
-+>>>>>>> .their
-     )
-   })
-   // copy from root package.json to temp/package.json
-@@ -73,7 +90,11 @@
- 
-   return github.repos.getReleases({
-     owner: 'electron',
-+<<<<<<< .our
-     repo: rootPackageJson.version.indexOf('nightly') > 0 ? 'nightlies' : 'electron'
-+=======
-+    repo: 'electron'
-+>>>>>>> .their
-   })
- })
- .then((releases) => {
-@@ -108,6 +129,7 @@
-     })
-   })
- })
-+<<<<<<< .our
- .then(async (release) => {
-   if (release.tag_name.indexOf('nightly') > 0) {
-     const currentBranch = await getCurrentBranch()
-@@ -119,6 +141,10 @@
-   } else {
-     npmTag = release.prerelease ? 'beta' : 'latest'
-   }
-+=======
-+.then((release) => {
-+  npmTag = release.prerelease ? 'beta' : 'latest'
-+>>>>>>> .their
- })
- .then(() => childProcess.execSync('npm pack', { cwd: tempDir }))
- .then(() => {
-@@ -129,14 +155,24 @@
-       env: Object.assign({}, process.env, { electron_config_cache: tempDir }),
-       cwd: tempDir
-     })
-+<<<<<<< .our
-     resolve(tarballPath)
-   })
- })
- .then((tarballPath) => childProcess.execSync(`npm publish ${tarballPath} --tag ${npmTag} --otp=${process.env.ELECTRON_NPM_OTP}`))
-+=======
-+    const checkVersion = childProcess.execSync(`${path.join(tempDir, 'node_modules', '.bin', 'electron')} -v`)
-+    assert.strictEqual(checkVersion.toString().trim(), `v${rootPackageJson.version}`)
-+    resolve(tarballPath)
-+  })
-+})
-+.then((tarballPath) => childProcess.execSync(`npm publish ${tarballPath} --tag ${npmTag}`))
-+>>>>>>> .their
- .catch((err) => {
-   console.error(`Error: ${err}`)
-   process.exit(1)
- })
-+<<<<<<< .our
- 
- async function getCurrentBranch () {
-   const gitDir = path.resolve(__dirname, '..')
-@@ -155,3 +191,5 @@
-     process.exit(1)
-   }
- }
-+=======
-+>>>>>>> .their
-added in both
-  our    100755 84e00ad4f309201f151c3f8fcbaf9ee536c9b6cb script/release.js
-  their  100755 df662e5608ee50ec838764bcc26dbe908c6e6e61 script/release.js
-@@ -1,8 +1,14 @@
- #!/usr/bin/env node
- 
-+<<<<<<< .our
- if (!process.env.CI) require('dotenv-safe').load()
- require('colors')
- const args = require('minimist')(process.argv.slice(2))
-+=======
-+require('colors')
-+const args = require('minimist')(process.argv.slice(2))
-+const assert = require('assert')
-+>>>>>>> .their
- const fs = require('fs')
- const { execSync } = require('child_process')
- const GitHub = require('github')
-@@ -16,16 +22,30 @@
- const sumchecker = require('sumchecker')
- const temp = require('temp').track()
- const { URL } = require('url')
-+<<<<<<< .our
- const targetRepo = pkgVersion.indexOf('nightly') > 0 ? 'nightlies' : 'electron'
- let failureCount = 0
- 
-+=======
-+let failureCount = 0
-+
-+assert(process.env.ELECTRON_GITHUB_TOKEN, 'ELECTRON_GITHUB_TOKEN not found in environment')
-+
-+>>>>>>> .their
- const github = new GitHub({
-   followRedirects: false
- })
- github.authenticate({type: 'token', token: process.env.ELECTRON_GITHUB_TOKEN})
-+<<<<<<< .our
- 
- async function getDraftRelease (version, skipValidation) {
-   let releaseInfo = await github.repos.getReleases({owner: 'electron', repo: targetRepo})
-+=======
-+const gitDir = path.resolve(__dirname, '..')
-+
-+async function getDraftRelease (version, skipValidation) {
-+  let releaseInfo = await github.repos.getReleases({owner: 'electron', repo: 'electron'})
-+>>>>>>> .their
-   let drafts
-   let versionToCheck
-   if (version) {
-@@ -49,8 +69,13 @@
-   return draft
- }
- 
-+<<<<<<< .our
- async function validateReleaseAssets (release, validatingRelease) {
-   const requiredAssets = assetsForVersion(release.tag_name, validatingRelease).sort()
-+=======
-+async function validateReleaseAssets (release) {
-+  const requiredAssets = assetsForVersion(release.tag_name).sort()
-+>>>>>>> .their
-   const extantAssets = release.assets.map(asset => asset.name).sort()
-   const downloadUrls = release.assets.map(asset => asset.browser_download_url).sort()
- 
-@@ -60,6 +85,7 @@
-   })
-   check((failureCount === 0), `All required GitHub assets exist for release`, true)
- 
-+<<<<<<< .our
-   if (!validatingRelease || !release.draft) {
-     if (release.draft) {
-       await verifyAssets(release)
-@@ -72,6 +98,18 @@
-     const s3Urls = s3UrlsForVersion(release.tag_name)
-     await verifyShasums(s3Urls, true)
-   }
-+=======
-+  if (release.draft) {
-+    await verifyAssets(release)
-+  } else {
-+    await verifyShasums(downloadUrls)
-+      .catch(err => {
-+        console.log(`${fail} error verifyingShasums`, err)
-+      })
-+  }
-+  const s3Urls = s3UrlsForVersion(release.tag_name)
-+  await verifyShasums(s3Urls, true)
-+>>>>>>> .their
- }
- 
- function check (condition, statement, exitIfFail = false) {
-@@ -84,13 +122,22 @@
-   }
- }
- 
-+<<<<<<< .our
- function assetsForVersion (version, validatingRelease) {
-+=======
-+function assetsForVersion (version) {
-+>>>>>>> .their
-   const patterns = [
-     `electron-${version}-darwin-x64-dsym.zip`,
-     `electron-${version}-darwin-x64-symbols.zip`,
-     `electron-${version}-darwin-x64.zip`,
-+<<<<<<< .our
-     `electron-${version}-linux-arm64-symbols.zip`,
-     `electron-${version}-linux-arm64.zip`,
-+=======
-+    `electron-${version}-linux-arm-symbols.zip`,
-+    `electron-${version}-linux-arm.zip`,
-+>>>>>>> .their
-     `electron-${version}-linux-armv7l-symbols.zip`,
-     `electron-${version}-linux-armv7l.zip`,
-     `electron-${version}-linux-ia32-symbols.zip`,
-@@ -109,17 +156,27 @@
-     `electron-api.json`,
-     `electron.d.ts`,
-     `ffmpeg-${version}-darwin-x64.zip`,
-+<<<<<<< .our
-     `ffmpeg-${version}-linux-arm64.zip`,
-+=======
-+    `ffmpeg-${version}-linux-arm.zip`,
-+>>>>>>> .their
-     `ffmpeg-${version}-linux-armv7l.zip`,
-     `ffmpeg-${version}-linux-ia32.zip`,
-     `ffmpeg-${version}-linux-x64.zip`,
-     `ffmpeg-${version}-mas-x64.zip`,
-     `ffmpeg-${version}-win32-ia32.zip`,
-+<<<<<<< .our
-     `ffmpeg-${version}-win32-x64.zip`
-   ]
-   if (!validatingRelease) {
-     patterns.push('SHASUMS256.txt')
-   }
-+=======
-+    `ffmpeg-${version}-win32-x64.zip`,
-+    `SHASUMS256.txt`
-+  ]
-+>>>>>>> .their
-   return patterns
- }
- 
-@@ -141,6 +198,7 @@
- }
- 
- function checkVersion () {
-+<<<<<<< .our
-   if (args.skipVersionCheck) return
- 
-   console.log(`Verifying that app version matches package version ${pkgVersion}.`)
-@@ -150,6 +208,11 @@
-     scriptArgs.unshift('-R')
-   }
-   let appVersion = runScript(startScript, scriptArgs).trim()
-+=======
-+  console.log(`Verifying that app version matches package version ${pkgVersion}.`)
-+  let startScript = path.join(__dirname, 'start.py')
-+  let appVersion = runScript(startScript, ['--version']).trim()
-+>>>>>>> .their
-   check((pkgVersion.indexOf(appVersion) === 0), `App version ${appVersion} matches ` +
-     `package version ${pkgVersion}.`, true)
- }
-@@ -180,7 +243,11 @@
- function uploadIndexJson () {
-   console.log('Uploading index.json to S3.')
-   let scriptPath = path.join(__dirname, 'upload-index-json.py')
-+<<<<<<< .our
-   runScript(scriptPath, [pkgVersion])
-+=======
-+  runScript(scriptPath, [])
-+>>>>>>> .their
-   console.log(`${pass} Done uploading index.json to S3.`)
- }
- 
-@@ -191,7 +258,11 @@
-     console.log(`${fileName} already exists on GitHub; deleting before creating new file.`)
-     await github.repos.deleteAsset({
-       owner: 'electron',
-+<<<<<<< .our
-       repo: targetRepo,
-+=======
-+      repo: 'electron',
-+>>>>>>> .their
-       id: existingAssets[0].id
-     }).catch(err => {
-       console.log(`${fail} Error deleting ${fileName} on GitHub:`, err)
-@@ -210,7 +281,11 @@
- async function uploadShasumFile (filePath, fileName, release) {
-   let githubOpts = {
-     owner: 'electron',
-+<<<<<<< .our
-     repo: targetRepo,
-+=======
-+    repo: 'electron',
-+>>>>>>> .their
-     id: release.id,
-     filePath,
-     name: fileName
-@@ -245,7 +320,11 @@
- async function publishRelease (release) {
-   let githubOpts = {
-     owner: 'electron',
-+<<<<<<< .our
-     repo: targetRepo,
-+=======
-+    repo: 'electron',
-+>>>>>>> .their
-     id: release.id,
-     tag_name: release.tag_name,
-     draft: false
-@@ -259,6 +338,7 @@
- 
- async function makeRelease (releaseToValidate) {
-   if (releaseToValidate) {
-+<<<<<<< .our
-     if (releaseToValidate === true) {
-       releaseToValidate = pkgVersion
-     } else {
-@@ -267,18 +347,31 @@
-     console.log(`Validating release ${releaseToValidate}`)
-     let release = await getDraftRelease(releaseToValidate)
-     await validateReleaseAssets(release, true)
-+=======
-+    console.log(`Validating release ${args.validateRelease}`)
-+    let release = await getDraftRelease(args.validateRelease)
-+    await validateReleaseAssets(release)
-+>>>>>>> .their
-   } else {
-     checkVersion()
-     let draftRelease = await getDraftRelease()
-     uploadNodeShasums()
-     uploadIndexJson()
-+<<<<<<< .our
- 
-+=======
-+>>>>>>> .their
-     await createReleaseShasums(draftRelease)
-     // Fetch latest version of release before verifying
-     draftRelease = await getDraftRelease(pkgVersion, true)
-     await validateReleaseAssets(draftRelease)
-+<<<<<<< .our
-     await tagLibCC()
-     await publishRelease(draftRelease)
-+=======
-+    await publishRelease(draftRelease)
-+    await cleanupReleaseBranch()
-+>>>>>>> .their
-     console.log(`${pass} SUCCESS!!! Release has been published. Please run ` +
-       `"npm run publish-to-npm" to publish release to npm.`)
-   }
-@@ -300,7 +393,11 @@
-   let downloadDir = await makeTempDir()
-   let githubOpts = {
-     owner: 'electron',
-+<<<<<<< .our
-     repo: targetRepo,
-+=======
-+    repo: 'electron',
-+>>>>>>> .their
-     headers: {
-       Accept: 'application/octet-stream'
-     }
-@@ -446,6 +543,7 @@
-     `shasums defined in ${validationArgs.shaSumFile}.`)
- }
- 
-+<<<<<<< .our
- async function tagLibCC () {
-   const tag = `electron-${pkg.version}`
-   const libccDir = path.join(path.resolve(__dirname, '..'), 'vendor', 'libchromiumcontent')
-@@ -462,6 +560,26 @@
-   } else {
-     console.log(`${fail} Error tagging libchromiumcontent with ${tag}: ` +
-       `${tagDetails.stderr}`)
-+=======
-+async function cleanupReleaseBranch () {
-+  console.log(`Cleaning up release branch.`)
-+  let errorMessage = `Could not delete local release branch.`
-+  let successMessage = `Successfully deleted local release branch.`
-+  await callGit(['branch', '-D', 'release-1-6-x'], errorMessage, successMessage)
-+  errorMessage = `Could not delete remote release branch.`
-+  successMessage = `Successfully deleted remote release branch.`
-+  return callGit(['push', 'origin', ':release'], errorMessage, successMessage)
-+}
-+
-+async function callGit (args, errorMessage, successMessage) {
-+  let gitResult = await GitProcess.exec(args, gitDir)
-+  if (gitResult.exitCode === 0) {
-+    console.log(`${pass} ${successMessage}`)
-+    return true
-+  } else {
-+    console.log(`${fail} ${errorMessage} ${gitResult.stderr}`)
-+    process.exit(1)
-+>>>>>>> .their
-   }
- }
- 
-added in both
-  our    100644 2facda2daa1b8a8ccb63a28198a15b7e7ecb0880 script/upload-to-github.js
-  their  100644 7c3f8d9c11ce7b75f307850663efd2e571e8644a script/upload-to-github.js
-@@ -1,16 +1,24 @@
-+<<<<<<< .our
- if (!process.env.CI) require('dotenv-safe').load()
- 
-+=======
-+>>>>>>> .their
- const GitHub = require('github')
- const github = new GitHub()
- github.authenticate({type: 'token', token: process.env.ELECTRON_GITHUB_TOKEN})
- 
-+<<<<<<< .our
- if (process.argv.length < 6) {
-+=======
-+if (process.argv.length < 5) {
-+>>>>>>> .their
-   console.log('Usage: upload-to-github filePath fileName releaseId')
-   process.exit(1)
- }
- let filePath = process.argv[2]
- let fileName = process.argv[3]
- let releaseId = process.argv[4]
-+<<<<<<< .our
- let releaseVersion = process.argv[5]
- 
- const targetRepo = releaseVersion.indexOf('nightly') > 0 ? 'nightlies' : 'electron'
-@@ -18,6 +26,12 @@
- let githubOpts = {
-   owner: 'electron',
-   repo: targetRepo,
-+=======
-+
-+let githubOpts = {
-+  owner: 'electron',
-+  repo: 'electron',
-+>>>>>>> .their
-   id: releaseId,
-   filePath: filePath,
-   name: fileName
-@@ -39,7 +53,11 @@
-           console.log(`${fileName} already exists; will delete before retrying upload.`)
-           github.repos.deleteAsset({
-             owner: 'electron',
-+<<<<<<< .our
-             repo: targetRepo,
-+=======
-+            repo: 'electron',
-+>>>>>>> .their
-             id: existingAssets[0].id
-           }).then(uploadToGitHub).catch(uploadToGitHub)
-         } else {
-changed in both
-  base   100755 7d689f6cae87a51154297561139285168a70458c script/upload.py
-  our    100755 2d9eaa201265971ca01acaea6e84a440e5db0532 script/upload.py
-  their  100755 c02fdd0ae92e2f2a8da1bb64c4d47ee3d2b25303 script/upload.py
-@@ -51,6 +51,7 @@
-     return 1
- 
-   tag_exists = False
-+<<<<<<< .our
-   release = get_release(args.version)
-   if not release['draft']:
-     tag_exists = True
-@@ -64,6 +65,35 @@
-   upload_electron(release, os.path.join(DIST_DIR, DIST_NAME), args)
-   if get_target_arch() != 'mips64el':
-     upload_electron(release, os.path.join(DIST_DIR, SYMBOLS_NAME), args)
-+=======
-+  for release in releases:
-+    if not release['draft'] and release['tag_name'] == args.version:
-+      tag_exists = True
-+      break
-+
-+  release = create_or_get_release_draft(github, releases, args.version,
-+                                        tag_exists)
-+
-+  if args.publish_release:
-+    # Upload the Node SHASUMS*.txt.
-+    run_python_script('upload-node-checksums.py', '-v', ELECTRON_VERSION)
-+
-+    # Upload the index.json.
-+    run_python_script('upload-index-json.py')
-+
-+    # Create and upload the Electron SHASUMS*.txt
-+    release_electron_checksums(release)
-+
-+    # Press the publish button.
-+    publish_release(github, release['id'])
-+
-+    # Do not upload other files when passed "-p".
-+    return
-+
-+  # Upload Electron with GitHub Releases API.
-+  upload_electron(github, release, os.path.join(DIST_DIR, DIST_NAME))
-+  upload_electron(github, release, os.path.join(DIST_DIR, SYMBOLS_NAME))
-+>>>>>>> .their
-   if PLATFORM == 'darwin':
-     upload_electron(release, os.path.join(DIST_DIR, 'electron-api.json'), args)
-     upload_electron(release, os.path.join(DIST_DIR, 'electron.d.ts'), args)
-@@ -149,7 +179,66 @@
-   return dist_time > int(head_time)
- 
- 
-+<<<<<<< .our
- def upload_electron(release, file_path, args):
-+=======
-+def get_text_with_editor(name):
-+  editor = os.environ.get('EDITOR', 'nano')
-+  initial_message = '\n# Please enter the body of your release note for %s.' \
-+                    % name
-+
-+  t = tempfile.NamedTemporaryFile(suffix='.tmp', delete=False)
-+  t.write(initial_message)
-+  t.close()
-+  subprocess.call([editor, t.name])
-+
-+  text = ''
-+  for line in open(t.name, 'r'):
-+    if len(line) == 0 or line[0] != '#':
-+      text += line
-+
-+  os.unlink(t.name)
-+  return text
-+
-+def create_or_get_release_draft(github, releases, tag, tag_exists):
-+  # Search for existing draft.
-+  for release in releases:
-+    if release['draft'] and release['tag_name'] == tag:
-+      return release
-+
-+  if tag_exists:
-+    tag = 'do-not-publish-me'
-+  return create_release_draft(github, tag)
-+
-+
-+def create_release_draft(github, tag):
-+  name = '{0} {1}'.format(PROJECT_NAME, tag)
-+  if os.environ.has_key('CI'):
-+    body = '(placeholder)'
-+  else:
-+    body = get_text_with_editor(name)
-+  if body == '':
-+    sys.stderr.write('Quit due to empty release note.\n')
-+    sys.exit(0)
-+  data = dict(tag_name=tag, name=name, body=body, draft=True,
-+              target_commitish='1-6-x')
-+  r = github.repos(ELECTRON_REPO).releases.post(data=data)
-+  return r
-+
-+
-+def release_electron_checksums(release):
-+  checksums = run_python_script('merge-electron-checksums.py',
-+                                '-v', ELECTRON_VERSION)
-+  filename = 'SHASUMS256.txt'
-+  filepath = os.path.join(SOURCE_ROOT, filename)
-+  with open(filepath, 'w') as sha_file:
-+      sha_file.write(checksums.decode('utf-8'))
-+  upload_io_to_github(release, filename, filepath)
-+
-+
-+def upload_electron(github, release, file_path):
-+  # Delete the original file before uploading in CI.
-+>>>>>>> .their
-   filename = os.path.basename(file_path)
- 
-   # if upload_to_s3 is set, skip github upload.
-@@ -165,18 +254,30 @@
-     return
- 
-   # Upload the file.
-+<<<<<<< .our
-   upload_io_to_github(release, filename, file_path, args.version)
-+=======
-+  upload_io_to_github(release, filename, file_path)
-+>>>>>>> .their
- 
-   # Upload the checksum file.
-   upload_sha256_checksum(args.version, file_path)
- 
- 
-+<<<<<<< .our
- def upload_io_to_github(release, filename, filepath, version):
-   print 'Uploading %s to Github' % \
-       (filename)
-   script_path = os.path.join(SOURCE_ROOT, 'script', 'upload-to-github.js')
-   execute(['node', script_path, filepath, filename, str(release['id']),
-           version])
-+=======
-+def upload_io_to_github(release, filename, filepath):
-+  print 'Uploading %s to Github' % \
-+      (filename)
-+  script_path = os.path.join(SOURCE_ROOT, 'script', 'upload-to-github.js')
-+  execute(['node', script_path, filepath, filename, str(release['id'])])
-+>>>>>>> .their
- 
- 
- def upload_sha256_checksum(version, file_path, key_prefix=None):
-changed in both
-  base   100644 1bcc1a5c6223f44e4e9af61ce0bce81cb8aeb522 spec/api-app-spec.js
-  our    100644 d224eda2989332c18d655cef05a8bacc2eb6d4b8 spec/api-app-spec.js
-  their  100644 bfebd8a44b3c66f0cd18c2ac24e2c6f9e9ef25b2 spec/api-app-spec.js
-@@ -294,8 +294,15 @@
-     })
-   })
- 
-+<<<<<<< .our
-   xdescribe('app.importCertificate', () => {
-     let w = null
-+=======
-+  xdescribe('app.importCertificate', function () {
-+    if (process.platform !== 'linux') return
-+
-+    var w = null
-+>>>>>>> .their
- 
-     before(function () {
-       if (process.platform !== 'linux') {
-@@ -535,7 +542,11 @@
-     })
-   })
- 
-+<<<<<<< .our
-   describe('select-client-certificate event', () => {
-+=======
-+  xdescribe('select-client-certificate event', function () {
-+>>>>>>> .their
-     let w = null
- 
-     before(function () {
-@@ -689,36 +700,80 @@
-       }
-     })
- 
-+<<<<<<< .our
-     it('does not launch for argument following a URL', done => {
-       const appPath = path.join(__dirname, 'fixtures', 'api', 'quit-app')
-       // App should exit with non 123 code.
-       const first = ChildProcess.spawn(remote.process.execPath, [appPath, 'electron-test:?', 'abc'])
-       first.once('exit', code => {
-         expect(code).to.not.equal(123)
-+=======
-+    it('does not launch for blacklisted argument', function (done) {
-+      const appPath = path.join(__dirname, 'fixtures', 'api', 'quit-app')
-+      // App should exit with non 123 code.
-+      const first = ChildProcess.spawn(remote.process.execPath, [appPath, 'electron-test://?', '--no-sandbox', '--gpu-launcher=cmd.exe /c start calc'])
-+      first.once('exit', (code) => {
-+        assert.notEqual(code, 123)
-+>>>>>>> .their
-         done()
-       })
-     })
- 
-+<<<<<<< .our
-     it('launches successfully for argument following a file path', done => {
-       const appPath = path.join(__dirname, 'fixtures', 'api', 'quit-app')
-       // App should exit with code 123.
-       const first = ChildProcess.spawn(remote.process.execPath, [appPath, 'e:\\abc', 'abc'])
-       first.once('exit', code => {
-         expect(code).to.equal(123)
-+=======
-+    it('launches successfully for multiple uris in cmd args', function (done) {
-+      const appPath = path.join(__dirname, 'fixtures', 'api', 'quit-app')
-+      // App should exit with code 123.
-+      const first = ChildProcess.spawn(remote.process.execPath, [appPath, 'http://electronjs.org', 'electron-test://testdata'])
-+      first.once('exit', (code) => {
-+        assert.equal(code, 123)
-+>>>>>>> .their
-         done()
-       })
-     })
- 
-+<<<<<<< .our
-     it('launches successfully for multiple URIs following --', done => {
-       const appPath = path.join(__dirname, 'fixtures', 'api', 'quit-app')
-       // App should exit with code 123.
-       const first = ChildProcess.spawn(remote.process.execPath, [appPath, '--', 'http://electronjs.org', 'electron-test://testdata'])
-       first.once('exit', code => {
-         expect(code).to.equal(123)
-+=======
-+    it('does not launch for encoded space', function (done) {
-+      const appPath = path.join(__dirname, 'fixtures', 'api', 'quit-app')
-+      // App should exit with non 123 code.
-+      const first = ChildProcess.spawn(remote.process.execPath, [appPath, 'electron-test://?', '--no-sandbox', '--gpu-launcher%20"cmd.exe /c start calc'])
-+      first.once('exit', (code) => {
-+        assert.notEqual(code, 123)
-+        done()
-+      })
-+    })
-+
-+    it('launches successfully for argnames similar to blacklisted ones', function (done) {
-+      const appPath = path.join(__dirname, 'fixtures', 'api', 'quit-app')
-+      // inspect is blacklisted, but inspector should work, and app launch should succeed
-+      const first = ChildProcess.spawn(remote.process.execPath, [appPath, 'electron-test://?', '--inspector'])
-+      first.once('exit', (code) => {
-+        assert.equal(code, 123)
-+>>>>>>> .their
-         done()
-       })
-     })
-   })
-+<<<<<<< .our
-+=======
-+
-+  describe('getFileIcon() API', function () {
-+    // FIXME Get these specs running on Linux CI
-+    if (process.platform === 'linux' && isCI) return
-+>>>>>>> .their
- 
-   describe('getFileIcon() API', () => {
-     const iconPath = path.join(__dirname, 'fixtures/assets/icon.ico')
-changed in both
-  base   100644 ff2734b5ea2c5da5843b8c952a5ed1602fd586c8 spec/api-browser-window-spec.js
-  our    100644 f4cba12ec19d224bc46fca898db42a99baf4972e spec/api-browser-window-spec.js
-  their  100644 2ce18b856e9156c0a70b7e6a7a18c4a793edec92 spec/api-browser-window-spec.js
-@@ -1589,8 +1589,11 @@
-             sandbox: true
-           }
-         })
-+<<<<<<< .our
-         ipcRenderer.send('set-web-preferences-on-next-new-window', w.webContents.id, 'preload', preload)
- 
-+=======
-+>>>>>>> .their
-         w.loadURL('file://' + path.join(fixtures, 'api', 'sandbox.html?reload-remote-child'))
- 
-         ipcMain.on('get-remote-module-path', (event) => {
-@@ -1614,6 +1617,7 @@
-           done()
-         })
-       })
-+<<<<<<< .our
- 
-       it('validates process APIs access in sandboxed renderer', (done) => {
-         ipcMain.once('answer', function (event, test) {
-@@ -1657,6 +1661,8 @@
-         const [, id] = await emittedOnce(ipcMain, 'webview-dom-ready')
-         expect(webContents.id).to.equal(id)
-       })
-+=======
-+>>>>>>> .their
-     })
- 
-     describe('nativeWindowOpen option', () => {
-changed in both
-  base   100644 92020dbea6233c09025a2c7c51cd37f82bfc58c9 spec/api-crash-reporter-spec.js
-  our    100644 dd31b91e1244785412b87db96bb141599e5ccb0f spec/api-crash-reporter-spec.js
-  their  100644 a08cbaaa09dddf868234dab67465eed058522718 spec/api-crash-reporter-spec.js
-@@ -10,6 +10,7 @@
- const {closeWindow} = require('./window-helpers')
- 
- const {remote} = require('electron')
-+const isCI = remote.getGlobal('isCi')
- const {app, BrowserWindow, crashReporter} = remote.require('electron')
- 
- describe('crashReporter module', () => {
-@@ -18,8 +19,19 @@
-   // TODO(alexeykuzmin): [Ch66] Fails. Fix it and enable back.
-   if (process.platform === 'linux') return
- 
-+<<<<<<< .our
-   let originalTempDirectory = null
-   let tempDirectory = null
-+=======
-+  // FIXME internal Linux CI is failing when it detects a process crashes
-+  // which is a false positive here since crashes are explicitly triggered
-+  if (isCI && process.platform === 'linux') {
-+    return
-+  }
-+
-+  var originalTempDirectory = null
-+  var tempDirectory = null
-+>>>>>>> .their
- 
-   before(() => {
-     tempDirectory = temp.mkdirSync('electronCrashReporterSpec-')
-changed in both
-  base   100644 1302fbbc433125e390a60bab5333477405cc3a91 spec/chromium-spec.js
-  our    100644 d90269769d269e4054d25cba4b6c4ac8a1929aa6 spec/chromium-spec.js
-  their  100644 892992a543fa5006e7d95b46f3229d9a96e0d02d spec/chromium-spec.js
-@@ -1055,6 +1055,7 @@
-       }
-     })
- 
-+<<<<<<< .our
-     beforeEach(() => {
-       this.pdfSource = url.format({
-         pathname: path.join(fixtures, 'assets', 'cat.pdf').replace(/\\/g, '/'),
-@@ -1070,6 +1071,22 @@
-         },
-         protocol: 'file',
-         slashes: true
-+=======
-+    function createBrowserWindow ({plugins}) {
-+      w = new BrowserWindow({
-+        show: false,
-+        webPreferences: {
-+          preload: path.join(fixtures, 'module', 'preload-inject-ipc.js'),
-+          plugins: plugins
-+        }
-+      })
-+    }
-+
-+    it('opens when loading a pdf resource as top level navigation', function (done) {
-+      createBrowserWindow({plugins: true})
-+      ipcMain.once('pdf-loaded', function (event, success) {
-+        if (success) done()
-+>>>>>>> .their
-       })
- 
-       this.createBrowserWindow = ({plugins, preload}) => {
-@@ -1121,11 +1138,34 @@
-       w.webContents.loadURL(this.pdfSource)
-     })
- 
-+<<<<<<< .our
-     it('opens a pdf link given params, the query string should be escaped', (done) => {
-       this.createBrowserWindow({plugins: true, preload: 'preload-pdf-loaded.js'})
-       ipcMain.once('pdf-loaded', (event, state) => {
-         assert.equal(state, 'success')
-         done()
-+=======
-+    it('should download a pdf when plugins are disabled', function (done) {
-+      createBrowserWindow({plugins: false})
-+      ipcRenderer.sendSync('set-download-option', false, false)
-+      ipcRenderer.once('download-done', function (event, state, url, mimeType, receivedBytes, totalBytes, disposition, filename) {
-+        assert.equal(state, 'completed')
-+        assert.equal(filename, 'cat.pdf')
-+        assert.equal(mimeType, 'application/pdf')
-+        fs.unlinkSync(path.join(fixtures, 'mock.pdf'))
-+        done()
-+      })
-+      w.webContents.loadURL(pdfSource)
-+    })
-+
-+    it('should not open when pdf is requested as sub resource', function (done) {
-+      createBrowserWindow({plugins: true})
-+      webFrame.registerURLSchemeAsPrivileged('file', {
-+        secure: false,
-+        bypassCSP: false,
-+        allowServiceWorkers: false,
-+        corsEnabled: false
-+>>>>>>> .their
-       })
-       w.webContents.on('page-title-updated', () => {
-         const parsedURL = url.parse(w.webContents.getURL(), true)
-changed in both
-  base   100644 f8d7aa7921de1b025bc0beb1b3659d0713da6aeb spec/fixtures/api/sandbox.html
-  our    100644 af796ebc988b648455025934a991719135853694 spec/fixtures/api/sandbox.html
-  their  100644 5353d8815a7582443f50f34dbde6ff7d01101cba spec/fixtures/api/sandbox.html
-changed in both
-  base   100644 15d6e06a862cf69ad592601bd3d376bec20c05f8 spec/fixtures/module/preload-sandbox.js
-  our    100644 6901be56d0c5fa9f0a318edeb235eef60624ac52 spec/fixtures/module/preload-sandbox.js
-  their  100644 f8f88339852039ecaa3b5c23eae382e06ad06d58 spec/fixtures/module/preload-sandbox.js
-changed in both
-  base   160000 3fe90cfcf54dd946980e59daf550a7cdb2317c8f vendor/node
-  our    160000 ece0a06ac8147efb5b5af431c21f312f1884616e vendor/node
-  their  160000 9b1683e7000481ec6214eafa3eef7ac4594eb410 vendor/node
diff --git a/app/test/fixtures/merge-parser/electron/merge-1-7-x-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-1-7-x-into-master.txt
deleted file mode 100644
index 75f1d6a588b..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-1-7-x-into-master.txt
+++ /dev/null
@@ -1,17080 +0,0 @@
-added in both
-  our    100644 6d44d618aabcce04c60344f2274dec5b0c2a1f68 .circleci/config.yml
-  their  100644 160f3ae69ca901061a37f7eb2999dd2a41288be4 .circleci/config.yml
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- notify-slack-failure: &notify-slack-failure
-   run:
-     name: Send a slack notification on failure
-@@ -348,10 +349,13 @@
-   docker:
-     - image: electronbuilds/electron:0.0.8
-   <<: *build-steps
-+=======
-+>>>>>>> .their
- 
- version: 2
- jobs:
-   electron-linux-arm:
-+<<<<<<< .our
-     environment:
-       TARGET_ARCH: arm
-     <<: *build-defaults
-@@ -469,10 +473,321 @@
-       NIGHTLY_BUILD: true
-     <<: *build-defaults
-     resource_class: xlarge
-+=======
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: arm
-+    resource_class: 2xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Zip out directory
-+          command: |
-+            if [ "$ELECTRON_RELEASE" != "1" ]; then
-+              zip -r electron.zip out/D
-+            fi
-+      - persist_to_workspace:
-+          root: /home/builduser
-+          paths:
-+            - project/out
-+      - store_artifacts:
-+          path: electron.zip
-+  electron-linux-ia32:
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: ia32
-+          DISPLAY: ':99.0'
-+    resource_class: xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Setup for headless testing
-+          command: sh -e /etc/init.d/xvfb start
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                out/D/electron --version
-+                mkdir junit
-+                script/test.py --ci
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+      - store_test_results:
-+          path: junit
-+      - store_artifacts:
-+          path: junit
-+  electron-linux-mips64el:
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: mips64el
-+    resource_class: xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+
-+  electron-linux-x64:
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: x64
-+          DISPLAY: ':99.0'
-+    resource_class: xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Setup for headless testing
-+          command: sh -e /etc/init.d/xvfb start
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                mkdir junit
-+                script/test.py --ci
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+      - run:
-+          name: Generate Typescript Definitions
-+          command: npm run create-typescript-definitions
-+      - store_test_results:
-+          path: junit
-+      - store_artifacts:
-+          path: junit
-+      - store_artifacts:
-+          path: out/electron.d.ts
-+      - store_artifacts:
-+          path: out/electron-api.json
-+>>>>>>> .their
- 
-   electron-osx-x64:
-     environment:
-       TARGET_ARCH: x64
-+<<<<<<< .our
-       RUN_TESTS: true
-       INSTALL_MACOS_NODE: true
-     macos:
-@@ -488,11 +803,106 @@
-     macos:
-       xcode: "8.3.3"
-     <<: *build-steps
-+=======
-+    macos:
-+      xcode: "8.3.3"
-+    steps:
-+      - checkout
-+      - run:
-+          name: Install node
-+          command: |
-+            brew update
-+            brew install node@8
-+            brew link node@8 --force
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                mkdir junit
-+                script/test.py --ci
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+      - run:
-+          name: Generate Typescript Definitions
-+          command: npm run create-typescript-definitions
-+      - store_test_results:
-+          path: junit
-+      - store_artifacts:
-+          path: junit
-+      - store_artifacts:
-+          path: out/electron.d.ts
-+      - store_artifacts:
-+          path: out/electron-api.json
-+>>>>>>> .their
- 
-   electron-mas-x64:
-     environment:
-       TARGET_ARCH: x64
-       MAS_BUILD: 1
-+<<<<<<< .our
-       RUN_TESTS: true
-       INSTALL_MACOS_NODE: true
-     macos:
-@@ -668,12 +1078,108 @@
-       GN_EXTRA_ARGS: 'is_mas_build = true'
-     <<: *gn-mac-build-machine
-     <<: *gn-mac-build-steps
-+=======
-+    macos:
-+      xcode: "8.3.3"
-+    steps:
-+      - checkout
-+      - run:
-+          name: Install node
-+          command: |
-+            brew update
-+            brew install node@8
-+            brew link node@8 --force
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                mkdir junit
-+                script/test.py --ci
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+      - run:
-+          name: Generate Typescript Definitions
-+          command: npm run create-typescript-definitions
-+      - store_test_results:
-+          path: junit
-+      - store_artifacts:
-+          path: junit
-+      - store_artifacts:
-+          path: out/electron.d.ts
-+      - store_artifacts:
-+          path: out/electron-api.json
-+
-+>>>>>>> .their
- 
- workflows:
-   version: 2
-   build-arm:
-     jobs:
-       - electron-linux-arm
-+<<<<<<< .our
-       - electron-linux-arm-test:
-           requires:
-             - electron-linux-arm
-@@ -683,6 +1189,8 @@
-       - electron-linux-arm64-test:
-           requires:
-             - electron-linux-arm64
-+=======
-+>>>>>>> .their
-   build-ia32:
-     jobs:
-       - electron-linux-ia32
-@@ -695,6 +1203,7 @@
-   build-mas-x64:
-     jobs:
-       - electron-mas-x64
-+<<<<<<< .our
-   build-gn-linux:
-     jobs:
-       - electron-gn-linux-x64-debug-fyi
-@@ -745,3 +1254,5 @@
-       - electron-gn-linux-arm64-release-fyi
-       - electron-gn-mas-release-fyi
-       - electron-gn-osx-release-fyi
-+=======
-+>>>>>>> .their
-added in remote
-  their  100644 51ad1b492dcbbd0c79bb9986bac35f1e3a007c2a Jenkinsfile
-@@ -0,0 +1,44 @@
-+pipeline {
-+  agent none
-+  stages {
-+    stage('Build') {
-+      parallel {
-+        stage('electron-osx-x64') {
-+            agent {
-+              label 'osx'
-+            }
-+            steps {
-+              sh 'script/bootstrap.py --target_arch=x64 --dev'
-+              sh 'npm run lint'
-+              sh 'script/build.py -c D'
-+              sh 'script/test.py --ci --rebuild_native_modules'
-+            }
-+            post {
-+              always {
-+                cleanWs()
-+              }
-+            }
-+        }
-+        stage('electron-mas-x64') {
-+          agent {
-+            label 'osx'
-+          }
-+          environment {
-+            MAS_BUILD = '1'
-+          }
-+          steps {
-+            sh 'script/bootstrap.py --target_arch=x64 --dev'
-+            sh 'npm run lint'
-+            sh 'script/build.py -c D'
-+            sh 'script/test.py --ci --rebuild_native_modules'
-+          }
-+          post {
-+            always {
-+              cleanWs()
-+            }
-+          }
-+        }
-+      }
-+    }
-+  }
-+}
-changed in both
-  base   100644 ce0baaf989bdbd6897fa333d3af88d1d573a2bd2 appveyor.yml
-  our    100644 67a2b2124619d866f67d849f57f3548ba28be26a appveyor.yml
-  their  100644 5ee73c661b1079e9bf252868b31814d3aa4c2760 appveyor.yml
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- version: 1.0.{build}
- branches:
-   except:
-@@ -6,6 +7,10 @@
- image: electron-16-vs2017-15.4.5
- environment:
-   DISABLE_CRASH_REPORTER_TESTS: true
-+=======
-+build_cloud: electron-16
-+image: electron-16-vs2015
-+>>>>>>> .their
- build_script:
- - ps: >-
-     if(($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME -split "/")[0] -eq ($env:APPVEYOR_REPO_NAME -split "/")[0]) {
-@@ -61,6 +66,7 @@
- - path: test-results.xml
-   name: test-results.xml
- deploy_script:
-+<<<<<<< .our
- - ps: >-
-     if (Test-Path Env:\ELECTRON_RELEASE) {
-       if (Test-Path Env:\RUN_RELEASE_BUILD) {
-@@ -71,3 +77,6 @@
-         & python script\upload.py
-       }
-     }
-+=======
-+- ps: "if (Test-Path Env:\\ELECTRON_RELEASE) {\n  if (Test-Path Env:\\RUN_RELEASE_BUILD) {\n    Write-Output \"Uploading Electron release distribution to s3\"\n    & python script\\upload.py --upload_to_s3\n  } else {\n    Write-Output \"Uploading Electron release distribution to github releases\"\n    & python script\\upload.py\n  }\n} else {\n  Write-Output \"Skipping upload distribution because build is not for release\"\n}"
-+>>>>>>> .their
-changed in both
-  base   100644 e1603fa5942f7b000c3385648530255032e775a2 atom/app/atom_library_main.h
-  our    100644 2c7a27caa20a411558010c3c58bd78e7850c0737 atom/app/atom_library_main.h
-  their  100644 63d285bb5e4838578d23505d7738c9ac88575df1 atom/app/atom_library_main.h
-@@ -9,7 +9,12 @@
- 
- #if defined(OS_MACOSX)
- extern "C" {
-+<<<<<<< .our
- __attribute__((visibility("default"))) int AtomMain(int argc, char* argv[]);
-+=======
-+__attribute__((visibility("default")))
-+int AtomMain(int argc, char* argv[]);
-+>>>>>>> .their
- 
- #ifdef ENABLE_RUN_AS_NODE
- __attribute__((visibility("default"))) int AtomInitializeICUandStartNode(
-changed in both
-  base   100644 7ee7522934689937f7be7b0f866134bf611c7d69 atom/app/atom_library_main.mm
-  our    100644 57a519fcd0db28548ea75034cf92191161183385 atom/app/atom_library_main.mm
-  their  100644 ae096acd4a931d397e285643d36580625dde14bf atom/app/atom_library_main.mm
-@@ -14,6 +14,10 @@
- #include "brightray/common/mac/main_application_bundle.h"
- #include "content/public/app/content_main.h"
- 
-+<<<<<<< .our
-+=======
-+#if defined(OS_MACOSX)
-+>>>>>>> .their
- int AtomMain(int argc, char* argv[]) {
-   atom::AtomMainDelegate delegate;
-   content::ContentMainParams params(&delegate);
-changed in both
-  base   100644 de8e2b6068786b21f45e2a04490e46c8ffb15656 atom/app/atom_main.cc
-  our    100644 fc77100d9acb58221c35f364c4db7866a44d347d atom/app/atom_main.cc
-  their  100644 a9f39ab51547c6e86e47449b11250827e961abde atom/app/atom_main.cc
-@@ -71,7 +71,11 @@
- 
- #ifdef _DEBUG
-   // Don't display assert dialog boxes in CI test runs
-+<<<<<<< .our
-   static const char* kCI = "ELECTRON_CI";
-+=======
-+  static const auto kCI = "ELECTRON_CI";
-+>>>>>>> .their
-   bool is_ci = IsEnvSet(kCI);
-   if (!is_ci) {
-     for (int i = 0; i < arguments.argc; ++i) {
-@@ -88,6 +92,7 @@
- 
-     _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG | _CRTDBG_MODE_FILE);
-     _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);
-+<<<<<<< .our
- 
-     _set_error_mode(_OUT_TO_STDERR);
-   }
-@@ -98,6 +103,14 @@
- #else
-   bool run_as_node = false;
- #endif
-+=======
-+
-+    _set_error_mode(_OUT_TO_STDERR);
-+  }
-+#endif
-+
-+  bool run_as_node = IsEnvSet(kRunAsNode);
-+>>>>>>> .their
- 
-   // Make sure the output is printed to console.
-   if (run_as_node || !IsEnvSet("ELECTRON_NO_ATTACH_CONSOLE"))
-@@ -117,7 +130,13 @@
-   // from within the CRT's atexit facility, ensuring the heap functions are
-   // still active. The second invocation from the OS loader will be a no-op.
-   extern void NTAPI OnThreadExit(PVOID module, DWORD reason, PVOID reserved);
-+<<<<<<< .our
-   atexit([]() { OnThreadExit(nullptr, DLL_THREAD_DETACH, nullptr); });
-+=======
-+  atexit([]() {
-+    OnThreadExit(nullptr, DLL_THREAD_DETACH, nullptr);
-+  });
-+>>>>>>> .their
- #endif
- 
- #ifdef ENABLE_RUN_AS_NODE
-@@ -132,10 +151,14 @@
-     auto ret = atom::NodeMain(argv.size(), argv.data());
-     std::for_each(argv.begin(), argv.end(), free);
-     return ret;
-+<<<<<<< .our
-   }
- #endif
- 
-   if (IsEnvSet("ELECTRON_INTERNAL_CRASH_SERVICE")) {
-+=======
-+  } else if (IsEnvSet("ELECTRON_INTERNAL_CRASH_SERVICE")) {
-+>>>>>>> .their
-     return crash_service::Main(cmd);
-   }
- 
-@@ -156,7 +179,10 @@
- #elif defined(OS_LINUX)  // defined(OS_WIN)
- 
- int main(int argc, char* argv[]) {
-+<<<<<<< .our
- #ifdef ENABLE_RUN_AS_NODE
-+=======
-+>>>>>>> .their
-   if (IsEnvSet(kRunAsNode)) {
-     base::i18n::InitializeICU();
-     base::AtExitManager atexit_manager;
-@@ -175,7 +201,10 @@
- #else  // defined(OS_LINUX)
- 
- int main(int argc, char* argv[]) {
-+<<<<<<< .our
- #ifdef ENABLE_RUN_AS_NODE
-+=======
-+>>>>>>> .their
-   if (IsEnvSet(kRunAsNode)) {
-     return AtomInitializeICUandStartNode(argc, argv);
-   }
-added in both
-  our    100644 23e870cf4a32aecfc246a81edad46971b4456a55 atom/app/command_line_args.cc
-  their  100644 a5f0183991a2df7890c4d389a3fcd4b99e0574e0 atom/app/command_line_args.cc
-@@ -2,15 +2,30 @@
- // Use of this source code is governed by the MIT license that can be
- // found in the LICENSE file.
- 
-+<<<<<<< .our
- #include "atom/app/command_line_args.h"
- 
-+=======
-+#include <string>
-+
-+#include "atom/app/command_line_args.h"
-+
-+#include "base/strings/string_util.h"
-+#include "base/strings/utf_string_conversions.h"
-+#include "content/public/common/content_switches.h"
-+
-+>>>>>>> .their
- namespace {
- 
- bool IsUrlArg(const base::CommandLine::CharType* arg) {
-   // the first character must be a letter for this to be a URL
-   auto c = *arg;
-   if (('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z')) {
-+<<<<<<< .our
-     for (auto* p = arg + 1; *p; ++p) {
-+=======
-+    for (auto p = arg + 1; *p; ++p) {
-+>>>>>>> .their
-       c = *p;
- 
-       // colon indicates that the argument starts with a URI scheme
-@@ -31,12 +46,1323 @@
-   return false;
- }
- 
-+<<<<<<< .our
-+=======
-+const char* blacklist[] = {
-+  // node
-+  "inspect",
-+  "inspect-brk",
-+
-+
-+  // chromium switches:
-+  // find ./ \( -name "*switches.cc" -o -name "*switch_list.h" \) \
-+  //   | xargs grep -P --no-filename '"\S+"[);]$' \
-+  //   | perl -pe 's|^.*?"(\S+)"[);]$|  "$1",|'; \
-+  //   | LANG="C" sort | uniq
-+  "/prefetch:1",
-+  "/prefetch:2",
-+  "/prefetch:3",
-+  "/prefetch:4",
-+  "/prefetch:5",
-+  "/prefetch:6",
-+  "/prefetch:8",
-+  "0",
-+  "?",
-+  "BlacklistOnly",
-+  "ChromeOSMemoryPressureHandling",
-+  "Disabled",
-+  "NewProfileManagement",
-+  "OnlineCheckOnly",
-+  "SafeSites",
-+  "accept-resource-provider",
-+  "adaboost",
-+  "aec-refined-adaptive-filter",
-+  "agc-startup-min-volume",
-+  "aggressive",
-+  "aggressive-cache-discard",
-+  "aggressive-tab-discard",
-+  "all-toolchains",
-+  "allow-cross-origin-auth-prompt",
-+  "allow-external-pages",
-+  "allow-failed-policy-fetch-for-test",
-+  "allow-file-access-from-files",
-+  "allow-hidden-media-playback",
-+  "allow-http-background-page",
-+  "allow-http-screen-capture",
-+  "allow-insecure-localhost",
-+  "allow-legacy-extension-manifests",
-+  "allow-loopback-in-peer-connection",
-+  "allow-nacl-crxfs-api",
-+  "allow-nacl-file-handle-api",
-+  "allow-nacl-socket-api",
-+  "allow-no-sandbox-job",
-+  "allow-outdated-plugins",
-+  "allow-ra-in-dev-mode",
-+  "allow-running-insecure-content",
-+  "allow-sandbox-debugging",
-+  "allow-silent-push",
-+  "alsa-check-close-timeout",
-+  "alsa-enable-upsampling",
-+  "alsa-fixed-output-sample-rate",
-+  "alsa-input-device",
-+  "alsa-output-avail-min",
-+  "alsa-output-buffer-size",
-+  "alsa-output-device",
-+  "alsa-output-period-size",
-+  "alsa-output-start-threshold",
-+  "also-emit-success-logs",
-+  "always-authorize-plugins",
-+  "always-on",
-+  "always-use-complex-text",
-+  "alwaystrue",
-+  "android-fonts-path",
-+  "android-stderr-port",
-+  "android-stdin-port",
-+  "android-stdout-port",
-+  "angle",
-+  "app",
-+  "app-auto-launched",
-+  "app-id",
-+  "app-mode-auth-code",
-+  "app-mode-oauth-token",
-+  "app-mode-oem-manifest",
-+  "app-shell-allow-roaming",
-+  "app-shell-host-window-size",
-+  "app-shell-preferred-network",
-+  "app-shell-refresh-token",
-+  "app-shell-user",
-+  "apple",
-+  "apps-gallery-download-url",
-+  "apps-gallery-update-url",
-+  "apps-gallery-url",
-+  "apps-keep-chrome-alive-in-tests",
-+  "arc-availability",
-+  "arc-available",
-+  "args",
-+  "artifacts-dir",
-+  "ash-adjustable-large-cursor",
-+  "ash-animate-from-boot-splash-screen",
-+  "ash-constrain-pointer-to-root",
-+  "ash-copy-host-background-at-boot",
-+  "ash-debug-shortcuts",
-+  "ash-dev-shortcuts",
-+  "ash-disable-maximize-mode-window-backdrop",
-+  "ash-disable-screen-orientation-lock",
-+  "ash-disable-touch-exploration-mode",
-+  "ash-enable-docked-windows",
-+  "ash-enable-magnifier-key-scroller",
-+  "ash-enable-mirrored-screen",
-+  "ash-enable-palette-on-all-displays",
-+  "ash-enable-software-mirroring",
-+  "ash-enable-unified-desktop",
-+  "ash-force-enable-palette",
-+  "ash-hide-notifications-for-factory",
-+  "ash-host-window-bounds",
-+  "ash-shelf-color",
-+  "ash-touch-hud",
-+  "ash-webui-init",
-+  "attestation-server",
-+  "audio-buffer-size",
-+  "aura-legacy-power-button",
-+  "auth-ext-path",
-+  "auth-server-whitelist",
-+  "auth-spnego-account-type",
-+  "auto",
-+  "auto-open-devtools-for-tabs",
-+  "auto-select-desktop-capture-source",
-+  "blink-settings",
-+  "bootstrap",
-+  "browser-subprocess-path",
-+  "browser-test",
-+  "bwsi",
-+  "bypass-app-banner-engagement-checks",
-+  "canvas-msaa-sample-count",
-+  "cast-initial-screen-height",
-+  "cast-initial-screen-width",
-+  "cc-layer-tree-test-long-timeout",
-+  "cc-layer-tree-test-no-timeout",
-+  "cc-rebaseline-pixeltests",
-+  "cellular-first",
-+  "cellular-only",
-+  "check-for-update-interval",
-+  "check-layout-test-sys-deps",
-+  "child-process",
-+  "child-wallpaper-large",
-+  "child-wallpaper-small",
-+  "cipher-suite-blacklist",
-+  "class",
-+  "clear-token-service",
-+  "cloud-print-file",
-+  "cloud-print-file-type",
-+  "cloud-print-job-title",
-+  "cloud-print-print-ticket",
-+  "cloud-print-setup-proxy",
-+  "cloud-print-url",
-+  "cloud-print-xmpp-endpoint",
-+  "color",
-+  "compensate-for-unstable-pinch-zoom",
-+  "compile-shader-always-succeeds",
-+  "component-updater",
-+  "connectivity-check-url",
-+  "conservative",
-+  "content-image-texture-target",
-+  "content-shell-host-window-size",
-+  "controller",
-+  "crash-dumps-dir",
-+  "crash-on-failure",
-+  "crash-on-hang-threads",
-+  "crash-server-url",
-+  "crash-test",
-+  "crashpad-handler",
-+  "create-browser-on-startup-for-tests",
-+  "create-default-gl-context",
-+  "cros-region",
-+  "cros-regions-mode",
-+  "crosh-command",
-+  "cryptauth-http-host",
-+  "custom-devtools-frontend",
-+  "custom-launcher-page",
-+  "custom_summary",
-+  "d3d11",
-+  "d3d9",
-+  "daemon",
-+  "dark_muted",
-+  "dark_vibrant",
-+  "data-path",
-+  "data-reduction-proxy-config-url",
-+  "data-reduction-proxy-enable-quic-on-non-core-proxies",
-+  "data-reduction-proxy-experiment",
-+  "data-reduction-proxy-http-proxies",
-+  "data-reduction-proxy-lo-fi",
-+  "data-reduction-proxy-pingback-url",
-+  "data-reduction-proxy-secure-proxy-check-url",
-+  "data-reduction-proxy-server-experiments-disabled",
-+  "data-reduction-proxy-warmup-url",
-+  "dbus-stub",
-+  "debug-devtools",
-+  "debug-enable-frame-toggle",
-+  "debug-packed-apps",
-+  "debug-print",
-+  "default",
-+  "default-tile-height",
-+  "default-tile-width",
-+  "default-wallpaper-is-oem",
-+  "default-wallpaper-large",
-+  "default-wallpaper-small",
-+  "demo",
-+  "derelict-detection-timeout",
-+  "derelict-idle-timeout",
-+  "desktop",
-+  "desktop-window-1080p",
-+  "deterministic-fetch",
-+  "device-management-url",
-+  "device-scale-factor",
-+  "devtools-flags",
-+  "diagnostics",
-+  "diagnostics-format",
-+  "diagnostics-recovery",
-+  "disable",
-+  "disable-2d-canvas-clip-aa",
-+  "disable-2d-canvas-image-chromium",
-+  "disable-3d-apis",
-+  "disable-accelerated-2d-canvas",
-+  "disable-accelerated-jpeg-decoding",
-+  "disable-accelerated-mjpeg-decode",
-+  "disable-accelerated-video-decode",
-+  "disable-account-consistency",
-+  "disable-add-to-shelf",
-+  "disable-app-info-dialog-mac",
-+  "disable-app-list-dismiss-on-blur",
-+  "disable-app-window-cycling",
-+  "disable-appcontainer",
-+  "disable-arc-data-wipe",
-+  "disable-arc-opt-in-verification",
-+  "disable-audio-support-for-desktop-share",
-+  "disable-autofill-keyboard-accessory-view",
-+  "disable-avfoundation-overlays",
-+  "disable-background-networking",
-+  "disable-background-timer-throttling",
-+  "disable-backgrounding-occluded-windows",
-+  "disable-backing-store-limit",
-+  "disable-blink-features",
-+  "disable-boot-animation",
-+  "disable-breakpad",
-+  "disable-browser-task-scheduler",
-+  "disable-bundled-ppapi-flash",
-+  "disable-canvas-aa",
-+  "disable-captive-portal-bypass-proxy",
-+  "disable-cast-streaming-hw-encoding",
-+  "disable-clear-browsing-data-counters",
-+  "disable-client-side-phishing-detection",
-+  "disable-cloud-import",
-+  "disable-component-cloud-policy",
-+  "disable-component-extensions-with-background-pages",
-+  "disable-component-update",
-+  "disable-composited-antialiasing",
-+  "disable-contextual-search",
-+  "disable-d3d11",
-+  "disable-databases",
-+  "disable-datasaver-prompt",
-+  "disable-default-apps",
-+  "disable-demo-mode",
-+  "disable-device-disabling",
-+  "disable-device-discovery-notifications",
-+  "disable-dinosaur-easter-egg",
-+  "disable-direct-composition",
-+  "disable-directwrite-for-ui",
-+  "disable-display-color-calibration",
-+  "disable-display-list-2d-canvas",
-+  "disable-distance-field-text",
-+  "disable-domain-blocking-for-3d-apis",
-+  "disable-domain-reliability",
-+  "disable-download-image-renaming",
-+  "disable-drive-search-in-app-launcher",
-+  "disable-dwm-composition",
-+  "disable-eol-notification",
-+  "disable-es3-apis",
-+  "disable-es3-gl-context",
-+  "disable-extensions",
-+  "disable-extensions-except",
-+  "disable-extensions-file-access-check",
-+  "disable-extensions-http-throttling",
-+  "disable-fast-web-scroll-view-insets",
-+  "disable-features",
-+  "disable-field-trial-config",
-+  "disable-file-system",
-+  "disable-flash-3d",
-+  "disable-flash-stage3d",
-+  "disable-fullscreen-low-power-mode",
-+  "disable-fullscreen-tab-detaching",
-+  "disable-gaia-services",
-+  "disable-gesture-editing",
-+  "disable-gesture-requirement-for-media-playback",
-+  "disable-gesture-requirement-for-presentation",
-+  "disable-gesture-typing",
-+  "disable-gl-drawing-for-tests",
-+  "disable-gl-error-limit",
-+  "disable-gl-extensions",
-+  "disable-glsl-translator",
-+  "disable-gpu",
-+  "disable-gpu-async-worker-context",
-+  "disable-gpu-compositing",
-+  "disable-gpu-driver-bug-workarounds",
-+  "disable-gpu-early-init",
-+  "disable-gpu-memory-buffer-compositor-resources",
-+  "disable-gpu-memory-buffer-video-frames",
-+  "disable-gpu-process-crash-limit",
-+  "disable-gpu-program-cache",
-+  "disable-gpu-rasterization",
-+  "disable-gpu-sandbox",
-+  "disable-gpu-shader-disk-cache",
-+  "disable-gpu-vsync",
-+  "disable-gpu-watchdog",
-+  "disable-hang-monitor",
-+  "disable-hid-detection-on-oobe",
-+  "disable-hide-inactive-stacked-tab-close-buttons",
-+  "disable-histogram-customizer",
-+  "disable-hosted-app-shim-creation",
-+  "disable-hosted-apps-in-windows",
-+  "disable-http2",
-+  "disable-in-process-stack-traces",
-+  "disable-infobars",
-+  "disable-input-ime-api",
-+  "disable-input-view",
-+  "disable-ios-password-generation",
-+  "disable-ios-password-suggestions",
-+  "disable-ios-physical-web",
-+  "disable-javascript-harmony-shipping",
-+  "disable-kill-after-bad-ipc",
-+  "disable-lcd-text",
-+  "disable-legacy-window",
-+  "disable-local-storage",
-+  "disable-logging",
-+  "disable-login-animations",
-+  "disable-low-end-device-mode",
-+  "disable-low-latency-dxva",
-+  "disable-low-res-tiling",
-+  "disable-lru-snapshot-cache",
-+  "disable-mac-overlays",
-+  "disable-mac-views-native-app-windows",
-+  "disable-main-frame-before-activation",
-+  "disable-md-oobe",
-+  "disable-media-session-api",
-+  "disable-media-suspend",
-+  "disable-merge-key-char-events",
-+  "disable-minimize-on-second-launcher-item-click",
-+  "disable-mojo-renderer",
-+  "disable-mtp-write-support",
-+  "disable-multi-display-layout",
-+  "disable-namespace-sandbox",
-+  "disable-native-gpu-memory-buffers",
-+  "disable-network-portal-notification",
-+  "disable-new-bookmark-apps",
-+  "disable-new-channel-switcher-ui",
-+  "disable-new-kiosk-ui",
-+  "disable-new-korean-ime",
-+  "disable-new-profile-management",
-+  "disable-new-zip-unpacker",
-+  "disable-notifications",
-+  "disable-ntp-popular-sites",
-+  "disable-nv12-dxgi-video",
-+  "disable-offer-store-unmasked-wallet-cards",
-+  "disable-offer-upload-credit-cards",
-+  "disable-office-editing-component-extension",
-+  "disable-offline-auto-reload",
-+  "disable-offline-auto-reload-visible-only",
-+  "disable-overlay-scrollbar",
-+  "disable-overscroll-edge-effect",
-+  "disable-panel-fitting",
-+  "disable-partial-raster",
-+  "disable-password-generation",
-+  "disable-payment-request",
-+  "disable-pepper-3d",
-+  "disable-pepper-3d-image-chromium",
-+  "disable-per-monitor-dpi",
-+  "disable-permission-action-reporting",
-+  "disable-permissions-api",
-+  "disable-physical-keyboard-autocorrect",
-+  "disable-pinch",
-+  "disable-pnacl-crash-throttling",
-+  "disable-popup-blocking",
-+  "disable-prefer-compositing-to-lcd-text",
-+  "disable-presentation-api",
-+  "disable-print-preview",
-+  "disable-prompt-on-repost",
-+  "disable-pull-to-refresh-effect",
-+  "disable-push-api-background-mode",
-+  "disable-quic",
-+  "disable-reading-from-canvas",
-+  "disable-remote-core-animation",
-+  "disable-remote-fonts",
-+  "disable-remote-playback-api",
-+  "disable-renderer-accessibility",
-+  "disable-renderer-backgrounding",
-+  "disable-renderer-priority-management",
-+  "disable-resize-lock",
-+  "disable-rgba-4444-textures",
-+  "disable-rollback-option",
-+  "disable-rtc-smoothness-algorithm",
-+  "disable-screen-orientation-lock",
-+  "disable-search-geolocation-disclosure",
-+  "disable-seccomp-filter-sandbox",
-+  "disable-settings-window",
-+  "disable-setuid-sandbox",
-+  "disable-shader-name-hashing",
-+  "disable-shared-workers",
-+  "disable-signin-scoped-device-id",
-+  "disable-single-click-autofill",
-+  "disable-slimming-paint-invalidation",
-+  "disable-smart-virtual-keyboard",
-+  "disable-smooth-scrolling",
-+  "disable-software-rasterizer",
-+  "disable-speech-api",
-+  "disable-suggestions-ui",
-+  "disable-sync",
-+  "disable-sync-app-list",
-+  "disable-sync-types",
-+  "disable-system-timezone-automatic-detection",
-+  "disable-tab-for-desktop-share",
-+  "disable-tab-strip-autoscroll-new-tabs",
-+  "disable-threaded-animation",
-+  "disable-threaded-compositing",
-+  "disable-threaded-scrolling",
-+  "disable-touch-adjustment",
-+  "disable-touch-drag-drop",
-+  "disable-translate",
-+  "disable-translate-new-ux",
-+  "disable-usb-keyboard-detect",
-+  "disable-v8-idle-tasks",
-+  "disable-vaapi-accelerated-video-encode",
-+  "disable-views-rect-based-targeting",
-+  "disable-virtual-keyboard-overscroll",
-+  "disable-voice-input",
-+  "disable-volume-adjust-sound",
-+  "disable-wake-on-wifi",
-+  "disable-web-notification-custom-layouts",
-+  "disable-web-security",
-+  "disable-webgl",
-+  "disable-webgl-image-chromium",
-+  "disable-webrtc-encryption",
-+  "disable-webrtc-hw-decoding",
-+  "disable-webrtc-hw-encoding",
-+  "disable-webrtc-hw-vp8-encoding",
-+  "disable-win32k-lockdown",
-+  "disable-xss-auditor",
-+  "disable-zero-browsers-open-for-tests",
-+  "disable-zero-copy",
-+  "disable-zero-copy-dxgi-video",
-+  "disabled",
-+  "disk-cache-dir",
-+  "disk-cache-size",
-+  "display",
-+  "dmg-device",
-+  "dns-log-details",
-+  "dom-automation",
-+  "dotfile",
-+  "duck-flash",
-+  "dump-browser-histograms",
-+  "dump-dom",
-+  "eafe-path",
-+  "eafe-url",
-+  "early-tracing",
-+  "easy-unlock-app-path",
-+  "edge-touch-filtering",
-+  "egl",
-+  "elevate",
-+  "embedded-extension-options",
-+  "emphasize-titles-in-omnibox-dropdown",
-+  "emulate-shader-precision",
-+  "enable-accelerated-2d-canvas",
-+  "enable-accelerated-vpx-decode",
-+  "enable-accessibility-tab-switcher",
-+  "enable-account-consistency",
-+  "enable-ad",
-+  "enable-adaptive-selection-handle-orientation",
-+  "enable-add-to-shelf",
-+  "enable-aggressive-domstorage-flushing",
-+  "enable-android-wallpapers-app",
-+  "enable-app-info-dialog-mac",
-+  "enable-app-list",
-+  "enable-app-window-cycling",
-+  "enable-appcontainer",
-+  "enable-arc",
-+  "enable-arc-oobe-optin",
-+  "enable-audio-debug-recordings-from-extension",
-+  "enable-autofill-keyboard-accessory-view",
-+  "enable-automation",
-+  "enable-benchmarking",
-+  "enable-ble-advertising-in-apps",
-+  "enable-blink-features",
-+  "enable-bookmark-undo",
-+  "enable-browser-side-navigation",
-+  "enable-browser-task-scheduler",
-+  "enable-canvas-2d-dynamic-rendering-mode-switching",
-+  "enable-checker-imaging",
-+  "enable-chromevox-arc-support",
-+  "enable-clear-browsing-data-counters",
-+  "enable-cloud-print-proxy",
-+  "enable-cloud-print-xps",
-+  "enable-color-correct-rendering",
-+  "enable-color-correct-rendering-default-mode",
-+  "enable-consumer-kiosk",
-+  "enable-content-intent-detection",
-+  "enable-contextual-search",
-+  "enable-crash-reporter",
-+  "enable-crash-reporter-for-testing",
-+  "enable-crx-hash-check",
-+  "enable-data-reduction-proxy-bypass-warning",
-+  "enable-data-reduction-proxy-carrier-test",
-+  "enable-data-reduction-proxy-force-pingback",
-+  "enable-data-reduction-proxy-lite-page",
-+  "enable-data-reduction-proxy-savings-promo",
-+  "enable-datasaver-prompt",
-+  "enable-default-media-session",
-+  "enable-device-discovery-notifications",
-+  "enable-devtools-experiments",
-+  "enable-display-list-2d-canvas",
-+  "enable-distance-field-text",
-+  "enable-distillability-service",
-+  "enable-dom-distiller",
-+  "enable-domain-reliability",
-+  "enable-download-image-renaming",
-+  "enable-drive-search-in-app-launcher",
-+  "enable-drm-atomic",
-+  "enable-embedded-extension-options",
-+  "enable-es3-apis",
-+  "enable-exclusive-audio",
-+  "enable-experimental-accessibility-features",
-+  "enable-experimental-canvas-features",
-+  "enable-experimental-extension-apis",
-+  "enable-experimental-input-view-features",
-+  "enable-experimental-web-platform-features",
-+  "enable-extension-activity-log-testing",
-+  "enable-extension-activity-logging",
-+  "enable-extension-assets-sharing",
-+  "enable-fast-unload",
-+  "enable-fast-web-scroll-view-insets",
-+  "enable-features",
-+  "enable-first-run-ui-transitions",
-+  "enable-floating-virtual-keyboard",
-+  "enable-font-antialiasing",
-+  "enable-fullscreen-tab-detaching",
-+  "enable-fullscreen-toolbar-reveal",
-+  "enable-google-branded-context-menu",
-+  "enable-gpu-async-worker-context",
-+  "enable-gpu-benchmarking",
-+  "enable-gpu-client-logging",
-+  "enable-gpu-client-tracing",
-+  "enable-gpu-command-logging",
-+  "enable-gpu-debugging",
-+  "enable-gpu-driver-debug-logging",
-+  "enable-gpu-memory-buffer-compositor-resources",
-+  "enable-gpu-memory-buffer-video-frames",
-+  "enable-gpu-rasterization",
-+  "enable-gpu-service-logging",
-+  "enable-gpu-service-tracing",
-+  "enable-grouped-history",
-+  "enable-hardware-overlays",
-+  "enable-harfbuzz-rendertext",
-+  "enable-hdr-output",
-+  "enable-heap-profiling",
-+  "enable-hosted-app-quit-notification",
-+  "enable-hosted-apps-in-windows",
-+  "enable-hosted-mode",
-+  "enable-hotword-hardware",
-+  "enable-hung-renderer-infobar",
-+  "enable-inband-text-tracks",
-+  "enable-input-ime-api",
-+  "enable-ios-handoff-to-other-devices",
-+  "enable-ios-password-generation",
-+  "enable-ios-physical-web",
-+  "enable-kiosk-mode",
-+  "enable-layer-lists",
-+  "enable-lcd-text",
-+  "enable-leak-detection",
-+  "enable-local-file-accesses",
-+  "enable-local-sync-backend",
-+  "enable-logging",
-+  "enable-longpress-drag-selection",
-+  "enable-low-end-device-mode",
-+  "enable-low-res-tiling",
-+  "enable-lru-snapshot-cache",
-+  "enable-mac-views-native-app-windows",
-+  "enable-main-frame-before-activation",
-+  "enable-md-feedback",
-+  "enable-md-policy-page",
-+  "enable-media-suspend",
-+  "enable-merge-key-char-events",
-+  "enable-message-center-always-scroll-up-upon-notification-removal",
-+  "enable-nacl",
-+  "enable-nacl-debug",
-+  "enable-nacl-nonsfi-mode",
-+  "enable-native-cups",
-+  "enable-native-gpu-memory-buffers",
-+  "enable-natural-scroll-default",
-+  "enable-navigation-tracing",
-+  "enable-net-benchmarking",
-+  "enable-network-information",
-+  "enable-network-portal-notification",
-+  "enable-new-bookmark-apps",
-+  "enable-ntp-popular-sites",
-+  "enable-ntp-search-engine-country-detection",
-+  "enable-offer-store-unmasked-wallet-cards",
-+  "enable-offer-upload-credit-cards",
-+  "enable-offline-auto-reload",
-+  "enable-offline-auto-reload-visible-only",
-+  "enable-osk-overscroll",
-+  "enable-overlay-scrollbar",
-+  "enable-override-bookmarks-ui",
-+  "enable-partial-raster",
-+  "enable-password-generation",
-+  "enable-payment-request",
-+  "enable-pepper-testing",
-+  "enable-per-monitor-dpi",
-+  "enable-permission-action-reporting",
-+  "enable-physical-keyboard-autocorrect",
-+  "enable-pinch",
-+  "enable-pixel-output-in-tests",
-+  "enable-plugin-placeholder-testing",
-+  "enable-potentially-annoying-security-features",
-+  "enable-power-overlay",
-+  "enable-precache",
-+  "enable-precise-memory-info",
-+  "enable-prefer-compositing-to-lcd-text",
-+  "enable-print-browser",
-+  "enable-print-preview-register-promos",
-+  "enable-profile-shortcut-manager",
-+  "enable-profiling",
-+  "enable-proximity-auth-bluetooth-low-energy-discovery",
-+  "enable-proximity-auth-proximity-detection",
-+  "enable-push-api-background-mode",
-+  "enable-quic",
-+  "enable-reader-mode-toolbar-icon",
-+  "enable-refresh-token-annotation-request",
-+  "enable-request-tablet-site",
-+  "enable-rgba-4444-textures",
-+  "enable-sandbox",
-+  "enable-sandbox-logging",
-+  "enable-screenshot-testing-with-mode",
-+  "enable-scripts-require-action",
-+  "enable-scroll-prediction",
-+  "enable-service-manager-tracing",
-+  "enable-settings-window",
-+  "enable-sgi-video-sync",
-+  "enable-single-click-autofill",
-+  "enable-site-engagement-eviction-policy",
-+  "enable-site-settings",
-+  "enable-skia-benchmarking",
-+  "enable-slimming-paint-invalidation",
-+  "enable-slimming-paint-v2",
-+  "enable-smooth-scrolling",
-+  "enable-spatial-navigation",
-+  "enable-spdy-proxy-auth",
-+  "enable-speech-dispatcher",
-+  "enable-spelling-feedback-field-trial",
-+  "enable-spotlight-actions",
-+  "enable-stats-collection-bindings",
-+  "enable-stats-table",
-+  "enable-strict-mixed-content-checking",
-+  "enable-strict-powerful-feature-restrictions",
-+  "enable-suggestions-ui",
-+  "enable-suggestions-with-substring-match",
-+  "enable-supervised-user-managed-bookmarks-folder",
-+  "enable-swap-buffers-with-bounds",
-+  "enable-sync-app-list",
-+  "enable-sync-articles",
-+  "enable-tab-audio-muting",
-+  "enable-tcp-fastopen",
-+  "enable-tether",
-+  "enable-threaded-compositing",
-+  "enable-threaded-texture-mailboxes",
-+  "enable-thumbnail-retargeting",
-+  "enable-tile-compression",
-+  "enable-touch-calibration-setting",
-+  "enable-touch-drag-drop",
-+  "enable-touch-support-for-screen-magnifier",
-+  "enable-touchpad-three-finger-click",
-+  "enable-touchview",
-+  "enable-trace-app-source",
-+  "enable-tracing",
-+  "enable-tracing-output",
-+  "enable-translate-new-ux",
-+  "enable-true-color-rendering",
-+  "enable-ui-devtools",
-+  "enable-use-zoom-for-dsf",
-+  "enable-user-controlled-alternate-protocol-ports",
-+  "enable-user-metrics",
-+  "enable-usermedia-screen-capturing",
-+  "enable-video-player-chromecast-support",
-+  "enable-viewport",
-+  "enable-virtual-keyboard",
-+  "enable-vp9-in-mp4",
-+  "enable-vtune-support",
-+  "enable-vulkan",
-+  "enable-wayland-server",
-+  "enable-web-notification-custom-layouts",
-+  "enable-webfonts-intervention-trigger",
-+  "enable-webfonts-intervention-v2",
-+  "enable-webgl-draft-extensions",
-+  "enable-webgl-image-chromium",
-+  "enable-webrtc-event-logging-from-extension",
-+  "enable-webrtc-stun-origin",
-+  "enable-webvr",
-+  "enable-wifi-credential-sync",
-+  "enable-win7-webrtc-hw-h264-decoding",
-+  "enable-zero-copy",
-+  "enabled",
-+  "enabled-2g",
-+  "enabled-3g",
-+  "enabled-slow2g",
-+  "encode-binary",
-+  "enforce",
-+  "enforce-gl-minimums",
-+  "enforce-webrtc-ip-permission-check",
-+  "enforce_strict",
-+  "enterprise-disable-arc",
-+  "enterprise-enable-forced-re-enrollment",
-+  "enterprise-enable-zero-touch-enrollment",
-+  "enterprise-enrollment-initial-modulus",
-+  "enterprise-enrollment-modulus-limit",
-+  "error-console",
-+  "explicitly-allowed-ports",
-+  "expose-internals-for-testing",
-+  "extension-content-verification",
-+  "extension-process",
-+  "extensions-install-verification",
-+  "extensions-multi-account",
-+  "extensions-not-webstore",
-+  "extensions-on-chrome-urls",
-+  "extensions-update-frequency",
-+  "extra-search-query-params",
-+  "fail-on-unused-args",
-+  "fake-variations-channel",
-+  "false",
-+  "fast",
-+  "fast-start",
-+  "feedback-server",
-+  "field-trial-handle",
-+  "first-exec-after-boot",
-+  "flag-switches-begin",
-+  "flag-switches-end",
-+  "font-cache-shared-handle",
-+  "force-android-app-mode",
-+  "force-app-mode",
-+  "force-desktop-ios-promotion",
-+  "force-dev-mode-highlighting",
-+  "force-device-scale-factor",
-+  "force-display-list-2d-canvas",
-+  "force-fieldtrial-params",
-+  "force-fieldtrials",
-+  "force-first-run",
-+  "force-first-run-ui",
-+  "force-gpu-mem-available-mb",
-+  "force-gpu-rasterization",
-+  "force-happiness-tracking-system",
-+  "force-load-easy-unlock-app-in-tests",
-+  "force-local-ntp",
-+  "force-login-manager-in-tests",
-+  "force-mediafoundation",
-+  "force-overlay-fullscreen-video",
-+  "force-pnacl-subzero",
-+  "force-renderer-accessibility",
-+  "force-show-update-menu-badge",
-+  "force-show-update-menu-item",
-+  "force-system-compositor-mode",
-+  "force-ui-direction",
-+  "force-variation-ids",
-+  "force-video-overlays",
-+  "force-wave-audio",
-+  "force-webrtc-ip-handling-policy",
-+  "full-memory-crash-report",
-+  "gaia-url",
-+  "gcm-checkin-url",
-+  "gcm-mcs-endpoint",
-+  "gcm-registration-url",
-+  "generate-accessibility-test-expectations",
-+  "gl",
-+  "gl-composited-texture-quad-border",
-+  "gl-shader-interm-output",
-+  "gles",
-+  "golden-screenshots-dir",
-+  "google-apis-url",
-+  "google-base-url",
-+  "google-doodle-url",
-+  "google-profile-info",
-+  "google-url",
-+  "gpu-active-device-id",
-+  "gpu-active-vendor-id",
-+  "gpu-device-id",
-+  "gpu-driver-bug-workarounds",
-+  "gpu-driver-date",
-+  "gpu-driver-vendor",
-+  "gpu-driver-version",
-+  "gpu-launcher",
-+  "gpu-no-complete-info-collection",
-+  "gpu-no-context-lost",
-+  "gpu-process",
-+  "gpu-program-cache-size-kb",
-+  "gpu-rasterization-msaa-sample-count",
-+  "gpu-sandbox-allow-sysv-shm",
-+  "gpu-sandbox-failures-fatal",
-+  "gpu-sandbox-start-early",
-+  "gpu-secondary-device-ids",
-+  "gpu-secondary-vendor-ids",
-+  "gpu-startup-dialog",
-+  "gpu-testing-device-id",
-+  "gpu-testing-driver-date",
-+  "gpu-testing-gl-renderer",
-+  "gpu-testing-gl-vendor",
-+  "gpu-testing-gl-version",
-+  "gpu-testing-os-version",
-+  "gpu-testing-secondary-device-ids",
-+  "gpu-testing-secondary-vendor-ids",
-+  "gpu-testing-vendor-id",
-+  "gpu-vendor-id",
-+  "guest-wallpaper-large",
-+  "guest-wallpaper-small",
-+  "h",
-+  "has-chromeos-diamond-key",
-+  "headless",
-+  "help",
-+  "hide",
-+  "hide-icons",
-+  "hide-scrollbars",
-+  "history-entry-requires-user-gesture",
-+  "homedir",
-+  "homepage",
-+  "host",
-+  "host-pairing-oobe",
-+  "host-resolver-retry-attempts",
-+  "host-resolver-rules",
-+  "host-rules",
-+  "icu-data-dir",
-+  "ignore-autocomplete-off-autofill",
-+  "ignore-certificate-errors",
-+  "ignore-gpu-blacklist",
-+  "ignore-missing-cdm-host-file",
-+  "ignore-urlfetcher-cert-requests",
-+  "ignore-user-profile-mapping-for-tests",
-+  "in-process-gpu",
-+  "incognito",
-+  "inert-visual-viewport",
-+  "input",
-+  "inspect",
-+  "inspect-brk",
-+  "install-chrome-app",
-+  "install-supervised-user-whitelists",
-+  "instant-process",
-+  "interests-url",
-+  "invalidation-use-gcm-channel",
-+  "ipc-connection-timeout",
-+  "ipc-dump-directory",
-+  "ipc-fuzzer-testcase",
-+  "is-running-in-mash",
-+  "isolate-extensions",
-+  "isolate-sites-for-testing",
-+  "javascript-harmony",
-+  "js-flags",
-+  "keep-alive-for-test",
-+  "kiosk",
-+  "kiosk-printing",
-+  "lang",
-+  "last-launched-app",
-+  "light_muted",
-+  "light_vibrant",
-+  "load-and-launch-app",
-+  "load-apps",
-+  "load-extension",
-+  "load-media-router-component-extension",
-+  "local-heuristics-only-for-password-generation",
-+  "local-ntp-reload",
-+  "local-sync-backend-dir",
-+  "log-gpu-control-list-decisions",
-+  "log-level",
-+  "log-net-log",
-+  "login-manager",
-+  "login-profile",
-+  "login-user",
-+  "lso-url",
-+  "ltr",
-+  "main-frame-resizes-are-orientation-changes",
-+  "make-chrome-default",
-+  "make-default-browser",
-+  "managed-user-id",
-+  "managed-user-sync-token",
-+  "mark-non-secure-as",
-+  "markdown",
-+  "market-url-for-testing",
-+  "mash",
-+  "material",
-+  "material-design-ink-drop-animation-speed",
-+  "material-hybrid",
-+  "max-gum-fps",
-+  "max-untiled-layer-height",
-+  "max-untiled-layer-width",
-+  "media-cache-size",
-+  "mem-pressure-system-reserved-kb",
-+  "memory-metrics",
-+  "memory-pressure-off",
-+  "memory-pressure-thresholds",
-+  "memory-pressure-thresholds-mb",
-+  "message-center-changes-while-open",
-+  "metrics-client-id",
-+  "metrics-recording-only",
-+  "mhtml-generator-option",
-+  "mock",
-+  "mojo-channel-token",
-+  "mojo-local-storage",
-+  "mojo-pipe-token",
-+  "monitoring-destination-id",
-+  "mse-audio-buffer-size-limit",
-+  "mse-video-buffer-size-limit",
-+  "mute-audio",
-+  "nacl-broker",
-+  "nacl-dangerous-no-sandbox-nonsfi",
-+  "nacl-debug-mask",
-+  "nacl-gdb",
-+  "nacl-gdb-script",
-+  "nacl-loader",
-+  "nacl-loader-nonsfi",
-+  "native",
-+  "native-crx-bindings",
-+  "net-log-capture-mode",
-+  "netifs-to-ignore",
-+  "network-country-iso",
-+  "new-profile-management",
-+  "new-window",
-+  "no-default-browser-check",
-+  "no-experiments",
-+  "no-first-run",
-+  "no-managed-user-acknowledgment-check",
-+  "no-network-profile-warning",
-+  "no-pings",
-+  "no-proxy-server",
-+  "no-referrers",
-+  "no-sandbox",
-+  "no-service-autorun",
-+  "no-startup-window",
-+  "no-use-mus-in-renderer",
-+  "no-wifi",
-+  "no-zygote",
-+  "nocolor",
-+  "noerrdialogs",
-+  "non-material",
-+  "non-secure",
-+  "none",
-+  "normal_muted",
-+  "normal_vibrant",
-+  "note-taking-app-ids",
-+  "ntp-snippets-add-incomplete",
-+  "ntp-switch-to-existing-tab",
-+  "null",
-+  "num-pac-threads",
-+  "num-raster-threads",
-+  "oauth2-client-id",
-+  "oauth2-client-secret",
-+  "off",
-+  "on",
-+  "oobe-bootstrapping-master",
-+  "oobe-guest-session",
-+  "oobe-skip-postlogin",
-+  "oobe-timer-interval",
-+  "open-ash",
-+  "opengraph",
-+  "origin-to-force-quic-on",
-+  "origin-trial-disabled-features",
-+  "origin-trial-disabled-tokens",
-+  "origin-trial-public-key",
-+  "original-process-start-time",
-+  "osmesa",
-+  "output",
-+  "override",
-+  "override-metrics-upload-url",
-+  "override-plugin-power-saver-for-testing",
-+  "override-use-software-gl-for-tests",
-+  "overscroll-history-navigation",
-+  "ozone-dump-file",
-+  "ozone-platform",
-+  "pack-extension",
-+  "pack-extension-key",
-+  "parent-profile",
-+  "parent-window",
-+  "passive-listeners-default",
-+  "password-store",
-+  "permission-request-api-scope",
-+  "permission-request-api-url",
-+  "power-stub",
-+  "ppapi",
-+  "ppapi-antialiased-text-enabled",
-+  "ppapi-broker",
-+  "ppapi-flash-args",
-+  "ppapi-flash-path",
-+  "ppapi-flash-version",
-+  "ppapi-in-process",
-+  "ppapi-plugin-launcher",
-+  "ppapi-startup-dialog",
-+  "ppapi-subpixel-rendering-setting",
-+  "precache-config-settings-url",
-+  "precache-manifest-url-prefix",
-+  "prerender-from-omnibox",
-+  "previous-app",
-+  "primary",
-+  "primordial-pipe-token",
-+  "privet-ipv6-only",
-+  "process-per-site",
-+  "process-per-tab",
-+  "process-service-name",
-+  "product-version",
-+  "profile-directory",
-+  "profiler-timing",
-+  "profiling-at-start",
-+  "profiling-file",
-+  "profiling-flush",
-+  "progress-bar-animation",
-+  "progress-bar-completion",
-+  "prompt-for-external-extensions",
-+  "proxy-auto-detect",
-+  "proxy-bypass-list",
-+  "proxy-pac-url",
-+  "proxy-server",
-+  "q",
-+  "quic-connection-options",
-+  "quic-host-whitelist",
-+  "quic-max-packet-length",
-+  "quic-version",
-+  "rdp_desktop_session",
-+  "reader-mode-feedback",
-+  "reader-mode-heuristics",
-+  "rebaseline-pixel-tests",
-+  "reduce-security-for-testing",
-+  "reduced-referrer-granularity",
-+  "register-font-files",
-+  "register-pepper-plugins",
-+  "relauncher",
-+  "remote-debugging-address",
-+  "remote-debugging-port",
-+  "remote-debugging-socket-name",
-+  "remote-debugging-targets",
-+  "renderer",
-+  "renderer-client-id",
-+  "renderer-cmd-prefix",
-+  "renderer-process-limit",
-+  "renderer-startup-dialog",
-+  "renderer-wait-for-java-debugger",
-+  "repl",
-+  "report-vp9-as-an-unsupported-mime-type",
-+  "require-audio-hardware-for-testing",
-+  "reset-app-list-install-state",
-+  "reset-variation-state",
-+  "restore-last-session",
-+  "root",
-+  "root-layer-scrolls",
-+  "rtl",
-+  "run-layout-test",
-+  "runtime-deps-list-file",
-+  "safebrowsing-disable-auto-update",
-+  "safebrowsing-disable-download-protection",
-+  "safebrowsing-disable-extension-blacklist",
-+  "safebrowsing-manual-download-blacklist",
-+  "sandbox-ipc",
-+  "save-page-as-mhtml",
-+  "saveas-menu-label",
-+  "screen-config",
-+  "screenshot",
-+  "script-executable",
-+  "scripts-require-action",
-+  "scroll-end-effect",
-+  "secondary",
-+  "secondary-display-layout",
-+  "secondary-ui-md",
-+  "service",
-+  "service-overrides",
-+  "service-request-channel-token",
-+  "shared-files",
-+  "shill-stub",
-+  "show-app-list",
-+  "show-autofill-signatures",
-+  "show-autofill-type-predictions",
-+  "show-component-extension-options",
-+  "show-composited-layer-borders",
-+  "show-fps-counter",
-+  "show-icons",
-+  "show-layer-animation-bounds",
-+  "show-mac-overlay-borders",
-+  "show-overdraw-feedback",
-+  "show-paint-rects",
-+  "show-property-changed-rects",
-+  "show-saved-copy",
-+  "show-screenspace-rects",
-+  "show-surface-damage-rects",
-+  "show_summary",
-+  "silent-debugger-extension-api",
-+  "silent-launch",
-+  "simulate-critical-update",
-+  "simulate-elevated-recovery",
-+  "simulate-outdated",
-+  "simulate-outdated-no-au",
-+  "simulate-upgrade",
-+  "single-process",
-+  "site-per-process",
-+  "skip-gpu-data-loading",
-+  "skip-nostore-all",
-+  "skip-nostore-main",
-+  "skip-reencoding-on-skp-capture",
-+  "slow",
-+  "slow-connections-only",
-+  "slow-down-raster-scale-factor",
-+  "sms-test-messages",
-+  "spdy-proxy-auth-fallback",
-+  "spdy-proxy-auth-origin",
-+  "spdy-proxy-auth-value",
-+  "spelling-service-feedback-interval-seconds",
-+  "spelling-service-feedback-url",
-+  "ssl-key-log-file",
-+  "ssl-version-max",
-+  "ssl-version-min",
-+  "stable-release-mode",
-+  "start-fullscreen",
-+  "start-maximized",
-+  "start-stack-profiler",
-+  "started",
-+  "stub",
-+  "stub-cros-settings",
-+  "supports-dual-gpus",
-+  "swiftshader",
-+  "swiftshader-path",
-+  "swiftshader-webgl",
-+  "sync-allow-insecure-xmpp-connection",
-+  "sync-deferred-startup-timeout-seconds",
-+  "sync-disable-deferred-startup",
-+  "sync-enable-get-update-avoidance",
-+  "sync-notification-host-port",
-+  "sync-on-draw-hardware",
-+  "sync-short-initial-retry-override",
-+  "sync-short-nudge-delay-for-test",
-+  "sync-url",
-+  "system-developer-mode",
-+  "system-log-upload-frequency",
-+  "tab-management-experiment-type-disabled",
-+  "tab-management-experiment-type-elderberry",
-+  "task-profiler",
-+  "team-drives",
-+  "test-auto-update-ui",
-+  "test-child-process",
-+  "test-cros-gaia-id-migration",
-+  "test-do-not-initialize-icu",
-+  "test-gl-lib",
-+  "test-launcher-batch-limit",
-+  "test-launcher-bot-mode",
-+  "test-launcher-debug-launcher",
-+  "test-launcher-filter-file",
-+  "test-launcher-force-run-broken-tests",
-+  "test-launcher-jobs",
-+  "test-launcher-list-tests",
-+  "test-launcher-output",
-+  "test-launcher-print-test-stdio",
-+  "test-launcher-print-writable-path",
-+  "test-launcher-retry-limit",
-+  "test-launcher-shard-index",
-+  "test-launcher-summary-output",
-+  "test-launcher-timeout",
-+  "test-launcher-total-shards",
-+  "test-launcher-trace",
-+  "test-name",
-+  "test-tiny-timeout",
-+  "test-type",
-+  "testing-fixed-http-port",
-+  "testing-fixed-https-port",
-+  "threads",
-+  "time",
-+  "timeout",
-+  "tls1",
-+  "tls1.1",
-+  "tls1.2",
-+  "tls1.3",
-+  "top-chrome-md",
-+  "top-controls-hide-threshold",
-+  "top-controls-show-threshold",
-+  "top-document-isolation",
-+  "touch-calibration",
-+  "touch-devices",
-+  "touch-events",
-+  "touch-noise-filtering",
-+  "touch-selection-strategy",
-+  "trace-config-file",
-+  "trace-export-events-to-etw",
-+  "trace-shutdown",
-+  "trace-shutdown-file",
-+  "trace-startup",
-+  "trace-startup-duration",
-+  "trace-startup-file",
-+  "trace-to-console",
-+  "trace-to-file",
-+  "trace-to-file-name",
-+  "trace-upload-url",
-+  "tracelog",
-+  "translate-ranker-model-url",
-+  "translate-script-url",
-+  "translate-security-origin",
-+  "true",
-+  "try-chrome-again",
-+  "try-supported-channel-layouts",
-+  "type",
-+  "ui-disable-partial-swap",
-+  "ui-enable-layer-lists",
-+  "ui-enable-rgba-4444-textures",
-+  "ui-enable-zero-copy",
-+  "ui-prioritize-in-gpu-process",
-+  "ui-show-fps-counter",
-+  "ui-show-layer-animation-bounds",
-+  "ui-show-layer-borders",
-+  "ui-show-paint-rects",
-+  "ui-show-property-changed-rects",
-+  "ui-show-screenspace-rects",
-+  "ui-show-surface-damage-rects",
-+  "ui-slow-animations",
-+  "ui-test-action-max-timeout",
-+  "ui-test-action-timeout",
-+  "uninstall",
-+  "unlimited-storage",
-+  "unsafe-pac-url",
-+  "unsafely-treat-insecure-origin-as-secure",
-+  "use-angle",
-+  "use-cras",
-+  "use-fake-device-for-media-stream",
-+  "use-fake-ui-for-media-stream",
-+  "use-file-for-fake-audio-capture",
-+  "use-file-for-fake-video-capture",
-+  "use-first-display-as-internal",
-+  "use-gl",
-+  "use-gpu-in-tests",
-+  "use-mobile-user-agent",
-+  "use-mock-keychain",
-+  "use-new-virtual-keyboard-behavior",
-+  "use-passthrough-cmd-decoder",
-+  "use-simple-cache-backend",
-+  "use-test-config",
-+  "use_new_features_summary",
-+  "user-agent",
-+  "user-always-affiliated",
-+  "user-data-dir",
-+  "utility",
-+  "utility-allowed-dir",
-+  "utility-cmd-prefix",
-+  "utility-run-elevated",
-+  "v",
-+  "v8-cache-options",
-+  "v8-cache-strategies-for-cache-storage",
-+  "validate-crx",
-+  "validate-input-event-stream",
-+  "variations-server-url",
-+  "version",
-+  "video-image-texture-target",
-+  "video-threads",
-+  "video-underflow-threshold-ms",
-+  "viewer-launch-via-appid",
-+  "virtual-time-budget",
-+  "vmodule",
-+  "wait-for-debugger",
-+  "wait-for-debugger-children",
-+  "wake-on-wifi-packet",
-+  "wallet-service-use-sandbox",
-+  "watcher",
-+  "waveout-buffers",
-+  "webapk-server-url",
-+  "webrtc-stun-probe-trial",
-+  "webview-enable-safebrowsing-support",
-+  "webview-sandboxed-renderer",
-+  "whitelisted-extension-id",
-+  "win-jumplist-action",
-+  "window-position",
-+  "window-size",
-+  "window-workspace",
-+  "windows10-custom-titlebar",
-+  "windows8-search",
-+  "winhttp-proxy-resolver",
-+  "wm-window-animations-disabled",
-+  "zygote",
-+  "zygote-cmd-prefix"
-+};
-+
-+bool IsBlacklistedArg(const base::CommandLine::CharType* arg) {
-+#if defined(OS_WIN)
-+  const auto converted = base::WideToUTF8(arg);
-+  const char* a = converted.c_str();
-+#else
-+  const char* a = arg;
-+#endif
-+
-+  static const char* prefixes[] = {"--", "-", "/"};
-+
-+  int prefix_length = 0;
-+  for (auto& prefix : prefixes) {
-+    if (base::StartsWith(a, prefix, base::CompareCase::SENSITIVE)) {
-+      prefix_length = strlen(prefix);
-+      break;
-+    }
-+  }
-+
-+  if (prefix_length > 0) {
-+    a += prefix_length;
-+    std::string switch_name =
-+        base::ToLowerASCII(base::StringPiece(a, strcspn(a, "=")));
-+    for (auto& item : blacklist) {
-+      if (switch_name == item)
-+        return true;
-+    }
-+  }
-+
-+  return false;
-+}
-+
-+>>>>>>> .their
- }  // namespace
- 
- namespace atom {
- 
- bool CheckCommandLineArguments(int argc, base::CommandLine::CharType** argv) {
-   const base::CommandLine::StringType dashdash(2, '-');
-+<<<<<<< .our
-   bool block_args = false;
-   for (int i = 0; i < argc; ++i) {
-     if (argv[i] == dashdash)
-@@ -45,6 +1371,17 @@
-       return false;
-     } else if (IsUrlArg(argv[i])) {
-       block_args = true;
-+=======
-+  bool block_blacklisted_args = false;
-+  for (int i = 0; i < argc; ++i) {
-+    if (argv[i] == dashdash)
-+      break;
-+    if (block_blacklisted_args) {
-+      if (IsBlacklistedArg(argv[i]))
-+        return false;
-+    } else if (IsUrlArg(argv[i])) {
-+      block_blacklisted_args = true;
-+>>>>>>> .their
-     }
-   }
-   return true;
-added in both
-  our    100644 2c0acc1648ff3b4bc574f000643069f8ef8e94bb atom/app/command_line_args.h
-  their  100644 1f5fd756868898e7a304c754d89625059d36441f atom/app/command_line_args.h
-@@ -14,3 +14,7 @@
- }  // namespace atom
- 
- #endif  // ATOM_APP_COMMAND_LINE_ARGS_H_
-+<<<<<<< .our
-+=======
-+
-+>>>>>>> .their
-changed in both
-  base   100644 06d4dd8aaf5b1d64db4b8b6a1ed11f67ab5e9835 atom/browser/api/atom_api_app.cc
-  our    100644 089a2b63d1bae3afebea925582a3aac81ddeaa4f atom/browser/api/atom_api_app.cc
-  their  100644 620abed67081a04788d03f358f787ad0bb7502df atom/browser/api/atom_api_app.cc
-@@ -618,7 +618,10 @@
- }
- 
- void App::OnPreMainMessageLoopRun() {
-+<<<<<<< .our
-   content::BrowserChildProcessObserver::Add(this);
-+=======
-+>>>>>>> .their
-   if (process_singleton_) {
-     process_singleton_->OnBrowserReady();
-   }
-changed in both
-  base   100644 694a3e3047303a953f098610504c65ce7b4c9003 atom/browser/api/atom_api_app.h
-  our    100644 ee0ad42c05fe33be17146b79cbe3422953516621 atom/browser/api/atom_api_app.h
-  their  100644 15141391e067d1b44a45255a1b5cca265ea0b5a8 atom/browser/api/atom_api_app.h
-changed in both
-  base   100644 7496b8389aceee1db3a028b86d50a7bdc56d375b atom/browser/api/atom_api_notification.cc
-  our    100644 06d22455c7024a41799d5003a755588bb67437a9 atom/browser/api/atom_api_notification.cc
-  their  100644 ef5b9ce1296a3e6f535ae1f77614028ca4dfa6d9 atom/browser/api/atom_api_notification.cc
-@@ -72,7 +72,10 @@
-     opts.Get("hasReply", &has_reply_);
-     opts.Get("actions", &actions_);
-     opts.Get("sound", &sound_);
-+<<<<<<< .our
-     opts.Get("closeButtonText", &close_button_text_);
-+=======
-+>>>>>>> .their
-   }
- }
- 
-@@ -123,8 +126,13 @@
-   return actions_;
- }
- 
-+<<<<<<< .our
- base::string16 Notification::GetCloseButtonText() const {
-   return close_button_text_;
-+=======
-+base::string16 Notification::GetSound() const {
-+  return sound_;
-+>>>>>>> .their
- }
- 
- // Setters
-@@ -161,8 +169,13 @@
-   actions_ = actions;
- }
- 
-+<<<<<<< .our
- void Notification::SetCloseButtonText(const base::string16& text) {
-   close_button_text_ = text;
-+=======
-+void Notification::SetSound(const base::string16& new_sound) {
-+  sound_ = new_sound;
-+>>>>>>> .their
- }
- 
- void Notification::NotificationAction(int index) {
-@@ -211,7 +224,10 @@
-       options.reply_placeholder = reply_placeholder_;
-       options.actions = actions_;
-       options.sound = sound_;
-+<<<<<<< .our
-       options.close_button_text = close_button_text_;
-+=======
-+>>>>>>> .their
-       notification_->Show(options);
-     }
-   }
-@@ -241,8 +257,13 @@
-       .SetProperty("sound", &Notification::GetSound, &Notification::SetSound)
-       .SetProperty("actions", &Notification::GetActions,
-                    &Notification::SetActions)
-+<<<<<<< .our
-       .SetProperty("closeButtonText", &Notification::GetCloseButtonText,
-                    &Notification::SetCloseButtonText);
-+=======
-+      .SetProperty("sound", &Notification::GetSound,
-+                   &Notification::SetSound);
-+>>>>>>> .their
- }
- 
- }  // namespace api
-changed in both
-  base   100644 9c2dcd4b5107932ab668464d6199f7a3193100f0 atom/browser/api/atom_api_notification.h
-  our    100644 91a5b72c983c95b20315384091048e50ad08d27f atom/browser/api/atom_api_notification.h
-  their  100644 d4679e7c2c90df3b8e20cd95c8e3a96a412b2492 atom/browser/api/atom_api_notification.h
-@@ -56,7 +56,11 @@
-   base::string16 GetReplyPlaceholder() const;
-   base::string16 GetSound() const;
-   std::vector<brightray::NotificationAction> GetActions() const;
-+<<<<<<< .our
-   base::string16 GetCloseButtonText() const;
-+=======
-+  base::string16 GetSound() const;
-+>>>>>>> .their
- 
-   // Prop Setters
-   void SetTitle(const base::string16& new_title);
-@@ -67,7 +71,11 @@
-   void SetReplyPlaceholder(const base::string16& new_reply_placeholder);
-   void SetSound(const base::string16& sound);
-   void SetActions(const std::vector<brightray::NotificationAction>& actions);
-+<<<<<<< .our
-   void SetCloseButtonText(const base::string16& text);
-+=======
-+  void SetSound(const base::string16& sound);
-+>>>>>>> .their
- 
-  private:
-   base::string16 title_;
-@@ -81,7 +89,11 @@
-   base::string16 reply_placeholder_;
-   base::string16 sound_;
-   std::vector<brightray::NotificationAction> actions_;
-+<<<<<<< .our
-   base::string16 close_button_text_;
-+=======
-+  base::string16 sound_;
-+>>>>>>> .their
- 
-   brightray::NotificationPresenter* presenter_;
- 
-changed in both
-  base   100644 a23d2817b87df8c7bfb63465afbb8b0852bd8b2f atom/browser/api/atom_api_web_contents.cc
-  our    100644 20a1ac2e672f08ffea528b6e094ba530ff8083d1 atom/browser/api/atom_api_web_contents.cc
-  their  100644 95fb99a2351be4df43415302bca700042a4c9f16 atom/browser/api/atom_api_web_contents.cc
-@@ -397,8 +397,8 @@
-     options.Get("transparent", &transparent);
- 
-     content::WebContents::CreateParams params(session->browser_context());
--    auto* view = new OffScreenWebContentsView(
--        transparent, base::Bind(&WebContents::OnPaint, base::Unretained(this)));
-+    auto* view = new OffScreenWebContentsView(transparent,
-+        base::Bind(&WebContents::OnPaint, base::Unretained(this)));
-     params.view = view;
-     params.delegate_view = view;
- 
-@@ -1742,7 +1742,12 @@
-     return;
- 
- #if defined(ENABLE_OSR)
-+<<<<<<< .our
-   auto* osr_wcv = GetOffScreenWebContentsView();
-+=======
-+  const auto* wc_impl = static_cast<content::WebContentsImpl*>(web_contents());
-+  auto* osr_wcv = static_cast<OffScreenWebContentsView*>(wc_impl->GetView());
-+>>>>>>> .their
-   if (osr_wcv)
-     osr_wcv->SetPainting(true);
- #endif
-@@ -1753,7 +1758,12 @@
-     return;
- 
- #if defined(ENABLE_OSR)
-+<<<<<<< .our
-   auto* osr_wcv = GetOffScreenWebContentsView();
-+=======
-+  const auto* wc_impl = static_cast<content::WebContentsImpl*>(web_contents());
-+  auto* osr_wcv = static_cast<OffScreenWebContentsView*>(wc_impl->GetView());
-+>>>>>>> .their
-   if (osr_wcv)
-     osr_wcv->SetPainting(false);
- #endif
-@@ -1764,7 +1774,13 @@
-     return false;
- 
- #if defined(ENABLE_OSR)
-+<<<<<<< .our
-   auto* osr_wcv = GetOffScreenWebContentsView();
-+=======
-+  const auto* wc_impl = static_cast<content::WebContentsImpl*>(web_contents());
-+  auto* osr_wcv = static_cast<OffScreenWebContentsView*>(wc_impl->GetView());
-+
-+>>>>>>> .their
-   return osr_wcv && osr_wcv->IsPainting();
- #else
-   return false;
-@@ -1776,7 +1792,13 @@
-     return;
- 
- #if defined(ENABLE_OSR)
-+<<<<<<< .our
-   auto* osr_wcv = GetOffScreenWebContentsView();
-+=======
-+  const auto* wc_impl = static_cast<content::WebContentsImpl*>(web_contents());
-+  auto* osr_wcv = static_cast<OffScreenWebContentsView*>(wc_impl->GetView());
-+
-+>>>>>>> .their
-   if (osr_wcv)
-     osr_wcv->SetFrameRate(frame_rate);
- #endif
-@@ -1787,7 +1809,13 @@
-     return 0;
- 
- #if defined(ENABLE_OSR)
-+<<<<<<< .our
-   auto* osr_wcv = GetOffScreenWebContentsView();
-+=======
-+  const auto* wc_impl = static_cast<content::WebContentsImpl*>(web_contents());
-+  auto* osr_wcv = static_cast<OffScreenWebContentsView*>(wc_impl->GetView());
-+
-+>>>>>>> .their
-   return osr_wcv ? osr_wcv->GetFrameRate() : 0;
- #else
-   return 0;
-@@ -1871,6 +1899,7 @@
-   return mate::ConvertToV8(isolate, *web_preferences->preference());
- }
- 
-+<<<<<<< .our
- v8::Local<v8::Value> WebContents::GetLastWebPreferences(
-     v8::Isolate* isolate) const {
-   auto* web_preferences = WebContentsPreferences::From(web_contents());
-@@ -1880,6 +1909,17 @@
- }
- 
- v8::Local<v8::Value> WebContents::GetOwnerBrowserWindow() const {
-+=======
-+v8::Local<v8::Value> WebContents::GetLastWebPreferences(v8::Isolate* isolate) {
-+  WebContentsPreferences* web_preferences =
-+      WebContentsPreferences::FromWebContents(web_contents());
-+  if (!web_preferences)
-+    return v8::Null(isolate);
-+  return mate::ConvertToV8(isolate, *web_preferences->last_web_preferences());
-+}
-+
-+v8::Local<v8::Value> WebContents::GetOwnerBrowserWindow() {
-+>>>>>>> .their
-   if (owner_window())
-     return BrowserWindow::From(isolate(), owner_window());
-   else
-changed in both
-  base   100644 1270a0ce2c79edab0c1be08450f06eef7b8cdd49 atom/browser/api/atom_api_web_contents.h
-  our    100644 7939f8268aa8c3371623e0c15f3b6001d7f1efa4 atom/browser/api/atom_api_web_contents.h
-  their  100644 99e64f8ff8d9dc41eadc8d022d149e68679382f7 atom/browser/api/atom_api_web_contents.h
-@@ -234,8 +234,13 @@
-   v8::Local<v8::Value> GetPreloadPath(v8::Isolate* isolate) const;
- 
-   // Returns the web preferences of current WebContents.
-+<<<<<<< .our
-   v8::Local<v8::Value> GetWebPreferences(v8::Isolate* isolate) const;
-   v8::Local<v8::Value> GetLastWebPreferences(v8::Isolate* isolate) const;
-+=======
-+  v8::Local<v8::Value> GetWebPreferences(v8::Isolate* isolate);
-+  v8::Local<v8::Value> GetLastWebPreferences(v8::Isolate* isolate);
-+>>>>>>> .their
- 
-   // Returns the owner window.
-   v8::Local<v8::Value> GetOwnerBrowserWindow() const;
-changed in both
-  base   100644 61c97f2c35ce3c9e76cee59f9e4becd9649c993b atom/browser/atom_browser_client.cc
-  our    100644 57c4ee582405e6d501ec23940ccb10689ecd64a1 atom/browser/atom_browser_client.cc
-  their  100644 713b1bc6ec037aaa9f845b98d26a959d7d7688bc atom/browser/atom_browser_client.cc
-@@ -27,6 +27,7 @@
- #include "base/command_line.h"
- #include "base/environment.h"
- #include "base/files/file_util.h"
-+#include "base/path_service.h"
- #include "base/stl_util.h"
- #include "base/strings/string_number_conversions.h"
- #include "base/strings/string_util.h"
-@@ -296,6 +297,7 @@
-     base::CommandLine* command_line,
-     int process_id) {
-   // Make sure we're about to launch a known executable
-+<<<<<<< .our
-   {
-     base::FilePath child_path;
-     PathService::Get(content::CHILD_PROCESS_EXE, &child_path);
-@@ -303,6 +305,11 @@
-     base::ThreadRestrictions::ScopedAllowIO allow_io;
-     CHECK(base::MakeAbsoluteFilePath(command_line->GetProgram()) == child_path);
-   }
-+=======
-+  base::FilePath child_path;
-+  PathService::Get(content::CHILD_PROCESS_EXE, &child_path);
-+  CHECK(base::MakeAbsoluteFilePath(command_line->GetProgram()) == child_path);
-+>>>>>>> .their
- 
-   std::string process_type =
-       command_line->GetSwitchValueASCII(::switches::kProcessType);
-changed in both
-  base   100644 190898fdef9afb08c5110185136d3016bfd7edc2 atom/browser/atom_browser_main_parts.cc
-  our    100644 5229b19ca9af7845a3f2f13b7e0913f633b68b1d atom/browser/atom_browser_main_parts.cc
-  their  100644 89ab75c33cbe8bac8b50be241ae0ac82ea000ac6 atom/browser/atom_browser_main_parts.cc
-@@ -223,7 +223,10 @@
-   Browser::Get()->DidFinishLaunching(base::DictionaryValue());
- #endif
- 
-+<<<<<<< .our
-   // Notify observers that main thread message loop was initialized.
-+=======
-+>>>>>>> .their
-   Browser::Get()->PreMainMessageLoopRun();
- }
- 
-changed in both
-  base   100644 c714dc1f46ab633127a65a997e1adca4b240d2e8 atom/browser/browser.cc
-  our    100644 ce35de64d60c6767ac52596c1b32e7bde5ceefa0 atom/browser/browser.cc
-  their  100644 1e4bc5e8e72c21735530960fe617e07c3afeaa0c atom/browser/browser.cc
-changed in both
-  base   100644 2204eafdd5503ab90c67659c2d3c377dd745cc68 atom/browser/browser.h
-  our    100644 aed7d25c37da59c0dd5e09940a064c329353a0b2 atom/browser/browser.h
-  their  100644 d0f929caf1792c3e62bc7e6f52ad9cf0b9655a91 atom/browser/browser.h
-@@ -238,7 +238,13 @@
- 
-   void PreMainMessageLoopRun();
- 
-+<<<<<<< .our
-   void AddObserver(BrowserObserver* obs) { observers_.AddObserver(obs); }
-+=======
-+  void AddObserver(BrowserObserver* obs) {
-+    observers_.AddObserver(obs);
-+  }
-+>>>>>>> .their
- 
-   void RemoveObserver(BrowserObserver* obs) { observers_.RemoveObserver(obs); }
- 
-changed in both
-  base   100644 3e50fc228b9ad5699dba2e2ecb70ee6212d6e5c1 atom/browser/browser_observer.h
-  our    100644 d518e8d6a7c6e8e30c09498883719a58c8a9f5e8 atom/browser/browser_observer.h
-  their  100644 fce24d8ac792e2262b1c5097d3b82bccfb0c2ca7 atom/browser/browser_observer.h
-changed in both
-  base   100644 1ad07a90869708c653e38f0ee7924bcff761419d atom/browser/mac/atom_application_delegate.mm
-  our    100644 683f7a84bcaa2c47bb78cf299314a5afeb15639b atom/browser/mac/atom_application_delegate.mm
-  their  100644 ccf51133ce2594f2095455e2f30172ffcf7f2f72 atom/browser/mac/atom_application_delegate.mm
-@@ -8,13 +8,21 @@
- #import "atom/browser/mac/atom_application.h"
- #include "atom/browser/mac/dict_util.h"
- #include "base/allocator/allocator_shim.h"
-+<<<<<<< .our
- #include "base/allocator/buildflags.h"
-+=======
-+#include "base/allocator/features.h"
-+>>>>>>> .their
- #include "base/mac/mac_util.h"
- #include "base/mac/scoped_objc_class_swizzler.h"
- #include "base/strings/sys_string_conversions.h"
- #include "base/values.h"
- 
-+<<<<<<< .our
- #if BUILDFLAG(USE_ALLOCATOR_SHIM)
-+=======
-+#if BUILDFLAG(USE_EXPERIMENTAL_ALLOCATOR_SHIM)
-+>>>>>>> .their
- // On macOS 10.12, the IME system attempts to allocate a 2^64 size buffer,
- // which would typically cause an OOM crash. To avoid this, the problematic
- // method is swizzled out and the make-OOM-fatal bit is disabled for the
-@@ -35,7 +43,11 @@
-   base::allocator::SetCallNewHandlerOnMallocFailure(true);
- }
- @end
-+<<<<<<< .our
- #endif  // BUILDFLAG(USE_ALLOCATOR_SHIM)
-+=======
-+#endif  // BUILDFLAG(USE_EXPERIMENTAL_ALLOCATOR_SHIM)
-+>>>>>>> .their
- 
- @implementation AtomApplicationDelegate
- 
-@@ -65,7 +77,11 @@
-     atom::Browser::Get()->DidFinishLaunching(base::DictionaryValue());
-   }
- 
-+<<<<<<< .our
- #if BUILDFLAG(USE_ALLOCATOR_SHIM)
-+=======
-+#if BUILDFLAG(USE_EXPERIMENTAL_ALLOCATOR_SHIM)
-+>>>>>>> .their
-   // Disable fatal OOM to hack around an OS bug https://crbug.com/654695.
-   if (base::mac::IsOS10_12()) {
-     g_swizzle_imk_input_session = new base::mac::ScopedObjCClassSwizzler(
-changed in both
-  base   100644 949e5e9ec96d42d75e975e6e4facc249079bce9e atom/browser/native_browser_view.cc
-  our    100644 6460f2bfbd22f7809ce92325ffb36ddbe3512a9f atom/browser/native_browser_view.cc
-  their  100644 c97fe683e6c56b17a32eede8d397d2c2d47efa2b atom/browser/native_browser_view.cc
-changed in both
-  base   100644 236f615c2b0664ee0c2f2c80182a1a6070956170 atom/browser/native_browser_view.h
-  our    100644 56937e4c8c69e3605d2b6cc71a0877b74ff4e83d atom/browser/native_browser_view.h
-  their  100644 7c154b60b00e25c42847ceefb98723b50ea03dd0 atom/browser/native_browser_view.h
-@@ -48,7 +48,11 @@
- 
-   // Called when the window needs to update its draggable region.
-   virtual void UpdateDraggableRegions(
-+<<<<<<< .our
-       const std::vector<gfx::Rect>& system_drag_exclude_areas) {}
-+=======
-+    const std::vector<gfx::Rect>& system_drag_exclude_areas) {}
-+>>>>>>> .their
- 
-  protected:
-   explicit NativeBrowserView(
-changed in both
-  base   100644 4e7aa429ce27ae12e495ab579247d2d244fdd18f atom/browser/native_browser_view_mac.h
-  our    100644 726ca75433e8091a344ef8d731e51c27f8a23450 atom/browser/native_browser_view_mac.h
-  their  100644 0b04edad729faa8e2f79b4653426db1d941dafe3 atom/browser/native_browser_view_mac.h
-@@ -23,6 +23,8 @@
-   void SetAutoResizeFlags(uint8_t flags) override;
-   void SetBounds(const gfx::Rect& bounds) override;
-   void SetBackgroundColor(SkColor color) override;
-+  void UpdateDraggableRegions(
-+      const std::vector<gfx::Rect>& system_drag_exclude_areas) override;
- 
-   void UpdateDraggableRegions(
-       const std::vector<gfx::Rect>& system_drag_exclude_areas) override;
-changed in both
-  base   100644 2ce2adc1f4fe02a600c18c2c7b0852e1fcf27710 atom/browser/native_browser_view_mac.mm
-  our    100644 0416e26e89f1e0f37366ef1798b4359da0729225 atom/browser/native_browser_view_mac.mm
-  their  100644 3d77b2a84891a724336e83af2284543470a57cf1 atom/browser/native_browser_view_mac.mm
-@@ -15,16 +15,25 @@
- 
- @interface DragRegionView : NSView
- 
-+<<<<<<< .our
- @property(assign) NSPoint initialLocation;
-+=======
-+@property (assign) NSPoint initialLocation;
-+>>>>>>> .their
- 
- @end
- 
- @interface NSWindow ()
-+<<<<<<< .our
- - (void)performWindowDragWithEvent:(NSEvent*)event;
-+=======
-+- (void)performWindowDragWithEvent:(NSEvent *)event;
-+>>>>>>> .their
- @end
- 
- @implementation DragRegionView
- 
-+<<<<<<< .our
- @synthesize initialLocation;
- 
- - (BOOL)mouseDownCanMoveWindow {
-@@ -56,32 +65,67 @@
-   }
- 
-   if (self.window.styleMask & NSFullScreenWindowMask) {
-+=======
-+- (BOOL)mouseDownCanMoveWindow
-+{
-+  return NO;
-+}
-+
-+- (NSView *)hitTest:(NSPoint)aPoint
-+{
-+    // Pass-through events that don't hit one of the exclusion zones
-+    for (NSView *exlusion_zones in [self subviews]) {
-+      if ([exlusion_zones hitTest:aPoint])
-+        return nil;
-+    }
-+
-+    return self;
-+}
-+
-+- (void)mouseDown:(NSEvent *)event
-+{
-+  if ([self.window respondsToSelector:@selector(performWindowDragWithEvent)]) {
-+    [self.window performWindowDragWithEvent:event];
-+>>>>>>> .their
-     return;
-   }
- 
-   self.initialLocation = [event locationInWindow];
- }
- 
-+<<<<<<< .our
- - (void)mouseDragged:(NSEvent*)theEvent {
-+=======
-+- (void)mouseDragged:(NSEvent *)theEvent
-+{
-+>>>>>>> .their
-   if ([self.window respondsToSelector:@selector(performWindowDragWithEvent)]) {
-     return;
-   }
- 
-+<<<<<<< .our
-   if (self.window.styleMask & NSFullScreenWindowMask) {
-     return;
-   }
- 
-+=======
-+>>>>>>> .their
-   NSPoint currentLocation = [NSEvent mouseLocation];
-   NSPoint newOrigin;
- 
-   NSRect screenFrame = [[NSScreen mainScreen] frame];
-+<<<<<<< .our
-   NSSize screenSize = screenFrame.size;
-   NSRect windowFrame = [self.window frame];
-   NSSize windowSize = windowFrame.size;
-+=======
-+  NSRect windowFrame = [self.window frame];
-+>>>>>>> .their
- 
-   newOrigin.x = currentLocation.x - self.initialLocation.x;
-   newOrigin.y = currentLocation.y - self.initialLocation.y;
- 
-+<<<<<<< .our
-   BOOL inMenuBar = (newOrigin.y + windowSize.height) >
-                    (screenFrame.origin.y + screenSize.height);
-   BOOL screenAboveMainScreen = false;
-@@ -116,6 +160,11 @@
-   if (inMenuBar && !screenAboveMainScreen) {
-     newOrigin.y = screenFrame.origin.y +
-                   (screenFrame.size.height - windowFrame.size.height);
-+=======
-+  // Don't let window get dragged up under the menu bar
-+  if ((newOrigin.y + windowFrame.size.height) > (screenFrame.origin.y + screenFrame.size.height)) {
-+    newOrigin.y = screenFrame.origin.y + (screenFrame.size.height - windowFrame.size.height);
-+>>>>>>> .their
-   }
- 
-   // Move the window to the new location
-@@ -195,6 +244,7 @@
- }
- 
- void NativeBrowserViewMac::UpdateDraggableRegions(
-+<<<<<<< .our
-     const std::vector<gfx::Rect>& drag_exclude_rects) {
-   NSView* web_view = GetWebContents()->GetNativeView();
-   NSView* inspectable_view = GetInspectableWebContentsView()->GetNativeView();
-@@ -229,6 +279,58 @@
-             initWithFrame:drag_region_view_exclude_rect]);
-     [drag_region_view addSubview:exclude_drag_region_view];
-   }
-+=======
-+    const std::vector<gfx::Rect>& system_drag_exclude_areas) {
-+  NSView* webView = GetInspectableWebContentsView()->GetNativeView();
-+
-+  NSInteger superViewHeight = NSHeight([webView.superview bounds]);
-+  NSInteger webViewHeight = NSHeight([webView bounds]);
-+  NSInteger webViewWidth = NSWidth([webView bounds]);
-+  NSInteger webViewX = NSMinX([webView frame]);
-+  NSInteger webViewY = 0;
-+
-+  // Apple's NSViews have their coordinate system originate at the bottom left,
-+  // meaning that we need to be a bit smarter when it comes to calculating our
-+  // current top offset
-+  if (webViewHeight > superViewHeight) {
-+    webViewY = std::abs(webViewHeight - superViewHeight - (std::abs(NSMinY([webView frame]))));
-+  } else {
-+    webViewY = superViewHeight - NSMaxY([webView frame]);
-+  }
-+
-+  // Remove all DraggableRegionViews that are added last time.
-+  // Note that [webView subviews] returns the view's mutable internal array and
-+  // it should be copied to avoid mutating the original array while enumerating
-+  // it.
-+  base::scoped_nsobject<NSArray> subviews([[webView subviews] copy]);
-+  for (NSView* subview in subviews.get())
-+    if ([subview isKindOfClass:[DragRegionView class]])
-+      [subview removeFromSuperview];
-+
-+  // Create one giant NSView that is draggable.
-+  base::scoped_nsobject<NSView> dragRegion(
-+        [[DragRegionView alloc] initWithFrame:NSZeroRect]);
-+    [dragRegion setFrame:NSMakeRect(0,
-+                                    0,
-+                                    webViewWidth,
-+                                    webViewHeight)];
-+
-+  // Then, on top of that, add "exclusion zones"
-+  for (auto iter = system_drag_exclude_areas.begin();
-+       iter != system_drag_exclude_areas.end();
-+       ++iter) {
-+    base::scoped_nsobject<NSView> controlRegion(
-+        [[ExcludeDragRegionView alloc] initWithFrame:NSZeroRect]);
-+    [controlRegion setFrame:NSMakeRect(iter->x() - webViewX,
-+                                       webViewHeight - iter->bottom() + webViewY,
-+                                       iter->width(),
-+                                       iter->height())];
-+    [dragRegion addSubview:controlRegion];
-+  }
-+
-+  // Add the DragRegion to the WebView
-+  [webView addSubview:dragRegion];
-+>>>>>>> .their
- }
- 
- // static
-changed in both
-  base   100644 3dfb88d5398fc9c6c2985cd3df58c5a10ea56462 atom/browser/native_window_mac.h
-  our    100644 44a78198f44cdba9875e3fb27c8e2c87eaa6f33b atom/browser/native_window_mac.h
-  their  100644 45636eb7025e1c7250db17496e3553ce9422b2e4 atom/browser/native_window_mac.h
-@@ -163,7 +163,16 @@
-   void InternalSetParentWindow(NativeWindow* parent, bool attach);
-   void ShowWindowButton(NSWindowButton button);
- 
-+<<<<<<< .our
-   void SetForwardMouseMessages(bool forward);
-+=======
-+  void InstallView();
-+  void UninstallView();
-+
-+  // Install the drag view, which will cover the whole window and decides
-+  // whether we can drag.
-+  void UpdateDraggableRegionViews(const std::vector<DraggableRegion>& regions);
-+>>>>>>> .their
- 
-   AtomNSWindow* window_;  // Weak ref, managed by widget_.
- 
-changed in both
-  base   100644 2719c672954ab0eb2b8090fb25c9c9965c99e410 atom/browser/native_window_mac.mm
-  our    100644 004263ec127709067e903ffbf31003b8844226b4 atom/browser/native_window_mac.mm
-  their  100644 a0af83de3574e3a86f1e0064c8212dd6c526d40d atom/browser/native_window_mac.mm
-@@ -1387,10 +1387,45 @@
-     [parent->GetNativeWindow() addChildWindow:window_ ordered:NSWindowAbove];
- }
- 
-+<<<<<<< .our
- void NativeWindowMac::ShowWindowButton(NSWindowButton button) {
-   auto view = [window_ standardWindowButton:button];
-   [view.superview addSubview:view positioned:NSWindowAbove relativeTo:nil];
- }
-+=======
-+  // Remove all ControlRegionViews that are added last time.
-+  // Note that [webView subviews] returns the view's mutable internal array and
-+  // it should be copied to avoid mutating the original array while enumerating
-+  // it.
-+  base::scoped_nsobject<NSArray> subviews([[webView subviews] copy]);
-+  for (NSView* subview in subviews.get())
-+    if ([subview isKindOfClass:[ControlRegionView class]])
-+      [subview removeFromSuperview];
-+
-+  // Draggable regions is implemented by having the whole web view draggable
-+  // (mouseDownCanMoveWindow) and overlaying regions that are not draggable.
-+  std::vector<gfx::Rect> system_drag_exclude_areas =
-+      CalculateNonDraggableRegions(regions, webViewWidth, webViewHeight);
-+
-+  if (browser_view_) {
-+    browser_view_->UpdateDraggableRegions(system_drag_exclude_areas);
-+  }
-+
-+  // Create and add a ControlRegionView for each region that needs to be
-+  // excluded from the dragging.
-+  for (std::vector<gfx::Rect>::const_iterator iter =
-+           system_drag_exclude_areas.begin();
-+       iter != system_drag_exclude_areas.end();
-+       ++iter) {
-+    base::scoped_nsobject<NSView> controlRegion(
-+        [[ControlRegionView alloc] initWithFrame:NSZeroRect]);
-+    [controlRegion setFrame:NSMakeRect(iter->x(),
-+                                       webViewHeight - iter->bottom(),
-+                                       iter->width(),
-+                                       iter->height())];
-+    [webView addSubview:controlRegion];
-+  }
-+>>>>>>> .their
- 
- void NativeWindowMac::SetForwardMouseMessages(bool forward) {
-   [window_ setAcceptsMouseMovedEvents:forward];
-changed in both
-  base   100644 ad02ed620d6d94ba15e7f8d154063a0968178110 atom/browser/net/asar/url_request_asar_job.cc
-  our    100644 85eb2e1dd142b6d64aafb5350ae47603db989e8f atom/browser/net/asar/url_request_asar_job.cc
-  their  100644 5c4472a315911a6c2da533b35d489f8f9da5cd53 atom/browser/net/asar/url_request_asar_job.cc
-@@ -243,6 +243,24 @@
-     meta_info->mime_type_result = net::GetWellKnownMimeTypeFromExtension(
-         file_extension.substr(1), &meta_info->mime_type);
-   }
-+<<<<<<< .our
-+=======
-+
-+  // We use GetWellKnownMimeTypeFromExtension() to ensure that configurations
-+  // that may have been set by other programs on a user's machine don't affect
-+  // the mime type returned (in particular, JS should always be
-+  // (application/javascript). See https://crbug.com/797712. Using an accurate
-+  // mime type is necessary at least for modules and sw, which enforce strict
-+  // mime type requirements.
-+  // TODO(deepak1556): Revert this when sw support is removed for file scheme.
-+  base::FilePath::StringType file_extension = file_path.Extension();
-+  if (file_extension.empty()) {
-+    meta_info->mime_type_result = false;
-+  } else {
-+    meta_info->mime_type_result = net::GetWellKnownMimeTypeFromExtension(
-+        file_extension.substr(1), &meta_info->mime_type);
-+  }
-+>>>>>>> .their
- }
- 
- void URLRequestAsarJob::DidFetchMetaInfo(const FileMetaInfo* meta_info) {
-changed in both
-  base   100644 ff426dd08c8e39bcb23aeff2cdf03f2db414529e atom/browser/net/url_request_fetch_job.cc
-  our    100644 68539433f4de80a96bc672de3a2834b299d6c04b atom/browser/net/url_request_fetch_job.cc
-  their  100644 04d0ddd1e6af761c8e36d6cb93b99866a886457a atom/browser/net/url_request_fetch_job.cc
-changed in both
-  base   100644 c35e364236f68545a869ecfb34a6b9f496c0511f atom/browser/osr/osr_output_device.cc
-  our    100644 e5c1e7fd95fc6443e77f86c86645c51ca36d0d9b atom/browser/osr/osr_output_device.cc
-  their  100644 1234a17b842074ca4236066f09994cccf1a6a83b atom/browser/osr/osr_output_device.cc
-@@ -80,7 +80,11 @@
-     return;
-   active_ = active;
- 
-+<<<<<<< .our
-   if (!active_ && !pending_damage_rect_.IsEmpty() && paint)
-+=======
-+  if (active_ && paint)
-+>>>>>>> .their
-     OnPaint(gfx::Rect(viewport_pixel_size_));
- }
- 
-changed in both
-  base   100644 5710bc41b8319597ae37c0cb995e42b24562de17 atom/browser/osr/osr_output_device.h
-  our    100644 4c62414fd0c57ba650c04e23a75fe9be82999b2e atom/browser/osr/osr_output_device.h
-  their  100644 a65865316fa4398d8aa161264a30dd19762eae27 atom/browser/osr/osr_output_device.h
-changed in both
-  base   100644 11523a660b8f1d6972254117e84fd69588b1421a atom/browser/osr/osr_render_widget_host_view.cc
-  our    100644 4a2a0747fe2e6bf38c8999b80dbfea31e52a17fd atom/browser/osr/osr_render_widget_host_view.cc
-  their  100644 e2e521dbadd20313ebb92af117a21c407ffe05b5 atom/browser/osr/osr_render_widget_host_view.cc
-@@ -259,12 +259,27 @@
-       native_window_(native_window),
-       transparent_(transparent),
-       callback_(callback),
-+<<<<<<< .our
-       frame_rate_(frame_rate),
-+=======
-+      parent_callback_(nullptr),
-+      frame_rate_(frame_rate),
-+      frame_rate_threshold_us_(0),
-+      last_time_(base::Time::Now()),
-+>>>>>>> .their
-       scale_factor_(kDefaultScaleFactor),
-       size_(native_window->GetSize()),
-       painting_(painting),
-       is_showing_(!render_widget_host_->is_hidden()),
-+<<<<<<< .our
-       mouse_wheel_phase_handler_(render_widget_host_, this),
-+=======
-+      is_destroyed_(false),
-+      popup_position_(gfx::Rect()),
-+      hold_resize_(false),
-+      pending_resize_(false),
-+      paint_callback_running_(false),
-+>>>>>>> .their
-       weak_ptr_factory_(this) {
-   DCHECK(render_widget_host_);
-   bool is_guest_view_hack = parent_host_view_ != nullptr;
-@@ -292,9 +307,13 @@
-   compositor_.reset(
-       new ui::Compositor(context_factory_private->AllocateFrameSinkId(),
-                          content::GetContextFactory(), context_factory_private,
-+<<<<<<< .our
-                          base::ThreadTaskRunnerHandle::Get(),
-                          features::IsSurfaceSynchronizationEnabled(),
-                          false /* enable_pixel_canvas */));
-+=======
-+                         base::ThreadTaskRunnerHandle::Get()));
-+>>>>>>> .their
-   compositor_->SetAcceleratedWidget(gfx::kNullAcceleratedWidget);
-   compositor_->SetRootLayer(root_layer_.get());
- #endif
-@@ -713,8 +732,18 @@
-   }
- 
-   return new OffScreenRenderWidgetHostView(
-+<<<<<<< .our
-       transparent_, true, embedder_host_view->GetFrameRate(), callback_,
-       render_widget_host, embedder_host_view, native_window_);
-+=======
-+      transparent_,
-+      true,
-+      embedder_host_view->GetFrameRate(),
-+      callback_,
-+      render_widget_host,
-+      embedder_host_view,
-+      native_window_);
-+>>>>>>> .their
- }
- 
- #if !defined(OS_MACOSX)
-@@ -1204,7 +1233,11 @@
- 
-   SetupFrameRate(true);
- 
-+<<<<<<< .our
-   for (auto* guest_host_view : guest_host_views_)
-+=======
-+  for (auto guest_host_view : guest_host_views_)
-+>>>>>>> .their
-     guest_host_view->SetFrameRate(frame_rate);
- }
- 
-@@ -1233,10 +1266,15 @@
- 
-   frame_rate_threshold_us_ = 1000000 / frame_rate_;
- 
-+<<<<<<< .our
-   if (GetCompositor()) {
-     GetCompositor()->SetAuthoritativeVSyncInterval(
-         base::TimeDelta::FromMicroseconds(frame_rate_threshold_us_));
-   }
-+=======
-+  GetCompositor()->SetAuthoritativeVSyncInterval(
-+      base::TimeDelta::FromMicroseconds(frame_rate_threshold_us_));
-+>>>>>>> .their
- 
-   if (copy_frame_generator_.get()) {
-     copy_frame_generator_->set_frame_rate_threshold_us(
-changed in both
-  base   100644 dc204a311ff557a1f2b38c2933fbcec47c8751a7 atom/browser/osr/osr_render_widget_host_view.h
-  our    100644 b81f6310f864c00fea50b1aac49dc89173eaa302 atom/browser/osr/osr_render_widget_host_view.h
-  their  100644 a4b5593cf28a2b09c28c4285efa7a0cdae2b76da atom/browser/osr/osr_render_widget_host_view.h
-@@ -317,6 +317,8 @@
-   viz::LocalSurfaceId local_surface_id_;
-   viz::ParentLocalSurfaceIdAllocator local_surface_id_allocator_;
- 
-+  bool paint_callback_running_;
-+
-   std::unique_ptr<ui::Layer> root_layer_;
-   std::unique_ptr<ui::Compositor> compositor_;
-   std::unique_ptr<content::DelegatedFrameHost> delegated_frame_host_;
-changed in both
-  base   100644 0e10abf6a034ab604f51553eb905b18e18f45552 atom/browser/osr/osr_web_contents_view.cc
-  our    100644 c8223df0d8c6f3436d323059686e42684ff98462 atom/browser/osr/osr_web_contents_view.cc
-  their  100644 4cbc6a5c42f9762b81fc4d601ebb534dedcd4914 atom/browser/osr/osr_web_contents_view.cc
-@@ -13,9 +13,18 @@
- namespace atom {
- 
- OffScreenWebContentsView::OffScreenWebContentsView(
-+<<<<<<< .our
-     bool transparent,
-     const OnPaintCallback& callback)
-     : transparent_(transparent), callback_(callback) {
-+=======
-+    bool transparent, const OnPaintCallback& callback)
-+    : transparent_(transparent),
-+      painting_(true),
-+      frame_rate_(60),
-+      callback_(callback),
-+      web_contents_(nullptr) {
-+>>>>>>> .their
- #if defined(OS_MACOSX)
-   PlatformCreate();
- #endif
-@@ -104,8 +113,18 @@
- 
-   auto* relay = NativeWindowRelay::FromWebContents(web_contents_);
-   return new OffScreenRenderWidgetHostView(
-+<<<<<<< .our
-       transparent_, painting_, GetFrameRate(), callback_, render_widget_host,
-       nullptr, relay->window.get());
-+=======
-+      transparent_,
-+      painting_,
-+      GetFrameRate(),
-+      callback_,
-+      render_widget_host,
-+      nullptr,
-+      relay->window.get());
-+>>>>>>> .their
- }
- 
- content::RenderWidgetHostViewBase*
-@@ -124,8 +143,18 @@
-               : web_contents_impl->GetRenderWidgetHostView());
- 
-   return new OffScreenRenderWidgetHostView(
-+<<<<<<< .our
-       transparent_, true, view->GetFrameRate(), callback_, render_widget_host,
-       view, relay->window.get());
-+=======
-+      transparent_,
-+      true,
-+      view->GetFrameRate(),
-+      callback_,
-+      render_widget_host,
-+      view,
-+      relay->window.get());
-+>>>>>>> .their
- }
- 
- void OffScreenWebContentsView::SetPageTitle(const base::string16& title) {}
-@@ -209,6 +238,42 @@
-   }
- }
- 
-+void OffScreenWebContentsView::SetPainting(bool painting) {
-+  auto* view = GetView();
-+  if (view != nullptr) {
-+    view->SetPainting(painting);
-+  } else {
-+    painting_ = painting;
-+  }
-+}
-+
-+bool OffScreenWebContentsView::IsPainting() const {
-+  auto* view = GetView();
-+  if (view != nullptr) {
-+    return view->IsPainting();
-+  } else {
-+    return painting_;
-+  }
-+}
-+
-+void OffScreenWebContentsView::SetFrameRate(int frame_rate) {
-+  auto* view = GetView();
-+  if (view != nullptr) {
-+    view->SetFrameRate(frame_rate);
-+  } else {
-+    frame_rate_ = frame_rate;
-+  }
-+}
-+
-+int OffScreenWebContentsView::GetFrameRate() const {
-+  auto* view = GetView();
-+  if (view != nullptr) {
-+    return view->GetFrameRate();
-+  } else {
-+    return frame_rate_;
-+  }
-+}
-+
- OffScreenRenderWidgetHostView* OffScreenWebContentsView::GetView() const {
-   if (web_contents_) {
-     return static_cast<OffScreenRenderWidgetHostView*>(
-changed in both
-  base   100644 ffb3b38619c4521f9947fe29e3871ed06d97978e atom/browser/osr/osr_web_contents_view.h
-  our    100644 206ab9dd3421af522a12aba615c6f040ba176ba4 atom/browser/osr/osr_web_contents_view.h
-  their  100644 788e55bf316d8069811fc026bf610ad231371fce atom/browser/osr/osr_web_contents_view.h
-@@ -83,8 +83,13 @@
-   OffScreenRenderWidgetHostView* GetView() const;
- 
-   const bool transparent_;
-+<<<<<<< .our
-   bool painting_ = true;
-   int frame_rate_ = 60;
-+=======
-+  bool painting_;
-+  int frame_rate_;
-+>>>>>>> .their
-   OnPaintCallback callback_;
- 
-   // Weak refs.
-changed in both
-  base   100644 9610d80693b1670f696f82812442419504d61454 atom/browser/relauncher.cc
-  our    100644 35c6785e3d87d21eaea27ad5818434d870326047 atom/browser/relauncher.cc
-  their  100644 9dfb6edd06661f302ca7498a2ba34f0ce70c938b atom/browser/relauncher.cc
-changed in both
-  base   100644 e4207b2f46835a44089d4e23a5e973e5ff401f4d atom/browser/resources/mac/Info.plist
-  our    100644 9094f0f7335edf833d51f688851e6a105de60433 atom/browser/resources/mac/Info.plist
-  their  100644 cd8c6245a978327778f3f45b106347287d6a9ecb atom/browser/resources/mac/Info.plist
-@@ -17,9 +17,15 @@
-   <key>CFBundleIconFile</key>
-   <string>electron.icns</string>
-   <key>CFBundleVersion</key>
-+<<<<<<< .our
-   <string>4.0.0</string>
-   <key>CFBundleShortVersionString</key>
-   <string>4.0.0</string>
-+=======
-+  <string>1.7.16</string>
-+  <key>CFBundleShortVersionString</key>
-+  <string>1.7.16</string>
-+>>>>>>> .their
-   <key>LSApplicationCategoryType</key>
-   <string>public.app-category.developer-tools</string>
-   <key>LSMinimumSystemVersion</key>
-changed in both
-  base   100644 9035ccc9e4608312b0fef482afaafbc0f2fb8486 atom/browser/resources/win/atom.rc
-  our    100644 c0bd831e8bddf10180f75cd40694831e2e98622d atom/browser/resources/win/atom.rc
-  their  100644 bb309c131cc0946c5683a026d0561c82e54510ce atom/browser/resources/win/atom.rc
-@@ -56,8 +56,13 @@
- //
- 
- VS_VERSION_INFO VERSIONINFO
-+<<<<<<< .our
-  FILEVERSION 4,0,0,20180821
-  PRODUCTVERSION 4,0,0,20180821
-+=======
-+ FILEVERSION 1,7,16,0
-+ PRODUCTVERSION 1,7,16,0
-+>>>>>>> .their
-  FILEFLAGSMASK 0x3fL
- #ifdef _DEBUG
-  FILEFLAGS 0x1L
-@@ -74,12 +79,20 @@
-         BEGIN
-             VALUE "CompanyName", "GitHub, Inc."
-             VALUE "FileDescription", "Electron"
-+<<<<<<< .our
-             VALUE "FileVersion", "4.0.0"
-+=======
-+            VALUE "FileVersion", "1.7.16"
-+>>>>>>> .their
-             VALUE "InternalName", "electron.exe"
-             VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
-             VALUE "OriginalFilename", "electron.exe"
-             VALUE "ProductName", "Electron"
-+<<<<<<< .our
-             VALUE "ProductVersion", "4.0.0"
-+=======
-+            VALUE "ProductVersion", "1.7.16"
-+>>>>>>> .their
-             VALUE "SquirrelAwareVersion", "1"
-         END
-     END
-changed in both
-  base   100644 26662cf48502d880f6c18d9cb3236a42e2a813e4 atom/browser/ui/cocoa/atom_touch_bar.h
-  our    100644 fd6bb0cdc449d6d8f48a208f3300e857045d4686 atom/browser/ui/cocoa/atom_touch_bar.h
-  their  100644 d36e45898ea54f9e4205786f6b1fe9592c5acd67 atom/browser/ui/cocoa/atom_touch_bar.h
-@@ -17,9 +17,13 @@
- #include "native_mate/constructor.h"
- #include "native_mate/persistent_dictionary.h"
- 
-+<<<<<<< .our
- @interface AtomTouchBar : NSObject <NSScrubberDelegate,
-                                     NSScrubberDataSource,
-                                     NSScrubberFlowLayoutDelegate> {
-+=======
-+@interface AtomTouchBar : NSObject<NSScrubberDelegate, NSScrubberDataSource, NSScrubberFlowLayoutDelegate> {
-+>>>>>>> .their
-  @protected
-   std::vector<mate::PersistentDictionary> ordered_settings_;
-   std::map<std::string, mate::PersistentDictionary> settings_;
-changed in both
-  base   100644 30a3e6643fb89ca09e4310f789b20f1e22b1962c atom/browser/ui/cocoa/atom_touch_bar.mm
-  our    100644 72777c491f8a6024b61ed8cd3b849a5637f394a7 atom/browser/ui/cocoa/atom_touch_bar.mm
-  their  100644 366cb9e2d0c8adc3cee70a87d08f8ea9f2eca9d2 atom/browser/ui/cocoa/atom_touch_bar.mm
-@@ -765,15 +765,21 @@
-   return itemView;
- }
- 
-+<<<<<<< .our
- - (NSSize)scrubber:(NSScrubber*)scrubber
-                 layout:(NSScrubberFlowLayout*)layout
-     sizeForItemAtIndex:(NSInteger)itemIndex API_AVAILABLE(macosx(10.12.2)) {
-+=======
-+- (NSSize)scrubber:(NSScrubber *)scrubber layout:(NSScrubberFlowLayout *)layout sizeForItemAtIndex:(NSInteger)itemIndex
-+{
-+>>>>>>> .their
-   NSInteger width = 50;
-   NSInteger height = 30;
-   NSInteger margin = 15;
-   NSSize defaultSize = NSMakeSize(width, height);
- 
-   std::string s_id([[scrubber identifier] UTF8String]);
-+<<<<<<< .our
-   if (![self hasItemWithID:s_id])
-     return defaultSize;
- 
-@@ -784,12 +790,22 @@
- 
-   if (itemIndex >= static_cast<NSInteger>(items.size()))
-     return defaultSize;
-+=======
-+  if (![self hasItemWithID:s_id]) return defaultSize;
-+
-+  mate::PersistentDictionary settings = settings_[s_id];
-+  std::vector<mate::PersistentDictionary> items;
-+  if (!settings.Get("items", &items)) return defaultSize;
-+
-+  if (itemIndex >= static_cast<NSInteger>(items.size())) return defaultSize;
-+>>>>>>> .their
- 
-   mate::PersistentDictionary item = items[itemIndex];
-   std::string title;
- 
-   if (item.Get("label", &title)) {
-     NSSize size = NSMakeSize(CGFLOAT_MAX, CGFLOAT_MAX);
-+<<<<<<< .our
-     NSRect textRect = [base::SysUTF8ToNSString(title)
-         boundingRectWithSize:size
-                      options:NSStringDrawingUsesLineFragmentOrigin |
-@@ -797,6 +813,11 @@
-                   attributes:@{
-                     NSFontAttributeName : [NSFont systemFontOfSize:0]
-                   }];
-+=======
-+    NSRect textRect = [base::SysUTF8ToNSString(title) boundingRectWithSize:size
-+                                          options:NSStringDrawingUsesLineFragmentOrigin |   NSStringDrawingUsesFontLeading
-+                                          attributes:@{ NSFontAttributeName: [NSFont systemFontOfSize:0]}];
-+>>>>>>> .their
- 
-     width = textRect.size.width + margin;
-   } else {
-changed in both
-  base   100644 6fe7c820a1ccda7befcabbb6b9e740cab8d33afc atom/browser/ui/cocoa/touch_bar_forward_declarations.h
-  our    100644 281672c30420d3e1abb77cb96db69e375f4d5ea7 atom/browser/ui/cocoa/touch_bar_forward_declarations.h
-  their  100644 062723bca670a1bb5a5b4c34524d7eecfa52f50d atom/browser/ui/cocoa/touch_bar_forward_declarations.h
-@@ -14,11 +14,16 @@
- #pragma clang assume_nonnull begin
- 
- @class NSTouchBar, NSTouchBarItem;
-+<<<<<<< .our
- @class NSScrubber, NSScrubberItemView, NSScrubberArrangedView,
-     NSScrubberTextItemView, NSScrubberImageItemView, NSScrubberSelectionStyle;
- @protocol NSTouchBarDelegate
- , NSScrubberDelegate, NSScrubberDataSource, NSScrubberFlowLayoutDelegate,
-     NSScrubberFlowLayout;
-+=======
-+@class NSScrubber, NSScrubberItemView, NSScrubberArrangedView, NSScrubberTextItemView, NSScrubberImageItemView, NSScrubberSelectionStyle;
-+@protocol NSTouchBarDelegate, NSScrubberDelegate, NSScrubberDataSource, NSScrubberFlowLayoutDelegate, NSScrubberFlowLayout;
-+>>>>>>> .their
- 
- typedef float NSTouchBarItemPriority;
- static const NSTouchBarItemPriority NSTouchBarItemPriorityHigh = 1000;
-@@ -150,10 +155,17 @@
- 
- @end
- 
-+<<<<<<< .our
- @interface NSScrubberFlowLayout : NSObject
- @end
- 
- @interface NSScrubberSelectionStyle : NSObject <NSCoding>
-+=======
-+@interface NSScrubberFlowLayout: NSObject
-+@end
-+
-+@interface NSScrubberSelectionStyle : NSObject<NSCoding>
-+>>>>>>> .their
- 
- @property(class, strong, readonly)
-     NSScrubberSelectionStyle* outlineOverlayStyle;
-@@ -245,6 +257,12 @@
- 
- @end
- 
-+@protocol NSScrubberFlowLayoutDelegate<NSObject>
-+
-+- (NSSize)scrubber:(NSScrubber *)scrubber layout:(NSScrubberFlowLayout *)layout sizeForItemAtIndex:(NSInteger)itemIndex;
-+
-+@end
-+
- #pragma clang assume_nonnull end
- 
- #elif MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_12_1
-changed in both
-  base   100644 be9c15e7238987eeb533d6b981edea5b4125f8be atom/browser/ui/file_dialog_mac.mm
-  our    100644 18b18a8b240cda5512ae49e0afde5c749bdf75c0 atom/browser/ui/file_dialog_mac.mm
-  their  100644 cdc10d6cb430b6521e262ba5d19acaeb23859f42 atom/browser/ui/file_dialog_mac.mm
-@@ -94,6 +94,7 @@
- 
-   // Passing empty array to setAllowedFileTypes will cause exception.
-   NSArray* file_types = nil;
-+<<<<<<< .our
-   NSUInteger count = [file_types_list count];
-   if (count > 0) {
-     file_types = [[file_types_list objectAtIndex:0] allObjects];
-@@ -102,6 +103,11 @@
-     if ([file_types count] == 0 || [file_types containsObject:@"*"])
-       file_types = nil;
-   }
-+=======
-+  if ([file_type_set count])
-+    file_types = [file_type_set allObjects];
-+
-+>>>>>>> .their
-   [dialog setAllowedFileTypes:file_types];
- 
-   if (count <= 1)
-changed in both
-  base   100644 cc621625818feaeddf4fb76cd9103c822795e652 atom/browser/web_contents_preferences.cc
-  our    100644 c21c93383155091a7481cdd4e741cefad90a4a55 atom/browser/web_contents_preferences.cc
-  their  100644 701791b41d871d605367604e872f17668a7d24b5 atom/browser/web_contents_preferences.cc
-@@ -97,6 +97,7 @@
-   instances_.push_back(this);
- 
-   // Set WebPreferences defaults onto the JS object
-+<<<<<<< .our
-   SetDefaultBoolIfUndefined(options::kPlugins, false);
-   SetDefaultBoolIfUndefined(options::kExperimentalFeatures, false);
-   bool node = SetDefaultBoolIfUndefined(options::kNodeIntegration, true);
-@@ -104,11 +105,22 @@
-   SetDefaultBoolIfUndefined(options::kWebviewTag, node);
-   SetDefaultBoolIfUndefined(options::kSandbox, false);
-   SetDefaultBoolIfUndefined(options::kNativeWindowOpen, false);
-+=======
-+  SetDefaultBoolIfUndefined("plugins", false);
-+  SetDefaultBoolIfUndefined(options::kExperimentalFeatures, false);
-+  SetDefaultBoolIfUndefined(options::kExperimentalCanvasFeatures, false);
-+  bool node = SetDefaultBoolIfUndefined(options::kNodeIntegration, true);
-+  SetDefaultBoolIfUndefined(options::kNodeIntegrationInWorker, false);
-+  SetDefaultBoolIfUndefined(options::kWebviewTag, node);
-+  SetDefaultBoolIfUndefined("sandbox", false);
-+  SetDefaultBoolIfUndefined("nativeWindowOpen", false);
-+>>>>>>> .their
-   SetDefaultBoolIfUndefined(options::kContextIsolation, false);
-   SetDefaultBoolIfUndefined("javascript", true);
-   SetDefaultBoolIfUndefined("images", true);
-   SetDefaultBoolIfUndefined("textAreasAreResizable", true);
-   SetDefaultBoolIfUndefined("webgl", true);
-+<<<<<<< .our
-   bool webSecurity = true;
-   SetDefaultBoolIfUndefined(options::kWebSecurity, webSecurity);
-   // If webSecurity was explicity set to false, let's inherit that into
-@@ -125,6 +137,15 @@
-   SetDefaultBoolIfUndefined(options::kOffscreen, false);
- 
-   last_preference_ = preference_.Clone();
-+=======
-+  SetDefaultBoolIfUndefined("webSecurity", true);
-+  SetDefaultBoolIfUndefined("allowRunningInsecureContent", false);
-+  #if defined(OS_MACOSX)
-+  SetDefaultBoolIfUndefined(options::kScrollBounce, false);
-+  #endif
-+  SetDefaultBoolIfUndefined("offscreen", false);
-+  last_web_preferences_.MergeDictionary(&web_preferences_);
-+>>>>>>> .their
- }
- 
- WebContentsPreferences::~WebContentsPreferences() {
-@@ -154,6 +175,16 @@
-   return default_value;
- }
- 
-+bool WebContentsPreferences::SetDefaultBoolIfUndefined(const std::string key,
-+                                                       bool val) {
-+  bool existing;
-+  if (!web_preferences_.GetBoolean(key, &existing)) {
-+    web_preferences_.SetBoolean(key, val);
-+    return val;
-+  }
-+  return existing;
-+}
-+
- void WebContentsPreferences::Merge(const base::DictionaryValue& extend) {
-   if (preference_.is_dict())
-     static_cast<base::DictionaryValue*>(&preference_)->MergeDictionary(&extend);
-@@ -212,8 +243,18 @@
-   return FromWebContents(web_contents);
- }
- 
-+<<<<<<< .our
- void WebContentsPreferences::AppendCommandLineSwitches(
-     base::CommandLine* command_line) {
-+=======
-+  // We are appending args to a webContents so let's save the current state
-+  // of our preferences object so that during the lifetime of the WebContents
-+  // we can fetch the options used to initally configure the WebContents
-+  self->last_web_preferences_.Clear();
-+  self->last_web_preferences_.MergeDictionary(&web_preferences);
-+
-+  bool b;
-+>>>>>>> .their
-   // Check if plugins are enabled.
-   if (IsEnabled(options::kPlugins))
-     command_line->AppendSwitch(switches::kEnablePlugins);
-changed in both
-  base   100644 366aa1d9520847d6b81e673cc5a2156d53cc5ba5 atom/browser/web_contents_preferences.h
-  our    100644 d835347afcd259f473f95271a2c19e42afcc6f2b atom/browser/web_contents_preferences.h
-  their  100644 be277487d1d669b5e85676ff1a7ca4da365c0572 atom/browser/web_contents_preferences.h
-@@ -59,8 +59,15 @@
-   bool GetPreloadPath(base::FilePath::StringType* path) const;
- 
-   // Returns the web preferences.
-+<<<<<<< .our
-   base::Value* preference() { return &preference_; }
-   base::Value* last_preference() { return &last_preference_; }
-+=======
-+  base::DictionaryValue* web_preferences() { return &web_preferences_; }
-+  base::DictionaryValue* last_web_preferences() {
-+    return &last_web_preferences_;
-+  }
-+>>>>>>> .their
- 
-  private:
-   friend class content::WebContentsUserData<WebContentsPreferences>;
-@@ -75,6 +82,14 @@
-   static std::vector<WebContentsPreferences*> instances_;
- 
-   content::WebContents* web_contents_;
-+<<<<<<< .our
-+=======
-+  base::DictionaryValue web_preferences_;
-+  base::DictionaryValue last_web_preferences_;
-+
-+  // Set preference value to given bool if user did not provide value
-+  bool SetDefaultBoolIfUndefined(const std::string key, bool val);
-+>>>>>>> .their
- 
-   base::Value preference_ = base::Value(base::Value::Type::DICTIONARY);
-   base::Value last_preference_ = base::Value(base::Value::Type::DICTIONARY);
-changed in both
-  base   100644 08880ffe4a3591d9010f55ef18ce288e69101fe1 atom/common/atom_command_line.cc
-  our    100644 287e43f75fef778948ef9acdac8b9a7edfe07d0a atom/common/atom_command_line.cc
-  their  100644 54420b533a6b2600a87c95645b73bc01fbf0122f atom/common/atom_command_line.cc
-changed in both
-  base   100644 0f58ceb5123e85577732993552c326640d71de54 atom/common/atom_version.h
-  our    100644 65e7d19911559a40b1b258319df5fe0fa180354f atom/common/atom_version.h
-  their  100644 2b564da8029267a5d66e908b46da11a0a9870376 atom/common/atom_version.h
-@@ -5,10 +5,22 @@
- #ifndef ATOM_COMMON_ATOM_VERSION_H_
- #define ATOM_COMMON_ATOM_VERSION_H_
- 
-+<<<<<<< .our
- #define ATOM_MAJOR_VERSION 4
- #define ATOM_MINOR_VERSION 0
- #define ATOM_PATCH_VERSION 0
- #define ATOM_PRE_RELEASE_VERSION -nightly.20180821
-+=======
-+#define ATOM_MAJOR_VERSION 1
-+#define ATOM_MINOR_VERSION 7
-+#define ATOM_PATCH_VERSION 16
-+// #define ATOM_PRE_RELEASE_VERSION
-+#define ATOM_VERSION_IS_RELEASE 1
-+
-+#ifndef ATOM_TAG
-+# define ATOM_TAG ""
-+#endif
-+>>>>>>> .their
- 
- #ifndef ATOM_STRINGIFY
- #define ATOM_STRINGIFY(n) ATOM_STRINGIFY_HELPER(n)
-changed in both
-  base   100644 03e96ae8a4f3cb7e656143fb46dff58eb924fa12 atom/common/node_bindings.cc
-  our    100644 e6aded2e661af919c2d89c2f9bd46b4921d4aec4 atom/common/node_bindings.cc
-  their  100644 84792c58207dd85de2d2b60bd789417346c31b50 atom/common/node_bindings.cc
-@@ -228,8 +228,12 @@
- }
- 
- node::Environment* NodeBindings::CreateEnvironment(
-+<<<<<<< .our
-     v8::Handle<v8::Context> context,
-     node::MultiIsolatePlatform* platform) {
-+=======
-+    v8::Handle<v8::Context> context) {
-+>>>>>>> .their
- #if defined(OS_WIN)
-   auto& atom_args = AtomCommandLine::argv();
-   std::vector<std::string> args(atom_args.size());
-@@ -255,8 +259,13 @@
-   base::FilePath resources_path = GetResourcesPath(browser_env_ == BROWSER);
-   base::FilePath script_path =
-       resources_path.Append(FILE_PATH_LITERAL("electron.asar"))
-+<<<<<<< .our
-           .Append(process_type)
-           .Append(FILE_PATH_LITERAL("init.js"));
-+=======
-+                    .Append(process_type)
-+                    .Append(FILE_PATH_LITERAL("init.js"));
-+>>>>>>> .their
-   args.insert(args.begin() + 1, script_path.AsUTF8Unsafe());
- 
-   std::unique_ptr<const char* []> c_argv = StringVectorToArgArray(args);
-changed in both
-  base   100644 a56d2e24c0e77dcdcfd240c366daede6e3f2f709 brightray/browser/mac/cocoa_notification.mm
-  our    100644 57f53931e972adac9cbadf643c737b21d6b9b712 brightray/browser/mac/cocoa_notification.mm
-  their  100644 cd7b69ef4058ebc5ccf3396474551f2fc065d20f brightray/browser/mac/cocoa_notification.mm
-@@ -48,7 +48,13 @@
- 
-   if (options.silent) {
-     [notification_ setSoundName:nil];
-+<<<<<<< .our
-   } else if (options.sound.empty()) {
-+=======
-+  } else if (options.sound != nil) {
-+    [notification_ setSoundName:base::SysUTF16ToNSString(options.sound)];
-+  } else {
-+>>>>>>> .their
-     [notification_ setSoundName:NSUserNotificationDefaultSoundName];
-   } else {
-     [notification_ setSoundName:base::SysUTF16ToNSString(options.sound)];
-changed in both
-  base   100644 017fdd85261df0df1b885ef8a15fed74ed86c8de brightray/browser/notification.h
-  our    100644 efb8752f3595f81d8f080573924791cd1411ae84 brightray/browser/notification.h
-  their  100644 69efcff386f544f84074eb39781e3daa083ae64f brightray/browser/notification.h
-changed in both
-  base   100644 eab6c35479a3551de482e323fce00a962de423a5 chromium_src/chrome/browser/process_singleton.h
-  our    100644 b2909e8d1852c8fa69daa21b83432bb7c36f17c9 chromium_src/chrome/browser/process_singleton.h
-  their  100644 d77f5b41df88e4dba037c5946715bf690e28f95e chromium_src/chrome/browser/process_singleton.h
-changed in both
-  base   100644 e1e25cf91de0195202cae646dda4f124ee161dc2 chromium_src/chrome/browser/process_singleton_posix.cc
-  our    100644 4891743710d16673c6a72d76a303f6ac56a5ad32 chromium_src/chrome/browser/process_singleton_posix.cc
-  their  100644 1943ad51f635b19379753b67bc45d8ad316d6eb1 chromium_src/chrome/browser/process_singleton_posix.cc
-@@ -883,8 +883,15 @@
- void ProcessSingleton::StartListeningOnSocket() {
-   watcher_ = new LinuxWatcher(this);
-   BrowserThread::PostTask(
-+<<<<<<< .our
-       BrowserThread::IO, FROM_HERE,
-       base::Bind(&ProcessSingleton::LinuxWatcher::StartListening, watcher_,
-+=======
-+      BrowserThread::IO,
-+      FROM_HERE,
-+      base::Bind(&ProcessSingleton::LinuxWatcher::StartListening,
-+                 watcher_,
-+>>>>>>> .their
-                  sock_));
- }
- 
-changed in both
-  base   100644 b488ad457674287187b9b0edf24a423f774ff9c6 chromium_src/chrome/browser/process_singleton_win.cc
-  our    100644 6d0d102430ff700e703cef7e3189403c4a35218f chromium_src/chrome/browser/process_singleton_win.cc
-  their  100644 cce6054d1230c396f18a1eb358aa87faf1b29fd5 chromium_src/chrome/browser/process_singleton_win.cc
-changed in both
-  base   100644 9036102668286db7ca4d338dc8f326f1bd3653b7 docs/api/notification.md
-  our    100644 08776a9d3b8fb0969a5538981a2dd991b248fb82 docs/api/notification.md
-  their  100644 6dab356bbda50812a241fa150f39a03580d8cfae docs/api/notification.md
-@@ -30,6 +30,7 @@
- ### `new Notification([options])` _Experimental_
- 
- * `options` Object
-+<<<<<<< .our
-   * `title` String - A title for the notification, which will be shown at the top of the notification window when it is shown.
-   * `subtitle` String (optional) _macOS_ - A subtitle for the notification, which will be displayed below the title.
-   * `body` String - The body text of the notification, which will be displayed below the title or subtitle.
-@@ -40,6 +41,18 @@
-   * `sound` String (optional) _macOS_ - The name of the sound file to play when the notification is shown.
-   * `actions` [NotificationAction[]](structures/notification-action.md) (optional) _macOS_ - Actions to add to the notification. Please read the available actions and limitations in the `NotificationAction` documentation.
-   * `closeButtonText` String (optional) _macOS_ - A custom title for the close button of an alert. An empty string will cause the default localized text to be used.
-+=======
-+  * `title` String - A title for the notification, which will be shown at the top of the notification window when it is shown
-+  * `subtitle` String - (optional) A subtitle for the notification, which will be displayed below the title. _macOS_
-+  * `body` String - The body text of the notification, which will be displayed below the title or subtitle
-+  * `silent` Boolean - (optional) Whether or not to emit an OS notification noise when showing the notification
-+  * `icon` [NativeImage](native-image.md) - (optional) An icon to use in the notification
-+  * `hasReply` Boolean - (optional) Whether or not to add an inline reply option to the notification.  _macOS_
-+  * `replyPlaceholder` String - (optional) The placeholder to write in the inline reply input field. _macOS_
-+  * `sound` String - (optional) The name of the sound file to play when the notification is shown. _macOS_
-+  * `actions` [NotificationAction[]](structures/notification-action.md) - (optional) Actions to add to the notification.  Please read the available actions and limitations in the `NotificationAction` documentation _macOS_
-+
-+>>>>>>> .their
- 
- ### Instance Events
- 
-@@ -104,6 +117,7 @@
- not immediately show it to the user, you need to call this method before the OS
- will display it.
- 
-+<<<<<<< .our
- If the notification has been shown before, this method will dismiss the previously
- shown notification and create a new one with identical properties.
- 
-@@ -111,6 +125,8 @@
- 
- Dismisses the notification.
- 
-+=======
-+>>>>>>> .their
- ### Playing Sounds
- 
- On macOS, you can specify the name of the sound you'd like to play when the
-changed in both
-  base   100644 456fc207fe98260b4f971154f9260fad685fc563 docs/api/touch-bar-button.md
-  our    100644 4f3e2906ecd35c700c47edf358cd8ef2a4977050 docs/api/touch-bar-button.md
-  their  100644 461c0c5155227adf2306cb37865151aec48f7f7e docs/api/touch-bar-button.md
-changed in both
-  base   100644 17d416608b94068be43459bf2ce9ca18fc4dcedc electron.gyp
-  our    100644 944ddab2a3fd879044e31677e4bac2843fffbdee electron.gyp
-  their  100644 29a0f6ea3c58105659d1603447729d9021f1775e electron.gyp
-@@ -4,7 +4,11 @@
-     'product_name%': 'Electron',
-     'company_name%': 'GitHub, Inc',
-     'company_abbr%': 'github',
-+<<<<<<< .our
-     'version%': '4.0.0-nightly.20180821',
-+=======
-+    'version%': '1.7.16',
-+>>>>>>> .their
-     'js2c_input_dir': '<(SHARED_INTERMEDIATE_DIR)/js2c',
-   },
-   'includes': [
-@@ -255,6 +259,11 @@
-               ],
-             },
-           ],
-+          'link_settings': {
-+            'ldflags': [
-+              '-Wl,-z,noexecstack',
-+            ],
-+          },
-         }],  # OS=="linux"
-       ],
-     },  # target <(project_name)
-changed in both
-  base   100644 e90fe322ba15d1613f7fa300427bcb96c10d351f filenames.gypi
-  our    100644 f57860558f06b7e5d8a50f48cfc7e53044df0bc6 filenames.gypi
-  their  100644 22d8b072a7bbd28e0a9c67896210d54640b1628a filenames.gypi
-@@ -114,6 +114,11 @@
-       'atom/app/atom_main_delegate_mac.mm',
-       'atom/app/command_line_args.cc',
-       'atom/app/command_line_args.h',
-+<<<<<<< .our
-+=======
-+      'atom/app/node_main.cc',
-+      'atom/app/node_main.h',
-+>>>>>>> .their
-       'atom/app/uv_task_runner.cc',
-       'atom/app/uv_task_runner.h',
-       'atom/browser/api/atom_api_app.cc',
-changed in both
-  base   100644 55b8372f52cf485ea5f812baed5f48296bacb962 lib/browser/api/auto-updater/auto-updater-win.js
-  our    100644 7fead4aabb4a8768db4e4d3bc13da4927cf3c42e lib/browser/api/auto-updater/auto-updater-win.js
-  their  100644 fced1258797756160d28cd1a16e0e5515d39bf5b lib/browser/api/auto-updater/auto-updater-win.js
-changed in both
-  base   100644 4783a9dd98852f303fe50e6fd03dabdecd6d0693 lib/browser/api/auto-updater/squirrel-update-win.js
-  our    100644 fecf7958cd0afd54e978f011f5f87eea751faf6d lib/browser/api/auto-updater/squirrel-update-win.js
-  their  100644 60345f1a1abead139d280b14457e558c6467de45 lib/browser/api/auto-updater/squirrel-update-win.js
-changed in both
-  base   100644 731f82838af35a13442a2723b843cf0bcfb4717c lib/browser/guest-view-manager.js
-  our    100644 1e4029e39a981c85fb6ff18c5ccd52f81b3c56f2 lib/browser/guest-view-manager.js
-  their  100644 039753b7aef48f9ff8e9f507f7cb5d13458413b5 lib/browser/guest-view-manager.js
-changed in both
-  base   100644 bd9473dda879723625af24c0f98de2855234a2c7 lib/browser/guest-window-manager.js
-  our    100644 7253c1942b0956ae6b9b0c80a23470fc26669b8a lib/browser/guest-window-manager.js
-  their  100644 15137992b19d7a8f666dd54936200f728013e71c lib/browser/guest-window-manager.js
-@@ -65,7 +65,11 @@
-   // Inherit certain option values from parent window
-   const webPreferences = embedder.getLastWebPreferences()
-   for (const [name, value] of inheritedWebPreferences) {
-+<<<<<<< .our
-     if (webPreferences[name] === value) {
-+=======
-+    if (embedder.getLastWebPreferences()[name] === value) {
-+>>>>>>> .their
-       options.webPreferences[name] = value
-     }
-   }
-added in both
-  our    100644 b1d8824658ea05c277e82d1ac6c6febab9c55030 package-lock.json
-  their  100644 514c02bdd3fcc3df56524925fec36baab9db77f7 package-lock.json
-@@ -1,13 +1,23 @@
- {
-   "name": "electron",
-+<<<<<<< .our
-   "version": "4.0.0-nightly.20180819",
-+=======
-+  "version": "1.7.15",
-+>>>>>>> .their
-   "lockfileVersion": 1,
-   "requires": true,
-   "dependencies": {
-     "@types/node": {
-+<<<<<<< .our
-       "version": "7.0.69",
-       "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.69.tgz",
-       "integrity": "sha512-S5NC8HV6HnRipg8nC0j30TPl7ktXjRTKqgyINLNe8K/64UJUI8Lq0sRopXC0hProsV2F5ibj8IqPkl1xpGggrw==",
-+=======
-+      "version": "7.0.56",
-+      "resolved": "http://registry.npmjs.org/@types/node/-/node-7.0.56.tgz",
-+      "integrity": "sha512-NgjN3xPyqbAXSIpznNAR5Cisx5uKqJWxcS9kefzSFEX/9J7O01/FHyfnvPI7SztBf9p6c8mqOn3olZWJx3ja6g==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "JSONStream": {
-@@ -30,6 +40,7 @@
-     "abbrev": {
-       "version": "1.1.1",
-       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg=",
-       "dev": true
-     },
-@@ -43,6 +54,11 @@
-         "negotiator": "0.6.1"
-       }
-     },
-+=======
-+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-+      "dev": true
-+    },
-+>>>>>>> .their
-     "acorn": {
-       "version": "4.0.13",
-       "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
-@@ -109,12 +125,15 @@
-       "integrity": "sha1-anmQQ3ynNtXhKI25K9MmbV9csqo=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "address": {
-       "version": "1.0.3",
-       "resolved": "https://registry.npmjs.org/address/-/address-1.0.3.tgz",
-       "integrity": "sha512-z55ocwKBRLryBs394Sm3ushTtBeg6VAeuku7utSoSnsJKvKcnXFIyC6vh27n3rXyxSgkJBBCAvyOn7gSUcTYjg==",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "agent-base": {
-       "version": "2.1.1",
-       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz",
-@@ -192,7 +211,11 @@
-         "string-width": {
-           "version": "2.1.1",
-           "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
-+=======
-+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "is-fullwidth-code-point": "2.0.0",
-@@ -231,13 +254,18 @@
-     "anymatch": {
-       "version": "1.3.2",
-       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-VT3Lj5HjyImEXf26NMd3IbkLnXo=",
-+=======
-+      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "micromatch": "2.3.11",
-         "normalize-path": "2.1.1"
-       }
-     },
-+<<<<<<< .our
-     "arch": {
-       "version": "2.1.1",
-       "resolved": "https://registry.npmjs.org/arch/-/arch-2.1.1.tgz",
-@@ -250,6 +278,8 @@
-       "integrity": "sha512-XxNTUzKnz1ctK3ZIcI2XUPlD96wbHP2nGqkPKpvk/HNRlPveYrXIVSTk9m3LcqOgDPg3B1nMvdV/K8wZd7PG4w==",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "argparse": {
-       "version": "1.0.10",
-       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-@@ -259,6 +289,7 @@
-         "sprintf-js": "1.0.3"
-       }
-     },
-+<<<<<<< .our
-     "args": {
-       "version": "4.0.0",
-       "resolved": "https://registry.npmjs.org/args/-/args-4.0.0.tgz",
-@@ -314,6 +345,8 @@
-         }
-       }
-     },
-+=======
-+>>>>>>> .their
-     "arr-diff": {
-       "version": "2.0.0",
-       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-@@ -326,7 +359,11 @@
-     "arr-flatten": {
-       "version": "1.1.0",
-       "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE=",
-+=======
-+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "array-filter": {
-@@ -347,12 +384,15 @@
-       "integrity": "sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "array-iterate": {
-       "version": "1.1.2",
-       "resolved": "https://registry.npmjs.org/array-iterate/-/array-iterate-1.1.2.tgz",
-       "integrity": "sha512-1hWSHTIlG/8wtYD+PPX5AOBtKWngpDFjrsrHgZpe+JdgNGz0udYu6ZIkAa/xuenIUEqFv7DvE2Yr60jxweJSrQ==",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "array-map": {
-       "version": "0.0.0",
-       "resolved": "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz",
-@@ -393,7 +433,11 @@
-       "dev": true,
-       "requires": {
-         "define-properties": "1.1.2",
-+<<<<<<< .our
-         "es-abstract": "1.11.0"
-+=======
-+        "es-abstract": "1.10.0"
-+>>>>>>> .their
-       }
-     },
-     "arrify": {
-@@ -409,7 +453,11 @@
-       "dev": true,
-       "requires": {
-         "chromium-pickle-js": "0.1.0",
-+<<<<<<< .our
-         "commander": "2.15.1",
-+=======
-+        "commander": "2.15.0",
-+>>>>>>> .their
-         "cuint": "0.2.2",
-         "glob": "6.0.4",
-         "minimatch": "3.0.4",
-@@ -431,7 +479,11 @@
-       "requires": {
-         "bn.js": "4.11.8",
-         "inherits": "2.0.3",
-+<<<<<<< .our
-         "minimalistic-assert": "1.0.1"
-+=======
-+        "minimalistic-assert": "1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "assert": {
-@@ -464,12 +516,15 @@
-       "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "async-each": {
-       "version": "1.0.1",
-       "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz",
-       "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "asynckit": {
-       "version": "0.4.0",
-       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-@@ -483,9 +538,15 @@
-       "dev": true
-     },
-     "aws4": {
-+<<<<<<< .our
-       "version": "1.7.0",
-       "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz",
-       "integrity": "sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w==",
-+=======
-+      "version": "1.6.0",
-+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-+      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "babel-code-frame": {
-@@ -499,12 +560,15 @@
-         "js-tokens": "3.0.2"
-       }
-     },
-+<<<<<<< .our
-     "bail": {
-       "version": "1.0.3",
-       "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.3.tgz",
-       "integrity": "sha512-1X8CnjFVQ+a+KW36uBNMTU5s8+v5FzeqrP7hTG5aTb4aPreSbZJlhwPon9VKMuEVgV++JM+SQrALY3kr7eswdg==",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "balanced-match": {
-       "version": "1.0.0",
-       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-@@ -512,6 +576,7 @@
-       "dev": true
-     },
-     "base64-js": {
-+<<<<<<< .our
-       "version": "1.3.0",
-       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
-       "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==",
-@@ -534,6 +599,13 @@
-         }
-       }
-     },
-+=======
-+      "version": "1.2.3",
-+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.3.tgz",
-+      "integrity": "sha512-MsAhsUW1GxCdgYSO6tAfZrNapmUKk7mWx/k5mFY/A1gBtkaCaNapTg+FExCw1r9yeaZhqx/xPg43xgTFH6KL5w==",
-+      "dev": true
-+    },
-+>>>>>>> .their
-     "bcrypt-pbkdf": {
-       "version": "1.0.1",
-       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
-@@ -554,6 +626,7 @@
-         "chainsaw": "0.1.0"
-       }
-     },
-+<<<<<<< .our
-     "binary-extensions": {
-       "version": "1.11.0",
-       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz",
-@@ -568,6 +641,15 @@
-       "requires": {
-         "readable-stream": "2.3.6",
-         "safe-buffer": "5.1.2"
-+=======
-+    "bl": {
-+      "version": "1.2.1",
-+      "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.1.tgz",
-+      "integrity": "sha1-ysMo977kVzDUBLaSID/LWQ4XLV4=",
-+      "dev": true,
-+      "requires": {
-+        "readable-stream": "2.3.5"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -577,31 +659,52 @@
-           "dev": true
-         },
-         "readable-stream": {
-+<<<<<<< .our
-           "version": "2.3.6",
-           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-+=======
-+          "version": "2.3.5",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
-+          "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-             "process-nextick-args": "2.0.0",
-+<<<<<<< .our
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-+=======
-+            "safe-buffer": "5.1.1",
-+            "string_decoder": "1.0.3",
-+>>>>>>> .their
-             "util-deprecate": "1.0.2"
-           }
-         },
-         "string_decoder": {
-+<<<<<<< .our
-           "version": "1.1.1",
-           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-             "safe-buffer": "5.1.2"
-+=======
-+          "version": "1.0.3",
-+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-+          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-+          "dev": true,
-+          "requires": {
-+            "safe-buffer": "5.1.1"
-+>>>>>>> .their
-           }
-         }
-       }
-     },
-+<<<<<<< .our
-     "bluebird": {
-       "version": "3.5.1",
-       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
-@@ -612,6 +715,12 @@
-       "version": "4.11.8",
-       "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-       "integrity": "sha1-LN4J617jQfSEdGuwMJsyU7GxRC8=",
-+=======
-+    "bn.js": {
-+      "version": "4.11.8",
-+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-+      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "boolbase": {
-@@ -637,7 +746,11 @@
-       "requires": {
-         "ansi-align": "2.0.0",
-         "camelcase": "4.1.0",
-+<<<<<<< .our
-         "chalk": "2.4.1",
-+=======
-+        "chalk": "2.3.2",
-+>>>>>>> .their
-         "cli-boxes": "1.0.0",
-         "string-width": "2.1.1",
-         "term-size": "1.2.0",
-@@ -666,14 +779,24 @@
-           "dev": true
-         },
-         "chalk": {
-+<<<<<<< .our
-           "version": "2.4.1",
-           "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
-           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
-+=======
-+          "version": "2.3.2",
-+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
-+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "ansi-styles": "3.2.1",
-             "escape-string-regexp": "1.0.5",
-+<<<<<<< .our
-             "supports-color": "5.4.0"
-+=======
-+            "supports-color": "5.3.0"
-+>>>>>>> .their
-           }
-         },
-         "has-flag": {
-@@ -691,7 +814,11 @@
-         "string-width": {
-           "version": "2.1.1",
-           "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
-+=======
-+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "is-fullwidth-code-point": "2.0.0",
-@@ -708,9 +835,15 @@
-           }
-         },
-         "supports-color": {
-+<<<<<<< .our
-           "version": "5.4.0",
-           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
-           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-+=======
-+          "version": "5.3.0",
-+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
-+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "has-flag": "3.0.0"
-@@ -746,15 +879,25 @@
-       "dev": true
-     },
-     "browser-pack": {
-+<<<<<<< .our
-       "version": "6.1.0",
-       "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-6.1.0.tgz",
-       "integrity": "sha512-erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA==",
-+=======
-+      "version": "6.0.4",
-+      "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.4.tgz",
-+      "integrity": "sha512-Q4Rvn7P6ObyWfc4stqLWHtG1MJ8vVtjgT24Zbu+8UTzxYuZouqZsmNRRTFVMY/Ux0eIKv1d+JWzsInTX+fdHPQ==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "JSONStream": "1.3.2",
-         "combine-source-map": "0.8.0",
-         "defined": "1.0.0",
-+<<<<<<< .our
-         "safe-buffer": "5.1.2",
-+=======
-+        "safe-buffer": "5.1.1",
-+>>>>>>> .their
-         "through2": "2.0.3",
-         "umd": "3.0.3"
-       }
-@@ -784,7 +927,11 @@
-       "requires": {
-         "JSONStream": "1.3.2",
-         "assert": "1.4.1",
-+<<<<<<< .our
-         "browser-pack": "6.1.0",
-+=======
-+        "browser-pack": "6.0.4",
-+>>>>>>> .their
-         "browser-resolve": "1.11.2",
-         "browserify-zlib": "0.1.4",
-         "buffer": "4.9.1",
-@@ -803,8 +950,13 @@
-         "htmlescape": "1.1.1",
-         "https-browserify": "0.0.1",
-         "inherits": "2.0.3",
-+<<<<<<< .our
-         "insert-module-globals": "7.0.6",
-         "labeled-stream-splicer": "2.0.1",
-+=======
-+        "insert-module-globals": "7.0.2",
-+        "labeled-stream-splicer": "2.0.0",
-+>>>>>>> .their
-         "module-deps": "4.1.1",
-         "os-browserify": "0.1.2",
-         "parents": "1.0.1",
-@@ -813,12 +965,21 @@
-         "punycode": "1.4.1",
-         "querystring-es3": "0.2.1",
-         "read-only-stream": "2.0.0",
-+<<<<<<< .our
-         "readable-stream": "2.3.6",
-         "resolve": "1.7.1",
-         "shasum": "1.0.2",
-         "shell-quote": "1.6.1",
-         "stream-browserify": "2.0.1",
-         "stream-http": "2.8.2",
-+=======
-+        "readable-stream": "2.3.5",
-+        "resolve": "1.5.0",
-+        "shasum": "1.0.2",
-+        "shell-quote": "1.6.1",
-+        "stream-browserify": "2.0.1",
-+        "stream-http": "2.8.1",
-+>>>>>>> .their
-         "string_decoder": "0.10.31",
-         "subarg": "1.0.0",
-         "syntax-error": "1.4.0",
-@@ -834,7 +995,11 @@
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "fs.realpath": "1.0.0",
-@@ -852,27 +1017,47 @@
-           "dev": true
-         },
-         "readable-stream": {
-+<<<<<<< .our
-           "version": "2.3.6",
-           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-+=======
-+          "version": "2.3.5",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
-+          "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-             "process-nextick-args": "2.0.0",
-+<<<<<<< .our
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-+=======
-+            "safe-buffer": "5.1.1",
-+            "string_decoder": "1.0.3",
-+>>>>>>> .their
-             "util-deprecate": "1.0.2"
-           },
-           "dependencies": {
-             "string_decoder": {
-+<<<<<<< .our
-               "version": "1.1.1",
-               "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-               "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-               "dev": true,
-               "requires": {
-                 "safe-buffer": "5.1.2"
-+=======
-+              "version": "1.0.3",
-+              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-+              "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-+              "dev": true,
-+              "requires": {
-+                "safe-buffer": "5.1.1"
-+>>>>>>> .their
-               }
-             }
-           }
-@@ -880,13 +1065,20 @@
-       }
-     },
-     "browserify-aes": {
-+<<<<<<< .our
-       "version": "1.2.0",
-       "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-       "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
-+=======
-+      "version": "1.1.1",
-+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.1.1.tgz",
-+      "integrity": "sha512-UGnTYAnB2a3YuYKIRy1/4FB2HdM866E0qC46JXvVTYKlBlZlnvfpSfY6OKfXZAkv70eJ2a1SqzpAo5CRhZGDFg==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "buffer-xor": "1.0.3",
-         "cipher-base": "1.0.4",
-+<<<<<<< .our
-         "create-hash": "1.2.0",
-         "evp_bytestokey": "1.0.3",
-         "inherits": "2.0.3",
-@@ -901,13 +1093,35 @@
-       "requires": {
-         "browserify-aes": "1.2.0",
-         "browserify-des": "1.0.1",
-+=======
-+        "create-hash": "1.1.3",
-+        "evp_bytestokey": "1.0.3",
-+        "inherits": "2.0.3",
-+        "safe-buffer": "5.1.1"
-+      }
-+    },
-+    "browserify-cipher": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz",
-+      "integrity": "sha1-mYgkSHS/XtTijalWZtzWasj8Njo=",
-+      "dev": true,
-+      "requires": {
-+        "browserify-aes": "1.1.1",
-+        "browserify-des": "1.0.0",
-+>>>>>>> .their
-         "evp_bytestokey": "1.0.3"
-       }
-     },
-     "browserify-des": {
-+<<<<<<< .our
-       "version": "1.0.1",
-       "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.1.tgz",
-       "integrity": "sha512-zy0Cobe3hhgpiOM32Tj7KQ3Vl91m0njwsjzZQK1L+JDf11dzP9qIvjreVinsvXrgfjhStXwUWAEpB9D7Gwmayw==",
-+=======
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz",
-+      "integrity": "sha1-2qJ3cXRwki7S/hhZQRihdUOXId0=",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "cipher-base": "1.0.4",
-@@ -933,11 +1147,19 @@
-       "requires": {
-         "bn.js": "4.11.8",
-         "browserify-rsa": "4.0.1",
-+<<<<<<< .our
-         "create-hash": "1.2.0",
-         "create-hmac": "1.1.7",
-         "elliptic": "6.4.0",
-         "inherits": "2.0.3",
-         "parse-asn1": "5.1.1"
-+=======
-+        "create-hash": "1.1.3",
-+        "create-hmac": "1.1.6",
-+        "elliptic": "6.4.0",
-+        "inherits": "2.0.3",
-+        "parse-asn1": "5.1.0"
-+>>>>>>> .their
-       }
-     },
-     "browserify-zlib": {
-@@ -955,8 +1177,13 @@
-       "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "base64-js": "1.3.0",
-         "ieee754": "1.1.11",
-+=======
-+        "base64-js": "1.2.3",
-+        "ieee754": "1.1.8",
-+>>>>>>> .their
-         "isarray": "1.0.0"
-       },
-       "dependencies": {
-@@ -968,6 +1195,7 @@
-         }
-       }
-     },
-+<<<<<<< .our
-     "buffer-alloc": {
-       "version": "1.1.0",
-       "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.1.0.tgz",
-@@ -996,6 +1224,8 @@
-       "integrity": "sha512-83apNb8KK0Se60UE1+4Ukbe3HbfELJ6UlI4ldtOGs7So4KD26orJM8hIY9lxdzP+UpItH1Yh/Y8GUvNFWFFRxA==",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "buffer-xor": {
-       "version": "1.0.3",
-       "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-@@ -1020,12 +1250,15 @@
-       "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "bytes": {
-       "version": "3.0.0",
-       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-       "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "cached-path-relative": {
-       "version": "1.0.1",
-       "resolved": "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.1.tgz",
-@@ -1085,12 +1318,15 @@
-       "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "ccount": {
-       "version": "1.0.3",
-       "resolved": "https://registry.npmjs.org/ccount/-/ccount-1.0.3.tgz",
-       "integrity": "sha512-Jt9tIBkRc9POUof7QA/VwWd+58fKkEEfI+/t1/eOlxKM7ZhrczNzMFefge7Ai+39y1pR/pP6cI19guHy3FSLmw==",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "center-align": {
-       "version": "0.1.3",
-       "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
-@@ -1132,6 +1368,7 @@
-         }
-       }
-     },
-+<<<<<<< .our
-     "character-entities": {
-       "version": "1.2.2",
-       "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.2.tgz",
-@@ -1160,6 +1397,12 @@
-       "version": "1.2.0",
-       "resolved": "https://registry.npmjs.org/check-for-leaks/-/check-for-leaks-1.2.0.tgz",
-       "integrity": "sha1-6jtQFk6XV3kzLGKBMZX/jGr4Jsw=",
-+=======
-+    "check-for-leaks": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/check-for-leaks/-/check-for-leaks-1.2.0.tgz",
-+      "integrity": "sha512-bJ2Bzo6RtsYqamMnsjtVzowGvBNVrR5IPK8Bd+lx5W1TNgOKMsF+AyNHVkqFqO7cpDZNfny5SaqH6gEovpV5Gw==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "anymatch": "1.3.2",
-@@ -1201,6 +1444,7 @@
-         "lodash.some": "4.6.0"
-       }
-     },
-+<<<<<<< .our
-     "chokidar": {
-       "version": "1.7.0",
-       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
-@@ -1218,6 +1462,8 @@
-         "readdirp": "2.1.0"
-       }
-     },
-+=======
-+>>>>>>> .their
-     "chownr": {
-       "version": "1.0.1",
-       "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz",
-@@ -1239,16 +1485,25 @@
-     "cipher-base": {
-       "version": "1.0.4",
-       "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-h2Dk7MJy9MNjUy+SbYdKriwTl94=",
-       "dev": true,
-       "requires": {
-         "inherits": "2.0.3",
-         "safe-buffer": "5.1.2"
-+=======
-+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-+      "dev": true,
-+      "requires": {
-+        "inherits": "2.0.3",
-+        "safe-buffer": "5.1.1"
-+>>>>>>> .their
-       }
-     },
-     "circular-json": {
-       "version": "0.3.3",
-       "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-gVyZ6oT2gJUp0vRXkb34JxE1LWY=",
-       "dev": true
-     },
-@@ -1279,6 +1534,11 @@
-         }
-       }
-     },
-+=======
-+      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
-+      "dev": true
-+    },
-+>>>>>>> .their
-     "clean-deep": {
-       "version": "2.0.2",
-       "resolved": "https://registry.npmjs.org/clean-deep/-/clean-deep-2.0.2.tgz",
-@@ -1317,6 +1577,7 @@
-       "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "clipboardy": {
-       "version": "1.2.3",
-       "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-1.2.3.tgz",
-@@ -1344,6 +1605,8 @@
-         }
-       }
-     },
-+=======
-+>>>>>>> .their
-     "cliui": {
-       "version": "2.1.0",
-       "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-@@ -1377,12 +1640,15 @@
-       "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "collapse-white-space": {
-       "version": "1.0.4",
-       "resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.4.tgz",
-       "integrity": "sha512-YfQ1tAUZm561vpYD+5eyWN8+UsceQbSrqqlc/6zDY2gtAE+uZLSdkkovhnGpmCThsvKBFakq4EdY/FF93E8XIw==",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "color-convert": {
-       "version": "1.9.1",
-       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz",
-@@ -1399,9 +1665,15 @@
-       "dev": true
-     },
-     "colors": {
-+<<<<<<< .our
-       "version": "1.2.5",
-       "resolved": "https://registry.npmjs.org/colors/-/colors-1.2.5.tgz",
-       "integrity": "sha512-erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg==",
-+=======
-+      "version": "1.2.1",
-+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.2.1.tgz",
-+      "integrity": "sha512-s8+wktIuDSLffCywiwSxQOMqtPxML11a/dtHE17tMn4B1MSWw/C22EKf7M2KGUBcDaVFEGT+S8N02geDXeuNKg==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "combine-source-map": {
-@@ -1426,9 +1698,15 @@
-       }
-     },
-     "commander": {
-+<<<<<<< .our
-       "version": "2.15.1",
-       "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
-       "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
-+=======
-+      "version": "2.15.0",
-+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.0.tgz",
-+      "integrity": "sha512-7B1ilBwtYSbetCgTY1NJFg+gVpestg0fdA1MhC1Vs4ssyfSXnCAjFr+QcQM9/RedXC0EaUx1sG8Smgw2VfgKEg==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "compare-func": {
-@@ -1441,6 +1719,7 @@
-         "dot-prop": "3.0.0"
-       }
-     },
-+<<<<<<< .our
-     "compressible": {
-       "version": "2.0.14",
-       "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.14.tgz",
-@@ -1473,6 +1752,8 @@
-         "vary": "1.1.2"
-       }
-     },
-+=======
-+>>>>>>> .their
-     "concat-map": {
-       "version": "0.0.1",
-       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-@@ -1519,14 +1800,24 @@
-       }
-     },
-     "configstore": {
-+<<<<<<< .our
-       "version": "3.1.2",
-       "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz",
-       "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==",
-+=======
-+      "version": "3.1.1",
-+      "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz",
-+      "integrity": "sha512-5oNkD/L++l0O6xGXxb1EWS7SivtjfGQlRyxJsYgE0Z495/L81e2h4/d3r969hoPXuFItzNOKMtsXgYG4c7dYvw==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "dot-prop": "4.2.0",
-         "graceful-fs": "4.1.11",
-+<<<<<<< .our
-         "make-dir": "1.3.0",
-+=======
-+        "make-dir": "1.2.0",
-+>>>>>>> .their
-         "unique-string": "1.0.0",
-         "write-file-atomic": "2.3.0",
-         "xdg-basedir": "3.0.0"
-@@ -1535,7 +1826,11 @@
-         "dot-prop": {
-           "version": "4.2.0",
-           "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-HxngwuGqDjJ5fEl5nyg3rGr2nFc=",
-+=======
-+          "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "is-obj": "1.0.1"
-@@ -1564,6 +1859,7 @@
-       "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "content-type": {
-       "version": "1.0.4",
-       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-@@ -1587,6 +1883,25 @@
-         "conventional-changelog-jscs": "0.1.0",
-         "conventional-changelog-jshint": "0.3.8",
-         "conventional-changelog-preset-loader": "1.1.8"
-+=======
-+    "conventional-changelog": {
-+      "version": "1.1.18",
-+      "resolved": "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.18.tgz",
-+      "integrity": "sha512-swf5bqhm7PsY2cw6zxuPy6+rZiiGwEpQnrWki+L+z2oZI53QSYwU4brpljmmWss821AsiwmVL+7V6hP+ER+TBA==",
-+      "dev": true,
-+      "requires": {
-+        "conventional-changelog-angular": "1.6.6",
-+        "conventional-changelog-atom": "0.2.4",
-+        "conventional-changelog-codemirror": "0.3.4",
-+        "conventional-changelog-core": "2.0.5",
-+        "conventional-changelog-ember": "0.3.6",
-+        "conventional-changelog-eslint": "1.0.5",
-+        "conventional-changelog-express": "0.3.4",
-+        "conventional-changelog-jquery": "0.1.0",
-+        "conventional-changelog-jscs": "0.1.0",
-+        "conventional-changelog-jshint": "0.3.4",
-+        "conventional-changelog-preset-loader": "1.1.6"
-+>>>>>>> .their
-       }
-     },
-     "conventional-changelog-angular": {
-@@ -1600,15 +1915,22 @@
-       }
-     },
-     "conventional-changelog-atom": {
-+<<<<<<< .our
-       "version": "0.2.8",
-       "resolved": "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.2.8.tgz",
-       "integrity": "sha512-8pPZqhMbrnltNBizjoDCb/Sz85KyUXNDQxuAEYAU5V/eHn0okMBVjqc8aHWYpHrytyZWvMGbayOlDv7i8kEf6g==",
-+=======
-+      "version": "0.2.4",
-+      "resolved": "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.2.4.tgz",
-+      "integrity": "sha512-4+hmbBwcAwx1XzDZ4aEOxk/ONU0iay10G0u/sld16ksgnRUHN7CxmZollm3FFaptr6VADMq1qxomA+JlpblBlg==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "q": "1.5.1"
-       }
-     },
-     "conventional-changelog-cli": {
-+<<<<<<< .our
-       "version": "1.3.22",
-       "resolved": "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.22.tgz",
-       "integrity": "sha512-pnjdIJbxjkZ5VdAX/H1wndr1G10CY8MuZgnXuJhIHglOXfIrXygb7KZC836GW9uo1u8PjEIvIw/bKX0lOmOzZg==",
-@@ -1618,19 +1940,37 @@
-         "conventional-changelog": "1.1.24",
-         "lodash": "4.17.10",
-         "meow": "4.0.1",
-+=======
-+      "version": "1.3.16",
-+      "resolved": "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.16.tgz",
-+      "integrity": "sha512-zNDG/rNbh29Z+d6zzrHN63dFZ4q9k1Ri0V8lXGw1q2ia6+FaE7AqJKccObbBFRmRISXpFESrqZiXpM4QeA84YA==",
-+      "dev": true,
-+      "requires": {
-+        "add-stream": "1.0.0",
-+        "conventional-changelog": "1.1.18",
-+        "lodash": "4.17.5",
-+        "meow": "4.0.0",
-+>>>>>>> .their
-         "tempfile": "1.1.1"
-       }
-     },
-     "conventional-changelog-codemirror": {
-+<<<<<<< .our
-       "version": "0.3.8",
-       "resolved": "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.3.8.tgz",
-       "integrity": "sha512-3HFZKtBXTaUCHvz7ai6nk2+psRIkldDoNzCsom0egDtVmPsvvHZkzjynhdQyULfacRSsBTaiQ0ol6nBOL4dDiQ==",
-+=======
-+      "version": "0.3.4",
-+      "resolved": "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.3.4.tgz",
-+      "integrity": "sha512-8M7pGgQVzRU//vG3rFlLYqqBywOLxu9XM0/lc1/1Ll7RuKA79PgK9TDpuPmQDHFnqGS7D1YiZpC3Z0D9AIYExg==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "q": "1.5.1"
-       }
-     },
-     "conventional-changelog-core": {
-+<<<<<<< .our
-       "version": "2.0.11",
-       "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-2.0.11.tgz",
-       "integrity": "sha512-HvTE6RlqeEZ/NFPtQeFLsIDOLrGP3bXYr7lFLMhCVsbduF1MXIe8OODkwMFyo1i9ku9NWBwVnVn0jDmIFXjDRg==",
-@@ -1644,6 +1984,21 @@
-         "git-remote-origin-url": "2.0.0",
-         "git-semver-tags": "1.3.6",
-         "lodash": "4.17.10",
-+=======
-+      "version": "2.0.5",
-+      "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-2.0.5.tgz",
-+      "integrity": "sha512-lP1s7Z3NyEFcG78bWy7GG7nXsq9OpAJgo2xbyAlVBDweLSL5ghvyEZlkEamnAQpIUVK0CAVhs8nPvCiQuXT/VA==",
-+      "dev": true,
-+      "requires": {
-+        "conventional-changelog-writer": "3.0.4",
-+        "conventional-commits-parser": "2.1.5",
-+        "dateformat": "3.0.3",
-+        "get-pkg-repo": "1.4.0",
-+        "git-raw-commits": "1.3.4",
-+        "git-remote-origin-url": "2.0.0",
-+        "git-semver-tags": "1.3.4",
-+        "lodash": "4.17.5",
-+>>>>>>> .their
-         "normalize-package-data": "2.4.0",
-         "q": "1.5.1",
-         "read-pkg": "1.1.0",
-@@ -1652,27 +2007,45 @@
-       }
-     },
-     "conventional-changelog-ember": {
-+<<<<<<< .our
-       "version": "0.3.12",
-       "resolved": "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.3.12.tgz",
-       "integrity": "sha512-mmJzA7uzbrOqeF89dMMi6z17O07ORTXlTMArnLG9ZTX4oLaKNolUlxFUFlFm9JUoVWajVpaHQWjxH1EOQ+ARoQ==",
-+=======
-+      "version": "0.3.6",
-+      "resolved": "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.3.6.tgz",
-+      "integrity": "sha512-hBM1xb5IrjNtsjXaGryPF/Wn36cwyjkNeqX/CIDbJv/1kRFBHsWoSPYBiNVEpg8xE5fcK4DbPhGTDN2sVoPeiA==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "q": "1.5.1"
-       }
-     },
-     "conventional-changelog-eslint": {
-+<<<<<<< .our
-       "version": "1.0.9",
-       "resolved": "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-1.0.9.tgz",
-       "integrity": "sha512-h87nfVh2fdk9fJIvz26wCBsbDC/KxqCc5wSlNMZbXcARtbgNbNDIF7Y7ctokFdnxkzVdaHsbINkh548T9eBA7Q==",
-+=======
-+      "version": "1.0.5",
-+      "resolved": "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-1.0.5.tgz",
-+      "integrity": "sha512-7NUv+gMOS8Y49uPFRgF7kuLZqpnrKa2bQMZZsc62NzvaJmjUktnV03PYHuXhTDEHt5guvV9gyEFtUpgHCDkojg==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "q": "1.5.1"
-       }
-     },
-     "conventional-changelog-express": {
-+<<<<<<< .our
-       "version": "0.3.6",
-       "resolved": "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.3.6.tgz",
-       "integrity": "sha512-3iWVtBJZ9RnRnZveNDzOD8QRn6g6vUif0qVTWWyi5nUIAbuN1FfPVyKdAlJJfp5Im+dE8Kiy/d2SpaX/0X678Q==",
-+=======
-+      "version": "0.3.4",
-+      "resolved": "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.3.4.tgz",
-+      "integrity": "sha512-M+UUb715TXT6l9vyMf4HYvAepnQn0AYTcPi6KHrFsd80E0HErjQnqStBg8i3+Qm7EV9+RyATQEnIhSzHbdQ7+A==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "q": "1.5.1"
-@@ -1697,9 +2070,15 @@
-       }
-     },
-     "conventional-changelog-jshint": {
-+<<<<<<< .our
-       "version": "0.3.8",
-       "resolved": "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.3.8.tgz",
-       "integrity": "sha512-hn9QU4ZI/5V50wKPJNPGT4gEWgiBFpV6adieILW4MaUFynuDYOvQ71EMSj3EznJyKi/KzuXpc9dGmX8njZMjig==",
-+=======
-+      "version": "0.3.4",
-+      "resolved": "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.3.4.tgz",
-+      "integrity": "sha512-CdrqwDgL56b176FVxHmhuOvnO1dRDQvrMaHyuIVjcFlOXukATz2wVT17g8jQU3LvybVbyXvJRbdD5pboo7/1KQ==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "compare-func": "1.3.2",
-@@ -1707,6 +2086,7 @@
-       }
-     },
-     "conventional-changelog-preset-loader": {
-+<<<<<<< .our
-       "version": "1.1.8",
-       "resolved": "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-1.1.8.tgz",
-       "integrity": "sha512-MkksM4G4YdrMlT2MbTsV2F6LXu/hZR0Tc/yenRrDIKRwBl/SP7ER4ZDlglqJsCzLJi4UonBc52Bkm5hzrOVCcw==",
-@@ -1725,12 +2105,33 @@
-         "json-stringify-safe": "5.0.1",
-         "lodash": "4.17.10",
-         "meow": "4.0.1",
-+=======
-+      "version": "1.1.6",
-+      "resolved": "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-1.1.6.tgz",
-+      "integrity": "sha512-yWPIP9wwsCKeUSPYApnApWhKIDjWRIX/uHejGS1tYfEsQR/bwpDFET7LYiHT+ujNbrlf6h1s3NlPGheOd4yJRQ==",
-+      "dev": true
-+    },
-+    "conventional-changelog-writer": {
-+      "version": "3.0.4",
-+      "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-3.0.4.tgz",
-+      "integrity": "sha512-EUf/hWiEj3IOa5Jk8XDzM6oS0WgijlYGkUfLc+mDnLH9RwpZqhYIBwgJHWHzEB4My013wx2FhmUu45P6tQrucw==",
-+      "dev": true,
-+      "requires": {
-+        "compare-func": "1.3.2",
-+        "conventional-commits-filter": "1.1.5",
-+        "dateformat": "3.0.3",
-+        "handlebars": "4.0.11",
-+        "json-stringify-safe": "5.0.1",
-+        "lodash": "4.17.5",
-+        "meow": "4.0.0",
-+>>>>>>> .their
-         "semver": "5.5.0",
-         "split": "1.0.1",
-         "through2": "2.0.3"
-       }
-     },
-     "conventional-commits-filter": {
-+<<<<<<< .our
-       "version": "1.1.6",
-       "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-1.1.6.tgz",
-       "integrity": "sha512-KcDgtCRKJCQhyk6VLT7zR+ZOyCnerfemE/CsR3iQpzRRFbLEs0Y6rwk3mpDvtOh04X223z+1xyJ582Stfct/0Q==",
-@@ -1744,12 +2145,32 @@
-       "version": "2.1.7",
-       "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.1.7.tgz",
-       "integrity": "sha512-BoMaddIEJ6B4QVMSDu9IkVImlGOSGA1I2BQyOZHeLQ6qVOJLcLKn97+fL6dGbzWEiqDzfH4OkcveULmeq2MHFQ==",
-+=======
-+      "version": "1.1.5",
-+      "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-1.1.5.tgz",
-+      "integrity": "sha512-mj3+WLj8UZE72zO9jocZjx8+W4Bwnx/KHoIz1vb4F8XUXj0XSjp8Y3MFkpRyIpsRiCBX+DkDjxGKF/nfeu7BGw==",
-+      "dev": true,
-+      "requires": {
-+        "is-subset": "0.1.1",
-+        "modify-values": "1.0.0"
-+      }
-+    },
-+    "conventional-commits-parser": {
-+      "version": "2.1.5",
-+      "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.1.5.tgz",
-+      "integrity": "sha512-jaAP61py+ISMF3/n3yIiIuY5h6mJlucOqawu5mLB1HaQADLvg/y5UB3pT7HSucZJan34lp7+7ylQPfbKEGmxrA==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "JSONStream": "1.3.2",
-         "is-text-path": "1.0.1",
-+<<<<<<< .our
-         "lodash": "4.17.10",
-         "meow": "4.0.1",
-+=======
-+        "lodash": "4.17.5",
-+        "meow": "4.0.0",
-+>>>>>>> .their
-         "split2": "2.2.0",
-         "through2": "2.0.3",
-         "trim-off-newlines": "1.0.1"
-@@ -1768,9 +2189,15 @@
-       "dev": true
-     },
-     "create-ecdh": {
-+<<<<<<< .our
-       "version": "4.0.3",
-       "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
-       "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
-+=======
-+      "version": "4.0.0",
-+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz",
-+      "integrity": "sha1-iIxyNZbN92EvZJgjPuvXo1MBc30=",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "bn.js": "4.11.8",
-@@ -1787,13 +2214,20 @@
-       }
-     },
-     "create-hash": {
-+<<<<<<< .our
-       "version": "1.2.0",
-       "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-       "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-+=======
-+      "version": "1.1.3",
-+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz",
-+      "integrity": "sha1-YGBCrIuSYnUPSDyt2rD1gZFy2P0=",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "cipher-base": "1.0.4",
-         "inherits": "2.0.3",
-+<<<<<<< .our
-         "md5.js": "1.3.4",
-         "ripemd160": "2.0.2",
-         "sha.js": "2.4.11"
-@@ -1811,6 +2245,24 @@
-         "ripemd160": "2.0.2",
-         "safe-buffer": "5.1.2",
-         "sha.js": "2.4.11"
-+=======
-+        "ripemd160": "2.0.1",
-+        "sha.js": "2.4.10"
-+      }
-+    },
-+    "create-hmac": {
-+      "version": "1.1.6",
-+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz",
-+      "integrity": "sha1-rLniIaThe9sHbpBlfEK5PjcmzwY=",
-+      "dev": true,
-+      "requires": {
-+        "cipher-base": "1.0.4",
-+        "create-hash": "1.1.3",
-+        "inherits": "2.0.3",
-+        "ripemd160": "2.0.1",
-+        "safe-buffer": "5.1.1",
-+        "sha.js": "2.4.10"
-+>>>>>>> .their
-       }
-     },
-     "cross-spawn": {
-@@ -1819,7 +2271,11 @@
-       "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "lru-cache": "4.1.3",
-+=======
-+        "lru-cache": "4.1.2",
-+>>>>>>> .their
-         "shebang-command": "1.2.0",
-         "which": "1.3.0"
-       }
-@@ -1836,7 +2292,11 @@
-         "boom": {
-           "version": "5.2.0",
-           "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-XdnabuOl8wIHdDYpDLcX0/SlTgI=",
-+=======
-+          "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "hoek": "4.2.1"
-@@ -1850,6 +2310,7 @@
-       "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "browserify-cipher": "1.0.1",
-         "browserify-sign": "4.0.4",
-         "create-ecdh": "4.0.3",
-@@ -1859,6 +2320,17 @@
-         "inherits": "2.0.3",
-         "pbkdf2": "3.0.16",
-         "public-encrypt": "4.0.2",
-+=======
-+        "browserify-cipher": "1.0.0",
-+        "browserify-sign": "4.0.4",
-+        "create-ecdh": "4.0.0",
-+        "create-hash": "1.1.3",
-+        "create-hmac": "1.1.6",
-+        "diffie-hellman": "5.0.2",
-+        "inherits": "2.0.3",
-+        "pbkdf2": "3.0.14",
-+        "public-encrypt": "4.0.0",
-+>>>>>>> .their
-         "randombytes": "2.0.6",
-         "randomfill": "1.0.4"
-       }
-@@ -1924,7 +2396,11 @@
-       "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "es5-ext": "0.10.42"
-+=======
-+        "es5-ext": "0.10.40"
-+>>>>>>> .their
-       }
-     },
-     "dargs": {
-@@ -1960,7 +2436,11 @@
-     "debug": {
-       "version": "2.6.9",
-       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
-+=======
-+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "ms": "2.0.0"
-@@ -2018,9 +2498,15 @@
-       "dev": true
-     },
-     "deep-extend": {
-+<<<<<<< .our
-       "version": "0.5.1",
-       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz",
-       "integrity": "sha512-N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w==",
-+=======
-+      "version": "0.4.2",
-+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
-+      "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "deep-is": {
-@@ -2061,16 +2547,26 @@
-       "requires": {
-         "find-root": "1.1.0",
-         "glob": "7.1.2",
-+<<<<<<< .our
-         "ignore": "3.3.8",
-         "pkg-config": "1.1.1",
-         "run-parallel": "1.1.9",
-+=======
-+        "ignore": "3.3.7",
-+        "pkg-config": "1.1.1",
-+        "run-parallel": "1.1.7",
-+>>>>>>> .their
-         "uniq": "1.0.1"
-       },
-       "dependencies": {
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "fs.realpath": "1.0.0",
-@@ -2091,7 +2587,11 @@
-       "requires": {
-         "globby": "5.0.0",
-         "is-path-cwd": "1.0.0",
-+<<<<<<< .our
-         "is-path-in-cwd": "1.0.1",
-+=======
-+        "is-path-in-cwd": "1.0.0",
-+>>>>>>> .their
-         "object-assign": "4.1.1",
-         "pify": "2.3.0",
-         "pinkie-promise": "2.0.1",
-@@ -2104,12 +2604,15 @@
-       "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "depd": {
-       "version": "1.1.1",
-       "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
-       "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "deps-sort": {
-       "version": "2.0.0",
-       "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.0.tgz",
-@@ -2129,6 +2632,7 @@
-       "dev": true,
-       "requires": {
-         "inherits": "2.0.3",
-+<<<<<<< .our
-         "minimalistic-assert": "1.0.1"
-       }
-     },
-@@ -2146,6 +2650,9 @@
-       "requires": {
-         "address": "1.0.3",
-         "debug": "2.6.9"
-+=======
-+        "minimalistic-assert": "1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "detective": {
-@@ -2173,9 +2680,15 @@
-       "dev": true
-     },
-     "diffie-hellman": {
-+<<<<<<< .our
-       "version": "5.0.3",
-       "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-       "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
-+=======
-+      "version": "5.0.2",
-+      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz",
-+      "integrity": "sha1-tYNXOScM/ias9jIJn97SoH8gnl4=",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "bn.js": "4.11.8",
-@@ -2184,12 +2697,30 @@
-       }
-     },
-     "doctrine": {
-+<<<<<<< .our
-       "version": "2.1.0",
-       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-       "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-       "dev": true,
-       "requires": {
-         "esutils": "2.0.2"
-+=======
-+      "version": "1.5.0",
-+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
-+      "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
-+      "dev": true,
-+      "requires": {
-+        "esutils": "2.0.2",
-+        "isarray": "1.0.0"
-+      },
-+      "dependencies": {
-+        "isarray": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-+          "dev": true
-+        }
-+>>>>>>> .their
-       }
-     },
-     "dom-serializer": {
-@@ -2223,9 +2754,15 @@
-       "dev": true
-     },
-     "domhandler": {
-+<<<<<<< .our
-       "version": "2.4.2",
-       "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
-       "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
-+=======
-+      "version": "2.4.1",
-+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz",
-+      "integrity": "sha1-iS5HAAqZvlW783dP/qBWHYh5wlk=",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "domelementtype": "1.3.0"
-@@ -2266,9 +2803,15 @@
-       }
-     },
-     "dugite": {
-+<<<<<<< .our
-       "version": "1.63.0",
-       "resolved": "https://registry.npmjs.org/dugite/-/dugite-1.63.0.tgz",
-       "integrity": "sha512-CFd0sWTB2oouat0kJA4/rEQAeh6ZUvCDL9uFOaSBhLX+2CM/YL+ebKJXd8dYVIe8iVXmK5R9P31NVbRw4Ccoxw==",
-+=======
-+      "version": "1.60.0",
-+      "resolved": "https://registry.npmjs.org/dugite/-/dugite-1.60.0.tgz",
-+      "integrity": "sha512-HP5Qfx867ESOkrrEhXtxi72UQoNWaCSEcahGCmnBM/v+ldgbFu94s9CvG3tDcBtz1HJkvYEtkBd8V8Vb63nfUw==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "checksum": "0.1.1",
-@@ -2276,7 +2819,11 @@
-         "progress": "2.0.0",
-         "request": "2.85.0",
-         "rimraf": "2.6.2",
-+<<<<<<< .our
-         "tar": "4.4.2"
-+=======
-+        "tar": "4.4.0"
-+>>>>>>> .their
-       }
-     },
-     "duplexer2": {
-@@ -2285,7 +2832,11 @@
-       "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "readable-stream": "2.3.6"
-+=======
-+        "readable-stream": "2.3.5"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -2295,27 +2846,47 @@
-           "dev": true
-         },
-         "readable-stream": {
-+<<<<<<< .our
-           "version": "2.3.6",
-           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-+=======
-+          "version": "2.3.5",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
-+          "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-             "process-nextick-args": "2.0.0",
-+<<<<<<< .our
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-+=======
-+            "safe-buffer": "5.1.1",
-+            "string_decoder": "1.0.3",
-+>>>>>>> .their
-             "util-deprecate": "1.0.2"
-           }
-         },
-         "string_decoder": {
-+<<<<<<< .our
-           "version": "1.1.1",
-           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-             "safe-buffer": "5.1.2"
-+=======
-+          "version": "1.0.3",
-+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-+          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-+          "dev": true,
-+          "requires": {
-+            "safe-buffer": "5.1.1"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -2327,14 +2898,24 @@
-       "dev": true
-     },
-     "duplexify": {
-+<<<<<<< .our
-       "version": "3.6.0",
-       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz",
-       "integrity": "sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==",
-+=======
-+      "version": "3.5.4",
-+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.4.tgz",
-+      "integrity": "sha512-JzYSLYMhoVVBe8+mbHQ4KgpvHpm0DZpJuL8PY93Vyv1fW7jYJ90LoXa1di/CVbJM+TgMs91rbDapE/RNIfnJsA==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "end-of-stream": "1.4.1",
-         "inherits": "2.0.3",
-+<<<<<<< .our
-         "readable-stream": "2.3.6",
-+=======
-+        "readable-stream": "2.3.5",
-+>>>>>>> .their
-         "stream-shift": "1.0.0"
-       },
-       "dependencies": {
-@@ -2345,27 +2926,47 @@
-           "dev": true
-         },
-         "readable-stream": {
-+<<<<<<< .our
-           "version": "2.3.6",
-           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-+=======
-+          "version": "2.3.5",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
-+          "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-             "process-nextick-args": "2.0.0",
-+<<<<<<< .our
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-+=======
-+            "safe-buffer": "5.1.1",
-+            "string_decoder": "1.0.3",
-+>>>>>>> .their
-             "util-deprecate": "1.0.2"
-           }
-         },
-         "string_decoder": {
-+<<<<<<< .our
-           "version": "1.1.1",
-           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-             "safe-buffer": "5.1.2"
-+=======
-+          "version": "1.0.3",
-+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-+          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-+          "dev": true,
-+          "requires": {
-+            "safe-buffer": "5.1.1"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -2380,12 +2981,15 @@
-         "jsbn": "0.1.1"
-       }
-     },
-+<<<<<<< .our
-     "ee-first": {
-       "version": "1.1.1",
-       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "electabul": {
-       "version": "0.0.4",
-       "resolved": "https://registry.npmjs.org/electabul/-/electabul-0.0.4.tgz",
-@@ -2408,7 +3012,11 @@
-           "dev": true,
-           "requires": {
-             "chromium-pickle-js": "0.2.0",
-+<<<<<<< .our
-             "commander": "2.15.1",
-+=======
-+            "commander": "2.15.0",
-+>>>>>>> .their
-             "cuint": "0.2.2",
-             "glob": "6.0.4",
-             "minimatch": "3.0.4",
-@@ -2441,7 +3049,11 @@
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "fs.realpath": "1.0.0",
-@@ -2467,7 +3079,11 @@
-         "path-exists": "3.0.0",
-         "pify": "2.3.0",
-         "semver": "5.5.0",
-+<<<<<<< .our
-         "tar-fs": "1.16.2"
-+=======
-+        "tar-fs": "1.16.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "ora": {
-@@ -2523,6 +3139,7 @@
-       }
-     },
-     "electron-typescript-definitions": {
-+<<<<<<< .our
-       "version": "1.3.6",
-       "resolved": "https://registry.npmjs.org/electron-typescript-definitions/-/electron-typescript-definitions-1.3.6.tgz",
-       "integrity": "sha512-Wz6tPaaZ22lbfWwF9bzVSki7LMW96xilCT1M8eeNYZG6LcpA9x34jlrAZg5HZWTHXR2tfbTQhSmrY+FEVulD/A==",
-@@ -2538,6 +3155,23 @@
-         "rimraf": "2.6.2",
-         "tslint": "4.5.1",
-         "typescript": "2.9.2"
-+=======
-+      "version": "1.2.11",
-+      "resolved": "https://registry.npmjs.org/electron-typescript-definitions/-/electron-typescript-definitions-1.2.11.tgz",
-+      "integrity": "sha512-gBVmiGkw2hiut17wnSchYpFxrBmMb+jKFSjxbVFeivCn1OAAFykKtrsg26Sjcrra6AN1YiWyTC7SD9twPAO8dQ==",
-+      "dev": true,
-+      "requires": {
-+        "@types/node": "7.0.56",
-+        "colors": "1.2.1",
-+        "debug": "2.6.9",
-+        "electron-docs": "2.0.1",
-+        "electron-docs-linter": "2.3.4",
-+        "lodash": "4.17.5",
-+        "mkdirp": "0.5.1",
-+        "rimraf": "2.6.2",
-+        "tslint": "4.5.1",
-+        "typescript": "2.7.2"
-+>>>>>>> .their
-       }
-     },
-     "elliptic": {
-@@ -2551,6 +3185,7 @@
-         "hash.js": "1.1.3",
-         "hmac-drbg": "1.0.1",
-         "inherits": "2.0.3",
-+<<<<<<< .our
-         "minimalistic-assert": "1.0.1",
-         "minimalistic-crypto-utils": "1.0.1"
-       }
-@@ -2561,6 +3196,12 @@
-       "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
-       "dev": true
-     },
-+=======
-+        "minimalistic-assert": "1.0.0",
-+        "minimalistic-crypto-utils": "1.0.1"
-+      }
-+    },
-+>>>>>>> .their
-     "end-of-stream": {
-       "version": "1.4.1",
-       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
-@@ -2592,9 +3233,15 @@
-       }
-     },
-     "es-abstract": {
-+<<<<<<< .our
-       "version": "1.11.0",
-       "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.11.0.tgz",
-       "integrity": "sha512-ZnQrE/lXTTQ39ulXZ+J1DTFazV9qBy61x2bY071B+qGco8Z8q1QddsLdt/EF8Ai9hcWH72dWS0kFqXLxOxqslA==",
-+=======
-+      "version": "1.10.0",
-+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.10.0.tgz",
-+      "integrity": "sha512-/uh/DhdqIOSkAWifU+8nG78vlQxdLckUdI/sPgy0VhuXi2qJ7T8czBmqIYtLQVpCIFYafChnsRsB5pyb1JdmCQ==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "es-to-primitive": "1.1.1",
-@@ -2616,6 +3263,7 @@
-       }
-     },
-     "es5-ext": {
-+<<<<<<< .our
-       "version": "0.10.42",
-       "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.42.tgz",
-       "integrity": "sha512-AJxO1rmPe1bDEfSR6TJ/FgMFYuTBhR5R57KW58iCkYACMyFbrkqVyzXSurYoScDGvgyMpk7uRF/lPUPPTmsRSA==",
-@@ -2624,6 +3272,15 @@
-         "es6-iterator": "2.0.3",
-         "es6-symbol": "3.1.1",
-         "next-tick": "1.0.0"
-+=======
-+      "version": "0.10.40",
-+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.40.tgz",
-+      "integrity": "sha512-S9Fh3oya5OOvYSNGvPZJ+vyrs6VYpe1IXPowVe3N1OhaiwVaGlwfn3Zf5P5klYcWOA0toIwYQW8XEv/QqhdHvQ==",
-+      "dev": true,
-+      "requires": {
-+        "es6-iterator": "2.0.3",
-+        "es6-symbol": "3.1.1"
-+>>>>>>> .their
-       }
-     },
-     "es6-iterator": {
-@@ -2633,7 +3290,11 @@
-       "dev": true,
-       "requires": {
-         "d": "1.0.0",
-+<<<<<<< .our
-         "es5-ext": "0.10.42",
-+=======
-+        "es5-ext": "0.10.40",
-+>>>>>>> .their
-         "es6-symbol": "3.1.1"
-       }
-     },
-@@ -2644,7 +3305,11 @@
-       "dev": true,
-       "requires": {
-         "d": "1.0.0",
-+<<<<<<< .our
-         "es5-ext": "0.10.42",
-+=======
-+        "es5-ext": "0.10.40",
-+>>>>>>> .their
-         "es6-iterator": "2.0.3",
-         "es6-set": "0.1.5",
-         "es6-symbol": "3.1.1",
-@@ -2658,7 +3323,11 @@
-       "dev": true,
-       "requires": {
-         "d": "1.0.0",
-+<<<<<<< .our
-         "es5-ext": "0.10.42",
-+=======
-+        "es5-ext": "0.10.40",
-+>>>>>>> .their
-         "es6-iterator": "2.0.3",
-         "es6-symbol": "3.1.1",
-         "event-emitter": "0.3.5"
-@@ -2671,7 +3340,11 @@
-       "dev": true,
-       "requires": {
-         "d": "1.0.0",
-+<<<<<<< .our
-         "es5-ext": "0.10.42"
-+=======
-+        "es5-ext": "0.10.40"
-+>>>>>>> .their
-       }
-     },
-     "es6-weak-map": {
-@@ -2681,17 +3354,24 @@
-       "dev": true,
-       "requires": {
-         "d": "1.0.0",
-+<<<<<<< .our
-         "es5-ext": "0.10.42",
-+=======
-+        "es5-ext": "0.10.40",
-+>>>>>>> .their
-         "es6-iterator": "2.0.3",
-         "es6-symbol": "3.1.1"
-       }
-     },
-+<<<<<<< .our
-     "escape-html": {
-       "version": "1.0.3",
-       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-       "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "escape-string-regexp": {
-       "version": "1.0.5",
-       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-@@ -2744,25 +3424,41 @@
-       }
-     },
-     "eslint": {
-+<<<<<<< .our
-       "version": "3.19.0",
-       "resolved": "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz",
-       "integrity": "sha1-yPxiAcf0DdCJQbh8CFdnOGpnmsw=",
-+=======
-+      "version": "3.10.2",
-+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-3.10.2.tgz",
-+      "integrity": "sha1-yaEOi/bp1lZRIEd4xQM0Hx6sPOc=",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "babel-code-frame": "6.26.0",
-         "chalk": "1.1.3",
-         "concat-stream": "1.5.2",
-         "debug": "2.6.9",
-+<<<<<<< .our
-         "doctrine": "2.1.0",
-         "escope": "3.6.0",
-         "espree": "3.5.4",
-         "esquery": "1.0.1",
-+=======
-+        "doctrine": "1.5.0",
-+        "escope": "3.6.0",
-+        "espree": "3.5.4",
-+>>>>>>> .their
-         "estraverse": "4.2.0",
-         "esutils": "2.0.2",
-         "file-entry-cache": "2.0.0",
-         "glob": "7.1.2",
-         "globals": "9.18.0",
-+<<<<<<< .our
-         "ignore": "3.3.8",
-+=======
-+        "ignore": "3.3.7",
-+>>>>>>> .their
-         "imurmurhash": "0.1.4",
-         "inquirer": "0.12.0",
-         "is-my-json-valid": "2.17.2",
-@@ -2770,7 +3466,11 @@
-         "js-yaml": "3.11.0",
-         "json-stable-stringify": "1.0.1",
-         "levn": "0.3.0",
-+<<<<<<< .our
-         "lodash": "4.17.10",
-+=======
-+        "lodash": "4.17.5",
-+>>>>>>> .their
-         "mkdirp": "0.5.1",
-         "natural-compare": "1.4.0",
-         "optionator": "0.8.2",
-@@ -2780,7 +3480,11 @@
-         "require-uncached": "1.0.3",
-         "shelljs": "0.7.8",
-         "strip-bom": "3.0.0",
-+<<<<<<< .our
-         "strip-json-comments": "2.0.1",
-+=======
-+        "strip-json-comments": "1.0.4",
-+>>>>>>> .their
-         "table": "3.8.3",
-         "text-table": "0.2.0",
-         "user-home": "2.0.0"
-@@ -2795,7 +3499,11 @@
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "fs.realpath": "1.0.0",
-@@ -2826,10 +3534,20 @@
-           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-           "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-           "dev": true
-+<<<<<<< .our
-+=======
-+        },
-+        "strip-json-comments": {
-+          "version": "1.0.4",
-+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz",
-+          "integrity": "sha1-HhX7ysl9Pumb8tc7TGVrCCu6+5E=",
-+          "dev": true
-+>>>>>>> .their
-         }
-       }
-     },
-     "eslint-config-standard": {
-+<<<<<<< .our
-       "version": "10.2.1",
-       "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-10.2.1.tgz",
-       "integrity": "sha1-wGHk0GbzedwXzVYsZOgZtN1FRZE=",
-@@ -2839,6 +3557,17 @@
-       "version": "4.0.2",
-       "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-4.0.2.tgz",
-       "integrity": "sha512-F8fRh2WFnTek7dZH9ZaE0PCBwdVGkwVWZmizla/DDNOmg7Tx6B/IlK5+oYpiX29jpu73LszeJj5i1axEZv6VMw==",
-+=======
-+      "version": "6.2.1",
-+      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-6.2.1.tgz",
-+      "integrity": "sha1-06aKr8cZFjnn7kQec0hzkCY1QpI=",
-+      "dev": true
-+    },
-+    "eslint-config-standard-jsx": {
-+      "version": "3.2.0",
-+      "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-3.2.0.tgz",
-+      "integrity": "sha1-wkDibtkZoRpCqk3oBZRys4Jo1iA=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "eslint-import-resolver-node": {
-@@ -2849,6 +3578,7 @@
-       "requires": {
-         "debug": "2.6.9",
-         "object-assign": "4.1.1",
-+<<<<<<< .our
-         "resolve": "1.7.1"
-       }
-     },
-@@ -2856,6 +3586,15 @@
-       "version": "2.2.0",
-       "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.2.0.tgz",
-       "integrity": "sha1-snA2LNiLGkitMIl2zn+lTphBF0Y=",
-+=======
-+        "resolve": "1.5.0"
-+      }
-+    },
-+    "eslint-module-utils": {
-+      "version": "2.1.1",
-+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.1.1.tgz",
-+      "integrity": "sha512-jDI/X5l/6D1rRD/3T43q8Qgbls2nq5km5KSqiwlyUbGo5+04fXhMKdCPhjwbqAa6HXWaMxj8Q4hQDIh7IadJQw==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "debug": "2.6.9",
-@@ -2873,11 +3612,16 @@
-         "debug": "2.6.9",
-         "doctrine": "1.5.0",
-         "eslint-import-resolver-node": "0.2.3",
-+<<<<<<< .our
-         "eslint-module-utils": "2.2.0",
-+=======
-+        "eslint-module-utils": "2.1.1",
-+>>>>>>> .their
-         "has": "1.0.1",
-         "lodash.cond": "4.5.2",
-         "minimatch": "3.0.4",
-         "pkg-up": "1.0.0"
-+<<<<<<< .our
-       },
-       "dependencies": {
-         "doctrine": {
-@@ -2896,11 +3640,14 @@
-           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-           "dev": true
-         }
-+=======
-+>>>>>>> .their
-       }
-     },
-     "eslint-plugin-node": {
-       "version": "4.2.3",
-       "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-4.2.3.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-wEOQq428u2iHF0Aj1vOnJ2nmO5c=",
-       "dev": true,
-       "requires": {
-@@ -2908,6 +3655,15 @@
-         "minimatch": "3.0.4",
-         "object-assign": "4.1.1",
-         "resolve": "1.7.1",
-+=======
-+      "integrity": "sha512-vIUQPuwbVYdz/CYnlTLsJrRy7iXHQjdEe5wz0XhhdTym3IInM/zZLlPf9nZ2mThsH0QcsieCOWs2vOeCy/22LQ==",
-+      "dev": true,
-+      "requires": {
-+        "ignore": "3.3.7",
-+        "minimatch": "3.0.4",
-+        "object-assign": "4.1.1",
-+        "resolve": "1.5.0",
-+>>>>>>> .their
-         "semver": "5.3.0"
-       },
-       "dependencies": {
-@@ -2920,6 +3676,7 @@
-       }
-     },
-     "eslint-plugin-promise": {
-+<<<<<<< .our
-       "version": "3.5.0",
-       "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-3.5.0.tgz",
-       "integrity": "sha1-ePu2/+BHIBYnVp6FpsU3OvKmj8o=",
-@@ -2960,6 +3717,27 @@
-       "version": "3.0.1",
-       "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-3.0.1.tgz",
-       "integrity": "sha1-NNDJFbRe3G8BA5PH7vOCOwhWXPI=",
-+=======
-+      "version": "3.4.2",
-+      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-3.4.2.tgz",
-+      "integrity": "sha1-G+J5Pq/i0YtbEjuBNsJp+AT+cSI=",
-+      "dev": true
-+    },
-+    "eslint-plugin-react": {
-+      "version": "6.7.1",
-+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-6.7.1.tgz",
-+      "integrity": "sha1-Gvlq6lRYVoJRV9l8G1DVqPtkpac=",
-+      "dev": true,
-+      "requires": {
-+        "doctrine": "1.5.0",
-+        "jsx-ast-utils": "1.4.1"
-+      }
-+    },
-+    "eslint-plugin-standard": {
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-2.0.1.tgz",
-+      "integrity": "sha1-NYlpn/nJF/LCX3apFmh/ZBw2n/M=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "espree": {
-@@ -2987,9 +3765,15 @@
-       "dev": true
-     },
-     "esquery": {
-+<<<<<<< .our
-       "version": "1.0.1",
-       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
-       "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
-+=======
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.0.tgz",
-+      "integrity": "sha1-z7qLV9f7qT8XKYqKAGoEzaE9gPo=",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "estraverse": "4.2.0"
-@@ -3032,12 +3816,15 @@
-       "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "etag": {
-       "version": "1.8.1",
-       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-       "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "event-emitter": {
-       "version": "0.3.5",
-       "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
-@@ -3045,7 +3832,11 @@
-       "dev": true,
-       "requires": {
-         "d": "1.0.0",
-+<<<<<<< .our
-         "es5-ext": "0.10.42"
-+=======
-+        "es5-ext": "0.10.40"
-+>>>>>>> .their
-       }
-     },
-     "events": {
-@@ -3057,11 +3848,19 @@
-     "evp_bytestokey": {
-       "version": "1.0.3",
-       "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-f8vbGY3HGVlDLv4ThCaE4FJaywI=",
-       "dev": true,
-       "requires": {
-         "md5.js": "1.3.4",
-         "safe-buffer": "5.1.2"
-+=======
-+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-+      "dev": true,
-+      "requires": {
-+        "md5.js": "1.3.4",
-+        "safe-buffer": "5.1.1"
-+>>>>>>> .their
-       }
-     },
-     "execa": {
-@@ -3100,7 +3899,11 @@
-       "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "fill-range": "2.2.4"
-+=======
-+        "fill-range": "2.2.3"
-+>>>>>>> .their
-       }
-     },
-     "extend": {
-@@ -3142,6 +3945,7 @@
-       "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "fault": {
-       "version": "1.0.2",
-       "resolved": "https://registry.npmjs.org/fault/-/fault-1.0.2.tgz",
-@@ -3151,6 +3955,8 @@
-         "format": "0.2.2"
-       }
-     },
-+=======
-+>>>>>>> .their
-     "figures": {
-       "version": "1.7.0",
-       "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
-@@ -3177,6 +3983,7 @@
-       "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "filesize": {
-       "version": "3.6.1",
-       "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz",
-@@ -3187,11 +3994,21 @@
-       "version": "2.2.4",
-       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
-       "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
-+=======
-+    "fill-range": {
-+      "version": "2.2.3",
-+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
-+      "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "is-number": "2.1.0",
-         "isobject": "2.1.0",
-+<<<<<<< .our
-         "randomatic": "3.0.0",
-+=======
-+        "randomatic": "1.1.7",
-+>>>>>>> .their
-         "repeat-element": "1.1.2",
-         "repeat-string": "1.6.1"
-       }
-@@ -3199,7 +4016,11 @@
-     "find-root": {
-       "version": "1.1.0",
-       "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-q8/Iunb3CMQql7PWhbfpRQv7nOQ=",
-+=======
-+      "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "find-up": {
-@@ -3248,12 +4069,15 @@
-         "write": "0.2.1"
-       }
-     },
-+<<<<<<< .our
-     "fn-name": {
-       "version": "2.0.1",
-       "resolved": "https://registry.npmjs.org/fn-name/-/fn-name-2.0.1.tgz",
-       "integrity": "sha1-UhTXU3pNBqSjAcDMJi/rhBiAAuc=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "follow-redirects": {
-       "version": "0.0.7",
-       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-0.0.7.tgz",
-@@ -3302,6 +4126,7 @@
-         "mime-types": "2.1.18"
-       }
-     },
-+<<<<<<< .our
-     "format": {
-       "version": "0.2.2",
-       "resolved": "https://registry.npmjs.org/format/-/format-0.2.2.tgz",
-@@ -3320,6 +4145,8 @@
-       "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "fs-extra": {
-       "version": "0.26.7",
-       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz",
-@@ -3339,7 +4166,11 @@
-       "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "minipass": "2.3.0"
-+=======
-+        "minipass": "2.2.1"
-+>>>>>>> .their
-       }
-     },
-     "fs.realpath": {
-@@ -3348,6 +4179,7 @@
-       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "fsevents": {
-       "version": "1.2.4",
-       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz",
-@@ -5046,2140 +5878,2034 @@
-           "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-           "dev": true,
-           "requires": {
--            "inflight": "1.0.6",
--            "inherits": "2.0.3",
--            "minimatch": "3.0.4",
--            "once": "1.4.0",
--            "path-is-absolute": "1.0.1"
--          }
--        },
--        "resolve": {
--          "version": "1.1.7",
--          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
--          "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
--          "dev": true
--        },
--        "wordwrap": {
--          "version": "1.0.0",
--          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
--          "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
--          "dev": true
--        }
--      }
-+=======
-+    "function-bind": {
-+      "version": "1.1.1",
-+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-+      "dev": true
-     },
--    "js-tokens": {
--      "version": "3.0.2",
--      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
--      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
-+    "generate-function": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
-+      "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=",
-       "dev": true
-     },
--    "js-yaml": {
--      "version": "3.11.0",
--      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz",
--      "integrity": "sha512-saJstZWv7oNeOyBh3+Dx1qWzhW0+e6/8eDzo7p5rDFqxntSztloLtuKu+Ejhtq82jsilwOIZYsCz+lIjthg1Hw==",
-+    "generate-object-property": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
-+      "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
-       "dev": true,
-       "requires": {
--        "argparse": "1.0.10",
--        "esprima": "4.0.0"
--      },
--      "dependencies": {
--        "esprima": {
--          "version": "4.0.0",
--          "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
--          "integrity": "sha1-RJnt3NERDgshi6zy+n9/WfVcqAQ=",
--          "dev": true
--        }
-+        "is-property": "1.0.2"
-       }
-     },
--    "jsbn": {
--      "version": "0.1.1",
--      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
--      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
--      "dev": true,
--      "optional": true
-+    "get-caller-file": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz",
-+      "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=",
-+      "dev": true
-     },
--    "jsdom": {
--      "version": "7.2.2",
--      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-7.2.2.tgz",
--      "integrity": "sha1-QLQCdwwr2iNGkJa+6Rq2deOx/G4=",
-+    "get-pkg-repo": {
-+      "version": "1.4.0",
-+      "resolved": "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz",
-+      "integrity": "sha1-xztInAbYDMVTbCyFP54FIyBWly0=",
-       "dev": true,
--      "optional": true,
-       "requires": {
--        "abab": "1.0.4",
--        "acorn": "2.7.0",
--        "acorn-globals": "1.0.9",
--        "cssom": "0.3.2",
--        "cssstyle": "0.2.37",
--        "escodegen": "1.8.1",
--        "nwmatcher": "1.4.4",
--        "parse5": "1.5.1",
--        "request": "2.85.0",
--        "sax": "1.2.4",
--        "symbol-tree": "3.2.2",
--        "tough-cookie": "2.3.4",
--        "webidl-conversions": "2.0.1",
--        "whatwg-url-compat": "0.6.5",
--        "xml-name-validator": "2.0.1"
-+        "hosted-git-info": "2.6.0",
-+        "meow": "3.7.0",
-+        "normalize-package-data": "2.4.0",
-+        "parse-github-repo-url": "1.4.1",
-+        "through2": "2.0.3"
-       },
-       "dependencies": {
--        "acorn": {
--          "version": "2.7.0",
--          "resolved": "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz",
--          "integrity": "sha1-q259nYhqrKiwhbwzEreaGYQz8Oc=",
-+        "camelcase": {
-+          "version": "2.1.1",
-+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-+          "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
-+          "dev": true
-+        },
-+        "camelcase-keys": {
-+          "version": "2.1.0",
-+          "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
-+          "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
-           "dev": true,
--          "optional": true
-+          "requires": {
-+            "camelcase": "2.1.1",
-+            "map-obj": "1.0.1"
-+          }
-+        },
-+        "indent-string": {
-+          "version": "2.1.0",
-+          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-+          "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
-+          "dev": true,
-+          "requires": {
-+            "repeating": "2.0.1"
-+          }
-+        },
-+        "map-obj": {
-+          "version": "1.0.1",
-+          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-+          "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-+          "dev": true
-+        },
-+        "meow": {
-+          "version": "3.7.0",
-+          "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-+          "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
-+          "dev": true,
-+          "requires": {
-+            "camelcase-keys": "2.1.0",
-+            "decamelize": "1.2.0",
-+            "loud-rejection": "1.6.0",
-+            "map-obj": "1.0.1",
-+            "minimist": "1.2.0",
-+            "normalize-package-data": "2.4.0",
-+            "object-assign": "4.1.1",
-+            "read-pkg-up": "1.0.1",
-+            "redent": "1.0.0",
-+            "trim-newlines": "1.0.0"
-+          }
-+        },
-+        "redent": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-+          "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
-+          "dev": true,
-+          "requires": {
-+            "indent-string": "2.1.0",
-+            "strip-indent": "1.0.1"
-+          }
-+        },
-+        "strip-indent": {
-+          "version": "1.0.1",
-+          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
-+          "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
-+          "dev": true,
-+          "requires": {
-+            "get-stdin": "4.0.1"
-+          }
-+        },
-+        "trim-newlines": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-+          "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
-+          "dev": true
-         }
-       }
-     },
--    "json-parse-better-errors": {
--      "version": "1.0.2",
--      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
--      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
--      "dev": true
--    },
--    "json-schema": {
--      "version": "0.2.3",
--      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
--      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-+    "get-stdin": {
-+      "version": "4.0.1",
-+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-+      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-       "dev": true
-     },
--    "json-schema-traverse": {
--      "version": "0.3.1",
--      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
--      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
-+    "get-stream": {
-+      "version": "3.0.0",
-+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-+      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-       "dev": true
-     },
--    "json-stable-stringify": {
--      "version": "0.0.1",
--      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz",
--      "integrity": "sha1-YRwj6BTbN1Un34URk9tZ3Sryf0U=",
-+    "getpass": {
-+      "version": "0.1.7",
-+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-       "dev": true,
-       "requires": {
--        "jsonify": "0.0.0"
-+        "assert-plus": "1.0.0"
-       }
-     },
--    "json-stringify-safe": {
--      "version": "5.0.1",
--      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
--      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
--      "dev": true
--    },
--    "jsonfile": {
--      "version": "2.4.0",
--      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
--      "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
-+    "git-raw-commits": {
-+      "version": "1.3.4",
-+      "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-1.3.4.tgz",
-+      "integrity": "sha512-G3O+41xHbscpgL5nA0DUkbFVgaAz5rd57AMSIMew8p7C8SyFwZDyn08MoXHkTl9zcD0LmxsLFPxbqFY4YPbpPA==",
-       "dev": true,
-       "requires": {
--        "graceful-fs": "4.1.11"
-+        "dargs": "4.1.0",
-+        "lodash.template": "4.4.0",
-+        "meow": "4.0.0",
-+        "split2": "2.2.0",
-+        "through2": "2.0.3"
-       }
-     },
--    "jsonify": {
--      "version": "0.0.0",
--      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
--      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
--      "dev": true
--    },
--    "jsonparse": {
--      "version": "1.3.1",
--      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
--      "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
--      "dev": true
--    },
--    "jsonpointer": {
--      "version": "4.0.1",
--      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
--      "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",
--      "dev": true
--    },
--    "jsprim": {
--      "version": "1.4.1",
--      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
--      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-+    "git-remote-origin-url": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz",
-+      "integrity": "sha1-UoJlna4hBxRaERJhEq0yFuxfpl8=",
-       "dev": true,
-       "requires": {
--        "assert-plus": "1.0.0",
--        "extsprintf": "1.3.0",
--        "json-schema": "0.2.3",
--        "verror": "1.10.0"
-+        "gitconfiglocal": "1.0.0",
-+        "pify": "2.3.0"
-       }
-     },
--    "jsx-ast-utils": {
--      "version": "1.4.1",
--      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz",
--      "integrity": "sha1-OGchPo3Xm/Ho8jAMDPwe+xgsDfE=",
--      "dev": true
--    },
--    "keyed-array": {
--      "version": "2.1.2",
--      "resolved": "https://registry.npmjs.org/keyed-array/-/keyed-array-2.1.2.tgz",
--      "integrity": "sha1-isE3thMi7V7Rx7Qbn5zQZmMcrOA=",
--      "dev": true
--    },
--    "kind-of": {
--      "version": "3.2.2",
--      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
--      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-+    "git-semver-tags": {
-+      "version": "1.3.4",
-+      "resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.3.4.tgz",
-+      "integrity": "sha512-Xe2Z74MwXZfAezuaO6e6cA4nsgeCiARPzaBp23gma325c/OXdt//PhrknptIaynNeUp2yWtmikV7k5RIicgGIQ==",
-       "dev": true,
-       "requires": {
--        "is-buffer": "1.1.6"
-+        "meow": "4.0.0",
-+        "semver": "5.5.0"
-       }
-     },
--    "klaw": {
--      "version": "1.3.1",
--      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
--      "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
-+    "gitconfiglocal": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz",
-+      "integrity": "sha1-QdBF84UaXqiPA/JMocYXgRRGS5s=",
-       "dev": true,
-       "requires": {
--        "graceful-fs": "4.1.11"
-+        "ini": "1.3.5"
-       }
-     },
--    "labeled-stream-splicer": {
--      "version": "2.0.1",
--      "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.1.tgz",
--      "integrity": "sha512-MC94mHZRvJ3LfykJlTUipBqenZz1pacOZEMhhQ8dMGcDHs0SBE5GbsavUXV7YtP3icBW17W0Zy1I0lfASmo9Pg==",
-+    "github": {
-+      "version": "9.3.1",
-+      "resolved": "https://registry.npmjs.org/github/-/github-9.3.1.tgz",
-+      "integrity": "sha512-LvVb6iR8/7bqYgj0VeAtqys0t427jwIBkv/+or/ssypfIk5R1fnz4aeIEv4udPw6VFoH6vL4gi+foBoD5aazXg==",
-       "dev": true,
-       "requires": {
--        "inherits": "2.0.3",
--        "isarray": "2.0.4",
--        "stream-splicer": "2.0.0"
--      },
--      "dependencies": {
--        "isarray": {
--          "version": "2.0.4",
--          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.4.tgz",
--          "integrity": "sha512-GMxXOiUirWg1xTKRipM0Ek07rX+ubx4nNVElTJdNLYmNO/2YrDkgJGw9CljXn+r4EWiDQg/8lsRdHyg2PJuUaA==",
--          "dev": true
--        }
-+        "follow-redirects": "0.0.7",
-+        "https-proxy-agent": "1.0.0",
-+        "mime": "1.6.0",
-+        "netrc": "0.1.4"
-       }
-     },
--    "latest-version": {
--      "version": "3.1.0",
--      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz",
--      "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=",
-+    "glob": {
-+      "version": "6.0.4",
-+      "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
-+      "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
-       "dev": true,
-       "requires": {
--        "package-json": "4.0.1"
-+        "inflight": "1.0.6",
-+        "inherits": "2.0.3",
-+        "minimatch": "3.0.4",
-+        "once": "1.4.0",
-+        "path-is-absolute": "1.0.1"
-       }
-     },
--    "lazy-cache": {
--      "version": "1.0.4",
--      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
--      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
--      "dev": true,
--      "optional": true
--    },
--    "lcid": {
--      "version": "1.0.0",
--      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
--      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-+    "glob-base": {
-+      "version": "0.3.0",
-+      "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
-+      "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
-       "dev": true,
-       "requires": {
--        "invert-kv": "1.0.0"
-+        "glob-parent": "2.0.0",
-+        "is-glob": "2.0.1"
-       }
-     },
--    "leven": {
--      "version": "2.1.0",
--      "resolved": "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz",
--      "integrity": "sha1-wuep93IJTe6dNCAq6KzORoeHVYA=",
--      "dev": true
--    },
--    "levn": {
--      "version": "0.3.0",
--      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
--      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-+    "glob-parent": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-+      "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
-       "dev": true,
-       "requires": {
--        "prelude-ls": "1.1.2",
--        "type-check": "0.3.2"
-+        "is-glob": "2.0.1"
-       }
-     },
--    "lexical-scope": {
--      "version": "1.2.0",
--      "resolved": "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.2.0.tgz",
--      "integrity": "sha1-/Ope3HBKSzqHls3KQZw6CvryLfQ=",
-+    "global-dirs": {
-+      "version": "0.1.1",
-+      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz",
-+      "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=",
-       "dev": true,
-       "requires": {
--        "astw": "2.2.0"
-+        "ini": "1.3.5"
-       }
-     },
--    "linkify-it": {
--      "version": "1.2.4",
--      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-1.2.4.tgz",
--      "integrity": "sha1-B3NSbDF8j9E71TTuHRgP+Iq/iBo=",
-+    "globals": {
-+      "version": "9.18.0",
-+      "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-+      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-+      "dev": true
-+    },
-+    "globby": {
-+      "version": "5.0.0",
-+      "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
-+      "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
-       "dev": true,
-       "requires": {
--        "uc.micro": "1.0.5"
-+        "array-union": "1.0.2",
-+        "arrify": "1.0.1",
-+        "glob": "7.1.2",
-+        "object-assign": "4.1.1",
-+        "pify": "2.3.0",
-+        "pinkie-promise": "2.0.1"
-+      },
-+      "dependencies": {
-+        "glob": {
-+          "version": "7.1.2",
-+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+          "dev": true,
-+          "requires": {
-+            "fs.realpath": "1.0.0",
-+>>>>>>> .their
-+            "inflight": "1.0.6",
-+            "inherits": "2.0.3",
-+            "minimatch": "3.0.4",
-+            "once": "1.4.0",
-+            "path-is-absolute": "1.0.1"
-+          }
-+<<<<<<< .our
-+        },
-+        "resolve": {
-+          "version": "1.1.7",
-+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-+          "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
-+          "dev": true
-+        },
-+        "wordwrap": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-+          "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
-+          "dev": true
-+        }
-       }
-     },
--    "lint": {
--      "version": "1.1.2",
--      "resolved": "https://registry.npmjs.org/lint/-/lint-1.1.2.tgz",
--      "integrity": "sha1-Ne0GTzIlR8MxNY2JmGhmSWi6Nx8=",
-+    "js-tokens": {
-+      "version": "3.0.2",
-+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-+      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
-       "dev": true
-     },
--    "load-json-file": {
--      "version": "1.1.0",
--      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
--      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-+    "js-yaml": {
-+      "version": "3.11.0",
-+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz",
-+      "integrity": "sha512-saJstZWv7oNeOyBh3+Dx1qWzhW0+e6/8eDzo7p5rDFqxntSztloLtuKu+Ejhtq82jsilwOIZYsCz+lIjthg1Hw==",
-       "dev": true,
-       "requires": {
--        "graceful-fs": "4.1.11",
--        "parse-json": "2.2.0",
--        "pify": "2.3.0",
--        "pinkie-promise": "2.0.1",
--        "strip-bom": "2.0.0"
-+        "argparse": "1.0.10",
-+        "esprima": "4.0.0"
-+      },
-+      "dependencies": {
-+        "esprima": {
-+          "version": "4.0.0",
-+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
-+          "integrity": "sha1-RJnt3NERDgshi6zy+n9/WfVcqAQ=",
-+          "dev": true
-+        }
-       }
-     },
--    "load-plugin": {
--      "version": "2.2.2",
--      "resolved": "https://registry.npmjs.org/load-plugin/-/load-plugin-2.2.2.tgz",
--      "integrity": "sha512-FYzamtURIJefQykZGtiClYuZkJBUKzmx8Tc74y8JGAulDzbzVm/C+w/MbAljHRr+REL0cRzy3WgnHE+T8gce5g==",
-+    "jsbn": {
-+      "version": "0.1.1",
-+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-       "dev": true,
--      "requires": {
--        "npm-prefix": "1.2.0",
--        "resolve-from": "4.0.0"
--      }
-+      "optional": true
-     },
--    "locate-path": {
--      "version": "2.0.0",
--      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
--      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-+    "jsdom": {
-+      "version": "7.2.2",
-+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-7.2.2.tgz",
-+      "integrity": "sha1-QLQCdwwr2iNGkJa+6Rq2deOx/G4=",
-       "dev": true,
-+      "optional": true,
-       "requires": {
--        "p-locate": "2.0.0",
--        "path-exists": "3.0.0"
-+        "abab": "1.0.4",
-+        "acorn": "2.7.0",
-+        "acorn-globals": "1.0.9",
-+        "cssom": "0.3.2",
-+        "cssstyle": "0.2.37",
-+        "escodegen": "1.8.1",
-+        "nwmatcher": "1.4.4",
-+        "parse5": "1.5.1",
-+        "request": "2.85.0",
-+        "sax": "1.2.4",
-+        "symbol-tree": "3.2.2",
-+        "tough-cookie": "2.3.4",
-+        "webidl-conversions": "2.0.1",
-+        "whatwg-url-compat": "0.6.5",
-+        "xml-name-validator": "2.0.1"
-       },
-       "dependencies": {
--        "path-exists": {
--          "version": "3.0.0",
--          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
--          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
--          "dev": true
-+        "acorn": {
-+          "version": "2.7.0",
-+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz",
-+          "integrity": "sha1-q259nYhqrKiwhbwzEreaGYQz8Oc=",
-+          "dev": true,
-+          "optional": true
-         }
-       }
-     },
--    "lodash": {
--      "version": "4.17.10",
--      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
--      "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==",
-+    "json-parse-better-errors": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-       "dev": true
-     },
--    "lodash._reinterpolate": {
--      "version": "3.0.0",
--      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
--      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
-+    "json-schema": {
-+      "version": "0.2.3",
-+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-       "dev": true
-     },
--    "lodash.assign": {
--      "version": "4.2.0",
--      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
--      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
-+    "json-schema-traverse": {
-+      "version": "0.3.1",
-+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-+      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
-       "dev": true
-     },
--    "lodash.assignin": {
--      "version": "4.2.0",
--      "resolved": "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz",
--      "integrity": "sha1-uo31+4QesKPoBEIysOJjqNxqKKI=",
--      "dev": true
-+    "json-stable-stringify": {
-+      "version": "0.0.1",
-+      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz",
-+      "integrity": "sha1-YRwj6BTbN1Un34URk9tZ3Sryf0U=",
-+      "dev": true,
-+      "requires": {
-+        "jsonify": "0.0.0"
-+      }
-     },
--    "lodash.bind": {
--      "version": "4.2.1",
--      "resolved": "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz",
--      "integrity": "sha1-euMBfpOWIqwxt9fX3LGzTbFpDTU=",
-+    "json-stringify-safe": {
-+      "version": "5.0.1",
-+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-       "dev": true
-     },
--    "lodash.cond": {
--      "version": "4.5.2",
--      "resolved": "https://registry.npmjs.org/lodash.cond/-/lodash.cond-4.5.2.tgz",
--      "integrity": "sha1-9HGh2khr5g9quVXRcRVSPdHSVdU=",
--      "dev": true
-+    "jsonfile": {
-+      "version": "2.4.0",
-+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
-+      "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
-+      "dev": true,
-+      "requires": {
-+        "graceful-fs": "4.1.11"
-+      }
-     },
--    "lodash.defaults": {
--      "version": "4.2.0",
--      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
--      "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=",
-+    "jsonify": {
-+      "version": "0.0.0",
-+      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-+      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
-       "dev": true
-     },
--    "lodash.filter": {
--      "version": "4.6.0",
--      "resolved": "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz",
--      "integrity": "sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4=",
-+    "jsonparse": {
-+      "version": "1.3.1",
-+      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
-+      "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
-       "dev": true
-     },
--    "lodash.flatten": {
--      "version": "4.4.0",
--      "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
--      "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=",
-+    "jsonpointer": {
-+      "version": "4.0.1",
-+      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
-+      "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",
-       "dev": true
-     },
--    "lodash.foreach": {
--      "version": "4.5.0",
--      "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz",
--      "integrity": "sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=",
-+    "jsprim": {
-+      "version": "1.4.1",
-+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-+      "dev": true,
-+      "requires": {
-+        "assert-plus": "1.0.0",
-+        "extsprintf": "1.3.0",
-+        "json-schema": "0.2.3",
-+        "verror": "1.10.0"
-+      }
-+    },
-+    "jsx-ast-utils": {
-+      "version": "1.4.1",
-+      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz",
-+      "integrity": "sha1-OGchPo3Xm/Ho8jAMDPwe+xgsDfE=",
-       "dev": true
-     },
--    "lodash.isempty": {
--      "version": "4.4.0",
--      "resolved": "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz",
--      "integrity": "sha1-b4bL7di+TsmHvpqvM8loTbGzHn4=",
--      "dev": true
--    },
--    "lodash.isplainobject": {
--      "version": "4.0.6",
--      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
--      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=",
--      "dev": true
--    },
--    "lodash.map": {
--      "version": "4.6.0",
--      "resolved": "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz",
--      "integrity": "sha1-dx7Hg540c9nEzeKLGTlMNWL09tM=",
-+    "keyed-array": {
-+      "version": "2.1.2",
-+      "resolved": "https://registry.npmjs.org/keyed-array/-/keyed-array-2.1.2.tgz",
-+      "integrity": "sha1-isE3thMi7V7Rx7Qbn5zQZmMcrOA=",
-       "dev": true
-     },
--    "lodash.memoize": {
--      "version": "3.0.4",
--      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz",
--      "integrity": "sha1-LcvSwofLwKVcxCMovQxzYVDVPj8=",
--      "dev": true
-+    "kind-of": {
-+      "version": "3.2.2",
-+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-+      "dev": true,
-+      "requires": {
-+        "is-buffer": "1.1.6"
-+      }
-     },
--    "lodash.merge": {
--      "version": "4.6.1",
--      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz",
--      "integrity": "sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ==",
--      "dev": true
-+    "klaw": {
-+      "version": "1.3.1",
-+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
-+      "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
-+      "dev": true,
-+      "requires": {
-+        "graceful-fs": "4.1.11"
-+      }
-     },
--    "lodash.pick": {
--      "version": "4.4.0",
--      "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz",
--      "integrity": "sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=",
--      "dev": true
-+    "labeled-stream-splicer": {
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.1.tgz",
-+      "integrity": "sha512-MC94mHZRvJ3LfykJlTUipBqenZz1pacOZEMhhQ8dMGcDHs0SBE5GbsavUXV7YtP3icBW17W0Zy1I0lfASmo9Pg==",
-+      "dev": true,
-+      "requires": {
-+        "inherits": "2.0.3",
-+        "isarray": "2.0.4",
-+        "stream-splicer": "2.0.0"
-+      },
-+      "dependencies": {
-+        "isarray": {
-+          "version": "2.0.4",
-+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.4.tgz",
-+          "integrity": "sha512-GMxXOiUirWg1xTKRipM0Ek07rX+ubx4nNVElTJdNLYmNO/2YrDkgJGw9CljXn+r4EWiDQg/8lsRdHyg2PJuUaA==",
-+          "dev": true
-+        }
-+      }
-     },
--    "lodash.range": {
--      "version": "3.2.0",
--      "resolved": "https://registry.npmjs.org/lodash.range/-/lodash.range-3.2.0.tgz",
--      "integrity": "sha1-9GHliPZmg/fq3q3lE+OKaaVloV0=",
--      "dev": true
-+    "latest-version": {
-+      "version": "3.1.0",
-+      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz",
-+      "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=",
-+      "dev": true,
-+      "requires": {
-+        "package-json": "4.0.1"
-+      }
-     },
--    "lodash.reduce": {
--      "version": "4.6.0",
--      "resolved": "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz",
--      "integrity": "sha1-8atrg5KZrUj3hKu/R2WW8DuRTTs=",
--      "dev": true
-+    "lazy-cache": {
-+      "version": "1.0.4",
-+      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
-+      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
-+      "dev": true,
-+      "optional": true
-     },
--    "lodash.reject": {
--      "version": "4.6.0",
--      "resolved": "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz",
--      "integrity": "sha1-gNZJLcFHCGS79YNTO2UfQqn1JBU=",
--      "dev": true
-+    "lcid": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-+      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-+      "dev": true,
-+      "requires": {
-+        "invert-kv": "1.0.0"
-+      }
-     },
--    "lodash.some": {
--      "version": "4.6.0",
--      "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz",
--      "integrity": "sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=",
-+    "leven": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz",
-+      "integrity": "sha1-wuep93IJTe6dNCAq6KzORoeHVYA=",
-       "dev": true
-     },
--    "lodash.template": {
--      "version": "4.4.0",
--      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.4.0.tgz",
--      "integrity": "sha1-5zoDhcg1VZF0bgILmWecaQ5o+6A=",
-+    "levn": {
-+      "version": "0.3.0",
-+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-       "dev": true,
-       "requires": {
--        "lodash._reinterpolate": "3.0.0",
--        "lodash.templatesettings": "4.1.0"
-+        "prelude-ls": "1.1.2",
-+        "type-check": "0.3.2"
-       }
-     },
--    "lodash.templatesettings": {
--      "version": "4.1.0",
--      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz",
--      "integrity": "sha1-K01OlbpEDZFf8IvImeRVNmZxMxY=",
-+    "lexical-scope": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.2.0.tgz",
-+      "integrity": "sha1-/Ope3HBKSzqHls3KQZw6CvryLfQ=",
-       "dev": true,
-       "requires": {
--        "lodash._reinterpolate": "3.0.0"
-+        "astw": "2.2.0"
-       }
-     },
--    "lodash.transform": {
--      "version": "4.6.0",
--      "resolved": "https://registry.npmjs.org/lodash.transform/-/lodash.transform-4.6.0.tgz",
--      "integrity": "sha1-EjBkIvYzJK7YSD0/ODMrX2cFR6A=",
--      "dev": true
--    },
--    "log-symbols": {
--      "version": "1.0.2",
--      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz",
--      "integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=",
-+    "linkify-it": {
-+      "version": "1.2.4",
-+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-1.2.4.tgz",
-+      "integrity": "sha1-B3NSbDF8j9E71TTuHRgP+Iq/iBo=",
-       "dev": true,
-       "requires": {
--        "chalk": "1.1.3"
-+        "uc.micro": "1.0.5"
-       }
-     },
--    "longest": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
--      "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
--      "dev": true
--    },
--    "longest-streak": {
--      "version": "2.0.2",
--      "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.2.tgz",
--      "integrity": "sha512-TmYTeEYxiAmSVdpbnQDXGtvYOIRsCMg89CVZzwzc2o7GFL1CjoiRPjH5ec0NFAVlAx3fVof9dX/t6KKRAo2OWA==",
-+    "lint": {
-+      "version": "1.1.2",
-+      "resolved": "https://registry.npmjs.org/lint/-/lint-1.1.2.tgz",
-+      "integrity": "sha1-Ne0GTzIlR8MxNY2JmGhmSWi6Nx8=",
-       "dev": true
-     },
--    "loud-rejection": {
--      "version": "1.6.0",
--      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
--      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
-+    "load-json-file": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-+      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-       "dev": true,
-       "requires": {
--        "currently-unhandled": "0.4.1",
--        "signal-exit": "3.0.2"
-+        "graceful-fs": "4.1.11",
-+        "parse-json": "2.2.0",
-+        "pify": "2.3.0",
-+        "pinkie-promise": "2.0.1",
-+        "strip-bom": "2.0.0"
-       }
-     },
--    "lowercase-keys": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
--      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
--      "dev": true
--    },
--    "lru-cache": {
--      "version": "4.1.3",
--      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz",
--      "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
-+    "load-plugin": {
-+      "version": "2.2.2",
-+      "resolved": "https://registry.npmjs.org/load-plugin/-/load-plugin-2.2.2.tgz",
-+      "integrity": "sha512-FYzamtURIJefQykZGtiClYuZkJBUKzmx8Tc74y8JGAulDzbzVm/C+w/MbAljHRr+REL0cRzy3WgnHE+T8gce5g==",
-       "dev": true,
-       "requires": {
--        "pseudomap": "1.0.2",
--        "yallist": "2.1.2"
--      },
--      "dependencies": {
--        "yallist": {
--          "version": "2.1.2",
--          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
--          "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
--          "dev": true
--        }
-+        "npm-prefix": "1.2.0",
-+        "resolve-from": "4.0.0"
-       }
-     },
--    "make-dir": {
--      "version": "1.3.0",
--      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
--      "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
-+    "locate-path": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-+      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-       "dev": true,
-       "requires": {
--        "pify": "3.0.0"
-+        "p-locate": "2.0.0",
-+        "path-exists": "3.0.0"
-       },
-       "dependencies": {
--        "pify": {
-+        "path-exists": {
-           "version": "3.0.0",
--          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
--          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
--          "dev": true
-+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-+          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-+=======
-         }
-       }
-     },
--    "map-obj": {
--      "version": "2.0.0",
--      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz",
--      "integrity": "sha1-plzSkIepJZi4eRJXpSPgISIqwfk=",
--      "dev": true
-+    "got": {
-+      "version": "6.7.1",
-+      "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
-+      "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
-+      "dev": true,
-+      "requires": {
-+        "create-error-class": "3.0.2",
-+        "duplexer3": "0.1.4",
-+        "get-stream": "3.0.0",
-+        "is-redirect": "1.0.0",
-+        "is-retry-allowed": "1.1.0",
-+        "is-stream": "1.1.0",
-+        "lowercase-keys": "1.0.0",
-+        "safe-buffer": "5.1.1",
-+        "timed-out": "4.0.1",
-+        "unzip-response": "2.0.1",
-+        "url-parse-lax": "1.0.0"
-+      }
-     },
--    "markdown-escapes": {
--      "version": "1.0.2",
--      "resolved": "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.2.tgz",
--      "integrity": "sha512-lbRZ2mE3Q9RtLjxZBZ9+IMl68DKIXaVAhwvwn9pmjnPLS0h/6kyBMgNhqi1xFJ/2yv6cSyv0jbiZavZv93JkkA==",
-+    "graceful-fs": {
-+      "version": "4.1.11",
-+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-       "dev": true
-     },
--    "markdown-extensions": {
--      "version": "1.1.1",
--      "resolved": "https://registry.npmjs.org/markdown-extensions/-/markdown-extensions-1.1.1.tgz",
--      "integrity": "sha512-WWC0ZuMzCyDHYCasEGs4IPvLyTGftYwh6wIEOULOF0HXcqZlhwRzrK0w2VUlxWA98xnvb/jszw4ZSkJ6ADpM6Q==",
--      "dev": true
--    },
--    "markdown-it": {
--      "version": "6.1.1",
--      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-6.1.1.tgz",
--      "integrity": "sha1-ztA39Ec+6fUVOsQU933IPJG6knw=",
--      "dev": true,
--      "requires": {
--        "argparse": "1.0.10",
--        "entities": "1.1.1",
--        "linkify-it": "1.2.4",
--        "mdurl": "1.0.1",
--        "uc.micro": "1.0.5"
--      }
--    },
--    "markdown-it-named-headers": {
--      "version": "0.0.4",
--      "resolved": "https://registry.npmjs.org/markdown-it-named-headers/-/markdown-it-named-headers-0.0.4.tgz",
--      "integrity": "sha1-gu/CgyQkCmsed7mq5QF3HV81HB8=",
-+    "gunzip-maybe": {
-+      "version": "1.4.1",
-+      "resolved": "https://registry.npmjs.org/gunzip-maybe/-/gunzip-maybe-1.4.1.tgz",
-+      "integrity": "sha512-qtutIKMthNJJgeHQS7kZ9FqDq59/Wn0G2HYCRNjpup7yKfVI6/eqwpmroyZGFoCYaG+sW6psNVb4zoLADHpp2g==",
-       "dev": true,
-       "requires": {
--        "string": "3.3.3"
-+        "browserify-zlib": "0.1.4",
-+        "is-deflate": "1.0.0",
-+        "is-gzip": "1.0.0",
-+        "peek-stream": "1.1.2",
-+        "pumpify": "1.4.0",
-+        "through2": "2.0.3"
-       }
-     },
--    "markdown-table": {
--      "version": "1.1.2",
--      "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-1.1.2.tgz",
--      "integrity": "sha512-NcWuJFHDA8V3wkDgR/j4+gZx+YQwstPgfQDV8ndUeWWzta3dnDTBxpVzqS9lkmJAuV5YX35lmyojl6HO5JXAgw==",
--      "dev": true
--    },
--    "marky-markdown-lite": {
--      "version": "1.2.0",
--      "resolved": "https://registry.npmjs.org/marky-markdown-lite/-/marky-markdown-lite-1.2.0.tgz",
--      "integrity": "sha1-dO2phLgTZVfe4QZO/RXkBhdAaZc=",
-+    "handlebars": {
-+      "version": "4.0.11",
-+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz",
-+      "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=",
-       "dev": true,
-       "requires": {
--        "cheerio": "0.20.0",
--        "conventional-changelog-cli": "1.3.22",
--        "is-file": "1.0.0",
--        "markdown-it": "6.1.1",
--        "markdown-it-named-headers": "0.0.4"
-+        "async": "1.5.2",
-+        "optimist": "0.6.1",
-+        "source-map": "0.4.4",
-+        "uglify-js": "2.8.29"
-       },
-       "dependencies": {
--        "cheerio": {
--          "version": "0.20.0",
--          "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.20.0.tgz",
--          "integrity": "sha1-XHEPK6uVZTJyhCugHG6mGzVF7DU=",
--          "dev": true,
--          "requires": {
--            "css-select": "1.2.0",
--            "dom-serializer": "0.1.0",
--            "entities": "1.1.1",
--            "htmlparser2": "3.8.3",
--            "jsdom": "7.2.2",
--            "lodash": "4.17.10"
--          }
-+        "minimist": {
-+          "version": "0.0.10",
-+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
-+          "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
-+          "dev": true
-         },
--        "domhandler": {
--          "version": "2.3.0",
--          "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz",
--          "integrity": "sha1-LeWaCCLVAn+r/28DLCsloqir5zg=",
-+        "optimist": {
-+          "version": "0.6.1",
-+          "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
-+          "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
-           "dev": true,
-           "requires": {
--            "domelementtype": "1.3.0"
-+            "minimist": "0.0.10",
-+            "wordwrap": "0.0.3"
-           }
-         },
--        "htmlparser2": {
--          "version": "3.8.3",
--          "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
--          "integrity": "sha1-mWwosZFRaovoZQGn15dX5ccMEGg=",
-+        "source-map": {
-+          "version": "0.4.4",
-+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-+          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
-           "dev": true,
-           "requires": {
--            "domelementtype": "1.3.0",
--            "domhandler": "2.3.0",
--            "domutils": "1.5.1",
--            "entities": "1.0.0",
--            "readable-stream": "1.1.14"
--          },
--          "dependencies": {
--            "entities": {
--              "version": "1.0.0",
--              "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz",
--              "integrity": "sha1-sph6o4ITR/zeZCsk/fyeT7cSvyY=",
--              "dev": true
--            }
-+            "amdefine": "1.0.1"
-           }
-         }
-       }
-     },
--    "matcher-collection": {
--      "version": "1.0.5",
--      "resolved": "https://registry.npmjs.org/matcher-collection/-/matcher-collection-1.0.5.tgz",
--      "integrity": "sha1-LuCVQ4Nyy4iE8FgjQTjAXGROwzk=",
-+    "har-schema": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-+      "dev": true
-+    },
-+    "har-validator": {
-+      "version": "5.0.3",
-+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
-+      "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
-       "dev": true,
-       "requires": {
--        "minimatch": "3.0.4"
-+        "ajv": "5.5.2",
-+        "har-schema": "2.0.0"
-       }
-     },
--    "math-random": {
-+    "has": {
-       "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.1.tgz",
--      "integrity": "sha1-izqsWIuKZuSXXjzepn97sylgH6w=",
-+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
-+      "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=",
-+      "dev": true,
-+      "requires": {
-+        "function-bind": "1.1.1"
-+      }
-+    },
-+    "has-ansi": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-+      "dev": true,
-+      "requires": {
-+        "ansi-regex": "2.1.1"
-+      }
-+    },
-+    "has-flag": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-+      "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-       "dev": true
-     },
--    "md5.js": {
--      "version": "1.3.4",
--      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz",
--      "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=",
-+    "has-symbols": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
-+      "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=",
-+      "dev": true
-+    },
-+    "hash-base": {
-+      "version": "2.0.2",
-+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz",
-+      "integrity": "sha1-ZuodhW206KVHDK32/OI65SRO8uE=",
-       "dev": true,
-       "requires": {
--        "hash-base": "3.0.4",
-         "inherits": "2.0.3"
-       }
-     },
--    "mdast-comment-marker": {
--      "version": "1.0.2",
--      "resolved": "https://registry.npmjs.org/mdast-comment-marker/-/mdast-comment-marker-1.0.2.tgz",
--      "integrity": "sha1-Hd8O+BH7UkOQF8jSwLkiA18rp0o=",
--      "dev": true
-+    "hash.js": {
-+      "version": "1.1.3",
-+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz",
-+      "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==",
-+      "dev": true,
-+      "requires": {
-+        "inherits": "2.0.3",
-+        "minimalistic-assert": "1.0.0"
-+      }
-     },
--    "mdast-util-compact": {
-+    "hawk": {
-+      "version": "6.0.2",
-+      "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
-+      "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
-+      "dev": true,
-+      "requires": {
-+        "boom": "4.3.1",
-+        "cryptiles": "3.1.2",
-+        "hoek": "4.2.1",
-+        "sntp": "2.1.0"
-+      }
-+    },
-+    "heads": {
-+      "version": "1.3.0",
-+      "resolved": "https://registry.npmjs.org/heads/-/heads-1.3.0.tgz",
-+      "integrity": "sha1-/p8Q01WjqYbeuO5MzZ8rvHVLZcA=",
-+      "dev": true,
-+      "requires": {
-+        "async": "2.6.0",
-+        "got": "6.7.1",
-+        "pify": "2.3.0"
-+      },
-+      "dependencies": {
-+        "async": {
-+          "version": "2.6.0",
-+          "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz",
-+          "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==",
-+          "dev": true,
-+          "requires": {
-+            "lodash": "4.17.5"
-+          }
-+        }
-+      }
-+    },
-+    "hmac-drbg": {
-       "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-1.0.1.tgz",
--      "integrity": "sha1-zbX4TitqLTEU3zO9BdnLMuPECDo=",
-+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-+      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
-       "dev": true,
-       "requires": {
--        "unist-util-modify-children": "1.1.2",
--        "unist-util-visit": "1.3.1"
-+        "hash.js": "1.1.3",
-+        "minimalistic-assert": "1.0.0",
-+        "minimalistic-crypto-utils": "1.0.1"
-       }
-     },
--    "mdast-util-heading-style": {
--      "version": "1.0.3",
--      "resolved": "https://registry.npmjs.org/mdast-util-heading-style/-/mdast-util-heading-style-1.0.3.tgz",
--      "integrity": "sha1-77OQ28iqAWw89XegNJANsn7nJHw=",
-+    "hoek": {
-+      "version": "4.2.1",
-+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz",
-+      "integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==",
-       "dev": true
-     },
--    "mdast-util-to-string": {
--      "version": "1.0.4",
--      "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-1.0.4.tgz",
--      "integrity": "sha1-XEVch4yTVfDB5/PotxnPWDaRrPs=",
-+    "home-or-tmp": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
-+      "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
-+      "dev": true,
-+      "requires": {
-+        "os-homedir": "1.0.2",
-+        "os-tmpdir": "1.0.2"
-+      }
-+    },
-+    "hosted-git-info": {
-+      "version": "2.6.0",
-+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.0.tgz",
-+      "integrity": "sha512-lIbgIIQA3lz5XaB6vxakj6sDHADJiZadYEJB+FgA+C4nubM1NwcuvUr9EJPmnH1skZqpqUzWborWo8EIUi0Sdw==",
-       "dev": true
-     },
--    "mdurl": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
--      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=",
-+    "htmlescape": {
-+      "version": "1.1.1",
-+      "resolved": "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz",
-+      "integrity": "sha1-OgPtwiFLyjtmQko+eVk0lQnLA1E=",
-       "dev": true
-     },
--    "meow": {
--      "version": "4.0.1",
--      "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz",
--      "integrity": "sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==",
-+    "htmlparser2": {
-+      "version": "3.9.2",
-+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz",
-+      "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=",
-       "dev": true,
-       "requires": {
--        "camelcase-keys": "4.2.0",
--        "decamelize-keys": "1.1.0",
--        "loud-rejection": "1.6.0",
--        "minimist": "1.2.0",
--        "minimist-options": "3.0.2",
--        "normalize-package-data": "2.4.0",
--        "read-pkg-up": "3.0.0",
--        "redent": "2.0.0",
--        "trim-newlines": "2.0.0"
--      },
-+        "domelementtype": "1.3.0",
-+        "domhandler": "2.4.1",
-+        "domutils": "1.5.1",
-+        "entities": "1.1.1",
-+        "inherits": "2.0.3",
-+        "readable-stream": "2.3.5"
-+      },
-       "dependencies": {
--        "find-up": {
--          "version": "2.1.0",
--          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
--          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
--          "dev": true,
--          "requires": {
--            "locate-path": "2.0.0"
--          }
--        },
--        "load-json-file": {
--          "version": "4.0.0",
--          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
--          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
--          "dev": true,
--          "requires": {
--            "graceful-fs": "4.1.11",
--            "parse-json": "4.0.0",
--            "pify": "3.0.0",
--            "strip-bom": "3.0.0"
--          }
--        },
--        "parse-json": {
--          "version": "4.0.0",
--          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
--          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
--          "dev": true,
--          "requires": {
--            "error-ex": "1.3.1",
--            "json-parse-better-errors": "1.0.2"
--          }
--        },
--        "path-type": {
--          "version": "3.0.0",
--          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
--          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
--          "dev": true,
--          "requires": {
--            "pify": "3.0.0"
--          }
--        },
--        "pify": {
--          "version": "3.0.0",
--          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
--          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-+        "isarray": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-           "dev": true
-         },
--        "read-pkg": {
--          "version": "3.0.0",
--          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
--          "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
-+        "readable-stream": {
-+          "version": "2.3.5",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
-+          "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
-           "dev": true,
-           "requires": {
--            "load-json-file": "4.0.0",
--            "normalize-package-data": "2.4.0",
--            "path-type": "3.0.0"
-+            "core-util-is": "1.0.2",
-+            "inherits": "2.0.3",
-+            "isarray": "1.0.0",
-+            "process-nextick-args": "2.0.0",
-+            "safe-buffer": "5.1.1",
-+            "string_decoder": "1.0.3",
-+            "util-deprecate": "1.0.2"
-           }
-         },
--        "read-pkg-up": {
--          "version": "3.0.0",
--          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
--          "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
-+        "string_decoder": {
-+          "version": "1.0.3",
-+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-+          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-           "dev": true,
-           "requires": {
--            "find-up": "2.1.0",
--            "read-pkg": "3.0.0"
-+            "safe-buffer": "5.1.1"
-           }
--        },
--        "strip-bom": {
--          "version": "3.0.0",
--          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
--          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
--          "dev": true
-         }
-       }
-     },
--    "micro": {
--      "version": "9.3.1",
--      "resolved": "https://registry.npmjs.org/micro/-/micro-9.3.1.tgz",
--      "integrity": "sha512-83uimpPJqfwkfKvJl2WWontBlV3hmzrIgyJ+L2uhDXKNk7Ll+/ezK3zBz7TljubpKPqjM0JdT2Ker4MTPmhjgA==",
-+    "http-signature": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-       "dev": true,
-       "requires": {
--        "arg": "2.0.0",
--        "chalk": "2.4.0",
--        "content-type": "1.0.4",
--        "is-stream": "1.1.0",
--        "raw-body": "2.3.2"
--      },
--      "dependencies": {
--        "ansi-styles": {
--          "version": "3.2.1",
--          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
--          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
--          "dev": true,
--          "requires": {
--            "color-convert": "1.9.1"
--          }
--        },
--        "chalk": {
--          "version": "2.4.0",
--          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz",
--          "integrity": "sha512-Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw==",
--          "dev": true,
--          "requires": {
--            "ansi-styles": "3.2.1",
--            "escape-string-regexp": "1.0.5",
--            "supports-color": "5.4.0"
--          }
--        },
--        "has-flag": {
--          "version": "3.0.0",
--          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
--          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
--          "dev": true
--        },
--        "supports-color": {
--          "version": "5.4.0",
--          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
--          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
--          "dev": true,
--          "requires": {
--            "has-flag": "3.0.0"
--          }
--        }
-+        "assert-plus": "1.0.0",
-+        "jsprim": "1.4.1",
-+        "sshpk": "1.14.1"
-       }
-     },
--    "micro-compress": {
--      "version": "1.0.0",
--      "resolved": "https://registry.npmjs.org/micro-compress/-/micro-compress-1.0.0.tgz",
--      "integrity": "sha1-U/WoC0rQMgyhZaVZtuPfFF1PcE8=",
--      "dev": true,
--      "requires": {
--        "compression": "1.7.3"
--      }
-+    "https-browserify": {
-+      "version": "0.0.1",
-+      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz",
-+      "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=",
-+      "dev": true
-     },
--    "micromatch": {
--      "version": "2.3.11",
--      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
--      "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-+    "https-proxy-agent": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz",
-+      "integrity": "sha1-NffabEjOTdv6JkiRrFk+5f+GceY=",
-       "dev": true,
-       "requires": {
--        "arr-diff": "2.0.0",
--        "array-unique": "0.2.1",
--        "braces": "1.8.5",
--        "expand-brackets": "0.1.5",
--        "extglob": "0.3.2",
--        "filename-regex": "2.0.1",
--        "is-extglob": "1.0.0",
--        "is-glob": "2.0.1",
--        "kind-of": "3.2.2",
--        "normalize-path": "2.1.1",
--        "object.omit": "2.0.1",
--        "parse-glob": "3.0.4",
--        "regex-cache": "0.4.4"
-+        "agent-base": "2.1.1",
-+        "debug": "2.6.9",
-+        "extend": "3.0.1"
-       }
-     },
--    "miller-rabin": {
--      "version": "4.0.1",
--      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
--      "integrity": "sha1-8IA1HIZbDcViqEYpZtqlNUPHik0=",
-+    "husky": {
-+      "version": "0.14.3",
-+      "resolved": "https://registry.npmjs.org/husky/-/husky-0.14.3.tgz",
-+      "integrity": "sha512-e21wivqHpstpoiWA/Yi8eFti8E+sQDSS53cpJsPptPs295QTOQR0ZwnHo2TXy1XOpZFD9rPOd3NpmqTK6uMLJA==",
-       "dev": true,
-       "requires": {
--        "bn.js": "4.11.8",
--        "brorand": "1.1.0"
-+        "is-ci": "1.1.0",
-+        "normalize-path": "1.0.0",
-+        "strip-indent": "2.0.0"
-+      },
-+      "dependencies": {
-+        "normalize-path": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-1.0.0.tgz",
-+          "integrity": "sha1-MtDkcvkf80VwHBWoMRAY07CpA3k=",
-+>>>>>>> .their
-+          "dev": true
-+        }
-       }
-     },
--    "mime": {
--      "version": "1.6.0",
--      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
--      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-+<<<<<<< .our
-+    "lodash": {
-+      "version": "4.17.10",
-+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
-+      "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==",
-       "dev": true
-     },
--    "mime-db": {
--      "version": "1.33.0",
--      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz",
--      "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==",
-+    "lodash._reinterpolate": {
-+      "version": "3.0.0",
-+      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-+      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
-       "dev": true
-     },
--    "mime-types": {
--      "version": "2.1.18",
--      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz",
--      "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
--      "dev": true,
--      "requires": {
--        "mime-db": "1.33.0"
--      }
--    },
--    "mimic-fn": {
--      "version": "1.2.0",
--      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
--      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
-+    "lodash.assign": {
-+      "version": "4.2.0",
-+      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
-+      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
-       "dev": true
-     },
--    "minimalistic-assert": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
--      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-+    "lodash.assignin": {
-+      "version": "4.2.0",
-+      "resolved": "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz",
-+      "integrity": "sha1-uo31+4QesKPoBEIysOJjqNxqKKI=",
-       "dev": true
-     },
--    "minimalistic-crypto-utils": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
--      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
-+    "lodash.bind": {
-+      "version": "4.2.1",
-+      "resolved": "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz",
-+      "integrity": "sha1-euMBfpOWIqwxt9fX3LGzTbFpDTU=",
-       "dev": true
-     },
--    "minimatch": {
--      "version": "3.0.4",
--      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
--      "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
--      "dev": true,
--      "requires": {
--        "brace-expansion": "1.1.11"
--      }
--    },
--    "minimist": {
--      "version": "1.2.0",
--      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
--      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-+    "lodash.cond": {
-+      "version": "4.5.2",
-+      "resolved": "https://registry.npmjs.org/lodash.cond/-/lodash.cond-4.5.2.tgz",
-+      "integrity": "sha1-9HGh2khr5g9quVXRcRVSPdHSVdU=",
-       "dev": true
-     },
--    "minimist-options": {
--      "version": "3.0.2",
--      "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-3.0.2.tgz",
--      "integrity": "sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==",
--      "dev": true,
--      "requires": {
--        "arrify": "1.0.1",
--        "is-plain-obj": "1.1.0"
--      }
--    },
--    "minipass": {
--      "version": "2.3.0",
--      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.0.tgz",
--      "integrity": "sha512-jWC2Eg+Np4bxah7llu1IrUNSJQxtLz/J+pOjTM0nFpJXGAaV18XBWhUn031Q1tAA/TJtA1jgwnOe9S2PQa4Lbg==",
--      "dev": true,
--      "requires": {
--        "safe-buffer": "5.1.2",
--        "yallist": "3.0.2"
--      }
--    },
--    "minizlib": {
--      "version": "1.1.0",
--      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz",
--      "integrity": "sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==",
--      "dev": true,
--      "requires": {
--        "minipass": "2.3.0"
--      }
-+    "lodash.defaults": {
-+      "version": "4.2.0",
-+      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
-+      "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=",
-+      "dev": true
-     },
--    "mkdirp": {
--      "version": "0.5.1",
--      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
--      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
--      "dev": true,
--      "requires": {
--        "minimist": "0.0.8"
--      },
--      "dependencies": {
--        "minimist": {
--          "version": "0.0.8",
--          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
--          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
--          "dev": true
--        }
--      }
-+    "lodash.filter": {
-+      "version": "4.6.0",
-+      "resolved": "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz",
-+      "integrity": "sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4=",
-+      "dev": true
-     },
--    "mkpath": {
--      "version": "0.1.0",
--      "resolved": "https://registry.npmjs.org/mkpath/-/mkpath-0.1.0.tgz",
--      "integrity": "sha1-dVSm+Nhxg0zJe1RisSLEwSTW3pE=",
-+    "lodash.flatten": {
-+      "version": "4.4.0",
-+      "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
-+      "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=",
-       "dev": true
-     },
--    "mksnapshot": {
--      "version": "0.3.1",
--      "resolved": "https://registry.npmjs.org/mksnapshot/-/mksnapshot-0.3.1.tgz",
--      "integrity": "sha1-JQHAVldDbXQs6Vik/5LHfkDdN+Y=",
--      "dev": true,
--      "requires": {
--        "decompress-zip": "0.3.0",
--        "fs-extra": "0.26.7",
--        "request": "2.85.0"
--      }
-+    "lodash.foreach": {
-+      "version": "4.5.0",
-+      "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz",
-+      "integrity": "sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=",
-+      "dev": true
-     },
--    "modify-values": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/modify-values/-/modify-values-1.0.1.tgz",
--      "integrity": "sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==",
-+    "lodash.isempty": {
-+      "version": "4.4.0",
-+      "resolved": "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz",
-+      "integrity": "sha1-b4bL7di+TsmHvpqvM8loTbGzHn4=",
-       "dev": true
-     },
--    "module-deps": {
--      "version": "4.1.1",
--      "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-4.1.1.tgz",
--      "integrity": "sha1-IyFYM/HaE/1gbMuAh7RIUty4If0=",
--      "dev": true,
--      "requires": {
--        "JSONStream": "1.3.2",
--        "browser-resolve": "1.11.2",
--        "cached-path-relative": "1.0.1",
--        "concat-stream": "1.5.2",
--        "defined": "1.0.0",
--        "detective": "4.7.1",
--        "duplexer2": "0.1.4",
--        "inherits": "2.0.3",
--        "parents": "1.0.1",
--        "readable-stream": "2.3.6",
--        "resolve": "1.7.1",
--        "stream-combiner2": "1.1.1",
--        "subarg": "1.0.0",
--        "through2": "2.0.3",
--        "xtend": "4.0.1"
--      },
--      "dependencies": {
--        "isarray": {
--          "version": "1.0.0",
--          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
--          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
--          "dev": true
--        },
--        "readable-stream": {
--          "version": "2.3.6",
--          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
--          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
--          "dev": true,
--          "requires": {
--            "core-util-is": "1.0.2",
--            "inherits": "2.0.3",
--            "isarray": "1.0.0",
--            "process-nextick-args": "2.0.0",
--            "safe-buffer": "5.1.2",
--            "string_decoder": "1.1.1",
--            "util-deprecate": "1.0.2"
--          }
--        },
--        "string_decoder": {
--          "version": "1.1.1",
--          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
--          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
--          "dev": true,
--          "requires": {
--            "safe-buffer": "5.1.2"
--          }
--        }
--      }
-+    "lodash.isplainobject": {
-+      "version": "4.0.6",
-+      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-+      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=",
-+      "dev": true
-     },
--    "mri": {
--      "version": "1.1.0",
--      "resolved": "https://registry.npmjs.org/mri/-/mri-1.1.0.tgz",
--      "integrity": "sha1-XAo/KcjM/7ux7JQdzsCdcfoy82o=",
-+    "lodash.map": {
-+      "version": "4.6.0",
-+      "resolved": "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz",
-+      "integrity": "sha1-dx7Hg540c9nEzeKLGTlMNWL09tM=",
-       "dev": true
-     },
--    "ms": {
--      "version": "2.0.0",
--      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
--      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-+    "lodash.memoize": {
-+      "version": "3.0.4",
-+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz",
-+      "integrity": "sha1-LcvSwofLwKVcxCMovQxzYVDVPj8=",
-       "dev": true
-     },
--    "mute-stream": {
--      "version": "0.0.5",
--      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz",
--      "integrity": "sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA=",
-+    "lodash.merge": {
-+      "version": "4.6.1",
-+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz",
-+      "integrity": "sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ==",
-       "dev": true
-     },
--    "nan": {
--      "version": "2.10.0",
--      "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
--      "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==",
--      "dev": true,
--      "optional": true
-+    "lodash.pick": {
-+      "version": "4.4.0",
-+      "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz",
-+      "integrity": "sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=",
-+      "dev": true
-     },
--    "natural-compare": {
--      "version": "1.4.0",
--      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
--      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-+    "lodash.range": {
-+      "version": "3.2.0",
-+      "resolved": "https://registry.npmjs.org/lodash.range/-/lodash.range-3.2.0.tgz",
-+      "integrity": "sha1-9GHliPZmg/fq3q3lE+OKaaVloV0=",
-       "dev": true
-     },
--    "negotiator": {
--      "version": "0.6.1",
--      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
--      "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=",
-+    "lodash.reduce": {
-+      "version": "4.6.0",
-+      "resolved": "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz",
-+      "integrity": "sha1-8atrg5KZrUj3hKu/R2WW8DuRTTs=",
-       "dev": true
-     },
--    "netrc": {
--      "version": "0.1.4",
--      "resolved": "https://registry.npmjs.org/netrc/-/netrc-0.1.4.tgz",
--      "integrity": "sha1-a+lPysqNd63gqWcNxGCRTJRHJEQ=",
-+    "lodash.reject": {
-+      "version": "4.6.0",
-+      "resolved": "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz",
-+      "integrity": "sha1-gNZJLcFHCGS79YNTO2UfQqn1JBU=",
-       "dev": true
-     },
--    "next-tick": {
--      "version": "1.0.0",
--      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
--      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
-+    "lodash.some": {
-+      "version": "4.6.0",
-+      "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz",
-+      "integrity": "sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=",
-       "dev": true
-     },
--    "node-dir": {
--      "version": "0.1.17",
--      "resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz",
--      "integrity": "sha1-X1Zl2TNRM1yqvvjxxVRRbPXx5OU=",
-+    "lodash.template": {
-+      "version": "4.4.0",
-+      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.4.0.tgz",
-+      "integrity": "sha1-5zoDhcg1VZF0bgILmWecaQ5o+6A=",
-       "dev": true,
-       "requires": {
--        "minimatch": "3.0.4"
-+        "lodash._reinterpolate": "3.0.0",
-+        "lodash.templatesettings": "4.1.0"
-       }
-     },
--    "node-fetch": {
--      "version": "2.1.2",
--      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.1.2.tgz",
--      "integrity": "sha1-q4hOjn5X44qUR1POxwb3iNF2i7U=",
--      "dev": true
-+    "lodash.templatesettings": {
-+      "version": "4.1.0",
-+      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz",
-+      "integrity": "sha1-K01OlbpEDZFf8IvImeRVNmZxMxY=",
-+      "dev": true,
-+      "requires": {
-+        "lodash._reinterpolate": "3.0.0"
-+      }
-     },
--    "node-version": {
--      "version": "1.1.3",
--      "resolved": "https://registry.npmjs.org/node-version/-/node-version-1.1.3.tgz",
--      "integrity": "sha512-rEwE51JWn0yN3Wl5BXeGn5d52OGbSXzWiiXRjAQeuyvcGKyvuSILW2rb3G7Xh+nexzLwhTpek6Ehxd6IjvHePg==",
-+    "lodash.transform": {
-+      "version": "4.6.0",
-+      "resolved": "https://registry.npmjs.org/lodash.transform/-/lodash.transform-4.6.0.tgz",
-+      "integrity": "sha1-EjBkIvYzJK7YSD0/ODMrX2cFR6A=",
-       "dev": true
-     },
--    "nopt": {
--      "version": "3.0.6",
--      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
--      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-+    "log-symbols": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz",
-+      "integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=",
-       "dev": true,
-       "requires": {
--        "abbrev": "1.1.1"
-+        "chalk": "1.1.3"
-       }
-     },
--    "normalize-package-data": {
--      "version": "2.4.0",
--      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
--      "integrity": "sha1-EvlaMH1YNSB1oEkHuErIvpisAS8=",
--      "dev": true,
--      "requires": {
--        "hosted-git-info": "2.6.0",
--        "is-builtin-module": "1.0.0",
--        "semver": "5.5.0",
--        "validate-npm-package-license": "3.0.3"
--      }
--    },
--    "normalize-path": {
--      "version": "2.1.1",
--      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
--      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
--      "dev": true,
--      "requires": {
--        "remove-trailing-separator": "1.1.0"
--      }
--    },
--    "npm-prefix": {
--      "version": "1.2.0",
--      "resolved": "https://registry.npmjs.org/npm-prefix/-/npm-prefix-1.2.0.tgz",
--      "integrity": "sha1-5hlFX3B0ulTMZtbQ033Z8b5ry8A=",
--      "dev": true,
--      "requires": {
--        "rc": "1.2.7",
--        "shellsubstitute": "1.2.0",
--        "untildify": "2.1.0"
--      }
-+    "longest": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
-+      "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
-+      "dev": true
-     },
--    "npm-run-path": {
-+    "longest-streak": {
-       "version": "2.0.2",
--      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
--      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
--      "dev": true,
--      "requires": {
--        "path-key": "2.0.1"
--      }
--    },
--    "nth-check": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz",
--      "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=",
--      "dev": true,
--      "requires": {
--        "boolbase": "1.0.0"
--      }
-+      "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.2.tgz",
-+      "integrity": "sha512-TmYTeEYxiAmSVdpbnQDXGtvYOIRsCMg89CVZzwzc2o7GFL1CjoiRPjH5ec0NFAVlAx3fVof9dX/t6KKRAo2OWA==",
-+      "dev": true
-     },
--    "nugget": {
--      "version": "2.0.1",
--      "resolved": "https://registry.npmjs.org/nugget/-/nugget-2.0.1.tgz",
--      "integrity": "sha1-IBCVpIfhrTYIGzQy+jytpPjQcbA=",
-+    "loud-rejection": {
-+      "version": "1.6.0",
-+      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
-+      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
-       "dev": true,
-       "requires": {
--        "debug": "2.6.9",
--        "minimist": "1.2.0",
--        "pretty-bytes": "1.0.4",
--        "progress-stream": "1.2.0",
--        "request": "2.85.0",
--        "single-line-log": "1.1.2",
--        "throttleit": "0.0.2"
-+        "currently-unhandled": "0.4.1",
-+        "signal-exit": "3.0.2"
-       }
-     },
--    "number-is-nan": {
-+    "lowercase-keys": {
-       "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
--      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
--      "dev": true
--    },
--    "nwmatcher": {
--      "version": "1.4.4",
--      "resolved": "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.4.tgz",
--      "integrity": "sha512-3iuY4N5dhgMpCUrOVnuAdGrgxVqV2cJpM+XNccjR2DKOB1RUP0aA+wGXEiNziG/UKboFyGBIoKOaNlJxx8bciQ==",
--      "dev": true,
--      "optional": true
--    },
--    "oauth-sign": {
--      "version": "0.8.2",
--      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
--      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
--      "dev": true
--    },
--    "object-assign": {
--      "version": "4.1.1",
--      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
--      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
--      "dev": true
--    },
--    "object-keys": {
--      "version": "0.4.0",
--      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
--      "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=",
-+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
-+      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
-       "dev": true
-     },
--    "object.assign": {
--      "version": "4.1.0",
--      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
--      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
-+    "lru-cache": {
-+      "version": "4.1.3",
-+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz",
-+      "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
-       "dev": true,
-       "requires": {
--        "define-properties": "1.1.2",
--        "function-bind": "1.1.1",
--        "has-symbols": "1.0.0",
--        "object-keys": "1.0.11"
-+        "pseudomap": "1.0.2",
-+        "yallist": "2.1.2"
-       },
-       "dependencies": {
--        "object-keys": {
--          "version": "1.0.11",
--          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
--          "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=",
-+        "yallist": {
-+          "version": "2.1.2",
-+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-+          "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-           "dev": true
-         }
-       }
-     },
--    "object.omit": {
--      "version": "2.0.1",
--      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
--      "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
--      "dev": true,
--      "requires": {
--        "for-own": "0.1.5",
--        "is-extendable": "0.1.1"
--      }
--    },
--    "octicons": {
--      "version": "7.3.0",
--      "resolved": "https://registry.npmjs.org/octicons/-/octicons-7.3.0.tgz",
--      "integrity": "sha512-UVjlkmUL15Ef/7Rd72Io634Bdl61QgSMasAZpvXPoR2XNFj1RelAyhl4QJuR1hBGlPWFDR7KFj2jEzsFax2IUg==",
--      "dev": true,
--      "requires": {
--        "object-assign": "4.1.1"
--      }
--    },
--    "on-finished": {
--      "version": "2.3.0",
--      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
--      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-+    "make-dir": {
-+      "version": "1.3.0",
-+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
-+      "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
-       "dev": true,
-       "requires": {
--        "ee-first": "1.1.1"
-+        "pify": "3.0.0"
-+      },
-+      "dependencies": {
-+        "pify": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-+          "dev": true
-+        }
-       }
-     },
--    "on-headers": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz",
--      "integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=",
-+    "map-obj": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz",
-+      "integrity": "sha1-plzSkIepJZi4eRJXpSPgISIqwfk=",
-       "dev": true
-     },
--    "once": {
--      "version": "1.4.0",
--      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
--      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
--      "dev": true,
--      "requires": {
--        "wrappy": "1.0.2"
--      }
--    },
--    "onetime": {
--      "version": "1.1.0",
--      "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
--      "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
-+    "markdown-escapes": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.2.tgz",
-+      "integrity": "sha512-lbRZ2mE3Q9RtLjxZBZ9+IMl68DKIXaVAhwvwn9pmjnPLS0h/6kyBMgNhqi1xFJ/2yv6cSyv0jbiZavZv93JkkA==",
-       "dev": true
-     },
--    "openssl-self-signed-certificate": {
--      "version": "1.1.6",
--      "resolved": "https://registry.npmjs.org/openssl-self-signed-certificate/-/openssl-self-signed-certificate-1.1.6.tgz",
--      "integrity": "sha1-nTpHdrGlfphHNQOSEUrS+RWoPdQ=",
-+    "markdown-extensions": {
-+      "version": "1.1.1",
-+      "resolved": "https://registry.npmjs.org/markdown-extensions/-/markdown-extensions-1.1.1.tgz",
-+      "integrity": "sha512-WWC0ZuMzCyDHYCasEGs4IPvLyTGftYwh6wIEOULOF0HXcqZlhwRzrK0w2VUlxWA98xnvb/jszw4ZSkJ6ADpM6Q==",
-       "dev": true
-     },
--    "opn": {
--      "version": "5.3.0",
--      "resolved": "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz",
--      "integrity": "sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==",
-+    "markdown-it": {
-+      "version": "6.1.1",
-+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-6.1.1.tgz",
-+      "integrity": "sha1-ztA39Ec+6fUVOsQU933IPJG6knw=",
-       "dev": true,
-       "requires": {
--        "is-wsl": "1.1.0"
-+        "argparse": "1.0.10",
-+        "entities": "1.1.1",
-+        "linkify-it": "1.2.4",
-+        "mdurl": "1.0.1",
-+        "uc.micro": "1.0.5"
-       }
-     },
--    "optimist": {
--      "version": "0.3.7",
--      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
--      "integrity": "sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=",
-+    "markdown-it-named-headers": {
-+      "version": "0.0.4",
-+      "resolved": "https://registry.npmjs.org/markdown-it-named-headers/-/markdown-it-named-headers-0.0.4.tgz",
-+      "integrity": "sha1-gu/CgyQkCmsed7mq5QF3HV81HB8=",
-       "dev": true,
-       "requires": {
--        "wordwrap": "0.0.3"
-+        "string": "3.3.3"
-       }
-     },
--    "optionator": {
--      "version": "0.8.2",
--      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
--      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
-+    "markdown-table": {
-+      "version": "1.1.2",
-+      "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-1.1.2.tgz",
-+      "integrity": "sha512-NcWuJFHDA8V3wkDgR/j4+gZx+YQwstPgfQDV8ndUeWWzta3dnDTBxpVzqS9lkmJAuV5YX35lmyojl6HO5JXAgw==",
-+      "dev": true
-+    },
-+    "marky-markdown-lite": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/marky-markdown-lite/-/marky-markdown-lite-1.2.0.tgz",
-+      "integrity": "sha1-dO2phLgTZVfe4QZO/RXkBhdAaZc=",
-       "dev": true,
-       "requires": {
--        "deep-is": "0.1.3",
--        "fast-levenshtein": "2.0.6",
--        "levn": "0.3.0",
--        "prelude-ls": "1.1.2",
--        "type-check": "0.3.2",
--        "wordwrap": "1.0.0"
-+        "cheerio": "0.20.0",
-+        "conventional-changelog-cli": "1.3.22",
-+        "is-file": "1.0.0",
-+        "markdown-it": "6.1.1",
-+        "markdown-it-named-headers": "0.0.4"
-       },
-       "dependencies": {
--        "wordwrap": {
--          "version": "1.0.0",
--          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
--          "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
--          "dev": true
--        }
--      }
--    },
--    "ora": {
--      "version": "0.3.0",
--      "resolved": "https://registry.npmjs.org/ora/-/ora-0.3.0.tgz",
--      "integrity": "sha1-NnoHitJc+wltpQERXrW0AeB9dJU=",
--      "dev": true,
--      "requires": {
--        "chalk": "1.1.3",
--        "cli-cursor": "1.0.2",
--        "cli-spinners": "0.2.0",
--        "log-symbols": "1.0.2"
--      },
--      "dependencies": {
--        "cli-spinners": {
--          "version": "0.2.0",
--          "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-0.2.0.tgz",
--          "integrity": "sha1-hQeHN5E7iA9uyf/ntl6D7Hd2KE8=",
--          "dev": true
-+        "cheerio": {
-+          "version": "0.20.0",
-+          "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.20.0.tgz",
-+          "integrity": "sha1-XHEPK6uVZTJyhCugHG6mGzVF7DU=",
-+          "dev": true,
-+          "requires": {
-+            "css-select": "1.2.0",
-+            "dom-serializer": "0.1.0",
-+            "entities": "1.1.1",
-+            "htmlparser2": "3.8.3",
-+            "jsdom": "7.2.2",
-+            "lodash": "4.17.10"
-+          }
-+        },
-+        "domhandler": {
-+          "version": "2.3.0",
-+          "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz",
-+          "integrity": "sha1-LeWaCCLVAn+r/28DLCsloqir5zg=",
-+          "dev": true,
-+          "requires": {
-+            "domelementtype": "1.3.0"
-+          }
-+        },
-+        "htmlparser2": {
-+          "version": "3.8.3",
-+          "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
-+          "integrity": "sha1-mWwosZFRaovoZQGn15dX5ccMEGg=",
-+          "dev": true,
-+          "requires": {
-+            "domelementtype": "1.3.0",
-+            "domhandler": "2.3.0",
-+            "domutils": "1.5.1",
-+            "entities": "1.0.0",
-+            "readable-stream": "1.1.14"
-+          },
-+          "dependencies": {
-+            "entities": {
-+              "version": "1.0.0",
-+              "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz",
-+              "integrity": "sha1-sph6o4ITR/zeZCsk/fyeT7cSvyY=",
-+              "dev": true
-+            }
-+          }
-         }
-       }
-     },
--    "os-browserify": {
--      "version": "0.1.2",
--      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz",
--      "integrity": "sha1-ScoCk+CxlZCl9d4Qx/JlphfY/lQ=",
--      "dev": true
--    },
--    "os-homedir": {
--      "version": "1.0.2",
--      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
--      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
--      "dev": true
--    },
--    "os-locale": {
--      "version": "1.4.0",
--      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
--      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
--      "dev": true,
--      "requires": {
--        "lcid": "1.0.0"
--      }
--    },
--    "os-tmpdir": {
--      "version": "1.0.2",
--      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
--      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
--      "dev": true
--    },
--    "p-finally": {
--      "version": "1.0.0",
--      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
--      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
--      "dev": true
--    },
--    "p-limit": {
--      "version": "1.2.0",
--      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz",
--      "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==",
--      "dev": true,
--      "requires": {
--        "p-try": "1.0.0"
--      }
--    },
--    "p-locate": {
--      "version": "2.0.0",
--      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
--      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-+    "matcher-collection": {
-+      "version": "1.0.5",
-+      "resolved": "https://registry.npmjs.org/matcher-collection/-/matcher-collection-1.0.5.tgz",
-+      "integrity": "sha1-LuCVQ4Nyy4iE8FgjQTjAXGROwzk=",
-       "dev": true,
-       "requires": {
--        "p-limit": "1.2.0"
-+        "minimatch": "3.0.4"
-       }
-     },
--    "p-try": {
--      "version": "1.0.0",
--      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
--      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-+    "math-random": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.1.tgz",
-+      "integrity": "sha1-izqsWIuKZuSXXjzepn97sylgH6w=",
-       "dev": true
-     },
--    "package-json": {
--      "version": "4.0.1",
--      "resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz",
--      "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=",
-+    "md5.js": {
-+      "version": "1.3.4",
-+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz",
-+      "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=",
-       "dev": true,
-       "requires": {
--        "got": "6.7.1",
--        "registry-auth-token": "3.3.2",
--        "registry-url": "3.1.0",
--        "semver": "5.5.0"
-+        "hash-base": "3.0.4",
-+        "inherits": "2.0.3"
-       }
-     },
--    "pako": {
--      "version": "0.2.9",
--      "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
--      "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=",
-+    "mdast-comment-marker": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/mdast-comment-marker/-/mdast-comment-marker-1.0.2.tgz",
-+      "integrity": "sha1-Hd8O+BH7UkOQF8jSwLkiA18rp0o=",
-       "dev": true
-     },
--    "parents": {
-+    "mdast-util-compact": {
-       "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz",
--      "integrity": "sha1-/t1NK/GTp3dF/nHjcdc8MwfZx1E=",
-+      "resolved": "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-1.0.1.tgz",
-+      "integrity": "sha1-zbX4TitqLTEU3zO9BdnLMuPECDo=",
-       "dev": true,
-       "requires": {
--        "path-platform": "0.11.15"
-+        "unist-util-modify-children": "1.1.2",
-+        "unist-util-visit": "1.3.1"
-       }
-     },
--    "parse-asn1": {
--      "version": "5.1.1",
--      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz",
--      "integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==",
--      "dev": true,
--      "requires": {
--        "asn1.js": "4.10.1",
--        "browserify-aes": "1.2.0",
--        "create-hash": "1.2.0",
--        "evp_bytestokey": "1.0.3",
--        "pbkdf2": "3.0.16"
--      }
-+    "mdast-util-heading-style": {
-+      "version": "1.0.3",
-+      "resolved": "https://registry.npmjs.org/mdast-util-heading-style/-/mdast-util-heading-style-1.0.3.tgz",
-+      "integrity": "sha1-77OQ28iqAWw89XegNJANsn7nJHw=",
-+      "dev": true
-     },
--    "parse-entities": {
--      "version": "1.1.2",
--      "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-1.1.2.tgz",
--      "integrity": "sha512-5N9lmQ7tmxfXf+hO3X6KRG6w7uYO/HL9fHalSySTdyn63C3WNvTM/1R8tn1u1larNcEbo3Slcy2bsVDQqvEpUg==",
--      "dev": true,
--      "requires": {
--        "character-entities": "1.2.2",
--        "character-entities-legacy": "1.1.2",
--        "character-reference-invalid": "1.1.2",
--        "is-alphanumerical": "1.0.2",
--        "is-decimal": "1.0.2",
--        "is-hexadecimal": "1.0.2"
--      }
-+    "mdast-util-to-string": {
-+      "version": "1.0.4",
-+      "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-1.0.4.tgz",
-+      "integrity": "sha1-XEVch4yTVfDB5/PotxnPWDaRrPs=",
-+      "dev": true
-     },
--    "parse-github-repo-url": {
--      "version": "1.4.1",
--      "resolved": "https://registry.npmjs.org/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz",
--      "integrity": "sha1-nn2LslKmy2ukJZUGC3v23z28H1A=",
-+    "mdurl": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-+      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=",
-       "dev": true
-     },
--    "parse-gitignore": {
--      "version": "0.4.0",
--      "resolved": "https://registry.npmjs.org/parse-gitignore/-/parse-gitignore-0.4.0.tgz",
--      "integrity": "sha1-q/cC5LkAUk//eQK2g4YoV7Y/k/4=",
-+    "meow": {
-+      "version": "4.0.1",
-+      "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz",
-+      "integrity": "sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==",
-       "dev": true,
-       "requires": {
--        "array-unique": "0.3.2",
--        "is-glob": "3.1.0"
-+        "camelcase-keys": "4.2.0",
-+        "decamelize-keys": "1.1.0",
-+        "loud-rejection": "1.6.0",
-+        "minimist": "1.2.0",
-+        "minimist-options": "3.0.2",
-+        "normalize-package-data": "2.4.0",
-+        "read-pkg-up": "3.0.0",
-+        "redent": "2.0.0",
-+        "trim-newlines": "2.0.0"
-       },
-       "dependencies": {
--        "array-unique": {
--          "version": "0.3.2",
--          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
--          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
--          "dev": true
-+        "find-up": {
-+          "version": "2.1.0",
-+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-+          "dev": true,
-+          "requires": {
-+            "locate-path": "2.0.0"
-+          }
-         },
--        "is-extglob": {
--          "version": "2.1.1",
--          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
--          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
--          "dev": true
-+        "load-json-file": {
-+          "version": "4.0.0",
-+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
-+          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
-+          "dev": true,
-+          "requires": {
-+            "graceful-fs": "4.1.11",
-+            "parse-json": "4.0.0",
-+            "pify": "3.0.0",
-+            "strip-bom": "3.0.0"
-+          }
-         },
--        "is-glob": {
--          "version": "3.1.0",
--          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
--          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-+        "parse-json": {
-+          "version": "4.0.0",
-+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-+          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
-           "dev": true,
-           "requires": {
--            "is-extglob": "2.1.1"
-+            "error-ex": "1.3.1",
-+            "json-parse-better-errors": "1.0.2"
-           }
--        }
--      }
--    },
--    "parse-glob": {
--      "version": "3.0.4",
--      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
--      "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
--      "dev": true,
--      "requires": {
--        "glob-base": "0.3.0",
--        "is-dotfile": "1.0.3",
--        "is-extglob": "1.0.0",
--        "is-glob": "2.0.1"
-+        },
-+        "path-type": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-+          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-+          "dev": true,
-+          "requires": {
-+            "pify": "3.0.0"
-+          }
-+        },
-+        "pify": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-+          "dev": true
-+        },
-+        "read-pkg": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
-+          "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
-+          "dev": true,
-+          "requires": {
-+            "load-json-file": "4.0.0",
-+            "normalize-package-data": "2.4.0",
-+            "path-type": "3.0.0"
-+          }
-+        },
-+        "read-pkg-up": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
-+          "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
-+          "dev": true,
-+          "requires": {
-+            "find-up": "2.1.0",
-+            "read-pkg": "3.0.0"
-+          }
-+        },
-+        "strip-bom": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-+          "dev": true
-+        }
-       }
-     },
--    "parse-json": {
--      "version": "2.2.0",
--      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
--      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-+    "micro": {
-+      "version": "9.3.1",
-+      "resolved": "https://registry.npmjs.org/micro/-/micro-9.3.1.tgz",
-+      "integrity": "sha512-83uimpPJqfwkfKvJl2WWontBlV3hmzrIgyJ+L2uhDXKNk7Ll+/ezK3zBz7TljubpKPqjM0JdT2Ker4MTPmhjgA==",
-       "dev": true,
-       "requires": {
--        "error-ex": "1.3.1"
-+        "arg": "2.0.0",
-+        "chalk": "2.4.0",
-+        "content-type": "1.0.4",
-+        "is-stream": "1.1.0",
-+        "raw-body": "2.3.2"
-+      },
-+      "dependencies": {
-+        "ansi-styles": {
-+          "version": "3.2.1",
-+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-+          "dev": true,
-+          "requires": {
-+            "color-convert": "1.9.1"
-+          }
-+        },
-+        "chalk": {
-+          "version": "2.4.0",
-+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz",
-+          "integrity": "sha512-Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw==",
-+          "dev": true,
-+          "requires": {
-+            "ansi-styles": "3.2.1",
-+            "escape-string-regexp": "1.0.5",
-+            "supports-color": "5.4.0"
-+          }
-+        },
-+        "has-flag": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-+          "dev": true
-+        },
-+        "supports-color": {
-+          "version": "5.4.0",
-+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
-+          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-+          "dev": true,
-+          "requires": {
-+            "has-flag": "3.0.0"
-+          }
-+        }
-       }
-     },
--    "parse5": {
--      "version": "1.5.1",
--      "resolved": "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz",
--      "integrity": "sha1-m387DeMr543CQBsXVzzK8Pb1nZQ=",
-+    "micro-compress": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/micro-compress/-/micro-compress-1.0.0.tgz",
-+      "integrity": "sha1-U/WoC0rQMgyhZaVZtuPfFF1PcE8=",
-       "dev": true,
--      "optional": true
-+      "requires": {
-+        "compression": "1.7.3"
-+      }
-     },
--    "path-browserify": {
--      "version": "0.0.0",
--      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
--      "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
--      "dev": true
-+    "micromatch": {
-+      "version": "2.3.11",
-+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-+      "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-+      "dev": true,
-+      "requires": {
-+        "arr-diff": "2.0.0",
-+        "array-unique": "0.2.1",
-+        "braces": "1.8.5",
-+        "expand-brackets": "0.1.5",
-+        "extglob": "0.3.2",
-+        "filename-regex": "2.0.1",
-+        "is-extglob": "1.0.0",
-+        "is-glob": "2.0.1",
-+        "kind-of": "3.2.2",
-+        "normalize-path": "2.1.1",
-+        "object.omit": "2.0.1",
-+        "parse-glob": "3.0.4",
-+        "regex-cache": "0.4.4"
-+      }
-     },
--    "path-exists": {
--      "version": "2.1.0",
--      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
--      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-+    "miller-rabin": {
-+      "version": "4.0.1",
-+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-+      "integrity": "sha1-8IA1HIZbDcViqEYpZtqlNUPHik0=",
-       "dev": true,
-       "requires": {
--        "pinkie-promise": "2.0.1"
-+        "bn.js": "4.11.8",
-+        "brorand": "1.1.0"
-       }
-     },
--    "path-is-absolute": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
--      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-+    "mime": {
-+      "version": "1.6.0",
-+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-       "dev": true
-     },
--    "path-is-inside": {
--      "version": "1.0.2",
--      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
--      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
-+    "mime-db": {
-+      "version": "1.33.0",
-+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz",
-+      "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==",
-       "dev": true
-     },
--    "path-key": {
--      "version": "2.0.1",
--      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
--      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
-+    "mime-types": {
-+      "version": "2.1.18",
-+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz",
-+      "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
-+      "dev": true,
-+      "requires": {
-+        "mime-db": "1.33.0"
-+      }
-+    },
-+    "mimic-fn": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
-       "dev": true
-     },
--    "path-parse": {
--      "version": "1.0.5",
--      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
--      "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
-+    "minimalistic-assert": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-       "dev": true
-     },
--    "path-platform": {
--      "version": "0.11.15",
--      "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz",
--      "integrity": "sha1-6GQhf3TDaFDwhSt43Hv31KVyG/I=",
-+    "minimalistic-crypto-utils": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-+      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
-       "dev": true
-     },
--    "path-type": {
--      "version": "1.1.0",
--      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
--      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-+    "minimatch": {
-+      "version": "3.0.4",
-+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-+      "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
-       "dev": true,
-       "requires": {
--        "graceful-fs": "4.1.11",
--        "pify": "2.3.0",
--        "pinkie-promise": "2.0.1"
-+        "brace-expansion": "1.1.11"
-       }
-     },
--    "pbkdf2": {
--      "version": "3.0.16",
--      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.16.tgz",
--      "integrity": "sha512-y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA==",
-+    "minimist": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-+      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-+      "dev": true
-+    },
-+    "minimist-options": {
-+      "version": "3.0.2",
-+      "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-3.0.2.tgz",
-+      "integrity": "sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==",
-       "dev": true,
-       "requires": {
--        "create-hash": "1.2.0",
--        "create-hmac": "1.1.7",
--        "ripemd160": "2.0.2",
--        "safe-buffer": "5.1.2",
--        "sha.js": "2.4.11"
-+        "arrify": "1.0.1",
-+        "is-plain-obj": "1.1.0"
-       }
-     },
--    "peek-stream": {
--      "version": "1.1.3",
--      "resolved": "https://registry.npmjs.org/peek-stream/-/peek-stream-1.1.3.tgz",
--      "integrity": "sha512-FhJ+YbOSBb9/rIl2ZeE/QHEsWn7PqNYt8ARAY3kIgNGOk13g9FGyIY6JIl/xB/3TFRVoTv5as0l11weORrTekA==",
-+    "minipass": {
-+      "version": "2.3.0",
-+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.0.tgz",
-+      "integrity": "sha512-jWC2Eg+Np4bxah7llu1IrUNSJQxtLz/J+pOjTM0nFpJXGAaV18XBWhUn031Q1tAA/TJtA1jgwnOe9S2PQa4Lbg==",
-       "dev": true,
-       "requires": {
--        "buffer-from": "1.0.0",
--        "duplexify": "3.6.0",
--        "through2": "2.0.3"
-+        "safe-buffer": "5.1.2",
-+        "yallist": "3.0.2"
-       }
-     },
--    "performance-now": {
--      "version": "2.1.0",
--      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
--      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
--      "dev": true
-+    "minizlib": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz",
-+      "integrity": "sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==",
-+      "dev": true,
-+      "requires": {
-+        "minipass": "2.3.0"
-+      }
-     },
--    "pify": {
--      "version": "2.3.0",
--      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
--      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-+    "mkdirp": {
-+      "version": "0.5.1",
-+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-+      "dev": true,
-+      "requires": {
-+        "minimist": "0.0.8"
-+      },
-+      "dependencies": {
-+        "minimist": {
-+          "version": "0.0.8",
-+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-+=======
-+    "ieee754": {
-+      "version": "1.1.8",
-+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz",
-+      "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=",
-       "dev": true
-     },
--    "pinkie": {
--      "version": "2.0.4",
--      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
--      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-+    "ignore": {
-+      "version": "3.3.7",
-+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz",
-+      "integrity": "sha512-YGG3ejvBNHRqu0559EOxxNFihD0AjpvHlC/pdGKd3X3ofe+CoJkYazwNJYTNebqpPKN+VVQbh4ZFn1DivMNuHA==",
-       "dev": true
-     },
--    "pinkie-promise": {
--      "version": "2.0.1",
--      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
--      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-+    "import-lazy": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
-+      "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=",
-+      "dev": true
-+    },
-+    "imurmurhash": {
-+      "version": "0.1.4",
-+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-+      "dev": true
-+    },
-+    "indent-string": {
-+      "version": "3.2.0",
-+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
-+      "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=",
-+      "dev": true
-+    },
-+    "indexof": {
-+      "version": "0.0.1",
-+      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
-+      "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
-+      "dev": true
-+    },
-+    "inflight": {
-+      "version": "1.0.6",
-+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-       "dev": true,
-       "requires": {
--        "pinkie": "2.0.4"
-+        "once": "1.4.0",
-+        "wrappy": "1.0.2"
-       }
-     },
--    "pkg-conf": {
--      "version": "2.1.0",
--      "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-2.1.0.tgz",
--      "integrity": "sha1-ISZRTKbyq/69FoWW3xi6V4Z/AFg=",
-+    "inherits": {
-+      "version": "2.0.3",
-+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-+      "dev": true
-+    },
-+    "ini": {
-+      "version": "1.3.5",
-+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
-+      "dev": true
-+    },
-+    "inline-source-map": {
-+      "version": "0.6.2",
-+      "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.6.2.tgz",
-+      "integrity": "sha1-+Tk0ccGKedFyT4Y/o4tYY3Ct4qU=",
-       "dev": true,
-       "requires": {
--        "find-up": "2.1.0",
--        "load-json-file": "4.0.0"
-+        "source-map": "0.5.7"
-+      }
-+    },
-+    "inquirer": {
-+      "version": "0.12.0",
-+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz",
-+      "integrity": "sha1-HvK/1jUE3wvHV4X/+MLEHfEvB34=",
-+      "dev": true,
-+      "requires": {
-+        "ansi-escapes": "1.4.0",
-+        "ansi-regex": "2.1.1",
-+        "chalk": "1.1.3",
-+        "cli-cursor": "1.0.2",
-+        "cli-width": "2.2.0",
-+        "figures": "1.7.0",
-+        "lodash": "4.17.5",
-+        "readline2": "1.0.1",
-+        "run-async": "0.1.0",
-+        "rx-lite": "3.1.2",
-+        "string-width": "1.0.2",
-+        "strip-ansi": "3.0.1",
-+        "through": "2.3.8"
-+      }
-+    },
-+    "insert-module-globals": {
-+      "version": "7.0.2",
-+      "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.0.2.tgz",
-+      "integrity": "sha512-p3s7g96Nm62MbHRuj9ZXab0DuJNWD7qcmdUXCOQ/ZZn42DtDXfsLill7bq19lDCx3K3StypqUnuE3H2VmIJFUw==",
-+      "dev": true,
-+      "requires": {
-+        "JSONStream": "1.3.2",
-+        "combine-source-map": "0.7.2",
-+        "concat-stream": "1.5.2",
-+        "is-buffer": "1.1.6",
-+        "lexical-scope": "1.2.0",
-+        "process": "0.11.10",
-+        "through2": "2.0.3",
-+        "xtend": "4.0.1"
-       },
-       "dependencies": {
--        "find-up": {
--          "version": "2.1.0",
--          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
--          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
--          "dev": true,
--          "requires": {
--            "locate-path": "2.0.0"
--          }
--        },
--        "load-json-file": {
--          "version": "4.0.0",
--          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
--          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
--          "dev": true,
--          "requires": {
--            "graceful-fs": "4.1.11",
--            "parse-json": "4.0.0",
--            "pify": "3.0.0",
--            "strip-bom": "3.0.0"
--          }
--        },
--        "parse-json": {
--          "version": "4.0.0",
--          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
--          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
-+        "combine-source-map": {
-+          "version": "0.7.2",
-+          "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.7.2.tgz",
-+          "integrity": "sha1-CHAxKFazB6h8xKxIbzqaYq7MwJ4=",
-           "dev": true,
-           "requires": {
--            "error-ex": "1.3.1",
--            "json-parse-better-errors": "1.0.2"
-+            "convert-source-map": "1.1.3",
-+            "inline-source-map": "0.6.2",
-+            "lodash.memoize": "3.0.4",
-+            "source-map": "0.5.7"
-           }
--        },
--        "pify": {
--          "version": "3.0.0",
--          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
--          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
--          "dev": true
--        },
--        "strip-bom": {
--          "version": "3.0.0",
--          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
--          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
--          "dev": true
-         }
-       }
-     },
--    "pkg-config": {
--      "version": "1.1.1",
--      "resolved": "https://registry.npmjs.org/pkg-config/-/pkg-config-1.1.1.tgz",
--      "integrity": "sha1-VX7yLXPaPIg3EHdmxS6tq94pj+Q=",
--      "dev": true,
--      "requires": {
--        "debug-log": "1.0.1",
--        "find-root": "1.1.0",
--        "xtend": "4.0.1"
--      }
-+    "interpret": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz",
-+      "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=",
-+      "dev": true
-     },
--    "pkg-dir": {
-+    "invert-kv": {
-       "version": "1.0.0",
--      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz",
--      "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=",
--      "dev": true,
--      "requires": {
--        "find-up": "1.1.2"
--      }
-+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-+      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
-+      "dev": true
-     },
--    "pkg-up": {
-+    "is-arrayish": {
-+      "version": "0.2.1",
-+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-+      "dev": true
-+    },
-+    "is-buffer": {
-+      "version": "1.1.6",
-+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-+      "dev": true
-+    },
-+    "is-builtin-module": {
-       "version": "1.0.0",
--      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-1.0.0.tgz",
--      "integrity": "sha1-Pgj7RhUlxEIWJKM7n35tCvWwWiY=",
-+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
-+      "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
-       "dev": true,
-       "requires": {
--        "find-up": "1.1.2"
-+        "builtin-modules": "1.1.1"
-       }
-     },
--    "plur": {
--      "version": "2.1.2",
--      "resolved": "https://registry.npmjs.org/plur/-/plur-2.1.2.tgz",
--      "integrity": "sha1-dIJFLBoPUI4+NE6uwxLJHCncZVo=",
-+    "is-callable": {
-+      "version": "1.1.3",
-+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz",
-+      "integrity": "sha1-hut1OSgF3cM69xySoO7fdO52BLI=",
-+      "dev": true
-+    },
-+    "is-ci": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.1.0.tgz",
-+      "integrity": "sha512-c7TnwxLePuqIlxHgr7xtxzycJPegNHFuIrBkwbf8hc58//+Op1CqFkyS+xnIMkwn9UsJIwc174BIjkyBmSpjKg==",
-       "dev": true,
-       "requires": {
--        "irregular-plurals": "1.4.0"
-+        "ci-info": "1.1.3"
-       }
-     },
--    "pluralize": {
--      "version": "1.2.1",
--      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz",
--      "integrity": "sha1-0aIUg/0iu0HlihL6NCGCMUCJfEU=",
--      "dev": true
--    },
--    "prelude-ls": {
--      "version": "1.1.2",
--      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
--      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-+    "is-date-object": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
-+      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
-       "dev": true
-     },
--    "prepend-http": {
--      "version": "1.0.4",
--      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
--      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
-+    "is-deflate": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/is-deflate/-/is-deflate-1.0.0.tgz",
-+      "integrity": "sha1-yGKQHDwWH7CdrHzcfnhPgOmPLxQ=",
-       "dev": true
-     },
--    "preserve": {
--      "version": "0.2.0",
--      "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
--      "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
-+    "is-dotfile": {
-+      "version": "1.0.3",
-+      "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
-+      "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
-       "dev": true
-     },
--    "pretty-bytes": {
--      "version": "1.0.4",
--      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz",
--      "integrity": "sha1-CiLoIQYJrTVUL4yNXSFZr/B1HIQ=",
-+    "is-equal-shallow": {
-+      "version": "0.1.3",
-+      "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
-+      "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
-       "dev": true,
-       "requires": {
--        "get-stdin": "4.0.1",
--        "meow": "3.7.0"
--      },
--      "dependencies": {
--        "camelcase": {
--          "version": "2.1.1",
--          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
--          "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
--          "dev": true
--        },
--        "camelcase-keys": {
--          "version": "2.1.0",
--          "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
--          "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
--          "dev": true,
--          "requires": {
--            "camelcase": "2.1.1",
--            "map-obj": "1.0.1"
--          }
--        },
--        "indent-string": {
--          "version": "2.1.0",
--          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
--          "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
--          "dev": true,
--          "requires": {
--            "repeating": "2.0.1"
--          }
--        },
--        "map-obj": {
--          "version": "1.0.1",
--          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
--          "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
--          "dev": true
--        },
--        "meow": {
--          "version": "3.7.0",
--          "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
--          "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
--          "dev": true,
--          "requires": {
--            "camelcase-keys": "2.1.0",
--            "decamelize": "1.2.0",
--            "loud-rejection": "1.6.0",
--            "map-obj": "1.0.1",
--            "minimist": "1.2.0",
--            "normalize-package-data": "2.4.0",
--            "object-assign": "4.1.1",
--            "read-pkg-up": "1.0.1",
--            "redent": "1.0.0",
--            "trim-newlines": "1.0.0"
--          }
--        },
--        "redent": {
--          "version": "1.0.0",
--          "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
--          "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
--          "dev": true,
--          "requires": {
--            "indent-string": "2.1.0",
--            "strip-indent": "1.0.1"
--          }
--        },
--        "strip-indent": {
--          "version": "1.0.1",
--          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
--          "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
--          "dev": true,
--          "requires": {
--            "get-stdin": "4.0.1"
--          }
--        },
--        "trim-newlines": {
--          "version": "1.0.0",
--          "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
--          "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
--          "dev": true
--        }
-+        "is-primitive": "2.0.0"
-       }
-     },
--    "process": {
--      "version": "0.11.10",
--      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
--      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-+    "is-extendable": {
-+      "version": "0.1.1",
-+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-       "dev": true
-     },
--    "process-nextick-args": {
--      "version": "2.0.0",
--      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
--      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
-+    "is-extglob": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-+      "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-       "dev": true
-     },
--    "progress": {
--      "version": "2.0.0",
--      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz",
--      "integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=",
-+    "is-file": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/is-file/-/is-file-1.0.0.tgz",
-+      "integrity": "sha1-KKRM+9nT2xkwRfIrZfzo7fliBZY=",
-       "dev": true
-     },
--    "progress-stream": {
--      "version": "1.2.0",
--      "resolved": "https://registry.npmjs.org/progress-stream/-/progress-stream-1.2.0.tgz",
--      "integrity": "sha1-LNPP6jO6OonJwSHsM0er6asSX3c=",
-+    "is-finite": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
-+      "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
-       "dev": true,
-       "requires": {
--        "speedometer": "0.1.4",
--        "through2": "0.2.3"
--      },
--      "dependencies": {
--        "through2": {
--          "version": "0.2.3",
--          "resolved": "https://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
--          "integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=",
--          "dev": true,
--          "requires": {
--            "readable-stream": "1.1.14",
--            "xtend": "2.1.2"
--          }
--        },
--        "xtend": {
--          "version": "2.1.2",
--          "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
--          "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
--          "dev": true,
--          "requires": {
--            "object-keys": "0.4.0"
--          }
--        }
-+        "number-is-nan": "1.0.1"
-       }
-     },
--    "pseudomap": {
--      "version": "1.0.2",
--      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
--      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
--      "dev": true
--    },
--    "public-encrypt": {
--      "version": "4.0.2",
--      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz",
--      "integrity": "sha512-4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==",
-+    "is-fullwidth-code-point": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-+      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-       "dev": true,
-       "requires": {
--        "bn.js": "4.11.8",
--        "browserify-rsa": "4.0.1",
--        "create-hash": "1.2.0",
--        "parse-asn1": "5.1.1",
--        "randombytes": "2.0.6"
-+        "number-is-nan": "1.0.1"
-       }
-     },
--    "pump": {
-+    "is-glob": {
-       "version": "2.0.1",
--      "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
--      "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-+      "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-       "dev": true,
-       "requires": {
--        "end-of-stream": "1.4.1",
--        "once": "1.4.0"
-+        "is-extglob": "1.0.0"
-       }
-     },
--    "pumpify": {
--      "version": "1.5.0",
--      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.0.tgz",
--      "integrity": "sha512-UWi0klDoq8xtVzlMRgENV9F7iCTZExaJQSQL187UXsxpk9NnrKGqTqqUNYAKGOzucSOxs2+jUnRNI+rLviPhJg==",
-+    "is-gzip": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/is-gzip/-/is-gzip-1.0.0.tgz",
-+      "integrity": "sha1-bKiwe5nHeZgCWQDlVc7Y7YCHmoM=",
-+      "dev": true
-+    },
-+    "is-installed-globally": {
-+      "version": "0.1.0",
-+      "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz",
-+      "integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=",
-       "dev": true,
-       "requires": {
--        "duplexify": "3.6.0",
--        "inherits": "2.0.3",
--        "pump": "2.0.1"
-+        "global-dirs": "0.1.1",
-+        "is-path-inside": "1.0.1"
-       }
-     },
--    "punycode": {
--      "version": "1.4.1",
--      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
--      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-+    "is-my-ip-valid": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz",
-+      "integrity": "sha512-gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ==",
-       "dev": true
-     },
--    "q": {
--      "version": "1.5.1",
--      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
--      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
--      "dev": true
-+    "is-my-json-valid": {
-+      "version": "2.17.2",
-+      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz",
-+      "integrity": "sha512-IBhBslgngMQN8DDSppmgDv7RNrlFotuuDsKcrCP3+HbFaVivIBU7u9oiiErw8sH4ynx3+gOGQ3q2otkgiSi6kg==",
-+      "dev": true,
-+      "requires": {
-+        "generate-function": "2.0.0",
-+        "generate-object-property": "1.2.0",
-+        "is-my-ip-valid": "1.0.0",
-+        "jsonpointer": "4.0.1",
-+        "xtend": "4.0.1"
-+      }
-     },
--    "qs": {
--      "version": "6.5.2",
--      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
--      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-+    "is-npm": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz",
-+      "integrity": "sha1-8vtjpl5JBbQGyGBydloaTceTufQ=",
-       "dev": true
-     },
--    "querystring": {
--      "version": "0.2.0",
--      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
--      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
--      "dev": true
-+    "is-number": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-+      "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
-+      "dev": true,
-+      "requires": {
-+        "kind-of": "3.2.2"
-+      }
-     },
--    "querystring-es3": {
--      "version": "0.2.1",
--      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
--      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
-+    "is-obj": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-+      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
-       "dev": true
-     },
--    "quick-lru": {
--      "version": "1.1.0",
--      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz",
--      "integrity": "sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=",
-+    "is-path-cwd": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
-+      "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
-       "dev": true
-     },
--    "randomatic": {
--      "version": "3.0.0",
--      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.0.0.tgz",
--      "integrity": "sha512-VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA==",
-+    "is-path-in-cwd": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz",
-+      "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=",
-       "dev": true,
-       "requires": {
--        "is-number": "4.0.0",
--        "kind-of": "6.0.2",
--        "math-random": "1.0.1"
--      },
--      "dependencies": {
--        "is-number": {
--          "version": "4.0.0",
--          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
--          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
--          "dev": true
--        },
--        "kind-of": {
--          "version": "6.0.2",
--          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
--          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
--          "dev": true
--        }
-+        "is-path-inside": "1.0.1"
-       }
-     },
--    "randombytes": {
--      "version": "2.0.6",
--      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz",
--      "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
-+    "is-path-inside": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
-+      "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
-       "dev": true,
-       "requires": {
--        "safe-buffer": "5.1.2"
-+        "path-is-inside": "1.0.2"
-       }
-     },
--    "randomfill": {
-+    "is-plain-obj": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
-+      "dev": true
-+    },
-+    "is-posix-bracket": {
-+      "version": "0.1.1",
-+      "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
-+      "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
-+      "dev": true
-+    },
-+    "is-primitive": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
-+      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
-+      "dev": true
-+    },
-+    "is-property": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
-+      "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=",
-+      "dev": true
-+    },
-+    "is-redirect": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
-+      "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
-+      "dev": true
-+    },
-+    "is-regex": {
-       "version": "1.0.4",
--      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
--      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
-+      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
-       "dev": true,
-       "requires": {
--        "randombytes": "2.0.6",
--        "safe-buffer": "5.1.2"
-+        "has": "1.0.1"
-       }
-     },
--    "range-parser": {
--      "version": "1.2.0",
--      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
--      "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=",
-+    "is-resolvable": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-+      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
-       "dev": true
-     },
--    "raw-body": {
--      "version": "2.3.2",
--      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz",
--      "integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=",
--      "dev": true,
--      "requires": {
--        "bytes": "3.0.0",
--        "http-errors": "1.6.2",
--        "iconv-lite": "0.4.19",
--        "unpipe": "1.0.0"
--      }
-+    "is-retry-allowed": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
-+      "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=",
-+      "dev": true
-     },
--    "rc": {
--      "version": "1.2.7",
--      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.7.tgz",
--      "integrity": "sha512-LdLD8xD4zzLsAT5xyushXDNscEjB7+2ulnl8+r1pnESlYtlJtVSoCMBGr30eDRJ3+2Gq89jK9P9e4tCEH1+ywA==",
-+    "is-stream": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
-+      "dev": true
-+    },
-+    "is-subset": {
-+      "version": "0.1.1",
-+      "resolved": "https://registry.npmjs.org/is-subset/-/is-subset-0.1.1.tgz",
-+      "integrity": "sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY=",
-+      "dev": true
-+    },
-+    "is-symbol": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz",
-+      "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=",
-+      "dev": true
-+    },
-+    "is-text-path": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz",
-+      "integrity": "sha1-Thqg+1G/vLPpJogAE5cgLBd1tm4=",
-       "dev": true,
-       "requires": {
--        "deep-extend": "0.5.1",
--        "ini": "1.3.5",
--        "minimist": "1.2.0",
--        "strip-json-comments": "2.0.1"
-+        "text-extensions": "1.7.0"
-       }
-     },
--    "read-only-stream": {
-+    "is-typedarray": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-+      "dev": true
-+    },
-+    "is-utf8": {
-+      "version": "0.2.1",
-+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-+      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
-+      "dev": true
-+    },
-+    "isarray": {
-+      "version": "0.0.1",
-+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-+      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-+      "dev": true
-+    },
-+    "isexe": {
-       "version": "2.0.0",
--      "resolved": "https://registry.npmjs.org/read-only-stream/-/read-only-stream-2.0.0.tgz",
--      "integrity": "sha1-JyT9aoET1zdkrCiNQ4YnDB2/F/A=",
-+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-+      "dev": true
-+    },
-+    "isobject": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-+      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-       "dev": true,
-       "requires": {
--        "readable-stream": "2.3.6"
-+        "isarray": "1.0.0"
-       },
-       "dependencies": {
-         "isarray": {
-           "version": "1.0.0",
-           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-+>>>>>>> .their
-           "dev": true
--        },
--        "readable-stream": {
--          "version": "2.3.6",
--          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
--          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
--          "dev": true,
--          "requires": {
--            "core-util-is": "1.0.2",
--            "inherits": "2.0.3",
--            "isarray": "1.0.0",
--            "process-nextick-args": "2.0.0",
--            "safe-buffer": "5.1.2",
--            "string_decoder": "1.1.1",
--            "util-deprecate": "1.0.2"
--          }
--        },
--        "string_decoder": {
--          "version": "1.1.1",
--          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
--          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
--          "dev": true,
--          "requires": {
--            "safe-buffer": "5.1.2"
--          }
-         }
-       }
-     },
--    "read-pkg": {
--      "version": "1.1.0",
--      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
--      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-+<<<<<<< .our
-+    "mkpath": {
-+      "version": "0.1.0",
-+      "resolved": "https://registry.npmjs.org/mkpath/-/mkpath-0.1.0.tgz",
-+      "integrity": "sha1-dVSm+Nhxg0zJe1RisSLEwSTW3pE=",
-+      "dev": true
-+    },
-+    "mksnapshot": {
-+      "version": "0.3.1",
-+      "resolved": "https://registry.npmjs.org/mksnapshot/-/mksnapshot-0.3.1.tgz",
-+      "integrity": "sha1-JQHAVldDbXQs6Vik/5LHfkDdN+Y=",
-       "dev": true,
-       "requires": {
--        "load-json-file": "1.1.0",
--        "normalize-package-data": "2.4.0",
--        "path-type": "1.1.0"
-+        "decompress-zip": "0.3.0",
-+        "fs-extra": "0.26.7",
-+        "request": "2.85.0"
-       }
-     },
--    "read-pkg-up": {
-+    "modify-values": {
-       "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
--      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
--      "dev": true,
--      "requires": {
--        "find-up": "1.1.2",
--        "read-pkg": "1.1.0"
--      }
-+      "resolved": "https://registry.npmjs.org/modify-values/-/modify-values-1.0.1.tgz",
-+      "integrity": "sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==",
-+      "dev": true
-     },
--    "readable-stream": {
--      "version": "1.1.14",
--      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
--      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-+    "module-deps": {
-+      "version": "4.1.1",
-+      "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-4.1.1.tgz",
-+      "integrity": "sha1-IyFYM/HaE/1gbMuAh7RIUty4If0=",
-       "dev": true,
-       "requires": {
--        "core-util-is": "1.0.2",
-+        "JSONStream": "1.3.2",
-+        "browser-resolve": "1.11.2",
-+        "cached-path-relative": "1.0.1",
-+        "concat-stream": "1.5.2",
-+        "defined": "1.0.0",
-+        "detective": "4.7.1",
-+        "duplexer2": "0.1.4",
-         "inherits": "2.0.3",
--        "isarray": "0.0.1",
--        "string_decoder": "0.10.31"
--      }
--    },
--    "readdirp": {
--      "version": "2.1.0",
--      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz",
--      "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
--      "dev": true,
--      "requires": {
--        "graceful-fs": "4.1.11",
--        "minimatch": "3.0.4",
-+        "parents": "1.0.1",
-         "readable-stream": "2.3.6",
--        "set-immediate-shim": "1.0.1"
-+        "resolve": "1.7.1",
-+        "stream-combiner2": "1.1.1",
-+        "subarg": "1.0.0",
-+        "through2": "2.0.3",
-+        "xtend": "4.0.1"
-       },
-       "dependencies": {
-         "isarray": {
-@@ -7214,717 +7940,3764 @@
-         }
-       }
-     },
--    "readline2": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz",
--      "integrity": "sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU=",
--      "dev": true,
--      "requires": {
--        "code-point-at": "1.1.0",
--        "is-fullwidth-code-point": "1.0.0",
--        "mute-stream": "0.0.5"
--      }
-+    "mri": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/mri/-/mri-1.1.0.tgz",
-+      "integrity": "sha1-XAo/KcjM/7ux7JQdzsCdcfoy82o=",
-+      "dev": true
-     },
--    "rechoir": {
--      "version": "0.6.2",
--      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
--      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
--      "dev": true,
--      "requires": {
--        "resolve": "1.7.1"
--      }
--    },
--    "redent": {
-+    "ms": {
-       "version": "2.0.0",
--      "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz",
--      "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=",
-+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-+      "dev": true
-+    },
-+    "mute-stream": {
-+      "version": "0.0.5",
-+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz",
-+      "integrity": "sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA=",
-+      "dev": true
-+    },
-+    "nan": {
-+      "version": "2.10.0",
-+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
-+      "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==",
-       "dev": true,
--      "requires": {
--        "indent-string": "3.2.0",
--        "strip-indent": "2.0.0"
--      }
-+      "optional": true
-     },
--    "regex-cache": {
--      "version": "0.4.4",
--      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
--      "integrity": "sha1-db3FiioUls7EihKDW8VMjVYjNt0=",
-+    "natural-compare": {
-+      "version": "1.4.0",
-+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-+      "dev": true
-+    },
-+    "negotiator": {
-+      "version": "0.6.1",
-+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
-+      "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=",
-+      "dev": true
-+    },
-+    "netrc": {
-+      "version": "0.1.4",
-+      "resolved": "https://registry.npmjs.org/netrc/-/netrc-0.1.4.tgz",
-+      "integrity": "sha1-a+lPysqNd63gqWcNxGCRTJRHJEQ=",
-+      "dev": true
-+    },
-+    "next-tick": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
-+      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
-+      "dev": true
-+    },
-+    "node-dir": {
-+      "version": "0.1.17",
-+      "resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz",
-+      "integrity": "sha1-X1Zl2TNRM1yqvvjxxVRRbPXx5OU=",
-       "dev": true,
-       "requires": {
--        "is-equal-shallow": "0.1.3"
-+        "minimatch": "3.0.4"
-       }
-     },
--    "registry-auth-token": {
--      "version": "3.3.2",
--      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz",
--      "integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==",
-+    "node-fetch": {
-+      "version": "2.1.2",
-+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.1.2.tgz",
-+      "integrity": "sha1-q4hOjn5X44qUR1POxwb3iNF2i7U=",
-+      "dev": true
-+    },
-+    "node-version": {
-+      "version": "1.1.3",
-+      "resolved": "https://registry.npmjs.org/node-version/-/node-version-1.1.3.tgz",
-+      "integrity": "sha512-rEwE51JWn0yN3Wl5BXeGn5d52OGbSXzWiiXRjAQeuyvcGKyvuSILW2rb3G7Xh+nexzLwhTpek6Ehxd6IjvHePg==",
-+      "dev": true
-+    },
-+    "nopt": {
-+      "version": "3.0.6",
-+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-+      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-       "dev": true,
-       "requires": {
--        "rc": "1.2.7",
--        "safe-buffer": "5.1.2"
-+        "abbrev": "1.1.1"
-       }
-     },
--    "registry-url": {
--      "version": "3.1.0",
--      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz",
--      "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=",
-+    "normalize-package-data": {
-+      "version": "2.4.0",
-+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-+      "integrity": "sha1-EvlaMH1YNSB1oEkHuErIvpisAS8=",
-       "dev": true,
-       "requires": {
--        "rc": "1.2.7"
-+        "hosted-git-info": "2.6.0",
-+        "is-builtin-module": "1.0.0",
-+        "semver": "5.5.0",
-+        "validate-npm-package-license": "3.0.3"
-       }
-     },
--    "remark": {
--      "version": "8.0.0",
--      "resolved": "https://registry.npmjs.org/remark/-/remark-8.0.0.tgz",
--      "integrity": "sha512-K0PTsaZvJlXTl9DN6qYlvjTkqSZBFELhROZMrblm2rB+085flN84nz4g/BscKRMqDvhzlK1oQ/xnWQumdeNZYw==",
-+    "normalize-path": {
-+      "version": "2.1.1",
-+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-+      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-       "dev": true,
-       "requires": {
--        "remark-parse": "4.0.0",
--        "remark-stringify": "4.0.0",
--        "unified": "6.2.0"
-+        "remove-trailing-separator": "1.1.0"
-       }
-     },
--    "remark-cli": {
--      "version": "4.0.0",
--      "resolved": "https://registry.npmjs.org/remark-cli/-/remark-cli-4.0.0.tgz",
--      "integrity": "sha512-q5GMjGypUS4rTZb3WfMQcGpClSC38A9Ogg1h/HB2GLsqypDetmAfy0X+tuJ6JeyCPVOXXCDgsDCQq4QPqKmxBA==",
-+    "npm-prefix": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/npm-prefix/-/npm-prefix-1.2.0.tgz",
-+      "integrity": "sha1-5hlFX3B0ulTMZtbQ033Z8b5ry8A=",
-       "dev": true,
-       "requires": {
--        "markdown-extensions": "1.1.1",
--        "remark": "8.0.0",
--        "unified-args": "4.0.0"
-+        "rc": "1.2.7",
-+        "shellsubstitute": "1.2.0",
-+        "untildify": "2.1.0"
-       }
-     },
--    "remark-lint": {
--      "version": "6.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint/-/remark-lint-6.0.1.tgz",
--      "integrity": "sha512-wvTTuB5O5pF8SxqahQjjrU3dtuhygYjaGcOZTw+4ACgSE4RBINDlNqN46HjcV3X0ib5GmObJUt5a2mmhtmuTqw==",
-+    "npm-run-path": {
-+      "version": "2.0.2",
-+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-       "dev": true,
-       "requires": {
--        "remark-message-control": "4.1.0"
-+        "path-key": "2.0.1"
-       }
-     },
--    "remark-lint-blockquote-indentation": {
-+    "nth-check": {
-       "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-blockquote-indentation/-/remark-lint-blockquote-indentation-1.0.1.tgz",
--      "integrity": "sha512-YrP99MJ3+dQ5JXzq39fUOcYzwcumva/xEM1eFtD2TrQcSdlMLoqYa7gj+aEEhZCjlA5BssTiVoWWW0RjyPPGZw==",
-+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz",
-+      "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=",
-       "dev": true,
-       "requires": {
--        "mdast-util-to-string": "1.0.4",
--        "plur": "2.1.2",
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "boolbase": "1.0.0"
-       }
-     },
--    "remark-lint-code-block-style": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-code-block-style/-/remark-lint-code-block-style-1.0.1.tgz",
--      "integrity": "sha512-FRUMhhKwCruH4vkatdMhVO4WlYpysV1NmMILVoK/k+/7uFLSfgvlqo66nzhpMdWL8TQHqdo0LhiXuetGC2WjsQ==",
-+    "nugget": {
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/nugget/-/nugget-2.0.1.tgz",
-+      "integrity": "sha1-IBCVpIfhrTYIGzQy+jytpPjQcbA=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "debug": "2.6.9",
-+        "minimist": "1.2.0",
-+        "pretty-bytes": "1.0.4",
-+        "progress-stream": "1.2.0",
-+        "request": "2.85.0",
-+        "single-line-log": "1.1.2",
-+        "throttleit": "0.0.2"
-       }
-     },
--    "remark-lint-definition-case": {
-+    "number-is-nan": {
-       "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-definition-case/-/remark-lint-definition-case-1.0.1.tgz",
--      "integrity": "sha512-TxLye5KF4o/rKVTvmPRX5jS9itamFS02yy1IG8bIYcIAJvWsW3GlJaXq4ohK3hKwSQOhtCherEfD6XF9BHLNYQ==",
-+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-+      "dev": true
-+    },
-+    "nwmatcher": {
-+      "version": "1.4.4",
-+      "resolved": "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.4.tgz",
-+      "integrity": "sha512-3iuY4N5dhgMpCUrOVnuAdGrgxVqV2cJpM+XNccjR2DKOB1RUP0aA+wGXEiNziG/UKboFyGBIoKOaNlJxx8bciQ==",
-       "dev": true,
--      "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
--      }
-+      "optional": true
-     },
--    "remark-lint-definition-spacing": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-definition-spacing/-/remark-lint-definition-spacing-1.0.1.tgz",
--      "integrity": "sha512-ewzdlFfpTSP11ZuiOln0yfz6Y03aWtgJmLVQNfF1spaT1gURaShjs8Hiilbo719bz96DgvXSZLP6UnkSiZL1vg==",
-+    "oauth-sign": {
-+      "version": "0.8.2",
-+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-+      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
-+      "dev": true
-+    },
-+    "object-assign": {
-+      "version": "4.1.1",
-+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-+      "dev": true
-+    },
-+    "object-keys": {
-+      "version": "0.4.0",
-+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
-+      "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=",
-+      "dev": true
-+    },
-+    "object.assign": {
-+      "version": "4.1.0",
-+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
-+      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "define-properties": "1.1.2",
-+        "function-bind": "1.1.1",
-+        "has-symbols": "1.0.0",
-+        "object-keys": "1.0.11"
-+      },
-+      "dependencies": {
-+        "object-keys": {
-+          "version": "1.0.11",
-+          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
-+          "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=",
-+          "dev": true
-+        }
-       }
-     },
--    "remark-lint-emphasis-marker": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-emphasis-marker/-/remark-lint-emphasis-marker-1.0.1.tgz",
--      "integrity": "sha512-QyNsD6y8EZQqhechw0XFGybYMlxn6PFLSlFUO50KSQlJEOgkImN2yJfrNrET2GY4t/fc/uYmeI/q7auUIkLX2w==",
-+    "object.omit": {
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
-+      "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "for-own": "0.1.5",
-+        "is-extendable": "0.1.1"
-       }
-     },
--    "remark-lint-fenced-code-flag": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-fenced-code-flag/-/remark-lint-fenced-code-flag-1.0.1.tgz",
--      "integrity": "sha512-P24T9DRe/nnywPFRpE1UAXAVzN1CX6HmINr15UHbQZo1Cy8KYt7uV9YOR0/XzphtnO/AFenAqZyf7tchW5AUNQ==",
-+    "octicons": {
-+      "version": "7.3.0",
-+      "resolved": "https://registry.npmjs.org/octicons/-/octicons-7.3.0.tgz",
-+      "integrity": "sha512-UVjlkmUL15Ef/7Rd72Io634Bdl61QgSMasAZpvXPoR2XNFj1RelAyhl4QJuR1hBGlPWFDR7KFj2jEzsFax2IUg==",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "object-assign": "4.1.1"
-       }
-     },
--    "remark-lint-fenced-code-marker": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-fenced-code-marker/-/remark-lint-fenced-code-marker-1.0.1.tgz",
--      "integrity": "sha512-mX7xAMl5m7xGX+YtOtyXIyv+egD4IQAm6DPGdfunI734QwODwcoBydtpTD56jrY+48nVcQ/anFYT1Blg3Xk3sQ==",
-+    "on-finished": {
-+      "version": "2.3.0",
-+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-+      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "ee-first": "1.1.1"
-       }
-     },
--    "remark-lint-file-extension": {
-+    "on-headers": {
-       "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-file-extension/-/remark-lint-file-extension-1.0.1.tgz",
--      "integrity": "sha512-K1Pf5oviaFyCs0FhZqaNZ2odgd5KoV6AlA4nNAMxyylB0Y6t0mYpzECoLSS5Bgxf6f8Op9YbuM2cbjBAsv0dIA==",
-+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz",
-+      "integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=",
-+      "dev": true
-+    },
-+    "once": {
-+      "version": "1.4.0",
-+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2"
-+        "wrappy": "1.0.2"
-       }
-     },
--    "remark-lint-final-definition": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-final-definition/-/remark-lint-final-definition-1.0.1.tgz",
--      "integrity": "sha512-DK6bphJdQ0xSOQAn+8wOyLIVc3SZW2+ZzCMCLkQnVtHiQ9GHMzFiCkeE3Cq+OClsMI5Yn8wFTHZHPUn58VhNEQ==",
-+    "onetime": {
-+      "version": "1.1.0",
-+      "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
-+      "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
-+      "dev": true
-+    },
-+    "openssl-self-signed-certificate": {
-+      "version": "1.1.6",
-+      "resolved": "https://registry.npmjs.org/openssl-self-signed-certificate/-/openssl-self-signed-certificate-1.1.6.tgz",
-+      "integrity": "sha1-nTpHdrGlfphHNQOSEUrS+RWoPdQ=",
-+      "dev": true
-+    },
-+    "opn": {
-+      "version": "5.3.0",
-+      "resolved": "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz",
-+      "integrity": "sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "is-wsl": "1.1.0"
-       }
-     },
--    "remark-lint-hard-break-spaces": {
--      "version": "1.0.2",
--      "resolved": "https://registry.npmjs.org/remark-lint-hard-break-spaces/-/remark-lint-hard-break-spaces-1.0.2.tgz",
--      "integrity": "sha512-uh7LqHgRPCphiCvRzBVA4D0Ml2IqPaw89lWJdQ6HvYiV8ChB/OFLBapHi6OKW7NVVVPPJsElPMB/UPUsKFaPTg==",
-+    "optimist": {
-+      "version": "0.3.7",
-+      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
-+      "integrity": "sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "wordwrap": "0.0.3"
-       }
-     },
--    "remark-lint-heading-increment": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-heading-increment/-/remark-lint-heading-increment-1.0.1.tgz",
--      "integrity": "sha512-jBAJacXAU5drUpvmymOoFmrdCCNDiz8bzGgJIMjpT0Vyjd0+qdXu2iyFMl/4RkkUli25rpUDXkTHTcxmNbh7Zw==",
-+    "optionator": {
-+      "version": "0.8.2",
-+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
-+      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-visit": "1.3.1"
-+        "deep-is": "0.1.3",
-+        "fast-levenshtein": "2.0.6",
-+        "levn": "0.3.0",
-+        "prelude-ls": "1.1.2",
-+        "type-check": "0.3.2",
-+        "wordwrap": "1.0.0"
-+      },
-+      "dependencies": {
-+        "wordwrap": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-+          "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
-+          "dev": true
-+        }
-       }
-     },
--    "remark-lint-heading-style": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-heading-style/-/remark-lint-heading-style-1.0.1.tgz",
--      "integrity": "sha512-m9Gqr091YdxUtG69xdXYH8fSd3+nsrsMamB/qSWpVSZuWQKZ1mRotr1LO9NphJh6vhw8IfBtG07wgEDn6b40sQ==",
-+    "ora": {
-+      "version": "0.3.0",
-+      "resolved": "https://registry.npmjs.org/ora/-/ora-0.3.0.tgz",
-+      "integrity": "sha1-NnoHitJc+wltpQERXrW0AeB9dJU=",
-       "dev": true,
-       "requires": {
--        "mdast-util-heading-style": "1.0.3",
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-visit": "1.3.1"
--      }
-+        "chalk": "1.1.3",
-+        "cli-cursor": "1.0.2",
-+        "cli-spinners": "0.2.0",
-+        "log-symbols": "1.0.2"
-+      },
-+      "dependencies": {
-+        "cli-spinners": {
-+          "version": "0.2.0",
-+          "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-0.2.0.tgz",
-+          "integrity": "sha1-hQeHN5E7iA9uyf/ntl6D7Hd2KE8=",
-+=======
-+    "isstream": {
-+      "version": "0.1.2",
-+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-+      "dev": true
-     },
--    "remark-lint-link-title-style": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-link-title-style/-/remark-lint-link-title-style-1.0.1.tgz",
--      "integrity": "sha512-91MyqmZjokSzRbgvlKq5sLCJEFkM/MNKT1PDaWa3+GDLBGu7D4eMQGd2x49xX8IdJDEoWy5D8W+2Gb8XKWMUyw==",
-+    "istanbul": {
-+      "version": "0.4.5",
-+      "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz",
-+      "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1",
--        "vfile-location": "2.0.3"
-+        "abbrev": "1.0.9",
-+        "async": "1.5.2",
-+        "escodegen": "1.8.1",
-+        "esprima": "2.7.3",
-+        "glob": "5.0.15",
-+        "handlebars": "4.0.11",
-+        "js-yaml": "3.11.0",
-+        "mkdirp": "0.5.1",
-+        "nopt": "3.0.6",
-+        "once": "1.4.0",
-+        "resolve": "1.1.7",
-+        "supports-color": "3.2.3",
-+        "which": "1.3.0",
-+        "wordwrap": "1.0.0"
-+      },
-+      "dependencies": {
-+        "abbrev": {
-+          "version": "1.0.9",
-+          "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
-+          "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=",
-+          "dev": true
-+        },
-+        "glob": {
-+          "version": "5.0.15",
-+          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-+          "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-+          "dev": true,
-+          "requires": {
-+            "inflight": "1.0.6",
-+            "inherits": "2.0.3",
-+            "minimatch": "3.0.4",
-+            "once": "1.4.0",
-+            "path-is-absolute": "1.0.1"
-+          }
-+        },
-+        "resolve": {
-+          "version": "1.1.7",
-+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-+          "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
-+          "dev": true
-+        },
-+        "wordwrap": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-+          "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
-+          "dev": true
-+        }
-       }
-     },
--    "remark-lint-list-item-content-indent": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-list-item-content-indent/-/remark-lint-list-item-content-indent-1.0.1.tgz",
--      "integrity": "sha512-R5cdXFFywoBcg+2UUcF9OJ/vt9oqJv+KmTKIQV9CFHWeAfMFiZbxazsSPNaCcO1fW9622hxPCawN/AofDTbP7Q==",
-+    "js-tokens": {
-+      "version": "3.0.2",
-+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-+      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
-+      "dev": true
-+    },
-+    "js-yaml": {
-+      "version": "3.11.0",
-+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz",
-+      "integrity": "sha512-saJstZWv7oNeOyBh3+Dx1qWzhW0+e6/8eDzo7p5rDFqxntSztloLtuKu+Ejhtq82jsilwOIZYsCz+lIjthg1Hw==",
-       "dev": true,
-       "requires": {
--        "plur": "2.1.2",
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "argparse": "1.0.10",
-+        "esprima": "4.0.0"
-+      },
-+      "dependencies": {
-+        "esprima": {
-+          "version": "4.0.0",
-+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
-+          "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==",
-+          "dev": true
-+        }
-       }
-     },
--    "remark-lint-list-item-indent": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-list-item-indent/-/remark-lint-list-item-indent-1.0.1.tgz",
--      "integrity": "sha512-dSUFGQYtduuaos+5oXH89RTk0rGUe6DFf04q+rxQ7Z3YRbuXhAU2nYeY0/HENYiWJU1xFLteZkDvKMj0NfS3DQ==",
-+    "jsbn": {
-+      "version": "0.1.1",
-+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-       "dev": true,
--      "requires": {
--        "plur": "2.1.2",
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
--      }
-+      "optional": true
-     },
--    "remark-lint-list-item-spacing": {
--      "version": "1.1.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-list-item-spacing/-/remark-lint-list-item-spacing-1.1.1.tgz",
--      "integrity": "sha512-HlPEzRq4LJB6tQ72zgIZ42mOaOSX92O268BLolys/H1x6N29/JNMLfurWqLsrxZrxxHH3H7EUP4dNM2P1kDGBw==",
-+    "jsdom": {
-+      "version": "7.2.2",
-+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-7.2.2.tgz",
-+      "integrity": "sha1-QLQCdwwr2iNGkJa+6Rq2deOx/G4=",
-       "dev": true,
-+      "optional": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "abab": "1.0.4",
-+        "acorn": "2.7.0",
-+        "acorn-globals": "1.0.9",
-+        "cssom": "0.3.2",
-+        "cssstyle": "0.2.37",
-+        "escodegen": "1.8.1",
-+        "nwmatcher": "1.4.3",
-+        "parse5": "1.5.1",
-+        "request": "2.85.0",
-+        "sax": "1.2.4",
-+        "symbol-tree": "3.2.2",
-+        "tough-cookie": "2.3.4",
-+        "webidl-conversions": "2.0.1",
-+        "whatwg-url-compat": "0.6.5",
-+        "xml-name-validator": "2.0.1"
-+      },
-+      "dependencies": {
-+        "acorn": {
-+          "version": "2.7.0",
-+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz",
-+          "integrity": "sha1-q259nYhqrKiwhbwzEreaGYQz8Oc=",
-+          "dev": true,
-+          "optional": true
-+        }
-       }
-     },
--    "remark-lint-maximum-heading-length": {
-+    "json-parse-better-errors": {
-       "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-maximum-heading-length/-/remark-lint-maximum-heading-length-1.0.1.tgz",
--      "integrity": "sha512-f8ChV9U238gncyvTqmzJ+UpCMj+hFyluWBjVYr2K8CNh+MdSivIxS4zw4170sBRoqNuS3gBxRHG9f4rmdqotJA==",
-+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz",
-+      "integrity": "sha512-xyQpxeWWMKyJps9CuGJYeng6ssI5bpqS9ltQpdVQ90t4ql6NdnxFKh95JcRt2cun/DjMVNrdjniLPuMA69xmCw==",
-+      "dev": true
-+    },
-+    "json-schema": {
-+      "version": "0.2.3",
-+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-+      "dev": true
-+    },
-+    "json-schema-traverse": {
-+      "version": "0.3.1",
-+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-+      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
-+      "dev": true
-+    },
-+    "json-stable-stringify": {
-+      "version": "0.0.1",
-+      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz",
-+      "integrity": "sha1-YRwj6BTbN1Un34URk9tZ3Sryf0U=",
-       "dev": true,
-       "requires": {
--        "mdast-util-to-string": "1.0.4",
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-visit": "1.3.1"
-+        "jsonify": "0.0.0"
-       }
-     },
--    "remark-lint-maximum-line-length": {
--      "version": "1.0.2",
--      "resolved": "https://registry.npmjs.org/remark-lint-maximum-line-length/-/remark-lint-maximum-line-length-1.0.2.tgz",
--      "integrity": "sha512-M4UIXAAbtLgoQbTDVwdKOEFbTKtJSZ+pCW7ZqMFs+cbIN0Svm32LM9+xpVfVU0hLYt3Ypl++EAPfguBNe1PZEw==",
-+    "json-stringify-safe": {
-+      "version": "5.0.1",
-+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-+      "dev": true
-+    },
-+    "jsonfile": {
-+      "version": "2.4.0",
-+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
-+      "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "graceful-fs": "4.1.11"
-       }
-     },
--    "remark-lint-no-auto-link-without-protocol": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-no-auto-link-without-protocol/-/remark-lint-no-auto-link-without-protocol-1.0.1.tgz",
--      "integrity": "sha512-MHl0hNtF8Rc0lg6iuVP7/0rnp4uZadm3S07/1TiFeqzU22KFxxzcC8980Q4+I8oPZE0d1x80h9DmkNAVFwhDjQ==",
-+    "jsonify": {
-+      "version": "0.0.0",
-+      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-+      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
-+      "dev": true
-+    },
-+    "jsonparse": {
-+      "version": "1.3.1",
-+      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
-+      "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
-+      "dev": true
-+    },
-+    "jsonpointer": {
-+      "version": "4.0.1",
-+      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
-+      "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",
-+      "dev": true
-+    },
-+    "jsprim": {
-+      "version": "1.4.1",
-+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-       "dev": true,
-       "requires": {
--        "mdast-util-to-string": "1.0.4",
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "assert-plus": "1.0.0",
-+        "extsprintf": "1.3.0",
-+        "json-schema": "0.2.3",
-+        "verror": "1.10.0"
-       }
-     },
--    "remark-lint-no-blockquote-without-marker": {
--      "version": "2.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-no-blockquote-without-marker/-/remark-lint-no-blockquote-without-marker-2.0.1.tgz",
--      "integrity": "sha512-8VTQ/MP3flvG4U0tFSD+DMVT7F/4u9SnQLb/jjeRC3DzgbsIagIUqpWYAKkc+yBz9S/lgftA92lLP5PrlOa5DA==",
-+    "jsx-ast-utils": {
-+      "version": "1.4.1",
-+      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz",
-+      "integrity": "sha1-OGchPo3Xm/Ho8jAMDPwe+xgsDfE=",
-+      "dev": true
-+    },
-+    "keyed-array": {
-+      "version": "2.1.2",
-+      "resolved": "https://registry.npmjs.org/keyed-array/-/keyed-array-2.1.2.tgz",
-+      "integrity": "sha1-isE3thMi7V7Rx7Qbn5zQZmMcrOA=",
-+      "dev": true
-+    },
-+    "kind-of": {
-+      "version": "3.2.2",
-+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1",
--        "vfile-location": "2.0.3"
-+        "is-buffer": "1.1.6"
-       }
-     },
--    "remark-lint-no-consecutive-blank-lines": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-no-consecutive-blank-lines/-/remark-lint-no-consecutive-blank-lines-1.0.1.tgz",
--      "integrity": "sha512-IhyUiGTpb/hjtusIVg10q963KeL5CyNfbWOfDZ1KtY2tvdoSPRGrrCuTKo6OG8r1qavM6bU0mtRuIBqNh4lIzA==",
-+    "klaw": {
-+      "version": "1.3.1",
-+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
-+      "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
-       "dev": true,
-       "requires": {
--        "plur": "2.1.2",
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "graceful-fs": "4.1.11"
-       }
-     },
--    "remark-lint-no-duplicate-headings": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-no-duplicate-headings/-/remark-lint-no-duplicate-headings-1.0.1.tgz",
--      "integrity": "sha512-iZZxyZgwnjvDkydKZzqHBueJvIpGbxnITmgd8xN8TOLZoAg9/KGTQRAkotL1HXNRdkzwggfgB9ONxv/rWtYBmg==",
-+    "labeled-stream-splicer": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.0.tgz",
-+      "integrity": "sha1-pS4dE4AkwAuGscDJH2d5GLiuClk=",
-       "dev": true,
-       "requires": {
--        "mdast-util-to-string": "1.0.4",
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "inherits": "2.0.3",
-+        "isarray": "0.0.1",
-+        "stream-splicer": "2.0.0"
-       }
-     },
--    "remark-lint-no-emphasis-as-heading": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-no-emphasis-as-heading/-/remark-lint-no-emphasis-as-heading-1.0.1.tgz",
--      "integrity": "sha512-+x17Hrjwne4Mhk2x/Zolnuv/sOclF1oYMDBSEYhBUpn/UAwxhXEXYKkeo0KkWA7Q3+UCLELJvzsk4cGNP6Sgow==",
-+    "latest-version": {
-+      "version": "3.1.0",
-+      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz",
-+      "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-visit": "1.3.1"
-+        "package-json": "4.0.1"
-       }
-     },
--    "remark-lint-no-file-name-articles": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-no-file-name-articles/-/remark-lint-no-file-name-articles-1.0.1.tgz",
--      "integrity": "sha512-SzebnFnilrsINA6QZP1YqPa3SrfSotrLkRWl5FUCoVshBvEFNKJFWXj6Xyt4NjWQ5tJWFtOMysAuHdGT+Odhjg==",
-+    "lazy-cache": {
-+      "version": "1.0.4",
-+      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
-+      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
-+      "dev": true,
-+      "optional": true
-+    },
-+    "lcid": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-+      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2"
-+        "invert-kv": "1.0.0"
-       }
-     },
--    "remark-lint-no-file-name-consecutive-dashes": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-no-file-name-consecutive-dashes/-/remark-lint-no-file-name-consecutive-dashes-1.0.1.tgz",
--      "integrity": "sha512-YP2HBwA00yeD7phvxp4ftiqbfBPfYHPgPfcEcb8oNa1WlUh/58cs9DbSHWKsZG+XLkvEaheC6qUQG02jEKZHPA==",
-+    "levn": {
-+      "version": "0.3.0",
-+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2"
-+        "prelude-ls": "1.1.2",
-+        "type-check": "0.3.2"
-       }
-     },
--    "remark-lint-no-file-name-irregular-characters": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-no-file-name-irregular-characters/-/remark-lint-no-file-name-irregular-characters-1.0.1.tgz",
--      "integrity": "sha512-+ks/V6OVMGOPZKw+fe2E4DPvLoslGxvdgtqXq2Nyz0cEdYX8RP45kI79V4w95H7UCJAeOFM9mZzVLvmCY1sEbg==",
-+    "lexical-scope": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.2.0.tgz",
-+      "integrity": "sha1-/Ope3HBKSzqHls3KQZw6CvryLfQ=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2"
-+        "astw": "2.2.0"
-       }
-     },
--    "remark-lint-no-file-name-mixed-case": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-no-file-name-mixed-case/-/remark-lint-no-file-name-mixed-case-1.0.1.tgz",
--      "integrity": "sha512-bcqPsow1C0LrsKII1YehUO7VPOER7nze6FzsZZ8/NP+d200OL7Y7VMCqN1kscAvG+PTJgjznyXuLEpy7KQnVFg==",
-+    "linkify-it": {
-+      "version": "1.2.4",
-+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-1.2.4.tgz",
-+      "integrity": "sha1-B3NSbDF8j9E71TTuHRgP+Iq/iBo=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2"
-+        "uc.micro": "1.0.5"
-       }
-     },
--    "remark-lint-no-file-name-outer-dashes": {
--      "version": "1.0.2",
--      "resolved": "https://registry.npmjs.org/remark-lint-no-file-name-outer-dashes/-/remark-lint-no-file-name-outer-dashes-1.0.2.tgz",
--      "integrity": "sha512-BVEwLrA4kipalgKrxhncpgtmh6eUmHBH1ggC+X3csYR4X5vXv4vHQqpov4I1vMyWxMLMBnq7lTL3Iqp0CS4vwg==",
-+    "load-json-file": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-+      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2"
-+        "graceful-fs": "4.1.11",
-+        "parse-json": "2.2.0",
-+        "pify": "2.3.0",
-+        "pinkie-promise": "2.0.1",
-+        "strip-bom": "2.0.0"
-       }
-     },
--    "remark-lint-no-heading-punctuation": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-no-heading-punctuation/-/remark-lint-no-heading-punctuation-1.0.1.tgz",
--      "integrity": "sha512-/7kGRmPT+JLxEME1Z/rQn99mP8yr4qXFwcniKYsefR1jl8pCZciwCIp2Tq92Nn+FPELVrpk9sloRBb2JP3UB0A==",
-+    "locate-path": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-+      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-       "dev": true,
-       "requires": {
--        "mdast-util-to-string": "1.0.4",
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-visit": "1.3.1"
-+        "p-locate": "2.0.0",
-+        "path-exists": "3.0.0"
-+      },
-+      "dependencies": {
-+        "path-exists": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-+          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-+>>>>>>> .their
-+          "dev": true
-+        }
-       }
-     },
--    "remark-lint-no-inline-padding": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-no-inline-padding/-/remark-lint-no-inline-padding-1.0.1.tgz",
--      "integrity": "sha512-nRl6vA45ZPdMz3/rVMZw7WRRqLFuMrzhdkrbrGLjwBovdIeD/IGCEbDA5NR60g2xT9V5dAmKogvHEH1bIr8SdQ==",
-+<<<<<<< .our
-+    "os-browserify": {
-+      "version": "0.1.2",
-+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz",
-+      "integrity": "sha1-ScoCk+CxlZCl9d4Qx/JlphfY/lQ=",
-+      "dev": true
-+    },
-+    "os-homedir": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-+      "dev": true
-+    },
-+    "os-locale": {
-+      "version": "1.4.0",
-+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-+      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-       "dev": true,
-       "requires": {
--        "mdast-util-to-string": "1.0.4",
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-visit": "1.3.1"
-+        "lcid": "1.0.0"
-       }
-     },
--    "remark-lint-no-literal-urls": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-no-literal-urls/-/remark-lint-no-literal-urls-1.0.1.tgz",
--      "integrity": "sha512-YMsZFVYQDt9gvpc6THL76GzyhCR+cK79vjyEOEmX+O3tOjxQstbi0oW6Lngbl1WbpkCW5TWEzSKOorQowYI2wg==",
-+    "os-tmpdir": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-+      "dev": true
-+    },
-+    "p-finally": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
-+      "dev": true
-+    },
-+    "p-limit": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz",
-+      "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==",
-       "dev": true,
-       "requires": {
--        "mdast-util-to-string": "1.0.4",
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "p-try": "1.0.0"
-       }
-     },
--    "remark-lint-no-multiple-toplevel-headings": {
-+    "p-locate": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-+      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-+      "dev": true,
-+      "requires": {
-+        "p-limit": "1.2.0"
-+      }
-+    },
-+    "p-try": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-+      "dev": true
-+    },
-+    "package-json": {
-+      "version": "4.0.1",
-+      "resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz",
-+      "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=",
-+      "dev": true,
-+      "requires": {
-+        "got": "6.7.1",
-+        "registry-auth-token": "3.3.2",
-+        "registry-url": "3.1.0",
-+        "semver": "5.5.0"
-+      }
-+    },
-+    "pako": {
-+      "version": "0.2.9",
-+      "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
-+      "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=",
-+      "dev": true
-+    },
-+    "parents": {
-       "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-no-multiple-toplevel-headings/-/remark-lint-no-multiple-toplevel-headings-1.0.1.tgz",
--      "integrity": "sha512-LFfgjF3NKFkt0tGNnJ8Exf8+DrVcMRwek5qu5mvh2KrZnmSpm5flYWzUy2UnnIyicDL3CZYC/r3Fjz6CeBYgZA==",
-+      "resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz",
-+      "integrity": "sha1-/t1NK/GTp3dF/nHjcdc8MwfZx1E=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "path-platform": "0.11.15"
-       }
-     },
--    "remark-lint-no-shell-dollars": {
-+    "parse-asn1": {
-+      "version": "5.1.1",
-+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz",
-+      "integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==",
-+      "dev": true,
-+      "requires": {
-+        "asn1.js": "4.10.1",
-+        "browserify-aes": "1.2.0",
-+        "create-hash": "1.2.0",
-+        "evp_bytestokey": "1.0.3",
-+        "pbkdf2": "3.0.16"
-+      }
-+    },
-+    "parse-entities": {
-+      "version": "1.1.2",
-+      "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-1.1.2.tgz",
-+      "integrity": "sha512-5N9lmQ7tmxfXf+hO3X6KRG6w7uYO/HL9fHalSySTdyn63C3WNvTM/1R8tn1u1larNcEbo3Slcy2bsVDQqvEpUg==",
-+      "dev": true,
-+      "requires": {
-+        "character-entities": "1.2.2",
-+        "character-entities-legacy": "1.1.2",
-+        "character-reference-invalid": "1.1.2",
-+        "is-alphanumerical": "1.0.2",
-+        "is-decimal": "1.0.2",
-+        "is-hexadecimal": "1.0.2"
-+      }
-+    },
-+    "parse-github-repo-url": {
-+      "version": "1.4.1",
-+      "resolved": "https://registry.npmjs.org/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz",
-+      "integrity": "sha1-nn2LslKmy2ukJZUGC3v23z28H1A=",
-+      "dev": true
-+    },
-+    "parse-gitignore": {
-+      "version": "0.4.0",
-+      "resolved": "https://registry.npmjs.org/parse-gitignore/-/parse-gitignore-0.4.0.tgz",
-+      "integrity": "sha1-q/cC5LkAUk//eQK2g4YoV7Y/k/4=",
-+      "dev": true,
-+      "requires": {
-+        "array-unique": "0.3.2",
-+        "is-glob": "3.1.0"
-+      },
-+      "dependencies": {
-+        "array-unique": {
-+          "version": "0.3.2",
-+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-+          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-+          "dev": true
-+        },
-+        "is-extglob": {
-+          "version": "2.1.1",
-+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-+          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-+          "dev": true
-+        },
-+        "is-glob": {
-+          "version": "3.1.0",
-+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-+          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-+          "dev": true,
-+          "requires": {
-+            "is-extglob": "2.1.1"
-+          }
-+        }
-+      }
-+    },
-+    "parse-glob": {
-+      "version": "3.0.4",
-+      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
-+      "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
-+      "dev": true,
-+      "requires": {
-+        "glob-base": "0.3.0",
-+        "is-dotfile": "1.0.3",
-+        "is-extglob": "1.0.0",
-+        "is-glob": "2.0.1"
-+      }
-+    },
-+    "parse-json": {
-+      "version": "2.2.0",
-+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-+      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-+      "dev": true,
-+      "requires": {
-+        "error-ex": "1.3.1"
-+      }
-+    },
-+    "parse5": {
-+      "version": "1.5.1",
-+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz",
-+      "integrity": "sha1-m387DeMr543CQBsXVzzK8Pb1nZQ=",
-+      "dev": true,
-+      "optional": true
-+    },
-+    "path-browserify": {
-+      "version": "0.0.0",
-+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
-+      "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
-+      "dev": true
-+    },
-+    "path-exists": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-+      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-+      "dev": true,
-+      "requires": {
-+        "pinkie-promise": "2.0.1"
-+      }
-+    },
-+    "path-is-absolute": {
-       "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-no-shell-dollars/-/remark-lint-no-shell-dollars-1.0.1.tgz",
--      "integrity": "sha512-YryHem73PTxjCkuC4HONJWHsmrLyXmF7r+cCH36Ys3vuWsfAbwkbOwpyuPB4KXn+6fHaTUfz/B5BPp3iwzJwyA==",
-+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-+      "dev": true
-+    },
-+    "path-is-inside": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-+      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
-+      "dev": true
-+    },
-+    "path-key": {
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
-+      "dev": true
-+    },
-+    "path-parse": {
-+      "version": "1.0.5",
-+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
-+      "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
-+      "dev": true
-+    },
-+    "path-platform": {
-+      "version": "0.11.15",
-+      "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz",
-+      "integrity": "sha1-6GQhf3TDaFDwhSt43Hv31KVyG/I=",
-+      "dev": true
-+    },
-+    "path-type": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-+      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-+      "dev": true,
-+      "requires": {
-+        "graceful-fs": "4.1.11",
-+        "pify": "2.3.0",
-+        "pinkie-promise": "2.0.1"
-+      }
-+    },
-+    "pbkdf2": {
-+      "version": "3.0.16",
-+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.16.tgz",
-+      "integrity": "sha512-y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA==",
-+      "dev": true,
-+      "requires": {
-+        "create-hash": "1.2.0",
-+        "create-hmac": "1.1.7",
-+        "ripemd160": "2.0.2",
-+        "safe-buffer": "5.1.2",
-+        "sha.js": "2.4.11"
-+      }
-+    },
-+    "peek-stream": {
-+      "version": "1.1.3",
-+      "resolved": "https://registry.npmjs.org/peek-stream/-/peek-stream-1.1.3.tgz",
-+      "integrity": "sha512-FhJ+YbOSBb9/rIl2ZeE/QHEsWn7PqNYt8ARAY3kIgNGOk13g9FGyIY6JIl/xB/3TFRVoTv5as0l11weORrTekA==",
-+      "dev": true,
-+      "requires": {
-+        "buffer-from": "1.0.0",
-+        "duplexify": "3.6.0",
-+        "through2": "2.0.3"
-+      }
-+    },
-+    "performance-now": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-+      "dev": true
-+    },
-+    "pify": {
-+      "version": "2.3.0",
-+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-+      "dev": true
-+    },
-+    "pinkie": {
-+      "version": "2.0.4",
-+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-+      "dev": true
-+    },
-+    "pinkie-promise": {
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-+      "dev": true,
-+      "requires": {
-+        "pinkie": "2.0.4"
-+      }
-+    },
-+    "pkg-conf": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-2.1.0.tgz",
-+      "integrity": "sha1-ISZRTKbyq/69FoWW3xi6V4Z/AFg=",
-+      "dev": true,
-+      "requires": {
-+        "find-up": "2.1.0",
-+        "load-json-file": "4.0.0"
-+=======
-+    "lodash": {
-+      "version": "4.17.5",
-+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz",
-+      "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==",
-+      "dev": true
-+    },
-+    "lodash._reinterpolate": {
-+      "version": "3.0.0",
-+      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-+      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
-+      "dev": true
-+    },
-+    "lodash.assign": {
-+      "version": "4.2.0",
-+      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
-+      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
-+      "dev": true
-+    },
-+    "lodash.assignin": {
-+      "version": "4.2.0",
-+      "resolved": "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz",
-+      "integrity": "sha1-uo31+4QesKPoBEIysOJjqNxqKKI=",
-+      "dev": true
-+    },
-+    "lodash.bind": {
-+      "version": "4.2.1",
-+      "resolved": "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz",
-+      "integrity": "sha1-euMBfpOWIqwxt9fX3LGzTbFpDTU=",
-+      "dev": true
-+    },
-+    "lodash.cond": {
-+      "version": "4.5.2",
-+      "resolved": "https://registry.npmjs.org/lodash.cond/-/lodash.cond-4.5.2.tgz",
-+      "integrity": "sha1-9HGh2khr5g9quVXRcRVSPdHSVdU=",
-+      "dev": true
-+    },
-+    "lodash.defaults": {
-+      "version": "4.2.0",
-+      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
-+      "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=",
-+      "dev": true
-+    },
-+    "lodash.filter": {
-+      "version": "4.6.0",
-+      "resolved": "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz",
-+      "integrity": "sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4=",
-+      "dev": true
-+    },
-+    "lodash.flatten": {
-+      "version": "4.4.0",
-+      "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
-+      "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=",
-+      "dev": true
-+    },
-+    "lodash.foreach": {
-+      "version": "4.5.0",
-+      "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz",
-+      "integrity": "sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=",
-+      "dev": true
-+    },
-+    "lodash.isempty": {
-+      "version": "4.4.0",
-+      "resolved": "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz",
-+      "integrity": "sha1-b4bL7di+TsmHvpqvM8loTbGzHn4=",
-+      "dev": true
-+    },
-+    "lodash.isplainobject": {
-+      "version": "4.0.6",
-+      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-+      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=",
-+      "dev": true
-+    },
-+    "lodash.map": {
-+      "version": "4.6.0",
-+      "resolved": "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz",
-+      "integrity": "sha1-dx7Hg540c9nEzeKLGTlMNWL09tM=",
-+      "dev": true
-+    },
-+    "lodash.memoize": {
-+      "version": "3.0.4",
-+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz",
-+      "integrity": "sha1-LcvSwofLwKVcxCMovQxzYVDVPj8=",
-+      "dev": true
-+    },
-+    "lodash.merge": {
-+      "version": "4.6.1",
-+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz",
-+      "integrity": "sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ==",
-+      "dev": true
-+    },
-+    "lodash.pick": {
-+      "version": "4.4.0",
-+      "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz",
-+      "integrity": "sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=",
-+      "dev": true
-+    },
-+    "lodash.range": {
-+      "version": "3.2.0",
-+      "resolved": "https://registry.npmjs.org/lodash.range/-/lodash.range-3.2.0.tgz",
-+      "integrity": "sha1-9GHliPZmg/fq3q3lE+OKaaVloV0=",
-+      "dev": true
-+    },
-+    "lodash.reduce": {
-+      "version": "4.6.0",
-+      "resolved": "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz",
-+      "integrity": "sha1-8atrg5KZrUj3hKu/R2WW8DuRTTs=",
-+      "dev": true
-+    },
-+    "lodash.reject": {
-+      "version": "4.6.0",
-+      "resolved": "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz",
-+      "integrity": "sha1-gNZJLcFHCGS79YNTO2UfQqn1JBU=",
-+      "dev": true
-+    },
-+    "lodash.some": {
-+      "version": "4.6.0",
-+      "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz",
-+      "integrity": "sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=",
-+      "dev": true
-+    },
-+    "lodash.template": {
-+      "version": "4.4.0",
-+      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.4.0.tgz",
-+      "integrity": "sha1-5zoDhcg1VZF0bgILmWecaQ5o+6A=",
-+      "dev": true,
-+      "requires": {
-+        "lodash._reinterpolate": "3.0.0",
-+        "lodash.templatesettings": "4.1.0"
-+      }
-+    },
-+    "lodash.templatesettings": {
-+      "version": "4.1.0",
-+      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz",
-+      "integrity": "sha1-K01OlbpEDZFf8IvImeRVNmZxMxY=",
-+      "dev": true,
-+      "requires": {
-+        "lodash._reinterpolate": "3.0.0"
-+      }
-+    },
-+    "lodash.transform": {
-+      "version": "4.6.0",
-+      "resolved": "https://registry.npmjs.org/lodash.transform/-/lodash.transform-4.6.0.tgz",
-+      "integrity": "sha1-EjBkIvYzJK7YSD0/ODMrX2cFR6A=",
-+      "dev": true
-+    },
-+    "log-symbols": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz",
-+      "integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=",
-+      "dev": true,
-+      "requires": {
-+        "chalk": "1.1.3"
-+      }
-+    },
-+    "longest": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
-+      "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
-+      "dev": true
-+    },
-+    "loud-rejection": {
-+      "version": "1.6.0",
-+      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
-+      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
-+      "dev": true,
-+      "requires": {
-+        "currently-unhandled": "0.4.1",
-+        "signal-exit": "3.0.2"
-+      }
-+    },
-+    "lowercase-keys": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz",
-+      "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=",
-+      "dev": true
-+    },
-+    "lru-cache": {
-+      "version": "4.1.2",
-+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.2.tgz",
-+      "integrity": "sha512-wgeVXhrDwAWnIF/yZARsFnMBtdFXOg1b8RIrhilp+0iDYN4mdQcNZElDZ0e4B64BhaxeQ5zN7PMyvu7we1kPeQ==",
-+      "dev": true,
-+      "requires": {
-+        "pseudomap": "1.0.2",
-+        "yallist": "2.1.2"
-+      },
-+      "dependencies": {
-+        "yallist": {
-+          "version": "2.1.2",
-+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-+          "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "make-dir": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.2.0.tgz",
-+      "integrity": "sha512-aNUAa4UMg/UougV25bbrU4ZaaKNjJ/3/xnvg/twpmKROPdKZPZ9wGgI0opdZzO8q/zUFawoUuixuOv33eZ61Iw==",
-+      "dev": true,
-+      "requires": {
-+        "pify": "3.0.0"
-+      },
-+      "dependencies": {
-+        "pify": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "map-obj": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz",
-+      "integrity": "sha1-plzSkIepJZi4eRJXpSPgISIqwfk=",
-+      "dev": true
-+    },
-+    "markdown-it": {
-+      "version": "6.1.1",
-+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-6.1.1.tgz",
-+      "integrity": "sha1-ztA39Ec+6fUVOsQU933IPJG6knw=",
-+      "dev": true,
-+      "requires": {
-+        "argparse": "1.0.10",
-+        "entities": "1.1.1",
-+        "linkify-it": "1.2.4",
-+        "mdurl": "1.0.1",
-+        "uc.micro": "1.0.5"
-+      }
-+    },
-+    "markdown-it-named-headers": {
-+      "version": "0.0.4",
-+      "resolved": "https://registry.npmjs.org/markdown-it-named-headers/-/markdown-it-named-headers-0.0.4.tgz",
-+      "integrity": "sha1-gu/CgyQkCmsed7mq5QF3HV81HB8=",
-+      "dev": true,
-+      "requires": {
-+        "string": "3.3.3"
-+      }
-+    },
-+    "marky-markdown-lite": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/marky-markdown-lite/-/marky-markdown-lite-1.2.0.tgz",
-+      "integrity": "sha1-dO2phLgTZVfe4QZO/RXkBhdAaZc=",
-+      "dev": true,
-+      "requires": {
-+        "cheerio": "0.20.0",
-+        "conventional-changelog-cli": "1.3.16",
-+        "is-file": "1.0.0",
-+        "markdown-it": "6.1.1",
-+        "markdown-it-named-headers": "0.0.4"
-+      },
-+      "dependencies": {
-+        "cheerio": {
-+          "version": "0.20.0",
-+          "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.20.0.tgz",
-+          "integrity": "sha1-XHEPK6uVZTJyhCugHG6mGzVF7DU=",
-+          "dev": true,
-+          "requires": {
-+            "css-select": "1.2.0",
-+            "dom-serializer": "0.1.0",
-+            "entities": "1.1.1",
-+            "htmlparser2": "3.8.3",
-+            "jsdom": "7.2.2",
-+            "lodash": "4.17.5"
-+          }
-+        },
-+        "domhandler": {
-+          "version": "2.3.0",
-+          "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz",
-+          "integrity": "sha1-LeWaCCLVAn+r/28DLCsloqir5zg=",
-+          "dev": true,
-+          "requires": {
-+            "domelementtype": "1.3.0"
-+          }
-+        },
-+        "htmlparser2": {
-+          "version": "3.8.3",
-+          "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
-+          "integrity": "sha1-mWwosZFRaovoZQGn15dX5ccMEGg=",
-+          "dev": true,
-+          "requires": {
-+            "domelementtype": "1.3.0",
-+            "domhandler": "2.3.0",
-+            "domutils": "1.5.1",
-+            "entities": "1.0.0",
-+            "readable-stream": "1.1.14"
-+          },
-+          "dependencies": {
-+            "entities": {
-+              "version": "1.0.0",
-+              "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz",
-+              "integrity": "sha1-sph6o4ITR/zeZCsk/fyeT7cSvyY=",
-+              "dev": true
-+            }
-+          }
-+        }
-+      }
-+    },
-+    "matcher-collection": {
-+      "version": "1.0.5",
-+      "resolved": "https://registry.npmjs.org/matcher-collection/-/matcher-collection-1.0.5.tgz",
-+      "integrity": "sha512-nUCmzKipcJEwYsBVAFh5P+d7JBuhJaW1xs85Hara9xuMLqtCVUrW6DSC0JVIkluxEH2W45nPBM/wjHtBXa/tYA==",
-+      "dev": true,
-+      "requires": {
-+        "minimatch": "3.0.4"
-+      }
-+    },
-+    "md5.js": {
-+      "version": "1.3.4",
-+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz",
-+      "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=",
-+      "dev": true,
-+      "requires": {
-+        "hash-base": "3.0.4",
-+        "inherits": "2.0.3"
-+      },
-+      "dependencies": {
-+        "hash-base": {
-+          "version": "3.0.4",
-+          "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
-+          "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
-+          "dev": true,
-+          "requires": {
-+            "inherits": "2.0.3",
-+            "safe-buffer": "5.1.1"
-+          }
-+        }
-+      }
-+    },
-+    "mdurl": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-+      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=",
-+      "dev": true
-+    },
-+    "meow": {
-+      "version": "4.0.0",
-+      "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.0.tgz",
-+      "integrity": "sha512-Me/kel335m6vMKmEmA6c87Z6DUFW3JqkINRnxkbC+A/PUm0D5Fl2dEBQrPKnqCL9Te/CIa1MUt/0InMJhuC/sw==",
-+      "dev": true,
-+      "requires": {
-+        "camelcase-keys": "4.2.0",
-+        "decamelize-keys": "1.1.0",
-+        "loud-rejection": "1.6.0",
-+        "minimist": "1.2.0",
-+        "minimist-options": "3.0.2",
-+        "normalize-package-data": "2.4.0",
-+        "read-pkg-up": "3.0.0",
-+        "redent": "2.0.0",
-+        "trim-newlines": "2.0.0"
-+>>>>>>> .their
-+      },
-+      "dependencies": {
-+        "find-up": {
-+          "version": "2.1.0",
-+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-+          "dev": true,
-+          "requires": {
-+            "locate-path": "2.0.0"
-+          }
-+        },
-+        "load-json-file": {
-+          "version": "4.0.0",
-+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
-+          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
-+          "dev": true,
-+          "requires": {
-+            "graceful-fs": "4.1.11",
-+            "parse-json": "4.0.0",
-+            "pify": "3.0.0",
-+            "strip-bom": "3.0.0"
-+          }
-+        },
-+        "parse-json": {
-+          "version": "4.0.0",
-+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-+          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
-+          "dev": true,
-+          "requires": {
-+            "error-ex": "1.3.1",
-+<<<<<<< .our
-+            "json-parse-better-errors": "1.0.2"
-+=======
-+            "json-parse-better-errors": "1.0.1"
-+          }
-+        },
-+        "path-type": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-+          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-+          "dev": true,
-+          "requires": {
-+            "pify": "3.0.0"
-+>>>>>>> .their
-+          }
-+        },
-+        "pify": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-+          "dev": true
-+        },
-+<<<<<<< .our
-+=======
-+        "read-pkg": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
-+          "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
-+          "dev": true,
-+          "requires": {
-+            "load-json-file": "4.0.0",
-+            "normalize-package-data": "2.4.0",
-+            "path-type": "3.0.0"
-+          }
-+        },
-+        "read-pkg-up": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
-+          "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
-+          "dev": true,
-+          "requires": {
-+            "find-up": "2.1.0",
-+            "read-pkg": "3.0.0"
-+          }
-+        },
-+>>>>>>> .their
-+        "strip-bom": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-+          "dev": true
-+        }
-+      }
-+    },
-+<<<<<<< .our
-+    "pkg-config": {
-+      "version": "1.1.1",
-+      "resolved": "https://registry.npmjs.org/pkg-config/-/pkg-config-1.1.1.tgz",
-+      "integrity": "sha1-VX7yLXPaPIg3EHdmxS6tq94pj+Q=",
-+      "dev": true,
-+      "requires": {
-+        "debug-log": "1.0.1",
-+        "find-root": "1.1.0",
-+        "xtend": "4.0.1"
-+      }
-+    },
-+    "pkg-dir": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz",
-+      "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=",
-+      "dev": true,
-+      "requires": {
-+        "find-up": "1.1.2"
-+      }
-+    },
-+    "pkg-up": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-1.0.0.tgz",
-+      "integrity": "sha1-Pgj7RhUlxEIWJKM7n35tCvWwWiY=",
-+      "dev": true,
-+      "requires": {
-+        "find-up": "1.1.2"
-+      }
-+    },
-+    "plur": {
-+      "version": "2.1.2",
-+      "resolved": "https://registry.npmjs.org/plur/-/plur-2.1.2.tgz",
-+      "integrity": "sha1-dIJFLBoPUI4+NE6uwxLJHCncZVo=",
-+      "dev": true,
-+      "requires": {
-+        "irregular-plurals": "1.4.0"
-+      }
-+    },
-+    "pluralize": {
-+      "version": "1.2.1",
-+      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz",
-+      "integrity": "sha1-0aIUg/0iu0HlihL6NCGCMUCJfEU=",
-+      "dev": true
-+    },
-+    "prelude-ls": {
-+      "version": "1.1.2",
-+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-+      "dev": true
-+    },
-+    "prepend-http": {
-+      "version": "1.0.4",
-+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
-+      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
-+      "dev": true
-+    },
-+    "preserve": {
-+      "version": "0.2.0",
-+      "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
-+      "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
-+      "dev": true
-+    },
-+    "pretty-bytes": {
-+      "version": "1.0.4",
-+      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz",
-+      "integrity": "sha1-CiLoIQYJrTVUL4yNXSFZr/B1HIQ=",
-+      "dev": true,
-+      "requires": {
-+        "get-stdin": "4.0.1",
-+        "meow": "3.7.0"
-+      },
-+      "dependencies": {
-+        "camelcase": {
-+          "version": "2.1.1",
-+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-+          "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
-+          "dev": true
-+        },
-+        "camelcase-keys": {
-+          "version": "2.1.0",
-+          "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
-+          "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
-+          "dev": true,
-+          "requires": {
-+            "camelcase": "2.1.1",
-+            "map-obj": "1.0.1"
-+          }
-+        },
-+        "indent-string": {
-+          "version": "2.1.0",
-+          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-+          "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
-+          "dev": true,
-+          "requires": {
-+            "repeating": "2.0.1"
-+          }
-+        },
-+        "map-obj": {
-+          "version": "1.0.1",
-+          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-+          "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-+          "dev": true
-+        },
-+        "meow": {
-+          "version": "3.7.0",
-+          "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-+          "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
-+          "dev": true,
-+          "requires": {
-+            "camelcase-keys": "2.1.0",
-+            "decamelize": "1.2.0",
-+            "loud-rejection": "1.6.0",
-+            "map-obj": "1.0.1",
-+            "minimist": "1.2.0",
-+            "normalize-package-data": "2.4.0",
-+            "object-assign": "4.1.1",
-+            "read-pkg-up": "1.0.1",
-+            "redent": "1.0.0",
-+            "trim-newlines": "1.0.0"
-+          }
-+        },
-+        "redent": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-+          "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
-+          "dev": true,
-+          "requires": {
-+            "indent-string": "2.1.0",
-+            "strip-indent": "1.0.1"
-+          }
-+        },
-+        "strip-indent": {
-+          "version": "1.0.1",
-+          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
-+          "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
-+          "dev": true,
-+          "requires": {
-+            "get-stdin": "4.0.1"
-+          }
-+        },
-+        "trim-newlines": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-+          "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
-+=======
-+    "micromatch": {
-+      "version": "2.3.11",
-+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-+      "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-+      "dev": true,
-+      "requires": {
-+        "arr-diff": "2.0.0",
-+        "array-unique": "0.2.1",
-+        "braces": "1.8.5",
-+        "expand-brackets": "0.1.5",
-+        "extglob": "0.3.2",
-+        "filename-regex": "2.0.1",
-+        "is-extglob": "1.0.0",
-+        "is-glob": "2.0.1",
-+        "kind-of": "3.2.2",
-+        "normalize-path": "2.1.1",
-+        "object.omit": "2.0.1",
-+        "parse-glob": "3.0.4",
-+        "regex-cache": "0.4.4"
-+      }
-+    },
-+    "miller-rabin": {
-+      "version": "4.0.1",
-+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
-+      "dev": true,
-+      "requires": {
-+        "bn.js": "4.11.8",
-+        "brorand": "1.1.0"
-+      }
-+    },
-+    "mime": {
-+      "version": "1.6.0",
-+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-+      "dev": true
-+    },
-+    "mime-db": {
-+      "version": "1.33.0",
-+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz",
-+      "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==",
-+      "dev": true
-+    },
-+    "mime-types": {
-+      "version": "2.1.18",
-+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz",
-+      "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
-+      "dev": true,
-+      "requires": {
-+        "mime-db": "1.33.0"
-+      }
-+    },
-+    "mimic-fn": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
-+      "dev": true
-+    },
-+    "minimalistic-assert": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz",
-+      "integrity": "sha1-cCvi3aazf0g2vLP121ZkG2Sh09M=",
-+      "dev": true
-+    },
-+    "minimalistic-crypto-utils": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-+      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
-+      "dev": true
-+    },
-+    "minimatch": {
-+      "version": "3.0.4",
-+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-+      "dev": true,
-+      "requires": {
-+        "brace-expansion": "1.1.11"
-+      }
-+    },
-+    "minimist": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-+      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-+      "dev": true
-+    },
-+    "minimist-options": {
-+      "version": "3.0.2",
-+      "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-3.0.2.tgz",
-+      "integrity": "sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==",
-+      "dev": true,
-+      "requires": {
-+        "arrify": "1.0.1",
-+        "is-plain-obj": "1.1.0"
-+      }
-+    },
-+    "minipass": {
-+      "version": "2.2.1",
-+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.2.1.tgz",
-+      "integrity": "sha512-u1aUllxPJUI07cOqzR7reGmQxmCqlH88uIIsf6XZFEWgw7gXKpJdR+5R9Y3KEDmWYkdIz9wXZs3C0jOPxejk/Q==",
-+      "dev": true,
-+      "requires": {
-+        "yallist": "3.0.2"
-+      }
-+    },
-+    "minizlib": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz",
-+      "integrity": "sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==",
-+      "dev": true,
-+      "requires": {
-+        "minipass": "2.2.1"
-+      }
-+    },
-+    "mkdirp": {
-+      "version": "0.5.1",
-+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-+      "dev": true,
-+      "requires": {
-+        "minimist": "0.0.8"
-+      },
-+      "dependencies": {
-+        "minimist": {
-+          "version": "0.0.8",
-+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-+>>>>>>> .their
-+          "dev": true
-+        }
-+      }
-+    },
-+<<<<<<< .our
-+    "process": {
-+      "version": "0.11.10",
-+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-+      "dev": true
-+    },
-+    "process-nextick-args": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-+      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
-+      "dev": true
-+    },
-+    "progress": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz",
-+      "integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=",
-+      "dev": true
-+    },
-+    "progress-stream": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/progress-stream/-/progress-stream-1.2.0.tgz",
-+      "integrity": "sha1-LNPP6jO6OonJwSHsM0er6asSX3c=",
-+      "dev": true,
-+      "requires": {
-+        "speedometer": "0.1.4",
-+        "through2": "0.2.3"
-+      },
-+      "dependencies": {
-+        "through2": {
-+          "version": "0.2.3",
-+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
-+          "integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=",
-+          "dev": true,
-+          "requires": {
-+            "readable-stream": "1.1.14",
-+            "xtend": "2.1.2"
-+          }
-+        },
-+        "xtend": {
-+          "version": "2.1.2",
-+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
-+          "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
-+          "dev": true,
-+          "requires": {
-+            "object-keys": "0.4.0"
-+=======
-+    "mkpath": {
-+      "version": "0.1.0",
-+      "resolved": "https://registry.npmjs.org/mkpath/-/mkpath-0.1.0.tgz",
-+      "integrity": "sha1-dVSm+Nhxg0zJe1RisSLEwSTW3pE=",
-+      "dev": true
-+    },
-+    "mksnapshot": {
-+      "version": "0.3.1",
-+      "resolved": "https://registry.npmjs.org/mksnapshot/-/mksnapshot-0.3.1.tgz",
-+      "integrity": "sha1-JQHAVldDbXQs6Vik/5LHfkDdN+Y=",
-+      "dev": true,
-+      "requires": {
-+        "decompress-zip": "0.3.0",
-+        "fs-extra": "0.26.7",
-+        "request": "2.85.0"
-+      }
-+    },
-+    "modify-values": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/modify-values/-/modify-values-1.0.0.tgz",
-+      "integrity": "sha1-4rbN65zhn5kxelNyLz2/XfXqqrI=",
-+      "dev": true
-+    },
-+    "module-deps": {
-+      "version": "4.1.1",
-+      "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-4.1.1.tgz",
-+      "integrity": "sha1-IyFYM/HaE/1gbMuAh7RIUty4If0=",
-+      "dev": true,
-+      "requires": {
-+        "JSONStream": "1.3.2",
-+        "browser-resolve": "1.11.2",
-+        "cached-path-relative": "1.0.1",
-+        "concat-stream": "1.5.2",
-+        "defined": "1.0.0",
-+        "detective": "4.7.1",
-+        "duplexer2": "0.1.4",
-+        "inherits": "2.0.3",
-+        "parents": "1.0.1",
-+        "readable-stream": "2.3.5",
-+        "resolve": "1.5.0",
-+        "stream-combiner2": "1.1.1",
-+        "subarg": "1.0.0",
-+        "through2": "2.0.3",
-+        "xtend": "4.0.1"
-+      },
-+      "dependencies": {
-+        "isarray": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-+          "dev": true
-+        },
-+        "readable-stream": {
-+          "version": "2.3.5",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
-+          "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
-+          "dev": true,
-+          "requires": {
-+            "core-util-is": "1.0.2",
-+            "inherits": "2.0.3",
-+            "isarray": "1.0.0",
-+            "process-nextick-args": "2.0.0",
-+            "safe-buffer": "5.1.1",
-+            "string_decoder": "1.0.3",
-+            "util-deprecate": "1.0.2"
-+          }
-+        },
-+        "string_decoder": {
-+          "version": "1.0.3",
-+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-+          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-+          "dev": true,
-+          "requires": {
-+            "safe-buffer": "5.1.1"
-+>>>>>>> .their
-+          }
-+        }
-+      }
-+    },
-+<<<<<<< .our
-+    "pseudomap": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
-+      "dev": true
-+    },
-+    "public-encrypt": {
-+      "version": "4.0.2",
-+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz",
-+      "integrity": "sha512-4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==",
-+      "dev": true,
-+      "requires": {
-+        "bn.js": "4.11.8",
-+        "browserify-rsa": "4.0.1",
-+        "create-hash": "1.2.0",
-+        "parse-asn1": "5.1.1",
-+        "randombytes": "2.0.6"
-+      }
-+    },
-+    "pump": {
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
-+      "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-+      "dev": true,
-+      "requires": {
-+        "end-of-stream": "1.4.1",
-+        "once": "1.4.0"
-+      }
-+    },
-+    "pumpify": {
-+      "version": "1.5.0",
-+      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.0.tgz",
-+      "integrity": "sha512-UWi0klDoq8xtVzlMRgENV9F7iCTZExaJQSQL187UXsxpk9NnrKGqTqqUNYAKGOzucSOxs2+jUnRNI+rLviPhJg==",
-+      "dev": true,
-+      "requires": {
-+        "duplexify": "3.6.0",
-+        "inherits": "2.0.3",
-+        "pump": "2.0.1"
-+      }
-+    },
-+    "punycode": {
-+      "version": "1.4.1",
-+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-+      "dev": true
-+    },
-+    "q": {
-+      "version": "1.5.1",
-+      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-+      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
-+      "dev": true
-+    },
-+    "qs": {
-+      "version": "6.5.2",
-+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-+      "dev": true
-+    },
-+    "querystring": {
-+      "version": "0.2.0",
-+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
-+      "dev": true
-+    },
-+    "querystring-es3": {
-+      "version": "0.2.1",
-+      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-+      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
-+      "dev": true
-+    },
-+    "quick-lru": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz",
-+      "integrity": "sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=",
-+      "dev": true
-+    },
-+    "randomatic": {
-+      "version": "3.0.0",
-+      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.0.0.tgz",
-+      "integrity": "sha512-VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA==",
-+      "dev": true,
-+      "requires": {
-+        "is-number": "4.0.0",
-+        "kind-of": "6.0.2",
-+        "math-random": "1.0.1"
-+      },
-+      "dependencies": {
-+        "is-number": {
-+          "version": "4.0.0",
-+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-+          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-+          "dev": true
-+        },
-+        "kind-of": {
-+          "version": "6.0.2",
-+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-+=======
-+    "ms": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-+      "dev": true
-+    },
-+    "mute-stream": {
-+      "version": "0.0.5",
-+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz",
-+      "integrity": "sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA=",
-+      "dev": true
-+    },
-+    "natural-compare": {
-+      "version": "1.4.0",
-+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-+      "dev": true
-+    },
-+    "netrc": {
-+      "version": "0.1.4",
-+      "resolved": "https://registry.npmjs.org/netrc/-/netrc-0.1.4.tgz",
-+      "integrity": "sha1-a+lPysqNd63gqWcNxGCRTJRHJEQ=",
-+      "dev": true
-+    },
-+    "node-dir": {
-+      "version": "0.1.17",
-+      "resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz",
-+      "integrity": "sha1-X1Zl2TNRM1yqvvjxxVRRbPXx5OU=",
-+      "dev": true,
-+      "requires": {
-+        "minimatch": "3.0.4"
-+      }
-+    },
-+    "nopt": {
-+      "version": "3.0.6",
-+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-+      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-+      "dev": true,
-+      "requires": {
-+        "abbrev": "1.1.1"
-+      }
-+    },
-+    "normalize-package-data": {
-+      "version": "2.4.0",
-+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-+      "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
-+      "dev": true,
-+      "requires": {
-+        "hosted-git-info": "2.6.0",
-+        "is-builtin-module": "1.0.0",
-+        "semver": "5.5.0",
-+        "validate-npm-package-license": "3.0.3"
-+      }
-+    },
-+    "normalize-path": {
-+      "version": "2.1.1",
-+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-+      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-+      "dev": true,
-+      "requires": {
-+        "remove-trailing-separator": "1.1.0"
-+      }
-+    },
-+    "npm-run-path": {
-+      "version": "2.0.2",
-+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-+      "dev": true,
-+      "requires": {
-+        "path-key": "2.0.1"
-+      }
-+    },
-+    "nth-check": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz",
-+      "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=",
-+      "dev": true,
-+      "requires": {
-+        "boolbase": "1.0.0"
-+      }
-+    },
-+    "nugget": {
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/nugget/-/nugget-2.0.1.tgz",
-+      "integrity": "sha1-IBCVpIfhrTYIGzQy+jytpPjQcbA=",
-+      "dev": true,
-+      "requires": {
-+        "debug": "2.6.9",
-+        "minimist": "1.2.0",
-+        "pretty-bytes": "1.0.4",
-+        "progress-stream": "1.2.0",
-+        "request": "2.85.0",
-+        "single-line-log": "1.1.2",
-+        "throttleit": "0.0.2"
-+      }
-+    },
-+    "number-is-nan": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-+      "dev": true
-+    },
-+    "nwmatcher": {
-+      "version": "1.4.3",
-+      "resolved": "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.3.tgz",
-+      "integrity": "sha512-IKdSTiDWCarf2JTS5e9e2+5tPZGdkRJ79XjYV0pzK8Q9BpsFyBq1RGKxzs7Q8UBushGw7m6TzVKz6fcY99iSWw==",
-+      "dev": true,
-+      "optional": true
-+    },
-+    "oauth-sign": {
-+      "version": "0.8.2",
-+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-+      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
-+      "dev": true
-+    },
-+    "object-assign": {
-+      "version": "4.1.1",
-+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-+      "dev": true
-+    },
-+    "object-keys": {
-+      "version": "0.4.0",
-+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
-+      "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=",
-+      "dev": true
-+    },
-+    "object.assign": {
-+      "version": "4.1.0",
-+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
-+      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
-+      "dev": true,
-+      "requires": {
-+        "define-properties": "1.1.2",
-+        "function-bind": "1.1.1",
-+        "has-symbols": "1.0.0",
-+        "object-keys": "1.0.11"
-+      },
-+      "dependencies": {
-+        "object-keys": {
-+          "version": "1.0.11",
-+          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
-+          "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=",
-+>>>>>>> .their
-+          "dev": true
-+        }
-+      }
-+    },
-+<<<<<<< .our
-+    "randombytes": {
-+      "version": "2.0.6",
-+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz",
-+      "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
-+      "dev": true,
-+      "requires": {
-+        "safe-buffer": "5.1.2"
-+      }
-+    },
-+    "randomfill": {
-+      "version": "1.0.4",
-+      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-+      "dev": true,
-+      "requires": {
-+        "randombytes": "2.0.6",
-+        "safe-buffer": "5.1.2"
-+      }
-+    },
-+    "range-parser": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
-+      "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=",
-+      "dev": true
-+    },
-+    "raw-body": {
-+      "version": "2.3.2",
-+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz",
-+      "integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=",
-+      "dev": true,
-+      "requires": {
-+        "bytes": "3.0.0",
-+        "http-errors": "1.6.2",
-+        "iconv-lite": "0.4.19",
-+        "unpipe": "1.0.0"
-+      }
-+    },
-+    "rc": {
-+      "version": "1.2.7",
-+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.7.tgz",
-+      "integrity": "sha512-LdLD8xD4zzLsAT5xyushXDNscEjB7+2ulnl8+r1pnESlYtlJtVSoCMBGr30eDRJ3+2Gq89jK9P9e4tCEH1+ywA==",
-+      "dev": true,
-+      "requires": {
-+        "deep-extend": "0.5.1",
-+        "ini": "1.3.5",
-+        "minimist": "1.2.0",
-+        "strip-json-comments": "2.0.1"
-+      }
-+    },
-+    "read-only-stream": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/read-only-stream/-/read-only-stream-2.0.0.tgz",
-+      "integrity": "sha1-JyT9aoET1zdkrCiNQ4YnDB2/F/A=",
-+      "dev": true,
-+      "requires": {
-+        "readable-stream": "2.3.6"
-+      },
-+      "dependencies": {
-+        "isarray": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-+          "dev": true
-+        },
-+        "readable-stream": {
-+          "version": "2.3.6",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-+          "dev": true,
-+          "requires": {
-+            "core-util-is": "1.0.2",
-+            "inherits": "2.0.3",
-+            "isarray": "1.0.0",
-+            "process-nextick-args": "2.0.0",
-+            "safe-buffer": "5.1.2",
-+            "string_decoder": "1.1.1",
-+            "util-deprecate": "1.0.2"
-+          }
-+        },
-+        "string_decoder": {
-+          "version": "1.1.1",
-+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-+          "dev": true,
-+          "requires": {
-+            "safe-buffer": "5.1.2"
-+          }
-+        }
-+      }
-+    },
-+    "read-pkg": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-+      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-+      "dev": true,
-+      "requires": {
-+        "load-json-file": "1.1.0",
-+        "normalize-package-data": "2.4.0",
-+        "path-type": "1.1.0"
-+      }
-+    },
-+    "read-pkg-up": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-+      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-+      "dev": true,
-+      "requires": {
-+        "find-up": "1.1.2",
-+        "read-pkg": "1.1.0"
-+      }
-+    },
-+    "readable-stream": {
-+      "version": "1.1.14",
-+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-+      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-+      "dev": true,
-+      "requires": {
-+        "core-util-is": "1.0.2",
-+        "inherits": "2.0.3",
-+        "isarray": "0.0.1",
-+        "string_decoder": "0.10.31"
-+      }
-+    },
-+    "readdirp": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz",
-+      "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
-+      "dev": true,
-+      "requires": {
-+        "graceful-fs": "4.1.11",
-+        "minimatch": "3.0.4",
-+        "readable-stream": "2.3.6",
-+        "set-immediate-shim": "1.0.1"
-+      },
-+      "dependencies": {
-+        "isarray": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-+          "dev": true
-+        },
-+        "readable-stream": {
-+          "version": "2.3.6",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-+          "dev": true,
-+          "requires": {
-+            "core-util-is": "1.0.2",
-+            "inherits": "2.0.3",
-+            "isarray": "1.0.0",
-+            "process-nextick-args": "2.0.0",
-+            "safe-buffer": "5.1.2",
-+            "string_decoder": "1.1.1",
-+            "util-deprecate": "1.0.2"
-+          }
-+        },
-+        "string_decoder": {
-+          "version": "1.1.1",
-+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-+          "dev": true,
-+          "requires": {
-+            "safe-buffer": "5.1.2"
-+          }
-+        }
-+      }
-+    },
-+    "readline2": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz",
-+      "integrity": "sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU=",
-+      "dev": true,
-+      "requires": {
-+        "code-point-at": "1.1.0",
-+        "is-fullwidth-code-point": "1.0.0",
-+        "mute-stream": "0.0.5"
-+      }
-+    },
-+    "rechoir": {
-+      "version": "0.6.2",
-+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
-+      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
-+      "dev": true,
-+      "requires": {
-+        "resolve": "1.7.1"
-+      }
-+    },
-+    "redent": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz",
-+      "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=",
-+      "dev": true,
-+      "requires": {
-+        "indent-string": "3.2.0",
-+        "strip-indent": "2.0.0"
-+      }
-+    },
-+    "regex-cache": {
-+      "version": "0.4.4",
-+      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
-+      "integrity": "sha1-db3FiioUls7EihKDW8VMjVYjNt0=",
-+      "dev": true,
-+      "requires": {
-+        "is-equal-shallow": "0.1.3"
-+      }
-+    },
-+    "registry-auth-token": {
-+      "version": "3.3.2",
-+      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz",
-+      "integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==",
-+      "dev": true,
-+      "requires": {
-+        "rc": "1.2.7",
-+        "safe-buffer": "5.1.2"
-+      }
-+    },
-+    "registry-url": {
-+      "version": "3.1.0",
-+      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz",
-+      "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=",
-+      "dev": true,
-+      "requires": {
-+        "rc": "1.2.7"
-+      }
-+    },
-+    "remark": {
-+      "version": "8.0.0",
-+      "resolved": "https://registry.npmjs.org/remark/-/remark-8.0.0.tgz",
-+      "integrity": "sha512-K0PTsaZvJlXTl9DN6qYlvjTkqSZBFELhROZMrblm2rB+085flN84nz4g/BscKRMqDvhzlK1oQ/xnWQumdeNZYw==",
-+      "dev": true,
-+      "requires": {
-+        "remark-parse": "4.0.0",
-+        "remark-stringify": "4.0.0",
-+        "unified": "6.2.0"
-+      }
-+    },
-+    "remark-cli": {
-+      "version": "4.0.0",
-+      "resolved": "https://registry.npmjs.org/remark-cli/-/remark-cli-4.0.0.tgz",
-+      "integrity": "sha512-q5GMjGypUS4rTZb3WfMQcGpClSC38A9Ogg1h/HB2GLsqypDetmAfy0X+tuJ6JeyCPVOXXCDgsDCQq4QPqKmxBA==",
-+      "dev": true,
-+      "requires": {
-+        "markdown-extensions": "1.1.1",
-+        "remark": "8.0.0",
-+        "unified-args": "4.0.0"
-+      }
-+    },
-+    "remark-lint": {
-+      "version": "6.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint/-/remark-lint-6.0.1.tgz",
-+      "integrity": "sha512-wvTTuB5O5pF8SxqahQjjrU3dtuhygYjaGcOZTw+4ACgSE4RBINDlNqN46HjcV3X0ib5GmObJUt5a2mmhtmuTqw==",
-+      "dev": true,
-+      "requires": {
-+        "remark-message-control": "4.1.0"
-+      }
-+    },
-+    "remark-lint-blockquote-indentation": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-blockquote-indentation/-/remark-lint-blockquote-indentation-1.0.1.tgz",
-+      "integrity": "sha512-YrP99MJ3+dQ5JXzq39fUOcYzwcumva/xEM1eFtD2TrQcSdlMLoqYa7gj+aEEhZCjlA5BssTiVoWWW0RjyPPGZw==",
-+      "dev": true,
-+      "requires": {
-+        "mdast-util-to-string": "1.0.4",
-+        "plur": "2.1.2",
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-code-block-style": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-code-block-style/-/remark-lint-code-block-style-1.0.1.tgz",
-+      "integrity": "sha512-FRUMhhKwCruH4vkatdMhVO4WlYpysV1NmMILVoK/k+/7uFLSfgvlqo66nzhpMdWL8TQHqdo0LhiXuetGC2WjsQ==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-definition-case": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-definition-case/-/remark-lint-definition-case-1.0.1.tgz",
-+      "integrity": "sha512-TxLye5KF4o/rKVTvmPRX5jS9itamFS02yy1IG8bIYcIAJvWsW3GlJaXq4ohK3hKwSQOhtCherEfD6XF9BHLNYQ==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-definition-spacing": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-definition-spacing/-/remark-lint-definition-spacing-1.0.1.tgz",
-+      "integrity": "sha512-ewzdlFfpTSP11ZuiOln0yfz6Y03aWtgJmLVQNfF1spaT1gURaShjs8Hiilbo719bz96DgvXSZLP6UnkSiZL1vg==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-emphasis-marker": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-emphasis-marker/-/remark-lint-emphasis-marker-1.0.1.tgz",
-+      "integrity": "sha512-QyNsD6y8EZQqhechw0XFGybYMlxn6PFLSlFUO50KSQlJEOgkImN2yJfrNrET2GY4t/fc/uYmeI/q7auUIkLX2w==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-fenced-code-flag": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-fenced-code-flag/-/remark-lint-fenced-code-flag-1.0.1.tgz",
-+      "integrity": "sha512-P24T9DRe/nnywPFRpE1UAXAVzN1CX6HmINr15UHbQZo1Cy8KYt7uV9YOR0/XzphtnO/AFenAqZyf7tchW5AUNQ==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-fenced-code-marker": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-fenced-code-marker/-/remark-lint-fenced-code-marker-1.0.1.tgz",
-+      "integrity": "sha512-mX7xAMl5m7xGX+YtOtyXIyv+egD4IQAm6DPGdfunI734QwODwcoBydtpTD56jrY+48nVcQ/anFYT1Blg3Xk3sQ==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-file-extension": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-file-extension/-/remark-lint-file-extension-1.0.1.tgz",
-+      "integrity": "sha512-K1Pf5oviaFyCs0FhZqaNZ2odgd5KoV6AlA4nNAMxyylB0Y6t0mYpzECoLSS5Bgxf6f8Op9YbuM2cbjBAsv0dIA==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2"
-+      }
-+    },
-+    "remark-lint-final-definition": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-final-definition/-/remark-lint-final-definition-1.0.1.tgz",
-+      "integrity": "sha512-DK6bphJdQ0xSOQAn+8wOyLIVc3SZW2+ZzCMCLkQnVtHiQ9GHMzFiCkeE3Cq+OClsMI5Yn8wFTHZHPUn58VhNEQ==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-hard-break-spaces": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/remark-lint-hard-break-spaces/-/remark-lint-hard-break-spaces-1.0.2.tgz",
-+      "integrity": "sha512-uh7LqHgRPCphiCvRzBVA4D0Ml2IqPaw89lWJdQ6HvYiV8ChB/OFLBapHi6OKW7NVVVPPJsElPMB/UPUsKFaPTg==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-heading-increment": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-heading-increment/-/remark-lint-heading-increment-1.0.1.tgz",
-+      "integrity": "sha512-jBAJacXAU5drUpvmymOoFmrdCCNDiz8bzGgJIMjpT0Vyjd0+qdXu2iyFMl/4RkkUli25rpUDXkTHTcxmNbh7Zw==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-heading-style": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-heading-style/-/remark-lint-heading-style-1.0.1.tgz",
-+      "integrity": "sha512-m9Gqr091YdxUtG69xdXYH8fSd3+nsrsMamB/qSWpVSZuWQKZ1mRotr1LO9NphJh6vhw8IfBtG07wgEDn6b40sQ==",
-+      "dev": true,
-+      "requires": {
-+        "mdast-util-heading-style": "1.0.3",
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-link-title-style": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-link-title-style/-/remark-lint-link-title-style-1.0.1.tgz",
-+      "integrity": "sha512-91MyqmZjokSzRbgvlKq5sLCJEFkM/MNKT1PDaWa3+GDLBGu7D4eMQGd2x49xX8IdJDEoWy5D8W+2Gb8XKWMUyw==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1",
-+        "vfile-location": "2.0.3"
-+      }
-+    },
-+    "remark-lint-list-item-content-indent": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-list-item-content-indent/-/remark-lint-list-item-content-indent-1.0.1.tgz",
-+      "integrity": "sha512-R5cdXFFywoBcg+2UUcF9OJ/vt9oqJv+KmTKIQV9CFHWeAfMFiZbxazsSPNaCcO1fW9622hxPCawN/AofDTbP7Q==",
-+      "dev": true,
-+      "requires": {
-+        "plur": "2.1.2",
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-list-item-indent": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-list-item-indent/-/remark-lint-list-item-indent-1.0.1.tgz",
-+      "integrity": "sha512-dSUFGQYtduuaos+5oXH89RTk0rGUe6DFf04q+rxQ7Z3YRbuXhAU2nYeY0/HENYiWJU1xFLteZkDvKMj0NfS3DQ==",
-+      "dev": true,
-+      "requires": {
-+        "plur": "2.1.2",
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-list-item-spacing": {
-+      "version": "1.1.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-list-item-spacing/-/remark-lint-list-item-spacing-1.1.1.tgz",
-+      "integrity": "sha512-HlPEzRq4LJB6tQ72zgIZ42mOaOSX92O268BLolys/H1x6N29/JNMLfurWqLsrxZrxxHH3H7EUP4dNM2P1kDGBw==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-maximum-heading-length": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-maximum-heading-length/-/remark-lint-maximum-heading-length-1.0.1.tgz",
-+      "integrity": "sha512-f8ChV9U238gncyvTqmzJ+UpCMj+hFyluWBjVYr2K8CNh+MdSivIxS4zw4170sBRoqNuS3gBxRHG9f4rmdqotJA==",
-+      "dev": true,
-+      "requires": {
-+        "mdast-util-to-string": "1.0.4",
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-maximum-line-length": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/remark-lint-maximum-line-length/-/remark-lint-maximum-line-length-1.0.2.tgz",
-+      "integrity": "sha512-M4UIXAAbtLgoQbTDVwdKOEFbTKtJSZ+pCW7ZqMFs+cbIN0Svm32LM9+xpVfVU0hLYt3Ypl++EAPfguBNe1PZEw==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-no-auto-link-without-protocol": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-no-auto-link-without-protocol/-/remark-lint-no-auto-link-without-protocol-1.0.1.tgz",
-+      "integrity": "sha512-MHl0hNtF8Rc0lg6iuVP7/0rnp4uZadm3S07/1TiFeqzU22KFxxzcC8980Q4+I8oPZE0d1x80h9DmkNAVFwhDjQ==",
-+      "dev": true,
-+      "requires": {
-+        "mdast-util-to-string": "1.0.4",
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-no-blockquote-without-marker": {
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-no-blockquote-without-marker/-/remark-lint-no-blockquote-without-marker-2.0.1.tgz",
-+      "integrity": "sha512-8VTQ/MP3flvG4U0tFSD+DMVT7F/4u9SnQLb/jjeRC3DzgbsIagIUqpWYAKkc+yBz9S/lgftA92lLP5PrlOa5DA==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1",
-+        "vfile-location": "2.0.3"
-+      }
-+    },
-+    "remark-lint-no-consecutive-blank-lines": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-no-consecutive-blank-lines/-/remark-lint-no-consecutive-blank-lines-1.0.1.tgz",
-+      "integrity": "sha512-IhyUiGTpb/hjtusIVg10q963KeL5CyNfbWOfDZ1KtY2tvdoSPRGrrCuTKo6OG8r1qavM6bU0mtRuIBqNh4lIzA==",
-+      "dev": true,
-+      "requires": {
-+        "plur": "2.1.2",
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-no-duplicate-headings": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-no-duplicate-headings/-/remark-lint-no-duplicate-headings-1.0.1.tgz",
-+      "integrity": "sha512-iZZxyZgwnjvDkydKZzqHBueJvIpGbxnITmgd8xN8TOLZoAg9/KGTQRAkotL1HXNRdkzwggfgB9ONxv/rWtYBmg==",
-+      "dev": true,
-+      "requires": {
-+        "mdast-util-to-string": "1.0.4",
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-no-emphasis-as-heading": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-no-emphasis-as-heading/-/remark-lint-no-emphasis-as-heading-1.0.1.tgz",
-+      "integrity": "sha512-+x17Hrjwne4Mhk2x/Zolnuv/sOclF1oYMDBSEYhBUpn/UAwxhXEXYKkeo0KkWA7Q3+UCLELJvzsk4cGNP6Sgow==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-no-file-name-articles": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-no-file-name-articles/-/remark-lint-no-file-name-articles-1.0.1.tgz",
-+      "integrity": "sha512-SzebnFnilrsINA6QZP1YqPa3SrfSotrLkRWl5FUCoVshBvEFNKJFWXj6Xyt4NjWQ5tJWFtOMysAuHdGT+Odhjg==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2"
-+      }
-+    },
-+    "remark-lint-no-file-name-consecutive-dashes": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-no-file-name-consecutive-dashes/-/remark-lint-no-file-name-consecutive-dashes-1.0.1.tgz",
-+      "integrity": "sha512-YP2HBwA00yeD7phvxp4ftiqbfBPfYHPgPfcEcb8oNa1WlUh/58cs9DbSHWKsZG+XLkvEaheC6qUQG02jEKZHPA==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2"
-+      }
-+    },
-+    "remark-lint-no-file-name-irregular-characters": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-no-file-name-irregular-characters/-/remark-lint-no-file-name-irregular-characters-1.0.1.tgz",
-+      "integrity": "sha512-+ks/V6OVMGOPZKw+fe2E4DPvLoslGxvdgtqXq2Nyz0cEdYX8RP45kI79V4w95H7UCJAeOFM9mZzVLvmCY1sEbg==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2"
-+      }
-+    },
-+    "remark-lint-no-file-name-mixed-case": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-no-file-name-mixed-case/-/remark-lint-no-file-name-mixed-case-1.0.1.tgz",
-+      "integrity": "sha512-bcqPsow1C0LrsKII1YehUO7VPOER7nze6FzsZZ8/NP+d200OL7Y7VMCqN1kscAvG+PTJgjznyXuLEpy7KQnVFg==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2"
-+      }
-+    },
-+    "remark-lint-no-file-name-outer-dashes": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/remark-lint-no-file-name-outer-dashes/-/remark-lint-no-file-name-outer-dashes-1.0.2.tgz",
-+      "integrity": "sha512-BVEwLrA4kipalgKrxhncpgtmh6eUmHBH1ggC+X3csYR4X5vXv4vHQqpov4I1vMyWxMLMBnq7lTL3Iqp0CS4vwg==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2"
-+      }
-+    },
-+    "remark-lint-no-heading-punctuation": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-no-heading-punctuation/-/remark-lint-no-heading-punctuation-1.0.1.tgz",
-+      "integrity": "sha512-/7kGRmPT+JLxEME1Z/rQn99mP8yr4qXFwcniKYsefR1jl8pCZciwCIp2Tq92Nn+FPELVrpk9sloRBb2JP3UB0A==",
-+      "dev": true,
-+      "requires": {
-+        "mdast-util-to-string": "1.0.4",
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-no-inline-padding": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-no-inline-padding/-/remark-lint-no-inline-padding-1.0.1.tgz",
-+      "integrity": "sha512-nRl6vA45ZPdMz3/rVMZw7WRRqLFuMrzhdkrbrGLjwBovdIeD/IGCEbDA5NR60g2xT9V5dAmKogvHEH1bIr8SdQ==",
-+      "dev": true,
-+      "requires": {
-+        "mdast-util-to-string": "1.0.4",
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-no-literal-urls": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-no-literal-urls/-/remark-lint-no-literal-urls-1.0.1.tgz",
-+      "integrity": "sha512-YMsZFVYQDt9gvpc6THL76GzyhCR+cK79vjyEOEmX+O3tOjxQstbi0oW6Lngbl1WbpkCW5TWEzSKOorQowYI2wg==",
-+      "dev": true,
-+      "requires": {
-+        "mdast-util-to-string": "1.0.4",
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-no-multiple-toplevel-headings": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-no-multiple-toplevel-headings/-/remark-lint-no-multiple-toplevel-headings-1.0.1.tgz",
-+      "integrity": "sha512-LFfgjF3NKFkt0tGNnJ8Exf8+DrVcMRwek5qu5mvh2KrZnmSpm5flYWzUy2UnnIyicDL3CZYC/r3Fjz6CeBYgZA==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-no-shell-dollars": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-no-shell-dollars/-/remark-lint-no-shell-dollars-1.0.1.tgz",
-+      "integrity": "sha512-YryHem73PTxjCkuC4HONJWHsmrLyXmF7r+cCH36Ys3vuWsfAbwkbOwpyuPB4KXn+6fHaTUfz/B5BPp3iwzJwyA==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-no-shortcut-reference-image": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-no-shortcut-reference-image/-/remark-lint-no-shortcut-reference-image-1.0.1.tgz",
-+      "integrity": "sha512-nUQ+4xB5hKZTCl9gvg7c+W1T3ddsnjgu4zwRza2Bn+21cKmUzx+z9dvlZ4aVuNGmxuWHbKI8/ZkKuB8Eu27vJw==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-no-shortcut-reference-link": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/remark-lint-no-shortcut-reference-link/-/remark-lint-no-shortcut-reference-link-1.0.2.tgz",
-+      "integrity": "sha512-A6ZexZ6XyQ7fXebrj5WgW5FkSJ81GobjWyMFVmBxgxPd9GH2BkRsZ10aFSkQQvfKSrqbnOL2vrigGMgbiERRxA==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-no-table-indentation": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-no-table-indentation/-/remark-lint-no-table-indentation-1.0.1.tgz",
-+      "integrity": "sha512-QrtT1GvJmAoNsWh+gmHFajFlM+ubm9rd3Cbz2OYPix8ZM6g907aIfG2NusJFXL9D8/CExQWYhlBvelFBbHgqbQ==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-ordered-list-marker-style": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-ordered-list-marker-style/-/remark-lint-ordered-list-marker-style-1.0.1.tgz",
-+      "integrity": "sha512-LJICUZIxqHHi360EP90zbDP+2QQIVVgPGlz0AatuR9ifd7xqAzraQKxsQajAZpuOepZgjBMTOz9L9W0Znx7ujA==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-ordered-list-marker-value": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-ordered-list-marker-value/-/remark-lint-ordered-list-marker-value-1.0.1.tgz",
-+      "integrity": "sha512-P6fYui3MvuB21+6AYH8Lbe7SVZ2VQL+FVJUuDCBhe01bgx6SajGmQ/f4Iqt0gCHEAaKw7e2B7tdwd36ifbs1EA==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-rule-style": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-rule-style/-/remark-lint-rule-style-1.0.1.tgz",
-+      "integrity": "sha512-dzH+K6DcPIIMBq6LUQgE4dR9TiQGZrQOoULD7m0Y0lIb2EoR2FK5Zd4TgZg/LnvTs6fid37t0xFoaY4/lXV/5Q==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-strong-marker": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-strong-marker/-/remark-lint-strong-marker-1.0.1.tgz",
-+      "integrity": "sha512-+bwWKWAqDwqd21Vw+ndqVFh5V27Dp4MKhk9AUlKmcvgJYHuvQ8UfWQdpZcP218ps/4EbwTfyi33TaPyXqOTlXA==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-table-cell-padding": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-table-cell-padding/-/remark-lint-table-cell-padding-1.0.1.tgz",
-+      "integrity": "sha512-o3WwC9YysXbQKf0D5nvhhJPcLagqedLwGdifukdgyaKvuIQVbtWbNv1/UOdB3LL+D+2fUrwrCmnQ8J3E1r0lBw==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-table-pipe-alignment": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-table-pipe-alignment/-/remark-lint-table-pipe-alignment-1.0.1.tgz",
-+      "integrity": "sha512-lYfK2gWGN45hYfAOZw5gscQ4uDaO9bJLp+H64jvrTQzBV+OCvB9kRQwI0oIrJAa4XMmipAZR+2XhjNSCfQ0fRA==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-table-pipes": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-table-pipes/-/remark-lint-table-pipes-1.0.1.tgz",
-+      "integrity": "sha512-VHfDRvcovLBl/cvSjwDoA0xRizdZU33A6F2qFD9A5hu1sDWgGxMLg5m2MOvFlRkUVxSwUv47cuD0/yxB4THYXQ==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-unordered-list-marker-style": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-unordered-list-marker-style/-/remark-lint-unordered-list-marker-style-1.0.1.tgz",
-+      "integrity": "sha512-dHYD9cHM9ZJ7BKUZ1nEPGfLAHgUmYxccXtms1GSEM/uyUtR2SU/ao1RwZZ+LvacZFCNZ1yG2yKCJhGI/5U/GrA==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-message-control": {
-+      "version": "4.1.0",
-+      "resolved": "https://registry.npmjs.org/remark-message-control/-/remark-message-control-4.1.0.tgz",
-+      "integrity": "sha512-e1dszks4YKY7hLAkhS2367jBjBpAfvi+kVgSN/tOFrdp3qxITjiNR5fOFnyYF8vvorkQ9uxlKJoZUOW8T7rKDg==",
-+      "dev": true,
-+      "requires": {
-+        "mdast-comment-marker": "1.0.2",
-+        "unified-message-control": "1.0.4",
-+        "xtend": "4.0.1"
-+      }
-+    },
-+    "remark-parse": {
-+      "version": "4.0.0",
-+      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-4.0.0.tgz",
-+      "integrity": "sha512-XZgICP2gJ1MHU7+vQaRM+VA9HEL3X253uwUM/BGgx3iv6TH2B3bF3B8q00DKcyP9YrJV+/7WOWEWBFF/u8cIsw==",
-+      "dev": true,
-+      "requires": {
-+        "collapse-white-space": "1.0.4",
-+        "is-alphabetical": "1.0.2",
-+        "is-decimal": "1.0.2",
-+        "is-whitespace-character": "1.0.2",
-+        "is-word-character": "1.0.2",
-+        "markdown-escapes": "1.0.2",
-+        "parse-entities": "1.1.2",
-+        "repeat-string": "1.6.1",
-+        "state-toggle": "1.0.1",
-+        "trim": "0.0.1",
-+        "trim-trailing-lines": "1.1.1",
-+        "unherit": "1.1.1",
-+        "unist-util-remove-position": "1.1.2",
-+        "vfile-location": "2.0.3",
-+        "xtend": "4.0.1"
-+      }
-+    },
-+    "remark-preset-lint-markdown-style-guide": {
-+      "version": "2.1.1",
-+      "resolved": "https://registry.npmjs.org/remark-preset-lint-markdown-style-guide/-/remark-preset-lint-markdown-style-guide-2.1.1.tgz",
-+      "integrity": "sha512-Ao6fB63WuGtz1fa4rjoI+u1EOu21rWVGPmJlUKZlCICPPB6I815nJ52V0sLYjaw2cs+ZiXsXhdVinN7UpVgXcQ==",
-+      "dev": true,
-+      "requires": {
-+        "remark-lint": "6.0.1",
-+        "remark-lint-blockquote-indentation": "1.0.1",
-+        "remark-lint-code-block-style": "1.0.1",
-+        "remark-lint-definition-case": "1.0.1",
-+        "remark-lint-definition-spacing": "1.0.1",
-+        "remark-lint-emphasis-marker": "1.0.1",
-+        "remark-lint-fenced-code-flag": "1.0.1",
-+        "remark-lint-fenced-code-marker": "1.0.1",
-+        "remark-lint-file-extension": "1.0.1",
-+        "remark-lint-final-definition": "1.0.1",
-+        "remark-lint-hard-break-spaces": "1.0.2",
-+        "remark-lint-heading-increment": "1.0.1",
-+        "remark-lint-heading-style": "1.0.1",
-+        "remark-lint-link-title-style": "1.0.1",
-+        "remark-lint-list-item-content-indent": "1.0.1",
-+        "remark-lint-list-item-indent": "1.0.1",
-+        "remark-lint-list-item-spacing": "1.1.1",
-+        "remark-lint-maximum-heading-length": "1.0.1",
-+        "remark-lint-maximum-line-length": "1.0.2",
-+        "remark-lint-no-auto-link-without-protocol": "1.0.1",
-+        "remark-lint-no-blockquote-without-marker": "2.0.1",
-+        "remark-lint-no-consecutive-blank-lines": "1.0.1",
-+        "remark-lint-no-duplicate-headings": "1.0.1",
-+        "remark-lint-no-emphasis-as-heading": "1.0.1",
-+        "remark-lint-no-file-name-articles": "1.0.1",
-+        "remark-lint-no-file-name-consecutive-dashes": "1.0.1",
-+        "remark-lint-no-file-name-irregular-characters": "1.0.1",
-+        "remark-lint-no-file-name-mixed-case": "1.0.1",
-+        "remark-lint-no-file-name-outer-dashes": "1.0.2",
-+        "remark-lint-no-heading-punctuation": "1.0.1",
-+        "remark-lint-no-inline-padding": "1.0.1",
-+        "remark-lint-no-literal-urls": "1.0.1",
-+        "remark-lint-no-multiple-toplevel-headings": "1.0.1",
-+        "remark-lint-no-shell-dollars": "1.0.1",
-+        "remark-lint-no-shortcut-reference-image": "1.0.1",
-+        "remark-lint-no-shortcut-reference-link": "1.0.2",
-+        "remark-lint-no-table-indentation": "1.0.1",
-+        "remark-lint-ordered-list-marker-style": "1.0.1",
-+        "remark-lint-ordered-list-marker-value": "1.0.1",
-+        "remark-lint-rule-style": "1.0.1",
-+        "remark-lint-strong-marker": "1.0.1",
-+        "remark-lint-table-cell-padding": "1.0.1",
-+        "remark-lint-table-pipe-alignment": "1.0.1",
-+        "remark-lint-table-pipes": "1.0.1",
-+        "remark-lint-unordered-list-marker-style": "1.0.1"
-+      }
-+    },
-+    "remark-stringify": {
-+      "version": "4.0.0",
-+      "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-4.0.0.tgz",
-+      "integrity": "sha512-xLuyKTnuQer3ke9hkU38SUYLiTmS078QOnoFavztmbt/pAJtNSkNtFgR0U//uCcmG0qnyxao+PDuatQav46F1w==",
-+      "dev": true,
-+      "requires": {
-+        "ccount": "1.0.3",
-+        "is-alphanumeric": "1.0.0",
-+        "is-decimal": "1.0.2",
-+        "is-whitespace-character": "1.0.2",
-+        "longest-streak": "2.0.2",
-+        "markdown-escapes": "1.0.2",
-+        "markdown-table": "1.1.2",
-+        "mdast-util-compact": "1.0.1",
-+        "parse-entities": "1.1.2",
-+        "repeat-string": "1.6.1",
-+        "state-toggle": "1.0.1",
-+        "stringify-entities": "1.3.2",
-+        "unherit": "1.1.1",
-+        "xtend": "4.0.1"
-+=======
-+    "object.omit": {
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
-+      "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
-+      "dev": true,
-+      "requires": {
-+        "for-own": "0.1.5",
-+        "is-extendable": "0.1.1"
-+      }
-+    },
-+    "once": {
-+      "version": "1.4.0",
-+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-+      "dev": true,
-+      "requires": {
-+        "wrappy": "1.0.2"
-+      }
-+    },
-+    "onetime": {
-+      "version": "1.1.0",
-+      "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
-+      "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
-+      "dev": true
-+    },
-+    "optimist": {
-+      "version": "0.3.7",
-+      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
-+      "integrity": "sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=",
-+      "dev": true,
-+      "requires": {
-+        "wordwrap": "0.0.3"
-+      }
-+    },
-+    "optionator": {
-+      "version": "0.8.2",
-+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
-+      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
-+      "dev": true,
-+      "requires": {
-+        "deep-is": "0.1.3",
-+        "fast-levenshtein": "2.0.6",
-+        "levn": "0.3.0",
-+        "prelude-ls": "1.1.2",
-+        "type-check": "0.3.2",
-+        "wordwrap": "1.0.0"
-+      },
-+      "dependencies": {
-+        "wordwrap": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-+          "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "ora": {
-+      "version": "0.3.0",
-+      "resolved": "https://registry.npmjs.org/ora/-/ora-0.3.0.tgz",
-+      "integrity": "sha1-NnoHitJc+wltpQERXrW0AeB9dJU=",
-+      "dev": true,
-+      "requires": {
-+        "chalk": "1.1.3",
-+        "cli-cursor": "1.0.2",
-+        "cli-spinners": "0.2.0",
-+        "log-symbols": "1.0.2"
-+      },
-+      "dependencies": {
-+        "cli-spinners": {
-+          "version": "0.2.0",
-+          "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-0.2.0.tgz",
-+          "integrity": "sha1-hQeHN5E7iA9uyf/ntl6D7Hd2KE8=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "os-browserify": {
-+      "version": "0.1.2",
-+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz",
-+      "integrity": "sha1-ScoCk+CxlZCl9d4Qx/JlphfY/lQ=",
-+      "dev": true
-+    },
-+    "os-homedir": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-+      "dev": true
-+    },
-+    "os-locale": {
-+      "version": "1.4.0",
-+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-+      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-+      "dev": true,
-+      "requires": {
-+        "lcid": "1.0.0"
-+      }
-+    },
-+    "os-tmpdir": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-+      "dev": true
-+    },
-+    "p-finally": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
-+      "dev": true
-+    },
-+    "p-limit": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz",
-+      "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==",
-+      "dev": true,
-+      "requires": {
-+        "p-try": "1.0.0"
-+      }
-+    },
-+    "p-locate": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-+      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-+      "dev": true,
-+      "requires": {
-+        "p-limit": "1.2.0"
-+      }
-+    },
-+    "p-try": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-+      "dev": true
-+    },
-+    "package-json": {
-+      "version": "4.0.1",
-+      "resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz",
-+      "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=",
-+      "dev": true,
-+      "requires": {
-+        "got": "6.7.1",
-+        "registry-auth-token": "3.3.2",
-+        "registry-url": "3.1.0",
-+        "semver": "5.5.0"
-+      }
-+    },
-+    "pako": {
-+      "version": "0.2.9",
-+      "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
-+      "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=",
-+      "dev": true
-+    },
-+    "parents": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz",
-+      "integrity": "sha1-/t1NK/GTp3dF/nHjcdc8MwfZx1E=",
-+      "dev": true,
-+      "requires": {
-+        "path-platform": "0.11.15"
-+      }
-+    },
-+    "parse-asn1": {
-+      "version": "5.1.0",
-+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz",
-+      "integrity": "sha1-N8T5t+06tlx0gXtfJICTf7+XxxI=",
-+      "dev": true,
-+      "requires": {
-+        "asn1.js": "4.10.1",
-+        "browserify-aes": "1.1.1",
-+        "create-hash": "1.1.3",
-+        "evp_bytestokey": "1.0.3",
-+        "pbkdf2": "3.0.14"
-+      }
-+    },
-+    "parse-github-repo-url": {
-+      "version": "1.4.1",
-+      "resolved": "https://registry.npmjs.org/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz",
-+      "integrity": "sha1-nn2LslKmy2ukJZUGC3v23z28H1A=",
-+      "dev": true
-+    },
-+    "parse-gitignore": {
-+      "version": "0.4.0",
-+      "resolved": "https://registry.npmjs.org/parse-gitignore/-/parse-gitignore-0.4.0.tgz",
-+      "integrity": "sha1-q/cC5LkAUk//eQK2g4YoV7Y/k/4=",
-+      "dev": true,
-+      "requires": {
-+        "array-unique": "0.3.2",
-+        "is-glob": "3.1.0"
-+      },
-+      "dependencies": {
-+        "array-unique": {
-+          "version": "0.3.2",
-+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-+          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-+          "dev": true
-+        },
-+        "is-extglob": {
-+          "version": "2.1.1",
-+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-+          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-+          "dev": true
-+        },
-+        "is-glob": {
-+          "version": "3.1.0",
-+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-+          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-+          "dev": true,
-+          "requires": {
-+            "is-extglob": "2.1.1"
-+          }
-+        }
-+      }
-+    },
-+    "parse-glob": {
-+      "version": "3.0.4",
-+      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
-+      "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
-+      "dev": true,
-+      "requires": {
-+        "glob-base": "0.3.0",
-+        "is-dotfile": "1.0.3",
-+        "is-extglob": "1.0.0",
-+        "is-glob": "2.0.1"
-+      }
-+    },
-+    "parse-json": {
-+      "version": "2.2.0",
-+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-+      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-+      "dev": true,
-+      "requires": {
-+        "error-ex": "1.3.1"
-+      }
-+    },
-+    "parse5": {
-+      "version": "1.5.1",
-+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz",
-+      "integrity": "sha1-m387DeMr543CQBsXVzzK8Pb1nZQ=",
-+      "dev": true,
-+      "optional": true
-+    },
-+    "path-browserify": {
-+      "version": "0.0.0",
-+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
-+      "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
-+      "dev": true
-+    },
-+    "path-exists": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-+      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-+      "dev": true,
-+      "requires": {
-+        "pinkie-promise": "2.0.1"
-+      }
-+    },
-+    "path-is-absolute": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-+      "dev": true
-+    },
-+    "path-is-inside": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-+      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
-+      "dev": true
-+    },
-+    "path-key": {
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
-+      "dev": true
-+    },
-+    "path-parse": {
-+      "version": "1.0.5",
-+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
-+      "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
-+      "dev": true
-+    },
-+    "path-platform": {
-+      "version": "0.11.15",
-+      "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz",
-+      "integrity": "sha1-6GQhf3TDaFDwhSt43Hv31KVyG/I=",
-+      "dev": true
-+    },
-+    "path-type": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-+      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-+      "dev": true,
-+      "requires": {
-+        "graceful-fs": "4.1.11",
-+        "pify": "2.3.0",
-+        "pinkie-promise": "2.0.1"
-+      }
-+    },
-+    "pbkdf2": {
-+      "version": "3.0.14",
-+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz",
-+      "integrity": "sha512-gjsZW9O34fm0R7PaLHRJmLLVfSoesxztjPjE9o6R+qtVJij90ltg1joIovN9GKrRW3t1PzhDDG3UMEMFfZ+1wA==",
-+      "dev": true,
-+      "requires": {
-+        "create-hash": "1.1.3",
-+        "create-hmac": "1.1.6",
-+        "ripemd160": "2.0.1",
-+        "safe-buffer": "5.1.1",
-+        "sha.js": "2.4.10"
-+      }
-+    },
-+    "peek-stream": {
-+      "version": "1.1.2",
-+      "resolved": "https://registry.npmjs.org/peek-stream/-/peek-stream-1.1.2.tgz",
-+      "integrity": "sha1-l+t2NlvP2MieKH9VyLadTD6bzFI=",
-+      "dev": true,
-+      "requires": {
-+        "duplexify": "3.5.4",
-+        "through2": "2.0.3"
-+      }
-+    },
-+    "performance-now": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-+      "dev": true
-+    },
-+    "pify": {
-+      "version": "2.3.0",
-+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-+      "dev": true
-+    },
-+    "pinkie": {
-+      "version": "2.0.4",
-+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-+      "dev": true
-+    },
-+    "pinkie-promise": {
-+      "version": "2.0.1",
-+      "resolved": "http://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-+      "dev": true,
-+      "requires": {
-+        "pinkie": "2.0.4"
-+      }
-+    },
-+    "pkg-conf": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-2.1.0.tgz",
-+      "integrity": "sha1-ISZRTKbyq/69FoWW3xi6V4Z/AFg=",
-+      "dev": true,
-+      "requires": {
-+        "find-up": "2.1.0",
-+        "load-json-file": "4.0.0"
-+      },
-+      "dependencies": {
-+        "find-up": {
-+          "version": "2.1.0",
-+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-+          "dev": true,
-+          "requires": {
-+            "locate-path": "2.0.0"
-+          }
-+        },
-+        "load-json-file": {
-+          "version": "4.0.0",
-+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
-+          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
-+          "dev": true,
-+          "requires": {
-+            "graceful-fs": "4.1.11",
-+            "parse-json": "4.0.0",
-+            "pify": "3.0.0",
-+            "strip-bom": "3.0.0"
-+          }
-+        },
-+        "parse-json": {
-+          "version": "4.0.0",
-+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-+          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
-+          "dev": true,
-+          "requires": {
-+            "error-ex": "1.3.1",
-+            "json-parse-better-errors": "1.0.1"
-+          }
-+        },
-+        "pify": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-+          "dev": true
-+        },
-+        "strip-bom": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "pkg-config": {
-+      "version": "1.1.1",
-+      "resolved": "https://registry.npmjs.org/pkg-config/-/pkg-config-1.1.1.tgz",
-+      "integrity": "sha1-VX7yLXPaPIg3EHdmxS6tq94pj+Q=",
-+      "dev": true,
-+      "requires": {
-+        "debug-log": "1.0.1",
-+        "find-root": "1.1.0",
-+        "xtend": "4.0.1"
-+      }
-+    },
-+    "pkg-dir": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz",
-+      "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=",
-+      "dev": true,
-+      "requires": {
-+        "find-up": "1.1.2"
-+      }
-+    },
-+    "pkg-up": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-1.0.0.tgz",
-+      "integrity": "sha1-Pgj7RhUlxEIWJKM7n35tCvWwWiY=",
-+      "dev": true,
-+      "requires": {
-+        "find-up": "1.1.2"
-+      }
-+    },
-+    "pluralize": {
-+      "version": "1.2.1",
-+      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz",
-+      "integrity": "sha1-0aIUg/0iu0HlihL6NCGCMUCJfEU=",
-+      "dev": true
-+    },
-+    "prelude-ls": {
-+      "version": "1.1.2",
-+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-+      "dev": true
-+    },
-+    "prepend-http": {
-+      "version": "1.0.4",
-+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
-+      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
-+      "dev": true
-+    },
-+    "preserve": {
-+      "version": "0.2.0",
-+      "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
-+      "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
-+      "dev": true
-+    },
-+    "pretty-bytes": {
-+      "version": "1.0.4",
-+      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz",
-+      "integrity": "sha1-CiLoIQYJrTVUL4yNXSFZr/B1HIQ=",
-+      "dev": true,
-+      "requires": {
-+        "get-stdin": "4.0.1",
-+        "meow": "3.7.0"
-+      },
-+      "dependencies": {
-+        "camelcase": {
-+          "version": "2.1.1",
-+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-+          "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
-+          "dev": true
-+        },
-+        "camelcase-keys": {
-+          "version": "2.1.0",
-+          "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
-+          "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
-+          "dev": true,
-+          "requires": {
-+            "camelcase": "2.1.1",
-+            "map-obj": "1.0.1"
-+          }
-+        },
-+        "indent-string": {
-+          "version": "2.1.0",
-+          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-+          "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
-+          "dev": true,
-+          "requires": {
-+            "repeating": "2.0.1"
-+          }
-+        },
-+        "map-obj": {
-+          "version": "1.0.1",
-+          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-+          "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-+          "dev": true
-+        },
-+        "meow": {
-+          "version": "3.7.0",
-+          "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-+          "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
-+          "dev": true,
-+          "requires": {
-+            "camelcase-keys": "2.1.0",
-+            "decamelize": "1.2.0",
-+            "loud-rejection": "1.6.0",
-+            "map-obj": "1.0.1",
-+            "minimist": "1.2.0",
-+            "normalize-package-data": "2.4.0",
-+            "object-assign": "4.1.1",
-+            "read-pkg-up": "1.0.1",
-+            "redent": "1.0.0",
-+            "trim-newlines": "1.0.0"
-+          }
-+        },
-+        "redent": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-+          "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
-+          "dev": true,
-+          "requires": {
-+            "indent-string": "2.1.0",
-+            "strip-indent": "1.0.1"
-+          }
-+        },
-+        "strip-indent": {
-+          "version": "1.0.1",
-+          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
-+          "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
-+          "dev": true,
-+          "requires": {
-+            "get-stdin": "4.0.1"
-+          }
-+        },
-+        "trim-newlines": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-+          "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "process": {
-+      "version": "0.11.10",
-+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-+      "dev": true
-+    },
-+    "process-nextick-args": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-+      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
-+      "dev": true
-+    },
-+    "progress": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz",
-+      "integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=",
-+      "dev": true
-+    },
-+    "progress-stream": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/progress-stream/-/progress-stream-1.2.0.tgz",
-+      "integrity": "sha1-LNPP6jO6OonJwSHsM0er6asSX3c=",
-+      "dev": true,
-+      "requires": {
-+        "speedometer": "0.1.4",
-+        "through2": "0.2.3"
-+      },
-+      "dependencies": {
-+        "through2": {
-+          "version": "0.2.3",
-+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
-+          "integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=",
-+          "dev": true,
-+          "requires": {
-+            "readable-stream": "1.1.14",
-+            "xtend": "2.1.2"
-+          }
-+        },
-+        "xtend": {
-+          "version": "2.1.2",
-+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
-+          "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
-+          "dev": true,
-+          "requires": {
-+            "object-keys": "0.4.0"
-+          }
-+        }
-+      }
-+    },
-+    "pseudomap": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
-+      "dev": true
-+    },
-+    "public-encrypt": {
-+      "version": "4.0.0",
-+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz",
-+      "integrity": "sha1-OfaZ86RlYN1eusvKaTyvfGXBjMY=",
-+      "dev": true,
-+      "requires": {
-+        "bn.js": "4.11.8",
-+        "browserify-rsa": "4.0.1",
-+        "create-hash": "1.1.3",
-+        "parse-asn1": "5.1.0",
-+        "randombytes": "2.0.6"
-+      }
-+    },
-+    "pump": {
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
-+      "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-visit": "1.3.1"
-+        "end-of-stream": "1.4.1",
-+        "once": "1.4.0"
-       }
-     },
--    "remark-lint-no-shortcut-reference-image": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-no-shortcut-reference-image/-/remark-lint-no-shortcut-reference-image-1.0.1.tgz",
--      "integrity": "sha512-nUQ+4xB5hKZTCl9gvg7c+W1T3ddsnjgu4zwRza2Bn+21cKmUzx+z9dvlZ4aVuNGmxuWHbKI8/ZkKuB8Eu27vJw==",
-+    "pumpify": {
-+      "version": "1.4.0",
-+      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.4.0.tgz",
-+      "integrity": "sha512-2kmNR9ry+Pf45opRVirpNuIFotsxUGLaYqxIwuR77AYrYRMuFCz9eryHBS52L360O+NcR383CL4QYlMKPq4zYA==",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-visit": "1.3.1"
-+        "duplexify": "3.5.4",
-+        "inherits": "2.0.3",
-+        "pump": "2.0.1"
-       }
-     },
--    "remark-lint-no-shortcut-reference-link": {
--      "version": "1.0.2",
--      "resolved": "https://registry.npmjs.org/remark-lint-no-shortcut-reference-link/-/remark-lint-no-shortcut-reference-link-1.0.2.tgz",
--      "integrity": "sha512-A6ZexZ6XyQ7fXebrj5WgW5FkSJ81GobjWyMFVmBxgxPd9GH2BkRsZ10aFSkQQvfKSrqbnOL2vrigGMgbiERRxA==",
-+    "punycode": {
-+      "version": "1.4.1",
-+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-+      "dev": true
-+    },
-+    "q": {
-+      "version": "1.5.1",
-+      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-+      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
-+      "dev": true
-+    },
-+    "qs": {
-+      "version": "6.5.1",
-+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
-+      "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==",
-+      "dev": true
-+    },
-+    "querystring": {
-+      "version": "0.2.0",
-+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
-+      "dev": true
-+    },
-+    "querystring-es3": {
-+      "version": "0.2.1",
-+      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-+      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
-+      "dev": true
-+    },
-+    "quick-lru": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz",
-+      "integrity": "sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=",
-+      "dev": true
-+    },
-+    "randomatic": {
-+      "version": "1.1.7",
-+      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
-+      "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-visit": "1.3.1"
-+        "is-number": "3.0.0",
-+        "kind-of": "4.0.0"
-+      },
-+      "dependencies": {
-+        "is-number": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-+          "dev": true,
-+          "requires": {
-+            "kind-of": "3.2.2"
-+          },
-+          "dependencies": {
-+            "kind-of": {
-+              "version": "3.2.2",
-+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-+              "dev": true,
-+              "requires": {
-+                "is-buffer": "1.1.6"
-+              }
-+            }
-+          }
-+        },
-+        "kind-of": {
-+          "version": "4.0.0",
-+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-+          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-+          "dev": true,
-+          "requires": {
-+            "is-buffer": "1.1.6"
-+          }
-+        }
-       }
-     },
--    "remark-lint-no-table-indentation": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-no-table-indentation/-/remark-lint-no-table-indentation-1.0.1.tgz",
--      "integrity": "sha512-QrtT1GvJmAoNsWh+gmHFajFlM+ubm9rd3Cbz2OYPix8ZM6g907aIfG2NusJFXL9D8/CExQWYhlBvelFBbHgqbQ==",
-+    "randombytes": {
-+      "version": "2.0.6",
-+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz",
-+      "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "safe-buffer": "5.1.1"
-       }
-     },
--    "remark-lint-ordered-list-marker-style": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-ordered-list-marker-style/-/remark-lint-ordered-list-marker-style-1.0.1.tgz",
--      "integrity": "sha512-LJICUZIxqHHi360EP90zbDP+2QQIVVgPGlz0AatuR9ifd7xqAzraQKxsQajAZpuOepZgjBMTOz9L9W0Znx7ujA==",
-+    "randomfill": {
-+      "version": "1.0.4",
-+      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "randombytes": "2.0.6",
-+        "safe-buffer": "5.1.1"
-       }
-     },
--    "remark-lint-ordered-list-marker-value": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-ordered-list-marker-value/-/remark-lint-ordered-list-marker-value-1.0.1.tgz",
--      "integrity": "sha512-P6fYui3MvuB21+6AYH8Lbe7SVZ2VQL+FVJUuDCBhe01bgx6SajGmQ/f4Iqt0gCHEAaKw7e2B7tdwd36ifbs1EA==",
-+    "rc": {
-+      "version": "1.2.6",
-+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.6.tgz",
-+      "integrity": "sha1-6xiYnG1PTxYsOZ953dKfODVWgJI=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "deep-extend": "0.4.2",
-+        "ini": "1.3.5",
-+        "minimist": "1.2.0",
-+        "strip-json-comments": "2.0.1"
-       }
-     },
--    "remark-lint-rule-style": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-rule-style/-/remark-lint-rule-style-1.0.1.tgz",
--      "integrity": "sha512-dzH+K6DcPIIMBq6LUQgE4dR9TiQGZrQOoULD7m0Y0lIb2EoR2FK5Zd4TgZg/LnvTs6fid37t0xFoaY4/lXV/5Q==",
-+    "read-only-stream": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/read-only-stream/-/read-only-stream-2.0.0.tgz",
-+      "integrity": "sha1-JyT9aoET1zdkrCiNQ4YnDB2/F/A=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "readable-stream": "2.3.5"
-+      },
-+      "dependencies": {
-+        "isarray": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-+          "dev": true
-+        },
-+        "readable-stream": {
-+          "version": "2.3.5",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
-+          "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
-+          "dev": true,
-+          "requires": {
-+            "core-util-is": "1.0.2",
-+            "inherits": "2.0.3",
-+            "isarray": "1.0.0",
-+            "process-nextick-args": "2.0.0",
-+            "safe-buffer": "5.1.1",
-+            "string_decoder": "1.0.3",
-+            "util-deprecate": "1.0.2"
-+          }
-+        },
-+        "string_decoder": {
-+          "version": "1.0.3",
-+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-+          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-+          "dev": true,
-+          "requires": {
-+            "safe-buffer": "5.1.1"
-+          }
-+        }
-       }
-     },
--    "remark-lint-strong-marker": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-strong-marker/-/remark-lint-strong-marker-1.0.1.tgz",
--      "integrity": "sha512-+bwWKWAqDwqd21Vw+ndqVFh5V27Dp4MKhk9AUlKmcvgJYHuvQ8UfWQdpZcP218ps/4EbwTfyi33TaPyXqOTlXA==",
-+    "read-pkg": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-+      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "load-json-file": "1.1.0",
-+        "normalize-package-data": "2.4.0",
-+        "path-type": "1.1.0"
-       }
-     },
--    "remark-lint-table-cell-padding": {
-+    "read-pkg-up": {
-       "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-table-cell-padding/-/remark-lint-table-cell-padding-1.0.1.tgz",
--      "integrity": "sha512-o3WwC9YysXbQKf0D5nvhhJPcLagqedLwGdifukdgyaKvuIQVbtWbNv1/UOdB3LL+D+2fUrwrCmnQ8J3E1r0lBw==",
-+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-+      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "find-up": "1.1.2",
-+        "read-pkg": "1.1.0"
-       }
-     },
--    "remark-lint-table-pipe-alignment": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-table-pipe-alignment/-/remark-lint-table-pipe-alignment-1.0.1.tgz",
--      "integrity": "sha512-lYfK2gWGN45hYfAOZw5gscQ4uDaO9bJLp+H64jvrTQzBV+OCvB9kRQwI0oIrJAa4XMmipAZR+2XhjNSCfQ0fRA==",
-+    "readable-stream": {
-+      "version": "1.1.14",
-+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-+      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "core-util-is": "1.0.2",
-+        "inherits": "2.0.3",
-+        "isarray": "0.0.1",
-+        "string_decoder": "0.10.31"
-       }
-     },
--    "remark-lint-table-pipes": {
-+    "readline2": {
-       "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-table-pipes/-/remark-lint-table-pipes-1.0.1.tgz",
--      "integrity": "sha512-VHfDRvcovLBl/cvSjwDoA0xRizdZU33A6F2qFD9A5hu1sDWgGxMLg5m2MOvFlRkUVxSwUv47cuD0/yxB4THYXQ==",
-+      "resolved": "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz",
-+      "integrity": "sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "code-point-at": "1.1.0",
-+        "is-fullwidth-code-point": "1.0.0",
-+        "mute-stream": "0.0.5"
-       }
-     },
--    "remark-lint-unordered-list-marker-style": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-unordered-list-marker-style/-/remark-lint-unordered-list-marker-style-1.0.1.tgz",
--      "integrity": "sha512-dHYD9cHM9ZJ7BKUZ1nEPGfLAHgUmYxccXtms1GSEM/uyUtR2SU/ao1RwZZ+LvacZFCNZ1yG2yKCJhGI/5U/GrA==",
-+    "rechoir": {
-+      "version": "0.6.2",
-+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
-+      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "resolve": "1.5.0"
-       }
-     },
--    "remark-message-control": {
--      "version": "4.1.0",
--      "resolved": "https://registry.npmjs.org/remark-message-control/-/remark-message-control-4.1.0.tgz",
--      "integrity": "sha512-e1dszks4YKY7hLAkhS2367jBjBpAfvi+kVgSN/tOFrdp3qxITjiNR5fOFnyYF8vvorkQ9uxlKJoZUOW8T7rKDg==",
-+    "redent": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz",
-+      "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=",
-       "dev": true,
-       "requires": {
--        "mdast-comment-marker": "1.0.2",
--        "unified-message-control": "1.0.4",
--        "xtend": "4.0.1"
-+        "indent-string": "3.2.0",
-+        "strip-indent": "2.0.0"
-       }
-     },
--    "remark-parse": {
--      "version": "4.0.0",
--      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-4.0.0.tgz",
--      "integrity": "sha512-XZgICP2gJ1MHU7+vQaRM+VA9HEL3X253uwUM/BGgx3iv6TH2B3bF3B8q00DKcyP9YrJV+/7WOWEWBFF/u8cIsw==",
--      "dev": true,
--      "requires": {
--        "collapse-white-space": "1.0.4",
--        "is-alphabetical": "1.0.2",
--        "is-decimal": "1.0.2",
--        "is-whitespace-character": "1.0.2",
--        "is-word-character": "1.0.2",
--        "markdown-escapes": "1.0.2",
--        "parse-entities": "1.1.2",
--        "repeat-string": "1.6.1",
--        "state-toggle": "1.0.1",
--        "trim": "0.0.1",
--        "trim-trailing-lines": "1.1.1",
--        "unherit": "1.1.1",
--        "unist-util-remove-position": "1.1.2",
--        "vfile-location": "2.0.3",
--        "xtend": "4.0.1"
-+    "regex-cache": {
-+      "version": "0.4.4",
-+      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
-+      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
-+      "dev": true,
-+      "requires": {
-+        "is-equal-shallow": "0.1.3"
-       }
-     },
--    "remark-preset-lint-markdown-style-guide": {
--      "version": "2.1.1",
--      "resolved": "https://registry.npmjs.org/remark-preset-lint-markdown-style-guide/-/remark-preset-lint-markdown-style-guide-2.1.1.tgz",
--      "integrity": "sha512-Ao6fB63WuGtz1fa4rjoI+u1EOu21rWVGPmJlUKZlCICPPB6I815nJ52V0sLYjaw2cs+ZiXsXhdVinN7UpVgXcQ==",
-+    "registry-auth-token": {
-+      "version": "3.3.2",
-+      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz",
-+      "integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==",
-       "dev": true,
-       "requires": {
--        "remark-lint": "6.0.1",
--        "remark-lint-blockquote-indentation": "1.0.1",
--        "remark-lint-code-block-style": "1.0.1",
--        "remark-lint-definition-case": "1.0.1",
--        "remark-lint-definition-spacing": "1.0.1",
--        "remark-lint-emphasis-marker": "1.0.1",
--        "remark-lint-fenced-code-flag": "1.0.1",
--        "remark-lint-fenced-code-marker": "1.0.1",
--        "remark-lint-file-extension": "1.0.1",
--        "remark-lint-final-definition": "1.0.1",
--        "remark-lint-hard-break-spaces": "1.0.2",
--        "remark-lint-heading-increment": "1.0.1",
--        "remark-lint-heading-style": "1.0.1",
--        "remark-lint-link-title-style": "1.0.1",
--        "remark-lint-list-item-content-indent": "1.0.1",
--        "remark-lint-list-item-indent": "1.0.1",
--        "remark-lint-list-item-spacing": "1.1.1",
--        "remark-lint-maximum-heading-length": "1.0.1",
--        "remark-lint-maximum-line-length": "1.0.2",
--        "remark-lint-no-auto-link-without-protocol": "1.0.1",
--        "remark-lint-no-blockquote-without-marker": "2.0.1",
--        "remark-lint-no-consecutive-blank-lines": "1.0.1",
--        "remark-lint-no-duplicate-headings": "1.0.1",
--        "remark-lint-no-emphasis-as-heading": "1.0.1",
--        "remark-lint-no-file-name-articles": "1.0.1",
--        "remark-lint-no-file-name-consecutive-dashes": "1.0.1",
--        "remark-lint-no-file-name-irregular-characters": "1.0.1",
--        "remark-lint-no-file-name-mixed-case": "1.0.1",
--        "remark-lint-no-file-name-outer-dashes": "1.0.2",
--        "remark-lint-no-heading-punctuation": "1.0.1",
--        "remark-lint-no-inline-padding": "1.0.1",
--        "remark-lint-no-literal-urls": "1.0.1",
--        "remark-lint-no-multiple-toplevel-headings": "1.0.1",
--        "remark-lint-no-shell-dollars": "1.0.1",
--        "remark-lint-no-shortcut-reference-image": "1.0.1",
--        "remark-lint-no-shortcut-reference-link": "1.0.2",
--        "remark-lint-no-table-indentation": "1.0.1",
--        "remark-lint-ordered-list-marker-style": "1.0.1",
--        "remark-lint-ordered-list-marker-value": "1.0.1",
--        "remark-lint-rule-style": "1.0.1",
--        "remark-lint-strong-marker": "1.0.1",
--        "remark-lint-table-cell-padding": "1.0.1",
--        "remark-lint-table-pipe-alignment": "1.0.1",
--        "remark-lint-table-pipes": "1.0.1",
--        "remark-lint-unordered-list-marker-style": "1.0.1"
-+        "rc": "1.2.6",
-+        "safe-buffer": "5.1.1"
-       }
-     },
--    "remark-stringify": {
--      "version": "4.0.0",
--      "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-4.0.0.tgz",
--      "integrity": "sha512-xLuyKTnuQer3ke9hkU38SUYLiTmS078QOnoFavztmbt/pAJtNSkNtFgR0U//uCcmG0qnyxao+PDuatQav46F1w==",
-+    "registry-url": {
-+      "version": "3.1.0",
-+      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz",
-+      "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=",
-       "dev": true,
-       "requires": {
--        "ccount": "1.0.3",
--        "is-alphanumeric": "1.0.0",
--        "is-decimal": "1.0.2",
--        "is-whitespace-character": "1.0.2",
--        "longest-streak": "2.0.2",
--        "markdown-escapes": "1.0.2",
--        "markdown-table": "1.1.2",
--        "mdast-util-compact": "1.0.1",
--        "parse-entities": "1.1.2",
--        "repeat-string": "1.6.1",
--        "state-toggle": "1.0.1",
--        "stringify-entities": "1.3.2",
--        "unherit": "1.1.1",
--        "xtend": "4.0.1"
-+        "rc": "1.2.6"
-+>>>>>>> .their
-       }
-     },
-     "remove-trailing-separator": {
-@@ -7954,12 +11727,15 @@
-         "is-finite": "1.0.2"
-       }
-     },
-+<<<<<<< .our
-     "replace-ext": {
-       "version": "1.0.0",
-       "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
-       "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "request": {
-       "version": "2.85.0",
-       "resolved": "https://registry.npmjs.org/request/-/request-2.85.0.tgz",
-@@ -7967,7 +11743,11 @@
-       "dev": true,
-       "requires": {
-         "aws-sign2": "0.7.0",
-+<<<<<<< .our
-         "aws4": "1.7.0",
-+=======
-+        "aws4": "1.6.0",
-+>>>>>>> .their
-         "caseless": "0.12.0",
-         "combined-stream": "1.0.6",
-         "extend": "3.0.1",
-@@ -7982,9 +11762,15 @@
-         "mime-types": "2.1.18",
-         "oauth-sign": "0.8.2",
-         "performance-now": "2.1.0",
-+<<<<<<< .our
-         "qs": "6.5.2",
-         "safe-buffer": "5.1.2",
-         "stringstream": "0.0.6",
-+=======
-+        "qs": "6.5.1",
-+        "safe-buffer": "5.1.1",
-+        "stringstream": "0.0.5",
-+>>>>>>> .their
-         "tough-cookie": "2.3.4",
-         "tunnel-agent": "0.6.0",
-         "uuid": "3.2.1"
-@@ -8010,6 +11796,7 @@
-       "requires": {
-         "caller-path": "0.1.0",
-         "resolve-from": "1.0.1"
-+<<<<<<< .our
-       },
-       "dependencies": {
-         "resolve-from": {
-@@ -8024,15 +11811,29 @@
-       "version": "1.7.1",
-       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz",
-       "integrity": "sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw==",
-+=======
-+      }
-+    },
-+    "resolve": {
-+      "version": "1.5.0",
-+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz",
-+      "integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "path-parse": "1.0.5"
-       }
-     },
-     "resolve-from": {
-+<<<<<<< .our
-       "version": "4.0.0",
-       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-+=======
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
-+      "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "restore-cursor": {
-@@ -8064,7 +11865,11 @@
-     "rimraf": {
-       "version": "2.6.2",
-       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-LtgVDSShbqhlHm1u8PR8QVjOejY=",
-+=======
-+      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "glob": "7.1.2"
-@@ -8073,7 +11878,11 @@
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "fs.realpath": "1.0.0",
-@@ -8087,12 +11896,21 @@
-       }
-     },
-     "ripemd160": {
-+<<<<<<< .our
-       "version": "2.0.2",
-       "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-       "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-       "dev": true,
-       "requires": {
-         "hash-base": "3.0.4",
-+=======
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz",
-+      "integrity": "sha1-D0WEKVxTo2KK9+bXmsohzlfRxuc=",
-+      "dev": true,
-+      "requires": {
-+        "hash-base": "2.0.2",
-+>>>>>>> .their
-         "inherits": "2.0.3"
-       }
-     },
-@@ -8106,9 +11924,15 @@
-       }
-     },
-     "run-parallel": {
-+<<<<<<< .our
-       "version": "1.1.9",
-       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz",
-       "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==",
-+=======
-+      "version": "1.1.7",
-+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.7.tgz",
-+      "integrity": "sha512-nB641a6enJOh0fdsFHR9SiVCiOlAyjMplImDdjV3kWCzJZw9rwzvGwmpGuPmfX//Yxblh0pkzPcFcxA81iwmxA==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "rx-lite": {
-@@ -8118,15 +11942,25 @@
-       "dev": true
-     },
-     "safe-buffer": {
-+<<<<<<< .our
-       "version": "5.1.2",
-       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-+=======
-+      "version": "5.1.1",
-+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-+      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "sax": {
-       "version": "1.2.4",
-       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-KBYjTiN4vdxOU1T6tcqold9xANk=",
-+=======
-+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-+>>>>>>> .their
-       "dev": true,
-       "optional": true
-     },
-@@ -8145,6 +11979,7 @@
-         "semver": "5.5.0"
-       }
-     },
-+<<<<<<< .our
-     "send": {
-       "version": "0.16.2",
-       "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
-@@ -8294,12 +12129,15 @@
-         }
-       }
-     },
-+=======
-+>>>>>>> .their
-     "set-blocking": {
-       "version": "2.0.0",
-       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-       "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "set-immediate-shim": {
-       "version": "1.0.1",
-       "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
-@@ -8320,6 +12158,16 @@
-       "requires": {
-         "inherits": "2.0.3",
-         "safe-buffer": "5.1.2"
-+=======
-+    "sha.js": {
-+      "version": "2.4.10",
-+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.10.tgz",
-+      "integrity": "sha512-vnwmrFDlOExK4Nm16J2KMWHLrp14lBrjxMxBJpu++EnsuBmpiYaM/MEs46Vxxm/4FvdP5yTwuCTO9it5FSjrqA==",
-+      "dev": true,
-+      "requires": {
-+        "inherits": "2.0.3",
-+        "safe-buffer": "5.1.1"
-+>>>>>>> .their
-       }
-     },
-     "shasum": {
-@@ -8329,7 +12177,11 @@
-       "dev": true,
-       "requires": {
-         "json-stable-stringify": "0.0.1",
-+<<<<<<< .our
-         "sha.js": "2.4.11"
-+=======
-+        "sha.js": "2.4.10"
-+>>>>>>> .their
-       }
-     },
-     "shebang-command": {
-@@ -8373,7 +12225,11 @@
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "fs.realpath": "1.0.0",
-@@ -8386,12 +12242,15 @@
-         }
-       }
-     },
-+<<<<<<< .our
-     "shellsubstitute": {
-       "version": "1.2.0",
-       "resolved": "https://registry.npmjs.org/shellsubstitute/-/shellsubstitute-1.2.0.tgz",
-       "integrity": "sha1-5PcCpQxRiw9v6YRRiQ1wWvKba3A=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "signal-exit": {
-       "version": "3.0.2",
-       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-@@ -8413,12 +12272,15 @@
-       "integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "sliced": {
-       "version": "1.0.1",
-       "resolved": "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz",
-       "integrity": "sha1-CzpmK10Ewxd7GSa+qCsD+Dei70E=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "sntp": {
-       "version": "2.1.0",
-       "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",
-@@ -8475,7 +12337,11 @@
-     "split": {
-       "version": "1.0.1",
-       "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-YFvZvjA6pZ+zX5Ip++oN3snqB9k=",
-+=======
-+      "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "through": "2.3.8"
-@@ -8484,7 +12350,11 @@
-     "split2": {
-       "version": "2.2.0",
-       "resolved": "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-GGsldbz4PoW30YRldWI47k7kJJM=",
-+=======
-+      "integrity": "sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "through2": "2.0.3"
-@@ -8513,6 +12383,7 @@
-       }
-     },
-     "standard": {
-+<<<<<<< .our
-       "version": "10.0.3",
-       "resolved": "https://registry.npmjs.org/standard/-/standard-10.0.3.tgz",
-       "integrity": "sha512-JURZ+85ExKLQULckDFijdX5WHzN6RC7fgiZNSV4jFQVo+3tPoQGHyBrGekye/yf0aOfb4210EM5qPNlc2cRh4w==",
-@@ -8539,6 +12410,34 @@
-         "get-stdin": "5.0.1",
-         "minimist": "1.2.0",
-         "pkg-conf": "2.1.0"
-+=======
-+      "version": "8.6.0",
-+      "resolved": "https://registry.npmjs.org/standard/-/standard-8.6.0.tgz",
-+      "integrity": "sha1-Y1Eyvnv7VnwpIQBfMPnjUOR1Kq0=",
-+      "dev": true,
-+      "requires": {
-+        "eslint": "3.10.2",
-+        "eslint-config-standard": "6.2.1",
-+        "eslint-config-standard-jsx": "3.2.0",
-+        "eslint-plugin-promise": "3.4.2",
-+        "eslint-plugin-react": "6.7.1",
-+        "eslint-plugin-standard": "2.0.1",
-+        "standard-engine": "5.2.0"
-+      }
-+    },
-+    "standard-engine": {
-+      "version": "5.2.0",
-+      "resolved": "https://registry.npmjs.org/standard-engine/-/standard-engine-5.2.0.tgz",
-+      "integrity": "sha1-QAZgrlrM6K/U22D/IhSpGQrXkKM=",
-+      "dev": true,
-+      "requires": {
-+        "deglob": "2.1.0",
-+        "find-root": "1.1.0",
-+        "get-stdin": "5.0.1",
-+        "home-or-tmp": "2.0.0",
-+        "minimist": "1.2.0",
-+        "pkg-config": "1.1.1"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "get-stdin": {
-@@ -8552,11 +12451,19 @@
-     "standard-markdown": {
-       "version": "4.0.2",
-       "resolved": "https://registry.npmjs.org/standard-markdown/-/standard-markdown-4.0.2.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-NaC1bLtX5JzuLXQ9ocmERMNK1Lg=",
-       "dev": true,
-       "requires": {
-         "async": "2.6.0",
-         "commander": "2.15.1",
-+=======
-+      "integrity": "sha512-h+WTmoGN0qmse8I1VX8VD6V5JeVLXZOPQltvxQP9FfSpSl6RmKYMLTUQ2j/QhdmsdxQKDqulZF/Bf8oEnttIQA==",
-+      "dev": true,
-+      "requires": {
-+        "async": "2.6.0",
-+        "commander": "2.15.0",
-+>>>>>>> .their
-         "globby": "6.1.0",
-         "lodash.flatten": "4.4.0",
-         "lodash.range": "3.2.0",
-@@ -8579,6 +12486,7 @@
-           "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "lodash": "4.17.10"
-           }
-         },
-@@ -8586,11 +12494,24 @@
-           "version": "2.4.1",
-           "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
-           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
-+=======
-+            "lodash": "4.17.5"
-+          }
-+        },
-+        "chalk": {
-+          "version": "2.3.2",
-+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
-+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "ansi-styles": "3.2.1",
-             "escape-string-regexp": "1.0.5",
-+<<<<<<< .our
-             "supports-color": "5.4.0"
-+=======
-+            "supports-color": "5.3.0"
-+>>>>>>> .their
-           }
-         },
-         "cli-cursor": {
-@@ -8603,15 +12524,165 @@
-           }
-         },
-         "cli-spinners": {
-+<<<<<<< .our
-           "version": "1.3.1",
-           "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.3.1.tgz",
-           "integrity": "sha512-1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg==",
-+=======
-+          "version": "1.1.0",
-+          "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.1.0.tgz",
-+          "integrity": "sha1-8YR7FohE2RemceudFH499JfJDQY=",
-+          "dev": true
-+        },
-+        "doctrine": {
-+          "version": "2.1.0",
-+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-+          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-+          "dev": true,
-+          "requires": {
-+            "esutils": "2.0.2"
-+          }
-+        },
-+        "eslint": {
-+          "version": "3.19.0",
-+          "resolved": "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz",
-+          "integrity": "sha1-yPxiAcf0DdCJQbh8CFdnOGpnmsw=",
-+          "dev": true,
-+          "requires": {
-+            "babel-code-frame": "6.26.0",
-+            "chalk": "1.1.3",
-+            "concat-stream": "1.5.2",
-+            "debug": "2.6.9",
-+            "doctrine": "2.1.0",
-+            "escope": "3.6.0",
-+            "espree": "3.5.4",
-+            "esquery": "1.0.0",
-+            "estraverse": "4.2.0",
-+            "esutils": "2.0.2",
-+            "file-entry-cache": "2.0.0",
-+            "glob": "7.1.2",
-+            "globals": "9.18.0",
-+            "ignore": "3.3.7",
-+            "imurmurhash": "0.1.4",
-+            "inquirer": "0.12.0",
-+            "is-my-json-valid": "2.17.2",
-+            "is-resolvable": "1.1.0",
-+            "js-yaml": "3.11.0",
-+            "json-stable-stringify": "1.0.1",
-+            "levn": "0.3.0",
-+            "lodash": "4.17.5",
-+            "mkdirp": "0.5.1",
-+            "natural-compare": "1.4.0",
-+            "optionator": "0.8.2",
-+            "path-is-inside": "1.0.2",
-+            "pluralize": "1.2.1",
-+            "progress": "1.1.8",
-+            "require-uncached": "1.0.3",
-+            "shelljs": "0.7.8",
-+            "strip-bom": "3.0.0",
-+            "strip-json-comments": "2.0.1",
-+            "table": "3.8.3",
-+            "text-table": "0.2.0",
-+            "user-home": "2.0.0"
-+          },
-+          "dependencies": {
-+            "ansi-styles": {
-+              "version": "2.2.1",
-+              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-+              "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-+              "dev": true
-+            },
-+            "chalk": {
-+              "version": "1.1.3",
-+              "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-+              "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-+              "dev": true,
-+              "requires": {
-+                "ansi-styles": "2.2.1",
-+                "escape-string-regexp": "1.0.5",
-+                "has-ansi": "2.0.0",
-+                "strip-ansi": "3.0.1",
-+                "supports-color": "2.0.0"
-+              }
-+            },
-+            "supports-color": {
-+              "version": "2.0.0",
-+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-+              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-+              "dev": true
-+            }
-+          }
-+        },
-+        "eslint-config-standard": {
-+          "version": "10.2.1",
-+          "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-10.2.1.tgz",
-+          "integrity": "sha1-wGHk0GbzedwXzVYsZOgZtN1FRZE=",
-+          "dev": true
-+        },
-+        "eslint-config-standard-jsx": {
-+          "version": "4.0.2",
-+          "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-4.0.2.tgz",
-+          "integrity": "sha512-F8fRh2WFnTek7dZH9ZaE0PCBwdVGkwVWZmizla/DDNOmg7Tx6B/IlK5+oYpiX29jpu73LszeJj5i1axEZv6VMw==",
-+          "dev": true
-+        },
-+        "eslint-plugin-promise": {
-+          "version": "3.5.0",
-+          "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-3.5.0.tgz",
-+          "integrity": "sha1-ePu2/+BHIBYnVp6FpsU3OvKmj8o=",
-+          "dev": true
-+        },
-+        "eslint-plugin-react": {
-+          "version": "6.10.3",
-+          "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-6.10.3.tgz",
-+          "integrity": "sha1-xUNb6wZ3ThLH2y9qut3L+QDNP3g=",
-+          "dev": true,
-+          "requires": {
-+            "array.prototype.find": "2.0.4",
-+            "doctrine": "1.5.0",
-+            "has": "1.0.1",
-+            "jsx-ast-utils": "1.4.1",
-+            "object.assign": "4.1.0"
-+          },
-+          "dependencies": {
-+            "doctrine": {
-+              "version": "1.5.0",
-+              "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
-+              "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
-+              "dev": true,
-+              "requires": {
-+                "esutils": "2.0.2",
-+                "isarray": "1.0.0"
-+              }
-+            }
-+          }
-+        },
-+        "eslint-plugin-standard": {
-+          "version": "3.0.1",
-+          "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-3.0.1.tgz",
-+          "integrity": "sha1-NNDJFbRe3G8BA5PH7vOCOwhWXPI=",
-+          "dev": true
-+        },
-+        "estraverse": {
-+          "version": "4.2.0",
-+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-+          "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
-+          "dev": true
-+        },
-+        "get-stdin": {
-+          "version": "5.0.1",
-+          "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.1.tgz",
-+          "integrity": "sha1-Ei4WFZHiH/TFJTAwVpPyDmOTo5g=",
-+>>>>>>> .their
-           "dev": true
-         },
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "fs.realpath": "1.0.0",
-@@ -8641,13 +12712,35 @@
-           "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-           "dev": true
-         },
-+<<<<<<< .our
-+=======
-+        "isarray": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-+          "dev": true
-+        },
-+        "json-stable-stringify": {
-+          "version": "1.0.1",
-+          "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
-+          "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
-+          "dev": true,
-+          "requires": {
-+            "jsonify": "0.0.0"
-+          }
-+        },
-+>>>>>>> .their
-         "log-symbols": {
-           "version": "2.2.0",
-           "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
-           "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "chalk": "2.4.1"
-+=======
-+            "chalk": "2.3.2"
-+>>>>>>> .their
-           }
-         },
-         "onetime": {
-@@ -8665,12 +12758,27 @@
-           "integrity": "sha512-iMK1DOQxzzh2MBlVsU42G80mnrvUhqsMh74phHtDlrcTZPK0pH6o7l7DRshK+0YsxDyEuaOkziVdvM3T0QTzpw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "chalk": "2.4.1",
-             "cli-cursor": "2.1.0",
-             "cli-spinners": "1.3.1",
-             "log-symbols": "2.2.0"
-           }
-         },
-+=======
-+            "chalk": "2.3.2",
-+            "cli-cursor": "2.1.0",
-+            "cli-spinners": "1.1.0",
-+            "log-symbols": "2.2.0"
-+          }
-+        },
-+        "progress": {
-+          "version": "1.1.8",
-+          "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
-+          "integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=",
-+          "dev": true
-+        },
-+>>>>>>> .their
-         "restore-cursor": {
-           "version": "2.0.0",
-           "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
-@@ -8681,10 +12789,52 @@
-             "signal-exit": "3.0.2"
-           }
-         },
-+<<<<<<< .our
-         "supports-color": {
-           "version": "5.4.0",
-           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
-           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-+=======
-+        "standard": {
-+          "version": "10.0.3",
-+          "resolved": "https://registry.npmjs.org/standard/-/standard-10.0.3.tgz",
-+          "integrity": "sha512-JURZ+85ExKLQULckDFijdX5WHzN6RC7fgiZNSV4jFQVo+3tPoQGHyBrGekye/yf0aOfb4210EM5qPNlc2cRh4w==",
-+          "dev": true,
-+          "requires": {
-+            "eslint": "3.19.0",
-+            "eslint-config-standard": "10.2.1",
-+            "eslint-config-standard-jsx": "4.0.2",
-+            "eslint-plugin-import": "2.2.0",
-+            "eslint-plugin-node": "4.2.3",
-+            "eslint-plugin-promise": "3.5.0",
-+            "eslint-plugin-react": "6.10.3",
-+            "eslint-plugin-standard": "3.0.1",
-+            "standard-engine": "7.0.0"
-+          }
-+        },
-+        "standard-engine": {
-+          "version": "7.0.0",
-+          "resolved": "https://registry.npmjs.org/standard-engine/-/standard-engine-7.0.0.tgz",
-+          "integrity": "sha1-67d7nI/CyBZf+jU72Rug3/Qa9pA=",
-+          "dev": true,
-+          "requires": {
-+            "deglob": "2.1.0",
-+            "get-stdin": "5.0.1",
-+            "minimist": "1.2.0",
-+            "pkg-conf": "2.1.0"
-+          }
-+        },
-+        "strip-bom": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-+          "dev": true
-+        },
-+        "supports-color": {
-+          "version": "5.3.0",
-+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
-+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "has-flag": "3.0.0"
-@@ -8692,6 +12842,7 @@
-         }
-       }
-     },
-+<<<<<<< .our
-     "state-toggle": {
-       "version": "1.0.1",
-       "resolved": "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.1.tgz",
-@@ -8704,6 +12855,8 @@
-       "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "stream-browserify": {
-       "version": "2.0.1",
-       "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
-@@ -8711,7 +12864,11 @@
-       "dev": true,
-       "requires": {
-         "inherits": "2.0.3",
-+<<<<<<< .our
-         "readable-stream": "2.3.6"
-+=======
-+        "readable-stream": "2.3.5"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -8721,27 +12878,47 @@
-           "dev": true
-         },
-         "readable-stream": {
-+<<<<<<< .our
-           "version": "2.3.6",
-           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-+=======
-+          "version": "2.3.5",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
-+          "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-             "process-nextick-args": "2.0.0",
-+<<<<<<< .our
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-+=======
-+            "safe-buffer": "5.1.1",
-+            "string_decoder": "1.0.3",
-+>>>>>>> .their
-             "util-deprecate": "1.0.2"
-           }
-         },
-         "string_decoder": {
-+<<<<<<< .our
-           "version": "1.1.1",
-           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-             "safe-buffer": "5.1.2"
-+=======
-+          "version": "1.0.3",
-+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-+          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-+          "dev": true,
-+          "requires": {
-+            "safe-buffer": "5.1.1"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -8753,7 +12930,11 @@
-       "dev": true,
-       "requires": {
-         "duplexer2": "0.1.4",
-+<<<<<<< .our
-         "readable-stream": "2.3.6"
-+=======
-+        "readable-stream": "2.3.5"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -8763,27 +12944,47 @@
-           "dev": true
-         },
-         "readable-stream": {
-+<<<<<<< .our
-           "version": "2.3.6",
-           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-+=======
-+          "version": "2.3.5",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
-+          "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-             "process-nextick-args": "2.0.0",
-+<<<<<<< .our
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-+=======
-+            "safe-buffer": "5.1.1",
-+            "string_decoder": "1.0.3",
-+>>>>>>> .their
-             "util-deprecate": "1.0.2"
-           }
-         },
-         "string_decoder": {
-+<<<<<<< .our
-           "version": "1.1.1",
-           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-             "safe-buffer": "5.1.2"
-+=======
-+          "version": "1.0.3",
-+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-+          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-+          "dev": true,
-+          "requires": {
-+            "safe-buffer": "5.1.1"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -8795,14 +12996,24 @@
-       "dev": true
-     },
-     "stream-http": {
-+<<<<<<< .our
-       "version": "2.8.2",
-       "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.2.tgz",
-       "integrity": "sha512-QllfrBhqF1DPcz46WxKTs6Mz1Bpc+8Qm6vbqOpVav5odAXwbyzwnEczoWqtxrsmlO+cJqtPrp/8gWKWjaKLLlA==",
-+=======
-+      "version": "2.8.1",
-+      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.1.tgz",
-+      "integrity": "sha512-cQ0jo17BLca2r0GfRdZKYAGLU6JRoIWxqSOakUMuKOT6MOK7AAlE856L33QuDmAy/eeOrhLee3dZKX0Uadu93A==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "builtin-status-codes": "3.0.0",
-         "inherits": "2.0.3",
-+<<<<<<< .our
-         "readable-stream": "2.3.6",
-+=======
-+        "readable-stream": "2.3.5",
-+>>>>>>> .their
-         "to-arraybuffer": "1.0.1",
-         "xtend": "4.0.1"
-       },
-@@ -8814,27 +13025,47 @@
-           "dev": true
-         },
-         "readable-stream": {
-+<<<<<<< .our
-           "version": "2.3.6",
-           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-+=======
-+          "version": "2.3.5",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
-+          "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-             "process-nextick-args": "2.0.0",
-+<<<<<<< .our
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-+=======
-+            "safe-buffer": "5.1.1",
-+            "string_decoder": "1.0.3",
-+>>>>>>> .their
-             "util-deprecate": "1.0.2"
-           }
-         },
-         "string_decoder": {
-+<<<<<<< .our
-           "version": "1.1.1",
-           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-             "safe-buffer": "5.1.2"
-+=======
-+          "version": "1.0.3",
-+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-+          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-+          "dev": true,
-+          "requires": {
-+            "safe-buffer": "5.1.1"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -8852,7 +13083,11 @@
-       "dev": true,
-       "requires": {
-         "inherits": "2.0.3",
-+<<<<<<< .our
-         "readable-stream": "2.3.6"
-+=======
-+        "readable-stream": "2.3.5"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -8862,27 +13097,47 @@
-           "dev": true
-         },
-         "readable-stream": {
-+<<<<<<< .our
-           "version": "2.3.6",
-           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-+=======
-+          "version": "2.3.5",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
-+          "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-             "process-nextick-args": "2.0.0",
-+<<<<<<< .our
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-+=======
-+            "safe-buffer": "5.1.1",
-+            "string_decoder": "1.0.3",
-+>>>>>>> .their
-             "util-deprecate": "1.0.2"
-           }
-         },
-         "string_decoder": {
-+<<<<<<< .our
-           "version": "1.1.1",
-           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-             "safe-buffer": "5.1.2"
-+=======
-+          "version": "1.0.3",
-+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-+          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-+          "dev": true,
-+          "requires": {
-+            "safe-buffer": "5.1.1"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -8910,6 +13165,7 @@
-       "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "stringify-entities": {
-       "version": "1.3.2",
-       "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-1.3.2.tgz",
-@@ -8926,6 +13182,12 @@
-       "version": "0.0.6",
-       "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz",
-       "integrity": "sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==",
-+=======
-+    "stringstream": {
-+      "version": "0.0.5",
-+      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-+      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "strip-ansi": {
-@@ -9016,7 +13278,11 @@
-         "ajv": "4.11.8",
-         "ajv-keywords": "1.5.1",
-         "chalk": "1.1.3",
-+<<<<<<< .our
-         "lodash": "4.17.10",
-+=======
-+        "lodash": "4.17.5",
-+>>>>>>> .their
-         "slice-ansi": "0.0.4",
-         "string-width": "2.1.1"
-       },
-@@ -9055,7 +13321,11 @@
-         "string-width": {
-           "version": "2.1.1",
-           "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
-+=======
-+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "is-fullwidth-code-point": "2.0.0",
-@@ -9074,30 +13344,52 @@
-       }
-     },
-     "tar": {
-+<<<<<<< .our
-       "version": "4.4.2",
-       "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.2.tgz",
-       "integrity": "sha512-BfkE9CciGGgDsATqkikUHrQrraBCO+ke/1f6SFAEMnxyyfN9lxC+nW1NFWMpqH865DhHIy9vQi682gk1X7friw==",
-+=======
-+      "version": "4.4.0",
-+      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.0.tgz",
-+      "integrity": "sha512-gJlTiiErwo96K904FnoYWl+5+FBgS+FimU6GMh66XLdLa55al8+d4jeDfPoGwSNHdtWI5FJP6xurmVqhBuGJpQ==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "chownr": "1.0.1",
-         "fs-minipass": "1.2.5",
-+<<<<<<< .our
-         "minipass": "2.3.0",
-         "minizlib": "1.1.0",
-         "mkdirp": "0.5.1",
-         "safe-buffer": "5.1.2",
-+=======
-+        "minipass": "2.2.1",
-+        "minizlib": "1.1.0",
-+        "mkdirp": "0.5.1",
-+>>>>>>> .their
-         "yallist": "3.0.2"
-       }
-     },
-     "tar-fs": {
-+<<<<<<< .our
-       "version": "1.16.2",
-       "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.2.tgz",
-       "integrity": "sha512-LdknWjPEiZC1nOBwhv0JBzfJBGPJar08dZg2rwZe0ZTLQoRGEzgrl7vF3qUEkCHpI/wN9e7RyCuDhMsJUCLPPQ==",
-+=======
-+      "version": "1.16.0",
-+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.0.tgz",
-+      "integrity": "sha512-I9rb6v7mjWLtOfCau9eH5L7sLJyU2BnxtEZRQ5Mt+eRKmf1F0ohXmT/Jc3fr52kDvjJ/HV5MH3soQfPL5bQ0Yg==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "chownr": "1.0.1",
-         "mkdirp": "0.5.1",
-         "pump": "1.0.3",
-+<<<<<<< .our
-         "tar-stream": "1.6.0"
-+=======
-+        "tar-stream": "1.5.5"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "pump": {
-@@ -9113,6 +13405,7 @@
-       }
-     },
-     "tar-stream": {
-+<<<<<<< .our
-       "version": "1.6.0",
-       "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.0.tgz",
-       "integrity": "sha512-lh2iAPG/BHNmN6WB9Ybdynk9rEJ5GD/dy4zscHmVlwa1dq2tpE+BH78i5vjYwYVWEaOXGBjzxr89aVACF17Cpw==",
-@@ -9124,6 +13417,16 @@
-         "fs-constants": "1.0.0",
-         "readable-stream": "2.3.6",
-         "to-buffer": "1.1.1",
-+=======
-+      "version": "1.5.5",
-+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.5.tgz",
-+      "integrity": "sha512-mQdgLPc/Vjfr3VWqWbfxW8yQNiJCbAZ+Gf6GDu1Cy0bdb33ofyiNGBtAY96jHFhDuivCwgW1H9DgTON+INiXgg==",
-+      "dev": true,
-+      "requires": {
-+        "bl": "1.2.1",
-+        "end-of-stream": "1.4.1",
-+        "readable-stream": "2.3.5",
-+>>>>>>> .their
-         "xtend": "4.0.1"
-       },
-       "dependencies": {
-@@ -9134,27 +13437,47 @@
-           "dev": true
-         },
-         "readable-stream": {
-+<<<<<<< .our
-           "version": "2.3.6",
-           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-+=======
-+          "version": "2.3.5",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
-+          "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-             "process-nextick-args": "2.0.0",
-+<<<<<<< .our
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-+=======
-+            "safe-buffer": "5.1.1",
-+            "string_decoder": "1.0.3",
-+>>>>>>> .their
-             "util-deprecate": "1.0.2"
-           }
-         },
-         "string_decoder": {
-+<<<<<<< .our
-           "version": "1.1.1",
-           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-             "safe-buffer": "5.1.2"
-+=======
-+          "version": "1.0.3",
-+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-+          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-+          "dev": true,
-+          "requires": {
-+            "safe-buffer": "5.1.1"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -9207,7 +13530,11 @@
-     "text-extensions": {
-       "version": "1.7.0",
-       "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.7.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-+qq6JiXtdG1WiiPk0KrNm/CKizk=",
-+=======
-+      "integrity": "sha512-AKXZeDq230UaSzaO5s3qQUZOaC7iKbzq0jOFL614R7d9R593HLqAOL0cYoqLdkNrjBSOdmoQI06yigq1TSBXAg==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "text-table": {
-@@ -9234,7 +13561,11 @@
-       "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "readable-stream": "2.3.6",
-+=======
-+        "readable-stream": "2.3.5",
-+>>>>>>> .their
-         "xtend": "4.0.1"
-       },
-       "dependencies": {
-@@ -9245,27 +13576,47 @@
-           "dev": true
-         },
-         "readable-stream": {
-+<<<<<<< .our
-           "version": "2.3.6",
-           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-+=======
-+          "version": "2.3.5",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
-+          "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-             "process-nextick-args": "2.0.0",
-+<<<<<<< .our
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-+=======
-+            "safe-buffer": "5.1.1",
-+            "string_decoder": "1.0.3",
-+>>>>>>> .their
-             "util-deprecate": "1.0.2"
-           }
-         },
-         "string_decoder": {
-+<<<<<<< .our
-           "version": "1.1.1",
-           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-             "safe-buffer": "5.1.2"
-+=======
-+          "version": "1.0.3",
-+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-+          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-+          "dev": true,
-+          "requires": {
-+            "safe-buffer": "5.1.1"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -9300,6 +13651,7 @@
-       "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "to-buffer": {
-       "version": "1.1.1",
-       "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz",
-@@ -9317,6 +13669,8 @@
-         "x-is-function": "1.0.4"
-       }
-     },
-+=======
-+>>>>>>> .their
-     "touch": {
-       "version": "0.0.3",
-       "resolved": "https://registry.npmjs.org/touch/-/touch-0.0.3.tgz",
-@@ -9359,12 +13713,15 @@
-       "integrity": "sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "trim": {
-       "version": "0.0.1",
-       "resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz",
-       "integrity": "sha1-WFhUf2spB1fulczMZm+1AITEYN0=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "trim-newlines": {
-       "version": "2.0.0",
-       "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz",
-@@ -9377,6 +13734,7 @@
-       "integrity": "sha1-n5up2e+odkw4dpi8v+sshI8RrbM=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "trim-trailing-lines": {
-       "version": "1.1.1",
-       "resolved": "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.1.tgz",
-@@ -9389,6 +13747,8 @@
-       "integrity": "sha512-FHkoUZvG6Egrv9XZAyYGKEyb1JMsFphgPjoczkZC2y6W93U1jswcVURB8MUvtsahEPEVACyxD47JAL63vF4JsQ==",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "tslint": {
-       "version": "4.5.1",
-       "resolved": "https://registry.npmjs.org/tslint/-/tslint-4.5.1.tgz",
-@@ -9396,20 +13756,34 @@
-       "dev": true,
-       "requires": {
-         "babel-code-frame": "6.26.0",
-+<<<<<<< .our
-         "colors": "1.2.5",
-+=======
-+        "colors": "1.2.1",
-+>>>>>>> .their
-         "diff": "3.5.0",
-         "findup-sync": "0.3.0",
-         "glob": "7.1.2",
-         "optimist": "0.6.1",
-+<<<<<<< .our
-         "resolve": "1.7.1",
-         "tsutils": "1.9.1",
-         "update-notifier": "2.5.0"
-+=======
-+        "resolve": "1.5.0",
-+        "tsutils": "1.9.1",
-+        "update-notifier": "2.3.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "fs.realpath": "1.0.0",
-@@ -9456,7 +13830,11 @@
-       "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "safe-buffer": "5.1.2"
-+=======
-+        "safe-buffer": "5.1.1"
-+>>>>>>> .their
-       }
-     },
-     "tweetnacl": {
-@@ -9482,9 +13860,15 @@
-       "dev": true
-     },
-     "typescript": {
-+<<<<<<< .our
-       "version": "2.9.2",
-       "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
-       "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==",
-+=======
-+      "version": "2.7.2",
-+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.7.2.tgz",
-+      "integrity": "sha512-p5TCYZDAO0m4G344hD+wx/LATebLWZNkkh2asWUFqSsD2OrDNhbAHuSjobrmsUmdzjJjEeZVU9g1h3O6vpstnw==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "uc.micro": {
-@@ -9533,6 +13917,7 @@
-       "integrity": "sha512-4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow==",
-       "dev": true
-     },
-+<<<<<<< .our
-     "unherit": {
-       "version": "1.1.1",
-       "resolved": "https://registry.npmjs.org/unherit/-/unherit-1.1.1.tgz",
-@@ -9677,6 +14062,8 @@
-         "vfile-location": "2.0.3"
-       }
-     },
-+=======
-+>>>>>>> .their
-     "uniq": {
-       "version": "1.0.1",
-       "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
-@@ -9692,6 +14079,7 @@
-         "crypto-random-string": "1.0.0"
-       }
-     },
-+<<<<<<< .our
-     "unist-util-generated": {
-       "version": "1.1.2",
-       "resolved": "https://registry.npmjs.org/unist-util-generated/-/unist-util-generated-1.1.2.tgz",
-@@ -9764,12 +14152,15 @@
-         "os-homedir": "1.0.2"
-       }
-     },
-+=======
-+>>>>>>> .their
-     "unzip-response": {
-       "version": "2.0.1",
-       "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz",
-       "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "update-check": {
-       "version": "1.5.1",
-       "resolved": "https://registry.npmjs.org/update-check/-/update-check-1.5.1.tgz",
-@@ -9791,6 +14182,18 @@
-         "configstore": "3.1.2",
-         "import-lazy": "2.1.0",
-         "is-ci": "1.1.0",
-+=======
-+    "update-notifier": {
-+      "version": "2.3.0",
-+      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.3.0.tgz",
-+      "integrity": "sha1-TognpruRUUCrCTVZ1wFOPruDdFE=",
-+      "dev": true,
-+      "requires": {
-+        "boxen": "1.3.0",
-+        "chalk": "2.3.2",
-+        "configstore": "3.1.1",
-+        "import-lazy": "2.1.0",
-+>>>>>>> .their
-         "is-installed-globally": "0.1.0",
-         "is-npm": "1.0.0",
-         "latest-version": "3.1.0",
-@@ -9808,14 +14211,24 @@
-           }
-         },
-         "chalk": {
-+<<<<<<< .our
-           "version": "2.4.1",
-           "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
-           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
-+=======
-+          "version": "2.3.2",
-+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
-+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "ansi-styles": "3.2.1",
-             "escape-string-regexp": "1.0.5",
-+<<<<<<< .our
-             "supports-color": "5.4.0"
-+=======
-+            "supports-color": "5.3.0"
-+>>>>>>> .their
-           }
-         },
-         "has-flag": {
-@@ -9825,9 +14238,15 @@
-           "dev": true
-         },
-         "supports-color": {
-+<<<<<<< .our
-           "version": "5.4.0",
-           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
-           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-+=======
-+          "version": "5.3.0",
-+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
-+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "has-flag": "3.0.0"
-@@ -9910,12 +14329,15 @@
-         "spdx-expression-parse": "3.0.0"
-       }
-     },
-+<<<<<<< .our
-     "vary": {
-       "version": "1.1.2",
-       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-       "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "verror": {
-       "version": "1.10.0",
-       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-@@ -9927,6 +14349,7 @@
-         "extsprintf": "1.3.0"
-       }
-     },
-+<<<<<<< .our
-     "vfile": {
-       "version": "2.3.0",
-       "resolved": "https://registry.npmjs.org/vfile/-/vfile-2.3.0.tgz",
-@@ -9990,6 +14413,8 @@
-       "integrity": "sha512-dxUM6IYvGChHuwMT3dseyU5BHprNRXzAV0OHx1A769lVGsTiT50kU7BbpRFV+IE6oWmU+PwHdsTKfXhnDIRIgQ==",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "vm-browserify": {
-       "version": "0.0.4",
-       "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
-@@ -10002,7 +14427,11 @@
-     "walk-sync": {
-       "version": "0.3.2",
-       "resolved": "https://registry.npmjs.org/walk-sync/-/walk-sync-0.3.2.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-SCcoCvxC0OA1NnxKTjHurA0Tb3U=",
-+=======
-+      "integrity": "sha512-FMB5VqpLqOCcqrzA9okZFc0wq0Qbmdm396qJxvQZhDpyu0W95G9JCmp74tx7iyYnyOcBtUuKJsgIKAqjozvmmQ==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "ensure-posix-path": "1.0.2",
-@@ -10029,7 +14458,11 @@
-     "which": {
-       "version": "1.3.0",
-       "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-/wS9/AEO5UfXgL7DjhrBwnd9JTo=",
-+=======
-+      "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "isexe": "2.0.0"
-@@ -10106,6 +14539,7 @@
-         "strip-ansi": "3.0.1"
-       }
-     },
-+<<<<<<< .our
-     "wrapped": {
-       "version": "1.0.1",
-       "resolved": "https://registry.npmjs.org/wrapped/-/wrapped-1.0.1.tgz",
-@@ -10124,6 +14558,8 @@
-         }
-       }
-     },
-+=======
-+>>>>>>> .their
-     "wrappy": {
-       "version": "1.0.2",
-       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-@@ -10142,7 +14578,11 @@
-     "write-file-atomic": {
-       "version": "2.3.0",
-       "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-H/YVdcLipOjlENb6TiQ8zhg5mas=",
-+=======
-+      "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "graceful-fs": "4.1.11",
-@@ -10150,6 +14590,7 @@
-         "signal-exit": "3.0.2"
-       }
-     },
-+<<<<<<< .our
-     "x-is-function": {
-       "version": "1.0.4",
-       "resolved": "https://registry.npmjs.org/x-is-function/-/x-is-function-1.0.4.tgz",
-@@ -10162,6 +14603,8 @@
-       "integrity": "sha1-R0tQhlrzpJqcRlfwWs0UVFj3fYI=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "xdg-basedir": {
-       "version": "3.0.0",
-       "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz",
-changed in both
-  base   100644 570c63f4e7915198292dae1cd9e84e7ecd725386 package.json
-  our    100644 c081cd89450cd50efba1ec280ff1349a96ea3ce0 package.json
-  their  100644 87167f4bd3a967da3e673237ba91da87f2a452f1 package.json
-@@ -1,17 +1,25 @@
- {
-   "name": "electron",
-+<<<<<<< .our
-   "version": "4.0.0-nightly.20180821",
-+=======
-+  "version": "1.7.16",
-+>>>>>>> .their
-   "repository": "https://github.com/electron/electron",
-   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
-   "devDependencies": {
-     "asar": "^0.11.0",
-     "browserify": "^13.1.0",
-     "check-for-leaks": "^1.0.2",
-+<<<<<<< .our
-     "clang-format": "^1.2.3",
-+=======
-+>>>>>>> .their
-     "colors": "^1.1.2",
-     "dotenv-safe": "^4.0.4",
-     "dugite": "^1.45.0",
-     "electabul": "~0.0.4",
-+<<<<<<< .our
-     "electron-docs-linter": "^2.3.4",
-     "electron-typescript-definitions": "^1.3.6",
-     "github": "^9.2.0",
-@@ -24,6 +32,15 @@
-     "octicons": "^7.3.0",
-     "remark-cli": "^4.0.0",
-     "remark-preset-lint-markdown-style-guide": "^2.1.1",
-+=======
-+    "electron-docs-linter": "^2.3.3",
-+    "electron-typescript-definitions": "~1.2.11",
-+    "github": "^9.2.0",
-+    "heads": "^1.3.0",
-+    "husky": "^0.14.3",
-+    "minimist": "^1.2.0",
-+    "nugget": "^2.0.1",
-+>>>>>>> .their
-     "request": "^2.68.0",
-     "semver": "^5.5.0",
-     "serve": "^6.5.8",
-@@ -69,6 +86,10 @@
-     "lint:js-in-markdown": "standard-markdown docs",
-     "create-api-json": "electron-docs-linter docs --outfile=out/electron-api.json --version=$npm_package_version",
-     "create-typescript-definitions": "npm run create-api-json && electron-typescript-definitions --in=out/electron-api.json --out=out/electron.d.ts",
-+<<<<<<< .our
-+=======
-+    "merge-release": "node ./script/merge-release.js",
-+>>>>>>> .their
-     "mock-release": "node ./script/ci-release-build.js",
-     "preinstall": "node -e 'process.exit(0)'",
-     "publish-to-npm": "node ./script/publish-to-npm.js",
-changed in both
-  base   100755 4db30b71fca9996003fe44a71fa9d81499677bd2 script/bump-version.py
-  our    100755 564adb2116312b0f6d0351096bd89cb373cd3bab script/bump-version.py
-  their  100755 28424aaa8ee614b0dfffc7468adb2266f05440cb script/bump-version.py
-@@ -12,6 +12,7 @@
- SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
- 
- def main():
-+<<<<<<< .our
- 
-   parser = argparse.ArgumentParser(
-     description='Bump version numbers. Must specify at least one of the three'
-@@ -94,6 +95,77 @@
-   if args.dry_run:
-     print 'new version number would be: {0}\n'.format(version + suffix)
-     return 0
-+=======
-+
-+  parser = argparse.ArgumentParser(
-+    description='Bump version numbers. Must specify at least one of the three'
-+               +' options:\n'
-+               +'   --bump=patch to increment patch version, or\n'
-+               +'   --stable to promote current beta to stable, or\n'
-+               +'   --version={version} to set version number directly\n'
-+               +'Note that you can use both --bump and --stable '
-+               +'simultaneously.',
-+               formatter_class=argparse.RawTextHelpFormatter
-+  )
-+  parser.add_argument(
-+    '--version',
-+    default=None,
-+    dest='new_version',
-+    help='new version number'
-+  )
-+  parser.add_argument(
-+    '--bump',
-+    action='store',
-+    default=None,
-+    dest='bump',
-+    help='increment [major | minor | patch | beta]'
-+  )
-+  parser.add_argument(
-+    '--stable',
-+    action='store_true',
-+    default= False,
-+    dest='stable',
-+    help='promote to stable (i.e. remove `-beta.x` suffix)'
-+  )
-+  parser.add_argument(
-+    '--dry-run',
-+    action='store_true',
-+    default= False,
-+    dest='dry_run',
-+    help='just to check that version number is correct'
-+  )
-+
-+  args = parser.parse_args()
-+
-+  if args.new_version == None and args.bump == None and args.stable == False:
-+    parser.print_help()
-+    return 1
-+
-+  increments = ['major', 'minor', 'patch', 'beta']
-+
-+  curr_version = get_electron_version()
-+  versions = parse_version(re.sub('-beta', '', curr_version))
-+
-+  if args.bump in increments:
-+    versions = increase_version(versions, increments.index(args.bump))
-+    if versions[3] == '0':
-+      # beta starts at 1
-+      versions = increase_version(versions, increments.index('beta'))
-+
-+  if args.stable == True:
-+    versions[3] = '0'
-+
-+  if args.new_version != None:
-+    versions = parse_version(re.sub('-beta', '', args.new_version))
-+
-+  version = '.'.join(versions[:3])
-+  suffix = '' if versions[3] == '0' else '-beta.' + versions[3]
-+
-+  if args.dry_run:
-+    print 'new version number would be: {0}\n'.format(version + suffix)
-+    return 0
-+
-+>>>>>>> .their
- 
-   with scoped_cwd(SOURCE_ROOT):
-     update_electron_gyp(version, suffix)
-@@ -104,9 +176,12 @@
-     tag_version(version, suffix)
- 
-   print 'Bumped to version: {0}'.format(version + suffix)
-+<<<<<<< .our
- 
- def not_reached():
-   raise Exception('Unreachable code was reached')
-+=======
-+>>>>>>> .their
- 
- def increase_version(versions, index):
-   for i in range(index + 1, 4):
-@@ -116,8 +191,12 @@
- 
- 
- def update_electron_gyp(version, suffix):
-+<<<<<<< .our
-   pattern = re.compile(" *'version%' *: *'[0-9.]+(-beta[0-9.]*)?(-dev)?"
-     + "(-nightly[0-9.]*)?'")
-+=======
-+  pattern = re.compile(" *'version%' *: *'[0-9.]+(-beta[0-9.]*)?'")
-+>>>>>>> .their
-   with open('electron.gyp', 'r') as f:
-     lines = f.readlines()
- 
-@@ -209,6 +288,7 @@
- 
- 
- def tag_version(version, suffix):
-+<<<<<<< .our
-   execute([
-     'git',
-     'commit',
-@@ -217,6 +297,9 @@
-     'Bump v{0}'.format(version + suffix),
-     '-n'
-   ])
-+=======
-+  execute(['git', 'commit', '-a', '-m', 'Bump v{0}'.format(version + suffix)])
-+>>>>>>> .their
- 
- 
- if __name__ == '__main__':
-added in both
-  our    100644 be9f9597387f5f8b7bfddc61c202f32ce4c6d478 script/ci-release-build.js
-  their  100644 eb37ece8a892e696dbcc1815c3b9a2ccca79437b script/ci-release-build.js
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- require('dotenv-safe').load()
- 
- const assert = require('assert')
-@@ -23,6 +24,18 @@
-   'electron-release-osx-x64'
- ]
- 
-+=======
-+const assert = require('assert')
-+const request = require('request')
-+const buildAppVeyorURL = 'https://windows-ci.electronjs.org/api/builds'
-+
-+const circleCIJobs = [
-+  'electron-linux-arm',
-+  'electron-linux-ia32',
-+  'electron-linux-x64'
-+]
-+
-+>>>>>>> .their
- async function makeRequest (requestOptions, parseResponse) {
-   return new Promise((resolve, reject) => {
-     request(requestOptions, (err, res, body) => {
-@@ -34,6 +47,7 @@
-           resolve(body)
-         }
-       } else {
-+<<<<<<< .our
-         console.error('Error occurred while requesting:', requestOptions.url)
-         if (parseResponse) {
-           try {
-@@ -41,6 +55,10 @@
-           } catch (err) {
-             console.log('Error: ', `(status ${res.statusCode})`, err || res.body, requestOptions)
-           }
-+=======
-+        if (parseResponse) {
-+          console.log('Error: ', `(status ${res.statusCode})`, err || JSON.parse(res.body), requestOptions)
-+>>>>>>> .their
-         } else {
-           console.log('Error: ', `(status ${res.statusCode})`, err || res.body, requestOptions)
-         }
-@@ -50,7 +68,12 @@
-   })
- }
- 
-+<<<<<<< .our
- async function circleCIcall (buildUrl, targetBranch, job, options) {
-+=======
-+async function circleCIcall (buildUrl, targetBranch, job, ghRelease) {
-+  assert(process.env.CIRCLE_TOKEN, 'CIRCLE_TOKEN not found in environment')
-+>>>>>>> .their
-   console.log(`Triggering CircleCI to run build job: ${job} on branch: ${targetBranch} with release flag.`)
-   let buildRequest = {
-     'build_parameters': {
-@@ -58,16 +81,23 @@
-     }
-   }
- 
-+<<<<<<< .our
-   if (options.ghRelease) {
-+=======
-+  if (ghRelease) {
-+>>>>>>> .their
-     buildRequest.build_parameters.ELECTRON_RELEASE = 1
-   } else {
-     buildRequest.build_parameters.RUN_RELEASE_BUILD = 'true'
-   }
- 
-+<<<<<<< .our
-   if (options.automaticRelease) {
-     buildRequest.build_parameters.AUTO_RELEASE = 'true'
-   }
- 
-+=======
-+>>>>>>> .their
-   let circleResponse = await makeRequest({
-     method: 'POST',
-     url: buildUrl,
-@@ -79,6 +109,7 @@
-   }, true).catch(err => {
-     console.log('Error calling CircleCI:', err)
-   })
-+<<<<<<< .our
-   console.log(`CircleCI release build request for ${job} successful.  Check ${circleResponse.build_url} for status.`)
- }
- 
-@@ -97,15 +128,29 @@
-   let environmentVariables = {}
- 
-   if (options.ghRelease) {
-+=======
-+  console.log(`Check ${circleResponse.build_url} for status. (${job})`)
-+}
-+
-+async function buildAppVeyor (targetBranch, ghRelease) {
-+  console.log(`Triggering AppVeyor to run build on branch: ${targetBranch} with release flag.`)
-+  assert(process.env.APPVEYOR_TOKEN, 'APPVEYOR_TOKEN not found in environment')
-+  let environmentVariables = {}
-+
-+  if (ghRelease) {
-+>>>>>>> .their
-     environmentVariables.ELECTRON_RELEASE = 1
-   } else {
-     environmentVariables.RUN_RELEASE_BUILD = 'true'
-   }
- 
-+<<<<<<< .our
-   if (options.automaticRelease) {
-     environmentVariables.AUTO_RELEASE = 'true'
-   }
- 
-+=======
-+>>>>>>> .their
-   const requestOpts = {
-     url: buildAppVeyorURL,
-     auth: {
-@@ -116,7 +161,11 @@
-     },
-     body: JSON.stringify({
-       accountName: 'AppVeyor',
-+<<<<<<< .our
-       projectSlug: appVeyorJobs[job],
-+=======
-+      projectSlug: 'electron',
-+>>>>>>> .their
-       branch: targetBranch,
-       environmentVariables
-     }),
-@@ -125,6 +174,7 @@
-   let appVeyorResponse = await makeRequest(requestOpts, true).catch(err => {
-     console.log('Error calling AppVeyor:', err)
-   })
-+<<<<<<< .our
-   const buildUrl = `https://windows-ci.electronjs.org/project/AppVeyor/${appVeyorJobs[job]}/build/${appVeyorResponse.version}`
-   console.log(`AppVeyor release build request for ${job} successful.  Check build status at ${buildUrl}`)
- }
-@@ -202,10 +252,27 @@
-   console.log(`VSTS release build request for ${build.name} successful. Check ${vstsResponse._links.web.href} for status.`)
- }
- 
-+=======
-+  const buildUrl = `https://windows-ci.electronjs.org/project/AppVeyor/electron/build/${appVeyorResponse.version}`
-+  console.log(`AppVeyor release build request successful.  Check build status at ${buildUrl}`)
-+}
-+
-+function buildCircleCI (targetBranch, ghRelease, job) {
-+  const circleBuildUrl = `https://circleci.com/api/v1.1/project/github/electron/electron/tree/${targetBranch}?circle-token=${process.env.CIRCLE_TOKEN}`
-+  if (job) {
-+    assert(circleCIJobs.includes(job), `Unknown CI job name: ${job}.`)
-+    circleCIcall(circleBuildUrl, targetBranch, job, ghRelease)
-+  } else {
-+    circleCIJobs.forEach((job) => circleCIcall(circleBuildUrl, targetBranch, job, ghRelease))
-+  }
-+}
-+
-+>>>>>>> .their
- function runRelease (targetBranch, options) {
-   if (options.ci) {
-     switch (options.ci) {
-       case 'CircleCI': {
-+<<<<<<< .our
-         buildCircleCI(targetBranch, options)
-         break
-       }
-@@ -226,12 +293,26 @@
-     buildCircleCI(targetBranch, options)
-     buildAppVeyor(targetBranch, options)
-     buildVSTS(targetBranch, options)
-+=======
-+        buildCircleCI(targetBranch, options.ghRelease, options.job)
-+        break
-+      }
-+      case 'AppVeyor': {
-+        buildAppVeyor(targetBranch, options.ghRelease)
-+        break
-+      }
-+    }
-+  } else {
-+    buildCircleCI(targetBranch, options.ghRelease, options.job)
-+    buildAppVeyor(targetBranch, options.ghRelease)
-+>>>>>>> .their
-   }
- }
- 
- module.exports = runRelease
- 
- if (require.main === module) {
-+<<<<<<< .our
-   const args = require('minimist')(process.argv.slice(2), {
-     boolean: ['ghRelease', 'automaticRelease']
-   })
-@@ -239,6 +320,13 @@
-   if (args._.length < 1) {
-     console.log(`Trigger CI to build release builds of electron.
-     Usage: ci-release-build.js [--job=CI_JOB_NAME] [--ci=CircleCI|AppVeyor|VSTS] [--ghRelease] [--automaticRelease] TARGET_BRANCH
-+=======
-+  const args = require('minimist')(process.argv.slice(2))
-+  const targetBranch = args._[0]
-+  if (args._.length < 1) {
-+    console.log(`Trigger CI to build release builds of electron.
-+    Usage: ci-release-build.js [--job=CI_JOB_NAME] [--ci=CircleCI|AppVeyor] [--ghRelease] TARGET_BRANCH
-+>>>>>>> .their
-     `)
-     process.exit(0)
-   }
-changed in both
-  base   100755 96e6ea2e751eea50df6e4d1014c5ce9ce9e726bb script/cibuild
-  our    100755 758dc2c794e642430ab6a0d966e7a41863be947c script/cibuild
-  their  100755 36e9e13fe98bce5d93a28e9711b36ae96d909fd6 script/cibuild
-@@ -57,6 +57,20 @@
-   if os.environ.has_key('TARGET_ARCH'):
-     target_arch = os.environ['TARGET_ARCH']
- 
-+<<<<<<< .our
-+=======
-+  is_travis = (os.getenv('TRAVIS') == 'true')
-+  if is_travis and PLATFORM == 'linux':
-+    print 'Setup travis CI'
-+    execute(['sudo', 'apt-get', 'update'])
-+    deps = LINUX_DEPS
-+    if target_arch == 'arm':
-+      deps += LINUX_DEPS_ARM
-+    else:
-+      deps += LINUX_DEPS_NO_ARM
-+    execute(['sudo', 'apt-get', 'install'] + deps)
-+
-+>>>>>>> .their
-   if PLATFORM == 'linux' and target_arch == 'x64':
-     os.environ['DISPLAY'] = ':99.0'
-     execute(['sh', '-e', '/etc/init.d/xvfb', 'start'])
-added in remote
-  their  100755 a33a208c32e4395a09cec65b121991443af1f373 script/merge-release.js
-@@ -0,0 +1,116 @@
-+#!/usr/bin/env node
-+
-+require('colors')
-+const assert = require('assert')
-+const branchToRelease = process.argv[2]
-+const fail = '\u2717'.red
-+const { GitProcess, GitError } = require('dugite')
-+const pass = '\u2713'.green
-+const path = require('path')
-+const pkg = require('../package.json')
-+
-+assert(process.env.ELECTRON_GITHUB_TOKEN, 'ELECTRON_GITHUB_TOKEN not found in environment')
-+if (!branchToRelease) {
-+  console.log(`Usage: merge-release branch`)
-+  process.exit(1)
-+}
-+const gitDir = path.resolve(__dirname, '..')
-+
-+async function callGit (args, errorMessage, successMessage) {
-+  let gitResult = await GitProcess.exec(args, gitDir)
-+  if (gitResult.exitCode === 0) {
-+    console.log(`${pass} ${successMessage}`)
-+    return true
-+  } else {
-+    console.log(`${fail} ${errorMessage} ${gitResult.stderr}`)
-+    process.exit(1)
-+  }
-+}
-+
-+async function checkoutBranch (branchName) {
-+  console.log(`Checking out ${branchName}.`)
-+  let errorMessage = `Error checking out branch ${branchName}:`
-+  let successMessage = `Successfully checked out branch ${branchName}.`
-+  return callGit(['checkout', branchName], errorMessage, successMessage)
-+}
-+
-+async function commitMerge () {
-+  console.log(`Committing the merge for v${pkg.version}`)
-+  let errorMessage = `Error committing merge:`
-+  let successMessage = `Successfully committed the merge for v${pkg.version}`
-+  let gitArgs = ['commit', '-m', `v${pkg.version}`]
-+  return callGit(gitArgs, errorMessage, successMessage)
-+}
-+
-+async function mergeReleaseIntoBranch (branchName) {
-+  console.log(`Merging release branch into ${branchName}.`)
-+  let mergeArgs = ['merge', 'release-1-7-x', '--squash']
-+  let mergeDetails = await GitProcess.exec(mergeArgs, gitDir)
-+  if (mergeDetails.exitCode === 0) {
-+    return true
-+  } else {
-+    const error = GitProcess.parseError(mergeDetails.stderr)
-+    if (error === GitError.MergeConflicts) {
-+      console.log(`${fail} Could not merge release branch into ${branchName} ` +
-+        `due to merge conflicts.`)
-+      return false
-+    } else {
-+      console.log(`${fail} Could not merge release branch into ${branchName} ` +
-+        `due to an error: ${mergeDetails.stderr}.`)
-+      process.exit(1)
-+    }
-+  }
-+}
-+
-+async function pushBranch (branchName) {
-+  console.log(`Pushing branch ${branchName}.`)
-+  let pushArgs = ['push', 'origin', branchName]
-+  let errorMessage = `Could not push branch ${branchName} due to an error:`
-+  let successMessage = `Successfully pushed branch ${branchName}.`
-+  return callGit(pushArgs, errorMessage, successMessage)
-+}
-+
-+async function pull () {
-+  console.log(`Performing a git pull`)
-+  let errorMessage = `Could not pull due to an error:`
-+  let successMessage = `Successfully performed a git pull`
-+  return callGit(['pull'], errorMessage, successMessage)
-+}
-+
-+async function rebase (targetBranch) {
-+  console.log(`Rebasing release branch from ${targetBranch}`)
-+  let errorMessage = `Could not rebase due to an error:`
-+  let successMessage = `Successfully rebased release branch from ` +
-+    `${targetBranch}`
-+  return callGit(['rebase', targetBranch], errorMessage, successMessage)
-+}
-+
-+async function mergeRelease () {
-+  await checkoutBranch(branchToRelease)
-+  let mergeSuccess = await mergeReleaseIntoBranch(branchToRelease)
-+  if (mergeSuccess) {
-+    console.log(`${pass} Successfully merged release branch into ` +
-+      `${branchToRelease}.`)
-+    await commitMerge()
-+    let pushSuccess = await pushBranch(branchToRelease)
-+    if (pushSuccess) {
-+      console.log(`${pass} Success!!! ${branchToRelease} now has the latest release!`)
-+    }
-+  } else {
-+    console.log(`Trying rebase of ${branchToRelease} into release branch.`)
-+    await pull()
-+    await checkoutBranch('release-1-7-x')
-+    let rebaseResult = await rebase(branchToRelease)
-+    if (rebaseResult) {
-+      let pushResult = pushBranch('HEAD')
-+      if (pushResult) {
-+        console.log(`Rebase of ${branchToRelease} into release branch was ` +
-+          `successful.  Let release builds run and then try this step again.`)
-+      }
-+      // Exit as failure so release doesn't continue
-+      process.exit(1)
-+    }
-+  }
-+}
-+
-+mergeRelease()
-added in both
-  our    100755 72a28b719bf1ff7770692caef86c76746c4d8edf script/prepare-release.js
-  their  100755 3e7baefd0cc37db804c6019b597200c02a281c1e script/prepare-release.js
-@@ -1,5 +1,6 @@
- #!/usr/bin/env node
- 
-+<<<<<<< .our
- if (!process.env.CI) require('dotenv-safe').load()
- require('colors')
- const args = require('minimist')(process.argv.slice(2), {
-@@ -9,20 +10,39 @@
- const { execSync } = require('child_process')
- const fail = '\u2717'.red
- const { GitProcess } = require('dugite')
-+=======
-+require('colors')
-+const args = require('minimist')(process.argv.slice(2))
-+const assert = require('assert')
-+const ciReleaseBuild = require('./ci-release-build')
-+const { execSync } = require('child_process')
-+const fail = '\u2717'.red
-+const { GitProcess, GitError } = require('dugite')
-+>>>>>>> .their
- const GitHub = require('github')
- const pass = '\u2713'.green
- const path = require('path')
- const pkg = require('../package.json')
- const readline = require('readline')
- const versionType = args._[0]
-+<<<<<<< .our
- const targetRepo = versionType === 'nightly' ? 'nightlies' : 'electron'
-+=======
-+>>>>>>> .their
- 
- // TODO (future) automatically determine version based on conventional commits
- // via conventional-recommended-bump
- 
-+<<<<<<< .our
- if (!versionType && !args.notesOnly) {
-   console.log(`Usage: prepare-release versionType [stable | beta | nightly]` +
-      ` (--stable) (--notesOnly) (--automaticRelease) (--branch)`)
-+=======
-+assert(process.env.ELECTRON_GITHUB_TOKEN, 'ELECTRON_GITHUB_TOKEN not found in environment')
-+if (!versionType && !args.notesOnly) {
-+  console.log(`Usage: prepare-release versionType [major | minor | patch | beta]` +
-+     ` (--stable) (--notesOnly)`)
-+>>>>>>> .their
-   process.exit(1)
- }
- 
-@@ -30,12 +50,37 @@
- const gitDir = path.resolve(__dirname, '..')
- github.authenticate({type: 'token', token: process.env.ELECTRON_GITHUB_TOKEN})
- 
-+<<<<<<< .our
- async function getNewVersion (dryRun) {
-   if (!dryRun) {
-     console.log(`Bumping for new "${versionType}" version.`)
-   }
-   let bumpScript = path.join(__dirname, 'bump-version.py')
-   let scriptArgs = [bumpScript, '--bump', versionType]
-+=======
-+async function createReleaseBranch () {
-+  console.log(`Creating release branch.`)
-+  let checkoutDetails = await GitProcess.exec([ 'checkout', '-b', 'release-1-7-x' ], gitDir)
-+  if (checkoutDetails.exitCode === 0) {
-+    console.log(`${pass} Successfully created the release branch.`)
-+  } else {
-+    const error = GitProcess.parseError(checkoutDetails.stderr)
-+    if (error === GitError.BranchAlreadyExists) {
-+      console.log(`${fail} Release branch already exists, aborting prepare ` +
-+        `release process.`)
-+    } else {
-+      console.log(`${fail} Error creating release branch: ` +
-+        `${checkoutDetails.stderr}`)
-+    }
-+    process.exit(1)
-+  }
-+}
-+
-+function getNewVersion (dryRun) {
-+  console.log(`Bumping for new "${versionType}" version.`)
-+  let bumpScript = path.join(__dirname, 'bump-version.py')
-+  let scriptArgs = [bumpScript, `--bump ${versionType}`]
-+>>>>>>> .their
-   if (args.stable) {
-     scriptArgs.push('--stable')
-   }
-@@ -52,7 +97,10 @@
-     return newVersion
-   } catch (err) {
-     console.log(`${fail} Could not bump version, error was:`, err)
-+<<<<<<< .our
-     throw err
-+=======
-+>>>>>>> .their
-   }
- }
- 
-@@ -74,6 +122,7 @@
- }
- 
- async function getReleaseNotes (currentBranch) {
-+<<<<<<< .our
-   if (versionType === 'nightly') {
-     return 'Nightlies do not get release notes, please compare tags for info'
-   }
-@@ -81,6 +130,12 @@
-   let githubOpts = {
-     owner: 'electron',
-     repo: targetRepo,
-+=======
-+  console.log(`Generating release notes for ${currentBranch}.`)
-+  let githubOpts = {
-+    owner: 'electron',
-+    repo: 'electron',
-+>>>>>>> .their
-     base: `v${pkg.version}`,
-     head: currentBranch
-   }
-@@ -142,11 +197,18 @@
- 
- async function createRelease (branchToTarget, isBeta) {
-   let releaseNotes = await getReleaseNotes(branchToTarget)
-+<<<<<<< .our
-   let newVersion = await getNewVersion()
-   await tagRelease(newVersion)
-   const githubOpts = {
-     owner: 'electron',
-     repo: targetRepo
-+=======
-+  let newVersion = getNewVersion()
-+  const githubOpts = {
-+    owner: 'electron',
-+    repo: 'electron'
-+>>>>>>> .their
-   }
-   console.log(`Checking for existing draft release.`)
-   let releases = await github.repos.getReleases(githubOpts)
-@@ -164,6 +226,7 @@
-   githubOpts.draft = true
-   githubOpts.name = `electron ${newVersion}`
-   if (isBeta) {
-+<<<<<<< .our
-     if (newVersion.indexOf('nightly') > 0) {
-       githubOpts.body = `Note: This is a nightly release.  Please file new issues ` +
-         `for any bugs you find in it.\n \n This release is published to npm ` +
-@@ -175,13 +238,23 @@
-         `under the beta tag and can be installed via npm install electron@beta, ` +
-         `or npm i electron@${newVersion.substr(1)}.\n \n ${releaseNotes}`
-     }
-+=======
-+    githubOpts.body = `Note: This is a beta release.  Please file new issues ` +
-+      `for any bugs you find in it.\n \n This release is published to npm ` +
-+      `under the beta tag and can be installed via npm install electron@beta, ` +
-+      `or npm i electron@${newVersion.substr(1)}.\n \n ${releaseNotes}`
-+>>>>>>> .their
-     githubOpts.name = `${githubOpts.name}`
-     githubOpts.prerelease = true
-   } else {
-     githubOpts.body = releaseNotes
-   }
-   githubOpts.tag_name = newVersion
-+<<<<<<< .our
-   githubOpts.target_commitish = newVersion.indexOf('nightly') !== -1 ? 'master' : branchToTarget
-+=======
-+  githubOpts.target_commitish = branchToTarget
-+>>>>>>> .their
-   await github.repos.createRelease(githubOpts)
-     .catch(err => {
-       console.log(`${fail} Error creating new release: `, err)
-@@ -190,6 +263,7 @@
-   console.log(`${pass} Draft release for ${newVersion} has been created.`)
- }
- 
-+<<<<<<< .our
- async function pushRelease (branch) {
-   let pushDetails = await GitProcess.exec(['push', 'origin', `HEAD:${branch}`, '--follow-tags'], gitDir)
-   if (pushDetails.exitCode === 0) {
-@@ -197,11 +271,21 @@
-       `release builds to finish before running "npm run release".`)
-   } else {
-     console.log(`${fail} Error pushing the release: ` +
-+=======
-+async function pushRelease () {
-+  let pushDetails = await GitProcess.exec(['push', 'origin', 'HEAD'], gitDir)
-+  if (pushDetails.exitCode === 0) {
-+    console.log(`${pass} Successfully pushed the release branch.  Wait for ` +
-+      `release builds to finish before running "npm run release".`)
-+  } else {
-+    console.log(`${fail} Error pushing the release branch: ` +
-+>>>>>>> .their
-         `${pushDetails.stderr}`)
-     process.exit(1)
-   }
- }
- 
-+<<<<<<< .our
- async function runReleaseBuilds (branch) {
-   await ciReleaseBuild(branch, {
-     ghRelease: true,
-@@ -229,6 +313,17 @@
-   } else {
-     response = await promptForVersion(newVersion)
-   }
-+=======
-+async function runReleaseBuilds () {
-+  await ciReleaseBuild('release-1-7-x', {
-+    ghRelease: true
-+  })
-+}
-+
-+async function verifyNewVersion () {
-+  let newVersion = await getNewVersion(true)
-+  let response = await promptForVersion(newVersion)
-+>>>>>>> .their
-   if (response.match(/^y/i)) {
-     console.log(`${pass} Starting release of ${newVersion}`)
-   } else {
-@@ -250,6 +345,7 @@
-   })
- }
- 
-+<<<<<<< .our
- // function to determine if there have been commits to master since the last release
- async function changesToRelease () {
-   let lastCommitWasRelease = new RegExp(`^Bump v[0-9.]*(-beta[0-9.]*)?(-nightly[0-9.]*)?$`, 'g')
-@@ -278,6 +374,19 @@
-         process.exit(1)
-       }
-     }
-+=======
-+async function prepareRelease (isBeta, notesOnly) {
-+  let currentBranch = await getCurrentBranch(gitDir)
-+  if (notesOnly) {
-+    let releaseNotes = await getReleaseNotes(currentBranch)
-+    console.log(`Draft release notes are: ${releaseNotes}`)
-+  } else {
-+    await verifyNewVersion()
-+    await createReleaseBranch()
-+    await createRelease(currentBranch, isBeta)
-+    await pushRelease()
-+    await runReleaseBuilds()
-+>>>>>>> .their
-   }
- }
- 
-added in remote
-  their  100755 78b63933009cf47cc50130dabaa8fe6f5f73b30f script/prerelease.js
-@@ -0,0 +1,112 @@
-+#!/usr/bin/env node
-+
-+require('colors')
-+const assert = require('assert')
-+const GitHub = require('github')
-+const heads = require('heads')
-+const pkg = require('../package.json')
-+const pass = '\u2713'.green
-+const fail = '\u2717'.red
-+let failureCount = 0
-+
-+assert(process.env.ELECTRON_GITHUB_TOKEN, 'ELECTRON_GITHUB_TOKEN not found in environment')
-+
-+const github = new GitHub()
-+github.authenticate({type: 'token', token: process.env.ELECTRON_GITHUB_TOKEN})
-+github.repos.getReleases({owner: 'electron', repo: 'electron'})
-+  .then(res => {
-+    const releases = res.data
-+    const drafts = releases
-+      .filter(release => release.draft) // comment out for testing
-+      // .filter(release => release.tag_name === 'v1.7.5') // uncomment for testing
-+
-+    check(drafts.length === 1, 'one draft exists', true)
-+    const draft = drafts[0]
-+
-+    check(draft.tag_name === `v${pkg.version}`, `draft release version matches local package.json (v${pkg.version})`)
-+    check(draft.prerelease, 'draft is a prerelease')
-+    check(draft.body.length > 50 && !draft.body.includes('(placeholder)'), 'draft has release notes')
-+
-+    const requiredAssets = assetsForVersion(draft.tag_name).sort()
-+    const extantAssets = draft.assets.map(asset => asset.name).sort()
-+
-+    requiredAssets.forEach(asset => {
-+      check(extantAssets.includes(asset), asset)
-+    })
-+
-+    const s3Urls = s3UrlsForVersion(draft.tag_name)
-+    heads(s3Urls)
-+      .then(results => {
-+        results.forEach((result, i) => {
-+          check(result === 200, s3Urls[i])
-+        })
-+
-+        process.exit(failureCount > 0 ? 1 : 0)
-+      })
-+      .catch(err => {
-+        console.error('Error making HEAD requests for S3 assets')
-+        console.error(err)
-+        process.exit(1)
-+      })
-+  })
-+
-+function check (condition, statement, exitIfFail = false) {
-+  if (condition) {
-+    console.log(`${pass} ${statement}`)
-+  } else {
-+    failureCount++
-+    console.log(`${fail} ${statement}`)
-+    if (exitIfFail) process.exit(1)
-+  }
-+}
-+
-+function assetsForVersion (version) {
-+  const patterns = [
-+    'electron-{{VERSION}}-darwin-x64-dsym.zip',
-+    'electron-{{VERSION}}-darwin-x64-symbols.zip',
-+    'electron-{{VERSION}}-darwin-x64.zip',
-+    'electron-{{VERSION}}-linux-arm-symbols.zip',
-+    'electron-{{VERSION}}-linux-arm.zip',
-+    'electron-{{VERSION}}-linux-armv7l-symbols.zip',
-+    'electron-{{VERSION}}-linux-armv7l.zip',
-+    'electron-{{VERSION}}-linux-ia32-symbols.zip',
-+    'electron-{{VERSION}}-linux-ia32.zip',
-+    'electron-{{VERSION}}-linux-x64-symbols.zip',
-+    'electron-{{VERSION}}-linux-x64.zip',
-+    'electron-{{VERSION}}-mas-x64-dsym.zip',
-+    'electron-{{VERSION}}-mas-x64-symbols.zip',
-+    'electron-{{VERSION}}-mas-x64.zip',
-+    'electron-{{VERSION}}-win32-ia32-pdb.zip',
-+    'electron-{{VERSION}}-win32-ia32-symbols.zip',
-+    'electron-{{VERSION}}-win32-ia32.zip',
-+    'electron-{{VERSION}}-win32-x64-pdb.zip',
-+    'electron-{{VERSION}}-win32-x64-symbols.zip',
-+    'electron-{{VERSION}}-win32-x64.zip',
-+    'electron-api.json',
-+    'electron.d.ts',
-+    'ffmpeg-{{VERSION}}-darwin-x64.zip',
-+    'ffmpeg-{{VERSION}}-linux-arm.zip',
-+    'ffmpeg-{{VERSION}}-linux-armv7l.zip',
-+    'ffmpeg-{{VERSION}}-linux-ia32.zip',
-+    'ffmpeg-{{VERSION}}-linux-x64.zip',
-+    'ffmpeg-{{VERSION}}-mas-x64.zip',
-+    'ffmpeg-{{VERSION}}-win32-ia32.zip',
-+    'ffmpeg-{{VERSION}}-win32-x64.zip'
-+  ]
-+  return patterns.map(pattern => pattern.replace(/{{VERSION}}/g, version))
-+}
-+
-+function s3UrlsForVersion (version) {
-+  const bucket = 'https://gh-contractor-zcbenz.s3.amazonaws.com/'
-+  const patterns = [
-+    'atom-shell/dist/{{VERSION}}/iojs-{{VERSION}}-headers.tar.gz',
-+    'atom-shell/dist/{{VERSION}}/iojs-{{VERSION}}.tar.gz',
-+    'atom-shell/dist/{{VERSION}}/node-{{VERSION}}.tar.gz',
-+    'atom-shell/dist/{{VERSION}}/node.lib',
-+    'atom-shell/dist/{{VERSION}}/win-x64/iojs.lib',
-+    'atom-shell/dist/{{VERSION}}/win-x86/iojs.lib',
-+    'atom-shell/dist/{{VERSION}}/x64/node.lib',
-+    'atom-shell/dist/index.json'
-+  ]
-+  return patterns.map(pattern => bucket + pattern.replace(/{{VERSION}}/g, version))
-+}
-added in both
-  our    100755 84e00ad4f309201f151c3f8fcbaf9ee536c9b6cb script/release.js
-  their  100755 54379f8ff9ea9fc19a0ba3349c0019f23383b94f script/release.js
-@@ -1,8 +1,14 @@
- #!/usr/bin/env node
- 
-+<<<<<<< .our
- if (!process.env.CI) require('dotenv-safe').load()
- require('colors')
- const args = require('minimist')(process.argv.slice(2))
-+=======
-+require('colors')
-+const args = require('minimist')(process.argv.slice(2))
-+const assert = require('assert')
-+>>>>>>> .their
- const fs = require('fs')
- const { execSync } = require('child_process')
- const GitHub = require('github')
-@@ -16,16 +22,30 @@
- const sumchecker = require('sumchecker')
- const temp = require('temp').track()
- const { URL } = require('url')
-+<<<<<<< .our
- const targetRepo = pkgVersion.indexOf('nightly') > 0 ? 'nightlies' : 'electron'
- let failureCount = 0
- 
-+=======
-+let failureCount = 0
-+
-+assert(process.env.ELECTRON_GITHUB_TOKEN, 'ELECTRON_GITHUB_TOKEN not found in environment')
-+
-+>>>>>>> .their
- const github = new GitHub({
-   followRedirects: false
- })
- github.authenticate({type: 'token', token: process.env.ELECTRON_GITHUB_TOKEN})
-+<<<<<<< .our
- 
- async function getDraftRelease (version, skipValidation) {
-   let releaseInfo = await github.repos.getReleases({owner: 'electron', repo: targetRepo})
-+=======
-+const gitDir = path.resolve(__dirname, '..')
-+
-+async function getDraftRelease (version, skipValidation) {
-+  let releaseInfo = await github.repos.getReleases({owner: 'electron', repo: 'electron'})
-+>>>>>>> .their
-   let drafts
-   let versionToCheck
-   if (version) {
-@@ -49,8 +69,13 @@
-   return draft
- }
- 
-+<<<<<<< .our
- async function validateReleaseAssets (release, validatingRelease) {
-   const requiredAssets = assetsForVersion(release.tag_name, validatingRelease).sort()
-+=======
-+async function validateReleaseAssets (release) {
-+  const requiredAssets = assetsForVersion(release.tag_name).sort()
-+>>>>>>> .their
-   const extantAssets = release.assets.map(asset => asset.name).sort()
-   const downloadUrls = release.assets.map(asset => asset.browser_download_url).sort()
- 
-@@ -60,6 +85,7 @@
-   })
-   check((failureCount === 0), `All required GitHub assets exist for release`, true)
- 
-+<<<<<<< .our
-   if (!validatingRelease || !release.draft) {
-     if (release.draft) {
-       await verifyAssets(release)
-@@ -72,6 +98,18 @@
-     const s3Urls = s3UrlsForVersion(release.tag_name)
-     await verifyShasums(s3Urls, true)
-   }
-+=======
-+  if (release.draft) {
-+    await verifyAssets(release)
-+  } else {
-+    await verifyShasums(downloadUrls)
-+      .catch(err => {
-+        console.log(`${fail} error verifyingShasums`, err)
-+      })
-+  }
-+  const s3Urls = s3UrlsForVersion(release.tag_name)
-+  await verifyShasums(s3Urls, true)
-+>>>>>>> .their
- }
- 
- function check (condition, statement, exitIfFail = false) {
-@@ -84,13 +122,22 @@
-   }
- }
- 
-+<<<<<<< .our
- function assetsForVersion (version, validatingRelease) {
-+=======
-+function assetsForVersion (version) {
-+>>>>>>> .their
-   const patterns = [
-     `electron-${version}-darwin-x64-dsym.zip`,
-     `electron-${version}-darwin-x64-symbols.zip`,
-     `electron-${version}-darwin-x64.zip`,
-+<<<<<<< .our
-     `electron-${version}-linux-arm64-symbols.zip`,
-     `electron-${version}-linux-arm64.zip`,
-+=======
-+    `electron-${version}-linux-arm-symbols.zip`,
-+    `electron-${version}-linux-arm.zip`,
-+>>>>>>> .their
-     `electron-${version}-linux-armv7l-symbols.zip`,
-     `electron-${version}-linux-armv7l.zip`,
-     `electron-${version}-linux-ia32-symbols.zip`,
-@@ -109,17 +156,27 @@
-     `electron-api.json`,
-     `electron.d.ts`,
-     `ffmpeg-${version}-darwin-x64.zip`,
-+<<<<<<< .our
-     `ffmpeg-${version}-linux-arm64.zip`,
-+=======
-+    `ffmpeg-${version}-linux-arm.zip`,
-+>>>>>>> .their
-     `ffmpeg-${version}-linux-armv7l.zip`,
-     `ffmpeg-${version}-linux-ia32.zip`,
-     `ffmpeg-${version}-linux-x64.zip`,
-     `ffmpeg-${version}-mas-x64.zip`,
-     `ffmpeg-${version}-win32-ia32.zip`,
-+<<<<<<< .our
-     `ffmpeg-${version}-win32-x64.zip`
-   ]
-   if (!validatingRelease) {
-     patterns.push('SHASUMS256.txt')
-   }
-+=======
-+    `ffmpeg-${version}-win32-x64.zip`,
-+    `SHASUMS256.txt`
-+  ]
-+>>>>>>> .their
-   return patterns
- }
- 
-@@ -141,6 +198,7 @@
- }
- 
- function checkVersion () {
-+<<<<<<< .our
-   if (args.skipVersionCheck) return
- 
-   console.log(`Verifying that app version matches package version ${pkgVersion}.`)
-@@ -150,6 +208,11 @@
-     scriptArgs.unshift('-R')
-   }
-   let appVersion = runScript(startScript, scriptArgs).trim()
-+=======
-+  console.log(`Verifying that app version matches package version ${pkgVersion}.`)
-+  let startScript = path.join(__dirname, 'start.py')
-+  let appVersion = runScript(startScript, ['--version']).trim()
-+>>>>>>> .their
-   check((pkgVersion.indexOf(appVersion) === 0), `App version ${appVersion} matches ` +
-     `package version ${pkgVersion}.`, true)
- }
-@@ -180,7 +243,11 @@
- function uploadIndexJson () {
-   console.log('Uploading index.json to S3.')
-   let scriptPath = path.join(__dirname, 'upload-index-json.py')
-+<<<<<<< .our
-   runScript(scriptPath, [pkgVersion])
-+=======
-+  runScript(scriptPath, [])
-+>>>>>>> .their
-   console.log(`${pass} Done uploading index.json to S3.`)
- }
- 
-@@ -191,7 +258,11 @@
-     console.log(`${fileName} already exists on GitHub; deleting before creating new file.`)
-     await github.repos.deleteAsset({
-       owner: 'electron',
-+<<<<<<< .our
-       repo: targetRepo,
-+=======
-+      repo: 'electron',
-+>>>>>>> .their
-       id: existingAssets[0].id
-     }).catch(err => {
-       console.log(`${fail} Error deleting ${fileName} on GitHub:`, err)
-@@ -210,7 +281,11 @@
- async function uploadShasumFile (filePath, fileName, release) {
-   let githubOpts = {
-     owner: 'electron',
-+<<<<<<< .our
-     repo: targetRepo,
-+=======
-+    repo: 'electron',
-+>>>>>>> .their
-     id: release.id,
-     filePath,
-     name: fileName
-@@ -245,7 +320,11 @@
- async function publishRelease (release) {
-   let githubOpts = {
-     owner: 'electron',
-+<<<<<<< .our
-     repo: targetRepo,
-+=======
-+    repo: 'electron',
-+>>>>>>> .their
-     id: release.id,
-     tag_name: release.tag_name,
-     draft: false
-@@ -259,6 +338,7 @@
- 
- async function makeRelease (releaseToValidate) {
-   if (releaseToValidate) {
-+<<<<<<< .our
-     if (releaseToValidate === true) {
-       releaseToValidate = pkgVersion
-     } else {
-@@ -267,18 +347,31 @@
-     console.log(`Validating release ${releaseToValidate}`)
-     let release = await getDraftRelease(releaseToValidate)
-     await validateReleaseAssets(release, true)
-+=======
-+    console.log(`Validating release ${args.validateRelease}`)
-+    let release = await getDraftRelease(args.validateRelease)
-+    await validateReleaseAssets(release)
-+>>>>>>> .their
-   } else {
-     checkVersion()
-     let draftRelease = await getDraftRelease()
-     uploadNodeShasums()
-     uploadIndexJson()
-+<<<<<<< .our
- 
-+=======
-+>>>>>>> .their
-     await createReleaseShasums(draftRelease)
-     // Fetch latest version of release before verifying
-     draftRelease = await getDraftRelease(pkgVersion, true)
-     await validateReleaseAssets(draftRelease)
-+<<<<<<< .our
-     await tagLibCC()
-     await publishRelease(draftRelease)
-+=======
-+    await publishRelease(draftRelease)
-+    await cleanupReleaseBranch()
-+>>>>>>> .their
-     console.log(`${pass} SUCCESS!!! Release has been published. Please run ` +
-       `"npm run publish-to-npm" to publish release to npm.`)
-   }
-@@ -300,7 +393,11 @@
-   let downloadDir = await makeTempDir()
-   let githubOpts = {
-     owner: 'electron',
-+<<<<<<< .our
-     repo: targetRepo,
-+=======
-+    repo: 'electron',
-+>>>>>>> .their
-     headers: {
-       Accept: 'application/octet-stream'
-     }
-@@ -446,6 +543,7 @@
-     `shasums defined in ${validationArgs.shaSumFile}.`)
- }
- 
-+<<<<<<< .our
- async function tagLibCC () {
-   const tag = `electron-${pkg.version}`
-   const libccDir = path.join(path.resolve(__dirname, '..'), 'vendor', 'libchromiumcontent')
-@@ -462,6 +560,26 @@
-   } else {
-     console.log(`${fail} Error tagging libchromiumcontent with ${tag}: ` +
-       `${tagDetails.stderr}`)
-+=======
-+async function cleanupReleaseBranch () {
-+  console.log(`Cleaning up release branch.`)
-+  let errorMessage = `Could not delete local release branch.`
-+  let successMessage = `Successfully deleted local release branch.`
-+  await callGit(['branch', '-D', 'release-1-7-x'], errorMessage, successMessage)
-+  errorMessage = `Could not delete remote release branch.`
-+  successMessage = `Successfully deleted remote release branch.`
-+  return callGit(['push', 'origin', ':release'], errorMessage, successMessage)
-+}
-+
-+async function callGit (args, errorMessage, successMessage) {
-+  let gitResult = await GitProcess.exec(args, gitDir)
-+  if (gitResult.exitCode === 0) {
-+    console.log(`${pass} ${successMessage}`)
-+    return true
-+  } else {
-+    console.log(`${fail} ${errorMessage} ${gitResult.stderr}`)
-+    process.exit(1)
-+>>>>>>> .their
-   }
- }
- 
-changed in both
-  base   100755 94cdb4e9ce644b87fbe0d18ea8c7ad5234486250 script/update-external-binaries.py
-  our    100755 0bc9d0f632057f4a17aa811340ba21631433f173 script/update-external-binaries.py
-  their  100755 a207ad3a1a15e5b01eb85ba382267aa2594dbd98 script/update-external-binaries.py
-@@ -8,7 +8,12 @@
- from lib.util import add_exec_bit, download, extract_zip, rm_rf, \
-                      safe_mkdir, tempdir
- 
-+<<<<<<< .our
- VERSION = 'v1.4.0'
-+=======
-+
-+VERSION = 'v1.2.2'
-+>>>>>>> .their
- SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
- FRAMEWORKS_URL = 'http://github.com/electron/electron-frameworks/releases' \
-                  '/download/' + VERSION
-added in both
-  our    100644 2facda2daa1b8a8ccb63a28198a15b7e7ecb0880 script/upload-to-github.js
-  their  100644 7c3f8d9c11ce7b75f307850663efd2e571e8644a script/upload-to-github.js
-@@ -1,16 +1,24 @@
-+<<<<<<< .our
- if (!process.env.CI) require('dotenv-safe').load()
- 
-+=======
-+>>>>>>> .their
- const GitHub = require('github')
- const github = new GitHub()
- github.authenticate({type: 'token', token: process.env.ELECTRON_GITHUB_TOKEN})
- 
-+<<<<<<< .our
- if (process.argv.length < 6) {
-+=======
-+if (process.argv.length < 5) {
-+>>>>>>> .their
-   console.log('Usage: upload-to-github filePath fileName releaseId')
-   process.exit(1)
- }
- let filePath = process.argv[2]
- let fileName = process.argv[3]
- let releaseId = process.argv[4]
-+<<<<<<< .our
- let releaseVersion = process.argv[5]
- 
- const targetRepo = releaseVersion.indexOf('nightly') > 0 ? 'nightlies' : 'electron'
-@@ -18,6 +26,12 @@
- let githubOpts = {
-   owner: 'electron',
-   repo: targetRepo,
-+=======
-+
-+let githubOpts = {
-+  owner: 'electron',
-+  repo: 'electron',
-+>>>>>>> .their
-   id: releaseId,
-   filePath: filePath,
-   name: fileName
-@@ -39,7 +53,11 @@
-           console.log(`${fileName} already exists; will delete before retrying upload.`)
-           github.repos.deleteAsset({
-             owner: 'electron',
-+<<<<<<< .our
-             repo: targetRepo,
-+=======
-+            repo: 'electron',
-+>>>>>>> .their
-             id: existingAssets[0].id
-           }).then(uploadToGitHub).catch(uploadToGitHub)
-         } else {
-changed in both
-  base   100755 455ed789e0a081bc411adb02b75995bede18c25f script/upload.py
-  our    100755 2d9eaa201265971ca01acaea6e84a440e5db0532 script/upload.py
-  their  100755 4da630433812b51ff0ebbdf89f68c71d90ab8046 script/upload.py
-@@ -51,6 +51,7 @@
-     return 1
- 
-   tag_exists = False
-+<<<<<<< .our
-   release = get_release(args.version)
-   if not release['draft']:
-     tag_exists = True
-@@ -84,6 +85,55 @@
-     # Upload the x64 binary for arm/arm64 mksnapshot
-     mksnapshot = get_zip_name('mksnapshot', ELECTRON_VERSION, 'x64')
-     upload_electron(release, os.path.join(DIST_DIR, mksnapshot), args)
-+=======
-+  for r in releases:
-+    if not r['draft'] and r['tag_name'] == args.version:
-+      release = r
-+      tag_exists = True
-+      break
-+
-+  if not args.upload_to_s3:
-+    assert tag_exists == args.overwrite, \
-+          'You have to pass --overwrite to overwrite a published release'
-+    if not args.overwrite:
-+      release = create_or_get_release_draft(github, releases, args.version,
-+                                            tag_exists)
-+
-+  # Upload Electron with GitHub Releases API.
-+  upload_electron(github, release, os.path.join(DIST_DIR, DIST_NAME),
-+                  args.upload_to_s3)
-+  if get_target_arch() != 'mips64el':
-+    upload_electron(github, release, os.path.join(DIST_DIR, SYMBOLS_NAME),
-+                    args.upload_to_s3)
-+  if PLATFORM == 'darwin':
-+    upload_electron(github, release, os.path.join(DIST_DIR,
-+                    'electron-api.json'), args.upload_to_s3)
-+    upload_electron(github, release, os.path.join(DIST_DIR, 'electron.d.ts'),
-+                    args.upload_to_s3)
-+    upload_electron(github, release, os.path.join(DIST_DIR, DSYM_NAME),
-+                    args.upload_to_s3)
-+  elif PLATFORM == 'win32':
-+    upload_electron(github, release, os.path.join(DIST_DIR, PDB_NAME),
-+                    args.upload_to_s3)
-+
-+  # Upload free version of ffmpeg.
-+  ffmpeg = get_zip_name('ffmpeg', ELECTRON_VERSION)
-+  upload_electron(github, release, os.path.join(DIST_DIR, ffmpeg),
-+                  args.upload_to_s3)
-+
-+  # Upload chromedriver and mksnapshot for minor version update.
-+  if parse_version(args.version)[2] == '0':
-+    chromedriver = get_zip_name('chromedriver', ELECTRON_VERSION)
-+    upload_electron(github, release, os.path.join(DIST_DIR, chromedriver),
-+                    args.upload_to_s3)
-+    mksnapshot = get_zip_name('mksnapshot', ELECTRON_VERSION)
-+    upload_electron(github, release, os.path.join(DIST_DIR, mksnapshot),
-+                    args.upload_to_s3)
-+
-+  if PLATFORM == 'win32' and not tag_exists and not args.upload_to_s3:
-+    # Upload PDBs to Windows symbol server.
-+    run_python_script('upload-windows-pdb.py')
-+>>>>>>> .their
- 
-   if not tag_exists and not args.upload_to_s3:
-     # Upload symbols to symbol server.
-@@ -149,7 +199,66 @@
-   return dist_time > int(head_time)
- 
- 
-+<<<<<<< .our
- def upload_electron(release, file_path, args):
-+=======
-+def get_text_with_editor(name):
-+  editor = os.environ.get('EDITOR', 'nano')
-+  initial_message = '\n# Please enter the body of your release note for %s.' \
-+                    % name
-+
-+  t = tempfile.NamedTemporaryFile(suffix='.tmp', delete=False)
-+  t.write(initial_message)
-+  t.close()
-+  subprocess.call([editor, t.name])
-+
-+  text = ''
-+  for line in open(t.name, 'r'):
-+    if len(line) == 0 or line[0] != '#':
-+      text += line
-+
-+  os.unlink(t.name)
-+  return text
-+
-+def create_or_get_release_draft(github, releases, tag, tag_exists):
-+  # Search for existing draft.
-+  for release in releases:
-+    if release['draft'] and release['tag_name'] == tag:
-+      return release
-+
-+  if tag_exists:
-+    tag = 'do-not-publish-me'
-+  return create_release_draft(github, tag)
-+
-+
-+def create_release_draft(github, tag):
-+  name = '{0} {1} beta'.format(PROJECT_NAME, tag)
-+  if os.environ.has_key('CI'):
-+    body = '(placeholder)'
-+  else:
-+    body = get_text_with_editor(name)
-+  if body == '':
-+    sys.stderr.write('Quit due to empty release note.\n')
-+    sys.exit(0)
-+
-+  data = dict(tag_name=tag, name=name, body=body, draft=True, prerelease=True)
-+  r = github.repos(ELECTRON_REPO).releases.post(data=data)
-+  return r
-+
-+
-+def upload_electron(github, release, file_path, upload_to_s3):
-+
-+  # if upload_to_s3 is set, skip github upload.
-+  if upload_to_s3:
-+    bucket, access_key, secret_key = s3_config()
-+    key_prefix = 'electron-artifacts/{0}'.format(release['tag_name'])
-+    s3put(bucket, access_key, secret_key, os.path.dirname(file_path),
-+          key_prefix, [file_path])
-+    upload_sha256_checksum(release['tag_name'], file_path, key_prefix)
-+    return
-+
-+  # Delete the original file before uploading in CI.
-+>>>>>>> .their
-   filename = os.path.basename(file_path)
- 
-   # if upload_to_s3 is set, skip github upload.
-@@ -165,6 +274,7 @@
-     return
- 
-   # Upload the file.
-+<<<<<<< .our
-   upload_io_to_github(release, filename, file_path, args.version)
- 
-   # Upload the checksum file.
-@@ -177,6 +287,27 @@
-   script_path = os.path.join(SOURCE_ROOT, 'script', 'upload-to-github.js')
-   execute(['node', script_path, filepath, filename, str(release['id']),
-           version])
-+=======
-+  upload_io_to_github(release, filename, file_path)
-+
-+  # Upload the checksum file.
-+  upload_sha256_checksum(release['tag_name'], file_path)
-+
-+  # Upload ARM assets without the v7l suffix for backwards compatibility
-+  # TODO Remove for 2.0
-+  if 'armv7l' in filename:
-+    arm_filename = filename.replace('armv7l', 'arm')
-+    arm_file_path = os.path.join(os.path.dirname(file_path), arm_filename)
-+    shutil.copy2(file_path, arm_file_path)
-+    upload_electron(github, release, arm_file_path, upload_to_s3)
-+
-+
-+def upload_io_to_github(release, filename, filepath):
-+  print 'Uploading %s to Github' % \
-+      (filename)
-+  script_path = os.path.join(SOURCE_ROOT, 'script', 'upload-to-github.js')
-+  execute(['node', script_path, filepath, filename, str(release['id'])])
-+>>>>>>> .their
- 
- 
- def upload_sha256_checksum(version, file_path, key_prefix=None):
-changed in both
-  base   100644 1df816807ddb0fb20d91f9a6536381126ff9ebb7 spec/api-app-spec.js
-  our    100644 d224eda2989332c18d655cef05a8bacc2eb6d4b8 spec/api-app-spec.js
-  their  100644 a8c288e771ecb3f1fd8807f7dc9a776769395b03 spec/api-app-spec.js
-@@ -196,6 +196,7 @@
-     })
-   })
- 
-+<<<<<<< .our
-   // TODO(MarshallOfSound) - Remove in 4.0.0
-   describe('app.makeSingleInstance', () => {
-     it('prevents the second launch of app', function (done) {
-@@ -233,11 +234,41 @@
-           expect(code).to.equal(1)
-           done()
-         })
-+=======
-+  describe('app.makeSingleInstance', function () {
-+    it('prevents the second launch of app', function (done) {
-+      this.timeout(120000)
-+      const appPath = path.join(__dirname, 'fixtures', 'api', 'singleton')
-+      // First launch should exit with 0.
-+      let secondLaunched = false
-+      const first = ChildProcess.spawn(remote.process.execPath, [appPath])
-+      let launchOnce = true
-+      first.stdout.on('data', (data) => {
-+        if (data.toString().trim() === 'launched' && launchOnce) {
-+          launchOnce = false
-+          // Second launch should exit with 1.
-+          const second = ChildProcess.spawn(remote.process.execPath, [appPath])
-+          second.once('exit', (code) => {
-+            assert.ok(!secondLaunched)
-+            assert.equal(code, 1)
-+            secondLaunched = true
-+          })
-+        }
-+      })
-+      first.once('exit', (code) => {
-+        assert.ok(secondLaunched)
-+        assert.equal(code, 0)
-+        done()
-+>>>>>>> .their
-       })
-     })
-   })
- 
-+<<<<<<< .our
-   describe('app.relaunch', () => {
-+=======
-+  describe('app.relaunch', function () {
-+>>>>>>> .their
-     let server = null
-     const socketPath = process.platform === 'win32' ? '\\\\.\\pipe\\electron-app-relaunch' : '/tmp/electron-app-relaunch'
- 
-@@ -294,8 +325,16 @@
-     })
-   })
- 
-+<<<<<<< .our
-   xdescribe('app.importCertificate', () => {
-     let w = null
-+=======
-+  xdescribe('app.importCertificate', function () {
-+    if (process.platform !== 'linux') return
-+
-+    this.timeout(120000)
-+    var w = null
-+>>>>>>> .their
- 
-     before(function () {
-       if (process.platform !== 'linux') {
-@@ -535,7 +574,11 @@
-     })
-   })
- 
-+<<<<<<< .our
-   describe('select-client-certificate event', () => {
-+=======
-+  xdescribe('select-client-certificate event', function () {
-+>>>>>>> .their
-     let w = null
- 
-     before(function () {
-@@ -688,6 +731,54 @@
-         this.skip()
-       }
-     })
-+<<<<<<< .our
-+=======
-+
-+    it('does not launch for blacklisted argument', function (done) {
-+      const appPath = path.join(__dirname, 'fixtures', 'api', 'quit-app')
-+      // App should exit with non 123 code.
-+      const first = ChildProcess.spawn(remote.process.execPath, [appPath, 'electron-test://?', '--no-sandbox', '--gpu-launcher=cmd.exe /c start calc'])
-+      first.once('exit', (code) => {
-+        assert.notEqual(code, 123)
-+        done()
-+      })
-+    })
-+
-+    it('launches successfully for multiple uris in cmd args', function (done) {
-+      const appPath = path.join(__dirname, 'fixtures', 'api', 'quit-app')
-+      // App should exit with code 123.
-+      const first = ChildProcess.spawn(remote.process.execPath, [appPath, 'http://electronjs.org', 'electron-test://testdata'])
-+      first.once('exit', (code) => {
-+        assert.equal(code, 123)
-+        done()
-+      })
-+    })
-+
-+    it('does not launch for encoded space', function (done) {
-+      const appPath = path.join(__dirname, 'fixtures', 'api', 'quit-app')
-+      // App should exit with non 123 code.
-+      const first = ChildProcess.spawn(remote.process.execPath, [appPath, 'electron-test://?', '--no-sandbox', '--gpu-launcher%20"cmd.exe /c start calc'])
-+      first.once('exit', (code) => {
-+        assert.notEqual(code, 123)
-+        done()
-+      })
-+    })
-+
-+    it('launches successfully for argnames similar to blacklisted ones', function (done) {
-+      const appPath = path.join(__dirname, 'fixtures', 'api', 'quit-app')
-+      // inspect is blacklisted, but inspector should work, and app launch should succeed
-+      const first = ChildProcess.spawn(remote.process.execPath, [appPath, 'electron-test://?', '--inspector'])
-+      first.once('exit', (code) => {
-+        assert.equal(code, 123)
-+        done()
-+      })
-+    })
-+  })
-+
-+  describe('getFileIcon() API', function () {
-+    // FIXME Get these specs running on Linux CI
-+    if (process.platform === 'linux' && isCI) return
-+>>>>>>> .their
- 
-     it('does not launch for argument following a URL', done => {
-       const appPath = path.join(__dirname, 'fixtures', 'api', 'quit-app')
-changed in both
-  base   100644 52c9b5fb47e3f559785104958b65824d511fa986 spec/api-browser-window-spec.js
-  our    100644 f4cba12ec19d224bc46fca898db42a99baf4972e spec/api-browser-window-spec.js
-  their  100644 f4222145dba6f9e773d7d657cc688ad9efb55afa spec/api-browser-window-spec.js
-changed in both
-  base   100644 2f9f2b2795adbe396b683ed9854c6675a50d6ba4 spec/chromium-spec.js
-  our    100644 d90269769d269e4054d25cba4b6c4ac8a1929aa6 spec/chromium-spec.js
-  their  100644 e18b1a141eac068348eb34d064a357929b243a5f spec/chromium-spec.js
-@@ -319,8 +319,12 @@
-       b = window.open(windowUrl, '', 'nodeIntegration=no,show=no')
-     })
- 
-+<<<<<<< .our
-     // TODO(codebytere): re-enable this test
-     xit('disables node integration when it is disabled on the parent window for chrome devtools URLs', (done) => {
-+=======
-+    it('disables node integration when it is disabled on the parent window for chrome devtools URLs', (done) => {
-+>>>>>>> .their
-       let b
-       app.once('web-contents-created', (event, contents) => {
-         contents.once('did-finish-load', () => {
-added in both
-  our    100644 3202a7a180d6d48c70706d5ef244652872b24bbc spec/fixtures/api/singleton/main.js
-  their  100644 665987c8400f1183d009e3aad3bfab0860529de1 spec/fixtures/api/singleton/main.js
-@@ -1,5 +1,6 @@
- const {app} = require('electron')
- 
-+<<<<<<< .our
- app.once('ready', () => {
-   console.log('started')  // ping parent
- })
-@@ -11,5 +12,18 @@
- })
- 
- if (!gotTheLock) {
-+=======
-+console.log('launched')
-+
-+process.on('uncaughtException', () => {
-+  app.exit(2)
-+})
-+
-+const shouldExit = app.makeSingleInstance(() => {
-+  process.nextTick(() => app.exit(0))
-+})
-+
-+if (shouldExit) {
-+>>>>>>> .their
-   app.exit(1)
- }
-changed in both
-  base   100644 1211b3ea8bb8f45b69c4479ce9c4ce42a2d84373 spec/package.json
-  our    100644 37dec32f876cbe6a0b07b78922140397947a818a spec/package.json
-  their  100644 0bedddc69f0b1c930b90ced3f38726649e82fe49 spec/package.json
-@@ -13,11 +13,19 @@
-     "dirty-chai": "^2.0.1",
-     "graceful-fs": "^4.1.11",
-     "mkdirp": "^0.5.1",
-+<<<<<<< .our
-     "mocha": "^5.2.0",
-     "mocha-junit-reporter": "^1.17.0",
-     "multiparty": "^4.1.4",
-     "q": "^1.5.1",
-     "send": "^0.16.2",
-+=======
-+    "mocha": "^3.1.0",
-+    "mocha-junit-reporter": "^1.14.0",
-+    "multiparty": "^4.1.3",
-+    "q": "^1.4.1",
-+    "send": "^0.14.1",
-+>>>>>>> .their
-     "temp": "^0.8.3",
-     "walkdir": "0.0.12",
-     "winreg": "^1.2.4",
-changed in both
-  base   100644 74a9e6d278e9e96968d8e3b75303456b4a756825 spec/static/index.html
-  our    100644 fc1e153c0af2908cf7ee4c3ea4f05522de04f0f8 spec/static/index.html
-  their  100644 39f523f7d96b322ce39323040426ef517ee3c261 spec/static/index.html
-@@ -44,12 +44,24 @@
-   const { Coverage } = require('electabul')
-   const Mocha = require('mocha')
- 
-+<<<<<<< .our
-   const mocha = new Mocha(process.env.MOCHA_REPORTER
-     ? { reporter: process.env.MOCHA_REPORTER }
-     : undefined)
- 
-   if (!process.env.MOCHA_REPORTER) {
-     mocha.ui('bdd').reporter(isCi ? 'tap' : 'html')
-+=======
-+  var Mocha = require('mocha');
-+  var mochaOpts = {};
-+  if (process.env.MOCHA_REPORTER) {
-+    mochaOpts.reporter = process.env.MOCHA_REPORTER;
-+  }
-+  var mocha = new Mocha(mochaOpts);
-+
-+  if (!process.env.MOCHA_REPORTER) {
-+    mocha.ui('bdd').reporter(isCi ? 'tap' : 'html');
-+>>>>>>> .their
-   }
-   mocha.timeout(isCi ? 30000 : 10000)
- 
-changed in both
-  base   160000 92e2d6a9657444dfbdcb89f986c8705bdda3dccf vendor/libchromiumcontent
-  our    160000 c85470a1c379b1c4bedb372c146521bc4be9b75d vendor/libchromiumcontent
-  their  160000 4a4acde5522c21fe2f0a21f5ca29f99e90b03adc vendor/libchromiumcontent
-changed in both
-  base   160000 dfa72e2c73e0442d27746e0f8716d0427f7f9b27 vendor/node
-  our    160000 ece0a06ac8147efb5b5af431c21f312f1884616e vendor/node
-  their  160000 a992f2ff412b85606ec1d4c1eb00ad832fa1e640 vendor/node
-added in both
-  our    100644 84bd69c2b2868ac23bc30061aa208ad38fbb9506 vsts.yml
-  their  100644 aaee2e6522650cd470f09e43b74b4d0a126c2128 vsts.yml
-@@ -59,7 +59,11 @@
- - bash: |
-     echo 'Verifying ffmpeg on build'
-     if [ "$ELECTRON_RELEASE" == "1" ]; then
-+<<<<<<< .our
-       script/verify-ffmpeg.py -c R
-+=======
-+      script/verify-ffmpeg.py -R
-+>>>>>>> .their
-     else
-       script/verify-ffmpeg.py
-     fi
-@@ -69,6 +73,7 @@
- - task: PublishTestResults@2
-   displayName: Publish Test Results
-   inputs:
-+<<<<<<< .our
-     testResultsFiles: '**/test-*.xml'
-   condition: and(always(), eq(variables['MOCHA_FILE'], 'test-results.xml'))
- 
-@@ -93,5 +98,18 @@
-   inputs:
-     PathtoPublish: '$(Build.SourcesDirectory)/out'
-     ArtifactName: out
-+=======
-+    testResultsFiles: 'test-results.xml'
-+    searchFolder: junit
-+  condition: and(always(), ne(variables['ELECTRON_RELEASE'], '1'))
-+
-+- task: kasunkodagoda.slack-notification.slack-notification-task.SlackNotification@3
-+  displayName: Post Slack Notification
-+  inputs:
-+    SlackApiToken: '$(slack_token)'
-+    Channel: '#bot-nightly-releases'
-+    Message: '$(Build.DefinitionName)-$(Build.BuildNumber) finished with a $(Agent.JobStatus) status.'
-+  condition: and(always(), eq(variables['Build.Reason'], 'Schedule'))
-+>>>>>>> .their
- 
- - task: mspremier.PostBuildCleanup.PostBuildCleanup-task.PostBuildCleanup@3
diff --git a/app/test/fixtures/merge-parser/electron/merge-1-8-x-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-1-8-x-into-master.txt
deleted file mode 100644
index df79003098f..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-1-8-x-into-master.txt
+++ /dev/null
@@ -1,11139 +0,0 @@
-changed in both
-  base   100644 e3a808718b918ad0b158ee4e8d0fdbb811fbf191 .circleci/config.yml
-  our    100644 6d44d618aabcce04c60344f2274dec5b0c2a1f68 .circleci/config.yml
-  their  100644 0563a8274cd113b56243a76f5057013bfafb7118 .circleci/config.yml
-@@ -352,6 +352,7 @@
- version: 2
- jobs:
-   electron-linux-arm:
-+<<<<<<< .our
-     environment:
-       TARGET_ARCH: arm
-     <<: *build-defaults
-@@ -359,6 +360,13 @@
- 
-   electron-linux-arm-test:
-     machine: true
-+=======
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: arm
-+    resource_class: 2xlarge
-+>>>>>>> .their
-     steps:
-       - attach_workspace:
-           at: /tmp/workspace/project/out
-@@ -391,6 +399,7 @@
-     resource_class: 2xlarge
- 
-   electron-linux-arm64:
-+<<<<<<< .our
-     environment:
-       TARGET_ARCH: arm64
-     <<: *build-defaults
-@@ -398,6 +407,13 @@
- 
-   electron-linux-arm64-test:
-     machine: true
-+=======
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: arm64
-+    resource_class: 2xlarge
-+>>>>>>> .their
-     steps:
-       - attach_workspace:
-           at: /tmp/workspace/project/out
-@@ -430,12 +446,19 @@
-     resource_class: 2xlarge
- 
-   electron-linux-ia32:
-+<<<<<<< .our
-     environment:
-       TARGET_ARCH: ia32
-       DISPLAY: ':99.0'
-       RUN_TESTS: true
-       RUN_HEADLESS_TESTS: true
-     <<: *build-defaults
-+=======
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: ia32
-+>>>>>>> .their
-     resource_class: xlarge
- 
-   electron-linux-ia32-release-nightly:
-@@ -447,12 +470,20 @@
-     resource_class: xlarge
- 
-   electron-linux-mips64el:
-+<<<<<<< .our
-     environment:
-       TARGET_ARCH: mips64el
-     <<: *build-defaults
-+=======
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: mips64el
-+>>>>>>> .their
-     resource_class: xlarge
- 
-   electron-linux-x64:
-+<<<<<<< .our
-     environment:
-       TARGET_ARCH: x64
-       DISPLAY: ':99.0'
-@@ -469,10 +500,107 @@
-       NIGHTLY_BUILD: true
-     <<: *build-defaults
-     resource_class: xlarge
-+=======
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: x64
-+          DISPLAY: ':99.0'
-+    resource_class: 2xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Setup for headless testing
-+          command: sh -e /etc/init.d/xvfb start
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         no_output_timeout: 30m
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                mkdir junit
-+                script/test.py --ci --rebuild_native_modules
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+      - run:
-+          name: Generate Typescript Definitions
-+          command: npm run create-typescript-definitions
-+      - store_test_results:
-+          path: junit
-+      - store_artifacts:
-+          path: junit
-+      - store_artifacts:
-+          path: out/electron.d.ts
-+      - store_artifacts:
-+          path: out/electron-api.json
-+>>>>>>> .their
- 
-   electron-osx-x64:
-     environment:
-       TARGET_ARCH: x64
-+<<<<<<< .our
-       RUN_TESTS: true
-       INSTALL_MACOS_NODE: true
-     macos:
-@@ -488,11 +616,109 @@
-     macos:
-       xcode: "8.3.3"
-     <<: *build-steps
-+=======
-+    macos:
-+      xcode: "9.0"
-+    resource_class: 2xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Reclaim disk space
-+          command: |
-+            df -h
-+            sudo rm -rf /Library/Developer/CoreSimulator
-+            df -h
-+            sysctl -n hw.ncpu
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         no_output_timeout: 30m
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                mkdir junit
-+                script/test.py --ci --rebuild_native_modules
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+      - run:
-+          name: Generate Typescript Definitions
-+          command: npm run create-typescript-definitions
-+      - store_test_results:
-+          path: junit
-+      - store_artifacts:
-+          path: junit
-+      - store_artifacts:
-+          path: out/electron.d.ts
-+      - store_artifacts:
-+          path: out/electron-api.json
-+>>>>>>> .their
- 
-   electron-mas-x64:
-     environment:
-       TARGET_ARCH: x64
-       MAS_BUILD: 1
-+<<<<<<< .our
-       RUN_TESTS: true
-       INSTALL_MACOS_NODE: true
-     macos:
-@@ -668,6 +894,103 @@
-       GN_EXTRA_ARGS: 'is_mas_build = true'
-     <<: *gn-mac-build-machine
-     <<: *gn-mac-build-steps
-+=======
-+    macos:
-+      xcode: "9.0"
-+    resource_class: 2xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Reclaim disk space
-+          command: |
-+            df -h
-+            sudo rm -rf /Library/Developer/CoreSimulator
-+            df -h
-+            sysctl -n hw.ncpu
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         no_output_timeout: 30m
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                mkdir junit
-+                script/test.py --ci --rebuild_native_modules
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+      - run:
-+          name: Generate Typescript Definitions
-+          command: npm run create-typescript-definitions
-+      - store_test_results:
-+          path: junit
-+      - store_artifacts:
-+          path: junit
-+      - store_artifacts:
-+          path: out/electron.d.ts
-+      - store_artifacts:
-+          path: out/electron-api.json
-+>>>>>>> .their
- 
- workflows:
-   version: 2
-@@ -689,12 +1012,19 @@
-   build-x64:
-     jobs:
-       - electron-linux-x64
-+<<<<<<< .our
-+=======
-+  build-mips64el:
-+    jobs:
-+      - electron-linux-mips64el
-+>>>>>>> .their
-   build-osx-x64:
-     jobs:
-       - electron-osx-x64
-   build-mas-x64:
-     jobs:
-       - electron-mas-x64
-+<<<<<<< .our
-   build-gn-linux:
-     jobs:
-       - electron-gn-linux-x64-debug-fyi
-@@ -745,3 +1075,5 @@
-       - electron-gn-linux-arm64-release-fyi
-       - electron-gn-mas-release-fyi
-       - electron-gn-osx-release-fyi
-+=======
-+>>>>>>> .their
-changed in both
-  base   100644 eb045368b7a5ce226368c7c2955db1fe1ac676e5 .gitignore
-  our    100644 f393b1cdcef87b41bb3ed47ebae59757fed3a780 .gitignore
-  their  100644 97d35686044a0257a78fc58ed5fa2f096a6aec66 .gitignore
-@@ -27,6 +27,7 @@
- /external_binaries/
- /out/
- /vendor/.gclient
-+<<<<<<< .our
- /vendor/debian_jessie_mips64-sysroot/
- /vendor/debian_stretch_amd64-sysroot/
- /vendor/debian_stretch_arm-sysroot/
-@@ -34,6 +35,17 @@
- /vendor/debian_stretch_i386-sysroot/
- /vendor/gcc-4.8.3-d197-n64-loongson/
- /vendor/readme-gcc483-loongson.txt
-+=======
-+/vendor/cross-gcc-4.9.3-n64-loongson-rc5.4
-+/vendor/debian_jessie_amd64-sysroot/
-+/vendor/debian_jessie_arm-sysroot/
-+/vendor/debian_jessie_arm64-sysroot/
-+/vendor/debian_jessie_i386-sysroot/
-+/vendor/debian_jessie_mips64-sysroot/
-+/vendor/debian_wheezy_amd64-sysroot/
-+/vendor/debian_wheezy_arm-sysroot/
-+/vendor/debian_wheezy_i386-sysroot/
-+>>>>>>> .their
- /vendor/download/
- /vendor/llvm-build/
- /vendor/llvm/
-changed in both
-  base   100644 bff9a648f5bd1180cc5b1c9a2bc6fc080c09b616 CONTRIBUTING.md
-  our    100644 414f83db905db904728facf3b40e70e7b7973193 CONTRIBUTING.md
-  their  100644 fffa69e5aad572e7922eb83858572198cee0e453 CONTRIBUTING.md
-changed in both
-  base   100644 58da91e125094253096e1317eb10b2fc33901860 Dockerfile
-  our    100644 74e5eeedea9bea87cd7a98ac2cb63f4376275a2a Dockerfile
-  their  100644 526603ec9bac3e465ee378d22a49fa0abe72cee4 Dockerfile
-@@ -7,8 +7,13 @@
- RUN chmod a+rwx /home
- 
- # Install node.js
-+<<<<<<< .our
- RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
- RUN apt-get install -y nodejs
-+=======
-+RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
-+RUN apt-get update && apt-get install -y --force-yes nodejs
-+>>>>>>> .their
- 
- # Install wget used by crash reporter
- RUN apt-get install -y wget
-added in both
-  our    100644 a95dcfb73ddc8dcb4db9c8a82655e49580135dd9 Dockerfile.arm64v8
-  their  100644 6272c9d16cf63ecbda6dae80592939a100233302 Dockerfile.arm64v8
-@@ -42,6 +42,10 @@
-  python-setuptools \
-  python-pip \
-  python-dbusmock \
-+<<<<<<< .our
-+=======
-+ unzip \
-+>>>>>>> .their
-  wget \
-  xvfb
- 
-changed in both
-  base   100644 3c3a610ecab99f40e7db8441414a3089fabef045 Dockerfile.circleci
-  our    100644 d369c8c640161fc3ba65935297aec7dd27eb1e9f Dockerfile.circleci
-  their  100644 a186769291fa9010ffa4456ec08ab84f57aee9f8 Dockerfile.circleci
-@@ -3,8 +3,13 @@
- USER root
- 
- # Install node.js
-+<<<<<<< .our
- RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
- RUN apt-get install -y nodejs
-+=======
-+RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
-+RUN apt-get update && apt-get install -y --force-yes nodejs
-+>>>>>>> .their
- 
- # Install wget used by crash reporter
- RUN apt-get install -y wget
-added in remote
-  their  100644 1567ad810092ec3eb4efae628c38403a775e4d65 Jenkinsfile.arm64
-@@ -0,0 +1,36 @@
-+pipeline {
-+  agent {
-+    docker {
-+      image 'electronbuilds/arm64v8:0.0.3'
-+      args '--privileged'
-+    }
-+  }
-+  environment {
-+    TARGET_ARCH='arm64'
-+    DISPLAY=':99.0'
-+    MOCHA_TIMEOUT='60000'
-+  }
-+  stages {
-+    stage('Bootstrap') {
-+      steps {
-+        sh 'script/bootstrap.py -v --dev --target_arch=$TARGET_ARCH'
-+      }
-+    }
-+    stage('Build') {
-+      steps {
-+        sh 'script/build.py -c D --ninja-path /usr/local/ninja/ninja'
-+      }
-+    }
-+    stage('Test') {
-+      steps {
-+        sh '/etc/init.d/xvfb start'
-+        sh 'script/test.py --ci'
-+      }
-+    }
-+  }
-+  post {
-+    always {
-+      cleanWs()
-+    }
-+  }
-+}
-changed in both
-  base   100644 d9ad098a6aca95172956ff4ed66b9542346e0771 README.md
-  our    100644 ec09364417b767ac59b2d970fee5e2ab2db2173b README.md
-  their  100644 1ea1ec27294ad3d8e85092b13dbd9cacfcdf38d0 README.md
-changed in both
-  base   100644 ff2f1018423a244508c90ad7554ca278d2b2a66a SECURITY.md
-  our    100644 c113ff00e06f0fd2d5025b7fd87fa8d6bc9fcf74 SECURITY.md
-  their  100644 a0d18da90d90d51745e3f9405991f9d8d067058e SECURITY.md
-changed in both
-  base   100644 ce0baaf989bdbd6897fa333d3af88d1d573a2bd2 appveyor.yml
-  our    100644 67a2b2124619d866f67d849f57f3548ba28be26a appveyor.yml
-  their  100644 5ee73c661b1079e9bf252868b31814d3aa4c2760 appveyor.yml
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- version: 1.0.{build}
- branches:
-   except:
-@@ -6,6 +7,10 @@
- image: electron-16-vs2017-15.4.5
- environment:
-   DISABLE_CRASH_REPORTER_TESTS: true
-+=======
-+build_cloud: electron-16
-+image: electron-16-vs2015
-+>>>>>>> .their
- build_script:
- - ps: >-
-     if(($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME -split "/")[0] -eq ($env:APPVEYOR_REPO_NAME -split "/")[0]) {
-@@ -61,6 +66,7 @@
- - path: test-results.xml
-   name: test-results.xml
- deploy_script:
-+<<<<<<< .our
- - ps: >-
-     if (Test-Path Env:\ELECTRON_RELEASE) {
-       if (Test-Path Env:\RUN_RELEASE_BUILD) {
-@@ -71,3 +77,6 @@
-         & python script\upload.py
-       }
-     }
-+=======
-+- ps: "if (Test-Path Env:\\ELECTRON_RELEASE) {\n  if (Test-Path Env:\\RUN_RELEASE_BUILD) {\n    Write-Output \"Uploading Electron release distribution to s3\"\n    & python script\\upload.py --upload_to_s3\n  } else {\n    Write-Output \"Uploading Electron release distribution to github releases\"\n    & python script\\upload.py\n  }\n} else {\n  Write-Output \"Skipping upload distribution because build is not for release\"\n}"
-+>>>>>>> .their
-changed in both
-  base   100644 e1603fa5942f7b000c3385648530255032e775a2 atom/app/atom_library_main.h
-  our    100644 2c7a27caa20a411558010c3c58bd78e7850c0737 atom/app/atom_library_main.h
-  their  100644 63d285bb5e4838578d23505d7738c9ac88575df1 atom/app/atom_library_main.h
-@@ -9,7 +9,12 @@
- 
- #if defined(OS_MACOSX)
- extern "C" {
-+<<<<<<< .our
- __attribute__((visibility("default"))) int AtomMain(int argc, char* argv[]);
-+=======
-+__attribute__((visibility("default")))
-+int AtomMain(int argc, char* argv[]);
-+>>>>>>> .their
- 
- #ifdef ENABLE_RUN_AS_NODE
- __attribute__((visibility("default"))) int AtomInitializeICUandStartNode(
-changed in both
-  base   100644 7ee7522934689937f7be7b0f866134bf611c7d69 atom/app/atom_library_main.mm
-  our    100644 57a519fcd0db28548ea75034cf92191161183385 atom/app/atom_library_main.mm
-  their  100644 ae096acd4a931d397e285643d36580625dde14bf atom/app/atom_library_main.mm
-@@ -14,6 +14,10 @@
- #include "brightray/common/mac/main_application_bundle.h"
- #include "content/public/app/content_main.h"
- 
-+<<<<<<< .our
-+=======
-+#if defined(OS_MACOSX)
-+>>>>>>> .their
- int AtomMain(int argc, char* argv[]) {
-   atom::AtomMainDelegate delegate;
-   content::ContentMainParams params(&delegate);
-changed in both
-  base   100644 fa854ca1637a677332f4b01fdede12b23b945720 atom/app/atom_main.cc
-  our    100644 fc77100d9acb58221c35f364c4db7866a44d347d atom/app/atom_main.cc
-  their  100644 5fd93a88d60c926ebd50c4b453693b5ce066c20d atom/app/atom_main.cc
-@@ -93,11 +93,15 @@
-   }
- #endif
- 
-+<<<<<<< .our
- #ifdef ENABLE_RUN_AS_NODE
-   bool run_as_node = IsEnvSet(kRunAsNode);
- #else
-   bool run_as_node = false;
- #endif
-+=======
-+  bool run_as_node = IsEnvSet(kRunAsNode);
-+>>>>>>> .their
- 
-   // Make sure the output is printed to console.
-   if (run_as_node || !IsEnvSet("ELECTRON_NO_ATTACH_CONSOLE"))
-@@ -132,10 +136,14 @@
-     auto ret = atom::NodeMain(argv.size(), argv.data());
-     std::for_each(argv.begin(), argv.end(), free);
-     return ret;
-+<<<<<<< .our
-   }
- #endif
- 
-   if (IsEnvSet("ELECTRON_INTERNAL_CRASH_SERVICE")) {
-+=======
-+  } else if (IsEnvSet("ELECTRON_INTERNAL_CRASH_SERVICE")) {
-+>>>>>>> .their
-     return crash_service::Main(cmd);
-   }
- 
-@@ -156,7 +164,10 @@
- #elif defined(OS_LINUX)  // defined(OS_WIN)
- 
- int main(int argc, char* argv[]) {
-+<<<<<<< .our
- #ifdef ENABLE_RUN_AS_NODE
-+=======
-+>>>>>>> .their
-   if (IsEnvSet(kRunAsNode)) {
-     base::i18n::InitializeICU();
-     base::AtExitManager atexit_manager;
-@@ -175,7 +186,10 @@
- #else  // defined(OS_LINUX)
- 
- int main(int argc, char* argv[]) {
-+<<<<<<< .our
- #ifdef ENABLE_RUN_AS_NODE
-+=======
-+>>>>>>> .their
-   if (IsEnvSet(kRunAsNode)) {
-     return AtomInitializeICUandStartNode(argc, argv);
-   }
-added in both
-  our    100644 23e870cf4a32aecfc246a81edad46971b4456a55 atom/app/command_line_args.cc
-  their  100644 82edd15b4ac52e5b14effdd8ff7e112f4331293b atom/app/command_line_args.cc
-@@ -2,15 +2,30 @@
- // Use of this source code is governed by the MIT license that can be
- // found in the LICENSE file.
- 
-+<<<<<<< .our
- #include "atom/app/command_line_args.h"
- 
-+=======
-+#include <string>
-+
-+#include "atom/app/command_line_args.h"
-+
-+#include "base/strings/string_util.h"
-+#include "base/strings/utf_string_conversions.h"
-+#include "content/public/common/content_switches.h"
-+
-+>>>>>>> .their
- namespace {
- 
- bool IsUrlArg(const base::CommandLine::CharType* arg) {
-   // the first character must be a letter for this to be a URL
-   auto c = *arg;
-   if (('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z')) {
-+<<<<<<< .our
-     for (auto* p = arg + 1; *p; ++p) {
-+=======
-+    for (auto p = arg + 1; *p; ++p) {
-+>>>>>>> .their
-       c = *p;
- 
-       // colon indicates that the argument starts with a URI scheme
-@@ -31,12 +46,1345 @@
-   return false;
- }
- 
-+<<<<<<< .our
-+=======
-+const char* blacklist[] = {
-+  // node
-+  "inspect",
-+  "inspect-brk",
-+
-+  // chromium switches:
-+  // find ./ \( -name "*switches.cc" -o -name "*switch_list.h" \) \
-+  //  | xargs grep -P --no-filename '"\S+"[);]$' \
-+  //  | perl -pe 's|^.*?"(\S+)"[);]$|  "$1",|'; \
-+  //  | LANG="C" sort | uniq
-+  "/prefetch:1",
-+  "/prefetch:2",
-+  "/prefetch:3",
-+  "/prefetch:4",
-+  "/prefetch:5",
-+  "/prefetch:6",
-+  "/prefetch:8",
-+  "0",
-+  "?",
-+  "BlacklistOnly",
-+  "ChromeOSMemoryPressureHandling",
-+  "Disabled",
-+  "OnlineCheckOnly",
-+  "SafeSites",
-+  "accept-resource-provider",
-+  "adaboost",
-+  "aec-refined-adaptive-filter",
-+  "agc-startup-min-volume",
-+  "aggressive",
-+  "aggressive-cache-discard",
-+  "aggressive-tab-discard",
-+  "all-toolchains",
-+  "allow-cross-origin-auth-prompt",
-+  "allow-external-pages",
-+  "allow-failed-policy-fetch-for-test",
-+  "allow-file-access-from-files",
-+  "allow-hidden-media-playback",
-+  "allow-http-background-page",
-+  "allow-http-screen-capture",
-+  "allow-insecure-localhost",
-+  "allow-legacy-extension-manifests",
-+  "allow-loopback-in-peer-connection",
-+  "allow-nacl-crxfs-api",
-+  "allow-nacl-file-handle-api",
-+  "allow-nacl-socket-api",
-+  "allow-no-sandbox-job",
-+  "allow-outdated-plugins",
-+  "allow-ra-in-dev-mode",
-+  "allow-running-insecure-content",
-+  "allow-sandbox-debugging",
-+  "allow-silent-push",
-+  "alsa-check-close-timeout",
-+  "alsa-enable-upsampling",
-+  "alsa-fixed-output-sample-rate",
-+  "alsa-input-device",
-+  "alsa-mute-device-name",
-+  "alsa-mute-element-name",
-+  "alsa-output-avail-min",
-+  "alsa-output-buffer-size",
-+  "alsa-output-device",
-+  "alsa-output-period-size",
-+  "alsa-output-start-threshold",
-+  "alsa-volume-device-name",
-+  "alsa-volume-element-name",
-+  "also-emit-success-logs",
-+  "always-authorize-plugins",
-+  "always-on",
-+  "always-use-complex-text",
-+  "alwaystrue",
-+  "android-fonts-path",
-+  "android-stderr-port",
-+  "android-stdin-port",
-+  "android-stdout-port",
-+  "angle",
-+  "app",
-+  "app-auto-launched",
-+  "app-id",
-+  "app-mode-auth-code",
-+  "app-mode-oauth-token",
-+  "app-mode-oem-manifest",
-+  "app-shell-allow-roaming",
-+  "app-shell-host-window-size",
-+  "app-shell-preferred-network",
-+  "app-shell-refresh-token",
-+  "app-shell-user",
-+  "apple",
-+  "apps-gallery-download-url",
-+  "apps-gallery-update-url",
-+  "apps-gallery-url",
-+  "apps-keep-chrome-alive-in-tests",
-+  "arc-always-start",
-+  "arc-availability",
-+  "arc-available",
-+  "args",
-+  "artifacts-dir",
-+  "ash-adjustable-large-cursor",
-+  "ash-animate-from-boot-splash-screen",
-+  "ash-constrain-pointer-to-root",
-+  "ash-copy-host-background-at-boot",
-+  "ash-debug-shortcuts",
-+  "ash-dev-shortcuts",
-+  "ash-disable-maximize-mode-window-backdrop",
-+  "ash-disable-screen-orientation-lock",
-+  "ash-disable-touch-exploration-mode",
-+  "ash-enable-magnifier-key-scroller",
-+  "ash-enable-mirrored-screen",
-+  "ash-enable-palette-on-all-displays",
-+  "ash-enable-smooth-screen-rotation",
-+  "ash-enable-software-mirroring",
-+  "ash-enable-unified-desktop",
-+  "ash-estimated-presentation-delay",
-+  "ash-force-enable-palette",
-+  "ash-hide-notifications-for-factory",
-+  "ash-host-window-bounds",
-+  "ash-shelf-color",
-+  "ash-shelf-color-scheme",
-+  "ash-touch-hud",
-+  "ash-webui-init",
-+  "attestation-server",
-+  "audio-buffer-size",
-+  "aura-legacy-power-button",
-+  "auth-ext-path",
-+  "auth-server-whitelist",
-+  "auth-spnego-account-type",
-+  "auto",
-+  "auto-open-devtools-for-tabs",
-+  "auto-select-desktop-capture-source",
-+  "blink-settings",
-+  "bootstrap",
-+  "browser-subprocess-path",
-+  "browser-test",
-+  "bwsi",
-+  "bypass-app-banner-engagement-checks",
-+  "canvas-msaa-sample-count",
-+  "cast-initial-screen-height",
-+  "cast-initial-screen-width",
-+  "cc-layer-tree-test-long-timeout",
-+  "cc-layer-tree-test-no-timeout",
-+  "cc-rebaseline-pixeltests",
-+  "cellular-first",
-+  "cellular-only",
-+  "check-for-update-interval",
-+  "check-layout-test-sys-deps",
-+  "child-process",
-+  "child-wallpaper-large",
-+  "child-wallpaper-small",
-+  "cipher-suite-blacklist",
-+  "clamshell",
-+  "class",
-+  "clear-token-service",
-+  "cloud-print-file",
-+  "cloud-print-file-type",
-+  "cloud-print-job-title",
-+  "cloud-print-print-ticket",
-+  "cloud-print-setup-proxy",
-+  "cloud-print-url",
-+  "cloud-print-xmpp-endpoint",
-+  "color",
-+  "compensate-for-unstable-pinch-zoom",
-+  "compile-shader-always-succeeds",
-+  "component-updater",
-+  "connectivity-check-url",
-+  "conservative",
-+  "content-image-texture-target",
-+  "content-shell-host-window-size",
-+  "controller",
-+  "crash-dumps-dir",
-+  "crash-on-failure",
-+  "crash-on-hang-threads",
-+  "crash-server-url",
-+  "crash-test",
-+  "crashpad-handler",
-+  "create-browser-on-startup-for-tests",
-+  "create-default-gl-context",
-+  "cros-region",
-+  "cros-regions-mode",
-+  "crosh-command",
-+  "cryptauth-http-host",
-+  "custom-devtools-frontend",
-+  "custom-launcher-page",
-+  "custom_summary",
-+  "d3d11",
-+  "d3d9",
-+  "daemon",
-+  "dark_muted",
-+  "dark_vibrant",
-+  "data-path",
-+  "data-reduction-proxy-config-url",
-+  "data-reduction-proxy-experiment",
-+  "data-reduction-proxy-http-proxies",
-+  "data-reduction-proxy-lo-fi",
-+  "data-reduction-proxy-pingback-url",
-+  "data-reduction-proxy-secure-proxy-check-url",
-+  "data-reduction-proxy-server-experiments-disabled",
-+  "data-reduction-proxy-warmup-url",
-+  "dbus-stub",
-+  "debug-devtools",
-+  "debug-enable-frame-toggle",
-+  "debug-packed-apps",
-+  "debug-print",
-+  "default",
-+  "default-background-color",
-+  "default-tile-height",
-+  "default-tile-width",
-+  "default-wallpaper-is-oem",
-+  "default-wallpaper-large",
-+  "default-wallpaper-small",
-+  "demo",
-+  "derelict-detection-timeout",
-+  "derelict-idle-timeout",
-+  "desktop",
-+  "desktop-window-1080p",
-+  "deterministic-fetch",
-+  "device-management-url",
-+  "device-scale-factor",
-+  "devtools-flags",
-+  "diagnostics",
-+  "diagnostics-format",
-+  "diagnostics-recovery",
-+  "disable",
-+  "disable-2d-canvas-clip-aa",
-+  "disable-2d-canvas-image-chromium",
-+  "disable-3d-apis",
-+  "disable-accelerated-2d-canvas",
-+  "disable-accelerated-jpeg-decoding",
-+  "disable-accelerated-mjpeg-decode",
-+  "disable-accelerated-video-decode",
-+  "disable-add-to-shelf",
-+  "disable-app-info-dialog-mac",
-+  "disable-app-list-dismiss-on-blur",
-+  "disable-app-window-cycling",
-+  "disable-appcontainer",
-+  "disable-arc-data-wipe",
-+  "disable-arc-opt-in-verification",
-+  "disable-audio-support-for-desktop-share",
-+  "disable-autofill-keyboard-accessory-view",
-+  "disable-avfoundation-overlays",
-+  "disable-background-networking",
-+  "disable-background-timer-throttling",
-+  "disable-backgrounding-occluded-windows",
-+  "disable-backing-store-limit",
-+  "disable-blink-features",
-+  "disable-boot-animation",
-+  "disable-breakpad",
-+  "disable-browser-task-scheduler",
-+  "disable-bundled-ppapi-flash",
-+  "disable-canvas-aa",
-+  "disable-captive-portal-bypass-proxy",
-+  "disable-cast-streaming-hw-encoding",
-+  "disable-clear-browsing-data-counters",
-+  "disable-client-side-phishing-detection",
-+  "disable-cloud-import",
-+  "disable-component-cloud-policy",
-+  "disable-component-extensions-with-background-pages",
-+  "disable-component-update",
-+  "disable-composited-antialiasing",
-+  "disable-contextual-search",
-+  "disable-d3d11",
-+  "disable-databases",
-+  "disable-datasaver-prompt",
-+  "disable-default-apps",
-+  "disable-demo-mode",
-+  "disable-device-disabling",
-+  "disable-device-discovery-notifications",
-+  "disable-dinosaur-easter-egg",
-+  "disable-direct-composition",
-+  "disable-direct-composition-layers",
-+  "disable-directwrite-for-ui",
-+  "disable-display-color-calibration",
-+  "disable-display-list-2d-canvas",
-+  "disable-distance-field-text",
-+  "disable-domain-blocking-for-3d-apis",
-+  "disable-domain-reliability",
-+  "disable-download-image-renaming",
-+  "disable-drive-search-in-app-launcher",
-+  "disable-dwm-composition",
-+  "disable-encryption-migration",
-+  "disable-eol-notification",
-+  "disable-es3-apis",
-+  "disable-es3-gl-context",
-+  "disable-extensions",
-+  "disable-extensions-except",
-+  "disable-extensions-file-access-check",
-+  "disable-extensions-http-throttling",
-+  "disable-fast-web-scroll-view-insets",
-+  "disable-features",
-+  "disable-field-trial-config",
-+  "disable-file-system",
-+  "disable-flash-3d",
-+  "disable-flash-stage3d",
-+  "disable-fullscreen-low-power-mode",
-+  "disable-fullscreen-tab-detaching",
-+  "disable-gaia-services",
-+  "disable-gesture-editing",
-+  "disable-gesture-requirement-for-media-playback",
-+  "disable-gesture-requirement-for-presentation",
-+  "disable-gesture-typing",
-+  "disable-gl-drawing-for-tests",
-+  "disable-gl-error-limit",
-+  "disable-gl-extensions",
-+  "disable-glsl-translator",
-+  "disable-gpu",
-+  "disable-gpu-async-worker-context",
-+  "disable-gpu-compositing",
-+  "disable-gpu-driver-bug-workarounds",
-+  "disable-gpu-early-init",
-+  "disable-gpu-memory-buffer-compositor-resources",
-+  "disable-gpu-memory-buffer-video-frames",
-+  "disable-gpu-process-crash-limit",
-+  "disable-gpu-program-cache",
-+  "disable-gpu-rasterization",
-+  "disable-gpu-sandbox",
-+  "disable-gpu-shader-disk-cache",
-+  "disable-gpu-vsync",
-+  "disable-gpu-watchdog",
-+  "disable-hang-monitor",
-+  "disable-hid-detection-on-oobe",
-+  "disable-hide-inactive-stacked-tab-close-buttons",
-+  "disable-histogram-customizer",
-+  "disable-hosted-app-shim-creation",
-+  "disable-hosted-apps-in-windows",
-+  "disable-http2",
-+  "disable-in-process-stack-traces",
-+  "disable-infobars",
-+  "disable-input-ime-api",
-+  "disable-input-view",
-+  "disable-ios-password-generation",
-+  "disable-ios-password-suggestions",
-+  "disable-ios-physical-web",
-+  "disable-javascript-harmony-shipping",
-+  "disable-kill-after-bad-ipc",
-+  "disable-lcd-text",
-+  "disable-legacy-window",
-+  "disable-local-storage",
-+  "disable-logging",
-+  "disable-login-animations",
-+  "disable-low-end-device-mode",
-+  "disable-low-latency-dxva",
-+  "disable-low-res-tiling",
-+  "disable-lru-snapshot-cache",
-+  "disable-mac-overlays",
-+  "disable-mac-views-native-app-windows",
-+  "disable-main-frame-before-activation",
-+  "disable-md-oobe",
-+  "disable-media-session-api",
-+  "disable-media-suspend",
-+  "disable-merge-key-char-events",
-+  "disable-minimize-on-second-launcher-item-click",
-+  "disable-mojo-renderer",
-+  "disable-mtp-write-support",
-+  "disable-multi-display-layout",
-+  "disable-namespace-sandbox",
-+  "disable-native-cups",
-+  "disable-native-gpu-memory-buffers",
-+  "disable-network-portal-notification",
-+  "disable-new-channel-switcher-ui",
-+  "disable-new-kiosk-ui",
-+  "disable-new-korean-ime",
-+  "disable-new-zip-unpacker",
-+  "disable-notifications",
-+  "disable-ntp-popular-sites",
-+  "disable-nv12-dxgi-video",
-+  "disable-offer-store-unmasked-wallet-cards",
-+  "disable-offer-upload-credit-cards",
-+  "disable-office-editing-component-extension",
-+  "disable-offline-auto-reload",
-+  "disable-offline-auto-reload-visible-only",
-+  "disable-overscroll-edge-effect",
-+  "disable-panel-fitting",
-+  "disable-partial-raster",
-+  "disable-password-generation",
-+  "disable-payment-request",
-+  "disable-pepper-3d",
-+  "disable-pepper-3d-image-chromium",
-+  "disable-per-monitor-dpi",
-+  "disable-permission-action-reporting",
-+  "disable-permissions-api",
-+  "disable-physical-keyboard-autocorrect",
-+  "disable-pinch",
-+  "disable-pnacl-crash-throttling",
-+  "disable-popup-blocking",
-+  "disable-prefer-compositing-to-lcd-text",
-+  "disable-presentation-api",
-+  "disable-print-preview",
-+  "disable-prompt-on-repost",
-+  "disable-pull-to-refresh-effect",
-+  "disable-push-api-background-mode",
-+  "disable-quic",
-+  "disable-reading-from-canvas",
-+  "disable-remote-core-animation",
-+  "disable-remote-fonts",
-+  "disable-remote-playback-api",
-+  "disable-renderer-accessibility",
-+  "disable-renderer-backgrounding",
-+  "disable-renderer-priority-management",
-+  "disable-resize-lock",
-+  "disable-rgba-4444-textures",
-+  "disable-rollback-option",
-+  "disable-rtc-smoothness-algorithm",
-+  "disable-screen-orientation-lock",
-+  "disable-search-geolocation-disclosure",
-+  "disable-seccomp-filter-sandbox",
-+  "disable-settings-window",
-+  "disable-setuid-sandbox",
-+  "disable-shader-name-hashing",
-+  "disable-shared-workers",
-+  "disable-signin-promo",
-+  "disable-signin-scoped-device-id",
-+  "disable-single-click-autofill",
-+  "disable-slimming-paint-invalidation",
-+  "disable-smart-virtual-keyboard",
-+  "disable-smooth-scrolling",
-+  "disable-software-rasterizer",
-+  "disable-speech-api",
-+  "disable-suggestions-ui",
-+  "disable-sync",
-+  "disable-sync-app-list",
-+  "disable-sync-types",
-+  "disable-system-timezone-automatic-detection",
-+  "disable-tab-for-desktop-share",
-+  "disable-tab-strip-autoscroll-new-tabs",
-+  "disable-threaded-animation",
-+  "disable-threaded-compositing",
-+  "disable-threaded-scrolling",
-+  "disable-touch-adjustment",
-+  "disable-touch-drag-drop",
-+  "disable-translate",
-+  "disable-translate-new-ux",
-+  "disable-usb-keyboard-detect",
-+  "disable-v8-idle-tasks",
-+  "disable-vaapi-accelerated-video-encode",
-+  "disable-views-rect-based-targeting",
-+  "disable-virtual-keyboard-overscroll",
-+  "disable-voice-input",
-+  "disable-volume-adjust-sound",
-+  "disable-wake-on-wifi",
-+  "disable-web-notification-custom-layouts",
-+  "disable-web-security",
-+  "disable-webgl",
-+  "disable-webgl-image-chromium",
-+  "disable-webrtc-encryption",
-+  "disable-webrtc-hw-decoding",
-+  "disable-webrtc-hw-encoding",
-+  "disable-webrtc-hw-vp8-encoding",
-+  "disable-win32k-lockdown",
-+  "disable-xss-auditor",
-+  "disable-zero-browsers-open-for-tests",
-+  "disable-zero-copy",
-+  "disable-zero-copy-dxgi-video",
-+  "disabled",
-+  "disk-cache-dir",
-+  "disk-cache-size",
-+  "display",
-+  "dmg-device",
-+  "dns-log-details",
-+  "dom-automation",
-+  "dotfile",
-+  "draw-view-bounds-rects",
-+  "duck-flash",
-+  "dump-browser-histograms",
-+  "dump-dom",
-+  "eafe-path",
-+  "eafe-url",
-+  "early-tracing",
-+  "easy-unlock-app-path",
-+  "edge-touch-filtering",
-+  "egl",
-+  "elevate",
-+  "embedded-extension-options",
-+  "emphasize-titles-in-omnibox-dropdown",
-+  "emulate-shader-precision",
-+  "enable-accelerated-2d-canvas",
-+  "enable-accelerated-vpx-decode",
-+  "enable-accessibility-tab-switcher",
-+  "enable-account-consistency",
-+  "enable-adaptive-selection-handle-orientation",
-+  "enable-add-to-shelf",
-+  "enable-aggressive-domstorage-flushing",
-+  "enable-android-wallpapers-app",
-+  "enable-app-info-dialog-mac",
-+  "enable-app-list",
-+  "enable-app-window-cycling",
-+  "enable-appcontainer",
-+  "enable-arc",
-+  "enable-arc-oobe-optin",
-+  "enable-audio-debug-recordings-from-extension",
-+  "enable-autofill-keyboard-accessory-view",
-+  "enable-automation",
-+  "enable-benchmarking",
-+  "enable-ble-advertising-in-apps",
-+  "enable-blink-features",
-+  "enable-bookmark-undo",
-+  "enable-browser-side-navigation",
-+  "enable-browser-task-scheduler",
-+  "enable-canvas-2d-dynamic-rendering-mode-switching",
-+  "enable-checker-imaging",
-+  "enable-chromevox-arc-support",
-+  "enable-clear-browsing-data-counters",
-+  "enable-cloud-print-proxy",
-+  "enable-cloud-print-xps",
-+  "enable-color-correct-rendering",
-+  "enable-color-correct-rendering-default-mode",
-+  "enable-consumer-kiosk",
-+  "enable-contextual-search",
-+  "enable-crash-reporter",
-+  "enable-crash-reporter-for-testing",
-+  "enable-crx-hash-check",
-+  "enable-data-reduction-proxy-bypass-warning",
-+  "enable-data-reduction-proxy-carrier-test",
-+  "enable-data-reduction-proxy-force-pingback",
-+  "enable-data-reduction-proxy-lite-page",
-+  "enable-data-reduction-proxy-savings-promo",
-+  "enable-datasaver-prompt",
-+  "enable-default-media-session",
-+  "enable-device-discovery-notifications",
-+  "enable-devtools-experiments",
-+  "enable-direct-composition-layers",
-+  "enable-display-list-2d-canvas",
-+  "enable-distance-field-text",
-+  "enable-distillability-service",
-+  "enable-dom-distiller",
-+  "enable-domain-reliability",
-+  "enable-download-image-renaming",
-+  "enable-drive-search-in-app-launcher",
-+  "enable-drm-atomic",
-+  "enable-embedded-extension-options",
-+  "enable-encryption-migration",
-+  "enable-es3-apis",
-+  "enable-exclusive-audio",
-+  "enable-experimental-accessibility-features",
-+  "enable-experimental-canvas-features",
-+  "enable-experimental-extension-apis",
-+  "enable-experimental-input-view-features",
-+  "enable-experimental-web-platform-features",
-+  "enable-extension-activity-log-testing",
-+  "enable-extension-activity-logging",
-+  "enable-extension-assets-sharing",
-+  "enable-fast-unload",
-+  "enable-fast-web-scroll-view-insets",
-+  "enable-features",
-+  "enable-first-run-ui-transitions",
-+  "enable-floating-virtual-keyboard",
-+  "enable-font-antialiasing",
-+  "enable-fullscreen-tab-detaching",
-+  "enable-fullscreen-toolbar-reveal",
-+  "enable-google-branded-context-menu",
-+  "enable-gpu-async-worker-context",
-+  "enable-gpu-benchmarking",
-+  "enable-gpu-client-logging",
-+  "enable-gpu-client-tracing",
-+  "enable-gpu-command-logging",
-+  "enable-gpu-debugging",
-+  "enable-gpu-driver-debug-logging",
-+  "enable-gpu-memory-buffer-compositor-resources",
-+  "enable-gpu-memory-buffer-video-frames",
-+  "enable-gpu-rasterization",
-+  "enable-gpu-service-logging",
-+  "enable-gpu-service-tracing",
-+  "enable-grouped-history",
-+  "enable-hardware-overlays",
-+  "enable-harfbuzz-rendertext",
-+  "enable-hdr",
-+  "enable-heap-profiling",
-+  "enable-hosted-app-quit-notification",
-+  "enable-hosted-apps-in-windows",
-+  "enable-hosted-mode",
-+  "enable-hotword-hardware",
-+  "enable-hung-renderer-infobar",
-+  "enable-inband-text-tracks",
-+  "enable-input-ime-api",
-+  "enable-ios-handoff-to-other-devices",
-+  "enable-ios-password-generation",
-+  "enable-ios-physical-web",
-+  "enable-kiosk-mode",
-+  "enable-layer-lists",
-+  "enable-lcd-text",
-+  "enable-leak-detection",
-+  "enable-local-file-accesses",
-+  "enable-local-sync-backend",
-+  "enable-logging",
-+  "enable-login-screen-apps",
-+  "enable-longpress-drag-selection",
-+  "enable-low-end-device-mode",
-+  "enable-low-res-tiling",
-+  "enable-lru-snapshot-cache",
-+  "enable-mac-views-native-app-windows",
-+  "enable-main-frame-before-activation",
-+  "enable-md-feedback",
-+  "enable-md-policy-page",
-+  "enable-media-suspend",
-+  "enable-merge-key-char-events",
-+  "enable-message-center-always-scroll-up-upon-notification-removal",
-+  "enable-nacl",
-+  "enable-nacl-debug",
-+  "enable-nacl-nonsfi-mode",
-+  "enable-native-gpu-memory-buffers",
-+  "enable-natural-scroll-default",
-+  "enable-navigation-tracing",
-+  "enable-net-benchmarking",
-+  "enable-network-information",
-+  "enable-network-portal-notification",
-+  "enable-network-service",
-+  "enable-new-vp9-codec-string",
-+  "enable-ntp-popular-sites",
-+  "enable-ntp-search-engine-country-detection",
-+  "enable-offer-store-unmasked-wallet-cards",
-+  "enable-offer-upload-credit-cards",
-+  "enable-offline-auto-reload",
-+  "enable-offline-auto-reload-visible-only",
-+  "enable-osk-overscroll",
-+  "enable-override-bookmarks-ui",
-+  "enable-partial-raster",
-+  "enable-password-generation",
-+  "enable-payment-request",
-+  "enable-pepper-testing",
-+  "enable-per-monitor-dpi",
-+  "enable-permission-action-reporting",
-+  "enable-physical-keyboard-autocorrect",
-+  "enable-pinch",
-+  "enable-pixel-output-in-tests",
-+  "enable-plugin-placeholder-testing",
-+  "enable-potentially-annoying-security-features",
-+  "enable-power-overlay",
-+  "enable-precache",
-+  "enable-precise-memory-info",
-+  "enable-prefer-compositing-to-lcd-text",
-+  "enable-print-browser",
-+  "enable-print-preview-register-promos",
-+  "enable-profile-shortcut-manager",
-+  "enable-profiling",
-+  "enable-proximity-auth-bluetooth-low-energy-discovery",
-+  "enable-proximity-auth-proximity-detection",
-+  "enable-push-api-background-mode",
-+  "enable-quic",
-+  "enable-reader-mode-toolbar-icon",
-+  "enable-refresh-token-annotation-request",
-+  "enable-request-tablet-site",
-+  "enable-rgba-4444-textures",
-+  "enable-sandbox",
-+  "enable-sandbox-logging",
-+  "enable-screenshot-testing-with-mode",
-+  "enable-scripts-require-action",
-+  "enable-scroll-prediction",
-+  "enable-service-manager-tracing",
-+  "enable-settings-window",
-+  "enable-sgi-video-sync",
-+  "enable-signin-promo",
-+  "enable-single-click-autofill",
-+  "enable-site-engagement-eviction-policy",
-+  "enable-site-settings",
-+  "enable-skia-benchmarking",
-+  "enable-slimming-paint-invalidation",
-+  "enable-slimming-paint-v2",
-+  "enable-smooth-scrolling",
-+  "enable-spatial-navigation",
-+  "enable-spdy-proxy-auth",
-+  "enable-speech-dispatcher",
-+  "enable-spelling-feedback-field-trial",
-+  "enable-spotlight-actions",
-+  "enable-stats-collection-bindings",
-+  "enable-stats-table",
-+  "enable-strict-mixed-content-checking",
-+  "enable-strict-powerful-feature-restrictions",
-+  "enable-suggestions-ui",
-+  "enable-suggestions-with-substring-match",
-+  "enable-supervised-user-managed-bookmarks-folder",
-+  "enable-surface-synchronization",
-+  "enable-swap-buffers-with-bounds",
-+  "enable-sync-app-list",
-+  "enable-sync-articles",
-+  "enable-tab-audio-muting",
-+  "enable-tcp-fastopen",
-+  "enable-tether",
-+  "enable-threaded-compositing",
-+  "enable-threaded-texture-mailboxes",
-+  "enable-thumbnail-retargeting",
-+  "enable-tile-compression",
-+  "enable-touch-calibration-setting",
-+  "enable-touch-drag-drop",
-+  "enable-touch-support-for-screen-magnifier",
-+  "enable-touchpad-three-finger-click",
-+  "enable-touchview",
-+  "enable-trace-app-source",
-+  "enable-tracing",
-+  "enable-tracing-output",
-+  "enable-translate-new-ux",
-+  "enable-ui-devtools",
-+  "enable-use-zoom-for-dsf",
-+  "enable-user-controlled-alternate-protocol-ports",
-+  "enable-user-metrics",
-+  "enable-usermedia-screen-capturing",
-+  "enable-video-player-chromecast-support",
-+  "enable-viewport",
-+  "enable-virtual-keyboard",
-+  "enable-voice-interaction",
-+  "enable-vp9-in-mp4",
-+  "enable-vtune-support",
-+  "enable-vulkan",
-+  "enable-wayland-server",
-+  "enable-web-notification-custom-layouts",
-+  "enable-webfonts-intervention-trigger",
-+  "enable-webfonts-intervention-v2",
-+  "enable-webgl-draft-extensions",
-+  "enable-webgl-image-chromium",
-+  "enable-webrtc-event-logging-from-extension",
-+  "enable-webrtc-srtp-aes-gcm",
-+  "enable-webrtc-stun-origin",
-+  "enable-webvr",
-+  "enable-wifi-credential-sync",
-+  "enable-win7-webrtc-hw-h264-decoding",
-+  "enable-zero-copy",
-+  "enable-zip-archiver-on-file-manager",
-+  "enabled",
-+  "enabled-2g",
-+  "enabled-3g",
-+  "enabled-slow2g",
-+  "encode-binary",
-+  "enforce",
-+  "enforce-gl-minimums",
-+  "enforce-webrtc-ip-permission-check",
-+  "enforce_strict",
-+  "enterprise-disable-arc",
-+  "enterprise-enable-forced-re-enrollment",
-+  "enterprise-enable-zero-touch-enrollment",
-+  "enterprise-enrollment-initial-modulus",
-+  "enterprise-enrollment-modulus-limit",
-+  "error-console",
-+  "explicitly-allowed-ports",
-+  "expose-internals-for-testing",
-+  "extension-content-verification",
-+  "extension-process",
-+  "extensions-install-verification",
-+  "extensions-multi-account",
-+  "extensions-not-webstore",
-+  "extensions-on-chrome-urls",
-+  "extensions-update-frequency",
-+  "extra-search-query-params",
-+  "fail-on-unused-args",
-+  "fake-variations-channel",
-+  "false",
-+  "fast",
-+  "fast-start",
-+  "feedback-server",
-+  "field-trial-handle",
-+  "first-exec-after-boot",
-+  "flag-switches-begin",
-+  "flag-switches-end",
-+  "font-cache-shared-handle",
-+  "force-android-app-mode",
-+  "force-app-mode",
-+  "force-desktop-ios-promotion",
-+  "force-dev-mode-highlighting",
-+  "force-device-scale-factor",
-+  "force-display-list-2d-canvas",
-+  "force-fieldtrial-params",
-+  "force-fieldtrials",
-+  "force-first-run",
-+  "force-first-run-ui",
-+  "force-gpu-mem-available-mb",
-+  "force-gpu-rasterization",
-+  "force-happiness-tracking-system",
-+  "force-load-easy-unlock-app-in-tests",
-+  "force-local-ntp",
-+  "force-login-manager-in-tests",
-+  "force-mediafoundation",
-+  "force-overlay-fullscreen-video",
-+  "force-pnacl-subzero",
-+  "force-renderer-accessibility",
-+  "force-show-update-menu-badge",
-+  "force-show-update-menu-item",
-+  "force-system-compositor-mode",
-+  "force-tablet-mode",
-+  "force-ui-direction",
-+  "force-variation-ids",
-+  "force-video-overlays",
-+  "force-wave-audio",
-+  "force-webrtc-ip-handling-policy",
-+  "full-memory-crash-report",
-+  "gaia-url",
-+  "gcm-checkin-url",
-+  "gcm-mcs-endpoint",
-+  "gcm-registration-url",
-+  "generate-accessibility-test-expectations",
-+  "gl",
-+  "gl-composited-texture-quad-border",
-+  "gl-shader-interm-output",
-+  "gles",
-+  "golden-screenshots-dir",
-+  "google-apis-url",
-+  "google-base-url",
-+  "google-doodle-url",
-+  "google-url",
-+  "gpu-active-device-id",
-+  "gpu-active-vendor-id",
-+  "gpu-device-id",
-+  "gpu-driver-bug-workarounds",
-+  "gpu-driver-date",
-+  "gpu-driver-vendor",
-+  "gpu-driver-version",
-+  "gpu-launcher",
-+  "gpu-no-complete-info-collection",
-+  "gpu-no-context-lost",
-+  "gpu-process",
-+  "gpu-program-cache-size-kb",
-+  "gpu-rasterization-msaa-sample-count",
-+  "gpu-sandbox-allow-sysv-shm",
-+  "gpu-sandbox-failures-fatal",
-+  "gpu-sandbox-start-early",
-+  "gpu-secondary-device-ids",
-+  "gpu-secondary-vendor-ids",
-+  "gpu-startup-dialog",
-+  "gpu-testing-device-id",
-+  "gpu-testing-driver-date",
-+  "gpu-testing-gl-renderer",
-+  "gpu-testing-gl-vendor",
-+  "gpu-testing-gl-version",
-+  "gpu-testing-os-version",
-+  "gpu-testing-secondary-device-ids",
-+  "gpu-testing-secondary-vendor-ids",
-+  "gpu-testing-vendor-id",
-+  "gpu-vendor-id",
-+  "guest-wallpaper-large",
-+  "guest-wallpaper-small",
-+  "h",
-+  "has-chromeos-diamond-key",
-+  "headless",
-+  "help",
-+  "hide",
-+  "hide-icons",
-+  "hide-scrollbars",
-+  "history-entry-requires-user-gesture",
-+  "homedir",
-+  "homepage",
-+  "host",
-+  "host-pairing-oobe",
-+  "host-resolver-retry-attempts",
-+  "host-resolver-rules",
-+  "host-rules",
-+  "icu-data-dir",
-+  "ignore-autocomplete-off-autofill",
-+  "ignore-certificate-errors",
-+  "ignore-gpu-blacklist",
-+  "ignore-urlfetcher-cert-requests",
-+  "ignore-user-profile-mapping-for-tests",
-+  "in-process-gpu",
-+  "incognito",
-+  "inert-visual-viewport",
-+  "input",
-+  "inspect",
-+  "inspect-brk",
-+  "install-chrome-app",
-+  "install-supervised-user-whitelists",
-+  "instant-process",
-+  "interests-url",
-+  "invalidation-use-gcm-channel",
-+  "ipc-connection-timeout",
-+  "ipc-dump-directory",
-+  "ipc-fuzzer-testcase",
-+  "is-running-in-mash",
-+  "isolate-extensions",
-+  "isolate-sites-for-testing",
-+  "javascript-harmony",
-+  "js-flags",
-+  "keep-alive-for-test",
-+  "kiosk",
-+  "kiosk-printing",
-+  "lang",
-+  "last-launched-app",
-+  "layer",
-+  "light_muted",
-+  "light_vibrant",
-+  "load-and-launch-app",
-+  "load-apps",
-+  "load-extension",
-+  "load-media-router-component-extension",
-+  "local-heuristics-only-for-password-generation",
-+  "local-ntp-reload",
-+  "local-sync-backend-dir",
-+  "log-gpu-control-list-decisions",
-+  "log-level",
-+  "log-net-log",
-+  "login-manager",
-+  "login-profile",
-+  "login-user",
-+  "lso-url",
-+  "ltr",
-+  "main-frame-resizes-are-orientation-changes",
-+  "make-chrome-default",
-+  "make-default-browser",
-+  "managed-user-id",
-+  "managed-user-sync-token",
-+  "mark-non-secure-as",
-+  "markdown",
-+  "market-url-for-testing",
-+  "mash",
-+  "material",
-+  "material-design-ink-drop-animation-speed",
-+  "material-hybrid",
-+  "max-gum-fps",
-+  "max-output-volume-dba1m",
-+  "max-untiled-layer-height",
-+  "max-untiled-layer-width",
-+  "media-cache-size",
-+  "mem-pressure-system-reserved-kb",
-+  "memory-metrics",
-+  "memory-pressure-off",
-+  "memory-pressure-thresholds",
-+  "memory-pressure-thresholds-mb",
-+  "message-center-changes-while-open",
-+  "metrics-client-id",
-+  "metrics-recording-only",
-+  "mhtml-generator-option",
-+  "mock",
-+  "mojo-channel-token",
-+  "mojo-local-storage",
-+  "mojo-pipe-token",
-+  "monitoring-destination-id",
-+  "mse-audio-buffer-size-limit",
-+  "mse-video-buffer-size-limit",
-+  "mus",
-+  "mus-config",
-+  "mute-audio",
-+  "nacl-broker",
-+  "nacl-dangerous-no-sandbox-nonsfi",
-+  "nacl-debug-mask",
-+  "nacl-gdb",
-+  "nacl-gdb-script",
-+  "nacl-loader",
-+  "nacl-loader-nonsfi",
-+  "native",
-+  "native-crx-bindings",
-+  "net-log-capture-mode",
-+  "netifs-to-ignore",
-+  "network-country-iso",
-+  "new-window",
-+  "no-default-browser-check",
-+  "no-experiments",
-+  "no-first-run",
-+  "no-managed-user-acknowledgment-check",
-+  "no-network-profile-warning",
-+  "no-pings",
-+  "no-proxy-server",
-+  "no-referrers",
-+  "no-sandbox",
-+  "no-service-autorun",
-+  "no-startup-window",
-+  "no-wifi",
-+  "no-zygote",
-+  "nocolor",
-+  "noerrdialogs",
-+  "non-material",
-+  "non-secure",
-+  "none",
-+  "normal_muted",
-+  "normal_vibrant",
-+  "note-taking-app-ids",
-+  "ntp-snippets-add-incomplete",
-+  "ntp-switch-to-existing-tab",
-+  "null",
-+  "num-pac-threads",
-+  "num-raster-threads",
-+  "oauth2-client-id",
-+  "oauth2-client-secret",
-+  "off",
-+  "on",
-+  "oobe-bootstrapping-master",
-+  "oobe-guest-session",
-+  "oobe-skip-postlogin",
-+  "oobe-timer-interval",
-+  "open-ash",
-+  "opengraph",
-+  "origin-to-force-quic-on",
-+  "origin-trial-disabled-features",
-+  "origin-trial-disabled-tokens",
-+  "origin-trial-public-key",
-+  "original-process-start-time",
-+  "osmesa",
-+  "output",
-+  "override",
-+  "override-metrics-upload-url",
-+  "override-plugin-power-saver-for-testing",
-+  "override-use-software-gl-for-tests",
-+  "overscroll-history-navigation",
-+  "overscroll-start-threshold",
-+  "ozone-dump-file",
-+  "ozone-platform",
-+  "pack-extension",
-+  "pack-extension-key",
-+  "parent-profile",
-+  "parent-window",
-+  "passive-listeners-default",
-+  "password-store",
-+  "permission-request-api-scope",
-+  "permission-request-api-url",
-+  "power-stub",
-+  "ppapi",
-+  "ppapi-antialiased-text-enabled",
-+  "ppapi-broker",
-+  "ppapi-flash-args",
-+  "ppapi-flash-path",
-+  "ppapi-flash-version",
-+  "ppapi-in-process",
-+  "ppapi-plugin-launcher",
-+  "ppapi-startup-dialog",
-+  "ppapi-subpixel-rendering-setting",
-+  "precache-config-settings-url",
-+  "precache-manifest-url-prefix",
-+  "prerender-from-omnibox",
-+  "previous-app",
-+  "primary",
-+  "primordial-pipe-token",
-+  "print-to-pdf",
-+  "privet-ipv6-only",
-+  "process-per-site",
-+  "process-per-tab",
-+  "process-service-name",
-+  "product-version",
-+  "profile-directory",
-+  "profiler-timing",
-+  "profiling-at-start",
-+  "profiling-file",
-+  "profiling-flush",
-+  "progress-bar-animation",
-+  "progress-bar-completion",
-+  "prompt-for-external-extensions",
-+  "proxy-auto-detect",
-+  "proxy-bypass-list",
-+  "proxy-pac-url",
-+  "proxy-server",
-+  "q",
-+  "quic-connection-options",
-+  "quic-host-whitelist",
-+  "quic-max-packet-length",
-+  "quic-version",
-+  "rdp_desktop_session",
-+  "reader-mode-feedback",
-+  "reader-mode-heuristics",
-+  "rebaseline-pixel-tests",
-+  "reduce-security-for-testing",
-+  "reduced-referrer-granularity",
-+  "register-font-files",
-+  "register-pepper-plugins",
-+  "relauncher",
-+  "remote-debugging-address",
-+  "remote-debugging-port",
-+  "remote-debugging-socket-name",
-+  "remote-debugging-targets",
-+  "renderer",
-+  "renderer-client-id",
-+  "renderer-cmd-prefix",
-+  "renderer-process-limit",
-+  "renderer-startup-dialog",
-+  "renderer-wait-for-java-debugger",
-+  "renderpass",
-+  "repl",
-+  "report-vp9-as-an-unsupported-mime-type",
-+  "require-audio-hardware-for-testing",
-+  "reset-app-list-install-state",
-+  "reset-variation-state",
-+  "restore-last-session",
-+  "root",
-+  "root-layer-scrolls",
-+  "rtl",
-+  "run-layout-test",
-+  "runtime-deps-list-file",
-+  "safebrowsing-disable-auto-update",
-+  "safebrowsing-disable-download-protection",
-+  "safebrowsing-disable-extension-blacklist",
-+  "safebrowsing-manual-download-blacklist",
-+  "sandbox-ipc",
-+  "save-page-as-mhtml",
-+  "saveas-menu-label",
-+  "screen-config",
-+  "screenshot",
-+  "script-executable",
-+  "scripts-require-action",
-+  "scroll-end-effect",
-+  "secondary",
-+  "secondary-display-layout",
-+  "secondary-ui-md",
-+  "service",
-+  "service-overrides",
-+  "service-request-channel-token",
-+  "shared-files",
-+  "shill-stub",
-+  "show-app-list",
-+  "show-autofill-signatures",
-+  "show-autofill-type-predictions",
-+  "show-component-extension-options",
-+  "show-composited-layer-borders",
-+  "show-fps-counter",
-+  "show-icons",
-+  "show-layer-animation-bounds",
-+  "show-mac-overlay-borders",
-+  "show-overdraw-feedback",
-+  "show-paint-rects",
-+  "show-property-changed-rects",
-+  "show-saved-copy",
-+  "show-screenspace-rects",
-+  "show-surface-damage-rects",
-+  "show_summary",
-+  "silent-debugger-extension-api",
-+  "silent-launch",
-+  "simulate-critical-update",
-+  "simulate-elevated-recovery",
-+  "simulate-outdated",
-+  "simulate-outdated-no-au",
-+  "simulate-upgrade",
-+  "single-process",
-+  "site-per-process",
-+  "skip-gpu-data-loading",
-+  "skip-nostore-all",
-+  "skip-nostore-main",
-+  "skip-reencoding-on-skp-capture",
-+  "slow",
-+  "slow-connections-only",
-+  "slow-down-raster-scale-factor",
-+  "sms-test-messages",
-+  "spdy-proxy-auth-fallback",
-+  "spdy-proxy-auth-origin",
-+  "spdy-proxy-auth-value",
-+  "spelling-service-feedback-interval-seconds",
-+  "spelling-service-feedback-url",
-+  "ssl-key-log-file",
-+  "ssl-version-max",
-+  "ssl-version-min",
-+  "stable-release-mode",
-+  "start-fullscreen",
-+  "start-maximized",
-+  "start-stack-profiler",
-+  "started",
-+  "stub",
-+  "stub-cros-settings",
-+  "supports-dual-gpus",
-+  "surface",
-+  "swiftshader",
-+  "swiftshader-webgl",
-+  "sync-allow-insecure-xmpp-connection",
-+  "sync-deferred-startup-timeout-seconds",
-+  "sync-disable-deferred-startup",
-+  "sync-enable-get-update-avoidance",
-+  "sync-notification-host-port",
-+  "sync-on-draw-hardware",
-+  "sync-short-initial-retry-override",
-+  "sync-short-nudge-delay-for-test",
-+  "sync-url",
-+  "system-developer-mode",
-+  "system-log-upload-frequency",
-+  "tab-management-experiment-type-disabled",
-+  "tab-management-experiment-type-elderberry",
-+  "task-profiler",
-+  "team-drives",
-+  "test-auto-update-ui",
-+  "test-child-process",
-+  "test-cros-gaia-id-migration",
-+  "test-do-not-initialize-icu",
-+  "test-encryption-migration-ui",
-+  "test-gl-lib",
-+  "test-launcher-batch-limit",
-+  "test-launcher-bot-mode",
-+  "test-launcher-debug-launcher",
-+  "test-launcher-filter-file",
-+  "test-launcher-force-run-broken-tests",
-+  "test-launcher-jobs",
-+  "test-launcher-list-tests",
-+  "test-launcher-output",
-+  "test-launcher-print-test-stdio",
-+  "test-launcher-print-writable-path",
-+  "test-launcher-retry-limit",
-+  "test-launcher-shard-index",
-+  "test-launcher-summary-output",
-+  "test-launcher-timeout",
-+  "test-launcher-total-shards",
-+  "test-launcher-trace",
-+  "test-name",
-+  "test-tiny-timeout",
-+  "test-type",
-+  "testing-fixed-http-port",
-+  "testing-fixed-https-port",
-+  "threads",
-+  "time",
-+  "timeout",
-+  "tls1",
-+  "tls1.1",
-+  "tls1.2",
-+  "tls1.3",
-+  "top-chrome-md",
-+  "top-controls-hide-threshold",
-+  "top-controls-show-threshold",
-+  "top-document-isolation",
-+  "touch-calibration",
-+  "touch-devices",
-+  "touch-events",
-+  "touch-noise-filtering",
-+  "touch-selection-strategy",
-+  "touch_view",
-+  "trace-config-file",
-+  "trace-export-events-to-etw",
-+  "trace-shutdown",
-+  "trace-shutdown-file",
-+  "trace-startup",
-+  "trace-startup-duration",
-+  "trace-startup-file",
-+  "trace-to-console",
-+  "trace-to-file",
-+  "trace-to-file-name",
-+  "trace-upload-url",
-+  "tracelog",
-+  "translate-ranker-model-url",
-+  "translate-script-url",
-+  "translate-security-origin",
-+  "true",
-+  "try-chrome-again",
-+  "try-supported-channel-layouts",
-+  "type",
-+  "ui-disable-partial-swap",
-+  "ui-enable-layer-lists",
-+  "ui-enable-rgba-4444-textures",
-+  "ui-enable-zero-copy",
-+  "ui-prioritize-in-gpu-process",
-+  "ui-show-fps-counter",
-+  "ui-show-layer-animation-bounds",
-+  "ui-show-layer-borders",
-+  "ui-show-paint-rects",
-+  "ui-show-property-changed-rects",
-+  "ui-show-screenspace-rects",
-+  "ui-show-surface-damage-rects",
-+  "ui-slow-animations",
-+  "ui-test-action-max-timeout",
-+  "ui-test-action-timeout",
-+  "uninstall",
-+  "unlimited-storage",
-+  "unsafe-pac-url",
-+  "unsafely-allow-protected-media-identifier-for-domain",
-+  "unsafely-treat-insecure-origin-as-secure",
-+  "use-angle",
-+  "use-cras",
-+  "use-double-buffering",
-+  "use-fake-device-for-media-stream",
-+  "use-fake-jpeg-decode-accelerator",
-+  "use-fake-ui-for-media-stream",
-+  "use-file-for-fake-audio-capture",
-+  "use-file-for-fake-video-capture",
-+  "use-first-display-as-internal",
-+  "use-gl",
-+  "use-gpu-in-tests",
-+  "use-mobile-user-agent",
-+  "use-mock-keychain",
-+  "use-new-virtual-keyboard-behavior",
-+  "use-passthrough-cmd-decoder",
-+  "use-simple-cache-backend",
-+  "use-test-config",
-+  "use_new_features_summary",
-+  "user-agent",
-+  "user-always-affiliated",
-+  "user-data-dir",
-+  "utility",
-+  "utility-allowed-dir",
-+  "utility-cmd-prefix",
-+  "utility-run-elevated",
-+  "v",
-+  "v8-cache-options",
-+  "v8-cache-strategies-for-cache-storage",
-+  "validate-crx",
-+  "validate-input-event-stream",
-+  "variations-server-url",
-+  "version",
-+  "video-image-texture-target",
-+  "video-threads",
-+  "video-underflow-threshold-ms",
-+  "viewer-launch-via-appid",
-+  "virtual-time-budget",
-+  "vmodule",
-+  "wait-for-debugger",
-+  "wait-for-debugger-children",
-+  "wake-on-wifi-packet",
-+  "wallet-service-use-sandbox",
-+  "watcher",
-+  "waveout-buffers",
-+  "webapk-server-url",
-+  "webrtc-max-cpu-consumption-percentage",
-+  "webrtc-stun-probe-trial",
-+  "webview-enable-safebrowsing-support",
-+  "webview-sandboxed-renderer",
-+  "whitelisted-extension-id",
-+  "win-jumplist-action",
-+  "window-position",
-+  "window-size",
-+  "window-workspace",
-+  "windows10-custom-titlebar",
-+  "windows8-search",
-+  "winhttp-proxy-resolver",
-+  "wm-window-animations-disabled",
-+  "yield-between-content-script-runs",
-+  "zygote",
-+  "zygote-cmd-prefix"
-+};
-+
-+bool IsBlacklistedArg(const base::CommandLine::CharType* arg) {
-+#if defined(OS_WIN)
-+  const auto converted = base::WideToUTF8(arg);
-+  const char* a = converted.c_str();
-+#else
-+  const char* a = arg;
-+#endif
-+
-+  static const char* prefixes[] = {"--", "-", "/"};
-+
-+  int prefix_length = 0;
-+  for (auto& prefix : prefixes) {
-+    if (base::StartsWith(a, prefix, base::CompareCase::SENSITIVE)) {
-+      prefix_length = strlen(prefix);
-+      break;
-+    }
-+  }
-+
-+  if (prefix_length > 0) {
-+    a += prefix_length;
-+    std::string switch_name =
-+        base::ToLowerASCII(base::StringPiece(a, strcspn(a, "=")));
-+    for (auto& item : blacklist) {
-+      if (switch_name == item)
-+        return true;
-+    }
-+  }
-+
-+  return false;
-+}
-+
-+>>>>>>> .their
- }  // namespace
- 
- namespace atom {
- 
- bool CheckCommandLineArguments(int argc, base::CommandLine::CharType** argv) {
-   const base::CommandLine::StringType dashdash(2, '-');
-+<<<<<<< .our
-   bool block_args = false;
-   for (int i = 0; i < argc; ++i) {
-     if (argv[i] == dashdash)
-@@ -45,6 +1393,17 @@
-       return false;
-     } else if (IsUrlArg(argv[i])) {
-       block_args = true;
-+=======
-+  bool block_blacklisted_args = false;
-+  for (int i = 0; i < argc; ++i) {
-+    if (argv[i] == dashdash)
-+      break;
-+    if (block_blacklisted_args) {
-+      if (IsBlacklistedArg(argv[i]))
-+        return false;
-+    } else if (IsUrlArg(argv[i])) {
-+      block_blacklisted_args = true;
-+>>>>>>> .their
-     }
-   }
-   return true;
-added in both
-  our    100644 2c0acc1648ff3b4bc574f000643069f8ef8e94bb atom/app/command_line_args.h
-  their  100644 1f5fd756868898e7a304c754d89625059d36441f atom/app/command_line_args.h
-@@ -14,3 +14,7 @@
- }  // namespace atom
- 
- #endif  // ATOM_APP_COMMAND_LINE_ARGS_H_
-+<<<<<<< .our
-+=======
-+
-+>>>>>>> .their
-changed in both
-  base   100644 1534f648498f991dbf16f53a1f8b7f816fc8fd27 atom/browser/api/atom_api_app.cc
-  our    100644 089a2b63d1bae3afebea925582a3aac81ddeaa4f atom/browser/api/atom_api_app.cc
-  their  100644 b3d79045c0d482495618f47801492d8f04c81af2 atom/browser/api/atom_api_app.cc
-changed in both
-  base   100644 4bd88a5a43c03ceba308ec06fdf0cbadeddcaae3 atom/browser/api/atom_api_browser_view.cc
-  our    100644 bd83208694c61c4d7c43ce4be26939c2682b2a13 atom/browser/api/atom_api_browser_view.cc
-  their  100644 41f0e99cdd79bf1ad2c4c8c0db5aaa97ac5e1297 atom/browser/api/atom_api_browser_view.cc
-changed in both
-  base   100644 79feb7520b0d8209b1b024f17261161a350f09a3 atom/browser/api/atom_api_desktop_capturer.cc
-  our    100644 135b4edd11048a4635f9017f569f4b4ae644a09c atom/browser/api/atom_api_desktop_capturer.cc
-  their  100644 7a7c41503e22572cdfddc4be915d1f7ab2b77ef7 atom/browser/api/atom_api_desktop_capturer.cc
-@@ -62,6 +62,7 @@
-                        const gfx::Size& thumbnail_size,
-                        atom::api::DesktopCapturer* cap) {
- #if defined(OS_WIN)
-+<<<<<<< .our
-   if (content::desktop_capture::CreateDesktopCaptureOptions()
-       .allow_directx_capturer()) {
-     // DxgiDuplicatorController should be alive in this scope according to
-@@ -71,6 +72,18 @@
-         webrtc::ScreenCapturerWinDirectx::IsSupported();
-   }
- #endif  // defined(OS_WIN)
-+=======
-+  // On windows, desktop effects (e.g. Aero) will be disabled when the Desktop
-+  // capture API is active by default.
-+  // We keep the desktop effects in most times. Howerver, the screen still
-+  // fickers when the API is capturing the window due to limitation of current
-+  // implemetation. This is a known and wontFix issue in webrtc (see:
-+  // http://code.google.com/p/webrtc/issues/detail?id=3373)
-+  options.set_disable_effects(false);
-+  options.set_allow_directx_capturer(true);
-+#endif
-+
-+>>>>>>> .their
-   std::unique_ptr<webrtc::DesktopCapturer> screen_capturer(
-       capture_screen ? content::desktop_capture::CreateScreenCapturer()
-                      : nullptr);
-changed in both
-  base   100644 59fdac39491ceaae7340d08164c091dafdb8a388 atom/browser/api/atom_api_menu_views.cc
-  our    100644 3da7dc2842fa4561e037aa67f290d0cc6ca71014 atom/browser/api/atom_api_menu_views.cc
-  their  100644 66adeb8271d8720aad9f9974242f26db583e10cc atom/browser/api/atom_api_menu_views.cc
-@@ -19,11 +19,16 @@
- 
- MenuViews::~MenuViews() = default;
- 
-+<<<<<<< .our
- void MenuViews::PopupAt(TopLevelWindow* window,
-                         int x,
-                         int y,
-                         int positioning_item,
-                         const base::Closure& callback) {
-+=======
-+void MenuViews::PopupAt(
-+    Window* window, int x, int y, int positioning_item, bool async) {
-+>>>>>>> .their
-   auto* native_window = static_cast<NativeWindowViews*>(window->window());
-   if (!native_window)
-     return;
-@@ -45,12 +50,24 @@
-   // Show the menu.
-   int32_t window_id = window->weak_map_id();
-   auto close_callback = base::Bind(
-+<<<<<<< .our
-       &MenuViews::OnClosed, weak_factory_.GetWeakPtr(), window_id, callback);
-   menu_runners_[window_id] =
-       std::make_unique<MenuRunner>(model(), flags, close_callback);
-   menu_runners_[window_id]->RunMenuAt(
-       native_window->widget(), NULL, gfx::Rect(location, gfx::Size()),
-       views::MENU_ANCHOR_TOPLEFT, ui::MENU_SOURCE_MOUSE);
-+=======
-+      &MenuViews::ClosePopupAt, weak_factory_.GetWeakPtr(), window_id);
-+  menu_runners_[window_id] = std::unique_ptr<MenuRunner>(new MenuRunner(
-+      model(), flags, close_callback));
-+  ignore_result(menu_runners_[window_id]->RunMenuAt(
-+      native_window->widget(),
-+      NULL,
-+      gfx::Rect(location, gfx::Size()),
-+      views::MENU_ANCHOR_TOPLEFT,
-+      ui::MENU_SOURCE_MOUSE));
-+>>>>>>> .their
- }
- 
- void MenuViews::ClosePopupAt(int32_t window_id) {
-changed in both
-  base   100644 40dc30600f936e9a89fc8b201e1a9816a94b721e atom/browser/api/atom_api_protocol.h
-  our    100644 deaf680c996ce0dd74af45e7c7c95f711884bb07 atom/browser/api/atom_api_protocol.h
-  their  100644 dfc32be6bc57cb9c9c18803ff13e2045ce7f6caa atom/browser/api/atom_api_protocol.h
-changed in both
-  base   100644 7df905a8ee9decfc0406db717c0149655e399234 atom/browser/api/atom_api_web_contents.cc
-  our    100644 20a1ac2e672f08ffea528b6e094ba530ff8083d1 atom/browser/api/atom_api_web_contents.cc
-  their  100644 1aa7878fd435a355575cac8034a19e40e021c422 atom/browser/api/atom_api_web_contents.cc
-@@ -280,7 +280,12 @@
- 
- // Called when CapturePage is done.
- void OnCapturePageDone(const base::Callback<void(const gfx::Image&)>& callback,
-+<<<<<<< .our
-                        const SkBitmap& bitmap) {
-+=======
-+                       const SkBitmap& bitmap,
-+                       content::ReadbackResponse response) {
-+>>>>>>> .their
-   // Hack to enable transparency in captured image
-   // TODO(nitsakh) Remove hack once fixed in chromium
-   const_cast<SkBitmap&>(bitmap).setAlphaType(kPremul_SkAlphaType);
-@@ -397,8 +402,8 @@
-     options.Get("transparent", &transparent);
- 
-     content::WebContents::CreateParams params(session->browser_context());
--    auto* view = new OffScreenWebContentsView(
--        transparent, base::Bind(&WebContents::OnPaint, base::Unretained(this)));
-+    auto* view = new OffScreenWebContentsView(transparent,
-+        base::Bind(&WebContents::OnPaint, base::Unretained(this)));
-     params.view = view;
-     params.delegate_view = view;
- 
-@@ -1742,7 +1747,12 @@
-     return;
- 
- #if defined(ENABLE_OSR)
-+<<<<<<< .our
-   auto* osr_wcv = GetOffScreenWebContentsView();
-+=======
-+  const auto* wc_impl = static_cast<content::WebContentsImpl*>(web_contents());
-+  auto* osr_wcv = static_cast<OffScreenWebContentsView*>(wc_impl->GetView());
-+>>>>>>> .their
-   if (osr_wcv)
-     osr_wcv->SetPainting(true);
- #endif
-@@ -1753,7 +1763,12 @@
-     return;
- 
- #if defined(ENABLE_OSR)
-+<<<<<<< .our
-   auto* osr_wcv = GetOffScreenWebContentsView();
-+=======
-+  const auto* wc_impl = static_cast<content::WebContentsImpl*>(web_contents());
-+  auto* osr_wcv = static_cast<OffScreenWebContentsView*>(wc_impl->GetView());
-+>>>>>>> .their
-   if (osr_wcv)
-     osr_wcv->SetPainting(false);
- #endif
-@@ -1764,7 +1779,13 @@
-     return false;
- 
- #if defined(ENABLE_OSR)
-+<<<<<<< .our
-   auto* osr_wcv = GetOffScreenWebContentsView();
-+=======
-+  const auto* wc_impl = static_cast<content::WebContentsImpl*>(web_contents());
-+  auto* osr_wcv = static_cast<OffScreenWebContentsView*>(wc_impl->GetView());
-+
-+>>>>>>> .their
-   return osr_wcv && osr_wcv->IsPainting();
- #else
-   return false;
-@@ -1776,7 +1797,13 @@
-     return;
- 
- #if defined(ENABLE_OSR)
-+<<<<<<< .our
-   auto* osr_wcv = GetOffScreenWebContentsView();
-+=======
-+  const auto* wc_impl = static_cast<content::WebContentsImpl*>(web_contents());
-+  auto* osr_wcv = static_cast<OffScreenWebContentsView*>(wc_impl->GetView());
-+
-+>>>>>>> .their
-   if (osr_wcv)
-     osr_wcv->SetFrameRate(frame_rate);
- #endif
-@@ -1787,7 +1814,13 @@
-     return 0;
- 
- #if defined(ENABLE_OSR)
-+<<<<<<< .our
-   auto* osr_wcv = GetOffScreenWebContentsView();
-+=======
-+  const auto* wc_impl = static_cast<content::WebContentsImpl*>(web_contents());
-+  auto* osr_wcv = static_cast<OffScreenWebContentsView*>(wc_impl->GetView());
-+
-+>>>>>>> .their
-   return osr_wcv ? osr_wcv->GetFrameRate() : 0;
- #else
-   return 0;
-@@ -1871,6 +1904,7 @@
-   return mate::ConvertToV8(isolate, *web_preferences->preference());
- }
- 
-+<<<<<<< .our
- v8::Local<v8::Value> WebContents::GetLastWebPreferences(
-     v8::Isolate* isolate) const {
-   auto* web_preferences = WebContentsPreferences::From(web_contents());
-@@ -1880,6 +1914,17 @@
- }
- 
- v8::Local<v8::Value> WebContents::GetOwnerBrowserWindow() const {
-+=======
-+v8::Local<v8::Value> WebContents::GetLastWebPreferences(v8::Isolate* isolate) {
-+  WebContentsPreferences* web_preferences =
-+      WebContentsPreferences::FromWebContents(web_contents());
-+  if (!web_preferences)
-+    return v8::Null(isolate);
-+  return mate::ConvertToV8(isolate, *web_preferences->last_web_preferences());
-+}
-+
-+v8::Local<v8::Value> WebContents::GetOwnerBrowserWindow() {
-+>>>>>>> .their
-   if (owner_window())
-     return BrowserWindow::From(isolate(), owner_window());
-   else
-changed in both
-  base   100644 ffeb8f7241802ba1bd188752b3b3ef9a81c7dd66 atom/browser/api/atom_api_web_contents.h
-  our    100644 7939f8268aa8c3371623e0c15f3b6001d7f1efa4 atom/browser/api/atom_api_web_contents.h
-  their  100644 a5b96adb94fa384f8ba50737be07f05f2074580f atom/browser/api/atom_api_web_contents.h
-@@ -234,8 +234,13 @@
-   v8::Local<v8::Value> GetPreloadPath(v8::Isolate* isolate) const;
- 
-   // Returns the web preferences of current WebContents.
-+<<<<<<< .our
-   v8::Local<v8::Value> GetWebPreferences(v8::Isolate* isolate) const;
-   v8::Local<v8::Value> GetLastWebPreferences(v8::Isolate* isolate) const;
-+=======
-+  v8::Local<v8::Value> GetWebPreferences(v8::Isolate* isolate);
-+  v8::Local<v8::Value> GetLastWebPreferences(v8::Isolate* isolate);
-+>>>>>>> .their
- 
-   // Returns the owner window.
-   v8::Local<v8::Value> GetOwnerBrowserWindow() const;
-removed in local
-  base   100644 bb7060adb76d9f7993f18774be599c2bd604cb9f atom/browser/api/atom_api_window.cc
-  their  100644 5a135ea522d56f89a8d56f41814ca483040ed62f atom/browser/api/atom_api_window.cc
-changed in both
-  base   100644 61c97f2c35ce3c9e76cee59f9e4becd9649c993b atom/browser/atom_browser_client.cc
-  our    100644 57c4ee582405e6d501ec23940ccb10689ecd64a1 atom/browser/atom_browser_client.cc
-  their  100644 49c8656c882a5aedf27649504c65d4f64f0ae416 atom/browser/atom_browser_client.cc
-@@ -296,6 +296,7 @@
-     base::CommandLine* command_line,
-     int process_id) {
-   // Make sure we're about to launch a known executable
-+<<<<<<< .our
-   {
-     base::FilePath child_path;
-     PathService::Get(content::CHILD_PROCESS_EXE, &child_path);
-@@ -303,6 +304,11 @@
-     base::ThreadRestrictions::ScopedAllowIO allow_io;
-     CHECK(base::MakeAbsoluteFilePath(command_line->GetProgram()) == child_path);
-   }
-+=======
-+  base::FilePath child_path;
-+  PathService::Get(content::CHILD_PROCESS_EXE, &child_path);
-+  CHECK(base::MakeAbsoluteFilePath(command_line->GetProgram()) == child_path);
-+>>>>>>> .their
- 
-   std::string process_type =
-       command_line->GetSwitchValueASCII(::switches::kProcessType);
-changed in both
-  base   100644 7c154b60b00e25c42847ceefb98723b50ea03dd0 atom/browser/native_browser_view.h
-  our    100644 56937e4c8c69e3605d2b6cc71a0877b74ff4e83d atom/browser/native_browser_view.h
-  their  100644 cab6980fa2cf035c1a5ca6b4aee822a0ee604fd4 atom/browser/native_browser_view.h
-changed in both
-  base   100644 17b0a1ee9006dd70888165a9209076fd7065f3cc atom/browser/native_browser_view_mac.mm
-  our    100644 0416e26e89f1e0f37366ef1798b4359da0729225 atom/browser/native_browser_view_mac.mm
-  their  100644 86df632638ef7772270569824515b251470d0c08 atom/browser/native_browser_view_mac.mm
-changed in both
-  base   100644 08a8123bcaef664aa660d1bea6d6baf783b78e89 atom/browser/native_browser_view_views.cc
-  our    100644 6414005a1e40d80ae86102b12edee0255cab9adb atom/browser/native_browser_view_views.cc
-  their  100644 3e7df488c73e98ba2870c913542f478865e15575 atom/browser/native_browser_view_views.cc
-changed in both
-  base   100644 5dcda13447cde098fccaf8782fefb97d861d47f4 atom/browser/native_browser_view_views.h
-  our    100644 8f8e860292baddad1156c50ae7cfaa0fd6e87d99 atom/browser/native_browser_view_views.h
-  their  100644 abf47178302ad7527c1640a3f41492f871f137e5 atom/browser/native_browser_view_views.h
-changed in both
-  base   100644 1e02a37fc07da1616026915cea6c61f467a4751d atom/browser/native_window.h
-  our    100644 35b67e2dd230692c415a32aae5f0a5e99ab74ac0 atom/browser/native_window.h
-  their  100644 d2e1ff876c1678dc2749b5d98a8cc46e948bb2dc atom/browser/native_window.h
-@@ -221,6 +221,8 @@
-       content::WebContents*,
-       const content::NativeWebKeyboardEvent& event) {}
- 
-+  virtual void UpdateDraggableRegionViews() {}
-+
-   // Public API used by platform-dependent delegates and observers to send UI
-   // related notifications.
-   void NotifyWindowRequestPreferredWith(int* width);
-changed in both
-  base   100644 24d9a0aab87837e39a4c1e1368cfb3a724dd0410 atom/browser/native_window_mac.h
-  our    100644 44a78198f44cdba9875e3fb27c8e2c87eaa6f33b atom/browser/native_window_mac.h
-  their  100644 e0c548a2d616d90c5ac3de0a879bcd7943e503b0 atom/browser/native_window_mac.h
-@@ -130,8 +130,19 @@
-   gfx::Rect ContentBoundsToWindowBounds(const gfx::Rect& bounds) const override;
-   gfx::Rect WindowBoundsToContentBounds(const gfx::Rect& bounds) const override;
- 
-+<<<<<<< .our
-   // Use a custom content view instead of Chromium's BridgedContentView.
-   void OverrideNSWindowContentView();
-+=======
-+  // content::WebContentsObserver:
-+  void RenderViewHostChanged(content::RenderViewHost* old_host,
-+                             content::RenderViewHost* new_host) override;
-+
-+  // Refresh the DraggableRegion views.
-+  void UpdateDraggableRegionViews() override {
-+    UpdateDraggableRegionViews(draggable_regions_);
-+  }
-+>>>>>>> .their
- 
-   // Set the attribute of NSWindow while work around a bug of zoom button.
-   void SetStyleMask(bool on, NSUInteger flag);
-changed in both
-  base   100644 59301fc7a982605ca204bb541410ac74a872e127 atom/browser/native_window_mac.mm
-  our    100644 004263ec127709067e903ffbf31003b8844226b4 atom/browser/native_window_mac.mm
-  their  100644 1db35693d8ae2b9ade1d13d0f28631ee5b8417cc atom/browser/native_window_mac.mm
-@@ -1387,6 +1387,7 @@
-     [parent->GetNativeWindow() addChildWindow:window_ ordered:NSWindowAbove];
- }
- 
-+<<<<<<< .our
- void NativeWindowMac::ShowWindowButton(NSWindowButton button) {
-   auto view = [window_ standardWindowButton:button];
-   [view.superview addSubview:view positioned:NSWindowAbove relativeTo:nil];
-@@ -1395,6 +1396,35 @@
- void NativeWindowMac::SetForwardMouseMessages(bool forward) {
-   [window_ setAcceptsMouseMovedEvents:forward];
- }
-+=======
-+  // Remove all ControlRegionViews that are added last time.
-+  // Note that [webView subviews] returns the view's mutable internal array and
-+  // it should be copied to avoid mutating the original array while enumerating
-+  // it.
-+  base::scoped_nsobject<NSArray> subviews([[webView subviews] copy]);
-+  for (NSView* subview in subviews.get())
-+    if ([subview isKindOfClass:[ControlRegionView class]])
-+      [subview removeFromSuperview];
-+
-+  // Draggable regions is implemented by having the whole web view draggable
-+  // (mouseDownCanMoveWindow) and overlaying regions that are not draggable.
-+  std::vector<gfx::Rect> drag_exclude_rects =
-+      CalculateNonDraggableRegions(regions, webViewWidth, webViewHeight);
-+
-+  if (browser_view_) {
-+    browser_view_->UpdateDraggableRegions(drag_exclude_rects);
-+  }
-+
-+  // Create and add a ControlRegionView for each region that needs to be
-+  // excluded from the dragging.
-+  for (const auto& rect : drag_exclude_rects) {
-+    base::scoped_nsobject<NSView> controlRegion(
-+        [[ControlRegionView alloc] initWithFrame:NSZeroRect]);
-+    [controlRegion setFrame:NSMakeRect(rect.x(), webViewHeight - rect.bottom(),
-+                                       rect.width(), rect.height())];
-+    [webView addSubview:controlRegion];
-+  }
-+>>>>>>> .their
- 
- void NativeWindowMac::OverrideNSWindowContentView() {
-   // When using `views::Widget` to hold WebContents, Chromium would use
-changed in both
-  base   100644 0ae5092b4397fbf999ada9007eaadcd3e9c4b43a atom/browser/native_window_views.cc
-  our    100644 0dba39942f92d54ba34db7709b73012055680d94 atom/browser/native_window_views.cc
-  their  100644 26f1a926ac94a6838eeba2208a15e37ebd1e4019 atom/browser/native_window_views.cc
-@@ -55,6 +55,7 @@
- #include "atom/browser/ui/views/win_frame_view.h"
- #include "atom/browser/ui/win/atom_desktop_native_widget_aura.h"
- #include "atom/browser/ui/win/atom_desktop_window_tree_host_win.h"
-+#include "content/public/browser/gpu_data_manager.h"
- #include "skia/ext/skia_utils_win.h"
- #include "ui/base/win/shell.h"
- #include "ui/display/display.h"
-@@ -247,7 +248,16 @@
-     ::SetWindowLong(GetAcceleratedWidget(), GWL_STYLE, frame_style);
-   }
- 
-+  bool hardware_accelerated =
-+    content::GpuDataManager::GetInstance()->HardwareAccelerationEnabled();
-   LONG ex_style = ::GetWindowLong(GetAcceleratedWidget(), GWL_EXSTYLE);
-+<<<<<<< .our
-+=======
-+  // Window without thick frame has to have WS_EX_COMPOSITED style when GPU
-+  // acceleration is enabled.
-+  if (!thick_frame_ && hardware_accelerated)
-+    ex_style |= WS_EX_COMPOSITED;
-+>>>>>>> .their
-   if (window_type == "toolbar")
-     ex_style |= WS_EX_TOOLWINDOW;
-   ::SetWindowLong(GetAcceleratedWidget(), GWL_EXSTYLE, ex_style);
-@@ -1237,9 +1247,141 @@
- void NativeWindowViews::HandleKeyboardEvent(
-     content::WebContents*,
-     const content::NativeWebKeyboardEvent& event) {
-+<<<<<<< .our
-   keyboard_event_handler_->HandleKeyboardEvent(event,
-                                                root_view_->GetFocusManager());
-   root_view_->HandleKeyEvent(event);
-+=======
-+  keyboard_event_handler_->HandleKeyboardEvent(event, GetFocusManager());
-+
-+  if (!menu_bar_)
-+    return;
-+
-+  // Show accelerator when "Alt" is pressed.
-+  if (menu_bar_visible_ && IsAltKey(event))
-+    menu_bar_->SetAcceleratorVisibility(
-+        event.GetType() == blink::WebInputEvent::kRawKeyDown);
-+
-+  // Show the submenu when "Alt+Key" is pressed.
-+  if (event.GetType() == blink::WebInputEvent::kRawKeyDown &&
-+      !IsAltKey(event) && IsAltModifier(event)) {
-+    if (!menu_bar_visible_ &&
-+        (menu_bar_->GetAcceleratorIndex(event.windows_key_code) != -1))
-+      SetMenuBarVisibility(true);
-+    menu_bar_->ActivateAccelerator(event.windows_key_code);
-+    return;
-+  }
-+
-+  if (!menu_bar_autohide_)
-+    return;
-+
-+  // Toggle the menu bar only when a single Alt is released.
-+  if (event.GetType() == blink::WebInputEvent::kRawKeyDown && IsAltKey(event)) {
-+    // When a single Alt is pressed:
-+    menu_bar_alt_pressed_ = true;
-+  } else if (event.GetType() == blink::WebInputEvent::kKeyUp &&
-+             IsAltKey(event) && menu_bar_alt_pressed_) {
-+    // When a single Alt is released right after a Alt is pressed:
-+    menu_bar_alt_pressed_ = false;
-+    SetMenuBarVisibility(!menu_bar_visible_);
-+  } else {
-+    // When any other keys except single Alt have been pressed/released:
-+    menu_bar_alt_pressed_ = false;
-+  }
-+}
-+
-+void NativeWindowViews::ShowAutofillPopup(
-+    content::RenderFrameHost* frame_host,
-+    content::WebContents* web_contents,
-+    const gfx::RectF& bounds,
-+    const std::vector<base::string16>& values,
-+    const std::vector<base::string16>& labels) {
-+  bool is_offsceen = false;
-+  bool is_embedder_offscreen = false;
-+
-+  auto* web_contents_preferences =
-+      WebContentsPreferences::FromWebContents(web_contents);
-+  if (web_contents_preferences) {
-+    const auto* web_preferences = web_contents_preferences->web_preferences();
-+
-+    web_preferences->GetBoolean("offscreen", &is_offsceen);
-+    int guest_instance_id = 0;
-+    web_preferences->GetInteger(options::kGuestInstanceID, &guest_instance_id);
-+
-+    if (guest_instance_id) {
-+      auto manager = WebViewManager::GetWebViewManager(web_contents);
-+      if (manager) {
-+        auto embedder = manager->GetEmbedder(guest_instance_id);
-+        if (embedder) {
-+          is_embedder_offscreen = WebContentsPreferences::IsPreferenceEnabled(
-+              "offscreen", embedder);
-+        }
-+      }
-+    }
-+  }
-+
-+  autofill_popup_->CreateView(
-+      frame_host,
-+      is_offsceen || is_embedder_offscreen,
-+      widget(),
-+      bounds);
-+  autofill_popup_->SetItems(values, labels);
-+  autofill_popup_->UpdatePopupBounds(menu_bar_visible_ ? 0 : kMenuBarHeight);
-+}
-+
-+void NativeWindowViews::HideAutofillPopup(
-+    content::RenderFrameHost* frame_host) {
-+  autofill_popup_->Hide();
-+}
-+
-+void NativeWindowViews::Layout() {
-+  const auto size = GetContentsBounds().size();
-+  const auto menu_bar_bounds =
-+      menu_bar_visible_ ? gfx::Rect(0, 0, size.width(), kMenuBarHeight)
-+                        : gfx::Rect();
-+  if (menu_bar_) {
-+    menu_bar_->SetBoundsRect(menu_bar_bounds);
-+  }
-+
-+  if (web_view_) {
-+    web_view_->SetBoundsRect(
-+        gfx::Rect(0, menu_bar_bounds.height(), size.width(),
-+                  size.height() - menu_bar_bounds.height()));
-+  }
-+
-+  if (autofill_popup_.get())
-+    autofill_popup_->UpdatePopupBounds(menu_bar_visible_ ? 0 : kMenuBarHeight);
-+}
-+
-+gfx::Size NativeWindowViews::GetMinimumSize() const {
-+  return NativeWindow::GetMinimumSize();
-+}
-+
-+gfx::Size NativeWindowViews::GetMaximumSize() const {
-+  return NativeWindow::GetMaximumSize();
-+}
-+
-+bool NativeWindowViews::AcceleratorPressed(const ui::Accelerator& accelerator) {
-+  return accelerator_util::TriggerAcceleratorTableCommand(
-+      &accelerator_table_, accelerator);
-+}
-+
-+void NativeWindowViews::RegisterAccelerators(AtomMenuModel* menu_model) {
-+  // Clear previous accelerators.
-+  views::FocusManager* focus_manager = GetFocusManager();
-+  accelerator_table_.clear();
-+  focus_manager->UnregisterAccelerators(this);
-+
-+  // Register accelerators with focus manager.
-+  accelerator_util::GenerateAcceleratorTable(&accelerator_table_, menu_model);
-+  accelerator_util::AcceleratorTable::const_iterator iter;
-+  for (iter = accelerator_table_.begin();
-+       iter != accelerator_table_.end();
-+       ++iter) {
-+    focus_manager->RegisterAccelerator(
-+        iter->first, ui::AcceleratorManager::kNormalPriority, this);
-+  }
-+>>>>>>> .their
- }
- 
- ui::WindowShowState NativeWindowViews::GetRestoredState() {
-changed in both
-  base   100644 ad02ed620d6d94ba15e7f8d154063a0968178110 atom/browser/net/asar/url_request_asar_job.cc
-  our    100644 85eb2e1dd142b6d64aafb5350ae47603db989e8f atom/browser/net/asar/url_request_asar_job.cc
-  their  100644 5c4472a315911a6c2da533b35d489f8f9da5cd53 atom/browser/net/asar/url_request_asar_job.cc
-@@ -243,6 +243,24 @@
-     meta_info->mime_type_result = net::GetWellKnownMimeTypeFromExtension(
-         file_extension.substr(1), &meta_info->mime_type);
-   }
-+<<<<<<< .our
-+=======
-+
-+  // We use GetWellKnownMimeTypeFromExtension() to ensure that configurations
-+  // that may have been set by other programs on a user's machine don't affect
-+  // the mime type returned (in particular, JS should always be
-+  // (application/javascript). See https://crbug.com/797712. Using an accurate
-+  // mime type is necessary at least for modules and sw, which enforce strict
-+  // mime type requirements.
-+  // TODO(deepak1556): Revert this when sw support is removed for file scheme.
-+  base::FilePath::StringType file_extension = file_path.Extension();
-+  if (file_extension.empty()) {
-+    meta_info->mime_type_result = false;
-+  } else {
-+    meta_info->mime_type_result = net::GetWellKnownMimeTypeFromExtension(
-+        file_extension.substr(1), &meta_info->mime_type);
-+  }
-+>>>>>>> .their
- }
- 
- void URLRequestAsarJob::DidFetchMetaInfo(const FileMetaInfo* meta_info) {
-changed in both
-  base   100644 9400f361f11a2e709b4cb0837ff638219aa519a7 atom/browser/net/atom_url_request.cc
-  our    100644 5ffbfd65a48b4459b2ebca66a5c2259f18ed80a8 atom/browser/net/atom_url_request.cc
-  their  100644 f259889edab7c64ac8c682e2bd68a778463135e0 atom/browser/net/atom_url_request.cc
-changed in both
-  base   100644 79dd80b586600cb5e3b98d03f69f9bd8aed4a526 atom/browser/net/atom_url_request_job_factory.cc
-  our    100644 7047f7a6f7f83e782121f2a849a621fb836ad534 atom/browser/net/atom_url_request_job_factory.cc
-  their  100644 20680adf7da826e94e555865d4f023d8a9217eab atom/browser/net/atom_url_request_job_factory.cc
-changed in both
-  base   100644 56f979c2ff60b06aea1c62f5cefa78b1a9df6e21 atom/browser/net/atom_url_request_job_factory.h
-  our    100644 c0e26568fdea57dd473f917d597624ab10efe129 atom/browser/net/atom_url_request_job_factory.h
-  their  100644 a560839b68e0ccd00f414deff245bc237de9deba atom/browser/net/atom_url_request_job_factory.h
-changed in both
-  base   100644 be3d76bc047d1723eaed3db1bfac827baa063009 atom/browser/node_debugger.cc
-  our    100644 56e68e2b8b817aae2786775e3977977474420cc2 atom/browser/node_debugger.cc
-  their  100644 a0d0b0dc42b913937bedbb08d1e344dc00ba26c7 atom/browser/node_debugger.cc
-@@ -31,11 +31,27 @@
- #endif
-   }
- 
-+<<<<<<< .our
-   // Set process._debugWaitConnect if --inspect-brk was specified to stop
-   // the debugger on the first line
-   if (options.wait_for_connect()) {
-     mate::Dictionary process(env_->isolate(), env_->process_object());
-     process.Set("_breakFirstLine", true);
-+=======
-+  if (options.inspector_enabled()) {
-+    // Use custom platform since the gin platform does not work correctly
-+    // with node's inspector agent
-+    platform_.reset(v8::platform::CreateDefaultPlatform());
-+
-+    // Set process._debugWaitConnect if --inspect-brk was specified to stop
-+    // the debugger on the first line
-+    if (options.wait_for_connect()) {
-+      mate::Dictionary process(env_->isolate(), env_->process_object());
-+      process.Set("_breakFirstLine", true);
-+    }
-+
-+    inspector->Start(platform_.get(), nullptr, options);
-+>>>>>>> .their
-   }
- 
-   inspector->Start(static_cast<node::NodePlatform*>(platform), nullptr,
-changed in both
-  base   100644 42d3b7792e3b17eb2b1c508f2e433e9dbd945452 atom/browser/osr/osr_render_widget_host_view.cc
-  our    100644 4a2a0747fe2e6bf38c8999b80dbfea31e52a17fd atom/browser/osr/osr_render_widget_host_view.cc
-  their  100644 80a13ef96656b3fe7820b8412aacad0b005526e1 atom/browser/osr/osr_render_widget_host_view.cc
-@@ -259,12 +259,29 @@
-       native_window_(native_window),
-       transparent_(transparent),
-       callback_(callback),
-+<<<<<<< .our
-       frame_rate_(frame_rate),
-+=======
-+      parent_callback_(nullptr),
-+      frame_rate_(frame_rate),
-+      frame_rate_threshold_us_(0),
-+      last_time_(base::Time::Now()),
-+>>>>>>> .their
-       scale_factor_(kDefaultScaleFactor),
-       size_(native_window->GetSize()),
-       painting_(painting),
-       is_showing_(!render_widget_host_->is_hidden()),
-+<<<<<<< .our
-       mouse_wheel_phase_handler_(render_widget_host_, this),
-+=======
-+      is_destroyed_(false),
-+      popup_position_(gfx::Rect()),
-+      hold_resize_(false),
-+      pending_resize_(false),
-+      paint_callback_running_(false),
-+      renderer_compositor_frame_sink_(nullptr),
-+      background_color_(SkColor()),
-+>>>>>>> .their
-       weak_ptr_factory_(this) {
-   DCHECK(render_widget_host_);
-   bool is_guest_view_hack = parent_host_view_ != nullptr;
-@@ -292,9 +309,13 @@
-   compositor_.reset(
-       new ui::Compositor(context_factory_private->AllocateFrameSinkId(),
-                          content::GetContextFactory(), context_factory_private,
-+<<<<<<< .our
-                          base::ThreadTaskRunnerHandle::Get(),
-                          features::IsSurfaceSynchronizationEnabled(),
-                          false /* enable_pixel_canvas */));
-+=======
-+                         base::ThreadTaskRunnerHandle::Get()));
-+>>>>>>> .their
-   compositor_->SetAcceleratedWidget(gfx::kNullAcceleratedWidget);
-   compositor_->SetRootLayer(root_layer_.get());
- #endif
-@@ -713,8 +734,18 @@
-   }
- 
-   return new OffScreenRenderWidgetHostView(
-+<<<<<<< .our
-       transparent_, true, embedder_host_view->GetFrameRate(), callback_,
-       render_widget_host, embedder_host_view, native_window_);
-+=======
-+      transparent_,
-+      true,
-+      embedder_host_view->GetFrameRate(),
-+      callback_,
-+      render_widget_host,
-+      embedder_host_view,
-+      native_window_);
-+>>>>>>> .their
- }
- 
- #if !defined(OS_MACOSX)
-@@ -1204,7 +1235,11 @@
- 
-   SetupFrameRate(true);
- 
-+<<<<<<< .our
-   for (auto* guest_host_view : guest_host_views_)
-+=======
-+  for (auto guest_host_view : guest_host_views_)
-+>>>>>>> .their
-     guest_host_view->SetFrameRate(frame_rate);
- }
- 
-@@ -1233,10 +1268,15 @@
- 
-   frame_rate_threshold_us_ = 1000000 / frame_rate_;
- 
-+<<<<<<< .our
-   if (GetCompositor()) {
-     GetCompositor()->SetAuthoritativeVSyncInterval(
-         base::TimeDelta::FromMicroseconds(frame_rate_threshold_us_));
-   }
-+=======
-+  GetCompositor()->SetAuthoritativeVSyncInterval(
-+      base::TimeDelta::FromMicroseconds(frame_rate_threshold_us_));
-+>>>>>>> .their
- 
-   if (copy_frame_generator_.get()) {
-     copy_frame_generator_->set_frame_rate_threshold_us(
-changed in both
-  base   100644 23549838c335b37b479b2f154eaab29d86abbc4a atom/browser/osr/osr_render_widget_host_view.h
-  our    100644 b81f6310f864c00fea50b1aac49dc89173eaa302 atom/browser/osr/osr_render_widget_host_view.h
-  their  100644 ed0c46f6b41a044e9f4f224b3fe9322efe1937b3 atom/browser/osr/osr_render_widget_host_view.h
-@@ -317,6 +317,8 @@
-   viz::LocalSurfaceId local_surface_id_;
-   viz::ParentLocalSurfaceIdAllocator local_surface_id_allocator_;
- 
-+  bool paint_callback_running_;
-+
-   std::unique_ptr<ui::Layer> root_layer_;
-   std::unique_ptr<ui::Compositor> compositor_;
-   std::unique_ptr<content::DelegatedFrameHost> delegated_frame_host_;
-changed in both
-  base   100644 0e10abf6a034ab604f51553eb905b18e18f45552 atom/browser/osr/osr_web_contents_view.cc
-  our    100644 c8223df0d8c6f3436d323059686e42684ff98462 atom/browser/osr/osr_web_contents_view.cc
-  their  100644 4cbc6a5c42f9762b81fc4d601ebb534dedcd4914 atom/browser/osr/osr_web_contents_view.cc
-@@ -13,9 +13,18 @@
- namespace atom {
- 
- OffScreenWebContentsView::OffScreenWebContentsView(
-+<<<<<<< .our
-     bool transparent,
-     const OnPaintCallback& callback)
-     : transparent_(transparent), callback_(callback) {
-+=======
-+    bool transparent, const OnPaintCallback& callback)
-+    : transparent_(transparent),
-+      painting_(true),
-+      frame_rate_(60),
-+      callback_(callback),
-+      web_contents_(nullptr) {
-+>>>>>>> .their
- #if defined(OS_MACOSX)
-   PlatformCreate();
- #endif
-@@ -104,8 +113,18 @@
- 
-   auto* relay = NativeWindowRelay::FromWebContents(web_contents_);
-   return new OffScreenRenderWidgetHostView(
-+<<<<<<< .our
-       transparent_, painting_, GetFrameRate(), callback_, render_widget_host,
-       nullptr, relay->window.get());
-+=======
-+      transparent_,
-+      painting_,
-+      GetFrameRate(),
-+      callback_,
-+      render_widget_host,
-+      nullptr,
-+      relay->window.get());
-+>>>>>>> .their
- }
- 
- content::RenderWidgetHostViewBase*
-@@ -124,8 +143,18 @@
-               : web_contents_impl->GetRenderWidgetHostView());
- 
-   return new OffScreenRenderWidgetHostView(
-+<<<<<<< .our
-       transparent_, true, view->GetFrameRate(), callback_, render_widget_host,
-       view, relay->window.get());
-+=======
-+      transparent_,
-+      true,
-+      view->GetFrameRate(),
-+      callback_,
-+      render_widget_host,
-+      view,
-+      relay->window.get());
-+>>>>>>> .their
- }
- 
- void OffScreenWebContentsView::SetPageTitle(const base::string16& title) {}
-@@ -209,6 +238,42 @@
-   }
- }
- 
-+void OffScreenWebContentsView::SetPainting(bool painting) {
-+  auto* view = GetView();
-+  if (view != nullptr) {
-+    view->SetPainting(painting);
-+  } else {
-+    painting_ = painting;
-+  }
-+}
-+
-+bool OffScreenWebContentsView::IsPainting() const {
-+  auto* view = GetView();
-+  if (view != nullptr) {
-+    return view->IsPainting();
-+  } else {
-+    return painting_;
-+  }
-+}
-+
-+void OffScreenWebContentsView::SetFrameRate(int frame_rate) {
-+  auto* view = GetView();
-+  if (view != nullptr) {
-+    view->SetFrameRate(frame_rate);
-+  } else {
-+    frame_rate_ = frame_rate;
-+  }
-+}
-+
-+int OffScreenWebContentsView::GetFrameRate() const {
-+  auto* view = GetView();
-+  if (view != nullptr) {
-+    return view->GetFrameRate();
-+  } else {
-+    return frame_rate_;
-+  }
-+}
-+
- OffScreenRenderWidgetHostView* OffScreenWebContentsView::GetView() const {
-   if (web_contents_) {
-     return static_cast<OffScreenRenderWidgetHostView*>(
-changed in both
-  base   100644 ffb3b38619c4521f9947fe29e3871ed06d97978e atom/browser/osr/osr_web_contents_view.h
-  our    100644 206ab9dd3421af522a12aba615c6f040ba176ba4 atom/browser/osr/osr_web_contents_view.h
-  their  100644 788e55bf316d8069811fc026bf610ad231371fce atom/browser/osr/osr_web_contents_view.h
-@@ -83,8 +83,13 @@
-   OffScreenRenderWidgetHostView* GetView() const;
- 
-   const bool transparent_;
-+<<<<<<< .our
-   bool painting_ = true;
-   int frame_rate_ = 60;
-+=======
-+  bool painting_;
-+  int frame_rate_;
-+>>>>>>> .their
-   OnPaintCallback callback_;
- 
-   // Weak refs.
-changed in both
-  base   100644 9610d80693b1670f696f82812442419504d61454 atom/browser/relauncher.cc
-  our    100644 35c6785e3d87d21eaea27ad5818434d870326047 atom/browser/relauncher.cc
-  their  100644 9dfb6edd06661f302ca7498a2ba34f0ce70c938b atom/browser/relauncher.cc
-changed in both
-  base   100644 3313eba36bb903426778fac6cd18258a95fec677 atom/browser/resources/mac/Info.plist
-  our    100644 9094f0f7335edf833d51f688851e6a105de60433 atom/browser/resources/mac/Info.plist
-  their  100644 a9ccf0ef539f713789b79e05d83092561a96fc80 atom/browser/resources/mac/Info.plist
-@@ -17,9 +17,15 @@
-   <key>CFBundleIconFile</key>
-   <string>electron.icns</string>
-   <key>CFBundleVersion</key>
-+<<<<<<< .our
-   <string>4.0.0</string>
-   <key>CFBundleShortVersionString</key>
-   <string>4.0.0</string>
-+=======
-+  <string>1.8.8</string>
-+  <key>CFBundleShortVersionString</key>
-+  <string>1.8.8</string>
-+>>>>>>> .their
-   <key>LSApplicationCategoryType</key>
-   <string>public.app-category.developer-tools</string>
-   <key>LSMinimumSystemVersion</key>
-changed in both
-  base   100644 c349f99d712ff69960d35b18587ddb6c417f7cd5 atom/browser/resources/win/atom.rc
-  our    100644 c0bd831e8bddf10180f75cd40694831e2e98622d atom/browser/resources/win/atom.rc
-  their  100644 cd274bfcb0537b6f7830ef0a0fd6958ce06aec45 atom/browser/resources/win/atom.rc
-@@ -56,8 +56,13 @@
- //
- 
- VS_VERSION_INFO VERSIONINFO
-+<<<<<<< .our
-  FILEVERSION 4,0,0,20180821
-  PRODUCTVERSION 4,0,0,20180821
-+=======
-+ FILEVERSION 1,8,8,0
-+ PRODUCTVERSION 1,8,8,0
-+>>>>>>> .their
-  FILEFLAGSMASK 0x3fL
- #ifdef _DEBUG
-  FILEFLAGS 0x1L
-@@ -74,12 +79,20 @@
-         BEGIN
-             VALUE "CompanyName", "GitHub, Inc."
-             VALUE "FileDescription", "Electron"
-+<<<<<<< .our
-             VALUE "FileVersion", "4.0.0"
-+=======
-+            VALUE "FileVersion", "1.8.8"
-+>>>>>>> .their
-             VALUE "InternalName", "electron.exe"
-             VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
-             VALUE "OriginalFilename", "electron.exe"
-             VALUE "ProductName", "Electron"
-+<<<<<<< .our
-             VALUE "ProductVersion", "4.0.0"
-+=======
-+            VALUE "ProductVersion", "1.8.8"
-+>>>>>>> .their
-             VALUE "SquirrelAwareVersion", "1"
-         END
-     END
-changed in both
-  base   100644 276f782ce0d25b7c24fdf829b74074ead01cf7d8 atom/browser/ui/file_dialog_mac.mm
-  our    100644 18b18a8b240cda5512ae49e0afde5c749bdf75c0 atom/browser/ui/file_dialog_mac.mm
-  their  100644 295d9a57b895db9c6f66c64fd4d94d0d8f365e4c atom/browser/ui/file_dialog_mac.mm
-@@ -282,6 +282,7 @@
-   return true;
- }
- 
-+<<<<<<< .our
- void OpenDialogCompletion(int chosen,
-                           NSOpenPanel* dialog,
-                           const DialogSettings& settings,
-@@ -307,6 +308,17 @@
-     ReadDialogPaths(dialog, &paths);
-     callback.Run(true, paths);
- #endif
-+=======
-+void OpenDialogCompletion(int chosen, NSOpenPanel* dialog,
-+                          const DialogSettings& settings,
-+                          const OpenDialogCallback& callback) {
-+  if (chosen == NSFileHandlingPanelCancelButton) {
-+    callback.Run(false, std::vector<base::FilePath>());
-+  } else {
-+    std::vector<base::FilePath> paths;
-+    ReadDialogPaths(dialog, &paths);
-+    callback.Run(true, paths);
-+>>>>>>> .their
-   }
- }
- 
-@@ -330,8 +342,13 @@
-     NSWindow* window = settings.parent_window->GetNativeWindow();
-     [dialog beginSheetModalForWindow:window
-                    completionHandler:^(NSInteger chosen) {
-+<<<<<<< .our
-                      OpenDialogCompletion(chosen, dialog, settings, callback);
-                    }];
-+=======
-+      OpenDialogCompletion(chosen, dialog, settings, callback);
-+    }];
-+>>>>>>> .their
-   }
- }
- 
-@@ -349,6 +366,7 @@
-   return true;
- }
- 
-+<<<<<<< .our
- void SaveDialogCompletion(int chosen,
-                           NSSavePanel* dialog,
-                           const DialogSettings& settings,
-@@ -370,6 +388,16 @@
- #else
-     callback.Run(true, base::FilePath(path));
- #endif
-+=======
-+void SaveDialogCompletion(int chosen, NSSavePanel* dialog,
-+                          const DialogSettings& settings,
-+                          const SaveDialogCallback& callback) {
-+  if (chosen == NSFileHandlingPanelCancelButton) {
-+    callback.Run(false, base::FilePath());
-+  } else {
-+    std::string path = base::SysNSStringToUTF8([[dialog URL] path]);
-+    callback.Run(true, base::FilePath(path));
-+>>>>>>> .their
-   }
- }
- 
-@@ -391,8 +419,13 @@
-     NSWindow* window = settings.parent_window->GetNativeWindow();
-     [dialog beginSheetModalForWindow:window
-                    completionHandler:^(NSInteger chosen) {
-+<<<<<<< .our
-                      SaveDialogCompletion(chosen, dialog, settings, callback);
-                    }];
-+=======
-+      SaveDialogCompletion(chosen, dialog, settings, callback);
-+    }];
-+>>>>>>> .their
-   }
- }
- 
-changed in both
-  base   100644 8f495f3bf7afef98c62456bda19607adab35c930 atom/browser/ui/message_box_mac.mm
-  our    100644 ee2f59dc8c84ba0bf5fe049a133f403d550a9473 atom/browser/ui/message_box_mac.mm
-  their  100644 17c66043a27f76077f20ac4ff61522fac0bb2b51 atom/browser/ui/message_box_mac.mm
-changed in both
-  base   100644 e0cd68608a33e999032a7ff2ce4c0e6971c5e8f2 atom/browser/ui/win/atom_desktop_native_widget_aura.cc
-  our    100644 21300409add439f7513536eaf255601da0778299 atom/browser/ui/win/atom_desktop_native_widget_aura.cc
-  their  100644 c38760f7c39ea60a6504c700a0262539619999eb atom/browser/ui/win/atom_desktop_native_widget_aura.cc
-@@ -12,7 +12,11 @@
-     views::internal::NativeWidgetDelegate* delegate)
-     : views::DesktopNativeWidgetAura(delegate) {
-   // This is to enable the override of OnWindowActivated
-+<<<<<<< .our
-   wm::SetActivationChangeObserver(GetNativeWindow(), this);
-+=======
-+  aura::client::SetActivationChangeObserver(GetNativeWindow(), this);
-+>>>>>>> .their
- }
- 
- void AtomDesktopNativeWidgetAura::Activate() {
-@@ -24,6 +28,7 @@
- }
- 
- void AtomDesktopNativeWidgetAura::OnWindowActivated(
-+<<<<<<< .our
-     wm::ActivationChangeObserver::ActivationReason reason,
-     aura::Window* gained_active,
-     aura::Window* lost_active) {
-@@ -32,6 +37,16 @@
-   if (lost_active != nullptr) {
-     auto* tooltip_controller = static_cast<views::corewm::TooltipController*>(
-         wm::GetTooltipClient(lost_active->GetRootWindow()));
-+=======
-+    aura::client::ActivationChangeObserver::ActivationReason reason,
-+    aura::Window* gained_active,
-+    aura::Window* lost_active) {
-+  views::DesktopNativeWidgetAura::OnWindowActivated(
-+    reason, gained_active, lost_active);
-+  if (lost_active != nullptr) {
-+    auto* tooltip_controller = static_cast<views::corewm::TooltipController*>(
-+      aura::client::GetTooltipClient(lost_active->GetRootWindow()));
-+>>>>>>> .their
- 
-     // This will cause the tooltip to be hidden when a window is deactivated,
-     // as it should be.
-changed in both
-  base   100644 b5a6c0933d5b6527e3f4ee2607acf888197b61ca atom/browser/ui/win/atom_desktop_native_widget_aura.h
-  our    100644 81c6f2b394a8c1501d97fb017b1a58e4ca240d18 atom/browser/ui/win/atom_desktop_native_widget_aura.h
-  their  100644 79ce3dd5cd4cc77fd2016e7ed4c93044a4873236 atom/browser/ui/win/atom_desktop_native_widget_aura.h
-@@ -19,9 +19,16 @@
-   void Activate() override;
- 
-  private:
-+<<<<<<< .our
-   void OnWindowActivated(wm::ActivationChangeObserver::ActivationReason reason,
-                          aura::Window* gained_active,
-                          aura::Window* lost_active) override;
-+=======
-+  void OnWindowActivated(
-+      aura::client::ActivationChangeObserver::ActivationReason reason,
-+      aura::Window* gained_active,
-+      aura::Window* lost_active) override;
-+>>>>>>> .their
-   DISALLOW_COPY_AND_ASSIGN(AtomDesktopNativeWidgetAura);
- };
- 
-changed in both
-  base   100644 cc621625818feaeddf4fb76cd9103c822795e652 atom/browser/web_contents_preferences.cc
-  our    100644 c21c93383155091a7481cdd4e741cefad90a4a55 atom/browser/web_contents_preferences.cc
-  their  100644 2a07ba7f22d06c3e0c1b072c2e291e0b9a8f3eb2 atom/browser/web_contents_preferences.cc
-@@ -97,6 +97,7 @@
-   instances_.push_back(this);
- 
-   // Set WebPreferences defaults onto the JS object
-+<<<<<<< .our
-   SetDefaultBoolIfUndefined(options::kPlugins, false);
-   SetDefaultBoolIfUndefined(options::kExperimentalFeatures, false);
-   bool node = SetDefaultBoolIfUndefined(options::kNodeIntegration, true);
-@@ -104,12 +105,23 @@
-   SetDefaultBoolIfUndefined(options::kWebviewTag, node);
-   SetDefaultBoolIfUndefined(options::kSandbox, false);
-   SetDefaultBoolIfUndefined(options::kNativeWindowOpen, false);
-+=======
-+  SetDefaultBoolIfUndefined("plugins", false);
-+  SetDefaultBoolIfUndefined(options::kExperimentalFeatures, false);
-+  SetDefaultBoolIfUndefined(options::kExperimentalCanvasFeatures, false);
-+  bool node = SetDefaultBoolIfUndefined(options::kNodeIntegration, true);
-+  SetDefaultBoolIfUndefined(options::kNodeIntegrationInWorker, false);
-+  SetDefaultBoolIfUndefined(options::kWebviewTag, node);
-+  SetDefaultBoolIfUndefined("sandbox", false);
-+  SetDefaultBoolIfUndefined("nativeWindowOpen", false);
-+>>>>>>> .their
-   SetDefaultBoolIfUndefined(options::kContextIsolation, false);
-   SetDefaultBoolIfUndefined("javascript", true);
-   SetDefaultBoolIfUndefined("images", true);
-   SetDefaultBoolIfUndefined("textAreasAreResizable", true);
-   SetDefaultBoolIfUndefined("webgl", true);
-   bool webSecurity = true;
-+<<<<<<< .our
-   SetDefaultBoolIfUndefined(options::kWebSecurity, webSecurity);
-   // If webSecurity was explicity set to false, let's inherit that into
-   // insecureContent
-@@ -125,6 +137,21 @@
-   SetDefaultBoolIfUndefined(options::kOffscreen, false);
- 
-   last_preference_ = preference_.Clone();
-+=======
-+  SetDefaultBoolIfUndefined("webSecurity", webSecurity);
-+  // If webSecurity was explicity set to false, let's inherit that into
-+  // insecureContent
-+  if (web_preferences.Get("webSecurity", &webSecurity) && !webSecurity) {
-+    SetDefaultBoolIfUndefined("allowRunningInsecureContent", true);
-+  } else {
-+    SetDefaultBoolIfUndefined("allowRunningInsecureContent", false);
-+  }
-+  #if defined(OS_MACOSX)
-+  SetDefaultBoolIfUndefined(options::kScrollBounce, false);
-+  #endif
-+  SetDefaultBoolIfUndefined("offscreen", false);
-+  last_web_preferences_.MergeDictionary(&web_preferences_);
-+>>>>>>> .their
- }
- 
- WebContentsPreferences::~WebContentsPreferences() {
-@@ -154,6 +181,16 @@
-   return default_value;
- }
- 
-+bool WebContentsPreferences::SetDefaultBoolIfUndefined(const std::string key,
-+                                                       bool val) {
-+  bool existing;
-+  if (!web_preferences_.GetBoolean(key, &existing)) {
-+    web_preferences_.SetBoolean(key, val);
-+    return val;
-+  }
-+  return existing;
-+}
-+
- void WebContentsPreferences::Merge(const base::DictionaryValue& extend) {
-   if (preference_.is_dict())
-     static_cast<base::DictionaryValue*>(&preference_)->MergeDictionary(&extend);
-@@ -212,8 +249,18 @@
-   return FromWebContents(web_contents);
- }
- 
-+<<<<<<< .our
- void WebContentsPreferences::AppendCommandLineSwitches(
-     base::CommandLine* command_line) {
-+=======
-+  // We are appending args to a webContents so let's save the current state
-+  // of our preferences object so that during the lifetime of the WebContents
-+  // we can fetch the options used to initally configure the WebContents
-+  self->last_web_preferences_.Clear();
-+  self->last_web_preferences_.MergeDictionary(&web_preferences);
-+
-+  bool b;
-+>>>>>>> .their
-   // Check if plugins are enabled.
-   if (IsEnabled(options::kPlugins))
-     command_line->AppendSwitch(switches::kEnablePlugins);
-changed in both
-  base   100644 366aa1d9520847d6b81e673cc5a2156d53cc5ba5 atom/browser/web_contents_preferences.h
-  our    100644 d835347afcd259f473f95271a2c19e42afcc6f2b atom/browser/web_contents_preferences.h
-  their  100644 be277487d1d669b5e85676ff1a7ca4da365c0572 atom/browser/web_contents_preferences.h
-@@ -59,8 +59,15 @@
-   bool GetPreloadPath(base::FilePath::StringType* path) const;
- 
-   // Returns the web preferences.
-+<<<<<<< .our
-   base::Value* preference() { return &preference_; }
-   base::Value* last_preference() { return &last_preference_; }
-+=======
-+  base::DictionaryValue* web_preferences() { return &web_preferences_; }
-+  base::DictionaryValue* last_web_preferences() {
-+    return &last_web_preferences_;
-+  }
-+>>>>>>> .their
- 
-  private:
-   friend class content::WebContentsUserData<WebContentsPreferences>;
-@@ -75,6 +82,14 @@
-   static std::vector<WebContentsPreferences*> instances_;
- 
-   content::WebContents* web_contents_;
-+<<<<<<< .our
-+=======
-+  base::DictionaryValue web_preferences_;
-+  base::DictionaryValue last_web_preferences_;
-+
-+  // Set preference value to given bool if user did not provide value
-+  bool SetDefaultBoolIfUndefined(const std::string key, bool val);
-+>>>>>>> .their
- 
-   base::Value preference_ = base::Value(base::Value::Type::DICTIONARY);
-   base::Value last_preference_ = base::Value(base::Value::Type::DICTIONARY);
-changed in both
-  base   100644 a20d962c0a82ff7e79bf6552334c2788c235cc3a atom/browser/web_dialog_helper.cc
-  our    100644 74c8573d13f15bcaa189abdc40fa0cd8e48f89be atom/browser/web_dialog_helper.cc
-  their  100644 19e5c11a6186ce9e99f61a98e1e965508020648c atom/browser/web_dialog_helper.cc
-changed in both
-  base   100644 08880ffe4a3591d9010f55ef18ce288e69101fe1 atom/common/atom_command_line.cc
-  our    100644 287e43f75fef778948ef9acdac8b9a7edfe07d0a atom/common/atom_command_line.cc
-  their  100644 54420b533a6b2600a87c95645b73bc01fbf0122f atom/common/atom_command_line.cc
-changed in both
-  base   100644 a279283cf09dd0275c41669362a9659c01b790dd atom/common/atom_version.h
-  our    100644 65e7d19911559a40b1b258319df5fe0fa180354f atom/common/atom_version.h
-  their  100644 1fb5ba2490e9da47a5eedfe7e2ea9a68da84621d atom/common/atom_version.h
-@@ -5,10 +5,17 @@
- #ifndef ATOM_COMMON_ATOM_VERSION_H_
- #define ATOM_COMMON_ATOM_VERSION_H_
- 
-+<<<<<<< .our
- #define ATOM_MAJOR_VERSION 4
- #define ATOM_MINOR_VERSION 0
- #define ATOM_PATCH_VERSION 0
- #define ATOM_PRE_RELEASE_VERSION -nightly.20180821
-+=======
-+#define ATOM_MAJOR_VERSION 1
-+#define ATOM_MINOR_VERSION 8
-+#define ATOM_PATCH_VERSION 8
-+// #define ATOM_PRE_RELEASE_VERSION
-+>>>>>>> .their
- 
- #ifndef ATOM_STRINGIFY
- #define ATOM_STRINGIFY(n) ATOM_STRINGIFY_HELPER(n)
-@@ -16,6 +23,7 @@
- #endif
- 
- #ifndef ATOM_PRE_RELEASE_VERSION
-+<<<<<<< .our
- #define ATOM_VERSION_STRING          \
-   ATOM_STRINGIFY(ATOM_MAJOR_VERSION) \
-   "." ATOM_STRINGIFY(ATOM_MINOR_VERSION) "." ATOM_STRINGIFY(ATOM_PATCH_VERSION)
-@@ -24,6 +32,16 @@
-   ATOM_STRINGIFY(ATOM_MAJOR_VERSION)                         \
-   "." ATOM_STRINGIFY(ATOM_MINOR_VERSION) "." ATOM_STRINGIFY( \
-       ATOM_PATCH_VERSION) ATOM_STRINGIFY(ATOM_PRE_RELEASE_VERSION)
-+=======
-+  #define ATOM_VERSION_STRING ATOM_STRINGIFY(ATOM_MAJOR_VERSION) "." \
-+                              ATOM_STRINGIFY(ATOM_MINOR_VERSION) "." \
-+                              ATOM_STRINGIFY(ATOM_PATCH_VERSION)
-+#else
-+  #define ATOM_VERSION_STRING ATOM_STRINGIFY(ATOM_MAJOR_VERSION) "." \
-+                              ATOM_STRINGIFY(ATOM_MINOR_VERSION) "." \
-+                              ATOM_STRINGIFY(ATOM_PATCH_VERSION)     \
-+                              ATOM_STRINGIFY(ATOM_PRE_RELEASE_VERSION)
-+>>>>>>> .their
- #endif
- 
- #define ATOM_VERSION "v" ATOM_VERSION_STRING
-changed in both
-  base   100644 a7908ef30c6bafc4aca1da9a870f7ae12703fe04 atom/common/crash_reporter/crash_reporter_win.cc
-  our    100644 c574da71c9de9bd8c7b7cad57d3a0f84708fb97c atom/common/crash_reporter/crash_reporter_win.cc
-  their  100644 49f90b7e6665727b697a243414544bae304fde6e atom/common/crash_reporter/crash_reporter_win.cc
-changed in both
-  base   100644 03e96ae8a4f3cb7e656143fb46dff58eb924fa12 atom/common/node_bindings.cc
-  our    100644 e6aded2e661af919c2d89c2f9bd46b4921d4aec4 atom/common/node_bindings.cc
-  their  100644 84792c58207dd85de2d2b60bd789417346c31b50 atom/common/node_bindings.cc
-@@ -228,8 +228,12 @@
- }
- 
- node::Environment* NodeBindings::CreateEnvironment(
-+<<<<<<< .our
-     v8::Handle<v8::Context> context,
-     node::MultiIsolatePlatform* platform) {
-+=======
-+    v8::Handle<v8::Context> context) {
-+>>>>>>> .their
- #if defined(OS_WIN)
-   auto& atom_args = AtomCommandLine::argv();
-   std::vector<std::string> args(atom_args.size());
-@@ -255,8 +259,13 @@
-   base::FilePath resources_path = GetResourcesPath(browser_env_ == BROWSER);
-   base::FilePath script_path =
-       resources_path.Append(FILE_PATH_LITERAL("electron.asar"))
-+<<<<<<< .our
-           .Append(process_type)
-           .Append(FILE_PATH_LITERAL("init.js"));
-+=======
-+                    .Append(process_type)
-+                    .Append(FILE_PATH_LITERAL("init.js"));
-+>>>>>>> .their
-   args.insert(args.begin() + 1, script_path.AsUTF8Unsafe());
- 
-   std::unique_ptr<const char* []> c_argv = StringVectorToArgArray(args);
-changed in both
-  base   100644 a265b942f31ff76d7e21da03e7eafb6d164fd610 atom/renderer/api/atom_api_web_frame.cc
-  our    100644 f0f7ef249d73876f7107d3d3865e8fc71ee33945 atom/renderer/api/atom_api_web_frame.cc
-  their  100644 b0b5e4fd5f42b9755a8ad9e1063baed70b9ed358 atom/renderer/api/atom_api_web_frame.cc
-@@ -13,7 +13,10 @@
- #include "atom/renderer/api/atom_api_spell_check_client.h"
- #include "base/memory/memory_pressure_listener.h"
- #include "content/public/renderer/render_frame.h"
-+<<<<<<< .our
- #include "content/public/renderer/render_frame_observer.h"
-+=======
-+>>>>>>> .their
- #include "content/public/renderer/render_frame_visitor.h"
- #include "content/public/renderer/render_view.h"
- #include "native_mate/dictionary.h"
-@@ -119,7 +122,11 @@
-     main_frame_ = nullptr;
-   }
-   bool Visit(content::RenderFrame* render_frame) override {
-+<<<<<<< .our
-     auto* view = render_frame->GetRenderView();
-+=======
-+    auto view = render_frame->GetRenderView();
-+>>>>>>> .their
-     if (view->GetMainRenderFrame() == main_frame_ ||
-         (render_frame->IsMainFrame() && render_frame == main_frame_)) {
-       render_frame->GetWebFrame()->SetTextCheckClient(spell_check_client_);
-@@ -222,15 +229,30 @@
-     return;
-   }
- 
-+<<<<<<< .our
-   auto client = std::make_unique<SpellCheckClient>(
-       language, auto_spell_correct_turned_on, args->isolate(), provider);
-+=======
-+  std::unique_ptr<SpellCheckClient> client(new SpellCheckClient(
-+      language, auto_spell_correct_turned_on, args->isolate(), provider));
-+>>>>>>> .their
-   // Set spellchecker for all live frames in the same process or
-   // in the sandbox mode for all live sub frames to this WebFrame.
-   FrameSpellChecker spell_checker(
-       client.get(), content::RenderFrame::FromWebFrame(web_frame_));
-   content::RenderFrame::ForEach(&spell_checker);
-   spell_check_client_.swap(client);
-+<<<<<<< .our
-   web_frame_->SetSpellCheckPanelHostClient(spell_check_client_.get());
-+=======
-+  web_frame_->View()->SetSpellCheckClient(spell_check_client_.get());
-+}
-+
-+void WebFrame::RegisterURLSchemeAsSecure(const std::string& scheme) {
-+  // TODO(pfrazee): Remove 2.0
-+  blink::SchemeRegistry::RegisterURLSchemeAsSecure(
-+      WTF::String::FromUTF8(scheme.data(), scheme.length()));
-+>>>>>>> .their
- }
- 
- void WebFrame::RegisterURLSchemeAsBypassingCSP(const std::string& scheme) {
-changed in both
-  base   100644 069ff42e7bf6e01f69e76738925e35560c981b49 atom/renderer/atom_sandboxed_renderer_client.cc
-  our    100644 6e29fe45a69f44856d7fca449ec1be4eaf6970a2 atom/renderer/atom_sandboxed_renderer_client.cc
-  their  100644 f8acc3b1b942496ea974cf51e5a06275e1a0c0fa atom/renderer/atom_sandboxed_renderer_client.cc
-@@ -33,11 +33,14 @@
- const std::string kIpcKey = "ipcNative";
- const std::string kModuleCacheKey = "native-module-cache";
- 
-+<<<<<<< .our
- bool IsDevTools(content::RenderFrame* render_frame) {
-   return render_frame->GetWebFrame()->GetDocument().Url().ProtocolIs(
-       "chrome-devtools");
- }
- 
-+=======
-+>>>>>>> .their
- v8::Local<v8::Object> GetModuleCache(v8::Isolate* isolate) {
-   mate::Dictionary global(isolate, isolate->GetCurrentContext()->Global());
-   v8::Local<v8::Value> cache;
-@@ -176,6 +179,7 @@
- }
- 
- void AtomSandboxedRendererClient::DidCreateScriptContext(
-+<<<<<<< .our
-     v8::Handle<v8::Context> context,
-     content::RenderFrame* render_frame) {
-   RendererClientBase::DidCreateScriptContext(context, render_frame);
-@@ -184,6 +188,12 @@
-   // For devtools we still want to run the preload_bundle script
-   if (!render_frame->IsMainFrame() && !IsDevTools(render_frame))
-     return;
-+=======
-+    v8::Handle<v8::Context> context, content::RenderFrame* render_frame) {
-+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-+  std::string preload_script = command_line->GetSwitchValueASCII(
-+      switches::kPreloadScript);
-+>>>>>>> .their
- 
-   auto* isolate = context->GetIsolate();
-   v8::HandleScope handle_scope(isolate);
-changed in both
-  base   100644 04fc46b740297570b1ef7fc6f97b90dc8ebb6cc2 brightray/brightray.gypi
-  our    100644 8a945dc0219293d90e30162e4691a4d871071f4f brightray/brightray.gypi
-  their  100644 4473ced3efbd1668f207511aa7c3510682fd2e74 brightray/brightray.gypi
-@@ -249,7 +249,11 @@
-             # perform FPO regardless, so we must explicitly disable.
-             # We still want the false setting above to avoid having
-             # "/Oy /Oy-" and warnings about overriding.
-+<<<<<<< .our
-             'AdditionalOptions': ['/Oy-', '/guard:cf'],
-+=======
-+            'AdditionalOptions': ['/Oy-', '/d2guard4'],
-+>>>>>>> .their
-           },
-           'VCLibrarianTool': {
-             'LinkTimeCodeGeneration': 'true',  # /LTCG
-@@ -293,6 +297,7 @@
-           }],  # OS=="linux"
-           ['OS=="linux" and target_arch in ["ia32", "x64", "arm64"]', {
-             'cflags': [
-+<<<<<<< .our
-               '-flto=thin',
-             ],
-             'ldflags': [
-@@ -301,6 +306,16 @@
-               '-Wl,--lto-O0',  # this could be removed in future; see https://codereview.chromium.org/2939923004
-               '-Wl,-mllvm,-function-sections',
-               '-Wl,-mllvm,-data-sections',
-+=======
-+              '-flto',
-+            ],
-+            'ldflags': [
-+              '-flto',
-+              '-fuse-ld=gold',
-+              '-Wl,-plugin-opt,O1',
-+              '-Wl,-plugin-opt,-function-sections',
-+              '-Wl,--icf=all',
-+>>>>>>> .their
-             ],
-           }],
-         ],
-changed in both
-  base   100644 8dea03f1fc6444d6bf56c4ac3ea2fdec206b42da brightray/browser/win/win32_desktop_notifications/desktop_notification_controller.cc
-  our    100644 71395a49d82f7be8a3ffd66e4795af968973a274 brightray/browser/win/win32_desktop_notifications/desktop_notification_controller.cc
-  their  100644 358074c602bebb7e440c1c5cd01708617f5b29e9 brightray/browser/win/win32_desktop_notifications/desktop_notification_controller.cc
-@@ -176,6 +176,7 @@
- }
- 
- void DesktopNotificationController::AnimateAll() {
-+<<<<<<< .our
-   // NOTE: This function refreshes position and size of all toasts according
-   // to all current conditions. Animation time is only one of the variables
-   // influencing them. Screen resolution is another.
-@@ -204,6 +205,35 @@
- 
-       if (hdwp)
-         EndDeferWindowPos(hdwp);
-+=======
-+    // NOTE: This function refreshes position and size of all toasts according
-+    // to all current conditions. Animation time is only one of the variables
-+    // influencing them. Screen resolution is another.
-+
-+    bool keep_animating = false;
-+
-+    if (!instances_.empty()) {
-+        RECT work_area;
-+        if (SystemParametersInfo(SPI_GETWORKAREA, 0, &work_area, 0)) {
-+            ScreenMetrics metrics;
-+            POINT origin = { work_area.right,
-+                             work_area.bottom - metrics.Y(toast_margin_) };
-+
-+            auto hdwp =
-+                BeginDeferWindowPos(static_cast<int>(instances_.size()));
-+
-+            for (auto&& inst : instances_) {
-+                if (!inst.hwnd) continue;
-+
-+                auto notification = Toast::Get(inst.hwnd);
-+                hdwp = notification->Animate(hdwp, origin);
-+                if (!hdwp) break;
-+                keep_animating |= notification->IsAnimationActive();
-+            }
-+
-+            if (hdwp) EndDeferWindowPos(hdwp);
-+        }
-+>>>>>>> .their
-     }
-   }
- 
-@@ -259,8 +289,29 @@
-         else
-           toast->SetVerticalPosition(target_pos);
- 
-+<<<<<<< .our
-         target_pos += toast->GetHeight() + margin;
-       }
-+=======
-+    // Set new toast positions
-+    if (!instances_.empty()) {
-+        ScreenMetrics metrics;
-+        auto margin = metrics.Y(toast_margin_);
-+
-+        int target_pos = 0;
-+        for (auto&& inst : instances_) {
-+            if (inst.hwnd) {
-+                auto toast = Toast::Get(inst.hwnd);
-+
-+                if (toast->IsHighlighted())
-+                    target_pos = toast->GetVerticalPosition();
-+                else
-+                    toast->SetVerticalPosition(target_pos);
-+
-+                target_pos += toast->GetHeight() + margin;
-+            }
-+        }
-+>>>>>>> .their
-     }
-   }
- 
-@@ -310,6 +361,7 @@
- }
- 
- void DesktopNotificationController::CreateToast(NotificationLink&& data) {
-+<<<<<<< .our
-   auto* hinstance = RegisterWndClasses();
-   auto* hwnd = Toast::Create(hinstance, data);
-   if (hwnd) {
-@@ -322,6 +374,35 @@
-       auto* toast = Toast::Get(item.hwnd);
-       toast_pos = toast->GetVerticalPosition() + toast->GetHeight() +
-                   scr.Y(toast_margin_);
-+=======
-+    auto hinstance = RegisterWndClasses();
-+    auto hwnd = Toast::Create(hinstance, data);
-+    if (hwnd) {
-+        int toast_pos = 0;
-+        if (!instances_.empty()) {
-+            auto& item = instances_.back();
-+            _ASSERT(item.hwnd);
-+
-+            ScreenMetrics scr;
-+            auto toast = Toast::Get(item.hwnd);
-+            toast_pos = toast->GetVerticalPosition() +
-+                        toast->GetHeight() +
-+                        scr.Y(toast_margin_);
-+        }
-+
-+        instances_.push_back({ hwnd, move(data) });
-+
-+        if (!hwnd_controller_) {
-+            // NOTE: We cannot use a message-only window because we need to
-+            //       receive system notifications
-+            hwnd_controller_ = CreateWindow(class_name_, nullptr, 0,
-+                                            0, 0, 0, 0,
-+                                            NULL, NULL, hinstance, this);
-+        }
-+
-+        auto toast = Toast::Get(hwnd);
-+        toast->PopUp(toast_pos);
-+>>>>>>> .their
-     }
- 
-     instances_.push_back({hwnd, move(data)});
-changed in both
-  base   100644 643a61f5331e0765de31e8cfeab58416e4c23e42 brightray/browser/win/win32_desktop_notifications/desktop_notification_controller.h
-  our    100644 d6d8fd35a2958b39dc0f6a76b4ee110b2951c832 brightray/browser/win/win32_desktop_notifications/desktop_notification_controller.h
-  their  100644 1e76e1e1ad2ed268dae7ac5327d7dc56ea48a05a brightray/browser/win/win32_desktop_notifications/desktop_notification_controller.h
-@@ -33,6 +33,7 @@
-   HFONT GetBodyFont();
- 
-  private:
-+<<<<<<< .our
-   enum TimerID { TimerID_Animate = 1 };
- 
-   static constexpr int toast_margin_ = 20;
-@@ -74,6 +75,50 @@
-   void CreateToast(NotificationLink&& data);
-   HWND GetToast(const NotificationData* data) const;
-   void DestroyToast(ToastInstance& inst);
-+=======
-+    enum TimerID {
-+        TimerID_Animate = 1
-+    };
-+
-+    static constexpr int toast_margin_ = 20;
-+
-+    // Wrapper around `NotificationData` which makes sure that
-+    // the `controller` member is cleared when the controller object
-+    // stops tracking the notification
-+    struct NotificationLink : std::shared_ptr<NotificationData> {
-+        explicit NotificationLink(DesktopNotificationController* controller);
-+        ~NotificationLink();
-+
-+        NotificationLink(NotificationLink&&) = default;
-+        NotificationLink(const NotificationLink&) = delete;
-+        NotificationLink& operator=(NotificationLink&&) = default;
-+    };
-+
-+    struct ToastInstance {
-+        HWND hwnd;
-+        NotificationLink data;
-+    };
-+
-+    class Toast;
-+
-+    static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
-+                                    WPARAM wparam, LPARAM lparam);
-+    static DesktopNotificationController* Get(HWND hwnd) {
-+        return reinterpret_cast<DesktopNotificationController*>(
-+            GetWindowLongPtr(hwnd, 0));
-+    }
-+
-+    DesktopNotificationController(
-+        const DesktopNotificationController&) = delete;
-+
-+    void InitializeFonts();
-+    void ClearAssets();
-+    void AnimateAll();
-+    void CheckQueue();
-+    void CreateToast(NotificationLink&& data);
-+    HWND GetToast(const NotificationData* data) const;
-+    void DestroyToast(ToastInstance& inst);
-+>>>>>>> .their
- 
-  private:
-   static const TCHAR class_name_[];
-changed in both
-  base   100644 31797a87ec72a2448dc7fbca979bcb6924682d0b common.gypi
-  our    100644 676d1e904127066e4a3d313106f15406fcbed8b6 common.gypi
-  their  100644 d71415add7a1b124816b99b1f0ee5a6aa9c1f696 common.gypi
-@@ -155,7 +155,10 @@
-           'BUILDING_V8_SHARED',
-           'BUILDING_V8_PLATFORM_SHARED',
-           'BUILDING_V8_BASE_SHARED',
-+<<<<<<< .our
-           'NODE_WITHOUT_NODE_OPTIONS',
-+=======
-+>>>>>>> .their
-         ],
-         'conditions': [
-           ['OS=="mac" and libchromiumcontent_component==0', {
-changed in both
-  base   100644 6ed06d4be4a82ee91e44bea9a733cce6b05da0ab docs/api/browser-view.md
-  our    100644 ee1780942db5565c9c9a9e3a4139345c413e1eb9 docs/api/browser-view.md
-  their  100644 d2e368725fc4d6d407020c0cc426ca88d69fe407 docs/api/browser-view.md
-changed in both
-  base   100644 2cddafa25e762d12efb14d67684b587414f76d5d docs/api/browser-window.md
-  our    100644 dff61dd336f047cf2f6f06228b2df2b98ff2304d docs/api/browser-window.md
-  their  100644 9389f38af2214eda6bc0140614bc189933f46c55 docs/api/browser-window.md
-changed in both
-  base   100644 52147bcc292d77f10bb58f8d4c58e6403b1055e2 docs/api/tray.md
-  our    100644 c60f7ba4c9e9b6ad3fc1b2f717983b71bd286842 docs/api/tray.md
-  their  100644 6b1b3e41c2cf0195cb5de29323f2fef1d86abe74 docs/api/tray.md
-changed in both
-  base   100644 9b56820d04944a1ca1747e9474d73617239ba81a docs/api/web-contents.md
-  our    100644 8990fe2e97ab62eafdd3f7a4eb8ee782415124c5 docs/api/web-contents.md
-  their  100644 087c73784096f093cc5b242d7a3b34501c1b2bf5 docs/api/web-contents.md
-@@ -1385,6 +1385,26 @@
- 
- Shows pop-up dictionary that searches the selected word on the page.
- 
-+<<<<<<< .our
-+=======
-+#### `contents.setSize(options)`
-+
-+Set the size of the page. This is only supported for `<webview>` guest contents.
-+
-+* `options` Object
-+  * `enableAutoSize` Boolean (optional) - true to make the webview container automatically
-+    resize within the bounds specified by the attributes normal, min and max.
-+  * `normal` [Size](structures/size.md) (optional) - Normal size of the page. This can be used in
-+    combination with the [`disableguestresize`](webview-tag.md#disableguestresize)
-+    attribute to manually resize the webview guest contents.
-+  * `min` [Size](structures/size.md) (optional) - Minimum size of the page. This can be used in
-+    combination with the [`disableguestresize`](webview-tag.md#disableguestresize)
-+    attribute to manually resize the webview guest contents.
-+  * `max` [Size](structures/size.md) (optional) - Maximium size of the page. This can be used in
-+    combination with the [`disableguestresize`](webview-tag.md#disableguestresize)
-+    attribute to manually resize the webview guest contents.
-+
-+>>>>>>> .their
- #### `contents.isOffscreen()`
- 
- Returns `Boolean` - Indicates whether *offscreen rendering* is enabled.
-changed in both
-  base   100644 abe8e4d916264e4de586486c20f961f687ee271c docs/api/web-frame.md
-  our    100644 989060ef3e50c5d93db1a914997f1d190edf3cf5 docs/api/web-frame.md
-  their  100644 dee3e150db50c002b7cef8e3424e3843e349fc83 docs/api/web-frame.md
-changed in both
-  base   100644 7474cec466c793aada767b2100f5a9f38cc15f87 docs/tutorial/supported-platforms.md
-  our    100644 6c84b1438b8fb1f328b38b701c86a8ec9a7483de docs/tutorial/supported-platforms.md
-  their  100644 9f7b44274c3f3375950c348fe9789bb9e2d3dadf docs/tutorial/supported-platforms.md
-@@ -1 +1,47 @@
-+<<<<<<< .our
- Moved to [support.md](support.md)
-+=======
-+# Supported Platforms
-+
-+Following platforms are supported by Electron:
-+
-+### macOS
-+
-+Only 64bit binaries are provided for macOS, and the minimum macOS version
-+supported is macOS 10.9.
-+
-+### Windows
-+
-+Windows 7 and later are supported, older operating systems are not supported
-+(and do not work).
-+
-+Both `ia32` (`x86`) and `x64` (`amd64`) binaries are provided for Windows.
-+Please note, the `ARM` version of Windows is not supported for now.
-+
-+### Linux
-+
-+The prebuilt binaries of Electron are built for Debian Jessie, but whether the
-+prebuilt binary can run on a distribution depends on whether the distribution
-+includes the libraries that Electron is linked to on the building platform, so
-+only Debian Jessie is guaranteed to work, but following platforms are also
-+verified to be able to run the prebuilt binaries of Electron:
-+
-+* Ubuntu 12.04 and later
-+* Fedora 21
-+* Debian 8 and later
-+
-+Electorn provides prebuilt binaries for following CPU architectures:
-+
-+* `ia32` (`i686`)
-+* `x64` (`amd64`)
-+* `armv7l`
-+* `arm64`
-+* `mips64el`
-+
-+The `arm` binary is built against ARM v7 with hard-float ABI and NEON, and it is
-+not guaranteed to run on all ARM platforms.
-+
-+The `mips64el` binary is built with toolchains provided by Loongson, and it is
-+not guaranteed to run on all MIPS64 platforms. And currently all certificate
-+related APIs are not working on `mips64el` builds.
-+>>>>>>> .their
-changed in both
-  base   100644 e3bf588e79cadae8673419e9854ad5063aa9beac electron.gyp
-  our    100644 944ddab2a3fd879044e31677e4bac2843fffbdee electron.gyp
-  their  100644 b5f923dd3cc421473140a513757fe5b469dffc89 electron.gyp
-@@ -4,7 +4,11 @@
-     'product_name%': 'Electron',
-     'company_name%': 'GitHub, Inc',
-     'company_abbr%': 'github',
-+<<<<<<< .our
-     'version%': '4.0.0-nightly.20180821',
-+=======
-+    'version%': '1.8.8',
-+>>>>>>> .their
-     'js2c_input_dir': '<(SHARED_INTERMEDIATE_DIR)/js2c',
-   },
-   'includes': [
-@@ -255,6 +259,11 @@
-               ],
-             },
-           ],
-+          'link_settings': {
-+            'ldflags': [
-+              '-Wl,-z,noexecstack',
-+            ],
-+          },
-         }],  # OS=="linux"
-       ],
-     },  # target <(project_name)
-changed in both
-  base   100644 f071924231c089bc6308bd334450770795ff4858 filenames.gypi
-  our    100644 f57860558f06b7e5d8a50f48cfc7e53044df0bc6 filenames.gypi
-  their  100644 ad7256736ef4a64683d4a6dd57e020c96e3543d1 filenames.gypi
-@@ -114,6 +114,11 @@
-       'atom/app/atom_main_delegate_mac.mm',
-       'atom/app/command_line_args.cc',
-       'atom/app/command_line_args.h',
-+<<<<<<< .our
-+=======
-+      'atom/app/node_main.cc',
-+      'atom/app/node_main.h',
-+>>>>>>> .their
-       'atom/app/uv_task_runner.cc',
-       'atom/app/uv_task_runner.h',
-       'atom/browser/api/atom_api_app.cc',
-changed in both
-  base   100644 33c324d4fa8cca5ba6e914deb3f1404333e178c0 lib/browser/api/menu.js
-  our    100644 506e3525c10ce142cafe3fc1bf4de1c255e48503 lib/browser/api/menu.js
-  their  100644 b7556b1f41b9db0424303add30acdba9fa969721 lib/browser/api/menu.js
-@@ -44,15 +44,52 @@
-   this.commandsMap = {}
-   this.groupsMap = {}
-   this.items = []
-+<<<<<<< .our
-   this.delegate = delegate
- }
- 
- Menu.prototype.popup = function (options = {}) {
-   if (options == null || typeof options !== 'object') {
-     throw new TypeError('Options must be an object')
-+=======
-+  this.delegate = {
-+    isCommandIdChecked: id => this.commandsMap[id] ? this.commandsMap[id].checked : undefined,
-+    isCommandIdEnabled: id => this.commandsMap[id] ? this.commandsMap[id].enabled : undefined,
-+    isCommandIdVisible: id => this.commandsMap[id] ? this.commandsMap[id].visible : undefined,
-+    getAcceleratorForCommandId: (id, useDefaultAccelerator) => {
-+      const command = this.commandsMap[id]
-+      if (!command) return
-+      if (command.accelerator != null) return command.accelerator
-+      if (useDefaultAccelerator) return command.getDefaultRoleAccelerator()
-+    },
-+    getIconForCommandId: id => this.commandsMap[id] ? this.commandsMap[id].icon : undefined,
-+    executeCommand: (event, id) => {
-+      const command = this.commandsMap[id]
-+      if (!command) return
-+      command.click(event, BrowserWindow.getFocusedWindow(), webContents.getFocusedWebContents())
-+    },
-+    menuWillShow: () => {
-+      // Ensure radio groups have at least one menu item seleted
-+      for (const id in this.groupsMap) {
-+        const found = this.groupsMap[id].find(item => item.checked) || null
-+        if (!found) v8Util.setHiddenValue(this.groupsMap[id][0], 'checked', true)
-+      }
-+    }
-+  }
-+}
-+
-+Menu.prototype.popup = function (window, x, y, positioningItem) {
-+  let asyncPopup, opts
-+  let [newX, newY, newPosition, newWindow] = [x, y, positioningItem, window]
-+
-+  // menu.popup(x, y, positioningItem)
-+  if (window != null && !(window instanceof BrowserWindow)) {
-+    [newPosition, newY, newX, newWindow] = [y, x, window, null]
-+>>>>>>> .their
-   }
-   let {window, x, y, positioningItem, callback} = options
- 
-+<<<<<<< .our
-   // no callback passed
-   if (!callback || typeof callback !== 'function') callback = () => {}
- 
-@@ -75,6 +112,46 @@
- 
-   this.popupAt(window, x, y, positioningItem, callback)
-   return { browserWindow: window, x, y, position: positioningItem }
-+=======
-+  // menu.popup({})
-+  if (window != null && window.constructor === Object) {
-+    opts = window
-+  // menu.popup(window, {})
-+  } else if (x && typeof x === 'object') {
-+    opts = x
-+  }
-+
-+  if (opts) {
-+    newX = opts.x
-+    newY = opts.y
-+    newPosition = opts.positioningItem
-+    asyncPopup = opts.async
-+  }
-+
-+  // set defaults
-+  if (typeof newX !== 'number') newX = -1
-+  if (typeof newY !== 'number') newY = -1
-+  if (typeof newPosition !== 'number') newPosition = -1
-+  if (typeof asyncPopup !== 'boolean') asyncPopup = false
-+  if (!newWindow || (newWindow && newWindow.constructor !== BrowserWindow)) {
-+    newWindow = BrowserWindow.getFocusedWindow()
-+
-+    // No window focused?
-+    if (!newWindow) {
-+      const browserWindows = BrowserWindow.getAllWindows()
-+
-+      if (browserWindows && browserWindows.length > 0) {
-+        newWindow = browserWindows[0]
-+      } else {
-+        throw new Error(`Cannot open Menu without a BrowserWindow present`)
-+      }
-+    }
-+  }
-+
-+  this.popupAt(newWindow, newX, newY, newPosition, asyncPopup)
-+
-+  return { browserWindow: newWindow, x: newX, y: newY, position: newPosition, async: asyncPopup }
-+>>>>>>> .their
- }
- 
- Menu.prototype.closePopup = function (window) {
-@@ -156,7 +233,11 @@
- 
- Menu.buildFromTemplate = function (template) {
-   if (!Array.isArray(template)) {
-+<<<<<<< .our
-     throw new TypeError('Invalid template for Menu: Menu template must be an array')
-+=======
-+    throw new TypeError('Invalid template for Menu')
-+>>>>>>> .their
-   }
-   const menu = new Menu()
-   if (!areValidTemplateItems(template)) {
-changed in both
-  base   100644 65e9694954a4dd5ff47080d77886c34b94fcec4e lib/browser/api/touch-bar.js
-  our    100644 72c50f6ff19d2a72d191a83ce33a3667f26b0756 lib/browser/api/touch-bar.js
-  their  100644 8294582129905e8384f74b3bdc4aa84b4dc32281 lib/browser/api/touch-bar.js
-changed in both
-  base   100644 0338b776f8938c1548ea9786385fe75db9db3403 lib/browser/guest-view-manager.js
-  our    100644 1e4029e39a981c85fb6ff18c5ccd52f81b3c56f2 lib/browser/guest-view-manager.js
-  their  100644 dd8e0ff1a9239e5c7a92f90a58da866c076011ca lib/browser/guest-view-manager.js
-changed in both
-  base   100644 bd9473dda879723625af24c0f98de2855234a2c7 lib/browser/guest-window-manager.js
-  our    100644 7253c1942b0956ae6b9b0c80a23470fc26669b8a lib/browser/guest-window-manager.js
-  their  100644 6ff9e5f530f0ba4b3c0011ca6d345d7baa9c3a8f lib/browser/guest-window-manager.js
-@@ -52,7 +52,11 @@
-     // if parent's visibility is available, that overrides 'show' flag (#12125)
-     const win = BrowserWindow.fromWebContents(embedder.webContents)
-     if (win != null) {
-+<<<<<<< .our
-       parentOptions = {...embedder.browserWindowOptions, show: win.isVisible()}
-+=======
-+      parentOptions = Object.assign({}, embedder.browserWindowOptions, {show: win.isVisible()})
-+>>>>>>> .their
-     }
- 
-     // Inherit the original options if it is a BrowserWindow.
-@@ -65,7 +69,11 @@
-   // Inherit certain option values from parent window
-   const webPreferences = embedder.getLastWebPreferences()
-   for (const [name, value] of inheritedWebPreferences) {
-+<<<<<<< .our
-     if (webPreferences[name] === value) {
-+=======
-+    if (embedder.getLastWebPreferences()[name] === value) {
-+>>>>>>> .their
-       options.webPreferences[name] = value
-     }
-   }
-changed in both
-  base   100644 0d1a251c4da9d0cc83a3916f99bdd13900653ce2 lib/renderer/init.js
-  our    100644 2470a5e8be80e770b0c03f6a439a71e72ae12a1b lib/renderer/init.js
-  their  100644 bb349cbd0a2945a14198e56c7579329a4b0721a0 lib/renderer/init.js
-changed in both
-  base   100644 119391e79462bfa8bb1494039bcb3522d97acead lib/sandboxed_renderer/init.js
-  our    100644 30a3fa55216f6bf7588c3accc07b150a31163b7c lib/sandboxed_renderer/init.js
-  their  100644 a1acbb2bdc26b33db4041e31cbb251b0399ac197 lib/sandboxed_renderer/init.js
-@@ -35,12 +35,15 @@
-   ['url', require('url')]
- ])
- 
-+<<<<<<< .our
- const {
-   preloadSrc, preloadError, process: processProps
- } = electron.ipcRenderer.sendSync('ELECTRON_BROWSER_SANDBOX_LOAD')
- 
- require('../renderer/web-frame-init')()
- 
-+=======
-+>>>>>>> .their
- // Pass different process object to the preload script(which should not have
- // access to things like `process.atomBinding`).
- const preloadProcess = new events.EventEmitter()
-@@ -78,6 +81,7 @@
-   require('../renderer/inspector')
- }
- 
-+<<<<<<< .our
- if (binding.guestInstanceId) {
-   process.guestInstanceId = parseInt(binding.guestInstanceId)
- }
-@@ -88,6 +92,8 @@
-   require('../renderer/web-view/web-view-attributes')
- }
- 
-+=======
-+>>>>>>> .their
- // Wrap the script into a function executed in global scope. It won't have
- // access to the current scope, so we'll expose a few objects as arguments:
- //
-@@ -107,6 +113,7 @@
- // and any `require('electron')` calls in `preload.js` will work as expected
- // since browserify won't try to include `electron` in the bundle, falling back
- // to the `preloadRequire` function above.
-+<<<<<<< .our
- if (preloadSrc) {
-   const preloadWrapperSrc = `(function(require, process, Buffer, global, setImmediate, clearImmediate) {
-   ${preloadSrc}
-@@ -118,4 +125,18 @@
-   preloadFn(preloadRequire, preloadProcess, Buffer, global, setImmediate, clearImmediate)
- } else if (preloadError) {
-   console.error(preloadError.stack)
-+=======
-+if (preloadPath) {
-+  const preloadSrc = fs.readFileSync(preloadPath).toString()
-+  const preloadWrapperSrc = `(function(require, process, Buffer, global, setImmediate) {
-+  ${preloadSrc}
-+  })`
-+
-+  // eval in window scope:
-+  // http://www.ecma-international.org/ecma-262/5.1/#sec-10.4.2
-+  const geval = eval
-+  const preloadFn = geval(preloadWrapperSrc)
-+  const {setImmediate} = require('timers')
-+  preloadFn(preloadRequire, preloadProcess, Buffer, global, setImmediate)
-+>>>>>>> .their
- }
-added in both
-  our    100644 b1d8824658ea05c277e82d1ac6c6febab9c55030 package-lock.json
-  their  100644 3ce50996b6fb78ed2ed6924a639f01139f53866a package-lock.json
-@@ -1,13 +1,23 @@
- {
-   "name": "electron",
-+<<<<<<< .our
-   "version": "4.0.0-nightly.20180819",
-+=======
-+  "version": "1.8.5",
-+>>>>>>> .their
-   "lockfileVersion": 1,
-   "requires": true,
-   "dependencies": {
-     "@types/node": {
-+<<<<<<< .our
-       "version": "7.0.69",
-       "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.69.tgz",
-       "integrity": "sha512-S5NC8HV6HnRipg8nC0j30TPl7ktXjRTKqgyINLNe8K/64UJUI8Lq0sRopXC0hProsV2F5ibj8IqPkl1xpGggrw==",
-+=======
-+      "version": "7.0.59",
-+      "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.59.tgz",
-+      "integrity": "sha512-FRRJ2hkgzySTgLnwQhXQCGkLRu1ImISVu/YKYWXCIbF6261nqXwDPQ+6xPzZw+c2Il2Zx2JfM/t0tCaw8wzbmA==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "JSONStream": {
-@@ -30,6 +40,7 @@
-     "abbrev": {
-       "version": "1.1.1",
-       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg=",
-       "dev": true
-     },
-@@ -43,6 +54,11 @@
-         "negotiator": "0.6.1"
-       }
-     },
-+=======
-+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-+      "dev": true
-+    },
-+>>>>>>> .their
-     "acorn": {
-       "version": "4.0.13",
-       "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
-@@ -109,12 +125,15 @@
-       "integrity": "sha1-anmQQ3ynNtXhKI25K9MmbV9csqo=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "address": {
-       "version": "1.0.3",
-       "resolved": "https://registry.npmjs.org/address/-/address-1.0.3.tgz",
-       "integrity": "sha512-z55ocwKBRLryBs394Sm3ushTtBeg6VAeuku7utSoSnsJKvKcnXFIyC6vh27n3rXyxSgkJBBCAvyOn7gSUcTYjg==",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "agent-base": {
-       "version": "2.1.1",
-       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz",
-@@ -192,7 +211,11 @@
-         "string-width": {
-           "version": "2.1.1",
-           "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
-+=======
-+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "is-fullwidth-code-point": "2.0.0",
-@@ -231,13 +254,18 @@
-     "anymatch": {
-       "version": "1.3.2",
-       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-VT3Lj5HjyImEXf26NMd3IbkLnXo=",
-+=======
-+      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "micromatch": "2.3.11",
-         "normalize-path": "2.1.1"
-       }
-     },
-+<<<<<<< .our
-     "arch": {
-       "version": "2.1.1",
-       "resolved": "https://registry.npmjs.org/arch/-/arch-2.1.1.tgz",
-@@ -250,6 +278,8 @@
-       "integrity": "sha512-XxNTUzKnz1ctK3ZIcI2XUPlD96wbHP2nGqkPKpvk/HNRlPveYrXIVSTk9m3LcqOgDPg3B1nMvdV/K8wZd7PG4w==",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "argparse": {
-       "version": "1.0.10",
-       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-@@ -259,6 +289,7 @@
-         "sprintf-js": "1.0.3"
-       }
-     },
-+<<<<<<< .our
-     "args": {
-       "version": "4.0.0",
-       "resolved": "https://registry.npmjs.org/args/-/args-4.0.0.tgz",
-@@ -314,6 +345,8 @@
-         }
-       }
-     },
-+=======
-+>>>>>>> .their
-     "arr-diff": {
-       "version": "2.0.0",
-       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-@@ -326,7 +359,11 @@
-     "arr-flatten": {
-       "version": "1.1.0",
-       "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE=",
-+=======
-+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "array-filter": {
-@@ -348,9 +385,15 @@
-       "dev": true
-     },
-     "array-iterate": {
-+<<<<<<< .our
-       "version": "1.1.2",
-       "resolved": "https://registry.npmjs.org/array-iterate/-/array-iterate-1.1.2.tgz",
-       "integrity": "sha512-1hWSHTIlG/8wtYD+PPX5AOBtKWngpDFjrsrHgZpe+JdgNGz0udYu6ZIkAa/xuenIUEqFv7DvE2Yr60jxweJSrQ==",
-+=======
-+      "version": "1.1.1",
-+      "resolved": "https://registry.npmjs.org/array-iterate/-/array-iterate-1.1.1.tgz",
-+      "integrity": "sha1-hlv3+K851rCYLGCQKRSsdrwBCPY=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "array-map": {
-@@ -431,7 +474,11 @@
-       "requires": {
-         "bn.js": "4.11.8",
-         "inherits": "2.0.3",
-+<<<<<<< .our
-         "minimalistic-assert": "1.0.1"
-+=======
-+        "minimalistic-assert": "1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "assert": {
-@@ -483,9 +530,15 @@
-       "dev": true
-     },
-     "aws4": {
-+<<<<<<< .our
-       "version": "1.7.0",
-       "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz",
-       "integrity": "sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w==",
-+=======
-+      "version": "1.6.0",
-+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-+      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "babel-code-frame": {
-@@ -500,9 +553,15 @@
-       }
-     },
-     "bail": {
-+<<<<<<< .our
-       "version": "1.0.3",
-       "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.3.tgz",
-       "integrity": "sha512-1X8CnjFVQ+a+KW36uBNMTU5s8+v5FzeqrP7hTG5aTb4aPreSbZJlhwPon9VKMuEVgV++JM+SQrALY3kr7eswdg==",
-+=======
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.2.tgz",
-+      "integrity": "sha1-99bBcxYwqfnw1NNe0fli4gdKF2Q=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "balanced-match": {
-@@ -512,6 +571,7 @@
-       "dev": true
-     },
-     "base64-js": {
-+<<<<<<< .our
-       "version": "1.3.0",
-       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
-       "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==",
-@@ -534,6 +594,13 @@
-         }
-       }
-     },
-+=======
-+      "version": "1.2.3",
-+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.3.tgz",
-+      "integrity": "sha512-MsAhsUW1GxCdgYSO6tAfZrNapmUKk7mWx/k5mFY/A1gBtkaCaNapTg+FExCw1r9yeaZhqx/xPg43xgTFH6KL5w==",
-+      "dev": true
-+    },
-+>>>>>>> .their
-     "bcrypt-pbkdf": {
-       "version": "1.0.1",
-       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
-@@ -567,7 +634,11 @@
-       "dev": true,
-       "requires": {
-         "readable-stream": "2.3.6",
-+<<<<<<< .our
-         "safe-buffer": "5.1.2"
-+=======
-+        "safe-buffer": "5.1.1"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -586,7 +657,11 @@
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-             "process-nextick-args": "2.0.0",
-+<<<<<<< .our
-             "safe-buffer": "5.1.2",
-+=======
-+            "safe-buffer": "5.1.1",
-+>>>>>>> .their
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-           }
-@@ -597,11 +672,16 @@
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "safe-buffer": "5.1.2"
-+=======
-+            "safe-buffer": "5.1.1"
-+>>>>>>> .their
-           }
-         }
-       }
-     },
-+<<<<<<< .our
-     "bluebird": {
-       "version": "3.5.1",
-       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
-@@ -612,6 +692,12 @@
-       "version": "4.11.8",
-       "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-       "integrity": "sha1-LN4J617jQfSEdGuwMJsyU7GxRC8=",
-+=======
-+    "bn.js": {
-+      "version": "4.11.8",
-+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-+      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "boolbase": {
-@@ -637,7 +723,11 @@
-       "requires": {
-         "ansi-align": "2.0.0",
-         "camelcase": "4.1.0",
-+<<<<<<< .our
-         "chalk": "2.4.1",
-+=======
-+        "chalk": "2.3.2",
-+>>>>>>> .their
-         "cli-boxes": "1.0.0",
-         "string-width": "2.1.1",
-         "term-size": "1.2.0",
-@@ -666,14 +756,24 @@
-           "dev": true
-         },
-         "chalk": {
-+<<<<<<< .our
-           "version": "2.4.1",
-           "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
-           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
-+=======
-+          "version": "2.3.2",
-+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
-+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "ansi-styles": "3.2.1",
-             "escape-string-regexp": "1.0.5",
-+<<<<<<< .our
-             "supports-color": "5.4.0"
-+=======
-+            "supports-color": "5.3.0"
-+>>>>>>> .their
-           }
-         },
-         "has-flag": {
-@@ -691,7 +791,11 @@
-         "string-width": {
-           "version": "2.1.1",
-           "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
-+=======
-+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "is-fullwidth-code-point": "2.0.0",
-@@ -708,9 +812,15 @@
-           }
-         },
-         "supports-color": {
-+<<<<<<< .our
-           "version": "5.4.0",
-           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
-           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-+=======
-+          "version": "5.3.0",
-+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
-+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "has-flag": "3.0.0"
-@@ -754,7 +864,11 @@
-         "JSONStream": "1.3.2",
-         "combine-source-map": "0.8.0",
-         "defined": "1.0.0",
-+<<<<<<< .our
-         "safe-buffer": "5.1.2",
-+=======
-+        "safe-buffer": "5.1.1",
-+>>>>>>> .their
-         "through2": "2.0.3",
-         "umd": "3.0.3"
-       }
-@@ -803,7 +917,11 @@
-         "htmlescape": "1.1.1",
-         "https-browserify": "0.0.1",
-         "inherits": "2.0.3",
-+<<<<<<< .our
-         "insert-module-globals": "7.0.6",
-+=======
-+        "insert-module-globals": "7.0.5",
-+>>>>>>> .their
-         "labeled-stream-splicer": "2.0.1",
-         "module-deps": "4.1.1",
-         "os-browserify": "0.1.2",
-@@ -814,11 +932,19 @@
-         "querystring-es3": "0.2.1",
-         "read-only-stream": "2.0.0",
-         "readable-stream": "2.3.6",
-+<<<<<<< .our
-         "resolve": "1.7.1",
-         "shasum": "1.0.2",
-         "shell-quote": "1.6.1",
-         "stream-browserify": "2.0.1",
-         "stream-http": "2.8.2",
-+=======
-+        "resolve": "1.6.0",
-+        "shasum": "1.0.2",
-+        "shell-quote": "1.6.1",
-+        "stream-browserify": "2.0.1",
-+        "stream-http": "2.8.1",
-+>>>>>>> .their
-         "string_decoder": "0.10.31",
-         "subarg": "1.0.0",
-         "syntax-error": "1.4.0",
-@@ -834,7 +960,11 @@
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "fs.realpath": "1.0.0",
-@@ -861,7 +991,11 @@
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-             "process-nextick-args": "2.0.0",
-+<<<<<<< .our
-             "safe-buffer": "5.1.2",
-+=======
-+            "safe-buffer": "5.1.1",
-+>>>>>>> .their
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-           },
-@@ -872,7 +1006,11 @@
-               "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-               "dev": true,
-               "requires": {
-+<<<<<<< .our
-                 "safe-buffer": "5.1.2"
-+=======
-+                "safe-buffer": "5.1.1"
-+>>>>>>> .their
-               }
-             }
-           }
-@@ -887,6 +1025,7 @@
-       "requires": {
-         "buffer-xor": "1.0.3",
-         "cipher-base": "1.0.4",
-+<<<<<<< .our
-         "create-hash": "1.2.0",
-         "evp_bytestokey": "1.0.3",
-         "inherits": "2.0.3",
-@@ -901,13 +1040,35 @@
-       "requires": {
-         "browserify-aes": "1.2.0",
-         "browserify-des": "1.0.1",
-+=======
-+        "create-hash": "1.1.3",
-+        "evp_bytestokey": "1.0.3",
-+        "inherits": "2.0.3",
-+        "safe-buffer": "5.1.1"
-+      }
-+    },
-+    "browserify-cipher": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz",
-+      "integrity": "sha1-mYgkSHS/XtTijalWZtzWasj8Njo=",
-+      "dev": true,
-+      "requires": {
-+        "browserify-aes": "1.2.0",
-+        "browserify-des": "1.0.0",
-+>>>>>>> .their
-         "evp_bytestokey": "1.0.3"
-       }
-     },
-     "browserify-des": {
-+<<<<<<< .our
-       "version": "1.0.1",
-       "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.1.tgz",
-       "integrity": "sha512-zy0Cobe3hhgpiOM32Tj7KQ3Vl91m0njwsjzZQK1L+JDf11dzP9qIvjreVinsvXrgfjhStXwUWAEpB9D7Gwmayw==",
-+=======
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz",
-+      "integrity": "sha1-2qJ3cXRwki7S/hhZQRihdUOXId0=",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "cipher-base": "1.0.4",
-@@ -933,11 +1094,19 @@
-       "requires": {
-         "bn.js": "4.11.8",
-         "browserify-rsa": "4.0.1",
-+<<<<<<< .our
-         "create-hash": "1.2.0",
-         "create-hmac": "1.1.7",
-         "elliptic": "6.4.0",
-         "inherits": "2.0.3",
-         "parse-asn1": "5.1.1"
-+=======
-+        "create-hash": "1.1.3",
-+        "create-hmac": "1.1.6",
-+        "elliptic": "6.4.0",
-+        "inherits": "2.0.3",
-+        "parse-asn1": "5.1.0"
-+>>>>>>> .their
-       }
-     },
-     "browserify-zlib": {
-@@ -955,7 +1124,11 @@
-       "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "base64-js": "1.3.0",
-+=======
-+        "base64-js": "1.2.3",
-+>>>>>>> .their
-         "ieee754": "1.1.11",
-         "isarray": "1.0.0"
-       },
-@@ -968,6 +1141,7 @@
-         }
-       }
-     },
-+<<<<<<< .our
-     "buffer-alloc": {
-       "version": "1.1.0",
-       "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.1.0.tgz",
-@@ -990,6 +1164,8 @@
-       "integrity": "sha512-YgBMBzdRLEfgxJIGu2wrvI2E03tMCFU1p7d1KhB4BOoMN0VxmTFjSyN5JtKt9z8Z9JajMHruI6SE25W96wNv7Q==",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "buffer-from": {
-       "version": "1.0.0",
-       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.0.0.tgz",
-@@ -1020,12 +1196,15 @@
-       "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "bytes": {
-       "version": "3.0.0",
-       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-       "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "cached-path-relative": {
-       "version": "1.0.1",
-       "resolved": "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.1.tgz",
-@@ -1086,9 +1265,15 @@
-       "dev": true
-     },
-     "ccount": {
-+<<<<<<< .our
-       "version": "1.0.3",
-       "resolved": "https://registry.npmjs.org/ccount/-/ccount-1.0.3.tgz",
-       "integrity": "sha512-Jt9tIBkRc9POUof7QA/VwWd+58fKkEEfI+/t1/eOlxKM7ZhrczNzMFefge7Ai+39y1pR/pP6cI19guHy3FSLmw==",
-+=======
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/ccount/-/ccount-1.0.2.tgz",
-+      "integrity": "sha1-U7ai+BW7d7nChx97mnLDol8djok=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "center-align": {
-@@ -1133,6 +1318,7 @@
-       }
-     },
-     "character-entities": {
-+<<<<<<< .our
-       "version": "1.2.2",
-       "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.2.tgz",
-       "integrity": "sha512-sMoHX6/nBiy3KKfC78dnEalnpn0Az0oSNvqUWYTtYrhRI5iUIYsROU48G+E+kMFQzqXaJ8kHJZ85n7y6/PHgwQ==",
-@@ -1154,12 +1340,39 @@
-       "version": "1.1.2",
-       "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.2.tgz",
-       "integrity": "sha512-7I/xceXfKyUJmSAn/jw8ve/9DyOP7XxufNYLI9Px7CmsKgEUaZLUTax6nZxGQtaoiZCjpu6cHPj20xC/vqRReQ==",
-+=======
-+      "version": "1.2.1",
-+      "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.1.tgz",
-+      "integrity": "sha1-92hxvl72bdt/j440eOzDdMJ9bco=",
-+      "dev": true
-+    },
-+    "character-entities-html4": {
-+      "version": "1.1.1",
-+      "resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.1.tgz",
-+      "integrity": "sha1-NZoqSg9+KdPcKsmb2+Ie45Q46lA=",
-+      "dev": true
-+    },
-+    "character-entities-legacy": {
-+      "version": "1.1.1",
-+      "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.1.tgz",
-+      "integrity": "sha1-9Ad53xoQGHK7UQo9KV4fzPFHIC8=",
-+      "dev": true
-+    },
-+    "character-reference-invalid": {
-+      "version": "1.1.1",
-+      "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.1.tgz",
-+      "integrity": "sha1-lCg191Dk7GGjCOYMLvjMEBEgLvw=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "check-for-leaks": {
-       "version": "1.2.0",
-       "resolved": "https://registry.npmjs.org/check-for-leaks/-/check-for-leaks-1.2.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-6jtQFk6XV3kzLGKBMZX/jGr4Jsw=",
-+=======
-+      "integrity": "sha512-bJ2Bzo6RtsYqamMnsjtVzowGvBNVrR5IPK8Bd+lx5W1TNgOKMsF+AyNHVkqFqO7cpDZNfny5SaqH6gEovpV5Gw==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "anymatch": "1.3.2",
-@@ -1209,7 +1422,11 @@
-       "requires": {
-         "anymatch": "1.3.2",
-         "async-each": "1.0.1",
-+<<<<<<< .our
-         "fsevents": "1.2.4",
-+=======
-+        "fsevents": "1.1.3",
-+>>>>>>> .their
-         "glob-parent": "2.0.0",
-         "inherits": "2.0.3",
-         "is-binary-path": "1.0.1",
-@@ -1239,16 +1456,25 @@
-     "cipher-base": {
-       "version": "1.0.4",
-       "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-h2Dk7MJy9MNjUy+SbYdKriwTl94=",
-       "dev": true,
-       "requires": {
-         "inherits": "2.0.3",
-         "safe-buffer": "5.1.2"
-+=======
-+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-+      "dev": true,
-+      "requires": {
-+        "inherits": "2.0.3",
-+        "safe-buffer": "5.1.1"
-+>>>>>>> .their
-       }
-     },
-     "circular-json": {
-       "version": "0.3.3",
-       "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-gVyZ6oT2gJUp0vRXkb34JxE1LWY=",
-       "dev": true
-     },
-@@ -1279,6 +1505,11 @@
-         }
-       }
-     },
-+=======
-+      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
-+      "dev": true
-+    },
-+>>>>>>> .their
-     "clean-deep": {
-       "version": "2.0.2",
-       "resolved": "https://registry.npmjs.org/clean-deep/-/clean-deep-2.0.2.tgz",
-@@ -1317,6 +1548,7 @@
-       "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "clipboardy": {
-       "version": "1.2.3",
-       "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-1.2.3.tgz",
-@@ -1344,6 +1576,8 @@
-         }
-       }
-     },
-+=======
-+>>>>>>> .their
-     "cliui": {
-       "version": "2.1.0",
-       "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-@@ -1378,9 +1612,15 @@
-       "dev": true
-     },
-     "collapse-white-space": {
-+<<<<<<< .our
-       "version": "1.0.4",
-       "resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.4.tgz",
-       "integrity": "sha512-YfQ1tAUZm561vpYD+5eyWN8+UsceQbSrqqlc/6zDY2gtAE+uZLSdkkovhnGpmCThsvKBFakq4EdY/FF93E8XIw==",
-+=======
-+      "version": "1.0.3",
-+      "resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.3.tgz",
-+      "integrity": "sha1-S5BvZw5aljqHt2sOFolkM0G2Ajw=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "color-convert": {
-@@ -1399,9 +1639,15 @@
-       "dev": true
-     },
-     "colors": {
-+<<<<<<< .our
-       "version": "1.2.5",
-       "resolved": "https://registry.npmjs.org/colors/-/colors-1.2.5.tgz",
-       "integrity": "sha512-erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg==",
-+=======
-+      "version": "1.2.1",
-+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.2.1.tgz",
-+      "integrity": "sha512-s8+wktIuDSLffCywiwSxQOMqtPxML11a/dtHE17tMn4B1MSWw/C22EKf7M2KGUBcDaVFEGT+S8N02geDXeuNKg==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "combine-source-map": {
-@@ -1441,6 +1687,7 @@
-         "dot-prop": "3.0.0"
-       }
-     },
-+<<<<<<< .our
-     "compressible": {
-       "version": "2.0.14",
-       "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.14.tgz",
-@@ -1473,6 +1720,8 @@
-         "vary": "1.1.2"
-       }
-     },
-+=======
-+>>>>>>> .their
-     "concat-map": {
-       "version": "0.0.1",
-       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-@@ -1526,7 +1775,11 @@
-       "requires": {
-         "dot-prop": "4.2.0",
-         "graceful-fs": "4.1.11",
-+<<<<<<< .our
-         "make-dir": "1.3.0",
-+=======
-+        "make-dir": "1.2.0",
-+>>>>>>> .their
-         "unique-string": "1.0.0",
-         "write-file-atomic": "2.3.0",
-         "xdg-basedir": "3.0.0"
-@@ -1535,7 +1788,11 @@
-         "dot-prop": {
-           "version": "4.2.0",
-           "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-HxngwuGqDjJ5fEl5nyg3rGr2nFc=",
-+=======
-+          "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "is-obj": "1.0.1"
-@@ -1564,6 +1821,7 @@
-       "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "content-type": {
-       "version": "1.0.4",
-       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-@@ -1574,13 +1832,24 @@
-       "version": "1.1.24",
-       "resolved": "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.24.tgz",
-       "integrity": "sha512-2WcSUst4Y3Z4hHvoMTWXMJr/DmgVdLiMOVY1Kak2LfFz+GIz2KDp5naqbFesYbfXPmaZ5p491dO0FWZIJoJw1Q==",
-+=======
-+    "conventional-changelog": {
-+      "version": "1.1.23",
-+      "resolved": "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.23.tgz",
-+      "integrity": "sha512-yCPXU/OXJmxgbvTQfIKXKwKa4KQTvlO0a4T/371Raz3bdxcHIGhQtHtdrNee4Z8nGLNfe54njHDblVG2JNFyjg==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "conventional-changelog-angular": "1.6.6",
-         "conventional-changelog-atom": "0.2.8",
-         "conventional-changelog-codemirror": "0.3.8",
-+<<<<<<< .our
-         "conventional-changelog-core": "2.0.11",
-         "conventional-changelog-ember": "0.3.12",
-+=======
-+        "conventional-changelog-core": "2.0.10",
-+        "conventional-changelog-ember": "0.3.11",
-+>>>>>>> .their
-         "conventional-changelog-eslint": "1.0.9",
-         "conventional-changelog-express": "0.3.6",
-         "conventional-changelog-jquery": "0.1.0",
-@@ -1609,6 +1878,7 @@
-       }
-     },
-     "conventional-changelog-cli": {
-+<<<<<<< .our
-       "version": "1.3.22",
-       "resolved": "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.22.tgz",
-       "integrity": "sha512-pnjdIJbxjkZ5VdAX/H1wndr1G10CY8MuZgnXuJhIHglOXfIrXygb7KZC836GW9uo1u8PjEIvIw/bKX0lOmOzZg==",
-@@ -1618,6 +1888,17 @@
-         "conventional-changelog": "1.1.24",
-         "lodash": "4.17.10",
-         "meow": "4.0.1",
-+=======
-+      "version": "1.3.21",
-+      "resolved": "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.21.tgz",
-+      "integrity": "sha512-K9VBljxzuATZCLTVnI83PN7WdeRJRPPB5FumuLk4ES3E+m2YJvX07DRbdJlINk6C2DeAjj4ioS5JvsvJaaCRbA==",
-+      "dev": true,
-+      "requires": {
-+        "add-stream": "1.0.0",
-+        "conventional-changelog": "1.1.23",
-+        "lodash": "4.17.5",
-+        "meow": "4.0.0",
-+>>>>>>> .their
-         "tempfile": "1.1.1"
-       }
-     },
-@@ -1631,9 +1912,15 @@
-       }
-     },
-     "conventional-changelog-core": {
-+<<<<<<< .our
-       "version": "2.0.11",
-       "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-2.0.11.tgz",
-       "integrity": "sha512-HvTE6RlqeEZ/NFPtQeFLsIDOLrGP3bXYr7lFLMhCVsbduF1MXIe8OODkwMFyo1i9ku9NWBwVnVn0jDmIFXjDRg==",
-+=======
-+      "version": "2.0.10",
-+      "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-2.0.10.tgz",
-+      "integrity": "sha512-FP0NHXIbpvU+f5jk/qZdnodhFmlzKW8ENRHQIWT69oe7ffur9nFRVJZlnXnFBOzwHM9WIRbC15ZWh9HZN6t9Uw==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "conventional-changelog-writer": "3.0.9",
-@@ -1643,7 +1930,11 @@
-         "git-raw-commits": "1.3.6",
-         "git-remote-origin-url": "2.0.0",
-         "git-semver-tags": "1.3.6",
-+<<<<<<< .our
-         "lodash": "4.17.10",
-+=======
-+        "lodash": "4.17.5",
-+>>>>>>> .their
-         "normalize-package-data": "2.4.0",
-         "q": "1.5.1",
-         "read-pkg": "1.1.0",
-@@ -1652,9 +1943,15 @@
-       }
-     },
-     "conventional-changelog-ember": {
-+<<<<<<< .our
-       "version": "0.3.12",
-       "resolved": "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.3.12.tgz",
-       "integrity": "sha512-mmJzA7uzbrOqeF89dMMi6z17O07ORTXlTMArnLG9ZTX4oLaKNolUlxFUFlFm9JUoVWajVpaHQWjxH1EOQ+ARoQ==",
-+=======
-+      "version": "0.3.11",
-+      "resolved": "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.3.11.tgz",
-+      "integrity": "sha512-ErjPPiDmTd/WPgj2bSp+CGsLtJiv7FbdPKjZXH2Cd5P7j44Rqf0V9SIAAYFTQNoPqmvcp+sIcr/vH52WzPJUbw==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "q": "1.5.1"
-@@ -1723,8 +2020,13 @@
-         "dateformat": "3.0.3",
-         "handlebars": "4.0.11",
-         "json-stringify-safe": "5.0.1",
-+<<<<<<< .our
-         "lodash": "4.17.10",
-         "meow": "4.0.1",
-+=======
-+        "lodash": "4.17.5",
-+        "meow": "4.0.0",
-+>>>>>>> .their
-         "semver": "5.5.0",
-         "split": "1.0.1",
-         "through2": "2.0.3"
-@@ -1748,8 +2050,13 @@
-       "requires": {
-         "JSONStream": "1.3.2",
-         "is-text-path": "1.0.1",
-+<<<<<<< .our
-         "lodash": "4.17.10",
-         "meow": "4.0.1",
-+=======
-+        "lodash": "4.17.5",
-+        "meow": "4.0.0",
-+>>>>>>> .their
-         "split2": "2.2.0",
-         "through2": "2.0.3",
-         "trim-off-newlines": "1.0.1"
-@@ -1768,9 +2075,15 @@
-       "dev": true
-     },
-     "create-ecdh": {
-+<<<<<<< .our
-       "version": "4.0.3",
-       "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
-       "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
-+=======
-+      "version": "4.0.0",
-+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz",
-+      "integrity": "sha1-iIxyNZbN92EvZJgjPuvXo1MBc30=",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "bn.js": "4.11.8",
-@@ -1787,19 +2100,30 @@
-       }
-     },
-     "create-hash": {
-+<<<<<<< .our
-       "version": "1.2.0",
-       "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-       "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-+=======
-+      "version": "1.1.3",
-+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz",
-+      "integrity": "sha1-YGBCrIuSYnUPSDyt2rD1gZFy2P0=",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "cipher-base": "1.0.4",
-         "inherits": "2.0.3",
-+<<<<<<< .our
-         "md5.js": "1.3.4",
-         "ripemd160": "2.0.2",
-+=======
-+        "ripemd160": "2.0.1",
-+>>>>>>> .their
-         "sha.js": "2.4.11"
-       }
-     },
-     "create-hmac": {
-+<<<<<<< .our
-       "version": "1.1.7",
-       "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-       "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-@@ -1810,6 +2134,18 @@
-         "inherits": "2.0.3",
-         "ripemd160": "2.0.2",
-         "safe-buffer": "5.1.2",
-+=======
-+      "version": "1.1.6",
-+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz",
-+      "integrity": "sha1-rLniIaThe9sHbpBlfEK5PjcmzwY=",
-+      "dev": true,
-+      "requires": {
-+        "cipher-base": "1.0.4",
-+        "create-hash": "1.1.3",
-+        "inherits": "2.0.3",
-+        "ripemd160": "2.0.1",
-+        "safe-buffer": "5.1.1",
-+>>>>>>> .their
-         "sha.js": "2.4.11"
-       }
-     },
-@@ -1819,7 +2155,11 @@
-       "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "lru-cache": "4.1.3",
-+=======
-+        "lru-cache": "4.1.2",
-+>>>>>>> .their
-         "shebang-command": "1.2.0",
-         "which": "1.3.0"
-       }
-@@ -1836,7 +2176,11 @@
-         "boom": {
-           "version": "5.2.0",
-           "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-XdnabuOl8wIHdDYpDLcX0/SlTgI=",
-+=======
-+          "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "hoek": "4.2.1"
-@@ -1850,6 +2194,7 @@
-       "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "browserify-cipher": "1.0.1",
-         "browserify-sign": "4.0.4",
-         "create-ecdh": "4.0.3",
-@@ -1859,6 +2204,17 @@
-         "inherits": "2.0.3",
-         "pbkdf2": "3.0.16",
-         "public-encrypt": "4.0.2",
-+=======
-+        "browserify-cipher": "1.0.0",
-+        "browserify-sign": "4.0.4",
-+        "create-ecdh": "4.0.0",
-+        "create-hash": "1.1.3",
-+        "create-hmac": "1.1.6",
-+        "diffie-hellman": "5.0.2",
-+        "inherits": "2.0.3",
-+        "pbkdf2": "3.0.14",
-+        "public-encrypt": "4.0.0",
-+>>>>>>> .their
-         "randombytes": "2.0.6",
-         "randomfill": "1.0.4"
-       }
-@@ -1960,7 +2316,11 @@
-     "debug": {
-       "version": "2.6.9",
-       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
-+=======
-+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "ms": "2.0.0"
-@@ -2018,9 +2378,15 @@
-       "dev": true
-     },
-     "deep-extend": {
-+<<<<<<< .our
-       "version": "0.5.1",
-       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz",
-       "integrity": "sha512-N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w==",
-+=======
-+      "version": "0.4.2",
-+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
-+      "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "deep-is": {
-@@ -2061,16 +2427,26 @@
-       "requires": {
-         "find-root": "1.1.0",
-         "glob": "7.1.2",
-+<<<<<<< .our
-         "ignore": "3.3.8",
-         "pkg-config": "1.1.1",
-         "run-parallel": "1.1.9",
-+=======
-+        "ignore": "3.3.7",
-+        "pkg-config": "1.1.1",
-+        "run-parallel": "1.1.8",
-+>>>>>>> .their
-         "uniq": "1.0.1"
-       },
-       "dependencies": {
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "fs.realpath": "1.0.0",
-@@ -2104,12 +2480,15 @@
-       "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "depd": {
-       "version": "1.1.1",
-       "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
-       "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "deps-sort": {
-       "version": "2.0.0",
-       "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.0.tgz",
-@@ -2129,6 +2508,7 @@
-       "dev": true,
-       "requires": {
-         "inherits": "2.0.3",
-+<<<<<<< .our
-         "minimalistic-assert": "1.0.1"
-       }
-     },
-@@ -2146,6 +2526,9 @@
-       "requires": {
-         "address": "1.0.3",
-         "debug": "2.6.9"
-+=======
-+        "minimalistic-assert": "1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "detective": {
-@@ -2173,9 +2556,15 @@
-       "dev": true
-     },
-     "diffie-hellman": {
-+<<<<<<< .our
-       "version": "5.0.3",
-       "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-       "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
-+=======
-+      "version": "5.0.2",
-+      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz",
-+      "integrity": "sha1-tYNXOScM/ias9jIJn97SoH8gnl4=",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "bn.js": "4.11.8",
-@@ -2184,12 +2573,30 @@
-       }
-     },
-     "doctrine": {
-+<<<<<<< .our
-       "version": "2.1.0",
-       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-       "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-       "dev": true,
-       "requires": {
-         "esutils": "2.0.2"
-+=======
-+      "version": "1.5.0",
-+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
-+      "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
-+      "dev": true,
-+      "requires": {
-+        "esutils": "2.0.2",
-+        "isarray": "1.0.0"
-+      },
-+      "dependencies": {
-+        "isarray": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-+          "dev": true
-+        }
-+>>>>>>> .their
-       }
-     },
-     "dom-serializer": {
-@@ -2223,9 +2630,15 @@
-       "dev": true
-     },
-     "domhandler": {
-+<<<<<<< .our
-       "version": "2.4.2",
-       "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
-       "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
-+=======
-+      "version": "2.4.1",
-+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz",
-+      "integrity": "sha1-iS5HAAqZvlW783dP/qBWHYh5wlk=",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "domelementtype": "1.3.0"
-@@ -2266,9 +2679,15 @@
-       }
-     },
-     "dugite": {
-+<<<<<<< .our
-       "version": "1.63.0",
-       "resolved": "https://registry.npmjs.org/dugite/-/dugite-1.63.0.tgz",
-       "integrity": "sha512-CFd0sWTB2oouat0kJA4/rEQAeh6ZUvCDL9uFOaSBhLX+2CM/YL+ebKJXd8dYVIe8iVXmK5R9P31NVbRw4Ccoxw==",
-+=======
-+      "version": "1.61.0",
-+      "resolved": "https://registry.npmjs.org/dugite/-/dugite-1.61.0.tgz",
-+      "integrity": "sha512-F4d094nICYAIATRN+SZTa6x9XlebJEEyk7os7RLp7qS+IwNkBz8iMIvdrUdNutBVC0POVQ3hrRN9rGxnw7sZrA==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "checksum": "0.1.1",
-@@ -2276,7 +2695,11 @@
-         "progress": "2.0.0",
-         "request": "2.85.0",
-         "rimraf": "2.6.2",
-+<<<<<<< .our
-         "tar": "4.4.2"
-+=======
-+        "tar": "4.4.1"
-+>>>>>>> .their
-       }
-     },
-     "duplexer2": {
-@@ -2304,7 +2727,11 @@
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-             "process-nextick-args": "2.0.0",
-+<<<<<<< .our
-             "safe-buffer": "5.1.2",
-+=======
-+            "safe-buffer": "5.1.1",
-+>>>>>>> .their
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-           }
-@@ -2315,7 +2742,11 @@
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "safe-buffer": "5.1.2"
-+=======
-+            "safe-buffer": "5.1.1"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -2327,9 +2758,15 @@
-       "dev": true
-     },
-     "duplexify": {
-+<<<<<<< .our
-       "version": "3.6.0",
-       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz",
-       "integrity": "sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==",
-+=======
-+      "version": "3.5.4",
-+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.4.tgz",
-+      "integrity": "sha512-JzYSLYMhoVVBe8+mbHQ4KgpvHpm0DZpJuL8PY93Vyv1fW7jYJ90LoXa1di/CVbJM+TgMs91rbDapE/RNIfnJsA==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "end-of-stream": "1.4.1",
-@@ -2354,7 +2791,11 @@
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-             "process-nextick-args": "2.0.0",
-+<<<<<<< .our
-             "safe-buffer": "5.1.2",
-+=======
-+            "safe-buffer": "5.1.1",
-+>>>>>>> .their
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-           }
-@@ -2365,7 +2806,11 @@
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "safe-buffer": "5.1.2"
-+=======
-+            "safe-buffer": "5.1.1"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -2380,12 +2825,15 @@
-         "jsbn": "0.1.1"
-       }
-     },
-+<<<<<<< .our
-     "ee-first": {
-       "version": "1.1.1",
-       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "electabul": {
-       "version": "0.0.4",
-       "resolved": "https://registry.npmjs.org/electabul/-/electabul-0.0.4.tgz",
-@@ -2441,7 +2889,11 @@
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "fs.realpath": "1.0.0",
-@@ -2467,7 +2919,11 @@
-         "path-exists": "3.0.0",
-         "pify": "2.3.0",
-         "semver": "5.5.0",
-+<<<<<<< .our
-         "tar-fs": "1.16.2"
-+=======
-+        "tar-fs": "1.16.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "ora": {
-@@ -2523,6 +2979,7 @@
-       }
-     },
-     "electron-typescript-definitions": {
-+<<<<<<< .our
-       "version": "1.3.6",
-       "resolved": "https://registry.npmjs.org/electron-typescript-definitions/-/electron-typescript-definitions-1.3.6.tgz",
-       "integrity": "sha512-Wz6tPaaZ22lbfWwF9bzVSki7LMW96xilCT1M8eeNYZG6LcpA9x34jlrAZg5HZWTHXR2tfbTQhSmrY+FEVulD/A==",
-@@ -2538,6 +2995,23 @@
-         "rimraf": "2.6.2",
-         "tslint": "4.5.1",
-         "typescript": "2.9.2"
-+=======
-+      "version": "1.2.11",
-+      "resolved": "https://registry.npmjs.org/electron-typescript-definitions/-/electron-typescript-definitions-1.2.11.tgz",
-+      "integrity": "sha512-gBVmiGkw2hiut17wnSchYpFxrBmMb+jKFSjxbVFeivCn1OAAFykKtrsg26Sjcrra6AN1YiWyTC7SD9twPAO8dQ==",
-+      "dev": true,
-+      "requires": {
-+        "@types/node": "7.0.59",
-+        "colors": "1.2.1",
-+        "debug": "2.6.9",
-+        "electron-docs": "2.0.1",
-+        "electron-docs-linter": "2.3.4",
-+        "lodash": "4.17.5",
-+        "mkdirp": "0.5.1",
-+        "rimraf": "2.6.2",
-+        "tslint": "4.5.1",
-+        "typescript": "2.8.1"
-+>>>>>>> .their
-       }
-     },
-     "elliptic": {
-@@ -2551,6 +3025,7 @@
-         "hash.js": "1.1.3",
-         "hmac-drbg": "1.0.1",
-         "inherits": "2.0.3",
-+<<<<<<< .our
-         "minimalistic-assert": "1.0.1",
-         "minimalistic-crypto-utils": "1.0.1"
-       }
-@@ -2561,6 +3036,12 @@
-       "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
-       "dev": true
-     },
-+=======
-+        "minimalistic-assert": "1.0.0",
-+        "minimalistic-crypto-utils": "1.0.1"
-+      }
-+    },
-+>>>>>>> .their
-     "end-of-stream": {
-       "version": "1.4.1",
-       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
-@@ -2686,12 +3167,15 @@
-         "es6-symbol": "3.1.1"
-       }
-     },
-+<<<<<<< .our
-     "escape-html": {
-       "version": "1.0.3",
-       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-       "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "escape-string-regexp": {
-       "version": "1.0.5",
-       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-@@ -2744,25 +3228,41 @@
-       }
-     },
-     "eslint": {
-+<<<<<<< .our
-       "version": "3.19.0",
-       "resolved": "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz",
-       "integrity": "sha1-yPxiAcf0DdCJQbh8CFdnOGpnmsw=",
-+=======
-+      "version": "3.10.2",
-+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-3.10.2.tgz",
-+      "integrity": "sha1-yaEOi/bp1lZRIEd4xQM0Hx6sPOc=",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "babel-code-frame": "6.26.0",
-         "chalk": "1.1.3",
-         "concat-stream": "1.5.2",
-         "debug": "2.6.9",
-+<<<<<<< .our
-         "doctrine": "2.1.0",
-         "escope": "3.6.0",
-         "espree": "3.5.4",
-         "esquery": "1.0.1",
-+=======
-+        "doctrine": "1.5.0",
-+        "escope": "3.6.0",
-+        "espree": "3.5.4",
-+>>>>>>> .their
-         "estraverse": "4.2.0",
-         "esutils": "2.0.2",
-         "file-entry-cache": "2.0.0",
-         "glob": "7.1.2",
-         "globals": "9.18.0",
-+<<<<<<< .our
-         "ignore": "3.3.8",
-+=======
-+        "ignore": "3.3.7",
-+>>>>>>> .their
-         "imurmurhash": "0.1.4",
-         "inquirer": "0.12.0",
-         "is-my-json-valid": "2.17.2",
-@@ -2770,7 +3270,11 @@
-         "js-yaml": "3.11.0",
-         "json-stable-stringify": "1.0.1",
-         "levn": "0.3.0",
-+<<<<<<< .our
-         "lodash": "4.17.10",
-+=======
-+        "lodash": "4.17.5",
-+>>>>>>> .their
-         "mkdirp": "0.5.1",
-         "natural-compare": "1.4.0",
-         "optionator": "0.8.2",
-@@ -2780,7 +3284,11 @@
-         "require-uncached": "1.0.3",
-         "shelljs": "0.7.8",
-         "strip-bom": "3.0.0",
-+<<<<<<< .our
-         "strip-json-comments": "2.0.1",
-+=======
-+        "strip-json-comments": "1.0.4",
-+>>>>>>> .their
-         "table": "3.8.3",
-         "text-table": "0.2.0",
-         "user-home": "2.0.0"
-@@ -2795,7 +3303,11 @@
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "fs.realpath": "1.0.0",
-@@ -2826,10 +3338,20 @@
-           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-           "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-           "dev": true
-+<<<<<<< .our
-+=======
-+        },
-+        "strip-json-comments": {
-+          "version": "1.0.4",
-+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz",
-+          "integrity": "sha1-HhX7ysl9Pumb8tc7TGVrCCu6+5E=",
-+          "dev": true
-+>>>>>>> .their
-         }
-       }
-     },
-     "eslint-config-standard": {
-+<<<<<<< .our
-       "version": "10.2.1",
-       "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-10.2.1.tgz",
-       "integrity": "sha1-wGHk0GbzedwXzVYsZOgZtN1FRZE=",
-@@ -2839,6 +3361,17 @@
-       "version": "4.0.2",
-       "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-4.0.2.tgz",
-       "integrity": "sha512-F8fRh2WFnTek7dZH9ZaE0PCBwdVGkwVWZmizla/DDNOmg7Tx6B/IlK5+oYpiX29jpu73LszeJj5i1axEZv6VMw==",
-+=======
-+      "version": "6.2.1",
-+      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-6.2.1.tgz",
-+      "integrity": "sha1-06aKr8cZFjnn7kQec0hzkCY1QpI=",
-+      "dev": true
-+    },
-+    "eslint-config-standard-jsx": {
-+      "version": "3.2.0",
-+      "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-3.2.0.tgz",
-+      "integrity": "sha1-wkDibtkZoRpCqk3oBZRys4Jo1iA=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "eslint-import-resolver-node": {
-@@ -2849,7 +3382,11 @@
-       "requires": {
-         "debug": "2.6.9",
-         "object-assign": "4.1.1",
-+<<<<<<< .our
-         "resolve": "1.7.1"
-+=======
-+        "resolve": "1.6.0"
-+>>>>>>> .their
-       }
-     },
-     "eslint-module-utils": {
-@@ -2878,6 +3415,7 @@
-         "lodash.cond": "4.5.2",
-         "minimatch": "3.0.4",
-         "pkg-up": "1.0.0"
-+<<<<<<< .our
-       },
-       "dependencies": {
-         "doctrine": {
-@@ -2896,11 +3434,14 @@
-           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-           "dev": true
-         }
-+=======
-+>>>>>>> .their
-       }
-     },
-     "eslint-plugin-node": {
-       "version": "4.2.3",
-       "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-4.2.3.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-wEOQq428u2iHF0Aj1vOnJ2nmO5c=",
-       "dev": true,
-       "requires": {
-@@ -2908,6 +3449,15 @@
-         "minimatch": "3.0.4",
-         "object-assign": "4.1.1",
-         "resolve": "1.7.1",
-+=======
-+      "integrity": "sha512-vIUQPuwbVYdz/CYnlTLsJrRy7iXHQjdEe5wz0XhhdTym3IInM/zZLlPf9nZ2mThsH0QcsieCOWs2vOeCy/22LQ==",
-+      "dev": true,
-+      "requires": {
-+        "ignore": "3.3.7",
-+        "minimatch": "3.0.4",
-+        "object-assign": "4.1.1",
-+        "resolve": "1.6.0",
-+>>>>>>> .their
-         "semver": "5.3.0"
-       },
-       "dependencies": {
-@@ -2920,6 +3470,7 @@
-       }
-     },
-     "eslint-plugin-promise": {
-+<<<<<<< .our
-       "version": "3.5.0",
-       "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-3.5.0.tgz",
-       "integrity": "sha1-ePu2/+BHIBYnVp6FpsU3OvKmj8o=",
-@@ -2960,6 +3511,27 @@
-       "version": "3.0.1",
-       "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-3.0.1.tgz",
-       "integrity": "sha1-NNDJFbRe3G8BA5PH7vOCOwhWXPI=",
-+=======
-+      "version": "3.4.2",
-+      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-3.4.2.tgz",
-+      "integrity": "sha1-G+J5Pq/i0YtbEjuBNsJp+AT+cSI=",
-+      "dev": true
-+    },
-+    "eslint-plugin-react": {
-+      "version": "6.7.1",
-+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-6.7.1.tgz",
-+      "integrity": "sha1-Gvlq6lRYVoJRV9l8G1DVqPtkpac=",
-+      "dev": true,
-+      "requires": {
-+        "doctrine": "1.5.0",
-+        "jsx-ast-utils": "1.4.1"
-+      }
-+    },
-+    "eslint-plugin-standard": {
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-2.0.1.tgz",
-+      "integrity": "sha1-NYlpn/nJF/LCX3apFmh/ZBw2n/M=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "espree": {
-@@ -3032,12 +3604,15 @@
-       "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "etag": {
-       "version": "1.8.1",
-       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-       "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "event-emitter": {
-       "version": "0.3.5",
-       "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
-@@ -3057,11 +3632,19 @@
-     "evp_bytestokey": {
-       "version": "1.0.3",
-       "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-f8vbGY3HGVlDLv4ThCaE4FJaywI=",
-       "dev": true,
-       "requires": {
-         "md5.js": "1.3.4",
-         "safe-buffer": "5.1.2"
-+=======
-+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-+      "dev": true,
-+      "requires": {
-+        "md5.js": "1.3.4",
-+        "safe-buffer": "5.1.1"
-+>>>>>>> .their
-       }
-     },
-     "execa": {
-@@ -3100,7 +3683,11 @@
-       "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "fill-range": "2.2.4"
-+=======
-+        "fill-range": "2.2.3"
-+>>>>>>> .their
-       }
-     },
-     "extend": {
-@@ -3143,9 +3730,15 @@
-       "dev": true
-     },
-     "fault": {
-+<<<<<<< .our
-       "version": "1.0.2",
-       "resolved": "https://registry.npmjs.org/fault/-/fault-1.0.2.tgz",
-       "integrity": "sha512-o2eo/X2syzzERAtN5LcGbiVQ0WwZSlN3qLtadwAz3X8Bu+XWD16dja/KMsjZLiQr+BLGPDnHGkc4yUJf1Xpkpw==",
-+=======
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/fault/-/fault-1.0.1.tgz",
-+      "integrity": "sha1-3o01Df1IviS13BsChn4IcbkTUJI=",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "format": "0.2.2"
-@@ -3177,6 +3770,7 @@
-       "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "filesize": {
-       "version": "3.6.1",
-       "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz",
-@@ -3187,11 +3781,21 @@
-       "version": "2.2.4",
-       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
-       "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
-+=======
-+    "fill-range": {
-+      "version": "2.2.3",
-+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
-+      "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "is-number": "2.1.0",
-         "isobject": "2.1.0",
-+<<<<<<< .our
-         "randomatic": "3.0.0",
-+=======
-+        "randomatic": "1.1.7",
-+>>>>>>> .their
-         "repeat-element": "1.1.2",
-         "repeat-string": "1.6.1"
-       }
-@@ -3199,7 +3803,11 @@
-     "find-root": {
-       "version": "1.1.0",
-       "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-q8/Iunb3CMQql7PWhbfpRQv7nOQ=",
-+=======
-+      "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "find-up": {
-@@ -3308,6 +3916,7 @@
-       "integrity": "sha1-1hcBB+nv3E7TDJ3DkBbflCtctYs=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "fresh": {
-       "version": "0.5.2",
-       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-@@ -3320,6 +3929,8 @@
-       "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "fs-extra": {
-       "version": "0.26.7",
-       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz",
-@@ -3339,7 +3950,11 @@
-       "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "minipass": "2.3.0"
-+=======
-+        "minipass": "2.2.4"
-+>>>>>>> .their
-       }
-     },
-     "fs.realpath": {
-@@ -3349,29 +3964,60 @@
-       "dev": true
-     },
-     "fsevents": {
-+<<<<<<< .our
-       "version": "1.2.4",
-       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz",
-       "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==",
-+=======
-+      "version": "1.1.3",
-+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz",
-+      "integrity": "sha512-WIr7iDkdmdbxu/Gh6eKEZJL6KPE74/5MEsf2whTOFNxbIoIixogroLdKYqB6FDav4Wavh/lZdzzd3b2KxIXC5Q==",
-+>>>>>>> .their
-       "dev": true,
-       "optional": true,
-       "requires": {
-         "nan": "2.10.0",
-+<<<<<<< .our
-         "node-pre-gyp": "0.10.0"
-       },
-       "dependencies": {
-         "abbrev": {
-           "version": "1.1.1",
-+=======
-+        "node-pre-gyp": "0.6.39"
-+      },
-+      "dependencies": {
-+        "abbrev": {
-+          "version": "1.1.0",
-+>>>>>>> .their
-           "bundled": true,
-           "dev": true,
-           "optional": true
-         },
-+<<<<<<< .our
-+=======
-+        "ajv": {
-+          "version": "4.11.8",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+            "co": "4.6.0",
-+            "json-stable-stringify": "1.0.1"
-+          }
-+        },
-+>>>>>>> .their
-         "ansi-regex": {
-           "version": "2.1.1",
-           "bundled": true,
-           "dev": true
-         },
-         "aproba": {
-+<<<<<<< .our
-           "version": "1.2.0",
-+=======
-+          "version": "1.1.1",
-+>>>>>>> .their
-           "bundled": true,
-           "dev": true,
-           "optional": true
-@@ -3382,6 +4028,7 @@
-           "dev": true,
-           "optional": true,
-           "requires": {
-+<<<<<<< .our
-             "delegates": "^1.0.0",
-             "readable-stream": "^2.0.6"
-           }
-@@ -3402,6 +4049,94 @@
-         },
-         "chownr": {
-           "version": "1.0.1",
-+=======
-+            "delegates": "1.0.0",
-+            "readable-stream": "2.2.9"
-+          }
-+        },
-+        "asn1": {
-+          "version": "0.2.3",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "assert-plus": {
-+          "version": "0.2.0",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "asynckit": {
-+          "version": "0.4.0",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "aws-sign2": {
-+          "version": "0.6.0",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "aws4": {
-+          "version": "1.6.0",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "balanced-match": {
-+          "version": "0.4.2",
-+          "bundled": true,
-+          "dev": true
-+        },
-+        "bcrypt-pbkdf": {
-+          "version": "1.0.1",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+            "tweetnacl": "0.14.5"
-+          }
-+        },
-+        "block-stream": {
-+          "version": "0.0.9",
-+          "bundled": true,
-+          "dev": true,
-+          "requires": {
-+            "inherits": "2.0.3"
-+          }
-+        },
-+        "boom": {
-+          "version": "2.10.1",
-+          "bundled": true,
-+          "dev": true,
-+          "requires": {
-+            "hoek": "2.16.3"
-+          }
-+        },
-+        "brace-expansion": {
-+          "version": "1.1.7",
-+          "bundled": true,
-+          "dev": true,
-+          "requires": {
-+            "balanced-match": "0.4.2",
-+            "concat-map": "0.0.1"
-+          }
-+        },
-+        "buffer-shims": {
-+          "version": "1.0.0",
-+          "bundled": true,
-+          "dev": true
-+        },
-+        "caseless": {
-+          "version": "0.12.0",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "co": {
-+          "version": "4.6.0",
-+>>>>>>> .their
-           "bundled": true,
-           "dev": true,
-           "optional": true
-@@ -3411,6 +4146,17 @@
-           "bundled": true,
-           "dev": true
-         },
-+<<<<<<< .our
-+=======
-+        "combined-stream": {
-+          "version": "1.0.5",
-+          "bundled": true,
-+          "dev": true,
-+          "requires": {
-+            "delayed-stream": "1.0.0"
-+          }
-+        },
-+>>>>>>> .their
-         "concat-map": {
-           "version": "0.0.1",
-           "bundled": true,
-@@ -3424,11 +4170,43 @@
-         "core-util-is": {
-           "version": "1.0.2",
-           "bundled": true,
-+<<<<<<< .our
-           "dev": true,
-           "optional": true
-         },
-         "debug": {
-           "version": "2.6.9",
-+=======
-+          "dev": true
-+        },
-+        "cryptiles": {
-+          "version": "2.0.5",
-+          "bundled": true,
-+          "dev": true,
-+          "requires": {
-+            "boom": "2.10.1"
-+          }
-+        },
-+        "dashdash": {
-+          "version": "1.14.1",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+            "assert-plus": "1.0.0"
-+          },
-+          "dependencies": {
-+            "assert-plus": {
-+              "version": "1.0.0",
-+              "bundled": true,
-+              "dev": true,
-+              "optional": true
-+            }
-+          }
-+        },
-+        "debug": {
-+          "version": "2.6.8",
-+>>>>>>> .their
-           "bundled": true,
-           "dev": true,
-           "optional": true,
-@@ -3437,11 +4215,23 @@
-           }
-         },
-         "deep-extend": {
-+<<<<<<< .our
-           "version": "0.5.1",
-+=======
-+          "version": "0.4.2",
-+>>>>>>> .their
-           "bundled": true,
-           "dev": true,
-           "optional": true
-         },
-+<<<<<<< .our
-+=======
-+        "delayed-stream": {
-+          "version": "1.0.0",
-+          "bundled": true,
-+          "dev": true
-+        },
-+>>>>>>> .their
-         "delegates": {
-           "version": "1.0.0",
-           "bundled": true,
-@@ -3449,32 +4239,100 @@
-           "optional": true
-         },
-         "detect-libc": {
-+<<<<<<< .our
-           "version": "1.0.3",
-+=======
-+          "version": "1.0.2",
-+>>>>>>> .their
-           "bundled": true,
-           "dev": true,
-           "optional": true
-         },
-+<<<<<<< .our
-         "fs-minipass": {
-           "version": "1.2.5",
-+=======
-+        "ecc-jsbn": {
-+          "version": "0.1.1",
-+>>>>>>> .their
-           "bundled": true,
-           "dev": true,
-           "optional": true,
-           "requires": {
-+<<<<<<< .our
-             "minipass": "^2.2.1"
-+=======
-+            "jsbn": "0.1.1"
-           }
-         },
--        "fs.realpath": {
--          "version": "1.0.0",
-+        "extend": {
-+          "version": "3.0.1",
-           "bundled": true,
-           "dev": true,
-           "optional": true
-         },
--        "gauge": {
--          "version": "2.7.4",
-+        "extsprintf": {
-+          "version": "1.0.2",
-+          "bundled": true,
-+          "dev": true
-+        },
-+        "forever-agent": {
-+          "version": "0.6.1",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "form-data": {
-+          "version": "2.1.4",
-           "bundled": true,
-           "dev": true,
-           "optional": true,
-           "requires": {
-+            "asynckit": "0.4.0",
-+            "combined-stream": "1.0.5",
-+            "mime-types": "2.1.15"
-+>>>>>>> .their
-+          }
-+        },
-+        "fs.realpath": {
-+          "version": "1.0.0",
-+          "bundled": true,
-+<<<<<<< .our
-+          "dev": true,
-+          "optional": true
-+=======
-+          "dev": true
-+        },
-+        "fstream": {
-+          "version": "1.0.11",
-+          "bundled": true,
-+          "dev": true,
-+          "requires": {
-+            "graceful-fs": "4.1.11",
-+            "inherits": "2.0.3",
-+            "mkdirp": "0.5.1",
-+            "rimraf": "2.6.1"
-+          }
-+        },
-+        "fstream-ignore": {
-+          "version": "1.0.5",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+            "fstream": "1.0.11",
-+            "inherits": "2.0.3",
-+            "minimatch": "3.0.4"
-+          }
-+>>>>>>> .their
-+        },
-+        "gauge": {
-+          "version": "2.7.4",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+<<<<<<< .our
-             "aproba": "^1.0.3",
-             "console-control-strings": "^1.0.0",
-             "has-unicode": "^2.0.0",
-@@ -3483,12 +4341,40 @@
-             "string-width": "^1.0.1",
-             "strip-ansi": "^3.0.1",
-             "wide-align": "^1.1.0"
-+=======
-+            "aproba": "1.1.1",
-+            "console-control-strings": "1.1.0",
-+            "has-unicode": "2.0.1",
-+            "object-assign": "4.1.1",
-+            "signal-exit": "3.0.2",
-+            "string-width": "1.0.2",
-+            "strip-ansi": "3.0.1",
-+            "wide-align": "1.1.2"
-+          }
-+        },
-+        "getpass": {
-+          "version": "0.1.7",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+            "assert-plus": "1.0.0"
-+          },
-+          "dependencies": {
-+            "assert-plus": {
-+              "version": "1.0.0",
-+              "bundled": true,
-+              "dev": true,
-+              "optional": true
-+            }
-+>>>>>>> .their
-           }
-         },
-         "glob": {
-           "version": "7.1.2",
-           "bundled": true,
-           "dev": true,
-+<<<<<<< .our
-           "optional": true,
-           "requires": {
-             "fs.realpath": "^1.0.0",
-@@ -3497,6 +4383,36 @@
-             "minimatch": "^3.0.4",
-             "once": "^1.3.0",
-             "path-is-absolute": "^1.0.0"
-+=======
-+          "requires": {
-+            "fs.realpath": "1.0.0",
-+            "inflight": "1.0.6",
-+            "inherits": "2.0.3",
-+            "minimatch": "3.0.4",
-+            "once": "1.4.0",
-+            "path-is-absolute": "1.0.1"
-+          }
-+        },
-+        "graceful-fs": {
-+          "version": "4.1.11",
-+          "bundled": true,
-+          "dev": true
-+        },
-+        "har-schema": {
-+          "version": "1.0.5",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "har-validator": {
-+          "version": "4.2.1",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+            "ajv": "4.11.8",
-+            "har-schema": "1.0.5"
-+>>>>>>> .their
-           }
-         },
-         "has-unicode": {
-@@ -3505,6 +4421,7 @@
-           "dev": true,
-           "optional": true
-         },
-+<<<<<<< .our
-         "iconv-lite": {
-           "version": "0.4.21",
-           "bundled": true,
-@@ -3516,21 +4433,53 @@
-         },
-         "ignore-walk": {
-           "version": "3.0.1",
-+=======
-+        "hawk": {
-+          "version": "3.1.3",
-+          "bundled": true,
-+          "dev": true,
-+          "requires": {
-+            "boom": "2.10.1",
-+            "cryptiles": "2.0.5",
-+            "hoek": "2.16.3",
-+            "sntp": "1.0.9"
-+          }
-+        },
-+        "hoek": {
-+          "version": "2.16.3",
-+          "bundled": true,
-+          "dev": true
-+        },
-+        "http-signature": {
-+          "version": "1.1.1",
-+>>>>>>> .their
-           "bundled": true,
-           "dev": true,
-           "optional": true,
-           "requires": {
-+<<<<<<< .our
-             "minimatch": "^3.0.4"
-+=======
-+            "assert-plus": "0.2.0",
-+            "jsprim": "1.4.0",
-+            "sshpk": "1.13.0"
-+>>>>>>> .their
-           }
-         },
-         "inflight": {
-           "version": "1.0.6",
-           "bundled": true,
-           "dev": true,
-+<<<<<<< .our
-           "optional": true,
-           "requires": {
-             "once": "^1.3.0",
-             "wrappy": "1"
-+=======
-+          "requires": {
-+            "once": "1.4.0",
-+            "wrappy": "1.0.2"
-+>>>>>>> .their
-           }
-         },
-         "inherits": {
-@@ -3539,7 +4488,11 @@
-           "dev": true
-         },
-         "ini": {
-+<<<<<<< .our
-           "version": "1.3.5",
-+=======
-+          "version": "1.3.4",
-+>>>>>>> .their
-           "bundled": true,
-           "dev": true,
-           "optional": true
-@@ -3549,6 +4502,7 @@
-           "bundled": true,
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "number-is-nan": "^1.0.0"
-           }
-         },
-@@ -3582,10 +4536,56 @@
-         },
-         "minizlib": {
-           "version": "1.1.0",
-+=======
-+            "number-is-nan": "1.0.1"
-+          }
-+        },
-+        "is-typedarray": {
-+          "version": "1.0.0",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "isarray": {
-+          "version": "1.0.0",
-+          "bundled": true,
-+          "dev": true
-+        },
-+        "isstream": {
-+          "version": "0.1.2",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "jodid25519": {
-+          "version": "1.0.2",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+            "jsbn": "0.1.1"
-+          }
-+        },
-+        "jsbn": {
-+          "version": "0.1.1",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "json-schema": {
-+          "version": "0.2.3",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "json-stable-stringify": {
-+          "version": "1.0.1",
-+>>>>>>> .their
-           "bundled": true,
-           "dev": true,
-           "optional": true,
-           "requires": {
-+<<<<<<< .our
-             "minipass": "^2.2.1"
-           }
-         },
-@@ -3599,16 +4599,35 @@
-         },
-         "ms": {
-           "version": "2.0.0",
-+=======
-+            "jsonify": "0.0.0"
-+          }
-+        },
-+        "json-stringify-safe": {
-+          "version": "5.0.1",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "jsonify": {
-+          "version": "0.0.0",
-+>>>>>>> .their
-           "bundled": true,
-           "dev": true,
-           "optional": true
-         },
-+<<<<<<< .our
-         "needle": {
-           "version": "2.2.0",
-+=======
-+        "jsprim": {
-+          "version": "1.4.0",
-+>>>>>>> .their
-           "bundled": true,
-           "dev": true,
-           "optional": true,
-           "requires": {
-+<<<<<<< .our
-             "debug": "^2.1.2",
-             "iconv-lite": "^0.4.4",
-             "sax": "^1.2.4"
-@@ -3644,30 +4663,122 @@
-         },
-         "npm-bundled": {
-           "version": "1.0.3",
-+=======
-+            "assert-plus": "1.0.0",
-+            "extsprintf": "1.0.2",
-+            "json-schema": "0.2.3",
-+            "verror": "1.3.6"
-+          },
-+          "dependencies": {
-+            "assert-plus": {
-+              "version": "1.0.0",
-+              "bundled": true,
-+              "dev": true,
-+              "optional": true
-+            }
-+          }
-+        },
-+        "mime-db": {
-+          "version": "1.27.0",
-+          "bundled": true,
-+          "dev": true
-+        },
-+        "mime-types": {
-+          "version": "2.1.15",
-+          "bundled": true,
-+          "dev": true,
-+          "requires": {
-+            "mime-db": "1.27.0"
-+          }
-+        },
-+        "minimatch": {
-+          "version": "3.0.4",
-+          "bundled": true,
-+          "dev": true,
-+          "requires": {
-+            "brace-expansion": "1.1.7"
-+          }
-+        },
-+        "minimist": {
-+          "version": "0.0.8",
-+          "bundled": true,
-+          "dev": true
-+        },
-+        "mkdirp": {
-+          "version": "0.5.1",
-+          "bundled": true,
-+          "dev": true,
-+          "requires": {
-+            "minimist": "0.0.8"
-+          }
-+        },
-+        "ms": {
-+          "version": "2.0.0",
-+>>>>>>> .their
-           "bundled": true,
-           "dev": true,
-           "optional": true
-         },
-+<<<<<<< .our
-         "npm-packlist": {
-           "version": "1.1.10",
-+=======
-+        "node-pre-gyp": {
-+          "version": "0.6.39",
-+>>>>>>> .their
-           "bundled": true,
-           "dev": true,
-           "optional": true,
-           "requires": {
-+<<<<<<< .our
-             "ignore-walk": "^3.0.1",
-             "npm-bundled": "^1.0.1"
-           }
-         },
-         "npmlog": {
-           "version": "4.1.2",
-+=======
-+            "detect-libc": "1.0.2",
-+            "hawk": "3.1.3",
-+            "mkdirp": "0.5.1",
-+            "nopt": "4.0.1",
-+            "npmlog": "4.1.0",
-+            "rc": "1.2.1",
-+            "request": "2.81.0",
-+            "rimraf": "2.6.1",
-+            "semver": "5.3.0",
-+            "tar": "2.2.1",
-+            "tar-pack": "3.4.0"
-+          }
-+        },
-+        "nopt": {
-+          "version": "4.0.1",
-           "bundled": true,
-           "dev": true,
-           "optional": true,
-           "requires": {
-+            "abbrev": "1.1.0",
-+            "osenv": "0.1.4"
-+          }
-+        },
-+        "npmlog": {
-+          "version": "4.1.0",
-+>>>>>>> .their
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+<<<<<<< .our
-             "are-we-there-yet": "~1.1.2",
-             "console-control-strings": "~1.1.0",
-             "gauge": "~2.7.3",
-             "set-blocking": "~2.0.0"
-+=======
-+            "are-we-there-yet": "1.1.4",
-+            "console-control-strings": "1.1.0",
-+            "gauge": "2.7.4",
-+            "set-blocking": "2.0.0"
-+>>>>>>> .their
-           }
-         },
-         "number-is-nan": {
-@@ -3675,6 +4786,15 @@
-           "bundled": true,
-           "dev": true
-         },
-+<<<<<<< .our
-+=======
-+        "oauth-sign": {
-+          "version": "0.8.2",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+>>>>>>> .their
-         "object-assign": {
-           "version": "4.1.1",
-           "bundled": true,
-@@ -3686,7 +4806,11 @@
-           "bundled": true,
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "wrappy": "1"
-+=======
-+            "wrappy": "1.0.2"
-+>>>>>>> .their
-           }
-         },
-         "os-homedir": {
-@@ -3702,33 +4826,173 @@
-           "optional": true
-         },
-         "osenv": {
-+<<<<<<< .our
-           "version": "0.1.5",
-+=======
-+          "version": "0.1.4",
-+>>>>>>> .their
-           "bundled": true,
-           "dev": true,
-           "optional": true,
-           "requires": {
-+<<<<<<< .our
-             "os-homedir": "^1.0.0",
-             "os-tmpdir": "^1.0.0"
-+=======
-+            "os-homedir": "1.0.2",
-+            "os-tmpdir": "1.0.2"
-+>>>>>>> .their
-           }
-         },
-         "path-is-absolute": {
-           "version": "1.0.1",
-           "bundled": true,
-+<<<<<<< .our
-+=======
-+          "dev": true
-+        },
-+        "performance-now": {
-+          "version": "0.2.0",
-+          "bundled": true,
-+>>>>>>> .their
-           "dev": true,
-           "optional": true
-         },
-         "process-nextick-args": {
-+<<<<<<< .our
-           "version": "2.0.0",
-+=======
-+          "version": "1.0.7",
-+          "bundled": true,
-+          "dev": true
-+        },
-+        "punycode": {
-+          "version": "1.4.1",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "qs": {
-+          "version": "6.4.0",
-+>>>>>>> .their
-           "bundled": true,
-           "dev": true,
-           "optional": true
-         },
-         "rc": {
-+<<<<<<< .our
-           "version": "1.2.7",
-+=======
-+          "version": "1.2.1",
-           "bundled": true,
-           "dev": true,
-           "optional": true,
-           "requires": {
-+            "deep-extend": "0.4.2",
-+            "ini": "1.3.4",
-+            "minimist": "1.2.0",
-+            "strip-json-comments": "2.0.1"
-+          },
-+          "dependencies": {
-+            "minimist": {
-+              "version": "1.2.0",
-+              "bundled": true,
-+              "dev": true,
-+              "optional": true
-+            }
-+          }
-+        },
-+        "readable-stream": {
-+          "version": "2.2.9",
-+          "bundled": true,
-+          "dev": true,
-+          "requires": {
-+            "buffer-shims": "1.0.0",
-+            "core-util-is": "1.0.2",
-+            "inherits": "2.0.3",
-+            "isarray": "1.0.0",
-+            "process-nextick-args": "1.0.7",
-+            "string_decoder": "1.0.1",
-+            "util-deprecate": "1.0.2"
-+          }
-+        },
-+        "request": {
-+          "version": "2.81.0",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+            "aws-sign2": "0.6.0",
-+            "aws4": "1.6.0",
-+            "caseless": "0.12.0",
-+            "combined-stream": "1.0.5",
-+            "extend": "3.0.1",
-+            "forever-agent": "0.6.1",
-+            "form-data": "2.1.4",
-+            "har-validator": "4.2.1",
-+            "hawk": "3.1.3",
-+            "http-signature": "1.1.1",
-+            "is-typedarray": "1.0.0",
-+            "isstream": "0.1.2",
-+            "json-stringify-safe": "5.0.1",
-+            "mime-types": "2.1.15",
-+            "oauth-sign": "0.8.2",
-+            "performance-now": "0.2.0",
-+            "qs": "6.4.0",
-+            "safe-buffer": "5.0.1",
-+            "stringstream": "0.0.5",
-+            "tough-cookie": "2.3.2",
-+            "tunnel-agent": "0.6.0",
-+            "uuid": "3.0.1"
-+          }
-+        },
-+        "rimraf": {
-+          "version": "2.6.1",
-+          "bundled": true,
-+          "dev": true,
-+          "requires": {
-+            "glob": "7.1.2"
-+          }
-+        },
-+        "safe-buffer": {
-+          "version": "5.0.1",
-+          "bundled": true,
-+          "dev": true
-+        },
-+        "semver": {
-+          "version": "5.3.0",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "set-blocking": {
-+          "version": "2.0.0",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "signal-exit": {
-+          "version": "3.0.2",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "sntp": {
-+          "version": "1.0.9",
-+          "bundled": true,
-+          "dev": true,
-+          "requires": {
-+            "hoek": "2.16.3"
-+          }
-+        },
-+        "sshpk": {
-+          "version": "1.13.0",
-+>>>>>>> .their
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+<<<<<<< .our
-             "deep-extend": "^0.5.1",
-             "ini": "~1.3.0",
-             "minimist": "^1.2.0",
-@@ -3737,12 +5001,28 @@
-           "dependencies": {
-             "minimist": {
-               "version": "1.2.0",
-+=======
-+            "asn1": "0.2.3",
-+            "assert-plus": "1.0.0",
-+            "bcrypt-pbkdf": "1.0.1",
-+            "dashdash": "1.14.1",
-+            "ecc-jsbn": "0.1.1",
-+            "getpass": "0.1.7",
-+            "jodid25519": "1.0.2",
-+            "jsbn": "0.1.1",
-+            "tweetnacl": "0.14.5"
-+          },
-+          "dependencies": {
-+            "assert-plus": {
-+              "version": "1.0.0",
-+>>>>>>> .their
-               "bundled": true,
-               "dev": true,
-               "optional": true
-             }
-           }
-         },
-+<<<<<<< .our
-         "readable-stream": {
-           "version": "2.3.6",
-           "bundled": true,
-@@ -3780,10 +5060,33 @@
-         },
-         "sax": {
-           "version": "1.2.4",
-+=======
-+        "string-width": {
-+          "version": "1.0.2",
-+          "bundled": true,
-+          "dev": true,
-+          "requires": {
-+            "code-point-at": "1.1.0",
-+            "is-fullwidth-code-point": "1.0.0",
-+            "strip-ansi": "3.0.1"
-+          }
-+        },
-+        "string_decoder": {
-+          "version": "1.0.1",
-+          "bundled": true,
-+          "dev": true,
-+          "requires": {
-+            "safe-buffer": "5.0.1"
-+          }
-+        },
-+        "stringstream": {
-+          "version": "0.0.5",
-+>>>>>>> .their
-           "bundled": true,
-           "dev": true,
-           "optional": true
-         },
-+<<<<<<< .our
-         "semver": {
-           "version": "5.5.0",
-           "bundled": true,
-@@ -3792,10 +5095,23 @@
-         },
-         "set-blocking": {
-           "version": "2.0.0",
-+=======
-+        "strip-ansi": {
-+          "version": "3.0.1",
-+          "bundled": true,
-+          "dev": true,
-+          "requires": {
-+            "ansi-regex": "2.1.1"
-+          }
-+        },
-+        "strip-json-comments": {
-+          "version": "2.0.1",
-+>>>>>>> .their
-           "bundled": true,
-           "dev": true,
-           "optional": true
-         },
-+<<<<<<< .our
-         "signal-exit": {
-           "version": "3.0.2",
-           "bundled": true,
-@@ -3814,10 +5130,41 @@
-         },
-         "string_decoder": {
-           "version": "1.1.1",
-+=======
-+        "tar": {
-+          "version": "2.2.1",
-+          "bundled": true,
-+          "dev": true,
-+          "requires": {
-+            "block-stream": "0.0.9",
-+            "fstream": "1.0.11",
-+            "inherits": "2.0.3"
-+          }
-+        },
-+        "tar-pack": {
-+          "version": "3.4.0",
-           "bundled": true,
-           "dev": true,
-           "optional": true,
-           "requires": {
-+            "debug": "2.6.8",
-+            "fstream": "1.0.11",
-+            "fstream-ignore": "1.0.5",
-+            "once": "1.4.0",
-+            "readable-stream": "2.2.9",
-+            "rimraf": "2.6.1",
-+            "tar": "2.2.1",
-+            "uid-number": "0.0.6"
-+          }
-+        },
-+        "tough-cookie": {
-+          "version": "2.3.2",
-+>>>>>>> .their
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+<<<<<<< .our
-             "safe-buffer": "~5.1.0"
-           }
-         },
-@@ -3831,10 +5178,27 @@
-         },
-         "strip-json-comments": {
-           "version": "2.0.1",
-+=======
-+            "punycode": "1.4.1"
-+          }
-+        },
-+        "tunnel-agent": {
-+          "version": "0.6.0",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+            "safe-buffer": "5.0.1"
-+          }
-+        },
-+        "tweetnacl": {
-+          "version": "0.14.5",
-+>>>>>>> .their
-           "bundled": true,
-           "dev": true,
-           "optional": true
-         },
-+<<<<<<< .our
-         "tar": {
-           "version": "4.4.1",
-           "bundled": true,
-@@ -3849,38 +5213,76 @@
-             "safe-buffer": "^5.1.1",
-             "yallist": "^3.0.2"
-           }
-+=======
-+        "uid-number": {
-+          "version": "0.0.6",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+>>>>>>> .their
-         },
-         "util-deprecate": {
-           "version": "1.0.2",
-           "bundled": true,
-+<<<<<<< .our
-+          "dev": true,
-+          "optional": true
-+        },
-+=======
-+          "dev": true
-+        },
-+        "uuid": {
-+          "version": "3.0.1",
-+          "bundled": true,
-           "dev": true,
-           "optional": true
-         },
-+        "verror": {
-+          "version": "1.3.6",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+            "extsprintf": "1.0.2"
-+          }
-+        },
-+>>>>>>> .their
-         "wide-align": {
-           "version": "1.1.2",
-           "bundled": true,
-           "dev": true,
-           "optional": true,
-           "requires": {
-+<<<<<<< .our
-             "string-width": "^1.0.2"
-+=======
-+            "string-width": "1.0.2"
-+>>>>>>> .their
-           }
-         },
-         "wrappy": {
-           "version": "1.0.2",
-           "bundled": true,
-           "dev": true
-+<<<<<<< .our
-         },
-         "yallist": {
-           "version": "3.0.2",
-           "bundled": true,
-           "dev": true
-+=======
-+>>>>>>> .their
-         }
-       }
-     },
-     "function-bind": {
-       "version": "1.1.1",
-       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0=",
-+=======
-+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "generate-function": {
-@@ -4022,7 +5424,11 @@
-       "requires": {
-         "dargs": "4.1.0",
-         "lodash.template": "4.4.0",
-+<<<<<<< .our
-         "meow": "4.0.1",
-+=======
-+        "meow": "4.0.0",
-+>>>>>>> .their
-         "split2": "2.2.0",
-         "through2": "2.0.3"
-       }
-@@ -4043,7 +5449,11 @@
-       "integrity": "sha512-2jHlJnln4D/ECk9FxGEBh3k44wgYdWjWDtMmJPaecjoRmxKo3Y1Lh8GMYuOPu04CHw86NTAODchYjC5pnpMQig==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "meow": "4.0.1",
-+=======
-+        "meow": "4.0.0",
-+>>>>>>> .their
-         "semver": "5.5.0"
-       }
-     },
-@@ -4059,7 +5469,11 @@
-     "github": {
-       "version": "9.3.1",
-       "resolved": "https://registry.npmjs.org/github/-/github-9.3.1.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-ajxanMKhzQtdCXpHuu+50Ryu+J4=",
-+=======
-+      "integrity": "sha512-LvVb6iR8/7bqYgj0VeAtqys0t427jwIBkv/+or/ssypfIk5R1fnz4aeIEv4udPw6VFoH6vL4gi+foBoD5aazXg==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "follow-redirects": "0.0.7",
-@@ -4112,7 +5526,11 @@
-     "globals": {
-       "version": "9.18.0",
-       "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-qjiWs+abSH8X4x7SFD1pqOMMLYo=",
-+=======
-+      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "globby": {
-@@ -4132,7 +5550,11 @@
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "fs.realpath": "1.0.0",
-@@ -4158,7 +5580,11 @@
-         "is-retry-allowed": "1.1.0",
-         "is-stream": "1.1.0",
-         "lowercase-keys": "1.0.1",
-+<<<<<<< .our
-         "safe-buffer": "5.1.2",
-+=======
-+        "safe-buffer": "5.1.1",
-+>>>>>>> .their
-         "timed-out": "4.0.1",
-         "unzip-response": "2.0.1",
-         "url-parse-lax": "1.0.0"
-@@ -4173,14 +5599,22 @@
-     "gunzip-maybe": {
-       "version": "1.4.1",
-       "resolved": "https://registry.npmjs.org/gunzip-maybe/-/gunzip-maybe-1.4.1.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-Occu2J0bSbpwjhh3ZQBIiQKlICc=",
-+=======
-+      "integrity": "sha512-qtutIKMthNJJgeHQS7kZ9FqDq59/Wn0G2HYCRNjpup7yKfVI6/eqwpmroyZGFoCYaG+sW6psNVb4zoLADHpp2g==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "browserify-zlib": "0.1.4",
-         "is-deflate": "1.0.0",
-         "is-gzip": "1.0.0",
-         "peek-stream": "1.1.3",
-+<<<<<<< .our
-         "pumpify": "1.5.0",
-+=======
-+        "pumpify": "1.4.0",
-+>>>>>>> .their
-         "through2": "2.0.3"
-       }
-     },
-@@ -4270,6 +5704,7 @@
-       "dev": true
-     },
-     "hash-base": {
-+<<<<<<< .our
-       "version": "3.0.4",
-       "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
-       "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
-@@ -4277,22 +5712,42 @@
-       "requires": {
-         "inherits": "2.0.3",
-         "safe-buffer": "5.1.2"
-+=======
-+      "version": "2.0.2",
-+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz",
-+      "integrity": "sha1-ZuodhW206KVHDK32/OI65SRO8uE=",
-+      "dev": true,
-+      "requires": {
-+        "inherits": "2.0.3"
-+>>>>>>> .their
-       }
-     },
-     "hash.js": {
-       "version": "1.1.3",
-       "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-NA3tvmKQGHFRweodd3o0SJNd+EY=",
-       "dev": true,
-       "requires": {
-         "inherits": "2.0.3",
-         "minimalistic-assert": "1.0.1"
-+=======
-+      "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==",
-+      "dev": true,
-+      "requires": {
-+        "inherits": "2.0.3",
-+        "minimalistic-assert": "1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "hawk": {
-       "version": "6.0.2",
-       "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-r02RTrBl+bXOTZ0RwcshJu7MMDg=",
-+=======
-+      "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "boom": "4.3.1",
-@@ -4308,7 +5763,11 @@
-       "dev": true,
-       "requires": {
-         "hash.js": "1.1.3",
-+<<<<<<< .our
-         "minimalistic-assert": "1.0.1",
-+=======
-+        "minimalistic-assert": "1.0.0",
-+>>>>>>> .their
-         "minimalistic-crypto-utils": "1.0.1"
-       }
-     },
-@@ -4318,18 +5777,34 @@
-       "integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==",
-       "dev": true
-     },
-+<<<<<<< .our
-+=======
-+    "home-or-tmp": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
-+      "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
-+      "dev": true,
-+      "requires": {
-+        "os-homedir": "1.0.2",
-+        "os-tmpdir": "1.0.2"
-+      }
-+    },
-+>>>>>>> .their
-     "hosted-git-info": {
-       "version": "2.6.0",
-       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.0.tgz",
-       "integrity": "sha512-lIbgIIQA3lz5XaB6vxakj6sDHADJiZadYEJB+FgA+C4nubM1NwcuvUr9EJPmnH1skZqpqUzWborWo8EIUi0Sdw==",
-       "dev": true
-     },
-+<<<<<<< .our
-     "html-entities": {
-       "version": "1.2.1",
-       "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz",
-       "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "htmlescape": {
-       "version": "1.1.1",
-       "resolved": "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz",
-@@ -4343,7 +5818,11 @@
-       "dev": true,
-       "requires": {
-         "domelementtype": "1.3.0",
-+<<<<<<< .our
-         "domhandler": "2.4.2",
-+=======
-+        "domhandler": "2.4.1",
-+>>>>>>> .their
-         "domutils": "1.5.1",
-         "entities": "1.1.1",
-         "inherits": "2.0.3",
-@@ -4366,7 +5845,11 @@
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-             "process-nextick-args": "2.0.0",
-+<<<<<<< .our
-             "safe-buffer": "5.1.2",
-+=======
-+            "safe-buffer": "5.1.1",
-+>>>>>>> .their
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-           }
-@@ -4377,11 +5860,16 @@
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "safe-buffer": "5.1.2"
-+=======
-+            "safe-buffer": "5.1.1"
-+>>>>>>> .their
-           }
-         }
-       }
-     },
-+<<<<<<< .our
-     "http-errors": {
-       "version": "1.6.2",
-       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz",
-@@ -4394,6 +5882,8 @@
-         "statuses": "1.5.0"
-       }
-     },
-+=======
-+>>>>>>> .their
-     "http-signature": {
-       "version": "1.2.0",
-       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-@@ -4425,7 +5915,11 @@
-     "husky": {
-       "version": "0.14.3",
-       "resolved": "https://registry.npmjs.org/husky/-/husky-0.14.3.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-xp7XTi0neXaaF7qDmbVM4LY8EsM=",
-+=======
-+      "integrity": "sha512-e21wivqHpstpoiWA/Yi8eFti8E+sQDSS53cpJsPptPs295QTOQR0ZwnHo2TXy1XOpZFD9rPOd3NpmqTK6uMLJA==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "is-ci": "1.1.0",
-@@ -4441,12 +5935,15 @@
-         }
-       }
-     },
-+<<<<<<< .our
-     "iconv-lite": {
-       "version": "0.4.19",
-       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
-       "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "ieee754": {
-       "version": "1.1.11",
-       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.11.tgz",
-@@ -4454,9 +5951,15 @@
-       "dev": true
-     },
-     "ignore": {
-+<<<<<<< .our
-       "version": "3.3.8",
-       "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.8.tgz",
-       "integrity": "sha512-pUh+xUQQhQzevjRHHFqqcTy0/dP/kS9I8HSrUydhihjuD09W6ldVWFtIrwhXdUJHis3i2rZNqEHpZH/cbinFbg==",
-+=======
-+      "version": "3.3.7",
-+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz",
-+      "integrity": "sha512-YGG3ejvBNHRqu0559EOxxNFihD0AjpvHlC/pdGKd3X3ofe+CoJkYazwNJYTNebqpPKN+VVQbh4ZFn1DivMNuHA==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "import-lazy": {
-@@ -4526,7 +6029,11 @@
-         "cli-cursor": "1.0.2",
-         "cli-width": "2.2.0",
-         "figures": "1.7.0",
-+<<<<<<< .our
-         "lodash": "4.17.10",
-+=======
-+        "lodash": "4.17.5",
-+>>>>>>> .their
-         "readline2": "1.0.1",
-         "run-async": "0.1.0",
-         "rx-lite": "3.1.2",
-@@ -4536,9 +6043,15 @@
-       }
-     },
-     "insert-module-globals": {
-+<<<<<<< .our
-       "version": "7.0.6",
-       "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.0.6.tgz",
-       "integrity": "sha512-R3sidKJr3SsggqQQ5cEwQb3pWG8RNx0UnpyeiOSR6jorRIeAOzH2gkTWnNdMnyRiVbjrG047K7UCtlMkQ1Mo9w==",
-+=======
-+      "version": "7.0.5",
-+      "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.0.5.tgz",
-+      "integrity": "sha512-wgRtrCpMm0ruH2hgLUIx+9YfJsgJQmU1KkPUzTuatW9dbH19yPRqAQhFX1HJU6zbmg2IMmt80BgSE5MWuksw3Q==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "JSONStream": "1.3.2",
-@@ -4546,7 +6059,10 @@
-         "concat-stream": "1.6.2",
-         "is-buffer": "1.1.6",
-         "lexical-scope": "1.2.0",
-+<<<<<<< .our
-         "path-is-absolute": "1.0.1",
-+=======
-+>>>>>>> .their
-         "process": "0.11.10",
-         "through2": "2.0.3",
-         "xtend": "4.0.1"
-@@ -4580,7 +6096,11 @@
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-             "process-nextick-args": "2.0.0",
-+<<<<<<< .our
-             "safe-buffer": "5.1.2",
-+=======
-+            "safe-buffer": "5.1.1",
-+>>>>>>> .their
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-           }
-@@ -4591,7 +6111,11 @@
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "safe-buffer": "5.1.2"
-+=======
-+            "safe-buffer": "5.1.1"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -4608,12 +6132,15 @@
-       "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "ip": {
-       "version": "1.1.5",
-       "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
-       "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "irregular-plurals": {
-       "version": "1.4.0",
-       "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-1.4.0.tgz",
-@@ -4621,9 +6148,15 @@
-       "dev": true
-     },
-     "is-alphabetical": {
-+<<<<<<< .our
-       "version": "1.0.2",
-       "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.2.tgz",
-       "integrity": "sha512-V0xN4BYezDHcBSKb1QHUFMlR4as/XEuCZBzMJUU4n7+Cbt33SmUnSol+pnXFvLxSHNq2CemUXNdaXV6Flg7+xg==",
-+=======
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.1.tgz",
-+      "integrity": "sha1-x3B5zJHU76x3W+EDS/LSQ/lebwg=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "is-alphanumeric": {
-@@ -4633,6 +6166,7 @@
-       "dev": true
-     },
-     "is-alphanumerical": {
-+<<<<<<< .our
-       "version": "1.0.2",
-       "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.2.tgz",
-       "integrity": "sha512-pyfU/0kHdISIgslFfZN9nfY1Gk3MquQgUm1mJTjdkEPpkAKNWuBTSqFwewOpR7N351VkErCiyV71zX7mlQQqsg==",
-@@ -4640,6 +6174,15 @@
-       "requires": {
-         "is-alphabetical": "1.0.2",
-         "is-decimal": "1.0.2"
-+=======
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.1.tgz",
-+      "integrity": "sha1-37SqTRCF4zvbYcLe6cgOnGwZ9Ts=",
-+      "dev": true,
-+      "requires": {
-+        "is-alphabetical": "1.0.1",
-+        "is-decimal": "1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "is-arrayish": {
-@@ -4694,9 +6237,15 @@
-       "dev": true
-     },
-     "is-decimal": {
-+<<<<<<< .our
-       "version": "1.0.2",
-       "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.2.tgz",
-       "integrity": "sha512-TRzl7mOCchnhchN+f3ICUCzYvL9ul7R+TYOsZ8xia++knyZAJfv/uA1FvQXsAnYIl1T3B2X5E/J7Wb1QXiIBXg==",
-+=======
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.1.tgz",
-+      "integrity": "sha1-9ftqlJlq2ejjdh+/vQkfH8qMToI=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "is-deflate": {
-@@ -4778,9 +6327,15 @@
-       "dev": true
-     },
-     "is-hexadecimal": {
-+<<<<<<< .our
-       "version": "1.0.2",
-       "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.2.tgz",
-       "integrity": "sha512-but/G3sapV3MNyqiDBLrOi4x8uCIw0RY3o/Vb5GT0sMFHrVV7731wFSVy41T5FO1og7G0gXLJh0MkgPRouko/A==",
-+=======
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.1.tgz",
-+      "integrity": "sha1-bghLvJIGH7sJcexYts5tQE4k2mk=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "is-hidden": {
-@@ -4960,6 +6515,7 @@
-       "dev": true
-     },
-     "is-whitespace-character": {
-+<<<<<<< .our
-       "version": "1.0.2",
-       "resolved": "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.2.tgz",
-       "integrity": "sha512-SzM+T5GKUCtLhlHFKt2SDAX2RFzfS6joT91F2/WSi9LxgFdsnhfPK/UIA+JhRR2xuyLdrCys2PiFDrtn1fU5hQ==",
-@@ -4975,6 +6531,17 @@
-       "version": "1.1.0",
-       "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
-       "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
-+=======
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.1.tgz",
-+      "integrity": "sha1-muAXbzKCtlRXoZks2whPil+DPjs=",
-+      "dev": true
-+    },
-+    "is-word-character": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.1.tgz",
-+      "integrity": "sha1-WgP6HqkazopusMfNdw64bWXIvvs=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "isarray": {
-@@ -5086,7 +6653,11 @@
-         "esprima": {
-           "version": "4.0.0",
-           "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-RJnt3NERDgshi6zy+n9/WfVcqAQ=",
-+=======
-+          "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==",
-+>>>>>>> .their
-           "dev": true
-         }
-       }
-@@ -5277,12 +6848,15 @@
-         "invert-kv": "1.0.0"
-       }
-     },
-+<<<<<<< .our
-     "leven": {
-       "version": "2.1.0",
-       "resolved": "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz",
-       "integrity": "sha1-wuep93IJTe6dNCAq6KzORoeHVYA=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "levn": {
-       "version": "0.3.0",
-       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-@@ -5311,12 +6885,15 @@
-         "uc.micro": "1.0.5"
-       }
-     },
-+<<<<<<< .our
-     "lint": {
-       "version": "1.1.2",
-       "resolved": "https://registry.npmjs.org/lint/-/lint-1.1.2.tgz",
-       "integrity": "sha1-Ne0GTzIlR8MxNY2JmGhmSWi6Nx8=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "load-json-file": {
-       "version": "1.1.0",
-       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-@@ -5331,6 +6908,7 @@
-       }
-     },
-     "load-plugin": {
-+<<<<<<< .our
-       "version": "2.2.2",
-       "resolved": "https://registry.npmjs.org/load-plugin/-/load-plugin-2.2.2.tgz",
-       "integrity": "sha512-FYzamtURIJefQykZGtiClYuZkJBUKzmx8Tc74y8JGAulDzbzVm/C+w/MbAljHRr+REL0cRzy3WgnHE+T8gce5g==",
-@@ -5338,6 +6916,15 @@
-       "requires": {
-         "npm-prefix": "1.2.0",
-         "resolve-from": "4.0.0"
-+=======
-+      "version": "2.2.1",
-+      "resolved": "https://registry.npmjs.org/load-plugin/-/load-plugin-2.2.1.tgz",
-+      "integrity": "sha512-raqInsJNdPGpzZyb+FjjJYmXsjIm8fIiOjOmqmUTGPyCXDMeEK3p4x4Xm1ZCNp43UmfDTWvo7pZkB2fKbD5AAA==",
-+      "dev": true,
-+      "requires": {
-+        "npm-prefix": "1.2.0",
-+        "resolve-from": "2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "locate-path": {
-@@ -5359,9 +6946,15 @@
-       }
-     },
-     "lodash": {
-+<<<<<<< .our
-       "version": "4.17.10",
-       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
-       "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==",
-+=======
-+      "version": "4.17.5",
-+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz",
-+      "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "lodash._reinterpolate": {
-@@ -5541,9 +7134,15 @@
-       "dev": true
-     },
-     "lru-cache": {
-+<<<<<<< .our
-       "version": "4.1.3",
-       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz",
-       "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
-+=======
-+      "version": "4.1.2",
-+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.2.tgz",
-+      "integrity": "sha512-wgeVXhrDwAWnIF/yZARsFnMBtdFXOg1b8RIrhilp+0iDYN4mdQcNZElDZ0e4B64BhaxeQ5zN7PMyvu7we1kPeQ==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "pseudomap": "1.0.2",
-@@ -5559,9 +7158,15 @@
-       }
-     },
-     "make-dir": {
-+<<<<<<< .our
-       "version": "1.3.0",
-       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
-       "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
-+=======
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.2.0.tgz",
-+      "integrity": "sha512-aNUAa4UMg/UougV25bbrU4ZaaKNjJ/3/xnvg/twpmKROPdKZPZ9wGgI0opdZzO8q/zUFawoUuixuOv33eZ61Iw==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "pify": "3.0.0"
-@@ -5582,9 +7187,15 @@
-       "dev": true
-     },
-     "markdown-escapes": {
-+<<<<<<< .our
-       "version": "1.0.2",
-       "resolved": "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.2.tgz",
-       "integrity": "sha512-lbRZ2mE3Q9RtLjxZBZ9+IMl68DKIXaVAhwvwn9pmjnPLS0h/6kyBMgNhqi1xFJ/2yv6cSyv0jbiZavZv93JkkA==",
-+=======
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.1.tgz",
-+      "integrity": "sha1-GZTfLTr0gR3lmmcUk0wrIpJzRRg=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "markdown-extensions": {
-@@ -5616,9 +7227,15 @@
-       }
-     },
-     "markdown-table": {
-+<<<<<<< .our
-       "version": "1.1.2",
-       "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-1.1.2.tgz",
-       "integrity": "sha512-NcWuJFHDA8V3wkDgR/j4+gZx+YQwstPgfQDV8ndUeWWzta3dnDTBxpVzqS9lkmJAuV5YX35lmyojl6HO5JXAgw==",
-+=======
-+      "version": "1.1.1",
-+      "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-1.1.1.tgz",
-+      "integrity": "sha1-Sz3ToTPRUYuO8NvHCb8qG0gkvIw=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "marky-markdown-lite": {
-@@ -5628,7 +7245,11 @@
-       "dev": true,
-       "requires": {
-         "cheerio": "0.20.0",
-+<<<<<<< .our
-         "conventional-changelog-cli": "1.3.22",
-+=======
-+        "conventional-changelog-cli": "1.3.21",
-+>>>>>>> .their
-         "is-file": "1.0.0",
-         "markdown-it": "6.1.1",
-         "markdown-it-named-headers": "0.0.4"
-@@ -5645,7 +7266,11 @@
-             "entities": "1.1.1",
-             "htmlparser2": "3.8.3",
-             "jsdom": "7.2.2",
-+<<<<<<< .our
-             "lodash": "4.17.10"
-+=======
-+            "lodash": "4.17.5"
-+>>>>>>> .their
-           }
-         },
-         "domhandler": {
-@@ -5683,18 +7308,25 @@
-     "matcher-collection": {
-       "version": "1.0.5",
-       "resolved": "https://registry.npmjs.org/matcher-collection/-/matcher-collection-1.0.5.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-LuCVQ4Nyy4iE8FgjQTjAXGROwzk=",
-+=======
-+      "integrity": "sha512-nUCmzKipcJEwYsBVAFh5P+d7JBuhJaW1xs85Hara9xuMLqtCVUrW6DSC0JVIkluxEH2W45nPBM/wjHtBXa/tYA==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "minimatch": "3.0.4"
-       }
-     },
-+<<<<<<< .our
-     "math-random": {
-       "version": "1.0.1",
-       "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.1.tgz",
-       "integrity": "sha1-izqsWIuKZuSXXjzepn97sylgH6w=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "md5.js": {
-       "version": "1.3.4",
-       "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz",
-@@ -5703,6 +7335,21 @@
-       "requires": {
-         "hash-base": "3.0.4",
-         "inherits": "2.0.3"
-+<<<<<<< .our
-+=======
-+      },
-+      "dependencies": {
-+        "hash-base": {
-+          "version": "3.0.4",
-+          "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
-+          "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
-+          "dev": true,
-+          "requires": {
-+            "inherits": "2.0.3",
-+            "safe-buffer": "5.1.1"
-+          }
-+        }
-+>>>>>>> .their
-       }
-     },
-     "mdast-comment-marker": {
-@@ -5717,8 +7364,13 @@
-       "integrity": "sha1-zbX4TitqLTEU3zO9BdnLMuPECDo=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unist-util-modify-children": "1.1.2",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unist-util-modify-children": "1.1.1",
-+        "unist-util-visit": "1.3.0"
-+>>>>>>> .their
-       }
-     },
-     "mdast-util-heading-style": {
-@@ -5740,9 +7392,15 @@
-       "dev": true
-     },
-     "meow": {
-+<<<<<<< .our
-       "version": "4.0.1",
-       "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz",
-       "integrity": "sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==",
-+=======
-+      "version": "4.0.0",
-+      "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.0.tgz",
-+      "integrity": "sha512-Me/kel335m6vMKmEmA6c87Z6DUFW3JqkINRnxkbC+A/PUm0D5Fl2dEBQrPKnqCL9Te/CIa1MUt/0InMJhuC/sw==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "camelcase-keys": "4.2.0",
-@@ -5831,6 +7489,7 @@
-         }
-       }
-     },
-+<<<<<<< .our
-     "micro": {
-       "version": "9.3.1",
-       "resolved": "https://registry.npmjs.org/micro/-/micro-9.3.1.tgz",
-@@ -5890,6 +7549,8 @@
-         "compression": "1.7.3"
-       }
-     },
-+=======
-+>>>>>>> .their
-     "micromatch": {
-       "version": "2.3.11",
-       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-@@ -5914,7 +7575,11 @@
-     "miller-rabin": {
-       "version": "4.0.1",
-       "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-8IA1HIZbDcViqEYpZtqlNUPHik0=",
-+=======
-+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "bn.js": "4.11.8",
-@@ -5949,9 +7614,15 @@
-       "dev": true
-     },
-     "minimalistic-assert": {
-+<<<<<<< .our
-       "version": "1.0.1",
-       "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-       "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-+=======
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz",
-+      "integrity": "sha1-cCvi3aazf0g2vLP121ZkG2Sh09M=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "minimalistic-crypto-utils": {
-@@ -5963,7 +7634,11 @@
-     "minimatch": {
-       "version": "3.0.4",
-       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
-+=======
-+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "brace-expansion": "1.1.11"
-@@ -5986,12 +7661,21 @@
-       }
-     },
-     "minipass": {
-+<<<<<<< .our
-       "version": "2.3.0",
-       "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.0.tgz",
-       "integrity": "sha512-jWC2Eg+Np4bxah7llu1IrUNSJQxtLz/J+pOjTM0nFpJXGAaV18XBWhUn031Q1tAA/TJtA1jgwnOe9S2PQa4Lbg==",
-       "dev": true,
-       "requires": {
-         "safe-buffer": "5.1.2",
-+=======
-+      "version": "2.2.4",
-+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.2.4.tgz",
-+      "integrity": "sha512-hzXIWWet/BzWhYs2b+u7dRHlruXhwdgvlTMDKC6Cb1U7ps6Ac6yQlR39xsbjWJE377YTCtKwIXIpJ5oP+j5y8g==",
-+      "dev": true,
-+      "requires": {
-+        "safe-buffer": "5.1.1",
-+>>>>>>> .their
-         "yallist": "3.0.2"
-       }
-     },
-@@ -6001,7 +7685,11 @@
-       "integrity": "sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "minipass": "2.3.0"
-+=======
-+        "minipass": "2.2.4"
-+>>>>>>> .their
-       }
-     },
-     "mkdirp": {
-@@ -6060,7 +7748,11 @@
-         "inherits": "2.0.3",
-         "parents": "1.0.1",
-         "readable-stream": "2.3.6",
-+<<<<<<< .our
-         "resolve": "1.7.1",
-+=======
-+        "resolve": "1.6.0",
-+>>>>>>> .their
-         "stream-combiner2": "1.1.1",
-         "subarg": "1.0.0",
-         "through2": "2.0.3",
-@@ -6083,7 +7775,11 @@
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-             "process-nextick-args": "2.0.0",
-+<<<<<<< .our
-             "safe-buffer": "5.1.2",
-+=======
-+            "safe-buffer": "5.1.1",
-+>>>>>>> .their
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-           }
-@@ -6094,17 +7790,24 @@
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "safe-buffer": "5.1.2"
-+=======
-+            "safe-buffer": "5.1.1"
-+>>>>>>> .their
-           }
-         }
-       }
-     },
-+<<<<<<< .our
-     "mri": {
-       "version": "1.1.0",
-       "resolved": "https://registry.npmjs.org/mri/-/mri-1.1.0.tgz",
-       "integrity": "sha1-XAo/KcjM/7ux7JQdzsCdcfoy82o=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "ms": {
-       "version": "2.0.0",
-       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-@@ -6130,12 +7833,15 @@
-       "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "negotiator": {
-       "version": "0.6.1",
-       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
-       "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "netrc": {
-       "version": "0.1.4",
-       "resolved": "https://registry.npmjs.org/netrc/-/netrc-0.1.4.tgz",
-@@ -6157,6 +7863,7 @@
-         "minimatch": "3.0.4"
-       }
-     },
-+<<<<<<< .our
-     "node-fetch": {
-       "version": "2.1.2",
-       "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.1.2.tgz",
-@@ -6169,6 +7876,8 @@
-       "integrity": "sha512-rEwE51JWn0yN3Wl5BXeGn5d52OGbSXzWiiXRjAQeuyvcGKyvuSILW2rb3G7Xh+nexzLwhTpek6Ehxd6IjvHePg==",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "nopt": {
-       "version": "3.0.6",
-       "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-@@ -6181,7 +7890,11 @@
-     "normalize-package-data": {
-       "version": "2.4.0",
-       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-EvlaMH1YNSB1oEkHuErIvpisAS8=",
-+=======
-+      "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "hosted-git-info": "2.6.0",
-@@ -6205,7 +7918,11 @@
-       "integrity": "sha1-5hlFX3B0ulTMZtbQ033Z8b5ry8A=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "rc": "1.2.7",
-+=======
-+        "rc": "1.2.6",
-+>>>>>>> .their
-         "shellsubstitute": "1.2.0",
-         "untildify": "2.1.0"
-       }
-@@ -6304,6 +8021,7 @@
-         "is-extendable": "0.1.1"
-       }
-     },
-+<<<<<<< .our
-     "octicons": {
-       "version": "7.3.0",
-       "resolved": "https://registry.npmjs.org/octicons/-/octicons-7.3.0.tgz",
-@@ -6328,6 +8046,8 @@
-       "integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "once": {
-       "version": "1.4.0",
-       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-@@ -6343,6 +8063,7 @@
-       "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "openssl-self-signed-certificate": {
-       "version": "1.1.6",
-       "resolved": "https://registry.npmjs.org/openssl-self-signed-certificate/-/openssl-self-signed-certificate-1.1.6.tgz",
-@@ -6358,6 +8079,8 @@
-         "is-wsl": "1.1.0"
-       }
-     },
-+=======
-+>>>>>>> .their
-     "optimist": {
-       "version": "0.3.7",
-       "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
-@@ -6494,13 +8217,20 @@
-       }
-     },
-     "parse-asn1": {
-+<<<<<<< .our
-       "version": "5.1.1",
-       "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz",
-       "integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==",
-+=======
-+      "version": "5.1.0",
-+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz",
-+      "integrity": "sha1-N8T5t+06tlx0gXtfJICTf7+XxxI=",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "asn1.js": "4.10.1",
-         "browserify-aes": "1.2.0",
-+<<<<<<< .our
-         "create-hash": "1.2.0",
-         "evp_bytestokey": "1.0.3",
-         "pbkdf2": "3.0.16"
-@@ -6518,6 +8248,25 @@
-         "is-alphanumerical": "1.0.2",
-         "is-decimal": "1.0.2",
-         "is-hexadecimal": "1.0.2"
-+=======
-+        "create-hash": "1.1.3",
-+        "evp_bytestokey": "1.0.3",
-+        "pbkdf2": "3.0.14"
-+      }
-+    },
-+    "parse-entities": {
-+      "version": "1.1.1",
-+      "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-1.1.1.tgz",
-+      "integrity": "sha1-gRLYhHExnyerrk1klksSL+ThuJA=",
-+      "dev": true,
-+      "requires": {
-+        "character-entities": "1.2.1",
-+        "character-entities-legacy": "1.1.1",
-+        "character-reference-invalid": "1.1.1",
-+        "is-alphanumerical": "1.0.1",
-+        "is-decimal": "1.0.1",
-+        "is-hexadecimal": "1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "parse-github-repo-url": {
-@@ -6644,6 +8393,7 @@
-       }
-     },
-     "pbkdf2": {
-+<<<<<<< .our
-       "version": "3.0.16",
-       "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.16.tgz",
-       "integrity": "sha512-y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA==",
-@@ -6653,6 +8403,17 @@
-         "create-hmac": "1.1.7",
-         "ripemd160": "2.0.2",
-         "safe-buffer": "5.1.2",
-+=======
-+      "version": "3.0.14",
-+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz",
-+      "integrity": "sha512-gjsZW9O34fm0R7PaLHRJmLLVfSoesxztjPjE9o6R+qtVJij90ltg1joIovN9GKrRW3t1PzhDDG3UMEMFfZ+1wA==",
-+      "dev": true,
-+      "requires": {
-+        "create-hash": "1.1.3",
-+        "create-hmac": "1.1.6",
-+        "ripemd160": "2.0.1",
-+        "safe-buffer": "5.1.1",
-+>>>>>>> .their
-         "sha.js": "2.4.11"
-       }
-     },
-@@ -6663,7 +8424,11 @@
-       "dev": true,
-       "requires": {
-         "buffer-from": "1.0.0",
-+<<<<<<< .our
-         "duplexify": "3.6.0",
-+=======
-+        "duplexify": "3.5.4",
-+>>>>>>> .their
-         "through2": "2.0.3"
-       }
-     },
-@@ -6953,15 +8718,26 @@
-       "dev": true
-     },
-     "public-encrypt": {
-+<<<<<<< .our
-       "version": "4.0.2",
-       "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz",
-       "integrity": "sha512-4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==",
-+=======
-+      "version": "4.0.0",
-+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz",
-+      "integrity": "sha1-OfaZ86RlYN1eusvKaTyvfGXBjMY=",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "bn.js": "4.11.8",
-         "browserify-rsa": "4.0.1",
-+<<<<<<< .our
-         "create-hash": "1.2.0",
-         "parse-asn1": "5.1.1",
-+=======
-+        "create-hash": "1.1.3",
-+        "parse-asn1": "5.1.0",
-+>>>>>>> .their
-         "randombytes": "2.0.6"
-       }
-     },
-@@ -6976,12 +8752,21 @@
-       }
-     },
-     "pumpify": {
-+<<<<<<< .our
-       "version": "1.5.0",
-       "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.0.tgz",
-       "integrity": "sha512-UWi0klDoq8xtVzlMRgENV9F7iCTZExaJQSQL187UXsxpk9NnrKGqTqqUNYAKGOzucSOxs2+jUnRNI+rLviPhJg==",
-       "dev": true,
-       "requires": {
-         "duplexify": "3.6.0",
-+=======
-+      "version": "1.4.0",
-+      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.4.0.tgz",
-+      "integrity": "sha512-2kmNR9ry+Pf45opRVirpNuIFotsxUGLaYqxIwuR77AYrYRMuFCz9eryHBS52L360O+NcR383CL4QYlMKPq4zYA==",
-+      "dev": true,
-+      "requires": {
-+        "duplexify": "3.5.4",
-+>>>>>>> .their
-         "inherits": "2.0.3",
-         "pump": "2.0.1"
-       }
-@@ -6999,9 +8784,15 @@
-       "dev": true
-     },
-     "qs": {
-+<<<<<<< .our
-       "version": "6.5.2",
-       "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-       "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-+=======
-+      "version": "6.5.1",
-+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
-+      "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "querystring": {
-@@ -7023,6 +8814,7 @@
-       "dev": true
-     },
-     "randomatic": {
-+<<<<<<< .our
-       "version": "3.0.0",
-       "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.0.0.tgz",
-       "integrity": "sha512-VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA==",
-@@ -7040,10 +8832,49 @@
-           "dev": true
-         },
-         "kind-of": {
--          "version": "6.0.2",
--          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
--          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
--          "dev": true
-+          "version": "6.0.2",
-+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-+          "dev": true
-+=======
-+      "version": "1.1.7",
-+      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
-+      "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==",
-+      "dev": true,
-+      "requires": {
-+        "is-number": "3.0.0",
-+        "kind-of": "4.0.0"
-+      },
-+      "dependencies": {
-+        "is-number": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-+          "dev": true,
-+          "requires": {
-+            "kind-of": "3.2.2"
-+          },
-+          "dependencies": {
-+            "kind-of": {
-+              "version": "3.2.2",
-+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-+              "dev": true,
-+              "requires": {
-+                "is-buffer": "1.1.6"
-+              }
-+            }
-+          }
-+        },
-+        "kind-of": {
-+          "version": "4.0.0",
-+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-+          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-+          "dev": true,
-+          "requires": {
-+            "is-buffer": "1.1.6"
-+          }
-+>>>>>>> .their
-         }
-       }
-     },
-@@ -7053,7 +8884,11 @@
-       "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "safe-buffer": "5.1.2"
-+=======
-+        "safe-buffer": "5.1.1"
-+>>>>>>> .their
-       }
-     },
-     "randomfill": {
-@@ -7063,6 +8898,7 @@
-       "dev": true,
-       "requires": {
-         "randombytes": "2.0.6",
-+<<<<<<< .our
-         "safe-buffer": "5.1.2"
-       }
-     },
-@@ -7091,6 +8927,18 @@
-       "dev": true,
-       "requires": {
-         "deep-extend": "0.5.1",
-+=======
-+        "safe-buffer": "5.1.1"
-+      }
-+    },
-+    "rc": {
-+      "version": "1.2.6",
-+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.6.tgz",
-+      "integrity": "sha1-6xiYnG1PTxYsOZ953dKfODVWgJI=",
-+      "dev": true,
-+      "requires": {
-+        "deep-extend": "0.4.2",
-+>>>>>>> .their
-         "ini": "1.3.5",
-         "minimist": "1.2.0",
-         "strip-json-comments": "2.0.1"
-@@ -7121,7 +8969,11 @@
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-             "process-nextick-args": "2.0.0",
-+<<<<<<< .our
-             "safe-buffer": "5.1.2",
-+=======
-+            "safe-buffer": "5.1.1",
-+>>>>>>> .their
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-           }
-@@ -7132,7 +8984,11 @@
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "safe-buffer": "5.1.2"
-+=======
-+            "safe-buffer": "5.1.1"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -7198,7 +9054,11 @@
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-             "process-nextick-args": "2.0.0",
-+<<<<<<< .our
-             "safe-buffer": "5.1.2",
-+=======
-+            "safe-buffer": "5.1.1",
-+>>>>>>> .their
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-           }
-@@ -7209,7 +9069,11 @@
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "safe-buffer": "5.1.2"
-+=======
-+            "safe-buffer": "5.1.1"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -7231,7 +9095,11 @@
-       "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "resolve": "1.7.1"
-+=======
-+        "resolve": "1.6.0"
-+>>>>>>> .their
-       }
-     },
-     "redent": {
-@@ -7247,7 +9115,11 @@
-     "regex-cache": {
-       "version": "0.4.4",
-       "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-db3FiioUls7EihKDW8VMjVYjNt0=",
-+=======
-+      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "is-equal-shallow": "0.1.3"
-@@ -7259,8 +9131,13 @@
-       "integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "rc": "1.2.7",
-         "safe-buffer": "5.1.2"
-+=======
-+        "rc": "1.2.6",
-+        "safe-buffer": "5.1.1"
-+>>>>>>> .their
-       }
-     },
-     "registry-url": {
-@@ -7269,7 +9146,11 @@
-       "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "rc": "1.2.7"
-+=======
-+        "rc": "1.2.6"
-+>>>>>>> .their
-       }
-     },
-     "remark": {
-@@ -7280,7 +9161,11 @@
-       "requires": {
-         "remark-parse": "4.0.0",
-         "remark-stringify": "4.0.0",
-+<<<<<<< .our
-         "unified": "6.2.0"
-+=======
-+        "unified": "6.1.6"
-+>>>>>>> .their
-       }
-     },
-     "remark-cli": {
-@@ -7312,9 +9197,15 @@
-         "mdast-util-to-string": "1.0.4",
-         "plur": "2.1.2",
-         "unified-lint-rule": "1.0.2",
-+<<<<<<< .our
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unist-util-generated": "1.1.1",
-+        "unist-util-position": "3.0.0",
-+        "unist-util-visit": "1.3.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-code-block-style": {
-@@ -7324,9 +9215,15 @@
-       "dev": true,
-       "requires": {
-         "unified-lint-rule": "1.0.2",
-+<<<<<<< .our
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unist-util-generated": "1.1.1",
-+        "unist-util-position": "3.0.0",
-+        "unist-util-visit": "1.3.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-definition-case": {
-@@ -7336,9 +9233,15 @@
-       "dev": true,
-       "requires": {
-         "unified-lint-rule": "1.0.2",
-+<<<<<<< .our
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unist-util-generated": "1.1.1",
-+        "unist-util-position": "3.0.0",
-+        "unist-util-visit": "1.3.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-definition-spacing": {
-@@ -7348,9 +9251,15 @@
-       "dev": true,
-       "requires": {
-         "unified-lint-rule": "1.0.2",
-+<<<<<<< .our
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unist-util-generated": "1.1.1",
-+        "unist-util-position": "3.0.0",
-+        "unist-util-visit": "1.3.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-emphasis-marker": {
-@@ -7360,9 +9269,15 @@
-       "dev": true,
-       "requires": {
-         "unified-lint-rule": "1.0.2",
-+<<<<<<< .our
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unist-util-generated": "1.1.1",
-+        "unist-util-position": "3.0.0",
-+        "unist-util-visit": "1.3.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-fenced-code-flag": {
-@@ -7372,9 +9287,15 @@
-       "dev": true,
-       "requires": {
-         "unified-lint-rule": "1.0.2",
-+<<<<<<< .our
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unist-util-generated": "1.1.1",
-+        "unist-util-position": "3.0.0",
-+        "unist-util-visit": "1.3.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-fenced-code-marker": {
-@@ -7384,9 +9305,15 @@
-       "dev": true,
-       "requires": {
-         "unified-lint-rule": "1.0.2",
-+<<<<<<< .our
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unist-util-generated": "1.1.1",
-+        "unist-util-position": "3.0.0",
-+        "unist-util-visit": "1.3.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-file-extension": {
-@@ -7405,9 +9332,15 @@
-       "dev": true,
-       "requires": {
-         "unified-lint-rule": "1.0.2",
-+<<<<<<< .our
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unist-util-generated": "1.1.1",
-+        "unist-util-position": "3.0.0",
-+        "unist-util-visit": "1.3.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-hard-break-spaces": {
-@@ -7417,9 +9350,15 @@
-       "dev": true,
-       "requires": {
-         "unified-lint-rule": "1.0.2",
-+<<<<<<< .our
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unist-util-generated": "1.1.1",
-+        "unist-util-position": "3.0.0",
-+        "unist-util-visit": "1.3.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-heading-increment": {
-@@ -7429,8 +9368,13 @@
-       "dev": true,
-       "requires": {
-         "unified-lint-rule": "1.0.2",
-+<<<<<<< .our
-         "unist-util-generated": "1.1.2",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unist-util-generated": "1.1.1",
-+        "unist-util-visit": "1.3.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-heading-style": {
-@@ -7441,8 +9385,13 @@
-       "requires": {
-         "mdast-util-heading-style": "1.0.3",
-         "unified-lint-rule": "1.0.2",
-+<<<<<<< .our
-         "unist-util-generated": "1.1.2",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unist-util-generated": "1.1.1",
-+        "unist-util-visit": "1.3.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-link-title-style": {
-@@ -7452,10 +9401,17 @@
-       "dev": true,
-       "requires": {
-         "unified-lint-rule": "1.0.2",
-+<<<<<<< .our
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1",
-         "vfile-location": "2.0.3"
-+=======
-+        "unist-util-generated": "1.1.1",
-+        "unist-util-position": "3.0.0",
-+        "unist-util-visit": "1.3.0",
-+        "vfile-location": "2.0.2"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-list-item-content-indent": {
-@@ -7466,9 +9422,15 @@
-       "requires": {
-         "plur": "2.1.2",
-         "unified-lint-rule": "1.0.2",
-+<<<<<<< .our
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unist-util-generated": "1.1.1",
-+        "unist-util-position": "3.0.0",
-+        "unist-util-visit": "1.3.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-list-item-indent": {
-@@ -7479,9 +9441,15 @@
-       "requires": {
-         "plur": "2.1.2",
-         "unified-lint-rule": "1.0.2",
-+<<<<<<< .our
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unist-util-generated": "1.1.1",
-+        "unist-util-position": "3.0.0",
-+        "unist-util-visit": "1.3.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-list-item-spacing": {
-@@ -7491,9 +9459,15 @@
-       "dev": true,
-       "requires": {
-         "unified-lint-rule": "1.0.2",
-+<<<<<<< .our
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unist-util-generated": "1.1.1",
-+        "unist-util-position": "3.0.0",
-+        "unist-util-visit": "1.3.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-maximum-heading-length": {
-@@ -7504,8 +9478,13 @@
-       "requires": {
-         "mdast-util-to-string": "1.0.4",
-         "unified-lint-rule": "1.0.2",
-+<<<<<<< .our
-         "unist-util-generated": "1.1.2",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unist-util-generated": "1.1.1",
-+        "unist-util-visit": "1.3.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-maximum-line-length": {
-@@ -7515,9 +9494,15 @@
-       "dev": true,
-       "requires": {
-         "unified-lint-rule": "1.0.2",
-+<<<<<<< .our
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unist-util-generated": "1.1.1",
-+        "unist-util-position": "3.0.0",
-+        "unist-util-visit": "1.3.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-auto-link-without-protocol": {
-@@ -7528,9 +9513,15 @@
-       "requires": {
-         "mdast-util-to-string": "1.0.4",
-         "unified-lint-rule": "1.0.2",
-+<<<<<<< .our
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unist-util-generated": "1.1.1",
-+        "unist-util-position": "3.0.0",
-+        "unist-util-visit": "1.3.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-blockquote-without-marker": {
-@@ -7540,10 +9531,17 @@
-       "dev": true,
-       "requires": {
-         "unified-lint-rule": "1.0.2",
-+<<<<<<< .our
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1",
-         "vfile-location": "2.0.3"
-+=======
-+        "unist-util-generated": "1.1.1",
-+        "unist-util-position": "3.0.0",
-+        "unist-util-visit": "1.3.0",
-+        "vfile-location": "2.0.2"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-consecutive-blank-lines": {
-@@ -7554,9 +9552,15 @@
-       "requires": {
-         "plur": "2.1.2",
-         "unified-lint-rule": "1.0.2",
-+<<<<<<< .our
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unist-util-generated": "1.1.1",
-+        "unist-util-position": "3.0.0",
-+        "unist-util-visit": "1.3.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-duplicate-headings": {
-@@ -7567,9 +9571,15 @@
-       "requires": {
-         "mdast-util-to-string": "1.0.4",
-         "unified-lint-rule": "1.0.2",
-+<<<<<<< .our
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unist-util-generated": "1.1.1",
-+        "unist-util-position": "3.0.0",
-+        "unist-util-visit": "1.3.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-emphasis-as-heading": {
-@@ -7579,8 +9589,13 @@
-       "dev": true,
-       "requires": {
-         "unified-lint-rule": "1.0.2",
-+<<<<<<< .our
-         "unist-util-generated": "1.1.2",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unist-util-generated": "1.1.1",
-+        "unist-util-visit": "1.3.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-file-name-articles": {
-@@ -7636,8 +9651,13 @@
-       "requires": {
-         "mdast-util-to-string": "1.0.4",
-         "unified-lint-rule": "1.0.2",
-+<<<<<<< .our
-         "unist-util-generated": "1.1.2",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unist-util-generated": "1.1.1",
-+        "unist-util-visit": "1.3.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-inline-padding": {
-@@ -7648,8 +9668,13 @@
-       "requires": {
-         "mdast-util-to-string": "1.0.4",
-         "unified-lint-rule": "1.0.2",
-+<<<<<<< .our
-         "unist-util-generated": "1.1.2",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unist-util-generated": "1.1.1",
-+        "unist-util-visit": "1.3.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-literal-urls": {
-@@ -7660,9 +9685,15 @@
-       "requires": {
-         "mdast-util-to-string": "1.0.4",
-         "unified-lint-rule": "1.0.2",
-+<<<<<<< .our
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unist-util-generated": "1.1.1",
-+        "unist-util-position": "3.0.0",
-+        "unist-util-visit": "1.3.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-multiple-toplevel-headings": {
-@@ -7672,9 +9703,15 @@
-       "dev": true,
-       "requires": {
-         "unified-lint-rule": "1.0.2",
-+<<<<<<< .our
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unist-util-generated": "1.1.1",
-+        "unist-util-position": "3.0.0",
-+        "unist-util-visit": "1.3.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-shell-dollars": {
-@@ -7684,8 +9721,13 @@
-       "dev": true,
-       "requires": {
-         "unified-lint-rule": "1.0.2",
-+<<<<<<< .our
-         "unist-util-generated": "1.1.2",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unist-util-generated": "1.1.1",
-+        "unist-util-visit": "1.3.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-shortcut-reference-image": {
-@@ -7695,8 +9737,13 @@
-       "dev": true,
-       "requires": {
-         "unified-lint-rule": "1.0.2",
-+<<<<<<< .our
-         "unist-util-generated": "1.1.2",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unist-util-generated": "1.1.1",
-+        "unist-util-visit": "1.3.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-shortcut-reference-link": {
-@@ -7706,8 +9753,13 @@
-       "dev": true,
-       "requires": {
-         "unified-lint-rule": "1.0.2",
-+<<<<<<< .our
-         "unist-util-generated": "1.1.2",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unist-util-generated": "1.1.1",
-+        "unist-util-visit": "1.3.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-table-indentation": {
-@@ -7717,9 +9769,15 @@
-       "dev": true,
-       "requires": {
-         "unified-lint-rule": "1.0.2",
-+<<<<<<< .our
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unist-util-generated": "1.1.1",
-+        "unist-util-position": "3.0.0",
-+        "unist-util-visit": "1.3.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-ordered-list-marker-style": {
-@@ -7729,9 +9787,15 @@
-       "dev": true,
-       "requires": {
-         "unified-lint-rule": "1.0.2",
-+<<<<<<< .our
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unist-util-generated": "1.1.1",
-+        "unist-util-position": "3.0.0",
-+        "unist-util-visit": "1.3.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-ordered-list-marker-value": {
-@@ -7741,9 +9805,15 @@
-       "dev": true,
-       "requires": {
-         "unified-lint-rule": "1.0.2",
-+<<<<<<< .our
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unist-util-generated": "1.1.1",
-+        "unist-util-position": "3.0.0",
-+        "unist-util-visit": "1.3.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-rule-style": {
-@@ -7753,9 +9823,15 @@
-       "dev": true,
-       "requires": {
-         "unified-lint-rule": "1.0.2",
-+<<<<<<< .our
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unist-util-generated": "1.1.1",
-+        "unist-util-position": "3.0.0",
-+        "unist-util-visit": "1.3.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-strong-marker": {
-@@ -7765,9 +9841,15 @@
-       "dev": true,
-       "requires": {
-         "unified-lint-rule": "1.0.2",
-+<<<<<<< .our
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unist-util-generated": "1.1.1",
-+        "unist-util-position": "3.0.0",
-+        "unist-util-visit": "1.3.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-table-cell-padding": {
-@@ -7777,9 +9859,15 @@
-       "dev": true,
-       "requires": {
-         "unified-lint-rule": "1.0.2",
-+<<<<<<< .our
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unist-util-generated": "1.1.1",
-+        "unist-util-position": "3.0.0",
-+        "unist-util-visit": "1.3.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-table-pipe-alignment": {
-@@ -7789,9 +9877,15 @@
-       "dev": true,
-       "requires": {
-         "unified-lint-rule": "1.0.2",
-+<<<<<<< .our
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unist-util-generated": "1.1.1",
-+        "unist-util-position": "3.0.0",
-+        "unist-util-visit": "1.3.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-table-pipes": {
-@@ -7801,9 +9895,15 @@
-       "dev": true,
-       "requires": {
-         "unified-lint-rule": "1.0.2",
-+<<<<<<< .our
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unist-util-generated": "1.1.1",
-+        "unist-util-position": "3.0.0",
-+        "unist-util-visit": "1.3.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-unordered-list-marker-style": {
-@@ -7813,9 +9913,15 @@
-       "dev": true,
-       "requires": {
-         "unified-lint-rule": "1.0.2",
-+<<<<<<< .our
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unist-util-generated": "1.1.1",
-+        "unist-util-position": "3.0.0",
-+        "unist-util-visit": "1.3.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-message-control": {
-@@ -7825,7 +9931,11 @@
-       "dev": true,
-       "requires": {
-         "mdast-comment-marker": "1.0.2",
-+<<<<<<< .our
-         "unified-message-control": "1.0.4",
-+=======
-+        "unified-message-control": "1.0.3",
-+>>>>>>> .their
-         "xtend": "4.0.1"
-       }
-     },
-@@ -7835,6 +9945,7 @@
-       "integrity": "sha512-XZgICP2gJ1MHU7+vQaRM+VA9HEL3X253uwUM/BGgx3iv6TH2B3bF3B8q00DKcyP9YrJV+/7WOWEWBFF/u8cIsw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "collapse-white-space": "1.0.4",
-         "is-alphabetical": "1.0.2",
-         "is-decimal": "1.0.2",
-@@ -7849,6 +9960,22 @@
-         "unherit": "1.1.1",
-         "unist-util-remove-position": "1.1.2",
-         "vfile-location": "2.0.3",
-+=======
-+        "collapse-white-space": "1.0.3",
-+        "is-alphabetical": "1.0.1",
-+        "is-decimal": "1.0.1",
-+        "is-whitespace-character": "1.0.1",
-+        "is-word-character": "1.0.1",
-+        "markdown-escapes": "1.0.1",
-+        "parse-entities": "1.1.1",
-+        "repeat-string": "1.6.1",
-+        "state-toggle": "1.0.0",
-+        "trim": "0.0.1",
-+        "trim-trailing-lines": "1.1.0",
-+        "unherit": "1.1.0",
-+        "unist-util-remove-position": "1.1.1",
-+        "vfile-location": "2.0.2",
-+>>>>>>> .their
-         "xtend": "4.0.1"
-       }
-     },
-@@ -7911,6 +10038,7 @@
-       "integrity": "sha512-xLuyKTnuQer3ke9hkU38SUYLiTmS078QOnoFavztmbt/pAJtNSkNtFgR0U//uCcmG0qnyxao+PDuatQav46F1w==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "ccount": "1.0.3",
-         "is-alphanumeric": "1.0.0",
-         "is-decimal": "1.0.2",
-@@ -7924,6 +10052,21 @@
-         "state-toggle": "1.0.1",
-         "stringify-entities": "1.3.2",
-         "unherit": "1.1.1",
-+=======
-+        "ccount": "1.0.2",
-+        "is-alphanumeric": "1.0.0",
-+        "is-decimal": "1.0.1",
-+        "is-whitespace-character": "1.0.1",
-+        "longest-streak": "2.0.2",
-+        "markdown-escapes": "1.0.1",
-+        "markdown-table": "1.1.1",
-+        "mdast-util-compact": "1.0.1",
-+        "parse-entities": "1.1.1",
-+        "repeat-string": "1.6.1",
-+        "state-toggle": "1.0.0",
-+        "stringify-entities": "1.3.1",
-+        "unherit": "1.1.0",
-+>>>>>>> .their
-         "xtend": "4.0.1"
-       }
-     },
-@@ -7967,7 +10110,11 @@
-       "dev": true,
-       "requires": {
-         "aws-sign2": "0.7.0",
-+<<<<<<< .our
-         "aws4": "1.7.0",
-+=======
-+        "aws4": "1.6.0",
-+>>>>>>> .their
-         "caseless": "0.12.0",
-         "combined-stream": "1.0.6",
-         "extend": "3.0.1",
-@@ -7982,9 +10129,15 @@
-         "mime-types": "2.1.18",
-         "oauth-sign": "0.8.2",
-         "performance-now": "2.1.0",
-+<<<<<<< .our
-         "qs": "6.5.2",
-         "safe-buffer": "5.1.2",
-         "stringstream": "0.0.6",
-+=======
-+        "qs": "6.5.1",
-+        "safe-buffer": "5.1.1",
-+        "stringstream": "0.0.5",
-+>>>>>>> .their
-         "tough-cookie": "2.3.4",
-         "tunnel-agent": "0.6.0",
-         "uuid": "3.2.1"
-@@ -8021,18 +10174,30 @@
-       }
-     },
-     "resolve": {
-+<<<<<<< .our
-       "version": "1.7.1",
-       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz",
-       "integrity": "sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw==",
-+=======
-+      "version": "1.6.0",
-+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.6.0.tgz",
-+      "integrity": "sha512-mw7JQNu5ExIkcw4LPih0owX/TZXjD/ZUF/ZQ/pDnkw3ZKhDcZZw5klmBlj6gVMwjQ3Pz5Jgu7F3d0jcDVuEWdw==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "path-parse": "1.0.5"
-       }
-     },
-     "resolve-from": {
-+<<<<<<< .our
-       "version": "4.0.0",
-       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-+=======
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz",
-+      "integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "restore-cursor": {
-@@ -8064,7 +10229,11 @@
-     "rimraf": {
-       "version": "2.6.2",
-       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-LtgVDSShbqhlHm1u8PR8QVjOejY=",
-+=======
-+      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "glob": "7.1.2"
-@@ -8073,7 +10242,11 @@
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "fs.realpath": "1.0.0",
-@@ -8087,12 +10260,21 @@
-       }
-     },
-     "ripemd160": {
-+<<<<<<< .our
-       "version": "2.0.2",
-       "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-       "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-       "dev": true,
-       "requires": {
-         "hash-base": "3.0.4",
-+=======
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz",
-+      "integrity": "sha1-D0WEKVxTo2KK9+bXmsohzlfRxuc=",
-+      "dev": true,
-+      "requires": {
-+        "hash-base": "2.0.2",
-+>>>>>>> .their
-         "inherits": "2.0.3"
-       }
-     },
-@@ -8106,9 +10288,15 @@
-       }
-     },
-     "run-parallel": {
-+<<<<<<< .our
-       "version": "1.1.9",
-       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz",
-       "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==",
-+=======
-+      "version": "1.1.8",
-+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.8.tgz",
-+      "integrity": "sha512-e5t1NVhr5VWmD9V9U4KjjSGkf5w6CcTPgw11A3CfIvkkQxlAKzX3usPUp1NUQTmpOOjU+f9QRICU3tMbKwn9ZQ==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "rx-lite": {
-@@ -8118,15 +10306,25 @@
-       "dev": true
-     },
-     "safe-buffer": {
-+<<<<<<< .our
-       "version": "5.1.2",
-       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-+=======
-+      "version": "5.1.1",
-+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-+      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "sax": {
-       "version": "1.2.4",
-       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-KBYjTiN4vdxOU1T6tcqold9xANk=",
-+=======
-+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-+>>>>>>> .their
-       "dev": true,
-       "optional": true
-     },
-@@ -8145,6 +10343,7 @@
-         "semver": "5.5.0"
-       }
-     },
-+<<<<<<< .our
-     "send": {
-       "version": "0.16.2",
-       "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
-@@ -8294,6 +10493,8 @@
-         }
-       }
-     },
-+=======
-+>>>>>>> .their
-     "set-blocking": {
-       "version": "2.0.0",
-       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-@@ -8306,12 +10507,15 @@
-       "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "setprototypeof": {
-       "version": "1.0.3",
-       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz",
-       "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "sha.js": {
-       "version": "2.4.11",
-       "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-@@ -8319,7 +10523,11 @@
-       "dev": true,
-       "requires": {
-         "inherits": "2.0.3",
-+<<<<<<< .our
-         "safe-buffer": "5.1.2"
-+=======
-+        "safe-buffer": "5.1.1"
-+>>>>>>> .their
-       }
-     },
-     "shasum": {
-@@ -8373,7 +10581,11 @@
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "fs.realpath": "1.0.0",
-@@ -8475,7 +10687,11 @@
-     "split": {
-       "version": "1.0.1",
-       "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-YFvZvjA6pZ+zX5Ip++oN3snqB9k=",
-+=======
-+      "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "through": "2.3.8"
-@@ -8484,7 +10700,11 @@
-     "split2": {
-       "version": "2.2.0",
-       "resolved": "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-GGsldbz4PoW30YRldWI47k7kJJM=",
-+=======
-+      "integrity": "sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "through2": "2.0.3"
-@@ -8513,6 +10733,7 @@
-       }
-     },
-     "standard": {
-+<<<<<<< .our
-       "version": "10.0.3",
-       "resolved": "https://registry.npmjs.org/standard/-/standard-10.0.3.tgz",
-       "integrity": "sha512-JURZ+85ExKLQULckDFijdX5WHzN6RC7fgiZNSV4jFQVo+3tPoQGHyBrGekye/yf0aOfb4210EM5qPNlc2cRh4w==",
-@@ -8539,6 +10760,34 @@
-         "get-stdin": "5.0.1",
-         "minimist": "1.2.0",
-         "pkg-conf": "2.1.0"
-+=======
-+      "version": "8.6.0",
-+      "resolved": "https://registry.npmjs.org/standard/-/standard-8.6.0.tgz",
-+      "integrity": "sha1-Y1Eyvnv7VnwpIQBfMPnjUOR1Kq0=",
-+      "dev": true,
-+      "requires": {
-+        "eslint": "3.10.2",
-+        "eslint-config-standard": "6.2.1",
-+        "eslint-config-standard-jsx": "3.2.0",
-+        "eslint-plugin-promise": "3.4.2",
-+        "eslint-plugin-react": "6.7.1",
-+        "eslint-plugin-standard": "2.0.1",
-+        "standard-engine": "5.2.0"
-+      }
-+    },
-+    "standard-engine": {
-+      "version": "5.2.0",
-+      "resolved": "https://registry.npmjs.org/standard-engine/-/standard-engine-5.2.0.tgz",
-+      "integrity": "sha1-QAZgrlrM6K/U22D/IhSpGQrXkKM=",
-+      "dev": true,
-+      "requires": {
-+        "deglob": "2.1.0",
-+        "find-root": "1.1.0",
-+        "get-stdin": "5.0.1",
-+        "home-or-tmp": "2.0.0",
-+        "minimist": "1.2.0",
-+        "pkg-config": "1.1.1"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "get-stdin": {
-@@ -8552,7 +10801,11 @@
-     "standard-markdown": {
-       "version": "4.0.2",
-       "resolved": "https://registry.npmjs.org/standard-markdown/-/standard-markdown-4.0.2.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-NaC1bLtX5JzuLXQ9ocmERMNK1Lg=",
-+=======
-+      "integrity": "sha512-h+WTmoGN0qmse8I1VX8VD6V5JeVLXZOPQltvxQP9FfSpSl6RmKYMLTUQ2j/QhdmsdxQKDqulZF/Bf8oEnttIQA==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "async": "2.6.0",
-@@ -8579,6 +10832,7 @@
-           "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "lodash": "4.17.10"
-           }
-         },
-@@ -8586,11 +10840,24 @@
-           "version": "2.4.1",
-           "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
-           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
-+=======
-+            "lodash": "4.17.5"
-+          }
-+        },
-+        "chalk": {
-+          "version": "2.3.2",
-+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
-+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "ansi-styles": "3.2.1",
-             "escape-string-regexp": "1.0.5",
-+<<<<<<< .our
-             "supports-color": "5.4.0"
-+=======
-+            "supports-color": "5.3.0"
-+>>>>>>> .their
-           }
-         },
-         "cli-cursor": {
-@@ -8603,15 +10870,165 @@
-           }
-         },
-         "cli-spinners": {
-+<<<<<<< .our
-           "version": "1.3.1",
-           "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.3.1.tgz",
-           "integrity": "sha512-1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg==",
-+=======
-+          "version": "1.3.0",
-+          "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.3.0.tgz",
-+          "integrity": "sha512-ahr3q/EW26uLN3vqBaDQS4g1rUwKMbVSTRlyfyoY06VwwSJmMYRxhT3FTAiTz9Yam6OOb1e0ldwvbsnuThvuzA==",
-+          "dev": true
-+        },
-+        "doctrine": {
-+          "version": "2.1.0",
-+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-+          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-+          "dev": true,
-+          "requires": {
-+            "esutils": "2.0.2"
-+          }
-+        },
-+        "eslint": {
-+          "version": "3.19.0",
-+          "resolved": "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz",
-+          "integrity": "sha1-yPxiAcf0DdCJQbh8CFdnOGpnmsw=",
-+          "dev": true,
-+          "requires": {
-+            "babel-code-frame": "6.26.0",
-+            "chalk": "1.1.3",
-+            "concat-stream": "1.5.2",
-+            "debug": "2.6.9",
-+            "doctrine": "2.1.0",
-+            "escope": "3.6.0",
-+            "espree": "3.5.4",
-+            "esquery": "1.0.1",
-+            "estraverse": "4.2.0",
-+            "esutils": "2.0.2",
-+            "file-entry-cache": "2.0.0",
-+            "glob": "7.1.2",
-+            "globals": "9.18.0",
-+            "ignore": "3.3.7",
-+            "imurmurhash": "0.1.4",
-+            "inquirer": "0.12.0",
-+            "is-my-json-valid": "2.17.2",
-+            "is-resolvable": "1.1.0",
-+            "js-yaml": "3.11.0",
-+            "json-stable-stringify": "1.0.1",
-+            "levn": "0.3.0",
-+            "lodash": "4.17.5",
-+            "mkdirp": "0.5.1",
-+            "natural-compare": "1.4.0",
-+            "optionator": "0.8.2",
-+            "path-is-inside": "1.0.2",
-+            "pluralize": "1.2.1",
-+            "progress": "1.1.8",
-+            "require-uncached": "1.0.3",
-+            "shelljs": "0.7.8",
-+            "strip-bom": "3.0.0",
-+            "strip-json-comments": "2.0.1",
-+            "table": "3.8.3",
-+            "text-table": "0.2.0",
-+            "user-home": "2.0.0"
-+          },
-+          "dependencies": {
-+            "ansi-styles": {
-+              "version": "2.2.1",
-+              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-+              "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-+              "dev": true
-+            },
-+            "chalk": {
-+              "version": "1.1.3",
-+              "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-+              "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-+              "dev": true,
-+              "requires": {
-+                "ansi-styles": "2.2.1",
-+                "escape-string-regexp": "1.0.5",
-+                "has-ansi": "2.0.0",
-+                "strip-ansi": "3.0.1",
-+                "supports-color": "2.0.0"
-+              }
-+            },
-+            "supports-color": {
-+              "version": "2.0.0",
-+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-+              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-+              "dev": true
-+            }
-+          }
-+        },
-+        "eslint-config-standard": {
-+          "version": "10.2.1",
-+          "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-10.2.1.tgz",
-+          "integrity": "sha1-wGHk0GbzedwXzVYsZOgZtN1FRZE=",
-+          "dev": true
-+        },
-+        "eslint-config-standard-jsx": {
-+          "version": "4.0.2",
-+          "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-4.0.2.tgz",
-+          "integrity": "sha512-F8fRh2WFnTek7dZH9ZaE0PCBwdVGkwVWZmizla/DDNOmg7Tx6B/IlK5+oYpiX29jpu73LszeJj5i1axEZv6VMw==",
-+          "dev": true
-+        },
-+        "eslint-plugin-promise": {
-+          "version": "3.5.0",
-+          "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-3.5.0.tgz",
-+          "integrity": "sha1-ePu2/+BHIBYnVp6FpsU3OvKmj8o=",
-+          "dev": true
-+        },
-+        "eslint-plugin-react": {
-+          "version": "6.10.3",
-+          "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-6.10.3.tgz",
-+          "integrity": "sha1-xUNb6wZ3ThLH2y9qut3L+QDNP3g=",
-+          "dev": true,
-+          "requires": {
-+            "array.prototype.find": "2.0.4",
-+            "doctrine": "1.5.0",
-+            "has": "1.0.1",
-+            "jsx-ast-utils": "1.4.1",
-+            "object.assign": "4.1.0"
-+          },
-+          "dependencies": {
-+            "doctrine": {
-+              "version": "1.5.0",
-+              "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
-+              "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
-+              "dev": true,
-+              "requires": {
-+                "esutils": "2.0.2",
-+                "isarray": "1.0.0"
-+              }
-+            }
-+          }
-+        },
-+        "eslint-plugin-standard": {
-+          "version": "3.0.1",
-+          "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-3.0.1.tgz",
-+          "integrity": "sha1-NNDJFbRe3G8BA5PH7vOCOwhWXPI=",
-+          "dev": true
-+        },
-+        "estraverse": {
-+          "version": "4.2.0",
-+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-+          "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
-+          "dev": true
-+        },
-+        "get-stdin": {
-+          "version": "5.0.1",
-+          "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.1.tgz",
-+          "integrity": "sha1-Ei4WFZHiH/TFJTAwVpPyDmOTo5g=",
-+>>>>>>> .their
-           "dev": true
-         },
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "fs.realpath": "1.0.0",
-@@ -8641,13 +11058,35 @@
-           "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-           "dev": true
-         },
-+<<<<<<< .our
-+=======
-+        "isarray": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-+          "dev": true
-+        },
-+        "json-stable-stringify": {
-+          "version": "1.0.1",
-+          "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
-+          "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
-+          "dev": true,
-+          "requires": {
-+            "jsonify": "0.0.0"
-+          }
-+        },
-+>>>>>>> .their
-         "log-symbols": {
-           "version": "2.2.0",
-           "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
-           "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "chalk": "2.4.1"
-+=======
-+            "chalk": "2.3.2"
-+>>>>>>> .their
-           }
-         },
-         "onetime": {
-@@ -8665,12 +11104,27 @@
-           "integrity": "sha512-iMK1DOQxzzh2MBlVsU42G80mnrvUhqsMh74phHtDlrcTZPK0pH6o7l7DRshK+0YsxDyEuaOkziVdvM3T0QTzpw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "chalk": "2.4.1",
-             "cli-cursor": "2.1.0",
-             "cli-spinners": "1.3.1",
-             "log-symbols": "2.2.0"
-           }
-         },
-+=======
-+            "chalk": "2.3.2",
-+            "cli-cursor": "2.1.0",
-+            "cli-spinners": "1.3.0",
-+            "log-symbols": "2.2.0"
-+          }
-+        },
-+        "progress": {
-+          "version": "1.1.8",
-+          "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
-+          "integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=",
-+          "dev": true
-+        },
-+>>>>>>> .their
-         "restore-cursor": {
-           "version": "2.0.0",
-           "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
-@@ -8681,10 +11135,52 @@
-             "signal-exit": "3.0.2"
-           }
-         },
-+<<<<<<< .our
-         "supports-color": {
-           "version": "5.4.0",
-           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
-           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-+=======
-+        "standard": {
-+          "version": "10.0.3",
-+          "resolved": "https://registry.npmjs.org/standard/-/standard-10.0.3.tgz",
-+          "integrity": "sha512-JURZ+85ExKLQULckDFijdX5WHzN6RC7fgiZNSV4jFQVo+3tPoQGHyBrGekye/yf0aOfb4210EM5qPNlc2cRh4w==",
-+          "dev": true,
-+          "requires": {
-+            "eslint": "3.19.0",
-+            "eslint-config-standard": "10.2.1",
-+            "eslint-config-standard-jsx": "4.0.2",
-+            "eslint-plugin-import": "2.2.0",
-+            "eslint-plugin-node": "4.2.3",
-+            "eslint-plugin-promise": "3.5.0",
-+            "eslint-plugin-react": "6.10.3",
-+            "eslint-plugin-standard": "3.0.1",
-+            "standard-engine": "7.0.0"
-+          }
-+        },
-+        "standard-engine": {
-+          "version": "7.0.0",
-+          "resolved": "https://registry.npmjs.org/standard-engine/-/standard-engine-7.0.0.tgz",
-+          "integrity": "sha1-67d7nI/CyBZf+jU72Rug3/Qa9pA=",
-+          "dev": true,
-+          "requires": {
-+            "deglob": "2.1.0",
-+            "get-stdin": "5.0.1",
-+            "minimist": "1.2.0",
-+            "pkg-conf": "2.1.0"
-+          }
-+        },
-+        "strip-bom": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-+          "dev": true
-+        },
-+        "supports-color": {
-+          "version": "5.3.0",
-+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
-+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "has-flag": "3.0.0"
-@@ -8693,6 +11189,7 @@
-       }
-     },
-     "state-toggle": {
-+<<<<<<< .our
-       "version": "1.0.1",
-       "resolved": "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.1.tgz",
-       "integrity": "sha512-Qe8QntFrrpWTnHwvwj2FZTgv+PKIsp0B9VxLzLLbSpPXWOgRgc5LVj/aTiSfK1RqIeF9jeC1UeOH8Q8y60A7og==",
-@@ -8702,6 +11199,11 @@
-       "version": "1.5.0",
-       "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-       "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
-+=======
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.0.tgz",
-+      "integrity": "sha1-0g+aYWu08MO5i5GSLSW2QKorxCU=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "stream-browserify": {
-@@ -8730,7 +11232,11 @@
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-             "process-nextick-args": "2.0.0",
-+<<<<<<< .our
-             "safe-buffer": "5.1.2",
-+=======
-+            "safe-buffer": "5.1.1",
-+>>>>>>> .their
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-           }
-@@ -8741,7 +11247,11 @@
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "safe-buffer": "5.1.2"
-+=======
-+            "safe-buffer": "5.1.1"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -8772,7 +11282,11 @@
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-             "process-nextick-args": "2.0.0",
-+<<<<<<< .our
-             "safe-buffer": "5.1.2",
-+=======
-+            "safe-buffer": "5.1.1",
-+>>>>>>> .their
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-           }
-@@ -8783,7 +11297,11 @@
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "safe-buffer": "5.1.2"
-+=======
-+            "safe-buffer": "5.1.1"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -8795,9 +11313,15 @@
-       "dev": true
-     },
-     "stream-http": {
-+<<<<<<< .our
-       "version": "2.8.2",
-       "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.2.tgz",
-       "integrity": "sha512-QllfrBhqF1DPcz46WxKTs6Mz1Bpc+8Qm6vbqOpVav5odAXwbyzwnEczoWqtxrsmlO+cJqtPrp/8gWKWjaKLLlA==",
-+=======
-+      "version": "2.8.1",
-+      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.1.tgz",
-+      "integrity": "sha512-cQ0jo17BLca2r0GfRdZKYAGLU6JRoIWxqSOakUMuKOT6MOK7AAlE856L33QuDmAy/eeOrhLee3dZKX0Uadu93A==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "builtin-status-codes": "3.0.0",
-@@ -8823,7 +11347,11 @@
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-             "process-nextick-args": "2.0.0",
-+<<<<<<< .our
-             "safe-buffer": "5.1.2",
-+=======
-+            "safe-buffer": "5.1.1",
-+>>>>>>> .their
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-           }
-@@ -8834,7 +11362,11 @@
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "safe-buffer": "5.1.2"
-+=======
-+            "safe-buffer": "5.1.1"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -8871,7 +11403,11 @@
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-             "process-nextick-args": "2.0.0",
-+<<<<<<< .our
-             "safe-buffer": "5.1.2",
-+=======
-+            "safe-buffer": "5.1.1",
-+>>>>>>> .their
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-           }
-@@ -8882,7 +11418,11 @@
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "safe-buffer": "5.1.2"
-+=======
-+            "safe-buffer": "5.1.1"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -8911,6 +11451,7 @@
-       "dev": true
-     },
-     "stringify-entities": {
-+<<<<<<< .our
-       "version": "1.3.2",
-       "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-1.3.2.tgz",
-       "integrity": "sha512-nrBAQClJAPN2p+uGCVJRPIPakKeKWZ9GtBCmormE7pWOSlHat7+x5A8gx85M7HM5Dt0BP3pP5RhVW77WdbJJ3A==",
-@@ -8926,6 +11467,23 @@
-       "version": "0.0.6",
-       "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz",
-       "integrity": "sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==",
-+=======
-+      "version": "1.3.1",
-+      "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-1.3.1.tgz",
-+      "integrity": "sha1-sVDsLXKsTBtfMktR+2soyc3/BYw=",
-+      "dev": true,
-+      "requires": {
-+        "character-entities-html4": "1.1.1",
-+        "character-entities-legacy": "1.1.1",
-+        "is-alphanumerical": "1.0.1",
-+        "is-hexadecimal": "1.0.1"
-+      }
-+    },
-+    "stringstream": {
-+      "version": "0.0.5",
-+      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-+      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "strip-ansi": {
-@@ -9016,7 +11574,11 @@
-         "ajv": "4.11.8",
-         "ajv-keywords": "1.5.1",
-         "chalk": "1.1.3",
-+<<<<<<< .our
-         "lodash": "4.17.10",
-+=======
-+        "lodash": "4.17.5",
-+>>>>>>> .their
-         "slice-ansi": "0.0.4",
-         "string-width": "2.1.1"
-       },
-@@ -9055,7 +11617,11 @@
-         "string-width": {
-           "version": "2.1.1",
-           "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
-+=======
-+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "is-fullwidth-code-point": "2.0.0",
-@@ -9074,30 +11640,53 @@
-       }
-     },
-     "tar": {
-+<<<<<<< .our
-       "version": "4.4.2",
-       "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.2.tgz",
-       "integrity": "sha512-BfkE9CciGGgDsATqkikUHrQrraBCO+ke/1f6SFAEMnxyyfN9lxC+nW1NFWMpqH865DhHIy9vQi682gk1X7friw==",
-+=======
-+      "version": "4.4.1",
-+      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.1.tgz",
-+      "integrity": "sha512-O+v1r9yN4tOsvl90p5HAP4AEqbYhx4036AGMm075fH9F8Qwi3oJ+v4u50FkT/KkvywNGtwkk0zRI+8eYm1X/xg==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "chownr": "1.0.1",
-         "fs-minipass": "1.2.5",
-+<<<<<<< .our
-         "minipass": "2.3.0",
-         "minizlib": "1.1.0",
-         "mkdirp": "0.5.1",
-         "safe-buffer": "5.1.2",
-+=======
-+        "minipass": "2.2.4",
-+        "minizlib": "1.1.0",
-+        "mkdirp": "0.5.1",
-+        "safe-buffer": "5.1.1",
-+>>>>>>> .their
-         "yallist": "3.0.2"
-       }
-     },
-     "tar-fs": {
-+<<<<<<< .our
-       "version": "1.16.2",
-       "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.2.tgz",
-       "integrity": "sha512-LdknWjPEiZC1nOBwhv0JBzfJBGPJar08dZg2rwZe0ZTLQoRGEzgrl7vF3qUEkCHpI/wN9e7RyCuDhMsJUCLPPQ==",
-+=======
-+      "version": "1.16.0",
-+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.0.tgz",
-+      "integrity": "sha512-I9rb6v7mjWLtOfCau9eH5L7sLJyU2BnxtEZRQ5Mt+eRKmf1F0ohXmT/Jc3fr52kDvjJ/HV5MH3soQfPL5bQ0Yg==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "chownr": "1.0.1",
-         "mkdirp": "0.5.1",
-         "pump": "1.0.3",
-+<<<<<<< .our
-         "tar-stream": "1.6.0"
-+=======
-+        "tar-stream": "1.5.5"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "pump": {
-@@ -9113,6 +11702,7 @@
-       }
-     },
-     "tar-stream": {
-+<<<<<<< .our
-       "version": "1.6.0",
-       "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.0.tgz",
-       "integrity": "sha512-lh2iAPG/BHNmN6WB9Ybdynk9rEJ5GD/dy4zscHmVlwa1dq2tpE+BH78i5vjYwYVWEaOXGBjzxr89aVACF17Cpw==",
-@@ -9124,6 +11714,16 @@
-         "fs-constants": "1.0.0",
-         "readable-stream": "2.3.6",
-         "to-buffer": "1.1.1",
-+=======
-+      "version": "1.5.5",
-+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.5.tgz",
-+      "integrity": "sha512-mQdgLPc/Vjfr3VWqWbfxW8yQNiJCbAZ+Gf6GDu1Cy0bdb33ofyiNGBtAY96jHFhDuivCwgW1H9DgTON+INiXgg==",
-+      "dev": true,
-+      "requires": {
-+        "bl": "1.2.2",
-+        "end-of-stream": "1.4.1",
-+        "readable-stream": "2.3.6",
-+>>>>>>> .their
-         "xtend": "4.0.1"
-       },
-       "dependencies": {
-@@ -9143,7 +11743,11 @@
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-             "process-nextick-args": "2.0.0",
-+<<<<<<< .our
-             "safe-buffer": "5.1.2",
-+=======
-+            "safe-buffer": "5.1.1",
-+>>>>>>> .their
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-           }
-@@ -9154,7 +11758,11 @@
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "safe-buffer": "5.1.2"
-+=======
-+            "safe-buffer": "5.1.1"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -9207,7 +11815,11 @@
-     "text-extensions": {
-       "version": "1.7.0",
-       "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.7.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-+qq6JiXtdG1WiiPk0KrNm/CKizk=",
-+=======
-+      "integrity": "sha512-AKXZeDq230UaSzaO5s3qQUZOaC7iKbzq0jOFL614R7d9R593HLqAOL0cYoqLdkNrjBSOdmoQI06yigq1TSBXAg==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "text-table": {
-@@ -9254,7 +11866,11 @@
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-             "process-nextick-args": "2.0.0",
-+<<<<<<< .our
-             "safe-buffer": "5.1.2",
-+=======
-+            "safe-buffer": "5.1.1",
-+>>>>>>> .their
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-           }
-@@ -9265,7 +11881,11 @@
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "safe-buffer": "5.1.2"
-+=======
-+            "safe-buffer": "5.1.1"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -9300,12 +11920,15 @@
-       "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "to-buffer": {
-       "version": "1.1.1",
-       "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz",
-       "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "to-vfile": {
-       "version": "2.2.0",
-       "resolved": "https://registry.npmjs.org/to-vfile/-/to-vfile-2.2.0.tgz",
-@@ -9378,6 +12001,7 @@
-       "dev": true
-     },
-     "trim-trailing-lines": {
-+<<<<<<< .our
-       "version": "1.1.1",
-       "resolved": "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.1.tgz",
-       "integrity": "sha512-bWLv9BbWbbd7mlqqs2oQYnLD/U/ZqeJeJwbO0FG2zA1aTq+HTvxfHNKFa/HGCVyJpDiioUYaBhfiT6rgk+l4mg==",
-@@ -9387,6 +12011,17 @@
-       "version": "1.0.2",
-       "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.2.tgz",
-       "integrity": "sha512-FHkoUZvG6Egrv9XZAyYGKEyb1JMsFphgPjoczkZC2y6W93U1jswcVURB8MUvtsahEPEVACyxD47JAL63vF4JsQ==",
-+=======
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.0.tgz",
-+      "integrity": "sha1-eu+7eAjfnWafbaLkOMrIxGradoQ=",
-+      "dev": true
-+    },
-+    "trough": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.1.tgz",
-+      "integrity": "sha1-qf2LA5Swro//guBjOgo2zK1bX4Y=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "tslint": {
-@@ -9396,20 +12031,34 @@
-       "dev": true,
-       "requires": {
-         "babel-code-frame": "6.26.0",
-+<<<<<<< .our
-         "colors": "1.2.5",
-+=======
-+        "colors": "1.2.1",
-+>>>>>>> .their
-         "diff": "3.5.0",
-         "findup-sync": "0.3.0",
-         "glob": "7.1.2",
-         "optimist": "0.6.1",
-+<<<<<<< .our
-         "resolve": "1.7.1",
-         "tsutils": "1.9.1",
-         "update-notifier": "2.5.0"
-+=======
-+        "resolve": "1.6.0",
-+        "tsutils": "1.9.1",
-+        "update-notifier": "2.4.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "fs.realpath": "1.0.0",
-@@ -9456,7 +12105,11 @@
-       "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "safe-buffer": "5.1.2"
-+=======
-+        "safe-buffer": "5.1.1"
-+>>>>>>> .their
-       }
-     },
-     "tweetnacl": {
-@@ -9482,9 +12135,15 @@
-       "dev": true
-     },
-     "typescript": {
-+<<<<<<< .our
-       "version": "2.9.2",
-       "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
-       "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==",
-+=======
-+      "version": "2.8.1",
-+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.8.1.tgz",
-+      "integrity": "sha512-Ao/f6d/4EPLq0YwzsQz8iXflezpTkQzqAyenTiw4kCUGr1uPiFLC3+fZ+gMZz6eeI/qdRUqvC+HxIJzUAzEFdg==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "uc.micro": {
-@@ -9534,9 +12193,15 @@
-       "dev": true
-     },
-     "unherit": {
-+<<<<<<< .our
-       "version": "1.1.1",
-       "resolved": "https://registry.npmjs.org/unherit/-/unherit-1.1.1.tgz",
-       "integrity": "sha512-+XZuV691Cn4zHsK0vkKYwBEwB74T3IZIcxrgn2E4rKwTfFyI1zCh7X7grwh9Re08fdPlarIdyWgI8aVB3F5A5g==",
-+=======
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/unherit/-/unherit-1.1.0.tgz",
-+      "integrity": "sha1-a5qu379z3xdWrZ4xbdmBiFhAzX0=",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "inherits": "2.0.3",
-@@ -9544,6 +12209,7 @@
-       }
-     },
-     "unified": {
-+<<<<<<< .our
-       "version": "6.2.0",
-       "resolved": "https://registry.npmjs.org/unified/-/unified-6.2.0.tgz",
-       "integrity": "sha512-1k+KPhlVtqmG99RaTbAv/usu85fcSRu3wY8X+vnsEhIxNP5VbVIDiXnLqyKIG+UMdyTg0ZX9EI6k2AfjJkHPtA==",
-@@ -9554,6 +12220,19 @@
-         "is-plain-obj": "1.1.0",
-         "trough": "1.0.2",
-         "vfile": "2.3.0",
-+=======
-+      "version": "6.1.6",
-+      "resolved": "https://registry.npmjs.org/unified/-/unified-6.1.6.tgz",
-+      "integrity": "sha512-pW2f82bCIo2ifuIGYcV12fL96kMMYgw7JKVEgh7ODlrM9rj6vXSY3BV+H6lCcv1ksxynFf582hwWLnA1qRFy4w==",
-+      "dev": true,
-+      "requires": {
-+        "bail": "1.0.2",
-+        "extend": "3.0.1",
-+        "is-plain-obj": "1.1.0",
-+        "trough": "1.0.1",
-+        "vfile": "2.3.0",
-+        "x-is-function": "1.0.4",
-+>>>>>>> .their
-         "x-is-string": "0.1.0"
-       }
-     },
-@@ -9564,7 +12243,11 @@
-       "dev": true,
-       "requires": {
-         "camelcase": "4.1.0",
-+<<<<<<< .our
-         "chalk": "2.4.1",
-+=======
-+        "chalk": "2.3.2",
-+>>>>>>> .their
-         "chokidar": "1.7.0",
-         "minimist": "1.2.0",
-         "text-table": "0.2.0",
-@@ -9587,14 +12270,24 @@
-           "dev": true
-         },
-         "chalk": {
-+<<<<<<< .our
-           "version": "2.4.1",
-           "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
-           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
-+=======
-+          "version": "2.3.2",
-+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
-+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "ansi-styles": "3.2.1",
-             "escape-string-regexp": "1.0.5",
-+<<<<<<< .our
-             "supports-color": "5.4.0"
-+=======
-+            "supports-color": "5.3.0"
-+>>>>>>> .their
-           }
-         },
-         "has-flag": {
-@@ -9604,9 +12297,15 @@
-           "dev": true
-         },
-         "supports-color": {
-+<<<<<<< .our
-           "version": "5.4.0",
-           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
-           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-+=======
-+          "version": "5.3.0",
-+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
-+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "has-flag": "3.0.0"
-@@ -9622,20 +12321,36 @@
-       "requires": {
-         "concat-stream": "1.5.2",
-         "debug": "2.6.9",
-+<<<<<<< .our
-         "fault": "1.0.2",
-         "fn-name": "2.0.1",
-         "glob": "7.1.2",
-         "ignore": "3.3.8",
-+=======
-+        "fault": "1.0.1",
-+        "fn-name": "2.0.1",
-+        "glob": "7.1.2",
-+        "ignore": "3.3.7",
-+>>>>>>> .their
-         "is-empty": "1.2.0",
-         "is-hidden": "1.1.1",
-         "is-object": "1.0.1",
-         "js-yaml": "3.11.0",
-+<<<<<<< .our
-         "load-plugin": "2.2.2",
-         "parse-json": "2.2.0",
-         "to-vfile": "2.2.0",
-         "trough": "1.0.2",
-         "vfile-reporter": "4.0.0",
-         "vfile-statistics": "1.1.1",
-+=======
-+        "load-plugin": "2.2.1",
-+        "parse-json": "2.2.0",
-+        "to-vfile": "2.2.0",
-+        "trough": "1.0.1",
-+        "vfile-reporter": "4.0.0",
-+        "vfile-statistics": "1.1.0",
-+>>>>>>> .their
-         "x-is-function": "1.0.4",
-         "x-is-string": "0.1.0",
-         "xtend": "4.0.1"
-@@ -9667,6 +12382,7 @@
-       }
-     },
-     "unified-message-control": {
-+<<<<<<< .our
-       "version": "1.0.4",
-       "resolved": "https://registry.npmjs.org/unified-message-control/-/unified-message-control-1.0.4.tgz",
-       "integrity": "sha512-e1dEtN4Z/TvLn/qHm+xeZpzqhJTtfZusFErk336kkZVpqrJYiV9ptxq+SbRPFMlN0OkjDYHmVJ929KYjsMTo3g==",
-@@ -9675,6 +12391,16 @@
-         "trim": "0.0.1",
-         "unist-util-visit": "1.3.1",
-         "vfile-location": "2.0.3"
-+=======
-+      "version": "1.0.3",
-+      "resolved": "https://registry.npmjs.org/unified-message-control/-/unified-message-control-1.0.3.tgz",
-+      "integrity": "sha512-zXx8LVgecdkzIMHj5c+aV3GQqJ8uxIhKi2yCccW5mhNQ5Ettb8GMA5VKvurk9Xg382/+EmUlTWW/NhBBgwmG+A==",
-+      "dev": true,
-+      "requires": {
-+        "trim": "0.0.1",
-+        "unist-util-visit": "1.3.0",
-+        "vfile-location": "2.0.2"
-+>>>>>>> .their
-       }
-     },
-     "uniq": {
-@@ -9693,6 +12419,7 @@
-       }
-     },
-     "unist-util-generated": {
-+<<<<<<< .our
-       "version": "1.1.2",
-       "resolved": "https://registry.npmjs.org/unist-util-generated/-/unist-util-generated-1.1.2.tgz",
-       "integrity": "sha512-1HcwiEO62dr0XWGT+abVK4f0aAm8Ik8N08c5nAYVmuSxfvpA9rCcNyX/le8xXj1pJK5nBrGlZefeWB6bN8Pstw==",
-@@ -9755,6 +12482,58 @@
-       "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
-       "dev": true
-     },
-+=======
-+      "version": "1.1.1",
-+      "resolved": "https://registry.npmjs.org/unist-util-generated/-/unist-util-generated-1.1.1.tgz",
-+      "integrity": "sha1-mfFseJWayFTe58YVwpGSTIv03n8=",
-+      "dev": true
-+    },
-+    "unist-util-is": {
-+      "version": "2.1.1",
-+      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-2.1.1.tgz",
-+      "integrity": "sha1-DDEmKeP5YMZukx6BLT2A53AQlHs=",
-+      "dev": true
-+    },
-+    "unist-util-modify-children": {
-+      "version": "1.1.1",
-+      "resolved": "https://registry.npmjs.org/unist-util-modify-children/-/unist-util-modify-children-1.1.1.tgz",
-+      "integrity": "sha1-ZtfmpEnm9nIguXarPLi166w55R0=",
-+      "dev": true,
-+      "requires": {
-+        "array-iterate": "1.1.1"
-+      }
-+    },
-+    "unist-util-position": {
-+      "version": "3.0.0",
-+      "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-3.0.0.tgz",
-+      "integrity": "sha1-5uHgPu64HF4a/lU+jUrfvXwNj4I=",
-+      "dev": true
-+    },
-+    "unist-util-remove-position": {
-+      "version": "1.1.1",
-+      "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.1.tgz",
-+      "integrity": "sha1-WoXBVV/BugwQG4ZwfRXlD6TIcbs=",
-+      "dev": true,
-+      "requires": {
-+        "unist-util-visit": "1.3.0"
-+      }
-+    },
-+    "unist-util-stringify-position": {
-+      "version": "1.1.1",
-+      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-1.1.1.tgz",
-+      "integrity": "sha1-PMvcU2ee7W7PN3fdf14yKcG2qjw=",
-+      "dev": true
-+    },
-+    "unist-util-visit": {
-+      "version": "1.3.0",
-+      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.3.0.tgz",
-+      "integrity": "sha512-9ntYcxPFtl44gnwXrQKZ5bMqXMY0ZHzUpqMFiU4zcc8mmf/jzYm8GhYgezuUlX4cJIM1zIDYaO6fG/fI+L6iiQ==",
-+      "dev": true,
-+      "requires": {
-+        "unist-util-is": "2.1.1"
-+      }
-+    },
-+>>>>>>> .their
-     "untildify": {
-       "version": "2.1.0",
-       "resolved": "https://registry.npmjs.org/untildify/-/untildify-2.1.0.tgz",
-@@ -9770,6 +12549,7 @@
-       "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "update-check": {
-       "version": "1.5.1",
-       "resolved": "https://registry.npmjs.org/update-check/-/update-check-1.5.1.tgz",
-@@ -9788,6 +12568,16 @@
-       "requires": {
-         "boxen": "1.3.0",
-         "chalk": "2.4.1",
-+=======
-+    "update-notifier": {
-+      "version": "2.4.0",
-+      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.4.0.tgz",
-+      "integrity": "sha1-+bTHAPv9TsEsgRWHJYd31WPYyGY=",
-+      "dev": true,
-+      "requires": {
-+        "boxen": "1.3.0",
-+        "chalk": "2.3.2",
-+>>>>>>> .their
-         "configstore": "3.1.2",
-         "import-lazy": "2.1.0",
-         "is-ci": "1.1.0",
-@@ -9808,14 +12598,24 @@
-           }
-         },
-         "chalk": {
-+<<<<<<< .our
-           "version": "2.4.1",
-           "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
-           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
-+=======
-+          "version": "2.3.2",
-+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
-+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "ansi-styles": "3.2.1",
-             "escape-string-regexp": "1.0.5",
-+<<<<<<< .our
-             "supports-color": "5.4.0"
-+=======
-+            "supports-color": "5.3.0"
-+>>>>>>> .their
-           }
-         },
-         "has-flag": {
-@@ -9825,9 +12625,15 @@
-           "dev": true
-         },
-         "supports-color": {
-+<<<<<<< .our
-           "version": "5.4.0",
-           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
-           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-+=======
-+          "version": "5.3.0",
-+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
-+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "has-flag": "3.0.0"
-@@ -9910,12 +12716,15 @@
-         "spdx-expression-parse": "3.0.0"
-       }
-     },
-+<<<<<<< .our
-     "vary": {
-       "version": "1.1.2",
-       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-       "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "verror": {
-       "version": "1.10.0",
-       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-@@ -9935,6 +12744,7 @@
-       "requires": {
-         "is-buffer": "1.1.6",
-         "replace-ext": "1.0.0",
-+<<<<<<< .our
-         "unist-util-stringify-position": "1.1.2",
-         "vfile-message": "1.0.1"
-       }
-@@ -9952,6 +12762,25 @@
-       "dev": true,
-       "requires": {
-         "unist-util-stringify-position": "1.1.2"
-+=======
-+        "unist-util-stringify-position": "1.1.1",
-+        "vfile-message": "1.0.0"
-+      }
-+    },
-+    "vfile-location": {
-+      "version": "2.0.2",
-+      "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.2.tgz",
-+      "integrity": "sha1-02dcWch3SY5JK0dW/2Xkrxp1IlU=",
-+      "dev": true
-+    },
-+    "vfile-message": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-1.0.0.tgz",
-+      "integrity": "sha512-HPREhzTOB/sNDc9/Mxf8w0FmHnThg5CRSJdR9VRFkD2riqYWs+fuXlj5z8mIpv2LrD7uU41+oPWFOL4Mjlf+dw==",
-+      "dev": true,
-+      "requires": {
-+        "unist-util-stringify-position": "1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "vfile-reporter": {
-@@ -9963,8 +12792,13 @@
-         "repeat-string": "1.6.1",
-         "string-width": "1.0.2",
-         "supports-color": "4.5.0",
-+<<<<<<< .our
-         "unist-util-stringify-position": "1.1.2",
-         "vfile-statistics": "1.1.1"
-+=======
-+        "unist-util-stringify-position": "1.1.1",
-+        "vfile-statistics": "1.1.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "has-flag": {
-@@ -9985,9 +12819,15 @@
-       }
-     },
-     "vfile-statistics": {
-+<<<<<<< .our
-       "version": "1.1.1",
-       "resolved": "https://registry.npmjs.org/vfile-statistics/-/vfile-statistics-1.1.1.tgz",
-       "integrity": "sha512-dxUM6IYvGChHuwMT3dseyU5BHprNRXzAV0OHx1A769lVGsTiT50kU7BbpRFV+IE6oWmU+PwHdsTKfXhnDIRIgQ==",
-+=======
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/vfile-statistics/-/vfile-statistics-1.1.0.tgz",
-+      "integrity": "sha1-AhBMYP3u0dEbH3OtZTMLdjSz2JU=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "vm-browserify": {
-@@ -10002,7 +12842,11 @@
-     "walk-sync": {
-       "version": "0.3.2",
-       "resolved": "https://registry.npmjs.org/walk-sync/-/walk-sync-0.3.2.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-SCcoCvxC0OA1NnxKTjHurA0Tb3U=",
-+=======
-+      "integrity": "sha512-FMB5VqpLqOCcqrzA9okZFc0wq0Qbmdm396qJxvQZhDpyu0W95G9JCmp74tx7iyYnyOcBtUuKJsgIKAqjozvmmQ==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "ensure-posix-path": "1.0.2",
-@@ -10029,7 +12873,11 @@
-     "which": {
-       "version": "1.3.0",
-       "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-/wS9/AEO5UfXgL7DjhrBwnd9JTo=",
-+=======
-+      "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "isexe": "2.0.0"
-@@ -10142,7 +12990,11 @@
-     "write-file-atomic": {
-       "version": "2.3.0",
-       "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-H/YVdcLipOjlENb6TiQ8zhg5mas=",
-+=======
-+      "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "graceful-fs": "4.1.11",
-changed in both
-  base   100644 14c3ba9421dbc3f8367641960d1aaafda16c7416 package.json
-  our    100644 c081cd89450cd50efba1ec280ff1349a96ea3ce0 package.json
-  their  100644 baee69b3712f6ce4345afddf0b60e573acd80e6d package.json
-@@ -1,6 +1,10 @@
- {
-   "name": "electron",
-+<<<<<<< .our
-   "version": "4.0.0-nightly.20180821",
-+=======
-+  "version": "1.8.8",
-+>>>>>>> .their
-   "repository": "https://github.com/electron/electron",
-   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
-   "devDependencies": {
-@@ -13,7 +17,11 @@
-     "dugite": "^1.45.0",
-     "electabul": "~0.0.4",
-     "electron-docs-linter": "^2.3.4",
-+<<<<<<< .our
-     "electron-typescript-definitions": "^1.3.6",
-+=======
-+    "electron-typescript-definitions": "~1.2.11",
-+>>>>>>> .their
-     "github": "^9.2.0",
-     "html-entities": "^1.2.1",
-     "husky": "^0.14.3",
-changed in both
-  base   100755 4465b85c135ddb55a673c5180e15f05f09dac57e script/bootstrap.py
-  our    100755 e4aaf89e216b0164f15882a3040e8cac70bf1fd9 script/bootstrap.py
-  their  100755 1ee84561d1100be2a75927c922da9c153c0fd0ca script/bootstrap.py
-@@ -230,12 +230,21 @@
- def download_native_mksnapshot(arch):
-   if not os.path.exists(os.path.join(VENDOR_DIR,
-                                      'native_mksnapshot')):
-+<<<<<<< .our
-     tar_name = 'native-mksnapshot.tar.bz2'
-     url = '{0}/linux/{1}/{2}/{3}'.format(BASE_URL, arch,
-            get_libchromiumcontent_commit(), tar_name)
-     download(tar_name, url, os.path.join(SOURCE_ROOT, tar_name))
-     subprocess.call(['tar', '-jxf', tar_name, '-C', VENDOR_DIR])
-     os.remove(tar_name)
-+=======
-+    zip_name = 'native-mksnapshot.zip'
-+    url = '{0}/linux/{1}/{2}/{3}'.format(BASE_URL, arch,
-+           get_libchromiumcontent_commit(), zip_name)
-+    download(zip_name, url, os.path.join(SOURCE_ROOT, zip_name))
-+    subprocess.call(['unzip', zip_name, '-d', VENDOR_DIR])
-+    os.remove(zip_name)
-+>>>>>>> .their
- 
- def create_chrome_version_h():
-   version_file = os.path.join(VENDOR_DIR, 'libchromiumcontent', 'VERSION')
-changed in both
-  base   100755 c97cd8336f7d7980911d0bdea93137e7bc95ba24 script/build.py
-  our    100755 fb2b95d3bb71a25ce1ca58acf596afdc0f2cc5bd script/build.py
-  their  100755 2a2231394207c28fcd2b86d3d9f9b079b08d637e script/build.py
-@@ -40,6 +40,12 @@
-   if is_verbose_mode():
-     ninja.append('-v')
- 
-+<<<<<<< .our
-+=======
-+  args = parse_args()
-+  if args.ninja_path:
-+    ninja = args.ninja_path
-+>>>>>>> .their
-   if args.libcc:
-     if ('D' not in args.configuration
-         or not os.path.exists(GCLIENT_DONE)
-@@ -93,12 +99,15 @@
-   parser.add_argument('--ninja-path',
-                       help='Path of ninja command to use.',
-                       required=False)
-+<<<<<<< .our
-   parser.add_argument('--compdb',
-                       help=(
-                         'Generate JSON compilation database. This will not '
-                         'trigger actual build. '
-                       ),
-                       action='store_true', default=False)
-+=======
-+>>>>>>> .their
-   return parser.parse_args()
- 
- 
-changed in both
-  base   100644 e6870246b5698116bc6c123c821b1069a8362e77 script/ci-release-build.js
-  our    100644 be9f9597387f5f8b7bfddc61c202f32ce4c6d478 script/ci-release-build.js
-  their  100644 60c3682ac708e0177352aee7284744b82255c05b script/ci-release-build.js
-@@ -3,12 +3,15 @@
- const assert = require('assert')
- const request = require('request')
- const buildAppVeyorURL = 'https://windows-ci.electronjs.org/api/builds'
-+<<<<<<< .our
- const vstsURL = 'https://github.visualstudio.com/electron/_apis/build'
- 
- const appVeyorJobs = {
-   'electron-x64': 'electron',
-   'electron-ia32': 'electron-39ng6'
- }
-+=======
-+>>>>>>> .their
- 
- const circleCIJobs = [
-   'electron-linux-arm',
-@@ -18,11 +21,14 @@
-   'electron-linux-x64'
- ]
- 
-+<<<<<<< .our
- const vstsJobs = [
-   'electron-release-mas-x64',
-   'electron-release-osx-x64'
- ]
- 
-+=======
-+>>>>>>> .their
- async function makeRequest (requestOptions, parseResponse) {
-   return new Promise((resolve, reject) => {
-     request(requestOptions, (err, res, body) => {
-@@ -139,6 +145,7 @@
-   }
- }
- 
-+<<<<<<< .our
- async function buildVSTS (targetBranch, options) {
-   if (options.job) {
-     assert(vstsJobs.includes(options.job), `Unknown VSTS CI job name: ${options.job}. Valid values are: ${vstsJobs}.`)
-@@ -202,6 +209,8 @@
-   console.log(`VSTS release build request for ${build.name} successful. Check ${vstsResponse._links.web.href} for status.`)
- }
- 
-+=======
-+>>>>>>> .their
- function runRelease (targetBranch, options) {
-   if (options.ci) {
-     switch (options.ci) {
-@@ -213,6 +222,7 @@
-         buildAppVeyor(targetBranch, options)
-         break
-       }
-+<<<<<<< .our
-       case 'VSTS': {
-         buildVSTS(targetBranch, options)
-         break
-@@ -226,12 +236,19 @@
-     buildCircleCI(targetBranch, options)
-     buildAppVeyor(targetBranch, options)
-     buildVSTS(targetBranch, options)
-+=======
-+    }
-+  } else {
-+    buildCircleCI(targetBranch, options.ghRelease, options.job)
-+    buildAppVeyor(targetBranch, options.ghRelease)
-+>>>>>>> .their
-   }
- }
- 
- module.exports = runRelease
- 
- if (require.main === module) {
-+<<<<<<< .our
-   const args = require('minimist')(process.argv.slice(2), {
-     boolean: ['ghRelease', 'automaticRelease']
-   })
-@@ -239,6 +256,13 @@
-   if (args._.length < 1) {
-     console.log(`Trigger CI to build release builds of electron.
-     Usage: ci-release-build.js [--job=CI_JOB_NAME] [--ci=CircleCI|AppVeyor|VSTS] [--ghRelease] [--automaticRelease] TARGET_BRANCH
-+=======
-+  const args = require('minimist')(process.argv.slice(2), { boolean: 'ghRelease' })
-+  const targetBranch = args._[0]
-+  if (args._.length < 1) {
-+    console.log(`Trigger CI to build release builds of electron.
-+    Usage: ci-release-build.js [--job=CI_JOB_NAME] [--ci=CircleCI|AppVeyor] [--ghRelease] TARGET_BRANCH
-+>>>>>>> .their
-     `)
-     process.exit(0)
-   }
-changed in both
-  base   100755 9eef2bffef97c473849d226f90580db061d7087c script/create-dist.py
-  our    100755 4a6c0c7ce8f275175e48c4c380ff33627f7a5961 script/create-dist.py
-  their  100755 f20ebf83adfd79ef2c1f0fb71e577eb3b8b44c5c script/create-dist.py
-@@ -147,7 +147,11 @@
- 
-   # Copy file and keep the executable bit.
-   shutil.copyfile(src, dest)
-+<<<<<<< .our
-   add_exec_bit(dest)
-+=======
-+  os.chmod(dest, os.stat(dest).st_mode | stat.S_IEXEC)
-+>>>>>>> .their
- 
- def copy_vcruntime_binaries():
-   arch = get_target_arch()
-@@ -231,7 +235,7 @@
-   elif get_target_arch() == 'arm64':
-     strip = 'aarch64-linux-gnu-strip'
-   elif get_target_arch() == 'mips64el':
--    strip = 'mips64el-redhat-linux-strip'
-+    strip = 'mips64el-loongson-linux-strip'
-   else:
-     strip = 'strip'
-   execute([strip, binary_path], env=build_env())
-@@ -302,7 +306,11 @@
-     dest = os.path.join(DIST_DIR, binary)
-     # Copy file and keep the executable bit.
-     shutil.copyfile(src, dest)
-+<<<<<<< .our
-     add_exec_bit(dest)
-+=======
-+    os.chmod(dest, os.stat(dest).st_mode | stat.S_IEXEC)
-+>>>>>>> .their
- 
-     dist_name = get_zip_name(binary, version)
-     zip_file = os.path.join(SOURCE_ROOT, 'dist', dist_name)
-merged
-  result 100644 052f0830e8bfc18ad4a0785af5a96c7267e4a1fa script/lib/config.py
-  our    100644 9ad0fbc680e5ecdeb8c13d0f0d6678bbba7d9031 script/lib/config.py
-@@ -8,8 +8,8 @@
- # URL to the mips64el sysroot image.
- MIPS64EL_SYSROOT_URL = 'https://github.com/electron/debian-sysroot-image-creator/releases/download/v0.5.0/debian_jessie_mips64-sysroot.tar.bz2'
- # URL to the mips64el toolchain.
--MIPS64EL_GCC = 'gcc-4.8.3-d197-n64-loongson'
--MIPS64EL_GCC_URL = 'http://ftp.loongnix.org/toolchain/gcc/release/' + MIPS64EL_GCC + '.tar.gz'
-+MIPS64EL_GCC = 'cross-gcc-4.9.3-n64-loongson-rc5.4'
-+MIPS64EL_GCC_URL = 'https://github.com/electron/debian-sysroot-image-creator/releases/download/v0.5.0/' + MIPS64EL_GCC + '.tar.gz'
- 
- BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \
-     'https://s3.amazonaws.com/github-janky-artifacts/libchromiumcontent'
-@@ -93,11 +93,11 @@
-     VENDOR_DIR = os.path.join(SOURCE_ROOT, 'vendor')
-     gcc_dir = os.path.join(VENDOR_DIR, MIPS64EL_GCC)
-     ldlib_dirs = [
--      gcc_dir + '/usr/x86_64-unknown-linux-gnu/mips64el-redhat-linux/lib',
-+      gcc_dir + '/usr/x86_64-unknown-linux-gnu/mips64el-loongson-linux/lib',
-       gcc_dir + '/usr/lib64',
--      gcc_dir + '/usr/mips64el-redhat-linux/lib64',
--      gcc_dir + '/usr/mips64el-redhat-linux/sysroot/lib64',
--      gcc_dir + '/usr/mips64el-redhat-linux/sysroot/usr/lib64',
-+      gcc_dir + '/usr/mips64el-loongson-linux/lib64',
-+      gcc_dir + '/usr/mips64el-loongson-linux/sysroot/lib64',
-+      gcc_dir + '/usr/mips64el-loongson-linux/sysroot/usr/lib64',
-     ]
-     env['LD_LIBRARY_PATH'] = os.pathsep.join(ldlib_dirs)
-     env['PATH'] = os.pathsep.join([gcc_dir + '/usr/bin', env['PATH']])
-changed in both
-  base   100755 ccc9057693fe3524bf7ffc8cd619579fbe8635e3 script/prepare-release.js
-  our    100755 72a28b719bf1ff7770692caef86c76746c4d8edf script/prepare-release.js
-  their  100755 cb5ea44688210d23b03a13dc8e68d2b7b635dd98 script/prepare-release.js
-@@ -34,6 +34,13 @@
-   if (!dryRun) {
-     console.log(`Bumping for new "${versionType}" version.`)
-   }
-+<<<<<<< .our
-+=======
-+}
-+
-+function getNewVersion (dryRun) {
-+  console.log(`Bumping for new "${versionType}" version.`)
-+>>>>>>> .their
-   let bumpScript = path.join(__dirname, 'bump-version.py')
-   let scriptArgs = [bumpScript, '--bump', versionType]
-   if (args.stable) {
-@@ -164,6 +171,7 @@
-   githubOpts.draft = true
-   githubOpts.name = `electron ${newVersion}`
-   if (isBeta) {
-+<<<<<<< .our
-     if (newVersion.indexOf('nightly') > 0) {
-       githubOpts.body = `Note: This is a nightly release.  Please file new issues ` +
-         `for any bugs you find in it.\n \n This release is published to npm ` +
-@@ -175,6 +183,12 @@
-         `under the beta tag and can be installed via npm install electron@beta, ` +
-         `or npm i electron@${newVersion.substr(1)}.\n \n ${releaseNotes}`
-     }
-+=======
-+    githubOpts.body = `Note: This is a beta release.  Please file new issues ` +
-+      `for any bugs you find in it.\n \n This release is published to npm ` +
-+      `under the beta tag and can be installed via npm install electron@beta, ` +
-+      `or npm i electron@${newVersion.substr(1)}.\n \n ${releaseNotes}`
-+>>>>>>> .their
-     githubOpts.name = `${githubOpts.name}`
-     githubOpts.prerelease = true
-   } else {
-@@ -250,11 +264,36 @@
-   })
- }
- 
-+<<<<<<< .our
- // function to determine if there have been commits to master since the last release
- async function changesToRelease () {
-   let lastCommitWasRelease = new RegExp(`^Bump v[0-9.]*(-beta[0-9.]*)?(-nightly[0-9.]*)?$`, 'g')
-   let lastCommit = await GitProcess.exec(['log', '-n', '1', `--pretty=format:'%s'`], gitDir)
-   return !lastCommitWasRelease.test(lastCommit.stdout)
-+=======
-+async function verifyNewVersion () {
-+  let newVersion = await getNewVersion(true)
-+  let response = await promptForVersion(newVersion)
-+  if (response.match(/^y/i)) {
-+    console.log(`${pass} Starting release of ${newVersion}`)
-+  } else {
-+    console.log(`${fail} Aborting release of ${newVersion}`)
-+    process.exit()
-+  }
-+}
-+
-+async function promptForVersion (version) {
-+  return new Promise((resolve, reject) => {
-+    const rl = readline.createInterface({
-+      input: process.stdin,
-+      output: process.stdout
-+    })
-+    rl.question(`Do you want to create the release ${version.green} (y/N)? `, (answer) => {
-+      rl.close()
-+      resolve(answer)
-+    })
-+  })
-+>>>>>>> .their
- }
- 
- async function prepareRelease (isBeta, notesOnly) {
-@@ -262,6 +301,7 @@
-     let newVersion = await getNewVersion(true)
-     console.log(newVersion)
-   } else {
-+<<<<<<< .our
-     const currentBranch = (args.branch) ? args.branch : await getCurrentBranch(gitDir)
-     if (notesOnly) {
-       let releaseNotes = await getReleaseNotes(currentBranch)
-@@ -278,6 +318,13 @@
-         process.exit(1)
-       }
-     }
-+=======
-+    await verifyNewVersion()
-+    await createReleaseBranch()
-+    await createRelease(currentBranch, isBeta)
-+    await pushRelease()
-+    await runReleaseBuilds()
-+>>>>>>> .their
-   }
- }
- 
-changed in both
-  base   100644 aaf93f33cd9a49f4ce4981efd8a8480e6658579f script/publish-to-npm.js
-  our    100644 27290c513bb28d9bd394575d833f1e6786e3b479 script/publish-to-npm.js
-  their  100644 eb0702ff5ef265b545824ba21ffb4c5d760d5476 script/publish-to-npm.js
-changed in both
-  base   100755 1baa56a7c8862da9f24f7814dc12359c0c75b072 script/release.js
-  our    100755 84e00ad4f309201f151c3f8fcbaf9ee536c9b6cb script/release.js
-  their  100755 9863ef912cd5a940428e9ac22e1993494b2b1828 script/release.js
-@@ -446,6 +446,7 @@
-     `shasums defined in ${validationArgs.shaSumFile}.`)
- }
- 
-+<<<<<<< .our
- async function tagLibCC () {
-   const tag = `electron-${pkg.version}`
-   const libccDir = path.join(path.resolve(__dirname, '..'), 'vendor', 'libchromiumcontent')
-@@ -459,6 +460,23 @@
-       console.log(`${fail} Error pushing libchromiumcontent tag ${tag}: ` +
-         `${pushDetails.stderr}`)
-     }
-+=======
-+async function cleanupReleaseBranch () {
-+  console.log(`Cleaning up release branch.`)
-+  let errorMessage = `Could not delete local release branch.`
-+  let successMessage = `Successfully deleted local release branch.`
-+  await callGit(['branch', '-D', 'release'], errorMessage, successMessage)
-+  errorMessage = `Could not delete remote release branch.`
-+  successMessage = `Successfully deleted remote release branch.`
-+  return callGit(['push', 'origin', ':release'], errorMessage, successMessage)
-+}
-+
-+async function callGit (args, errorMessage, successMessage) {
-+  let gitResult = await GitProcess.exec(args, gitDir)
-+  if (gitResult.exitCode === 0) {
-+    console.log(`${pass} ${successMessage}`)
-+    return true
-+>>>>>>> .their
-   } else {
-     console.log(`${fail} Error tagging libchromiumcontent with ${tag}: ` +
-       `${tagDetails.stderr}`)
-changed in both
-  base   100755 cea171d8597c9917839e322cb6c8e4d0c308ac30 script/update-clang.sh
-  our    100755 0c7ab60533381e33152b8735aaccf41d5f0d6676 script/update-clang.sh
-  their  100755 4a0924576a0fe26d980c71bfa7ff4917d3fb66db script/update-clang.sh
-@@ -46,37 +46,54 @@
- 
- # Check if there's a prebuilt binary and if so just fetch that. That's faster,
- # and goma relies on having matching binary hashes on client and server too.
--CDS_FILE="clang-${PACKAGE_VERSION}.tgz"
-+echo Trying to download prebuilt clang
-+rm -rf "${LLVM_BUILD_DIR}"
-+mkdir -p "${LLVM_BUILD_DIR}"
-+
-+CDS_FILES=("clang-${PACKAGE_VERSION}.tgz")
- CDS_OUT_DIR=$(mktemp -d -t clang_download.XXXXXX)
--CDS_OUTPUT="${CDS_OUT_DIR}/${CDS_FILE}"
- if [ "${OS}" = "Linux" ]; then
-   ARCH="$(uname -m)"
-   if [ "${ARCH}" = "aarch64" ]; then
-+<<<<<<< .our
-     CDS_FULL_URL="${S3_URL}/arm64/${CDS_FILE}"
-   else
-     CDS_FULL_URL="${CDS_URL}/Linux_x64/${CDS_FILE}"
-+=======
-+    CDS_URL="${S3_URL}"
-+    CDS_SUBDIR="arm64"
-+  else
-+    CDS_FILES+=("llvmgold-${PACKAGE_VERSION}.tgz")
-+    CDS_SUBDIR="Linux_x64"
-+>>>>>>> .their
-   fi
- elif [ "${OS}" = "Darwin" ]; then
--  CDS_FULL_URL="${CDS_URL}/Mac/${CDS_FILE}"
--fi
--echo Trying to download prebuilt clang
--if which curl > /dev/null; then
--  curl -L --fail "${CDS_FULL_URL}" -o "${CDS_OUTPUT}" || \
--      rm -rf "${CDS_OUT_DIR}"
--elif which wget > /dev/null; then
--  wget "${CDS_FULL_URL}" -O "${CDS_OUTPUT}" || rm -rf "${CDS_OUT_DIR}"
--else
--  echo "Neither curl nor wget found. Please install one of these."
--  exit 1
--fi
--if [ -f "${CDS_OUTPUT}" ]; then
--  rm -rf "${LLVM_BUILD_DIR}"
--  mkdir -p "${LLVM_BUILD_DIR}"
--  tar -xzf "${CDS_OUTPUT}" -C "${LLVM_BUILD_DIR}"
--  echo clang "${PACKAGE_VERSION}" unpacked
--  echo "${PACKAGE_VERSION}" > "${STAMP_FILE}"
--  rm -rf "${CDS_OUT_DIR}"
--  exit 0
--else
--  echo Did not find prebuilt clang "${PACKAGE_VERSION}", building
-+  CDS_SUBDIR="Mac"
- fi
-+for CDS_FILE in "${CDS_FILES[@]}"
-+do
-+  CDS_OUTPUT="${CDS_OUT_DIR}/${CDS_FILE}"
-+  CDS_FULL_URL="${CDS_URL}/${CDS_SUBDIR}/${CDS_FILE}"
-+
-+  if which curl > /dev/null; then
-+    curl -L --fail "${CDS_FULL_URL}" -o "${CDS_OUTPUT}" || \
-+        rm -rf "${CDS_OUT_DIR}"
-+  elif which wget > /dev/null; then
-+    wget "${CDS_FULL_URL}" -O "${CDS_OUTPUT}" || rm -rf "${CDS_OUT_DIR}"
-+  else
-+    echo "Neither curl nor wget found. Please install one of these."
-+    exit 1
-+  fi
-+
-+  if [ -f "${CDS_OUTPUT}" ]; then
-+    tar -xzf "${CDS_OUTPUT}" -C "${LLVM_BUILD_DIR}"
-+  else
-+    echo Did not find prebuilt clang "${PACKAGE_VERSION}"
-+    exit 1
-+  fi
-+done
-+
-+echo clang "${PACKAGE_VERSION}" unpacked
-+echo "${PACKAGE_VERSION}" > "${STAMP_FILE}"
-+rm -rf "${CDS_OUT_DIR}"
-+exit 0
-changed in both
-  base   100755 2be84be82d78c16a55dae4070d81c6ec79ab2691 script/upload.py
-  our    100755 2d9eaa201265971ca01acaea6e84a440e5db0532 script/upload.py
-  their  100755 ee7a027af02274326ba06d84df031bb0d241ec47 script/upload.py
-@@ -76,9 +76,23 @@
-   upload_electron(release, os.path.join(DIST_DIR, ffmpeg), args)
- 
-   chromedriver = get_zip_name('chromedriver', ELECTRON_VERSION)
-+<<<<<<< .our
-   upload_electron(release, os.path.join(DIST_DIR, chromedriver), args)
-   mksnapshot = get_zip_name('mksnapshot', ELECTRON_VERSION)
-   upload_electron(release, os.path.join(DIST_DIR, mksnapshot), args)
-+=======
-+  upload_electron(github, release, os.path.join(DIST_DIR, chromedriver),
-+                  args.upload_to_s3)
-+  mksnapshot = get_zip_name('mksnapshot', ELECTRON_VERSION)
-+  upload_electron(github, release, os.path.join(DIST_DIR, mksnapshot),
-+                args.upload_to_s3)
-+
-+  if get_target_arch().startswith('arm'):
-+    # Upload the x64 binary for arm/arm64 mksnapshot
-+    mksnapshot = get_zip_name('mksnapshot', ELECTRON_VERSION, 'x64')
-+    upload_electron(github, release, os.path.join(DIST_DIR, mksnapshot),
-+                    args.upload_to_s3)
-+>>>>>>> .their
- 
-   if get_target_arch().startswith('arm'):
-     # Upload the x64 binary for arm/arm64 mksnapshot
-@@ -149,8 +163,56 @@
-   return dist_time > int(head_time)
- 
- 
-+<<<<<<< .our
- def upload_electron(release, file_path, args):
-   filename = os.path.basename(file_path)
-+=======
-+def get_text_with_editor(name):
-+  editor = os.environ.get('EDITOR', 'nano')
-+  initial_message = '\n# Please enter the body of your release note for %s.' \
-+                    % name
-+
-+  t = tempfile.NamedTemporaryFile(suffix='.tmp', delete=False)
-+  t.write(initial_message)
-+  t.close()
-+  subprocess.call([editor, t.name])
-+
-+  text = ''
-+  for line in open(t.name, 'r'):
-+    if len(line) == 0 or line[0] != '#':
-+      text += line
-+
-+  os.unlink(t.name)
-+  return text
-+
-+def create_or_get_release_draft(github, releases, tag, tag_exists):
-+  # Search for existing draft.
-+  for release in releases:
-+    if release['draft'] and release['tag_name'] == tag:
-+      return release
-+
-+  if tag_exists:
-+    tag = 'do-not-publish-me'
-+  return create_release_draft(github, tag)
-+
-+
-+def create_release_draft(github, tag):
-+  name = '{0} {1} beta'.format(PROJECT_NAME, tag)
-+  if os.environ.has_key('CI'):
-+    body = '(placeholder)'
-+  else:
-+    body = get_text_with_editor(name)
-+  if body == '':
-+    sys.stderr.write('Quit due to empty release note.\n')
-+    sys.exit(0)
-+
-+  data = dict(tag_name=tag, name=name, body=body, draft=True, prerelease=True)
-+  r = github.repos(ELECTRON_REPO).releases.post(data=data)
-+  return r
-+
-+
-+def upload_electron(github, release, file_path, upload_to_s3):
-+>>>>>>> .their
- 
-   # if upload_to_s3 is set, skip github upload.
-   if args.upload_to_s3:
-changed in both
-  base   100644 3df3a87e66429193d65c27545e92a034dce92eeb spec/api-app-spec.js
-  our    100644 d224eda2989332c18d655cef05a8bacc2eb6d4b8 spec/api-app-spec.js
-  their  100644 5816902d7cd68c74d4161ef3a87402125a44c0a5 spec/api-app-spec.js
-@@ -720,6 +720,54 @@
-     })
-   })
- 
-+  describe('app launch through uri', () => {
-+    before(function () {
-+      if (process.platform !== 'win32') {
-+        this.skip()
-+      }
-+    })
-+
-+    it('does not launch for blacklisted argument', function (done) {
-+      const appPath = path.join(__dirname, 'fixtures', 'api', 'quit-app')
-+      // App should exit with non 123 code.
-+      const first = ChildProcess.spawn(remote.process.execPath, [appPath, 'electron-test://?', '--no-sandbox', '--gpu-launcher=cmd.exe /c start calc'])
-+      first.once('exit', (code) => {
-+        assert.notEqual(code, 123)
-+        done()
-+      })
-+    })
-+
-+    it('launches successfully for multiple uris in cmd args', function (done) {
-+      const appPath = path.join(__dirname, 'fixtures', 'api', 'quit-app')
-+      // App should exit with code 123.
-+      const first = ChildProcess.spawn(remote.process.execPath, [appPath, 'http://electronjs.org', 'electron-test://testdata'])
-+      first.once('exit', (code) => {
-+        assert.equal(code, 123)
-+        done()
-+      })
-+    })
-+
-+    it('does not launch for encoded space', function (done) {
-+      const appPath = path.join(__dirname, 'fixtures', 'api', 'quit-app')
-+      // App should exit with non 123 code.
-+      const first = ChildProcess.spawn(remote.process.execPath, [appPath, 'electron-test://?', '--no-sandbox', '--gpu-launcher%20"cmd.exe /c start calc'])
-+      first.once('exit', (code) => {
-+        assert.notEqual(code, 123)
-+        done()
-+      })
-+    })
-+
-+    it('launches successfully for argnames similar to blacklisted ones', function (done) {
-+      const appPath = path.join(__dirname, 'fixtures', 'api', 'quit-app')
-+      // inspect is blacklisted, but inspector should work, and app launch should succeed
-+      const first = ChildProcess.spawn(remote.process.execPath, [appPath, 'electron-test://?', '--inspector'])
-+      first.once('exit', (code) => {
-+        assert.equal(code, 123)
-+        done()
-+      })
-+    })
-+  })
-+
-   describe('getFileIcon() API', () => {
-     const iconPath = path.join(__dirname, 'fixtures/assets/icon.ico')
-     const sizes = {
-changed in both
-  base   100644 ab96021ebf4c4360fa581b5a695249456a9afeda spec/api-browser-view-spec.js
-  our    100644 968912a4abf3d759a1363e2420d2c21b7923dbd6 spec/api-browser-view-spec.js
-  their  100644 df239a8914527a2d62f652b878c97a7791f63a9d spec/api-browser-view-spec.js
-@@ -44,9 +44,15 @@
-   describe('BrowserView.isDestroyed()', () => {
-     it('returns correct value', () => {
-       view = new BrowserView()
-+<<<<<<< .our
-       expect(view.isDestroyed()).to.be.false()
-       view.destroy()
-       expect(view.isDestroyed()).to.be.true()
-+=======
-+      assert.ok(!view.isDestroyed())
-+      view.destroy()
-+      assert.ok(view.isDestroyed())
-+>>>>>>> .their
-     })
-   })
- 
-changed in both
-  base   100644 2adc82df05d0d9c0524324edfe33f83824f47cb4 spec/api-browser-window-spec.js
-  our    100644 f4cba12ec19d224bc46fca898db42a99baf4972e spec/api-browser-window-spec.js
-  their  100644 2a52bbc1043c17624ffe60cca6a09b43bf3089aa spec/api-browser-window-spec.js
-@@ -453,6 +453,29 @@
-       // Values can be 0,2,3,4, or 6. We want 6, which is RGB + Alpha
-       expect(imgBuffer[25]).to.equal(6)
-     })
-+
-+    it('preserves transparency', (done) => {
-+      w.close()
-+      const width = 400
-+      const height = 400
-+      w = new BrowserWindow({
-+        show: false,
-+        width: width,
-+        height: height,
-+        transparent: true
-+      })
-+      w.loadURL('data:text/html,<html><body background-color: rgba(255,255,255,0)></body></html>')
-+      w.once('ready-to-show', () => {
-+        w.show()
-+        w.capturePage((image) => {
-+          let imgBuffer = image.toPNG()
-+          // Check 25th byte in the PNG
-+          // Values can be 0,2,3,4, or 6. We want 6, which is RGB + Alpha
-+          assert.equal(imgBuffer[25], 6)
-+          done()
-+        })
-+      })
-+    })
-   })
- 
-   describe('BrowserWindow.setSize(width, height)', () => {
-changed in both
-  base   100644 2a74fc7297af92e99ff99ec38d6a57e1246b6f38 spec/api-menu-spec.js
-  our    100644 ed2749700c6c8bf299f507d52606c1ae3f597e5c spec/api-menu-spec.js
-  their  100644 4afac1b4f7f2f46aa9fd573c40a6aa74ecb0cc88 spec/api-menu-spec.js
-@@ -648,10 +648,28 @@
-       return closeWindow(w).then(() => { w = null })
-     })
- 
-+<<<<<<< .our
-     it('throws an error if options is not an object', () => {
-       expect(() => {
-         menu.popup('this is a string, not an object')
-       }).to.throw(/Options must be an object/)
-+=======
-+    it('returns immediately', () => {
-+      const { browserWindow, x, y, async } = menu.popup(w, {x: 100, y: 101, async: true})
-+
-+      assert.equal(browserWindow, w)
-+      assert.equal(x, 100)
-+      assert.equal(y, 101)
-+      assert.equal(async, true)
-+    })
-+
-+    it('works without a given BrowserWindow and options', () => {
-+      const { browserWindow, x, y } = menu.popup({x: 100, y: 101, async: true})
-+
-+      assert.equal(browserWindow.constructor.name, 'BrowserWindow')
-+      assert.equal(x, 100)
-+      assert.equal(y, 101)
-+>>>>>>> .their
-     })
- 
-     it('allows for options to be optional', () => {
-changed in both
-  base   100644 54235a334a5403dd580424d3129569c60e4c41de spec/api-session-spec.js
-  our    100644 b9093d1d6335ece5ca713a668a67bf3b40f4fabe spec/api-session-spec.js
-  their  100644 5e9743f83d9ab56419080674f82f8847495eb2e5 spec/api-session-spec.js
-@@ -298,8 +298,12 @@
-                                    filename, port, savePath, isCustom) => {
-       assert.equal(state, 'completed')
-       assert.equal(filename, 'mock.pdf')
-+<<<<<<< .our
-       assert.ok(path.isAbsolute(savePath))
-       assert.ok(isPathEqual(savePath, path.join(__dirname, 'fixtures', 'mock.pdf')))
-+=======
-+      assert.equal(savePath, path.join(__dirname, 'fixtures', 'mock.pdf'))
-+>>>>>>> .their
-       if (isCustom) {
-         assert.equal(url, `${protocolName}://item`)
-       } else {
-changed in both
-  base   100644 1420fed7c6a7b64ad1fb04da0751725bddb87b5c spec/chromium-spec.js
-  our    100644 d90269769d269e4054d25cba4b6c4ac8a1929aa6 spec/chromium-spec.js
-  their  100644 ffcc187e8434e1baaf5b667184a7a376200987fe spec/chromium-spec.js
-@@ -319,8 +319,12 @@
-       b = window.open(windowUrl, '', 'nodeIntegration=no,show=no')
-     })
- 
-+<<<<<<< .our
-     // TODO(codebytere): re-enable this test
-     xit('disables node integration when it is disabled on the parent window for chrome devtools URLs', (done) => {
-+=======
-+    it('disables node integration when it is disabled on the parent window for chrome devtools URLs', (done) => {
-+>>>>>>> .their
-       let b
-       app.once('web-contents-created', (event, contents) => {
-         contents.once('did-finish-load', () => {
-changed in both
-  base   100644 cfe840ca0a44c5766509b2865034d98e375da1a1 spec/modules-spec.js
-  our    100644 b996b8f4839bff2160bffb69e55263b16a4178d7 spec/modules-spec.js
-  their  100644 28f2602acff67b2da9accd0574d64d386e0795a7 spec/modules-spec.js
-changed in both
-  base   100644 57cb31e2b52888c7d2135d0169d514e26106d356 spec/node-spec.js
-  our    100644 9bb03494a56ffacec075c40bebde39a3b57ac734 spec/node-spec.js
-  their  100644 572c9548c1d2a3657473a64e74679c777ca5a2ba spec/node-spec.js
-changed in both
-  base   100644 4a4dfd109df33c9f5f607d6ea593276973e0bb3f spec/static/main.js
-  our    100644 5659c44c8de4456a25e0026e29199b827c89cb08 spec/static/main.js
-  their  100644 f91dc4e5216774d73a5d7648ee873770ac694210 spec/static/main.js
-changed in both
-  base   100644 6580f18a1ad9e53ab3f2ae88cb7ea023bcf9579c toolchain.gypi
-  our    100644 697add78e42191741cee1b015cdcf4f801c570e7 toolchain.gypi
-  their  100644 82408a5ac62ac1c84ae33c3b440b8fc243674fee toolchain.gypi
-@@ -9,7 +9,7 @@
-     'cc_wrapper%': '',
- 
-     # Path to mips64el toolchain.
--    'make_mips64_dir%': 'vendor/gcc-4.8.3-d197-n64-loongson/usr',
-+    'make_mips64_dir%': 'vendor/cross-gcc-4.9.3-n64-loongson-rc5.4/usr',
- 
-     'variables': {
-       # The minimum macOS SDK version to use.
-@@ -116,8 +116,10 @@
-     # Setup building with clang.
-     ['clang==1', {
-       'make_global_settings': [
-+        ['AR', '<(make_clang_dir)/bin/llvm-ar'],
-         ['CC', '<(make_clang_dir)/bin/clang'],
-         ['CXX', '<(make_clang_dir)/bin/clang++'],
-+        ['AR.host', '<(make_clang_dir)/bin/llvm-ar'],
-         ['CC.host', '$(CC)'],
-         ['CXX.host', '$(CXX)'],
-       ],
-@@ -192,8 +194,8 @@
- 
-     ['target_arch=="mips64el"', {
-       'make_global_settings': [
--        ['CC', '<(make_mips64_dir)/bin/mips64el-redhat-linux-gcc'],
--        ['CXX', '<(make_mips64_dir)/bin/mips64el-redhat-linux-g++'],
-+        ['CC', '<(make_mips64_dir)/bin/mips64el-loongson-linux-gcc'],
-+        ['CXX', '<(make_mips64_dir)/bin/mips64el-loongson-linux-g++'],
-         ['CC.host', '$(CC)'],
-         ['CXX.host', '$(CXX)'],
-       ],
-changed in both
-  base   160000 eb1db5393cd8bf2f931c5ef3ab7c55948bd57d60 vendor/libchromiumcontent
-  our    160000 c85470a1c379b1c4bedb372c146521bc4be9b75d vendor/libchromiumcontent
-  their  160000 07396ffd8e07470ae2e939d26bc8d7b6b4c3d9d3 vendor/libchromiumcontent
-changed in both
-  base   160000 dc8fe9d390b1deb32ae2601357a90679cbcc757e vendor/node
-  our    160000 ece0a06ac8147efb5b5af431c21f312f1884616e vendor/node
-  their  160000 2586ef1eb5f5f53da2c1852efb47c20dc8888534 vendor/node
-added in both
-  our    100644 84bd69c2b2868ac23bc30061aa208ad38fbb9506 vsts.yml
-  their  100644 aaee2e6522650cd470f09e43b74b4d0a126c2128 vsts.yml
-@@ -59,7 +59,11 @@
- - bash: |
-     echo 'Verifying ffmpeg on build'
-     if [ "$ELECTRON_RELEASE" == "1" ]; then
-+<<<<<<< .our
-       script/verify-ffmpeg.py -c R
-+=======
-+      script/verify-ffmpeg.py -R
-+>>>>>>> .their
-     else
-       script/verify-ffmpeg.py
-     fi
-@@ -69,6 +73,7 @@
- - task: PublishTestResults@2
-   displayName: Publish Test Results
-   inputs:
-+<<<<<<< .our
-     testResultsFiles: '**/test-*.xml'
-   condition: and(always(), eq(variables['MOCHA_FILE'], 'test-results.xml'))
- 
-@@ -93,5 +98,18 @@
-   inputs:
-     PathtoPublish: '$(Build.SourcesDirectory)/out'
-     ArtifactName: out
-+=======
-+    testResultsFiles: 'test-results.xml'
-+    searchFolder: junit
-+  condition: and(always(), ne(variables['ELECTRON_RELEASE'], '1'))
-+
-+- task: kasunkodagoda.slack-notification.slack-notification-task.SlackNotification@3
-+  displayName: Post Slack Notification
-+  inputs:
-+    SlackApiToken: '$(slack_token)'
-+    Channel: '#bot-nightly-releases'
-+    Message: '$(Build.DefinitionName)-$(Build.BuildNumber) finished with a $(Agent.JobStatus) status.'
-+  condition: and(always(), eq(variables['Build.Reason'], 'Schedule'))
-+>>>>>>> .their
- 
- - task: mspremier.PostBuildCleanup.PostBuildCleanup-task.PostBuildCleanup@3
diff --git a/app/test/fixtures/merge-parser/electron/merge-2-0-x-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-2-0-x-into-master.txt
deleted file mode 100644
index 99d23d16233..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-2-0-x-into-master.txt
+++ /dev/null
@@ -1,6917 +0,0 @@
-changed in both
-  base   100644 d4f98eab95b73b59018f170b09b9132d4d03477b .circleci/config.yml
-  our    100644 6d44d618aabcce04c60344f2274dec5b0c2a1f68 .circleci/config.yml
-  their  100644 8d065e3f257178d4706dcbd1340326be42b2e2e2 .circleci/config.yml
-@@ -19,6 +19,7 @@
-       fi
-     when: on_success
- 
-+<<<<<<< .our
- build-steps: &build-steps
-   steps:
-     - checkout
-@@ -92,6 +93,13 @@
-           fi
-     - run:
-         name: Test
-+=======
-+version: 2
-+jobs:
-+  electron-linux-arm:
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+>>>>>>> .their
-         environment:
-           MOCHA_FILE: junit/test-results.xml
-           MOCHA_REPORTER: mocha-junit-reporter
-@@ -110,6 +118,7 @@
-                 echo 'Skipping tests on GitHub release'
-               fi
-             fi
-+<<<<<<< .our
-           else
-            echo 'Skipping tests due to configuration'
-           fi
-@@ -117,6 +126,76 @@
-         name: Verify FFmpeg
-         command: |
-           if [ "$RUN_TESTS" == "true" ]; then
-+=======
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Optionally finish release
-+          shell: /bin/sh
-+          command: |
-+            if [ "$ELECTRON_RELEASE" == "1" ] && [ "$AUTO_RELEASE" == "true" ]; then
-+              echo 'Trying to finish release'
-+              node script/release.js --validateRelease --automaticRelease
-+              releaseExitCode=$?
-+              if [ $releaseExitCode -eq 0 ]; then
-+                echo 'Release is ready to go; releasing'
-+                node script/release.js--automaticRelease
-+                if [ $releaseExitCode -eq 0 ]; then
-+                  echo 'Release successful, now publishing to npm'
-+                  echo "//registry.npmjs.org/:_authToken=$ELECTRON_NPM_TOKEN" >> ~/.npmrc
-+                  npm run publish-to-npm
-+                  echo 'Release has been published to npm'
-+                fi
-+              else
-+                echo 'Release is not complete, skipping publish for now'
-+              fi
-+            else
-+              echo 'Skipping finishing release because build is not for release'
-+            fi
-+      - run:
-+          name: Zip out directory
-+          command: |
-+>>>>>>> .their
-             if [ "$ELECTRON_RELEASE" != "1" ]; then
-               echo 'Verifying ffmpeg on debug build'
-               script/verify-ffmpeg.py
-@@ -391,11 +470,105 @@
-     resource_class: 2xlarge
- 
-   electron-linux-arm64:
-+<<<<<<< .our
-     environment:
-       TARGET_ARCH: arm64
-     <<: *build-defaults
-     resource_class: 2xlarge
- 
-+=======
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: arm64
-+    resource_class: 2xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Optionally finish release
-+          shell: /bin/sh
-+          command: |
-+            if [ "$ELECTRON_RELEASE" == "1" ] && [ "$AUTO_RELEASE" == "true" ]; then
-+              echo 'Trying to finish release'
-+              node script/release.js --validateRelease --automaticRelease
-+              releaseExitCode=$?
-+              if [ $releaseExitCode -eq 0 ]; then
-+                echo 'Release is ready to go; releasing'
-+                node script/release.js--automaticRelease
-+                if [ $releaseExitCode -eq 0 ]; then
-+                  echo 'Release successful, now publishing to npm'
-+                  echo "//registry.npmjs.org/:_authToken=$ELECTRON_NPM_TOKEN" >> ~/.npmrc
-+                  npm run publish-to-npm
-+                  echo 'Release has been published to npm'
-+                fi
-+              else
-+                echo 'Release is not complete, skipping publish for now'
-+              fi
-+            else
-+              echo 'Skipping finishing release because build is not for release'
-+            fi
-+      - run:
-+          name: Zip out directory
-+          command: |
-+            if [ "$ELECTRON_RELEASE" != "1" ]; then
-+              zip -r electron.zip out/D
-+            fi
-+      - persist_to_workspace:
-+          root: /home/builduser
-+          paths:
-+            - project/out
-+      - store_artifacts:
-+          path: electron.zip
-+>>>>>>> .their
-   electron-linux-arm64-test:
-     machine: true
-     steps:
-@@ -430,6 +603,7 @@
-     resource_class: 2xlarge
- 
-   electron-linux-ia32:
-+<<<<<<< .our
-     environment:
-       TARGET_ARCH: ia32
-       DISPLAY: ':99.0'
-@@ -469,10 +643,317 @@
-       NIGHTLY_BUILD: true
-     <<: *build-defaults
-     resource_class: xlarge
-+=======
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: ia32
-+          DISPLAY: ':99.0'
-+    resource_class: xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Setup for headless testing
-+          command: sh -e /etc/init.d/xvfb start
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Optionally finish release
-+          shell: /bin/sh
-+          command: |
-+            if [ "$ELECTRON_RELEASE" == "1" ] && [ "$AUTO_RELEASE" == "true" ]; then
-+              echo 'Trying to finish release'
-+              node script/release.js --validateRelease --automaticRelease
-+              releaseExitCode=$?
-+              if [ $releaseExitCode -eq 0 ]; then
-+                echo 'Release is ready to go; releasing'
-+                node script/release.js--automaticRelease
-+                if [ $releaseExitCode -eq 0 ]; then
-+                  echo 'Release successful, now publishing to npm'
-+                  echo "//registry.npmjs.org/:_authToken=$ELECTRON_NPM_TOKEN" >> ~/.npmrc
-+                  npm run publish-to-npm
-+                  echo 'Release has been published to npm'
-+                fi
-+              else
-+                echo 'Release is not complete, skipping publish for now'
-+              fi
-+            else
-+              echo 'Skipping finishing release because build is not for release'
-+            fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                out/D/electron --version
-+                mkdir junit
-+                script/test.py --ci --rebuild_native_modules
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+  electron-linux-mips64el:
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: mips64el
-+    resource_class: xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Optionally finish release
-+          shell: /bin/sh
-+          command: |
-+            if [ "$ELECTRON_RELEASE" == "1" ] && [ "$AUTO_RELEASE" == "true" ]; then
-+              echo 'Trying to finish release'
-+              node script/release.js --validateRelease --automaticRelease
-+              releaseExitCode=$?
-+              if [ $releaseExitCode -eq 0 ]; then
-+                echo 'Release is ready to go; releasing'
-+                node script/release.js--automaticRelease
-+                if [ $releaseExitCode -eq 0 ]; then
-+                  echo 'Release successful, now publishing to npm'
-+                  echo "//registry.npmjs.org/:_authToken=$ELECTRON_NPM_TOKEN" >> ~/.npmrc
-+                  npm run publish-to-npm
-+                  echo 'Release has been published to npm'
-+                fi
-+              else
-+                echo 'Release is not complete, skipping publish for now'
-+              fi
-+            else
-+              echo 'Skipping finishing release because build is not for release'
-+            fi
-+
-+  electron-linux-x64:
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: x64
-+          DISPLAY: ':99.0'
-+    resource_class: xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Setup for headless testing
-+          command: sh -e /etc/init.d/xvfb start
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Optionally finish release
-+          shell: /bin/sh
-+          command: |
-+            if [ "$ELECTRON_RELEASE" == "1" ] && [ "$AUTO_RELEASE" == "true" ]; then
-+              echo 'Trying to finish release'
-+              node script/release.js --validateRelease --automaticRelease
-+              releaseExitCode=$?
-+              if [ $releaseExitCode -eq 0 ]; then
-+                echo 'Release is ready to go; releasing'
-+                node script/release.js--automaticRelease
-+                if [ $releaseExitCode -eq 0 ]; then
-+                  echo 'Release successful, now publishing to npm'
-+                  echo "//registry.npmjs.org/:_authToken=$ELECTRON_NPM_TOKEN" >> ~/.npmrc
-+                  npm run publish-to-npm
-+                  echo 'Release has been published to npm'
-+                fi
-+              else
-+                echo 'Release is not complete, skipping publish for now'
-+              fi
-+            else
-+              echo 'Skipping finishing release because build is not for release'
-+            fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                mkdir junit
-+                script/test.py --ci --rebuild_native_modules
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+      - run:
-+          name: Generate Typescript Definitions
-+          command: npm run create-typescript-definitions
-+      - store_test_results:
-+          path: junit
-+      - store_artifacts:
-+          path: junit
-+      - store_artifacts:
-+          path: out/electron.d.ts
-+      - store_artifacts:
-+          path: out/electron-api.json
-+>>>>>>> .their
- 
-   electron-osx-x64:
-     environment:
-       TARGET_ARCH: x64
-+<<<<<<< .our
-       RUN_TESTS: true
-       INSTALL_MACOS_NODE: true
-     macos:
-@@ -488,11 +969,107 @@
-     macos:
-       xcode: "8.3.3"
-     <<: *build-steps
-+=======
-+    macos:
-+        xcode: "9.0"
-+    steps:
-+      - checkout
-+      - run:
-+          name: Reclaim disk space
-+          command: |
-+            df -h
-+            sudo rm -rf /Library/Developer/CoreSimulator
-+            df -h
-+            sysctl -n hw.ncpu
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                mkdir junit
-+                script/test.py --ci --rebuild_native_modules
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+      - run:
-+          name: Generate Typescript Definitions
-+          command: npm run create-typescript-definitions
-+      - store_test_results:
-+          path: junit
-+      - store_artifacts:
-+          path: junit
-+      - store_artifacts:
-+          path: out/electron.d.ts
-+      - store_artifacts:
-+          path: out/electron-api.json
-+>>>>>>> .their
- 
-   electron-mas-x64:
-     environment:
-       TARGET_ARCH: x64
-       MAS_BUILD: 1
-+<<<<<<< .our
-       RUN_TESTS: true
-       INSTALL_MACOS_NODE: true
-     macos:
-@@ -668,6 +1245,101 @@
-       GN_EXTRA_ARGS: 'is_mas_build = true'
-     <<: *gn-mac-build-machine
-     <<: *gn-mac-build-steps
-+=======
-+    macos:
-+        xcode: "9.0"
-+    steps:
-+      - checkout
-+      - run:
-+          name: Reclaim disk space
-+          command: |
-+            df -h
-+            sudo rm -rf /Library/Developer/CoreSimulator
-+            df -h
-+            sysctl -n hw.ncpu
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                mkdir junit
-+                script/test.py --ci --rebuild_native_modules
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+      - run:
-+          name: Generate Typescript Definitions
-+          command: npm run create-typescript-definitions
-+      - store_test_results:
-+          path: junit
-+      - store_artifacts:
-+          path: junit
-+      - store_artifacts:
-+          path: out/electron.d.ts
-+      - store_artifacts:
-+          path: out/electron-api.json
-+>>>>>>> .their
- 
- workflows:
-   version: 2
-@@ -695,6 +1367,7 @@
-   build-mas-x64:
-     jobs:
-       - electron-mas-x64
-+<<<<<<< .our
-   build-gn-linux:
-     jobs:
-       - electron-gn-linux-x64-debug-fyi
-@@ -745,3 +1418,5 @@
-       - electron-gn-linux-arm64-release-fyi
-       - electron-gn-mas-release-fyi
-       - electron-gn-osx-release-fyi
-+=======
-+>>>>>>> .their
-changed in both
-  base   100644 8632e8e30869d32176552cd218560f5016a24300 .gitignore
-  our    100644 f393b1cdcef87b41bb3ed47ebae59757fed3a780 .gitignore
-  their  100644 f82d92052e4f7ac936637ac2c163633e02588f12 .gitignore
-changed in both
-  base   100644 5d04da05397c4c74ce00d6d6c8969ce370adb32d CONTRIBUTING.md
-  our    100644 414f83db905db904728facf3b40e70e7b7973193 CONTRIBUTING.md
-  their  100644 0955f68c4f2b1097e770398cf51d3af811f53050 CONTRIBUTING.md
-changed in both
-  base   100644 4cfea0e70f9af56ba746347b4cae410970f3d900 Dockerfile
-  our    100644 74e5eeedea9bea87cd7a98ac2cb63f4376275a2a Dockerfile
-  their  100644 2d74e16915d2e89e1e1e7f3ffd259cc448e1b864 Dockerfile
-@@ -7,8 +7,13 @@
- RUN chmod a+rwx /home
- 
- # Install node.js
-+<<<<<<< .our
- RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
- RUN apt-get install -y nodejs
-+=======
-+RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
-+RUN apt-get update && apt-get install -y nodejs
-+>>>>>>> .their
- 
- # Install wget used by crash reporter
- RUN apt-get install -y wget
-changed in both
-  base   100644 271947c56e39b91fc23bf10579f61cab50b0f4dc Dockerfile.circleci
-  our    100644 d369c8c640161fc3ba65935297aec7dd27eb1e9f Dockerfile.circleci
-  their  100644 0cdb1e88c24f01a5acdfd8ef348126819f593454 Dockerfile.circleci
-@@ -3,8 +3,13 @@
- USER root
- 
- # Install node.js
-+<<<<<<< .our
- RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
- RUN apt-get install -y nodejs
-+=======
-+RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
-+RUN apt-get update && apt-get install -y nodejs
-+>>>>>>> .their
- 
- # Install wget used by crash reporter
- RUN apt-get install -y wget
-added in remote
-  their  100644 c6d558f7f3518ea2924fa9075ed38ab48d70d204 Jenkinsfile.arm64
-@@ -0,0 +1,36 @@
-+pipeline {
-+  agent {
-+    docker {
-+      image 'electronbuilds/arm64v8:0.0.2'
-+      args '--privileged'
-+    }
-+  }
-+  environment {
-+    TARGET_ARCH='arm64'
-+    DISPLAY=':99.0'
-+    MOCHA_TIMEOUT='60000'
-+  }
-+  stages {
-+    stage('Bootstrap') {
-+      steps {
-+        sh 'script/bootstrap.py -v --dev --target_arch=$TARGET_ARCH'
-+      }
-+    }
-+    stage('Build') {
-+      steps {
-+        sh 'script/build.py -c D --ninja-path /usr/local/ninja/ninja'
-+      }
-+    }
-+    stage('Test') {
-+      steps {
-+        sh '/etc/init.d/xvfb start'
-+        sh 'script/test.py --ci'
-+      }
-+    }
-+  }
-+  post {
-+    always {
-+      cleanWs()
-+    }
-+  }
-+}
-changed in both
-  base   100644 160dae7908236105f8534f9448f4111da1bcb014 README.md
-  our    100644 ec09364417b767ac59b2d970fee5e2ab2db2173b README.md
-  their  100644 a7b4fa6ed40a6449245cfdbdace8bb38945284d2 README.md
-added in both
-  our    100644 67a2b2124619d866f67d849f57f3548ba28be26a appveyor.yml
-  their  100644 2c4eaacb01d60137be83cf673bfa95d5d4b398e3 appveyor.yml
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- version: 1.0.{build}
- branches:
-   except:
-@@ -71,3 +72,72 @@
-         & python script\upload.py
-       }
-     }
-+=======
-+build_cloud: electron-16
-+image: electron-16-vs2015
-+build_script:
-+- ps: >-
-+    if(($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME -split "/")[0] -eq ($env:APPVEYOR_REPO_NAME -split "/")[0]) {
-+      Write-warning "Skipping PR build for branch"; Exit-AppveyorBuild
-+    } else {
-+      Add-Path "$env:ProgramFiles (x86)\Windows Kits\10\Debuggers\x64"
-+      $env:path = "$env:ProgramFiles (x86)\Windows Kits\10\Debuggers\x64;$env:path"
-+      if($env:APPVEYOR_SCHEDULED_BUILD -eq 'True')  {
-+        $env:RUN_RELEASE_BUILD = "1"
-+      }
-+      $Message = (git log --format=%B -n 1 HEAD) | Out-String
-+      if ((Test-Path Env:\RUN_RELEASE_BUILD)) {
-+        $env:ELECTRON_RELEASE = '1'
-+        Write-Output "release build triggered from api"
-+      }
-+      if ((Test-Path Env:\ELECTRON_RELEASE)) {
-+        Write-Output "Running release build"
-+        python script\bootstrap.py --target_arch=$env:TARGET_ARCH
-+        python script\build.py -c R
-+        python script\create-dist.py
-+      } else {
-+        Write-Output "Running debug build"
-+        python script\bootstrap.py --target_arch=$env:TARGET_ARCH --dev
-+        python script\build.py -c D
-+      }
-+      if ($? -ne 'True') {
-+        throw "Build failed with exit code $?"
-+      } else {
-+        "Build succeeded."
-+      }
-+      Push-AppveyorArtifact out
-+    }
-+test_script:
-+- ps: >-
-+    if (Test-Path Env:\ELECTRON_RELEASE) {
-+      Write-Output "Skipping tests for release build"
-+    } else {
-+      Write-Output "Running tests for debug build"
-+      python script\test.py --ci --rebuild_native_modules
-+      if ($LASTEXITCODE -ne '0') {
-+        throw "Tests failed with exit code $LASTEXITCODE"
-+      } else {
-+        Write-Output "Tests succeeded."
-+      }
-+      python script\verify-ffmpeg.py
-+      if ($LASTEXITCODE -ne '0') {
-+        throw "Verify ffmpeg failed with exit code $LASTEXITCODE"
-+      } else {
-+        "Verify ffmpeg succeeded."
-+      }
-+    }
-+artifacts:
-+- path: test-results.xml
-+  name: test-results.xml
-+deploy_script:
-+- ps: >-
-+    if (Test-Path Env:\ELECTRON_RELEASE) {
-+      if (Test-Path Env:\RUN_RELEASE_BUILD) {
-+        Write-Output "Uploading Electron release distribution to s3"
-+        & python script\upload.py --upload_to_s3
-+      } else {
-+        Write-Output "Uploading Electron release distribution to github releases"
-+        & python script\upload.py
-+      }
-+    }
-+>>>>>>> .their
-changed in both
-  base   100644 9472d1cb9fd76beca4047bb24db024b9c6378aae atom/app/command_line_args.cc
-  our    100644 23e870cf4a32aecfc246a81edad46971b4456a55 atom/app/command_line_args.cc
-  their  100644 be171457726a09cde9eb7a090ba1e2a67f4cb9cb atom/app/command_line_args.cc
-@@ -31,6 +31,1376 @@
-   return false;
- }
- 
-+<<<<<<< .our
-+=======
-+/*
-+ * The blacklist of command line switches, must be sorted.
-+ * Update the list by pasting the following command into bash
-+ * in libchromiumcontent/src/:
-+
-+   (find ./ \( -name "*switches.cc" -o -name "*switch_list.h" \) | \
-+      xargs grep -P --no-filename '"\S+"[);]$' | \
-+      perl -pe 's|^.*?"(\S+)"[);]$|  "$1",|'; \
-+      echo '  "inspect",'; \
-+      echo '  "inspect-brk",') | \
-+    LANG="C" sort | \
-+    uniq > blacklist-switches.txt
-+
-+ */
-+const char* kBlacklist[] = {
-+  "/prefetch:1",
-+  "/prefetch:2",
-+  "/prefetch:3",
-+  "/prefetch:4",
-+  "/prefetch:5",
-+  "/prefetch:6",
-+  "/prefetch:8",
-+  "0",
-+  "?",
-+  "BlacklistOnly",
-+  "ChromeOSMemoryPressureHandling",
-+  "Disabled",
-+  "OnlineCheckOnly",
-+  "SafeSites",
-+  "accept-resource-provider",
-+  "account-consistency",
-+  "adaboost",
-+  "aec-refined-adaptive-filter",
-+  "agc-startup-min-volume",
-+  "aggressive",
-+  "aggressive-cache-discard",
-+  "aggressive-tab-discard",
-+  "all-toolchains",
-+  "allarticles",
-+  "allow-cross-origin-auth-prompt",
-+  "allow-external-pages",
-+  "allow-failed-policy-fetch-for-test",
-+  "allow-file-access-from-files",
-+  "allow-hidden-media-playback",
-+  "allow-http-background-page",
-+  "allow-http-screen-capture",
-+  "allow-insecure-localhost",
-+  "allow-legacy-extension-manifests",
-+  "allow-loopback-in-peer-connection",
-+  "allow-nacl-crxfs-api",
-+  "allow-nacl-file-handle-api",
-+  "allow-nacl-socket-api",
-+  "allow-no-sandbox-job",
-+  "allow-outdated-plugins",
-+  "allow-ra-in-dev-mode",
-+  "allow-running-insecure-content",
-+  "allow-sandbox-debugging",
-+  "allow-silent-push",
-+  "alsa-check-close-timeout",
-+  "alsa-enable-upsampling",
-+  "alsa-fixed-output-sample-rate",
-+  "alsa-input-device",
-+  "alsa-mute-device-name",
-+  "alsa-mute-element-name",
-+  "alsa-output-avail-min",
-+  "alsa-output-buffer-size",
-+  "alsa-output-device",
-+  "alsa-output-period-size",
-+  "alsa-output-start-threshold",
-+  "alsa-volume-device-name",
-+  "alsa-volume-element-name",
-+  "also-emit-success-logs",
-+  "alternative",
-+  "always-authorize-plugins",
-+  "always-on",
-+  "always-use-complex-text",
-+  "alwaystrue",
-+  "android-fonts-path",
-+  "android-stderr-port",
-+  "android-stdin-port",
-+  "android-stdout-port",
-+  "angle",
-+  "app",
-+  "app-auto-launched",
-+  "app-id",
-+  "app-mode-auth-code",
-+  "app-mode-oauth-token",
-+  "app-mode-oem-manifest",
-+  "app-shell-allow-roaming",
-+  "app-shell-host-window-size",
-+  "app-shell-preferred-network",
-+  "app-shell-refresh-token",
-+  "app-shell-user",
-+  "apple",
-+  "apps-gallery-download-url",
-+  "apps-gallery-update-url",
-+  "apps-gallery-url",
-+  "apps-keep-chrome-alive-in-tests",
-+  "arc-availability",
-+  "arc-available",
-+  "arc-start-mode",
-+  "arc-transition-migration-required",
-+  "args",
-+  "artifacts-dir",
-+  "ash-animate-from-boot-splash-screen",
-+  "ash-constrain-pointer-to-root",
-+  "ash-copy-host-background-at-boot",
-+  "ash-debug-shortcuts",
-+  "ash-dev-shortcuts",
-+  "ash-disable-smooth-screen-rotation",
-+  "ash-disable-touch-exploration-mode",
-+  "ash-enable-magnifier-key-scroller",
-+  "ash-enable-mirrored-screen",
-+  "ash-enable-night-light",
-+  "ash-enable-palette-on-all-displays",
-+  "ash-enable-scale-settings-tray",
-+  "ash-enable-software-mirroring",
-+  "ash-enable-unified-desktop",
-+  "ash-estimated-presentation-delay",
-+  "ash-hide-notifications-for-factory",
-+  "ash-host-window-bounds",
-+  "ash-shelf-color",
-+  "ash-shelf-color-scheme",
-+  "ash-touch-hud",
-+  "ash-webui-init",
-+  "attestation-server",
-+  "audio-buffer-size",
-+  "audio-output-channels",
-+  "aura-legacy-power-button",
-+  "auth-ext-path",
-+  "auth-server-whitelist",
-+  "auth-spnego-account-type",
-+  "auto",
-+  "auto-open-devtools-for-tabs",
-+  "auto-select-desktop-capture-source",
-+  "autoplay-policy",
-+  "blink-settings",
-+  "bootstrap",
-+  "browser-subprocess-path",
-+  "browser-test",
-+  "bwsi",
-+  "bypass-app-banner-engagement-checks",
-+  "canvas-msaa-sample-count",
-+  "cast-initial-screen-height",
-+  "cast-initial-screen-width",
-+  "cc-layer-tree-test-long-timeout",
-+  "cc-layer-tree-test-no-timeout",
-+  "cc-rebaseline-pixeltests",
-+  "cellular-first",
-+  "cellular-only",
-+  "check-for-update-interval",
-+  "check-layout-test-sys-deps",
-+  "child-wallpaper-large",
-+  "child-wallpaper-small",
-+  "chrome-home-swipe-logic",
-+  "cipher-suite-blacklist",
-+  "clamshell",
-+  "class",
-+  "clear-token-service",
-+  "cloud-print-file",
-+  "cloud-print-file-type",
-+  "cloud-print-job-title",
-+  "cloud-print-print-ticket",
-+  "cloud-print-setup-proxy",
-+  "cloud-print-url",
-+  "cloud-print-xmpp-endpoint",
-+  "color",
-+  "compensate-for-unstable-pinch-zoom",
-+  "compile-shader-always-succeeds",
-+  "component-updater",
-+  "connectivity-check-url",
-+  "conservative",
-+  "content-image-texture-target",
-+  "content-shell-host-window-size",
-+  "controller",
-+  "crash-dumps-dir",
-+  "crash-on-failure",
-+  "crash-on-hang-threads",
-+  "crash-server-url",
-+  "crash-test",
-+  "crashpad-handler",
-+  "create-browser-on-startup-for-tests",
-+  "create-default-gl-context",
-+  "cros-gaia-api-v1",
-+  "cros-region",
-+  "cros-regions-mode",
-+  "crosh-command",
-+  "cryptauth-http-host",
-+  "custom-devtools-frontend",
-+  "custom-launcher-page",
-+  "custom_summary",
-+  "d3d11",
-+  "d3d9",
-+  "daemon",
-+  "dark_muted",
-+  "dark_vibrant",
-+  "data-path",
-+  "data-reduction-proxy-config-url",
-+  "data-reduction-proxy-experiment",
-+  "data-reduction-proxy-http-proxies",
-+  "data-reduction-proxy-lo-fi",
-+  "data-reduction-proxy-pingback-url",
-+  "data-reduction-proxy-secure-proxy-check-url",
-+  "data-reduction-proxy-server-experiments-disabled",
-+  "dbus-stub",
-+  "debug-devtools",
-+  "debug-enable-frame-toggle",
-+  "debug-packed-apps",
-+  "debug-print",
-+  "default",
-+  "default-background-color",
-+  "default-tile-height",
-+  "default-tile-width",
-+  "default-wallpaper-is-oem",
-+  "default-wallpaper-large",
-+  "default-wallpaper-small",
-+  "delay-reload-stop-button-change",
-+  "demo",
-+  "derelict-detection-timeout",
-+  "derelict-idle-timeout",
-+  "desktop",
-+  "desktop-window-1080p",
-+  "deterministic-fetch",
-+  "device-management-url",
-+  "device-scale-factor",
-+  "devtools-flags",
-+  "diagnostics",
-+  "diagnostics-format",
-+  "diagnostics-recovery",
-+  "dice",
-+  "disable",
-+  "disable-2d-canvas-clip-aa",
-+  "disable-2d-canvas-image-chromium",
-+  "disable-3d-apis",
-+  "disable-accelerated-2d-canvas",
-+  "disable-accelerated-jpeg-decoding",
-+  "disable-accelerated-mjpeg-decode",
-+  "disable-accelerated-video-decode",
-+  "disable-app-info-dialog-mac",
-+  "disable-app-list-dismiss-on-blur",
-+  "disable-app-window-cycling",
-+  "disable-appcontainer",
-+  "disable-arc-data-wipe",
-+  "disable-arc-opt-in-verification",
-+  "disable-audio-support-for-desktop-share",
-+  "disable-avfoundation-overlays",
-+  "disable-background-networking",
-+  "disable-background-timer-throttling",
-+  "disable-backgrounding-occluded-windows",
-+  "disable-backing-store-limit",
-+  "disable-blink-features",
-+  "disable-bookmark-reordering",
-+  "disable-boot-animation",
-+  "disable-breakpad",
-+  "disable-browser-task-scheduler",
-+  "disable-bundled-ppapi-flash",
-+  "disable-canvas-aa",
-+  "disable-captive-portal-bypass-proxy",
-+  "disable-cast-streaming-hw-encoding",
-+  "disable-checker-imaging",
-+  "disable-clear-browsing-data-counters",
-+  "disable-client-side-phishing-detection",
-+  "disable-cloud-import",
-+  "disable-component-cloud-policy",
-+  "disable-component-extensions-with-background-pages",
-+  "disable-component-update",
-+  "disable-composited-antialiasing",
-+  "disable-contextual-search",
-+  "disable-d3d11",
-+  "disable-databases",
-+  "disable-datasaver-prompt",
-+  "disable-default-apps",
-+  "disable-demo-mode",
-+  "disable-device-disabling",
-+  "disable-device-discovery-notifications",
-+  "disable-dinosaur-easter-egg",
-+  "disable-direct-composition",
-+  "disable-direct-composition-layers",
-+  "disable-directwrite-for-ui",
-+  "disable-display-color-calibration",
-+  "disable-display-list-2d-canvas",
-+  "disable-distance-field-text",
-+  "disable-domain-blocking-for-3d-apis",
-+  "disable-domain-reliability",
-+  "disable-drive-search-in-app-launcher",
-+  "disable-dwm-composition",
-+  "disable-encryption-migration",
-+  "disable-eol-notification",
-+  "disable-es3-apis",
-+  "disable-es3-gl-context",
-+  "disable-extensions",
-+  "disable-extensions-except",
-+  "disable-extensions-file-access-check",
-+  "disable-extensions-http-throttling",
-+  "disable-fast-web-scroll-view-insets",
-+  "disable-features",
-+  "disable-field-trial-config",
-+  "disable-file-manager-touch-mode",
-+  "disable-file-system",
-+  "disable-flash-3d",
-+  "disable-flash-stage3d",
-+  "disable-fullscreen-low-power-mode",
-+  "disable-fullscreen-tab-detaching",
-+  "disable-gaia-services",
-+  "disable-gesture-editing",
-+  "disable-gesture-requirement-for-presentation",
-+  "disable-gesture-typing",
-+  "disable-gl-drawing-for-tests",
-+  "disable-gl-error-limit",
-+  "disable-gl-extensions",
-+  "disable-glsl-translator",
-+  "disable-gpu",
-+  "disable-gpu-compositing",
-+  "disable-gpu-driver-bug-workarounds",
-+  "disable-gpu-early-init",
-+  "disable-gpu-memory-buffer-compositor-resources",
-+  "disable-gpu-memory-buffer-video-frames",
-+  "disable-gpu-process-crash-limit",
-+  "disable-gpu-program-cache",
-+  "disable-gpu-rasterization",
-+  "disable-gpu-sandbox",
-+  "disable-gpu-shader-disk-cache",
-+  "disable-gpu-vsync",
-+  "disable-gpu-watchdog",
-+  "disable-hang-monitor",
-+  "disable-hid-detection-on-oobe",
-+  "disable-histogram-customizer",
-+  "disable-hosted-app-shim-creation",
-+  "disable-hosted-apps-in-windows",
-+  "disable-http2",
-+  "disable-in-process-stack-traces",
-+  "disable-infobars",
-+  "disable-input-ime-api",
-+  "disable-input-view",
-+  "disable-ios-password-generation",
-+  "disable-ios-password-suggestions",
-+  "disable-ios-physical-web",
-+  "disable-javascript-harmony-shipping",
-+  "disable-kill-after-bad-ipc",
-+  "disable-lcd-text",
-+  "disable-legacy-window",
-+  "disable-local-storage",
-+  "disable-lock-screen-apps",
-+  "disable-logging",
-+  "disable-logging-redirect",
-+  "disable-login-animations",
-+  "disable-login-screen-apps",
-+  "disable-low-end-device-mode",
-+  "disable-low-latency-dxva",
-+  "disable-low-res-tiling",
-+  "disable-lru-snapshot-cache",
-+  "disable-mac-overlays",
-+  "disable-mac-views-native-app-windows",
-+  "disable-machine-cert-request",
-+  "disable-main-frame-before-activation",
-+  "disable-md-error-screen",
-+  "disable-md-oobe",
-+  "disable-media-session-api",
-+  "disable-media-suspend",
-+  "disable-merge-key-char-events",
-+  "disable-mojo-local-storage",
-+  "disable-mojo-renderer",
-+  "disable-mtp-write-support",
-+  "disable-multi-display-layout",
-+  "disable-namespace-sandbox",
-+  "disable-native-gpu-memory-buffers",
-+  "disable-network-portal-notification",
-+  "disable-new-channel-switcher-ui",
-+  "disable-new-korean-ime",
-+  "disable-new-virtual-keyboard-behavior",
-+  "disable-new-zip-unpacker",
-+  "disable-notifications",
-+  "disable-ntp-most-likely-favicons-from-server",
-+  "disable-ntp-popular-sites",
-+  "disable-nv12-dxgi-video",
-+  "disable-offer-store-unmasked-wallet-cards",
-+  "disable-offer-upload-credit-cards",
-+  "disable-office-editing-component-extension",
-+  "disable-offline-auto-reload",
-+  "disable-offline-auto-reload-visible-only",
-+  "disable-origin-trial-controlled-blink-features",
-+  "disable-overscroll-edge-effect",
-+  "disable-panel-fitting",
-+  "disable-partial-raster",
-+  "disable-password-generation",
-+  "disable-pepper-3d",
-+  "disable-pepper-3d-image-chromium",
-+  "disable-permission-action-reporting",
-+  "disable-permissions-api",
-+  "disable-physical-keyboard-autocorrect",
-+  "disable-pinch",
-+  "disable-pnacl-crash-throttling",
-+  "disable-popup-blocking",
-+  "disable-prefer-compositing-to-lcd-text",
-+  "disable-presentation-api",
-+  "disable-print-preview",
-+  "disable-prompt-on-repost",
-+  "disable-proximity-auth-bluetooth-low-energy-discovery",
-+  "disable-pull-to-refresh-effect",
-+  "disable-push-api-background-mode",
-+  "disable-quic",
-+  "disable-reading-from-canvas",
-+  "disable-remote-core-animation",
-+  "disable-remote-fonts",
-+  "disable-remote-playback-api",
-+  "disable-renderer-accessibility",
-+  "disable-renderer-backgrounding",
-+  "disable-renderer-priority-management",
-+  "disable-request-mobile-site",
-+  "disable-resize-lock",
-+  "disable-rgba-4444-textures",
-+  "disable-rollback-option",
-+  "disable-rtc-smoothness-algorithm",
-+  "disable-screen-orientation-lock",
-+  "disable-search-geolocation-disclosure",
-+  "disable-seccomp-filter-sandbox",
-+  "disable-settings-window",
-+  "disable-setuid-sandbox",
-+  "disable-shader-name-hashing",
-+  "disable-shared-workers",
-+  "disable-signin-promo",
-+  "disable-signin-scoped-device-id",
-+  "disable-single-click-autofill",
-+  "disable-skia-runtime-opts",
-+  "disable-slim-navigation-manager",
-+  "disable-slimming-paint-invalidation",
-+  "disable-smooth-scrolling",
-+  "disable-software-rasterizer",
-+  "disable-speech-api",
-+  "disable-suggestions-ui",
-+  "disable-sync",
-+  "disable-sync-app-list",
-+  "disable-sync-types",
-+  "disable-system-timezone-automatic-detection",
-+  "disable-tab-for-desktop-share",
-+  "disable-tab-strip-autoscroll-new-tabs",
-+  "disable-third-party-keyboard-workaround",
-+  "disable-threaded-animation",
-+  "disable-threaded-compositing",
-+  "disable-threaded-scrolling",
-+  "disable-touch-adjustment",
-+  "disable-touch-drag-drop",
-+  "disable-translate-new-ux",
-+  "disable-usb-keyboard-detect",
-+  "disable-v8-idle-tasks",
-+  "disable-vaapi-accelerated-video-encode",
-+  "disable-virtual-keyboard-overscroll",
-+  "disable-voice-input",
-+  "disable-volume-adjust-sound",
-+  "disable-wake-on-wifi",
-+  "disable-web-notification-custom-layouts",
-+  "disable-web-security",
-+  "disable-webgl",
-+  "disable-webgl-image-chromium",
-+  "disable-webrtc-encryption",
-+  "disable-webrtc-hw-decoding",
-+  "disable-webrtc-hw-encoding",
-+  "disable-win32k-lockdown",
-+  "disable-xss-auditor",
-+  "disable-zero-browsers-open-for-tests",
-+  "disable-zero-copy",
-+  "disable-zero-copy-dxgi-video",
-+  "disabled",
-+  "disabled-new-style-notification",
-+  "disallow-non-exact-resource-reuse",
-+  "disk-cache-dir",
-+  "disk-cache-size",
-+  "display",
-+  "dmg-device",
-+  "dns-log-details",
-+  "document-user-activation-required",
-+  "dom-automation",
-+  "dotfile",
-+  "draft",
-+  "draw-view-bounds-rects",
-+  "duck-flash",
-+  "dump-blink-runtime-call-stats",
-+  "dump-browser-histograms",
-+  "dump-dom",
-+  "eafe-path",
-+  "eafe-url",
-+  "easy-unlock-app-path",
-+  "edge-touch-filtering",
-+  "egl",
-+  "elevate",
-+  "embedded-extension-options",
-+  "emphasize-titles-in-omnibox-dropdown",
-+  "emulate-shader-precision",
-+  "enable-accelerated-2d-canvas",
-+  "enable-accelerated-vpx-decode",
-+  "enable-accessibility-tab-switcher",
-+  "enable-adaptive-selection-handle-orientation",
-+  "enable-aggressive-domstorage-flushing",
-+  "enable-android-wallpapers-app",
-+  "enable-app-info-dialog-mac",
-+  "enable-app-list",
-+  "enable-app-window-cycling",
-+  "enable-appcontainer",
-+  "enable-arc",
-+  "enable-arc-oobe-optin",
-+  "enable-audio-debug-recordings-from-extension",
-+  "enable-audio-focus",
-+  "enable-automation",
-+  "enable-benchmarking",
-+  "enable-ble-advertising-in-apps",
-+  "enable-blink-features",
-+  "enable-bookmark-reordering",
-+  "enable-bookmark-undo",
-+  "enable-browser-side-navigation",
-+  "enable-browser-task-scheduler",
-+  "enable-checker-imaging",
-+  "enable-chromevox-arc-support",
-+  "enable-clear-browsing-data-counters",
-+  "enable-cloud-print-proxy",
-+  "enable-cloud-print-xps",
-+  "enable-consumer-kiosk",
-+  "enable-contextual-search",
-+  "enable-crash-reporter",
-+  "enable-crash-reporter-for-testing",
-+  "enable-crx-hash-check",
-+  "enable-data-reduction-proxy-bypass-warning",
-+  "enable-data-reduction-proxy-force-pingback",
-+  "enable-data-reduction-proxy-lite-page",
-+  "enable-data-reduction-proxy-savings-promo",
-+  "enable-datasaver-prompt",
-+  "enable-device-discovery-notifications",
-+  "enable-devtools-experiments",
-+  "enable-direct-composition-layers",
-+  "enable-display-list-2d-canvas",
-+  "enable-distance-field-text",
-+  "enable-distillability-service",
-+  "enable-dom-distiller",
-+  "enable-domain-reliability",
-+  "enable-drive-search-in-app-launcher",
-+  "enable-drm-atomic",
-+  "enable-embedded-extension-options",
-+  "enable-encryption-migration",
-+  "enable-encryption-selection",
-+  "enable-es3-apis",
-+  "enable-exclusive-audio",
-+  "enable-experimental-accessibility-features",
-+  "enable-experimental-canvas-features",
-+  "enable-experimental-extension-apis",
-+  "enable-experimental-fullscreen-exit-ui",
-+  "enable-experimental-input-view-features",
-+  "enable-experimental-web-platform-features",
-+  "enable-extension-activity-log-testing",
-+  "enable-extension-activity-logging",
-+  "enable-extension-assets-sharing",
-+  "enable-fast-unload",
-+  "enable-fast-web-scroll-view-insets",
-+  "enable-features",
-+  "enable-file-manager-touch-mode",
-+  "enable-first-run-ui-transitions",
-+  "enable-floating-virtual-keyboard",
-+  "enable-font-antialiasing",
-+  "enable-fullscreen-tab-detaching",
-+  "enable-fullscreen-toolbar-reveal",
-+  "enable-google-branded-context-menu",
-+  "enable-gpu-async-worker-context",
-+  "enable-gpu-benchmarking",
-+  "enable-gpu-client-logging",
-+  "enable-gpu-client-tracing",
-+  "enable-gpu-command-logging",
-+  "enable-gpu-debugging",
-+  "enable-gpu-driver-debug-logging",
-+  "enable-gpu-memory-buffer-compositor-resources",
-+  "enable-gpu-memory-buffer-video-frames",
-+  "enable-gpu-rasterization",
-+  "enable-gpu-service-logging",
-+  "enable-gpu-service-tracing",
-+  "enable-hardware-overlays",
-+  "enable-harfbuzz-rendertext",
-+  "enable-hdr",
-+  "enable-heap-profiling",
-+  "enable-hosted-app-quit-notification",
-+  "enable-hosted-apps-in-windows",
-+  "enable-hotword-hardware",
-+  "enable-hung-renderer-infobar",
-+  "enable-inband-text-tracks",
-+  "enable-input-ime-api",
-+  "enable-internal-media-session",
-+  "enable-ios-handoff-to-other-devices",
-+  "enable-ios-password-generation",
-+  "enable-ios-physical-web",
-+  "enable-layer-lists",
-+  "enable-lcd-text",
-+  "enable-leak-detection",
-+  "enable-local-file-accesses",
-+  "enable-local-sync-backend",
-+  "enable-logging",
-+  "enable-longpress-drag-selection",
-+  "enable-low-end-device-mode",
-+  "enable-low-res-tiling",
-+  "enable-lru-snapshot-cache",
-+  "enable-mac-views-native-app-windows",
-+  "enable-main-frame-before-activation",
-+  "enable-md-feedback",
-+  "enable-md-policy-page",
-+  "enable-media-suspend",
-+  "enable-merge-key-char-events",
-+  "enable-message-center-always-scroll-up-upon-notification-removal",
-+  "enable-nacl",
-+  "enable-nacl-debug",
-+  "enable-nacl-nonsfi-mode",
-+  "enable-native-gpu-memory-buffers",
-+  "enable-natural-scroll-default",
-+  "enable-navigation-tracing",
-+  "enable-net-benchmarking",
-+  "enable-network-information-downlink-max",
-+  "enable-network-portal-notification",
-+  "enable-new-app-menu-icon",
-+  "enable-ntp-most-likely-favicons-from-server",
-+  "enable-ntp-popular-sites",
-+  "enable-ntp-search-engine-country-detection",
-+  "enable-offer-store-unmasked-wallet-cards",
-+  "enable-offer-upload-credit-cards",
-+  "enable-offline-auto-reload",
-+  "enable-offline-auto-reload-visible-only",
-+  "enable-osk-overscroll",
-+  "enable-override-bookmarks-ui",
-+  "enable-partial-raster",
-+  "enable-password-generation",
-+  "enable-pepper-testing",
-+  "enable-permission-action-reporting",
-+  "enable-physical-keyboard-autocorrect",
-+  "enable-picture-in-picture",
-+  "enable-pinch",
-+  "enable-pixel-output-in-tests",
-+  "enable-plugin-placeholder-testing",
-+  "enable-potentially-annoying-security-features",
-+  "enable-power-overlay",
-+  "enable-precise-memory-info",
-+  "enable-prefer-compositing-to-lcd-text",
-+  "enable-print-browser",
-+  "enable-print-preview-register-promos",
-+  "enable-profile-shortcut-manager",
-+  "enable-profiling",
-+  "enable-push-api-background-mode",
-+  "enable-quic",
-+  "enable-reader-mode-toolbar-icon",
-+  "enable-refresh-token-annotation-request",
-+  "enable-request-tablet-site",
-+  "enable-rgba-4444-textures",
-+  "enable-sandbox",
-+  "enable-sandbox-logging",
-+  "enable-screenshot-testing-with-mode",
-+  "enable-scripts-require-action",
-+  "enable-scroll-prediction",
-+  "enable-service-manager-tracing",
-+  "enable-settings-window",
-+  "enable-sgi-video-sync",
-+  "enable-signin-promo",
-+  "enable-single-click-autofill",
-+  "enable-site-settings",
-+  "enable-skia-benchmarking",
-+  "enable-slim-navigation-manager",
-+  "enable-slimming-paint-invalidation",
-+  "enable-slimming-paint-v2",
-+  "enable-smooth-scrolling",
-+  "enable-spatial-navigation",
-+  "enable-spdy-proxy-auth",
-+  "enable-speech-dispatcher",
-+  "enable-spelling-feedback-field-trial",
-+  "enable-spotlight-actions",
-+  "enable-stats-collection-bindings",
-+  "enable-stats-table",
-+  "enable-strict-mixed-content-checking",
-+  "enable-strict-powerful-feature-restrictions",
-+  "enable-suggestions-ui",
-+  "enable-suggestions-with-substring-match",
-+  "enable-supervised-user-managed-bookmarks-folder",
-+  "enable-surface-synchronization",
-+  "enable-swap-buffers-with-bounds",
-+  "enable-sync-app-list",
-+  "enable-sync-articles",
-+  "enable-tab-audio-muting",
-+  "enable-tablet-splitview",
-+  "enable-tcp-fastopen",
-+  "enable-third-party-keyboard-workaround",
-+  "enable-threaded-compositing",
-+  "enable-threaded-texture-mailboxes",
-+  "enable-tile-compression",
-+  "enable-touch-calibration-setting",
-+  "enable-touch-drag-drop",
-+  "enable-touchpad-three-finger-click",
-+  "enable-touchview",
-+  "enable-trace-app-source",
-+  "enable-tracing",
-+  "enable-tracing-output",
-+  "enable-translate-new-ux",
-+  "enable-ui-devtools",
-+  "enable-use-zoom-for-dsf",
-+  "enable-user-controlled-alternate-protocol-ports",
-+  "enable-user-metrics",
-+  "enable-usermedia-screen-capturing",
-+  "enable-video-player-chromecast-support",
-+  "enable-viewport",
-+  "enable-virtual-keyboard",
-+  "enable-voice-interaction",
-+  "enable-vtune-support",
-+  "enable-vulkan",
-+  "enable-wayland-server",
-+  "enable-web-notification-custom-layouts",
-+  "enable-webfonts-intervention-trigger",
-+  "enable-webfonts-intervention-v2",
-+  "enable-webgl-draft-extensions",
-+  "enable-webgl-image-chromium",
-+  "enable-webrtc-event-logging-from-extension",
-+  "enable-webrtc-srtp-aes-gcm",
-+  "enable-webrtc-stun-origin",
-+  "enable-webview-finch",
-+  "enable-webvr",
-+  "enable-wifi-credential-sync",
-+  "enable-win7-webrtc-hw-h264-decoding",
-+  "enable-zero-copy",
-+  "enable-zip-archiver-on-file-manager",
-+  "enabled",
-+  "enabled-2g",
-+  "enabled-3g",
-+  "enabled-new-style-notification",
-+  "enabled-slow2g",
-+  "encode-binary",
-+  "enforce",
-+  "enforce-gl-minimums",
-+  "enforce-webrtc-ip-permission-check",
-+  "enforce_strict",
-+  "enterprise-disable-arc",
-+  "enterprise-enable-forced-re-enrollment",
-+  "enterprise-enable-license-type-selection",
-+  "enterprise-enable-zero-touch-enrollment",
-+  "enterprise-enrollment-initial-modulus",
-+  "enterprise-enrollment-modulus-limit",
-+  "error-console",
-+  "experiment",
-+  "explicitly-allowed-ports",
-+  "expose-internals-for-testing",
-+  "extension-content-verification",
-+  "extension-process",
-+  "extensions-install-verification",
-+  "extensions-multi-account",
-+  "extensions-not-webstore",
-+  "extensions-on-chrome-urls",
-+  "extensions-update-frequency",
-+  "extra-search-query-params",
-+  "fail-on-unused-args",
-+  "fake-variations-channel",
-+  "false",
-+  "fast",
-+  "fast-start",
-+  "feedback-server",
-+  "field-trial-handle",
-+  "first-exec-after-boot",
-+  "flag-switches-begin",
-+  "flag-switches-end",
-+  "font-cache-shared-handle",
-+  "force-android-app-mode",
-+  "force-app-mode",
-+  "force-clamshell-power-button",
-+  "force-color-profile",
-+  "force-desktop-ios-promotion",
-+  "force-dev-mode-highlighting",
-+  "force-device-scale-factor",
-+  "force-display-list-2d-canvas",
-+  "force-effective-connection-type",
-+  "force-enable-metrics-reporting",
-+  "force-enable-stylus-tools",
-+  "force-fieldtrial-params",
-+  "force-fieldtrials",
-+  "force-first-run",
-+  "force-first-run-ui",
-+  "force-gpu-mem-available-mb",
-+  "force-gpu-rasterization",
-+  "force-happiness-tracking-system",
-+  "force-load-easy-unlock-app-in-tests",
-+  "force-local-ntp",
-+  "force-login-manager-in-tests",
-+  "force-mediafoundation",
-+  "force-overlay-fullscreen-video",
-+  "force-password-reauth",
-+  "force-pnacl-subzero",
-+  "force-renderer-accessibility",
-+  "force-show-update-menu-badge",
-+  "force-show-update-menu-item",
-+  "force-system-compositor-mode",
-+  "force-tablet-mode",
-+  "force-text-direction",
-+  "force-ui-direction",
-+  "force-variation-ids",
-+  "force-video-overlays",
-+  "force-wave-audio",
-+  "force-webrtc-ip-handling-policy",
-+  "full-memory-crash-report",
-+  "gaia-url",
-+  "gcm-checkin-url",
-+  "gcm-mcs-endpoint",
-+  "gcm-registration-url",
-+  "generate-accessibility-test-expectations",
-+  "gl",
-+  "gl-composited-overlay-candidate-quad-border",
-+  "gl-shader-interm-output",
-+  "gles",
-+  "golden-screenshots-dir",
-+  "google-apis-url",
-+  "google-base-url",
-+  "google-doodle-url",
-+  "google-url",
-+  "gpu-active-device-id",
-+  "gpu-active-vendor-id",
-+  "gpu-device-id",
-+  "gpu-driver-bug-workarounds",
-+  "gpu-driver-date",
-+  "gpu-driver-vendor",
-+  "gpu-driver-version",
-+  "gpu-launcher",
-+  "gpu-no-complete-info-collection",
-+  "gpu-no-context-lost",
-+  "gpu-process",
-+  "gpu-program-cache-size-kb",
-+  "gpu-rasterization-msaa-sample-count",
-+  "gpu-sandbox-allow-sysv-shm",
-+  "gpu-sandbox-failures-fatal",
-+  "gpu-sandbox-start-early",
-+  "gpu-secondary-device-ids",
-+  "gpu-secondary-vendor-ids",
-+  "gpu-startup-dialog",
-+  "gpu-testing-device-id",
-+  "gpu-testing-driver-date",
-+  "gpu-testing-gl-renderer",
-+  "gpu-testing-gl-vendor",
-+  "gpu-testing-gl-version",
-+  "gpu-testing-os-version",
-+  "gpu-testing-secondary-device-ids",
-+  "gpu-testing-secondary-vendor-ids",
-+  "gpu-testing-vendor-id",
-+  "gpu-vendor-id",
-+  "guest-wallpaper-large",
-+  "guest-wallpaper-small",
-+  "h",
-+  "has-chromeos-diamond-key",
-+  "has-chromeos-keyboard",
-+  "has-internal-stylus",
-+  "headless",
-+  "help",
-+  "hide",
-+  "hide-icons",
-+  "hide-scrollbars",
-+  "history-entry-requires-user-gesture",
-+  "homedir",
-+  "homepage",
-+  "host",
-+  "host-pairing-oobe",
-+  "host-resolver-rules",
-+  "host-rules",
-+  "icu-data-dir",
-+  "ignore-autocomplete-off-autofill",
-+  "ignore-autoplay-restrictions",
-+  "ignore-certificate-errors",
-+  "ignore-certificate-errors-spki-list",
-+  "ignore-gpu-blacklist",
-+  "ignore-urlfetcher-cert-requests",
-+  "ignore-user-profile-mapping-for-tests",
-+  "in-process-gpu",
-+  "incognito",
-+  "input",
-+  "inspect",
-+  "inspect-brk",
-+  "install-chrome-app",
-+  "install-supervised-user-whitelists",
-+  "instant-process",
-+  "invalidation-use-gcm-channel",
-+  "ipc-connection-timeout",
-+  "ipc-dump-directory",
-+  "ipc-fuzzer-testcase",
-+  "is-running-in-mash",
-+  "isolate-origins",
-+  "isolate-sites-for-testing",
-+  "javascript-harmony",
-+  "js-flags",
-+  "keep-alive-for-test",
-+  "kiosk",
-+  "kiosk-printing",
-+  "lang",
-+  "last-launched-app",
-+  "layer",
-+  "light_muted",
-+  "light_vibrant",
-+  "limit-fps",
-+  "load-and-launch-app",
-+  "load-apps",
-+  "load-extension",
-+  "load-media-router-component-extension",
-+  "local-heuristics-only-for-password-generation",
-+  "local-ntp-reload",
-+  "local-sync-backend-dir",
-+  "log-gpu-control-list-decisions",
-+  "log-level",
-+  "log-net-log",
-+  "login-manager",
-+  "login-profile",
-+  "login-user",
-+  "lso-url",
-+  "ltr",
-+  "main-frame-resizes-are-orientation-changes",
-+  "make-chrome-default",
-+  "make-default-browser",
-+  "managed-user-id",
-+  "managed-user-sync-token",
-+  "mark-non-secure-as",
-+  "markdown",
-+  "market-url-for-testing",
-+  "mash",
-+  "material",
-+  "material-design-ink-drop-animation-speed",
-+  "material-hybrid",
-+  "max-gum-fps",
-+  "max-output-volume-dba1m",
-+  "max-untiled-layer-height",
-+  "max-untiled-layer-width",
-+  "media-cache-size",
-+  "mem-pressure-system-reserved-kb",
-+  "memlog",
-+  "memlog-pipe",
-+  "memory-pressure-off",
-+  "memory-pressure-thresholds",
-+  "memory-pressure-thresholds-mb",
-+  "message-center-changes-while-open",
-+  "metrics-client-id",
-+  "metrics-recording-only",
-+  "mhtml-generator-option",
-+  "mirror",
-+  "mock",
-+  "mojo-local-storage",
-+  "mojo-pipe-token",
-+  "monitoring-destination-id",
-+  "mse-audio-buffer-size-limit",
-+  "mse-video-buffer-size-limit",
-+  "mus",
-+  "mus-config",
-+  "mute-audio",
-+  "nacl-broker",
-+  "nacl-dangerous-no-sandbox-nonsfi",
-+  "nacl-debug-mask",
-+  "nacl-gdb",
-+  "nacl-gdb-script",
-+  "nacl-loader",
-+  "nacl-loader-nonsfi",
-+  "native",
-+  "native-crx-bindings",
-+  "need-arc-migration-policy-check",
-+  "net-log-capture-mode",
-+  "netifs-to-ignore",
-+  "network-country-iso",
-+  "network-settings-config",
-+  "new-window",
-+  "no-default-browser-check",
-+  "no-experiments",
-+  "no-first-run",
-+  "no-managed-user-acknowledgment-check",
-+  "no-network-profile-warning",
-+  "no-pings",
-+  "no-proxy-server",
-+  "no-referrers",
-+  "no-sandbox",
-+  "no-service-autorun",
-+  "no-session-id",
-+  "no-startup-window",
-+  "no-user-gesture-required",
-+  "no-wifi",
-+  "no-zygote",
-+  "nocolor",
-+  "noerrdialogs",
-+  "non-material",
-+  "non-secure",
-+  "non-secure-after-editing",
-+  "non-secure-while-incognito",
-+  "non-secure-while-incognito-or-editing",
-+  "none",
-+  "normal_muted",
-+  "normal_vibrant",
-+  "note-taking-app-ids",
-+  "ntp-snippets-add-incomplete",
-+  "ntp-switch-to-existing-tab",
-+  "null",
-+  "num-raster-threads",
-+  "oauth2-client-id",
-+  "oauth2-client-secret",
-+  "off",
-+  "on",
-+  "oobe-bootstrapping-master",
-+  "oobe-force-show-screen",
-+  "oobe-guest-session",
-+  "oobe-skip-postlogin",
-+  "oobe-timer-interval",
-+  "open-ash",
-+  "opengraph",
-+  "origin-to-force-quic-on",
-+  "origin-trial-disabled-features",
-+  "origin-trial-disabled-tokens",
-+  "origin-trial-public-key",
-+  "original-process-start-time",
-+  "osmesa",
-+  "output",
-+  "override",
-+  "override-metrics-upload-url",
-+  "override-plugin-power-saver-for-testing",
-+  "override-use-software-gl-for-tests",
-+  "overscroll-history-navigation",
-+  "overscroll-start-threshold",
-+  "ozone-dump-file",
-+  "ozone-platform",
-+  "pack-extension",
-+  "pack-extension-key",
-+  "parent-profile",
-+  "parent-window",
-+  "passive-listeners-default",
-+  "password-store",
-+  "permission-request-api-scope",
-+  "permission-request-api-url",
-+  "ppapi",
-+  "ppapi-antialiased-text-enabled",
-+  "ppapi-broker",
-+  "ppapi-flash-args",
-+  "ppapi-flash-path",
-+  "ppapi-flash-version",
-+  "ppapi-in-process",
-+  "ppapi-plugin-launcher",
-+  "ppapi-startup-dialog",
-+  "ppapi-subpixel-rendering-setting",
-+  "prerender-from-omnibox",
-+  "previous-app",
-+  "primary",
-+  "print-to-pdf",
-+  "privet-ipv6-only",
-+  "process-per-site",
-+  "process-per-tab",
-+  "product-version",
-+  "profile-directory",
-+  "profiler-timing",
-+  "profiling",
-+  "profiling-at-start",
-+  "profiling-file",
-+  "profiling-flush",
-+  "progress-bar-animation",
-+  "progress-bar-completion",
-+  "prompt-for-external-extensions",
-+  "proxy-auto-detect",
-+  "proxy-bypass-list",
-+  "proxy-pac-url",
-+  "proxy-server",
-+  "q",
-+  "quic-connection-options",
-+  "quic-max-packet-length",
-+  "quic-version",
-+  "rdp_desktop_session",
-+  "reader-mode-feedback",
-+  "reader-mode-heuristics",
-+  "rebaseline-pixel-tests",
-+  "record-type",
-+  "reduce-security-for-testing",
-+  "reduced-referrer-granularity",
-+  "register-font-files",
-+  "register-pepper-plugins",
-+  "relauncher",
-+  "remote-debugging-address",
-+  "remote-debugging-port",
-+  "remote-debugging-socket-fd",
-+  "remote-debugging-socket-name",
-+  "remote-debugging-targets",
-+  "renderer",
-+  "renderer-client-id",
-+  "renderer-cmd-prefix",
-+  "renderer-process-limit",
-+  "renderer-startup-dialog",
-+  "renderer-wait-for-java-debugger",
-+  "renderpass",
-+  "repl",
-+  "report-vp9-as-an-unsupported-mime-type",
-+  "require-audio-hardware-for-testing",
-+  "reset-app-list-install-state",
-+  "reset-variation-state",
-+  "restore-last-session",
-+  "root",
-+  "root-layer-scrolls",
-+  "rtl",
-+  "run-layout-test",
-+  "runtime-deps-list-file",
-+  "safebrowsing-disable-auto-update",
-+  "safebrowsing-disable-download-protection",
-+  "safebrowsing-disable-extension-blacklist",
-+  "safebrowsing-manual-download-blacklist",
-+  "sandbox-ipc",
-+  "save-page-as-mhtml",
-+  "screen-config",
-+  "screenshot",
-+  "script-executable",
-+  "scripts-require-action",
-+  "scroll-end-effect",
-+  "search-provider-logo-url",
-+  "secondary",
-+  "secondary-display-layout",
-+  "secondary-ui-md",
-+  "service",
-+  "service-manager",
-+  "service-name",
-+  "service-pipe-token",
-+  "service-request-channel-token",
-+  "service-runner",
-+  "shared-files",
-+  "shill-stub",
-+  "show-app-list",
-+  "show-autofill-signatures",
-+  "show-autofill-type-predictions",
-+  "show-cert-link",
-+  "show-component-extension-options",
-+  "show-composited-layer-borders",
-+  "show-fps-counter",
-+  "show-icons",
-+  "show-layer-animation-bounds",
-+  "show-login-dev-overlay",
-+  "show-mac-overlay-borders",
-+  "show-md-login",
-+  "show-non-md-login",
-+  "show-overdraw-feedback",
-+  "show-paint-rects",
-+  "show-property-changed-rects",
-+  "show-saved-copy",
-+  "show-screenspace-rects",
-+  "show-surface-damage-rects",
-+  "silent-debugger-extension-api",
-+  "silent-launch",
-+  "simulate-critical-update",
-+  "simulate-elevated-recovery",
-+  "simulate-outdated",
-+  "simulate-outdated-no-au",
-+  "simulate-upgrade",
-+  "single-process",
-+  "site-per-process",
-+  "skip-gpu-data-loading",
-+  "skip-nostore-all",
-+  "skip-nostore-main",
-+  "skip-reencoding-on-skp-capture",
-+  "slow",
-+  "slow-connections-only",
-+  "slow-down-raster-scale-factor",
-+  "sms-test-messages",
-+  "spdy-proxy-auth-fallback",
-+  "spdy-proxy-auth-origin",
-+  "spdy-proxy-auth-value",
-+  "spelling-service-feedback-interval-seconds",
-+  "spelling-service-feedback-url",
-+  "spurious-power-button-accel-count",
-+  "spurious-power-button-keyboard-accel",
-+  "spurious-power-button-lid-angle-change",
-+  "spurious-power-button-screen-accel",
-+  "spurious-power-button-window",
-+  "ssl-key-log-file",
-+  "ssl-version-max",
-+  "ssl-version-min",
-+  "stable-release-mode",
-+  "start-fullscreen",
-+  "start-maximized",
-+  "start-stack-profiler",
-+  "started",
-+  "stub",
-+  "stub-cros-settings",
-+  "supports-dual-gpus",
-+  "surface",
-+  "swiftshader",
-+  "swiftshader-webgl",
-+  "sync-allow-insecure-xmpp-connection",
-+  "sync-deferred-startup-timeout-seconds",
-+  "sync-disable-deferred-startup",
-+  "sync-enable-get-update-avoidance",
-+  "sync-notification-host-port",
-+  "sync-on-draw-hardware",
-+  "sync-short-initial-retry-override",
-+  "sync-short-nudge-delay-for-test",
-+  "sync-url",
-+  "system-developer-mode",
-+  "system-log-upload-frequency",
-+  "tab-management-experiment-type-disabled",
-+  "tab-management-experiment-type-elderberry",
-+  "task-profiler",
-+  "team-drives",
-+  "test-auto-update-ui",
-+  "test-child-process",
-+  "test-cros-gaia-id-migration",
-+  "test-do-not-initialize-icu",
-+  "test-encryption-migration-ui",
-+  "test-gl-lib",
-+  "test-launcher-batch-limit",
-+  "test-launcher-bot-mode",
-+  "test-launcher-debug-launcher",
-+  "test-launcher-filter-file",
-+  "test-launcher-force-run-broken-tests",
-+  "test-launcher-jobs",
-+  "test-launcher-list-tests",
-+  "test-launcher-output",
-+  "test-launcher-print-test-stdio",
-+  "test-launcher-print-writable-path",
-+  "test-launcher-retry-limit",
-+  "test-launcher-shard-index",
-+  "test-launcher-summary-output",
-+  "test-launcher-test-part-results-limit",
-+  "test-launcher-timeout",
-+  "test-launcher-total-shards",
-+  "test-launcher-trace",
-+  "test-name",
-+  "test-tiny-timeout",
-+  "test-type",
-+  "testing-fixed-http-port",
-+  "testing-fixed-https-port",
-+  "tether-stub",
-+  "threads",
-+  "time",
-+  "timeout",
-+  "tls1",
-+  "tls1.1",
-+  "tls1.2",
-+  "tls1.3",
-+  "tls13-variant",
-+  "top-chrome-md",
-+  "top-controls-hide-threshold",
-+  "top-controls-show-threshold",
-+  "touch-calibration",
-+  "touch-devices",
-+  "touch-events",
-+  "touch-noise-filtering",
-+  "touch-selection-strategy",
-+  "touch_view",
-+  "trace-config-file",
-+  "trace-export-events-to-etw",
-+  "trace-shutdown",
-+  "trace-shutdown-file",
-+  "trace-startup",
-+  "trace-startup-duration",
-+  "trace-startup-file",
-+  "trace-to-console",
-+  "trace-to-file",
-+  "trace-to-file-name",
-+  "trace-upload-url",
-+  "tracelog",
-+  "translate-ranker-model-url",
-+  "translate-script-url",
-+  "translate-security-origin",
-+  "true",
-+  "trusted-download-sources",
-+  "try-chrome-again",
-+  "try-supported-channel-layouts",
-+  "type",
-+  "ui-disable-partial-swap",
-+  "ui-enable-layer-lists",
-+  "ui-enable-rgba-4444-textures",
-+  "ui-enable-zero-copy",
-+  "ui-prioritize-in-gpu-process",
-+  "ui-show-composited-layer-borders",
-+  "ui-show-fps-counter",
-+  "ui-show-layer-animation-bounds",
-+  "ui-show-paint-rects",
-+  "ui-show-property-changed-rects",
-+  "ui-show-screenspace-rects",
-+  "ui-show-surface-damage-rects",
-+  "ui-slow-animations",
-+  "ui-test-action-max-timeout",
-+  "ui-test-action-timeout",
-+  "uninstall",
-+  "unlimited-storage",
-+  "unsafe-pac-url",
-+  "unsafely-allow-protected-media-identifier-for-domain",
-+  "unsafely-treat-insecure-origin-as-secure",
-+  "use-angle",
-+  "use-cras",
-+  "use-double-buffering",
-+  "use-fake-device-for-media-stream",
-+  "use-fake-jpeg-decode-accelerator",
-+  "use-fake-ui-for-media-stream",
-+  "use-file-for-fake-audio-capture",
-+  "use-file-for-fake-video-capture",
-+  "use-first-display-as-internal",
-+  "use-gl",
-+  "use-gpu-in-tests",
-+  "use-ime-service",
-+  "use-mobile-user-agent",
-+  "use-mock-keychain",
-+  "use-passthrough-cmd-decoder",
-+  "use-simple-cache-backend",
-+  "use-system-default-printer",
-+  "use-test-config",
-+  "user-agent",
-+  "user-always-affiliated",
-+  "user-data-dir",
-+  "user-gesture-required",
-+  "user-gesture-required-for-cross-origin",
-+  "utility",
-+  "utility-allowed-dir",
-+  "utility-cmd-prefix",
-+  "utility-run-elevated",
-+  "v",
-+  "v2-sandbox",
-+  "v2-sandbox-enabled",
-+  "v8-cache-options",
-+  "v8-cache-strategies-for-cache-storage",
-+  "validate-crx",
-+  "validate-input-event-stream",
-+  "variations-override-country",
-+  "variations-server-url",
-+  "version",
-+  "video-image-texture-target",
-+  "video-threads",
-+  "video-underflow-threshold-ms",
-+  "virtual-time-budget",
-+  "vmodule",
-+  "voice-interaction-supported-locales",
-+  "wait-for-debugger",
-+  "wait-for-debugger-children",
-+  "wake-on-wifi-packet",
-+  "wallet-service-use-sandbox",
-+  "watcher",
-+  "waveout-buffers",
-+  "webapk-server-url",
-+  "webrtc-max-cpu-consumption-percentage",
-+  "webrtc-stun-probe-trial",
-+  "webview-enable-safebrowsing-support",
-+  "webview-sandboxed-renderer",
-+  "whitelisted-extension-id",
-+  "win-jumplist-action",
-+  "window-position",
-+  "window-size",
-+  "window-workspace",
-+  "windows10-custom-titlebar",
-+  "winhttp-proxy-resolver",
-+  "wm-window-animations-disabled",
-+  "yield-between-content-script-runs",
-+  "zygote",
-+  "zygote-cmd-prefix",
-+};
-+
-+bool IsBlacklistedArg(const base::CommandLine::CharType* arg) {
-+#if defined(OS_WIN)
-+  const auto converted = base::WideToUTF8(arg);
-+  const char* a = converted.c_str();
-+#else
-+  const char* a = arg;
-+#endif
-+
-+  static const char* prefixes[] = {"--", "-", "/"};
-+
-+  int prefix_length = 0;
-+  for (auto& prefix : prefixes) {
-+    if (base::StartsWith(a, prefix, base::CompareCase::SENSITIVE)) {
-+      prefix_length = strlen(prefix);
-+      break;
-+    }
-+  }
-+
-+  if (prefix_length > 0) {
-+    a += prefix_length;
-+    std::string switch_name =
-+        base::ToLowerASCII(base::StringPiece(a, strcspn(a, "=")));
-+    return std::binary_search(std::begin(kBlacklist), std::end(kBlacklist),
-+                              switch_name);
-+  }
-+
-+  return false;
-+}
-+
-+>>>>>>> .their
- }  // namespace
- 
- namespace atom {
-changed in both
-  base   100644 4bd88a5a43c03ceba308ec06fdf0cbadeddcaae3 atom/browser/api/atom_api_browser_view.cc
-  our    100644 bd83208694c61c4d7c43ce4be26939c2682b2a13 atom/browser/api/atom_api_browser_view.cc
-  their  100644 41f0e99cdd79bf1ad2c4c8c0db5aaa97ac5e1297 atom/browser/api/atom_api_browser_view.cc
-changed in both
-  base   100644 cb5b9af26d8f21040a45ad7d1f0c4a23e7c8c445 atom/browser/api/atom_api_menu_mac.mm
-  our    100644 2b63b8a6cefe6265d96399dc6b70ab3ffdc352c3 atom/browser/api/atom_api_menu_mac.mm
-  their  100644 a2919e65d1b4ded98cb50884ead6763ed288e7c7 atom/browser/api/atom_api_menu_mac.mm
-@@ -135,9 +135,15 @@
- // static
- void Menu::SetApplicationMenu(Menu* base_menu) {
-   MenuMac* menu = static_cast<MenuMac*>(base_menu);
-+<<<<<<< .our
-   base::scoped_nsobject<AtomMenuController> menu_controller([
-       [AtomMenuController alloc] initWithModel:menu->model_.get()
-                          useDefaultAccelerator:YES]);
-+=======
-+  base::scoped_nsobject<AtomMenuController> menu_controller(
-+      [[AtomMenuController alloc] initWithModel:menu->model_.get()
-+                          useDefaultAccelerator:YES]);
-+>>>>>>> .their
- 
-   NSRunLoop* currentRunLoop = [NSRunLoop currentRunLoop];
-   [currentRunLoop cancelPerformSelector:@selector(setMainMenu:)
-changed in both
-  base   100644 ced1cb31d8df7689f7652111720ba20fb029b1fe atom/browser/api/atom_api_menu_views.cc
-  our    100644 3da7dc2842fa4561e037aa67f290d0cc6ca71014 atom/browser/api/atom_api_menu_views.cc
-  their  100644 fa178e57d82413544b92172ae0ed4401ea5f178b atom/browser/api/atom_api_menu_views.cc
-@@ -49,8 +49,16 @@
-   menu_runners_[window_id] =
-       std::make_unique<MenuRunner>(model(), flags, close_callback);
-   menu_runners_[window_id]->RunMenuAt(
-+<<<<<<< .our
-       native_window->widget(), NULL, gfx::Rect(location, gfx::Size()),
-       views::MENU_ANCHOR_TOPLEFT, ui::MENU_SOURCE_MOUSE);
-+=======
-+      native_window->widget(),
-+      NULL,
-+      gfx::Rect(location, gfx::Size()),
-+      views::MENU_ANCHOR_TOPLEFT,
-+      ui::MENU_SOURCE_MOUSE);
-+>>>>>>> .their
- }
- 
- void MenuViews::ClosePopupAt(int32_t window_id) {
-removed in local
-  base   100644 0d22fad5b8b5e3ed7711d55aa763f930014a75d7 atom/browser/api/atom_api_screen_mac.mm
-  their  100644 056b775fdfc221cb0501ba5b7afd8de01f2d4d63 atom/browser/api/atom_api_screen_mac.mm
-changed in both
-  base   100644 6e5c4b9cbe77c1a4004bbc2bf7b0f0089ffb9004 atom/browser/api/atom_api_session.cc
-  our    100644 658f913bb60b66ae1bf3aae97d7d9158e56f7ee0 atom/browser/api/atom_api_session.cc
-  their  100644 d36812daa35dc795b667c190952b980f25d9e618 atom/browser/api/atom_api_session.cc
-@@ -29,7 +29,6 @@
- #include "base/guid.h"
- #include "base/strings/string_number_conversions.h"
- #include "base/strings/string_util.h"
--#include "base/threading/thread_task_runner_handle.h"
- #include "brightray/browser/media/media_device_id_salt.h"
- #include "chrome/browser/browser_process.h"
- #include "chrome/common/pref_names.h"
-@@ -46,8 +45,12 @@
- #include "net/dns/host_cache.h"
- #include "net/http/http_auth_handler_factory.h"
- #include "net/http/http_auth_preferences.h"
-+<<<<<<< .our
- #include "net/proxy_resolution/proxy_config_service_fixed.h"
- #include "net/proxy_resolution/proxy_service.h"
-+=======
-+#include "net/proxy/proxy_config_service_fixed.h"
-+>>>>>>> .their
- #include "net/url_request/static_http_user_agent_settings.h"
- #include "net/url_request/url_request_context.h"
- #include "net/url_request/url_request_context_getter.h"
-@@ -236,6 +239,7 @@
- // Referenced session objects.
- std::map<uint32_t, v8::Global<v8::Object>> g_sessions;
- 
-+<<<<<<< .our
- class ResolveProxyHelper {
-  public:
-   ResolveProxyHelper(AtomBrowserContext* browser_context,
-@@ -286,6 +290,8 @@
-   DISALLOW_COPY_AND_ASSIGN(ResolveProxyHelper);
- };
- 
-+=======
-+>>>>>>> .their
- // Runs the callback in UI thread.
- void RunCallbackInUI(const base::Callback<void()>& callback) {
-   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, callback);
-@@ -451,6 +457,7 @@
-   AtomNetworkDelegate* network_delegate =
-       static_cast<AtomNetworkDelegate*>(context->network_delegate());
-   network_delegate->SetDevToolsNetworkEmulationClientId(client_id);
-+<<<<<<< .our
- }
- 
- void DestroyGlobalHandle(v8::Isolate* isolate,
-@@ -468,6 +475,8 @@
-       object->SetAlignedPointerInInternalField(0, nullptr);
-     }
-   }
-+=======
-+>>>>>>> .their
- }
- 
- }  // namespace
-@@ -513,8 +522,10 @@
-   }
- }
- 
--void Session::ResolveProxy(const GURL& url, ResolveProxyCallback callback) {
--  new ResolveProxyHelper(browser_context(), url, callback);
-+void Session::ResolveProxy(
-+    const GURL& url,
-+    const ResolveProxyHelper::ResolveProxyCallback& callback) {
-+  browser_context_->GetResolveProxyHelper()->ResolveProxy(url, callback);
- }
- 
- template <Session::CacheAction action>
-changed in both
-  base   100644 d56c2400d4df9d197a03335c4e2b7e735065f301 atom/browser/api/atom_api_session.h
-  our    100644 6c8247c5c4a90e643712dd47d000d37d181a147b atom/browser/api/atom_api_session.h
-  their  100644 547f0e627b0ecf23e808b85cbd5173892479673f atom/browser/api/atom_api_session.h
-@@ -10,6 +10,7 @@
- 
- #include "atom/browser/api/trackable_object.h"
- #include "atom/browser/atom_blob_reader.h"
-+#include "atom/browser/net/resolve_proxy_helper.h"
- #include "base/values.h"
- #include "content/public/browser/download_manager.h"
- #include "native_mate/handle.h"
-@@ -39,8 +40,6 @@
- class Session : public mate::TrackableObject<Session>,
-                 public content::DownloadManager::Observer {
-  public:
--  using ResolveProxyCallback = base::Callback<void(std::string)>;
--
-   enum class CacheAction {
-     CLEAR,
-     STATS,
-@@ -63,8 +62,14 @@
-                              v8::Local<v8::FunctionTemplate> prototype);
- 
-   // Methods.
-+<<<<<<< .our
-   void ResolveProxy(const GURL& url, ResolveProxyCallback callback);
-   template <CacheAction action>
-+=======
-+  void ResolveProxy(const GURL& url,
-+                    const ResolveProxyHelper::ResolveProxyCallback& callback);
-+  template<CacheAction action>
-+>>>>>>> .their
-   void DoCacheAction(const net::CompletionCallback& callback);
-   void ClearStorageData(mate::Arguments* args);
-   void FlushStorageData();
-changed in both
-  base   100644 83adf62eee8301c49799b5397f2dcf6bfdbbd295 atom/browser/api/atom_api_web_contents.cc
-  our    100644 20a1ac2e672f08ffea528b6e094ba530ff8083d1 atom/browser/api/atom_api_web_contents.cc
-  their  100644 9a19b727a82229565ec37e6a436bdbec4e670925 atom/browser/api/atom_api_web_contents.cc
-@@ -124,6 +124,30 @@
- struct Converter<PrintSettings> {
-   static bool FromV8(v8::Isolate* isolate,
-                      v8::Local<v8::Value> val,
-+<<<<<<< .our
-+=======
-+                     atom::SetSizeParams* out) {
-+    mate::Dictionary params;
-+    if (!ConvertFromV8(isolate, val, &params))
-+      return false;
-+    bool autosize;
-+    if (params.Get("enableAutoSize", &autosize))
-+      out->enable_auto_size.reset(new bool(autosize));
-+    gfx::Size size;
-+    if (params.Get("min", &size))
-+      out->min_size.reset(new gfx::Size(size));
-+    if (params.Get("max", &size))
-+      out->max_size.reset(new gfx::Size(size));
-+    if (params.Get("normal", &size))
-+      out->normal_size.reset(new gfx::Size(size));
-+    return true;
-+  }
-+};
-+
-+template<>
-+struct Converter<PrintSettings> {
-+  static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
-+>>>>>>> .their
-                      PrintSettings* out) {
-     mate::Dictionary dict;
-     if (!ConvertFromV8(isolate, val, &dict))
-@@ -280,7 +304,12 @@
- 
- // Called when CapturePage is done.
- void OnCapturePageDone(const base::Callback<void(const gfx::Image&)>& callback,
-+<<<<<<< .our
-                        const SkBitmap& bitmap) {
-+=======
-+                       const SkBitmap& bitmap,
-+                       content::ReadbackResponse response) {
-+>>>>>>> .their
-   // Hack to enable transparency in captured image
-   // TODO(nitsakh) Remove hack once fixed in chromium
-   const_cast<SkBitmap&>(bitmap).setAlphaType(kPremul_SkAlphaType);
-@@ -1015,6 +1044,18 @@
-                                     content::RenderFrameHost* frame_host) {
-   bool handled = true;
-   FrameDispatchHelper helper = {this, frame_host};
-+<<<<<<< .our
-+=======
-+  auto relay = NativeWindowRelay::FromWebContents(web_contents());
-+  if (relay) {
-+    IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(NativeWindow, message, frame_host)
-+      IPC_MESSAGE_FORWARD(AtomAutofillFrameHostMsg_HidePopup,
-+                          relay->window.get(), NativeWindow::HideAutofillPopup)
-+      IPC_MESSAGE_UNHANDLED(handled = false)
-+    IPC_END_MESSAGE_MAP()
-+  }
-+
-+>>>>>>> .their
-   IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(WebContents, message, frame_host)
-     IPC_MESSAGE_HANDLER(AtomFrameHostMsg_Message, OnRendererMessage)
-     IPC_MESSAGE_FORWARD_DELAY_REPLY(AtomFrameHostMsg_Message_Sync, &helper,
-@@ -1024,10 +1065,14 @@
-         FrameDispatchHelper::OnSetTemporaryZoomLevel)
-     IPC_MESSAGE_FORWARD_DELAY_REPLY(AtomFrameHostMsg_GetZoomLevel, &helper,
-                                     FrameDispatchHelper::OnGetZoomLevel)
-+<<<<<<< .our
- #if defined(TOOLKIT_VIEWS) && !defined(OS_MACOSX)
-     IPC_MESSAGE_HANDLER(AtomAutofillFrameHostMsg_ShowPopup, ShowAutofillPopup)
-     IPC_MESSAGE_HANDLER(AtomAutofillFrameHostMsg_HidePopup, HideAutofillPopup)
- #endif
-+=======
-+    IPC_MESSAGE_HANDLER(AtomAutofillFrameHostMsg_ShowPopup, ShowAutofillPopup)
-+>>>>>>> .their
-     IPC_MESSAGE_UNHANDLED(handled = false)
-   IPC_END_MESSAGE_MAP()
- 
-@@ -1075,6 +1120,20 @@
-        details.is_same_document, details.did_replace_entry);
- }
- 
-+<<<<<<< .our
-+=======
-+int64_t WebContents::GetIDForContents(content::WebContents* web_contents) {
-+  int64_t process_id = web_contents->GetRenderProcessHost()->GetID();
-+  int64_t routing_id = web_contents->GetMainFrame()->GetRoutingID();
-+  int64_t rv = (process_id << 32) + routing_id;
-+  return rv;
-+}
-+
-+int64_t WebContents::GetID() const {
-+  return WebContents::GetIDForContents(web_contents());
-+}
-+
-+>>>>>>> .their
- int WebContents::GetProcessID() const {
-   return web_contents()->GetMainFrame()->GetProcess()->GetID();
- }
-@@ -1552,7 +1611,11 @@
- bool WebContents::SendIPCMessage(bool all_frames,
-                                  const base::string16& channel,
-                                  const base::ListValue& args) {
-+<<<<<<< .our
-   auto* frame_host = web_contents()->GetMainFrame();
-+=======
-+  auto frame_host = web_contents()->GetMainFrame();
-+>>>>>>> .their
-   if (frame_host) {
-     return frame_host->Send(new AtomFrameMsg_Message(
-         frame_host->GetRoutingID(), all_frames, channel, args));
-@@ -1853,6 +1916,7 @@
-   rfh->Send(reply_msg);
- }
- 
-+<<<<<<< .our
- v8::Local<v8::Value> WebContents::GetPreloadPath(v8::Isolate* isolate) const {
-   if (auto* web_preferences = WebContentsPreferences::From(web_contents())) {
-     base::FilePath::StringType preload;
-@@ -1880,6 +1944,25 @@
- }
- 
- v8::Local<v8::Value> WebContents::GetOwnerBrowserWindow() const {
-+=======
-+v8::Local<v8::Value> WebContents::GetWebPreferences(v8::Isolate* isolate) {
-+  WebContentsPreferences* web_preferences =
-+      WebContentsPreferences::FromWebContents(web_contents());
-+  if (!web_preferences)
-+    return v8::Null(isolate);
-+  return mate::ConvertToV8(isolate, *web_preferences->web_preferences());
-+}
-+
-+v8::Local<v8::Value> WebContents::GetLastWebPreferences(v8::Isolate* isolate) {
-+  WebContentsPreferences* web_preferences =
-+      WebContentsPreferences::FromWebContents(web_contents());
-+  if (!web_preferences)
-+    return v8::Null(isolate);
-+  return mate::ConvertToV8(isolate, *web_preferences->last_web_preferences());
-+}
-+
-+v8::Local<v8::Value> WebContents::GetOwnerBrowserWindow() {
-+>>>>>>> .their
-   if (owner_window())
-     return BrowserWindow::From(isolate(), owner_window());
-   else
-@@ -2013,7 +2096,10 @@
-       .SetMethod("endFrameSubscription", &WebContents::EndFrameSubscription)
-       .SetMethod("startDrag", &WebContents::StartDrag)
-       .SetMethod("isGuest", &WebContents::IsGuest)
-+<<<<<<< .our
-       .SetMethod("attachToIframe", &WebContents::AttachToIframe)
-+=======
-+>>>>>>> .their
-       .SetMethod("isOffscreen", &WebContents::IsOffScreen)
-       .SetMethod("startPainting", &WebContents::StartPainting)
-       .SetMethod("stopPainting", &WebContents::StopPainting)
-changed in both
-  base   100644 16f23210557ca816cdeadd50b9332447eca8815f atom/browser/api/atom_api_web_contents.h
-  our    100644 7939f8268aa8c3371623e0c15f3b6001d7f1efa4 atom/browser/api/atom_api_web_contents.h
-  their  100644 027332a3706d5ac43a4a769234d361304bdc0350 atom/browser/api/atom_api_web_contents.h
-@@ -97,6 +97,8 @@
-   static void BuildPrototype(v8::Isolate* isolate,
-                              v8::Local<v8::FunctionTemplate> prototype);
- 
-+  static int64_t GetIDForContents(content::WebContents* web_contents);
-+
-   // Notifies to destroy any guest web contents before destroying self.
-   void DestroyWebContents(bool async);
- 
-@@ -234,8 +236,13 @@
-   v8::Local<v8::Value> GetPreloadPath(v8::Isolate* isolate) const;
- 
-   // Returns the web preferences of current WebContents.
-+<<<<<<< .our
-   v8::Local<v8::Value> GetWebPreferences(v8::Isolate* isolate) const;
-   v8::Local<v8::Value> GetLastWebPreferences(v8::Isolate* isolate) const;
-+=======
-+  v8::Local<v8::Value> GetWebPreferences(v8::Isolate* isolate);
-+  v8::Local<v8::Value> GetLastWebPreferences(v8::Isolate* isolate);
-+>>>>>>> .their
- 
-   // Returns the owner window.
-   v8::Local<v8::Value> GetOwnerBrowserWindow() const;
-changed in both
-  base   100644 3f53f4d3d7204f59037ba80556a2c9896e23aae4 atom/browser/api/atom_api_web_request.cc
-  our    100644 c088196f833160ac964e67030fa083302dd090b0 atom/browser/api/atom_api_web_request.cc
-  their  100644 ac84ac196b69a121a54dc64b87b7c2c1d6df21b5 atom/browser/api/atom_api_web_request.cc
-@@ -40,7 +40,11 @@
- 
- namespace {
- 
-+<<<<<<< .our
- template <typename Method, typename Event, typename Listener>
-+=======
-+template<typename Method, typename Event, typename Listener>
-+>>>>>>> .their
- void CallNetworkDelegateMethod(
-     brightray::URLRequestContextGetter* url_request_context_getter,
-     Method method,
-@@ -95,14 +99,24 @@
-   }
- 
-   brightray::URLRequestContextGetter* url_request_context_getter =
-+<<<<<<< .our
-       browser_context_->GetRequestContext();
-+=======
-+      browser_context_->url_request_context_getter();
-+>>>>>>> .their
-   if (!url_request_context_getter)
-     return;
-   BrowserThread::PostTask(
-       BrowserThread::IO, FROM_HERE,
-+<<<<<<< .our
-       base::BindOnce(&CallNetworkDelegateMethod<Method, Event, Listener>,
-                      base::RetainedRef(url_request_context_getter), method,
-                      type, std::move(patterns), std::move(listener)));
-+=======
-+      base::Bind(&CallNetworkDelegateMethod<Method, Event, Listener>,
-+                 base::RetainedRef(url_request_context_getter),
-+                 method, type, std::move(patterns), std::move(listener)));
-+>>>>>>> .their
- }
- 
- // static
-removed in local
-  base   100644 993f9680ccb475f8870a2e3b4da2d20472531d91 atom/browser/api/atom_api_window.cc
-  their  100644 d177afb300f65ba14daa8c07042d4d768b00fd54 atom/browser/api/atom_api_window.cc
-removed in local
-  base   100644 f86c387a34afb15920738413c6819176081b5ee7 atom/browser/api/atom_api_window.h
-  their  100644 e07f34e23f060906942b5fce81081965ea792204 atom/browser/api/atom_api_window.h
-changed in both
-  base   100644 8810fed4b9aef78842fb65db93ed2efebabb6928 atom/browser/api/event.cc
-  our    100644 7b617034eca5a229fc9323bfd6d531ebded752d6 atom/browser/api/event.cc
-  their  100644 1ee0d57e36068c9b6427c278e9a7a5a66b7f8f79 atom/browser/api/event.cc
-@@ -6,7 +6,10 @@
- 
- #include "atom/common/api/api_messages.h"
- #include "atom/common/native_mate_converters/string16_converter.h"
-+<<<<<<< .our
- #include "atom/common/native_mate_converters/value_converter.h"
-+=======
-+>>>>>>> .their
- #include "content/public/browser/render_frame_host.h"
- #include "content/public/browser/web_contents.h"
- #include "native_mate/object_template_builder.h"
-@@ -27,6 +30,7 @@
-   message_ = message;
- 
-   Observe(content::WebContents::FromRenderFrameHost(sender));
-+<<<<<<< .our
- }
- 
- void Event::RenderFrameDeleted(content::RenderFrameHost* rfh) {
-@@ -42,6 +46,23 @@
-     sender_ = new_rfh;
- }
- 
-+=======
-+}
-+
-+void Event::RenderFrameDeleted(content::RenderFrameHost* rfh) {
-+  if (sender_ != rfh)
-+    return;
-+  sender_ = nullptr;
-+  message_ = nullptr;
-+}
-+
-+void Event::RenderFrameHostChanged(content::RenderFrameHost* old_rfh,
-+                                   content::RenderFrameHost* new_rfh) {
-+  if (sender_ && sender_ == old_rfh)
-+    sender_ = new_rfh;
-+}
-+
-+>>>>>>> .their
- void Event::FrameDeleted(content::RenderFrameHost* rfh) {
-   if (sender_ != rfh)
-     return;
-@@ -57,7 +78,11 @@
-   if (message_ == nullptr || sender_ == nullptr)
-     return false;
- 
-+<<<<<<< .our
-   AtomFrameHostMsg_Message_Sync::WriteReplyParams(message_, result);
-+=======
-+  AtomFrameHostMsg_Message_Sync::WriteReplyParams(message_, json);
-+>>>>>>> .their
-   bool success = sender_->Send(message_);
-   message_ = nullptr;
-   sender_ = nullptr;
-changed in both
-  base   100644 d73bd2f64b55b5eb0827f819805578559b947f46 atom/browser/api/event.h
-  our    100644 fbec8f27574691005d203adbafb50709f5c2d010 atom/browser/api/event.h
-  their  100644 05ad7daff8ac524294c1cacb66f876efc9716dd4 atom/browser/api/event.h
-@@ -44,8 +44,13 @@
- 
-  private:
-   // Replyer for the synchronous messages.
-+<<<<<<< .our
-   content::RenderFrameHost* sender_ = nullptr;
-   IPC::Message* message_ = nullptr;
-+=======
-+  content::RenderFrameHost* sender_;
-+  IPC::Message* message_;
-+>>>>>>> .their
- 
-   DISALLOW_COPY_AND_ASSIGN(Event);
- };
-changed in both
-  base   100644 3dbcd0601ef8a63cd6712b566cdc7f388c85e3ee atom/browser/api/event_emitter.cc
-  our    100644 c6e810b51225c8f89eaf53ac3e46381b52ba63b5 atom/browser/api/event_emitter.cc
-  their  100644 91769cbb94794a978732773612a3fec245acd750 atom/browser/api/event_emitter.cc
-changed in both
-  base   100644 8d9d2960df35a33a09dfc79c4c35d424738df43f atom/browser/api/event_emitter.h
-  our    100644 5e4ca3b4ffcb184583ef386100eabda7a9e00da0 atom/browser/api/event_emitter.h
-  their  100644 8145113084a9c0c34ea808e3712879f5f70737c9 atom/browser/api/event_emitter.h
-changed in both
-  base   100644 c83a99c2b38708ca296b4c9215e26cb58eb9a7d2 atom/browser/atom_browser_client.cc
-  our    100644 57c4ee582405e6d501ec23940ccb10689ecd64a1 atom/browser/atom_browser_client.cc
-  their  100644 5c442b32d70e1e1a51b79bfd2d093479ab518060 atom/browser/atom_browser_client.cc
-@@ -343,6 +343,11 @@
-       web_preferences->AppendCommandLineSwitches(command_line);
-     SessionPreferences::AppendExtraCommandLineSwitches(
-         web_contents->GetBrowserContext(), command_line);
-+
-+    auto context_id = atom::api::WebContents::GetIDForContents(
-+      web_contents);
-+    command_line->AppendSwitchASCII(switches::kContextId,
-+      base::IntToString(context_id));
-   }
- }
- 
-@@ -497,7 +502,6 @@
- 
- brightray::BrowserMainParts* AtomBrowserClient::OverrideCreateBrowserMainParts(
-     const content::MainFunctionParams&) {
--  v8::V8::Initialize();  // Init V8 before creating main parts.
-   return new AtomBrowserMainParts;
- }
- 
-changed in both
-  base   100644 07b351b551b609e8b7201753b8969ad9dc6f6a52 atom/browser/atom_browser_context.cc
-  our    100644 e036cbc8103f19a034ce386940462f8a23ea6807 atom/browser/atom_browser_context.cc
-  their  100644 f297fbef0a6e75cdb5ca00c86090eb27e44031a7 atom/browser/atom_browser_context.cc
-@@ -9,8 +9,18 @@
- #include "atom/browser/atom_download_manager_delegate.h"
- #include "atom/browser/atom_permission_manager.h"
- #include "atom/browser/browser.h"
-+<<<<<<< .our
- #include "atom/browser/request_context_delegate.h"
- #include "atom/browser/special_storage_policy.h"
-+=======
-+#include "atom/browser/net/about_protocol_handler.h"
-+#include "atom/browser/net/asar/asar_protocol_handler.h"
-+#include "atom/browser/net/atom_cert_verifier.h"
-+#include "atom/browser/net/atom_network_delegate.h"
-+#include "atom/browser/net/atom_url_request_job_factory.h"
-+#include "atom/browser/net/http_protocol_handler.h"
-+#include "atom/browser/net/resolve_proxy_helper.h"
-+>>>>>>> .their
- #include "atom/browser/web_view_manager.h"
- #include "atom/common/atom_version.h"
- #include "atom/common/chrome_version.h"
-@@ -133,6 +143,14 @@
-   return blob_reader_.get();
- }
- 
-+ResolveProxyHelper* AtomBrowserContext::GetResolveProxyHelper() {
-+  if (!resolve_proxy_helper_.get()) {
-+    resolve_proxy_helper_ =
-+        base::MakeRefCounted<ResolveProxyHelper>(url_request_context_getter());
-+  }
-+  return resolve_proxy_helper_.get();
-+}
-+
- // static
- scoped_refptr<AtomBrowserContext> AtomBrowserContext::From(
-     const std::string& partition,
-changed in both
-  base   100644 359d3d6b71a5ea1d606b59d7f9b158a15baf1942 atom/browser/atom_browser_context.h
-  our    100644 9e6a841ceb8d11069a1a094bf7dbbd3a788918b3 atom/browser/atom_browser_context.h
-  their  100644 77469254db0a598a714d5c9ac3abefbe41ed89af atom/browser/atom_browser_context.h
-@@ -20,8 +20,12 @@
- class AtomBlobReader;
- class AtomDownloadManagerDelegate;
- class AtomPermissionManager;
-+<<<<<<< .our
- class RequestContextDelegate;
- class SpecialStoragePolicy;
-+=======
-+class ResolveProxyHelper;
-+>>>>>>> .their
- class WebViewManager;
- 
- class AtomBrowserContext : public brightray::BrowserContext {
-@@ -49,8 +53,16 @@
-   void OnMainRequestContextCreated(
-       brightray::URLRequestContextGetter* getter) override;
- 
-+<<<<<<< .our
-   RequestContextDelegate* GetRequestContextDelegate() const {
-     return request_context_delegate_.get();
-+=======
-+  ResolveProxyHelper* GetResolveProxyHelper();
-+
-+  AtomBlobReader* GetBlobReader();
-+  AtomCookieDelegate* cookie_delegate() const {
-+    return cookie_delegate_.get();
-+>>>>>>> .their
-   }
- 
-  protected:
-@@ -60,8 +72,12 @@
-   ~AtomBrowserContext() override;
- 
-  private:
-+<<<<<<< .our
-   brightray::URLRequestContextGetter* url_request_context_getter_;
- 
-+=======
-+  scoped_refptr<ResolveProxyHelper> resolve_proxy_helper_;
-+>>>>>>> .their
-   std::unique_ptr<AtomDownloadManagerDelegate> download_manager_delegate_;
-   std::unique_ptr<WebViewManager> guest_manager_;
-   std::unique_ptr<AtomPermissionManager> permission_manager_;
-changed in both
-  base   100644 86d50d3c78bda4f4c61dedf43904f9243633d946 atom/browser/atom_browser_main_parts.cc
-  our    100644 5229b19ca9af7845a3f2f13b7e0913f633b68b1d atom/browser/atom_browser_main_parts.cc
-  their  100644 4ecd61b3ab14ceeebab78f95f44b0f1153ccb350 atom/browser/atom_browser_main_parts.cc
-changed in both
-  base   100644 f16ee50158508565cc1e043d3257ad687cc69215 atom/browser/browser.cc
-  our    100644 ce35de64d60c6767ac52596c1b32e7bde5ceefa0 atom/browser/browser.cc
-  their  100644 3ba915f91eb3403df9630697e77cce9ed7fa3307 atom/browser/browser.cc
-changed in both
-  base   100644 0970b26b776b34f68e5f22776e74c19ddcc039ad atom/browser/browser.h
-  our    100644 aed7d25c37da59c0dd5e09940a064c329353a0b2 atom/browser/browser.h
-  their  100644 a8c1a8c5e7c4409e3a78279da46fb2ba6112f409 atom/browser/browser.h
-@@ -277,7 +277,11 @@
-   bool is_ready_ = false;
- 
-   // The browser is being shutdown.
-+<<<<<<< .our
-   bool is_shutdown_ = false;
-+=======
-+  bool is_shutdown_;
-+>>>>>>> .their
- 
-   int badge_count_ = 0;
- 
-changed in both
-  base   100644 0faeee36f9390b36bc5963b2f90d2063e3603109 atom/browser/browser_mac.mm
-  our    100644 27e347eccebf006336d5d110c81717ecc45af9c3 atom/browser/browser_mac.mm
-  their  100644 e47b8cb9d3c7fcf24279cd6e973a1b00a85ea25a atom/browser/browser_mac.mm
-changed in both
-  base   100644 7c154b60b00e25c42847ceefb98723b50ea03dd0 atom/browser/native_browser_view.h
-  our    100644 56937e4c8c69e3605d2b6cc71a0877b74ff4e83d atom/browser/native_browser_view.h
-  their  100644 cab6980fa2cf035c1a5ca6b4aee822a0ee604fd4 atom/browser/native_browser_view.h
-changed in both
-  base   100644 17b0a1ee9006dd70888165a9209076fd7065f3cc atom/browser/native_browser_view_mac.mm
-  our    100644 0416e26e89f1e0f37366ef1798b4359da0729225 atom/browser/native_browser_view_mac.mm
-  their  100644 86df632638ef7772270569824515b251470d0c08 atom/browser/native_browser_view_mac.mm
-changed in both
-  base   100644 78e788b3019c23bce13fdc8d94385d4a3937cf22 atom/browser/native_browser_view_views.cc
-  our    100644 6414005a1e40d80ae86102b12edee0255cab9adb atom/browser/native_browser_view_views.cc
-  their  100644 def64d12e3520fa15a2b6779147a819a6eaec2f8 atom/browser/native_browser_view_views.cc
-changed in both
-  base   100644 5dcda13447cde098fccaf8782fefb97d861d47f4 atom/browser/native_browser_view_views.h
-  our    100644 8f8e860292baddad1156c50ae7cfaa0fd6e87d99 atom/browser/native_browser_view_views.h
-  their  100644 abf47178302ad7527c1640a3f41492f871f137e5 atom/browser/native_browser_view_views.h
-changed in both
-  base   100644 34778fb6434707e6ae3c70ab55e48e87eb556448 atom/browser/native_window.cc
-  our    100644 4ff2bcfcabfd34d8563f9ed213c03655a99dd9c6 atom/browser/native_window.cc
-  their  100644 26ac44607ebceadcde1d4c038890d914c888a0d5 atom/browser/native_window.cc
-@@ -21,6 +21,11 @@
- #include "ui/display/win/screen_win.h"
- #endif
- 
-+#if defined(OS_WIN)
-+#include "ui/base/win/shell.h"
-+#include "ui/display/win/screen_win.h"
-+#endif
-+
- DEFINE_WEB_CONTENTS_USER_DATA_KEY(atom::NativeWindowRelay);
- 
- namespace atom {
-@@ -45,9 +50,29 @@
- 
- }  // namespace
- 
-+<<<<<<< .our
- NativeWindow::NativeWindow(const mate::Dictionary& options,
-                            NativeWindow* parent)
-     : widget_(new views::Widget), parent_(parent), weak_factory_(this) {
-+=======
-+NativeWindow::NativeWindow(
-+    brightray::InspectableWebContents* inspectable_web_contents,
-+    const mate::Dictionary& options,
-+    NativeWindow* parent)
-+    : content::WebContentsObserver(inspectable_web_contents->GetWebContents()),
-+      has_frame_(true),
-+      transparent_(false),
-+      enable_larger_than_screen_(false),
-+      is_closed_(false),
-+      sheet_offset_x_(0.0),
-+      sheet_offset_y_(0.0),
-+      aspect_ratio_(0.0),
-+      parent_(parent),
-+      is_modal_(false),
-+      is_osr_dummy_(false),
-+      inspectable_web_contents_(inspectable_web_contents),
-+      weak_factory_(this) {
-+>>>>>>> .their
-   options.Get(options::kFrame, &has_frame_);
-   options.Get(options::kTransparent, &transparent_);
-   options.Get(options::kEnableLargerThanScreen, &enable_larger_than_screen_);
-changed in both
-  base   100644 d1cfa7cc352971772689ecd60a110b48ef1a7eaa atom/browser/native_window.h
-  our    100644 35b67e2dd230692c415a32aae5f0a5e99ab74ac0 atom/browser/native_window.h
-  their  100644 61922aea78e3b61db614354e6a578fcda925096b atom/browser/native_window.h
-@@ -220,6 +220,17 @@
-   virtual void HandleKeyboardEvent(
-       content::WebContents*,
-       const content::NativeWebKeyboardEvent& event) {}
-+<<<<<<< .our
-+=======
-+  virtual void ShowAutofillPopup(content::RenderFrameHost* frame_host,
-+                                 content::WebContents* web_contents,
-+                                 const gfx::RectF& bounds,
-+                                 const std::vector<base::string16>& values,
-+                                 const std::vector<base::string16>& labels) {}
-+  virtual void HideAutofillPopup(content::RenderFrameHost* frame_host) {}
-+>>>>>>> .their
-+
-+  virtual void UpdateDraggableRegionViews() {}
- 
-   // Public API used by platform-dependent delegates and observers to send UI
-   // related notifications.
-@@ -340,8 +351,13 @@
- class NativeWindowRelay
-     : public content::WebContentsUserData<NativeWindowRelay> {
-  public:
-+<<<<<<< .our
-   explicit NativeWindowRelay(base::WeakPtr<NativeWindow> window);
-   ~NativeWindowRelay() override;
-+=======
-+  explicit NativeWindowRelay(base::WeakPtr<NativeWindow> window)
-+      : key(UserDataKey()), window(window) {}
-+>>>>>>> .their
- 
-   static void* UserDataKey() {
-     return content::WebContentsUserData<NativeWindowRelay>::UserDataKey();
-changed in both
-  base   100644 60d8fc23f59a842c100412b1c236b87d0815a7a0 atom/browser/native_window_mac.h
-  our    100644 44a78198f44cdba9875e3fb27c8e2c87eaa6f33b atom/browser/native_window_mac.h
-  their  100644 9e8c3aef87dd8d2d4a3260587b7013d260649b55 atom/browser/native_window_mac.h
-@@ -118,8 +118,11 @@
-   void MoveTabToNewWindow() override;
-   void ToggleTabBar() override;
-   bool AddTabbedWindow(NativeWindow* window) override;
-+<<<<<<< .our
- 
-   bool SetWindowButtonVisibility(bool visible) override;
-+=======
-+>>>>>>> .their
- 
-   void SetVibrancy(const std::string& type) override;
-   void SetTouchBar(
-@@ -130,8 +133,19 @@
-   gfx::Rect ContentBoundsToWindowBounds(const gfx::Rect& bounds) const override;
-   gfx::Rect WindowBoundsToContentBounds(const gfx::Rect& bounds) const override;
- 
-+<<<<<<< .our
-   // Use a custom content view instead of Chromium's BridgedContentView.
-   void OverrideNSWindowContentView();
-+=======
-+  // content::WebContentsObserver:
-+  void RenderViewHostChanged(content::RenderViewHost* old_host,
-+                             content::RenderViewHost* new_host) override;
-+
-+  // Refresh the DraggableRegion views.
-+  void UpdateDraggableRegionViews() override {
-+    UpdateDraggableRegionViews(draggable_regions_);
-+  }
-+>>>>>>> .their
- 
-   // Set the attribute of NSWindow while work around a bug of zoom button.
-   void SetStyleMask(bool on, NSUInteger flag);
-changed in both
-  base   100644 ad1713e401240dbc1c2054551d0caeb41aea2884 atom/browser/native_window_mac.mm
-  our    100644 004263ec127709067e903ffbf31003b8844226b4 atom/browser/native_window_mac.mm
-  their  100644 0397c62d8df94b3ce66482c0d9c4b3b87ac97a45 atom/browser/native_window_mac.mm
-@@ -28,9 +28,12 @@
- #include "skia/ext/skia_utils_mac.h"
- #include "ui/gfx/skia_util.h"
- #include "ui/gl/gpu_switching_manager.h"
-+<<<<<<< .our
- #include "ui/views/background.h"
- #include "ui/views/cocoa/bridged_native_widget.h"
- #include "ui/views/widget/widget.h"
-+=======
-+>>>>>>> .their
- 
- // This view always takes the size of its superview. It is intended to be used
- // as a NSWindow's contentView.  It is needed because NSWindow's implementation
-@@ -1144,10 +1147,17 @@
- }
- 
- bool NativeWindowMac::AddTabbedWindow(NativeWindow* window) {
-+<<<<<<< .our
-   if (window_ == window->GetNativeWindow()) {
-     return false;
-   } else {
-     if (@available(macOS 10.12, *))
-+=======
-+  if (window_.get() == window->GetNativeWindow()) {
-+    return false;
-+  } else {
-+    if ([window_ respondsToSelector:@selector(addTabbedWindow:ordered:)])
-+>>>>>>> .their
-       [window_ addTabbedWindow:window->GetNativeWindow() ordered:NSWindowAbove];
-   }
-   return true;
-@@ -1185,15 +1195,22 @@
-       return;
-     }
- 
-+<<<<<<< .our
-     background_color_before_vibrancy_.reset([[window_ backgroundColor] retain]);
-     transparency_before_vibrancy_ = [window_ titlebarAppearsTransparent];
-     ui::GpuSwitchingManager::SetTransparent(true);
-+=======
-+    [vibrant_view removeFromSuperview];
-+    [window_ setVibrantView:nil];
-+    ui::GpuSwitchingManager::SetTransparent(transparent());
-+>>>>>>> .their
- 
-     if (title_bar_style_ != NORMAL) {
-       [window_ setTitlebarAppearsTransparent:YES];
-       [window_ setBackgroundColor:[NSColor clearColor]];
-     }
- 
-+<<<<<<< .our
-     NSVisualEffectView* effect_view = (NSVisualEffectView*)vibrant_view;
-     if (effect_view == nil) {
-       effect_view = [[[NSVisualEffectView alloc]
-@@ -1208,6 +1225,31 @@
-                              positioned:NSWindowBelow
-                              relativeTo:nil];
-     }
-+=======
-+  SetRenderWidgetHostOpaque(false);
-+  background_color_before_vibrancy_.reset([window_ backgroundColor]);
-+  transparency_before_vibrancy_ = [window_ titlebarAppearsTransparent];
-+  ui::GpuSwitchingManager::SetTransparent(true);
-+
-+  if (title_bar_style_ != NORMAL) {
-+    [window_ setTitlebarAppearsTransparent:YES];
-+    [window_ setBackgroundColor:[NSColor clearColor]];
-+  }
-+
-+  NSVisualEffectView* effect_view = (NSVisualEffectView*)vibrant_view;
-+  if (effect_view == nil) {
-+    effect_view = [[[NSVisualEffectView alloc]
-+        initWithFrame: [[window_ contentView] bounds]] autorelease];
-+    [window_ setVibrantView:(NSView*)effect_view];
-+
-+    [effect_view setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
-+    [effect_view setBlendingMode:NSVisualEffectBlendingModeBehindWindow];
-+    [effect_view setState:NSVisualEffectStateActive];
-+    [[window_ contentView] addSubview:effect_view
-+                           positioned:NSWindowBelow
-+                           relativeTo:nil];
-+  }
-+>>>>>>> .their
- 
-     NSVisualEffectMaterial vibrancyType = NSVisualEffectMaterialLight;
- 
-@@ -1387,6 +1429,7 @@
-     [parent->GetNativeWindow() addChildWindow:window_ ordered:NSWindowAbove];
- }
- 
-+<<<<<<< .our
- void NativeWindowMac::ShowWindowButton(NSWindowButton button) {
-   auto view = [window_ standardWindowButton:button];
-   [view.superview addSubview:view positioned:NSWindowAbove relativeTo:nil];
-@@ -1395,6 +1438,35 @@
- void NativeWindowMac::SetForwardMouseMessages(bool forward) {
-   [window_ setAcceptsMouseMovedEvents:forward];
- }
-+=======
-+  // Remove all ControlRegionViews that are added last time.
-+  // Note that [webView subviews] returns the view's mutable internal array and
-+  // it should be copied to avoid mutating the original array while enumerating
-+  // it.
-+  base::scoped_nsobject<NSArray> subviews([[webView subviews] copy]);
-+  for (NSView* subview in subviews.get())
-+    if ([subview isKindOfClass:[ControlRegionView class]])
-+      [subview removeFromSuperview];
-+
-+  // Draggable regions is implemented by having the whole web view draggable
-+  // (mouseDownCanMoveWindow) and overlaying regions that are not draggable.
-+  std::vector<gfx::Rect> drag_exclude_rects =
-+      CalculateNonDraggableRegions(regions, webViewWidth, webViewHeight);
-+
-+  if (browser_view_) {
-+    browser_view_->UpdateDraggableRegions(drag_exclude_rects);
-+  }
-+
-+  // Create and add a ControlRegionView for each region that needs to be
-+  // excluded from the dragging.
-+  for (const auto& rect : drag_exclude_rects) {
-+    base::scoped_nsobject<NSView> controlRegion(
-+        [[ControlRegionView alloc] initWithFrame:NSZeroRect]);
-+    [controlRegion setFrame:NSMakeRect(rect.x(), webViewHeight - rect.bottom(),
-+                                       rect.width(), rect.height())];
-+    [webView addSubview:controlRegion];
-+  }
-+>>>>>>> .their
- 
- void NativeWindowMac::OverrideNSWindowContentView() {
-   // When using `views::Widget` to hold WebContents, Chromium would use
-changed in both
-  base   100644 008109970ec8d3c55a2028a173c3b941908d78a7 atom/browser/native_window_views.cc
-  our    100644 0dba39942f92d54ba34db7709b73012055680d94 atom/browser/native_window_views.cc
-  their  100644 f3e6fc09c5850cbc3d6989a2a94607b1f9a5d514 atom/browser/native_window_views.cc
-@@ -1115,7 +1115,11 @@
-   if (!active && IsMenuBarAutoHide() && IsMenuBarVisible())
-     SetMenuBarVisibility(false);
- 
-+<<<<<<< .our
-   root_view_->ResetAltState();
-+=======
-+  menu_bar_alt_pressed_ = false;
-+>>>>>>> .their
- }
- 
- void NativeWindowViews::OnWidgetBoundsChanged(views::Widget* changed_widget,
-@@ -1237,9 +1241,138 @@
- void NativeWindowViews::HandleKeyboardEvent(
-     content::WebContents*,
-     const content::NativeWebKeyboardEvent& event) {
-+<<<<<<< .our
-   keyboard_event_handler_->HandleKeyboardEvent(event,
-                                                root_view_->GetFocusManager());
-   root_view_->HandleKeyEvent(event);
-+=======
-+  keyboard_event_handler_->HandleKeyboardEvent(event, GetFocusManager());
-+
-+  if (!menu_bar_)
-+    return;
-+
-+  // Show accelerator when "Alt" is pressed.
-+  if (menu_bar_visible_ && IsAltKey(event))
-+    menu_bar_->SetAcceleratorVisibility(
-+        event.GetType() == blink::WebInputEvent::kRawKeyDown);
-+
-+  // Show the submenu when "Alt+Key" is pressed.
-+  if (event.GetType() == blink::WebInputEvent::kRawKeyDown &&
-+      !IsAltKey(event) && IsAltModifier(event)) {
-+    if (!menu_bar_visible_ &&
-+        (menu_bar_->HasAccelerator(event.windows_key_code)))
-+      SetMenuBarVisibility(true);
-+    menu_bar_->ActivateAccelerator(event.windows_key_code);
-+    return;
-+  }
-+
-+  if (!menu_bar_autohide_)
-+    return;
-+
-+  // Toggle the menu bar only when a single Alt is released.
-+  if (event.GetType() == blink::WebInputEvent::kRawKeyDown && IsAltKey(event)) {
-+    // When a single Alt is pressed:
-+    menu_bar_alt_pressed_ = true;
-+  } else if (event.GetType() == blink::WebInputEvent::kKeyUp &&
-+             IsAltKey(event) && menu_bar_alt_pressed_) {
-+    // When a single Alt is released right after a Alt is pressed:
-+    menu_bar_alt_pressed_ = false;
-+    SetMenuBarVisibility(!menu_bar_visible_);
-+  } else {
-+    // When any other keys except single Alt have been pressed/released:
-+    menu_bar_alt_pressed_ = false;
-+  }
-+}
-+
-+void NativeWindowViews::ShowAutofillPopup(
-+    content::RenderFrameHost* frame_host,
-+    content::WebContents* web_contents,
-+    const gfx::RectF& bounds,
-+    const std::vector<base::string16>& values,
-+    const std::vector<base::string16>& labels) {
-+  bool is_offsceen = false;
-+  bool is_embedder_offscreen = false;
-+
-+  auto* web_contents_preferences =
-+      WebContentsPreferences::FromWebContents(web_contents);
-+  if (web_contents_preferences) {
-+    const auto* web_preferences = web_contents_preferences->web_preferences();
-+
-+    web_preferences->GetBoolean("offscreen", &is_offsceen);
-+    int guest_instance_id = 0;
-+    web_preferences->GetInteger(options::kGuestInstanceID, &guest_instance_id);
-+
-+    if (guest_instance_id) {
-+      auto manager = WebViewManager::GetWebViewManager(web_contents);
-+      if (manager) {
-+        auto embedder = manager->GetEmbedder(guest_instance_id);
-+        if (embedder) {
-+          is_embedder_offscreen = WebContentsPreferences::IsPreferenceEnabled(
-+              "offscreen", embedder);
-+        }
-+      }
-+    }
-+  }
-+
-+  autofill_popup_->CreateView(
-+      frame_host,
-+      is_offsceen || is_embedder_offscreen,
-+      widget(),
-+      bounds);
-+  autofill_popup_->SetItems(values, labels);
-+  autofill_popup_->UpdatePopupBounds(menu_bar_visible_ ? 0 : kMenuBarHeight);
-+}
-+
-+void NativeWindowViews::HideAutofillPopup(
-+    content::RenderFrameHost* frame_host) {
-+  autofill_popup_->Hide();
-+}
-+
-+void NativeWindowViews::Layout() {
-+  const auto size = GetContentsBounds().size();
-+  const auto menu_bar_bounds =
-+      menu_bar_visible_ ? gfx::Rect(0, 0, size.width(), kMenuBarHeight)
-+                        : gfx::Rect();
-+  if (menu_bar_) {
-+    menu_bar_->SetBoundsRect(menu_bar_bounds);
-+  }
-+
-+  if (web_view_) {
-+    web_view_->SetBoundsRect(
-+        gfx::Rect(0, menu_bar_bounds.height(), size.width(),
-+                  size.height() - menu_bar_bounds.height()));
-+  }
-+
-+  if (autofill_popup_.get())
-+    autofill_popup_->UpdatePopupBounds(menu_bar_visible_ ? 0 : kMenuBarHeight);
-+}
-+
-+gfx::Size NativeWindowViews::GetMinimumSize() const {
-+  return NativeWindow::GetMinimumSize();
-+}
-+
-+gfx::Size NativeWindowViews::GetMaximumSize() const {
-+  return NativeWindow::GetMaximumSize();
-+}
-+
-+bool NativeWindowViews::AcceleratorPressed(const ui::Accelerator& accelerator) {
-+  return accelerator_util::TriggerAcceleratorTableCommand(
-+      &accelerator_table_, accelerator);
-+}
-+
-+void NativeWindowViews::RegisterAccelerators(AtomMenuModel* menu_model) {
-+  // Clear previous accelerators.
-+  views::FocusManager* focus_manager = GetFocusManager();
-+  accelerator_table_.clear();
-+  focus_manager->UnregisterAccelerators(this);
-+
-+  // Register accelerators with focus manager.
-+  accelerator_util::GenerateAcceleratorTable(&accelerator_table_, menu_model);
-+  for (const auto& iter : accelerator_table_) {
-+    focus_manager->RegisterAccelerator(
-+        iter.first, ui::AcceleratorManager::kNormalPriority, this);
-+  }
-+>>>>>>> .their
- }
- 
- ui::WindowShowState NativeWindowViews::GetRestoredState() {
-changed in both
-  base   100644 a39e84ce5b8d7b757233dab4bed646e08cb8c76a atom/browser/net/asar/url_request_asar_job.cc
-  our    100644 85eb2e1dd142b6d64aafb5350ae47603db989e8f atom/browser/net/asar/url_request_asar_job.cc
-  their  100644 a6fe5e26540c9533f16dcf56fc955d0025de3b4a atom/browser/net/asar/url_request_asar_job.cc
-changed in both
-  base   100644 9b0f3a98dc53b922c0d070244f8f7457f332d850 atom/browser/net/atom_network_delegate.cc
-  our    100644 e71ea74317b69f31a5aac8e723902748972fed8f atom/browser/net/atom_network_delegate.cc
-  their  100644 239a64016febb8f9d81206d7f2a7d100ccd1f293 atom/browser/net/atom_network_delegate.cc
-@@ -250,6 +250,7 @@
- 
- AtomNetworkDelegate::~AtomNetworkDelegate() {}
- 
-+<<<<<<< .our
- void AtomNetworkDelegate::SetSimpleListenerInIO(SimpleEvent type,
-                                                 URLPatterns patterns,
-                                                 SimpleListener callback) {
-@@ -266,6 +267,26 @@
-     response_listeners_.erase(type);
-   else
-     response_listeners_[type] = {std::move(patterns), std::move(callback)};
-+=======
-+void AtomNetworkDelegate::SetSimpleListenerInIO(
-+    SimpleEvent type,
-+    URLPatterns patterns,
-+    SimpleListener callback) {
-+  if (callback.is_null())
-+    simple_listeners_.erase(type);
-+  else
-+    simple_listeners_[type] = { std::move(patterns), std::move(callback) };
-+}
-+
-+void AtomNetworkDelegate::SetResponseListenerInIO(
-+    ResponseEvent type,
-+    URLPatterns patterns,
-+    ResponseListener callback) {
-+  if (callback.is_null())
-+    response_listeners_.erase(type);
-+  else
-+    response_listeners_[type] = { std::move(patterns), std::move(callback) };
-+>>>>>>> .their
- }
- 
- void AtomNetworkDelegate::SetDevToolsNetworkEmulationClientId(
-changed in both
-  base   100644 e00c26ff2cbc134b987b4361896971e48056951d atom/browser/net/atom_network_delegate.h
-  our    100644 39a7a8ddfcda17fd7d022331132b54485d07a279 atom/browser/net/atom_network_delegate.h
-  their  100644 ad37a926d4732d94526f74b2f927e35504d2efe3 atom/browser/net/atom_network_delegate.h
-added in remote
-  their  100644 fde8718f89c5d4d4a6dd0a9b08353832c07902c5 atom/browser/net/resolve_proxy_helper.cc
-@@ -0,0 +1,85 @@
-+// Copyright (c) 2018 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "atom/browser/net/resolve_proxy_helper.h"
-+
-+#include "base/threading/thread_task_runner_handle.h"
-+#include "net/url_request/url_request_context.h"
-+#include "net/url_request/url_request_context_getter.h"
-+
-+namespace atom {
-+
-+ResolveProxyHelper::ResolveProxyHelper(net::URLRequestContextGetter* getter)
-+    : context_getter_(getter),
-+      original_thread_(base::ThreadTaskRunnerHandle::Get()) {}
-+
-+ResolveProxyHelper::~ResolveProxyHelper() {
-+  // Clear all pending requests if the ProxyService is still alive.
-+  pending_requests_.clear();
-+}
-+
-+void ResolveProxyHelper::ResolveProxy(const GURL& url,
-+                                      const ResolveProxyCallback& callback) {
-+  // Enqueue the pending request.
-+  pending_requests_.push_back(PendingRequest(url, callback));
-+
-+  // If nothing is in progress, start.
-+  if (pending_requests_.size() == 1)
-+    StartPendingRequest();
-+}
-+
-+void ResolveProxyHelper::SendProxyResult(const std::string& proxy) {
-+  CHECK(!pending_requests_.empty());
-+
-+  const auto& completed_request = pending_requests_.front();
-+  if (!completed_request.callback.is_null())
-+    completed_request.callback.Run(proxy);
-+
-+  // Clear the current (completed) request.
-+  pending_requests_.pop_front();
-+
-+  // Start the next request.
-+  if (!pending_requests_.empty())
-+    StartPendingRequest();
-+}
-+
-+void ResolveProxyHelper::StartPendingRequest() {
-+  auto& request = pending_requests_.front();
-+  context_getter_->GetNetworkTaskRunner()->PostTask(
-+      FROM_HERE,
-+      base::BindOnce(&ResolveProxyHelper::StartPendingRequestInIO,
-+                     base::Unretained(this), request.url, request.pac_req));
-+}
-+
-+void ResolveProxyHelper::OnResolveProxyCompleted(int result) {
-+  std::string proxy;
-+  if (result == net::OK)
-+    proxy = proxy_info_.ToPacString();
-+
-+  original_thread_->PostTask(
-+      FROM_HERE, base::BindOnce(&ResolveProxyHelper::SendProxyResult,
-+                                base::Unretained(this), proxy));
-+}
-+
-+void ResolveProxyHelper::StartPendingRequestInIO(
-+    const GURL& url,
-+    net::ProxyService::PacRequest* pac_req) {
-+  // Verify the request wasn't started yet.
-+  DCHECK(nullptr == pac_req);
-+
-+  auto proxy_service = context_getter_->GetURLRequestContext()->proxy_service();
-+
-+  // Start the request.
-+  int result = proxy_service->ResolveProxy(
-+      url, std::string(), &proxy_info_,
-+      base::Bind(&ResolveProxyHelper::OnResolveProxyCompleted,
-+                 base::Unretained(this)),
-+      &pac_req, nullptr, net::NetLogWithSource());
-+
-+  // Completed synchronously.
-+  if (result != net::ERR_IO_PENDING)
-+    OnResolveProxyCompleted(result);
-+}
-+
-+}  // namespace atom
-added in remote
-  their  100644 cc85d4ff62ce753ff4ba1fc5979760b5e5d768a6 atom/browser/net/resolve_proxy_helper.h
-@@ -0,0 +1,59 @@
-+// Copyright (c) 2018 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ATOM_BROWSER_NET_RESOLVE_PROXY_HELPER_H_
-+#define ATOM_BROWSER_NET_RESOLVE_PROXY_HELPER_H_
-+
-+#include <deque>
-+#include <string>
-+
-+#include "base/memory/ref_counted.h"
-+#include "net/proxy/proxy_service.h"
-+#include "url/gurl.h"
-+
-+namespace net {
-+class URLRequestContextGetter;
-+}
-+
-+namespace atom {
-+
-+class ResolveProxyHelper
-+    : public base::RefCountedThreadSafe<ResolveProxyHelper> {
-+ public:
-+  using ResolveProxyCallback = base::Callback<void(std::string)>;
-+  explicit ResolveProxyHelper(net::URLRequestContextGetter* getter);
-+
-+  void ResolveProxy(const GURL& url, const ResolveProxyCallback& callback);
-+
-+ private:
-+  friend class base::RefCountedThreadSafe<ResolveProxyHelper>;
-+  struct PendingRequest {
-+   public:
-+    PendingRequest(const GURL& url, const ResolveProxyCallback& callback)
-+        : url(url), callback(callback), pac_req(nullptr) {}
-+
-+    GURL url;
-+    ResolveProxyCallback callback;
-+    net::ProxyService::PacRequest* pac_req;
-+  };
-+
-+  ~ResolveProxyHelper();
-+
-+  void StartPendingRequest();
-+  void StartPendingRequestInIO(const GURL& request,
-+                               net::ProxyService::PacRequest* pac_req);
-+  void SendProxyResult(const std::string& proxy);
-+  void OnResolveProxyCompleted(int result);
-+
-+  net::ProxyInfo proxy_info_;
-+  std::deque<PendingRequest> pending_requests_;
-+  scoped_refptr<net::URLRequestContextGetter> context_getter_;
-+  scoped_refptr<base::SingleThreadTaskRunner> original_thread_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(ResolveProxyHelper);
-+};
-+
-+}  // namespace atom
-+
-+#endif  // ATOM_BROWSER_NET_RESOLVE_PROXY_HELPER_H_
-changed in both
-  base   100644 3313eba36bb903426778fac6cd18258a95fec677 atom/browser/resources/mac/Info.plist
-  our    100644 9094f0f7335edf833d51f688851e6a105de60433 atom/browser/resources/mac/Info.plist
-  their  100644 35e7c7c7db7078814e62dec008da8ed1e8130940 atom/browser/resources/mac/Info.plist
-@@ -17,9 +17,15 @@
-   <key>CFBundleIconFile</key>
-   <string>electron.icns</string>
-   <key>CFBundleVersion</key>
-+<<<<<<< .our
-   <string>4.0.0</string>
-   <key>CFBundleShortVersionString</key>
-   <string>4.0.0</string>
-+=======
-+  <string>2.0.8</string>
-+  <key>CFBundleShortVersionString</key>
-+  <string>2.0.8</string>
-+>>>>>>> .their
-   <key>LSApplicationCategoryType</key>
-   <string>public.app-category.developer-tools</string>
-   <key>LSMinimumSystemVersion</key>
-changed in both
-  base   100644 c349f99d712ff69960d35b18587ddb6c417f7cd5 atom/browser/resources/win/atom.rc
-  our    100644 c0bd831e8bddf10180f75cd40694831e2e98622d atom/browser/resources/win/atom.rc
-  their  100644 0a45ab66c64dd400f7928e5eaed7c24a0eea60de atom/browser/resources/win/atom.rc
-@@ -56,8 +56,13 @@
- //
- 
- VS_VERSION_INFO VERSIONINFO
-+<<<<<<< .our
-  FILEVERSION 4,0,0,20180821
-  PRODUCTVERSION 4,0,0,20180821
-+=======
-+ FILEVERSION 2,0,8,0
-+ PRODUCTVERSION 2,0,8,0
-+>>>>>>> .their
-  FILEFLAGSMASK 0x3fL
- #ifdef _DEBUG
-  FILEFLAGS 0x1L
-@@ -74,12 +79,20 @@
-         BEGIN
-             VALUE "CompanyName", "GitHub, Inc."
-             VALUE "FileDescription", "Electron"
-+<<<<<<< .our
-             VALUE "FileVersion", "4.0.0"
-+=======
-+            VALUE "FileVersion", "2.0.8"
-+>>>>>>> .their
-             VALUE "InternalName", "electron.exe"
-             VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
-             VALUE "OriginalFilename", "electron.exe"
-             VALUE "ProductName", "Electron"
-+<<<<<<< .our
-             VALUE "ProductVersion", "4.0.0"
-+=======
-+            VALUE "ProductVersion", "2.0.8"
-+>>>>>>> .their
-             VALUE "SquirrelAwareVersion", "1"
-         END
-     END
-changed in both
-  base   100644 8bdf4e0c2be32fc7d704bc989d7ccec5dd5db672 atom/browser/ui/cocoa/atom_menu_controller.mm
-  our    100644 cecf30ce1c88e007957a65427648941765a6067e atom/browser/ui/cocoa/atom_menu_controller.mm
-  their  100644 ea141b495e710222f12913f35625cf435b947e18 atom/browser/ui/cocoa/atom_menu_controller.mm
-@@ -334,8 +334,13 @@
-   if (isMenuOpen_) {
-     isMenuOpen_ = NO;
-     model_->MenuWillClose();
-+<<<<<<< .our
-     // Post async task so that itemSelected runs before the close callback
-     // deletes the controller from the map which deallocates it
-+=======
-+    // Post async task so that itemSelected runs before the close callback	
-+    // deletes the controller from the map which deallocates it	
-+>>>>>>> .their
-     if (!closeCallback.is_null()) {
-       BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, closeCallback);
-     }
-changed in both
-  base   100644 b26d472db131f7be9d5bfbbd1cebfc992743d312 atom/browser/ui/file_dialog_mac.mm
-  our    100644 18b18a8b240cda5512ae49e0afde5c749bdf75c0 atom/browser/ui/file_dialog_mac.mm
-  their  100644 89ecaf46ec7f32ca4f3a3a89de13efcbdad5619f atom/browser/ui/file_dialog_mac.mm
-@@ -27,9 +27,12 @@
- 
- @implementation PopUpButtonHandler
- 
-+<<<<<<< .our
- @synthesize savePanel;
- @synthesize fileTypesList;
- 
-+=======
-+>>>>>>> .their
- - (instancetype)initWithPanel:(NSSavePanel*)panel
-                  andTypesList:(NSArray*)typesList {
-   self = [super init];
-@@ -55,6 +58,7 @@
- }
- 
- @end
-+<<<<<<< .our
- 
- // Manages the PopUpButtonHandler.
- @interface AtomAccessoryView : NSView
-@@ -65,6 +69,17 @@
- - (void)dealloc {
-   auto* popupButton =
-       static_cast<NSPopUpButton*>([[self subviews] objectAtIndex:1]);
-+=======
-+
-+// Manages the PopUpButtonHandler.
-+@interface AtomAccessoryView : NSView
-+@end
-+
-+@implementation AtomAccessoryView
-+
-+- (void)dealloc {
-+  auto* popupButton = static_cast<NSPopUpButton*>([[self subviews] objectAtIndex: 1]);
-+>>>>>>> .their
-   [[popupButton target] release];
-   [super dealloc];
- }
-@@ -76,8 +91,11 @@
- DialogSettings::DialogSettings() = default;
- DialogSettings::~DialogSettings() = default;
- 
-+<<<<<<< .our
- namespace {
- 
-+=======
-+>>>>>>> .their
- void SetAllowedFileTypes(NSSavePanel* dialog, const Filters& filters) {
-   NSMutableArray* file_types_list = [NSMutableArray array];
-   NSMutableArray* filter_names = [NSMutableArray array];
-@@ -85,9 +103,18 @@
-   // Create array to keep file types and their name.
-   for (const Filter& filter : filters) {
-     NSMutableSet* file_type_set = [NSMutableSet set];
-+<<<<<<< .our
-     [filter_names addObject:@(filter.first.c_str())];
-     for (const std::string& ext : filter.second) {
-       [file_type_set addObject:@(ext.c_str())];
-+=======
-+    base::ScopedCFTypeRef<CFStringRef> name_cf(
-+        base::SysUTF8ToCFStringRef(filter.first));
-+    [filter_names addObject:base::mac::CFToNSCast(name_cf.get())];
-+    for (const std::string& ext : filter.second) {
-+      base::ScopedCFTypeRef<CFStringRef> ext_cf(base::SysUTF8ToCFStringRef(ext));
-+      [file_type_set addObject:base::mac::CFToNSCast(ext_cf.get())];
-+>>>>>>> .their
-     }
-     [file_types_list addObject:[file_type_set allObjects]];
-   }
-@@ -119,12 +146,19 @@
-   [label setBezeled:NO];
-   [label setDrawsBackground:NO];
- 
-+<<<<<<< .our
-   NSPopUpButton* popupButton =
-       [[NSPopUpButton alloc] initWithFrame:NSMakeRect(50.0, 2, 140, 22.0)
-                                  pullsDown:NO];
-   PopUpButtonHandler* popUpButtonHandler =
-       [[PopUpButtonHandler alloc] initWithPanel:dialog
-                                    andTypesList:file_types_list];
-+=======
-+  NSPopUpButton* popupButton = [[NSPopUpButton alloc] initWithFrame:NSMakeRect(50.0, 2, 140, 22.0)
-+                                                          pullsDown:NO];
-+  PopUpButtonHandler* popUpButtonHandler = [[PopUpButtonHandler alloc] initWithPanel:dialog
-+                                                                        andTypesList:file_types_list];
-+>>>>>>> .their
-   [popupButton addItemsWithTitles:filter_names];
-   [popupButton setTarget:popUpButtonHandler];
-   [popupButton setAction:@selector(selectFormat:)];
-changed in both
-  base   100644 17c66043a27f76077f20ac4ff61522fac0bb2b51 atom/browser/ui/message_box_mac.mm
-  our    100644 ee2f59dc8c84ba0bf5fe049a133f403d550a9473 atom/browser/ui/message_box_mac.mm
-  their  100644 a98ce79bf97165b5693cb05f6ebaa4e9617a89da atom/browser/ui/message_box_mac.mm
-changed in both
-  base   100644 a358f676a8c41d15bb9c3157cce4a62ef8356855 atom/browser/ui/tray_icon_cocoa.mm
-  our    100644 2c434d7a9e312adfb3802628a3d092a95d4ac49f atom/browser/ui/tray_icon_cocoa.mm
-  their  100644 aedce38f656eaab389502df98bb20b28e3e3619a atom/browser/ui/tray_icon_cocoa.mm
-@@ -240,13 +240,22 @@
-   }
- 
-   // check title_ being nil
-+<<<<<<< .our
-   NSString* title = @"";
-+=======
-+  NSString *title = @"";
-+>>>>>>> .their
-   if (title_)
-     title = title_;
- 
-   attributedTitle_.reset([[NSMutableAttributedString alloc]
-+<<<<<<< .our
-       initWithString:title
-           attributes:attributes]);
-+=======
-+                             initWithString:title
-+                                 attributes:attributes]);
-+>>>>>>> .their
- 
-   // NSFontAttributeName:[NSFont menuBarFontOfSize:0],
-   // NSForegroundColorAttributeName:[self colorWithHighlight: highlight]
-changed in both
-  base   100644 e1836ad68985f6068a5ea4be76d6f58682056d04 atom/browser/ui/tray_icon_gtk.cc
-  our    100644 4c780285c80a157afca74b0927175ba3b045def9 atom/browser/ui/tray_icon_gtk.cc
-  their  100644 eb7be1ed3b4345cf825075785c1c1708a7b69d30 atom/browser/ui/tray_icon_gtk.cc
-@@ -36,9 +36,16 @@
-   if (libgtkui::AppIndicatorIcon::CouldOpen()) {
-     ++indicators_count;
-     icon_.reset(new libgtkui::AppIndicatorIcon(
-+<<<<<<< .our
-         base::StringPrintf("%s%d", Browser::Get()->GetName().c_str(),
-                            indicators_count),
-         image.AsImageSkia(), toolTip));
-+=======
-+        base::StringPrintf(
-+            "%s%d", Browser::Get()->GetName().c_str(), indicators_count),
-+        image.AsImageSkia(),
-+        toolTip));
-+>>>>>>> .their
-   } else {
-     icon_.reset(new libgtkui::Gtk2StatusIcon(image.AsImageSkia(), toolTip));
-   }
-changed in both
-  base   100644 5182e1a0f7f141e8ddfa95fd8cca8771f2cabd9f atom/browser/ui/views/frameless_view.cc
-  our    100644 8959ee13612979d2819621acc14ebf641fb7f116 atom/browser/ui/views/frameless_view.cc
-  their  100644 b78e897b8f51747fbeb86cdf1e507ecf5be0bf9b atom/browser/ui/views/frameless_view.cc
-changed in both
-  base   100644 f2ab22f70a6fa08ff1315d197ff3ff3cb700733f atom/browser/ui/views/global_menu_bar_x11.cc
-  our    100644 656bd8f991f87c06a240cdc09a3bfcd500d1c1c8 atom/browser/ui/views/global_menu_bar_x11.cc
-  their  100644 eaeefbd1fb411fca13d6de5dbbc17806d271affd atom/browser/ui/views/global_menu_bar_x11.cc
-changed in both
-  base   100644 bf9801a1457740da391c75621214b8d91cb7467d atom/browser/ui/views/menu_bar.cc
-  our    100644 e838d3cc217b5ffdb77226beff0d7217539f23f9 atom/browser/ui/views/menu_bar.cc
-  their  100644 d963c121bbd29bf3f67b488666297c86b4fee225 atom/browser/ui/views/menu_bar.cc
-@@ -18,11 +18,17 @@
- 
- namespace {
- 
-+<<<<<<< .our
-+=======
-+const char kViewClassName[] = "ElectronMenuBar";
-+
-+>>>>>>> .their
- // Default color of the menu bar.
- const SkColor kDefaultColor = SkColorSetARGB(255, 233, 233, 233);
- 
- }  // namespace
- 
-+<<<<<<< .our
- const char MenuBar::kViewClassName[] = "ElectronMenuBar";
- 
- MenuBar::MenuBar(views::View* window)
-@@ -32,12 +38,35 @@
-   SetLayoutManager(
-       std::make_unique<views::BoxLayout>(views::BoxLayout::kHorizontal));
-   window_->GetFocusManager()->AddFocusChangeListener(this);
-+=======
-+MenuBar::MenuBar(NativeWindow* window)
-+    : background_color_(kDefaultColor), menu_model_(NULL), window_(window) {
-+  RefreshColorCache();
-+  UpdateViewColors();
-+  SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal));
-+>>>>>>> .their
- }
- 
- MenuBar::~MenuBar() {
-   window_->GetFocusManager()->RemoveFocusChangeListener(this);
- }
- 
-+<<<<<<< .our
-+=======
-+void MenuBar::AddedToWidget() {
-+  auto fm = GetFocusManager();
-+  fm->AddFocusChangeListener(this);
-+  // Note that we don't own fm -- this manages the _connection_
-+  focus_manager_.reset(fm, [this](views::FocusManager* fm) {
-+    fm->RemoveFocusChangeListener(this);
-+  });
-+}
-+
-+void MenuBar::RemovedFromWidget() {
-+  focus_manager_.reset();
-+}
-+
-+>>>>>>> .their
- void MenuBar::SetMenu(AtomMenuModel* model) {
-   menu_model_ = model;
-   RebuildChildren();
-@@ -61,7 +90,11 @@
- }
- 
- void MenuBar::ActivateAccelerator(base::char16 key) {
-+<<<<<<< .our
-   auto* child = FindAccelChild(key);
-+=======
-+  auto child = FindAccelChild(key);
-+>>>>>>> .their
-   if (child)
-     static_cast<SubmenuButton*>(child)->Activate(nullptr);
- }
-@@ -151,7 +184,11 @@
- void MenuBar::RebuildChildren() {
-   RemoveAllChildViews(true);
-   for (int i = 0, n = GetItemCount(); i < n; ++i) {
-+<<<<<<< .our
-     auto* button =
-+=======
-+    auto button =
-+>>>>>>> .their
-         new SubmenuButton(menu_model_->GetLabelAt(i), this, background_color_);
-     button->set_tag(i);
-     AddChildView(button);
-@@ -169,7 +206,11 @@
- #if defined(USE_X11)
-   const auto& textColor = has_focus_ ? enabled_color_ : disabled_color_;
-   for (auto* child : GetChildrenInZOrder()) {
-+<<<<<<< .our
-     auto* button = static_cast<SubmenuButton*>(child);
-+=======
-+    auto button = static_cast<SubmenuButton*>(child);
-+>>>>>>> .their
-     button->SetTextColor(views::Button::STATE_NORMAL, textColor);
-     button->SetTextColor(views::Button::STATE_DISABLED, disabled_color_);
-     button->SetTextColor(views::Button::STATE_PRESSED, enabled_color_);
-@@ -178,7 +219,11 @@
-   }
- #elif defined(OS_WIN)
-   for (auto* child : GetChildrenInZOrder()) {
-+<<<<<<< .our
-     auto* button = static_cast<SubmenuButton*>(child);
-+=======
-+    auto button = static_cast<SubmenuButton*>(child);
-+>>>>>>> .their
-     button->SetUnderlineColor(color_utils::GetSysSkColor(COLOR_MENUTEXT));
-   }
- #endif
-changed in both
-  base   100644 761e31b98ea75f44bcd016da3b34b7615f3b409f atom/browser/ui/views/menu_bar.h
-  our    100644 2b10ba3e3bf2ccfc0453fdb59ad022ef7da8ed5b atom/browser/ui/views/menu_bar.h
-  their  100644 13cfa32f3988881e3aa87cae6cae65656fa68d70 atom/browser/ui/views/menu_bar.h
-@@ -5,6 +5,12 @@
- #ifndef ATOM_BROWSER_UI_VIEWS_MENU_BAR_H_
- #define ATOM_BROWSER_UI_VIEWS_MENU_BAR_H_
- 
-+<<<<<<< .our
-+=======
-+#include <memory>
-+
-+#include "atom/browser/native_window.h"
-+>>>>>>> .their
- #include "atom/browser/ui/atom_menu_model.h"
- #include "ui/views/controls/button/menu_button_listener.h"
- #include "ui/views/focus/focus_manager.h"
-@@ -49,7 +55,9 @@
- 
-  protected:
-   // views::View:
-+  void AddedToWidget() override;
-   const char* GetClassName() const override;
-+  void RemovedFromWidget() override;
- 
-   // views::MenuButtonListener:
-   void OnMenuButtonClicked(views::MenuButton* source,
-@@ -79,6 +87,11 @@
- 
-   bool has_focus_ = true;
- 
-+  View* FindAccelChild(base::char16 key);
-+
-+  std::shared_ptr<views::FocusManager> focus_manager_;
-+  bool has_focus_ = true;
-+
-   DISALLOW_COPY_AND_ASSIGN(MenuBar);
- };
- 
-changed in both
-  base   100644 3c3cff3c65410f2e61bdade6e457a096ffba3a54 atom/browser/ui/views/submenu_button.cc
-  our    100644 1124d3d01471876fefa2757570ba3cff796a991c atom/browser/ui/views/submenu_button.cc
-  their  100644 baee28f2cd6931611e048ec46c83e602b95b4b59 atom/browser/ui/views/submenu_button.cc
-@@ -82,8 +82,12 @@
- 
- bool SubmenuButton::GetUnderlinePosition(const base::string16& text,
-                                          base::char16* accelerator,
-+<<<<<<< .our
-                                          int* start,
-                                          int* end) const {
-+=======
-+                                         int* start, int* end) const {
-+>>>>>>> .their
-   int pos, span;
-   base::string16 trimmed = gfx::RemoveAcceleratorChar(text, '&', &pos, &span);
-   if (pos > -1 && span != 0) {
-@@ -96,9 +100,14 @@
-   return false;
- }
- 
-+<<<<<<< .our
- void SubmenuButton::GetCharacterPosition(const base::string16& text,
-                                          int index,
-                                          int* pos) const {
-+=======
-+void SubmenuButton::GetCharacterPosition(
-+    const base::string16& text, int index, int* pos) const {
-+>>>>>>> .their
-   int height = 0;
-   gfx::Canvas::SizeStringInt(text.substr(0, index), gfx::FontList(), pos,
-                              &height, 0, 0);
-changed in both
-  base   100644 5c05481cbbfb85b5d77511cb91cc19cc8ef0e626 atom/browser/ui/views/submenu_button.h
-  our    100644 d8b7785da131271e88533879d090badfd6e49dd5 atom/browser/ui/views/submenu_button.h
-  their  100644 0f7eddf4c914790675f0c9bfab696b2a96b91f74 atom/browser/ui/views/submenu_button.h
-@@ -33,11 +33,17 @@
-  private:
-   bool GetUnderlinePosition(const base::string16& text,
-                             base::char16* accelerator,
-+<<<<<<< .our
-                             int* start,
-                             int* end) const;
-   void GetCharacterPosition(const base::string16& text,
-                             int index,
-                             int* pos) const;
-+=======
-+                            int* start, int* end) const;
-+  void GetCharacterPosition(
-+      const base::string16& text, int index, int* pos) const;
-+>>>>>>> .their
- 
-   base::char16 accelerator_ = 0;
- 
-changed in both
-  base   100644 84a6d9aa3e50ced33616fb4b78e124f39461cd0e atom/browser/ui/win/atom_desktop_window_tree_host_win.cc
-  our    100644 97857d6515aa5617cf8c1972690a1dcdfd645ac1 atom/browser/ui/win/atom_desktop_window_tree_host_win.cc
-  their  100644 3da0241a27a9d272c09db30db068939c1bc66d19 atom/browser/ui/win/atom_desktop_window_tree_host_win.cc
-changed in both
-  base   100644 47e4cb6aed2a962bfdd2a92edaca74b452d15c4d atom/browser/ui/win/atom_desktop_window_tree_host_win.h
-  our    100644 30af3cc162b4429cb3335c6864b801eac1d5f963 atom/browser/ui/win/atom_desktop_window_tree_host_win.h
-  their  100644 b0164f2ab6ca9580d11ae1aaff68d9caae314d54 atom/browser/ui/win/atom_desktop_window_tree_host_win.h
-@@ -25,10 +25,15 @@
-   ~AtomDesktopWindowTreeHostWin() override;
- 
-  protected:
-+<<<<<<< .our
-   bool PreHandleMSG(UINT message,
-                     WPARAM w_param,
-                     LPARAM l_param,
-                     LRESULT* result) override;
-+=======
-+  bool PreHandleMSG(
-+      UINT message, WPARAM w_param, LPARAM l_param, LRESULT* result) override;
-+>>>>>>> .their
-   bool HasNativeFrame() const override;
- 
-  private:
-changed in both
-  base   100644 2cbf07be86a812f07105846dc8caf8226a8595df atom/browser/web_contents_preferences.cc
-  our    100644 c21c93383155091a7481cdd4e741cefad90a4a55 atom/browser/web_contents_preferences.cc
-  their  100644 98b39fee234cb15ac0da99fd5639c7b8265d71b0 atom/browser/web_contents_preferences.cc
-@@ -97,6 +97,7 @@
-   instances_.push_back(this);
- 
-   // Set WebPreferences defaults onto the JS object
-+<<<<<<< .our
-   SetDefaultBoolIfUndefined(options::kPlugins, false);
-   SetDefaultBoolIfUndefined(options::kExperimentalFeatures, false);
-   bool node = SetDefaultBoolIfUndefined(options::kNodeIntegration, true);
-@@ -104,12 +105,23 @@
-   SetDefaultBoolIfUndefined(options::kWebviewTag, node);
-   SetDefaultBoolIfUndefined(options::kSandbox, false);
-   SetDefaultBoolIfUndefined(options::kNativeWindowOpen, false);
-+=======
-+  SetDefaultBoolIfUndefined("plugins", false);
-+  SetDefaultBoolIfUndefined(options::kExperimentalFeatures, false);
-+  SetDefaultBoolIfUndefined(options::kExperimentalCanvasFeatures, false);
-+  bool node = SetDefaultBoolIfUndefined(options::kNodeIntegration, true);
-+  SetDefaultBoolIfUndefined(options::kNodeIntegrationInWorker, false);
-+  SetDefaultBoolIfUndefined(options::kWebviewTag, node);
-+  SetDefaultBoolIfUndefined("sandbox", false);
-+  SetDefaultBoolIfUndefined("nativeWindowOpen", false);
-+>>>>>>> .their
-   SetDefaultBoolIfUndefined(options::kContextIsolation, false);
-   SetDefaultBoolIfUndefined("javascript", true);
-   SetDefaultBoolIfUndefined("images", true);
-   SetDefaultBoolIfUndefined("textAreasAreResizable", true);
-   SetDefaultBoolIfUndefined("webgl", true);
-   bool webSecurity = true;
-+<<<<<<< .our
-   SetDefaultBoolIfUndefined(options::kWebSecurity, webSecurity);
-   // If webSecurity was explicity set to false, let's inherit that into
-   // insecureContent
-@@ -125,6 +137,21 @@
-   SetDefaultBoolIfUndefined(options::kOffscreen, false);
- 
-   last_preference_ = preference_.Clone();
-+=======
-+  SetDefaultBoolIfUndefined("webSecurity", webSecurity);
-+  // If webSecurity was explicity set to false, let's inherit that into
-+  // insecureContent
-+  if (web_preferences.Get("webSecurity", &webSecurity) && !webSecurity) {
-+    SetDefaultBoolIfUndefined("allowRunningInsecureContent", true);
-+  } else {
-+    SetDefaultBoolIfUndefined("allowRunningInsecureContent", false);
-+  }
-+  #if defined(OS_MACOSX)
-+  SetDefaultBoolIfUndefined(options::kScrollBounce, false);
-+  #endif
-+  SetDefaultBoolIfUndefined("offscreen", false);
-+  last_web_preferences_.MergeDictionary(&web_preferences_);
-+>>>>>>> .their
- }
- 
- WebContentsPreferences::~WebContentsPreferences() {
-@@ -154,6 +181,16 @@
-   return default_value;
- }
- 
-+bool WebContentsPreferences::SetDefaultBoolIfUndefined(const std::string key,
-+                                                       bool val) {
-+  bool existing;
-+  if (!web_preferences_.GetBoolean(key, &existing)) {
-+    web_preferences_.SetBoolean(key, val);
-+    return val;
-+  }
-+  return existing;
-+}
-+
- void WebContentsPreferences::Merge(const base::DictionaryValue& extend) {
-   if (preference_.is_dict())
-     static_cast<base::DictionaryValue*>(&preference_)->MergeDictionary(&extend);
-@@ -212,8 +249,18 @@
-   return FromWebContents(web_contents);
- }
- 
-+<<<<<<< .our
- void WebContentsPreferences::AppendCommandLineSwitches(
-     base::CommandLine* command_line) {
-+=======
-+  // We are appending args to a webContents so let's save the current state
-+  // of our preferences object so that during the lifetime of the WebContents
-+  // we can fetch the options used to initally configure the WebContents
-+  self->last_web_preferences_.Clear();
-+  self->last_web_preferences_.MergeDictionary(&web_preferences);
-+
-+  bool b;
-+>>>>>>> .their
-   // Check if plugins are enabled.
-   if (IsEnabled(options::kPlugins))
-     command_line->AppendSwitch(switches::kEnablePlugins);
-changed in both
-  base   100644 94dd8dc598bef5cc35383d69d20ade8d644a7ef5 atom/browser/web_contents_preferences.h
-  our    100644 d835347afcd259f473f95271a2c19e42afcc6f2b atom/browser/web_contents_preferences.h
-  their  100644 28ee9a85485e26b33b8a7852a4a212b4c11b71a0 atom/browser/web_contents_preferences.h
-@@ -59,25 +59,45 @@
-   bool GetPreloadPath(base::FilePath::StringType* path) const;
- 
-   // Returns the web preferences.
-+<<<<<<< .our
-   base::Value* preference() { return &preference_; }
-   base::Value* last_preference() { return &last_preference_; }
-+=======
-+  base::DictionaryValue* web_preferences() { return &web_preferences_; }
-+  base::DictionaryValue* last_web_preferences() {
-+    return &last_web_preferences_;
-+  }
-+>>>>>>> .their
- 
-  private:
-   friend class content::WebContentsUserData<WebContentsPreferences>;
-   friend class AtomBrowserClient;
- 
-+<<<<<<< .our
-   // Get WebContents according to process ID.
-   static content::WebContents* GetWebContentsFromProcessID(int process_id);
- 
-   // Set preference value to given bool if user did not provide value
-   bool SetDefaultBoolIfUndefined(const base::StringPiece& key, bool val);
-+=======
-+  // Set preference value to given bool if user did not provide value
-+  bool SetDefaultBoolIfUndefined(const std::string key, bool val);
-+
-+  // Get preferences value as integer possibly coercing it from a string
-+  bool GetInteger(const std::string& attributeName, int* intValue);
-+>>>>>>> .their
- 
-   static std::vector<WebContentsPreferences*> instances_;
- 
-   content::WebContents* web_contents_;
-+<<<<<<< .our
- 
-   base::Value preference_ = base::Value(base::Value::Type::DICTIONARY);
-   base::Value last_preference_ = base::Value(base::Value::Type::DICTIONARY);
-+=======
-+  base::DictionaryValue web_preferences_;
-+  base::DictionaryValue last_web_preferences_;
-+>>>>>>> .their
- 
-   DISALLOW_COPY_AND_ASSIGN(WebContentsPreferences);
- };
-changed in both
-  base   100644 1dd479883d872dc6d76ef069782aad6dc4f731da atom/browser/web_dialog_helper.cc
-  our    100644 74c8573d13f15bcaa189abdc40fa0cd8e48f89be atom/browser/web_dialog_helper.cc
-  their  100644 c76b48a74b3629b9b8588983cb4563aada6d28b9 atom/browser/web_dialog_helper.cc
-changed in both
-  base   100644 ad8c1d49bbc049b89eb4c69224b42fb51906c726 atom/common/api/api_messages.h
-  our    100644 6131a7a473c68e31790fcd8697c8f380c65ad275 atom/common/api/api_messages.h
-  their  100644 46e6142260d67b6408060ccaf328ee1f74335fe4 atom/common/api/api_messages.h
-@@ -59,6 +59,7 @@
- 
- // Sent by renderer to set the temporary zoom level.
- IPC_SYNC_MESSAGE_ROUTED1_1(AtomFrameHostMsg_SetTemporaryZoomLevel,
-+<<<<<<< .our
-                            double /* zoom level */,
-                            double /* result */)
- 
-@@ -69,3 +70,10 @@
- IPC_MESSAGE_ROUTED2(AtomFrameHostMsg_PDFSaveURLAs,
-                     GURL /* url */,
-                     content::Referrer /* referrer */)
-+=======
-+                            double /* zoom level */,
-+                            double /* result */)
-+
-+// Sent by renderer to get the zoom level.
-+IPC_SYNC_MESSAGE_ROUTED0_1(AtomFrameHostMsg_GetZoomLevel, double /* result */)
-+>>>>>>> .their
-changed in both
-  base   100644 a01ca8f84d917f6402a2e8d0aa153c6f7be9a3c5 atom/common/api/atom_api_v8_util.cc
-  our    100644 3d80db0c0a4cdbb4c7a78fa7e4266fc6fc87193f atom/common/api/atom_api_v8_util.cc
-  their  100644 b579d6f7d66c9d28006029ac78a6837007dbb217 atom/common/api/atom_api_v8_util.cc
-changed in both
-  base   100644 d1a185d51f394b1828d66cbcf2a1d1cc278de23d atom/common/api/remote_callback_freer.cc
-  our    100644 eba828591353dae53d1b7cdaa60fee52166d7473 atom/common/api/remote_callback_freer.cc
-  their  100644 099e2160cc0d28322a60e4a9891a22b29ab841f9 atom/common/api/remote_callback_freer.cc
-@@ -29,7 +29,12 @@
-     : ObjectLifeMonitor(isolate, target),
-       content::WebContentsObserver(web_contents),
-       context_id_(context_id),
-+<<<<<<< .our
-       object_id_(object_id) {}
-+=======
-+      object_id_(object_id) {
-+}
-+>>>>>>> .their
- 
- RemoteCallbackFreer::~RemoteCallbackFreer() {}
- 
-@@ -39,7 +44,11 @@
-   base::ListValue args;
-   args.AppendString(context_id_);
-   args.AppendInteger(object_id_);
-+<<<<<<< .our
-   auto* frame_host = web_contents()->GetMainFrame();
-+=======
-+  auto frame_host = web_contents()->GetMainFrame();
-+>>>>>>> .their
-   if (frame_host) {
-     frame_host->Send(new AtomFrameMsg_Message(frame_host->GetRoutingID(), false,
-                                               channel, args));
-changed in both
-  base   100644 315127822d1709802abf317c4d8cf49ec7e2bfaa atom/common/api/remote_object_freer.cc
-  our    100644 8afe8b9a32bc4ba4d5cdfc66ecf7036b8553cb48 atom/common/api/remote_object_freer.cc
-  their  100644 6e9778994ff21fb3c6be3dd27dbf7cbe2c4c94d6 atom/common/api/remote_object_freer.cc
-changed in both
-  base   100644 5fa39680ca814675d344665b3b2a6ce5d94e625f atom/common/atom_version.h
-  our    100644 65e7d19911559a40b1b258319df5fe0fa180354f atom/common/atom_version.h
-  their  100644 93e2a1dba6b95b4582d269b273cc728325a32e8b atom/common/atom_version.h
-@@ -5,10 +5,17 @@
- #ifndef ATOM_COMMON_ATOM_VERSION_H_
- #define ATOM_COMMON_ATOM_VERSION_H_
- 
-+<<<<<<< .our
- #define ATOM_MAJOR_VERSION 4
- #define ATOM_MINOR_VERSION 0
- #define ATOM_PATCH_VERSION 0
- #define ATOM_PRE_RELEASE_VERSION -nightly.20180821
-+=======
-+#define ATOM_MAJOR_VERSION 2
-+#define ATOM_MINOR_VERSION 0
-+#define ATOM_PATCH_VERSION 8
-+// #define ATOM_PRE_RELEASE_VERSION
-+>>>>>>> .their
- 
- #ifndef ATOM_STRINGIFY
- #define ATOM_STRINGIFY(n) ATOM_STRINGIFY_HELPER(n)
-changed in both
-  base   100644 a7908ef30c6bafc4aca1da9a870f7ae12703fe04 atom/common/crash_reporter/crash_reporter_win.cc
-  our    100644 c574da71c9de9bd8c7b7cad57d3a0f84708fb97c atom/common/crash_reporter/crash_reporter_win.cc
-  their  100644 49f90b7e6665727b697a243414544bae304fde6e atom/common/crash_reporter/crash_reporter_win.cc
-changed in both
-  base   100644 cff228ba49068a8a683257e9ac50778437a56c45 atom/common/linux/application_info.cc
-  our    100644 3354c73b8b60f77cf054f975ea713d96b7e7683e atom/common/linux/application_info.cc
-  their  100644 05bd7f6fc15015a4f570e36801aea622a8f0cb3a atom/common/linux/application_info.cc
-@@ -19,7 +19,11 @@
- namespace {
- 
- GDesktopAppInfo* get_desktop_app_info() {
-+<<<<<<< .our
-   GDesktopAppInfo* ret = nullptr;
-+=======
-+  GDesktopAppInfo * ret = nullptr;
-+>>>>>>> .their
- 
-   std::string desktop_id;
-   if (brightray::platform_util::GetDesktopName(&desktop_id))
-changed in both
-  base   100644 eed6e7bc092f84bd1bde673c27f5fe5363c7783c atom/common/options_switches.cc
-  our    100644 8b1836f80c583e4db68971ff1b00ca4f86356b45 atom/common/options_switches.cc
-  their  100644 c1cd185443c0fdbadeb7ba2e174d2048ab2d45d7 atom/common/options_switches.cc
-@@ -188,6 +188,9 @@
- // The application path
- const char kAppPath[] = "app-path";
- 
-+// The context ID for this process
-+const char kContextId[] = "context-id";
-+
- // The command line switch versions of the options.
- const char kBackgroundColor[] = "background-color";
- const char kPreloadScript[] = "preload";
-changed in both
-  base   100644 525301971c8a05c45e12aada7d0534b84307aebf atom/common/options_switches.h
-  our    100644 5f6d7e9d38120668ed06922ced2f8d6a6e27a52b atom/common/options_switches.h
-  their  100644 9d65bc376925906063c24a9a254b2c31c7e22c34 atom/common/options_switches.h
-@@ -92,6 +92,7 @@
- extern const char kSecureSchemes[];
- extern const char kAppUserModelId[];
- extern const char kAppPath[];
-+extern const char kContextId[];
- 
- extern const char kBackgroundColor[];
- extern const char kPreloadScript[];
-changed in both
-  base   100644 7bee1411ba1c2fbac516ff8b65bcbd89f6132819 atom/renderer/api/atom_api_renderer_ipc.cc
-  our    100644 3e48a4f7d0c11f40e6360b0acc2c83c38e671319 atom/renderer/api/atom_api_renderer_ipc.cc
-  their  100644 ad6a12b90d525e9c6a49fac7a5d122b8c2c295f9 atom/renderer/api/atom_api_renderer_ipc.cc
-@@ -12,8 +12,13 @@
- #include "native_mate/dictionary.h"
- #include "third_party/WebKit/public/web/WebLocalFrame.h"
- 
-+<<<<<<< .our
- using blink::WebLocalFrame;
- using content::RenderFrame;
-+=======
-+using content::RenderFrame;
-+using blink::WebLocalFrame;
-+>>>>>>> .their
- 
- namespace atom {
- 
-@@ -48,10 +53,17 @@
- 
-   RenderFrame* render_frame = GetCurrentRenderFrame();
-   if (render_frame == nullptr)
-+<<<<<<< .our
-     return result;
- 
-   IPC::SyncMessage* message = new AtomFrameHostMsg_Message_Sync(
-       render_frame->GetRoutingID(), channel, arguments, &result);
-+=======
-+    return json;
-+
-+  IPC::SyncMessage* message = new AtomFrameHostMsg_Message_Sync(
-+      render_frame->GetRoutingID(), channel, arguments, &json);
-+>>>>>>> .their
-   bool success = render_frame->Send(message);
- 
-   if (!success)
-changed in both
-  base   100644 d0164f44a0a523b26a919e02b5b7add25a0e7224 atom/renderer/api/atom_api_web_frame.cc
-  our    100644 f0f7ef249d73876f7107d3d3865e8fc71ee33945 atom/renderer/api/atom_api_web_frame.cc
-  their  100644 c36d1a06491994f126333c98796f6ff64cfc6506 atom/renderer/api/atom_api_web_frame.cc
-changed in both
-  base   100644 1971a26c1c5d4f5c5f5f029e6334f157a16b5394 atom/renderer/atom_render_frame_observer.cc
-  our    100644 ea2355fd968339600ae8093524f1c3dcfd2f4ff3 atom/renderer/atom_render_frame_observer.cc
-  their  100644 4ddf9186b723091ef91d69cfaedc4fbdd1ac09fa atom/renderer/atom_render_frame_observer.cc
-@@ -7,6 +7,8 @@
- #include <string>
- #include <vector>
- 
-+#include "atom/common/native_mate_converters/string16_converter.h"
-+
- #include "atom/common/api/api_messages.h"
- #include "atom/common/api/event_emitter_caller.h"
- #include "atom/common/native_mate_converters/value_converter.h"
-@@ -72,7 +74,12 @@
-     RendererClientBase* renderer_client)
-     : content::RenderFrameObserver(frame),
-       render_frame_(frame),
-+<<<<<<< .our
-       renderer_client_(renderer_client) {
-+=======
-+      renderer_client_(renderer_client),
-+      document_created_(false) {
-+>>>>>>> .their
-   // Initialise resource for directory listing.
-   net::NetModule::SetResourceProvider(NetResourceProvider);
- }
-@@ -195,8 +202,13 @@
- }
- 
- void AtomRenderFrameObserver::EmitIPCEvent(blink::WebLocalFrame* frame,
-+<<<<<<< .our
-                                            const base::string16& channel,
-                                            const base::ListValue& args) {
-+=======
-+                                          const base::string16& channel,
-+                                          const base::ListValue& args) {
-+>>>>>>> .their
-   if (!frame)
-     return;
- 
-changed in both
-  base   100644 248d5a68096dedea0f6ffb3c9df38ff3373e7c18 atom/renderer/atom_render_frame_observer.h
-  our    100644 e774741c019956a3bff00db2f6d2b133bf1be6de atom/renderer/atom_render_frame_observer.h
-  their  100644 d4f3d0c7d5c454bb65a190f59b26501137dd04e0 atom/renderer/atom_render_frame_observer.h
-@@ -56,7 +56,11 @@
- 
-   content::RenderFrame* render_frame_;
-   RendererClientBase* renderer_client_;
-+<<<<<<< .our
-   bool document_created_ = false;
-+=======
-+  bool document_created_;
-+>>>>>>> .their
- 
-   DISALLOW_COPY_AND_ASSIGN(AtomRenderFrameObserver);
- };
-changed in both
-  base   100644 4d3e7cba7a65330a45a5f2aebba90c257b206e35 atom/renderer/atom_render_view_observer.h
-  our    100644 097616e12369662473c12645a93e27cffcb55e3b atom/renderer/atom_render_view_observer.h
-  their  100644 ca9fb01288e3bd4788c7718f0feb8b37307383e6 atom/renderer/atom_render_view_observer.h
-@@ -14,7 +14,11 @@
-   explicit AtomRenderViewObserver(content::RenderView* render_view);
- 
-  protected:
-+<<<<<<< .our
-   ~AtomRenderViewObserver() override;
-+=======
-+  virtual ~AtomRenderViewObserver();
-+>>>>>>> .their
- 
-  private:
-   // content::RenderViewObserver implementation.
-changed in both
-  base   100644 82ba9d024350009ae86bc5406513c8086073990a atom/renderer/atom_renderer_client.cc
-  our    100644 204f17c2cf0d2d4ec4a71bdbecfcd1cbdc5fc8be atom/renderer/atom_renderer_client.cc
-  their  100644 9241410d7516bcfecc945e2659e02c178ddad2a7 atom/renderer/atom_renderer_client.cc
-@@ -77,8 +77,12 @@
- }
- 
- void AtomRendererClient::DidCreateScriptContext(
-+<<<<<<< .our
-     v8::Handle<v8::Context> context,
-     content::RenderFrame* render_frame) {
-+=======
-+    v8::Handle<v8::Context> context, content::RenderFrame* render_frame) {
-+>>>>>>> .their
-   RendererClientBase::DidCreateScriptContext(context, render_frame);
- 
-   // Only allow node integration for the main frame, unless it is a devtools
-changed in both
-  base   100644 07d20bda8b00b1acdb823546f5e606154278cd4e atom/renderer/atom_sandboxed_renderer_client.cc
-  our    100644 6e29fe45a69f44856d7fca449ec1be4eaf6970a2 atom/renderer/atom_sandboxed_renderer_client.cc
-  their  100644 f3642244f7847fc3f16144a40d2560478c276fa9 atom/renderer/atom_sandboxed_renderer_client.cc
-@@ -12,11 +12,16 @@
- #include "atom/common/options_switches.h"
- #include "atom/renderer/api/atom_api_renderer_ipc.h"
- #include "atom/renderer/atom_render_frame_observer.h"
-+<<<<<<< .our
- #include "base/base_paths.h"
- #include "base/command_line.h"
- #include "base/files/file_path.h"
- #include "base/path_service.h"
- #include "base/process/process_handle.h"
-+=======
-+#include "base/command_line.h"
-+#include "base/files/file_path.h"
-+>>>>>>> .their
- #include "chrome/renderer/printing/print_web_view_helper.h"
- #include "content/public/renderer/render_frame.h"
- #include "native_mate/dictionary.h"
-@@ -34,8 +39,13 @@
- const std::string kModuleCacheKey = "native-module-cache";
- 
- bool IsDevTools(content::RenderFrame* render_frame) {
-+<<<<<<< .our
-   return render_frame->GetWebFrame()->GetDocument().Url().ProtocolIs(
-       "chrome-devtools");
-+=======
-+  return render_frame->GetWebFrame()->GetDocument().Url()
-+        .ProtocolIs("chrome-devtools");
-+>>>>>>> .their
- }
- 
- v8::Local<v8::Object> GetModuleCache(v8::Isolate* isolate) {
-@@ -102,12 +112,19 @@
-   AtomSandboxedRenderFrameObserver(content::RenderFrame* render_frame,
-                                    AtomSandboxedRendererClient* renderer_client)
-       : AtomRenderFrameObserver(render_frame, renderer_client),
-+<<<<<<< .our
-         renderer_client_(renderer_client) {}
-+=======
-+        v8_converter_(new atom::V8ValueConverter),
-+        renderer_client_(renderer_client) {
-+    v8_converter_->SetDisableNode(true);
-+  }
-+>>>>>>> .their
- 
-  protected:
-   void EmitIPCEvent(blink::WebLocalFrame* frame,
-                     const base::string16& channel,
--                    const base::ListValue& args) override {
-+                    const base::ListValue& args) {
-     if (!frame)
-       return;
- 
-@@ -176,6 +193,7 @@
- }
- 
- void AtomSandboxedRendererClient::DidCreateScriptContext(
-+<<<<<<< .our
-     v8::Handle<v8::Context> context,
-     content::RenderFrame* render_frame) {
-   RendererClientBase::DidCreateScriptContext(context, render_frame);
-@@ -184,6 +202,19 @@
-   // For devtools we still want to run the preload_bundle script
-   if (!render_frame->IsMainFrame() && !IsDevTools(render_frame))
-     return;
-+=======
-+    v8::Handle<v8::Context> context, content::RenderFrame* render_frame) {
-+  RendererClientBase::DidCreateScriptContext(context, render_frame);
-+
-+  // Only allow preload for the main frame or
-+  // For devtools we still want to run the preload_bundle script
-+  if (!render_frame->IsMainFrame() && !IsDevTools(render_frame))
-+    return;
-+
-+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-+  base::FilePath preload_script_path = command_line->GetSwitchValuePath(
-+      switches::kPreloadScript);
-+>>>>>>> .their
- 
-   auto* isolate = context->GetIsolate();
-   v8::HandleScope handle_scope(isolate);
-@@ -203,7 +234,14 @@
-   auto binding = v8::Object::New(isolate);
-   InitializeBindings(binding, context);
-   AddRenderBindings(isolate, binding);
-+<<<<<<< .our
-   v8::Local<v8::Value> args[] = {binding};
-+=======
-+  v8::Local<v8::Value> args[] = {
-+    binding,
-+    mate::ConvertToV8(isolate, preload_script_path.value())
-+  };
-+>>>>>>> .their
-   // Execute the function with proper arguments
-   ignore_result(
-       func->Call(context, v8::Null(isolate), node::arraysize(args), args));
-changed in both
-  base   100644 89af0932d10a598f87dd28ec4b32ae3b2e0eadca atom/renderer/renderer_client_base.cc
-  our    100644 69490420ef5b8f87e7cb8fd97ebd5ec4509fa1ae atom/renderer/renderer_client_base.cc
-  their  100644 dbb39a363cd31b6de64f52b5854225d35bcc5a54 atom/renderer/renderer_client_base.cc
-@@ -16,6 +16,10 @@
- #include "atom/renderer/content_settings_observer.h"
- #include "atom/renderer/preferences_manager.h"
- #include "base/command_line.h"
-+<<<<<<< .our
-+=======
-+#include "base/memory/ptr_util.h"
-+>>>>>>> .their
- #include "base/process/process_handle.h"
- #include "base/strings/string_split.h"
- #include "base/strings/stringprintf.h"
-@@ -42,6 +46,7 @@
- #include <shlobj.h>
- #endif
- 
-+<<<<<<< .our
- #if defined(ENABLE_PDF_VIEWER)
- #include "atom/common/atom_constants.h"
- #endif  // defined(ENABLE_PDF_VIEWER)
-@@ -50,6 +55,8 @@
- #include "chrome/renderer/pepper/pepper_helper.h"
- #endif  // defined(ENABLE_PEPPER_FLASH)
- 
-+=======
-+>>>>>>> .their
- // This is defined in later versions of Chromium, remove this if you see
- // compiler complaining duplicate defines.
- #if defined(OS_WIN) || defined(OS_FUCHSIA)
-@@ -105,6 +112,19 @@
-   context->Global()->SetPrivate(context, private_key, value);
- }
- 
-+void RendererClientBase::DidCreateScriptContext(
-+    v8::Handle<v8::Context> context,
-+    content::RenderFrame* render_frame) {
-+  // global.setHidden("contextId", `${processId}-${++nextContextId}`)
-+  std::string context_id = base::StringPrintf(
-+      "%" CrPRIdPid "-%d", base::GetCurrentProcId(), ++next_context_id_);
-+  v8::Isolate* isolate = context->GetIsolate();
-+  v8::Local<v8::String> key = mate::StringToSymbol(isolate, "contextId");
-+  v8::Local<v8::Private> private_key = v8::Private::ForApi(isolate, key);
-+  v8::Local<v8::Value> value = mate::ConvertToV8(isolate, context_id);
-+  context->Global()->SetPrivate(context, private_key, value);
-+}
-+
- void RendererClientBase::AddRenderBindings(
-     v8::Isolate* isolate,
-     v8::Local<v8::Object> binding_object) {
-@@ -161,7 +181,10 @@
- 
- void RendererClientBase::RenderFrameCreated(
-     content::RenderFrame* render_frame) {
-+<<<<<<< .our
- #if defined(TOOLKIT_VIEWS)
-+=======
-+>>>>>>> .their
-   new AutofillAgent(render_frame);
- #endif
- #if defined(ENABLE_PEPPER_FLASH)
-changed in both
-  base   100644 ba302e6a34498cb59cfa8cbf8636044691ee904c atom/renderer/renderer_client_base.h
-  our    100644 f04be0a0fb555fce88aa006c6c6623cc8730d4ed atom/renderer/renderer_client_base.h
-  their  100644 70db197294b7d2491d9c1eaf008ac8b36796f418 atom/renderer/renderer_client_base.h
-@@ -20,10 +20,17 @@
-   RendererClientBase();
-   ~RendererClientBase() override;
- 
-+<<<<<<< .our
-   virtual void DidCreateScriptContext(v8::Handle<v8::Context> context,
-                                       content::RenderFrame* render_frame);
-   virtual void WillReleaseScriptContext(v8::Handle<v8::Context> context,
-                                         content::RenderFrame* render_frame) = 0;
-+=======
-+  virtual void DidCreateScriptContext(
-+      v8::Handle<v8::Context> context, content::RenderFrame* render_frame);
-+  virtual void WillReleaseScriptContext(
-+      v8::Handle<v8::Context> context, content::RenderFrame* render_frame) = 0;
-+>>>>>>> .their
-   virtual void DidClearWindowObject(content::RenderFrame* render_frame);
-   virtual void SetupMainWorldOverrides(v8::Handle<v8::Context> context) = 0;
- 
-changed in both
-  base   100644 653aca2b86182a17d5a1a53aeda6d441bfd3652a atom/utility/atom_content_utility_client.cc
-  our    100644 e2a856d53ae243de988c43b0a3335b9391e54b4e atom/utility/atom_content_utility_client.cc
-  their  100644 91168f7fc2da98546864d12f03d1e0f75a7ca64f atom/utility/atom_content_utility_client.cc
-@@ -4,12 +4,29 @@
- 
- #include "atom/utility/atom_content_utility_client.h"
- 
-+#include "content/public/common/service_manager_connection.h"
-+#include "content/public/common/simple_connection_filter.h"
-+#include "content/public/utility/utility_thread.h"
-+#include "mojo/public/cpp/bindings/strong_binding.h"
-+#include "net/proxy/mojo_proxy_resolver_factory_impl.h"
-+#include "services/service_manager/public/cpp/binder_registry.h"
-+
- #if defined(OS_WIN)
- #include "chrome/utility/printing_handler_win.h"
- #endif
- 
- namespace atom {
- 
-+namespace {
-+
-+void CreateProxyResolverFactory(
-+    net::interfaces::ProxyResolverFactoryRequest request) {
-+  mojo::MakeStrongBinding(base::MakeUnique<net::MojoProxyResolverFactoryImpl>(),
-+                          std::move(request));
-+}
-+
-+}  // namespace
-+
- AtomContentUtilityClient::AtomContentUtilityClient() {
- #if defined(OS_WIN)
-   handlers_.push_back(std::make_unique<printing::PrintingHandlerWin>());
-@@ -18,7 +35,29 @@
- 
- AtomContentUtilityClient::~AtomContentUtilityClient() {}
- 
-+<<<<<<< .our
- bool AtomContentUtilityClient::OnMessageReceived(const IPC::Message& message) {
-+=======
-+void AtomContentUtilityClient::UtilityThreadStarted() {
-+  content::ServiceManagerConnection* connection =
-+      content::ChildThread::Get()->GetServiceManagerConnection();
-+
-+  // NOTE: Some utility process instances are not connected to the Service
-+  // Manager. Nothing left to do in that case.
-+  if (!connection)
-+    return;
-+
-+  auto registry = base::MakeUnique<service_manager::BinderRegistry>();
-+  registry->AddInterface<net::interfaces::ProxyResolverFactory>(
-+      base::Bind(CreateProxyResolverFactory),
-+      base::ThreadTaskRunnerHandle::Get());
-+  connection->AddConnectionFilter(
-+      base::MakeUnique<content::SimpleConnectionFilter>(std::move(registry)));
-+}
-+
-+bool AtomContentUtilityClient::OnMessageReceived(
-+    const IPC::Message& message) {
-+>>>>>>> .their
- #if defined(OS_WIN)
-   for (const auto& handler : handlers_) {
-     if (handler->OnMessageReceived(message))
-merged
-  result 100644 75359a2456129dd0caeb03a37eebf7bbfb9a2e21 atom/utility/atom_content_utility_client.h
-  our    100644 7694970457b745a84ecab24a2f0ec8eaefa8a1ad atom/utility/atom_content_utility_client.h
-@@ -20,6 +20,7 @@
-   AtomContentUtilityClient();
-   ~AtomContentUtilityClient() override;
- 
-+  void UtilityThreadStarted() override;
-   bool OnMessageReceived(const IPC::Message& message) override;
- 
-  private:
-changed in both
-  base   100644 065fe818a64586b6f786cdaa163c40b8a3aacabe brightray/brightray.gyp
-  our    100644 f233257e88bad8f0ff703034bea02e4715a5b5b9 brightray/brightray.gyp
-  their  100644 03d48ccef48fccb58bd39f9604e73b872f825d76 brightray/brightray.gyp
-@@ -127,6 +127,8 @@
-                   '<(libchromiumcontent_dir)/libviz_service.a',
-                   # services/device/wake_lock/power_save_blocker/
-                   '<(libchromiumcontent_dir)/libpower_save_blocker.a',
-+                  # net/proxy/mojo_*
-+                  '<(libchromiumcontent_dir)/libnet_proxy_service.a',
-                   # Friends of libpdf.a:
-                   # On Linux we have to use "--whole-archive" to include
-                   # all symbols, otherwise there will be plenty of
-@@ -178,6 +180,7 @@
-                 ],
-               },
-             }],
-+<<<<<<< .our
-             # Due to strange linker behavior, component build of arm needs to
-             # be linked with libjpeg.a explicitly.
-             ['target_arch=="arm" and libchromiumcontent_component==1', {
-@@ -187,6 +190,8 @@
-                 ],
-               },
-             }],
-+=======
-+>>>>>>> .their
-           ],
-         }],  # OS=="linux"
-         ['OS=="mac"', {
-@@ -221,6 +226,8 @@
-                   '<(libchromiumcontent_dir)/libviz_service.a',
-                   # services/device/wake_lock/power_save_blocker/
-                   '<(libchromiumcontent_dir)/libpower_save_blocker.a',
-+                  # net/proxy/mojo_*
-+                  '<(libchromiumcontent_dir)/libnet_proxy_service.a',
-                   # Friends of libpdf.a:
-                   '<(libchromiumcontent_dir)/libpdf.a',
-                   '<(libchromiumcontent_dir)/libppapi_cpp_objects.a',
-@@ -288,6 +295,20 @@
-                 ],
-               },
-             }],
-+            # In the OSX 10.10 SDK, CoreBluetooth became a top level framework.
-+            # Previously, it was nested in IOBluetooth. In order for Chrome to run on
-+            # OSes older than OSX 10.10, the top level CoreBluetooth framework must be
-+            # weakly linked.
-+            ['mac_sdk=="10.10" and libchromiumcontent_component==0', {
-+              'direct_dependent_settings': {
-+                'xcode_settings': {
-+                  'OTHER_LDFLAGS': [
-+                    '-weak_framework',
-+                    'CoreBluetooth',
-+                  ],
-+                },
-+              },
-+            }],
-           ]
-         }],  # OS=="mac"
-         ['OS=="win"', {
-@@ -359,6 +380,8 @@
-                   '<(libchromiumcontent_dir)/viz_service.lib',
-                   # services/device/wake_lock/power_save_blocker/
-                   '<(libchromiumcontent_dir)/power_save_blocker.lib',
-+                  # net/proxy/mojo_*
-+                  '<(libchromiumcontent_dir)/net_proxy_service.lib',
-                   # Friends of pdf.lib:
-                   '<(libchromiumcontent_dir)/pdf.lib',
-                   '<(libchromiumcontent_dir)/ppapi_cpp_objects.lib',
-changed in both
-  base   100644 d7a4c672926c03dcf4c1a4df1a9e5fa09b19d272 brightray/browser/browser_context.cc
-  our    100644 1eff7344e9aef78bb88720c38c0f75fb92e6bc09 brightray/browser/browser_context.cc
-  their  100644 241398ce96efbe0e4f2203acd86f224c910443e2 brightray/browser/browser_context.cc
-@@ -89,6 +89,7 @@
- }
- 
- void BrowserContext::InitPrefs() {
-+  base::ThreadRestrictions::ScopedAllowIO allow_io;
-   auto prefs_path = GetPath().Append(FILE_PATH_LITERAL("Preferences"));
-   base::ThreadRestrictions::ScopedAllowIO allow_io;
-   PrefServiceFactory prefs_factory;
-changed in both
-  base   100644 642734aa4db9fd3c8025986bb987d79102b27dd5 brightray/browser/browser_main_parts.cc
-  our    100644 78d0ef15ef1343e7db123f97182bac7f9a98b3eb brightray/browser/browser_main_parts.cc
-  their  100644 c79ce69b4b3566b21e5411f2a477b52bcf5ce899 brightray/browser/browser_main_parts.cc
-@@ -183,18 +183,29 @@
-   auto* cmd_line = base::CommandLine::ForCurrentProcess();
-   const auto enable_features =
-       cmd_line->GetSwitchValueASCII(switches::kEnableFeatures);
-+<<<<<<< .our
-   auto disable_features =
-       cmd_line->GetSwitchValueASCII(switches::kDisableFeatures);
-   auto feature_list = std::make_unique<base::FeatureList>();
-+=======
-+  const auto disable_features =
-+      cmd_line->GetSwitchValueASCII(switches::kDisableFeatures);
-+
-+  std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);
-+>>>>>>> .their
-   feature_list->InitializeFromCommandLine(enable_features, disable_features);
-   base::FeatureList::SetInstance(std::move(feature_list));
- }
- 
-+<<<<<<< .our
- bool BrowserMainParts::ShouldContentCreateFeatureList() {
-   return false;
- }
- 
- int BrowserMainParts::PreEarlyInitialization() {
-+=======
-+void BrowserMainParts::PreEarlyInitialization() {
-+>>>>>>> .their
-   InitializeFeatureList();
-   OverrideAppLogsPath();
- #if defined(USE_X11)
-changed in both
-  base   100644 f69682ce51610a754dcaa4f9751c7a22b9a359b2 brightray/browser/browser_main_parts.h
-  our    100644 cf8e0296585b17f1e7dab1717e0aa80293d902dd brightray/browser/browser_main_parts.h
-  their  100644 df8234995d6ed3258d94bf0ebf88112629629f07 brightray/browser/browser_main_parts.h
-changed in both
-  base   100644 143a5fdea3eb6ad7709fa8383298029a24c1b407 brightray/browser/linux/libnotify_notification.cc
-  our    100644 0725ffded989d3c6bce753a210e464deca346ad1 brightray/browser/linux/libnotify_notification.cc
-  their  100644 7f9fb35e434f7cc85cf4145661e754ff4a0d84fc brightray/browser/linux/libnotify_notification.cc
-added in remote
-  their  100644 def1fc7f25e6fa60aa4a548d4ddbe9c2f5633289 brightray/browser/net/chrome_mojo_proxy_resolver_factory.cc
-@@ -0,0 +1,117 @@
-+// Copyright 2015 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "brightray/browser/net/chrome_mojo_proxy_resolver_factory.h"
-+
-+#include <utility>
-+
-+#include "base/logging.h"
-+#include "base/memory/ptr_util.h"
-+#include "base/memory/singleton.h"
-+#include "base/single_thread_task_runner.h"
-+#include "base/strings/utf_string_conversions.h"
-+#include "base/threading/thread_task_runner_handle.h"
-+#include "content/public/browser/browser_thread.h"
-+#include "content/public/browser/utility_process_host.h"
-+#include "content/public/browser/utility_process_host_client.h"
-+#include "services/service_manager/public/cpp/interface_provider.h"
-+
-+namespace {
-+const int kUtilityProcessIdleTimeoutSeconds = 5;
-+}
-+
-+// static
-+ChromeMojoProxyResolverFactory* ChromeMojoProxyResolverFactory::GetInstance() {
-+  DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-+  return base::Singleton<
-+      ChromeMojoProxyResolverFactory,
-+      base::LeakySingletonTraits<ChromeMojoProxyResolverFactory>>::get();
-+}
-+
-+ChromeMojoProxyResolverFactory::ChromeMojoProxyResolverFactory() {
-+  DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-+}
-+
-+ChromeMojoProxyResolverFactory::~ChromeMojoProxyResolverFactory() {
-+  DCHECK(thread_checker_.CalledOnValidThread());
-+}
-+
-+std::unique_ptr<base::ScopedClosureRunner>
-+ChromeMojoProxyResolverFactory::CreateResolver(
-+    const std::string& pac_script,
-+    mojo::InterfaceRequest<net::interfaces::ProxyResolver> req,
-+    net::interfaces::ProxyResolverFactoryRequestClientPtr client) {
-+  DCHECK(thread_checker_.CalledOnValidThread());
-+  if (!resolver_factory_)
-+    CreateFactory();
-+
-+  if (!resolver_factory_) {
-+    // If factory creation failed, close |req|'s message pipe, which should
-+    // cause a connection error.
-+    req = nullptr;
-+    return nullptr;
-+  }
-+  idle_timer_.Stop();
-+  num_proxy_resolvers_++;
-+  resolver_factory_->CreateResolver(pac_script, std::move(req),
-+                                    std::move(client));
-+  return base::MakeUnique<base::ScopedClosureRunner>(
-+      base::Bind(&ChromeMojoProxyResolverFactory::OnResolverDestroyed,
-+                 base::Unretained(this)));
-+}
-+
-+void ChromeMojoProxyResolverFactory::CreateFactory() {
-+  DCHECK(thread_checker_.CalledOnValidThread());
-+  DCHECK(!resolver_factory_);
-+  DCHECK(!weak_utility_process_host_);
-+
-+  DVLOG(1) << "Attempting to create utility process for proxy resolver";
-+  content::UtilityProcessHost* utility_process_host =
-+      content::UtilityProcessHost::Create(
-+          scoped_refptr<content::UtilityProcessHostClient>(),
-+          base::ThreadTaskRunnerHandle::Get());
-+  utility_process_host->SetName(base::ASCIIToUTF16("Electron Proxy Resolver"));
-+  bool process_started = utility_process_host->Start();
-+  if (process_started) {
-+    BindInterface(utility_process_host, &resolver_factory_);
-+    weak_utility_process_host_ = utility_process_host->AsWeakPtr();
-+  } else {
-+    LOG(ERROR) << "Unable to connect to utility process";
-+    return;
-+  }
-+
-+  resolver_factory_.set_connection_error_handler(base::Bind(
-+      &ChromeMojoProxyResolverFactory::DestroyFactory, base::Unretained(this)));
-+}
-+
-+void ChromeMojoProxyResolverFactory::DestroyFactory() {
-+  resolver_factory_.reset();
-+  delete weak_utility_process_host_.get();
-+  weak_utility_process_host_.reset();
-+}
-+
-+void ChromeMojoProxyResolverFactory::OnResolverDestroyed() {
-+  DCHECK(thread_checker_.CalledOnValidThread());
-+  DCHECK_GT(num_proxy_resolvers_, 0u);
-+  if (--num_proxy_resolvers_ == 0) {
-+    // When all proxy resolvers have been destroyed, the proxy resolver factory
-+    // is no longer needed. However, new proxy resolvers may be created
-+    // shortly after being destroyed (e.g. due to a network change).
-+    //
-+    // On desktop, where a utility process is used, if the utility process is
-+    // shut down immediately, this would cause unnecessary process churn, so
-+    // wait for an idle timeout before shutting down the proxy resolver utility
-+    // process.
-+    idle_timer_.Start(
-+        FROM_HERE,
-+        base::TimeDelta::FromSeconds(kUtilityProcessIdleTimeoutSeconds), this,
-+        &ChromeMojoProxyResolverFactory::OnIdleTimeout);
-+  }
-+}
-+
-+void ChromeMojoProxyResolverFactory::OnIdleTimeout() {
-+  DCHECK(thread_checker_.CalledOnValidThread());
-+  DCHECK_EQ(num_proxy_resolvers_, 0u);
-+  DestroyFactory();
-+}
-added in remote
-  their  100644 47e51efebf3285c981ab71ba344d27bcd89c52e6 brightray/browser/net/chrome_mojo_proxy_resolver_factory.h
-@@ -0,0 +1,73 @@
-+// Copyright 2015 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef BRIGHTRAY_BROWSER_NET_CHROME_MOJO_PROXY_RESOLVER_FACTORY_H_
-+#define BRIGHTRAY_BROWSER_NET_CHROME_MOJO_PROXY_RESOLVER_FACTORY_H_
-+
-+#include <stddef.h>
-+#include <string>
-+
-+#include "base/macros.h"
-+#include "base/memory/weak_ptr.h"
-+#include "base/threading/thread_checker.h"
-+#include "base/timer/timer.h"
-+#include "net/proxy/mojo_proxy_resolver_factory.h"
-+
-+namespace content {
-+class UtilityProcessHost;
-+}
-+
-+namespace base {
-+template <typename Type>
-+struct DefaultSingletonTraits;
-+}  // namespace base
-+
-+// A factory used to create connections to Mojo proxy resolver services.  On
-+// Android, the proxy resolvers will run in the browser process, and on other
-+// platforms, they'll all be run in the same utility process. Utility process
-+// crashes are detected and the utility process is automatically restarted.
-+class ChromeMojoProxyResolverFactory : public net::MojoProxyResolverFactory {
-+ public:
-+  static ChromeMojoProxyResolverFactory* GetInstance();
-+
-+  // Overridden from net::MojoProxyResolverFactory:
-+  std::unique_ptr<base::ScopedClosureRunner> CreateResolver(
-+      const std::string& pac_script,
-+      mojo::InterfaceRequest<net::interfaces::ProxyResolver> req,
-+      net::interfaces::ProxyResolverFactoryRequestClientPtr client) override;
-+
-+ private:
-+  friend struct base::DefaultSingletonTraits<ChromeMojoProxyResolverFactory>;
-+  ChromeMojoProxyResolverFactory();
-+  ~ChromeMojoProxyResolverFactory() override;
-+
-+  // Creates the proxy resolver factory. On desktop, creates a new utility
-+  // process before creating it out of process. On Android, creates it on the
-+  // current thread.
-+  void CreateFactory();
-+
-+  // Destroys |resolver_factory_|.
-+  void DestroyFactory();
-+
-+  // Invoked each time a proxy resolver is destroyed.
-+  void OnResolverDestroyed();
-+
-+  // Invoked once an idle timeout has elapsed after all proxy resolvers are
-+  // destroyed.
-+  void OnIdleTimeout();
-+
-+  net::interfaces::ProxyResolverFactoryPtr resolver_factory_;
-+
-+  base::WeakPtr<content::UtilityProcessHost> weak_utility_process_host_;
-+
-+  size_t num_proxy_resolvers_ = 0;
-+
-+  base::OneShotTimer idle_timer_;
-+
-+  base::ThreadChecker thread_checker_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(ChromeMojoProxyResolverFactory);
-+};
-+
-+#endif  // BRIGHTRAY_BROWSER_NET_CHROME_MOJO_PROXY_RESOLVER_FACTORY_H_
-changed in both
-  base   100644 7a798ae98e6c180c5a60e0a32ce6393532e83468 brightray/browser/net_log.cc
-  our    100644 fb443ea0b72b9659d98d1873fad1a714483bb13f brightray/browser/net_log.cc
-  their  100644 978667acb61b0330d6bf48bb7e814bbdef50b904 brightray/browser/net_log.cc
-@@ -45,11 +45,16 @@
-     return;
- 
-   base::FilePath log_path =
-+<<<<<<< .our
-       command_line->GetSwitchValuePath(network::switches::kLogNetLog);
-   if (log_path.empty())
-     return;
- 
-   std::unique_ptr<base::Value> constants(GetConstants());  // Net constants
-+=======
-+      command_line->GetSwitchValuePath(switches::kLogNetLog);
-+  std::unique_ptr<base::Value> constants(GetConstants());
-+>>>>>>> .their
-   net::NetLogCaptureMode capture_mode = net::NetLogCaptureMode::Default();
- 
-   file_net_log_observer_ =
-changed in both
-  base   100644 28e988f4b49cd35507e4972c19122bbe604f2690 brightray/browser/url_request_context_getter.cc
-  our    100644 c07ba80cbc522030af580adc5d8676ed31d592d1 brightray/browser/url_request_context_getter.cc
-  their  100644 972d8054221e95442456559ada46ba62e6f75b79 brightray/browser/url_request_context_getter.cc
-@@ -12,7 +12,13 @@
- #include "base/strings/string_util.h"
- #include "base/task_scheduler/post_task.h"
- #include "brightray/browser/browser_client.h"
-+<<<<<<< .our
- #include "brightray/browser/browser_context.h"
-+=======
-+#include "brightray/browser/net/chrome_mojo_proxy_resolver_factory.h"
-+#include "brightray/browser/net/devtools_network_controller_handle.h"
-+#include "brightray/browser/net/devtools_network_transaction_factory.h"
-+>>>>>>> .their
- #include "brightray/browser/net/require_ct_delegate.h"
- #include "brightray/browser/net_log.h"
- #include "brightray/common/switches.h"
-@@ -35,11 +41,20 @@
- #include "net/http/http_auth_preferences.h"
- #include "net/http/http_server_properties_impl.h"
- #include "net/log/net_log.h"
-+<<<<<<< .our
- #include "net/proxy_resolution/dhcp_pac_file_fetcher_factory.h"
- #include "net/proxy_resolution/pac_file_fetcher_impl.h"
- #include "net/proxy_resolution/proxy_config.h"
- #include "net/proxy_resolution/proxy_config_service.h"
- #include "net/proxy_resolution/proxy_service.h"
-+=======
-+#include "net/proxy/dhcp_proxy_script_fetcher_factory.h"
-+#include "net/proxy/proxy_config.h"
-+#include "net/proxy/proxy_config_service.h"
-+#include "net/proxy/proxy_script_fetcher_impl.h"
-+#include "net/proxy/proxy_service.h"
-+#include "net/proxy/proxy_service_mojo.h"
-+>>>>>>> .their
- #include "net/ssl/channel_id_service.h"
- #include "net/ssl/default_channel_id_store.h"
- #include "net/ssl/ssl_config_service_defaults.h"
-@@ -276,9 +291,18 @@
-       storage_->set_proxy_resolution_service(
-           net::ProxyResolutionService::CreateFixed(proxy_config));
-     } else {
-+<<<<<<< .our
-       storage_->set_proxy_resolution_service(
-           net::ProxyResolutionService::CreateUsingSystemProxyResolver(
-               std::move(proxy_config_service_), net_log_));
-+=======
-+      storage_->set_proxy_service(net::CreateProxyServiceUsingMojoFactory(
-+          ChromeMojoProxyResolverFactory::GetInstance(),
-+          std::move(proxy_config_service_),
-+          new net::ProxyScriptFetcherImpl(url_request_context_.get()),
-+          dhcp_factory.Create(url_request_context_.get()), host_resolver.get(),
-+          nullptr, url_request_context_->network_delegate()));
-+>>>>>>> .their
-     }
- 
-     std::vector<std::string> schemes;
-changed in both
-  base   100644 04033f451e045ee7211f0a7152d46c5010a55b72 brightray/browser/url_request_context_getter.h
-  our    100644 941a5782b14a941bb25a7a9ef6ca6d73f8bc3ec1 brightray/browser/url_request_context_getter.h
-  their  100644 1a26704d380ab7d113c4e2b0deb940a2d674f96b brightray/browser/url_request_context_getter.h
-@@ -76,11 +76,14 @@
-       const override;
- 
-   net::URLRequestJobFactory* job_factory() const { return job_factory_; }
-+<<<<<<< .our
-   void set_delegate(Delegate* delegate) { delegate_ = delegate; }
- 
-   // Discard reference to URLRequestContext and inform observers to
-   // shutdown. Must be called only on IO thread.
-   void NotifyContextShuttingDown(std::unique_ptr<ResourceContext>);
-+=======
-+>>>>>>> .their
- 
-  private:
-   friend class BrowserContext;
-changed in both
-  base   100644 08b203a23291ba0e2ba254873074178da4921123 brightray/common/application_info_win.cc
-  our    100644 a0256372bbdbbc1d77cb84885faab42a27f55c9f brightray/common/application_info_win.cc
-  their  100644 89ea0aceb6784119ad65783cfd1c019e7aedbf57 brightray/common/application_info_win.cc
-changed in both
-  base   100644 6a7d91f135c4b904e6d3172da91e7813793a2fba brightray/filenames.gypi
-  our    100644 b9e2d96175f8ee2d407db9c49b2e2b74756327de brightray/filenames.gypi
-  their  100644 e3f2aa5f5bc6f7443df50b88c1ab498d2de0a6f1 brightray/filenames.gypi
-@@ -47,6 +47,27 @@
-       'browser/media/media_device_id_salt.h',
-       'browser/media/media_stream_devices_controller.cc',
-       'browser/media/media_stream_devices_controller.h',
-+<<<<<<< .our
-+=======
-+      'browser/net/devtools_network_conditions.cc',
-+      'browser/net/devtools_network_conditions.h',
-+      'browser/net/devtools_network_controller.cc',
-+      'browser/net/devtools_network_controller.h',
-+      'browser/net/devtools_network_controller_handle.cc',
-+      'browser/net/devtools_network_controller_handle.h',
-+      'browser/net/devtools_network_interceptor.cc',
-+      'browser/net/devtools_network_interceptor.h',
-+      'browser/net/devtools_network_protocol_handler.cc',
-+      'browser/net/devtools_network_protocol_handler.h',
-+      'browser/net/devtools_network_transaction_factory.cc',
-+      'browser/net/devtools_network_transaction_factory.h',
-+      'browser/net/devtools_network_transaction.cc',
-+      'browser/net/devtools_network_transaction.h',
-+      'browser/net/devtools_network_upload_data_stream.cc',
-+      'browser/net/devtools_network_upload_data_stream.h',
-+      'browser/net/chrome_mojo_proxy_resolver_factory.cc',
-+      'browser/net/chrome_mojo_proxy_resolver_factory.h',
-+>>>>>>> .their
-       'browser/net/require_ct_delegate.cc',
-       'browser/net/require_ct_delegate.h',
-       'browser/net_log.cc',
-changed in both
-  base   100644 233e21047718c9bbbc9056f79aecf51657886b92 common.gypi
-  our    100644 676d1e904127066e4a3d313106f15406fcbed8b6 common.gypi
-  their  100644 acad39d991479147b9bc2ee2c5a51fbd8693a689 common.gypi
-changed in both
-  base   100644 e0e8b153ae51d917f37ba50967e2ef9e5b74254d docs/README.md
-  our    100644 f7b956e8feb95ceb64743ad260a1759e5a298afe docs/README.md
-  their  100644 436188887e5dad0a4ae291e5221e3eb8644bc56e docs/README.md
-@@ -16,6 +16,7 @@
- 
- * [Electron FAQ](faq.md)
- 
-+<<<<<<< .our
- ## Guides and Tutorials
- 
- * [Setting up the Development Environment](tutorial/development-environment.md)
-@@ -66,6 +67,12 @@
-   * [Mac App Store](tutorial/mac-app-store-submission-guide.md)
-   * [Windows Store](tutorial/windows-store-guide.md)
-   * [Snapcraft](tutorial/snapcraft.md)
-+=======
-+## Guides
-+
-+* [Glossary of Terms](glossary.md)
-+* [Support](tutorial/support.md)
-+>>>>>>> .their
- * [Security](tutorial/security.md)
-   * [Reporting Security Issues](tutorial/security.md#reporting-security-issues)
-   * [Chromium Security Issues and Upgrades](tutorial/security.md#chromium-security-issues-and-upgrades)
-changed in both
-  base   100644 926d1dde8ffc33d99c48cb55bbc2d0f9c2087ad4 docs/api/app.md
-  our    100644 14dc557e237404cbbd5bcebabb0e65486dc36926 docs/api/app.md
-  their  100644 40fdf2669442ca48fd1fc9a3b4aede6a199df4f1 docs/api/app.md
-changed in both
-  base   100644 2be2da597664c1913a665ad51de5becc42658d0f docs/api/browser-window.md
-  our    100644 dff61dd336f047cf2f6f06228b2df2b98ff2304d docs/api/browser-window.md
-  their  100644 38db79506b4dce32f9e6f4cf07e1d6fe72648a24 docs/api/browser-window.md
-changed in both
-  base   100644 f9aaaa90ddd7b8887c5ed3fea371bf175e28c2e7 docs/api/in-app-purchase.md
-  our    100644 6e612a72e27159602400f4efa30d5bc2f3aa668f docs/api/in-app-purchase.md
-  their  100644 67109dc0f92d8c537c9a2f1fa5fa2ce223137964 docs/api/in-app-purchase.md
-changed in both
-  base   100644 f130d127936331ab8c6cadd4672a7446a77a683a docs/api/tray.md
-  our    100644 c60f7ba4c9e9b6ad3fc1b2f717983b71bd286842 docs/api/tray.md
-  their  100644 5fb345538a7f29bb679223af1c4d9d3b099a9bf0 docs/api/tray.md
-changed in both
-  base   100644 6aaa2bdd9b0ade84160b7449396d5ecd510f0e41 docs/api/web-contents.md
-  our    100644 8990fe2e97ab62eafdd3f7a4eb8ee782415124c5 docs/api/web-contents.md
-  their  100644 841acb4a506626c334004e28266ebed3845360d3 docs/api/web-contents.md
-@@ -1385,6 +1385,26 @@
- 
- Shows pop-up dictionary that searches the selected word on the page.
- 
-+<<<<<<< .our
-+=======
-+#### `contents.setSize(options)`
-+
-+Set the size of the page. This is only supported for `<webview>` guest contents.
-+
-+* `options` Object
-+  * `enableAutoSize` Boolean (optional) - true to make the webview container automatically
-+    resize within the bounds specified by the attributes normal, min and max.
-+  * `normal` [Size](structures/size.md) (optional) - Normal size of the page. This can be used in
-+    combination with the [`disableguestresize`](webview-tag.md#disableguestresize)
-+    attribute to manually resize the webview guest contents.
-+  * `min` [Size](structures/size.md) (optional) - Minimum size of the page. This can be used in
-+    combination with the [`disableguestresize`](webview-tag.md#disableguestresize)
-+    attribute to manually resize the webview guest contents.
-+  * `max` [Size](structures/size.md) (optional) - Maximium size of the page. This can be used in
-+    combination with the [`disableguestresize`](webview-tag.md#disableguestresize)
-+    attribute to manually resize the webview guest contents.
-+
-+>>>>>>> .their
- #### `contents.isOffscreen()`
- 
- Returns `Boolean` - Indicates whether *offscreen rendering* is enabled.
-changed in both
-  base   100644 441e2b4d0533db1de59b7dd4e4a6e21a7fa52af1 docs/api/web-frame.md
-  our    100644 989060ef3e50c5d93db1a914997f1d190edf3cf5 docs/api/web-frame.md
-  their  100644 1c7bb83ad953a56561f2d86b3a4d89b37dceb560 docs/api/web-frame.md
-changed in both
-  base   100644 afdff5615421e52b8750ea1de20b63941cbefb1f docs/development/releasing.md
-  our    100644 85a5fa0a935201521155dc60de45986db5829613 docs/development/releasing.md
-  their  100644 d27fb5022515cb80a829a80369fb6cb192003522 docs/development/releasing.md
-@@ -8,16 +8,25 @@
- information.
- 
- There are a handful of `*_TOKEN` environment variables needed by the release
-+<<<<<<< .our
- scripts:
- 
- * `ELECTRON_GITHUB_TOKEN`:
- Create this by visiting https://github.com/settings/tokens/new?scopes=repo
-+=======
-+scripts. Once you've generated these per-user tokens, you may want to keep
-+them in a local file that you can `source` when starting a release.
-+* `ELECTRON_GITHUB_TOKEN`:
-+Create as described at https://github.com/settings/tokens/new,
-+giving the token repo access scope.
-+>>>>>>> .their
- * `APPVEYOR_TOKEN`:
- Create a token from https://windows-ci.electronjs.org/api-token
- If you don't have an account, ask a team member to add you.
- * `CIRCLE_TOKEN`:
- Create a token from "Personal API Tokens" at https://circleci.com/account/api
- * `VSTS_TOKEN`:
-+<<<<<<< .our
- Create a Personal Access Token at https://github.visualstudio.com/_usersSettings/tokens or https://github.visualstudio.com/_details/security/tokens
- with the scope of `Build (read and execute)`.
- * `ELECTRON_S3_BUCKET`:
-@@ -29,6 +38,10 @@
- of the project. This file is gitignored, and will be loaded into the 
- environment by the release scripts.
- 
-+=======
-+Create a Personal Access Token at https://github.visualstudio.com/_usersSettings/tokens
-+with the scope of `Build (read and execute)`.
-+>>>>>>> .their
- 
- ## Determine which branch to release from
- 
-@@ -212,10 +225,13 @@
- ```sh
- $ npm run release -- --validateRelease
- ```
-+<<<<<<< .our
- Note, if you need to run `--validateRelease` more than once to check the assets,
- run it as above the first time, then `node ./script/release.js --validateRelease`
- for subsequent calls so that you don't have to rebuild each time you want to
- check the assets.
-+=======
-+>>>>>>> .their
- 
- ## Publish the release
- 
-@@ -258,6 +274,7 @@
- electron
- $ npm run publish-to-npm
- ```
-+<<<<<<< .our
- 
- After publishing, you can check the `latest` release:
- ```sh
-@@ -273,6 +290,8 @@
- ```sh
- $ npm dist-tag add electron@2.0.0 latest
- ```
-+=======
-+>>>>>>> .their
- 
- [the releases page]: https://github.com/electron/electron/releases
- [this bump commit]: https://github.com/electron/electron/commit/78ec1b8f89b3886b856377a1756a51617bc33f5a
-@@ -303,7 +322,11 @@
- ```
- 
- Additionally you can pass a job name to the script to run an individual job, eg:
-+<<<<<<< .our
- ```sh
-+=======
-+````sh
-+>>>>>>> .their
- node script/ci-release-build.js --ci=AppVeyor --ghRelease --job=electron-x64 TARGET_BRANCH
- ```
- 
-removed in local
-  base   100644 7dfc6084f5c94bfb924438e7efa50260d38b9144 docs/tutorial/planned-breaking-changes.md
-  their  100644 00e01f4f8c3a85f0e535a00c11e22f3595bff4b9 docs/tutorial/planned-breaking-changes.md
-added in both
-  our    100644 bdb3b8678485feabfad2ce23309f5bcac6050f31 docs/tutorial/support.md
-  their  100644 306876fee9314fbca1779a6c41ff8c6381753bda docs/tutorial/support.md
-@@ -91,4 +91,8 @@
- * Fedora 21
- * Debian 8
- 
-+<<<<<<< .our
- [arm-breaking-change]: https://github.com/electron/electron/blob/master/docs/api/breaking-changes.md#duplicate-arm-assets
-+=======
-+[arm-breaking-change]: https://github.com/electron/electron/blob/master/docs/tutorial/planned-breaking-changes.md#duplicate-arm-assets
-+>>>>>>> .their
-changed in both
-  base   100644 53ad35c63321e74a5023197ef2e075584e0f268b electron.gyp
-  our    100644 944ddab2a3fd879044e31677e4bac2843fffbdee electron.gyp
-  their  100644 51af69bc0be042f22925ff23f7cb2fc832722ed8 electron.gyp
-@@ -4,7 +4,11 @@
-     'product_name%': 'Electron',
-     'company_name%': 'GitHub, Inc',
-     'company_abbr%': 'github',
-+<<<<<<< .our
-     'version%': '4.0.0-nightly.20180821',
-+=======
-+    'version%': '2.0.8',
-+>>>>>>> .their
-     'js2c_input_dir': '<(SHARED_INTERMEDIATE_DIR)/js2c',
-   },
-   'includes': [
-changed in both
-  base   100644 ef3e8258584a5459b069e2006db44c0a8b66412d filenames.gypi
-  our    100644 f57860558f06b7e5d8a50f48cfc7e53044df0bc6 filenames.gypi
-  their  100644 acd43c97988952b9a2760b44d366bd87134a1d65 filenames.gypi
-@@ -292,6 +292,8 @@
-       'atom/browser/net/http_protocol_handler.h',
-       'atom/browser/net/js_asker.cc',
-       'atom/browser/net/js_asker.h',
-+      'atom/browser/net/resolve_proxy_helper.cc',
-+      'atom/browser/net/resolve_proxy_helper.h',
-       'atom/browser/net/url_request_about_job.cc',
-       'atom/browser/net/url_request_about_job.h',
-       'atom/browser/net/url_request_async_asar_job.cc',
-changed in both
-  base   100644 381a2a866372ebe06f374529c634af411c864ba0 lib/browser/api/app.js
-  our    100644 66f6ae651acf10fb19b8ec068fc5280850dd3d91 lib/browser/api/app.js
-  their  100644 1ea1daddca84dfeba57b7b7883ebb754b8508d2d lib/browser/api/app.js
-changed in both
-  base   100644 22565dcf9875b7f00acff192b10b05d27d6446a7 lib/browser/api/browser-window.js
-  our    100644 cb523496d65c7018c30054621cfdeb1281f9db6a lib/browser/api/browser-window.js
-  their  100644 c5faa0a2c131d633e7aea3a1850abab958d22a1d lib/browser/api/browser-window.js
-changed in both
-  base   100644 da5ff57a113f7a063d1409ff56003db4bd04e68a lib/browser/api/menu.js
-  our    100644 506e3525c10ce142cafe3fc1bf4de1c255e48503 lib/browser/api/menu.js
-  their  100644 a87e0cd0436da2899b6402a06d370e755c2aac47 lib/browser/api/menu.js
-@@ -47,7 +47,11 @@
-   this.delegate = delegate
- }
- 
-+<<<<<<< .our
- Menu.prototype.popup = function (options = {}) {
-+=======
-+Menu.prototype.popup = function (options) {
-+>>>>>>> .their
-   if (options == null || typeof options !== 'object') {
-     throw new TypeError('Options must be an object')
-   }
-@@ -156,7 +160,11 @@
- 
- Menu.buildFromTemplate = function (template) {
-   if (!Array.isArray(template)) {
-+<<<<<<< .our
-     throw new TypeError('Invalid template for Menu: Menu template must be an array')
-+=======
-+    throw new TypeError('Invalid template for Menu')
-+>>>>>>> .their
-   }
-   const menu = new Menu()
-   if (!areValidTemplateItems(template)) {
-merged
-  result 100644 bbbc1bbe1727dd30352c4836cea489145cd7ad7d lib/browser/api/screen.js
-  our    100644 8287bfa8bfdc6db322a05059fd5c8ba58e802db9 lib/browser/api/screen.js
-@@ -1,8 +1,17 @@
- const {EventEmitter} = require('events')
-+const {deprecate} = require('electron')
- const {screen, Screen} = process.atomBinding('screen')
- 
- // Screen is an EventEmitter.
- Object.setPrototypeOf(Screen.prototype, EventEmitter.prototype)
- EventEmitter.call(screen)
- 
-+const nativeFn = screen.getMenuBarHeight
-+screen.getMenuBarHeight = function () {
-+  if (!process.noDeprecations) {
-+    deprecate.warn('screen.getMenuBarHeight', 'screen.getPrimaryDisplay().workArea')
-+  }
-+  return nativeFn.call(this)
-+}
-+
- module.exports = screen
-changed in both
-  base   100644 0338b776f8938c1548ea9786385fe75db9db3403 lib/browser/guest-view-manager.js
-  our    100644 1e4029e39a981c85fb6ff18c5ccd52f81b3c56f2 lib/browser/guest-view-manager.js
-  their  100644 169a4ac1d175e9bbbf8a3d8a01612e079c9df635 lib/browser/guest-view-manager.js
-@@ -316,6 +316,17 @@
- 
- ipcMain.on('ELECTRON_GUEST_VIEW_MANAGER_CREATE_GUEST_SYNC', function (event, params) {
-   event.returnValue = createGuest(event.sender, params)
-+<<<<<<< .our
-+=======
-+})
-+
-+ipcMain.on('ELECTRON_GUEST_VIEW_MANAGER_ATTACH_GUEST', function (event, elementInstanceId, guestInstanceId, params) {
-+  attachGuest(event, elementInstanceId, guestInstanceId, params)
-+})
-+
-+ipcMain.on('ELECTRON_GUEST_VIEW_MANAGER_DESTROY_GUEST', function (event, guestInstanceId) {
-+  destroyGuest(event.sender, guestInstanceId)
-+>>>>>>> .their
- })
- 
- ipcMain.on('ELECTRON_GUEST_VIEW_MANAGER_ATTACH_GUEST', function (event, embedderFrameId, elementInstanceId, guestInstanceId, params) {
-changed in both
-  base   100644 50e890e225a315718d04a0028fb6bf2feb4092ce lib/browser/guest-window-manager.js
-  our    100644 7253c1942b0956ae6b9b0c80a23470fc26669b8a lib/browser/guest-window-manager.js
-  their  100644 339b543dd485d3d708aa98a2eec834ab4d65da2b lib/browser/guest-window-manager.js
-@@ -65,7 +65,11 @@
-   // Inherit certain option values from parent window
-   const webPreferences = embedder.getLastWebPreferences()
-   for (const [name, value] of inheritedWebPreferences) {
-+<<<<<<< .our
-     if (webPreferences[name] === value) {
-+=======
-+    if (embedder.getLastWebPreferences()[name] === value) {
-+>>>>>>> .their
-       options.webPreferences[name] = value
-     }
-   }
-changed in both
-  base   100644 24a86fdfee7b87cd8ad177363aec26b438fe79b7 lib/browser/init.js
-  our    100644 bed3d912ab8be3ca4f21de04e801bb42dc12a528 lib/browser/init.js
-  their  100644 344bcf16dceafc99dcc337a0d9113c8e764c6364 lib/browser/init.js
-changed in both
-  base   100644 bfb9091e6584c43a19bf6283a79027274053239b lib/browser/objects-registry.js
-  our    100644 f03a23d2f6910d6555bb9469180d1b60b94bc313 lib/browser/objects-registry.js
-  their  100644 3fb0923df10da778f3e6bd096e771038fd026cb8 lib/browser/objects-registry.js
-@@ -15,7 +15,11 @@
-     this.storage = {}
- 
-     // Stores the IDs of objects referenced by WebContents.
-+<<<<<<< .our
-     // (ownerKey) => [id]
-+=======
-+    // (webContentsContextId) => [id]
-+>>>>>>> .their
-     this.owners = {}
-   }
- 
-@@ -26,10 +30,17 @@
-     const id = this.saveToStorage(obj)
- 
-     // Add object to the set of referenced objects.
-+<<<<<<< .our
-     const ownerKey = getOwnerKey(webContents, contextId)
-     let owner = this.owners[ownerKey]
-     if (!owner) {
-       owner = this.owners[ownerKey] = new Set()
-+=======
-+    const webContentsContextId = `${webContents.id}-${contextId}`
-+    let owner = this.owners[webContentsContextId]
-+    if (!owner) {
-+      owner = this.owners[webContentsContextId] = new Set()
-+>>>>>>> .their
-       this.registerDeleteListener(webContents, contextId)
-     }
-     if (!owner.has(id)) {
-@@ -50,8 +61,13 @@
-   // Note that an object may be double-freed (cleared when page is reloaded, and
-   // then garbage collected in old page).
-   remove (webContents, contextId, id) {
-+<<<<<<< .our
-     const ownerKey = getOwnerKey(webContents, contextId)
-     let owner = this.owners[ownerKey]
-+=======
-+    const webContentsContextId = `${webContents.id}-${contextId}`
-+    let owner = this.owners[webContentsContextId]
-+>>>>>>> .their
-     if (owner) {
-       // Remove the reference in owner.
-       owner.delete(id)
-@@ -62,13 +78,22 @@
- 
-   // Clear all references to objects refrenced by the WebContents.
-   clear (webContents, contextId) {
-+<<<<<<< .our
-     const ownerKey = getOwnerKey(webContents, contextId)
-     let owner = this.owners[ownerKey]
-+=======
-+    const webContentsContextId = `${webContents.id}-${contextId}`
-+    let owner = this.owners[webContentsContextId]
-+>>>>>>> .their
-     if (!owner) return
- 
-     for (let id of owner) this.dereference(id)
- 
-+<<<<<<< .our
-     delete this.owners[ownerKey]
-+=======
-+    delete this.owners[webContentsContextId]
-+>>>>>>> .their
-   }
- 
-   // Private: Saves the object into storage and assigns an ID for it.
-@@ -87,7 +112,10 @@
- 
-   // Private: Dereference the object from store.
-   dereference (id) {
-+<<<<<<< .our
-     // FIXME(MarshallOfSound): We should remove this once remote deref works well
-+=======
-+>>>>>>> .their
-     if (process.env.ELECTRON_DISABLE_REMOTE_DEREFERENCING) return
- 
-     let pointer = this.storage[id]
-@@ -101,7 +129,11 @@
-     }
-   }
- 
-+<<<<<<< .our
-   // Private: Clear the storage when renderer process is destroyed.
-+=======
-+  // Private: Clear the storage when renderer process is destoryed.
-+>>>>>>> .their
-   registerDeleteListener (webContents, contextId) {
-     const processId = webContents.getProcessId()
-     const listener = (event, deletedProcessId) => {
-changed in both
-  base   100644 c0cd09dea4273642aa780756985e9c90dbe164d3 lib/browser/rpc-server.js
-  our    100644 ff9f77321de3a4145946b67f3fe2a597f98e2510 lib/browser/rpc-server.js
-  their  100644 612ec274ca13cdb7167a41fbacb711c3cc6cb9c3 lib/browser/rpc-server.js
-@@ -84,7 +84,11 @@
- 
-   // Fill the meta object according to value's type.
-   if (meta.type === 'array') {
-+<<<<<<< .our
-     meta.members = value.map((el) => valueToMeta(sender, contextId, el, optimizeSimpleObject))
-+=======
-+    meta.members = value.map((el) => valueToMeta(sender, contextId, el))
-+>>>>>>> .their
-   } else if (meta.type === 'object' || meta.type === 'function') {
-     meta.name = value.constructor ? value.constructor.name : ''
- 
-@@ -210,9 +214,15 @@
-           return rendererFunctions.get(objectId)
-         }
- 
-+<<<<<<< .our
-         const processId = sender.getProcessId()
-         let callIntoRenderer = function (...args) {
-           if (!sender.isDestroyed() && processId === sender.getProcessId()) {
-+=======
-+        const webContentsId = sender.getId()
-+        let callIntoRenderer = function (...args) {
-+          if (!sender.isDestroyed() && webContentsId === sender.getId()) {
-+>>>>>>> .their
-             sender.send('ELECTRON_RENDERER_CALLBACK', contextId, meta.id, valueToMeta(sender, contextId, args))
-           } else {
-             removeRemoteListenersAndLogWarning(this, meta, callIntoRenderer)
-@@ -234,8 +244,14 @@
- // Call a function and send reply asynchronously if it's a an asynchronous
- // style function and the caller didn't pass a callback.
- const callFunction = function (event, contextId, func, caller, args) {
-+<<<<<<< .our
-   const funcMarkedAsync = v8Util.getHiddenValue(func, 'asynchronous')
-   const funcPassedCallback = typeof args[args.length - 1] === 'function'
-+=======
-+  let funcMarkedAsync, funcName, funcPassedCallback, ref, ret
-+  funcMarkedAsync = v8Util.getHiddenValue(func, 'asynchronous')
-+  funcPassedCallback = typeof args[args.length - 1] === 'function'
-+>>>>>>> .their
-   try {
-     if (funcMarkedAsync && !funcPassedCallback) {
-       args.push(function (ret) {
-@@ -243,7 +259,11 @@
-       })
-       func.apply(caller, args)
-     } else {
-+<<<<<<< .our
-       const ret = func.apply(caller, args)
-+=======
-+      ret = func.apply(caller, args)
-+>>>>>>> .their
-       event.returnValue = valueToMeta(event.sender, contextId, ret, true)
-     }
-   } catch (error) {
-@@ -302,7 +322,14 @@
-       throwRPCError(`Cannot call constructor on missing remote object ${id}`)
-     }
- 
-+<<<<<<< .our
-     event.returnValue = valueToMeta(event.sender, contextId, new constructor(...args))
-+=======
-+    // Call new with array of arguments.
-+    // http://stackoverflow.com/questions/1606797/use-of-apply-with-new-operator-is-this-possible
-+    let obj = new (Function.prototype.bind.apply(constructor, [null].concat(args)))()
-+    event.returnValue = valueToMeta(event.sender, contextId, obj)
-+>>>>>>> .their
-   } catch (error) {
-     event.returnValue = exceptionToMeta(event.sender, contextId, error)
-   }
-@@ -332,7 +359,14 @@
-       throwRPCError(`Cannot call constructor '${method}' on missing remote object ${id}`)
-     }
- 
-+<<<<<<< .our
-     event.returnValue = valueToMeta(event.sender, contextId, new object[method](...args))
-+=======
-+    // Call new with array of arguments.
-+    let constructor = object[method]
-+    let obj = new (Function.prototype.bind.apply(constructor, [null].concat(args)))()
-+    event.returnValue = valueToMeta(event.sender, contextId, obj)
-+>>>>>>> .their
-   } catch (error) {
-     event.returnValue = exceptionToMeta(event.sender, contextId, error)
-   }
-changed in both
-  base   100644 6dc774049def3acbd13b79dfd559c12d4eebd657 lib/common/api/crash-reporter.js
-  our    100644 1090d425e4c5cdf89a03d470718324ef16963472 lib/common/api/crash-reporter.js
-  their  100644 1b20fa52aab741e5dd34de7872f36798ec7c1c68 lib/common/api/crash-reporter.js
-changed in both
-  base   100644 1b9a993a2e67a00c073a9df9883c7adc3c2fcf65 lib/common/asar.js
-  our    100644 41c3d0c85c69954dddad53c674f84051f25372e4 lib/common/asar.js
-  their  100644 6565ddab86e0d11953cbbb000420535e95602a5e lib/common/asar.js
-changed in both
-  base   100644 a4f8072ed57642e1ca7d1066e132875da7ad3f46 lib/renderer/api/remote.js
-  our    100644 59117f8f2dd977fc1817a6b1d540b616ddcb0dae lib/renderer/api/remote.js
-  their  100644 4a38befb03cbdb560a3b34d8dd771d3d19c0bc3b lib/renderer/api/remote.js
-changed in both
-  base   100644 1cb69436dd479baf54b9805c04c0c31b20f24fad lib/renderer/init.js
-  our    100644 2470a5e8be80e770b0c03f6a439a71e72ae12a1b lib/renderer/init.js
-  their  100644 93129849ae048c1c09f943b56e78562f46be04e8 lib/renderer/init.js
-changed in both
-  base   100644 d2da884f1d9caf3d633de25837cb2128f564f2fb lib/renderer/security-warnings.js
-  our    100644 b24f9e28b879154457be0342b9d4b44c0e651253 lib/renderer/security-warnings.js
-  their  100644 4f7d6ef9e596cdc3a5c7e1f2b89b24b9cd67de1d lib/renderer/security-warnings.js
-changed in both
-  base   100644 110b0e453afd07210c9fba0f93d8755b5fbc1a93 lib/renderer/web-view/guest-view-internal.js
-  our    100644 6e42c769b70e5223fe97397f87144ec342882f8d lib/renderer/web-view/guest-view-internal.js
-  their  100644 f7c6232d41a52ff4c2af71350d4ae43c05a3b12a lib/renderer/web-view/guest-view-internal.js
-@@ -90,6 +90,16 @@
-   },
-   createGuestSync: function (params) {
-     return ipcRenderer.sendSync('ELECTRON_GUEST_VIEW_MANAGER_CREATE_GUEST_SYNC', params)
-+<<<<<<< .our
-+=======
-+  },
-+  attachGuest: function (elementInstanceId, guestInstanceId, params) {
-+    ipcRenderer.send('ELECTRON_GUEST_VIEW_MANAGER_ATTACH_GUEST', elementInstanceId, guestInstanceId, params)
-+    webFrame.attachGuest(elementInstanceId)
-+  },
-+  destroyGuest: function (guestInstanceId) {
-+    ipcRenderer.send('ELECTRON_GUEST_VIEW_MANAGER_DESTROY_GUEST', guestInstanceId)
-+>>>>>>> .their
-   },
-   attachGuest: function (elementInstanceId, guestInstanceId, params, contentWindow) {
-     const embedderFrameId = webFrame.getWebFrameId(contentWindow)
-changed in both
-  base   100644 16bfe7e61ac6e2c516f4523f2854a4f1db169c70 lib/renderer/web-view/web-view-attributes.js
-  our    100644 ad9970bd0b9355ac8163c82f6fa7f3ca08a05de6 lib/renderer/web-view/web-view-attributes.js
-  their  100644 204046bd60542657e9213f2b12e5c126ee10ea33 lib/renderer/web-view/web-view-attributes.js
-changed in both
-  base   100644 544652e44756fc63747a5cf58548b87363508b4a lib/renderer/web-view/web-view.js
-  our    100644 574a2b545597f9d1c05ec9b7147585063e90ae89 lib/renderer/web-view/web-view.js
-  their  100644 1e2ea0adf5d85af68dbdf0e976d68753b4ae2572 lib/renderer/web-view/web-view.js
-@@ -130,10 +130,60 @@
-     this.attributes[attributeName].handleMutation(oldValue, newValue)
-   }
- 
-+<<<<<<< .our
-   onElementResize () {
-     const resizeEvent = new Event('resize')
-     resizeEvent.newWidth = this.webviewNode.clientWidth
-     resizeEvent.newHeight = this.webviewNode.clientHeight
-+=======
-+  handleBrowserPluginAttributeMutation (attributeName, oldValue, newValue) {
-+    if (attributeName === webViewConstants.ATTRIBUTE_INTERNALINSTANCEID && !oldValue && !!newValue) {
-+      this.browserPluginNode.removeAttribute(webViewConstants.ATTRIBUTE_INTERNALINSTANCEID)
-+      this.internalInstanceId = parseInt(newValue)
-+
-+      // Track when the element resizes using the element resize callback.
-+      webFrame.registerElementResizeCallback(this.internalInstanceId, this.onElementResize.bind(this))
-+      if (this.guestInstanceId) {
-+        guestViewInternal.attachGuest(this.internalInstanceId, this.guestInstanceId, this.buildParams())
-+      }
-+    }
-+  }
-+
-+  onSizeChanged (webViewEvent) {
-+    const {newHeight, newWidth} = webViewEvent
-+    const node = this.webviewNode
-+    const width = node.offsetWidth
-+
-+    // Check the current bounds to make sure we do not resize <webview>
-+    // outside of current constraints.
-+    const maxWidth = this.attributes[webViewConstants.ATTRIBUTE_MAXWIDTH].getValue() | width
-+    const maxHeight = this.attributes[webViewConstants.ATTRIBUTE_MAXHEIGHT].getValue() | width
-+    let minWidth = this.attributes[webViewConstants.ATTRIBUTE_MINWIDTH].getValue() | width
-+    let minHeight = this.attributes[webViewConstants.ATTRIBUTE_MINHEIGHT].getValue() | width
-+    minWidth = Math.min(minWidth, maxWidth)
-+    minHeight = Math.min(minHeight, maxHeight)
-+    if (!this.attributes[webViewConstants.ATTRIBUTE_AUTOSIZE].getValue() || (newWidth >= minWidth && newWidth <= maxWidth && newHeight >= minHeight && newHeight <= maxHeight)) {
-+      node.style.width = `${newWidth}px`
-+      node.style.height = `${newHeight}px`
-+
-+      // Only fire the DOM event if the size of the <webview> has actually
-+      // changed.
-+      this.dispatchEvent(webViewEvent)
-+    }
-+  }
-+
-+  onElementResize (newSize) {
-+    // Dispatch the 'resize' event.
-+    const resizeEvent = new Event('resize')
-+
-+    // Using client size values, because when a webview is transformed `newSize`
-+    // is incorrect
-+    newSize.width = this.webviewNode.clientWidth
-+    newSize.height = this.webviewNode.clientHeight
-+
-+    resizeEvent.newWidth = newSize.width
-+    resizeEvent.newHeight = newSize.height
-+>>>>>>> .their
-     this.dispatchEvent(resizeEvent)
-   }
- 
-@@ -144,7 +194,10 @@
-   }
- 
-   createGuestSync () {
-+<<<<<<< .our
-     this.beforeFirstNavigation = false
-+=======
-+>>>>>>> .their
-     this.attachGuestInstance(guestViewInternal.createGuestSync(this.buildParams()))
-   }
- 
-changed in both
-  base   100644 119391e79462bfa8bb1494039bcb3522d97acead lib/sandboxed_renderer/init.js
-  our    100644 30a3fa55216f6bf7588c3accc07b150a31163b7c lib/sandboxed_renderer/init.js
-  their  100644 b45a105091446f1b1c3afd2f4905ccf7c0ef67b5 lib/sandboxed_renderer/init.js
-@@ -35,10 +35,13 @@
-   ['url', require('url')]
- ])
- 
-+<<<<<<< .our
- const {
-   preloadSrc, preloadError, process: processProps
- } = electron.ipcRenderer.sendSync('ELECTRON_BROWSER_SANDBOX_LOAD')
- 
-+=======
-+>>>>>>> .their
- require('../renderer/web-frame-init')()
- 
- // Pass different process object to the preload script(which should not have
-@@ -78,6 +81,7 @@
-   require('../renderer/inspector')
- }
- 
-+<<<<<<< .our
- if (binding.guestInstanceId) {
-   process.guestInstanceId = parseInt(binding.guestInstanceId)
- }
-@@ -88,6 +92,8 @@
-   require('../renderer/web-view/web-view-attributes')
- }
- 
-+=======
-+>>>>>>> .their
- // Wrap the script into a function executed in global scope. It won't have
- // access to the current scope, so we'll expose a few objects as arguments:
- //
-@@ -107,6 +113,7 @@
- // and any `require('electron')` calls in `preload.js` will work as expected
- // since browserify won't try to include `electron` in the bundle, falling back
- // to the `preloadRequire` function above.
-+<<<<<<< .our
- if (preloadSrc) {
-   const preloadWrapperSrc = `(function(require, process, Buffer, global, setImmediate, clearImmediate) {
-   ${preloadSrc}
-@@ -118,4 +125,18 @@
-   preloadFn(preloadRequire, preloadProcess, Buffer, global, setImmediate, clearImmediate)
- } else if (preloadError) {
-   console.error(preloadError.stack)
-+=======
-+if (preloadPath) {
-+  const preloadSrc = fs.readFileSync(preloadPath).toString()
-+  const preloadWrapperSrc = `(function(require, process, Buffer, global, setImmediate) {
-+  ${preloadSrc}
-+  })`
-+
-+  // eval in window scope:
-+  // http://www.ecma-international.org/ecma-262/5.1/#sec-10.4.2
-+  const geval = eval
-+  const preloadFn = geval(preloadWrapperSrc)
-+  const {setImmediate} = require('timers')
-+  preloadFn(preloadRequire, preloadProcess, Buffer, global, setImmediate)
-+>>>>>>> .their
- }
-changed in both
-  base   100755 8cb9ed8815f2a52964f6d7acfa30645908464c4f npm/install.js
-  our    100755 ed208de247ef151147c58d9efc4af9519e983f86 npm/install.js
-  their  100755 caa89deabeb8dc2ca28c2331cd8bcc28bb04cd52 npm/install.js
-@@ -23,6 +23,12 @@
-   process.exit(0)
- }
- 
-+var mirror
-+
-+if (version.indexOf('nightly') !== -1) {
-+  mirror = 'https://github.com/electron/nightlies/releases/download/v'
-+}
-+
- // downloads if not cached
- download({
-   cache: process.env.electron_config_cache,
-@@ -31,7 +37,8 @@
-   arch: process.env.npm_config_arch,
-   strictSSL: process.env.npm_config_strict_ssl === 'true',
-   force: process.env.force_no_cache === 'true',
--  quiet: process.env.npm_config_loglevel === 'silent' || process.env.CI
-+  quiet: process.env.npm_config_loglevel === 'silent' || process.env.CI,
-+  mirror
- }, extractFile)
- 
- // unzips and makes path.txt point at the correct executable
-changed in both
-  base   100644 9d3b0da9c80b223e4a1188311a1121796eb9f7ae package.json
-  our    100644 c081cd89450cd50efba1ec280ff1349a96ea3ce0 package.json
-  their  100644 5f07d696148bca95f5cea25505048fcf9ea64576 package.json
-@@ -1,6 +1,10 @@
- {
-   "name": "electron",
-+<<<<<<< .our
-   "version": "4.0.0-nightly.20180821",
-+=======
-+  "version": "2.0.8",
-+>>>>>>> .their
-   "repository": "https://github.com/electron/electron",
-   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
-   "devDependencies": {
-@@ -13,7 +17,11 @@
-     "dugite": "^1.45.0",
-     "electabul": "~0.0.4",
-     "electron-docs-linter": "^2.3.4",
-+<<<<<<< .our
-     "electron-typescript-definitions": "^1.3.6",
-+=======
-+    "electron-typescript-definitions": "1.3.2",
-+>>>>>>> .their
-     "github": "^9.2.0",
-     "html-entities": "^1.2.1",
-     "husky": "^0.14.3",
-@@ -25,8 +33,12 @@
-     "remark-cli": "^4.0.0",
-     "remark-preset-lint-markdown-style-guide": "^2.1.1",
-     "request": "^2.68.0",
-+<<<<<<< .our
-     "semver": "^5.5.0",
-     "serve": "^6.5.8",
-+=======
-+    "serve": "^6.5.3",
-+>>>>>>> .their
-     "standard": "^10.0.0",
-     "standard-markdown": "^4.0.0",
-     "sumchecker": "^2.0.2",
-changed in both
-  base   100755 4465b85c135ddb55a673c5180e15f05f09dac57e script/bootstrap.py
-  our    100755 e4aaf89e216b0164f15882a3040e8cac70bf1fd9 script/bootstrap.py
-  their  100755 c6ebe4ef6975efd1f6184159cc3d9d079bf3628d script/bootstrap.py
-changed in both
-  base   100755 c97cd8336f7d7980911d0bdea93137e7bc95ba24 script/build.py
-  our    100755 fb2b95d3bb71a25ce1ca58acf596afdc0f2cc5bd script/build.py
-  their  100755 2a2231394207c28fcd2b86d3d9f9b079b08d637e script/build.py
-@@ -40,6 +40,12 @@
-   if is_verbose_mode():
-     ninja.append('-v')
- 
-+<<<<<<< .our
-+=======
-+  args = parse_args()
-+  if args.ninja_path:
-+    ninja = args.ninja_path
-+>>>>>>> .their
-   if args.libcc:
-     if ('D' not in args.configuration
-         or not os.path.exists(GCLIENT_DONE)
-@@ -93,12 +99,15 @@
-   parser.add_argument('--ninja-path',
-                       help='Path of ninja command to use.',
-                       required=False)
-+<<<<<<< .our
-   parser.add_argument('--compdb',
-                       help=(
-                         'Generate JSON compilation database. This will not '
-                         'trigger actual build. '
-                       ),
-                       action='store_true', default=False)
-+=======
-+>>>>>>> .their
-   return parser.parse_args()
- 
- 
-changed in both
-  base   100755 de3b9ffd48156379afd677b98c40c97532cb8367 script/create-dist.py
-  our    100755 4a6c0c7ce8f275175e48c4c380ff33627f7a5961 script/create-dist.py
-  their  100755 e8396a2e6d242b9deba3b6a7642060584cd1a605 script/create-dist.py
-@@ -147,7 +147,11 @@
- 
-   # Copy file and keep the executable bit.
-   shutil.copyfile(src, dest)
-+<<<<<<< .our
-   add_exec_bit(dest)
-+=======
-+  os.chmod(dest, os.stat(dest).st_mode | stat.S_IEXEC)
-+>>>>>>> .their
- 
- def copy_vcruntime_binaries():
-   arch = get_target_arch()
-@@ -302,7 +306,11 @@
-     dest = os.path.join(DIST_DIR, binary)
-     # Copy file and keep the executable bit.
-     shutil.copyfile(src, dest)
-+<<<<<<< .our
-     add_exec_bit(dest)
-+=======
-+    os.chmod(dest, os.stat(dest).st_mode | stat.S_IEXEC)
-+>>>>>>> .their
- 
-     dist_name = get_zip_name(binary, version)
-     zip_file = os.path.join(SOURCE_ROOT, 'dist', dist_name)
-changed in both
-  base   100644 76f39fc26973e01145f7758785778075ddbaa648 script/lib/dbus_mock.py
-  our    100644 9b9c8029cb75a9d84c632d04f234c2020542ca68 script/lib/dbus_mock.py
-  their  100644 00b1fd98d7837cfef60460f9d456a5cb8340761c script/lib/dbus_mock.py
-@@ -4,21 +4,29 @@
- import atexit
- import os
- import sys
-+<<<<<<< .our
-+=======
-+
-+>>>>>>> .their
- 
- 
- def stop():
-     DBusTestCase.stop_dbus(DBusTestCase.system_bus_pid)
-     DBusTestCase.stop_dbus(DBusTestCase.session_bus_pid)
-+<<<<<<< .our
- 
- def start():
-     dbusmock_log = sys.stdout if is_verbose_mode() else open(os.devnull, 'w')
- 
-     DBusTestCase.start_system_bus()
-     DBusTestCase.spawn_server_template('logind', None, dbusmock_log)
-+=======
-+>>>>>>> .their
- 
-     DBusTestCase.start_session_bus()
-     DBusTestCase.spawn_server_template('notification_daemon', None, dbusmock_log)
- 
-+<<<<<<< .our
- if __name__ == '__main__':
-     import subprocess
-     start()
-@@ -26,3 +34,14 @@
-         subprocess.check_call(sys.argv[1:])
-     finally:
-         stop()
-+=======
-+atexit.register(cleanup)
-+
-+dbusmock_log = sys.stdout if is_verbose_mode() else open(os.devnull, 'w')
-+
-+DBusTestCase.start_system_bus()
-+DBusTestCase.spawn_server_template('logind', None, dbusmock_log)
-+
-+DBusTestCase.start_session_bus()
-+DBusTestCase.spawn_server_template('notification_daemon', None, dbusmock_log)
-+>>>>>>> .their
-changed in both
-  base   100644 492c9a411caa8ac47919d2cfb56fa73575ac7f29 script/lib/util.py
-  our    100644 d479d5a9556534c5d98ae1fdc97397cdd14376f5 script/lib/util.py
-  their  100644 de595f7275c67c790fa4f869eba997090086f3bc script/lib/util.py
-@@ -297,6 +297,7 @@
-     else:
-       execute_stdout(args, env)
- 
-+<<<<<<< .our
- def add_exec_bit(filename):
-   os.chmod(filename, os.stat(filename).st_mode | stat.S_IEXEC)
- 
-@@ -305,6 +306,13 @@
- 
- def is_stable(v):
-   return len(v.split(".")) == 3    
-+=======
-+def clean_parse_version(v):
-+  return parse_version(v.split("-")[0])
-+
-+def is_stable(v):
-+  return len(v.split(".")) == 3
-+>>>>>>> .their
- 
- def is_beta(v):
-   return 'beta' in v
-changed in both
-  base   100755 1f90ed795fcc3e739061cf4ae5c8ab9ea95a1236 script/test.py
-  our    100755 46cada435e1bd6ecaa2111cdf29e5aeb834b227e script/test.py
-  their  100755 cb17102557dca975208140b479168906100cfd74 script/test.py
-changed in both
-  base   100755 a35eb2f5b90272c8369bcfd511f976a4f64fa57f script/update-clang.sh
-  our    100755 0c7ab60533381e33152b8735aaccf41d5f0d6676 script/update-clang.sh
-  their  100755 f7dce574f11b2fa901ee27aa4ca0a1731a0d7b1e script/update-clang.sh
-@@ -8,10 +8,14 @@
- # Do NOT CHANGE this if you don't know what you're doing -- see
- # https://code.google.com/p/chromium/wiki/UpdatingClang
- # Reverting problematic clang rolls is safe, though.
-+<<<<<<< .our
- CLANG_REVISION=325667
-+=======
-+CLANG_REVISION=308728
-+>>>>>>> .their
- 
- # This is incremented when pushing a new build of Clang at the same revision.
--CLANG_SUB_REVISION=1
-+CLANG_SUB_REVISION=3
- 
- PACKAGE_VERSION="${CLANG_REVISION}-${CLANG_SUB_REVISION}"
- 
-changed in both
-  base   100755 4da630433812b51ff0ebbdf89f68c71d90ab8046 script/upload.py
-  our    100755 2d9eaa201265971ca01acaea6e84a440e5db0532 script/upload.py
-  their  100755 d58a22f4314346d48f1130dec04e5cc137e56397 script/upload.py
-@@ -37,7 +37,11 @@
-   args = parse_args()
-   if  args.upload_to_s3:
-     utcnow = datetime.datetime.utcnow()
-+<<<<<<< .our
-     args.upload_timestamp = utcnow.strftime('%Y%m%d')
-+=======
-+    args.upload_timestamp = utcnow.strftime('%Y-%m-%d_%H:%M:%S')
-+>>>>>>> .their
- 
-   if not dist_newer_than_head():
-     run_python_script('create-dist.py')
-@@ -79,6 +83,14 @@
-   upload_electron(release, os.path.join(DIST_DIR, chromedriver), args)
-   mksnapshot = get_zip_name('mksnapshot', ELECTRON_VERSION)
-   upload_electron(release, os.path.join(DIST_DIR, mksnapshot), args)
-+<<<<<<< .our
-+=======
-+
-+  if get_target_arch().startswith('arm'):
-+    # Upload the x64 binary for arm/arm64 mksnapshot
-+    mksnapshot = get_zip_name('mksnapshot', ELECTRON_VERSION, 'x64')
-+    upload_electron(release, os.path.join(DIST_DIR, mksnapshot), args)
-+>>>>>>> .their
- 
-   if get_target_arch().startswith('arm'):
-     # Upload the x64 binary for arm/arm64 mksnapshot
-@@ -170,7 +182,19 @@
-   # Upload the checksum file.
-   upload_sha256_checksum(args.version, file_path)
- 
-+<<<<<<< .our
-+
-+=======
-+  # Upload ARM assets without the v7l suffix for backwards compatibility
-+  # TODO Remove for 2.0
-+  if 'armv7l' in filename:
-+    arm_filename = filename.replace('armv7l', 'arm')
-+    arm_file_path = os.path.join(os.path.dirname(file_path), arm_filename)
-+    shutil.copy2(file_path, arm_file_path)
-+    upload_electron(release, arm_file_path, args)
-+
- 
-+>>>>>>> .their
- def upload_io_to_github(release, filename, filepath, version):
-   print 'Uploading %s to Github' % \
-       (filename)
-changed in both
-  base   100644 0eda951b15d6fff609b6612589e222adb4f0720e spec/api-app-spec.js
-  our    100644 d224eda2989332c18d655cef05a8bacc2eb6d4b8 spec/api-app-spec.js
-  their  100644 5c2e0a0c7e6184e780b7ec031f9788f1f54eaca9 spec/api-app-spec.js
-@@ -9,7 +9,10 @@
- const {ipcRenderer, remote} = require('electron')
- const {closeWindow} = require('./window-helpers')
- 
-+<<<<<<< .our
- const {expect} = chai
-+=======
-+>>>>>>> .their
- const {app, BrowserWindow, Menu, ipcMain} = remote
- 
- const isCI = remote.getGlobal('isCi')
-@@ -186,11 +189,19 @@
- 
-       // Singleton will send us greeting data to let us know it's running.
-       // After that, ask it to exit gracefully and confirm that it does.
-+<<<<<<< .our
-       appProcess.stdout.on('data', data => appProcess.kill())
-       appProcess.on('exit', (code, sig) => {
-         const message = `code:\n${code}\nsig:\n${sig}`
-         expect(code).to.equal(0, message)
-         expect(sig).to.be.null(message)
-+=======
-+      appProcess.stdout.on('data', (data) => appProcess.kill())
-+      appProcess.on('exit', (code, sig) => {
-+        let message = ['code:', code, 'sig:', sig].join('\n')
-+        assert.equal(code, 0, message)
-+        assert.equal(sig, null, message)
-+>>>>>>> .their
-         done()
-       })
-     })
-@@ -948,4 +959,18 @@
-       return expect(app.whenReady()).to.be.eventually.fulfilled
-     })
-   })
-+
-+  describe('dock.setMenu', () => {
-+    before(function () {
-+      if (process.platform !== 'darwin') {
-+        this.skip()
-+      }
-+    })
-+
-+    it('keeps references to the menu', () => {
-+      app.dock.setMenu(new Menu())
-+      const v8Util = process.atomBinding('v8_util')
-+      v8Util.requestGarbageCollectionForTesting()
-+    })
-+  })
- })
-changed in both
-  base   100644 ab96021ebf4c4360fa581b5a695249456a9afeda spec/api-browser-view-spec.js
-  our    100644 968912a4abf3d759a1363e2420d2c21b7923dbd6 spec/api-browser-view-spec.js
-  their  100644 df239a8914527a2d62f652b878c97a7791f63a9d spec/api-browser-view-spec.js
-@@ -44,9 +44,15 @@
-   describe('BrowserView.isDestroyed()', () => {
-     it('returns correct value', () => {
-       view = new BrowserView()
-+<<<<<<< .our
-       expect(view.isDestroyed()).to.be.false()
-       view.destroy()
-       expect(view.isDestroyed()).to.be.true()
-+=======
-+      assert.ok(!view.isDestroyed())
-+      view.destroy()
-+      assert.ok(view.isDestroyed())
-+>>>>>>> .their
-     })
-   })
- 
-changed in both
-  base   100644 3033eb6a1f6cca3cf4874a54dd217ec62d2d82cd spec/api-browser-window-spec.js
-  our    100644 f4cba12ec19d224bc46fca898db42a99baf4972e spec/api-browser-window-spec.js
-  their  100644 4807094095a591ca716d520aef51a25af6ff9687 spec/api-browser-window-spec.js
-@@ -409,12 +409,34 @@
-     })
-   })
- 
-+<<<<<<< .our
-   // TODO(alexeykuzmin): [Ch66] Enable the test. Passes locally.
-   xdescribe('BrowserWindow.getFocusedWindow()', (done) => {
-+=======
-+  describe('BrowserWindow.getFocusedWindow()', (done) => {
-+>>>>>>> .their
-     it('returns the opener window when dev tools window is focused', (done) => {
-       w.show()
-       w.webContents.once('devtools-focused', () => {
-         assert.deepEqual(BrowserWindow.getFocusedWindow(), w)
-+<<<<<<< .our
-+=======
-+        done()
-+      })
-+      w.webContents.openDevTools({mode: 'undocked'})
-+    })
-+  })
-+
-+  describe('BrowserWindow.capturePage(rect, callback)', () => {
-+    it('calls the callback with a Buffer', (done) => {
-+      w.capturePage({
-+        x: 0,
-+        y: 0,
-+        width: 100,
-+        height: 100
-+      }, (image) => {
-+        assert.equal(image.isEmpty(), true)
-+>>>>>>> .their
-         done()
-       })
-       w.webContents.openDevTools({mode: 'undocked'})
-@@ -453,6 +475,29 @@
-       // Values can be 0,2,3,4, or 6. We want 6, which is RGB + Alpha
-       expect(imgBuffer[25]).to.equal(6)
-     })
-+
-+    it('preserves transparency', (done) => {
-+      w.close()
-+      const width = 400
-+      const height = 400
-+      w = new BrowserWindow({
-+        show: false,
-+        width: width,
-+        height: height,
-+        transparent: true
-+      })
-+      w.loadURL('data:text/html,<html><body background-color: rgba(255,255,255,0)></body></html>')
-+      w.once('ready-to-show', () => {
-+        w.show()
-+        w.capturePage((image) => {
-+          let imgBuffer = image.toPNG()
-+          // Check 25th byte in the PNG
-+          // Values can be 0,2,3,4, or 6. We want 6, which is RGB + Alpha
-+          assert.equal(imgBuffer[25], 6)
-+          done()
-+        })
-+      })
-+    })
-   })
- 
-   describe('BrowserWindow.setSize(width, height)', () => {
-@@ -763,6 +808,7 @@
-         w.addTabbedWindow(w)
-       }, /AddTabbedWindow cannot be called by a window on itself./)
-     })
-+<<<<<<< .our
-   })
- 
-   describe('BrowserWindow.setWindowButtonVisibility()', () => {
-@@ -790,6 +836,8 @@
-         w.setWindowButtonVisibility(true)
-       }, /Not supported for this window/)
-     })
-+=======
-+>>>>>>> .their
-   })
- 
-   describe('BrowserWindow.setVibrancy(type)', () => {
-changed in both
-  base   100644 b4d55cd70b70b42d52a026ff7b4ff3c47d1671df spec/api-crash-reporter-spec.js
-  our    100644 dd31b91e1244785412b87db96bb141599e5ccb0f spec/api-crash-reporter-spec.js
-  their  100644 ffa3c0370595f32b0c7d476b82bea133d6a87000 spec/api-crash-reporter-spec.js
-@@ -266,6 +266,7 @@
-   describe('getLastCrashReport', () => {
-     it('correctly returns the most recent report', () => {
-       const reports = crashReporter.getUploadedReports()
-+<<<<<<< .our
-       expect(reports).to.be.an('array')
-       expect(reports).to.have.lengthOf.at.least(2,
-           'There are not enough reports for this test')
-@@ -275,16 +276,31 @@
- 
-       // Let's find the newest report.
-       const {report: newestReport} = reports.reduce((acc, cur) => {
-+=======
-+      const lastReport = crashReporter.getLastCrashReport()
-+
-+      // Let's find the newest report
-+      const newestReport = reports.reduce((acc, cur) => {
-+>>>>>>> .their
-         const timestamp = new Date(cur.date).getTime()
-         return (timestamp > acc.timestamp)
-           ? { report: cur, timestamp: timestamp }
-           : acc
-+<<<<<<< .our
-       }, { timestamp: -Infinity })
-       assert(newestReport, 'Hey!')
- 
-       expect(lastReport.date.getTime()).to.be.equal(
-           newestReport.date.getTime(),
-           'Last report is not the newest.')
-+=======
-+      }, { timestamp: 0 })
-+
-+      assert(reports.length > 1, 'has more than 1 report')
-+      assert(lastReport != null, 'found a last report')
-+      assert(lastReport.date.toString() === newestReport.report.date.toString(),
-+        'last report is correct')
-+>>>>>>> .their
-     })
-   })
- 
-changed in both
-  base   100644 667f098bc4b9974a142435e7d3ddb762ac0f54a2 spec/api-menu-spec.js
-  our    100644 ed2749700c6c8bf299f507d52606c1ae3f597e5c spec/api-menu-spec.js
-  their  100644 3efb6ed8745843bb7e221fe25b3c75761a085759 spec/api-menu-spec.js
-@@ -649,6 +649,7 @@
-     })
- 
-     it('throws an error if options is not an object', () => {
-+<<<<<<< .our
-       expect(() => {
-         menu.popup('this is a string, not an object')
-       }).to.throw(/Options must be an object/)
-@@ -658,6 +659,11 @@
-       expect(() => {
-         menu.popup({})
-       }).to.not.throw()
-+=======
-+      assert.throws(() => {
-+        menu.popup()
-+      }, /Options must be an object/)
-+>>>>>>> .their
-     })
- 
-     it('should emit menu-will-show event', (done) => {
-added in both
-  our    100644 9ab56d88e50ae5891364cb271362e5ec0c0edd26 spec/api-notification-dbus-spec.js
-  their  100644 81c1b68f31d0c9490742d3bd4b4227abaaf72ca3 spec/api-notification-dbus-spec.js
-@@ -6,7 +6,11 @@
- //
- // See https://pypi.python.org/pypi/python-dbusmock to read about dbusmock.
- 
-+<<<<<<< .our
- const {expect} = require('chai')
-+=======
-+const assert = require('assert')
-+>>>>>>> .their
- const dbus = require('dbus-native')
- const Promise = require('bluebird')
- 
-@@ -27,12 +31,20 @@
-   before(async () => {
-     // init app
-     app.setName(appName)
-+<<<<<<< .our
-     app.setDesktopName(`${appName}.desktop`)
-+=======
-+    app.setDesktopName(appName + '.desktop')
-+>>>>>>> .their
-     // init dbus
-     const path = '/org/freedesktop/Notifications'
-     const iface = 'org.freedesktop.DBus.Mock'
-     const bus = dbus.sessionBus()
-+<<<<<<< .our
-     console.log(`session bus: ${process.env.DBUS_SESSION_BUS_ADDRESS}`)
-+=======
-+    console.log('session bus: ' + process.env.DBUS_SESSION_BUS_ADDRESS)
-+>>>>>>> .their
-     const service = bus.getService(serviceName)
-     const getInterface = Promise.promisify(service.getInterface, {context: service})
-     mock = await getInterface(path, iface)
-@@ -48,10 +60,17 @@
-     app.setVersion(realAppVersion)
-   })
- 
-+<<<<<<< .our
-   describe(`Notification module using ${serviceName}`, () => {
-     function onMethodCalled (done) {
-       function cb (name) {
-         console.log(`onMethodCalled: ${name}`)
-+=======
-+  describe('Notification module using ' + serviceName, () => {
-+    function onMethodCalled (done) {
-+      function cb (name) {
-+        console.log('onMethodCalled: ' + name)
-+>>>>>>> .their
-         if (name === 'Notify') {
-           mock.removeListener('MethodCalled', cb)
-           console.log('done')
-@@ -83,7 +102,11 @@
-       }
-     }
- 
-+<<<<<<< .our
-     before(done => {
-+=======
-+    before((done) => {
-+>>>>>>> .their
-       mock.on('MethodCalled', onMethodCalled(done))
-       // lazy load Notification after we listen to MethodCalled mock signal
-       Notification = require('electron').remote.Notification
-@@ -98,6 +121,7 @@
-       n.show()
-     })
- 
-+<<<<<<< .our
-     it(`should call ${serviceName} to show notifications`, async () => {
-       const calls = await getCalls()
-       expect(calls).to.be.an('array').of.lengthOf.at.least(1)
-@@ -108,6 +132,16 @@
- 
-       let args = unmarshalDBusNotifyArgs(lastCall[2])
-       expect(args).to.deep.equal({
-+=======
-+    it('should call ' + serviceName + ' to show notifications', async () => {
-+      const calls = await getCalls()
-+      assert(calls.length >= 1)
-+      let lastCall = calls[calls.length - 1]
-+      let methodName = lastCall[1]
-+      assert.equal(methodName, 'Notify')
-+      let args = unmarshalDBusNotifyArgs(lastCall[2])
-+      assert.deepEqual(args, {
-+>>>>>>> .their
-         app_name: appName,
-         replaces_id: 0,
-         app_icon: '',
-changed in both
-  base   100644 122170292838e951ade4989669c87a7531e89ba7 spec/api-web-contents-spec.js
-  our    100644 be02cb3f84001a541d64b11fe6eda50fc32e8afd spec/api-web-contents-spec.js
-  their  100644 cbb45f5d84f1b11c8c27c56515d5daffa23d0c04 spec/api-web-contents-spec.js
-@@ -122,6 +122,7 @@
-     })
-   })
- 
-+<<<<<<< .our
-   // Disabled because flaky. See #13969
-   xdescribe('isCurrentlyAudible() API', () => {
-     it('returns whether audio is playing', async () => {
-@@ -138,6 +139,8 @@
-     })
-   })
- 
-+=======
-+>>>>>>> .their
-   describe('getWebPreferences() API', () => {
-     it('should not crash when called for devTools webContents', (done) => {
-       w.webContents.openDevTools()
-@@ -730,6 +733,7 @@
-     })
-   })
- 
-+<<<<<<< .our
-   describe('referrer', () => {
-     it('propagates referrer information to new target=_blank windows', (done) => {
-       const server = http.createServer((req, res) => {
-@@ -776,6 +780,8 @@
-     })
-   })
- 
-+=======
-+>>>>>>> .their
-   describe('webframe messages in sandboxed contents', () => {
-     it('responds to executeJavaScript', (done) => {
-       w.destroy()
-changed in both
-  base   100644 f87554f32e267b46fe3501405617a289b6cccedb spec/asar-spec.js
-  our    100644 489f68c96d41e80c308560a98486a07756a03be7 spec/asar-spec.js
-  their  100644 a82e73071e13d2289087d346a00ef62eacd71f6e spec/asar-spec.js
-@@ -900,6 +900,18 @@
-       })
-     })
- 
-+    describe('util.promisify', function () {
-+      it('can promisify all fs functions', function () {
-+        const originalFs = require('original-fs')
-+
-+        for (const key in originalFs) {
-+          if (originalFs[key][util.promisify.custom] && !fs[key][util.promisify.custom]) {
-+            assert(false, `fs.${key}[util.promisify.custom] missing`)
-+          }
-+        }
-+      })
-+    })
-+
-     describe('process.noAsar', function () {
-       var errorName = process.platform === 'win32' ? 'ENOENT' : 'ENOTDIR'
- 
-changed in both
-  base   100644 2d388ca3b5744ea69d96ef71da6ade70e3dd001b spec/chromium-spec.js
-  our    100644 d90269769d269e4054d25cba4b6c4ac8a1929aa6 spec/chromium-spec.js
-  their  100644 25bef2e689e5ecbcd1485a042e84691db9400659 spec/chromium-spec.js
-@@ -319,8 +319,12 @@
-       b = window.open(windowUrl, '', 'nodeIntegration=no,show=no')
-     })
- 
-+<<<<<<< .our
-     // TODO(codebytere): re-enable this test
-     xit('disables node integration when it is disabled on the parent window for chrome devtools URLs', (done) => {
-+=======
-+    it('disables node integration when it is disabled on the parent window for chrome devtools URLs', (done) => {
-+>>>>>>> .their
-       let b
-       app.once('web-contents-created', (event, contents) => {
-         contents.once('did-finish-load', () => {
-changed in both
-  base   100644 07176e0097efa17e8f8aea5bb059a2739b8c3336 spec/fixtures/api/singleton/main.js
-  our    100644 3202a7a180d6d48c70706d5ef244652872b24bbc spec/fixtures/api/singleton/main.js
-  their  100644 cbf3da1117d91eb8df1b1e6363737a210b7eae78 spec/fixtures/api/singleton/main.js
-@@ -3,8 +3,11 @@
- app.once('ready', () => {
-   console.log('started')  // ping parent
- })
-+<<<<<<< .our
- 
- const gotTheLock = app.requestSingleInstanceLock()
-+=======
-+>>>>>>> .their
- 
- app.on('second-instance', () => {
-   setImmediate(() => app.exit(0))
-changed in both
-  base   100644 cfe840ca0a44c5766509b2865034d98e375da1a1 spec/modules-spec.js
-  our    100644 b996b8f4839bff2160bffb69e55263b16a4178d7 spec/modules-spec.js
-  their  100644 28f2602acff67b2da9accd0574d64d386e0795a7 spec/modules-spec.js
-changed in both
-  base   100644 e2d7d001eb49a9b01edcf9590ccdcb7ac8cc669c spec/node-spec.js
-  our    100644 9bb03494a56ffacec075c40bebde39a3b57ac734 spec/node-spec.js
-  their  100644 2c849bc3a442f8d1f800efce17cde212fc676531 spec/node-spec.js
-changed in both
-  base   100644 feac23db7e06d3e49f8d5be7e9b3f08a204f262f spec/security-warnings-spec.js
-  our    100644 6315a9420e01b5db19596f0dd5731d47ce02acf6 spec/security-warnings-spec.js
-  their  100644 85fd0973b60cd6e27becbeef75415560b4061d24 spec/security-warnings-spec.js
-@@ -142,7 +142,11 @@
-       }
-     })
-     w.webContents.once('console-message', (e, level, message) => {
-+<<<<<<< .our
-       assert(message.includes('enableBlinkFeatures'), message)
-+=======
-+      assert(message.includes('blinkFeatures'), message)
-+>>>>>>> .their
-       done()
-     })
- 
-changed in both
-  base   100644 ca5cc28d4f9f860947454dfc964208dd13ba1434 spec/static/index.html
-  our    100644 fc1e153c0af2908cf7ee4c3ea4f05522de04f0f8 spec/static/index.html
-  their  100644 e9d779f061cd5bdf00667d0b7942c6c30de81092 spec/static/index.html
-@@ -51,7 +51,11 @@
-   if (!process.env.MOCHA_REPORTER) {
-     mocha.ui('bdd').reporter(isCi ? 'tap' : 'html')
-   }
--  mocha.timeout(isCi ? 30000 : 10000)
-+  if (process.env.MOCHA_TIMEOUT && process.env.MOCHA_TIMEOUT > 0) {
-+    mocha.timeout(process.env.MOCHA_TIMEOUT)
-+  } else {
-+    mocha.timeout(isCi ? 30000 : 10000)
-+  }
- 
-   const query = Mocha.utils.parseQuery(window.location.search || '')
-   if (query.grep) mocha.grep(query.grep)
-changed in both
-  base   100644 7050f3a7e43070e9c1ae924d1cd314ad8214e2d3 spec/static/main.js
-  our    100644 5659c44c8de4456a25e0026e29199b827c89cb08 spec/static/main.js
-  their  100644 6dc8a4550ebab1e0c5b562ab776d9f1a2a2d13d7 spec/static/main.js
-changed in both
-  base   100644 73df333dd2b24e1b32931498ebe41557c3d24d0e spec/webview-spec.js
-  our    100644 db75a4e3754e24a5e6740be61be4f4098c58006e spec/webview-spec.js
-  their  100644 dfb3965a5a56a99a8299eb2ae9016822421245a4 spec/webview-spec.js
-@@ -696,6 +696,7 @@
-   xdescribe('setDevToolsWebContents() API', () => {
-     it('sets webContents of webview as devtools', async () => {
-       const webview2 = new WebView()
-+<<<<<<< .our
-       loadWebView(webview2)
- 
-       // Setup an event handler for further usage.
-@@ -720,6 +721,24 @@
-       document.body.removeChild(webview2)
- 
-       expect(name).to.be.equal('InspectorFrontendHostImpl')
-+=======
-+      document.body.appendChild(webview2)
-+      webview2.addEventListener('dom-ready', () => {
-+        const devtools = webview2.getWebContents()
-+        assert.ok(devtools.getURL().startsWith('chrome-devtools://devtools'))
-+        devtools.executeJavaScript('InspectorFrontendHost.constructor.name', (name) => {
-+          assert.ok(name, 'InspectorFrontendHostImpl')
-+          document.body.removeChild(webview2)
-+          done()
-+        })
-+      })
-+      webview.addEventListener('dom-ready', () => {
-+        webview.getWebContents().setDevToolsWebContents(webview2.getWebContents())
-+        webview.getWebContents().openDevTools()
-+      })
-+      webview.src = 'about:blank'
-+      document.body.appendChild(webview)
-+>>>>>>> .their
-     })
-   })
- 
-@@ -1182,6 +1201,7 @@
- 
-   describe('will-attach-webview event', () => {
-     it('does not emit when src is not changed', (done) => {
-+<<<<<<< .our
-       loadWebView(webview)
-       setTimeout(() => {
-         const expectedErrorMessage =
-@@ -1189,6 +1209,21 @@
-             'The WebView must be attached to the DOM ' +
-             'and the dom-ready event emitted before this method can be called.'
-         expect(() => { webview.stop() }).to.throw(expectedErrorMessage)
-+=======
-+      document.body.appendChild(webview)
-+      setTimeout(() => {
-+        assert.throws(() => {
-+          webview.stop()
-+        }, 'Cannot call stop because the webContents is unavailable. The WebView must be attached to the DOM and the dom-ready event emitted before this method can be called.')
-+        done()
-+      })
-+    })
-+
-+    it('supports changing the web preferences', (done) => {
-+      ipcRenderer.send('disable-node-on-next-will-attach-webview')
-+      webview.addEventListener('console-message', (event) => {
-+        assert.equal(event.message, 'undefined undefined undefined undefined')
-+>>>>>>> .their
-         done()
-       })
-     })
-@@ -1251,9 +1286,260 @@
- 
-     w.loadURL(`file://${fixtures}/pages/webview-devtools.html`)
- 
-+<<<<<<< .our
-     const [, {runtimeId, tabId}] = await emittedOnce(ipcMain, 'answer')
-     expect(runtimeId).to.equal('foo')
-     expect(tabId).to.be.not.equal(w.webContents.id)
-+=======
-+    ipcMain.once('answer', (event, message) => {
-+      assert.equal(message.runtimeId, 'foo')
-+      assert.notEqual(message.tabId, w.webContents.id)
-+      done()
-+    })
-+  })
-+
-+  describe('guestinstance attribute', () => {
-+    it('before loading there is no attribute', () => {
-+      document.body.appendChild(webview)
-+      assert(!webview.hasAttribute('guestinstance'))
-+    })
-+
-+    it('loading a page sets the guest view', (done) => {
-+      const loadListener = () => {
-+        webview.removeEventListener('did-finish-load', loadListener, false)
-+        const instance = webview.getAttribute('guestinstance')
-+        assert.equal(instance, parseInt(instance))
-+
-+        const guest = getGuestWebContents(parseInt(instance))
-+        assert.equal(guest, webview.getWebContents())
-+        done()
-+      }
-+      webview.addEventListener('did-finish-load', loadListener, false)
-+      webview.src = `file://${fixtures}/api/blank.html`
-+      document.body.appendChild(webview)
-+    })
-+
-+    it('deleting the attribute destroys the webview', (done) => {
-+      const loadListener = () => {
-+        webview.removeEventListener('did-finish-load', loadListener, false)
-+        const destroyListener = () => {
-+          webview.removeEventListener('destroyed', destroyListener, false)
-+          assert.equal(getGuestWebContents(instance), null)
-+          done()
-+        }
-+        webview.addEventListener('destroyed', destroyListener, false)
-+
-+        const instance = parseInt(webview.getAttribute('guestinstance'))
-+        webview.removeAttribute('guestinstance')
-+      }
-+      webview.addEventListener('did-finish-load', loadListener, false)
-+      webview.src = `file://${fixtures}/api/blank.html`
-+      document.body.appendChild(webview)
-+    })
-+
-+    it('setting the attribute on a new webview moves the contents', (done) => {
-+      const loadListener = () => {
-+        webview.removeEventListener('did-finish-load', loadListener, false)
-+        const webContents = webview.getWebContents()
-+        const instance = webview.getAttribute('guestinstance')
-+
-+        const destroyListener = () => {
-+          webview.removeEventListener('destroyed', destroyListener, false)
-+          assert.equal(webContents, webview2.getWebContents())
-+          // Make sure that events are hooked up to the right webview now
-+          webview2.addEventListener('console-message', (e) => {
-+            assert.equal(e.message, 'a')
-+            document.body.removeChild(webview2)
-+            done()
-+          })
-+
-+          webview2.src = `file://${fixtures}/pages/a.html`
-+        }
-+        webview.addEventListener('destroyed', destroyListener, false)
-+
-+        const webview2 = new WebView()
-+        webview2.setAttribute('guestinstance', instance)
-+        document.body.appendChild(webview2)
-+      }
-+      webview.addEventListener('did-finish-load', loadListener, false)
-+      webview.src = `file://${fixtures}/api/blank.html`
-+      document.body.appendChild(webview)
-+    })
-+
-+    it('setting the attribute to an invalid guestinstance does nothing', (done) => {
-+      const loadListener = () => {
-+        webview.removeEventListener('did-finish-load', loadListener, false)
-+        webview.setAttribute('guestinstance', 55)
-+
-+        // Make sure that events are still hooked up to the webview
-+        webview.addEventListener('console-message', (e) => {
-+          assert.equal(e.message, 'a')
-+          done()
-+        })
-+        webview.src = `file://${fixtures}/pages/a.html`
-+      }
-+      webview.addEventListener('did-finish-load', loadListener, false)
-+
-+      webview.src = `file://${fixtures}/api/blank.html`
-+      document.body.appendChild(webview)
-+    })
-+
-+    it('setting the attribute on an existing webview moves the contents', (done) => {
-+      const load1Listener = () => {
-+        webview.removeEventListener('did-finish-load', load1Listener, false)
-+        const webContents = webview.getWebContents()
-+        const instance = webview.getAttribute('guestinstance')
-+        let destroyedInstance
-+
-+        const destroyListener = () => {
-+          webview.removeEventListener('destroyed', destroyListener, false)
-+          assert.equal(webContents, webview2.getWebContents())
-+          assert.equal(null, getGuestWebContents(parseInt(destroyedInstance)))
-+
-+          // Make sure that events are hooked up to the right webview now
-+          webview2.addEventListener('console-message', (e) => {
-+            assert.equal(e.message, 'a')
-+            document.body.removeChild(webview2)
-+            done()
-+          })
-+
-+          webview2.src = 'file://' + fixtures + '/pages/a.html'
-+        }
-+        webview.addEventListener('destroyed', destroyListener, false)
-+
-+        const webview2 = new WebView()
-+        const load2Listener = () => {
-+          webview2.removeEventListener('did-finish-load', load2Listener, false)
-+          destroyedInstance = webview2.getAttribute('guestinstance')
-+          assert.notEqual(instance, destroyedInstance)
-+
-+          webview2.setAttribute('guestinstance', instance)
-+        }
-+        webview2.addEventListener('did-finish-load', load2Listener, false)
-+        webview2.src = 'file://' + fixtures + '/api/blank.html'
-+        document.body.appendChild(webview2)
-+      }
-+      webview.addEventListener('did-finish-load', load1Listener, false)
-+      webview.src = 'file://' + fixtures + '/api/blank.html'
-+      document.body.appendChild(webview)
-+    })
-+
-+    it('moving a guest back to its original webview should work', (done) => {
-+      const loadListener = () => {
-+        webview.removeEventListener('did-finish-load', loadListener, false)
-+        const webContents = webview.getWebContents()
-+        const instance = webview.getAttribute('guestinstance')
-+
-+        const destroy1Listener = () => {
-+          webview.removeEventListener('destroyed', destroy1Listener, false)
-+          assert.equal(webContents, webview2.getWebContents())
-+          assert.notStrictEqual(webContents, webview.getWebContents())
-+
-+          const destroy2Listener = () => {
-+            webview2.removeEventListener('destroyed', destroy2Listener, false)
-+            assert.equal(webContents, webview.getWebContents())
-+            assert.notStrictEqual(webContents, webview2.getWebContents())
-+
-+            // Make sure that events are hooked up to the right webview now
-+            webview.addEventListener('console-message', (e) => {
-+              assert.equal(e.message, 'a')
-+              document.body.removeChild(webview2)
-+              done()
-+            })
-+
-+            webview.src = `file://${fixtures}/pages/a.html`
-+          }
-+          webview2.addEventListener('destroyed', destroy2Listener, false)
-+          webview.setAttribute('guestinstance', instance)
-+        }
-+        webview.addEventListener('destroyed', destroy1Listener, false)
-+
-+        const webview2 = new WebView()
-+        webview2.setAttribute('guestinstance', instance)
-+        document.body.appendChild(webview2)
-+      }
-+      webview.addEventListener('did-finish-load', loadListener, false)
-+      webview.src = `file://${fixtures}/api/blank.html`
-+      document.body.appendChild(webview)
-+    })
-+
-+    it('setting the attribute on a webview in a different window moves the contents', (done) => {
-+      const loadListener = () => {
-+        webview.removeEventListener('did-finish-load', loadListener, false)
-+        const instance = webview.getAttribute('guestinstance')
-+
-+        w = new BrowserWindow({ show: false })
-+        w.webContents.once('did-finish-load', () => {
-+          ipcMain.once('pong', () => {
-+            assert(!webview.hasAttribute('guestinstance'))
-+            done()
-+          })
-+
-+          w.webContents.send('guestinstance', instance)
-+        })
-+        w.loadURL(`file://${fixtures}/pages/webview-move-to-window.html`)
-+      }
-+      webview.addEventListener('did-finish-load', loadListener, false)
-+      webview.src = `file://${fixtures}/api/blank.html`
-+      document.body.appendChild(webview)
-+    })
-+
-+    it('does not delete the guestinstance attribute when moving the webview to another parent node', (done) => {
-+      webview.addEventListener('dom-ready', function domReadyListener () {
-+        webview.addEventListener('did-attach', () => {
-+          assert(webview.guestinstance != null)
-+          assert(webview.getWebContents() != null)
-+          done()
-+        })
-+
-+        document.body.replaceChild(webview, div)
-+      })
-+      webview.src = `file://${fixtures}/pages/a.html`
-+
-+      const div = document.createElement('div')
-+      div.appendChild(webview)
-+      document.body.appendChild(div)
-+    })
-+
-+    it('does not destroy the webContents when hiding/showing the webview (regression)', (done) => {
-+      webview.addEventListener('dom-ready', function domReadyListener () {
-+        const instance = webview.getAttribute('guestinstance')
-+        assert(instance != null)
-+
-+        // Wait for event directly since attach happens asynchronously over IPC
-+        ipcMain.once('ELECTRON_GUEST_VIEW_MANAGER_ATTACH_GUEST', () => {
-+          assert(webview.getWebContents() != null)
-+          assert.equal(instance, webview.getAttribute('guestinstance'))
-+          done()
-+        })
-+
-+        webview.style.display = 'none'
-+        webview.offsetHeight // eslint-disable-line
-+        webview.style.display = 'block'
-+      })
-+      webview.src = `file://${fixtures}/pages/a.html`
-+      document.body.appendChild(webview)
-+    })
-+
-+    it('does not reload the webContents when hiding/showing the webview (regression)', (done) => {
-+      webview.addEventListener('dom-ready', function domReadyListener () {
-+        webview.addEventListener('did-start-loading', () => {
-+          done(new Error('webview started loading unexpectedly'))
-+        })
-+
-+        // Wait for event directly since attach happens asynchronously over IPC
-+        webview.addEventListener('did-attach', () => {
-+          done()
-+        })
-+
-+        webview.style.display = 'none'
-+        webview.offsetHeight  // eslint-disable-line
-+        webview.style.display = 'block'
-+      })
-+      webview.src = `file://${fixtures}/pages/a.html`
-+      document.body.appendChild(webview)
-+    })
-+>>>>>>> .their
-   })
- 
-   describe('DOM events', () => {
-changed in both
-  base   100644 6580f18a1ad9e53ab3f2ae88cb7ea023bcf9579c toolchain.gypi
-  our    100644 697add78e42191741cee1b015cdcf4f801c570e7 toolchain.gypi
-  their  100644 8ed945a57c8875bae06cef74dc5d44afcc586d1d toolchain.gypi
-changed in both
-  base   160000 db1b314c019f6acbd4d1be273b63521cc6051d3c vendor/libchromiumcontent
-  our    160000 c85470a1c379b1c4bedb372c146521bc4be9b75d vendor/libchromiumcontent
-  their  160000 657a0c84482e296e2a4df63b49e4638faa8fee72 vendor/libchromiumcontent
-removed in local
-  base   160000 99d9e262eb36cb9dc8e83f61e026d2a7ad1e96ab vendor/native_mate
-  their  160000 6a3d238b7e1e3742f2bb495336a84021d927a24f vendor/native_mate
-changed in both
-  base   160000 bf06b641574a6e2a8357ca4b44defac4a83f1dda vendor/node
-  our    160000 ece0a06ac8147efb5b5af431c21f312f1884616e vendor/node
-  their  160000 f2bcc6b58293287e2a6e592bd296aa55bb37b801 vendor/node
-added in both
-  our    100644 84bd69c2b2868ac23bc30061aa208ad38fbb9506 vsts.yml
-  their  100644 aaee2e6522650cd470f09e43b74b4d0a126c2128 vsts.yml
-@@ -59,7 +59,11 @@
- - bash: |
-     echo 'Verifying ffmpeg on build'
-     if [ "$ELECTRON_RELEASE" == "1" ]; then
-+<<<<<<< .our
-       script/verify-ffmpeg.py -c R
-+=======
-+      script/verify-ffmpeg.py -R
-+>>>>>>> .their
-     else
-       script/verify-ffmpeg.py
-     fi
-@@ -69,6 +73,7 @@
- - task: PublishTestResults@2
-   displayName: Publish Test Results
-   inputs:
-+<<<<<<< .our
-     testResultsFiles: '**/test-*.xml'
-   condition: and(always(), eq(variables['MOCHA_FILE'], 'test-results.xml'))
- 
-@@ -93,5 +98,18 @@
-   inputs:
-     PathtoPublish: '$(Build.SourcesDirectory)/out'
-     ArtifactName: out
-+=======
-+    testResultsFiles: 'test-results.xml'
-+    searchFolder: junit
-+  condition: and(always(), ne(variables['ELECTRON_RELEASE'], '1'))
-+
-+- task: kasunkodagoda.slack-notification.slack-notification-task.SlackNotification@3
-+  displayName: Post Slack Notification
-+  inputs:
-+    SlackApiToken: '$(slack_token)'
-+    Channel: '#bot-nightly-releases'
-+    Message: '$(Build.DefinitionName)-$(Build.BuildNumber) finished with a $(Agent.JobStatus) status.'
-+  condition: and(always(), eq(variables['Build.Reason'], 'Schedule'))
-+>>>>>>> .their
- 
- - task: mspremier.PostBuildCleanup.PostBuildCleanup-task.PostBuildCleanup@3
diff --git a/app/test/fixtures/merge-parser/electron/merge-2-1-x-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-2-1-x-into-master.txt
deleted file mode 100644
index 6209c33677c..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-2-1-x-into-master.txt
+++ /dev/null
@@ -1,7326 +0,0 @@
-changed in both
-  base   100644 d4f98eab95b73b59018f170b09b9132d4d03477b .circleci/config.yml
-  our    100644 6d44d618aabcce04c60344f2274dec5b0c2a1f68 .circleci/config.yml
-  their  100644 8d065e3f257178d4706dcbd1340326be42b2e2e2 .circleci/config.yml
-@@ -19,6 +19,7 @@
-       fi
-     when: on_success
- 
-+<<<<<<< .our
- build-steps: &build-steps
-   steps:
-     - checkout
-@@ -92,6 +93,13 @@
-           fi
-     - run:
-         name: Test
-+=======
-+version: 2
-+jobs:
-+  electron-linux-arm:
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+>>>>>>> .their
-         environment:
-           MOCHA_FILE: junit/test-results.xml
-           MOCHA_REPORTER: mocha-junit-reporter
-@@ -110,6 +118,7 @@
-                 echo 'Skipping tests on GitHub release'
-               fi
-             fi
-+<<<<<<< .our
-           else
-            echo 'Skipping tests due to configuration'
-           fi
-@@ -117,6 +126,76 @@
-         name: Verify FFmpeg
-         command: |
-           if [ "$RUN_TESTS" == "true" ]; then
-+=======
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Optionally finish release
-+          shell: /bin/sh
-+          command: |
-+            if [ "$ELECTRON_RELEASE" == "1" ] && [ "$AUTO_RELEASE" == "true" ]; then
-+              echo 'Trying to finish release'
-+              node script/release.js --validateRelease --automaticRelease
-+              releaseExitCode=$?
-+              if [ $releaseExitCode -eq 0 ]; then
-+                echo 'Release is ready to go; releasing'
-+                node script/release.js--automaticRelease
-+                if [ $releaseExitCode -eq 0 ]; then
-+                  echo 'Release successful, now publishing to npm'
-+                  echo "//registry.npmjs.org/:_authToken=$ELECTRON_NPM_TOKEN" >> ~/.npmrc
-+                  npm run publish-to-npm
-+                  echo 'Release has been published to npm'
-+                fi
-+              else
-+                echo 'Release is not complete, skipping publish for now'
-+              fi
-+            else
-+              echo 'Skipping finishing release because build is not for release'
-+            fi
-+      - run:
-+          name: Zip out directory
-+          command: |
-+>>>>>>> .their
-             if [ "$ELECTRON_RELEASE" != "1" ]; then
-               echo 'Verifying ffmpeg on debug build'
-               script/verify-ffmpeg.py
-@@ -391,11 +470,105 @@
-     resource_class: 2xlarge
- 
-   electron-linux-arm64:
-+<<<<<<< .our
-     environment:
-       TARGET_ARCH: arm64
-     <<: *build-defaults
-     resource_class: 2xlarge
- 
-+=======
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: arm64
-+    resource_class: 2xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Optionally finish release
-+          shell: /bin/sh
-+          command: |
-+            if [ "$ELECTRON_RELEASE" == "1" ] && [ "$AUTO_RELEASE" == "true" ]; then
-+              echo 'Trying to finish release'
-+              node script/release.js --validateRelease --automaticRelease
-+              releaseExitCode=$?
-+              if [ $releaseExitCode -eq 0 ]; then
-+                echo 'Release is ready to go; releasing'
-+                node script/release.js--automaticRelease
-+                if [ $releaseExitCode -eq 0 ]; then
-+                  echo 'Release successful, now publishing to npm'
-+                  echo "//registry.npmjs.org/:_authToken=$ELECTRON_NPM_TOKEN" >> ~/.npmrc
-+                  npm run publish-to-npm
-+                  echo 'Release has been published to npm'
-+                fi
-+              else
-+                echo 'Release is not complete, skipping publish for now'
-+              fi
-+            else
-+              echo 'Skipping finishing release because build is not for release'
-+            fi
-+      - run:
-+          name: Zip out directory
-+          command: |
-+            if [ "$ELECTRON_RELEASE" != "1" ]; then
-+              zip -r electron.zip out/D
-+            fi
-+      - persist_to_workspace:
-+          root: /home/builduser
-+          paths:
-+            - project/out
-+      - store_artifacts:
-+          path: electron.zip
-+>>>>>>> .their
-   electron-linux-arm64-test:
-     machine: true
-     steps:
-@@ -430,6 +603,7 @@
-     resource_class: 2xlarge
- 
-   electron-linux-ia32:
-+<<<<<<< .our
-     environment:
-       TARGET_ARCH: ia32
-       DISPLAY: ':99.0'
-@@ -469,10 +643,317 @@
-       NIGHTLY_BUILD: true
-     <<: *build-defaults
-     resource_class: xlarge
-+=======
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: ia32
-+          DISPLAY: ':99.0'
-+    resource_class: xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Setup for headless testing
-+          command: sh -e /etc/init.d/xvfb start
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Optionally finish release
-+          shell: /bin/sh
-+          command: |
-+            if [ "$ELECTRON_RELEASE" == "1" ] && [ "$AUTO_RELEASE" == "true" ]; then
-+              echo 'Trying to finish release'
-+              node script/release.js --validateRelease --automaticRelease
-+              releaseExitCode=$?
-+              if [ $releaseExitCode -eq 0 ]; then
-+                echo 'Release is ready to go; releasing'
-+                node script/release.js--automaticRelease
-+                if [ $releaseExitCode -eq 0 ]; then
-+                  echo 'Release successful, now publishing to npm'
-+                  echo "//registry.npmjs.org/:_authToken=$ELECTRON_NPM_TOKEN" >> ~/.npmrc
-+                  npm run publish-to-npm
-+                  echo 'Release has been published to npm'
-+                fi
-+              else
-+                echo 'Release is not complete, skipping publish for now'
-+              fi
-+            else
-+              echo 'Skipping finishing release because build is not for release'
-+            fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                out/D/electron --version
-+                mkdir junit
-+                script/test.py --ci --rebuild_native_modules
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+  electron-linux-mips64el:
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: mips64el
-+    resource_class: xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Optionally finish release
-+          shell: /bin/sh
-+          command: |
-+            if [ "$ELECTRON_RELEASE" == "1" ] && [ "$AUTO_RELEASE" == "true" ]; then
-+              echo 'Trying to finish release'
-+              node script/release.js --validateRelease --automaticRelease
-+              releaseExitCode=$?
-+              if [ $releaseExitCode -eq 0 ]; then
-+                echo 'Release is ready to go; releasing'
-+                node script/release.js--automaticRelease
-+                if [ $releaseExitCode -eq 0 ]; then
-+                  echo 'Release successful, now publishing to npm'
-+                  echo "//registry.npmjs.org/:_authToken=$ELECTRON_NPM_TOKEN" >> ~/.npmrc
-+                  npm run publish-to-npm
-+                  echo 'Release has been published to npm'
-+                fi
-+              else
-+                echo 'Release is not complete, skipping publish for now'
-+              fi
-+            else
-+              echo 'Skipping finishing release because build is not for release'
-+            fi
-+
-+  electron-linux-x64:
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: x64
-+          DISPLAY: ':99.0'
-+    resource_class: xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Setup for headless testing
-+          command: sh -e /etc/init.d/xvfb start
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Optionally finish release
-+          shell: /bin/sh
-+          command: |
-+            if [ "$ELECTRON_RELEASE" == "1" ] && [ "$AUTO_RELEASE" == "true" ]; then
-+              echo 'Trying to finish release'
-+              node script/release.js --validateRelease --automaticRelease
-+              releaseExitCode=$?
-+              if [ $releaseExitCode -eq 0 ]; then
-+                echo 'Release is ready to go; releasing'
-+                node script/release.js--automaticRelease
-+                if [ $releaseExitCode -eq 0 ]; then
-+                  echo 'Release successful, now publishing to npm'
-+                  echo "//registry.npmjs.org/:_authToken=$ELECTRON_NPM_TOKEN" >> ~/.npmrc
-+                  npm run publish-to-npm
-+                  echo 'Release has been published to npm'
-+                fi
-+              else
-+                echo 'Release is not complete, skipping publish for now'
-+              fi
-+            else
-+              echo 'Skipping finishing release because build is not for release'
-+            fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                mkdir junit
-+                script/test.py --ci --rebuild_native_modules
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+      - run:
-+          name: Generate Typescript Definitions
-+          command: npm run create-typescript-definitions
-+      - store_test_results:
-+          path: junit
-+      - store_artifacts:
-+          path: junit
-+      - store_artifacts:
-+          path: out/electron.d.ts
-+      - store_artifacts:
-+          path: out/electron-api.json
-+>>>>>>> .their
- 
-   electron-osx-x64:
-     environment:
-       TARGET_ARCH: x64
-+<<<<<<< .our
-       RUN_TESTS: true
-       INSTALL_MACOS_NODE: true
-     macos:
-@@ -488,11 +969,107 @@
-     macos:
-       xcode: "8.3.3"
-     <<: *build-steps
-+=======
-+    macos:
-+        xcode: "9.0"
-+    steps:
-+      - checkout
-+      - run:
-+          name: Reclaim disk space
-+          command: |
-+            df -h
-+            sudo rm -rf /Library/Developer/CoreSimulator
-+            df -h
-+            sysctl -n hw.ncpu
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                mkdir junit
-+                script/test.py --ci --rebuild_native_modules
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+      - run:
-+          name: Generate Typescript Definitions
-+          command: npm run create-typescript-definitions
-+      - store_test_results:
-+          path: junit
-+      - store_artifacts:
-+          path: junit
-+      - store_artifacts:
-+          path: out/electron.d.ts
-+      - store_artifacts:
-+          path: out/electron-api.json
-+>>>>>>> .their
- 
-   electron-mas-x64:
-     environment:
-       TARGET_ARCH: x64
-       MAS_BUILD: 1
-+<<<<<<< .our
-       RUN_TESTS: true
-       INSTALL_MACOS_NODE: true
-     macos:
-@@ -668,6 +1245,101 @@
-       GN_EXTRA_ARGS: 'is_mas_build = true'
-     <<: *gn-mac-build-machine
-     <<: *gn-mac-build-steps
-+=======
-+    macos:
-+        xcode: "9.0"
-+    steps:
-+      - checkout
-+      - run:
-+          name: Reclaim disk space
-+          command: |
-+            df -h
-+            sudo rm -rf /Library/Developer/CoreSimulator
-+            df -h
-+            sysctl -n hw.ncpu
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                mkdir junit
-+                script/test.py --ci --rebuild_native_modules
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+      - run:
-+          name: Generate Typescript Definitions
-+          command: npm run create-typescript-definitions
-+      - store_test_results:
-+          path: junit
-+      - store_artifacts:
-+          path: junit
-+      - store_artifacts:
-+          path: out/electron.d.ts
-+      - store_artifacts:
-+          path: out/electron-api.json
-+>>>>>>> .their
- 
- workflows:
-   version: 2
-@@ -695,6 +1367,7 @@
-   build-mas-x64:
-     jobs:
-       - electron-mas-x64
-+<<<<<<< .our
-   build-gn-linux:
-     jobs:
-       - electron-gn-linux-x64-debug-fyi
-@@ -745,3 +1418,5 @@
-       - electron-gn-linux-arm64-release-fyi
-       - electron-gn-mas-release-fyi
-       - electron-gn-osx-release-fyi
-+=======
-+>>>>>>> .their
-changed in both
-  base   100644 8632e8e30869d32176552cd218560f5016a24300 .gitignore
-  our    100644 f393b1cdcef87b41bb3ed47ebae59757fed3a780 .gitignore
-  their  100644 f82d92052e4f7ac936637ac2c163633e02588f12 .gitignore
-changed in both
-  base   100644 5d04da05397c4c74ce00d6d6c8969ce370adb32d CONTRIBUTING.md
-  our    100644 414f83db905db904728facf3b40e70e7b7973193 CONTRIBUTING.md
-  their  100644 0955f68c4f2b1097e770398cf51d3af811f53050 CONTRIBUTING.md
-changed in both
-  base   100644 4cfea0e70f9af56ba746347b4cae410970f3d900 Dockerfile
-  our    100644 74e5eeedea9bea87cd7a98ac2cb63f4376275a2a Dockerfile
-  their  100644 2d74e16915d2e89e1e1e7f3ffd259cc448e1b864 Dockerfile
-@@ -7,8 +7,13 @@
- RUN chmod a+rwx /home
- 
- # Install node.js
-+<<<<<<< .our
- RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
- RUN apt-get install -y nodejs
-+=======
-+RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
-+RUN apt-get update && apt-get install -y nodejs
-+>>>>>>> .their
- 
- # Install wget used by crash reporter
- RUN apt-get install -y wget
-changed in both
-  base   100644 271947c56e39b91fc23bf10579f61cab50b0f4dc Dockerfile.circleci
-  our    100644 d369c8c640161fc3ba65935297aec7dd27eb1e9f Dockerfile.circleci
-  their  100644 0cdb1e88c24f01a5acdfd8ef348126819f593454 Dockerfile.circleci
-@@ -3,8 +3,13 @@
- USER root
- 
- # Install node.js
-+<<<<<<< .our
- RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
- RUN apt-get install -y nodejs
-+=======
-+RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
-+RUN apt-get update && apt-get install -y nodejs
-+>>>>>>> .their
- 
- # Install wget used by crash reporter
- RUN apt-get install -y wget
-added in remote
-  their  100644 c6d558f7f3518ea2924fa9075ed38ab48d70d204 Jenkinsfile.arm64
-@@ -0,0 +1,36 @@
-+pipeline {
-+  agent {
-+    docker {
-+      image 'electronbuilds/arm64v8:0.0.2'
-+      args '--privileged'
-+    }
-+  }
-+  environment {
-+    TARGET_ARCH='arm64'
-+    DISPLAY=':99.0'
-+    MOCHA_TIMEOUT='60000'
-+  }
-+  stages {
-+    stage('Bootstrap') {
-+      steps {
-+        sh 'script/bootstrap.py -v --dev --target_arch=$TARGET_ARCH'
-+      }
-+    }
-+    stage('Build') {
-+      steps {
-+        sh 'script/build.py -c D --ninja-path /usr/local/ninja/ninja'
-+      }
-+    }
-+    stage('Test') {
-+      steps {
-+        sh '/etc/init.d/xvfb start'
-+        sh 'script/test.py --ci'
-+      }
-+    }
-+  }
-+  post {
-+    always {
-+      cleanWs()
-+    }
-+  }
-+}
-changed in both
-  base   100644 160dae7908236105f8534f9448f4111da1bcb014 README.md
-  our    100644 ec09364417b767ac59b2d970fee5e2ab2db2173b README.md
-  their  100644 a7b4fa6ed40a6449245cfdbdace8bb38945284d2 README.md
-added in both
-  our    100644 67a2b2124619d866f67d849f57f3548ba28be26a appveyor.yml
-  their  100644 2ed4ebcf4b90c2c28d9fd36af13198be5a08e5ad appveyor.yml
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- version: 1.0.{build}
- branches:
-   except:
-@@ -71,3 +72,63 @@
-         & python script\upload.py
-       }
-     }
-+=======
-+build_cloud: electron-16
-+image: electron-16-vs2015
-+build_script:
-+- ps: >-
-+    if(($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME -split "/")[0] -eq ($env:APPVEYOR_REPO_NAME -split "/")[0]) {
-+      Write-warning "Skipping PR build for branch"; Exit-AppveyorBuild
-+    } else {
-+      Add-Path "$env:ProgramFiles (x86)\Windows Kits\10\Debuggers\x64"
-+      $env:path = "$env:ProgramFiles (x86)\Windows Kits\10\Debuggers\x64;$env:path"
-+      if($env:APPVEYOR_SCHEDULED_BUILD -eq 'True')  {
-+        $env:RUN_RELEASE_BUILD = "1"
-+      }
-+      $Message = (git log --format=%B -n 1 HEAD) | Out-String
-+      if ((Test-Path Env:\RUN_RELEASE_BUILD)) {
-+        $env:ELECTRON_RELEASE = '1'
-+        Write-Output "release build triggered from api"
-+      }
-+      if ((Test-Path Env:\ELECTRON_RELEASE)) {
-+        Write-Output "Running release build"
-+        python script\bootstrap.py --target_arch=$env:TARGET_ARCH
-+        python script\build.py -c R
-+        python script\create-dist.py
-+      } else {
-+        Write-Output "Running debug build"
-+        python script\bootstrap.py --target_arch=$env:TARGET_ARCH --dev
-+        python script\build.py -c D
-+      }
-+      if ($? -ne 'True') {
-+        throw "Build failed with exit code $?"
-+      } else {
-+        "Build succeeded."
-+      }
-+      Push-AppveyorArtifact out
-+    }
-+test_script:
-+- ps: >-
-+    if (Test-Path Env:\ELECTRON_RELEASE) {
-+      Write-Output "Skipping tests for release build"
-+    } else {
-+      Write-Output "Running tests for debug build"
-+      python script\test.py --ci --rebuild_native_modules
-+      if ($LASTEXITCODE -ne '0') {
-+        throw "Tests failed with exit code $LASTEXITCODE"
-+      } else {
-+        Write-Output "Tests succeeded."
-+      }
-+      python script\verify-ffmpeg.py
-+      if ($LASTEXITCODE -ne '0') {
-+        throw "Verify ffmpeg failed with exit code $LASTEXITCODE"
-+      } else {
-+        "Verify ffmpeg succeeded."
-+      }
-+    }
-+artifacts:
-+- path: test-results.xml
-+  name: test-results.xml
-+deploy_script:
-+- ps: "if (Test-Path Env:\\ELECTRON_RELEASE) {\n  if (Test-Path Env:\\RUN_RELEASE_BUILD) {\n    Write-Output \"Uploading Electron release distribution to s3\"\n    & python script\\upload.py --upload_to_s3\n  } else {\n    Write-Output \"Uploading Electron release distribution to github releases\"\n    & python script\\upload.py\n    if (Test-Path Env:\\AUTO_RELEASE) {\n      node script\\release.js --validateRelease --automaticRelease\n      if ($? -eq 'True') {\n        echo 'Release is ready to go; now running release'\n        node script\\release.js --automaticRelease\n        if ($? -eq 'True') {      \n          echo 'Release successful, now publishing to npm'      \n          $npmfile = \"$HOME\\.npmrc\"\n          \"//registry.npmjs.org/:_authToken=$env:ELECTRON_NPM_TOKEN\" > $npmfile\n          npm run publish-to-npm\n        }\n      } else {\n        echo 'Release is not complete, skipping publish for now.'\n      }\n    }\n  }\n} else {\n  Write-Output \"Skipping upload distribution because build is not for release\"\n}"
-+>>>>>>> .their
-changed in both
-  base   100644 9472d1cb9fd76beca4047bb24db024b9c6378aae atom/app/command_line_args.cc
-  our    100644 23e870cf4a32aecfc246a81edad46971b4456a55 atom/app/command_line_args.cc
-  their  100644 be171457726a09cde9eb7a090ba1e2a67f4cb9cb atom/app/command_line_args.cc
-@@ -31,6 +31,1376 @@
-   return false;
- }
- 
-+<<<<<<< .our
-+=======
-+/*
-+ * The blacklist of command line switches, must be sorted.
-+ * Update the list by pasting the following command into bash
-+ * in libchromiumcontent/src/:
-+
-+   (find ./ \( -name "*switches.cc" -o -name "*switch_list.h" \) | \
-+      xargs grep -P --no-filename '"\S+"[);]$' | \
-+      perl -pe 's|^.*?"(\S+)"[);]$|  "$1",|'; \
-+      echo '  "inspect",'; \
-+      echo '  "inspect-brk",') | \
-+    LANG="C" sort | \
-+    uniq > blacklist-switches.txt
-+
-+ */
-+const char* kBlacklist[] = {
-+  "/prefetch:1",
-+  "/prefetch:2",
-+  "/prefetch:3",
-+  "/prefetch:4",
-+  "/prefetch:5",
-+  "/prefetch:6",
-+  "/prefetch:8",
-+  "0",
-+  "?",
-+  "BlacklistOnly",
-+  "ChromeOSMemoryPressureHandling",
-+  "Disabled",
-+  "OnlineCheckOnly",
-+  "SafeSites",
-+  "accept-resource-provider",
-+  "account-consistency",
-+  "adaboost",
-+  "aec-refined-adaptive-filter",
-+  "agc-startup-min-volume",
-+  "aggressive",
-+  "aggressive-cache-discard",
-+  "aggressive-tab-discard",
-+  "all-toolchains",
-+  "allarticles",
-+  "allow-cross-origin-auth-prompt",
-+  "allow-external-pages",
-+  "allow-failed-policy-fetch-for-test",
-+  "allow-file-access-from-files",
-+  "allow-hidden-media-playback",
-+  "allow-http-background-page",
-+  "allow-http-screen-capture",
-+  "allow-insecure-localhost",
-+  "allow-legacy-extension-manifests",
-+  "allow-loopback-in-peer-connection",
-+  "allow-nacl-crxfs-api",
-+  "allow-nacl-file-handle-api",
-+  "allow-nacl-socket-api",
-+  "allow-no-sandbox-job",
-+  "allow-outdated-plugins",
-+  "allow-ra-in-dev-mode",
-+  "allow-running-insecure-content",
-+  "allow-sandbox-debugging",
-+  "allow-silent-push",
-+  "alsa-check-close-timeout",
-+  "alsa-enable-upsampling",
-+  "alsa-fixed-output-sample-rate",
-+  "alsa-input-device",
-+  "alsa-mute-device-name",
-+  "alsa-mute-element-name",
-+  "alsa-output-avail-min",
-+  "alsa-output-buffer-size",
-+  "alsa-output-device",
-+  "alsa-output-period-size",
-+  "alsa-output-start-threshold",
-+  "alsa-volume-device-name",
-+  "alsa-volume-element-name",
-+  "also-emit-success-logs",
-+  "alternative",
-+  "always-authorize-plugins",
-+  "always-on",
-+  "always-use-complex-text",
-+  "alwaystrue",
-+  "android-fonts-path",
-+  "android-stderr-port",
-+  "android-stdin-port",
-+  "android-stdout-port",
-+  "angle",
-+  "app",
-+  "app-auto-launched",
-+  "app-id",
-+  "app-mode-auth-code",
-+  "app-mode-oauth-token",
-+  "app-mode-oem-manifest",
-+  "app-shell-allow-roaming",
-+  "app-shell-host-window-size",
-+  "app-shell-preferred-network",
-+  "app-shell-refresh-token",
-+  "app-shell-user",
-+  "apple",
-+  "apps-gallery-download-url",
-+  "apps-gallery-update-url",
-+  "apps-gallery-url",
-+  "apps-keep-chrome-alive-in-tests",
-+  "arc-availability",
-+  "arc-available",
-+  "arc-start-mode",
-+  "arc-transition-migration-required",
-+  "args",
-+  "artifacts-dir",
-+  "ash-animate-from-boot-splash-screen",
-+  "ash-constrain-pointer-to-root",
-+  "ash-copy-host-background-at-boot",
-+  "ash-debug-shortcuts",
-+  "ash-dev-shortcuts",
-+  "ash-disable-smooth-screen-rotation",
-+  "ash-disable-touch-exploration-mode",
-+  "ash-enable-magnifier-key-scroller",
-+  "ash-enable-mirrored-screen",
-+  "ash-enable-night-light",
-+  "ash-enable-palette-on-all-displays",
-+  "ash-enable-scale-settings-tray",
-+  "ash-enable-software-mirroring",
-+  "ash-enable-unified-desktop",
-+  "ash-estimated-presentation-delay",
-+  "ash-hide-notifications-for-factory",
-+  "ash-host-window-bounds",
-+  "ash-shelf-color",
-+  "ash-shelf-color-scheme",
-+  "ash-touch-hud",
-+  "ash-webui-init",
-+  "attestation-server",
-+  "audio-buffer-size",
-+  "audio-output-channels",
-+  "aura-legacy-power-button",
-+  "auth-ext-path",
-+  "auth-server-whitelist",
-+  "auth-spnego-account-type",
-+  "auto",
-+  "auto-open-devtools-for-tabs",
-+  "auto-select-desktop-capture-source",
-+  "autoplay-policy",
-+  "blink-settings",
-+  "bootstrap",
-+  "browser-subprocess-path",
-+  "browser-test",
-+  "bwsi",
-+  "bypass-app-banner-engagement-checks",
-+  "canvas-msaa-sample-count",
-+  "cast-initial-screen-height",
-+  "cast-initial-screen-width",
-+  "cc-layer-tree-test-long-timeout",
-+  "cc-layer-tree-test-no-timeout",
-+  "cc-rebaseline-pixeltests",
-+  "cellular-first",
-+  "cellular-only",
-+  "check-for-update-interval",
-+  "check-layout-test-sys-deps",
-+  "child-wallpaper-large",
-+  "child-wallpaper-small",
-+  "chrome-home-swipe-logic",
-+  "cipher-suite-blacklist",
-+  "clamshell",
-+  "class",
-+  "clear-token-service",
-+  "cloud-print-file",
-+  "cloud-print-file-type",
-+  "cloud-print-job-title",
-+  "cloud-print-print-ticket",
-+  "cloud-print-setup-proxy",
-+  "cloud-print-url",
-+  "cloud-print-xmpp-endpoint",
-+  "color",
-+  "compensate-for-unstable-pinch-zoom",
-+  "compile-shader-always-succeeds",
-+  "component-updater",
-+  "connectivity-check-url",
-+  "conservative",
-+  "content-image-texture-target",
-+  "content-shell-host-window-size",
-+  "controller",
-+  "crash-dumps-dir",
-+  "crash-on-failure",
-+  "crash-on-hang-threads",
-+  "crash-server-url",
-+  "crash-test",
-+  "crashpad-handler",
-+  "create-browser-on-startup-for-tests",
-+  "create-default-gl-context",
-+  "cros-gaia-api-v1",
-+  "cros-region",
-+  "cros-regions-mode",
-+  "crosh-command",
-+  "cryptauth-http-host",
-+  "custom-devtools-frontend",
-+  "custom-launcher-page",
-+  "custom_summary",
-+  "d3d11",
-+  "d3d9",
-+  "daemon",
-+  "dark_muted",
-+  "dark_vibrant",
-+  "data-path",
-+  "data-reduction-proxy-config-url",
-+  "data-reduction-proxy-experiment",
-+  "data-reduction-proxy-http-proxies",
-+  "data-reduction-proxy-lo-fi",
-+  "data-reduction-proxy-pingback-url",
-+  "data-reduction-proxy-secure-proxy-check-url",
-+  "data-reduction-proxy-server-experiments-disabled",
-+  "dbus-stub",
-+  "debug-devtools",
-+  "debug-enable-frame-toggle",
-+  "debug-packed-apps",
-+  "debug-print",
-+  "default",
-+  "default-background-color",
-+  "default-tile-height",
-+  "default-tile-width",
-+  "default-wallpaper-is-oem",
-+  "default-wallpaper-large",
-+  "default-wallpaper-small",
-+  "delay-reload-stop-button-change",
-+  "demo",
-+  "derelict-detection-timeout",
-+  "derelict-idle-timeout",
-+  "desktop",
-+  "desktop-window-1080p",
-+  "deterministic-fetch",
-+  "device-management-url",
-+  "device-scale-factor",
-+  "devtools-flags",
-+  "diagnostics",
-+  "diagnostics-format",
-+  "diagnostics-recovery",
-+  "dice",
-+  "disable",
-+  "disable-2d-canvas-clip-aa",
-+  "disable-2d-canvas-image-chromium",
-+  "disable-3d-apis",
-+  "disable-accelerated-2d-canvas",
-+  "disable-accelerated-jpeg-decoding",
-+  "disable-accelerated-mjpeg-decode",
-+  "disable-accelerated-video-decode",
-+  "disable-app-info-dialog-mac",
-+  "disable-app-list-dismiss-on-blur",
-+  "disable-app-window-cycling",
-+  "disable-appcontainer",
-+  "disable-arc-data-wipe",
-+  "disable-arc-opt-in-verification",
-+  "disable-audio-support-for-desktop-share",
-+  "disable-avfoundation-overlays",
-+  "disable-background-networking",
-+  "disable-background-timer-throttling",
-+  "disable-backgrounding-occluded-windows",
-+  "disable-backing-store-limit",
-+  "disable-blink-features",
-+  "disable-bookmark-reordering",
-+  "disable-boot-animation",
-+  "disable-breakpad",
-+  "disable-browser-task-scheduler",
-+  "disable-bundled-ppapi-flash",
-+  "disable-canvas-aa",
-+  "disable-captive-portal-bypass-proxy",
-+  "disable-cast-streaming-hw-encoding",
-+  "disable-checker-imaging",
-+  "disable-clear-browsing-data-counters",
-+  "disable-client-side-phishing-detection",
-+  "disable-cloud-import",
-+  "disable-component-cloud-policy",
-+  "disable-component-extensions-with-background-pages",
-+  "disable-component-update",
-+  "disable-composited-antialiasing",
-+  "disable-contextual-search",
-+  "disable-d3d11",
-+  "disable-databases",
-+  "disable-datasaver-prompt",
-+  "disable-default-apps",
-+  "disable-demo-mode",
-+  "disable-device-disabling",
-+  "disable-device-discovery-notifications",
-+  "disable-dinosaur-easter-egg",
-+  "disable-direct-composition",
-+  "disable-direct-composition-layers",
-+  "disable-directwrite-for-ui",
-+  "disable-display-color-calibration",
-+  "disable-display-list-2d-canvas",
-+  "disable-distance-field-text",
-+  "disable-domain-blocking-for-3d-apis",
-+  "disable-domain-reliability",
-+  "disable-drive-search-in-app-launcher",
-+  "disable-dwm-composition",
-+  "disable-encryption-migration",
-+  "disable-eol-notification",
-+  "disable-es3-apis",
-+  "disable-es3-gl-context",
-+  "disable-extensions",
-+  "disable-extensions-except",
-+  "disable-extensions-file-access-check",
-+  "disable-extensions-http-throttling",
-+  "disable-fast-web-scroll-view-insets",
-+  "disable-features",
-+  "disable-field-trial-config",
-+  "disable-file-manager-touch-mode",
-+  "disable-file-system",
-+  "disable-flash-3d",
-+  "disable-flash-stage3d",
-+  "disable-fullscreen-low-power-mode",
-+  "disable-fullscreen-tab-detaching",
-+  "disable-gaia-services",
-+  "disable-gesture-editing",
-+  "disable-gesture-requirement-for-presentation",
-+  "disable-gesture-typing",
-+  "disable-gl-drawing-for-tests",
-+  "disable-gl-error-limit",
-+  "disable-gl-extensions",
-+  "disable-glsl-translator",
-+  "disable-gpu",
-+  "disable-gpu-compositing",
-+  "disable-gpu-driver-bug-workarounds",
-+  "disable-gpu-early-init",
-+  "disable-gpu-memory-buffer-compositor-resources",
-+  "disable-gpu-memory-buffer-video-frames",
-+  "disable-gpu-process-crash-limit",
-+  "disable-gpu-program-cache",
-+  "disable-gpu-rasterization",
-+  "disable-gpu-sandbox",
-+  "disable-gpu-shader-disk-cache",
-+  "disable-gpu-vsync",
-+  "disable-gpu-watchdog",
-+  "disable-hang-monitor",
-+  "disable-hid-detection-on-oobe",
-+  "disable-histogram-customizer",
-+  "disable-hosted-app-shim-creation",
-+  "disable-hosted-apps-in-windows",
-+  "disable-http2",
-+  "disable-in-process-stack-traces",
-+  "disable-infobars",
-+  "disable-input-ime-api",
-+  "disable-input-view",
-+  "disable-ios-password-generation",
-+  "disable-ios-password-suggestions",
-+  "disable-ios-physical-web",
-+  "disable-javascript-harmony-shipping",
-+  "disable-kill-after-bad-ipc",
-+  "disable-lcd-text",
-+  "disable-legacy-window",
-+  "disable-local-storage",
-+  "disable-lock-screen-apps",
-+  "disable-logging",
-+  "disable-logging-redirect",
-+  "disable-login-animations",
-+  "disable-login-screen-apps",
-+  "disable-low-end-device-mode",
-+  "disable-low-latency-dxva",
-+  "disable-low-res-tiling",
-+  "disable-lru-snapshot-cache",
-+  "disable-mac-overlays",
-+  "disable-mac-views-native-app-windows",
-+  "disable-machine-cert-request",
-+  "disable-main-frame-before-activation",
-+  "disable-md-error-screen",
-+  "disable-md-oobe",
-+  "disable-media-session-api",
-+  "disable-media-suspend",
-+  "disable-merge-key-char-events",
-+  "disable-mojo-local-storage",
-+  "disable-mojo-renderer",
-+  "disable-mtp-write-support",
-+  "disable-multi-display-layout",
-+  "disable-namespace-sandbox",
-+  "disable-native-gpu-memory-buffers",
-+  "disable-network-portal-notification",
-+  "disable-new-channel-switcher-ui",
-+  "disable-new-korean-ime",
-+  "disable-new-virtual-keyboard-behavior",
-+  "disable-new-zip-unpacker",
-+  "disable-notifications",
-+  "disable-ntp-most-likely-favicons-from-server",
-+  "disable-ntp-popular-sites",
-+  "disable-nv12-dxgi-video",
-+  "disable-offer-store-unmasked-wallet-cards",
-+  "disable-offer-upload-credit-cards",
-+  "disable-office-editing-component-extension",
-+  "disable-offline-auto-reload",
-+  "disable-offline-auto-reload-visible-only",
-+  "disable-origin-trial-controlled-blink-features",
-+  "disable-overscroll-edge-effect",
-+  "disable-panel-fitting",
-+  "disable-partial-raster",
-+  "disable-password-generation",
-+  "disable-pepper-3d",
-+  "disable-pepper-3d-image-chromium",
-+  "disable-permission-action-reporting",
-+  "disable-permissions-api",
-+  "disable-physical-keyboard-autocorrect",
-+  "disable-pinch",
-+  "disable-pnacl-crash-throttling",
-+  "disable-popup-blocking",
-+  "disable-prefer-compositing-to-lcd-text",
-+  "disable-presentation-api",
-+  "disable-print-preview",
-+  "disable-prompt-on-repost",
-+  "disable-proximity-auth-bluetooth-low-energy-discovery",
-+  "disable-pull-to-refresh-effect",
-+  "disable-push-api-background-mode",
-+  "disable-quic",
-+  "disable-reading-from-canvas",
-+  "disable-remote-core-animation",
-+  "disable-remote-fonts",
-+  "disable-remote-playback-api",
-+  "disable-renderer-accessibility",
-+  "disable-renderer-backgrounding",
-+  "disable-renderer-priority-management",
-+  "disable-request-mobile-site",
-+  "disable-resize-lock",
-+  "disable-rgba-4444-textures",
-+  "disable-rollback-option",
-+  "disable-rtc-smoothness-algorithm",
-+  "disable-screen-orientation-lock",
-+  "disable-search-geolocation-disclosure",
-+  "disable-seccomp-filter-sandbox",
-+  "disable-settings-window",
-+  "disable-setuid-sandbox",
-+  "disable-shader-name-hashing",
-+  "disable-shared-workers",
-+  "disable-signin-promo",
-+  "disable-signin-scoped-device-id",
-+  "disable-single-click-autofill",
-+  "disable-skia-runtime-opts",
-+  "disable-slim-navigation-manager",
-+  "disable-slimming-paint-invalidation",
-+  "disable-smooth-scrolling",
-+  "disable-software-rasterizer",
-+  "disable-speech-api",
-+  "disable-suggestions-ui",
-+  "disable-sync",
-+  "disable-sync-app-list",
-+  "disable-sync-types",
-+  "disable-system-timezone-automatic-detection",
-+  "disable-tab-for-desktop-share",
-+  "disable-tab-strip-autoscroll-new-tabs",
-+  "disable-third-party-keyboard-workaround",
-+  "disable-threaded-animation",
-+  "disable-threaded-compositing",
-+  "disable-threaded-scrolling",
-+  "disable-touch-adjustment",
-+  "disable-touch-drag-drop",
-+  "disable-translate-new-ux",
-+  "disable-usb-keyboard-detect",
-+  "disable-v8-idle-tasks",
-+  "disable-vaapi-accelerated-video-encode",
-+  "disable-virtual-keyboard-overscroll",
-+  "disable-voice-input",
-+  "disable-volume-adjust-sound",
-+  "disable-wake-on-wifi",
-+  "disable-web-notification-custom-layouts",
-+  "disable-web-security",
-+  "disable-webgl",
-+  "disable-webgl-image-chromium",
-+  "disable-webrtc-encryption",
-+  "disable-webrtc-hw-decoding",
-+  "disable-webrtc-hw-encoding",
-+  "disable-win32k-lockdown",
-+  "disable-xss-auditor",
-+  "disable-zero-browsers-open-for-tests",
-+  "disable-zero-copy",
-+  "disable-zero-copy-dxgi-video",
-+  "disabled",
-+  "disabled-new-style-notification",
-+  "disallow-non-exact-resource-reuse",
-+  "disk-cache-dir",
-+  "disk-cache-size",
-+  "display",
-+  "dmg-device",
-+  "dns-log-details",
-+  "document-user-activation-required",
-+  "dom-automation",
-+  "dotfile",
-+  "draft",
-+  "draw-view-bounds-rects",
-+  "duck-flash",
-+  "dump-blink-runtime-call-stats",
-+  "dump-browser-histograms",
-+  "dump-dom",
-+  "eafe-path",
-+  "eafe-url",
-+  "easy-unlock-app-path",
-+  "edge-touch-filtering",
-+  "egl",
-+  "elevate",
-+  "embedded-extension-options",
-+  "emphasize-titles-in-omnibox-dropdown",
-+  "emulate-shader-precision",
-+  "enable-accelerated-2d-canvas",
-+  "enable-accelerated-vpx-decode",
-+  "enable-accessibility-tab-switcher",
-+  "enable-adaptive-selection-handle-orientation",
-+  "enable-aggressive-domstorage-flushing",
-+  "enable-android-wallpapers-app",
-+  "enable-app-info-dialog-mac",
-+  "enable-app-list",
-+  "enable-app-window-cycling",
-+  "enable-appcontainer",
-+  "enable-arc",
-+  "enable-arc-oobe-optin",
-+  "enable-audio-debug-recordings-from-extension",
-+  "enable-audio-focus",
-+  "enable-automation",
-+  "enable-benchmarking",
-+  "enable-ble-advertising-in-apps",
-+  "enable-blink-features",
-+  "enable-bookmark-reordering",
-+  "enable-bookmark-undo",
-+  "enable-browser-side-navigation",
-+  "enable-browser-task-scheduler",
-+  "enable-checker-imaging",
-+  "enable-chromevox-arc-support",
-+  "enable-clear-browsing-data-counters",
-+  "enable-cloud-print-proxy",
-+  "enable-cloud-print-xps",
-+  "enable-consumer-kiosk",
-+  "enable-contextual-search",
-+  "enable-crash-reporter",
-+  "enable-crash-reporter-for-testing",
-+  "enable-crx-hash-check",
-+  "enable-data-reduction-proxy-bypass-warning",
-+  "enable-data-reduction-proxy-force-pingback",
-+  "enable-data-reduction-proxy-lite-page",
-+  "enable-data-reduction-proxy-savings-promo",
-+  "enable-datasaver-prompt",
-+  "enable-device-discovery-notifications",
-+  "enable-devtools-experiments",
-+  "enable-direct-composition-layers",
-+  "enable-display-list-2d-canvas",
-+  "enable-distance-field-text",
-+  "enable-distillability-service",
-+  "enable-dom-distiller",
-+  "enable-domain-reliability",
-+  "enable-drive-search-in-app-launcher",
-+  "enable-drm-atomic",
-+  "enable-embedded-extension-options",
-+  "enable-encryption-migration",
-+  "enable-encryption-selection",
-+  "enable-es3-apis",
-+  "enable-exclusive-audio",
-+  "enable-experimental-accessibility-features",
-+  "enable-experimental-canvas-features",
-+  "enable-experimental-extension-apis",
-+  "enable-experimental-fullscreen-exit-ui",
-+  "enable-experimental-input-view-features",
-+  "enable-experimental-web-platform-features",
-+  "enable-extension-activity-log-testing",
-+  "enable-extension-activity-logging",
-+  "enable-extension-assets-sharing",
-+  "enable-fast-unload",
-+  "enable-fast-web-scroll-view-insets",
-+  "enable-features",
-+  "enable-file-manager-touch-mode",
-+  "enable-first-run-ui-transitions",
-+  "enable-floating-virtual-keyboard",
-+  "enable-font-antialiasing",
-+  "enable-fullscreen-tab-detaching",
-+  "enable-fullscreen-toolbar-reveal",
-+  "enable-google-branded-context-menu",
-+  "enable-gpu-async-worker-context",
-+  "enable-gpu-benchmarking",
-+  "enable-gpu-client-logging",
-+  "enable-gpu-client-tracing",
-+  "enable-gpu-command-logging",
-+  "enable-gpu-debugging",
-+  "enable-gpu-driver-debug-logging",
-+  "enable-gpu-memory-buffer-compositor-resources",
-+  "enable-gpu-memory-buffer-video-frames",
-+  "enable-gpu-rasterization",
-+  "enable-gpu-service-logging",
-+  "enable-gpu-service-tracing",
-+  "enable-hardware-overlays",
-+  "enable-harfbuzz-rendertext",
-+  "enable-hdr",
-+  "enable-heap-profiling",
-+  "enable-hosted-app-quit-notification",
-+  "enable-hosted-apps-in-windows",
-+  "enable-hotword-hardware",
-+  "enable-hung-renderer-infobar",
-+  "enable-inband-text-tracks",
-+  "enable-input-ime-api",
-+  "enable-internal-media-session",
-+  "enable-ios-handoff-to-other-devices",
-+  "enable-ios-password-generation",
-+  "enable-ios-physical-web",
-+  "enable-layer-lists",
-+  "enable-lcd-text",
-+  "enable-leak-detection",
-+  "enable-local-file-accesses",
-+  "enable-local-sync-backend",
-+  "enable-logging",
-+  "enable-longpress-drag-selection",
-+  "enable-low-end-device-mode",
-+  "enable-low-res-tiling",
-+  "enable-lru-snapshot-cache",
-+  "enable-mac-views-native-app-windows",
-+  "enable-main-frame-before-activation",
-+  "enable-md-feedback",
-+  "enable-md-policy-page",
-+  "enable-media-suspend",
-+  "enable-merge-key-char-events",
-+  "enable-message-center-always-scroll-up-upon-notification-removal",
-+  "enable-nacl",
-+  "enable-nacl-debug",
-+  "enable-nacl-nonsfi-mode",
-+  "enable-native-gpu-memory-buffers",
-+  "enable-natural-scroll-default",
-+  "enable-navigation-tracing",
-+  "enable-net-benchmarking",
-+  "enable-network-information-downlink-max",
-+  "enable-network-portal-notification",
-+  "enable-new-app-menu-icon",
-+  "enable-ntp-most-likely-favicons-from-server",
-+  "enable-ntp-popular-sites",
-+  "enable-ntp-search-engine-country-detection",
-+  "enable-offer-store-unmasked-wallet-cards",
-+  "enable-offer-upload-credit-cards",
-+  "enable-offline-auto-reload",
-+  "enable-offline-auto-reload-visible-only",
-+  "enable-osk-overscroll",
-+  "enable-override-bookmarks-ui",
-+  "enable-partial-raster",
-+  "enable-password-generation",
-+  "enable-pepper-testing",
-+  "enable-permission-action-reporting",
-+  "enable-physical-keyboard-autocorrect",
-+  "enable-picture-in-picture",
-+  "enable-pinch",
-+  "enable-pixel-output-in-tests",
-+  "enable-plugin-placeholder-testing",
-+  "enable-potentially-annoying-security-features",
-+  "enable-power-overlay",
-+  "enable-precise-memory-info",
-+  "enable-prefer-compositing-to-lcd-text",
-+  "enable-print-browser",
-+  "enable-print-preview-register-promos",
-+  "enable-profile-shortcut-manager",
-+  "enable-profiling",
-+  "enable-push-api-background-mode",
-+  "enable-quic",
-+  "enable-reader-mode-toolbar-icon",
-+  "enable-refresh-token-annotation-request",
-+  "enable-request-tablet-site",
-+  "enable-rgba-4444-textures",
-+  "enable-sandbox",
-+  "enable-sandbox-logging",
-+  "enable-screenshot-testing-with-mode",
-+  "enable-scripts-require-action",
-+  "enable-scroll-prediction",
-+  "enable-service-manager-tracing",
-+  "enable-settings-window",
-+  "enable-sgi-video-sync",
-+  "enable-signin-promo",
-+  "enable-single-click-autofill",
-+  "enable-site-settings",
-+  "enable-skia-benchmarking",
-+  "enable-slim-navigation-manager",
-+  "enable-slimming-paint-invalidation",
-+  "enable-slimming-paint-v2",
-+  "enable-smooth-scrolling",
-+  "enable-spatial-navigation",
-+  "enable-spdy-proxy-auth",
-+  "enable-speech-dispatcher",
-+  "enable-spelling-feedback-field-trial",
-+  "enable-spotlight-actions",
-+  "enable-stats-collection-bindings",
-+  "enable-stats-table",
-+  "enable-strict-mixed-content-checking",
-+  "enable-strict-powerful-feature-restrictions",
-+  "enable-suggestions-ui",
-+  "enable-suggestions-with-substring-match",
-+  "enable-supervised-user-managed-bookmarks-folder",
-+  "enable-surface-synchronization",
-+  "enable-swap-buffers-with-bounds",
-+  "enable-sync-app-list",
-+  "enable-sync-articles",
-+  "enable-tab-audio-muting",
-+  "enable-tablet-splitview",
-+  "enable-tcp-fastopen",
-+  "enable-third-party-keyboard-workaround",
-+  "enable-threaded-compositing",
-+  "enable-threaded-texture-mailboxes",
-+  "enable-tile-compression",
-+  "enable-touch-calibration-setting",
-+  "enable-touch-drag-drop",
-+  "enable-touchpad-three-finger-click",
-+  "enable-touchview",
-+  "enable-trace-app-source",
-+  "enable-tracing",
-+  "enable-tracing-output",
-+  "enable-translate-new-ux",
-+  "enable-ui-devtools",
-+  "enable-use-zoom-for-dsf",
-+  "enable-user-controlled-alternate-protocol-ports",
-+  "enable-user-metrics",
-+  "enable-usermedia-screen-capturing",
-+  "enable-video-player-chromecast-support",
-+  "enable-viewport",
-+  "enable-virtual-keyboard",
-+  "enable-voice-interaction",
-+  "enable-vtune-support",
-+  "enable-vulkan",
-+  "enable-wayland-server",
-+  "enable-web-notification-custom-layouts",
-+  "enable-webfonts-intervention-trigger",
-+  "enable-webfonts-intervention-v2",
-+  "enable-webgl-draft-extensions",
-+  "enable-webgl-image-chromium",
-+  "enable-webrtc-event-logging-from-extension",
-+  "enable-webrtc-srtp-aes-gcm",
-+  "enable-webrtc-stun-origin",
-+  "enable-webview-finch",
-+  "enable-webvr",
-+  "enable-wifi-credential-sync",
-+  "enable-win7-webrtc-hw-h264-decoding",
-+  "enable-zero-copy",
-+  "enable-zip-archiver-on-file-manager",
-+  "enabled",
-+  "enabled-2g",
-+  "enabled-3g",
-+  "enabled-new-style-notification",
-+  "enabled-slow2g",
-+  "encode-binary",
-+  "enforce",
-+  "enforce-gl-minimums",
-+  "enforce-webrtc-ip-permission-check",
-+  "enforce_strict",
-+  "enterprise-disable-arc",
-+  "enterprise-enable-forced-re-enrollment",
-+  "enterprise-enable-license-type-selection",
-+  "enterprise-enable-zero-touch-enrollment",
-+  "enterprise-enrollment-initial-modulus",
-+  "enterprise-enrollment-modulus-limit",
-+  "error-console",
-+  "experiment",
-+  "explicitly-allowed-ports",
-+  "expose-internals-for-testing",
-+  "extension-content-verification",
-+  "extension-process",
-+  "extensions-install-verification",
-+  "extensions-multi-account",
-+  "extensions-not-webstore",
-+  "extensions-on-chrome-urls",
-+  "extensions-update-frequency",
-+  "extra-search-query-params",
-+  "fail-on-unused-args",
-+  "fake-variations-channel",
-+  "false",
-+  "fast",
-+  "fast-start",
-+  "feedback-server",
-+  "field-trial-handle",
-+  "first-exec-after-boot",
-+  "flag-switches-begin",
-+  "flag-switches-end",
-+  "font-cache-shared-handle",
-+  "force-android-app-mode",
-+  "force-app-mode",
-+  "force-clamshell-power-button",
-+  "force-color-profile",
-+  "force-desktop-ios-promotion",
-+  "force-dev-mode-highlighting",
-+  "force-device-scale-factor",
-+  "force-display-list-2d-canvas",
-+  "force-effective-connection-type",
-+  "force-enable-metrics-reporting",
-+  "force-enable-stylus-tools",
-+  "force-fieldtrial-params",
-+  "force-fieldtrials",
-+  "force-first-run",
-+  "force-first-run-ui",
-+  "force-gpu-mem-available-mb",
-+  "force-gpu-rasterization",
-+  "force-happiness-tracking-system",
-+  "force-load-easy-unlock-app-in-tests",
-+  "force-local-ntp",
-+  "force-login-manager-in-tests",
-+  "force-mediafoundation",
-+  "force-overlay-fullscreen-video",
-+  "force-password-reauth",
-+  "force-pnacl-subzero",
-+  "force-renderer-accessibility",
-+  "force-show-update-menu-badge",
-+  "force-show-update-menu-item",
-+  "force-system-compositor-mode",
-+  "force-tablet-mode",
-+  "force-text-direction",
-+  "force-ui-direction",
-+  "force-variation-ids",
-+  "force-video-overlays",
-+  "force-wave-audio",
-+  "force-webrtc-ip-handling-policy",
-+  "full-memory-crash-report",
-+  "gaia-url",
-+  "gcm-checkin-url",
-+  "gcm-mcs-endpoint",
-+  "gcm-registration-url",
-+  "generate-accessibility-test-expectations",
-+  "gl",
-+  "gl-composited-overlay-candidate-quad-border",
-+  "gl-shader-interm-output",
-+  "gles",
-+  "golden-screenshots-dir",
-+  "google-apis-url",
-+  "google-base-url",
-+  "google-doodle-url",
-+  "google-url",
-+  "gpu-active-device-id",
-+  "gpu-active-vendor-id",
-+  "gpu-device-id",
-+  "gpu-driver-bug-workarounds",
-+  "gpu-driver-date",
-+  "gpu-driver-vendor",
-+  "gpu-driver-version",
-+  "gpu-launcher",
-+  "gpu-no-complete-info-collection",
-+  "gpu-no-context-lost",
-+  "gpu-process",
-+  "gpu-program-cache-size-kb",
-+  "gpu-rasterization-msaa-sample-count",
-+  "gpu-sandbox-allow-sysv-shm",
-+  "gpu-sandbox-failures-fatal",
-+  "gpu-sandbox-start-early",
-+  "gpu-secondary-device-ids",
-+  "gpu-secondary-vendor-ids",
-+  "gpu-startup-dialog",
-+  "gpu-testing-device-id",
-+  "gpu-testing-driver-date",
-+  "gpu-testing-gl-renderer",
-+  "gpu-testing-gl-vendor",
-+  "gpu-testing-gl-version",
-+  "gpu-testing-os-version",
-+  "gpu-testing-secondary-device-ids",
-+  "gpu-testing-secondary-vendor-ids",
-+  "gpu-testing-vendor-id",
-+  "gpu-vendor-id",
-+  "guest-wallpaper-large",
-+  "guest-wallpaper-small",
-+  "h",
-+  "has-chromeos-diamond-key",
-+  "has-chromeos-keyboard",
-+  "has-internal-stylus",
-+  "headless",
-+  "help",
-+  "hide",
-+  "hide-icons",
-+  "hide-scrollbars",
-+  "history-entry-requires-user-gesture",
-+  "homedir",
-+  "homepage",
-+  "host",
-+  "host-pairing-oobe",
-+  "host-resolver-rules",
-+  "host-rules",
-+  "icu-data-dir",
-+  "ignore-autocomplete-off-autofill",
-+  "ignore-autoplay-restrictions",
-+  "ignore-certificate-errors",
-+  "ignore-certificate-errors-spki-list",
-+  "ignore-gpu-blacklist",
-+  "ignore-urlfetcher-cert-requests",
-+  "ignore-user-profile-mapping-for-tests",
-+  "in-process-gpu",
-+  "incognito",
-+  "input",
-+  "inspect",
-+  "inspect-brk",
-+  "install-chrome-app",
-+  "install-supervised-user-whitelists",
-+  "instant-process",
-+  "invalidation-use-gcm-channel",
-+  "ipc-connection-timeout",
-+  "ipc-dump-directory",
-+  "ipc-fuzzer-testcase",
-+  "is-running-in-mash",
-+  "isolate-origins",
-+  "isolate-sites-for-testing",
-+  "javascript-harmony",
-+  "js-flags",
-+  "keep-alive-for-test",
-+  "kiosk",
-+  "kiosk-printing",
-+  "lang",
-+  "last-launched-app",
-+  "layer",
-+  "light_muted",
-+  "light_vibrant",
-+  "limit-fps",
-+  "load-and-launch-app",
-+  "load-apps",
-+  "load-extension",
-+  "load-media-router-component-extension",
-+  "local-heuristics-only-for-password-generation",
-+  "local-ntp-reload",
-+  "local-sync-backend-dir",
-+  "log-gpu-control-list-decisions",
-+  "log-level",
-+  "log-net-log",
-+  "login-manager",
-+  "login-profile",
-+  "login-user",
-+  "lso-url",
-+  "ltr",
-+  "main-frame-resizes-are-orientation-changes",
-+  "make-chrome-default",
-+  "make-default-browser",
-+  "managed-user-id",
-+  "managed-user-sync-token",
-+  "mark-non-secure-as",
-+  "markdown",
-+  "market-url-for-testing",
-+  "mash",
-+  "material",
-+  "material-design-ink-drop-animation-speed",
-+  "material-hybrid",
-+  "max-gum-fps",
-+  "max-output-volume-dba1m",
-+  "max-untiled-layer-height",
-+  "max-untiled-layer-width",
-+  "media-cache-size",
-+  "mem-pressure-system-reserved-kb",
-+  "memlog",
-+  "memlog-pipe",
-+  "memory-pressure-off",
-+  "memory-pressure-thresholds",
-+  "memory-pressure-thresholds-mb",
-+  "message-center-changes-while-open",
-+  "metrics-client-id",
-+  "metrics-recording-only",
-+  "mhtml-generator-option",
-+  "mirror",
-+  "mock",
-+  "mojo-local-storage",
-+  "mojo-pipe-token",
-+  "monitoring-destination-id",
-+  "mse-audio-buffer-size-limit",
-+  "mse-video-buffer-size-limit",
-+  "mus",
-+  "mus-config",
-+  "mute-audio",
-+  "nacl-broker",
-+  "nacl-dangerous-no-sandbox-nonsfi",
-+  "nacl-debug-mask",
-+  "nacl-gdb",
-+  "nacl-gdb-script",
-+  "nacl-loader",
-+  "nacl-loader-nonsfi",
-+  "native",
-+  "native-crx-bindings",
-+  "need-arc-migration-policy-check",
-+  "net-log-capture-mode",
-+  "netifs-to-ignore",
-+  "network-country-iso",
-+  "network-settings-config",
-+  "new-window",
-+  "no-default-browser-check",
-+  "no-experiments",
-+  "no-first-run",
-+  "no-managed-user-acknowledgment-check",
-+  "no-network-profile-warning",
-+  "no-pings",
-+  "no-proxy-server",
-+  "no-referrers",
-+  "no-sandbox",
-+  "no-service-autorun",
-+  "no-session-id",
-+  "no-startup-window",
-+  "no-user-gesture-required",
-+  "no-wifi",
-+  "no-zygote",
-+  "nocolor",
-+  "noerrdialogs",
-+  "non-material",
-+  "non-secure",
-+  "non-secure-after-editing",
-+  "non-secure-while-incognito",
-+  "non-secure-while-incognito-or-editing",
-+  "none",
-+  "normal_muted",
-+  "normal_vibrant",
-+  "note-taking-app-ids",
-+  "ntp-snippets-add-incomplete",
-+  "ntp-switch-to-existing-tab",
-+  "null",
-+  "num-raster-threads",
-+  "oauth2-client-id",
-+  "oauth2-client-secret",
-+  "off",
-+  "on",
-+  "oobe-bootstrapping-master",
-+  "oobe-force-show-screen",
-+  "oobe-guest-session",
-+  "oobe-skip-postlogin",
-+  "oobe-timer-interval",
-+  "open-ash",
-+  "opengraph",
-+  "origin-to-force-quic-on",
-+  "origin-trial-disabled-features",
-+  "origin-trial-disabled-tokens",
-+  "origin-trial-public-key",
-+  "original-process-start-time",
-+  "osmesa",
-+  "output",
-+  "override",
-+  "override-metrics-upload-url",
-+  "override-plugin-power-saver-for-testing",
-+  "override-use-software-gl-for-tests",
-+  "overscroll-history-navigation",
-+  "overscroll-start-threshold",
-+  "ozone-dump-file",
-+  "ozone-platform",
-+  "pack-extension",
-+  "pack-extension-key",
-+  "parent-profile",
-+  "parent-window",
-+  "passive-listeners-default",
-+  "password-store",
-+  "permission-request-api-scope",
-+  "permission-request-api-url",
-+  "ppapi",
-+  "ppapi-antialiased-text-enabled",
-+  "ppapi-broker",
-+  "ppapi-flash-args",
-+  "ppapi-flash-path",
-+  "ppapi-flash-version",
-+  "ppapi-in-process",
-+  "ppapi-plugin-launcher",
-+  "ppapi-startup-dialog",
-+  "ppapi-subpixel-rendering-setting",
-+  "prerender-from-omnibox",
-+  "previous-app",
-+  "primary",
-+  "print-to-pdf",
-+  "privet-ipv6-only",
-+  "process-per-site",
-+  "process-per-tab",
-+  "product-version",
-+  "profile-directory",
-+  "profiler-timing",
-+  "profiling",
-+  "profiling-at-start",
-+  "profiling-file",
-+  "profiling-flush",
-+  "progress-bar-animation",
-+  "progress-bar-completion",
-+  "prompt-for-external-extensions",
-+  "proxy-auto-detect",
-+  "proxy-bypass-list",
-+  "proxy-pac-url",
-+  "proxy-server",
-+  "q",
-+  "quic-connection-options",
-+  "quic-max-packet-length",
-+  "quic-version",
-+  "rdp_desktop_session",
-+  "reader-mode-feedback",
-+  "reader-mode-heuristics",
-+  "rebaseline-pixel-tests",
-+  "record-type",
-+  "reduce-security-for-testing",
-+  "reduced-referrer-granularity",
-+  "register-font-files",
-+  "register-pepper-plugins",
-+  "relauncher",
-+  "remote-debugging-address",
-+  "remote-debugging-port",
-+  "remote-debugging-socket-fd",
-+  "remote-debugging-socket-name",
-+  "remote-debugging-targets",
-+  "renderer",
-+  "renderer-client-id",
-+  "renderer-cmd-prefix",
-+  "renderer-process-limit",
-+  "renderer-startup-dialog",
-+  "renderer-wait-for-java-debugger",
-+  "renderpass",
-+  "repl",
-+  "report-vp9-as-an-unsupported-mime-type",
-+  "require-audio-hardware-for-testing",
-+  "reset-app-list-install-state",
-+  "reset-variation-state",
-+  "restore-last-session",
-+  "root",
-+  "root-layer-scrolls",
-+  "rtl",
-+  "run-layout-test",
-+  "runtime-deps-list-file",
-+  "safebrowsing-disable-auto-update",
-+  "safebrowsing-disable-download-protection",
-+  "safebrowsing-disable-extension-blacklist",
-+  "safebrowsing-manual-download-blacklist",
-+  "sandbox-ipc",
-+  "save-page-as-mhtml",
-+  "screen-config",
-+  "screenshot",
-+  "script-executable",
-+  "scripts-require-action",
-+  "scroll-end-effect",
-+  "search-provider-logo-url",
-+  "secondary",
-+  "secondary-display-layout",
-+  "secondary-ui-md",
-+  "service",
-+  "service-manager",
-+  "service-name",
-+  "service-pipe-token",
-+  "service-request-channel-token",
-+  "service-runner",
-+  "shared-files",
-+  "shill-stub",
-+  "show-app-list",
-+  "show-autofill-signatures",
-+  "show-autofill-type-predictions",
-+  "show-cert-link",
-+  "show-component-extension-options",
-+  "show-composited-layer-borders",
-+  "show-fps-counter",
-+  "show-icons",
-+  "show-layer-animation-bounds",
-+  "show-login-dev-overlay",
-+  "show-mac-overlay-borders",
-+  "show-md-login",
-+  "show-non-md-login",
-+  "show-overdraw-feedback",
-+  "show-paint-rects",
-+  "show-property-changed-rects",
-+  "show-saved-copy",
-+  "show-screenspace-rects",
-+  "show-surface-damage-rects",
-+  "silent-debugger-extension-api",
-+  "silent-launch",
-+  "simulate-critical-update",
-+  "simulate-elevated-recovery",
-+  "simulate-outdated",
-+  "simulate-outdated-no-au",
-+  "simulate-upgrade",
-+  "single-process",
-+  "site-per-process",
-+  "skip-gpu-data-loading",
-+  "skip-nostore-all",
-+  "skip-nostore-main",
-+  "skip-reencoding-on-skp-capture",
-+  "slow",
-+  "slow-connections-only",
-+  "slow-down-raster-scale-factor",
-+  "sms-test-messages",
-+  "spdy-proxy-auth-fallback",
-+  "spdy-proxy-auth-origin",
-+  "spdy-proxy-auth-value",
-+  "spelling-service-feedback-interval-seconds",
-+  "spelling-service-feedback-url",
-+  "spurious-power-button-accel-count",
-+  "spurious-power-button-keyboard-accel",
-+  "spurious-power-button-lid-angle-change",
-+  "spurious-power-button-screen-accel",
-+  "spurious-power-button-window",
-+  "ssl-key-log-file",
-+  "ssl-version-max",
-+  "ssl-version-min",
-+  "stable-release-mode",
-+  "start-fullscreen",
-+  "start-maximized",
-+  "start-stack-profiler",
-+  "started",
-+  "stub",
-+  "stub-cros-settings",
-+  "supports-dual-gpus",
-+  "surface",
-+  "swiftshader",
-+  "swiftshader-webgl",
-+  "sync-allow-insecure-xmpp-connection",
-+  "sync-deferred-startup-timeout-seconds",
-+  "sync-disable-deferred-startup",
-+  "sync-enable-get-update-avoidance",
-+  "sync-notification-host-port",
-+  "sync-on-draw-hardware",
-+  "sync-short-initial-retry-override",
-+  "sync-short-nudge-delay-for-test",
-+  "sync-url",
-+  "system-developer-mode",
-+  "system-log-upload-frequency",
-+  "tab-management-experiment-type-disabled",
-+  "tab-management-experiment-type-elderberry",
-+  "task-profiler",
-+  "team-drives",
-+  "test-auto-update-ui",
-+  "test-child-process",
-+  "test-cros-gaia-id-migration",
-+  "test-do-not-initialize-icu",
-+  "test-encryption-migration-ui",
-+  "test-gl-lib",
-+  "test-launcher-batch-limit",
-+  "test-launcher-bot-mode",
-+  "test-launcher-debug-launcher",
-+  "test-launcher-filter-file",
-+  "test-launcher-force-run-broken-tests",
-+  "test-launcher-jobs",
-+  "test-launcher-list-tests",
-+  "test-launcher-output",
-+  "test-launcher-print-test-stdio",
-+  "test-launcher-print-writable-path",
-+  "test-launcher-retry-limit",
-+  "test-launcher-shard-index",
-+  "test-launcher-summary-output",
-+  "test-launcher-test-part-results-limit",
-+  "test-launcher-timeout",
-+  "test-launcher-total-shards",
-+  "test-launcher-trace",
-+  "test-name",
-+  "test-tiny-timeout",
-+  "test-type",
-+  "testing-fixed-http-port",
-+  "testing-fixed-https-port",
-+  "tether-stub",
-+  "threads",
-+  "time",
-+  "timeout",
-+  "tls1",
-+  "tls1.1",
-+  "tls1.2",
-+  "tls1.3",
-+  "tls13-variant",
-+  "top-chrome-md",
-+  "top-controls-hide-threshold",
-+  "top-controls-show-threshold",
-+  "touch-calibration",
-+  "touch-devices",
-+  "touch-events",
-+  "touch-noise-filtering",
-+  "touch-selection-strategy",
-+  "touch_view",
-+  "trace-config-file",
-+  "trace-export-events-to-etw",
-+  "trace-shutdown",
-+  "trace-shutdown-file",
-+  "trace-startup",
-+  "trace-startup-duration",
-+  "trace-startup-file",
-+  "trace-to-console",
-+  "trace-to-file",
-+  "trace-to-file-name",
-+  "trace-upload-url",
-+  "tracelog",
-+  "translate-ranker-model-url",
-+  "translate-script-url",
-+  "translate-security-origin",
-+  "true",
-+  "trusted-download-sources",
-+  "try-chrome-again",
-+  "try-supported-channel-layouts",
-+  "type",
-+  "ui-disable-partial-swap",
-+  "ui-enable-layer-lists",
-+  "ui-enable-rgba-4444-textures",
-+  "ui-enable-zero-copy",
-+  "ui-prioritize-in-gpu-process",
-+  "ui-show-composited-layer-borders",
-+  "ui-show-fps-counter",
-+  "ui-show-layer-animation-bounds",
-+  "ui-show-paint-rects",
-+  "ui-show-property-changed-rects",
-+  "ui-show-screenspace-rects",
-+  "ui-show-surface-damage-rects",
-+  "ui-slow-animations",
-+  "ui-test-action-max-timeout",
-+  "ui-test-action-timeout",
-+  "uninstall",
-+  "unlimited-storage",
-+  "unsafe-pac-url",
-+  "unsafely-allow-protected-media-identifier-for-domain",
-+  "unsafely-treat-insecure-origin-as-secure",
-+  "use-angle",
-+  "use-cras",
-+  "use-double-buffering",
-+  "use-fake-device-for-media-stream",
-+  "use-fake-jpeg-decode-accelerator",
-+  "use-fake-ui-for-media-stream",
-+  "use-file-for-fake-audio-capture",
-+  "use-file-for-fake-video-capture",
-+  "use-first-display-as-internal",
-+  "use-gl",
-+  "use-gpu-in-tests",
-+  "use-ime-service",
-+  "use-mobile-user-agent",
-+  "use-mock-keychain",
-+  "use-passthrough-cmd-decoder",
-+  "use-simple-cache-backend",
-+  "use-system-default-printer",
-+  "use-test-config",
-+  "user-agent",
-+  "user-always-affiliated",
-+  "user-data-dir",
-+  "user-gesture-required",
-+  "user-gesture-required-for-cross-origin",
-+  "utility",
-+  "utility-allowed-dir",
-+  "utility-cmd-prefix",
-+  "utility-run-elevated",
-+  "v",
-+  "v2-sandbox",
-+  "v2-sandbox-enabled",
-+  "v8-cache-options",
-+  "v8-cache-strategies-for-cache-storage",
-+  "validate-crx",
-+  "validate-input-event-stream",
-+  "variations-override-country",
-+  "variations-server-url",
-+  "version",
-+  "video-image-texture-target",
-+  "video-threads",
-+  "video-underflow-threshold-ms",
-+  "virtual-time-budget",
-+  "vmodule",
-+  "voice-interaction-supported-locales",
-+  "wait-for-debugger",
-+  "wait-for-debugger-children",
-+  "wake-on-wifi-packet",
-+  "wallet-service-use-sandbox",
-+  "watcher",
-+  "waveout-buffers",
-+  "webapk-server-url",
-+  "webrtc-max-cpu-consumption-percentage",
-+  "webrtc-stun-probe-trial",
-+  "webview-enable-safebrowsing-support",
-+  "webview-sandboxed-renderer",
-+  "whitelisted-extension-id",
-+  "win-jumplist-action",
-+  "window-position",
-+  "window-size",
-+  "window-workspace",
-+  "windows10-custom-titlebar",
-+  "winhttp-proxy-resolver",
-+  "wm-window-animations-disabled",
-+  "yield-between-content-script-runs",
-+  "zygote",
-+  "zygote-cmd-prefix",
-+};
-+
-+bool IsBlacklistedArg(const base::CommandLine::CharType* arg) {
-+#if defined(OS_WIN)
-+  const auto converted = base::WideToUTF8(arg);
-+  const char* a = converted.c_str();
-+#else
-+  const char* a = arg;
-+#endif
-+
-+  static const char* prefixes[] = {"--", "-", "/"};
-+
-+  int prefix_length = 0;
-+  for (auto& prefix : prefixes) {
-+    if (base::StartsWith(a, prefix, base::CompareCase::SENSITIVE)) {
-+      prefix_length = strlen(prefix);
-+      break;
-+    }
-+  }
-+
-+  if (prefix_length > 0) {
-+    a += prefix_length;
-+    std::string switch_name =
-+        base::ToLowerASCII(base::StringPiece(a, strcspn(a, "=")));
-+    return std::binary_search(std::begin(kBlacklist), std::end(kBlacklist),
-+                              switch_name);
-+  }
-+
-+  return false;
-+}
-+
-+>>>>>>> .their
- }  // namespace
- 
- namespace atom {
-changed in both
-  base   100644 4bd88a5a43c03ceba308ec06fdf0cbadeddcaae3 atom/browser/api/atom_api_browser_view.cc
-  our    100644 bd83208694c61c4d7c43ce4be26939c2682b2a13 atom/browser/api/atom_api_browser_view.cc
-  their  100644 41f0e99cdd79bf1ad2c4c8c0db5aaa97ac5e1297 atom/browser/api/atom_api_browser_view.cc
-changed in both
-  base   100644 b5daaaee05f9b5041ff0eebc65048c2c7b72b6f4 atom/browser/api/atom_api_desktop_capturer.cc
-  our    100644 135b4edd11048a4635f9017f569f4b4ae644a09c atom/browser/api/atom_api_desktop_capturer.cc
-  their  100644 3aa2227cfcf110d7b9cf7be6393d61e5e98fc907 atom/browser/api/atom_api_desktop_capturer.cc
-@@ -57,6 +57,7 @@
-   cap->Emit("finished", sources);
- }
- 
-+<<<<<<< .our
- void StartHandlingTask(bool capture_window,
-                        bool capture_screen,
-                        const gfx::Size& thumbnail_size,
-@@ -71,6 +72,23 @@
-         webrtc::ScreenCapturerWinDirectx::IsSupported();
-   }
- #endif  // defined(OS_WIN)
-+=======
-+void DesktopCapturer::StartHandling(bool capture_window,
-+                                    bool capture_screen,
-+                                    const gfx::Size& thumbnail_size) {
-+  webrtc::DesktopCaptureOptions options =
-+    content::CreateDesktopCaptureOptions();
-+#if defined(OS_WIN)
-+  if (options.allow_directx_capturer()) {
-+    // DxgiDuplicatorController should be alive in this scope according to
-+    // screen_capturer_win.cc.
-+    auto duplicator = webrtc::DxgiDuplicatorController::Instance();
-+    using_directx_capturer_ =
-+        webrtc::ScreenCapturerWinDirectx::IsSupported();
-+  }
-+#endif  // defined(OS_WIN)
-+
-+>>>>>>> .their
-   std::unique_ptr<webrtc::DesktopCapturer> screen_capturer(
-       capture_screen ? content::desktop_capture::CreateScreenCapturer()
-                      : nullptr);
-@@ -168,8 +186,58 @@
- void DesktopCapturer::OnSourceThumbnailChanged(int index) {}
- 
- bool DesktopCapturer::OnRefreshFinished() {
-+<<<<<<< .our
-   capture_thread_->PostTask(FROM_HERE,
-                             base::BindOnce(OnRefreshFinishedTask, this));
-+=======
-+  const auto media_list_sources = media_list_->GetSources();
-+  std::vector<DesktopCapturer::Source> sources;
-+  for (const auto& media_list_source : media_list_sources) {
-+    sources.emplace_back(
-+        DesktopCapturer::Source{media_list_source, std::string()});
-+  }
-+
-+#if defined(OS_WIN)
-+  // Gather the same unique screen IDs used by the electron.screen API in order
-+  // to provide an association between it and desktopCapturer/getUserMedia.
-+  // This is only required when using the DirectX capturer, otherwise the IDs
-+  // across the APIs already match.
-+  if (using_directx_capturer_) {
-+    std::vector<std::string> device_names;
-+    // Crucially, this list of device names will be in the same order as
-+    // |media_list_sources|.
-+    webrtc::DxgiDuplicatorController::Instance()->GetDeviceNames(&device_names);
-+    int device_name_index = 0;
-+    for (auto& source : sources) {
-+      if (source.media_list_source.id.type ==
-+          content::DesktopMediaID::TYPE_SCREEN) {
-+        const auto& device_name = device_names[device_name_index++];
-+        std::wstring wide_device_name;
-+        base::UTF8ToWide(device_name.c_str(), device_name.size(),
-+                         &wide_device_name);
-+        const int64_t device_id =
-+            display::win::DisplayInfo::DeviceIdFromDeviceName(
-+                wide_device_name.c_str());
-+        source.display_id = base::Int64ToString(device_id);
-+      }
-+    }
-+  }
-+#elif defined(OS_MACOSX)
-+  // On Mac, the IDs across the APIs match.
-+  for (auto& source : sources) {
-+    if (source.media_list_source.id.type ==
-+        content::DesktopMediaID::TYPE_SCREEN) {
-+      source.display_id =
-+          base::Int64ToString(source.media_list_source.id.id);
-+    }
-+  }
-+#endif  // defined(OS_WIN)
-+// TODO(ajmacd): Add Linux support. The IDs across APIs differ but Chrome only
-+// supports capturing the entire desktop on Linux. Revisit this if individual
-+// screen support is added.
-+
-+  Emit("finished", sources);
-+>>>>>>> .their
-   return false;
- }
- 
-changed in both
-  base   100644 571f08bcfc63c3da3e9c6d24617ead4526da8819 atom/browser/api/atom_api_desktop_capturer.h
-  our    100644 88960e46d49dd0b68c51647be18066a2d097ce79 atom/browser/api/atom_api_desktop_capturer.h
-  their  100644 fdc35b6b1fd7348da01307f1ddfd4823d7b00f69 atom/browser/api/atom_api_desktop_capturer.h
-@@ -52,7 +52,14 @@
-   bool OnRefreshFinished() override;
- 
-  private:
-+<<<<<<< .our
-   scoped_refptr<base::SequencedTaskRunner> capture_thread_;
-+=======
-+  std::unique_ptr<DesktopMediaList> media_list_;
-+#if defined(OS_WIN)
-+  bool using_directx_capturer_ = false;
-+#endif  // defined(OS_WIN)
-+>>>>>>> .their
- 
-   DISALLOW_COPY_AND_ASSIGN(DesktopCapturer);
- };
-changed in both
-  base   100644 cb5b9af26d8f21040a45ad7d1f0c4a23e7c8c445 atom/browser/api/atom_api_menu_mac.mm
-  our    100644 2b63b8a6cefe6265d96399dc6b70ab3ffdc352c3 atom/browser/api/atom_api_menu_mac.mm
-  their  100644 a2919e65d1b4ded98cb50884ead6763ed288e7c7 atom/browser/api/atom_api_menu_mac.mm
-@@ -135,9 +135,15 @@
- // static
- void Menu::SetApplicationMenu(Menu* base_menu) {
-   MenuMac* menu = static_cast<MenuMac*>(base_menu);
-+<<<<<<< .our
-   base::scoped_nsobject<AtomMenuController> menu_controller([
-       [AtomMenuController alloc] initWithModel:menu->model_.get()
-                          useDefaultAccelerator:YES]);
-+=======
-+  base::scoped_nsobject<AtomMenuController> menu_controller(
-+      [[AtomMenuController alloc] initWithModel:menu->model_.get()
-+                          useDefaultAccelerator:YES]);
-+>>>>>>> .their
- 
-   NSRunLoop* currentRunLoop = [NSRunLoop currentRunLoop];
-   [currentRunLoop cancelPerformSelector:@selector(setMainMenu:)
-changed in both
-  base   100644 ced1cb31d8df7689f7652111720ba20fb029b1fe atom/browser/api/atom_api_menu_views.cc
-  our    100644 3da7dc2842fa4561e037aa67f290d0cc6ca71014 atom/browser/api/atom_api_menu_views.cc
-  their  100644 fa178e57d82413544b92172ae0ed4401ea5f178b atom/browser/api/atom_api_menu_views.cc
-@@ -49,8 +49,16 @@
-   menu_runners_[window_id] =
-       std::make_unique<MenuRunner>(model(), flags, close_callback);
-   menu_runners_[window_id]->RunMenuAt(
-+<<<<<<< .our
-       native_window->widget(), NULL, gfx::Rect(location, gfx::Size()),
-       views::MENU_ANCHOR_TOPLEFT, ui::MENU_SOURCE_MOUSE);
-+=======
-+      native_window->widget(),
-+      NULL,
-+      gfx::Rect(location, gfx::Size()),
-+      views::MENU_ANCHOR_TOPLEFT,
-+      ui::MENU_SOURCE_MOUSE);
-+>>>>>>> .their
- }
- 
- void MenuViews::ClosePopupAt(int32_t window_id) {
-removed in local
-  base   100644 0d22fad5b8b5e3ed7711d55aa763f930014a75d7 atom/browser/api/atom_api_screen_mac.mm
-  their  100644 056b775fdfc221cb0501ba5b7afd8de01f2d4d63 atom/browser/api/atom_api_screen_mac.mm
-changed in both
-  base   100644 6e5c4b9cbe77c1a4004bbc2bf7b0f0089ffb9004 atom/browser/api/atom_api_session.cc
-  our    100644 658f913bb60b66ae1bf3aae97d7d9158e56f7ee0 atom/browser/api/atom_api_session.cc
-  their  100644 d36812daa35dc795b667c190952b980f25d9e618 atom/browser/api/atom_api_session.cc
-@@ -29,7 +29,6 @@
- #include "base/guid.h"
- #include "base/strings/string_number_conversions.h"
- #include "base/strings/string_util.h"
--#include "base/threading/thread_task_runner_handle.h"
- #include "brightray/browser/media/media_device_id_salt.h"
- #include "chrome/browser/browser_process.h"
- #include "chrome/common/pref_names.h"
-@@ -46,8 +45,12 @@
- #include "net/dns/host_cache.h"
- #include "net/http/http_auth_handler_factory.h"
- #include "net/http/http_auth_preferences.h"
-+<<<<<<< .our
- #include "net/proxy_resolution/proxy_config_service_fixed.h"
- #include "net/proxy_resolution/proxy_service.h"
-+=======
-+#include "net/proxy/proxy_config_service_fixed.h"
-+>>>>>>> .their
- #include "net/url_request/static_http_user_agent_settings.h"
- #include "net/url_request/url_request_context.h"
- #include "net/url_request/url_request_context_getter.h"
-@@ -236,6 +239,7 @@
- // Referenced session objects.
- std::map<uint32_t, v8::Global<v8::Object>> g_sessions;
- 
-+<<<<<<< .our
- class ResolveProxyHelper {
-  public:
-   ResolveProxyHelper(AtomBrowserContext* browser_context,
-@@ -286,6 +290,8 @@
-   DISALLOW_COPY_AND_ASSIGN(ResolveProxyHelper);
- };
- 
-+=======
-+>>>>>>> .their
- // Runs the callback in UI thread.
- void RunCallbackInUI(const base::Callback<void()>& callback) {
-   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, callback);
-@@ -451,6 +457,7 @@
-   AtomNetworkDelegate* network_delegate =
-       static_cast<AtomNetworkDelegate*>(context->network_delegate());
-   network_delegate->SetDevToolsNetworkEmulationClientId(client_id);
-+<<<<<<< .our
- }
- 
- void DestroyGlobalHandle(v8::Isolate* isolate,
-@@ -468,6 +475,8 @@
-       object->SetAlignedPointerInInternalField(0, nullptr);
-     }
-   }
-+=======
-+>>>>>>> .their
- }
- 
- }  // namespace
-@@ -513,8 +522,10 @@
-   }
- }
- 
--void Session::ResolveProxy(const GURL& url, ResolveProxyCallback callback) {
--  new ResolveProxyHelper(browser_context(), url, callback);
-+void Session::ResolveProxy(
-+    const GURL& url,
-+    const ResolveProxyHelper::ResolveProxyCallback& callback) {
-+  browser_context_->GetResolveProxyHelper()->ResolveProxy(url, callback);
- }
- 
- template <Session::CacheAction action>
-changed in both
-  base   100644 d56c2400d4df9d197a03335c4e2b7e735065f301 atom/browser/api/atom_api_session.h
-  our    100644 6c8247c5c4a90e643712dd47d000d37d181a147b atom/browser/api/atom_api_session.h
-  their  100644 547f0e627b0ecf23e808b85cbd5173892479673f atom/browser/api/atom_api_session.h
-@@ -10,6 +10,7 @@
- 
- #include "atom/browser/api/trackable_object.h"
- #include "atom/browser/atom_blob_reader.h"
-+#include "atom/browser/net/resolve_proxy_helper.h"
- #include "base/values.h"
- #include "content/public/browser/download_manager.h"
- #include "native_mate/handle.h"
-@@ -39,8 +40,6 @@
- class Session : public mate::TrackableObject<Session>,
-                 public content::DownloadManager::Observer {
-  public:
--  using ResolveProxyCallback = base::Callback<void(std::string)>;
--
-   enum class CacheAction {
-     CLEAR,
-     STATS,
-@@ -63,8 +62,14 @@
-                              v8::Local<v8::FunctionTemplate> prototype);
- 
-   // Methods.
-+<<<<<<< .our
-   void ResolveProxy(const GURL& url, ResolveProxyCallback callback);
-   template <CacheAction action>
-+=======
-+  void ResolveProxy(const GURL& url,
-+                    const ResolveProxyHelper::ResolveProxyCallback& callback);
-+  template<CacheAction action>
-+>>>>>>> .their
-   void DoCacheAction(const net::CompletionCallback& callback);
-   void ClearStorageData(mate::Arguments* args);
-   void FlushStorageData();
-changed in both
-  base   100644 d3607e7283ccb8c5119c793bdda4c476baae1c7f atom/browser/api/atom_api_url_request.cc
-  our    100644 9f18d97d2656fbc5dc62b7bcea05a8acab63e847 atom/browser/api/atom_api_url_request.cc
-  their  100644 f4660abe1873766b9ba93f17f066c64a8f22b136 atom/browser/api/atom_api_url_request.cc
-changed in both
-  base   100644 372ac98ac6578d7c757bcb47288a6a310cad3134 atom/browser/api/atom_api_url_request.h
-  our    100644 4a5a2b65160bf0590c9e890e52d0531b799b583a atom/browser/api/atom_api_url_request.h
-  their  100644 13d3e18811c566bbd3e8ff4d5bb7bc271bfab4a7 atom/browser/api/atom_api_url_request.h
-changed in both
-  base   100644 83adf62eee8301c49799b5397f2dcf6bfdbbd295 atom/browser/api/atom_api_web_contents.cc
-  our    100644 20a1ac2e672f08ffea528b6e094ba530ff8083d1 atom/browser/api/atom_api_web_contents.cc
-  their  100644 9a19b727a82229565ec37e6a436bdbec4e670925 atom/browser/api/atom_api_web_contents.cc
-@@ -124,6 +124,30 @@
- struct Converter<PrintSettings> {
-   static bool FromV8(v8::Isolate* isolate,
-                      v8::Local<v8::Value> val,
-+<<<<<<< .our
-+=======
-+                     atom::SetSizeParams* out) {
-+    mate::Dictionary params;
-+    if (!ConvertFromV8(isolate, val, &params))
-+      return false;
-+    bool autosize;
-+    if (params.Get("enableAutoSize", &autosize))
-+      out->enable_auto_size.reset(new bool(autosize));
-+    gfx::Size size;
-+    if (params.Get("min", &size))
-+      out->min_size.reset(new gfx::Size(size));
-+    if (params.Get("max", &size))
-+      out->max_size.reset(new gfx::Size(size));
-+    if (params.Get("normal", &size))
-+      out->normal_size.reset(new gfx::Size(size));
-+    return true;
-+  }
-+};
-+
-+template<>
-+struct Converter<PrintSettings> {
-+  static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
-+>>>>>>> .their
-                      PrintSettings* out) {
-     mate::Dictionary dict;
-     if (!ConvertFromV8(isolate, val, &dict))
-@@ -280,7 +304,12 @@
- 
- // Called when CapturePage is done.
- void OnCapturePageDone(const base::Callback<void(const gfx::Image&)>& callback,
-+<<<<<<< .our
-                        const SkBitmap& bitmap) {
-+=======
-+                       const SkBitmap& bitmap,
-+                       content::ReadbackResponse response) {
-+>>>>>>> .their
-   // Hack to enable transparency in captured image
-   // TODO(nitsakh) Remove hack once fixed in chromium
-   const_cast<SkBitmap&>(bitmap).setAlphaType(kPremul_SkAlphaType);
-@@ -1015,6 +1044,18 @@
-                                     content::RenderFrameHost* frame_host) {
-   bool handled = true;
-   FrameDispatchHelper helper = {this, frame_host};
-+<<<<<<< .our
-+=======
-+  auto relay = NativeWindowRelay::FromWebContents(web_contents());
-+  if (relay) {
-+    IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(NativeWindow, message, frame_host)
-+      IPC_MESSAGE_FORWARD(AtomAutofillFrameHostMsg_HidePopup,
-+                          relay->window.get(), NativeWindow::HideAutofillPopup)
-+      IPC_MESSAGE_UNHANDLED(handled = false)
-+    IPC_END_MESSAGE_MAP()
-+  }
-+
-+>>>>>>> .their
-   IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(WebContents, message, frame_host)
-     IPC_MESSAGE_HANDLER(AtomFrameHostMsg_Message, OnRendererMessage)
-     IPC_MESSAGE_FORWARD_DELAY_REPLY(AtomFrameHostMsg_Message_Sync, &helper,
-@@ -1024,10 +1065,14 @@
-         FrameDispatchHelper::OnSetTemporaryZoomLevel)
-     IPC_MESSAGE_FORWARD_DELAY_REPLY(AtomFrameHostMsg_GetZoomLevel, &helper,
-                                     FrameDispatchHelper::OnGetZoomLevel)
-+<<<<<<< .our
- #if defined(TOOLKIT_VIEWS) && !defined(OS_MACOSX)
-     IPC_MESSAGE_HANDLER(AtomAutofillFrameHostMsg_ShowPopup, ShowAutofillPopup)
-     IPC_MESSAGE_HANDLER(AtomAutofillFrameHostMsg_HidePopup, HideAutofillPopup)
- #endif
-+=======
-+    IPC_MESSAGE_HANDLER(AtomAutofillFrameHostMsg_ShowPopup, ShowAutofillPopup)
-+>>>>>>> .their
-     IPC_MESSAGE_UNHANDLED(handled = false)
-   IPC_END_MESSAGE_MAP()
- 
-@@ -1075,6 +1120,20 @@
-        details.is_same_document, details.did_replace_entry);
- }
- 
-+<<<<<<< .our
-+=======
-+int64_t WebContents::GetIDForContents(content::WebContents* web_contents) {
-+  int64_t process_id = web_contents->GetRenderProcessHost()->GetID();
-+  int64_t routing_id = web_contents->GetMainFrame()->GetRoutingID();
-+  int64_t rv = (process_id << 32) + routing_id;
-+  return rv;
-+}
-+
-+int64_t WebContents::GetID() const {
-+  return WebContents::GetIDForContents(web_contents());
-+}
-+
-+>>>>>>> .their
- int WebContents::GetProcessID() const {
-   return web_contents()->GetMainFrame()->GetProcess()->GetID();
- }
-@@ -1552,7 +1611,11 @@
- bool WebContents::SendIPCMessage(bool all_frames,
-                                  const base::string16& channel,
-                                  const base::ListValue& args) {
-+<<<<<<< .our
-   auto* frame_host = web_contents()->GetMainFrame();
-+=======
-+  auto frame_host = web_contents()->GetMainFrame();
-+>>>>>>> .their
-   if (frame_host) {
-     return frame_host->Send(new AtomFrameMsg_Message(
-         frame_host->GetRoutingID(), all_frames, channel, args));
-@@ -1853,6 +1916,7 @@
-   rfh->Send(reply_msg);
- }
- 
-+<<<<<<< .our
- v8::Local<v8::Value> WebContents::GetPreloadPath(v8::Isolate* isolate) const {
-   if (auto* web_preferences = WebContentsPreferences::From(web_contents())) {
-     base::FilePath::StringType preload;
-@@ -1880,6 +1944,25 @@
- }
- 
- v8::Local<v8::Value> WebContents::GetOwnerBrowserWindow() const {
-+=======
-+v8::Local<v8::Value> WebContents::GetWebPreferences(v8::Isolate* isolate) {
-+  WebContentsPreferences* web_preferences =
-+      WebContentsPreferences::FromWebContents(web_contents());
-+  if (!web_preferences)
-+    return v8::Null(isolate);
-+  return mate::ConvertToV8(isolate, *web_preferences->web_preferences());
-+}
-+
-+v8::Local<v8::Value> WebContents::GetLastWebPreferences(v8::Isolate* isolate) {
-+  WebContentsPreferences* web_preferences =
-+      WebContentsPreferences::FromWebContents(web_contents());
-+  if (!web_preferences)
-+    return v8::Null(isolate);
-+  return mate::ConvertToV8(isolate, *web_preferences->last_web_preferences());
-+}
-+
-+v8::Local<v8::Value> WebContents::GetOwnerBrowserWindow() {
-+>>>>>>> .their
-   if (owner_window())
-     return BrowserWindow::From(isolate(), owner_window());
-   else
-@@ -2013,7 +2096,10 @@
-       .SetMethod("endFrameSubscription", &WebContents::EndFrameSubscription)
-       .SetMethod("startDrag", &WebContents::StartDrag)
-       .SetMethod("isGuest", &WebContents::IsGuest)
-+<<<<<<< .our
-       .SetMethod("attachToIframe", &WebContents::AttachToIframe)
-+=======
-+>>>>>>> .their
-       .SetMethod("isOffscreen", &WebContents::IsOffScreen)
-       .SetMethod("startPainting", &WebContents::StartPainting)
-       .SetMethod("stopPainting", &WebContents::StopPainting)
-changed in both
-  base   100644 16f23210557ca816cdeadd50b9332447eca8815f atom/browser/api/atom_api_web_contents.h
-  our    100644 7939f8268aa8c3371623e0c15f3b6001d7f1efa4 atom/browser/api/atom_api_web_contents.h
-  their  100644 027332a3706d5ac43a4a769234d361304bdc0350 atom/browser/api/atom_api_web_contents.h
-@@ -97,6 +97,8 @@
-   static void BuildPrototype(v8::Isolate* isolate,
-                              v8::Local<v8::FunctionTemplate> prototype);
- 
-+  static int64_t GetIDForContents(content::WebContents* web_contents);
-+
-   // Notifies to destroy any guest web contents before destroying self.
-   void DestroyWebContents(bool async);
- 
-@@ -234,8 +236,13 @@
-   v8::Local<v8::Value> GetPreloadPath(v8::Isolate* isolate) const;
- 
-   // Returns the web preferences of current WebContents.
-+<<<<<<< .our
-   v8::Local<v8::Value> GetWebPreferences(v8::Isolate* isolate) const;
-   v8::Local<v8::Value> GetLastWebPreferences(v8::Isolate* isolate) const;
-+=======
-+  v8::Local<v8::Value> GetWebPreferences(v8::Isolate* isolate);
-+  v8::Local<v8::Value> GetLastWebPreferences(v8::Isolate* isolate);
-+>>>>>>> .their
- 
-   // Returns the owner window.
-   v8::Local<v8::Value> GetOwnerBrowserWindow() const;
-changed in both
-  base   100644 3f53f4d3d7204f59037ba80556a2c9896e23aae4 atom/browser/api/atom_api_web_request.cc
-  our    100644 c088196f833160ac964e67030fa083302dd090b0 atom/browser/api/atom_api_web_request.cc
-  their  100644 ac84ac196b69a121a54dc64b87b7c2c1d6df21b5 atom/browser/api/atom_api_web_request.cc
-@@ -40,7 +40,11 @@
- 
- namespace {
- 
-+<<<<<<< .our
- template <typename Method, typename Event, typename Listener>
-+=======
-+template<typename Method, typename Event, typename Listener>
-+>>>>>>> .their
- void CallNetworkDelegateMethod(
-     brightray::URLRequestContextGetter* url_request_context_getter,
-     Method method,
-@@ -95,14 +99,24 @@
-   }
- 
-   brightray::URLRequestContextGetter* url_request_context_getter =
-+<<<<<<< .our
-       browser_context_->GetRequestContext();
-+=======
-+      browser_context_->url_request_context_getter();
-+>>>>>>> .their
-   if (!url_request_context_getter)
-     return;
-   BrowserThread::PostTask(
-       BrowserThread::IO, FROM_HERE,
-+<<<<<<< .our
-       base::BindOnce(&CallNetworkDelegateMethod<Method, Event, Listener>,
-                      base::RetainedRef(url_request_context_getter), method,
-                      type, std::move(patterns), std::move(listener)));
-+=======
-+      base::Bind(&CallNetworkDelegateMethod<Method, Event, Listener>,
-+                 base::RetainedRef(url_request_context_getter),
-+                 method, type, std::move(patterns), std::move(listener)));
-+>>>>>>> .their
- }
- 
- // static
-removed in local
-  base   100644 993f9680ccb475f8870a2e3b4da2d20472531d91 atom/browser/api/atom_api_window.cc
-  their  100644 d82dc76f802bf17c5d0cb159fdd5aa7a334b9675 atom/browser/api/atom_api_window.cc
-removed in local
-  base   100644 f86c387a34afb15920738413c6819176081b5ee7 atom/browser/api/atom_api_window.h
-  their  100644 7abebe798c261c64d9634dbdd46aba182175c4d3 atom/browser/api/atom_api_window.h
-changed in both
-  base   100644 8810fed4b9aef78842fb65db93ed2efebabb6928 atom/browser/api/event.cc
-  our    100644 7b617034eca5a229fc9323bfd6d531ebded752d6 atom/browser/api/event.cc
-  their  100644 1ee0d57e36068c9b6427c278e9a7a5a66b7f8f79 atom/browser/api/event.cc
-@@ -6,7 +6,10 @@
- 
- #include "atom/common/api/api_messages.h"
- #include "atom/common/native_mate_converters/string16_converter.h"
-+<<<<<<< .our
- #include "atom/common/native_mate_converters/value_converter.h"
-+=======
-+>>>>>>> .their
- #include "content/public/browser/render_frame_host.h"
- #include "content/public/browser/web_contents.h"
- #include "native_mate/object_template_builder.h"
-@@ -27,6 +30,7 @@
-   message_ = message;
- 
-   Observe(content::WebContents::FromRenderFrameHost(sender));
-+<<<<<<< .our
- }
- 
- void Event::RenderFrameDeleted(content::RenderFrameHost* rfh) {
-@@ -42,6 +46,23 @@
-     sender_ = new_rfh;
- }
- 
-+=======
-+}
-+
-+void Event::RenderFrameDeleted(content::RenderFrameHost* rfh) {
-+  if (sender_ != rfh)
-+    return;
-+  sender_ = nullptr;
-+  message_ = nullptr;
-+}
-+
-+void Event::RenderFrameHostChanged(content::RenderFrameHost* old_rfh,
-+                                   content::RenderFrameHost* new_rfh) {
-+  if (sender_ && sender_ == old_rfh)
-+    sender_ = new_rfh;
-+}
-+
-+>>>>>>> .their
- void Event::FrameDeleted(content::RenderFrameHost* rfh) {
-   if (sender_ != rfh)
-     return;
-@@ -57,7 +78,11 @@
-   if (message_ == nullptr || sender_ == nullptr)
-     return false;
- 
-+<<<<<<< .our
-   AtomFrameHostMsg_Message_Sync::WriteReplyParams(message_, result);
-+=======
-+  AtomFrameHostMsg_Message_Sync::WriteReplyParams(message_, json);
-+>>>>>>> .their
-   bool success = sender_->Send(message_);
-   message_ = nullptr;
-   sender_ = nullptr;
-changed in both
-  base   100644 d73bd2f64b55b5eb0827f819805578559b947f46 atom/browser/api/event.h
-  our    100644 fbec8f27574691005d203adbafb50709f5c2d010 atom/browser/api/event.h
-  their  100644 05ad7daff8ac524294c1cacb66f876efc9716dd4 atom/browser/api/event.h
-@@ -44,8 +44,13 @@
- 
-  private:
-   // Replyer for the synchronous messages.
-+<<<<<<< .our
-   content::RenderFrameHost* sender_ = nullptr;
-   IPC::Message* message_ = nullptr;
-+=======
-+  content::RenderFrameHost* sender_;
-+  IPC::Message* message_;
-+>>>>>>> .their
- 
-   DISALLOW_COPY_AND_ASSIGN(Event);
- };
-changed in both
-  base   100644 3dbcd0601ef8a63cd6712b566cdc7f388c85e3ee atom/browser/api/event_emitter.cc
-  our    100644 c6e810b51225c8f89eaf53ac3e46381b52ba63b5 atom/browser/api/event_emitter.cc
-  their  100644 91769cbb94794a978732773612a3fec245acd750 atom/browser/api/event_emitter.cc
-changed in both
-  base   100644 8d9d2960df35a33a09dfc79c4c35d424738df43f atom/browser/api/event_emitter.h
-  our    100644 5e4ca3b4ffcb184583ef386100eabda7a9e00da0 atom/browser/api/event_emitter.h
-  their  100644 8145113084a9c0c34ea808e3712879f5f70737c9 atom/browser/api/event_emitter.h
-changed in both
-  base   100644 c83a99c2b38708ca296b4c9215e26cb58eb9a7d2 atom/browser/atom_browser_client.cc
-  our    100644 57c4ee582405e6d501ec23940ccb10689ecd64a1 atom/browser/atom_browser_client.cc
-  their  100644 5c442b32d70e1e1a51b79bfd2d093479ab518060 atom/browser/atom_browser_client.cc
-@@ -343,6 +343,11 @@
-       web_preferences->AppendCommandLineSwitches(command_line);
-     SessionPreferences::AppendExtraCommandLineSwitches(
-         web_contents->GetBrowserContext(), command_line);
-+
-+    auto context_id = atom::api::WebContents::GetIDForContents(
-+      web_contents);
-+    command_line->AppendSwitchASCII(switches::kContextId,
-+      base::IntToString(context_id));
-   }
- }
- 
-@@ -497,7 +502,6 @@
- 
- brightray::BrowserMainParts* AtomBrowserClient::OverrideCreateBrowserMainParts(
-     const content::MainFunctionParams&) {
--  v8::V8::Initialize();  // Init V8 before creating main parts.
-   return new AtomBrowserMainParts;
- }
- 
-changed in both
-  base   100644 07b351b551b609e8b7201753b8969ad9dc6f6a52 atom/browser/atom_browser_context.cc
-  our    100644 e036cbc8103f19a034ce386940462f8a23ea6807 atom/browser/atom_browser_context.cc
-  their  100644 f297fbef0a6e75cdb5ca00c86090eb27e44031a7 atom/browser/atom_browser_context.cc
-@@ -9,8 +9,18 @@
- #include "atom/browser/atom_download_manager_delegate.h"
- #include "atom/browser/atom_permission_manager.h"
- #include "atom/browser/browser.h"
-+<<<<<<< .our
- #include "atom/browser/request_context_delegate.h"
- #include "atom/browser/special_storage_policy.h"
-+=======
-+#include "atom/browser/net/about_protocol_handler.h"
-+#include "atom/browser/net/asar/asar_protocol_handler.h"
-+#include "atom/browser/net/atom_cert_verifier.h"
-+#include "atom/browser/net/atom_network_delegate.h"
-+#include "atom/browser/net/atom_url_request_job_factory.h"
-+#include "atom/browser/net/http_protocol_handler.h"
-+#include "atom/browser/net/resolve_proxy_helper.h"
-+>>>>>>> .their
- #include "atom/browser/web_view_manager.h"
- #include "atom/common/atom_version.h"
- #include "atom/common/chrome_version.h"
-@@ -133,6 +143,14 @@
-   return blob_reader_.get();
- }
- 
-+ResolveProxyHelper* AtomBrowserContext::GetResolveProxyHelper() {
-+  if (!resolve_proxy_helper_.get()) {
-+    resolve_proxy_helper_ =
-+        base::MakeRefCounted<ResolveProxyHelper>(url_request_context_getter());
-+  }
-+  return resolve_proxy_helper_.get();
-+}
-+
- // static
- scoped_refptr<AtomBrowserContext> AtomBrowserContext::From(
-     const std::string& partition,
-changed in both
-  base   100644 359d3d6b71a5ea1d606b59d7f9b158a15baf1942 atom/browser/atom_browser_context.h
-  our    100644 9e6a841ceb8d11069a1a094bf7dbbd3a788918b3 atom/browser/atom_browser_context.h
-  their  100644 77469254db0a598a714d5c9ac3abefbe41ed89af atom/browser/atom_browser_context.h
-@@ -20,8 +20,12 @@
- class AtomBlobReader;
- class AtomDownloadManagerDelegate;
- class AtomPermissionManager;
-+<<<<<<< .our
- class RequestContextDelegate;
- class SpecialStoragePolicy;
-+=======
-+class ResolveProxyHelper;
-+>>>>>>> .their
- class WebViewManager;
- 
- class AtomBrowserContext : public brightray::BrowserContext {
-@@ -49,8 +53,16 @@
-   void OnMainRequestContextCreated(
-       brightray::URLRequestContextGetter* getter) override;
- 
-+<<<<<<< .our
-   RequestContextDelegate* GetRequestContextDelegate() const {
-     return request_context_delegate_.get();
-+=======
-+  ResolveProxyHelper* GetResolveProxyHelper();
-+
-+  AtomBlobReader* GetBlobReader();
-+  AtomCookieDelegate* cookie_delegate() const {
-+    return cookie_delegate_.get();
-+>>>>>>> .their
-   }
- 
-  protected:
-@@ -60,8 +72,12 @@
-   ~AtomBrowserContext() override;
- 
-  private:
-+<<<<<<< .our
-   brightray::URLRequestContextGetter* url_request_context_getter_;
- 
-+=======
-+  scoped_refptr<ResolveProxyHelper> resolve_proxy_helper_;
-+>>>>>>> .their
-   std::unique_ptr<AtomDownloadManagerDelegate> download_manager_delegate_;
-   std::unique_ptr<WebViewManager> guest_manager_;
-   std::unique_ptr<AtomPermissionManager> permission_manager_;
-changed in both
-  base   100644 86d50d3c78bda4f4c61dedf43904f9243633d946 atom/browser/atom_browser_main_parts.cc
-  our    100644 5229b19ca9af7845a3f2f13b7e0913f633b68b1d atom/browser/atom_browser_main_parts.cc
-  their  100644 4ecd61b3ab14ceeebab78f95f44b0f1153ccb350 atom/browser/atom_browser_main_parts.cc
-changed in both
-  base   100644 f16ee50158508565cc1e043d3257ad687cc69215 atom/browser/browser.cc
-  our    100644 ce35de64d60c6767ac52596c1b32e7bde5ceefa0 atom/browser/browser.cc
-  their  100644 3ba915f91eb3403df9630697e77cce9ed7fa3307 atom/browser/browser.cc
-changed in both
-  base   100644 0970b26b776b34f68e5f22776e74c19ddcc039ad atom/browser/browser.h
-  our    100644 aed7d25c37da59c0dd5e09940a064c329353a0b2 atom/browser/browser.h
-  their  100644 a8c1a8c5e7c4409e3a78279da46fb2ba6112f409 atom/browser/browser.h
-@@ -277,7 +277,11 @@
-   bool is_ready_ = false;
- 
-   // The browser is being shutdown.
-+<<<<<<< .our
-   bool is_shutdown_ = false;
-+=======
-+  bool is_shutdown_;
-+>>>>>>> .their
- 
-   int badge_count_ = 0;
- 
-changed in both
-  base   100644 0faeee36f9390b36bc5963b2f90d2063e3603109 atom/browser/browser_mac.mm
-  our    100644 27e347eccebf006336d5d110c81717ecc45af9c3 atom/browser/browser_mac.mm
-  their  100644 e47b8cb9d3c7fcf24279cd6e973a1b00a85ea25a atom/browser/browser_mac.mm
-changed in both
-  base   100644 7c154b60b00e25c42847ceefb98723b50ea03dd0 atom/browser/native_browser_view.h
-  our    100644 56937e4c8c69e3605d2b6cc71a0877b74ff4e83d atom/browser/native_browser_view.h
-  their  100644 cab6980fa2cf035c1a5ca6b4aee822a0ee604fd4 atom/browser/native_browser_view.h
-changed in both
-  base   100644 17b0a1ee9006dd70888165a9209076fd7065f3cc atom/browser/native_browser_view_mac.mm
-  our    100644 0416e26e89f1e0f37366ef1798b4359da0729225 atom/browser/native_browser_view_mac.mm
-  their  100644 86df632638ef7772270569824515b251470d0c08 atom/browser/native_browser_view_mac.mm
-changed in both
-  base   100644 78e788b3019c23bce13fdc8d94385d4a3937cf22 atom/browser/native_browser_view_views.cc
-  our    100644 6414005a1e40d80ae86102b12edee0255cab9adb atom/browser/native_browser_view_views.cc
-  their  100644 def64d12e3520fa15a2b6779147a819a6eaec2f8 atom/browser/native_browser_view_views.cc
-changed in both
-  base   100644 5dcda13447cde098fccaf8782fefb97d861d47f4 atom/browser/native_browser_view_views.h
-  our    100644 8f8e860292baddad1156c50ae7cfaa0fd6e87d99 atom/browser/native_browser_view_views.h
-  their  100644 abf47178302ad7527c1640a3f41492f871f137e5 atom/browser/native_browser_view_views.h
-changed in both
-  base   100644 34778fb6434707e6ae3c70ab55e48e87eb556448 atom/browser/native_window.cc
-  our    100644 4ff2bcfcabfd34d8563f9ed213c03655a99dd9c6 atom/browser/native_window.cc
-  their  100644 26ac44607ebceadcde1d4c038890d914c888a0d5 atom/browser/native_window.cc
-@@ -21,6 +21,11 @@
- #include "ui/display/win/screen_win.h"
- #endif
- 
-+#if defined(OS_WIN)
-+#include "ui/base/win/shell.h"
-+#include "ui/display/win/screen_win.h"
-+#endif
-+
- DEFINE_WEB_CONTENTS_USER_DATA_KEY(atom::NativeWindowRelay);
- 
- namespace atom {
-@@ -45,9 +50,29 @@
- 
- }  // namespace
- 
-+<<<<<<< .our
- NativeWindow::NativeWindow(const mate::Dictionary& options,
-                            NativeWindow* parent)
-     : widget_(new views::Widget), parent_(parent), weak_factory_(this) {
-+=======
-+NativeWindow::NativeWindow(
-+    brightray::InspectableWebContents* inspectable_web_contents,
-+    const mate::Dictionary& options,
-+    NativeWindow* parent)
-+    : content::WebContentsObserver(inspectable_web_contents->GetWebContents()),
-+      has_frame_(true),
-+      transparent_(false),
-+      enable_larger_than_screen_(false),
-+      is_closed_(false),
-+      sheet_offset_x_(0.0),
-+      sheet_offset_y_(0.0),
-+      aspect_ratio_(0.0),
-+      parent_(parent),
-+      is_modal_(false),
-+      is_osr_dummy_(false),
-+      inspectable_web_contents_(inspectable_web_contents),
-+      weak_factory_(this) {
-+>>>>>>> .their
-   options.Get(options::kFrame, &has_frame_);
-   options.Get(options::kTransparent, &transparent_);
-   options.Get(options::kEnableLargerThanScreen, &enable_larger_than_screen_);
-changed in both
-  base   100644 d1cfa7cc352971772689ecd60a110b48ef1a7eaa atom/browser/native_window.h
-  our    100644 35b67e2dd230692c415a32aae5f0a5e99ab74ac0 atom/browser/native_window.h
-  their  100644 61922aea78e3b61db614354e6a578fcda925096b atom/browser/native_window.h
-@@ -220,6 +220,17 @@
-   virtual void HandleKeyboardEvent(
-       content::WebContents*,
-       const content::NativeWebKeyboardEvent& event) {}
-+<<<<<<< .our
-+=======
-+  virtual void ShowAutofillPopup(content::RenderFrameHost* frame_host,
-+                                 content::WebContents* web_contents,
-+                                 const gfx::RectF& bounds,
-+                                 const std::vector<base::string16>& values,
-+                                 const std::vector<base::string16>& labels) {}
-+  virtual void HideAutofillPopup(content::RenderFrameHost* frame_host) {}
-+>>>>>>> .their
-+
-+  virtual void UpdateDraggableRegionViews() {}
- 
-   // Public API used by platform-dependent delegates and observers to send UI
-   // related notifications.
-@@ -340,8 +351,13 @@
- class NativeWindowRelay
-     : public content::WebContentsUserData<NativeWindowRelay> {
-  public:
-+<<<<<<< .our
-   explicit NativeWindowRelay(base::WeakPtr<NativeWindow> window);
-   ~NativeWindowRelay() override;
-+=======
-+  explicit NativeWindowRelay(base::WeakPtr<NativeWindow> window)
-+      : key(UserDataKey()), window(window) {}
-+>>>>>>> .their
- 
-   static void* UserDataKey() {
-     return content::WebContentsUserData<NativeWindowRelay>::UserDataKey();
-changed in both
-  base   100644 60d8fc23f59a842c100412b1c236b87d0815a7a0 atom/browser/native_window_mac.h
-  our    100644 44a78198f44cdba9875e3fb27c8e2c87eaa6f33b atom/browser/native_window_mac.h
-  their  100644 9e8c3aef87dd8d2d4a3260587b7013d260649b55 atom/browser/native_window_mac.h
-@@ -118,8 +118,11 @@
-   void MoveTabToNewWindow() override;
-   void ToggleTabBar() override;
-   bool AddTabbedWindow(NativeWindow* window) override;
-+<<<<<<< .our
- 
-   bool SetWindowButtonVisibility(bool visible) override;
-+=======
-+>>>>>>> .their
- 
-   void SetVibrancy(const std::string& type) override;
-   void SetTouchBar(
-@@ -130,8 +133,19 @@
-   gfx::Rect ContentBoundsToWindowBounds(const gfx::Rect& bounds) const override;
-   gfx::Rect WindowBoundsToContentBounds(const gfx::Rect& bounds) const override;
- 
-+<<<<<<< .our
-   // Use a custom content view instead of Chromium's BridgedContentView.
-   void OverrideNSWindowContentView();
-+=======
-+  // content::WebContentsObserver:
-+  void RenderViewHostChanged(content::RenderViewHost* old_host,
-+                             content::RenderViewHost* new_host) override;
-+
-+  // Refresh the DraggableRegion views.
-+  void UpdateDraggableRegionViews() override {
-+    UpdateDraggableRegionViews(draggable_regions_);
-+  }
-+>>>>>>> .their
- 
-   // Set the attribute of NSWindow while work around a bug of zoom button.
-   void SetStyleMask(bool on, NSUInteger flag);
-changed in both
-  base   100644 ad1713e401240dbc1c2054551d0caeb41aea2884 atom/browser/native_window_mac.mm
-  our    100644 004263ec127709067e903ffbf31003b8844226b4 atom/browser/native_window_mac.mm
-  their  100644 0397c62d8df94b3ce66482c0d9c4b3b87ac97a45 atom/browser/native_window_mac.mm
-@@ -28,9 +28,12 @@
- #include "skia/ext/skia_utils_mac.h"
- #include "ui/gfx/skia_util.h"
- #include "ui/gl/gpu_switching_manager.h"
-+<<<<<<< .our
- #include "ui/views/background.h"
- #include "ui/views/cocoa/bridged_native_widget.h"
- #include "ui/views/widget/widget.h"
-+=======
-+>>>>>>> .their
- 
- // This view always takes the size of its superview. It is intended to be used
- // as a NSWindow's contentView.  It is needed because NSWindow's implementation
-@@ -1144,10 +1147,17 @@
- }
- 
- bool NativeWindowMac::AddTabbedWindow(NativeWindow* window) {
-+<<<<<<< .our
-   if (window_ == window->GetNativeWindow()) {
-     return false;
-   } else {
-     if (@available(macOS 10.12, *))
-+=======
-+  if (window_.get() == window->GetNativeWindow()) {
-+    return false;
-+  } else {
-+    if ([window_ respondsToSelector:@selector(addTabbedWindow:ordered:)])
-+>>>>>>> .their
-       [window_ addTabbedWindow:window->GetNativeWindow() ordered:NSWindowAbove];
-   }
-   return true;
-@@ -1185,15 +1195,22 @@
-       return;
-     }
- 
-+<<<<<<< .our
-     background_color_before_vibrancy_.reset([[window_ backgroundColor] retain]);
-     transparency_before_vibrancy_ = [window_ titlebarAppearsTransparent];
-     ui::GpuSwitchingManager::SetTransparent(true);
-+=======
-+    [vibrant_view removeFromSuperview];
-+    [window_ setVibrantView:nil];
-+    ui::GpuSwitchingManager::SetTransparent(transparent());
-+>>>>>>> .their
- 
-     if (title_bar_style_ != NORMAL) {
-       [window_ setTitlebarAppearsTransparent:YES];
-       [window_ setBackgroundColor:[NSColor clearColor]];
-     }
- 
-+<<<<<<< .our
-     NSVisualEffectView* effect_view = (NSVisualEffectView*)vibrant_view;
-     if (effect_view == nil) {
-       effect_view = [[[NSVisualEffectView alloc]
-@@ -1208,6 +1225,31 @@
-                              positioned:NSWindowBelow
-                              relativeTo:nil];
-     }
-+=======
-+  SetRenderWidgetHostOpaque(false);
-+  background_color_before_vibrancy_.reset([window_ backgroundColor]);
-+  transparency_before_vibrancy_ = [window_ titlebarAppearsTransparent];
-+  ui::GpuSwitchingManager::SetTransparent(true);
-+
-+  if (title_bar_style_ != NORMAL) {
-+    [window_ setTitlebarAppearsTransparent:YES];
-+    [window_ setBackgroundColor:[NSColor clearColor]];
-+  }
-+
-+  NSVisualEffectView* effect_view = (NSVisualEffectView*)vibrant_view;
-+  if (effect_view == nil) {
-+    effect_view = [[[NSVisualEffectView alloc]
-+        initWithFrame: [[window_ contentView] bounds]] autorelease];
-+    [window_ setVibrantView:(NSView*)effect_view];
-+
-+    [effect_view setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
-+    [effect_view setBlendingMode:NSVisualEffectBlendingModeBehindWindow];
-+    [effect_view setState:NSVisualEffectStateActive];
-+    [[window_ contentView] addSubview:effect_view
-+                           positioned:NSWindowBelow
-+                           relativeTo:nil];
-+  }
-+>>>>>>> .their
- 
-     NSVisualEffectMaterial vibrancyType = NSVisualEffectMaterialLight;
- 
-@@ -1387,6 +1429,7 @@
-     [parent->GetNativeWindow() addChildWindow:window_ ordered:NSWindowAbove];
- }
- 
-+<<<<<<< .our
- void NativeWindowMac::ShowWindowButton(NSWindowButton button) {
-   auto view = [window_ standardWindowButton:button];
-   [view.superview addSubview:view positioned:NSWindowAbove relativeTo:nil];
-@@ -1395,6 +1438,35 @@
- void NativeWindowMac::SetForwardMouseMessages(bool forward) {
-   [window_ setAcceptsMouseMovedEvents:forward];
- }
-+=======
-+  // Remove all ControlRegionViews that are added last time.
-+  // Note that [webView subviews] returns the view's mutable internal array and
-+  // it should be copied to avoid mutating the original array while enumerating
-+  // it.
-+  base::scoped_nsobject<NSArray> subviews([[webView subviews] copy]);
-+  for (NSView* subview in subviews.get())
-+    if ([subview isKindOfClass:[ControlRegionView class]])
-+      [subview removeFromSuperview];
-+
-+  // Draggable regions is implemented by having the whole web view draggable
-+  // (mouseDownCanMoveWindow) and overlaying regions that are not draggable.
-+  std::vector<gfx::Rect> drag_exclude_rects =
-+      CalculateNonDraggableRegions(regions, webViewWidth, webViewHeight);
-+
-+  if (browser_view_) {
-+    browser_view_->UpdateDraggableRegions(drag_exclude_rects);
-+  }
-+
-+  // Create and add a ControlRegionView for each region that needs to be
-+  // excluded from the dragging.
-+  for (const auto& rect : drag_exclude_rects) {
-+    base::scoped_nsobject<NSView> controlRegion(
-+        [[ControlRegionView alloc] initWithFrame:NSZeroRect]);
-+    [controlRegion setFrame:NSMakeRect(rect.x(), webViewHeight - rect.bottom(),
-+                                       rect.width(), rect.height())];
-+    [webView addSubview:controlRegion];
-+  }
-+>>>>>>> .their
- 
- void NativeWindowMac::OverrideNSWindowContentView() {
-   // When using `views::Widget` to hold WebContents, Chromium would use
-changed in both
-  base   100644 008109970ec8d3c55a2028a173c3b941908d78a7 atom/browser/native_window_views.cc
-  our    100644 0dba39942f92d54ba34db7709b73012055680d94 atom/browser/native_window_views.cc
-  their  100644 f3e6fc09c5850cbc3d6989a2a94607b1f9a5d514 atom/browser/native_window_views.cc
-@@ -1115,7 +1115,11 @@
-   if (!active && IsMenuBarAutoHide() && IsMenuBarVisible())
-     SetMenuBarVisibility(false);
- 
-+<<<<<<< .our
-   root_view_->ResetAltState();
-+=======
-+  menu_bar_alt_pressed_ = false;
-+>>>>>>> .their
- }
- 
- void NativeWindowViews::OnWidgetBoundsChanged(views::Widget* changed_widget,
-@@ -1237,9 +1241,138 @@
- void NativeWindowViews::HandleKeyboardEvent(
-     content::WebContents*,
-     const content::NativeWebKeyboardEvent& event) {
-+<<<<<<< .our
-   keyboard_event_handler_->HandleKeyboardEvent(event,
-                                                root_view_->GetFocusManager());
-   root_view_->HandleKeyEvent(event);
-+=======
-+  keyboard_event_handler_->HandleKeyboardEvent(event, GetFocusManager());
-+
-+  if (!menu_bar_)
-+    return;
-+
-+  // Show accelerator when "Alt" is pressed.
-+  if (menu_bar_visible_ && IsAltKey(event))
-+    menu_bar_->SetAcceleratorVisibility(
-+        event.GetType() == blink::WebInputEvent::kRawKeyDown);
-+
-+  // Show the submenu when "Alt+Key" is pressed.
-+  if (event.GetType() == blink::WebInputEvent::kRawKeyDown &&
-+      !IsAltKey(event) && IsAltModifier(event)) {
-+    if (!menu_bar_visible_ &&
-+        (menu_bar_->HasAccelerator(event.windows_key_code)))
-+      SetMenuBarVisibility(true);
-+    menu_bar_->ActivateAccelerator(event.windows_key_code);
-+    return;
-+  }
-+
-+  if (!menu_bar_autohide_)
-+    return;
-+
-+  // Toggle the menu bar only when a single Alt is released.
-+  if (event.GetType() == blink::WebInputEvent::kRawKeyDown && IsAltKey(event)) {
-+    // When a single Alt is pressed:
-+    menu_bar_alt_pressed_ = true;
-+  } else if (event.GetType() == blink::WebInputEvent::kKeyUp &&
-+             IsAltKey(event) && menu_bar_alt_pressed_) {
-+    // When a single Alt is released right after a Alt is pressed:
-+    menu_bar_alt_pressed_ = false;
-+    SetMenuBarVisibility(!menu_bar_visible_);
-+  } else {
-+    // When any other keys except single Alt have been pressed/released:
-+    menu_bar_alt_pressed_ = false;
-+  }
-+}
-+
-+void NativeWindowViews::ShowAutofillPopup(
-+    content::RenderFrameHost* frame_host,
-+    content::WebContents* web_contents,
-+    const gfx::RectF& bounds,
-+    const std::vector<base::string16>& values,
-+    const std::vector<base::string16>& labels) {
-+  bool is_offsceen = false;
-+  bool is_embedder_offscreen = false;
-+
-+  auto* web_contents_preferences =
-+      WebContentsPreferences::FromWebContents(web_contents);
-+  if (web_contents_preferences) {
-+    const auto* web_preferences = web_contents_preferences->web_preferences();
-+
-+    web_preferences->GetBoolean("offscreen", &is_offsceen);
-+    int guest_instance_id = 0;
-+    web_preferences->GetInteger(options::kGuestInstanceID, &guest_instance_id);
-+
-+    if (guest_instance_id) {
-+      auto manager = WebViewManager::GetWebViewManager(web_contents);
-+      if (manager) {
-+        auto embedder = manager->GetEmbedder(guest_instance_id);
-+        if (embedder) {
-+          is_embedder_offscreen = WebContentsPreferences::IsPreferenceEnabled(
-+              "offscreen", embedder);
-+        }
-+      }
-+    }
-+  }
-+
-+  autofill_popup_->CreateView(
-+      frame_host,
-+      is_offsceen || is_embedder_offscreen,
-+      widget(),
-+      bounds);
-+  autofill_popup_->SetItems(values, labels);
-+  autofill_popup_->UpdatePopupBounds(menu_bar_visible_ ? 0 : kMenuBarHeight);
-+}
-+
-+void NativeWindowViews::HideAutofillPopup(
-+    content::RenderFrameHost* frame_host) {
-+  autofill_popup_->Hide();
-+}
-+
-+void NativeWindowViews::Layout() {
-+  const auto size = GetContentsBounds().size();
-+  const auto menu_bar_bounds =
-+      menu_bar_visible_ ? gfx::Rect(0, 0, size.width(), kMenuBarHeight)
-+                        : gfx::Rect();
-+  if (menu_bar_) {
-+    menu_bar_->SetBoundsRect(menu_bar_bounds);
-+  }
-+
-+  if (web_view_) {
-+    web_view_->SetBoundsRect(
-+        gfx::Rect(0, menu_bar_bounds.height(), size.width(),
-+                  size.height() - menu_bar_bounds.height()));
-+  }
-+
-+  if (autofill_popup_.get())
-+    autofill_popup_->UpdatePopupBounds(menu_bar_visible_ ? 0 : kMenuBarHeight);
-+}
-+
-+gfx::Size NativeWindowViews::GetMinimumSize() const {
-+  return NativeWindow::GetMinimumSize();
-+}
-+
-+gfx::Size NativeWindowViews::GetMaximumSize() const {
-+  return NativeWindow::GetMaximumSize();
-+}
-+
-+bool NativeWindowViews::AcceleratorPressed(const ui::Accelerator& accelerator) {
-+  return accelerator_util::TriggerAcceleratorTableCommand(
-+      &accelerator_table_, accelerator);
-+}
-+
-+void NativeWindowViews::RegisterAccelerators(AtomMenuModel* menu_model) {
-+  // Clear previous accelerators.
-+  views::FocusManager* focus_manager = GetFocusManager();
-+  accelerator_table_.clear();
-+  focus_manager->UnregisterAccelerators(this);
-+
-+  // Register accelerators with focus manager.
-+  accelerator_util::GenerateAcceleratorTable(&accelerator_table_, menu_model);
-+  for (const auto& iter : accelerator_table_) {
-+    focus_manager->RegisterAccelerator(
-+        iter.first, ui::AcceleratorManager::kNormalPriority, this);
-+  }
-+>>>>>>> .their
- }
- 
- ui::WindowShowState NativeWindowViews::GetRestoredState() {
-changed in both
-  base   100644 a39e84ce5b8d7b757233dab4bed646e08cb8c76a atom/browser/net/asar/url_request_asar_job.cc
-  our    100644 85eb2e1dd142b6d64aafb5350ae47603db989e8f atom/browser/net/asar/url_request_asar_job.cc
-  their  100644 a6fe5e26540c9533f16dcf56fc955d0025de3b4a atom/browser/net/asar/url_request_asar_job.cc
-changed in both
-  base   100644 9b0f3a98dc53b922c0d070244f8f7457f332d850 atom/browser/net/atom_network_delegate.cc
-  our    100644 e71ea74317b69f31a5aac8e723902748972fed8f atom/browser/net/atom_network_delegate.cc
-  their  100644 239a64016febb8f9d81206d7f2a7d100ccd1f293 atom/browser/net/atom_network_delegate.cc
-@@ -250,6 +250,7 @@
- 
- AtomNetworkDelegate::~AtomNetworkDelegate() {}
- 
-+<<<<<<< .our
- void AtomNetworkDelegate::SetSimpleListenerInIO(SimpleEvent type,
-                                                 URLPatterns patterns,
-                                                 SimpleListener callback) {
-@@ -266,6 +267,26 @@
-     response_listeners_.erase(type);
-   else
-     response_listeners_[type] = {std::move(patterns), std::move(callback)};
-+=======
-+void AtomNetworkDelegate::SetSimpleListenerInIO(
-+    SimpleEvent type,
-+    URLPatterns patterns,
-+    SimpleListener callback) {
-+  if (callback.is_null())
-+    simple_listeners_.erase(type);
-+  else
-+    simple_listeners_[type] = { std::move(patterns), std::move(callback) };
-+}
-+
-+void AtomNetworkDelegate::SetResponseListenerInIO(
-+    ResponseEvent type,
-+    URLPatterns patterns,
-+    ResponseListener callback) {
-+  if (callback.is_null())
-+    response_listeners_.erase(type);
-+  else
-+    response_listeners_[type] = { std::move(patterns), std::move(callback) };
-+>>>>>>> .their
- }
- 
- void AtomNetworkDelegate::SetDevToolsNetworkEmulationClientId(
-changed in both
-  base   100644 e00c26ff2cbc134b987b4361896971e48056951d atom/browser/net/atom_network_delegate.h
-  our    100644 39a7a8ddfcda17fd7d022331132b54485d07a279 atom/browser/net/atom_network_delegate.h
-  their  100644 ad37a926d4732d94526f74b2f927e35504d2efe3 atom/browser/net/atom_network_delegate.h
-changed in both
-  base   100644 1f0bdae4c08aa70faa5d6d3771a9af3b2a92f6ff atom/browser/net/atom_url_request.cc
-  our    100644 5ffbfd65a48b4459b2ebca66a5c2259f18ed80a8 atom/browser/net/atom_url_request.cc
-  their  100644 7c5ded81aa3cf6c3052c63cf2383bbb7aa8c39f1 atom/browser/net/atom_url_request.cc
-changed in both
-  base   100644 654798d8aac82409d3959cd06077c568f1e064d6 atom/browser/net/atom_url_request.h
-  our    100644 fde7b161385fb431b2d807012a00679a4bdb507a atom/browser/net/atom_url_request.h
-  their  100644 8c6ced8af6907d2a2bf079ca52ad9850763780a6 atom/browser/net/atom_url_request.h
-added in remote
-  their  100644 fde8718f89c5d4d4a6dd0a9b08353832c07902c5 atom/browser/net/resolve_proxy_helper.cc
-@@ -0,0 +1,85 @@
-+// Copyright (c) 2018 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "atom/browser/net/resolve_proxy_helper.h"
-+
-+#include "base/threading/thread_task_runner_handle.h"
-+#include "net/url_request/url_request_context.h"
-+#include "net/url_request/url_request_context_getter.h"
-+
-+namespace atom {
-+
-+ResolveProxyHelper::ResolveProxyHelper(net::URLRequestContextGetter* getter)
-+    : context_getter_(getter),
-+      original_thread_(base::ThreadTaskRunnerHandle::Get()) {}
-+
-+ResolveProxyHelper::~ResolveProxyHelper() {
-+  // Clear all pending requests if the ProxyService is still alive.
-+  pending_requests_.clear();
-+}
-+
-+void ResolveProxyHelper::ResolveProxy(const GURL& url,
-+                                      const ResolveProxyCallback& callback) {
-+  // Enqueue the pending request.
-+  pending_requests_.push_back(PendingRequest(url, callback));
-+
-+  // If nothing is in progress, start.
-+  if (pending_requests_.size() == 1)
-+    StartPendingRequest();
-+}
-+
-+void ResolveProxyHelper::SendProxyResult(const std::string& proxy) {
-+  CHECK(!pending_requests_.empty());
-+
-+  const auto& completed_request = pending_requests_.front();
-+  if (!completed_request.callback.is_null())
-+    completed_request.callback.Run(proxy);
-+
-+  // Clear the current (completed) request.
-+  pending_requests_.pop_front();
-+
-+  // Start the next request.
-+  if (!pending_requests_.empty())
-+    StartPendingRequest();
-+}
-+
-+void ResolveProxyHelper::StartPendingRequest() {
-+  auto& request = pending_requests_.front();
-+  context_getter_->GetNetworkTaskRunner()->PostTask(
-+      FROM_HERE,
-+      base::BindOnce(&ResolveProxyHelper::StartPendingRequestInIO,
-+                     base::Unretained(this), request.url, request.pac_req));
-+}
-+
-+void ResolveProxyHelper::OnResolveProxyCompleted(int result) {
-+  std::string proxy;
-+  if (result == net::OK)
-+    proxy = proxy_info_.ToPacString();
-+
-+  original_thread_->PostTask(
-+      FROM_HERE, base::BindOnce(&ResolveProxyHelper::SendProxyResult,
-+                                base::Unretained(this), proxy));
-+}
-+
-+void ResolveProxyHelper::StartPendingRequestInIO(
-+    const GURL& url,
-+    net::ProxyService::PacRequest* pac_req) {
-+  // Verify the request wasn't started yet.
-+  DCHECK(nullptr == pac_req);
-+
-+  auto proxy_service = context_getter_->GetURLRequestContext()->proxy_service();
-+
-+  // Start the request.
-+  int result = proxy_service->ResolveProxy(
-+      url, std::string(), &proxy_info_,
-+      base::Bind(&ResolveProxyHelper::OnResolveProxyCompleted,
-+                 base::Unretained(this)),
-+      &pac_req, nullptr, net::NetLogWithSource());
-+
-+  // Completed synchronously.
-+  if (result != net::ERR_IO_PENDING)
-+    OnResolveProxyCompleted(result);
-+}
-+
-+}  // namespace atom
-added in remote
-  their  100644 cc85d4ff62ce753ff4ba1fc5979760b5e5d768a6 atom/browser/net/resolve_proxy_helper.h
-@@ -0,0 +1,59 @@
-+// Copyright (c) 2018 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ATOM_BROWSER_NET_RESOLVE_PROXY_HELPER_H_
-+#define ATOM_BROWSER_NET_RESOLVE_PROXY_HELPER_H_
-+
-+#include <deque>
-+#include <string>
-+
-+#include "base/memory/ref_counted.h"
-+#include "net/proxy/proxy_service.h"
-+#include "url/gurl.h"
-+
-+namespace net {
-+class URLRequestContextGetter;
-+}
-+
-+namespace atom {
-+
-+class ResolveProxyHelper
-+    : public base::RefCountedThreadSafe<ResolveProxyHelper> {
-+ public:
-+  using ResolveProxyCallback = base::Callback<void(std::string)>;
-+  explicit ResolveProxyHelper(net::URLRequestContextGetter* getter);
-+
-+  void ResolveProxy(const GURL& url, const ResolveProxyCallback& callback);
-+
-+ private:
-+  friend class base::RefCountedThreadSafe<ResolveProxyHelper>;
-+  struct PendingRequest {
-+   public:
-+    PendingRequest(const GURL& url, const ResolveProxyCallback& callback)
-+        : url(url), callback(callback), pac_req(nullptr) {}
-+
-+    GURL url;
-+    ResolveProxyCallback callback;
-+    net::ProxyService::PacRequest* pac_req;
-+  };
-+
-+  ~ResolveProxyHelper();
-+
-+  void StartPendingRequest();
-+  void StartPendingRequestInIO(const GURL& request,
-+                               net::ProxyService::PacRequest* pac_req);
-+  void SendProxyResult(const std::string& proxy);
-+  void OnResolveProxyCompleted(int result);
-+
-+  net::ProxyInfo proxy_info_;
-+  std::deque<PendingRequest> pending_requests_;
-+  scoped_refptr<net::URLRequestContextGetter> context_getter_;
-+  scoped_refptr<base::SingleThreadTaskRunner> original_thread_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(ResolveProxyHelper);
-+};
-+
-+}  // namespace atom
-+
-+#endif  // ATOM_BROWSER_NET_RESOLVE_PROXY_HELPER_H_
-changed in both
-  base   100644 3313eba36bb903426778fac6cd18258a95fec677 atom/browser/resources/mac/Info.plist
-  our    100644 9094f0f7335edf833d51f688851e6a105de60433 atom/browser/resources/mac/Info.plist
-  their  100644 0c499f8929996fb2ba2b15387221957cbff42adf atom/browser/resources/mac/Info.plist
-@@ -17,9 +17,15 @@
-   <key>CFBundleIconFile</key>
-   <string>electron.icns</string>
-   <key>CFBundleVersion</key>
-+<<<<<<< .our
-   <string>4.0.0</string>
-   <key>CFBundleShortVersionString</key>
-   <string>4.0.0</string>
-+=======
-+  <string>2.1.0</string>
-+  <key>CFBundleShortVersionString</key>
-+  <string>2.1.0</string>
-+>>>>>>> .their
-   <key>LSApplicationCategoryType</key>
-   <string>public.app-category.developer-tools</string>
-   <key>LSMinimumSystemVersion</key>
-changed in both
-  base   100644 c349f99d712ff69960d35b18587ddb6c417f7cd5 atom/browser/resources/win/atom.rc
-  our    100644 c0bd831e8bddf10180f75cd40694831e2e98622d atom/browser/resources/win/atom.rc
-  their  100644 95e13b65e49c1942380686821715c30f6ddb4023 atom/browser/resources/win/atom.rc
-@@ -56,8 +56,13 @@
- //
- 
- VS_VERSION_INFO VERSIONINFO
-+<<<<<<< .our
-  FILEVERSION 4,0,0,20180821
-  PRODUCTVERSION 4,0,0,20180821
-+=======
-+ FILEVERSION 2,1,0,20180809
-+ PRODUCTVERSION 2,1,0,20180809
-+>>>>>>> .their
-  FILEFLAGSMASK 0x3fL
- #ifdef _DEBUG
-  FILEFLAGS 0x1L
-@@ -74,12 +79,20 @@
-         BEGIN
-             VALUE "CompanyName", "GitHub, Inc."
-             VALUE "FileDescription", "Electron"
-+<<<<<<< .our
-             VALUE "FileVersion", "4.0.0"
-+=======
-+            VALUE "FileVersion", "2.1.0"
-+>>>>>>> .their
-             VALUE "InternalName", "electron.exe"
-             VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
-             VALUE "OriginalFilename", "electron.exe"
-             VALUE "ProductName", "Electron"
-+<<<<<<< .our
-             VALUE "ProductVersion", "4.0.0"
-+=======
-+            VALUE "ProductVersion", "2.1.0"
-+>>>>>>> .their
-             VALUE "SquirrelAwareVersion", "1"
-         END
-     END
-changed in both
-  base   100644 8bdf4e0c2be32fc7d704bc989d7ccec5dd5db672 atom/browser/ui/cocoa/atom_menu_controller.mm
-  our    100644 cecf30ce1c88e007957a65427648941765a6067e atom/browser/ui/cocoa/atom_menu_controller.mm
-  their  100644 ea141b495e710222f12913f35625cf435b947e18 atom/browser/ui/cocoa/atom_menu_controller.mm
-@@ -334,8 +334,13 @@
-   if (isMenuOpen_) {
-     isMenuOpen_ = NO;
-     model_->MenuWillClose();
-+<<<<<<< .our
-     // Post async task so that itemSelected runs before the close callback
-     // deletes the controller from the map which deallocates it
-+=======
-+    // Post async task so that itemSelected runs before the close callback	
-+    // deletes the controller from the map which deallocates it	
-+>>>>>>> .their
-     if (!closeCallback.is_null()) {
-       BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, closeCallback);
-     }
-changed in both
-  base   100644 b26d472db131f7be9d5bfbbd1cebfc992743d312 atom/browser/ui/file_dialog_mac.mm
-  our    100644 18b18a8b240cda5512ae49e0afde5c749bdf75c0 atom/browser/ui/file_dialog_mac.mm
-  their  100644 89ecaf46ec7f32ca4f3a3a89de13efcbdad5619f atom/browser/ui/file_dialog_mac.mm
-@@ -27,9 +27,12 @@
- 
- @implementation PopUpButtonHandler
- 
-+<<<<<<< .our
- @synthesize savePanel;
- @synthesize fileTypesList;
- 
-+=======
-+>>>>>>> .their
- - (instancetype)initWithPanel:(NSSavePanel*)panel
-                  andTypesList:(NSArray*)typesList {
-   self = [super init];
-@@ -55,6 +58,7 @@
- }
- 
- @end
-+<<<<<<< .our
- 
- // Manages the PopUpButtonHandler.
- @interface AtomAccessoryView : NSView
-@@ -65,6 +69,17 @@
- - (void)dealloc {
-   auto* popupButton =
-       static_cast<NSPopUpButton*>([[self subviews] objectAtIndex:1]);
-+=======
-+
-+// Manages the PopUpButtonHandler.
-+@interface AtomAccessoryView : NSView
-+@end
-+
-+@implementation AtomAccessoryView
-+
-+- (void)dealloc {
-+  auto* popupButton = static_cast<NSPopUpButton*>([[self subviews] objectAtIndex: 1]);
-+>>>>>>> .their
-   [[popupButton target] release];
-   [super dealloc];
- }
-@@ -76,8 +91,11 @@
- DialogSettings::DialogSettings() = default;
- DialogSettings::~DialogSettings() = default;
- 
-+<<<<<<< .our
- namespace {
- 
-+=======
-+>>>>>>> .their
- void SetAllowedFileTypes(NSSavePanel* dialog, const Filters& filters) {
-   NSMutableArray* file_types_list = [NSMutableArray array];
-   NSMutableArray* filter_names = [NSMutableArray array];
-@@ -85,9 +103,18 @@
-   // Create array to keep file types and their name.
-   for (const Filter& filter : filters) {
-     NSMutableSet* file_type_set = [NSMutableSet set];
-+<<<<<<< .our
-     [filter_names addObject:@(filter.first.c_str())];
-     for (const std::string& ext : filter.second) {
-       [file_type_set addObject:@(ext.c_str())];
-+=======
-+    base::ScopedCFTypeRef<CFStringRef> name_cf(
-+        base::SysUTF8ToCFStringRef(filter.first));
-+    [filter_names addObject:base::mac::CFToNSCast(name_cf.get())];
-+    for (const std::string& ext : filter.second) {
-+      base::ScopedCFTypeRef<CFStringRef> ext_cf(base::SysUTF8ToCFStringRef(ext));
-+      [file_type_set addObject:base::mac::CFToNSCast(ext_cf.get())];
-+>>>>>>> .their
-     }
-     [file_types_list addObject:[file_type_set allObjects]];
-   }
-@@ -119,12 +146,19 @@
-   [label setBezeled:NO];
-   [label setDrawsBackground:NO];
- 
-+<<<<<<< .our
-   NSPopUpButton* popupButton =
-       [[NSPopUpButton alloc] initWithFrame:NSMakeRect(50.0, 2, 140, 22.0)
-                                  pullsDown:NO];
-   PopUpButtonHandler* popUpButtonHandler =
-       [[PopUpButtonHandler alloc] initWithPanel:dialog
-                                    andTypesList:file_types_list];
-+=======
-+  NSPopUpButton* popupButton = [[NSPopUpButton alloc] initWithFrame:NSMakeRect(50.0, 2, 140, 22.0)
-+                                                          pullsDown:NO];
-+  PopUpButtonHandler* popUpButtonHandler = [[PopUpButtonHandler alloc] initWithPanel:dialog
-+                                                                        andTypesList:file_types_list];
-+>>>>>>> .their
-   [popupButton addItemsWithTitles:filter_names];
-   [popupButton setTarget:popUpButtonHandler];
-   [popupButton setAction:@selector(selectFormat:)];
-changed in both
-  base   100644 a358f676a8c41d15bb9c3157cce4a62ef8356855 atom/browser/ui/tray_icon_cocoa.mm
-  our    100644 2c434d7a9e312adfb3802628a3d092a95d4ac49f atom/browser/ui/tray_icon_cocoa.mm
-  their  100644 aedce38f656eaab389502df98bb20b28e3e3619a atom/browser/ui/tray_icon_cocoa.mm
-@@ -240,13 +240,22 @@
-   }
- 
-   // check title_ being nil
-+<<<<<<< .our
-   NSString* title = @"";
-+=======
-+  NSString *title = @"";
-+>>>>>>> .their
-   if (title_)
-     title = title_;
- 
-   attributedTitle_.reset([[NSMutableAttributedString alloc]
-+<<<<<<< .our
-       initWithString:title
-           attributes:attributes]);
-+=======
-+                             initWithString:title
-+                                 attributes:attributes]);
-+>>>>>>> .their
- 
-   // NSFontAttributeName:[NSFont menuBarFontOfSize:0],
-   // NSForegroundColorAttributeName:[self colorWithHighlight: highlight]
-changed in both
-  base   100644 e1836ad68985f6068a5ea4be76d6f58682056d04 atom/browser/ui/tray_icon_gtk.cc
-  our    100644 4c780285c80a157afca74b0927175ba3b045def9 atom/browser/ui/tray_icon_gtk.cc
-  their  100644 eb7be1ed3b4345cf825075785c1c1708a7b69d30 atom/browser/ui/tray_icon_gtk.cc
-@@ -36,9 +36,16 @@
-   if (libgtkui::AppIndicatorIcon::CouldOpen()) {
-     ++indicators_count;
-     icon_.reset(new libgtkui::AppIndicatorIcon(
-+<<<<<<< .our
-         base::StringPrintf("%s%d", Browser::Get()->GetName().c_str(),
-                            indicators_count),
-         image.AsImageSkia(), toolTip));
-+=======
-+        base::StringPrintf(
-+            "%s%d", Browser::Get()->GetName().c_str(), indicators_count),
-+        image.AsImageSkia(),
-+        toolTip));
-+>>>>>>> .their
-   } else {
-     icon_.reset(new libgtkui::Gtk2StatusIcon(image.AsImageSkia(), toolTip));
-   }
-changed in both
-  base   100644 5182e1a0f7f141e8ddfa95fd8cca8771f2cabd9f atom/browser/ui/views/frameless_view.cc
-  our    100644 8959ee13612979d2819621acc14ebf641fb7f116 atom/browser/ui/views/frameless_view.cc
-  their  100644 b78e897b8f51747fbeb86cdf1e507ecf5be0bf9b atom/browser/ui/views/frameless_view.cc
-changed in both
-  base   100644 f2ab22f70a6fa08ff1315d197ff3ff3cb700733f atom/browser/ui/views/global_menu_bar_x11.cc
-  our    100644 656bd8f991f87c06a240cdc09a3bfcd500d1c1c8 atom/browser/ui/views/global_menu_bar_x11.cc
-  their  100644 eaeefbd1fb411fca13d6de5dbbc17806d271affd atom/browser/ui/views/global_menu_bar_x11.cc
-changed in both
-  base   100644 bf9801a1457740da391c75621214b8d91cb7467d atom/browser/ui/views/menu_bar.cc
-  our    100644 e838d3cc217b5ffdb77226beff0d7217539f23f9 atom/browser/ui/views/menu_bar.cc
-  their  100644 d963c121bbd29bf3f67b488666297c86b4fee225 atom/browser/ui/views/menu_bar.cc
-@@ -18,11 +18,17 @@
- 
- namespace {
- 
-+<<<<<<< .our
-+=======
-+const char kViewClassName[] = "ElectronMenuBar";
-+
-+>>>>>>> .their
- // Default color of the menu bar.
- const SkColor kDefaultColor = SkColorSetARGB(255, 233, 233, 233);
- 
- }  // namespace
- 
-+<<<<<<< .our
- const char MenuBar::kViewClassName[] = "ElectronMenuBar";
- 
- MenuBar::MenuBar(views::View* window)
-@@ -32,12 +38,35 @@
-   SetLayoutManager(
-       std::make_unique<views::BoxLayout>(views::BoxLayout::kHorizontal));
-   window_->GetFocusManager()->AddFocusChangeListener(this);
-+=======
-+MenuBar::MenuBar(NativeWindow* window)
-+    : background_color_(kDefaultColor), menu_model_(NULL), window_(window) {
-+  RefreshColorCache();
-+  UpdateViewColors();
-+  SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal));
-+>>>>>>> .their
- }
- 
- MenuBar::~MenuBar() {
-   window_->GetFocusManager()->RemoveFocusChangeListener(this);
- }
- 
-+<<<<<<< .our
-+=======
-+void MenuBar::AddedToWidget() {
-+  auto fm = GetFocusManager();
-+  fm->AddFocusChangeListener(this);
-+  // Note that we don't own fm -- this manages the _connection_
-+  focus_manager_.reset(fm, [this](views::FocusManager* fm) {
-+    fm->RemoveFocusChangeListener(this);
-+  });
-+}
-+
-+void MenuBar::RemovedFromWidget() {
-+  focus_manager_.reset();
-+}
-+
-+>>>>>>> .their
- void MenuBar::SetMenu(AtomMenuModel* model) {
-   menu_model_ = model;
-   RebuildChildren();
-@@ -61,7 +90,11 @@
- }
- 
- void MenuBar::ActivateAccelerator(base::char16 key) {
-+<<<<<<< .our
-   auto* child = FindAccelChild(key);
-+=======
-+  auto child = FindAccelChild(key);
-+>>>>>>> .their
-   if (child)
-     static_cast<SubmenuButton*>(child)->Activate(nullptr);
- }
-@@ -151,7 +184,11 @@
- void MenuBar::RebuildChildren() {
-   RemoveAllChildViews(true);
-   for (int i = 0, n = GetItemCount(); i < n; ++i) {
-+<<<<<<< .our
-     auto* button =
-+=======
-+    auto button =
-+>>>>>>> .their
-         new SubmenuButton(menu_model_->GetLabelAt(i), this, background_color_);
-     button->set_tag(i);
-     AddChildView(button);
-@@ -169,7 +206,11 @@
- #if defined(USE_X11)
-   const auto& textColor = has_focus_ ? enabled_color_ : disabled_color_;
-   for (auto* child : GetChildrenInZOrder()) {
-+<<<<<<< .our
-     auto* button = static_cast<SubmenuButton*>(child);
-+=======
-+    auto button = static_cast<SubmenuButton*>(child);
-+>>>>>>> .their
-     button->SetTextColor(views::Button::STATE_NORMAL, textColor);
-     button->SetTextColor(views::Button::STATE_DISABLED, disabled_color_);
-     button->SetTextColor(views::Button::STATE_PRESSED, enabled_color_);
-@@ -178,7 +219,11 @@
-   }
- #elif defined(OS_WIN)
-   for (auto* child : GetChildrenInZOrder()) {
-+<<<<<<< .our
-     auto* button = static_cast<SubmenuButton*>(child);
-+=======
-+    auto button = static_cast<SubmenuButton*>(child);
-+>>>>>>> .their
-     button->SetUnderlineColor(color_utils::GetSysSkColor(COLOR_MENUTEXT));
-   }
- #endif
-changed in both
-  base   100644 761e31b98ea75f44bcd016da3b34b7615f3b409f atom/browser/ui/views/menu_bar.h
-  our    100644 2b10ba3e3bf2ccfc0453fdb59ad022ef7da8ed5b atom/browser/ui/views/menu_bar.h
-  their  100644 13cfa32f3988881e3aa87cae6cae65656fa68d70 atom/browser/ui/views/menu_bar.h
-@@ -5,6 +5,12 @@
- #ifndef ATOM_BROWSER_UI_VIEWS_MENU_BAR_H_
- #define ATOM_BROWSER_UI_VIEWS_MENU_BAR_H_
- 
-+<<<<<<< .our
-+=======
-+#include <memory>
-+
-+#include "atom/browser/native_window.h"
-+>>>>>>> .their
- #include "atom/browser/ui/atom_menu_model.h"
- #include "ui/views/controls/button/menu_button_listener.h"
- #include "ui/views/focus/focus_manager.h"
-@@ -49,7 +55,9 @@
- 
-  protected:
-   // views::View:
-+  void AddedToWidget() override;
-   const char* GetClassName() const override;
-+  void RemovedFromWidget() override;
- 
-   // views::MenuButtonListener:
-   void OnMenuButtonClicked(views::MenuButton* source,
-@@ -79,6 +87,11 @@
- 
-   bool has_focus_ = true;
- 
-+  View* FindAccelChild(base::char16 key);
-+
-+  std::shared_ptr<views::FocusManager> focus_manager_;
-+  bool has_focus_ = true;
-+
-   DISALLOW_COPY_AND_ASSIGN(MenuBar);
- };
- 
-changed in both
-  base   100644 3c3cff3c65410f2e61bdade6e457a096ffba3a54 atom/browser/ui/views/submenu_button.cc
-  our    100644 1124d3d01471876fefa2757570ba3cff796a991c atom/browser/ui/views/submenu_button.cc
-  their  100644 baee28f2cd6931611e048ec46c83e602b95b4b59 atom/browser/ui/views/submenu_button.cc
-@@ -82,8 +82,12 @@
- 
- bool SubmenuButton::GetUnderlinePosition(const base::string16& text,
-                                          base::char16* accelerator,
-+<<<<<<< .our
-                                          int* start,
-                                          int* end) const {
-+=======
-+                                         int* start, int* end) const {
-+>>>>>>> .their
-   int pos, span;
-   base::string16 trimmed = gfx::RemoveAcceleratorChar(text, '&', &pos, &span);
-   if (pos > -1 && span != 0) {
-@@ -96,9 +100,14 @@
-   return false;
- }
- 
-+<<<<<<< .our
- void SubmenuButton::GetCharacterPosition(const base::string16& text,
-                                          int index,
-                                          int* pos) const {
-+=======
-+void SubmenuButton::GetCharacterPosition(
-+    const base::string16& text, int index, int* pos) const {
-+>>>>>>> .their
-   int height = 0;
-   gfx::Canvas::SizeStringInt(text.substr(0, index), gfx::FontList(), pos,
-                              &height, 0, 0);
-changed in both
-  base   100644 5c05481cbbfb85b5d77511cb91cc19cc8ef0e626 atom/browser/ui/views/submenu_button.h
-  our    100644 d8b7785da131271e88533879d090badfd6e49dd5 atom/browser/ui/views/submenu_button.h
-  their  100644 0f7eddf4c914790675f0c9bfab696b2a96b91f74 atom/browser/ui/views/submenu_button.h
-@@ -33,11 +33,17 @@
-  private:
-   bool GetUnderlinePosition(const base::string16& text,
-                             base::char16* accelerator,
-+<<<<<<< .our
-                             int* start,
-                             int* end) const;
-   void GetCharacterPosition(const base::string16& text,
-                             int index,
-                             int* pos) const;
-+=======
-+                            int* start, int* end) const;
-+  void GetCharacterPosition(
-+      const base::string16& text, int index, int* pos) const;
-+>>>>>>> .their
- 
-   base::char16 accelerator_ = 0;
- 
-changed in both
-  base   100644 84a6d9aa3e50ced33616fb4b78e124f39461cd0e atom/browser/ui/win/atom_desktop_window_tree_host_win.cc
-  our    100644 97857d6515aa5617cf8c1972690a1dcdfd645ac1 atom/browser/ui/win/atom_desktop_window_tree_host_win.cc
-  their  100644 3da0241a27a9d272c09db30db068939c1bc66d19 atom/browser/ui/win/atom_desktop_window_tree_host_win.cc
-changed in both
-  base   100644 47e4cb6aed2a962bfdd2a92edaca74b452d15c4d atom/browser/ui/win/atom_desktop_window_tree_host_win.h
-  our    100644 30af3cc162b4429cb3335c6864b801eac1d5f963 atom/browser/ui/win/atom_desktop_window_tree_host_win.h
-  their  100644 b0164f2ab6ca9580d11ae1aaff68d9caae314d54 atom/browser/ui/win/atom_desktop_window_tree_host_win.h
-@@ -25,10 +25,15 @@
-   ~AtomDesktopWindowTreeHostWin() override;
- 
-  protected:
-+<<<<<<< .our
-   bool PreHandleMSG(UINT message,
-                     WPARAM w_param,
-                     LPARAM l_param,
-                     LRESULT* result) override;
-+=======
-+  bool PreHandleMSG(
-+      UINT message, WPARAM w_param, LPARAM l_param, LRESULT* result) override;
-+>>>>>>> .their
-   bool HasNativeFrame() const override;
- 
-  private:
-changed in both
-  base   100644 2cbf07be86a812f07105846dc8caf8226a8595df atom/browser/web_contents_preferences.cc
-  our    100644 c21c93383155091a7481cdd4e741cefad90a4a55 atom/browser/web_contents_preferences.cc
-  their  100644 98b39fee234cb15ac0da99fd5639c7b8265d71b0 atom/browser/web_contents_preferences.cc
-@@ -97,6 +97,7 @@
-   instances_.push_back(this);
- 
-   // Set WebPreferences defaults onto the JS object
-+<<<<<<< .our
-   SetDefaultBoolIfUndefined(options::kPlugins, false);
-   SetDefaultBoolIfUndefined(options::kExperimentalFeatures, false);
-   bool node = SetDefaultBoolIfUndefined(options::kNodeIntegration, true);
-@@ -104,12 +105,23 @@
-   SetDefaultBoolIfUndefined(options::kWebviewTag, node);
-   SetDefaultBoolIfUndefined(options::kSandbox, false);
-   SetDefaultBoolIfUndefined(options::kNativeWindowOpen, false);
-+=======
-+  SetDefaultBoolIfUndefined("plugins", false);
-+  SetDefaultBoolIfUndefined(options::kExperimentalFeatures, false);
-+  SetDefaultBoolIfUndefined(options::kExperimentalCanvasFeatures, false);
-+  bool node = SetDefaultBoolIfUndefined(options::kNodeIntegration, true);
-+  SetDefaultBoolIfUndefined(options::kNodeIntegrationInWorker, false);
-+  SetDefaultBoolIfUndefined(options::kWebviewTag, node);
-+  SetDefaultBoolIfUndefined("sandbox", false);
-+  SetDefaultBoolIfUndefined("nativeWindowOpen", false);
-+>>>>>>> .their
-   SetDefaultBoolIfUndefined(options::kContextIsolation, false);
-   SetDefaultBoolIfUndefined("javascript", true);
-   SetDefaultBoolIfUndefined("images", true);
-   SetDefaultBoolIfUndefined("textAreasAreResizable", true);
-   SetDefaultBoolIfUndefined("webgl", true);
-   bool webSecurity = true;
-+<<<<<<< .our
-   SetDefaultBoolIfUndefined(options::kWebSecurity, webSecurity);
-   // If webSecurity was explicity set to false, let's inherit that into
-   // insecureContent
-@@ -125,6 +137,21 @@
-   SetDefaultBoolIfUndefined(options::kOffscreen, false);
- 
-   last_preference_ = preference_.Clone();
-+=======
-+  SetDefaultBoolIfUndefined("webSecurity", webSecurity);
-+  // If webSecurity was explicity set to false, let's inherit that into
-+  // insecureContent
-+  if (web_preferences.Get("webSecurity", &webSecurity) && !webSecurity) {
-+    SetDefaultBoolIfUndefined("allowRunningInsecureContent", true);
-+  } else {
-+    SetDefaultBoolIfUndefined("allowRunningInsecureContent", false);
-+  }
-+  #if defined(OS_MACOSX)
-+  SetDefaultBoolIfUndefined(options::kScrollBounce, false);
-+  #endif
-+  SetDefaultBoolIfUndefined("offscreen", false);
-+  last_web_preferences_.MergeDictionary(&web_preferences_);
-+>>>>>>> .their
- }
- 
- WebContentsPreferences::~WebContentsPreferences() {
-@@ -154,6 +181,16 @@
-   return default_value;
- }
- 
-+bool WebContentsPreferences::SetDefaultBoolIfUndefined(const std::string key,
-+                                                       bool val) {
-+  bool existing;
-+  if (!web_preferences_.GetBoolean(key, &existing)) {
-+    web_preferences_.SetBoolean(key, val);
-+    return val;
-+  }
-+  return existing;
-+}
-+
- void WebContentsPreferences::Merge(const base::DictionaryValue& extend) {
-   if (preference_.is_dict())
-     static_cast<base::DictionaryValue*>(&preference_)->MergeDictionary(&extend);
-@@ -212,8 +249,18 @@
-   return FromWebContents(web_contents);
- }
- 
-+<<<<<<< .our
- void WebContentsPreferences::AppendCommandLineSwitches(
-     base::CommandLine* command_line) {
-+=======
-+  // We are appending args to a webContents so let's save the current state
-+  // of our preferences object so that during the lifetime of the WebContents
-+  // we can fetch the options used to initally configure the WebContents
-+  self->last_web_preferences_.Clear();
-+  self->last_web_preferences_.MergeDictionary(&web_preferences);
-+
-+  bool b;
-+>>>>>>> .their
-   // Check if plugins are enabled.
-   if (IsEnabled(options::kPlugins))
-     command_line->AppendSwitch(switches::kEnablePlugins);
-changed in both
-  base   100644 94dd8dc598bef5cc35383d69d20ade8d644a7ef5 atom/browser/web_contents_preferences.h
-  our    100644 d835347afcd259f473f95271a2c19e42afcc6f2b atom/browser/web_contents_preferences.h
-  their  100644 28ee9a85485e26b33b8a7852a4a212b4c11b71a0 atom/browser/web_contents_preferences.h
-@@ -59,25 +59,45 @@
-   bool GetPreloadPath(base::FilePath::StringType* path) const;
- 
-   // Returns the web preferences.
-+<<<<<<< .our
-   base::Value* preference() { return &preference_; }
-   base::Value* last_preference() { return &last_preference_; }
-+=======
-+  base::DictionaryValue* web_preferences() { return &web_preferences_; }
-+  base::DictionaryValue* last_web_preferences() {
-+    return &last_web_preferences_;
-+  }
-+>>>>>>> .their
- 
-  private:
-   friend class content::WebContentsUserData<WebContentsPreferences>;
-   friend class AtomBrowserClient;
- 
-+<<<<<<< .our
-   // Get WebContents according to process ID.
-   static content::WebContents* GetWebContentsFromProcessID(int process_id);
- 
-   // Set preference value to given bool if user did not provide value
-   bool SetDefaultBoolIfUndefined(const base::StringPiece& key, bool val);
-+=======
-+  // Set preference value to given bool if user did not provide value
-+  bool SetDefaultBoolIfUndefined(const std::string key, bool val);
-+
-+  // Get preferences value as integer possibly coercing it from a string
-+  bool GetInteger(const std::string& attributeName, int* intValue);
-+>>>>>>> .their
- 
-   static std::vector<WebContentsPreferences*> instances_;
- 
-   content::WebContents* web_contents_;
-+<<<<<<< .our
- 
-   base::Value preference_ = base::Value(base::Value::Type::DICTIONARY);
-   base::Value last_preference_ = base::Value(base::Value::Type::DICTIONARY);
-+=======
-+  base::DictionaryValue web_preferences_;
-+  base::DictionaryValue last_web_preferences_;
-+>>>>>>> .their
- 
-   DISALLOW_COPY_AND_ASSIGN(WebContentsPreferences);
- };
-changed in both
-  base   100644 1dd479883d872dc6d76ef069782aad6dc4f731da atom/browser/web_dialog_helper.cc
-  our    100644 74c8573d13f15bcaa189abdc40fa0cd8e48f89be atom/browser/web_dialog_helper.cc
-  their  100644 c76b48a74b3629b9b8588983cb4563aada6d28b9 atom/browser/web_dialog_helper.cc
-changed in both
-  base   100644 ad8c1d49bbc049b89eb4c69224b42fb51906c726 atom/common/api/api_messages.h
-  our    100644 6131a7a473c68e31790fcd8697c8f380c65ad275 atom/common/api/api_messages.h
-  their  100644 46e6142260d67b6408060ccaf328ee1f74335fe4 atom/common/api/api_messages.h
-@@ -59,6 +59,7 @@
- 
- // Sent by renderer to set the temporary zoom level.
- IPC_SYNC_MESSAGE_ROUTED1_1(AtomFrameHostMsg_SetTemporaryZoomLevel,
-+<<<<<<< .our
-                            double /* zoom level */,
-                            double /* result */)
- 
-@@ -69,3 +70,10 @@
- IPC_MESSAGE_ROUTED2(AtomFrameHostMsg_PDFSaveURLAs,
-                     GURL /* url */,
-                     content::Referrer /* referrer */)
-+=======
-+                            double /* zoom level */,
-+                            double /* result */)
-+
-+// Sent by renderer to get the zoom level.
-+IPC_SYNC_MESSAGE_ROUTED0_1(AtomFrameHostMsg_GetZoomLevel, double /* result */)
-+>>>>>>> .their
-changed in both
-  base   100644 a01ca8f84d917f6402a2e8d0aa153c6f7be9a3c5 atom/common/api/atom_api_v8_util.cc
-  our    100644 3d80db0c0a4cdbb4c7a78fa7e4266fc6fc87193f atom/common/api/atom_api_v8_util.cc
-  their  100644 b579d6f7d66c9d28006029ac78a6837007dbb217 atom/common/api/atom_api_v8_util.cc
-changed in both
-  base   100644 d1a185d51f394b1828d66cbcf2a1d1cc278de23d atom/common/api/remote_callback_freer.cc
-  our    100644 eba828591353dae53d1b7cdaa60fee52166d7473 atom/common/api/remote_callback_freer.cc
-  their  100644 099e2160cc0d28322a60e4a9891a22b29ab841f9 atom/common/api/remote_callback_freer.cc
-@@ -29,7 +29,12 @@
-     : ObjectLifeMonitor(isolate, target),
-       content::WebContentsObserver(web_contents),
-       context_id_(context_id),
-+<<<<<<< .our
-       object_id_(object_id) {}
-+=======
-+      object_id_(object_id) {
-+}
-+>>>>>>> .their
- 
- RemoteCallbackFreer::~RemoteCallbackFreer() {}
- 
-@@ -39,7 +44,11 @@
-   base::ListValue args;
-   args.AppendString(context_id_);
-   args.AppendInteger(object_id_);
-+<<<<<<< .our
-   auto* frame_host = web_contents()->GetMainFrame();
-+=======
-+  auto frame_host = web_contents()->GetMainFrame();
-+>>>>>>> .their
-   if (frame_host) {
-     frame_host->Send(new AtomFrameMsg_Message(frame_host->GetRoutingID(), false,
-                                               channel, args));
-changed in both
-  base   100644 315127822d1709802abf317c4d8cf49ec7e2bfaa atom/common/api/remote_object_freer.cc
-  our    100644 8afe8b9a32bc4ba4d5cdfc66ecf7036b8553cb48 atom/common/api/remote_object_freer.cc
-  their  100644 6e9778994ff21fb3c6be3dd27dbf7cbe2c4c94d6 atom/common/api/remote_object_freer.cc
-changed in both
-  base   100644 5fa39680ca814675d344665b3b2a6ce5d94e625f atom/common/atom_version.h
-  our    100644 65e7d19911559a40b1b258319df5fe0fa180354f atom/common/atom_version.h
-  their  100644 8827e576b1a71b91a6003714fd15039e03ff814e atom/common/atom_version.h
-@@ -5,10 +5,17 @@
- #ifndef ATOM_COMMON_ATOM_VERSION_H_
- #define ATOM_COMMON_ATOM_VERSION_H_
- 
-+<<<<<<< .our
- #define ATOM_MAJOR_VERSION 4
- #define ATOM_MINOR_VERSION 0
- #define ATOM_PATCH_VERSION 0
- #define ATOM_PRE_RELEASE_VERSION -nightly.20180821
-+=======
-+#define ATOM_MAJOR_VERSION 2
-+#define ATOM_MINOR_VERSION 1
-+#define ATOM_PATCH_VERSION 0
-+#define ATOM_PRE_RELEASE_VERSION -unsupported.20180809
-+>>>>>>> .their
- 
- #ifndef ATOM_STRINGIFY
- #define ATOM_STRINGIFY(n) ATOM_STRINGIFY_HELPER(n)
-changed in both
-  base   100644 a7908ef30c6bafc4aca1da9a870f7ae12703fe04 atom/common/crash_reporter/crash_reporter_win.cc
-  our    100644 c574da71c9de9bd8c7b7cad57d3a0f84708fb97c atom/common/crash_reporter/crash_reporter_win.cc
-  their  100644 49f90b7e6665727b697a243414544bae304fde6e atom/common/crash_reporter/crash_reporter_win.cc
-changed in both
-  base   100644 cff228ba49068a8a683257e9ac50778437a56c45 atom/common/linux/application_info.cc
-  our    100644 3354c73b8b60f77cf054f975ea713d96b7e7683e atom/common/linux/application_info.cc
-  their  100644 05bd7f6fc15015a4f570e36801aea622a8f0cb3a atom/common/linux/application_info.cc
-@@ -19,7 +19,11 @@
- namespace {
- 
- GDesktopAppInfo* get_desktop_app_info() {
-+<<<<<<< .our
-   GDesktopAppInfo* ret = nullptr;
-+=======
-+  GDesktopAppInfo * ret = nullptr;
-+>>>>>>> .their
- 
-   std::string desktop_id;
-   if (brightray::platform_util::GetDesktopName(&desktop_id))
-changed in both
-  base   100644 eed6e7bc092f84bd1bde673c27f5fe5363c7783c atom/common/options_switches.cc
-  our    100644 8b1836f80c583e4db68971ff1b00ca4f86356b45 atom/common/options_switches.cc
-  their  100644 c1cd185443c0fdbadeb7ba2e174d2048ab2d45d7 atom/common/options_switches.cc
-@@ -188,6 +188,9 @@
- // The application path
- const char kAppPath[] = "app-path";
- 
-+// The context ID for this process
-+const char kContextId[] = "context-id";
-+
- // The command line switch versions of the options.
- const char kBackgroundColor[] = "background-color";
- const char kPreloadScript[] = "preload";
-changed in both
-  base   100644 525301971c8a05c45e12aada7d0534b84307aebf atom/common/options_switches.h
-  our    100644 5f6d7e9d38120668ed06922ced2f8d6a6e27a52b atom/common/options_switches.h
-  their  100644 9d65bc376925906063c24a9a254b2c31c7e22c34 atom/common/options_switches.h
-@@ -92,6 +92,7 @@
- extern const char kSecureSchemes[];
- extern const char kAppUserModelId[];
- extern const char kAppPath[];
-+extern const char kContextId[];
- 
- extern const char kBackgroundColor[];
- extern const char kPreloadScript[];
-changed in both
-  base   100644 7bee1411ba1c2fbac516ff8b65bcbd89f6132819 atom/renderer/api/atom_api_renderer_ipc.cc
-  our    100644 3e48a4f7d0c11f40e6360b0acc2c83c38e671319 atom/renderer/api/atom_api_renderer_ipc.cc
-  their  100644 ad6a12b90d525e9c6a49fac7a5d122b8c2c295f9 atom/renderer/api/atom_api_renderer_ipc.cc
-@@ -12,8 +12,13 @@
- #include "native_mate/dictionary.h"
- #include "third_party/WebKit/public/web/WebLocalFrame.h"
- 
-+<<<<<<< .our
- using blink::WebLocalFrame;
- using content::RenderFrame;
-+=======
-+using content::RenderFrame;
-+using blink::WebLocalFrame;
-+>>>>>>> .their
- 
- namespace atom {
- 
-@@ -48,10 +53,17 @@
- 
-   RenderFrame* render_frame = GetCurrentRenderFrame();
-   if (render_frame == nullptr)
-+<<<<<<< .our
-     return result;
- 
-   IPC::SyncMessage* message = new AtomFrameHostMsg_Message_Sync(
-       render_frame->GetRoutingID(), channel, arguments, &result);
-+=======
-+    return json;
-+
-+  IPC::SyncMessage* message = new AtomFrameHostMsg_Message_Sync(
-+      render_frame->GetRoutingID(), channel, arguments, &json);
-+>>>>>>> .their
-   bool success = render_frame->Send(message);
- 
-   if (!success)
-changed in both
-  base   100644 d0164f44a0a523b26a919e02b5b7add25a0e7224 atom/renderer/api/atom_api_web_frame.cc
-  our    100644 f0f7ef249d73876f7107d3d3865e8fc71ee33945 atom/renderer/api/atom_api_web_frame.cc
-  their  100644 c36d1a06491994f126333c98796f6ff64cfc6506 atom/renderer/api/atom_api_web_frame.cc
-changed in both
-  base   100644 1971a26c1c5d4f5c5f5f029e6334f157a16b5394 atom/renderer/atom_render_frame_observer.cc
-  our    100644 ea2355fd968339600ae8093524f1c3dcfd2f4ff3 atom/renderer/atom_render_frame_observer.cc
-  their  100644 4ddf9186b723091ef91d69cfaedc4fbdd1ac09fa atom/renderer/atom_render_frame_observer.cc
-@@ -7,6 +7,8 @@
- #include <string>
- #include <vector>
- 
-+#include "atom/common/native_mate_converters/string16_converter.h"
-+
- #include "atom/common/api/api_messages.h"
- #include "atom/common/api/event_emitter_caller.h"
- #include "atom/common/native_mate_converters/value_converter.h"
-@@ -72,7 +74,12 @@
-     RendererClientBase* renderer_client)
-     : content::RenderFrameObserver(frame),
-       render_frame_(frame),
-+<<<<<<< .our
-       renderer_client_(renderer_client) {
-+=======
-+      renderer_client_(renderer_client),
-+      document_created_(false) {
-+>>>>>>> .their
-   // Initialise resource for directory listing.
-   net::NetModule::SetResourceProvider(NetResourceProvider);
- }
-@@ -195,8 +202,13 @@
- }
- 
- void AtomRenderFrameObserver::EmitIPCEvent(blink::WebLocalFrame* frame,
-+<<<<<<< .our
-                                            const base::string16& channel,
-                                            const base::ListValue& args) {
-+=======
-+                                          const base::string16& channel,
-+                                          const base::ListValue& args) {
-+>>>>>>> .their
-   if (!frame)
-     return;
- 
-changed in both
-  base   100644 248d5a68096dedea0f6ffb3c9df38ff3373e7c18 atom/renderer/atom_render_frame_observer.h
-  our    100644 e774741c019956a3bff00db2f6d2b133bf1be6de atom/renderer/atom_render_frame_observer.h
-  their  100644 d4f3d0c7d5c454bb65a190f59b26501137dd04e0 atom/renderer/atom_render_frame_observer.h
-@@ -56,7 +56,11 @@
- 
-   content::RenderFrame* render_frame_;
-   RendererClientBase* renderer_client_;
-+<<<<<<< .our
-   bool document_created_ = false;
-+=======
-+  bool document_created_;
-+>>>>>>> .their
- 
-   DISALLOW_COPY_AND_ASSIGN(AtomRenderFrameObserver);
- };
-changed in both
-  base   100644 4d3e7cba7a65330a45a5f2aebba90c257b206e35 atom/renderer/atom_render_view_observer.h
-  our    100644 097616e12369662473c12645a93e27cffcb55e3b atom/renderer/atom_render_view_observer.h
-  their  100644 ca9fb01288e3bd4788c7718f0feb8b37307383e6 atom/renderer/atom_render_view_observer.h
-@@ -14,7 +14,11 @@
-   explicit AtomRenderViewObserver(content::RenderView* render_view);
- 
-  protected:
-+<<<<<<< .our
-   ~AtomRenderViewObserver() override;
-+=======
-+  virtual ~AtomRenderViewObserver();
-+>>>>>>> .their
- 
-  private:
-   // content::RenderViewObserver implementation.
-changed in both
-  base   100644 82ba9d024350009ae86bc5406513c8086073990a atom/renderer/atom_renderer_client.cc
-  our    100644 204f17c2cf0d2d4ec4a71bdbecfcd1cbdc5fc8be atom/renderer/atom_renderer_client.cc
-  their  100644 9241410d7516bcfecc945e2659e02c178ddad2a7 atom/renderer/atom_renderer_client.cc
-@@ -77,8 +77,12 @@
- }
- 
- void AtomRendererClient::DidCreateScriptContext(
-+<<<<<<< .our
-     v8::Handle<v8::Context> context,
-     content::RenderFrame* render_frame) {
-+=======
-+    v8::Handle<v8::Context> context, content::RenderFrame* render_frame) {
-+>>>>>>> .their
-   RendererClientBase::DidCreateScriptContext(context, render_frame);
- 
-   // Only allow node integration for the main frame, unless it is a devtools
-changed in both
-  base   100644 07d20bda8b00b1acdb823546f5e606154278cd4e atom/renderer/atom_sandboxed_renderer_client.cc
-  our    100644 6e29fe45a69f44856d7fca449ec1be4eaf6970a2 atom/renderer/atom_sandboxed_renderer_client.cc
-  their  100644 f3642244f7847fc3f16144a40d2560478c276fa9 atom/renderer/atom_sandboxed_renderer_client.cc
-@@ -12,11 +12,16 @@
- #include "atom/common/options_switches.h"
- #include "atom/renderer/api/atom_api_renderer_ipc.h"
- #include "atom/renderer/atom_render_frame_observer.h"
-+<<<<<<< .our
- #include "base/base_paths.h"
- #include "base/command_line.h"
- #include "base/files/file_path.h"
- #include "base/path_service.h"
- #include "base/process/process_handle.h"
-+=======
-+#include "base/command_line.h"
-+#include "base/files/file_path.h"
-+>>>>>>> .their
- #include "chrome/renderer/printing/print_web_view_helper.h"
- #include "content/public/renderer/render_frame.h"
- #include "native_mate/dictionary.h"
-@@ -34,8 +39,13 @@
- const std::string kModuleCacheKey = "native-module-cache";
- 
- bool IsDevTools(content::RenderFrame* render_frame) {
-+<<<<<<< .our
-   return render_frame->GetWebFrame()->GetDocument().Url().ProtocolIs(
-       "chrome-devtools");
-+=======
-+  return render_frame->GetWebFrame()->GetDocument().Url()
-+        .ProtocolIs("chrome-devtools");
-+>>>>>>> .their
- }
- 
- v8::Local<v8::Object> GetModuleCache(v8::Isolate* isolate) {
-@@ -102,12 +112,19 @@
-   AtomSandboxedRenderFrameObserver(content::RenderFrame* render_frame,
-                                    AtomSandboxedRendererClient* renderer_client)
-       : AtomRenderFrameObserver(render_frame, renderer_client),
-+<<<<<<< .our
-         renderer_client_(renderer_client) {}
-+=======
-+        v8_converter_(new atom::V8ValueConverter),
-+        renderer_client_(renderer_client) {
-+    v8_converter_->SetDisableNode(true);
-+  }
-+>>>>>>> .their
- 
-  protected:
-   void EmitIPCEvent(blink::WebLocalFrame* frame,
-                     const base::string16& channel,
--                    const base::ListValue& args) override {
-+                    const base::ListValue& args) {
-     if (!frame)
-       return;
- 
-@@ -176,6 +193,7 @@
- }
- 
- void AtomSandboxedRendererClient::DidCreateScriptContext(
-+<<<<<<< .our
-     v8::Handle<v8::Context> context,
-     content::RenderFrame* render_frame) {
-   RendererClientBase::DidCreateScriptContext(context, render_frame);
-@@ -184,6 +202,19 @@
-   // For devtools we still want to run the preload_bundle script
-   if (!render_frame->IsMainFrame() && !IsDevTools(render_frame))
-     return;
-+=======
-+    v8::Handle<v8::Context> context, content::RenderFrame* render_frame) {
-+  RendererClientBase::DidCreateScriptContext(context, render_frame);
-+
-+  // Only allow preload for the main frame or
-+  // For devtools we still want to run the preload_bundle script
-+  if (!render_frame->IsMainFrame() && !IsDevTools(render_frame))
-+    return;
-+
-+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-+  base::FilePath preload_script_path = command_line->GetSwitchValuePath(
-+      switches::kPreloadScript);
-+>>>>>>> .their
- 
-   auto* isolate = context->GetIsolate();
-   v8::HandleScope handle_scope(isolate);
-@@ -203,7 +234,14 @@
-   auto binding = v8::Object::New(isolate);
-   InitializeBindings(binding, context);
-   AddRenderBindings(isolate, binding);
-+<<<<<<< .our
-   v8::Local<v8::Value> args[] = {binding};
-+=======
-+  v8::Local<v8::Value> args[] = {
-+    binding,
-+    mate::ConvertToV8(isolate, preload_script_path.value())
-+  };
-+>>>>>>> .their
-   // Execute the function with proper arguments
-   ignore_result(
-       func->Call(context, v8::Null(isolate), node::arraysize(args), args));
-changed in both
-  base   100644 89af0932d10a598f87dd28ec4b32ae3b2e0eadca atom/renderer/renderer_client_base.cc
-  our    100644 69490420ef5b8f87e7cb8fd97ebd5ec4509fa1ae atom/renderer/renderer_client_base.cc
-  their  100644 dbb39a363cd31b6de64f52b5854225d35bcc5a54 atom/renderer/renderer_client_base.cc
-@@ -16,6 +16,10 @@
- #include "atom/renderer/content_settings_observer.h"
- #include "atom/renderer/preferences_manager.h"
- #include "base/command_line.h"
-+<<<<<<< .our
-+=======
-+#include "base/memory/ptr_util.h"
-+>>>>>>> .their
- #include "base/process/process_handle.h"
- #include "base/strings/string_split.h"
- #include "base/strings/stringprintf.h"
-@@ -42,6 +46,7 @@
- #include <shlobj.h>
- #endif
- 
-+<<<<<<< .our
- #if defined(ENABLE_PDF_VIEWER)
- #include "atom/common/atom_constants.h"
- #endif  // defined(ENABLE_PDF_VIEWER)
-@@ -50,6 +55,8 @@
- #include "chrome/renderer/pepper/pepper_helper.h"
- #endif  // defined(ENABLE_PEPPER_FLASH)
- 
-+=======
-+>>>>>>> .their
- // This is defined in later versions of Chromium, remove this if you see
- // compiler complaining duplicate defines.
- #if defined(OS_WIN) || defined(OS_FUCHSIA)
-@@ -105,6 +112,19 @@
-   context->Global()->SetPrivate(context, private_key, value);
- }
- 
-+void RendererClientBase::DidCreateScriptContext(
-+    v8::Handle<v8::Context> context,
-+    content::RenderFrame* render_frame) {
-+  // global.setHidden("contextId", `${processId}-${++nextContextId}`)
-+  std::string context_id = base::StringPrintf(
-+      "%" CrPRIdPid "-%d", base::GetCurrentProcId(), ++next_context_id_);
-+  v8::Isolate* isolate = context->GetIsolate();
-+  v8::Local<v8::String> key = mate::StringToSymbol(isolate, "contextId");
-+  v8::Local<v8::Private> private_key = v8::Private::ForApi(isolate, key);
-+  v8::Local<v8::Value> value = mate::ConvertToV8(isolate, context_id);
-+  context->Global()->SetPrivate(context, private_key, value);
-+}
-+
- void RendererClientBase::AddRenderBindings(
-     v8::Isolate* isolate,
-     v8::Local<v8::Object> binding_object) {
-@@ -161,7 +181,10 @@
- 
- void RendererClientBase::RenderFrameCreated(
-     content::RenderFrame* render_frame) {
-+<<<<<<< .our
- #if defined(TOOLKIT_VIEWS)
-+=======
-+>>>>>>> .their
-   new AutofillAgent(render_frame);
- #endif
- #if defined(ENABLE_PEPPER_FLASH)
-changed in both
-  base   100644 ba302e6a34498cb59cfa8cbf8636044691ee904c atom/renderer/renderer_client_base.h
-  our    100644 f04be0a0fb555fce88aa006c6c6623cc8730d4ed atom/renderer/renderer_client_base.h
-  their  100644 70db197294b7d2491d9c1eaf008ac8b36796f418 atom/renderer/renderer_client_base.h
-@@ -20,10 +20,17 @@
-   RendererClientBase();
-   ~RendererClientBase() override;
- 
-+<<<<<<< .our
-   virtual void DidCreateScriptContext(v8::Handle<v8::Context> context,
-                                       content::RenderFrame* render_frame);
-   virtual void WillReleaseScriptContext(v8::Handle<v8::Context> context,
-                                         content::RenderFrame* render_frame) = 0;
-+=======
-+  virtual void DidCreateScriptContext(
-+      v8::Handle<v8::Context> context, content::RenderFrame* render_frame);
-+  virtual void WillReleaseScriptContext(
-+      v8::Handle<v8::Context> context, content::RenderFrame* render_frame) = 0;
-+>>>>>>> .their
-   virtual void DidClearWindowObject(content::RenderFrame* render_frame);
-   virtual void SetupMainWorldOverrides(v8::Handle<v8::Context> context) = 0;
- 
-changed in both
-  base   100644 653aca2b86182a17d5a1a53aeda6d441bfd3652a atom/utility/atom_content_utility_client.cc
-  our    100644 e2a856d53ae243de988c43b0a3335b9391e54b4e atom/utility/atom_content_utility_client.cc
-  their  100644 91168f7fc2da98546864d12f03d1e0f75a7ca64f atom/utility/atom_content_utility_client.cc
-@@ -4,12 +4,29 @@
- 
- #include "atom/utility/atom_content_utility_client.h"
- 
-+#include "content/public/common/service_manager_connection.h"
-+#include "content/public/common/simple_connection_filter.h"
-+#include "content/public/utility/utility_thread.h"
-+#include "mojo/public/cpp/bindings/strong_binding.h"
-+#include "net/proxy/mojo_proxy_resolver_factory_impl.h"
-+#include "services/service_manager/public/cpp/binder_registry.h"
-+
- #if defined(OS_WIN)
- #include "chrome/utility/printing_handler_win.h"
- #endif
- 
- namespace atom {
- 
-+namespace {
-+
-+void CreateProxyResolverFactory(
-+    net::interfaces::ProxyResolverFactoryRequest request) {
-+  mojo::MakeStrongBinding(base::MakeUnique<net::MojoProxyResolverFactoryImpl>(),
-+                          std::move(request));
-+}
-+
-+}  // namespace
-+
- AtomContentUtilityClient::AtomContentUtilityClient() {
- #if defined(OS_WIN)
-   handlers_.push_back(std::make_unique<printing::PrintingHandlerWin>());
-@@ -18,7 +35,29 @@
- 
- AtomContentUtilityClient::~AtomContentUtilityClient() {}
- 
-+<<<<<<< .our
- bool AtomContentUtilityClient::OnMessageReceived(const IPC::Message& message) {
-+=======
-+void AtomContentUtilityClient::UtilityThreadStarted() {
-+  content::ServiceManagerConnection* connection =
-+      content::ChildThread::Get()->GetServiceManagerConnection();
-+
-+  // NOTE: Some utility process instances are not connected to the Service
-+  // Manager. Nothing left to do in that case.
-+  if (!connection)
-+    return;
-+
-+  auto registry = base::MakeUnique<service_manager::BinderRegistry>();
-+  registry->AddInterface<net::interfaces::ProxyResolverFactory>(
-+      base::Bind(CreateProxyResolverFactory),
-+      base::ThreadTaskRunnerHandle::Get());
-+  connection->AddConnectionFilter(
-+      base::MakeUnique<content::SimpleConnectionFilter>(std::move(registry)));
-+}
-+
-+bool AtomContentUtilityClient::OnMessageReceived(
-+    const IPC::Message& message) {
-+>>>>>>> .their
- #if defined(OS_WIN)
-   for (const auto& handler : handlers_) {
-     if (handler->OnMessageReceived(message))
-merged
-  result 100644 75359a2456129dd0caeb03a37eebf7bbfb9a2e21 atom/utility/atom_content_utility_client.h
-  our    100644 7694970457b745a84ecab24a2f0ec8eaefa8a1ad atom/utility/atom_content_utility_client.h
-@@ -20,6 +20,7 @@
-   AtomContentUtilityClient();
-   ~AtomContentUtilityClient() override;
- 
-+  void UtilityThreadStarted() override;
-   bool OnMessageReceived(const IPC::Message& message) override;
- 
-  private:
-changed in both
-  base   100644 065fe818a64586b6f786cdaa163c40b8a3aacabe brightray/brightray.gyp
-  our    100644 f233257e88bad8f0ff703034bea02e4715a5b5b9 brightray/brightray.gyp
-  their  100644 03d48ccef48fccb58bd39f9604e73b872f825d76 brightray/brightray.gyp
-@@ -127,6 +127,8 @@
-                   '<(libchromiumcontent_dir)/libviz_service.a',
-                   # services/device/wake_lock/power_save_blocker/
-                   '<(libchromiumcontent_dir)/libpower_save_blocker.a',
-+                  # net/proxy/mojo_*
-+                  '<(libchromiumcontent_dir)/libnet_proxy_service.a',
-                   # Friends of libpdf.a:
-                   # On Linux we have to use "--whole-archive" to include
-                   # all symbols, otherwise there will be plenty of
-@@ -178,6 +180,7 @@
-                 ],
-               },
-             }],
-+<<<<<<< .our
-             # Due to strange linker behavior, component build of arm needs to
-             # be linked with libjpeg.a explicitly.
-             ['target_arch=="arm" and libchromiumcontent_component==1', {
-@@ -187,6 +190,8 @@
-                 ],
-               },
-             }],
-+=======
-+>>>>>>> .their
-           ],
-         }],  # OS=="linux"
-         ['OS=="mac"', {
-@@ -221,6 +226,8 @@
-                   '<(libchromiumcontent_dir)/libviz_service.a',
-                   # services/device/wake_lock/power_save_blocker/
-                   '<(libchromiumcontent_dir)/libpower_save_blocker.a',
-+                  # net/proxy/mojo_*
-+                  '<(libchromiumcontent_dir)/libnet_proxy_service.a',
-                   # Friends of libpdf.a:
-                   '<(libchromiumcontent_dir)/libpdf.a',
-                   '<(libchromiumcontent_dir)/libppapi_cpp_objects.a',
-@@ -288,6 +295,20 @@
-                 ],
-               },
-             }],
-+            # In the OSX 10.10 SDK, CoreBluetooth became a top level framework.
-+            # Previously, it was nested in IOBluetooth. In order for Chrome to run on
-+            # OSes older than OSX 10.10, the top level CoreBluetooth framework must be
-+            # weakly linked.
-+            ['mac_sdk=="10.10" and libchromiumcontent_component==0', {
-+              'direct_dependent_settings': {
-+                'xcode_settings': {
-+                  'OTHER_LDFLAGS': [
-+                    '-weak_framework',
-+                    'CoreBluetooth',
-+                  ],
-+                },
-+              },
-+            }],
-           ]
-         }],  # OS=="mac"
-         ['OS=="win"', {
-@@ -359,6 +380,8 @@
-                   '<(libchromiumcontent_dir)/viz_service.lib',
-                   # services/device/wake_lock/power_save_blocker/
-                   '<(libchromiumcontent_dir)/power_save_blocker.lib',
-+                  # net/proxy/mojo_*
-+                  '<(libchromiumcontent_dir)/net_proxy_service.lib',
-                   # Friends of pdf.lib:
-                   '<(libchromiumcontent_dir)/pdf.lib',
-                   '<(libchromiumcontent_dir)/ppapi_cpp_objects.lib',
-changed in both
-  base   100644 d7a4c672926c03dcf4c1a4df1a9e5fa09b19d272 brightray/browser/browser_context.cc
-  our    100644 1eff7344e9aef78bb88720c38c0f75fb92e6bc09 brightray/browser/browser_context.cc
-  their  100644 241398ce96efbe0e4f2203acd86f224c910443e2 brightray/browser/browser_context.cc
-@@ -89,6 +89,7 @@
- }
- 
- void BrowserContext::InitPrefs() {
-+  base::ThreadRestrictions::ScopedAllowIO allow_io;
-   auto prefs_path = GetPath().Append(FILE_PATH_LITERAL("Preferences"));
-   base::ThreadRestrictions::ScopedAllowIO allow_io;
-   PrefServiceFactory prefs_factory;
-changed in both
-  base   100644 642734aa4db9fd3c8025986bb987d79102b27dd5 brightray/browser/browser_main_parts.cc
-  our    100644 78d0ef15ef1343e7db123f97182bac7f9a98b3eb brightray/browser/browser_main_parts.cc
-  their  100644 c79ce69b4b3566b21e5411f2a477b52bcf5ce899 brightray/browser/browser_main_parts.cc
-@@ -183,18 +183,29 @@
-   auto* cmd_line = base::CommandLine::ForCurrentProcess();
-   const auto enable_features =
-       cmd_line->GetSwitchValueASCII(switches::kEnableFeatures);
-+<<<<<<< .our
-   auto disable_features =
-       cmd_line->GetSwitchValueASCII(switches::kDisableFeatures);
-   auto feature_list = std::make_unique<base::FeatureList>();
-+=======
-+  const auto disable_features =
-+      cmd_line->GetSwitchValueASCII(switches::kDisableFeatures);
-+
-+  std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);
-+>>>>>>> .their
-   feature_list->InitializeFromCommandLine(enable_features, disable_features);
-   base::FeatureList::SetInstance(std::move(feature_list));
- }
- 
-+<<<<<<< .our
- bool BrowserMainParts::ShouldContentCreateFeatureList() {
-   return false;
- }
- 
- int BrowserMainParts::PreEarlyInitialization() {
-+=======
-+void BrowserMainParts::PreEarlyInitialization() {
-+>>>>>>> .their
-   InitializeFeatureList();
-   OverrideAppLogsPath();
- #if defined(USE_X11)
-changed in both
-  base   100644 f69682ce51610a754dcaa4f9751c7a22b9a359b2 brightray/browser/browser_main_parts.h
-  our    100644 cf8e0296585b17f1e7dab1717e0aa80293d902dd brightray/browser/browser_main_parts.h
-  their  100644 df8234995d6ed3258d94bf0ebf88112629629f07 brightray/browser/browser_main_parts.h
-changed in both
-  base   100644 143a5fdea3eb6ad7709fa8383298029a24c1b407 brightray/browser/linux/libnotify_notification.cc
-  our    100644 0725ffded989d3c6bce753a210e464deca346ad1 brightray/browser/linux/libnotify_notification.cc
-  their  100644 7f9fb35e434f7cc85cf4145661e754ff4a0d84fc brightray/browser/linux/libnotify_notification.cc
-added in remote
-  their  100644 def1fc7f25e6fa60aa4a548d4ddbe9c2f5633289 brightray/browser/net/chrome_mojo_proxy_resolver_factory.cc
-@@ -0,0 +1,117 @@
-+// Copyright 2015 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "brightray/browser/net/chrome_mojo_proxy_resolver_factory.h"
-+
-+#include <utility>
-+
-+#include "base/logging.h"
-+#include "base/memory/ptr_util.h"
-+#include "base/memory/singleton.h"
-+#include "base/single_thread_task_runner.h"
-+#include "base/strings/utf_string_conversions.h"
-+#include "base/threading/thread_task_runner_handle.h"
-+#include "content/public/browser/browser_thread.h"
-+#include "content/public/browser/utility_process_host.h"
-+#include "content/public/browser/utility_process_host_client.h"
-+#include "services/service_manager/public/cpp/interface_provider.h"
-+
-+namespace {
-+const int kUtilityProcessIdleTimeoutSeconds = 5;
-+}
-+
-+// static
-+ChromeMojoProxyResolverFactory* ChromeMojoProxyResolverFactory::GetInstance() {
-+  DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-+  return base::Singleton<
-+      ChromeMojoProxyResolverFactory,
-+      base::LeakySingletonTraits<ChromeMojoProxyResolverFactory>>::get();
-+}
-+
-+ChromeMojoProxyResolverFactory::ChromeMojoProxyResolverFactory() {
-+  DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-+}
-+
-+ChromeMojoProxyResolverFactory::~ChromeMojoProxyResolverFactory() {
-+  DCHECK(thread_checker_.CalledOnValidThread());
-+}
-+
-+std::unique_ptr<base::ScopedClosureRunner>
-+ChromeMojoProxyResolverFactory::CreateResolver(
-+    const std::string& pac_script,
-+    mojo::InterfaceRequest<net::interfaces::ProxyResolver> req,
-+    net::interfaces::ProxyResolverFactoryRequestClientPtr client) {
-+  DCHECK(thread_checker_.CalledOnValidThread());
-+  if (!resolver_factory_)
-+    CreateFactory();
-+
-+  if (!resolver_factory_) {
-+    // If factory creation failed, close |req|'s message pipe, which should
-+    // cause a connection error.
-+    req = nullptr;
-+    return nullptr;
-+  }
-+  idle_timer_.Stop();
-+  num_proxy_resolvers_++;
-+  resolver_factory_->CreateResolver(pac_script, std::move(req),
-+                                    std::move(client));
-+  return base::MakeUnique<base::ScopedClosureRunner>(
-+      base::Bind(&ChromeMojoProxyResolverFactory::OnResolverDestroyed,
-+                 base::Unretained(this)));
-+}
-+
-+void ChromeMojoProxyResolverFactory::CreateFactory() {
-+  DCHECK(thread_checker_.CalledOnValidThread());
-+  DCHECK(!resolver_factory_);
-+  DCHECK(!weak_utility_process_host_);
-+
-+  DVLOG(1) << "Attempting to create utility process for proxy resolver";
-+  content::UtilityProcessHost* utility_process_host =
-+      content::UtilityProcessHost::Create(
-+          scoped_refptr<content::UtilityProcessHostClient>(),
-+          base::ThreadTaskRunnerHandle::Get());
-+  utility_process_host->SetName(base::ASCIIToUTF16("Electron Proxy Resolver"));
-+  bool process_started = utility_process_host->Start();
-+  if (process_started) {
-+    BindInterface(utility_process_host, &resolver_factory_);
-+    weak_utility_process_host_ = utility_process_host->AsWeakPtr();
-+  } else {
-+    LOG(ERROR) << "Unable to connect to utility process";
-+    return;
-+  }
-+
-+  resolver_factory_.set_connection_error_handler(base::Bind(
-+      &ChromeMojoProxyResolverFactory::DestroyFactory, base::Unretained(this)));
-+}
-+
-+void ChromeMojoProxyResolverFactory::DestroyFactory() {
-+  resolver_factory_.reset();
-+  delete weak_utility_process_host_.get();
-+  weak_utility_process_host_.reset();
-+}
-+
-+void ChromeMojoProxyResolverFactory::OnResolverDestroyed() {
-+  DCHECK(thread_checker_.CalledOnValidThread());
-+  DCHECK_GT(num_proxy_resolvers_, 0u);
-+  if (--num_proxy_resolvers_ == 0) {
-+    // When all proxy resolvers have been destroyed, the proxy resolver factory
-+    // is no longer needed. However, new proxy resolvers may be created
-+    // shortly after being destroyed (e.g. due to a network change).
-+    //
-+    // On desktop, where a utility process is used, if the utility process is
-+    // shut down immediately, this would cause unnecessary process churn, so
-+    // wait for an idle timeout before shutting down the proxy resolver utility
-+    // process.
-+    idle_timer_.Start(
-+        FROM_HERE,
-+        base::TimeDelta::FromSeconds(kUtilityProcessIdleTimeoutSeconds), this,
-+        &ChromeMojoProxyResolverFactory::OnIdleTimeout);
-+  }
-+}
-+
-+void ChromeMojoProxyResolverFactory::OnIdleTimeout() {
-+  DCHECK(thread_checker_.CalledOnValidThread());
-+  DCHECK_EQ(num_proxy_resolvers_, 0u);
-+  DestroyFactory();
-+}
-added in remote
-  their  100644 47e51efebf3285c981ab71ba344d27bcd89c52e6 brightray/browser/net/chrome_mojo_proxy_resolver_factory.h
-@@ -0,0 +1,73 @@
-+// Copyright 2015 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef BRIGHTRAY_BROWSER_NET_CHROME_MOJO_PROXY_RESOLVER_FACTORY_H_
-+#define BRIGHTRAY_BROWSER_NET_CHROME_MOJO_PROXY_RESOLVER_FACTORY_H_
-+
-+#include <stddef.h>
-+#include <string>
-+
-+#include "base/macros.h"
-+#include "base/memory/weak_ptr.h"
-+#include "base/threading/thread_checker.h"
-+#include "base/timer/timer.h"
-+#include "net/proxy/mojo_proxy_resolver_factory.h"
-+
-+namespace content {
-+class UtilityProcessHost;
-+}
-+
-+namespace base {
-+template <typename Type>
-+struct DefaultSingletonTraits;
-+}  // namespace base
-+
-+// A factory used to create connections to Mojo proxy resolver services.  On
-+// Android, the proxy resolvers will run in the browser process, and on other
-+// platforms, they'll all be run in the same utility process. Utility process
-+// crashes are detected and the utility process is automatically restarted.
-+class ChromeMojoProxyResolverFactory : public net::MojoProxyResolverFactory {
-+ public:
-+  static ChromeMojoProxyResolverFactory* GetInstance();
-+
-+  // Overridden from net::MojoProxyResolverFactory:
-+  std::unique_ptr<base::ScopedClosureRunner> CreateResolver(
-+      const std::string& pac_script,
-+      mojo::InterfaceRequest<net::interfaces::ProxyResolver> req,
-+      net::interfaces::ProxyResolverFactoryRequestClientPtr client) override;
-+
-+ private:
-+  friend struct base::DefaultSingletonTraits<ChromeMojoProxyResolverFactory>;
-+  ChromeMojoProxyResolverFactory();
-+  ~ChromeMojoProxyResolverFactory() override;
-+
-+  // Creates the proxy resolver factory. On desktop, creates a new utility
-+  // process before creating it out of process. On Android, creates it on the
-+  // current thread.
-+  void CreateFactory();
-+
-+  // Destroys |resolver_factory_|.
-+  void DestroyFactory();
-+
-+  // Invoked each time a proxy resolver is destroyed.
-+  void OnResolverDestroyed();
-+
-+  // Invoked once an idle timeout has elapsed after all proxy resolvers are
-+  // destroyed.
-+  void OnIdleTimeout();
-+
-+  net::interfaces::ProxyResolverFactoryPtr resolver_factory_;
-+
-+  base::WeakPtr<content::UtilityProcessHost> weak_utility_process_host_;
-+
-+  size_t num_proxy_resolvers_ = 0;
-+
-+  base::OneShotTimer idle_timer_;
-+
-+  base::ThreadChecker thread_checker_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(ChromeMojoProxyResolverFactory);
-+};
-+
-+#endif  // BRIGHTRAY_BROWSER_NET_CHROME_MOJO_PROXY_RESOLVER_FACTORY_H_
-changed in both
-  base   100644 7a798ae98e6c180c5a60e0a32ce6393532e83468 brightray/browser/net_log.cc
-  our    100644 fb443ea0b72b9659d98d1873fad1a714483bb13f brightray/browser/net_log.cc
-  their  100644 978667acb61b0330d6bf48bb7e814bbdef50b904 brightray/browser/net_log.cc
-@@ -45,11 +45,16 @@
-     return;
- 
-   base::FilePath log_path =
-+<<<<<<< .our
-       command_line->GetSwitchValuePath(network::switches::kLogNetLog);
-   if (log_path.empty())
-     return;
- 
-   std::unique_ptr<base::Value> constants(GetConstants());  // Net constants
-+=======
-+      command_line->GetSwitchValuePath(switches::kLogNetLog);
-+  std::unique_ptr<base::Value> constants(GetConstants());
-+>>>>>>> .their
-   net::NetLogCaptureMode capture_mode = net::NetLogCaptureMode::Default();
- 
-   file_net_log_observer_ =
-changed in both
-  base   100644 28e988f4b49cd35507e4972c19122bbe604f2690 brightray/browser/url_request_context_getter.cc
-  our    100644 c07ba80cbc522030af580adc5d8676ed31d592d1 brightray/browser/url_request_context_getter.cc
-  their  100644 972d8054221e95442456559ada46ba62e6f75b79 brightray/browser/url_request_context_getter.cc
-@@ -12,7 +12,13 @@
- #include "base/strings/string_util.h"
- #include "base/task_scheduler/post_task.h"
- #include "brightray/browser/browser_client.h"
-+<<<<<<< .our
- #include "brightray/browser/browser_context.h"
-+=======
-+#include "brightray/browser/net/chrome_mojo_proxy_resolver_factory.h"
-+#include "brightray/browser/net/devtools_network_controller_handle.h"
-+#include "brightray/browser/net/devtools_network_transaction_factory.h"
-+>>>>>>> .their
- #include "brightray/browser/net/require_ct_delegate.h"
- #include "brightray/browser/net_log.h"
- #include "brightray/common/switches.h"
-@@ -35,11 +41,20 @@
- #include "net/http/http_auth_preferences.h"
- #include "net/http/http_server_properties_impl.h"
- #include "net/log/net_log.h"
-+<<<<<<< .our
- #include "net/proxy_resolution/dhcp_pac_file_fetcher_factory.h"
- #include "net/proxy_resolution/pac_file_fetcher_impl.h"
- #include "net/proxy_resolution/proxy_config.h"
- #include "net/proxy_resolution/proxy_config_service.h"
- #include "net/proxy_resolution/proxy_service.h"
-+=======
-+#include "net/proxy/dhcp_proxy_script_fetcher_factory.h"
-+#include "net/proxy/proxy_config.h"
-+#include "net/proxy/proxy_config_service.h"
-+#include "net/proxy/proxy_script_fetcher_impl.h"
-+#include "net/proxy/proxy_service.h"
-+#include "net/proxy/proxy_service_mojo.h"
-+>>>>>>> .their
- #include "net/ssl/channel_id_service.h"
- #include "net/ssl/default_channel_id_store.h"
- #include "net/ssl/ssl_config_service_defaults.h"
-@@ -276,9 +291,18 @@
-       storage_->set_proxy_resolution_service(
-           net::ProxyResolutionService::CreateFixed(proxy_config));
-     } else {
-+<<<<<<< .our
-       storage_->set_proxy_resolution_service(
-           net::ProxyResolutionService::CreateUsingSystemProxyResolver(
-               std::move(proxy_config_service_), net_log_));
-+=======
-+      storage_->set_proxy_service(net::CreateProxyServiceUsingMojoFactory(
-+          ChromeMojoProxyResolverFactory::GetInstance(),
-+          std::move(proxy_config_service_),
-+          new net::ProxyScriptFetcherImpl(url_request_context_.get()),
-+          dhcp_factory.Create(url_request_context_.get()), host_resolver.get(),
-+          nullptr, url_request_context_->network_delegate()));
-+>>>>>>> .their
-     }
- 
-     std::vector<std::string> schemes;
-changed in both
-  base   100644 04033f451e045ee7211f0a7152d46c5010a55b72 brightray/browser/url_request_context_getter.h
-  our    100644 941a5782b14a941bb25a7a9ef6ca6d73f8bc3ec1 brightray/browser/url_request_context_getter.h
-  their  100644 1a26704d380ab7d113c4e2b0deb940a2d674f96b brightray/browser/url_request_context_getter.h
-@@ -76,11 +76,14 @@
-       const override;
- 
-   net::URLRequestJobFactory* job_factory() const { return job_factory_; }
-+<<<<<<< .our
-   void set_delegate(Delegate* delegate) { delegate_ = delegate; }
- 
-   // Discard reference to URLRequestContext and inform observers to
-   // shutdown. Must be called only on IO thread.
-   void NotifyContextShuttingDown(std::unique_ptr<ResourceContext>);
-+=======
-+>>>>>>> .their
- 
-  private:
-   friend class BrowserContext;
-changed in both
-  base   100644 08b203a23291ba0e2ba254873074178da4921123 brightray/common/application_info_win.cc
-  our    100644 a0256372bbdbbc1d77cb84885faab42a27f55c9f brightray/common/application_info_win.cc
-  their  100644 89ea0aceb6784119ad65783cfd1c019e7aedbf57 brightray/common/application_info_win.cc
-changed in both
-  base   100644 6a7d91f135c4b904e6d3172da91e7813793a2fba brightray/filenames.gypi
-  our    100644 b9e2d96175f8ee2d407db9c49b2e2b74756327de brightray/filenames.gypi
-  their  100644 e3f2aa5f5bc6f7443df50b88c1ab498d2de0a6f1 brightray/filenames.gypi
-@@ -47,6 +47,27 @@
-       'browser/media/media_device_id_salt.h',
-       'browser/media/media_stream_devices_controller.cc',
-       'browser/media/media_stream_devices_controller.h',
-+<<<<<<< .our
-+=======
-+      'browser/net/devtools_network_conditions.cc',
-+      'browser/net/devtools_network_conditions.h',
-+      'browser/net/devtools_network_controller.cc',
-+      'browser/net/devtools_network_controller.h',
-+      'browser/net/devtools_network_controller_handle.cc',
-+      'browser/net/devtools_network_controller_handle.h',
-+      'browser/net/devtools_network_interceptor.cc',
-+      'browser/net/devtools_network_interceptor.h',
-+      'browser/net/devtools_network_protocol_handler.cc',
-+      'browser/net/devtools_network_protocol_handler.h',
-+      'browser/net/devtools_network_transaction_factory.cc',
-+      'browser/net/devtools_network_transaction_factory.h',
-+      'browser/net/devtools_network_transaction.cc',
-+      'browser/net/devtools_network_transaction.h',
-+      'browser/net/devtools_network_upload_data_stream.cc',
-+      'browser/net/devtools_network_upload_data_stream.h',
-+      'browser/net/chrome_mojo_proxy_resolver_factory.cc',
-+      'browser/net/chrome_mojo_proxy_resolver_factory.h',
-+>>>>>>> .their
-       'browser/net/require_ct_delegate.cc',
-       'browser/net/require_ct_delegate.h',
-       'browser/net_log.cc',
-changed in both
-  base   100644 233e21047718c9bbbc9056f79aecf51657886b92 common.gypi
-  our    100644 676d1e904127066e4a3d313106f15406fcbed8b6 common.gypi
-  their  100644 acad39d991479147b9bc2ee2c5a51fbd8693a689 common.gypi
-changed in both
-  base   100644 e0e8b153ae51d917f37ba50967e2ef9e5b74254d docs/README.md
-  our    100644 f7b956e8feb95ceb64743ad260a1759e5a298afe docs/README.md
-  their  100644 436188887e5dad0a4ae291e5221e3eb8644bc56e docs/README.md
-@@ -16,6 +16,7 @@
- 
- * [Electron FAQ](faq.md)
- 
-+<<<<<<< .our
- ## Guides and Tutorials
- 
- * [Setting up the Development Environment](tutorial/development-environment.md)
-@@ -66,6 +67,12 @@
-   * [Mac App Store](tutorial/mac-app-store-submission-guide.md)
-   * [Windows Store](tutorial/windows-store-guide.md)
-   * [Snapcraft](tutorial/snapcraft.md)
-+=======
-+## Guides
-+
-+* [Glossary of Terms](glossary.md)
-+* [Support](tutorial/support.md)
-+>>>>>>> .their
- * [Security](tutorial/security.md)
-   * [Reporting Security Issues](tutorial/security.md#reporting-security-issues)
-   * [Chromium Security Issues and Upgrades](tutorial/security.md#chromium-security-issues-and-upgrades)
-changed in both
-  base   100644 926d1dde8ffc33d99c48cb55bbc2d0f9c2087ad4 docs/api/app.md
-  our    100644 14dc557e237404cbbd5bcebabb0e65486dc36926 docs/api/app.md
-  their  100644 40fdf2669442ca48fd1fc9a3b4aede6a199df4f1 docs/api/app.md
-changed in both
-  base   100644 2be2da597664c1913a665ad51de5becc42658d0f docs/api/browser-window.md
-  our    100644 dff61dd336f047cf2f6f06228b2df2b98ff2304d docs/api/browser-window.md
-  their  100644 b9664cb4eff53f133822767b9006d596072c9a40 docs/api/browser-window.md
-changed in both
-  base   100644 f9aaaa90ddd7b8887c5ed3fea371bf175e28c2e7 docs/api/in-app-purchase.md
-  our    100644 6e612a72e27159602400f4efa30d5bc2f3aa668f docs/api/in-app-purchase.md
-  their  100644 67109dc0f92d8c537c9a2f1fa5fa2ce223137964 docs/api/in-app-purchase.md
-changed in both
-  base   100644 f130d127936331ab8c6cadd4672a7446a77a683a docs/api/tray.md
-  our    100644 c60f7ba4c9e9b6ad3fc1b2f717983b71bd286842 docs/api/tray.md
-  their  100644 5fb345538a7f29bb679223af1c4d9d3b099a9bf0 docs/api/tray.md
-changed in both
-  base   100644 6aaa2bdd9b0ade84160b7449396d5ecd510f0e41 docs/api/web-contents.md
-  our    100644 8990fe2e97ab62eafdd3f7a4eb8ee782415124c5 docs/api/web-contents.md
-  their  100644 841acb4a506626c334004e28266ebed3845360d3 docs/api/web-contents.md
-@@ -1385,6 +1385,26 @@
- 
- Shows pop-up dictionary that searches the selected word on the page.
- 
-+<<<<<<< .our
-+=======
-+#### `contents.setSize(options)`
-+
-+Set the size of the page. This is only supported for `<webview>` guest contents.
-+
-+* `options` Object
-+  * `enableAutoSize` Boolean (optional) - true to make the webview container automatically
-+    resize within the bounds specified by the attributes normal, min and max.
-+  * `normal` [Size](structures/size.md) (optional) - Normal size of the page. This can be used in
-+    combination with the [`disableguestresize`](webview-tag.md#disableguestresize)
-+    attribute to manually resize the webview guest contents.
-+  * `min` [Size](structures/size.md) (optional) - Minimum size of the page. This can be used in
-+    combination with the [`disableguestresize`](webview-tag.md#disableguestresize)
-+    attribute to manually resize the webview guest contents.
-+  * `max` [Size](structures/size.md) (optional) - Maximium size of the page. This can be used in
-+    combination with the [`disableguestresize`](webview-tag.md#disableguestresize)
-+    attribute to manually resize the webview guest contents.
-+
-+>>>>>>> .their
- #### `contents.isOffscreen()`
- 
- Returns `Boolean` - Indicates whether *offscreen rendering* is enabled.
-changed in both
-  base   100644 afdff5615421e52b8750ea1de20b63941cbefb1f docs/development/releasing.md
-  our    100644 85a5fa0a935201521155dc60de45986db5829613 docs/development/releasing.md
-  their  100644 d27fb5022515cb80a829a80369fb6cb192003522 docs/development/releasing.md
-@@ -8,16 +8,25 @@
- information.
- 
- There are a handful of `*_TOKEN` environment variables needed by the release
-+<<<<<<< .our
- scripts:
- 
- * `ELECTRON_GITHUB_TOKEN`:
- Create this by visiting https://github.com/settings/tokens/new?scopes=repo
-+=======
-+scripts. Once you've generated these per-user tokens, you may want to keep
-+them in a local file that you can `source` when starting a release.
-+* `ELECTRON_GITHUB_TOKEN`:
-+Create as described at https://github.com/settings/tokens/new,
-+giving the token repo access scope.
-+>>>>>>> .their
- * `APPVEYOR_TOKEN`:
- Create a token from https://windows-ci.electronjs.org/api-token
- If you don't have an account, ask a team member to add you.
- * `CIRCLE_TOKEN`:
- Create a token from "Personal API Tokens" at https://circleci.com/account/api
- * `VSTS_TOKEN`:
-+<<<<<<< .our
- Create a Personal Access Token at https://github.visualstudio.com/_usersSettings/tokens or https://github.visualstudio.com/_details/security/tokens
- with the scope of `Build (read and execute)`.
- * `ELECTRON_S3_BUCKET`:
-@@ -29,6 +38,10 @@
- of the project. This file is gitignored, and will be loaded into the 
- environment by the release scripts.
- 
-+=======
-+Create a Personal Access Token at https://github.visualstudio.com/_usersSettings/tokens
-+with the scope of `Build (read and execute)`.
-+>>>>>>> .their
- 
- ## Determine which branch to release from
- 
-@@ -212,10 +225,13 @@
- ```sh
- $ npm run release -- --validateRelease
- ```
-+<<<<<<< .our
- Note, if you need to run `--validateRelease` more than once to check the assets,
- run it as above the first time, then `node ./script/release.js --validateRelease`
- for subsequent calls so that you don't have to rebuild each time you want to
- check the assets.
-+=======
-+>>>>>>> .their
- 
- ## Publish the release
- 
-@@ -258,6 +274,7 @@
- electron
- $ npm run publish-to-npm
- ```
-+<<<<<<< .our
- 
- After publishing, you can check the `latest` release:
- ```sh
-@@ -273,6 +290,8 @@
- ```sh
- $ npm dist-tag add electron@2.0.0 latest
- ```
-+=======
-+>>>>>>> .their
- 
- [the releases page]: https://github.com/electron/electron/releases
- [this bump commit]: https://github.com/electron/electron/commit/78ec1b8f89b3886b856377a1756a51617bc33f5a
-@@ -303,7 +322,11 @@
- ```
- 
- Additionally you can pass a job name to the script to run an individual job, eg:
-+<<<<<<< .our
- ```sh
-+=======
-+````sh
-+>>>>>>> .their
- node script/ci-release-build.js --ci=AppVeyor --ghRelease --job=electron-x64 TARGET_BRANCH
- ```
- 
-removed in local
-  base   100644 7dfc6084f5c94bfb924438e7efa50260d38b9144 docs/tutorial/planned-breaking-changes.md
-  their  100644 00e01f4f8c3a85f0e535a00c11e22f3595bff4b9 docs/tutorial/planned-breaking-changes.md
-added in both
-  our    100644 bdb3b8678485feabfad2ce23309f5bcac6050f31 docs/tutorial/support.md
-  their  100644 306876fee9314fbca1779a6c41ff8c6381753bda docs/tutorial/support.md
-@@ -91,4 +91,8 @@
- * Fedora 21
- * Debian 8
- 
-+<<<<<<< .our
- [arm-breaking-change]: https://github.com/electron/electron/blob/master/docs/api/breaking-changes.md#duplicate-arm-assets
-+=======
-+[arm-breaking-change]: https://github.com/electron/electron/blob/master/docs/tutorial/planned-breaking-changes.md#duplicate-arm-assets
-+>>>>>>> .their
-changed in both
-  base   100644 53ad35c63321e74a5023197ef2e075584e0f268b electron.gyp
-  our    100644 944ddab2a3fd879044e31677e4bac2843fffbdee electron.gyp
-  their  100644 a367ca027fa553f0d56d0f2192e76acbd294ffcc electron.gyp
-@@ -4,7 +4,11 @@
-     'product_name%': 'Electron',
-     'company_name%': 'GitHub, Inc',
-     'company_abbr%': 'github',
-+<<<<<<< .our
-     'version%': '4.0.0-nightly.20180821',
-+=======
-+    'version%': '2.1.0-unsupported.20180809',
-+>>>>>>> .their
-     'js2c_input_dir': '<(SHARED_INTERMEDIATE_DIR)/js2c',
-   },
-   'includes': [
-changed in both
-  base   100644 ef3e8258584a5459b069e2006db44c0a8b66412d filenames.gypi
-  our    100644 f57860558f06b7e5d8a50f48cfc7e53044df0bc6 filenames.gypi
-  their  100644 acd43c97988952b9a2760b44d366bd87134a1d65 filenames.gypi
-@@ -292,6 +292,8 @@
-       'atom/browser/net/http_protocol_handler.h',
-       'atom/browser/net/js_asker.cc',
-       'atom/browser/net/js_asker.h',
-+      'atom/browser/net/resolve_proxy_helper.cc',
-+      'atom/browser/net/resolve_proxy_helper.h',
-       'atom/browser/net/url_request_about_job.cc',
-       'atom/browser/net/url_request_about_job.h',
-       'atom/browser/net/url_request_async_asar_job.cc',
-changed in both
-  base   100644 381a2a866372ebe06f374529c634af411c864ba0 lib/browser/api/app.js
-  our    100644 66f6ae651acf10fb19b8ec068fc5280850dd3d91 lib/browser/api/app.js
-  their  100644 1ea1daddca84dfeba57b7b7883ebb754b8508d2d lib/browser/api/app.js
-changed in both
-  base   100644 22565dcf9875b7f00acff192b10b05d27d6446a7 lib/browser/api/browser-window.js
-  our    100644 cb523496d65c7018c30054621cfdeb1281f9db6a lib/browser/api/browser-window.js
-  their  100644 c5faa0a2c131d633e7aea3a1850abab958d22a1d lib/browser/api/browser-window.js
-changed in both
-  base   100644 da5ff57a113f7a063d1409ff56003db4bd04e68a lib/browser/api/menu.js
-  our    100644 506e3525c10ce142cafe3fc1bf4de1c255e48503 lib/browser/api/menu.js
-  their  100644 a87e0cd0436da2899b6402a06d370e755c2aac47 lib/browser/api/menu.js
-@@ -47,7 +47,11 @@
-   this.delegate = delegate
- }
- 
-+<<<<<<< .our
- Menu.prototype.popup = function (options = {}) {
-+=======
-+Menu.prototype.popup = function (options) {
-+>>>>>>> .their
-   if (options == null || typeof options !== 'object') {
-     throw new TypeError('Options must be an object')
-   }
-@@ -156,7 +160,11 @@
- 
- Menu.buildFromTemplate = function (template) {
-   if (!Array.isArray(template)) {
-+<<<<<<< .our
-     throw new TypeError('Invalid template for Menu: Menu template must be an array')
-+=======
-+    throw new TypeError('Invalid template for Menu')
-+>>>>>>> .their
-   }
-   const menu = new Menu()
-   if (!areValidTemplateItems(template)) {
-merged
-  result 100644 bbbc1bbe1727dd30352c4836cea489145cd7ad7d lib/browser/api/screen.js
-  our    100644 8287bfa8bfdc6db322a05059fd5c8ba58e802db9 lib/browser/api/screen.js
-@@ -1,8 +1,17 @@
- const {EventEmitter} = require('events')
-+const {deprecate} = require('electron')
- const {screen, Screen} = process.atomBinding('screen')
- 
- // Screen is an EventEmitter.
- Object.setPrototypeOf(Screen.prototype, EventEmitter.prototype)
- EventEmitter.call(screen)
- 
-+const nativeFn = screen.getMenuBarHeight
-+screen.getMenuBarHeight = function () {
-+  if (!process.noDeprecations) {
-+    deprecate.warn('screen.getMenuBarHeight', 'screen.getPrimaryDisplay().workArea')
-+  }
-+  return nativeFn.call(this)
-+}
-+
- module.exports = screen
-changed in both
-  base   100644 0338b776f8938c1548ea9786385fe75db9db3403 lib/browser/guest-view-manager.js
-  our    100644 1e4029e39a981c85fb6ff18c5ccd52f81b3c56f2 lib/browser/guest-view-manager.js
-  their  100644 169a4ac1d175e9bbbf8a3d8a01612e079c9df635 lib/browser/guest-view-manager.js
-@@ -316,6 +316,17 @@
- 
- ipcMain.on('ELECTRON_GUEST_VIEW_MANAGER_CREATE_GUEST_SYNC', function (event, params) {
-   event.returnValue = createGuest(event.sender, params)
-+<<<<<<< .our
-+=======
-+})
-+
-+ipcMain.on('ELECTRON_GUEST_VIEW_MANAGER_ATTACH_GUEST', function (event, elementInstanceId, guestInstanceId, params) {
-+  attachGuest(event, elementInstanceId, guestInstanceId, params)
-+})
-+
-+ipcMain.on('ELECTRON_GUEST_VIEW_MANAGER_DESTROY_GUEST', function (event, guestInstanceId) {
-+  destroyGuest(event.sender, guestInstanceId)
-+>>>>>>> .their
- })
- 
- ipcMain.on('ELECTRON_GUEST_VIEW_MANAGER_ATTACH_GUEST', function (event, embedderFrameId, elementInstanceId, guestInstanceId, params) {
-changed in both
-  base   100644 50e890e225a315718d04a0028fb6bf2feb4092ce lib/browser/guest-window-manager.js
-  our    100644 7253c1942b0956ae6b9b0c80a23470fc26669b8a lib/browser/guest-window-manager.js
-  their  100644 339b543dd485d3d708aa98a2eec834ab4d65da2b lib/browser/guest-window-manager.js
-@@ -65,7 +65,11 @@
-   // Inherit certain option values from parent window
-   const webPreferences = embedder.getLastWebPreferences()
-   for (const [name, value] of inheritedWebPreferences) {
-+<<<<<<< .our
-     if (webPreferences[name] === value) {
-+=======
-+    if (embedder.getLastWebPreferences()[name] === value) {
-+>>>>>>> .their
-       options.webPreferences[name] = value
-     }
-   }
-changed in both
-  base   100644 24a86fdfee7b87cd8ad177363aec26b438fe79b7 lib/browser/init.js
-  our    100644 bed3d912ab8be3ca4f21de04e801bb42dc12a528 lib/browser/init.js
-  their  100644 344bcf16dceafc99dcc337a0d9113c8e764c6364 lib/browser/init.js
-changed in both
-  base   100644 bfb9091e6584c43a19bf6283a79027274053239b lib/browser/objects-registry.js
-  our    100644 f03a23d2f6910d6555bb9469180d1b60b94bc313 lib/browser/objects-registry.js
-  their  100644 c6afe2616153dfd82b190b02f1c4fce582727a76 lib/browser/objects-registry.js
-@@ -15,7 +15,11 @@
-     this.storage = {}
- 
-     // Stores the IDs of objects referenced by WebContents.
-+<<<<<<< .our
-     // (ownerKey) => [id]
-+=======
-+    // (webContentsContextId) => [id]
-+>>>>>>> .their
-     this.owners = {}
-   }
- 
-@@ -26,10 +30,17 @@
-     const id = this.saveToStorage(obj)
- 
-     // Add object to the set of referenced objects.
-+<<<<<<< .our
-     const ownerKey = getOwnerKey(webContents, contextId)
-     let owner = this.owners[ownerKey]
-     if (!owner) {
-       owner = this.owners[ownerKey] = new Set()
-+=======
-+    const webContentsContextId = `${webContents.id}-${contextId}`
-+    let owner = this.owners[webContentsContextId]
-+    if (!owner) {
-+      owner = this.owners[webContentsContextId] = new Set()
-+>>>>>>> .their
-       this.registerDeleteListener(webContents, contextId)
-     }
-     if (!owner.has(id)) {
-@@ -50,8 +61,13 @@
-   // Note that an object may be double-freed (cleared when page is reloaded, and
-   // then garbage collected in old page).
-   remove (webContents, contextId, id) {
-+<<<<<<< .our
-     const ownerKey = getOwnerKey(webContents, contextId)
-     let owner = this.owners[ownerKey]
-+=======
-+    const webContentsContextId = `${webContents.id}-${contextId}`
-+    let owner = this.owners[webContentsContextId]
-+>>>>>>> .their
-     if (owner) {
-       // Remove the reference in owner.
-       owner.delete(id)
-@@ -62,13 +78,22 @@
- 
-   // Clear all references to objects refrenced by the WebContents.
-   clear (webContents, contextId) {
-+<<<<<<< .our
-     const ownerKey = getOwnerKey(webContents, contextId)
-     let owner = this.owners[ownerKey]
-+=======
-+    const webContentsContextId = `${webContents.id}-${contextId}`
-+    let owner = this.owners[webContentsContextId]
-+>>>>>>> .their
-     if (!owner) return
- 
-     for (let id of owner) this.dereference(id)
- 
-+<<<<<<< .our
-     delete this.owners[ownerKey]
-+=======
-+    delete this.owners[webContentsContextId]
-+>>>>>>> .their
-   }
- 
-   // Private: Saves the object into storage and assigns an ID for it.
-@@ -101,7 +126,11 @@
-     }
-   }
- 
-+<<<<<<< .our
-   // Private: Clear the storage when renderer process is destroyed.
-+=======
-+  // Private: Clear the storage when renderer process is destoryed.
-+>>>>>>> .their
-   registerDeleteListener (webContents, contextId) {
-     const processId = webContents.getProcessId()
-     const listener = (event, deletedProcessId) => {
-changed in both
-  base   100644 c0cd09dea4273642aa780756985e9c90dbe164d3 lib/browser/rpc-server.js
-  our    100644 ff9f77321de3a4145946b67f3fe2a597f98e2510 lib/browser/rpc-server.js
-  their  100644 612ec274ca13cdb7167a41fbacb711c3cc6cb9c3 lib/browser/rpc-server.js
-@@ -84,7 +84,11 @@
- 
-   // Fill the meta object according to value's type.
-   if (meta.type === 'array') {
-+<<<<<<< .our
-     meta.members = value.map((el) => valueToMeta(sender, contextId, el, optimizeSimpleObject))
-+=======
-+    meta.members = value.map((el) => valueToMeta(sender, contextId, el))
-+>>>>>>> .their
-   } else if (meta.type === 'object' || meta.type === 'function') {
-     meta.name = value.constructor ? value.constructor.name : ''
- 
-@@ -210,9 +214,15 @@
-           return rendererFunctions.get(objectId)
-         }
- 
-+<<<<<<< .our
-         const processId = sender.getProcessId()
-         let callIntoRenderer = function (...args) {
-           if (!sender.isDestroyed() && processId === sender.getProcessId()) {
-+=======
-+        const webContentsId = sender.getId()
-+        let callIntoRenderer = function (...args) {
-+          if (!sender.isDestroyed() && webContentsId === sender.getId()) {
-+>>>>>>> .their
-             sender.send('ELECTRON_RENDERER_CALLBACK', contextId, meta.id, valueToMeta(sender, contextId, args))
-           } else {
-             removeRemoteListenersAndLogWarning(this, meta, callIntoRenderer)
-@@ -234,8 +244,14 @@
- // Call a function and send reply asynchronously if it's a an asynchronous
- // style function and the caller didn't pass a callback.
- const callFunction = function (event, contextId, func, caller, args) {
-+<<<<<<< .our
-   const funcMarkedAsync = v8Util.getHiddenValue(func, 'asynchronous')
-   const funcPassedCallback = typeof args[args.length - 1] === 'function'
-+=======
-+  let funcMarkedAsync, funcName, funcPassedCallback, ref, ret
-+  funcMarkedAsync = v8Util.getHiddenValue(func, 'asynchronous')
-+  funcPassedCallback = typeof args[args.length - 1] === 'function'
-+>>>>>>> .their
-   try {
-     if (funcMarkedAsync && !funcPassedCallback) {
-       args.push(function (ret) {
-@@ -243,7 +259,11 @@
-       })
-       func.apply(caller, args)
-     } else {
-+<<<<<<< .our
-       const ret = func.apply(caller, args)
-+=======
-+      ret = func.apply(caller, args)
-+>>>>>>> .their
-       event.returnValue = valueToMeta(event.sender, contextId, ret, true)
-     }
-   } catch (error) {
-@@ -302,7 +322,14 @@
-       throwRPCError(`Cannot call constructor on missing remote object ${id}`)
-     }
- 
-+<<<<<<< .our
-     event.returnValue = valueToMeta(event.sender, contextId, new constructor(...args))
-+=======
-+    // Call new with array of arguments.
-+    // http://stackoverflow.com/questions/1606797/use-of-apply-with-new-operator-is-this-possible
-+    let obj = new (Function.prototype.bind.apply(constructor, [null].concat(args)))()
-+    event.returnValue = valueToMeta(event.sender, contextId, obj)
-+>>>>>>> .their
-   } catch (error) {
-     event.returnValue = exceptionToMeta(event.sender, contextId, error)
-   }
-@@ -332,7 +359,14 @@
-       throwRPCError(`Cannot call constructor '${method}' on missing remote object ${id}`)
-     }
- 
-+<<<<<<< .our
-     event.returnValue = valueToMeta(event.sender, contextId, new object[method](...args))
-+=======
-+    // Call new with array of arguments.
-+    let constructor = object[method]
-+    let obj = new (Function.prototype.bind.apply(constructor, [null].concat(args)))()
-+    event.returnValue = valueToMeta(event.sender, contextId, obj)
-+>>>>>>> .their
-   } catch (error) {
-     event.returnValue = exceptionToMeta(event.sender, contextId, error)
-   }
-changed in both
-  base   100644 6dc774049def3acbd13b79dfd559c12d4eebd657 lib/common/api/crash-reporter.js
-  our    100644 1090d425e4c5cdf89a03d470718324ef16963472 lib/common/api/crash-reporter.js
-  their  100644 1b20fa52aab741e5dd34de7872f36798ec7c1c68 lib/common/api/crash-reporter.js
-changed in both
-  base   100644 1b9a993a2e67a00c073a9df9883c7adc3c2fcf65 lib/common/asar.js
-  our    100644 41c3d0c85c69954dddad53c674f84051f25372e4 lib/common/asar.js
-  their  100644 f47c6757d48c967db3ed00ab3474ea05ce034371 lib/common/asar.js
-changed in both
-  base   100644 a4f8072ed57642e1ca7d1066e132875da7ad3f46 lib/renderer/api/remote.js
-  our    100644 59117f8f2dd977fc1817a6b1d540b616ddcb0dae lib/renderer/api/remote.js
-  their  100644 4a38befb03cbdb560a3b34d8dd771d3d19c0bc3b lib/renderer/api/remote.js
-changed in both
-  base   100644 1cb69436dd479baf54b9805c04c0c31b20f24fad lib/renderer/init.js
-  our    100644 2470a5e8be80e770b0c03f6a439a71e72ae12a1b lib/renderer/init.js
-  their  100644 93129849ae048c1c09f943b56e78562f46be04e8 lib/renderer/init.js
-changed in both
-  base   100644 d2da884f1d9caf3d633de25837cb2128f564f2fb lib/renderer/security-warnings.js
-  our    100644 b24f9e28b879154457be0342b9d4b44c0e651253 lib/renderer/security-warnings.js
-  their  100644 4f7d6ef9e596cdc3a5c7e1f2b89b24b9cd67de1d lib/renderer/security-warnings.js
-changed in both
-  base   100644 110b0e453afd07210c9fba0f93d8755b5fbc1a93 lib/renderer/web-view/guest-view-internal.js
-  our    100644 6e42c769b70e5223fe97397f87144ec342882f8d lib/renderer/web-view/guest-view-internal.js
-  their  100644 f7c6232d41a52ff4c2af71350d4ae43c05a3b12a lib/renderer/web-view/guest-view-internal.js
-@@ -90,6 +90,16 @@
-   },
-   createGuestSync: function (params) {
-     return ipcRenderer.sendSync('ELECTRON_GUEST_VIEW_MANAGER_CREATE_GUEST_SYNC', params)
-+<<<<<<< .our
-+=======
-+  },
-+  attachGuest: function (elementInstanceId, guestInstanceId, params) {
-+    ipcRenderer.send('ELECTRON_GUEST_VIEW_MANAGER_ATTACH_GUEST', elementInstanceId, guestInstanceId, params)
-+    webFrame.attachGuest(elementInstanceId)
-+  },
-+  destroyGuest: function (guestInstanceId) {
-+    ipcRenderer.send('ELECTRON_GUEST_VIEW_MANAGER_DESTROY_GUEST', guestInstanceId)
-+>>>>>>> .their
-   },
-   attachGuest: function (elementInstanceId, guestInstanceId, params, contentWindow) {
-     const embedderFrameId = webFrame.getWebFrameId(contentWindow)
-changed in both
-  base   100644 16bfe7e61ac6e2c516f4523f2854a4f1db169c70 lib/renderer/web-view/web-view-attributes.js
-  our    100644 ad9970bd0b9355ac8163c82f6fa7f3ca08a05de6 lib/renderer/web-view/web-view-attributes.js
-  their  100644 204046bd60542657e9213f2b12e5c126ee10ea33 lib/renderer/web-view/web-view-attributes.js
-changed in both
-  base   100644 544652e44756fc63747a5cf58548b87363508b4a lib/renderer/web-view/web-view.js
-  our    100644 574a2b545597f9d1c05ec9b7147585063e90ae89 lib/renderer/web-view/web-view.js
-  their  100644 a703230fd4a461d3fb548663ef7b495a133377b6 lib/renderer/web-view/web-view.js
-@@ -144,7 +144,10 @@
-   }
- 
-   createGuestSync () {
-+<<<<<<< .our
-     this.beforeFirstNavigation = false
-+=======
-+>>>>>>> .their
-     this.attachGuestInstance(guestViewInternal.createGuestSync(this.buildParams()))
-   }
- 
-changed in both
-  base   100644 119391e79462bfa8bb1494039bcb3522d97acead lib/sandboxed_renderer/init.js
-  our    100644 30a3fa55216f6bf7588c3accc07b150a31163b7c lib/sandboxed_renderer/init.js
-  their  100644 b45a105091446f1b1c3afd2f4905ccf7c0ef67b5 lib/sandboxed_renderer/init.js
-@@ -35,10 +35,13 @@
-   ['url', require('url')]
- ])
- 
-+<<<<<<< .our
- const {
-   preloadSrc, preloadError, process: processProps
- } = electron.ipcRenderer.sendSync('ELECTRON_BROWSER_SANDBOX_LOAD')
- 
-+=======
-+>>>>>>> .their
- require('../renderer/web-frame-init')()
- 
- // Pass different process object to the preload script(which should not have
-@@ -78,6 +81,7 @@
-   require('../renderer/inspector')
- }
- 
-+<<<<<<< .our
- if (binding.guestInstanceId) {
-   process.guestInstanceId = parseInt(binding.guestInstanceId)
- }
-@@ -88,6 +92,8 @@
-   require('../renderer/web-view/web-view-attributes')
- }
- 
-+=======
-+>>>>>>> .their
- // Wrap the script into a function executed in global scope. It won't have
- // access to the current scope, so we'll expose a few objects as arguments:
- //
-@@ -107,6 +113,7 @@
- // and any `require('electron')` calls in `preload.js` will work as expected
- // since browserify won't try to include `electron` in the bundle, falling back
- // to the `preloadRequire` function above.
-+<<<<<<< .our
- if (preloadSrc) {
-   const preloadWrapperSrc = `(function(require, process, Buffer, global, setImmediate, clearImmediate) {
-   ${preloadSrc}
-@@ -118,4 +125,18 @@
-   preloadFn(preloadRequire, preloadProcess, Buffer, global, setImmediate, clearImmediate)
- } else if (preloadError) {
-   console.error(preloadError.stack)
-+=======
-+if (preloadPath) {
-+  const preloadSrc = fs.readFileSync(preloadPath).toString()
-+  const preloadWrapperSrc = `(function(require, process, Buffer, global, setImmediate) {
-+  ${preloadSrc}
-+  })`
-+
-+  // eval in window scope:
-+  // http://www.ecma-international.org/ecma-262/5.1/#sec-10.4.2
-+  const geval = eval
-+  const preloadFn = geval(preloadWrapperSrc)
-+  const {setImmediate} = require('timers')
-+  preloadFn(preloadRequire, preloadProcess, Buffer, global, setImmediate)
-+>>>>>>> .their
- }
-changed in both
-  base   100644 9d3b0da9c80b223e4a1188311a1121796eb9f7ae package.json
-  our    100644 c081cd89450cd50efba1ec280ff1349a96ea3ce0 package.json
-  their  100644 c276f9b9a0bb61257eeaaadd9757ee2ac5a8f8f5 package.json
-@@ -1,6 +1,10 @@
- {
-   "name": "electron",
-+<<<<<<< .our
-   "version": "4.0.0-nightly.20180821",
-+=======
-+  "version": "2.1.0-unsupported.20180809",
-+>>>>>>> .their
-   "repository": "https://github.com/electron/electron",
-   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
-   "devDependencies": {
-@@ -13,7 +17,11 @@
-     "dugite": "^1.45.0",
-     "electabul": "~0.0.4",
-     "electron-docs-linter": "^2.3.4",
-+<<<<<<< .our
-     "electron-typescript-definitions": "^1.3.6",
-+=======
-+    "electron-typescript-definitions": "1.3.2",
-+>>>>>>> .their
-     "github": "^9.2.0",
-     "html-entities": "^1.2.1",
-     "husky": "^0.14.3",
-@@ -25,8 +33,12 @@
-     "remark-cli": "^4.0.0",
-     "remark-preset-lint-markdown-style-guide": "^2.1.1",
-     "request": "^2.68.0",
-+<<<<<<< .our
-     "semver": "^5.5.0",
-     "serve": "^6.5.8",
-+=======
-+    "serve": "^6.5.3",
-+>>>>>>> .their
-     "standard": "^10.0.0",
-     "standard-markdown": "^4.0.0",
-     "sumchecker": "^2.0.2",
-changed in both
-  base   100755 4465b85c135ddb55a673c5180e15f05f09dac57e script/bootstrap.py
-  our    100755 e4aaf89e216b0164f15882a3040e8cac70bf1fd9 script/bootstrap.py
-  their  100755 c6ebe4ef6975efd1f6184159cc3d9d079bf3628d script/bootstrap.py
-changed in both
-  base   100755 c97cd8336f7d7980911d0bdea93137e7bc95ba24 script/build.py
-  our    100755 fb2b95d3bb71a25ce1ca58acf596afdc0f2cc5bd script/build.py
-  their  100755 2a2231394207c28fcd2b86d3d9f9b079b08d637e script/build.py
-@@ -40,6 +40,12 @@
-   if is_verbose_mode():
-     ninja.append('-v')
- 
-+<<<<<<< .our
-+=======
-+  args = parse_args()
-+  if args.ninja_path:
-+    ninja = args.ninja_path
-+>>>>>>> .their
-   if args.libcc:
-     if ('D' not in args.configuration
-         or not os.path.exists(GCLIENT_DONE)
-@@ -93,12 +99,15 @@
-   parser.add_argument('--ninja-path',
-                       help='Path of ninja command to use.',
-                       required=False)
-+<<<<<<< .our
-   parser.add_argument('--compdb',
-                       help=(
-                         'Generate JSON compilation database. This will not '
-                         'trigger actual build. '
-                       ),
-                       action='store_true', default=False)
-+=======
-+>>>>>>> .their
-   return parser.parse_args()
- 
- 
-changed in both
-  base   100755 28424aaa8ee614b0dfffc7468adb2266f05440cb script/bump-version.py
-  our    100755 564adb2116312b0f6d0351096bd89cb373cd3bab script/bump-version.py
-  their  100755 9e32709db12a5e831bf8d2a969a2885508a1b37f script/bump-version.py
-@@ -84,12 +84,41 @@
-     parser.print_help()
-     return 1
- 
-+<<<<<<< .our
-   versions = clean_parse_version(version)
-   suffix = ''
-   if '-' in version:
-     suffix = '-' + version.split('-')[1]
-     versions[3] = parse_version(version)[3]
-   version = version.split('-')[0]
-+=======
-+  increments = ['major', 'minor', 'patch', 'beta']
-+
-+  curr_version = get_electron_version()
-+  versions = parse_version(re.sub('-beta', '', curr_version))
-+
-+  if args.bump in increments:
-+    versions = increase_version(versions, increments.index(args.bump))
-+    if versions[3] == '0':
-+      # beta starts at 1
-+      versions = increase_version(versions, increments.index('beta'))
-+
-+  if args.stable == True:
-+    versions[3] = '0'
-+
-+  if args.new_version != None:
-+    clean_version = re.sub('-beta', '', args.new_version)
-+    clean_version = re.sub('-unsupported', '', clean_version)
-+    versions = parse_version(clean_version)
-+
-+  version = '.'.join(versions[:3])
-+  suffix = ''
-+
-+  if args.new_version != None and '-unsupported' in args.new_version:
-+    suffix = '-unsupported.' + versions[3]
-+  elif versions[3] != '0':
-+    suffix = '-beta.' + versions[3]
-+>>>>>>> .their
- 
-   if args.dry_run:
-     print 'new version number would be: {0}\n'.format(version + suffix)
-changed in both
-  base   100644 ec2459198bf254e7e380e4ae63097168041d0068 script/ci-release-build.js
-  our    100644 be9f9597387f5f8b7bfddc61c202f32ce4c6d478 script/ci-release-build.js
-  their  100644 1a15cd55b266363bea4394e970d274b2caa2d716 script/ci-release-build.js
-@@ -51,6 +51,10 @@
- }
- 
- async function circleCIcall (buildUrl, targetBranch, job, options) {
-+<<<<<<< .our
-+=======
-+  assert(process.env.CIRCLE_TOKEN, 'CIRCLE_TOKEN not found in environment')
-+>>>>>>> .their
-   console.log(`Triggering CircleCI to run build job: ${job} on branch: ${targetBranch} with release flag.`)
-   let buildRequest = {
-     'build_parameters': {
-@@ -80,6 +84,7 @@
-     console.log('Error calling CircleCI:', err)
-   })
-   console.log(`CircleCI release build request for ${job} successful.  Check ${circleResponse.build_url} for status.`)
-+<<<<<<< .our
- }
- 
- function buildAppVeyor (targetBranch, options) {
-@@ -92,6 +97,21 @@
-   }
- }
- 
-+=======
-+}
-+
-+function buildAppVeyor (targetBranch, options) {
-+  assert(process.env.APPVEYOR_TOKEN, 'APPVEYOR_TOKEN not found in environment')
-+  const validJobs = Object.keys(appVeyorJobs)
-+  if (options.job) {
-+    assert(validJobs.includes(options.job), `Unknown AppVeyor CI job name: ${options.job}.  Valid values are: ${validJobs}.`)
-+    callAppVeyor(targetBranch, options.job, options)
-+  } else {
-+    validJobs.forEach((job) => callAppVeyor(targetBranch, job, options))
-+  }
-+}
-+
-+>>>>>>> .their
- async function callAppVeyor (targetBranch, job, options) {
-   console.log(`Triggering AppVeyor to run build job: ${job} on branch: ${targetBranch} with release flag.`)
-   let environmentVariables = {}
-@@ -144,6 +164,10 @@
-     assert(vstsJobs.includes(options.job), `Unknown VSTS CI job name: ${options.job}. Valid values are: ${vstsJobs}.`)
-   }
-   console.log(`Triggering VSTS to run build on branch: ${targetBranch} with release flag.`)
-+<<<<<<< .our
-+=======
-+  assert(process.env.VSTS_TOKEN, 'VSTS_TOKEN not found in environment')
-+>>>>>>> .their
-   let environmentVariables = {}
- 
-   if (!options.ghRelease) {
-changed in both
-  base   100755 de3b9ffd48156379afd677b98c40c97532cb8367 script/create-dist.py
-  our    100755 4a6c0c7ce8f275175e48c4c380ff33627f7a5961 script/create-dist.py
-  their  100755 e8396a2e6d242b9deba3b6a7642060584cd1a605 script/create-dist.py
-@@ -147,7 +147,11 @@
- 
-   # Copy file and keep the executable bit.
-   shutil.copyfile(src, dest)
-+<<<<<<< .our
-   add_exec_bit(dest)
-+=======
-+  os.chmod(dest, os.stat(dest).st_mode | stat.S_IEXEC)
-+>>>>>>> .their
- 
- def copy_vcruntime_binaries():
-   arch = get_target_arch()
-@@ -302,7 +306,11 @@
-     dest = os.path.join(DIST_DIR, binary)
-     # Copy file and keep the executable bit.
-     shutil.copyfile(src, dest)
-+<<<<<<< .our
-     add_exec_bit(dest)
-+=======
-+    os.chmod(dest, os.stat(dest).st_mode | stat.S_IEXEC)
-+>>>>>>> .their
- 
-     dist_name = get_zip_name(binary, version)
-     zip_file = os.path.join(SOURCE_ROOT, 'dist', dist_name)
-added in both
-  our    100644 d8cfb2be8af17bc5536e521848c64b14b155015a script/find-release.js
-  their  100644 3cfd79aae1427c3b432076a869e6cf689d79871f script/find-release.js
-@@ -1,5 +1,8 @@
-+<<<<<<< .our
- if (!process.env.CI) require('dotenv-safe').load()
- 
-+=======
-+>>>>>>> .their
- const GitHub = require('github')
- const github = new GitHub()
- 
-@@ -14,7 +17,11 @@
-   github.authenticate({type: 'token', token: process.env.ELECTRON_GITHUB_TOKEN})
-   let releases = await github.repos.getReleases({
-     owner: 'electron',
-+<<<<<<< .our
-     repo: version.indexOf('nightly') > 0 ? 'nightlies' : 'electron'
-+=======
-+    repo: 'electron'
-+>>>>>>> .their
-   })
-   let targetRelease = releases.data.find(release => {
-     return release.tag_name === version
-changed in both
-  base   100644 76f39fc26973e01145f7758785778075ddbaa648 script/lib/dbus_mock.py
-  our    100644 9b9c8029cb75a9d84c632d04f234c2020542ca68 script/lib/dbus_mock.py
-  their  100644 00b1fd98d7837cfef60460f9d456a5cb8340761c script/lib/dbus_mock.py
-@@ -4,21 +4,29 @@
- import atexit
- import os
- import sys
-+<<<<<<< .our
-+=======
-+
-+>>>>>>> .their
- 
- 
- def stop():
-     DBusTestCase.stop_dbus(DBusTestCase.system_bus_pid)
-     DBusTestCase.stop_dbus(DBusTestCase.session_bus_pid)
-+<<<<<<< .our
- 
- def start():
-     dbusmock_log = sys.stdout if is_verbose_mode() else open(os.devnull, 'w')
- 
-     DBusTestCase.start_system_bus()
-     DBusTestCase.spawn_server_template('logind', None, dbusmock_log)
-+=======
-+>>>>>>> .their
- 
-     DBusTestCase.start_session_bus()
-     DBusTestCase.spawn_server_template('notification_daemon', None, dbusmock_log)
- 
-+<<<<<<< .our
- if __name__ == '__main__':
-     import subprocess
-     start()
-@@ -26,3 +34,14 @@
-         subprocess.check_call(sys.argv[1:])
-     finally:
-         stop()
-+=======
-+atexit.register(cleanup)
-+
-+dbusmock_log = sys.stdout if is_verbose_mode() else open(os.devnull, 'w')
-+
-+DBusTestCase.start_system_bus()
-+DBusTestCase.spawn_server_template('logind', None, dbusmock_log)
-+
-+DBusTestCase.start_session_bus()
-+DBusTestCase.spawn_server_template('notification_daemon', None, dbusmock_log)
-+>>>>>>> .their
-changed in both
-  base   100755 69882928765a56f50702a371af322710ef3ccf22 script/prepare-release.js
-  our    100755 72a28b719bf1ff7770692caef86c76746c4d8edf script/prepare-release.js
-  their  100755 c768c0ef0af4f4e5a518c940a8b70b3c2d568bf2 script/prepare-release.js
-@@ -5,6 +5,10 @@
- const args = require('minimist')(process.argv.slice(2), {
-   boolean: ['automaticRelease', 'notesOnly', 'stable']
- })
-+<<<<<<< .our
-+=======
-+const assert = require('assert')
-+>>>>>>> .their
- const ciReleaseBuild = require('./ci-release-build')
- const { execSync } = require('child_process')
- const fail = '\u2717'.red
-@@ -21,8 +25,13 @@
- // via conventional-recommended-bump
- 
- if (!versionType && !args.notesOnly) {
-+<<<<<<< .our
-   console.log(`Usage: prepare-release versionType [stable | beta | nightly]` +
-      ` (--stable) (--notesOnly) (--automaticRelease) (--branch)`)
-+=======
-+  console.log(`Usage: prepare-release versionType [major | minor | patch | beta | specificVersion]` +
-+     ` (--stable) (--notesOnly) (--automaticRelease) (--branch) (--version)`)
-+>>>>>>> .their
-   process.exit(1)
- }
- 
-@@ -35,7 +44,16 @@
-     console.log(`Bumping for new "${versionType}" version.`)
-   }
-   let bumpScript = path.join(__dirname, 'bump-version.py')
-+<<<<<<< .our
-   let scriptArgs = [bumpScript, '--bump', versionType]
-+=======
-+  let scriptArgs = [bumpScript]
-+  if (versionType === 'specificVersion' && args.version) {
-+    scriptArgs.push(`--version ${args.version}`)
-+  } else {
-+    scriptArgs.push(`--bump ${versionType}`)
-+  }
-+>>>>>>> .their
-   if (args.stable) {
-     scriptArgs.push('--stable')
-   }
-@@ -222,7 +240,11 @@
- }
- 
- async function verifyNewVersion () {
-+<<<<<<< .our
-   let newVersion = await getNewVersion(true)
-+=======
-+  let newVersion = getNewVersion(true)
-+>>>>>>> .their
-   let response
-   if (args.automaticRelease) {
-     response = 'y'
-@@ -258,6 +280,7 @@
- }
- 
- async function prepareRelease (isBeta, notesOnly) {
-+<<<<<<< .our
-   if (args.dryRun) {
-     let newVersion = await getNewVersion(true)
-     console.log(newVersion)
-@@ -278,6 +301,27 @@
-         process.exit(1)
-       }
-     }
-+=======
-+  if (args.automaticRelease && (pkg.version.indexOf('beta') === -1 ||
-+      versionType !== 'beta')) {
-+    console.log(`${fail} Automatic release is only supported for beta releases`)
-+    process.exit(1)
-+  }
-+  let currentBranch
-+  if (args.branch) {
-+    currentBranch = args.branch
-+  } else {
-+    currentBranch = await getCurrentBranch(gitDir)
-+  }
-+  if (notesOnly) {
-+    let releaseNotes = await getReleaseNotes(currentBranch)
-+    console.log(`Draft release notes are: \n${releaseNotes}`)
-+  } else {
-+    await verifyNewVersion()
-+    await createRelease(currentBranch, isBeta)
-+    await pushRelease(currentBranch)
-+    await runReleaseBuilds(currentBranch)
-+>>>>>>> .their
-   }
- }
- 
-changed in both
-  base   100644 eb0702ff5ef265b545824ba21ffb4c5d760d5476 script/publish-to-npm.js
-  our    100644 27290c513bb28d9bd394575d833f1e6786e3b479 script/publish-to-npm.js
-  their  100644 ec3f131913e3a8d7b2bbb3d383f5a318ec881a23 script/publish-to-npm.js
-@@ -1,3 +1,4 @@
-+const args = require('minimist')(process.argv.slice(2))
- const temp = require('temp')
- const fs = require('fs')
- const path = require('path')
-@@ -108,6 +109,7 @@
-     })
-   })
- })
-+<<<<<<< .our
- .then(async (release) => {
-   if (release.tag_name.indexOf('nightly') > 0) {
-     const currentBranch = await getCurrentBranch()
-@@ -116,6 +118,11 @@
-     } else {
-       npmTag = `nightly-${currentBranch}`
-     }
-+=======
-+.then((release) => {
-+  if (args.tag) {
-+    npmTag = args.tag
-+>>>>>>> .their
-   } else {
-     npmTag = release.prerelease ? 'beta' : 'latest'
-   }
-changed in both
-  base   100755 9863ef912cd5a940428e9ac22e1993494b2b1828 script/release.js
-  our    100755 84e00ad4f309201f151c3f8fcbaf9ee536c9b6cb script/release.js
-  their  100755 5858caf215a38e09d98c342bd74252b3dbd7ee71 script/release.js
-@@ -95,6 +95,10 @@
-     `electron-${version}-linux-armv7l.zip`,
-     `electron-${version}-linux-ia32-symbols.zip`,
-     `electron-${version}-linux-ia32.zip`,
-+<<<<<<< .our
-+=======
-+//    `electron-${version}-linux-mips64el.zip`,
-+>>>>>>> .their
-     `electron-${version}-linux-x64-symbols.zip`,
-     `electron-${version}-linux-x64.zip`,
-     `electron-${version}-mas-x64-dsym.zip`,
-@@ -112,6 +116,10 @@
-     `ffmpeg-${version}-linux-arm64.zip`,
-     `ffmpeg-${version}-linux-armv7l.zip`,
-     `ffmpeg-${version}-linux-ia32.zip`,
-+<<<<<<< .our
-+=======
-+//    `ffmpeg-${version}-linux-mips64el.zip`,
-+>>>>>>> .their
-     `ffmpeg-${version}-linux-x64.zip`,
-     `ffmpeg-${version}-mas-x64.zip`,
-     `ffmpeg-${version}-win32-ia32.zip`,
-@@ -180,7 +188,15 @@
- function uploadIndexJson () {
-   console.log('Uploading index.json to S3.')
-   let scriptPath = path.join(__dirname, 'upload-index-json.py')
-+<<<<<<< .our
-   runScript(scriptPath, [pkgVersion])
-+=======
-+  let scriptArgs = []
-+  if (args.automaticRelease) {
-+    scriptArgs.push('-R')
-+  }
-+  runScript(scriptPath, scriptArgs)
-+>>>>>>> .their
-   console.log(`${pass} Done uploading index.json to S3.`)
- }
- 
-changed in both
-  base   100755 1f90ed795fcc3e739061cf4ae5c8ab9ea95a1236 script/test.py
-  our    100755 46cada435e1bd6ecaa2111cdf29e5aeb834b227e script/test.py
-  their  100755 cb17102557dca975208140b479168906100cfd74 script/test.py
-changed in both
-  base   100755 a35eb2f5b90272c8369bcfd511f976a4f64fa57f script/update-clang.sh
-  our    100755 0c7ab60533381e33152b8735aaccf41d5f0d6676 script/update-clang.sh
-  their  100755 6e4cf08216616a4b6a2ee896bba47b1ba5d469b5 script/update-clang.sh
-changed in both
-  base   100755 f5e5b3c7a6adcaf7005ad9242c1664ad2f243d1f script/upload-index-json.py
-  our    100755 55d0675d0707d34c806847f3a64aa77f20a4830d script/upload-index-json.py
-  their  100755 479e46bb811695482f5ea62060e4bef02af505f1 script/upload-index-json.py
-@@ -8,7 +8,6 @@
- from lib.util import s3put, scoped_cwd, safe_mkdir
- 
- SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
--OUT_DIR     = os.path.join(SOURCE_ROOT, 'out', 'D')
- 
- BASE_URL = 'https://electron-metadumper.herokuapp.com/?version='
- 
-@@ -35,6 +34,7 @@
-     raise Exception("Please set META_DUMPER_AUTH_HEADER")
-   # Upload the index.json.
-   with scoped_cwd(SOURCE_ROOT):
-+<<<<<<< .our
-     safe_mkdir(OUT_DIR)
-     index_json = os.path.relpath(os.path.join(OUT_DIR, 'index.json'))
- 
-@@ -42,9 +42,27 @@
- 
-     with open(index_json, "w") as f:
-       f.write(new_content)
-+=======
-+    if len(sys.argv) == 2 and sys.argv[1] == '-R':
-+      config = 'R'
-+    else:
-+      config = 'D'
-+    out_dir = os.path.join(SOURCE_ROOT, 'out', config)
-+    if sys.platform == 'darwin':
-+      electron = os.path.join(out_dir, '{0}.app'.format(PRODUCT_NAME),
-+                                'Contents', 'MacOS', PRODUCT_NAME)
-+    elif sys.platform == 'win32':
-+      electron = os.path.join(out_dir, '{0}.exe'.format(PROJECT_NAME))
-+    else:
-+      electron = os.path.join(out_dir, PROJECT_NAME)
-+    index_json = os.path.relpath(os.path.join(out_dir, 'index.json'))
-+    execute([electron,
-+             os.path.join('tools', 'dump-version-info.js'),
-+             index_json])
-+>>>>>>> .their
- 
-     bucket, access_key, secret_key = s3_config()
--    s3put(bucket, access_key, secret_key, OUT_DIR, 'atom-shell/dist',
-+    s3put(bucket, access_key, secret_key, out_dir, 'atom-shell/dist',
-           [index_json])
- 
- 
-changed in both
-  base   100755 4da630433812b51ff0ebbdf89f68c71d90ab8046 script/upload.py
-  our    100755 2d9eaa201265971ca01acaea6e84a440e5db0532 script/upload.py
-  their  100755 48f8d650eae7a9d46b45a353d68e0e7bef33d219 script/upload.py
-@@ -37,7 +37,11 @@
-   args = parse_args()
-   if  args.upload_to_s3:
-     utcnow = datetime.datetime.utcnow()
-+<<<<<<< .our
-     args.upload_timestamp = utcnow.strftime('%Y%m%d')
-+=======
-+    args.upload_timestamp = utcnow.strftime('%Y-%m-%d_%H:%M:%S')
-+>>>>>>> .their
- 
-   if not dist_newer_than_head():
-     run_python_script('create-dist.py')
-@@ -79,6 +83,14 @@
-   upload_electron(release, os.path.join(DIST_DIR, chromedriver), args)
-   mksnapshot = get_zip_name('mksnapshot', ELECTRON_VERSION)
-   upload_electron(release, os.path.join(DIST_DIR, mksnapshot), args)
-+<<<<<<< .our
-+=======
-+
-+  if get_target_arch().startswith('arm'):
-+    # Upload the x64 binary for arm/arm64 mksnapshot
-+    mksnapshot = get_zip_name('mksnapshot', ELECTRON_VERSION, 'x64')
-+    upload_electron(release, os.path.join(DIST_DIR, mksnapshot), args)
-+>>>>>>> .their
- 
-   if get_target_arch().startswith('arm'):
-     # Upload the x64 binary for arm/arm64 mksnapshot
-@@ -170,6 +182,16 @@
-   # Upload the checksum file.
-   upload_sha256_checksum(args.version, file_path)
- 
-+<<<<<<< .our
-+=======
-+  # Upload ARM assets without the v7l suffix for backwards compatibility
-+  # TODO Remove for 2.0
-+  if 'armv7l' in filename:
-+    arm_filename = filename.replace('armv7l', 'arm')
-+    arm_file_path = os.path.join(os.path.dirname(file_path), arm_filename)
-+    shutil.copy2(file_path, arm_file_path)
-+    upload_electron(release, arm_file_path, args)
-+>>>>>>> .their
- 
- def upload_io_to_github(release, filename, filepath, version):
-   print 'Uploading %s to Github' % \
-changed in both
-  base   100644 0eda951b15d6fff609b6612589e222adb4f0720e spec/api-app-spec.js
-  our    100644 d224eda2989332c18d655cef05a8bacc2eb6d4b8 spec/api-app-spec.js
-  their  100644 5c2e0a0c7e6184e780b7ec031f9788f1f54eaca9 spec/api-app-spec.js
-@@ -9,7 +9,10 @@
- const {ipcRenderer, remote} = require('electron')
- const {closeWindow} = require('./window-helpers')
- 
-+<<<<<<< .our
- const {expect} = chai
-+=======
-+>>>>>>> .their
- const {app, BrowserWindow, Menu, ipcMain} = remote
- 
- const isCI = remote.getGlobal('isCi')
-@@ -186,11 +189,19 @@
- 
-       // Singleton will send us greeting data to let us know it's running.
-       // After that, ask it to exit gracefully and confirm that it does.
-+<<<<<<< .our
-       appProcess.stdout.on('data', data => appProcess.kill())
-       appProcess.on('exit', (code, sig) => {
-         const message = `code:\n${code}\nsig:\n${sig}`
-         expect(code).to.equal(0, message)
-         expect(sig).to.be.null(message)
-+=======
-+      appProcess.stdout.on('data', (data) => appProcess.kill())
-+      appProcess.on('exit', (code, sig) => {
-+        let message = ['code:', code, 'sig:', sig].join('\n')
-+        assert.equal(code, 0, message)
-+        assert.equal(sig, null, message)
-+>>>>>>> .their
-         done()
-       })
-     })
-@@ -948,4 +959,18 @@
-       return expect(app.whenReady()).to.be.eventually.fulfilled
-     })
-   })
-+
-+  describe('dock.setMenu', () => {
-+    before(function () {
-+      if (process.platform !== 'darwin') {
-+        this.skip()
-+      }
-+    })
-+
-+    it('keeps references to the menu', () => {
-+      app.dock.setMenu(new Menu())
-+      const v8Util = process.atomBinding('v8_util')
-+      v8Util.requestGarbageCollectionForTesting()
-+    })
-+  })
- })
-changed in both
-  base   100644 ab96021ebf4c4360fa581b5a695249456a9afeda spec/api-browser-view-spec.js
-  our    100644 968912a4abf3d759a1363e2420d2c21b7923dbd6 spec/api-browser-view-spec.js
-  their  100644 df239a8914527a2d62f652b878c97a7791f63a9d spec/api-browser-view-spec.js
-@@ -44,9 +44,15 @@
-   describe('BrowserView.isDestroyed()', () => {
-     it('returns correct value', () => {
-       view = new BrowserView()
-+<<<<<<< .our
-       expect(view.isDestroyed()).to.be.false()
-       view.destroy()
-       expect(view.isDestroyed()).to.be.true()
-+=======
-+      assert.ok(!view.isDestroyed())
-+      view.destroy()
-+      assert.ok(view.isDestroyed())
-+>>>>>>> .their
-     })
-   })
- 
-changed in both
-  base   100644 3033eb6a1f6cca3cf4874a54dd217ec62d2d82cd spec/api-browser-window-spec.js
-  our    100644 f4cba12ec19d224bc46fca898db42a99baf4972e spec/api-browser-window-spec.js
-  their  100644 4b93a6bb3f3624594c8bd42835735dd2625fc6b7 spec/api-browser-window-spec.js
-@@ -409,12 +409,34 @@
-     })
-   })
- 
-+<<<<<<< .our
-   // TODO(alexeykuzmin): [Ch66] Enable the test. Passes locally.
-   xdescribe('BrowserWindow.getFocusedWindow()', (done) => {
-+=======
-+  describe('BrowserWindow.getFocusedWindow()', (done) => {
-+>>>>>>> .their
-     it('returns the opener window when dev tools window is focused', (done) => {
-       w.show()
-       w.webContents.once('devtools-focused', () => {
-         assert.deepEqual(BrowserWindow.getFocusedWindow(), w)
-+<<<<<<< .our
-+=======
-+        done()
-+      })
-+      w.webContents.openDevTools({mode: 'undocked'})
-+    })
-+  })
-+
-+  describe('BrowserWindow.capturePage(rect, callback)', () => {
-+    it('calls the callback with a Buffer', (done) => {
-+      w.capturePage({
-+        x: 0,
-+        y: 0,
-+        width: 100,
-+        height: 100
-+      }, (image) => {
-+        assert.equal(image.isEmpty(), true)
-+>>>>>>> .their
-         done()
-       })
-       w.webContents.openDevTools({mode: 'undocked'})
-@@ -453,6 +475,29 @@
-       // Values can be 0,2,3,4, or 6. We want 6, which is RGB + Alpha
-       expect(imgBuffer[25]).to.equal(6)
-     })
-+
-+    it('preserves transparency', (done) => {
-+      w.close()
-+      const width = 400
-+      const height = 400
-+      w = new BrowserWindow({
-+        show: false,
-+        width: width,
-+        height: height,
-+        transparent: true
-+      })
-+      w.loadURL('data:text/html,<html><body background-color: rgba(255,255,255,0)></body></html>')
-+      w.once('ready-to-show', () => {
-+        w.show()
-+        w.capturePage((image) => {
-+          let imgBuffer = image.toPNG()
-+          // Check 25th byte in the PNG
-+          // Values can be 0,2,3,4, or 6. We want 6, which is RGB + Alpha
-+          assert.equal(imgBuffer[25], 6)
-+          done()
-+        })
-+      })
-+    })
-   })
- 
-   describe('BrowserWindow.setSize(width, height)', () => {
-@@ -763,6 +808,7 @@
-         w.addTabbedWindow(w)
-       }, /AddTabbedWindow cannot be called by a window on itself./)
-     })
-+<<<<<<< .our
-   })
- 
-   describe('BrowserWindow.setWindowButtonVisibility()', () => {
-@@ -790,6 +836,8 @@
-         w.setWindowButtonVisibility(true)
-       }, /Not supported for this window/)
-     })
-+=======
-+>>>>>>> .their
-   })
- 
-   describe('BrowserWindow.setVibrancy(type)', () => {
-changed in both
-  base   100644 b4d55cd70b70b42d52a026ff7b4ff3c47d1671df spec/api-crash-reporter-spec.js
-  our    100644 dd31b91e1244785412b87db96bb141599e5ccb0f spec/api-crash-reporter-spec.js
-  their  100644 ffa3c0370595f32b0c7d476b82bea133d6a87000 spec/api-crash-reporter-spec.js
-@@ -266,6 +266,7 @@
-   describe('getLastCrashReport', () => {
-     it('correctly returns the most recent report', () => {
-       const reports = crashReporter.getUploadedReports()
-+<<<<<<< .our
-       expect(reports).to.be.an('array')
-       expect(reports).to.have.lengthOf.at.least(2,
-           'There are not enough reports for this test')
-@@ -275,16 +276,31 @@
- 
-       // Let's find the newest report.
-       const {report: newestReport} = reports.reduce((acc, cur) => {
-+=======
-+      const lastReport = crashReporter.getLastCrashReport()
-+
-+      // Let's find the newest report
-+      const newestReport = reports.reduce((acc, cur) => {
-+>>>>>>> .their
-         const timestamp = new Date(cur.date).getTime()
-         return (timestamp > acc.timestamp)
-           ? { report: cur, timestamp: timestamp }
-           : acc
-+<<<<<<< .our
-       }, { timestamp: -Infinity })
-       assert(newestReport, 'Hey!')
- 
-       expect(lastReport.date.getTime()).to.be.equal(
-           newestReport.date.getTime(),
-           'Last report is not the newest.')
-+=======
-+      }, { timestamp: 0 })
-+
-+      assert(reports.length > 1, 'has more than 1 report')
-+      assert(lastReport != null, 'found a last report')
-+      assert(lastReport.date.toString() === newestReport.report.date.toString(),
-+        'last report is correct')
-+>>>>>>> .their
-     })
-   })
- 
-changed in both
-  base   100644 de623162e59d2c8fdd9ade3dbabe73f3500efc49 spec/api-desktop-capturer-spec.js
-  our    100644 339d9756e40f8a532322800349b36d4371a2c9b0 spec/api-desktop-capturer-spec.js
-  their  100644 c85220bce65785fc2face8a1d2934c9d9c204c79 spec/api-desktop-capturer-spec.js
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- const chai = require('chai')
- const dirtyChai = require('dirty-chai')
- const {desktopCapturer, remote, screen} = require('electron')
-@@ -5,6 +6,10 @@
- 
- const {expect} = chai
- chai.use(dirtyChai)
-+=======
-+const assert = require('assert')
-+const {desktopCapturer, remote, screen} = require('electron')
-+>>>>>>> .their
- 
- const isCI = remote.getGlobal('isCi')
- 
-@@ -51,7 +56,11 @@
-     desktopCapturer.getSources({types: ['window', 'screen']}, callback)
-   })
- 
-+<<<<<<< .our
-   it('responds to subsequent calls of different options', done => {
-+=======
-+  it('responds to subsequent calls of different options', (done) => {
-+>>>>>>> .their
-     let callCount = 0
-     const callback = (error, sources) => {
-       callCount++
-@@ -63,11 +72,16 @@
-     desktopCapturer.getSources({types: ['screen']}, callback)
-   })
- 
-+<<<<<<< .our
-   it('returns an empty display_id for window sources on Windows and Mac', done => {
-+=======
-+  it('returns an empty display_id for window sources on Windows and Mac', (done) => {
-+>>>>>>> .their
-     // Linux doesn't return any window sources.
-     if (process.platform !== 'win32' && process.platform !== 'darwin') {
-       return done()
-     }
-+<<<<<<< .our
- 
-     const { BrowserWindow } = remote
-     const w = new BrowserWindow({ width: 200, height: 200 })
-@@ -79,10 +93,17 @@
-       for (const {display_id: displayId} of sources) {
-         expect(displayId).to.be.a('string').and.be.empty()
-       }
-+=======
-+    desktopCapturer.getSources({types: ['window']}, (error, sources) => {
-+      assert.equal(error, null)
-+      assert.notEqual(sources.length, 0)
-+      sources.forEach((source) => { assert.equal(source.display_id.length, 0) })
-+>>>>>>> .their
-       done()
-     })
-   })
- 
-+<<<<<<< .our
-   it('returns display_ids matching the Screen API on Windows and Mac', done => {
-     if (process.platform !== 'win32' && process.platform !== 'darwin') {
-       return done()
-@@ -95,6 +116,19 @@
- 
-       for (let i = 0; i < sources.length; i++) {
-         expect(sources[i].display_id).to.equal(displays[i].id.toString())
-+=======
-+  it('returns display_ids matching the Screen API on Windows and Mac', (done) => {
-+    if (process.platform !== 'win32' && process.platform !== 'darwin') {
-+      return done()
-+    }
-+    const displays = screen.getAllDisplays()
-+    desktopCapturer.getSources({types: ['screen']}, (error, sources) => {
-+      assert.equal(error, null)
-+      assert.notEqual(sources.length, 0)
-+      assert.equal(sources.length, displays.length)
-+      for (let i = 0; i < sources.length; i++) {
-+        assert.equal(sources[i].display_id, displays[i].id)
-+>>>>>>> .their
-       }
-       done()
-     })
-changed in both
-  base   100644 667f098bc4b9974a142435e7d3ddb762ac0f54a2 spec/api-menu-spec.js
-  our    100644 ed2749700c6c8bf299f507d52606c1ae3f597e5c spec/api-menu-spec.js
-  their  100644 3efb6ed8745843bb7e221fe25b3c75761a085759 spec/api-menu-spec.js
-@@ -649,6 +649,7 @@
-     })
- 
-     it('throws an error if options is not an object', () => {
-+<<<<<<< .our
-       expect(() => {
-         menu.popup('this is a string, not an object')
-       }).to.throw(/Options must be an object/)
-@@ -658,6 +659,11 @@
-       expect(() => {
-         menu.popup({})
-       }).to.not.throw()
-+=======
-+      assert.throws(() => {
-+        menu.popup()
-+      }, /Options must be an object/)
-+>>>>>>> .their
-     })
- 
-     it('should emit menu-will-show event', (done) => {
-added in both
-  our    100644 9ab56d88e50ae5891364cb271362e5ec0c0edd26 spec/api-notification-dbus-spec.js
-  their  100644 81c1b68f31d0c9490742d3bd4b4227abaaf72ca3 spec/api-notification-dbus-spec.js
-@@ -6,7 +6,11 @@
- //
- // See https://pypi.python.org/pypi/python-dbusmock to read about dbusmock.
- 
-+<<<<<<< .our
- const {expect} = require('chai')
-+=======
-+const assert = require('assert')
-+>>>>>>> .their
- const dbus = require('dbus-native')
- const Promise = require('bluebird')
- 
-@@ -27,12 +31,20 @@
-   before(async () => {
-     // init app
-     app.setName(appName)
-+<<<<<<< .our
-     app.setDesktopName(`${appName}.desktop`)
-+=======
-+    app.setDesktopName(appName + '.desktop')
-+>>>>>>> .their
-     // init dbus
-     const path = '/org/freedesktop/Notifications'
-     const iface = 'org.freedesktop.DBus.Mock'
-     const bus = dbus.sessionBus()
-+<<<<<<< .our
-     console.log(`session bus: ${process.env.DBUS_SESSION_BUS_ADDRESS}`)
-+=======
-+    console.log('session bus: ' + process.env.DBUS_SESSION_BUS_ADDRESS)
-+>>>>>>> .their
-     const service = bus.getService(serviceName)
-     const getInterface = Promise.promisify(service.getInterface, {context: service})
-     mock = await getInterface(path, iface)
-@@ -48,10 +60,17 @@
-     app.setVersion(realAppVersion)
-   })
- 
-+<<<<<<< .our
-   describe(`Notification module using ${serviceName}`, () => {
-     function onMethodCalled (done) {
-       function cb (name) {
-         console.log(`onMethodCalled: ${name}`)
-+=======
-+  describe('Notification module using ' + serviceName, () => {
-+    function onMethodCalled (done) {
-+      function cb (name) {
-+        console.log('onMethodCalled: ' + name)
-+>>>>>>> .their
-         if (name === 'Notify') {
-           mock.removeListener('MethodCalled', cb)
-           console.log('done')
-@@ -83,7 +102,11 @@
-       }
-     }
- 
-+<<<<<<< .our
-     before(done => {
-+=======
-+    before((done) => {
-+>>>>>>> .their
-       mock.on('MethodCalled', onMethodCalled(done))
-       // lazy load Notification after we listen to MethodCalled mock signal
-       Notification = require('electron').remote.Notification
-@@ -98,6 +121,7 @@
-       n.show()
-     })
- 
-+<<<<<<< .our
-     it(`should call ${serviceName} to show notifications`, async () => {
-       const calls = await getCalls()
-       expect(calls).to.be.an('array').of.lengthOf.at.least(1)
-@@ -108,6 +132,16 @@
- 
-       let args = unmarshalDBusNotifyArgs(lastCall[2])
-       expect(args).to.deep.equal({
-+=======
-+    it('should call ' + serviceName + ' to show notifications', async () => {
-+      const calls = await getCalls()
-+      assert(calls.length >= 1)
-+      let lastCall = calls[calls.length - 1]
-+      let methodName = lastCall[1]
-+      assert.equal(methodName, 'Notify')
-+      let args = unmarshalDBusNotifyArgs(lastCall[2])
-+      assert.deepEqual(args, {
-+>>>>>>> .their
-         app_name: appName,
-         replaces_id: 0,
-         app_icon: '',
-changed in both
-  base   100644 122170292838e951ade4989669c87a7531e89ba7 spec/api-web-contents-spec.js
-  our    100644 be02cb3f84001a541d64b11fe6eda50fc32e8afd spec/api-web-contents-spec.js
-  their  100644 cbb45f5d84f1b11c8c27c56515d5daffa23d0c04 spec/api-web-contents-spec.js
-@@ -122,6 +122,7 @@
-     })
-   })
- 
-+<<<<<<< .our
-   // Disabled because flaky. See #13969
-   xdescribe('isCurrentlyAudible() API', () => {
-     it('returns whether audio is playing', async () => {
-@@ -138,6 +139,8 @@
-     })
-   })
- 
-+=======
-+>>>>>>> .their
-   describe('getWebPreferences() API', () => {
-     it('should not crash when called for devTools webContents', (done) => {
-       w.webContents.openDevTools()
-@@ -730,6 +733,7 @@
-     })
-   })
- 
-+<<<<<<< .our
-   describe('referrer', () => {
-     it('propagates referrer information to new target=_blank windows', (done) => {
-       const server = http.createServer((req, res) => {
-@@ -776,6 +780,8 @@
-     })
-   })
- 
-+=======
-+>>>>>>> .their
-   describe('webframe messages in sandboxed contents', () => {
-     it('responds to executeJavaScript', (done) => {
-       w.destroy()
-changed in both
-  base   100644 f87554f32e267b46fe3501405617a289b6cccedb spec/asar-spec.js
-  our    100644 489f68c96d41e80c308560a98486a07756a03be7 spec/asar-spec.js
-  their  100644 a82e73071e13d2289087d346a00ef62eacd71f6e spec/asar-spec.js
-@@ -900,6 +900,18 @@
-       })
-     })
- 
-+    describe('util.promisify', function () {
-+      it('can promisify all fs functions', function () {
-+        const originalFs = require('original-fs')
-+
-+        for (const key in originalFs) {
-+          if (originalFs[key][util.promisify.custom] && !fs[key][util.promisify.custom]) {
-+            assert(false, `fs.${key}[util.promisify.custom] missing`)
-+          }
-+        }
-+      })
-+    })
-+
-     describe('process.noAsar', function () {
-       var errorName = process.platform === 'win32' ? 'ENOENT' : 'ENOTDIR'
- 
-changed in both
-  base   100644 2d388ca3b5744ea69d96ef71da6ade70e3dd001b spec/chromium-spec.js
-  our    100644 d90269769d269e4054d25cba4b6c4ac8a1929aa6 spec/chromium-spec.js
-  their  100644 25bef2e689e5ecbcd1485a042e84691db9400659 spec/chromium-spec.js
-@@ -319,8 +319,12 @@
-       b = window.open(windowUrl, '', 'nodeIntegration=no,show=no')
-     })
- 
-+<<<<<<< .our
-     // TODO(codebytere): re-enable this test
-     xit('disables node integration when it is disabled on the parent window for chrome devtools URLs', (done) => {
-+=======
-+    it('disables node integration when it is disabled on the parent window for chrome devtools URLs', (done) => {
-+>>>>>>> .their
-       let b
-       app.once('web-contents-created', (event, contents) => {
-         contents.once('did-finish-load', () => {
-changed in both
-  base   100644 07176e0097efa17e8f8aea5bb059a2739b8c3336 spec/fixtures/api/singleton/main.js
-  our    100644 3202a7a180d6d48c70706d5ef244652872b24bbc spec/fixtures/api/singleton/main.js
-  their  100644 cbf3da1117d91eb8df1b1e6363737a210b7eae78 spec/fixtures/api/singleton/main.js
-@@ -3,8 +3,11 @@
- app.once('ready', () => {
-   console.log('started')  // ping parent
- })
-+<<<<<<< .our
- 
- const gotTheLock = app.requestSingleInstanceLock()
-+=======
-+>>>>>>> .their
- 
- app.on('second-instance', () => {
-   setImmediate(() => app.exit(0))
-changed in both
-  base   100644 cfe840ca0a44c5766509b2865034d98e375da1a1 spec/modules-spec.js
-  our    100644 b996b8f4839bff2160bffb69e55263b16a4178d7 spec/modules-spec.js
-  their  100644 28f2602acff67b2da9accd0574d64d386e0795a7 spec/modules-spec.js
-changed in both
-  base   100644 e2d7d001eb49a9b01edcf9590ccdcb7ac8cc669c spec/node-spec.js
-  our    100644 9bb03494a56ffacec075c40bebde39a3b57ac734 spec/node-spec.js
-  their  100644 2c849bc3a442f8d1f800efce17cde212fc676531 spec/node-spec.js
-changed in both
-  base   100644 feac23db7e06d3e49f8d5be7e9b3f08a204f262f spec/security-warnings-spec.js
-  our    100644 6315a9420e01b5db19596f0dd5731d47ce02acf6 spec/security-warnings-spec.js
-  their  100644 85fd0973b60cd6e27becbeef75415560b4061d24 spec/security-warnings-spec.js
-@@ -142,7 +142,11 @@
-       }
-     })
-     w.webContents.once('console-message', (e, level, message) => {
-+<<<<<<< .our
-       assert(message.includes('enableBlinkFeatures'), message)
-+=======
-+      assert(message.includes('blinkFeatures'), message)
-+>>>>>>> .their
-       done()
-     })
- 
-changed in both
-  base   100644 ca5cc28d4f9f860947454dfc964208dd13ba1434 spec/static/index.html
-  our    100644 fc1e153c0af2908cf7ee4c3ea4f05522de04f0f8 spec/static/index.html
-  their  100644 e9d779f061cd5bdf00667d0b7942c6c30de81092 spec/static/index.html
-@@ -51,7 +51,11 @@
-   if (!process.env.MOCHA_REPORTER) {
-     mocha.ui('bdd').reporter(isCi ? 'tap' : 'html')
-   }
--  mocha.timeout(isCi ? 30000 : 10000)
-+  if (process.env.MOCHA_TIMEOUT && process.env.MOCHA_TIMEOUT > 0) {
-+    mocha.timeout(process.env.MOCHA_TIMEOUT)
-+  } else {
-+    mocha.timeout(isCi ? 30000 : 10000)
-+  }
- 
-   const query = Mocha.utils.parseQuery(window.location.search || '')
-   if (query.grep) mocha.grep(query.grep)
-changed in both
-  base   100644 7050f3a7e43070e9c1ae924d1cd314ad8214e2d3 spec/static/main.js
-  our    100644 5659c44c8de4456a25e0026e29199b827c89cb08 spec/static/main.js
-  their  100644 6dc8a4550ebab1e0c5b562ab776d9f1a2a2d13d7 spec/static/main.js
-changed in both
-  base   100644 73df333dd2b24e1b32931498ebe41557c3d24d0e spec/webview-spec.js
-  our    100644 db75a4e3754e24a5e6740be61be4f4098c58006e spec/webview-spec.js
-  their  100644 dfb3965a5a56a99a8299eb2ae9016822421245a4 spec/webview-spec.js
-@@ -696,6 +696,7 @@
-   xdescribe('setDevToolsWebContents() API', () => {
-     it('sets webContents of webview as devtools', async () => {
-       const webview2 = new WebView()
-+<<<<<<< .our
-       loadWebView(webview2)
- 
-       // Setup an event handler for further usage.
-@@ -720,6 +721,24 @@
-       document.body.removeChild(webview2)
- 
-       expect(name).to.be.equal('InspectorFrontendHostImpl')
-+=======
-+      document.body.appendChild(webview2)
-+      webview2.addEventListener('dom-ready', () => {
-+        const devtools = webview2.getWebContents()
-+        assert.ok(devtools.getURL().startsWith('chrome-devtools://devtools'))
-+        devtools.executeJavaScript('InspectorFrontendHost.constructor.name', (name) => {
-+          assert.ok(name, 'InspectorFrontendHostImpl')
-+          document.body.removeChild(webview2)
-+          done()
-+        })
-+      })
-+      webview.addEventListener('dom-ready', () => {
-+        webview.getWebContents().setDevToolsWebContents(webview2.getWebContents())
-+        webview.getWebContents().openDevTools()
-+      })
-+      webview.src = 'about:blank'
-+      document.body.appendChild(webview)
-+>>>>>>> .their
-     })
-   })
- 
-@@ -1182,6 +1201,7 @@
- 
-   describe('will-attach-webview event', () => {
-     it('does not emit when src is not changed', (done) => {
-+<<<<<<< .our
-       loadWebView(webview)
-       setTimeout(() => {
-         const expectedErrorMessage =
-@@ -1189,6 +1209,21 @@
-             'The WebView must be attached to the DOM ' +
-             'and the dom-ready event emitted before this method can be called.'
-         expect(() => { webview.stop() }).to.throw(expectedErrorMessage)
-+=======
-+      document.body.appendChild(webview)
-+      setTimeout(() => {
-+        assert.throws(() => {
-+          webview.stop()
-+        }, 'Cannot call stop because the webContents is unavailable. The WebView must be attached to the DOM and the dom-ready event emitted before this method can be called.')
-+        done()
-+      })
-+    })
-+
-+    it('supports changing the web preferences', (done) => {
-+      ipcRenderer.send('disable-node-on-next-will-attach-webview')
-+      webview.addEventListener('console-message', (event) => {
-+        assert.equal(event.message, 'undefined undefined undefined undefined')
-+>>>>>>> .their
-         done()
-       })
-     })
-@@ -1251,9 +1286,260 @@
- 
-     w.loadURL(`file://${fixtures}/pages/webview-devtools.html`)
- 
-+<<<<<<< .our
-     const [, {runtimeId, tabId}] = await emittedOnce(ipcMain, 'answer')
-     expect(runtimeId).to.equal('foo')
-     expect(tabId).to.be.not.equal(w.webContents.id)
-+=======
-+    ipcMain.once('answer', (event, message) => {
-+      assert.equal(message.runtimeId, 'foo')
-+      assert.notEqual(message.tabId, w.webContents.id)
-+      done()
-+    })
-+  })
-+
-+  describe('guestinstance attribute', () => {
-+    it('before loading there is no attribute', () => {
-+      document.body.appendChild(webview)
-+      assert(!webview.hasAttribute('guestinstance'))
-+    })
-+
-+    it('loading a page sets the guest view', (done) => {
-+      const loadListener = () => {
-+        webview.removeEventListener('did-finish-load', loadListener, false)
-+        const instance = webview.getAttribute('guestinstance')
-+        assert.equal(instance, parseInt(instance))
-+
-+        const guest = getGuestWebContents(parseInt(instance))
-+        assert.equal(guest, webview.getWebContents())
-+        done()
-+      }
-+      webview.addEventListener('did-finish-load', loadListener, false)
-+      webview.src = `file://${fixtures}/api/blank.html`
-+      document.body.appendChild(webview)
-+    })
-+
-+    it('deleting the attribute destroys the webview', (done) => {
-+      const loadListener = () => {
-+        webview.removeEventListener('did-finish-load', loadListener, false)
-+        const destroyListener = () => {
-+          webview.removeEventListener('destroyed', destroyListener, false)
-+          assert.equal(getGuestWebContents(instance), null)
-+          done()
-+        }
-+        webview.addEventListener('destroyed', destroyListener, false)
-+
-+        const instance = parseInt(webview.getAttribute('guestinstance'))
-+        webview.removeAttribute('guestinstance')
-+      }
-+      webview.addEventListener('did-finish-load', loadListener, false)
-+      webview.src = `file://${fixtures}/api/blank.html`
-+      document.body.appendChild(webview)
-+    })
-+
-+    it('setting the attribute on a new webview moves the contents', (done) => {
-+      const loadListener = () => {
-+        webview.removeEventListener('did-finish-load', loadListener, false)
-+        const webContents = webview.getWebContents()
-+        const instance = webview.getAttribute('guestinstance')
-+
-+        const destroyListener = () => {
-+          webview.removeEventListener('destroyed', destroyListener, false)
-+          assert.equal(webContents, webview2.getWebContents())
-+          // Make sure that events are hooked up to the right webview now
-+          webview2.addEventListener('console-message', (e) => {
-+            assert.equal(e.message, 'a')
-+            document.body.removeChild(webview2)
-+            done()
-+          })
-+
-+          webview2.src = `file://${fixtures}/pages/a.html`
-+        }
-+        webview.addEventListener('destroyed', destroyListener, false)
-+
-+        const webview2 = new WebView()
-+        webview2.setAttribute('guestinstance', instance)
-+        document.body.appendChild(webview2)
-+      }
-+      webview.addEventListener('did-finish-load', loadListener, false)
-+      webview.src = `file://${fixtures}/api/blank.html`
-+      document.body.appendChild(webview)
-+    })
-+
-+    it('setting the attribute to an invalid guestinstance does nothing', (done) => {
-+      const loadListener = () => {
-+        webview.removeEventListener('did-finish-load', loadListener, false)
-+        webview.setAttribute('guestinstance', 55)
-+
-+        // Make sure that events are still hooked up to the webview
-+        webview.addEventListener('console-message', (e) => {
-+          assert.equal(e.message, 'a')
-+          done()
-+        })
-+        webview.src = `file://${fixtures}/pages/a.html`
-+      }
-+      webview.addEventListener('did-finish-load', loadListener, false)
-+
-+      webview.src = `file://${fixtures}/api/blank.html`
-+      document.body.appendChild(webview)
-+    })
-+
-+    it('setting the attribute on an existing webview moves the contents', (done) => {
-+      const load1Listener = () => {
-+        webview.removeEventListener('did-finish-load', load1Listener, false)
-+        const webContents = webview.getWebContents()
-+        const instance = webview.getAttribute('guestinstance')
-+        let destroyedInstance
-+
-+        const destroyListener = () => {
-+          webview.removeEventListener('destroyed', destroyListener, false)
-+          assert.equal(webContents, webview2.getWebContents())
-+          assert.equal(null, getGuestWebContents(parseInt(destroyedInstance)))
-+
-+          // Make sure that events are hooked up to the right webview now
-+          webview2.addEventListener('console-message', (e) => {
-+            assert.equal(e.message, 'a')
-+            document.body.removeChild(webview2)
-+            done()
-+          })
-+
-+          webview2.src = 'file://' + fixtures + '/pages/a.html'
-+        }
-+        webview.addEventListener('destroyed', destroyListener, false)
-+
-+        const webview2 = new WebView()
-+        const load2Listener = () => {
-+          webview2.removeEventListener('did-finish-load', load2Listener, false)
-+          destroyedInstance = webview2.getAttribute('guestinstance')
-+          assert.notEqual(instance, destroyedInstance)
-+
-+          webview2.setAttribute('guestinstance', instance)
-+        }
-+        webview2.addEventListener('did-finish-load', load2Listener, false)
-+        webview2.src = 'file://' + fixtures + '/api/blank.html'
-+        document.body.appendChild(webview2)
-+      }
-+      webview.addEventListener('did-finish-load', load1Listener, false)
-+      webview.src = 'file://' + fixtures + '/api/blank.html'
-+      document.body.appendChild(webview)
-+    })
-+
-+    it('moving a guest back to its original webview should work', (done) => {
-+      const loadListener = () => {
-+        webview.removeEventListener('did-finish-load', loadListener, false)
-+        const webContents = webview.getWebContents()
-+        const instance = webview.getAttribute('guestinstance')
-+
-+        const destroy1Listener = () => {
-+          webview.removeEventListener('destroyed', destroy1Listener, false)
-+          assert.equal(webContents, webview2.getWebContents())
-+          assert.notStrictEqual(webContents, webview.getWebContents())
-+
-+          const destroy2Listener = () => {
-+            webview2.removeEventListener('destroyed', destroy2Listener, false)
-+            assert.equal(webContents, webview.getWebContents())
-+            assert.notStrictEqual(webContents, webview2.getWebContents())
-+
-+            // Make sure that events are hooked up to the right webview now
-+            webview.addEventListener('console-message', (e) => {
-+              assert.equal(e.message, 'a')
-+              document.body.removeChild(webview2)
-+              done()
-+            })
-+
-+            webview.src = `file://${fixtures}/pages/a.html`
-+          }
-+          webview2.addEventListener('destroyed', destroy2Listener, false)
-+          webview.setAttribute('guestinstance', instance)
-+        }
-+        webview.addEventListener('destroyed', destroy1Listener, false)
-+
-+        const webview2 = new WebView()
-+        webview2.setAttribute('guestinstance', instance)
-+        document.body.appendChild(webview2)
-+      }
-+      webview.addEventListener('did-finish-load', loadListener, false)
-+      webview.src = `file://${fixtures}/api/blank.html`
-+      document.body.appendChild(webview)
-+    })
-+
-+    it('setting the attribute on a webview in a different window moves the contents', (done) => {
-+      const loadListener = () => {
-+        webview.removeEventListener('did-finish-load', loadListener, false)
-+        const instance = webview.getAttribute('guestinstance')
-+
-+        w = new BrowserWindow({ show: false })
-+        w.webContents.once('did-finish-load', () => {
-+          ipcMain.once('pong', () => {
-+            assert(!webview.hasAttribute('guestinstance'))
-+            done()
-+          })
-+
-+          w.webContents.send('guestinstance', instance)
-+        })
-+        w.loadURL(`file://${fixtures}/pages/webview-move-to-window.html`)
-+      }
-+      webview.addEventListener('did-finish-load', loadListener, false)
-+      webview.src = `file://${fixtures}/api/blank.html`
-+      document.body.appendChild(webview)
-+    })
-+
-+    it('does not delete the guestinstance attribute when moving the webview to another parent node', (done) => {
-+      webview.addEventListener('dom-ready', function domReadyListener () {
-+        webview.addEventListener('did-attach', () => {
-+          assert(webview.guestinstance != null)
-+          assert(webview.getWebContents() != null)
-+          done()
-+        })
-+
-+        document.body.replaceChild(webview, div)
-+      })
-+      webview.src = `file://${fixtures}/pages/a.html`
-+
-+      const div = document.createElement('div')
-+      div.appendChild(webview)
-+      document.body.appendChild(div)
-+    })
-+
-+    it('does not destroy the webContents when hiding/showing the webview (regression)', (done) => {
-+      webview.addEventListener('dom-ready', function domReadyListener () {
-+        const instance = webview.getAttribute('guestinstance')
-+        assert(instance != null)
-+
-+        // Wait for event directly since attach happens asynchronously over IPC
-+        ipcMain.once('ELECTRON_GUEST_VIEW_MANAGER_ATTACH_GUEST', () => {
-+          assert(webview.getWebContents() != null)
-+          assert.equal(instance, webview.getAttribute('guestinstance'))
-+          done()
-+        })
-+
-+        webview.style.display = 'none'
-+        webview.offsetHeight // eslint-disable-line
-+        webview.style.display = 'block'
-+      })
-+      webview.src = `file://${fixtures}/pages/a.html`
-+      document.body.appendChild(webview)
-+    })
-+
-+    it('does not reload the webContents when hiding/showing the webview (regression)', (done) => {
-+      webview.addEventListener('dom-ready', function domReadyListener () {
-+        webview.addEventListener('did-start-loading', () => {
-+          done(new Error('webview started loading unexpectedly'))
-+        })
-+
-+        // Wait for event directly since attach happens asynchronously over IPC
-+        webview.addEventListener('did-attach', () => {
-+          done()
-+        })
-+
-+        webview.style.display = 'none'
-+        webview.offsetHeight  // eslint-disable-line
-+        webview.style.display = 'block'
-+      })
-+      webview.src = `file://${fixtures}/pages/a.html`
-+      document.body.appendChild(webview)
-+    })
-+>>>>>>> .their
-   })
- 
-   describe('DOM events', () => {
-changed in both
-  base   100644 6580f18a1ad9e53ab3f2ae88cb7ea023bcf9579c toolchain.gypi
-  our    100644 697add78e42191741cee1b015cdcf4f801c570e7 toolchain.gypi
-  their  100644 8ed945a57c8875bae06cef74dc5d44afcc586d1d toolchain.gypi
-changed in both
-  base   160000 db1b314c019f6acbd4d1be273b63521cc6051d3c vendor/libchromiumcontent
-  our    160000 c85470a1c379b1c4bedb372c146521bc4be9b75d vendor/libchromiumcontent
-  their  160000 028b0af83076cec898f4ebce208b7fadb715656e vendor/libchromiumcontent
-removed in local
-  base   160000 99d9e262eb36cb9dc8e83f61e026d2a7ad1e96ab vendor/native_mate
-  their  160000 6a3d238b7e1e3742f2bb495336a84021d927a24f vendor/native_mate
-changed in both
-  base   160000 bf06b641574a6e2a8357ca4b44defac4a83f1dda vendor/node
-  our    160000 ece0a06ac8147efb5b5af431c21f312f1884616e vendor/node
-  their  160000 f2bcc6b58293287e2a6e592bd296aa55bb37b801 vendor/node
-added in both
-  our    100644 84bd69c2b2868ac23bc30061aa208ad38fbb9506 vsts.yml
-  their  100644 5209acdec2eb8557ea55ce5281b7999b974aa5b6 vsts.yml
-@@ -54,21 +54,32 @@
-       script/test.py --ci --rebuild_native_modules
-     fi
-   name: Test
-+<<<<<<< .our
-   condition: or(ne(variables['ELECTRON_RELEASE'], '1'), eq(variables['UPLOAD_TO_S3'], '1'))
-+=======
-+>>>>>>> .their
- 
- - bash: |
-     echo 'Verifying ffmpeg on build'
-     if [ "$ELECTRON_RELEASE" == "1" ]; then
-+<<<<<<< .our
-       script/verify-ffmpeg.py -c R
-+=======
-+      script/verify-ffmpeg.py -R
-+>>>>>>> .their
-     else
-       script/verify-ffmpeg.py
-     fi
-   name: Verify_FFmpeg
-+<<<<<<< .our
-   condition: or(ne(variables['ELECTRON_RELEASE'], '1'), eq(variables['UPLOAD_TO_S3'], '1'))
-+=======
-+>>>>>>> .their
- 
- - task: PublishTestResults@2
-   displayName: Publish Test Results
-   inputs:
-+<<<<<<< .our
-     testResultsFiles: '**/test-*.xml'
-   condition: and(always(), eq(variables['MOCHA_FILE'], 'test-results.xml'))
- 
-@@ -93,5 +104,18 @@
-   inputs:
-     PathtoPublish: '$(Build.SourcesDirectory)/out'
-     ArtifactName: out
-+=======
-+    testResultsFiles: 'test-results.xml'
-+    searchFolder: junit
-+  condition: and(always(), ne(variables['ELECTRON_RELEASE'], '1'))
-+
-+- task: kasunkodagoda.slack-notification.slack-notification-task.SlackNotification@3
-+  displayName: Post Slack Notification
-+  inputs:
-+    SlackApiToken: '$(slack_token)'
-+    Channel: '#bot-nightly-releases'
-+    Message: '$(Build.DefinitionName)-$(Build.BuildNumber) finished with a $(Agent.JobStatus) status.'
-+  condition: and(always(), eq(variables['Build.Reason'], 'Schedule'))
-+>>>>>>> .their
- 
- - task: mspremier.PostBuildCleanup.PostBuildCleanup-task.PostBuildCleanup@3
diff --git a/app/test/fixtures/merge-parser/electron/merge-3-0-x-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-3-0-x-into-master.txt
deleted file mode 100644
index 508e29be736..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-3-0-x-into-master.txt
+++ /dev/null
@@ -1,15217 +0,0 @@
-added in both
-  our    100644 6d44d618aabcce04c60344f2274dec5b0c2a1f68 .circleci/config.yml
-  their  100644 7bc5ddc6be0269ab0ed88cc2a569de36ba93e5fa .circleci/config.yml
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- notify-slack-failure: &notify-slack-failure
-   run:
-     name: Send a slack notification on failure
-@@ -19,6 +20,8 @@
-       fi
-     when: on_success
- 
-+=======
-+>>>>>>> .their
- build-steps: &build-steps
-   steps:
-     - checkout
-@@ -122,7 +125,11 @@
-               script/verify-ffmpeg.py
-             else
-               echo 'Verifying ffmpeg on release build'
-+<<<<<<< .our
-               script/verify-ffmpeg.py -c R
-+=======
-+              script/verify-ffmpeg.py -R
-+>>>>>>> .their
-             fi
-           else
-             echo 'Skipping tests due to configuration'
-@@ -134,8 +141,11 @@
-           if [ "$CREATE_TYPESCRIPT_DEFS" == "true" ]; then
-             npm run create-typescript-definitions
-           fi
-+<<<<<<< .our
-     - <<: *notify-slack-failure
-     - <<: *notify-slack-success
-+=======
-+>>>>>>> .their
-     - persist_to_workspace:
-         root: out
-         paths:
-@@ -147,6 +157,7 @@
-     - store_artifacts:
-         path: out
- 
-+<<<<<<< .our
- gn-build-steps: &gn-build-steps
-   steps:
-     - run:
-@@ -344,6 +355,8 @@
-     xcode: "8.3.3"
-   resource_class: large
- 
-+=======
-+>>>>>>> .their
- build-defaults: &build-defaults
-   docker:
-     - image: electronbuilds/electron:0.0.8
-@@ -386,7 +399,10 @@
-     environment:
-       TARGET_ARCH: arm
-       RUN_RELEASE_BUILD: true
-+<<<<<<< .our
-       NIGHTLY_BUILD: true
-+=======
-+>>>>>>> .their
-     <<: *build-defaults
-     resource_class: 2xlarge
- 
-@@ -425,7 +441,10 @@
-     environment:
-       TARGET_ARCH: arm64
-       RUN_RELEASE_BUILD: true
-+<<<<<<< .our
-       NIGHTLY_BUILD: true
-+=======
-+>>>>>>> .their
-     <<: *build-defaults
-     resource_class: 2xlarge
- 
-@@ -442,7 +461,10 @@
-     environment:
-       TARGET_ARCH: ia32
-       RUN_RELEASE_BUILD: true
-+<<<<<<< .our
-       NIGHTLY_BUILD: true
-+=======
-+>>>>>>> .their
-     <<: *build-defaults
-     resource_class: xlarge
- 
-@@ -466,7 +488,10 @@
-     environment:
-       TARGET_ARCH: x64
-       RUN_RELEASE_BUILD: true
-+<<<<<<< .our
-       NIGHTLY_BUILD: true
-+=======
-+>>>>>>> .their
-     <<: *build-defaults
-     resource_class: xlarge
- 
-@@ -484,7 +509,10 @@
-       TARGET_ARCH: x64
-       RUN_RELEASE_BUILD: true
-       INSTALL_MACOS_NODE: true
-+<<<<<<< .our
-       NIGHTLY_BUILD: true
-+=======
-+>>>>>>> .their
-     macos:
-       xcode: "8.3.3"
-     <<: *build-steps
-@@ -505,11 +533,15 @@
-       MAS_BUILD: 1
-       RUN_RELEASE_BUILD: true
-       INSTALL_MACOS_NODE: true
-+<<<<<<< .our
-       NIGHTLY_BUILD: true
-+=======
-+>>>>>>> .their
-     macos:
-       xcode: "8.3.3"
-     <<: *build-steps
- 
-+<<<<<<< .our
-   electron-gn-linux-x64-debug-fyi:
-     environment:
-       DISPLAY: ':99.0'
-@@ -668,6 +700,8 @@
-       GN_EXTRA_ARGS: 'is_mas_build = true'
-     <<: *gn-mac-build-machine
-     <<: *gn-mac-build-steps
-+=======
-+>>>>>>> .their
- 
- workflows:
-   version: 2
-@@ -695,6 +729,7 @@
-   build-mas-x64:
-     jobs:
-       - electron-mas-x64
-+<<<<<<< .our
-   build-gn-linux:
-     jobs:
-       - electron-gn-linux-x64-debug-fyi
-@@ -711,6 +746,8 @@
-       - electron-gn-mas-testing-fyi
-       - electron-gn-osx-debug-fyi
-       - electron-gn-osx-testing-fyi
-+=======
-+>>>>>>> .their
- 
-   nightly-release-test:
-     triggers:
-@@ -720,7 +757,10 @@
-             branches:
-               only:
-                 - master
-+<<<<<<< .our
-                 - 3-0-x
-+=======
-+>>>>>>> .their
-                 - 2-0-x
-                 - 1-8-x
-                 - 1-7-x
-@@ -730,6 +770,7 @@
-       - electron-linux-ia32-release-nightly
-       - electron-linux-x64-release-nightly
- 
-+<<<<<<< .our
-   nightly-gn-release-test:
-     triggers:
-       - schedule:
-@@ -745,3 +786,13 @@
-       - electron-gn-linux-arm64-release-fyi
-       - electron-gn-mas-release-fyi
-       - electron-gn-osx-release-fyi
-+=======
-+experimental:
-+  notify:
-+    branches:
-+      only:
-+        - master
-+        - 2-0-x
-+        - 1-8-x
-+        - 1-7-x
-+>>>>>>> .their
-added in both
-  our    100644 cd15610276869944caf77c06906f6fb5315ebd3e .env.example
-  their  100644 c2af9cb1f737c66d0c2512f93ac1365b627f440f .env.example
-@@ -4,4 +4,8 @@
- APPVEYOR_TOKEN=
- CIRCLE_TOKEN=
- ELECTRON_GITHUB_TOKEN=
--VSTS_TOKEN=
-\ No newline at end of file
-+<<<<<<< .our
-+VSTS_TOKEN=
-+=======
-+VSTS_TOKEN=
-+>>>>>>> .their
-added in both
-  our    100644 e9c110640201b62255ffa62eea2a6f4ccbadb34f .github/ISSUE_TEMPLATE.md
-  their  100644 7a21d0e22a6442a1cc509acbdb4ca9bf865a3014 .github/ISSUE_TEMPLATE.md
-@@ -7,11 +7,19 @@
- - If you need general advice, join our Slack: http://atom-slack.herokuapp.com
- -->
- 
-+<<<<<<< .our
- * Output of `node_modules/.bin/electron --version`:
- * Operating System (Platform and Version):
- 
- <!-- If this used to work -->
- * Output of `node_modules/.bin/electron --version` on last known working Electron version (if applicable):
-+=======
-+* Electron version:
-+* Operating system:
-+
-+<!-- If this used to work -->
-+* Last known working Electron version: 
-+>>>>>>> .their
- 
- ### Expected behavior
- 
-added in both
-  our    100644 10cb69a7a8e4ca3b2e9ca08515eacced297bb277 .github/ISSUE_TEMPLATE/Bug_report.md
-  their  100644 a5cad57bfaef1e29296926448a251d1fe3e5419f .github/ISSUE_TEMPLATE/Bug_report.md
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- ---
- name: Bug report
- about: Create a report to help us improve Electron
-@@ -30,3 +31,37 @@
- 
- **Additional Information**
- Add any other context about the problem here.
-+=======
-+---
-+name: Bug report
-+about: Create a report to help us improve Electron
-+
-+---
-+
-+* Electron Version:
-+* Operating System (Platform and Version):
-+* Last known working Electron version: 
-+
-+**Expected Behavior**
-+A clear and concise description of what you expected to happen.
-+
-+**Actual behavior**
-+A clear and concise description of what actually happened.
-+
-+**To Reproduce**
-+Your best chance of getting this bug looked at quickly is to provide a REPOSITORY that can be cloned and run.
-+
-+You can fork [electron-quick-start](https://github.com/electron/electron-quick-start) and include a link to the branch with your changes.
-+
-+If you provide a URL, please list the commands required to clone/setup/run your repo e.g.
-+```sh
-+$ git clone $YOUR_URL -b $BRANCH
-+$ npm install
-+$ npm start || electron .
-+```
-+**Screenshots**
-+If applicable, add screenshots to help explain your problem.
-+
-+**Additional Information**
-+Add any other context about the problem here.
-+>>>>>>> .their
-added in both
-  our    100644 51c2e6c8d52c9343a0853d2d2ec5b205a3aca790 .github/ISSUE_TEMPLATE/Feature_request.md
-  their  100644 9f3aa9e21d7bf082f3d486f49603406bb10fd8f5 .github/ISSUE_TEMPLATE/Feature_request.md
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- ---
- name: Feature request
- about: Suggest an idea for Electron
-@@ -15,3 +16,22 @@
- 
- **Additional context**
- Add any other context or screenshots about the feature request here.
-+=======
-+---
-+name: Feature request
-+about: Suggest an idea for Electron
-+
-+---
-+
-+**Is your feature request related to a problem? Please describe.**
-+A clear and concise description of what the problem is.
-+
-+**Describe the solution you'd like**
-+A clear and concise description of what you want to happen.
-+
-+**Describe alternatives you've considered**
-+A clear and concise description of any alternative solutions or features you've considered.
-+
-+**Additional context**
-+Add any other context or screenshots about the feature request here.
-+>>>>>>> .their
-added in both
-  our    100644 67a1646fee28c2c19cd1ec7301b587c0c8d6cb66 .github/PULL_REQUEST_TEMPLATE.md
-  their  100644 9a2d96970f629ee5eedadaac694d2423f6fb6005 .github/PULL_REQUEST_TEMPLATE.md
-@@ -1,4 +1,7 @@
-+<<<<<<< .our
- ##### Description of Change
-+=======
-+>>>>>>> .their
- <!--
- Thank you for your Pull Request. Please provide a description above and review
- the requirements below.
-@@ -13,10 +16,14 @@
- - [ ] `npm test` passes
- - [ ] tests are [changed or added](https://github.com/electron/electron/blob/master/docs/development/testing.md)
- - [ ] relevant documentation is changed or added
-+<<<<<<< .our
- - [ ] PR title follows semantic [commit guidelines](https://github.com/electron/electron/blob/master/docs/development/pull-requests.md#commit-message-guidelines)
- 
- 
- ##### Release Notes
- <!-- Used to describe release notes for future release versions. See https://github.com/electron/clerk/blob/master/README.md for details. -->
- 
--Notes: <!-- One-line Change Summary Here-->
-\ No newline at end of file
-+Notes: <!-- One-line Change Summary Here-->
-+=======
-+- [ ] commit messages or PR title follow semantic [commit guidelines](https://github.com/electron/electron/blob/master/docs/development/pull-requests.md#commit-message-guidelines)
-+>>>>>>> .their
-added in both
-  our    100644 ff8d1b64f1b2f68ceaf63ce74ede3b01625586ba .github/config.yml
-  their  100644 3c222c2f14dcbcab344059e6e4031edec6935f3c .github/config.yml
-@@ -12,7 +12,11 @@
- newPRWelcomeComment: |
-   💖 Thanks for opening this pull request! 💖
- 
-+<<<<<<< .our
-   We use [semantic commit messages](https://github.com/electron/electron/blob/master/docs/development/pull-requests.md#commit-message-guidelines) to streamline the release process. Before your pull request can be merged, you should **update your pull request title** to start with a semantic prefix.
-+=======
-+  We use [semantic commit messages](https://github.com/electron/electron/blob/master/docs/development/pull-requests.md#commit-message-guidelines) to streamline the release process. Before your pull request can be merged, you should **update your pull request title** to start with a semantic prefix, OR prefix at least one of your commit messages.
-+>>>>>>> .their
- 
-   Examples of commit messages with semantic prefixes:
- 
-added in both
-  our    100644 f393b1cdcef87b41bb3ed47ebae59757fed3a780 .gitignore
-  their  100644 665fb6fa10444592991a714828b60ca08daa4a2f .gitignore
-@@ -50,5 +50,8 @@
- # npm package
- /npm/dist
- /npm/path.txt
-+<<<<<<< .our
- 
--.npmrc
-\ No newline at end of file
-+.npmrc
-+=======
-+>>>>>>> .their
-added in both
-  our    100644 d00c4b1e3d3523641210ff20fda41d76c9eb546c BUILD.gn
-  their  100644 4a71e5550f6c7b8b74fcd15ceffdace06c8f9f52 BUILD.gn
-@@ -1,5 +1,6 @@
- import("//build/config/locales.gni")
- import("//tools/grit/repack.gni")
-+<<<<<<< .our
- import("//tools/v8_context_snapshot/v8_context_snapshot.gni")
- import("build/asar.gni")
- import("build/npm.gni")
-@@ -7,6 +8,10 @@
- import("//build/config/win/manifest.gni")
- import("electron_paks.gni")
- import("//third_party/ffmpeg/ffmpeg_options.gni")
-+=======
-+import("build/asar.gni")
-+import("build/npm.gni")
-+>>>>>>> .their
- 
- if (is_mac) {
-   import("//build/config/mac/rules.gni")
-@@ -31,6 +36,7 @@
- 
-   enable_desktop_capturer = true
-   enable_run_as_node = true
-+<<<<<<< .our
-   enable_osr = false
- }
- 
-@@ -47,6 +53,20 @@
-                 ],
-                 "scope",
-                 [ "filenames.gypi" ])
-+=======
-+  enable_osr = true
-+}
-+
-+filenames_gypi = exec_script(
-+  "//build/gypi_to_gn.py",
-+  [
-+    rebase_path("filenames.gypi"),
-+    "--replace=<(SHARED_INTERMEDIATE_DIR)=$target_gen_dir",
-+  ],
-+  "scope",
-+  [ "filenames.gypi" ]
-+)
-+>>>>>>> .their
- 
- config("branding") {
-   defines = [
-@@ -68,6 +88,7 @@
-   }
- }
- 
-+<<<<<<< .our
- npm_action("atom_browserify_sandbox") {
-   deps = [
-     ":atom_js2c_copy",
-@@ -85,6 +106,59 @@
-     "./lib/sandboxed_renderer/api/exports/path.js:path",
-     "-r",
-     "./lib/sandboxed_renderer/api/exports/child_process.js:child_process",
-+=======
-+config("native_mate_config") {
-+  include_dirs = [
-+    "//third_party/native_mate",
-+  ]
-+  cflags_cc = [
-+    "-Wno-deprecated-declarations",
-+  ]
-+  cflags_objcc = cflags_cc
-+}
-+
-+source_set("native_mate") {
-+  deps = [
-+    "//base",
-+    "//net",
-+    "//v8:v8_headers",
-+    "build/node",
-+  ]
-+  public_configs = [ ":native_mate_config" ]
-+  sources = [
-+    "//third_party/native_mate/native_mate/arguments.cc",
-+    "//third_party/native_mate/native_mate/arguments.h",
-+    "//third_party/native_mate/native_mate/compat.h",
-+    "//third_party/native_mate/native_mate/constructor.h",
-+    "//third_party/native_mate/native_mate/converter.cc",
-+    "//third_party/native_mate/native_mate/converter.h",
-+    "//third_party/native_mate/native_mate/dictionary.cc",
-+    "//third_party/native_mate/native_mate/dictionary.h",
-+    "//third_party/native_mate/native_mate/function_template.cc",
-+    "//third_party/native_mate/native_mate/function_template.h",
-+    "//third_party/native_mate/native_mate/handle.h",
-+    "//third_party/native_mate/native_mate/object_template_builder.cc",
-+    "//third_party/native_mate/native_mate/object_template_builder.h",
-+    "//third_party/native_mate/native_mate/persistent_dictionary.cc",
-+    "//third_party/native_mate/native_mate/persistent_dictionary.h",
-+    "//third_party/native_mate/native_mate/scoped_persistent.h",
-+    "//third_party/native_mate/native_mate/wrappable.cc",
-+    "//third_party/native_mate/native_mate/wrappable.h",
-+    "//third_party/native_mate/native_mate/wrappable_base.h",
-+  ]
-+}
-+
-+npm_action("atom_browserify_sandbox") {
-+  deps = [ ":atom_js2c_copy" ]
-+
-+  sandbox_args = [
-+    "lib/sandboxed_renderer/init.js",
-+    "-r", "./lib/sandboxed_renderer/api/exports/electron.js:electron",
-+    "-r", "./lib/sandboxed_renderer/api/exports/fs.js:fs",
-+    "-r", "./lib/sandboxed_renderer/api/exports/os.js:os",
-+    "-r", "./lib/sandboxed_renderer/api/exports/path.js:path",
-+    "-r", "./lib/sandboxed_renderer/api/exports/child_process.js:child_process",
-+>>>>>>> .their
-   ]
- 
-   inputs = [
-@@ -95,6 +169,7 @@
-     "lib/sandboxed_renderer/api/exports/path.js",
-     "lib/sandboxed_renderer/api/exports/child_process.js",
-   ]
-+<<<<<<< .our
-   outputs = [
-     "$target_gen_dir/js2c/preload_bundle.js",
-   ]
-@@ -123,6 +198,26 @@
-            "-o",
-            rebase_path(outputs[0]),
-          ]
-+=======
-+  outputs = [ "$target_gen_dir/js2c/preload_bundle.js" ]
-+
-+  script = "browserify"
-+  args = sandbox_args + [
-+    "-o", rebase_path(outputs[0])
-+  ]
-+}
-+
-+npm_action("atom_browserify_isolated") {
-+  deps = [ ":atom_js2c_copy" ]
-+
-+  inputs = [ "lib/isolated_renderer/init.js" ]
-+  outputs = [ "$target_gen_dir/js2c/isolated_bundle.js" ]
-+
-+  script = "browserify"
-+  args = inputs + [
-+    "-o", rebase_path(outputs[0])
-+  ]
-+>>>>>>> .their
- }
- 
- copy("atom_js2c_copy") {
-@@ -130,16 +225,26 @@
-     "lib/common/asar.js",
-     "lib/common/asar_init.js",
-   ]
-+<<<<<<< .our
-   outputs = [
-     "$target_gen_dir/js2c/{{source_file_part}}",
-   ]
-+=======
-+  outputs = [ "$target_gen_dir/js2c/{{source_file_part}}" ]
-+>>>>>>> .their
- }
- 
- action("atom_js2c") {
-   deps = [
-+<<<<<<< .our
-     ":atom_browserify_isolated",
-     ":atom_browserify_sandbox",
-     ":atom_js2c_copy",
-+=======
-+    ":atom_js2c_copy",
-+    ":atom_browserify_sandbox",
-+    ":atom_browserify_isolated",
-+>>>>>>> .their
-   ]
- 
-   js2c_sources = filenames_gypi.js2c_sources
-@@ -151,6 +256,7 @@
- 
-   inputs = js2c_sources + browserify_sources
- 
-+<<<<<<< .our
-   outputs = [
-     "$target_gen_dir/atom_natives.h",
-   ]
-@@ -159,10 +265,21 @@
-   args = [ rebase_path("//third_party/electron_node") ] +
-          rebase_path(outputs, root_build_dir) +
-          [ rebase_path("$target_gen_dir/js2c", root_build_dir) ]
-+=======
-+  outputs = [ "$target_gen_dir/atom_natives.h" ]
-+
-+  script = "tools/js2c.py"
-+  args = [
-+    rebase_path("//third_party/electron_node")
-+  ] + rebase_path(outputs, root_build_dir) + [
-+    rebase_path("$target_gen_dir/js2c", root_build_dir)
-+  ]
-+>>>>>>> .their
- }
- 
- asar("js2asar") {
-   sources = filenames_gypi.js_sources
-+<<<<<<< .our
-   if (enable_desktop_capturer) {
-     sources += [
-       "lib/browser/desktop-capturer.js",
-@@ -172,11 +289,15 @@
-   outputs = [
-     "$root_out_dir/resources/electron.asar",
-   ]
-+=======
-+  outputs = [ "$root_out_dir/resources/electron.asar" ]
-+>>>>>>> .their
-   root = "lib"
- }
- 
- asar("app2asar") {
-   sources = filenames_gypi.default_app_sources
-+<<<<<<< .our
-   outputs = [
-     "$root_out_dir/resources/default_app.asar",
-   ]
-@@ -187,10 +308,25 @@
-   configs += [ "//v8:external_startup_data" ]
-   configs += [ "//third_party/electron_node:node_internals" ]
- 
-+=======
-+  outputs = [ "$root_out_dir/resources/default_app.asar" ]
-+  root = "default_app"
-+}
-+
-+group("electron") {
-+  deps = [ ":electron_lib" ]
-+}
-+
-+static_library("electron_lib") {
-+  configs += [
-+    "//v8:external_startup_data",
-+  ]
-+>>>>>>> .their
-   public_configs = [
-     ":branding",
-     ":features",
-   ]
-+<<<<<<< .our
- 
-   deps = [
-     ":atom_js2c",
-@@ -198,15 +334,22 @@
-     "native_mate",
-     "//base",
-     "//base:i18n",
-+=======
-+  deps = [
-+>>>>>>> .their
-     "//chrome/common:constants",
-     "//components/cdm/renderer",
-     "//components/network_session_configurator/common",
-     "//components/prefs",
-     "//components/printing/common",
-     "//components/security_state/content",
-+<<<<<<< .our
-     "//components/viz/service",
-     "//content/public/app:both",
-     "//content/public/child",
-+=======
-+    "//content/public/browser",
-+>>>>>>> .their
-     "//device/geolocation",
-     "//gin",
-     "//net:net_resources",
-@@ -214,6 +357,7 @@
-     "//ppapi/proxy",
-     "//ppapi/shared_impl",
-     "//printing",
-+<<<<<<< .our
-     "//services/device/wake_lock/power_save_blocker",  # TODO: this requires a visibility patch to chromium src
-     "//skia",
-     "//third_party/WebKit/public:blink",
-@@ -228,10 +372,64 @@
-     "//v8",
-   ]
- 
-+=======
-+    "//services/device/wake_lock/power_save_blocker", # TODO: this requires a visibility patch to chromium src
-+    "//skia",
-+    "//third_party/WebKit/public:blink",
-+    "//third_party/boringssl",
-+    "//third_party/crashpad/crashpad/client",
-+    "//third_party/leveldatabase",
-+    "//third_party/libyuv",
-+    "//third_party/webrtc/modules/desktop_capture",
-+    "//third_party/webrtc/modules/desktop_capture:primitives",
-+    "//ui/events:dom_keycode_converter",
-+    "//ui/views",
-+    "//v8",
-+    ":atom_js2c",
-+    ":native_mate",
-+    "brightray",
-+    "build/node",
-+  ]
-+  if (is_mac) {
-+    deps += [
-+      "//ui/accelerated_widget_mac",
-+      "//base/allocator:features",
-+    ]
-+  }
-+  if (is_linux) {
-+    deps += [
-+      "//build/config/linux/gtk3",
-+      "//chrome/browser/ui/libgtkui",
-+      "//device/bluetooth",
-+      "//third_party/breakpad:client",
-+      "//ui/events/devices/x11",
-+      "//ui/events/platform/x11",
-+      "//ui/native_theme",
-+      "//ui/views/controls/webview",
-+      "//ui/wm",
-+    ]
-+    configs += [ ":gio_unix" ]
-+  }
-+  defines = [
-+    # This is defined in skia/skia_common.gypi.
-+    "SK_SUPPORT_LEGACY_GETTOPDEVICE",
-+    # Disable warnings for g_settings_list_schemas.
-+    "GLIB_DISABLE_DEPRECATION_WARNINGS",
-+
-+    # Import V8 symbols from shared library (node.dll / libnode.so)
-+    "USING_V8_SHARED",
-+    "USING_V8_PLATFORM_SHARED",
-+    "USING_V8_BASE_SHARED",
-+
-+    # Enables SkBitmap size 64 operations
-+    #"SK_SUPPORT_LEGACY_SAFESIZE64", # doesn't seem to be needed to build?
-+  ]
-+>>>>>>> .their
-   include_dirs = [
-     "chromium_src",
-     ".",
-     "$target_gen_dir",
-+<<<<<<< .our
- 
-     # TODO(nornagon): replace usage of SchemeRegistry by an actually exported
-     # API of blink, then delete this include dir.
-@@ -240,6 +438,21 @@
- 
-   defines = []
-   libs = []
-+=======
-+    # TODO(nornagon): replace usage of SchemeRegistry by an actually exported
-+    # API of blink, then delete this include dir.
-+    "//third_party/WebKit/Source",
-+    # NOTE(nornagon): other chromium files use the full path to include
-+    # crashpad; this is just here for compatibility between GN and GYP, so that
-+    # the #includes can be agnostic about where crashpad is vendored.
-+    "//third_party/crashpad",
-+  ]
-+  if (is_linux) {
-+    include_dirs += [
-+      "//third_party/breakpad",
-+    ]
-+  }
-+>>>>>>> .their
- 
-   extra_source_filters = []
-   if (!is_linux) {
-@@ -249,7 +462,10 @@
-       "*_x11.cc",
-       "*_gtk.h",
-       "*_gtk.cc",
-+<<<<<<< .our
-       "*\blibrary_loaders/*",
-+=======
-+>>>>>>> .their
-     ]
-   }
-   if (!is_win) {
-@@ -268,6 +484,7 @@
-     ]
-   }
- 
-+<<<<<<< .our
-   set_sources_assignment_filter(
-       sources_assignment_filter + extra_source_filters)
-   sources = filenames_gypi.lib_sources
-@@ -349,6 +566,12 @@
-     deps += [ "//pdf" ]
-   }
- 
-+=======
-+  set_sources_assignment_filter(sources_assignment_filter + extra_source_filters)
-+  sources = filenames_gypi.lib_sources
-+  set_sources_assignment_filter(sources_assignment_filter)
-+
-+>>>>>>> .their
-   if (enable_run_as_node) {
-     sources += [
-       "atom/app/node_main.cc",
-@@ -371,18 +594,27 @@
-       "atom/browser/osr/osr_web_contents_view_mac.mm",
-     ]
-     deps += [
-+<<<<<<< .our
-       "//components/viz/service",
-       "//ui/compositor",
-+=======
-+      "//ui/compositor",
-+      "//components/viz/service",
-+>>>>>>> .their
-     ]
-   }
- 
-   if (enable_desktop_capturer) {
-+<<<<<<< .our
-     deps += [ "//third_party/webrtc/modules/desktop_capture" ]
-+=======
-+>>>>>>> .their
-     sources += [
-       "atom/browser/api/atom_api_desktop_capturer.cc",
-       "atom/browser/api/atom_api_desktop_capturer.h",
-     ]
-   }
-+<<<<<<< .our
- }
- 
- electron_paks("packed_resources") {
-@@ -391,32 +623,69 @@
-     copy_data_to_bundle = true
-   } else {
-     output_dir = root_out_dir
-+=======
-+
-+  if (is_mac) {
-+    libs = [
-+      "Squirrel.framework",
-+      "ReactiveCocoa.framework",
-+      "Mantle.framework",
-+    ]
-+    cflags_objcc = [
-+      "-F", rebase_path("external_binaries", root_build_dir)
-+    ]
-+    if (true) { # !is_mas_build
-+      # ReactiveCocoa which is used by Squirrel requires using __weak.
-+      cflags_objcc += [ "-fobjc-weak" ]
-+    }
-+  }
-+  if (is_linux) {
-+    sources += filenames_gypi.lib_sources_linux
-+    sources += filenames_gypi.lib_sources_nss
-+>>>>>>> .their
-   }
- }
- 
- if (is_mac) {
-   electron_framework_name = electron_product_name + " Framework"
-   electron_helper_name = electron_product_name + " Helper"
-+<<<<<<< .our
-   electron_login_helper_name = electron_product_name + " Login Helper"
-+=======
-+>>>>>>> .their
-   electron_framework_version = "A"
-   electron_mac_bundle_id = "com.$electron_company_abbr.$electron_project_name"
- 
-   mac_xib_bundle_data("electron_xibs") {
-+<<<<<<< .our
-     sources = [
-       "atom/common/resources/mac/MainMenu.xib",
-     ]
-+=======
-+    sources = [ "atom/common/resources/mac/MainMenu.xib" ]
-+>>>>>>> .their
-   }
- 
-   bundle_data("electron_framework_resources") {
-     public_deps = [
-+<<<<<<< .our
-       ":packed_resources",
-     ]
-     sources = []
-+=======
-+      "//content/shell:pak",
-+      ":electron_locales",
-+    ]
-+    sources = [
-+      "$root_out_dir/content_shell.pak",
-+    ]
-+>>>>>>> .their
-     if (icu_use_data_file) {
-       sources += [ "$root_out_dir/icudtl.dat" ]
-       public_deps += [ "//third_party/icu:icudata" ]
-     }
-     if (v8_use_external_startup_data) {
-+<<<<<<< .our
-       sources += [ "$root_out_dir/natives_blob.bin" ]
-       public_deps += [ "//v8" ]
-       if (use_v8_context_snapshot) {
-@@ -425,12 +694,20 @@
-       } else {
-         sources += [ "$root_out_dir/snapshot_blob.bin" ]
-       }
-+=======
-+      sources += [
-+        "$root_out_dir/natives_blob.bin",
-+        "$root_out_dir/snapshot_blob.bin",
-+      ]
-+      public_deps += [ "//v8" ]
-+>>>>>>> .their
-     }
-     outputs = [
-       "{{bundle_resources_dir}}/{{source_file_part}}",
-     ]
-   }
- 
-+<<<<<<< .our
-   if (!is_component_build) {
-     bundle_data("electron_framework_libraries") {
-       sources = []
-@@ -453,6 +730,19 @@
-   }
- 
-   bundle_data("electron_crashpad_helper") {
-+=======
-+  bundle_data("electron_framework_libraries") {
-+    public_deps = [ "build/node" ]
-+    sources = [
-+      "$root_out_dir/libnode.dylib"
-+    ]
-+    outputs = [
-+      "{{bundle_contents_dir}}/Libraries/{{source_file_part}}"
-+    ]
-+  }
-+
-+  bundle_data("electron_framework_helpers") {
-+>>>>>>> .their
-     sources = [
-       "$root_out_dir/crashpad_handler",
-     ]
-@@ -470,6 +760,7 @@
-     output_name = electron_framework_name
-     framework_version = electron_framework_version
-     framework_contents = [ "Resources" ]
-+<<<<<<< .our
-     public_deps = [
-       ":electron_lib",
-     ]
-@@ -485,6 +776,25 @@
-     extra_substitutions = [ "ATOM_BUNDLE_ID=$electron_mac_bundle_id.framework" ]
- 
-     include_dirs = [ "." ]
-+=======
-+    public_deps = [ ":electron_lib" ]
-+    deps = [
-+      "//base",
-+      "//base:i18n",
-+      ":electron_framework_helpers",
-+      ":electron_framework_libraries",
-+      ":electron_framework_resources",
-+      ":electron_xibs",
-+    ]
-+    info_plist = "atom/common/resources/mac/Info.plist"
-+    extra_substitutions = [
-+      "ATOM_BUNDLE_ID=$electron_mac_bundle_id.framework",
-+    ]
-+
-+    include_dirs = [
-+      ".",
-+    ]
-+>>>>>>> .their
-     sources = filenames_gypi.framework_sources
- 
-     libs = [
-@@ -497,8 +807,12 @@
-       "StoreKit.framework",
-     ]
-     ldflags = [
-+<<<<<<< .our
-       "-F",
-       rebase_path("external_binaries", root_build_dir),
-+=======
-+      "-F", rebase_path("external_binaries", root_build_dir),
-+>>>>>>> .their
-       "-Wl,-install_name,@rpath/$output_name.framework/$output_name",
-       "-rpath",
-       "@loader_path/Libraries",
-@@ -506,13 +820,18 @@
-     if (is_component_build) {
-       ldflags += [
-         "-rpath",
-+<<<<<<< .our
-         "@executable_path/../../../../../..",
-+=======
-+        "@executable_path/../../../../../.."
-+>>>>>>> .their
-       ]
-     }
-   }
- 
-   mac_app_bundle("electron_helper_app") {
-     output_name = electron_helper_name
-+<<<<<<< .our
-     deps = [
-       ":electron_framework+link",
-     ]
-@@ -520,6 +839,15 @@
-     include_dirs = [ "." ]
-     info_plist = "atom/renderer/resources/mac/Info.plist"
-     extra_substitutions = [ "ATOM_BUNDLE_ID=$electron_mac_bundle_id.helper" ]
-+=======
-+    deps = [ ":electron_framework+link" ]
-+    sources = filenames_gypi.app_sources
-+    include_dirs = [ "." ]
-+    info_plist = "atom/renderer/resources/mac/Info.plist"
-+    extra_substitutions = [
-+      "ATOM_BUNDLE_ID=$electron_mac_bundle_id.helper",
-+    ]
-+>>>>>>> .their
-     ldflags = [
-       "-rpath",
-       "@executable_path/../../..",
-@@ -530,6 +858,7 @@
-     sources = [
-       "$root_out_dir/$electron_framework_name.framework",
-       "$root_out_dir/$electron_helper_name.app",
-+<<<<<<< .our
-     ]
-     if (!is_mas_build) {
-       sources += [
-@@ -538,6 +867,12 @@
-         "external_binaries/Squirrel.framework",
-       ]
-     }
-+=======
-+      "external_binaries/Squirrel.framework",
-+      "external_binaries/ReactiveCocoa.framework",
-+      "external_binaries/Mantle.framework",
-+    ]
-+>>>>>>> .their
-     outputs = [
-       "{{bundle_contents_dir}}/Frameworks/{{source_file_part}}",
-     ]
-@@ -547,6 +882,7 @@
-     ]
-   }
- 
-+<<<<<<< .our
-   mac_app_bundle("electron_login_helper") {
-     output_name = electron_login_helper_name
-     sources = filenames_gypi.login_helper_sources
-@@ -581,6 +917,44 @@
-     outputs = [
-       "{{bundle_resources_dir}}/{{source_file_part}}",
-     ]
-+=======
-+  bundle_data("electron_app_resources") {
-+    public_deps = [
-+      ":js2asar",
-+      ":app2asar",
-+    ]
-+    sources = [
-+      "$root_out_dir/resources/electron.asar",
-+      "$root_out_dir/resources/default_app.asar",
-+    ]
-+    outputs = [
-+      "{{bundle_resources_dir}}/{{source_file_part}}"
-+    ]
-+  }
-+
-+  repack_locales("electron_locales") {
-+    source_patterns = [
-+      "${root_gen_dir}/content/app/strings/content_strings_",
-+    ]
-+    deps = [
-+      "//content/app/strings",
-+    ]
-+
-+    input_locales = locales
-+
-+    if (is_mac) {
-+      output_locales = locales_as_mac_outputs
-+    } else {
-+      output_locales = locales
-+    }
-+
-+    if (is_mac) {
-+      output_dir = "$root_gen_dir/repack"
-+      copy_data_to_bundle = true
-+    } else {
-+      output_dir = root_out_dir
-+    }
-+>>>>>>> .their
-   }
- 
-   mac_app_bundle("electron_app") {
-@@ -591,16 +965,24 @@
-       ":electron_app_framework_bundle_data",
-       ":electron_app_resources",
-     ]
-+<<<<<<< .our
-     if (is_mas_build) {
-       deps += [ ":electron_login_helper_app" ]
-     }
-     info_plist = "atom/browser/resources/mac/Info.plist"
-     extra_substitutions = [ "ATOM_BUNDLE_ID=$electron_mac_bundle_id" ]
-+=======
-+    info_plist = "atom/browser/resources/mac/Info.plist"
-+    extra_substitutions = [
-+      "ATOM_BUNDLE_ID=$electron_mac_bundle_id",
-+    ]
-+>>>>>>> .their
-     ldflags = [
-       "-rpath",
-       "@executable_path/../Frameworks",
-     ]
-   }
-+<<<<<<< .our
- } else {
-   windows_manifest("electron_app_manifest") {
-     sources = [
-@@ -610,12 +992,18 @@
-     ]
-   }
- 
-+=======
-+}
-+
-+if (is_linux) {
-+>>>>>>> .their
-   executable("electron_app") {
-     output_name = electron_project_name
-     sources = filenames_gypi.app_sources
-     include_dirs = [ "." ]
-     deps = [
-       ":app2asar",
-+<<<<<<< .our
-       ":electron_app_manifest",
-       ":electron_lib",
-       ":js2asar",
-@@ -814,3 +1202,16 @@
- group("electron") {
-   deps = [ ":electron_app" ]
- }
-+=======
-+      ":electron_lib",
-+      ":js2asar",
-+      "//build/config:exe_and_shlib_deps",
-+      "//chrome:packed_resources",
-+      "//content/shell:copy_shell_resources",
-+      "//content/shell:pak",
-+      "//third_party/WebKit/public:image_resources",
-+      "//ui/strings",
-+    ]
-+  }
-+}
-+>>>>>>> .their
-added in both
-  our    100644 b3b9d650b27274f4f98f7408319b1e6b35f63abf DEPS
-  their  100644 5c1f2337c5a6f3ec82c5b1daabf7e0b608b7afba DEPS
-@@ -1,16 +1,27 @@
- vars = {
-   'chromium_version':
-+<<<<<<< .our
-     '66.0.3359.181',
-   'libchromiumcontent_revision':
-     'c85470a1c379b1c4bedb372c146521bc4be9b75d',
-   'node_version':
-     'ece0a06ac8147efb5b5af431c21f312f1884616e',
-+=======
-+    '63.0.3239.150',
-+  'libchromiumcontent_revision':
-+    '92dc0accfae5cd133fa2a6758ae6b3ff4ff7e569',
-+  'node_version':
-+    'v9.7.0-33-g538a5023af',
-+  'native_mate_revision':
-+    '4cd7d113915de0cc08e9a218be35bff9c7361906',
-+>>>>>>> .their
- 
-   'chromium_git':
-     'https://chromium.googlesource.com',
- 
-   'electron_git':
-     'https://github.com/electron',
-+<<<<<<< .our
- 
-   'checkout_nacl':
-     False,
-@@ -18,6 +29,8 @@
-     True,
-   'checkout_oculus_sdk':
-     False,
-+=======
-+>>>>>>> .their
- }
- 
- deps = {
-@@ -27,15 +40,24 @@
-     (Var("electron_git")) + '/libchromiumcontent.git@' + (Var("libchromiumcontent_revision")),
-   'src/third_party/electron_node':
-     (Var("electron_git")) + '/node.git@' + (Var("node_version")),
-+<<<<<<< .our
-+=======
-+  'src/third_party/native_mate':
-+    (Var("electron_git")) + '/native-mate.git@' + (Var("native_mate_revision")),
-+>>>>>>> .their
- }
- 
- hooks = [
-   {
-     'action': [
-+<<<<<<< .our
-       'python',
-       'src/libchromiumcontent/script/apply-patches',
-       '--project-root=.',
-       '--commit'
-+=======
-+      'src/libchromiumcontent/script/apply-patches'
-+>>>>>>> .their
-     ],
-     'pattern':
-       'src/libchromiumcontent',
-@@ -44,7 +66,10 @@
-   },
-   {
-     'action': [
-+<<<<<<< .our
-       'python',
-+=======
-+>>>>>>> .their
-       'src/electron/script/update-external-binaries.py'
-     ],
-     'pattern':
-@@ -54,9 +79,26 @@
-   },
-   {
-     'action': [
-+<<<<<<< .our
-       'python',
-       '-c',
-       'import os; os.chdir("src"); os.chdir("electron"); os.system("npm install")',
-+=======
-+      'bash',
-+      '-c',
-+      # NOTE(nornagon): this ridiculous {{}} stuff is because these strings get
-+      # variable-substituted twice by gclient.
-+      'echo -e "#\\n{{{{\'variables\':{{{{}}}}}}}}" > src/third_party/electron_node/config.gypi',
-+    ],
-+    'pattern': 'src/third_party/electron_node',
-+    'name': 'touch_node_config_gypi'
-+  },
-+  {
-+    'action': [
-+      'bash',
-+      '-c',
-+      'cd src/electron; npm install',
-+>>>>>>> .their
-     ],
-     'pattern': 'src/electron/package.json',
-     'name': 'electron_npm_deps'
-@@ -67,6 +109,7 @@
-   'src',
-   'src/libchromiumcontent',
- ]
-+<<<<<<< .our
- 
- gclient_gn_args = [
-   'checkout_libaom',
-@@ -74,3 +117,5 @@
-   'checkout_oculus_sdk'
- ]
- gclient_gn_args_file =  'src/build/config/gclient_args.gni'
-+=======
-+>>>>>>> .their
-added in remote
-  their  100644 d0281e481f6a6b2f0ffe25aeb309c737e3a8d228 appveyor-override.yml
-@@ -0,0 +1,71 @@
-+build_cloud: electron-16
-+image: electron-16-vs2017-15.4.5
-+build_script:
-+- ps: >-
-+    echo "Build worker image $env:APPVEYOR_BUILD_WORKER_IMAGE"
-+
-+    &"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe"
-+
-+    if(($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME -split "/")[0] -eq ($env:APPVEYOR_REPO_NAME -split "/")[0]) {
-+      Write-warning "Skipping PR build for branch"; Exit-AppveyorBuild
-+    } else {
-+      Add-Path "$env:ProgramFiles (x86)\Windows Kits\10\Debuggers\x64"
-+      $env:path = "$env:ProgramFiles (x86)\Windows Kits\10\Debuggers\x64;$env:path"
-+      if($env:APPVEYOR_SCHEDULED_BUILD -eq 'True')  {
-+        $env:RUN_RELEASE_BUILD = "1"
-+      }
-+      $Message = (git log --format=%B -n 1 HEAD) | Out-String
-+      if ((Test-Path Env:\RUN_RELEASE_BUILD)) {
-+        $env:ELECTRON_RELEASE = '1'
-+        Write-Output "release build triggered from api"
-+      }
-+      if ((Test-Path Env:\ELECTRON_RELEASE)) {
-+        Write-Output "Running release build"
-+        python script\bootstrap.py --target_arch=$env:TARGET_ARCH
-+        python script\build.py -c R
-+        python script\create-dist.py
-+      } else {
-+        Write-Output "Running debug build"
-+        python script\bootstrap.py --target_arch=$env:TARGET_ARCH --dev
-+        python script\build.py -c D
-+      }
-+      if ($? -ne 'True') {
-+        throw "Build failed with exit code $?"
-+      } else {
-+        "Build succeeded."
-+      }
-+      Push-AppveyorArtifact out
-+    }
-+test_script:
-+- ps: >-
-+    if (Test-Path Env:\ELECTRON_RELEASE) {
-+      Write-Output "Skipping tests for release build"
-+    } else {
-+      Write-Output "Running tests for debug build"
-+      python script\test.py --ci --rebuild_native_modules
-+      if ($LASTEXITCODE -ne '0') {
-+        throw "Tests failed with exit code $LASTEXITCODE"
-+      } else {
-+        Write-Output "Tests succeeded."
-+      }
-+      python script\verify-ffmpeg.py
-+      if ($LASTEXITCODE -ne '0') {
-+        throw "Verify ffmpeg failed with exit code $LASTEXITCODE"
-+      } else {
-+        "Verify ffmpeg succeeded."
-+      }
-+    }
-+artifacts:
-+- path: test-results.xml
-+  name: test-results.xml
-+deploy_script:
-+- ps: >-
-+    if (Test-Path Env:\ELECTRON_RELEASE) {
-+      if (Test-Path Env:\RUN_RELEASE_BUILD) {
-+        Write-Output "Uploading Electron release distribution to s3"
-+        & python script\upload.py --upload_to_s3
-+      } else {
-+        Write-Output "Uploading Electron release distribution to github releases"
-+        & python script\upload.py
-+      }
-+    }
-added in both
-  our    100644 fc77100d9acb58221c35f364c4db7866a44d347d atom/app/atom_main.cc
-  their  100644 d6f3e0a1cfa59ce910557e8b04f001db9f9ad8aa atom/app/atom_main.cc
-@@ -71,7 +71,11 @@
- 
- #ifdef _DEBUG
-   // Don't display assert dialog boxes in CI test runs
-+<<<<<<< .our
-   static const char* kCI = "ELECTRON_CI";
-+=======
-+  static const auto kCI = "ELECTRON_CI";
-+>>>>>>> .their
-   bool is_ci = IsEnvSet(kCI);
-   if (!is_ci) {
-     for (int i = 0; i < arguments.argc; ++i) {
-added in both
-  our    100644 b3b5b8f2a8f24b8928f69a286c80e8a3b8464366 atom/app/atom_main_delegate.cc
-  their  100644 40be88a55abf6b054aad50b4c20c270588ac69a9 atom/app/atom_main_delegate.cc
-@@ -131,6 +131,11 @@
-   brightray::MainDelegate::PreSandboxStartup();
- 
-   auto* command_line = base::CommandLine::ForCurrentProcess();
-+<<<<<<< .our
-+=======
-+  std::string process_type =
-+      command_line->GetSwitchValueASCII(::switches::kProcessType);
-+>>>>>>> .their
- 
-   // Only append arguments for browser process.
-   if (!IsBrowserProcess(command_line))
-added in both
-  our    100644 089a2b63d1bae3afebea925582a3aac81ddeaa4f atom/browser/api/atom_api_app.cc
-  their  100644 b3c1bb1522bddb4cc429696e65d96ba592cab332 atom/browser/api/atom_api_app.cc
-@@ -990,8 +990,12 @@
-                             const net::CompletionCallback& callback) {
-   auto browser_context = AtomBrowserContext::From("", false);
-   if (!certificate_manager_model_) {
-+<<<<<<< .our
-     auto copy = base::DictionaryValue::From(
-         base::Value::ToUniquePtrValue(options.Clone()));
-+=======
-+    std::unique_ptr<base::DictionaryValue> copy = options.CreateDeepCopy();
-+>>>>>>> .their
-     CertificateManagerModel::Create(
-         browser_context.get(),
-         base::Bind(&App::OnCertificateManagerModelCreated,
-@@ -1115,10 +1119,13 @@
-     mate::Dictionary memory_dict = mate::Dictionary::CreateEmpty(isolate);
-     mate::Dictionary cpu_dict = mate::Dictionary::CreateEmpty(isolate);
- 
-+<<<<<<< .our
-     pid_dict.SetHidden("simple", true);
-     memory_dict.SetHidden("simple", true);
-     cpu_dict.SetHidden("simple", true);
- 
-+=======
-+>>>>>>> .their
-     memory_dict.Set(
-         "workingSetSize",
-         static_cast<double>(
-@@ -1224,7 +1231,10 @@
-       .SetMethod("getName", base::Bind(&Browser::GetName, browser))
-       .SetMethod("setName", base::Bind(&Browser::SetName, browser))
-       .SetMethod("isReady", base::Bind(&Browser::is_ready, browser))
-+<<<<<<< .our
-       .SetMethod("whenReady", base::Bind(&Browser::WhenReady, browser))
-+=======
-+>>>>>>> .their
-       .SetMethod("addRecentDocument",
-                  base::Bind(&Browser::AddRecentDocument, browser))
-       .SetMethod("clearRecentDocuments",
-added in both
-  our    100644 ee0ad42c05fe33be17146b79cbe3422953516621 atom/browser/api/atom_api_app.h
-  their  100644 e9032073f6a731a55cbd5e84c0d21f51020249dc atom/browser/api/atom_api_app.h
-@@ -15,7 +15,10 @@
- #include "atom/browser/browser.h"
- #include "atom/browser/browser_observer.h"
- #include "atom/common/native_mate_converters/callback.h"
-+<<<<<<< .our
- #include "atom/common/promise_util.h"
-+=======
-+>>>>>>> .their
- #include "base/process/process_iterator.h"
- #include "base/task/cancelable_task_tracker.h"
- #include "chrome/browser/icon_manager.h"
-added in both
-  our    100644 d0ae6f4ea78407c70e4cce6ff1181ce01e395133 atom/browser/api/atom_api_browser_window.cc
-  their  100644 1b0ed8d2950d6a2a24887bed802140372e9acc73 atom/browser/api/atom_api_browser_window.cc
-@@ -55,7 +55,11 @@
-     base::DictionaryValue web_preferences_dict;
-     if (mate::ConvertFromV8(isolate, web_preferences.GetHandle(),
-                             &web_preferences_dict)) {
-+<<<<<<< .our
-       existing_preferences->Clear();
-+=======
-+      existing_preferences->dict()->Clear();
-+>>>>>>> .their
-       existing_preferences->Merge(web_preferences_dict);
-     }
-   } else {
-added in both
-  our    100644 daccf443927abdf444845613b6e2916d167f96f3 atom/browser/api/atom_api_cookies.cc
-  their  100644 2f226d9210db6ed80f6960b08cfe1dc12b2f3180 atom/browser/api/atom_api_cookies.cc
-@@ -264,6 +264,7 @@
- 
- void Cookies::Get(const base::DictionaryValue& filter,
-                   const GetCallback& callback) {
-+<<<<<<< .our
-   auto copy = base::DictionaryValue::From(
-       base::Value::ToUniquePtrValue(filter.Clone()));
-   auto* getter = browser_context_->GetRequestContext();
-@@ -271,6 +272,14 @@
-       BrowserThread::IO, FROM_HERE,
-       base::BindOnce(GetCookiesOnIO, base::RetainedRef(getter), std::move(copy),
-                      callback));
-+=======
-+  std::unique_ptr<base::DictionaryValue> copied(filter.CreateDeepCopy());
-+  auto* getter = browser_context_->GetRequestContext();
-+  content::BrowserThread::PostTask(
-+      BrowserThread::IO, FROM_HERE,
-+      base::BindOnce(GetCookiesOnIO, base::RetainedRef(getter),
-+                     std::move(copied), callback));
-+>>>>>>> .their
- }
- 
- void Cookies::Remove(const GURL& url,
-@@ -285,6 +294,7 @@
- 
- void Cookies::Set(const base::DictionaryValue& details,
-                   const SetCallback& callback) {
-+<<<<<<< .our
-   auto copy = base::DictionaryValue::From(
-       base::Value::ToUniquePtrValue(details.Clone()));
-   auto* getter = browser_context_->GetRequestContext();
-@@ -292,6 +302,14 @@
-       BrowserThread::IO, FROM_HERE,
-       base::BindOnce(SetCookieOnIO, base::RetainedRef(getter), std::move(copy),
-                      callback));
-+=======
-+  std::unique_ptr<base::DictionaryValue> copied(details.CreateDeepCopy());
-+  auto* getter = browser_context_->GetRequestContext();
-+  content::BrowserThread::PostTask(
-+      BrowserThread::IO, FROM_HERE,
-+      base::BindOnce(SetCookieOnIO, base::RetainedRef(getter),
-+                     std::move(copied), callback));
-+>>>>>>> .their
- }
- 
- void Cookies::FlushStore(const base::Closure& callback) {
-added in both
-  our    100644 e0ef26a9fc46818056581a69169395e741ce2efe atom/browser/api/atom_api_system_preferences.h
-  their  100644 bfd64e80159dc46806360f14fd609ba24ccc09cb atom/browser/api/atom_api_system_preferences.h
-@@ -50,6 +50,14 @@
- #if defined(OS_WIN)
-   bool IsAeroGlassEnabled();
- 
-+<<<<<<< .our
-+=======
-+  typedef HRESULT(STDAPICALLTYPE* DwmGetColorizationColor)(DWORD*, BOOL*);
-+  DwmGetColorizationColor dwmGetColorizationColor =
-+      (DwmGetColorizationColor)GetProcAddress(LoadLibraryW(L"dwmapi.dll"),
-+                                              "DwmGetColorizationColor");
-+
-+>>>>>>> .their
-   std::string GetAccentColor();
-   std::string GetColor(const std::string& color, mate::Arguments* args);
- 
-added in both
-  our    100644 0a24d1abf45fe7ff244386ea238b0e7b03b2df00 atom/browser/api/atom_api_system_preferences_win.cc
-  their  100644 b3fd74d59d9bcb53a23712f4a48206af191d45a6 atom/browser/api/atom_api_system_preferences_win.cc
-@@ -2,7 +2,10 @@
- // Use of this source code is governed by the MIT license that can be
- // found in the LICENSE file.
- 
-+<<<<<<< .our
- #include <dwmapi.h>
-+=======
-+>>>>>>> .their
- #include <iomanip>
- 
- #include "atom/browser/api/atom_api_system_preferences.h"
-@@ -39,7 +42,11 @@
-   DWORD color = 0;
-   BOOL opaque = FALSE;
- 
-+<<<<<<< .our
-   if (FAILED(DwmGetColorizationColor(&color, &opaque))) {
-+=======
-+  if (FAILED(dwmGetColorizationColor(&color, &opaque))) {
-+>>>>>>> .their
-     return "";
-   }
- 
-added in both
-  our    100644 c8db6b0bb468a2a722d8d830a9b2cb4bf2ce116b atom/browser/api/atom_api_top_level_window.cc
-  their  100644 f1f61c66752baf0b4bc5a6e94a639142b276e670 atom/browser/api/atom_api_top_level_window.cc
-@@ -194,6 +194,7 @@
-   Emit("restore");
- }
- 
-+<<<<<<< .our
- void TopLevelWindow::OnWindowWillResize(const gfx::Rect& new_bounds,
-                                         bool* prevent_default) {
-   if (Emit("will-resize", new_bounds)) {
-@@ -201,6 +202,8 @@
-   }
- }
- 
-+=======
-+>>>>>>> .their
- void TopLevelWindow::OnWindowResize() {
-   Emit("resize");
- }
-@@ -578,10 +581,13 @@
-   return window_->GetOpacity();
- }
- 
-+<<<<<<< .our
- void TopLevelWindow::SetShape(const std::vector<gfx::Rect>& rects) {
-   window_->widget()->SetShape(std::make_unique<std::vector<gfx::Rect>>(rects));
- }
- 
-+=======
-+>>>>>>> .their
- void TopLevelWindow::SetRepresentedFilename(const std::string& filename) {
-   window_->SetRepresentedFilename(filename);
- }
-@@ -749,6 +755,7 @@
-     args->ThrowError("AddTabbedWindow cannot be called by a window on itself.");
- }
- 
-+<<<<<<< .our
- void TopLevelWindow::SetWindowButtonVisibility(bool visible,
-                                                mate::Arguments* args) {
-   if (!window_->SetWindowButtonVisibility(visible)) {
-@@ -756,6 +763,8 @@
-   }
- }
- 
-+=======
-+>>>>>>> .their
- void TopLevelWindow::SetAutoHideMenuBar(bool auto_hide) {
-   window_->SetAutoHideMenuBar(auto_hide);
- }
-@@ -828,7 +837,11 @@
-     args->ThrowError();
-     return false;
-   }
-+<<<<<<< .our
-   auto* window = static_cast<NativeWindowViews*>(window_.get());
-+=======
-+  auto window = static_cast<NativeWindowViews*>(window_.get());
-+>>>>>>> .their
-   return window->taskbar_host().SetThumbarButtons(
-       window_->GetAcceleratedWidget(), buttons);
- #else
-@@ -1011,7 +1024,10 @@
-       .SetMethod("hasShadow", &TopLevelWindow::HasShadow)
-       .SetMethod("setOpacity", &TopLevelWindow::SetOpacity)
-       .SetMethod("getOpacity", &TopLevelWindow::GetOpacity)
-+<<<<<<< .our
-       .SetMethod("setShape", &TopLevelWindow::SetShape)
-+=======
-+>>>>>>> .their
-       .SetMethod("setRepresentedFilename",
-                  &TopLevelWindow::SetRepresentedFilename)
-       .SetMethod("getRepresentedFilename",
-@@ -1049,8 +1065,11 @@
-       .SetMethod("moveTabToNewWindow", &TopLevelWindow::MoveTabToNewWindow)
-       .SetMethod("toggleTabBar", &TopLevelWindow::ToggleTabBar)
-       .SetMethod("addTabbedWindow", &TopLevelWindow::AddTabbedWindow)
-+<<<<<<< .our
-       .SetMethod("setWindowButtonVisibility",
-                  &TopLevelWindow::SetWindowButtonVisibility)
-+=======
-+>>>>>>> .their
- #endif
-       .SetMethod("setAutoHideMenuBar", &TopLevelWindow::SetAutoHideMenuBar)
-       .SetMethod("isMenuBarAutoHide", &TopLevelWindow::IsMenuBarAutoHide)
-added in both
-  our    100644 ac4c7670a544abc25029314122ba6124a81cc81a atom/browser/api/atom_api_top_level_window.h
-  their  100644 5a76fd229c6b1cd1737199c5a502bb069e81dd64 atom/browser/api/atom_api_top_level_window.h
-@@ -60,8 +60,11 @@
-   void OnWindowUnmaximize() override;
-   void OnWindowMinimize() override;
-   void OnWindowRestore() override;
-+<<<<<<< .our
-   void OnWindowWillResize(const gfx::Rect& new_bounds,
-                           bool* prevent_default) override;
-+=======
-+>>>>>>> .their
-   void OnWindowResize() override;
-   void OnWindowMove() override;
-   void OnWindowMoved() override;
-@@ -148,7 +151,10 @@
-   bool HasShadow();
-   void SetOpacity(const double opacity);
-   double GetOpacity();
-+<<<<<<< .our
-   void SetShape(const std::vector<gfx::Rect>& rects);
-+=======
-+>>>>>>> .their
-   void SetRepresentedFilename(const std::string& filename);
-   std::string GetRepresentedFilename();
-   void SetDocumentEdited(bool edited);
-@@ -176,7 +182,10 @@
-   void MoveTabToNewWindow();
-   void ToggleTabBar();
-   void AddTabbedWindow(NativeWindow* window, mate::Arguments* args);
-+<<<<<<< .our
-   void SetWindowButtonVisibility(bool visible, mate::Arguments* args);
-+=======
-+>>>>>>> .their
-   void SetAutoHideMenuBar(bool auto_hide);
-   bool IsMenuBarAutoHide();
-   void SetMenuBarVisibility(bool visible);
-added in both
-  our    100644 9f18d97d2656fbc5dc62b7bcea05a8acab63e847 atom/browser/api/atom_api_url_request.cc
-  their  100644 51c7969e31f44c9c08dbc5aa7ccc8b1e60fff863 atom/browser/api/atom_api_url_request.cc
-@@ -125,6 +125,7 @@
-   return IsFlagSet(ResponseStateFlags::kFailed);
- }
- 
-+<<<<<<< .our
- mate::Dictionary URLRequest::GetUploadProgress(v8::Isolate* isolate) {
-   mate::Dictionary progress = mate::Dictionary::CreateEmpty(isolate);
- 
-@@ -137,6 +138,8 @@
-   return progress;
- }
- 
-+=======
-+>>>>>>> .their
- URLRequest::URLRequest(v8::Isolate* isolate, v8::Local<v8::Object> wrapper) {
-   InitWith(isolate, wrapper);
- }
-@@ -195,7 +198,10 @@
-       .SetMethod("setChunkedUpload", &URLRequest::SetChunkedUpload)
-       .SetMethod("followRedirect", &URLRequest::FollowRedirect)
-       .SetMethod("_setLoadFlags", &URLRequest::SetLoadFlags)
-+<<<<<<< .our
-       .SetMethod("getUploadProgress", &URLRequest::GetUploadProgress)
-+=======
-+>>>>>>> .their
-       .SetProperty("notStarted", &URLRequest::NotStarted)
-       .SetProperty("finished", &URLRequest::Finished)
-       // Response APi
-added in both
-  our    100644 4a5a2b65160bf0590c9e890e52d0531b799b583a atom/browser/api/atom_api_url_request.h
-  their  100644 3b5e667d7590b9398b6d41632f0f016f1a6c27d5 atom/browser/api/atom_api_url_request.h
-@@ -112,7 +112,10 @@
-   void OnResponseData(scoped_refptr<const net::IOBufferWithSize> data);
-   void OnResponseCompleted();
-   void OnError(const std::string& error, bool isRequestError);
-+<<<<<<< .our
-   mate::Dictionary GetUploadProgress(v8::Isolate* isolate);
-+=======
-+>>>>>>> .their
- 
-  protected:
-   explicit URLRequest(v8::Isolate* isolate, v8::Local<v8::Object> wrapper);
-added in both
-  our    100644 20a1ac2e672f08ffea528b6e094ba530ff8083d1 atom/browser/api/atom_api_web_contents.cc
-  their  100644 ce8fbeb848db9787e712f20264e0fa52f9b20405 atom/browser/api/atom_api_web_contents.cc
-@@ -1075,12 +1075,30 @@
-        details.is_same_document, details.did_replace_entry);
- }
- 
-+<<<<<<< .our
-+=======
-+int64_t WebContents::GetIDForContents(content::WebContents* web_contents) {
-+  int64_t process_id = web_contents->GetMainFrame()->GetProcess()->GetID();
-+  int64_t routing_id = web_contents->GetMainFrame()->GetRoutingID();
-+  int64_t rv = (process_id << 32) + routing_id;
-+  return rv;
-+}
-+
-+int64_t WebContents::GetID() const {
-+  return WebContents::GetIDForContents(web_contents());
-+}
-+
-+>>>>>>> .their
- int WebContents::GetProcessID() const {
-   return web_contents()->GetMainFrame()->GetProcess()->GetID();
- }
- 
- base::ProcessId WebContents::GetOSProcessID() const {
-+<<<<<<< .our
-   base::ProcessHandle process_handle =
-+=======
-+  auto process_handle =
-+>>>>>>> .their
-       web_contents()->GetMainFrame()->GetProcess()->GetHandle();
-   return base::GetProcId(process_handle);
- }
-@@ -1090,7 +1108,11 @@
- }
- 
- bool WebContents::Equal(const WebContents* web_contents) const {
-+<<<<<<< .our
-   return ID() == web_contents->ID();
-+=======
-+  return GetID() == web_contents->GetID();
-+>>>>>>> .their
- }
- 
- void WebContents::LoadURL(const GURL& url, const mate::Dictionary& options) {
-@@ -1142,8 +1164,13 @@
-   if (view) {
-     auto* web_preferences = WebContentsPreferences::From(web_contents());
-     std::string color_name;
-+<<<<<<< .our
-     if (web_preferences->GetPreference(options::kBackgroundColor,
-                                        &color_name)) {
-+=======
-+    if (web_preferences->dict()->GetString(options::kBackgroundColor,
-+                                           &color_name)) {
-+>>>>>>> .their
-       view->SetBackgroundColor(ParseHexColor(color_name));
-     } else {
-       view->SetBackgroundColor(SK_ColorTRANSPARENT);
-@@ -1391,10 +1418,13 @@
-   return web_contents()->IsAudioMuted();
- }
- 
-+<<<<<<< .our
- bool WebContents::IsCurrentlyAudible() {
-   return web_contents()->IsCurrentlyAudible();
- }
- 
-+=======
-+>>>>>>> .their
- void WebContents::Print(mate::Arguments* args) {
-   PrintSettings settings = {false, false, base::string16()};
-   if (args->Length() >= 1 && !args->GetNext(&settings)) {
-@@ -1823,7 +1853,11 @@
-   zoom_controller_->SetZoomLevel(level);
- }
- 
-+<<<<<<< .our
- double WebContents::GetZoomLevel() const {
-+=======
-+double WebContents::GetZoomLevel() {
-+>>>>>>> .their
-   return zoom_controller_->GetZoomLevel();
- }
- 
-@@ -1832,7 +1866,11 @@
-   SetZoomLevel(level);
- }
- 
-+<<<<<<< .our
- double WebContents::GetZoomFactor() const {
-+=======
-+double WebContents::GetZoomFactor() {
-+>>>>>>> .their
-   auto level = GetZoomLevel();
-   return content::ZoomLevelToZoomFactor(level);
- }
-@@ -1863,6 +1901,7 @@
-   return v8::Null(isolate);
- }
- 
-+<<<<<<< .our
- v8::Local<v8::Value> WebContents::GetWebPreferences(
-     v8::Isolate* isolate) const {
-   auto* web_preferences = WebContentsPreferences::From(web_contents());
-@@ -1880,6 +1919,24 @@
- }
- 
- v8::Local<v8::Value> WebContents::GetOwnerBrowserWindow() const {
-+=======
-+v8::Local<v8::Value> WebContents::GetWebPreferences(v8::Isolate* isolate) {
-+  auto* web_preferences = WebContentsPreferences::From(web_contents());
-+  if (!web_preferences)
-+    return v8::Null(isolate);
-+  return mate::ConvertToV8(isolate, *web_preferences->dict());
-+}
-+
-+v8::Local<v8::Value> WebContents::GetLastWebPreferences(v8::Isolate* isolate) {
-+  WebContentsPreferences* web_preferences =
-+      WebContentsPreferences::FromWebContents(web_contents());
-+  if (!web_preferences)
-+    return v8::Null(isolate);
-+  return mate::ConvertToV8(isolate, *web_preferences->last_dict());
-+}
-+
-+v8::Local<v8::Value> WebContents::GetOwnerBrowserWindow() {
-+>>>>>>> .their
-   if (owner_window())
-     return BrowserWindow::From(isolate(), owner_window());
-   else
-@@ -1961,6 +2018,10 @@
-   prototype->SetClassName(mate::StringToV8(isolate, "WebContents"));
-   mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
-       .MakeDestroyable()
-+<<<<<<< .our
-+=======
-+      .SetMethod("getId", &WebContents::GetID)
-+>>>>>>> .their
-       .SetMethod("getProcessId", &WebContents::GetProcessID)
-       .SetMethod("getOSProcessId", &WebContents::GetOSProcessID)
-       .SetMethod("equal", &WebContents::Equal)
-@@ -1990,7 +2051,10 @@
-       .SetMethod("setIgnoreMenuShortcuts", &WebContents::SetIgnoreMenuShortcuts)
-       .SetMethod("setAudioMuted", &WebContents::SetAudioMuted)
-       .SetMethod("isAudioMuted", &WebContents::IsAudioMuted)
-+<<<<<<< .our
-       .SetMethod("isCurrentlyAudible", &WebContents::IsCurrentlyAudible)
-+=======
-+>>>>>>> .their
-       .SetMethod("undo", &WebContents::Undo)
-       .SetMethod("redo", &WebContents::Redo)
-       .SetMethod("cut", &WebContents::Cut)
-added in both
-  our    100644 7939f8268aa8c3371623e0c15f3b6001d7f1efa4 atom/browser/api/atom_api_web_contents.h
-  their  100644 336ef1f33355e9c88879450c6b891d8e50806757 atom/browser/api/atom_api_web_contents.h
-@@ -97,9 +97,18 @@
-   static void BuildPrototype(v8::Isolate* isolate,
-                              v8::Local<v8::FunctionTemplate> prototype);
- 
-+<<<<<<< .our
-   // Notifies to destroy any guest web contents before destroying self.
-   void DestroyWebContents(bool async);
- 
-+=======
-+  static int64_t GetIDForContents(content::WebContents* web_contents);
-+
-+  // Notifies to destroy any guest web contents before destroying self.
-+  void DestroyWebContents(bool async);
-+
-+  int64_t GetID() const;
-+>>>>>>> .their
-   int GetProcessID() const;
-   base::ProcessId GetOSProcessID() const;
-   Type GetType() const;
-@@ -139,7 +148,10 @@
-   void SetIgnoreMenuShortcuts(bool ignore);
-   void SetAudioMuted(bool muted);
-   bool IsAudioMuted();
-+<<<<<<< .our
-   bool IsCurrentlyAudible();
-+=======
-+>>>>>>> .their
-   void Print(mate::Arguments* args);
-   std::vector<printing::PrinterBasicInfo> GetPrinterList();
-   void SetEmbedder(const WebContents* embedder);
-@@ -213,9 +225,15 @@
- 
-   // Methods for zoom handling.
-   void SetZoomLevel(double level);
-+<<<<<<< .our
-   double GetZoomLevel() const;
-   void SetZoomFactor(double factor);
-   double GetZoomFactor() const;
-+=======
-+  double GetZoomLevel();
-+  void SetZoomFactor(double factor);
-+  double GetZoomFactor();
-+>>>>>>> .their
- 
-   // Callback triggered on permission response.
-   void OnEnterFullscreenModeForTab(content::WebContents* source,
-@@ -234,11 +252,19 @@
-   v8::Local<v8::Value> GetPreloadPath(v8::Isolate* isolate) const;
- 
-   // Returns the web preferences of current WebContents.
-+<<<<<<< .our
-   v8::Local<v8::Value> GetWebPreferences(v8::Isolate* isolate) const;
-   v8::Local<v8::Value> GetLastWebPreferences(v8::Isolate* isolate) const;
- 
-   // Returns the owner window.
-   v8::Local<v8::Value> GetOwnerBrowserWindow() const;
-+=======
-+  v8::Local<v8::Value> GetWebPreferences(v8::Isolate* isolate);
-+  v8::Local<v8::Value> GetLastWebPreferences(v8::Isolate* isolate);
-+
-+  // Returns the owner window.
-+  v8::Local<v8::Value> GetOwnerBrowserWindow();
-+>>>>>>> .their
- 
-   // Grants the child process the capability to access URLs with the origin of
-   // the specified URL.
-added in both
-  our    100644 7bcb7ab9370a8b3fe245c9569c93dbbdac0a0697 atom/browser/api/frame_subscriber.cc
-  their  100644 4b1234d5677e15b9c77d1e8a80e2be159b7d75e7 atom/browser/api/frame_subscriber.cc
-@@ -83,7 +83,11 @@
-                                        : frame;
- 
-   size_t rgb_row_size = bitmap.width() * bitmap.bytesPerPixel();
-+<<<<<<< .our
-   auto* source = static_cast<const char*>(bitmap.getPixels());
-+=======
-+  auto source = static_cast<const char*>(bitmap.getPixels());
-+>>>>>>> .their
- 
-   v8::MaybeLocal<v8::Object> buffer =
-       node::Buffer::Copy(isolate_, source, rgb_row_size * bitmap.height());
-added in both
-  our    100644 d3e82855417cb59c0449f1c1b685970ffaea2af6 atom/browser/api/frame_subscriber.h
-  their  100644 3de976f3051139f7ebd3a63da7455faf9d69ef76 atom/browser/api/frame_subscriber.h
-@@ -29,7 +29,11 @@
-                   content::WebContents* web_contents,
-                   const FrameCaptureCallback& callback,
-                   bool only_dirty);
-+<<<<<<< .our
-   ~FrameSubscriber() override;
-+=======
-+  ~FrameSubscriber();
-+>>>>>>> .their
- 
-  private:
-   gfx::Rect GetDamageRect();
-added in both
-  our    100644 57c4ee582405e6d501ec23940ccb10689ecd64a1 atom/browser/atom_browser_client.cc
-  their  100644 06fad9e28f6888009e2be08369f8e154d4eeca0b atom/browser/atom_browser_client.cc
-@@ -31,6 +31,10 @@
- #include "base/strings/string_number_conversions.h"
- #include "base/strings/string_util.h"
- #include "chrome/browser/printing/printing_message_filter.h"
-+<<<<<<< .our
-+=======
-+#include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h"
-+>>>>>>> .their
- #include "chrome/browser/speech/tts_message_filter.h"
- #include "content/public/browser/browser_ppapi_host.h"
- #include "content/public/browser/client_certificate_delegate.h"
-@@ -60,10 +64,13 @@
- #include "net/ssl/client_cert_store.h"
- #endif
- 
-+<<<<<<< .our
- #if defined(ENABLE_PEPPER_FLASH)
- #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h"
- #endif  // defined(ENABLE_PEPPER_FLASH)
- 
-+=======
-+>>>>>>> .their
- using content::BrowserThread;
- 
- namespace atom {
-@@ -251,11 +258,19 @@
-     return;
- 
-   // Do we have an affinity site to manage ?
-+<<<<<<< .our
-   auto* web_contents = content::WebContents::FromRenderFrameHost(rfh);
-   auto* web_preferences = WebContentsPreferences::From(web_contents);
-   std::string affinity;
-   if (web_preferences &&
-       web_preferences->GetPreference("affinity", &affinity) &&
-+=======
-+  std::string affinity;
-+  auto* web_contents = content::WebContents::FromRenderFrameHost(rfh);
-+  auto* web_preferences = WebContentsPreferences::From(web_contents);
-+  if (web_preferences &&
-+      web_preferences->dict()->GetString("affinity", &affinity) &&
-+>>>>>>> .their
-       !affinity.empty()) {
-     affinity = base::ToLowerASCII(affinity);
-     auto iter = site_per_affinities.find(affinity);
-@@ -343,14 +358,26 @@
-       web_preferences->AppendCommandLineSwitches(command_line);
-     SessionPreferences::AppendExtraCommandLineSwitches(
-         web_contents->GetBrowserContext(), command_line);
-+<<<<<<< .our
-+=======
-+
-+    auto context_id = atom::api::WebContents::GetIDForContents(web_contents);
-+    command_line->AppendSwitchASCII(switches::kContextId,
-+                                    base::IntToString(context_id));
-+>>>>>>> .their
-   }
- }
- 
- void AtomBrowserClient::DidCreatePpapiPlugin(content::BrowserPpapiHost* host) {
-+<<<<<<< .our
- #if defined(ENABLE_PEPPER_FLASH)
-   host->GetPpapiHost()->AddHostFactoryFilter(
-       base::WrapUnique(new ChromeBrowserPepperHostFactory(host)));
- #endif
-+=======
-+  host->GetPpapiHost()->AddHostFactoryFilter(
-+      base::WrapUnique(new chrome::ChromeBrowserPepperHostFactory(host)));
-+>>>>>>> .their
- }
- 
- void AtomBrowserClient::GetGeolocationRequestContext(
-added in both
-  our    100644 e036cbc8103f19a034ce386940462f8a23ea6807 atom/browser/atom_browser_context.cc
-  their  100644 ffef00da50a6da587dded419bebbf7400c9aa13e atom/browser/atom_browser_context.cc
-@@ -10,7 +10,10 @@
- #include "atom/browser/atom_permission_manager.h"
- #include "atom/browser/browser.h"
- #include "atom/browser/request_context_delegate.h"
-+<<<<<<< .our
- #include "atom/browser/special_storage_policy.h"
-+=======
-+>>>>>>> .their
- #include "atom/browser/web_view_manager.h"
- #include "atom/common/atom_version.h"
- #include "atom/common/chrome_version.h"
-@@ -43,8 +46,12 @@
-                                        bool in_memory,
-                                        const base::DictionaryValue& options)
-     : brightray::BrowserContext(partition, in_memory),
-+<<<<<<< .our
-       url_request_context_getter_(nullptr),
-       storage_policy_(new SpecialStoragePolicy) {
-+=======
-+      url_request_context_getter_(nullptr) {
-+>>>>>>> .their
-   // Construct user agent string.
-   Browser* browser = Browser::Get();
-   std::string name = RemoveWhitespace(browser->GetName());
-@@ -100,10 +107,13 @@
-   return permission_manager_.get();
- }
- 
-+<<<<<<< .our
- storage::SpecialStoragePolicy* AtomBrowserContext::GetSpecialStoragePolicy() {
-   return storage_policy_.get();
- }
- 
-+=======
-+>>>>>>> .their
- void AtomBrowserContext::RegisterPrefs(PrefRegistrySimple* pref_registry) {
-   pref_registry->RegisterFilePathPref(prefs::kSelectFileLastDirectory,
-                                       base::FilePath());
-added in both
-  our    100644 9e6a841ceb8d11069a1a094bf7dbbd3a788918b3 atom/browser/atom_browser_context.h
-  their  100644 581ecc185f1227c3cd020b6f61d7f58dfd667419 atom/browser/atom_browser_context.h
-@@ -8,6 +8,7 @@
- #include <string>
- #include <vector>
- 
-+<<<<<<< .our
- #include "base/memory/scoped_refptr.h"
- #include "brightray/browser/browser_context.h"
- 
-@@ -15,13 +16,20 @@
- class SpecialStoragePolicy;
- }
- 
-+=======
-+#include "brightray/browser/browser_context.h"
-+
-+>>>>>>> .their
- namespace atom {
- 
- class AtomBlobReader;
- class AtomDownloadManagerDelegate;
- class AtomPermissionManager;
- class RequestContextDelegate;
-+<<<<<<< .our
- class SpecialStoragePolicy;
-+=======
-+>>>>>>> .their
- class WebViewManager;
- 
- class AtomBrowserContext : public brightray::BrowserContext {
-@@ -41,7 +49,10 @@
-   content::DownloadManagerDelegate* GetDownloadManagerDelegate() override;
-   content::BrowserPluginGuestManager* GetGuestManager() override;
-   content::PermissionManager* GetPermissionManager() override;
-+<<<<<<< .our
-   storage::SpecialStoragePolicy* GetSpecialStoragePolicy() override;
-+=======
-+>>>>>>> .their
- 
-   // brightray::BrowserContext:
-   void RegisterPrefs(PrefRegistrySimple* pref_registry) override;
-@@ -65,7 +76,10 @@
-   std::unique_ptr<AtomDownloadManagerDelegate> download_manager_delegate_;
-   std::unique_ptr<WebViewManager> guest_manager_;
-   std::unique_ptr<AtomPermissionManager> permission_manager_;
-+<<<<<<< .our
-   scoped_refptr<storage::SpecialStoragePolicy> storage_policy_;
-+=======
-+>>>>>>> .their
-   std::unique_ptr<AtomBlobReader> blob_reader_;
-   std::unique_ptr<RequestContextDelegate> request_context_delegate_;
-   std::string user_agent_;
-added in both
-  our    100644 25fc326ebac3f2a5beb9199194067dae12c8229b atom/browser/atom_javascript_dialog_manager.cc
-  their  100644 c0c7be6302796cf774923757b466084816d897fe atom/browser/atom_javascript_dialog_manager.cc
-@@ -62,7 +62,11 @@
-   std::string checkbox;
-   if (origin_counts_[origin] > 1 && web_preferences &&
-       web_preferences->IsEnabled("safeDialogs") &&
-+<<<<<<< .our
-       !web_preferences->GetPreference("safeDialogsMessage", &checkbox)) {
-+=======
-+      !web_preferences->dict()->GetString("safeDialogsMessage", &checkbox)) {
-+>>>>>>> .their
-     checkbox = "Prevent this app from creating additional dialogs";
-   }
- 
-added in both
-  our    100644 ce35de64d60c6767ac52596c1b32e7bde5ceefa0 atom/browser/browser.cc
-  their  100644 0df8876bb620f5df7a1d0fd6ff3329c36ba5bd1b atom/browser/browser.cc
-@@ -155,13 +155,17 @@
-     base::CreateDirectoryAndGetError(user_data, nullptr);
- 
-   is_ready_ = true;
-+<<<<<<< .our
-   if (ready_promise_) {
-     ready_promise_->Resolve();
-   }
-+=======
-+>>>>>>> .their
-   for (BrowserObserver& observer : observers_)
-     observer.OnFinishLaunching(launch_info);
- }
- 
-+<<<<<<< .our
- util::Promise* Browser::WhenReady(v8::Isolate* isolate) {
-   if (!ready_promise_) {
-     ready_promise_ = new util::Promise(isolate);
-@@ -172,6 +176,8 @@
-   return ready_promise_;
- }
- 
-+=======
-+>>>>>>> .their
- void Browser::OnAccessibilitySupportChanged() {
-   for (BrowserObserver& observer : observers_)
-     observer.OnAccessibilitySupportChanged();
-added in both
-  our    100644 aed7d25c37da59c0dd5e09940a064c329353a0b2 atom/browser/browser.h
-  their  100644 d63ac7ccac55f3e13032bb0c5b16f9f2c5acc47e atom/browser/browser.h
-@@ -10,7 +10,10 @@
- 
- #include "atom/browser/browser_observer.h"
- #include "atom/browser/window_list_observer.h"
-+<<<<<<< .our
- #include "atom/common/promise_util.h"
-+=======
-+>>>>>>> .their
- #include "base/compiler_specific.h"
- #include "base/macros.h"
- #include "base/observer_list.h"
-@@ -191,10 +194,13 @@
-     base::string16 description;
-     base::FilePath icon_path;
-     int icon_index;
-+<<<<<<< .our
- 
-     UserTask();
-     UserTask(const UserTask&);
-     ~UserTask();
-+=======
-+>>>>>>> .their
-   };
- 
-   // Add a custom task to jump list.
-@@ -245,7 +251,10 @@
-   bool is_shutting_down() const { return is_shutdown_; }
-   bool is_quiting() const { return is_quiting_; }
-   bool is_ready() const { return is_ready_; }
-+<<<<<<< .our
-   util::Promise* WhenReady(v8::Isolate* isolate);
-+=======
-+>>>>>>> .their
- 
-  protected:
-   // Returns the version of application bundle or executable file.
-@@ -281,8 +290,11 @@
- 
-   int badge_count_ = 0;
- 
-+<<<<<<< .our
-   util::Promise* ready_promise_ = nullptr;
- 
-+=======
-+>>>>>>> .their
- #if defined(OS_MACOSX)
-   base::DictionaryValue about_panel_options_;
- #endif
-added in both
-  our    100644 27e347eccebf006336d5d110c81717ecc45af9c3 atom/browser/browser_mac.mm
-  their  100644 19b27416a16dfedbe960ee42d6e6a98ca197a6cb atom/browser/browser_mac.mm
-@@ -336,9 +336,16 @@
-   for (base::DictionaryValue::Iterator iter(options); !iter.IsAtEnd();
-        iter.Advance()) {
-     std::string key = iter.key();
-+<<<<<<< .our
-     if (!key.empty() && iter.value().is_string()) {
-       key[0] = base::ToUpperASCII(key[0]);
-       about_panel_options_.SetString(key, iter.value().GetString());
-+=======
-+    std::string value;
-+    if (!key.empty() && iter.value().GetAsString(&value)) {
-+      key[0] = base::ToUpperASCII(key[0]);
-+      about_panel_options_.SetString(key, value);
-+>>>>>>> .their
-     }
-   }
- }
-added in both
-  our    100644 fc3b9f330a4958b0b1e30d41c2bebe091b135856 atom/browser/browser_win.cc
-  their  100644 d109129afbb40471006560d895d94aa7e9a0e288 atom/browser/browser_win.cc
-@@ -84,10 +84,13 @@
- 
- }  // namespace
- 
-+<<<<<<< .our
- Browser::UserTask::UserTask() = default;
- Browser::UserTask::UserTask(const UserTask&) = default;
- Browser::UserTask::~UserTask() = default;
- 
-+=======
-+>>>>>>> .their
- void Browser::Focus() {
-   // On Windows we just focus on the first window found for this process.
-   DWORD pid = GetCurrentProcessId();
-added in both
-  our    100644 4ff2bcfcabfd34d8563f9ed213c03655a99dd9c6 atom/browser/native_window.cc
-  their  100644 4048e2a32b251859efccb22d8fc03d8a6d22d672 atom/browser/native_window.cc
-@@ -355,10 +355,13 @@
-   return true;
- }
- 
-+<<<<<<< .our
- bool NativeWindow::SetWindowButtonVisibility(bool visible) {
-   return false;
- }
- 
-+=======
-+>>>>>>> .their
- double NativeWindow::GetAspectRatio() {
-   return aspect_ratio_;
- }
-@@ -458,12 +461,15 @@
-     observer.OnWindowRestore();
- }
- 
-+<<<<<<< .our
- void NativeWindow::NotifyWindowWillResize(const gfx::Rect& new_bounds,
-                                           bool* prevent_default) {
-   for (NativeWindowObserver& observer : observers_)
-     observer.OnWindowWillResize(new_bounds, prevent_default);
- }
- 
-+=======
-+>>>>>>> .their
- void NativeWindow::NotifyWindowResize() {
-   for (NativeWindowObserver& observer : observers_)
-     observer.OnWindowResize();
-added in both
-  our    100644 35b67e2dd230692c415a32aae5f0a5e99ab74ac0 atom/browser/native_window.h
-  their  100644 759d7cb202101710855c3fabada43c976c8543df atom/browser/native_window.h
-@@ -187,9 +187,12 @@
-   virtual void ToggleTabBar();
-   virtual bool AddTabbedWindow(NativeWindow* window);
- 
-+<<<<<<< .our
-   // Returns false if unsupported.
-   virtual bool SetWindowButtonVisibility(bool visible);
- 
-+=======
-+>>>>>>> .their
-   // Toggle the menu bar.
-   virtual void SetAutoHideMenuBar(bool auto_hide);
-   virtual bool IsMenuBarAutoHide();
-@@ -236,8 +239,11 @@
-   void NotifyWindowMinimize();
-   void NotifyWindowRestore();
-   void NotifyWindowMove();
-+<<<<<<< .our
-   void NotifyWindowWillResize(const gfx::Rect& new_bounds,
-                               bool* prevent_default);
-+=======
-+>>>>>>> .their
-   void NotifyWindowResize();
-   void NotifyWindowMoved();
-   void NotifyWindowScrollTouchBegin();
-added in both
-  our    100644 44a78198f44cdba9875e3fb27c8e2c87eaa6f33b atom/browser/native_window_mac.h
-  their  100644 54891c5b35af7a88c842e95b9b72a2f2be363681 atom/browser/native_window_mac.h
-@@ -119,8 +119,11 @@
-   void ToggleTabBar() override;
-   bool AddTabbedWindow(NativeWindow* window) override;
- 
-+<<<<<<< .our
-   bool SetWindowButtonVisibility(bool visible) override;
- 
-+=======
-+>>>>>>> .their
-   void SetVibrancy(const std::string& type) override;
-   void SetTouchBar(
-       const std::vector<mate::PersistentDictionary>& items) override;
-@@ -195,10 +198,13 @@
-   // The "titleBarStyle" option.
-   TitleBarStyle title_bar_style_ = NORMAL;
- 
-+<<<<<<< .our
-   // The visibility mode of window button controls when explicitly set through
-   // setWindowButtonVisibility().
-   base::Optional<bool> window_button_visibility_;
- 
-+=======
-+>>>>>>> .their
-   // Simple (pre-Lion) Fullscreen Settings
-   bool always_simple_fullscreen_ = false;
-   bool is_simple_fullscreen_ = false;
-added in both
-  our    100644 004263ec127709067e903ffbf31003b8844226b4 atom/browser/native_window_mac.mm
-  their  100644 2d8149668e5988c2f26c39678a57a9780ca150c6 atom/browser/native_window_mac.mm
-@@ -884,9 +884,14 @@
-       // Resize the window to accomodate the _entire_ screen size
-       fullscreenFrame.size.height -=
-           [[[NSApplication sharedApplication] mainMenu] menuBarHeight];
-+<<<<<<< .our
-     } else if (!window_button_visibility_.has_value()) {
-       // Lets keep previous behaviour - hide window controls in titled
-       // fullscreen mode when not specified otherwise.
-+=======
-+    } else {
-+      // No need to hide the title, but we should still hide the window buttons
-+>>>>>>> .their
-       [[window standardWindowButton:NSWindowZoomButton] setHidden:YES];
-       [[window standardWindowButton:NSWindowMiniaturizeButton] setHidden:YES];
-       [[window standardWindowButton:NSWindowCloseButton] setHidden:YES];
-@@ -905,6 +910,7 @@
-     if (!fullscreen_window_title()) {
-       // Restore the titlebar
-       SetStyleMask(true, NSTitledWindowMask);
-+<<<<<<< .our
-     }
- 
-     // Restore window controls visibility state
-@@ -916,6 +922,15 @@
-     [[window standardWindowButton:NSWindowCloseButton]
-         setHidden:window_button_hidden];
- 
-+=======
-+    } else {
-+      // Show the window buttons
-+      [[window standardWindowButton:NSWindowZoomButton] setHidden:NO];
-+      [[window standardWindowButton:NSWindowMiniaturizeButton] setHidden:NO];
-+      [[window standardWindowButton:NSWindowCloseButton] setHidden:NO];
-+    }
-+
-+>>>>>>> .their
-     [window setFrame:original_frame_ display:YES animate:YES];
- 
-     [NSApp setPresentationOptions:simple_fullscreen_options_];
-@@ -1153,6 +1168,7 @@
-   return true;
- }
- 
-+<<<<<<< .our
- bool NativeWindowMac::SetWindowButtonVisibility(bool visible) {
-   if (title_bar_style_ == CUSTOM_BUTTONS_ON_HOVER) {
-     return false;
-@@ -1166,6 +1182,8 @@
-   return true;
- }
- 
-+=======
-+>>>>>>> .their
- void NativeWindowMac::SetVibrancy(const std::string& type) {
-   if (@available(macOS 10.10, *)) {
-     NSView* vibrant_view = [window_ vibrantView];
-added in both
-  our    100644 c2a86ea6b65cd6091fa7e8018bed0b11c7390f23 atom/browser/native_window_observer.h
-  their  100644 33e9eb643254c9066bfafbae993d2f98c624a5f3 atom/browser/native_window_observer.h
-@@ -16,10 +16,13 @@
- #include <windows.h>
- #endif
- 
-+<<<<<<< .our
- namespace gfx {
- class Rect;
- }
- 
-+=======
-+>>>>>>> .their
- namespace atom {
- 
- class NativeWindowObserver {
-@@ -67,8 +70,11 @@
-   virtual void OnWindowUnmaximize() {}
-   virtual void OnWindowMinimize() {}
-   virtual void OnWindowRestore() {}
-+<<<<<<< .our
-   virtual void OnWindowWillResize(const gfx::Rect& new_bounds,
-                                   bool* prevent_default) {}
-+=======
-+>>>>>>> .their
-   virtual void OnWindowResize() {}
-   virtual void OnWindowMove() {}
-   virtual void OnWindowMoved() {}
-added in both
-  our    100644 0e61d18b915924eb3d3d14e40d1cbbd199631bed atom/browser/native_window_views_win.cc
-  their  100644 c9802b2e0a83680a2df01e18cd2674e4d114f2af atom/browser/native_window_views_win.cc
-@@ -164,7 +164,11 @@
- 
-       const DWORD obj_id = static_cast<DWORD>(l_param);
- 
-+<<<<<<< .our
-       if (obj_id != static_cast<DWORD>(OBJID_CLIENT)) {
-+=======
-+      if (obj_id != OBJID_CLIENT) {
-+>>>>>>> .their
-         return false;
-       }
- 
-@@ -174,7 +178,11 @@
- 
-       checked_for_a11y_support_ = true;
- 
-+<<<<<<< .our
-       auto* const axState = content::BrowserAccessibilityState::GetInstance();
-+=======
-+      const auto axState = content::BrowserAccessibilityState::GetInstance();
-+>>>>>>> .their
-       if (axState && !axState->IsAccessibleBrowser()) {
-         axState->OnScreenReaderDetected();
-         Browser::Get()->OnAccessibilitySupportChanged();
-@@ -187,6 +195,7 @@
-       if (HIWORD(w_param) == THBN_CLICKED)
-         return taskbar_host_.HandleThumbarButtonEvent(LOWORD(w_param));
-       return false;
-+<<<<<<< .our
-     case WM_SIZING: {
-       bool prevent_default = false;
-       NotifyWindowWillResize(gfx::Rect(*reinterpret_cast<RECT*>(l_param)),
-@@ -197,6 +206,8 @@
-       }
-       return false;
-     }
-+=======
-+>>>>>>> .their
-     case WM_SIZE: {
-       // Handle window state change.
-       HandleSizeEvent(w_param, l_param);
-@@ -208,8 +219,12 @@
-     }
-     case WM_MOVING: {
-       if (!movable_)
-+<<<<<<< .our
-         ::GetWindowRect(GetAcceleratedWidget(),
-                         reinterpret_cast<RECT*>(l_param));
-+=======
-+        ::GetWindowRect(GetAcceleratedWidget(), (LPRECT)l_param);
-+>>>>>>> .their
-       return false;
-     }
-     case WM_MOVE: {
-@@ -289,8 +304,11 @@
-               NotifyWindowRestore();
-             }
-             break;
-+<<<<<<< .our
-           default:
-             break;
-+=======
-+>>>>>>> .their
-         }
-       }
-       break;
-@@ -363,7 +381,11 @@
-   // the cursor since they are in a state where they would otherwise ignore all
-   // mouse input.
-   if (w_param == WM_MOUSEMOVE) {
-+<<<<<<< .our
-     for (auto* window : forwarding_windows_) {
-+=======
-+    for (auto window : forwarding_windows_) {
-+>>>>>>> .their
-       // At first I considered enumerating windows to check whether the cursor
-       // was directly above the window, but since nothing bad seems to happen
-       // if we post the message even if some other window occludes it I have
-added in both
-  our    100644 e71ea74317b69f31a5aac8e723902748972fed8f atom/browser/net/atom_network_delegate.cc
-  their  100644 ca0a3ddeba5fe980a792a27e16ab3f22214abd4d atom/browser/net/atom_network_delegate.cc
-@@ -128,7 +128,11 @@
-   std::string key;
-   std::string value;
-   while (headers->EnumerateHeaderLines(&iter, &key, &value)) {
-+<<<<<<< .our
-     if (dict->FindKey(key)) {
-+=======
-+    if (dict->HasKey(key)) {
-+>>>>>>> .their
-       base::ListValue* values = nullptr;
-       if (dict->GetList(key, &values))
-         values->AppendString(value);
-@@ -189,10 +193,16 @@
-     headers->Clear();
-     for (base::DictionaryValue::Iterator it(*dict); !it.IsAtEnd();
-          it.Advance()) {
-+<<<<<<< .our
-       if (it.value().is_string()) {
-         std::string value = it.value().GetString();
-         headers->SetHeader(it.key(), value);
-       }
-+=======
-+      std::string value;
-+      if (it.value().GetAsString(&value))
-+        headers->SetHeader(it.key(), value);
-+>>>>>>> .their
-     }
-   }
- }
-@@ -542,8 +552,12 @@
-     uint64_t id,
-     T out,
-     const base::DictionaryValue& response) {
-+<<<<<<< .our
-   auto copy = base::DictionaryValue::From(
-       base::Value::ToUniquePtrValue(response.Clone()));
-+=======
-+  std::unique_ptr<base::DictionaryValue> copy = response.CreateDeepCopy();
-+>>>>>>> .their
-   BrowserThread::PostTask(
-       BrowserThread::IO, FROM_HERE,
-       base::BindOnce(&AtomNetworkDelegate::OnListenerResultInIO<T>,
-added in both
-  our    100644 5ffbfd65a48b4459b2ebca66a5c2259f18ed80a8 atom/browser/net/atom_url_request.cc
-  their  100644 94d7f4a3b1a77426b6e797999abdb7a631812684 atom/browser/net/atom_url_request.cc
-@@ -501,6 +501,7 @@
-     delegate_->OnError(error, isRequestError);
- }
- 
-+<<<<<<< .our
- void AtomURLRequest::GetUploadProgress(mate::Dictionary* progress) const {
-   net::UploadProgress upload_progress;
-   if (request_) {
-@@ -513,4 +514,6 @@
-   progress->Set("total", upload_progress.size());
- }
- 
-+=======
-+>>>>>>> .their
- }  // namespace atom
-added in both
-  our    100644 fde7b161385fb431b2d807012a00679a4bdb507a atom/browser/net/atom_url_request.h
-  their  100644 2b03ad7bc37ce6cfec1ff79ce183d37adf90749b atom/browser/net/atom_url_request.h
-@@ -43,7 +43,10 @@
-   void PassLoginInformation(const base::string16& username,
-                             const base::string16& password) const;
-   void SetLoadFlags(int flags) const;
-+<<<<<<< .our
-   void GetUploadProgress(mate::Dictionary* progress) const;
-+=======
-+>>>>>>> .their
- 
-  protected:
-   // Overrides of net::URLRequest::Delegate
-added in both
-  our    100644 59e3ab881c2355c2ed29b806de59ef372c170b62 atom/browser/net/js_asker.cc
-  their  100644 daf978082f102937d142dcddbdd860c92c709dbe atom/browser/net/js_asker.cc
-@@ -62,8 +62,13 @@
-     if (dict->GetInteger("error", error))
-       return true;
-   } else if (value->is_int()) {
-+<<<<<<< .our
-     *error = value->GetInt();
-     return true;
-+=======
-+    if (value->GetAsInteger(error))
-+      return true;
-+>>>>>>> .their
-   }
-   return false;
- }
-added in both
-  our    100644 1c15fd39b9d479b441b0931564f9e2c3f9de37c7 atom/browser/net/url_request_async_asar_job.cc
-  their  100644 06959032411d27e69ec441577b7a1987a2117080 atom/browser/net/url_request_async_asar_job.cc
-@@ -7,7 +7,10 @@
- #include <string>
- 
- #include "atom/common/atom_constants.h"
-+<<<<<<< .our
- #include "base/strings/utf_string_conversions.h"
-+=======
-+>>>>>>> .their
- #include "base/task_scheduler/post_task.h"
- 
- namespace atom {
-@@ -18,6 +21,7 @@
-     : JsAsker<asar::URLRequestAsarJob>(request, network_delegate) {}
- 
- void URLRequestAsyncAsarJob::StartAsync(std::unique_ptr<base::Value> options) {
-+<<<<<<< .our
-   std::string file_path;
-   if (options->is_dict()) {
-     auto* path_value =
-@@ -26,6 +30,14 @@
-       file_path = path_value->GetString();
-   } else if (options->is_string()) {
-     file_path = options->GetString();
-+=======
-+  base::FilePath::StringType file_path;
-+  if (options->is_dict()) {
-+    static_cast<base::DictionaryValue*>(options.get())
-+        ->GetString("path", &file_path);
-+  } else if (options->is_string()) {
-+    options->GetAsString(&file_path);
-+>>>>>>> .their
-   }
- 
-   if (file_path.empty()) {
-@@ -36,11 +48,15 @@
-         base::CreateSequencedTaskRunnerWithTraits(
-             {base::MayBlock(), base::TaskPriority::USER_VISIBLE,
-              base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN}),
-+<<<<<<< .our
- #if defined(OS_WIN)
-         base::FilePath(base::UTF8ToWide(file_path)));
- #else
-         base::FilePath(file_path));
- #endif
-+=======
-+        base::FilePath(file_path));
-+>>>>>>> .their
-     asar::URLRequestAsarJob::Start();
-   }
- }
-added in both
-  our    100644 31381ff118665f10a53e13fbe0044046738ca230 atom/browser/net/url_request_string_job.cc
-  their  100644 453dd0bb6615880d75f73294d22e67ec9975b7c3 atom/browser/net/url_request_string_job.cc
-@@ -25,7 +25,11 @@
-     dict->GetString("charset", &charset_);
-     dict->GetString("data", &data_);
-   } else if (options->is_string()) {
-+<<<<<<< .our
-     data_ = options->GetString();
-+=======
-+    options->GetAsString(&data_);
-+>>>>>>> .their
-   }
-   net::URLRequestSimpleJob::Start();
- }
-added in both
-  our    100644 ae60f3c21ca91f7065da3eb0926ee62a27cb5e97 atom/browser/render_process_preferences.cc
-  their  100644 1d11181776616d20bbd3c349559423b76d08aa7e atom/browser/render_process_preferences.cc
-@@ -21,8 +21,12 @@
- 
- int RenderProcessPreferences::AddEntry(const base::DictionaryValue& entry) {
-   int id = ++next_id_;
-+<<<<<<< .our
-   entries_[id] =
-       base::DictionaryValue::From(base::Value::ToUniquePtrValue(entry.Clone()));
-+=======
-+  entries_[id] = entry.CreateDeepCopy();
-+>>>>>>> .their
-   cache_needs_update_ = true;
-   return id;
- }
-added in both
-  our    100644 9094f0f7335edf833d51f688851e6a105de60433 atom/browser/resources/mac/Info.plist
-  their  100644 70a794e41b94870bf45efa8f692d25f8c43998cd atom/browser/resources/mac/Info.plist
-@@ -17,9 +17,15 @@
-   <key>CFBundleIconFile</key>
-   <string>electron.icns</string>
-   <key>CFBundleVersion</key>
-+<<<<<<< .our
-   <string>4.0.0</string>
-   <key>CFBundleShortVersionString</key>
-   <string>4.0.0</string>
-+=======
-+  <string>3.0.0</string>
-+  <key>CFBundleShortVersionString</key>
-+  <string>3.0.0</string>
-+>>>>>>> .their
-   <key>LSApplicationCategoryType</key>
-   <string>public.app-category.developer-tools</string>
-   <key>LSMinimumSystemVersion</key>
-added in both
-  our    100644 c0bd831e8bddf10180f75cd40694831e2e98622d atom/browser/resources/win/atom.rc
-  their  100644 9d70adbd54c5d2b90a2d03384534816cb23ec725 atom/browser/resources/win/atom.rc
-@@ -1,6 +1,10 @@
- // Microsoft Visual C++ generated resource script.
- //
-+<<<<<<< .our
- #include "ui\\resources\\grit\\ui_unscaled_resources.h"
-+=======
-+#include "grit\\ui_unscaled_resources.h"
-+>>>>>>> .their
- #include "resource.h"
- #include <winresrc.h>
- #ifdef IDC_STATIC
-@@ -56,8 +60,13 @@
- //
- 
- VS_VERSION_INFO VERSIONINFO
-+<<<<<<< .our
-  FILEVERSION 4,0,0,20180821
-  PRODUCTVERSION 4,0,0,20180821
-+=======
-+ FILEVERSION 3,0,0,7
-+ PRODUCTVERSION 3,0,0,7
-+>>>>>>> .their
-  FILEFLAGSMASK 0x3fL
- #ifdef _DEBUG
-  FILEFLAGS 0x1L
-@@ -74,12 +83,20 @@
-         BEGIN
-             VALUE "CompanyName", "GitHub, Inc."
-             VALUE "FileDescription", "Electron"
-+<<<<<<< .our
-             VALUE "FileVersion", "4.0.0"
-+=======
-+            VALUE "FileVersion", "3.0.0"
-+>>>>>>> .their
-             VALUE "InternalName", "electron.exe"
-             VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
-             VALUE "OriginalFilename", "electron.exe"
-             VALUE "ProductName", "Electron"
-+<<<<<<< .our
-             VALUE "ProductVersion", "4.0.0"
-+=======
-+            VALUE "ProductVersion", "3.0.0"
-+>>>>>>> .their
-             VALUE "SquirrelAwareVersion", "1"
-         END
-     END
-added in both
-  our    100644 f3dc0e0cc6ae044daf9cc499061db98f387d7dea atom/browser/ui/certificate_trust_win.cc
-  their  100644 6179b08607041c38996d7faef8f7f456e42e4ac4 atom/browser/ui/certificate_trust_win.cc
-@@ -20,8 +20,13 @@
- // This requires prompting the user to confirm they trust the certificate.
- BOOL AddToTrustedRootStore(const PCCERT_CONTEXT cert_context,
-                            const scoped_refptr<net::X509Certificate>& cert) {
-+<<<<<<< .our
-   auto* root_cert_store = CertOpenStore(
-       CERT_STORE_PROV_SYSTEM, 0, NULL, CERT_SYSTEM_STORE_CURRENT_USER, L"Root");
-+=======
-+  auto root_cert_store = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, NULL,
-+                                       CERT_SYSTEM_STORE_CURRENT_USER, L"Root");
-+>>>>>>> .their
- 
-   if (root_cert_store == NULL) {
-     return false;
-@@ -32,7 +37,11 @@
- 
-   if (result) {
-     // force Chromium to reload it's database for this certificate
-+<<<<<<< .our
-     auto* cert_db = net::CertDatabase::GetInstance();
-+=======
-+    auto cert_db = net::CertDatabase::GetInstance();
-+>>>>>>> .their
-     cert_db->NotifyObserversCertDBChanged();
-   }
- 
-added in both
-  our    100644 aaaf933e106080002d198ad6c15e637043609618 atom/browser/ui/cocoa/atom_ns_window.mm
-  their  100644 56ed5dc2319ccc62ad26919460a416a8c1ccc047 atom/browser/ui/cocoa/atom_ns_window.mm
-@@ -173,12 +173,20 @@
-       buttonFrame.origin.x += NSWidth(
-           [[self standardWindowButton:NSWindowMiniaturizeButton] frame]);
-       buttonFrame.origin.x += windowButtonsInterButtonSpacing_;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+      // fallthrough
-+>>>>>>> .their
-     case NSWindowMiniaturizeButton:
-       buttonFrame.origin.x +=
-           NSWidth([[self standardWindowButton:NSWindowCloseButton] frame]);
-       buttonFrame.origin.x += windowButtonsInterButtonSpacing_;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+      // fallthrough
-+>>>>>>> .their
-     default:
-       break;
-   }
-added in both
-  our    100644 c58da546dc8dab14b6f32e284727342bc8096d0c atom/browser/ui/cocoa/atom_ns_window_delegate.mm
-  their  100644 78bfe1fcd7b523290c190bdbe9b04ae250a6af1b atom/browser/ui/cocoa/atom_ns_window_delegate.mm
-@@ -112,6 +112,7 @@
-                extraHeightPlusFrame);
-   }
- 
-+<<<<<<< .our
-   {
-     bool prevent_default = false;
-     gfx::Rect new_bounds(gfx::Point(sender.frame.origin), gfx::Size(newSize));
-@@ -121,6 +122,8 @@
-     }
-   }
- 
-+=======
-+>>>>>>> .their
-   return newSize;
- }
- 
-added in both
-  our    100644 becc1806610ae54c005b3e8aef17a9ef19d730bf atom/browser/ui/file_dialog.h
-  their  100644 efa50062bb8284149a893c9bff174ed1cdb10ced atom/browser/ui/file_dialog.h
-@@ -66,7 +66,10 @@
-   bool security_scoped_bookmarks = false;
- 
-   DialogSettings();
-+<<<<<<< .our
-   DialogSettings(const DialogSettings&);
-+=======
-+>>>>>>> .their
-   ~DialogSettings();
- };
- 
-added in both
-  our    100644 dab125ec881bc75ff608dbbfddff972169049e54 atom/browser/ui/file_dialog_win.cc
-  their  100644 2d708086bfdf28bd31dd735360e36ed6222a6a16 atom/browser/ui/file_dialog_win.cc
-@@ -6,10 +6,16 @@
- 
- #include <windows.h>  // windows.h must be included first
- 
-+<<<<<<< .our
- #include <atlbase.h>  // atlbase.h for CComPtr
- 
- #include <shlobj.h>
- #include <shobjidl.h>
-+=======
-+#include <atlbase.h>
-+#include <commdlg.h>
-+#include <shlobj.h>
-+>>>>>>> .their
- 
- #include "atom/browser/native_window_views.h"
- #include "atom/browser/unresponsive_suppressor.h"
-@@ -21,11 +27,19 @@
- #include "base/threading/thread.h"
- #include "base/threading/thread_task_runner_handle.h"
- #include "base/win/registry.h"
-+<<<<<<< .our
-+=======
-+#include "third_party/wtl/include/atlapp.h"
-+#include "third_party/wtl/include/atldlgs.h"
-+>>>>>>> .their
- 
- namespace file_dialog {
- 
- DialogSettings::DialogSettings() = default;
-+<<<<<<< .our
- DialogSettings::DialogSettings(const DialogSettings&) = default;
-+=======
-+>>>>>>> .their
- DialogSettings::~DialogSettings() = default;
- 
- namespace {
-@@ -64,6 +78,90 @@
-   }
- }
- 
-+<<<<<<< .our
-+=======
-+// Generic class to delegate common open/save dialog's behaviours, users need to
-+// call interface methods via GetPtr().
-+template <typename T>
-+class FileDialog {
-+ public:
-+  FileDialog(const DialogSettings& settings, int options) {
-+    std::wstring file_part;
-+    if (!IsDirectory(settings.default_path))
-+      file_part = settings.default_path.BaseName().value();
-+
-+    std::vector<std::wstring> buffer;
-+    std::vector<COMDLG_FILTERSPEC> filterspec;
-+    ConvertFilters(settings.filters, &buffer, &filterspec);
-+
-+    dialog_.reset(new T(file_part.c_str(), options, NULL, filterspec.data(),
-+                        filterspec.size()));
-+
-+    if (!settings.title.empty())
-+      GetPtr()->SetTitle(base::UTF8ToUTF16(settings.title).c_str());
-+
-+    if (!settings.button_label.empty())
-+      GetPtr()->SetOkButtonLabel(
-+          base::UTF8ToUTF16(settings.button_label).c_str());
-+
-+    // By default, *.* will be added to the file name if file type is "*.*". In
-+    // Electron, we disable it to make a better experience.
-+    //
-+    // From MSDN: https://msdn.microsoft.com/en-us/library/windows/desktop/
-+    // bb775970(v=vs.85).aspx
-+    //
-+    // If SetDefaultExtension is not called, the dialog will not update
-+    // automatically when user choose a new file type in the file dialog.
-+    //
-+    // We set file extension to the first none-wildcard extension to make
-+    // sure the dialog will update file extension automatically.
-+    for (size_t i = 0; i < filterspec.size(); ++i) {
-+      if (std::wstring(filterspec[i].pszSpec) != L"*.*") {
-+        // SetFileTypeIndex is regarded as one-based index.
-+        GetPtr()->SetFileTypeIndex(i + 1);
-+        GetPtr()->SetDefaultExtension(filterspec[i].pszSpec);
-+        break;
-+      }
-+    }
-+
-+    if (settings.default_path.IsAbsolute()) {
-+      SetDefaultFolder(settings.default_path);
-+    }
-+  }
-+
-+  bool Show(atom::NativeWindow* parent_window) {
-+    atom::UnresponsiveSuppressor suppressor;
-+    HWND window = parent_window
-+                      ? static_cast<atom::NativeWindowViews*>(parent_window)
-+                            ->GetAcceleratedWidget()
-+                      : NULL;
-+    return dialog_->DoModal(window) == IDOK;
-+  }
-+
-+  T* GetDialog() { return dialog_.get(); }
-+
-+  IFileDialog* GetPtr() const { return dialog_->GetPtr(); }
-+
-+ private:
-+  // Set up the initial directory for the dialog.
-+  void SetDefaultFolder(const base::FilePath file_path) {
-+    std::wstring directory = IsDirectory(file_path)
-+                                 ? file_path.value()
-+                                 : file_path.DirName().value();
-+
-+    ATL::CComPtr<IShellItem> folder_item;
-+    HRESULT hr = SHCreateItemFromParsingName(directory.c_str(), NULL,
-+                                             IID_PPV_ARGS(&folder_item));
-+    if (SUCCEEDED(hr))
-+      GetPtr()->SetFolder(folder_item);
-+  }
-+
-+  std::unique_ptr<T> dialog_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(FileDialog);
-+};
-+
-+>>>>>>> .their
- struct RunState {
-   base::Thread* dialog_thread;
-   scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner;
-@@ -103,6 +201,7 @@
- 
- }  // namespace
- 
-+<<<<<<< .our
- static HRESULT GetFileNameFromShellItem(IShellItem* pShellItem,
-                                         SIGDN type,
-                                         LPWSTR lpstr,
-@@ -207,6 +306,11 @@
-     return false;
- 
-   DWORD options = FOS_FORCEFILESYSTEM | FOS_FILEMUSTEXIST;
-+=======
-+bool ShowOpenDialog(const DialogSettings& settings,
-+                    std::vector<base::FilePath>* paths) {
-+  int options = FOS_FORCEFILESYSTEM | FOS_FILEMUSTEXIST;
-+>>>>>>> .their
-   if (settings.properties & FILE_DIALOG_OPEN_DIRECTORY)
-     options |= FOS_PICKFOLDERS;
-   if (settings.properties & FILE_DIALOG_MULTI_SELECTIONS)
-@@ -215,6 +319,7 @@
-     options |= FOS_FORCESHOWHIDDEN;
-   if (settings.properties & FILE_DIALOG_PROMPT_TO_CREATE)
-     options |= FOS_CREATEPROMPT;
-+<<<<<<< .our
-   file_open_dialog->SetOptions(options);
- 
-   ApplySettings(file_open_dialog, settings);
-@@ -224,6 +329,16 @@
- 
-   ATL::CComPtr<IShellItemArray> items;
-   hr = file_open_dialog->GetResults(&items);
-+=======
-+
-+  FileDialog<CShellFileOpenDialog> open_dialog(settings, options);
-+  if (!open_dialog.Show(settings.parent_window))
-+    return false;
-+
-+  ATL::CComPtr<IShellItemArray> items;
-+  HRESULT hr =
-+      static_cast<IFileOpenDialog*>(open_dialog.GetPtr())->GetResults(&items);
-+>>>>>>> .their
-   if (FAILED(hr))
-     return false;
- 
-@@ -240,8 +355,13 @@
-       return false;
- 
-     wchar_t file_name[MAX_PATH];
-+<<<<<<< .our
-     hr = GetFileNameFromShellItem(item, SIGDN_FILESYSPATH, file_name, MAX_PATH);
- 
-+=======
-+    hr = CShellFileOpenDialog::GetFileNameFromShellItem(item, SIGDN_FILESYSPATH,
-+                                                        file_name, MAX_PATH);
-+>>>>>>> .their
-     if (FAILED(hr))
-       return false;
- 
-@@ -265,6 +385,7 @@
- }
- 
- bool ShowSaveDialog(const DialogSettings& settings, base::FilePath* path) {
-+<<<<<<< .our
-   ATL::CComPtr<IFileSaveDialog> file_save_dialog;
-   HRESULT hr = file_save_dialog.CoCreateInstance(CLSID_FileSaveDialog);
-   if (FAILED(hr))
-@@ -291,6 +412,19 @@
-   *path = base::FilePath(result_path);
-   CoTaskMemFree(result_path);
- 
-+=======
-+  FileDialog<CShellFileSaveDialog> save_dialog(
-+      settings, FOS_FORCEFILESYSTEM | FOS_PATHMUSTEXIST | FOS_OVERWRITEPROMPT);
-+  if (!save_dialog.Show(settings.parent_window))
-+    return false;
-+
-+  wchar_t buffer[MAX_PATH];
-+  HRESULT hr = save_dialog.GetDialog()->GetFilePath(buffer, MAX_PATH);
-+  if (FAILED(hr))
-+    return false;
-+
-+  *path = base::FilePath(buffer);
-+>>>>>>> .their
-   return true;
- }
- 
-added in both
-  our    100644 b0e73f550e1d3a91f15e8d2d0604518027f75298 atom/browser/ui/message_box_win.cc
-  their  100644 e5a0e61379d0b7f294253e3bf1daa005dccfbfbd atom/browser/ui/message_box_win.cc
-@@ -128,8 +128,11 @@
-       case MESSAGE_BOX_TYPE_ERROR:
-         config.pszMainIcon = TD_ERROR_ICON;
-         break;
-+<<<<<<< .our
-       case MESSAGE_BOX_TYPE_NONE:
-         break;
-+=======
-+>>>>>>> .their
-     }
-   }
- 
-added in both
-  our    100644 e838d3cc217b5ffdb77226beff0d7217539f23f9 atom/browser/ui/views/menu_bar.cc
-  their  100644 535af8f2803187d737e1f5e42507d95b9b7272c2 atom/browser/ui/views/menu_bar.cc
-@@ -29,8 +29,13 @@
-     : background_color_(kDefaultColor), window_(window) {
-   RefreshColorCache();
-   UpdateViewColors();
-+<<<<<<< .our
-   SetLayoutManager(
-       std::make_unique<views::BoxLayout>(views::BoxLayout::kHorizontal));
-+=======
-+  SetLayoutManager(std::make_unique<views::BoxLayout>(
-+      views::BoxLayout::kHorizontal));
-+>>>>>>> .their
-   window_->GetFocusManager()->AddFocusChangeListener(this);
- }
- 
-@@ -178,7 +183,11 @@
-   }
- #elif defined(OS_WIN)
-   for (auto* child : GetChildrenInZOrder()) {
-+<<<<<<< .our
-     auto* button = static_cast<SubmenuButton*>(child);
-+=======
-+    auto button = static_cast<SubmenuButton*>(child);
-+>>>>>>> .their
-     button->SetUnderlineColor(color_utils::GetSysSkColor(COLOR_MENUTEXT));
-   }
- #endif
-added in both
-  our    100644 8f2139cb90fab876a1db1b17cac016997a3904ba atom/browser/ui/views/win_frame_view.cc
-  their  100644 91fdb8a966809633d934f97b46861aa4ef4c8120 atom/browser/ui/views/win_frame_view.cc
-@@ -10,7 +10,15 @@
- 
- namespace atom {
- 
-+<<<<<<< .our
- const char WinFrameView::kViewClassName[] = "WinFrameView";
-+=======
-+namespace {
-+
-+const char kViewClassName[] = "WinFrameView";
-+
-+}  // namespace
-+>>>>>>> .their
- 
- WinFrameView::WinFrameView() {}
- 
-added in both
-  our    100644 a6ffd7f363304913bb124908f138258bb804e56f atom/browser/ui/views/win_frame_view.h
-  their  100644 b2c1ef3a15de9a222233a27193ed811a8add09f6 atom/browser/ui/views/win_frame_view.h
-@@ -11,9 +11,14 @@
- 
- class WinFrameView : public FramelessView {
-  public:
-+<<<<<<< .our
-   static const char kViewClassName[];
-   WinFrameView();
-   ~WinFrameView() override;
-+=======
-+  WinFrameView();
-+  virtual ~WinFrameView();
-+>>>>>>> .their
- 
-   // views::NonClientFrameView:
-   gfx::Rect GetWindowBoundsForClientBounds(
-added in both
-  our    100644 39197cdccc994ee96aad07d8f5db01258fcb66a4 atom/browser/ui/webui/pdf_viewer_handler.cc
-  their  100644 4b63c3dc7112a85f594061bb262def495da69582 atom/browser/ui/webui/pdf_viewer_handler.cc
-@@ -112,8 +112,12 @@
-     PopulateStreamInfo(stream_info.get(), stream_, original_url_);
-     ResolveJavascriptCallback(*callback_id, *stream_info);
-   } else {
-+<<<<<<< .our
-     initialize_callback_id_ =
-         base::Value::ToUniquePtrValue(callback_id.Clone());
-+=======
-+    initialize_callback_id_ = callback_id->CreateDeepCopy();
-+>>>>>>> .their
-   }
- 
-   auto zoom_controller =
-added in both
-  our    100644 4a76126214e7ae0063fa379c64aaca6be9f17d20 atom/browser/ui/win/jump_list.cc
-  their  100644 6af235e756c227c0b1d7fed0446e08ee10352800 atom/browser/ui/win/jump_list.cc
-@@ -144,6 +144,7 @@
- 
- namespace atom {
- 
-+<<<<<<< .our
- JumpListItem::JumpListItem() = default;
- JumpListItem::JumpListItem(const JumpListItem&) = default;
- JumpListItem::~JumpListItem() = default;
-@@ -151,12 +152,17 @@
- JumpListCategory::JumpListCategory(const JumpListCategory&) = default;
- JumpListCategory::~JumpListCategory() = default;
- 
-+=======
-+>>>>>>> .their
- JumpList::JumpList(const base::string16& app_id) : app_id_(app_id) {
-   destinations_.CoCreateInstance(CLSID_DestinationList);
- }
- 
-+<<<<<<< .our
- JumpList::~JumpList() = default;
- 
-+=======
-+>>>>>>> .their
- bool JumpList::Begin(int* min_items, std::vector<JumpListItem>* removed_items) {
-   DCHECK(destinations_);
-   if (!destinations_)
-@@ -275,9 +281,15 @@
-         result = JumpListResult::GENERIC_ERROR;
-     }
-   } else {
-+<<<<<<< .our
-     HRESULT hr = destinations_->AppendCategory(category.name.c_str(), items);
-     if (FAILED(hr)) {
-       if (hr == static_cast<HRESULT>(0x80040F03)) {
-+=======
-+    auto hr = destinations_->AppendCategory(category.name.c_str(), items);
-+    if (FAILED(hr)) {
-+      if (hr == 0x80040F03) {
-+>>>>>>> .their
-         LOG(ERROR) << "Failed to append custom category "
-                    << "'" << category.name << "' "
-                    << "to Jump List due to missing file type registration.";
-added in both
-  our    100644 59d9a21a6c31f4d8fa5ebc0261630f3383138e84 atom/browser/ui/win/jump_list.h
-  their  100644 fc4ab085fc0db76b0d392abd5402adf35abe6ba1 atom/browser/ui/win/jump_list.h
-@@ -51,10 +51,13 @@
-   base::string16 description;
-   base::FilePath icon_path;
-   int icon_index = 0;
-+<<<<<<< .our
- 
-   JumpListItem();
-   JumpListItem(const JumpListItem&);
-   ~JumpListItem();
-+=======
-+>>>>>>> .their
- };
- 
- struct JumpListCategory {
-@@ -74,10 +77,13 @@
-   Type type = Type::TASKS;
-   base::string16 name;
-   std::vector<JumpListItem> items;
-+<<<<<<< .our
- 
-   JumpListCategory();
-   JumpListCategory(const JumpListCategory&);
-   ~JumpListCategory();
-+=======
-+>>>>>>> .their
- };
- 
- // Creates or removes a custom Jump List for an app.
-@@ -88,7 +94,10 @@
-   // custom Jump List should be created/removed, it's usually obtained by
-   // calling GetCurrentProcessExplicitAppUserModelID().
-   explicit JumpList(const base::string16& app_id);
-+<<<<<<< .our
-   ~JumpList();
-+=======
-+>>>>>>> .their
- 
-   // Starts a new transaction, must be called before appending any categories,
-   // aborting or committing. After the method returns |min_items| will indicate
-added in both
-  our    100644 bd4c17d2fcee53c7c106b0912252848cd6de0dc7 atom/browser/ui/win/notify_icon.h
-  their  100644 aed548ecb6188ccdfd71b93684a613ee2fe21d1a atom/browser/ui/win/notify_icon.h
-@@ -32,7 +32,11 @@
-  public:
-   // Constructor which provides this icon's unique ID and messaging window.
-   NotifyIcon(NotifyIconHost* host, UINT id, HWND window, UINT message);
-+<<<<<<< .our
-   ~NotifyIcon() override;
-+=======
-+  virtual ~NotifyIcon();
-+>>>>>>> .their
- 
-   // Handles a click event from the user - if |left_button_click| is true and
-   // there is a registered observer, passes the click event to the observer,
-added in both
-  our    100644 c4b92a24aefb3afa3ff2929eea59940d439e8709 atom/browser/ui/win/taskbar_host.cc
-  their  100644 e023fdc8c836899b7a8b9a80d4bc57edb365f3cc atom/browser/ui/win/taskbar_host.cc
-@@ -50,11 +50,14 @@
- 
- }  // namespace
- 
-+<<<<<<< .our
- TaskbarHost::ThumbarButton::ThumbarButton() = default;
- TaskbarHost::ThumbarButton::ThumbarButton(const TaskbarHost::ThumbarButton&) =
-     default;
- TaskbarHost::ThumbarButton::~ThumbarButton() = default;
- 
-+=======
-+>>>>>>> .their
- TaskbarHost::TaskbarHost() {}
- 
- TaskbarHost::~TaskbarHost() {}
-added in both
-  our    100644 2182d377a7736f5e135d2f518c2a0a838cd0d1a0 atom/browser/ui/win/taskbar_host.h
-  their  100644 31199cf22837b604beca1fe92627b53cf6f71e8f atom/browser/ui/win/taskbar_host.h
-@@ -26,10 +26,13 @@
-     gfx::Image icon;
-     std::vector<std::string> flags;
-     base::Closure clicked_callback;
-+<<<<<<< .our
- 
-     ThumbarButton();
-     ThumbarButton(const ThumbarButton&);
-     ~ThumbarButton();
-+=======
-+>>>>>>> .their
-   };
- 
-   TaskbarHost();
-added in both
-  our    100644 c21c93383155091a7481cdd4e741cefad90a4a55 atom/browser/web_contents_preferences.cc
-  their  100644 f2385b974dc7362c37cd7dcd1506bb048e5db5d7 atom/browser/web_contents_preferences.cc
-@@ -15,7 +15,10 @@
- #include "base/command_line.h"
- #include "base/memory/ptr_util.h"
- #include "base/strings/string_number_conversions.h"
-+<<<<<<< .our
- #include "base/strings/utf_string_conversions.h"
-+=======
-+>>>>>>> .their
- #include "cc/base/switches.h"
- #include "content/public/browser/render_frame_host.h"
- #include "content/public/browser/render_process_host.h"
-@@ -30,6 +33,7 @@
- 
- DEFINE_WEB_CONTENTS_USER_DATA_KEY(atom::WebContentsPreferences);
- 
-+<<<<<<< .our
- namespace {
- 
- bool GetAsString(const base::Value* val,
-@@ -75,6 +79,8 @@
- 
- }  // namespace
- 
-+=======
-+>>>>>>> .their
- namespace atom {
- 
- // static
-@@ -91,7 +97,11 @@
-   copied.Delete("isGuest");
-   copied.Delete("session");
- 
-+<<<<<<< .our
-   mate::ConvertFromV8(isolate, copied.GetHandle(), &preference_);
-+=======
-+  mate::ConvertFromV8(isolate, copied.GetHandle(), &dict_);
-+>>>>>>> .their
-   web_contents->SetUserData(UserDataKey(), base::WrapUnique(this));
- 
-   instances_.push_back(this);
-@@ -99,6 +109,10 @@
-   // Set WebPreferences defaults onto the JS object
-   SetDefaultBoolIfUndefined(options::kPlugins, false);
-   SetDefaultBoolIfUndefined(options::kExperimentalFeatures, false);
-+<<<<<<< .our
-+=======
-+  SetDefaultBoolIfUndefined(options::kExperimentalCanvasFeatures, false);
-+>>>>>>> .their
-   bool node = SetDefaultBoolIfUndefined(options::kNodeIntegration, true);
-   SetDefaultBoolIfUndefined(options::kNodeIntegrationInWorker, false);
-   SetDefaultBoolIfUndefined(options::kWebviewTag, node);
-@@ -124,7 +138,11 @@
- #endif
-   SetDefaultBoolIfUndefined(options::kOffscreen, false);
- 
-+<<<<<<< .our
-   last_preference_ = preference_.Clone();
-+=======
-+  last_dict_ = std::move(*dict_.CreateDeepCopy());
-+>>>>>>> .their
- }
- 
- WebContentsPreferences::~WebContentsPreferences() {
-@@ -135,6 +153,7 @@
- bool WebContentsPreferences::SetDefaultBoolIfUndefined(
-     const base::StringPiece& key,
-     bool val) {
-+<<<<<<< .our
-   auto* current_value =
-       preference_.FindKeyOfType(key, base::Value::Type::BOOLEAN);
-   if (current_value) {
-@@ -167,20 +186,47 @@
- bool WebContentsPreferences::GetPreference(const base::StringPiece& name,
-                                            std::string* value) const {
-   return GetAsString(&preference_, name, value);
-+=======
-+  bool existing;
-+  if (!dict_.GetBoolean(key, &existing)) {
-+    dict_.SetBoolean(key, val);
-+    return val;
-+  }
-+  return existing;
-+}
-+
-+bool WebContentsPreferences::IsEnabled(const base::StringPiece& name,
-+                                       bool default_value) {
-+  bool bool_value = default_value;
-+  dict_.GetBoolean(name, &bool_value);
-+  return bool_value;
-+}
-+
-+void WebContentsPreferences::Merge(const base::DictionaryValue& extend) {
-+  dict_.MergeDictionary(&extend);
-+>>>>>>> .their
- }
- 
- bool WebContentsPreferences::GetPreloadPath(
-     base::FilePath::StringType* path) const {
-   DCHECK(path);
-   base::FilePath::StringType preload;
-+<<<<<<< .our
-   if (GetAsString(&preference_, options::kPreloadScript, &preload)) {
-+=======
-+  if (dict_.GetString(options::kPreloadScript, &preload)) {
-+>>>>>>> .their
-     if (base::FilePath(preload).IsAbsolute()) {
-       *path = std::move(preload);
-       return true;
-     } else {
-       LOG(ERROR) << "preload script must have absolute path.";
-     }
-+<<<<<<< .our
-   } else if (GetAsString(&preference_, options::kPreloadURL, &preload)) {
-+=======
-+  } else if (dict_.GetString(options::kPreloadURL, &preload)) {
-+>>>>>>> .their
-     // Translate to file path if there is "preload-url" option.
-     base::FilePath preload_path;
-     if (net::FileURLToFilePath(GURL(preload), &preload_path)) {
-@@ -214,6 +260,7 @@
- 
- void WebContentsPreferences::AppendCommandLineSwitches(
-     base::CommandLine* command_line) {
-+<<<<<<< .our
-   // Check if plugins are enabled.
-   if (IsEnabled(options::kPlugins))
-     command_line->AppendSwitch(switches::kEnablePlugins);
-@@ -230,17 +277,45 @@
- 
-   // Whether to enable node integration in Worker.
-   if (IsEnabled(options::kNodeIntegrationInWorker))
-+=======
-+  bool b;
-+  // Check if plugins are enabled.
-+  if (dict_.GetBoolean(options::kPlugins, &b) && b)
-+    command_line->AppendSwitch(switches::kEnablePlugins);
-+
-+  // Experimental flags.
-+  if (dict_.GetBoolean(options::kExperimentalFeatures, &b) && b)
-+    command_line->AppendSwitch(
-+        ::switches::kEnableExperimentalWebPlatformFeatures);
-+  if (dict_.GetBoolean(options::kExperimentalCanvasFeatures, &b) && b)
-+    command_line->AppendSwitch(::switches::kEnableExperimentalCanvasFeatures);
-+
-+  // Check if we have node integration specified.
-+  bool node_integration = true;
-+  dict_.GetBoolean(options::kNodeIntegration, &node_integration);
-+  command_line->AppendSwitchASCII(switches::kNodeIntegration,
-+                                  node_integration ? "true" : "false");
-+
-+  // Whether to enable node integration in Worker.
-+  if (dict_.GetBoolean(options::kNodeIntegrationInWorker, &b) && b)
-+>>>>>>> .their
-     command_line->AppendSwitch(switches::kNodeIntegrationInWorker);
- 
-   // Check if webview tag creation is enabled, default to nodeIntegration value.
-   // TODO(kevinsawicki): Default to false in 2.0
-+<<<<<<< .our
-   bool webview_tag = IsEnabled(options::kWebviewTag, enable_node_integration);
-+=======
-+  bool webview_tag = node_integration;
-+  dict_.GetBoolean(options::kWebviewTag, &webview_tag);
-+>>>>>>> .their
-   command_line->AppendSwitchASCII(switches::kWebviewTag,
-                                   webview_tag ? "true" : "false");
- 
-   // If the `sandbox` option was passed to the BrowserWindow's webPreferences,
-   // pass `--enable-sandbox` to the renderer so it won't have any node.js
-   // integration.
-+<<<<<<< .our
-   if (IsEnabled(options::kSandbox))
-     command_line->AppendSwitch(switches::kEnableSandbox);
-   else if (!command_line->HasSwitch(switches::kEnableSandbox))
-@@ -248,6 +323,13 @@
- 
-   // Check if nativeWindowOpen is enabled.
-   if (IsEnabled(options::kNativeWindowOpen))
-+=======
-+  if (dict_.GetBoolean(options::kSandbox, &b) && b)
-+    command_line->AppendSwitch(switches::kEnableSandbox);
-+  else if (!command_line->HasSwitch(switches::kEnableSandbox))
-+    command_line->AppendSwitch(::switches::kNoSandbox);
-+  if (dict_.GetBoolean(options::kNativeWindowOpen, &b) && b)
-+>>>>>>> .their
-     command_line->AppendSwitch(switches::kNativeWindowOpen);
- 
-   // The preload script.
-@@ -256,43 +338,70 @@
-     command_line->AppendSwitchNative(switches::kPreloadScript, preload);
- 
-   // Custom args for renderer process
-+<<<<<<< .our
-   auto* customArgs =
-       preference_.FindKeyOfType(options::kCustomArgs, base::Value::Type::LIST);
-   if (customArgs) {
-     for (const auto& customArg : customArgs->GetList()) {
-+=======
-+  base::Value* customArgs;
-+  if (dict_.Get(options::kCustomArgs, &customArgs) && customArgs->is_list()) {
-+    for (const base::Value& customArg : customArgs->GetList()) {
-+>>>>>>> .their
-       if (customArg.is_string())
-         command_line->AppendArg(customArg.GetString());
-     }
-   }
- 
-   // Run Electron APIs and preload script in isolated world
-+<<<<<<< .our
-   if (IsEnabled(options::kContextIsolation))
-+=======
-+  if (dict_.GetBoolean(options::kContextIsolation, &b) && b)
-+>>>>>>> .their
-     command_line->AppendSwitch(switches::kContextIsolation);
- 
-   // --background-color.
-   std::string s;
-+<<<<<<< .our
-   if (GetAsString(&preference_, options::kBackgroundColor, &s))
-+=======
-+  if (dict_.GetString(options::kBackgroundColor, &s))
-+>>>>>>> .their
-     command_line->AppendSwitchASCII(switches::kBackgroundColor, s);
- 
-   // --guest-instance-id, which is used to identify guest WebContents.
-   int guest_instance_id = 0;
-+<<<<<<< .our
-   if (GetAsInteger(&preference_, options::kGuestInstanceID, &guest_instance_id))
-+=======
-+  if (dict_.GetInteger(options::kGuestInstanceID, &guest_instance_id))
-+>>>>>>> .their
-     command_line->AppendSwitchASCII(switches::kGuestInstanceID,
-                                     base::IntToString(guest_instance_id));
- 
-   // Pass the opener's window id.
-   int opener_id;
-+<<<<<<< .our
-   if (GetAsInteger(&preference_, options::kOpenerID, &opener_id))
-+=======
-+  if (dict_.GetInteger(options::kOpenerID, &opener_id))
-+>>>>>>> .their
-     command_line->AppendSwitchASCII(switches::kOpenerID,
-                                     base::IntToString(opener_id));
- 
- #if defined(OS_MACOSX)
-   // Enable scroll bounce.
-+<<<<<<< .our
-   if (IsEnabled(options::kScrollBounce))
-+=======
-+  if (dict_.GetBoolean(options::kScrollBounce, &b) && b)
-+>>>>>>> .their
-     command_line->AppendSwitch(switches::kScrollBounce);
- #endif
- 
-   // Custom command line switches.
-+<<<<<<< .our
-   auto* args =
-       preference_.FindKeyOfType("commandLineSwitches", base::Value::Type::LIST);
-   if (args) {
-@@ -302,15 +411,31 @@
-         if (!arg_val.empty())
-           command_line->AppendSwitch(arg_val);
-       }
-+=======
-+  const base::ListValue* args;
-+  if (dict_.GetList("commandLineSwitches", &args)) {
-+    for (size_t i = 0; i < args->GetSize(); ++i) {
-+      std::string arg;
-+      if (args->GetString(i, &arg) && !arg.empty())
-+        command_line->AppendSwitch(arg);
-+>>>>>>> .their
-     }
-   }
- 
-   // Enable blink features.
-+<<<<<<< .our
-   if (GetAsString(&preference_, options::kEnableBlinkFeatures, &s))
-     command_line->AppendSwitchASCII(::switches::kEnableBlinkFeatures, s);
- 
-   // Disable blink features.
-   if (GetAsString(&preference_, options::kDisableBlinkFeatures, &s))
-+=======
-+  if (dict_.GetString(options::kEnableBlinkFeatures, &s))
-+    command_line->AppendSwitchASCII(::switches::kEnableBlinkFeatures, s);
-+
-+  // Disable blink features.
-+  if (dict_.GetString(options::kDisableBlinkFeatures, &s))
-+>>>>>>> .their
-     command_line->AppendSwitchASCII(::switches::kDisableBlinkFeatures, s);
- 
-   if (guest_instance_id) {
-@@ -337,11 +462,16 @@
-   // We are appending args to a webContents so let's save the current state
-   // of our preferences object so that during the lifetime of the WebContents
-   // we can fetch the options used to initally configure the WebContents
-+<<<<<<< .our
-   last_preference_ = preference_.Clone();
-+=======
-+  last_dict_ = std::move(*dict_.CreateDeepCopy());
-+>>>>>>> .their
- }
- 
- void WebContentsPreferences::OverrideWebkitPrefs(
-     content::WebPreferences* prefs) {
-+<<<<<<< .our
-   prefs->javascript_enabled = IsEnabled("javascript", true /* default_value */);
-   prefs->images_enabled = IsEnabled("images", true /* default_value */);
-   prefs->text_areas_are_resizable =
-@@ -392,4 +522,66 @@
-     prefs->default_encoding = encoding;
- }
- 
-+=======
-+  bool b;
-+  if (dict_.GetBoolean("javascript", &b))
-+    prefs->javascript_enabled = b;
-+  if (dict_.GetBoolean("images", &b))
-+    prefs->images_enabled = b;
-+  if (dict_.GetBoolean("textAreasAreResizable", &b))
-+    prefs->text_areas_are_resizable = b;
-+  if (dict_.GetBoolean("webgl", &b)) {
-+    prefs->webgl1_enabled = b;
-+    prefs->webgl2_enabled = b;
-+  }
-+  if (dict_.GetBoolean(options::kWebSecurity, &b)) {
-+    prefs->web_security_enabled = b;
-+    prefs->allow_running_insecure_content = !b;
-+  }
-+  if (dict_.GetBoolean(options::kAllowRunningInsecureContent, &b))
-+    prefs->allow_running_insecure_content = b;
-+  if (dict_.GetBoolean("navigateOnDragDrop", &b))
-+    prefs->navigate_on_drag_drop = b;
-+  const base::DictionaryValue* fonts = nullptr;
-+  if (dict_.GetDictionary("defaultFontFamily", &fonts)) {
-+    base::string16 font;
-+    if (fonts->GetString("standard", &font))
-+      prefs->standard_font_family_map[content::kCommonScript] = font;
-+    if (fonts->GetString("serif", &font))
-+      prefs->serif_font_family_map[content::kCommonScript] = font;
-+    if (fonts->GetString("sansSerif", &font))
-+      prefs->sans_serif_font_family_map[content::kCommonScript] = font;
-+    if (fonts->GetString("monospace", &font))
-+      prefs->fixed_font_family_map[content::kCommonScript] = font;
-+    if (fonts->GetString("cursive", &font))
-+      prefs->cursive_font_family_map[content::kCommonScript] = font;
-+    if (fonts->GetString("fantasy", &font))
-+      prefs->fantasy_font_family_map[content::kCommonScript] = font;
-+  }
-+  int size;
-+  if (GetInteger("defaultFontSize", &size))
-+    prefs->default_font_size = size;
-+  if (GetInteger("defaultMonospaceFontSize", &size))
-+    prefs->default_fixed_font_size = size;
-+  if (GetInteger("minimumFontSize", &size))
-+    prefs->minimum_font_size = size;
-+  std::string encoding;
-+  if (dict_.GetString("defaultEncoding", &encoding))
-+    prefs->default_encoding = encoding;
-+}
-+
-+bool WebContentsPreferences::GetInteger(const base::StringPiece& attribute_name,
-+                                        int* val) {
-+  // if it is already an integer, no conversion needed
-+  if (dict_.GetInteger(attribute_name, val))
-+    return true;
-+
-+  std::string str;
-+  if (dict_.GetString(attribute_name, &str))
-+    return base::StringToInt(str, val);
-+
-+  return false;
-+}
-+
-+>>>>>>> .their
- }  // namespace atom
-added in both
-  our    100644 d835347afcd259f473f95271a2c19e42afcc6f2b atom/browser/web_contents_preferences.h
-  their  100644 c1a24eff3418bedaeaf131c0e39a0e3bb229129a atom/browser/web_contents_preferences.h
-@@ -37,8 +37,12 @@
-   ~WebContentsPreferences() override;
- 
-   // A simple way to know whether a Boolean property is enabled.
-+<<<<<<< .our
-   bool IsEnabled(const base::StringPiece& name,
-                  bool default_value = false) const;
-+=======
-+  bool IsEnabled(const base::StringPiece& name, bool default_value = false);
-+>>>>>>> .their
- 
-   // $.extend(|web_preferences|, |new_web_preferences|).
-   void Merge(const base::DictionaryValue& new_web_preferences);
-@@ -49,18 +53,27 @@
-   // Modify the WebPreferences according to preferences.
-   void OverrideWebkitPrefs(content::WebPreferences* prefs);
- 
-+<<<<<<< .our
-   // Clear the current WebPreferences.
-   void Clear();
- 
-   // Return true if the particular preference value exists.
-   bool GetPreference(const base::StringPiece& name, std::string* value) const;
- 
-+=======
-+>>>>>>> .their
-   // Returns the preload script path.
-   bool GetPreloadPath(base::FilePath::StringType* path) const;
- 
-   // Returns the web preferences.
-+<<<<<<< .our
-   base::Value* preference() { return &preference_; }
-   base::Value* last_preference() { return &last_preference_; }
-+=======
-+  base::DictionaryValue* dict() { return &dict_; }
-+  const base::DictionaryValue* dict() const { return &dict_; }
-+  base::DictionaryValue* last_dict() { return &last_dict_; }
-+>>>>>>> .their
- 
-  private:
-   friend class content::WebContentsUserData<WebContentsPreferences>;
-@@ -72,12 +85,23 @@
-   // Set preference value to given bool if user did not provide value
-   bool SetDefaultBoolIfUndefined(const base::StringPiece& key, bool val);
- 
-+<<<<<<< .our
-+=======
-+  // Get preferences value as integer possibly coercing it from a string
-+  bool GetInteger(const base::StringPiece& attribute_name, int* val);
-+
-+>>>>>>> .their
-   static std::vector<WebContentsPreferences*> instances_;
- 
-   content::WebContents* web_contents_;
- 
-+<<<<<<< .our
-   base::Value preference_ = base::Value(base::Value::Type::DICTIONARY);
-   base::Value last_preference_ = base::Value(base::Value::Type::DICTIONARY);
-+=======
-+  base::DictionaryValue dict_;
-+  base::DictionaryValue last_dict_;
-+>>>>>>> .their
- 
-   DISALLOW_COPY_AND_ASSIGN(WebContentsPreferences);
- };
-added in both
-  our    100644 74c8573d13f15bcaa189abdc40fa0cd8e48f89be atom/browser/web_dialog_helper.cc
-  their  100644 f39f77a643522bba10cc2f764b0d5daf02f35d42 atom/browser/web_dialog_helper.cc
-@@ -220,7 +220,10 @@
-     switch (params.mode) {
-       case content::FileChooserParams::OpenMultiple:
-         flags |= file_dialog::FILE_DIALOG_MULTI_SELECTIONS;
-+<<<<<<< .our
-         FALLTHROUGH;
-+=======
-+>>>>>>> .their
-       case content::FileChooserParams::Open:
-         flags |= file_dialog::FILE_DIALOG_OPEN_FILE;
-         flags |= file_dialog::FILE_DIALOG_TREAT_PACKAGE_APP_AS_DIRECTORY;
-added in both
-  our    100644 09edfdaac9107386241505d2d5763b1b24aa73a4 atom/common/api/atom_api_native_image.cc
-  their  100644 7b274b38cae7e44b0737912e93a7015c64a60895 atom/common/api/atom_api_native_image.cc
-@@ -245,14 +245,23 @@
- 
-   // First try loading the icon with specified size.
-   if (!hicon_path_.empty()) {
-+<<<<<<< .our
-     hicons_[size] = ReadICOFromPath(size, hicon_path_);
-+=======
-+    hicons_[size] = std::move(ReadICOFromPath(size, hicon_path_));
-+>>>>>>> .their
-     return hicons_[size].get();
-   }
- 
-   // Then convert the image to ICO.
-   if (image_.IsEmpty())
-     return NULL;
-+<<<<<<< .our
-   hicons_[size] = IconUtil::CreateHICONFromSkBitmap(image_.AsBitmap());
-+=======
-+  hicons_[size] =
-+      std::move(IconUtil::CreateHICONFromSkBitmap(image_.AsBitmap()));
-+>>>>>>> .their
-   return hicons_[size].get();
- }
- #endif
-added in both
-  our    100644 3dba3d63673ca8eb02044bd1335a3095f0194971 atom/common/api/atom_bindings.cc
-  their  100644 ee02ed3f6a28bcc15407465ae0cc34f71664d9dc atom/common/api/atom_bindings.cc
-@@ -14,7 +14,10 @@
- #include "atom/common/native_mate_converters/string16_converter.h"
- #include "atom/common/node_includes.h"
- #include "base/logging.h"
-+<<<<<<< .our
- #include "base/process/process_info.h"
-+=======
-+>>>>>>> .their
- #include "base/process/process_metrics_iocounters.h"
- #include "base/sys_info.h"
- #include "native_mate/dictionary.h"
-@@ -56,10 +59,16 @@
-   dict.SetMethod("log", &Log);
-   dict.SetMethod("getHeapStatistics", &GetHeapStatistics);
-   dict.SetMethod("getProcessMemoryInfo", &GetProcessMemoryInfo);
-+<<<<<<< .our
-   dict.SetMethod("getCreationTime", &GetCreationTime);
-   dict.SetMethod("getSystemMemoryInfo", &GetSystemMemoryInfo);
-   dict.SetMethod("getCPUUsage", base::Bind(&AtomBindings::GetCPUUsage,
-                                            base::Unretained(metrics_.get())));
-+=======
-+  dict.SetMethod("getSystemMemoryInfo", &GetSystemMemoryInfo);
-+  dict.SetMethod("getCPUUsage", base::Bind(&AtomBindings::GetCPUUsage,
-+                                           base::Unretained(this)));
-+>>>>>>> .their
-   dict.SetMethod("getIOCounters", &GetIOCounters);
- #if defined(OS_POSIX)
-   dict.SetMethod("setFdLimit", &base::SetFdLimit);
-@@ -135,7 +144,10 @@
-   isolate->GetHeapStatistics(&v8_heap_stats);
- 
-   mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
-+<<<<<<< .our
-   dict.SetHidden("simple", true);
-+=======
-+>>>>>>> .their
-   dict.Set("totalHeapSize",
-            static_cast<double>(v8_heap_stats.total_heap_size() >> 10));
-   dict.Set(
-@@ -164,7 +176,10 @@
-   auto metrics = base::ProcessMetrics::CreateCurrentProcessMetrics();
- 
-   mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
-+<<<<<<< .our
-   dict.SetHidden("simple", true);
-+=======
-+>>>>>>> .their
-   dict.Set("workingSetSize",
-            static_cast<double>(metrics->GetWorkingSetSize() >> 10));
-   dict.Set("peakWorkingSetSize",
-@@ -180,6 +195,7 @@
- }
- 
- // static
-+<<<<<<< .our
- v8::Local<v8::Value> AtomBindings::GetCreationTime(v8::Isolate* isolate) {
-   auto timeValue = base::CurrentProcessInfo::CreationTime();
-   if (timeValue.is_null()) {
-@@ -190,6 +206,8 @@
- }
- 
- // static
-+=======
-+>>>>>>> .their
- v8::Local<v8::Value> AtomBindings::GetSystemMemoryInfo(v8::Isolate* isolate,
-                                                        mate::Arguments* args) {
-   base::SystemMemoryInfoKB mem_info;
-@@ -199,7 +217,10 @@
-   }
- 
-   mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
-+<<<<<<< .our
-   dict.SetHidden("simple", true);
-+=======
-+>>>>>>> .their
-   dict.Set("total", mem_info.total);
- 
-   // See Chromium's "base/process/process_metrics.h" for an explanation.
-@@ -220,6 +241,7 @@
-   return dict.GetHandle();
- }
- 
-+<<<<<<< .our
- // static
- v8::Local<v8::Value> AtomBindings::GetCPUUsage(base::ProcessMetrics* metrics,
-                                                v8::Isolate* isolate) {
-@@ -228,11 +250,22 @@
-   int processor_count = base::SysInfo::NumberOfProcessors();
-   dict.Set("percentCPUUsage",
-            metrics->GetPlatformIndependentCPUUsage() / processor_count);
-+=======
-+v8::Local<v8::Value> AtomBindings::GetCPUUsage(v8::Isolate* isolate) {
-+  mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
-+  int processor_count = base::SysInfo::NumberOfProcessors();
-+  dict.Set("percentCPUUsage",
-+           metrics_->GetPlatformIndependentCPUUsage() / processor_count);
-+>>>>>>> .their
- 
-   // NB: This will throw NOTIMPLEMENTED() on Windows
-   // For backwards compatibility, we'll return 0
- #if !defined(OS_WIN)
-+<<<<<<< .our
-   dict.Set("idleWakeupsPerSecond", metrics->GetIdleWakeupsPerSecond());
-+=======
-+  dict.Set("idleWakeupsPerSecond", metrics_->GetIdleWakeupsPerSecond());
-+>>>>>>> .their
- #else
-   dict.Set("idleWakeupsPerSecond", 0);
- #endif
-@@ -245,7 +278,10 @@
-   auto metrics = base::ProcessMetrics::CreateCurrentProcessMetrics();
-   base::IoCounters io_counters;
-   mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
-+<<<<<<< .our
-   dict.SetHidden("simple", true);
-+=======
-+>>>>>>> .their
- 
-   if (metrics->GetIOCounters(&io_counters)) {
-     dict.Set("readOperationCount", io_counters.ReadOperationCount);
-added in both
-  our    100644 ba8385c979b15286fd7647582e7d0aee93e1974e atom/common/api/atom_bindings.h
-  their  100644 46a5f36bdcea9adb76c091b17bbed47a0ba8a2ea atom/common/api/atom_bindings.h
-@@ -37,11 +37,17 @@
-   static void Hang();
-   static v8::Local<v8::Value> GetHeapStatistics(v8::Isolate* isolate);
-   static v8::Local<v8::Value> GetProcessMemoryInfo(v8::Isolate* isolate);
-+<<<<<<< .our
-   static v8::Local<v8::Value> GetCreationTime(v8::Isolate* isolate);
-   static v8::Local<v8::Value> GetSystemMemoryInfo(v8::Isolate* isolate,
-                                                   mate::Arguments* args);
-   static v8::Local<v8::Value> GetCPUUsage(base::ProcessMetrics* metrics,
-                                           v8::Isolate* isolate);
-+=======
-+  static v8::Local<v8::Value> GetSystemMemoryInfo(v8::Isolate* isolate,
-+                                                  mate::Arguments* args);
-+  v8::Local<v8::Value> GetCPUUsage(v8::Isolate* isolate);
-+>>>>>>> .their
-   static v8::Local<v8::Value> GetIOCounters(v8::Isolate* isolate);
- 
-  private:
-added in both
-  our    100644 9b37f94a4dc462c0cc84e0182654ff2571952df9 atom/common/asar/archive.cc
-  their  100644 769efec0a2b0d402428ab10ced26feeb5c6157c5 atom/common/asar/archive.cc
-@@ -221,13 +221,21 @@
-   if (!GetNodeFromPath(path.AsUTF8Unsafe(), header_.get(), &node))
-     return false;
- 
-+<<<<<<< .our
-   if (node->FindKey("link")) {
-+=======
-+  if (node->HasKey("link")) {
-+>>>>>>> .their
-     stats->is_file = false;
-     stats->is_link = true;
-     return true;
-   }
- 
-+<<<<<<< .our
-   if (node->FindKey("files")) {
-+=======
-+  if (node->HasKey("files")) {
-+>>>>>>> .their
-     stats->is_file = false;
-     stats->is_directory = true;
-     return true;
-added in both
-  our    100644 65e7d19911559a40b1b258319df5fe0fa180354f atom/common/atom_version.h
-  their  100644 3321475153fda689b992c1b53600094ebd23c879 atom/common/atom_version.h
-@@ -5,10 +5,17 @@
- #ifndef ATOM_COMMON_ATOM_VERSION_H_
- #define ATOM_COMMON_ATOM_VERSION_H_
- 
-+<<<<<<< .our
- #define ATOM_MAJOR_VERSION 4
- #define ATOM_MINOR_VERSION 0
- #define ATOM_PATCH_VERSION 0
- #define ATOM_PRE_RELEASE_VERSION -nightly.20180821
-+=======
-+#define ATOM_MAJOR_VERSION 3
-+#define ATOM_MINOR_VERSION 0
-+#define ATOM_PATCH_VERSION 0
-+#define ATOM_PRE_RELEASE_VERSION -beta.7
-+>>>>>>> .their
- 
- #ifndef ATOM_STRINGIFY
- #define ATOM_STRINGIFY(n) ATOM_STRINGIFY_HELPER(n)
-added in both
-  our    100644 89a2a5966d6caf3c13643065ef084e98b69efcaf atom/common/crash_reporter/crash_reporter_win.h
-  their  100644 f7f1c6b28455a52daf0860028df1054788ddde54 atom/common/crash_reporter/crash_reporter_win.h
-@@ -11,7 +11,11 @@
- 
- #include "atom/common/crash_reporter/crash_reporter.h"
- #include "base/compiler_specific.h"
-+<<<<<<< .our
- #include "breakpad/src/client/windows/handler/exception_handler.h"
-+=======
-+#include "vendor/breakpad/src/client/windows/handler/exception_handler.h"
-+>>>>>>> .their
- 
- namespace base {
- template <typename T>
-@@ -40,7 +44,11 @@
-   friend struct base::DefaultSingletonTraits<CrashReporterWin>;
- 
-   CrashReporterWin();
-+<<<<<<< .our
-   ~CrashReporterWin() override;
-+=======
-+  virtual ~CrashReporterWin();
-+>>>>>>> .their
- 
-   static bool FilterCallback(void* context,
-                              EXCEPTION_POINTERS* exinfo,
-@@ -65,9 +73,13 @@
-   google_breakpad::CustomClientInfo custom_info_;
- 
-   bool skip_system_crash_handler_ = false;
-+<<<<<<< .our
- #ifdef _WIN64
-   bool code_range_registered_ = false;
- #endif
-+=======
-+  bool code_range_registered_ = false;
-+>>>>>>> .their
-   std::unique_ptr<google_breakpad::ExceptionHandler> breakpad_;
- 
-   DISALLOW_COPY_AND_ASSIGN(CrashReporterWin);
-added in both
-  our    100644 8b0e3de5cecdda5c97237ebd5d6e0bbbd99a280b atom/common/crash_reporter/linux/crash_dump_handler.cc
-  their  100644 ccc8d0d538e3a23a85f7dc3dd2d2650f6cb88bcd atom/common/crash_reporter/linux/crash_dump_handler.cc
-@@ -15,7 +15,11 @@
- #include "base/posix/eintr_wrapper.h"
- #include "breakpad/src/client/linux/minidump_writer/directory_reader.h"
- #include "breakpad/src/common/linux/linux_libc_support.h"
-+<<<<<<< .our
- #include "breakpad/src/common/memory_allocator.h"
-+=======
-+#include "breakpad/src/common/memory.h"
-+>>>>>>> .their
- 
- #include "third_party/lss/linux_syscall_support.h"
- 
-added in both
-  our    100644 d13111f495be844df10deebacd572560021bbb4e atom/common/crash_reporter/win/crash_service.cc
-  their  100644 a1a6ab6d7908389bdc0a400cf751fde809408115 atom/common/crash_reporter/win/crash_service.cc
-@@ -17,9 +17,15 @@
- #include "base/strings/string_util.h"
- #include "base/time/time.h"
- #include "base/win/windows_version.h"
-+<<<<<<< .our
- #include "breakpad/src/client/windows/crash_generation/client_info.h"
- #include "breakpad/src/client/windows/crash_generation/crash_generation_server.h"
- #include "breakpad/src/client/windows/sender/crash_report_sender.h"
-+=======
-+#include "vendor/breakpad/src/client/windows/crash_generation/client_info.h"
-+#include "vendor/breakpad/src/client/windows/crash_generation/crash_generation_server.h"
-+#include "vendor/breakpad/src/client/windows/sender/crash_report_sender.h"
-+>>>>>>> .their
- 
- namespace breakpad {
- 
-@@ -132,7 +138,11 @@
-   wcx.lpfnWndProc = CrashSvcWndProc;
-   wcx.hInstance = instance;
-   wcx.lpszClassName = class_name.c_str();
-+<<<<<<< .our
-   ::RegisterClassExW(&wcx);
-+=======
-+  ATOM atom = ::RegisterClassExW(&wcx);
-+>>>>>>> .their
-   DWORD style = visible ? WS_POPUPWINDOW | WS_VISIBLE : WS_OVERLAPPED;
- 
-   // The window size is zero but being a popup window still shows in the
-@@ -487,6 +497,10 @@
-   // Build the SDDL string for the label.
-   std::wstring sddl = L"S:(ML;;NW;;;S-1-16-4096)";
- 
-+<<<<<<< .our
-+=======
-+  DWORD error = ERROR_SUCCESS;
-+>>>>>>> .their
-   PSECURITY_DESCRIPTOR sec_desc = NULL;
- 
-   PACL sacl = NULL;
-added in both
-  our    100644 d0a12cb6d91b9688c1bed496e64d6bbaccaf244a atom/common/keyboard_util.cc
-  their  100644 b8caa1f1b00d652a67ecd103e5ce3a78b70c01f4 atom/common/keyboard_util.cc
-@@ -88,108 +88,171 @@
- 
-     case ')':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '0':
-       return ui::VKEY_0;
-     case '!':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '1':
-       return ui::VKEY_1;
-     case '@':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '2':
-       return ui::VKEY_2;
-     case '#':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '3':
-       return ui::VKEY_3;
-     case '$':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '4':
-       return ui::VKEY_4;
-     case '%':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '5':
-       return ui::VKEY_5;
-     case '^':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '6':
-       return ui::VKEY_6;
-     case '&':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '7':
-       return ui::VKEY_7;
-     case '*':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '8':
-       return ui::VKEY_8;
-     case '(':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '9':
-       return ui::VKEY_9;
- 
-     case ':':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case ';':
-       return ui::VKEY_OEM_1;
-     case '+':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '=':
-       return ui::VKEY_OEM_PLUS;
-     case '<':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case ',':
-       return ui::VKEY_OEM_COMMA;
-     case '_':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '-':
-       return ui::VKEY_OEM_MINUS;
-     case '>':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '.':
-       return ui::VKEY_OEM_PERIOD;
-     case '?':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '/':
-       return ui::VKEY_OEM_2;
-     case '~':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '`':
-       return ui::VKEY_OEM_3;
-     case '{':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '[':
-       return ui::VKEY_OEM_4;
-     case '|':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '\\':
-       return ui::VKEY_OEM_5;
-     case '}':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case ']':
-       return ui::VKEY_OEM_6;
-     case '"':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '\'':
-       return ui::VKEY_OEM_7;
- 
-added in both
-  our    100644 2684aa7dda07ac79e47823c3cf9bf00d3f5cf3f5 atom/common/native_mate_converters/content_converter.cc
-  their  100644 46364e21266a93c7c496d87acbf6cc4ff4965194 atom/common/native_mate_converters/content_converter.cc
-@@ -43,12 +43,18 @@
-     case content::MenuItem::CHECKABLE_OPTION:
-     case content::MenuItem::GROUP:
-       v8_item.Set("checked", item.checked);
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case content::MenuItem::OPTION:
-     case content::MenuItem::SUBMENU:
-       v8_item.Set("label", item.label);
-       v8_item.Set("enabled", item.enabled);
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     default:
-       v8_item.Set("type", item.type);
-   }
-added in both
-  our    100644 db54210e7c095da593c6f5b9f4ed1eafb91b945d atom/common/native_mate_converters/net_converter.cc
-  their  100644 d3890bbff79276627528e7ced7eb69ffcf367f43 atom/common/native_mate_converters/net_converter.cc
-@@ -160,7 +160,11 @@
-     std::string value;
-     while (headers->EnumerateHeaderLines(&iter, &key, &value)) {
-       key = base::ToLowerASCII(key);
-+<<<<<<< .our
-       if (response_headers.FindKey(key)) {
-+=======
-+      if (response_headers.HasKey(key)) {
-+>>>>>>> .their
-         base::ListValue* values = nullptr;
-         if (response_headers.GetList(key, &values))
-           values->AppendString(value);
-@@ -239,9 +243,14 @@
-     if (reader->AsBytesReader()) {
-       const net::UploadBytesElementReader* bytes_reader =
-           reader->AsBytesReader();
-+<<<<<<< .our
-       auto bytes = std::make_unique<base::Value>(
-           std::vector<char>(bytes_reader->bytes(),
-                             bytes_reader->bytes() + bytes_reader->length()));
-+=======
-+      std::unique_ptr<base::Value> bytes(base::Value::CreateWithCopiedBuffer(
-+          bytes_reader->bytes(), bytes_reader->length()));
-+>>>>>>> .their
-       upload_data_dict->Set("bytes", std::move(bytes));
-     } else if (reader->AsFileReader()) {
-       const net::UploadFileElementReader* file_reader = reader->AsFileReader();
-added in both
-  our    100644 61a6563a617030684081e4934044865fdc3c6540 atom/common/native_mate_converters/network_converter.cc
-  their  100644 1f98a5b8ebd548f54a8113f186c5344618dcd027 atom/common/native_mate_converters/network_converter.cc
-@@ -6,7 +6,10 @@
- 
- #include <string>
- #include <utility>
-+<<<<<<< .our
- #include <vector>
-+=======
-+>>>>>>> .their
- 
- #include "atom/common/native_mate_converters/value_converter.h"
- #include "native_mate/dictionary.h"
-@@ -26,8 +29,13 @@
-     auto post_data_dict = std::make_unique<base::DictionaryValue>();
-     auto type = element.type();
-     if (type == network::DataElement::TYPE_BYTES) {
-+<<<<<<< .our
-       auto bytes = std::make_unique<base::Value>(std::vector<char>(
-           element.bytes(), element.bytes() + (element.length())));
-+=======
-+      auto bytes = base::Value::CreateWithCopiedBuffer(
-+          element.bytes(), static_cast<size_t>(element.length()));
-+>>>>>>> .their
-       post_data_dict->SetString("type", "rawData");
-       post_data_dict->Set("bytes", std::move(bytes));
-     } else if (type == network::DataElement::TYPE_FILE) {
-added in both
-  our    100644 3fa070771d6843e9428e560c746965b095961e2a atom/common/native_mate_converters/v8_value_converter.cc
-  their  100644 fbc410bdcb7111bf2ee86dbe07538957de486b68 atom/common/native_mate_converters/v8_value_converter.cc
-@@ -8,7 +8,10 @@
- #include <memory>
- #include <string>
- #include <utility>
-+<<<<<<< .our
- #include <vector>
-+=======
-+>>>>>>> .their
- 
- #include "base/logging.h"
- #include "base/values.h"
-@@ -163,22 +166,42 @@
-       return v8::Null(isolate);
- 
-     case base::Value::Type::BOOLEAN: {
-+<<<<<<< .our
-       bool val = value->GetBool();
-+=======
-+      bool val = false;
-+      value->GetAsBoolean(&val);
-+>>>>>>> .their
-       return v8::Boolean::New(isolate, val);
-     }
- 
-     case base::Value::Type::INTEGER: {
-+<<<<<<< .our
-       int val = value->GetInt();
-+=======
-+      int val = 0;
-+      value->GetAsInteger(&val);
-+>>>>>>> .their
-       return v8::Integer::New(isolate, val);
-     }
- 
-     case base::Value::Type::DOUBLE: {
-+<<<<<<< .our
-       double val = value->GetDouble();
-+=======
-+      double val = 0.0;
-+      value->GetAsDouble(&val);
-+>>>>>>> .their
-       return v8::Number::New(isolate, val);
-     }
- 
-     case base::Value::Type::STRING: {
-+<<<<<<< .our
-       std::string val = value->GetString();
-+=======
-+      std::string val;
-+      value->GetAsString(&val);
-+>>>>>>> .their
-       return v8::String::NewFromUtf8(isolate, val.c_str(),
-                                      v8::String::kNormalString, val.length());
-     }
-@@ -342,8 +365,13 @@
-   if (val->IsRegExp()) {
-     if (!reg_exp_allowed_)
-       // JSON.stringify converts to an object.
-+<<<<<<< .our
-       return FromV8Object(val->ToObject(context).ToLocalChecked(), state,
-                           isolate);
-+=======
-+      return FromV8Object(val->ToObject(context).ToLocalChecked(),
-+          state, isolate);
-+>>>>>>> .their
-     return new base::Value(
-         *v8::String::Utf8Value(val->ToString(context).ToLocalChecked()));
-   }
-@@ -356,8 +384,13 @@
-     if (!function_allowed_)
-       // JSON.stringify refuses to convert function(){}.
-       return nullptr;
-+<<<<<<< .our
-     return FromV8Object(val->ToObject(context).ToLocalChecked(), state,
-                         isolate);
-+=======
-+    return FromV8Object(val->ToObject(context).ToLocalChecked(),
-+        state, isolate);
-+>>>>>>> .their
-   }
- 
-   if (node::Buffer::HasInstance(val)) {
-@@ -365,8 +398,13 @@
-   }
- 
-   if (val->IsObject()) {
-+<<<<<<< .our
-     return FromV8Object(val->ToObject(context).ToLocalChecked(), state,
-                         isolate);
-+=======
-+    return FromV8Object(val->ToObject(context).ToLocalChecked(),
-+        state, isolate);
-+>>>>>>> .their
-   }
- 
-   LOG(ERROR) << "Unexpected v8 value type encountered.";
-@@ -415,9 +453,15 @@
- base::Value* V8ValueConverter::FromNodeBuffer(v8::Local<v8::Value> value,
-                                               FromV8ValueState* state,
-                                               v8::Isolate* isolate) const {
-+<<<<<<< .our
-   return new base::Value(std::vector<char>(
-       node::Buffer::Data(value),
-       node::Buffer::Data(value) + node::Buffer::Length(value)));
-+=======
-+  return base::Value::CreateWithCopiedBuffer(node::Buffer::Data(value),
-+                                             node::Buffer::Length(value))
-+      .release();
-+>>>>>>> .their
- }
- 
- base::Value* V8ValueConverter::FromV8Object(v8::Local<v8::Object> val,
-added in both
-  our    100644 a71cc70f83d2526596a75d8daf036f905ca099be atom/common/native_mate_converters/value_converter.cc
-  their  100644 0412a0118f2b5f6e2801f02e6089f9d12214d311 atom/common/native_mate_converters/value_converter.cc
-@@ -30,6 +30,7 @@
-   return converter.ToV8Value(&val, isolate->GetCurrentContext());
- }
- 
-+<<<<<<< .our
- bool Converter<base::Value>::FromV8(v8::Isolate* isolate,
-                                     v8::Local<v8::Value> val,
-                                     base::Value* out) {
-@@ -50,6 +51,8 @@
-   return converter.ToV8Value(&val, isolate->GetCurrentContext());
- }
- 
-+=======
-+>>>>>>> .their
- bool Converter<base::ListValue>::FromV8(v8::Isolate* isolate,
-                                         v8::Local<v8::Value> val,
-                                         base::ListValue* out) {
-added in both
-  our    100644 b2ea5def0aa9646791c635c15e0ed504dc0af465 atom/common/native_mate_converters/value_converter.h
-  their  100644 a53b2724b0883ab343f6262f7e506deb39e5b34d atom/common/native_mate_converters/value_converter.h
-@@ -10,7 +10,10 @@
- namespace base {
- class DictionaryValue;
- class ListValue;
-+<<<<<<< .our
- class Value;
-+=======
-+>>>>>>> .their
- }  // namespace base
- 
- namespace mate {
-@@ -25,6 +28,7 @@
- };
- 
- template <>
-+<<<<<<< .our
- struct Converter<base::Value> {
-   static bool FromV8(v8::Isolate* isolate,
-                      v8::Local<v8::Value> val,
-@@ -34,6 +38,8 @@
- };
- 
- template <>
-+=======
-+>>>>>>> .their
- struct Converter<base::ListValue> {
-   static bool FromV8(v8::Isolate* isolate,
-                      v8::Local<v8::Value> val,
-added in both
-  our    100644 e6aded2e661af919c2d89c2f9bd46b4921d4aec4 atom/common/node_bindings.cc
-  their  100644 a26747cf03c85a7ada7e84a2bda860791a4d73e2 atom/common/node_bindings.cc
-@@ -15,6 +15,10 @@
- #include "base/base_paths.h"
- #include "base/command_line.h"
- #include "base/environment.h"
-+<<<<<<< .our
-+=======
-+#include "base/files/file_path.h"
-+>>>>>>> .their
- #include "base/path_service.h"
- #include "base/run_loop.h"
- #include "base/strings/utf_string_conversions.h"
-@@ -194,10 +198,13 @@
-   return g_is_initialized;
- }
- 
-+<<<<<<< .our
- base::FilePath::StringType NodeBindings::GetHelperResourcesPath() {
-   return GetResourcesPath(false).value();
- }
- 
-+=======
-+>>>>>>> .their
- void NodeBindings::Initialize() {
-   // Open node's error reporting system for browser process.
-   node::g_standalone_mode = browser_env_ == BROWSER;
-added in both
-  our    100644 5e5ec8e5300ba2c1917e3e9d7e2e8ea1ee341e3b atom/common/node_bindings.h
-  their  100644 7c8cad46cc6927de6746ea65b7db536245baad20 atom/common/node_bindings.h
-@@ -5,7 +5,10 @@
- #ifndef ATOM_COMMON_NODE_BINDINGS_H_
- #define ATOM_COMMON_NODE_BINDINGS_H_
- 
-+<<<<<<< .our
- #include "base/files/file_path.h"
-+=======
-+>>>>>>> .their
- #include "base/macros.h"
- #include "base/memory/weak_ptr.h"
- #include "base/single_thread_task_runner.h"
-@@ -34,7 +37,10 @@
-   static NodeBindings* Create(BrowserEnvironment browser_env);
-   static void RegisterBuiltinModules();
-   static bool IsInitialized();
-+<<<<<<< .our
-   static base::FilePath::StringType GetHelperResourcesPath();
-+=======
-+>>>>>>> .their
- 
-   virtual ~NodeBindings();
- 
-added in both
-  our    100644 e41fb585f57114de00376f52e0d97277e6eca94b atom/common/node_bindings_win.cc
-  their  100644 4a5ff5c51406d0b051f6d790b111a3477da561bf atom/common/node_bindings_win.cc
-@@ -8,6 +8,13 @@
- 
- #include "base/logging.h"
- 
-+<<<<<<< .our
-+=======
-+extern "C" {
-+#include "vendor/node/deps/uv/src/win/internal.h"
-+}
-+
-+>>>>>>> .their
- namespace atom {
- 
- NodeBindingsWin::NodeBindingsWin(BrowserEnvironment browser_env)
-added in both
-  our    100644 77fe5f43b54c8d53bfc5a4a29c9c0a6f62bea423 atom/common/node_bindings_win.h
-  their  100644 793586d88da8a40c86a322bef383f118404d2480 atom/common/node_bindings_win.h
-@@ -13,7 +13,11 @@
- class NodeBindingsWin : public NodeBindings {
-  public:
-   explicit NodeBindingsWin(BrowserEnvironment browser_env);
-+<<<<<<< .our
-   ~NodeBindingsWin() override;
-+=======
-+  virtual ~NodeBindingsWin();
-+>>>>>>> .their
- 
-  private:
-   void PollEvents() override;
-added in both
-  our    100644 fa1a7499a8b082fe9007f04041b46e58502b3ad9 atom/common/node_includes.h
-  their  100644 edd4812e01c29f9307a21b59db876106ae8fc8ec atom/common/node_includes.h
-@@ -9,9 +9,13 @@
- 
- // Include common headers for using node APIs.
- 
-+<<<<<<< .our
- #ifdef NODE_SHARED_MODE
- #define BUILDING_NODE_EXTENSION
- #endif
-+=======
-+#define BUILDING_NODE_EXTENSION
-+>>>>>>> .their
- 
- // The following define makes sure that we do not include the macros
- // again. But we still need the tracing functions, so declaring them.
-added in both
-  our    100644 8b1836f80c583e4db68971ff1b00ca4f86356b45 atom/common/options_switches.cc
-  their  100644 db82468f292dce07471d626e8536aea55de8cb2e atom/common/options_switches.cc
-@@ -118,6 +118,10 @@
- 
- // Web runtime features.
- const char kExperimentalFeatures[] = "experimentalFeatures";
-+<<<<<<< .our
-+=======
-+const char kExperimentalCanvasFeatures[] = "experimentalCanvasFeatures";
-+>>>>>>> .their
- 
- // Opener window's ID.
- const char kOpenerID[] = "openerId";
-@@ -188,9 +192,19 @@
- // The application path
- const char kAppPath[] = "app-path";
- 
-+<<<<<<< .our
- // The command line switch versions of the options.
- const char kBackgroundColor[] = "background-color";
- const char kPreloadScript[] = "preload";
-+=======
-+// The context ID for this process
-+const char kContextId[] = "context-id";
-+
-+// The command line switch versions of the options.
-+const char kBackgroundColor[] = "background-color";
-+const char kPreloadScript[] = "preload";
-+const char kPreloadURL[] = "preload-url";
-+>>>>>>> .their
- const char kPreloadScripts[] = "preload-scripts";
- const char kNodeIntegration[] = "node-integration";
- const char kContextIsolation[] = "context-isolation";
-added in both
-  our    100644 5f6d7e9d38120668ed06922ced2f8d6a6e27a52b atom/common/options_switches.h
-  their  100644 2469c7b5841f861c99e47d59fa18649264b259aa atom/common/options_switches.h
-@@ -61,6 +61,10 @@
- extern const char kContextIsolation[];
- extern const char kGuestInstanceID[];
- extern const char kExperimentalFeatures[];
-+<<<<<<< .our
-+=======
-+extern const char kExperimentalCanvasFeatures[];
-+>>>>>>> .their
- extern const char kOpenerID[];
- extern const char kScrollBounce[];
- extern const char kEnableBlinkFeatures[];
-@@ -92,9 +96,17 @@
- extern const char kSecureSchemes[];
- extern const char kAppUserModelId[];
- extern const char kAppPath[];
-+<<<<<<< .our
- 
- extern const char kBackgroundColor[];
- extern const char kPreloadScript[];
-+=======
-+extern const char kContextId[];
-+
-+extern const char kBackgroundColor[];
-+extern const char kPreloadScript[];
-+extern const char kPreloadURL[];
-+>>>>>>> .their
- extern const char kPreloadScripts[];
- extern const char kNodeIntegration[];
- extern const char kContextIsolation[];
-added in both
-  our    100644 34576be95f2552aaa985dacb3f36406dfc29d54c atom/common/platform_util_win.cc
-  their  100644 193e2ece0042367113ee23512b5b3ee6d4785fca atom/common/platform_util_win.cc
-@@ -31,12 +31,32 @@
- 
- namespace {
- 
-+<<<<<<< .our
-+=======
-+// Old ShellExecute crashes the process when the command for a given scheme
-+// is empty. This function tells if it is.
-+bool ValidateShellCommandForScheme(const std::string& scheme) {
-+  base::win::RegKey key;
-+  base::string16 registry_path =
-+      base::ASCIIToUTF16(scheme) + L"\\shell\\open\\command";
-+  key.Open(HKEY_CLASSES_ROOT, registry_path.c_str(), KEY_READ);
-+  if (!key.Valid())
-+    return false;
-+  DWORD size = 0;
-+  key.ReadValue(NULL, NULL, &size, NULL);
-+  if (size <= 2)
-+    return false;
-+  return true;
-+}
-+
-+>>>>>>> .their
- // Required COM implementation of IFileOperationProgressSink so we can
- // precheck files before deletion to make sure they can be move to the
- // Recycle Bin.
- class DeleteFileProgressSink : public IFileOperationProgressSink {
-  public:
-   DeleteFileProgressSink();
-+<<<<<<< .our
-   virtual ~DeleteFileProgressSink() = default;
- 
-  private:
-@@ -75,17 +95,55 @@
-                                            HRESULT,
-                                            IShellItem*) override;
-   HRESULT STDMETHODCALLTYPE PreNewItem(DWORD, IShellItem*, LPCWSTR) override;
-+=======
-+
-+ private:
-+  ULONG STDMETHODCALLTYPE AddRef(void);
-+  ULONG STDMETHODCALLTYPE Release(void);
-+  HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, LPVOID* ppvObj);
-+  HRESULT STDMETHODCALLTYPE StartOperations(void);
-+  HRESULT STDMETHODCALLTYPE FinishOperations(HRESULT);
-+  HRESULT STDMETHODCALLTYPE PreRenameItem(DWORD, IShellItem*, LPCWSTR);
-+  HRESULT STDMETHODCALLTYPE
-+  PostRenameItem(DWORD, IShellItem*, LPCWSTR, HRESULT, IShellItem*);
-+  HRESULT STDMETHODCALLTYPE PreMoveItem(DWORD,
-+                                        IShellItem*,
-+                                        IShellItem*,
-+                                        LPCWSTR);
-+  HRESULT STDMETHODCALLTYPE
-+  PostMoveItem(DWORD, IShellItem*, IShellItem*, LPCWSTR, HRESULT, IShellItem*);
-+  HRESULT STDMETHODCALLTYPE PreCopyItem(DWORD,
-+                                        IShellItem*,
-+                                        IShellItem*,
-+                                        LPCWSTR);
-+  HRESULT STDMETHODCALLTYPE
-+  PostCopyItem(DWORD, IShellItem*, IShellItem*, LPCWSTR, HRESULT, IShellItem*);
-+  HRESULT STDMETHODCALLTYPE PreDeleteItem(DWORD, IShellItem*);
-+  HRESULT STDMETHODCALLTYPE PostDeleteItem(DWORD,
-+                                           IShellItem*,
-+                                           HRESULT,
-+                                           IShellItem*);
-+  HRESULT STDMETHODCALLTYPE PreNewItem(DWORD, IShellItem*, LPCWSTR);
-+>>>>>>> .their
-   HRESULT STDMETHODCALLTYPE PostNewItem(DWORD,
-                                         IShellItem*,
-                                         LPCWSTR,
-                                         LPCWSTR,
-                                         DWORD,
-                                         HRESULT,
-+<<<<<<< .our
-                                         IShellItem*) override;
-   HRESULT STDMETHODCALLTYPE UpdateProgress(UINT, UINT) override;
-   HRESULT STDMETHODCALLTYPE ResetTimer(void) override;
-   HRESULT STDMETHODCALLTYPE PauseTimer(void) override;
-   HRESULT STDMETHODCALLTYPE ResumeTimer(void) override;
-+=======
-+                                        IShellItem*);
-+  HRESULT STDMETHODCALLTYPE UpdateProgress(UINT, UINT);
-+  HRESULT STDMETHODCALLTYPE ResetTimer(void);
-+  HRESULT STDMETHODCALLTYPE PauseTimer(void);
-+  HRESULT STDMETHODCALLTYPE ResumeTimer(void);
-+>>>>>>> .their
- 
-   ULONG m_cRef;
- };
-@@ -240,6 +298,36 @@
-   if (dir.empty())
-     return false;
- 
-+<<<<<<< .our
-+=======
-+  typedef HRESULT(WINAPI * SHOpenFolderAndSelectItemsFuncPtr)(
-+      PCIDLIST_ABSOLUTE pidl_Folder, UINT cidl, PCUITEMID_CHILD_ARRAY pidls,
-+      DWORD flags);
-+
-+  static SHOpenFolderAndSelectItemsFuncPtr open_folder_and_select_itemsPtr =
-+      NULL;
-+  static bool initialize_open_folder_proc = true;
-+  if (initialize_open_folder_proc) {
-+    initialize_open_folder_proc = false;
-+    // The SHOpenFolderAndSelectItems API is exposed by shell32 version 6
-+    // and does not exist in Win2K. We attempt to retrieve this function export
-+    // from shell32 and if it does not exist, we just invoke ShellExecute to
-+    // open the folder thus losing the functionality to select the item in
-+    // the process.
-+    HMODULE shell32_base = GetModuleHandle(L"shell32.dll");
-+    if (!shell32_base) {
-+      NOTREACHED() << " " << __FUNCTION__ << "(): Can't open shell32.dll";
-+      return false;
-+    }
-+    open_folder_and_select_itemsPtr =
-+        reinterpret_cast<SHOpenFolderAndSelectItemsFuncPtr>(
-+            GetProcAddress(shell32_base, "SHOpenFolderAndSelectItems"));
-+  }
-+  if (!open_folder_and_select_itemsPtr) {
-+    return ui::win::OpenFolderViaShell(dir);
-+  }
-+
-+>>>>>>> .their
-   Microsoft::WRL::ComPtr<IShellFolder> desktop;
-   HRESULT hr = SHGetDesktopFolder(desktop.GetAddressOf());
-   if (FAILED(hr))
-@@ -263,8 +351,13 @@
- 
-   const ITEMIDLIST* highlight[] = {file_item};
- 
-+<<<<<<< .our
-   hr = SHOpenFolderAndSelectItems(dir_item, arraysize(highlight), highlight,
-                                   NULL);
-+=======
-+  hr = (*open_folder_and_select_itemsPtr)(dir_item, arraysize(highlight),
-+                                          highlight, NULL);
-+>>>>>>> .their
-   if (!FAILED(hr))
-     return true;
- 
-@@ -275,8 +368,14 @@
-     return ui::win::OpenFolderViaShell(dir);
-   } else {
-     LPTSTR message = NULL;
-+<<<<<<< .our
-     FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
-                   0, hr, 0, reinterpret_cast<LPTSTR>(&message), 0, NULL);
-+=======
-+    DWORD message_length = FormatMessage(
-+        FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, 0, hr, 0,
-+        reinterpret_cast<LPTSTR>(&message), 0, NULL);
-+>>>>>>> .their
-     LOG(WARNING) << " " << __FUNCTION__ << "(): Can't open full_path = \""
-                  << full_path.value() << "\""
-                  << " hr = " << hr << " " << reinterpret_cast<LPTSTR>(&message);
-added in both
-  our    100644 6e29fe45a69f44856d7fca449ec1be4eaf6970a2 atom/renderer/atom_sandboxed_renderer_client.cc
-  their  100644 ce214162033ca353a34ced83f0facf5b1dd1eca4 atom/renderer/atom_sandboxed_renderer_client.cc
-@@ -16,7 +16,10 @@
- #include "base/command_line.h"
- #include "base/files/file_path.h"
- #include "base/path_service.h"
-+<<<<<<< .our
- #include "base/process/process_handle.h"
-+=======
-+>>>>>>> .their
- #include "chrome/renderer/printing/print_web_view_helper.h"
- #include "content/public/renderer/render_frame.h"
- #include "native_mate/dictionary.h"
-@@ -90,11 +93,32 @@
-   return path.value();
- }
- 
-+<<<<<<< .our
- v8::Local<v8::Value> CreatePreloadScript(v8::Isolate* isolate,
-                                          v8::Local<v8::String> preloadSrc) {
-   auto script = v8::Script::Compile(preloadSrc);
-   auto func = script->Run();
-   return func;
-+=======
-+void InitializeBindings(v8::Local<v8::Object> binding,
-+                        v8::Local<v8::Context> context) {
-+  auto* isolate = context->GetIsolate();
-+  mate::Dictionary b(isolate, binding);
-+  b.SetMethod("get", GetBinding);
-+  b.SetMethod("crash", AtomBindings::Crash);
-+  b.SetMethod("hang", AtomBindings::Hang);
-+  b.SetMethod("getArgv", GetArgv);
-+  b.SetMethod("getExecPath", GetExecPath);
-+  b.SetMethod("getHeapStatistics", &AtomBindings::GetHeapStatistics);
-+  b.SetMethod("getProcessMemoryInfo", &AtomBindings::GetProcessMemoryInfo);
-+  b.SetMethod("getSystemMemoryInfo", &AtomBindings::GetSystemMemoryInfo);
-+
-+  // Pass in CLI flags needed to setup the renderer
-+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-+  if (command_line->HasSwitch(switches::kGuestInstanceID))
-+    b.Set(options::kGuestInstanceID,
-+          command_line->GetSwitchValueASCII(switches::kGuestInstanceID));
-+>>>>>>> .their
- }
- 
- class AtomSandboxedRenderFrameObserver : public AtomRenderFrameObserver {
-@@ -132,11 +156,15 @@
- AtomSandboxedRendererClient::AtomSandboxedRendererClient() {
-   // Explicitly register electron's builtin modules.
-   NodeBindings::RegisterBuiltinModules();
-+<<<<<<< .our
-   metrics_ = base::ProcessMetrics::CreateCurrentProcessMetrics();
-+=======
-+>>>>>>> .their
- }
- 
- AtomSandboxedRendererClient::~AtomSandboxedRendererClient() {}
- 
-+<<<<<<< .our
- void AtomSandboxedRendererClient::InitializeBindings(
-     v8::Local<v8::Object> binding,
-     v8::Local<v8::Context> context) {
-@@ -164,6 +192,8 @@
-           command_line->GetSwitchValueASCII(switches::kGuestInstanceID));
- }
- 
-+=======
-+>>>>>>> .their
- void AtomSandboxedRendererClient::RenderFrameCreated(
-     content::RenderFrame* render_frame) {
-   new AtomSandboxedRenderFrameObserver(render_frame, this);
-added in both
-  our    100644 4afef42dfd43d9e177d93a3c49b115c34f7e2e6a atom/renderer/atom_sandboxed_renderer_client.h
-  their  100644 1ebf4429794f47996c8f92f66b1c5b0295365b06 atom/renderer/atom_sandboxed_renderer_client.h
-@@ -8,7 +8,10 @@
- #include <vector>
- 
- #include "atom/renderer/renderer_client_base.h"
-+<<<<<<< .our
- #include "base/process/process_metrics.h"
-+=======
-+>>>>>>> .their
- 
- namespace atom {
- 
-@@ -17,8 +20,11 @@
-   AtomSandboxedRendererClient();
-   ~AtomSandboxedRendererClient() override;
- 
-+<<<<<<< .our
-   void InitializeBindings(v8::Local<v8::Object> binding,
-                           v8::Local<v8::Context> context);
-+=======
-+>>>>>>> .their
-   void InvokeIpcCallback(v8::Handle<v8::Context> context,
-                          const std::string& callback_name,
-                          std::vector<v8::Handle<v8::Value>> args);
-@@ -33,8 +39,11 @@
-   void RenderViewCreated(content::RenderView*) override;
- 
-  private:
-+<<<<<<< .our
-   std::unique_ptr<base::ProcessMetrics> metrics_;
- 
-+=======
-+>>>>>>> .their
-   DISALLOW_COPY_AND_ASSIGN(AtomSandboxedRendererClient);
- };
- 
-added in both
-  our    100644 3c591201532e4510010f5bc895da3c16780d08d9 atom/renderer/preferences_manager.cc
-  their  100644 2c6540cd5f40b7244e70a55f9c146571ec91e4a1 atom/renderer/preferences_manager.cc
-@@ -26,9 +26,13 @@
- 
- void PreferencesManager::OnUpdatePreferences(
-     const base::ListValue& preferences) {
-+<<<<<<< .our
-   auto copy =
-       base::ListValue::From(base::Value::ToUniquePtrValue(preferences.Clone()));
-   preferences_.swap(copy);
-+=======
-+  preferences_ = preferences.CreateDeepCopy();
-+>>>>>>> .their
- }
- 
- }  // namespace atom
-added in both
-  our    100644 69490420ef5b8f87e7cb8fd97ebd5ec4509fa1ae atom/renderer/renderer_client_base.cc
-  their  100644 a73dd265f9367dd35308568588b42597c6650189 atom/renderer/renderer_client_base.cc
-@@ -20,6 +20,10 @@
- #include "base/strings/string_split.h"
- #include "base/strings/stringprintf.h"
- #include "chrome/renderer/media/chrome_key_systems.h"
-+<<<<<<< .our
-+=======
-+#include "chrome/renderer/pepper/pepper_helper.h"
-+>>>>>>> .their
- #include "chrome/renderer/printing/print_web_view_helper.h"
- #include "chrome/renderer/tts_dispatcher.h"
- #include "content/public/common/content_constants.h"
-@@ -46,10 +50,13 @@
- #include "atom/common/atom_constants.h"
- #endif  // defined(ENABLE_PDF_VIEWER)
- 
-+<<<<<<< .our
- #if defined(ENABLE_PEPPER_FLASH)
- #include "chrome/renderer/pepper/pepper_helper.h"
- #endif  // defined(ENABLE_PEPPER_FLASH)
- 
-+=======
-+>>>>>>> .their
- // This is defined in later versions of Chromium, remove this if you see
- // compiler complaining duplicate defines.
- #if defined(OS_WIN) || defined(OS_FUCHSIA)
-@@ -95,7 +102,11 @@
- void RendererClientBase::DidCreateScriptContext(
-     v8::Handle<v8::Context> context,
-     content::RenderFrame* render_frame) {
-+<<<<<<< .our
-   // global.setHidden("contextId", `${processId}-${++next_context_id_}`)
-+=======
-+  // global.setHidden("contextId", `${processId}-${++nextContextId}`)
-+>>>>>>> .their
-   std::string context_id = base::StringPrintf(
-       "%" CrPRIdPid "-%d", base::GetCurrentProcId(), ++next_context_id_);
-   v8::Isolate* isolate = context->GetIsolate();
-@@ -164,9 +175,13 @@
- #if defined(TOOLKIT_VIEWS)
-   new AutofillAgent(render_frame);
- #endif
-+<<<<<<< .our
- #if defined(ENABLE_PEPPER_FLASH)
-   new PepperHelper(render_frame);
- #endif
-+=======
-+  new PepperHelper(render_frame);
-+>>>>>>> .their
-   new ContentSettingsObserver(render_frame);
-   new printing::PrintWebViewHelper(render_frame);
- 
-added in both
-  our    100644 166c01b8686498ecb9cb1929e872309441eeaf36 brightray/BUILD.gn
-  their  100644 c2185726abdf17d7c24010a0b076b7e33496f2ad brightray/BUILD.gn
-@@ -1,14 +1,48 @@
- import("//build/config/ui.gni")
- 
-+<<<<<<< .our
- filenames_gypi = exec_script("//build/gypi_to_gn.py",
-                              [ rebase_path("filenames.gypi") ],
-                              "scope",
-                              [ "filenames.gypi" ])
-+=======
-+filenames_gypi = exec_script(
-+  "//build/gypi_to_gn.py",
-+  [ rebase_path("filenames.gypi") ],
-+  "scope",
-+  [ "filenames.gypi" ]
-+)
-+
-+
-+if (is_linux) {
-+  # TODO: Experiment with using //tools/generate_library_loader for generating
-+  # the libnotify loader.
-+  copy("libnotify_headers") {
-+    sources = [
-+      "/usr/include/libnotify/notify.h",
-+      "/usr/include/libnotify/notification.h",
-+      "/usr/include/libnotify/notify-enum-types.h",
-+      "/usr/include/libnotify/notify-features.h",
-+    ]
-+    outputs = [ "$target_gen_dir/libnotify-copy/libnotify/{{source_file_part}}" ]
-+  }
-+  config("libnotify_config") {
-+    include_dirs = [ "$target_gen_dir/libnotify-copy" ]
-+  }
-+  group("libnotify") {
-+    deps = [ ":libnotify_headers" ]
-+    public_configs = [ ":libnotify_config" ]
-+  }
-+}
-+>>>>>>> .their
- 
- static_library("brightray") {
-   deps = [
-     "//base",
-+<<<<<<< .our
-     "//base:base_static",
-+=======
-+>>>>>>> .their
-     "//components/network_session_configurator/common",
-     "//components/prefs",
-     "//content/public/browser",
-@@ -18,6 +52,7 @@
-     "//ui/views",
-   ]
- 
-+<<<<<<< .our
-   include_dirs = [ ".." ]
- 
-   defines = [
-@@ -27,6 +62,21 @@
- 
-   if (is_linux) {
-     deps += [ "//build/config/linux/gtk" ]
-+=======
-+  include_dirs = [
-+    "..",
-+  ]
-+
-+  defines = [
-+    "DISABLE_NACL=1",
-+  ]
-+
-+  if (is_linux) {
-+    deps += [
-+      "//build/config/linux/gtk3",
-+      ":libnotify",
-+    ]
-+>>>>>>> .their
-   }
- 
-   extra_source_filters = []
-@@ -38,8 +88,12 @@
-     ]
-   }
- 
-+<<<<<<< .our
-   set_sources_assignment_filter(
-       sources_assignment_filter + extra_source_filters)
-+=======
-+  set_sources_assignment_filter(sources_assignment_filter + extra_source_filters)
-+>>>>>>> .their
-   sources = filenames_gypi.brightray_sources
-   set_sources_assignment_filter(sources_assignment_filter)
- }
-added in both
-  our    100644 8a945dc0219293d90e30162e4691a4d871071f4f brightray/brightray.gypi
-  their  100644 33d42bc8069ce4031cbb4375e37194c923b9de89 brightray/brightray.gypi
-@@ -155,7 +155,14 @@
-               'WEBRTC_MAC',
-              ],
-           }],  # OS=="mac"
-+<<<<<<< .our
-           ['OS=="win"', {            
-+=======
-+          ['OS=="win"', {
-+            'include_dirs': [
-+              '<(libchromiumcontent_src_dir)/third_party/wtl/include',
-+            ],
-+>>>>>>> .their
-             'defines': [
-               '_WIN32_WINNT=0x0602',
-               'WINVER=0x0602',
-@@ -205,7 +212,10 @@
-           'SKIA_DLL',
-           'USING_V8_SHARED',
-           'WEBKIT_DLL',
-+<<<<<<< .our
-           'V8_ENABLE_CHECKS',
-+=======
-+>>>>>>> .their
-         ],
-         'msvs_settings': {
-           'VCCLCompilerTool': {
-added in both
-  our    100644 1eff7344e9aef78bb88720c38c0f75fb92e6bc09 brightray/browser/browser_context.cc
-  their  100644 708a97bddd1e883f1192e0e431957b72e40e7f22 brightray/browser/browser_context.cc
-@@ -11,6 +11,10 @@
- #include "brightray/browser/brightray_paths.h"
- #include "brightray/browser/browser_client.h"
- #include "brightray/browser/inspectable_web_contents_impl.h"
-+<<<<<<< .our
-+=======
-+#include "brightray/browser/special_storage_policy.h"
-+>>>>>>> .their
- #include "brightray/browser/zoom_level_delegate.h"
- #include "brightray/common/application_info.h"
- #include "components/prefs/json_pref_store.h"
-@@ -54,6 +58,10 @@
- 
- BrowserContext::BrowserContext(const std::string& partition, bool in_memory)
-     : in_memory_(in_memory),
-+<<<<<<< .our
-+=======
-+      storage_policy_(new SpecialStoragePolicy),
-+>>>>>>> .their
-       weak_factory_(this) {
-   if (!PathService::Get(DIR_USER_DATA, &path_)) {
-     PathService::Get(DIR_APP_DATA, &path_);
-@@ -158,6 +166,13 @@
-   return nullptr;
- }
- 
-+<<<<<<< .our
-+=======
-+storage::SpecialStoragePolicy* BrowserContext::GetSpecialStoragePolicy() {
-+  return storage_policy_.get();
-+}
-+
-+>>>>>>> .their
- content::PushMessagingService* BrowserContext::GetPushMessagingService() {
-   return nullptr;
- }
-added in both
-  our    100644 1fb1c59b8043dbb711a364fca3c357c11993bedc brightray/browser/browser_context.h
-  their  100644 d36ec3bbdff9ad50a080ab849e879c211e2a9213 brightray/browser/browser_context.h
-@@ -17,6 +17,13 @@
- class PrefRegistrySimple;
- class PrefService;
- 
-+<<<<<<< .our
-+=======
-+namespace storage {
-+class SpecialStoragePolicy;
-+}
-+
-+>>>>>>> .their
- namespace brightray {
- 
- class BrowserContext;
-@@ -48,6 +55,10 @@
-   content::ResourceContext* GetResourceContext() override;
-   content::DownloadManagerDelegate* GetDownloadManagerDelegate() override;
-   content::BrowserPluginGuestManager* GetGuestManager() override;
-+<<<<<<< .our
-+=======
-+  storage::SpecialStoragePolicy* GetSpecialStoragePolicy() override;
-+>>>>>>> .their
-   content::PushMessagingService* GetPushMessagingService() override;
-   content::SSLHostStateDelegate* GetSSLHostStateDelegate() override;
-   content::BackgroundFetchDelegate* GetBackgroundFetchDelegate() override;
-@@ -116,6 +127,10 @@
-   base::FilePath path_;
-   bool in_memory_;
- 
-+<<<<<<< .our
-+=======
-+  scoped_refptr<storage::SpecialStoragePolicy> storage_policy_;
-+>>>>>>> .their
-   std::unique_ptr<PrefService> prefs_;
-   std::unique_ptr<MediaDeviceIDSalt> media_device_id_salt_;
-   // Self-destructing class responsible for creating URLRequestContextGetter
-added in both
-  our    100644 80e6615be13d8dd8fd244c1b2c90b3630e893578 brightray/browser/mac/cocoa_notification.h
-  their  100644 066528ee490b8821bd797c49805cd34bbcdf0bc0 brightray/browser/mac/cocoa_notification.h
-@@ -31,7 +31,10 @@
-   void NotificationActivated();
-   void NotificationActivated(NSUserNotificationAction* action)
-     API_AVAILABLE(macosx(10.10));
-+<<<<<<< .our
-   void NotificationDismissed();
-+=======
-+>>>>>>> .their
- 
-   NSUserNotification* notification() const { return notification_; }
- 
-added in both
-  our    100644 57f53931e972adac9cbadf643c737b21d6b9b712 brightray/browser/mac/cocoa_notification.mm
-  their  100644 6b576497d41a9b747b702d5502583637d96606df brightray/browser/mac/cocoa_notification.mm
-@@ -156,6 +156,7 @@
-   this->LogAction("button clicked");
- }
- 
-+<<<<<<< .our
- void CocoaNotification::NotificationDismissed() {
-   if (delegate())
-     delegate()->NotificationClosed();
-@@ -163,6 +164,8 @@
-   this->LogAction("dismissed");
- }
- 
-+=======
-+>>>>>>> .their
- void CocoaNotification::LogAction(const char* action) {
-   if (getenv("ELECTRON_DEBUG_NOTIFICATIONS")) {
-     NSString* identifier = [notification_ valueForKey:@"identifier"];
-added in both
-  our    100644 ddf0cbfa888d3f3be47db890c842900ce52d2411 brightray/browser/mac/notification_center_delegate.mm
-  their  100644 7ae24b8979b441e7583583ade5aa2708cfb1b994 brightray/browser/mac/notification_center_delegate.mm
-@@ -65,6 +65,7 @@
-   return YES;
- }
- 
-+<<<<<<< .our
- #if !defined(MAS_BUILD)
- // This undocumented method notifies us if a user closes "Alert" notifications
- // https://chromium.googlesource.com/chromium/src/+/lkgr/chrome/browser/notifications/notification_platform_bridge_mac.mm
-@@ -89,4 +90,6 @@
- }
- #endif
- 
-+=======
-+>>>>>>> .their
- @end
-added in remote
-  their  100644 e662441dedbfe3c5cf08e8dcce3413153c1fcf82 brightray/browser/special_storage_policy.cc
-@@ -0,0 +1,41 @@
-+// Copyright 2014 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "brightray/browser/special_storage_policy.h"
-+
-+namespace brightray {
-+
-+SpecialStoragePolicy::SpecialStoragePolicy() {}
-+
-+SpecialStoragePolicy::~SpecialStoragePolicy() {}
-+
-+bool SpecialStoragePolicy::IsStorageProtected(const GURL& origin) {
-+  return true;
-+}
-+
-+bool SpecialStoragePolicy::IsStorageUnlimited(const GURL& origin) {
-+  return true;
-+}
-+
-+bool SpecialStoragePolicy::IsStorageDurable(const GURL& origin) {
-+  return true;
-+}
-+
-+bool SpecialStoragePolicy::HasIsolatedStorage(const GURL& origin) {
-+  return false;
-+}
-+
-+bool SpecialStoragePolicy::IsStorageSessionOnly(const GURL& origin) {
-+  return false;
-+}
-+
-+bool SpecialStoragePolicy::HasSessionOnlyOrigins() {
-+  return false;
-+}
-+
-+bool SpecialStoragePolicy::ShouldDeleteCookieOnExit(const GURL& origin) {
-+  return false;
-+}
-+
-+}  // namespace brightray
-added in remote
-  their  100644 2d02cdd293438d4f10863c4cf6a7932dc20a3666 brightray/browser/special_storage_policy.h
-@@ -0,0 +1,31 @@
-+// Copyright 2014 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef BRIGHTRAY_BROWSER_SPECIAL_STORAGE_POLICY_H_
-+#define BRIGHTRAY_BROWSER_SPECIAL_STORAGE_POLICY_H_
-+
-+#include "storage/browser/quota/special_storage_policy.h"
-+
-+namespace brightray {
-+
-+class SpecialStoragePolicy : public storage::SpecialStoragePolicy {
-+ public:
-+  SpecialStoragePolicy();
-+
-+  // storage::SpecialStoragePolicy implementation.
-+  bool IsStorageProtected(const GURL& origin) override;
-+  bool IsStorageUnlimited(const GURL& origin) override;
-+  bool IsStorageDurable(const GURL& origin) override;
-+  bool HasIsolatedStorage(const GURL& origin) override;
-+  bool IsStorageSessionOnly(const GURL& origin) override;
-+  bool HasSessionOnlyOrigins() override;
-+  bool ShouldDeleteCookieOnExit(const GURL& origin) override;
-+
-+ protected:
-+  ~SpecialStoragePolicy() override;
-+};
-+
-+}  // namespace brightray
-+
-+#endif  // BRIGHTRAY_BROWSER_SPECIAL_STORAGE_POLICY_H_
-added in both
-  our    100644 f954489704cf1147b13937bc3a228898f45cb38d brightray/browser/win/notification_presenter_win.h
-  their  100644 2a1a779bfa3d53e693b50d3b7f669a6afd92efaa brightray/browser/win/notification_presenter_win.h
-@@ -35,7 +35,11 @@
- class NotificationPresenterWin : public NotificationPresenter {
-  public:
-   NotificationPresenterWin();
-+<<<<<<< .our
-   ~NotificationPresenterWin() override;
-+=======
-+  ~NotificationPresenterWin();
-+>>>>>>> .their
- 
-   bool Init();
- 
-added in both
-  our    100644 cbfea8360b983a139736c01e93f0fda5b104f900 brightray/browser/win/notification_presenter_win7.cc
-  their  100644 9a1ede3642afae305a6f5b1f388d04646f6b765b brightray/browser/win/notification_presenter_win7.cc
-@@ -13,8 +13,13 @@
- 
- Win32Notification* NotificationPresenterWin7::GetNotificationObjectByRef(
-     const DesktopNotificationController::Notification& ref) {
-+<<<<<<< .our
-   for (auto* n : this->notifications()) {
-     auto* w32n = static_cast<Win32Notification*>(n);
-+=======
-+  for (auto n : this->notifications()) {
-+    auto w32n = static_cast<Win32Notification*>(n);
-+>>>>>>> .their
-     if (w32n->GetRef() == ref)
-       return w32n;
-   }
-@@ -24,8 +29,13 @@
- 
- Win32Notification* NotificationPresenterWin7::GetNotificationObjectByTag(
-     const std::string& tag) {
-+<<<<<<< .our
-   for (auto* n : this->notifications()) {
-     auto* w32n = static_cast<Win32Notification*>(n);
-+=======
-+  for (auto n : this->notifications()) {
-+    auto w32n = static_cast<Win32Notification*>(n);
-+>>>>>>> .their
-     if (w32n->GetTag() == tag)
-       return w32n;
-   }
-@@ -35,14 +45,22 @@
- 
- void NotificationPresenterWin7::OnNotificationClicked(
-     Notification& notification) {
-+<<<<<<< .our
-   auto* n = GetNotificationObjectByRef(notification);
-+=======
-+  auto n = GetNotificationObjectByRef(notification);
-+>>>>>>> .their
-   if (n)
-     n->NotificationClicked();
- }
- 
- void NotificationPresenterWin7::OnNotificationDismissed(
-     Notification& notification) {
-+<<<<<<< .our
-   auto* n = GetNotificationObjectByRef(notification);
-+=======
-+  auto n = GetNotificationObjectByRef(notification);
-+>>>>>>> .their
-   if (n)
-     n->NotificationDismissed();
- }
-added in both
-  our    100644 f07d43105fc1b99b7421e38b7d937a280738a6b6 brightray/browser/win/win32_desktop_notifications/common.h
-  their  100644 967ad247481f224e0c4f305337d6127ffd9cfa19 brightray/browser/win/win32_desktop_notifications/common.h
-@@ -36,7 +36,11 @@
-         GetProcAddress(GetModuleHandle(TEXT("shcore")), "GetDpiForMonitor"));
- 
-     if (GetDpiForMonitor) {
-+<<<<<<< .our
-       auto* monitor = MonitorFromPoint({}, MONITOR_DEFAULTTOPRIMARY);
-+=======
-+      auto monitor = MonitorFromPoint({}, MONITOR_DEFAULTTOPRIMARY);
-+>>>>>>> .their
-       if (GetDpiForMonitor(monitor, 0, &dpi_x, &dpi_y) == S_OK)
-         return;
-     }
-added in both
-  our    100644 71395a49d82f7be8a3ffd66e4795af968973a274 brightray/browser/win/win32_desktop_notifications/desktop_notification_controller.cc
-  their  100644 0840d9e6364dc743458588dd21464f32ea946adf brightray/browser/win/win32_desktop_notifications/desktop_notification_controller.cc
-@@ -1,9 +1,14 @@
-+<<<<<<< .our
- #ifndef NOMINMAX
- #define NOMINMAX
- #endif
- #ifndef WIN32_LEAN_AND_MEAN
- #define WIN32_LEAN_AND_MEAN
- #endif
-+=======
-+#define NOMINMAX
-+#define WIN32_LEAN_AND_MEAN
-+>>>>>>> .their
- #include "brightray/browser/win/win32_desktop_notifications/desktop_notification_controller.h"
- #include <windowsx.h>
- #include <algorithm>
-@@ -39,9 +44,12 @@
-   return ret;
- }
- 
-+<<<<<<< .our
- const TCHAR DesktopNotificationController::class_name_[] =
-       TEXT("DesktopNotificationController");
- 
-+=======
-+>>>>>>> .their
- HINSTANCE DesktopNotificationController::RegisterWndClasses() {
-   // We keep a static `module` variable which serves a dual purpose:
-   // 1. Stores the HINSTANCE where the window classes are registered,
-@@ -90,7 +98,11 @@
-                                                         LPARAM lparam) {
-   switch (message) {
-     case WM_CREATE: {
-+<<<<<<< .our
-       auto*& cs = reinterpret_cast<const CREATESTRUCT*&>(lparam);
-+=======
-+      auto& cs = reinterpret_cast<const CREATESTRUCT*&>(lparam);
-+>>>>>>> .their
-       SetWindowLongPtr(hwnd, 0, (LONG_PTR)cs->lpCreateParams);
-     } break;
- 
-@@ -101,7 +113,11 @@
-       return 0;
- 
-     case WM_DISPLAYCHANGE: {
-+<<<<<<< .our
-       auto* inst = Get(hwnd);
-+=======
-+      auto inst = Get(hwnd);
-+>>>>>>> .their
-       inst->ClearAssets();
-       inst->AnimateAll();
-     } break;
-@@ -189,13 +205,21 @@
-       POINT origin = {work_area.right,
-                       work_area.bottom - metrics.Y(toast_margin_)};
- 
-+<<<<<<< .our
-       auto* hdwp = BeginDeferWindowPos(static_cast<int>(instances_.size()));
-+=======
-+      auto hdwp = BeginDeferWindowPos(static_cast<int>(instances_.size()));
-+>>>>>>> .their
- 
-       for (auto&& inst : instances_) {
-         if (!inst.hwnd)
-           continue;
- 
-+<<<<<<< .our
-         auto* notification = Toast::Get(inst.hwnd);
-+=======
-+        auto notification = Toast::Get(inst.hwnd);
-+>>>>>>> .their
-         hdwp = notification->Animate(hdwp, origin);
-         if (!hdwp)
-           break;
-@@ -252,7 +276,11 @@
-     int target_pos = 0;
-     for (auto&& inst : instances_) {
-       if (inst.hwnd) {
-+<<<<<<< .our
-         auto* toast = Toast::Get(inst.hwnd);
-+=======
-+        auto toast = Toast::Get(inst.hwnd);
-+>>>>>>> .their
- 
-         if (toast->IsHighlighted())
-           target_pos = toast->GetVerticalPosition();
-@@ -295,9 +323,15 @@
-   }
- 
-   // Dismiss active toast
-+<<<<<<< .our
-   auto* hwnd = GetToast(notification.data_.get());
-   if (hwnd) {
-     auto* toast = Toast::Get(hwnd);
-+=======
-+  auto hwnd = GetToast(notification.data_.get());
-+  if (hwnd) {
-+    auto toast = Toast::Get(hwnd);
-+>>>>>>> .their
-     toast->Dismiss();
-   }
- }
-@@ -310,8 +344,13 @@
- }
- 
- void DesktopNotificationController::CreateToast(NotificationLink&& data) {
-+<<<<<<< .our
-   auto* hinstance = RegisterWndClasses();
-   auto* hwnd = Toast::Create(hinstance, data);
-+=======
-+  auto hinstance = RegisterWndClasses();
-+  auto hwnd = Toast::Create(hinstance, data);
-+>>>>>>> .their
-   if (hwnd) {
-     int toast_pos = 0;
-     if (!instances_.empty()) {
-@@ -319,7 +358,11 @@
-       _ASSERT(item.hwnd);
- 
-       ScreenMetrics scr;
-+<<<<<<< .our
-       auto* toast = Toast::Get(item.hwnd);
-+=======
-+      auto toast = Toast::Get(item.hwnd);
-+>>>>>>> .their
-       toast_pos = toast->GetVerticalPosition() + toast->GetHeight() +
-                   scr.Y(toast_margin_);
-     }
-@@ -333,7 +376,11 @@
-                                       NULL, hinstance, this);
-     }
- 
-+<<<<<<< .our
-     auto* toast = Toast::Get(hwnd);
-+=======
-+    auto toast = Toast::Get(hwnd);
-+>>>>>>> .their
-     toast->PopUp(toast_pos);
-   }
- }
-@@ -363,18 +410,24 @@
-   }
- }
- 
-+<<<<<<< .our
- DesktopNotificationController::Notification::Notification() = default;
- DesktopNotificationController::Notification::Notification(
-   const DesktopNotificationController::Notification&) = default;
- 
-+=======
-+>>>>>>> .their
- DesktopNotificationController::Notification::Notification(
-     const shared_ptr<NotificationData>& data)
-     : data_(data) {
-   _ASSERT(data != nullptr);
- }
- 
-+<<<<<<< .our
- DesktopNotificationController::Notification::~Notification() = default;
- 
-+=======
-+>>>>>>> .their
- bool DesktopNotificationController::Notification::operator==(
-     const Notification& other) const {
-   return data_ == other.data_;
-@@ -405,9 +458,15 @@
-   data_->body_text = move(body_text);
-   data_->image = CopyBitmap(image);
- 
-+<<<<<<< .our
-   auto* hwnd = data_->controller->GetToast(data_.get());
-   if (hwnd) {
-     auto* toast = Toast::Get(hwnd);
-+=======
-+  auto hwnd = data_->controller->GetToast(data_.get());
-+  if (hwnd) {
-+    auto toast = Toast::Get(hwnd);
-+>>>>>>> .their
-     toast->ResetContents();
-   }
- 
-@@ -422,7 +481,11 @@
- }
- 
- DesktopNotificationController::NotificationLink::~NotificationLink() {
-+<<<<<<< .our
-   auto* p = get();
-+=======
-+  auto p = get();
-+>>>>>>> .their
-   if (p)
-     p->controller = nullptr;
- }
-added in both
-  our    100644 d6d8fd35a2958b39dc0f6a76b4ee110b2951c832 brightray/browser/win/win32_desktop_notifications/desktop_notification_controller.h
-  their  100644 ad62fa727b453510e07917ee718e830e8ac84d2d brightray/browser/win/win32_desktop_notifications/desktop_notification_controller.h
-@@ -76,7 +76,12 @@
-   void DestroyToast(ToastInstance& inst);
- 
-  private:
-+<<<<<<< .our
-   static const TCHAR class_name_[];
-+=======
-+  static constexpr const TCHAR class_name_[] =
-+      TEXT("DesktopNotificationController");
-+>>>>>>> .their
- 
-   HWND hwnd_controller_ = NULL;
-   HFONT caption_font_ = NULL, body_font_ = NULL;
-@@ -87,10 +92,15 @@
- 
- class DesktopNotificationController::Notification {
-  public:
-+<<<<<<< .our
-   Notification();
-   explicit Notification(const std::shared_ptr<NotificationData>& data);
-   Notification(const Notification&);
-   ~Notification();
-+=======
-+  Notification() = default;
-+  explicit Notification(const std::shared_ptr<NotificationData>& data);
-+>>>>>>> .their
- 
-   bool operator==(const Notification& other) const;
- 
-added in both
-  our    100644 061eb977a8dc58f07aff1370467f88b10aec8003 brightray/browser/win/win32_desktop_notifications/toast.cc
-  their  100644 9a1e7cb099e83e4b6af7c5bcdde3f5c83d09e454 brightray/browser/win/win32_desktop_notifications/toast.cc
-@@ -1,11 +1,18 @@
-+<<<<<<< .our
- #ifndef NOMINMAX
- #define NOMINMAX
- #endif
-+=======
-+#define NOMINMAX
-+>>>>>>> .their
- #include "brightray/browser/win/win32_desktop_notifications/toast.h"
- #include <uxtheme.h>
- #include <windowsx.h>
- #include <algorithm>
-+<<<<<<< .our
- #include "base/logging.h"
-+=======
-+>>>>>>> .their
- #include "brightray/browser/win/win32_desktop_notifications/common.h"
- 
- #pragma comment(lib, "msimg32.lib")
-@@ -86,7 +93,11 @@
-       if (GetDIBits(hdc_screen, bitmap, 0, 0, 0,
-                     reinterpret_cast<BITMAPINFO*>(&bmi), DIB_RGB_COLORS) &&
-           bmi.biSizeImage > 0 && (bmi.biSizeImage % 4) == 0) {
-+<<<<<<< .our
-         auto* buf = reinterpret_cast<BYTE*>(
-+=======
-+        auto buf = reinterpret_cast<BYTE*>(
-+>>>>>>> .their
-             _aligned_malloc(bmi.biSizeImage, sizeof(DWORD)));
- 
-         if (buf) {
-@@ -120,12 +131,20 @@
-     bmi.biCompression = BI_RGB;
- 
-     void* color_bits;
-+<<<<<<< .our
-     auto* color_bitmap =
-+=======
-+    auto color_bitmap =
-+>>>>>>> .their
-         CreateDIBSection(NULL, reinterpret_cast<BITMAPINFO*>(&bmi),
-                          DIB_RGB_COLORS, &color_bits, NULL, 0);
- 
-     void* alpha_bits;
-+<<<<<<< .our
-     auto* alpha_bitmap =
-+=======
-+    auto alpha_bitmap =
-+>>>>>>> .their
-         CreateDIBSection(NULL, reinterpret_cast<BITMAPINFO*>(&bmi),
-                          DIB_RGB_COLORS, &alpha_bits, NULL, 0);
- 
-@@ -151,9 +170,15 @@
-       GdiFlush();
- 
-       // apply the alpha channel
-+<<<<<<< .our
-       auto* dest = reinterpret_cast<BYTE*>(color_bits);
-       auto* src = reinterpret_cast<const BYTE*>(alpha_bits);
-       auto* end = src + (width * height * 4);
-+=======
-+      auto dest = reinterpret_cast<BYTE*>(color_bits);
-+      auto src = reinterpret_cast<const BYTE*>(alpha_bits);
-+      auto end = src + (width * height * 4);
-+>>>>>>> .their
-       while (src != end) {
-         dest[3] = src[0];
-         dest += 4;
-@@ -184,9 +209,12 @@
-   return result_bitmap;
- }
- 
-+<<<<<<< .our
- const TCHAR DesktopNotificationController::Toast::class_name_[] =
-     TEXT("DesktopNotificationToast");
- 
-+=======
-+>>>>>>> .their
- DesktopNotificationController::Toast::Toast(HWND hwnd,
-                                             shared_ptr<NotificationData>* data)
-     : hwnd_(hwnd), data_(*data) {
-@@ -220,10 +248,17 @@
-                                                       LPARAM lparam) {
-   switch (message) {
-     case WM_CREATE: {
-+<<<<<<< .our
-       auto*& cs = reinterpret_cast<const CREATESTRUCT*&>(lparam);
-       auto* data =
-           static_cast<shared_ptr<NotificationData>*>(cs->lpCreateParams);
-       auto* inst = new Toast(hwnd, data);
-+=======
-+      auto& cs = reinterpret_cast<const CREATESTRUCT*&>(lparam);
-+      auto data =
-+          static_cast<shared_ptr<NotificationData>*>(cs->lpCreateParams);
-+      auto inst = new Toast(hwnd, data);
-+>>>>>>> .their
-       SetWindowLongPtr(hwnd, 0, (LONG_PTR)inst);
-     } break;
- 
-@@ -242,7 +277,11 @@
-       return 0;
- 
-     case WM_LBUTTONDOWN: {
-+<<<<<<< .our
-       auto* inst = Get(hwnd);
-+=======
-+      auto inst = Get(hwnd);
-+>>>>>>> .their
- 
-       inst->Dismiss();
- 
-@@ -255,7 +294,11 @@
-       return 0;
- 
-     case WM_MOUSEMOVE: {
-+<<<<<<< .our
-       auto* inst = Get(hwnd);
-+=======
-+      auto inst = Get(hwnd);
-+>>>>>>> .their
-       if (!inst->is_highlighted_) {
-         inst->is_highlighted_ = true;
- 
-@@ -275,7 +318,11 @@
-       return 0;
- 
-     case WM_MOUSELEAVE: {
-+<<<<<<< .our
-       auto* inst = Get(hwnd);
-+=======
-+      auto inst = Get(hwnd);
-+>>>>>>> .their
-       inst->is_highlighted_ = false;
-       inst->is_close_hot_ = false;
-       inst->UpdateContents();
-@@ -289,7 +336,11 @@
-       return 0;
- 
-     case WM_WINDOWPOSCHANGED: {
-+<<<<<<< .our
-       auto*& wp = reinterpret_cast<WINDOWPOS*&>(lparam);
-+=======
-+      auto& wp = reinterpret_cast<WINDOWPOS*&>(lparam);
-+>>>>>>> .their
-       if (wp->flags & SWP_HIDEWINDOW) {
-         if (!IsWindowVisible(hwnd))
-           Get(hwnd)->is_highlighted_ = false;
-@@ -363,7 +414,11 @@
- 
-   // Draw background
-   {
-+<<<<<<< .our
-     auto* brush = CreateSolidBrush(back_color);
-+=======
-+    auto brush = CreateSolidBrush(back_color);
-+>>>>>>> .their
- 
-     RECT rc = {0, 0, toast_size_.cx, toast_size_.cy};
-     FillRect(hdc_, &rc, brush);
-@@ -374,8 +429,13 @@
-   SetBkMode(hdc_, TRANSPARENT);
- 
-   const auto close = L'\x2715';
-+<<<<<<< .our
-   auto* caption_font = data_->controller->GetCaptionFont();
-   auto* body_font = data_->controller->GetBodyFont();
-+=======
-+  auto caption_font = data_->controller->GetCaptionFont();
-+  auto body_font = data_->controller->GetBodyFont();
-+>>>>>>> .their
- 
-   TEXTMETRIC tm_cap;
-   SelectFont(hdc_, caption_font);
-@@ -526,7 +586,11 @@
-     if (new_size.cx != this->toast_size_.cx ||
-         new_size.cy != this->toast_size_.cy) {
-       HDC hdc_screen = GetDC(NULL);
-+<<<<<<< .our
-       auto* new_bitmap =
-+=======
-+      auto new_bitmap =
-+>>>>>>> .their
-           CreateCompatibleBitmap(hdc_screen, new_size.cx, new_size.cy);
-       ReleaseDC(NULL, hdc_screen);
- 
-@@ -567,7 +631,11 @@
-             auto b1 = UpdateLayeredWindowIndirect(hwnd_, &ulw);
-             ulw.prcDirty = &dirty2;
-             auto b2 = UpdateLayeredWindowIndirect(hwnd_, &ulw);
-+<<<<<<< .our
-             DCHECK(b1 && b2);
-+=======
-+            _ASSERT(b1 && b2);
-+>>>>>>> .their
-           }
- 
-           return;
-@@ -739,21 +807,33 @@
-   // ULWI fails, which can happen when one of the dimensions is zero (e.g.
-   // at the beginning of ease-in).
- 
-+<<<<<<< .our
-   UpdateLayeredWindowIndirect(hwnd_, &ulw);
-+=======
-+  auto ulw_result = UpdateLayeredWindowIndirect(hwnd_, &ulw);
-+>>>>>>> .their
-   hdwp = DeferWindowPos(hdwp, hwnd_, HWND_TOPMOST, pt.x, pt.y, size.cx, size.cy,
-                         dwpFlags);
-   return hdwp;
- }
- 
- void DesktopNotificationController::Toast::StartEaseIn() {
-+<<<<<<< .our
-   DCHECK(!ease_in_active_);
-+=======
-+  _ASSERT(!ease_in_active_);
-+>>>>>>> .their
-   ease_in_start_ = GetTickCount();
-   ease_in_active_ = true;
-   data_->controller->StartAnimation();
- }
- 
- void DesktopNotificationController::Toast::StartEaseOut() {
-+<<<<<<< .our
-   DCHECK(!ease_out_active_);
-+=======
-+  _ASSERT(!ease_out_active_);
-+>>>>>>> .their
-   ease_out_start_ = GetTickCount();
-   ease_out_active_ = true;
-   data_->controller->StartAnimation();
-added in both
-  our    100644 5a0e91b5e5ca02a51d4938c853c8b14903a403b4 brightray/browser/win/win32_desktop_notifications/toast.h
-  their  100644 967697ac8ccaf5a72825446137b845ed64b44acd brightray/browser/win/win32_desktop_notifications/toast.h
-@@ -64,7 +64,11 @@
-   float AnimateStackCollapse();
- 
-  private:
-+<<<<<<< .our
-   static const TCHAR class_name_[];
-+=======
-+  static constexpr const TCHAR class_name_[] = TEXT("DesktopNotificationToast");
-+>>>>>>> .their
- 
-   const HWND hwnd_;
-   HDC hdc_;
-added in both
-  our    100644 adeb55656b5130e4cc09b7a5d82b78cc50a3b873 brightray/browser/win/win32_notification.cc
-  their  100644 d459438ea952de679d2197dec90656a87f8e2351 brightray/browser/win/win32_notification.cc
-@@ -1,6 +1,10 @@
-+<<<<<<< .our
- #ifndef WIN32_LEAN_AND_MEAN
- #define WIN32_LEAN_AND_MEAN
- #endif
-+=======
-+#define WIN32_LEAN_AND_MEAN
-+>>>>>>> .their
- 
- #include "brightray/browser/win/win32_notification.h"
- 
-@@ -13,7 +17,11 @@
- namespace brightray {
- 
- void Win32Notification::Show(const NotificationOptions& options) {
-+<<<<<<< .our
-   auto* presenter = static_cast<NotificationPresenterWin7*>(this->presenter());
-+=======
-+  auto presenter = static_cast<NotificationPresenterWin7*>(this->presenter());
-+>>>>>>> .their
-   if (!presenter)
-     return;
- 
-added in both
-  our    100644 a87ca051ff4ca81b0e4d6130ca3c7a2106204bdd brightray/browser/win/windows_toast_notification.cc
-  their  100644 72adba548493129d094fc044ae76ddf616dc10a3 brightray/browser/win/windows_toast_notification.cc
-@@ -80,7 +80,11 @@
- }
- 
- void WindowsToastNotification::Show(const NotificationOptions& options) {
-+<<<<<<< .our
-   auto* presenter_win = static_cast<NotificationPresenterWin*>(presenter());
-+=======
-+  auto presenter_win = static_cast<NotificationPresenterWin*>(presenter());
-+>>>>>>> .their
-   std::wstring icon_path =
-       presenter_win->SaveIconToFilesystem(options.icon, options.icon_url);
- 
-added in both
-  our    100644 6e368fb38dcb9e2fbf6d6108e39c5cfb25a5b7a5 brightray/browser/win/windows_toast_notification.h
-  their  100644 62c8b844c753ae5a35c676cdca1adcab8018f65b brightray/browser/win/windows_toast_notification.h
-@@ -47,7 +47,11 @@
- 
-   WindowsToastNotification(NotificationDelegate* delegate,
-                            NotificationPresenter* presenter);
-+<<<<<<< .our
-   ~WindowsToastNotification() override;
-+=======
-+  ~WindowsToastNotification();
-+>>>>>>> .their
- 
-  protected:
-   // Notification:
-@@ -108,7 +112,11 @@
-                                               DesktopToastFailedEventHandler> {
-  public:
-   explicit ToastEventHandler(Notification* notification);
-+<<<<<<< .our
-   ~ToastEventHandler() override;
-+=======
-+  ~ToastEventHandler();
-+>>>>>>> .their
- 
-   IFACEMETHODIMP Invoke(
-       ABI::Windows::UI::Notifications::IToastNotification* sender,
-added in both
-  our    100644 407866f006d51ac528efaba97cb3750687229900 brightray/common/application_info.h
-  their  100644 a4918cc7c3d5b3f73a5e50b2adeccbb4e527c127 brightray/common/application_info.h
-@@ -2,7 +2,10 @@
- #define BRIGHTRAY_COMMON_APPLICATION_INFO_H_
- 
- #if defined(OS_WIN)
-+<<<<<<< .our
- #include "base/strings/string16.h"
-+=======
-+>>>>>>> .their
- #include "brightray/browser/win/scoped_hstring.h"
- #endif
- 
-added in both
-  our    100644 a0256372bbdbbc1d77cb84885faab42a27f55c9f brightray/common/application_info_win.cc
-  their  100644 49a3720f01e97316b58791c9c6e8333c8d0d8314 brightray/common/application_info_win.cc
-@@ -22,14 +22,22 @@
- const wchar_t kAppUserModelIDFormat[] = L"electron.app.$1";
- 
- std::string GetApplicationName() {
-+<<<<<<< .our
-   auto* module = GetModuleHandle(nullptr);
-+=======
-+  auto module = GetModuleHandle(nullptr);
-+>>>>>>> .their
-   std::unique_ptr<FileVersionInfo> info(
-       FileVersionInfo::CreateFileVersionInfoForModule(module));
-   return base::UTF16ToUTF8(info->product_name());
- }
- 
- std::string GetApplicationVersion() {
-+<<<<<<< .our
-   auto* module = GetModuleHandle(nullptr);
-+=======
-+  auto module = GetModuleHandle(nullptr);
-+>>>>>>> .their
-   std::unique_ptr<FileVersionInfo> info(
-       FileVersionInfo::CreateFileVersionInfoForModule(module));
-   return base::UTF16ToUTF8(info->product_version());
-added in both
-  our    100644 c25cb5f0c02e6b29139cb44f01d8aab69b713381 brightray/common/main_delegate.cc
-  their  100644 5f94601be9163415329b6fa5bf372ecb8445bb79 brightray/common/main_delegate.cc
-@@ -48,6 +48,7 @@
-   if (initialized)
-     ui::ResourceBundle::CleanupSharedInstance();
- 
-+<<<<<<< .our
-   // Load other resource files.
-   base::FilePath pak_dir;
- #if defined(OS_MACOSX)
-@@ -70,6 +71,21 @@
-   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
-   bundle.ReloadLocaleResources(locale);
- 
-+=======
-+  ui::ResourceBundle::InitSharedInstanceWithLocale(
-+      locale, nullptr, ui::ResourceBundle::DO_NOT_LOAD_COMMON_RESOURCES);
-+
-+  ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
-+  bundle.ReloadLocaleResources(locale);
-+
-+  // Load other resource files.
-+  base::FilePath pak_dir;
-+#if defined(OS_MACOSX)
-+  pak_dir = base::mac::FrameworkBundlePath().Append("Resources");
-+#else
-+  PathService::Get(base::DIR_MODULE, &pak_dir);
-+#endif
-+>>>>>>> .their
-   bundle.AddDataPackFromPath(
-       pak_dir.Append(FILE_PATH_LITERAL("content_shell.pak")),
-       ui::GetSupportedScaleFactors()[0]);
-@@ -90,7 +106,10 @@
-   bundle.AddDataPackFromPath(
-       pak_dir.Append(FILE_PATH_LITERAL("views_resources_200_percent.pak")),
-       ui::SCALE_FACTOR_200P);
-+<<<<<<< .our
- #endif
-+=======
-+>>>>>>> .their
- }
- 
- MainDelegate::MainDelegate() {}
-added in both
-  our    100644 b9e2d96175f8ee2d407db9c49b2e2b74756327de brightray/filenames.gypi
-  their  100644 03b1106f978cbe08c75016f22335c3e6e21fc39f brightray/filenames.gypi
-@@ -79,6 +79,11 @@
-       'browser/win/win32_notification.h',
-       'browser/win/windows_toast_notification.cc',
-       'browser/win/windows_toast_notification.h',
-+<<<<<<< .our
-+=======
-+      'browser/special_storage_policy.cc',
-+      'browser/special_storage_policy.h',
-+>>>>>>> .their
-       'browser/url_request_context_getter.cc',
-       'browser/url_request_context_getter.h',
-       'browser/views/inspectable_web_contents_view_views.h',
-added in both
-  our    100644 110a1d892892d3e27618574c45ae9c12757eb280 build/asar.gni
-  their  100644 d9298e82d42b072c6b0c0173f913561c80eafd32 build/asar.gni
-@@ -1,5 +1,6 @@
- import("npm.gni")
- 
-+<<<<<<< .our
- # Run an action with a given working directory. Behaves identically to the
- # action() target type, with the exception that it changes directory before
- # running the script.
-@@ -30,11 +31,14 @@
-   }
- }
- 
-+=======
-+>>>>>>> .their
- template("asar") {
-   assert(defined(invoker.sources),
-          "Need sources in $target_name listing the JS files.")
-   assert(defined(invoker.outputs),
-          "Need asar name (as 1-element array, e.g. \$root_out_dir/foo.asar)")
-+<<<<<<< .our
-   assert(defined(invoker.root), "Need asar root directory")
-   asar_root = invoker.root
- 
-@@ -46,5 +50,27 @@
-     script = "//electron/tools/js2asar.py"
-     cwd = rebase_path(get_path_info(".", "abspath"))
-     args = rebase_path(outputs, cwd) + [ asar_root ] + rebase_path(sources, ".")
-+=======
-+  assert(defined(invoker.root),
-+         "Need asar root directory")
-+  asar_root = invoker.root
-+  copy_target_name = target_name + "_inputs"
-+  copy(copy_target_name) {
-+    sources = invoker.sources
-+    outputs = [
-+      "$target_gen_dir/$target_name/{{source_target_relative}}"
-+    ]
-+  }
-+  npm_action(target_name) {
-+    forward_variables_from(invoker, ["deps", "public_deps"])
-+    deps = [":$copy_target_name"]
-+    sources = invoker.sources
-+    script = "asar"
-+    outputs = invoker.outputs
-+    args = [
-+      "pack",
-+      rebase_path("$target_gen_dir/$target_name/$asar_root")
-+    ] + rebase_path(outputs)
-+>>>>>>> .their
-   }
- }
-added in remote
-  their  100644 59a181b1ac668b563384e6d3f40b3693845532b3 build/node/BUILD.gn
-@@ -0,0 +1,113 @@
-+action("configure_node") {
-+  script = "//third_party/electron_node/configure"
-+  args = [
-+    "--enable-static",
-+    "--release-urlbase=https://atom.io/download/electron",
-+    "--shared",
-+    "--shared-openssl",
-+    "--shared-openssl-includes=" + rebase_path("//third_party/boringssl/src/include"),
-+    "--shared-openssl-libname=boringssl",
-+    "--shared-openssl-libpath=" + rebase_path(root_out_dir),
-+    "--without-npm",
-+    "--without-bundled-v8",
-+    "--without-dtrace",
-+    "--without-etw",
-+    "--without-perfctr",
-+    "--without-v8-platform",
-+    "--without-intl",
-+    "--prefix=",
-+    "--config-out-dir=" + rebase_path(target_gen_dir),
-+    "--no-run-gyp",
-+  ]
-+  outputs = [
-+    "$target_gen_dir/config.gypi",
-+  ]
-+}
-+
-+action("gyp_node") {
-+  script = "//tools/gyp/gyp_main.py"
-+  deps = [ ":configure_node" ]
-+  inputs = [
-+    "//third_party/electron_node/common.gypi",
-+    "//third_party/electron_node/node.gyp",
-+    "//third_party/electron_node/node.gypi",
-+    "$target_gen_dir/config.gypi",
-+    "node_override.gypi",
-+  ]
-+  outputs = [
-+    "$target_out_dir/Release/build.ninja",
-+  ]
-+
-+  # TODO(jeremy): should shlib_suffix be set inside node.gypi?
-+  if (is_mac) {
-+    shlib_suffix = "dylib"
-+  } else if (is_linux) {
-+    shlib_suffix = "so"
-+  }
-+  args = [
-+    "-I", rebase_path("$target_gen_dir/config.gypi", root_build_dir),
-+    "-I", rebase_path("node_override.gypi", root_build_dir),
-+    "-I", rebase_path("//third_party/electron_node/common.gypi", root_build_dir),
-+    "-D", "component=shared_library",
-+    "-D", "target_arch=$target_cpu",
-+    "-D", "host_arch=$host_cpu",
-+    "-D", "config_gypi=" + rebase_path("$target_gen_dir/config.gypi"),
-+    "-Goutput_dir=./$target_out_dir", # bizarrely, gyp generates from the build root instead of from cwd
-+    "-fninja",
-+    rebase_path("//third_party/electron_node/node.gyp", root_build_dir),
-+  ]
-+}
-+
-+action("build_node") {
-+  deps = [
-+    "//third_party/boringssl",
-+    "//third_party/icu",
-+    "//v8",
-+    "//v8:v8_libbase",
-+    "//v8:v8_libplatform",
-+    ":gyp_node",
-+  ]
-+  script = "//electron/build/run-ninja.py"
-+  args = [
-+    "-C", rebase_path(target_out_dir, root_build_dir) + "/Release",
-+    "node_lib"
-+  ]
-+  if (is_mac) {
-+    outputs = [ "$target_out_dir/Release/libnode.dylib" ]
-+  }
-+  if (is_linux) {
-+    outputs = [ "$target_out_dir/Release/lib/libnode.so" ]
-+  }
-+}
-+
-+node_libs = get_target_outputs(":build_node")
-+
-+copy("copy_node") {
-+  deps = [ ":build_node" ]
-+  sources = node_libs
-+  outputs = [ "$root_out_dir/{{source_file_part}}" ]
-+}
-+
-+config("node_config") {
-+  include_dirs = [
-+    "//third_party/electron_node/src",
-+    "//third_party/electron_node/deps/uv/include",
-+    "//third_party/electron_node/deps/cares/include",
-+  ]
-+  libs = node_libs
-+  cflags_cc = [
-+    "-Wno-deprecated-declarations",
-+  ]
-+  defines = [
-+    # We need to access internal implementations of Node.
-+    "NODE_WANT_INTERNALS=1",
-+    "NODE_SHARED_MODE",
-+    "HAVE_OPENSSL=1",
-+    "HAVE_INSPECTOR=1",
-+  ]
-+}
-+
-+group("node") {
-+  public_configs = [ ":node_config" ]
-+  public_deps = [ ":copy_node" ]
-+}
-added in remote
-  their  100644 01ff4ff249786f56c7162ab4d0272711e61395a9 build/node/node_override.gypi
-@@ -0,0 +1,41 @@
-+{
-+  'variables': {
-+    # Node disables the inspector unless icu is enabled. But node doesn't know
-+    # that we're building v8 with icu, so force it on.
-+    'v8_enable_inspector': 1,
-+
-+    # By default, node will build a dylib called something like
-+    # libnode.$node_module_version.dylib, which is inconvenient for our
-+    # purposes (since it makes the library's name unpredictable). This forces
-+    # it to drop the module_version from the filename and just produce
-+    # `libnode.dylib`.
-+    'shlib_suffix': 'dylib',
-+  },
-+  'target_defaults': {
-+    'target_conditions': [
-+      ['_target_name=="node_lib"', {
-+        'include_dirs': [
-+          '../../../v8',
-+          '../../../v8/include',
-+          '../../../third_party/icu/source/common',
-+          '../../../third_party/icu/source/i18n',
-+        ],
-+        'libraries': [
-+          '../../../../../../libv8.dylib',
-+          '../../../../../../libv8_libbase.dylib',
-+          '../../../../../../libv8_libplatform.dylib',
-+          '../../../../../../libicuuc.dylib',
-+        ],
-+        'defines': [
-+          # These will no longer be necessary once
-+          # https://github.com/google/boringssl/commit/a02ed04d527e1b57b4efaa0b4f9bdbc1ed5975b2
-+          # is in the past for Electron
-+          'EVP_CIPH_CCM_MODE=0',
-+          'EVP_CIPH_WRAP_MODE=0',
-+          'EVP_CIPHER_CTX_FLAG_WRAP_ALLOW=0',
-+          'EVP_CIPHER_CTX_set_flags(...)',
-+        ],
-+      }],
-+    ],
-+  },
-+}
-added in remote
-  their  100644 802b17d51df17893196e59446fcbf6fb495310e4 build/node/toolchain.gypi
-@@ -0,0 +1,35 @@
-+{
-+  'variables': {
-+    'llvm_dir': '<(chromium_src_dir)/third_party/llvm-build/Release+Asserts',
-+  },
-+  'conditions': [
-+    ['clang==1', {
-+      'make_global_settings': [
-+        ['CC', '<(llvm_dir)/bin/clang'],
-+        ['CXX', '<(llvm_dir)/bin/clang++'],
-+        ['CC.host', '$(CC)'],
-+        ['CXX.host', '$(CXX)'],
-+      ],
-+      'target_defaults': {
-+        'target_conditions': [
-+          ['OS=="linux" and _toolset=="target"', {
-+            'cflags_cc': [
-+              '-std=gnu++14',
-+              '-nostdinc++',
-+              '-isystem<(chromium_src_dir)/buildtools/third_party/libc++/trunk/include',
-+              '-isystem<(chromium_src_dir)/buildtools/third_party/libc++abi/trunk/include',
-+            ],
-+            'ldflags': [
-+              '-nostdlib++',
-+            ],
-+          }],
-+          ['OS=="linux" and _toolset=="host"', {
-+            'cflags_cc': [
-+              '-std=gnu++14',
-+            ],
-+          }],
-+        ],
-+      },
-+    }],  # clang==1
-+  ],
-+}
-added in both
-  our    100644 1a8b6dddefd1d868bb9d2453655223742b227976 chromium_src/chrome/browser/extensions/global_shortcut_listener_win.h
-  their  100644 83e9fdff283fb9e582ed7cd65365ec88cd925530 chromium_src/chrome/browser/extensions/global_shortcut_listener_win.h
-@@ -21,17 +21,30 @@
- class GlobalShortcutListenerWin : public GlobalShortcutListener {
-  public:
-   GlobalShortcutListenerWin();
-+<<<<<<< .our
-   ~GlobalShortcutListenerWin() override;
-+=======
-+  virtual ~GlobalShortcutListenerWin();
-+>>>>>>> .their
- 
-  private:
-   // The implementation of our Window Proc, called by SingletonHwndObserver.
-   void OnWndProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam);
- 
-   // GlobalShortcutListener implementation.
-+<<<<<<< .our
-   void StartListening() override;
-   void StopListening() override;
-   bool RegisterAcceleratorImpl(const ui::Accelerator& accelerator) override;
-   void UnregisterAcceleratorImpl(const ui::Accelerator& accelerator) override;
-+=======
-+  virtual void StartListening() override;
-+  virtual void StopListening() override;
-+  virtual bool RegisterAcceleratorImpl(
-+      const ui::Accelerator& accelerator) override;
-+  virtual void UnregisterAcceleratorImpl(
-+      const ui::Accelerator& accelerator) override;
-+>>>>>>> .their
- 
-   // Whether this object is listening for global shortcuts.
-   bool is_listening_;
-added in remote
-  their  100644 28229a178e6ca1103e5b0fdffc9718a5bd8d79b8 chromium_src/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc
-@@ -0,0 +1,94 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h"
-+
-+#include "build/build_config.h"
-+#include "chrome/browser/renderer_host/pepper/pepper_broker_message_filter.h"
-+#include "chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h"
-+#include "chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.h"
-+#include "chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h"
-+#include "chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h"
-+#include "content/public/browser/browser_ppapi_host.h"
-+#include "ppapi/host/message_filter_host.h"
-+#include "ppapi/host/ppapi_host.h"
-+#include "ppapi/host/resource_host.h"
-+#include "ppapi/proxy/ppapi_messages.h"
-+#include "ppapi/shared_impl/ppapi_permissions.h"
-+
-+using ppapi::host::MessageFilterHost;
-+using ppapi::host::ResourceHost;
-+using ppapi::host::ResourceMessageFilter;
-+
-+namespace chrome {
-+
-+ChromeBrowserPepperHostFactory::ChromeBrowserPepperHostFactory(
-+    content::BrowserPpapiHost* host)
-+    : host_(host) {}
-+
-+ChromeBrowserPepperHostFactory::~ChromeBrowserPepperHostFactory() {}
-+
-+std::unique_ptr<ResourceHost>
-+ChromeBrowserPepperHostFactory::CreateResourceHost(
-+    ppapi::host::PpapiHost* host,
-+    PP_Resource resource,
-+    PP_Instance instance,
-+    const IPC::Message& message) {
-+  DCHECK(host == host_->GetPpapiHost());
-+
-+  // Make sure the plugin is giving us a valid instance for this resource.
-+  if (!host_->IsValidInstance(instance))
-+    return std::unique_ptr<ResourceHost>();
-+
-+  // Private interfaces.
-+  if (host_->GetPpapiHost()->permissions().HasPermission(
-+          ppapi::PERMISSION_PRIVATE)) {
-+    switch (message.type()) {
-+      case PpapiHostMsg_Broker_Create::ID: {
-+        scoped_refptr<ResourceMessageFilter> broker_filter(
-+            new PepperBrokerMessageFilter(instance, host_));
-+        return std::unique_ptr<ResourceHost>(new MessageFilterHost(
-+            host_->GetPpapiHost(), instance, resource, broker_filter));
-+      }
-+    }
-+  }
-+
-+  // Flash interfaces.
-+  if (host_->GetPpapiHost()->permissions().HasPermission(
-+          ppapi::PERMISSION_FLASH)) {
-+    switch (message.type()) {
-+      case PpapiHostMsg_Flash_Create::ID:
-+        return std::unique_ptr<ResourceHost>(
-+            new PepperFlashBrowserHost(host_, instance, resource));
-+      case PpapiHostMsg_FlashClipboard_Create::ID: {
-+        scoped_refptr<ResourceMessageFilter> clipboard_filter(
-+            new PepperFlashClipboardMessageFilter);
-+        return std::unique_ptr<ResourceHost>(new MessageFilterHost(
-+            host_->GetPpapiHost(), instance, resource, clipboard_filter));
-+      }
-+      case PpapiHostMsg_FlashDRM_Create::ID:
-+        return std::unique_ptr<ResourceHost>(
-+            new chrome::PepperFlashDRMHost(host_, instance, resource));
-+    }
-+  }
-+
-+  // Permissions for the following interfaces will be checked at the
-+  // time of the corresponding instance's methods calls (because
-+  // permission check can be performed only on the UI
-+  // thread). Currently these interfaces are available only for
-+  // whitelisted apps which may not have access to the other private
-+  // interfaces.
-+  if (message.type() == PpapiHostMsg_IsolatedFileSystem_Create::ID) {
-+    PepperIsolatedFileSystemMessageFilter* isolated_fs_filter =
-+        PepperIsolatedFileSystemMessageFilter::Create(instance, host_);
-+    if (!isolated_fs_filter)
-+      return std::unique_ptr<ResourceHost>();
-+    return std::unique_ptr<ResourceHost>(
-+        new MessageFilterHost(host, instance, resource, isolated_fs_filter));
-+  }
-+
-+  return std::unique_ptr<ResourceHost>();
-+}
-+
-+}  // namespace chrome
-added in remote
-  their  100644 84385140ceca7e4eb2e16b2a0802714fd0aa392b chromium_src/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h
-@@ -0,0 +1,38 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_BROWSER_RENDERER_HOST_PEPPER_CHROME_BROWSER_PEPPER_HOST_FACTORY_H_
-+#define CHROME_BROWSER_RENDERER_HOST_PEPPER_CHROME_BROWSER_PEPPER_HOST_FACTORY_H_
-+
-+#include "base/macros.h"
-+#include "ppapi/host/host_factory.h"
-+
-+namespace content {
-+class BrowserPpapiHost;
-+}  // namespace content
-+
-+namespace chrome {
-+
-+class ChromeBrowserPepperHostFactory : public ppapi::host::HostFactory {
-+ public:
-+  // Non-owning pointer to the filter must outlive this class.
-+  explicit ChromeBrowserPepperHostFactory(content::BrowserPpapiHost* host);
-+  ~ChromeBrowserPepperHostFactory() override;
-+
-+  std::unique_ptr<ppapi::host::ResourceHost> CreateResourceHost(
-+      ppapi::host::PpapiHost* host,
-+      PP_Resource resource,
-+      PP_Instance instance,
-+      const IPC::Message& message) override;
-+
-+ private:
-+  // Non-owning pointer.
-+  content::BrowserPpapiHost* host_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(ChromeBrowserPepperHostFactory);
-+};
-+
-+}  // namespace chrome
-+
-+#endif  // CHROME_BROWSER_RENDERER_HOST_PEPPER_CHROME_BROWSER_PEPPER_HOST_FACTORY_H_
-added in remote
-  their  100644 cc10ee85780caa46817802f861e38f9ce9af9d61 chromium_src/chrome/browser/renderer_host/pepper/monitor_finder_mac.h
-@@ -0,0 +1,52 @@
-+// Copyright 2014 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_BROWSER_RENDERER_HOST_PEPPER_MONITOR_FINDER_MAC_H_
-+#define CHROME_BROWSER_RENDERER_HOST_PEPPER_MONITOR_FINDER_MAC_H_
-+
-+#include <ApplicationServices/ApplicationServices.h>
-+#include <stdint.h>
-+
-+#include "base/macros.h"
-+#include "base/memory/ref_counted.h"
-+#include "base/synchronization/lock.h"
-+
-+namespace chrome {
-+
-+// MonitorFinder maps a RenderFrameHost to the display ID on which the widget
-+// is painting. This class operates on the IO thread while the RenderFrameHost
-+// is on the UI thread, so the value returned by GetMonitor() may be 0 until
-+// the information can be retrieved asynchronously.
-+class MonitorFinder : public base::RefCountedThreadSafe<MonitorFinder> {
-+ public:
-+  MonitorFinder(int process_id, int render_frame_id);
-+
-+  // Gets the native display ID for the <process_id, render_frame_id> tuple.
-+  int64_t GetMonitor();
-+
-+  // Checks if the given |monitor_id| represents a built-in display.
-+  static bool IsMonitorBuiltIn(int64_t monitor_id);
-+
-+ private:
-+  friend class base::RefCountedThreadSafe<MonitorFinder>;
-+  ~MonitorFinder();
-+
-+  // Method run on the UI thread to get the display information.
-+  void FetchMonitorFromWidget();
-+
-+  const int process_id_;
-+  const int render_frame_id_;
-+
-+  base::Lock mutex_;  // Protects the two members below.
-+  // Whether one request to FetchMonitorFromWidget() has been made already.
-+  bool request_sent_;
-+  // The native display ID for the RenderFrameHost.
-+  CGDirectDisplayID display_id_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(MonitorFinder);
-+};
-+
-+}  // namespace chrome
-+
-+#endif  // CHROME_BROWSER_RENDERER_HOST_PEPPER_MONITOR_FINDER_H_
-added in remote
-  their  100644 e6e0a62fa67edabae605c17ae87a38df083f70cc chromium_src/chrome/browser/renderer_host/pepper/monitor_finder_mac.mm
-@@ -0,0 +1,61 @@
-+// Copyright 2014 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/browser/renderer_host/pepper/monitor_finder_mac.h"
-+
-+#import <Cocoa/Cocoa.h>
-+
-+#include "content/public/browser/browser_thread.h"
-+#include "content/public/browser/render_frame_host.h"
-+
-+namespace chrome {
-+
-+MonitorFinder::MonitorFinder(int process_id, int render_frame_id)
-+    : process_id_(process_id),
-+      render_frame_id_(render_frame_id),
-+      request_sent_(false),
-+      display_id_(kCGNullDirectDisplay) {}
-+
-+MonitorFinder::~MonitorFinder() {}
-+
-+int64_t MonitorFinder::GetMonitor() {
-+  {
-+    // The plugin may call this method several times, so avoid spamming the UI
-+    // thread with requests by only allowing one outstanding request at a time.
-+    base::AutoLock lock(mutex_);
-+    if (request_sent_)
-+      return display_id_;
-+    request_sent_ = true;
-+  }
-+
-+  content::BrowserThread::PostTask(
-+      content::BrowserThread::UI, FROM_HERE,
-+      base::Bind(&MonitorFinder::FetchMonitorFromWidget, this));
-+  return display_id_;
-+}
-+
-+// static
-+bool MonitorFinder::IsMonitorBuiltIn(int64_t display_id) {
-+  return CGDisplayIsBuiltin(display_id);
-+}
-+
-+void MonitorFinder::FetchMonitorFromWidget() {
-+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-+  content::RenderFrameHost* rfh =
-+      content::RenderFrameHost::FromID(process_id_, render_frame_id_);
-+  if (!rfh)
-+    return;
-+
-+  gfx::NativeView native_view = rfh->GetNativeView();
-+  NSWindow* window = [native_view window];
-+  NSScreen* screen = [window screen];
-+  CGDirectDisplayID display_id =
-+      [[[screen deviceDescription] objectForKey:@"NSScreenNumber"] intValue];
-+
-+  base::AutoLock lock(mutex_);
-+  request_sent_ = false;
-+  display_id_ = display_id;
-+}
-+
-+}  // namespace chrome
-added in remote
-  their  100644 d40ad53dd17d24a24f00b5c669d6e113760a1c0a chromium_src/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc
-@@ -0,0 +1,53 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/browser/renderer_host/pepper/pepper_broker_message_filter.h"
-+
-+#include <string>
-+
-+#include "content/public/browser/browser_ppapi_host.h"
-+#include "content/public/browser/browser_thread.h"
-+#include "content/public/browser/render_process_host.h"
-+#include "ipc/ipc_message_macros.h"
-+#include "ppapi/c/pp_errors.h"
-+#include "ppapi/host/dispatch_host_message.h"
-+#include "ppapi/proxy/ppapi_messages.h"
-+#include "url/gurl.h"
-+
-+using content::BrowserPpapiHost;
-+using content::BrowserThread;
-+
-+namespace chrome {
-+
-+PepperBrokerMessageFilter::PepperBrokerMessageFilter(PP_Instance instance,
-+                                                     BrowserPpapiHost* host)
-+    : document_url_(host->GetDocumentURLForInstance(instance)) {
-+  int unused;
-+  host->GetRenderFrameIDsForInstance(instance, &render_process_id_, &unused);
-+}
-+
-+PepperBrokerMessageFilter::~PepperBrokerMessageFilter() {}
-+
-+scoped_refptr<base::TaskRunner>
-+PepperBrokerMessageFilter::OverrideTaskRunnerForMessage(
-+    const IPC::Message& message) {
-+  return BrowserThread::GetTaskRunnerForThread(BrowserThread::UI);
-+}
-+
-+int32_t PepperBrokerMessageFilter::OnResourceMessageReceived(
-+    const IPC::Message& msg,
-+    ppapi::host::HostMessageContext* context) {
-+  PPAPI_BEGIN_MESSAGE_MAP(PepperBrokerMessageFilter, msg)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL_0(PpapiHostMsg_Broker_IsAllowed,
-+                                        OnIsAllowed)
-+  PPAPI_END_MESSAGE_MAP()
-+  return PP_ERROR_FAILED;
-+}
-+
-+int32_t PepperBrokerMessageFilter::OnIsAllowed(
-+    ppapi::host::HostMessageContext* context) {
-+  return PP_OK;
-+}
-+
-+}  // namespace chrome
-added in remote
-  their  100644 2aad5593b26a1eab56841e56fc56acf1d5cba28b chromium_src/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.h
-@@ -0,0 +1,51 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_BROKER_MESSAGE_FILTER_H_
-+#define CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_BROKER_MESSAGE_FILTER_H_
-+
-+#include "base/compiler_specific.h"
-+#include "ppapi/c/pp_instance.h"
-+#include "ppapi/host/resource_message_filter.h"
-+#include "url/gurl.h"
-+
-+namespace content {
-+class BrowserPpapiHost;
-+}
-+
-+namespace ppapi {
-+namespace host {
-+struct HostMessageContext;
-+}
-+}  // namespace ppapi
-+
-+namespace chrome {
-+
-+// This filter handles messages for the PepperBrokerHost on the UI thread.
-+class PepperBrokerMessageFilter : public ppapi::host::ResourceMessageFilter {
-+ public:
-+  PepperBrokerMessageFilter(PP_Instance instance,
-+                            content::BrowserPpapiHost* host);
-+
-+ private:
-+  ~PepperBrokerMessageFilter() override;
-+
-+  // ppapi::host::ResourceMessageFilter overrides.
-+  scoped_refptr<base::TaskRunner> OverrideTaskRunnerForMessage(
-+      const IPC::Message& message) override;
-+  int32_t OnResourceMessageReceived(
-+      const IPC::Message& msg,
-+      ppapi::host::HostMessageContext* context) override;
-+
-+  int32_t OnIsAllowed(ppapi::host::HostMessageContext* context);
-+
-+  int render_process_id_;
-+  GURL document_url_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(PepperBrokerMessageFilter);
-+};
-+
-+}  // namespace chrome
-+
-+#endif  // CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_BROKER_MESSAGE_FILTER_H_
-added in remote
-  their  100644 901da1ad6e221b55196a1b25a1549fa272b4fdf7 chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc
-@@ -0,0 +1,111 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h"
-+
-+#include "base/time/time.h"
-+#include "content/public/browser/browser_context.h"
-+#include "content/public/browser/browser_ppapi_host.h"
-+#include "content/public/browser/browser_thread.h"
-+#include "content/public/browser/render_process_host.h"
-+#include "ipc/ipc_message_macros.h"
-+#include "ppapi/c/pp_errors.h"
-+#include "ppapi/c/private/ppb_flash.h"
-+#include "ppapi/host/dispatch_host_message.h"
-+#include "ppapi/proxy/ppapi_messages.h"
-+#include "ppapi/proxy/resource_message_params.h"
-+#include "ppapi/shared_impl/time_conversion.h"
-+#include "url/gurl.h"
-+
-+#if defined(OS_WIN)
-+#include <windows.h>
-+#elif defined(OS_MACOSX)
-+#include <CoreServices/CoreServices.h>
-+#endif
-+
-+using content::BrowserPpapiHost;
-+using content::BrowserThread;
-+
-+namespace chrome {
-+
-+PepperFlashBrowserHost::PepperFlashBrowserHost(BrowserPpapiHost* host,
-+                                               PP_Instance instance,
-+                                               PP_Resource resource)
-+    : ResourceHost(host->GetPpapiHost(), instance, resource),
-+      host_(host),
-+      weak_factory_(this) {
-+  int unused;
-+  host->GetRenderFrameIDsForInstance(instance, &render_process_id_, &unused);
-+}
-+
-+PepperFlashBrowserHost::~PepperFlashBrowserHost() {}
-+
-+int32_t PepperFlashBrowserHost::OnResourceMessageReceived(
-+    const IPC::Message& msg,
-+    ppapi::host::HostMessageContext* context) {
-+  PPAPI_BEGIN_MESSAGE_MAP(PepperFlashBrowserHost, msg)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL_0(PpapiHostMsg_Flash_UpdateActivity,
-+                                        OnUpdateActivity)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_Flash_GetLocalTimeZoneOffset,
-+                                      OnGetLocalTimeZoneOffset)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL_0(
-+        PpapiHostMsg_Flash_GetLocalDataRestrictions, OnGetLocalDataRestrictions)
-+  PPAPI_END_MESSAGE_MAP()
-+  return PP_ERROR_FAILED;
-+}
-+
-+int32_t PepperFlashBrowserHost::OnUpdateActivity(
-+    ppapi::host::HostMessageContext* host_context) {
-+#if defined(OS_WIN)
-+  // Reading then writing back the same value to the screensaver timeout system
-+  // setting resets the countdown which prevents the screensaver from turning
-+  // on "for a while". As long as the plugin pings us with this message faster
-+  // than the screensaver timeout, it won't go on.
-+  int value = 0;
-+  if (SystemParametersInfo(SPI_GETSCREENSAVETIMEOUT, 0, &value, 0))
-+    SystemParametersInfo(SPI_SETSCREENSAVETIMEOUT, value, NULL, 0);
-+#elif defined(OS_MACOSX)
-+// UpdateSystemActivity(OverallAct);
-+#else
-+// TODO(brettw) implement this for other platforms.
-+#endif
-+  return PP_OK;
-+}
-+
-+int32_t PepperFlashBrowserHost::OnGetLocalTimeZoneOffset(
-+    ppapi::host::HostMessageContext* host_context,
-+    const base::Time& t) {
-+  // The reason for this processing being in the browser process is that on
-+  // Linux, the localtime calls require filesystem access prohibited by the
-+  // sandbox.
-+  host_context->reply_msg = PpapiPluginMsg_Flash_GetLocalTimeZoneOffsetReply(
-+      ppapi::PPGetLocalTimeZoneOffset(t));
-+  return PP_OK;
-+}
-+
-+int32_t PepperFlashBrowserHost::OnGetLocalDataRestrictions(
-+    ppapi::host::HostMessageContext* context) {
-+  // Getting the Flash LSO settings requires using the CookieSettings which
-+  // belong to the profile which lives on the UI thread. We lazily initialize
-+  // |cookie_settings_| by grabbing the reference from the UI thread and then
-+  // call |GetLocalDataRestrictions| with it.
-+  GURL document_url = host_->GetDocumentURLForInstance(pp_instance());
-+  GURL plugin_url = host_->GetPluginURLForInstance(pp_instance());
-+  GetLocalDataRestrictions(context->MakeReplyMessageContext(), document_url,
-+                           plugin_url);
-+  return PP_OK_COMPLETIONPENDING;
-+}
-+
-+void PepperFlashBrowserHost::GetLocalDataRestrictions(
-+    ppapi::host::ReplyMessageContext reply_context,
-+    const GURL& document_url,
-+    const GURL& plugin_url) {
-+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-+
-+  PP_FlashLSORestrictions restrictions = PP_FLASHLSORESTRICTIONS_NONE;
-+  SendReply(reply_context, PpapiPluginMsg_Flash_GetLocalDataRestrictionsReply(
-+                               static_cast<int32_t>(restrictions)));
-+}
-+
-+}  // namespace chrome
-added in remote
-  their  100644 65e0d02c001c6086d78d09154a515d031293227d chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h
-@@ -0,0 +1,59 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_FLASH_BROWSER_HOST_H_
-+#define CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_FLASH_BROWSER_HOST_H_
-+
-+#include "base/memory/ref_counted.h"
-+#include "base/memory/weak_ptr.h"
-+#include "ppapi/host/host_message_context.h"
-+#include "ppapi/host/resource_host.h"
-+
-+namespace base {
-+class Time;
-+}
-+
-+namespace content {
-+class BrowserPpapiHost;
-+class ResourceContext;
-+}  // namespace content
-+
-+class GURL;
-+
-+namespace chrome {
-+
-+class PepperFlashBrowserHost : public ppapi::host::ResourceHost {
-+ public:
-+  PepperFlashBrowserHost(content::BrowserPpapiHost* host,
-+                         PP_Instance instance,
-+                         PP_Resource resource);
-+  ~PepperFlashBrowserHost() override;
-+
-+  // ppapi::host::ResourceHost override.
-+  int32_t OnResourceMessageReceived(
-+      const IPC::Message& msg,
-+      ppapi::host::HostMessageContext* context) override;
-+
-+ private:
-+  int32_t OnUpdateActivity(ppapi::host::HostMessageContext* host_context);
-+  int32_t OnGetLocalTimeZoneOffset(
-+      ppapi::host::HostMessageContext* host_context,
-+      const base::Time& t);
-+  int32_t OnGetLocalDataRestrictions(ppapi::host::HostMessageContext* context);
-+
-+  void GetLocalDataRestrictions(ppapi::host::ReplyMessageContext reply_context,
-+                                const GURL& document_url,
-+                                const GURL& plugin_url);
-+
-+  content::BrowserPpapiHost* host_;
-+  int render_process_id_;
-+  // For fetching the Flash LSO settings.
-+  base::WeakPtrFactory<PepperFlashBrowserHost> weak_factory_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(PepperFlashBrowserHost);
-+};
-+
-+}  // namespace chrome
-+
-+#endif  // CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_FLASH_BROWSER_HOST_H_
-added in remote
-  their  100644 c62d2d98621d6f8cc651501111af81f7a5ade2c0 chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc
-@@ -0,0 +1,372 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.h"
-+
-+#include <stddef.h>
-+
-+#include "base/pickle.h"
-+#include "base/strings/utf_string_conversions.h"
-+#include "content/public/browser/browser_thread.h"
-+#include "ipc/ipc_message.h"
-+#include "ipc/ipc_message_macros.h"
-+#include "ppapi/c/pp_errors.h"
-+#include "ppapi/c/private/ppb_flash_clipboard.h"
-+#include "ppapi/host/dispatch_host_message.h"
-+#include "ppapi/host/host_message_context.h"
-+#include "ppapi/host/ppapi_host.h"
-+#include "ppapi/proxy/ppapi_messages.h"
-+#include "ppapi/proxy/resource_message_params.h"
-+#include "ui/base/clipboard/scoped_clipboard_writer.h"
-+
-+using content::BrowserThread;
-+
-+namespace chrome {
-+
-+namespace {
-+
-+const size_t kMaxClipboardWriteSize = 1000000;
-+
-+ui::ClipboardType ConvertClipboardType(uint32_t type) {
-+  switch (type) {
-+    case PP_FLASH_CLIPBOARD_TYPE_STANDARD:
-+      return ui::CLIPBOARD_TYPE_COPY_PASTE;
-+    case PP_FLASH_CLIPBOARD_TYPE_SELECTION:
-+      return ui::CLIPBOARD_TYPE_SELECTION;
-+  }
-+  NOTREACHED();
-+  return ui::CLIPBOARD_TYPE_COPY_PASTE;
-+}
-+
-+// Functions to pack/unpack custom data from a pickle. See the header file for
-+// more detail on custom formats in Pepper.
-+// TODO(raymes): Currently pepper custom formats are stored in their own
-+// native format type. However we should be able to store them in the same way
-+// as "Web Custom" formats are. This would allow clipboard data to be shared
-+// between pepper applications and web applications. However currently web apps
-+// assume all data that is placed on the clipboard is UTF16 and pepper allows
-+// arbitrary data so this change would require some reworking of the chrome
-+// clipboard interface for custom data.
-+bool JumpToFormatInPickle(const base::string16& format,
-+                          base::PickleIterator* iter) {
-+  uint32_t size = 0;
-+  if (!iter->ReadUInt32(&size))
-+    return false;
-+  for (uint32_t i = 0; i < size; ++i) {
-+    base::string16 stored_format;
-+    if (!iter->ReadString16(&stored_format))
-+      return false;
-+    if (stored_format == format)
-+      return true;
-+    int skip_length;
-+    if (!iter->ReadLength(&skip_length))
-+      return false;
-+    if (!iter->SkipBytes(skip_length))
-+      return false;
-+  }
-+  return false;
-+}
-+
-+bool IsFormatAvailableInPickle(const base::string16& format,
-+                               const base::Pickle& pickle) {
-+  base::PickleIterator iter(pickle);
-+  return JumpToFormatInPickle(format, &iter);
-+}
-+
-+std::string ReadDataFromPickle(const base::string16& format,
-+                               const base::Pickle& pickle) {
-+  std::string result;
-+  base::PickleIterator iter(pickle);
-+  if (!JumpToFormatInPickle(format, &iter) || !iter.ReadString(&result))
-+    return std::string();
-+  return result;
-+}
-+
-+void WriteDataToPickle(const std::map<base::string16, std::string>& data,
-+                       base::Pickle* pickle) {
-+  pickle->WriteUInt32(data.size());
-+  for (std::map<base::string16, std::string>::const_iterator it = data.begin();
-+       it != data.end(); ++it) {
-+    pickle->WriteString16(it->first);
-+    pickle->WriteString(it->second);
-+  }
-+}
-+
-+}  // namespace
-+
-+PepperFlashClipboardMessageFilter::PepperFlashClipboardMessageFilter() {}
-+
-+PepperFlashClipboardMessageFilter::~PepperFlashClipboardMessageFilter() {}
-+
-+scoped_refptr<base::TaskRunner>
-+PepperFlashClipboardMessageFilter::OverrideTaskRunnerForMessage(
-+    const IPC::Message& msg) {
-+  // Clipboard writes should always occur on the UI thread due to the
-+  // restrictions of various platform APIs. In general, the clipboard is not
-+  // thread-safe, so all clipboard calls should be serviced from the UI thread.
-+  if (msg.type() == PpapiHostMsg_FlashClipboard_WriteData::ID)
-+    return BrowserThread::GetTaskRunnerForThread(BrowserThread::UI);
-+
-+// Windows needs clipboard reads to be serviced from the IO thread because
-+// these are sync IPCs which can result in deadlocks with plugins if serviced
-+// from the UI thread. Note that Windows clipboard calls ARE thread-safe so it
-+// is ok for reads and writes to be serviced from different threads.
-+#if !defined(OS_WIN)
-+  return BrowserThread::GetTaskRunnerForThread(BrowserThread::UI);
-+#else
-+  return BrowserThread::GetTaskRunnerForThread(BrowserThread::IO);
-+#endif
-+}
-+
-+int32_t PepperFlashClipboardMessageFilter::OnResourceMessageReceived(
-+    const IPC::Message& msg,
-+    ppapi::host::HostMessageContext* context) {
-+  PPAPI_BEGIN_MESSAGE_MAP(PepperFlashClipboardMessageFilter, msg)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(
-+        PpapiHostMsg_FlashClipboard_RegisterCustomFormat,
-+        OnMsgRegisterCustomFormat)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(
-+        PpapiHostMsg_FlashClipboard_IsFormatAvailable, OnMsgIsFormatAvailable)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_FlashClipboard_ReadData,
-+                                      OnMsgReadData)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_FlashClipboard_WriteData,
-+                                      OnMsgWriteData)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(
-+        PpapiHostMsg_FlashClipboard_GetSequenceNumber, OnMsgGetSequenceNumber)
-+  PPAPI_END_MESSAGE_MAP()
-+  return PP_ERROR_FAILED;
-+}
-+
-+int32_t PepperFlashClipboardMessageFilter::OnMsgRegisterCustomFormat(
-+    ppapi::host::HostMessageContext* host_context,
-+    const std::string& format_name) {
-+  uint32_t format = custom_formats_.RegisterFormat(format_name);
-+  if (format == PP_FLASH_CLIPBOARD_FORMAT_INVALID)
-+    return PP_ERROR_FAILED;
-+  host_context->reply_msg =
-+      PpapiPluginMsg_FlashClipboard_RegisterCustomFormatReply(format);
-+  return PP_OK;
-+}
-+
-+int32_t PepperFlashClipboardMessageFilter::OnMsgIsFormatAvailable(
-+    ppapi::host::HostMessageContext* host_context,
-+    uint32_t clipboard_type,
-+    uint32_t format) {
-+  if (clipboard_type != PP_FLASH_CLIPBOARD_TYPE_STANDARD) {
-+    NOTIMPLEMENTED();
-+    return PP_ERROR_FAILED;
-+  }
-+
-+  ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
-+  ui::ClipboardType type = ConvertClipboardType(clipboard_type);
-+  bool available = false;
-+  switch (format) {
-+    case PP_FLASH_CLIPBOARD_FORMAT_PLAINTEXT: {
-+      bool plain = clipboard->IsFormatAvailable(
-+          ui::Clipboard::GetPlainTextFormatType(), type);
-+      bool plainw = clipboard->IsFormatAvailable(
-+          ui::Clipboard::GetPlainTextWFormatType(), type);
-+      available = plain || plainw;
-+      break;
-+    }
-+    case PP_FLASH_CLIPBOARD_FORMAT_HTML:
-+      available = clipboard->IsFormatAvailable(
-+          ui::Clipboard::GetHtmlFormatType(), type);
-+      break;
-+    case PP_FLASH_CLIPBOARD_FORMAT_RTF:
-+      available =
-+          clipboard->IsFormatAvailable(ui::Clipboard::GetRtfFormatType(), type);
-+      break;
-+    case PP_FLASH_CLIPBOARD_FORMAT_INVALID:
-+      break;
-+    default:
-+      if (custom_formats_.IsFormatRegistered(format)) {
-+        std::string format_name = custom_formats_.GetFormatName(format);
-+        std::string clipboard_data;
-+        clipboard->ReadData(ui::Clipboard::GetPepperCustomDataFormatType(),
-+                            &clipboard_data);
-+        base::Pickle pickle(clipboard_data.data(), clipboard_data.size());
-+        available =
-+            IsFormatAvailableInPickle(base::UTF8ToUTF16(format_name), pickle);
-+      }
-+      break;
-+  }
-+
-+  return available ? PP_OK : PP_ERROR_FAILED;
-+}
-+
-+int32_t PepperFlashClipboardMessageFilter::OnMsgReadData(
-+    ppapi::host::HostMessageContext* host_context,
-+    uint32_t clipboard_type,
-+    uint32_t format) {
-+  if (clipboard_type != PP_FLASH_CLIPBOARD_TYPE_STANDARD) {
-+    NOTIMPLEMENTED();
-+    return PP_ERROR_FAILED;
-+  }
-+
-+  ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
-+  ui::ClipboardType type = ConvertClipboardType(clipboard_type);
-+  std::string clipboard_string;
-+  int32_t result = PP_ERROR_FAILED;
-+  switch (format) {
-+    case PP_FLASH_CLIPBOARD_FORMAT_PLAINTEXT: {
-+      if (clipboard->IsFormatAvailable(ui::Clipboard::GetPlainTextWFormatType(),
-+                                       type)) {
-+        base::string16 text;
-+        clipboard->ReadText(type, &text);
-+        if (!text.empty()) {
-+          result = PP_OK;
-+          clipboard_string = base::UTF16ToUTF8(text);
-+          break;
-+        }
-+      }
-+      // If the PlainTextW format isn't available or is empty, take the
-+      // ASCII text format.
-+      if (clipboard->IsFormatAvailable(ui::Clipboard::GetPlainTextFormatType(),
-+                                       type)) {
-+        result = PP_OK;
-+        clipboard->ReadAsciiText(type, &clipboard_string);
-+      }
-+      break;
-+    }
-+    case PP_FLASH_CLIPBOARD_FORMAT_HTML: {
-+      if (!clipboard->IsFormatAvailable(ui::Clipboard::GetHtmlFormatType(),
-+                                        type)) {
-+        break;
-+      }
-+
-+      base::string16 html;
-+      std::string url;
-+      uint32_t fragment_start;
-+      uint32_t fragment_end;
-+      clipboard->ReadHTML(type, &html, &url, &fragment_start, &fragment_end);
-+      result = PP_OK;
-+      clipboard_string = base::UTF16ToUTF8(
-+          html.substr(fragment_start, fragment_end - fragment_start));
-+      break;
-+    }
-+    case PP_FLASH_CLIPBOARD_FORMAT_RTF: {
-+      if (!clipboard->IsFormatAvailable(ui::Clipboard::GetRtfFormatType(),
-+                                        type)) {
-+        break;
-+      }
-+      result = PP_OK;
-+      clipboard->ReadRTF(type, &clipboard_string);
-+      break;
-+    }
-+    case PP_FLASH_CLIPBOARD_FORMAT_INVALID:
-+      break;
-+    default: {
-+      if (custom_formats_.IsFormatRegistered(format)) {
-+        base::string16 format_name =
-+            base::UTF8ToUTF16(custom_formats_.GetFormatName(format));
-+        std::string clipboard_data;
-+        clipboard->ReadData(ui::Clipboard::GetPepperCustomDataFormatType(),
-+                            &clipboard_data);
-+        base::Pickle pickle(clipboard_data.data(), clipboard_data.size());
-+        if (IsFormatAvailableInPickle(format_name, pickle)) {
-+          result = PP_OK;
-+          clipboard_string = ReadDataFromPickle(format_name, pickle);
-+        }
-+      }
-+      break;
-+    }
-+  }
-+
-+  if (result == PP_OK) {
-+    host_context->reply_msg =
-+        PpapiPluginMsg_FlashClipboard_ReadDataReply(clipboard_string);
-+  }
-+  return result;
-+}
-+
-+int32_t PepperFlashClipboardMessageFilter::OnMsgWriteData(
-+    ppapi::host::HostMessageContext* host_context,
-+    uint32_t clipboard_type,
-+    const std::vector<uint32_t>& formats,
-+    const std::vector<std::string>& data) {
-+  if (clipboard_type != PP_FLASH_CLIPBOARD_TYPE_STANDARD) {
-+    NOTIMPLEMENTED();
-+    return PP_ERROR_FAILED;
-+  }
-+  if (formats.size() != data.size())
-+    return PP_ERROR_FAILED;
-+
-+  ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
-+  ui::ClipboardType type = ConvertClipboardType(clipboard_type);
-+  // If no formats are passed in clear the clipboard.
-+  if (formats.size() == 0) {
-+    clipboard->Clear(type);
-+    return PP_OK;
-+  }
-+
-+  ui::ScopedClipboardWriter scw(type);
-+  std::map<base::string16, std::string> custom_data_map;
-+  int32_t res = PP_OK;
-+  for (uint32_t i = 0; i < formats.size(); ++i) {
-+    if (data[i].length() > kMaxClipboardWriteSize) {
-+      res = PP_ERROR_NOSPACE;
-+      break;
-+    }
-+
-+    switch (formats[i]) {
-+      case PP_FLASH_CLIPBOARD_FORMAT_PLAINTEXT:
-+        scw.WriteText(base::UTF8ToUTF16(data[i]));
-+        break;
-+      case PP_FLASH_CLIPBOARD_FORMAT_HTML:
-+        scw.WriteHTML(base::UTF8ToUTF16(data[i]), std::string());
-+        break;
-+      case PP_FLASH_CLIPBOARD_FORMAT_RTF:
-+        scw.WriteRTF(data[i]);
-+        break;
-+      case PP_FLASH_CLIPBOARD_FORMAT_INVALID:
-+        res = PP_ERROR_BADARGUMENT;
-+        break;
-+      default:
-+        if (custom_formats_.IsFormatRegistered(formats[i])) {
-+          std::string format_name = custom_formats_.GetFormatName(formats[i]);
-+          custom_data_map[base::UTF8ToUTF16(format_name)] = data[i];
-+        } else {
-+          // Invalid format.
-+          res = PP_ERROR_BADARGUMENT;
-+          break;
-+        }
-+    }
-+
-+    if (res != PP_OK)
-+      break;
-+  }
-+
-+  if (custom_data_map.size() > 0) {
-+    base::Pickle pickle;
-+    WriteDataToPickle(custom_data_map, &pickle);
-+    scw.WritePickledData(pickle,
-+                         ui::Clipboard::GetPepperCustomDataFormatType());
-+  }
-+
-+  if (res != PP_OK) {
-+    // Need to clear the objects so nothing is written.
-+    scw.Reset();
-+  }
-+
-+  return res;
-+}
-+
-+int32_t PepperFlashClipboardMessageFilter::OnMsgGetSequenceNumber(
-+    ppapi::host::HostMessageContext* host_context,
-+    uint32_t clipboard_type) {
-+  if (clipboard_type != PP_FLASH_CLIPBOARD_TYPE_STANDARD) {
-+    NOTIMPLEMENTED();
-+    return PP_ERROR_FAILED;
-+  }
-+
-+  ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
-+  ui::ClipboardType type = ConvertClipboardType(clipboard_type);
-+  int64_t sequence_number = clipboard->GetSequenceNumber(type);
-+  host_context->reply_msg =
-+      PpapiPluginMsg_FlashClipboard_GetSequenceNumberReply(sequence_number);
-+  return PP_OK;
-+}
-+
-+}  // namespace chrome
-added in remote
-  their  100644 b282d54df28cbb43b5a1b49c6272b504565cde2b chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.h
-@@ -0,0 +1,76 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_FLASH_CLIPBOARD_MESSAGE_FILTER_H_
-+#define CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_FLASH_CLIPBOARD_MESSAGE_FILTER_H_
-+
-+#include <string>
-+#include <vector>
-+
-+#include "ppapi/host/resource_message_filter.h"
-+#include "ppapi/shared_impl/flash_clipboard_format_registry.h"
-+
-+namespace ppapi {
-+namespace host {
-+struct HostMessageContext;
-+}
-+}  // namespace ppapi
-+
-+namespace ui {
-+class ScopedClipboardWriter;
-+}
-+
-+namespace chrome {
-+
-+// Resource message filter for accessing the clipboard in Pepper. Pepper
-+// supports reading/writing custom formats from the clipboard. Currently, all
-+// custom formats that are read/written from the clipboard through pepper are
-+// stored in a single real clipboard format (in the same way the "web custom"
-+// clipboard formats are). This is done so that we don't have to have use real
-+// clipboard types for each custom clipboard format which may be a limited
-+// resource on a particular platform.
-+class PepperFlashClipboardMessageFilter
-+    : public ppapi::host::ResourceMessageFilter {
-+ public:
-+  PepperFlashClipboardMessageFilter();
-+
-+ protected:
-+  // ppapi::host::ResourceMessageFilter overrides.
-+  scoped_refptr<base::TaskRunner> OverrideTaskRunnerForMessage(
-+      const IPC::Message& msg) override;
-+  int32_t OnResourceMessageReceived(
-+      const IPC::Message& msg,
-+      ppapi::host::HostMessageContext* context) override;
-+
-+ private:
-+  ~PepperFlashClipboardMessageFilter() override;
-+
-+  int32_t OnMsgRegisterCustomFormat(
-+      ppapi::host::HostMessageContext* host_context,
-+      const std::string& format_name);
-+  int32_t OnMsgIsFormatAvailable(ppapi::host::HostMessageContext* host_context,
-+                                 uint32_t clipboard_type,
-+                                 uint32_t format);
-+  int32_t OnMsgReadData(ppapi::host::HostMessageContext* host_context,
-+                        uint32_t clipoard_type,
-+                        uint32_t format);
-+  int32_t OnMsgWriteData(ppapi::host::HostMessageContext* host_context,
-+                         uint32_t clipboard_type,
-+                         const std::vector<uint32_t>& formats,
-+                         const std::vector<std::string>& data);
-+  int32_t OnMsgGetSequenceNumber(ppapi::host::HostMessageContext* host_context,
-+                                 uint32_t clipboard_type);
-+
-+  int32_t WriteClipboardDataItem(uint32_t format,
-+                                 const std::string& data,
-+                                 ui::ScopedClipboardWriter* scw);
-+
-+  ppapi::FlashClipboardFormatRegistry custom_formats_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(PepperFlashClipboardMessageFilter);
-+};
-+
-+}  // namespace chrome
-+
-+#endif  // CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_FLASH_CLIPBOARD_MESSAGE_FILTER_H_
-added in remote
-  their  100644 06b0b583a6441819cb6486e99a3aa77c4ed906db chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc
-@@ -0,0 +1,216 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h"
-+
-+#include <cmath>
-+
-+#if defined(OS_WIN)
-+#include <Windows.h>
-+#endif
-+
-+#include "base/bind.h"
-+#include "base/compiler_specific.h"
-+#include "base/logging.h"
-+#include "base/memory/ref_counted.h"
-+#include "base/strings/string_number_conversions.h"
-+#include "build/build_config.h"
-+#include "content/public/browser/browser_ppapi_host.h"
-+#include "content/public/browser/browser_thread.h"
-+#include "content/public/browser/child_process_security_policy.h"
-+#include "content/public/browser/render_frame_host.h"
-+#include "content/public/common/pepper_plugin_info.h"
-+#include "net/base/network_interfaces.h"
-+#include "ppapi/c/pp_errors.h"
-+#include "ppapi/host/dispatch_host_message.h"
-+#include "ppapi/host/host_message_context.h"
-+#include "ppapi/host/ppapi_host.h"
-+#include "ppapi/proxy/ppapi_messages.h"
-+
-+#if defined(USE_AURA)
-+#include "ui/aura/window.h"
-+#include "ui/aura/window_tree_host.h"
-+#endif
-+
-+#if defined(OS_MACOSX)
-+#include "chrome/browser/renderer_host/pepper/monitor_finder_mac.h"
-+#endif
-+
-+using content::BrowserPpapiHost;
-+
-+namespace chrome {
-+
-+namespace {
-+
-+const char kVoucherFilename[] = "plugin.vch";
-+
-+#if defined(OS_WIN)
-+bool GetSystemVolumeSerialNumber(std::string* number) {
-+  // Find the system root path (e.g: C:\).
-+  wchar_t system_path[MAX_PATH + 1];
-+  if (!GetSystemDirectoryW(system_path, MAX_PATH))
-+    return false;
-+
-+  wchar_t* first_slash = wcspbrk(system_path, L"\\/");
-+  if (first_slash != NULL)
-+    *(first_slash + 1) = 0;
-+
-+  DWORD number_local = 0;
-+  if (!GetVolumeInformationW(system_path, NULL, 0, &number_local, NULL, NULL,
-+                             NULL, 0))
-+    return false;
-+
-+  *number = base::IntToString(std::abs(static_cast<int>(number_local)));
-+  return true;
-+}
-+#endif
-+
-+}  // namespace
-+
-+#if defined(OS_WIN)
-+// Helper class to get the UI thread which monitor is showing the
-+// window associated with the instance's render view. Since we get
-+// called by the IO thread and we cannot block, the first answer is
-+// of GetMonitor() may be NULL, but eventually it will contain the
-+// right monitor.
-+class MonitorFinder : public base::RefCountedThreadSafe<MonitorFinder> {
-+ public:
-+  MonitorFinder(int process_id, int render_frame_id)
-+      : process_id_(process_id),
-+        render_frame_id_(render_frame_id),
-+        monitor_(NULL),
-+        request_sent_(0) {}
-+
-+  int64_t GetMonitor() {
-+    // We use |request_sent_| as an atomic boolean so that we
-+    // never have more than one task posted at a given time. We
-+    // do this because we don't know how often our client is going
-+    // to call and we can't cache the |monitor_| value.
-+    if (InterlockedCompareExchange(&request_sent_, 1, 0) == 0) {
-+      content::BrowserThread::PostTask(
-+          content::BrowserThread::UI, FROM_HERE,
-+          base::Bind(&MonitorFinder::FetchMonitorFromWidget, this));
-+    }
-+    return reinterpret_cast<int64_t>(monitor_);
-+  }
-+
-+ private:
-+  friend class base::RefCountedThreadSafe<MonitorFinder>;
-+  ~MonitorFinder() {}
-+
-+  void FetchMonitorFromWidget() {
-+    InterlockedExchange(&request_sent_, 0);
-+    content::RenderFrameHost* rfh =
-+        content::RenderFrameHost::FromID(process_id_, render_frame_id_);
-+    if (!rfh)
-+      return;
-+    gfx::NativeView native_view = rfh->GetNativeView();
-+#if defined(USE_AURA)
-+    aura::WindowTreeHost* host = native_view->GetHost();
-+    if (!host)
-+      return;
-+    HWND window = host->GetAcceleratedWidget();
-+#else
-+    HWND window = native_view;
-+#endif
-+    HMONITOR monitor = ::MonitorFromWindow(window, MONITOR_DEFAULTTONULL);
-+    InterlockedExchangePointer(reinterpret_cast<void* volatile*>(&monitor_),
-+                               monitor);
-+  }
-+
-+  const int process_id_;
-+  const int render_frame_id_;
-+  volatile HMONITOR monitor_;
-+  volatile long request_sent_;
-+};
-+#elif !defined(OS_MACOSX)
-+// TODO(cpu): Support Linux someday.
-+class MonitorFinder : public base::RefCountedThreadSafe<MonitorFinder> {
-+ public:
-+  MonitorFinder(int, int) {}
-+  int64_t GetMonitor() { return 0; }
-+
-+ private:
-+  friend class base::RefCountedThreadSafe<MonitorFinder>;
-+  ~MonitorFinder() {}
-+};
-+#endif
-+
-+PepperFlashDRMHost::PepperFlashDRMHost(BrowserPpapiHost* host,
-+                                       PP_Instance instance,
-+                                       PP_Resource resource)
-+    : ppapi::host::ResourceHost(host->GetPpapiHost(), instance, resource),
-+      weak_factory_(this) {
-+  // Grant permissions to read the flash voucher file.
-+  int render_process_id;
-+  int render_frame_id;
-+  bool success = host->GetRenderFrameIDsForInstance(
-+      instance, &render_process_id, &render_frame_id);
-+  base::FilePath plugin_dir = host->GetPluginPath().DirName();
-+  DCHECK(!plugin_dir.empty() && success);
-+  base::FilePath voucher_file = plugin_dir.AppendASCII(kVoucherFilename);
-+  content::ChildProcessSecurityPolicy::GetInstance()->GrantReadFile(
-+      render_process_id, voucher_file);
-+
-+  monitor_finder_ = new MonitorFinder(render_process_id, render_frame_id);
-+  monitor_finder_->GetMonitor();
-+}
-+
-+PepperFlashDRMHost::~PepperFlashDRMHost() {}
-+
-+int32_t PepperFlashDRMHost::OnResourceMessageReceived(
-+    const IPC::Message& msg,
-+    ppapi::host::HostMessageContext* context) {
-+  PPAPI_BEGIN_MESSAGE_MAP(PepperFlashDRMHost, msg)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL_0(PpapiHostMsg_FlashDRM_GetDeviceID,
-+                                        OnHostMsgGetDeviceID)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL_0(PpapiHostMsg_FlashDRM_GetHmonitor,
-+                                        OnHostMsgGetHmonitor)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL_0(PpapiHostMsg_FlashDRM_MonitorIsExternal,
-+                                        OnHostMsgMonitorIsExternal)
-+  PPAPI_END_MESSAGE_MAP()
-+  return PP_ERROR_FAILED;
-+}
-+
-+int32_t PepperFlashDRMHost::OnHostMsgGetDeviceID(
-+    ppapi::host::HostMessageContext* context) {
-+  static std::string id;
-+#if defined(OS_WIN)
-+  if (id.empty() && !GetSystemVolumeSerialNumber(&id))
-+    id = net::GetHostName();
-+#else
-+  if (id.empty())
-+    id = net::GetHostName();
-+#endif
-+  context->reply_msg = PpapiPluginMsg_FlashDRM_GetDeviceIDReply(id);
-+  return PP_OK;
-+}
-+
-+int32_t PepperFlashDRMHost::OnHostMsgGetHmonitor(
-+    ppapi::host::HostMessageContext* context) {
-+  int64_t monitor_id = monitor_finder_->GetMonitor();
-+  if (monitor_id) {
-+    context->reply_msg = PpapiPluginMsg_FlashDRM_GetHmonitorReply(monitor_id);
-+    return PP_OK;
-+  }
-+  return PP_ERROR_FAILED;
-+}
-+
-+int32_t PepperFlashDRMHost::OnHostMsgMonitorIsExternal(
-+    ppapi::host::HostMessageContext* context) {
-+  int64_t monitor_id = monitor_finder_->GetMonitor();
-+  if (!monitor_id)
-+    return PP_ERROR_FAILED;
-+
-+  PP_Bool is_external = PP_FALSE;
-+#if defined(OS_MACOSX)
-+  if (!MonitorFinder::IsMonitorBuiltIn(monitor_id))
-+    is_external = PP_TRUE;
-+#endif
-+  context->reply_msg =
-+      PpapiPluginMsg_FlashDRM_MonitorIsExternalReply(is_external);
-+  return PP_OK;
-+}
-+
-+}  // namespace chrome
-added in remote
-  their  100644 91bba9631e68f08728d5d926528fc80ce4f9cb00 chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h
-@@ -0,0 +1,55 @@
-+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_FLASH_DRM_HOST_H_
-+#define CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_FLASH_DRM_HOST_H_
-+
-+#include <stdint.h>
-+
-+#include <string>
-+
-+#include "base/macros.h"
-+#include "base/memory/weak_ptr.h"
-+#include "ppapi/host/host_message_context.h"
-+#include "ppapi/host/resource_host.h"
-+
-+namespace content {
-+class BrowserPpapiHost;
-+}
-+
-+namespace IPC {
-+class Message;
-+}
-+
-+namespace chrome {
-+class MonitorFinder;
-+
-+class PepperFlashDRMHost : public ppapi::host::ResourceHost {
-+ public:
-+  PepperFlashDRMHost(content::BrowserPpapiHost* host,
-+                     PP_Instance instance,
-+                     PP_Resource resource);
-+  ~PepperFlashDRMHost() override;
-+
-+  // ResourceHost override.
-+  int32_t OnResourceMessageReceived(
-+      const IPC::Message& msg,
-+      ppapi::host::HostMessageContext* context) override;
-+
-+ private:
-+  // IPC message handler.
-+  int32_t OnHostMsgGetDeviceID(ppapi::host::HostMessageContext* context);
-+  int32_t OnHostMsgGetHmonitor(ppapi::host::HostMessageContext* context);
-+  int32_t OnHostMsgMonitorIsExternal(ppapi::host::HostMessageContext* context);
-+
-+  scoped_refptr<MonitorFinder> monitor_finder_;
-+
-+  base::WeakPtrFactory<PepperFlashDRMHost> weak_factory_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(PepperFlashDRMHost);
-+};
-+
-+}  // namespace chrome
-+
-+#endif  // CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_FLASH_DRM_HOST_H_
-added in remote
-  their  100644 be771653066bf4689f9857e6a218dd3c79d9696e chromium_src/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc
-@@ -0,0 +1,106 @@
-+// Copyright 2013 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h"
-+
-+#include "content/public/browser/browser_ppapi_host.h"
-+#include "content/public/browser/browser_thread.h"
-+#include "content/public/browser/child_process_security_policy.h"
-+#include "content/public/browser/render_view_host.h"
-+#include "ppapi/c/pp_errors.h"
-+#include "ppapi/host/dispatch_host_message.h"
-+#include "ppapi/host/host_message_context.h"
-+#include "ppapi/host/ppapi_host.h"
-+#include "ppapi/proxy/ppapi_messages.h"
-+#include "ppapi/shared_impl/file_system_util.h"
-+#include "storage/browser/fileapi/isolated_context.h"
-+
-+namespace chrome {
-+
-+// static
-+PepperIsolatedFileSystemMessageFilter*
-+PepperIsolatedFileSystemMessageFilter::Create(PP_Instance instance,
-+                                              content::BrowserPpapiHost* host) {
-+  int render_process_id;
-+  int unused_render_frame_id;
-+  if (!host->GetRenderFrameIDsForInstance(instance, &render_process_id,
-+                                          &unused_render_frame_id)) {
-+    return NULL;
-+  }
-+  return new PepperIsolatedFileSystemMessageFilter(
-+      render_process_id, host->GetProfileDataDirectory(),
-+      host->GetDocumentURLForInstance(instance), host->GetPpapiHost());
-+}
-+
-+PepperIsolatedFileSystemMessageFilter::PepperIsolatedFileSystemMessageFilter(
-+    int render_process_id,
-+    const base::FilePath& profile_directory,
-+    const GURL& document_url,
-+    ppapi::host::PpapiHost* ppapi_host)
-+    : render_process_id_(render_process_id),
-+      profile_directory_(profile_directory),
-+      document_url_(document_url),
-+      ppapi_host_(ppapi_host) {}
-+
-+PepperIsolatedFileSystemMessageFilter::
-+    ~PepperIsolatedFileSystemMessageFilter() {}
-+
-+scoped_refptr<base::TaskRunner>
-+PepperIsolatedFileSystemMessageFilter::OverrideTaskRunnerForMessage(
-+    const IPC::Message& msg) {
-+  // In order to reach ExtensionSystem, we need to get ProfileManager first.
-+  // ProfileManager lives in UI thread, so we need to do this in UI thread.
-+  return content::BrowserThread::GetTaskRunnerForThread(
-+      content::BrowserThread::UI);
-+}
-+
-+int32_t PepperIsolatedFileSystemMessageFilter::OnResourceMessageReceived(
-+    const IPC::Message& msg,
-+    ppapi::host::HostMessageContext* context) {
-+  PPAPI_BEGIN_MESSAGE_MAP(PepperIsolatedFileSystemMessageFilter, msg)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(
-+        PpapiHostMsg_IsolatedFileSystem_BrowserOpen, OnOpenFileSystem)
-+  PPAPI_END_MESSAGE_MAP()
-+  return PP_ERROR_FAILED;
-+}
-+
-+int32_t PepperIsolatedFileSystemMessageFilter::OnOpenFileSystem(
-+    ppapi::host::HostMessageContext* context,
-+    PP_IsolatedFileSystemType_Private type) {
-+  switch (type) {
-+    case PP_ISOLATEDFILESYSTEMTYPE_PRIVATE_INVALID:
-+    case PP_ISOLATEDFILESYSTEMTYPE_PRIVATE_CRX:
-+      break;
-+    case PP_ISOLATEDFILESYSTEMTYPE_PRIVATE_PLUGINPRIVATE:
-+      return OpenPluginPrivateFileSystem(context);
-+  }
-+  NOTREACHED();
-+  context->reply_msg =
-+      PpapiPluginMsg_IsolatedFileSystem_BrowserOpenReply(std::string());
-+  return PP_ERROR_FAILED;
-+}
-+
-+int32_t PepperIsolatedFileSystemMessageFilter::OpenPluginPrivateFileSystem(
-+    ppapi::host::HostMessageContext* context) {
-+  DCHECK(ppapi_host_);
-+  // Only plugins with private permission can open the filesystem.
-+  if (!ppapi_host_->permissions().HasPermission(ppapi::PERMISSION_PRIVATE))
-+    return PP_ERROR_NOACCESS;
-+
-+  const std::string& root_name = ppapi::IsolatedFileSystemTypeToRootName(
-+      PP_ISOLATEDFILESYSTEMTYPE_PRIVATE_PLUGINPRIVATE);
-+  const std::string& fsid =
-+      storage::IsolatedContext::GetInstance()->RegisterFileSystemForVirtualPath(
-+          storage::kFileSystemTypePluginPrivate, root_name, base::FilePath());
-+
-+  // Grant full access of isolated filesystem to renderer process.
-+  content::ChildProcessSecurityPolicy* policy =
-+      content::ChildProcessSecurityPolicy::GetInstance();
-+  policy->GrantCreateReadWriteFileSystem(render_process_id_, fsid);
-+
-+  context->reply_msg = PpapiPluginMsg_IsolatedFileSystem_BrowserOpenReply(fsid);
-+  return PP_OK;
-+}
-+
-+}  // namespace chrome
-added in remote
-  their  100644 6a24feadd150e0c5ecd1fa44c7e412262ecae55d chromium_src/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h
-@@ -0,0 +1,76 @@
-+// Copyright 2013 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_ISOLATED_FILE_SYSTEM_MESSAGE_FILTER_H_
-+#define CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_ISOLATED_FILE_SYSTEM_MESSAGE_FILTER_H_
-+
-+#include <set>
-+#include <string>
-+
-+#include "base/files/file_path.h"
-+#include "ppapi/c/pp_instance.h"
-+#include "ppapi/c/pp_resource.h"
-+#include "ppapi/c/private/ppb_isolated_file_system_private.h"
-+#include "ppapi/host/resource_host.h"
-+#include "ppapi/host/resource_message_filter.h"
-+#include "url/gurl.h"
-+
-+class Profile;
-+
-+namespace content {
-+class BrowserPpapiHost;
-+}
-+
-+namespace ppapi {
-+namespace host {
-+struct HostMessageContext;
-+}  // namespace host
-+}  // namespace ppapi
-+
-+namespace chrome {
-+
-+class PepperIsolatedFileSystemMessageFilter
-+    : public ppapi::host::ResourceMessageFilter {
-+ public:
-+  static PepperIsolatedFileSystemMessageFilter* Create(
-+      PP_Instance instance,
-+      content::BrowserPpapiHost* host);
-+
-+  // ppapi::host::ResourceMessageFilter implementation.
-+  scoped_refptr<base::TaskRunner> OverrideTaskRunnerForMessage(
-+      const IPC::Message& msg) override;
-+  int32_t OnResourceMessageReceived(
-+      const IPC::Message& msg,
-+      ppapi::host::HostMessageContext* context) override;
-+
-+ private:
-+  PepperIsolatedFileSystemMessageFilter(int render_process_id,
-+                                        const base::FilePath& profile_directory,
-+                                        const GURL& document_url,
-+                                        ppapi::host::PpapiHost* ppapi_host_);
-+
-+  ~PepperIsolatedFileSystemMessageFilter() override;
-+
-+  // Returns filesystem id of isolated filesystem if valid, or empty string
-+  // otherwise.  This must run on the UI thread because ProfileManager only
-+  // allows access on that thread.
-+
-+  int32_t OnOpenFileSystem(ppapi::host::HostMessageContext* context,
-+                           PP_IsolatedFileSystemType_Private type);
-+  int32_t OpenPluginPrivateFileSystem(ppapi::host::HostMessageContext* context);
-+
-+  const int render_process_id_;
-+  // Keep a copy from original thread.
-+  const base::FilePath profile_directory_;
-+  const GURL document_url_;
-+
-+  // Not owned by this object.
-+  ppapi::host::PpapiHost* ppapi_host_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(PepperIsolatedFileSystemMessageFilter);
-+};
-+
-+}  // namespace chrome
-+
-+#endif  // CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_ISOLATED_FILE_SYSTEM_MESSAGE_FILTER_H_
-added in both
-  our    100644 850bd7ad3630604fa35bdb67397eb789e059973a chromium_src/chrome/browser/ui/views/color_chooser_dialog.h
-  their  100644 b23061a386dc0dc235f5924fc559aa3b7d355a56 chromium_src/chrome/browser/ui/views/color_chooser_dialog.h
-@@ -23,6 +23,7 @@
-   ColorChooserDialog(views::ColorChooserListener* listener,
-                      SkColor initial_color,
-                      gfx::NativeWindow owning_window);
-+<<<<<<< .our
- 
-   // BaseShellDialog:
-   bool IsRunning(gfx::NativeWindow owning_window) const override;
-@@ -32,6 +33,15 @@
-   ~ColorChooserDialog() override;
-   friend class base::RefCountedThreadSafe<ColorChooserDialog>;
- 
-+=======
-+  virtual ~ColorChooserDialog();
-+
-+  // BaseShellDialog:
-+  virtual bool IsRunning(gfx::NativeWindow owning_window) const override;
-+  virtual void ListenerDestroyed() override;
-+
-+ private:
-+>>>>>>> .their
-   struct ExecuteOpenParams {
-     ExecuteOpenParams(SkColor color, RunState run_state, HWND owner);
-     SkColor color;
-added in both
-  our    100644 0f8ebfa6366f90e435dc0e854b20cef92fc2964f chromium_src/chrome/browser/ui/views/color_chooser_win.cc
-  their  100644 fc330dd63f1810bc9486428a32f351ec0cdfb3eb chromium_src/chrome/browser/ui/views/color_chooser_win.cc
-@@ -22,6 +22,7 @@
-                                SkColor initial_color);
- 
-   ColorChooserWin(content::WebContents* web_contents, SkColor initial_color);
-+<<<<<<< .our
-   ~ColorChooserWin() override;
- 
-   // content::ColorChooser overrides:
-@@ -31,6 +32,17 @@
-   // views::ColorChooserListener overrides:
-   void OnColorChosen(SkColor color) override;
-   void OnColorChooserDialogClosed() override;
-+=======
-+  ~ColorChooserWin();
-+
-+  // content::ColorChooser overrides:
-+  virtual void End() override;
-+  virtual void SetSelectedColor(SkColor color) override {}
-+
-+  // views::ColorChooserListener overrides:
-+  virtual void OnColorChosen(SkColor color);
-+  virtual void OnColorChooserDialogClosed();
-+>>>>>>> .their
- 
-  private:
-   static ColorChooserWin* current_color_chooser_;
-added in remote
-  their  100644 437d87f8ff5e89c13990e1fba87e7e51de7d962f chromium_src/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc
-@@ -0,0 +1,99 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/renderer/pepper/chrome_renderer_pepper_host_factory.h"
-+
-+#include "base/logging.h"
-+#include "chrome/renderer/pepper/pepper_flash_font_file_host.h"
-+#include "chrome/renderer/pepper/pepper_flash_fullscreen_host.h"
-+#include "chrome/renderer/pepper/pepper_flash_menu_host.h"
-+#include "chrome/renderer/pepper/pepper_flash_renderer_host.h"
-+#include "content/public/renderer/renderer_ppapi_host.h"
-+#include "ppapi/host/ppapi_host.h"
-+#include "ppapi/host/resource_host.h"
-+#include "ppapi/proxy/ppapi_message_utils.h"
-+#include "ppapi/proxy/ppapi_messages.h"
-+#include "ppapi/shared_impl/ppapi_permissions.h"
-+
-+#if defined(ENABLE_PDF_VIEWER)
-+#include "components/pdf/renderer/pepper_pdf_host.h"
-+#endif  // defined(ENABLE_PDF_VIEWER)
-+
-+using ppapi::host::ResourceHost;
-+
-+ChromeRendererPepperHostFactory::ChromeRendererPepperHostFactory(
-+    content::RendererPpapiHost* host)
-+    : host_(host) {}
-+
-+ChromeRendererPepperHostFactory::~ChromeRendererPepperHostFactory() {}
-+
-+std::unique_ptr<ResourceHost>
-+ChromeRendererPepperHostFactory::CreateResourceHost(
-+    ppapi::host::PpapiHost* host,
-+    PP_Resource resource,
-+    PP_Instance instance,
-+    const IPC::Message& message) {
-+  DCHECK_EQ(host_->GetPpapiHost(), host);
-+
-+  // Make sure the plugin is giving us a valid instance for this resource.
-+  if (!host_->IsValidInstance(instance))
-+    return std::unique_ptr<ResourceHost>();
-+
-+  if (host_->GetPpapiHost()->permissions().HasPermission(
-+          ppapi::PERMISSION_FLASH)) {
-+    switch (message.type()) {
-+      case PpapiHostMsg_Flash_Create::ID: {
-+        return std::unique_ptr<ResourceHost>(
-+            new PepperFlashRendererHost(host_, instance, resource));
-+      }
-+      case PpapiHostMsg_FlashFullscreen_Create::ID: {
-+        return std::unique_ptr<ResourceHost>(
-+            new PepperFlashFullscreenHost(host_, instance, resource));
-+      }
-+      case PpapiHostMsg_FlashMenu_Create::ID: {
-+        ppapi::proxy::SerializedFlashMenu serialized_menu;
-+        if (ppapi::UnpackMessage<PpapiHostMsg_FlashMenu_Create>(
-+                message, &serialized_menu)) {
-+          return std::unique_ptr<ResourceHost>(new PepperFlashMenuHost(
-+              host_, instance, resource, serialized_menu));
-+        }
-+        break;
-+      }
-+    }
-+  }
-+
-+  // TODO(raymes): PDF also needs access to the FlashFontFileHost currently.
-+  // We should either rename PPB_FlashFont_File to PPB_FontFile_Private or get
-+  // rid of its use in PDF if possible.
-+  if (host_->GetPpapiHost()->permissions().HasPermission(
-+          ppapi::PERMISSION_FLASH) ||
-+      host_->GetPpapiHost()->permissions().HasPermission(
-+          ppapi::PERMISSION_PRIVATE)) {
-+    switch (message.type()) {
-+      case PpapiHostMsg_FlashFontFile_Create::ID: {
-+        ppapi::proxy::SerializedFontDescription description;
-+        PP_PrivateFontCharset charset;
-+        if (ppapi::UnpackMessage<PpapiHostMsg_FlashFontFile_Create>(
-+                message, &description, &charset)) {
-+          return std::unique_ptr<ResourceHost>(new PepperFlashFontFileHost(
-+              host_, instance, resource, description, charset));
-+        }
-+        break;
-+      }
-+    }
-+  }
-+
-+#if defined(ENABLE_PDF_VIEWER)
-+  if (host_->GetPpapiHost()->permissions().HasPermission(
-+          ppapi::PERMISSION_PRIVATE)) {
-+    switch (message.type()) {
-+      case PpapiHostMsg_PDF_Create::ID: {
-+        return std::make_unique<pdf::PepperPDFHost>(host_, instance, resource);
-+      }
-+    }
-+  }
-+#endif  // defined(ENABLE_PDF_VIEWER)
-+
-+  return std::unique_ptr<ResourceHost>();
-+}
-added in remote
-  their  100644 c52c73b56f048fc522f4879597e870285ec7009d chromium_src/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.h
-@@ -0,0 +1,34 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_RENDERER_PEPPER_CHROME_RENDERER_PEPPER_HOST_FACTORY_H_
-+#define CHROME_RENDERER_PEPPER_CHROME_RENDERER_PEPPER_HOST_FACTORY_H_
-+
-+#include "base/macros.h"
-+#include "ppapi/host/host_factory.h"
-+
-+namespace content {
-+class RendererPpapiHost;
-+}
-+
-+class ChromeRendererPepperHostFactory : public ppapi::host::HostFactory {
-+ public:
-+  explicit ChromeRendererPepperHostFactory(content::RendererPpapiHost* host);
-+  ~ChromeRendererPepperHostFactory() override;
-+
-+  // HostFactory.
-+  std::unique_ptr<ppapi::host::ResourceHost> CreateResourceHost(
-+      ppapi::host::PpapiHost* host,
-+      PP_Resource resource,
-+      PP_Instance instance,
-+      const IPC::Message& message) override;
-+
-+ private:
-+  // Not owned by this object.
-+  content::RendererPpapiHost* host_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(ChromeRendererPepperHostFactory);
-+};
-+
-+#endif  // CHROME_RENDERER_PEPPER_CHROME_RENDERER_PEPPER_HOST_FACTORY_H_
-added in remote
-  their  100644 efdc9316b82976b2e07cb3c8aec06141304f390c chromium_src/chrome/renderer/pepper/pepper_flash_font_file_host.cc
-@@ -0,0 +1,105 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/renderer/pepper/pepper_flash_font_file_host.h"
-+
-+#include "base/sys_byteorder.h"
-+#include "build/build_config.h"
-+#include "content/public/renderer/renderer_ppapi_host.h"
-+#include "ppapi/c/pp_errors.h"
-+#include "ppapi/host/dispatch_host_message.h"
-+#include "ppapi/host/host_message_context.h"
-+#include "ppapi/host/ppapi_host.h"
-+#include "ppapi/proxy/ppapi_messages.h"
-+#include "ppapi/proxy/serialized_structs.h"
-+
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
-+#include "content/public/child/child_process_sandbox_support_linux.h"
-+#include "content/public/common/common_sandbox_support_linux.h"
-+#elif defined(OS_WIN)
-+#include "third_party/skia/include/ports/SkFontMgr.h"
-+#endif
-+
-+PepperFlashFontFileHost::PepperFlashFontFileHost(
-+    content::RendererPpapiHost* host,
-+    PP_Instance instance,
-+    PP_Resource resource,
-+    const ppapi::proxy::SerializedFontDescription& description,
-+    PP_PrivateFontCharset charset)
-+    : ResourceHost(host->GetPpapiHost(), instance, resource) {
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
-+  fd_.reset(content::MatchFontWithFallback(
-+      description.face.c_str(),
-+      description.weight >= PP_BROWSERFONT_TRUSTED_WEIGHT_BOLD,
-+      description.italic, charset, PP_BROWSERFONT_TRUSTED_FAMILY_DEFAULT));
-+#elif defined(OS_WIN)  // defined(OS_LINUX) || defined(OS_OPENBSD)
-+  int weight = description.weight;
-+  if (weight == FW_DONTCARE)
-+    weight = SkFontStyle::kNormal_Weight;
-+  SkFontStyle style(weight, SkFontStyle::kNormal_Width,
-+                    description.italic ? SkFontStyle::kItalic_Slant
-+                                       : SkFontStyle::kUpright_Slant);
-+  sk_sp<SkFontMgr> font_mgr(SkFontMgr::RefDefault());
-+  typeface_ = sk_sp<SkTypeface>(
-+      font_mgr->matchFamilyStyle(description.face.c_str(), style));
-+#endif                 // defined(OS_WIN)
-+}
-+
-+PepperFlashFontFileHost::~PepperFlashFontFileHost() {}
-+
-+int32_t PepperFlashFontFileHost::OnResourceMessageReceived(
-+    const IPC::Message& msg,
-+    ppapi::host::HostMessageContext* context) {
-+  PPAPI_BEGIN_MESSAGE_MAP(PepperFlashFontFileHost, msg)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_FlashFontFile_GetFontTable,
-+                                      OnGetFontTable)
-+  PPAPI_END_MESSAGE_MAP()
-+  return PP_ERROR_FAILED;
-+}
-+bool PepperFlashFontFileHost::GetFontData(uint32_t table,
-+                                          void* buffer,
-+                                          size_t* length) {
-+  bool result = false;
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
-+  int fd = fd_.get();
-+  if (fd != -1)
-+    result = content::GetFontTable(fd, table, 0 /* offset */,
-+                                   reinterpret_cast<uint8_t*>(buffer), length);
-+#elif defined(OS_WIN)
-+  if (typeface_) {
-+    table = base::ByteSwap(table);
-+    if (buffer == NULL) {
-+      *length = typeface_->getTableSize(table);
-+      if (*length > 0)
-+        result = true;
-+    } else {
-+      size_t new_length = typeface_->getTableData(table, 0, *length, buffer);
-+      if (new_length == *length)
-+        result = true;
-+    }
-+  }
-+#endif
-+  return result;
-+}
-+
-+int32_t PepperFlashFontFileHost::OnGetFontTable(
-+    ppapi::host::HostMessageContext* context,
-+    uint32_t table) {
-+  std::string contents;
-+  int32_t result = PP_ERROR_FAILED;
-+  size_t length = 0;
-+  if (GetFontData(table, NULL, &length)) {
-+    contents.resize(length);
-+    uint8_t* contents_ptr =
-+        reinterpret_cast<uint8_t*>(const_cast<char*>(contents.c_str()));
-+    if (GetFontData(table, contents_ptr, &length)) {
-+      result = PP_OK;
-+    } else {
-+      contents.clear();
-+    }
-+  }
-+
-+  context->reply_msg = PpapiPluginMsg_FlashFontFile_GetFontTableReply(contents);
-+  return result;
-+}
-added in remote
-  their  100644 15eb73837b50dbb85d607a84bc3b3a71cf789ac5 chromium_src/chrome/renderer/pepper/pepper_flash_font_file_host.h
-@@ -0,0 +1,56 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_RENDERER_PEPPER_PEPPER_FLASH_FONT_FILE_HOST_H_
-+#define CHROME_RENDERER_PEPPER_PEPPER_FLASH_FONT_FILE_HOST_H_
-+
-+#include "ppapi/c/private/pp_private_font_charset.h"
-+#include "ppapi/host/resource_host.h"
-+
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
-+#include "base/files/scoped_file.h"
-+#elif defined(OS_WIN)
-+#include "third_party/skia/include/core/SkRefCnt.h"
-+#include "third_party/skia/include/core/SkTypeface.h"
-+#endif
-+
-+namespace content {
-+class RendererPpapiHost;
-+}
-+
-+namespace ppapi {
-+namespace proxy {
-+struct SerializedFontDescription;
-+}
-+}  // namespace ppapi
-+
-+class PepperFlashFontFileHost : public ppapi::host::ResourceHost {
-+ public:
-+  PepperFlashFontFileHost(
-+      content::RendererPpapiHost* host,
-+      PP_Instance instance,
-+      PP_Resource resource,
-+      const ppapi::proxy::SerializedFontDescription& description,
-+      PP_PrivateFontCharset charset);
-+  ~PepperFlashFontFileHost() override;
-+
-+  int32_t OnResourceMessageReceived(
-+      const IPC::Message& msg,
-+      ppapi::host::HostMessageContext* context) override;
-+
-+ private:
-+  int32_t OnGetFontTable(ppapi::host::HostMessageContext* context,
-+                         uint32_t table);
-+  bool GetFontData(uint32_t table, void* buffer, size_t* length);
-+
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
-+  base::ScopedFD fd_;
-+#elif defined(OS_WIN)
-+  sk_sp<SkTypeface> typeface_;
-+#endif
-+
-+  DISALLOW_COPY_AND_ASSIGN(PepperFlashFontFileHost);
-+};
-+
-+#endif  // CHROME_RENDERER_PEPPER_PEPPER_FLASH_FONT_FILE_HOST_H_
-added in remote
-  their  100644 f4367ef73ce882cec4392da24413800620237c25 chromium_src/chrome/renderer/pepper/pepper_flash_fullscreen_host.cc
-@@ -0,0 +1,42 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/renderer/pepper/pepper_flash_fullscreen_host.h"
-+
-+#include "content/public/renderer/pepper_plugin_instance.h"
-+#include "content/public/renderer/renderer_ppapi_host.h"
-+#include "ppapi/c/pp_errors.h"
-+#include "ppapi/host/dispatch_host_message.h"
-+#include "ppapi/host/host_message_context.h"
-+#include "ppapi/host/ppapi_host.h"
-+#include "ppapi/proxy/ppapi_messages.h"
-+
-+PepperFlashFullscreenHost::PepperFlashFullscreenHost(
-+    content::RendererPpapiHost* host,
-+    PP_Instance instance,
-+    PP_Resource resource)
-+    : ResourceHost(host->GetPpapiHost(), instance, resource),
-+      renderer_ppapi_host_(host) {}
-+
-+PepperFlashFullscreenHost::~PepperFlashFullscreenHost() {}
-+
-+int32_t PepperFlashFullscreenHost::OnResourceMessageReceived(
-+    const IPC::Message& msg,
-+    ppapi::host::HostMessageContext* context) {
-+  PPAPI_BEGIN_MESSAGE_MAP(PepperFlashFullscreenHost, msg)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(
-+        PpapiHostMsg_FlashFullscreen_SetFullscreen, OnSetFullscreen)
-+  PPAPI_END_MESSAGE_MAP()
-+  return PP_ERROR_FAILED;
-+}
-+
-+int32_t PepperFlashFullscreenHost::OnSetFullscreen(
-+    ppapi::host::HostMessageContext* context,
-+    bool fullscreen) {
-+  content::PepperPluginInstance* plugin_instance =
-+      renderer_ppapi_host_->GetPluginInstance(pp_instance());
-+  if (plugin_instance && plugin_instance->FlashSetFullscreen(fullscreen, true))
-+    return PP_OK;
-+  return PP_ERROR_FAILED;
-+}
-added in remote
-  their  100644 86d0af73aee54451905485e2afa0e4cd08d0037e chromium_src/chrome/renderer/pepper/pepper_flash_fullscreen_host.h
-@@ -0,0 +1,35 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_RENDERER_PEPPER_PEPPER_FLASH_FULLSCREEN_HOST_H_
-+#define CHROME_RENDERER_PEPPER_PEPPER_FLASH_FULLSCREEN_HOST_H_
-+
-+#include "ppapi/host/resource_host.h"
-+
-+namespace content {
-+class RendererPpapiHost;
-+}
-+
-+class PepperFlashFullscreenHost : public ppapi::host::ResourceHost {
-+ public:
-+  PepperFlashFullscreenHost(content::RendererPpapiHost* host,
-+                            PP_Instance instance,
-+                            PP_Resource resource);
-+  ~PepperFlashFullscreenHost() override;
-+
-+  int32_t OnResourceMessageReceived(
-+      const IPC::Message& msg,
-+      ppapi::host::HostMessageContext* context) override;
-+
-+ private:
-+  int32_t OnSetFullscreen(ppapi::host::HostMessageContext* context,
-+                          bool fullscreen);
-+
-+  // Non-owning pointer.
-+  content::RendererPpapiHost* renderer_ppapi_host_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(PepperFlashFullscreenHost);
-+};
-+
-+#endif  // CHROME_RENDERER_PEPPER_PEPPER_FLASH_FULLSCREEN_HOST_H_
-added in remote
-  their  100644 45a79349a1c5e6f0b2767cbb1f5e678358f714b8 chromium_src/chrome/renderer/pepper/pepper_flash_menu_host.cc
-@@ -0,0 +1,201 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/renderer/pepper/pepper_flash_menu_host.h"
-+
-+#include "base/strings/utf_string_conversions.h"
-+#include "content/public/common/context_menu_params.h"
-+#include "content/public/renderer/render_frame.h"
-+#include "content/public/renderer/renderer_ppapi_host.h"
-+#include "ipc/ipc_message.h"
-+#include "ppapi/c/private/ppb_flash_menu.h"
-+#include "ppapi/host/dispatch_host_message.h"
-+#include "ppapi/host/ppapi_host.h"
-+#include "ppapi/proxy/ppapi_messages.h"
-+#include "ppapi/proxy/serialized_flash_menu.h"
-+#include "ui/gfx/geometry/point.h"
-+
-+namespace {
-+
-+// Maximum depth of submenus allowed (e.g., 1 indicates that submenus are
-+// allowed, but not sub-submenus).
-+const size_t kMaxMenuDepth = 2;
-+
-+// Maximum number of entries in any single menu (including separators).
-+const size_t kMaxMenuEntries = 50;
-+
-+// Maximum total number of entries in the |menu_id_map| (see below).
-+// (Limit to 500 real entries; reserve the 0 action as an invalid entry.)
-+const size_t kMaxMenuIdMapEntries = 501;
-+
-+// Converts menu data from one form to another.
-+//  - |depth| is the current nested depth (call it starting with 0).
-+//  - |menu_id_map| is such that |menu_id_map[output_item.action] ==
-+//    input_item.id| (where |action| is what a |MenuItem| has, |id| is what a
-+//    |PP_Flash_MenuItem| has).
-+bool ConvertMenuData(const PP_Flash_Menu* in_menu,
-+                     size_t depth,
-+                     std::vector<content::MenuItem>* out_menu,
-+                     std::vector<int32_t>* menu_id_map) {
-+  if (depth > kMaxMenuDepth || !in_menu)
-+    return false;
-+
-+  // Clear the output, just in case.
-+  out_menu->clear();
-+
-+  if (!in_menu->count)
-+    return true;  // Nothing else to do.
-+
-+  if (!in_menu->items || in_menu->count > kMaxMenuEntries)
-+    return false;
-+  for (uint32_t i = 0; i < in_menu->count; i++) {
-+    content::MenuItem item;
-+
-+    PP_Flash_MenuItem_Type type = in_menu->items[i].type;
-+    switch (type) {
-+      case PP_FLASH_MENUITEM_TYPE_NORMAL:
-+        item.type = content::MenuItem::OPTION;
-+        break;
-+      case PP_FLASH_MENUITEM_TYPE_CHECKBOX:
-+        item.type = content::MenuItem::CHECKABLE_OPTION;
-+        break;
-+      case PP_FLASH_MENUITEM_TYPE_SEPARATOR:
-+        item.type = content::MenuItem::SEPARATOR;
-+        break;
-+      case PP_FLASH_MENUITEM_TYPE_SUBMENU:
-+        item.type = content::MenuItem::SUBMENU;
-+        break;
-+      default:
-+        return false;
-+    }
-+    if (in_menu->items[i].name)
-+      item.label = base::UTF8ToUTF16(in_menu->items[i].name);
-+    if (menu_id_map->size() >= kMaxMenuIdMapEntries)
-+      return false;
-+    item.action = static_cast<unsigned>(menu_id_map->size());
-+    // This sets |(*menu_id_map)[item.action] = in_menu->items[i].id|.
-+    menu_id_map->push_back(in_menu->items[i].id);
-+    item.enabled = PP_ToBool(in_menu->items[i].enabled);
-+    item.checked = PP_ToBool(in_menu->items[i].checked);
-+    if (type == PP_FLASH_MENUITEM_TYPE_SUBMENU) {
-+      if (!ConvertMenuData(in_menu->items[i].submenu, depth + 1, &item.submenu,
-+                           menu_id_map))
-+        return false;
-+    }
-+
-+    out_menu->push_back(item);
-+  }
-+
-+  return true;
-+}
-+
-+}  // namespace
-+
-+PepperFlashMenuHost::PepperFlashMenuHost(
-+    content::RendererPpapiHost* host,
-+    PP_Instance instance,
-+    PP_Resource resource,
-+    const ppapi::proxy::SerializedFlashMenu& serial_menu)
-+    : ppapi::host::ResourceHost(host->GetPpapiHost(), instance, resource),
-+      renderer_ppapi_host_(host),
-+      showing_context_menu_(false),
-+      context_menu_request_id_(0),
-+      has_saved_context_menu_action_(false),
-+      saved_context_menu_action_(0) {
-+  menu_id_map_.push_back(0);  // Reserve |menu_id_map_[0]|.
-+  if (!ConvertMenuData(serial_menu.pp_menu(), 0, &menu_data_, &menu_id_map_)) {
-+    menu_data_.clear();
-+    menu_id_map_.clear();
-+  }
-+}
-+
-+PepperFlashMenuHost::~PepperFlashMenuHost() {
-+  if (showing_context_menu_) {
-+    content::RenderFrame* render_frame =
-+        renderer_ppapi_host_->GetRenderFrameForInstance(pp_instance());
-+    if (render_frame)
-+      render_frame->CancelContextMenu(context_menu_request_id_);
-+  }
-+}
-+
-+int32_t PepperFlashMenuHost::OnResourceMessageReceived(
-+    const IPC::Message& msg,
-+    ppapi::host::HostMessageContext* context) {
-+  PPAPI_BEGIN_MESSAGE_MAP(PepperFlashMenuHost, msg)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_FlashMenu_Show,
-+                                      OnHostMsgShow)
-+  PPAPI_END_MESSAGE_MAP()
-+  return PP_ERROR_FAILED;
-+}
-+
-+int32_t PepperFlashMenuHost::OnHostMsgShow(
-+    ppapi::host::HostMessageContext* context,
-+    const PP_Point& location) {
-+  // Note that all early returns must do a SendMenuReply. The sync result for
-+  // this message isn't used, so to forward the error to the plugin, we need to
-+  // additionally call SendMenuReply explicitly.
-+  if (menu_data_.empty()) {
-+    SendMenuReply(PP_ERROR_FAILED, -1);
-+    return PP_ERROR_FAILED;
-+  }
-+  if (showing_context_menu_) {
-+    SendMenuReply(PP_ERROR_INPROGRESS, -1);
-+    return PP_ERROR_INPROGRESS;
-+  }
-+
-+  content::RenderFrame* render_frame =
-+      renderer_ppapi_host_->GetRenderFrameForInstance(pp_instance());
-+
-+  content::ContextMenuParams params;
-+  params.x = location.x;
-+  params.y = location.y;
-+  params.custom_context.is_pepper_menu = true;
-+  params.custom_context.render_widget_id =
-+      renderer_ppapi_host_->GetRoutingIDForWidget(pp_instance());
-+  params.custom_items = menu_data_;
-+
-+  // Transform the position to be in render frame's coordinates.
-+  gfx::Point render_frame_pt = renderer_ppapi_host_->PluginPointToRenderFrame(
-+      pp_instance(), gfx::Point(location.x, location.y));
-+  params.x = render_frame_pt.x();
-+  params.y = render_frame_pt.y();
-+
-+  showing_context_menu_ = true;
-+  context_menu_request_id_ = render_frame->ShowContextMenu(this, params);
-+
-+  // Note: the show message is sync so this OK is for the sync reply which we
-+  // don't actually use (see the comment in the resource file for this). The
-+  // async message containing the context menu action will be sent in the
-+  // future.
-+  return PP_OK;
-+}
-+
-+void PepperFlashMenuHost::OnMenuAction(int request_id, unsigned action) {
-+  // Just save the action.
-+  DCHECK(!has_saved_context_menu_action_);
-+  has_saved_context_menu_action_ = true;
-+  saved_context_menu_action_ = action;
-+}
-+
-+void PepperFlashMenuHost::OnMenuClosed(int request_id) {
-+  if (has_saved_context_menu_action_ &&
-+      saved_context_menu_action_ < menu_id_map_.size()) {
-+    SendMenuReply(PP_OK, menu_id_map_[saved_context_menu_action_]);
-+    has_saved_context_menu_action_ = false;
-+    saved_context_menu_action_ = 0;
-+  } else {
-+    SendMenuReply(PP_ERROR_USERCANCEL, -1);
-+  }
-+
-+  showing_context_menu_ = false;
-+  context_menu_request_id_ = 0;
-+}
-+
-+void PepperFlashMenuHost::SendMenuReply(int32_t result, int action) {
-+  ppapi::host::ReplyMessageContext reply_context(
-+      ppapi::proxy::ResourceMessageReplyParams(pp_resource(), 0), NULL,
-+      MSG_ROUTING_NONE);
-+  reply_context.params.set_result(result);
-+  host()->SendReply(reply_context, PpapiPluginMsg_FlashMenu_ShowReply(action));
-+}
-added in remote
-  their  100644 a2b4f9cb40098aa65bd8c15759dbbfbcc4fa6674 chromium_src/chrome/renderer/pepper/pepper_flash_menu_host.h
-@@ -0,0 +1,69 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_RENDERER_PEPPER_PEPPER_FLASH_MENU_HOST_H_
-+#define CHROME_RENDERER_PEPPER_PEPPER_FLASH_MENU_HOST_H_
-+
-+#include <vector>
-+
-+#include "base/compiler_specific.h"
-+#include "content/public/renderer/context_menu_client.h"
-+#include "ppapi/c/pp_point.h"
-+#include "ppapi/host/host_message_context.h"
-+#include "ppapi/host/resource_host.h"
-+
-+namespace content {
-+class RendererPpapiHost;
-+struct MenuItem;
-+}  // namespace content
-+
-+namespace ppapi {
-+namespace proxy {
-+class SerializedFlashMenu;
-+}
-+}  // namespace ppapi
-+
-+class PepperFlashMenuHost : public ppapi::host::ResourceHost,
-+                            public content::ContextMenuClient {
-+ public:
-+  PepperFlashMenuHost(content::RendererPpapiHost* host,
-+                      PP_Instance instance,
-+                      PP_Resource resource,
-+                      const ppapi::proxy::SerializedFlashMenu& serial_menu);
-+  ~PepperFlashMenuHost() override;
-+
-+  int32_t OnResourceMessageReceived(
-+      const IPC::Message& msg,
-+      ppapi::host::HostMessageContext* context) override;
-+
-+ private:
-+  int32_t OnHostMsgShow(ppapi::host::HostMessageContext* context,
-+                        const PP_Point& location);
-+
-+  // ContextMenuClient implementation.
-+  void OnMenuAction(int request_id, unsigned action) override;
-+  void OnMenuClosed(int request_id) override;
-+
-+  void SendMenuReply(int32_t result, int action);
-+
-+  content::RendererPpapiHost* renderer_ppapi_host_;
-+
-+  bool showing_context_menu_;
-+  int context_menu_request_id_;
-+
-+  std::vector<content::MenuItem> menu_data_;
-+
-+  // We send |MenuItem|s, which have an |unsigned| "action" field instead of
-+  // an |int32_t| ID. (CONTENT also limits the range of valid values for
-+  // actions.) This maps actions to IDs.
-+  std::vector<int32_t> menu_id_map_;
-+
-+  // Used to send a single context menu "completion" upon menu close.
-+  bool has_saved_context_menu_action_;
-+  unsigned saved_context_menu_action_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(PepperFlashMenuHost);
-+};
-+
-+#endif  // CHROME_RENDERER_PEPPER_PEPPER_FLASH_MENU_HOST_H_
-added in remote
-  their  100644 50015122ccc7e2da02d0e9b2c7014e085c3ffec4 chromium_src/chrome/renderer/pepper/pepper_flash_renderer_host.cc
-@@ -0,0 +1,370 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/renderer/pepper/pepper_flash_renderer_host.h"
-+
-+#include <map>
-+#include <vector>
-+
-+#include "base/lazy_instance.h"
-+#include "base/macros.h"
-+#include "base/metrics/histogram_macros.h"
-+#include "base/strings/string_util.h"
-+#include "content/public/renderer/pepper_plugin_instance.h"
-+#include "content/public/renderer/render_thread.h"
-+#include "content/public/renderer/renderer_ppapi_host.h"
-+#include "ipc/ipc_message_macros.h"
-+#include "net/http/http_util.h"
-+#include "ppapi/c/pp_errors.h"
-+#include "ppapi/c/trusted/ppb_browser_font_trusted.h"
-+#include "ppapi/host/dispatch_host_message.h"
-+#include "ppapi/proxy/host_dispatcher.h"
-+#include "ppapi/proxy/ppapi_messages.h"
-+#include "ppapi/proxy/resource_message_params.h"
-+#include "ppapi/proxy/serialized_structs.h"
-+#include "ppapi/thunk/enter.h"
-+#include "ppapi/thunk/ppb_image_data_api.h"
-+#include "skia/ext/platform_canvas.h"
-+#include "third_party/skia/include/core/SkCanvas.h"
-+#include "third_party/skia/include/core/SkFontStyle.h"
-+#include "third_party/skia/include/core/SkMatrix.h"
-+#include "third_party/skia/include/core/SkPaint.h"
-+#include "third_party/skia/include/core/SkPoint.h"
-+#include "third_party/skia/include/core/SkTypeface.h"
-+#include "ui/gfx/geometry/rect.h"
-+#include "url/gurl.h"
-+
-+using ppapi::thunk::EnterResourceNoLock;
-+using ppapi::thunk::PPB_ImageData_API;
-+
-+namespace {
-+
-+// Some non-simple HTTP request headers that Flash may set.
-+// (Please see http://www.w3.org/TR/cors/#simple-header for the definition of
-+// simple headers.)
-+//
-+// The list and the enum defined below are used to collect data about request
-+// headers used in PPB_Flash.Navigate() calls, in order to understand the impact
-+// of rejecting PPB_Flash.Navigate() requests with non-simple headers.
-+//
-+// TODO(yzshen): We should be able to remove the histogram recording code once
-+// we get the answer.
-+const char* const kRejectedHttpRequestHeaders[] = {
-+    "authorization",     //
-+    "cache-control",     //
-+    "content-encoding",  //
-+    "content-md5",       //
-+    "content-type",      // If the media type is not one of those covered by the
-+                         // simple header definition.
-+    "expires",           //
-+    "from",              //
-+    "if-match",          //
-+    "if-none-match",     //
-+    "if-range",          //
-+    "if-unmodified-since",  //
-+    "pragma",               //
-+    "referer"               //
-+};
-+
-+// Please note that new entries should be added right above
-+// FLASH_NAVIGATE_USAGE_ENUM_COUNT, and existing entries shouldn't be re-ordered
-+// or removed, since this ordering is used in a histogram.
-+enum FlashNavigateUsage {
-+  // This section must be in the same order as kRejectedHttpRequestHeaders.
-+  REJECT_AUTHORIZATION = 0,
-+  REJECT_CACHE_CONTROL,
-+  REJECT_CONTENT_ENCODING,
-+  REJECT_CONTENT_MD5,
-+  REJECT_CONTENT_TYPE,
-+  REJECT_EXPIRES,
-+  REJECT_FROM,
-+  REJECT_IF_MATCH,
-+  REJECT_IF_NONE_MATCH,
-+  REJECT_IF_RANGE,
-+  REJECT_IF_UNMODIFIED_SINCE,
-+  REJECT_PRAGMA,
-+  REJECT_REFERER,
-+
-+  // The navigate request is rejected because of headers not listed above
-+  // (e.g., custom headers).
-+  REJECT_OTHER_HEADERS,
-+
-+  // Total number of rejected navigate requests.
-+  TOTAL_REJECTED_NAVIGATE_REQUESTS,
-+
-+  // Total number of navigate requests.
-+  TOTAL_NAVIGATE_REQUESTS,
-+  FLASH_NAVIGATE_USAGE_ENUM_COUNT
-+};
-+
-+static base::LazyInstance<std::map<std::string, FlashNavigateUsage>>::
-+    DestructorAtExit g_rejected_headers = LAZY_INSTANCE_INITIALIZER;
-+
-+bool IsSimpleHeader(const std::string& lower_case_header_name,
-+                    const std::string& header_value) {
-+  if (lower_case_header_name == "accept" ||
-+      lower_case_header_name == "accept-language" ||
-+      lower_case_header_name == "content-language") {
-+    return true;
-+  }
-+
-+  if (lower_case_header_name == "content-type") {
-+    std::string lower_case_mime_type;
-+    std::string lower_case_charset;
-+    bool had_charset = false;
-+    net::HttpUtil::ParseContentType(header_value, &lower_case_mime_type,
-+                                    &lower_case_charset, &had_charset, NULL);
-+    return lower_case_mime_type == "application/x-www-form-urlencoded" ||
-+           lower_case_mime_type == "multipart/form-data" ||
-+           lower_case_mime_type == "text/plain";
-+  }
-+
-+  return false;
-+}
-+
-+void RecordFlashNavigateUsage(FlashNavigateUsage usage) {
-+  DCHECK_NE(FLASH_NAVIGATE_USAGE_ENUM_COUNT, usage);
-+  UMA_HISTOGRAM_ENUMERATION("Plugin.FlashNavigateUsage", usage,
-+                            FLASH_NAVIGATE_USAGE_ENUM_COUNT);
-+}
-+
-+}  // namespace
-+
-+PepperFlashRendererHost::PepperFlashRendererHost(
-+    content::RendererPpapiHost* host,
-+    PP_Instance instance,
-+    PP_Resource resource)
-+    : ResourceHost(host->GetPpapiHost(), instance, resource),
-+      host_(host),
-+      weak_factory_(this) {}
-+
-+PepperFlashRendererHost::~PepperFlashRendererHost() {
-+  // This object may be destroyed in the middle of a sync message. If that is
-+  // the case, make sure we respond to all the pending navigate calls.
-+  std::vector<ppapi::host::ReplyMessageContext>::reverse_iterator it;
-+  for (it = navigate_replies_.rbegin(); it != navigate_replies_.rend(); ++it)
-+    SendReply(*it, IPC::Message());
-+}
-+
-+int32_t PepperFlashRendererHost::OnResourceMessageReceived(
-+    const IPC::Message& msg,
-+    ppapi::host::HostMessageContext* context) {
-+  PPAPI_BEGIN_MESSAGE_MAP(PepperFlashRendererHost, msg)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_Flash_GetProxyForURL,
-+                                      OnGetProxyForURL)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_Flash_SetInstanceAlwaysOnTop,
-+                                      OnSetInstanceAlwaysOnTop)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_Flash_DrawGlyphs,
-+                                      OnDrawGlyphs)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_Flash_Navigate, OnNavigate)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_Flash_IsRectTopmost,
-+                                      OnIsRectTopmost)
-+  PPAPI_END_MESSAGE_MAP()
-+  return PP_ERROR_FAILED;
-+}
-+
-+int32_t PepperFlashRendererHost::OnGetProxyForURL(
-+    ppapi::host::HostMessageContext* host_context,
-+    const std::string& url) {
-+  GURL gurl(url);
-+  if (!gurl.is_valid())
-+    return PP_ERROR_FAILED;
-+  std::string proxy;
-+  bool result = content::RenderThread::Get()->ResolveProxy(gurl, &proxy);
-+  if (!result)
-+    return PP_ERROR_FAILED;
-+  host_context->reply_msg = PpapiPluginMsg_Flash_GetProxyForURLReply(proxy);
-+  return PP_OK;
-+}
-+
-+int32_t PepperFlashRendererHost::OnSetInstanceAlwaysOnTop(
-+    ppapi::host::HostMessageContext* host_context,
-+    bool on_top) {
-+  content::PepperPluginInstance* plugin_instance =
-+      host_->GetPluginInstance(pp_instance());
-+  if (plugin_instance)
-+    plugin_instance->SetAlwaysOnTop(on_top);
-+  // Since no reply is sent for this message, it doesn't make sense to return an
-+  // error.
-+  return PP_OK;
-+}
-+
-+int32_t PepperFlashRendererHost::OnDrawGlyphs(
-+    ppapi::host::HostMessageContext* host_context,
-+    ppapi::proxy::PPBFlash_DrawGlyphs_Params params) {
-+  return PP_ERROR_FAILED;
-+  // if (params.glyph_indices.size() != params.glyph_advances.size() ||
-+  //     params.glyph_indices.empty())
-+  //   return PP_ERROR_FAILED;
-+  //
-+  // // Set up the typeface.
-+  // int weight = (params.font_desc.weight + 1) * 100;
-+  // SkFontStyle::Slant slant = SkFontStyle::kUpright_Slant;
-+  // if (params.font_desc.italic)
-+  //   slant = SkFontStyle::kItalic_Slant;
-+  // SkFontStyle style(weight, SkFontStyle::kNormal_Width, slant);
-+  // sk_sp<SkTypeface> typeface(
-+  //     SkTypeface::MakeFromName(params.font_desc.face.c_str(), style));
-+  // if (!typeface)
-+  //   return PP_ERROR_FAILED;
-+  //
-+  // EnterResourceNoLock<PPB_ImageData_API> enter(
-+  //     params.image_data.host_resource(), true);
-+  // if (enter.failed())
-+  //   return PP_ERROR_FAILED;
-+  //
-+  // // Set up the canvas.
-+  // PPB_ImageData_API* image = static_cast<PPB_ImageData_API*>(enter.object());
-+  // SkCanvas* canvas = image->GetCanvas();
-+  // bool needs_unmapping = false;
-+  // if (!canvas) {
-+  //   needs_unmapping = true;
-+  //   image->Map();
-+  //   canvas = image->GetCanvas();
-+  //   if (!canvas)
-+  //     return PP_ERROR_FAILED;  // Failure mapping.
-+  // }
-+  //
-+  // SkAutoCanvasRestore acr(canvas, true);
-+  //
-+  // // Clip is applied in pixels before the transform.
-+  // SkRect clip_rect = {
-+  //     SkIntToScalar(params.clip.point.x), SkIntToScalar(params.clip.point.y),
-+  //     SkIntToScalar(params.clip.point.x + params.clip.size.width),
-+  //     SkIntToScalar(params.clip.point.y + params.clip.size.height)};
-+  // canvas->clipRect(clip_rect);
-+  //
-+  // // Convert & set the matrix.
-+  // SkMatrix matrix;
-+  // matrix.set(SkMatrix::kMScaleX, SkFloatToScalar(params.transformation[0][0]));
-+  // matrix.set(SkMatrix::kMSkewX, SkFloatToScalar(params.transformation[0][1]));
-+  // matrix.set(SkMatrix::kMTransX, SkFloatToScalar(params.transformation[0][2]));
-+  // matrix.set(SkMatrix::kMSkewY, SkFloatToScalar(params.transformation[1][0]));
-+  // matrix.set(SkMatrix::kMScaleY, SkFloatToScalar(params.transformation[1][1]));
-+  // matrix.set(SkMatrix::kMTransY, SkFloatToScalar(params.transformation[1][2]));
-+  // matrix.set(SkMatrix::kMPersp0, SkFloatToScalar(params.transformation[2][0]));
-+  // matrix.set(SkMatrix::kMPersp1, SkFloatToScalar(params.transformation[2][1]));
-+  // matrix.set(SkMatrix::kMPersp2, SkFloatToScalar(params.transformation[2][2]));
-+  // canvas->concat(matrix);
-+  //
-+  // SkPaint paint;
-+  // paint.setColor(params.color);
-+  // paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
-+  // paint.setAntiAlias(true);
-+  // paint.setHinting(SkPaint::kFull_Hinting);
-+  // paint.setTextSize(SkIntToScalar(params.font_desc.size));
-+  // paint.setTypeface(std::move(typeface));
-+  // if (params.allow_subpixel_aa) {
-+  //   paint.setSubpixelText(true);
-+  //   paint.setLCDRenderText(true);
-+  // }
-+  //
-+  // SkScalar x = SkIntToScalar(params.position.x);
-+  // SkScalar y = SkIntToScalar(params.position.y);
-+  //
-+  // // Build up the skia advances.
-+  // size_t glyph_count = params.glyph_indices.size();
-+  // if (glyph_count) {
-+  //   std::vector<SkPoint> storage;
-+  //   storage.resize(glyph_count);
-+  //   SkPoint* sk_positions = &storage[0];
-+  //   for (uint32_t i = 0; i < glyph_count; i++) {
-+  //     sk_positions[i].set(x, y);
-+  //     x += SkFloatToScalar(params.glyph_advances[i].x);
-+  //     y += SkFloatToScalar(params.glyph_advances[i].y);
-+  //   }
-+  //
-+  //   canvas->drawPosText(&params.glyph_indices[0], glyph_count * 2, sk_positions,
-+  //                       paint);
-+  // }
-+  //
-+  // if (needs_unmapping)
-+  //   image->Unmap();
-+  //
-+  // return PP_OK;
-+}
-+
-+// CAUTION: This code is subtle because Navigate is a sync call which may
-+// cause re-entrancy or cause the instance to be destroyed. If the instance
-+// is destroyed we need to ensure that we respond to all outstanding sync
-+// messages so that the plugin process does not remain blocked.
-+int32_t PepperFlashRendererHost::OnNavigate(
-+    ppapi::host::HostMessageContext* host_context,
-+    const ppapi::URLRequestInfoData& data,
-+    const std::string& target,
-+    bool from_user_action) {
-+  // If our PepperPluginInstance is already destroyed, just return a failure.
-+  content::PepperPluginInstance* plugin_instance =
-+      host_->GetPluginInstance(pp_instance());
-+  if (!plugin_instance)
-+    return PP_ERROR_FAILED;
-+
-+  std::map<std::string, FlashNavigateUsage>& rejected_headers =
-+      g_rejected_headers.Get();
-+  if (rejected_headers.empty()) {
-+    for (size_t i = 0; i < arraysize(kRejectedHttpRequestHeaders); ++i)
-+      rejected_headers[kRejectedHttpRequestHeaders[i]] =
-+          static_cast<FlashNavigateUsage>(i);
-+  }
-+
-+  net::HttpUtil::HeadersIterator header_iter(data.headers.begin(),
-+                                             data.headers.end(), "\n\r");
-+  bool rejected = false;
-+  while (header_iter.GetNext()) {
-+    std::string lower_case_header_name = base::ToLowerASCII(header_iter.name());
-+    if (!IsSimpleHeader(lower_case_header_name, header_iter.values())) {
-+      rejected = true;
-+
-+      std::map<std::string, FlashNavigateUsage>::const_iterator iter =
-+          rejected_headers.find(lower_case_header_name);
-+      FlashNavigateUsage usage =
-+          iter != rejected_headers.end() ? iter->second : REJECT_OTHER_HEADERS;
-+      RecordFlashNavigateUsage(usage);
-+    }
-+  }
-+
-+  RecordFlashNavigateUsage(TOTAL_NAVIGATE_REQUESTS);
-+  if (rejected) {
-+    RecordFlashNavigateUsage(TOTAL_REJECTED_NAVIGATE_REQUESTS);
-+    return PP_ERROR_NOACCESS;
-+  }
-+
-+  // Navigate may call into Javascript (e.g. with a "javascript:" URL),
-+  // or do things like navigate away from the page, either one of which will
-+  // need to re-enter into the plugin. It is safe, because it is essentially
-+  // equivalent to NPN_GetURL, where Flash would expect re-entrancy.
-+  ppapi::proxy::HostDispatcher* host_dispatcher =
-+      ppapi::proxy::HostDispatcher::GetForInstance(pp_instance());
-+  host_dispatcher->set_allow_plugin_reentrancy();
-+
-+  // Grab a weak pointer to ourselves on the stack so we can check if we are
-+  // still alive.
-+  base::WeakPtr<PepperFlashRendererHost> weak_ptr = weak_factory_.GetWeakPtr();
-+  // Keep track of reply contexts in case we are destroyed during a Navigate
-+  // call. Even if we are destroyed, we still need to send these replies to
-+  // unblock the plugin process.
-+  navigate_replies_.push_back(host_context->MakeReplyMessageContext());
-+  plugin_instance->Navigate(data, target.c_str(), from_user_action);
-+  // This object might have been destroyed by this point. If it is destroyed
-+  // the reply will be sent in the destructor. Otherwise send the reply here.
-+  if (weak_ptr.get()) {
-+    SendReply(navigate_replies_.back(), IPC::Message());
-+    navigate_replies_.pop_back();
-+  }
-+
-+  // Return PP_OK_COMPLETIONPENDING so that no reply is automatically sent.
-+  return PP_OK_COMPLETIONPENDING;
-+}
-+
-+int32_t PepperFlashRendererHost::OnIsRectTopmost(
-+    ppapi::host::HostMessageContext* host_context,
-+    const PP_Rect& rect) {
-+  content::PepperPluginInstance* plugin_instance =
-+      host_->GetPluginInstance(pp_instance());
-+  if (plugin_instance &&
-+      plugin_instance->IsRectTopmost(gfx::Rect(
-+          rect.point.x, rect.point.y, rect.size.width, rect.size.height)))
-+    return PP_OK;
-+  return PP_ERROR_FAILED;
-+}
-added in remote
-  their  100644 b080f1d9fbf0db2e6adaf67dd783b05eeb9d06a0 chromium_src/chrome/renderer/pepper/pepper_flash_renderer_host.h
-@@ -0,0 +1,68 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_RENDERER_PEPPER_PEPPER_FLASH_RENDERER_HOST_H_
-+#define CHROME_RENDERER_PEPPER_PEPPER_FLASH_RENDERER_HOST_H_
-+
-+#include <string>
-+#include <vector>
-+
-+#include "base/memory/weak_ptr.h"
-+#include "ppapi/host/host_message_context.h"
-+#include "ppapi/host/resource_host.h"
-+
-+struct PP_Rect;
-+
-+namespace ppapi {
-+struct URLRequestInfoData;
-+}
-+
-+namespace ppapi {
-+namespace proxy {
-+struct PPBFlash_DrawGlyphs_Params;
-+}
-+}  // namespace ppapi
-+
-+namespace content {
-+class RendererPpapiHost;
-+}
-+
-+class PepperFlashRendererHost : public ppapi::host::ResourceHost {
-+ public:
-+  PepperFlashRendererHost(content::RendererPpapiHost* host,
-+                          PP_Instance instance,
-+                          PP_Resource resource);
-+  ~PepperFlashRendererHost() override;
-+
-+  // ppapi::host::ResourceHost override.
-+  int32_t OnResourceMessageReceived(
-+      const IPC::Message& msg,
-+      ppapi::host::HostMessageContext* context) override;
-+
-+ private:
-+  int32_t OnGetProxyForURL(ppapi::host::HostMessageContext* host_context,
-+                           const std::string& url);
-+  int32_t OnSetInstanceAlwaysOnTop(
-+      ppapi::host::HostMessageContext* host_context,
-+      bool on_top);
-+  int32_t OnDrawGlyphs(ppapi::host::HostMessageContext* host_context,
-+                       ppapi::proxy::PPBFlash_DrawGlyphs_Params params);
-+  int32_t OnNavigate(ppapi::host::HostMessageContext* host_context,
-+                     const ppapi::URLRequestInfoData& data,
-+                     const std::string& target,
-+                     bool from_user_action);
-+  int32_t OnIsRectTopmost(ppapi::host::HostMessageContext* host_context,
-+                          const PP_Rect& rect);
-+
-+  // A stack of ReplyMessageContexts to track Navigate() calls which have not
-+  // yet been replied to.
-+  std::vector<ppapi::host::ReplyMessageContext> navigate_replies_;
-+
-+  content::RendererPpapiHost* host_;
-+  base::WeakPtrFactory<PepperFlashRendererHost> weak_factory_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(PepperFlashRendererHost);
-+};
-+
-+#endif  // CHROME_RENDERER_PEPPER_PEPPER_FLASH_RENDERER_HOST_H_
-added in remote
-  their  100644 eef18560f9e577a77f8dc4eba64bf5907f77a0e2 chromium_src/chrome/renderer/pepper/pepper_helper.cc
-@@ -0,0 +1,30 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/renderer/pepper/pepper_helper.h"
-+
-+#include "chrome/renderer/pepper/chrome_renderer_pepper_host_factory.h"
-+#include "chrome/renderer/pepper/pepper_shared_memory_message_filter.h"
-+#include "content/public/renderer/renderer_ppapi_host.h"
-+#include "ppapi/host/ppapi_host.h"
-+
-+PepperHelper::PepperHelper(content::RenderFrame* render_frame)
-+    : RenderFrameObserver(render_frame) {}
-+
-+PepperHelper::~PepperHelper() {}
-+
-+void PepperHelper::DidCreatePepperPlugin(content::RendererPpapiHost* host) {
-+  // TODO(brettw) figure out how to hook up the host factory. It needs some
-+  // kind of filter-like system to allow dynamic additions.
-+  host->GetPpapiHost()->AddHostFactoryFilter(
-+      std::unique_ptr<ppapi::host::HostFactory>(
-+          new ChromeRendererPepperHostFactory(host)));
-+  host->GetPpapiHost()->AddInstanceMessageFilter(
-+      std::unique_ptr<ppapi::host::InstanceMessageFilter>(
-+          new PepperSharedMemoryMessageFilter(host)));
-+}
-+
-+void PepperHelper::OnDestruct() {
-+  delete this;
-+}
-added in remote
-  their  100644 6157d2c794868d5d2b5f39ddd6f38cbce72a0a9f chromium_src/chrome/renderer/pepper/pepper_helper.h
-@@ -0,0 +1,26 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_RENDERER_PEPPER_PEPPER_HELPER_H_
-+#define CHROME_RENDERER_PEPPER_PEPPER_HELPER_H_
-+
-+#include "base/compiler_specific.h"
-+#include "content/public/renderer/render_frame_observer.h"
-+
-+// This class listens for Pepper creation events from the RenderFrame and
-+// attaches the parts required for Chrome-specific plugin support.
-+class PepperHelper : public content::RenderFrameObserver {
-+ public:
-+  explicit PepperHelper(content::RenderFrame* render_frame);
-+  ~PepperHelper() override;
-+
-+  // RenderFrameObserver.
-+  void DidCreatePepperPlugin(content::RendererPpapiHost* host) override;
-+  void OnDestruct() override;
-+
-+ private:
-+  DISALLOW_COPY_AND_ASSIGN(PepperHelper);
-+};
-+
-+#endif  // CHROME_RENDERER_PEPPER_PEPPER_HELPER_H_
-added in remote
-  their  100644 fb72c2da786b3cbcef7ce149f560821592df1747 chromium_src/chrome/renderer/pepper/pepper_shared_memory_message_filter.cc
-@@ -0,0 +1,63 @@
-+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/renderer/pepper/pepper_shared_memory_message_filter.h"
-+
-+#include <memory>
-+
-+#include "base/memory/shared_memory.h"
-+#include "base/process/process_handle.h"
-+#include "content/public/common/content_client.h"
-+#include "content/public/renderer/pepper_plugin_instance.h"
-+#include "content/public/renderer/render_thread.h"
-+#include "content/public/renderer/renderer_ppapi_host.h"
-+#include "ppapi/host/ppapi_host.h"
-+#include "ppapi/proxy/ppapi_messages.h"
-+#include "ppapi/shared_impl/var_tracker.h"
-+
-+PepperSharedMemoryMessageFilter::PepperSharedMemoryMessageFilter(
-+    content::RendererPpapiHost* host)
-+    : InstanceMessageFilter(host->GetPpapiHost()), host_(host) {}
-+
-+PepperSharedMemoryMessageFilter::~PepperSharedMemoryMessageFilter() {}
-+
-+bool PepperSharedMemoryMessageFilter::OnInstanceMessageReceived(
-+    const IPC::Message& msg) {
-+  bool handled = true;
-+  IPC_BEGIN_MESSAGE_MAP(PepperSharedMemoryMessageFilter, msg)
-+    IPC_MESSAGE_HANDLER(PpapiHostMsg_SharedMemory_CreateSharedMemory,
-+                        OnHostMsgCreateSharedMemory)
-+    IPC_MESSAGE_UNHANDLED(handled = false)
-+  IPC_END_MESSAGE_MAP()
-+  return handled;
-+}
-+
-+bool PepperSharedMemoryMessageFilter::Send(IPC::Message* msg) {
-+  return host_->GetPpapiHost()->Send(msg);
-+}
-+
-+void PepperSharedMemoryMessageFilter::OnHostMsgCreateSharedMemory(
-+    PP_Instance instance,
-+    uint32_t size,
-+    int* host_handle_id,
-+    ppapi::proxy::SerializedHandle* plugin_handle) {
-+  plugin_handle->set_null_shmem();
-+  *host_handle_id = -1;
-+  std::unique_ptr<base::SharedMemory> shm(
-+      content::RenderThread::Get()->HostAllocateSharedMemoryBuffer(size));
-+  if (!shm.get())
-+    return;
-+
-+  base::SharedMemoryHandle host_shm_handle = shm->handle().Duplicate();
-+  *host_handle_id =
-+      content::PepperPluginInstance::Get(instance)
-+          ->GetVarTracker()
-+          ->TrackSharedMemoryHandle(instance, host_shm_handle, size);
-+
-+  // We set auto_close to false since we need our file descriptor to
-+  // actually be duplicated on linux. The shared memory destructor will
-+  // close the original handle for us.
-+  plugin_handle->set_shmem(
-+      host_->ShareSharedMemoryHandleWithRemote(host_shm_handle), size);
-+}
-added in remote
-  their  100644 d1e2dc1719e501561941cafeab4fd95ef0779314 chromium_src/chrome/renderer/pepper/pepper_shared_memory_message_filter.h
-@@ -0,0 +1,46 @@
-+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_RENDERER_PEPPER_PEPPER_SHARED_MEMORY_MESSAGE_FILTER_H_
-+#define CHROME_RENDERER_PEPPER_PEPPER_SHARED_MEMORY_MESSAGE_FILTER_H_
-+
-+#include "ppapi/c/pp_instance.h"
-+#include "ppapi/host/instance_message_filter.h"
-+
-+namespace content {
-+class RendererPpapiHost;
-+}
-+
-+namespace ppapi {
-+namespace proxy {
-+class SerializedHandle;
-+}
-+}  // namespace ppapi
-+
-+// Implements the backend for shared memory messages from a plugin process.
-+class PepperSharedMemoryMessageFilter
-+    : public ppapi::host::InstanceMessageFilter {
-+ public:
-+  explicit PepperSharedMemoryMessageFilter(content::RendererPpapiHost* host);
-+  ~PepperSharedMemoryMessageFilter() override;
-+
-+  // InstanceMessageFilter:
-+  bool OnInstanceMessageReceived(const IPC::Message& msg) override;
-+
-+  bool Send(IPC::Message* msg);
-+
-+ private:
-+  // Message handlers.
-+  void OnHostMsgCreateSharedMemory(
-+      PP_Instance instance,
-+      uint32_t size,
-+      int* host_shm_handle_id,
-+      ppapi::proxy::SerializedHandle* plugin_shm_handle);
-+
-+  content::RendererPpapiHost* host_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(PepperSharedMemoryMessageFilter);
-+};
-+
-+#endif  // CHROME_RENDERER_PEPPER_PEPPER_SHARED_MEMORY_MESSAGE_FILTER_H_
-added in both
-  our    100644 8744574f10aa0235234f87cd1b614572d9ba98e9 chromium_src/chrome/utility/printing_handler_win.h
-  their  100644 d058e7e505569126827ba24b3a42051ba386630c chromium_src/chrome/utility/printing_handler_win.h
-@@ -13,7 +13,11 @@
- 
- namespace printing {
- 
-+<<<<<<< .our
- struct PdfRenderSettings;
-+=======
-+class PdfRenderSettings;
-+>>>>>>> .their
- struct PwgRasterSettings;
- struct PageRange;
- 
-added in both
-  our    100644 1b9da74e503ab4afa8d2c530cd45332f0868a463 default_app/default_app.js
-  their  100644 e6ba9eea2cb5938fe71ab7c18a47921d3959061e default_app/default_app.js
-@@ -18,17 +18,24 @@
-       webPreferences: {
-         nodeIntegrationInWorker: true
-       },
-+<<<<<<< .our
-       useContentSize: true,
-       show: false
-+=======
-+      useContentSize: true
-+>>>>>>> .their
-     }
-     if (process.platform === 'linux') {
-       options.icon = path.join(__dirname, 'icon.png')
-     }
- 
-     mainWindow = new BrowserWindow(options)
-+<<<<<<< .our
- 
-     mainWindow.on('ready-to-show', () => mainWindow.show())
- 
-+=======
-+>>>>>>> .their
-     mainWindow.loadURL(appUrl)
-     mainWindow.focus()
-   })
-added in both
-  our    100644 fd4525f128b5f7718e03998a9d83ae79ff163078 default_app/index.html
-  their  100644 c8564cb57a11cbfea4bea37db09df4cd82dee4fb default_app/index.html
-@@ -2,13 +2,174 @@
- 
- <head>
-   <title>Electron</title>
-+<<<<<<< .our
-   <meta http-equiv="Content-Security-Policy" content="default-src 'none'; script-src 'self'; style-src 'self'; img-src 'self'" />
-   <link href="./styles.css" type="text/css" rel="stylesheet" />
-   <link href="./node_modules/octicons/build/build.css" type="text/css" rel="stylesheet" />
-+=======
-+  <style>
-+    body {
-+      color: #86a5b1;
-+      background-color: #2f3241;
-+      font-family: Roboto, -apple-system, BlinkMacSystemFont, "Helvetica Neue", "Segoe UI", "Oxygen", "Ubuntu", "Cantarell", "Open Sans", sans-serif;
-+      margin: 0;
-+      display: flex;
-+      flex-direction: column;
-+    }
-+
-+    .container {
-+      margin: 15px 30px 30px 30px;
-+      background-color: #2f3241;
-+      flex: 1;
-+      display: flex;
-+      flex-direction: column;
-+    }
-+
-+    .svg-stroke {
-+      stroke: #9feaf9;
-+    }
-+
-+    .svg-fill {
-+      fill: #9feaf9;
-+    }
-+
-+    .vertical-middle {
-+      vertical-align: middle !important;
-+    }
-+
-+    h2, h4, p {
-+      text-align: center;
-+    }
-+
-+    h4 {
-+      font-weight: normal;
-+      margin: 0;
-+      line-height: 3;
-+    }
-+
-+    .hero-icons {
-+      transform-origin: 50% 50%;
-+    }
-+
-+    hero-icon.loop-3 {
-+      transform: translate(79px, 21px);
-+      opacity: 1;
-+    }
-+
-+    .hero-icon {
-+      fill: #c2f5ff;
-+      opacity: 1;
-+      transform-origin: 50% 50%;
-+    }
-+
-+    .hero-app {
-+      fill: #71abb7;
-+      transform-origin: 50% 50%;
-+    }
-+
-+    a {
-+      color: #86a5b1;
-+      text-decoration: none;
-+      transition: all 0.2s;
-+    }
-+
-+    a:hover {
-+      color: #c2f5ff;
-+      text-decoration: none;
-+    }
-+
-+    pre, code, .code {
-+      font-family: "Menlo", "Lucida Console", monospace;
-+      color: #c2f5ff;
-+    }
-+
-+    pre {
-+      background-color: #26282E;
-+      white-space: pre-wrap;
-+      line-height: 2.5;
-+      overflow: auto;
-+      margin: 0 auto;
-+      display: inline-block;
-+      padding: 6px 15px;
-+      text-align: center;
-+      border-radius: 3px;
-+    }
-+
-+    pre.with-prompt:before {
-+      content: "$ ";
-+      opacity: 0.7;
-+    }
-+
-+    code {
-+      padding: 1px 4px;
-+      font-size: 14px;
-+      text-align: center;
-+    }
-+
-+    .versions {
-+      list-style: none;
-+      margin: 0 auto;
-+      padding: 0;
-+      float: none;
-+      clear: both;
-+      overflow: hidden;
-+    }
-+
-+    .versions li {
-+      display: block;
-+      float: left;
-+      border-right: 1px solid rgba(194, 245, 255, 0.4);
-+      padding: 0 20px;
-+      font-size: 13px;
-+      opacity: 0.8;
-+    }
-+
-+    .versions li:last-child {
-+      border: none;
-+    }
-+
-+    nav {
-+      margin: 40px 0 0 0;
-+    }
-+
-+    .linkcol {
-+      width: 19%;
-+      display: inline-block;
-+      text-align: center;
-+    }
-+
-+    .hero-octicon {
-+      display: block;
-+      width: 80px;
-+      height: 80px;
-+      margin: 0;
-+      padding: 0;
-+      font-size: 42px !important;
-+      color: #9feaf9;
-+      text-align: center;
-+      background-color: rgba(194, 245, 255, 0.1);
-+      border-radius: 50%;
-+    }
-+
-+    .hero-octicon:before {
-+      display: block;
-+      padding-top: 20px;
-+    }
-+
-+    .octicon-gist:before { padding-left: 10px; }
-+    .octicon-gear:before { padding-left: 5px; }
-+    .octicon-star:before { padding-left: 6px; }
-+    .octicon-gift:before { padding-left: 2px; }
-+  </style>
-+>>>>>>> .their
- </head>
- 
- <body>
-   <div class="container">
-+<<<<<<< .our
-+=======
-+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/octicons/4.4.0/font/octicons.css">
-+>>>>>>> .their
-     <ul class="versions code">
-       <li class="electron-version"></li>
-       <li class="chrome-version"></li>
-@@ -84,7 +245,13 @@
-     </div>
-   </nav>
- 
-+<<<<<<< .our
-   <script src="./renderer.js"></script>
-+=======
-+  <script>
-+    require('./renderer')
-+  </script>
-+>>>>>>> .their
- </body>
- 
- </html>
-\ No newline at end of file
-added in both
-  our    100644 0e93f684875ca8c4fd8c771c93dce9110de57c15 default_app/main.js
-  their  100644 7fdfc7c3fa3607f1cb664bf50a9b536abe5c40d5 default_app/main.js
-@@ -320,7 +320,11 @@
-   const file = option.file
-   const protocol = url.parse(file).protocol
-   const extension = path.extname(file)
-+<<<<<<< .our
-   if (protocol === 'http:' || protocol === 'https:' || protocol === 'file:' || protocol === 'chrome:') {
-+=======
-+  if (protocol === 'http:' || protocol === 'https:' || protocol === 'file:') {
-+>>>>>>> .their
-     loadApplicationByUrl(file)
-   } else if (extension === '.html' || extension === '.htm') {
-     loadApplicationByUrl('file://' + path.resolve(file))
-added in both
-  our    100644 977aad7ab9d4171d2ab86b599eee1e39b4b82041 default_app/renderer.js
-  their  100644 92e5530ada1aa971e28b276164e1a8885bce9f45 default_app/renderer.js
-@@ -1,5 +1,8 @@
- const {remote, shell} = require('electron')
-+<<<<<<< .our
- const fs = require('fs')
-+=======
-+>>>>>>> .their
- const path = require('path')
- const URL = require('url')
- const electronPath = path.relative(process.cwd(), remote.process.execPath)
-@@ -21,6 +24,7 @@
- document.querySelector('.node-version').innerText = `Node v${process.versions.node}`
- document.querySelector('.v8-version').innerText = `v8 v${process.versions.v8}`
- document.querySelector('.command-example').innerText = `${electronPath} path-to-app`
-+<<<<<<< .our
- 
- function getOcticonSvg (name) {
-   const octiconPath = path.resolve(__dirname, 'node_modules', 'octicons', 'build', 'svg', `${name}.svg`)
-@@ -50,3 +54,5 @@
- for (const element of document.querySelectorAll('.octicon')) {
-   loadSVG(element)
- }
-+=======
-+>>>>>>> .their
-added in both
-  our    100644 14dc557e237404cbbd5bcebabb0e65486dc36926 docs/api/app.md
-  their  100644 740da22d82ee5662e5bb994fa8e1c2eadb907a5e docs/api/app.md
-@@ -881,7 +881,11 @@
- 
- Imports the certificate in pkcs12 format into the platform certificate store.
- `callback` is called with the `result` of import operation, a value of `0`
-+<<<<<<< .our
- indicates success while any other value indicates failure according to Chromium [net_error_list](https://code.google.com/p/chromium/codesearch#chromium/src/net/base/net_error_list.h).
-+=======
-+indicates success while any other value indicates failure according to chromium [net_error_list](https://code.google.com/p/chromium/codesearch#chromium/src/net/base/net_error_list.h).
-+>>>>>>> .their
- 
- ### `app.disableHardwareAcceleration()`
- 
-@@ -1033,7 +1037,11 @@
- stopAccessingSecurityScopedResource()
- ```
- 
-+<<<<<<< .our
- Start accessing a security scoped resource. With this method Electron applications that are packaged for the Mac App Store may reach outside their sandbox to access files chosen by the user. See [Apple's documentation](https://developer.apple.com/library/content/documentation/Security/Conceptual/AppSandboxDesignGuide/AppSandboxInDepth/AppSandboxInDepth.html#//apple_ref/doc/uid/TP40011183-CH3-SW16) for a description of how this system works.
-+=======
-+Start accessing a security scoped resource. With this method electron applications that are packaged for the Mac App Store may reach outside their sandbox to access files chosen by the user. See [Apple's documentation](https://developer.apple.com/library/content/documentation/Security/Conceptual/AppSandboxDesignGuide/AppSandboxInDepth/AppSandboxInDepth.html#//apple_ref/doc/uid/TP40011183-CH3-SW16) for a description of how this system works.
-+>>>>>>> .their
- 
- ### `app.commandLine.appendSwitch(switch[, value])`
- 
-added in both
-  our    100644 7f840f07102aae0f0308742e66692345a84cb84b docs/api/auto-updater.md
-  their  100644 bb181347a0ae9c4f78c48f4932c569db9f2627b5 docs/api/auto-updater.md
-@@ -84,9 +84,12 @@
- 
- On Windows only `releaseName` is available.
- 
-+<<<<<<< .our
- **Note:** It is not strictly necessary to handle this event. A successfully 
- downloaded update will still be applied the next time the application starts.
- 
-+=======
-+>>>>>>> .their
- ### Event: 'before-quit-for-update'
- 
- This event is emitted after a user calls `quitAndInstall()`.
-@@ -125,9 +128,15 @@
- windows first, and automatically call `app.quit()` after all windows have been
- closed.
- 
-+<<<<<<< .our
- **Note:** It is not strictly necessary to call this function to apply an update, 
- as a successfully downloaded update will always be applied the next time the 
- application starts.
-+=======
-+**Note:** If the application is quit without calling this API after the
-+`update-downloaded` event has been emitted, the application will still be
-+replaced by the updated one on the next run.
-+>>>>>>> .their
- 
- [squirrel-mac]: https://github.com/Squirrel/Squirrel.Mac
- [server-support]: https://github.com/Squirrel/Squirrel.Mac#server-support
-added in both
-  our    100644 dff61dd336f047cf2f6f06228b2df2b98ff2304d docs/api/browser-window.md
-  their  100644 16657f6d55f05711ade1b726966b1889ca96403b docs/api/browser-window.md
-@@ -305,6 +305,11 @@
-     * `plugins` Boolean (optional) - Whether plugins should be enabled. Default is `false`.
-     * `experimentalFeatures` Boolean (optional) - Enables Chromium's experimental features.
-       Default is `false`.
-+<<<<<<< .our
-+=======
-+    * `experimentalCanvasFeatures` Boolean (optional) - Enables Chromium's experimental
-+      canvas features. Default is `false`.
-+>>>>>>> .their
-     * `scrollBounce` Boolean (optional) - Enables scroll bounce (rubber banding) effect on
-       macOS. Default is `false`.
-     * `enableBlinkFeatures` String (optional) - A list of feature strings separated by `,`, like
-@@ -490,6 +495,7 @@
- 
- Emitted when the window is restored from a minimized state.
- 
-+<<<<<<< .our
- #### Event: 'will-resize' _macOS_ _Windows_
- 
- Returns:
-@@ -504,6 +510,11 @@
- #### Event: 'resize'
- 
- Emitted after the window has been resized.
-+=======
-+#### Event: 'resize'
-+
-+Emitted when the window is being resized.
-+>>>>>>> .their
- 
- #### Event: 'move'
- 
-@@ -1273,6 +1284,7 @@
- 
- Returns `Number` - between 0.0 (fully transparent) and 1.0 (fully opaque)
- 
-+<<<<<<< .our
- #### `win.setShape(rects)` _Windows_ _Linux_ _Experimental_
- 
- * `rects` [Rectangle[]](structures/rectangle.md) - Sets a shape on the window.
-@@ -1284,6 +1296,8 @@
- the region will not be received by that window, but will fall through to
- whatever is behind the window.
- 
-+=======
-+>>>>>>> .their
- #### `win.setThumbarButtons(buttons)` _Windows_
- 
- * `buttons` [ThumbarButton[]](structures/thumbar-button.md)
-@@ -1364,6 +1378,7 @@
- 
- Changes window icon.
- 
-+<<<<<<< .our
- #### `win.setWindowButtonVisibility(visible)` _macOS_
- 
- * `visible` Boolean
-@@ -1372,6 +1387,8 @@
- 
- This cannot be called when `titleBarStyle` is set to `customButtonsOnHover`.
- 
-+=======
-+>>>>>>> .their
- #### `win.setAutoHideMenuBar(hide)`
- 
- * `hide` Boolean
-added in both
-  our    100644 b2b28f5adb7de78a0d945e0ed1ee196d6aa45fd1 docs/api/chrome-command-line-switches.md
-  their  100644 132eddfdeb74b007958793ca62a033ecbf8d486d docs/api/chrome-command-line-switches.md
-@@ -60,8 +60,12 @@
- Use a specified proxy server, which overrides the system setting. This switch
- only affects requests with HTTP protocol, including HTTPS and WebSocket
- requests. It is also noteworthy that not all proxy servers support HTTPS and
-+<<<<<<< .our
- WebSocket requests. The proxy URL does not support username and password
- authentication [per Chromium issue](https://bugs.chromium.org/p/chromium/issues/detail?id=615947).
-+=======
-+WebSocket requests.
-+>>>>>>> .their
- 
- ## --proxy-bypass-list=`hosts`
- 
-added in both
-  our    100644 586c17e37ac1afaf7aaac3b213434ab4ecbb1ca2 docs/api/client-request.md
-  their  100644 5cd9562b654a2e8d4483d25254bb2ae72ec5b7bc docs/api/client-request.md
-@@ -215,6 +215,7 @@
- #### `request.followRedirect()`
- 
- Continues any deferred redirection request when the redirection mode is `manual`.
-+<<<<<<< .our
- 
- #### `request.getUploadProgress()`
- 
-@@ -229,3 +230,5 @@
- 
- You can use this method in conjunction with `POST` requests to get the progress
- of a file upload or other data transfer.
-+=======
-+>>>>>>> .their
-added in both
-  our    100644 80d266ab56382901e7745067488d3d316c172294 docs/api/crash-reporter.md
-  their  100644 d8f9f060241760ac723f7202d11edf2b93c04272 docs/api/crash-reporter.md
-@@ -42,7 +42,11 @@
- ### `crashReporter.start(options)`
- 
- * `options` Object
-+<<<<<<< .our
-   * `companyName` String
-+=======
-+  * `companyName` String (optional)
-+>>>>>>> .their
-   * `submitURL` String - URL that crash reports will be sent to as POST.
-   * `productName` String (optional) - Defaults to `app.getName()`.
-   * `uploadToServer` Boolean (optional) - Whether crash reports should be sent to the server
-added in both
-  our    100644 11101ae3ec01954b61266051ee74078ebfe8b299 docs/api/dialog.md
-  their  100644 a69cba8b969eeb8c7f06b9d246981d9291dae0ed docs/api/dialog.md
-@@ -141,7 +141,11 @@
-   * `cancelId` Integer (optional) - The index of the button to be used to cancel the dialog, via
-     the `Esc` key. By default this is assigned to the first button with "cancel" or "no" as the
-     label. If no such labeled buttons exist and this option is not set, `0` will be used as the
-+<<<<<<< .our
-     return value or callback response.
-+=======
-+    return value or callback response. This option is ignored on Windows.
-+>>>>>>> .their
-   * `noLink` Boolean (optional) - On Windows Electron will try to figure out which one of
-     the `buttons` are common buttons (like "Cancel" or "Yes"), and show the
-     others as command links in the dialog. This can make the dialog appear in
-added in both
-  our    100644 ae04a286821de314680b67c9a666e6d2a0f42db0 docs/api/menu-item.md
-  their  100644 f687e43dbc9f5fa925a06ceeaa67bf503fff5c37 docs/api/menu-item.md
-@@ -47,9 +47,12 @@
- The `label` and `accelerator` values are optional when using a `role` and will
- default to appropriate values for each platform.
- 
-+<<<<<<< .our
- Every menu item must have either a `role`, `label`, or in the case of a separator
- a `type`.
- 
-+=======
-+>>>>>>> .their
- The `role` property can have following values:
- 
- * `undo`
-@@ -62,11 +65,19 @@
- * `delete`
- * `minimize` - Minimize current window.
- * `close` - Close current window.
-+<<<<<<< .our
- * `quit` - Quit the application.
- * `reload` - Reload the current window.
- * `forceReload` - Reload the current window ignoring the cache.
- * `toggleDevTools` - Toggle developer tools in the current window.
- * `toggleFullScreen` - Toggle full screen mode on the current window.
-+=======
-+* `quit`- Quit the application.
-+* `reload` - Reload the current window.
-+* `forceReload` - Reload the current window ignoring the cache.
-+* `toggleDevTools` - Toggle developer tools in the current window.
-+* `toggleFullScreen`- Toggle full screen mode on the current window.
-+>>>>>>> .their
- * `resetZoom` - Reset the focused page's zoom level to the original size.
- * `zoomIn` - Zoom in the focused page by 10%.
- * `zoomOut` - Zoom out the focused page by 10%.
-added in both
-  our    100644 e1d6e9958de7f2b95129c9c7e69f0941e466e3e8 docs/api/menu.md
-  their  100644 339a9ef7986b545829195d5e5600a678849f3782 docs/api/menu.md
-@@ -61,7 +61,11 @@
- 
- #### `menu.popup(options)`
- 
-+<<<<<<< .our
- * `options` Object (optional)
-+=======
-+* `options` Object
-+>>>>>>> .their
-   * `window` [BrowserWindow](browser-window.md) (optional) - Default is the focused window.
-   * `x` Number (optional) - Default is the current mouse cursor position.
-     Must be declared if `y` is declared.
-added in both
-  our    100644 1f6b20d2f25c31b48fbb2bfedc6a064ae283424f docs/api/process.md
-  their  100644 e6b34290b92c071ee8e7d4f9aa45ce04fb916ec9 docs/api/process.md
-@@ -16,6 +16,7 @@
- - `getHeapStatistics()`
- - `getProcessMemoryInfo()`
- - `getSystemMemoryInfo()`
-+<<<<<<< .our
- - `getCPUUsage()`
- - `getIOCounters()`
- - `argv`
-@@ -29,6 +30,12 @@
- - `type`
- - `version`
- - `versions`
-+=======
-+- `argv`
-+- `execPath`
-+- `env`
-+- `platform`
-+>>>>>>> .their
- 
- ## Events
- 
-@@ -77,11 +84,14 @@
- 
- A `String` representing the path to the resources directory.
- 
-+<<<<<<< .our
- ### `process.sandboxed`
- 
- A `Boolean`. When the renderer process is sandboxed, this property is `true`,
- otherwise it is `undefined`.
- 
-+=======
-+>>>>>>> .their
- ### `process.throwDeprecation`
- 
- A `Boolean` that controls whether or not deprecation warnings will be thrown as
-@@ -125,6 +135,7 @@
- 
- Causes the main thread of the current process crash.
- 
-+<<<<<<< .our
- ### `process.getCreationTime()`
- 
- Returns `Number | null` - The number of milliseconds since epoch, or `null` if the information is unavailable
-@@ -132,6 +143,8 @@
- Indicates the creation time of the application.
- The time is represented as number of milliseconds since epoch. It returns null if it is unable to get the process creation time.
- 
-+=======
-+>>>>>>> .their
- ### `process.getCPUUsage()`
- 
- Returns [`CPUUsage`](structures/cpu-usage.md)
-added in both
-  our    100644 8a9d242fce0e5b35af4d2a45dfe30153d73a0532 docs/api/sandbox-option.md
-  their  100644 4923f93bbe6d47c86e9c2c5a273c4c469d3a1fa7 docs/api/sandbox-option.md
-@@ -2,7 +2,11 @@
- 
- > Create a browser window with a renderer that can run inside Chromium OS sandbox. With this
- option enabled, the renderer must communicate via IPC to the main process in order to access node APIs.
-+<<<<<<< .our
- However, in order to enable the Chromium OS sandbox, Electron must be run with the `--enable-sandbox`
-+=======
-+However, in order to enable the Chromium OS sandbox, electron must be run with the `--enable-sandbox`
-+>>>>>>> .their
- command line argument.
- 
- One of the key security features of Chromium is that all blink rendering/JavaScript
-@@ -14,14 +18,22 @@
- [Here's](https://www.chromium.org/developers/design-documents/sandbox) more
- information about the sandbox.
- 
-+<<<<<<< .our
- Since a major feature in Electron is the ability to run Node.js in the
- renderer process (making it easier to develop desktop applications using web
- technologies), the sandbox is disabled by electron. This is because
- most Node.js APIs require system access. `require()` for example, is not
-+=======
-+Since a major feature in electron is the ability to run node.js in the
-+renderer process (making it easier to develop desktop applications using web
-+technologies), the sandbox is disabled by electron. This is because
-+most node.js APIs require system access. `require()` for example, is not
-+>>>>>>> .their
- possible without file system permissions, which are not available in a sandboxed
- environment.
- 
- Usually this is not a problem for desktop applications since the code is always
-+<<<<<<< .our
- trusted, but it makes Electron less secure than Chromium for displaying
- untrusted web content. For applications that require more security, the
- `sandbox` flag will force Electron to spawn a classic Chromium renderer that is
-@@ -34,6 +46,20 @@
- Another difference is that sandboxed renderers don't modify any of the default
- JavaScript APIs. Consequently, some APIs such as `window.open` will work as they
- do in Chromium (i.e. they do not return a [`BrowserWindowProxy`](browser-window-proxy.md)).
-+=======
-+trusted, but it makes electron less secure than chromium for displaying
-+untrusted web content. For applications that require more security, the
-+`sandbox` flag will force electron to spawn a classic chromium renderer that is
-+compatible with the sandbox.
-+
-+A sandboxed renderer doesn't have a node.js environment running and doesn't
-+expose node.js JavaScript APIs to client code. The only exception is the preload script,
-+which has access to a subset of the electron renderer API.
-+
-+Another difference is that sandboxed renderers don't modify any of the default
-+JavaScript APIs. Consequently, some APIs such as `window.open` will work as they
-+do in chromium (i.e. they do not return a [`BrowserWindowProxy`](browser-window-proxy.md)).
-+>>>>>>> .their
- 
- ## Example
- 
-@@ -51,9 +77,15 @@
- })
- ```
- 
-+<<<<<<< .our
- In the above code the [`BrowserWindow`](browser-window.md) that was created has Node.js disabled and can communicate
- only via IPC. The use of this option stops Electron from creating a Node.js runtime in the renderer. Also,
- within this new window `window.open` follows the native behaviour (by default Electron creates a [`BrowserWindow`](browser-window.md)
-+=======
-+In the above code the [`BrowserWindow`](browser-window.md) that was created has node.js disabled and can communicate
-+only via IPC. The use of this option stops electron from creating a node.js runtime in the renderer. Also,
-+within this new window `window.open` follows the native behaviour (by default electron creates a [`BrowserWindow`](browser-window.md)
-+>>>>>>> .their
- and returns a proxy to this via `window.open`).
- 
- It is important to note that this option alone won't enable the OS-enforced sandbox. To enable this feature, the
-@@ -75,19 +107,32 @@
- 
- Note that it is not enough to call
- `app.commandLine.appendSwitch('--enable-sandbox')`, as electron/node startup
-+<<<<<<< .our
- code runs after it is possible to make changes to Chromium sandbox settings. The
- switch must be passed to Electron on the command-line:
-+=======
-+code runs after it is possible to make changes to chromium sandbox settings. The
-+switch must be passed to electron on the command-line:
-+>>>>>>> .their
- 
- ```sh
- electron --enable-sandbox app.js
- ```
- 
- It is not possible to have the OS sandbox active only for some renderers, if
-+<<<<<<< .our
- `--enable-sandbox` is enabled, normal Electron windows cannot be created.
- 
- If you need to mix sandboxed and non-sandboxed renderers in one application,
- omit the `--enable-sandbox` argument. Without this argument, windows
- created with `sandbox: true` will still have Node.js disabled and communicate
-+=======
-+`--enable-sandbox` is enabled, normal electron windows cannot be created.
-+
-+If you need to mix sandboxed and non-sandboxed renderers in one application,
-+omit the `--enable-sandbox` argument. Without this argument, windows
-+created with `sandbox: true` will still have node.js disabled and communicate
-+>>>>>>> .their
- only via IPC, which by itself is already a gain from security POV.
- 
- ## Preload
-@@ -112,7 +157,11 @@
- 
- ```js
- // This file is loaded whenever a javascript context is created. It runs in a
-+<<<<<<< .our
- // private scope that can access a subset of Electron renderer APIs. We must be
-+=======
-+// private scope that can access a subset of electron renderer APIs. We must be
-+>>>>>>> .their
- // careful to not leak any objects into the global scope!
- const fs = require('fs')
- const {ipcRenderer} = require('electron')
-@@ -136,7 +185,11 @@
- 
- Important things to notice in the preload script:
- 
-+<<<<<<< .our
- - Even though the sandboxed renderer doesn't have Node.js running, it still has
-+=======
-+- Even though the sandboxed renderer doesn't have node.js running, it still has
-+>>>>>>> .their
-   access to a limited node-like environment: `Buffer`, `process`, `setImmediate`
-   and `require` are available.
- - The preload script can indirectly access all APIs from the main process through the
-@@ -146,7 +199,11 @@
- - The preload script must be contained in a single script, but it is possible to have
-   complex preload code composed with multiple modules by using a tool like
-   browserify, as explained below. In fact, browserify is already used by
-+<<<<<<< .our
-   Electron to provide a node-like environment to the preload script.
-+=======
-+  electron to provide a node-like environment to the preload script.
-+>>>>>>> .their
- 
- To create a browserify bundle and use it as a preload script, something like
- the following should be used:
-@@ -178,7 +235,11 @@
- - `timers`
- - `url`
- 
-+<<<<<<< .our
- More may be added as needed to expose more Electron APIs in the sandbox, but any
-+=======
-+More may be added as needed to expose more electron APIs in the sandbox, but any
-+>>>>>>> .their
- module in the main process can already be used through
- `electron.remote.require`.
- 
-@@ -186,7 +247,11 @@
- 
- Please use the `sandbox` option with care, as it is still an experimental
- feature. We are still not aware of the security implications of exposing some
-+<<<<<<< .our
- Electron renderer APIs to the preload script, but here are some things to
-+=======
-+electron renderer APIs to the preload script, but here are some things to
-+>>>>>>> .their
- consider before rendering untrusted content:
- 
- - A preload script can accidentally leak privileged APIs to untrusted code.
-@@ -194,9 +259,15 @@
-   APIs, effectively granting full access to the system through the `remote`
-   module.
- 
-+<<<<<<< .our
- Since rendering untrusted content in Electron is still uncharted territory,
- the APIs exposed to the sandbox preload script should be considered more
- unstable than the rest of Electron APIs, and may have breaking changes to fix
-+=======
-+Since rendering untrusted content in electron is still uncharted territory,
-+the APIs exposed to the sandbox preload script should be considered more
-+unstable than the rest of electron APIs, and may have breaking changes to fix
-+>>>>>>> .their
- security issues.
- 
- One planned enhancement that should greatly increase security is to block IPC
-added in both
-  our    100644 2eb5574bffe05def2ec3646b200038db15df2e9b docs/api/structures/certificate-principal.md
-  their  100644 12c46382aaf3d098b8845176eda99e9dddd82d83 docs/api/structures/certificate-principal.md
-@@ -1,8 +1,17 @@
- # CertificatePrincipal Object
- 
-+<<<<<<< .our
- * `commonName` String - Common Name.
- * `organizations` String[] - Organization names.
- * `organizationUnits` String[] - Organization Unit names.
- * `locality` String - Locality.
- * `state` String - State or province.
- * `country` String - Country or region.
-+=======
-+* `commonName` String - Common Name
-+* `organizations` String[] - Organization names
-+* `organizationUnits` String[] - Organization Unit names
-+* `locality` String - Locality
-+* `state` String - State or province
-+* `country` String - Country or region
-+>>>>>>> .their
-added in both
-  our    100644 b0e5b8d15165b23035303bafe049c1824a759439 docs/api/structures/gpu-feature-status.md
-  their  100644 f7bf3933d6c4c620c8f4d40fbda8a4c7c6b311ee docs/api/structures/gpu-feature-status.md
-@@ -1,5 +1,6 @@
- # GPUFeatureStatus Object
- 
-+<<<<<<< .our
- * `2d_canvas` String - Canvas.
- * `flash_3d` String - Flash.
- * `flash_stage3d` String - Flash Stage3D.
-@@ -13,6 +14,21 @@
- * `vpx_decode` String - VPx Video Decode.
- * `webgl` String - WebGL.
- * `webgl2` String - WebGL2.
-+=======
-+* `2d_canvas` String - Canvas
-+* `flash_3d` String - Flash
-+* `flash_stage3d` String - Flash Stage3D
-+* `flash_stage3d_baseline` String - Flash Stage3D Baseline profile
-+* `gpu_compositing` String - Compositing
-+* `multiple_raster_threads` String - Multiple Raster Threads
-+* `native_gpu_memory_buffers` String - Native GpuMemoryBuffers
-+* `rasterization` String - Rasterization
-+* `video_decode` String - Video Decode
-+* `video_encode` String - Video Encode
-+* `vpx_decode` String - VPx Video Decode
-+* `webgl` String - WebGL
-+* `webgl2` String - WebGL2
-+>>>>>>> .their
- 
- Possible values:
- 
-added in both
-  our    100644 470dd3a3f7d70f059c0a42736c20213b19372014 docs/api/structures/mime-typed-buffer.md
-  their  100644 08e5cd47a4a9a5f5ec7784c14b26c82502e20155 docs/api/structures/mime-typed-buffer.md
-@@ -1,4 +1,9 @@
- # MimeTypedBuffer Object
- 
-+<<<<<<< .our
- * `mimeType` String - The mimeType of the Buffer that you are sending.
- * `data` Buffer - The actual Buffer content.
-+=======
-+* `mimeType` String - The mimeType of the Buffer that you are sending
-+* `data` Buffer - The actual Buffer content
-+>>>>>>> .their
-added in both
-  our    100644 9f7a000967d09895fe3f43b9792578d6219a43b5 docs/api/structures/rectangle.md
-  their  100644 1a1228bc0b7c8d0d0f0ae3cea09048960f9df197 docs/api/structures/rectangle.md
-@@ -1,6 +1,13 @@
- # Rectangle Object
- 
-+<<<<<<< .our
- * `x` Number - The x coordinate of the origin of the rectangle (must be an integer).
- * `y` Number - The y coordinate of the origin of the rectangle (must be an integer).
- * `width` Number - The width of the rectangle (must be an integer).
- * `height` Number - The height of the rectangle (must be an integer).
-+=======
-+* `x` Number - The x coordinate of the origin of the rectangle (must be an integer)
-+* `y` Number - The y coordinate of the origin of the rectangle (must be an integer)
-+* `width` Number - The width of the rectangle (must be an integer)
-+* `height` Number - The height of the rectangle (must be an integer)
-+>>>>>>> .their
-added in both
-  our    100644 538579684242b9de3921d944b9d2fb64cf957a13 docs/api/structures/scrubber-item.md
-  their  100644 584593b6fde7e089fa296fc891eca05588c108cb docs/api/structures/scrubber-item.md
-@@ -1,4 +1,9 @@
- # ScrubberItem Object
- 
-+<<<<<<< .our
- * `label` String (optional) - The text to appear in this item.
- * `icon` NativeImage (optional) - The image to appear in this item.
-+=======
-+* `label` String (optional) - The text to appear in this item
-+* `icon` NativeImage (optional) - The image to appear in this item
-+>>>>>>> .their
-added in both
-  our    100644 47dfaa24027550db196340bc4f63906b6cf43ee2 docs/api/structures/segmented-control-segment.md
-  their  100644 06a8fd201a190e7787ed7f7c9c55fe31c8f1f37a docs/api/structures/segmented-control-segment.md
-@@ -1,5 +1,11 @@
- # SegmentedControlSegment Object
- 
-+<<<<<<< .our
- * `label` String (optional) - The text to appear in this segment.
- * `icon` NativeImage (optional) - The image to appear in this segment.
- * `enabled` Boolean (optional) - Whether this segment is selectable. Default: true.
-+=======
-+* `label` String (optional) - The text to appear in this segment
-+* `icon` NativeImage (optional) - The image to appear in this segment
-+* `enabled` Boolean (optional) - Whether this segment is selectable. Default: true
-+>>>>>>> .their
-added in both
-  our    100644 ec1fa27e5e7de32e18f4a8ca0ec1969d21054fd4 docs/api/structures/stream-protocol-response.md
-  their  100644 64847075a05e796a32e46c57eec865ae46740eed docs/api/structures/stream-protocol-response.md
-@@ -1,5 +1,11 @@
- # StreamProtocolResponse Object
- 
-+<<<<<<< .our
- * `statusCode` Number - The HTTP response code.
- * `headers` Object - An object containing the response headers.
- * `data` ReadableStream - A Node.js readable stream representing the response body.
-+=======
-+* `statusCode` Number - The HTTP response code
-+* `headers` Object - An object containing the response headers
-+* `data` ReadableStream - A Node.js readable stream representing the response body
-+>>>>>>> .their
-added in both
-  our    100644 8990fe2e97ab62eafdd3f7a4eb8ee782415124c5 docs/api/web-contents.md
-  their  100644 520b3cce7bc7c42cecd80ac88d01669c0d5bba5b docs/api/web-contents.md
-@@ -832,10 +832,13 @@
- 
- Returns `Boolean` - Whether this page has been muted.
- 
-+<<<<<<< .our
- #### `contents.isCurrentlyAudible()`
- 
- Returns `Boolean` - Whether audio is currently playing.
- 
-+=======
-+>>>>>>> .their
- #### `contents.setZoomFactor(factor)`
- 
- * `factor` Number - Zoom factor.
-@@ -1451,7 +1454,11 @@
- 
- #### `contents.getProcessId()`
- 
-+<<<<<<< .our
- Returns `Integer` - The Chromium internal `pid` of the associated renderer. Can
-+=======
-+Returns `Integer` - The chromium internal `pid` of the associated renderer. Can
-+>>>>>>> .their
- be compared to the `frameProcessId` passed by frame specific navigation events
- (e.g. `did-frame-navigate`)
- 
-added in both
-  our    100644 989060ef3e50c5d93db1a914997f1d190edf3cf5 docs/api/web-frame.md
-  their  100644 5a191da39b6534e78914d01f6486bae9a84ceaff docs/api/web-frame.md
-@@ -4,7 +4,11 @@
- 
- Process: [Renderer](../glossary.md#renderer-process)
- 
-+<<<<<<< .our
- `webFrame` export of the Electron module is an instance of the `WebFrame`
-+=======
-+`webFrame` export of the electron module is an instance of the `WebFrame`
-+>>>>>>> .their
- class representing the top frame of the current `BrowserWindow`. Sub-frames can
- be retrieved by certain properties and methods (e.g. `webFrame.firstChild`).
- 
-@@ -232,8 +236,13 @@
-    current renderer process. Routing IDs can be retrieved from `WebFrame`
-    instances (`webFrame.routingId`) and are also passed by frame
-    specific `WebContents` navigation events (e.g. `did-frame-navigate`)
-+<<<<<<< .our
- 
- Returns `WebFrame` - that has the supplied `routingId`, `null` if not found.
-+=======
-+  
-+Returns `WebFrame` - that has the supplied `routingId`, `null` if not found. 
-+>>>>>>> .their
- 
- ## Properties
- 
-added in both
-  our    100644 0904db05accd92a661a6b02275c2166b7a8af2af docs/api/web-request.md
-  their  100644 2d039923d6f14f3231c7177b8c1b4242b3e4126c docs/api/web-request.md
-@@ -9,9 +9,14 @@
- 
- The methods of `WebRequest` accept an optional `filter` and a `listener`. The
- `listener` will be called with `listener(details)` when the API's event has
-+<<<<<<< .our
- happened. The `details` object describes the request.
- 
- ⚠️ Only the last attached `listener` will be used. Passing `null` as `listener` will unsubscribe from the event.
-+=======
-+happened. The `details` object describes the request. Passing `null`
-+as `listener` will unsubscribe from the event.
-+>>>>>>> .their
- 
- The `filter` object has a `urls` property which is an Array of URL
- patterns that will be used to filter out the requests that do not match the URL
-added in both
-  our    100644 8dc16b4a4e92ad132c7722ac400e2be851723f9b docs/api/webview-tag.md
-  their  100644 fd48cf064f93e57a8e4475e8718fa00ac5a32b30 docs/api/webview-tag.md
-@@ -407,10 +407,13 @@
- 
- Returns `Boolean` - Whether guest page has been muted.
- 
-+<<<<<<< .our
- #### `<webview>.isCurrentlyAudible()`
- 
- Returns `Boolean` - Whether audio is currently playing.
- 
-+=======
-+>>>>>>> .their
- ### `<webview>.undo()`
- 
- Executes editing command `undo` in page.
-added in both
-  our    100644 cbbdaf4c3d1998ccce8e5438eea1a7c9b00f2e37 docs/development/build-instructions-gn.md
-  their  100644 cdddc4dc8e54b8ce21c4bba333edd128eab5636f docs/development/build-instructions-gn.md
-@@ -3,6 +3,7 @@
- Follow the guidelines below for building Electron with the experimental GN
- build.
- 
-+<<<<<<< .our
- > **NOTE**: The GN build system is in _experimental_ status.
- 
- ## Platform prerequisites
-@@ -61,6 +62,34 @@
-     --name "src/electron" \
-     --unmanaged \
-     https://github.com/electron/electron
-+=======
-+> **NOTE**: The GN build system is in _experimental_ status, and currently only
-+> works on macOS and Linux, in debug mode, as a component build.
-+
-+## Prerequisites
-+
-+See the [macOS](build-instructions-osx.md#prerequisites) or
-+[Linux](build-instructions-linux.md#prerequisites) build instructions for the
-+requirements for your platform. In addition, you'll need to install
-+[`depot_tools`][depot-tools], the toolset used for fetching Chromium and its
-+dependencies.
-+
-+[depot-tools]: http://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/docs/html/depot_tools_tutorial.html#_setting_up
-+
-+## Getting the Code
-+
-+```sh
-+$ mkdir electron-gn && cd electron-gn
-+$ cat > .gclient <<-GCLIENT
-+solutions = [
-+  {
-+    "url": "https://github.com/electron/electron",
-+    "managed": False,
-+    "name": "src/electron",
-+  },
-+]
-+GCLIENT
-+>>>>>>> .their
- $ gclient sync --with_branch_heads --with_tags
- # This will take a while, go get a coffee.
- ```
-@@ -70,6 +99,7 @@
- ```sh
- $ cd src
- $ export CHROMIUM_BUILDTOOLS_PATH=`pwd`/buildtools
-+<<<<<<< .our
- # this next line is needed only if building with sccache
- $ export GN_EXTRA_ARGS="${GN_EXTRA_ARGS} cc_wrapper=\"${PWD}/electron/external_binaries/sccache\""
- $ gn gen out/Default --args="import(\"//electron/build/args/debug.gn\") $GN_EXTRA_ARGS"
-@@ -99,6 +129,16 @@
- ```
- 
- **To build, run `ninja` with the `electron:electron_app` target:**
-+=======
-+$ gn gen out/Default --args='root_extra_deps=["//electron"] is_electron_build=true is_component_build=true use_jumbo_build=true v8_promise_internal_field_count=1 v8_typed_array_max_size_in_heap=0'
-+```
-+
-+This will generate all the ninja files needed for the build. You shouldn't have
-+to run `gn gen` again—if you want to change the build arguments you can run `gn
-+args out/Default` to bring up an editor.
-+
-+To build, run `ninja` with the `electron:electron_app` target:
-+>>>>>>> .their
- 
- ```sh
- $ ninja -C out/Default electron:electron_app
-@@ -110,8 +150,12 @@
- so it will take a while.
- 
- To speed up subsequent builds, you can use [sccache][sccache]. Add the GN arg
-+<<<<<<< .our
- `cc_wrapper = "sccache"` by running `gn args out/Default` to bring up an
- editor and adding a line to the end of the file.
-+=======
-+`cc_wrapper="sccache"` by running `gn args out/Default` to bring up an editor.
-+>>>>>>> .their
- 
- [sccache]: https://github.com/mozilla/sccache
- 
-@@ -119,12 +163,16 @@
- 
- ```sh
- $ ./out/Default/Electron.app/Contents/MacOS/Electron
-+<<<<<<< .our
- # or, on Windows
- $ ./out/Default/electron.exe
-+=======
-+>>>>>>> .their
- # or, on Linux
- $ ./out/Default/electron
- ```
- 
-+<<<<<<< .our
- ### Cross-compiling
- 
- To compile for a platform that isn't the same as the one you're building on,
-@@ -157,17 +205,30 @@
- $ ninja -C out/Default third_party/electron_node:headers
- # Install the test modules with the generated headers
- $ (cd electron/spec && npm i --nodedir=../../out/Default/gen/node_headers)
-+=======
-+## Tests
-+
-+To run the tests, you'll first need to build the test modules against the
-+same version of node.js that was built as part of the build process.
-+
-+```sh
-+$ (cd electron/spec && npm i --nodedir=../../third_party/electron_node)
-+>>>>>>> .their
- ```
- 
- Then, run Electron with `electron/spec` as the argument:
- 
- ```sh
-+<<<<<<< .our
- # on Mac:
- $ ./out/Default/Electron.app/Contents/MacOS/Electron electron/spec
- # on Windows:
- $ ./out/Default/electron.exe electron/spec
- # on Linux:
- $ ./out/Default/electron electron/spec
-+=======
-+$ ./out/Default/Electron.app/Contents/MacOS/Electron electron/spec
-+>>>>>>> .their
- ```
- 
- If you're debugging something, it can be helpful to pass some extra flags to
-added in both
-  our    100644 3276b494aec5d1a49626b8c24d725ec665cf2c62 docs/development/build-instructions-linux.md
-  their  100644 6f7660669bf071628d6d3d9458640a61e5bcda0e docs/development/build-instructions-linux.md
-@@ -12,7 +12,11 @@
-   For a quick test, run the following script:
- 
-   ```sh
-+<<<<<<< .our
-   $ npm run check-tls
-+=======
-+  $ python ./script/tls.py
-+>>>>>>> .their
-   ```
- 
-   If the script returns that your configuration is using an outdated security
-@@ -71,6 +75,7 @@
- Downloading certain files can take a long time. Notice that we are using
- `ninja` to build Electron so there is no `Makefile` generated.
- 
-+<<<<<<< .our
- To bootstrap for a static, non-developer build, run:
- 
- ```sh
-@@ -83,6 +88,11 @@
- ```sh
- $ cd electron
- $ npm run bootstrap:dev
-+=======
-+```sh
-+$ cd electron
-+$ ./script/bootstrap.py --verbose
-+>>>>>>> .their
- ```
- 
- If you are using editor supports [JSON compilation database](http://clang.llvm.org/docs/JSONCompilationDatabase.html) based
-@@ -121,7 +131,11 @@
- If you would like to build both `Release` and `Debug` targets:
- 
- ```sh
-+<<<<<<< .our
- $ npm run build
-+=======
-+$ ./script/build.py
-+>>>>>>> .their
- ```
- 
- This script will cause a very large Electron executable to be placed in
-@@ -137,6 +151,7 @@
- the `dist` directory. After running the `create-dist.py` script, you
- may want to remove the 1.3+ gigabyte binary which is still in `out/R`.
- 
-+<<<<<<< .our
- You can also build either the `Debug` or `Release` target on its own:
- 
- ```sh
-@@ -145,6 +160,12 @@
- 
- ```sh
- $ npm run build:release
-+=======
-+You can also build the `Debug` target only:
-+
-+```sh
-+$ ./script/build.py -c D
-+>>>>>>> .their
- ```
- 
- After building is done, you can find the `electron` debug binary under `out/D`.
-added in both
-  our    100644 22dba096b73d1f99ee323f6822abb54a8b453477 docs/development/build-instructions-osx.md
-  their  100644 157ab0d3e5f38e0c07695128832565f9aeffd27e docs/development/build-instructions-osx.md
-@@ -15,7 +15,11 @@
- This depends on both your version of macOS and Python. For a quick test, run:
- 
- ```sh
-+<<<<<<< .our
- $ npm run check-tls
-+=======
-+$ python ./script/tls.py
-+>>>>>>> .their
- ```
- 
- If the script returns that your configuration is using an outdated security
-@@ -69,6 +73,7 @@
- the build project files. Notice that we're using [ninja](https://ninja-build.org/)
- to build Electron so there is no Xcode project generated.
- 
-+<<<<<<< .our
- To bootstrap for a static, non-developer build, run:
- 
- ```sh
-@@ -81,6 +86,11 @@
- ```sh
- $ cd electron
- $ npm run bootstrap:dev
-+=======
-+```sh
-+$ cd electron
-+$ ./script/bootstrap.py -v
-+>>>>>>> .their
- ```
- 
- If you are using editor supports [JSON compilation database](http://clang.llvm.org/docs/JSONCompilationDatabase.html) based
-@@ -92,6 +102,7 @@
- 
- ## Building
- 
-+<<<<<<< .our
- To build both `Release` and `Debug` targets:
- 
- ```sh
-@@ -106,6 +117,18 @@
- 
- ```sh
- $ npm run build:release
-+=======
-+Build both `Release` and `Debug` targets:
-+
-+```sh
-+$ ./script/build.py
-+```
-+
-+You can also only build the `Debug` target:
-+
-+```sh
-+$ ./script/build.py -c D
-+>>>>>>> .their
- ```
- 
- After building is done, you can find `Electron.app` under `out/D`.
-added in both
-  our    100644 86f9d2b6f82bb28fe8dda7ec2bea9eccd6119fd4 docs/development/build-instructions-windows.md
-  their  100644 0afd0ef3ea4636acfb2f67c05cb913403f9da2b7 docs/development/build-instructions-windows.md
-@@ -4,7 +4,11 @@
- 
- ## Prerequisites
- 
-+<<<<<<< .our
- * Windows 10 / Server 2012 R2 or higher
-+=======
-+* Windows 7 / Server 2008 R2 or higher
-+>>>>>>> .their
- * Visual Studio 2017 15.7.2 or higher - [download VS 2017 Community Edition for
-   free](https://www.visualstudio.com/vs/)
- * [Python 2.7](http://www.python.org/download/releases/2.7/)
-@@ -37,6 +41,7 @@
- the build project files. Notice that we're using `ninja` to build Electron so
- there is no Visual Studio project generated.
- 
-+<<<<<<< .our
- To bootstrap for a static, non-developer build, run:
- 
- ```powershell
-@@ -49,10 +54,16 @@
- ```powershell
- $ cd electron
- $ npm run bootstrap:dev
-+=======
-+```powershell
-+$ cd electron
-+$ python script\bootstrap.py -v
-+>>>>>>> .their
- ```
- 
- ## Building
- 
-+<<<<<<< .our
- Build both `Release` and `Debug` targets:
- 
- ```powershell
-@@ -67,6 +78,18 @@
- 
- ```powershell
- $ npm run build:release
-+=======
-+Build both Release and Debug targets:
-+
-+```powershell
-+$ python script\build.py
-+```
-+
-+You can also only build the Debug target:
-+
-+```powershell
-+$ python script\build.py -c D
-+>>>>>>> .their
- ```
- 
- After building is done, you can find `electron.exe` under `out\D` (debug
-@@ -166,6 +189,7 @@
- 
- You may get this error if you are using Git Bash for building, you should use
- PowerShell or VS2015 Command Prompt instead.
-+<<<<<<< .our
- 
- ### cannot create directory at '...': Filename too long
- 
-@@ -174,3 +198,5 @@
- ```sh
- $ git config --system core.longpaths true
- ```
-+=======
-+>>>>>>> .their
-added in both
-  our    100644 0abaea2417d7e88955bf60c6dd8f2206b51c99af docs/development/coding-style.md
-  their  100644 870cb85c7f1855a089b1adc76b6ea0cc2819d58d docs/development/coding-style.md
-@@ -40,7 +40,11 @@
- 
- ## Documentation
- 
-+<<<<<<< .our
- * Write [remark](https://github.com/remarkjs/remark) markdown style.
-+=======
-+* Write [remark](https://github.com/remarkjs/remark) markdown style
-+>>>>>>> .their
- 
- You can run `npm run lint-docs` to ensure that your documentation changes are
- formatted correctly.
-added in both
-  our    100644 95f4cbab47f5a4ae40f733fd3f8942a63bf4382d docs/development/debug-instructions-windows.md
-  their  100644 b689ef4480365ad1b56c9bdd2fd028f0d797f1be docs/development/debug-instructions-windows.md
-@@ -7,8 +7,11 @@
- and the Electron source code, you can enable step-through debugging
- with breakpoints inside Electron's source code.
- 
-+<<<<<<< .our
- **See also**: There's a wealth of information on debugging Chromium, much of which also applies to Electron, on the Chromium developers site: [Debugging Chromium on Windows](https://www.chromium.org/developers/how-tos/debugging-on-windows).
- 
-+=======
-+>>>>>>> .their
- ## Requirements
- 
- * **A debug build of Electron**: The easiest way is usually building it
-added in both
-  our    100644 6c2234477a35701b5d2e4f845d954bccbb203977 docs/development/debugging-instructions-macos-xcode.md
-  their  100644 e136ee9253cea6fb4debe3c4d73454468cbc8551 docs/development/debugging-instructions-macos-xcode.md
-@@ -1,12 +1,21 @@
- ## Debugging with XCode
- 
- ### Build Debug Electron with Release libchromiumcontent
-+<<<<<<< .our
- You can create a debug build of Electron by following [build instructions for macOS](build-instructions-osx.md).
- The bootstrap process will download Release version of libchromiumcontent by default,
- so you will not be able to step through the Chromium source.
- 
- ### Build Debug Electron with Debug libchromiumcontent
- If you want to debug and step through libchromiumcontent, you will have to run the
-+=======
-+You can create a debug build of electron by following [build instructions for macOS](build-instructions-osx.md).
-+The bootstrap process will download Release version of libchromiumcontent by default,
-+so you will not be able to step through the chromium source.
-+
-+### Build Debug Electron with Debug libchromiumcontent
-+If you want to debug and step through libchromiumcontent, you will have to run the 
-+>>>>>>> .their
- bootsrap script with the `--build_debug_libcc` argument.
- 
- ```sh
-@@ -25,7 +34,11 @@
- ```sh
- $ ./script/build.py -c D --libcc
- ```
-+<<<<<<< .our
- This will build debug Electron with debug version of libchromiumcontent.
-+=======
-+This will build debug electron with debug version of libchromiumcontent.
-+>>>>>>> .their
- 
- ### Generate xcode project for debugging sources (cannot build code from xcode)
- Run the update script with the --xcode argument.
-@@ -37,16 +50,30 @@
- 
- ### Debugging and breakpoints
- 
-+<<<<<<< .our
- Launch Electron app after build.
- You can now open the xcode workspace created above and attach to the Electron process
-+=======
-+Launch electron app after build.
-+You can now open the xcode workspace created above and attach to the electron process
-+>>>>>>> .their
- through the Debug > Attach To Process > Electron debug menu. [Note: If you want to debug
- the renderer process, you need to attach to the Electron Helper as well.]
- 
- You can now set breakpoints in any of the indexed files. However, you will not be able
-+<<<<<<< .our
- to set breakpoints directly in the Chromium source.
- To set break points in the Chromium source, you can choose Debug > Breakpoints > Create
-+=======
-+to set breakpoints directly in the chromium source.
-+To set break points in the chromium source, you can choose Debug > Breakpoints > Create
-+>>>>>>> .their
- Symbolic Breakpoint and set any function name as the symbol. This will set the breakpoint
- for all functions with that name, from all the classes if there are more than one.
- You can also do this step of setting break points prior to attaching the debugger,
- however, actual breakpoints for symbolic breakpoint functions may not show up until the
-+<<<<<<< .our
-+debugger is attached to the app.
-+=======
- debugger is attached to the app.
-+>>>>>>> .their
-added in both
-  our    100644 c7b4ae62d30fe55da6ba4d03ae2df95141920f99 docs/development/pull-requests.md
-  their  100644 3b404343efa0d00e06e5bbab4b81a3b6eb25c737 docs/development/pull-requests.md
-@@ -86,7 +86,14 @@
- uses [semantic commit messages](https://conventionalcommits.org/) to streamline
- the release process.
- 
-+<<<<<<< .our
- Before a pull request can be merged, it **must** have a pull request title with a semantic prefix.
-+=======
-+Before a pull request can be merged, it should include at least one semantic
-+commit message, though it's not necessary for all commits in the pull request
-+to be semantic. Alternatively, you can **update your pull request title**  to
-+start with a semantic prefix.
-+>>>>>>> .their
- 
- Examples of commit messages with semantic prefixes:
- 
-@@ -105,7 +112,10 @@
-   - perf: A code change that improves performance
-   - refactor: A code change that neither fixes a bug nor adds a feature
-   - style: Changes that do not affect the meaning of the code (linting)
-+<<<<<<< .our
-   - vendor: Bumping a dependency like libchromiumcontent or node
-+=======
-+>>>>>>> .their
- 
- Other things to keep in mind when writing a commit message:
- 
-added in both
-  our    100644 85a5fa0a935201521155dc60de45986db5829613 docs/development/releasing.md
-  their  100644 7fe929515bcdffbbbf3e454cbd72fdda0e25c7cb docs/development/releasing.md
-@@ -8,16 +8,25 @@
- information.
- 
- There are a handful of `*_TOKEN` environment variables needed by the release
-+<<<<<<< .our
- scripts:
- 
- * `ELECTRON_GITHUB_TOKEN`:
- Create this by visiting https://github.com/settings/tokens/new?scopes=repo
-+=======
-+scripts. Once you've generated these per-user tokens, you may want to keep
-+them in a local file that you can `source` when starting a release.
-+* `ELECTRON_GITHUB_TOKEN`:
-+Create as described at https://github.com/settings/tokens/new,
-+giving the token repo access scope.
-+>>>>>>> .their
- * `APPVEYOR_TOKEN`:
- Create a token from https://windows-ci.electronjs.org/api-token
- If you don't have an account, ask a team member to add you.
- * `CIRCLE_TOKEN`:
- Create a token from "Personal API Tokens" at https://circleci.com/account/api
- * `VSTS_TOKEN`:
-+<<<<<<< .our
- Create a Personal Access Token at https://github.visualstudio.com/_usersSettings/tokens or https://github.visualstudio.com/_details/security/tokens
- with the scope of `Build (read and execute)`.
- * `ELECTRON_S3_BUCKET`:
-@@ -29,6 +38,10 @@
- of the project. This file is gitignored, and will be loaded into the 
- environment by the release scripts.
- 
-+=======
-+Create a Personal Access Token at https://github.visualstudio.com/_usersSettings/tokens
-+with the scope of `Build (read and execute)`.
-+>>>>>>> .their
- 
- ## Determine which branch to release from
- 
-@@ -73,7 +86,11 @@
- ```
- ### Patch version change
- ```sh
-+<<<<<<< .our
- npm run prepare-release -- patch --stable
-+=======
-+npm run prepare-release -- patch
-+>>>>>>> .their
- ```
- ### Beta version change
- ```sh
-@@ -212,10 +229,13 @@
- ```sh
- $ npm run release -- --validateRelease
- ```
-+<<<<<<< .our
- Note, if you need to run `--validateRelease` more than once to check the assets,
- run it as above the first time, then `node ./script/release.js --validateRelease`
- for subsequent calls so that you don't have to rebuild each time you want to
- check the assets.
-+=======
-+>>>>>>> .their
- 
- ## Publish the release
- 
-@@ -259,6 +279,7 @@
- $ npm run publish-to-npm
- ```
- 
-+<<<<<<< .our
- After publishing, you can check the `latest` release:
- ```sh
- $ npm dist-tag ls electron
-@@ -274,6 +295,8 @@
- $ npm dist-tag add electron@2.0.0 latest
- ```
- 
-+=======
-+>>>>>>> .their
- [the releases page]: https://github.com/electron/electron/releases
- [this bump commit]: https://github.com/electron/electron/commit/78ec1b8f89b3886b856377a1756a51617bc33f5a
- [versioning]: /docs/tutorial/electron-versioning.md
-@@ -303,7 +326,11 @@
- ```
- 
- Additionally you can pass a job name to the script to run an individual job, eg:
-+<<<<<<< .our
- ```sh
-+=======
-+````sh
-+>>>>>>> .their
- node script/ci-release-build.js --ci=AppVeyor --ghRelease --job=electron-x64 TARGET_BRANCH
- ```
- 
-added in both
-  our    100644 1c61b3ee66504a23d72478c2e35a48ebeba3372a docs/development/upgrading-node.md
-  their  100644 821a89391dfd06a158d0fe76272a244ead5f3971 docs/development/upgrading-node.md
-@@ -61,6 +61,7 @@
- 2. Run `script/update` to get the latest libcc
-   - This will be time-consuming
- 3. Remove our copies of the old Node v8 patches
-+<<<<<<< .our
-   - (In libchromiumcontent repo) Read `patches/common/v8/README.md` to see which patchfiles
-     were created during the last update
-   - Remove those files from `patches/common/v8/`:
-@@ -77,6 +78,52 @@
- 7. Apply all patches with the [`get-patch` script](https://github.com/electron/libchromiumcontent/blob/master/script/README.md#get-patch):
-   - `./script/get-patch --repo src/v8 --output-dir patches/v8 --commit abc123 def456 ...`
- 8. Update `patches/common/v8/README.md` with references to all new patches that have been added so that the next person will know which need to be removed.
-+=======
-+  - (In libchromiumcontent repo) Read `patches/v8/README.md` to see which patchfiles
-+    were created during the last update
-+  - Remove those files from `patches/v8/`:
-+    - `git rm` the patchfiles
-+    - edit `patches/v8/README.md`
-+    - commit these removals
-+4. Inspect Node [repo](https://github.com/electron/node) to see what patches upstream Node
-+  used with their v8 after bumping its version
-+  - `git log --oneline deps/V8`
-+5. Create a checklist of the patches. This is useful for tracking your work and for
-+  having a quick reference of commit hashes to use in the `git diff-tree` step below.
-+6. Read `patches/v8/README.md` to see which patchfiles came from the previous version of V8 and therefore need to be removed.
-+  - Delete each patchfile referenced in `patches/v8/README.md`
-+7. For each patch, do:
-+  - (In node repo) `git diff-tree --patch HASH > ~/path_to_libchromiumcontent/patches/v8/xxx-patch_name.patch`
-+    - `xxx` is an incremented three-digit number (to force patch order)
-+    - `patch_name` should loosely match the node commit messages,
-+      e.g. `030-cherry_pick_cc55747,patch` if the Node commit message was "cherry-pick cc55747"
-+  - (remainder of steps in libchromium repo)
-+     Manually edit the `.patch` file to match upstream V8's directory:
-+    - If a diff section has no instances of `deps/V8`, remove it altogether.
-+      - We don’t want those patches because we’re only patching V8.
-+    - Replace instances of `a/deps/v8/filename.ext` with `a/filename.ext`
-+      - This is needed because upstream Node keeps its V8 files in a subdirectory
-+  - Ensure that local status is clean: `git status` to make sure there are no unstaged changes.
-+  - Confirm that the patch applies cleanly with
-+     `script/patch.py -r src/V8 -p patches/v8/xxx-patch_name.patch.patch`
-+  - Create a new copy of the patch:
-+     - `cd src/v8 && git diff > ../../test.patch && cd ../..`
-+     - This is needed because the first patch has Node commit checksums that we don't want
-+  - Confirm that checksums are the only difference between the two patches:
-+     - `diff -u test.patch patches/v8/xxx-patch_name.patch`
-+  - Replace the old patch with the new:
-+     - `mv test.patch patches/v8/xxx-patch_name.patch`
-+  - Add the patched code to the index _without_ committing:
-+     - `cd src/v8 && git add . && cd ../..`
-+     - We don't want to commit the changes (they're kept in the patchfiles)
-+        but need them locally so that they don't show up in subsequent diffs
-+        while we iterate through more patches
-+  - Add the patch file to the index:
-+     - `git add a patches/v8/`
-+  - (Optionally) commit each patch file to ensure you can back up if you mess up a step:
-+     - `git commit patches/v8/`
-+8. Update `patches/v8/README.md` with references to all new patches that have been added so that the next person will know which need to be removed.
-+>>>>>>> .their
- 9. Update Electron's submodule references:
-   ```sh
-   $ cd electron/vendor/node
-@@ -87,8 +134,13 @@
-   electron/vendor/libchromiumcontent$ git checkout upgrade-to-chromium-X
-   electron/vendor/libchromiumcontent$ cd ../..
-   electron$ git add vendor
-+<<<<<<< .our
-   electron$ git commit -m "update submodule references for node and libcc"
-   electron$ git push origin upgrade-to-chromium-<VERSION>
-+=======
-+  electron$ git commit -m "update submodule referefences for node and libc"
-+  electron$ git pso upgrade-to-chromium-62
-+>>>>>>> .their
-   electron$ script/bootstrap.py -d
-   electron$ script/build.py -c -D
-   ```
-added in both
-  our    100644 162300c6e17ce19fef7ee7c3baa1d74a2cb0dc7a docs/tutorial/application-architecture.md
-  their  100644 7411f025823483cb2d755a4a033102e1ca1b1f36 docs/tutorial/application-architecture.md
-@@ -39,7 +39,11 @@
- 
- > #### Aside: Communication Between Processes
- > In Electron, we have several ways to communicate between the main process
-+<<<<<<< .our
- and renderer processes, such as [`ipcRenderer`](../api/ipc-renderer.md) and
-+=======
-+and renderer processes. Like [`ipcRenderer`](../api/ipc-renderer.md) and
-+>>>>>>> .their
- [`ipcMain`](../api/ipc-main.md) modules for sending messages, and the
- [remote](../api/remote.md) module for RPC style communication. There is also
- an FAQ entry on [how to share data between web pages][share-data].
-added in both
-  our    100644 22b861749cb9c5d7fe6982d273856fb3c4bf04c9 docs/tutorial/application-distribution.md
-  their  100644 83d7c7bdfe6ac01d981e1bae47c8303f8de9e4fe docs/tutorial/application-distribution.md
-@@ -141,7 +141,11 @@
- 2. Create a new S3 bucket and create the following empty directory structure:
- 
-     ```sh
-+<<<<<<< .our
-     - electron/
-+=======
-+    - atom-shell/
-+>>>>>>> .their
-       - symbols/
-       - dist/
-     ```
-@@ -150,7 +154,11 @@
- 
-   * `ELECTRON_GITHUB_TOKEN` - a token that can create releases on GitHub
-   * `ELECTRON_S3_ACCESS_KEY`, `ELECTRON_S3_BUCKET`, `ELECTRON_S3_SECRET_KEY` -
-+<<<<<<< .our
-     the place where you'll upload Node.js headers as well as symbols
-+=======
-+    the place where you'll upload node.js headers as well as symbols
-+>>>>>>> .their
-   * `ELECTRON_RELEASE` - Set to `true` and the upload part will run, leave unset
-     and `surf-build` will do CI-type checks, appropriate to run for every
-     pull request.
-added in both
-  our    100644 16eb961fabe09001e621b834b297cada6918c102 docs/tutorial/code-signing.md
-  their  100644 236ebe80ef02f38a094404a79f067120d32adaa7 docs/tutorial/code-signing.md
-@@ -66,7 +66,11 @@
- See the [Windows Store Guide].
- 
- [Apple Developer Program]: https://developer.apple.com/programs/
-+<<<<<<< .our
- [`electron-builder`]: https://github.com/electron-userland/electron-builder
-+=======
-+[`electron-builder`]: https://github.com/electron/electron-builder
-+>>>>>>> .their
- [`electron-forge`]: https://github.com/electron-userland/electron-forge
- [`electron-osx-sign`]: https://github.com/electron-userland/electron-osx-sign
- [`electron-packager`]: https://github.com/electron-userland/electron-packager
-added in both
-  our    100644 9629bb98282d080bc53171a619d83a193041a022 docs/tutorial/electron-versioning.md
-  their  100644 883f20eefa9e59450efaed9fbd4dbafb2632b4e5 docs/tutorial/electron-versioning.md
-@@ -49,7 +49,11 @@
- | Chromium version updates        |                                    | fix-related chromium patches  |
- 
- 
-+<<<<<<< .our
- Note that most Chromium updates will be considered breaking. Fixes that can be backported will likely be cherry-picked as patches.
-+=======
-+Note that most chromium updates will be considered breaking. Fixes that can be backported will likely be cherry-picked as patches.
-+>>>>>>> .their
- 
- # Stabilization Branches
- 
-@@ -136,12 +140,20 @@
- 
- We seek to increase clarity at all levels of the update and releases process. Starting with `2.0.0` we will require pull requests adhere to the [Conventional Commits](https://conventionalcommits.org/) spec, which can be summarized as follows:
- 
-+<<<<<<< .our
- * Commits that would result in a semver **major** bump must start their body with `BREAKING CHANGE:`.
-+=======
-+* Commits that would result in a semver **major** bump must start with `BREAKING CHANGE:`.
-+>>>>>>> .their
- * Commits that would result in a semver **minor** bump must start with `feat:`.
- * Commits that would result in a semver **patch** bump must start with `fix:`.
- 
- * We allow squashing of commits, provided that the squashed message adheres the the above message format.
-+<<<<<<< .our
- * It is acceptable for some commits in a pull request to not include a semantic prefix, as long as the pull request title contains a meaningful encompassing semantic message.
-+=======
-+* It is acceptable for some commits in a pull request to not include a semantic prefix, as long as a later commit in the same pull request contains a meaningful encompassing semantic message.
-+>>>>>>> .their
- 
- # Versionless `master`
- 
-added in both
-  our    100644 081c82031907404938387485dc95414c7de4e4db docs/tutorial/mac-app-store-submission-guide.md
-  their  100644 e8812a85b57f6d10900b8932ebe790c499ba8476 docs/tutorial/mac-app-store-submission-guide.md
-@@ -229,6 +229,20 @@
- See the [Enabling User-Selected File Access documentation][user-selected] for
- more details.
- 
-+<<<<<<< .our
-+=======
-+## Known issues
-+
-+### `shell.openItem(filePath)`
-+
-+This will fail when the app is signed for distribution in the Mac App Store.
-+Subscribe to [#9005](https://github.com/electron/electron/issues/9005) for updates.
-+
-+#### Workaround
-+
-+`shell.openExternal('file://' + filePath)` will open the file in the default application as long as the extension is associated with an installed app.
-+
-+>>>>>>> .their
- ## Cryptographic Algorithms Used by Electron
- 
- Depending on the country and region you are located, Mac App Store may require
-added in both
-  our    100644 77f5d9632f58a1874c3d962b981619872a73a8b2 docs/tutorial/security.md
-  their  100644 70c455236e0b45e540eb55f168feb851625a7f08 docs/tutorial/security.md
-@@ -31,7 +31,11 @@
- developers should be aware that upgrading is a serious undertaking - involving
- hand-editing dozens or even hundreds of files. Given the resources and
- contributions available today, Electron will often not be on the very latest
-+<<<<<<< .our
- version of Chromium, lagging behind by several weeks or a few months.
-+=======
-+version of Chromium, lagging behind by either days or weeks.
-+>>>>>>> .their
- 
- We feel that our current system of updating the Chromium component strikes an
- appropriate balance between the resources we have available and the needs of
-@@ -82,7 +86,11 @@
- 11. [`<webview>`: Do not use `allowpopups`](#11-do-not-use-allowpopups)
- 12. [`<webview>`: Verify options and params](#12-verify-webview-options-before-creation)
- 13. [Disable or limit navigation](#13-disable-or-limit-navigation)
-+<<<<<<< .our
- 14. [Disable or limit creation of new windows](#14-disable-or-limit-creation-of-new-windows)
-+=======
-+14. [Disable or limit creation of new windows](#13-disable-or-limit-creation-of-new-windows)
-+>>>>>>> .their
- 
- ## 1) Only Load Secure Content
- 
-@@ -340,7 +348,16 @@
- Electron can load for that given web page. `https://your-page.com` should
- be allowed to load scripts from the origins you defined while scripts from
- `https://evil.attacker.com` should not be allowed to run. Defining a CSP is an
-+<<<<<<< .our
- easy way to improve your application's security.
-+=======
-+easy way to improve your applications security.
-+
-+### How?
-+
-+Electron respects [the `Content-Security-Policy` HTTP header](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy)
-+and the respective `<meta>` tag.
-+>>>>>>> .their
- 
- The following CSP will allow Electron to execute scripts from the current
- website and from `apis.mydomain.com`.
-@@ -353,6 +370,7 @@
- Content-Security-Policy: script-src 'self' https://apis.mydomain.com
- ```
- 
-+<<<<<<< .our
- ### CSP HTTP Header
- 
- Electron respects the [`Content-Security-Policy` HTTP header](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy)
-@@ -379,6 +397,8 @@
- 
- #### `webRequest.onHeadersReceived([filter, ]listener)`
- 
-+=======
-+>>>>>>> .their
- 
- ## 7) Override and Disable `eval`
- 
-@@ -446,7 +466,11 @@
- _Recommendation is Electron's default_
- 
- Advanced users of Electron can enable experimental Chromium features using the
-+<<<<<<< .our
- `experimentalFeatures` property.
-+=======
-+`experimentalFeatures` and `experimentalCanvasFeatures` properties.
-+>>>>>>> .their
- 
- ### Why?
- 
-@@ -612,13 +636,21 @@
- `https://google.com.attacker.com` through.
- 
- ```js
-+<<<<<<< .our
- const URL = require('url').URL
-+=======
-+const URL = require('url')
-+>>>>>>> .their
- 
- app.on('web-contents-created', (event, contents) => {
-   contents.on('will-navigate', (event, navigationUrl) => {
-     const parsedUrl = new URL(navigationUrl)
- 
-+<<<<<<< .our
-     if (parsedUrl.origin !== 'https://my-own-server.com') {
-+=======
-+    if (parsedUrl.hostname !== 'my-own-server.com') {
-+>>>>>>> .their
-       event.preventDefault()
-     }
-   })
-added in both
-  our    100644 bf01dc632319a6dfa147fcbc8376686778e71714 docs/tutorial/using-pepper-flash-plugin.md
-  their  100644 42ead0d694916bd22dad19e3487ccf73fc9f6190 docs/tutorial/using-pepper-flash-plugin.md
-@@ -7,7 +7,11 @@
- ## Prepare a Copy of Flash Plugin
- 
- On macOS and Linux, the details of the Pepper Flash plugin can be found by
-+<<<<<<< .our
- navigating to `chrome://flash` in the Chrome browser. Its location and version
-+=======
-+navigating to `chrome://plugins` in the Chrome browser. Its location and version
-+>>>>>>> .their
- are useful for Electron's Pepper Flash support. You can also copy it to another
- location.
- 
-added in both
-  our    100644 1ceae13473af2a1ccd888924f342e5137c83e7e5 docs/tutorial/using-selenium-and-webdriver.md
-  their  100644 5df8818d5b83c73469de4b3e5760baa5ee37591a docs/tutorial/using-selenium-and-webdriver.md
-@@ -164,7 +164,11 @@
- [place](https://github.com/electron/electron/blob/master/docs/tutorial/application-distribution.md)
- your app source into Electron's resource directory.
- 
-+<<<<<<< .our
- Alternatively, pass an argument to run with your Electron binary that points to
-+=======
-+Alternatively, pass an argument to run with your electron binary that points to
-+>>>>>>> .their
- your app's folder. This eliminates the need to copy-paste your app into
- Electron's resource directory.
- 
-added in both
-  our    100644 944ddab2a3fd879044e31677e4bac2843fffbdee electron.gyp
-  their  100644 52537ba11dadcd28a6c4b69a61268a64540cb29a electron.gyp
-@@ -4,7 +4,11 @@
-     'product_name%': 'Electron',
-     'company_name%': 'GitHub, Inc',
-     'company_abbr%': 'github',
-+<<<<<<< .our
-     'version%': '4.0.0-nightly.20180821',
-+=======
-+    'version%': '3.0.0-beta.7',
-+>>>>>>> .their
-     'js2c_input_dir': '<(SHARED_INTERMEDIATE_DIR)/js2c',
-   },
-   'includes': [
-@@ -48,11 +52,14 @@
-           'ENABLE_VIEW_API',
-         ],
-       }],  # enable_view_api
-+<<<<<<< .our
-       ['enable_pepper_flash==1', {
-         'defines': [
-           'ENABLE_PEPPER_FLASH',
-         ],
-       }],  # enable_pepper_flash
-+=======
-+>>>>>>> .their
-     ],
-   },
-   'targets': [
-@@ -163,6 +170,12 @@
-           ],
-         }],  # OS!="mac"
-         ['OS=="win"', {
-+<<<<<<< .our
-+=======
-+          'include_dirs': [
-+            '<(libchromiumcontent_dir)/gen/ui/resources',
-+          ],
-+>>>>>>> .their
-           'msvs_settings': {
-             'VCManifestTool': {
-               'EmbedManifest': 'true',
-@@ -272,6 +285,11 @@
-         'NODE_SHARED_MODE',
-         'HAVE_OPENSSL=1',
-         'HAVE_INSPECTOR=1',
-+<<<<<<< .our
-+=======
-+        # This is defined in skia/skia_common.gypi.
-+        'SK_SUPPORT_LEGACY_GETTOPDEVICE',
-+>>>>>>> .their
-         # Disable warnings for g_settings_list_schemas.
-         'GLIB_DISABLE_DEPRECATION_WARNINGS',
-         # Defined in Chromium but not exposed in its gyp file.
-@@ -285,6 +303,12 @@
-         # See Chromium src/third_party/protobuf/BUILD.gn
-         'GOOGLE_PROTOBUF_NO_RTTI',
-         'GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER',
-+<<<<<<< .our
-+=======
-+
-+        # Enables SkBitmap size 64 operations
-+        'SK_SUPPORT_LEGACY_SAFESIZE64',
-+>>>>>>> .their
-       ],
-       'sources': [
-         '<@(lib_sources)',
-@@ -333,6 +357,7 @@
-             'vendor/pdf_viewer/pdf_viewer.gyp:pdf_viewer',
-           ],
-         }],  # enable_pdf_viewer
-+<<<<<<< .our
-         ['enable_pepper_flash==1', {
-           'include_dirs': [
-             '<(libchromiumcontent_src_dir)/chrome/browser/renderer_host/pepper',
-@@ -352,6 +377,8 @@
-             ],
-           },
-         }],  # enable_pepper_flash
-+=======
-+>>>>>>> .their
-         ['libchromiumcontent_component', {
-           'link_settings': {
-             'libraries': [ '<@(libchromiumcontent_v8_libraries)' ],
-@@ -363,9 +390,13 @@
-           ],
-           'link_settings': {
-             'libraries': [
-+<<<<<<< .our
-               '-ldwmapi.lib',
-               '-limm32.lib',
-               '-lgdi32.lib',
-+=======
-+              '-limm32.lib',
-+>>>>>>> .their
-               '-loleacc.lib',
-               '-lcomctl32.lib',
-               '-lcomdlg32.lib',
-added in both
-  our    100644 86543a4db1195223a3556fa71583038f15d79a0a features.gypi
-  their  100644 ae08bc63a5c3bec6a8b1e13e532538e40aed0b05 features.gypi
-@@ -7,13 +7,19 @@
-       'enable_pdf_viewer%': 0,  # FIXME(deepak1556)
-       'enable_run_as_node%': 1,
-       'enable_view_api%': 0,
-+<<<<<<< .our
-       'enable_pepper_flash%': 1,
-+=======
-+>>>>>>> .their
-     },
-     'enable_desktop_capturer%': '<(enable_desktop_capturer)',
-     'enable_osr%': '<(enable_osr)',
-     'enable_pdf_viewer%': '<(enable_pdf_viewer)',
-     'enable_run_as_node%': '<(enable_run_as_node)',
-     'enable_view_api%': '<(enable_view_api)',
-+<<<<<<< .our
-     'enable_pepper_flash%': '<(enable_pepper_flash)',
-+=======
-+>>>>>>> .their
-   },
- }
-added in both
-  our    100644 f57860558f06b7e5d8a50f48cfc7e53044df0bc6 filenames.gypi
-  their  100644 a9e59f5cdf4d17f6b669765af9a9e5e2ce55aeef filenames.gypi
-@@ -98,6 +98,7 @@
-       'default_app/main.js',
-       'default_app/package.json',
-       'default_app/renderer.js',
-+<<<<<<< .our
-       'default_app/styles.css',
-       'node_modules/octicons/build/build.css',
-       'node_modules/octicons/build/svg/gist.svg',
-@@ -105,6 +106,8 @@
-       'node_modules/octicons/build/svg/gear.svg',
-       'node_modules/octicons/build/svg/star.svg',
-       'node_modules/octicons/build/svg/gift.svg',
-+=======
-+>>>>>>> .their
-     ],
-     'lib_sources': [
-       'atom/app/atom_content_client.cc',
-@@ -317,8 +320,11 @@
-       'atom/browser/request_context_delegate.h',
-       'atom/browser/session_preferences.cc',
-       'atom/browser/session_preferences.h',
-+<<<<<<< .our
-       'atom/browser/special_storage_policy.cc',
-       'atom/browser/special_storage_policy.h',
-+=======
-+>>>>>>> .their
-       'atom/browser/ui/accelerator_util.cc',
-       'atom/browser/ui/accelerator_util.h',
-       'atom/browser/ui/accelerator_util_mac.mm',
-@@ -533,8 +539,11 @@
-       'atom/common/platform_util_linux.cc',
-       'atom/common/platform_util_mac.mm',
-       'atom/common/platform_util_win.cc',
-+<<<<<<< .our
-       'atom/common/promise_util.h',
-       'atom/common/promise_util.cc',
-+=======
-+>>>>>>> .their
-       'atom/renderer/api/atom_api_renderer_ipc.h',
-       'atom/renderer/api/atom_api_renderer_ipc.cc',
-       'atom/renderer/api/atom_api_spell_check_client.cc',
-@@ -608,6 +617,23 @@
-       'chromium_src/chrome/browser/process_singleton_posix.cc',
-       'chromium_src/chrome/browser/process_singleton_win.cc',
-       'chromium_src/chrome/browser/process_singleton.h',
-+<<<<<<< .our
-+=======
-+      'chromium_src/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc',
-+      'chromium_src/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h',
-+      'chromium_src/chrome/browser/renderer_host/pepper/monitor_finder_mac.h',
-+      'chromium_src/chrome/browser/renderer_host/pepper/monitor_finder_mac.mm',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.h',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.h',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h',
-+>>>>>>> .their
-       'chromium_src/chrome/browser/speech/tts_controller.h',
-       'chromium_src/chrome/browser/speech/tts_controller_impl.cc',
-       'chromium_src/chrome/browser/speech/tts_controller_impl.h',
-@@ -645,6 +671,23 @@
-       'chromium_src/chrome/common/widevine_cdm_constants.h',
-       'chromium_src/chrome/renderer/media/chrome_key_systems.cc',
-       'chromium_src/chrome/renderer/media/chrome_key_systems.h',
-+<<<<<<< .our
-+=======
-+      'chromium_src/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc',
-+      'chromium_src/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.h',
-+      'chromium_src/chrome/renderer/pepper/pepper_flash_font_file_host.cc',
-+      'chromium_src/chrome/renderer/pepper/pepper_flash_font_file_host.h',
-+      'chromium_src/chrome/renderer/pepper/pepper_flash_fullscreen_host.cc',
-+      'chromium_src/chrome/renderer/pepper/pepper_flash_fullscreen_host.h',
-+      'chromium_src/chrome/renderer/pepper/pepper_flash_menu_host.cc',
-+      'chromium_src/chrome/renderer/pepper/pepper_flash_menu_host.h',
-+      'chromium_src/chrome/renderer/pepper/pepper_flash_renderer_host.cc',
-+      'chromium_src/chrome/renderer/pepper/pepper_flash_renderer_host.h',
-+      'chromium_src/chrome/renderer/pepper/pepper_helper.cc',
-+      'chromium_src/chrome/renderer/pepper/pepper_helper.h',
-+      'chromium_src/chrome/renderer/pepper/pepper_shared_memory_message_filter.cc',
-+      'chromium_src/chrome/renderer/pepper/pepper_shared_memory_message_filter.h',
-+>>>>>>> .their
-       'chromium_src/chrome/renderer/printing/print_web_view_helper.cc',
-       'chromium_src/chrome/renderer/printing/print_web_view_helper_linux.cc',
-       'chromium_src/chrome/renderer/printing/print_web_view_helper_mac.mm',
-added in both
-  our    100644 66f6ae651acf10fb19b8ec068fc5280850dd3d91 lib/browser/api/app.js
-  their  100644 a6d94a20a40051faf01c2c15cd6d492235d17a1d lib/browser/api/app.js
-@@ -12,12 +12,36 @@
- const {EventEmitter} = require('events')
- 
- let dockMenu = null
-+<<<<<<< .our
-+=======
-+let readyPromise = null
-+>>>>>>> .their
- 
- // App is an EventEmitter.
- Object.setPrototypeOf(App.prototype, EventEmitter.prototype)
- EventEmitter.call(app)
- 
- Object.assign(app, {
-+<<<<<<< .our
-+=======
-+  whenReady () {
-+    if (readyPromise !== null) {
-+      return readyPromise
-+    }
-+
-+    if (app.isReady()) {
-+      readyPromise = Promise.resolve()
-+    } else {
-+      readyPromise = new Promise(resolve => {
-+        // XXX(alexeykuzmin): Explicitly ignore any data
-+        // passed to the event handler to avoid memory leaks.
-+        app.once('ready', () => resolve())
-+      })
-+    }
-+
-+    return readyPromise
-+  },
-+>>>>>>> .their
-   setApplicationMenu (menu) {
-     return Menu.setApplicationMenu(menu)
-   },
-added in both
-  our    100644 506e3525c10ce142cafe3fc1bf4de1c255e48503 lib/browser/api/menu.js
-  their  100644 dcc446587913f37a58c86f4d1bf612371589960e lib/browser/api/menu.js
-@@ -47,7 +47,11 @@
-   this.delegate = delegate
- }
- 
-+<<<<<<< .our
- Menu.prototype.popup = function (options = {}) {
-+=======
-+Menu.prototype.popup = function (options) {
-+>>>>>>> .their
-   if (options == null || typeof options !== 'object') {
-     throw new TypeError('Options must be an object')
-   }
-@@ -156,6 +160,7 @@
- 
- Menu.buildFromTemplate = function (template) {
-   if (!Array.isArray(template)) {
-+<<<<<<< .our
-     throw new TypeError('Invalid template for Menu: Menu template must be an array')
-   }
-   const menu = new Menu()
-@@ -166,18 +171,36 @@
-   const sorted = sortTemplate(filtered)
- 
-   sorted.forEach((item) => menu.append(new MenuItem(item)))
-+=======
-+    throw new TypeError('Invalid template for Menu')
-+  }
-+
-+  const menu = new Menu()
-+  const filtered = removeExtraSeparators(template)
-+  const sorted = sortTemplate(filtered)
-+
-+  sorted.forEach((item) => {
-+    if (typeof item !== 'object') {
-+      throw new TypeError('Invalid template for MenuItem')
-+    }
-+    menu.append(new MenuItem(item))
-+  })
-+>>>>>>> .their
- 
-   return menu
- }
- 
- /* Helper Functions */
- 
-+<<<<<<< .our
- // validate the template against having the wrong attribute
- function areValidTemplateItems (template) {
-   return template.every(item =>
-   item != null && typeof item === 'object' && (item.hasOwnProperty('label') || item.hasOwnProperty('role') || item.type === 'separator'))
- }
- 
-+=======
-+>>>>>>> .their
- function sortTemplate (template) {
-   const sorted = sortMenuItems(template)
-   for (let id in sorted) {
-added in both
-  our    100644 3f2d470a270378ce1221c928e549d0857755fa09 lib/browser/api/net.js
-  their  100644 54ef99d407ff3a7d7e853b8ccda350d5f8d47fa8 lib/browser/api/net.js
-@@ -352,10 +352,13 @@
-   abort () {
-     this.urlRequest.cancel()
-   }
-+<<<<<<< .our
- 
-   getUploadProgress () {
-     return this.urlRequest.getUploadProgress()
-   }
-+=======
-+>>>>>>> .their
- }
- 
- function writeAfterEndNT (self, error, callback) {
-added in both
-  our    100644 1e4029e39a981c85fb6ff18c5ccd52f81b3c56f2 lib/browser/guest-view-manager.js
-  their  100644 191fa6f3f019bf776f48a18e67a3c4999b1991fe lib/browser/guest-view-manager.js
-@@ -158,7 +158,11 @@
- const attachGuest = function (event, embedderFrameId, elementInstanceId, guestInstanceId, params) {
-   const embedder = event.sender
-   // Destroy the old guest when attaching.
-+<<<<<<< .our
-   const key = `${embedder.id}-${elementInstanceId}`
-+=======
-+  const key = `${embedder.getId()}-${elementInstanceId}`
-+>>>>>>> .their
-   const oldGuestInstanceId = embedderElementsMap[key]
-   if (oldGuestInstanceId != null) {
-     // Reattachment to the same guest is just a no-op.
-@@ -181,7 +185,11 @@
- 
-   // If this guest is already attached to an element then remove it
-   if (guestInstance.elementInstanceId) {
-+<<<<<<< .our
-     const oldKey = `${guestInstance.embedder.id}-${guestInstance.elementInstanceId}`
-+=======
-+    const oldKey = `${guestInstance.embedder.getId()}-${guestInstance.elementInstanceId}`
-+>>>>>>> .their
-     delete embedderElementsMap[oldKey]
- 
-     // Remove guest from embedder if moving across web views
-@@ -269,7 +277,11 @@
-   webViewManager.removeGuest(embedder, guestInstanceId)
-   delete guestInstances[guestInstanceId]
- 
-+<<<<<<< .our
-   const key = `${embedder.id}-${guestInstance.elementInstanceId}`
-+=======
-+  const key = `${embedder.getId()}-${guestInstance.elementInstanceId}`
-+>>>>>>> .their
-   delete embedderElementsMap[key]
- }
- 
-added in both
-  our    100644 7253c1942b0956ae6b9b0c80a23470fc26669b8a lib/browser/guest-window-manager.js
-  their  100644 7985dec4b9ef1ddfc7b88ea4885d7f7136060369 lib/browser/guest-window-manager.js
-@@ -63,9 +63,14 @@
-   }
- 
-   // Inherit certain option values from parent window
-+<<<<<<< .our
-   const webPreferences = embedder.getLastWebPreferences()
-   for (const [name, value] of inheritedWebPreferences) {
-     if (webPreferences[name] === value) {
-+=======
-+  for (const [name, value] of inheritedWebPreferences) {
-+    if (embedder.getLastWebPreferences()[name] === value) {
-+>>>>>>> .their
-       options.webPreferences[name] = value
-     }
-   }
-added in both
-  our    100644 f03a23d2f6910d6555bb9469180d1b60b94bc313 lib/browser/objects-registry.js
-  their  100644 3fb0923df10da778f3e6bd096e771038fd026cb8 lib/browser/objects-registry.js
-@@ -2,10 +2,13 @@
- 
- const v8Util = process.atomBinding('v8_util')
- 
-+<<<<<<< .our
- const getOwnerKey = (webContents, contextId) => {
-   return `${webContents.id}-${contextId}`
- }
- 
-+=======
-+>>>>>>> .their
- class ObjectsRegistry {
-   constructor () {
-     this.nextId = 0
-@@ -15,7 +18,11 @@
-     this.storage = {}
- 
-     // Stores the IDs of objects referenced by WebContents.
-+<<<<<<< .our
-     // (ownerKey) => [id]
-+=======
-+    // (webContentsContextId) => [id]
-+>>>>>>> .their
-     this.owners = {}
-   }
- 
-@@ -26,10 +33,17 @@
-     const id = this.saveToStorage(obj)
- 
-     // Add object to the set of referenced objects.
-+<<<<<<< .our
-     const ownerKey = getOwnerKey(webContents, contextId)
-     let owner = this.owners[ownerKey]
-     if (!owner) {
-       owner = this.owners[ownerKey] = new Set()
-+=======
-+    const webContentsContextId = `${webContents.id}-${contextId}`
-+    let owner = this.owners[webContentsContextId]
-+    if (!owner) {
-+      owner = this.owners[webContentsContextId] = new Set()
-+>>>>>>> .their
-       this.registerDeleteListener(webContents, contextId)
-     }
-     if (!owner.has(id)) {
-@@ -50,8 +64,13 @@
-   // Note that an object may be double-freed (cleared when page is reloaded, and
-   // then garbage collected in old page).
-   remove (webContents, contextId, id) {
-+<<<<<<< .our
-     const ownerKey = getOwnerKey(webContents, contextId)
-     let owner = this.owners[ownerKey]
-+=======
-+    const webContentsContextId = `${webContents.id}-${contextId}`
-+    let owner = this.owners[webContentsContextId]
-+>>>>>>> .their
-     if (owner) {
-       // Remove the reference in owner.
-       owner.delete(id)
-@@ -62,13 +81,22 @@
- 
-   // Clear all references to objects refrenced by the WebContents.
-   clear (webContents, contextId) {
-+<<<<<<< .our
-     const ownerKey = getOwnerKey(webContents, contextId)
-     let owner = this.owners[ownerKey]
-+=======
-+    const webContentsContextId = `${webContents.id}-${contextId}`
-+    let owner = this.owners[webContentsContextId]
-+>>>>>>> .their
-     if (!owner) return
- 
-     for (let id of owner) this.dereference(id)
- 
-+<<<<<<< .our
-     delete this.owners[ownerKey]
-+=======
-+    delete this.owners[webContentsContextId]
-+>>>>>>> .their
-   }
- 
-   // Private: Saves the object into storage and assigns an ID for it.
-@@ -87,7 +115,10 @@
- 
-   // Private: Dereference the object from store.
-   dereference (id) {
-+<<<<<<< .our
-     // FIXME(MarshallOfSound): We should remove this once remote deref works well
-+=======
-+>>>>>>> .their
-     if (process.env.ELECTRON_DISABLE_REMOTE_DEREFERENCING) return
- 
-     let pointer = this.storage[id]
-@@ -101,7 +132,11 @@
-     }
-   }
- 
-+<<<<<<< .our
-   // Private: Clear the storage when renderer process is destroyed.
-+=======
-+  // Private: Clear the storage when renderer process is destoryed.
-+>>>>>>> .their
-   registerDeleteListener (webContents, contextId) {
-     const processId = webContents.getProcessId()
-     const listener = (event, deletedProcessId) => {
-added in both
-  our    100644 ff9f77321de3a4145946b67f3fe2a597f98e2510 lib/browser/rpc-server.js
-  their  100644 09ffb13dcb497383bd7d97e0d26ce72688028d11 lib/browser/rpc-server.js
-@@ -171,6 +171,10 @@
- // Convert array of meta data from renderer into array of real values.
- const unwrapArgs = function (sender, contextId, args) {
-   const metaToValue = function (meta) {
-+<<<<<<< .our
-+=======
-+    let i, len, member, ref, returnValue
-+>>>>>>> .their
-     switch (meta.type) {
-       case 'value':
-         return meta.value
-@@ -190,13 +194,24 @@
-         let ret = {}
-         Object.defineProperty(ret.constructor, 'name', { value: meta.name })
- 
-+<<<<<<< .our
-         for (const {name, value} of meta.members) {
-           ret[name] = metaToValue(value)
-+=======
-+        ref = meta.members
-+        for (i = 0, len = ref.length; i < len; i++) {
-+          member = ref[i]
-+          ret[member.name] = metaToValue(member.value)
-+>>>>>>> .their
-         }
-         return ret
-       }
-       case 'function-with-return-value':
-+<<<<<<< .our
-         const returnValue = metaToValue(meta.value)
-+=======
-+        returnValue = metaToValue(meta.value)
-+>>>>>>> .their
-         return function () {
-           return returnValue
-         }
-@@ -210,9 +225,15 @@
-           return rendererFunctions.get(objectId)
-         }
- 
-+<<<<<<< .our
-         const processId = sender.getProcessId()
-         let callIntoRenderer = function (...args) {
-           if (!sender.isDestroyed() && processId === sender.getProcessId()) {
-+=======
-+        const webContentsId = sender.getId()
-+        let callIntoRenderer = function (...args) {
-+          if (!sender.isDestroyed() && webContentsId === sender.getId()) {
-+>>>>>>> .their
-             sender.send('ELECTRON_RENDERER_CALLBACK', contextId, meta.id, valueToMeta(sender, contextId, args))
-           } else {
-             removeRemoteListenersAndLogWarning(this, meta, callIntoRenderer)
-@@ -234,8 +255,14 @@
- // Call a function and send reply asynchronously if it's a an asynchronous
- // style function and the caller didn't pass a callback.
- const callFunction = function (event, contextId, func, caller, args) {
-+<<<<<<< .our
-   const funcMarkedAsync = v8Util.getHiddenValue(func, 'asynchronous')
-   const funcPassedCallback = typeof args[args.length - 1] === 'function'
-+=======
-+  let err, funcMarkedAsync, funcName, funcPassedCallback, ref, ret
-+  funcMarkedAsync = v8Util.getHiddenValue(func, 'asynchronous')
-+  funcPassedCallback = typeof args[args.length - 1] === 'function'
-+>>>>>>> .their
-   try {
-     if (funcMarkedAsync && !funcPassedCallback) {
-       args.push(function (ret) {
-@@ -243,15 +270,24 @@
-       })
-       func.apply(caller, args)
-     } else {
-+<<<<<<< .our
-       const ret = func.apply(caller, args)
-+=======
-+      ret = func.apply(caller, args)
-+>>>>>>> .their
-       event.returnValue = valueToMeta(event.sender, contextId, ret, true)
-     }
-   } catch (error) {
-     // Catch functions thrown further down in function invocation and wrap
-     // them with the function name so it's easier to trace things like
-     // `Error processing argument -1.`
-+<<<<<<< .our
-     const funcName = func.name || 'anonymous'
-     const err = new Error(`Could not call remote function '${funcName}'. Check that the function signature is correct. Underlying error: ${error.message}`)
-+=======
-+    funcName = ((ref = func.name) != null) ? ref : 'anonymous'
-+    err = new Error(`Could not call remote function '${funcName}'. Check that the function signature is correct. Underlying error: ${error.message}`)
-+>>>>>>> .their
-     err.cause = error
-     throw err
-   }
-@@ -302,7 +338,14 @@
-       throwRPCError(`Cannot call constructor on missing remote object ${id}`)
-     }
- 
-+<<<<<<< .our
-     event.returnValue = valueToMeta(event.sender, contextId, new constructor(...args))
-+=======
-+    // Call new with array of arguments.
-+    // http://stackoverflow.com/questions/1606797/use-of-apply-with-new-operator-is-this-possible
-+    let obj = new (Function.prototype.bind.apply(constructor, [null].concat(args)))()
-+    event.returnValue = valueToMeta(event.sender, contextId, obj)
-+>>>>>>> .their
-   } catch (error) {
-     event.returnValue = exceptionToMeta(event.sender, contextId, error)
-   }
-@@ -332,7 +375,14 @@
-       throwRPCError(`Cannot call constructor '${method}' on missing remote object ${id}`)
-     }
- 
-+<<<<<<< .our
-     event.returnValue = valueToMeta(event.sender, contextId, new object[method](...args))
-+=======
-+    // Call new with array of arguments.
-+    let constructor = object[method]
-+    let obj = new (Function.prototype.bind.apply(constructor, [null].concat(args)))()
-+    event.returnValue = valueToMeta(event.sender, contextId, obj)
-+>>>>>>> .their
-   } catch (error) {
-     event.returnValue = exceptionToMeta(event.sender, contextId, error)
-   }
-@@ -454,6 +504,7 @@
-   event.returnValue = {
-     preloadSrc: preloadSrc,
-     preloadError: preloadError,
-+<<<<<<< .our
-     process: {
-       arch: process.arch,
-       platform: process.platform,
-@@ -461,5 +512,10 @@
-       version: process.version,
-       versions: process.versions
-     }
-+=======
-+    webContentsId: event.sender.getId(),
-+    platform: process.platform,
-+    env: process.env
-+>>>>>>> .their
-   }
- })
-added in both
-  our    100644 b24f9e28b879154457be0342b9d4b44c0e651253 lib/renderer/security-warnings.js
-  their  100644 41557164ce716dec6d934ce49fe654a22c6658e3 lib/renderer/security-warnings.js
-@@ -210,7 +210,12 @@
-    */
-   warnAboutExperimentalFeatures: () => {
-     const webPreferences = getWebPreferences()
-+<<<<<<< .our
-     if (!webPreferences || (!webPreferences.experimentalFeatures)) {
-+=======
-+    if (!webPreferences || (!webPreferences.experimentalFeatures &&
-+        !webPreferences.experimentalCanvasFeatures)) {
-+>>>>>>> .their
-       return
-     }
- 
-added in both
-  our    100644 574a2b545597f9d1c05ec9b7147585063e90ae89 lib/renderer/web-view/web-view.js
-  their  100644 9e7f15bf084bbef671daa348b4264364c56837fc lib/renderer/web-view/web-view.js
-@@ -131,7 +131,11 @@
-   }
- 
-   onElementResize () {
-+<<<<<<< .our
-     const resizeEvent = new Event('resize')
-+=======
-+    const resizeEvent = new Event('resize', { bubbles: true })
-+>>>>>>> .their
-     resizeEvent.newWidth = this.webviewNode.clientWidth
-     resizeEvent.newHeight = this.webviewNode.clientHeight
-     this.dispatchEvent(resizeEvent)
-@@ -288,7 +292,10 @@
-     'inspectElement',
-     'setAudioMuted',
-     'isAudioMuted',
-+<<<<<<< .our
-     'isCurrentlyAudible',
-+=======
-+>>>>>>> .their
-     'undo',
-     'redo',
-     'cut',
-@@ -302,6 +309,10 @@
-     'replaceMisspelling',
-     'findInPage',
-     'stopFindInPage',
-+<<<<<<< .our
-+=======
-+    'getId',
-+>>>>>>> .their
-     'downloadURL',
-     'inspectServiceWorker',
-     'print',
-added in both
-  our    100644 30a3fa55216f6bf7588c3accc07b150a31163b7c lib/sandboxed_renderer/init.js
-  their  100644 2b0d3b81ceef5480c28e8da249e38d8350808d15 lib/sandboxed_renderer/init.js
-@@ -36,9 +36,21 @@
- ])
- 
- const {
-+<<<<<<< .our
-   preloadSrc, preloadError, process: processProps
- } = electron.ipcRenderer.sendSync('ELECTRON_BROWSER_SANDBOX_LOAD')
- 
-+=======
-+  preloadSrc, preloadError, webContentsId, platform, env
-+} = electron.ipcRenderer.sendSync('ELECTRON_BROWSER_SANDBOX_LOAD')
-+
-+Object.defineProperty(process, 'webContentsId', {
-+  configurable: false,
-+  writable: false,
-+  value: webContentsId
-+})
-+
-+>>>>>>> .their
- require('../renderer/web-frame-init')()
- 
- // Pass different process object to the preload script(which should not have
-@@ -49,6 +61,7 @@
- preloadProcess.getHeapStatistics = () => binding.getHeapStatistics()
- preloadProcess.getProcessMemoryInfo = () => binding.getProcessMemoryInfo()
- preloadProcess.getSystemMemoryInfo = () => binding.getSystemMemoryInfo()
-+<<<<<<< .our
- preloadProcess.getCPUUsage = () => binding.getCPUUsage()
- preloadProcess.getIOCounters = () => binding.getIOCounters()
- preloadProcess.argv = process.argv = binding.getArgv()
-@@ -59,6 +72,12 @@
- preloadProcess.type = 'renderer'
- Object.assign(preloadProcess, processProps)
- Object.assign(process, processProps)
-+=======
-+preloadProcess.argv = process.argv = binding.getArgv()
-+preloadProcess.execPath = process.execPath = binding.getExecPath()
-+preloadProcess.platform = process.platform = platform
-+preloadProcess.env = process.env = env
-+>>>>>>> .their
- 
- process.on('exit', () => preloadProcess.emit('exit'))
- 
-@@ -112,8 +131,15 @@
-   ${preloadSrc}
-   })`
- 
-+<<<<<<< .our
-   // eval in window scope
-   const preloadFn = binding.createPreloadScript(preloadWrapperSrc)
-+=======
-+  // eval in window scope:
-+  // http://www.ecma-international.org/ecma-262/5.1/#sec-10.4.2
-+  const geval = eval
-+  const preloadFn = geval(preloadWrapperSrc)
-+>>>>>>> .their
-   const {setImmediate, clearImmediate} = require('timers')
-   preloadFn(preloadRequire, preloadProcess, Buffer, global, setImmediate, clearImmediate)
- } else if (preloadError) {
-added in both
-  our    100644 bac533f6786ffad78ef1e711bc4a94d5b51cd36d native_mate/native_mate/dictionary.cc
-  their  100644 3caff114597440fecf0494c8565b4524602f2694 native_mate/native_mate/dictionary.cc
-@@ -6,6 +6,7 @@
- 
- namespace mate {
- 
-+<<<<<<< .our
- Dictionary::Dictionary() : isolate_(NULL) {}
- 
- Dictionary::Dictionary(v8::Isolate* isolate, v8::Local<v8::Object> object)
-@@ -14,6 +15,20 @@
- Dictionary::Dictionary(const Dictionary& other) = default;
- 
- Dictionary::~Dictionary() = default;
-+=======
-+Dictionary::Dictionary()
-+    : isolate_(NULL) {
-+}
-+
-+Dictionary::Dictionary(v8::Isolate* isolate,
-+                       v8::Local<v8::Object> object)
-+    : isolate_(isolate),
-+      object_(object) {
-+}
-+
-+Dictionary::~Dictionary() {
-+}
-+>>>>>>> .their
- 
- Dictionary Dictionary::CreateEmpty(v8::Isolate* isolate) {
-   return Dictionary(isolate, v8::Object::New(isolate));
-@@ -24,7 +39,11 @@
- }
- 
- v8::Local<v8::Value> Converter<Dictionary>::ToV8(v8::Isolate* isolate,
-+<<<<<<< .our
-                                                  Dictionary val) {
-+=======
-+                                                  Dictionary val) {
-+>>>>>>> .their
-   return val.GetHandle();
- }
- 
-added in both
-  our    100644 63a1350597604f9a0ab3233f7f6f24b0d3a81c22 native_mate/native_mate/dictionary.h
-  their  100644 9e80cb99acfdbedbeacc6a98d2398f9a2c17713f native_mate/native_mate/dictionary.h
-@@ -35,12 +35,19 @@
-  public:
-   Dictionary();
-   Dictionary(v8::Isolate* isolate, v8::Local<v8::Object> object);
-+<<<<<<< .our
-   Dictionary(const Dictionary& other);
-+=======
-+>>>>>>> .their
-   virtual ~Dictionary();
- 
-   static Dictionary CreateEmpty(v8::Isolate* isolate);
- 
-+<<<<<<< .our
-   template <typename T>
-+=======
-+  template<typename T>
-+>>>>>>> .their
-   bool Get(const base::StringPiece& key, T* out) const {
-     // Check for existence before getting, otherwise this method will always
-     // returns true when T == v8::Local<v8::Value>.
-@@ -55,30 +62,54 @@
-     return ConvertFromV8(isolate_, val, out);
-   }
- 
-+<<<<<<< .our
-   template <typename T>
-+=======
-+  template<typename T>
-+>>>>>>> .their
-   bool GetHidden(const base::StringPiece& key, T* out) const {
-     v8::Local<v8::Context> context = isolate_->GetCurrentContext();
-     v8::Local<v8::Private> privateKey =
-         v8::Private::ForApi(isolate_, StringToV8(isolate_, key));
-     v8::Local<v8::Value> value;
-+<<<<<<< .our
-     v8::Maybe<bool> result = GetHandle()->HasPrivate(context, privateKey);
-+=======
-+    v8::Maybe<bool> result =
-+        GetHandle()->HasPrivate(context, privateKey);
-+>>>>>>> .their
-     if (internal::IsTrue(result) &&
-         GetHandle()->GetPrivate(context, privateKey).ToLocal(&value))
-       return ConvertFromV8(isolate_, value, out);
-     return false;
-   }
- 
-+<<<<<<< .our
-   template <typename T>
-+=======
-+  template<typename T>
-+>>>>>>> .their
-   bool Set(const base::StringPiece& key, const T& val) {
-     v8::Local<v8::Value> v8_value;
-     if (!TryConvertToV8(isolate_, val, &v8_value))
-       return false;
-+<<<<<<< .our
-     v8::Maybe<bool> result = GetHandle()->Set(
-         isolate_->GetCurrentContext(), StringToV8(isolate_, key), v8_value);
-     return !result.IsNothing() && result.FromJust();
-   }
- 
-   template <typename T>
-+=======
-+    v8::Maybe<bool> result =
-+        GetHandle()->Set(isolate_->GetCurrentContext(),
-+                         StringToV8(isolate_, key),
-+                         v8_value);
-+    return !result.IsNothing() && result.FromJust();
-+  }
-+
-+  template<typename T>
-+>>>>>>> .their
-   bool SetHidden(const base::StringPiece& key, T val) {
-     v8::Local<v8::Value> v8_value;
-     if (!TryConvertToV8(isolate_, val, &v8_value))
-@@ -91,11 +122,16 @@
-     return !result.IsNothing() && result.FromJust();
-   }
- 
-+<<<<<<< .our
-   template <typename T>
-+=======
-+  template<typename T>
-+>>>>>>> .their
-   bool SetReadOnly(const base::StringPiece& key, T val) {
-     v8::Local<v8::Value> v8_value;
-     if (!TryConvertToV8(isolate_, val, &v8_value))
-       return false;
-+<<<<<<< .our
-     v8::Maybe<bool> result = GetHandle()->DefineOwnProperty(
-         isolate_->GetCurrentContext(), StringToV8(isolate_, key), v8_value,
-         v8::ReadOnly);
-@@ -103,6 +139,17 @@
-   }
- 
-   template <typename T>
-+=======
-+    v8::Maybe<bool> result =
-+        GetHandle()->DefineOwnProperty(isolate_->GetCurrentContext(),
-+                                       StringToV8(isolate_, key),
-+                                       v8_value,
-+                                       v8::ReadOnly);
-+    return !result.IsNothing() && result.FromJust();
-+  }
-+
-+  template<typename T>
-+>>>>>>> .their
-   bool SetMethod(const base::StringPiece& key, const T& callback) {
-     return GetHandle()->Set(
-         StringToV8(isolate_, key),
-@@ -128,9 +175,16 @@
-   v8::Local<v8::Object> object_;
- };
- 
-+<<<<<<< .our
- template <>
- struct Converter<Dictionary> {
-   static v8::Local<v8::Value> ToV8(v8::Isolate* isolate, Dictionary val);
-+=======
-+template<>
-+struct Converter<Dictionary> {
-+  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-+                                    Dictionary val);
-+>>>>>>> .their
-   static bool FromV8(v8::Isolate* isolate,
-                      v8::Local<v8::Value> val,
-                      Dictionary* out);
-added in both
-  our    100644 6a5e5a0253f4f465747fd0a4d96aad2336784d9c native_mate/native_mate/persistent_dictionary.cc
-  their  100644 fd68cdced275ed4848a9b866caea02b50fff8613 native_mate/native_mate/persistent_dictionary.cc
-@@ -6,7 +6,12 @@
- 
- namespace mate {
- 
-+<<<<<<< .our
- PersistentDictionary::PersistentDictionary() {}
-+=======
-+PersistentDictionary::PersistentDictionary() {
-+}
-+>>>>>>> .their
- 
- PersistentDictionary::PersistentDictionary(v8::Isolate* isolate,
-                                            v8::Local<v8::Object> object)
-@@ -14,10 +19,15 @@
-   isolate_ = isolate;
- }
- 
-+<<<<<<< .our
- PersistentDictionary::PersistentDictionary(const PersistentDictionary& other) =
-     default;
- 
- PersistentDictionary::~PersistentDictionary() {}
-+=======
-+PersistentDictionary::~PersistentDictionary() {
-+}
-+>>>>>>> .their
- 
- v8::Local<v8::Object> PersistentDictionary::GetHandle() const {
-   return handle_->NewHandle();
-added in both
-  our    100644 7a83916f1505d53a8694c9d438485177d6cb539e native_mate/native_mate/persistent_dictionary.h
-  their  100644 26c8998632bd80876f5448a86a8f57b25e73801e native_mate/native_mate/persistent_dictionary.h
-@@ -16,16 +16,27 @@
-  public:
-   PersistentDictionary();
-   PersistentDictionary(v8::Isolate* isolate, v8::Local<v8::Object> object);
-+<<<<<<< .our
-   PersistentDictionary(const PersistentDictionary& other);
-   ~PersistentDictionary() override;
-+=======
-+  virtual ~PersistentDictionary();
-+>>>>>>> .their
- 
-   v8::Local<v8::Object> GetHandle() const override;
- 
-  private:
-+<<<<<<< .our
-   scoped_refptr<RefCountedPersistent<v8::Object>> handle_;
- };
- 
- template <>
-+=======
-+  scoped_refptr<RefCountedPersistent<v8::Object> > handle_;
-+};
-+
-+template<>
-+>>>>>>> .their
- struct Converter<PersistentDictionary> {
-   static bool FromV8(v8::Isolate* isolate,
-                      v8::Local<v8::Value> val,
-added in both
-  our    100644 faba6f332e4ac31eb55f08e9a76ae216f0916311 native_mate/native_mate/wrappable.h
-  their  100644 489c5817481b8663ffc2500ec89bf8c1e72dea0e native_mate/native_mate/wrappable.h
-@@ -6,9 +6,15 @@
- #define NATIVE_MATE_WRAPPABLE_H_
- 
- #include "base/bind.h"
-+<<<<<<< .our
- #include "gin/per_isolate_data.h"
- #include "native_mate/constructor.h"
- #include "native_mate/converter.h"
-+=======
-+#include "native_mate/converter.h"
-+#include "native_mate/constructor.h"
-+#include "gin/per_isolate_data.h"
-+>>>>>>> .their
- 
- namespace mate {
- 
-@@ -18,25 +24,42 @@
- 
- }  // namespace internal
- 
-+<<<<<<< .our
- template <typename T>
-+=======
-+template<typename T>
-+>>>>>>> .their
- class Wrappable : public WrappableBase {
-  public:
-   Wrappable() {}
- 
-+<<<<<<< .our
-   template <typename Sig>
-+=======
-+  template<typename Sig>
-+>>>>>>> .their
-   static void SetConstructor(v8::Isolate* isolate,
-                              const base::Callback<Sig>& constructor) {
-     v8::Local<v8::FunctionTemplate> templ = CreateFunctionTemplate(
-         isolate, base::Bind(&internal::InvokeNew<Sig>, constructor));
-     templ->InstanceTemplate()->SetInternalFieldCount(1);
-     T::BuildPrototype(isolate, templ);
-+<<<<<<< .our
-     gin::PerIsolateData::From(isolate)->SetFunctionTemplate(&kWrapperInfo,
-                                                             templ);
-+=======
-+    gin::PerIsolateData::From(isolate)->SetFunctionTemplate(
-+        &kWrapperInfo, templ);
-+>>>>>>> .their
-   }
- 
-   static v8::Local<v8::FunctionTemplate> GetConstructor(v8::Isolate* isolate) {
-     // Fill the object template.
-+<<<<<<< .our
-     auto* data = gin::PerIsolateData::From(isolate);
-+=======
-+    auto data = gin::PerIsolateData::From(isolate);
-+>>>>>>> .their
-     auto templ = data->GetFunctionTemplate(&kWrapperInfo);
-     if (templ.IsEmpty()) {
-       templ = v8::FunctionTemplate::New(isolate);
-@@ -55,9 +78,14 @@
-     // |wrapper| may be empty in some extreme cases, e.g., when
-     // Object.prototype.constructor is overwritten.
-     v8::Local<v8::Object> wrapper;
-+<<<<<<< .our
-     if (!templ->InstanceTemplate()
-              ->NewInstance(isolate->GetCurrentContext())
-              .ToLocal(&wrapper)) {
-+=======
-+    if (!templ->InstanceTemplate()->NewInstance(
-+            isolate->GetCurrentContext()).ToLocal(&wrapper)) {
-+>>>>>>> .their
-       // The current wrappable object will be no longer managed by V8. Delete
-       // this now.
-       delete this;
-@@ -73,8 +101,13 @@
- };
- 
- // static
-+<<<<<<< .our
- template <typename T>
- gin::WrapperInfo Wrappable<T>::kWrapperInfo = {gin::kEmbedderNativeGin};
-+=======
-+template<typename T>
-+gin::WrapperInfo Wrappable<T>::kWrapperInfo = { gin::kEmbedderNativeGin };
-+>>>>>>> .their
- 
- // This converter handles any subclass of Wrappable.
- template <typename T>
-@@ -89,8 +122,13 @@
-   }
- 
-   static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val, T** out) {
-+<<<<<<< .our
-     *out = static_cast<T*>(
-         static_cast<WrappableBase*>(internal::FromV8Impl(isolate, val)));
-+=======
-+    *out = static_cast<T*>(static_cast<WrappableBase*>(
-+        internal::FromV8Impl(isolate, val)));
-+>>>>>>> .their
-     return *out != nullptr;
-   }
- };
-added in both
-  our    100644 b1d8824658ea05c277e82d1ac6c6febab9c55030 package-lock.json
-  their  100644 5951cdf249d38722c0f19e847ce3f16c750f468f package-lock.json
-@@ -1,13 +1,23 @@
- {
-   "name": "electron",
-+<<<<<<< .our
-   "version": "4.0.0-nightly.20180819",
-+=======
-+  "version": "3.0.0-nightly.20180821",
-+>>>>>>> .their
-   "lockfileVersion": 1,
-   "requires": true,
-   "dependencies": {
-     "@types/node": {
-+<<<<<<< .our
-       "version": "7.0.69",
-       "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.69.tgz",
-       "integrity": "sha512-S5NC8HV6HnRipg8nC0j30TPl7ktXjRTKqgyINLNe8K/64UJUI8Lq0sRopXC0hProsV2F5ibj8IqPkl1xpGggrw==",
-+=======
-+      "version": "7.0.68",
-+      "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.68.tgz",
-+      "integrity": "sha512-ym3LNHwJQU0XDyPrTK6NHJTH5YmGKKe0k56in6pg+Wx4HD8fiKrt8xute6/unHvHujCfzmOQTGz1NoEKgFF5Mw==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "JSONStream": {
-@@ -30,7 +40,11 @@
-     "abbrev": {
-       "version": "1.1.1",
-       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg=",
-+=======
-+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "accepts": {
-@@ -192,7 +206,11 @@
-         "string-width": {
-           "version": "2.1.1",
-           "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
-+=======
-+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "is-fullwidth-code-point": "2.0.0",
-@@ -231,7 +249,11 @@
-     "anymatch": {
-       "version": "1.3.2",
-       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-VT3Lj5HjyImEXf26NMd3IbkLnXo=",
-+=======
-+      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "micromatch": "2.3.11",
-@@ -239,6 +261,7 @@
-       }
-     },
-     "arch": {
-+<<<<<<< .our
-       "version": "2.1.1",
-       "resolved": "https://registry.npmjs.org/arch/-/arch-2.1.1.tgz",
-       "integrity": "sha512-BLM56aPo9vLLFVa8+/+pJLnrZ7QGGTVHWsCwieAWT9o9K8UeGaQbzZbGoabWLOo2ksBCztoXdqBZBplqLDDCSg==",
-@@ -248,6 +271,11 @@
-       "version": "2.0.0",
-       "resolved": "https://registry.npmjs.org/arg/-/arg-2.0.0.tgz",
-       "integrity": "sha512-XxNTUzKnz1ctK3ZIcI2XUPlD96wbHP2nGqkPKpvk/HNRlPveYrXIVSTk9m3LcqOgDPg3B1nMvdV/K8wZd7PG4w==",
-+=======
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/arch/-/arch-2.1.0.tgz",
-+      "integrity": "sha1-NhOqRhSQZLPB8GB5Gb8dR4boKIk=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "argparse": {
-@@ -326,7 +354,11 @@
-     "arr-flatten": {
-       "version": "1.1.0",
-       "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE=",
-+=======
-+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "array-filter": {
-@@ -611,7 +643,11 @@
-     "bn.js": {
-       "version": "4.11.8",
-       "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-LN4J617jQfSEdGuwMJsyU7GxRC8=",
-+=======
-+      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "boolbase": {
-@@ -691,7 +727,11 @@
-         "string-width": {
-           "version": "2.1.1",
-           "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
-+=======
-+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "is-fullwidth-code-point": "2.0.0",
-@@ -834,7 +874,11 @@
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "fs.realpath": "1.0.0",
-@@ -1159,7 +1203,11 @@
-     "check-for-leaks": {
-       "version": "1.2.0",
-       "resolved": "https://registry.npmjs.org/check-for-leaks/-/check-for-leaks-1.2.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-6jtQFk6XV3kzLGKBMZX/jGr4Jsw=",
-+=======
-+      "integrity": "sha512-bJ2Bzo6RtsYqamMnsjtVzowGvBNVrR5IPK8Bd+lx5W1TNgOKMsF+AyNHVkqFqO7cpDZNfny5SaqH6gEovpV5Gw==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "anymatch": "1.3.2",
-@@ -1239,7 +1287,11 @@
-     "cipher-base": {
-       "version": "1.0.4",
-       "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-h2Dk7MJy9MNjUy+SbYdKriwTl94=",
-+=======
-+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "inherits": "2.0.3",
-@@ -1249,7 +1301,11 @@
-     "circular-json": {
-       "version": "0.3.3",
-       "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-gVyZ6oT2gJUp0vRXkb34JxE1LWY=",
-+=======
-+      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "clang-format": {
-@@ -1323,7 +1379,11 @@
-       "integrity": "sha512-2WNImOvCRe6r63Gk9pShfkwXsVtKCroMAevIbiae021mS850UkWPbevxsBz3tnvjZIEGvlwaqCPsw+4ulzNgJA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "arch": "2.1.1",
-+=======
-+        "arch": "2.1.0",
-+>>>>>>> .their
-         "execa": "0.8.0"
-       },
-       "dependencies": {
-@@ -1442,6 +1502,7 @@
-       }
-     },
-     "compressible": {
-+<<<<<<< .our
-       "version": "2.0.14",
-       "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.14.tgz",
-       "integrity": "sha1-MmxfUH+7BV9UEWeCuWmoG2einac=",
-@@ -1462,15 +1523,45 @@
-       "version": "1.7.3",
-       "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.3.tgz",
-       "integrity": "sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==",
-+=======
-+      "version": "2.0.13",
-+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.13.tgz",
-+      "integrity": "sha1-DRAgq5JLL9tNYnmHXH1tq6a6p6k=",
-+      "dev": true,
-+      "requires": {
-+        "mime-db": "1.33.0"
-+      }
-+    },
-+    "compression": {
-+      "version": "1.7.2",
-+      "resolved": "http://registry.npmjs.org/compression/-/compression-1.7.2.tgz",
-+      "integrity": "sha1-qv+81qr4VLROuygDU9WtFlH1mmk=",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "accepts": "1.3.5",
-         "bytes": "3.0.0",
-+<<<<<<< .our
-         "compressible": "2.0.14",
-         "debug": "2.6.9",
-         "on-headers": "1.0.1",
-         "safe-buffer": "5.1.2",
-         "vary": "1.1.2"
-+=======
-+        "compressible": "2.0.13",
-+        "debug": "2.6.9",
-+        "on-headers": "1.0.1",
-+        "safe-buffer": "5.1.1",
-+        "vary": "1.1.2"
-+      },
-+      "dependencies": {
-+        "safe-buffer": {
-+          "version": "5.1.1",
-+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-+          "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
-+          "dev": true
-+        }
-+>>>>>>> .their
-       }
-     },
-     "concat-map": {
-@@ -1535,7 +1626,11 @@
-         "dot-prop": {
-           "version": "4.2.0",
-           "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-HxngwuGqDjJ5fEl5nyg3rGr2nFc=",
-+=======
-+          "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "is-obj": "1.0.1"
-@@ -1836,7 +1931,11 @@
-         "boom": {
-           "version": "5.2.0",
-           "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-XdnabuOl8wIHdDYpDLcX0/SlTgI=",
-+=======
-+          "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "hoek": "4.2.1"
-@@ -1960,7 +2059,11 @@
-     "debug": {
-       "version": "2.6.9",
-       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
-+=======
-+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "ms": "2.0.0"
-@@ -2070,7 +2173,11 @@
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "fs.realpath": "1.0.0",
-@@ -2139,9 +2246,15 @@
-       "dev": true
-     },
-     "detect-port": {
-+<<<<<<< .our
-       "version": "1.2.3",
-       "resolved": "https://registry.npmjs.org/detect-port/-/detect-port-1.2.3.tgz",
-       "integrity": "sha512-IDbrX6PxqnYy8jV4wSHBaJlErYKTJvW8OQb9F7xivl1iQLqiUYHGa+nZ61Do6+N5uuOn/pReXKNqI9rUn04vug==",
-+=======
-+      "version": "1.2.2",
-+      "resolved": "https://registry.npmjs.org/detect-port/-/detect-port-1.2.2.tgz",
-+      "integrity": "sha512-06H99JMCwgbYbA+codm97aBhFLAjABftetp+v+Z88Pvvlkawp2N+1bP/9J24+mihrvk9yBvUYTyIj3NixG1CsA==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "address": "1.0.3",
-@@ -2441,7 +2554,11 @@
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "fs.realpath": "1.0.0",
-@@ -2523,12 +2640,21 @@
-       }
-     },
-     "electron-typescript-definitions": {
-+<<<<<<< .our
-       "version": "1.3.6",
-       "resolved": "https://registry.npmjs.org/electron-typescript-definitions/-/electron-typescript-definitions-1.3.6.tgz",
-       "integrity": "sha512-Wz6tPaaZ22lbfWwF9bzVSki7LMW96xilCT1M8eeNYZG6LcpA9x34jlrAZg5HZWTHXR2tfbTQhSmrY+FEVulD/A==",
-       "dev": true,
-       "requires": {
-         "@types/node": "7.0.69",
-+=======
-+      "version": "1.3.5",
-+      "resolved": "https://registry.npmjs.org/electron-typescript-definitions/-/electron-typescript-definitions-1.3.5.tgz",
-+      "integrity": "sha512-7Ryb7AN0Re63oeX3wHytjX0ScVlDcgj+GSBi6Q8aSNpo4B/sffAgZK6P/b4idqF26hp2jPJWcjBMizUb0VNfAQ==",
-+      "dev": true,
-+      "requires": {
-+        "@types/node": "7.0.68",
-+>>>>>>> .their
-         "colors": "1.2.5",
-         "debug": "2.6.9",
-         "electron-docs": "2.0.1",
-@@ -2795,7 +2921,11 @@
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "fs.realpath": "1.0.0",
-@@ -2901,7 +3031,11 @@
-     "eslint-plugin-node": {
-       "version": "4.2.3",
-       "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-4.2.3.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-wEOQq428u2iHF0Aj1vOnJ2nmO5c=",
-+=======
-+      "integrity": "sha512-vIUQPuwbVYdz/CYnlTLsJrRy7iXHQjdEe5wz0XhhdTym3IInM/zZLlPf9nZ2mThsH0QcsieCOWs2vOeCy/22LQ==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "ignore": "3.3.8",
-@@ -3057,7 +3191,11 @@
-     "evp_bytestokey": {
-       "version": "1.0.3",
-       "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-f8vbGY3HGVlDLv4ThCaE4FJaywI=",
-+=======
-+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "md5.js": "1.3.4",
-@@ -3199,7 +3337,11 @@
-     "find-root": {
-       "version": "1.1.0",
-       "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-q8/Iunb3CMQql7PWhbfpRQv7nOQ=",
-+=======
-+      "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "find-up": {
-@@ -3880,7 +4022,11 @@
-     "function-bind": {
-       "version": "1.1.1",
-       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0=",
-+=======
-+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "generate-function": {
-@@ -4059,7 +4205,11 @@
-     "github": {
-       "version": "9.3.1",
-       "resolved": "https://registry.npmjs.org/github/-/github-9.3.1.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-ajxanMKhzQtdCXpHuu+50Ryu+J4=",
-+=======
-+      "integrity": "sha512-LvVb6iR8/7bqYgj0VeAtqys0t427jwIBkv/+or/ssypfIk5R1fnz4aeIEv4udPw6VFoH6vL4gi+foBoD5aazXg==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "follow-redirects": "0.0.7",
-@@ -4112,7 +4262,11 @@
-     "globals": {
-       "version": "9.18.0",
-       "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-qjiWs+abSH8X4x7SFD1pqOMMLYo=",
-+=======
-+      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "globby": {
-@@ -4132,7 +4286,11 @@
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "fs.realpath": "1.0.0",
-@@ -4173,7 +4331,11 @@
-     "gunzip-maybe": {
-       "version": "1.4.1",
-       "resolved": "https://registry.npmjs.org/gunzip-maybe/-/gunzip-maybe-1.4.1.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-Occu2J0bSbpwjhh3ZQBIiQKlICc=",
-+=======
-+      "integrity": "sha512-qtutIKMthNJJgeHQS7kZ9FqDq59/Wn0G2HYCRNjpup7yKfVI6/eqwpmroyZGFoCYaG+sW6psNVb4zoLADHpp2g==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "browserify-zlib": "0.1.4",
-@@ -4282,7 +4444,11 @@
-     "hash.js": {
-       "version": "1.1.3",
-       "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-NA3tvmKQGHFRweodd3o0SJNd+EY=",
-+=======
-+      "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "inherits": "2.0.3",
-@@ -4292,7 +4458,11 @@
-     "hawk": {
-       "version": "6.0.2",
-       "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-r02RTrBl+bXOTZ0RwcshJu7MMDg=",
-+=======
-+      "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "boom": "4.3.1",
-@@ -4425,7 +4595,11 @@
-     "husky": {
-       "version": "0.14.3",
-       "resolved": "https://registry.npmjs.org/husky/-/husky-0.14.3.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-xp7XTi0neXaaF7qDmbVM4LY8EsM=",
-+=======
-+      "integrity": "sha512-e21wivqHpstpoiWA/Yi8eFti8E+sQDSS53cpJsPptPs295QTOQR0ZwnHo2TXy1XOpZFD9rPOd3NpmqTK6uMLJA==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "is-ci": "1.1.0",
-@@ -5086,7 +5260,11 @@
-         "esprima": {
-           "version": "4.0.0",
-           "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-RJnt3NERDgshi6zy+n9/WfVcqAQ=",
-+=======
-+          "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==",
-+>>>>>>> .their
-           "dev": true
-         }
-       }
-@@ -5683,7 +5861,11 @@
-     "matcher-collection": {
-       "version": "1.0.5",
-       "resolved": "https://registry.npmjs.org/matcher-collection/-/matcher-collection-1.0.5.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-LuCVQ4Nyy4iE8FgjQTjAXGROwzk=",
-+=======
-+      "integrity": "sha512-nUCmzKipcJEwYsBVAFh5P+d7JBuhJaW1xs85Hara9xuMLqtCVUrW6DSC0JVIkluxEH2W45nPBM/wjHtBXa/tYA==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "minimatch": "3.0.4"
-@@ -5832,6 +6014,7 @@
-       }
-     },
-     "micro": {
-+<<<<<<< .our
-       "version": "9.3.1",
-       "resolved": "https://registry.npmjs.org/micro/-/micro-9.3.1.tgz",
-       "integrity": "sha512-83uimpPJqfwkfKvJl2WWontBlV3hmzrIgyJ+L2uhDXKNk7Ll+/ezK3zBz7TljubpKPqjM0JdT2Ker4MTPmhjgA==",
-@@ -5879,6 +6062,17 @@
-             "has-flag": "3.0.0"
-           }
-         }
-+=======
-+      "version": "9.1.4",
-+      "resolved": "https://registry.npmjs.org/micro/-/micro-9.1.4.tgz",
-+      "integrity": "sha512-2eQ5QpO33LAPQJ/1iA3BrtLzdYlOCAXlstY4vcIj3SEmv0tsWuNZpsfgn1o8xGAYzf15kb+FXnEx8EklXz+pPg==",
-+      "dev": true,
-+      "requires": {
-+        "content-type": "1.0.4",
-+        "is-stream": "1.1.0",
-+        "mri": "1.1.0",
-+        "raw-body": "2.3.2"
-+>>>>>>> .their
-       }
-     },
-     "micro-compress": {
-@@ -5887,7 +6081,11 @@
-       "integrity": "sha1-U/WoC0rQMgyhZaVZtuPfFF1PcE8=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "compression": "1.7.3"
-+=======
-+        "compression": "1.7.2"
-+>>>>>>> .their
-       }
-     },
-     "micromatch": {
-@@ -5914,7 +6112,11 @@
-     "miller-rabin": {
-       "version": "4.0.1",
-       "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-8IA1HIZbDcViqEYpZtqlNUPHik0=",
-+=======
-+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "bn.js": "4.11.8",
-@@ -5963,7 +6165,11 @@
-     "minimatch": {
-       "version": "3.0.4",
-       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
-+=======
-+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "brace-expansion": "1.1.11"
-@@ -6181,7 +6387,11 @@
-     "normalize-package-data": {
-       "version": "2.4.0",
-       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-EvlaMH1YNSB1oEkHuErIvpisAS8=",
-+=======
-+      "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "hosted-git-info": "2.6.0",
-@@ -6304,6 +6514,7 @@
-         "is-extendable": "0.1.1"
-       }
-     },
-+<<<<<<< .our
-     "octicons": {
-       "version": "7.3.0",
-       "resolved": "https://registry.npmjs.org/octicons/-/octicons-7.3.0.tgz",
-@@ -6313,6 +6524,8 @@
-         "object-assign": "4.1.1"
-       }
-     },
-+=======
-+>>>>>>> .their
-     "on-finished": {
-       "version": "2.3.0",
-       "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-@@ -7247,7 +7460,11 @@
-     "regex-cache": {
-       "version": "0.4.4",
-       "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-db3FiioUls7EihKDW8VMjVYjNt0=",
-+=======
-+      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "is-equal-shallow": "0.1.3"
-@@ -8064,7 +8281,11 @@
-     "rimraf": {
-       "version": "2.6.2",
-       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-LtgVDSShbqhlHm1u8PR8QVjOejY=",
-+=======
-+      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "glob": "7.1.2"
-@@ -8073,7 +8294,11 @@
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "fs.realpath": "1.0.0",
-@@ -8126,7 +8351,11 @@
-     "sax": {
-       "version": "1.2.4",
-       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-KBYjTiN4vdxOU1T6tcqold9xANk=",
-+=======
-+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-+>>>>>>> .their
-       "dev": true,
-       "optional": true
-     },
-@@ -8187,15 +8416,22 @@
-       }
-     },
-     "serve": {
-+<<<<<<< .our
-       "version": "6.5.8",
-       "resolved": "https://registry.npmjs.org/serve/-/serve-6.5.8.tgz",
-       "integrity": "sha512-GZYlJz7f6E7Xq6xbg1rTSvQQV9x4v/yYB/sum6egzSBLa/mdk1PViDSX2JvL0Me83sxu3JpEpQELfakDKbGcrw==",
-+=======
-+      "version": "6.5.6",
-+      "resolved": "https://registry.npmjs.org/serve/-/serve-6.5.6.tgz",
-+      "integrity": "sha512-rdbHRzBh94UdZPktcoNjWEUqY0ILanZ8Q+VwNfhw5n93pkCPn86wH8x+hXgRi8II9+xj3DvGMWL/6hGUQyfuXg==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "args": "4.0.0",
-         "basic-auth": "2.0.0",
-         "bluebird": "3.5.1",
-         "boxen": "1.3.0",
-+<<<<<<< .our
-         "chalk": "2.4.1",
-         "clipboardy": "1.2.3",
-         "dargs": "5.1.0",
-@@ -8205,6 +8441,17 @@
-         "handlebars": "4.0.11",
-         "ip": "1.1.5",
-         "micro": "9.3.1",
-+=======
-+        "chalk": "2.4.0",
-+        "clipboardy": "1.2.3",
-+        "dargs": "5.1.0",
-+        "detect-port": "1.2.2",
-+        "filesize": "3.6.1",
-+        "fs-extra": "5.0.0",
-+        "handlebars": "4.0.11",
-+        "ip": "1.1.5",
-+        "micro": "9.1.4",
-+>>>>>>> .their
-         "micro-compress": "1.0.0",
-         "mime-types": "2.1.18",
-         "node-version": "1.1.3",
-@@ -8213,7 +8460,11 @@
-         "path-is-inside": "1.0.2",
-         "path-type": "3.0.0",
-         "send": "0.16.2",
-+<<<<<<< .our
-         "update-check": "1.5.1"
-+=======
-+        "update-check": "1.3.2"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "ansi-styles": {
-@@ -8226,9 +8477,15 @@
-           }
-         },
-         "chalk": {
-+<<<<<<< .our
-           "version": "2.4.1",
-           "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
-           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
-+=======
-+          "version": "2.4.0",
-+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz",
-+          "integrity": "sha512-Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "ansi-styles": "3.2.1",
-@@ -8243,14 +8500,24 @@
-           "dev": true
-         },
-         "fs-extra": {
-+<<<<<<< .our
-           "version": "6.0.1",
-           "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz",
-           "integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==",
-+=======
-+          "version": "5.0.0",
-+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz",
-+          "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "graceful-fs": "4.1.11",
-             "jsonfile": "4.0.0",
-+<<<<<<< .our
-             "universalify": "0.1.2"
-+=======
-+            "universalify": "0.1.1"
-+>>>>>>> .their
-           }
-         },
-         "has-flag": {
-@@ -8373,7 +8640,11 @@
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "fs.realpath": "1.0.0",
-@@ -8475,7 +8746,11 @@
-     "split": {
-       "version": "1.0.1",
-       "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-YFvZvjA6pZ+zX5Ip++oN3snqB9k=",
-+=======
-+      "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "through": "2.3.8"
-@@ -8484,7 +8759,11 @@
-     "split2": {
-       "version": "2.2.0",
-       "resolved": "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-GGsldbz4PoW30YRldWI47k7kJJM=",
-+=======
-+      "integrity": "sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "through2": "2.0.3"
-@@ -8552,7 +8831,11 @@
-     "standard-markdown": {
-       "version": "4.0.2",
-       "resolved": "https://registry.npmjs.org/standard-markdown/-/standard-markdown-4.0.2.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-NaC1bLtX5JzuLXQ9ocmERMNK1Lg=",
-+=======
-+      "integrity": "sha512-h+WTmoGN0qmse8I1VX8VD6V5JeVLXZOPQltvxQP9FfSpSl6RmKYMLTUQ2j/QhdmsdxQKDqulZF/Bf8oEnttIQA==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "async": "2.6.0",
-@@ -8611,7 +8894,11 @@
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "fs.realpath": "1.0.0",
-@@ -9055,7 +9342,11 @@
-         "string-width": {
-           "version": "2.1.1",
-           "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
-+=======
-+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "is-fullwidth-code-point": "2.0.0",
-@@ -9207,7 +9498,11 @@
-     "text-extensions": {
-       "version": "1.7.0",
-       "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.7.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-+qq6JiXtdG1WiiPk0KrNm/CKizk=",
-+=======
-+      "integrity": "sha512-AKXZeDq230UaSzaO5s3qQUZOaC7iKbzq0jOFL614R7d9R593HLqAOL0cYoqLdkNrjBSOdmoQI06yigq1TSBXAg==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "text-table": {
-@@ -9409,7 +9704,11 @@
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "fs.realpath": "1.0.0",
-@@ -9744,9 +10043,15 @@
-       }
-     },
-     "universalify": {
-+<<<<<<< .our
-       "version": "0.1.2",
-       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-       "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-+=======
-+      "version": "0.1.1",
-+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz",
-+      "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "unpipe": {
-@@ -9771,9 +10076,15 @@
-       "dev": true
-     },
-     "update-check": {
-+<<<<<<< .our
-       "version": "1.5.1",
-       "resolved": "https://registry.npmjs.org/update-check/-/update-check-1.5.1.tgz",
-       "integrity": "sha512-M3rjq5KwSrWZrm2GVPIQIF+NXpIn5I9mIV67gGoydptQvzRjLp9ZbM6ctFJeNuaWSm5+mNP7aInELjSiLcIw6A==",
-+=======
-+      "version": "1.3.2",
-+      "resolved": "https://registry.npmjs.org/update-check/-/update-check-1.3.2.tgz",
-+      "integrity": "sha512-0iGt63gXrsU4VTw4tIGVVk14H6KLHI7ExNPuSmdDdwUrUAQTBnh1hQcRpnoBWetb3/Ab4YyXK1iDWXP7D0VHTQ==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "registry-auth-token": "3.3.2",
-@@ -10002,7 +10313,11 @@
-     "walk-sync": {
-       "version": "0.3.2",
-       "resolved": "https://registry.npmjs.org/walk-sync/-/walk-sync-0.3.2.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-SCcoCvxC0OA1NnxKTjHurA0Tb3U=",
-+=======
-+      "integrity": "sha512-FMB5VqpLqOCcqrzA9okZFc0wq0Qbmdm396qJxvQZhDpyu0W95G9JCmp74tx7iyYnyOcBtUuKJsgIKAqjozvmmQ==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "ensure-posix-path": "1.0.2",
-@@ -10029,7 +10344,11 @@
-     "which": {
-       "version": "1.3.0",
-       "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-/wS9/AEO5UfXgL7DjhrBwnd9JTo=",
-+=======
-+      "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "isexe": "2.0.0"
-@@ -10142,7 +10461,11 @@
-     "write-file-atomic": {
-       "version": "2.3.0",
-       "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-H/YVdcLipOjlENb6TiQ8zhg5mas=",
-+=======
-+      "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "graceful-fs": "4.1.11",
-added in both
-  our    100644 c081cd89450cd50efba1ec280ff1349a96ea3ce0 package.json
-  their  100644 76ec83ce2fab14c29f975bef623d45febcb4166e package.json
-@@ -1,6 +1,10 @@
- {
-   "name": "electron",
-+<<<<<<< .our
-   "version": "4.0.0-nightly.20180821",
-+=======
-+  "version": "3.0.0-beta.7",
-+>>>>>>> .their
-   "repository": "https://github.com/electron/electron",
-   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
-   "devDependencies": {
-@@ -13,7 +17,11 @@
-     "dugite": "^1.45.0",
-     "electabul": "~0.0.4",
-     "electron-docs-linter": "^2.3.4",
-+<<<<<<< .our
-     "electron-typescript-definitions": "^1.3.6",
-+=======
-+    "electron-typescript-definitions": "^1.3.5",
-+>>>>>>> .their
-     "github": "^9.2.0",
-     "html-entities": "^1.2.1",
-     "husky": "^0.14.3",
-@@ -21,12 +29,19 @@
-     "minimist": "^1.2.0",
-     "node-fetch": "^2.1.2",
-     "nugget": "^2.0.1",
-+<<<<<<< .our
-     "octicons": "^7.3.0",
-+=======
-+>>>>>>> .their
-     "remark-cli": "^4.0.0",
-     "remark-preset-lint-markdown-style-guide": "^2.1.1",
-     "request": "^2.68.0",
-     "semver": "^5.5.0",
-+<<<<<<< .our
-     "serve": "^6.5.8",
-+=======
-+    "serve": "^6.5.3",
-+>>>>>>> .their
-     "standard": "^10.0.0",
-     "standard-markdown": "^4.0.0",
-     "sumchecker": "^2.0.2",
-@@ -45,6 +60,7 @@
-   "private": true,
-   "scripts": {
-     "asar": "asar",
-+<<<<<<< .our
-     "bootstrap:dev": "python ./script/bootstrap.py -d -v",
-     "bootstrap": "python ./script/bootstrap.py -v",
-     "browserify": "browserify",
-@@ -54,6 +70,13 @@
-     "build:release": "python ./script/build.py -c R",
-     "rebuild-test-modules": "python ./script/rebuild-test-modules.py",
-     "check-tls": "python ./script/tls.py",
-+=======
-+    "bootstrap": "python ./script/bootstrap.py",
-+    "browserify": "browserify",
-+    "bump-version": "./script/bump-version.py",
-+    "build": "python ./script/build.py -c D",
-+    "rebuild-test-modules": "python ./script/rebuild-test-modules.py",
-+>>>>>>> .their
-     "clean": "python ./script/clean.py",
-     "clean-build": "python ./script/clean.py --build",
-     "clang-format": "find atom/ brightray/ chromium_src/ -iname *.h -o -iname *.cc -o -iname *.mm | xargs clang-format -i",
-added in both
-  our    100755 4a6c0c7ce8f275175e48c4c380ff33627f7a5961 script/create-dist.py
-  their  100755 ae5ce3707c38e61716f96cf5e7627cc909597fb8 script/create-dist.py
-@@ -11,6 +11,7 @@
- if sys.platform == "win32":
-   import _winreg
- 
-+<<<<<<< .our
- from lib.config import BASE_URL, PLATFORM, build_env, \
-                        enable_verbose_mode, get_target_arch, get_zip_name
- 
-@@ -18,6 +19,12 @@
-                      execute, get_electron_version, make_zip, \
-                      parse_version, rm_rf, scoped_cwd
- 
-+=======
-+from lib.config import BASE_URL, PLATFORM, enable_verbose_mode, \
-+                       get_target_arch, get_zip_name, build_env
-+from lib.util import scoped_cwd, rm_rf, get_electron_version, make_zip, \
-+                     execute, electron_gyp, electron_features, parse_version
-+>>>>>>> .their
- from lib.env_util import get_vs_location
- 
- 
-@@ -147,7 +154,11 @@
- 
-   # Copy file and keep the executable bit.
-   shutil.copyfile(src, dest)
-+<<<<<<< .our
-   add_exec_bit(dest)
-+=======
-+  os.chmod(dest, os.stat(dest).st_mode | stat.S_IEXEC)
-+>>>>>>> .their
- 
- def copy_vcruntime_binaries():
-   arch = get_target_arch()
-@@ -302,7 +313,11 @@
-     dest = os.path.join(DIST_DIR, binary)
-     # Copy file and keep the executable bit.
-     shutil.copyfile(src, dest)
-+<<<<<<< .our
-     add_exec_bit(dest)
-+=======
-+    os.chmod(dest, os.stat(dest).st_mode | stat.S_IEXEC)
-+>>>>>>> .their
- 
-     dist_name = get_zip_name(binary, version)
-     zip_file = os.path.join(SOURCE_ROOT, 'dist', dist_name)
-added in both
-  our    100644 d479d5a9556534c5d98ae1fdc97397cdd14376f5 script/lib/util.py
-  their  100644 617b576b88402a98233dda952a262176221bdc54 script/lib/util.py
-@@ -8,7 +8,10 @@
- import re
- import shutil
- import ssl
-+<<<<<<< .our
- import stat
-+=======
-+>>>>>>> .their
- import subprocess
- import sys
- import tarfile
-@@ -84,7 +87,10 @@
-     if hasattr(ssl, '_create_unverified_context'):
-       ssl._create_default_https_context = ssl._create_unverified_context
- 
-+<<<<<<< .our
-     print "Downloading %s to %s" % (url, path)
-+=======
-+>>>>>>> .their
-     web_file = urllib2.urlopen(url)
-     file_size = int(web_file.info().getheaders("Content-Length")[0])
-     downloaded_size = 0
-@@ -297,9 +303,12 @@
-     else:
-       execute_stdout(args, env)
- 
-+<<<<<<< .our
- def add_exec_bit(filename):
-   os.chmod(filename, os.stat(filename).st_mode | stat.S_IEXEC)
- 
-+=======
-+>>>>>>> .their
- def clean_parse_version(v):
-   return parse_version(v.split("-")[0])        
- 
-@@ -347,7 +356,11 @@
-     return make_version(pv[0] , pv[1],  pv[2], 'beta.1')
- 
-   lv = parse_version(tag_list[-1])
-+<<<<<<< .our
-   return make_version(pv[0] , pv[1],  pv[2], 'beta.' + str(int(lv[3]) + 1))
-+=======
-+  return make_version(pv[0], pv[1], pv[2], 'beta.' + str(int(lv[3]) + 1))
-+>>>>>>> .their
- 
- def get_next_stable_from_pre(v):
-   pv = clean_parse_version(v)
-added in both
-  our    100755 72a28b719bf1ff7770692caef86c76746c4d8edf script/prepare-release.js
-  their  100755 30b0a0e54967ef967c8e2bb1abc0f72b24b11ace script/prepare-release.js
-@@ -141,6 +141,10 @@
- }
- 
- async function createRelease (branchToTarget, isBeta) {
-+<<<<<<< .our
-+=======
-+  console.log('creating release for', branchToTarget, `isBeta=${isBeta}`)
-+>>>>>>> .their
-   let releaseNotes = await getReleaseNotes(branchToTarget)
-   let newVersion = await getNewVersion()
-   await tagRelease(newVersion)
-@@ -182,6 +186,10 @@
-   }
-   githubOpts.tag_name = newVersion
-   githubOpts.target_commitish = newVersion.indexOf('nightly') !== -1 ? 'master' : branchToTarget
-+<<<<<<< .our
-+=======
-+  console.log('creating release with github opts', githubOpts)
-+>>>>>>> .their
-   await github.repos.createRelease(githubOpts)
-     .catch(err => {
-       console.log(`${fail} Error creating new release: `, err)
-added in both
-  our    100755 0bc9d0f632057f4a17aa811340ba21631433f173 script/update-external-binaries.py
-  their  100755 e67ac996e2605be675a0431db7fb61fd28a1445c script/update-external-binaries.py
-@@ -4,11 +4,19 @@
- import sys
- import os
- 
-+<<<<<<< .our
- from lib.config import PLATFORM, get_target_arch
- from lib.util import add_exec_bit, download, extract_zip, rm_rf, \
-                      safe_mkdir, tempdir
- 
- VERSION = 'v1.4.0'
-+=======
-+from lib.config import get_target_arch
-+from lib.util import safe_mkdir, rm_rf, extract_zip, tempdir, download
-+
-+
-+VERSION = 'v1.3.0'
-+>>>>>>> .their
- SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
- FRAMEWORKS_URL = 'http://github.com/electron/electron-frameworks/releases' \
-                  '/download/' + VERSION
-@@ -31,6 +39,7 @@
-   elif sys.platform in ['cygwin', 'win32']:
-     download_and_unzip('directxsdk-' + get_target_arch())
- 
-+<<<<<<< .our
-   # get sccache & set exec bit. https://bugs.python.org/issue15795
-   download_and_unzip('sccache-{0}-x64'.format(PLATFORM))
-   appname = 'sccache'
-@@ -38,6 +47,8 @@
-     appname += '.exe'
-   add_exec_bit(os.path.join('external_binaries', appname))
- 
-+=======
-+>>>>>>> .their
-   with open(version_file, 'w') as f:
-     f.write(VERSION)
- 
-added in both
-  our    100755 5fe196270e64f8d9b5f16483a10425382135cc2e script/verify-ffmpeg.py
-  their  100755 1d78515a4ade0f9f283e9064ad08e3637affb003 script/verify-ffmpeg.py
-@@ -1,5 +1,9 @@
- #!/usr/bin/env python
-+<<<<<<< .our
- import argparse
-+=======
-+
-+>>>>>>> .their
- import os
- import shutil
- import subprocess
-@@ -17,10 +21,21 @@
- 
- 
- def main():
-+<<<<<<< .our
-   args = parse_args()
-   os.chdir(args.source_root)
- 
-   app_path = create_app_copy(args)
-+=======
-+  os.chdir(SOURCE_ROOT)
-+
-+  if len(sys.argv) == 2 and sys.argv[1] == '-R':
-+    config = 'R'
-+  else:
-+    config = 'D'
-+
-+  app_path = create_app_copy(config)
-+>>>>>>> .their
- 
-   if sys.platform == 'darwin':
-     electron = os.path.join(app_path, 'Contents', 'MacOS', PRODUCT_NAME)
-@@ -38,12 +53,20 @@
-     ffmpeg_name = 'libffmpeg.so'
- 
-   # Copy ffmpeg without proprietary codecs into app
-+<<<<<<< .our
-   shutil.copy(os.path.join(args.ffmpeg_path, ffmpeg_name), ffmpeg_app_path)
- 
-   returncode = 0
-   try:
-     test_path = os.path.join(SOURCE_ROOT, 'spec', 'fixtures',
-         'no-proprietary-codecs.js')
-+=======
-+  shutil.copy(os.path.join(FFMPEG_LIBCC_PATH, ffmpeg_name), ffmpeg_app_path)
-+
-+  returncode = 0
-+  try:
-+    test_path = os.path.join('spec', 'fixtures', 'no-proprietary-codecs.js')
-+>>>>>>> .their
-     subprocess.check_call([electron, test_path] + sys.argv[1:])
-   except subprocess.CalledProcessError as e:
-     returncode = e.returncode
-@@ -54,10 +77,16 @@
- 
- 
- # Create copy of app to install ffmpeg library without proprietary codecs into
-+<<<<<<< .our
- def create_app_copy(args):
-   initial_app_path = os.path.join(args.source_root, 'out', args.config)
-   app_path = os.path.join(args.source_root, 'out',
-     args.config + '-no-proprietary-codecs')
-+=======
-+def create_app_copy(config):
-+  initial_app_path = os.path.join(SOURCE_ROOT, 'out', config)
-+  app_path = os.path.join(SOURCE_ROOT, 'out', config + '-no-proprietary-codecs')
-+>>>>>>> .their
- 
-   if sys.platform == 'darwin':
-     app_name = '{0}.app'.format(PRODUCT_NAME)
-@@ -68,6 +97,7 @@
-   shutil.copytree(initial_app_path, app_path, symlinks=True)
-   return app_path
- 
-+<<<<<<< .our
- def parse_args():
-   parser = argparse.ArgumentParser(description='Test non-proprietary ffmpeg')
-   parser.add_argument('-c', '--config',
-@@ -81,6 +111,8 @@
-                       default=FFMPEG_LIBCC_PATH,
-                       required=False)
-   return parser.parse_args()
-+=======
-+>>>>>>> .their
- 
- if __name__ == '__main__':
-   sys.exit(main())
-added in both
-  our    100644 d224eda2989332c18d655cef05a8bacc2eb6d4b8 spec/api-app-spec.js
-  their  100644 37c5520a1d27d6988eb30267b7a8ca6ae83d2b20 spec/api-app-spec.js
-@@ -168,9 +168,14 @@
-       const electronPath = remote.getGlobal('process').execPath
- 
-       appProcess = ChildProcess.spawn(electronPath, [appPath])
-+<<<<<<< .our
-       appProcess.on('close', (code, signal) => {
-         expect(signal).to.equal(null, 'exit signal should be null, if you see this please tag @MarshallOfSound')
-         expect(code).to.equal(123, 'exit code should be 123, if you see this please tag @MarshallOfSound')
-+=======
-+      appProcess.on('close', code => {
-+        expect(code).to.equal(123)
-+>>>>>>> .their
-         done()
-       })
-     })
-@@ -796,7 +801,12 @@
-     })
-   })
- 
-+<<<<<<< .our
-   describe('getAppMetrics() API', () => {
-+=======
-+  // TODO(marshallofsound): [Ch66] Failed on Windows x64 + ia32 on CI, passes locally
-+  xdescribe('getAppMetrics() API', () => {
-+>>>>>>> .their
-     it('returns memory and cpu stats of all running electron processes', () => {
-       const appMetrics = app.getAppMetrics()
-       expect(appMetrics).to.be.an('array').and.have.lengthOf.at.least(1, 'App memory info object is not > 0')
-@@ -804,6 +814,7 @@
-       const types = []
-       for (const {memory, pid, type, cpu} of appMetrics) {
-         expect(memory.workingSetSize).to.be.above(0, 'working set size is not > 0')
-+<<<<<<< .our
- 
-         // windows causes failures here due to CI server configuration
-         if (process.platform !== 'win32') {
-@@ -811,6 +822,10 @@
-           expect(memory.sharedBytes).to.be.above(0, 'shared bytes is not > 0')
-         }
- 
-+=======
-+        expect(memory.privateBytes).to.be.above(0, 'private bytes is not > 0')
-+        expect(memory.sharedBytes).to.be.above(0, 'shared bytes is not > 0')
-+>>>>>>> .their
-         expect(pid).to.be.above(0, 'pid is not > 0')
-         expect(type).to.be.a('string').that.is.not.empty()
- 
-added in both
-  our    100644 f4cba12ec19d224bc46fca898db42a99baf4972e spec/api-browser-window-spec.js
-  their  100644 8349bbd4d5b1b19ce52c7cc519cfe757d7c09e3f spec/api-browser-window-spec.js
-@@ -1,8 +1,12 @@
- 'use strict'
- 
- const assert = require('assert')
-+<<<<<<< .our
- const chai = require('chai')
- const dirtyChai = require('dirty-chai')
-+=======
-+const {expect} = require('chai')
-+>>>>>>> .their
- const fs = require('fs')
- const path = require('path')
- const os = require('os')
-@@ -14,12 +18,19 @@
- const {app, ipcMain, BrowserWindow, BrowserView, protocol, session, webContents} = remote
- 
- const features = process.atomBinding('features')
-+<<<<<<< .our
- const {expect} = chai
- const isCI = remote.getGlobal('isCi')
- const nativeModulesEnabled = remote.getGlobal('nativeModulesEnabled')
- 
- chai.use(dirtyChai)
- 
-+=======
-+
-+const isCI = remote.getGlobal('isCi')
-+const nativeModulesEnabled = remote.getGlobal('nativeModulesEnabled')
-+
-+>>>>>>> .their
- describe('BrowserWindow module', () => {
-   const fixtures = path.resolve(__dirname, 'fixtures')
-   let w = null
-@@ -27,6 +38,7 @@
-   let server
-   let postData
- 
-+<<<<<<< .our
-   const defaultOptions = {
-     show: false,
-     width: 400,
-@@ -45,6 +57,8 @@
-     return w
-   }
- 
-+=======
-+>>>>>>> .their
-   const closeTheWindow = function () {
-     return closeWindow(w).then(() => { w = null })
-   }
-@@ -99,13 +113,32 @@
-     server = null
-   })
- 
-+<<<<<<< .our
-   beforeEach(openTheWindow)
-+=======
-+  beforeEach(() => {
-+    w = new BrowserWindow({
-+      show: false,
-+      width: 400,
-+      height: 400,
-+      webPreferences: {
-+        backgroundThrottling: false
-+      }
-+    })
-+  })
-+>>>>>>> .their
- 
-   afterEach(closeTheWindow)
- 
-   describe('BrowserWindow constructor', () => {
-     it('allows passing void 0 as the webContents', () => {
-+<<<<<<< .our
-       openTheWindow({
-+=======
-+      w.close()
-+      w = null
-+      w = new BrowserWindow({
-+>>>>>>> .their
-         webContents: void 0
-       })
-     })
-@@ -217,7 +250,11 @@
-       const contents = w.webContents
-       w.destroy()
-       assert.throws(() => {
-+<<<<<<< .our
-         contents.getProcessId()
-+=======
-+        contents.getId()
-+>>>>>>> .their
-       }, /Object has been destroyed/)
-     })
-   })
-@@ -422,6 +459,7 @@
-   })
- 
-   describe('BrowserWindow.capturePage(rect, callback)', () => {
-+<<<<<<< .our
-     it('calls the callback with a Buffer', async () => {
-       const image = await new Promise((resolve) => {
-         w.capturePage({
-@@ -452,10 +490,46 @@
-       // Check the 25th byte in the PNG.
-       // Values can be 0,2,3,4, or 6. We want 6, which is RGB + Alpha
-       expect(imgBuffer[25]).to.equal(6)
-+=======
-+    it('calls the callback with a Buffer', (done) => {
-+      w.capturePage({
-+        x: 0,
-+        y: 0,
-+        width: 100,
-+        height: 100
-+      }, (image) => {
-+        assert.equal(image.isEmpty(), true)
-+        done()
-+      })
-+    })
-+
-+    it('preserves transparency', (done) => {
-+      w.close()
-+      const width = 400
-+      const height = 400
-+      w = new BrowserWindow({
-+        show: false,
-+        width: width,
-+        height: height,
-+        transparent: true
-+      })
-+      w.loadURL('data:text/html,<html><body background-color: rgba(255,255,255,0)></body></html>')
-+      w.once('ready-to-show', () => {
-+        w.show()
-+        w.capturePage((image) => {
-+          let imgBuffer = image.toPNG()
-+          // Check 25th byte in the PNG
-+          // Values can be 0,2,3,4, or 6. We want 6, which is RGB + Alpha
-+          assert.equal(imgBuffer[25], 6)
-+          done()
-+        })
-+      })
-+>>>>>>> .their
-     })
-   })
- 
-   describe('BrowserWindow.setSize(width, height)', () => {
-+<<<<<<< .our
-     it('sets the window size', async () => {
-       const size = [300, 400]
- 
-@@ -464,6 +538,15 @@
-       await resized
- 
-       assertBoundsEqual(w.getSize(), size)
-+=======
-+    it('sets the window size', (done) => {
-+      const size = [300, 400]
-+      w.once('resize', () => {
-+        assertBoundsEqual(w.getSize(), size)
-+        done()
-+      })
-+      w.setSize(size[0], size[1])
-+>>>>>>> .their
-     })
-   })
- 
-@@ -765,6 +848,7 @@
-     })
-   })
- 
-+<<<<<<< .our
-   describe('BrowserWindow.setWindowButtonVisibility()', () => {
-     before(function () {
-       if (process.platform !== 'darwin') {
-@@ -792,6 +876,8 @@
-     })
-   })
- 
-+=======
-+>>>>>>> .their
-   describe('BrowserWindow.setVibrancy(type)', () => {
-     it('allows setting, changing, and removing the vibrancy', () => {
-       assert.doesNotThrow(() => {
-@@ -928,6 +1014,7 @@
-     })
-   })
- 
-+<<<<<<< .our
-   describe('BrowserWindow.setShape(rects)', () => {
-     it('allows setting shape', () => {
-       assert.doesNotThrow(() => {
-@@ -939,6 +1026,8 @@
-     })
-   })
- 
-+=======
-+>>>>>>> .their
-   describe('"useContentSize" option', () => {
-     it('make window created with content size when used', () => {
-       w.destroy()
-@@ -1617,6 +1706,7 @@
- 
-       it('validates process APIs access in sandboxed renderer', (done) => {
-         ipcMain.once('answer', function (event, test) {
-+<<<<<<< .our
-           assert.equal(test.pid, w.webContents.getOSProcessId())
-           assert.equal(test.arch, remote.process.arch)
-           assert.equal(test.platform, remote.process.platform)
-@@ -1627,6 +1717,11 @@
-           assert.equal(test.type, 'renderer')
-           assert.equal(test.version, remote.process.version)
-           assert.deepEqual(test.versions, remote.process.versions)
-+=======
-+          assert.equal(test.platform, remote.process.platform)
-+          assert.deepEqual(test.env, remote.process.env)
-+          assert.equal(test.execPath, remote.process.helperExecPath)
-+>>>>>>> .their
-           done()
-         })
-         remote.process.env.sandboxmain = 'foo'
-added in both
-  our    100644 fb3ee998eace4401d6f129930d802677ce5feb85 spec/api-menu-item-spec.js
-  their  100644 9bbb2e38da2cecb068528ded21307b387da337f1 spec/api-menu-item-spec.js
-@@ -1,11 +1,16 @@
-+<<<<<<< .our
- const chai = require('chai')
- const dirtyChai = require('dirty-chai')
-+=======
-+const assert = require('assert')
-+>>>>>>> .their
- 
- const {remote} = require('electron')
- const {BrowserWindow, app, Menu, MenuItem} = remote
- const roles = require('../lib/browser/api/menu-item-roles')
- const {closeWindow} = require('./window-helpers')
- 
-+<<<<<<< .our
- const {expect} = chai
- chai.use(dirtyChai)
- 
-@@ -17,6 +22,16 @@
-         click: (item) => {
-           expect(item.constructor.name).to.equal('MenuItem')
-           expect(item.label).to.equal('text')
-+=======
-+describe('MenuItems', () => {
-+  describe('MenuItem.click', () => {
-+    it('should be called with the item object passed', (done) => {
-+      const menu = Menu.buildFromTemplate([{
-+        label: 'text',
-+        click: (item) => {
-+          assert.equal(item.constructor.name, 'MenuItem')
-+          assert.equal(item.label, 'text')
-+>>>>>>> .their
-           done()
-         }
-       }])
-@@ -31,9 +46,15 @@
-         type: 'checkbox'
-       }])
- 
-+<<<<<<< .our
-       expect(menu.items[0].checked).to.be.false()
-       menu.delegate.executeCommand(menu, {}, menu.items[0].commandId)
-       expect(menu.items[0].checked).to.be.true()
-+=======
-+      assert.equal(menu.items[0].checked, false)
-+      menu.delegate.executeCommand(menu, {}, menu.items[0].commandId)
-+      assert.equal(menu.items[0].checked, true)
-+>>>>>>> .their
-     })
- 
-     it('clicking an radio item should always make checked property true', () => {
-@@ -43,9 +64,15 @@
-       }])
- 
-       menu.delegate.executeCommand(menu, {}, menu.items[0].commandId)
-+<<<<<<< .our
-       expect(menu.items[0].checked).to.be.true()
-       menu.delegate.executeCommand(menu, {}, menu.items[0].commandId)
-       expect(menu.items[0].checked).to.be.true()
-+=======
-+      assert.equal(menu.items[0].checked, true)
-+      menu.delegate.executeCommand(menu, {}, menu.items[0].commandId)
-+      assert.equal(menu.items[0].checked, true)
-+>>>>>>> .their
-     })
- 
-     describe('MenuItem group properties', () => {
-@@ -100,7 +127,11 @@
-         const groups = findRadioGroups(template)
- 
-         groups.forEach(g => {
-+<<<<<<< .our
-           expect(findChecked(menu.items, g.begin, g.end)).to.deep.equal([g.begin])
-+=======
-+          assert.deepEqual(findChecked(menu.items, g.begin, g.end), [g.begin])
-+>>>>>>> .their
-         })
-       })
- 
-@@ -113,12 +144,20 @@
-           const groupId = menu.items[g.begin].groupId
- 
-           // groupId should be previously unused
-+<<<<<<< .our
-           expect(usedGroupIds.has(groupId)).to.be.false()
-+=======
-+          assert(!usedGroupIds.has(groupId))
-+>>>>>>> .their
-           usedGroupIds.add(groupId)
- 
-           // everything in the group should have the same id
-           for (let i = g.begin; i < g.end; ++i) {
-+<<<<<<< .our
-             expect(menu.items[i].groupId).to.equal(groupId)
-+=======
-+            assert.equal(menu.items[i].groupId, groupId)
-+>>>>>>> .their
-           }
-         })
-       })
-@@ -128,6 +167,7 @@
- 
-         const groups = findRadioGroups(template)
-         groups.forEach(g => {
-+<<<<<<< .our
-           expect(findChecked(menu.items, g.begin, g.end)).to.deep.equal([])
- 
-           menu.items[g.begin].checked = true
-@@ -135,6 +175,15 @@
- 
-           menu.items[g.end - 1].checked = true
-           expect(findChecked(menu.items, g.begin, g.end)).to.deep.equal([g.end - 1])
-+=======
-+          assert.deepEqual(findChecked(menu.items, g.begin, g.end), [])
-+
-+          menu.items[g.begin].checked = true
-+          assert.deepEqual(findChecked(menu.items, g.begin, g.end), [g.begin])
-+
-+          menu.items[g.end - 1].checked = true
-+          assert.deepEqual(findChecked(menu.items, g.begin, g.end), [g.end - 1])
-+>>>>>>> .their
-         })
-       })
-     })
-@@ -146,7 +195,11 @@
-       let item = new MenuItem({role: 'asdfghjkl'})
- 
-       const canExecute = roles.execute(item.role, win, win.webContents)
-+<<<<<<< .our
-       expect(canExecute).to.be.false()
-+=======
-+      assert.equal(false, canExecute)
-+>>>>>>> .their
- 
-       closeWindow(win).then(() => { win = null })
-     })
-@@ -156,7 +209,11 @@
-       let item = new MenuItem({role: 'reload'})
- 
-       const canExecute = roles.execute(item.role, win, win.webContents)
-+<<<<<<< .our
-       expect(canExecute).to.be.true()
-+=======
-+      assert.equal(true, canExecute)
-+>>>>>>> .their
- 
-       closeWindow(win).then(() => { win = null })
-     })
-@@ -166,7 +223,11 @@
-       let item = new MenuItem({role: 'resetzoom'})
- 
-       const canExecute = roles.execute(item.role, win, win.webContents)
-+<<<<<<< .our
-       expect(canExecute).to.be.true()
-+=======
-+      assert.equal(true, canExecute)
-+>>>>>>> .their
- 
-       closeWindow(win).then(() => { win = null })
-     })
-@@ -177,31 +238,53 @@
-       const item = new MenuItem({label: 'item'})
- 
-       const commandId = item.commandId
-+<<<<<<< .our
-       expect(commandId).to.not.be.undefined()
-       item.commandId = `${commandId}-modified`
-       expect(item.commandId).to.equal(commandId)
-+=======
-+      assert(commandId)
-+      item.commandId = `${commandId}-modified`
-+      assert.equal(item.commandId, commandId)
-+>>>>>>> .their
-     })
-   })
- 
-   describe('MenuItem with invalid type', () => {
-     it('throws an exception', () => {
-+<<<<<<< .our
-       expect(() => {
-+=======
-+      assert.throws(() => {
-+>>>>>>> .their
-         Menu.buildFromTemplate([{
-           label: 'text',
-           type: 'not-a-type'
-         }])
-+<<<<<<< .our
-       }).to.throw(/Unknown menu item type: not-a-type/)
-+=======
-+      }, /Unknown menu item type: not-a-type/)
-+>>>>>>> .their
-     })
-   })
- 
-   describe('MenuItem with submenu type and missing submenu', () => {
-     it('throws an exception', () => {
-+<<<<<<< .our
-       expect(() => {
-+=======
-+      assert.throws(() => {
-+>>>>>>> .their
-         Menu.buildFromTemplate([{
-           label: 'text',
-           type: 'submenu'
-         }])
-+<<<<<<< .our
-       }).to.throw(/Invalid submenu/)
-+=======
-+      }, /Invalid submenu/)
-+>>>>>>> .their
-     })
-   })
- 
-@@ -231,7 +314,11 @@
- 
-       for (let role in roleList) {
-         const item = new MenuItem({role})
-+<<<<<<< .our
-         expect(item.getDefaultRoleAccelerator()).to.be.undefined()
-+=======
-+        assert.equal(item.getDefaultRoleAccelerator(), undefined)
-+>>>>>>> .their
-       }
-     })
- 
-@@ -260,7 +347,11 @@
- 
-       for (let role in roleList) {
-         const item = new MenuItem({role})
-+<<<<<<< .our
-         expect(item.label).to.equal(roleList[role])
-+=======
-+        assert.equal(item.label, roleList[role])
-+>>>>>>> .their
-       }
-     })
- 
-@@ -289,7 +380,11 @@
- 
-       for (let role in roleList) {
-         const item = new MenuItem({role})
-+<<<<<<< .our
-         expect(item.getDefaultRoleAccelerator()).to.equal(roleList[role])
-+=======
-+        assert.equal(item.getDefaultRoleAccelerator(), roleList[role])
-+>>>>>>> .their
-       }
-     })
- 
-@@ -300,9 +395,15 @@
-         accelerator: 'D'
-       })
- 
-+<<<<<<< .our
-       expect(item.label).to.equal('Custom Close!')
-       expect(item.accelerator).to.equal('D')
-       expect(item.getDefaultRoleAccelerator()).to.equal('CommandOrControl+W')
-+=======
-+      assert.equal(item.label, 'Custom Close!')
-+      assert.equal(item.accelerator, 'D')
-+      assert.equal(item.getDefaultRoleAccelerator(), 'CommandOrControl+W')
-+>>>>>>> .their
-     })
-   })
- 
-@@ -310,6 +411,7 @@
-     it('includes a default submenu layout when submenu is empty', () => {
-       const item = new MenuItem({role: 'editMenu'})
- 
-+<<<<<<< .our
-       expect(item.label).to.equal('Edit')
-       expect(item.submenu.items[0].role).to.equal('undo')
-       expect(item.submenu.items[1].role).to.equal('redo')
-@@ -328,6 +430,26 @@
-         expect(item.submenu.items[6].role).to.equal('delete')
-         expect(item.submenu.items[7].type).to.equal('separator')
-         expect(item.submenu.items[8].role).to.equal('selectall')
-+=======
-+      assert.equal(item.label, 'Edit')
-+      assert.equal(item.submenu.items[0].role, 'undo')
-+      assert.equal(item.submenu.items[1].role, 'redo')
-+      assert.equal(item.submenu.items[2].type, 'separator')
-+      assert.equal(item.submenu.items[3].role, 'cut')
-+      assert.equal(item.submenu.items[4].role, 'copy')
-+      assert.equal(item.submenu.items[5].role, 'paste')
-+
-+      if (process.platform === 'darwin') {
-+        assert.equal(item.submenu.items[6].role, 'pasteandmatchstyle')
-+        assert.equal(item.submenu.items[7].role, 'delete')
-+        assert.equal(item.submenu.items[8].role, 'selectall')
-+      }
-+
-+      if (process.platform === 'win32') {
-+        assert.equal(item.submenu.items[6].role, 'delete')
-+        assert.equal(item.submenu.items[7].type, 'separator')
-+        assert.equal(item.submenu.items[8].role, 'selectall')
-+>>>>>>> .their
-       }
-     })
- 
-@@ -338,8 +460,13 @@
-           role: 'close'
-         }]
-       })
-+<<<<<<< .our
-       expect(item.label).to.equal('Edit')
-       expect(item.submenu.items[0].role).to.equal('close')
-+=======
-+      assert.equal(item.label, 'Edit')
-+      assert.equal(item.submenu.items[0].role, 'close')
-+>>>>>>> .their
-     })
-   })
- 
-@@ -347,6 +474,7 @@
-     it('includes a default submenu layout when submenu is empty', () => {
-       const item = new MenuItem({role: 'windowMenu'})
- 
-+<<<<<<< .our
-       expect(item.label).to.equal('Window')
-       expect(item.submenu.items[0].role).to.equal('minimize')
-       expect(item.submenu.items[1].role).to.equal('close')
-@@ -354,6 +482,15 @@
-       if (process.platform === 'darwin') {
-         expect(item.submenu.items[2].type).to.equal('separator')
-         expect(item.submenu.items[3].role).to.equal('front')
-+=======
-+      assert.equal(item.label, 'Window')
-+      assert.equal(item.submenu.items[0].role, 'minimize')
-+      assert.equal(item.submenu.items[1].role, 'close')
-+
-+      if (process.platform === 'darwin') {
-+        assert.equal(item.submenu.items[2].type, 'separator')
-+        assert.equal(item.submenu.items[3].role, 'front')
-+>>>>>>> .their
-       }
-     })
- 
-@@ -363,8 +500,13 @@
-         submenu: [{role: 'copy'}]
-       })
- 
-+<<<<<<< .our
-       expect(item.label).to.equal('Window')
-       expect(item.submenu.items[0].role).to.equal('copy')
-+=======
-+      assert.equal(item.label, 'Window')
-+      assert.equal(item.submenu.items[0].role, 'copy')
-+>>>>>>> .their
-     })
-   })
- 
-@@ -383,10 +525,17 @@
-         overrideProperty: 'oops not allowed'
-       }))
- 
-+<<<<<<< .our
-       expect(menu.items[0].customProp).to.equal('foo')
-       expect(menu.items[0].submenu.items[0].label).to.equal('item 1')
-       expect(menu.items[0].submenu.items[0].customProp).to.equal('bar')
-       expect(menu.items[0].submenu.items[0].overrideProperty).to.be.a('function')
-+=======
-+      assert.equal(menu.items[0].customProp, 'foo')
-+      assert.equal(menu.items[0].submenu.items[0].label, 'item 1')
-+      assert.equal(menu.items[0].submenu.items[0].customProp, 'bar')
-+      assert.equal(typeof menu.items[0].submenu.items[0].overrideProperty, 'function')
-+>>>>>>> .their
-     })
-   })
- })
-added in both
-  our    100644 ed2749700c6c8bf299f507d52606c1ae3f597e5c spec/api-menu-spec.js
-  their  100644 4a25e3ce4d7c05892374a0e93928e3a33b643174 spec/api-menu-spec.js
-@@ -1,14 +1,21 @@
-+<<<<<<< .our
- const chai = require('chai')
- const dirtyChai = require('dirty-chai')
-+=======
-+const assert = require('assert')
-+>>>>>>> .their
- 
- const {ipcRenderer, remote} = require('electron')
- const {BrowserWindow, Menu, MenuItem} = remote
- const {sortMenuItems} = require('../lib/browser/api/menu-utils')
- const {closeWindow} = require('./window-helpers')
- 
-+<<<<<<< .our
- const {expect} = chai
- chai.use(dirtyChai)
- 
-+=======
-+>>>>>>> .their
- describe('Menu module', () => {
-   describe('Menu.buildFromTemplate', () => {
-     it('should be able to attach extra fields', () => {
-@@ -18,17 +25,29 @@
-           extra: 'field'
-         }
-       ])
-+<<<<<<< .our
-       expect(menu.items[0].extra).to.equal('field')
-+=======
-+      assert.equal(menu.items[0].extra, 'field')
-+>>>>>>> .their
-     })
- 
-     it('does not modify the specified template', () => {
-       const template = [{label: 'text', submenu: [{label: 'sub'}]}]
-       const result = ipcRenderer.sendSync('eval', `const template = [{label: 'text', submenu: [{label: 'sub'}]}]\nrequire('electron').Menu.buildFromTemplate(template)\ntemplate`)
-+<<<<<<< .our
-       expect(result).to.deep.equal(template)
-     })
- 
-     it('does not throw exceptions for undefined/null values', () => {
-       expect(() => {
-+=======
-+      assert.deepStrictEqual(result, template)
-+    })
-+
-+    it('does not throw exceptions for undefined/null values', () => {
-+      assert.doesNotThrow(() => {
-+>>>>>>> .their
-         Menu.buildFromTemplate([
-           {
-             label: 'text',
-@@ -39,6 +58,7 @@
-             accelerator: null
-           }
-         ])
-+<<<<<<< .our
-       }).to.not.throw()
-     })
- 
-@@ -57,6 +77,9 @@
-       expect(() => {
-         Menu.buildFromTemplate([undefined])
-       }).to.throw(/Invalid template for MenuItem: must have at least one of label, role or type/)
-+=======
-+      })
-+>>>>>>> .their
-     })
- 
-     describe('Menu sorting and building', () => {
-@@ -87,7 +110,11 @@
-             }
-           ]
- 
-+<<<<<<< .our
-           expect(sortMenuItems(items)).to.deep.equal(expected)
-+=======
-+          assert.deepEqual(sortMenuItems(items), expected)
-+>>>>>>> .their
-         })
- 
-         it('resolves cycles by ignoring things that conflict', () => {
-@@ -119,7 +146,11 @@
-             }
-           ]
- 
-+<<<<<<< .our
-           expect(sortMenuItems(items)).to.deep.equal(expected)
-+=======
-+          assert.deepEqual(sortMenuItems(items), expected)
-+>>>>>>> .their
-         })
- 
-         it('ignores references to commands that do not exist', () => {
-@@ -149,7 +180,11 @@
-             }
-           ]
- 
-+<<<<<<< .our
-           expect(sortMenuItems(items)).to.deep.equal(expected)
-+=======
-+          assert.deepEqual(sortMenuItems(items), expected)
-+>>>>>>> .their
-         })
- 
-         it('only respects the first matching [before|after]GroupContaining rule in a given group', () => {
-@@ -199,7 +234,11 @@
-             }
-           ]
- 
-+<<<<<<< .our
-           expect(sortMenuItems(items)).to.deep.equal(expected)
-+=======
-+          assert.deepEqual(sortMenuItems(items), expected)
-+>>>>>>> .their
-         })
-       })
- 
-@@ -241,7 +280,11 @@
-             }
-           ]
- 
-+<<<<<<< .our
-           expect(sortMenuItems(items)).to.deep.equal(expected)
-+=======
-+          assert.deepEqual(sortMenuItems(items), expected)
-+>>>>>>> .their
-         })
- 
-         it("moves all items in the moving item's group", () => {
-@@ -289,7 +332,11 @@
-             }
-           ]
- 
-+<<<<<<< .our
-           expect(sortMenuItems(items)).to.deep.equal(expected)
-+=======
-+          assert.deepEqual(sortMenuItems(items), expected)
-+>>>>>>> .their
-         })
- 
-         it("ignores positions relative to commands that don't exist", () => {
-@@ -339,7 +386,11 @@
-             }
-           ]
- 
-+<<<<<<< .our
-           expect(sortMenuItems(items)).to.deep.equal(expected)
-+=======
-+          assert.deepEqual(sortMenuItems(items), expected)
-+>>>>>>> .their
-         })
- 
-         it('can handle recursive group merging', () => {
-@@ -377,7 +428,11 @@
-             }
-           ]
- 
-+<<<<<<< .our
-           expect(sortMenuItems(items)).to.deep.equal(expected)
-+=======
-+          assert.deepEqual(sortMenuItems(items), expected)
-+>>>>>>> .their
-         })
- 
-         it('can merge multiple groups when given a list of before/after commands', () => {
-@@ -415,7 +470,11 @@
-             }
-           ]
- 
-+<<<<<<< .our
-           expect(sortMenuItems(items)).to.deep.equal(expected)
-+=======
-+          assert.deepEqual(sortMenuItems(items), expected)
-+>>>>>>> .their
-         })
- 
-         it('can merge multiple groups based on both before/after commands', () => {
-@@ -455,7 +514,11 @@
-             }
-           ]
- 
-+<<<<<<< .our
-           expect(sortMenuItems(items)).to.deep.equal(expected)
-+=======
-+          assert.deepEqual(sortMenuItems(items), expected)
-+>>>>>>> .their
-         })
-       })
- 
-@@ -474,9 +537,15 @@
-           }
-         ])
- 
-+<<<<<<< .our
-         expect(menu.items[0].label).to.equal('one')
-         expect(menu.items[1].label).to.equal('two')
-         expect(menu.items[2].label).to.equal('three')
-+=======
-+        assert.equal(menu.items[0].label, 'one')
-+        assert.equal(menu.items[1].label, 'two')
-+        assert.equal(menu.items[2].label, 'three')
-+>>>>>>> .their
-       })
- 
-       it('should position after existing item', () => {
-@@ -495,9 +564,15 @@
-           }
-         ])
- 
-+<<<<<<< .our
-         expect(menu.items[0].label).to.equal('one')
-         expect(menu.items[1].label).to.equal('two')
-         expect(menu.items[2].label).to.equal('three')
-+=======
-+        assert.equal(menu.items[0].label, 'one')
-+        assert.equal(menu.items[1].label, 'two')
-+        assert.equal(menu.items[2].label, 'three')
-+>>>>>>> .their
-       })
- 
-       it('should filter excess menu separators', () => {
-@@ -515,10 +590,17 @@
-           }
-         ])
- 
-+<<<<<<< .our
-         expect(menuOne.items).to.have.length(3)
-         expect(menuOne.items[0].label).to.equal('a')
-         expect(menuOne.items[1].label).to.equal('b')
-         expect(menuOne.items[2].label).to.equal('c')
-+=======
-+        assert.equal(menuOne.items.length, 3)
-+        assert.equal(menuOne.items[0].label, 'a')
-+        assert.equal(menuOne.items[1].label, 'b')
-+        assert.equal(menuOne.items[2].label, 'c')
-+>>>>>>> .their
- 
-         const menuTwo = Menu.buildFromTemplate([
-           {
-@@ -538,10 +620,17 @@
-           }
-         ])
- 
-+<<<<<<< .our
-         expect(menuTwo.items).to.have.length(3)
-         expect(menuTwo.items[0].label).to.equal('a')
-         expect(menuTwo.items[1].label).to.equal('b')
-         expect(menuTwo.items[2].label).to.equal('c')
-+=======
-+        assert.equal(menuTwo.items.length, 3)
-+        assert.equal(menuTwo.items[0].label, 'a')
-+        assert.equal(menuTwo.items[1].label, 'b')
-+        assert.equal(menuTwo.items[2].label, 'c')
-+>>>>>>> .their
-       })
- 
-       it('should continue inserting items at next index when no specifier is present', () => {
-@@ -565,11 +654,19 @@
-           }
-         ])
- 
-+<<<<<<< .our
-         expect(menu.items[0].label).to.equal('one')
-         expect(menu.items[1].label).to.equal('two')
-         expect(menu.items[2].label).to.equal('three')
-         expect(menu.items[3].label).to.equal('four')
-         expect(menu.items[4].label).to.equal('five')
-+=======
-+        assert.equal(menu.items[0].label, 'one')
-+        assert.equal(menu.items[1].label, 'two')
-+        assert.equal(menu.items[2].label, 'three')
-+        assert.equal(menu.items[3].label, 'four')
-+        assert.equal(menu.items[4].label, 'five')
-+>>>>>>> .their
-       })
-     })
-   })
-@@ -589,7 +686,11 @@
-         }
-       ])
-       const fsc = menu.getMenuItemById('fullScreen')
-+<<<<<<< .our
-       expect(menu.items[0].submenu.items[0]).to.equal(fsc)
-+=======
-+      assert.equal(menu.items[0].submenu.items[0], fsc)
-+>>>>>>> .their
-     })
-   })
- 
-@@ -604,10 +705,17 @@
-       const item = new MenuItem({ label: 'inserted' })
- 
-       menu.insert(1, item)
-+<<<<<<< .our
-       expect(menu.items[0].label).to.equal('1')
-       expect(menu.items[1].label).to.equal('inserted')
-       expect(menu.items[2].label).to.equal('2')
-       expect(menu.items[3].label).to.equal('3')
-+=======
-+      assert.equal(menu.items[0].label, '1')
-+      assert.equal(menu.items[1].label, 'inserted')
-+      assert.equal(menu.items[2].label, '2')
-+      assert.equal(menu.items[3].label, '3')
-+>>>>>>> .their
-     })
-   })
- 
-@@ -622,10 +730,17 @@
-       const item = new MenuItem({ label: 'inserted' })
-       menu.append(item)
- 
-+<<<<<<< .our
-       expect(menu.items[0].label).to.equal('1')
-       expect(menu.items[1].label).to.equal('2')
-       expect(menu.items[2].label).to.equal('3')
-       expect(menu.items[3].label).to.equal('inserted')
-+=======
-+      assert.equal(menu.items[0].label, '1')
-+      assert.equal(menu.items[1].label, '2')
-+      assert.equal(menu.items[2].label, '3')
-+      assert.equal(menu.items[3].label, 'inserted')
-+>>>>>>> .their
-     })
-   })
- 
-@@ -649,6 +764,7 @@
-     })
- 
-     it('throws an error if options is not an object', () => {
-+<<<<<<< .our
-       expect(() => {
-         menu.popup('this is a string, not an object')
-       }).to.throw(/Options must be an object/)
-@@ -658,6 +774,11 @@
-       expect(() => {
-         menu.popup({})
-       }).to.not.throw()
-+=======
-+      assert.throws(() => {
-+        menu.popup()
-+      }, /Options must be an object/)
-+>>>>>>> .their
-     })
- 
-     it('should emit menu-will-show event', (done) => {
-@@ -674,17 +795,29 @@
-     it('returns immediately', () => {
-       const input = {window: w, x: 100, y: 101}
-       const output = menu.popup(input)
-+<<<<<<< .our
-       expect(output.x).to.equal(input.x)
-       expect(output.y).to.equal(input.y)
-       expect(output.browserWindow).to.equal(input.window)
-+=======
-+      assert.equal(output.x, input.x)
-+      assert.equal(output.y, input.y)
-+      assert.equal(output.browserWindow, input.window)
-+>>>>>>> .their
-     })
- 
-     it('works without a given BrowserWindow and options', () => {
-       const {browserWindow, x, y} = menu.popup({x: 100, y: 101})
- 
-+<<<<<<< .our
-       expect(browserWindow.constructor.name).to.equal('BrowserWindow')
-       expect(x).to.equal(100)
-       expect(y).to.equal(101)
-+=======
-+      assert.equal(browserWindow.constructor.name, 'BrowserWindow')
-+      assert.equal(x, 100)
-+      assert.equal(y, 101)
-+>>>>>>> .their
-     })
- 
-     it('works with a given BrowserWindow, options and callback', (done) => {
-@@ -695,8 +828,13 @@
-         callback: () => done()
-       })
- 
-+<<<<<<< .our
-       expect(x).to.equal(100)
-       expect(y).to.equal(101)
-+=======
-+      assert.equal(x, 100)
-+      assert.equal(y, 101)
-+>>>>>>> .their
-       menu.closePopup()
-     })
- 
-@@ -714,12 +852,20 @@
-       ])
- 
-       Menu.setApplicationMenu(menu)
-+<<<<<<< .our
-       expect(Menu.getApplicationMenu()).to.not.be.null()
-+=======
-+      assert.notEqual(Menu.getApplicationMenu(), null)
-+>>>>>>> .their
-     })
- 
-     it('unsets a menu with null', () => {
-       Menu.setApplicationMenu(null)
-+<<<<<<< .our
-       expect(Menu.getApplicationMenu()).to.be.null()
-+=======
-+      assert.equal(Menu.getApplicationMenu(), null)
-+>>>>>>> .their
-     })
-   })
- })
-added in both
-  our    100644 0546971b716e0d29d1e76d689be0a182c3f4b52d spec/api-native-image-spec.js
-  their  100644 87399921ff14ac2c594bb88a0c4493d4e9575e49 spec/api-native-image-spec.js
-@@ -1,5 +1,6 @@
- 'use strict'
- 
-+<<<<<<< .our
- const chai = require('chai')
- const dirtyChai = require('dirty-chai')
- const {nativeImage} = require('electron')
-@@ -8,6 +9,14 @@
- const {expect} = chai
- chai.use(dirtyChai)
- 
-+=======
-+/* eslint-disable no-unused-expressions */
-+
-+const {expect} = require('chai')
-+const {nativeImage} = require('electron')
-+const path = require('path')
-+
-+>>>>>>> .their
- describe('nativeImage module', () => {
-   const ImageFormat = {
-     PNG: 'png',
-@@ -113,6 +122,7 @@
-       expect(empty.toDataURL()).to.equal('data:image/png;base64,')
-       expect(empty.toDataURL({scaleFactor: 2.0})).to.equal('data:image/png;base64,')
-       expect(empty.getSize()).to.deep.equal({width: 0, height: 0})
-+<<<<<<< .our
-       expect(empty.getBitmap()).to.be.empty()
-       expect(empty.getBitmap({scaleFactor: 2.0})).to.be.empty()
-       expect(empty.toBitmap()).to.be.empty()
-@@ -123,6 +133,18 @@
- 
-       if (process.platform === 'darwin') {
-         expect(empty.getNativeHandle()).to.be.empty()
-+=======
-+      expect(empty.getBitmap()).to.be.empty
-+      expect(empty.getBitmap({scaleFactor: 2.0})).to.be.empty
-+      expect(empty.toBitmap()).to.be.empty
-+      expect(empty.toBitmap({scaleFactor: 2.0})).to.be.empty
-+      expect(empty.toJPEG(100)).to.be.empty
-+      expect(empty.toPNG()).to.be.empty
-+      expect(empty.toPNG({scaleFactor: 2.0})).to.be.empty
-+
-+      if (process.platform === 'darwin') {
-+        expect(empty.getNativeHandle()).to.be.empty
-+>>>>>>> .their
-       }
-     })
-   })
-@@ -137,7 +159,11 @@
- 
-       const imageB = nativeImage.createFromBuffer(imageA.toPNG())
-       expect(imageB.getSize()).to.deep.equal({width: 538, height: 190})
-+<<<<<<< .our
-       expect(imageA.toBitmap().equals(imageB.toBitmap())).to.be.true()
-+=======
-+      expect(imageA.toBitmap().equals(imageB.toBitmap())).to.be.true
-+>>>>>>> .their
- 
-       const imageC = nativeImage.createFromBuffer(imageA.toJPEG(100))
-       expect(imageC.getSize()).to.deep.equal({width: 538, height: 190})
-@@ -216,7 +242,11 @@
-       expect(imageTwo.getSize()).to.deep.equal(
-           {width: imageData.width, height: imageData.height})
- 
-+<<<<<<< .our
-       expect(imageOne.toBitmap().equals(imageTwo.toBitmap())).to.be.true()
-+=======
-+      expect(imageOne.toBitmap().equals(imageTwo.toBitmap())).to.be.true
-+>>>>>>> .their
-     })
- 
-     it('supports a scale factor', () => {
-@@ -251,7 +281,11 @@
-       expect(imageC.getSize()).to.deep.equal(
-           {width: imageData.width, height: imageData.height})
- 
-+<<<<<<< .our
-       expect(imageB.toBitmap().equals(imageC.toBitmap())).to.be.true()
-+=======
-+      expect(imageB.toBitmap().equals(imageC.toBitmap())).to.be.true
-+>>>>>>> .their
-     })
- 
-     it('supports a scale factor', () => {
-@@ -280,23 +314,37 @@
-     })
- 
-     it('loads images from paths relative to the current working directory', () => {
-+<<<<<<< .our
-       const imagePath = path.relative('.', path.join(__dirname, 'fixtures', 'assets', 'logo.png'))
-       const image = nativeImage.createFromPath(imagePath)
-       expect(image.isEmpty()).to.be.false()
-+=======
-+      const imagePath = `.${path.sep}${path.join('spec', 'fixtures', 'assets', 'logo.png')}`
-+      const image = nativeImage.createFromPath(imagePath)
-+      expect(image.isEmpty()).to.be.false
-+>>>>>>> .their
-       expect(image.getSize()).to.deep.equal({width: 538, height: 190})
-     })
- 
-     it('loads images from paths with `.` segments', () => {
-       const imagePath = `${path.join(__dirname, 'fixtures')}${path.sep}.${path.sep}${path.join('assets', 'logo.png')}`
-       const image = nativeImage.createFromPath(imagePath)
-+<<<<<<< .our
-       expect(image.isEmpty()).to.be.false()
-+=======
-+      expect(image.isEmpty()).to.be.false
-+>>>>>>> .their
-       expect(image.getSize()).to.deep.equal({width: 538, height: 190})
-     })
- 
-     it('loads images from paths with `..` segments', () => {
-       const imagePath = `${path.join(__dirname, 'fixtures', 'api')}${path.sep}..${path.sep}${path.join('assets', 'logo.png')}`
-       const image = nativeImage.createFromPath(imagePath)
-+<<<<<<< .our
-       expect(image.isEmpty()).to.be.false()
-+=======
-+      expect(image.isEmpty()).to.be.false
-+>>>>>>> .their
-       expect(image.getSize()).to.deep.equal({width: 538, height: 190})
-     })
- 
-@@ -327,7 +375,11 @@
- 
-       const imagePath = path.join(__dirname, 'fixtures', 'assets', 'icon.ico')
-       const image = nativeImage.createFromPath(imagePath)
-+<<<<<<< .our
-       expect(image.isEmpty()).to.be.false()
-+=======
-+      expect(image.isEmpty()).to.be.false
-+>>>>>>> .their
-       expect(image.getSize()).to.deep.equal({width: 256, height: 256})
-     })
-   })
-@@ -357,7 +409,11 @@
-       }
- 
-       const image = nativeImage.createFromNamedImage('NSActionTemplate')
-+<<<<<<< .our
-       expect(image.isEmpty()).to.be.false()
-+=======
-+      expect(image.isEmpty()).to.be.false
-+>>>>>>> .their
-     })
- 
-     it('returns allows an HSL shift for a valid image on darwin', function () {
-@@ -368,7 +424,11 @@
-       }
- 
-       const image = nativeImage.createFromNamedImage('NSActionTemplate', [0.5, 0.2, 0.8])
-+<<<<<<< .our
-       expect(image.isEmpty()).to.be.false()
-+=======
-+      expect(image.isEmpty()).to.be.false
-+>>>>>>> .their
-     })
-   })
- 
-@@ -427,7 +487,11 @@
-       const cropB = image.crop({width: 25, height: 64, x: 30, y: 40})
-       expect(cropA.getSize()).to.deep.equal({width: 25, height: 64})
-       expect(cropB.getSize()).to.deep.equal({width: 25, height: 64})
-+<<<<<<< .our
-       expect(cropA.toPNG().equals(cropB.toPNG())).to.be.false()
-+=======
-+      expect(cropA.toPNG().equals(cropB.toPNG())).to.be.false
-+>>>>>>> .their
-     })
-   })
- 
-@@ -473,7 +537,11 @@
-         buffer: 'invalid'
-       })
- 
-+<<<<<<< .our
-       expect(image.isEmpty()).to.be.false()
-+=======
-+      expect(image.isEmpty()).to.be.false
-+>>>>>>> .their
-       expect(image.getSize()).to.deep.equal({width: 1, height: 1})
- 
-       expect(image.toDataURL({scaleFactor: 1.0})).to.equal(imageDataOne.dataUrl)
-@@ -508,7 +576,11 @@
-         dataURL: 'invalid'
-       })
- 
-+<<<<<<< .our
-       expect(image.isEmpty()).to.be.false()
-+=======
-+      expect(image.isEmpty()).to.be.false
-+>>>>>>> .their
-       expect(image.getSize()).to.deep.equal({width: 1, height: 1})
- 
-       expect(image.toDataURL({scaleFactor: 1.0})).to.equal(imageDataOne.dataUrl)
-added in both
-  our    100644 fa282244df66e955c97554c240f8e7bb7ca4cbf3 spec/api-net-log-spec.js
-  their  100644 1e9ca66722dc2f5fccc450729ef405d8d2bd8246 spec/api-net-log-spec.js
-@@ -1,5 +1,9 @@
-+<<<<<<< .our
- const chai = require('chai')
- const dirtyChai = require('dirty-chai')
-+=======
-+const assert = require('assert')
-+>>>>>>> .their
- const http = require('http')
- const fs = require('fs')
- const os = require('os')
-@@ -11,15 +15,22 @@
- const dumpFile = path.join(os.tmpdir(), 'net_log.json')
- const dumpFileDynamic = path.join(os.tmpdir(), 'net_log_dynamic.json')
- 
-+<<<<<<< .our
- const {expect} = chai
- chai.use(dirtyChai)
-+=======
-+>>>>>>> .their
- const isCI = remote.getGlobal('isCi')
- 
- describe('netLog module', () => {
-   let server
-   const connections = new Set()
- 
-+<<<<<<< .our
-   before(done => {
-+=======
-+  before((done) => {
-+>>>>>>> .their
-     server = http.createServer()
-     server.listen(0, '127.0.0.1', () => {
-       server.url = `http://127.0.0.1:${server.address().port}`
-@@ -36,7 +47,11 @@
-     })
-   })
- 
-+<<<<<<< .our
-   after(done => {
-+=======
-+  after((done) => {
-+>>>>>>> .their
-     for (const connection of connections) {
-       connection.destroy()
-     }
-@@ -55,6 +70,7 @@
-     }
-   })
- 
-+<<<<<<< .our
-   it('should begin and end logging to file when .startLogging() and .stopLogging() is called', done => {
-     expect(netLog.currentlyLogging).to.be.false()
-     expect(netLog.currentlyLoggingPath).to.equal('')
-@@ -70,11 +86,30 @@
- 
-       expect(path).to.equal(dumpFileDynamic)
-       expect(fs.existsSync(dumpFileDynamic)).to.be.true()
-+=======
-+  it('should begin and end logging to file when .startLogging() and .stopLogging() is called', (done) => {
-+    assert(!netLog.currentlyLogging)
-+    assert.equal(netLog.currentlyLoggingPath, '')
-+
-+    netLog.startLogging(dumpFileDynamic)
-+
-+    assert(netLog.currentlyLogging)
-+    assert.equal(netLog.currentlyLoggingPath, dumpFileDynamic)
-+
-+    netLog.stopLogging((path) => {
-+      assert(!netLog.currentlyLogging)
-+      assert.equal(netLog.currentlyLoggingPath, '')
-+
-+      assert.equal(path, dumpFileDynamic)
-+
-+      assert(fs.existsSync(dumpFileDynamic))
-+>>>>>>> .their
- 
-       done()
-     })
-   })
- 
-+<<<<<<< .our
-   it('should silence when .stopLogging() is called without calling .startLogging()', done => {
-     expect(netLog.currentlyLogging).to.be.false()
-     expect(netLog.currentlyLoggingPath).to.equal('')
-@@ -84,6 +119,17 @@
-       expect(netLog.currentlyLoggingPath).to.equal('')
- 
-       expect(path).to.equal('')
-+=======
-+  it('should silence when .stopLogging() is called without calling .startLogging()', (done) => {
-+    assert(!netLog.currentlyLogging)
-+    assert.equal(netLog.currentlyLoggingPath, '')
-+
-+    netLog.stopLogging((path) => {
-+      assert(!netLog.currentlyLogging)
-+      assert.equal(netLog.currentlyLoggingPath, '')
-+
-+      assert.equal(path, '')
-+>>>>>>> .their
- 
-       done()
-     })
-@@ -91,7 +137,11 @@
- 
-   // The following tests are skipped on Linux CI
- 
-+<<<<<<< .our
-   it('should begin and end logging automatically when --log-net-log is passed', done => {
-+=======
-+  it('should begin and end logging automatically when --log-net-log is passed', (done) => {
-+>>>>>>> .their
-     if (isCI && process.platform === 'linux') {
-       done()
-       return
-@@ -105,12 +155,20 @@
-       })
- 
-     appProcess.once('exit', () => {
-+<<<<<<< .our
-       expect(fs.existsSync(dumpFile)).to.be.true()
-+=======
-+      assert(fs.existsSync(dumpFile))
-+>>>>>>> .their
-       done()
-     })
-   })
- 
-+<<<<<<< .our
-   it('should begin and end logging automtically when --log-net-log is passed, and behave correctly when .startLogging() and .stopLogging() is called', done => {
-+=======
-+  it('should begin and end logging automtically when --log-net-log is passed, and behave correctly when .startLogging() and .stopLogging() is called', (done) => {
-+>>>>>>> .their
-     if (isCI && process.platform === 'linux') {
-       done()
-       return
-@@ -125,18 +183,31 @@
-         }
-       })
- 
-+<<<<<<< .our
-     appProcess.stdout.on('data', data => {
-+=======
-+    appProcess.stdout.on('data', (data) => {
-+>>>>>>> .their
-       console.log(data.toString())
-     })
- 
-     appProcess.once('exit', () => {
-+<<<<<<< .our
-       expect(fs.existsSync(dumpFile)).to.be.true()
-       expect(fs.existsSync(dumpFileDynamic)).to.be.true()
-+=======
-+      assert(fs.existsSync(dumpFile))
-+      assert(fs.existsSync(dumpFileDynamic))
-+>>>>>>> .their
-       done()
-     })
-   })
- 
-+<<<<<<< .our
-   it('should end logging automatically when only .startLogging() is called', done => {
-+=======
-+  it('should end logging automatically when only .startLogging() is called', (done) => {
-+>>>>>>> .their
-     if (isCI && process.platform === 'linux') {
-       done()
-       return
-@@ -151,7 +222,11 @@
-       })
- 
-     appProcess.once('exit', () => {
-+<<<<<<< .our
-       expect(fs.existsSync(dumpFileDynamic)).to.be.true()
-+=======
-+      assert(fs.existsSync(dumpFileDynamic))
-+>>>>>>> .their
-       done()
-     })
-   })
-added in both
-  our    100644 9ab56d88e50ae5891364cb271362e5ec0c0edd26 spec/api-notification-dbus-spec.js
-  their  100644 81c1b68f31d0c9490742d3bd4b4227abaaf72ca3 spec/api-notification-dbus-spec.js
-@@ -6,7 +6,11 @@
- //
- // See https://pypi.python.org/pypi/python-dbusmock to read about dbusmock.
- 
-+<<<<<<< .our
- const {expect} = require('chai')
-+=======
-+const assert = require('assert')
-+>>>>>>> .their
- const dbus = require('dbus-native')
- const Promise = require('bluebird')
- 
-@@ -27,12 +31,20 @@
-   before(async () => {
-     // init app
-     app.setName(appName)
-+<<<<<<< .our
-     app.setDesktopName(`${appName}.desktop`)
-+=======
-+    app.setDesktopName(appName + '.desktop')
-+>>>>>>> .their
-     // init dbus
-     const path = '/org/freedesktop/Notifications'
-     const iface = 'org.freedesktop.DBus.Mock'
-     const bus = dbus.sessionBus()
-+<<<<<<< .our
-     console.log(`session bus: ${process.env.DBUS_SESSION_BUS_ADDRESS}`)
-+=======
-+    console.log('session bus: ' + process.env.DBUS_SESSION_BUS_ADDRESS)
-+>>>>>>> .their
-     const service = bus.getService(serviceName)
-     const getInterface = Promise.promisify(service.getInterface, {context: service})
-     mock = await getInterface(path, iface)
-@@ -48,10 +60,17 @@
-     app.setVersion(realAppVersion)
-   })
- 
-+<<<<<<< .our
-   describe(`Notification module using ${serviceName}`, () => {
-     function onMethodCalled (done) {
-       function cb (name) {
-         console.log(`onMethodCalled: ${name}`)
-+=======
-+  describe('Notification module using ' + serviceName, () => {
-+    function onMethodCalled (done) {
-+      function cb (name) {
-+        console.log('onMethodCalled: ' + name)
-+>>>>>>> .their
-         if (name === 'Notify') {
-           mock.removeListener('MethodCalled', cb)
-           console.log('done')
-@@ -83,7 +102,11 @@
-       }
-     }
- 
-+<<<<<<< .our
-     before(done => {
-+=======
-+    before((done) => {
-+>>>>>>> .their
-       mock.on('MethodCalled', onMethodCalled(done))
-       // lazy load Notification after we listen to MethodCalled mock signal
-       Notification = require('electron').remote.Notification
-@@ -98,6 +121,7 @@
-       n.show()
-     })
- 
-+<<<<<<< .our
-     it(`should call ${serviceName} to show notifications`, async () => {
-       const calls = await getCalls()
-       expect(calls).to.be.an('array').of.lengthOf.at.least(1)
-@@ -108,6 +132,16 @@
- 
-       let args = unmarshalDBusNotifyArgs(lastCall[2])
-       expect(args).to.deep.equal({
-+=======
-+    it('should call ' + serviceName + ' to show notifications', async () => {
-+      const calls = await getCalls()
-+      assert(calls.length >= 1)
-+      let lastCall = calls[calls.length - 1]
-+      let methodName = lastCall[1]
-+      assert.equal(methodName, 'Notify')
-+      let args = unmarshalDBusNotifyArgs(lastCall[2])
-+      assert.deepEqual(args, {
-+>>>>>>> .their
-         app_name: appName,
-         replaces_id: 0,
-         app_icon: '',
-added in both
-  our    100644 ad8f1faea14208d2659c505105c1e70938bba2b9 spec/api-process-spec.js
-  their  100644 1de5e1a19dc7175eac1338b89d0f882a37bd91c0 spec/api-process-spec.js
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- const {expect} = require('chai')
- 
- describe('process module', () => {
-@@ -13,6 +14,16 @@
-       const cpuUsage = process.getCPUUsage()
-       expect(cpuUsage.percentCPUUsage).to.be.a('number')
-       expect(cpuUsage.idleWakeupsPerSecond).to.be.a('number')
-+=======
-+const assert = require('assert')
-+
-+describe('process module', () => {
-+  describe('process.getCPUUsage()', () => {
-+    it('returns a cpu usage object', () => {
-+      const cpuUsage = process.getCPUUsage()
-+      assert.equal(typeof cpuUsage.percentCPUUsage, 'number')
-+      assert.equal(typeof cpuUsage.idleWakeupsPerSecond, 'number')
-+>>>>>>> .their
-     })
-   })
- 
-@@ -25,6 +36,7 @@
- 
-     it('returns an io counters object', () => {
-       const ioCounters = process.getIOCounters()
-+<<<<<<< .our
-       expect(ioCounters.readOperationCount).to.be.a('number')
-       expect(ioCounters.writeOperationCount).to.be.a('number')
-       expect(ioCounters.otherOperationCount).to.be.a('number')
-@@ -49,12 +61,21 @@
-       const systemMemoryInfo = process.getSystemMemoryInfo()
-       expect(systemMemoryInfo.free).to.be.a('number')
-       expect(systemMemoryInfo.total).to.be.a('number')
-+=======
-+      assert.equal(typeof ioCounters.readOperationCount, 'number')
-+      assert.equal(typeof ioCounters.writeOperationCount, 'number')
-+      assert.equal(typeof ioCounters.otherOperationCount, 'number')
-+      assert.equal(typeof ioCounters.readTransferCount, 'number')
-+      assert.equal(typeof ioCounters.writeTransferCount, 'number')
-+      assert.equal(typeof ioCounters.otherTransferCount, 'number')
-+>>>>>>> .their
-     })
-   })
- 
-   describe('process.getHeapStatistics()', () => {
-     it('returns heap statistics object', () => {
-       const heapStats = process.getHeapStatistics()
-+<<<<<<< .our
-       expect(heapStats.totalHeapSize).to.be.a('number')
-       expect(heapStats.totalHeapSizeExecutable).to.be.a('number')
-       expect(heapStats.totalPhysicalSize).to.be.a('number')
-@@ -64,6 +85,17 @@
-       expect(heapStats.mallocedMemory).to.be.a('number')
-       expect(heapStats.peakMallocedMemory).to.be.a('number')
-       expect(heapStats.doesZapGarbage).to.be.a('boolean')
-+=======
-+      assert.equal(typeof heapStats.totalHeapSize, 'number')
-+      assert.equal(typeof heapStats.totalHeapSizeExecutable, 'number')
-+      assert.equal(typeof heapStats.totalPhysicalSize, 'number')
-+      assert.equal(typeof heapStats.totalAvailableSize, 'number')
-+      assert.equal(typeof heapStats.usedHeapSize, 'number')
-+      assert.equal(typeof heapStats.heapSizeLimit, 'number')
-+      assert.equal(typeof heapStats.mallocedMemory, 'number')
-+      assert.equal(typeof heapStats.peakMallocedMemory, 'number')
-+      assert.equal(typeof heapStats.doesZapGarbage, 'boolean')
-+>>>>>>> .their
-     })
-   })
- })
-added in both
-  our    100644 b9093d1d6335ece5ca713a668a67bf3b40f4fabe spec/api-session-spec.js
-  their  100644 7ac14e1f1f88549aa6594e96906cc77906c0accd spec/api-session-spec.js
-@@ -289,17 +289,24 @@
-       res.end(mockPDF)
-       downloadServer.close()
-     })
-+<<<<<<< .our
- 
-     const isPathEqual = (path1, path2) => {
-       return path.relative(path1, path2) === ''
-     }
-+=======
-+>>>>>>> .their
-     const assertDownload = (event, state, url, mimeType,
-                                    receivedBytes, totalBytes, disposition,
-                                    filename, port, savePath, isCustom) => {
-       assert.equal(state, 'completed')
-       assert.equal(filename, 'mock.pdf')
-+<<<<<<< .our
-       assert.ok(path.isAbsolute(savePath))
-       assert.ok(isPathEqual(savePath, path.join(__dirname, 'fixtures', 'mock.pdf')))
-+=======
-+      assert.equal(savePath, path.join(__dirname, 'fixtures', 'mock.pdf'))
-+>>>>>>> .their
-       if (isCustom) {
-         assert.equal(url, `${protocolName}://item`)
-       } else {
-added in both
-  our    100644 be02cb3f84001a541d64b11fe6eda50fc32e8afd spec/api-web-contents-spec.js
-  their  100644 b1b1d206a2934dbc0e6d3b57cffdc9b9345d7b7a spec/api-web-contents-spec.js
-@@ -4,6 +4,7 @@
- const http = require('http')
- const path = require('path')
- const {closeWindow} = require('./window-helpers')
-+<<<<<<< .our
- const {emittedOnce} = require('./events-helpers')
- const chai = require('chai')
- const dirtyChai = require('dirty-chai')
-@@ -16,6 +17,14 @@
- 
- chai.use(dirtyChai)
- 
-+=======
-+
-+const {ipcRenderer, remote} = require('electron')
-+const {BrowserWindow, webContents, ipcMain, session} = remote
-+
-+const isCi = remote.getGlobal('isCi')
-+
-+>>>>>>> .their
- /* The whole webContents API doesn't use standard callbacks */
- /* eslint-disable standard/no-callback-literal */
- 
-@@ -40,7 +49,11 @@
-     it('returns an array of web contents', (done) => {
-       w.webContents.on('devtools-opened', () => {
-         const all = webContents.getAllWebContents().sort((a, b) => {
-+<<<<<<< .our
-           return a.id - b.id
-+=======
-+          return a.getId() - b.getId()
-+>>>>>>> .their
-         })
- 
-         assert.ok(all.length >= 4)
-@@ -61,15 +74,26 @@
-       if (isCi) return done()
- 
-       const specWebContents = remote.getCurrentWebContents()
-+<<<<<<< .our
-       assert.equal(specWebContents.id, webContents.getFocusedWebContents().id)
- 
-       specWebContents.once('devtools-opened', () => {
-         assert.equal(specWebContents.devToolsWebContents.id, webContents.getFocusedWebContents().id)
-+=======
-+      assert.equal(specWebContents.getId(), webContents.getFocusedWebContents().getId())
-+
-+      specWebContents.once('devtools-opened', () => {
-+        assert.equal(specWebContents.devToolsWebContents.getId(), webContents.getFocusedWebContents().getId())
-+>>>>>>> .their
-         specWebContents.closeDevTools()
-       })
- 
-       specWebContents.once('devtools-closed', () => {
-+<<<<<<< .our
-         assert.equal(specWebContents.id, webContents.getFocusedWebContents().id)
-+=======
-+        assert.equal(specWebContents.getId(), webContents.getFocusedWebContents().getId())
-+>>>>>>> .their
-         done()
-       })
- 
-@@ -122,6 +146,7 @@
-     })
-   })
- 
-+<<<<<<< .our
-   // Disabled because flaky. See #13969
-   xdescribe('isCurrentlyAudible() API', () => {
-     it('returns whether audio is playing', async () => {
-@@ -138,6 +163,8 @@
-     })
-   })
- 
-+=======
-+>>>>>>> .their
-   describe('getWebPreferences() API', () => {
-     it('should not crash when called for devTools webContents', (done) => {
-       w.webContents.openDevTools()
-added in both
-  our    100644 d90269769d269e4054d25cba4b6c4ac8a1929aa6 spec/chromium-spec.js
-  their  100644 938798f001b866a34eae50db37c40e314866c28a spec/chromium-spec.js
-@@ -319,7 +319,11 @@
-       b = window.open(windowUrl, '', 'nodeIntegration=no,show=no')
-     })
- 
-+<<<<<<< .our
-     // TODO(codebytere): re-enable this test
-+=======
-+    // TODO(alexeykuzmin): [Ch66] Fix the test.
-+>>>>>>> .their
-     xit('disables node integration when it is disabled on the parent window for chrome devtools URLs', (done) => {
-       let b
-       app.once('web-contents-created', (event, contents) => {
-added in both
-  our    100644 6901be56d0c5fa9f0a318edeb235eef60624ac52 spec/fixtures/module/preload-sandbox.js
-  their  100644 38d14a8be50ce4e0eb5804336e8bc1f2e23dac0e spec/fixtures/module/preload-sandbox.js
-@@ -11,6 +11,7 @@
-       window.test = {
-         env: process.env,
-         execPath: process.execPath,
-+<<<<<<< .our
-         pid: process.pid,
-         arch: process.arch,
-         platform: process.platform,
-@@ -19,6 +20,9 @@
-         type: process.type,
-         version: process.version,
-         versions: process.versions
-+=======
-+        platform: process.platform
-+>>>>>>> .their
-       }
-     }
-   } else if (location.href !== 'about:blank') {
-added in both
-  our    100644 675d81e97b7240d61b49fbbbee857144033a0378 spec/fixtures/pages/a.html
-  their  100644 568973aed1cf5d40100d8b233fb9548d61bbebf2 spec/fixtures/pages/a.html
-@@ -1,7 +1,10 @@
- <html>
- <link rel="icon" type="image/png" href="/favicon.png"/>
- <link rel="icon" type="image/png" href="http://test.com/favicon.png"/>
-+<<<<<<< .our
- <meta http-equiv="content-security-policy" content="script-src 'self' 'unsafe-inline'" />
-+=======
-+>>>>>>> .their
- <body>
- <script type="text/javascript" charset="utf-8">
-   console.log('a');
-added in both
-  our    100644 5659c44c8de4456a25e0026e29199b827c89cb08 spec/static/main.js
-  their  100644 21a8515d66d1ccbf34fb549d85f8f1480110bdb8 spec/static/main.js
-@@ -99,7 +99,11 @@
-   })
- }
- 
-+<<<<<<< .our
- global.nativeModulesEnabled = !process.env.ELECTRON_SKIP_NATIVE_MODULE_TESTS
-+=======
-+global.nativeModulesEnabled = process.platform !== 'win32' || process.execPath.toLowerCase().indexOf('\\out\\d\\') === -1
-+>>>>>>> .their
- 
- // Register app as standard scheme.
- global.standardScheme = 'app'
-added in both
-  our    100644 db75a4e3754e24a5e6740be61be4f4098c58006e spec/webview-spec.js
-  their  100644 9b4dc3e8b80c7ff8596f1d89a4894d9946ac245e spec/webview-spec.js
-@@ -248,6 +248,7 @@
-       })
-     })
- 
-+<<<<<<< .our
-     it('runs in the correct scope when sandboxed', async () => {
-       const message = await startLoadingWebViewAndWaitForMessage(webview, {
-         preload: `${fixtures}/module/preload-context.js`,
-@@ -264,6 +265,8 @@
-       })
-     })
- 
-+=======
-+>>>>>>> .their
-     it('preload script can require modules that still use "process" and "Buffer" when nodeintegration is off', async () => {
-       const message = await startLoadingWebViewAndWaitForMessage(webview, {
-         preload: `${fixtures}/module/preload-node-off-wrapper.js`,
-@@ -1034,7 +1037,11 @@
-       assert.ok(webview.partition)
- 
-       const listener = function (webContents, permission, callback) {
-+<<<<<<< .our
-         if (webContents.id === webview.getWebContents().id) {
-+=======
-+        if (webContents.getId() === webview.getId()) {
-+>>>>>>> .their
-           // requestMIDIAccess with sysex requests both midi and midiSysex so
-           // grant the first midi one and then reject the midiSysex one
-           if (requestedPermission === 'midiSysex' && permission === 'midi') {
-@@ -1120,7 +1127,11 @@
-       webview.partition = 'permissionTest'
-       webview.setAttribute('nodeintegration', 'on')
-       session.fromPartition(webview.partition).setPermissionRequestHandler((webContents, permission, callback) => {
-+<<<<<<< .our
-         if (webContents.id === webview.getWebContents().id) {
-+=======
-+        if (webContents.getId() === webview.getId()) {
-+>>>>>>> .their
-           assert.equal(permission, 'notifications')
-           setTimeout(() => { callback(true) }, 10)
-         }
-added in both
-  our    100644 808f646f3cf52981f8d75aa8212f3c97b02f055a spec/window-helpers.js
-  their  100644 5a63100f9d0e6452c35c5d31190b37f840066d2a spec/window-helpers.js
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- const {expect} = require('chai')
- const {BrowserWindow} = require('electron').remote
- 
-@@ -15,5 +16,27 @@
- 
-   if (assertSingleWindow) {
-     expect(BrowserWindow.getAllWindows()).to.have.lengthOf(1)
-+=======
-+const assert = require('assert')
-+const {BrowserWindow} = require('electron').remote
-+
-+exports.closeWindow = (window, {assertSingleWindow} = {assertSingleWindow: true}) => {
-+  if (window == null || window.isDestroyed()) {
-+    if (assertSingleWindow) {
-+      assert.equal(BrowserWindow.getAllWindows().length, 1)
-+    }
-+    return Promise.resolve()
-+  } else {
-+    return new Promise((resolve, reject) => {
-+      window.once('closed', () => {
-+        if (assertSingleWindow) {
-+          assert.equal(BrowserWindow.getAllWindows().length, 1)
-+        }
-+        resolve()
-+      })
-+      window.setClosable(true)
-+      window.close()
-+    })
-+>>>>>>> .their
-   }
- }
-added in both
-  our    100755 145c1298c6fbba0a7863fa32cb25e2c6c8eb7e2c tools/js2asar.py
-  their  100755 adad1751e33d21173eaa0b60a9f987f7f074a6fd tools/js2asar.py
-@@ -16,11 +16,16 @@
-   source_files = sys.argv[3:]
- 
-   output_dir = tempfile.mkdtemp()
-+<<<<<<< .our
-   copy_files(source_files, output_dir, folder_name)
-+=======
-+  copy_files(source_files, output_dir)
-+>>>>>>> .their
-   call_asar(archive, os.path.join(output_dir, folder_name))
-   shutil.rmtree(output_dir)
- 
- 
-+<<<<<<< .our
- def copy_files(source_files, output_dir, folder_name):
-   for source_file in source_files:
-     output_path = os.path.join(output_dir, source_file)
-@@ -28,6 +33,11 @@
-     # the temp one we are making so they end up in the ASAR
-     if not os.path.normpath(source_file).startswith(folder_name + os.sep):
-       output_path = os.path.join(output_dir, folder_name, source_file)
-+=======
-+def copy_files(source_files, output_dir):
-+  for source_file in source_files:
-+    output_path = os.path.join(output_dir, source_file)
-+>>>>>>> .their
-     safe_mkdir(os.path.dirname(output_path))
-     shutil.copy2(source_file, output_path)
- 
-added in both
-  our    160000 f5f20660f20c281c1cbf1097ed55204b50711846 vendor/breakpad
-  their  160000 82f0452e6b687b3c1e14e08d172b2f3fb79ae91a vendor/breakpad
-added in both
-  our    160000 c85470a1c379b1c4bedb372c146521bc4be9b75d vendor/libchromiumcontent
-  their  160000 92dc0accfae5cd133fa2a6758ae6b3ff4ff7e569 vendor/libchromiumcontent
-added in both
-  our    160000 ece0a06ac8147efb5b5af431c21f312f1884616e vendor/node
-  their  160000 c3c62e09865f925e0f040d8689cf2a207e36c2a1 vendor/node
-added in both
-  our    100644 84bd69c2b2868ac23bc30061aa208ad38fbb9506 vsts.yml
-  their  100644 72418c7baa6ff63e01b55e0f4051abb2830ea746 vsts.yml
-@@ -59,7 +59,11 @@
- - bash: |
-     echo 'Verifying ffmpeg on build'
-     if [ "$ELECTRON_RELEASE" == "1" ]; then
-+<<<<<<< .our
-       script/verify-ffmpeg.py -c R
-+=======
-+      script/verify-ffmpeg.py -R
-+>>>>>>> .their
-     else
-       script/verify-ffmpeg.py
-     fi
-@@ -69,8 +73,14 @@
- - task: PublishTestResults@2
-   displayName: Publish Test Results
-   inputs:
-+<<<<<<< .our
-     testResultsFiles: '**/test-*.xml'
-   condition: and(always(), eq(variables['MOCHA_FILE'], 'test-results.xml'))
-+=======
-+    testResultsFiles: 'test-results.xml'
-+    searchFolder: junit
-+  condition: and(always(), ne(variables['ELECTRON_RELEASE'], '1'))
-+>>>>>>> .their
- 
- - bash: |
-     export BUILD_URL="${SYSTEM_TEAMFOUNDATIONCOLLECTIONURI}${SYSTEM_TEAMPROJECT}/_build/results?buildId=${BUILD_BUILDID}"
diff --git a/app/test/fixtures/merge-parser/electron/merge-add-dry-run-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-add-dry-run-into-master.txt
deleted file mode 100644
index 1436ddd6430..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-add-dry-run-into-master.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-changed in both
-  base   100755 8244e87ec555877901d7c793adc40218dfde0ad0 script/prepare-release.js
-  our    100755 72a28b719bf1ff7770692caef86c76746c4d8edf script/prepare-release.js
-  their  100755 fbc8e56c428635d5e8ff750494c8ca560e1621e7 script/prepare-release.js
-@@ -258,6 +258,14 @@
- }
- 
- async function prepareRelease (isBeta, notesOnly) {
-+<<<<<<< .our
-+=======
-+  if (args.automaticRelease && (pkg.version.indexOf('beta') === -1 ||
-+      versionType !== 'beta') && versionType !== 'nightly' && versionType !== 'stable') {
-+    console.log(`${fail} Automatic release is only supported for beta and nightly releases`)
-+    process.exit(1)
-+  }
-+>>>>>>> .their
-   if (args.dryRun) {
-     let newVersion = await getNewVersion(true)
-     console.log(newVersion)
diff --git a/app/test/fixtures/merge-parser/electron/merge-add-nightly-concept-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-add-nightly-concept-into-master.txt
deleted file mode 100644
index 76591df6214..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-add-nightly-concept-into-master.txt
+++ /dev/null
@@ -1,204 +0,0 @@
-changed in both
-  base   100755 28424aaa8ee614b0dfffc7468adb2266f05440cb script/bump-version.py
-  our    100755 564adb2116312b0f6d0351096bd89cb373cd3bab script/bump-version.py
-  their  100755 403bb88a80edf2d9b4e792e43862e841aa69a1a6 script/bump-version.py
-@@ -84,12 +84,41 @@
-     parser.print_help()
-     return 1
- 
-+<<<<<<< .our
-   versions = clean_parse_version(version)
-   suffix = ''
-   if '-' in version:
-     suffix = '-' + version.split('-')[1]
-     versions[3] = parse_version(version)[3]
-   version = version.split('-')[0]
-+=======
-+  increments = ['major', 'minor', 'patch', 'beta']
-+
-+  curr_version = get_electron_version()
-+  versions = parse_version(re.sub('-beta', '', curr_version))
-+
-+  if args.bump in increments:
-+    versions = increase_version(versions, increments.index(args.bump))
-+    if versions[3] == '0':
-+      # beta starts at 1
-+      versions = increase_version(versions, increments.index('beta'))
-+
-+  if args.stable == True:
-+    versions[3] = '0'
-+
-+  if args.new_version != None:
-+    clean_version = re.sub('-beta', '', args.new_version)
-+    clean_version = re.sub('-nightly', '', clean_version)
-+    versions = parse_version(clean_version)
-+
-+  version = '.'.join(versions[:3])
-+  suffix = ''
-+
-+  if args.new_version != None and '-nightly' in args.new_version:
-+    suffix = '-nightly.' + versions[3]
-+  elif versions[3] != '0':
-+    suffix = '-beta.' + versions[3]
-+>>>>>>> .their
- 
-   if args.dry_run:
-     print 'new version number would be: {0}\n'.format(version + suffix)
-changed in both
-  base   100755 34e500e46b341ea8f93729001bf6bff28a80d9c6 script/prepare-release.js
-  our    100755 72a28b719bf1ff7770692caef86c76746c4d8edf script/prepare-release.js
-  their  100755 e2cab7703581c34b6d942aa62e88d691fe2d4ee3 script/prepare-release.js
-@@ -14,6 +14,7 @@
- const path = require('path')
- const pkg = require('../package.json')
- const readline = require('readline')
-+const semver = require('semver')
- const versionType = args._[0]
- const targetRepo = versionType === 'nightly' ? 'nightlies' : 'electron'
- 
-@@ -21,7 +22,11 @@
- // via conventional-recommended-bump
- 
- if (!versionType && !args.notesOnly) {
-+<<<<<<< .our
-   console.log(`Usage: prepare-release versionType [stable | beta | nightly]` +
-+=======
-+  console.log(`Usage: prepare-release versionType [major | minor | patch | beta | nightly]` +
-+>>>>>>> .their
-      ` (--stable) (--notesOnly) (--automaticRelease) (--branch)`)
-   process.exit(1)
- }
-@@ -31,11 +36,22 @@
- github.authenticate({type: 'token', token: process.env.ELECTRON_GITHUB_TOKEN})
- 
- async function getNewVersion (dryRun) {
-+<<<<<<< .our
-   if (!dryRun) {
-     console.log(`Bumping for new "${versionType}" version.`)
-   }
-   let bumpScript = path.join(__dirname, 'bump-version.py')
-   let scriptArgs = [bumpScript, '--bump', versionType]
-+=======
-+  console.log(`Bumping for new "${versionType}" version.`)
-+  let bumpScript = path.join(__dirname, 'bump-version.py')
-+  let scriptArgs = [bumpScript]
-+  if (versionType === 'nightly') {
-+    scriptArgs.push(`--version ${await determineNextNightly(await getCurrentBranch())}`)
-+  } else {
-+    scriptArgs.push(`--bump ${versionType}`)
-+  }
-+>>>>>>> .their
-   if (args.stable) {
-     scriptArgs.push('--stable')
-   }
-@@ -53,9 +69,49 @@
-   } catch (err) {
-     console.log(`${fail} Could not bump version, error was:`, err)
-     throw err
-+<<<<<<< .our
-+=======
-+  }
-+}
-+
-+async function determineNextNightly (currentBranch) {
-+  const twoPad = (n) => n < 10 ? `0${n}` : `${n}`
-+  const d = new Date()
-+  const date = `${d.getFullYear()}${twoPad(d.getMonth() + 1)}${twoPad(d.getDate())}`
-+
-+  let version
-+
-+  if (currentBranch === 'master') {
-+    version = await determineNextNightlyForMaster()
-+  }
-+  if (!version) {
-+    throw new Error(`not yet implemented for release branch: ${currentBranch}`)
-+  }
-+
-+  return `${version}-nightly.${date}`
-+}
-+
-+async function determineNextNightlyForMaster () {
-+  let branchNames
-+  let result = await GitProcess.exec(['branch', '-a', '--remote', '--list', 'origin/[0-9]-[0-9]-x'], gitDir)
-+  if (result.exitCode === 0) {
-+    branchNames = result.stdout.trim().split('\n')
-+    const filtered = branchNames.map(b => b.replace('origin/', ''))
-+    return getNextReleaseBranch(filtered)
-+  } else {
-+    throw new Error('Release branches could not be fetched.')
-+>>>>>>> .their
-   }
- }
- 
-+function getNextReleaseBranch (branches) {
-+  const converted = branches.map(b => b.replace(/-/g, '.').replace('x', '0'))
-+  const next = converted.reduce((v1, v2) => {
-+    return semver.gt(v1, v2) ? v1 : v2
-+  })
-+  return `${parseInt(next.split('.')[0], 10) + 1}.0.0`
-+}
-+
- async function getCurrentBranch (gitDir) {
-   console.log(`Determining current git branch`)
-   let gitArgs = ['rev-parse', '--abbrev-ref', 'HEAD']
-@@ -164,6 +220,7 @@
-   githubOpts.draft = true
-   githubOpts.name = `electron ${newVersion}`
-   if (isBeta) {
-+<<<<<<< .our
-     if (newVersion.indexOf('nightly') > 0) {
-       githubOpts.body = `Note: This is a nightly release.  Please file new issues ` +
-         `for any bugs you find in it.\n \n This release is published to npm ` +
-@@ -173,6 +230,17 @@
-       githubOpts.body = `Note: This is a beta release.  Please file new issues ` +
-         `for any bugs you find in it.\n \n This release is published to npm ` +
-         `under the beta tag and can be installed via npm install electron@beta, ` +
-+=======
-+    if (versionType === 'nightly') {
-+      githubOpts.body = `Note: This is a beta release.  Please file new issues ` +
-+        `for any bugs you find in it.\n \n This release is published to npm ` +
-+        `under the beta tag and can be installed via npm install electron@beta, ` +
-+        `or npm i electron@${newVersion.substr(1)}.\n \n ${releaseNotes}`
-+    } else {
-+      githubOpts.body = `Note: This is a nightly release.  Please file new issues ` +
-+        `for any bugs you find in it.\n \n This release is published to npm ` +
-+        `under the nightly tag and can be installed via npm install electron@nightly, ` +
-+>>>>>>> .their
-         `or npm i electron@${newVersion.substr(1)}.\n \n ${releaseNotes}`
-     }
-     githubOpts.name = `${githubOpts.name}`
-@@ -258,9 +326,26 @@
- }
- 
- async function prepareRelease (isBeta, notesOnly) {
-+<<<<<<< .our
-   if (args.dryRun) {
-     let newVersion = await getNewVersion(true)
-     console.log(newVersion)
-+=======
-+  if (args.automaticRelease && (pkg.version.indexOf('beta') === -1 ||
-+      versionType !== 'beta') && versionType !== 'nightly') {
-+    console.log(`${fail} Automatic release is only supported for beta and nightly releases`)
-+    process.exit(1)
-+  }
-+  let currentBranch
-+  if (args.branch) {
-+    currentBranch = args.branch
-+  } else {
-+    currentBranch = await getCurrentBranch(gitDir)
-+  }
-+  if (notesOnly) {
-+    let releaseNotes = await getReleaseNotes(currentBranch)
-+    console.log(`Draft release notes are: \n${releaseNotes}`)
-+>>>>>>> .their
-   } else {
-     const currentBranch = (args.branch) ? args.branch : await getCurrentBranch(gitDir)
-     if (notesOnly) {
-changed in both
-  base   100644 eb0702ff5ef265b545824ba21ffb4c5d760d5476 script/publish-to-npm.js
-  our    100644 27290c513bb28d9bd394575d833f1e6786e3b479 script/publish-to-npm.js
-  their  100644 3139e29a5f246ce5c7eb58e5a083f6fe9966c511 script/publish-to-npm.js
-changed in both
-  base   100755 9048d759d94735feeed17a4a57a9a4b6152e8305 script/release.js
-  our    100755 84e00ad4f309201f151c3f8fcbaf9ee536c9b6cb script/release.js
-  their  100755 af9723eb1788a900e37f9ffcf4b37f29264d414a script/release.js
diff --git a/app/test/fixtures/merge-parser/electron/merge-add-web-frame-add-origin-access-whitelist-entry-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-add-web-frame-add-origin-access-whitelist-entry-into-master.txt
deleted file mode 100644
index 30eb7667e2e..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-add-web-frame-add-origin-access-whitelist-entry-into-master.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-changed in both
-  base   100644 a265b942f31ff76d7e21da03e7eafb6d164fd610 atom/renderer/api/atom_api_web_frame.cc
-  our    100644 f0f7ef249d73876f7107d3d3865e8fc71ee33945 atom/renderer/api/atom_api_web_frame.cc
-  their  100644 c8b21cd90045ef148841ec8fd93f1a4b634f3dd1 atom/renderer/api/atom_api_web_frame.cc
-@@ -28,7 +28,13 @@
- #include "third_party/WebKit/public/web/WebLocalFrame.h"
- #include "third_party/WebKit/public/web/WebScriptExecutionCallback.h"
- #include "third_party/WebKit/public/web/WebScriptSource.h"
-+#include "third_party/WebKit/public/web/WebSecurityPolicy.h"
- #include "third_party/WebKit/public/web/WebView.h"
-+<<<<<<< .our
-+=======
-+#include "third_party/WebKit/Source/platform/weborigin/SchemeRegistry.h"
-+#include "url/gurl.h"
-+>>>>>>> .their
- 
- #include "atom/common/node_includes.h"
- 
-@@ -281,6 +287,18 @@
-   }
- }
- 
-+void WebFrame::AddOriginAccessWhitelistEntry(
-+    const std::string& sourceOrigin,
-+    const std::string& destinationProtocol,
-+    const std::string& destinationHost,
-+    bool allowDestinationSubdomains) {
-+    blink::WebSecurityPolicy::AddOriginAccessWhitelistEntry(
-+        GURL(sourceOrigin.c_str()),
-+        blink::WebString::FromUTF8(destinationProtocol),
-+        blink::WebString::FromUTF8(destinationHost),
-+        allowDestinationSubdomains);
-+};
-+
- void WebFrame::InsertText(const std::string& text) {
-   web_frame_->FrameWidget()->GetActiveWebInputMethodController()->CommitText(
-       blink::WebString::FromUTF8(text),
-@@ -497,6 +515,8 @@
-                  &WebFrame::RegisterURLSchemeAsBypassingCSP)
-       .SetMethod("registerURLSchemeAsPrivileged",
-                  &WebFrame::RegisterURLSchemeAsPrivileged)
-+      .SetMethod("addOriginAccessWhitelistEntry",
-+                 &WebFrame::AddOriginAccessWhitelistEntry)
-       .SetMethod("insertText", &WebFrame::InsertText)
-       .SetMethod("insertCSS", &WebFrame::InsertCSS)
-       .SetMethod("executeJavaScript", &WebFrame::ExecuteJavaScript)
-changed in both
-  base   100644 6c6d0b19f985666449f301b645309c87e4a76e66 atom/renderer/api/atom_api_web_frame.h
-  our    100644 4cc6386abcb41cfa29fdc002f6fb267329bb112d atom/renderer/api/atom_api_web_frame.h
-  their  100644 d2e4c9e0d6fecee98926b906e5355454507eab9d atom/renderer/api/atom_api_web_frame.h
-@@ -64,9 +64,13 @@
-   void RegisterURLSchemeAsBypassingCSP(const std::string& scheme);
-   void RegisterURLSchemeAsPrivileged(const std::string& scheme,
-                                      mate::Arguments* args);
-+  void AddOriginAccessWhitelistEntry(const std::string& sourceOrigin,
-+                                     const std::string& destinationProtocol,
-+                                     const std::string& destinationHost,
-+                                     bool allowDestinationSubdomains);
- 
--  // Editing.
--  void InsertText(const std::string& text);
-+      // Editing.
-+      void InsertText(const std::string& text);
-   void InsertCSS(const std::string& css);
- 
-   // Executing scripts.
diff --git a/app/test/fixtures/merge-parser/electron/merge-api-naming-scheme-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-api-naming-scheme-into-master.txt
deleted file mode 100644
index f15b0bf490b..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-api-naming-scheme-into-master.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-added in remote
-  their  100644 9995a63bd6c605588a79583ee4de323c85825341 docs/api/names.js
-@@ -0,0 +1,34 @@
-+const fs = require('fs')
-+const path = require('path')
-+const glob = require('glob')
-+const marky = require('marky-markdown')
-+
-+function listFile (file) {
-+  console.log(`- [${file.heading}](https://github.com/atom/electron/blob/master/docs/api/${file.filename})`)
-+}
-+
-+glob(path.join(__dirname, '**/*.md'), function (error, files) {
-+  if (error) return console.log(error)
-+  files = files.map((file) => {
-+    var $ = marky(fs.readFileSync(file, 'utf8'))
-+    return {
-+      filename: path.basename(file),
-+      heading: $('h1').text()
-+    }
-+  })
-+
-+  console.log(`\n## CamelCase\n`)
-+  files.filter((file) => {
-+    return file.heading[0] === file.heading[0].toUpperCase() && !file.heading.match(/\s/)
-+  }).map(listFile)
-+
-+  console.log(`\n## mixedCase\n`)
-+  files.filter((file) => {
-+    return file.heading[0] === file.heading[0].toLowerCase() && !file.heading.match(/\s/)
-+  }).map(listFile)
-+
-+  console.log(`\n## Other\n`)
-+  files.filter((file) => {
-+    return file.heading.match(/\s/)
-+  }).map(listFile)
-+})
-changed in both
-  base   100644 2d1f7ec8b46487cab69e2564552b6eef60aaaa58 package.json
-  our    100644 c081cd89450cd50efba1ec280ff1349a96ea3ce0 package.json
-  their  100644 9d0c7be3b80c5bc67482bdb7ea2f1fd28e058142 package.json
-@@ -82,9 +82,16 @@
-     "start": "python ./script/start.py",
-     "test": "python ./script/test.py"
-   },
-+<<<<<<< .our
-   "license": "MIT",
-   "author": "Electron Community",
-   "keywords": [
-     "electron"
-   ]
-+=======
-+  "dependencies": {
-+    "cheerio": "^0.20.0",
-+    "marky-markdown": "^7.0.0"
-+  }
-+>>>>>>> .their
- }
diff --git a/app/test/fixtures/merge-parser/electron/merge-autorelease-fixes-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-autorelease-fixes-into-master.txt
deleted file mode 100644
index cc566247b3e..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-autorelease-fixes-into-master.txt
+++ /dev/null
@@ -1,3109 +0,0 @@
-changed in both
-  base   100644 d4f98eab95b73b59018f170b09b9132d4d03477b .circleci/config.yml
-  our    100644 6d44d618aabcce04c60344f2274dec5b0c2a1f68 .circleci/config.yml
-  their  100644 55d4ccd2f775f7a91f7e5f6f01fbaf2e034a4556 .circleci/config.yml
-@@ -19,6 +19,7 @@
-       fi
-     when: on_success
- 
-+<<<<<<< .our
- build-steps: &build-steps
-   steps:
-     - checkout
-@@ -92,6 +93,13 @@
-           fi
-     - run:
-         name: Test
-+=======
-+version: 2
-+jobs:
-+  electron-linux-arm:
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+>>>>>>> .their
-         environment:
-           MOCHA_FILE: junit/test-results.xml
-           MOCHA_REPORTER: mocha-junit-reporter
-@@ -110,6 +118,7 @@
-                 echo 'Skipping tests on GitHub release'
-               fi
-             fi
-+<<<<<<< .our
-           else
-            echo 'Skipping tests due to configuration'
-           fi
-@@ -117,6 +126,76 @@
-         name: Verify FFmpeg
-         command: |
-           if [ "$RUN_TESTS" == "true" ]; then
-+=======
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Optionally finish release
-+          shell: /bin/sh
-+          command: |
-+            if [ "$ELECTRON_RELEASE" == "1" ] && [ "$AUTO_RELEASE" == "true" ]; then
-+              echo 'Trying to finish release'
-+              node script/release.js --validateRelease --automaticRelease
-+              releaseExitCode=$?
-+              if [ $releaseExitCode -eq 0 ]; then
-+                echo 'Release is ready to go; releasing'
-+                node script/release.js--automaticRelease
-+                if [ $releaseExitCode -eq 0 ]; then
-+                  echo 'Release successful, now publishing to npm'
-+                  echo "//registry.npmjs.org/:_authToken=$ELECTRON_NPM_TOKEN" >> ~/.npmrc
-+                  npm run publish-to-npm
-+                  echo 'Release has been published to npm'
-+                fi
-+              else
-+                echo 'Release is not complete, skipping publish for now'
-+              fi
-+            else
-+              echo 'Skipping finishing release because build is not for release'
-+            fi
-+      - run:
-+          name: Zip out directory
-+          command: |
-+>>>>>>> .their
-             if [ "$ELECTRON_RELEASE" != "1" ]; then
-               echo 'Verifying ffmpeg on debug build'
-               script/verify-ffmpeg.py
-@@ -391,11 +470,105 @@
-     resource_class: 2xlarge
- 
-   electron-linux-arm64:
-+<<<<<<< .our
-     environment:
-       TARGET_ARCH: arm64
-     <<: *build-defaults
-     resource_class: 2xlarge
- 
-+=======
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: arm64
-+    resource_class: 2xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Optionally finish release
-+          shell: /bin/sh
-+          command: |
-+            if [ "$ELECTRON_RELEASE" == "1" ] && [ "$AUTO_RELEASE" == "true" ]; then
-+              echo 'Trying to finish release'
-+              node script/release.js --validateRelease --automaticRelease
-+              releaseExitCode=$?
-+              if [ $releaseExitCode -eq 0 ]; then
-+                echo 'Release is ready to go; releasing'
-+                node script/release.js--automaticRelease
-+                if [ $releaseExitCode -eq 0 ]; then
-+                  echo 'Release successful, now publishing to npm'
-+                  echo "//registry.npmjs.org/:_authToken=$ELECTRON_NPM_TOKEN" >> ~/.npmrc
-+                  npm run publish-to-npm
-+                  echo 'Release has been published to npm'
-+                fi
-+              else
-+                echo 'Release is not complete, skipping publish for now'
-+              fi
-+            else
-+              echo 'Skipping finishing release because build is not for release'
-+            fi
-+      - run:
-+          name: Zip out directory
-+          command: |
-+            if [ "$ELECTRON_RELEASE" != "1" ]; then
-+              zip -r electron.zip out/D
-+            fi
-+      - persist_to_workspace:
-+          root: /home/builduser
-+          paths:
-+            - project/out
-+      - store_artifacts:
-+          path: electron.zip
-+>>>>>>> .their
-   electron-linux-arm64-test:
-     machine: true
-     steps:
-@@ -430,6 +603,7 @@
-     resource_class: 2xlarge
- 
-   electron-linux-ia32:
-+<<<<<<< .our
-     environment:
-       TARGET_ARCH: ia32
-       DISPLAY: ':99.0'
-@@ -668,6 +842,312 @@
-       GN_EXTRA_ARGS: 'is_mas_build = true'
-     <<: *gn-mac-build-machine
-     <<: *gn-mac-build-steps
-+=======
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: ia32
-+          DISPLAY: ':99.0'
-+    resource_class: xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Setup for headless testing
-+          command: sh -e /etc/init.d/xvfb start
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Optionally finish release
-+          shell: /bin/sh
-+          command: |
-+            if [ "$ELECTRON_RELEASE" == "1" ] && [ "$AUTO_RELEASE" == "true" ]; then
-+              echo 'Trying to finish release'
-+              node script/release.js --validateRelease --automaticRelease
-+              releaseExitCode=$?
-+              if [ $releaseExitCode -eq 0 ]; then
-+                echo 'Release is ready to go; releasing'
-+                node script/release.js--automaticRelease
-+                if [ $releaseExitCode -eq 0 ]; then
-+                  echo 'Release successful, now publishing to npm'
-+                  echo "//registry.npmjs.org/:_authToken=$ELECTRON_NPM_TOKEN" >> ~/.npmrc
-+                  npm run publish-to-npm
-+                  echo 'Release has been published to npm'
-+                fi
-+              else
-+                echo 'Release is not complete, skipping publish for now'
-+              fi
-+            else
-+              echo 'Skipping finishing release because build is not for release'
-+            fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                out/D/electron --version
-+                mkdir junit
-+                script/test.py --ci --rebuild_native_modules
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+  electron-linux-mips64el:
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: mips64el
-+    resource_class: xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Optionally finish release
-+          shell: /bin/sh
-+          command: |
-+            if [ "$ELECTRON_RELEASE" == "1" ] && [ "$AUTO_RELEASE" == "true" ]; then
-+              echo 'Trying to finish release'
-+              node script/release.js --validateRelease --automaticRelease
-+              releaseExitCode=$?
-+              if [ $releaseExitCode -eq 0 ]; then
-+                echo 'Release is ready to go; releasing'
-+                node script/release.js--automaticRelease
-+                if [ $releaseExitCode -eq 0 ]; then
-+                  echo 'Release successful, now publishing to npm'
-+                  echo "//registry.npmjs.org/:_authToken=$ELECTRON_NPM_TOKEN" >> ~/.npmrc
-+                  npm run publish-to-npm
-+                  echo 'Release has been published to npm'
-+                fi
-+              else
-+                echo 'Release is not complete, skipping publish for now'
-+              fi
-+            else
-+              echo 'Skipping finishing release because build is not for release'
-+            fi
-+
-+  electron-linux-x64:
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: x64
-+          DISPLAY: ':99.0'
-+    resource_class: xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Setup for headless testing
-+          command: sh -e /etc/init.d/xvfb start
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Optionally finish release
-+          shell: /bin/sh
-+          command: |
-+            if [ "$ELECTRON_RELEASE" == "1" ] && [ "$AUTO_RELEASE" == "true" ]; then
-+              echo 'Trying to finish release'
-+              node script/release.js --validateRelease --automaticRelease
-+              releaseExitCode=$?
-+              if [ $releaseExitCode -eq 0 ]; then
-+                echo 'Release is ready to go; releasing'
-+                node script/release.js--automaticRelease
-+                if [ $releaseExitCode -eq 0 ]; then
-+                  echo 'Release successful, now publishing to npm'
-+                  echo "//registry.npmjs.org/:_authToken=$ELECTRON_NPM_TOKEN" >> ~/.npmrc
-+                  npm run publish-to-npm
-+                  echo 'Release has been published to npm'
-+                fi
-+              else
-+                echo 'Release is not complete, skipping publish for now'
-+              fi
-+            else
-+              echo 'Skipping finishing release because build is not for release'
-+            fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                mkdir junit
-+                script/test.py --ci --rebuild_native_modules
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+      - run:
-+          name: Generate Typescript Definitions
-+          command: npm run create-typescript-definitions
-+      - store_test_results:
-+          path: junit
-+      - store_artifacts:
-+          path: junit
-+      - store_artifacts:
-+          path: out/electron.d.ts
-+      - store_artifacts:
-+          path: out/electron-api.json
-+>>>>>>> .their
- 
- workflows:
-   version: 2
-changed in both
-  base   100644 5d04da05397c4c74ce00d6d6c8969ce370adb32d CONTRIBUTING.md
-  our    100644 414f83db905db904728facf3b40e70e7b7973193 CONTRIBUTING.md
-  their  100644 0955f68c4f2b1097e770398cf51d3af811f53050 CONTRIBUTING.md
-changed in both
-  base   100644 4cfea0e70f9af56ba746347b4cae410970f3d900 Dockerfile
-  our    100644 74e5eeedea9bea87cd7a98ac2cb63f4376275a2a Dockerfile
-  their  100644 2d74e16915d2e89e1e1e7f3ffd259cc448e1b864 Dockerfile
-@@ -7,8 +7,13 @@
- RUN chmod a+rwx /home
- 
- # Install node.js
-+<<<<<<< .our
- RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
- RUN apt-get install -y nodejs
-+=======
-+RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
-+RUN apt-get update && apt-get install -y nodejs
-+>>>>>>> .their
- 
- # Install wget used by crash reporter
- RUN apt-get install -y wget
-changed in both
-  base   100644 271947c56e39b91fc23bf10579f61cab50b0f4dc Dockerfile.circleci
-  our    100644 d369c8c640161fc3ba65935297aec7dd27eb1e9f Dockerfile.circleci
-  their  100644 0cdb1e88c24f01a5acdfd8ef348126819f593454 Dockerfile.circleci
-@@ -3,8 +3,13 @@
- USER root
- 
- # Install node.js
-+<<<<<<< .our
- RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
- RUN apt-get install -y nodejs
-+=======
-+RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
-+RUN apt-get update && apt-get install -y nodejs
-+>>>>>>> .their
- 
- # Install wget used by crash reporter
- RUN apt-get install -y wget
-added in remote
-  their  100644 c6d558f7f3518ea2924fa9075ed38ab48d70d204 Jenkinsfile.arm64
-@@ -0,0 +1,36 @@
-+pipeline {
-+  agent {
-+    docker {
-+      image 'electronbuilds/arm64v8:0.0.2'
-+      args '--privileged'
-+    }
-+  }
-+  environment {
-+    TARGET_ARCH='arm64'
-+    DISPLAY=':99.0'
-+    MOCHA_TIMEOUT='60000'
-+  }
-+  stages {
-+    stage('Bootstrap') {
-+      steps {
-+        sh 'script/bootstrap.py -v --dev --target_arch=$TARGET_ARCH'
-+      }
-+    }
-+    stage('Build') {
-+      steps {
-+        sh 'script/build.py -c D --ninja-path /usr/local/ninja/ninja'
-+      }
-+    }
-+    stage('Test') {
-+      steps {
-+        sh '/etc/init.d/xvfb start'
-+        sh 'script/test.py --ci'
-+      }
-+    }
-+  }
-+  post {
-+    always {
-+      cleanWs()
-+    }
-+  }
-+}
-changed in both
-  base   100644 160dae7908236105f8534f9448f4111da1bcb014 README.md
-  our    100644 ec09364417b767ac59b2d970fee5e2ab2db2173b README.md
-  their  100644 0a2e72b22aa7259045d448ed2bcc41bdfe70ad53 README.md
-changed in both
-  base   100644 4bd88a5a43c03ceba308ec06fdf0cbadeddcaae3 atom/browser/api/atom_api_browser_view.cc
-  our    100644 bd83208694c61c4d7c43ce4be26939c2682b2a13 atom/browser/api/atom_api_browser_view.cc
-  their  100644 41f0e99cdd79bf1ad2c4c8c0db5aaa97ac5e1297 atom/browser/api/atom_api_browser_view.cc
-changed in both
-  base   100644 ced1cb31d8df7689f7652111720ba20fb029b1fe atom/browser/api/atom_api_menu_views.cc
-  our    100644 3da7dc2842fa4561e037aa67f290d0cc6ca71014 atom/browser/api/atom_api_menu_views.cc
-  their  100644 fa178e57d82413544b92172ae0ed4401ea5f178b atom/browser/api/atom_api_menu_views.cc
-@@ -49,8 +49,16 @@
-   menu_runners_[window_id] =
-       std::make_unique<MenuRunner>(model(), flags, close_callback);
-   menu_runners_[window_id]->RunMenuAt(
-+<<<<<<< .our
-       native_window->widget(), NULL, gfx::Rect(location, gfx::Size()),
-       views::MENU_ANCHOR_TOPLEFT, ui::MENU_SOURCE_MOUSE);
-+=======
-+      native_window->widget(),
-+      NULL,
-+      gfx::Rect(location, gfx::Size()),
-+      views::MENU_ANCHOR_TOPLEFT,
-+      ui::MENU_SOURCE_MOUSE);
-+>>>>>>> .their
- }
- 
- void MenuViews::ClosePopupAt(int32_t window_id) {
-removed in local
-  base   100644 0d22fad5b8b5e3ed7711d55aa763f930014a75d7 atom/browser/api/atom_api_screen_mac.mm
-  their  100644 056b775fdfc221cb0501ba5b7afd8de01f2d4d63 atom/browser/api/atom_api_screen_mac.mm
-changed in both
-  base   100644 6e5c4b9cbe77c1a4004bbc2bf7b0f0089ffb9004 atom/browser/api/atom_api_session.cc
-  our    100644 658f913bb60b66ae1bf3aae97d7d9158e56f7ee0 atom/browser/api/atom_api_session.cc
-  their  100644 373ef90c393af3921e1cbd2d6375e7b9d9b7ecb5 atom/browser/api/atom_api_session.cc
-@@ -451,6 +451,7 @@
-   AtomNetworkDelegate* network_delegate =
-       static_cast<AtomNetworkDelegate*>(context->network_delegate());
-   network_delegate->SetDevToolsNetworkEmulationClientId(client_id);
-+<<<<<<< .our
- }
- 
- void DestroyGlobalHandle(v8::Isolate* isolate,
-@@ -468,6 +469,8 @@
-       object->SetAlignedPointerInInternalField(0, nullptr);
-     }
-   }
-+=======
-+>>>>>>> .their
- }
- 
- }  // namespace
-changed in both
-  base   100644 83adf62eee8301c49799b5397f2dcf6bfdbbd295 atom/browser/api/atom_api_web_contents.cc
-  our    100644 20a1ac2e672f08ffea528b6e094ba530ff8083d1 atom/browser/api/atom_api_web_contents.cc
-  their  100644 c004ca93b2a55d75782a4f06c64ea98fe1c73faf atom/browser/api/atom_api_web_contents.cc
-@@ -1015,6 +1015,18 @@
-                                     content::RenderFrameHost* frame_host) {
-   bool handled = true;
-   FrameDispatchHelper helper = {this, frame_host};
-+<<<<<<< .our
-+=======
-+  auto relay = NativeWindowRelay::FromWebContents(web_contents());
-+  if (relay) {
-+    IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(NativeWindow, message, frame_host)
-+      IPC_MESSAGE_FORWARD(AtomAutofillFrameHostMsg_HidePopup,
-+                          relay->window.get(), NativeWindow::HideAutofillPopup)
-+      IPC_MESSAGE_UNHANDLED(handled = false)
-+    IPC_END_MESSAGE_MAP()
-+  }
-+
-+>>>>>>> .their
-   IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(WebContents, message, frame_host)
-     IPC_MESSAGE_HANDLER(AtomFrameHostMsg_Message, OnRendererMessage)
-     IPC_MESSAGE_FORWARD_DELAY_REPLY(AtomFrameHostMsg_Message_Sync, &helper,
-@@ -1024,10 +1036,14 @@
-         FrameDispatchHelper::OnSetTemporaryZoomLevel)
-     IPC_MESSAGE_FORWARD_DELAY_REPLY(AtomFrameHostMsg_GetZoomLevel, &helper,
-                                     FrameDispatchHelper::OnGetZoomLevel)
-+<<<<<<< .our
- #if defined(TOOLKIT_VIEWS) && !defined(OS_MACOSX)
-     IPC_MESSAGE_HANDLER(AtomAutofillFrameHostMsg_ShowPopup, ShowAutofillPopup)
-     IPC_MESSAGE_HANDLER(AtomAutofillFrameHostMsg_HidePopup, HideAutofillPopup)
- #endif
-+=======
-+    IPC_MESSAGE_HANDLER(AtomAutofillFrameHostMsg_ShowPopup, ShowAutofillPopup)
-+>>>>>>> .their
-     IPC_MESSAGE_UNHANDLED(handled = false)
-   IPC_END_MESSAGE_MAP()
- 
-@@ -1075,6 +1091,20 @@
-        details.is_same_document, details.did_replace_entry);
- }
- 
-+<<<<<<< .our
-+=======
-+int64_t WebContents::GetIDForContents(content::WebContents* web_contents) {
-+  int64_t process_id = web_contents->GetRenderProcessHost()->GetID();
-+  int64_t routing_id = web_contents->GetMainFrame()->GetRoutingID();
-+  int64_t rv = (process_id << 32) + routing_id;
-+  return rv;
-+}
-+
-+int64_t WebContents::GetID() const {
-+  return WebContents::GetIDForContents(web_contents());
-+}
-+
-+>>>>>>> .their
- int WebContents::GetProcessID() const {
-   return web_contents()->GetMainFrame()->GetProcess()->GetID();
- }
-@@ -1552,7 +1582,11 @@
- bool WebContents::SendIPCMessage(bool all_frames,
-                                  const base::string16& channel,
-                                  const base::ListValue& args) {
-+<<<<<<< .our
-   auto* frame_host = web_contents()->GetMainFrame();
-+=======
-+  auto frame_host = web_contents()->GetMainFrame();
-+>>>>>>> .their
-   if (frame_host) {
-     return frame_host->Send(new AtomFrameMsg_Message(
-         frame_host->GetRoutingID(), all_frames, channel, args));
-@@ -1853,6 +1887,7 @@
-   rfh->Send(reply_msg);
- }
- 
-+<<<<<<< .our
- v8::Local<v8::Value> WebContents::GetPreloadPath(v8::Isolate* isolate) const {
-   if (auto* web_preferences = WebContentsPreferences::From(web_contents())) {
-     base::FilePath::StringType preload;
-@@ -1880,6 +1915,25 @@
- }
- 
- v8::Local<v8::Value> WebContents::GetOwnerBrowserWindow() const {
-+=======
-+v8::Local<v8::Value> WebContents::GetWebPreferences(v8::Isolate* isolate) {
-+  WebContentsPreferences* web_preferences =
-+      WebContentsPreferences::FromWebContents(web_contents());
-+  if (!web_preferences)
-+    return v8::Null(isolate);
-+  return mate::ConvertToV8(isolate, *web_preferences->web_preferences());
-+}
-+
-+v8::Local<v8::Value> WebContents::GetLastWebPreferences(v8::Isolate* isolate) {
-+  WebContentsPreferences* web_preferences =
-+      WebContentsPreferences::FromWebContents(web_contents());
-+  if (!web_preferences)
-+    return v8::Null(isolate);
-+  return mate::ConvertToV8(isolate, *web_preferences->last_web_preferences());
-+}
-+
-+v8::Local<v8::Value> WebContents::GetOwnerBrowserWindow() {
-+>>>>>>> .their
-   if (owner_window())
-     return BrowserWindow::From(isolate(), owner_window());
-   else
-changed in both
-  base   100644 16f23210557ca816cdeadd50b9332447eca8815f atom/browser/api/atom_api_web_contents.h
-  our    100644 7939f8268aa8c3371623e0c15f3b6001d7f1efa4 atom/browser/api/atom_api_web_contents.h
-  their  100644 027332a3706d5ac43a4a769234d361304bdc0350 atom/browser/api/atom_api_web_contents.h
-@@ -97,6 +97,8 @@
-   static void BuildPrototype(v8::Isolate* isolate,
-                              v8::Local<v8::FunctionTemplate> prototype);
- 
-+  static int64_t GetIDForContents(content::WebContents* web_contents);
-+
-   // Notifies to destroy any guest web contents before destroying self.
-   void DestroyWebContents(bool async);
- 
-@@ -234,8 +236,13 @@
-   v8::Local<v8::Value> GetPreloadPath(v8::Isolate* isolate) const;
- 
-   // Returns the web preferences of current WebContents.
-+<<<<<<< .our
-   v8::Local<v8::Value> GetWebPreferences(v8::Isolate* isolate) const;
-   v8::Local<v8::Value> GetLastWebPreferences(v8::Isolate* isolate) const;
-+=======
-+  v8::Local<v8::Value> GetWebPreferences(v8::Isolate* isolate);
-+  v8::Local<v8::Value> GetLastWebPreferences(v8::Isolate* isolate);
-+>>>>>>> .their
- 
-   // Returns the owner window.
-   v8::Local<v8::Value> GetOwnerBrowserWindow() const;
-changed in both
-  base   100644 3f53f4d3d7204f59037ba80556a2c9896e23aae4 atom/browser/api/atom_api_web_request.cc
-  our    100644 c088196f833160ac964e67030fa083302dd090b0 atom/browser/api/atom_api_web_request.cc
-  their  100644 ac84ac196b69a121a54dc64b87b7c2c1d6df21b5 atom/browser/api/atom_api_web_request.cc
-@@ -40,7 +40,11 @@
- 
- namespace {
- 
-+<<<<<<< .our
- template <typename Method, typename Event, typename Listener>
-+=======
-+template<typename Method, typename Event, typename Listener>
-+>>>>>>> .their
- void CallNetworkDelegateMethod(
-     brightray::URLRequestContextGetter* url_request_context_getter,
-     Method method,
-@@ -95,14 +99,24 @@
-   }
- 
-   brightray::URLRequestContextGetter* url_request_context_getter =
-+<<<<<<< .our
-       browser_context_->GetRequestContext();
-+=======
-+      browser_context_->url_request_context_getter();
-+>>>>>>> .their
-   if (!url_request_context_getter)
-     return;
-   BrowserThread::PostTask(
-       BrowserThread::IO, FROM_HERE,
-+<<<<<<< .our
-       base::BindOnce(&CallNetworkDelegateMethod<Method, Event, Listener>,
-                      base::RetainedRef(url_request_context_getter), method,
-                      type, std::move(patterns), std::move(listener)));
-+=======
-+      base::Bind(&CallNetworkDelegateMethod<Method, Event, Listener>,
-+                 base::RetainedRef(url_request_context_getter),
-+                 method, type, std::move(patterns), std::move(listener)));
-+>>>>>>> .their
- }
- 
- // static
-removed in local
-  base   100644 993f9680ccb475f8870a2e3b4da2d20472531d91 atom/browser/api/atom_api_window.cc
-  their  100644 d177afb300f65ba14daa8c07042d4d768b00fd54 atom/browser/api/atom_api_window.cc
-removed in local
-  base   100644 f86c387a34afb15920738413c6819176081b5ee7 atom/browser/api/atom_api_window.h
-  their  100644 e07f34e23f060906942b5fce81081965ea792204 atom/browser/api/atom_api_window.h
-changed in both
-  base   100644 8810fed4b9aef78842fb65db93ed2efebabb6928 atom/browser/api/event.cc
-  our    100644 7b617034eca5a229fc9323bfd6d531ebded752d6 atom/browser/api/event.cc
-  their  100644 1ee0d57e36068c9b6427c278e9a7a5a66b7f8f79 atom/browser/api/event.cc
-@@ -6,7 +6,10 @@
- 
- #include "atom/common/api/api_messages.h"
- #include "atom/common/native_mate_converters/string16_converter.h"
-+<<<<<<< .our
- #include "atom/common/native_mate_converters/value_converter.h"
-+=======
-+>>>>>>> .their
- #include "content/public/browser/render_frame_host.h"
- #include "content/public/browser/web_contents.h"
- #include "native_mate/object_template_builder.h"
-@@ -27,6 +30,7 @@
-   message_ = message;
- 
-   Observe(content::WebContents::FromRenderFrameHost(sender));
-+<<<<<<< .our
- }
- 
- void Event::RenderFrameDeleted(content::RenderFrameHost* rfh) {
-@@ -42,6 +46,23 @@
-     sender_ = new_rfh;
- }
- 
-+=======
-+}
-+
-+void Event::RenderFrameDeleted(content::RenderFrameHost* rfh) {
-+  if (sender_ != rfh)
-+    return;
-+  sender_ = nullptr;
-+  message_ = nullptr;
-+}
-+
-+void Event::RenderFrameHostChanged(content::RenderFrameHost* old_rfh,
-+                                   content::RenderFrameHost* new_rfh) {
-+  if (sender_ && sender_ == old_rfh)
-+    sender_ = new_rfh;
-+}
-+
-+>>>>>>> .their
- void Event::FrameDeleted(content::RenderFrameHost* rfh) {
-   if (sender_ != rfh)
-     return;
-@@ -57,7 +78,11 @@
-   if (message_ == nullptr || sender_ == nullptr)
-     return false;
- 
-+<<<<<<< .our
-   AtomFrameHostMsg_Message_Sync::WriteReplyParams(message_, result);
-+=======
-+  AtomFrameHostMsg_Message_Sync::WriteReplyParams(message_, json);
-+>>>>>>> .their
-   bool success = sender_->Send(message_);
-   message_ = nullptr;
-   sender_ = nullptr;
-changed in both
-  base   100644 d73bd2f64b55b5eb0827f819805578559b947f46 atom/browser/api/event.h
-  our    100644 fbec8f27574691005d203adbafb50709f5c2d010 atom/browser/api/event.h
-  their  100644 05ad7daff8ac524294c1cacb66f876efc9716dd4 atom/browser/api/event.h
-@@ -44,8 +44,13 @@
- 
-  private:
-   // Replyer for the synchronous messages.
-+<<<<<<< .our
-   content::RenderFrameHost* sender_ = nullptr;
-   IPC::Message* message_ = nullptr;
-+=======
-+  content::RenderFrameHost* sender_;
-+  IPC::Message* message_;
-+>>>>>>> .their
- 
-   DISALLOW_COPY_AND_ASSIGN(Event);
- };
-changed in both
-  base   100644 3dbcd0601ef8a63cd6712b566cdc7f388c85e3ee atom/browser/api/event_emitter.cc
-  our    100644 c6e810b51225c8f89eaf53ac3e46381b52ba63b5 atom/browser/api/event_emitter.cc
-  their  100644 91769cbb94794a978732773612a3fec245acd750 atom/browser/api/event_emitter.cc
-changed in both
-  base   100644 8d9d2960df35a33a09dfc79c4c35d424738df43f atom/browser/api/event_emitter.h
-  our    100644 5e4ca3b4ffcb184583ef386100eabda7a9e00da0 atom/browser/api/event_emitter.h
-  their  100644 8145113084a9c0c34ea808e3712879f5f70737c9 atom/browser/api/event_emitter.h
-changed in both
-  base   100644 c83a99c2b38708ca296b4c9215e26cb58eb9a7d2 atom/browser/atom_browser_client.cc
-  our    100644 57c4ee582405e6d501ec23940ccb10689ecd64a1 atom/browser/atom_browser_client.cc
-  their  100644 37dd43c49fc8056cf1a511d8c5895535a556cf9e atom/browser/atom_browser_client.cc
-@@ -343,6 +343,11 @@
-       web_preferences->AppendCommandLineSwitches(command_line);
-     SessionPreferences::AppendExtraCommandLineSwitches(
-         web_contents->GetBrowserContext(), command_line);
-+
-+    auto context_id = atom::api::WebContents::GetIDForContents(
-+      web_contents);
-+    command_line->AppendSwitchASCII(switches::kContextId,
-+      base::IntToString(context_id));
-   }
- }
- 
-changed in both
-  base   100644 f16ee50158508565cc1e043d3257ad687cc69215 atom/browser/browser.cc
-  our    100644 ce35de64d60c6767ac52596c1b32e7bde5ceefa0 atom/browser/browser.cc
-  their  100644 3ba915f91eb3403df9630697e77cce9ed7fa3307 atom/browser/browser.cc
-changed in both
-  base   100644 0970b26b776b34f68e5f22776e74c19ddcc039ad atom/browser/browser.h
-  our    100644 aed7d25c37da59c0dd5e09940a064c329353a0b2 atom/browser/browser.h
-  their  100644 a8c1a8c5e7c4409e3a78279da46fb2ba6112f409 atom/browser/browser.h
-@@ -277,7 +277,11 @@
-   bool is_ready_ = false;
- 
-   // The browser is being shutdown.
-+<<<<<<< .our
-   bool is_shutdown_ = false;
-+=======
-+  bool is_shutdown_;
-+>>>>>>> .their
- 
-   int badge_count_ = 0;
- 
-changed in both
-  base   100644 7c154b60b00e25c42847ceefb98723b50ea03dd0 atom/browser/native_browser_view.h
-  our    100644 56937e4c8c69e3605d2b6cc71a0877b74ff4e83d atom/browser/native_browser_view.h
-  their  100644 cab6980fa2cf035c1a5ca6b4aee822a0ee604fd4 atom/browser/native_browser_view.h
-changed in both
-  base   100644 17b0a1ee9006dd70888165a9209076fd7065f3cc atom/browser/native_browser_view_mac.mm
-  our    100644 0416e26e89f1e0f37366ef1798b4359da0729225 atom/browser/native_browser_view_mac.mm
-  their  100644 86df632638ef7772270569824515b251470d0c08 atom/browser/native_browser_view_mac.mm
-changed in both
-  base   100644 78e788b3019c23bce13fdc8d94385d4a3937cf22 atom/browser/native_browser_view_views.cc
-  our    100644 6414005a1e40d80ae86102b12edee0255cab9adb atom/browser/native_browser_view_views.cc
-  their  100644 def64d12e3520fa15a2b6779147a819a6eaec2f8 atom/browser/native_browser_view_views.cc
-changed in both
-  base   100644 5dcda13447cde098fccaf8782fefb97d861d47f4 atom/browser/native_browser_view_views.h
-  our    100644 8f8e860292baddad1156c50ae7cfaa0fd6e87d99 atom/browser/native_browser_view_views.h
-  their  100644 abf47178302ad7527c1640a3f41492f871f137e5 atom/browser/native_browser_view_views.h
-changed in both
-  base   100644 34778fb6434707e6ae3c70ab55e48e87eb556448 atom/browser/native_window.cc
-  our    100644 4ff2bcfcabfd34d8563f9ed213c03655a99dd9c6 atom/browser/native_window.cc
-  their  100644 ec671732a6d57de95b4a8a20a7df1d3984b3a7e5 atom/browser/native_window.cc
-changed in both
-  base   100644 d1cfa7cc352971772689ecd60a110b48ef1a7eaa atom/browser/native_window.h
-  our    100644 35b67e2dd230692c415a32aae5f0a5e99ab74ac0 atom/browser/native_window.h
-  their  100644 b96f2ea8a2946d68818997e6a5488c85652aab1b atom/browser/native_window.h
-@@ -221,6 +221,8 @@
-       content::WebContents*,
-       const content::NativeWebKeyboardEvent& event) {}
- 
-+  virtual void UpdateDraggableRegionViews() {}
-+
-   // Public API used by platform-dependent delegates and observers to send UI
-   // related notifications.
-   void NotifyWindowRequestPreferredWith(int* width);
-changed in both
-  base   100644 60d8fc23f59a842c100412b1c236b87d0815a7a0 atom/browser/native_window_mac.h
-  our    100644 44a78198f44cdba9875e3fb27c8e2c87eaa6f33b atom/browser/native_window_mac.h
-  their  100644 9e8c3aef87dd8d2d4a3260587b7013d260649b55 atom/browser/native_window_mac.h
-@@ -118,8 +118,11 @@
-   void MoveTabToNewWindow() override;
-   void ToggleTabBar() override;
-   bool AddTabbedWindow(NativeWindow* window) override;
-+<<<<<<< .our
- 
-   bool SetWindowButtonVisibility(bool visible) override;
-+=======
-+>>>>>>> .their
- 
-   void SetVibrancy(const std::string& type) override;
-   void SetTouchBar(
-@@ -130,8 +133,19 @@
-   gfx::Rect ContentBoundsToWindowBounds(const gfx::Rect& bounds) const override;
-   gfx::Rect WindowBoundsToContentBounds(const gfx::Rect& bounds) const override;
- 
-+<<<<<<< .our
-   // Use a custom content view instead of Chromium's BridgedContentView.
-   void OverrideNSWindowContentView();
-+=======
-+  // content::WebContentsObserver:
-+  void RenderViewHostChanged(content::RenderViewHost* old_host,
-+                             content::RenderViewHost* new_host) override;
-+
-+  // Refresh the DraggableRegion views.
-+  void UpdateDraggableRegionViews() override {
-+    UpdateDraggableRegionViews(draggable_regions_);
-+  }
-+>>>>>>> .their
- 
-   // Set the attribute of NSWindow while work around a bug of zoom button.
-   void SetStyleMask(bool on, NSUInteger flag);
-changed in both
-  base   100644 ad1713e401240dbc1c2054551d0caeb41aea2884 atom/browser/native_window_mac.mm
-  our    100644 004263ec127709067e903ffbf31003b8844226b4 atom/browser/native_window_mac.mm
-  their  100644 0397c62d8df94b3ce66482c0d9c4b3b87ac97a45 atom/browser/native_window_mac.mm
-@@ -28,9 +28,12 @@
- #include "skia/ext/skia_utils_mac.h"
- #include "ui/gfx/skia_util.h"
- #include "ui/gl/gpu_switching_manager.h"
-+<<<<<<< .our
- #include "ui/views/background.h"
- #include "ui/views/cocoa/bridged_native_widget.h"
- #include "ui/views/widget/widget.h"
-+=======
-+>>>>>>> .their
- 
- // This view always takes the size of its superview. It is intended to be used
- // as a NSWindow's contentView.  It is needed because NSWindow's implementation
-@@ -1144,10 +1147,17 @@
- }
- 
- bool NativeWindowMac::AddTabbedWindow(NativeWindow* window) {
-+<<<<<<< .our
-   if (window_ == window->GetNativeWindow()) {
-     return false;
-   } else {
-     if (@available(macOS 10.12, *))
-+=======
-+  if (window_.get() == window->GetNativeWindow()) {
-+    return false;
-+  } else {
-+    if ([window_ respondsToSelector:@selector(addTabbedWindow:ordered:)])
-+>>>>>>> .their
-       [window_ addTabbedWindow:window->GetNativeWindow() ordered:NSWindowAbove];
-   }
-   return true;
-@@ -1185,15 +1195,22 @@
-       return;
-     }
- 
-+<<<<<<< .our
-     background_color_before_vibrancy_.reset([[window_ backgroundColor] retain]);
-     transparency_before_vibrancy_ = [window_ titlebarAppearsTransparent];
-     ui::GpuSwitchingManager::SetTransparent(true);
-+=======
-+    [vibrant_view removeFromSuperview];
-+    [window_ setVibrantView:nil];
-+    ui::GpuSwitchingManager::SetTransparent(transparent());
-+>>>>>>> .their
- 
-     if (title_bar_style_ != NORMAL) {
-       [window_ setTitlebarAppearsTransparent:YES];
-       [window_ setBackgroundColor:[NSColor clearColor]];
-     }
- 
-+<<<<<<< .our
-     NSVisualEffectView* effect_view = (NSVisualEffectView*)vibrant_view;
-     if (effect_view == nil) {
-       effect_view = [[[NSVisualEffectView alloc]
-@@ -1208,6 +1225,31 @@
-                              positioned:NSWindowBelow
-                              relativeTo:nil];
-     }
-+=======
-+  SetRenderWidgetHostOpaque(false);
-+  background_color_before_vibrancy_.reset([window_ backgroundColor]);
-+  transparency_before_vibrancy_ = [window_ titlebarAppearsTransparent];
-+  ui::GpuSwitchingManager::SetTransparent(true);
-+
-+  if (title_bar_style_ != NORMAL) {
-+    [window_ setTitlebarAppearsTransparent:YES];
-+    [window_ setBackgroundColor:[NSColor clearColor]];
-+  }
-+
-+  NSVisualEffectView* effect_view = (NSVisualEffectView*)vibrant_view;
-+  if (effect_view == nil) {
-+    effect_view = [[[NSVisualEffectView alloc]
-+        initWithFrame: [[window_ contentView] bounds]] autorelease];
-+    [window_ setVibrantView:(NSView*)effect_view];
-+
-+    [effect_view setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
-+    [effect_view setBlendingMode:NSVisualEffectBlendingModeBehindWindow];
-+    [effect_view setState:NSVisualEffectStateActive];
-+    [[window_ contentView] addSubview:effect_view
-+                           positioned:NSWindowBelow
-+                           relativeTo:nil];
-+  }
-+>>>>>>> .their
- 
-     NSVisualEffectMaterial vibrancyType = NSVisualEffectMaterialLight;
- 
-@@ -1387,6 +1429,7 @@
-     [parent->GetNativeWindow() addChildWindow:window_ ordered:NSWindowAbove];
- }
- 
-+<<<<<<< .our
- void NativeWindowMac::ShowWindowButton(NSWindowButton button) {
-   auto view = [window_ standardWindowButton:button];
-   [view.superview addSubview:view positioned:NSWindowAbove relativeTo:nil];
-@@ -1395,6 +1438,35 @@
- void NativeWindowMac::SetForwardMouseMessages(bool forward) {
-   [window_ setAcceptsMouseMovedEvents:forward];
- }
-+=======
-+  // Remove all ControlRegionViews that are added last time.
-+  // Note that [webView subviews] returns the view's mutable internal array and
-+  // it should be copied to avoid mutating the original array while enumerating
-+  // it.
-+  base::scoped_nsobject<NSArray> subviews([[webView subviews] copy]);
-+  for (NSView* subview in subviews.get())
-+    if ([subview isKindOfClass:[ControlRegionView class]])
-+      [subview removeFromSuperview];
-+
-+  // Draggable regions is implemented by having the whole web view draggable
-+  // (mouseDownCanMoveWindow) and overlaying regions that are not draggable.
-+  std::vector<gfx::Rect> drag_exclude_rects =
-+      CalculateNonDraggableRegions(regions, webViewWidth, webViewHeight);
-+
-+  if (browser_view_) {
-+    browser_view_->UpdateDraggableRegions(drag_exclude_rects);
-+  }
-+
-+  // Create and add a ControlRegionView for each region that needs to be
-+  // excluded from the dragging.
-+  for (const auto& rect : drag_exclude_rects) {
-+    base::scoped_nsobject<NSView> controlRegion(
-+        [[ControlRegionView alloc] initWithFrame:NSZeroRect]);
-+    [controlRegion setFrame:NSMakeRect(rect.x(), webViewHeight - rect.bottom(),
-+                                       rect.width(), rect.height())];
-+    [webView addSubview:controlRegion];
-+  }
-+>>>>>>> .their
- 
- void NativeWindowMac::OverrideNSWindowContentView() {
-   // When using `views::Widget` to hold WebContents, Chromium would use
-changed in both
-  base   100644 008109970ec8d3c55a2028a173c3b941908d78a7 atom/browser/native_window_views.cc
-  our    100644 0dba39942f92d54ba34db7709b73012055680d94 atom/browser/native_window_views.cc
-  their  100644 f3e6fc09c5850cbc3d6989a2a94607b1f9a5d514 atom/browser/native_window_views.cc
-@@ -1115,7 +1115,11 @@
-   if (!active && IsMenuBarAutoHide() && IsMenuBarVisible())
-     SetMenuBarVisibility(false);
- 
-+<<<<<<< .our
-   root_view_->ResetAltState();
-+=======
-+  menu_bar_alt_pressed_ = false;
-+>>>>>>> .their
- }
- 
- void NativeWindowViews::OnWidgetBoundsChanged(views::Widget* changed_widget,
-@@ -1237,9 +1241,138 @@
- void NativeWindowViews::HandleKeyboardEvent(
-     content::WebContents*,
-     const content::NativeWebKeyboardEvent& event) {
-+<<<<<<< .our
-   keyboard_event_handler_->HandleKeyboardEvent(event,
-                                                root_view_->GetFocusManager());
-   root_view_->HandleKeyEvent(event);
-+=======
-+  keyboard_event_handler_->HandleKeyboardEvent(event, GetFocusManager());
-+
-+  if (!menu_bar_)
-+    return;
-+
-+  // Show accelerator when "Alt" is pressed.
-+  if (menu_bar_visible_ && IsAltKey(event))
-+    menu_bar_->SetAcceleratorVisibility(
-+        event.GetType() == blink::WebInputEvent::kRawKeyDown);
-+
-+  // Show the submenu when "Alt+Key" is pressed.
-+  if (event.GetType() == blink::WebInputEvent::kRawKeyDown &&
-+      !IsAltKey(event) && IsAltModifier(event)) {
-+    if (!menu_bar_visible_ &&
-+        (menu_bar_->HasAccelerator(event.windows_key_code)))
-+      SetMenuBarVisibility(true);
-+    menu_bar_->ActivateAccelerator(event.windows_key_code);
-+    return;
-+  }
-+
-+  if (!menu_bar_autohide_)
-+    return;
-+
-+  // Toggle the menu bar only when a single Alt is released.
-+  if (event.GetType() == blink::WebInputEvent::kRawKeyDown && IsAltKey(event)) {
-+    // When a single Alt is pressed:
-+    menu_bar_alt_pressed_ = true;
-+  } else if (event.GetType() == blink::WebInputEvent::kKeyUp &&
-+             IsAltKey(event) && menu_bar_alt_pressed_) {
-+    // When a single Alt is released right after a Alt is pressed:
-+    menu_bar_alt_pressed_ = false;
-+    SetMenuBarVisibility(!menu_bar_visible_);
-+  } else {
-+    // When any other keys except single Alt have been pressed/released:
-+    menu_bar_alt_pressed_ = false;
-+  }
-+}
-+
-+void NativeWindowViews::ShowAutofillPopup(
-+    content::RenderFrameHost* frame_host,
-+    content::WebContents* web_contents,
-+    const gfx::RectF& bounds,
-+    const std::vector<base::string16>& values,
-+    const std::vector<base::string16>& labels) {
-+  bool is_offsceen = false;
-+  bool is_embedder_offscreen = false;
-+
-+  auto* web_contents_preferences =
-+      WebContentsPreferences::FromWebContents(web_contents);
-+  if (web_contents_preferences) {
-+    const auto* web_preferences = web_contents_preferences->web_preferences();
-+
-+    web_preferences->GetBoolean("offscreen", &is_offsceen);
-+    int guest_instance_id = 0;
-+    web_preferences->GetInteger(options::kGuestInstanceID, &guest_instance_id);
-+
-+    if (guest_instance_id) {
-+      auto manager = WebViewManager::GetWebViewManager(web_contents);
-+      if (manager) {
-+        auto embedder = manager->GetEmbedder(guest_instance_id);
-+        if (embedder) {
-+          is_embedder_offscreen = WebContentsPreferences::IsPreferenceEnabled(
-+              "offscreen", embedder);
-+        }
-+      }
-+    }
-+  }
-+
-+  autofill_popup_->CreateView(
-+      frame_host,
-+      is_offsceen || is_embedder_offscreen,
-+      widget(),
-+      bounds);
-+  autofill_popup_->SetItems(values, labels);
-+  autofill_popup_->UpdatePopupBounds(menu_bar_visible_ ? 0 : kMenuBarHeight);
-+}
-+
-+void NativeWindowViews::HideAutofillPopup(
-+    content::RenderFrameHost* frame_host) {
-+  autofill_popup_->Hide();
-+}
-+
-+void NativeWindowViews::Layout() {
-+  const auto size = GetContentsBounds().size();
-+  const auto menu_bar_bounds =
-+      menu_bar_visible_ ? gfx::Rect(0, 0, size.width(), kMenuBarHeight)
-+                        : gfx::Rect();
-+  if (menu_bar_) {
-+    menu_bar_->SetBoundsRect(menu_bar_bounds);
-+  }
-+
-+  if (web_view_) {
-+    web_view_->SetBoundsRect(
-+        gfx::Rect(0, menu_bar_bounds.height(), size.width(),
-+                  size.height() - menu_bar_bounds.height()));
-+  }
-+
-+  if (autofill_popup_.get())
-+    autofill_popup_->UpdatePopupBounds(menu_bar_visible_ ? 0 : kMenuBarHeight);
-+}
-+
-+gfx::Size NativeWindowViews::GetMinimumSize() const {
-+  return NativeWindow::GetMinimumSize();
-+}
-+
-+gfx::Size NativeWindowViews::GetMaximumSize() const {
-+  return NativeWindow::GetMaximumSize();
-+}
-+
-+bool NativeWindowViews::AcceleratorPressed(const ui::Accelerator& accelerator) {
-+  return accelerator_util::TriggerAcceleratorTableCommand(
-+      &accelerator_table_, accelerator);
-+}
-+
-+void NativeWindowViews::RegisterAccelerators(AtomMenuModel* menu_model) {
-+  // Clear previous accelerators.
-+  views::FocusManager* focus_manager = GetFocusManager();
-+  accelerator_table_.clear();
-+  focus_manager->UnregisterAccelerators(this);
-+
-+  // Register accelerators with focus manager.
-+  accelerator_util::GenerateAcceleratorTable(&accelerator_table_, menu_model);
-+  for (const auto& iter : accelerator_table_) {
-+    focus_manager->RegisterAccelerator(
-+        iter.first, ui::AcceleratorManager::kNormalPriority, this);
-+  }
-+>>>>>>> .their
- }
- 
- ui::WindowShowState NativeWindowViews::GetRestoredState() {
-changed in both
-  base   100644 a39e84ce5b8d7b757233dab4bed646e08cb8c76a atom/browser/net/asar/url_request_asar_job.cc
-  our    100644 85eb2e1dd142b6d64aafb5350ae47603db989e8f atom/browser/net/asar/url_request_asar_job.cc
-  their  100644 a6fe5e26540c9533f16dcf56fc955d0025de3b4a atom/browser/net/asar/url_request_asar_job.cc
-changed in both
-  base   100644 9b0f3a98dc53b922c0d070244f8f7457f332d850 atom/browser/net/atom_network_delegate.cc
-  our    100644 e71ea74317b69f31a5aac8e723902748972fed8f atom/browser/net/atom_network_delegate.cc
-  their  100644 239a64016febb8f9d81206d7f2a7d100ccd1f293 atom/browser/net/atom_network_delegate.cc
-@@ -250,6 +250,7 @@
- 
- AtomNetworkDelegate::~AtomNetworkDelegate() {}
- 
-+<<<<<<< .our
- void AtomNetworkDelegate::SetSimpleListenerInIO(SimpleEvent type,
-                                                 URLPatterns patterns,
-                                                 SimpleListener callback) {
-@@ -266,6 +267,26 @@
-     response_listeners_.erase(type);
-   else
-     response_listeners_[type] = {std::move(patterns), std::move(callback)};
-+=======
-+void AtomNetworkDelegate::SetSimpleListenerInIO(
-+    SimpleEvent type,
-+    URLPatterns patterns,
-+    SimpleListener callback) {
-+  if (callback.is_null())
-+    simple_listeners_.erase(type);
-+  else
-+    simple_listeners_[type] = { std::move(patterns), std::move(callback) };
-+}
-+
-+void AtomNetworkDelegate::SetResponseListenerInIO(
-+    ResponseEvent type,
-+    URLPatterns patterns,
-+    ResponseListener callback) {
-+  if (callback.is_null())
-+    response_listeners_.erase(type);
-+  else
-+    response_listeners_[type] = { std::move(patterns), std::move(callback) };
-+>>>>>>> .their
- }
- 
- void AtomNetworkDelegate::SetDevToolsNetworkEmulationClientId(
-changed in both
-  base   100644 e00c26ff2cbc134b987b4361896971e48056951d atom/browser/net/atom_network_delegate.h
-  our    100644 39a7a8ddfcda17fd7d022331132b54485d07a279 atom/browser/net/atom_network_delegate.h
-  their  100644 ad37a926d4732d94526f74b2f927e35504d2efe3 atom/browser/net/atom_network_delegate.h
-changed in both
-  base   100644 3313eba36bb903426778fac6cd18258a95fec677 atom/browser/resources/mac/Info.plist
-  our    100644 9094f0f7335edf833d51f688851e6a105de60433 atom/browser/resources/mac/Info.plist
-  their  100644 6d0fe2ab89b8d9b3737456dc5f7fb22ef6dd6098 atom/browser/resources/mac/Info.plist
-@@ -17,9 +17,15 @@
-   <key>CFBundleIconFile</key>
-   <string>electron.icns</string>
-   <key>CFBundleVersion</key>
-+<<<<<<< .our
-   <string>4.0.0</string>
-   <key>CFBundleShortVersionString</key>
-   <string>4.0.0</string>
-+=======
-+  <string>2.0.0</string>
-+  <key>CFBundleShortVersionString</key>
-+  <string>2.0.0</string>
-+>>>>>>> .their
-   <key>LSApplicationCategoryType</key>
-   <string>public.app-category.developer-tools</string>
-   <key>LSMinimumSystemVersion</key>
-changed in both
-  base   100644 c349f99d712ff69960d35b18587ddb6c417f7cd5 atom/browser/resources/win/atom.rc
-  our    100644 c0bd831e8bddf10180f75cd40694831e2e98622d atom/browser/resources/win/atom.rc
-  their  100644 2da4c1d50dc436530b90ce2c6e3c720c8a7ece8e atom/browser/resources/win/atom.rc
-@@ -56,8 +56,13 @@
- //
- 
- VS_VERSION_INFO VERSIONINFO
-+<<<<<<< .our
-  FILEVERSION 4,0,0,20180821
-  PRODUCTVERSION 4,0,0,20180821
-+=======
-+ FILEVERSION 2,0,0,5
-+ PRODUCTVERSION 2,0,0,5
-+>>>>>>> .their
-  FILEFLAGSMASK 0x3fL
- #ifdef _DEBUG
-  FILEFLAGS 0x1L
-@@ -74,12 +79,20 @@
-         BEGIN
-             VALUE "CompanyName", "GitHub, Inc."
-             VALUE "FileDescription", "Electron"
-+<<<<<<< .our
-             VALUE "FileVersion", "4.0.0"
-+=======
-+            VALUE "FileVersion", "2.0.0"
-+>>>>>>> .their
-             VALUE "InternalName", "electron.exe"
-             VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
-             VALUE "OriginalFilename", "electron.exe"
-             VALUE "ProductName", "Electron"
-+<<<<<<< .our
-             VALUE "ProductVersion", "4.0.0"
-+=======
-+            VALUE "ProductVersion", "2.0.0"
-+>>>>>>> .their
-             VALUE "SquirrelAwareVersion", "1"
-         END
-     END
-changed in both
-  base   100644 8bdf4e0c2be32fc7d704bc989d7ccec5dd5db672 atom/browser/ui/cocoa/atom_menu_controller.mm
-  our    100644 cecf30ce1c88e007957a65427648941765a6067e atom/browser/ui/cocoa/atom_menu_controller.mm
-  their  100644 a117a1f4fa4158cccb3d9b942e7aaa2e9960492b atom/browser/ui/cocoa/atom_menu_controller.mm
-@@ -334,8 +334,13 @@
-   if (isMenuOpen_) {
-     isMenuOpen_ = NO;
-     model_->MenuWillClose();
-+<<<<<<< .our
-     // Post async task so that itemSelected runs before the close callback
-     // deletes the controller from the map which deallocates it
-+=======
-+    // Post async task so that itemSelected runs before the close callback	
-+    // deletes the controller from the map which deallocates it	
-+>>>>>>> .their
-     if (!closeCallback.is_null()) {
-       BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, closeCallback);
-     }
-changed in both
-  base   100644 b26d472db131f7be9d5bfbbd1cebfc992743d312 atom/browser/ui/file_dialog_mac.mm
-  our    100644 18b18a8b240cda5512ae49e0afde5c749bdf75c0 atom/browser/ui/file_dialog_mac.mm
-  their  100644 30c656cb115ad93b074e73917654f5f5a898f0a3 atom/browser/ui/file_dialog_mac.mm
-changed in both
-  base   100644 a358f676a8c41d15bb9c3157cce4a62ef8356855 atom/browser/ui/tray_icon_cocoa.mm
-  our    100644 2c434d7a9e312adfb3802628a3d092a95d4ac49f atom/browser/ui/tray_icon_cocoa.mm
-  their  100644 6931618f9b8ef8ed1d40c8a87ed7c577da6c0450 atom/browser/ui/tray_icon_cocoa.mm
-changed in both
-  base   100644 e1836ad68985f6068a5ea4be76d6f58682056d04 atom/browser/ui/tray_icon_gtk.cc
-  our    100644 4c780285c80a157afca74b0927175ba3b045def9 atom/browser/ui/tray_icon_gtk.cc
-  their  100644 eb7be1ed3b4345cf825075785c1c1708a7b69d30 atom/browser/ui/tray_icon_gtk.cc
-@@ -36,9 +36,16 @@
-   if (libgtkui::AppIndicatorIcon::CouldOpen()) {
-     ++indicators_count;
-     icon_.reset(new libgtkui::AppIndicatorIcon(
-+<<<<<<< .our
-         base::StringPrintf("%s%d", Browser::Get()->GetName().c_str(),
-                            indicators_count),
-         image.AsImageSkia(), toolTip));
-+=======
-+        base::StringPrintf(
-+            "%s%d", Browser::Get()->GetName().c_str(), indicators_count),
-+        image.AsImageSkia(),
-+        toolTip));
-+>>>>>>> .their
-   } else {
-     icon_.reset(new libgtkui::Gtk2StatusIcon(image.AsImageSkia(), toolTip));
-   }
-changed in both
-  base   100644 bf9801a1457740da391c75621214b8d91cb7467d atom/browser/ui/views/menu_bar.cc
-  our    100644 e838d3cc217b5ffdb77226beff0d7217539f23f9 atom/browser/ui/views/menu_bar.cc
-  their  100644 d963c121bbd29bf3f67b488666297c86b4fee225 atom/browser/ui/views/menu_bar.cc
-@@ -18,11 +18,17 @@
- 
- namespace {
- 
-+<<<<<<< .our
-+=======
-+const char kViewClassName[] = "ElectronMenuBar";
-+
-+>>>>>>> .their
- // Default color of the menu bar.
- const SkColor kDefaultColor = SkColorSetARGB(255, 233, 233, 233);
- 
- }  // namespace
- 
-+<<<<<<< .our
- const char MenuBar::kViewClassName[] = "ElectronMenuBar";
- 
- MenuBar::MenuBar(views::View* window)
-@@ -32,12 +38,35 @@
-   SetLayoutManager(
-       std::make_unique<views::BoxLayout>(views::BoxLayout::kHorizontal));
-   window_->GetFocusManager()->AddFocusChangeListener(this);
-+=======
-+MenuBar::MenuBar(NativeWindow* window)
-+    : background_color_(kDefaultColor), menu_model_(NULL), window_(window) {
-+  RefreshColorCache();
-+  UpdateViewColors();
-+  SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal));
-+>>>>>>> .their
- }
- 
- MenuBar::~MenuBar() {
-   window_->GetFocusManager()->RemoveFocusChangeListener(this);
- }
- 
-+<<<<<<< .our
-+=======
-+void MenuBar::AddedToWidget() {
-+  auto fm = GetFocusManager();
-+  fm->AddFocusChangeListener(this);
-+  // Note that we don't own fm -- this manages the _connection_
-+  focus_manager_.reset(fm, [this](views::FocusManager* fm) {
-+    fm->RemoveFocusChangeListener(this);
-+  });
-+}
-+
-+void MenuBar::RemovedFromWidget() {
-+  focus_manager_.reset();
-+}
-+
-+>>>>>>> .their
- void MenuBar::SetMenu(AtomMenuModel* model) {
-   menu_model_ = model;
-   RebuildChildren();
-@@ -61,7 +90,11 @@
- }
- 
- void MenuBar::ActivateAccelerator(base::char16 key) {
-+<<<<<<< .our
-   auto* child = FindAccelChild(key);
-+=======
-+  auto child = FindAccelChild(key);
-+>>>>>>> .their
-   if (child)
-     static_cast<SubmenuButton*>(child)->Activate(nullptr);
- }
-@@ -151,7 +184,11 @@
- void MenuBar::RebuildChildren() {
-   RemoveAllChildViews(true);
-   for (int i = 0, n = GetItemCount(); i < n; ++i) {
-+<<<<<<< .our
-     auto* button =
-+=======
-+    auto button =
-+>>>>>>> .their
-         new SubmenuButton(menu_model_->GetLabelAt(i), this, background_color_);
-     button->set_tag(i);
-     AddChildView(button);
-@@ -169,7 +206,11 @@
- #if defined(USE_X11)
-   const auto& textColor = has_focus_ ? enabled_color_ : disabled_color_;
-   for (auto* child : GetChildrenInZOrder()) {
-+<<<<<<< .our
-     auto* button = static_cast<SubmenuButton*>(child);
-+=======
-+    auto button = static_cast<SubmenuButton*>(child);
-+>>>>>>> .their
-     button->SetTextColor(views::Button::STATE_NORMAL, textColor);
-     button->SetTextColor(views::Button::STATE_DISABLED, disabled_color_);
-     button->SetTextColor(views::Button::STATE_PRESSED, enabled_color_);
-@@ -178,7 +219,11 @@
-   }
- #elif defined(OS_WIN)
-   for (auto* child : GetChildrenInZOrder()) {
-+<<<<<<< .our
-     auto* button = static_cast<SubmenuButton*>(child);
-+=======
-+    auto button = static_cast<SubmenuButton*>(child);
-+>>>>>>> .their
-     button->SetUnderlineColor(color_utils::GetSysSkColor(COLOR_MENUTEXT));
-   }
- #endif
-changed in both
-  base   100644 761e31b98ea75f44bcd016da3b34b7615f3b409f atom/browser/ui/views/menu_bar.h
-  our    100644 2b10ba3e3bf2ccfc0453fdb59ad022ef7da8ed5b atom/browser/ui/views/menu_bar.h
-  their  100644 13cfa32f3988881e3aa87cae6cae65656fa68d70 atom/browser/ui/views/menu_bar.h
-@@ -5,6 +5,12 @@
- #ifndef ATOM_BROWSER_UI_VIEWS_MENU_BAR_H_
- #define ATOM_BROWSER_UI_VIEWS_MENU_BAR_H_
- 
-+<<<<<<< .our
-+=======
-+#include <memory>
-+
-+#include "atom/browser/native_window.h"
-+>>>>>>> .their
- #include "atom/browser/ui/atom_menu_model.h"
- #include "ui/views/controls/button/menu_button_listener.h"
- #include "ui/views/focus/focus_manager.h"
-@@ -49,7 +55,9 @@
- 
-  protected:
-   // views::View:
-+  void AddedToWidget() override;
-   const char* GetClassName() const override;
-+  void RemovedFromWidget() override;
- 
-   // views::MenuButtonListener:
-   void OnMenuButtonClicked(views::MenuButton* source,
-@@ -79,6 +87,11 @@
- 
-   bool has_focus_ = true;
- 
-+  View* FindAccelChild(base::char16 key);
-+
-+  std::shared_ptr<views::FocusManager> focus_manager_;
-+  bool has_focus_ = true;
-+
-   DISALLOW_COPY_AND_ASSIGN(MenuBar);
- };
- 
-changed in both
-  base   100644 3c3cff3c65410f2e61bdade6e457a096ffba3a54 atom/browser/ui/views/submenu_button.cc
-  our    100644 1124d3d01471876fefa2757570ba3cff796a991c atom/browser/ui/views/submenu_button.cc
-  their  100644 baee28f2cd6931611e048ec46c83e602b95b4b59 atom/browser/ui/views/submenu_button.cc
-@@ -82,8 +82,12 @@
- 
- bool SubmenuButton::GetUnderlinePosition(const base::string16& text,
-                                          base::char16* accelerator,
-+<<<<<<< .our
-                                          int* start,
-                                          int* end) const {
-+=======
-+                                         int* start, int* end) const {
-+>>>>>>> .their
-   int pos, span;
-   base::string16 trimmed = gfx::RemoveAcceleratorChar(text, '&', &pos, &span);
-   if (pos > -1 && span != 0) {
-@@ -96,9 +100,14 @@
-   return false;
- }
- 
-+<<<<<<< .our
- void SubmenuButton::GetCharacterPosition(const base::string16& text,
-                                          int index,
-                                          int* pos) const {
-+=======
-+void SubmenuButton::GetCharacterPosition(
-+    const base::string16& text, int index, int* pos) const {
-+>>>>>>> .their
-   int height = 0;
-   gfx::Canvas::SizeStringInt(text.substr(0, index), gfx::FontList(), pos,
-                              &height, 0, 0);
-changed in both
-  base   100644 5c05481cbbfb85b5d77511cb91cc19cc8ef0e626 atom/browser/ui/views/submenu_button.h
-  our    100644 d8b7785da131271e88533879d090badfd6e49dd5 atom/browser/ui/views/submenu_button.h
-  their  100644 0f7eddf4c914790675f0c9bfab696b2a96b91f74 atom/browser/ui/views/submenu_button.h
-@@ -33,11 +33,17 @@
-  private:
-   bool GetUnderlinePosition(const base::string16& text,
-                             base::char16* accelerator,
-+<<<<<<< .our
-                             int* start,
-                             int* end) const;
-   void GetCharacterPosition(const base::string16& text,
-                             int index,
-                             int* pos) const;
-+=======
-+                            int* start, int* end) const;
-+  void GetCharacterPosition(
-+      const base::string16& text, int index, int* pos) const;
-+>>>>>>> .their
- 
-   base::char16 accelerator_ = 0;
- 
-changed in both
-  base   100644 2cbf07be86a812f07105846dc8caf8226a8595df atom/browser/web_contents_preferences.cc
-  our    100644 c21c93383155091a7481cdd4e741cefad90a4a55 atom/browser/web_contents_preferences.cc
-  their  100644 5b845f86ede32cab629a5bcf010882daebef9361 atom/browser/web_contents_preferences.cc
-@@ -97,6 +97,7 @@
-   instances_.push_back(this);
- 
-   // Set WebPreferences defaults onto the JS object
-+<<<<<<< .our
-   SetDefaultBoolIfUndefined(options::kPlugins, false);
-   SetDefaultBoolIfUndefined(options::kExperimentalFeatures, false);
-   bool node = SetDefaultBoolIfUndefined(options::kNodeIntegration, true);
-@@ -104,11 +105,22 @@
-   SetDefaultBoolIfUndefined(options::kWebviewTag, node);
-   SetDefaultBoolIfUndefined(options::kSandbox, false);
-   SetDefaultBoolIfUndefined(options::kNativeWindowOpen, false);
-+=======
-+  SetDefaultBoolIfUndefined("plugins", false);
-+  SetDefaultBoolIfUndefined(options::kExperimentalFeatures, false);
-+  SetDefaultBoolIfUndefined(options::kExperimentalCanvasFeatures, false);
-+  bool node = SetDefaultBoolIfUndefined(options::kNodeIntegration, true);
-+  SetDefaultBoolIfUndefined(options::kNodeIntegrationInWorker, false);
-+  SetDefaultBoolIfUndefined(options::kWebviewTag, node);
-+  SetDefaultBoolIfUndefined("sandbox", false);
-+  SetDefaultBoolIfUndefined("nativeWindowOpen", false);
-+>>>>>>> .their
-   SetDefaultBoolIfUndefined(options::kContextIsolation, false);
-   SetDefaultBoolIfUndefined("javascript", true);
-   SetDefaultBoolIfUndefined("images", true);
-   SetDefaultBoolIfUndefined("textAreasAreResizable", true);
-   SetDefaultBoolIfUndefined("webgl", true);
-+<<<<<<< .our
-   bool webSecurity = true;
-   SetDefaultBoolIfUndefined(options::kWebSecurity, webSecurity);
-   // If webSecurity was explicity set to false, let's inherit that into
-@@ -125,6 +137,15 @@
-   SetDefaultBoolIfUndefined(options::kOffscreen, false);
- 
-   last_preference_ = preference_.Clone();
-+=======
-+  SetDefaultBoolIfUndefined("webSecurity", true);
-+  SetDefaultBoolIfUndefined("allowRunningInsecureContent", false);
-+  #if defined(OS_MACOSX)
-+  SetDefaultBoolIfUndefined(options::kScrollBounce, false);
-+  #endif
-+  SetDefaultBoolIfUndefined("offscreen", false);
-+  last_web_preferences_.MergeDictionary(&web_preferences_);
-+>>>>>>> .their
- }
- 
- WebContentsPreferences::~WebContentsPreferences() {
-@@ -154,6 +175,16 @@
-   return default_value;
- }
- 
-+bool WebContentsPreferences::SetDefaultBoolIfUndefined(const std::string key,
-+                                                       bool val) {
-+  bool existing;
-+  if (!web_preferences_.GetBoolean(key, &existing)) {
-+    web_preferences_.SetBoolean(key, val);
-+    return val;
-+  }
-+  return existing;
-+}
-+
- void WebContentsPreferences::Merge(const base::DictionaryValue& extend) {
-   if (preference_.is_dict())
-     static_cast<base::DictionaryValue*>(&preference_)->MergeDictionary(&extend);
-@@ -212,8 +243,18 @@
-   return FromWebContents(web_contents);
- }
- 
-+<<<<<<< .our
- void WebContentsPreferences::AppendCommandLineSwitches(
-     base::CommandLine* command_line) {
-+=======
-+  // We are appending args to a webContents so let's save the current state
-+  // of our preferences object so that during the lifetime of the WebContents
-+  // we can fetch the options used to initally configure the WebContents
-+  self->last_web_preferences_.Clear();
-+  self->last_web_preferences_.MergeDictionary(&web_preferences);
-+
-+  bool b;
-+>>>>>>> .their
-   // Check if plugins are enabled.
-   if (IsEnabled(options::kPlugins))
-     command_line->AppendSwitch(switches::kEnablePlugins);
-changed in both
-  base   100644 94dd8dc598bef5cc35383d69d20ade8d644a7ef5 atom/browser/web_contents_preferences.h
-  our    100644 d835347afcd259f473f95271a2c19e42afcc6f2b atom/browser/web_contents_preferences.h
-  their  100644 28ee9a85485e26b33b8a7852a4a212b4c11b71a0 atom/browser/web_contents_preferences.h
-@@ -59,25 +59,45 @@
-   bool GetPreloadPath(base::FilePath::StringType* path) const;
- 
-   // Returns the web preferences.
-+<<<<<<< .our
-   base::Value* preference() { return &preference_; }
-   base::Value* last_preference() { return &last_preference_; }
-+=======
-+  base::DictionaryValue* web_preferences() { return &web_preferences_; }
-+  base::DictionaryValue* last_web_preferences() {
-+    return &last_web_preferences_;
-+  }
-+>>>>>>> .their
- 
-  private:
-   friend class content::WebContentsUserData<WebContentsPreferences>;
-   friend class AtomBrowserClient;
- 
-+<<<<<<< .our
-   // Get WebContents according to process ID.
-   static content::WebContents* GetWebContentsFromProcessID(int process_id);
- 
-   // Set preference value to given bool if user did not provide value
-   bool SetDefaultBoolIfUndefined(const base::StringPiece& key, bool val);
-+=======
-+  // Set preference value to given bool if user did not provide value
-+  bool SetDefaultBoolIfUndefined(const std::string key, bool val);
-+
-+  // Get preferences value as integer possibly coercing it from a string
-+  bool GetInteger(const std::string& attributeName, int* intValue);
-+>>>>>>> .their
- 
-   static std::vector<WebContentsPreferences*> instances_;
- 
-   content::WebContents* web_contents_;
-+<<<<<<< .our
- 
-   base::Value preference_ = base::Value(base::Value::Type::DICTIONARY);
-   base::Value last_preference_ = base::Value(base::Value::Type::DICTIONARY);
-+=======
-+  base::DictionaryValue web_preferences_;
-+  base::DictionaryValue last_web_preferences_;
-+>>>>>>> .their
- 
-   DISALLOW_COPY_AND_ASSIGN(WebContentsPreferences);
- };
-changed in both
-  base   100644 ad8c1d49bbc049b89eb4c69224b42fb51906c726 atom/common/api/api_messages.h
-  our    100644 6131a7a473c68e31790fcd8697c8f380c65ad275 atom/common/api/api_messages.h
-  their  100644 46e6142260d67b6408060ccaf328ee1f74335fe4 atom/common/api/api_messages.h
-@@ -59,6 +59,7 @@
- 
- // Sent by renderer to set the temporary zoom level.
- IPC_SYNC_MESSAGE_ROUTED1_1(AtomFrameHostMsg_SetTemporaryZoomLevel,
-+<<<<<<< .our
-                            double /* zoom level */,
-                            double /* result */)
- 
-@@ -69,3 +70,10 @@
- IPC_MESSAGE_ROUTED2(AtomFrameHostMsg_PDFSaveURLAs,
-                     GURL /* url */,
-                     content::Referrer /* referrer */)
-+=======
-+                            double /* zoom level */,
-+                            double /* result */)
-+
-+// Sent by renderer to get the zoom level.
-+IPC_SYNC_MESSAGE_ROUTED0_1(AtomFrameHostMsg_GetZoomLevel, double /* result */)
-+>>>>>>> .their
-changed in both
-  base   100644 d1a185d51f394b1828d66cbcf2a1d1cc278de23d atom/common/api/remote_callback_freer.cc
-  our    100644 eba828591353dae53d1b7cdaa60fee52166d7473 atom/common/api/remote_callback_freer.cc
-  their  100644 c15d5389a2e99fa0f305a812860a3232a3ec069d atom/common/api/remote_callback_freer.cc
-@@ -39,7 +39,11 @@
-   base::ListValue args;
-   args.AppendString(context_id_);
-   args.AppendInteger(object_id_);
-+<<<<<<< .our
-   auto* frame_host = web_contents()->GetMainFrame();
-+=======
-+  auto frame_host = web_contents()->GetMainFrame();
-+>>>>>>> .their
-   if (frame_host) {
-     frame_host->Send(new AtomFrameMsg_Message(frame_host->GetRoutingID(), false,
-                                               channel, args));
-changed in both
-  base   100644 315127822d1709802abf317c4d8cf49ec7e2bfaa atom/common/api/remote_object_freer.cc
-  our    100644 8afe8b9a32bc4ba4d5cdfc66ecf7036b8553cb48 atom/common/api/remote_object_freer.cc
-  their  100644 ef028441e3da5c7d56f6bdba2f162814ff6b21f3 atom/common/api/remote_object_freer.cc
-changed in both
-  base   100644 5fa39680ca814675d344665b3b2a6ce5d94e625f atom/common/atom_version.h
-  our    100644 65e7d19911559a40b1b258319df5fe0fa180354f atom/common/atom_version.h
-  their  100644 8ed7feec5bdc6c7a043e4deda125349ee57db21d atom/common/atom_version.h
-@@ -5,10 +5,17 @@
- #ifndef ATOM_COMMON_ATOM_VERSION_H_
- #define ATOM_COMMON_ATOM_VERSION_H_
- 
-+<<<<<<< .our
- #define ATOM_MAJOR_VERSION 4
- #define ATOM_MINOR_VERSION 0
- #define ATOM_PATCH_VERSION 0
- #define ATOM_PRE_RELEASE_VERSION -nightly.20180821
-+=======
-+#define ATOM_MAJOR_VERSION 2
-+#define ATOM_MINOR_VERSION 0
-+#define ATOM_PATCH_VERSION 0
-+#define ATOM_PRE_RELEASE_VERSION -beta.5
-+>>>>>>> .their
- 
- #ifndef ATOM_STRINGIFY
- #define ATOM_STRINGIFY(n) ATOM_STRINGIFY_HELPER(n)
-changed in both
-  base   100644 a7908ef30c6bafc4aca1da9a870f7ae12703fe04 atom/common/crash_reporter/crash_reporter_win.cc
-  our    100644 c574da71c9de9bd8c7b7cad57d3a0f84708fb97c atom/common/crash_reporter/crash_reporter_win.cc
-  their  100644 49f90b7e6665727b697a243414544bae304fde6e atom/common/crash_reporter/crash_reporter_win.cc
-changed in both
-  base   100644 cff228ba49068a8a683257e9ac50778437a56c45 atom/common/linux/application_info.cc
-  our    100644 3354c73b8b60f77cf054f975ea713d96b7e7683e atom/common/linux/application_info.cc
-  their  100644 05bd7f6fc15015a4f570e36801aea622a8f0cb3a atom/common/linux/application_info.cc
-@@ -19,7 +19,11 @@
- namespace {
- 
- GDesktopAppInfo* get_desktop_app_info() {
-+<<<<<<< .our
-   GDesktopAppInfo* ret = nullptr;
-+=======
-+  GDesktopAppInfo * ret = nullptr;
-+>>>>>>> .their
- 
-   std::string desktop_id;
-   if (brightray::platform_util::GetDesktopName(&desktop_id))
-changed in both
-  base   100644 eed6e7bc092f84bd1bde673c27f5fe5363c7783c atom/common/options_switches.cc
-  our    100644 8b1836f80c583e4db68971ff1b00ca4f86356b45 atom/common/options_switches.cc
-  their  100644 c1cd185443c0fdbadeb7ba2e174d2048ab2d45d7 atom/common/options_switches.cc
-@@ -188,6 +188,9 @@
- // The application path
- const char kAppPath[] = "app-path";
- 
-+// The context ID for this process
-+const char kContextId[] = "context-id";
-+
- // The command line switch versions of the options.
- const char kBackgroundColor[] = "background-color";
- const char kPreloadScript[] = "preload";
-changed in both
-  base   100644 525301971c8a05c45e12aada7d0534b84307aebf atom/common/options_switches.h
-  our    100644 5f6d7e9d38120668ed06922ced2f8d6a6e27a52b atom/common/options_switches.h
-  their  100644 9d65bc376925906063c24a9a254b2c31c7e22c34 atom/common/options_switches.h
-@@ -92,6 +92,7 @@
- extern const char kSecureSchemes[];
- extern const char kAppUserModelId[];
- extern const char kAppPath[];
-+extern const char kContextId[];
- 
- extern const char kBackgroundColor[];
- extern const char kPreloadScript[];
-changed in both
-  base   100644 7bee1411ba1c2fbac516ff8b65bcbd89f6132819 atom/renderer/api/atom_api_renderer_ipc.cc
-  our    100644 3e48a4f7d0c11f40e6360b0acc2c83c38e671319 atom/renderer/api/atom_api_renderer_ipc.cc
-  their  100644 ad6a12b90d525e9c6a49fac7a5d122b8c2c295f9 atom/renderer/api/atom_api_renderer_ipc.cc
-@@ -12,8 +12,13 @@
- #include "native_mate/dictionary.h"
- #include "third_party/WebKit/public/web/WebLocalFrame.h"
- 
-+<<<<<<< .our
- using blink::WebLocalFrame;
- using content::RenderFrame;
-+=======
-+using content::RenderFrame;
-+using blink::WebLocalFrame;
-+>>>>>>> .their
- 
- namespace atom {
- 
-@@ -48,10 +53,17 @@
- 
-   RenderFrame* render_frame = GetCurrentRenderFrame();
-   if (render_frame == nullptr)
-+<<<<<<< .our
-     return result;
- 
-   IPC::SyncMessage* message = new AtomFrameHostMsg_Message_Sync(
-       render_frame->GetRoutingID(), channel, arguments, &result);
-+=======
-+    return json;
-+
-+  IPC::SyncMessage* message = new AtomFrameHostMsg_Message_Sync(
-+      render_frame->GetRoutingID(), channel, arguments, &json);
-+>>>>>>> .their
-   bool success = render_frame->Send(message);
- 
-   if (!success)
-changed in both
-  base   100644 d0164f44a0a523b26a919e02b5b7add25a0e7224 atom/renderer/api/atom_api_web_frame.cc
-  our    100644 f0f7ef249d73876f7107d3d3865e8fc71ee33945 atom/renderer/api/atom_api_web_frame.cc
-  their  100644 fe8d5c9c24a6da8d77615df1c366ac9b2c7a0778 atom/renderer/api/atom_api_web_frame.cc
-changed in both
-  base   100644 1971a26c1c5d4f5c5f5f029e6334f157a16b5394 atom/renderer/atom_render_frame_observer.cc
-  our    100644 ea2355fd968339600ae8093524f1c3dcfd2f4ff3 atom/renderer/atom_render_frame_observer.cc
-  their  100644 4ddf9186b723091ef91d69cfaedc4fbdd1ac09fa atom/renderer/atom_render_frame_observer.cc
-@@ -7,6 +7,8 @@
- #include <string>
- #include <vector>
- 
-+#include "atom/common/native_mate_converters/string16_converter.h"
-+
- #include "atom/common/api/api_messages.h"
- #include "atom/common/api/event_emitter_caller.h"
- #include "atom/common/native_mate_converters/value_converter.h"
-@@ -72,7 +74,12 @@
-     RendererClientBase* renderer_client)
-     : content::RenderFrameObserver(frame),
-       render_frame_(frame),
-+<<<<<<< .our
-       renderer_client_(renderer_client) {
-+=======
-+      renderer_client_(renderer_client),
-+      document_created_(false) {
-+>>>>>>> .their
-   // Initialise resource for directory listing.
-   net::NetModule::SetResourceProvider(NetResourceProvider);
- }
-@@ -195,8 +202,13 @@
- }
- 
- void AtomRenderFrameObserver::EmitIPCEvent(blink::WebLocalFrame* frame,
-+<<<<<<< .our
-                                            const base::string16& channel,
-                                            const base::ListValue& args) {
-+=======
-+                                          const base::string16& channel,
-+                                          const base::ListValue& args) {
-+>>>>>>> .their
-   if (!frame)
-     return;
- 
-changed in both
-  base   100644 248d5a68096dedea0f6ffb3c9df38ff3373e7c18 atom/renderer/atom_render_frame_observer.h
-  our    100644 e774741c019956a3bff00db2f6d2b133bf1be6de atom/renderer/atom_render_frame_observer.h
-  their  100644 d4f3d0c7d5c454bb65a190f59b26501137dd04e0 atom/renderer/atom_render_frame_observer.h
-@@ -56,7 +56,11 @@
- 
-   content::RenderFrame* render_frame_;
-   RendererClientBase* renderer_client_;
-+<<<<<<< .our
-   bool document_created_ = false;
-+=======
-+  bool document_created_;
-+>>>>>>> .their
- 
-   DISALLOW_COPY_AND_ASSIGN(AtomRenderFrameObserver);
- };
-changed in both
-  base   100644 4d3e7cba7a65330a45a5f2aebba90c257b206e35 atom/renderer/atom_render_view_observer.h
-  our    100644 097616e12369662473c12645a93e27cffcb55e3b atom/renderer/atom_render_view_observer.h
-  their  100644 ca9fb01288e3bd4788c7718f0feb8b37307383e6 atom/renderer/atom_render_view_observer.h
-@@ -14,7 +14,11 @@
-   explicit AtomRenderViewObserver(content::RenderView* render_view);
- 
-  protected:
-+<<<<<<< .our
-   ~AtomRenderViewObserver() override;
-+=======
-+  virtual ~AtomRenderViewObserver();
-+>>>>>>> .their
- 
-  private:
-   // content::RenderViewObserver implementation.
-changed in both
-  base   100644 82ba9d024350009ae86bc5406513c8086073990a atom/renderer/atom_renderer_client.cc
-  our    100644 204f17c2cf0d2d4ec4a71bdbecfcd1cbdc5fc8be atom/renderer/atom_renderer_client.cc
-  their  100644 12e8fa2603a1b533646b300efbf312b9cb2d8361 atom/renderer/atom_renderer_client.cc
-changed in both
-  base   100644 07d20bda8b00b1acdb823546f5e606154278cd4e atom/renderer/atom_sandboxed_renderer_client.cc
-  our    100644 6e29fe45a69f44856d7fca449ec1be4eaf6970a2 atom/renderer/atom_sandboxed_renderer_client.cc
-  their  100644 4a97a5da54fbc371abd4f11c8901ac7ed5b0df07 atom/renderer/atom_sandboxed_renderer_client.cc
-@@ -12,7 +12,10 @@
- #include "atom/common/options_switches.h"
- #include "atom/renderer/api/atom_api_renderer_ipc.h"
- #include "atom/renderer/atom_render_frame_observer.h"
-+<<<<<<< .our
- #include "base/base_paths.h"
-+=======
-+>>>>>>> .their
- #include "base/command_line.h"
- #include "base/files/file_path.h"
- #include "base/path_service.h"
-@@ -20,7 +23,10 @@
- #include "chrome/renderer/printing/print_web_view_helper.h"
- #include "content/public/renderer/render_frame.h"
- #include "native_mate/dictionary.h"
-+<<<<<<< .our
- #include "third_party/WebKit/public/web/WebDocument.h"
-+=======
-+>>>>>>> .their
- #include "third_party/WebKit/public/web/WebKit.h"
- 
- #include "atom/common/node_includes.h"
-@@ -102,12 +108,19 @@
-   AtomSandboxedRenderFrameObserver(content::RenderFrame* render_frame,
-                                    AtomSandboxedRendererClient* renderer_client)
-       : AtomRenderFrameObserver(render_frame, renderer_client),
-+<<<<<<< .our
-         renderer_client_(renderer_client) {}
-+=======
-+        v8_converter_(new atom::V8ValueConverter),
-+        renderer_client_(renderer_client) {
-+    v8_converter_->SetDisableNode(true);
-+  }
-+>>>>>>> .their
- 
-  protected:
-   void EmitIPCEvent(blink::WebLocalFrame* frame,
-                     const base::string16& channel,
--                    const base::ListValue& args) override {
-+                    const base::ListValue& args) {
-     if (!frame)
-       return;
- 
-changed in both
-  base   100644 89af0932d10a598f87dd28ec4b32ae3b2e0eadca atom/renderer/renderer_client_base.cc
-  our    100644 69490420ef5b8f87e7cb8fd97ebd5ec4509fa1ae atom/renderer/renderer_client_base.cc
-  their  100644 af9dfe39367ff1014e558afee2f0fe5ab0e7456e atom/renderer/renderer_client_base.cc
-@@ -161,7 +161,10 @@
- 
- void RendererClientBase::RenderFrameCreated(
-     content::RenderFrame* render_frame) {
-+<<<<<<< .our
- #if defined(TOOLKIT_VIEWS)
-+=======
-+>>>>>>> .their
-   new AutofillAgent(render_frame);
- #endif
- #if defined(ENABLE_PEPPER_FLASH)
-changed in both
-  base   100644 065fe818a64586b6f786cdaa163c40b8a3aacabe brightray/brightray.gyp
-  our    100644 f233257e88bad8f0ff703034bea02e4715a5b5b9 brightray/brightray.gyp
-  their  100644 e42bbce42ae24faed7267e50e8efa7be4b66d215 brightray/brightray.gyp
-@@ -178,6 +178,7 @@
-                 ],
-               },
-             }],
-+<<<<<<< .our
-             # Due to strange linker behavior, component build of arm needs to
-             # be linked with libjpeg.a explicitly.
-             ['target_arch=="arm" and libchromiumcontent_component==1', {
-@@ -187,6 +188,8 @@
-                 ],
-               },
-             }],
-+=======
-+>>>>>>> .their
-           ],
-         }],  # OS=="linux"
-         ['OS=="mac"', {
-changed in both
-  base   100644 143a5fdea3eb6ad7709fa8383298029a24c1b407 brightray/browser/linux/libnotify_notification.cc
-  our    100644 0725ffded989d3c6bce753a210e464deca346ad1 brightray/browser/linux/libnotify_notification.cc
-  their  100644 7f9fb35e434f7cc85cf4145661e754ff4a0d84fc brightray/browser/linux/libnotify_notification.cc
-changed in both
-  base   100644 04033f451e045ee7211f0a7152d46c5010a55b72 brightray/browser/url_request_context_getter.h
-  our    100644 941a5782b14a941bb25a7a9ef6ca6d73f8bc3ec1 brightray/browser/url_request_context_getter.h
-  their  100644 1a26704d380ab7d113c4e2b0deb940a2d674f96b brightray/browser/url_request_context_getter.h
-@@ -76,11 +76,14 @@
-       const override;
- 
-   net::URLRequestJobFactory* job_factory() const { return job_factory_; }
-+<<<<<<< .our
-   void set_delegate(Delegate* delegate) { delegate_ = delegate; }
- 
-   // Discard reference to URLRequestContext and inform observers to
-   // shutdown. Must be called only on IO thread.
-   void NotifyContextShuttingDown(std::unique_ptr<ResourceContext>);
-+=======
-+>>>>>>> .their
- 
-  private:
-   friend class BrowserContext;
-changed in both
-  base   100644 08b203a23291ba0e2ba254873074178da4921123 brightray/common/application_info_win.cc
-  our    100644 a0256372bbdbbc1d77cb84885faab42a27f55c9f brightray/common/application_info_win.cc
-  their  100644 89ea0aceb6784119ad65783cfd1c019e7aedbf57 brightray/common/application_info_win.cc
-changed in both
-  base   100644 6a7d91f135c4b904e6d3172da91e7813793a2fba brightray/filenames.gypi
-  our    100644 b9e2d96175f8ee2d407db9c49b2e2b74756327de brightray/filenames.gypi
-  their  100644 9ddd990cfa52886ead940c428d1f355ef6234d9a brightray/filenames.gypi
-changed in both
-  base   100644 2be2da597664c1913a665ad51de5becc42658d0f docs/api/browser-window.md
-  our    100644 dff61dd336f047cf2f6f06228b2df2b98ff2304d docs/api/browser-window.md
-  their  100644 a6fab3f609c6ffea07e47cd9256451eeb53df600 docs/api/browser-window.md
-removed in local
-  base   100644 7dfc6084f5c94bfb924438e7efa50260d38b9144 docs/tutorial/planned-breaking-changes.md
-  their  100644 00e01f4f8c3a85f0e535a00c11e22f3595bff4b9 docs/tutorial/planned-breaking-changes.md
-changed in both
-  base   100644 53ad35c63321e74a5023197ef2e075584e0f268b electron.gyp
-  our    100644 944ddab2a3fd879044e31677e4bac2843fffbdee electron.gyp
-  their  100644 0e5903bde4b5ed676dbb270aeddf4c453381eea1 electron.gyp
-@@ -4,7 +4,11 @@
-     'product_name%': 'Electron',
-     'company_name%': 'GitHub, Inc',
-     'company_abbr%': 'github',
-+<<<<<<< .our
-     'version%': '4.0.0-nightly.20180821',
-+=======
-+    'version%': '2.0.0-beta.5',
-+>>>>>>> .their
-     'js2c_input_dir': '<(SHARED_INTERMEDIATE_DIR)/js2c',
-   },
-   'includes': [
-changed in both
-  base   100644 381a2a866372ebe06f374529c634af411c864ba0 lib/browser/api/app.js
-  our    100644 66f6ae651acf10fb19b8ec068fc5280850dd3d91 lib/browser/api/app.js
-  their  100644 1ea1daddca84dfeba57b7b7883ebb754b8508d2d lib/browser/api/app.js
-changed in both
-  base   100644 da5ff57a113f7a063d1409ff56003db4bd04e68a lib/browser/api/menu.js
-  our    100644 506e3525c10ce142cafe3fc1bf4de1c255e48503 lib/browser/api/menu.js
-  their  100644 e246a089478555f15a6b4bd79255d2bbdb43c705 lib/browser/api/menu.js
-@@ -47,7 +47,11 @@
-   this.delegate = delegate
- }
- 
-+<<<<<<< .our
- Menu.prototype.popup = function (options = {}) {
-+=======
-+Menu.prototype.popup = function (options) {
-+>>>>>>> .their
-   if (options == null || typeof options !== 'object') {
-     throw new TypeError('Options must be an object')
-   }
-merged
-  result 100644 bbbc1bbe1727dd30352c4836cea489145cd7ad7d lib/browser/api/screen.js
-  our    100644 8287bfa8bfdc6db322a05059fd5c8ba58e802db9 lib/browser/api/screen.js
-@@ -1,8 +1,17 @@
- const {EventEmitter} = require('events')
-+const {deprecate} = require('electron')
- const {screen, Screen} = process.atomBinding('screen')
- 
- // Screen is an EventEmitter.
- Object.setPrototypeOf(Screen.prototype, EventEmitter.prototype)
- EventEmitter.call(screen)
- 
-+const nativeFn = screen.getMenuBarHeight
-+screen.getMenuBarHeight = function () {
-+  if (!process.noDeprecations) {
-+    deprecate.warn('screen.getMenuBarHeight', 'screen.getPrimaryDisplay().workArea')
-+  }
-+  return nativeFn.call(this)
-+}
-+
- module.exports = screen
-changed in both
-  base   100644 0338b776f8938c1548ea9786385fe75db9db3403 lib/browser/guest-view-manager.js
-  our    100644 1e4029e39a981c85fb6ff18c5ccd52f81b3c56f2 lib/browser/guest-view-manager.js
-  their  100644 dd8e0ff1a9239e5c7a92f90a58da866c076011ca lib/browser/guest-view-manager.js
-changed in both
-  base   100644 50e890e225a315718d04a0028fb6bf2feb4092ce lib/browser/guest-window-manager.js
-  our    100644 7253c1942b0956ae6b9b0c80a23470fc26669b8a lib/browser/guest-window-manager.js
-  their  100644 ec77a7abdff1ba27e55da513c10d084d7978b7c0 lib/browser/guest-window-manager.js
-@@ -65,7 +65,11 @@
-   // Inherit certain option values from parent window
-   const webPreferences = embedder.getLastWebPreferences()
-   for (const [name, value] of inheritedWebPreferences) {
-+<<<<<<< .our
-     if (webPreferences[name] === value) {
-+=======
-+    if (embedder.getLastWebPreferences()[name] === value) {
-+>>>>>>> .their
-       options.webPreferences[name] = value
-     }
-   }
-changed in both
-  base   100644 c0cd09dea4273642aa780756985e9c90dbe164d3 lib/browser/rpc-server.js
-  our    100644 ff9f77321de3a4145946b67f3fe2a597f98e2510 lib/browser/rpc-server.js
-  their  100644 6321c0526f25a99d80228bbd569cc000ec76dee2 lib/browser/rpc-server.js
-@@ -387,9 +387,15 @@
-   objectsRegistry.remove(event.sender, contextId, id)
- })
- 
-+<<<<<<< .our
- ipcMain.on('ELECTRON_BROWSER_CONTEXT_RELEASE', (event, contextId) => {
-   objectsRegistry.clear(event.sender, contextId)
-   event.returnValue = null
-+=======
-+ipcMain.on('ELECTRON_BROWSER_CONTEXT_RELEASE', (e, contextId) => {
-+  objectsRegistry.clear(contextId)
-+  e.returnValue = null
-+>>>>>>> .their
- })
- 
- ipcMain.on('ELECTRON_BROWSER_GUEST_WEB_CONTENTS', function (event, contextId, guestInstanceId) {
-changed in both
-  base   100644 6dc774049def3acbd13b79dfd559c12d4eebd657 lib/common/api/crash-reporter.js
-  our    100644 1090d425e4c5cdf89a03d470718324ef16963472 lib/common/api/crash-reporter.js
-  their  100644 1b20fa52aab741e5dd34de7872f36798ec7c1c68 lib/common/api/crash-reporter.js
-changed in both
-  base   100644 a4f8072ed57642e1ca7d1066e132875da7ad3f46 lib/renderer/api/remote.js
-  our    100644 59117f8f2dd977fc1817a6b1d540b616ddcb0dae lib/renderer/api/remote.js
-  their  100644 3de99ecab255308662a4b65c6b45b573d723f4da lib/renderer/api/remote.js
-@@ -293,6 +293,14 @@
-   callbacksRegistry.remove(id)
- })
- 
-+<<<<<<< .our
-+=======
-+process.on('exit', () => {
-+  const command = 'ELECTRON_BROWSER_CONTEXT_RELEASE'
-+  ipcRenderer.sendSync(command, initialContext)
-+})
-+
-+>>>>>>> .their
- exports.require = (module) => {
-   const command = 'ELECTRON_BROWSER_REQUIRE'
-   const meta = ipcRenderer.sendSync(command, contextId, module)
-@@ -317,6 +325,15 @@
-   return metaToValue(ipcRenderer.sendSync('ELECTRON_BROWSER_CURRENT_WEB_CONTENTS', contextId))
- }
- 
-+const CONTEXT_ARG = '--context-id='
-+let initialContext = process.argv.find(arg => arg.startsWith(CONTEXT_ARG))
-+if (initialContext) {
-+  initialContext = parseInt(initialContext.substr(CONTEXT_ARG.length), 10)
-+} else {
-+  // In sandbox we need to pull this from remote
-+  initialContext = exports.getCurrentWebContents().getId()
-+}
-+
- // Get a global object in browser.
- exports.getGlobal = (name) => {
-   const command = 'ELECTRON_BROWSER_GLOBAL'
-changed in both
-  base   100644 1cb69436dd479baf54b9805c04c0c31b20f24fad lib/renderer/init.js
-  our    100644 2470a5e8be80e770b0c03f6a439a71e72ae12a1b lib/renderer/init.js
-  their  100644 795de06274030aaa1b3ad08a8dd6b259639b0e00 lib/renderer/init.js
-changed in both
-  base   100644 d2da884f1d9caf3d633de25837cb2128f564f2fb lib/renderer/security-warnings.js
-  our    100644 b24f9e28b879154457be0342b9d4b44c0e651253 lib/renderer/security-warnings.js
-  their  100644 4f7d6ef9e596cdc3a5c7e1f2b89b24b9cd67de1d lib/renderer/security-warnings.js
-changed in both
-  base   100644 9d3b0da9c80b223e4a1188311a1121796eb9f7ae package.json
-  our    100644 c081cd89450cd50efba1ec280ff1349a96ea3ce0 package.json
-  their  100644 0ffa2309e83e2205ec4fa907f9e94586e895bf2a package.json
-@@ -1,6 +1,10 @@
- {
-   "name": "electron",
-+<<<<<<< .our
-   "version": "4.0.0-nightly.20180821",
-+=======
-+  "version": "2.0.0-beta.5",
-+>>>>>>> .their
-   "repository": "https://github.com/electron/electron",
-   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
-   "devDependencies": {
-@@ -25,8 +29,12 @@
-     "remark-cli": "^4.0.0",
-     "remark-preset-lint-markdown-style-guide": "^2.1.1",
-     "request": "^2.68.0",
-+<<<<<<< .our
-     "semver": "^5.5.0",
-     "serve": "^6.5.8",
-+=======
-+    "serve": "^6.5.3",
-+>>>>>>> .their
-     "standard": "^10.0.0",
-     "standard-markdown": "^4.0.0",
-     "sumchecker": "^2.0.2",
-changed in both
-  base   100755 c97cd8336f7d7980911d0bdea93137e7bc95ba24 script/build.py
-  our    100755 fb2b95d3bb71a25ce1ca58acf596afdc0f2cc5bd script/build.py
-  their  100755 2a2231394207c28fcd2b86d3d9f9b079b08d637e script/build.py
-@@ -40,6 +40,12 @@
-   if is_verbose_mode():
-     ninja.append('-v')
- 
-+<<<<<<< .our
-+=======
-+  args = parse_args()
-+  if args.ninja_path:
-+    ninja = args.ninja_path
-+>>>>>>> .their
-   if args.libcc:
-     if ('D' not in args.configuration
-         or not os.path.exists(GCLIENT_DONE)
-@@ -93,12 +99,15 @@
-   parser.add_argument('--ninja-path',
-                       help='Path of ninja command to use.',
-                       required=False)
-+<<<<<<< .our
-   parser.add_argument('--compdb',
-                       help=(
-                         'Generate JSON compilation database. This will not '
-                         'trigger actual build. '
-                       ),
-                       action='store_true', default=False)
-+=======
-+>>>>>>> .their
-   return parser.parse_args()
- 
- 
-changed in both
-  base   100644 ec2459198bf254e7e380e4ae63097168041d0068 script/ci-release-build.js
-  our    100644 be9f9597387f5f8b7bfddc61c202f32ce4c6d478 script/ci-release-build.js
-  their  100644 dd722faea96002286202b6054dfdb75a64bae59d script/ci-release-build.js
-@@ -18,9 +18,14 @@
-   'electron-linux-x64'
- ]
- 
-+<<<<<<< .our
- const vstsJobs = [
-   'electron-release-mas-x64',
-   'electron-release-osx-x64'
-+=======
-+const jenkinsJobs = [
-+  'electron-release'
-+>>>>>>> .their
- ]
- 
- async function makeRequest (requestOptions, parseResponse) {
-@@ -51,6 +56,10 @@
- }
- 
- async function circleCIcall (buildUrl, targetBranch, job, options) {
-+<<<<<<< .our
-+=======
-+  assert(process.env.CIRCLE_TOKEN, 'CIRCLE_TOKEN not found in environment')
-+>>>>>>> .their
-   console.log(`Triggering CircleCI to run build job: ${job} on branch: ${targetBranch} with release flag.`)
-   let buildRequest = {
-     'build_parameters': {
-@@ -92,8 +101,14 @@
-   }
- }
- 
-+<<<<<<< .our
- async function callAppVeyor (targetBranch, job, options) {
-   console.log(`Triggering AppVeyor to run build job: ${job} on branch: ${targetBranch} with release flag.`)
-+=======
-+async function buildAppVeyor (targetBranch, options) {
-+  console.log(`Triggering AppVeyor to run build on branch: ${targetBranch} with release flag.`)
-+  assert(process.env.APPVEYOR_TOKEN, 'APPVEYOR_TOKEN not found in environment')
-+>>>>>>> .their
-   let environmentVariables = {}
- 
-   if (options.ghRelease) {
-@@ -132,13 +147,18 @@
- function buildCircleCI (targetBranch, options) {
-   const circleBuildUrl = `https://circleci.com/api/v1.1/project/github/electron/electron/tree/${targetBranch}?circle-token=${process.env.CIRCLE_TOKEN}`
-   if (options.job) {
-+<<<<<<< .our
-     assert(circleCIJobs.includes(options.job), `Unknown CircleCI job name: ${options.job}. Valid values are: ${circleCIJobs}.`)
-+=======
-+    assert(circleCIJobs.includes(options.job), `Unknown CI job name: ${options.job}.`)
-+>>>>>>> .their
-     circleCIcall(circleBuildUrl, targetBranch, options.job, options)
-   } else {
-     circleCIJobs.forEach((job) => circleCIcall(circleBuildUrl, targetBranch, job, options))
-   }
- }
- 
-+<<<<<<< .our
- async function buildVSTS (targetBranch, options) {
-   if (options.job) {
-     assert(vstsJobs.includes(options.job), `Unknown VSTS CI job name: ${options.job}. Valid values are: ${vstsJobs}.`)
-@@ -152,6 +172,20 @@
- 
-   if (options.automaticRelease) {
-     environmentVariables.AUTO_RELEASE = 'true'
-+=======
-+async function buildJenkins (targetBranch, options) {
-+  assert(process.env.JENKINS_AUTH_TOKEN, 'JENKINS_AUTH_TOKEN not found in environment')
-+  assert(process.env.JENKINS_BUILD_TOKEN, 'JENKINS_BUILD_TOKEN not found in environment')
-+  let jenkinsCrumb = await getJenkinsCrumb()
-+
-+  if (options.job) {
-+    assert(jenkinsJobs.includes(options.job), `Unknown CI job name: ${options.job}.`)
-+    callJenkinsBuild(options.job, jenkinsCrumb, targetBranch, options)
-+  } else {
-+    jenkinsJobs.forEach((job) => {
-+      callJenkinsBuild(job, jenkinsCrumb, targetBranch, options)
-+    })
-+>>>>>>> .their
-   }
- 
-   let requestOpts = {
-@@ -176,6 +210,7 @@
-   buildsToRun.forEach((build) => callVSTSBuild(build, targetBranch, environmentVariables))
- }
- 
-+<<<<<<< .our
- async function callVSTSBuild (build, targetBranch, environmentVariables) {
-   let buildBody = {
-     definition: build,
-@@ -198,6 +233,33 @@
-   }
-   let vstsResponse = await makeRequest(requestOpts, true).catch(err => {
-     console.log(`Error calling VSTS for job ${build.name}`, err)
-+=======
-+async function callJenkinsBuild (job, jenkinsCrumb, targetBranch, options) {
-+  console.log(`Triggering Jenkins to run build job: ${job} on branch: ${targetBranch} with release flag.`)
-+  let jenkinsParams = {
-+    token: process.env.JENKINS_BUILD_TOKEN,
-+    BRANCH: targetBranch
-+  }
-+  if (!options.ghRelease) {
-+    jenkinsParams.RUN_RELEASE_BUILD = 1
-+  }
-+  if (options.automaticRelease) {
-+    jenkinsParams.AUTO_RELEASE = 'true'
-+  }
-+  await callJenkins(`job/${job}/buildWithParameters`, jenkinsParams, jenkinsCrumb)
-+    .catch(err => {
-+      console.log(`Error calling Jenkins build`, err)
-+    })
-+  let buildUrl = `${jenkinsServer}/job/${job}/lastBuild/`
-+  console.log(`Jenkins build request successful.  Check build status at ${buildUrl}.`)
-+}
-+
-+async function getJenkinsCrumb () {
-+  let crumbResponse = await callJenkins('crumbIssuer/api/xml', {
-+    xpath: 'concat(//crumbRequestField,":",//crumb)'
-+  }).catch(err => {
-+    console.log(`Error getting jenkins crumb:`, err)
-+>>>>>>> .their
-   })
-   console.log(`VSTS release build request for ${build.name} successful. Check ${vstsResponse._links.web.href} for status.`)
- }
-@@ -213,8 +275,13 @@
-         buildAppVeyor(targetBranch, options)
-         break
-       }
-+<<<<<<< .our
-       case 'VSTS': {
-         buildVSTS(targetBranch, options)
-+=======
-+      case 'Jenkins': {
-+        buildJenkins(targetBranch, options)
-+>>>>>>> .their
-         break
-       }
-       default: {
-@@ -225,7 +292,11 @@
-   } else {
-     buildCircleCI(targetBranch, options)
-     buildAppVeyor(targetBranch, options)
-+<<<<<<< .our
-     buildVSTS(targetBranch, options)
-+=======
-+    buildJenkins(targetBranch, options)
-+>>>>>>> .their
-   }
- }
- 
-@@ -238,7 +309,11 @@
-   const targetBranch = args._[0]
-   if (args._.length < 1) {
-     console.log(`Trigger CI to build release builds of electron.
-+<<<<<<< .our
-     Usage: ci-release-build.js [--job=CI_JOB_NAME] [--ci=CircleCI|AppVeyor|VSTS] [--ghRelease] [--automaticRelease] TARGET_BRANCH
-+=======
-+    Usage: ci-release-build.js [--job=CI_JOB_NAME] [--ci=CircleCI|AppVeyor|Jenkins] [--ghRelease] [--automaticRelease] TARGET_BRANCH
-+>>>>>>> .their
-     `)
-     process.exit(0)
-   }
-changed in both
-  base   100644 76f39fc26973e01145f7758785778075ddbaa648 script/lib/dbus_mock.py
-  our    100644 9b9c8029cb75a9d84c632d04f234c2020542ca68 script/lib/dbus_mock.py
-  their  100644 00b1fd98d7837cfef60460f9d456a5cb8340761c script/lib/dbus_mock.py
-@@ -4,21 +4,29 @@
- import atexit
- import os
- import sys
-+<<<<<<< .our
-+=======
-+
-+>>>>>>> .their
- 
- 
- def stop():
-     DBusTestCase.stop_dbus(DBusTestCase.system_bus_pid)
-     DBusTestCase.stop_dbus(DBusTestCase.session_bus_pid)
-+<<<<<<< .our
- 
- def start():
-     dbusmock_log = sys.stdout if is_verbose_mode() else open(os.devnull, 'w')
- 
-     DBusTestCase.start_system_bus()
-     DBusTestCase.spawn_server_template('logind', None, dbusmock_log)
-+=======
-+>>>>>>> .their
- 
-     DBusTestCase.start_session_bus()
-     DBusTestCase.spawn_server_template('notification_daemon', None, dbusmock_log)
- 
-+<<<<<<< .our
- if __name__ == '__main__':
-     import subprocess
-     start()
-@@ -26,3 +34,14 @@
-         subprocess.check_call(sys.argv[1:])
-     finally:
-         stop()
-+=======
-+atexit.register(cleanup)
-+
-+dbusmock_log = sys.stdout if is_verbose_mode() else open(os.devnull, 'w')
-+
-+DBusTestCase.start_system_bus()
-+DBusTestCase.spawn_server_template('logind', None, dbusmock_log)
-+
-+DBusTestCase.start_session_bus()
-+DBusTestCase.spawn_server_template('notification_daemon', None, dbusmock_log)
-+>>>>>>> .their
-changed in both
-  base   100755 69882928765a56f50702a371af322710ef3ccf22 script/prepare-release.js
-  our    100755 72a28b719bf1ff7770692caef86c76746c4d8edf script/prepare-release.js
-  their  100755 bc3f5158d2af1e44ca00fd5485bc89f28c604290 script/prepare-release.js
-@@ -5,6 +5,10 @@
- const args = require('minimist')(process.argv.slice(2), {
-   boolean: ['automaticRelease', 'notesOnly', 'stable']
- })
-+<<<<<<< .our
-+=======
-+const assert = require('assert')
-+>>>>>>> .their
- const ciReleaseBuild = require('./ci-release-build')
- const { execSync } = require('child_process')
- const fail = '\u2717'.red
-@@ -21,7 +25,11 @@
- // via conventional-recommended-bump
- 
- if (!versionType && !args.notesOnly) {
-+<<<<<<< .our
-   console.log(`Usage: prepare-release versionType [stable | beta | nightly]` +
-+=======
-+  console.log(`Usage: prepare-release versionType [major | minor | patch | beta]` +
-+>>>>>>> .their
-      ` (--stable) (--notesOnly) (--automaticRelease) (--branch)`)
-   process.exit(1)
- }
-@@ -222,7 +230,11 @@
- }
- 
- async function verifyNewVersion () {
-+<<<<<<< .our
-   let newVersion = await getNewVersion(true)
-+=======
-+  let newVersion = getNewVersion(true)
-+>>>>>>> .their
-   let response
-   if (args.automaticRelease) {
-     response = 'y'
-@@ -258,9 +270,26 @@
- }
- 
- async function prepareRelease (isBeta, notesOnly) {
-+<<<<<<< .our
-   if (args.dryRun) {
-     let newVersion = await getNewVersion(true)
-     console.log(newVersion)
-+=======
-+  if (args.automaticRelease && (pkg.version.indexOf('beta') === -1 ||
-+      versionType !== 'beta')) {
-+    console.log(`${fail} Automatic release is only supported for beta releases`)
-+    process.exit(1)
-+  }
-+  let currentBranch
-+  if (args.branch) {
-+    currentBranch = args.branch
-+  } else {
-+    currentBranch = await getCurrentBranch(gitDir)
-+  }
-+  if (notesOnly) {
-+    let releaseNotes = await getReleaseNotes(currentBranch)
-+    console.log(`Draft release notes are: \n${releaseNotes}`)
-+>>>>>>> .their
-   } else {
-     const currentBranch = (args.branch) ? args.branch : await getCurrentBranch(gitDir)
-     if (notesOnly) {
-changed in both
-  base   100755 9863ef912cd5a940428e9ac22e1993494b2b1828 script/release.js
-  our    100755 84e00ad4f309201f151c3f8fcbaf9ee536c9b6cb script/release.js
-  their  100755 5e694366dc90a77582111ab2afd29176e63340e4 script/release.js
-@@ -6,7 +6,6 @@
- const fs = require('fs')
- const { execSync } = require('child_process')
- const GitHub = require('github')
--const { GitProcess } = require('dugite')
- const nugget = require('nugget')
- const pkg = require('../package.json')
- const pkgVersion = `v${pkg.version}`
-@@ -95,6 +94,10 @@
-     `electron-${version}-linux-armv7l.zip`,
-     `electron-${version}-linux-ia32-symbols.zip`,
-     `electron-${version}-linux-ia32.zip`,
-+<<<<<<< .our
-+=======
-+//    `electron-${version}-linux-mips64el.zip`,
-+>>>>>>> .their
-     `electron-${version}-linux-x64-symbols.zip`,
-     `electron-${version}-linux-x64.zip`,
-     `electron-${version}-mas-x64-dsym.zip`,
-@@ -112,6 +115,10 @@
-     `ffmpeg-${version}-linux-arm64.zip`,
-     `ffmpeg-${version}-linux-armv7l.zip`,
-     `ffmpeg-${version}-linux-ia32.zip`,
-+<<<<<<< .our
-+=======
-+//    `ffmpeg-${version}-linux-mips64el.zip`,
-+>>>>>>> .their
-     `ffmpeg-${version}-linux-x64.zip`,
-     `ffmpeg-${version}-mas-x64.zip`,
-     `ffmpeg-${version}-win32-ia32.zip`,
-@@ -180,7 +187,15 @@
- function uploadIndexJson () {
-   console.log('Uploading index.json to S3.')
-   let scriptPath = path.join(__dirname, 'upload-index-json.py')
-+<<<<<<< .our
-   runScript(scriptPath, [pkgVersion])
-+=======
-+  let scriptArgs = []
-+  if (args.automaticRelease) {
-+    scriptArgs.push('-R')
-+  }
-+  runScript(scriptPath, scriptArgs)
-+>>>>>>> .their
-   console.log(`${pass} Done uploading index.json to S3.`)
- }
- 
-@@ -446,6 +461,7 @@
-     `shasums defined in ${validationArgs.shaSumFile}.`)
- }
- 
-+<<<<<<< .our
- async function tagLibCC () {
-   const tag = `electron-${pkg.version}`
-   const libccDir = path.join(path.resolve(__dirname, '..'), 'vendor', 'libchromiumcontent')
-@@ -465,4 +481,6 @@
-   }
- }
- 
-+=======
-+>>>>>>> .their
- makeRelease(args.validateRelease)
-changed in both
-  base   100755 1f90ed795fcc3e739061cf4ae5c8ab9ea95a1236 script/test.py
-  our    100755 46cada435e1bd6ecaa2111cdf29e5aeb834b227e script/test.py
-  their  100755 cb17102557dca975208140b479168906100cfd74 script/test.py
-changed in both
-  base   100755 a35eb2f5b90272c8369bcfd511f976a4f64fa57f script/update-clang.sh
-  our    100755 0c7ab60533381e33152b8735aaccf41d5f0d6676 script/update-clang.sh
-  their  100755 6e4cf08216616a4b6a2ee896bba47b1ba5d469b5 script/update-clang.sh
-changed in both
-  base   100755 f5e5b3c7a6adcaf7005ad9242c1664ad2f243d1f script/upload-index-json.py
-  our    100755 55d0675d0707d34c806847f3a64aa77f20a4830d script/upload-index-json.py
-  their  100755 479e46bb811695482f5ea62060e4bef02af505f1 script/upload-index-json.py
-@@ -8,7 +8,6 @@
- from lib.util import s3put, scoped_cwd, safe_mkdir
- 
- SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
--OUT_DIR     = os.path.join(SOURCE_ROOT, 'out', 'D')
- 
- BASE_URL = 'https://electron-metadumper.herokuapp.com/?version='
- 
-@@ -35,6 +34,7 @@
-     raise Exception("Please set META_DUMPER_AUTH_HEADER")
-   # Upload the index.json.
-   with scoped_cwd(SOURCE_ROOT):
-+<<<<<<< .our
-     safe_mkdir(OUT_DIR)
-     index_json = os.path.relpath(os.path.join(OUT_DIR, 'index.json'))
- 
-@@ -42,9 +42,27 @@
- 
-     with open(index_json, "w") as f:
-       f.write(new_content)
-+=======
-+    if len(sys.argv) == 2 and sys.argv[1] == '-R':
-+      config = 'R'
-+    else:
-+      config = 'D'
-+    out_dir = os.path.join(SOURCE_ROOT, 'out', config)
-+    if sys.platform == 'darwin':
-+      electron = os.path.join(out_dir, '{0}.app'.format(PRODUCT_NAME),
-+                                'Contents', 'MacOS', PRODUCT_NAME)
-+    elif sys.platform == 'win32':
-+      electron = os.path.join(out_dir, '{0}.exe'.format(PROJECT_NAME))
-+    else:
-+      electron = os.path.join(out_dir, PROJECT_NAME)
-+    index_json = os.path.relpath(os.path.join(out_dir, 'index.json'))
-+    execute([electron,
-+             os.path.join('tools', 'dump-version-info.js'),
-+             index_json])
-+>>>>>>> .their
- 
-     bucket, access_key, secret_key = s3_config()
--    s3put(bucket, access_key, secret_key, OUT_DIR, 'atom-shell/dist',
-+    s3put(bucket, access_key, secret_key, out_dir, 'atom-shell/dist',
-           [index_json])
- 
- 
-changed in both
-  base   100644 0eda951b15d6fff609b6612589e222adb4f0720e spec/api-app-spec.js
-  our    100644 d224eda2989332c18d655cef05a8bacc2eb6d4b8 spec/api-app-spec.js
-  their  100644 5c2e0a0c7e6184e780b7ec031f9788f1f54eaca9 spec/api-app-spec.js
-@@ -9,7 +9,10 @@
- const {ipcRenderer, remote} = require('electron')
- const {closeWindow} = require('./window-helpers')
- 
-+<<<<<<< .our
- const {expect} = chai
-+=======
-+>>>>>>> .their
- const {app, BrowserWindow, Menu, ipcMain} = remote
- 
- const isCI = remote.getGlobal('isCi')
-@@ -186,11 +189,19 @@
- 
-       // Singleton will send us greeting data to let us know it's running.
-       // After that, ask it to exit gracefully and confirm that it does.
-+<<<<<<< .our
-       appProcess.stdout.on('data', data => appProcess.kill())
-       appProcess.on('exit', (code, sig) => {
-         const message = `code:\n${code}\nsig:\n${sig}`
-         expect(code).to.equal(0, message)
-         expect(sig).to.be.null(message)
-+=======
-+      appProcess.stdout.on('data', (data) => appProcess.kill())
-+      appProcess.on('exit', (code, sig) => {
-+        let message = ['code:', code, 'sig:', sig].join('\n')
-+        assert.equal(code, 0, message)
-+        assert.equal(sig, null, message)
-+>>>>>>> .their
-         done()
-       })
-     })
-@@ -948,4 +959,18 @@
-       return expect(app.whenReady()).to.be.eventually.fulfilled
-     })
-   })
-+
-+  describe('dock.setMenu', () => {
-+    before(function () {
-+      if (process.platform !== 'darwin') {
-+        this.skip()
-+      }
-+    })
-+
-+    it('keeps references to the menu', () => {
-+      app.dock.setMenu(new Menu())
-+      const v8Util = process.atomBinding('v8_util')
-+      v8Util.requestGarbageCollectionForTesting()
-+    })
-+  })
- })
-changed in both
-  base   100644 ab96021ebf4c4360fa581b5a695249456a9afeda spec/api-browser-view-spec.js
-  our    100644 968912a4abf3d759a1363e2420d2c21b7923dbd6 spec/api-browser-view-spec.js
-  their  100644 df239a8914527a2d62f652b878c97a7791f63a9d spec/api-browser-view-spec.js
-@@ -44,9 +44,15 @@
-   describe('BrowserView.isDestroyed()', () => {
-     it('returns correct value', () => {
-       view = new BrowserView()
-+<<<<<<< .our
-       expect(view.isDestroyed()).to.be.false()
-       view.destroy()
-       expect(view.isDestroyed()).to.be.true()
-+=======
-+      assert.ok(!view.isDestroyed())
-+      view.destroy()
-+      assert.ok(view.isDestroyed())
-+>>>>>>> .their
-     })
-   })
- 
-changed in both
-  base   100644 3033eb6a1f6cca3cf4874a54dd217ec62d2d82cd spec/api-browser-window-spec.js
-  our    100644 f4cba12ec19d224bc46fca898db42a99baf4972e spec/api-browser-window-spec.js
-  their  100644 efbf288ea8b78a4e439e8d1a5367850b2210eb82 spec/api-browser-window-spec.js
-@@ -763,6 +763,7 @@
-         w.addTabbedWindow(w)
-       }, /AddTabbedWindow cannot be called by a window on itself./)
-     })
-+<<<<<<< .our
-   })
- 
-   describe('BrowserWindow.setWindowButtonVisibility()', () => {
-@@ -790,6 +791,8 @@
-         w.setWindowButtonVisibility(true)
-       }, /Not supported for this window/)
-     })
-+=======
-+>>>>>>> .their
-   })
- 
-   describe('BrowserWindow.setVibrancy(type)', () => {
-changed in both
-  base   100644 b4d55cd70b70b42d52a026ff7b4ff3c47d1671df spec/api-crash-reporter-spec.js
-  our    100644 dd31b91e1244785412b87db96bb141599e5ccb0f spec/api-crash-reporter-spec.js
-  their  100644 ffa3c0370595f32b0c7d476b82bea133d6a87000 spec/api-crash-reporter-spec.js
-@@ -266,6 +266,7 @@
-   describe('getLastCrashReport', () => {
-     it('correctly returns the most recent report', () => {
-       const reports = crashReporter.getUploadedReports()
-+<<<<<<< .our
-       expect(reports).to.be.an('array')
-       expect(reports).to.have.lengthOf.at.least(2,
-           'There are not enough reports for this test')
-@@ -275,16 +276,31 @@
- 
-       // Let's find the newest report.
-       const {report: newestReport} = reports.reduce((acc, cur) => {
-+=======
-+      const lastReport = crashReporter.getLastCrashReport()
-+
-+      // Let's find the newest report
-+      const newestReport = reports.reduce((acc, cur) => {
-+>>>>>>> .their
-         const timestamp = new Date(cur.date).getTime()
-         return (timestamp > acc.timestamp)
-           ? { report: cur, timestamp: timestamp }
-           : acc
-+<<<<<<< .our
-       }, { timestamp: -Infinity })
-       assert(newestReport, 'Hey!')
- 
-       expect(lastReport.date.getTime()).to.be.equal(
-           newestReport.date.getTime(),
-           'Last report is not the newest.')
-+=======
-+      }, { timestamp: 0 })
-+
-+      assert(reports.length > 1, 'has more than 1 report')
-+      assert(lastReport != null, 'found a last report')
-+      assert(lastReport.date.toString() === newestReport.report.date.toString(),
-+        'last report is correct')
-+>>>>>>> .their
-     })
-   })
- 
-changed in both
-  base   100644 667f098bc4b9974a142435e7d3ddb762ac0f54a2 spec/api-menu-spec.js
-  our    100644 ed2749700c6c8bf299f507d52606c1ae3f597e5c spec/api-menu-spec.js
-  their  100644 3efb6ed8745843bb7e221fe25b3c75761a085759 spec/api-menu-spec.js
-@@ -649,6 +649,7 @@
-     })
- 
-     it('throws an error if options is not an object', () => {
-+<<<<<<< .our
-       expect(() => {
-         menu.popup('this is a string, not an object')
-       }).to.throw(/Options must be an object/)
-@@ -658,6 +659,11 @@
-       expect(() => {
-         menu.popup({})
-       }).to.not.throw()
-+=======
-+      assert.throws(() => {
-+        menu.popup()
-+      }, /Options must be an object/)
-+>>>>>>> .their
-     })
- 
-     it('should emit menu-will-show event', (done) => {
-added in both
-  our    100644 9ab56d88e50ae5891364cb271362e5ec0c0edd26 spec/api-notification-dbus-spec.js
-  their  100644 81c1b68f31d0c9490742d3bd4b4227abaaf72ca3 spec/api-notification-dbus-spec.js
-@@ -6,7 +6,11 @@
- //
- // See https://pypi.python.org/pypi/python-dbusmock to read about dbusmock.
- 
-+<<<<<<< .our
- const {expect} = require('chai')
-+=======
-+const assert = require('assert')
-+>>>>>>> .their
- const dbus = require('dbus-native')
- const Promise = require('bluebird')
- 
-@@ -27,12 +31,20 @@
-   before(async () => {
-     // init app
-     app.setName(appName)
-+<<<<<<< .our
-     app.setDesktopName(`${appName}.desktop`)
-+=======
-+    app.setDesktopName(appName + '.desktop')
-+>>>>>>> .their
-     // init dbus
-     const path = '/org/freedesktop/Notifications'
-     const iface = 'org.freedesktop.DBus.Mock'
-     const bus = dbus.sessionBus()
-+<<<<<<< .our
-     console.log(`session bus: ${process.env.DBUS_SESSION_BUS_ADDRESS}`)
-+=======
-+    console.log('session bus: ' + process.env.DBUS_SESSION_BUS_ADDRESS)
-+>>>>>>> .their
-     const service = bus.getService(serviceName)
-     const getInterface = Promise.promisify(service.getInterface, {context: service})
-     mock = await getInterface(path, iface)
-@@ -48,10 +60,17 @@
-     app.setVersion(realAppVersion)
-   })
- 
-+<<<<<<< .our
-   describe(`Notification module using ${serviceName}`, () => {
-     function onMethodCalled (done) {
-       function cb (name) {
-         console.log(`onMethodCalled: ${name}`)
-+=======
-+  describe('Notification module using ' + serviceName, () => {
-+    function onMethodCalled (done) {
-+      function cb (name) {
-+        console.log('onMethodCalled: ' + name)
-+>>>>>>> .their
-         if (name === 'Notify') {
-           mock.removeListener('MethodCalled', cb)
-           console.log('done')
-@@ -83,7 +102,11 @@
-       }
-     }
- 
-+<<<<<<< .our
-     before(done => {
-+=======
-+    before((done) => {
-+>>>>>>> .their
-       mock.on('MethodCalled', onMethodCalled(done))
-       // lazy load Notification after we listen to MethodCalled mock signal
-       Notification = require('electron').remote.Notification
-@@ -98,6 +121,7 @@
-       n.show()
-     })
- 
-+<<<<<<< .our
-     it(`should call ${serviceName} to show notifications`, async () => {
-       const calls = await getCalls()
-       expect(calls).to.be.an('array').of.lengthOf.at.least(1)
-@@ -108,6 +132,16 @@
- 
-       let args = unmarshalDBusNotifyArgs(lastCall[2])
-       expect(args).to.deep.equal({
-+=======
-+    it('should call ' + serviceName + ' to show notifications', async () => {
-+      const calls = await getCalls()
-+      assert(calls.length >= 1)
-+      let lastCall = calls[calls.length - 1]
-+      let methodName = lastCall[1]
-+      assert.equal(methodName, 'Notify')
-+      let args = unmarshalDBusNotifyArgs(lastCall[2])
-+      assert.deepEqual(args, {
-+>>>>>>> .their
-         app_name: appName,
-         replaces_id: 0,
-         app_icon: '',
-changed in both
-  base   100644 122170292838e951ade4989669c87a7531e89ba7 spec/api-web-contents-spec.js
-  our    100644 be02cb3f84001a541d64b11fe6eda50fc32e8afd spec/api-web-contents-spec.js
-  their  100644 cf9025228994b80526e5b4ccb715b4cefba56b92 spec/api-web-contents-spec.js
-@@ -122,6 +122,7 @@
-     })
-   })
- 
-+<<<<<<< .our
-   // Disabled because flaky. See #13969
-   xdescribe('isCurrentlyAudible() API', () => {
-     it('returns whether audio is playing', async () => {
-@@ -138,6 +139,8 @@
-     })
-   })
- 
-+=======
-+>>>>>>> .their
-   describe('getWebPreferences() API', () => {
-     it('should not crash when called for devTools webContents', (done) => {
-       w.webContents.openDevTools()
-changed in both
-  base   100644 2d388ca3b5744ea69d96ef71da6ade70e3dd001b spec/chromium-spec.js
-  our    100644 d90269769d269e4054d25cba4b6c4ac8a1929aa6 spec/chromium-spec.js
-  their  100644 25bef2e689e5ecbcd1485a042e84691db9400659 spec/chromium-spec.js
-@@ -319,8 +319,12 @@
-       b = window.open(windowUrl, '', 'nodeIntegration=no,show=no')
-     })
- 
-+<<<<<<< .our
-     // TODO(codebytere): re-enable this test
-     xit('disables node integration when it is disabled on the parent window for chrome devtools URLs', (done) => {
-+=======
-+    it('disables node integration when it is disabled on the parent window for chrome devtools URLs', (done) => {
-+>>>>>>> .their
-       let b
-       app.once('web-contents-created', (event, contents) => {
-         contents.once('did-finish-load', () => {
-changed in both
-  base   100644 07176e0097efa17e8f8aea5bb059a2739b8c3336 spec/fixtures/api/singleton/main.js
-  our    100644 3202a7a180d6d48c70706d5ef244652872b24bbc spec/fixtures/api/singleton/main.js
-  their  100644 cbf3da1117d91eb8df1b1e6363737a210b7eae78 spec/fixtures/api/singleton/main.js
-@@ -3,8 +3,11 @@
- app.once('ready', () => {
-   console.log('started')  // ping parent
- })
-+<<<<<<< .our
- 
- const gotTheLock = app.requestSingleInstanceLock()
-+=======
-+>>>>>>> .their
- 
- app.on('second-instance', () => {
-   setImmediate(() => app.exit(0))
-changed in both
-  base   100644 cfe840ca0a44c5766509b2865034d98e375da1a1 spec/modules-spec.js
-  our    100644 b996b8f4839bff2160bffb69e55263b16a4178d7 spec/modules-spec.js
-  their  100644 28f2602acff67b2da9accd0574d64d386e0795a7 spec/modules-spec.js
-changed in both
-  base   100644 e2d7d001eb49a9b01edcf9590ccdcb7ac8cc669c spec/node-spec.js
-  our    100644 9bb03494a56ffacec075c40bebde39a3b57ac734 spec/node-spec.js
-  their  100644 f053aa4dbadbbc216d98f3a985f29069bb2e4786 spec/node-spec.js
-changed in both
-  base   100644 ca5cc28d4f9f860947454dfc964208dd13ba1434 spec/static/index.html
-  our    100644 fc1e153c0af2908cf7ee4c3ea4f05522de04f0f8 spec/static/index.html
-  their  100644 e9d779f061cd5bdf00667d0b7942c6c30de81092 spec/static/index.html
-@@ -51,7 +51,11 @@
-   if (!process.env.MOCHA_REPORTER) {
-     mocha.ui('bdd').reporter(isCi ? 'tap' : 'html')
-   }
--  mocha.timeout(isCi ? 30000 : 10000)
-+  if (process.env.MOCHA_TIMEOUT && process.env.MOCHA_TIMEOUT > 0) {
-+    mocha.timeout(process.env.MOCHA_TIMEOUT)
-+  } else {
-+    mocha.timeout(isCi ? 30000 : 10000)
-+  }
- 
-   const query = Mocha.utils.parseQuery(window.location.search || '')
-   if (query.grep) mocha.grep(query.grep)
-changed in both
-  base   160000 db1b314c019f6acbd4d1be273b63521cc6051d3c vendor/libchromiumcontent
-  our    160000 c85470a1c379b1c4bedb372c146521bc4be9b75d vendor/libchromiumcontent
-  their  160000 5e61586b615e23a1426543a6d134fc9023642b59 vendor/libchromiumcontent
diff --git a/app/test/fixtures/merge-parser/electron/merge-backport-webview-sandbox-renderer-2-0-x-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-backport-webview-sandbox-renderer-2-0-x-into-master.txt
deleted file mode 100644
index ea61431ab0f..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-backport-webview-sandbox-renderer-2-0-x-into-master.txt
+++ /dev/null
@@ -1,6562 +0,0 @@
-changed in both
-  base   100644 d4f98eab95b73b59018f170b09b9132d4d03477b .circleci/config.yml
-  our    100644 6d44d618aabcce04c60344f2274dec5b0c2a1f68 .circleci/config.yml
-  their  100644 8d065e3f257178d4706dcbd1340326be42b2e2e2 .circleci/config.yml
-@@ -19,6 +19,7 @@
-       fi
-     when: on_success
- 
-+<<<<<<< .our
- build-steps: &build-steps
-   steps:
-     - checkout
-@@ -92,6 +93,13 @@
-           fi
-     - run:
-         name: Test
-+=======
-+version: 2
-+jobs:
-+  electron-linux-arm:
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+>>>>>>> .their
-         environment:
-           MOCHA_FILE: junit/test-results.xml
-           MOCHA_REPORTER: mocha-junit-reporter
-@@ -110,6 +118,7 @@
-                 echo 'Skipping tests on GitHub release'
-               fi
-             fi
-+<<<<<<< .our
-           else
-            echo 'Skipping tests due to configuration'
-           fi
-@@ -117,6 +126,76 @@
-         name: Verify FFmpeg
-         command: |
-           if [ "$RUN_TESTS" == "true" ]; then
-+=======
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Optionally finish release
-+          shell: /bin/sh
-+          command: |
-+            if [ "$ELECTRON_RELEASE" == "1" ] && [ "$AUTO_RELEASE" == "true" ]; then
-+              echo 'Trying to finish release'
-+              node script/release.js --validateRelease --automaticRelease
-+              releaseExitCode=$?
-+              if [ $releaseExitCode -eq 0 ]; then
-+                echo 'Release is ready to go; releasing'
-+                node script/release.js--automaticRelease
-+                if [ $releaseExitCode -eq 0 ]; then
-+                  echo 'Release successful, now publishing to npm'
-+                  echo "//registry.npmjs.org/:_authToken=$ELECTRON_NPM_TOKEN" >> ~/.npmrc
-+                  npm run publish-to-npm
-+                  echo 'Release has been published to npm'
-+                fi
-+              else
-+                echo 'Release is not complete, skipping publish for now'
-+              fi
-+            else
-+              echo 'Skipping finishing release because build is not for release'
-+            fi
-+      - run:
-+          name: Zip out directory
-+          command: |
-+>>>>>>> .their
-             if [ "$ELECTRON_RELEASE" != "1" ]; then
-               echo 'Verifying ffmpeg on debug build'
-               script/verify-ffmpeg.py
-@@ -391,11 +470,105 @@
-     resource_class: 2xlarge
- 
-   electron-linux-arm64:
-+<<<<<<< .our
-     environment:
-       TARGET_ARCH: arm64
-     <<: *build-defaults
-     resource_class: 2xlarge
- 
-+=======
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: arm64
-+    resource_class: 2xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Optionally finish release
-+          shell: /bin/sh
-+          command: |
-+            if [ "$ELECTRON_RELEASE" == "1" ] && [ "$AUTO_RELEASE" == "true" ]; then
-+              echo 'Trying to finish release'
-+              node script/release.js --validateRelease --automaticRelease
-+              releaseExitCode=$?
-+              if [ $releaseExitCode -eq 0 ]; then
-+                echo 'Release is ready to go; releasing'
-+                node script/release.js--automaticRelease
-+                if [ $releaseExitCode -eq 0 ]; then
-+                  echo 'Release successful, now publishing to npm'
-+                  echo "//registry.npmjs.org/:_authToken=$ELECTRON_NPM_TOKEN" >> ~/.npmrc
-+                  npm run publish-to-npm
-+                  echo 'Release has been published to npm'
-+                fi
-+              else
-+                echo 'Release is not complete, skipping publish for now'
-+              fi
-+            else
-+              echo 'Skipping finishing release because build is not for release'
-+            fi
-+      - run:
-+          name: Zip out directory
-+          command: |
-+            if [ "$ELECTRON_RELEASE" != "1" ]; then
-+              zip -r electron.zip out/D
-+            fi
-+      - persist_to_workspace:
-+          root: /home/builduser
-+          paths:
-+            - project/out
-+      - store_artifacts:
-+          path: electron.zip
-+>>>>>>> .their
-   electron-linux-arm64-test:
-     machine: true
-     steps:
-@@ -430,6 +603,7 @@
-     resource_class: 2xlarge
- 
-   electron-linux-ia32:
-+<<<<<<< .our
-     environment:
-       TARGET_ARCH: ia32
-       DISPLAY: ':99.0'
-@@ -469,10 +643,317 @@
-       NIGHTLY_BUILD: true
-     <<: *build-defaults
-     resource_class: xlarge
-+=======
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: ia32
-+          DISPLAY: ':99.0'
-+    resource_class: xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Setup for headless testing
-+          command: sh -e /etc/init.d/xvfb start
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Optionally finish release
-+          shell: /bin/sh
-+          command: |
-+            if [ "$ELECTRON_RELEASE" == "1" ] && [ "$AUTO_RELEASE" == "true" ]; then
-+              echo 'Trying to finish release'
-+              node script/release.js --validateRelease --automaticRelease
-+              releaseExitCode=$?
-+              if [ $releaseExitCode -eq 0 ]; then
-+                echo 'Release is ready to go; releasing'
-+                node script/release.js--automaticRelease
-+                if [ $releaseExitCode -eq 0 ]; then
-+                  echo 'Release successful, now publishing to npm'
-+                  echo "//registry.npmjs.org/:_authToken=$ELECTRON_NPM_TOKEN" >> ~/.npmrc
-+                  npm run publish-to-npm
-+                  echo 'Release has been published to npm'
-+                fi
-+              else
-+                echo 'Release is not complete, skipping publish for now'
-+              fi
-+            else
-+              echo 'Skipping finishing release because build is not for release'
-+            fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                out/D/electron --version
-+                mkdir junit
-+                script/test.py --ci --rebuild_native_modules
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+  electron-linux-mips64el:
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: mips64el
-+    resource_class: xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Optionally finish release
-+          shell: /bin/sh
-+          command: |
-+            if [ "$ELECTRON_RELEASE" == "1" ] && [ "$AUTO_RELEASE" == "true" ]; then
-+              echo 'Trying to finish release'
-+              node script/release.js --validateRelease --automaticRelease
-+              releaseExitCode=$?
-+              if [ $releaseExitCode -eq 0 ]; then
-+                echo 'Release is ready to go; releasing'
-+                node script/release.js--automaticRelease
-+                if [ $releaseExitCode -eq 0 ]; then
-+                  echo 'Release successful, now publishing to npm'
-+                  echo "//registry.npmjs.org/:_authToken=$ELECTRON_NPM_TOKEN" >> ~/.npmrc
-+                  npm run publish-to-npm
-+                  echo 'Release has been published to npm'
-+                fi
-+              else
-+                echo 'Release is not complete, skipping publish for now'
-+              fi
-+            else
-+              echo 'Skipping finishing release because build is not for release'
-+            fi
-+
-+  electron-linux-x64:
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: x64
-+          DISPLAY: ':99.0'
-+    resource_class: xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Setup for headless testing
-+          command: sh -e /etc/init.d/xvfb start
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Optionally finish release
-+          shell: /bin/sh
-+          command: |
-+            if [ "$ELECTRON_RELEASE" == "1" ] && [ "$AUTO_RELEASE" == "true" ]; then
-+              echo 'Trying to finish release'
-+              node script/release.js --validateRelease --automaticRelease
-+              releaseExitCode=$?
-+              if [ $releaseExitCode -eq 0 ]; then
-+                echo 'Release is ready to go; releasing'
-+                node script/release.js--automaticRelease
-+                if [ $releaseExitCode -eq 0 ]; then
-+                  echo 'Release successful, now publishing to npm'
-+                  echo "//registry.npmjs.org/:_authToken=$ELECTRON_NPM_TOKEN" >> ~/.npmrc
-+                  npm run publish-to-npm
-+                  echo 'Release has been published to npm'
-+                fi
-+              else
-+                echo 'Release is not complete, skipping publish for now'
-+              fi
-+            else
-+              echo 'Skipping finishing release because build is not for release'
-+            fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                mkdir junit
-+                script/test.py --ci --rebuild_native_modules
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+      - run:
-+          name: Generate Typescript Definitions
-+          command: npm run create-typescript-definitions
-+      - store_test_results:
-+          path: junit
-+      - store_artifacts:
-+          path: junit
-+      - store_artifacts:
-+          path: out/electron.d.ts
-+      - store_artifacts:
-+          path: out/electron-api.json
-+>>>>>>> .their
- 
-   electron-osx-x64:
-     environment:
-       TARGET_ARCH: x64
-+<<<<<<< .our
-       RUN_TESTS: true
-       INSTALL_MACOS_NODE: true
-     macos:
-@@ -488,11 +969,107 @@
-     macos:
-       xcode: "8.3.3"
-     <<: *build-steps
-+=======
-+    macos:
-+        xcode: "9.0"
-+    steps:
-+      - checkout
-+      - run:
-+          name: Reclaim disk space
-+          command: |
-+            df -h
-+            sudo rm -rf /Library/Developer/CoreSimulator
-+            df -h
-+            sysctl -n hw.ncpu
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                mkdir junit
-+                script/test.py --ci --rebuild_native_modules
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+      - run:
-+          name: Generate Typescript Definitions
-+          command: npm run create-typescript-definitions
-+      - store_test_results:
-+          path: junit
-+      - store_artifacts:
-+          path: junit
-+      - store_artifacts:
-+          path: out/electron.d.ts
-+      - store_artifacts:
-+          path: out/electron-api.json
-+>>>>>>> .their
- 
-   electron-mas-x64:
-     environment:
-       TARGET_ARCH: x64
-       MAS_BUILD: 1
-+<<<<<<< .our
-       RUN_TESTS: true
-       INSTALL_MACOS_NODE: true
-     macos:
-@@ -668,6 +1245,101 @@
-       GN_EXTRA_ARGS: 'is_mas_build = true'
-     <<: *gn-mac-build-machine
-     <<: *gn-mac-build-steps
-+=======
-+    macos:
-+        xcode: "9.0"
-+    steps:
-+      - checkout
-+      - run:
-+          name: Reclaim disk space
-+          command: |
-+            df -h
-+            sudo rm -rf /Library/Developer/CoreSimulator
-+            df -h
-+            sysctl -n hw.ncpu
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                mkdir junit
-+                script/test.py --ci --rebuild_native_modules
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+      - run:
-+          name: Generate Typescript Definitions
-+          command: npm run create-typescript-definitions
-+      - store_test_results:
-+          path: junit
-+      - store_artifacts:
-+          path: junit
-+      - store_artifacts:
-+          path: out/electron.d.ts
-+      - store_artifacts:
-+          path: out/electron-api.json
-+>>>>>>> .their
- 
- workflows:
-   version: 2
-@@ -695,6 +1367,7 @@
-   build-mas-x64:
-     jobs:
-       - electron-mas-x64
-+<<<<<<< .our
-   build-gn-linux:
-     jobs:
-       - electron-gn-linux-x64-debug-fyi
-@@ -745,3 +1418,5 @@
-       - electron-gn-linux-arm64-release-fyi
-       - electron-gn-mas-release-fyi
-       - electron-gn-osx-release-fyi
-+=======
-+>>>>>>> .their
-changed in both
-  base   100644 8632e8e30869d32176552cd218560f5016a24300 .gitignore
-  our    100644 f393b1cdcef87b41bb3ed47ebae59757fed3a780 .gitignore
-  their  100644 f82d92052e4f7ac936637ac2c163633e02588f12 .gitignore
-changed in both
-  base   100644 5d04da05397c4c74ce00d6d6c8969ce370adb32d CONTRIBUTING.md
-  our    100644 414f83db905db904728facf3b40e70e7b7973193 CONTRIBUTING.md
-  their  100644 0955f68c4f2b1097e770398cf51d3af811f53050 CONTRIBUTING.md
-changed in both
-  base   100644 4cfea0e70f9af56ba746347b4cae410970f3d900 Dockerfile
-  our    100644 74e5eeedea9bea87cd7a98ac2cb63f4376275a2a Dockerfile
-  their  100644 2d74e16915d2e89e1e1e7f3ffd259cc448e1b864 Dockerfile
-@@ -7,8 +7,13 @@
- RUN chmod a+rwx /home
- 
- # Install node.js
-+<<<<<<< .our
- RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
- RUN apt-get install -y nodejs
-+=======
-+RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
-+RUN apt-get update && apt-get install -y nodejs
-+>>>>>>> .their
- 
- # Install wget used by crash reporter
- RUN apt-get install -y wget
-changed in both
-  base   100644 271947c56e39b91fc23bf10579f61cab50b0f4dc Dockerfile.circleci
-  our    100644 d369c8c640161fc3ba65935297aec7dd27eb1e9f Dockerfile.circleci
-  their  100644 0cdb1e88c24f01a5acdfd8ef348126819f593454 Dockerfile.circleci
-@@ -3,8 +3,13 @@
- USER root
- 
- # Install node.js
-+<<<<<<< .our
- RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
- RUN apt-get install -y nodejs
-+=======
-+RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
-+RUN apt-get update && apt-get install -y nodejs
-+>>>>>>> .their
- 
- # Install wget used by crash reporter
- RUN apt-get install -y wget
-added in remote
-  their  100644 c6d558f7f3518ea2924fa9075ed38ab48d70d204 Jenkinsfile.arm64
-@@ -0,0 +1,36 @@
-+pipeline {
-+  agent {
-+    docker {
-+      image 'electronbuilds/arm64v8:0.0.2'
-+      args '--privileged'
-+    }
-+  }
-+  environment {
-+    TARGET_ARCH='arm64'
-+    DISPLAY=':99.0'
-+    MOCHA_TIMEOUT='60000'
-+  }
-+  stages {
-+    stage('Bootstrap') {
-+      steps {
-+        sh 'script/bootstrap.py -v --dev --target_arch=$TARGET_ARCH'
-+      }
-+    }
-+    stage('Build') {
-+      steps {
-+        sh 'script/build.py -c D --ninja-path /usr/local/ninja/ninja'
-+      }
-+    }
-+    stage('Test') {
-+      steps {
-+        sh '/etc/init.d/xvfb start'
-+        sh 'script/test.py --ci'
-+      }
-+    }
-+  }
-+  post {
-+    always {
-+      cleanWs()
-+    }
-+  }
-+}
-changed in both
-  base   100644 160dae7908236105f8534f9448f4111da1bcb014 README.md
-  our    100644 ec09364417b767ac59b2d970fee5e2ab2db2173b README.md
-  their  100644 a7b4fa6ed40a6449245cfdbdace8bb38945284d2 README.md
-added in remote
-  their  100644 2ed4ebcf4b90c2c28d9fd36af13198be5a08e5ad appveyor-override.yml
-@@ -0,0 +1,58 @@
-+build_cloud: electron-16
-+image: electron-16-vs2015
-+build_script:
-+- ps: >-
-+    if(($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME -split "/")[0] -eq ($env:APPVEYOR_REPO_NAME -split "/")[0]) {
-+      Write-warning "Skipping PR build for branch"; Exit-AppveyorBuild
-+    } else {
-+      Add-Path "$env:ProgramFiles (x86)\Windows Kits\10\Debuggers\x64"
-+      $env:path = "$env:ProgramFiles (x86)\Windows Kits\10\Debuggers\x64;$env:path"
-+      if($env:APPVEYOR_SCHEDULED_BUILD -eq 'True')  {
-+        $env:RUN_RELEASE_BUILD = "1"
-+      }
-+      $Message = (git log --format=%B -n 1 HEAD) | Out-String
-+      if ((Test-Path Env:\RUN_RELEASE_BUILD)) {
-+        $env:ELECTRON_RELEASE = '1'
-+        Write-Output "release build triggered from api"
-+      }
-+      if ((Test-Path Env:\ELECTRON_RELEASE)) {
-+        Write-Output "Running release build"
-+        python script\bootstrap.py --target_arch=$env:TARGET_ARCH
-+        python script\build.py -c R
-+        python script\create-dist.py
-+      } else {
-+        Write-Output "Running debug build"
-+        python script\bootstrap.py --target_arch=$env:TARGET_ARCH --dev
-+        python script\build.py -c D
-+      }
-+      if ($? -ne 'True') {
-+        throw "Build failed with exit code $?"
-+      } else {
-+        "Build succeeded."
-+      }
-+      Push-AppveyorArtifact out
-+    }
-+test_script:
-+- ps: >-
-+    if (Test-Path Env:\ELECTRON_RELEASE) {
-+      Write-Output "Skipping tests for release build"
-+    } else {
-+      Write-Output "Running tests for debug build"
-+      python script\test.py --ci --rebuild_native_modules
-+      if ($LASTEXITCODE -ne '0') {
-+        throw "Tests failed with exit code $LASTEXITCODE"
-+      } else {
-+        Write-Output "Tests succeeded."
-+      }
-+      python script\verify-ffmpeg.py
-+      if ($LASTEXITCODE -ne '0') {
-+        throw "Verify ffmpeg failed with exit code $LASTEXITCODE"
-+      } else {
-+        "Verify ffmpeg succeeded."
-+      }
-+    }
-+artifacts:
-+- path: test-results.xml
-+  name: test-results.xml
-+deploy_script:
-+- ps: "if (Test-Path Env:\\ELECTRON_RELEASE) {\n  if (Test-Path Env:\\RUN_RELEASE_BUILD) {\n    Write-Output \"Uploading Electron release distribution to s3\"\n    & python script\\upload.py --upload_to_s3\n  } else {\n    Write-Output \"Uploading Electron release distribution to github releases\"\n    & python script\\upload.py\n    if (Test-Path Env:\\AUTO_RELEASE) {\n      node script\\release.js --validateRelease --automaticRelease\n      if ($? -eq 'True') {\n        echo 'Release is ready to go; now running release'\n        node script\\release.js --automaticRelease\n        if ($? -eq 'True') {      \n          echo 'Release successful, now publishing to npm'      \n          $npmfile = \"$HOME\\.npmrc\"\n          \"//registry.npmjs.org/:_authToken=$env:ELECTRON_NPM_TOKEN\" > $npmfile\n          npm run publish-to-npm\n        }\n      } else {\n        echo 'Release is not complete, skipping publish for now.'\n      }\n    }\n  }\n} else {\n  Write-Output \"Skipping upload distribution because build is not for release\"\n}"
-\ No newline at end of file
-changed in both
-  base   100644 9472d1cb9fd76beca4047bb24db024b9c6378aae atom/app/command_line_args.cc
-  our    100644 23e870cf4a32aecfc246a81edad46971b4456a55 atom/app/command_line_args.cc
-  their  100644 be171457726a09cde9eb7a090ba1e2a67f4cb9cb atom/app/command_line_args.cc
-@@ -31,6 +31,1376 @@
-   return false;
- }
- 
-+<<<<<<< .our
-+=======
-+/*
-+ * The blacklist of command line switches, must be sorted.
-+ * Update the list by pasting the following command into bash
-+ * in libchromiumcontent/src/:
-+
-+   (find ./ \( -name "*switches.cc" -o -name "*switch_list.h" \) | \
-+      xargs grep -P --no-filename '"\S+"[);]$' | \
-+      perl -pe 's|^.*?"(\S+)"[);]$|  "$1",|'; \
-+      echo '  "inspect",'; \
-+      echo '  "inspect-brk",') | \
-+    LANG="C" sort | \
-+    uniq > blacklist-switches.txt
-+
-+ */
-+const char* kBlacklist[] = {
-+  "/prefetch:1",
-+  "/prefetch:2",
-+  "/prefetch:3",
-+  "/prefetch:4",
-+  "/prefetch:5",
-+  "/prefetch:6",
-+  "/prefetch:8",
-+  "0",
-+  "?",
-+  "BlacklistOnly",
-+  "ChromeOSMemoryPressureHandling",
-+  "Disabled",
-+  "OnlineCheckOnly",
-+  "SafeSites",
-+  "accept-resource-provider",
-+  "account-consistency",
-+  "adaboost",
-+  "aec-refined-adaptive-filter",
-+  "agc-startup-min-volume",
-+  "aggressive",
-+  "aggressive-cache-discard",
-+  "aggressive-tab-discard",
-+  "all-toolchains",
-+  "allarticles",
-+  "allow-cross-origin-auth-prompt",
-+  "allow-external-pages",
-+  "allow-failed-policy-fetch-for-test",
-+  "allow-file-access-from-files",
-+  "allow-hidden-media-playback",
-+  "allow-http-background-page",
-+  "allow-http-screen-capture",
-+  "allow-insecure-localhost",
-+  "allow-legacy-extension-manifests",
-+  "allow-loopback-in-peer-connection",
-+  "allow-nacl-crxfs-api",
-+  "allow-nacl-file-handle-api",
-+  "allow-nacl-socket-api",
-+  "allow-no-sandbox-job",
-+  "allow-outdated-plugins",
-+  "allow-ra-in-dev-mode",
-+  "allow-running-insecure-content",
-+  "allow-sandbox-debugging",
-+  "allow-silent-push",
-+  "alsa-check-close-timeout",
-+  "alsa-enable-upsampling",
-+  "alsa-fixed-output-sample-rate",
-+  "alsa-input-device",
-+  "alsa-mute-device-name",
-+  "alsa-mute-element-name",
-+  "alsa-output-avail-min",
-+  "alsa-output-buffer-size",
-+  "alsa-output-device",
-+  "alsa-output-period-size",
-+  "alsa-output-start-threshold",
-+  "alsa-volume-device-name",
-+  "alsa-volume-element-name",
-+  "also-emit-success-logs",
-+  "alternative",
-+  "always-authorize-plugins",
-+  "always-on",
-+  "always-use-complex-text",
-+  "alwaystrue",
-+  "android-fonts-path",
-+  "android-stderr-port",
-+  "android-stdin-port",
-+  "android-stdout-port",
-+  "angle",
-+  "app",
-+  "app-auto-launched",
-+  "app-id",
-+  "app-mode-auth-code",
-+  "app-mode-oauth-token",
-+  "app-mode-oem-manifest",
-+  "app-shell-allow-roaming",
-+  "app-shell-host-window-size",
-+  "app-shell-preferred-network",
-+  "app-shell-refresh-token",
-+  "app-shell-user",
-+  "apple",
-+  "apps-gallery-download-url",
-+  "apps-gallery-update-url",
-+  "apps-gallery-url",
-+  "apps-keep-chrome-alive-in-tests",
-+  "arc-availability",
-+  "arc-available",
-+  "arc-start-mode",
-+  "arc-transition-migration-required",
-+  "args",
-+  "artifacts-dir",
-+  "ash-animate-from-boot-splash-screen",
-+  "ash-constrain-pointer-to-root",
-+  "ash-copy-host-background-at-boot",
-+  "ash-debug-shortcuts",
-+  "ash-dev-shortcuts",
-+  "ash-disable-smooth-screen-rotation",
-+  "ash-disable-touch-exploration-mode",
-+  "ash-enable-magnifier-key-scroller",
-+  "ash-enable-mirrored-screen",
-+  "ash-enable-night-light",
-+  "ash-enable-palette-on-all-displays",
-+  "ash-enable-scale-settings-tray",
-+  "ash-enable-software-mirroring",
-+  "ash-enable-unified-desktop",
-+  "ash-estimated-presentation-delay",
-+  "ash-hide-notifications-for-factory",
-+  "ash-host-window-bounds",
-+  "ash-shelf-color",
-+  "ash-shelf-color-scheme",
-+  "ash-touch-hud",
-+  "ash-webui-init",
-+  "attestation-server",
-+  "audio-buffer-size",
-+  "audio-output-channels",
-+  "aura-legacy-power-button",
-+  "auth-ext-path",
-+  "auth-server-whitelist",
-+  "auth-spnego-account-type",
-+  "auto",
-+  "auto-open-devtools-for-tabs",
-+  "auto-select-desktop-capture-source",
-+  "autoplay-policy",
-+  "blink-settings",
-+  "bootstrap",
-+  "browser-subprocess-path",
-+  "browser-test",
-+  "bwsi",
-+  "bypass-app-banner-engagement-checks",
-+  "canvas-msaa-sample-count",
-+  "cast-initial-screen-height",
-+  "cast-initial-screen-width",
-+  "cc-layer-tree-test-long-timeout",
-+  "cc-layer-tree-test-no-timeout",
-+  "cc-rebaseline-pixeltests",
-+  "cellular-first",
-+  "cellular-only",
-+  "check-for-update-interval",
-+  "check-layout-test-sys-deps",
-+  "child-wallpaper-large",
-+  "child-wallpaper-small",
-+  "chrome-home-swipe-logic",
-+  "cipher-suite-blacklist",
-+  "clamshell",
-+  "class",
-+  "clear-token-service",
-+  "cloud-print-file",
-+  "cloud-print-file-type",
-+  "cloud-print-job-title",
-+  "cloud-print-print-ticket",
-+  "cloud-print-setup-proxy",
-+  "cloud-print-url",
-+  "cloud-print-xmpp-endpoint",
-+  "color",
-+  "compensate-for-unstable-pinch-zoom",
-+  "compile-shader-always-succeeds",
-+  "component-updater",
-+  "connectivity-check-url",
-+  "conservative",
-+  "content-image-texture-target",
-+  "content-shell-host-window-size",
-+  "controller",
-+  "crash-dumps-dir",
-+  "crash-on-failure",
-+  "crash-on-hang-threads",
-+  "crash-server-url",
-+  "crash-test",
-+  "crashpad-handler",
-+  "create-browser-on-startup-for-tests",
-+  "create-default-gl-context",
-+  "cros-gaia-api-v1",
-+  "cros-region",
-+  "cros-regions-mode",
-+  "crosh-command",
-+  "cryptauth-http-host",
-+  "custom-devtools-frontend",
-+  "custom-launcher-page",
-+  "custom_summary",
-+  "d3d11",
-+  "d3d9",
-+  "daemon",
-+  "dark_muted",
-+  "dark_vibrant",
-+  "data-path",
-+  "data-reduction-proxy-config-url",
-+  "data-reduction-proxy-experiment",
-+  "data-reduction-proxy-http-proxies",
-+  "data-reduction-proxy-lo-fi",
-+  "data-reduction-proxy-pingback-url",
-+  "data-reduction-proxy-secure-proxy-check-url",
-+  "data-reduction-proxy-server-experiments-disabled",
-+  "dbus-stub",
-+  "debug-devtools",
-+  "debug-enable-frame-toggle",
-+  "debug-packed-apps",
-+  "debug-print",
-+  "default",
-+  "default-background-color",
-+  "default-tile-height",
-+  "default-tile-width",
-+  "default-wallpaper-is-oem",
-+  "default-wallpaper-large",
-+  "default-wallpaper-small",
-+  "delay-reload-stop-button-change",
-+  "demo",
-+  "derelict-detection-timeout",
-+  "derelict-idle-timeout",
-+  "desktop",
-+  "desktop-window-1080p",
-+  "deterministic-fetch",
-+  "device-management-url",
-+  "device-scale-factor",
-+  "devtools-flags",
-+  "diagnostics",
-+  "diagnostics-format",
-+  "diagnostics-recovery",
-+  "dice",
-+  "disable",
-+  "disable-2d-canvas-clip-aa",
-+  "disable-2d-canvas-image-chromium",
-+  "disable-3d-apis",
-+  "disable-accelerated-2d-canvas",
-+  "disable-accelerated-jpeg-decoding",
-+  "disable-accelerated-mjpeg-decode",
-+  "disable-accelerated-video-decode",
-+  "disable-app-info-dialog-mac",
-+  "disable-app-list-dismiss-on-blur",
-+  "disable-app-window-cycling",
-+  "disable-appcontainer",
-+  "disable-arc-data-wipe",
-+  "disable-arc-opt-in-verification",
-+  "disable-audio-support-for-desktop-share",
-+  "disable-avfoundation-overlays",
-+  "disable-background-networking",
-+  "disable-background-timer-throttling",
-+  "disable-backgrounding-occluded-windows",
-+  "disable-backing-store-limit",
-+  "disable-blink-features",
-+  "disable-bookmark-reordering",
-+  "disable-boot-animation",
-+  "disable-breakpad",
-+  "disable-browser-task-scheduler",
-+  "disable-bundled-ppapi-flash",
-+  "disable-canvas-aa",
-+  "disable-captive-portal-bypass-proxy",
-+  "disable-cast-streaming-hw-encoding",
-+  "disable-checker-imaging",
-+  "disable-clear-browsing-data-counters",
-+  "disable-client-side-phishing-detection",
-+  "disable-cloud-import",
-+  "disable-component-cloud-policy",
-+  "disable-component-extensions-with-background-pages",
-+  "disable-component-update",
-+  "disable-composited-antialiasing",
-+  "disable-contextual-search",
-+  "disable-d3d11",
-+  "disable-databases",
-+  "disable-datasaver-prompt",
-+  "disable-default-apps",
-+  "disable-demo-mode",
-+  "disable-device-disabling",
-+  "disable-device-discovery-notifications",
-+  "disable-dinosaur-easter-egg",
-+  "disable-direct-composition",
-+  "disable-direct-composition-layers",
-+  "disable-directwrite-for-ui",
-+  "disable-display-color-calibration",
-+  "disable-display-list-2d-canvas",
-+  "disable-distance-field-text",
-+  "disable-domain-blocking-for-3d-apis",
-+  "disable-domain-reliability",
-+  "disable-drive-search-in-app-launcher",
-+  "disable-dwm-composition",
-+  "disable-encryption-migration",
-+  "disable-eol-notification",
-+  "disable-es3-apis",
-+  "disable-es3-gl-context",
-+  "disable-extensions",
-+  "disable-extensions-except",
-+  "disable-extensions-file-access-check",
-+  "disable-extensions-http-throttling",
-+  "disable-fast-web-scroll-view-insets",
-+  "disable-features",
-+  "disable-field-trial-config",
-+  "disable-file-manager-touch-mode",
-+  "disable-file-system",
-+  "disable-flash-3d",
-+  "disable-flash-stage3d",
-+  "disable-fullscreen-low-power-mode",
-+  "disable-fullscreen-tab-detaching",
-+  "disable-gaia-services",
-+  "disable-gesture-editing",
-+  "disable-gesture-requirement-for-presentation",
-+  "disable-gesture-typing",
-+  "disable-gl-drawing-for-tests",
-+  "disable-gl-error-limit",
-+  "disable-gl-extensions",
-+  "disable-glsl-translator",
-+  "disable-gpu",
-+  "disable-gpu-compositing",
-+  "disable-gpu-driver-bug-workarounds",
-+  "disable-gpu-early-init",
-+  "disable-gpu-memory-buffer-compositor-resources",
-+  "disable-gpu-memory-buffer-video-frames",
-+  "disable-gpu-process-crash-limit",
-+  "disable-gpu-program-cache",
-+  "disable-gpu-rasterization",
-+  "disable-gpu-sandbox",
-+  "disable-gpu-shader-disk-cache",
-+  "disable-gpu-vsync",
-+  "disable-gpu-watchdog",
-+  "disable-hang-monitor",
-+  "disable-hid-detection-on-oobe",
-+  "disable-histogram-customizer",
-+  "disable-hosted-app-shim-creation",
-+  "disable-hosted-apps-in-windows",
-+  "disable-http2",
-+  "disable-in-process-stack-traces",
-+  "disable-infobars",
-+  "disable-input-ime-api",
-+  "disable-input-view",
-+  "disable-ios-password-generation",
-+  "disable-ios-password-suggestions",
-+  "disable-ios-physical-web",
-+  "disable-javascript-harmony-shipping",
-+  "disable-kill-after-bad-ipc",
-+  "disable-lcd-text",
-+  "disable-legacy-window",
-+  "disable-local-storage",
-+  "disable-lock-screen-apps",
-+  "disable-logging",
-+  "disable-logging-redirect",
-+  "disable-login-animations",
-+  "disable-login-screen-apps",
-+  "disable-low-end-device-mode",
-+  "disable-low-latency-dxva",
-+  "disable-low-res-tiling",
-+  "disable-lru-snapshot-cache",
-+  "disable-mac-overlays",
-+  "disable-mac-views-native-app-windows",
-+  "disable-machine-cert-request",
-+  "disable-main-frame-before-activation",
-+  "disable-md-error-screen",
-+  "disable-md-oobe",
-+  "disable-media-session-api",
-+  "disable-media-suspend",
-+  "disable-merge-key-char-events",
-+  "disable-mojo-local-storage",
-+  "disable-mojo-renderer",
-+  "disable-mtp-write-support",
-+  "disable-multi-display-layout",
-+  "disable-namespace-sandbox",
-+  "disable-native-gpu-memory-buffers",
-+  "disable-network-portal-notification",
-+  "disable-new-channel-switcher-ui",
-+  "disable-new-korean-ime",
-+  "disable-new-virtual-keyboard-behavior",
-+  "disable-new-zip-unpacker",
-+  "disable-notifications",
-+  "disable-ntp-most-likely-favicons-from-server",
-+  "disable-ntp-popular-sites",
-+  "disable-nv12-dxgi-video",
-+  "disable-offer-store-unmasked-wallet-cards",
-+  "disable-offer-upload-credit-cards",
-+  "disable-office-editing-component-extension",
-+  "disable-offline-auto-reload",
-+  "disable-offline-auto-reload-visible-only",
-+  "disable-origin-trial-controlled-blink-features",
-+  "disable-overscroll-edge-effect",
-+  "disable-panel-fitting",
-+  "disable-partial-raster",
-+  "disable-password-generation",
-+  "disable-pepper-3d",
-+  "disable-pepper-3d-image-chromium",
-+  "disable-permission-action-reporting",
-+  "disable-permissions-api",
-+  "disable-physical-keyboard-autocorrect",
-+  "disable-pinch",
-+  "disable-pnacl-crash-throttling",
-+  "disable-popup-blocking",
-+  "disable-prefer-compositing-to-lcd-text",
-+  "disable-presentation-api",
-+  "disable-print-preview",
-+  "disable-prompt-on-repost",
-+  "disable-proximity-auth-bluetooth-low-energy-discovery",
-+  "disable-pull-to-refresh-effect",
-+  "disable-push-api-background-mode",
-+  "disable-quic",
-+  "disable-reading-from-canvas",
-+  "disable-remote-core-animation",
-+  "disable-remote-fonts",
-+  "disable-remote-playback-api",
-+  "disable-renderer-accessibility",
-+  "disable-renderer-backgrounding",
-+  "disable-renderer-priority-management",
-+  "disable-request-mobile-site",
-+  "disable-resize-lock",
-+  "disable-rgba-4444-textures",
-+  "disable-rollback-option",
-+  "disable-rtc-smoothness-algorithm",
-+  "disable-screen-orientation-lock",
-+  "disable-search-geolocation-disclosure",
-+  "disable-seccomp-filter-sandbox",
-+  "disable-settings-window",
-+  "disable-setuid-sandbox",
-+  "disable-shader-name-hashing",
-+  "disable-shared-workers",
-+  "disable-signin-promo",
-+  "disable-signin-scoped-device-id",
-+  "disable-single-click-autofill",
-+  "disable-skia-runtime-opts",
-+  "disable-slim-navigation-manager",
-+  "disable-slimming-paint-invalidation",
-+  "disable-smooth-scrolling",
-+  "disable-software-rasterizer",
-+  "disable-speech-api",
-+  "disable-suggestions-ui",
-+  "disable-sync",
-+  "disable-sync-app-list",
-+  "disable-sync-types",
-+  "disable-system-timezone-automatic-detection",
-+  "disable-tab-for-desktop-share",
-+  "disable-tab-strip-autoscroll-new-tabs",
-+  "disable-third-party-keyboard-workaround",
-+  "disable-threaded-animation",
-+  "disable-threaded-compositing",
-+  "disable-threaded-scrolling",
-+  "disable-touch-adjustment",
-+  "disable-touch-drag-drop",
-+  "disable-translate-new-ux",
-+  "disable-usb-keyboard-detect",
-+  "disable-v8-idle-tasks",
-+  "disable-vaapi-accelerated-video-encode",
-+  "disable-virtual-keyboard-overscroll",
-+  "disable-voice-input",
-+  "disable-volume-adjust-sound",
-+  "disable-wake-on-wifi",
-+  "disable-web-notification-custom-layouts",
-+  "disable-web-security",
-+  "disable-webgl",
-+  "disable-webgl-image-chromium",
-+  "disable-webrtc-encryption",
-+  "disable-webrtc-hw-decoding",
-+  "disable-webrtc-hw-encoding",
-+  "disable-win32k-lockdown",
-+  "disable-xss-auditor",
-+  "disable-zero-browsers-open-for-tests",
-+  "disable-zero-copy",
-+  "disable-zero-copy-dxgi-video",
-+  "disabled",
-+  "disabled-new-style-notification",
-+  "disallow-non-exact-resource-reuse",
-+  "disk-cache-dir",
-+  "disk-cache-size",
-+  "display",
-+  "dmg-device",
-+  "dns-log-details",
-+  "document-user-activation-required",
-+  "dom-automation",
-+  "dotfile",
-+  "draft",
-+  "draw-view-bounds-rects",
-+  "duck-flash",
-+  "dump-blink-runtime-call-stats",
-+  "dump-browser-histograms",
-+  "dump-dom",
-+  "eafe-path",
-+  "eafe-url",
-+  "easy-unlock-app-path",
-+  "edge-touch-filtering",
-+  "egl",
-+  "elevate",
-+  "embedded-extension-options",
-+  "emphasize-titles-in-omnibox-dropdown",
-+  "emulate-shader-precision",
-+  "enable-accelerated-2d-canvas",
-+  "enable-accelerated-vpx-decode",
-+  "enable-accessibility-tab-switcher",
-+  "enable-adaptive-selection-handle-orientation",
-+  "enable-aggressive-domstorage-flushing",
-+  "enable-android-wallpapers-app",
-+  "enable-app-info-dialog-mac",
-+  "enable-app-list",
-+  "enable-app-window-cycling",
-+  "enable-appcontainer",
-+  "enable-arc",
-+  "enable-arc-oobe-optin",
-+  "enable-audio-debug-recordings-from-extension",
-+  "enable-audio-focus",
-+  "enable-automation",
-+  "enable-benchmarking",
-+  "enable-ble-advertising-in-apps",
-+  "enable-blink-features",
-+  "enable-bookmark-reordering",
-+  "enable-bookmark-undo",
-+  "enable-browser-side-navigation",
-+  "enable-browser-task-scheduler",
-+  "enable-checker-imaging",
-+  "enable-chromevox-arc-support",
-+  "enable-clear-browsing-data-counters",
-+  "enable-cloud-print-proxy",
-+  "enable-cloud-print-xps",
-+  "enable-consumer-kiosk",
-+  "enable-contextual-search",
-+  "enable-crash-reporter",
-+  "enable-crash-reporter-for-testing",
-+  "enable-crx-hash-check",
-+  "enable-data-reduction-proxy-bypass-warning",
-+  "enable-data-reduction-proxy-force-pingback",
-+  "enable-data-reduction-proxy-lite-page",
-+  "enable-data-reduction-proxy-savings-promo",
-+  "enable-datasaver-prompt",
-+  "enable-device-discovery-notifications",
-+  "enable-devtools-experiments",
-+  "enable-direct-composition-layers",
-+  "enable-display-list-2d-canvas",
-+  "enable-distance-field-text",
-+  "enable-distillability-service",
-+  "enable-dom-distiller",
-+  "enable-domain-reliability",
-+  "enable-drive-search-in-app-launcher",
-+  "enable-drm-atomic",
-+  "enable-embedded-extension-options",
-+  "enable-encryption-migration",
-+  "enable-encryption-selection",
-+  "enable-es3-apis",
-+  "enable-exclusive-audio",
-+  "enable-experimental-accessibility-features",
-+  "enable-experimental-canvas-features",
-+  "enable-experimental-extension-apis",
-+  "enable-experimental-fullscreen-exit-ui",
-+  "enable-experimental-input-view-features",
-+  "enable-experimental-web-platform-features",
-+  "enable-extension-activity-log-testing",
-+  "enable-extension-activity-logging",
-+  "enable-extension-assets-sharing",
-+  "enable-fast-unload",
-+  "enable-fast-web-scroll-view-insets",
-+  "enable-features",
-+  "enable-file-manager-touch-mode",
-+  "enable-first-run-ui-transitions",
-+  "enable-floating-virtual-keyboard",
-+  "enable-font-antialiasing",
-+  "enable-fullscreen-tab-detaching",
-+  "enable-fullscreen-toolbar-reveal",
-+  "enable-google-branded-context-menu",
-+  "enable-gpu-async-worker-context",
-+  "enable-gpu-benchmarking",
-+  "enable-gpu-client-logging",
-+  "enable-gpu-client-tracing",
-+  "enable-gpu-command-logging",
-+  "enable-gpu-debugging",
-+  "enable-gpu-driver-debug-logging",
-+  "enable-gpu-memory-buffer-compositor-resources",
-+  "enable-gpu-memory-buffer-video-frames",
-+  "enable-gpu-rasterization",
-+  "enable-gpu-service-logging",
-+  "enable-gpu-service-tracing",
-+  "enable-hardware-overlays",
-+  "enable-harfbuzz-rendertext",
-+  "enable-hdr",
-+  "enable-heap-profiling",
-+  "enable-hosted-app-quit-notification",
-+  "enable-hosted-apps-in-windows",
-+  "enable-hotword-hardware",
-+  "enable-hung-renderer-infobar",
-+  "enable-inband-text-tracks",
-+  "enable-input-ime-api",
-+  "enable-internal-media-session",
-+  "enable-ios-handoff-to-other-devices",
-+  "enable-ios-password-generation",
-+  "enable-ios-physical-web",
-+  "enable-layer-lists",
-+  "enable-lcd-text",
-+  "enable-leak-detection",
-+  "enable-local-file-accesses",
-+  "enable-local-sync-backend",
-+  "enable-logging",
-+  "enable-longpress-drag-selection",
-+  "enable-low-end-device-mode",
-+  "enable-low-res-tiling",
-+  "enable-lru-snapshot-cache",
-+  "enable-mac-views-native-app-windows",
-+  "enable-main-frame-before-activation",
-+  "enable-md-feedback",
-+  "enable-md-policy-page",
-+  "enable-media-suspend",
-+  "enable-merge-key-char-events",
-+  "enable-message-center-always-scroll-up-upon-notification-removal",
-+  "enable-nacl",
-+  "enable-nacl-debug",
-+  "enable-nacl-nonsfi-mode",
-+  "enable-native-gpu-memory-buffers",
-+  "enable-natural-scroll-default",
-+  "enable-navigation-tracing",
-+  "enable-net-benchmarking",
-+  "enable-network-information-downlink-max",
-+  "enable-network-portal-notification",
-+  "enable-new-app-menu-icon",
-+  "enable-ntp-most-likely-favicons-from-server",
-+  "enable-ntp-popular-sites",
-+  "enable-ntp-search-engine-country-detection",
-+  "enable-offer-store-unmasked-wallet-cards",
-+  "enable-offer-upload-credit-cards",
-+  "enable-offline-auto-reload",
-+  "enable-offline-auto-reload-visible-only",
-+  "enable-osk-overscroll",
-+  "enable-override-bookmarks-ui",
-+  "enable-partial-raster",
-+  "enable-password-generation",
-+  "enable-pepper-testing",
-+  "enable-permission-action-reporting",
-+  "enable-physical-keyboard-autocorrect",
-+  "enable-picture-in-picture",
-+  "enable-pinch",
-+  "enable-pixel-output-in-tests",
-+  "enable-plugin-placeholder-testing",
-+  "enable-potentially-annoying-security-features",
-+  "enable-power-overlay",
-+  "enable-precise-memory-info",
-+  "enable-prefer-compositing-to-lcd-text",
-+  "enable-print-browser",
-+  "enable-print-preview-register-promos",
-+  "enable-profile-shortcut-manager",
-+  "enable-profiling",
-+  "enable-push-api-background-mode",
-+  "enable-quic",
-+  "enable-reader-mode-toolbar-icon",
-+  "enable-refresh-token-annotation-request",
-+  "enable-request-tablet-site",
-+  "enable-rgba-4444-textures",
-+  "enable-sandbox",
-+  "enable-sandbox-logging",
-+  "enable-screenshot-testing-with-mode",
-+  "enable-scripts-require-action",
-+  "enable-scroll-prediction",
-+  "enable-service-manager-tracing",
-+  "enable-settings-window",
-+  "enable-sgi-video-sync",
-+  "enable-signin-promo",
-+  "enable-single-click-autofill",
-+  "enable-site-settings",
-+  "enable-skia-benchmarking",
-+  "enable-slim-navigation-manager",
-+  "enable-slimming-paint-invalidation",
-+  "enable-slimming-paint-v2",
-+  "enable-smooth-scrolling",
-+  "enable-spatial-navigation",
-+  "enable-spdy-proxy-auth",
-+  "enable-speech-dispatcher",
-+  "enable-spelling-feedback-field-trial",
-+  "enable-spotlight-actions",
-+  "enable-stats-collection-bindings",
-+  "enable-stats-table",
-+  "enable-strict-mixed-content-checking",
-+  "enable-strict-powerful-feature-restrictions",
-+  "enable-suggestions-ui",
-+  "enable-suggestions-with-substring-match",
-+  "enable-supervised-user-managed-bookmarks-folder",
-+  "enable-surface-synchronization",
-+  "enable-swap-buffers-with-bounds",
-+  "enable-sync-app-list",
-+  "enable-sync-articles",
-+  "enable-tab-audio-muting",
-+  "enable-tablet-splitview",
-+  "enable-tcp-fastopen",
-+  "enable-third-party-keyboard-workaround",
-+  "enable-threaded-compositing",
-+  "enable-threaded-texture-mailboxes",
-+  "enable-tile-compression",
-+  "enable-touch-calibration-setting",
-+  "enable-touch-drag-drop",
-+  "enable-touchpad-three-finger-click",
-+  "enable-touchview",
-+  "enable-trace-app-source",
-+  "enable-tracing",
-+  "enable-tracing-output",
-+  "enable-translate-new-ux",
-+  "enable-ui-devtools",
-+  "enable-use-zoom-for-dsf",
-+  "enable-user-controlled-alternate-protocol-ports",
-+  "enable-user-metrics",
-+  "enable-usermedia-screen-capturing",
-+  "enable-video-player-chromecast-support",
-+  "enable-viewport",
-+  "enable-virtual-keyboard",
-+  "enable-voice-interaction",
-+  "enable-vtune-support",
-+  "enable-vulkan",
-+  "enable-wayland-server",
-+  "enable-web-notification-custom-layouts",
-+  "enable-webfonts-intervention-trigger",
-+  "enable-webfonts-intervention-v2",
-+  "enable-webgl-draft-extensions",
-+  "enable-webgl-image-chromium",
-+  "enable-webrtc-event-logging-from-extension",
-+  "enable-webrtc-srtp-aes-gcm",
-+  "enable-webrtc-stun-origin",
-+  "enable-webview-finch",
-+  "enable-webvr",
-+  "enable-wifi-credential-sync",
-+  "enable-win7-webrtc-hw-h264-decoding",
-+  "enable-zero-copy",
-+  "enable-zip-archiver-on-file-manager",
-+  "enabled",
-+  "enabled-2g",
-+  "enabled-3g",
-+  "enabled-new-style-notification",
-+  "enabled-slow2g",
-+  "encode-binary",
-+  "enforce",
-+  "enforce-gl-minimums",
-+  "enforce-webrtc-ip-permission-check",
-+  "enforce_strict",
-+  "enterprise-disable-arc",
-+  "enterprise-enable-forced-re-enrollment",
-+  "enterprise-enable-license-type-selection",
-+  "enterprise-enable-zero-touch-enrollment",
-+  "enterprise-enrollment-initial-modulus",
-+  "enterprise-enrollment-modulus-limit",
-+  "error-console",
-+  "experiment",
-+  "explicitly-allowed-ports",
-+  "expose-internals-for-testing",
-+  "extension-content-verification",
-+  "extension-process",
-+  "extensions-install-verification",
-+  "extensions-multi-account",
-+  "extensions-not-webstore",
-+  "extensions-on-chrome-urls",
-+  "extensions-update-frequency",
-+  "extra-search-query-params",
-+  "fail-on-unused-args",
-+  "fake-variations-channel",
-+  "false",
-+  "fast",
-+  "fast-start",
-+  "feedback-server",
-+  "field-trial-handle",
-+  "first-exec-after-boot",
-+  "flag-switches-begin",
-+  "flag-switches-end",
-+  "font-cache-shared-handle",
-+  "force-android-app-mode",
-+  "force-app-mode",
-+  "force-clamshell-power-button",
-+  "force-color-profile",
-+  "force-desktop-ios-promotion",
-+  "force-dev-mode-highlighting",
-+  "force-device-scale-factor",
-+  "force-display-list-2d-canvas",
-+  "force-effective-connection-type",
-+  "force-enable-metrics-reporting",
-+  "force-enable-stylus-tools",
-+  "force-fieldtrial-params",
-+  "force-fieldtrials",
-+  "force-first-run",
-+  "force-first-run-ui",
-+  "force-gpu-mem-available-mb",
-+  "force-gpu-rasterization",
-+  "force-happiness-tracking-system",
-+  "force-load-easy-unlock-app-in-tests",
-+  "force-local-ntp",
-+  "force-login-manager-in-tests",
-+  "force-mediafoundation",
-+  "force-overlay-fullscreen-video",
-+  "force-password-reauth",
-+  "force-pnacl-subzero",
-+  "force-renderer-accessibility",
-+  "force-show-update-menu-badge",
-+  "force-show-update-menu-item",
-+  "force-system-compositor-mode",
-+  "force-tablet-mode",
-+  "force-text-direction",
-+  "force-ui-direction",
-+  "force-variation-ids",
-+  "force-video-overlays",
-+  "force-wave-audio",
-+  "force-webrtc-ip-handling-policy",
-+  "full-memory-crash-report",
-+  "gaia-url",
-+  "gcm-checkin-url",
-+  "gcm-mcs-endpoint",
-+  "gcm-registration-url",
-+  "generate-accessibility-test-expectations",
-+  "gl",
-+  "gl-composited-overlay-candidate-quad-border",
-+  "gl-shader-interm-output",
-+  "gles",
-+  "golden-screenshots-dir",
-+  "google-apis-url",
-+  "google-base-url",
-+  "google-doodle-url",
-+  "google-url",
-+  "gpu-active-device-id",
-+  "gpu-active-vendor-id",
-+  "gpu-device-id",
-+  "gpu-driver-bug-workarounds",
-+  "gpu-driver-date",
-+  "gpu-driver-vendor",
-+  "gpu-driver-version",
-+  "gpu-launcher",
-+  "gpu-no-complete-info-collection",
-+  "gpu-no-context-lost",
-+  "gpu-process",
-+  "gpu-program-cache-size-kb",
-+  "gpu-rasterization-msaa-sample-count",
-+  "gpu-sandbox-allow-sysv-shm",
-+  "gpu-sandbox-failures-fatal",
-+  "gpu-sandbox-start-early",
-+  "gpu-secondary-device-ids",
-+  "gpu-secondary-vendor-ids",
-+  "gpu-startup-dialog",
-+  "gpu-testing-device-id",
-+  "gpu-testing-driver-date",
-+  "gpu-testing-gl-renderer",
-+  "gpu-testing-gl-vendor",
-+  "gpu-testing-gl-version",
-+  "gpu-testing-os-version",
-+  "gpu-testing-secondary-device-ids",
-+  "gpu-testing-secondary-vendor-ids",
-+  "gpu-testing-vendor-id",
-+  "gpu-vendor-id",
-+  "guest-wallpaper-large",
-+  "guest-wallpaper-small",
-+  "h",
-+  "has-chromeos-diamond-key",
-+  "has-chromeos-keyboard",
-+  "has-internal-stylus",
-+  "headless",
-+  "help",
-+  "hide",
-+  "hide-icons",
-+  "hide-scrollbars",
-+  "history-entry-requires-user-gesture",
-+  "homedir",
-+  "homepage",
-+  "host",
-+  "host-pairing-oobe",
-+  "host-resolver-rules",
-+  "host-rules",
-+  "icu-data-dir",
-+  "ignore-autocomplete-off-autofill",
-+  "ignore-autoplay-restrictions",
-+  "ignore-certificate-errors",
-+  "ignore-certificate-errors-spki-list",
-+  "ignore-gpu-blacklist",
-+  "ignore-urlfetcher-cert-requests",
-+  "ignore-user-profile-mapping-for-tests",
-+  "in-process-gpu",
-+  "incognito",
-+  "input",
-+  "inspect",
-+  "inspect-brk",
-+  "install-chrome-app",
-+  "install-supervised-user-whitelists",
-+  "instant-process",
-+  "invalidation-use-gcm-channel",
-+  "ipc-connection-timeout",
-+  "ipc-dump-directory",
-+  "ipc-fuzzer-testcase",
-+  "is-running-in-mash",
-+  "isolate-origins",
-+  "isolate-sites-for-testing",
-+  "javascript-harmony",
-+  "js-flags",
-+  "keep-alive-for-test",
-+  "kiosk",
-+  "kiosk-printing",
-+  "lang",
-+  "last-launched-app",
-+  "layer",
-+  "light_muted",
-+  "light_vibrant",
-+  "limit-fps",
-+  "load-and-launch-app",
-+  "load-apps",
-+  "load-extension",
-+  "load-media-router-component-extension",
-+  "local-heuristics-only-for-password-generation",
-+  "local-ntp-reload",
-+  "local-sync-backend-dir",
-+  "log-gpu-control-list-decisions",
-+  "log-level",
-+  "log-net-log",
-+  "login-manager",
-+  "login-profile",
-+  "login-user",
-+  "lso-url",
-+  "ltr",
-+  "main-frame-resizes-are-orientation-changes",
-+  "make-chrome-default",
-+  "make-default-browser",
-+  "managed-user-id",
-+  "managed-user-sync-token",
-+  "mark-non-secure-as",
-+  "markdown",
-+  "market-url-for-testing",
-+  "mash",
-+  "material",
-+  "material-design-ink-drop-animation-speed",
-+  "material-hybrid",
-+  "max-gum-fps",
-+  "max-output-volume-dba1m",
-+  "max-untiled-layer-height",
-+  "max-untiled-layer-width",
-+  "media-cache-size",
-+  "mem-pressure-system-reserved-kb",
-+  "memlog",
-+  "memlog-pipe",
-+  "memory-pressure-off",
-+  "memory-pressure-thresholds",
-+  "memory-pressure-thresholds-mb",
-+  "message-center-changes-while-open",
-+  "metrics-client-id",
-+  "metrics-recording-only",
-+  "mhtml-generator-option",
-+  "mirror",
-+  "mock",
-+  "mojo-local-storage",
-+  "mojo-pipe-token",
-+  "monitoring-destination-id",
-+  "mse-audio-buffer-size-limit",
-+  "mse-video-buffer-size-limit",
-+  "mus",
-+  "mus-config",
-+  "mute-audio",
-+  "nacl-broker",
-+  "nacl-dangerous-no-sandbox-nonsfi",
-+  "nacl-debug-mask",
-+  "nacl-gdb",
-+  "nacl-gdb-script",
-+  "nacl-loader",
-+  "nacl-loader-nonsfi",
-+  "native",
-+  "native-crx-bindings",
-+  "need-arc-migration-policy-check",
-+  "net-log-capture-mode",
-+  "netifs-to-ignore",
-+  "network-country-iso",
-+  "network-settings-config",
-+  "new-window",
-+  "no-default-browser-check",
-+  "no-experiments",
-+  "no-first-run",
-+  "no-managed-user-acknowledgment-check",
-+  "no-network-profile-warning",
-+  "no-pings",
-+  "no-proxy-server",
-+  "no-referrers",
-+  "no-sandbox",
-+  "no-service-autorun",
-+  "no-session-id",
-+  "no-startup-window",
-+  "no-user-gesture-required",
-+  "no-wifi",
-+  "no-zygote",
-+  "nocolor",
-+  "noerrdialogs",
-+  "non-material",
-+  "non-secure",
-+  "non-secure-after-editing",
-+  "non-secure-while-incognito",
-+  "non-secure-while-incognito-or-editing",
-+  "none",
-+  "normal_muted",
-+  "normal_vibrant",
-+  "note-taking-app-ids",
-+  "ntp-snippets-add-incomplete",
-+  "ntp-switch-to-existing-tab",
-+  "null",
-+  "num-raster-threads",
-+  "oauth2-client-id",
-+  "oauth2-client-secret",
-+  "off",
-+  "on",
-+  "oobe-bootstrapping-master",
-+  "oobe-force-show-screen",
-+  "oobe-guest-session",
-+  "oobe-skip-postlogin",
-+  "oobe-timer-interval",
-+  "open-ash",
-+  "opengraph",
-+  "origin-to-force-quic-on",
-+  "origin-trial-disabled-features",
-+  "origin-trial-disabled-tokens",
-+  "origin-trial-public-key",
-+  "original-process-start-time",
-+  "osmesa",
-+  "output",
-+  "override",
-+  "override-metrics-upload-url",
-+  "override-plugin-power-saver-for-testing",
-+  "override-use-software-gl-for-tests",
-+  "overscroll-history-navigation",
-+  "overscroll-start-threshold",
-+  "ozone-dump-file",
-+  "ozone-platform",
-+  "pack-extension",
-+  "pack-extension-key",
-+  "parent-profile",
-+  "parent-window",
-+  "passive-listeners-default",
-+  "password-store",
-+  "permission-request-api-scope",
-+  "permission-request-api-url",
-+  "ppapi",
-+  "ppapi-antialiased-text-enabled",
-+  "ppapi-broker",
-+  "ppapi-flash-args",
-+  "ppapi-flash-path",
-+  "ppapi-flash-version",
-+  "ppapi-in-process",
-+  "ppapi-plugin-launcher",
-+  "ppapi-startup-dialog",
-+  "ppapi-subpixel-rendering-setting",
-+  "prerender-from-omnibox",
-+  "previous-app",
-+  "primary",
-+  "print-to-pdf",
-+  "privet-ipv6-only",
-+  "process-per-site",
-+  "process-per-tab",
-+  "product-version",
-+  "profile-directory",
-+  "profiler-timing",
-+  "profiling",
-+  "profiling-at-start",
-+  "profiling-file",
-+  "profiling-flush",
-+  "progress-bar-animation",
-+  "progress-bar-completion",
-+  "prompt-for-external-extensions",
-+  "proxy-auto-detect",
-+  "proxy-bypass-list",
-+  "proxy-pac-url",
-+  "proxy-server",
-+  "q",
-+  "quic-connection-options",
-+  "quic-max-packet-length",
-+  "quic-version",
-+  "rdp_desktop_session",
-+  "reader-mode-feedback",
-+  "reader-mode-heuristics",
-+  "rebaseline-pixel-tests",
-+  "record-type",
-+  "reduce-security-for-testing",
-+  "reduced-referrer-granularity",
-+  "register-font-files",
-+  "register-pepper-plugins",
-+  "relauncher",
-+  "remote-debugging-address",
-+  "remote-debugging-port",
-+  "remote-debugging-socket-fd",
-+  "remote-debugging-socket-name",
-+  "remote-debugging-targets",
-+  "renderer",
-+  "renderer-client-id",
-+  "renderer-cmd-prefix",
-+  "renderer-process-limit",
-+  "renderer-startup-dialog",
-+  "renderer-wait-for-java-debugger",
-+  "renderpass",
-+  "repl",
-+  "report-vp9-as-an-unsupported-mime-type",
-+  "require-audio-hardware-for-testing",
-+  "reset-app-list-install-state",
-+  "reset-variation-state",
-+  "restore-last-session",
-+  "root",
-+  "root-layer-scrolls",
-+  "rtl",
-+  "run-layout-test",
-+  "runtime-deps-list-file",
-+  "safebrowsing-disable-auto-update",
-+  "safebrowsing-disable-download-protection",
-+  "safebrowsing-disable-extension-blacklist",
-+  "safebrowsing-manual-download-blacklist",
-+  "sandbox-ipc",
-+  "save-page-as-mhtml",
-+  "screen-config",
-+  "screenshot",
-+  "script-executable",
-+  "scripts-require-action",
-+  "scroll-end-effect",
-+  "search-provider-logo-url",
-+  "secondary",
-+  "secondary-display-layout",
-+  "secondary-ui-md",
-+  "service",
-+  "service-manager",
-+  "service-name",
-+  "service-pipe-token",
-+  "service-request-channel-token",
-+  "service-runner",
-+  "shared-files",
-+  "shill-stub",
-+  "show-app-list",
-+  "show-autofill-signatures",
-+  "show-autofill-type-predictions",
-+  "show-cert-link",
-+  "show-component-extension-options",
-+  "show-composited-layer-borders",
-+  "show-fps-counter",
-+  "show-icons",
-+  "show-layer-animation-bounds",
-+  "show-login-dev-overlay",
-+  "show-mac-overlay-borders",
-+  "show-md-login",
-+  "show-non-md-login",
-+  "show-overdraw-feedback",
-+  "show-paint-rects",
-+  "show-property-changed-rects",
-+  "show-saved-copy",
-+  "show-screenspace-rects",
-+  "show-surface-damage-rects",
-+  "silent-debugger-extension-api",
-+  "silent-launch",
-+  "simulate-critical-update",
-+  "simulate-elevated-recovery",
-+  "simulate-outdated",
-+  "simulate-outdated-no-au",
-+  "simulate-upgrade",
-+  "single-process",
-+  "site-per-process",
-+  "skip-gpu-data-loading",
-+  "skip-nostore-all",
-+  "skip-nostore-main",
-+  "skip-reencoding-on-skp-capture",
-+  "slow",
-+  "slow-connections-only",
-+  "slow-down-raster-scale-factor",
-+  "sms-test-messages",
-+  "spdy-proxy-auth-fallback",
-+  "spdy-proxy-auth-origin",
-+  "spdy-proxy-auth-value",
-+  "spelling-service-feedback-interval-seconds",
-+  "spelling-service-feedback-url",
-+  "spurious-power-button-accel-count",
-+  "spurious-power-button-keyboard-accel",
-+  "spurious-power-button-lid-angle-change",
-+  "spurious-power-button-screen-accel",
-+  "spurious-power-button-window",
-+  "ssl-key-log-file",
-+  "ssl-version-max",
-+  "ssl-version-min",
-+  "stable-release-mode",
-+  "start-fullscreen",
-+  "start-maximized",
-+  "start-stack-profiler",
-+  "started",
-+  "stub",
-+  "stub-cros-settings",
-+  "supports-dual-gpus",
-+  "surface",
-+  "swiftshader",
-+  "swiftshader-webgl",
-+  "sync-allow-insecure-xmpp-connection",
-+  "sync-deferred-startup-timeout-seconds",
-+  "sync-disable-deferred-startup",
-+  "sync-enable-get-update-avoidance",
-+  "sync-notification-host-port",
-+  "sync-on-draw-hardware",
-+  "sync-short-initial-retry-override",
-+  "sync-short-nudge-delay-for-test",
-+  "sync-url",
-+  "system-developer-mode",
-+  "system-log-upload-frequency",
-+  "tab-management-experiment-type-disabled",
-+  "tab-management-experiment-type-elderberry",
-+  "task-profiler",
-+  "team-drives",
-+  "test-auto-update-ui",
-+  "test-child-process",
-+  "test-cros-gaia-id-migration",
-+  "test-do-not-initialize-icu",
-+  "test-encryption-migration-ui",
-+  "test-gl-lib",
-+  "test-launcher-batch-limit",
-+  "test-launcher-bot-mode",
-+  "test-launcher-debug-launcher",
-+  "test-launcher-filter-file",
-+  "test-launcher-force-run-broken-tests",
-+  "test-launcher-jobs",
-+  "test-launcher-list-tests",
-+  "test-launcher-output",
-+  "test-launcher-print-test-stdio",
-+  "test-launcher-print-writable-path",
-+  "test-launcher-retry-limit",
-+  "test-launcher-shard-index",
-+  "test-launcher-summary-output",
-+  "test-launcher-test-part-results-limit",
-+  "test-launcher-timeout",
-+  "test-launcher-total-shards",
-+  "test-launcher-trace",
-+  "test-name",
-+  "test-tiny-timeout",
-+  "test-type",
-+  "testing-fixed-http-port",
-+  "testing-fixed-https-port",
-+  "tether-stub",
-+  "threads",
-+  "time",
-+  "timeout",
-+  "tls1",
-+  "tls1.1",
-+  "tls1.2",
-+  "tls1.3",
-+  "tls13-variant",
-+  "top-chrome-md",
-+  "top-controls-hide-threshold",
-+  "top-controls-show-threshold",
-+  "touch-calibration",
-+  "touch-devices",
-+  "touch-events",
-+  "touch-noise-filtering",
-+  "touch-selection-strategy",
-+  "touch_view",
-+  "trace-config-file",
-+  "trace-export-events-to-etw",
-+  "trace-shutdown",
-+  "trace-shutdown-file",
-+  "trace-startup",
-+  "trace-startup-duration",
-+  "trace-startup-file",
-+  "trace-to-console",
-+  "trace-to-file",
-+  "trace-to-file-name",
-+  "trace-upload-url",
-+  "tracelog",
-+  "translate-ranker-model-url",
-+  "translate-script-url",
-+  "translate-security-origin",
-+  "true",
-+  "trusted-download-sources",
-+  "try-chrome-again",
-+  "try-supported-channel-layouts",
-+  "type",
-+  "ui-disable-partial-swap",
-+  "ui-enable-layer-lists",
-+  "ui-enable-rgba-4444-textures",
-+  "ui-enable-zero-copy",
-+  "ui-prioritize-in-gpu-process",
-+  "ui-show-composited-layer-borders",
-+  "ui-show-fps-counter",
-+  "ui-show-layer-animation-bounds",
-+  "ui-show-paint-rects",
-+  "ui-show-property-changed-rects",
-+  "ui-show-screenspace-rects",
-+  "ui-show-surface-damage-rects",
-+  "ui-slow-animations",
-+  "ui-test-action-max-timeout",
-+  "ui-test-action-timeout",
-+  "uninstall",
-+  "unlimited-storage",
-+  "unsafe-pac-url",
-+  "unsafely-allow-protected-media-identifier-for-domain",
-+  "unsafely-treat-insecure-origin-as-secure",
-+  "use-angle",
-+  "use-cras",
-+  "use-double-buffering",
-+  "use-fake-device-for-media-stream",
-+  "use-fake-jpeg-decode-accelerator",
-+  "use-fake-ui-for-media-stream",
-+  "use-file-for-fake-audio-capture",
-+  "use-file-for-fake-video-capture",
-+  "use-first-display-as-internal",
-+  "use-gl",
-+  "use-gpu-in-tests",
-+  "use-ime-service",
-+  "use-mobile-user-agent",
-+  "use-mock-keychain",
-+  "use-passthrough-cmd-decoder",
-+  "use-simple-cache-backend",
-+  "use-system-default-printer",
-+  "use-test-config",
-+  "user-agent",
-+  "user-always-affiliated",
-+  "user-data-dir",
-+  "user-gesture-required",
-+  "user-gesture-required-for-cross-origin",
-+  "utility",
-+  "utility-allowed-dir",
-+  "utility-cmd-prefix",
-+  "utility-run-elevated",
-+  "v",
-+  "v2-sandbox",
-+  "v2-sandbox-enabled",
-+  "v8-cache-options",
-+  "v8-cache-strategies-for-cache-storage",
-+  "validate-crx",
-+  "validate-input-event-stream",
-+  "variations-override-country",
-+  "variations-server-url",
-+  "version",
-+  "video-image-texture-target",
-+  "video-threads",
-+  "video-underflow-threshold-ms",
-+  "virtual-time-budget",
-+  "vmodule",
-+  "voice-interaction-supported-locales",
-+  "wait-for-debugger",
-+  "wait-for-debugger-children",
-+  "wake-on-wifi-packet",
-+  "wallet-service-use-sandbox",
-+  "watcher",
-+  "waveout-buffers",
-+  "webapk-server-url",
-+  "webrtc-max-cpu-consumption-percentage",
-+  "webrtc-stun-probe-trial",
-+  "webview-enable-safebrowsing-support",
-+  "webview-sandboxed-renderer",
-+  "whitelisted-extension-id",
-+  "win-jumplist-action",
-+  "window-position",
-+  "window-size",
-+  "window-workspace",
-+  "windows10-custom-titlebar",
-+  "winhttp-proxy-resolver",
-+  "wm-window-animations-disabled",
-+  "yield-between-content-script-runs",
-+  "zygote",
-+  "zygote-cmd-prefix",
-+};
-+
-+bool IsBlacklistedArg(const base::CommandLine::CharType* arg) {
-+#if defined(OS_WIN)
-+  const auto converted = base::WideToUTF8(arg);
-+  const char* a = converted.c_str();
-+#else
-+  const char* a = arg;
-+#endif
-+
-+  static const char* prefixes[] = {"--", "-", "/"};
-+
-+  int prefix_length = 0;
-+  for (auto& prefix : prefixes) {
-+    if (base::StartsWith(a, prefix, base::CompareCase::SENSITIVE)) {
-+      prefix_length = strlen(prefix);
-+      break;
-+    }
-+  }
-+
-+  if (prefix_length > 0) {
-+    a += prefix_length;
-+    std::string switch_name =
-+        base::ToLowerASCII(base::StringPiece(a, strcspn(a, "=")));
-+    return std::binary_search(std::begin(kBlacklist), std::end(kBlacklist),
-+                              switch_name);
-+  }
-+
-+  return false;
-+}
-+
-+>>>>>>> .their
- }  // namespace
- 
- namespace atom {
-changed in both
-  base   100644 4bd88a5a43c03ceba308ec06fdf0cbadeddcaae3 atom/browser/api/atom_api_browser_view.cc
-  our    100644 bd83208694c61c4d7c43ce4be26939c2682b2a13 atom/browser/api/atom_api_browser_view.cc
-  their  100644 41f0e99cdd79bf1ad2c4c8c0db5aaa97ac5e1297 atom/browser/api/atom_api_browser_view.cc
-changed in both
-  base   100644 ced1cb31d8df7689f7652111720ba20fb029b1fe atom/browser/api/atom_api_menu_views.cc
-  our    100644 3da7dc2842fa4561e037aa67f290d0cc6ca71014 atom/browser/api/atom_api_menu_views.cc
-  their  100644 fa178e57d82413544b92172ae0ed4401ea5f178b atom/browser/api/atom_api_menu_views.cc
-@@ -49,8 +49,16 @@
-   menu_runners_[window_id] =
-       std::make_unique<MenuRunner>(model(), flags, close_callback);
-   menu_runners_[window_id]->RunMenuAt(
-+<<<<<<< .our
-       native_window->widget(), NULL, gfx::Rect(location, gfx::Size()),
-       views::MENU_ANCHOR_TOPLEFT, ui::MENU_SOURCE_MOUSE);
-+=======
-+      native_window->widget(),
-+      NULL,
-+      gfx::Rect(location, gfx::Size()),
-+      views::MENU_ANCHOR_TOPLEFT,
-+      ui::MENU_SOURCE_MOUSE);
-+>>>>>>> .their
- }
- 
- void MenuViews::ClosePopupAt(int32_t window_id) {
-removed in local
-  base   100644 0d22fad5b8b5e3ed7711d55aa763f930014a75d7 atom/browser/api/atom_api_screen_mac.mm
-  their  100644 056b775fdfc221cb0501ba5b7afd8de01f2d4d63 atom/browser/api/atom_api_screen_mac.mm
-changed in both
-  base   100644 6e5c4b9cbe77c1a4004bbc2bf7b0f0089ffb9004 atom/browser/api/atom_api_session.cc
-  our    100644 658f913bb60b66ae1bf3aae97d7d9158e56f7ee0 atom/browser/api/atom_api_session.cc
-  their  100644 d36812daa35dc795b667c190952b980f25d9e618 atom/browser/api/atom_api_session.cc
-@@ -29,7 +29,6 @@
- #include "base/guid.h"
- #include "base/strings/string_number_conversions.h"
- #include "base/strings/string_util.h"
--#include "base/threading/thread_task_runner_handle.h"
- #include "brightray/browser/media/media_device_id_salt.h"
- #include "chrome/browser/browser_process.h"
- #include "chrome/common/pref_names.h"
-@@ -46,8 +45,12 @@
- #include "net/dns/host_cache.h"
- #include "net/http/http_auth_handler_factory.h"
- #include "net/http/http_auth_preferences.h"
-+<<<<<<< .our
- #include "net/proxy_resolution/proxy_config_service_fixed.h"
- #include "net/proxy_resolution/proxy_service.h"
-+=======
-+#include "net/proxy/proxy_config_service_fixed.h"
-+>>>>>>> .their
- #include "net/url_request/static_http_user_agent_settings.h"
- #include "net/url_request/url_request_context.h"
- #include "net/url_request/url_request_context_getter.h"
-@@ -236,6 +239,7 @@
- // Referenced session objects.
- std::map<uint32_t, v8::Global<v8::Object>> g_sessions;
- 
-+<<<<<<< .our
- class ResolveProxyHelper {
-  public:
-   ResolveProxyHelper(AtomBrowserContext* browser_context,
-@@ -286,6 +290,8 @@
-   DISALLOW_COPY_AND_ASSIGN(ResolveProxyHelper);
- };
- 
-+=======
-+>>>>>>> .their
- // Runs the callback in UI thread.
- void RunCallbackInUI(const base::Callback<void()>& callback) {
-   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, callback);
-@@ -451,6 +457,7 @@
-   AtomNetworkDelegate* network_delegate =
-       static_cast<AtomNetworkDelegate*>(context->network_delegate());
-   network_delegate->SetDevToolsNetworkEmulationClientId(client_id);
-+<<<<<<< .our
- }
- 
- void DestroyGlobalHandle(v8::Isolate* isolate,
-@@ -468,6 +475,8 @@
-       object->SetAlignedPointerInInternalField(0, nullptr);
-     }
-   }
-+=======
-+>>>>>>> .their
- }
- 
- }  // namespace
-@@ -513,8 +522,10 @@
-   }
- }
- 
--void Session::ResolveProxy(const GURL& url, ResolveProxyCallback callback) {
--  new ResolveProxyHelper(browser_context(), url, callback);
-+void Session::ResolveProxy(
-+    const GURL& url,
-+    const ResolveProxyHelper::ResolveProxyCallback& callback) {
-+  browser_context_->GetResolveProxyHelper()->ResolveProxy(url, callback);
- }
- 
- template <Session::CacheAction action>
-changed in both
-  base   100644 d56c2400d4df9d197a03335c4e2b7e735065f301 atom/browser/api/atom_api_session.h
-  our    100644 6c8247c5c4a90e643712dd47d000d37d181a147b atom/browser/api/atom_api_session.h
-  their  100644 547f0e627b0ecf23e808b85cbd5173892479673f atom/browser/api/atom_api_session.h
-@@ -10,6 +10,7 @@
- 
- #include "atom/browser/api/trackable_object.h"
- #include "atom/browser/atom_blob_reader.h"
-+#include "atom/browser/net/resolve_proxy_helper.h"
- #include "base/values.h"
- #include "content/public/browser/download_manager.h"
- #include "native_mate/handle.h"
-@@ -39,8 +40,6 @@
- class Session : public mate::TrackableObject<Session>,
-                 public content::DownloadManager::Observer {
-  public:
--  using ResolveProxyCallback = base::Callback<void(std::string)>;
--
-   enum class CacheAction {
-     CLEAR,
-     STATS,
-@@ -63,8 +62,14 @@
-                              v8::Local<v8::FunctionTemplate> prototype);
- 
-   // Methods.
-+<<<<<<< .our
-   void ResolveProxy(const GURL& url, ResolveProxyCallback callback);
-   template <CacheAction action>
-+=======
-+  void ResolveProxy(const GURL& url,
-+                    const ResolveProxyHelper::ResolveProxyCallback& callback);
-+  template<CacheAction action>
-+>>>>>>> .their
-   void DoCacheAction(const net::CompletionCallback& callback);
-   void ClearStorageData(mate::Arguments* args);
-   void FlushStorageData();
-changed in both
-  base   100644 83adf62eee8301c49799b5397f2dcf6bfdbbd295 atom/browser/api/atom_api_web_contents.cc
-  our    100644 20a1ac2e672f08ffea528b6e094ba530ff8083d1 atom/browser/api/atom_api_web_contents.cc
-  their  100644 9a19b727a82229565ec37e6a436bdbec4e670925 atom/browser/api/atom_api_web_contents.cc
-@@ -124,6 +124,30 @@
- struct Converter<PrintSettings> {
-   static bool FromV8(v8::Isolate* isolate,
-                      v8::Local<v8::Value> val,
-+<<<<<<< .our
-+=======
-+                     atom::SetSizeParams* out) {
-+    mate::Dictionary params;
-+    if (!ConvertFromV8(isolate, val, &params))
-+      return false;
-+    bool autosize;
-+    if (params.Get("enableAutoSize", &autosize))
-+      out->enable_auto_size.reset(new bool(autosize));
-+    gfx::Size size;
-+    if (params.Get("min", &size))
-+      out->min_size.reset(new gfx::Size(size));
-+    if (params.Get("max", &size))
-+      out->max_size.reset(new gfx::Size(size));
-+    if (params.Get("normal", &size))
-+      out->normal_size.reset(new gfx::Size(size));
-+    return true;
-+  }
-+};
-+
-+template<>
-+struct Converter<PrintSettings> {
-+  static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
-+>>>>>>> .their
-                      PrintSettings* out) {
-     mate::Dictionary dict;
-     if (!ConvertFromV8(isolate, val, &dict))
-@@ -280,7 +304,12 @@
- 
- // Called when CapturePage is done.
- void OnCapturePageDone(const base::Callback<void(const gfx::Image&)>& callback,
-+<<<<<<< .our
-                        const SkBitmap& bitmap) {
-+=======
-+                       const SkBitmap& bitmap,
-+                       content::ReadbackResponse response) {
-+>>>>>>> .their
-   // Hack to enable transparency in captured image
-   // TODO(nitsakh) Remove hack once fixed in chromium
-   const_cast<SkBitmap&>(bitmap).setAlphaType(kPremul_SkAlphaType);
-@@ -1015,6 +1044,18 @@
-                                     content::RenderFrameHost* frame_host) {
-   bool handled = true;
-   FrameDispatchHelper helper = {this, frame_host};
-+<<<<<<< .our
-+=======
-+  auto relay = NativeWindowRelay::FromWebContents(web_contents());
-+  if (relay) {
-+    IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(NativeWindow, message, frame_host)
-+      IPC_MESSAGE_FORWARD(AtomAutofillFrameHostMsg_HidePopup,
-+                          relay->window.get(), NativeWindow::HideAutofillPopup)
-+      IPC_MESSAGE_UNHANDLED(handled = false)
-+    IPC_END_MESSAGE_MAP()
-+  }
-+
-+>>>>>>> .their
-   IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(WebContents, message, frame_host)
-     IPC_MESSAGE_HANDLER(AtomFrameHostMsg_Message, OnRendererMessage)
-     IPC_MESSAGE_FORWARD_DELAY_REPLY(AtomFrameHostMsg_Message_Sync, &helper,
-@@ -1024,10 +1065,14 @@
-         FrameDispatchHelper::OnSetTemporaryZoomLevel)
-     IPC_MESSAGE_FORWARD_DELAY_REPLY(AtomFrameHostMsg_GetZoomLevel, &helper,
-                                     FrameDispatchHelper::OnGetZoomLevel)
-+<<<<<<< .our
- #if defined(TOOLKIT_VIEWS) && !defined(OS_MACOSX)
-     IPC_MESSAGE_HANDLER(AtomAutofillFrameHostMsg_ShowPopup, ShowAutofillPopup)
-     IPC_MESSAGE_HANDLER(AtomAutofillFrameHostMsg_HidePopup, HideAutofillPopup)
- #endif
-+=======
-+    IPC_MESSAGE_HANDLER(AtomAutofillFrameHostMsg_ShowPopup, ShowAutofillPopup)
-+>>>>>>> .their
-     IPC_MESSAGE_UNHANDLED(handled = false)
-   IPC_END_MESSAGE_MAP()
- 
-@@ -1075,6 +1120,20 @@
-        details.is_same_document, details.did_replace_entry);
- }
- 
-+<<<<<<< .our
-+=======
-+int64_t WebContents::GetIDForContents(content::WebContents* web_contents) {
-+  int64_t process_id = web_contents->GetRenderProcessHost()->GetID();
-+  int64_t routing_id = web_contents->GetMainFrame()->GetRoutingID();
-+  int64_t rv = (process_id << 32) + routing_id;
-+  return rv;
-+}
-+
-+int64_t WebContents::GetID() const {
-+  return WebContents::GetIDForContents(web_contents());
-+}
-+
-+>>>>>>> .their
- int WebContents::GetProcessID() const {
-   return web_contents()->GetMainFrame()->GetProcess()->GetID();
- }
-@@ -1552,7 +1611,11 @@
- bool WebContents::SendIPCMessage(bool all_frames,
-                                  const base::string16& channel,
-                                  const base::ListValue& args) {
-+<<<<<<< .our
-   auto* frame_host = web_contents()->GetMainFrame();
-+=======
-+  auto frame_host = web_contents()->GetMainFrame();
-+>>>>>>> .their
-   if (frame_host) {
-     return frame_host->Send(new AtomFrameMsg_Message(
-         frame_host->GetRoutingID(), all_frames, channel, args));
-@@ -1853,6 +1916,7 @@
-   rfh->Send(reply_msg);
- }
- 
-+<<<<<<< .our
- v8::Local<v8::Value> WebContents::GetPreloadPath(v8::Isolate* isolate) const {
-   if (auto* web_preferences = WebContentsPreferences::From(web_contents())) {
-     base::FilePath::StringType preload;
-@@ -1880,6 +1944,25 @@
- }
- 
- v8::Local<v8::Value> WebContents::GetOwnerBrowserWindow() const {
-+=======
-+v8::Local<v8::Value> WebContents::GetWebPreferences(v8::Isolate* isolate) {
-+  WebContentsPreferences* web_preferences =
-+      WebContentsPreferences::FromWebContents(web_contents());
-+  if (!web_preferences)
-+    return v8::Null(isolate);
-+  return mate::ConvertToV8(isolate, *web_preferences->web_preferences());
-+}
-+
-+v8::Local<v8::Value> WebContents::GetLastWebPreferences(v8::Isolate* isolate) {
-+  WebContentsPreferences* web_preferences =
-+      WebContentsPreferences::FromWebContents(web_contents());
-+  if (!web_preferences)
-+    return v8::Null(isolate);
-+  return mate::ConvertToV8(isolate, *web_preferences->last_web_preferences());
-+}
-+
-+v8::Local<v8::Value> WebContents::GetOwnerBrowserWindow() {
-+>>>>>>> .their
-   if (owner_window())
-     return BrowserWindow::From(isolate(), owner_window());
-   else
-@@ -2013,7 +2096,10 @@
-       .SetMethod("endFrameSubscription", &WebContents::EndFrameSubscription)
-       .SetMethod("startDrag", &WebContents::StartDrag)
-       .SetMethod("isGuest", &WebContents::IsGuest)
-+<<<<<<< .our
-       .SetMethod("attachToIframe", &WebContents::AttachToIframe)
-+=======
-+>>>>>>> .their
-       .SetMethod("isOffscreen", &WebContents::IsOffScreen)
-       .SetMethod("startPainting", &WebContents::StartPainting)
-       .SetMethod("stopPainting", &WebContents::StopPainting)
-changed in both
-  base   100644 16f23210557ca816cdeadd50b9332447eca8815f atom/browser/api/atom_api_web_contents.h
-  our    100644 7939f8268aa8c3371623e0c15f3b6001d7f1efa4 atom/browser/api/atom_api_web_contents.h
-  their  100644 027332a3706d5ac43a4a769234d361304bdc0350 atom/browser/api/atom_api_web_contents.h
-@@ -97,6 +97,8 @@
-   static void BuildPrototype(v8::Isolate* isolate,
-                              v8::Local<v8::FunctionTemplate> prototype);
- 
-+  static int64_t GetIDForContents(content::WebContents* web_contents);
-+
-   // Notifies to destroy any guest web contents before destroying self.
-   void DestroyWebContents(bool async);
- 
-@@ -234,8 +236,13 @@
-   v8::Local<v8::Value> GetPreloadPath(v8::Isolate* isolate) const;
- 
-   // Returns the web preferences of current WebContents.
-+<<<<<<< .our
-   v8::Local<v8::Value> GetWebPreferences(v8::Isolate* isolate) const;
-   v8::Local<v8::Value> GetLastWebPreferences(v8::Isolate* isolate) const;
-+=======
-+  v8::Local<v8::Value> GetWebPreferences(v8::Isolate* isolate);
-+  v8::Local<v8::Value> GetLastWebPreferences(v8::Isolate* isolate);
-+>>>>>>> .their
- 
-   // Returns the owner window.
-   v8::Local<v8::Value> GetOwnerBrowserWindow() const;
-changed in both
-  base   100644 3f53f4d3d7204f59037ba80556a2c9896e23aae4 atom/browser/api/atom_api_web_request.cc
-  our    100644 c088196f833160ac964e67030fa083302dd090b0 atom/browser/api/atom_api_web_request.cc
-  their  100644 ac84ac196b69a121a54dc64b87b7c2c1d6df21b5 atom/browser/api/atom_api_web_request.cc
-@@ -40,7 +40,11 @@
- 
- namespace {
- 
-+<<<<<<< .our
- template <typename Method, typename Event, typename Listener>
-+=======
-+template<typename Method, typename Event, typename Listener>
-+>>>>>>> .their
- void CallNetworkDelegateMethod(
-     brightray::URLRequestContextGetter* url_request_context_getter,
-     Method method,
-@@ -95,14 +99,24 @@
-   }
- 
-   brightray::URLRequestContextGetter* url_request_context_getter =
-+<<<<<<< .our
-       browser_context_->GetRequestContext();
-+=======
-+      browser_context_->url_request_context_getter();
-+>>>>>>> .their
-   if (!url_request_context_getter)
-     return;
-   BrowserThread::PostTask(
-       BrowserThread::IO, FROM_HERE,
-+<<<<<<< .our
-       base::BindOnce(&CallNetworkDelegateMethod<Method, Event, Listener>,
-                      base::RetainedRef(url_request_context_getter), method,
-                      type, std::move(patterns), std::move(listener)));
-+=======
-+      base::Bind(&CallNetworkDelegateMethod<Method, Event, Listener>,
-+                 base::RetainedRef(url_request_context_getter),
-+                 method, type, std::move(patterns), std::move(listener)));
-+>>>>>>> .their
- }
- 
- // static
-removed in local
-  base   100644 993f9680ccb475f8870a2e3b4da2d20472531d91 atom/browser/api/atom_api_window.cc
-  their  100644 d177afb300f65ba14daa8c07042d4d768b00fd54 atom/browser/api/atom_api_window.cc
-removed in local
-  base   100644 f86c387a34afb15920738413c6819176081b5ee7 atom/browser/api/atom_api_window.h
-  their  100644 e07f34e23f060906942b5fce81081965ea792204 atom/browser/api/atom_api_window.h
-changed in both
-  base   100644 8810fed4b9aef78842fb65db93ed2efebabb6928 atom/browser/api/event.cc
-  our    100644 7b617034eca5a229fc9323bfd6d531ebded752d6 atom/browser/api/event.cc
-  their  100644 1ee0d57e36068c9b6427c278e9a7a5a66b7f8f79 atom/browser/api/event.cc
-@@ -6,7 +6,10 @@
- 
- #include "atom/common/api/api_messages.h"
- #include "atom/common/native_mate_converters/string16_converter.h"
-+<<<<<<< .our
- #include "atom/common/native_mate_converters/value_converter.h"
-+=======
-+>>>>>>> .their
- #include "content/public/browser/render_frame_host.h"
- #include "content/public/browser/web_contents.h"
- #include "native_mate/object_template_builder.h"
-@@ -27,6 +30,7 @@
-   message_ = message;
- 
-   Observe(content::WebContents::FromRenderFrameHost(sender));
-+<<<<<<< .our
- }
- 
- void Event::RenderFrameDeleted(content::RenderFrameHost* rfh) {
-@@ -42,6 +46,23 @@
-     sender_ = new_rfh;
- }
- 
-+=======
-+}
-+
-+void Event::RenderFrameDeleted(content::RenderFrameHost* rfh) {
-+  if (sender_ != rfh)
-+    return;
-+  sender_ = nullptr;
-+  message_ = nullptr;
-+}
-+
-+void Event::RenderFrameHostChanged(content::RenderFrameHost* old_rfh,
-+                                   content::RenderFrameHost* new_rfh) {
-+  if (sender_ && sender_ == old_rfh)
-+    sender_ = new_rfh;
-+}
-+
-+>>>>>>> .their
- void Event::FrameDeleted(content::RenderFrameHost* rfh) {
-   if (sender_ != rfh)
-     return;
-@@ -57,7 +78,11 @@
-   if (message_ == nullptr || sender_ == nullptr)
-     return false;
- 
-+<<<<<<< .our
-   AtomFrameHostMsg_Message_Sync::WriteReplyParams(message_, result);
-+=======
-+  AtomFrameHostMsg_Message_Sync::WriteReplyParams(message_, json);
-+>>>>>>> .their
-   bool success = sender_->Send(message_);
-   message_ = nullptr;
-   sender_ = nullptr;
-changed in both
-  base   100644 d73bd2f64b55b5eb0827f819805578559b947f46 atom/browser/api/event.h
-  our    100644 fbec8f27574691005d203adbafb50709f5c2d010 atom/browser/api/event.h
-  their  100644 05ad7daff8ac524294c1cacb66f876efc9716dd4 atom/browser/api/event.h
-@@ -44,8 +44,13 @@
- 
-  private:
-   // Replyer for the synchronous messages.
-+<<<<<<< .our
-   content::RenderFrameHost* sender_ = nullptr;
-   IPC::Message* message_ = nullptr;
-+=======
-+  content::RenderFrameHost* sender_;
-+  IPC::Message* message_;
-+>>>>>>> .their
- 
-   DISALLOW_COPY_AND_ASSIGN(Event);
- };
-changed in both
-  base   100644 3dbcd0601ef8a63cd6712b566cdc7f388c85e3ee atom/browser/api/event_emitter.cc
-  our    100644 c6e810b51225c8f89eaf53ac3e46381b52ba63b5 atom/browser/api/event_emitter.cc
-  their  100644 91769cbb94794a978732773612a3fec245acd750 atom/browser/api/event_emitter.cc
-changed in both
-  base   100644 8d9d2960df35a33a09dfc79c4c35d424738df43f atom/browser/api/event_emitter.h
-  our    100644 5e4ca3b4ffcb184583ef386100eabda7a9e00da0 atom/browser/api/event_emitter.h
-  their  100644 8145113084a9c0c34ea808e3712879f5f70737c9 atom/browser/api/event_emitter.h
-changed in both
-  base   100644 c83a99c2b38708ca296b4c9215e26cb58eb9a7d2 atom/browser/atom_browser_client.cc
-  our    100644 57c4ee582405e6d501ec23940ccb10689ecd64a1 atom/browser/atom_browser_client.cc
-  their  100644 5c442b32d70e1e1a51b79bfd2d093479ab518060 atom/browser/atom_browser_client.cc
-@@ -343,6 +343,11 @@
-       web_preferences->AppendCommandLineSwitches(command_line);
-     SessionPreferences::AppendExtraCommandLineSwitches(
-         web_contents->GetBrowserContext(), command_line);
-+
-+    auto context_id = atom::api::WebContents::GetIDForContents(
-+      web_contents);
-+    command_line->AppendSwitchASCII(switches::kContextId,
-+      base::IntToString(context_id));
-   }
- }
- 
-@@ -497,7 +502,6 @@
- 
- brightray::BrowserMainParts* AtomBrowserClient::OverrideCreateBrowserMainParts(
-     const content::MainFunctionParams&) {
--  v8::V8::Initialize();  // Init V8 before creating main parts.
-   return new AtomBrowserMainParts;
- }
- 
-changed in both
-  base   100644 07b351b551b609e8b7201753b8969ad9dc6f6a52 atom/browser/atom_browser_context.cc
-  our    100644 e036cbc8103f19a034ce386940462f8a23ea6807 atom/browser/atom_browser_context.cc
-  their  100644 f297fbef0a6e75cdb5ca00c86090eb27e44031a7 atom/browser/atom_browser_context.cc
-@@ -9,8 +9,18 @@
- #include "atom/browser/atom_download_manager_delegate.h"
- #include "atom/browser/atom_permission_manager.h"
- #include "atom/browser/browser.h"
-+<<<<<<< .our
- #include "atom/browser/request_context_delegate.h"
- #include "atom/browser/special_storage_policy.h"
-+=======
-+#include "atom/browser/net/about_protocol_handler.h"
-+#include "atom/browser/net/asar/asar_protocol_handler.h"
-+#include "atom/browser/net/atom_cert_verifier.h"
-+#include "atom/browser/net/atom_network_delegate.h"
-+#include "atom/browser/net/atom_url_request_job_factory.h"
-+#include "atom/browser/net/http_protocol_handler.h"
-+#include "atom/browser/net/resolve_proxy_helper.h"
-+>>>>>>> .their
- #include "atom/browser/web_view_manager.h"
- #include "atom/common/atom_version.h"
- #include "atom/common/chrome_version.h"
-@@ -133,6 +143,14 @@
-   return blob_reader_.get();
- }
- 
-+ResolveProxyHelper* AtomBrowserContext::GetResolveProxyHelper() {
-+  if (!resolve_proxy_helper_.get()) {
-+    resolve_proxy_helper_ =
-+        base::MakeRefCounted<ResolveProxyHelper>(url_request_context_getter());
-+  }
-+  return resolve_proxy_helper_.get();
-+}
-+
- // static
- scoped_refptr<AtomBrowserContext> AtomBrowserContext::From(
-     const std::string& partition,
-changed in both
-  base   100644 359d3d6b71a5ea1d606b59d7f9b158a15baf1942 atom/browser/atom_browser_context.h
-  our    100644 9e6a841ceb8d11069a1a094bf7dbbd3a788918b3 atom/browser/atom_browser_context.h
-  their  100644 77469254db0a598a714d5c9ac3abefbe41ed89af atom/browser/atom_browser_context.h
-@@ -20,8 +20,12 @@
- class AtomBlobReader;
- class AtomDownloadManagerDelegate;
- class AtomPermissionManager;
-+<<<<<<< .our
- class RequestContextDelegate;
- class SpecialStoragePolicy;
-+=======
-+class ResolveProxyHelper;
-+>>>>>>> .their
- class WebViewManager;
- 
- class AtomBrowserContext : public brightray::BrowserContext {
-@@ -49,8 +53,16 @@
-   void OnMainRequestContextCreated(
-       brightray::URLRequestContextGetter* getter) override;
- 
-+<<<<<<< .our
-   RequestContextDelegate* GetRequestContextDelegate() const {
-     return request_context_delegate_.get();
-+=======
-+  ResolveProxyHelper* GetResolveProxyHelper();
-+
-+  AtomBlobReader* GetBlobReader();
-+  AtomCookieDelegate* cookie_delegate() const {
-+    return cookie_delegate_.get();
-+>>>>>>> .their
-   }
- 
-  protected:
-@@ -60,8 +72,12 @@
-   ~AtomBrowserContext() override;
- 
-  private:
-+<<<<<<< .our
-   brightray::URLRequestContextGetter* url_request_context_getter_;
- 
-+=======
-+  scoped_refptr<ResolveProxyHelper> resolve_proxy_helper_;
-+>>>>>>> .their
-   std::unique_ptr<AtomDownloadManagerDelegate> download_manager_delegate_;
-   std::unique_ptr<WebViewManager> guest_manager_;
-   std::unique_ptr<AtomPermissionManager> permission_manager_;
-changed in both
-  base   100644 f16ee50158508565cc1e043d3257ad687cc69215 atom/browser/browser.cc
-  our    100644 ce35de64d60c6767ac52596c1b32e7bde5ceefa0 atom/browser/browser.cc
-  their  100644 3ba915f91eb3403df9630697e77cce9ed7fa3307 atom/browser/browser.cc
-changed in both
-  base   100644 0970b26b776b34f68e5f22776e74c19ddcc039ad atom/browser/browser.h
-  our    100644 aed7d25c37da59c0dd5e09940a064c329353a0b2 atom/browser/browser.h
-  their  100644 a8c1a8c5e7c4409e3a78279da46fb2ba6112f409 atom/browser/browser.h
-@@ -277,7 +277,11 @@
-   bool is_ready_ = false;
- 
-   // The browser is being shutdown.
-+<<<<<<< .our
-   bool is_shutdown_ = false;
-+=======
-+  bool is_shutdown_;
-+>>>>>>> .their
- 
-   int badge_count_ = 0;
- 
-changed in both
-  base   100644 0faeee36f9390b36bc5963b2f90d2063e3603109 atom/browser/browser_mac.mm
-  our    100644 27e347eccebf006336d5d110c81717ecc45af9c3 atom/browser/browser_mac.mm
-  their  100644 e47b8cb9d3c7fcf24279cd6e973a1b00a85ea25a atom/browser/browser_mac.mm
-changed in both
-  base   100644 7c154b60b00e25c42847ceefb98723b50ea03dd0 atom/browser/native_browser_view.h
-  our    100644 56937e4c8c69e3605d2b6cc71a0877b74ff4e83d atom/browser/native_browser_view.h
-  their  100644 cab6980fa2cf035c1a5ca6b4aee822a0ee604fd4 atom/browser/native_browser_view.h
-changed in both
-  base   100644 17b0a1ee9006dd70888165a9209076fd7065f3cc atom/browser/native_browser_view_mac.mm
-  our    100644 0416e26e89f1e0f37366ef1798b4359da0729225 atom/browser/native_browser_view_mac.mm
-  their  100644 86df632638ef7772270569824515b251470d0c08 atom/browser/native_browser_view_mac.mm
-changed in both
-  base   100644 78e788b3019c23bce13fdc8d94385d4a3937cf22 atom/browser/native_browser_view_views.cc
-  our    100644 6414005a1e40d80ae86102b12edee0255cab9adb atom/browser/native_browser_view_views.cc
-  their  100644 def64d12e3520fa15a2b6779147a819a6eaec2f8 atom/browser/native_browser_view_views.cc
-changed in both
-  base   100644 5dcda13447cde098fccaf8782fefb97d861d47f4 atom/browser/native_browser_view_views.h
-  our    100644 8f8e860292baddad1156c50ae7cfaa0fd6e87d99 atom/browser/native_browser_view_views.h
-  their  100644 abf47178302ad7527c1640a3f41492f871f137e5 atom/browser/native_browser_view_views.h
-changed in both
-  base   100644 34778fb6434707e6ae3c70ab55e48e87eb556448 atom/browser/native_window.cc
-  our    100644 4ff2bcfcabfd34d8563f9ed213c03655a99dd9c6 atom/browser/native_window.cc
-  their  100644 26ac44607ebceadcde1d4c038890d914c888a0d5 atom/browser/native_window.cc
-@@ -21,6 +21,11 @@
- #include "ui/display/win/screen_win.h"
- #endif
- 
-+#if defined(OS_WIN)
-+#include "ui/base/win/shell.h"
-+#include "ui/display/win/screen_win.h"
-+#endif
-+
- DEFINE_WEB_CONTENTS_USER_DATA_KEY(atom::NativeWindowRelay);
- 
- namespace atom {
-@@ -45,9 +50,29 @@
- 
- }  // namespace
- 
-+<<<<<<< .our
- NativeWindow::NativeWindow(const mate::Dictionary& options,
-                            NativeWindow* parent)
-     : widget_(new views::Widget), parent_(parent), weak_factory_(this) {
-+=======
-+NativeWindow::NativeWindow(
-+    brightray::InspectableWebContents* inspectable_web_contents,
-+    const mate::Dictionary& options,
-+    NativeWindow* parent)
-+    : content::WebContentsObserver(inspectable_web_contents->GetWebContents()),
-+      has_frame_(true),
-+      transparent_(false),
-+      enable_larger_than_screen_(false),
-+      is_closed_(false),
-+      sheet_offset_x_(0.0),
-+      sheet_offset_y_(0.0),
-+      aspect_ratio_(0.0),
-+      parent_(parent),
-+      is_modal_(false),
-+      is_osr_dummy_(false),
-+      inspectable_web_contents_(inspectable_web_contents),
-+      weak_factory_(this) {
-+>>>>>>> .their
-   options.Get(options::kFrame, &has_frame_);
-   options.Get(options::kTransparent, &transparent_);
-   options.Get(options::kEnableLargerThanScreen, &enable_larger_than_screen_);
-changed in both
-  base   100644 d1cfa7cc352971772689ecd60a110b48ef1a7eaa atom/browser/native_window.h
-  our    100644 35b67e2dd230692c415a32aae5f0a5e99ab74ac0 atom/browser/native_window.h
-  their  100644 61922aea78e3b61db614354e6a578fcda925096b atom/browser/native_window.h
-@@ -220,6 +220,17 @@
-   virtual void HandleKeyboardEvent(
-       content::WebContents*,
-       const content::NativeWebKeyboardEvent& event) {}
-+<<<<<<< .our
-+=======
-+  virtual void ShowAutofillPopup(content::RenderFrameHost* frame_host,
-+                                 content::WebContents* web_contents,
-+                                 const gfx::RectF& bounds,
-+                                 const std::vector<base::string16>& values,
-+                                 const std::vector<base::string16>& labels) {}
-+  virtual void HideAutofillPopup(content::RenderFrameHost* frame_host) {}
-+>>>>>>> .their
-+
-+  virtual void UpdateDraggableRegionViews() {}
- 
-   // Public API used by platform-dependent delegates and observers to send UI
-   // related notifications.
-@@ -340,8 +351,13 @@
- class NativeWindowRelay
-     : public content::WebContentsUserData<NativeWindowRelay> {
-  public:
-+<<<<<<< .our
-   explicit NativeWindowRelay(base::WeakPtr<NativeWindow> window);
-   ~NativeWindowRelay() override;
-+=======
-+  explicit NativeWindowRelay(base::WeakPtr<NativeWindow> window)
-+      : key(UserDataKey()), window(window) {}
-+>>>>>>> .their
- 
-   static void* UserDataKey() {
-     return content::WebContentsUserData<NativeWindowRelay>::UserDataKey();
-changed in both
-  base   100644 60d8fc23f59a842c100412b1c236b87d0815a7a0 atom/browser/native_window_mac.h
-  our    100644 44a78198f44cdba9875e3fb27c8e2c87eaa6f33b atom/browser/native_window_mac.h
-  their  100644 9e8c3aef87dd8d2d4a3260587b7013d260649b55 atom/browser/native_window_mac.h
-@@ -118,8 +118,11 @@
-   void MoveTabToNewWindow() override;
-   void ToggleTabBar() override;
-   bool AddTabbedWindow(NativeWindow* window) override;
-+<<<<<<< .our
- 
-   bool SetWindowButtonVisibility(bool visible) override;
-+=======
-+>>>>>>> .their
- 
-   void SetVibrancy(const std::string& type) override;
-   void SetTouchBar(
-@@ -130,8 +133,19 @@
-   gfx::Rect ContentBoundsToWindowBounds(const gfx::Rect& bounds) const override;
-   gfx::Rect WindowBoundsToContentBounds(const gfx::Rect& bounds) const override;
- 
-+<<<<<<< .our
-   // Use a custom content view instead of Chromium's BridgedContentView.
-   void OverrideNSWindowContentView();
-+=======
-+  // content::WebContentsObserver:
-+  void RenderViewHostChanged(content::RenderViewHost* old_host,
-+                             content::RenderViewHost* new_host) override;
-+
-+  // Refresh the DraggableRegion views.
-+  void UpdateDraggableRegionViews() override {
-+    UpdateDraggableRegionViews(draggable_regions_);
-+  }
-+>>>>>>> .their
- 
-   // Set the attribute of NSWindow while work around a bug of zoom button.
-   void SetStyleMask(bool on, NSUInteger flag);
-changed in both
-  base   100644 ad1713e401240dbc1c2054551d0caeb41aea2884 atom/browser/native_window_mac.mm
-  our    100644 004263ec127709067e903ffbf31003b8844226b4 atom/browser/native_window_mac.mm
-  their  100644 0397c62d8df94b3ce66482c0d9c4b3b87ac97a45 atom/browser/native_window_mac.mm
-@@ -28,9 +28,12 @@
- #include "skia/ext/skia_utils_mac.h"
- #include "ui/gfx/skia_util.h"
- #include "ui/gl/gpu_switching_manager.h"
-+<<<<<<< .our
- #include "ui/views/background.h"
- #include "ui/views/cocoa/bridged_native_widget.h"
- #include "ui/views/widget/widget.h"
-+=======
-+>>>>>>> .their
- 
- // This view always takes the size of its superview. It is intended to be used
- // as a NSWindow's contentView.  It is needed because NSWindow's implementation
-@@ -1144,10 +1147,17 @@
- }
- 
- bool NativeWindowMac::AddTabbedWindow(NativeWindow* window) {
-+<<<<<<< .our
-   if (window_ == window->GetNativeWindow()) {
-     return false;
-   } else {
-     if (@available(macOS 10.12, *))
-+=======
-+  if (window_.get() == window->GetNativeWindow()) {
-+    return false;
-+  } else {
-+    if ([window_ respondsToSelector:@selector(addTabbedWindow:ordered:)])
-+>>>>>>> .their
-       [window_ addTabbedWindow:window->GetNativeWindow() ordered:NSWindowAbove];
-   }
-   return true;
-@@ -1185,15 +1195,22 @@
-       return;
-     }
- 
-+<<<<<<< .our
-     background_color_before_vibrancy_.reset([[window_ backgroundColor] retain]);
-     transparency_before_vibrancy_ = [window_ titlebarAppearsTransparent];
-     ui::GpuSwitchingManager::SetTransparent(true);
-+=======
-+    [vibrant_view removeFromSuperview];
-+    [window_ setVibrantView:nil];
-+    ui::GpuSwitchingManager::SetTransparent(transparent());
-+>>>>>>> .their
- 
-     if (title_bar_style_ != NORMAL) {
-       [window_ setTitlebarAppearsTransparent:YES];
-       [window_ setBackgroundColor:[NSColor clearColor]];
-     }
- 
-+<<<<<<< .our
-     NSVisualEffectView* effect_view = (NSVisualEffectView*)vibrant_view;
-     if (effect_view == nil) {
-       effect_view = [[[NSVisualEffectView alloc]
-@@ -1208,6 +1225,31 @@
-                              positioned:NSWindowBelow
-                              relativeTo:nil];
-     }
-+=======
-+  SetRenderWidgetHostOpaque(false);
-+  background_color_before_vibrancy_.reset([window_ backgroundColor]);
-+  transparency_before_vibrancy_ = [window_ titlebarAppearsTransparent];
-+  ui::GpuSwitchingManager::SetTransparent(true);
-+
-+  if (title_bar_style_ != NORMAL) {
-+    [window_ setTitlebarAppearsTransparent:YES];
-+    [window_ setBackgroundColor:[NSColor clearColor]];
-+  }
-+
-+  NSVisualEffectView* effect_view = (NSVisualEffectView*)vibrant_view;
-+  if (effect_view == nil) {
-+    effect_view = [[[NSVisualEffectView alloc]
-+        initWithFrame: [[window_ contentView] bounds]] autorelease];
-+    [window_ setVibrantView:(NSView*)effect_view];
-+
-+    [effect_view setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
-+    [effect_view setBlendingMode:NSVisualEffectBlendingModeBehindWindow];
-+    [effect_view setState:NSVisualEffectStateActive];
-+    [[window_ contentView] addSubview:effect_view
-+                           positioned:NSWindowBelow
-+                           relativeTo:nil];
-+  }
-+>>>>>>> .their
- 
-     NSVisualEffectMaterial vibrancyType = NSVisualEffectMaterialLight;
- 
-@@ -1387,6 +1429,7 @@
-     [parent->GetNativeWindow() addChildWindow:window_ ordered:NSWindowAbove];
- }
- 
-+<<<<<<< .our
- void NativeWindowMac::ShowWindowButton(NSWindowButton button) {
-   auto view = [window_ standardWindowButton:button];
-   [view.superview addSubview:view positioned:NSWindowAbove relativeTo:nil];
-@@ -1395,6 +1438,35 @@
- void NativeWindowMac::SetForwardMouseMessages(bool forward) {
-   [window_ setAcceptsMouseMovedEvents:forward];
- }
-+=======
-+  // Remove all ControlRegionViews that are added last time.
-+  // Note that [webView subviews] returns the view's mutable internal array and
-+  // it should be copied to avoid mutating the original array while enumerating
-+  // it.
-+  base::scoped_nsobject<NSArray> subviews([[webView subviews] copy]);
-+  for (NSView* subview in subviews.get())
-+    if ([subview isKindOfClass:[ControlRegionView class]])
-+      [subview removeFromSuperview];
-+
-+  // Draggable regions is implemented by having the whole web view draggable
-+  // (mouseDownCanMoveWindow) and overlaying regions that are not draggable.
-+  std::vector<gfx::Rect> drag_exclude_rects =
-+      CalculateNonDraggableRegions(regions, webViewWidth, webViewHeight);
-+
-+  if (browser_view_) {
-+    browser_view_->UpdateDraggableRegions(drag_exclude_rects);
-+  }
-+
-+  // Create and add a ControlRegionView for each region that needs to be
-+  // excluded from the dragging.
-+  for (const auto& rect : drag_exclude_rects) {
-+    base::scoped_nsobject<NSView> controlRegion(
-+        [[ControlRegionView alloc] initWithFrame:NSZeroRect]);
-+    [controlRegion setFrame:NSMakeRect(rect.x(), webViewHeight - rect.bottom(),
-+                                       rect.width(), rect.height())];
-+    [webView addSubview:controlRegion];
-+  }
-+>>>>>>> .their
- 
- void NativeWindowMac::OverrideNSWindowContentView() {
-   // When using `views::Widget` to hold WebContents, Chromium would use
-changed in both
-  base   100644 008109970ec8d3c55a2028a173c3b941908d78a7 atom/browser/native_window_views.cc
-  our    100644 0dba39942f92d54ba34db7709b73012055680d94 atom/browser/native_window_views.cc
-  their  100644 f3e6fc09c5850cbc3d6989a2a94607b1f9a5d514 atom/browser/native_window_views.cc
-@@ -1115,7 +1115,11 @@
-   if (!active && IsMenuBarAutoHide() && IsMenuBarVisible())
-     SetMenuBarVisibility(false);
- 
-+<<<<<<< .our
-   root_view_->ResetAltState();
-+=======
-+  menu_bar_alt_pressed_ = false;
-+>>>>>>> .their
- }
- 
- void NativeWindowViews::OnWidgetBoundsChanged(views::Widget* changed_widget,
-@@ -1237,9 +1241,138 @@
- void NativeWindowViews::HandleKeyboardEvent(
-     content::WebContents*,
-     const content::NativeWebKeyboardEvent& event) {
-+<<<<<<< .our
-   keyboard_event_handler_->HandleKeyboardEvent(event,
-                                                root_view_->GetFocusManager());
-   root_view_->HandleKeyEvent(event);
-+=======
-+  keyboard_event_handler_->HandleKeyboardEvent(event, GetFocusManager());
-+
-+  if (!menu_bar_)
-+    return;
-+
-+  // Show accelerator when "Alt" is pressed.
-+  if (menu_bar_visible_ && IsAltKey(event))
-+    menu_bar_->SetAcceleratorVisibility(
-+        event.GetType() == blink::WebInputEvent::kRawKeyDown);
-+
-+  // Show the submenu when "Alt+Key" is pressed.
-+  if (event.GetType() == blink::WebInputEvent::kRawKeyDown &&
-+      !IsAltKey(event) && IsAltModifier(event)) {
-+    if (!menu_bar_visible_ &&
-+        (menu_bar_->HasAccelerator(event.windows_key_code)))
-+      SetMenuBarVisibility(true);
-+    menu_bar_->ActivateAccelerator(event.windows_key_code);
-+    return;
-+  }
-+
-+  if (!menu_bar_autohide_)
-+    return;
-+
-+  // Toggle the menu bar only when a single Alt is released.
-+  if (event.GetType() == blink::WebInputEvent::kRawKeyDown && IsAltKey(event)) {
-+    // When a single Alt is pressed:
-+    menu_bar_alt_pressed_ = true;
-+  } else if (event.GetType() == blink::WebInputEvent::kKeyUp &&
-+             IsAltKey(event) && menu_bar_alt_pressed_) {
-+    // When a single Alt is released right after a Alt is pressed:
-+    menu_bar_alt_pressed_ = false;
-+    SetMenuBarVisibility(!menu_bar_visible_);
-+  } else {
-+    // When any other keys except single Alt have been pressed/released:
-+    menu_bar_alt_pressed_ = false;
-+  }
-+}
-+
-+void NativeWindowViews::ShowAutofillPopup(
-+    content::RenderFrameHost* frame_host,
-+    content::WebContents* web_contents,
-+    const gfx::RectF& bounds,
-+    const std::vector<base::string16>& values,
-+    const std::vector<base::string16>& labels) {
-+  bool is_offsceen = false;
-+  bool is_embedder_offscreen = false;
-+
-+  auto* web_contents_preferences =
-+      WebContentsPreferences::FromWebContents(web_contents);
-+  if (web_contents_preferences) {
-+    const auto* web_preferences = web_contents_preferences->web_preferences();
-+
-+    web_preferences->GetBoolean("offscreen", &is_offsceen);
-+    int guest_instance_id = 0;
-+    web_preferences->GetInteger(options::kGuestInstanceID, &guest_instance_id);
-+
-+    if (guest_instance_id) {
-+      auto manager = WebViewManager::GetWebViewManager(web_contents);
-+      if (manager) {
-+        auto embedder = manager->GetEmbedder(guest_instance_id);
-+        if (embedder) {
-+          is_embedder_offscreen = WebContentsPreferences::IsPreferenceEnabled(
-+              "offscreen", embedder);
-+        }
-+      }
-+    }
-+  }
-+
-+  autofill_popup_->CreateView(
-+      frame_host,
-+      is_offsceen || is_embedder_offscreen,
-+      widget(),
-+      bounds);
-+  autofill_popup_->SetItems(values, labels);
-+  autofill_popup_->UpdatePopupBounds(menu_bar_visible_ ? 0 : kMenuBarHeight);
-+}
-+
-+void NativeWindowViews::HideAutofillPopup(
-+    content::RenderFrameHost* frame_host) {
-+  autofill_popup_->Hide();
-+}
-+
-+void NativeWindowViews::Layout() {
-+  const auto size = GetContentsBounds().size();
-+  const auto menu_bar_bounds =
-+      menu_bar_visible_ ? gfx::Rect(0, 0, size.width(), kMenuBarHeight)
-+                        : gfx::Rect();
-+  if (menu_bar_) {
-+    menu_bar_->SetBoundsRect(menu_bar_bounds);
-+  }
-+
-+  if (web_view_) {
-+    web_view_->SetBoundsRect(
-+        gfx::Rect(0, menu_bar_bounds.height(), size.width(),
-+                  size.height() - menu_bar_bounds.height()));
-+  }
-+
-+  if (autofill_popup_.get())
-+    autofill_popup_->UpdatePopupBounds(menu_bar_visible_ ? 0 : kMenuBarHeight);
-+}
-+
-+gfx::Size NativeWindowViews::GetMinimumSize() const {
-+  return NativeWindow::GetMinimumSize();
-+}
-+
-+gfx::Size NativeWindowViews::GetMaximumSize() const {
-+  return NativeWindow::GetMaximumSize();
-+}
-+
-+bool NativeWindowViews::AcceleratorPressed(const ui::Accelerator& accelerator) {
-+  return accelerator_util::TriggerAcceleratorTableCommand(
-+      &accelerator_table_, accelerator);
-+}
-+
-+void NativeWindowViews::RegisterAccelerators(AtomMenuModel* menu_model) {
-+  // Clear previous accelerators.
-+  views::FocusManager* focus_manager = GetFocusManager();
-+  accelerator_table_.clear();
-+  focus_manager->UnregisterAccelerators(this);
-+
-+  // Register accelerators with focus manager.
-+  accelerator_util::GenerateAcceleratorTable(&accelerator_table_, menu_model);
-+  for (const auto& iter : accelerator_table_) {
-+    focus_manager->RegisterAccelerator(
-+        iter.first, ui::AcceleratorManager::kNormalPriority, this);
-+  }
-+>>>>>>> .their
- }
- 
- ui::WindowShowState NativeWindowViews::GetRestoredState() {
-changed in both
-  base   100644 a39e84ce5b8d7b757233dab4bed646e08cb8c76a atom/browser/net/asar/url_request_asar_job.cc
-  our    100644 85eb2e1dd142b6d64aafb5350ae47603db989e8f atom/browser/net/asar/url_request_asar_job.cc
-  their  100644 a6fe5e26540c9533f16dcf56fc955d0025de3b4a atom/browser/net/asar/url_request_asar_job.cc
-changed in both
-  base   100644 9b0f3a98dc53b922c0d070244f8f7457f332d850 atom/browser/net/atom_network_delegate.cc
-  our    100644 e71ea74317b69f31a5aac8e723902748972fed8f atom/browser/net/atom_network_delegate.cc
-  their  100644 239a64016febb8f9d81206d7f2a7d100ccd1f293 atom/browser/net/atom_network_delegate.cc
-@@ -250,6 +250,7 @@
- 
- AtomNetworkDelegate::~AtomNetworkDelegate() {}
- 
-+<<<<<<< .our
- void AtomNetworkDelegate::SetSimpleListenerInIO(SimpleEvent type,
-                                                 URLPatterns patterns,
-                                                 SimpleListener callback) {
-@@ -266,6 +267,26 @@
-     response_listeners_.erase(type);
-   else
-     response_listeners_[type] = {std::move(patterns), std::move(callback)};
-+=======
-+void AtomNetworkDelegate::SetSimpleListenerInIO(
-+    SimpleEvent type,
-+    URLPatterns patterns,
-+    SimpleListener callback) {
-+  if (callback.is_null())
-+    simple_listeners_.erase(type);
-+  else
-+    simple_listeners_[type] = { std::move(patterns), std::move(callback) };
-+}
-+
-+void AtomNetworkDelegate::SetResponseListenerInIO(
-+    ResponseEvent type,
-+    URLPatterns patterns,
-+    ResponseListener callback) {
-+  if (callback.is_null())
-+    response_listeners_.erase(type);
-+  else
-+    response_listeners_[type] = { std::move(patterns), std::move(callback) };
-+>>>>>>> .their
- }
- 
- void AtomNetworkDelegate::SetDevToolsNetworkEmulationClientId(
-changed in both
-  base   100644 e00c26ff2cbc134b987b4361896971e48056951d atom/browser/net/atom_network_delegate.h
-  our    100644 39a7a8ddfcda17fd7d022331132b54485d07a279 atom/browser/net/atom_network_delegate.h
-  their  100644 ad37a926d4732d94526f74b2f927e35504d2efe3 atom/browser/net/atom_network_delegate.h
-added in remote
-  their  100644 fde8718f89c5d4d4a6dd0a9b08353832c07902c5 atom/browser/net/resolve_proxy_helper.cc
-@@ -0,0 +1,85 @@
-+// Copyright (c) 2018 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "atom/browser/net/resolve_proxy_helper.h"
-+
-+#include "base/threading/thread_task_runner_handle.h"
-+#include "net/url_request/url_request_context.h"
-+#include "net/url_request/url_request_context_getter.h"
-+
-+namespace atom {
-+
-+ResolveProxyHelper::ResolveProxyHelper(net::URLRequestContextGetter* getter)
-+    : context_getter_(getter),
-+      original_thread_(base::ThreadTaskRunnerHandle::Get()) {}
-+
-+ResolveProxyHelper::~ResolveProxyHelper() {
-+  // Clear all pending requests if the ProxyService is still alive.
-+  pending_requests_.clear();
-+}
-+
-+void ResolveProxyHelper::ResolveProxy(const GURL& url,
-+                                      const ResolveProxyCallback& callback) {
-+  // Enqueue the pending request.
-+  pending_requests_.push_back(PendingRequest(url, callback));
-+
-+  // If nothing is in progress, start.
-+  if (pending_requests_.size() == 1)
-+    StartPendingRequest();
-+}
-+
-+void ResolveProxyHelper::SendProxyResult(const std::string& proxy) {
-+  CHECK(!pending_requests_.empty());
-+
-+  const auto& completed_request = pending_requests_.front();
-+  if (!completed_request.callback.is_null())
-+    completed_request.callback.Run(proxy);
-+
-+  // Clear the current (completed) request.
-+  pending_requests_.pop_front();
-+
-+  // Start the next request.
-+  if (!pending_requests_.empty())
-+    StartPendingRequest();
-+}
-+
-+void ResolveProxyHelper::StartPendingRequest() {
-+  auto& request = pending_requests_.front();
-+  context_getter_->GetNetworkTaskRunner()->PostTask(
-+      FROM_HERE,
-+      base::BindOnce(&ResolveProxyHelper::StartPendingRequestInIO,
-+                     base::Unretained(this), request.url, request.pac_req));
-+}
-+
-+void ResolveProxyHelper::OnResolveProxyCompleted(int result) {
-+  std::string proxy;
-+  if (result == net::OK)
-+    proxy = proxy_info_.ToPacString();
-+
-+  original_thread_->PostTask(
-+      FROM_HERE, base::BindOnce(&ResolveProxyHelper::SendProxyResult,
-+                                base::Unretained(this), proxy));
-+}
-+
-+void ResolveProxyHelper::StartPendingRequestInIO(
-+    const GURL& url,
-+    net::ProxyService::PacRequest* pac_req) {
-+  // Verify the request wasn't started yet.
-+  DCHECK(nullptr == pac_req);
-+
-+  auto proxy_service = context_getter_->GetURLRequestContext()->proxy_service();
-+
-+  // Start the request.
-+  int result = proxy_service->ResolveProxy(
-+      url, std::string(), &proxy_info_,
-+      base::Bind(&ResolveProxyHelper::OnResolveProxyCompleted,
-+                 base::Unretained(this)),
-+      &pac_req, nullptr, net::NetLogWithSource());
-+
-+  // Completed synchronously.
-+  if (result != net::ERR_IO_PENDING)
-+    OnResolveProxyCompleted(result);
-+}
-+
-+}  // namespace atom
-added in remote
-  their  100644 cc85d4ff62ce753ff4ba1fc5979760b5e5d768a6 atom/browser/net/resolve_proxy_helper.h
-@@ -0,0 +1,59 @@
-+// Copyright (c) 2018 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ATOM_BROWSER_NET_RESOLVE_PROXY_HELPER_H_
-+#define ATOM_BROWSER_NET_RESOLVE_PROXY_HELPER_H_
-+
-+#include <deque>
-+#include <string>
-+
-+#include "base/memory/ref_counted.h"
-+#include "net/proxy/proxy_service.h"
-+#include "url/gurl.h"
-+
-+namespace net {
-+class URLRequestContextGetter;
-+}
-+
-+namespace atom {
-+
-+class ResolveProxyHelper
-+    : public base::RefCountedThreadSafe<ResolveProxyHelper> {
-+ public:
-+  using ResolveProxyCallback = base::Callback<void(std::string)>;
-+  explicit ResolveProxyHelper(net::URLRequestContextGetter* getter);
-+
-+  void ResolveProxy(const GURL& url, const ResolveProxyCallback& callback);
-+
-+ private:
-+  friend class base::RefCountedThreadSafe<ResolveProxyHelper>;
-+  struct PendingRequest {
-+   public:
-+    PendingRequest(const GURL& url, const ResolveProxyCallback& callback)
-+        : url(url), callback(callback), pac_req(nullptr) {}
-+
-+    GURL url;
-+    ResolveProxyCallback callback;
-+    net::ProxyService::PacRequest* pac_req;
-+  };
-+
-+  ~ResolveProxyHelper();
-+
-+  void StartPendingRequest();
-+  void StartPendingRequestInIO(const GURL& request,
-+                               net::ProxyService::PacRequest* pac_req);
-+  void SendProxyResult(const std::string& proxy);
-+  void OnResolveProxyCompleted(int result);
-+
-+  net::ProxyInfo proxy_info_;
-+  std::deque<PendingRequest> pending_requests_;
-+  scoped_refptr<net::URLRequestContextGetter> context_getter_;
-+  scoped_refptr<base::SingleThreadTaskRunner> original_thread_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(ResolveProxyHelper);
-+};
-+
-+}  // namespace atom
-+
-+#endif  // ATOM_BROWSER_NET_RESOLVE_PROXY_HELPER_H_
-changed in both
-  base   100644 3313eba36bb903426778fac6cd18258a95fec677 atom/browser/resources/mac/Info.plist
-  our    100644 9094f0f7335edf833d51f688851e6a105de60433 atom/browser/resources/mac/Info.plist
-  their  100644 f94d160f917644ea3f3f508396c0d0e511f94974 atom/browser/resources/mac/Info.plist
-@@ -17,9 +17,15 @@
-   <key>CFBundleIconFile</key>
-   <string>electron.icns</string>
-   <key>CFBundleVersion</key>
-+<<<<<<< .our
-   <string>4.0.0</string>
-   <key>CFBundleShortVersionString</key>
-   <string>4.0.0</string>
-+=======
-+  <string>2.0.5</string>
-+  <key>CFBundleShortVersionString</key>
-+  <string>2.0.5</string>
-+>>>>>>> .their
-   <key>LSApplicationCategoryType</key>
-   <string>public.app-category.developer-tools</string>
-   <key>LSMinimumSystemVersion</key>
-changed in both
-  base   100644 c349f99d712ff69960d35b18587ddb6c417f7cd5 atom/browser/resources/win/atom.rc
-  our    100644 c0bd831e8bddf10180f75cd40694831e2e98622d atom/browser/resources/win/atom.rc
-  their  100644 9805b678c0cf811284e676c745feea9a268295e6 atom/browser/resources/win/atom.rc
-@@ -56,8 +56,13 @@
- //
- 
- VS_VERSION_INFO VERSIONINFO
-+<<<<<<< .our
-  FILEVERSION 4,0,0,20180821
-  PRODUCTVERSION 4,0,0,20180821
-+=======
-+ FILEVERSION 2,0,5,0
-+ PRODUCTVERSION 2,0,5,0
-+>>>>>>> .their
-  FILEFLAGSMASK 0x3fL
- #ifdef _DEBUG
-  FILEFLAGS 0x1L
-@@ -74,12 +79,20 @@
-         BEGIN
-             VALUE "CompanyName", "GitHub, Inc."
-             VALUE "FileDescription", "Electron"
-+<<<<<<< .our
-             VALUE "FileVersion", "4.0.0"
-+=======
-+            VALUE "FileVersion", "2.0.5"
-+>>>>>>> .their
-             VALUE "InternalName", "electron.exe"
-             VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
-             VALUE "OriginalFilename", "electron.exe"
-             VALUE "ProductName", "Electron"
-+<<<<<<< .our
-             VALUE "ProductVersion", "4.0.0"
-+=======
-+            VALUE "ProductVersion", "2.0.5"
-+>>>>>>> .their
-             VALUE "SquirrelAwareVersion", "1"
-         END
-     END
-changed in both
-  base   100644 8bdf4e0c2be32fc7d704bc989d7ccec5dd5db672 atom/browser/ui/cocoa/atom_menu_controller.mm
-  our    100644 cecf30ce1c88e007957a65427648941765a6067e atom/browser/ui/cocoa/atom_menu_controller.mm
-  their  100644 ea141b495e710222f12913f35625cf435b947e18 atom/browser/ui/cocoa/atom_menu_controller.mm
-@@ -334,8 +334,13 @@
-   if (isMenuOpen_) {
-     isMenuOpen_ = NO;
-     model_->MenuWillClose();
-+<<<<<<< .our
-     // Post async task so that itemSelected runs before the close callback
-     // deletes the controller from the map which deallocates it
-+=======
-+    // Post async task so that itemSelected runs before the close callback	
-+    // deletes the controller from the map which deallocates it	
-+>>>>>>> .their
-     if (!closeCallback.is_null()) {
-       BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, closeCallback);
-     }
-changed in both
-  base   100644 b26d472db131f7be9d5bfbbd1cebfc992743d312 atom/browser/ui/file_dialog_mac.mm
-  our    100644 18b18a8b240cda5512ae49e0afde5c749bdf75c0 atom/browser/ui/file_dialog_mac.mm
-  their  100644 89ecaf46ec7f32ca4f3a3a89de13efcbdad5619f atom/browser/ui/file_dialog_mac.mm
-@@ -27,9 +27,12 @@
- 
- @implementation PopUpButtonHandler
- 
-+<<<<<<< .our
- @synthesize savePanel;
- @synthesize fileTypesList;
- 
-+=======
-+>>>>>>> .their
- - (instancetype)initWithPanel:(NSSavePanel*)panel
-                  andTypesList:(NSArray*)typesList {
-   self = [super init];
-@@ -55,6 +58,7 @@
- }
- 
- @end
-+<<<<<<< .our
- 
- // Manages the PopUpButtonHandler.
- @interface AtomAccessoryView : NSView
-@@ -65,6 +69,17 @@
- - (void)dealloc {
-   auto* popupButton =
-       static_cast<NSPopUpButton*>([[self subviews] objectAtIndex:1]);
-+=======
-+
-+// Manages the PopUpButtonHandler.
-+@interface AtomAccessoryView : NSView
-+@end
-+
-+@implementation AtomAccessoryView
-+
-+- (void)dealloc {
-+  auto* popupButton = static_cast<NSPopUpButton*>([[self subviews] objectAtIndex: 1]);
-+>>>>>>> .their
-   [[popupButton target] release];
-   [super dealloc];
- }
-@@ -76,8 +91,11 @@
- DialogSettings::DialogSettings() = default;
- DialogSettings::~DialogSettings() = default;
- 
-+<<<<<<< .our
- namespace {
- 
-+=======
-+>>>>>>> .their
- void SetAllowedFileTypes(NSSavePanel* dialog, const Filters& filters) {
-   NSMutableArray* file_types_list = [NSMutableArray array];
-   NSMutableArray* filter_names = [NSMutableArray array];
-@@ -85,9 +103,18 @@
-   // Create array to keep file types and their name.
-   for (const Filter& filter : filters) {
-     NSMutableSet* file_type_set = [NSMutableSet set];
-+<<<<<<< .our
-     [filter_names addObject:@(filter.first.c_str())];
-     for (const std::string& ext : filter.second) {
-       [file_type_set addObject:@(ext.c_str())];
-+=======
-+    base::ScopedCFTypeRef<CFStringRef> name_cf(
-+        base::SysUTF8ToCFStringRef(filter.first));
-+    [filter_names addObject:base::mac::CFToNSCast(name_cf.get())];
-+    for (const std::string& ext : filter.second) {
-+      base::ScopedCFTypeRef<CFStringRef> ext_cf(base::SysUTF8ToCFStringRef(ext));
-+      [file_type_set addObject:base::mac::CFToNSCast(ext_cf.get())];
-+>>>>>>> .their
-     }
-     [file_types_list addObject:[file_type_set allObjects]];
-   }
-@@ -119,12 +146,19 @@
-   [label setBezeled:NO];
-   [label setDrawsBackground:NO];
- 
-+<<<<<<< .our
-   NSPopUpButton* popupButton =
-       [[NSPopUpButton alloc] initWithFrame:NSMakeRect(50.0, 2, 140, 22.0)
-                                  pullsDown:NO];
-   PopUpButtonHandler* popUpButtonHandler =
-       [[PopUpButtonHandler alloc] initWithPanel:dialog
-                                    andTypesList:file_types_list];
-+=======
-+  NSPopUpButton* popupButton = [[NSPopUpButton alloc] initWithFrame:NSMakeRect(50.0, 2, 140, 22.0)
-+                                                          pullsDown:NO];
-+  PopUpButtonHandler* popUpButtonHandler = [[PopUpButtonHandler alloc] initWithPanel:dialog
-+                                                                        andTypesList:file_types_list];
-+>>>>>>> .their
-   [popupButton addItemsWithTitles:filter_names];
-   [popupButton setTarget:popUpButtonHandler];
-   [popupButton setAction:@selector(selectFormat:)];
-changed in both
-  base   100644 a358f676a8c41d15bb9c3157cce4a62ef8356855 atom/browser/ui/tray_icon_cocoa.mm
-  our    100644 2c434d7a9e312adfb3802628a3d092a95d4ac49f atom/browser/ui/tray_icon_cocoa.mm
-  their  100644 aedce38f656eaab389502df98bb20b28e3e3619a atom/browser/ui/tray_icon_cocoa.mm
-@@ -240,13 +240,22 @@
-   }
- 
-   // check title_ being nil
-+<<<<<<< .our
-   NSString* title = @"";
-+=======
-+  NSString *title = @"";
-+>>>>>>> .their
-   if (title_)
-     title = title_;
- 
-   attributedTitle_.reset([[NSMutableAttributedString alloc]
-+<<<<<<< .our
-       initWithString:title
-           attributes:attributes]);
-+=======
-+                             initWithString:title
-+                                 attributes:attributes]);
-+>>>>>>> .their
- 
-   // NSFontAttributeName:[NSFont menuBarFontOfSize:0],
-   // NSForegroundColorAttributeName:[self colorWithHighlight: highlight]
-changed in both
-  base   100644 e1836ad68985f6068a5ea4be76d6f58682056d04 atom/browser/ui/tray_icon_gtk.cc
-  our    100644 4c780285c80a157afca74b0927175ba3b045def9 atom/browser/ui/tray_icon_gtk.cc
-  their  100644 eb7be1ed3b4345cf825075785c1c1708a7b69d30 atom/browser/ui/tray_icon_gtk.cc
-@@ -36,9 +36,16 @@
-   if (libgtkui::AppIndicatorIcon::CouldOpen()) {
-     ++indicators_count;
-     icon_.reset(new libgtkui::AppIndicatorIcon(
-+<<<<<<< .our
-         base::StringPrintf("%s%d", Browser::Get()->GetName().c_str(),
-                            indicators_count),
-         image.AsImageSkia(), toolTip));
-+=======
-+        base::StringPrintf(
-+            "%s%d", Browser::Get()->GetName().c_str(), indicators_count),
-+        image.AsImageSkia(),
-+        toolTip));
-+>>>>>>> .their
-   } else {
-     icon_.reset(new libgtkui::Gtk2StatusIcon(image.AsImageSkia(), toolTip));
-   }
-changed in both
-  base   100644 5182e1a0f7f141e8ddfa95fd8cca8771f2cabd9f atom/browser/ui/views/frameless_view.cc
-  our    100644 8959ee13612979d2819621acc14ebf641fb7f116 atom/browser/ui/views/frameless_view.cc
-  their  100644 b78e897b8f51747fbeb86cdf1e507ecf5be0bf9b atom/browser/ui/views/frameless_view.cc
-changed in both
-  base   100644 f2ab22f70a6fa08ff1315d197ff3ff3cb700733f atom/browser/ui/views/global_menu_bar_x11.cc
-  our    100644 656bd8f991f87c06a240cdc09a3bfcd500d1c1c8 atom/browser/ui/views/global_menu_bar_x11.cc
-  their  100644 eaeefbd1fb411fca13d6de5dbbc17806d271affd atom/browser/ui/views/global_menu_bar_x11.cc
-changed in both
-  base   100644 bf9801a1457740da391c75621214b8d91cb7467d atom/browser/ui/views/menu_bar.cc
-  our    100644 e838d3cc217b5ffdb77226beff0d7217539f23f9 atom/browser/ui/views/menu_bar.cc
-  their  100644 d963c121bbd29bf3f67b488666297c86b4fee225 atom/browser/ui/views/menu_bar.cc
-@@ -18,11 +18,17 @@
- 
- namespace {
- 
-+<<<<<<< .our
-+=======
-+const char kViewClassName[] = "ElectronMenuBar";
-+
-+>>>>>>> .their
- // Default color of the menu bar.
- const SkColor kDefaultColor = SkColorSetARGB(255, 233, 233, 233);
- 
- }  // namespace
- 
-+<<<<<<< .our
- const char MenuBar::kViewClassName[] = "ElectronMenuBar";
- 
- MenuBar::MenuBar(views::View* window)
-@@ -32,12 +38,35 @@
-   SetLayoutManager(
-       std::make_unique<views::BoxLayout>(views::BoxLayout::kHorizontal));
-   window_->GetFocusManager()->AddFocusChangeListener(this);
-+=======
-+MenuBar::MenuBar(NativeWindow* window)
-+    : background_color_(kDefaultColor), menu_model_(NULL), window_(window) {
-+  RefreshColorCache();
-+  UpdateViewColors();
-+  SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal));
-+>>>>>>> .their
- }
- 
- MenuBar::~MenuBar() {
-   window_->GetFocusManager()->RemoveFocusChangeListener(this);
- }
- 
-+<<<<<<< .our
-+=======
-+void MenuBar::AddedToWidget() {
-+  auto fm = GetFocusManager();
-+  fm->AddFocusChangeListener(this);
-+  // Note that we don't own fm -- this manages the _connection_
-+  focus_manager_.reset(fm, [this](views::FocusManager* fm) {
-+    fm->RemoveFocusChangeListener(this);
-+  });
-+}
-+
-+void MenuBar::RemovedFromWidget() {
-+  focus_manager_.reset();
-+}
-+
-+>>>>>>> .their
- void MenuBar::SetMenu(AtomMenuModel* model) {
-   menu_model_ = model;
-   RebuildChildren();
-@@ -61,7 +90,11 @@
- }
- 
- void MenuBar::ActivateAccelerator(base::char16 key) {
-+<<<<<<< .our
-   auto* child = FindAccelChild(key);
-+=======
-+  auto child = FindAccelChild(key);
-+>>>>>>> .their
-   if (child)
-     static_cast<SubmenuButton*>(child)->Activate(nullptr);
- }
-@@ -151,7 +184,11 @@
- void MenuBar::RebuildChildren() {
-   RemoveAllChildViews(true);
-   for (int i = 0, n = GetItemCount(); i < n; ++i) {
-+<<<<<<< .our
-     auto* button =
-+=======
-+    auto button =
-+>>>>>>> .their
-         new SubmenuButton(menu_model_->GetLabelAt(i), this, background_color_);
-     button->set_tag(i);
-     AddChildView(button);
-@@ -169,7 +206,11 @@
- #if defined(USE_X11)
-   const auto& textColor = has_focus_ ? enabled_color_ : disabled_color_;
-   for (auto* child : GetChildrenInZOrder()) {
-+<<<<<<< .our
-     auto* button = static_cast<SubmenuButton*>(child);
-+=======
-+    auto button = static_cast<SubmenuButton*>(child);
-+>>>>>>> .their
-     button->SetTextColor(views::Button::STATE_NORMAL, textColor);
-     button->SetTextColor(views::Button::STATE_DISABLED, disabled_color_);
-     button->SetTextColor(views::Button::STATE_PRESSED, enabled_color_);
-@@ -178,7 +219,11 @@
-   }
- #elif defined(OS_WIN)
-   for (auto* child : GetChildrenInZOrder()) {
-+<<<<<<< .our
-     auto* button = static_cast<SubmenuButton*>(child);
-+=======
-+    auto button = static_cast<SubmenuButton*>(child);
-+>>>>>>> .their
-     button->SetUnderlineColor(color_utils::GetSysSkColor(COLOR_MENUTEXT));
-   }
- #endif
-changed in both
-  base   100644 761e31b98ea75f44bcd016da3b34b7615f3b409f atom/browser/ui/views/menu_bar.h
-  our    100644 2b10ba3e3bf2ccfc0453fdb59ad022ef7da8ed5b atom/browser/ui/views/menu_bar.h
-  their  100644 13cfa32f3988881e3aa87cae6cae65656fa68d70 atom/browser/ui/views/menu_bar.h
-@@ -5,6 +5,12 @@
- #ifndef ATOM_BROWSER_UI_VIEWS_MENU_BAR_H_
- #define ATOM_BROWSER_UI_VIEWS_MENU_BAR_H_
- 
-+<<<<<<< .our
-+=======
-+#include <memory>
-+
-+#include "atom/browser/native_window.h"
-+>>>>>>> .their
- #include "atom/browser/ui/atom_menu_model.h"
- #include "ui/views/controls/button/menu_button_listener.h"
- #include "ui/views/focus/focus_manager.h"
-@@ -49,7 +55,9 @@
- 
-  protected:
-   // views::View:
-+  void AddedToWidget() override;
-   const char* GetClassName() const override;
-+  void RemovedFromWidget() override;
- 
-   // views::MenuButtonListener:
-   void OnMenuButtonClicked(views::MenuButton* source,
-@@ -79,6 +87,11 @@
- 
-   bool has_focus_ = true;
- 
-+  View* FindAccelChild(base::char16 key);
-+
-+  std::shared_ptr<views::FocusManager> focus_manager_;
-+  bool has_focus_ = true;
-+
-   DISALLOW_COPY_AND_ASSIGN(MenuBar);
- };
- 
-changed in both
-  base   100644 3c3cff3c65410f2e61bdade6e457a096ffba3a54 atom/browser/ui/views/submenu_button.cc
-  our    100644 1124d3d01471876fefa2757570ba3cff796a991c atom/browser/ui/views/submenu_button.cc
-  their  100644 baee28f2cd6931611e048ec46c83e602b95b4b59 atom/browser/ui/views/submenu_button.cc
-@@ -82,8 +82,12 @@
- 
- bool SubmenuButton::GetUnderlinePosition(const base::string16& text,
-                                          base::char16* accelerator,
-+<<<<<<< .our
-                                          int* start,
-                                          int* end) const {
-+=======
-+                                         int* start, int* end) const {
-+>>>>>>> .their
-   int pos, span;
-   base::string16 trimmed = gfx::RemoveAcceleratorChar(text, '&', &pos, &span);
-   if (pos > -1 && span != 0) {
-@@ -96,9 +100,14 @@
-   return false;
- }
- 
-+<<<<<<< .our
- void SubmenuButton::GetCharacterPosition(const base::string16& text,
-                                          int index,
-                                          int* pos) const {
-+=======
-+void SubmenuButton::GetCharacterPosition(
-+    const base::string16& text, int index, int* pos) const {
-+>>>>>>> .their
-   int height = 0;
-   gfx::Canvas::SizeStringInt(text.substr(0, index), gfx::FontList(), pos,
-                              &height, 0, 0);
-changed in both
-  base   100644 5c05481cbbfb85b5d77511cb91cc19cc8ef0e626 atom/browser/ui/views/submenu_button.h
-  our    100644 d8b7785da131271e88533879d090badfd6e49dd5 atom/browser/ui/views/submenu_button.h
-  their  100644 0f7eddf4c914790675f0c9bfab696b2a96b91f74 atom/browser/ui/views/submenu_button.h
-@@ -33,11 +33,17 @@
-  private:
-   bool GetUnderlinePosition(const base::string16& text,
-                             base::char16* accelerator,
-+<<<<<<< .our
-                             int* start,
-                             int* end) const;
-   void GetCharacterPosition(const base::string16& text,
-                             int index,
-                             int* pos) const;
-+=======
-+                            int* start, int* end) const;
-+  void GetCharacterPosition(
-+      const base::string16& text, int index, int* pos) const;
-+>>>>>>> .their
- 
-   base::char16 accelerator_ = 0;
- 
-changed in both
-  base   100644 84a6d9aa3e50ced33616fb4b78e124f39461cd0e atom/browser/ui/win/atom_desktop_window_tree_host_win.cc
-  our    100644 97857d6515aa5617cf8c1972690a1dcdfd645ac1 atom/browser/ui/win/atom_desktop_window_tree_host_win.cc
-  their  100644 3da0241a27a9d272c09db30db068939c1bc66d19 atom/browser/ui/win/atom_desktop_window_tree_host_win.cc
-changed in both
-  base   100644 47e4cb6aed2a962bfdd2a92edaca74b452d15c4d atom/browser/ui/win/atom_desktop_window_tree_host_win.h
-  our    100644 30af3cc162b4429cb3335c6864b801eac1d5f963 atom/browser/ui/win/atom_desktop_window_tree_host_win.h
-  their  100644 b0164f2ab6ca9580d11ae1aaff68d9caae314d54 atom/browser/ui/win/atom_desktop_window_tree_host_win.h
-@@ -25,10 +25,15 @@
-   ~AtomDesktopWindowTreeHostWin() override;
- 
-  protected:
-+<<<<<<< .our
-   bool PreHandleMSG(UINT message,
-                     WPARAM w_param,
-                     LPARAM l_param,
-                     LRESULT* result) override;
-+=======
-+  bool PreHandleMSG(
-+      UINT message, WPARAM w_param, LPARAM l_param, LRESULT* result) override;
-+>>>>>>> .their
-   bool HasNativeFrame() const override;
- 
-  private:
-changed in both
-  base   100644 2cbf07be86a812f07105846dc8caf8226a8595df atom/browser/web_contents_preferences.cc
-  our    100644 c21c93383155091a7481cdd4e741cefad90a4a55 atom/browser/web_contents_preferences.cc
-  their  100644 98b39fee234cb15ac0da99fd5639c7b8265d71b0 atom/browser/web_contents_preferences.cc
-@@ -97,6 +97,7 @@
-   instances_.push_back(this);
- 
-   // Set WebPreferences defaults onto the JS object
-+<<<<<<< .our
-   SetDefaultBoolIfUndefined(options::kPlugins, false);
-   SetDefaultBoolIfUndefined(options::kExperimentalFeatures, false);
-   bool node = SetDefaultBoolIfUndefined(options::kNodeIntegration, true);
-@@ -104,12 +105,23 @@
-   SetDefaultBoolIfUndefined(options::kWebviewTag, node);
-   SetDefaultBoolIfUndefined(options::kSandbox, false);
-   SetDefaultBoolIfUndefined(options::kNativeWindowOpen, false);
-+=======
-+  SetDefaultBoolIfUndefined("plugins", false);
-+  SetDefaultBoolIfUndefined(options::kExperimentalFeatures, false);
-+  SetDefaultBoolIfUndefined(options::kExperimentalCanvasFeatures, false);
-+  bool node = SetDefaultBoolIfUndefined(options::kNodeIntegration, true);
-+  SetDefaultBoolIfUndefined(options::kNodeIntegrationInWorker, false);
-+  SetDefaultBoolIfUndefined(options::kWebviewTag, node);
-+  SetDefaultBoolIfUndefined("sandbox", false);
-+  SetDefaultBoolIfUndefined("nativeWindowOpen", false);
-+>>>>>>> .their
-   SetDefaultBoolIfUndefined(options::kContextIsolation, false);
-   SetDefaultBoolIfUndefined("javascript", true);
-   SetDefaultBoolIfUndefined("images", true);
-   SetDefaultBoolIfUndefined("textAreasAreResizable", true);
-   SetDefaultBoolIfUndefined("webgl", true);
-   bool webSecurity = true;
-+<<<<<<< .our
-   SetDefaultBoolIfUndefined(options::kWebSecurity, webSecurity);
-   // If webSecurity was explicity set to false, let's inherit that into
-   // insecureContent
-@@ -125,6 +137,21 @@
-   SetDefaultBoolIfUndefined(options::kOffscreen, false);
- 
-   last_preference_ = preference_.Clone();
-+=======
-+  SetDefaultBoolIfUndefined("webSecurity", webSecurity);
-+  // If webSecurity was explicity set to false, let's inherit that into
-+  // insecureContent
-+  if (web_preferences.Get("webSecurity", &webSecurity) && !webSecurity) {
-+    SetDefaultBoolIfUndefined("allowRunningInsecureContent", true);
-+  } else {
-+    SetDefaultBoolIfUndefined("allowRunningInsecureContent", false);
-+  }
-+  #if defined(OS_MACOSX)
-+  SetDefaultBoolIfUndefined(options::kScrollBounce, false);
-+  #endif
-+  SetDefaultBoolIfUndefined("offscreen", false);
-+  last_web_preferences_.MergeDictionary(&web_preferences_);
-+>>>>>>> .their
- }
- 
- WebContentsPreferences::~WebContentsPreferences() {
-@@ -154,6 +181,16 @@
-   return default_value;
- }
- 
-+bool WebContentsPreferences::SetDefaultBoolIfUndefined(const std::string key,
-+                                                       bool val) {
-+  bool existing;
-+  if (!web_preferences_.GetBoolean(key, &existing)) {
-+    web_preferences_.SetBoolean(key, val);
-+    return val;
-+  }
-+  return existing;
-+}
-+
- void WebContentsPreferences::Merge(const base::DictionaryValue& extend) {
-   if (preference_.is_dict())
-     static_cast<base::DictionaryValue*>(&preference_)->MergeDictionary(&extend);
-@@ -212,8 +249,18 @@
-   return FromWebContents(web_contents);
- }
- 
-+<<<<<<< .our
- void WebContentsPreferences::AppendCommandLineSwitches(
-     base::CommandLine* command_line) {
-+=======
-+  // We are appending args to a webContents so let's save the current state
-+  // of our preferences object so that during the lifetime of the WebContents
-+  // we can fetch the options used to initally configure the WebContents
-+  self->last_web_preferences_.Clear();
-+  self->last_web_preferences_.MergeDictionary(&web_preferences);
-+
-+  bool b;
-+>>>>>>> .their
-   // Check if plugins are enabled.
-   if (IsEnabled(options::kPlugins))
-     command_line->AppendSwitch(switches::kEnablePlugins);
-changed in both
-  base   100644 94dd8dc598bef5cc35383d69d20ade8d644a7ef5 atom/browser/web_contents_preferences.h
-  our    100644 d835347afcd259f473f95271a2c19e42afcc6f2b atom/browser/web_contents_preferences.h
-  their  100644 28ee9a85485e26b33b8a7852a4a212b4c11b71a0 atom/browser/web_contents_preferences.h
-@@ -59,25 +59,45 @@
-   bool GetPreloadPath(base::FilePath::StringType* path) const;
- 
-   // Returns the web preferences.
-+<<<<<<< .our
-   base::Value* preference() { return &preference_; }
-   base::Value* last_preference() { return &last_preference_; }
-+=======
-+  base::DictionaryValue* web_preferences() { return &web_preferences_; }
-+  base::DictionaryValue* last_web_preferences() {
-+    return &last_web_preferences_;
-+  }
-+>>>>>>> .their
- 
-  private:
-   friend class content::WebContentsUserData<WebContentsPreferences>;
-   friend class AtomBrowserClient;
- 
-+<<<<<<< .our
-   // Get WebContents according to process ID.
-   static content::WebContents* GetWebContentsFromProcessID(int process_id);
- 
-   // Set preference value to given bool if user did not provide value
-   bool SetDefaultBoolIfUndefined(const base::StringPiece& key, bool val);
-+=======
-+  // Set preference value to given bool if user did not provide value
-+  bool SetDefaultBoolIfUndefined(const std::string key, bool val);
-+
-+  // Get preferences value as integer possibly coercing it from a string
-+  bool GetInteger(const std::string& attributeName, int* intValue);
-+>>>>>>> .their
- 
-   static std::vector<WebContentsPreferences*> instances_;
- 
-   content::WebContents* web_contents_;
-+<<<<<<< .our
- 
-   base::Value preference_ = base::Value(base::Value::Type::DICTIONARY);
-   base::Value last_preference_ = base::Value(base::Value::Type::DICTIONARY);
-+=======
-+  base::DictionaryValue web_preferences_;
-+  base::DictionaryValue last_web_preferences_;
-+>>>>>>> .their
- 
-   DISALLOW_COPY_AND_ASSIGN(WebContentsPreferences);
- };
-changed in both
-  base   100644 1dd479883d872dc6d76ef069782aad6dc4f731da atom/browser/web_dialog_helper.cc
-  our    100644 74c8573d13f15bcaa189abdc40fa0cd8e48f89be atom/browser/web_dialog_helper.cc
-  their  100644 c76b48a74b3629b9b8588983cb4563aada6d28b9 atom/browser/web_dialog_helper.cc
-changed in both
-  base   100644 ad8c1d49bbc049b89eb4c69224b42fb51906c726 atom/common/api/api_messages.h
-  our    100644 6131a7a473c68e31790fcd8697c8f380c65ad275 atom/common/api/api_messages.h
-  their  100644 46e6142260d67b6408060ccaf328ee1f74335fe4 atom/common/api/api_messages.h
-@@ -59,6 +59,7 @@
- 
- // Sent by renderer to set the temporary zoom level.
- IPC_SYNC_MESSAGE_ROUTED1_1(AtomFrameHostMsg_SetTemporaryZoomLevel,
-+<<<<<<< .our
-                            double /* zoom level */,
-                            double /* result */)
- 
-@@ -69,3 +70,10 @@
- IPC_MESSAGE_ROUTED2(AtomFrameHostMsg_PDFSaveURLAs,
-                     GURL /* url */,
-                     content::Referrer /* referrer */)
-+=======
-+                            double /* zoom level */,
-+                            double /* result */)
-+
-+// Sent by renderer to get the zoom level.
-+IPC_SYNC_MESSAGE_ROUTED0_1(AtomFrameHostMsg_GetZoomLevel, double /* result */)
-+>>>>>>> .their
-changed in both
-  base   100644 a01ca8f84d917f6402a2e8d0aa153c6f7be9a3c5 atom/common/api/atom_api_v8_util.cc
-  our    100644 3d80db0c0a4cdbb4c7a78fa7e4266fc6fc87193f atom/common/api/atom_api_v8_util.cc
-  their  100644 9fa0484b87978841e73a4ab081fae6091624b5e4 atom/common/api/atom_api_v8_util.cc
-@@ -12,10 +12,20 @@
- #include "atom/common/native_mate_converters/gurl_converter.h"
- #include "atom/common/node_includes.h"
- #include "base/hash.h"
-+#include "base/process/process_handle.h"
-+#include "base/strings/stringprintf.h"
- #include "native_mate/dictionary.h"
- #include "url/origin.h"
- #include "v8/include/v8-profiler.h"
- 
-+// This is defined in later versions of Chromium, remove this if you see
-+// compiler complaining duplicate defines.
-+#if defined(OS_WIN) || defined(OS_FUCHSIA)
-+#define CrPRIdPid "ld"
-+#else
-+#define CrPRIdPid "d"
-+#endif
-+
- namespace std {
- 
- // The hash function used by DoubleIDWeakMap.
-@@ -90,6 +100,16 @@
-   return object->GetIdentityHash();
- }
- 
-+std::string GetContextID(v8::Isolate* isolate) {
-+  // When a page is reloaded, V8 and blink may have optimizations that do not
-+  // free blink::WebLocalFrame and v8::Context and reuse them for the new page,
-+  // while we always recreate node::Environment when a page is loaded.
-+  // So the only reliable way to return an identity for a page, is to return the
-+  // address of the node::Environment instance.
-+  node::Environment* env = node::Environment::GetCurrent(isolate);
-+  return base::StringPrintf("%" CrPRIdPid "-%p", base::GetCurrentProcId(), env);
-+}
-+
- void TakeHeapSnapshot(v8::Isolate* isolate) {
-   isolate->GetHeapProfiler()->TakeHeapSnapshot();
- }
-@@ -112,6 +132,7 @@
-   dict.SetMethod("setHiddenValue", &SetHiddenValue);
-   dict.SetMethod("deleteHiddenValue", &DeleteHiddenValue);
-   dict.SetMethod("getObjectHash", &GetObjectHash);
-+  dict.SetMethod("getContextId", &GetContextID);
-   dict.SetMethod("takeHeapSnapshot", &TakeHeapSnapshot);
-   dict.SetMethod("setRemoteCallbackFreer", &atom::RemoteCallbackFreer::BindTo);
-   dict.SetMethod("setRemoteObjectFreer", &atom::RemoteObjectFreer::BindTo);
-changed in both
-  base   100644 d1a185d51f394b1828d66cbcf2a1d1cc278de23d atom/common/api/remote_callback_freer.cc
-  our    100644 eba828591353dae53d1b7cdaa60fee52166d7473 atom/common/api/remote_callback_freer.cc
-  their  100644 099e2160cc0d28322a60e4a9891a22b29ab841f9 atom/common/api/remote_callback_freer.cc
-@@ -29,7 +29,12 @@
-     : ObjectLifeMonitor(isolate, target),
-       content::WebContentsObserver(web_contents),
-       context_id_(context_id),
-+<<<<<<< .our
-       object_id_(object_id) {}
-+=======
-+      object_id_(object_id) {
-+}
-+>>>>>>> .their
- 
- RemoteCallbackFreer::~RemoteCallbackFreer() {}
- 
-@@ -39,7 +44,11 @@
-   base::ListValue args;
-   args.AppendString(context_id_);
-   args.AppendInteger(object_id_);
-+<<<<<<< .our
-   auto* frame_host = web_contents()->GetMainFrame();
-+=======
-+  auto frame_host = web_contents()->GetMainFrame();
-+>>>>>>> .their
-   if (frame_host) {
-     frame_host->Send(new AtomFrameMsg_Message(frame_host->GetRoutingID(), false,
-                                               channel, args));
-changed in both
-  base   100644 315127822d1709802abf317c4d8cf49ec7e2bfaa atom/common/api/remote_object_freer.cc
-  our    100644 8afe8b9a32bc4ba4d5cdfc66ecf7036b8553cb48 atom/common/api/remote_object_freer.cc
-  their  100644 6e9778994ff21fb3c6be3dd27dbf7cbe2c4c94d6 atom/common/api/remote_object_freer.cc
-changed in both
-  base   100644 5fa39680ca814675d344665b3b2a6ce5d94e625f atom/common/atom_version.h
-  our    100644 65e7d19911559a40b1b258319df5fe0fa180354f atom/common/atom_version.h
-  their  100644 098c9dac927ce4c2568830cff98abb80c68391a6 atom/common/atom_version.h
-@@ -5,10 +5,17 @@
- #ifndef ATOM_COMMON_ATOM_VERSION_H_
- #define ATOM_COMMON_ATOM_VERSION_H_
- 
-+<<<<<<< .our
- #define ATOM_MAJOR_VERSION 4
- #define ATOM_MINOR_VERSION 0
- #define ATOM_PATCH_VERSION 0
- #define ATOM_PRE_RELEASE_VERSION -nightly.20180821
-+=======
-+#define ATOM_MAJOR_VERSION 2
-+#define ATOM_MINOR_VERSION 0
-+#define ATOM_PATCH_VERSION 5
-+// #define ATOM_PRE_RELEASE_VERSION
-+>>>>>>> .their
- 
- #ifndef ATOM_STRINGIFY
- #define ATOM_STRINGIFY(n) ATOM_STRINGIFY_HELPER(n)
-changed in both
-  base   100644 a7908ef30c6bafc4aca1da9a870f7ae12703fe04 atom/common/crash_reporter/crash_reporter_win.cc
-  our    100644 c574da71c9de9bd8c7b7cad57d3a0f84708fb97c atom/common/crash_reporter/crash_reporter_win.cc
-  their  100644 49f90b7e6665727b697a243414544bae304fde6e atom/common/crash_reporter/crash_reporter_win.cc
-changed in both
-  base   100644 cff228ba49068a8a683257e9ac50778437a56c45 atom/common/linux/application_info.cc
-  our    100644 3354c73b8b60f77cf054f975ea713d96b7e7683e atom/common/linux/application_info.cc
-  their  100644 05bd7f6fc15015a4f570e36801aea622a8f0cb3a atom/common/linux/application_info.cc
-@@ -19,7 +19,11 @@
- namespace {
- 
- GDesktopAppInfo* get_desktop_app_info() {
-+<<<<<<< .our
-   GDesktopAppInfo* ret = nullptr;
-+=======
-+  GDesktopAppInfo * ret = nullptr;
-+>>>>>>> .their
- 
-   std::string desktop_id;
-   if (brightray::platform_util::GetDesktopName(&desktop_id))
-changed in both
-  base   100644 eed6e7bc092f84bd1bde673c27f5fe5363c7783c atom/common/options_switches.cc
-  our    100644 8b1836f80c583e4db68971ff1b00ca4f86356b45 atom/common/options_switches.cc
-  their  100644 c1cd185443c0fdbadeb7ba2e174d2048ab2d45d7 atom/common/options_switches.cc
-@@ -188,6 +188,9 @@
- // The application path
- const char kAppPath[] = "app-path";
- 
-+// The context ID for this process
-+const char kContextId[] = "context-id";
-+
- // The command line switch versions of the options.
- const char kBackgroundColor[] = "background-color";
- const char kPreloadScript[] = "preload";
-changed in both
-  base   100644 525301971c8a05c45e12aada7d0534b84307aebf atom/common/options_switches.h
-  our    100644 5f6d7e9d38120668ed06922ced2f8d6a6e27a52b atom/common/options_switches.h
-  their  100644 9d65bc376925906063c24a9a254b2c31c7e22c34 atom/common/options_switches.h
-@@ -92,6 +92,7 @@
- extern const char kSecureSchemes[];
- extern const char kAppUserModelId[];
- extern const char kAppPath[];
-+extern const char kContextId[];
- 
- extern const char kBackgroundColor[];
- extern const char kPreloadScript[];
-changed in both
-  base   100644 7bee1411ba1c2fbac516ff8b65bcbd89f6132819 atom/renderer/api/atom_api_renderer_ipc.cc
-  our    100644 3e48a4f7d0c11f40e6360b0acc2c83c38e671319 atom/renderer/api/atom_api_renderer_ipc.cc
-  their  100644 ad6a12b90d525e9c6a49fac7a5d122b8c2c295f9 atom/renderer/api/atom_api_renderer_ipc.cc
-@@ -12,8 +12,13 @@
- #include "native_mate/dictionary.h"
- #include "third_party/WebKit/public/web/WebLocalFrame.h"
- 
-+<<<<<<< .our
- using blink::WebLocalFrame;
- using content::RenderFrame;
-+=======
-+using content::RenderFrame;
-+using blink::WebLocalFrame;
-+>>>>>>> .their
- 
- namespace atom {
- 
-@@ -48,10 +53,17 @@
- 
-   RenderFrame* render_frame = GetCurrentRenderFrame();
-   if (render_frame == nullptr)
-+<<<<<<< .our
-     return result;
- 
-   IPC::SyncMessage* message = new AtomFrameHostMsg_Message_Sync(
-       render_frame->GetRoutingID(), channel, arguments, &result);
-+=======
-+    return json;
-+
-+  IPC::SyncMessage* message = new AtomFrameHostMsg_Message_Sync(
-+      render_frame->GetRoutingID(), channel, arguments, &json);
-+>>>>>>> .their
-   bool success = render_frame->Send(message);
- 
-   if (!success)
-changed in both
-  base   100644 d0164f44a0a523b26a919e02b5b7add25a0e7224 atom/renderer/api/atom_api_web_frame.cc
-  our    100644 f0f7ef249d73876f7107d3d3865e8fc71ee33945 atom/renderer/api/atom_api_web_frame.cc
-  their  100644 c36d1a06491994f126333c98796f6ff64cfc6506 atom/renderer/api/atom_api_web_frame.cc
-changed in both
-  base   100644 1971a26c1c5d4f5c5f5f029e6334f157a16b5394 atom/renderer/atom_render_frame_observer.cc
-  our    100644 ea2355fd968339600ae8093524f1c3dcfd2f4ff3 atom/renderer/atom_render_frame_observer.cc
-  their  100644 4ddf9186b723091ef91d69cfaedc4fbdd1ac09fa atom/renderer/atom_render_frame_observer.cc
-@@ -7,6 +7,8 @@
- #include <string>
- #include <vector>
- 
-+#include "atom/common/native_mate_converters/string16_converter.h"
-+
- #include "atom/common/api/api_messages.h"
- #include "atom/common/api/event_emitter_caller.h"
- #include "atom/common/native_mate_converters/value_converter.h"
-@@ -72,7 +74,12 @@
-     RendererClientBase* renderer_client)
-     : content::RenderFrameObserver(frame),
-       render_frame_(frame),
-+<<<<<<< .our
-       renderer_client_(renderer_client) {
-+=======
-+      renderer_client_(renderer_client),
-+      document_created_(false) {
-+>>>>>>> .their
-   // Initialise resource for directory listing.
-   net::NetModule::SetResourceProvider(NetResourceProvider);
- }
-@@ -195,8 +202,13 @@
- }
- 
- void AtomRenderFrameObserver::EmitIPCEvent(blink::WebLocalFrame* frame,
-+<<<<<<< .our
-                                            const base::string16& channel,
-                                            const base::ListValue& args) {
-+=======
-+                                          const base::string16& channel,
-+                                          const base::ListValue& args) {
-+>>>>>>> .their
-   if (!frame)
-     return;
- 
-changed in both
-  base   100644 248d5a68096dedea0f6ffb3c9df38ff3373e7c18 atom/renderer/atom_render_frame_observer.h
-  our    100644 e774741c019956a3bff00db2f6d2b133bf1be6de atom/renderer/atom_render_frame_observer.h
-  their  100644 d4f3d0c7d5c454bb65a190f59b26501137dd04e0 atom/renderer/atom_render_frame_observer.h
-@@ -56,7 +56,11 @@
- 
-   content::RenderFrame* render_frame_;
-   RendererClientBase* renderer_client_;
-+<<<<<<< .our
-   bool document_created_ = false;
-+=======
-+  bool document_created_;
-+>>>>>>> .their
- 
-   DISALLOW_COPY_AND_ASSIGN(AtomRenderFrameObserver);
- };
-changed in both
-  base   100644 4d3e7cba7a65330a45a5f2aebba90c257b206e35 atom/renderer/atom_render_view_observer.h
-  our    100644 097616e12369662473c12645a93e27cffcb55e3b atom/renderer/atom_render_view_observer.h
-  their  100644 ca9fb01288e3bd4788c7718f0feb8b37307383e6 atom/renderer/atom_render_view_observer.h
-@@ -14,7 +14,11 @@
-   explicit AtomRenderViewObserver(content::RenderView* render_view);
- 
-  protected:
-+<<<<<<< .our
-   ~AtomRenderViewObserver() override;
-+=======
-+  virtual ~AtomRenderViewObserver();
-+>>>>>>> .their
- 
-  private:
-   // content::RenderViewObserver implementation.
-changed in both
-  base   100644 82ba9d024350009ae86bc5406513c8086073990a atom/renderer/atom_renderer_client.cc
-  our    100644 204f17c2cf0d2d4ec4a71bdbecfcd1cbdc5fc8be atom/renderer/atom_renderer_client.cc
-  their  100644 12e8fa2603a1b533646b300efbf312b9cb2d8361 atom/renderer/atom_renderer_client.cc
-changed in both
-  base   100644 07d20bda8b00b1acdb823546f5e606154278cd4e atom/renderer/atom_sandboxed_renderer_client.cc
-  our    100644 6e29fe45a69f44856d7fca449ec1be4eaf6970a2 atom/renderer/atom_sandboxed_renderer_client.cc
-  their  100644 cf272da91184fcccd484d25a48914897e68ad7e5 atom/renderer/atom_sandboxed_renderer_client.cc
-@@ -12,11 +12,16 @@
- #include "atom/common/options_switches.h"
- #include "atom/renderer/api/atom_api_renderer_ipc.h"
- #include "atom/renderer/atom_render_frame_observer.h"
-+<<<<<<< .our
- #include "base/base_paths.h"
- #include "base/command_line.h"
- #include "base/files/file_path.h"
- #include "base/path_service.h"
- #include "base/process/process_handle.h"
-+=======
-+#include "base/command_line.h"
-+#include "base/files/file_path.h"
-+>>>>>>> .their
- #include "chrome/renderer/printing/print_web_view_helper.h"
- #include "content/public/renderer/render_frame.h"
- #include "native_mate/dictionary.h"
-@@ -34,8 +39,13 @@
- const std::string kModuleCacheKey = "native-module-cache";
- 
- bool IsDevTools(content::RenderFrame* render_frame) {
-+<<<<<<< .our
-   return render_frame->GetWebFrame()->GetDocument().Url().ProtocolIs(
-       "chrome-devtools");
-+=======
-+  return render_frame->GetWebFrame()->GetDocument().Url()
-+        .ProtocolIs("chrome-devtools");
-+>>>>>>> .their
- }
- 
- v8::Local<v8::Object> GetModuleCache(v8::Isolate* isolate) {
-@@ -84,6 +94,7 @@
-   return base::CommandLine::ForCurrentProcess()->argv();
- }
- 
-+<<<<<<< .our
- base::FilePath::StringType GetExecPath() {
-   base::FilePath path;
-   PathService::Get(base::FILE_EXE, &path);
-@@ -95,6 +106,24 @@
-   auto script = v8::Script::Compile(preloadSrc);
-   auto func = script->Run();
-   return func;
-+=======
-+void InitializeBindings(v8::Local<v8::Object> binding,
-+                        v8::Local<v8::Context> context) {
-+  auto isolate = context->GetIsolate();
-+  mate::Dictionary b(isolate, binding);
-+  b.SetMethod("get", GetBinding);
-+  b.SetMethod("crash", AtomBindings::Crash);
-+  b.SetMethod("hang", AtomBindings::Hang);
-+  b.SetMethod("getArgv", GetArgv);
-+  b.SetMethod("getProcessMemoryInfo", &AtomBindings::GetProcessMemoryInfo);
-+  b.SetMethod("getSystemMemoryInfo", &AtomBindings::GetSystemMemoryInfo);
-+
-+  // Pass in CLI flags needed to setup the renderer
-+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-+  if (command_line->HasSwitch(switches::kGuestInstanceID))
-+    b.Set(options::kGuestInstanceID,
-+        command_line->GetSwitchValueASCII(switches::kGuestInstanceID));
-+>>>>>>> .their
- }
- 
- class AtomSandboxedRenderFrameObserver : public AtomRenderFrameObserver {
-@@ -102,12 +131,19 @@
-   AtomSandboxedRenderFrameObserver(content::RenderFrame* render_frame,
-                                    AtomSandboxedRendererClient* renderer_client)
-       : AtomRenderFrameObserver(render_frame, renderer_client),
-+<<<<<<< .our
-         renderer_client_(renderer_client) {}
-+=======
-+        v8_converter_(new atom::V8ValueConverter),
-+        renderer_client_(renderer_client) {
-+    v8_converter_->SetDisableNode(true);
-+  }
-+>>>>>>> .their
- 
-  protected:
-   void EmitIPCEvent(blink::WebLocalFrame* frame,
-                     const base::string16& channel,
--                    const base::ListValue& args) override {
-+                    const base::ListValue& args) {
-     if (!frame)
-       return;
- 
-@@ -176,6 +212,7 @@
- }
- 
- void AtomSandboxedRendererClient::DidCreateScriptContext(
-+<<<<<<< .our
-     v8::Handle<v8::Context> context,
-     content::RenderFrame* render_frame) {
-   RendererClientBase::DidCreateScriptContext(context, render_frame);
-@@ -184,6 +221,18 @@
-   // For devtools we still want to run the preload_bundle script
-   if (!render_frame->IsMainFrame() && !IsDevTools(render_frame))
-     return;
-+=======
-+    v8::Handle<v8::Context> context, content::RenderFrame* render_frame) {
-+
-+  // Only allow preload for the main frame or
-+  // For devtools we still want to run the preload_bundle script
-+  if (!render_frame->IsMainFrame() && !IsDevTools(render_frame))
-+    return;
-+
-+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-+  base::FilePath preload_script_path = command_line->GetSwitchValuePath(
-+      switches::kPreloadScript);
-+>>>>>>> .their
- 
-   auto* isolate = context->GetIsolate();
-   v8::HandleScope handle_scope(isolate);
-@@ -203,7 +252,14 @@
-   auto binding = v8::Object::New(isolate);
-   InitializeBindings(binding, context);
-   AddRenderBindings(isolate, binding);
-+<<<<<<< .our
-   v8::Local<v8::Value> args[] = {binding};
-+=======
-+  v8::Local<v8::Value> args[] = {
-+    binding,
-+    mate::ConvertToV8(isolate, preload_script_path.value())
-+  };
-+>>>>>>> .their
-   // Execute the function with proper arguments
-   ignore_result(
-       func->Call(context, v8::Null(isolate), node::arraysize(args), args));
-changed in both
-  base   100644 89af0932d10a598f87dd28ec4b32ae3b2e0eadca atom/renderer/renderer_client_base.cc
-  our    100644 69490420ef5b8f87e7cb8fd97ebd5ec4509fa1ae atom/renderer/renderer_client_base.cc
-  their  100644 af9dfe39367ff1014e558afee2f0fe5ab0e7456e atom/renderer/renderer_client_base.cc
-@@ -161,7 +161,10 @@
- 
- void RendererClientBase::RenderFrameCreated(
-     content::RenderFrame* render_frame) {
-+<<<<<<< .our
- #if defined(TOOLKIT_VIEWS)
-+=======
-+>>>>>>> .their
-   new AutofillAgent(render_frame);
- #endif
- #if defined(ENABLE_PEPPER_FLASH)
-changed in both
-  base   100644 653aca2b86182a17d5a1a53aeda6d441bfd3652a atom/utility/atom_content_utility_client.cc
-  our    100644 e2a856d53ae243de988c43b0a3335b9391e54b4e atom/utility/atom_content_utility_client.cc
-  their  100644 91168f7fc2da98546864d12f03d1e0f75a7ca64f atom/utility/atom_content_utility_client.cc
-@@ -4,12 +4,29 @@
- 
- #include "atom/utility/atom_content_utility_client.h"
- 
-+#include "content/public/common/service_manager_connection.h"
-+#include "content/public/common/simple_connection_filter.h"
-+#include "content/public/utility/utility_thread.h"
-+#include "mojo/public/cpp/bindings/strong_binding.h"
-+#include "net/proxy/mojo_proxy_resolver_factory_impl.h"
-+#include "services/service_manager/public/cpp/binder_registry.h"
-+
- #if defined(OS_WIN)
- #include "chrome/utility/printing_handler_win.h"
- #endif
- 
- namespace atom {
- 
-+namespace {
-+
-+void CreateProxyResolverFactory(
-+    net::interfaces::ProxyResolverFactoryRequest request) {
-+  mojo::MakeStrongBinding(base::MakeUnique<net::MojoProxyResolverFactoryImpl>(),
-+                          std::move(request));
-+}
-+
-+}  // namespace
-+
- AtomContentUtilityClient::AtomContentUtilityClient() {
- #if defined(OS_WIN)
-   handlers_.push_back(std::make_unique<printing::PrintingHandlerWin>());
-@@ -18,7 +35,29 @@
- 
- AtomContentUtilityClient::~AtomContentUtilityClient() {}
- 
-+<<<<<<< .our
- bool AtomContentUtilityClient::OnMessageReceived(const IPC::Message& message) {
-+=======
-+void AtomContentUtilityClient::UtilityThreadStarted() {
-+  content::ServiceManagerConnection* connection =
-+      content::ChildThread::Get()->GetServiceManagerConnection();
-+
-+  // NOTE: Some utility process instances are not connected to the Service
-+  // Manager. Nothing left to do in that case.
-+  if (!connection)
-+    return;
-+
-+  auto registry = base::MakeUnique<service_manager::BinderRegistry>();
-+  registry->AddInterface<net::interfaces::ProxyResolverFactory>(
-+      base::Bind(CreateProxyResolverFactory),
-+      base::ThreadTaskRunnerHandle::Get());
-+  connection->AddConnectionFilter(
-+      base::MakeUnique<content::SimpleConnectionFilter>(std::move(registry)));
-+}
-+
-+bool AtomContentUtilityClient::OnMessageReceived(
-+    const IPC::Message& message) {
-+>>>>>>> .their
- #if defined(OS_WIN)
-   for (const auto& handler : handlers_) {
-     if (handler->OnMessageReceived(message))
-merged
-  result 100644 75359a2456129dd0caeb03a37eebf7bbfb9a2e21 atom/utility/atom_content_utility_client.h
-  our    100644 7694970457b745a84ecab24a2f0ec8eaefa8a1ad atom/utility/atom_content_utility_client.h
-@@ -20,6 +20,7 @@
-   AtomContentUtilityClient();
-   ~AtomContentUtilityClient() override;
- 
-+  void UtilityThreadStarted() override;
-   bool OnMessageReceived(const IPC::Message& message) override;
- 
-  private:
-changed in both
-  base   100644 065fe818a64586b6f786cdaa163c40b8a3aacabe brightray/brightray.gyp
-  our    100644 f233257e88bad8f0ff703034bea02e4715a5b5b9 brightray/brightray.gyp
-  their  100644 03d48ccef48fccb58bd39f9604e73b872f825d76 brightray/brightray.gyp
-@@ -127,6 +127,8 @@
-                   '<(libchromiumcontent_dir)/libviz_service.a',
-                   # services/device/wake_lock/power_save_blocker/
-                   '<(libchromiumcontent_dir)/libpower_save_blocker.a',
-+                  # net/proxy/mojo_*
-+                  '<(libchromiumcontent_dir)/libnet_proxy_service.a',
-                   # Friends of libpdf.a:
-                   # On Linux we have to use "--whole-archive" to include
-                   # all symbols, otherwise there will be plenty of
-@@ -178,6 +180,7 @@
-                 ],
-               },
-             }],
-+<<<<<<< .our
-             # Due to strange linker behavior, component build of arm needs to
-             # be linked with libjpeg.a explicitly.
-             ['target_arch=="arm" and libchromiumcontent_component==1', {
-@@ -187,6 +190,8 @@
-                 ],
-               },
-             }],
-+=======
-+>>>>>>> .their
-           ],
-         }],  # OS=="linux"
-         ['OS=="mac"', {
-@@ -221,6 +226,8 @@
-                   '<(libchromiumcontent_dir)/libviz_service.a',
-                   # services/device/wake_lock/power_save_blocker/
-                   '<(libchromiumcontent_dir)/libpower_save_blocker.a',
-+                  # net/proxy/mojo_*
-+                  '<(libchromiumcontent_dir)/libnet_proxy_service.a',
-                   # Friends of libpdf.a:
-                   '<(libchromiumcontent_dir)/libpdf.a',
-                   '<(libchromiumcontent_dir)/libppapi_cpp_objects.a',
-@@ -288,6 +295,20 @@
-                 ],
-               },
-             }],
-+            # In the OSX 10.10 SDK, CoreBluetooth became a top level framework.
-+            # Previously, it was nested in IOBluetooth. In order for Chrome to run on
-+            # OSes older than OSX 10.10, the top level CoreBluetooth framework must be
-+            # weakly linked.
-+            ['mac_sdk=="10.10" and libchromiumcontent_component==0', {
-+              'direct_dependent_settings': {
-+                'xcode_settings': {
-+                  'OTHER_LDFLAGS': [
-+                    '-weak_framework',
-+                    'CoreBluetooth',
-+                  ],
-+                },
-+              },
-+            }],
-           ]
-         }],  # OS=="mac"
-         ['OS=="win"', {
-@@ -359,6 +380,8 @@
-                   '<(libchromiumcontent_dir)/viz_service.lib',
-                   # services/device/wake_lock/power_save_blocker/
-                   '<(libchromiumcontent_dir)/power_save_blocker.lib',
-+                  # net/proxy/mojo_*
-+                  '<(libchromiumcontent_dir)/net_proxy_service.lib',
-                   # Friends of pdf.lib:
-                   '<(libchromiumcontent_dir)/pdf.lib',
-                   '<(libchromiumcontent_dir)/ppapi_cpp_objects.lib',
-changed in both
-  base   100644 d7a4c672926c03dcf4c1a4df1a9e5fa09b19d272 brightray/browser/browser_context.cc
-  our    100644 1eff7344e9aef78bb88720c38c0f75fb92e6bc09 brightray/browser/browser_context.cc
-  their  100644 241398ce96efbe0e4f2203acd86f224c910443e2 brightray/browser/browser_context.cc
-@@ -89,6 +89,7 @@
- }
- 
- void BrowserContext::InitPrefs() {
-+  base::ThreadRestrictions::ScopedAllowIO allow_io;
-   auto prefs_path = GetPath().Append(FILE_PATH_LITERAL("Preferences"));
-   base::ThreadRestrictions::ScopedAllowIO allow_io;
-   PrefServiceFactory prefs_factory;
-changed in both
-  base   100644 143a5fdea3eb6ad7709fa8383298029a24c1b407 brightray/browser/linux/libnotify_notification.cc
-  our    100644 0725ffded989d3c6bce753a210e464deca346ad1 brightray/browser/linux/libnotify_notification.cc
-  their  100644 7f9fb35e434f7cc85cf4145661e754ff4a0d84fc brightray/browser/linux/libnotify_notification.cc
-added in remote
-  their  100644 def1fc7f25e6fa60aa4a548d4ddbe9c2f5633289 brightray/browser/net/chrome_mojo_proxy_resolver_factory.cc
-@@ -0,0 +1,117 @@
-+// Copyright 2015 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "brightray/browser/net/chrome_mojo_proxy_resolver_factory.h"
-+
-+#include <utility>
-+
-+#include "base/logging.h"
-+#include "base/memory/ptr_util.h"
-+#include "base/memory/singleton.h"
-+#include "base/single_thread_task_runner.h"
-+#include "base/strings/utf_string_conversions.h"
-+#include "base/threading/thread_task_runner_handle.h"
-+#include "content/public/browser/browser_thread.h"
-+#include "content/public/browser/utility_process_host.h"
-+#include "content/public/browser/utility_process_host_client.h"
-+#include "services/service_manager/public/cpp/interface_provider.h"
-+
-+namespace {
-+const int kUtilityProcessIdleTimeoutSeconds = 5;
-+}
-+
-+// static
-+ChromeMojoProxyResolverFactory* ChromeMojoProxyResolverFactory::GetInstance() {
-+  DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-+  return base::Singleton<
-+      ChromeMojoProxyResolverFactory,
-+      base::LeakySingletonTraits<ChromeMojoProxyResolverFactory>>::get();
-+}
-+
-+ChromeMojoProxyResolverFactory::ChromeMojoProxyResolverFactory() {
-+  DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-+}
-+
-+ChromeMojoProxyResolverFactory::~ChromeMojoProxyResolverFactory() {
-+  DCHECK(thread_checker_.CalledOnValidThread());
-+}
-+
-+std::unique_ptr<base::ScopedClosureRunner>
-+ChromeMojoProxyResolverFactory::CreateResolver(
-+    const std::string& pac_script,
-+    mojo::InterfaceRequest<net::interfaces::ProxyResolver> req,
-+    net::interfaces::ProxyResolverFactoryRequestClientPtr client) {
-+  DCHECK(thread_checker_.CalledOnValidThread());
-+  if (!resolver_factory_)
-+    CreateFactory();
-+
-+  if (!resolver_factory_) {
-+    // If factory creation failed, close |req|'s message pipe, which should
-+    // cause a connection error.
-+    req = nullptr;
-+    return nullptr;
-+  }
-+  idle_timer_.Stop();
-+  num_proxy_resolvers_++;
-+  resolver_factory_->CreateResolver(pac_script, std::move(req),
-+                                    std::move(client));
-+  return base::MakeUnique<base::ScopedClosureRunner>(
-+      base::Bind(&ChromeMojoProxyResolverFactory::OnResolverDestroyed,
-+                 base::Unretained(this)));
-+}
-+
-+void ChromeMojoProxyResolverFactory::CreateFactory() {
-+  DCHECK(thread_checker_.CalledOnValidThread());
-+  DCHECK(!resolver_factory_);
-+  DCHECK(!weak_utility_process_host_);
-+
-+  DVLOG(1) << "Attempting to create utility process for proxy resolver";
-+  content::UtilityProcessHost* utility_process_host =
-+      content::UtilityProcessHost::Create(
-+          scoped_refptr<content::UtilityProcessHostClient>(),
-+          base::ThreadTaskRunnerHandle::Get());
-+  utility_process_host->SetName(base::ASCIIToUTF16("Electron Proxy Resolver"));
-+  bool process_started = utility_process_host->Start();
-+  if (process_started) {
-+    BindInterface(utility_process_host, &resolver_factory_);
-+    weak_utility_process_host_ = utility_process_host->AsWeakPtr();
-+  } else {
-+    LOG(ERROR) << "Unable to connect to utility process";
-+    return;
-+  }
-+
-+  resolver_factory_.set_connection_error_handler(base::Bind(
-+      &ChromeMojoProxyResolverFactory::DestroyFactory, base::Unretained(this)));
-+}
-+
-+void ChromeMojoProxyResolverFactory::DestroyFactory() {
-+  resolver_factory_.reset();
-+  delete weak_utility_process_host_.get();
-+  weak_utility_process_host_.reset();
-+}
-+
-+void ChromeMojoProxyResolverFactory::OnResolverDestroyed() {
-+  DCHECK(thread_checker_.CalledOnValidThread());
-+  DCHECK_GT(num_proxy_resolvers_, 0u);
-+  if (--num_proxy_resolvers_ == 0) {
-+    // When all proxy resolvers have been destroyed, the proxy resolver factory
-+    // is no longer needed. However, new proxy resolvers may be created
-+    // shortly after being destroyed (e.g. due to a network change).
-+    //
-+    // On desktop, where a utility process is used, if the utility process is
-+    // shut down immediately, this would cause unnecessary process churn, so
-+    // wait for an idle timeout before shutting down the proxy resolver utility
-+    // process.
-+    idle_timer_.Start(
-+        FROM_HERE,
-+        base::TimeDelta::FromSeconds(kUtilityProcessIdleTimeoutSeconds), this,
-+        &ChromeMojoProxyResolverFactory::OnIdleTimeout);
-+  }
-+}
-+
-+void ChromeMojoProxyResolverFactory::OnIdleTimeout() {
-+  DCHECK(thread_checker_.CalledOnValidThread());
-+  DCHECK_EQ(num_proxy_resolvers_, 0u);
-+  DestroyFactory();
-+}
-added in remote
-  their  100644 47e51efebf3285c981ab71ba344d27bcd89c52e6 brightray/browser/net/chrome_mojo_proxy_resolver_factory.h
-@@ -0,0 +1,73 @@
-+// Copyright 2015 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef BRIGHTRAY_BROWSER_NET_CHROME_MOJO_PROXY_RESOLVER_FACTORY_H_
-+#define BRIGHTRAY_BROWSER_NET_CHROME_MOJO_PROXY_RESOLVER_FACTORY_H_
-+
-+#include <stddef.h>
-+#include <string>
-+
-+#include "base/macros.h"
-+#include "base/memory/weak_ptr.h"
-+#include "base/threading/thread_checker.h"
-+#include "base/timer/timer.h"
-+#include "net/proxy/mojo_proxy_resolver_factory.h"
-+
-+namespace content {
-+class UtilityProcessHost;
-+}
-+
-+namespace base {
-+template <typename Type>
-+struct DefaultSingletonTraits;
-+}  // namespace base
-+
-+// A factory used to create connections to Mojo proxy resolver services.  On
-+// Android, the proxy resolvers will run in the browser process, and on other
-+// platforms, they'll all be run in the same utility process. Utility process
-+// crashes are detected and the utility process is automatically restarted.
-+class ChromeMojoProxyResolverFactory : public net::MojoProxyResolverFactory {
-+ public:
-+  static ChromeMojoProxyResolverFactory* GetInstance();
-+
-+  // Overridden from net::MojoProxyResolverFactory:
-+  std::unique_ptr<base::ScopedClosureRunner> CreateResolver(
-+      const std::string& pac_script,
-+      mojo::InterfaceRequest<net::interfaces::ProxyResolver> req,
-+      net::interfaces::ProxyResolverFactoryRequestClientPtr client) override;
-+
-+ private:
-+  friend struct base::DefaultSingletonTraits<ChromeMojoProxyResolverFactory>;
-+  ChromeMojoProxyResolverFactory();
-+  ~ChromeMojoProxyResolverFactory() override;
-+
-+  // Creates the proxy resolver factory. On desktop, creates a new utility
-+  // process before creating it out of process. On Android, creates it on the
-+  // current thread.
-+  void CreateFactory();
-+
-+  // Destroys |resolver_factory_|.
-+  void DestroyFactory();
-+
-+  // Invoked each time a proxy resolver is destroyed.
-+  void OnResolverDestroyed();
-+
-+  // Invoked once an idle timeout has elapsed after all proxy resolvers are
-+  // destroyed.
-+  void OnIdleTimeout();
-+
-+  net::interfaces::ProxyResolverFactoryPtr resolver_factory_;
-+
-+  base::WeakPtr<content::UtilityProcessHost> weak_utility_process_host_;
-+
-+  size_t num_proxy_resolvers_ = 0;
-+
-+  base::OneShotTimer idle_timer_;
-+
-+  base::ThreadChecker thread_checker_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(ChromeMojoProxyResolverFactory);
-+};
-+
-+#endif  // BRIGHTRAY_BROWSER_NET_CHROME_MOJO_PROXY_RESOLVER_FACTORY_H_
-changed in both
-  base   100644 7a798ae98e6c180c5a60e0a32ce6393532e83468 brightray/browser/net_log.cc
-  our    100644 fb443ea0b72b9659d98d1873fad1a714483bb13f brightray/browser/net_log.cc
-  their  100644 978667acb61b0330d6bf48bb7e814bbdef50b904 brightray/browser/net_log.cc
-@@ -45,11 +45,16 @@
-     return;
- 
-   base::FilePath log_path =
-+<<<<<<< .our
-       command_line->GetSwitchValuePath(network::switches::kLogNetLog);
-   if (log_path.empty())
-     return;
- 
-   std::unique_ptr<base::Value> constants(GetConstants());  // Net constants
-+=======
-+      command_line->GetSwitchValuePath(switches::kLogNetLog);
-+  std::unique_ptr<base::Value> constants(GetConstants());
-+>>>>>>> .their
-   net::NetLogCaptureMode capture_mode = net::NetLogCaptureMode::Default();
- 
-   file_net_log_observer_ =
-changed in both
-  base   100644 28e988f4b49cd35507e4972c19122bbe604f2690 brightray/browser/url_request_context_getter.cc
-  our    100644 c07ba80cbc522030af580adc5d8676ed31d592d1 brightray/browser/url_request_context_getter.cc
-  their  100644 972d8054221e95442456559ada46ba62e6f75b79 brightray/browser/url_request_context_getter.cc
-@@ -12,7 +12,13 @@
- #include "base/strings/string_util.h"
- #include "base/task_scheduler/post_task.h"
- #include "brightray/browser/browser_client.h"
-+<<<<<<< .our
- #include "brightray/browser/browser_context.h"
-+=======
-+#include "brightray/browser/net/chrome_mojo_proxy_resolver_factory.h"
-+#include "brightray/browser/net/devtools_network_controller_handle.h"
-+#include "brightray/browser/net/devtools_network_transaction_factory.h"
-+>>>>>>> .their
- #include "brightray/browser/net/require_ct_delegate.h"
- #include "brightray/browser/net_log.h"
- #include "brightray/common/switches.h"
-@@ -35,11 +41,20 @@
- #include "net/http/http_auth_preferences.h"
- #include "net/http/http_server_properties_impl.h"
- #include "net/log/net_log.h"
-+<<<<<<< .our
- #include "net/proxy_resolution/dhcp_pac_file_fetcher_factory.h"
- #include "net/proxy_resolution/pac_file_fetcher_impl.h"
- #include "net/proxy_resolution/proxy_config.h"
- #include "net/proxy_resolution/proxy_config_service.h"
- #include "net/proxy_resolution/proxy_service.h"
-+=======
-+#include "net/proxy/dhcp_proxy_script_fetcher_factory.h"
-+#include "net/proxy/proxy_config.h"
-+#include "net/proxy/proxy_config_service.h"
-+#include "net/proxy/proxy_script_fetcher_impl.h"
-+#include "net/proxy/proxy_service.h"
-+#include "net/proxy/proxy_service_mojo.h"
-+>>>>>>> .their
- #include "net/ssl/channel_id_service.h"
- #include "net/ssl/default_channel_id_store.h"
- #include "net/ssl/ssl_config_service_defaults.h"
-@@ -276,9 +291,18 @@
-       storage_->set_proxy_resolution_service(
-           net::ProxyResolutionService::CreateFixed(proxy_config));
-     } else {
-+<<<<<<< .our
-       storage_->set_proxy_resolution_service(
-           net::ProxyResolutionService::CreateUsingSystemProxyResolver(
-               std::move(proxy_config_service_), net_log_));
-+=======
-+      storage_->set_proxy_service(net::CreateProxyServiceUsingMojoFactory(
-+          ChromeMojoProxyResolverFactory::GetInstance(),
-+          std::move(proxy_config_service_),
-+          new net::ProxyScriptFetcherImpl(url_request_context_.get()),
-+          dhcp_factory.Create(url_request_context_.get()), host_resolver.get(),
-+          nullptr, url_request_context_->network_delegate()));
-+>>>>>>> .their
-     }
- 
-     std::vector<std::string> schemes;
-changed in both
-  base   100644 04033f451e045ee7211f0a7152d46c5010a55b72 brightray/browser/url_request_context_getter.h
-  our    100644 941a5782b14a941bb25a7a9ef6ca6d73f8bc3ec1 brightray/browser/url_request_context_getter.h
-  their  100644 1a26704d380ab7d113c4e2b0deb940a2d674f96b brightray/browser/url_request_context_getter.h
-@@ -76,11 +76,14 @@
-       const override;
- 
-   net::URLRequestJobFactory* job_factory() const { return job_factory_; }
-+<<<<<<< .our
-   void set_delegate(Delegate* delegate) { delegate_ = delegate; }
- 
-   // Discard reference to URLRequestContext and inform observers to
-   // shutdown. Must be called only on IO thread.
-   void NotifyContextShuttingDown(std::unique_ptr<ResourceContext>);
-+=======
-+>>>>>>> .their
- 
-  private:
-   friend class BrowserContext;
-changed in both
-  base   100644 08b203a23291ba0e2ba254873074178da4921123 brightray/common/application_info_win.cc
-  our    100644 a0256372bbdbbc1d77cb84885faab42a27f55c9f brightray/common/application_info_win.cc
-  their  100644 89ea0aceb6784119ad65783cfd1c019e7aedbf57 brightray/common/application_info_win.cc
-changed in both
-  base   100644 6a7d91f135c4b904e6d3172da91e7813793a2fba brightray/filenames.gypi
-  our    100644 b9e2d96175f8ee2d407db9c49b2e2b74756327de brightray/filenames.gypi
-  their  100644 e3f2aa5f5bc6f7443df50b88c1ab498d2de0a6f1 brightray/filenames.gypi
-@@ -47,6 +47,27 @@
-       'browser/media/media_device_id_salt.h',
-       'browser/media/media_stream_devices_controller.cc',
-       'browser/media/media_stream_devices_controller.h',
-+<<<<<<< .our
-+=======
-+      'browser/net/devtools_network_conditions.cc',
-+      'browser/net/devtools_network_conditions.h',
-+      'browser/net/devtools_network_controller.cc',
-+      'browser/net/devtools_network_controller.h',
-+      'browser/net/devtools_network_controller_handle.cc',
-+      'browser/net/devtools_network_controller_handle.h',
-+      'browser/net/devtools_network_interceptor.cc',
-+      'browser/net/devtools_network_interceptor.h',
-+      'browser/net/devtools_network_protocol_handler.cc',
-+      'browser/net/devtools_network_protocol_handler.h',
-+      'browser/net/devtools_network_transaction_factory.cc',
-+      'browser/net/devtools_network_transaction_factory.h',
-+      'browser/net/devtools_network_transaction.cc',
-+      'browser/net/devtools_network_transaction.h',
-+      'browser/net/devtools_network_upload_data_stream.cc',
-+      'browser/net/devtools_network_upload_data_stream.h',
-+      'browser/net/chrome_mojo_proxy_resolver_factory.cc',
-+      'browser/net/chrome_mojo_proxy_resolver_factory.h',
-+>>>>>>> .their
-       'browser/net/require_ct_delegate.cc',
-       'browser/net/require_ct_delegate.h',
-       'browser/net_log.cc',
-changed in both
-  base   100644 233e21047718c9bbbc9056f79aecf51657886b92 common.gypi
-  our    100644 676d1e904127066e4a3d313106f15406fcbed8b6 common.gypi
-  their  100644 acad39d991479147b9bc2ee2c5a51fbd8693a689 common.gypi
-changed in both
-  base   100644 e0e8b153ae51d917f37ba50967e2ef9e5b74254d docs/README.md
-  our    100644 f7b956e8feb95ceb64743ad260a1759e5a298afe docs/README.md
-  their  100644 436188887e5dad0a4ae291e5221e3eb8644bc56e docs/README.md
-@@ -16,6 +16,7 @@
- 
- * [Electron FAQ](faq.md)
- 
-+<<<<<<< .our
- ## Guides and Tutorials
- 
- * [Setting up the Development Environment](tutorial/development-environment.md)
-@@ -66,6 +67,12 @@
-   * [Mac App Store](tutorial/mac-app-store-submission-guide.md)
-   * [Windows Store](tutorial/windows-store-guide.md)
-   * [Snapcraft](tutorial/snapcraft.md)
-+=======
-+## Guides
-+
-+* [Glossary of Terms](glossary.md)
-+* [Support](tutorial/support.md)
-+>>>>>>> .their
- * [Security](tutorial/security.md)
-   * [Reporting Security Issues](tutorial/security.md#reporting-security-issues)
-   * [Chromium Security Issues and Upgrades](tutorial/security.md#chromium-security-issues-and-upgrades)
-changed in both
-  base   100644 926d1dde8ffc33d99c48cb55bbc2d0f9c2087ad4 docs/api/app.md
-  our    100644 14dc557e237404cbbd5bcebabb0e65486dc36926 docs/api/app.md
-  their  100644 40fdf2669442ca48fd1fc9a3b4aede6a199df4f1 docs/api/app.md
-changed in both
-  base   100644 2be2da597664c1913a665ad51de5becc42658d0f docs/api/browser-window.md
-  our    100644 dff61dd336f047cf2f6f06228b2df2b98ff2304d docs/api/browser-window.md
-  their  100644 96e3951db79478f51beb9c3f39c18f03a0c61a21 docs/api/browser-window.md
-changed in both
-  base   100644 f9aaaa90ddd7b8887c5ed3fea371bf175e28c2e7 docs/api/in-app-purchase.md
-  our    100644 6e612a72e27159602400f4efa30d5bc2f3aa668f docs/api/in-app-purchase.md
-  their  100644 67109dc0f92d8c537c9a2f1fa5fa2ce223137964 docs/api/in-app-purchase.md
-changed in both
-  base   100644 6aaa2bdd9b0ade84160b7449396d5ecd510f0e41 docs/api/web-contents.md
-  our    100644 8990fe2e97ab62eafdd3f7a4eb8ee782415124c5 docs/api/web-contents.md
-  their  100644 841acb4a506626c334004e28266ebed3845360d3 docs/api/web-contents.md
-@@ -1385,6 +1385,26 @@
- 
- Shows pop-up dictionary that searches the selected word on the page.
- 
-+<<<<<<< .our
-+=======
-+#### `contents.setSize(options)`
-+
-+Set the size of the page. This is only supported for `<webview>` guest contents.
-+
-+* `options` Object
-+  * `enableAutoSize` Boolean (optional) - true to make the webview container automatically
-+    resize within the bounds specified by the attributes normal, min and max.
-+  * `normal` [Size](structures/size.md) (optional) - Normal size of the page. This can be used in
-+    combination with the [`disableguestresize`](webview-tag.md#disableguestresize)
-+    attribute to manually resize the webview guest contents.
-+  * `min` [Size](structures/size.md) (optional) - Minimum size of the page. This can be used in
-+    combination with the [`disableguestresize`](webview-tag.md#disableguestresize)
-+    attribute to manually resize the webview guest contents.
-+  * `max` [Size](structures/size.md) (optional) - Maximium size of the page. This can be used in
-+    combination with the [`disableguestresize`](webview-tag.md#disableguestresize)
-+    attribute to manually resize the webview guest contents.
-+
-+>>>>>>> .their
- #### `contents.isOffscreen()`
- 
- Returns `Boolean` - Indicates whether *offscreen rendering* is enabled.
-changed in both
-  base   100644 afdff5615421e52b8750ea1de20b63941cbefb1f docs/development/releasing.md
-  our    100644 85a5fa0a935201521155dc60de45986db5829613 docs/development/releasing.md
-  their  100644 d27fb5022515cb80a829a80369fb6cb192003522 docs/development/releasing.md
-@@ -8,16 +8,25 @@
- information.
- 
- There are a handful of `*_TOKEN` environment variables needed by the release
-+<<<<<<< .our
- scripts:
- 
- * `ELECTRON_GITHUB_TOKEN`:
- Create this by visiting https://github.com/settings/tokens/new?scopes=repo
-+=======
-+scripts. Once you've generated these per-user tokens, you may want to keep
-+them in a local file that you can `source` when starting a release.
-+* `ELECTRON_GITHUB_TOKEN`:
-+Create as described at https://github.com/settings/tokens/new,
-+giving the token repo access scope.
-+>>>>>>> .their
- * `APPVEYOR_TOKEN`:
- Create a token from https://windows-ci.electronjs.org/api-token
- If you don't have an account, ask a team member to add you.
- * `CIRCLE_TOKEN`:
- Create a token from "Personal API Tokens" at https://circleci.com/account/api
- * `VSTS_TOKEN`:
-+<<<<<<< .our
- Create a Personal Access Token at https://github.visualstudio.com/_usersSettings/tokens or https://github.visualstudio.com/_details/security/tokens
- with the scope of `Build (read and execute)`.
- * `ELECTRON_S3_BUCKET`:
-@@ -29,6 +38,10 @@
- of the project. This file is gitignored, and will be loaded into the 
- environment by the release scripts.
- 
-+=======
-+Create a Personal Access Token at https://github.visualstudio.com/_usersSettings/tokens
-+with the scope of `Build (read and execute)`.
-+>>>>>>> .their
- 
- ## Determine which branch to release from
- 
-@@ -212,10 +225,13 @@
- ```sh
- $ npm run release -- --validateRelease
- ```
-+<<<<<<< .our
- Note, if you need to run `--validateRelease` more than once to check the assets,
- run it as above the first time, then `node ./script/release.js --validateRelease`
- for subsequent calls so that you don't have to rebuild each time you want to
- check the assets.
-+=======
-+>>>>>>> .their
- 
- ## Publish the release
- 
-@@ -258,6 +274,7 @@
- electron
- $ npm run publish-to-npm
- ```
-+<<<<<<< .our
- 
- After publishing, you can check the `latest` release:
- ```sh
-@@ -273,6 +290,8 @@
- ```sh
- $ npm dist-tag add electron@2.0.0 latest
- ```
-+=======
-+>>>>>>> .their
- 
- [the releases page]: https://github.com/electron/electron/releases
- [this bump commit]: https://github.com/electron/electron/commit/78ec1b8f89b3886b856377a1756a51617bc33f5a
-@@ -303,7 +322,11 @@
- ```
- 
- Additionally you can pass a job name to the script to run an individual job, eg:
-+<<<<<<< .our
- ```sh
-+=======
-+````sh
-+>>>>>>> .their
- node script/ci-release-build.js --ci=AppVeyor --ghRelease --job=electron-x64 TARGET_BRANCH
- ```
- 
-removed in local
-  base   100644 7dfc6084f5c94bfb924438e7efa50260d38b9144 docs/tutorial/planned-breaking-changes.md
-  their  100644 00e01f4f8c3a85f0e535a00c11e22f3595bff4b9 docs/tutorial/planned-breaking-changes.md
-added in both
-  our    100644 bdb3b8678485feabfad2ce23309f5bcac6050f31 docs/tutorial/support.md
-  their  100644 306876fee9314fbca1779a6c41ff8c6381753bda docs/tutorial/support.md
-@@ -91,4 +91,8 @@
- * Fedora 21
- * Debian 8
- 
-+<<<<<<< .our
- [arm-breaking-change]: https://github.com/electron/electron/blob/master/docs/api/breaking-changes.md#duplicate-arm-assets
-+=======
-+[arm-breaking-change]: https://github.com/electron/electron/blob/master/docs/tutorial/planned-breaking-changes.md#duplicate-arm-assets
-+>>>>>>> .their
-changed in both
-  base   100644 53ad35c63321e74a5023197ef2e075584e0f268b electron.gyp
-  our    100644 944ddab2a3fd879044e31677e4bac2843fffbdee electron.gyp
-  their  100644 188be9e6a50e1baedd5ef5d9e8de90e0d0ad83bc electron.gyp
-@@ -4,7 +4,11 @@
-     'product_name%': 'Electron',
-     'company_name%': 'GitHub, Inc',
-     'company_abbr%': 'github',
-+<<<<<<< .our
-     'version%': '4.0.0-nightly.20180821',
-+=======
-+    'version%': '2.0.5',
-+>>>>>>> .their
-     'js2c_input_dir': '<(SHARED_INTERMEDIATE_DIR)/js2c',
-   },
-   'includes': [
-changed in both
-  base   100644 ef3e8258584a5459b069e2006db44c0a8b66412d filenames.gypi
-  our    100644 f57860558f06b7e5d8a50f48cfc7e53044df0bc6 filenames.gypi
-  their  100644 acd43c97988952b9a2760b44d366bd87134a1d65 filenames.gypi
-@@ -292,6 +292,8 @@
-       'atom/browser/net/http_protocol_handler.h',
-       'atom/browser/net/js_asker.cc',
-       'atom/browser/net/js_asker.h',
-+      'atom/browser/net/resolve_proxy_helper.cc',
-+      'atom/browser/net/resolve_proxy_helper.h',
-       'atom/browser/net/url_request_about_job.cc',
-       'atom/browser/net/url_request_about_job.h',
-       'atom/browser/net/url_request_async_asar_job.cc',
-changed in both
-  base   100644 381a2a866372ebe06f374529c634af411c864ba0 lib/browser/api/app.js
-  our    100644 66f6ae651acf10fb19b8ec068fc5280850dd3d91 lib/browser/api/app.js
-  their  100644 1ea1daddca84dfeba57b7b7883ebb754b8508d2d lib/browser/api/app.js
-changed in both
-  base   100644 22565dcf9875b7f00acff192b10b05d27d6446a7 lib/browser/api/browser-window.js
-  our    100644 cb523496d65c7018c30054621cfdeb1281f9db6a lib/browser/api/browser-window.js
-  their  100644 c5faa0a2c131d633e7aea3a1850abab958d22a1d lib/browser/api/browser-window.js
-changed in both
-  base   100644 da5ff57a113f7a063d1409ff56003db4bd04e68a lib/browser/api/menu.js
-  our    100644 506e3525c10ce142cafe3fc1bf4de1c255e48503 lib/browser/api/menu.js
-  their  100644 a87e0cd0436da2899b6402a06d370e755c2aac47 lib/browser/api/menu.js
-@@ -47,7 +47,11 @@
-   this.delegate = delegate
- }
- 
-+<<<<<<< .our
- Menu.prototype.popup = function (options = {}) {
-+=======
-+Menu.prototype.popup = function (options) {
-+>>>>>>> .their
-   if (options == null || typeof options !== 'object') {
-     throw new TypeError('Options must be an object')
-   }
-@@ -156,7 +160,11 @@
- 
- Menu.buildFromTemplate = function (template) {
-   if (!Array.isArray(template)) {
-+<<<<<<< .our
-     throw new TypeError('Invalid template for Menu: Menu template must be an array')
-+=======
-+    throw new TypeError('Invalid template for Menu')
-+>>>>>>> .their
-   }
-   const menu = new Menu()
-   if (!areValidTemplateItems(template)) {
-merged
-  result 100644 bbbc1bbe1727dd30352c4836cea489145cd7ad7d lib/browser/api/screen.js
-  our    100644 8287bfa8bfdc6db322a05059fd5c8ba58e802db9 lib/browser/api/screen.js
-@@ -1,8 +1,17 @@
- const {EventEmitter} = require('events')
-+const {deprecate} = require('electron')
- const {screen, Screen} = process.atomBinding('screen')
- 
- // Screen is an EventEmitter.
- Object.setPrototypeOf(Screen.prototype, EventEmitter.prototype)
- EventEmitter.call(screen)
- 
-+const nativeFn = screen.getMenuBarHeight
-+screen.getMenuBarHeight = function () {
-+  if (!process.noDeprecations) {
-+    deprecate.warn('screen.getMenuBarHeight', 'screen.getPrimaryDisplay().workArea')
-+  }
-+  return nativeFn.call(this)
-+}
-+
- module.exports = screen
-changed in both
-  base   100644 0338b776f8938c1548ea9786385fe75db9db3403 lib/browser/guest-view-manager.js
-  our    100644 1e4029e39a981c85fb6ff18c5ccd52f81b3c56f2 lib/browser/guest-view-manager.js
-  their  100644 9d729663a6a928ff7e1b89f374b6931cbb2a8dbc lib/browser/guest-view-manager.js
-changed in both
-  base   100644 50e890e225a315718d04a0028fb6bf2feb4092ce lib/browser/guest-window-manager.js
-  our    100644 7253c1942b0956ae6b9b0c80a23470fc26669b8a lib/browser/guest-window-manager.js
-  their  100644 ec77a7abdff1ba27e55da513c10d084d7978b7c0 lib/browser/guest-window-manager.js
-@@ -65,7 +65,11 @@
-   // Inherit certain option values from parent window
-   const webPreferences = embedder.getLastWebPreferences()
-   for (const [name, value] of inheritedWebPreferences) {
-+<<<<<<< .our
-     if (webPreferences[name] === value) {
-+=======
-+    if (embedder.getLastWebPreferences()[name] === value) {
-+>>>>>>> .their
-       options.webPreferences[name] = value
-     }
-   }
-changed in both
-  base   100644 24a86fdfee7b87cd8ad177363aec26b438fe79b7 lib/browser/init.js
-  our    100644 bed3d912ab8be3ca4f21de04e801bb42dc12a528 lib/browser/init.js
-  their  100644 344bcf16dceafc99dcc337a0d9113c8e764c6364 lib/browser/init.js
-changed in both
-  base   100644 bfb9091e6584c43a19bf6283a79027274053239b lib/browser/objects-registry.js
-  our    100644 f03a23d2f6910d6555bb9469180d1b60b94bc313 lib/browser/objects-registry.js
-  their  100644 b2667454152c271bfb088e50c29c096dd1f51c63 lib/browser/objects-registry.js
-@@ -26,10 +26,16 @@
-     const id = this.saveToStorage(obj)
- 
-     // Add object to the set of referenced objects.
-+<<<<<<< .our
-     const ownerKey = getOwnerKey(webContents, contextId)
-     let owner = this.owners[ownerKey]
-     if (!owner) {
-       owner = this.owners[ownerKey] = new Set()
-+=======
-+    let owner = this.owners[contextId]
-+    if (!owner) {
-+      owner = this.owners[contextId] = new Set()
-+>>>>>>> .their
-       this.registerDeleteListener(webContents, contextId)
-     }
-     if (!owner.has(id)) {
-@@ -49,9 +55,14 @@
-   // Dereference an object according to its ID.
-   // Note that an object may be double-freed (cleared when page is reloaded, and
-   // then garbage collected in old page).
-+<<<<<<< .our
-   remove (webContents, contextId, id) {
-     const ownerKey = getOwnerKey(webContents, contextId)
-     let owner = this.owners[ownerKey]
-+=======
-+  remove (contextId, id) {
-+    let owner = this.owners[contextId]
-+>>>>>>> .their
-     if (owner) {
-       // Remove the reference in owner.
-       owner.delete(id)
-@@ -61,14 +72,23 @@
-   }
- 
-   // Clear all references to objects refrenced by the WebContents.
-+<<<<<<< .our
-   clear (webContents, contextId) {
-     const ownerKey = getOwnerKey(webContents, contextId)
-     let owner = this.owners[ownerKey]
-+=======
-+  clear (contextId) {
-+    let owner = this.owners[contextId]
-+>>>>>>> .their
-     if (!owner) return
- 
-     for (let id of owner) this.dereference(id)
- 
-+<<<<<<< .our
-     delete this.owners[ownerKey]
-+=======
-+    delete this.owners[contextId]
-+>>>>>>> .their
-   }
- 
-   // Private: Saves the object into storage and assigns an ID for it.
-@@ -101,13 +121,21 @@
-     }
-   }
- 
-+<<<<<<< .our
-   // Private: Clear the storage when renderer process is destroyed.
-+=======
-+  // Private: Clear the storage when webContents is reloaded/navigated.
-+>>>>>>> .their
-   registerDeleteListener (webContents, contextId) {
-     const processId = webContents.getProcessId()
-     const listener = (event, deletedProcessId) => {
-       if (deletedProcessId === processId) {
-         webContents.removeListener('render-view-deleted', listener)
-+<<<<<<< .our
-         this.clear(webContents, contextId)
-+=======
-+        this.clear(contextId)
-+>>>>>>> .their
-       }
-     }
-     webContents.on('render-view-deleted', listener)
-changed in both
-  base   100644 c0cd09dea4273642aa780756985e9c90dbe164d3 lib/browser/rpc-server.js
-  our    100644 ff9f77321de3a4145946b67f3fe2a597f98e2510 lib/browser/rpc-server.js
-  their  100644 ea4f93fe5a877e35653c2c88d7a273936bf1d09d lib/browser/rpc-server.js
-@@ -84,7 +84,11 @@
- 
-   // Fill the meta object according to value's type.
-   if (meta.type === 'array') {
-+<<<<<<< .our
-     meta.members = value.map((el) => valueToMeta(sender, contextId, el, optimizeSimpleObject))
-+=======
-+    meta.members = value.map((el) => valueToMeta(sender, contextId, el))
-+>>>>>>> .their
-   } else if (meta.type === 'object' || meta.type === 'function') {
-     meta.name = value.constructor ? value.constructor.name : ''
- 
-@@ -210,9 +214,15 @@
-           return rendererFunctions.get(objectId)
-         }
- 
-+<<<<<<< .our
-         const processId = sender.getProcessId()
-         let callIntoRenderer = function (...args) {
-           if (!sender.isDestroyed() && processId === sender.getProcessId()) {
-+=======
-+        const webContentsId = sender.getId()
-+        let callIntoRenderer = function (...args) {
-+          if (!sender.isDestroyed() && webContentsId === sender.getId()) {
-+>>>>>>> .their
-             sender.send('ELECTRON_RENDERER_CALLBACK', contextId, meta.id, valueToMeta(sender, contextId, args))
-           } else {
-             removeRemoteListenersAndLogWarning(this, meta, callIntoRenderer)
-@@ -234,8 +244,14 @@
- // Call a function and send reply asynchronously if it's a an asynchronous
- // style function and the caller didn't pass a callback.
- const callFunction = function (event, contextId, func, caller, args) {
-+<<<<<<< .our
-   const funcMarkedAsync = v8Util.getHiddenValue(func, 'asynchronous')
-   const funcPassedCallback = typeof args[args.length - 1] === 'function'
-+=======
-+  let funcMarkedAsync, funcName, funcPassedCallback, ref, ret
-+  funcMarkedAsync = v8Util.getHiddenValue(func, 'asynchronous')
-+  funcPassedCallback = typeof args[args.length - 1] === 'function'
-+>>>>>>> .their
-   try {
-     if (funcMarkedAsync && !funcPassedCallback) {
-       args.push(function (ret) {
-@@ -243,7 +259,11 @@
-       })
-       func.apply(caller, args)
-     } else {
-+<<<<<<< .our
-       const ret = func.apply(caller, args)
-+=======
-+      ret = func.apply(caller, args)
-+>>>>>>> .their
-       event.returnValue = valueToMeta(event.sender, contextId, ret, true)
-     }
-   } catch (error) {
-@@ -302,7 +322,14 @@
-       throwRPCError(`Cannot call constructor on missing remote object ${id}`)
-     }
- 
-+<<<<<<< .our
-     event.returnValue = valueToMeta(event.sender, contextId, new constructor(...args))
-+=======
-+    // Call new with array of arguments.
-+    // http://stackoverflow.com/questions/1606797/use-of-apply-with-new-operator-is-this-possible
-+    let obj = new (Function.prototype.bind.apply(constructor, [null].concat(args)))()
-+    event.returnValue = valueToMeta(event.sender, contextId, obj)
-+>>>>>>> .their
-   } catch (error) {
-     event.returnValue = exceptionToMeta(event.sender, contextId, error)
-   }
-@@ -332,7 +359,14 @@
-       throwRPCError(`Cannot call constructor '${method}' on missing remote object ${id}`)
-     }
- 
-+<<<<<<< .our
-     event.returnValue = valueToMeta(event.sender, contextId, new object[method](...args))
-+=======
-+    // Call new with array of arguments.
-+    let constructor = object[method]
-+    let obj = new (Function.prototype.bind.apply(constructor, [null].concat(args)))()
-+    event.returnValue = valueToMeta(event.sender, contextId, obj)
-+>>>>>>> .their
-   } catch (error) {
-     event.returnValue = exceptionToMeta(event.sender, contextId, error)
-   }
-@@ -384,12 +418,21 @@
- })
- 
- ipcMain.on('ELECTRON_BROWSER_DEREFERENCE', function (event, contextId, id) {
-+<<<<<<< .our
-   objectsRegistry.remove(event.sender, contextId, id)
- })
- 
- ipcMain.on('ELECTRON_BROWSER_CONTEXT_RELEASE', (event, contextId) => {
-   objectsRegistry.clear(event.sender, contextId)
-   event.returnValue = null
-+=======
-+  objectsRegistry.remove(contextId, id)
-+})
-+
-+ipcMain.on('ELECTRON_BROWSER_CONTEXT_RELEASE', (e, contextId) => {
-+  objectsRegistry.clear(contextId)
-+  e.returnValue = null
-+>>>>>>> .their
- })
- 
- ipcMain.on('ELECTRON_BROWSER_GUEST_WEB_CONTENTS', function (event, contextId, guestInstanceId) {
-changed in both
-  base   100644 6dc774049def3acbd13b79dfd559c12d4eebd657 lib/common/api/crash-reporter.js
-  our    100644 1090d425e4c5cdf89a03d470718324ef16963472 lib/common/api/crash-reporter.js
-  their  100644 1b20fa52aab741e5dd34de7872f36798ec7c1c68 lib/common/api/crash-reporter.js
-changed in both
-  base   100644 a4f8072ed57642e1ca7d1066e132875da7ad3f46 lib/renderer/api/remote.js
-  our    100644 59117f8f2dd977fc1817a6b1d540b616ddcb0dae lib/renderer/api/remote.js
-  their  100644 4211201133db8cf2031cfb4180ff4e14a05794ed lib/renderer/api/remote.js
-@@ -10,7 +10,11 @@
- const remoteObjectCache = v8Util.createIDWeakMap()
- 
- // An unique ID that can represent current context.
-+<<<<<<< .our
- const contextId = v8Util.getHiddenValue(global, 'contextId')
-+=======
-+const contextId = v8Util.getContextId()
-+>>>>>>> .their
- 
- // Notify the main process when current context is going to be released.
- // Note that when the renderer process is destroyed, the message may not be
-changed in both
-  base   100644 1cb69436dd479baf54b9805c04c0c31b20f24fad lib/renderer/init.js
-  our    100644 2470a5e8be80e770b0c03f6a439a71e72ae12a1b lib/renderer/init.js
-  their  100644 93129849ae048c1c09f943b56e78562f46be04e8 lib/renderer/init.js
-changed in both
-  base   100644 d2da884f1d9caf3d633de25837cb2128f564f2fb lib/renderer/security-warnings.js
-  our    100644 b24f9e28b879154457be0342b9d4b44c0e651253 lib/renderer/security-warnings.js
-  their  100644 4f7d6ef9e596cdc3a5c7e1f2b89b24b9cd67de1d lib/renderer/security-warnings.js
-changed in both
-  base   100644 119391e79462bfa8bb1494039bcb3522d97acead lib/sandboxed_renderer/init.js
-  our    100644 30a3fa55216f6bf7588c3accc07b150a31163b7c lib/sandboxed_renderer/init.js
-  their  100644 04971e01d5b37e97856759965284adba8543d46c lib/sandboxed_renderer/init.js
-@@ -35,10 +35,13 @@
-   ['url', require('url')]
- ])
- 
-+<<<<<<< .our
- const {
-   preloadSrc, preloadError, process: processProps
- } = electron.ipcRenderer.sendSync('ELECTRON_BROWSER_SANDBOX_LOAD')
- 
-+=======
-+>>>>>>> .their
- require('../renderer/web-frame-init')()
- 
- // Pass different process object to the preload script(which should not have
-@@ -107,6 +110,7 @@
- // and any `require('electron')` calls in `preload.js` will work as expected
- // since browserify won't try to include `electron` in the bundle, falling back
- // to the `preloadRequire` function above.
-+<<<<<<< .our
- if (preloadSrc) {
-   const preloadWrapperSrc = `(function(require, process, Buffer, global, setImmediate, clearImmediate) {
-   ${preloadSrc}
-@@ -118,4 +122,18 @@
-   preloadFn(preloadRequire, preloadProcess, Buffer, global, setImmediate, clearImmediate)
- } else if (preloadError) {
-   console.error(preloadError.stack)
-+=======
-+if (preloadPath) {
-+  const preloadSrc = fs.readFileSync(preloadPath).toString()
-+  const preloadWrapperSrc = `(function(require, process, Buffer, global, setImmediate) {
-+  ${preloadSrc}
-+  })`
-+
-+  // eval in window scope:
-+  // http://www.ecma-international.org/ecma-262/5.1/#sec-10.4.2
-+  const geval = eval
-+  const preloadFn = geval(preloadWrapperSrc)
-+  const {setImmediate} = require('timers')
-+  preloadFn(preloadRequire, preloadProcess, Buffer, global, setImmediate)
-+>>>>>>> .their
- }
-changed in both
-  base   100644 9d3b0da9c80b223e4a1188311a1121796eb9f7ae package.json
-  our    100644 c081cd89450cd50efba1ec280ff1349a96ea3ce0 package.json
-  their  100644 cf86809bf9e49ab808e2873a03b9c1f1607f20f0 package.json
-@@ -1,6 +1,10 @@
- {
-   "name": "electron",
-+<<<<<<< .our
-   "version": "4.0.0-nightly.20180821",
-+=======
-+  "version": "2.0.5",
-+>>>>>>> .their
-   "repository": "https://github.com/electron/electron",
-   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
-   "devDependencies": {
-@@ -13,7 +17,11 @@
-     "dugite": "^1.45.0",
-     "electabul": "~0.0.4",
-     "electron-docs-linter": "^2.3.4",
-+<<<<<<< .our
-     "electron-typescript-definitions": "^1.3.6",
-+=======
-+    "electron-typescript-definitions": "1.3.2",
-+>>>>>>> .their
-     "github": "^9.2.0",
-     "html-entities": "^1.2.1",
-     "husky": "^0.14.3",
-@@ -25,8 +33,12 @@
-     "remark-cli": "^4.0.0",
-     "remark-preset-lint-markdown-style-guide": "^2.1.1",
-     "request": "^2.68.0",
-+<<<<<<< .our
-     "semver": "^5.5.0",
-     "serve": "^6.5.8",
-+=======
-+    "serve": "^6.5.3",
-+>>>>>>> .their
-     "standard": "^10.0.0",
-     "standard-markdown": "^4.0.0",
-     "sumchecker": "^2.0.2",
-changed in both
-  base   100755 4465b85c135ddb55a673c5180e15f05f09dac57e script/bootstrap.py
-  our    100755 e4aaf89e216b0164f15882a3040e8cac70bf1fd9 script/bootstrap.py
-  their  100755 c6ebe4ef6975efd1f6184159cc3d9d079bf3628d script/bootstrap.py
-changed in both
-  base   100755 c97cd8336f7d7980911d0bdea93137e7bc95ba24 script/build.py
-  our    100755 fb2b95d3bb71a25ce1ca58acf596afdc0f2cc5bd script/build.py
-  their  100755 2a2231394207c28fcd2b86d3d9f9b079b08d637e script/build.py
-@@ -40,6 +40,12 @@
-   if is_verbose_mode():
-     ninja.append('-v')
- 
-+<<<<<<< .our
-+=======
-+  args = parse_args()
-+  if args.ninja_path:
-+    ninja = args.ninja_path
-+>>>>>>> .their
-   if args.libcc:
-     if ('D' not in args.configuration
-         or not os.path.exists(GCLIENT_DONE)
-@@ -93,12 +99,15 @@
-   parser.add_argument('--ninja-path',
-                       help='Path of ninja command to use.',
-                       required=False)
-+<<<<<<< .our
-   parser.add_argument('--compdb',
-                       help=(
-                         'Generate JSON compilation database. This will not '
-                         'trigger actual build. '
-                       ),
-                       action='store_true', default=False)
-+=======
-+>>>>>>> .their
-   return parser.parse_args()
- 
- 
-changed in both
-  base   100644 ec2459198bf254e7e380e4ae63097168041d0068 script/ci-release-build.js
-  our    100644 be9f9597387f5f8b7bfddc61c202f32ce4c6d478 script/ci-release-build.js
-  their  100644 1a15cd55b266363bea4394e970d274b2caa2d716 script/ci-release-build.js
-@@ -51,6 +51,10 @@
- }
- 
- async function circleCIcall (buildUrl, targetBranch, job, options) {
-+<<<<<<< .our
-+=======
-+  assert(process.env.CIRCLE_TOKEN, 'CIRCLE_TOKEN not found in environment')
-+>>>>>>> .their
-   console.log(`Triggering CircleCI to run build job: ${job} on branch: ${targetBranch} with release flag.`)
-   let buildRequest = {
-     'build_parameters': {
-@@ -80,6 +84,7 @@
-     console.log('Error calling CircleCI:', err)
-   })
-   console.log(`CircleCI release build request for ${job} successful.  Check ${circleResponse.build_url} for status.`)
-+<<<<<<< .our
- }
- 
- function buildAppVeyor (targetBranch, options) {
-@@ -92,6 +97,21 @@
-   }
- }
- 
-+=======
-+}
-+
-+function buildAppVeyor (targetBranch, options) {
-+  assert(process.env.APPVEYOR_TOKEN, 'APPVEYOR_TOKEN not found in environment')
-+  const validJobs = Object.keys(appVeyorJobs)
-+  if (options.job) {
-+    assert(validJobs.includes(options.job), `Unknown AppVeyor CI job name: ${options.job}.  Valid values are: ${validJobs}.`)
-+    callAppVeyor(targetBranch, options.job, options)
-+  } else {
-+    validJobs.forEach((job) => callAppVeyor(targetBranch, job, options))
-+  }
-+}
-+
-+>>>>>>> .their
- async function callAppVeyor (targetBranch, job, options) {
-   console.log(`Triggering AppVeyor to run build job: ${job} on branch: ${targetBranch} with release flag.`)
-   let environmentVariables = {}
-@@ -144,6 +164,10 @@
-     assert(vstsJobs.includes(options.job), `Unknown VSTS CI job name: ${options.job}. Valid values are: ${vstsJobs}.`)
-   }
-   console.log(`Triggering VSTS to run build on branch: ${targetBranch} with release flag.`)
-+<<<<<<< .our
-+=======
-+  assert(process.env.VSTS_TOKEN, 'VSTS_TOKEN not found in environment')
-+>>>>>>> .their
-   let environmentVariables = {}
- 
-   if (!options.ghRelease) {
-changed in both
-  base   100755 de3b9ffd48156379afd677b98c40c97532cb8367 script/create-dist.py
-  our    100755 4a6c0c7ce8f275175e48c4c380ff33627f7a5961 script/create-dist.py
-  their  100755 e8396a2e6d242b9deba3b6a7642060584cd1a605 script/create-dist.py
-@@ -147,7 +147,11 @@
- 
-   # Copy file and keep the executable bit.
-   shutil.copyfile(src, dest)
-+<<<<<<< .our
-   add_exec_bit(dest)
-+=======
-+  os.chmod(dest, os.stat(dest).st_mode | stat.S_IEXEC)
-+>>>>>>> .their
- 
- def copy_vcruntime_binaries():
-   arch = get_target_arch()
-@@ -302,7 +306,11 @@
-     dest = os.path.join(DIST_DIR, binary)
-     # Copy file and keep the executable bit.
-     shutil.copyfile(src, dest)
-+<<<<<<< .our
-     add_exec_bit(dest)
-+=======
-+    os.chmod(dest, os.stat(dest).st_mode | stat.S_IEXEC)
-+>>>>>>> .their
- 
-     dist_name = get_zip_name(binary, version)
-     zip_file = os.path.join(SOURCE_ROOT, 'dist', dist_name)
-added in both
-  our    100644 d8cfb2be8af17bc5536e521848c64b14b155015a script/find-release.js
-  their  100644 3cfd79aae1427c3b432076a869e6cf689d79871f script/find-release.js
-@@ -1,5 +1,8 @@
-+<<<<<<< .our
- if (!process.env.CI) require('dotenv-safe').load()
- 
-+=======
-+>>>>>>> .their
- const GitHub = require('github')
- const github = new GitHub()
- 
-@@ -14,7 +17,11 @@
-   github.authenticate({type: 'token', token: process.env.ELECTRON_GITHUB_TOKEN})
-   let releases = await github.repos.getReleases({
-     owner: 'electron',
-+<<<<<<< .our
-     repo: version.indexOf('nightly') > 0 ? 'nightlies' : 'electron'
-+=======
-+    repo: 'electron'
-+>>>>>>> .their
-   })
-   let targetRelease = releases.data.find(release => {
-     return release.tag_name === version
-changed in both
-  base   100644 76f39fc26973e01145f7758785778075ddbaa648 script/lib/dbus_mock.py
-  our    100644 9b9c8029cb75a9d84c632d04f234c2020542ca68 script/lib/dbus_mock.py
-  their  100644 00b1fd98d7837cfef60460f9d456a5cb8340761c script/lib/dbus_mock.py
-@@ -4,21 +4,29 @@
- import atexit
- import os
- import sys
-+<<<<<<< .our
-+=======
-+
-+>>>>>>> .their
- 
- 
- def stop():
-     DBusTestCase.stop_dbus(DBusTestCase.system_bus_pid)
-     DBusTestCase.stop_dbus(DBusTestCase.session_bus_pid)
-+<<<<<<< .our
- 
- def start():
-     dbusmock_log = sys.stdout if is_verbose_mode() else open(os.devnull, 'w')
- 
-     DBusTestCase.start_system_bus()
-     DBusTestCase.spawn_server_template('logind', None, dbusmock_log)
-+=======
-+>>>>>>> .their
- 
-     DBusTestCase.start_session_bus()
-     DBusTestCase.spawn_server_template('notification_daemon', None, dbusmock_log)
- 
-+<<<<<<< .our
- if __name__ == '__main__':
-     import subprocess
-     start()
-@@ -26,3 +34,14 @@
-         subprocess.check_call(sys.argv[1:])
-     finally:
-         stop()
-+=======
-+atexit.register(cleanup)
-+
-+dbusmock_log = sys.stdout if is_verbose_mode() else open(os.devnull, 'w')
-+
-+DBusTestCase.start_system_bus()
-+DBusTestCase.spawn_server_template('logind', None, dbusmock_log)
-+
-+DBusTestCase.start_session_bus()
-+DBusTestCase.spawn_server_template('notification_daemon', None, dbusmock_log)
-+>>>>>>> .their
-changed in both
-  base   100755 69882928765a56f50702a371af322710ef3ccf22 script/prepare-release.js
-  our    100755 72a28b719bf1ff7770692caef86c76746c4d8edf script/prepare-release.js
-  their  100755 8021fa331da3e8afd8810b8bb4a87eb39e859e75 script/prepare-release.js
-@@ -5,6 +5,10 @@
- const args = require('minimist')(process.argv.slice(2), {
-   boolean: ['automaticRelease', 'notesOnly', 'stable']
- })
-+<<<<<<< .our
-+=======
-+const assert = require('assert')
-+>>>>>>> .their
- const ciReleaseBuild = require('./ci-release-build')
- const { execSync } = require('child_process')
- const fail = '\u2717'.red
-@@ -21,7 +25,11 @@
- // via conventional-recommended-bump
- 
- if (!versionType && !args.notesOnly) {
-+<<<<<<< .our
-   console.log(`Usage: prepare-release versionType [stable | beta | nightly]` +
-+=======
-+  console.log(`Usage: prepare-release versionType [major | minor | patch | beta]` +
-+>>>>>>> .their
-      ` (--stable) (--notesOnly) (--automaticRelease) (--branch)`)
-   process.exit(1)
- }
-@@ -222,7 +230,11 @@
- }
- 
- async function verifyNewVersion () {
-+<<<<<<< .our
-   let newVersion = await getNewVersion(true)
-+=======
-+  let newVersion = getNewVersion(true)
-+>>>>>>> .their
-   let response
-   if (args.automaticRelease) {
-     response = 'y'
-@@ -258,6 +270,7 @@
- }
- 
- async function prepareRelease (isBeta, notesOnly) {
-+<<<<<<< .our
-   if (args.dryRun) {
-     let newVersion = await getNewVersion(true)
-     console.log(newVersion)
-@@ -278,6 +291,27 @@
-         process.exit(1)
-       }
-     }
-+=======
-+  if (args.automaticRelease && (pkg.version.indexOf('beta') === -1 ||
-+      versionType !== 'beta')) {
-+    console.log(`${fail} Automatic release is only supported for beta releases`)
-+    process.exit(1)
-+  }
-+  let currentBranch
-+  if (args.branch) {
-+    currentBranch = args.branch
-+  } else {
-+    currentBranch = await getCurrentBranch(gitDir)
-+  }
-+  if (notesOnly) {
-+    let releaseNotes = await getReleaseNotes(currentBranch)
-+    console.log(`Draft release notes are: \n${releaseNotes}`)
-+  } else {
-+    await verifyNewVersion()
-+    await createRelease(currentBranch, isBeta)
-+    await pushRelease(currentBranch)
-+    await runReleaseBuilds(currentBranch)
-+>>>>>>> .their
-   }
- }
- 
-changed in both
-  base   100755 9863ef912cd5a940428e9ac22e1993494b2b1828 script/release.js
-  our    100755 84e00ad4f309201f151c3f8fcbaf9ee536c9b6cb script/release.js
-  their  100755 5858caf215a38e09d98c342bd74252b3dbd7ee71 script/release.js
-@@ -95,6 +95,10 @@
-     `electron-${version}-linux-armv7l.zip`,
-     `electron-${version}-linux-ia32-symbols.zip`,
-     `electron-${version}-linux-ia32.zip`,
-+<<<<<<< .our
-+=======
-+//    `electron-${version}-linux-mips64el.zip`,
-+>>>>>>> .their
-     `electron-${version}-linux-x64-symbols.zip`,
-     `electron-${version}-linux-x64.zip`,
-     `electron-${version}-mas-x64-dsym.zip`,
-@@ -112,6 +116,10 @@
-     `ffmpeg-${version}-linux-arm64.zip`,
-     `ffmpeg-${version}-linux-armv7l.zip`,
-     `ffmpeg-${version}-linux-ia32.zip`,
-+<<<<<<< .our
-+=======
-+//    `ffmpeg-${version}-linux-mips64el.zip`,
-+>>>>>>> .their
-     `ffmpeg-${version}-linux-x64.zip`,
-     `ffmpeg-${version}-mas-x64.zip`,
-     `ffmpeg-${version}-win32-ia32.zip`,
-@@ -180,7 +188,15 @@
- function uploadIndexJson () {
-   console.log('Uploading index.json to S3.')
-   let scriptPath = path.join(__dirname, 'upload-index-json.py')
-+<<<<<<< .our
-   runScript(scriptPath, [pkgVersion])
-+=======
-+  let scriptArgs = []
-+  if (args.automaticRelease) {
-+    scriptArgs.push('-R')
-+  }
-+  runScript(scriptPath, scriptArgs)
-+>>>>>>> .their
-   console.log(`${pass} Done uploading index.json to S3.`)
- }
- 
-changed in both
-  base   100755 1f90ed795fcc3e739061cf4ae5c8ab9ea95a1236 script/test.py
-  our    100755 46cada435e1bd6ecaa2111cdf29e5aeb834b227e script/test.py
-  their  100755 cb17102557dca975208140b479168906100cfd74 script/test.py
-changed in both
-  base   100755 a35eb2f5b90272c8369bcfd511f976a4f64fa57f script/update-clang.sh
-  our    100755 0c7ab60533381e33152b8735aaccf41d5f0d6676 script/update-clang.sh
-  their  100755 6e4cf08216616a4b6a2ee896bba47b1ba5d469b5 script/update-clang.sh
-changed in both
-  base   100755 f5e5b3c7a6adcaf7005ad9242c1664ad2f243d1f script/upload-index-json.py
-  our    100755 55d0675d0707d34c806847f3a64aa77f20a4830d script/upload-index-json.py
-  their  100755 479e46bb811695482f5ea62060e4bef02af505f1 script/upload-index-json.py
-@@ -8,7 +8,6 @@
- from lib.util import s3put, scoped_cwd, safe_mkdir
- 
- SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
--OUT_DIR     = os.path.join(SOURCE_ROOT, 'out', 'D')
- 
- BASE_URL = 'https://electron-metadumper.herokuapp.com/?version='
- 
-@@ -35,6 +34,7 @@
-     raise Exception("Please set META_DUMPER_AUTH_HEADER")
-   # Upload the index.json.
-   with scoped_cwd(SOURCE_ROOT):
-+<<<<<<< .our
-     safe_mkdir(OUT_DIR)
-     index_json = os.path.relpath(os.path.join(OUT_DIR, 'index.json'))
- 
-@@ -42,9 +42,27 @@
- 
-     with open(index_json, "w") as f:
-       f.write(new_content)
-+=======
-+    if len(sys.argv) == 2 and sys.argv[1] == '-R':
-+      config = 'R'
-+    else:
-+      config = 'D'
-+    out_dir = os.path.join(SOURCE_ROOT, 'out', config)
-+    if sys.platform == 'darwin':
-+      electron = os.path.join(out_dir, '{0}.app'.format(PRODUCT_NAME),
-+                                'Contents', 'MacOS', PRODUCT_NAME)
-+    elif sys.platform == 'win32':
-+      electron = os.path.join(out_dir, '{0}.exe'.format(PROJECT_NAME))
-+    else:
-+      electron = os.path.join(out_dir, PROJECT_NAME)
-+    index_json = os.path.relpath(os.path.join(out_dir, 'index.json'))
-+    execute([electron,
-+             os.path.join('tools', 'dump-version-info.js'),
-+             index_json])
-+>>>>>>> .their
- 
-     bucket, access_key, secret_key = s3_config()
--    s3put(bucket, access_key, secret_key, OUT_DIR, 'atom-shell/dist',
-+    s3put(bucket, access_key, secret_key, out_dir, 'atom-shell/dist',
-           [index_json])
- 
- 
-changed in both
-  base   100755 4da630433812b51ff0ebbdf89f68c71d90ab8046 script/upload.py
-  our    100755 2d9eaa201265971ca01acaea6e84a440e5db0532 script/upload.py
-  their  100755 48f8d650eae7a9d46b45a353d68e0e7bef33d219 script/upload.py
-@@ -37,7 +37,11 @@
-   args = parse_args()
-   if  args.upload_to_s3:
-     utcnow = datetime.datetime.utcnow()
-+<<<<<<< .our
-     args.upload_timestamp = utcnow.strftime('%Y%m%d')
-+=======
-+    args.upload_timestamp = utcnow.strftime('%Y-%m-%d_%H:%M:%S')
-+>>>>>>> .their
- 
-   if not dist_newer_than_head():
-     run_python_script('create-dist.py')
-@@ -79,6 +83,14 @@
-   upload_electron(release, os.path.join(DIST_DIR, chromedriver), args)
-   mksnapshot = get_zip_name('mksnapshot', ELECTRON_VERSION)
-   upload_electron(release, os.path.join(DIST_DIR, mksnapshot), args)
-+<<<<<<< .our
-+=======
-+
-+  if get_target_arch().startswith('arm'):
-+    # Upload the x64 binary for arm/arm64 mksnapshot
-+    mksnapshot = get_zip_name('mksnapshot', ELECTRON_VERSION, 'x64')
-+    upload_electron(release, os.path.join(DIST_DIR, mksnapshot), args)
-+>>>>>>> .their
- 
-   if get_target_arch().startswith('arm'):
-     # Upload the x64 binary for arm/arm64 mksnapshot
-@@ -170,6 +182,16 @@
-   # Upload the checksum file.
-   upload_sha256_checksum(args.version, file_path)
- 
-+<<<<<<< .our
-+=======
-+  # Upload ARM assets without the v7l suffix for backwards compatibility
-+  # TODO Remove for 2.0
-+  if 'armv7l' in filename:
-+    arm_filename = filename.replace('armv7l', 'arm')
-+    arm_file_path = os.path.join(os.path.dirname(file_path), arm_filename)
-+    shutil.copy2(file_path, arm_file_path)
-+    upload_electron(release, arm_file_path, args)
-+>>>>>>> .their
- 
- def upload_io_to_github(release, filename, filepath, version):
-   print 'Uploading %s to Github' % \
-changed in both
-  base   100644 0eda951b15d6fff609b6612589e222adb4f0720e spec/api-app-spec.js
-  our    100644 d224eda2989332c18d655cef05a8bacc2eb6d4b8 spec/api-app-spec.js
-  their  100644 5c2e0a0c7e6184e780b7ec031f9788f1f54eaca9 spec/api-app-spec.js
-@@ -9,7 +9,10 @@
- const {ipcRenderer, remote} = require('electron')
- const {closeWindow} = require('./window-helpers')
- 
-+<<<<<<< .our
- const {expect} = chai
-+=======
-+>>>>>>> .their
- const {app, BrowserWindow, Menu, ipcMain} = remote
- 
- const isCI = remote.getGlobal('isCi')
-@@ -186,11 +189,19 @@
- 
-       // Singleton will send us greeting data to let us know it's running.
-       // After that, ask it to exit gracefully and confirm that it does.
-+<<<<<<< .our
-       appProcess.stdout.on('data', data => appProcess.kill())
-       appProcess.on('exit', (code, sig) => {
-         const message = `code:\n${code}\nsig:\n${sig}`
-         expect(code).to.equal(0, message)
-         expect(sig).to.be.null(message)
-+=======
-+      appProcess.stdout.on('data', (data) => appProcess.kill())
-+      appProcess.on('exit', (code, sig) => {
-+        let message = ['code:', code, 'sig:', sig].join('\n')
-+        assert.equal(code, 0, message)
-+        assert.equal(sig, null, message)
-+>>>>>>> .their
-         done()
-       })
-     })
-@@ -948,4 +959,18 @@
-       return expect(app.whenReady()).to.be.eventually.fulfilled
-     })
-   })
-+
-+  describe('dock.setMenu', () => {
-+    before(function () {
-+      if (process.platform !== 'darwin') {
-+        this.skip()
-+      }
-+    })
-+
-+    it('keeps references to the menu', () => {
-+      app.dock.setMenu(new Menu())
-+      const v8Util = process.atomBinding('v8_util')
-+      v8Util.requestGarbageCollectionForTesting()
-+    })
-+  })
- })
-changed in both
-  base   100644 ab96021ebf4c4360fa581b5a695249456a9afeda spec/api-browser-view-spec.js
-  our    100644 968912a4abf3d759a1363e2420d2c21b7923dbd6 spec/api-browser-view-spec.js
-  their  100644 df239a8914527a2d62f652b878c97a7791f63a9d spec/api-browser-view-spec.js
-@@ -44,9 +44,15 @@
-   describe('BrowserView.isDestroyed()', () => {
-     it('returns correct value', () => {
-       view = new BrowserView()
-+<<<<<<< .our
-       expect(view.isDestroyed()).to.be.false()
-       view.destroy()
-       expect(view.isDestroyed()).to.be.true()
-+=======
-+      assert.ok(!view.isDestroyed())
-+      view.destroy()
-+      assert.ok(view.isDestroyed())
-+>>>>>>> .their
-     })
-   })
- 
-changed in both
-  base   100644 3033eb6a1f6cca3cf4874a54dd217ec62d2d82cd spec/api-browser-window-spec.js
-  our    100644 f4cba12ec19d224bc46fca898db42a99baf4972e spec/api-browser-window-spec.js
-  their  100644 ce9b69402a89050404cc76aa941e0474114616a8 spec/api-browser-window-spec.js
-@@ -409,12 +409,34 @@
-     })
-   })
- 
-+<<<<<<< .our
-   // TODO(alexeykuzmin): [Ch66] Enable the test. Passes locally.
-   xdescribe('BrowserWindow.getFocusedWindow()', (done) => {
-+=======
-+  describe('BrowserWindow.getFocusedWindow()', (done) => {
-+>>>>>>> .their
-     it('returns the opener window when dev tools window is focused', (done) => {
-       w.show()
-       w.webContents.once('devtools-focused', () => {
-         assert.deepEqual(BrowserWindow.getFocusedWindow(), w)
-+<<<<<<< .our
-+=======
-+        done()
-+      })
-+      w.webContents.openDevTools({mode: 'undocked'})
-+    })
-+  })
-+
-+  describe('BrowserWindow.capturePage(rect, callback)', () => {
-+    it('calls the callback with a Buffer', (done) => {
-+      w.capturePage({
-+        x: 0,
-+        y: 0,
-+        width: 100,
-+        height: 100
-+      }, (image) => {
-+        assert.equal(image.isEmpty(), true)
-+>>>>>>> .their
-         done()
-       })
-       w.webContents.openDevTools({mode: 'undocked'})
-@@ -453,6 +475,29 @@
-       // Values can be 0,2,3,4, or 6. We want 6, which is RGB + Alpha
-       expect(imgBuffer[25]).to.equal(6)
-     })
-+
-+    it('preserves transparency', (done) => {
-+      w.close()
-+      const width = 400
-+      const height = 400
-+      w = new BrowserWindow({
-+        show: false,
-+        width: width,
-+        height: height,
-+        transparent: true
-+      })
-+      w.loadURL('data:text/html,<html><body background-color: rgba(255,255,255,0)></body></html>')
-+      w.once('ready-to-show', () => {
-+        w.show()
-+        w.capturePage((image) => {
-+          let imgBuffer = image.toPNG()
-+          // Check 25th byte in the PNG
-+          // Values can be 0,2,3,4, or 6. We want 6, which is RGB + Alpha
-+          assert.equal(imgBuffer[25], 6)
-+          done()
-+        })
-+      })
-+    })
-   })
- 
-   describe('BrowserWindow.setSize(width, height)', () => {
-@@ -763,6 +808,7 @@
-         w.addTabbedWindow(w)
-       }, /AddTabbedWindow cannot be called by a window on itself./)
-     })
-+<<<<<<< .our
-   })
- 
-   describe('BrowserWindow.setWindowButtonVisibility()', () => {
-@@ -790,6 +836,8 @@
-         w.setWindowButtonVisibility(true)
-       }, /Not supported for this window/)
-     })
-+=======
-+>>>>>>> .their
-   })
- 
-   describe('BrowserWindow.setVibrancy(type)', () => {
-@@ -1615,6 +1663,7 @@
-         })
-       })
- 
-+<<<<<<< .our
-       it('validates process APIs access in sandboxed renderer', (done) => {
-         ipcMain.once('answer', function (event, test) {
-           assert.equal(test.pid, w.webContents.getOSProcessId())
-@@ -1641,6 +1690,8 @@
-         w.loadURL('file://' + path.join(fixtures, 'api', 'preload.html'))
-       })
- 
-+=======
-+>>>>>>> .their
-       it('webview in sandbox renderer', async () => {
-         w.destroy()
-         w = new BrowserWindow({
-@@ -1655,7 +1706,11 @@
- 
-         const [, webContents] = await emittedOnce(w.webContents, 'did-attach-webview')
-         const [, id] = await emittedOnce(ipcMain, 'webview-dom-ready')
-+<<<<<<< .our
-         expect(webContents.id).to.equal(id)
-+=======
-+        assert.equal(webContents.id, id)
-+>>>>>>> .their
-       })
-     })
- 
-changed in both
-  base   100644 b4d55cd70b70b42d52a026ff7b4ff3c47d1671df spec/api-crash-reporter-spec.js
-  our    100644 dd31b91e1244785412b87db96bb141599e5ccb0f spec/api-crash-reporter-spec.js
-  their  100644 ffa3c0370595f32b0c7d476b82bea133d6a87000 spec/api-crash-reporter-spec.js
-@@ -266,6 +266,7 @@
-   describe('getLastCrashReport', () => {
-     it('correctly returns the most recent report', () => {
-       const reports = crashReporter.getUploadedReports()
-+<<<<<<< .our
-       expect(reports).to.be.an('array')
-       expect(reports).to.have.lengthOf.at.least(2,
-           'There are not enough reports for this test')
-@@ -275,16 +276,31 @@
- 
-       // Let's find the newest report.
-       const {report: newestReport} = reports.reduce((acc, cur) => {
-+=======
-+      const lastReport = crashReporter.getLastCrashReport()
-+
-+      // Let's find the newest report
-+      const newestReport = reports.reduce((acc, cur) => {
-+>>>>>>> .their
-         const timestamp = new Date(cur.date).getTime()
-         return (timestamp > acc.timestamp)
-           ? { report: cur, timestamp: timestamp }
-           : acc
-+<<<<<<< .our
-       }, { timestamp: -Infinity })
-       assert(newestReport, 'Hey!')
- 
-       expect(lastReport.date.getTime()).to.be.equal(
-           newestReport.date.getTime(),
-           'Last report is not the newest.')
-+=======
-+      }, { timestamp: 0 })
-+
-+      assert(reports.length > 1, 'has more than 1 report')
-+      assert(lastReport != null, 'found a last report')
-+      assert(lastReport.date.toString() === newestReport.report.date.toString(),
-+        'last report is correct')
-+>>>>>>> .their
-     })
-   })
- 
-changed in both
-  base   100644 667f098bc4b9974a142435e7d3ddb762ac0f54a2 spec/api-menu-spec.js
-  our    100644 ed2749700c6c8bf299f507d52606c1ae3f597e5c spec/api-menu-spec.js
-  their  100644 3efb6ed8745843bb7e221fe25b3c75761a085759 spec/api-menu-spec.js
-@@ -649,6 +649,7 @@
-     })
- 
-     it('throws an error if options is not an object', () => {
-+<<<<<<< .our
-       expect(() => {
-         menu.popup('this is a string, not an object')
-       }).to.throw(/Options must be an object/)
-@@ -658,6 +659,11 @@
-       expect(() => {
-         menu.popup({})
-       }).to.not.throw()
-+=======
-+      assert.throws(() => {
-+        menu.popup()
-+      }, /Options must be an object/)
-+>>>>>>> .their
-     })
- 
-     it('should emit menu-will-show event', (done) => {
-added in both
-  our    100644 9ab56d88e50ae5891364cb271362e5ec0c0edd26 spec/api-notification-dbus-spec.js
-  their  100644 81c1b68f31d0c9490742d3bd4b4227abaaf72ca3 spec/api-notification-dbus-spec.js
-@@ -6,7 +6,11 @@
- //
- // See https://pypi.python.org/pypi/python-dbusmock to read about dbusmock.
- 
-+<<<<<<< .our
- const {expect} = require('chai')
-+=======
-+const assert = require('assert')
-+>>>>>>> .their
- const dbus = require('dbus-native')
- const Promise = require('bluebird')
- 
-@@ -27,12 +31,20 @@
-   before(async () => {
-     // init app
-     app.setName(appName)
-+<<<<<<< .our
-     app.setDesktopName(`${appName}.desktop`)
-+=======
-+    app.setDesktopName(appName + '.desktop')
-+>>>>>>> .their
-     // init dbus
-     const path = '/org/freedesktop/Notifications'
-     const iface = 'org.freedesktop.DBus.Mock'
-     const bus = dbus.sessionBus()
-+<<<<<<< .our
-     console.log(`session bus: ${process.env.DBUS_SESSION_BUS_ADDRESS}`)
-+=======
-+    console.log('session bus: ' + process.env.DBUS_SESSION_BUS_ADDRESS)
-+>>>>>>> .their
-     const service = bus.getService(serviceName)
-     const getInterface = Promise.promisify(service.getInterface, {context: service})
-     mock = await getInterface(path, iface)
-@@ -48,10 +60,17 @@
-     app.setVersion(realAppVersion)
-   })
- 
-+<<<<<<< .our
-   describe(`Notification module using ${serviceName}`, () => {
-     function onMethodCalled (done) {
-       function cb (name) {
-         console.log(`onMethodCalled: ${name}`)
-+=======
-+  describe('Notification module using ' + serviceName, () => {
-+    function onMethodCalled (done) {
-+      function cb (name) {
-+        console.log('onMethodCalled: ' + name)
-+>>>>>>> .their
-         if (name === 'Notify') {
-           mock.removeListener('MethodCalled', cb)
-           console.log('done')
-@@ -83,7 +102,11 @@
-       }
-     }
- 
-+<<<<<<< .our
-     before(done => {
-+=======
-+    before((done) => {
-+>>>>>>> .their
-       mock.on('MethodCalled', onMethodCalled(done))
-       // lazy load Notification after we listen to MethodCalled mock signal
-       Notification = require('electron').remote.Notification
-@@ -98,6 +121,7 @@
-       n.show()
-     })
- 
-+<<<<<<< .our
-     it(`should call ${serviceName} to show notifications`, async () => {
-       const calls = await getCalls()
-       expect(calls).to.be.an('array').of.lengthOf.at.least(1)
-@@ -108,6 +132,16 @@
- 
-       let args = unmarshalDBusNotifyArgs(lastCall[2])
-       expect(args).to.deep.equal({
-+=======
-+    it('should call ' + serviceName + ' to show notifications', async () => {
-+      const calls = await getCalls()
-+      assert(calls.length >= 1)
-+      let lastCall = calls[calls.length - 1]
-+      let methodName = lastCall[1]
-+      assert.equal(methodName, 'Notify')
-+      let args = unmarshalDBusNotifyArgs(lastCall[2])
-+      assert.deepEqual(args, {
-+>>>>>>> .their
-         app_name: appName,
-         replaces_id: 0,
-         app_icon: '',
-changed in both
-  base   100644 122170292838e951ade4989669c87a7531e89ba7 spec/api-web-contents-spec.js
-  our    100644 be02cb3f84001a541d64b11fe6eda50fc32e8afd spec/api-web-contents-spec.js
-  their  100644 cbb45f5d84f1b11c8c27c56515d5daffa23d0c04 spec/api-web-contents-spec.js
-@@ -122,6 +122,7 @@
-     })
-   })
- 
-+<<<<<<< .our
-   // Disabled because flaky. See #13969
-   xdescribe('isCurrentlyAudible() API', () => {
-     it('returns whether audio is playing', async () => {
-@@ -138,6 +139,8 @@
-     })
-   })
- 
-+=======
-+>>>>>>> .their
-   describe('getWebPreferences() API', () => {
-     it('should not crash when called for devTools webContents', (done) => {
-       w.webContents.openDevTools()
-@@ -730,6 +733,7 @@
-     })
-   })
- 
-+<<<<<<< .our
-   describe('referrer', () => {
-     it('propagates referrer information to new target=_blank windows', (done) => {
-       const server = http.createServer((req, res) => {
-@@ -776,6 +780,8 @@
-     })
-   })
- 
-+=======
-+>>>>>>> .their
-   describe('webframe messages in sandboxed contents', () => {
-     it('responds to executeJavaScript', (done) => {
-       w.destroy()
-changed in both
-  base   100644 2d388ca3b5744ea69d96ef71da6ade70e3dd001b spec/chromium-spec.js
-  our    100644 d90269769d269e4054d25cba4b6c4ac8a1929aa6 spec/chromium-spec.js
-  their  100644 25bef2e689e5ecbcd1485a042e84691db9400659 spec/chromium-spec.js
-@@ -319,8 +319,12 @@
-       b = window.open(windowUrl, '', 'nodeIntegration=no,show=no')
-     })
- 
-+<<<<<<< .our
-     // TODO(codebytere): re-enable this test
-     xit('disables node integration when it is disabled on the parent window for chrome devtools URLs', (done) => {
-+=======
-+    it('disables node integration when it is disabled on the parent window for chrome devtools URLs', (done) => {
-+>>>>>>> .their
-       let b
-       app.once('web-contents-created', (event, contents) => {
-         contents.once('did-finish-load', () => {
-changed in both
-  base   100644 07176e0097efa17e8f8aea5bb059a2739b8c3336 spec/fixtures/api/singleton/main.js
-  our    100644 3202a7a180d6d48c70706d5ef244652872b24bbc spec/fixtures/api/singleton/main.js
-  their  100644 cbf3da1117d91eb8df1b1e6363737a210b7eae78 spec/fixtures/api/singleton/main.js
-@@ -3,8 +3,11 @@
- app.once('ready', () => {
-   console.log('started')  // ping parent
- })
-+<<<<<<< .our
- 
- const gotTheLock = app.requestSingleInstanceLock()
-+=======
-+>>>>>>> .their
- 
- app.on('second-instance', () => {
-   setImmediate(() => app.exit(0))
-changed in both
-  base   100644 cfe840ca0a44c5766509b2865034d98e375da1a1 spec/modules-spec.js
-  our    100644 b996b8f4839bff2160bffb69e55263b16a4178d7 spec/modules-spec.js
-  their  100644 28f2602acff67b2da9accd0574d64d386e0795a7 spec/modules-spec.js
-changed in both
-  base   100644 e2d7d001eb49a9b01edcf9590ccdcb7ac8cc669c spec/node-spec.js
-  our    100644 9bb03494a56ffacec075c40bebde39a3b57ac734 spec/node-spec.js
-  their  100644 f053aa4dbadbbc216d98f3a985f29069bb2e4786 spec/node-spec.js
-changed in both
-  base   100644 feac23db7e06d3e49f8d5be7e9b3f08a204f262f spec/security-warnings-spec.js
-  our    100644 6315a9420e01b5db19596f0dd5731d47ce02acf6 spec/security-warnings-spec.js
-  their  100644 85fd0973b60cd6e27becbeef75415560b4061d24 spec/security-warnings-spec.js
-@@ -142,7 +142,11 @@
-       }
-     })
-     w.webContents.once('console-message', (e, level, message) => {
-+<<<<<<< .our
-       assert(message.includes('enableBlinkFeatures'), message)
-+=======
-+      assert(message.includes('blinkFeatures'), message)
-+>>>>>>> .their
-       done()
-     })
- 
-changed in both
-  base   100644 ca5cc28d4f9f860947454dfc964208dd13ba1434 spec/static/index.html
-  our    100644 fc1e153c0af2908cf7ee4c3ea4f05522de04f0f8 spec/static/index.html
-  their  100644 e9d779f061cd5bdf00667d0b7942c6c30de81092 spec/static/index.html
-@@ -51,7 +51,11 @@
-   if (!process.env.MOCHA_REPORTER) {
-     mocha.ui('bdd').reporter(isCi ? 'tap' : 'html')
-   }
--  mocha.timeout(isCi ? 30000 : 10000)
-+  if (process.env.MOCHA_TIMEOUT && process.env.MOCHA_TIMEOUT > 0) {
-+    mocha.timeout(process.env.MOCHA_TIMEOUT)
-+  } else {
-+    mocha.timeout(isCi ? 30000 : 10000)
-+  }
- 
-   const query = Mocha.utils.parseQuery(window.location.search || '')
-   if (query.grep) mocha.grep(query.grep)
-changed in both
-  base   100644 6580f18a1ad9e53ab3f2ae88cb7ea023bcf9579c toolchain.gypi
-  our    100644 697add78e42191741cee1b015cdcf4f801c570e7 toolchain.gypi
-  their  100644 8ed945a57c8875bae06cef74dc5d44afcc586d1d toolchain.gypi
-changed in both
-  base   160000 db1b314c019f6acbd4d1be273b63521cc6051d3c vendor/libchromiumcontent
-  our    160000 c85470a1c379b1c4bedb372c146521bc4be9b75d vendor/libchromiumcontent
-  their  160000 0f50f5e3b3fff53d53f72eb39293e01083480311 vendor/libchromiumcontent
-removed in local
-  base   160000 99d9e262eb36cb9dc8e83f61e026d2a7ad1e96ab vendor/native_mate
-  their  160000 6a3d238b7e1e3742f2bb495336a84021d927a24f vendor/native_mate
-changed in both
-  base   160000 bf06b641574a6e2a8357ca4b44defac4a83f1dda vendor/node
-  our    160000 ece0a06ac8147efb5b5af431c21f312f1884616e vendor/node
-  their  160000 f2bcc6b58293287e2a6e592bd296aa55bb37b801 vendor/node
-added in both
-  our    100644 84bd69c2b2868ac23bc30061aa208ad38fbb9506 vsts.yml
-  their  100644 5209acdec2eb8557ea55ce5281b7999b974aa5b6 vsts.yml
-@@ -54,21 +54,32 @@
-       script/test.py --ci --rebuild_native_modules
-     fi
-   name: Test
-+<<<<<<< .our
-   condition: or(ne(variables['ELECTRON_RELEASE'], '1'), eq(variables['UPLOAD_TO_S3'], '1'))
-+=======
-+>>>>>>> .their
- 
- - bash: |
-     echo 'Verifying ffmpeg on build'
-     if [ "$ELECTRON_RELEASE" == "1" ]; then
-+<<<<<<< .our
-       script/verify-ffmpeg.py -c R
-+=======
-+      script/verify-ffmpeg.py -R
-+>>>>>>> .their
-     else
-       script/verify-ffmpeg.py
-     fi
-   name: Verify_FFmpeg
-+<<<<<<< .our
-   condition: or(ne(variables['ELECTRON_RELEASE'], '1'), eq(variables['UPLOAD_TO_S3'], '1'))
-+=======
-+>>>>>>> .their
- 
- - task: PublishTestResults@2
-   displayName: Publish Test Results
-   inputs:
-+<<<<<<< .our
-     testResultsFiles: '**/test-*.xml'
-   condition: and(always(), eq(variables['MOCHA_FILE'], 'test-results.xml'))
- 
-@@ -93,5 +104,18 @@
-   inputs:
-     PathtoPublish: '$(Build.SourcesDirectory)/out'
-     ArtifactName: out
-+=======
-+    testResultsFiles: 'test-results.xml'
-+    searchFolder: junit
-+  condition: and(always(), ne(variables['ELECTRON_RELEASE'], '1'))
-+
-+- task: kasunkodagoda.slack-notification.slack-notification-task.SlackNotification@3
-+  displayName: Post Slack Notification
-+  inputs:
-+    SlackApiToken: '$(slack_token)'
-+    Channel: '#bot-nightly-releases'
-+    Message: '$(Build.DefinitionName)-$(Build.BuildNumber) finished with a $(Agent.JobStatus) status.'
-+  condition: and(always(), eq(variables['Build.Reason'], 'Schedule'))
-+>>>>>>> .their
- 
- - task: mspremier.PostBuildCleanup.PostBuildCleanup-task.PostBuildCleanup@3
diff --git a/app/test/fixtures/merge-parser/electron/merge-build-gn-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-build-gn-into-master.txt
deleted file mode 100644
index e0620106e12..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-build-gn-into-master.txt
+++ /dev/null
@@ -1,1373 +0,0 @@
-changed in both
-  base   100644 67d5e87c61fb70243241758afbf1a79ccf70bbce .gitignore
-  our    100644 f393b1cdcef87b41bb3ed47ebae59757fed3a780 .gitignore
-  their  100644 81ca17d9160b12a72ac22b1da02609999a783d6d .gitignore
-added in both
-  our    100644 d00c4b1e3d3523641210ff20fda41d76c9eb546c BUILD.gn
-  their  100644 f2d102cd65c9fdeaffec43623ea63c14f4acaf1c BUILD.gn
-@@ -1,5 +1,6 @@
- import("//build/config/locales.gni")
- import("//tools/grit/repack.gni")
-+<<<<<<< .our
- import("//tools/v8_context_snapshot/v8_context_snapshot.gni")
- import("build/asar.gni")
- import("build/npm.gni")
-@@ -7,6 +8,10 @@
- import("//build/config/win/manifest.gni")
- import("electron_paks.gni")
- import("//third_party/ffmpeg/ffmpeg_options.gni")
-+=======
-+import("build/asar.gni")
-+import("build/npm.gni")
-+>>>>>>> .their
- 
- if (is_mac) {
-   import("//build/config/mac/rules.gni")
-@@ -14,6 +19,7 @@
-   import("//v8/gni/v8.gni")
- }
- 
-+<<<<<<< .our
- if (is_linux) {
-   import("//build/config/linux/pkg_config.gni")
- 
-@@ -22,6 +28,8 @@
-   }
- }
- 
-+=======
-+>>>>>>> .their
- declare_args() {
-   electron_project_name = "electron"
-   electron_product_name = "Electron"
-@@ -29,6 +37,7 @@
-   electron_company_abbr = "github"
-   electron_version = "0.0.0-dev"
- 
-+<<<<<<< .our
-   enable_desktop_capturer = true
-   enable_run_as_node = true
-   enable_osr = false
-@@ -47,6 +56,21 @@
-                 ],
-                 "scope",
-                 [ "filenames.gypi" ])
-+=======
-+  enable_run_as_node = true
-+  enable_osr = true
-+}
-+
-+filenames_gypi = exec_script(
-+  "//build/gypi_to_gn.py",
-+  [
-+    rebase_path("filenames.gypi"),
-+    "--replace=<(SHARED_INTERMEDIATE_DIR)=$target_gen_dir",
-+  ],
-+  "scope",
-+  [ "filenames.gypi" ]
-+)
-+>>>>>>> .their
- 
- config("branding") {
-   defines = [
-@@ -57,9 +81,12 @@
- 
- config("features") {
-   defines = []
-+<<<<<<< .our
-   if (enable_desktop_capturer) {
-     defines += [ "ENABLE_DESKTOP_CAPTURER=1" ]
-   }
-+=======
-+>>>>>>> .their
-   if (enable_run_as_node) {
-     defines += [ "ENABLE_RUN_AS_NODE=1" ]
-   }
-@@ -68,6 +95,7 @@
-   }
- }
- 
-+<<<<<<< .our
- npm_action("atom_browserify_sandbox") {
-   deps = [
-     ":atom_js2c_copy",
-@@ -85,6 +113,59 @@
-     "./lib/sandboxed_renderer/api/exports/path.js:path",
-     "-r",
-     "./lib/sandboxed_renderer/api/exports/child_process.js:child_process",
-+=======
-+config("native_mate_config") {
-+  include_dirs = [
-+    "//third_party/native_mate",
-+  ]
-+  cflags_cc = [
-+    "-Wno-deprecated-declarations",
-+  ]
-+  cflags_objcc = cflags_cc
-+}
-+
-+source_set("native_mate") {
-+  deps = [
-+    "//base",
-+    "//net",
-+    "//v8:v8_headers",
-+    "build/node",
-+  ]
-+  public_configs = [ ":native_mate_config" ]
-+  sources = [
-+    "//third_party/native_mate/native_mate/arguments.cc",
-+    "//third_party/native_mate/native_mate/arguments.h",
-+    "//third_party/native_mate/native_mate/compat.h",
-+    "//third_party/native_mate/native_mate/constructor.h",
-+    "//third_party/native_mate/native_mate/converter.cc",
-+    "//third_party/native_mate/native_mate/converter.h",
-+    "//third_party/native_mate/native_mate/dictionary.cc",
-+    "//third_party/native_mate/native_mate/dictionary.h",
-+    "//third_party/native_mate/native_mate/function_template.cc",
-+    "//third_party/native_mate/native_mate/function_template.h",
-+    "//third_party/native_mate/native_mate/handle.h",
-+    "//third_party/native_mate/native_mate/object_template_builder.cc",
-+    "//third_party/native_mate/native_mate/object_template_builder.h",
-+    "//third_party/native_mate/native_mate/persistent_dictionary.cc",
-+    "//third_party/native_mate/native_mate/persistent_dictionary.h",
-+    "//third_party/native_mate/native_mate/scoped_persistent.h",
-+    "//third_party/native_mate/native_mate/wrappable.cc",
-+    "//third_party/native_mate/native_mate/wrappable.h",
-+    "//third_party/native_mate/native_mate/wrappable_base.h",
-+  ]
-+}
-+
-+npm_action("atom_browserify_sandbox") {
-+  deps = [ ":atom_js2c_copy" ]
-+
-+  sandbox_args = [
-+    "lib/sandboxed_renderer/init.js",
-+    "-r", "./lib/sandboxed_renderer/api/exports/electron.js:electron",
-+    "-r", "./lib/sandboxed_renderer/api/exports/fs.js:fs",
-+    "-r", "./lib/sandboxed_renderer/api/exports/os.js:os",
-+    "-r", "./lib/sandboxed_renderer/api/exports/path.js:path",
-+    "-r", "./lib/sandboxed_renderer/api/exports/child_process.js:child_process",
-+>>>>>>> .their
-   ]
- 
-   inputs = [
-@@ -95,6 +176,7 @@
-     "lib/sandboxed_renderer/api/exports/path.js",
-     "lib/sandboxed_renderer/api/exports/child_process.js",
-   ]
-+<<<<<<< .our
-   outputs = [
-     "$target_gen_dir/js2c/preload_bundle.js",
-   ]
-@@ -123,6 +205,26 @@
-            "-o",
-            rebase_path(outputs[0]),
-          ]
-+=======
-+  outputs = [ "$target_gen_dir/js2c/preload_bundle.js" ]
-+
-+  script = "browserify"
-+  args = sandbox_args + [
-+    "-o", rebase_path(outputs[0])
-+  ]
-+}
-+
-+npm_action("atom_browserify_isolated") {
-+  deps = [ ":atom_js2c_copy" ]
-+
-+  inputs = [ "lib/isolated_renderer/init.js" ]
-+  outputs = [ "$target_gen_dir/js2c/isolated_bundle.js" ]
-+
-+  script = "browserify"
-+  args = inputs + [
-+    "-o", rebase_path(outputs[0])
-+  ]
-+>>>>>>> .their
- }
- 
- copy("atom_js2c_copy") {
-@@ -130,16 +232,26 @@
-     "lib/common/asar.js",
-     "lib/common/asar_init.js",
-   ]
-+<<<<<<< .our
-   outputs = [
-     "$target_gen_dir/js2c/{{source_file_part}}",
-   ]
-+=======
-+  outputs = [ "$target_gen_dir/js2c/{{source_file_part}}" ]
-+>>>>>>> .their
- }
- 
- action("atom_js2c") {
-   deps = [
-+<<<<<<< .our
-     ":atom_browserify_isolated",
-     ":atom_browserify_sandbox",
-     ":atom_js2c_copy",
-+=======
-+    ":atom_js2c_copy",
-+    ":atom_browserify_sandbox",
-+    ":atom_browserify_isolated",
-+>>>>>>> .their
-   ]
- 
-   js2c_sources = filenames_gypi.js2c_sources
-@@ -151,6 +263,7 @@
- 
-   inputs = js2c_sources + browserify_sources
- 
-+<<<<<<< .our
-   outputs = [
-     "$target_gen_dir/atom_natives.h",
-   ]
-@@ -159,10 +272,21 @@
-   args = [ rebase_path("//third_party/electron_node") ] +
-          rebase_path(outputs, root_build_dir) +
-          [ rebase_path("$target_gen_dir/js2c", root_build_dir) ]
-+=======
-+  outputs = [ "$target_gen_dir/atom_natives.h" ]
-+
-+  script = "tools/js2c.py"
-+  args = [
-+    rebase_path("//third_party/electron_node")
-+  ] + rebase_path(outputs, root_build_dir) + [
-+    rebase_path("$target_gen_dir/js2c", root_build_dir)
-+  ]
-+>>>>>>> .their
- }
- 
- asar("js2asar") {
-   sources = filenames_gypi.js_sources
-+<<<<<<< .our
-   if (enable_desktop_capturer) {
-     sources += [
-       "lib/browser/desktop-capturer.js",
-@@ -172,11 +296,15 @@
-   outputs = [
-     "$root_out_dir/resources/electron.asar",
-   ]
-+=======
-+  outputs = [ "$root_out_dir/electron.asar" ]
-+>>>>>>> .their
-   root = "lib"
- }
- 
- asar("app2asar") {
-   sources = filenames_gypi.default_app_sources
-+<<<<<<< .our
-   outputs = [
-     "$root_out_dir/resources/default_app.asar",
-   ]
-@@ -187,10 +315,25 @@
-   configs += [ "//v8:external_startup_data" ]
-   configs += [ "//third_party/electron_node:node_internals" ]
- 
-+=======
-+  outputs = [ "$root_out_dir/default_app.asar" ]
-+  root = "default_app"
-+}
-+
-+group("electron") {
-+  deps = [ ":electron_lib" ]
-+}
-+
-+static_library("electron_lib") {
-+  configs += [
-+    "//v8:external_startup_data",
-+  ]
-+>>>>>>> .their
-   public_configs = [
-     ":branding",
-     ":features",
-   ]
-+<<<<<<< .our
- 
-   deps = [
-     ":atom_js2c",
-@@ -198,15 +341,22 @@
-     "native_mate",
-     "//base",
-     "//base:i18n",
-+=======
-+  deps = [
-+>>>>>>> .their
-     "//chrome/common:constants",
-     "//components/cdm/renderer",
-     "//components/network_session_configurator/common",
-     "//components/prefs",
-     "//components/printing/common",
-     "//components/security_state/content",
-+<<<<<<< .our
-     "//components/viz/service",
-     "//content/public/app:both",
-     "//content/public/child",
-+=======
-+    "//content/public/browser",
-+>>>>>>> .their
-     "//device/geolocation",
-     "//gin",
-     "//net:net_resources",
-@@ -214,6 +364,7 @@
-     "//ppapi/proxy",
-     "//ppapi/shared_impl",
-     "//printing",
-+<<<<<<< .our
-     "//services/device/wake_lock/power_save_blocker",  # TODO: this requires a visibility patch to chromium src
-     "//skia",
-     "//third_party/WebKit/public:blink",
-@@ -228,10 +379,50 @@
-     "//v8",
-   ]
- 
-+=======
-+    "//services/device/wake_lock/power_save_blocker", # TODO: this requires a visibility patch to chromium src
-+    "//skia",
-+    "//third_party/WebKit/public:blink",
-+    "//third_party/boringssl",
-+    "//third_party/crashpad/crashpad/client",
-+    "//third_party/leveldatabase",
-+    "//third_party/libyuv",
-+    "//third_party/webrtc/modules/desktop_capture",
-+    "//third_party/webrtc/modules/desktop_capture:primitives",
-+    "//ui/events:dom_keycode_converter",
-+    "//ui/views",
-+    "//v8",
-+    ":atom_js2c",
-+    ":native_mate",
-+    "brightray",
-+    "build/node",
-+  ]
-+  if (is_mac) {
-+    deps += [
-+      "//ui/accelerated_widget_mac",
-+      "//base/allocator:features",
-+    ]
-+  }
-+  defines = [
-+    # This is defined in skia/skia_common.gypi.
-+    "SK_SUPPORT_LEGACY_GETTOPDEVICE",
-+    # Disable warnings for g_settings_list_schemas.
-+    "GLIB_DISABLE_DEPRECATION_WARNINGS",
-+
-+    # Import V8 symbols from shared library (node.dll / libnode.so)
-+    "USING_V8_SHARED",
-+    "USING_V8_PLATFORM_SHARED",
-+    "USING_V8_BASE_SHARED",
-+
-+    # Enables SkBitmap size 64 operations
-+    #"SK_SUPPORT_LEGACY_SAFESIZE64", # doesn't seem to be needed to build?
-+  ]
-+>>>>>>> .their
-   include_dirs = [
-     "chromium_src",
-     ".",
-     "$target_gen_dir",
-+<<<<<<< .our
- 
-     # TODO(nornagon): replace usage of SchemeRegistry by an actually exported
-     # API of blink, then delete this include dir.
-@@ -241,6 +432,17 @@
-   defines = []
-   libs = []
- 
-+=======
-+    # TODO(nornagon): replace usage of SchemeRegistry by an actually exported
-+    # API of blink, then delete this include dir.
-+    "//third_party/WebKit/Source",
-+    # NOTE(nornagon): other chromium files use the full path to include
-+    # crashpad; this is just here for compatibility between GN and GYP, so that
-+    # the #includes can be agnostic about where crashpad is vendored.
-+    "//third_party/crashpad",
-+  ]
-+
-+>>>>>>> .their
-   extra_source_filters = []
-   if (!is_linux) {
-     extra_source_filters += [
-@@ -249,6 +451,7 @@
-       "*_x11.cc",
-       "*_gtk.h",
-       "*_gtk.cc",
-+<<<<<<< .our
-       "*\blibrary_loaders/*",
-     ]
-   }
-@@ -256,6 +459,8 @@
-     extra_source_filters += [
-       "*\bwin_*.h",
-       "*\bwin_*.cc",
-+=======
-+>>>>>>> .their
-     ]
-   }
-   if (is_mac) {
-@@ -268,6 +473,7 @@
-     ]
-   }
- 
-+<<<<<<< .our
-   set_sources_assignment_filter(
-       sources_assignment_filter + extra_source_filters)
-   sources = filenames_gypi.lib_sources
-@@ -349,6 +555,12 @@
-     deps += [ "//pdf" ]
-   }
- 
-+=======
-+  set_sources_assignment_filter(sources_assignment_filter + extra_source_filters)
-+  sources = filenames_gypi.lib_sources
-+  set_sources_assignment_filter(sources_assignment_filter)
-+
-+>>>>>>> .their
-   if (enable_run_as_node) {
-     sources += [
-       "atom/app/node_main.cc",
-@@ -371,6 +583,7 @@
-       "atom/browser/osr/osr_web_contents_view_mac.mm",
-     ]
-     deps += [
-+<<<<<<< .our
-       "//components/viz/service",
-       "//ui/compositor",
-     ]
-@@ -391,32 +604,72 @@
-     copy_data_to_bundle = true
-   } else {
-     output_dir = root_out_dir
-+=======
-+      "//ui/compositor",
-+      "//components/viz/service",
-+    ]
-+  }
-+
-+  if (is_mac) {
-+    libs = [
-+      "Squirrel.framework",
-+      "ReactiveCocoa.framework",
-+      "Mantle.framework",
-+    ]
-+    cflags_objcc = [
-+      "-F", rebase_path("external_binaries", root_build_dir)
-+    ]
-+    if (true) { # !is_mas_build
-+      # ReactiveCocoa which is used by Squirrel requires using __weak.
-+      cflags_objcc += [ "-fobjc-weak" ]
-+    }
-+  }
-+  if (is_linux) {
-+    sources += filenames_gypi.lib_sources_linux
-+>>>>>>> .their
-   }
- }
- 
- if (is_mac) {
-   electron_framework_name = electron_product_name + " Framework"
-   electron_helper_name = electron_product_name + " Helper"
-+<<<<<<< .our
-   electron_login_helper_name = electron_product_name + " Login Helper"
-+=======
-+>>>>>>> .their
-   electron_framework_version = "A"
-   electron_mac_bundle_id = "com.$electron_company_abbr.$electron_project_name"
- 
-   mac_xib_bundle_data("electron_xibs") {
-+<<<<<<< .our
-     sources = [
-       "atom/common/resources/mac/MainMenu.xib",
-     ]
-+=======
-+    sources = [ "atom/common/resources/mac/MainMenu.xib" ]
-+>>>>>>> .their
-   }
- 
-   bundle_data("electron_framework_resources") {
-     public_deps = [
-+<<<<<<< .our
-       ":packed_resources",
-     ]
-     sources = []
-+=======
-+      "//content/shell:pak",
-+      ":electron_locales",
-+    ]
-+    sources = [
-+      "$root_out_dir/content_shell.pak",
-+    ]
-+>>>>>>> .their
-     if (icu_use_data_file) {
-       sources += [ "$root_out_dir/icudtl.dat" ]
-       public_deps += [ "//third_party/icu:icudata" ]
-     }
-     if (v8_use_external_startup_data) {
-+<<<<<<< .our
-       sources += [ "$root_out_dir/natives_blob.bin" ]
-       public_deps += [ "//v8" ]
-       if (use_v8_context_snapshot) {
-@@ -425,12 +678,20 @@
-       } else {
-         sources += [ "$root_out_dir/snapshot_blob.bin" ]
-       }
-+=======
-+      sources += [
-+        "$root_out_dir/natives_blob.bin",
-+        "$root_out_dir/snapshot_blob.bin",
-+      ]
-+      public_deps += [ "//v8" ]
-+>>>>>>> .their
-     }
-     outputs = [
-       "{{bundle_resources_dir}}/{{source_file_part}}",
-     ]
-   }
- 
-+<<<<<<< .our
-   if (!is_component_build) {
-     bundle_data("electron_framework_libraries") {
-       sources = []
-@@ -453,6 +714,19 @@
-   }
- 
-   bundle_data("electron_crashpad_helper") {
-+=======
-+  bundle_data("electron_framework_libraries") {
-+    public_deps = [ "build/node" ]
-+    sources = [
-+      "$root_out_dir/libnode.dylib"
-+    ]
-+    outputs = [
-+      "{{bundle_contents_dir}}/Libraries/{{source_file_part}}"
-+    ]
-+  }
-+
-+  bundle_data("electron_framework_helpers") {
-+>>>>>>> .their
-     sources = [
-       "$root_out_dir/crashpad_handler",
-     ]
-@@ -470,6 +744,7 @@
-     output_name = electron_framework_name
-     framework_version = electron_framework_version
-     framework_contents = [ "Resources" ]
-+<<<<<<< .our
-     public_deps = [
-       ":electron_lib",
-     ]
-@@ -485,6 +760,25 @@
-     extra_substitutions = [ "ATOM_BUNDLE_ID=$electron_mac_bundle_id.framework" ]
- 
-     include_dirs = [ "." ]
-+=======
-+    public_deps = [ ":electron_lib" ]
-+    deps = [
-+      "//base",
-+      "//base:i18n",
-+      ":electron_framework_helpers",
-+      ":electron_framework_libraries",
-+      ":electron_framework_resources",
-+      ":electron_xibs",
-+    ]
-+    info_plist = "atom/common/resources/mac/Info.plist"
-+    extra_substitutions = [
-+      "ATOM_BUNDLE_ID=$electron_mac_bundle_id.framework",
-+    ]
-+
-+    include_dirs = [
-+      ".",
-+    ]
-+>>>>>>> .their
-     sources = filenames_gypi.framework_sources
- 
-     libs = [
-@@ -497,8 +791,12 @@
-       "StoreKit.framework",
-     ]
-     ldflags = [
-+<<<<<<< .our
-       "-F",
-       rebase_path("external_binaries", root_build_dir),
-+=======
-+      "-F", rebase_path("external_binaries", root_build_dir),
-+>>>>>>> .their
-       "-Wl,-install_name,@rpath/$output_name.framework/$output_name",
-       "-rpath",
-       "@loader_path/Libraries",
-@@ -506,13 +804,18 @@
-     if (is_component_build) {
-       ldflags += [
-         "-rpath",
-+<<<<<<< .our
-         "@executable_path/../../../../../..",
-+=======
-+        "@executable_path/../../../../../.."
-+>>>>>>> .their
-       ]
-     }
-   }
- 
-   mac_app_bundle("electron_helper_app") {
-     output_name = electron_helper_name
-+<<<<<<< .our
-     deps = [
-       ":electron_framework+link",
-     ]
-@@ -520,6 +823,15 @@
-     include_dirs = [ "." ]
-     info_plist = "atom/renderer/resources/mac/Info.plist"
-     extra_substitutions = [ "ATOM_BUNDLE_ID=$electron_mac_bundle_id.helper" ]
-+=======
-+    deps = [ ":electron_framework+link" ]
-+    sources = filenames_gypi.app_sources
-+    include_dirs = [ "." ]
-+    info_plist = "atom/renderer/resources/mac/Info.plist"
-+    extra_substitutions = [
-+      "ATOM_BUNDLE_ID=$electron_mac_bundle_id.helper",
-+    ]
-+>>>>>>> .their
-     ldflags = [
-       "-rpath",
-       "@executable_path/../../..",
-@@ -530,6 +842,7 @@
-     sources = [
-       "$root_out_dir/$electron_framework_name.framework",
-       "$root_out_dir/$electron_helper_name.app",
-+<<<<<<< .our
-     ]
-     if (!is_mas_build) {
-       sources += [
-@@ -538,6 +851,12 @@
-         "external_binaries/Squirrel.framework",
-       ]
-     }
-+=======
-+      "external_binaries/Squirrel.framework",
-+      "external_binaries/ReactiveCocoa.framework",
-+      "external_binaries/Mantle.framework",
-+    ]
-+>>>>>>> .their
-     outputs = [
-       "{{bundle_contents_dir}}/Frameworks/{{source_file_part}}",
-     ]
-@@ -547,6 +866,7 @@
-     ]
-   }
- 
-+<<<<<<< .our
-   mac_app_bundle("electron_login_helper") {
-     output_name = electron_login_helper_name
-     sources = filenames_gypi.login_helper_sources
-@@ -581,6 +901,44 @@
-     outputs = [
-       "{{bundle_resources_dir}}/{{source_file_part}}",
-     ]
-+=======
-+  bundle_data("electron_app_resources") {
-+    public_deps = [
-+      ":js2asar",
-+      ":app2asar",
-+    ]
-+    sources = [
-+      "$root_out_dir/electron.asar",
-+      "$root_out_dir/default_app.asar",
-+    ]
-+    outputs = [
-+      "{{bundle_resources_dir}}/{{source_file_part}}"
-+    ]
-+  }
-+
-+  repack_locales("electron_locales") {
-+    source_patterns = [
-+      "${root_gen_dir}/content/app/strings/content_strings_",
-+    ]
-+    deps = [
-+      "//content/app/strings",
-+    ]
-+
-+    input_locales = locales
-+
-+    if (is_mac) {
-+      output_locales = locales_as_mac_outputs
-+    } else {
-+      output_locales = locales
-+    }
-+
-+    if (is_mac) {
-+      output_dir = "$root_gen_dir/repack"
-+      copy_data_to_bundle = true
-+    } else {
-+      output_dir = root_out_dir
-+    }
-+>>>>>>> .their
-   }
- 
-   mac_app_bundle("electron_app") {
-@@ -591,16 +949,24 @@
-       ":electron_app_framework_bundle_data",
-       ":electron_app_resources",
-     ]
-+<<<<<<< .our
-     if (is_mas_build) {
-       deps += [ ":electron_login_helper_app" ]
-     }
-     info_plist = "atom/browser/resources/mac/Info.plist"
-     extra_substitutions = [ "ATOM_BUNDLE_ID=$electron_mac_bundle_id" ]
-+=======
-+    info_plist = "atom/browser/resources/mac/Info.plist"
-+    extra_substitutions = [
-+      "ATOM_BUNDLE_ID=$electron_mac_bundle_id",
-+    ]
-+>>>>>>> .their
-     ldflags = [
-       "-rpath",
-       "@executable_path/../Frameworks",
-     ]
-   }
-+<<<<<<< .our
- } else {
-   windows_manifest("electron_app_manifest") {
-     sources = [
-@@ -813,4 +1179,6 @@
- 
- group("electron") {
-   deps = [ ":electron_app" ]
-+=======
-+>>>>>>> .their
- }
-added in both
-  our    100644 b3b9d650b27274f4f98f7408319b1e6b35f63abf DEPS
-  their  100644 32fe2377e3585f4101a01956407ec1bd17d865f9 DEPS
-@@ -1,16 +1,27 @@
- vars = {
-   'chromium_version':
-+<<<<<<< .our
-     '66.0.3359.181',
-   'libchromiumcontent_revision':
-     'c85470a1c379b1c4bedb372c146521bc4be9b75d',
-   'node_version':
-     'ece0a06ac8147efb5b5af431c21f312f1884616e',
-+=======
-+    '63.0.3239.150',
-+  'libchromiumcontent_revision':
-+    '0e8b7216fe616405ea14ff5bece3ca087ead613c',
-+  'node_version':
-+    'v9.7.0-33-g538a5023af',
-+  'native_mate_revision':
-+    '4cd7d113915de0cc08e9a218be35bff9c7361906',
-+>>>>>>> .their
- 
-   'chromium_git':
-     'https://chromium.googlesource.com',
- 
-   'electron_git':
-     'https://github.com/electron',
-+<<<<<<< .our
- 
-   'checkout_nacl':
-     False,
-@@ -18,6 +29,8 @@
-     True,
-   'checkout_oculus_sdk':
-     False,
-+=======
-+>>>>>>> .their
- }
- 
- deps = {
-@@ -27,15 +40,24 @@
-     (Var("electron_git")) + '/libchromiumcontent.git@' + (Var("libchromiumcontent_revision")),
-   'src/third_party/electron_node':
-     (Var("electron_git")) + '/node.git@' + (Var("node_version")),
-+<<<<<<< .our
-+=======
-+  'src/third_party/native_mate':
-+    (Var("electron_git")) + '/native-mate.git@' + (Var("native_mate_revision")),
-+>>>>>>> .their
- }
- 
- hooks = [
-   {
-     'action': [
-+<<<<<<< .our
-       'python',
-       'src/libchromiumcontent/script/apply-patches',
-       '--project-root=.',
-       '--commit'
-+=======
-+      'src/libchromiumcontent/script/apply-patches'
-+>>>>>>> .their
-     ],
-     'pattern':
-       'src/libchromiumcontent',
-@@ -44,7 +66,10 @@
-   },
-   {
-     'action': [
-+<<<<<<< .our
-       'python',
-+=======
-+>>>>>>> .their
-       'src/electron/script/update-external-binaries.py'
-     ],
-     'pattern':
-@@ -54,9 +79,26 @@
-   },
-   {
-     'action': [
-+<<<<<<< .our
-       'python',
-       '-c',
-       'import os; os.chdir("src"); os.chdir("electron"); os.system("npm install")',
-+=======
-+      'bash',
-+      '-c',
-+      # NOTE(nornagon): this ridiculous {{}} stuff is because these strings get
-+      # variable-substituted twice by gclient.
-+      'echo -e "#\\n{{{{\'variables\':{{{{}}}}}}}}" > src/third_party/electron_node/config.gypi',
-+    ],
-+    'pattern': 'src/third_party/electron_node',
-+    'name': 'touch_node_config_gypi'
-+  },
-+  {
-+    'action': [
-+      'bash',
-+      '-c',
-+      'cd src/electron; npm install',
-+>>>>>>> .their
-     ],
-     'pattern': 'src/electron/package.json',
-     'name': 'electron_npm_deps'
-@@ -67,6 +109,7 @@
-   'src',
-   'src/libchromiumcontent',
- ]
-+<<<<<<< .our
- 
- gclient_gn_args = [
-   'checkout_libaom',
-@@ -74,3 +117,5 @@
-   'checkout_oculus_sdk'
- ]
- gclient_gn_args_file =  'src/build/config/gclient_args.gni'
-+=======
-+>>>>>>> .their
-added in both
-  our    100644 166c01b8686498ecb9cb1929e872309441eeaf36 brightray/BUILD.gn
-  their  100644 f82f52a903e47f3f6420dccbc5382796969e20d2 brightray/BUILD.gn
-@@ -1,14 +1,26 @@
- import("//build/config/ui.gni")
- 
-+<<<<<<< .our
- filenames_gypi = exec_script("//build/gypi_to_gn.py",
-                              [ rebase_path("filenames.gypi") ],
-                              "scope",
-                              [ "filenames.gypi" ])
-+=======
-+filenames_gypi = exec_script(
-+  "//build/gypi_to_gn.py",
-+  [ rebase_path("filenames.gypi") ],
-+  "scope",
-+  [ "filenames.gypi" ]
-+)
-+>>>>>>> .their
- 
- static_library("brightray") {
-   deps = [
-     "//base",
-+<<<<<<< .our
-     "//base:base_static",
-+=======
-+>>>>>>> .their
-     "//components/network_session_configurator/common",
-     "//components/prefs",
-     "//content/public/browser",
-@@ -18,6 +30,7 @@
-     "//ui/views",
-   ]
- 
-+<<<<<<< .our
-   include_dirs = [ ".." ]
- 
-   defines = [
-@@ -29,6 +42,16 @@
-     deps += [ "//build/config/linux/gtk" ]
-   }
- 
-+=======
-+  include_dirs = [
-+    "..",
-+  ]
-+
-+  defines = [
-+    "DISABLE_NACL=1",
-+  ]
-+
-+>>>>>>> .their
-   extra_source_filters = []
-   if (is_mac) {
-     extra_source_filters += [
-@@ -38,8 +61,12 @@
-     ]
-   }
- 
-+<<<<<<< .our
-   set_sources_assignment_filter(
-       sources_assignment_filter + extra_source_filters)
-+=======
-+  set_sources_assignment_filter(sources_assignment_filter + extra_source_filters)
-+>>>>>>> .their
-   sources = filenames_gypi.brightray_sources
-   set_sources_assignment_filter(sources_assignment_filter)
- }
-added in both
-  our    100644 110a1d892892d3e27618574c45ae9c12757eb280 build/asar.gni
-  their  100644 d9298e82d42b072c6b0c0173f913561c80eafd32 build/asar.gni
-@@ -1,5 +1,6 @@
- import("npm.gni")
- 
-+<<<<<<< .our
- # Run an action with a given working directory. Behaves identically to the
- # action() target type, with the exception that it changes directory before
- # running the script.
-@@ -30,11 +31,14 @@
-   }
- }
- 
-+=======
-+>>>>>>> .their
- template("asar") {
-   assert(defined(invoker.sources),
-          "Need sources in $target_name listing the JS files.")
-   assert(defined(invoker.outputs),
-          "Need asar name (as 1-element array, e.g. \$root_out_dir/foo.asar)")
-+<<<<<<< .our
-   assert(defined(invoker.root), "Need asar root directory")
-   asar_root = invoker.root
- 
-@@ -46,5 +50,27 @@
-     script = "//electron/tools/js2asar.py"
-     cwd = rebase_path(get_path_info(".", "abspath"))
-     args = rebase_path(outputs, cwd) + [ asar_root ] + rebase_path(sources, ".")
-+=======
-+  assert(defined(invoker.root),
-+         "Need asar root directory")
-+  asar_root = invoker.root
-+  copy_target_name = target_name + "_inputs"
-+  copy(copy_target_name) {
-+    sources = invoker.sources
-+    outputs = [
-+      "$target_gen_dir/$target_name/{{source_target_relative}}"
-+    ]
-+  }
-+  npm_action(target_name) {
-+    forward_variables_from(invoker, ["deps", "public_deps"])
-+    deps = [":$copy_target_name"]
-+    sources = invoker.sources
-+    script = "asar"
-+    outputs = invoker.outputs
-+    args = [
-+      "pack",
-+      rebase_path("$target_gen_dir/$target_name/$asar_root")
-+    ] + rebase_path(outputs)
-+>>>>>>> .their
-   }
- }
-added in remote
-  their  100644 0ce0ceee3f8be7927d0adab43557194f660c5b40 build/node/BUILD.gn
-@@ -0,0 +1,72 @@
-+action("gyp_node") {
-+  script = "//tools/gyp/gyp_main.py"
-+  inputs = [
-+    "//third_party/electron_node/common.gypi",
-+    "//third_party/electron_node/node.gyp",
-+    "//third_party/electron_node/node.gypi",
-+    "node.gypi",
-+  ]
-+  outputs = [
-+    "$target_out_dir/Release_Base/build.ninja",
-+  ]
-+  args = [
-+    "-I", rebase_path("node.gypi", root_build_dir),
-+    "-D", "component=shared_library",
-+    "-D", "buildtype=Custom",
-+    "-D", "target_arch=x64",
-+    "-D", "host_arch=x64",
-+    "-Goutput_dir=./$target_out_dir", # bizarrely, gyp generates from the build root instead of from cwd
-+    "-fninja",
-+    rebase_path("//third_party/electron_node/node.gyp", root_build_dir),
-+  ]
-+}
-+
-+action("build_node") {
-+  deps = [
-+    "//third_party/icu",
-+    "//v8",
-+    "//v8:v8_libbase",
-+    "//v8:v8_libplatform",
-+    ":gyp_node",
-+  ]
-+  script = "//electron/build/run-ninja.py"
-+  args = [
-+    "-C", rebase_path(target_out_dir, root_build_dir) + "/Release_Base",
-+    "node_lib"
-+  ]
-+  outputs = [
-+    "$target_out_dir/Release_Base/libnode.dylib"
-+  ]
-+}
-+
-+copy("copy_node") {
-+  deps = [ ":build_node" ]
-+  sources = [ "$target_out_dir/Release_Base/libnode.dylib" ]
-+  outputs = [ "$root_out_dir/{{source_file_part}}" ]
-+}
-+
-+config("node_config") {
-+  include_dirs = [
-+    "//third_party/electron_node/src",
-+    "//third_party/electron_node/deps/uv/include",
-+    "//third_party/electron_node/deps/cares/include",
-+  ]
-+  libs = [
-+    "$target_out_dir/Release_Base/libnode.dylib"
-+  ]
-+  cflags_cc = [
-+    "-Wno-deprecated-declarations",
-+  ]
-+  defines = [
-+    # We need to access internal implementations of Node.
-+    "NODE_WANT_INTERNALS=1",
-+    "NODE_SHARED_MODE",
-+    "HAVE_OPENSSL=1",
-+    "HAVE_INSPECTOR=1",
-+  ]
-+}
-+
-+group("node") {
-+  public_configs = [ ":node_config" ]
-+  public_deps = [ ":copy_node" ]
-+}
-added in remote
-  their  100644 be563fe822be231a37795c515a2c5d69569bd4ce build/node/node.gypi
-@@ -0,0 +1,305 @@
-+{
-+  #'includes': [ 'v8.gypi' ],
-+  'variables': {
-+    'openssl_fips': '',
-+    'openssl_no_asm': 1,
-+    'use_openssl_def': 0,
-+    'openssl_product': 'libopenssl.a',
-+    'clang': 1,
-+    # XXX(alexeykuzmin): Must match the clang version we use. See `clang -v`.
-+    'llvm_version': '6.0',
-+    'node_release_urlbase': 'https://atom.io/download/electron',
-+    'node_byteorder': '<!(node <(DEPTH)/electron/tools/get-endianness.js)',
-+    'node_target_type': 'shared_library',
-+    'library': 'static_library',
-+    'node_install_npm': 'false',
-+    'node_prefix': '',
-+    'node_shared': 'true',
-+    'node_shared_cares': 'false',
-+    'node_shared_http_parser': 'false',
-+    'node_shared_libuv': 'false',
-+    'node_shared_openssl': 'false',
-+    'node_shared_zlib': 'false',
-+    'node_tag': '',
-+    'node_use_dtrace': 'false',
-+    'node_use_etw': 'false',
-+    'node_use_mdb': 'false',
-+    'node_use_openssl': 'true',
-+    'node_use_perfctr': 'false',
-+    'node_use_v8_platform': 'false',
-+    'node_use_bundled_v8': 'false',
-+    'node_enable_d8': 'false',
-+    'uv_library': 'static_library',
-+    'uv_parent_path': 'vendor/node/deps/uv',
-+    'uv_use_dtrace': 'false',
-+    'v8_base': '',
-+    'v8_postmortem_support': 'false',
-+    'v8_enable_i18n_support': 'false',
-+    'v8_enable_inspector': '1',
-+    'debug_http2': 0,
-+    'debug_nghttp2': 0,
-+
-+    'node_module_version': '0',
-+    'shlib_suffix': 'dylib',
-+  },
-+  # Settings to compile node under Windows.
-+  'target_defaults': {
-+    'target_conditions': [
-+      ['_target_name in ["libuv", "http_parser", "openssl", "openssl-cli", "cares", "node_lib", "zlib", "nghttp2"]', {
-+        'msvs_disabled_warnings': [
-+          4003,  # not enough actual parameters for macro 'V'
-+          4013,  # 'free' undefined; assuming extern returning int
-+          4018,  # signed/unsigned mismatch
-+          4054,  #
-+          4055,  # 'type cast' : from data pointer 'void *' to function pointer
-+          4057,  # 'function' : 'volatile LONG *' differs in indirection to slightly different base types from 'unsigned long *'
-+          4065,  # switch statement contains 'default' but no 'case' labels
-+          4129,  # unrecognized character escape sequence
-+          4189,  #
-+          4131,  # uses old-style declarator
-+          4133,  # incompatible types
-+          4146,  # unary minus operator applied to unsigned type, result still unsigned
-+          4164,  # intrinsic function not declared
-+          4152,  # function/data pointer conversion in expression
-+          4206,  # translation unit is empty
-+          4204,  # non-constant aggregate initializer
-+          4210,  # nonstandard extension used : function given file scope
-+          4214,  # bit field types other than int
-+          4232,  # address of dllimport 'free' is not static, identity not guaranteed
-+          4291,  # no matching operator delete found
-+          4295,  # array is too small to include a terminating null character
-+          4309,  # 'static_cast': truncation of constant value
-+          4311,  # 'type cast': pointer truncation from 'void *const ' to 'unsigned long'
-+          4389,  # '==' : signed/unsigned mismatch
-+          4456,  # declaration of 'm' hides previous local declaration
-+          4457,  # declaration of 'message' hides function parameter
-+          4459,  # declaration of 'wq' hides global declaration
-+          4477,  # format string '%.*s' requires an argument of type 'int'
-+          4505,  # unreferenced local function has been removed
-+          4701,  # potentially uninitialized local variable 'sizew' used
-+          4703,  # potentially uninitialized local pointer variable 'req' used
-+          4706,  # assignment within conditional expression
-+          4804,  # unsafe use of type 'bool' in operation
-+          4996,  # this function or variable may be unsafe.
-+        ],
-+        'msvs_settings': {
-+          'VCCLCompilerTool': {
-+            'WarnAsError': 'false',
-+          },
-+        },
-+        'xcode_settings': {
-+          'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO',
-+          'WARNING_CFLAGS': [
-+            '-Wno-unknown-warning-option',
-+            '-Wno-parentheses-equality',
-+            '-Wno-unused-function',
-+            '-Wno-sometimes-uninitialized',
-+            '-Wno-pointer-sign',
-+            '-Wno-sign-compare',
-+            '-Wno-string-plus-int',
-+            '-Wno-unused-variable',
-+            '-Wno-deprecated-declarations',
-+            '-Wno-return-type',
-+            '-Wno-gnu-folding-constant',
-+            '-Wno-shift-negative-value',
-+            '-Wno-varargs', # https://git.io/v6Olj
-+            '-Wno-unused-private-field',
-+          ],
-+        },
-+        'conditions': [
-+          ['OS=="linux"', {
-+            'cflags': [
-+              '-Wno-unused-function',
-+              '-Wno-unused-variable',
-+              '-Wno-unused-value',
-+              '-Wno-deprecated-declarations',
-+              '-Wno-return-type',
-+              '-Wno-format',
-+              '-Wno-varargs', # https://git.io/v6Olj
-+              # Required when building as shared library.
-+              '-fPIC',
-+            ],
-+          }],
-+          ['OS=="linux" and clang==1', {
-+            'cflags': [
-+              '-Wno-pointer-sign',
-+              '-Wno-parentheses-equality',
-+              '-Wno-sometimes-uninitialized',
-+              '-Wno-string-plus-int',
-+              '-Wno-shift-negative-value',
-+              '-Wno-reserved-user-defined-literal',
-+              '-Wno-implicit-function-declaration',
-+              '-Wno-long-long',
-+            ],
-+          }],
-+        ],
-+      }],
-+      ['_target_name=="node_lib"', {
-+        'include_dirs': [
-+          '../../../v8',
-+          '../../../v8/include',
-+          '../../../third_party/icu/source/common',
-+          '../../../third_party/icu/source/i18n',
-+        ],
-+        'defines': [
-+          # Export V8 symbols from node.dll / libnode.so
-+          'BUILDING_V8_SHARED',
-+          'BUILDING_V8_PLATFORM_SHARED',
-+          'BUILDING_V8_BASE_SHARED',
-+        ],
-+        'cflags_cc': [
-+          '-std=gnu++14',
-+          '-fno-rtti',
-+        ],
-+        'xcode_settings': {
-+          # apparently on mac, even if you're not generating xcode junk,
-+          # cflags_cc is just flat out ignored, and this weirdo xcode_settings
-+          # thing is used instead.
-+          'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',
-+          'OTHER_CFLAGS': ['-fno-rtti'],
-+        },
-+        'libraries': [
-+          '../../../../../../libv8.dylib',
-+          '../../../../../../libv8_libbase.dylib',
-+          '../../../../../../libv8_libplatform.dylib',
-+          '../../../../../../libicuuc.dylib',
-+        ],
-+        'conditions': [
-+          #['OS=="mac" and libchromiumcontent_component==0', {
-+            ## -all_load is the "whole-archive" on macOS.
-+            #'xcode_settings': {
-+              #'OTHER_LDFLAGS': [ '-Wl,-all_load' ],
-+            #},
-+          #}],
-+          #[{
-+            #'libraries': [
-+              #'<@(libchromiumcontent_v8_libraries)',
-+            #],
-+          #}],
-+        ],
-+      }],
-+      ['_target_name=="openssl"', {
-+        'xcode_settings': {
-+          'DEAD_CODE_STRIPPING': 'YES',  # -Wl,-dead_strip
-+          'GCC_INLINES_ARE_PRIVATE_EXTERN': 'YES',
-+          'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES',
-+        },
-+        'cflags': [
-+          '-fvisibility=hidden',
-+        ],
-+      }],
-+      ['_target_name=="openssl-cli"', {
-+        'ldflags!': [
-+          '-nostdlib++',
-+        ]
-+      }],
-+      ['_target_name=="libuv"', {
-+        'conditions': [
-+          ['OS=="win"', {
-+            # Expose libuv's symbols.
-+            'defines': [
-+              'BUILDING_UV_SHARED=1',
-+            ],
-+          }],  # OS=="win"
-+        ],
-+      }],
-+      ['_target_name.startswith("crashpad")', {
-+        'conditions': [
-+          ['OS=="mac"', {
-+            'xcode_settings': {
-+              'WARNING_CFLAGS': [
-+                '-Wno-unused-private-field',
-+                '-Wno-address-of-packed-member',
-+              ],
-+            },
-+          }],  # OS=="mac"
-+        ],
-+      }],
-+      ['_target_name.startswith("breakpad") or _target_name in ["crash_report_sender", "dump_syms"]', {
-+        'conditions': [
-+          ['OS=="mac"', {
-+            'xcode_settings': {
-+              'WARNING_CFLAGS': [
-+                '-Wno-deprecated-declarations',
-+                '-Wno-deprecated-register',
-+                '-Wno-unused-private-field',
-+                '-Wno-unused-function',
-+              ],
-+            },
-+          }],  # OS=="mac"
-+          ['OS=="linux"', {
-+            'cflags': [
-+              '-Wno-empty-body',
-+            ],
-+          }],  # OS=="linux"
-+          ['OS=="win"', {
-+            'msvs_disabled_warnings': [
-+              # unreferenced local function has been removed.
-+              4505,
-+            ],
-+          }],  # OS=="win"
-+        ],
-+      }],
-+      ['OS=="linux" and _toolset=="target" and _target_name in ["dump_syms", "node_lib"]', {
-+        'conditions': [
-+          #['libchromiumcontent_component==0', {
-+            #'libraries': [
-+              #'<(libchromiumcontent_dir)/libc++.a',
-+            #],
-+            #'ldflags': [
-+              #'-lpthread',
-+            ##],
-+          #}, {
-+            #'libraries': [
-+              #'<(libchromiumcontent_dir)/libc++.so',
-+            #],
-+            #'ldflags': [
-+              #'-Wl,-rpath=\$$ORIGIN',
-+            #],
-+          #}],
-+        ],
-+      }]
-+    ],
-+    'msvs_cygwin_shell': 0, # Strangely setting it to 1 would make building under cygwin fail.
-+    'msvs_disabled_warnings': [
-+      4005,  # (node.h) macro redefinition
-+      4091,  # (node_extern.h) '__declspec(dllimport)' : ignored on left of 'node::Environment' when no variable is declared
-+      4099,  # (pdf_render_settings.h) type name first seen using 'class' now seen using 'struct'
-+      4189,  # local variable is initialized but not referenced
-+      4201,  # (uv.h) nameless struct/union
-+      4267,  # conversion from 'size_t' to 'int', possible loss of data
-+      4302,  # (atldlgs.h) 'type cast': truncation from 'LPCTSTR' to 'WORD'
-+      4458,  # (atldlgs.h) declaration of 'dwCommonButtons' hides class member
-+      4503,  # decorated name length exceeded, name was truncated
-+      4530,  # C++ exception handler used, but unwind semantics are not enabled. Specify /EHsc
-+      4577,  # 'noexcept' used with no exception handling mode specified
-+      4714,  # (atomicstring.h) function marked as __forceinline not inlined
-+      4800,  # (v8.h) forcing value to bool 'true' or 'false'
-+      4819,  # The file contains a character that cannot be represented in the current code page
-+      4838,  # (atlgdi.h) conversion from 'int' to 'UINT' requires a narrowing conversion
-+      4996,  # (atlapp.h) 'GetVersionExW': was declared deprecated
-+    ],
-+  },
-+  'conditions': [
-+    # The breakdpad on Windows assumes Debug_x64 and Release_x64 configurations.
-+    ['OS=="win"', {
-+      'target_defaults': {
-+        'configurations': {
-+          'Debug_x64': {
-+          },
-+          'Release_x64': {
-+          },
-+        },
-+      },
-+    }],  # OS=="win"
-+    # The breakdpad on Mac assumes Release_Base configuration.
-+    ['OS=="mac"', {
-+      'target_defaults': {
-+        'configurations': {
-+          'Release_Base': {
-+          },
-+        },
-+      },
-+    }],  # OS=="mac"
-+  ],
-+}
-changed in both
-  base   100644 a07c2d9b45c54cf9c1ccae0a76eed69f482178a8 package.json
-  our    100644 c081cd89450cd50efba1ec280ff1349a96ea3ce0 package.json
-  their  100644 41f2db3eb72adb7a10f006b62e8ce2eb819e8603 package.json
-@@ -45,8 +45,12 @@
-   "private": true,
-   "scripts": {
-     "asar": "asar",
-+<<<<<<< .our
-     "bootstrap:dev": "python ./script/bootstrap.py -d -v",
-     "bootstrap": "python ./script/bootstrap.py -v",
-+=======
-+    "bootstrap": "python ./script/bootstrap.py",
-+>>>>>>> .their
-     "browserify": "browserify",
-     "bump-version": "./script/bump-version.py",
-     "build": "python ./script/build.py",
diff --git a/app/test/fixtures/merge-parser/electron/merge-build-zip-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-build-zip-into-master.txt
deleted file mode 100644
index 6ef992b638a..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-build-zip-into-master.txt
+++ /dev/null
@@ -1,160 +0,0 @@
-changed in both
-  base   100644 d66102fb95300bf4c1c5728efd2382c9e8fad313 .circleci/config.yml
-  our    100644 6d44d618aabcce04c60344f2274dec5b0c2a1f68 .circleci/config.yml
-  their  100644 716cf849e9fe5e889117e3784299124264a07b81 .circleci/config.yml
-@@ -192,6 +192,7 @@
-           cd src
-           ninja -C out/Default electron:electron_app
-     - run:
-+<<<<<<< .our
-         name: ffmpeg GN gen
-         command: |
-           if [ "$BUILD_FFMPEG" == "true" ]; then
-@@ -220,6 +221,8 @@
-             ninja -C out/native_mksnapshot v8:mksnapshot
-           fi
-     - run:
-+=======
-+>>>>>>> .their
-         name: Build dist.zip
-         command: |
-           cd src
-@@ -257,12 +260,15 @@
-         path: src/junit
-     - store_artifacts:
-         path: src/out/Default/dist.zip
-+<<<<<<< .our
-     - store_artifacts:
-         path: src/out/ffmpeg/libffmpeg.dylib
-     - store_artifacts:
-         path: src/out/ffmpeg/libffmpeg.so
-     - store_artifacts:
-         path: src/out/native_mksnapshot/mksnapshot
-+=======
-+>>>>>>> .their
- 
- gn-mac-build-steps: &gn-mac-build-steps
-   steps:
-@@ -522,7 +528,10 @@
-     environment:
-       DISPLAY: ':99.0'
-       GN_CONFIG: //electron/build/args/testing.gn
-+<<<<<<< .our
-       BUILD_FFMPEG: true
-+=======
-+>>>>>>> .their
-     <<: *gn-linux-build-machine
-     <<: *gn-build-steps
- 
-@@ -530,7 +539,10 @@
-     environment:
-       DISPLAY: ':99.0'
-       GN_CONFIG: //electron/build/args/release.gn
-+<<<<<<< .our
-       BUILD_FFMPEG: true
-+=======
-+>>>>>>> .their
-     <<: *gn-linux-build-machine
-     <<: *gn-build-steps
- 
-@@ -550,7 +562,10 @@
-       GN_CONFIG: //electron/build/args/testing.gn
-       GN_EXTRA_ARGS: 'target_cpu = "x86"'
-       NPM_CONFIG_ARCH: ia32
-+<<<<<<< .our
-       BUILD_FFMPEG: true
-+=======
-+>>>>>>> .their
-     <<: *gn-linux-build-machine
-     <<: *gn-build-steps
- 
-@@ -560,7 +575,10 @@
-       GN_CONFIG: //electron/build/args/release.gn
-       GN_EXTRA_ARGS: 'target_cpu = "x86"'
-       NPM_CONFIG_ARCH: ia32
-+<<<<<<< .our
-       BUILD_FFMPEG: true
-+=======
-+>>>>>>> .their
-     <<: *gn-linux-build-machine
-     <<: *gn-build-steps
- 
-@@ -588,9 +606,12 @@
-       GN_EXTRA_ARGS: 'target_cpu = "arm"'
-       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True'
-       RUN_TESTS: false
-+<<<<<<< .our
-       BUILD_FFMPEG: true
-       BUILD_NATIVE_MKSNAPSHOT: true
-       MKSNAPSHOT_TOOLCHAIN: //build/toolchain/linux:clang_arm
-+=======
-+>>>>>>> .their
-     <<: *gn-linux-build-machine
-     <<: *gn-build-steps
- 
-@@ -618,9 +639,12 @@
-       GN_EXTRA_ARGS: 'target_cpu = "arm64" fatal_linker_warnings = false enable_linux_installer = false'
-       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm64=True'
-       RUN_TESTS: false
-+<<<<<<< .our
-       BUILD_FFMPEG: true
-       BUILD_NATIVE_MKSNAPSHOT: true
-       MKSNAPSHOT_TOOLCHAIN: //build/toolchain/linux:clang_arm64
-+=======
-+>>>>>>> .their
-     <<: *gn-linux-build-machine
-     <<: *gn-build-steps
- 
-changed in both
-  base   100644 050d6fc2ad0a5ec061c4d1be67914a71e572ab6b appveyor-gn.yml
-  our    100644 282c4952dfcbdc90df13c3935cc4a8ddd82d91e7 appveyor-gn.yml
-  their  100644 f54a4fff084a5337f8517e7256039401a8c05c2d appveyor-gn.yml
-@@ -21,7 +21,11 @@
-   - md src
-   - ps: Move-Item $env:APPVEYOR_BUILD_FOLDER -Destination src\electron
-   - ps: $env:CHROMIUM_BUILDTOOLS_PATH="$pwd\src\buildtools"
-+<<<<<<< .our
-   - ps: $env:SCCACHE_PATH="$pwd\src\electron\external_binaries\sccache.exe"
-+=======
-+  - ps: $env:SCCACHE_PATH="$pwd\src\libchromiumcontent\tools\sccache\aad2120\windows\sccache.exe"
-+>>>>>>> .their
-   - >-
-       gclient config
-       --name "src\electron"
-@@ -29,11 +33,19 @@
-       "https://github.com/electron/electron"
-   - gclient sync --with_branch_heads --with_tags
-   - cd src
--  - gn gen out/Default "--args=import(\"//electron/build/args/%gn_args%.gn\")"
-+  - >-
-+      %SCCACHE_PATH% -s
-+  - gn gen out/Default "--args=import(\"//electron/build/args/%gn_args%.gn\") cc_wrapper=\"%CC_WRAPPER%\" "
-   - ninja -C out/Default electron:electron_app
-+<<<<<<< .our
-   - gn gen out/ffmpeg "--args=import(\"//electron/build/args/ffmpeg.gn\")"
-   - ninja -C out/ffmpeg third_party/ffmpeg
-   - ninja -C out/Default electron:electron_dist_zip
-+=======
-+  - ninja -C out/Default electron:electron_dist_zip
-+  - >-
-+      %SCCACHE_PATH% -s
-+>>>>>>> .their
- test_script:
-   - ninja -C out/Default third_party/electron_node:headers
-   - ps: $env:npm_config_nodedir="$pwd/out/Default/gen/node_headers"
-changed in both
-  base   100644 e8bf757b2e13efb4673c4ce9bc4f5273bdd15645 vsts-gn.yml
-  our    100644 3c9985b16c0414cfd9bc6c6648d6411a969fc6ef vsts-gn.yml
-  their  100644 ddc313edf9a1c4cbb8191473a25b46fb57e9655f vsts-gn.yml
-@@ -31,7 +31,11 @@
-   - bash: |
-       cd src
-       export CHROMIUM_BUILDTOOLS_PATH=`pwd`/buildtools
-+<<<<<<< .our
-       export SCCACHE_WRAPPER="`pwd`/electron/external_binaries/sccache"
-+=======
-+      export SCCACHE_WRAPPER="`pwd`/libchromiumcontent/tools/sccache/aad2120/mac/sccache"
-+>>>>>>> .their
-       export SCCACHE_HELPER="`pwd`/libchromiumcontent/script/sccache"
-       "$SCCACHE_HELPER" --start-server --azure_container "$(SCCACHE_AZURE_BLOB_CONTAINER)" --azure_connection "$(SCCACHE_AZURE_CONNECTION_STRING)"
-       echo "##vso[task.setvariable variable=SCCACHE_WRAPPER]$SCCACHE_WRAPPER"
diff --git a/app/test/fixtures/merge-parser/electron/merge-buildFromTemplate-fix-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-buildFromTemplate-fix-into-master.txt
deleted file mode 100644
index 7cba7aeee6e..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-buildFromTemplate-fix-into-master.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-changed in both
-  base   100644 dcc446587913f37a58c86f4d1bf612371589960e lib/browser/api/menu.js
-  our    100644 506e3525c10ce142cafe3fc1bf4de1c255e48503 lib/browser/api/menu.js
-  their  100644 21a60b52b0e5ea1d091c9b35f57254b8af8f017d lib/browser/api/menu.js
-@@ -165,7 +165,18 @@
-   const filtered = removeExtraSeparators(template)
-   const sorted = sortTemplate(filtered)
- 
-+<<<<<<< .our
-   sorted.forEach((item) => menu.append(new MenuItem(item)))
-+=======
-+  sorted.forEach((item) => {
-+    if (typeof item !== 'object') {
-+      throw new TypeError('Invalid template for MenuItem')
-+    }
-+    if( Object.keys(item).length > 0) {
-+    menu.append(new MenuItem(item))
-+    }
-+  })
-+>>>>>>> .their
- 
-   return menu
- }
diff --git a/app/test/fixtures/merge-parser/electron/merge-chromium-upgrade-67-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-chromium-upgrade-67-into-master.txt
deleted file mode 100644
index 4059219e228..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-chromium-upgrade-67-into-master.txt
+++ /dev/null
@@ -1,2198 +0,0 @@
-changed in both
-  base   100644 a6ae681e48a0928c11f718950b804ac31f8147ad .circleci/config.yml
-  our    100644 6d44d618aabcce04c60344f2274dec5b0c2a1f68 .circleci/config.yml
-  their  100644 716cf849e9fe5e889117e3784299124264a07b81 .circleci/config.yml
-@@ -169,6 +169,7 @@
-           gclient config \
-             --name "src/electron" \
-             --unmanaged \
-+            --cache-dir "${GIT_CACHE_PATH}" \
-             $GCLIENT_EXTRA_ARGS \
-             "$CIRCLE_REPOSITORY_URL"
- 
-@@ -181,9 +182,9 @@
-         name: GN gen
-         command: |
-           cd src
--          SCCACHE_PATH="$PWD/electron/external_binaries/sccache"
-+          SCCACHE_PATH="$PWD/libchromiumcontent/tools/sccache/aad2120/linux/sccache"
-+          echo 'export SCCACHE_WRAPPER="'"$SCCACHE_PATH"'"' >> $BASH_ENV
-           echo 'export CHROMIUM_BUILDTOOLS_PATH="'"$PWD"'/buildtools"' >> $BASH_ENV
--          echo 'export SCCACHE_WRAPPER="'"$SCCACHE_PATH"'"'            >> $BASH_ENV
-           source $BASH_ENV
-           gn gen out/Default --args='import("'$GN_CONFIG'") cc_wrapper="'"$SCCACHE_PATH"'"'" $GN_EXTRA_ARGS"
-     - run:
-merged
-  result 100644 331eab5b86f915903a957d0d2b016e91d4d5a068 BUILD.gn
-  our    100644 d00c4b1e3d3523641210ff20fda41d76c9eb546c BUILD.gn
-@@ -216,7 +216,7 @@
-     "//printing",
-     "//services/device/wake_lock/power_save_blocker",  # TODO: this requires a visibility patch to chromium src
-     "//skia",
--    "//third_party/WebKit/public:blink",
-+    "//third_party/blink/public:blink",
-     "//third_party/boringssl",
-     "//third_party/electron_node:node_lib",
-     "//third_party/leveldatabase",
-@@ -235,7 +235,7 @@
- 
-     # TODO(nornagon): replace usage of SchemeRegistry by an actually exported
-     # API of blink, then delete this include dir.
--    "//third_party/WebKit/Source",
-+    "//third_party/blink/renderer",
-   ]
- 
-   defines = []
-@@ -699,8 +699,8 @@
-   testonly = true
- 
-   deps = [
--    "//third_party/WebKit/public:all_blink",
--    "//third_party/WebKit/public:test_support",
-+    "//third_party/blink/public:all_blink",
-+    "//third_party/blink/public:test_support",
-   ]
- }
- 
-@@ -716,7 +716,6 @@
-     "//device:device_unittests",
-     "//gin:gin_unittests",
-     "//gpu:gpu_unittests",
--    "//gpu/ipc/service:gpu_ipc_service_unittests",
-     "//ipc:ipc_tests",
-     "//media:media_unittests",
-     "//media/capture:capture_unittests",
-changed in both
-  base   100644 23d1ca3453c855fe80d9a6be87a23b5657ffe73c DEPS
-  our    100644 b3b9d650b27274f4f98f7408319b1e6b35f63abf DEPS
-  their  100644 3e524daeccfd72207c92d75eaf9ce6e3e0384c58 DEPS
-@@ -1,8 +1,12 @@
- vars = {
-   'chromium_version':
--    '66.0.3359.181',
-+    '67.0.3396.99',
-   'libchromiumcontent_revision':
-+<<<<<<< .our
-     'c85470a1c379b1c4bedb372c146521bc4be9b75d',
-+=======
-+    'e349f85568753947039fc912cf84d76a17a82f2e',
-+>>>>>>> .their
-   'node_version':
-     'ece0a06ac8147efb5b5af431c21f312f1884616e',
- 
-changed in both
-  base   100644 f4ed88660e5a8bf508a84a335403c9b3db56dcef appveyor-gn.yml
-  our    100644 282c4952dfcbdc90df13c3935cc4a8ddd82d91e7 appveyor-gn.yml
-  their  100644 bd7f39db7db74312677a748083248265a44c88b8 appveyor-gn.yml
-@@ -21,11 +21,16 @@
-   - md src
-   - ps: Move-Item $env:APPVEYOR_BUILD_FOLDER -Destination src\electron
-   - ps: $env:CHROMIUM_BUILDTOOLS_PATH="$pwd\src\buildtools"
-+<<<<<<< .our
-   - ps: $env:SCCACHE_PATH="$pwd\src\electron\external_binaries\sccache.exe"
-+=======
-+  - ps: $env:SCCACHE_PATH="$pwd\src\libchromiumcontent\tools\sccache\aad2120\windows\sccache.exe"
-+>>>>>>> .their
-   - >-
-       gclient config
-       --name "src\electron"
-       --unmanaged
-+      --cache-dir "${GIT_CACHE_PATH}"
-       "https://github.com/electron/electron"
-   - gclient sync --with_branch_heads --with_tags
-   - cd src
-@@ -47,7 +52,11 @@
-   - npm install
-   - ps: Pop-Location
-   - .\out\Default\electron.exe electron\spec --ci
-+<<<<<<< .our
-   - python electron\verify-ffmpeg.py -c Default --source-root "%pwd%" --ffmpeg-path "%pwd%\out\ffmpeg"
-+=======
-+  # TODO(nornagon): verify-ffmpeg step
-+>>>>>>> .their
- artifacts:
- - path: test-results.xml
-   name: test-results.xml
-merged
-  result 100644 5ce233161ca406f6d54de0dbed091775308a2bfd atom/app/atom_content_client.cc
-  our    100644 f17ae3137032f0b0e26eb735d37cfb3daaeebcfc atom/app/atom_content_client.cc
-@@ -18,7 +18,7 @@
- #include "content/public/common/content_constants.h"
- #include "content/public/common/pepper_plugin_info.h"
- #include "content/public/common/user_agent.h"
--#include "media/media_features.h"
-+#include "media/media_buildflags.h"
- #include "ppapi/shared_impl/ppapi_permissions.h"
- #include "ui/base/l10n/l10n_util.h"
- #include "url/url_constants.h"
-merged
-  result 100644 0bb19fe5bb4025e0c8cc56a18fed68d1414a2fce atom/app/atom_main_delegate.cc
-  our    100644 b3b5b8f2a8f24b8928f69a286c80e8a3b8464366 atom/app/atom_main_delegate.cc
-@@ -21,7 +21,7 @@
- #include "base/logging.h"
- #include "chrome/common/chrome_paths.h"
- #include "content/public/common/content_switches.h"
--#include "ipc/ipc_features.h"
-+#include "ipc/ipc_buildflags.h"
- #include "services/service_manager/sandbox/switches.h"
- #include "ui/base/l10n/l10n_util.h"
- #include "ui/base/resource/resource_bundle.h"
-changed in both
-  base   100644 37f3a05ddee9034c5056f88978b0da474dd3debf atom/browser/api/atom_api_app.cc
-  our    100644 089a2b63d1bae3afebea925582a3aac81ddeaa4f atom/browser/api/atom_api_app.cc
-  their  100644 81c685aaa20354517efbf5da3d57d63b68096b54 atom/browser/api/atom_api_app.cc
-@@ -1112,30 +1112,11 @@
- 
-   for (const auto& process_metric : app_metrics_) {
-     mate::Dictionary pid_dict = mate::Dictionary::CreateEmpty(isolate);
--    mate::Dictionary memory_dict = mate::Dictionary::CreateEmpty(isolate);
-     mate::Dictionary cpu_dict = mate::Dictionary::CreateEmpty(isolate);
- 
-     pid_dict.SetHidden("simple", true);
--    memory_dict.SetHidden("simple", true);
-     cpu_dict.SetHidden("simple", true);
- 
--    memory_dict.Set(
--        "workingSetSize",
--        static_cast<double>(
--            process_metric.second->metrics->GetWorkingSetSize() >> 10));
--    memory_dict.Set(
--        "peakWorkingSetSize",
--        static_cast<double>(
--            process_metric.second->metrics->GetPeakWorkingSetSize() >> 10));
--
--    size_t private_bytes, shared_bytes;
--    if (process_metric.second->metrics->GetMemoryBytes(&private_bytes,
--                                                       &shared_bytes)) {
--      memory_dict.Set("privateBytes", static_cast<double>(private_bytes >> 10));
--      memory_dict.Set("sharedBytes", static_cast<double>(shared_bytes >> 10));
--    }
--
--    pid_dict.Set("memory", memory_dict);
-     cpu_dict.Set(
-         "percentCPUUsage",
-         process_metric.second->metrics->GetPlatformIndependentCPUUsage() /
-merged
-  result 100644 9c171abd54e0e770c2f35581f91000fba57b0c8f atom/browser/api/atom_api_protocol.cc
-  our    100644 5e1f991ad8dcd611467b691fff48656e3cc299ff atom/browser/api/atom_api_protocol.cc
-@@ -50,7 +50,7 @@
-   // Dynamically register the schemes.
-   auto* policy = content::ChildProcessSecurityPolicy::GetInstance();
-   for (const std::string& scheme : schemes) {
--    url::AddStandardScheme(scheme.c_str(), url::SCHEME_WITHOUT_PORT);
-+    url::AddStandardScheme(scheme.c_str(), url::SCHEME_WITH_HOST);
-     if (secure) {
-       url::AddSecureScheme(scheme.c_str());
-     }
-merged
-  result 100644 24cf19b9cda901566492f8db999f40af8788432b atom/browser/api/atom_api_session.cc
-  our    100644 658f913bb60b66ae1bf3aae97d7d9158e56f7ee0 atom/browser/api/atom_api_session.cc
-@@ -47,7 +47,9 @@
- #include "net/http/http_auth_handler_factory.h"
- #include "net/http/http_auth_preferences.h"
- #include "net/proxy_resolution/proxy_config_service_fixed.h"
--#include "net/proxy_resolution/proxy_service.h"
-+#include "net/proxy_resolution/proxy_config_with_annotation.h"
-+#include "net/proxy_resolution/proxy_resolution_service.h"
-+#include "net/traffic_annotation/network_traffic_annotation.h"
- #include "net/url_request/static_http_user_agent_settings.h"
- #include "net/url_request/url_request_context.h"
- #include "net/url_request/url_request_context_getter.h"
-@@ -349,7 +351,8 @@
-   auto* proxy_service =
-       getter->GetURLRequestContext()->proxy_resolution_service();
-   proxy_service->ResetConfigService(
--      base::WrapUnique(new net::ProxyConfigServiceFixed(config)));
-+      base::WrapUnique(new net::ProxyConfigServiceFixed(
-+          net::ProxyConfigWithAnnotation(config, NO_TRAFFIC_ANNOTATION_YET))));
-   // Refetches and applies the new pac script if provided.
-   proxy_service->ForceReloadProxyConfig();
-   RunCallbackInUI(callback);
-changed in both
-  base   100644 667aa3f08f8edba1b8ad4579f444421471cdd95a atom/browser/api/atom_api_web_contents.cc
-  our    100644 20a1ac2e672f08ffea528b6e094ba530ff8083d1 atom/browser/api/atom_api_web_contents.cc
-  their  100644 b336c4177378d873ca35c353005f337b58bfc519 atom/browser/api/atom_api_web_contents.cc
-@@ -93,8 +93,8 @@
- #include "native_mate/dictionary.h"
- #include "native_mate/object_template_builder.h"
- #include "net/url_request/url_request_context.h"
--#include "third_party/WebKit/public/platform/WebInputEvent.h"
--#include "third_party/WebKit/public/web/WebFindOptions.h"
-+#include "third_party/blink/public/platform/web_input_event.h"
-+#include "third_party/blink/public/web/web_find_options.h"
- #include "ui/display/screen.h"
- #include "ui/events/base_event_utils.h"
- 
-@@ -316,7 +316,8 @@
-     : content::WebContentsObserver(web_contents), type_(type) {
-   const mate::Dictionary options = mate::Dictionary::CreateEmpty(isolate);
-   if (type == REMOTE) {
--    web_contents->SetUserAgentOverride(GetBrowserContext()->GetUserAgent());
-+    web_contents->SetUserAgentOverride(GetBrowserContext()->GetUserAgent(),
-+                                       false);
-     Init(isolate);
-     AttachAsUserData(web_contents);
-     InitZoomController(web_contents, options);
-@@ -457,7 +458,8 @@
-   // Initialize zoom controller.
-   InitZoomController(web_contents, options);
- 
--  web_contents->SetUserAgentOverride(GetBrowserContext()->GetUserAgent());
-+  web_contents->SetUserAgentOverride(GetBrowserContext()->GetUserAgent(),
-+                                     false);
- 
-   if (IsGuest()) {
-     NativeWindow* owner_window = nullptr;
-@@ -715,9 +717,10 @@
-   Emit("found-in-page", result);
- }
- 
--bool WebContents::CheckMediaAccessPermission(content::WebContents* web_contents,
--                                             const GURL& security_origin,
--                                             content::MediaStreamType type) {
-+bool WebContents::CheckMediaAccessPermission(
-+    content::RenderFrameHost* render_frame_host,
-+    const GURL& security_origin,
-+    content::MediaStreamType type) {
-   return true;
- }
- 
-@@ -1112,7 +1115,7 @@
- 
-   std::string user_agent;
-   if (options.Get("userAgent", &user_agent))
--    web_contents()->SetUserAgentOverride(user_agent);
-+    web_contents()->SetUserAgentOverride(user_agent, false);
- 
-   std::string extra_headers;
-   if (options.Get("extraHeaders", &extra_headers))
-@@ -1222,7 +1225,7 @@
- 
- void WebContents::SetUserAgent(const std::string& user_agent,
-                                mate::Arguments* args) {
--  web_contents()->SetUserAgentOverride(user_agent);
-+  web_contents()->SetUserAgentOverride(user_agent, false);
- }
- 
- std::string WebContents::GetUserAgent() {
-changed in both
-  base   100644 e907ef9f3e456485e4842aef275ea22aedfc9531 atom/browser/api/atom_api_web_contents.h
-  our    100644 7939f8268aa8c3371623e0c15f3b6001d7f1efa4 atom/browser/api/atom_api_web_contents.h
-  their  100644 7329bb9c5989d61bfc30b70f73cde226edc81f4b atom/browser/api/atom_api_web_contents.h
-@@ -325,7 +325,7 @@
-                  const gfx::Rect& selection_rect,
-                  int active_match_ordinal,
-                  bool final_update) override;
--  bool CheckMediaAccessPermission(content::WebContents* web_contents,
-+  bool CheckMediaAccessPermission(content::RenderFrameHost* render_frame_host,
-                                   const GURL& security_origin,
-                                   content::MediaStreamType type) override;
-   void RequestMediaAccessPermission(
-changed in both
-  base   100644 5b751af7e9170e9a49e394129bb5d3da016717cc atom/browser/atom_browser_client.cc
-  our    100644 57c4ee582405e6d501ec23940ccb10689ecd64a1 atom/browser/atom_browser_client.cc
-  their  100644 a311a90603d796baa2de4fdca33f2a0316ecfeca atom/browser/atom_browser_client.cc
-@@ -24,12 +24,15 @@
- #include "atom/browser/window_list.h"
- #include "atom/common/google_api_key.h"
- #include "atom/common/options_switches.h"
-+#include "atom/common/platform_util.h"
- #include "base/command_line.h"
- #include "base/environment.h"
- #include "base/files/file_util.h"
-+#include "base/memory/scoped_refptr.h"
- #include "base/stl_util.h"
- #include "base/strings/string_number_conversions.h"
- #include "base/strings/string_util.h"
-+#include "base/strings/utf_string_conversions.h"
- #include "chrome/browser/printing/printing_message_filter.h"
- #include "chrome/browser/speech/tts_message_filter.h"
- #include "content/public/browser/browser_ppapi_host.h"
-@@ -44,6 +47,7 @@
- #include "content/public/common/content_switches.h"
- #include "content/public/common/url_constants.h"
- #include "content/public/common/web_preferences.h"
-+#include "net/base/escape.h"
- #include "net/ssl/ssl_cert_request_info.h"
- #include "ppapi/host/ppapi_host.h"
- #include "services/network/public/cpp/resource_request_body.h"
-@@ -495,6 +499,21 @@
- #endif
- }
- 
-+<<<<<<< .our
-+=======
-+scoped_refptr<content::LoginDelegate> AtomBrowserClient::CreateLoginDelegate(
-+    net::AuthChallengeInfo* auth_info,
-+    content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
-+    bool is_main_frame,
-+    const GURL& url,
-+    bool first_auth_attempt,
-+    const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-+        auth_required_callback) {
-+  return base::MakeRefCounted<LoginHandler>(auth_info, web_contents_getter, url,
-+                                            auth_required_callback);
-+}
-+
-+>>>>>>> .their
- brightray::BrowserMainParts* AtomBrowserClient::OverrideCreateBrowserMainParts(
-     const content::MainFunctionParams&) {
-   v8::V8::Initialize();  // Init V8 before creating main parts.
-@@ -547,4 +566,49 @@
-   }
- }
- 
-+void OnOpenExternal(const GURL& escaped_url, bool allowed) {
-+  if (allowed)
-+    platform_util::OpenExternal(
-+#if defined(OS_WIN)
-+        base::UTF8ToUTF16(escaped_url.spec()),
-+#else
-+        escaped_url,
-+#endif
-+        true);
-+}
-+
-+void HandleExternalProtocolInUI(
-+    const GURL& url,
-+    const content::ResourceRequestInfo::WebContentsGetter& web_contents_getter,
-+    bool has_user_gesture) {
-+  content::WebContents* web_contents = web_contents_getter.Run();
-+  if (!web_contents)
-+    return;
-+
-+  auto* permission_helper =
-+      WebContentsPermissionHelper::FromWebContents(web_contents);
-+  if (!permission_helper)
-+    return;
-+
-+  GURL escaped_url(net::EscapeExternalHandlerValue(url.spec()));
-+  auto callback = base::Bind(&OnOpenExternal, escaped_url);
-+  permission_helper->RequestOpenExternalPermission(callback, has_user_gesture,
-+                                                   url);
-+}
-+
-+bool AtomBrowserClient::HandleExternalProtocol(
-+    const GURL& url,
-+    content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
-+    int child_id,
-+    content::NavigationUIData* navigation_data,
-+    bool is_main_frame,
-+    ui::PageTransition page_transition,
-+    bool has_user_gesture) {
-+  BrowserThread::PostTask(
-+      BrowserThread::UI, FROM_HERE,
-+      base::BindOnce(&HandleExternalProtocolInUI, url, web_contents_getter,
-+                     has_user_gesture));
-+  return true;
-+}
-+
- }  // namespace atom
-changed in both
-  base   100644 51cd6ebc6f01b916af0889b7308909a416b92bf0 atom/browser/atom_browser_client.h
-  our    100644 a0284cf3f72e9cd4292b636948f92bb09b97f0ae atom/browser/atom_browser_client.h
-  their  100644 c8d3c549daa73273a49d06207254e12cb794e26b atom/browser/atom_browser_client.h
-@@ -106,6 +106,17 @@
-   void SiteInstanceDeleting(content::SiteInstance* site_instance) override;
-   std::unique_ptr<net::ClientCertStore> CreateClientCertStore(
-       content::ResourceContext* resource_context) override;
-+<<<<<<< .our
-+=======
-+  scoped_refptr<content::LoginDelegate> CreateLoginDelegate(
-+      net::AuthChallengeInfo* auth_info,
-+      content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
-+      bool is_main_frame,
-+      const GURL& url,
-+      bool first_auth_attempt,
-+      const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-+          auth_required_callback) override;
-+>>>>>>> .their
- 
-   // brightray::BrowserClient:
-   brightray::BrowserMainParts* OverrideCreateBrowserMainParts(
-@@ -120,6 +131,14 @@
-   void RenderProcessExited(content::RenderProcessHost* host,
-                            base::TerminationStatus status,
-                            int exit_code) override;
-+  bool HandleExternalProtocol(
-+      const GURL& url,
-+      content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
-+      int child_id,
-+      content::NavigationUIData* navigation_data,
-+      bool is_main_frame,
-+      ui::PageTransition page_transition,
-+      bool has_user_gesture) override;
- 
-  private:
-   struct ProcessPreferences {
-merged
-  result 100644 ac8a0c6f9fd28598bedb46279366ddc5da33fc3f atom/browser/atom_permission_manager.cc
-  our    100644 218404434142cf1b0ab29610e873782712e3a876 atom/browser/atom_permission_manager.cc
-@@ -186,7 +186,6 @@
-   }
- }
- 
--
- void AtomPermissionManager::ResetPermission(content::PermissionType permission,
-                                             const GURL& requesting_origin,
-                                             const GURL& embedding_origin) {}
-@@ -209,4 +208,12 @@
- void AtomPermissionManager::UnsubscribePermissionStatusChange(
-     int subscription_id) {}
- 
-+blink::mojom::PermissionStatus
-+AtomPermissionManager::GetPermissionStatusForFrame(
-+    content::PermissionType permission,
-+    content::RenderFrameHost* render_frame_host,
-+    const GURL& requesting_origin) {
-+  return blink::mojom::PermissionStatus::GRANTED;
-+}
-+
- }  // namespace atom
-merged
-  result 100644 1c5973e528dc22af47fa22eeb3cb50da900b8e18 atom/browser/atom_permission_manager.h
-  our    100644 de23837330535539c2ab93a2bba4796be3f36e1e atom/browser/atom_permission_manager.h
-@@ -66,6 +66,10 @@
-       const base::DictionaryValue* details,
-       const base::Callback<
-           void(const std::vector<blink::mojom::PermissionStatus>&)>& callback);
-+  blink::mojom::PermissionStatus GetPermissionStatusForFrame(
-+      content::PermissionType permission,
-+      content::RenderFrameHost* render_frame_host,
-+      const GURL& requesting_origin) override;
- 
-  protected:
-   void OnPermissionResponse(int request_id,
-merged
-  result 100644 0a59a0dc8f4b6c6ac66b00ad16cab8df53df6964 atom/browser/atom_resource_dispatcher_host_delegate.cc
-  our    100644 934b0ebaa49b711490c58fc73b91985633cba439 atom/browser/atom_resource_dispatcher_host_delegate.cc
-@@ -5,9 +5,7 @@
- #include "atom/browser/atom_resource_dispatcher_host_delegate.h"
- 
- #include "atom/browser/atom_browser_context.h"
--#include "atom/browser/web_contents_permission_helper.h"
- #include "atom/browser/web_contents_preferences.h"
--#include "atom/common/platform_util.h"
- #include "base/strings/utf_string_conversions.h"
- #include "content/public/browser/browser_thread.h"
- #include "content/public/browser/download_manager.h"
-@@ -28,36 +26,6 @@
- 
- namespace {
- 
--void OnOpenExternal(const GURL& escaped_url, bool allowed) {
--  if (allowed)
--    platform_util::OpenExternal(
--#if defined(OS_WIN)
--        base::UTF8ToUTF16(escaped_url.spec()),
--#else
--        escaped_url,
--#endif
--        true);
--}
--
--void HandleExternalProtocolInUI(
--    const GURL& url,
--    const content::ResourceRequestInfo::WebContentsGetter& web_contents_getter,
--    bool has_user_gesture) {
--  content::WebContents* web_contents = web_contents_getter.Run();
--  if (!web_contents)
--    return;
--
--  auto* permission_helper =
--      WebContentsPermissionHelper::FromWebContents(web_contents);
--  if (!permission_helper)
--    return;
--
--  GURL escaped_url(net::EscapeExternalHandlerValue(url.spec()));
--  auto callback = base::Bind(&OnOpenExternal, escaped_url);
--  permission_helper->RequestOpenExternalPermission(callback, has_user_gesture,
--                                                   url);
--}
--
- #if defined(ENABLE_PDF_VIEWER)
- void OnPdfResourceIntercepted(
-     const GURL& original_url,
-@@ -103,16 +71,6 @@
- 
- AtomResourceDispatcherHostDelegate::AtomResourceDispatcherHostDelegate() {}
- 
--bool AtomResourceDispatcherHostDelegate::HandleExternalProtocol(
--    const GURL& url,
--    content::ResourceRequestInfo* info) {
--  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
--                          base::BindOnce(&HandleExternalProtocolInUI, url,
--                                         info->GetWebContentsGetterForRequest(),
--                                         info->HasUserGesture()));
--  return true;
--}
--
- bool AtomResourceDispatcherHostDelegate::ShouldInterceptResourceAsStream(
-     net::URLRequest* request,
-     const std::string& mime_type,
-merged
-  result 100644 252cfa39e9df928f57defee24510a3d26048945d atom/browser/atom_resource_dispatcher_host_delegate.h
-  our    100644 eb91b27921e2bcc9761a6f20c949abfa49fcfd77 atom/browser/atom_resource_dispatcher_host_delegate.h
-@@ -17,8 +17,6 @@
-   AtomResourceDispatcherHostDelegate();
- 
-   // content::ResourceDispatcherHostDelegate:
--  bool HandleExternalProtocol(const GURL& url,
--                              content::ResourceRequestInfo* info) override;
-   bool ShouldInterceptResourceAsStream(net::URLRequest* request,
-                                        const std::string& mime_type,
-                                        GURL* origin,
-changed in both
-  base   100644 80ff986e0be400c13388607abfe48fe51ac6d512 atom/browser/login_handler.h
-  our    100644 e7f1c5be0094506e01d2cccc0073fa864dfefb56 atom/browser/login_handler.h
-  their  100644 4f886ccbfb1984ee63ba97a1b68dd55a4de9af01 atom/browser/login_handler.h
-@@ -9,6 +9,11 @@
- #include "base/memory/ref_counted.h"
- #include "base/memory/weak_ptr.h"
- #include "base/strings/string16.h"
-+<<<<<<< .our
-+=======
-+#include "base/synchronization/lock.h"
-+#include "content/public/browser/login_delegate.h"
-+>>>>>>> .their
- #include "content/public/browser/resource_request_info.h"
- #include "net/base/network_delegate.h"
- 
-@@ -19,7 +24,11 @@
- namespace atom {
- 
- // Handles the HTTP basic auth, must be created on IO thread.
-+<<<<<<< .our
- class LoginHandler : public base::RefCountedThreadSafe<LoginHandler> {
-+=======
-+class LoginHandler : public content::LoginDelegate {
-+>>>>>>> .their
-  public:
-   LoginHandler(net::URLRequest* request,
-                const net::AuthChallengeInfo& auth_info,
-@@ -40,7 +49,12 @@
-   // thread.
-   content::WebContents* GetWebContents() const;
- 
-+<<<<<<< .our
-   const net::AuthChallengeInfo* auth_info() const { return &auth_info_; }
-+=======
-+  // content::LoginDelegate:
-+  void OnRequestCancelled() override;
-+>>>>>>> .their
- 
-  private:
-   friend class base::RefCountedThreadSafe<LoginHandler>;
-merged
-  result 100644 995af450799549915249dd3d95d0c2289414496a atom/browser/native_window.cc
-  our    100644 4ff2bcfcabfd34d8563f9ed213c03655a99dd9c6 atom/browser/native_window.cc
-@@ -60,7 +60,10 @@
- 
- NativeWindow::~NativeWindow() {
-   // It's possible that the windows gets destroyed before it's closed, in that
--  // case we need to ensure the OnWindowClosed message is still notified.
-+  // case we need to ensure the Widget delegate gets destroyed and
-+  // OnWindowClosed message is still notified.
-+  if (widget_->widget_delegate())
-+    widget_->OnNativeWidgetDestroyed();
-   NotifyWindowClosed();
- }
- 
-merged
-  result 100644 45482039a3fdac9a681ac93f5dde17d54e207a85 atom/browser/osr/osr_render_widget_host_view.cc
-  our    100644 4a2a0747fe2e6bf38c8999b80dbfea31e52a17fd atom/browser/osr/osr_render_widget_host_view.cc
-@@ -27,7 +27,7 @@
- #include "content/public/browser/context_factory.h"
- #include "content/public/browser/render_process_host.h"
- #include "media/base/video_frame.h"
--#include "third_party/WebKit/public/platform/WebInputEvent.h"
-+#include "third_party/blink/public/platform/web_input_event.h"
- #include "ui/compositor/compositor.h"
- #include "ui/compositor/layer.h"
- #include "ui/compositor/layer_type.h"
-merged
-  result 100644 f901a86b12dd43182132f60ffc2704167a443709 atom/browser/osr/osr_render_widget_host_view.h
-  our    100644 b81f6310f864c00fea50b1aac49dc89173eaa302 atom/browser/osr/osr_render_widget_host_view.h
-@@ -31,7 +31,7 @@
- #include "content/browser/renderer_host/render_widget_host_impl.h"
- #include "content/browser/renderer_host/render_widget_host_view_base.h"
- #include "content/browser/web_contents/web_contents_view.h"
--#include "third_party/WebKit/public/platform/WebVector.h"
-+#include "third_party/blink/public/platform/web_vector.h"
- #include "third_party/skia/include/core/SkBitmap.h"
- #include "ui/base/ime/text_input_client.h"
- #include "ui/compositor/compositor.h"
-merged
-  result 100644 e621d99aaf5467ddbe65373f613f51f53f8d2a1b atom/browser/osr/osr_web_contents_view.cc
-  our    100644 c8223df0d8c6f3436d323059686e42684ff98462 atom/browser/osr/osr_web_contents_view.cc
-@@ -7,7 +7,7 @@
- #include "atom/common/api/api_messages.h"
- #include "content/browser/web_contents/web_contents_impl.h"
- #include "content/public/browser/render_view_host.h"
--#include "third_party/WebKit/public/platform/WebScreenInfo.h"
-+#include "third_party/blink/public/platform/web_screen_info.h"
- #include "ui/display/screen.h"
- 
- namespace atom {
-merged
-  result 100644 b32c14356d4dc104e1e779696ca07c1f6c574e59 atom/browser/special_storage_policy.cc
-  our    100644 7f94bcd298bc36fb89aadc16a124a239979edb53 atom/browser/special_storage_policy.cc
-@@ -4,6 +4,9 @@
- 
- #include "atom/browser/special_storage_policy.h"
- 
-+#include "base/bind.h"
-+#include "base/callback.h"
-+
- namespace atom {
- 
- SpecialStoragePolicy::SpecialStoragePolicy() {}
-@@ -34,8 +37,9 @@
-   return false;
- }
- 
--bool SpecialStoragePolicy::ShouldDeleteCookieOnExit(const GURL& origin) {
--  return false;
-+storage::SpecialStoragePolicy::DeleteCookiePredicate
-+SpecialStoragePolicy::CreateDeleteCookieOnExitPredicate() {
-+  return storage::SpecialStoragePolicy::DeleteCookiePredicate();
- }
- 
- }  // namespace atom
-merged
-  result 100644 ce00ebbc31f6384dbeb9c60208aa51ba410bbc01 atom/browser/special_storage_policy.h
-  our    100644 7182bc38de9ccfd630ecae7d776035deba532235 atom/browser/special_storage_policy.h
-@@ -20,7 +20,8 @@
-   bool HasIsolatedStorage(const GURL& origin) override;
-   bool IsStorageSessionOnly(const GURL& origin) override;
-   bool HasSessionOnlyOrigins() override;
--  bool ShouldDeleteCookieOnExit(const GURL& origin) override;
-+  storage::SpecialStoragePolicy::DeleteCookiePredicate
-+  CreateDeleteCookieOnExitPredicate() override;
- 
-  protected:
-   ~SpecialStoragePolicy() override;
-merged
-  result 100644 32f05baabbb9085383521101bb55ea432c4ea542 atom/common/api/atom_bindings.cc
-  our    100644 3dba3d63673ca8eb02044bd1335a3095f0194971 atom/common/api/atom_bindings.cc
-@@ -55,7 +55,6 @@
-   dict.SetMethod("hang", &Hang);
-   dict.SetMethod("log", &Log);
-   dict.SetMethod("getHeapStatistics", &GetHeapStatistics);
--  dict.SetMethod("getProcessMemoryInfo", &GetProcessMemoryInfo);
-   dict.SetMethod("getCreationTime", &GetCreationTime);
-   dict.SetMethod("getSystemMemoryInfo", &GetSystemMemoryInfo);
-   dict.SetMethod("getCPUUsage", base::Bind(&AtomBindings::GetCPUUsage,
-@@ -160,26 +159,6 @@
- }
- 
- // static
--v8::Local<v8::Value> AtomBindings::GetProcessMemoryInfo(v8::Isolate* isolate) {
--  auto metrics = base::ProcessMetrics::CreateCurrentProcessMetrics();
--
--  mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
--  dict.SetHidden("simple", true);
--  dict.Set("workingSetSize",
--           static_cast<double>(metrics->GetWorkingSetSize() >> 10));
--  dict.Set("peakWorkingSetSize",
--           static_cast<double>(metrics->GetPeakWorkingSetSize() >> 10));
--
--  size_t private_bytes, shared_bytes;
--  if (metrics->GetMemoryBytes(&private_bytes, &shared_bytes)) {
--    dict.Set("privateBytes", static_cast<double>(private_bytes >> 10));
--    dict.Set("sharedBytes", static_cast<double>(shared_bytes >> 10));
--  }
--
--  return dict.GetHandle();
--}
--
--// static
- v8::Local<v8::Value> AtomBindings::GetCreationTime(v8::Isolate* isolate) {
-   auto timeValue = base::CurrentProcessInfo::CreationTime();
-   if (timeValue.is_null()) {
-merged
-  result 100644 592ca08ba38338c975a5298feed0fd663441f452 atom/common/api/atom_bindings.h
-  our    100644 ba8385c979b15286fd7647582e7d0aee93e1974e atom/common/api/atom_bindings.h
-@@ -36,7 +36,6 @@
-   static void Crash();
-   static void Hang();
-   static v8::Local<v8::Value> GetHeapStatistics(v8::Isolate* isolate);
--  static v8::Local<v8::Value> GetProcessMemoryInfo(v8::Isolate* isolate);
-   static v8::Local<v8::Value> GetCreationTime(v8::Isolate* isolate);
-   static v8::Local<v8::Value> GetSystemMemoryInfo(v8::Isolate* isolate,
-                                                   mate::Arguments* args);
-merged
-  result 100644 e5272aeb4e7b8cd6a8d335454e23c40448400401 atom/common/api/features.cc
-  our    100644 72ddba0479f952b9d0d8ce80d83951ec9864669b atom/common/api/features.cc
-@@ -2,8 +2,10 @@
- // Use of this source code is governed by the MIT license that can be
- // found in the LICENSE file.
- 
--#include "atom/common/node_includes.h"
- #include "native_mate/dictionary.h"
-+// clang-format off
-+#include "atom/common/node_includes.h"  // NOLINT(build/include_alpha)
-+// clang-format on
- 
- namespace {
- 
-merged
-  result 100644 7b9d7b847fd15d28e4052242da25db8e97106137 atom/common/api/remote_object_freer.cc
-  our    100644 8afe8b9a32bc4ba4d5cdfc66ecf7036b8553cb48 atom/common/api/remote_object_freer.cc
-@@ -8,7 +8,7 @@
- #include "base/strings/utf_string_conversions.h"
- #include "base/values.h"
- #include "content/public/renderer/render_frame.h"
--#include "third_party/WebKit/public/web/WebLocalFrame.h"
-+#include "third_party/blink/public/web/web_local_frame.h"
- 
- using blink::WebLocalFrame;
- 
-merged
-  result 100644 300870818b9fdafd6faade02f307674aabf63f23 atom/common/chrome_version.h
-  our    100644 35666ab599410942900abd2a7d9ad4b3e5c138af atom/common/chrome_version.h
-@@ -8,7 +8,7 @@
- #ifndef ATOM_COMMON_CHROME_VERSION_H_
- #define ATOM_COMMON_CHROME_VERSION_H_
- 
--#define CHROME_VERSION_STRING "66.0.3359.181"
-+#define CHROME_VERSION_STRING "67.0.3396.99"
- #define CHROME_VERSION "v" CHROME_VERSION_STRING
- 
- #endif  // ATOM_COMMON_CHROME_VERSION_H_
-merged
-  result 100644 318e4ab5968a97ec27c57fce8f023fe86f8a846c atom/common/crash_reporter/crash_reporter_win.cc
-  our    100644 c574da71c9de9bd8c7b7cad57d3a0f84708fb97c atom/common/crash_reporter/crash_reporter_win.cc
-@@ -112,7 +112,8 @@
-   // mov imm64, rax
-   record->thunk[0] = 0x48;
-   record->thunk[1] = 0xb8;
--  void* handler = &CrashForExceptionInNonABICompliantCodeRange;
-+  void* handler =
-+      reinterpret_cast<void*>(&CrashForExceptionInNonABICompliantCodeRange);
-   memcpy(&record->thunk[2], &handler, 8);
- 
-   // jmp rax
-merged
-  result 100644 1f42ad735a01d550f1bca36010b2fbc2d00bdb3d atom/common/keyboard_util.cc
-  our    100644 d0a12cb6d91b9688c1bed496e64d6bbaccaf244a atom/common/keyboard_util.cc
-@@ -7,7 +7,7 @@
- #include "atom/common/keyboard_util.h"
- #include "base/strings/string_number_conversions.h"
- #include "base/strings/string_util.h"
--#include "third_party/WebKit/public/platform/WebInputEvent.h"
-+#include "third_party/blink/public/platform/web_input_event.h"
- #include "ui/events/event_constants.h"
- 
- namespace atom {
-merged
-  result 100644 6ea5a6e49fe89b11d6afac096a340caf69741a65 atom/common/native_mate_converters/blink_converter.cc
-  our    100644 f52ec9af2e405f3969453ac22cb402436610c317 atom/common/native_mate_converters/blink_converter.cc
-@@ -13,11 +13,11 @@
- #include "base/strings/utf_string_conversions.h"
- #include "content/public/browser/native_web_keyboard_event.h"
- #include "native_mate/dictionary.h"
--#include "third_party/WebKit/public/platform/WebInputEvent.h"
--#include "third_party/WebKit/public/platform/WebMouseEvent.h"
--#include "third_party/WebKit/public/platform/WebMouseWheelEvent.h"
--#include "third_party/WebKit/public/web/WebDeviceEmulationParams.h"
--#include "third_party/WebKit/public/web/WebFindOptions.h"
-+#include "third_party/blink/public/platform/web_input_event.h"
-+#include "third_party/blink/public/platform/web_mouse_event.h"
-+#include "third_party/blink/public/platform/web_mouse_wheel_event.h"
-+#include "third_party/blink/public/web/web_device_emulation_params.h"
-+#include "third_party/blink/public/web/web_find_options.h"
- #include "ui/base/clipboard/clipboard.h"
- #include "ui/events/keycodes/dom/keycode_converter.h"
- #include "ui/events/keycodes/keyboard_code_conversion.h"
-merged
-  result 100644 ecec11f44549d4872dbfe00ec88a91cc858513fa atom/common/native_mate_converters/blink_converter.h
-  our    100644 5e6315d9b2499fd1e0853b8bd4258b887d222b21 atom/common/native_mate_converters/blink_converter.h
-@@ -6,9 +6,9 @@
- #define ATOM_COMMON_NATIVE_MATE_CONVERTERS_BLINK_CONVERTER_H_
- 
- #include "native_mate/converter.h"
--#include "third_party/WebKit/public/platform/WebCache.h"
--#include "third_party/WebKit/public/platform/WebInputEvent.h"
--#include "third_party/WebKit/public/web/WebContextMenuData.h"
-+#include "third_party/blink/public/platform/web_cache.h"
-+#include "third_party/blink/public/platform/web_input_event.h"
-+#include "third_party/blink/public/web/web_context_menu_data.h"
- 
- namespace blink {
- class WebMouseEvent;
-merged
-  result 100644 f02c0a976b91e51c16ce7703e38798eb406b23a0 atom/common/native_mate_converters/content_converter.h
-  our    100644 18a2d5f1a7c8d0f33cb35e575bae7a4b2740d7cd atom/common/native_mate_converters/content_converter.h
-@@ -12,7 +12,7 @@
- #include "content/public/common/referrer.h"
- #include "content/public/common/stop_find_action.h"
- #include "native_mate/converter.h"
--#include "third_party/WebKit/public/platform/modules/permissions/permission_status.mojom.h"
-+#include "third_party/blink/public/platform/modules/permissions/permission_status.mojom.h"
- 
- namespace content {
- struct ContextMenuParams;
-merged
-  result 100644 63ee0bdcefbb153152045279b078b2181e2e29fe atom/common/platform_util_linux.cc
-  our    100644 8fad8609342a81f46ea2608b3923f85af2d4308b atom/common/platform_util_linux.cc
-@@ -32,16 +32,15 @@
-   if (!process.IsValid())
-     return false;
- 
--  if (!wait_for_exit) {
--    base::EnsureProcessGetsReaped(process.Pid());
--    return true;
-+  if (wait_for_exit) {
-+    int exit_code = -1;
-+    if (!process.WaitForExit(&exit_code))
-+      return false;
-+    return (exit_code == 0);
-   }
- 
--  int exit_code = -1;
--  if (!process.WaitForExit(&exit_code))
--    return false;
--
--  return (exit_code == 0);
-+  base::EnsureProcessGetsReaped(std::move(process));
-+  return true;
- }
- 
- bool XDGUtil(const std::string& util,
-merged
-  result 100644 1cc8fc5dfc7b1ef90cbce44ed3c53c3f92e70053 atom/renderer/api/atom_api_renderer_ipc.cc
-  our    100644 3e48a4f7d0c11f40e6360b0acc2c83c38e671319 atom/renderer/api/atom_api_renderer_ipc.cc
-@@ -10,7 +10,7 @@
- #include "atom/common/node_includes.h"
- #include "content/public/renderer/render_frame.h"
- #include "native_mate/dictionary.h"
--#include "third_party/WebKit/public/web/WebLocalFrame.h"
-+#include "third_party/blink/public/web/web_local_frame.h"
- 
- using blink::WebLocalFrame;
- using content::RenderFrame;
-merged
-  result 100644 059f7f7017b4412cd19cd6cba248dac3d4ba3103 atom/renderer/api/atom_api_spell_check_client.cc
-  our    100644 5f7985be2f820fdb0a9b7a26032e7fc83ed34952 atom/renderer/api/atom_api_spell_check_client.cc
-@@ -13,8 +13,8 @@
- #include "chrome/renderer/spellchecker/spellcheck_worditerator.h"
- #include "native_mate/converter.h"
- #include "native_mate/dictionary.h"
--#include "third_party/WebKit/public/web/WebTextCheckingCompletion.h"
--#include "third_party/WebKit/public/web/WebTextCheckingResult.h"
-+#include "third_party/blink/public/web/web_text_checking_completion.h"
-+#include "third_party/blink/public/web/web_text_checking_result.h"
- #include "third_party/icu/source/common/unicode/uscript.h"
- 
- namespace atom {
-merged
-  result 100644 b908571429ab8e69c113860ee8b3ae02a49fb340 atom/renderer/api/atom_api_spell_check_client.h
-  our    100644 c8b5f7f4ab164307f735cc0bc0651435a42c3034 atom/renderer/api/atom_api_spell_check_client.h
-@@ -12,9 +12,9 @@
- #include "base/memory/weak_ptr.h"
- #include "chrome/renderer/spellchecker/spellcheck_worditerator.h"
- #include "native_mate/scoped_persistent.h"
--#include "third_party/WebKit/public/platform/WebSpellCheckPanelHostClient.h"
--#include "third_party/WebKit/public/platform/WebVector.h"
--#include "third_party/WebKit/public/web/WebTextCheckClient.h"
-+#include "third_party/blink/public/platform/web_spell_check_panel_host_client.h"
-+#include "third_party/blink/public/platform/web_vector.h"
-+#include "third_party/blink/public/web/web_text_check_client.h"
- 
- namespace blink {
- struct WebTextCheckingResult;
-merged
-  result 100644 0e96bc135053a3d9293dde49428c9ab0eb346157 atom/renderer/api/atom_api_web_frame.cc
-  our    100644 f0f7ef249d73876f7107d3d3865e8fc71ee33945 atom/renderer/api/atom_api_web_frame.cc
-@@ -18,17 +18,17 @@
- #include "content/public/renderer/render_view.h"
- #include "native_mate/dictionary.h"
- #include "native_mate/object_template_builder.h"
--#include "third_party/WebKit/Source/platform/weborigin/SchemeRegistry.h"
--#include "third_party/WebKit/public/platform/WebCache.h"
--#include "third_party/WebKit/public/web/WebDocument.h"
--#include "third_party/WebKit/public/web/WebElement.h"
--#include "third_party/WebKit/public/web/WebFrameWidget.h"
--#include "third_party/WebKit/public/web/WebImeTextSpan.h"
--#include "third_party/WebKit/public/web/WebInputMethodController.h"
--#include "third_party/WebKit/public/web/WebLocalFrame.h"
--#include "third_party/WebKit/public/web/WebScriptExecutionCallback.h"
--#include "third_party/WebKit/public/web/WebScriptSource.h"
--#include "third_party/WebKit/public/web/WebView.h"
-+#include "third_party/blink/public/platform/web_cache.h"
-+#include "third_party/blink/public/web/web_document.h"
-+#include "third_party/blink/public/web/web_element.h"
-+#include "third_party/blink/public/web/web_frame_widget.h"
-+#include "third_party/blink/public/web/web_ime_text_span.h"
-+#include "third_party/blink/public/web/web_input_method_controller.h"
-+#include "third_party/blink/public/web/web_local_frame.h"
-+#include "third_party/blink/public/web/web_script_execution_callback.h"
-+#include "third_party/blink/public/web/web_script_source.h"
-+#include "third_party/blink/public/web/web_view.h"
-+#include "third_party/blink/renderer/platform/weborigin/scheme_registry.h"
- 
- #include "atom/common/node_includes.h"
- 
-merged
-  result 100644 9fbdb165e69728dd7d8301eaa79abfd85bf5860f atom/renderer/api/atom_api_web_frame.h
-  our    100644 4cc6386abcb41cfa29fdc002f6fb267329bb112d atom/renderer/api/atom_api_web_frame.h
-@@ -11,7 +11,7 @@
- 
- #include "native_mate/handle.h"
- #include "native_mate/wrappable.h"
--#include "third_party/WebKit/public/platform/WebCache.h"
-+#include "third_party/blink/public/platform/web_cache.h"
- 
- namespace blink {
- class WebLocalFrame;
-merged
-  result 100644 7316fdf0bd651cd5f563584095aaf97da6c4d6ae atom/renderer/atom_autofill_agent.cc
-  our    100644 5a8d712a82aaafc37880efea3fb4bae23b7d0c4b atom/renderer/atom_autofill_agent.cc
-@@ -9,12 +9,12 @@
- #include "atom/common/api/api_messages.h"
- #include "content/public/renderer/render_frame.h"
- #include "content/public/renderer/render_view.h"
--#include "third_party/WebKit/public/platform/WebKeyboardEvent.h"
--#include "third_party/WebKit/public/platform/WebString.h"
--#include "third_party/WebKit/public/web/WebDocument.h"
--#include "third_party/WebKit/public/web/WebLocalFrame.h"
--#include "third_party/WebKit/public/web/WebOptionElement.h"
--#include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
-+#include "third_party/blink/public/platform/web_keyboard_event.h"
-+#include "third_party/blink/public/platform/web_string.h"
-+#include "third_party/blink/public/web/web_document.h"
-+#include "third_party/blink/public/web/web_local_frame.h"
-+#include "third_party/blink/public/web/web_option_element.h"
-+#include "third_party/blink/public/web/web_user_gesture_indicator.h"
- #include "ui/events/keycodes/keyboard_codes.h"
- #include "ui/gfx/geometry/rect_f.h"
- 
-merged
-  result 100644 d16d64e57c1712da5c5b4e9200cd1ee5fccb6772 atom/renderer/atom_autofill_agent.h
-  our    100644 3dbacb21d3c1ba0665e0e86edc8ad7f19e2e19c9 atom/renderer/atom_autofill_agent.h
-@@ -10,10 +10,10 @@
- #include "base/memory/weak_ptr.h"
- #include "content/public/renderer/render_frame_observer.h"
- #include "content/public/renderer/render_view_observer.h"
--#include "third_party/WebKit/public/web/WebAutofillClient.h"
--#include "third_party/WebKit/public/web/WebFormControlElement.h"
--#include "third_party/WebKit/public/web/WebInputElement.h"
--#include "third_party/WebKit/public/web/WebNode.h"
-+#include "third_party/blink/public/web/web_autofill_client.h"
-+#include "third_party/blink/public/web/web_form_control_element.h"
-+#include "third_party/blink/public/web/web_input_element.h"
-+#include "third_party/blink/public/web/web_node.h"
- 
- namespace atom {
- 
-merged
-  result 100644 5f5292bf310f1665fe7a471f1b0b1d50465f3fbc atom/renderer/atom_render_frame_observer.cc
-  our    100644 ea2355fd968339600ae8093524f1c3dcfd2f4ff3 atom/renderer/atom_render_frame_observer.cc
-@@ -19,12 +19,12 @@
- #include "native_mate/dictionary.h"
- #include "net/base/net_module.h"
- #include "net/grit/net_resources.h"
--#include "third_party/WebKit/public/web/WebDocument.h"
--#include "third_party/WebKit/public/web/WebDraggableRegion.h"
--#include "third_party/WebKit/public/web/WebElement.h"
--#include "third_party/WebKit/public/web/WebKit.h"
--#include "third_party/WebKit/public/web/WebLocalFrame.h"
--#include "third_party/WebKit/public/web/WebScriptSource.h"
-+#include "third_party/blink/public/web/web_document.h"
-+#include "third_party/blink/public/web/web_draggable_region.h"
-+#include "third_party/blink/public/web/web_element.h"
-+#include "third_party/blink/public/web/blink.h"
-+#include "third_party/blink/public/web/web_local_frame.h"
-+#include "third_party/blink/public/web/web_script_source.h"
- #include "ui/base/resource/resource_bundle.h"
- 
- namespace atom {
-merged
-  result 100644 b45a7a381ebeceb3e0160eb24478f4c9d232fb76 atom/renderer/atom_render_frame_observer.h
-  our    100644 e774741c019956a3bff00db2f6d2b133bf1be6de atom/renderer/atom_render_frame_observer.h
-@@ -8,7 +8,7 @@
- #include "atom/renderer/renderer_client_base.h"
- #include "base/strings/string16.h"
- #include "content/public/renderer/render_frame_observer.h"
--#include "third_party/WebKit/public/web/WebLocalFrame.h"
-+#include "third_party/blink/public/web/web_local_frame.h"
- 
- namespace base {
- class ListValue;
-merged
-  result 100644 89abe602a431a0284d837d26fb2de1440d36db9a atom/renderer/atom_render_view_observer.cc
-  our    100644 1a425dfa1d40953efb192c3405baff61e96cb734 atom/renderer/atom_render_view_observer.cc
-@@ -7,7 +7,7 @@
- #include "atom/common/api/api_messages.h"
- #include "content/public/renderer/render_view.h"
- #include "ipc/ipc_message_macros.h"
--#include "third_party/WebKit/public/web/WebView.h"
-+#include "third_party/blink/public/web/web_view.h"
- 
- namespace atom {
- 
-merged
-  result 100644 e2ddfbde244a20e1d0ed747933f0a9b325b59ac3 atom/renderer/atom_renderer_client.cc
-  our    100644 204f17c2cf0d2d4ec4a71bdbecfcd1cbdc5fc8be atom/renderer/atom_renderer_client.cc
-@@ -18,8 +18,8 @@
- #include "base/command_line.h"
- #include "content/public/renderer/render_frame.h"
- #include "native_mate/dictionary.h"
--#include "third_party/WebKit/public/web/WebDocument.h"
--#include "third_party/WebKit/public/web/WebLocalFrame.h"
-+#include "third_party/blink/public/web/web_document.h"
-+#include "third_party/blink/public/web/web_local_frame.h"
- 
- #include "atom/common/node_includes.h"
- #include "atom_natives.h"  // NOLINT: This file is generated with js2c
-merged
-  result 100644 9c153c02fd29b23c3de4a0009a8155f1ced21a4f atom/renderer/atom_sandboxed_renderer_client.cc
-  our    100644 6e29fe45a69f44856d7fca449ec1be4eaf6970a2 atom/renderer/atom_sandboxed_renderer_client.cc
-@@ -20,8 +20,8 @@
- #include "chrome/renderer/printing/print_web_view_helper.h"
- #include "content/public/renderer/render_frame.h"
- #include "native_mate/dictionary.h"
--#include "third_party/WebKit/public/web/WebDocument.h"
--#include "third_party/WebKit/public/web/WebKit.h"
-+#include "third_party/blink/public/web/web_document.h"
-+#include "third_party/blink/public/web/blink.h"
- 
- #include "atom/common/node_includes.h"
- #include "atom_natives.h"  // NOLINT: This file is generated with js2c
-@@ -151,7 +151,6 @@
-   b.SetMethod("getPid", &base::GetCurrentProcId);
-   b.SetMethod("getResourcesPath", &NodeBindings::GetHelperResourcesPath);
-   b.SetMethod("getHeapStatistics", &AtomBindings::GetHeapStatistics);
--  b.SetMethod("getProcessMemoryInfo", &AtomBindings::GetProcessMemoryInfo);
-   b.SetMethod("getSystemMemoryInfo", &AtomBindings::GetSystemMemoryInfo);
-   b.SetMethod("getCPUUsage", base::Bind(&AtomBindings::GetCPUUsage,
-                                         base::Unretained(metrics_.get())));
-merged
-  result 100644 ecf76347b29d7ddfe20d0a5b03746535859eca01 atom/renderer/content_settings_observer.cc
-  our    100644 e5a50fa5e20d7e1929673f1ee8a389429672c7e1 atom/renderer/content_settings_observer.cc
-@@ -5,9 +5,9 @@
- #include "atom/renderer/content_settings_observer.h"
- 
- #include "content/public/renderer/render_frame.h"
--#include "third_party/WebKit/public/platform/URLConversion.h"
--#include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
--#include "third_party/WebKit/public/web/WebLocalFrame.h"
-+#include "third_party/blink/public/platform/url_conversion.h"
-+#include "third_party/blink/public/platform/web_security_origin.h"
-+#include "third_party/blink/public/web/web_local_frame.h"
- 
- namespace atom {
- 
-merged
-  result 100644 2267550e8a5a3d95293d6639c5403667dfdc8475 atom/renderer/content_settings_observer.h
-  our    100644 c540226d19476c6b292be02c5c84db26aaf11c92 atom/renderer/content_settings_observer.h
-@@ -7,7 +7,7 @@
- 
- #include "base/compiler_specific.h"
- #include "content/public/renderer/render_frame_observer.h"
--#include "third_party/WebKit/public/platform/WebContentSettingsClient.h"
-+#include "third_party/blink/public/platform/web_content_settings_client.h"
- 
- namespace atom {
- 
-merged
-  result 100644 e188951d14a4483c57fd281b11bb2e90ae5eefd7 atom/renderer/renderer_client_base.cc
-  our    100644 69490420ef5b8f87e7cb8fd97ebd5ec4509fa1ae atom/renderer/renderer_client_base.cc
-@@ -26,13 +26,13 @@
- #include "content/public/renderer/render_frame.h"
- #include "content/public/renderer/render_view.h"
- #include "native_mate/dictionary.h"
--#include "third_party/WebKit/Source/platform/weborigin/SchemeRegistry.h"
--#include "third_party/WebKit/public/web/WebCustomElement.h"  // NOLINT(build/include_alpha)
--#include "third_party/WebKit/public/web/WebFrameWidget.h"
--#include "third_party/WebKit/public/web/WebKit.h"
--#include "third_party/WebKit/public/web/WebPluginParams.h"
--#include "third_party/WebKit/public/web/WebScriptSource.h"
--#include "third_party/WebKit/public/web/WebSecurityPolicy.h"
-+#include "third_party/blink/renderer/platform/weborigin/scheme_registry.h"
-+#include "third_party/blink/public/web/blink.h"
-+#include "third_party/blink/public/web/web_custom_element.h"  // NOLINT(build/include_alpha)
-+#include "third_party/blink/public/web/web_frame_widget.h"
-+#include "third_party/blink/public/web/web_plugin_params.h"
-+#include "third_party/blink/public/web/web_script_source.h"
-+#include "third_party/blink/public/web/web_security_policy.h"
- 
- #if defined(OS_MACOSX)
- #include "base/strings/sys_string_conversions.h"
-@@ -85,7 +85,7 @@
-   std::vector<std::string> standard_schemes_list =
-       ParseSchemesCLISwitch(switches::kStandardSchemes);
-   for (const std::string& scheme : standard_schemes_list)
--    url::AddStandardScheme(scheme.c_str(), url::SCHEME_WITHOUT_PORT);
-+    url::AddStandardScheme(scheme.c_str(), url::SCHEME_WITH_HOST);
-   isolated_world_ = base::CommandLine::ForCurrentProcess()->HasSwitch(
-       switches::kContextIsolation);
- }
-merged
-  result 100644 3c346fa4b1db1f176c05e4769f92b2f444bb6e18 atom/renderer/renderer_client_base.h
-  our    100644 f04be0a0fb555fce88aa006c6c6623cc8730d4ed atom/renderer/renderer_client_base.h
-@@ -9,7 +9,7 @@
- #include <vector>
- 
- #include "content/public/renderer/content_renderer_client.h"
--#include "third_party/WebKit/public/web/WebLocalFrame.h"
-+#include "third_party/blink/public/web/web_local_frame.h"
- 
- namespace atom {
- 
-merged
-  result 100644 80de85ed7c74290716d53dbeb6621d61a118c795 brightray/brightray.gyp
-  our    100644 f233257e88bad8f0ff703034bea02e4715a5b5b9 brightray/brightray.gyp
-@@ -23,7 +23,7 @@
-         '<(libchromiumcontent_src_dir)/third_party/skia/include/core',
-         '<(libchromiumcontent_src_dir)/third_party/skia/include/gpu',
-         '<(libchromiumcontent_src_dir)/third_party/mojo/src',
--        '<(libchromiumcontent_src_dir)/third_party/WebKit',
-+        '<(libchromiumcontent_src_dir)/third_party/blink',
-         '<(libchromiumcontent_src_dir)/third_party/khronos',
-         '<(libchromiumcontent_src_dir)/third_party/protobuf/src',
-         '<(libchromiumcontent_dir)/gen',
-@@ -41,9 +41,9 @@
-           '<(libchromiumcontent_src_dir)/third_party/icu/source/common',
-           '<(libchromiumcontent_src_dir)/third_party/mojo/src',
-           '<(libchromiumcontent_src_dir)/third_party/khronos',
--          '<(libchromiumcontent_src_dir)/third_party/WebKit',
-+          '<(libchromiumcontent_src_dir)/third_party/blink',
-           '<(libchromiumcontent_dir)/gen',
--          '<(libchromiumcontent_dir)/gen/third_party/WebKit',
-+          '<(libchromiumcontent_dir)/gen/third_party/blink',
-         ],
-       },
-       'defines': [
-merged
-  result 100644 93b8cef96d4fd2848e66f9b96e93223186785060 brightray/browser/browser_client.cc
-  our    100644 b2b7d36301f40fbb3c2154ae83d475027a3bb15b brightray/browser/browser_client.cc
-@@ -39,7 +39,8 @@
- void BrowserClient::SetApplicationLocale(const std::string& locale) {
-   DCHECK_CURRENTLY_ON(BrowserThread::UI);
- 
--  if (!BrowserThread::PostTask(
-+  if (!BrowserThread::IsThreadInitialized(BrowserThread::IO) ||
-+      !BrowserThread::PostTask(
-           BrowserThread::IO, FROM_HERE,
-           base::BindOnce(&SetApplicationLocaleOnIOThread, locale))) {
-     g_io_thread_application_locale.Get() = locale;
-merged
-  result 100644 10741b78392030d6d353c8f5f7c1f86bdd4a6077 brightray/browser/io_thread.cc
-  our    100644 4528cf7bfa57623ccddff71b346628a706e1a2e6 brightray/browser/io_thread.cc
-@@ -5,7 +5,7 @@
- #include "brightray/browser/io_thread.h"
- 
- #include "content/public/browser/browser_thread.h"
--#include "net/proxy_resolution/proxy_service.h"
-+#include "net/proxy_resolution/proxy_resolution_service.h"
- #include "net/url_request/url_request_context.h"
- #include "net/url_request/url_request_context_builder.h"
- #include "net/url_request/url_request_context_getter.h"
-@@ -36,14 +36,12 @@
-   url_request_context_getter_->AddRef();
- 
- #if defined(USE_NSS_CERTS)
--  net::SetMessageLoopForNSSHttpIO();
-   net::SetURLRequestContextForNSSHttpIO(url_request_context_.get());
- #endif
- }
- 
- void IOThread::CleanUp() {
- #if defined(USE_NSS_CERTS)
--  net::ShutdownNSSHttpIO();
-   net::SetURLRequestContextForNSSHttpIO(nullptr);
- #endif
-   // Explicitly release before the IO thread gets destroyed.
-merged
-  result 100644 cc1d0f082012fafe74f5c28b85cd1f7441e2ae6c brightray/browser/net/require_ct_delegate.cc
-  our    100644 b3c57650bf00dd33adec13bd59adce7ea194fe23 brightray/browser/net/require_ct_delegate.cc
-@@ -23,7 +23,9 @@
- }
- 
- RequireCTDelegate::CTRequirementLevel RequireCTDelegate::IsCTRequiredForHost(
--    const std::string& host) {
-+    const std::string& host,
-+    const net::X509Certificate* chain,
-+    const net::HashValueVector& hashes) {
-   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-   if (!ct_excluded_hosts_.empty() &&
-       (ct_excluded_hosts_.find(host) != ct_excluded_hosts_.end()))
-merged
-  result 100644 f1fb2c144ad1d708c9565423b1b5f77b2a126099 brightray/browser/net/require_ct_delegate.h
-  our    100644 6fcb1c63f106b367a31946f1888171455a63d31b brightray/browser/net/require_ct_delegate.h
-@@ -22,7 +22,10 @@
-   void ClearCTExcludedHostsList();
- 
-   // net::TransportSecurityState::RequireCTDelegate:
--  CTRequirementLevel IsCTRequiredForHost(const std::string& host) override;
-+  CTRequirementLevel IsCTRequiredForHost(
-+      const std::string& host,
-+      const net::X509Certificate* chain,
-+      const net::HashValueVector& hashes) override;
- 
-  private:
-   std::set<std::string> ct_excluded_hosts_;
-changed in both
-  base   100644 6bad48ee517b659745e8ba41e1379c5ec9a0a37c brightray/browser/url_request_context_getter.cc
-  our    100644 c07ba80cbc522030af580adc5d8676ed31d592d1 brightray/browser/url_request_context_getter.cc
-  their  100644 2fa3e628d1d13392b821a8d3a46fc9f4c4108e1d brightray/browser/url_request_context_getter.cc
-@@ -39,10 +39,12 @@
- #include "net/proxy_resolution/pac_file_fetcher_impl.h"
- #include "net/proxy_resolution/proxy_config.h"
- #include "net/proxy_resolution/proxy_config_service.h"
--#include "net/proxy_resolution/proxy_service.h"
-+#include "net/proxy_resolution/proxy_config_with_annotation.h"
-+#include "net/proxy_resolution/proxy_resolution_service.h"
- #include "net/ssl/channel_id_service.h"
- #include "net/ssl/default_channel_id_store.h"
- #include "net/ssl/ssl_config_service_defaults.h"
-+#include "net/traffic_annotation/network_traffic_annotation.h"
- #include "net/url_request/data_protocol_handler.h"
- #include "net/url_request/file_protocol_handler.h"
- #include "net/url_request/static_http_user_agent_settings.h"
-@@ -268,13 +270,17 @@
-       proxy_config.proxy_rules().bypass_rules.ParseFromString(
-           command_line.GetSwitchValueASCII(switches::kProxyBypassList));
-       storage_->set_proxy_resolution_service(
--          net::ProxyResolutionService::CreateFixed(proxy_config));
-+          net::ProxyResolutionService::CreateFixed(
-+              net::ProxyConfigWithAnnotation(proxy_config,
-+                                             NO_TRAFFIC_ANNOTATION_YET)));
-     } else if (command_line.HasSwitch(switches::kProxyPacUrl)) {
-       auto proxy_config = net::ProxyConfig::CreateFromCustomPacURL(
-           GURL(command_line.GetSwitchValueASCII(switches::kProxyPacUrl)));
-       proxy_config.set_pac_mandatory(true);
-       storage_->set_proxy_resolution_service(
--          net::ProxyResolutionService::CreateFixed(proxy_config));
-+          net::ProxyResolutionService::CreateFixed(
-+              net::ProxyConfigWithAnnotation(proxy_config,
-+                                             NO_TRAFFIC_ANNOTATION_YET)));
-     } else {
-       storage_->set_proxy_resolution_service(
-           net::ProxyResolutionService::CreateUsingSystemProxyResolver(
-merged
-  result 100644 a392661a63c0f8f92a2c6f2b98870ec5848e66c2 build/args/all.gn
-  our    100644 8f27ad1130e0cd28e43542a867b289e1bdf63f10 build/args/all.gn
-@@ -6,6 +6,5 @@
- v8_promise_internal_field_count = 1
- v8_typed_array_max_size_in_heap = 0
- 
--enable_widevine = true
- proprietary_codecs = true
- ffmpeg_branding = "Chrome"
-merged
-  result 100644 f91bc94a12fd4578663d82c6fdea26ed7399246f chromium_src/chrome/browser/printing/pdf_to_emf_converter.cc
-  our    100644 cd5fef18c1fd91d0cf97daed0ca97a8050836c6e chromium_src/chrome/browser/printing/pdf_to_emf_converter.cc
-@@ -26,8 +26,8 @@
- #include "chrome/common/chrome_utility_printing_messages.h"
- #include "content/public/browser/browser_thread.h"
- #include "content/public/browser/child_process_data.h"
--#include "content/public/browser/utility_process_host.h"
--#include "content/public/browser/utility_process_host_client.h"
-+#include "content/browser/utility_process_host.h"
-+#include "content/browser/utility_process_host_client.h"
- #include "printing/emf_win.h"
- #include "printing/pdf_render_settings.h"
- #include "ui/base/l10n/l10n_util.h"
-@@ -421,6 +421,7 @@
- void PdfConverterUtilityProcessHostClient::Start(
-     const scoped_refptr<base::RefCountedMemory>& data,
-     const PdfConverter::StartCallback& start_callback) {
-+  CHECK(false) << "Printing doesn't work yet.";
-   if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
-     BrowserThread::PostTask(
-         BrowserThread::IO, FROM_HERE,
-@@ -435,9 +436,12 @@
-   // NOTE: This process _must_ be sandboxed, otherwise the pdf dll will load
-   // gdiplus.dll, change how rendering happens, and not be able to correctly
-   // generate when sent to a metafile DC.
-+  /*
-   utility_process_host_ = content::UtilityProcessHost::Create(
-                               this, base::ThreadTaskRunnerHandle::Get())
-                               ->AsWeakPtr();
-+  */
-+  utility_process_host_ = nullptr;
-   utility_process_host_->SetName(GetName());
- 
-   base::PostTaskAndReplyWithResult(
-@@ -546,7 +550,11 @@
- 
- bool PdfConverterUtilityProcessHostClient::Send(IPC::Message* msg) {
-   if (utility_process_host_)
-+#if 1
-+    CHECK(false) << "Printing is broken.";
-+#else
-     return utility_process_host_->Send(msg);
-+#endif
-   delete msg;
-   return false;
- }
-merged
-  result 100644 54010e6a9d51419811a0eb812a08f5eeeb4c83ab chromium_src/chrome/browser/printing/print_job.cc
-  our    100644 80d9cc3c21a12b8256618405050f80bb6c2f08e4 chromium_src/chrome/browser/printing/print_job.cc
-@@ -265,6 +265,7 @@
-   const int kPrinterDpi = settings().dpi();
-   PdfRenderSettings settings(
-       content_area, gfx::Point(0, 0), gfx::Size(kPrinterDpi, kPrinterDpi), /*autorotate=*/true,
-+      settings_.color() == COLOR,
-       print_text_with_gdi ? PdfRenderSettings::Mode::GDI_TEXT
-                           : PdfRenderSettings::Mode::NORMAL);
-   pdf_conversion_state_->Start(
-@@ -313,6 +314,7 @@
-   const int kPrinterDpi = settings().dpi();
-   PdfRenderSettings settings(
-       content_area, physical_offsets, gfx::Size(kPrinterDpi, kPrinterDpi), true /* autorotate? */,
-+      settings_.color() == COLOR,
-       ps_level2 ? PdfRenderSettings::Mode::POSTSCRIPT_LEVEL2
-                 : PdfRenderSettings::Mode::POSTSCRIPT_LEVEL3);
-   pdf_conversion_state_->Start(
-merged
-  result 100644 9c23a80c221976b369a605db7ea68a55b12af472 chromium_src/chrome/browser/printing/printing_message_filter.cc
-  our    100644 52c6ecee81168a39d48e9c9a5f3a1cb71996172a chromium_src/chrome/browser/printing/printing_message_filter.cc
-@@ -17,7 +17,7 @@
- #include "content/public/browser/render_frame_host.h"
- #include "content/public/browser/web_contents.h"
- #include "content/public/common/child_process_host.h"
--#include "printing/features/features.h"
-+#include "printing/buildflags/buildflags.h"
- 
- #if defined(OS_ANDROID)
- #include "base/strings/string_number_conversions.h"
-merged
-  result 100644 f207c56b09be7b01e0bdc950b52b59aed46b44f8 chromium_src/chrome/browser/process_singleton_posix.cc
-  our    100644 4891743710d16673c6a72d76a303f6ac56a5ad32 chromium_src/chrome/browser/process_singleton_posix.cc
-@@ -1045,7 +1045,7 @@
- 
-   sock_ = sock;
- 
--  if (BrowserThread::IsMessageLoopValid(BrowserThread::IO)) {
-+  if (BrowserThread::IsThreadInitialized(BrowserThread::IO)) {
-     StartListeningOnSocket();
-   } else {
-     listen_on_ready_ = true;
-merged
-  result 100644 6a890d22e1153c220a588dd501226b86d53824b2 chromium_src/chrome/browser/ssl/security_state_tab_helper.h
-  our    100644 2fcb9ffbd1c2f22db198019b67f4a6f5b26b7ec6 chromium_src/chrome/browser/ssl/security_state_tab_helper.h
-@@ -11,7 +11,7 @@
- #include "components/security_state/core/security_state.h"
- #include "content/public/browser/web_contents_observer.h"
- #include "content/public/browser/web_contents_user_data.h"
--#include "third_party/WebKit/public/platform/WebSecurityStyle.h"
-+#include "third_party/blink/public/platform/web_security_style.h"
- 
- namespace content {
- class NavigationHandle;
-merged
-  result 100644 07d05c397f4b8c380dbff68b07aea7a1ada4db3a chromium_src/chrome/common/chrome_paths.cc
-  our    100644 30fe1fd7ba9624b1630d99f5c00049fb17b69795 chromium_src/chrome/common/chrome_paths.cc
-@@ -8,6 +8,7 @@
- #include "base/lazy_instance.h"
- #include "base/logging.h"
- #include "base/mac/bundle_locations.h"
-+#include "base/native_library.h"
- #include "base/path_service.h"
- #include "base/strings/string_util.h"
- #include "base/sys_info.h"
-@@ -16,7 +17,8 @@
- #include "chrome/common/chrome_constants.h"
- #include "chrome/common/chrome_paths_internal.h"
- #include "chrome/common/widevine_cdm_constants.h"
--#include "media/media_features.h"
-+#include "media/cdm/cdm_paths.h"
-+#include "media/media_buildflags.h"
- #include "third_party/widevine/cdm/stub/widevine_cdm_version.h"
- #include "third_party/widevine/cdm/widevine_cdm_common.h"
- 
-@@ -37,6 +39,45 @@
- 
- namespace {
- 
-+// Taken from src/media/cdm/cdm_paths.cc
-+const char kPlatformSpecific[] = "_platform_specific";
-+
-+// Name of the component platform in the manifest.
-+const char kComponentPlatform[] =
-+#if defined(OS_MACOSX)
-+    "mac";
-+#elif defined(OS_WIN)
-+    "win";
-+#elif defined(OS_CHROMEOS)
-+    "cros";
-+#elif defined(OS_LINUX)
-+    "linux";
-+#else
-+    "unsupported_platform";
-+#endif
-+
-+// Name of the component architecture in the manifest.
-+const char kComponentArch[] =
-+#if defined(ARCH_CPU_X86)
-+    "x86";
-+#elif defined(ARCH_CPU_X86_64)
-+    "x64";
-+#elif defined(ARCH_CPU_ARMEL)
-+    "arm";
-+#else
-+    "unsupported_arch";
-+#endif
-+// End src/media/cdm/cdm_paths.cc
-+
-+base::FilePath GetWidevinePath() {
-+  base::FilePath path;
-+  const std::string kPlatformArch =
-+      std::string(kComponentPlatform) + "_" + kComponentArch;
-+  return path.AppendASCII(kWidevineCdmBaseDirectory)
-+      .AppendASCII(kPlatformSpecific)
-+      .AppendASCII(kPlatformArch);
-+}
-+
- // The Pepper Flash plugins are in a directory with this name.
- const base::FilePath::CharType kPepperFlashBaseDirectory[] =
-     FILE_PATH_LITERAL("PepperFlash");
-@@ -369,13 +410,14 @@
-       cur = cur.AppendASCII(kWidevineCdmBaseDirectory);
-       break;
- #endif  // defined(WIDEVINE_CDM_IS_COMPONENT)
--    // TODO(xhwang): FILE_WIDEVINE_CDM_ADAPTER has different meanings.
--    // In the component case, this is the source adapter. Otherwise, it is the
--    // actual Pepper module that gets loaded.
--    case chrome::FILE_WIDEVINE_CDM_ADAPTER:
-+    // TODO(crbug.com/663554): Remove this after component updated CDM is
-+    // supported on Linux and ChromeOS.
-+    case chrome::FILE_WIDEVINE_CDM:
-       if (!GetInternalPluginsDirectory(&cur))
-         return false;
--      cur = cur.AppendASCII(kWidevineCdmAdapterFileName);
-+      cur =
-+          cur.Append(GetWidevinePath())
-+             .AppendASCII(base::GetNativeLibraryName(kWidevineCdmLibraryName));
-       break;
- #endif  // defined(WIDEVINE_CDM_AVAILABLE) && BUILDFLAG(ENABLE_LIBRARY_CDMS)
-     case chrome::FILE_RESOURCES_PACK:
-merged
-  result 100644 53197be0760586d5d6ef1ccd0ba570ef1d2d3525 chromium_src/chrome/common/chrome_paths.h
-  our    100644 61a5012475c339c02a2ec3f3a7bcd537aaab608e chromium_src/chrome/common/chrome_paths.h
-@@ -98,7 +98,7 @@
-                                // (subdir of DIR_PNACL_BASE).
-   DIR_COMPONENT_WIDEVINE_CDM,  // Directory that contains component-updated
-                                // Widevine CDM files.
--  FILE_WIDEVINE_CDM_ADAPTER,   // Full path to the Widevine CDM adapter file.
-+  FILE_WIDEVINE_CDM,           // Full path to the Widevine CDM.
-   FILE_RESOURCES_PACK,         // Full path to the .pak file containing
-                                // binary data (e.g., html files and images
-                                // used by internal pages).
-merged
-  result 100644 0f4fa21ede75b1083857c5d76a20b7e73ebfde17 chromium_src/chrome/common/chrome_utility_printing_messages.h
-  our    100644 fc71f0bd05f37de8e4c2a64fbc3356b322bf1f77 chromium_src/chrome/common/chrome_utility_printing_messages.h
-@@ -13,7 +13,7 @@
- #include "ipc/ipc_param_traits.h"
- #include "ipc/ipc_platform_file.h"
- #include "printing/backend/print_backend.h"
--#include "printing/features/features.h"
-+#include "printing/buildflags/buildflags.h"
- #include "printing/page_range.h"
- #include "printing/pdf_render_settings.h"
- #include "printing/pwg_raster_settings.h"
-merged
-  result 100644 ae42b58c4564e6141273232ca2f25bd93aa8081a chromium_src/chrome/common/print_messages.h
-  our    100644 1ca21544c252aedfdd26ffabd33bb8c4501ef276 chromium_src/chrome/common/print_messages.h
-@@ -13,7 +13,7 @@
- #include "ipc/ipc_message_macros.h"
- #include "printing/page_size_margins.h"
- #include "printing/print_job_constants.h"
--#include "third_party/WebKit/public/web/WebPrintScalingOption.h"
-+#include "third_party/blink/public/web/web_print_scaling_option.h"
- #include "ui/gfx/geometry/rect.h"
- #include "ui/gfx/native_widget_types.h"
- 
-merged
-  result 100644 91540b8cb6e2d587b15a18cea35047c8e2ba4e21 chromium_src/chrome/renderer/media/chrome_key_systems.cc
-  our    100644 c4ab859f06ba0758e857a222d7caf87230adb1fe chromium_src/chrome/renderer/media/chrome_key_systems.cc
-@@ -17,7 +17,7 @@
- #include "content/public/renderer/render_thread.h"
- #include "media/base/eme_constants.h"
- #include "media/base/key_system_properties.h"
--#include "media/media_features.h"
-+#include "media/media_buildflags.h"
- 
- #if BUILDFLAG(ENABLE_LIBRARY_CDMS)
- #include "content/public/renderer/key_system_support.h"
-@@ -37,8 +37,8 @@
- using media::SupportedCodecs;
- 
- #if BUILDFLAG(ENABLE_LIBRARY_CDMS)
--static const char kExternalClearKeyPepperType[] =
--    "application/x-ppapi-clearkey-cdm";
-+// static const char kExternalClearKeyPepperType[] =
-+//     "application/x-ppapi-clearkey-cdm";
- 
- // KeySystemProperties implementation for external Clear Key systems.
- class ExternalClearKeyProperties : public KeySystemProperties {
-@@ -102,10 +102,6 @@
-     return media::EmeFeatureSupport::NOT_SUPPORTED;
-   }
- 
--  std::string GetPepperType() const override {
--    return kExternalClearKeyPepperType;
--  }
--
-  private:
-   const std::string key_system_name_;
- };
-merged
-  result 100644 87933807a7111d1e722b5d86594218e95b43a400 chromium_src/chrome/renderer/printing/print_web_view_helper.cc
-  our    100644 506223fc82e63ee682a2e608cc6957c55d958115 chromium_src/chrome/renderer/printing/print_web_view_helper.cc
-@@ -25,24 +25,24 @@
- #include "net/base/escape.h"
- #include "printing/pdf_metafile_skia.h"
- #include "printing/units.h"
--#include "third_party/WebKit/public/mojom/page/page_visibility_state.mojom.h"
--#include "third_party/WebKit/public/platform/WebDoubleSize.h"
--#include "third_party/WebKit/public/platform/WebSize.h"
--#include "third_party/WebKit/public/platform/WebURLRequest.h"
--#include "third_party/WebKit/public/web/WebConsoleMessage.h"
--#include "third_party/WebKit/public/web/WebDocument.h"
--#include "third_party/WebKit/public/web/WebElement.h"
--#include "third_party/WebKit/public/web/WebFrameClient.h"
--#include "third_party/WebKit/public/web/WebFrameWidget.h"
--#include "third_party/WebKit/public/web/WebLocalFrame.h"
--#include "third_party/WebKit/public/web/WebPlugin.h"
--#include "third_party/WebKit/public/web/WebPluginDocument.h"
--#include "third_party/WebKit/public/web/WebPrintParams.h"
--#include "third_party/WebKit/public/web/WebPrintScalingOption.h"
--#include "third_party/WebKit/public/web/WebScriptSource.h"
--#include "third_party/WebKit/public/web/WebSettings.h"
--#include "third_party/WebKit/public/web/WebView.h"
--#include "third_party/WebKit/public/web/WebViewClient.h"
-+#include "third_party/blink/public/mojom/page/page_visibility_state.mojom.h"
-+#include "third_party/blink/public/platform/web_double_size.h"
-+#include "third_party/blink/public/platform/web_size.h"
-+#include "third_party/blink/public/platform/web_url_request.h"
-+#include "third_party/blink/public/web/web_console_message.h"
-+#include "third_party/blink/public/web/web_document.h"
-+#include "third_party/blink/public/web/web_element.h"
-+#include "third_party/blink/public/web/web_frame_client.h"
-+#include "third_party/blink/public/web/web_frame_widget.h"
-+#include "third_party/blink/public/web/web_local_frame.h"
-+#include "third_party/blink/public/web/web_plugin.h"
-+#include "third_party/blink/public/web/web_plugin_document.h"
-+#include "third_party/blink/public/web/web_print_params.h"
-+#include "third_party/blink/public/web/web_print_scaling_option.h"
-+#include "third_party/blink/public/web/web_script_source.h"
-+#include "third_party/blink/public/web/web_settings.h"
-+#include "third_party/blink/public/web/web_view.h"
-+#include "third_party/blink/public/web/web_view_client.h"
- #include "third_party/skia/include/core/SkCanvas.h"
- #include "ui/base/resource/resource_bundle.h"
- 
-merged
-  result 100644 b6bc0f4a9336c7c8394bdbf73960e6fafb8d9739 chromium_src/chrome/renderer/printing/print_web_view_helper.h
-  our    100644 f69ab823751bee88329e6d88c12fed12e01ac6b2 chromium_src/chrome/renderer/printing/print_web_view_helper.h
-@@ -16,10 +16,10 @@
- #include "content/public/renderer/render_frame_observer.h"
- #include "content/public/renderer/render_frame_observer_tracker.h"
- #include "printing/pdf_metafile_skia.h"
--#include "third_party/WebKit/public/platform/WebCanvas.h"
--#include "third_party/WebKit/public/web/WebLocalFrame.h"
--#include "third_party/WebKit/public/web/WebNode.h"
--#include "third_party/WebKit/public/web/WebPrintParams.h"
-+#include "third_party/blink/public/platform/web_canvas.h"
-+#include "third_party/blink/public/web/web_local_frame.h"
-+#include "third_party/blink/public/web/web_node.h"
-+#include "third_party/blink/public/web/web_print_params.h"
- #include "ui/gfx/geometry/size.h"
- 
- struct PrintMsg_Print_Params;
-merged
-  result 100644 018e72839b411a85eaafadb6df5a9aa17f301f05 chromium_src/chrome/renderer/printing/print_web_view_helper_linux.cc
-  our    100644 aedc042e6d6181b6c48082fb1f82e32f1ea405ea chromium_src/chrome/renderer/printing/print_web_view_helper_linux.cc
-@@ -12,7 +12,7 @@
- #include "printing/metafile_skia_wrapper.h"
- #include "printing/page_size_margins.h"
- #include "printing/pdf_metafile_skia.h"
--#include "third_party/WebKit/public/web/WebLocalFrame.h"
-+#include "third_party/blink/public/web/web_local_frame.h"
- 
- #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
- #include "base/process/process_handle.h"
-merged
-  result 100644 022da12bd7a292ac9e65e0e09e89514cf9a94962 chromium_src/chrome/renderer/printing/print_web_view_helper_mac.mm
-  our    100644 31dea2ea33cf55727331c03ed15895ef68fa9ce2 chromium_src/chrome/renderer/printing/print_web_view_helper_mac.mm
-@@ -12,8 +12,8 @@
- #include "chrome/common/print_messages.h"
- #include "printing/metafile_skia_wrapper.h"
- #include "printing/page_size_margins.h"
--#include "third_party/WebKit/public/platform/WebCanvas.h"
--#include "third_party/WebKit/public/web/WebLocalFrame.h"
-+#include "third_party/blink/public/platform/web_canvas.h"
-+#include "third_party/blink/public/web/web_local_frame.h"
- 
- namespace printing {
- 
-merged
-  result 100644 073923d6b0b8f080826e0c74e044512a22d2ff45 chromium_src/chrome/renderer/printing/print_web_view_helper_pdf_win.cc
-  our    100644 bbd65ebb15b12f3c35cb7b258535f0e0a5804724 chromium_src/chrome/renderer/printing/print_web_view_helper_pdf_win.cc
-@@ -14,7 +14,7 @@
- #include "printing/page_size_margins.h"
- #include "printing/pdf_metafile_skia.h"
- #include "printing/units.h"
--#include "third_party/WebKit/public/web/WebLocalFrame.h"
-+#include "third_party/blink/public/web/web_local_frame.h"
- 
- namespace printing {
- 
-merged
-  result 100644 caaa1dd3093dbb5282ef75d9e563fea31e594a66 chromium_src/chrome/renderer/tts_dispatcher.cc
-  our    100644 4aa82b5552389d67066d63239139030768e7f33a chromium_src/chrome/renderer/tts_dispatcher.cc
-@@ -8,10 +8,10 @@
- #include "chrome/common/tts_messages.h"
- #include "chrome/common/tts_utterance_request.h"
- #include "content/public/renderer/render_thread.h"
--#include "third_party/WebKit/public/platform/WebSpeechSynthesisUtterance.h"
--#include "third_party/WebKit/public/platform/WebSpeechSynthesisVoice.h"
--#include "third_party/WebKit/public/platform/WebString.h"
--#include "third_party/WebKit/public/platform/WebVector.h"
-+#include "third_party/blink/public/platform/web_speech_synthesis_utterance.h"
-+#include "third_party/blink/public/platform/web_speech_synthesis_voice.h"
-+#include "third_party/blink/public/platform/web_string.h"
-+#include "third_party/blink/public/platform/web_vector.h"
- 
- using blink::WebSpeechSynthesisUtterance;
- using blink::WebSpeechSynthesisVoice;
-merged
-  result 100644 f77a32045e6f4c283a6beb12fdfb0ab223650048 chromium_src/chrome/renderer/tts_dispatcher.h
-  our    100644 57928a3d2316000f251a160cea61d8eaf2e5f739 chromium_src/chrome/renderer/tts_dispatcher.h
-@@ -9,8 +9,8 @@
- 
- #include "base/containers/hash_tables.h"
- #include "content/public/renderer/render_thread_observer.h"
--#include "third_party/WebKit/public/platform/WebSpeechSynthesizer.h"
--#include "third_party/WebKit/public/platform/WebSpeechSynthesizerClient.h"
-+#include "third_party/blink/public/platform/web_speech_synthesizer.h"
-+#include "third_party/blink/public/platform/web_speech_synthesizer_client.h"
- 
- namespace IPC {
- class Message;
-merged
-  result 100644 796dccc5d3ab956cff9a2237a3d2f34ede6dcd36 chromium_src/chrome/utility/printing_handler_win.cc
-  our    100644 585259919fbb87956d4a763f04edc9a4cf1a6726 chromium_src/chrome/utility/printing_handler_win.cc
-@@ -161,6 +161,7 @@
-           pdf_rendering_settings_.area.y() - offset_y,
-           pdf_rendering_settings_.area.width(),
-           pdf_rendering_settings_.area.height(), true, false, true, true,
-+          pdf_rendering_settings_.use_color,
-           pdf_rendering_settings_.autorotate)) {
-     return false;
-   }
-changed in both
-  base   100644 1e38f4a8823c0c164efdaf361a306fd2d4a85f24 docs/api/breaking-changes.md
-  our    100644 7e3557fbb399d4691628f059f419a2b5027f4333 docs/api/breaking-changes.md
-  their  100644 2a417ef771c057326cd0a5d456b8420967a156a9 docs/api/breaking-changes.md
-@@ -49,9 +49,7 @@
- 
- // Deprecated
- const metrics = app.getAppMetrics()
--const {memory} = metrics[0]
--memory.privateBytes  // Deprecated property
--memory.sharedBytes  // Deprecated property
-+const {memory} = metrics[0] // Deprecated property
- ```
- 
- ## `BrowserWindow`
-@@ -135,8 +133,6 @@
- ```js
- // Deprecated
- const info = process.getProcessMemoryInfo()
--const privateBytes = info.privateBytes // deprecated property
--const sharedBytes = info.sharedBytes // deprecated property
- ```
- 
- ## `screen`
-merged
-  result 100644 691238a737a42be5f656b4d2da298a2779425da1 docs/api/process.md
-  our    100644 1f6b20d2f25c31b48fbb2bfedc6a064ae283424f docs/api/process.md
-@@ -14,7 +14,6 @@
- - `crash()`
- - `hang()`
- - `getHeapStatistics()`
--- `getProcessMemoryInfo()`
- - `getSystemMemoryInfo()`
- - `getCPUUsage()`
- - `getIOCounters()`
-@@ -156,22 +155,6 @@
- 
- Returns an object with V8 heap statistics. Note that all statistics are reported in Kilobytes.
- 
--### `process.getProcessMemoryInfo()`
--
--Returns `Object`:
--
--* `workingSetSize` Integer - The amount of memory currently pinned to actual physical
--  RAM.
--* `peakWorkingSetSize` Integer - The maximum amount of memory that has ever been pinned
--  to actual physical RAM.
--* `privateBytes` Integer - The amount of memory not shared by other processes, such as
--  JS heap or HTML content.
--* `sharedBytes` Integer - The amount of memory shared between processes, typically
--  memory consumed by the Electron code itself.
--
--Returns an object giving memory usage statistics about the current process. Note
--that all statistics are reported in Kilobytes.
--
- ### `process.getSystemMemoryInfo()`
- 
- Returns `Object`:
-merged
-  result 100644 62b3d6fe377b32520908cefcab451a797e9060e2 docs/api/structures/process-metric.md
-  our    100644 15a75a79664723ae5ee5e64621832c7dc883d9b1 docs/api/structures/process-metric.md
-@@ -2,5 +2,4 @@
- 
- * `pid` Integer - Process id of the process.
- * `type` String - Process type (Browser or Tab or GPU etc).
--* `memory` [MemoryInfo](memory-info.md) - Memory information for the process.
- * `cpu` [CPUUsage](cpu-usage.md) - CPU usage of the process.
-merged
-  result 100644 2a0602d5c1fdb60aad4c6e9402a6dfeddf90c561 docs/development/build-instructions-gn.md
-  our    100644 cbbdaf4c3d1998ccce8e5438eea1a7c9b00f2e37 docs/development/build-instructions-gn.md
-@@ -5,7 +5,7 @@
- 
- > **NOTE**: The GN build system is in _experimental_ status.
- 
--## Platform prerequisites
-+## Prerequisites
- 
- Check the build prerequisites for your platform before proceeding
- 
-@@ -13,7 +13,7 @@
-   * [Linux](build-instructions-linux.md#prerequisites)
-   * [Windows](build-instructions-windows.md#prerequisites)
- 
--## GN prerequisites
-+## Install `depot_tools`
- 
- You'll need to install [`depot_tools`][depot-tools], the toolset
- used for fetching Chromium and its dependencies.
-@@ -27,33 +27,20 @@
- 
- [depot-tools]: http://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/docs/html/depot_tools_tutorial.html#_setting_up
- 
--## Cached builds (optional step)
-+## Getting the Code
- 
--### GIT_CACHE_PATH
-+### Using a Git cache (optional step)
- 
--If you plan on building Electron more than once, adding a git cache will
--speed up subsequent calls to `gclient`. To do this, set a `GIT_CACHE_PATH`
--environment variable:
-+`gclient` fetches about 16G worth of repository data. If you plan on building
-+more than once, consider using its cache feature to make future calls faster:
- 
- ```sh
--$ export GIT_CACHE_PATH="${HOME}/.git_cache"
--$ mkdir -p "${GIT_CACHE_PATH}"
--# This will use about 16G.
-+$ export GIT_CACHE_PATH="$HOME/.git_cache"
-+$ mkdir -p "$GIT_CACHE_PATH"
-+# This will take about 16G.
- ```
- 
--### sccache
--
--Thousands of files must be compiled to build Chromium and Electron.
--You can avoid much of the wait by reusing Electron CI's build output via
--[sccache](https://github.com/mozilla/sccache). This requires some
--optional steps (listed below) and these two environment variables:
--
--```sh
--export SCCACHE_BUCKET="electronjs-sccache"
--export SCCACHE_TWO_TIER=true
--```
--
--## Getting the code
-+### Getting the code with gclient
- 
- ```sh
- $ mkdir electron-gn && cd electron-gn
-@@ -70,9 +57,7 @@
- ```sh
- $ cd src
- $ export CHROMIUM_BUILDTOOLS_PATH=`pwd`/buildtools
--# this next line is needed only if building with sccache
--$ export GN_EXTRA_ARGS="${GN_EXTRA_ARGS} cc_wrapper=\"${PWD}/electron/external_binaries/sccache\""
--$ gn gen out/Default --args="import(\"//electron/build/args/debug.gn\") $GN_EXTRA_ARGS"
-+$ gn gen out/Default --args='import("//electron/build/args/debug.gn")'
- ```
- 
- This will generate a build directory `out/Default` under `src/` with
-@@ -88,14 +73,14 @@
- Electron:**
- 
- ```sh
--$ gn gen out/Default --args='import("//electron/build/args/debug.gn") $GN_EXTRA_ARGS'
-+$ gn gen out/Default --args='import("//electron/build/args/debug.gn")'
- ```
- 
- **For generating Release (aka "non-component" or "static") build config of
- Electron:**
- 
- ```sh
--$ gn gen out/Default --args="import(\"//electron/build/args/release.gn\") $GN_EXTRA_ARGS"
-+$ gn gen out/Default --args='import("//electron/build/args/release.gn")'
- ```
- 
- **To build, run `ninja` with the `electron:electron_app` target:**
-merged
-  result 100644 78ec6e4e07d4aef614ce8a26dae4a1bb093afdad electron.gyp
-  our    100644 944ddab2a3fd879044e31677e4bac2843fffbdee electron.gyp
-@@ -303,8 +303,6 @@
-         '<(libchromiumcontent_src_dir)/v8/include',
-         # The `node.h` is using `#include"ares.h"`.
-         'vendor/node/deps/cares/include',
--        # The `third_party/WebKit/Source/platform/weborigin/SchemeRegistry.h` is using `platform/PlatformExport.h`.
--        '<(libchromiumcontent_src_dir)/third_party/WebKit/Source',
-         # The 'third_party/libyuv/include/libyuv/scale_argb.h' is using 'libyuv/basic_types.h'.
-         '<(libchromiumcontent_src_dir)/third_party/libyuv/include',
-         # The 'third_party/webrtc/modules/desktop_capture/desktop_frame.h' is using 'webrtc/base/scoped_ptr.h'.
-merged
-  result 100644 6bfbf9a0f211a8ecfa2757f81c39102b25447377 electron_paks.gni
-  our    100644 989cb3834ca0f2c4079fa9378369a6f1461f433a electron_paks.gni
-@@ -1,5 +1,5 @@
- import("//build/config/locales.gni")
--import("//printing/features/features.gni")
-+import("//printing/buildflags/buildflags.gni")
- import("//tools/grit/repack.gni")
- import("//ui/base/ui_features.gni")
- 
-@@ -17,7 +17,7 @@
- 
-     # All sources should also have deps for completeness.
-     sources = [
--      "$root_gen_dir/blink/public/resources/blink_scaled_resources_${percent}_percent.pak",
-+      "$root_gen_dir/third_party/blink/public/resources/blink_scaled_resources_${percent}_percent.pak",
-       "$root_gen_dir/components/components_resources_${percent}_percent.pak",
-       "$root_gen_dir/content/app/resources/content_resources_${percent}_percent.pak",
-       "$root_gen_dir/ui/resources/ui_resources_${percent}_percent.pak",
-@@ -26,7 +26,7 @@
-     deps = [
-       "//components/resources",
-       "//content/app/resources",
--      "//third_party/WebKit/public:scaled_resources_${percent}_percent",
-+      "//third_party/blink/public:scaled_resources_${percent}_percent",
-       "//ui/resources",
-     ]
- 
-@@ -53,7 +53,7 @@
-                            ])
-     output = "${invoker.output_dir}/resources.pak"
-     sources = [
--      "$root_gen_dir/blink/public/resources/blink_resources.pak",
-+      "$root_gen_dir/third_party/blink/public/resources/blink_resources.pak",
-       "$root_gen_dir/components/components_resources.pak",
-       "$root_gen_dir/content/browser/tracing/tracing_resources.pak",
-       "$root_gen_dir/content/content_resources.pak",
-@@ -66,7 +66,7 @@
-       "//content/browser/tracing:resources",
-       "//mojo/public/js:resources",
-       "//net:net_resources",
--      "//third_party/WebKit/public:resources",
-+      "//third_party/blink/public:resources",
-     ]
-     if (defined(invoker.deps)) {
-       deps += invoker.deps
-merged
-  result 100644 23d7d9907c2351fc3d7e6cd42a1e836524d727b1 features.gypi
-  our    100644 86543a4db1195223a3556fa71583038f15d79a0a features.gypi
-@@ -3,7 +3,7 @@
-   'variables': {
-     'variables': {
-       'enable_desktop_capturer%': 1,
--      'enable_osr%': 1,
-+      'enable_osr%': 0,  # FIXME(alexeykuzmin)
-       'enable_pdf_viewer%': 0,  # FIXME(deepak1556)
-       'enable_run_as_node%': 1,
-       'enable_view_api%': 0,
-merged
-  result 100644 f0db3c2e663bedc549370c91a64be2e10d1be73c lib/browser/api/app.js
-  our    100644 66f6ae651acf10fb19b8ec068fc5280850dd3d91 lib/browser/api/app.js
-@@ -42,8 +42,7 @@
- 
- const nativeFn = app.getAppMetrics
- app.getAppMetrics = () => {
--  deprecate.removeProperty(nativeFn, 'privateBytes')
--  deprecate.removeProperty(nativeFn, 'sharedBytes')
-+  deprecate.removeProperty(nativeFn, 'memory')
-   return nativeFn.call(app)
- }
- 
-merged
-  result 100644 c4ff2bb64f4eb9069c8a760e59a020e94fbf84b7 lib/sandboxed_renderer/init.js
-  our    100644 30a3fa55216f6bf7588c3accc07b150a31163b7c lib/sandboxed_renderer/init.js
-@@ -47,7 +47,6 @@
- preloadProcess.crash = () => binding.crash()
- preloadProcess.hang = () => binding.hang()
- preloadProcess.getHeapStatistics = () => binding.getHeapStatistics()
--preloadProcess.getProcessMemoryInfo = () => binding.getProcessMemoryInfo()
- preloadProcess.getSystemMemoryInfo = () => binding.getSystemMemoryInfo()
- preloadProcess.getCPUUsage = () => binding.getCPUUsage()
- preloadProcess.getIOCounters = () => binding.getIOCounters()
-merged
-  result 100755 ae5ce3707c38e61716f96cf5e7627cc909597fb8 script/create-dist.py
-  our    100755 4a6c0c7ce8f275175e48c4c380ff33627f7a5961 script/create-dist.py
-@@ -11,13 +11,10 @@
- if sys.platform == "win32":
-   import _winreg
- 
--from lib.config import BASE_URL, PLATFORM, build_env, \
--                       enable_verbose_mode, get_target_arch, get_zip_name
--
--from lib.util import add_exec_bit, electron_features, electron_gyp, \
--                     execute, get_electron_version, make_zip, \
--                     parse_version, rm_rf, scoped_cwd
--
-+from lib.config import BASE_URL, PLATFORM, enable_verbose_mode, \
-+                       get_target_arch, get_zip_name, build_env
-+from lib.util import scoped_cwd, rm_rf, get_electron_version, make_zip, \
-+                     execute, electron_gyp, electron_features, parse_version
- from lib.env_util import get_vs_location
- 
- 
-@@ -147,7 +144,7 @@
- 
-   # Copy file and keep the executable bit.
-   shutil.copyfile(src, dest)
--  add_exec_bit(dest)
-+  os.chmod(dest, os.stat(dest).st_mode | stat.S_IEXEC)
- 
- def copy_vcruntime_binaries():
-   arch = get_target_arch()
-@@ -302,7 +299,7 @@
-     dest = os.path.join(DIST_DIR, binary)
-     # Copy file and keep the executable bit.
-     shutil.copyfile(src, dest)
--    add_exec_bit(dest)
-+    os.chmod(dest, os.stat(dest).st_mode | stat.S_IEXEC)
- 
-     dist_name = get_zip_name(binary, version)
-     zip_file = os.path.join(SOURCE_ROOT, 'dist', dist_name)
-merged
-  result 100644 1fc2b813e7c9b934f7ad11fde55c4bac731f4755 script/lib/util.py
-  our    100644 d479d5a9556534c5d98ae1fdc97397cdd14376f5 script/lib/util.py
-@@ -8,7 +8,6 @@
- import re
- import shutil
- import ssl
--import stat
- import subprocess
- import sys
- import tarfile
-@@ -84,7 +83,6 @@
-     if hasattr(ssl, '_create_unverified_context'):
-       ssl._create_default_https_context = ssl._create_unverified_context
- 
--    print "Downloading %s to %s" % (url, path)
-     web_file = urllib2.urlopen(url)
-     file_size = int(web_file.info().getheaders("Content-Length")[0])
-     downloaded_size = 0
-@@ -297,9 +295,6 @@
-     else:
-       execute_stdout(args, env)
- 
--def add_exec_bit(filename):
--  os.chmod(filename, os.stat(filename).st_mode | stat.S_IEXEC)
--
- def clean_parse_version(v):
-   return parse_version(v.split("-")[0])        
- 
-merged
-  result 100755 07683a53f32d15c6dcb4f03bda90d9d89e590e29 script/update-clang.sh
-  our    100755 0c7ab60533381e33152b8735aaccf41d5f0d6676 script/update-clang.sh
-@@ -8,10 +8,10 @@
- # Do NOT CHANGE this if you don't know what you're doing -- see
- # https://code.google.com/p/chromium/wiki/UpdatingClang
- # Reverting problematic clang rolls is safe, though.
--CLANG_REVISION=325667
-+CLANG_REVISION=328716
- 
- # This is incremented when pushing a new build of Clang at the same revision.
--CLANG_SUB_REVISION=1
-+CLANG_SUB_REVISION=2
- 
- PACKAGE_VERSION="${CLANG_REVISION}-${CLANG_SUB_REVISION}"
- 
-merged
-  result 100755 e67ac996e2605be675a0431db7fb61fd28a1445c script/update-external-binaries.py
-  our    100755 0bc9d0f632057f4a17aa811340ba21631433f173 script/update-external-binaries.py
-@@ -4,11 +4,11 @@
- import sys
- import os
- 
--from lib.config import PLATFORM, get_target_arch
--from lib.util import add_exec_bit, download, extract_zip, rm_rf, \
--                     safe_mkdir, tempdir
-+from lib.config import get_target_arch
-+from lib.util import safe_mkdir, rm_rf, extract_zip, tempdir, download
- 
--VERSION = 'v1.4.0'
-+
-+VERSION = 'v1.3.0'
- SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
- FRAMEWORKS_URL = 'http://github.com/electron/electron-frameworks/releases' \
-                  '/download/' + VERSION
-@@ -31,13 +31,6 @@
-   elif sys.platform in ['cygwin', 'win32']:
-     download_and_unzip('directxsdk-' + get_target_arch())
- 
--  # get sccache & set exec bit. https://bugs.python.org/issue15795
--  download_and_unzip('sccache-{0}-x64'.format(PLATFORM))
--  appname = 'sccache'
--  if sys.platform == 'win32':
--    appname += '.exe'
--  add_exec_bit(os.path.join('external_binaries', appname))
--
-   with open(version_file, 'w') as f:
-     f.write(VERSION)
- 
-merged
-  result 100644 68652116a786124ad04813033826a572f93c0950 spec/api-app-spec.js
-  our    100644 d224eda2989332c18d655cef05a8bacc2eb6d4b8 spec/api-app-spec.js
-@@ -802,15 +802,7 @@
-       expect(appMetrics).to.be.an('array').and.have.lengthOf.at.least(1, 'App memory info object is not > 0')
- 
-       const types = []
--      for (const {memory, pid, type, cpu} of appMetrics) {
--        expect(memory.workingSetSize).to.be.above(0, 'working set size is not > 0')
--
--        // windows causes failures here due to CI server configuration
--        if (process.platform !== 'win32') {
--          expect(memory.privateBytes).to.be.above(0, 'private bytes is not > 0')
--          expect(memory.sharedBytes).to.be.above(0, 'shared bytes is not > 0')
--        }
--
-+      for (const {pid, type, cpu} of appMetrics) {
-         expect(pid).to.be.above(0, 'pid is not > 0')
-         expect(type).to.be.a('string').that.is.not.empty()
- 
-merged
-  result 100644 f42c0b0329f7212510ffb490521bbcbcd5161904 spec/api-browser-window-spec.js
-  our    100644 f4cba12ec19d224bc46fca898db42a99baf4972e spec/api-browser-window-spec.js
-@@ -1524,7 +1524,8 @@
-         w.loadURL('file://' + path.join(fixtures, 'pages', 'window-open.html'))
-       })
- 
--      it('releases memory after popup is closed', (done) => {
-+      // TODO(alexeykuzmin): `GetProcessMemoryInfo()` is not available starting Ch67.
-+      xit('releases memory after popup is closed', (done) => {
-         w.destroy()
-         w = new BrowserWindow({
-           show: false,
-merged
-  result 100644 2b07c407a21f1f4fecd54a488c93a516a7bd0370 spec/api-process-spec.js
-  our    100644 ad8f1faea14208d2659c505105c1e70938bba2b9 spec/api-process-spec.js
-@@ -34,15 +34,16 @@
-     })
-   })
- 
--  describe('process.getProcessMemoryInfo()', () => {
--    it('returns process memory info object', () => {
--      const processMemoryInfo = process.getProcessMemoryInfo()
--      expect(processMemoryInfo.peakWorkingSetSize).to.be.a('number')
--      expect(processMemoryInfo.privateBytes).to.be.a('number')
--      expect(processMemoryInfo.sharedBytes).to.be.a('number')
--      expect(processMemoryInfo.workingSetSize).to.be.a('number')
--    })
--  })
-+  // FIXME: Chromium 67 - getProcessMemoryInfo has been removed
-+  // describe('process.getProcessMemoryInfo()', () => {
-+  //   it('returns process memory info object', () => {
-+  //     const processMemoryInfo = process.getProcessMemoryInfo()
-+  //     expect(processMemoryInfo.peakWorkingSetSize).to.be.a('number')
-+  //     expect(processMemoryInfo.privateBytes).to.be.a('number')
-+  //     expect(processMemoryInfo.sharedBytes).to.be.a('number')
-+  //     expect(processMemoryInfo.workingSetSize).to.be.a('number')
-+  //   })
-+  // })
- 
-   describe('process.getSystemMemoryInfo()', () => {
-     it('returns system memory info object', () => {
-merged
-  result 100644 e745e7a62d4250f319186124982c889db1a139a4 spec/fixtures/api/sandbox.html
-  our    100644 af796ebc988b648455025934a991719135853694 spec/fixtures/api/sandbox.html
-@@ -35,20 +35,21 @@
-         await invokeGc()
-         ipcRenderer.send('answer', new Hello().say())
-       },
--      'allocate-memory': async () => {
--        await invokeGc()
--        const {privateBytes: bytesBeforeOpen} = process.getProcessMemoryInfo()
--        let w = open('./allocate-memory.html')
--        await invokeGc()
--        const {privateBytes: bytesAfterOpen} = process.getProcessMemoryInfo()
--        w.close()
--        w = null
--        await invokeGc()
--        const {privateBytes: bytesAfterClose} = process.getProcessMemoryInfo()
--        ipcRenderer.send('answer', {
--          bytesBeforeOpen, bytesAfterOpen, bytesAfterClose
--        })
--      },
-+      // FIXME: Chromium 67 - getProcessMemoryInfo has been removed
-+      // 'allocate-memory': async () => {
-+      //   await invokeGc()
-+      //   const {privateBytes: bytesBeforeOpen} = process.getProcessMemoryInfo()
-+      //   let w = open('./allocate-memory.html')
-+      //   await invokeGc()
-+      //   const {privateBytes: bytesAfterOpen} = process.getProcessMemoryInfo()
-+      //   w.close()
-+      //   w = null
-+      //   await invokeGc()
-+      //   const {privateBytes: bytesAfterClose} = process.getProcessMemoryInfo()
-+      //   ipcRenderer.send('answer', {
-+      //     bytesBeforeOpen, bytesAfterOpen, bytesAfterClose
-+      //   })
-+      // },
-       'window-events': () => {
-         document.title = 'changed'
-       },
-merged
-  result 100644 9d5a51378a32dd05def1782ecf808cbc64541fc8 spec/modules-spec.js
-  our    100644 b996b8f4839bff2160bffb69e55263b16a4178d7 spec/modules-spec.js
-@@ -7,7 +7,8 @@
- 
- const nativeModulesEnabled = remote.getGlobal('nativeModulesEnabled')
- 
--describe('modules support', () => {
-+// (alexeykuzmin): [Ch67]: TODO: Enable the tests.
-+xdescribe('modules support', () => {
-   const fixtures = path.join(__dirname, 'fixtures')
- 
-   describe('third-party module', () => {
-merged
-  result 160000 6e0b6913c54a2dec51ce452ff041de20460ef398 vendor/crashpad
-  our    160000 f72fa99d3e3d65e3bb9bed9d83429459d6f80c0d vendor/crashpad
-changed in both
-  base   160000 00cce7a094c5ded91d52d2ac2aac2ab70dc66d02 vendor/libchromiumcontent
-  our    160000 c85470a1c379b1c4bedb372c146521bc4be9b75d vendor/libchromiumcontent
-  their  160000 e349f85568753947039fc912cf84d76a17a82f2e vendor/libchromiumcontent
-merged
-  result 100644 ddc313edf9a1c4cbb8191473a25b46fb57e9655f vsts-gn.yml
-  our    100644 3c9985b16c0414cfd9bc6c6648d6411a969fc6ef vsts-gn.yml
-@@ -16,6 +16,7 @@
-       gclient config \
-         --name "src/electron" \
-         --unmanaged \
-+        --cache-dir "${GIT_CACHE_PATH}" \
-         "https://github.com/electron/electron"
-       mkdir src
-       git clone https://github.com/electron/electron src/electron
-@@ -31,7 +32,7 @@
-   - bash: |
-       cd src
-       export CHROMIUM_BUILDTOOLS_PATH=`pwd`/buildtools
--      export SCCACHE_WRAPPER="`pwd`/electron/external_binaries/sccache"
-+      export SCCACHE_WRAPPER="`pwd`/libchromiumcontent/tools/sccache/aad2120/mac/sccache"
-       export SCCACHE_HELPER="`pwd`/libchromiumcontent/script/sccache"
-       "$SCCACHE_HELPER" --start-server --azure_container "$(SCCACHE_AZURE_BLOB_CONTAINER)" --azure_connection "$(SCCACHE_AZURE_CONNECTION_STRING)"
-       echo "##vso[task.setvariable variable=SCCACHE_WRAPPER]$SCCACHE_WRAPPER"
diff --git a/app/test/fixtures/merge-parser/electron/merge-clang-cl-windows-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-clang-cl-windows-into-master.txt
deleted file mode 100644
index 92f5d41d4a5..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-clang-cl-windows-into-master.txt
+++ /dev/null
@@ -1,3970 +0,0 @@
-changed in both
-  base   100644 962e25d180eb17debea55ac49117cc6972ae91eb .circleci/config.yml
-  our    100644 6d44d618aabcce04c60344f2274dec5b0c2a1f68 .circleci/config.yml
-  their  100644 7c36f10ad96948599ca8e8ca8149038b4348459c .circleci/config.yml
-@@ -484,7 +484,10 @@
-       TARGET_ARCH: x64
-       RUN_RELEASE_BUILD: true
-       INSTALL_MACOS_NODE: true
-+<<<<<<< .our
-       NIGHTLY_BUILD: true
-+=======
-+>>>>>>> .their
-     macos:
-       xcode: "8.3.3"
-     <<: *build-steps
-@@ -505,7 +508,10 @@
-       MAS_BUILD: 1
-       RUN_RELEASE_BUILD: true
-       INSTALL_MACOS_NODE: true
-+<<<<<<< .our
-       NIGHTLY_BUILD: true
-+=======
-+>>>>>>> .their
-     macos:
-       xcode: "8.3.3"
-     <<: *build-steps
-added in both
-  our    100644 67a2b2124619d866f67d849f57f3548ba28be26a appveyor.yml
-  their  100644 cb0c8a67db55630fd6d94204955c56016c9937cf appveyor.yml
-@@ -1,4 +1,5 @@
- version: 1.0.{build}
-+<<<<<<< .our
- branches:
-   except:
-   - /^release$|^release-\d-\d-x$/
-@@ -6,10 +7,20 @@
- image: electron-16-vs2017-15.4.5
- environment:
-   DISABLE_CRASH_REPORTER_TESTS: true
-+=======
-+build_cloud: electron-16
-+image: electron-16-vs2017
-+environment:
-+  DISABLE_CRASH_REPORTER_TESTS: true
-+  matrix:
-+  - TARGET_ARCH: ia32
-+  - TARGET_ARCH: x64
-+>>>>>>> .their
- build_script:
- - ps: >-
-     if(($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME -split "/")[0] -eq ($env:APPVEYOR_REPO_NAME -split "/")[0]) {
-       Write-warning "Skipping PR build for branch"; Exit-AppveyorBuild
-+<<<<<<< .our
-     } else {
-       Add-Path "$env:ProgramFiles (x86)\Windows Kits\10\Debuggers\x64"
-       $env:path = "$env:ProgramFiles (x86)\Windows Kits\10\Debuggers\x64;$env:path"
-@@ -17,10 +28,24 @@
-         $env:RUN_RELEASE_BUILD = "1"
-       }
-       $Message = (git log --format=%B -n 1 HEAD) | Out-String
-+=======
-+
-+    } else {
-+      Add-Path "$env:ProgramFiles (x86)\Windows Kits\10\Debuggers\x64"
-+
-+      $env:path = "$env:ProgramFiles (x86)\Windows Kits\10\Debuggers\x64;$env:path"
-+
-+      $Message = (git log --format=%B -n 1 HEAD) | Out-String
-+
-+>>>>>>> .their
-       if ((Test-Path Env:\RUN_RELEASE_BUILD)) {
-         $env:ELECTRON_RELEASE = '1'
-         Write-Output "release build triggered from api"
-       }
-+<<<<<<< .our
-+=======
-+
-+>>>>>>> .their
-       if ((Test-Path Env:\ELECTRON_RELEASE)) {
-         Write-Output "Running release build"
-         python script\bootstrap.py --target_arch=$env:TARGET_ARCH
-@@ -36,21 +61,34 @@
-       } else {
-         "Build succeeded."
-       }
-+<<<<<<< .our
-       Push-AppveyorArtifact out
-     }
-+=======
-+    }
-+
-+>>>>>>> .their
- test_script:
- - ps: >-
-     if (Test-Path Env:\ELECTRON_RELEASE) {
-       Write-Output "Skipping tests for release build"
-     } else {
-       Write-Output "Running tests for debug build"
-+<<<<<<< .our
-       python script\test.py --ci --rebuild_native_modules
-+=======
-+      python script\test.py --ci
-+>>>>>>> .their
-       if ($LASTEXITCODE -ne '0') {
-         throw "Tests failed with exit code $LASTEXITCODE"
-       } else {
-         Write-Output "Tests succeeded."
-       }
-       python script\verify-ffmpeg.py
-+<<<<<<< .our
-+=======
-+
-+>>>>>>> .their
-       if ($LASTEXITCODE -ne '0') {
-         throw "Verify ffmpeg failed with exit code $LASTEXITCODE"
-       } else {
-@@ -58,6 +96,7 @@
-       }
-     }
- artifacts:
-+<<<<<<< .our
- - path: test-results.xml
-   name: test-results.xml
- deploy_script:
-@@ -71,3 +110,7 @@
-         & python script\upload.py
-       }
-     }
-+=======
-+- path: out
-+  name: out
-+>>>>>>> .their
-changed in both
-  base   100644 08e0776daf674e01202cdb55435c71ea554a1409 atom/app/atom_main_delegate.cc
-  our    100644 b3b5b8f2a8f24b8928f69a286c80e8a3b8464366 atom/app/atom_main_delegate.cc
-  their  100644 5cb10dece3e145ac5a4a7a3da2e277a511d826e8 atom/app/atom_main_delegate.cc
-changed in both
-  base   100644 61a661e4ad9e09fa469b39ab532f20e82fbd5381 atom/app/node_main.cc
-  our    100644 9a95165f77a2585b06975bb3dfd0f5e573329410 atom/app/node_main.cc
-  their  100644 e687266a11a79d56a7955abff2725841f1a32ef2 atom/app/node_main.cc
-changed in both
-  base   100644 69d8aaf4825b91fc8517838baf4a92bd52267ac9 atom/browser/api/atom_api_app.cc
-  our    100644 089a2b63d1bae3afebea925582a3aac81ddeaa4f atom/browser/api/atom_api_app.cc
-  their  100644 5d4715c3ad4bc233b87807f1f79fcac068ff298d atom/browser/api/atom_api_app.cc
-changed in both
-  base   100644 f4f5b325a4da16137da737fd9f3f4b8b7309d45e atom/browser/api/atom_api_app.h
-  our    100644 ee0ad42c05fe33be17146b79cbe3422953516621 atom/browser/api/atom_api_app.h
-  their  100644 6093ad05b6343c85799789a9dc68abbf7294dc88 atom/browser/api/atom_api_app.h
-changed in both
-  base   100644 a987828be55bc9fe76f8d9addcc71f459c4c63c4 atom/browser/api/atom_api_browser_window.cc
-  our    100644 d0ae6f4ea78407c70e4cce6ff1181ce01e395133 atom/browser/api/atom_api_browser_window.cc
-  their  100644 7cb8ecc0b58b5c565971e50bb814017bf13d0241 atom/browser/api/atom_api_browser_window.cc
-changed in both
-  base   100644 5f9610f3a3c2c2946f7a0ec38e3094f7b494cb29 atom/browser/api/atom_api_browser_window.h
-  our    100644 770181f5b7f4e01f0124f44991ee5332771db6e2 atom/browser/api/atom_api_browser_window.h
-  their  100644 d39a1583b2ec7a488613bff60bb0670b0091711b atom/browser/api/atom_api_browser_window.h
-changed in both
-  base   100644 9c4f2e97f22ada9be327b52862cbf70cc102c95c atom/browser/api/atom_api_cookies.cc
-  our    100644 daccf443927abdf444845613b6e2916d167f96f3 atom/browser/api/atom_api_cookies.cc
-  their  100644 f55ed136adfb15fed7065a60df6320de90c63fdb atom/browser/api/atom_api_cookies.cc
-changed in both
-  base   100644 3bf2df9679a050ddc0ee1e882fdae778bcf2e515 atom/browser/api/atom_api_desktop_capturer.cc
-  our    100644 135b4edd11048a4635f9017f569f4b4ae644a09c atom/browser/api/atom_api_desktop_capturer.cc
-  their  100644 1d33bbbd4a7e08369592e716e9b081c994ca313f atom/browser/api/atom_api_desktop_capturer.cc
-@@ -57,6 +57,7 @@
-   cap->Emit("finished", sources);
- }
- 
-+<<<<<<< .our
- void StartHandlingTask(bool capture_window,
-                        bool capture_screen,
-                        const gfx::Size& thumbnail_size,
-@@ -70,12 +71,27 @@
-     cap->using_directx_capturer_ =
-         webrtc::ScreenCapturerWinDirectx::IsSupported();
-   }
-+=======
-+DesktopCapturer::~DesktopCapturer() {}
-+
-+void DesktopCapturer::StartHandling(bool capture_window,
-+                                    bool capture_screen,
-+                                    const gfx::Size& thumbnail_size) {
-+#if defined(OS_WIN)
-+  using_directx_capturer_ =
-+      content::desktop_capture::CreateDesktopCaptureOptions()
-+          .allow_directx_capturer();
-+>>>>>>> .their
- #endif  // defined(OS_WIN)
-   std::unique_ptr<webrtc::DesktopCapturer> screen_capturer(
-       capture_screen ? content::desktop_capture::CreateScreenCapturer()
-                      : nullptr);
-   std::unique_ptr<webrtc::DesktopCapturer> window_capturer(
-+<<<<<<< .our
-       capture_window ? content::desktop_capture::CreateWindowCapturer()
-+=======
-+      capture_window ? content::desktop_capture::CreateScreenCapturer()
-+>>>>>>> .their
-                      : nullptr);
-   cap->media_list_.reset(new NativeDesktopMediaList(
-       std::move(screen_capturer), std::move(window_capturer)));
-changed in both
-  base   100644 51df0a63a5e835f9eee83c3d957b3269d918bb57 atom/browser/api/atom_api_power_save_blocker.cc
-  our    100644 0b06a9f583782b55296498159059e35b8f27f186 atom/browser/api/atom_api_power_save_blocker.cc
-  their  100644 d16265f50115de48112778c3ede58b423bb2b4d3 atom/browser/api/atom_api_power_save_blocker.cc
-@@ -70,6 +70,7 @@
-   }
- 
-   if (!power_save_blocker_ || new_blocker_type != current_blocker_type_) {
-+<<<<<<< .our
-     auto new_blocker = std::make_unique<device::PowerSaveBlocker>(
-         new_blocker_type, device::mojom::WakeLockReason::kOther,
-         ATOM_PRODUCT_NAME, base::ThreadTaskRunnerHandle::Get(),
-@@ -79,6 +80,18 @@
-         // therefore require a single-thread runner.
-         base::CreateSingleThreadTaskRunnerWithTraits(
-             {base::MayBlock(), base::TaskPriority::BACKGROUND}));
-+=======
-+    std::unique_ptr<device::PowerSaveBlocker> new_blocker(
-+        new device::PowerSaveBlocker(
-+            new_blocker_type, device::mojom::WakeLockReason::kOther,
-+            ATOM_PRODUCT_NAME, base::ThreadTaskRunnerHandle::Get(),
-+            // This task runner may be used by some device service
-+            // implementation bits to interface with dbus client code, which in
-+            // turn imposes some subtle thread affinity on the clients. We
-+            // therefore require a single-thread runner.
-+            base::CreateSingleThreadTaskRunnerWithTraits(
-+                {base::MayBlock(), base::TaskPriority::BACKGROUND})));
-+>>>>>>> .their
-     power_save_blocker_.swap(new_blocker);
-     current_blocker_type_ = new_blocker_type;
-   }
-changed in both
-  base   100644 c80973f439ac02e7283bdb6a23ba0fe7caff2dbf atom/browser/api/atom_api_session.cc
-  our    100644 658f913bb60b66ae1bf3aae97d7d9158e56f7ee0 atom/browser/api/atom_api_session.cc
-  their  100644 2ca8ae0e26ddeaa9db681e3bfb9d98582e4c154a atom/browser/api/atom_api_session.cc
-changed in both
-  base   100644 4a01680dcb3b27e6f24ad19c481105a9bcd973a8 atom/browser/api/atom_api_web_contents.cc
-  our    100644 20a1ac2e672f08ffea528b6e094ba530ff8083d1 atom/browser/api/atom_api_web_contents.cc
-  their  100644 72082a101018fc8668576a5c9d5a62bd63228d56 atom/browser/api/atom_api_web_contents.cc
-@@ -752,6 +752,13 @@
-   return dialog_manager_.get();
- }
- 
-+void WebContents::ResizeDueToAutoResize(content::WebContents* web_contents,
-+                                        const gfx::Size& new_size) {
-+  if (IsGuest()) {
-+    guest_delegate_->ResizeDueToAutoResize(new_size);
-+  }
-+}
-+
- void WebContents::BeforeUnloadFired(const base::TimeTicks& proceed_time) {
-   // Do nothing, we override this method just to avoid compilation error since
-   // there are two virtual functions named BeforeUnloadFired.
-changed in both
-  base   100644 af214562f5ac7499fcb3a6d777ea240cbd173a47 atom/browser/api/atom_api_web_contents.h
-  our    100644 7939f8268aa8c3371623e0c15f3b6001d7f1efa4 atom/browser/api/atom_api_web_contents.h
-  their  100644 2155656ccbdcc34731bcb01b99a89b7c321a96da atom/browser/api/atom_api_web_contents.h
-@@ -229,9 +229,12 @@
-                       WindowOpenDisposition disposition,
-                       const std::vector<std::string>& features,
-                       const scoped_refptr<network::ResourceRequestBody>& body);
-+<<<<<<< .our
- 
-   // Returns the preload script path of current WebContents.
-   v8::Local<v8::Value> GetPreloadPath(v8::Isolate* isolate) const;
-+=======
-+>>>>>>> .their
- 
-   // Returns the web preferences of current WebContents.
-   v8::Local<v8::Value> GetWebPreferences(v8::Isolate* isolate) const;
-@@ -340,6 +343,8 @@
-       const content::BluetoothChooser::EventHandler& handler) override;
-   content::JavaScriptDialogManager* GetJavaScriptDialogManager(
-       content::WebContents* source) override;
-+  void ResizeDueToAutoResize(content::WebContents* web_contents,
-+                             const gfx::Size& new_size) override;
- 
-   // content::WebContentsObserver:
-   void BeforeUnloadFired(const base::TimeTicks& proceed_time) override;
-changed in both
-  base   100644 8c2ce34a8a051fefe6a00ac2df33ebcb769b24b2 atom/browser/api/frame_subscriber.cc
-  our    100644 7bcb7ab9370a8b3fe245c9569c93dbbdac0a0697 atom/browser/api/frame_subscriber.cc
-  their  100644 b729a1cf6efc5fa974c609c08c60af2f8675f6d1 atom/browser/api/frame_subscriber.cc
-@@ -12,8 +12,11 @@
- #include "content/browser/renderer_host/render_widget_host_view_base.h"
- #include "ui/gfx/geometry/rect_conversions.h"
- #include "ui/gfx/skbitmap_operations.h"
-+<<<<<<< .our
- 
- #include "atom/common/node_includes.h"
-+=======
-+>>>>>>> .their
- 
- namespace atom {
- 
-@@ -26,8 +29,12 @@
-     : content::WebContentsObserver(web_contents),
-       isolate_(isolate),
-       callback_(callback),
-+<<<<<<< .our
-       only_dirty_(only_dirty),
-       weak_ptr_factory_(this) {}
-+=======
-+      only_dirty_(only_dirty) {}
-+>>>>>>> .their
- 
- FrameSubscriber::~FrameSubscriber() = default;
- 
-@@ -56,6 +63,7 @@
-   } else {
-     return gfx::Rect();
-   }
-+<<<<<<< .our
- }
- 
- void FrameSubscriber::DidReceiveCompositorFrame() {
-@@ -93,6 +101,36 @@
-       mate::Converter<gfx::Rect>::ToV8(isolate_, damage);
- 
-   callback_.Run(local_buffer, damage_rect);
-+=======
-+}
-+
-+void FrameSubscriber::DidReceiveCompositorFrame() {
-+  auto* view = web_contents()->GetRenderWidgetHostView();
-+  if (view == nullptr)
-+    return;
-+
-+  view->CopyFromSurface(
-+      gfx::Rect(), view->GetViewBounds().size(),
-+      base::BindOnce(&FrameSubscriber::Done, base::Unretained(this),
-+                     GetDamageRect()));
-+}
-+
-+void FrameSubscriber::Done(const gfx::Rect& damage, const SkBitmap& frame) {
-+  if (frame.drawsNothing())
-+    return;
-+
-+  const_cast<SkBitmap&>(frame).setAlphaType(kPremul_SkAlphaType);
-+  v8::Local<v8::Value> damage_rect =
-+      mate::Converter<gfx::Rect>::ToV8(isolate_, damage);
-+
-+  if (only_dirty_) {
-+    const SkBitmap& damageFrame = SkBitmapOperations::CreateTiledBitmap(
-+        frame, damage.x(), damage.y(), damage.width(), damage.height());
-+    callback_.Run(gfx::Image::CreateFrom1xBitmap(damageFrame), damage_rect);
-+  } else {
-+    callback_.Run(gfx::Image::CreateFrom1xBitmap(frame), damage_rect);
-+  }
-+>>>>>>> .their
- }
- 
- }  // namespace api
-changed in both
-  base   100644 4dbef58d9f0bd8591222f88f7cbaa43d32b98ca1 atom/browser/api/frame_subscriber.h
-  our    100644 d3e82855417cb59c0449f1c1b685970ffaea2af6 atom/browser/api/frame_subscriber.h
-  their  100644 1e43bae6035747dffd4a08f952c240c6169a8c21 atom/browser/api/frame_subscriber.h
-@@ -8,7 +8,10 @@
- #include "content/public/browser/web_contents.h"
- 
- #include "base/callback.h"
-+<<<<<<< .our
- #include "base/memory/weak_ptr.h"
-+=======
-+>>>>>>> .their
- #include "components/viz/common/frame_sinks/copy_output_result.h"
- #include "content/public/browser/web_contents_observer.h"
- #include "ui/gfx/image/image.h"
-@@ -23,13 +26,17 @@
- class FrameSubscriber : public content::WebContentsObserver {
-  public:
-   using FrameCaptureCallback =
--      base::Callback<void(v8::Local<v8::Value>, v8::Local<v8::Value>)>;
-+      base::Callback<void(const gfx::Image&, v8::Local<v8::Value>)>;
- 
-   FrameSubscriber(v8::Isolate* isolate,
-                   content::WebContents* web_contents,
-                   const FrameCaptureCallback& callback,
-                   bool only_dirty);
-+<<<<<<< .our
-   ~FrameSubscriber() override;
-+=======
-+  ~FrameSubscriber();
-+>>>>>>> .their
- 
-  private:
-   gfx::Rect GetDamageRect();
-@@ -40,8 +47,11 @@
-   FrameCaptureCallback callback_;
-   bool only_dirty_;
- 
-+<<<<<<< .our
-   base::WeakPtrFactory<FrameSubscriber> weak_ptr_factory_;
- 
-+=======
-+>>>>>>> .their
-   DISALLOW_COPY_AND_ASSIGN(FrameSubscriber);
- };
- 
-changed in both
-  base   100644 bee1f9c11dc2a42691453d38e0dfa2b59d3191bf atom/browser/atom_browser_client.cc
-  our    100644 57c4ee582405e6d501ec23940ccb10689ecd64a1 atom/browser/atom_browser_client.cc
-  their  100644 65ca3450f466573ab84a1da057af0520e4d58197 atom/browser/atom_browser_client.cc
-@@ -17,6 +17,7 @@
- #include "atom/browser/atom_resource_dispatcher_host_delegate.h"
- #include "atom/browser/atom_speech_recognition_manager_delegate.h"
- #include "atom/browser/child_web_contents_tracker.h"
-+#include "atom/browser/login_handler.h"
- #include "atom/browser/native_window.h"
- #include "atom/browser/session_preferences.h"
- #include "atom/browser/web_contents_permission_helper.h"
-@@ -31,6 +32,10 @@
- #include "base/strings/string_number_conversions.h"
- #include "base/strings/string_util.h"
- #include "chrome/browser/printing/printing_message_filter.h"
-+<<<<<<< .our
-+=======
-+#include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h"
-+>>>>>>> .their
- #include "chrome/browser/speech/tts_message_filter.h"
- #include "content/public/browser/browser_ppapi_host.h"
- #include "content/public/browser/client_certificate_delegate.h"
-@@ -60,10 +65,13 @@
- #include "net/ssl/client_cert_store.h"
- #endif
- 
-+<<<<<<< .our
- #if defined(ENABLE_PEPPER_FLASH)
- #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h"
- #endif  // defined(ENABLE_PEPPER_FLASH)
- 
-+=======
-+>>>>>>> .their
- using content::BrowserThread;
- 
- namespace atom {
-@@ -484,17 +492,42 @@
- std::unique_ptr<net::ClientCertStore> AtomBrowserClient::CreateClientCertStore(
-     content::ResourceContext* resource_context) {
- #if defined(USE_NSS_CERTS)
-+<<<<<<< .our
-   return std::make_unique<net::ClientCertStoreNSS>(
-       net::ClientCertStoreNSS::PasswordDelegateFactory());
- #elif defined(OS_WIN)
-   return std::make_unique<net::ClientCertStoreWin>();
- #elif defined(OS_MACOSX)
-   return std::make_unique<net::ClientCertStoreMac>();
-+=======
-+  return std::unique_ptr<net::ClientCertStore>(new net::ClientCertStoreNSS(
-+      net::ClientCertStoreNSS::PasswordDelegateFactory()));
-+#elif defined(OS_WIN)
-+  return std::unique_ptr<net::ClientCertStore>(new net::ClientCertStoreWin());
-+#elif defined(OS_MACOSX)
-+  return std::unique_ptr<net::ClientCertStore>(new net::ClientCertStoreMac());
-+>>>>>>> .their
- #elif defined(USE_OPENSSL)
-   return std::unique_ptr<net::ClientCertStore>();
- #endif
- }
- 
-+<<<<<<< .our
-+=======
-+content::ResourceDispatcherHostLoginDelegate*
-+AtomBrowserClient::CreateLoginDelegate(
-+    net::AuthChallengeInfo* auth_info,
-+    content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
-+    bool is_main_frame,
-+    const GURL& url,
-+    bool first_auth_attempt,
-+    const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-+        auth_required_callback) {
-+  return new LoginHandler(auth_info, web_contents_getter, url,
-+                          auth_required_callback);
-+}
-+
-+>>>>>>> .their
- brightray::BrowserMainParts* AtomBrowserClient::OverrideCreateBrowserMainParts(
-     const content::MainFunctionParams&) {
-   v8::V8::Initialize();  // Init V8 before creating main parts.
-changed in both
-  base   100644 c7bbc88375418dda9fe336ef15447fe94a127d08 atom/browser/atom_browser_client.h
-  our    100644 a0284cf3f72e9cd4292b636948f92bb09b97f0ae atom/browser/atom_browser_client.h
-  their  100644 51cd6ebc6f01b916af0889b7308909a416b92bf0 atom/browser/atom_browser_client.h
-@@ -106,6 +106,17 @@
-   void SiteInstanceDeleting(content::SiteInstance* site_instance) override;
-   std::unique_ptr<net::ClientCertStore> CreateClientCertStore(
-       content::ResourceContext* resource_context) override;
-+<<<<<<< .our
-+=======
-+  content::ResourceDispatcherHostLoginDelegate* CreateLoginDelegate(
-+      net::AuthChallengeInfo* auth_info,
-+      content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
-+      bool is_main_frame,
-+      const GURL& url,
-+      bool first_auth_attempt,
-+      const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-+          auth_required_callback) override;
-+>>>>>>> .their
- 
-   // brightray::BrowserClient:
-   brightray::BrowserMainParts* OverrideCreateBrowserMainParts(
-changed in both
-  base   100644 1cc741e2f406187564c95f286a35a77cf3cf98f8 atom/browser/atom_browser_context.cc
-  our    100644 e036cbc8103f19a034ce386940462f8a23ea6807 atom/browser/atom_browser_context.cc
-  their  100644 e3dbfedc0c2d70762301b86f3138cc325131e7f5 atom/browser/atom_browser_context.cc
-@@ -19,6 +19,10 @@
- #include "base/files/file_path.h"
- #include "base/path_service.h"
- #include "base/strings/stringprintf.h"
-+<<<<<<< .our
-+=======
-+#include "base/task_scheduler/post_task.h"
-+>>>>>>> .their
- #include "chrome/common/chrome_paths.h"
- #include "chrome/common/pref_names.h"
- #include "components/prefs/pref_registry_simple.h"
-@@ -100,8 +104,29 @@
-   return permission_manager_.get();
- }
- 
-+<<<<<<< .our
- storage::SpecialStoragePolicy* AtomBrowserContext::GetSpecialStoragePolicy() {
-   return storage_policy_.get();
-+=======
-+std::unique_ptr<net::CertVerifier> AtomBrowserContext::CreateCertVerifier(
-+    brightray::RequireCTDelegate* ct_delegate) {
-+  return base::WrapUnique(new AtomCertVerifier(ct_delegate));
-+}
-+
-+std::vector<std::string> AtomBrowserContext::GetCookieableSchemes() {
-+  auto default_schemes = brightray::BrowserContext::GetCookieableSchemes();
-+  const auto& standard_schemes = atom::api::GetStandardSchemes();
-+  default_schemes.insert(default_schemes.end(), standard_schemes.begin(),
-+                         standard_schemes.end());
-+  return default_schemes;
-+}
-+
-+void AtomBrowserContext::NotifyCookieChange(const net::CanonicalCookie& cookie,
-+                                            bool removed,
-+                                            net::CookieChangeCause cause) {
-+  CookieDetails cookie_details(&cookie, removed, cause);
-+  cookie_change_sub_list_.Notify(&cookie_details);
-+>>>>>>> .their
- }
- 
- void AtomBrowserContext::RegisterPrefs(PrefRegistrySimple* pref_registry) {
-changed in both
-  base   100644 f825413a96c6a98cf3de319ca7474554e5238a77 atom/browser/atom_browser_context.h
-  our    100644 9e6a841ceb8d11069a1a094bf7dbbd3a788918b3 atom/browser/atom_browser_context.h
-  their  100644 b60a4e682b0a77acf31def4ea2ef0b7dae187b99 atom/browser/atom_browser_context.h
-@@ -35,7 +35,28 @@
-       const base::DictionaryValue& options = base::DictionaryValue());
- 
-   void SetUserAgent(const std::string& user_agent);
-+<<<<<<< .our
-   AtomBlobReader* GetBlobReader();
-+=======
-+  // Register callbacks that needs to notified on any cookie store changes.
-+  std::unique_ptr<base::CallbackList<void(const CookieDetails*)>::Subscription>
-+  RegisterCookieChangeCallback(
-+      const base::Callback<void(const CookieDetails*)>& cb);
-+
-+  // brightray::URLRequestContextGetter::Delegate:
-+  std::unique_ptr<net::NetworkDelegate> CreateNetworkDelegate() override;
-+  std::string GetUserAgent() override;
-+  std::unique_ptr<net::URLRequestJobFactory> CreateURLRequestJobFactory(
-+      content::ProtocolHandlerMap* protocol_handlers) override;
-+  net::HttpCache::BackendFactory* CreateHttpCacheBackendFactory(
-+      const base::FilePath& base_path) override;
-+  std::unique_ptr<net::CertVerifier> CreateCertVerifier(
-+      brightray::RequireCTDelegate* ct_delegate) override;
-+  std::vector<std::string> GetCookieableSchemes() override;
-+  void NotifyCookieChange(const net::CanonicalCookie& cookie,
-+                          bool removed,
-+                          net::CookieChangeCause cause) override;
-+>>>>>>> .their
- 
-   // content::BrowserContext:
-   content::DownloadManagerDelegate* GetDownloadManagerDelegate() override;
-changed in both
-  base   100644 6b19e7e0d1504e8030327887f635f91e56159c44 atom/browser/atom_browser_main_parts.cc
-  our    100644 5229b19ca9af7845a3f2f13b7e0913f633b68b1d atom/browser/atom_browser_main_parts.cc
-  their  100644 c5ba3125b10c1b3fec2368033d30d7f7d6a27a15 atom/browser/atom_browser_main_parts.cc
-changed in both
-  base   100644 03f11c3a35149b69e459e8b4d5e32aaf7a68dd51 atom/browser/atom_javascript_dialog_manager.cc
-  our    100644 25fc326ebac3f2a5beb9199194067dae12c8229b atom/browser/atom_javascript_dialog_manager.cc
-  their  100644 c0c7be6302796cf774923757b466084816d897fe atom/browser/atom_javascript_dialog_manager.cc
-changed in both
-  base   100644 246f8a8645d1787f1a8463c0725791e97b7eaf6f atom/browser/browser.h
-  our    100644 aed7d25c37da59c0dd5e09940a064c329353a0b2 atom/browser/browser.h
-  their  100644 39cc0f9812ac766ff70f3eabb62882c04a2bfd4f atom/browser/browser.h
-changed in both
-  base   100644 1c7ff9c4b3abd3d9166c10cdff8f901cde854174 atom/browser/common_web_contents_delegate.cc
-  our    100644 b3b1195e044cd2c74b246aa13e9e85953d694477 atom/browser/common_web_contents_delegate.cc
-  their  100644 d5ab67eef25b489e46569076d5bd63ab92a6d325 atom/browser/common_web_contents_delegate.cc
-changed in both
-  base   100644 a977e1667dc3849bd9bce71d72d8da259a9be5f6 atom/browser/common_web_contents_delegate.h
-  our    100644 5da5d20975b8e795e34c9d8c7649f6f0eb3d0a50 atom/browser/common_web_contents_delegate.h
-  their  100644 1adb6d23ef0c3a69cdf74410c8dae369cf3e1562 atom/browser/common_web_contents_delegate.h
-changed in both
-  base   100644 d870c58b0921e16201899c7583837b3b493827cf atom/browser/login_handler.cc
-  our    100644 2063c6197fce449d1692f1b067c17e043b1d37e4 atom/browser/login_handler.cc
-  their  100644 0bba530d6086001a6d4d049c6355487c6e5bf613 atom/browser/login_handler.cc
-@@ -5,7 +5,6 @@
- #include "atom/browser/login_handler.h"
- 
- #include "atom/browser/browser.h"
--#include "atom/common/native_mate_converters/net_converter.h"
- #include "base/values.h"
- #include "content/public/browser/browser_thread.h"
- #include "content/public/browser/web_contents.h"
-@@ -16,6 +15,7 @@
- namespace atom {
- 
- LoginHandler::LoginHandler(
-+<<<<<<< .our
-     net::URLRequest* request,
-     const net::AuthChallengeInfo& auth_info,
-     const net::NetworkDelegate::AuthCallback& callback,
-@@ -33,6 +33,22 @@
- 
-   web_contents_getter_ =
-       resource_request_info->GetWebContentsGetterForRequest();
-+=======
-+    net::AuthChallengeInfo* auth_info,
-+    content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
-+    const GURL& url,
-+    const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-+        auth_required_callback)
-+    : auth_info_(auth_info),
-+      web_contents_getter_(web_contents_getter),
-+      auth_required_callback_(auth_required_callback) {
-+  // Fill request details on IO thread.
-+  // TODO(deepak1556): Fill in method and referrer details to
-+  // avoid breaking the app login event.
-+  std::unique_ptr<base::DictionaryValue> request_details(
-+      new base::DictionaryValue);
-+  request_details->SetKey("url", base::Value(url.spec()));
-+>>>>>>> .their
- 
-   BrowserThread::PostTask(
-       BrowserThread::UI, FROM_HERE,
-@@ -42,6 +58,14 @@
- 
- LoginHandler::~LoginHandler() {}
- 
-+<<<<<<< .our
-+=======
-+content::WebContents* LoginHandler::GetWebContents() const {
-+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-+  return web_contents_getter_.Run();
-+}
-+
-+>>>>>>> .their
- void LoginHandler::Login(const base::string16& username,
-                          const base::string16& password) {
-   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-@@ -60,10 +84,16 @@
-       base::BindOnce(&LoginHandler::DoCancelAuth, weak_factory_.GetWeakPtr()));
- }
- 
-+<<<<<<< .our
- void LoginHandler::NotifyRequestDestroyed() {
-   auth_callback_.Reset();
-   credentials_ = nullptr;
-   weak_factory_.InvalidateWeakPtrs();
-+=======
-+void LoginHandler::OnRequestCancelled() {
-+  TestAndSetAuthHandled();
-+  auth_required_callback_.Reset();
-+>>>>>>> .their
- }
- 
- content::WebContents* LoginHandler::GetWebContents() const {
-@@ -73,18 +103,29 @@
- 
- void LoginHandler::DoCancelAuth() {
-   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-+<<<<<<< .our
-   if (!auth_callback_.is_null())
-     std::move(auth_callback_)
-         .Run(net::NetworkDelegate::AUTH_REQUIRED_RESPONSE_CANCEL_AUTH);
-+=======
-+  if (!auth_required_callback_.is_null())
-+    std::move(auth_required_callback_).Run(base::nullopt);
-+>>>>>>> .their
- }
- 
- void LoginHandler::DoLogin(const base::string16& username,
-                            const base::string16& password) {
-   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-+<<<<<<< .our
-   if (!auth_callback_.is_null()) {
-     credentials_->Set(username, password);
-     std::move(auth_callback_)
-         .Run(net::NetworkDelegate::AUTH_REQUIRED_RESPONSE_SET_AUTH);
-+=======
-+  if (!auth_required_callback_.is_null()) {
-+    std::move(auth_required_callback_)
-+        .Run(net::AuthCredentials(username, password));
-+>>>>>>> .their
-   }
- }
- 
-changed in both
-  base   100644 16cded48625c9541d8fe4e6034a617853f4a58e7 atom/browser/login_handler.h
-  our    100644 e7f1c5be0094506e01d2cccc0073fa864dfefb56 atom/browser/login_handler.h
-  their  100644 80ff986e0be400c13388607abfe48fe51ac6d512 atom/browser/login_handler.h
-@@ -6,26 +6,55 @@
- #define ATOM_BROWSER_LOGIN_HANDLER_H_
- 
- #include "base/callback.h"
-+<<<<<<< .our
- #include "base/memory/ref_counted.h"
- #include "base/memory/weak_ptr.h"
- #include "base/strings/string16.h"
- #include "content/public/browser/resource_request_info.h"
- #include "net/base/network_delegate.h"
-+=======
-+#include "base/optional.h"
-+#include "base/strings/string16.h"
-+#include "base/synchronization/lock.h"
-+#include "content/public/browser/resource_dispatcher_host_login_delegate.h"
-+#include "content/public/browser/resource_request_info.h"
-+>>>>>>> .their
- 
- namespace content {
- class WebContents;
- }
- 
-+<<<<<<< .our
-+=======
-+namespace net {
-+class AuthChallengeInfo;
-+class AuthCredentials;
-+}  // namespace net
-+
-+>>>>>>> .their
- namespace atom {
- 
- // Handles the HTTP basic auth, must be created on IO thread.
- class LoginHandler : public base::RefCountedThreadSafe<LoginHandler> {
-  public:
-+<<<<<<< .our
-   LoginHandler(net::URLRequest* request,
-                const net::AuthChallengeInfo& auth_info,
-                const net::NetworkDelegate::AuthCallback& callback,
-                net::AuthCredentials* credentials,
-                const content::ResourceRequestInfo* resource_request_info);
-+=======
-+  LoginHandler(
-+      net::AuthChallengeInfo* auth_info,
-+      content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
-+      const GURL& url,
-+      const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-+          auth_required_callback);
-+
-+  // Returns the WebContents associated with the request, must be called on UI
-+  // thread.
-+  content::WebContents* GetWebContents() const;
-+>>>>>>> .their
- 
-   // The auth is cancelled, must be called on UI thread.
-   void CancelAuth();
-@@ -61,10 +90,18 @@
-   // WebContents associated with the login request.
-   content::ResourceRequestInfo::WebContentsGetter web_contents_getter_;
- 
-+<<<<<<< .our
-   // Called with preferred value of net::NetworkDelegate::AuthRequiredResponse.
-   net::NetworkDelegate::AuthCallback auth_callback_;
- 
-   base::WeakPtrFactory<LoginHandler> weak_factory_;
-+=======
-+  // WebContents associated with the login request.
-+  content::ResourceRequestInfo::WebContentsGetter web_contents_getter_;
-+
-+  base::Callback<void(const base::Optional<net::AuthCredentials>&)>
-+      auth_required_callback_;
-+>>>>>>> .their
- 
-   DISALLOW_COPY_AND_ASSIGN(LoginHandler);
- };
-changed in both
-  base   100644 8f8ea28cd20f7895d12aa50b98ae89d3365157e5 atom/browser/mac/atom_application_delegate.mm
-  our    100644 683f7a84bcaa2c47bb78cf299314a5afeb15639b atom/browser/mac/atom_application_delegate.mm
-  their  100644 66fe539406a52046d114f52feb1c9f1b8403c828 atom/browser/mac/atom_application_delegate.mm
-changed in both
-  base   100644 86c506d423f8228d2f31ad93950944c5902e9aec atom/browser/native_window_mac.mm
-  our    100644 004263ec127709067e903ffbf31003b8844226b4 atom/browser/native_window_mac.mm
-  their  100644 ba28d4f501bd0ff3fe7df91a46d2af995708c84d atom/browser/native_window_mac.mm
-changed in both
-  base   100644 3471622db0b92b4b3a9d181e3b74053667b58060 atom/browser/net/atom_network_delegate.cc
-  our    100644 e71ea74317b69f31a5aac8e723902748972fed8f atom/browser/net/atom_network_delegate.cc
-  their  100644 21ea34d57739878358d0822f3377cc97fefc4ec0 atom/browser/net/atom_network_delegate.cc
-@@ -342,7 +342,12 @@
- 
- void AtomNetworkDelegate::OnResponseStarted(net::URLRequest* request,
-                                             int net_error) {
-+<<<<<<< .our
-   if (!base::ContainsKey(simple_listeners_, kOnResponseStarted))
-+=======
-+  if (!base::ContainsKey(simple_listeners_, kOnResponseStarted)) {
-+    brightray::NetworkDelegate::OnResponseStarted(request, net_error);
-+>>>>>>> .their
-     return;
- 
-   if (request->status().status() != net::URLRequestStatus::SUCCESS)
-changed in both
-  base   100644 1ee8d19dc90081a4617f4d27b9efb571d1bf6159 atom/browser/net/atom_network_delegate.h
-  our    100644 39a7a8ddfcda17fd7d022331132b54485d07a279 atom/browser/net/atom_network_delegate.h
-  their  100644 9288b70cb422caf38485d33212ec4a4be4ceb97e atom/browser/net/atom_network_delegate.h
-@@ -103,10 +103,13 @@
-   void OnBeforeRedirect(net::URLRequest* request,
-                         const GURL& new_location) override;
-   void OnResponseStarted(net::URLRequest* request, int net_error) override;
-+<<<<<<< .our
-   void OnNetworkBytesReceived(net::URLRequest* request,
-                               int64_t bytes_read) override {}
-   void OnNetworkBytesSent(net::URLRequest* request,
-                           int64_t bytes_sent) override {}
-+=======
-+>>>>>>> .their
-   void OnCompleted(net::URLRequest* request, bool started) override;
-   void OnURLRequestDestroyed(net::URLRequest* request) override;
-   void OnPACScriptError(int line_number, const base::string16& error) override {
-changed in both
-  base   100644 253b7558aa45d5376d8e45eafdbd00e664ae3bee atom/browser/net/atom_url_request.cc
-  our    100644 5ffbfd65a48b4459b2ebca66a5c2259f18ed80a8 atom/browser/net/atom_url_request.cc
-  their  100644 1aac780d88213871ab258845f8a0e3baf990cf27 atom/browser/net/atom_url_request.cc
-changed in both
-  base   100644 19aaef091fee953b36238b13b1451a7af01fb106 atom/browser/net/atom_url_request.h
-  our    100644 fde7b161385fb431b2d807012a00679a4bdb507a atom/browser/net/atom_url_request.h
-  their  100644 2b03ad7bc37ce6cfec1ff79ce183d37adf90749b atom/browser/net/atom_url_request.h
-changed in both
-  base   100644 7b5e20631aaf927b714c4a3edf89c3ab820bc800 atom/browser/net/js_asker.cc
-  our    100644 59e3ab881c2355c2ed29b806de59ef372c170b62 atom/browser/net/js_asker.cc
-  their  100644 daf978082f102937d142dcddbdd860c92c709dbe atom/browser/net/js_asker.cc
-@@ -62,8 +62,13 @@
-     if (dict->GetInteger("error", error))
-       return true;
-   } else if (value->is_int()) {
-+<<<<<<< .our
-     *error = value->GetInt();
-     return true;
-+=======
-+    if (value->GetAsInteger(error))
-+      return true;
-+>>>>>>> .their
-   }
-   return false;
- }
-changed in both
-  base   100644 a51e08e486bffb2cf2f8fb6b26358f299f8b2061 atom/browser/net/url_request_async_asar_job.cc
-  our    100644 1c15fd39b9d479b441b0931564f9e2c3f9de37c7 atom/browser/net/url_request_async_asar_job.cc
-  their  100644 06959032411d27e69ec441577b7a1987a2117080 atom/browser/net/url_request_async_asar_job.cc
-@@ -18,6 +18,7 @@
-     : JsAsker<asar::URLRequestAsarJob>(request, network_delegate) {}
- 
- void URLRequestAsyncAsarJob::StartAsync(std::unique_ptr<base::Value> options) {
-+<<<<<<< .our
-   std::string file_path;
-   if (options->is_dict()) {
-     auto* path_value =
-@@ -26,6 +27,14 @@
-       file_path = path_value->GetString();
-   } else if (options->is_string()) {
-     file_path = options->GetString();
-+=======
-+  base::FilePath::StringType file_path;
-+  if (options->is_dict()) {
-+    static_cast<base::DictionaryValue*>(options.get())
-+        ->GetString("path", &file_path);
-+  } else if (options->is_string()) {
-+    options->GetAsString(&file_path);
-+>>>>>>> .their
-   }
- 
-   if (file_path.empty()) {
-changed in both
-  base   100644 5d3be1e455c3d59a98e7b2293bca40aae7839376 atom/browser/net/url_request_fetch_job.cc
-  our    100644 68539433f4de80a96bc672de3a2834b299d6c04b atom/browser/net/url_request_fetch_job.cc
-  their  100644 09f7277ab6595e0e21d99e53a63d84ef6259de6d atom/browser/net/url_request_fetch_job.cc
-changed in both
-  base   100644 82d76d2854a2f73f2e997a60df01b4acbee1feb3 atom/browser/net/url_request_string_job.cc
-  our    100644 31381ff118665f10a53e13fbe0044046738ca230 atom/browser/net/url_request_string_job.cc
-  their  100644 453dd0bb6615880d75f73294d22e67ec9975b7c3 atom/browser/net/url_request_string_job.cc
-@@ -25,7 +25,11 @@
-     dict->GetString("charset", &charset_);
-     dict->GetString("data", &data_);
-   } else if (options->is_string()) {
-+<<<<<<< .our
-     data_ = options->GetString();
-+=======
-+    options->GetAsString(&data_);
-+>>>>>>> .their
-   }
-   net::URLRequestSimpleJob::Start();
- }
-changed in both
-  base   100644 b2b2cec7468193fc6f2fbe1d54b5c8e29a1c47df atom/browser/osr/osr_render_widget_host_view.cc
-  our    100644 4a2a0747fe2e6bf38c8999b80dbfea31e52a17fd atom/browser/osr/osr_render_widget_host_view.cc
-  their  100644 669785cbaa7762ebb8220632db229b24e58ebdca atom/browser/osr/osr_render_widget_host_view.cc
-@@ -280,6 +280,9 @@
- 
-   local_surface_id_ = local_surface_id_allocator_.GenerateId();
- 
-+  // Surface synchronization is not supported with OSR.
-+  DCHECK(!features::IsSurfaceSynchronizationEnabled());
-+
- #if defined(OS_MACOSX)
-   last_frame_root_background_color_ = SK_ColorTRANSPARENT;
-   CreatePlatformWidget(is_guest_view_hack);
-@@ -755,6 +758,18 @@
-   render_widget_host_->DidProcessFrame(frame_token);
- }
- 
-+<<<<<<< .our
-+=======
-+void OffScreenRenderWidgetHostView::OnFirstSurfaceActivation(
-+    const viz::SurfaceInfo& surface_info) {}
-+
-+void OffScreenRenderWidgetHostView::OnBeginFrame(base::TimeTicks frame_time) {}
-+
-+void OffScreenRenderWidgetHostView::OnFrameTokenChanged(uint32_t frame_token) {
-+  render_widget_host_->DidProcessFrame(frame_token);
-+}
-+
-+>>>>>>> .their
- void OffScreenRenderWidgetHostView::DidReceiveFirstFrameAfterNavigation() {
-   render_widget_host_->DidReceiveFirstFrameAfterNavigation();
- }
-@@ -1131,11 +1146,16 @@
-                 popup_host_view_->popup_position_.x(),
-             mouse_wheel_event.PositionInWidget().y -
-                 popup_host_view_->popup_position_.y());
-+<<<<<<< .our
-         popup_mouse_wheel_event.SetPositionInScreen(
-             popup_mouse_wheel_event.PositionInWidget().x,
-             popup_mouse_wheel_event.PositionInWidget().y);
- 
-         popup_host_view_->SendMouseWheelEvent(popup_mouse_wheel_event);
-+=======
-+        popup_host_view_->ProcessMouseWheelEvent(popup_event,
-+                                                 ui::LatencyInfo());
-+>>>>>>> .their
-         return;
-       } else {
-         // Scrolling outside of the popup widget so destroy it.
-changed in both
-  base   100644 bba0c25c2a330cd958bde946b766a9fe95f28efa atom/browser/osr/osr_render_widget_host_view.h
-  our    100644 b81f6310f864c00fea50b1aac49dc89173eaa302 atom/browser/osr/osr_render_widget_host_view.h
-  their  100644 10cc7530f8b177d667f170fb08b32d6c44dd957d atom/browser/osr/osr_render_widget_host_view.h
-@@ -170,6 +170,10 @@
-   bool DelegatedFrameCanCreateResizeLock() const override;
-   std::unique_ptr<content::CompositorResizeLock>
-   DelegatedFrameHostCreateResizeLock() override;
-+<<<<<<< .our
-+=======
-+  viz::LocalSurfaceId GetLocalSurfaceId() const override;
-+>>>>>>> .their
-   void OnFirstSurfaceActivation(const viz::SurfaceInfo& surface_info) override;
-   void OnBeginFrame(base::TimeTicks frame_time) override;
-   void OnFrameTokenChanged(uint32_t frame_token) override;
-@@ -181,11 +185,14 @@
-   bool IsAutoResizeEnabled() const override;
- #endif  // !defined(OS_MACOSX)
- 
-+<<<<<<< .our
-   viz::LocalSurfaceId GetLocalSurfaceId() const override;
-   viz::FrameSinkId GetFrameSinkId() override;
- 
-   void DidNavigate() override;
- 
-+=======
-+>>>>>>> .their
-   bool TransformPointToLocalCoordSpace(const gfx::PointF& point,
-                                        const viz::SurfaceId& original_surface,
-                                        gfx::PointF* transformed_point) override;
-changed in both
-  base   100644 4c6f88efb6eb3d6db1235079a18fa27cddee988e atom/browser/osr/osr_render_widget_host_view_mac.mm
-  our    100644 8af4ce6ec263a6fba9f3c736ff74247c86787dbc atom/browser/osr/osr_render_widget_host_view_mac.mm
-  their  100644 81d39897f656613002d24a329eeb92d055d4be20 atom/browser/osr/osr_render_widget_host_view_mac.mm
-@@ -22,7 +22,11 @@
-   virtual ~MacHelper() {}
- 
-   // content::BrowserCompositorMacClient:
-+<<<<<<< .our
-   SkColor BrowserCompositorMacGetGutterColor() const override {
-+=======
-+  SkColor BrowserCompositorMacGetGutterColor(SkColor color) const override {
-+>>>>>>> .their
-     // When making an element on the page fullscreen the element's background
-     // may not match the page's, so use black as the gutter color to avoid
-     // flashes of brighter colors during the transition.
-@@ -81,7 +85,11 @@
- 
- void OffScreenRenderWidgetHostView::StopSpeaking() {}
- 
-+<<<<<<< .our
- bool OffScreenRenderWidgetHostView::ShouldContinueToPauseForFrame() {
-+=======
-+bool CefRenderWidgetHostViewOSR::ShouldContinueToPauseForFrame() {
-+>>>>>>> .their
-   return browser_compositor_->ShouldContinueToPauseForFrame();
- }
- 
-changed in both
-  base   100644 e73d055de09d58e87a5a1045c17d378548d1b00a atom/browser/resources/mac/Info.plist
-  our    100644 9094f0f7335edf833d51f688851e6a105de60433 atom/browser/resources/mac/Info.plist
-  their  100644 b8d6a2da8099c4826e7706d4859d9a6f2da0706d atom/browser/resources/mac/Info.plist
-@@ -23,7 +23,7 @@
-   <key>LSApplicationCategoryType</key>
-   <string>public.app-category.developer-tools</string>
-   <key>LSMinimumSystemVersion</key>
--  <string>10.9.0</string>
-+  <string>10.10.0</string>
-   <key>NSMainNibFile</key>
-   <string>MainMenu</string>
-   <key>NSPrincipalClass</key>
-changed in both
-  base   100644 89b6213a49ebc406a19fc4aae3b1ca718f09fe40 atom/browser/ui/autofill_popup.cc
-  our    100644 f7bd98dacb9812491e80f03a093381f145b03587 atom/browser/ui/autofill_popup.cc
-  their  100644 8719421abefdb4bc634c3eef27390d59a4125823 atom/browser/ui/autofill_popup.cc
-changed in both
-  base   100644 d0fbf08068f849d31de74aac78115382985e3685 atom/browser/ui/autofill_popup.h
-  our    100644 fe1b91760d8628566a858e406a896a006aa5d4ca atom/browser/ui/autofill_popup.h
-  their  100644 7e4f591f7436ced6bccc0032114239b9e50959bf atom/browser/ui/autofill_popup.h
-changed in both
-  base   100644 ac68d8313055f1b9f2c0d5242fda6d8c488d3d10 atom/browser/ui/certificate_trust_win.cc
-  our    100644 f3dc0e0cc6ae044daf9cc499061db98f387d7dea atom/browser/ui/certificate_trust_win.cc
-  their  100644 6179b08607041c38996d7faef8f7f456e42e4ac4 atom/browser/ui/certificate_trust_win.cc
-changed in both
-  base   100644 9821ccc537b0983257fdef15f2d9db973b926cbe atom/browser/ui/views/menu_bar.cc
-  our    100644 e838d3cc217b5ffdb77226beff0d7217539f23f9 atom/browser/ui/views/menu_bar.cc
-  their  100644 535af8f2803187d737e1f5e42507d95b9b7272c2 atom/browser/ui/views/menu_bar.cc
-@@ -29,8 +29,13 @@
-     : background_color_(kDefaultColor), window_(window) {
-   RefreshColorCache();
-   UpdateViewColors();
-+<<<<<<< .our
-   SetLayoutManager(
-       std::make_unique<views::BoxLayout>(views::BoxLayout::kHorizontal));
-+=======
-+  SetLayoutManager(std::make_unique<views::BoxLayout>(
-+      views::BoxLayout::kHorizontal));
-+>>>>>>> .their
-   window_->GetFocusManager()->AddFocusChangeListener(this);
- }
- 
-changed in both
-  base   100644 eeed3ca10e78057b1b6b97b62889fe48af7dfb2d atom/browser/ui/win/taskbar_host.h
-  our    100644 2182d377a7736f5e135d2f518c2a0a838cd0d1a0 atom/browser/ui/win/taskbar_host.h
-  their  100644 31199cf22837b604beca1fe92627b53cf6f71e8f atom/browser/ui/win/taskbar_host.h
-changed in both
-  base   100644 f1d144bc5a0b141a7da71cbd22005d55f78011ab atom/browser/web_view_guest_delegate.cc
-  our    100644 27fbff7e9e3633bd17c54b4c67ba4a1d5993e449 atom/browser/web_view_guest_delegate.cc
-  their  100644 ed8e2d87c7609fe2e1b11d20fa5a664107bcfca2 atom/browser/web_view_guest_delegate.cc
-@@ -24,6 +24,7 @@
-   ResetZoomController();
- }
- 
-+<<<<<<< .our
- void WebViewGuestDelegate::AttachToIframe(
-     content::WebContents* embedder_web_contents,
-     int embedder_frame_id) {
-@@ -41,6 +42,83 @@
-   // frame |embedder_frame| hosts the inner WebContents.
-   api_web_contents_->web_contents()->AttachToOuterWebContentsFrame(
-       embedder_web_contents_, embedder_frame);
-+=======
-+void WebViewGuestDelegate::SetSize(const SetSizeParams& params) {
-+  bool enable_auto_size =
-+      params.enable_auto_size ? *params.enable_auto_size : auto_size_enabled_;
-+  gfx::Size min_size = params.min_size ? *params.min_size : min_auto_size_;
-+  gfx::Size max_size = params.max_size ? *params.max_size : max_auto_size_;
-+
-+  if (params.normal_size)
-+    normal_size_ = *params.normal_size;
-+
-+  min_auto_size_ = min_size;
-+  min_auto_size_.SetToMin(max_size);
-+  max_auto_size_ = max_size;
-+  max_auto_size_.SetToMax(min_size);
-+
-+  enable_auto_size &= !min_auto_size_.IsEmpty() && !max_auto_size_.IsEmpty();
-+
-+  auto* rvh = web_contents()->GetRenderViewHost();
-+  if (enable_auto_size) {
-+    // Autosize is being enabled.
-+    rvh->EnableAutoResize(min_auto_size_, max_auto_size_);
-+    normal_size_.SetSize(0, 0);
-+  } else {
-+    // Autosize is being disabled.
-+    // Use default width/height if missing from partially defined normal size.
-+    if (normal_size_.width() && !normal_size_.height())
-+      normal_size_.set_height(GetDefaultSize().height());
-+    if (!normal_size_.width() && normal_size_.height())
-+      normal_size_.set_width(GetDefaultSize().width());
-+
-+    gfx::Size new_size;
-+    if (!normal_size_.IsEmpty()) {
-+      new_size = normal_size_;
-+    } else if (!guest_size_.IsEmpty()) {
-+      new_size = guest_size_;
-+    } else {
-+      new_size = GetDefaultSize();
-+    }
-+
-+    bool changed_due_to_auto_resize = false;
-+    if (auto_size_enabled_) {
-+      // Autosize was previously enabled.
-+      rvh->DisableAutoResize(new_size);
-+      changed_due_to_auto_resize = true;
-+    } else {
-+      // Autosize was already disabled.
-+      guest_host_->SizeContents(new_size);
-+    }
-+
-+    UpdateGuestSize(new_size, changed_due_to_auto_resize);
-+  }
-+
-+  auto_size_enabled_ = enable_auto_size;
-+}
-+
-+void WebViewGuestDelegate::ResizeDueToAutoResize(const gfx::Size& new_size) {
-+  UpdateGuestSize(new_size, auto_size_enabled_);
-+}
-+
-+void WebViewGuestDelegate::DidFinishNavigation(
-+    content::NavigationHandle* navigation_handle) {
-+  if (navigation_handle->HasCommitted() && !navigation_handle->IsErrorPage()) {
-+    auto is_main_frame = navigation_handle->IsInMainFrame();
-+    auto url = navigation_handle->GetURL();
-+    api_web_contents_->Emit("load-commit", url, is_main_frame);
-+  }
-+}
-+
-+void WebViewGuestDelegate::DidDetach() {
-+  attached_ = false;
-+  ResetZoomController();
-+}
-+
-+void WebViewGuestDelegate::DidAttach(int guest_proxy_routing_id) {
-+  attached_ = true;
-+  api_web_contents_->Emit("did-attach");
-+>>>>>>> .their
- 
-   ResetZoomController();
- 
-@@ -50,11 +128,20 @@
-   auto* zoom_controller = api_web_contents_->GetZoomController();
-   zoom_controller->SetEmbedderZoomController(embedder_zoom_controller_);
- 
-+<<<<<<< .our
-   api_web_contents_->Emit("did-attach");
- }
- 
- void WebViewGuestDelegate::DidDetach() {
-   ResetZoomController();
-+=======
-+content::WebContents* WebViewGuestDelegate::GetOwnerWebContents() const {
-+  return embedder_web_contents_;
-+}
-+
-+void WebViewGuestDelegate::SetGuestHost(content::GuestHost* guest_host) {
-+  guest_host_ = guest_host;
-+>>>>>>> .their
- }
- 
- content::WebContents* WebViewGuestDelegate::GetOwnerWebContents() const {
-@@ -77,8 +164,28 @@
-   }
- }
- 
-+<<<<<<< .our
- void WebViewGuestDelegate::OnZoomControllerWebContentsDestroyed() {
-   ResetZoomController();
-+=======
-+void WebViewGuestDelegate::UpdateGuestSize(const gfx::Size& new_size,
-+                                           bool due_to_auto_resize) {
-+  if (due_to_auto_resize)
-+    api_web_contents_->Emit("size-changed", guest_size_.width(),
-+                            guest_size_.height(), new_size.width(),
-+                            new_size.height());
-+  guest_size_ = new_size;
-+}
-+
-+gfx::Size WebViewGuestDelegate::GetDefaultSize() const {
-+  if (is_full_page_plugin_) {
-+    // Full page plugins default to the size of the owner's viewport.
-+    return embedder_web_contents_->GetRenderWidgetHostView()
-+        ->GetVisibleViewportSize();
-+  } else {
-+    return gfx::Size(kDefaultWidth, kDefaultHeight);
-+  }
-+>>>>>>> .their
- }
- 
- void WebViewGuestDelegate::ResetZoomController() {
-changed in both
-  base   100644 2384b0e6dd4561d8ab6018d3d21d30a3b0590123 atom/browser/web_view_guest_delegate.h
-  our    100644 6d9f440588d1d38a869ca6b6a33fd31031091efa atom/browser/web_view_guest_delegate.h
-  their  100644 784ca99275dd97e32b22a68d1bc49a804e48b213 atom/browser/web_view_guest_delegate.h
-@@ -21,16 +21,44 @@
-                        api::WebContents* api_web_contents);
-   ~WebViewGuestDelegate() override;
- 
-+<<<<<<< .our
-   // Attach to the iframe.
-   void AttachToIframe(content::WebContents* embedder_web_contents,
-                       int embedder_frame_id);
-+=======
-+  void Initialize(api::WebContents* api_web_contents);
-+
-+  // Called when the WebContents is going to be destroyed.
-+  void Destroy();
-+
-+  // Used to toggle autosize mode for this GuestView, and set both the automatic
-+  // and normal sizes.
-+  void SetSize(const SetSizeParams& params);
-+
-+  // Invoked when the contents auto-resized and the container should match it.
-+  void ResizeDueToAutoResize(const gfx::Size& new_size);
-+
-+  // Return true if attached.
-+  bool IsAttached() const { return attached_; }
-+>>>>>>> .their
- 
-  protected:
-   // content::BrowserPluginGuestDelegate:
-   void DidDetach() final;
-   content::WebContents* GetOwnerWebContents() const final;
-+<<<<<<< .our
-   content::RenderWidgetHost* GetOwnerRenderWidgetHost() final;
-   content::SiteInstance* GetOwnerSiteInstance() final;
-+=======
-+  void SetGuestHost(content::GuestHost* guest_host) final;
-+  void WillAttach(content::WebContents* embedder_web_contents,
-+                  int element_instance_id,
-+                  bool is_full_page_plugin,
-+                  const base::Closure& completion_callback) final;
-+  bool CanBeEmbeddedInsideCrossProcessFrames() override;
-+  content::RenderWidgetHost* GetOwnerRenderWidgetHost() override;
-+  content::SiteInstance* GetOwnerSiteInstance() override;
-+>>>>>>> .their
-   content::WebContents* CreateNewGuestWindow(
-       const content::WebContents::CreateParams& create_params) final;
- 
-@@ -41,6 +69,19 @@
-   void OnZoomControllerWebContentsDestroyed() override;
- 
-  private:
-+<<<<<<< .our
-+=======
-+  // This method is invoked when the contents auto-resized to give the container
-+  // an opportunity to match it if it wishes.
-+  //
-+  // This gives the derived class an opportunity to inform its container element
-+  // or perform other actions.
-+  void UpdateGuestSize(const gfx::Size& new_size, bool due_to_auto_resize);
-+
-+  // Returns the default size of the guestview.
-+  gfx::Size GetDefaultSize() const;
-+
-+>>>>>>> .their
-   void ResetZoomController();
- 
-   // The WebContents that attaches this guest view.
-changed in both
-  base   100644 0770f061acf6529ca55207258d70c3a2947e402f atom/common/api/atom_api_v8_util.cc
-  our    100644 3d80db0c0a4cdbb4c7a78fa7e4266fc6fc87193f atom/common/api/atom_api_v8_util.cc
-  their  100644 a7bf28a8e2cfd62ba198aabcc572fbb31cd0a8a7 atom/common/api/atom_api_v8_util.cc
-changed in both
-  base   100644 66211723a8feb5c0de9d4782f5ef25f977b133f7 atom/common/api/atom_bindings.cc
-  our    100644 3dba3d63673ca8eb02044bd1335a3095f0194971 atom/common/api/atom_bindings.cc
-  their  100644 ae243cdfaa15acd91f53f4112140845578d20393 atom/common/api/atom_bindings.cc
-@@ -14,7 +14,10 @@
- #include "atom/common/native_mate_converters/string16_converter.h"
- #include "atom/common/node_includes.h"
- #include "base/logging.h"
-+<<<<<<< .our
- #include "base/process/process_info.h"
-+=======
-+>>>>>>> .their
- #include "base/process/process_metrics_iocounters.h"
- #include "base/sys_info.h"
- #include "native_mate/dictionary.h"
-changed in both
-  base   100644 ef8f0e33adb74a276a3738a1fc735433d2a0f632 atom/common/asar/archive.cc
-  our    100644 9b37f94a4dc462c0cc84e0182654ff2571952df9 atom/common/asar/archive.cc
-  their  100644 5a08a99701deb5b53b9245ecfd1a9100d0ce607a atom/common/asar/archive.cc
-changed in both
-  base   100644 a74ae403213bdce8b5b605caaa3c042d08254b28 atom/common/native_mate_converters/content_converter.cc
-  our    100644 2684aa7dda07ac79e47823c3cf9bf00d3f5cf3f5 atom/common/native_mate_converters/content_converter.cc
-  their  100644 46364e21266a93c7c496d87acbf6cc4ff4965194 atom/common/native_mate_converters/content_converter.cc
-changed in both
-  base   100644 8e490ca733b4a97ac18f288e0b8c58c812c76a66 atom/common/native_mate_converters/net_converter.cc
-  our    100644 db54210e7c095da593c6f5b9f4ed1eafb91b945d atom/common/native_mate_converters/net_converter.cc
-  their  100644 b95cfbaeb5e0595dd5f22728a575b571a5d50eb3 atom/common/native_mate_converters/net_converter.cc
-added in both
-  our    100644 61a6563a617030684081e4934044865fdc3c6540 atom/common/native_mate_converters/network_converter.cc
-  their  100644 1037e5f111fbea5c780a168305b2d102e41a58d3 atom/common/native_mate_converters/network_converter.cc
-@@ -6,7 +6,10 @@
- 
- #include <string>
- #include <utility>
-+<<<<<<< .our
- #include <vector>
-+=======
-+>>>>>>> .their
- 
- #include "atom/common/native_mate_converters/value_converter.h"
- #include "native_mate/dictionary.h"
-@@ -21,6 +24,7 @@
-     const scoped_refptr<network::ResourceRequestBody>& val) {
-   if (!val)
-     return v8::Null(isolate);
-+<<<<<<< .our
-   auto list = std::make_unique<base::ListValue>();
-   for (const auto& element : *(val->elements())) {
-     auto post_data_dict = std::make_unique<base::DictionaryValue>();
-@@ -28,6 +32,16 @@
-     if (type == network::DataElement::TYPE_BYTES) {
-       auto bytes = std::make_unique<base::Value>(std::vector<char>(
-           element.bytes(), element.bytes() + (element.length())));
-+=======
-+  std::unique_ptr<base::ListValue> list(new base::ListValue);
-+  for (const auto& element : *(val->elements())) {
-+    std::unique_ptr<base::DictionaryValue> post_data_dict(
-+        new base::DictionaryValue);
-+    auto type = element.type();
-+    if (type == network::DataElement::TYPE_BYTES) {
-+      std::unique_ptr<base::Value> bytes(base::Value::CreateWithCopiedBuffer(
-+          element.bytes(), static_cast<size_t>(element.length())));
-+>>>>>>> .their
-       post_data_dict->SetString("type", "rawData");
-       post_data_dict->Set("bytes", std::move(bytes));
-     } else if (type == network::DataElement::TYPE_FILE) {
-@@ -52,7 +66,11 @@
-     v8::Isolate* isolate,
-     v8::Local<v8::Value> val,
-     scoped_refptr<network::ResourceRequestBody>* out) {
-+<<<<<<< .our
-   auto list = std::make_unique<base::ListValue>();
-+=======
-+  std::unique_ptr<base::ListValue> list(new base::ListValue);
-+>>>>>>> .their
-   if (!ConvertFromV8(isolate, val, list.get()))
-     return false;
-   *out = new network::ResourceRequestBody();
-changed in both
-  base   100644 b97b5fdfd8ee36c11f46dd9891b39976ac83bfc8 atom/common/native_mate_converters/v8_value_converter.cc
-  our    100644 3fa070771d6843e9428e560c746965b095961e2a atom/common/native_mate_converters/v8_value_converter.cc
-  their  100644 a5448cd192468e10236779540c2cf80a9428bd55 atom/common/native_mate_converters/v8_value_converter.cc
-@@ -342,8 +342,13 @@
-   if (val->IsRegExp()) {
-     if (!reg_exp_allowed_)
-       // JSON.stringify converts to an object.
-+<<<<<<< .our
-       return FromV8Object(val->ToObject(context).ToLocalChecked(), state,
-                           isolate);
-+=======
-+      return FromV8Object(val->ToObject(context).ToLocalChecked(),
-+          state, isolate);
-+>>>>>>> .their
-     return new base::Value(
-         *v8::String::Utf8Value(val->ToString(context).ToLocalChecked()));
-   }
-@@ -356,8 +361,13 @@
-     if (!function_allowed_)
-       // JSON.stringify refuses to convert function(){}.
-       return nullptr;
-+<<<<<<< .our
-     return FromV8Object(val->ToObject(context).ToLocalChecked(), state,
-                         isolate);
-+=======
-+    return FromV8Object(val->ToObject(context).ToLocalChecked(),
-+        state, isolate);
-+>>>>>>> .their
-   }
- 
-   if (node::Buffer::HasInstance(val)) {
-@@ -365,8 +375,13 @@
-   }
- 
-   if (val->IsObject()) {
-+<<<<<<< .our
-     return FromV8Object(val->ToObject(context).ToLocalChecked(), state,
-                         isolate);
-+=======
-+    return FromV8Object(val->ToObject(context).ToLocalChecked(),
-+        state, isolate);
-+>>>>>>> .their
-   }
- 
-   LOG(ERROR) << "Unexpected v8 value type encountered.";
-changed in both
-  base   100644 552c598b24ca4a38a9a94a893033e03204f44a9f atom/common/native_mate_converters/value_converter.cc
-  our    100644 a71cc70f83d2526596a75d8daf036f905ca099be atom/common/native_mate_converters/value_converter.cc
-  their  100644 0412a0118f2b5f6e2801f02e6089f9d12214d311 atom/common/native_mate_converters/value_converter.cc
-changed in both
-  base   100644 947d3bc1a08b5e5bcd1489c2622ae633c4646651 atom/common/platform_util_win.cc
-  our    100644 34576be95f2552aaa985dacb3f36406dfc29d54c atom/common/platform_util_win.cc
-  their  100644 193e2ece0042367113ee23512b5b3ee6d4785fca atom/common/platform_util_win.cc
-@@ -240,6 +240,36 @@
-   if (dir.empty())
-     return false;
- 
-+<<<<<<< .our
-+=======
-+  typedef HRESULT(WINAPI * SHOpenFolderAndSelectItemsFuncPtr)(
-+      PCIDLIST_ABSOLUTE pidl_Folder, UINT cidl, PCUITEMID_CHILD_ARRAY pidls,
-+      DWORD flags);
-+
-+  static SHOpenFolderAndSelectItemsFuncPtr open_folder_and_select_itemsPtr =
-+      NULL;
-+  static bool initialize_open_folder_proc = true;
-+  if (initialize_open_folder_proc) {
-+    initialize_open_folder_proc = false;
-+    // The SHOpenFolderAndSelectItems API is exposed by shell32 version 6
-+    // and does not exist in Win2K. We attempt to retrieve this function export
-+    // from shell32 and if it does not exist, we just invoke ShellExecute to
-+    // open the folder thus losing the functionality to select the item in
-+    // the process.
-+    HMODULE shell32_base = GetModuleHandle(L"shell32.dll");
-+    if (!shell32_base) {
-+      NOTREACHED() << " " << __FUNCTION__ << "(): Can't open shell32.dll";
-+      return false;
-+    }
-+    open_folder_and_select_itemsPtr =
-+        reinterpret_cast<SHOpenFolderAndSelectItemsFuncPtr>(
-+            GetProcAddress(shell32_base, "SHOpenFolderAndSelectItems"));
-+  }
-+  if (!open_folder_and_select_itemsPtr) {
-+    return ui::win::OpenFolderViaShell(dir);
-+  }
-+
-+>>>>>>> .their
-   Microsoft::WRL::ComPtr<IShellFolder> desktop;
-   HRESULT hr = SHGetDesktopFolder(desktop.GetAddressOf());
-   if (FAILED(hr))
-changed in both
-  base   100644 084f25eba8926e314482077af700923fc760c683 brightray/brightray.gyp
-  our    100644 f233257e88bad8f0ff703034bea02e4715a5b5b9 brightray/brightray.gyp
-  their  100644 5541952025c562b2e891da7e4f75550b7ad8b2cd brightray/brightray.gyp
-changed in both
-  base   100644 596b9bd373ed12292dcbb527e8df9c84b7a9bd84 brightray/brightray.gypi
-  our    100644 8a945dc0219293d90e30162e4691a4d871071f4f brightray/brightray.gypi
-  their  100644 e352533390a63c38d9c204c43d4c696c8285ff87 brightray/brightray.gypi
-@@ -32,7 +32,7 @@
-       'GCC_ENABLE_CPP_RTTI': 'NO',
-       'GCC_TREAT_WARNINGS_AS_ERRORS': 'YES',
-       'CLANG_CXX_LANGUAGE_STANDARD': 'c++14',
--      'MACOSX_DEPLOYMENT_TARGET': '10.9',
-+      'MACOSX_DEPLOYMENT_TARGET': '10.10',
-       'RUN_CLANG_STATIC_ANALYZER': 'YES',
-       'USE_HEADER_MAP': 'NO',
-     },
-changed in both
-  base   100644 6951bd8f4eab3a51d3e1295bafd8dac7209579f3 brightray/browser/browser_context.cc
-  our    100644 1eff7344e9aef78bb88720c38c0f75fb92e6bc09 brightray/browser/browser_context.cc
-  their  100644 6123937cb564831e21373b48405f7ba8d3f5efe1 brightray/browser/browser_context.cc
-changed in both
-  base   100644 96c3e661d651e0a469b04313ead75d8bf7b03aa9 brightray/browser/browser_context.h
-  our    100644 1fb1c59b8043dbb711a364fca3c357c11993bedc brightray/browser/browser_context.h
-  their  100644 8f3de784cfe25b64b2dd767f5efd91845a3aecb6 brightray/browser/browser_context.h
-@@ -19,6 +19,7 @@
- 
- namespace brightray {
- 
-+<<<<<<< .our
- class BrowserContext;
- 
- struct BrowserContextDeleter {
-@@ -28,6 +29,11 @@
- class BrowserContext
-     : public base::RefCountedThreadSafe<BrowserContext, BrowserContextDeleter>,
-       public content::BrowserContext {
-+=======
-+class BrowserContext : public base::RefCounted<BrowserContext>,
-+                       public content::BrowserContext,
-+                       public brightray::URLRequestContextGetter::Delegate {
-+>>>>>>> .their
-  public:
-   // Get the BrowserContext according to its |partition| and |in_memory|,
-   // empty pointer when be returned when there is no matching BrowserContext.
-changed in both
-  base   100644 4705abc986661ba3cb6bddfd0e9b70bfd45f19d8 brightray/browser/browser_main_parts.cc
-  our    100644 78d0ef15ef1343e7db123f97182bac7f9a98b3eb brightray/browser/browser_main_parts.cc
-  their  100644 d44ace2dc3306b0f98737297f59292778468e569 brightray/browser/browser_main_parts.cc
-@@ -179,6 +179,7 @@
- }
- #endif
- 
-+<<<<<<< .our
- void BrowserMainParts::InitializeFeatureList() {
-   auto* cmd_line = base::CommandLine::ForCurrentProcess();
-   const auto enable_features =
-@@ -187,6 +188,15 @@
-       cmd_line->GetSwitchValueASCII(switches::kDisableFeatures);
-   auto feature_list = std::make_unique<base::FeatureList>();
-   feature_list->InitializeFromCommandLine(enable_features, disable_features);
-+=======
-+int BrowserMainParts::PreEarlyInitialization() {
-+  std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);
-+  // TODO(deepak1556): Disable guest webcontents based on OOPIF feature.
-+  // Disable surface synchronization and async wheel events to make OSR work.
-+  feature_list->InitializeFromCommandLine(
-+      "",
-+      "GuestViewCrossProcessFrames,SurfaceSynchronization,AsyncWheelEvents");
-+>>>>>>> .their
-   base::FeatureList::SetInstance(std::move(feature_list));
- }
- 
-changed in both
-  base   100644 2173339853647f6d904e8d4822422adc495c7822 brightray/browser/browser_main_parts.h
-  our    100644 cf8e0296585b17f1e7dab1717e0aa80293d902dd brightray/browser/browser_main_parts.h
-  their  100644 0f82ce6daa9a7fc82aa70c68d8d5fd9dc0951a99 brightray/browser/browser_main_parts.h
-@@ -33,7 +33,10 @@
- 
-  protected:
-   // content::BrowserMainParts:
-+<<<<<<< .our
-   bool ShouldContentCreateFeatureList() override;
-+=======
-+>>>>>>> .their
-   int PreEarlyInitialization() override;
-   void ToolkitInitialized() override;
-   void PreMainMessageLoopStart() override;
-changed in both
-  base   100644 1182073dfac5ffc858a36eded964fe03b44dbe6e brightray/browser/inspectable_web_contents_impl.cc
-  our    100644 32b5743b8db53ef2628d062e9942e30ec7c52b2f brightray/browser/inspectable_web_contents_impl.cc
-  their  100644 ab609a4a9d19e7688e03d3daa320956e7ef1a541 brightray/browser/inspectable_web_contents_impl.cc
-changed in both
-  base   100644 32145f281fb350df13e105fd835d74f61f4a428d brightray/browser/inspectable_web_contents_impl.h
-  our    100644 3f0fe0093cf724e9f090a036a259e823c12f9294 brightray/browser/inspectable_web_contents_impl.h
-  their  100644 9ebcbfdd1ff3e995ac10e8a7ba07c2bdfe20a692 brightray/browser/inspectable_web_contents_impl.h
-changed in both
-  base   100644 05e7f92b0ae26c7f5588af8bce57914fbbc4e451 brightray/browser/net_log.cc
-  our    100644 fb443ea0b72b9659d98d1873fad1a714483bb13f brightray/browser/net_log.cc
-  their  100644 e2d549af0ac106978572189c60172975d8105ee8 brightray/browser/net_log.cc
-@@ -46,10 +46,14 @@
- 
-   base::FilePath log_path =
-       command_line->GetSwitchValuePath(network::switches::kLogNetLog);
-+<<<<<<< .our
-   if (log_path.empty())
-     return;
- 
-   std::unique_ptr<base::Value> constants(GetConstants());  // Net constants
-+=======
-+  std::unique_ptr<base::Value> constants(GetConstants());
-+>>>>>>> .their
-   net::NetLogCaptureMode capture_mode = net::NetLogCaptureMode::Default();
- 
-   file_net_log_observer_ =
-removed in local
-  base   100644 e5c0186a7b3d12ce8880670d81702757d4e898fb brightray/browser/network_delegate.cc
-  their  100644 32981cb8b8d53ee2b797c366dd80d5efcc82d2c9 brightray/browser/network_delegate.cc
-removed in local
-  base   100644 3c12624b27e1801350945a758e20d2d4ab835cad brightray/browser/network_delegate.h
-  their  100644 77625e5c86b13bdd3619d82d59f98d6acdcf9e36 brightray/browser/network_delegate.h
-changed in both
-  base   100644 7c58f4c2f1ff7e1671bbafc827a21dcd1802d30e brightray/browser/platform_notification_service.cc
-  our    100644 5913de18e298ab6f2388243b42af20ecba9c2ee0 brightray/browser/platform_notification_service.cc
-  their  100644 36b2cfb812f3919d053174bfe4475f4ecb59c319 brightray/browser/platform_notification_service.cc
-removed in local
-  base   100644 a9b45296f0313704eadb4bba69598db7fce8b8a3 brightray/browser/special_storage_policy.cc
-  their  100644 e662441dedbfe3c5cf08e8dcce3413153c1fcf82 brightray/browser/special_storage_policy.cc
-removed in local
-  base   100644 0c89db2d4c511da16fefcf2cf4ea75541ab30e15 brightray/browser/special_storage_policy.h
-  their  100644 2d02cdd293438d4f10863c4cf6a7932dc20a3666 brightray/browser/special_storage_policy.h
-changed in both
-  base   100644 31219c5fa604cd1e8f48715beea394dccf7cf0bc brightray/browser/url_request_context_getter.cc
-  our    100644 c07ba80cbc522030af580adc5d8676ed31d592d1 brightray/browser/url_request_context_getter.cc
-  their  100644 68041972af79509c018d6ec045461bf0b2b50a83 brightray/browser/url_request_context_getter.cc
-@@ -20,7 +20,10 @@
- #include "content/public/browser/browser_thread.h"
- #include "content/public/browser/cookie_store_factory.h"
- #include "content/public/browser/devtools_network_transaction_factory.h"
-+<<<<<<< .our
- #include "content/public/browser/resource_context.h"
-+=======
-+>>>>>>> .their
- #include "net/base/host_mapping_rules.h"
- #include "net/cert/cert_verifier.h"
- #include "net/cert/ct_known_logs.h"
-@@ -172,7 +175,11 @@
-   // the URLRequestContextStorage on the IO thread in GetURLRequestContext().
-   proxy_config_service_ =
-       net::ProxyResolutionService::CreateSystemProxyConfigService(
-+<<<<<<< .our
-           BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
-+=======
-+          io_task_runner_);
-+>>>>>>> .their
- }
- 
- URLRequestContextGetter::~URLRequestContextGetter() {}
-@@ -191,6 +198,29 @@
-   http_auth_preferences_.reset();
-   host_mapping_rules_.reset();
-   ct_delegate_.reset();
-+<<<<<<< .our
-+=======
-+  net::URLRequestContextGetter::NotifyContextShuttingDown();
-+}
-+
-+void URLRequestContextGetter::OnCookieChanged(
-+    const net::CanonicalCookie& cookie,
-+    net::CookieChangeCause cause) {
-+  DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-+
-+  if (!delegate_ || context_shutting_down_)
-+    return;
-+
-+  content::BrowserThread::PostTask(
-+      content::BrowserThread::UI, FROM_HERE,
-+      base::BindOnce(&Delegate::NotifyCookieChange, base::Unretained(delegate_),
-+                     cookie, !(cause == net::CookieChangeCause::INSERTED),
-+                     cause));
-+}
-+
-+net::HostResolver* URLRequestContextGetter::host_resolver() {
-+  return url_request_context_->host_resolver();
-+>>>>>>> .their
- }
- 
- net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
-@@ -218,8 +248,14 @@
-     auto cookie_path = in_memory_
-                            ? base::FilePath()
-                            : base_path_.Append(FILE_PATH_LITERAL("Cookies"));
-+<<<<<<< .our
-     std::unique_ptr<net::CookieStore> cookie_store = content::CreateCookieStore(
-         content::CookieStoreConfig(cookie_path, false, false, nullptr));
-+=======
-+    std::unique_ptr<net::CookieStore> cookie_store =
-+        content::CreateCookieStore(content::CookieStoreConfig(
-+            cookie_path, false, false, nullptr));
-+>>>>>>> .their
-     storage_->set_cookie_store(std::move(cookie_store));
- 
-     // Set custom schemes that can accept cookies.
-@@ -230,11 +266,19 @@
-     cookie_monster->SetCookieableSchemes(cookie_schemes);
-     // Cookie store will outlive notifier by order of declaration
-     // in the header.
-+<<<<<<< .our
-     cookie_change_sub_ = url_request_context_->cookie_store()
-                              ->GetChangeDispatcher()
-                              .AddCallbackForAllChanges(base::Bind(
-                                  &URLRequestContextGetter::OnCookieChanged,
-                                  base::RetainedRef(this)));
-+=======
-+    cookie_change_sub_ =
-+        url_request_context_->cookie_store()
-+            ->GetChangeDispatcher()
-+            .AddCallbackForAllChanges(
-+                base::Bind(&URLRequestContextGetter::OnCookieChanged, this));
-+>>>>>>> .their
- 
-     storage_->set_channel_id_service(std::make_unique<net::ChannelIDService>(
-         new net::DefaultChannelIDStore(nullptr)));
-changed in both
-  base   100644 0cfd921babe5e8595583ad1beed0fa4a2e3ed89a brightray/browser/url_request_context_getter.h
-  our    100644 941a5782b14a941bb25a7a9ef6ca6d73f8bc3ec1 brightray/browser/url_request_context_getter.h
-  their  100644 b990d479a06cb7c26f306bf50179eb87c9af4472 brightray/browser/url_request_context_getter.h
-@@ -54,11 +54,20 @@
-     virtual net::HttpCache::BackendFactory* CreateHttpCacheBackendFactory(
-         const base::FilePath& base_path) = 0;
-     virtual std::unique_ptr<net::CertVerifier> CreateCertVerifier(
-+<<<<<<< .our
-         RequireCTDelegate* ct_delegate) = 0;
-     virtual void GetCookieableSchemes(
-         std::vector<std::string>* cookie_schemes) {}
-     virtual void OnCookieChanged(const net::CanonicalCookie& cookie,
-                                  net::CookieChangeCause cause) {}
-+=======
-+        RequireCTDelegate* ct_delegate);
-+    virtual net::SSLConfigService* CreateSSLConfigService();
-+    virtual std::vector<std::string> GetCookieableSchemes();
-+    virtual void NotifyCookieChange(const net::CanonicalCookie& cookie,
-+                                    bool removed,
-+                                    net::CookieChangeCause cause) {}
-+>>>>>>> .their
-   };
- 
-   URLRequestContextGetter(
-@@ -70,6 +79,13 @@
-       content::ProtocolHandlerMap* protocol_handlers,
-       content::URLRequestInterceptorScopedVector protocol_interceptors);
- 
-+<<<<<<< .our
-+=======
-+  // net::CookieChangeDispatcher::CookieChangedCallback implementation.
-+  void OnCookieChanged(const net::CanonicalCookie& cookie,
-+                       net::CookieChangeCause cause);
-+
-+>>>>>>> .their
-   // net::URLRequestContextGetter:
-   net::URLRequestContext* GetURLRequestContext() override;
-   scoped_refptr<base::SingleThreadTaskRunner> GetNetworkTaskRunner()
-@@ -129,11 +145,14 @@
-   std::unique_ptr<net::HttpAuthPreferences> http_auth_preferences_;
-   std::unique_ptr<net::HttpNetworkSession> http_network_session_;
-   std::unique_ptr<net::CookieChangeSubscription> cookie_change_sub_;
-+<<<<<<< .our
- 
-   net::URLRequestJobFactory* job_factory_;
-   Delegate* delegate_;
-   NetLog* net_log_;
-   ResourceContext* resource_context_;
-+=======
-+>>>>>>> .their
-   content::ProtocolHandlerMap protocol_handlers_;
-   content::URLRequestInterceptorScopedVector protocol_interceptors_;
-   base::FilePath base_path_;
-changed in both
-  base   100644 c6c7d4e8e66de2da3ded6b03ef82ac0701c5ef6a brightray/filenames.gypi
-  our    100644 b9e2d96175f8ee2d407db9c49b2e2b74756327de brightray/filenames.gypi
-  their  100644 0d79b5faf74f5e113b69137d6f2ab9986ff79f09 brightray/filenames.gypi
-removed in local
-  base   100644 5aabe7032f4c3e5cebcd9da892ff732cafafc12a chromium_src/chrome/renderer/pepper/pepper_flash_renderer_host.cc
-  their  100644 50015122ccc7e2da02d0e9b2c7014e085c3ffec4 chromium_src/chrome/renderer/pepper/pepper_flash_renderer_host.cc
-changed in both
-  base   100644 5c6677b333ef1c47710499c97e9fd763eebe2aad common.gypi
-  our    100644 676d1e904127066e4a3d313106f15406fcbed8b6 common.gypi
-  their  100644 17d1db1bf3faf3b2175e7b4ac9c8262198f39f9c common.gypi
-changed in both
-  base   100644 2de0e12d9c3a1b76045718a5a955fa01e518e7a0 docs/api/browser-window.md
-  our    100644 dff61dd336f047cf2f6f06228b2df2b98ff2304d docs/api/browser-window.md
-  their  100644 f7a75fc94659a2c46f67ed0728c5791d69df2083 docs/api/browser-window.md
-changed in both
-  base   100644 34132af74d7876a447ae1dd685ab4df94caa453c docs/api/web-contents.md
-  our    100644 8990fe2e97ab62eafdd3f7a4eb8ee782415124c5 docs/api/web-contents.md
-  their  100644 ebdb643d907ce24bac1922d2756cf5b5594790fa docs/api/web-contents.md
-changed in both
-  base   100644 22fba1f5948e135f1438737c17e17fb0eb72abcc docs/api/webview-tag.md
-  our    100644 8dc16b4a4e92ad132c7722ac400e2be851723f9b docs/api/webview-tag.md
-  their  100644 4480bc132c3046601266d163040c2f68315e317a docs/api/webview-tag.md
-changed in both
-  base   100644 b06a3b71238a08b09ec7fda4281f09333383ace9 electron.gyp
-  our    100644 944ddab2a3fd879044e31677e4bac2843fffbdee electron.gyp
-  their  100644 656aad543eb9a2cae503be10b81511971594369b electron.gyp
-changed in both
-  base   100644 5fc4af7301ace2aa1ca3f751fd5caa776573099c features.gypi
-  our    100644 86543a4db1195223a3556fa71583038f15d79a0a features.gypi
-  their  100644 bff8b29fd48da2c92e11d4dfd0603155f20e5ece features.gypi
-@@ -2,8 +2,13 @@
-   # If it looks stupid but it works it ain't stupid.
-   'variables': {
-     'variables': {
-+<<<<<<< .our
-       'enable_desktop_capturer%': 1,
-       'enable_osr%': 1,
-+=======
-+      'enable_desktop_capturer%': 0,  # FIXME(alexeykuzmin)
-+      'enable_osr%': 0,  # FIXME(alexeykuzmin)
-+>>>>>>> .their
-       'enable_pdf_viewer%': 0,  # FIXME(deepak1556)
-       'enable_run_as_node%': 1,
-       'enable_view_api%': 0,
-changed in both
-  base   100644 284c82ae6f9356fb8ac4682bc1c7a02703969a6e filenames.gypi
-  our    100644 f57860558f06b7e5d8a50f48cfc7e53044df0bc6 filenames.gypi
-  their  100644 eb0f63047925940d97f548dcc8064b06f85c163e filenames.gypi
-@@ -608,6 +608,23 @@
-       'chromium_src/chrome/browser/process_singleton_posix.cc',
-       'chromium_src/chrome/browser/process_singleton_win.cc',
-       'chromium_src/chrome/browser/process_singleton.h',
-+<<<<<<< .our
-+=======
-+      'chromium_src/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc',
-+      'chromium_src/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h',
-+      'chromium_src/chrome/browser/renderer_host/pepper/monitor_finder_mac.h',
-+      'chromium_src/chrome/browser/renderer_host/pepper/monitor_finder_mac.mm',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.h',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.h',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h',
-+>>>>>>> .their
-       'chromium_src/chrome/browser/speech/tts_controller.h',
-       'chromium_src/chrome/browser/speech/tts_controller_impl.cc',
-       'chromium_src/chrome/browser/speech/tts_controller_impl.h',
-changed in both
-  base   100644 a9a99fe2ea7d4597d568880b8865535065ab8960 lib/browser/guest-view-manager.js
-  our    100644 1e4029e39a981c85fb6ff18c5ccd52f81b3c56f2 lib/browser/guest-view-manager.js
-  their  100644 28f1f4894b6ee19709ba7331d8168db2a810252b lib/browser/guest-view-manager.js
-changed in both
-  base   100644 52ef64cd777769a86dbbac1a16015994b6b81ea1 lib/renderer/web-view/guest-view-internal.js
-  our    100644 6e42c769b70e5223fe97397f87144ec342882f8d lib/renderer/web-view/guest-view-internal.js
-  their  100644 a868b513eb4221bbf311f8f43ad4f94fff323928 lib/renderer/web-view/guest-view-internal.js
-changed in both
-  base   100755 3195fa459b918bd14baee8b8766cae8461a1ad62 script/bootstrap.py
-  our    100755 e4aaf89e216b0164f15882a3040e8cac70bf1fd9 script/bootstrap.py
-  their  100755 099f9a7ab7d4ac5ee6cc8e896e446cb21d640aea script/bootstrap.py
-@@ -54,10 +54,10 @@
-     libcc_shared_library_path = os.path.join(dist_dir, 'shared_library')
-     libcc_static_library_path = os.path.join(dist_dir, 'static_library')
- 
--  if PLATFORM != 'win32':
--    if not args.disable_clang and args.clang_dir == '':
--      # Download prebuilt clang binaries.
--      update_clang()
-+  if (not args.disable_clang and args.clang_dir == '' 
-+      and not (sys.platform=='win32' and not args.use_clang_cl_on_windows)):
-+    # Download prebuilt clang binaries.
-+    update_clang()
- 
-   setup_python_libs()
-   update_node_modules('.')
-@@ -95,6 +95,9 @@
-   parser.add_argument('--target_arch', default=get_target_arch(),
-                       help='Manually specify the arch to build for')
-   parser.add_argument('--clang_dir', default='', help='Path to clang binaries')
-+  parser.add_argument('--use_clang_cl_on_windows', action='store_true', 
-+                      default=False, help='Download clang-cl on Windows and' \
-+                      ' use it as a compiler')
-   parser.add_argument('--disable_clang', action='store_true',
-                       help='Use compilers other than clang for building')
-   build_libcc = parser.add_mutually_exclusive_group()
-@@ -129,6 +132,14 @@
-     defines += ' clang_use_chrome_plugins=0'
-   if args.cc_wrapper is not None:
-     defines += ' cc_wrapper=' + args.cc_wrapper
-+  if args.use_clang_cl_on_windows:
-+    defines += ' clang_cl_windows=1'
-+    if not args.clang_dir:
-+      thisDir = os.path.abspath(os.path.dirname(__file__))
-+      llvmPath = os.path.join(thisDir, '..', 'vendor', 'llvm-build')
-+      llvmBuildDir = os.path.realpath(llvmPath)
-+      defines += ' make_clang_dir=' + llvmBuildDir
-+    
-   return defines
- 
- 
-@@ -197,8 +208,11 @@
- 
- 
- def update_clang():
--  execute_stdout([os.path.join(SOURCE_ROOT, 'script', 'update-clang.sh')])
--
-+  if sys.platform == 'win32':
-+    updateClangPath = os.path.join(SOURCE_ROOT, 'script', 'update-clang.py')
-+    execute_stdout([sys.executable, updateClangPath])
-+  else:
-+    execute_stdout([os.path.join(SOURCE_ROOT, 'script', 'update-clang.sh')])
- 
- def download_sysroot(target_arch):
-   if target_arch == 'ia32':
-changed in both
-  base   100755 e0a373d94fe73113ac2e07c767e4e636e629bd9a script/create-dist.py
-  our    100755 4a6c0c7ce8f275175e48c4c380ff33627f7a5961 script/create-dist.py
-  their  100755 ae5ce3707c38e61716f96cf5e7627cc909597fb8 script/create-dist.py
-added in remote
-  their  100755 ad9b65e8ae96752b49888dc053c6a1844b4bc322 script/update-clang.py
-@@ -0,0 +1,240 @@
-+#!/usr/bin/env python
-+# Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+# Use of this source code is governed by a BSD-style license that can be
-+# found in the LICENSE file.
-+
-+"""This script is used to download prebuilt clang binaries."""
-+
-+import os
-+import shutil
-+import subprocess
-+import stat
-+import sys
-+import tarfile
-+import tempfile
-+import time
-+import urllib2
-+
-+
-+# CLANG_REVISION and CLANG_SUB_REVISION determine the build of clang
-+# to use. These should be synced with tools/clang/scripts/update.py in
-+# Chromium.
-+CLANG_REVISION = '325667'
-+CLANG_SUB_REVISION=1
-+
-+PACKAGE_VERSION = "%s-%s" % (CLANG_REVISION, CLANG_SUB_REVISION)
-+
-+# Path constants. (All of these should be absolute paths.)
-+THIS_DIR = os.path.abspath(os.path.dirname(__file__))
-+LLVM_DIR = os.path.join(THIS_DIR, '..', 'vendor', 'llvm-build')
-+LLVM_BUILD_DIR = os.path.realpath(LLVM_DIR)
-+STAMP_FILE = os.path.join(LLVM_BUILD_DIR, 'cr_build_revision')
-+
-+# URL for pre-built binaries.
-+CDS_URL = os.environ.get('CDS_CLANG_BUCKET_OVERRIDE',
-+    'https://commondatastorage.googleapis.com/chromium-browser-clang')
-+
-+# Bump after VC updates.
-+DIA_DLL = {
-+  '2013': 'msdia120.dll',
-+  '2015': 'msdia140.dll',
-+  '2017': 'msdia140.dll',
-+}
-+
-+
-+def DownloadUrl(url, output_file):
-+  """Download url into output_file."""
-+  CHUNK_SIZE = 4096
-+  TOTAL_DOTS = 10
-+  num_retries = 3
-+  retry_wait_s = 5  # Doubled at each retry.
-+
-+  while True:
-+    try:
-+      sys.stdout.write('Downloading %s ' % url)
-+      sys.stdout.flush()
-+      response = urllib2.urlopen(url)
-+      total_size = int(response.info().getheader('Content-Length').strip())
-+      bytes_done = 0
-+      dots_printed = 0
-+      while True:
-+        chunk = response.read(CHUNK_SIZE)
-+        if not chunk:
-+          break
-+        output_file.write(chunk)
-+        bytes_done += len(chunk)
-+        num_dots = TOTAL_DOTS * bytes_done / total_size
-+        sys.stdout.write('.' * (num_dots - dots_printed))
-+        sys.stdout.flush()
-+        dots_printed = num_dots
-+      if bytes_done != total_size:
-+        raise urllib2.URLError("only got %d of %d bytes" %
-+                               (bytes_done, total_size))
-+      print ' Done.'
-+      return
-+    except urllib2.URLError as e:
-+      sys.stdout.write('\n')
-+      print e
-+      if num_retries == 0 or isinstance(e, urllib2.HTTPError) and e.code == 404:
-+        raise e
-+      num_retries -= 1
-+      print 'Retrying in %d s ...' % retry_wait_s
-+      time.sleep(retry_wait_s)
-+      retry_wait_s *= 2
-+
-+
-+def EnsureDirExists(path):
-+  if not os.path.exists(path):
-+    print "Creating directory %s" % path
-+    os.makedirs(path)
-+
-+
-+def DownloadAndUnpack(url, output_dir):
-+  with tempfile.TemporaryFile() as f:
-+    DownloadUrl(url, f)
-+    f.seek(0)
-+    EnsureDirExists(output_dir)
-+    tarfile.open(mode='r:gz', fileobj=f).extractall(path=output_dir)
-+
-+
-+def ReadStampFile(path=STAMP_FILE):
-+  """Return the contents of the stamp file, or '' if it doesn't exist."""
-+  try:
-+    with open(path, 'r') as f:
-+      return f.read().rstrip()
-+  except IOError:
-+    return ''
-+
-+
-+def WriteStampFile(s, path=STAMP_FILE):
-+  """Write s to the stamp file."""
-+  EnsureDirExists(os.path.dirname(path))
-+  with open(path, 'w') as f:
-+    f.write(s)
-+    f.write('\n')
-+
-+
-+def RmTree(directoryPath):
-+  """Delete dir."""
-+  def ChmodAndRetry(func, path, _):
-+    # Subversion can leave read-only files around.
-+    if not os.access(path, os.W_OK):
-+      os.chmod(path, stat.S_IWUSR)
-+      return func(path)
-+    raise
-+
-+  shutil.rmtree(directoryPath, onerror=ChmodAndRetry)
-+
-+
-+def CopyFile(src, dst):
-+  """Copy a file from src to dst."""
-+  print "Copying %s to %s" % (src, dst)
-+  shutil.copy(src, dst)
-+
-+
-+vs_version = None
-+def GetVSVersion():
-+  global vs_version
-+  if vs_version:
-+    return vs_version
-+
-+  # Try using the toolchain in depot_tools.
-+  # This sets environment variables used by SelectVisualStudioVersion below.
-+  sys.path.append(THIS_DIR)
-+  import vs_toolchain
-+  vs_toolchain.SetEnvironmentAndGetRuntimeDllDirs()
-+
-+  # Use gyp to find the MSVS installation, either in depot_tools as per above,
-+  # or a system-wide installation otherwise.
-+  sys.path.append(os.path.join(THIS_DIR, 'gyp', 'pylib'))
-+  import gyp.MSVSVersion
-+  vs_version = gyp.MSVSVersion.SelectVisualStudioVersion(
-+      vs_toolchain.GetVisualStudioVersion())
-+  return vs_version
-+
-+def ValidVS2017Path():
-+  vs2017Path = os.path.join(os.environ['ProgramFiles(x86)'], \
-+                            'Microsoft Visual Studio', '2017')
-+  vs2017Variants = ['Enterprise', 'Professional', 'Community']
-+
-+  for vs2017Variant in vs2017Variants:
-+    possiblePath = os.path.join(vs2017Path, vs2017Variant)
-+    if os.path.exists(possiblePath):
-+      return possiblePath
-+
-+  return ''
-+
-+
-+def ValidVS2015Path():
-+  vs2015Path = os.path.join(os.environ['ProgramFiles(x86)'], \
-+                            'Microsoft Visual Studio 14.0')
-+  if os.path.exists(vs2015Path):
-+    return vs2015Path
-+  return ''
-+
-+
-+def ValidVSPath():
-+  result = ValidVS2017Path()
-+  if (len(result) == 0):
-+    result = ValidVS2015Path()
-+  if (len(result) == 0):
-+    raise IOError
-+  
-+  return result
-+
-+
-+def CopyDiaDllTo(target_dir):
-+  # This script always wants to use the 64-bit msdia*.dll.
-+  vsPath = ValidVSPath()
-+  msdia140Path = os.path.join('DIA SDK', 'bin', 'amd64', 'msdia140.dll')
-+
-+  dia_dll_path = os.path.join(vsPath, msdia140Path)
-+  if not os.path.exists(dia_dll_path):
-+    raise IOError
-+
-+  dia_dll =  dia_dll_path
-+  CopyFile(dia_dll, target_dir)
-+
-+
-+def UpdateClang():
-+  cds_file = "clang-%s.tgz" %  PACKAGE_VERSION
-+  if sys.platform == 'win32' or sys.platform == 'cygwin':
-+    cds_full_url = CDS_URL + '/Win/' + cds_file
-+  elif sys.platform.startswith('linux'):
-+    cds_full_url = CDS_URL + '/Linux_x64/' + cds_file
-+  else:
-+    return 0
-+
-+  print 'Updating Clang to %s...' % PACKAGE_VERSION
-+
-+  if ReadStampFile() == PACKAGE_VERSION:
-+    print 'Clang is already up to date.'
-+    return 0
-+
-+  # Reset the stamp file in case the build is unsuccessful.
-+  WriteStampFile('')
-+
-+  print 'Downloading prebuilt clang'
-+  if os.path.exists(LLVM_BUILD_DIR):
-+    RmTree(LLVM_BUILD_DIR)
-+  try:
-+    DownloadAndUnpack(cds_full_url, LLVM_BUILD_DIR)
-+    print 'clang %s unpacked' % PACKAGE_VERSION
-+    if sys.platform == 'win32':
-+      CopyDiaDllTo(os.path.join(LLVM_BUILD_DIR, 'bin'))
-+    WriteStampFile(PACKAGE_VERSION)
-+    return 0
-+  except urllib2.URLError:
-+    print 'Failed to download prebuilt clang %s' % cds_file
-+    print 'Exiting.'
-+    return 1
-+
-+
-+def main():
-+  # Don't buffer stdout, so that print statements are immediately flushed.
-+  sys.stdout = os.fdopen(sys.stdout.fileno(), 'w', 0)
-+  return UpdateClang()
-+
-+
-+if __name__ == '__main__':
-+  sys.exit(main())
-changed in both
-  base   100644 5165a57b04a3769c3b712c4e98645413e26e1767 spec/api-app-spec.js
-  our    100644 d224eda2989332c18d655cef05a8bacc2eb6d4b8 spec/api-app-spec.js
-  their  100644 37c5520a1d27d6988eb30267b7a8ca6ae83d2b20 spec/api-app-spec.js
-@@ -796,7 +796,8 @@
-     })
-   })
- 
--  describe('getAppMetrics() API', () => {
-+  // TODO(marshallofsound): [Ch66] Failed on Windows x64 + ia32 on CI, passes locally
-+  xdescribe('getAppMetrics() API', () => {
-     it('returns memory and cpu stats of all running electron processes', () => {
-       const appMetrics = app.getAppMetrics()
-       expect(appMetrics).to.be.an('array').and.have.lengthOf.at.least(1, 'App memory info object is not > 0')
-changed in both
-  base   100644 711354fd6dff0c7cd231a39ef6cfd1c71d80d035 spec/api-browser-window-spec.js
-  our    100644 f4cba12ec19d224bc46fca898db42a99baf4972e spec/api-browser-window-spec.js
-  their  100644 54223a54b6a622f6a057ff7098917be86657b0b1 spec/api-browser-window-spec.js
-@@ -2142,7 +2142,9 @@
-     })
-   })
- 
--  describe('beginFrameSubscription method', () => {
-+  // TODO(alexeykuzmin): [Ch66] Crashes the app.
-+  // Fix and enable the test.
-+  xdescribe('beginFrameSubscription method', () => {
-     before(function () {
-       // This test is too slow, only test it on CI.
-       if (!isCI) {
-@@ -2845,7 +2847,8 @@
-         })
-       })
- 
--      describe('for a valid extension', () => {
-+      // TODO(alexeykuzmin): [Ch66] Enable the tests.
-+      xdescribe('for a valid extension', () => {
-         const extensionName = 'foo'
- 
-         const removeExtension = () => {
-@@ -2932,7 +2935,8 @@
-       })
-     })
- 
--    it('works when used with partitions', (done) => {
-+    // TODO(alexeykuzmin): [Ch66] Times out. Fix it and enable.
-+    xit('works when used with partitions', (done) => {
-       if (w != null) {
-         w.destroy()
-       }
-changed in both
-  base   100644 1d98e7993946f8f855670da3b53a60677b7d029b spec/api-debugger-spec.js
-  our    100644 0f5cc614c98bfe6c679575bc1a9c76e3b145ac71 spec/api-debugger-spec.js
-  their  100644 200a74f70696adad1b823fdcadefb1faac01da8f spec/api-debugger-spec.js
-changed in both
-  base   100644 6bc0b230bb40329d2c5b89ab69f47b9a24042247 spec/api-desktop-capturer-spec.js
-  our    100644 339d9756e40f8a532322800349b36d4371a2c9b0 spec/api-desktop-capturer-spec.js
-  their  100644 c351023ba59b82d5ffbdf0d33ea1f2a7253ccc00 spec/api-desktop-capturer-spec.js
-@@ -8,7 +8,9 @@
- 
- const isCI = remote.getGlobal('isCi')
- 
--describe('desktopCapturer', () => {
-+// FIXME(alexeykuzmin): [Ch66] Crashes the app.
-+// Fix the crash and enable the tests.
-+xdescribe('desktopCapturer', () => {
-   before(function () {
-     if (!features.isDesktopCapturerEnabled()) {
-       // It's been disabled during build time.
-changed in both
-  base   100644 1b864440fe88bd2559ee00601fe19df8f7e743da spec/api-session-spec.js
-  our    100644 b9093d1d6335ece5ca713a668a67bf3b40f4fabe spec/api-session-spec.js
-  their  100644 7ac14e1f1f88549aa6594e96906cc77906c0accd spec/api-session-spec.js
-changed in both
-  base   100644 847462e2f48eca7bd5b5fe442fac4a5765542d88 spec/api-web-contents-spec.js
-  our    100644 be02cb3f84001a541d64b11fe6eda50fc32e8afd spec/api-web-contents-spec.js
-  their  100644 b1b1d206a2934dbc0e6d3b57cffdc9b9345d7b7a spec/api-web-contents-spec.js
-changed in both
-  base   100644 f053aa4dbadbbc216d98f3a985f29069bb2e4786 spec/node-spec.js
-  our    100644 9bb03494a56ffacec075c40bebde39a3b57ac734 spec/node-spec.js
-  their  100644 c97b44039c607b494f27c7df6e4871db91c579d6 spec/node-spec.js
-@@ -286,7 +286,8 @@
-       }
-     })
- 
--    it('emit error when connect to a socket path without listeners', (done) => {
-+    // TODO(alexeykuzmin): [Ch66] Fix the test.
-+    xit('emit error when connect to a socket path without listeners', (done) => {
-       const socketPath = path.join(os.tmpdir(), 'atom-shell-test.sock')
-       const script = path.join(fixtures, 'module', 'create_socket.js')
-       const child = ChildProcess.fork(script, [socketPath])
-added in both
-  our    100644 5bc7ea1f27b7e56669c336a1f6cbae29c662b052 spec/package-lock.json
-  their  100644 f286018282ea22f6bf7320271da978722f1839d3 spec/package-lock.json
-@@ -11,8 +11,13 @@
-       "dev": true,
-       "optional": true,
-       "requires": {
-+<<<<<<< .our
-         "bindings": "^1.2.1",
-         "nan": "^2.0.9"
-+=======
-+        "bindings": "1.3.0",
-+        "nan": "2.10.0"
-+>>>>>>> .their
-       }
-     },
-     "ansi-regex": {
-@@ -27,12 +32,15 @@
-       "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
-       "dev": true
-     },
-+<<<<<<< .our
-     "async-limiter": {
-       "version": "1.0.0",
-       "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
-       "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "balanced-match": {
-       "version": "1.0.0",
-       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-@@ -40,6 +48,7 @@
-       "dev": true
-     },
-     "basic-auth": {
-+<<<<<<< .our
-       "version": "2.0.0",
-       "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.0.tgz",
-       "integrity": "sha1-AV2z81PgLlY3d1X5YnQuiYHnu7o=",
-@@ -55,6 +64,12 @@
-           "dev": true
-         }
-       }
-+=======
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-1.1.0.tgz",
-+      "integrity": "sha1-RSIe5Cn37h5QNb4/UVM/HN/SmIQ=",
-+      "dev": true
-+>>>>>>> .their
-     },
-     "bindings": {
-       "version": "1.3.0",
-@@ -75,11 +90,16 @@
-       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "balanced-match": "^1.0.0",
-+=======
-+        "balanced-match": "1.0.0",
-+>>>>>>> .their
-         "concat-map": "0.0.1"
-       }
-     },
-     "browser-stdout": {
-+<<<<<<< .our
-       "version": "1.3.1",
-       "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
-       "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
-@@ -89,6 +109,23 @@
-       "version": "4.1.0",
-       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-       "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-+=======
-+      "version": "1.3.0",
-+      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz",
-+      "integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8=",
-+      "dev": true
-+    },
-+    "builtin-modules": {
-+      "version": "1.1.1",
-+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
-+      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
-+      "dev": true
-+    },
-+    "camelcase": {
-+      "version": "3.0.0",
-+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-+      "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "chai": {
-@@ -97,12 +134,21 @@
-       "integrity": "sha1-D2RYS6ZC8PKs4oBiefTwbKI61zw=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "assertion-error": "^1.0.1",
-         "check-error": "^1.0.1",
-         "deep-eql": "^3.0.0",
-         "get-func-name": "^2.0.0",
-         "pathval": "^1.0.0",
-         "type-detect": "^4.0.0"
-+=======
-+        "assertion-error": "1.1.0",
-+        "check-error": "1.0.2",
-+        "deep-eql": "3.0.1",
-+        "get-func-name": "2.0.0",
-+        "pathval": "1.1.0",
-+        "type-detect": "4.0.8"
-+>>>>>>> .their
-       }
-     },
-     "chai-as-promised": {
-@@ -111,7 +157,11 @@
-       "integrity": "sha512-azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "check-error": "^1.0.2"
-+=======
-+        "check-error": "1.0.2"
-+>>>>>>> .their
-       }
-     },
-     "charenc": {
-@@ -127,6 +177,7 @@
-       "dev": true
-     },
-     "cliui": {
-+<<<<<<< .our
-       "version": "4.1.0",
-       "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
-       "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
-@@ -135,6 +186,33 @@
-         "string-width": "^2.1.1",
-         "strip-ansi": "^4.0.0",
-         "wrap-ansi": "^2.0.0"
-+=======
-+      "version": "3.2.0",
-+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-+      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-+      "dev": true,
-+      "requires": {
-+        "string-width": "1.0.2",
-+        "strip-ansi": "3.0.1",
-+        "wrap-ansi": "2.1.0"
-+      },
-+      "dependencies": {
-+        "ansi-regex": {
-+          "version": "2.1.1",
-+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-+          "dev": true
-+        },
-+        "strip-ansi": {
-+          "version": "3.0.1",
-+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-+          "dev": true,
-+          "requires": {
-+            "ansi-regex": "2.1.1"
-+          }
-+        }
-+>>>>>>> .their
-       }
-     },
-     "code-point-at": {
-@@ -150,10 +228,20 @@
-       "dev": true
-     },
-     "commander": {
-+<<<<<<< .our
-       "version": "2.15.1",
-       "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
-       "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
-       "dev": true
-+=======
-+      "version": "2.9.0",
-+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
-+      "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
-+      "dev": true,
-+      "requires": {
-+        "graceful-readlink": "1.0.1"
-+      }
-+>>>>>>> .their
-     },
-     "concat-map": {
-       "version": "0.0.1",
-@@ -161,6 +249,7 @@
-       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "cross-spawn": {
-       "version": "5.1.0",
-       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-@@ -172,6 +261,8 @@
-         "which": "^1.2.9"
-       }
-     },
-+=======
-+>>>>>>> .their
-     "crypt": {
-       "version": "0.0.2",
-       "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
-@@ -184,6 +275,7 @@
-       "integrity": "sha512-ocxMKCV7QdiNhzhFSeEMhj258OGtvpANSb3oWGiotmI5h1ZIse0TMPcSLiXSpqvbYvQz2Y5RsYPMNYLWhg9eBw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "abstract-socket": "^2.0.0",
-         "event-stream": "^3.1.7",
-         "hexy": "^0.2.10",
-@@ -191,13 +283,28 @@
-         "optimist": "^0.6.1",
-         "put": "0.0.6",
-         "safe-buffer": "^5.1.1",
-+=======
-+        "abstract-socket": "2.0.0",
-+        "event-stream": "3.3.4",
-+        "hexy": "0.2.11",
-+        "long": "3.2.0",
-+        "optimist": "0.6.1",
-+        "put": "0.0.6",
-+        "safe-buffer": "5.1.2",
-+>>>>>>> .their
-         "xml2js": "0.1.14"
-       }
-     },
-     "debug": {
-+<<<<<<< .our
-       "version": "2.6.9",
-       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-+=======
-+      "version": "2.6.8",
-+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-+      "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "ms": "2.0.0"
-@@ -215,7 +322,11 @@
-       "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "type-detect": "^4.0.0"
-+=======
-+        "type-detect": "4.0.8"
-+>>>>>>> .their
-       }
-     },
-     "depd": {
-@@ -231,6 +342,7 @@
-       "dev": true
-     },
-     "diff": {
-+<<<<<<< .our
-       "version": "3.5.0",
-       "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
-       "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
-@@ -240,6 +352,11 @@
-       "version": "2.0.1",
-       "resolved": "https://registry.npmjs.org/dirty-chai/-/dirty-chai-2.0.1.tgz",
-       "integrity": "sha512-ys79pWKvDMowIDEPC6Fig8d5THiC0DJ2gmTeGzVAoEH18J8OzLud0Jh7I9IWg3NSk8x2UocznUuFmfHCXYZx9w==",
-+=======
-+      "version": "3.2.0",
-+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz",
-+      "integrity": "sha1-yc45Okt8vQsFinJck98pkCeGj/k=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "duplexer": {
-@@ -260,6 +377,18 @@
-       "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
-       "dev": true
-     },
-+<<<<<<< .our
-+=======
-+    "error-ex": {
-+      "version": "1.3.1",
-+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz",
-+      "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=",
-+      "dev": true,
-+      "requires": {
-+        "is-arrayish": "0.2.1"
-+      }
-+    },
-+>>>>>>> .their
-     "escape-html": {
-       "version": "1.0.3",
-       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-@@ -280,6 +409,7 @@
-     },
-     "event-stream": {
-       "version": "3.3.4",
-+<<<<<<< .our
-       "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
-       "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
-       "dev": true,
-@@ -306,6 +436,19 @@
-         "p-finally": "^1.0.0",
-         "signal-exit": "^3.0.0",
-         "strip-eof": "^1.0.0"
-+=======
-+      "resolved": "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
-+      "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
-+      "dev": true,
-+      "requires": {
-+        "duplexer": "0.1.1",
-+        "from": "0.1.7",
-+        "map-stream": "0.1.0",
-+        "pause-stream": "0.0.11",
-+        "split": "0.3.3",
-+        "stream-combiner": "0.0.4",
-+        "through": "2.3.8"
-+>>>>>>> .their
-       }
-     },
-     "fd-slicer": {
-@@ -314,6 +457,7 @@
-       "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "pend": "~1.2.0"
-       }
-     },
-@@ -324,6 +468,19 @@
-       "dev": true,
-       "requires": {
-         "locate-path": "^2.0.0"
-+=======
-+        "pend": "1.2.0"
-+      }
-+    },
-+    "find-up": {
-+      "version": "1.1.2",
-+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-+      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-+      "dev": true,
-+      "requires": {
-+        "path-exists": "2.1.0",
-+        "pinkie-promise": "2.0.1"
-+>>>>>>> .their
-       }
-     },
-     "fresh": {
-@@ -356,6 +513,7 @@
-       "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "get-stream": {
-       "version": "3.0.0",
-       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-@@ -374,6 +532,20 @@
-         "minimatch": "^3.0.4",
-         "once": "^1.3.0",
-         "path-is-absolute": "^1.0.0"
-+=======
-+    "glob": {
-+      "version": "7.1.1",
-+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz",
-+      "integrity": "sha1-gFIR3wT6rxxjo2ADBs31reULLsg=",
-+      "dev": true,
-+      "requires": {
-+        "fs.realpath": "1.0.0",
-+        "inflight": "1.0.6",
-+        "inherits": "2.0.3",
-+        "minimatch": "3.0.4",
-+        "once": "1.4.0",
-+        "path-is-absolute": "1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "graceful-fs": {
-@@ -382,6 +554,7 @@
-       "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "growl": {
-       "version": "1.10.5",
-       "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
-@@ -392,6 +565,24 @@
-       "version": "3.0.0",
-       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-       "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-+=======
-+    "graceful-readlink": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
-+      "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
-+      "dev": true
-+    },
-+    "growl": {
-+      "version": "1.9.2",
-+      "resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz",
-+      "integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=",
-+      "dev": true
-+    },
-+    "has-flag": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-+      "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "he": {
-@@ -406,16 +597,32 @@
-       "integrity": "sha512-ciq6hFsSG/Bpt2DmrZJtv+56zpPdnq+NQ4ijEFrveKN0ZG1mhl/LdT1NQZ9se6ty1fACcI4d4vYqC9v8EYpH2A==",
-       "dev": true
-     },
-+<<<<<<< .our
-+=======
-+    "hosted-git-info": {
-+      "version": "2.6.0",
-+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.0.tgz",
-+      "integrity": "sha512-lIbgIIQA3lz5XaB6vxakj6sDHADJiZadYEJB+FgA+C4nubM1NwcuvUr9EJPmnH1skZqpqUzWborWo8EIUi0Sdw==",
-+      "dev": true
-+    },
-+>>>>>>> .their
-     "http-errors": {
-       "version": "1.6.3",
-       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-       "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "depd": "~1.1.2",
-         "inherits": "2.0.3",
-         "setprototypeof": "1.1.0",
-         "statuses": ">= 1.4.0 < 2"
-+=======
-+        "depd": "1.1.2",
-+        "inherits": "2.0.3",
-+        "setprototypeof": "1.1.0",
-+        "statuses": "1.4.0"
-+>>>>>>> .their
-       }
-     },
-     "inflight": {
-@@ -424,8 +631,13 @@
-       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "once": "^1.3.0",
-         "wrappy": "1"
-+=======
-+        "once": "1.4.0",
-+        "wrappy": "1.0.2"
-+>>>>>>> .their
-       }
-     },
-     "inherits": {
-@@ -440,12 +652,22 @@
-       "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
-       "dev": true
-     },
-+<<<<<<< .our
-+=======
-+    "is-arrayish": {
-+      "version": "0.2.1",
-+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-+      "dev": true
-+    },
-+>>>>>>> .their
-     "is-buffer": {
-       "version": "1.1.6",
-       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-       "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-       "dev": true
-     },
-+<<<<<<< .our
-     "is-fullwidth-code-point": {
-       "version": "2.0.0",
-       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-@@ -462,6 +684,36 @@
-       "version": "2.0.0",
-       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-       "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-+=======
-+    "is-builtin-module": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
-+      "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
-+      "dev": true,
-+      "requires": {
-+        "builtin-modules": "1.1.1"
-+      }
-+    },
-+    "is-fullwidth-code-point": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-+      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-+      "dev": true,
-+      "requires": {
-+        "number-is-nan": "1.0.1"
-+      }
-+    },
-+    "is-utf8": {
-+      "version": "0.2.1",
-+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-+      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
-+      "dev": true
-+    },
-+    "json3": {
-+      "version": "3.3.2",
-+      "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
-+      "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "lcid": {
-@@ -470,6 +722,7 @@
-       "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "invert-kv": "^1.0.0"
-       }
-     },
-@@ -499,6 +752,98 @@
-         "yallist": "^2.1.2"
-       }
-     },
-+=======
-+        "invert-kv": "1.0.0"
-+      }
-+    },
-+    "load-json-file": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-+      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-+      "dev": true,
-+      "requires": {
-+        "graceful-fs": "4.1.11",
-+        "parse-json": "2.2.0",
-+        "pify": "2.3.0",
-+        "pinkie-promise": "2.0.1",
-+        "strip-bom": "2.0.0"
-+      }
-+    },
-+    "lodash._baseassign": {
-+      "version": "3.2.0",
-+      "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
-+      "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=",
-+      "dev": true,
-+      "requires": {
-+        "lodash._basecopy": "3.0.1",
-+        "lodash.keys": "3.1.2"
-+      }
-+    },
-+    "lodash._basecopy": {
-+      "version": "3.0.1",
-+      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
-+      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
-+      "dev": true
-+    },
-+    "lodash._basecreate": {
-+      "version": "3.0.3",
-+      "resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz",
-+      "integrity": "sha1-G8ZhYU2qf8MRt9A78WgGoCE8+CE=",
-+      "dev": true
-+    },
-+    "lodash._getnative": {
-+      "version": "3.9.1",
-+      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-+      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
-+      "dev": true
-+    },
-+    "lodash._isiterateecall": {
-+      "version": "3.0.9",
-+      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
-+      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
-+      "dev": true
-+    },
-+    "lodash.create": {
-+      "version": "3.1.1",
-+      "resolved": "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz",
-+      "integrity": "sha1-1/KEnw29p+BGgruM1yqwIkYd6+c=",
-+      "dev": true,
-+      "requires": {
-+        "lodash._baseassign": "3.2.0",
-+        "lodash._basecreate": "3.0.3",
-+        "lodash._isiterateecall": "3.0.9"
-+      }
-+    },
-+    "lodash.isarguments": {
-+      "version": "3.1.0",
-+      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
-+      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
-+      "dev": true
-+    },
-+    "lodash.isarray": {
-+      "version": "3.0.4",
-+      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-+      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
-+      "dev": true
-+    },
-+    "lodash.keys": {
-+      "version": "3.1.2",
-+      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
-+      "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
-+      "dev": true,
-+      "requires": {
-+        "lodash._getnative": "3.9.1",
-+        "lodash.isarguments": "3.1.0",
-+        "lodash.isarray": "3.0.4"
-+      }
-+    },
-+    "long": {
-+      "version": "3.2.0",
-+      "resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz",
-+      "integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=",
-+      "dev": true
-+    },
-+>>>>>>> .their
-     "map-stream": {
-       "version": "0.1.0",
-       "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
-@@ -511,6 +856,7 @@
-       "integrity": "sha1-U6s41f48iJG6RlMp6iP6wFQBJvk=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "charenc": "~0.0.1",
-         "crypt": "~0.0.1",
-         "is-buffer": "~1.1.1"
-@@ -523,6 +869,11 @@
-       "dev": true,
-       "requires": {
-         "mimic-fn": "^1.0.0"
-+=======
-+        "charenc": "0.0.2",
-+        "crypt": "0.0.2",
-+        "is-buffer": "1.1.6"
-+>>>>>>> .their
-       }
-     },
-     "mime": {
-@@ -531,19 +882,26 @@
-       "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
-       "dev": true
-     },
-+<<<<<<< .our
-     "mimic-fn": {
-       "version": "1.2.0",
-       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-       "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "minimatch": {
-       "version": "3.0.4",
-       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-       "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "brace-expansion": "^1.1.7"
-+=======
-+        "brace-expansion": "1.1.11"
-+>>>>>>> .their
-       }
-     },
-     "minimist": {
-@@ -570,6 +928,7 @@
-       }
-     },
-     "mocha": {
-+<<<<<<< .our
-       "version": "5.2.0",
-       "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz",
-       "integrity": "sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==",
-@@ -597,6 +956,25 @@
-             "ms": "2.0.0"
-           }
-         }
-+=======
-+      "version": "3.5.3",
-+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-3.5.3.tgz",
-+      "integrity": "sha512-/6na001MJWEtYxHOV1WLfsmR4YIynkUEhBwzsb+fk2qmQ3iqsi258l/Q2MWHJMImAcNpZ8DEdYAK72NHoIQ9Eg==",
-+      "dev": true,
-+      "requires": {
-+        "browser-stdout": "1.3.0",
-+        "commander": "2.9.0",
-+        "debug": "2.6.8",
-+        "diff": "3.2.0",
-+        "escape-string-regexp": "1.0.5",
-+        "glob": "7.1.1",
-+        "growl": "1.9.2",
-+        "he": "1.1.1",
-+        "json3": "3.3.2",
-+        "lodash.create": "3.1.1",
-+        "mkdirp": "0.5.1",
-+        "supports-color": "3.1.2"
-+>>>>>>> .their
-       }
-     },
-     "mocha-junit-reporter": {
-@@ -605,11 +983,19 @@
-       "integrity": "sha1-LlFJ7UD8XS48px5C21qx/snG2Fw=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "debug": "^2.2.0",
-         "md5": "^2.1.0",
-         "mkdirp": "~0.5.1",
-         "strip-ansi": "^4.0.0",
-         "xml": "^1.0.0"
-+=======
-+        "debug": "2.6.8",
-+        "md5": "2.2.1",
-+        "mkdirp": "0.5.1",
-+        "strip-ansi": "4.0.0",
-+        "xml": "1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "ms": {
-@@ -619,6 +1005,7 @@
-       "dev": true
-     },
-     "multiparty": {
-+<<<<<<< .our
-       "version": "4.1.4",
-       "resolved": "https://registry.npmjs.org/multiparty/-/multiparty-4.1.4.tgz",
-       "integrity": "sha1-TJbcvcEeP3kX4WFeZAtLUCK+ZP0=",
-@@ -626,6 +1013,14 @@
-       "requires": {
-         "fd-slicer": "~1.0.1",
-         "safe-buffer": "5.1.2"
-+=======
-+      "version": "4.1.3",
-+      "resolved": "https://registry.npmjs.org/multiparty/-/multiparty-4.1.3.tgz",
-+      "integrity": "sha1-PEPH/LGJbhdGBDap3Qtu8WaOT5Q=",
-+      "dev": true,
-+      "requires": {
-+        "fd-slicer": "1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "nan": {
-@@ -634,6 +1029,7 @@
-       "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==",
-       "optional": true
-     },
-+<<<<<<< .our
-     "npm-run-path": {
-       "version": "2.0.2",
-       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-@@ -641,6 +1037,18 @@
-       "dev": true,
-       "requires": {
-         "path-key": "^2.0.0"
-+=======
-+    "normalize-package-data": {
-+      "version": "2.4.0",
-+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-+      "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
-+      "dev": true,
-+      "requires": {
-+        "hosted-git-info": "2.6.0",
-+        "is-builtin-module": "1.0.0",
-+        "semver": "5.5.0",
-+        "validate-npm-package-license": "3.0.3"
-+>>>>>>> .their
-       }
-     },
-     "number-is-nan": {
-@@ -664,7 +1072,11 @@
-       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "wrappy": "1"
-+=======
-+        "wrappy": "1.0.2"
-+>>>>>>> .their
-       }
-     },
-     "optimist": {
-@@ -673,6 +1085,7 @@
-       "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "minimist": "~0.0.1",
-         "wordwrap": "~0.0.2"
-       }
-@@ -686,6 +1099,25 @@
-         "execa": "^0.7.0",
-         "lcid": "^1.0.0",
-         "mem": "^1.1.0"
-+=======
-+        "minimist": "0.0.10",
-+        "wordwrap": "0.0.3"
-+      }
-+    },
-+    "options": {
-+      "version": "0.0.6",
-+      "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz",
-+      "integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8=",
-+      "dev": true
-+    },
-+    "os-locale": {
-+      "version": "1.4.0",
-+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-+      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-+      "dev": true,
-+      "requires": {
-+        "lcid": "1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "os-tmpdir": {
-@@ -694,6 +1126,7 @@
-       "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "p-finally": {
-       "version": "1.0.0",
-       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-@@ -730,17 +1163,50 @@
-       "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-       "dev": true
-     },
-+=======
-+    "parse-json": {
-+      "version": "2.2.0",
-+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-+      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-+      "dev": true,
-+      "requires": {
-+        "error-ex": "1.3.1"
-+      }
-+    },
-+    "path-exists": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-+      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-+      "dev": true,
-+      "requires": {
-+        "pinkie-promise": "2.0.1"
-+      }
-+    },
-+>>>>>>> .their
-     "path-is-absolute": {
-       "version": "1.0.1",
-       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-       "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "path-key": {
-       "version": "2.0.1",
-       "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-       "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
-       "dev": true
-+=======
-+    "path-type": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-+      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-+      "dev": true,
-+      "requires": {
-+        "graceful-fs": "4.1.11",
-+        "pify": "2.3.0",
-+        "pinkie-promise": "2.0.1"
-+      }
-+>>>>>>> .their
-     },
-     "pathval": {
-       "version": "1.1.0",
-@@ -754,7 +1220,11 @@
-       "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "through": "~2.3"
-+=======
-+        "through": "2.3.8"
-+>>>>>>> .their
-       }
-     },
-     "pend": {
-@@ -763,12 +1233,36 @@
-       "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "pseudomap": {
-       "version": "1.0.2",
-       "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-       "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
-       "dev": true
-     },
-+=======
-+    "pify": {
-+      "version": "2.3.0",
-+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-+      "dev": true
-+    },
-+    "pinkie": {
-+      "version": "2.0.4",
-+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-+      "dev": true
-+    },
-+    "pinkie-promise": {
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-+      "dev": true,
-+      "requires": {
-+        "pinkie": "2.0.4"
-+      }
-+    },
-+>>>>>>> .their
-     "put": {
-       "version": "0.0.6",
-       "resolved": "https://registry.npmjs.org/put/-/put-0.0.6.tgz",
-@@ -787,6 +1281,30 @@
-       "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=",
-       "dev": true
-     },
-+<<<<<<< .our
-+=======
-+    "read-pkg": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-+      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-+      "dev": true,
-+      "requires": {
-+        "load-json-file": "1.1.0",
-+        "normalize-package-data": "2.4.0",
-+        "path-type": "1.1.0"
-+      }
-+    },
-+    "read-pkg-up": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-+      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-+      "dev": true,
-+      "requires": {
-+        "find-up": "1.1.2",
-+        "read-pkg": "1.1.0"
-+      }
-+    },
-+>>>>>>> .their
-     "require-directory": {
-       "version": "2.1.1",
-       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-@@ -811,7 +1329,11 @@
-       "integrity": "sha1-Ut1TjbDkF0U5lTWjRwkbpFzA6rA=",
-       "optional": true,
-       "requires": {
-+<<<<<<< .our
-         "nan": "2.x"
-+=======
-+        "nan": "2.10.0"
-+>>>>>>> .their
-       }
-     },
-     "safe-buffer": {
-@@ -826,6 +1348,15 @@
-       "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-       "dev": true
-     },
-+<<<<<<< .our
-+=======
-+    "semver": {
-+      "version": "5.5.0",
-+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
-+      "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
-+      "dev": true
-+    },
-+>>>>>>> .their
-     "send": {
-       "version": "0.16.2",
-       "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
-@@ -833,6 +1364,7 @@
-       "dev": true,
-       "requires": {
-         "debug": "2.6.9",
-+<<<<<<< .our
-         "depd": "~1.1.2",
-         "destroy": "~1.0.4",
-         "encodeurl": "~1.0.2",
-@@ -845,6 +1377,20 @@
-         "on-finished": "~2.3.0",
-         "range-parser": "~1.2.0",
-         "statuses": "~1.4.0"
-+=======
-+        "depd": "1.1.2",
-+        "destroy": "1.0.4",
-+        "encodeurl": "1.0.2",
-+        "escape-html": "1.0.3",
-+        "etag": "1.8.1",
-+        "fresh": "0.5.2",
-+        "http-errors": "1.6.3",
-+        "mime": "1.4.1",
-+        "ms": "2.0.0",
-+        "on-finished": "2.3.0",
-+        "range-parser": "1.2.0",
-+        "statuses": "1.4.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "debug": {
-@@ -870,6 +1416,7 @@
-       "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-       "dev": true
-     },
-+<<<<<<< .our
-     "shebang-command": {
-       "version": "1.2.0",
-       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-@@ -889,6 +1436,38 @@
-       "version": "3.0.2",
-       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-       "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
-+=======
-+    "spdx-correct": {
-+      "version": "3.0.0",
-+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz",
-+      "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==",
-+      "dev": true,
-+      "requires": {
-+        "spdx-expression-parse": "3.0.0",
-+        "spdx-license-ids": "3.0.0"
-+      }
-+    },
-+    "spdx-exceptions": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz",
-+      "integrity": "sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==",
-+      "dev": true
-+    },
-+    "spdx-expression-parse": {
-+      "version": "3.0.0",
-+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
-+      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
-+      "dev": true,
-+      "requires": {
-+        "spdx-exceptions": "2.1.0",
-+        "spdx-license-ids": "3.0.0"
-+      }
-+    },
-+    "spdx-license-ids": {
-+      "version": "3.0.0",
-+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz",
-+      "integrity": "sha512-2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "split": {
-@@ -897,7 +1476,11 @@
-       "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "through": "2"
-+=======
-+        "through": "2.3.8"
-+>>>>>>> .their
-       }
-     },
-     "statuses": {
-@@ -912,6 +1495,7 @@
-       "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "duplexer": "~0.1.1"
-       }
-     },
-@@ -923,6 +1507,37 @@
-       "requires": {
-         "is-fullwidth-code-point": "^2.0.0",
-         "strip-ansi": "^4.0.0"
-+=======
-+        "duplexer": "0.1.1"
-+      }
-+    },
-+    "string-width": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-+      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-+      "dev": true,
-+      "requires": {
-+        "code-point-at": "1.1.0",
-+        "is-fullwidth-code-point": "1.0.0",
-+        "strip-ansi": "3.0.1"
-+      },
-+      "dependencies": {
-+        "ansi-regex": {
-+          "version": "2.1.1",
-+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-+          "dev": true
-+        },
-+        "strip-ansi": {
-+          "version": "3.0.1",
-+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-+          "dev": true,
-+          "requires": {
-+            "ansi-regex": "2.1.1"
-+          }
-+        }
-+>>>>>>> .their
-       }
-     },
-     "strip-ansi": {
-@@ -931,6 +1546,7 @@
-       "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "ansi-regex": "^3.0.0"
-       }
-     },
-@@ -947,6 +1563,27 @@
-       "dev": true,
-       "requires": {
-         "has-flag": "^3.0.0"
-+=======
-+        "ansi-regex": "3.0.0"
-+      }
-+    },
-+    "strip-bom": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-+      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-+      "dev": true,
-+      "requires": {
-+        "is-utf8": "0.2.1"
-+      }
-+    },
-+    "supports-color": {
-+      "version": "3.1.2",
-+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz",
-+      "integrity": "sha1-cqJiiU2dQIuVbKBf83su2KbiotU=",
-+      "dev": true,
-+      "requires": {
-+        "has-flag": "1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "temp": {
-@@ -955,8 +1592,13 @@
-       "integrity": "sha1-4Ma8TSa5AxJEEOT+2BEDAU38H1k=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "os-tmpdir": "^1.0.0",
-         "rimraf": "~2.2.6"
-+=======
-+        "os-tmpdir": "1.0.2",
-+        "rimraf": "2.2.8"
-+>>>>>>> .their
-       }
-     },
-     "through": {
-@@ -971,6 +1613,7 @@
-       "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-       "dev": true
-     },
-+<<<<<<< .our
-     "walkdir": {
-       "version": "0.0.12",
-       "resolved": "https://registry.npmjs.org/walkdir/-/walkdir-0.0.12.tgz",
-@@ -990,6 +1633,34 @@
-       "version": "2.0.0",
-       "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-       "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-+=======
-+    "ultron": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz",
-+      "integrity": "sha1-rOEWq1V80Zc4ak6I9GhTeMiy5Po=",
-+      "dev": true
-+    },
-+    "validate-npm-package-license": {
-+      "version": "3.0.3",
-+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz",
-+      "integrity": "sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==",
-+      "dev": true,
-+      "requires": {
-+        "spdx-correct": "3.0.0",
-+        "spdx-expression-parse": "3.0.0"
-+      }
-+    },
-+    "walkdir": {
-+      "version": "0.0.11",
-+      "resolved": "https://registry.npmjs.org/walkdir/-/walkdir-0.0.11.tgz",
-+      "integrity": "sha1-oW0CXrkxvQO1LzCMrtD0D86+lTI=",
-+      "dev": true
-+    },
-+    "which-module": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-+      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "winreg": {
-@@ -1010,8 +1681,13 @@
-       "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "string-width": "^1.0.1",
-         "strip-ansi": "^3.0.1"
-+=======
-+        "string-width": "1.0.2",
-+        "strip-ansi": "3.0.1"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "ansi-regex": {
-@@ -1020,6 +1696,7 @@
-           "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-           "dev": true
-         },
-+<<<<<<< .our
-         "is-fullwidth-code-point": {
-           "version": "1.0.0",
-           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-@@ -1040,13 +1717,19 @@
-             "strip-ansi": "^3.0.0"
-           }
-         },
-+=======
-+>>>>>>> .their
-         "strip-ansi": {
-           "version": "3.0.1",
-           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "ansi-regex": "^2.0.0"
-+=======
-+            "ansi-regex": "2.1.1"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -1058,12 +1741,22 @@
-       "dev": true
-     },
-     "ws": {
-+<<<<<<< .our
-       "version": "5.2.0",
-       "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.0.tgz",
-       "integrity": "sha512-c18dMeW+PEQdDFzkhDsnBAlS4Z8KGStBQQUcQ5mf7Nf689jyGk0594L+i9RaQuf4gog6SvWLJorz2NfSaqxZ7w==",
-       "dev": true,
-       "requires": {
-         "async-limiter": "~1.0.0"
-+=======
-+      "version": "1.1.5",
-+      "resolved": "https://registry.npmjs.org/ws/-/ws-1.1.5.tgz",
-+      "integrity": "sha512-o3KqipXNUdS7wpQzBHSe180lBGO60SoK0yVo3CYJgb2MkobuWuBX6dhkYP5ORCLd55y+SaflMOV5fqAB53ux4w==",
-+      "dev": true,
-+      "requires": {
-+        "options": "0.0.6",
-+        "ultron": "1.0.2"
-+>>>>>>> .their
-       }
-     },
-     "xml": {
-@@ -1078,7 +1771,11 @@
-       "integrity": "sha1-UnTmf1pkxfkpdM2FE54DMq3GuQw=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "sax": ">=0.1.1"
-+=======
-+        "sax": "1.2.4"
-+>>>>>>> .their
-       }
-     },
-     "y18n": {
-@@ -1087,6 +1784,7 @@
-       "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "yallist": {
-       "version": "2.1.2",
-       "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-@@ -1120,6 +1818,36 @@
-       "dev": true,
-       "requires": {
-         "camelcase": "^4.1.0"
-+=======
-+    "yargs": {
-+      "version": "6.6.0",
-+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz",
-+      "integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=",
-+      "dev": true,
-+      "requires": {
-+        "camelcase": "3.0.0",
-+        "cliui": "3.2.0",
-+        "decamelize": "1.2.0",
-+        "get-caller-file": "1.0.2",
-+        "os-locale": "1.4.0",
-+        "read-pkg-up": "1.0.1",
-+        "require-directory": "2.1.1",
-+        "require-main-filename": "1.0.1",
-+        "set-blocking": "2.0.0",
-+        "string-width": "1.0.2",
-+        "which-module": "1.0.0",
-+        "y18n": "3.2.1",
-+        "yargs-parser": "4.2.1"
-+      }
-+    },
-+    "yargs-parser": {
-+      "version": "4.2.1",
-+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz",
-+      "integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=",
-+      "dev": true,
-+      "requires": {
-+        "camelcase": "3.0.0"
-+>>>>>>> .their
-       }
-     }
-   }
-changed in both
-  base   100644 5ee932e8747e9371ee4ac98f1d3bcacb87bf1423 spec/webview-spec.js
-  our    100644 db75a4e3754e24a5e6740be61be4f4098c58006e spec/webview-spec.js
-  their  100644 d3204bf0830e1db7df4eecbee9725cb300a61800 spec/webview-spec.js
-@@ -1256,6 +1256,235 @@
-     expect(tabId).to.be.not.equal(w.webContents.id)
-   })
- 
-+<<<<<<< .our
-+=======
-+  // TODO(alexeykuzmin): Some tests rashe a renderer process.
-+  // Fix them and enable the tests.
-+  xdescribe('guestinstance attribute', () => {
-+    it('before loading there is no attribute', () => {
-+      loadWebView(webview)  // Don't wait for loading to finish.
-+      assert(!webview.hasAttribute('guestinstance'))
-+    })
-+
-+    it('loading a page sets the guest view', async () => {
-+      await loadWebView(webview, {
-+        src: `file://${fixtures}/api/blank.html`
-+      })
-+
-+      const instance = webview.getAttribute('guestinstance')
-+      assert.equal(instance, parseInt(instance))
-+
-+      const guest = getGuestWebContents(parseInt(instance))
-+      assert.equal(guest, webview.getWebContents())
-+    })
-+
-+    it('deleting the attribute destroys the webview', async () => {
-+      await loadWebView(webview, {
-+        src: `file://${fixtures}/api/blank.html`
-+      })
-+
-+      const instance = parseInt(webview.getAttribute('guestinstance'))
-+      const waitForDestroy = waitForEvent(webview, 'destroyed')
-+      webview.removeAttribute('guestinstance')
-+
-+      await waitForDestroy
-+      expect(getGuestWebContents(instance)).to.equal(undefined)
-+    })
-+
-+    it('setting the attribute on a new webview moves the contents', (done) => {
-+      const loadListener = () => {
-+        const webContents = webview.getWebContents()
-+        const instance = webview.getAttribute('guestinstance')
-+
-+        const destroyListener = () => {
-+          assert.equal(webContents, webview2.getWebContents())
-+
-+          // Make sure that events are hooked up to the right webview now
-+          webview2.addEventListener('console-message', (e) => {
-+            assert.equal(e.message, 'a')
-+            document.body.removeChild(webview2)
-+            done()
-+          })
-+
-+          webview2.src = `file://${fixtures}/pages/a.html`
-+        }
-+        webview.addEventListener('destroyed', destroyListener, {once: true})
-+
-+        const webview2 = new WebView()
-+        loadWebView(webview2, {
-+          guestinstance: instance
-+        })
-+      }
-+      webview.addEventListener('did-finish-load', loadListener, {once: true})
-+      loadWebView(webview, {
-+        src: `file://${fixtures}/api/blank.html`
-+      })
-+    })
-+
-+    it('setting the attribute to an invalid guestinstance does nothing', async () => {
-+      await loadWebView(webview, {
-+        src: `file://${fixtures}/api/blank.html`
-+      })
-+      webview.setAttribute('guestinstance', 55)
-+
-+      // Make sure that events are still hooked up to the webview
-+      const waitForMessage = waitForEvent(webview, 'console-message')
-+      webview.src = `file://${fixtures}/pages/a.html`
-+      const {message} = await waitForMessage
-+      assert.equal(message, 'a')
-+    })
-+
-+    it('setting the attribute on an existing webview moves the contents', (done) => {
-+      const load1Listener = () => {
-+        const webContents = webview.getWebContents()
-+        const instance = webview.getAttribute('guestinstance')
-+        let destroyedInstance
-+
-+        const destroyListener = () => {
-+          assert.equal(webContents, webview2.getWebContents())
-+          assert.equal(null, getGuestWebContents(parseInt(destroyedInstance)))
-+
-+          // Make sure that events are hooked up to the right webview now
-+          webview2.addEventListener('console-message', (e) => {
-+            assert.equal(e.message, 'a')
-+            document.body.removeChild(webview2)
-+            done()
-+          })
-+
-+          webview2.src = 'file://' + fixtures + '/pages/a.html'
-+        }
-+        webview.addEventListener('destroyed', destroyListener, {once: true})
-+
-+        const webview2 = new WebView()
-+        const load2Listener = () => {
-+          destroyedInstance = webview2.getAttribute('guestinstance')
-+          assert.notEqual(instance, destroyedInstance)
-+
-+          webview2.setAttribute('guestinstance', instance)
-+        }
-+        webview2.addEventListener('did-finish-load', load2Listener, {once: true})
-+        loadWebView(webview2, {
-+          src: `file://${fixtures}/api/blank.html`
-+        })
-+      }
-+
-+      webview.addEventListener('did-finish-load', load1Listener, {once: true})
-+      loadWebView(webview, {
-+        src: `file://${fixtures}/api/blank.html`
-+      })
-+    })
-+
-+    it('moving a guest back to its original webview should work', (done) => {
-+      loadWebView(webview, {
-+        src: `file://${fixtures}/api/blank.html`
-+      }).then(() => {
-+        const webContents = webview.getWebContents()
-+        const instance = webview.getAttribute('guestinstance')
-+
-+        const destroy1Listener = () => {
-+          assert.equal(webContents, webview2.getWebContents())
-+          assert.equal(null, webview.getWebContents())
-+
-+          const destroy2Listener = () => {
-+            assert.equal(webContents, webview.getWebContents())
-+            assert.equal(null, webview2.getWebContents())
-+
-+            // Make sure that events are hooked up to the right webview now
-+            webview.addEventListener('console-message', (e) => {
-+              document.body.removeChild(webview2)
-+              assert.equal(e.message, 'a')
-+              done()
-+            })
-+
-+            webview.src = `file://${fixtures}/pages/a.html`
-+          }
-+          webview2.addEventListener('destroyed', destroy2Listener, {once: true})
-+          webview.setAttribute('guestinstance', instance)
-+        }
-+        webview.addEventListener('destroyed', destroy1Listener, {once: true})
-+
-+        const webview2 = new WebView()
-+        loadWebView(webview2, {guestinstance: instance})
-+      })
-+    })
-+
-+    // FIXME(alexeykuzmin): This test only passes if the previous test ^
-+    // is run alongside.
-+    it('setting the attribute on a webview in a different window moves the contents', (done) => {
-+      loadWebView(webview, {
-+        src: `file://${fixtures}/api/blank.html`
-+      }).then(() => {
-+        const instance = webview.getAttribute('guestinstance')
-+
-+        w = new BrowserWindow({ show: false })
-+        w.webContents.once('did-finish-load', () => {
-+          ipcMain.once('pong', () => {
-+            assert(!webview.hasAttribute('guestinstance'))
-+            done()
-+          })
-+
-+          w.webContents.send('guestinstance', instance)
-+        })
-+        w.loadURL(`file://${fixtures}/pages/webview-move-to-window.html`)
-+      })
-+    })
-+
-+    it('does not delete the guestinstance attribute when moving the webview to another parent node', (done) => {
-+      webview.addEventListener('dom-ready', function domReadyListener () {
-+        webview.addEventListener('did-attach', () => {
-+          assert(webview.guestinstance != null)
-+          assert(webview.getWebContents() != null)
-+          done()
-+        })
-+
-+        document.body.replaceChild(webview, div)
-+      })
-+      webview.src = `file://${fixtures}/pages/a.html`
-+
-+      const div = document.createElement('div')
-+      div.appendChild(webview)
-+      document.body.appendChild(div)
-+    })
-+
-+    it('does not destroy the webContents when hiding/showing the webview (regression)', (done) => {
-+      webview.addEventListener('dom-ready', function () {
-+        const instance = webview.getAttribute('guestinstance')
-+        assert(instance != null)
-+
-+        // Wait for event directly since attach happens asynchronously over IPC
-+        ipcMain.once('ELECTRON_GUEST_VIEW_MANAGER_ATTACH_GUEST', () => {
-+          assert(webview.getWebContents() != null)
-+          assert.equal(instance, webview.getAttribute('guestinstance'))
-+          done()
-+        })
-+
-+        webview.style.display = 'none'
-+        webview.offsetHeight // eslint-disable-line
-+        webview.style.display = 'block'
-+      }, {once: true})
-+      loadWebView(webview, {src: `file://${fixtures}/pages/a.html`})
-+    })
-+
-+    it('does not reload the webContents when hiding/showing the webview (regression)', (done) => {
-+      webview.addEventListener('dom-ready', function () {
-+        webview.addEventListener('did-start-loading', () => {
-+          done(new Error('webview started loading unexpectedly'))
-+        })
-+
-+        // Wait for event directly since attach happens asynchronously over IPC
-+        webview.addEventListener('did-attach', () => {
-+          done()
-+        })
-+
-+        webview.style.display = 'none'
-+        webview.offsetHeight  // eslint-disable-line
-+        webview.style.display = 'block'
-+      }, {once: true})
-+      loadWebView(webview, {src: `file://${fixtures}/pages/a.html`})
-+    })
-+  })
-+
-+>>>>>>> .their
-   describe('DOM events', () => {
-     let div
- 
-@@ -1272,9 +1501,33 @@
-       if (div != null) div.remove()
-     })
- 
-+<<<<<<< .our
-     it('emits resize events', async () => {
-       const firstResizeSignal = waitForEvent(webview, 'resize')
-       const domReadySignal = waitForEvent(webview, 'dom-ready')
-+=======
-+    // TODO(alexeykuzmin): [Ch66] Enable the test.
-+    xit('emits resize events', (done) => {
-+      webview.addEventListener('dom-ready', () => {
-+        div.style.width = '1234px'
-+        div.style.height = '789px'
-+      })
-+
-+      webview.addEventListener('resize', function onResize (event) {
-+        webview.removeEventListener('resize', onResize)
-+        assert.equal(event.newWidth, 100)
-+        assert.equal(event.newHeight, 10)
-+        assert.equal(event.target, webview)
-+        webview.addEventListener('resize', function onResizeAgain (event) {
-+          // This will be triggered after setting the new div width and height.
-+          webview.removeEventListener('resize', onResizeAgain)
-+          assert.equal(event.newWidth, 1234)
-+          assert.equal(event.newHeight, 789)
-+          assert.equal(event.target, webview)
-+          done()
-+        })
-+      })
-+>>>>>>> .their
- 
-       webview.src = `file://${fixtures}/pages/a.html`
-       div.appendChild(webview)
-@@ -1287,12 +1540,89 @@
- 
-       await domReadySignal
- 
-+<<<<<<< .our
-       const secondResizeSignal = waitForEvent(webview, 'resize')
- 
-       const newWidth = 1234
-       const newHeight = 789
-       div.style.width = `${newWidth}px`
-       div.style.height = `${newHeight}px`
-+=======
-+    // TODO(alexeykuzmin): [Ch66] Enable the test.
-+    xit('does not resize guest when attribute is present', async () => {
-+      const INITIAL_SIZE = 200
-+      const w = await openTheWindow(
-+          {show: false, width: INITIAL_SIZE, height: INITIAL_SIZE})
-+      w.loadURL(`file://${fixtures}/pages/webview-no-guest-resize.html`)
-+      await waitForOnce(ipcMain, 'webview-loaded')
-+
-+      const noGuestResizePromise = Promise.race([
-+        waitForOnce(ipcMain, 'webview-guest-resize'),
-+        new Promise(resolve => setTimeout(() => resolve(), 500))
-+      ]).then((eventData = null) => {
-+        if (eventData !== null) {
-+          // Means we got the 'webview-guest-resize' event before the time out.
-+          return Promise.reject(new Error('Unexpected guest resize message'))
-+        }
-+      })
-+
-+      const CONTENT_SIZE = 300
-+      assert(CONTENT_SIZE !== INITIAL_SIZE)
-+      w.setContentSize(CONTENT_SIZE, CONTENT_SIZE)
-+
-+      return noGuestResizePromise
-+    })
-+
-+    // TODO(alexeykuzmin): [Ch66] Enable the test.
-+    xit('dispatches element resize event even when attribute is present', async () => {
-+      const INITIAL_SIZE = 200
-+      const w = await openTheWindow(
-+          {show: false, width: INITIAL_SIZE, height: INITIAL_SIZE})
-+      w.loadURL(`file://${fixtures}/pages/webview-no-guest-resize.html`)
-+      await waitForOnce(ipcMain, 'webview-loaded')
-+
-+      const elementResizePromise = waitForOnce(ipcMain, 'webview-element-resize')
-+          .then(([, width, height]) => {
-+            expect(width).to.equal(CONTENT_SIZE)
-+            expect(height).to.equal(CONTENT_SIZE)
-+          })
-+
-+      const CONTENT_SIZE = 300
-+      assert(CONTENT_SIZE !== INITIAL_SIZE)
-+      w.setContentSize(CONTENT_SIZE, CONTENT_SIZE)
-+
-+      return elementResizePromise
-+    })
-+
-+    // TODO(alexeykuzmin): [Ch66] Enable the test.
-+    xit('can be manually resized with setSize even when attribute is present', async () => {
-+      const INITIAL_SIZE = 200
-+      const w = await openTheWindow(
-+          {show: false, width: INITIAL_SIZE, height: INITIAL_SIZE})
-+      w.loadURL(`file://${fixtures}/pages/webview-no-guest-resize.html`)
-+      await waitForOnce(ipcMain, 'webview-loaded')
-+
-+      const GUEST_WIDTH = 10
-+      const GUEST_HEIGHT = 20
-+
-+      const guestResizePromise = waitForOnce(ipcMain, 'webview-guest-resize')
-+          .then(([, width, height]) => {
-+            expect(width).to.be.equal(GUEST_WIDTH)
-+            expect(height).to.be.equal(GUEST_HEIGHT)
-+          })
-+
-+      const wc = webContents.getAllWebContents().find((wc) => {
-+        return wc.hostWebContents &&
-+            wc.hostWebContents.id === w.webContents.id
-+      })
-+      assert(wc)
-+      wc.setSize({
-+        normal: {
-+          width: GUEST_WIDTH,
-+          height: GUEST_HEIGHT
-+        }
-+      })
-+>>>>>>> .their
- 
-       const secondResizeEvent = await secondResizeSignal
-       expect(secondResizeEvent.target).to.equal(webview)
-changed in both
-  base   100644 f4cc9df68d54b62358834054f4a4cf129cce59ba toolchain.gypi
-  our    100644 697add78e42191741cee1b015cdcf4f801c570e7 toolchain.gypi
-  their  100644 b18a00afde8a62fbe1900fdccd3d2923c4820e58 toolchain.gypi
-@@ -2,6 +2,7 @@
-   'variables': {
-     # Clang stuff.
-     'make_clang_dir%': 'vendor/llvm-build/Release+Asserts',
-+    
-     # Set this to true when building with Clang.
-     'clang%': 1,
- 
-@@ -23,6 +24,9 @@
- 
-       # Abosulte path to source root.
-       'source_root%': '<!(node <(DEPTH)/tools/atom_source_root.js)',
-+
-+      # Set this to 1 when you want to use clang-cl on Windows.
-+      'clang_cl_windows%': 0,
-     },
- 
-     # Copy conditionally-set variables out one scope.
-@@ -30,6 +34,7 @@
-     'arm_version%': '<(arm_version)',
-     'arm_neon%': '<(arm_neon)',
-     'source_root%': '<(source_root)',
-+    'clang_cl_windows%': '<(clang_cl_windows)',
- 
-     # Variables to control Link-Time Optimization (LTO).
-     'use_lto%': 0,
-@@ -101,6 +106,16 @@
-         'arm_float_abi%': 'hard',
-         'arm_thumb%': 1,
-       }],  # arm_version==7
-+
-+      ['clang_cl_windows==1', {
-+        # Clang-cl binaries useful on Windows
-+        'clang_cc_binary%' : 'clang-cl',
-+        'clang_cxx_binary%' : 'clang-cl'
-+      },{
-+        # Default clang binaries
-+        'clang_cc_binary%' : 'clang',
-+        'clang_cxx_binary%' : 'clang++',
-+      }]
-     ],
-   },
-   'conditions': [
-@@ -116,8 +131,8 @@
-     # Setup building with clang.
-     ['clang==1', {
-       'make_global_settings': [
--        ['CC', '<(make_clang_dir)/bin/clang'],
--        ['CXX', '<(make_clang_dir)/bin/clang++'],
-+        ['CC', '<(make_clang_dir)/bin/<(clang_cc_binary)'],
-+        ['CXX', '<(make_clang_dir)/bin/<(clang_cxx_binary)'],
-         ['CC.host', '$(CC)'],
-         ['CXX.host', '$(CXX)'],
-       ],
-changed in both
-  base   160000 03bdc78da46b87ad6acf74b2fe5b7c09e352ec24 vendor/libchromiumcontent
-  our    160000 c85470a1c379b1c4bedb372c146521bc4be9b75d vendor/libchromiumcontent
-  their  160000 b9a68acb7e1f93193540cdf94f73ad6ba22c7900 vendor/libchromiumcontent
-removed in local
-  base   160000 ddec87224c7619ebd751b78e3214bf70a7a04a99 vendor/native_mate
-  their  160000 875706f66008e03a0c7a699de16d7e2bde0efb90 vendor/native_mate
-changed in both
-  base   160000 538a5023af0a92ba19de2420a0eada6ad4cd18f6 vendor/node
-  our    160000 ece0a06ac8147efb5b5af431c21f312f1884616e vendor/node
-  their  160000 ce2efb3516b064df284c258e9a30825eb6f924b1 vendor/node
diff --git a/app/test/fixtures/merge-parser/electron/merge-delete-gyp-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-delete-gyp-into-master.txt
deleted file mode 100644
index be6045e2d58..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-delete-gyp-into-master.txt
+++ /dev/null
@@ -1,6784 +0,0 @@
-changed in both
-  base   100644 e9048b4e58887c5b4f50554f281871d3a28a7ead .circleci/config.yml
-  our    100644 6d44d618aabcce04c60344f2274dec5b0c2a1f68 .circleci/config.yml
-  their  100644 81db08fc84291733fe8d5a10c8d968dc96469970 .circleci/config.yml
-@@ -19,6 +19,7 @@
-       fi
-     when: on_success
- 
-+<<<<<<< .our
- build-steps: &build-steps
-   steps:
-     - checkout
-@@ -147,6 +148,8 @@
-     - store_artifacts:
-         path: out
- 
-+=======
-+>>>>>>> .their
- gn-build-steps: &gn-build-steps
-   steps:
-     - run:
-@@ -344,173 +347,9 @@
-     xcode: "8.3.3"
-   resource_class: large
- 
--build-defaults: &build-defaults
--  docker:
--    - image: electronbuilds/electron:0.0.8
--  <<: *build-steps
--
- version: 2
- jobs:
--  electron-linux-arm:
--    environment:
--      TARGET_ARCH: arm
--    <<: *build-defaults
--    resource_class: 2xlarge
--
--  electron-linux-arm-test:
--    machine: true
--    steps:
--      - attach_workspace:
--          at: /tmp/workspace/project/out
--      - checkout
--      - run:
--          name: Test in ARM docker container
--          command: |
--            if [ "$ELECTRON_RELEASE" != "1" ]; then
--              docker run --rm --privileged multiarch/qemu-user-static:register --reset
--              docker run -it \
--              --mount type=bind,source=/tmp/workspace,target=/tmp/workspace \
--              --rm electronbuilds/electronarm7:0.0.5 > version.txt
--              cat version.txt
--              if grep -q `script/get-version.py` version.txt; then
--                echo "Versions match"
--              else
--                echo "Versions do not match"
--                exit 1
--              fi
--            else
--              echo "Skipping test for release build"
--            fi
--
--  electron-linux-arm-release-nightly:
--    environment:
--      TARGET_ARCH: arm
--      RUN_RELEASE_BUILD: true
--      NIGHTLY_BUILD: true
--    <<: *build-defaults
--    resource_class: 2xlarge
--
--  electron-linux-arm64:
--    environment:
--      TARGET_ARCH: arm64
--    <<: *build-defaults
--    resource_class: 2xlarge
--
--  electron-linux-arm64-test:
--    machine: true
--    steps:
--      - attach_workspace:
--          at: /tmp/workspace/project/out
--      - checkout
--      - run:
--          name: Test in ARM64 docker container
--          command: |
--            if [ "$ELECTRON_RELEASE" != "1" ]; then
--              docker run --rm --privileged multiarch/qemu-user-static:register --reset
--              docker run -it \
--              --mount type=bind,source=/tmp/workspace,target=/tmp/workspace \
--              --rm electronbuilds/electronarm64:0.0.6 > version.txt
--              cat version.txt
--              if grep -q `script/get-version.py` version.txt; then
--                echo "Versions match"
--              else
--                echo "Versions do not match"
--                exit 1
--              fi
--            else
--              echo "Skipping test for release build"
--            fi
--
--  electron-linux-arm64-release-nightly:
--    environment:
--      TARGET_ARCH: arm64
--      RUN_RELEASE_BUILD: true
--      NIGHTLY_BUILD: true
--    <<: *build-defaults
--    resource_class: 2xlarge
--
--  electron-linux-ia32:
--    environment:
--      TARGET_ARCH: ia32
--      DISPLAY: ':99.0'
--      RUN_TESTS: true
--      RUN_HEADLESS_TESTS: true
--    <<: *build-defaults
--    resource_class: xlarge
--
--  electron-linux-ia32-release-nightly:
--    environment:
--      TARGET_ARCH: ia32
--      RUN_RELEASE_BUILD: true
--      NIGHTLY_BUILD: true
--    <<: *build-defaults
--    resource_class: xlarge
--
--  electron-linux-mips64el:
--    environment:
--      TARGET_ARCH: mips64el
--    <<: *build-defaults
--    resource_class: xlarge
--
--  electron-linux-x64:
--    environment:
--      TARGET_ARCH: x64
--      DISPLAY: ':99.0'
--      RUN_TESTS: true
--      RUN_HEADLESS_TESTS: true
--      CREATE_TYPESCRIPT_DEFS: true
--    <<: *build-defaults
--    resource_class: xlarge
--
--  electron-linux-x64-release-nightly:
--    environment:
--      TARGET_ARCH: x64
--      RUN_RELEASE_BUILD: true
--      NIGHTLY_BUILD: true
--    <<: *build-defaults
--    resource_class: xlarge
--
--  electron-osx-x64:
--    environment:
--      TARGET_ARCH: x64
--      RUN_TESTS: true
--      INSTALL_MACOS_NODE: true
--    macos:
--      xcode: "8.3.3"
--    <<: *build-steps
--
--  electron-osx-x64-release-nightly:
--    environment:
--      TARGET_ARCH: x64
--      RUN_RELEASE_BUILD: true
--      INSTALL_MACOS_NODE: true
--      NIGHTLY_BUILD: true
--    macos:
--      xcode: "8.3.3"
--    <<: *build-steps
--
--  electron-mas-x64:
--    environment:
--      TARGET_ARCH: x64
--      MAS_BUILD: 1
--      RUN_TESTS: true
--      INSTALL_MACOS_NODE: true
--    macos:
--      xcode: "8.3.3"
--    <<: *build-steps
--
--  electron-mas-x64-release-nightly:
--    environment:
--      TARGET_ARCH: x64
--      MAS_BUILD: 1
--      RUN_RELEASE_BUILD: true
--      INSTALL_MACOS_NODE: true
--      NIGHTLY_BUILD: true
--    macos:
--      xcode: "8.3.3"
--    <<: *build-steps
--
--  electron-gn-linux-x64-debug-fyi:
-+  electron-linux-x64-debug:
-     environment:
-       DISPLAY: ':99.0'
-       GN_CONFIG: //electron/build/args/debug.gn
-@@ -526,7 +365,7 @@
-     <<: *gn-linux-build-machine
-     <<: *gn-build-steps
- 
--  electron-gn-linux-x64-release-fyi:
-+  electron-linux-x64-release:
-     environment:
-       DISPLAY: ':99.0'
-       GN_CONFIG: //electron/build/args/release.gn
-@@ -534,7 +373,7 @@
-     <<: *gn-linux-build-machine
-     <<: *gn-build-steps
- 
--  electron-gn-linux-ia32-debug-fyi:
-+  electron-linux-ia32-debug:
-     environment:
-       DISPLAY: ':99.0'
-       GN_CONFIG: //electron/build/args/debug.gn
-@@ -554,7 +393,7 @@
-     <<: *gn-linux-build-machine
-     <<: *gn-build-steps
- 
--  electron-gn-linux-ia32-release-fyi:
-+  electron-linux-ia32-release:
-     environment:
-       DISPLAY: ':99.0'
-       GN_CONFIG: //electron/build/args/release.gn
-@@ -671,6 +510,7 @@
- 
- workflows:
-   version: 2
-+<<<<<<< .our
-   build-arm:
-     jobs:
-       - electron-linux-arm
-@@ -745,3 +585,11 @@
-       - electron-gn-linux-arm64-release-fyi
-       - electron-gn-mas-release-fyi
-       - electron-gn-osx-release-fyi
-+=======
-+  build-linux:
-+    jobs:
-+      - electron-linux-x64-debug
-+      - electron-linux-x64-release
-+      - electron-linux-ia32-debug
-+      - electron-linux-ia32-release
-+>>>>>>> .their
-changed in both
-  base   100644 932cfd540e24e8c139d2c397a3aad1a78e2d878f BUILD.gn
-  our    100644 d00c4b1e3d3523641210ff20fda41d76c9eb546c BUILD.gn
-  their  100644 2008bf3415c7e713d32701f3c0fa4e10b8e8b232 BUILD.gn
-@@ -1,3 +1,4 @@
-+import("filenames.gni")
- import("//build/config/locales.gni")
- import("//tools/grit/repack.gni")
- import("//tools/v8_context_snapshot/v8_context_snapshot.gni")
-@@ -32,6 +33,7 @@
-   enable_desktop_capturer = true
-   enable_run_as_node = true
-   enable_osr = false
-+  enable_view_api = false
- }
- 
- if (is_mas_build) {
-@@ -39,15 +41,6 @@
-          "It doesn't make sense to build a MAS build on a non-mac platform")
- }
- 
--filenames_gypi =
--    exec_script("//build/gypi_to_gn.py",
--                [
--                  rebase_path("filenames.gypi"),
--                  "--replace=<(SHARED_INTERMEDIATE_DIR)=$target_gen_dir",
--                ],
--                "scope",
--                [ "filenames.gypi" ])
--
- config("branding") {
-   defines = [
-     "ATOM_PRODUCT_NAME=\"$electron_product_name\"",
-@@ -142,7 +135,7 @@
-     ":atom_js2c_copy",
-   ]
- 
--  js2c_sources = filenames_gypi.js2c_sources
-+  js2c_sources = filenames.js2c_sources
- 
-   browserify_sources = [
-     "$target_gen_dir/js2c/isolated_bundle.js",
-@@ -162,13 +155,22 @@
- }
- 
- asar("js2asar") {
--  sources = filenames_gypi.js_sources
-+  sources = filenames.js_sources
-   if (enable_desktop_capturer) {
-     sources += [
-       "lib/browser/desktop-capturer.js",
-       "lib/renderer/api/desktop-capturer.js",
-     ]
-   }
-+  if (enable_view_api) {
-+    sources += [
-+      "lib/browser/api/box-layout.js",
-+      "lib/browser/api/button.js",
-+      "lib/browser/api/label-button.js",
-+      "lib/browser/api/layout-manager.js",
-+      "lib/browser/api/text-field.js",
-+    ]
-+  }
-   outputs = [
-     "$root_out_dir/resources/electron.asar",
-   ]
-@@ -176,7 +178,7 @@
- }
- 
- asar("app2asar") {
--  sources = filenames_gypi.default_app_sources
-+  sources = filenames.default_app_sources
-   outputs = [
-     "$root_out_dir/resources/default_app.asar",
-   ]
-@@ -270,9 +272,13 @@
- 
-   set_sources_assignment_filter(
-       sources_assignment_filter + extra_source_filters)
--  sources = filenames_gypi.lib_sources
-+  sources = filenames.lib_sources
-   set_sources_assignment_filter(sources_assignment_filter)
- 
-+  sources += [
-+    "$target_gen_dir/atom_natives.h",
-+  ]
-+
-   if (is_component_build) {
-     defines += [
-       # Import V8 symbols from shared library (node.dll / libnode.so)
-@@ -333,11 +339,11 @@
-       # Disable warnings for g_settings_list_schemas.
-       "GLIB_DISABLE_DEPRECATION_WARNINGS",
-     ]
--    sources += filenames_gypi.lib_sources_linux
--    sources += filenames_gypi.lib_sources_nss
-+    sources += filenames.lib_sources_linux
-+    sources += filenames.lib_sources_nss
-   }
-   if (is_win) {
--    sources += filenames_gypi.lib_sources_win
-+    sources += filenames.lib_sources_win
-     libs += [ "dwmapi.lib" ]
-   }
-   if (is_linux || is_win) {
-@@ -383,6 +389,21 @@
-       "atom/browser/api/atom_api_desktop_capturer.h",
-     ]
-   }
-+
-+  if (enable_view_api) {
-+    sources += [
-+      "atom/browser/api/atom_api_box_layout.cc",
-+      "atom/browser/api/atom_api_box_layout.h",
-+      "atom/browser/api/atom_api_button.cc",
-+      "atom/browser/api/atom_api_button.h",
-+      "atom/browser/api/atom_api_label_button.cc",
-+      "atom/browser/api/atom_api_label_button.h",
-+      "atom/browser/api/atom_api_layout_manager.cc",
-+      "atom/browser/api/atom_api_layout_manager.h",
-+      "atom/browser/api/atom_api_text_field.cc",
-+      "atom/browser/api/atom_api_text_field.h",
-+    ]
-+  }
- }
- 
- electron_paks("packed_resources") {
-@@ -485,7 +506,7 @@
-     extra_substitutions = [ "ATOM_BUNDLE_ID=$electron_mac_bundle_id.framework" ]
- 
-     include_dirs = [ "." ]
--    sources = filenames_gypi.framework_sources
-+    sources = filenames.framework_sources
- 
-     libs = [
-       "Carbon.framework",
-@@ -516,7 +537,7 @@
-     deps = [
-       ":electron_framework+link",
-     ]
--    sources = filenames_gypi.app_sources
-+    sources = filenames.app_sources
-     include_dirs = [ "." ]
-     info_plist = "atom/renderer/resources/mac/Info.plist"
-     extra_substitutions = [ "ATOM_BUNDLE_ID=$electron_mac_bundle_id.helper" ]
-@@ -549,7 +570,7 @@
- 
-   mac_app_bundle("electron_login_helper") {
-     output_name = electron_login_helper_name
--    sources = filenames_gypi.login_helper_sources
-+    sources = filenames.login_helper_sources
-     include_dirs = [ "." ]
-     libs = [ "AppKit.framework" ]
-     info_plist = "atom/app/resources/mac/loginhelper-Info.plist"
-@@ -585,7 +606,7 @@
- 
-   mac_app_bundle("electron_app") {
-     output_name = electron_product_name
--    sources = filenames_gypi.app_sources
-+    sources = filenames.app_sources
-     include_dirs = [ "." ]
-     deps = [
-       ":electron_app_framework_bundle_data",
-@@ -612,7 +633,7 @@
- 
-   executable("electron_app") {
-     output_name = electron_project_name
--    sources = filenames_gypi.app_sources
-+    sources = filenames.app_sources
-     include_dirs = [ "." ]
-     deps = [
-       ":app2asar",
-removed in remote
-  base   100644 67a2b2124619d866f67d849f57f3548ba28be26a appveyor.yml
-  our    100644 67a2b2124619d866f67d849f57f3548ba28be26a appveyor.yml
-@@ -1,73 +0,0 @@
--version: 1.0.{build}
--branches:
--  except:
--  - /^release$|^release-\d-\d-x$/
--build_cloud: electron-16
--image: electron-16-vs2017-15.4.5
--environment:
--  DISABLE_CRASH_REPORTER_TESTS: true
--build_script:
--- ps: >-
--    if(($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME -split "/")[0] -eq ($env:APPVEYOR_REPO_NAME -split "/")[0]) {
--      Write-warning "Skipping PR build for branch"; Exit-AppveyorBuild
--    } else {
--      Add-Path "$env:ProgramFiles (x86)\Windows Kits\10\Debuggers\x64"
--      $env:path = "$env:ProgramFiles (x86)\Windows Kits\10\Debuggers\x64;$env:path"
--      if($env:APPVEYOR_SCHEDULED_BUILD -eq 'True')  {
--        $env:RUN_RELEASE_BUILD = "1"
--      }
--      $Message = (git log --format=%B -n 1 HEAD) | Out-String
--      if ((Test-Path Env:\RUN_RELEASE_BUILD)) {
--        $env:ELECTRON_RELEASE = '1'
--        Write-Output "release build triggered from api"
--      }
--      if ((Test-Path Env:\ELECTRON_RELEASE)) {
--        Write-Output "Running release build"
--        python script\bootstrap.py --target_arch=$env:TARGET_ARCH
--        python script\build.py -c R
--        python script\create-dist.py
--      } else {
--        Write-Output "Running debug build"
--        python script\bootstrap.py --target_arch=$env:TARGET_ARCH --dev
--        python script\build.py -c D
--      }
--      if ($? -ne 'True') {
--        throw "Build failed with exit code $?"
--      } else {
--        "Build succeeded."
--      }
--      Push-AppveyorArtifact out
--    }
--test_script:
--- ps: >-
--    if (Test-Path Env:\ELECTRON_RELEASE) {
--      Write-Output "Skipping tests for release build"
--    } else {
--      Write-Output "Running tests for debug build"
--      python script\test.py --ci --rebuild_native_modules
--      if ($LASTEXITCODE -ne '0') {
--        throw "Tests failed with exit code $LASTEXITCODE"
--      } else {
--        Write-Output "Tests succeeded."
--      }
--      python script\verify-ffmpeg.py
--      if ($LASTEXITCODE -ne '0') {
--        throw "Verify ffmpeg failed with exit code $LASTEXITCODE"
--      } else {
--        "Verify ffmpeg succeeded."
--      }
--    }
--artifacts:
--- path: test-results.xml
--  name: test-results.xml
--deploy_script:
--- ps: >-
--    if (Test-Path Env:\ELECTRON_RELEASE) {
--      if (Test-Path Env:\RUN_RELEASE_BUILD) {
--        Write-Output "Uploading Electron release distribution to s3"
--        & python script\upload.py --upload_to_s3
--      } else {
--        Write-Output "Uploading Electron release distribution to github releases"
--        & python script\upload.py
--      }
--    }
-removed in remote
-  base   100644 f233257e88bad8f0ff703034bea02e4715a5b5b9 brightray/brightray.gyp
-  our    100644 f233257e88bad8f0ff703034bea02e4715a5b5b9 brightray/brightray.gyp
-@@ -1,454 +0,0 @@
--{
--  'variables': {
--    # The libraries brightray will be compiled to.
--    'linux_system_libraries': 'gtk+-3.0 atk-bridge-2.0 dbus-1 x11 x11-xcb xcb xi xcursor xdamage xrandr xcomposite xext xfixes xrender xtst xscrnsaver gconf-2.0 gmodule-2.0 nss',
--    'conditions': [
--      ['target_arch=="mips64el"', {
--        'linux_system_libraries': '<(linux_system_libraries) libpulse',
--      }],
--    ],
--  },
--  'includes': [
--    'filenames.gypi',
--  ],
--  'targets': [
--    {
--      'target_name': 'brightray',
--      'type': 'static_library',
--      'include_dirs': [
--        '..',
--        '<(libchromiumcontent_src_dir)',
--        '<(libchromiumcontent_src_dir)/skia/config',
--        '<(libchromiumcontent_src_dir)/third_party/boringssl/src/include',
--        '<(libchromiumcontent_src_dir)/third_party/skia/include/core',
--        '<(libchromiumcontent_src_dir)/third_party/skia/include/gpu',
--        '<(libchromiumcontent_src_dir)/third_party/mojo/src',
--        '<(libchromiumcontent_src_dir)/third_party/WebKit',
--        '<(libchromiumcontent_src_dir)/third_party/khronos',
--        '<(libchromiumcontent_src_dir)/third_party/protobuf/src',
--        '<(libchromiumcontent_dir)/gen',
--      ],
--      'direct_dependent_settings': {
--        'include_dirs': [
--          '../vendor',
--          '<(libchromiumcontent_src_dir)',
--          '<(libchromiumcontent_src_dir)/gpu',
--          '<(libchromiumcontent_src_dir)/skia/config',
--          '<(libchromiumcontent_src_dir)/third_party/boringssl/src/include',
--          '<(libchromiumcontent_src_dir)/third_party/skia/include/core',
--          '<(libchromiumcontent_src_dir)/third_party/skia/include/gpu',
--          '<(libchromiumcontent_src_dir)/third_party/skia/include/config',
--          '<(libchromiumcontent_src_dir)/third_party/icu/source/common',
--          '<(libchromiumcontent_src_dir)/third_party/mojo/src',
--          '<(libchromiumcontent_src_dir)/third_party/khronos',
--          '<(libchromiumcontent_src_dir)/third_party/WebKit',
--          '<(libchromiumcontent_dir)/gen',
--          '<(libchromiumcontent_dir)/gen/third_party/WebKit',
--        ],
--      },
--      'defines': [
--        # See Chromium's "src/third_party/protobuf/BUILD.gn".
--        'GOOGLE_PROTOBUF_NO_RTTI',
--        'GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER',
--      ],
--      'sources': [ '<@(brightray_sources)' ],
--      'conditions': [
--        # Link with libraries of libchromiumcontent.
--        ['OS=="linux" and libchromiumcontent_component==0', {
--          # On Linux we have to use "--whole-archive" to force executable
--          # to include all symbols, otherwise we will have plenty of
--          # unresolved symbols errors.
--          'direct_dependent_settings': {
--            'ldflags': [
--              '-Wl,--whole-archive',
--              '<@(libchromiumcontent_libraries)',
--              '-Wl,--no-whole-archive',
--            ],
--          }
--        }, {  # (Release build on Linux)
--          'link_settings': {
--            'libraries': [ '<@(libchromiumcontent_libraries)' ]
--          },
--        }],  # (Normal builds)
--        # Linux specific link settings.
--        ['OS=="linux"', {
--          'link_settings': {
--            'ldflags': [
--              '<!@(<(pkg-config) --libs-only-L --libs-only-other <(linux_system_libraries))',
--            ],
--            'libraries': [
--              '-lpthread',
--              '-latomic',
--              '<!@(<(pkg-config) --libs-only-l <(linux_system_libraries))',
--            ],
--          },
--          'cflags': [
--            '<!@(<(pkg-config) --cflags <(linux_system_libraries))',
--          ],
--          'direct_dependent_settings': {
--            'cflags': [
--              '<!@(<(pkg-config) --cflags <(linux_system_libraries))',
--            ],
--          },
--          'conditions': [
--            ['clang==1', {
--              'cflags_cc': [
--                '-Wno-reserved-user-defined-literal',
--              ],
--              'cflags': [
--                # Needed by using libgtkui:
--                '-Wno-deprecated-register',
--                '-Wno-sentinel',
--              ],
--              'direct_dependent_settings': {
--                'cflags': [
--                  '-Wno-deprecated-register',
--                  '-Wno-sentinel',
--                ],
--              },
--            }],
--            ['libchromiumcontent_component', {
--              'link_settings': {
--                'libraries': [
--                  # Following libraries are always linked statically.
--                  '<(libchromiumcontent_dir)/libbase_static.a',
--                  '<(libchromiumcontent_dir)/libgtkui.a',
--                  '<(libchromiumcontent_dir)/libhttp_server.a',
--                  '<(libchromiumcontent_dir)/libdevice_service.a',
--                  '<(libchromiumcontent_dir)/libdom_keycode_converter.a',
--                  '<(libchromiumcontent_dir)/libsystem_wrappers.a',
--                  '<(libchromiumcontent_dir)/librtc_base.a',
--                  '<(libchromiumcontent_dir)/librtc_base_generic.a',
--                  '<(libchromiumcontent_dir)/libwebrtc_common.a',
--                  '<(libchromiumcontent_dir)/libinit_webrtc.a',
--                  '<(libchromiumcontent_dir)/libyuv.a',
--                  '<(libchromiumcontent_dir)/librenderer.a',
--                  '<(libchromiumcontent_dir)/libsecurity_state.a',
--                  '<(libchromiumcontent_dir)/libviz_service.a',
--                  # services/device/wake_lock/power_save_blocker/
--                  '<(libchromiumcontent_dir)/libpower_save_blocker.a',
--                  # Friends of libpdf.a:
--                  # On Linux we have to use "--whole-archive" to include
--                  # all symbols, otherwise there will be plenty of
--                  # unresolved symbols errors.
--                  '-Wl,--whole-archive',
--                  '<(libchromiumcontent_dir)/libpdf.a',
--                  '<(libchromiumcontent_dir)/libppapi_cpp_objects.a',
--                  '<(libchromiumcontent_dir)/libppapi_internal_module.a',
--                  '<(libchromiumcontent_dir)/libpdfium.a',
--                  '<(libchromiumcontent_dir)/libpdfium_skia_shared.a',
--                  '<(libchromiumcontent_dir)/libfdrm.a',
--                  '<(libchromiumcontent_dir)/libformfiller.a',
--                  '<(libchromiumcontent_dir)/libfpdfapi.a',
--                  '<(libchromiumcontent_dir)/libfpdfdoc.a',
--                  '<(libchromiumcontent_dir)/libfpdftext.a',
--                  '<(libchromiumcontent_dir)/libfxcodec.a',
--                  '<(libchromiumcontent_dir)/libfxge.a',
--                  '<(libchromiumcontent_dir)/libfxjs.a',
--                  '<(libchromiumcontent_dir)/libpwl.a',
--                  '<(libchromiumcontent_dir)/libfx_agg.a',
--                  '<(libchromiumcontent_dir)/libfx_lcms2.a',
--                  '<(libchromiumcontent_dir)/libfx_libopenjpeg.a',
--                  '<(libchromiumcontent_dir)/libfx_zlib.a',
--                  '-Wl,--no-whole-archive',
--                ],
--              },
--            }, {
--              'link_settings': {
--                'libraries': [
--                  # Link with ffmpeg.
--                  '<(libchromiumcontent_dir)/libffmpeg.so',
--                  # Following libraries are required by libchromiumcontent:
--                  '-lasound',
--                  '-lcap',
--                  '-lcups',
--                  '-lrt',
--                  '-ldl',
--                  '-lresolv',
--                  '-lfontconfig',
--                  '-lexpat',
--                ],
--              },
--            }],
--            # This lib does not exist on arm.
--            ['target_arch=="arm"', {
--              'link_settings': {
--                'libraries!': [
--                  '<(libchromiumcontent_dir)/libdesktop_capture_differ_sse2.a',
--                ],
--              },
--            }],
--            # Due to strange linker behavior, component build of arm needs to
--            # be linked with libjpeg.a explicitly.
--            ['target_arch=="arm" and libchromiumcontent_component==1', {
--              'link_settings': {
--                'libraries': [
--                  '<(libchromiumcontent_dir)/libjpeg.a',
--                ],
--              },
--            }],
--          ],
--        }],  # OS=="linux"
--        ['OS=="mac"', {
--          'link_settings': {
--            'libraries': [
--              '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
--              # Required by webrtc:
--              '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
--              '$(SDKROOT)/System/Library/Frameworks/IOKit.framework',
--              # Required by media:
--              '$(SDKROOT)/System/Library/Frameworks/VideoToolbox.framework',
--            ],
--          },
--          'conditions':  [
--            ['libchromiumcontent_component', {
--              'link_settings': {
--                'libraries': [
--                  # Following libraries are always linked statically.
--                  '<(libchromiumcontent_dir)/libbase_static.a',
--                  '<(libchromiumcontent_dir)/libhttp_server.a',
--                  '<(libchromiumcontent_dir)/libdevice_service.a',
--                  '<(libchromiumcontent_dir)/libdom_keycode_converter.a',
--                  '<(libchromiumcontent_dir)/librtc_base.a',
--                  '<(libchromiumcontent_dir)/librtc_base_generic.a',
--                  '<(libchromiumcontent_dir)/libsystem_wrappers.a',
--                  '<(libchromiumcontent_dir)/libwebrtc_common.a',
--                  '<(libchromiumcontent_dir)/libinit_webrtc.a',
--                  '<(libchromiumcontent_dir)/libyuv.a',
--                  '<(libchromiumcontent_dir)/libpdfium_skia_shared.a',
--                  '<(libchromiumcontent_dir)/librenderer.a',
--                  '<(libchromiumcontent_dir)/libsecurity_state.a',
--                  '<(libchromiumcontent_dir)/libviz_service.a',
--                  # services/device/wake_lock/power_save_blocker/
--                  '<(libchromiumcontent_dir)/libpower_save_blocker.a',
--                  # Friends of libpdf.a:
--                  '<(libchromiumcontent_dir)/libpdf.a',
--                  '<(libchromiumcontent_dir)/libppapi_cpp_objects.a',
--                  '<(libchromiumcontent_dir)/libppapi_internal_module.a',
--                  '<(libchromiumcontent_dir)/libjpeg.a',
--                  '<(libchromiumcontent_dir)/libpdfium.a',
--                  '<(libchromiumcontent_dir)/libfdrm.a',
--                  '<(libchromiumcontent_dir)/libformfiller.a',
--                  '<(libchromiumcontent_dir)/libfpdfapi.a',
--                  '<(libchromiumcontent_dir)/libfpdfdoc.a',
--                  '<(libchromiumcontent_dir)/libfpdftext.a',
--                  '<(libchromiumcontent_dir)/libfxcodec.a',
--                  '<(libchromiumcontent_dir)/libfxcrt.a',
--                  '<(libchromiumcontent_dir)/libfxge.a',
--                  '<(libchromiumcontent_dir)/libfxjs.a',
--                  '<(libchromiumcontent_dir)/libpwl.a',
--                  '<(libchromiumcontent_dir)/libfx_agg.a',
--                  '<(libchromiumcontent_dir)/libfx_lcms2.a',
--                  '<(libchromiumcontent_dir)/libfx_libopenjpeg.a',
--                  '<(libchromiumcontent_dir)/libfx_zlib.a',
--                ],
--              },
--            }, {
--              'link_settings': {
--                'libraries': [
--                  # Link with ffmpeg.
--                  '<(libchromiumcontent_dir)/libffmpeg.dylib',
--                  # Link with system frameworks.
--                  # ui_base.gypi:
--                  '$(SDKROOT)/System/Library/Frameworks/Accelerate.framework',
--                  # net.gypi:
--                  '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
--                  '$(SDKROOT)/System/Library/Frameworks/Security.framework',
--                  '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framework',
--                  '-lresolv',
--                  # media.gyp:
--                  '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework',
--                  '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework',
--                  '$(SDKROOT)/System/Library/Frameworks/AVFoundation.framework',
--                  '$(SDKROOT)/System/Library/Frameworks/CoreAudio.framework',
--                  '$(SDKROOT)/System/Library/Frameworks/CoreMedia.framework',
--                  '$(SDKROOT)/System/Library/Frameworks/CoreMIDI.framework',
--                  '$(SDKROOT)/System/Library/Frameworks/CoreVideo.framework',
--                  # surface.gyp:
--                  '$(SDKROOT)/System/Library/Frameworks/IOSurface.framework',
--                  # content_common.gypi:
--                  '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
--                  # base.gyp:
--                  '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework',
--                  '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
--                  '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
--                  # device/gamepad/BUILD.gn:
--                  '$(SDKROOT)/System/Library/Frameworks/ForceFeedback.framework',
--                  '$(SDKROOT)/System/Library/Frameworks/GameController.framework',
--                  # content_browser.gypi:
--                  '-lbsm',
--                  # content_common.gypi:
--                  '-lsandbox',
--                  # bluetooth.gyp:
--                  '$(SDKROOT)/System/Library/Frameworks/IOBluetooth.framework',
--                  # components/wifi/BUILD.gn:
--                  '$(SDKROOT)/System/Library/Frameworks/CoreWLAN.framework',
--                  # printing/BUILD.gn:
--                  '-lcups',
--                ],
--              },
--            }],
--          ]
--        }],  # OS=="mac"
--        ['OS=="win"', {
--          'link_settings': {
--            'msvs_settings': {
--              'VCLinkerTool': {
--                'AdditionalOptions': [
--                  # warning /DELAYLOAD:dll ignored; no imports found from dll
--                  '/ignore:4199',
--                ],
--                'AdditionalDependencies': [
--                  'delayimp.lib',
--                ],
--                'DelayLoadDLLs': [
--                  'wtsapi32.dll',
--                  # content_common.gypi:
--                  'd3d9.dll',
--                  'd3d11.dll',
--                  'dxva2.dll',
--                  # media.gyp:
--                  'mf.dll',
--                  'mfplat.dll',
--                  'mfreadwrite.dll',
--                  # bluetooth.gyp:
--                  'BluetoothApis.dll',
--                  'Bthprops.cpl',
--                  'setupapi.dll',
--                  # base.gyp:
--                  'cfgmgr32.dll',
--                  'powrprof.dll',
--                  'setupapi.dll',
--                  # net_common.gypi:
--                  'crypt32.dll',
--                  'dhcpcsvc.dll',
--                  'rpcrt4.dll',
--                  'secur32.dll',
--                  'urlmon.dll',
--                  'winhttp.dll',
--                  # windows runtime
--                  'API-MS-WIN-CORE-WINRT-L1-1-0.DLL',
--                  'API-MS-WIN-CORE-WINRT-STRING-L1-1-0.DLL',
--                ],
--              },
--            },
--          },
--          'conditions': [
--            ['libchromiumcontent_component', {
--              'link_settings': {
--                'libraries': [
--                  # Needed by desktop_capture.lib:
--                  '-ld3d11.lib',
--                  '-ldxgi.lib',
--                  # Following libs are always linked statically.
--                  '<(libchromiumcontent_dir)/base_static.lib',
--                  '<(libchromiumcontent_dir)/sandbox.lib',
--                  '<(libchromiumcontent_dir)/sandbox_helper_win.lib',
--                  '<(libchromiumcontent_dir)/http_server.lib',
--                  '<(libchromiumcontent_dir)/device_service.lib',
--                  '<(libchromiumcontent_dir)/dom_keycode_converter.lib',
--                  '<(libchromiumcontent_dir)/rtc_base.lib',
--                  '<(libchromiumcontent_dir)/rtc_base_generic.lib',
--                  '<(libchromiumcontent_dir)/system_wrappers.lib',
--                  '<(libchromiumcontent_dir)/webrtc_common.lib',
--                  '<(libchromiumcontent_dir)/init_webrtc.lib',
--                  '<(libchromiumcontent_dir)/libyuv.lib',
--                  '<(libchromiumcontent_dir)/pdfium_skia_shared.lib',
--                  '<(libchromiumcontent_dir)/renderer.lib',
--                  '<(libchromiumcontent_dir)/security_state.lib',
--                  '<(libchromiumcontent_dir)/viz_service.lib',
--                  # services/device/wake_lock/power_save_blocker/
--                  '<(libchromiumcontent_dir)/power_save_blocker.lib',
--                  # Friends of pdf.lib:
--                  '<(libchromiumcontent_dir)/pdf.lib',
--                  '<(libchromiumcontent_dir)/ppapi_cpp_objects.lib',
--                  '<(libchromiumcontent_dir)/ppapi_internal_module.lib',
--                  '<(libchromiumcontent_dir)/libjpeg.lib',
--                  '<(libchromiumcontent_dir)/pdfium.lib',
--                  '<(libchromiumcontent_dir)/fdrm.lib',
--                  '<(libchromiumcontent_dir)/formfiller.lib',
--                  '<(libchromiumcontent_dir)/fpdfapi.lib',
--                  '<(libchromiumcontent_dir)/fpdfdoc.lib',
--                  '<(libchromiumcontent_dir)/fpdftext.lib',
--                  '<(libchromiumcontent_dir)/fpdftext.lib',
--                  '<(libchromiumcontent_dir)/fxcodec.lib',
--                  '<(libchromiumcontent_dir)/fxcrt.lib',
--                  '<(libchromiumcontent_dir)/fxge.lib',
--                  '<(libchromiumcontent_dir)/fxjs.lib',
--                  '<(libchromiumcontent_dir)/pwl.lib',
--                  '<(libchromiumcontent_dir)/fx_agg.lib',
--                  '<(libchromiumcontent_dir)/fx_lcms2.lib',
--                  '<(libchromiumcontent_dir)/fx_libopenjpeg.lib',
--                  '<(libchromiumcontent_dir)/fx_zlib.lib',
--                  '<(libchromiumcontent_dir)/desktop_capture_generic.lib',
--                  '<(libchromiumcontent_dir)/desktop_capture.lib',
--                ],
--              },
--            }, {
--              # Link with system libraries.
--              'link_settings': {
--                'libraries': [
--                  # Link with ffmpeg.
--                  '<(libchromiumcontent_dir)/ffmpeg.dll',
--                  # content_browser.gypi:
--                  '-lsensorsapi.lib',
--                  '-lportabledeviceguids.lib',
--                  # content_common.gypi:
--                  '-ld3d9.lib',
--                  '-ld3d11.lib',
--                  '-ldxgi.lib',
--                  '-ldxva2.lib',
--                  '-lstrmiids.lib',
--                  '-lmf.lib',
--                  '-lmfplat.lib',
--                  '-lmfuuid.lib',
--                  # media.gyp:
--                  '-ldxguid.lib',
--                  '-lmfreadwrite.lib',
--                  '-lmfuuid.lib',
--                ],
--                'msvs_settings': {
--                  'VCLinkerTool': {
--                    'AdditionalDependencies': [
--                      'advapi32.lib',
--                      'dbghelp.lib',
--                      'dwmapi.lib',
--                      'gdi32.lib',
--                      'hid.lib',
--                      'netapi32.lib',
--                      'oleacc.lib',
--                      'user32.lib',
--                      'usp10.lib',
--                      'version.lib',
--                      'winspool.lib',
--                      'wtsapi32.lib',
--                      # bluetooth.gyp:
--                      'Bthprops.lib',
--                      'BluetoothApis.lib',
--                      # base.gyp:
--                      'cfgmgr32.lib',
--                      'powrprof.lib',
--                      'setupapi.lib',
--                      # net_common.gypi:
--                      'crypt32.lib',
--                      'dhcpcsvc.lib',
--                      'ncrypt.lib',
--                      'rpcrt4.lib',
--                      'secur32.lib',
--                      'urlmon.lib',
--                      'winhttp.lib',
--                      # ui/gfx/BUILD.gn:
--                      'dwrite.lib',
--                      # skia/BUILD.gn:
--                      'fontsub.lib',
--                    ],
--                  },
--                },
--              },
--            }],  # libchromiumcontent_component
--          ],
--        }],  # OS=="win"
--      ],
--    },
--  ],
--}
-removed in remote
-  base   100644 8a945dc0219293d90e30162e4691a4d871071f4f brightray/brightray.gypi
-  our    100644 8a945dc0219293d90e30162e4691a4d871071f4f brightray/brightray.gypi
-@@ -1,417 +0,0 @@
--{
--  'includes': [
--    '../vendor/download/libchromiumcontent/filenames.gypi',
--  ],
--  'variables': {
--    'libchromiumcontent_component%': 1,
--    'pkg-config%': 'pkg-config',
--    'conditions': [
--      # The "libchromiumcontent_component" is defined when calling "gyp".
--      ['libchromiumcontent_component', {
--        'libchromiumcontent_dir%': '<(libchromiumcontent_shared_libraries_dir)',
--        'libchromiumcontent_libraries%': '<(libchromiumcontent_shared_libraries)',
--        'libchromiumcontent_v8_libraries%': '<(libchromiumcontent_shared_v8_libraries)',
--      }, {
--        'libchromiumcontent_dir%': '<(libchromiumcontent_static_libraries_dir)',
--        'libchromiumcontent_libraries%': '<(libchromiumcontent_static_libraries)',
--        'libchromiumcontent_v8_libraries%': '<(libchromiumcontent_static_v8_libraries)',
--      }],
--    ],
--  },
--  'target_defaults': {
--    'includes': [
--       # Rules for excluding e.g. foo_win.cc from the build on non-Windows.
--      'filename_rules.gypi',
--    ],
--    # Putting this in "configurations" will make overrides not working.
--    'xcode_settings': {
--      'ALWAYS_SEARCH_USER_PATHS': 'NO',
--      'ARCHS': ['x86_64'],
--      'COMBINE_HIDPI_IMAGES': 'YES',
--      'GCC_ENABLE_CPP_EXCEPTIONS': 'NO',
--      'GCC_ENABLE_CPP_RTTI': 'NO',
--      'GCC_TREAT_WARNINGS_AS_ERRORS': 'YES',
--      'CLANG_CXX_LANGUAGE_STANDARD': 'c++14',
--      'MACOSX_DEPLOYMENT_TARGET': '10.9',
--      'RUN_CLANG_STATIC_ANALYZER': 'YES',
--      'USE_HEADER_MAP': 'NO',
--    },
--    'msvs_configuration_attributes': {
--      'OutputDirectory': '<(DEPTH)\\build\\$(ConfigurationName)',
--      'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)',
--      'CharacterSet': '1',
--    },
--    'msvs_system_include_dirs': [
--      '$(VSInstallDir)/VC/atlmfc/include',
--    ],
--    'msvs_settings': {
--      'VCCLCompilerTool': {
--        'AdditionalOptions': ['/MP'],
--        'MinimalRebuild': 'false',
--        'BufferSecurityCheck': 'true',
--        'EnableFunctionLevelLinking': 'true',
--        'RuntimeTypeInfo': 'false',
--        'WarningLevel': '4',
--        'WarnAsError': 'true',
--        'DebugInformationFormat': '3',
--      },
--      'VCLinkerTool': {
--        'GenerateDebugInformation': 'true',
--        'MapFileName': '$(OutDir)\\$(TargetName).map',
--        'ImportLibrary': '$(OutDir)\\lib\\$(TargetName).lib',
--        'LargeAddressAware': '2',
--        'AdditionalOptions': [
--          # ATL 8.0 included in WDK 7.1 makes the linker to generate
--          # following
--          # warnings:
--          #   - warning LNK4254: section 'ATL' (50000040) merged into
--          #     '.rdata' (40000040) with different attributes
--          #   - warning LNK4078: multiple 'ATL' sections found with
--          #     different attributes
--          '/ignore:4254',
--          '/ignore:4078',
--          # views_chromiumcontent.lib generates this warning because it's
--          # symobls are defined as dllexport but used as static library:
--          #   - warning LNK4217: locally defined symbol imported in function
--          #   - warning LNK4049: locally defined symbol imported
--          '/ignore:4217',
--          '/ignore:4049',
--        ],
--      },
--    },
--    'configurations': {
--      # The "Debug" and "Release" configurations are not actually used.
--      'Debug': {},
--      'Release': {},
--
--      'Common_Base': {
--        'abstract': 1,
--        'defines': [
--          # Needed by gin:
--          'V8_USE_EXTERNAL_STARTUP_DATA',
--          # Special configuration for node:
--          'V8_PROMISE_INTERNAL_FIELD_COUNT=1',
--          # From skia_for_chromium_defines.gypi:
--          'SK_SUPPORT_LEGACY_GETTOPDEVICE',
--          'SK_SUPPORT_LEGACY_BITMAP_CONFIG',
--          'SK_SUPPORT_LEGACY_DEVICE_VIRTUAL_ISOPAQUE',
--          'SK_SUPPORT_LEGACY_N32_NAME',
--          'SK_SUPPORT_LEGACY_SETCONFIG',
--          'SK_IGNORE_ETC1_SUPPORT',
--          'SK_IGNORE_GPU_DITHER',
--          # NACL is not enabled:
--          'DISABLE_NACL',
--        ],
--        'conditions': [
--          ['OS!="mac"', {
--            'defines': [
--              'TOOLKIT_VIEWS',
--              'USE_AURA',
--            ],
--          }],
--          ['OS in ["mac", "win"]', {
--            'defines': [
--              'USE_OPENSSL',
--            ],
--          }, {
--            'defines': [
--              'USE_X11',
--              # "use_nss_certs" is set to 1 in libchromiumcontent.
--              'USE_NSS_CERTS',
--              'USE_NSS',  # deprecated after Chrome 45.
--            ],
--          }],
--          ['OS in ["linux", "mac"]', {
--            'defines': [
--              'WEBRTC_POSIX',
--              'UCHAR_TYPE=uint16_t',
--            ],
--          }],
--          ['OS=="linux"', {
--            'defines': [
--              '_LARGEFILE_SOURCE',
--              '_LARGEFILE64_SOURCE',
--              '_FILE_OFFSET_BITS=64',
--              'WEBRTC_LINUX',
--            ],
--            'cflags_cc': [
--              '-D__STRICT_ANSI__',
--              '-fno-exceptions',
--              '-fno-rtti',
--            ],
--            'ldflags': [
--              '-Wl,-z,noexecstack',
--            ],
--          }],  # OS=="linux"
--          ['OS=="linux" and target_arch in ["ia32", "x64", "arm64"]', {
--            'ldflags': [
--              '-fuse-ld=lld',  # Chromium Clang uses lld for linking
--            ],
--          }],  # OS=="linux" and target_arch in ["ia32", "x64", "arm64"]
--          ['OS=="mac"', {
--            'defines': [
--              # The usage of "webrtc/modules/desktop_capture/desktop_capture_options.h"
--              # is required to see this macro.
--              'WEBRTC_MAC',
--             ],
--          }],  # OS=="mac"
--          ['OS=="win"', {            
--            'defines': [
--              '_WIN32_WINNT=0x0602',
--              'WINVER=0x0602',
--              'WIN32',
--              '_WINDOWS',
--              'NOMINMAX',
--              'PSAPI_VERSION=1',
--              '_CRT_RAND_S',
--              'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',
--              'WIN32_LEAN_AND_MEAN',
--              '_ATL_NO_OPENGL',
--              '_SECURE_ATL',
--              # The usage of "webrtc/modules/desktop_capture/desktop_capture_options.h"
--              # is required to see this macro.
--              'WEBRTC_WIN',
--              'UCHAR_TYPE=wchar_t',
--            ],
--            'conditions': [
--              ['target_arch=="x64"', {
--                'msvs_configuration_platform': 'x64',
--                'msvs_settings': {
--                  'VCLinkerTool': {
--                    'MinimumRequiredVersion': '5.02',  # Server 2003.
--                    'TargetMachine': '17', # x86 - 64
--                    # Doesn't exist x64 SDK. Should use oleaut32 in any case.
--                    'IgnoreDefaultLibraryNames': [ 'olepro32.lib' ],
--                  },
--                  'VCLibrarianTool': {
--                    'TargetMachine': '17', # x64
--                  },
--                },
--              }],
--            ],
--          }],  # OS=="win"
--        ],
--      },  # Common_Base
--      'Debug_Base': {
--        'abstract': 1,
--        'defines': [
--          # Use this instead of "NDEBUG" to determine whether we are in
--          # Debug build, because "NDEBUG" is already used by Chromium.
--          'DEBUG',
--          '_DEBUG',
--          # Require when using libchromiumcontent.
--          'COMPONENT_BUILD',
--          'GURL_DLL',
--          'SKIA_DLL',
--          'USING_V8_SHARED',
--          'WEBKIT_DLL',
--          'V8_ENABLE_CHECKS',
--        ],
--        'msvs_settings': {
--          'VCCLCompilerTool': {
--            'RuntimeLibrary': '3',  # /MDd (debug DLL)
--            'Optimization': '0',  # 0 = /Od
--            # See http://msdn.microsoft.com/en-us/library/8wtf2dfz(VS.71).aspx
--            'BasicRuntimeChecks': '3',  # 3 = all checks enabled, 0 = off
--          },
--          'VCLinkerTool': {
--            'OptimizeReferences': 2, # /OPT:REF
--            'EnableCOMDATFolding': 2, # /OPT:ICF
--          },
--        },
--        'conditions': [
--          ['OS=="linux" and target_arch=="x64"', {
--            'defines': [
--              '_GLIBCXX_DEBUG',
--            ],
--            'cflags': [
--              '-g',
--            ],
--          }],  # OS=="linux"
--        ],
--      },  # Debug_Base
--      'Release_Base': {
--        'abstract': 1,
--        'defines': [
--          'NDEBUG',
--        ],
--        'msvs_settings': {
--          'VCCLCompilerTool': {
--            'RuntimeLibrary': '2',  # /MD (nondebug DLL)
--            'Optimization': '2',  # /O2
--            'WholeProgramOptimization': 'true',  # /GL
--            # See http://msdn.microsoft.com/en-us/library/47238hez(VS.71).aspx
--            'InlineFunctionExpansion': '2',  # 2 = max
--            # See http://msdn.microsoft.com/en-us/library/2kxx5t2c(v=vs.80).aspx
--            'OmitFramePointers': 'false',
--            # The above is not sufficient (http://crbug.com/106711): it
--            # simply eliminates an explicit "/Oy", but both /O2 and /Ox
--            # perform FPO regardless, so we must explicitly disable.
--            # We still want the false setting above to avoid having
--            # "/Oy /Oy-" and warnings about overriding.
--            'AdditionalOptions': ['/Oy-', '/guard:cf'],
--          },
--          'VCLibrarianTool': {
--            'LinkTimeCodeGeneration': 'true',  # /LTCG
--          },
--          'VCLinkerTool': {
--            # Control Flow Guard is a security feature in Windows
--            # 8.1 and higher designed to prevent exploitation of
--            # indirect calls in executables.
--            # Control Flow Guard is enabled using the /d2guard4
--            # compiler setting in combination with the /guard:cf
--            # linker setting.
--            'AdditionalOptions': ['/guard:cf'],
--            # Turn off incremental linking to save binary size.
--            'LinkIncremental': '1',  # /INCREMENTAL:NO
--            'LinkTimeCodeGeneration': '1',  # /LTCG
--            'OptimizeReferences': 2,  # /OPT:REF
--            'EnableCOMDATFolding': 2,  # /OPT:ICF
--          },
--        },
--        'conditions': [
--          ['OS=="linux"', {
--            'cflags': [
--              '-O2',
--              # Generate symbols, will be stripped later.
--              '-g',
--              # Don't emit the GCC version ident directives, they just end up
--              # in the .comment section taking up binary size.
--              '-fno-ident',
--              # Put data and code in their own sections, so that unused symbols
--              # can be removed at link time with --gc-sections.
--              '-fdata-sections',
--              '-ffunction-sections',
--            ],
--            'ldflags': [
--              # Specifically tell the linker to perform optimizations.
--              # See http://lwn.net/Articles/192624/ .
--              '-Wl,-O1',
--              '-Wl,--as-needed',
--              '-Wl,--gc-sections',
--            ],
--          }],  # OS=="linux"
--          ['OS=="linux" and target_arch in ["ia32", "x64", "arm64"]', {
--            'cflags': [
--              '-flto=thin',
--            ],
--            'ldflags': [
--              '-flto=thin',
--              '-Wl,--icf=all',
--              '-Wl,--lto-O0',  # this could be removed in future; see https://codereview.chromium.org/2939923004
--              '-Wl,-mllvm,-function-sections',
--              '-Wl,-mllvm,-data-sections',
--            ],
--          }],
--        ],
--      },  # Release_Base
--      'conditions': [
--        ['libchromiumcontent_component', {
--          'D': {
--            'inherit_from': ['Common_Base', 'Debug_Base'],
--          },  # D (Debug)
--        }, {
--          'R': {
--            'inherit_from': ['Common_Base', 'Release_Base'],
--          },  # R (Release)
--        }],  # libchromiumcontent_component
--        ['OS=="win"', {
--          'conditions': [
--            # gyp always assumes "_x64" targets on Windows.
--            ['libchromiumcontent_component', {
--              'D_x64': {
--                'inherit_from': ['Common_Base', 'Debug_Base'],
--              },  # D_x64
--            }, {
--              'R_x64': {
--                'inherit_from': ['Common_Base', 'Release_Base'],
--              },  # R_x64
--            }],  # libchromiumcontent_component
--          ],
--        }],  # OS=="win"
--      ],
--    },  # configurations
--    'target_conditions': [
--      # Putting this under "configurations" doesn't work.
--      ['libchromiumcontent_component', {
--        'xcode_settings': {
--          'GCC_OPTIMIZATION_LEVEL': '0',
--        },
--      }, {  # "Debug_Base"
--        'xcode_settings': {
--          'DEAD_CODE_STRIPPING': 'YES',  # -Wl,-dead_strip
--          'GCC_OPTIMIZATION_LEVEL': '2',
--          'OTHER_CFLAGS': [
--            '-fno-inline',
--            '-fno-omit-frame-pointer',
--            '-fno-builtin',
--            '-fno-optimize-sibling-calls',
--          ],
--        },
--      }],  # "Release_Base"
--      ['OS=="mac" and libchromiumcontent_component==0 and _type in ["executable", "shared_library"]', {
--        'xcode_settings': {
--          # Generates symbols and strip the binary.
--          'DEBUG_INFORMATION_FORMAT': 'dwarf-with-dsym',
--          'DEPLOYMENT_POSTPROCESSING': 'YES',
--          'STRIP_INSTALLED_PRODUCT': 'YES',
--          'STRIPFLAGS': '-x',
--        },
--      }],  # OS=="mac" and libchromiumcontent_component==0 and _type in ["executable", "shared_library"]
--      ['OS=="linux" and target_arch=="ia32" and _toolset=="target"', {
--        'ldflags': [
--          # Workaround for linker OOM.
--          '-Wl,--no-keep-memory',
--        ],
--      }],
--    ],  # target_conditions
--    # Ignored compiler warnings of Chromium/Node.js
--    'conditions': [
--      ['OS=="mac"', {
--        'xcode_settings': {
--          'WARNING_CFLAGS': [
--            '-Wall',
--            '-Wextra',
--            '-Wno-unused-parameter',
--            '-Wno-missing-field-initializers',
--            '-Wno-deprecated-declarations',
--            '-Wno-undefined-var-template', # https://crbug.com/604888
--            '-Wno-unneeded-internal-declaration',
--            '-Wno-inconsistent-missing-override',
--            '-Wno-tautological-unsigned-enum-zero-compare',
--          ],
--        },
--      }],
--      ['OS=="linux" and clang==1', {
--        'cflags': [
--          '-Wno-inconsistent-missing-override',
--          '-Wno-undefined-var-template', # https://crbug.com/604888
--          '-Wno-tautological-unsigned-enum-zero-compare',
--        ],
--      }],
--      ['OS=="win"', {
--        'msvs_disabled_warnings': [
--          4100, # unreferenced formal parameter
--          4102, # unreferencd label
--          4121, # alignment of a member was sensitive to packing
--          4127, # conditional expression is constant
--          4189, # local variable is initialized but not referenced
--          4244, # 'initializing' : conversion from 'double' to 'size_t', possible loss of data
--          4245, # 'initializing' : conversion from 'int' to 'const net::QuicVersionTag', signed/unsigned mismatch
--          4251, # class 'std::xx' needs to have dll-interface.
--          4310, # cast truncates constant value
--          4355, # 'this' : used in base member initializer list
--          4480, # nonstandard extension used: specifying underlying type for enum
--          4481, # nonstandard extension used: override specifier 'override'
--          4510, # default constructor could not be generated
--          4512, # assignment operator could not be generated
--          4610, # user defined constructor required
--          4702, # unreachable code
--          4715, # not all control paths return a value
--          4819, # The file contains a character that cannot be represented in the current code page
--          4275, # non dll-interface class used as base for dll-interface class
--        ],
--      }],
--    ],  # conditions
--  },  # target_defaults
--}
-removed in remote
-  base   100644 ffdd120b8b22cd84d88c29a7c29d415ff0b6d57c brightray/filename_rules.gypi
-  our    100644 ffdd120b8b22cd84d88c29a7c29d415ff0b6d57c brightray/filename_rules.gypi
-@@ -1,77 +0,0 @@
--# Copyright (c) 2012 The Chromium Authors. All rights reserved.
--# Use of this source code is governed by a BSD-style license that can be
--# found in the LICENSE file.
--
--# This gypi file defines the patterns used for determining whether a
--# file is excluded from the build on a given platform.  It is
--# included by common.gypi for chromium_code.
--
--{
--  'target_conditions': [
--    ['OS!="win"', {
--      'sources/': [ ['exclude', '_win(_unittest)?\\.(h|cc)$'],
--                    ['exclude', '(^|/)win/'],
--                    ['exclude', '(^|/)win_[^/]*\\.(h|cc)$'] ],
--    }],
--    ['OS!="mac"', {
--      'sources/': [ ['exclude', '_(cocoa|mac)(_unittest)?\\.(h|cc|mm?)$'],
--                    ['exclude', '(^|/)(cocoa|mac)/'] ],
--    }],
--    ['OS!="ios"', {
--      'sources/': [ ['exclude', '_ios(_unittest)?\\.(h|cc|mm?)$'],
--                    ['exclude', '(^|/)ios/'] ],
--    }],
--    ['OS!="mac" and OS!="ios"', {
--      'sources/': [ ['exclude', '\\.mm?$' ] ],
--    }],
--    # Do not exclude the linux files on *BSD since most of them can be
--    # shared at this point.
--    # In case a file is not needed, it is going to be excluded later on.
--    # TODO(evan): the above is not correct; we shouldn't build _linux
--    # files on non-linux.
--    ['OS!="linux" and OS!="openbsd" and OS!="freebsd"', {
--      'sources/': [
--        ['exclude', '(^|/)library_loaders/'],
--        ['exclude', '_linux(_unittest)?\\.(h|cc)$'],
--        ['exclude', '(^|/)linux_[^/]*\\.(h|cc)$'],
--        ['exclude', '(^|/)linux/'],
--        ['exclude', '_x11(_unittest)?\\.(h|cc)$'],
--        ['exclude', '(^|/)x11_[^/]*\\.(h|cc)$'],
--        ['exclude', '(^|/)x11/'],
--      ],
--    }],
--    ['OS!="android"', {
--      'sources/': [
--        ['exclude', '_android(_unittest)?\\.cc$'],
--        ['exclude', '(^|/)android/'],
--      ],
--    }],
--    ['OS=="win"', {
--      'sources/': [
--        ['exclude', '_posix(_unittest)?\\.(h|cc)$'],
--        ['exclude', '(^|/)posix/'],
--      ],
--    }],
--    ['OS!="linux" and OS!="openbsd" and OS!="freebsd"', {
--      'sources/': [
--        ['exclude', '_xdg(_unittest)?\\.(h|cc)$'],
--      ],
--    }],
--    ['OS!="linux" and OS!="openbsd" and OS!="freebsd"', {
--      'sources/': [
--        ['exclude', '_gtk(_browsertest|_unittest)?\\.(h|cc)$'],
--        ['exclude', '(^|/)gtk/'],
--        ['exclude', '(^|/)gtk_[^/]*\\.(h|cc)$'],
--        ['exclude', '(^|/)libgtkui/'],
--        ['exclude', '(^|/)x/'],
--      ],
--    }],
--    ['OS=="mac"', {
--      'sources/': [ ['exclude', '_aura(_browsertest|_unittest)?\\.(h|cc)$'],
--                    ['exclude', '(^|/)aura/'],
--                    ['exclude', '_views\\.(h|cc)$'],
--                    ['exclude', '(^|/)views/'],
--      ],
--    }],
--  ]
--}
-removed in remote
-  base   100644 49bc528437a0fa95c7b4dba87e666359f7c20236 build/run-ninja.py
-  our    100644 49bc528437a0fa95c7b4dba87e666359f7c20236 build/run-ninja.py
-@@ -1,11 +0,0 @@
--import sys
--import os
--import subprocess
--
--def main(argv):
--  src = os.path.abspath(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))
--  ninja_path = os.path.join(src, 'third_party', 'depot_tools', 'ninja')
--  os.execv(ninja_path, argv)
--
--if __name__ == '__main__':
--  main(sys.argv)
-removed in remote
-  base   100644 676d1e904127066e4a3d313106f15406fcbed8b6 common.gypi
-  our    100644 676d1e904127066e4a3d313106f15406fcbed8b6 common.gypi
-@@ -1,338 +0,0 @@
--{
--  'includes': [
--    'toolchain.gypi',
--    'brightray/brightray.gypi',
--  ],
--  'variables': {
--    # Tell crashpad to build as external project.
--    'crashpad_dependencies': 'external',
--    # Required by breakpad.
--    'os_bsd': 0,
--    'chromeos': 0,
--    # Reflects node's config.gypi.
--    'component%': 'static_library',
--    'debug_http2': 'false',
--    'debug_nghttp2': 'false',
--    # XXX(alexeykuzmin): Must match the clang version we use. See `clang -v`.
--    'llvm_version': '7.0',
--    'python': 'python',
--    'openssl_fips': '',
--    'openssl_no_asm': 1,
--    'use_openssl_def': 0,
--    'openssl_product': 'libopenssl.a',
--    'node_debug_lib': 'false',
--    'node_release_urlbase': 'https://atom.io/download/electron',
--    'node_byteorder': '<!(node <(DEPTH)/tools/get-endianness.js)',
--    'node_target_type': 'shared_library',
--    'node_install_npm': 'false',
--    'node_prefix': '',
--    'node_shared': 'true',
--    'node_shared_cares': 'false',
--    'node_shared_http_parser': 'false',
--    'node_shared_libuv': 'false',
--    'node_shared_openssl': 'false',
--    'node_shared_v8': 'true',
--    'node_shared_zlib': 'false',
--    'node_tag': '',
--    'node_use_dtrace': 'false',
--    'node_use_etw': 'false',
--    'node_use_mdb': 'false',
--    'node_use_openssl': 'true',
--    'node_use_perfctr': 'false',
--    'node_use_v8_platform': 'false',
--    'node_use_bundled_v8': 'false',
--    'node_enable_d8': 'false',
--    'uv_library': 'static_library',
--    'uv_parent_path': 'vendor/node/deps/uv',
--    'uv_use_dtrace': 'false',
--    'v8_base': '',
--    'v8_postmortem_support': 'false',
--    'v8_enable_i18n_support': 'false',
--    'v8_enable_inspector': '1',
--  },
--  # Settings to compile node under Windows.
--  'target_defaults': {
--    'target_conditions': [
--      ['_target_name in ["libuv", "http_parser", "openssl", "openssl-cli", "cares", "node_lib", "zlib", "nghttp2"]', {
--        'msvs_disabled_warnings': [
--          4003,  # not enough actual parameters for macro 'V'
--          4013,  # 'free' undefined; assuming extern returning int
--          4018,  # signed/unsigned mismatch
--          4054,  #
--          4055,  # 'type cast' : from data pointer 'void *' to function pointer
--          4057,  # 'function' : 'volatile LONG *' differs in indirection to slightly different base types from 'unsigned long *'
--          4065,  # switch statement contains 'default' but no 'case' labels
--          4129,  # unrecognized character escape sequence
--          4189,  #
--          4131,  # uses old-style declarator
--          4133,  # incompatible types
--          4146,  # unary minus operator applied to unsigned type, result still unsigned
--          4164,  # intrinsic function not declared
--          4152,  # function/data pointer conversion in expression
--          4206,  # translation unit is empty
--          4204,  # non-constant aggregate initializer
--          4210,  # nonstandard extension used : function given file scope
--          4214,  # bit field types other than int
--          4232,  # address of dllimport 'free' is not static, identity not guaranteed
--          4291,  # no matching operator delete found
--          4295,  # array is too small to include a terminating null character
--          4309,  # 'static_cast': truncation of constant value
--          4311,  # 'type cast': pointer truncation from 'void *const ' to 'unsigned long'
--          4389,  # '==' : signed/unsigned mismatch
--          4456,  # declaration of 'm' hides previous local declaration
--          4457,  # declaration of 'message' hides function parameter
--          4459,  # declaration of 'wq' hides global declaration
--          4477,  # format string '%.*s' requires an argument of type 'int'
--          4505,  # unreferenced local function has been removed
--          4701,  # potentially uninitialized local variable 'sizew' used
--          4703,  # potentially uninitialized local pointer variable 'req' used
--          4706,  # assignment within conditional expression
--          4804,  # unsafe use of type 'bool' in operation
--          4996,  # this function or variable may be unsafe.
--        ],
--        'msvs_settings': {
--          'VCCLCompilerTool': {
--            'WarnAsError': 'false',
--          },
--        },
--        'xcode_settings': {
--          'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO',
--          'WARNING_CFLAGS': [
--            '-Wno-unknown-warning-option',
--            '-Wno-parentheses-equality',
--            '-Wno-unused-function',
--            '-Wno-sometimes-uninitialized',
--            '-Wno-pointer-sign',
--            '-Wno-sign-compare',
--            '-Wno-string-plus-int',
--            '-Wno-unused-variable',
--            '-Wno-deprecated-declarations',
--            '-Wno-return-type',
--            '-Wno-gnu-folding-constant',
--            '-Wno-shift-negative-value',
--            '-Wno-varargs', # https://git.io/v6Olj
--            '-Wno-unused-private-field',
--          ],
--        },
--        'conditions': [
--          ['OS=="linux"', {
--            'cflags': [
--              '-Wno-unused-function',
--              '-Wno-unused-variable',
--              '-Wno-unused-value',
--              '-Wno-deprecated-declarations',
--              '-Wno-return-type',
--              '-Wno-format',
--              '-Wno-varargs', # https://git.io/v6Olj
--              # Required when building as shared library.
--              '-fPIC',
--            ],
--          }],
--          ['OS=="linux" and clang==1', {
--            'cflags': [
--              '-Wno-pointer-sign',
--              '-Wno-parentheses-equality',
--              '-Wno-sometimes-uninitialized',
--              '-Wno-string-plus-int',
--              '-Wno-shift-negative-value',
--              '-Wno-reserved-user-defined-literal',
--              '-Wno-implicit-function-declaration',
--              '-Wno-long-long',
--            ],
--          }],
--        ],
--      }],
--      ['_target_name=="node_lib"', {
--        'include_dirs': [
--          '<(libchromiumcontent_src_dir)',
--          '<(libchromiumcontent_src_dir)/third_party/icu/source/common',
--          '<(libchromiumcontent_src_dir)/third_party/icu/source/i18n',
--          '<(libchromiumcontent_src_dir)/v8',
--          '<(libchromiumcontent_src_dir)/v8/include',
--        ],
--        'defines': [
--          # Export V8 symbols from node.dll / libnode.so
--          'BUILDING_V8_SHARED',
--          'BUILDING_V8_PLATFORM_SHARED',
--          'BUILDING_V8_BASE_SHARED',
--          'NODE_WITHOUT_NODE_OPTIONS',
--        ],
--        'conditions': [
--          ['OS=="mac" and libchromiumcontent_component==0', {
--            # -all_load is the "whole-archive" on macOS.
--            'xcode_settings': {
--              'OTHER_LDFLAGS': [ '-Wl,-all_load' ],
--            },
--          }],
--          ['OS=="win"', {
--            # Fix passing fd across modules, see |osfhandle.h| for more.
--            'sources': [
--              '<(DEPTH)/atom/node/osfhandle.cc',
--              '<(DEPTH)/atom/node/osfhandle.h',
--            ],
--            'include_dirs': [
--              '<(DEPTH)/atom/node',
--            ],
--            'libraries': [
--              # Node is using networking API but linking with this itself.
--              '-lwinmm.lib',
--              # Needed by V8.
--              '-ldbghelp.lib',
--              '-lshlwapi.lib',
--            ],
--            'msvs_settings': {
--              # Change location of some hard-coded paths.
--              'VCLinkerTool': {
--                'AdditionalOptions!': [
--                  '/WHOLEARCHIVE:<(PRODUCT_DIR)\\lib\\zlib<(STATIC_LIB_SUFFIX)',
--                  '/WHOLEARCHIVE:<(PRODUCT_DIR)\\lib\\libuv<(STATIC_LIB_SUFFIX)',
--                  '/WHOLEARCHIVE:<(PRODUCT_DIR)\\lib\\libopenssl<(openssl_product)',
--                  '/WHOLEARCHIVE:<(PRODUCT_DIR)\\lib\\<(openssl_product)',
--                ],
--                'AdditionalOptions': [
--                  '/WHOLEARCHIVE:<(PRODUCT_DIR)\\obj\\vendor\\node\\deps\\zlib\\zlib<(STATIC_LIB_SUFFIX)',
--                  '/WHOLEARCHIVE:<(PRODUCT_DIR)\\obj\\vendor\\node\\deps\\uv\\libuv<(STATIC_LIB_SUFFIX)',
--                  '/WHOLEARCHIVE:<(PRODUCT_DIR)\\obj\\vendor\\node\\deps\\openssl\\openssl<(STATIC_LIB_SUFFIX)',
--                ],
--              },
--            },
--          }],
--          ['OS=="linux" and libchromiumcontent_component==0', {
--            # Prevent the linker from stripping symbols.
--            'ldflags': [
--              '-Wl,--whole-archive',
--              '<@(libchromiumcontent_v8_libraries)',
--              '-Wl,--no-whole-archive',
--            ],
--          }, {
--            'libraries': [
--              '<@(libchromiumcontent_v8_libraries)',
--            ],
--          }],
--        ],
--      }],
--      ['_target_name=="openssl"', {
--        'xcode_settings': {
--          'DEAD_CODE_STRIPPING': 'YES',  # -Wl,-dead_strip
--          'GCC_INLINES_ARE_PRIVATE_EXTERN': 'YES',
--          'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES',
--        },
--        'cflags': [
--          '-fvisibility=hidden',
--        ],
--      }],
--      ['_target_name=="openssl-cli"', {
--        'ldflags!': [
--          '-nostdlib++',
--        ]
--      }],
--      ['_target_name=="libuv"', {
--        'conditions': [
--          ['OS=="win"', {
--            # Expose libuv's symbols.
--            'defines': [
--              'BUILDING_UV_SHARED=1',
--            ],
--          }],  # OS=="win"
--        ],
--      }],
--      ['_target_name.startswith("crashpad")', {
--        'conditions': [
--          ['OS=="mac"', {
--            'xcode_settings': {
--              'WARNING_CFLAGS': [
--                '-Wno-unused-private-field',
--                '-Wno-address-of-packed-member',
--              ],
--            },
--          }],  # OS=="mac"
--        ],
--      }],
--      ['_target_name.startswith("breakpad") or _target_name in ["crash_report_sender", "dump_syms"]', {
--        'conditions': [
--          ['OS=="mac"', {
--            'xcode_settings': {
--              'WARNING_CFLAGS': [
--                '-Wno-deprecated-declarations',
--                '-Wno-deprecated-register',
--                '-Wno-unused-private-field',
--                '-Wno-unused-function',
--              ],
--            },
--          }],  # OS=="mac"
--          ['OS=="linux"', {
--            'cflags': [
--              '-Wno-empty-body',
--            ],
--          }],  # OS=="linux"
--          ['OS=="win"', {
--            'msvs_disabled_warnings': [
--              # unreferenced local function has been removed.
--              4505,
--            ],
--          }],  # OS=="win"
--        ],
--      }],
--      ['OS=="linux" and _toolset=="target" and _target_name in ["dump_syms", "node_lib"]', {
--        'conditions': [
--          ['libchromiumcontent_component==0', {
--            'libraries': [
--              '<(libchromiumcontent_dir)/libc++.a',
--            ],
--            'ldflags': [
--              '-lpthread',
--            ],
--          }, {
--            'libraries': [
--              '<(libchromiumcontent_dir)/libc++.so',
--            ],
--            'ldflags': [
--              '-Wl,-rpath=\$$ORIGIN',
--            ],
--          }],
--        ],
--      }]
--    ],
--    'msvs_cygwin_shell': 0, # Strangely setting it to 1 would make building under cygwin fail.
--    'msvs_disabled_warnings': [
--      4005,  # (node.h) macro redefinition
--      4091,  # (node_extern.h) '__declspec(dllimport)' : ignored on left of 'node::Environment' when no variable is declared
--      4099,  # (pdf_render_settings.h) type name first seen using 'class' now seen using 'struct'
--      4189,  # local variable is initialized but not referenced
--      4201,  # (uv.h) nameless struct/union
--      4267,  # conversion from 'size_t' to 'int', possible loss of data
--      4302,  # (atldlgs.h) 'type cast': truncation from 'LPCTSTR' to 'WORD'
--      4458,  # (atldlgs.h) declaration of 'dwCommonButtons' hides class member
--      4503,  # decorated name length exceeded, name was truncated
--      4530,  # C++ exception handler used, but unwind semantics are not enabled. Specify /EHsc
--      4577,  # 'noexcept' used with no exception handling mode specified
--      4714,  # (atomicstring.h) function marked as __forceinline not inlined
--      4800,  # (v8.h) forcing value to bool 'true' or 'false'
--      4819,  # The file contains a character that cannot be represented in the current code page
--      4838,  # (atlgdi.h) conversion from 'int' to 'UINT' requires a narrowing conversion
--      4996,  # (atlapp.h) 'GetVersionExW': was declared deprecated
--    ],
--  },
--  'conditions': [
--    # The breakdpad on Windows assumes Debug_x64 and Release_x64 configurations.
--    ['OS=="win"', {
--      'target_defaults': {
--        'configurations': {
--          'Debug_x64': {
--          },
--          'Release_x64': {
--          },
--        },
--      },
--    }],  # OS=="win"
--    # The breakdpad on Mac assumes Release_Base configuration.
--    ['OS=="mac"', {
--      'target_defaults': {
--        'configurations': {
--          'Release_Base': {
--          },
--        },
--      },
--    }],  # OS=="mac"
--  ],
--}
-merged
-  result 100644 a110508e4538eb0822d6dd149e1b9f192d99b35a docs/api/environment-variables.md
-  our    100644 72f75e6b816577a9d2ac2b2715437d45d29b7896 docs/api/environment-variables.md
-@@ -93,5 +93,5 @@
- the one downloaded by `npm install`. Usage:
- 
- ```sh
--export ELECTRON_OVERRIDE_DIST_PATH=/Users/username/projects/electron/out/D
-+export ELECTRON_OVERRIDE_DIST_PATH=/Users/username/projects/electron/out/Debug
- ```
-changed in both
-  base   100644 33b56b2505779ae5f02f63e237745d9c2aa465de docs/development/build-instructions-gn.md
-  our    100644 cbbdaf4c3d1998ccce8e5438eea1a7c9b00f2e37 docs/development/build-instructions-gn.md
-  their  100644 55bda67788b0e3824af3a7c263f9e95f09b6d33e docs/development/build-instructions-gn.md
-@@ -1,9 +1,6 @@
--# Build Instructions (experimental GN build)
-+# Build Instructions
- 
--Follow the guidelines below for building Electron with the experimental GN
--build.
--
--> **NOTE**: The GN build system is in _experimental_ status.
-+Follow the guidelines below for building Electron.
- 
- ## Platform prerequisites
- 
-@@ -65,6 +62,46 @@
- # This will take a while, go get a coffee.
- ```
- 
-+### Chromium git cache
-+
-+`depot_tools` has an option that allows the developer to set a global cache for
-+all git objects of Chromium + dependencies. This option uses `git clone
-+--shared` to save bandwidth/space on multiple clones of the same repositories.
-+
-+If you intend to have several Electron build trees on the same machine (to work
-+on different versions of Electron for example), it is recommended to set use
-+the git cache to speed up the download of Chromium source. For example:
-+
-+```sh
-+$ mkdir ~/.chromium-git-cache
-+$ gclient config \
-+    --name "src/electron" \
-+    --unmanaged \
-+    --cache_dir="$HOME/.chromium-git-cache" \
-+    https://github.com/electron/electron
-+$ gclient sync --with_branch_heads --with_tags
-+```
-+
-+If the bootstrap script is interrupted while using the git cache, it will leave
-+the cache locked. To remove the lock, pass the `--break_repo_locks` argument to
-+`gclient sync`.
-+
-+#### Sharing the cache between multiple machines
-+
-+It is possible to share this directory with other machines by exporting it as
-+SMB share on linux, but only one process/machine can be using the cache at a
-+time. The locks created by git-cache script will try to prevent this, but it may
-+not work perfectly in a network.
-+
-+On Windows, SMBv2 has a directory cache that will cause problems with the git
-+cache script, so it is necessary to disable it by setting the registry key
-+
-+```sh
-+HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\Lanmanworkstation\Parameters\DirectoryCacheLifetime
-+```
-+
-+to 0. More information: https://stackoverflow.com/a/9935126
-+
- ## Building
- 
- ```sh
-merged
-  result 100644 5d5dc5515f2a4014f553ec2bf66d21f6be482669 docs/development/build-instructions-linux.md
-  our    100644 3276b494aec5d1a49626b8c24d725ec665cf2c62 docs/development/build-instructions-linux.md
-@@ -58,40 +58,6 @@
- Other distributions may offer similar packages for installation via package
- managers such as pacman. Or one can compile from source code.
- 
--## Getting the Code
--
--```sh
--$ git clone https://github.com/electron/electron
--```
--
--## Bootstrapping
--
--The bootstrap script will download all necessary build dependencies and create
--the build project files. You must have Python 2.7.x for the script to succeed.
--Downloading certain files can take a long time. Notice that we are using
--`ninja` to build Electron so there is no `Makefile` generated.
--
--To bootstrap for a static, non-developer build, run:
--
--```sh
--$ cd electron
--$ npm run bootstrap
--```
--
--Or to bootstrap for a development session that builds faster by not statically linking:
--
--```sh
--$ cd electron
--$ npm run bootstrap:dev
--```
--
--If you are using editor supports [JSON compilation database](http://clang.llvm.org/docs/JSONCompilationDatabase.html) based
--language server, you can generate it:
--
--```sh
--$ ./script/build.py --compdb
--```
--
- ### Cross compilation
- 
- If you want to build for an `arm` target you should also install the following
-@@ -110,60 +76,15 @@
- ```
- 
- And to cross-compile for `arm` or `ia32` targets, you should pass the
--`--target_arch` parameter to the `bootstrap.py` script:
-+`target_cpu` parameter to `gn gen`:
- 
- ```sh
--$ ./script/bootstrap.py -v --target_arch=arm
-+$ gn gen out/Debug --args='import(...) target_cpu="arm"'
- ```
- 
- ## Building
- 
--If you would like to build both `Release` and `Debug` targets:
--
--```sh
--$ npm run build
--```
--
--This script will cause a very large Electron executable to be placed in
--the directory `out/R`. The file size is in excess of 1.3 gigabytes. This
--happens because the Release target binary contains debugging symbols.
--To reduce the file size, run the `create-dist.py` script:
--
--```sh
--$ ./script/create-dist.py
--```
--
--This will put a working distribution with much smaller file sizes in
--the `dist` directory. After running the `create-dist.py` script, you
--may want to remove the 1.3+ gigabyte binary which is still in `out/R`.
--
--You can also build either the `Debug` or `Release` target on its own:
--
--```sh
--$ npm run build:dev
--```
--
--```sh
--$ npm run build:release
--```
--
--After building is done, you can find the `electron` debug binary under `out/D`.
--
--## Cleaning
--
--To clean the build files:
--
--```sh
--$ npm run clean
--```
--
--To clean only `out` and `dist` directories:
--
--```sh
--$ npm run clean-build
--```
--
--**Note:** Both clean commands require running `bootstrap` again before building.
-+See [Build Instructions: GN](build-instructions-gn.md)
- 
- ## Troubleshooting
- 
-@@ -176,87 +97,26 @@
- $ sudo ln -s /usr/lib/libncurses.so.5 /usr/lib/libtinfo.so.5
- ```
- 
--## Tests
--
--See [Build System Overview: Tests](build-system-overview.md#tests)
--
- ## Advanced topics
- 
- The default building configuration is targeted for major desktop Linux
- distributions. To build for a specific distribution or device, the following
- information may help you.
- 
--### Building `libchromiumcontent` locally
--
--To avoid using the prebuilt binaries of `libchromiumcontent`, you can build `libchromiumcontent` locally. To do so, follow these steps:
--
--1. Install [depot_tools](https://chromium.googlesource.com/chromium/src/+/master/docs/linux_build_instructions.md#Install)
--2. Install [additional build dependencies](https://chromium.googlesource.com/chromium/src/+/master/docs/linux_build_instructions.md#Install-additional-build-dependencies)
--3. Fetch the git submodules:
--
--```sh
--$ git submodule update --init --recursive
--```
--4. Pass the `--build_release_libcc` switch to `bootstrap.py` script:
--
--```sh
--$ ./script/bootstrap.py -v --build_release_libcc
--```
--
--Note that by default the `shared_library` configuration is not built, so you can
--only build `Release` version of Electron if you use this mode:
--
--```sh
--$ ./script/build.py -c R
--```
--
- ### Using system `clang` instead of downloaded `clang` binaries
- 
- By default Electron is built with prebuilt
- [`clang`](https://clang.llvm.org/get_started.html) binaries provided by the
- Chromium project. If for some reason you want to build with the `clang`
--installed in your system, you can call `bootstrap.py` with `--clang_dir=<path>`
--switch. By passing it the build script will assume the `clang` binaries reside
--in `<path>/bin/`.
-+installed in your system, you can specify the `clang_base_path` argument in the
-+GN args.
- 
--For example if you installed `clang` under `/user/local/bin/clang`:
-+For example if you installed `clang` under `/usr/local/bin/clang`:
- 
- ```sh
--$ ./script/bootstrap.py -v --build_release_libcc --clang_dir /usr/local
--$ ./script/build.py -c R
-+$ gn gen out/Debug --args='import("//electron/build/args/debug.gn") clang_base_path = "/usr/local/bin"'
- ```
- 
- ### Using compilers other than `clang`
- 
--To build Electron with compilers like `g++`, you first need to disable `clang`
--with `--disable_clang` switch first, and then set `CC` and `CXX` environment
--variables to the ones you want.
--
--For example building with GCC toolchain:
--
--```sh
--$ env CC=gcc CXX=g++ ./script/bootstrap.py -v --build_release_libcc --disable_clang
--$ ./script/build.py -c R
--```
--
--### Environment variables
--
--Apart from `CC` and `CXX`, you can also set the following environment variables to
--customise the build configuration:
--
--* `CPPFLAGS`
--* `CPPFLAGS_host`
--* `CFLAGS`
--* `CFLAGS_host`
--* `CXXFLAGS`
--* `CXXFLAGS_host`
--* `AR`
--* `AR_host`
--* `CC`
--* `CC_host`
--* `CXX`
--* `CXX_host`
--* `LDFLAGS`
--
--The environment variables have to be set when executing the `bootstrap.py`
--script, it won't work in the `build.py` script.
-+Building Electron with compilers other than `clang` is not supported.
-added in remote
-  their  100644 ca086cc223454bd18b9c4c6724f7cedc3a273a4a docs/development/build-instructions-macos.md
-@@ -0,0 +1,62 @@
-+# Build Instructions (macOS)
-+
-+Follow the guidelines below for building Electron on macOS.
-+
-+## Prerequisites
-+
-+* macOS >= 10.11.6
-+* [Xcode](https://developer.apple.com/technologies/tools/) >= 8.2.1
-+* [node.js](https://nodejs.org) (external)
-+* Python 2.7 with support for TLS 1.2
-+
-+## Python
-+
-+Please also ensure that your system and Python version support at least TLS 1.2.
-+This depends on both your version of macOS and Python. For a quick test, run:
-+
-+```sh
-+$ npm run check-tls
-+```
-+
-+If the script returns that your configuration is using an outdated security
-+protocol, you can either update macOS to High Sierra or install a new version
-+of Python 2.7.x. To upgrade Python, use [Homebrew](https://brew.sh/):
-+
-+```sh
-+$ brew install python@2 && brew link python@2 --force
-+```
-+
-+If you are using Python as provided by Homebrew, you also need to install
-+the following Python modules:
-+
-+* [pyobjc](https://pythonhosted.org/pyobjc/install.html)
-+
-+## macOS SDK
-+
-+If you're developing Electron and don't plan to redistribute your
-+custom Electron build, you may skip this section.
-+
-+For certain features (e.g. pinch-zoom) to work properly, you must target the
-+macOS 10.10 SDK.
-+
-+Official Electron builds are built with [Xcode 8.2.1](http://adcdownload.apple.com/Developer_Tools/Xcode_8.2.1/Xcode_8.2.1.xip), which does not contain
-+the 10.10 SDK by default. To obtain it, first download and mount the
-+[Xcode 6.4](http://developer.apple.com/devcenter/download.action?path=/Developer_Tools/Xcode_6.4/Xcode_6.4.dmg)
-+DMG.
-+
-+Then, assuming that the Xcode 6.4 DMG has been mounted at `/Volumes/Xcode` and
-+that your Xcode 8.2.1 install is at `/Applications/Xcode.app`, run:
-+
-+```sh
-+cp -r /Volumes/Xcode/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/
-+```
-+
-+You will also need to enable Xcode to build against the 10.10 SDK:
-+
-+- Open `/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Info.plist`
-+- Set the `MinimumSDKVersion` to `10.10`
-+- Save the file
-+
-+## Building Electron
-+
-+See [Build Instructions: GN](build-instructions-gn.md).
-removed in remote
-  base   100644 22dba096b73d1f99ee323f6822abb54a8b453477 docs/development/build-instructions-osx.md
-  our    100644 22dba096b73d1f99ee323f6822abb54a8b453477 docs/development/build-instructions-osx.md
-@@ -1,136 +0,0 @@
--# Build Instructions (macOS)
--
--Follow the guidelines below for building Electron on macOS.
--
--## Prerequisites
--
--* macOS >= 10.11.6
--* [Xcode](https://developer.apple.com/technologies/tools/) >= 8.2.1
--* [node.js](https://nodejs.org) (external)
--* Python 2.7 with support for TLS 1.2
--
--## Python
--
--Please also ensure that your system and Python version support at least TLS 1.2.
--This depends on both your version of macOS and Python. For a quick test, run:
--
--```sh
--$ npm run check-tls
--```
--
--If the script returns that your configuration is using an outdated security
--protocol, you can either update macOS to High Sierra or install a new version
--of Python 2.7.x. To upgrade Python, use [Homebrew](https://brew.sh/):
--
--```sh
--$ brew install python@2 && brew link python@2 --force
--```
--
--If you are using Python as provided by Homebrew, you also need to install
--the following Python modules:
--
--* [pyobjc](https://pythonhosted.org/pyobjc/install.html)
--
--## macOS SDK
--
--If you're developing Electron and don't plan to redistribute your
--custom Electron build, you may skip this section.
--
--For certain features (e.g. pinch-zoom) to work properly, you must target the
--macOS 10.10 SDK.
--
--Official Electron builds are built with [Xcode 8.2.1](http://adcdownload.apple.com/Developer_Tools/Xcode_8.2.1/Xcode_8.2.1.xip), which does not contain
--the 10.10 SDK by default. To obtain it, first download and mount the
--[Xcode 6.4](http://developer.apple.com/devcenter/download.action?path=/Developer_Tools/Xcode_6.4/Xcode_6.4.dmg)
--DMG.
--
--Then, assuming that the Xcode 6.4 DMG has been mounted at `/Volumes/Xcode` and
--that your Xcode 8.2.1 install is at `/Applications/Xcode.app`, run:
--
--```sh
--cp -r /Volumes/Xcode/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/
--```
--
--You will also need to enable Xcode to build against the 10.10 SDK:
--
--- Open `/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Info.plist`
--- Set the `MinimumSDKVersion` to `10.10`
--- Save the file
--
--## Getting the Code
--
--```sh
--$ git clone https://github.com/electron/electron
--```
--
--## Bootstrapping
--
--The bootstrap script will download all necessary build dependencies and create
--the build project files. Notice that we're using [ninja](https://ninja-build.org/)
--to build Electron so there is no Xcode project generated.
--
--To bootstrap for a static, non-developer build, run:
--
--```sh
--$ cd electron
--$ npm run bootstrap
--```
--
--Or to bootstrap for a development session that builds faster by not statically linking:
--
--```sh
--$ cd electron
--$ npm run bootstrap:dev
--```
--
--If you are using editor supports [JSON compilation database](http://clang.llvm.org/docs/JSONCompilationDatabase.html) based
--language server, you can generate it:
--
--```sh
--$ ./script/build.py --compdb
--```
--
--## Building
--
--To build both `Release` and `Debug` targets:
--
--```sh
--$ npm run build
--```
--
--You can also build either the `Debug` or `Release` target on its own:
--
--```sh
--$ npm run build:dev
--```
--
--```sh
--$ npm run build:release
--```
--
--After building is done, you can find `Electron.app` under `out/D`.
--
--## 32bit Support
--
--Electron can only be built for a 64bit target on macOS and there is no plan to
--support 32bit macOS in the future.
--
--## Cleaning
--
--To clean the build files:
--
--```sh
--$ npm run clean
--```
--
--To clean only `out` and `dist` directories:
--
--```sh
--$ npm run clean-build
--```
--
--**Note:** Both clean commands require running `bootstrap` again before building.
--
--## Tests
--
--See [Build System Overview: Tests](build-system-overview.md#tests)
-merged
-  result 100644 c481dbf3b99f452f9e78374c7fe477e454eadbf6 docs/development/build-instructions-windows.md
-  our    100644 86f9d2b6f82bb28fe8dda7ec2bea9eccd6119fd4 docs/development/build-instructions-windows.md
-@@ -25,52 +25,9 @@
- **Note:** Even though Visual Studio is not used for building, it's still
- **required** because we need the build toolchains it provides.
- 
--## Getting the Code
--
--```powershell
--$ git clone https://github.com/electron/electron.git
--```
--
--## Bootstrapping
--
--The bootstrap script will download all necessary build dependencies and create
--the build project files. Notice that we're using `ninja` to build Electron so
--there is no Visual Studio project generated.
--
--To bootstrap for a static, non-developer build, run:
--
--```powershell
--$ cd electron
--$ npm run bootstrap
--```
--
--Or to bootstrap for a development session that builds faster by not statically linking:
--
--```powershell
--$ cd electron
--$ npm run bootstrap:dev
--```
--
- ## Building
- 
--Build both `Release` and `Debug` targets:
--
--```powershell
--$ npm run build
--```
--
--You can also build either the `Debug` or `Release` target on its own:
--
--```powershell
--$ npm run build:dev
--```
--
--```powershell
--$ npm run build:release
--```
--
--After building is done, you can find `electron.exe` under `out\D` (debug
--target) or under `out\R` (release target).
-+See [Build Instructions: GN](build-instructions-gn.md)
- 
- ## 32bit Build
- 
-@@ -85,32 +42,13 @@
- 
- ## Visual Studio project
- 
--To generate a Visual Studio project, you can pass the `--msvs` parameter:
--
--```powershell
--$ python script\bootstrap.py --msvs
--```
--
--## Cleaning
--
--To clean the build files:
-+To generate a Visual Studio project, you can pass the `--ide=vs2017` parameter
-+to `gn gen`:
- 
- ```powershell
--$ npm run clean
--```
--
--To clean only `out` and `dist` directories:
--
--```sh
--$ npm run clean-build
-+$ gn gen out/Debug --ide=vs2017
- ```
- 
--**Note:** Both clean commands require running `bootstrap` again before building.
--
--## Tests
--
--See [Build System Overview: Tests](build-system-overview.md#tests)
--
- ## Troubleshooting
- 
- ### Command xxxx not found
-@@ -122,34 +60,6 @@
- 
- Make sure you have the latest Visual Studio update installed.
- 
--### Assertion failed: ((handle))->activecnt >= 0
--
--If building under Cygwin, you may see `bootstrap.py` failed with following
--error:
--
--```sh
--Assertion failed: ((handle))->activecnt >= 0, file src\win\pipe.c, line 1430
--
--Traceback (most recent call last):
--  File "script/bootstrap.py", line 87, in <module>
--    sys.exit(main())
--  File "script/bootstrap.py", line 22, in main
--    update_node_modules('.')
--  File "script/bootstrap.py", line 56, in update_node_modules
--    execute([NPM, 'install'])
--  File "/home/zcbenz/codes/raven/script/lib/util.py", line 118, in execute
--    raise e
--subprocess.CalledProcessError: Command '['npm.cmd', 'install']' returned non-zero exit status 3
--```
--
--This is caused by a bug when using Cygwin Python and Win32 Node together. The
--solution is to use the Win32 Python to execute the bootstrap script (assuming
--you have installed Python under `C:\Python27`):
--
--```powershell
--$ /cygdrive/c/Python27/python.exe script/bootstrap.py
--```
--
- ### LNK1181: cannot open input file 'kernel32.lib'
- 
- Try reinstalling 32bit Node.js.
-merged
-  result 100644 1983de07ec1c9db3fbed4a21ec4b75a1094803af docs/development/build-system-overview.md
-  our    100644 c70876e56109453e17f770b6e980a61f6fecb813 docs/development/build-system-overview.md
-@@ -1,20 +1,18 @@
- # Build System Overview
- 
--Electron uses [gyp](https://gyp.gsrc.io/) for project generation and
-+Electron uses [GN](https://gn.googlesource.com/gn) for project generation and
- [ninja](https://ninja-build.org/) for building. Project configurations can
--be found in the `.gyp` and `.gypi` files.
-+be found in the `.gn` and `.gni` files.
- 
--## Gyp Files
-+## GN Files
- 
--Following `gyp` files contain the main rules for building Electron:
-+The following `gn` files contain the main rules for building Electron:
- 
--* `electron.gyp` defines how Electron itself is built.
--* `common.gypi` adjusts the build configurations of Node to make it build
--  together with Chromium.
--* `brightray/brightray.gyp` defines how `brightray` is built and
-+* `BUILD.gn` defines how Electron itself is built.
-+* `brightray/BUILD.gn` defines how `brightray` is built and
-   includes the default configurations for linking with Chromium.
--* `brightray/brightray.gypi` includes general build configurations about
--  building.
-+* `build/args/{debug,release,all}.gn` contain the default build arguments for
-+  building Electron.
- 
- ## Component Build
- 
-@@ -24,56 +22,17 @@
- a separate shared library, making linking very quick but sacrificing file size
- and performance.
- 
--In Electron we took a very similar approach: for `Debug` builds, the binary
--will be linked to a shared library version of Chromium's components to achieve
--fast linking time; for `Release` builds, the binary will be linked to the static
--library versions, so we can have the best possible binary size and performance.
--
--## Minimal Bootstrapping
--
--All of Chromium's prebuilt binaries (`libchromiumcontent`) are downloaded when
--running the bootstrap script. By default both static libraries and shared
--libraries will be downloaded and the final size should be between 800MB and 2GB
--depending on the platform.
--
--By default, `libchromiumcontent` is downloaded from Amazon Web Services.
--If the `LIBCHROMIUMCONTENT_MIRROR` environment variable is set, the bootstrap
--script will download from it.
--[`libchromiumcontent-qiniu-mirror`](https://github.com/hokein/libchromiumcontent-qiniu-mirror)
--is a mirror for `libchromiumcontent`. If you have trouble in accessing AWS, you
--can switch the download address to it via
--`export LIBCHROMIUMCONTENT_MIRROR=http://7xk3d2.dl1.z0.glb.clouddn.com/`
--
--If you only want to build Electron quickly for testing or development, you
--can download the shared library versions by passing the `--dev` parameter:
--
--```sh
--$ ./script/bootstrap.py --dev
--$ ./script/build.py -c D
--```
--
--## Two-Phase Project Generation
--
--Electron links with different sets of libraries in `Release` and `Debug`
--builds. `gyp`, however, doesn't support configuring different link settings for
--different configurations.
--
--To work around this Electron uses a `gyp` variable
--`libchromiumcontent_component` to control which link settings to use and only
--generates one target when running `gyp`.
--
--## Target Names
--
--Unlike most projects that use `Release` and `Debug` as target names, Electron
--uses `R` and `D` instead. This is because `gyp` randomly crashes if there is
--only one `Release` or `Debug` build configuration defined, and Electron only has
--to generate one target at a time as stated above.
--
--This only affects developers, if you are building Electron for rebranding
--you are not affected.
-+Electron inherits this build option from Chromium. In `Debug` builds, the
-+binary will be linked to a shared library version of Chromium's components to
-+achieve fast linking time; for `Release` builds, the binary will be linked to
-+the static library versions, so we can have the best possible binary size and
-+performance.
- 
- ## Tests
- 
-+**NB** _this section is out of date and contains information that is no longer
-+relevant to the GN-built electron._
-+
- Test your changes conform to the project coding style using:
- 
- ```sh
-merged
-  result 100644 23506ae918faf1f4878fb4cb0d89fa53f2d4d505 docs/development/chromium-development.md
-  our    100644 faebd3d43470b2207b64108d4a10f89faa59da91 docs/development/chromium-development.md
-@@ -12,76 +12,3 @@
- - [Discussion Groups](http://www.chromium.org/developers/discussion-groups)
- 
- See also [V8 Development](v8-development.md)
--
--# Chromium development with Electron
--
--It is possible to debug Chromium with Electron by passing
--`--build_debug_libcc` to the bootstrap script:
--
--```sh
--$ ./script/bootstrap.py -d --build_debug_libcc
--```
--
--This will download and build libchromiumcontent locally, similarly to the
--`--build_release_libcc`, but it will create a shared library build of
--libchromiumcontent and won't strip any symbols, making it ideal for debugging.
--
--When built like this, you can make changes to files in
--`vendor/libchromiumcontent/src` and rebuild quickly with:
--
--```sh
--$ ./script/build.py -c D --libcc
--```
--
--When developing on linux with gdb, it is recommended to add a gdb index to speed
--up loading symbols. This doesn't need to be executed on every build, but it is
--recommended to do it at least once to index most shared libraries:
--
--```sh
--$ ./vendor/libchromiumcontent/src/build/gdb-add-index ./out/D/electron
--```
--
--Building libchromiumcontent requires a powerful machine and takes a long time
--(though incremental rebuilding the shared library component is fast). With an
--8-core/16-thread Ryzen 1700 CPU clocked at 3ghz, fast SSD and 32GB of RAM, it
--should take about 40 minutes. It is not recommended to build with less than 16GB
--of RAM.
--
--## Chromium git cache
--
--`depot_tools` has an undocumented option that allows the developer to set a
--global cache for all git objects of Chromium + dependencies. This option uses
--`git clone --shared` to save bandwidth/space on multiple clones of the same
--repositories.
--
--On electron/libchromiumcontent, this option is exposed through the
--`LIBCHROMIUMCONTENT_GIT_CACHE` environment variable. If you intend to have
--several libchromiumcontent build trees on the same machine(to work on different
--branches for example), it is recommended to set the variable to speed up the
--download of Chromium source. For example:
--
--```sh
--$ mkdir ~/.chromium-git-cache
--$ LIBCHROMIUMCONTENT_GIT_CACHE=~/.chromium-git-cache ./script/bootstrap.py -d --build_debug_libcc
--```
--
--If the bootstrap script is interrupted while using the git cache, it will leave
--the cache locked. To remove the lock, delete the files ending in `.lock`:
--
--```sh
--$ find ~/.chromium-git-cache/ -type f -name '*.lock' -delete
--```
--
--It is possible to share this directory with other machines by exporting it as
--SMB share on linux, but only one process/machine can be using the cache at a
--time. The locks created by git-cache script will try to prevent this, but it may
--not work perfectly in a network.
--
--On Windows, SMBv2 has a directory cache that will cause problems with the git
--cache script, so it is necessary to disable it by setting the registry key
--
--```sh
--HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\Lanmanworkstation\Parameters\DirectoryCacheLifetime
--```
--
--to 0. More information: https://stackoverflow.com/a/9935126
-merged
-  result 100644 93f0ec7e2ea32d3e69d4663c2347a871136d7f86 docs/development/debug-instructions-windows.md
-  our    100644 95f4cbab47f5a4ae40f733fd3f8942a63bf4382d docs/development/debug-instructions-windows.md
-@@ -36,7 +36,7 @@
- build of Electron, using the application to open as a parameter.
- 
- ```powershell
--$ ./out/D/electron.exe ~/my-electron-app/
-+$ ./out/Debug/electron.exe ~/my-electron-app/
- ```
- 
- ### Setting Breakpoints
-merged
-  result 100644 13da10df29c2ada481ae33d156977cd8c557b9ce docs/development/debugging-instructions-macos-xcode.md
-  our    100644 6c2234477a35701b5d2e4f845d954bccbb203977 docs/development/debugging-instructions-macos-xcode.md
-@@ -1,40 +1,15 @@
- ## Debugging with XCode
- 
--### Build Debug Electron with Release libchromiumcontent
--You can create a debug build of Electron by following [build instructions for macOS](build-instructions-osx.md).
--The bootstrap process will download Release version of libchromiumcontent by default,
--so you will not be able to step through the Chromium source.
--
--### Build Debug Electron with Debug libchromiumcontent
--If you want to debug and step through libchromiumcontent, you will have to run the
--bootsrap script with the `--build_debug_libcc` argument.
--
--```sh
--$ cd electron
--$ ./script/bootstrap.py -v --build_debug_libcc
--```
--This can take a significant amount of time depending on build machine as it has to
--build all of the libchromium source.
--
--Once, the lib is built, create a symlink to the built directory under download
--
--`ln -s vendor/libchromiumcontent/dist/main/shared_library vendor/download/libchromiumcontent/shared_library`
--
--Electron debug builds will use this shared library to link against.
--
--```sh
--$ ./script/build.py -c D --libcc
--```
--This will build debug Electron with debug version of libchromiumcontent.
--
- ### Generate xcode project for debugging sources (cannot build code from xcode)
--Run the update script with the --xcode argument.
-+Run `gn gen` with the --ide=xcode argument.
- ```sh
--$ ./script/update.py --xcode
-+$ gn gen out/Debug --ide=xcode
- ```
--This will generate the electron.ninjs.xcworkspace. You will have to open this workspace
-+This will generate the electron.ninja.xcworkspace. You will have to open this workspace
- to set breakpoints and inspect.
- 
-+See `gn help gen` for more information on generating IDE projects with GN.
-+
- ### Debugging and breakpoints
- 
- Launch Electron app after build.
-merged
-  result 100644 e469210ba3ca506b82012c184d9f5c3cb7f621bf docs/development/debugging-instructions-macos.md
-  our    100644 0a9c07906e5f04372c970f232b22a47a56199bce docs/development/debugging-instructions-macos.md
-@@ -29,9 +29,9 @@
- build of Electron as a parameter.
- 
- ```sh
--$ lldb ./out/D/Electron.app
--(lldb) target create "./out/D/Electron.app"
--Current executable set to './out/D/Electron.app' (x86_64).
-+$ lldb ./out/Debug/Electron.app
-+(lldb) target create "./out/Debug/Electron.app"
-+Current executable set to './out/Debug/Electron.app' (x86_64).
- ```
- 
- ### Setting Breakpoints
-@@ -63,7 +63,7 @@
- 
- ```sh
- (lldb) run
--Process 25244 launched: '/Users/fr/Code/electron/out/D/Electron.app/Contents/MacOS/Electron' (x86_64)
-+Process 25244 launched: '/Users/fr/Code/electron/out/Debug/Electron.app/Contents/MacOS/Electron' (x86_64)
- Process 25244 stopped
- * thread #1: tid = 0x839a4c, 0x0000000100162db4 Electron Framework`atom::Browser::SetName(this=0x0000000108b14f20, name="Electron") + 20 at browser.cc:118, queue = 'com.apple.main-thread', stop reason = breakpoint 1.1
-     frame #0: 0x0000000100162db4 Electron Framework`atom::Browser::SetName(this=0x0000000108b14f20, name="Electron") + 20 at browser.cc:118
-merged
-  result 100644 c009c53465cffc7059ce9973266514689e372b52 docs/development/source-code-directory-structure.md
-  our    100644 3c8a679a43c33be6757b95d56dc2ab61f9d57bf9 docs/development/source-code-directory-structure.md
-@@ -46,9 +46,7 @@
- ├── native_mate/ - A fork of Chromium's gin library that makes it easier to marshal
- |                  types between C++ and JavaScript.
- ├── spec/ - Automatic tests.
--├── electron.gyp - Building rules of Electron.
--└── common.gypi - Compiler specific settings and building rules for other
--                  components like `node` and `breakpad`.
-+└── BUILD.gn - Building rules of Electron.
- ```
- 
- ## `/chromium_src`
-@@ -68,7 +66,7 @@
- 
- * **script** - Scripts used for development purpose like building, packaging,
-   testing, etc.
--* **tools** - Helper scripts used by gyp files, unlike `script`, scripts put
-+* **tools** - Helper scripts used by GN files, unlike `script`, scripts put
-   here should never be invoked by users directly.
- * **vendor** - Source code of third party dependencies, we didn't use
-   `third_party` as name because it would confuse it with the same directory in
-@@ -78,7 +76,7 @@
- * **dist** - Temporary directory created by `script/create-dist.py` script
-   when creating a distribution.
- * **external_binaries** - Downloaded binaries of third-party frameworks which
--  do not support building with `gyp`.
-+  do not support building with `gn`.
- 
- ## Keeping Git Submodules Up to Date
- 
-@@ -89,8 +87,8 @@
- ```sh
- $ git status
- 
--	modified:   vendor/libchromiumcontent (new commits)
--	modified:   vendor/node (new commits)
-+	modified:   vendor/depot_tools (new commits)
-+	modified:   vendor/boto (new commits)
- ```
- 
- To update these vendored dependencies, run the following command:
-merged
-  result 100644 5897a841c05306b66ec01e5e8a75972141c9cf7e docs/tutorial/application-distribution.md
-  our    100644 22b861749cb9c5d7fe6982d273856fb3c4bf04c9 docs/tutorial/application-distribution.md
-@@ -116,8 +116,9 @@
- ## Rebranding by Rebuilding Electron from Source
- 
- It is also possible to rebrand Electron by changing the product name and
--building it from source. To do this you need to modify the `atom.gyp` file and
--have a clean rebuild.
-+building it from source. To do this you need to set the build argument
-+corresponding to the product name (`electron_product_name = "YourProductName"`)
-+in the `args.gn` file and rebuild.
- 
- ### Creating a Custom Electron Fork
- 
-removed in remote
-  base   100644 922c6b257004404dbc7d2b8db17358639e88a1c3 electron.gyp
-  our    100644 944ddab2a3fd879044e31677e4bac2843fffbdee electron.gyp
-@@ -1,817 +0,0 @@
--{
--  'variables': {
--    'project_name%': 'electron',
--    'product_name%': 'Electron',
--    'company_name%': 'GitHub, Inc',
--    'company_abbr%': 'github',
--    'version%': '4.0.0-nightly.20180821',
--    'js2c_input_dir': '<(SHARED_INTERMEDIATE_DIR)/js2c',
--  },
--  'includes': [
--    'features.gypi',
--    'filenames.gypi',
--    'native_mate/native_mate_files.gypi',
--  ],
--  'target_defaults': {
--    'defines': [
--      'ATOM_PRODUCT_NAME="<(product_name)"',
--      'ATOM_PROJECT_NAME="<(project_name)"',
--    ],
--    'conditions': [
--      ['OS=="mac"', {
--        'mac_framework_dirs': [
--          '<(source_root)/external_binaries',
--        ],
--      }],
--      ['enable_desktop_capturer==1', {
--        'defines': [
--          'ENABLE_DESKTOP_CAPTURER',
--        ],
--      }],  # enable_desktop_capturer==1
--      ['enable_osr==1', {
--        'defines': [
--          'ENABLE_OSR',
--        ],
--      }],  # enable_osr==1
--      ['enable_pdf_viewer==1', {
--        'defines': [
--          'ENABLE_PDF_VIEWER',
--        ],
--      }],  # enable_pdf_viewer
--      ['enable_run_as_node==1', {
--        'defines': [
--          'ENABLE_RUN_AS_NODE',
--        ],
--      }],  # enable_run_as_node
--      ['enable_view_api==1', {
--        'defines': [
--          'ENABLE_VIEW_API',
--        ],
--      }],  # enable_view_api
--      ['enable_pepper_flash==1', {
--        'defines': [
--          'ENABLE_PEPPER_FLASH',
--        ],
--      }],  # enable_pepper_flash
--    ],
--  },
--  'targets': [
--    {
--      'target_name': '<(project_name)',
--      'type': 'executable',
--      'dependencies': [
--        'js2asar',
--        'app2asar',
--        '<(project_name)_lib',
--      ],
--      'sources': [
--        '<@(app_sources)',
--      ],
--      'include_dirs': [
--        '.',
--      ],
--      'conditions': [
--        ['OS=="mac"', {
--          'product_name': '<(product_name)',
--          'mac_bundle': 1,
--          'dependencies!': [
--            '<(project_name)_lib',
--          ],
--          'dependencies': [
--            '<(project_name)_framework',
--            '<(project_name)_helper',
--          ],
--          'xcode_settings': {
--            'ATOM_BUNDLE_ID': 'com.<(company_abbr).<(project_name)',
--            'INFOPLIST_FILE': 'atom/browser/resources/mac/Info.plist',
--            'LD_RUNPATH_SEARCH_PATHS': [
--              '@executable_path/../Frameworks',
--            ],
--          },
--          'mac_bundle_resources': [
--            '<@(bundle_sources)',
--          ],
--          'copies': [
--            {
--              'destination': '<(PRODUCT_DIR)/<(product_name).app/Contents/Frameworks',
--              'files': [
--                '<(PRODUCT_DIR)/<(product_name) Helper.app',
--                '<(PRODUCT_DIR)/<(product_name) Framework.framework',
--              ],
--            },
--          ],
--          'postbuilds': [
--            {
--              # This postbuid step is responsible for creating the following
--              # helpers:
--              #
--              # <(product_name) EH.app and <(product_name) NP.app are created
--              # from <(product_name).app.
--              #
--              # The EH helper is marked for an executable heap. The NP helper
--              # is marked for no PIE (ASLR).
--              'postbuild_name': 'Make More Helpers',
--              'action': [
--                'tools/mac/make_more_helpers.sh',
--                'Frameworks',
--                '<(product_name)',
--              ],
--            },
--              # The application doesn't have real localizations, it just has
--              # empty .lproj directories, which is enough to convince Cocoa
--              # that Electron supports those languages.
--            {
--              'postbuild_name': 'Make Empty Localizations',
--              'variables': {
--                'apply_locales_cmd': ['python', 'tools/mac/apply_locales.py'],
--                'locale_dirs': [
--                  '>!@(<(apply_locales_cmd) -d ZZLOCALE.lproj <(locales))',
--                ],
--              },
--              'action': [
--                'tools/mac/make_locale_dirs.sh',
--                '<@(locale_dirs)',
--              ],
--            },
--          ],
--          'conditions': [
--            ['mas_build==0', {
--              'copies': [
--                {
--                  'destination': '<(PRODUCT_DIR)/<(product_name).app/Contents/Frameworks',
--                  'files': [
--                    'external_binaries/Squirrel.framework',
--                    'external_binaries/ReactiveCocoa.framework',
--                    'external_binaries/Mantle.framework',
--                  ],
--                },
--              ],
--            }],
--            ['mas_build==1', {
--              'dependencies': [
--                '<(project_name)_login_helper',
--              ],
--              'copies': [
--                {
--                  'destination': '<(PRODUCT_DIR)/<(product_name).app/Contents/Library/LoginItems',
--                  'files': [
--                    '<(PRODUCT_DIR)/<(product_name) Login Helper.app',
--                  ],
--                },
--              ],
--            }],
--          ],
--        }],  # OS!="mac"
--        ['OS=="win"', {
--          'msvs_settings': {
--            'VCManifestTool': {
--              'EmbedManifest': 'true',
--              'AdditionalManifestFiles': 'atom/browser/resources/win/atom.manifest',
--            },
--            'VCLinkerTool': {
--              # Chrome builds with this minimum environment which makes e.g.
--              # GetSystemMetrics(SM_CXSIZEFRAME) return Windows XP/2003
--              # compatible metrics. See: https://crbug.com/361720
--              #
--              # The following two settings translate to a linker flag
--              # of /SUBSYSTEM:WINDOWS,5.02
--              'MinimumRequiredVersion': '5.02',
--              'SubSystem': '2',
--              'AdditionalDependencies': [
--                'wtsapi32.lib',
--              ],
--            },
--          },
--          'copies': [
--            {
--              'variables': {
--                'conditions': [
--                  ['libchromiumcontent_component', {
--                    'copied_libraries': [
--                      '<@(libchromiumcontent_shared_libraries)',
--                      '<@(libchromiumcontent_shared_v8_libraries)',
--                    ],
--                  }, {
--                    'copied_libraries': [
--                      '<(libchromiumcontent_dir)/ffmpeg.dll',
--                    ],
--                  }],
--                ],
--              },
--              'destination': '<(PRODUCT_DIR)',
--              'files': [
--                '<@(copied_libraries)',
--                '<(libchromiumcontent_dir)/locales',
--                '<(libchromiumcontent_dir)/libEGL.dll',
--                '<(libchromiumcontent_dir)/libGLESv2.dll',
--                '<(libchromiumcontent_dir)/icudtl.dat',
--                '<(libchromiumcontent_dir)/blink_image_resources_200_percent.pak',
--                '<(libchromiumcontent_dir)/content_resources_200_percent.pak',
--                '<(libchromiumcontent_dir)/content_shell.pak',
--                '<(libchromiumcontent_dir)/ui_resources_200_percent.pak',
--                '<(libchromiumcontent_dir)/views_resources_200_percent.pak',
--                '<(libchromiumcontent_dir)/natives_blob.bin',
--                '<(libchromiumcontent_dir)/v8_context_snapshot.bin',
--                'external_binaries/d3dcompiler_47.dll',
--              ],
--            },
--          ],
--        }, {
--          'dependencies': [
--            'vendor/breakpad/breakpad.gyp:dump_syms#host',
--          ],
--        }],  # OS=="win"
--        ['OS=="linux"', {
--          'copies': [
--            {
--              'variables': {
--                'conditions': [
--                  ['libchromiumcontent_component', {
--                    'copied_libraries': [
--                      '<(PRODUCT_DIR)/lib/libnode.so',
--                      '<@(libchromiumcontent_shared_libraries)',
--                      '<@(libchromiumcontent_shared_v8_libraries)',
--                    ],
--                  }, {
--                    'copied_libraries': [
--                      '<(PRODUCT_DIR)/lib/libnode.so',
--                      '<(libchromiumcontent_dir)/libffmpeg.so',
--                    ],
--                  }],
--                ],
--              },
--              'destination': '<(PRODUCT_DIR)',
--              'files': [
--                '<@(copied_libraries)',
--                '<(libchromiumcontent_dir)/locales',
--                '<(libchromiumcontent_dir)/icudtl.dat',
--                '<(libchromiumcontent_dir)/blink_image_resources_200_percent.pak',
--                '<(libchromiumcontent_dir)/content_resources_200_percent.pak',
--                '<(libchromiumcontent_dir)/content_shell.pak',
--                '<(libchromiumcontent_dir)/ui_resources_200_percent.pak',
--                '<(libchromiumcontent_dir)/views_resources_200_percent.pak',
--                '<(libchromiumcontent_dir)/natives_blob.bin',
--                '<(libchromiumcontent_dir)/v8_context_snapshot.bin',
--              ],
--            },
--          ],
--        }],  # OS=="linux"
--      ],
--    },  # target <(project_name)
--    {
--      'target_name': '<(project_name)_lib',
--      'type': 'static_library',
--      'dependencies': [
--        'atom_js2c',
--        'brightray/brightray.gyp:brightray',
--        'vendor/node/node.gyp:node_lib',
--      ],
--      'defines': [
--        # We need to access internal implementations of Node.
--        'NODE_WANT_INTERNALS=1',
--        'NODE_SHARED_MODE',
--        'HAVE_OPENSSL=1',
--        'HAVE_INSPECTOR=1',
--        # Disable warnings for g_settings_list_schemas.
--        'GLIB_DISABLE_DEPRECATION_WARNINGS',
--        # Defined in Chromium but not exposed in its gyp file.
--        'V8_USE_EXTERNAL_STARTUP_DATA',
--
--        # Import V8 symbols from shared library (node.dll / libnode.so)
--        'USING_V8_SHARED',
--        'USING_V8_PLATFORM_SHARED',
--        'USING_V8_BASE_SHARED',
--
--        # See Chromium src/third_party/protobuf/BUILD.gn
--        'GOOGLE_PROTOBUF_NO_RTTI',
--        'GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER',
--      ],
--      'sources': [
--        '<@(lib_sources)',
--      ],
--      'include_dirs': [
--        '.',
--        'chromium_src',
--        'native_mate',
--        # Include atom_natives.h.
--        '<(SHARED_INTERMEDIATE_DIR)',
--        # Include directories for uv and node.
--        'vendor/node/src',
--        'vendor/node/deps/http_parser',
--        'vendor/node/deps/uv/include',
--        # The `node.h` is using `#include"v8.h"`.
--        '<(libchromiumcontent_src_dir)/v8/include',
--        # The `node.h` is using `#include"ares.h"`.
--        'vendor/node/deps/cares/include',
--        # The `third_party/WebKit/Source/platform/weborigin/SchemeRegistry.h` is using `platform/PlatformExport.h`.
--        '<(libchromiumcontent_src_dir)/third_party/WebKit/Source',
--        # The 'third_party/libyuv/include/libyuv/scale_argb.h' is using 'libyuv/basic_types.h'.
--        '<(libchromiumcontent_src_dir)/third_party/libyuv/include',
--        # The 'third_party/webrtc/modules/desktop_capture/desktop_frame.h' is using 'webrtc/base/scoped_ptr.h'.
--        '<(libchromiumcontent_src_dir)/third_party/',
--        '<(libchromiumcontent_src_dir)/components/cdm',
--        '<(libchromiumcontent_src_dir)/third_party/widevine',
--        '<(libchromiumcontent_src_dir)/third_party/widevine/cdm/stub',
--        '<(libchromiumcontent_src_dir)/third_party/protobuf/src',
--        # The 'third_party/webrtc/modules/desktop_capture/desktop_capture_options.h' is using 'rtc_base/constructormagic.h'.
--        '<(libchromiumcontent_src_dir)/third_party/webrtc',
--        # leveldb includes are required
--        '<(libchromiumcontent_src_dir)/third_party/leveldatabase/src',
--        '<(libchromiumcontent_src_dir)/third_party/leveldatabase/src/include',
--      ],
--      'direct_dependent_settings': {
--        'include_dirs': [
--          '.',
--        ],
--      },
--      'export_dependent_settings': [
--        'brightray/brightray.gyp:brightray',
--      ],
--      'conditions': [
--        ['enable_pdf_viewer==1', {
--          'dependencies': [
--            'vendor/pdf_viewer/pdf_viewer.gyp:pdf_viewer',
--          ],
--        }],  # enable_pdf_viewer
--        ['enable_pepper_flash==1', {
--          'include_dirs': [
--            '<(libchromiumcontent_src_dir)/chrome/browser/renderer_host/pepper',
--            '<(libchromiumcontent_src_dir)/chrome/renderer/pepper',
--          ],
--          'link_settings': {
--            'conditions': [
--              ['OS=="win"', {
--                'libraries': [
--                  '<(libchromiumcontent_dir)/pepper_flash.lib',
--                ]
--              }, {
--                'libraries': [
--                  '<(libchromiumcontent_dir)/libpepper_flash.a',
--                ]
--              }],
--            ],
--          },
--        }],  # enable_pepper_flash
--        ['libchromiumcontent_component', {
--          'link_settings': {
--            'libraries': [ '<@(libchromiumcontent_v8_libraries)' ],
--          },
--        }],
--        ['OS=="win"', {
--          'sources': [
--            '<@(lib_sources_win)',
--          ],
--          'link_settings': {
--            'libraries': [
--              '-ldwmapi.lib',
--              '-limm32.lib',
--              '-lgdi32.lib',
--              '-loleacc.lib',
--              '-lcomctl32.lib',
--              '-lcomdlg32.lib',
--              '-lwininet.lib',
--              '-lwinmm.lib',
--              '-lcrypt32.lib',
--              '-luiautomationcore.lib',
--              '-lPropsys.lib'
--            ],
--          },
--          'dependencies': [
--            # Node is built as static_library on Windows, so we also need to
--            # include its dependencies here.
--            'vendor/node/deps/cares/cares.gyp:cares',
--            'vendor/node/deps/http_parser/http_parser.gyp:http_parser',
--            'vendor/node/deps/uv/uv.gyp:libuv',
--            'vendor/node/deps/zlib/zlib.gyp:zlib',
--            # Build with breakpad support.
--            'vendor/breakpad/breakpad.gyp:breakpad_handler',
--            'vendor/breakpad/breakpad.gyp:breakpad_sender',
--          ],
--        }],  # OS=="win"
--        ['OS=="mac" and mas_build==0', {
--          'dependencies': [
--            'vendor/crashpad/client/client.gyp:crashpad_client',
--            'vendor/crashpad/handler/handler.gyp:crashpad_handler',
--          ],
--          'link_settings': {
--            # Do not link with QTKit for mas build.
--            'libraries': [
--              '$(SDKROOT)/System/Library/Frameworks/QTKit.framework',
--            ],
--          },
--          'xcode_settings': {
--            # ReactiveCocoa which is used by Squirrel requires using __weak.
--            'CLANG_ENABLE_OBJC_WEAK': 'YES',
--            'OTHER_CFLAGS': [
--              '-Wunguarded-availability',
--              '-Wobjc-missing-property-synthesis',
--            ],
--          },
--        }],  # OS=="mac" and mas_build==0
--        ['OS=="mac" and mas_build==1', {
--          'defines': [
--            'MAS_BUILD',
--          ],
--          'sources!': [
--            'atom/browser/auto_updater_mac.mm',
--            'atom/common/crash_reporter/crash_reporter_mac.h',
--            'atom/common/crash_reporter/crash_reporter_mac.mm',
--          ],
--          'dependencies': [
--            # Somehow we have code from Chromium using crashpad, very likely
--            # from components/crash.
--            # Since we do not actually invoke code from components/crash, this
--            # dependency should be eventually optimized out by linker.
--            'vendor/crashpad/client/client.gyp:crashpad_client',
--          ],
--        }],  # OS=="mac" and mas_build==1
--        ['OS=="linux"', {
--          'sources': [
--            '<@(lib_sources_linux)',
--            '<@(lib_sources_nss)',
--          ],
--          'link_settings': {
--            'ldflags': [
--              # Make binary search for libraries under current directory, so we
--              # don't have to manually set $LD_LIBRARY_PATH:
--              # http://serverfault.com/questions/279068/cant-find-so-in-the-same-directory-as-the-executable
--              '-Wl,-rpath=\$$ORIGIN',
--              # Make native module dynamic loading work.
--              '-rdynamic',
--            ],
--          },
--          # Required settings of using breakpad.
--          'cflags_cc': [
--            '-Wno-empty-body',
--          ],
--          'include_dirs': [
--            'vendor/breakpad/src',
--          ],
--          'dependencies': [
--            'vendor/breakpad/breakpad.gyp:breakpad_client',
--          ],
--        }],  # OS=="linux"
--        ['OS=="linux" and clang==1', {
--          # Required settings of using breakpad.
--          'cflags_cc': [
--            '-Wno-reserved-user-defined-literal',
--          ],
--        }],  # OS=="linux" and clang==1
--      ],
--    },  # target <(product_name)_lib
--    {
--      'target_name': 'js2asar',
--      'type': 'none',
--      'actions': [
--        {
--          'action_name': 'js2asar',
--          'variables': {
--            'conditions': [
--              ['OS=="mac"', {
--                'resources_path': '<(PRODUCT_DIR)/<(product_name).app/Contents/Resources',
--              },{
--                'resources_path': '<(PRODUCT_DIR)/resources',
--              }],
--            ],
--          },
--          'inputs': [
--            '<@(js_sources)',
--          ],
--          'outputs': [
--            '<(resources_path)/electron.asar',
--          ],
--          'action': [
--            'python',
--            'tools/js2asar.py',
--            '<@(_outputs)',
--            'lib',
--            '<@(_inputs)',
--          ],
--        }
--      ],
--    },  # target js2asar
--    {
--      'target_name': 'app2asar',
--      'type': 'none',
--      'actions': [
--        {
--          'action_name': 'app2asar',
--          'variables': {
--            'conditions': [
--              ['OS=="mac"', {
--                'resources_path': '<(PRODUCT_DIR)/<(product_name).app/Contents/Resources',
--              },{
--                'resources_path': '<(PRODUCT_DIR)/resources',
--              }],
--            ],
--          },
--          'inputs': [
--            '<@(default_app_sources)',
--          ],
--          'outputs': [
--            '<(resources_path)/default_app.asar',
--          ],
--          'action': [
--            'python',
--            'tools/js2asar.py',
--            '<@(_outputs)',
--            'default_app',
--            '<@(_inputs)',
--          ],
--        }
--      ],
--    },  # target app2asar
--    {
--      'target_name': 'atom_js2c_copy',
--      'type': 'none',
--      'copies': [
--        {
--          'destination': '<(js2c_input_dir)',
--          'files': [
--            '<@(js2c_sources)',
--          ],
--        },
--      ],
--    },  # target atom_js2c_copy
--    {
--      'target_name': 'atom_browserify',
--      'type': 'none',
--      'dependencies': [
--        # depend on this target to ensure the '<(js2c_input_dir)' is created
--        'atom_js2c_copy',
--      ],
--      'variables': {
--        'sandbox_args': [
--          './lib/sandboxed_renderer/init.js',
--          '-r',
--          './lib/sandboxed_renderer/api/exports/electron.js:electron',
--          '-r',
--          './lib/sandboxed_renderer/api/exports/fs.js:fs',
--          '-r',
--          './lib/sandboxed_renderer/api/exports/os.js:os',
--          '-r',
--          './lib/sandboxed_renderer/api/exports/path.js:path',
--          '-r',
--          './lib/sandboxed_renderer/api/exports/child_process.js:child_process'
--        ],
--        'isolated_args': [
--          'lib/isolated_renderer/init.js',
--        ]
--      },
--      'actions': [
--        {
--          'action_name': 'atom_browserify_sandbox',
--          'inputs': [
--            '<!@(python tools/list-browserify-deps.py <(sandbox_args))'
--          ],
--          'outputs': [
--            '<(js2c_input_dir)/preload_bundle.js',
--          ],
--          'action': [
--            'npm',
--            'run',
--            '--silent',
--            'browserify',
--            '--',
--            '<@(sandbox_args)',
--            '-o',
--            '<@(_outputs)',
--          ],
--        },
--        {
--          'action_name': 'atom_browserify_isolated_context',
--          'inputs': [
--            '<!@(python tools/list-browserify-deps.py <(isolated_args))'
--          ],
--          'outputs': [
--            '<(js2c_input_dir)/isolated_bundle.js',
--          ],
--          'action': [
--            'npm',
--            'run',
--            '--silent',
--            'browserify',
--            '--',
--            '<@(isolated_args)',
--            '-o',
--            '<@(_outputs)',
--          ],
--        },
--      ],
--    },  # target atom_browserify
--    {
--      'target_name': 'atom_js2c',
--      'type': 'none',
--      'dependencies': [
--        'atom_js2c_copy',
--        'atom_browserify',
--      ],
--      'actions': [
--        {
--          'action_name': 'atom_js2c',
--          'inputs': [
--            # List all input files that should trigger a rebuild with js2c
--            '<@(js2c_sources)',
--            '<(js2c_input_dir)/preload_bundle.js',
--            '<(js2c_input_dir)/isolated_bundle.js',
--          ],
--          'outputs': [
--            '<(SHARED_INTERMEDIATE_DIR)/atom_natives.h',
--          ],
--          'action': [
--            'python',
--            'tools/js2c.py',
--            'vendor/node',
--            '<@(_outputs)',
--            '<(js2c_input_dir)',
--          ],
--        }
--      ],
--    },  # target atom_js2c
--  ],
--  'conditions': [
--    ['OS=="mac"', {
--      'targets': [
--        {
--          'target_name': '<(project_name)_framework',
--          'product_name': '<(product_name) Framework',
--          'type': 'shared_library',
--          'dependencies': [
--            '<(project_name)_lib',
--          ],
--          'sources': [
--            '<@(framework_sources)',
--          ],
--          'include_dirs': [
--            '.',
--            'vendor',
--            '<(libchromiumcontent_src_dir)',
--          ],
--          'export_dependent_settings': [
--            '<(project_name)_lib',
--          ],
--          'link_settings': {
--            'libraries': [
--              '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
--              '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
--              '$(SDKROOT)/System/Library/Frameworks/Quartz.framework',
--              '$(SDKROOT)/System/Library/Frameworks/Security.framework',
--              '$(SDKROOT)/System/Library/Frameworks/SecurityInterface.framework',
--              '$(SDKROOT)/System/Library/Frameworks/ServiceManagement.framework',
--              '$(SDKROOT)/System/Library/Frameworks/StoreKit.framework',
--            ],
--          },
--          'mac_bundle': 1,
--          'mac_bundle_resources': [
--            'atom/common/resources/mac/MainMenu.xib',
--            '<(libchromiumcontent_dir)/icudtl.dat',
--            '<(libchromiumcontent_dir)/blink_image_resources_200_percent.pak',
--            '<(libchromiumcontent_dir)/content_resources_200_percent.pak',
--            '<(libchromiumcontent_dir)/content_shell.pak',
--            '<(libchromiumcontent_dir)/ui_resources_200_percent.pak',
--            '<(libchromiumcontent_dir)/views_resources_200_percent.pak',
--            '<(libchromiumcontent_dir)/natives_blob.bin',
--            '<(libchromiumcontent_dir)/v8_context_snapshot.bin',
--          ],
--          'xcode_settings': {
--            'ATOM_BUNDLE_ID': 'com.<(company_abbr).<(project_name).framework',
--            'INFOPLIST_FILE': 'atom/common/resources/mac/Info.plist',
--            'LD_DYLIB_INSTALL_NAME': '@rpath/<(product_name) Framework.framework/<(product_name) Framework',
--            'LD_RUNPATH_SEARCH_PATHS': [
--              '@loader_path/Libraries',
--            ],
--            'OTHER_LDFLAGS': [
--              '-ObjC',
--            ],
--          },
--          'copies': [
--            {
--              'variables': {
--                'conditions': [
--                  ['libchromiumcontent_component', {
--                    'copied_libraries': [
--                      '<(PRODUCT_DIR)/libnode.dylib',
--                      '<@(libchromiumcontent_shared_libraries)',
--                      '<@(libchromiumcontent_shared_v8_libraries)',
--                    ],
--                  }, {
--                    'copied_libraries': [
--                      '<(PRODUCT_DIR)/libnode.dylib',
--                      '<(libchromiumcontent_dir)/libffmpeg.dylib',
--                    ],
--                  }],
--                ],
--              },
--              'destination': '<(PRODUCT_DIR)/<(product_name) Framework.framework/Versions/A/Libraries',
--              'files': [
--                '<@(copied_libraries)',
--              ],
--            },
--          ],
--          'postbuilds': [
--            {
--              'postbuild_name': 'Fix path of libnode',
--              'action': [
--                'install_name_tool',
--                '-change',
--                '/usr/local/lib/libnode.dylib',
--                '@rpath/libnode.dylib',
--                '${BUILT_PRODUCTS_DIR}/<(product_name) Framework.framework/Versions/A/<(product_name) Framework',
--              ],
--            },
--            {
--              'postbuild_name': 'Add symlinks for framework subdirectories',
--              'action': [
--                'tools/mac/create-framework-subdir-symlinks.sh',
--                '<(product_name) Framework',
--                'Libraries',
--              ],
--            },
--            {
--              'postbuild_name': 'Copy locales',
--              'action': [
--                'tools/mac/copy-locales.py',
--                '-d',
--                '<(libchromiumcontent_dir)/locales',
--                '${BUILT_PRODUCTS_DIR}/<(product_name) Framework.framework/Resources',
--                '<@(locales)',
--              ],
--            },
--          ],
--          'conditions': [
--            ['enable_pdf_viewer==1', {
--              'mac_bundle_resources': [
--                '<(PRODUCT_DIR)/pdf_viewer_resources.pak',
--              ],
--            }],  # enable_pdf_viewer
--            ['mas_build==0', {
--              'link_settings': {
--                'libraries': [
--                  'external_binaries/Squirrel.framework',
--                  'external_binaries/ReactiveCocoa.framework',
--                  'external_binaries/Mantle.framework',
--                ],
--              },
--              'copies': [
--                {
--                  'destination': '<(PRODUCT_DIR)/<(product_name) Framework.framework/Versions/A/Resources',
--                  'files': [
--                    '<(PRODUCT_DIR)/crashpad_handler',
--                  ],
--                },
--              ],
--            }],
--          ],
--        },  # target framework
--        {
--          'target_name': '<(project_name)_helper',
--          'product_name': '<(product_name) Helper',
--          'type': 'executable',
--          'dependencies': [
--            '<(project_name)_framework',
--          ],
--          'sources': [
--            '<@(app_sources)',
--          ],
--          'include_dirs': [
--            '.',
--          ],
--          'mac_bundle': 1,
--          'xcode_settings': {
--            'ATOM_BUNDLE_ID': 'com.<(company_abbr).<(project_name).helper',
--            'INFOPLIST_FILE': 'atom/renderer/resources/mac/Info.plist',
--            'LD_RUNPATH_SEARCH_PATHS': [
--              '@executable_path/../../..',
--            ],
--          },
--        },  # target helper
--        {
--          'target_name': '<(project_name)_login_helper',
--          'product_name': '<(product_name) Login Helper',
--          'type': 'executable',
--          'sources': [
--            '<@(login_helper_sources)',
--          ],
--          'include_dirs': [
--            '.',
--            'vendor',
--            '<(libchromiumcontent_src_dir)',
--          ],
--          'link_settings': {
--            'libraries': [
--              '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
--            ],
--          },
--          'mac_bundle': 1,
--          'xcode_settings': {
--            'ATOM_BUNDLE_ID': 'com.<(company_abbr).<(project_name).loginhelper',
--            'INFOPLIST_FILE': 'atom/app/resources/mac/loginhelper-Info.plist',
--            'OTHER_LDFLAGS': [
--              '-ObjC',
--            ],
--          },
--        },  # target login_helper
--      ],
--    }],  # OS!="mac"
--  ],
--}
-removed in remote
-  base   100644 23d7d9907c2351fc3d7e6cd42a1e836524d727b1 features.gypi
-  our    100644 86543a4db1195223a3556fa71583038f15d79a0a features.gypi
-@@ -1,19 +0,0 @@
--{
--  # If it looks stupid but it works it ain't stupid.
--  'variables': {
--    'variables': {
--      'enable_desktop_capturer%': 1,
--      'enable_osr%': 1,
--      'enable_pdf_viewer%': 0,  # FIXME(deepak1556)
--      'enable_run_as_node%': 1,
--      'enable_view_api%': 0,
--      'enable_pepper_flash%': 1,
--    },
--    'enable_desktop_capturer%': '<(enable_desktop_capturer)',
--    'enable_osr%': '<(enable_osr)',
--    'enable_pdf_viewer%': '<(enable_pdf_viewer)',
--    'enable_run_as_node%': '<(enable_run_as_node)',
--    'enable_view_api%': '<(enable_view_api)',
--    'enable_pepper_flash%': '<(enable_pepper_flash)',
--  },
--}
-added in remote
-  their  100644 6c438e2c999dce5372e5080124b0de9dc1543634 filenames.gni
-@@ -0,0 +1,690 @@
-+filenames = {
-+  js2c_sources = [
-+    "lib/common/asar.js",
-+    "lib/common/asar_init.js",
-+  ]
-+
-+  js_sources = [
-+    "lib/browser/api/app.js",
-+    "lib/browser/api/auto-updater.js",
-+    "lib/browser/api/auto-updater/auto-updater-native.js",
-+    "lib/browser/api/auto-updater/auto-updater-win.js",
-+    "lib/browser/api/auto-updater/squirrel-update-win.js",
-+    "lib/browser/api/browser-view.js",
-+    "lib/browser/api/browser-window.js",
-+    "lib/browser/api/content-tracing.js",
-+    "lib/browser/api/dialog.js",
-+    "lib/browser/api/exports/electron.js",
-+    "lib/browser/api/global-shortcut.js",
-+    "lib/browser/api/ipc-main.js",
-+    "lib/browser/api/in-app-purchase.js",
-+    "lib/browser/api/menu-item-roles.js",
-+    "lib/browser/api/menu-item.js",
-+    "lib/browser/api/menu-utils.js",
-+    "lib/browser/api/menu.js",
-+    "lib/browser/api/module-list.js",
-+    "lib/browser/api/navigation-controller.js",
-+    "lib/browser/api/net.js",
-+    "lib/browser/api/net-log.js",
-+    "lib/browser/api/notification.js",
-+    "lib/browser/api/power-monitor.js",
-+    "lib/browser/api/power-save-blocker.js",
-+    "lib/browser/api/protocol.js",
-+    "lib/browser/api/screen.js",
-+    "lib/browser/api/session.js",
-+    "lib/browser/api/system-preferences.js",
-+    "lib/browser/api/top-level-window.js",
-+    "lib/browser/api/touch-bar.js",
-+    "lib/browser/api/tray.js",
-+    "lib/browser/api/view.js",
-+    "lib/browser/api/web-contents.js",
-+    "lib/browser/api/web-contents-view.js",
-+    "lib/browser/chrome-extension.js",
-+    "lib/browser/guest-view-manager.js",
-+    "lib/browser/guest-window-manager.js",
-+    "lib/browser/init.js",
-+    "lib/browser/objects-registry.js",
-+    "lib/browser/rpc-server.js",
-+    "lib/common/api/callbacks-registry.js",
-+    "lib/common/api/clipboard.js",
-+    "lib/common/api/crash-reporter.js",
-+    "lib/common/api/deprecate.js",
-+    "lib/common/api/deprecations.js",
-+    "lib/common/api/is-promise.js",
-+    "lib/common/api/exports/electron.js",
-+    "lib/common/api/module-list.js",
-+    "lib/common/api/native-image.js",
-+    "lib/common/api/shell.js",
-+    "lib/common/atom-binding-setup.js",
-+    "lib/common/buffer-utils.js",
-+    "lib/common/init.js",
-+    "lib/common/parse-features-string.js",
-+    "lib/common/reset-search-paths.js",
-+    "lib/renderer/chrome-api.js",
-+    "lib/renderer/content-scripts-injector.js",
-+    "lib/renderer/init.js",
-+    "lib/renderer/inspector.js",
-+    "lib/renderer/override.js",
-+    "lib/renderer/security-warnings.js",
-+    "lib/renderer/web-frame-init.js",
-+    "lib/renderer/window-setup.js",
-+    "lib/renderer/web-view/guest-view-internal.js",
-+    "lib/renderer/web-view/web-view.js",
-+    "lib/renderer/web-view/web-view-attributes.js",
-+    "lib/renderer/web-view/web-view-constants.js",
-+    "lib/renderer/api/exports/electron.js",
-+    "lib/renderer/api/ipc-renderer.js",
-+    "lib/renderer/api/module-list.js",
-+    "lib/renderer/api/remote.js",
-+    "lib/renderer/api/screen.js",
-+    "lib/renderer/api/web-frame.js",
-+    "lib/renderer/extensions/event.js",
-+    "lib/renderer/extensions/i18n.js",
-+    "lib/renderer/extensions/storage.js",
-+    "lib/renderer/extensions/web-navigation.js",
-+    "lib/worker/init.js",
-+  ]
-+
-+  default_app_sources = [
-+    "default_app/default_app.js",
-+    "default_app/icon.png",
-+    "default_app/index.html",
-+    "default_app/main.js",
-+    "default_app/package.json",
-+    "default_app/renderer.js",
-+    "default_app/styles.css",
-+    "node_modules/octicons/build/build.css",
-+    "node_modules/octicons/build/svg/gist.svg",
-+    "node_modules/octicons/build/svg/mark-github.svg",
-+    "node_modules/octicons/build/svg/gear.svg",
-+    "node_modules/octicons/build/svg/star.svg",
-+    "node_modules/octicons/build/svg/gift.svg",
-+  ]
-+
-+  lib_sources = [
-+    "atom/app/atom_content_client.cc",
-+    "atom/app/atom_content_client.h",
-+    "atom/app/atom_main_delegate.cc",
-+    "atom/app/atom_main_delegate.h",
-+    "atom/app/atom_main_delegate_mac.mm",
-+    "atom/app/command_line_args.cc",
-+    "atom/app/command_line_args.h",
-+    "atom/app/uv_task_runner.cc",
-+    "atom/app/uv_task_runner.h",
-+    "atom/browser/api/atom_api_app.cc",
-+    "atom/browser/api/atom_api_app.h",
-+    "atom/browser/api/atom_api_auto_updater.cc",
-+    "atom/browser/api/atom_api_auto_updater.h",
-+    "atom/browser/api/atom_api_browser_view.cc",
-+    "atom/browser/api/atom_api_browser_view.h",
-+    "atom/browser/api/atom_api_content_tracing.cc",
-+    "atom/browser/api/atom_api_cookies.cc",
-+    "atom/browser/api/atom_api_cookies.h",
-+    "atom/browser/api/atom_api_debugger.cc",
-+    "atom/browser/api/atom_api_debugger.h",
-+    "atom/browser/api/atom_api_dialog.cc",
-+    "atom/browser/api/atom_api_download_item.cc",
-+    "atom/browser/api/atom_api_download_item.h",
-+    "atom/browser/api/atom_api_global_shortcut.cc",
-+    "atom/browser/api/atom_api_global_shortcut.h",
-+    "atom/browser/api/atom_api_in_app_purchase.cc",
-+    "atom/browser/api/atom_api_in_app_purchase.h",
-+    "atom/browser/api/atom_api_menu.cc",
-+    "atom/browser/api/atom_api_menu.h",
-+    "atom/browser/api/atom_api_menu_mac.h",
-+    "atom/browser/api/atom_api_menu_mac.mm",
-+    "atom/browser/api/atom_api_menu_views.cc",
-+    "atom/browser/api/atom_api_menu_views.h",
-+    "atom/browser/api/atom_api_net.cc",
-+    "atom/browser/api/atom_api_net.h",
-+    "atom/browser/api/atom_api_net_log.cc",
-+    "atom/browser/api/atom_api_net_log.h",
-+    "atom/browser/api/atom_api_notification.cc",
-+    "atom/browser/api/atom_api_notification.h",
-+    "atom/browser/api/atom_api_power_monitor_mac.mm",
-+    "atom/browser/api/atom_api_power_monitor_win.cc",
-+    "atom/browser/api/atom_api_power_monitor.cc",
-+    "atom/browser/api/atom_api_power_monitor.h",
-+    "atom/browser/api/atom_api_power_save_blocker.cc",
-+    "atom/browser/api/atom_api_power_save_blocker.h",
-+    "atom/browser/api/atom_api_protocol.cc",
-+    "atom/browser/api/atom_api_protocol.h",
-+    "atom/browser/api/atom_api_render_process_preferences.cc",
-+    "atom/browser/api/atom_api_render_process_preferences.h",
-+    "atom/browser/api/atom_api_screen.cc",
-+    "atom/browser/api/atom_api_screen.h",
-+    "atom/browser/api/atom_api_session.cc",
-+    "atom/browser/api/atom_api_session.h",
-+    "atom/browser/api/atom_api_system_preferences.cc",
-+    "atom/browser/api/atom_api_system_preferences.h",
-+    "atom/browser/api/atom_api_system_preferences_mac.mm",
-+    "atom/browser/api/atom_api_system_preferences_win.cc",
-+    "atom/browser/api/atom_api_top_level_window.cc",
-+    "atom/browser/api/atom_api_top_level_window.h",
-+    "atom/browser/api/atom_api_tray.cc",
-+    "atom/browser/api/atom_api_tray.h",
-+    "atom/browser/api/atom_api_url_request.cc",
-+    "atom/browser/api/atom_api_url_request.h",
-+    "atom/browser/api/atom_api_view.cc",
-+    "atom/browser/api/atom_api_view.h",
-+    "atom/browser/api/atom_api_web_contents.cc",
-+    "atom/browser/api/atom_api_web_contents.h",
-+    "atom/browser/api/atom_api_web_contents_mac.mm",
-+    "atom/browser/api/atom_api_web_contents_view.cc",
-+    "atom/browser/api/atom_api_web_contents_view.h",
-+    "atom/browser/api/atom_api_web_request.cc",
-+    "atom/browser/api/atom_api_web_request.h",
-+    "atom/browser/api/atom_api_web_view_manager.cc",
-+    "atom/browser/api/atom_api_browser_window.cc",
-+    "atom/browser/api/atom_api_browser_window.h",
-+    "atom/browser/api/atom_api_browser_window_mac.mm",
-+    "atom/browser/api/atom_api_browser_window_views.cc",
-+    "atom/browser/api/event.cc",
-+    "atom/browser/api/event.h",
-+    "atom/browser/api/event_emitter.cc",
-+    "atom/browser/api/event_emitter.h",
-+    "atom/browser/api/event_subscriber.cc",
-+    "atom/browser/api/event_subscriber.h",
-+    "atom/browser/api/trackable_object.cc",
-+    "atom/browser/api/trackable_object.h",
-+    "atom/browser/api/frame_subscriber.cc",
-+    "atom/browser/api/frame_subscriber.h",
-+    "atom/browser/api/save_page_handler.cc",
-+    "atom/browser/api/save_page_handler.h",
-+    "atom/browser/auto_updater.cc",
-+    "atom/browser/auto_updater.h",
-+    "atom/browser/auto_updater_mac.mm",
-+    "atom/browser/atom_blob_reader.cc",
-+    "atom/browser/atom_blob_reader.h",
-+    "atom/browser/atom_browser_client.cc",
-+    "atom/browser/atom_browser_client.h",
-+    "atom/browser/atom_browser_context.cc",
-+    "atom/browser/atom_browser_context.h",
-+    "atom/browser/atom_download_manager_delegate.cc",
-+    "atom/browser/atom_download_manager_delegate.h",
-+    "atom/browser/atom_browser_main_parts.cc",
-+    "atom/browser/atom_browser_main_parts.h",
-+    "atom/browser/atom_browser_main_parts_mac.mm",
-+    "atom/browser/atom_browser_main_parts_posix.cc",
-+    "atom/browser/atom_javascript_dialog_manager.cc",
-+    "atom/browser/atom_javascript_dialog_manager.h",
-+    "atom/browser/atom_permission_manager.cc",
-+    "atom/browser/atom_permission_manager.h",
-+    "atom/browser/atom_quota_permission_context.cc",
-+    "atom/browser/atom_quota_permission_context.h",
-+    "atom/browser/atom_resource_dispatcher_host_delegate.cc",
-+    "atom/browser/atom_resource_dispatcher_host_delegate.h",
-+    "atom/browser/atom_speech_recognition_manager_delegate.cc",
-+    "atom/browser/atom_speech_recognition_manager_delegate.h",
-+    "atom/browser/atom_web_ui_controller_factory.cc",
-+    "atom/browser/atom_web_ui_controller_factory.h",
-+    "atom/browser/bridge_task_runner.cc",
-+    "atom/browser/bridge_task_runner.h",
-+    "atom/browser/browser.cc",
-+    "atom/browser/browser.h",
-+    "atom/browser/browser_linux.cc",
-+    "atom/browser/browser_mac.mm",
-+    "atom/browser/browser_win.cc",
-+    "atom/browser/browser_observer.h",
-+    "atom/browser/child_web_contents_tracker.cc",
-+    "atom/browser/child_web_contents_tracker.h",
-+    "atom/browser/common_web_contents_delegate_mac.mm",
-+    "atom/browser/common_web_contents_delegate_views.cc",
-+    "atom/browser/common_web_contents_delegate.cc",
-+    "atom/browser/common_web_contents_delegate.h",
-+    "atom/browser/javascript_environment.cc",
-+    "atom/browser/javascript_environment.h",
-+    "atom/browser/lib/bluetooth_chooser.cc",
-+    "atom/browser/lib/bluetooth_chooser.h",
-+    "atom/browser/lib/power_observer.h",
-+    "atom/browser/lib/power_observer_linux.h",
-+    "atom/browser/lib/power_observer_linux.cc",
-+    "atom/browser/loader/layered_resource_handler.cc",
-+    "atom/browser/loader/layered_resource_handler.h",
-+    "atom/browser/login_handler.cc",
-+    "atom/browser/login_handler.h",
-+    "atom/browser/mac/atom_application.h",
-+    "atom/browser/mac/atom_application.mm",
-+    "atom/browser/mac/atom_application_delegate.h",
-+    "atom/browser/mac/atom_application_delegate.mm",
-+    "atom/browser/mac/dict_util.h",
-+    "atom/browser/mac/dict_util.mm",
-+    "atom/browser/mac/in_app_purchase.h",
-+    "atom/browser/mac/in_app_purchase.mm",
-+    "atom/browser/mac/in_app_purchase_observer.h",
-+    "atom/browser/mac/in_app_purchase_observer.mm",
-+    "atom/browser/mac/in_app_purchase_product.h",
-+    "atom/browser/mac/in_app_purchase_product.mm",
-+    "atom/browser/native_browser_view.cc",
-+    "atom/browser/native_browser_view.h",
-+    "atom/browser/native_browser_view_mac.h",
-+    "atom/browser/native_browser_view_mac.mm",
-+    "atom/browser/native_browser_view_views.h",
-+    "atom/browser/native_browser_view_views.cc",
-+    "atom/browser/native_window.cc",
-+    "atom/browser/native_window.h",
-+    "atom/browser/native_window_views_win.cc",
-+    "atom/browser/native_window_views.cc",
-+    "atom/browser/native_window_views.h",
-+    "atom/browser/native_window_mac.h",
-+    "atom/browser/native_window_mac.mm",
-+    "atom/browser/native_window_observer.h",
-+    "atom/browser/net/about_protocol_handler.cc",
-+    "atom/browser/net/about_protocol_handler.h",
-+    "atom/browser/net/asar/asar_protocol_handler.cc",
-+    "atom/browser/net/asar/asar_protocol_handler.h",
-+    "atom/browser/net/asar/url_request_asar_job.cc",
-+    "atom/browser/net/asar/url_request_asar_job.h",
-+    "atom/browser/net/atom_cert_verifier.cc",
-+    "atom/browser/net/atom_cert_verifier.h",
-+    "atom/browser/net/atom_network_delegate.cc",
-+    "atom/browser/net/atom_network_delegate.h",
-+    "atom/browser/net/atom_url_request.cc",
-+    "atom/browser/net/atom_url_request.h",
-+    "atom/browser/net/atom_url_request_job_factory.cc",
-+    "atom/browser/net/atom_url_request_job_factory.h",
-+    "atom/browser/net/http_protocol_handler.cc",
-+    "atom/browser/net/http_protocol_handler.h",
-+    "atom/browser/net/js_asker.cc",
-+    "atom/browser/net/js_asker.h",
-+    "atom/browser/net/url_request_about_job.cc",
-+    "atom/browser/net/url_request_about_job.h",
-+    "atom/browser/net/url_request_async_asar_job.cc",
-+    "atom/browser/net/url_request_async_asar_job.h",
-+    "atom/browser/net/url_request_string_job.cc",
-+    "atom/browser/net/url_request_string_job.h",
-+    "atom/browser/net/url_request_buffer_job.cc",
-+    "atom/browser/net/url_request_buffer_job.h",
-+    "atom/browser/net/url_request_fetch_job.cc",
-+    "atom/browser/net/url_request_fetch_job.h",
-+    "atom/browser/net/url_request_stream_job.cc",
-+    "atom/browser/net/url_request_stream_job.h",
-+    "atom/browser/node_debugger.cc",
-+    "atom/browser/node_debugger.h",
-+    "atom/browser/relauncher_linux.cc",
-+    "atom/browser/relauncher_mac.cc",
-+    "atom/browser/relauncher_win.cc",
-+    "atom/browser/relauncher.cc",
-+    "atom/browser/relauncher.h",
-+    "atom/browser/render_process_preferences.cc",
-+    "atom/browser/render_process_preferences.h",
-+    "atom/browser/request_context_delegate.cc",
-+    "atom/browser/request_context_delegate.h",
-+    "atom/browser/session_preferences.cc",
-+    "atom/browser/session_preferences.h",
-+    "atom/browser/ui/accelerator_util.cc",
-+    "atom/browser/ui/accelerator_util.h",
-+    "atom/browser/ui/accelerator_util_mac.mm",
-+    "atom/browser/ui/accelerator_util_views.cc",
-+    "atom/browser/ui/atom_menu_model.cc",
-+    "atom/browser/ui/atom_menu_model.h",
-+    "atom/browser/ui/autofill_popup.cc",
-+    "atom/browser/ui/autofill_popup.h",
-+    "atom/browser/ui/certificate_trust.h",
-+    "atom/browser/ui/certificate_trust_mac.mm",
-+    "atom/browser/ui/certificate_trust_win.cc",
-+    "atom/browser/ui/cocoa/atom_bundle_mover.h",
-+    "atom/browser/ui/cocoa/atom_bundle_mover.mm",
-+    "atom/browser/ui/cocoa/atom_menu_controller.h",
-+    "atom/browser/ui/cocoa/atom_menu_controller.mm",
-+    "atom/browser/ui/cocoa/atom_native_widget_mac.h",
-+    "atom/browser/ui/cocoa/atom_native_widget_mac.mm",
-+    "atom/browser/ui/cocoa/atom_ns_window.h",
-+    "atom/browser/ui/cocoa/atom_ns_window.mm",
-+    "atom/browser/ui/cocoa/atom_ns_window_delegate.h",
-+    "atom/browser/ui/cocoa/atom_ns_window_delegate.mm",
-+    "atom/browser/ui/cocoa/atom_preview_item.h",
-+    "atom/browser/ui/cocoa/atom_preview_item.mm",
-+    "atom/browser/ui/cocoa/atom_touch_bar.h",
-+    "atom/browser/ui/cocoa/atom_touch_bar.mm",
-+    "atom/browser/ui/cocoa/delayed_native_view_host.cc",
-+    "atom/browser/ui/cocoa/delayed_native_view_host.h",
-+    "atom/browser/ui/cocoa/views_delegate_mac.h",
-+    "atom/browser/ui/cocoa/views_delegate_mac.mm",
-+    "atom/browser/ui/cocoa/root_view_mac.mm",
-+    "atom/browser/ui/cocoa/root_view_mac.h",
-+    "atom/browser/ui/cocoa/touch_bar_forward_declarations.h",
-+    "atom/browser/ui/drag_util_mac.mm",
-+    "atom/browser/ui/drag_util_views.cc",
-+    "atom/browser/ui/drag_util.h",
-+    "atom/browser/ui/file_dialog.h",
-+    "atom/browser/ui/file_dialog_gtk.cc",
-+    "atom/browser/ui/file_dialog_mac.mm",
-+    "atom/browser/ui/file_dialog_win.cc",
-+    "atom/browser/ui/message_box.h",
-+    "atom/browser/ui/message_box_gtk.cc",
-+    "atom/browser/ui/message_box_mac.mm",
-+    "atom/browser/ui/message_box_win.cc",
-+    "atom/browser/ui/cocoa/NSColor+Hex.mm",
-+    "atom/browser/ui/cocoa/NSColor+Hex.h",
-+    "atom/browser/ui/cocoa/NSString+ANSI.mm",
-+    "atom/browser/ui/cocoa/NSString+ANSI.h",
-+    "atom/browser/ui/tray_icon.cc",
-+    "atom/browser/ui/tray_icon.h",
-+    "atom/browser/ui/tray_icon_gtk.cc",
-+    "atom/browser/ui/tray_icon_gtk.h",
-+    "atom/browser/ui/tray_icon_cocoa.h",
-+    "atom/browser/ui/tray_icon_cocoa.mm",
-+    "atom/browser/ui/tray_icon_observer.h",
-+    "atom/browser/ui/tray_icon_win.cc",
-+    "atom/browser/ui/views/autofill_popup_view.cc",
-+    "atom/browser/ui/views/autofill_popup_view.h",
-+    "atom/browser/ui/views/frameless_view.cc",
-+    "atom/browser/ui/views/frameless_view.h",
-+    "atom/browser/ui/views/global_menu_bar_x11.cc",
-+    "atom/browser/ui/views/global_menu_bar_x11.h",
-+    "atom/browser/ui/views/menu_bar.cc",
-+    "atom/browser/ui/views/menu_bar.h",
-+    "atom/browser/ui/views/menu_delegate.cc",
-+    "atom/browser/ui/views/menu_delegate.h",
-+    "atom/browser/ui/views/menu_model_adapter.cc",
-+    "atom/browser/ui/views/menu_model_adapter.h",
-+    "atom/browser/ui/views/native_frame_view.cc",
-+    "atom/browser/ui/views/native_frame_view.h",
-+    "atom/browser/ui/views/root_view.cc",
-+    "atom/browser/ui/views/root_view.h",
-+    "atom/browser/ui/views/submenu_button.cc",
-+    "atom/browser/ui/views/submenu_button.h",
-+    "atom/browser/ui/views/win_frame_view.cc",
-+    "atom/browser/ui/views/win_frame_view.h",
-+    "atom/browser/ui/win/atom_desktop_native_widget_aura.cc",
-+    "atom/browser/ui/win/atom_desktop_native_widget_aura.h",
-+    "atom/browser/ui/win/atom_desktop_window_tree_host_win.cc",
-+    "atom/browser/ui/win/atom_desktop_window_tree_host_win.h",
-+    "atom/browser/ui/win/jump_list.cc",
-+    "atom/browser/ui/win/jump_list.h",
-+    "atom/browser/ui/win/message_handler_delegate.cc",
-+    "atom/browser/ui/win/message_handler_delegate.h",
-+    "atom/browser/ui/win/notify_icon_host.cc",
-+    "atom/browser/ui/win/notify_icon_host.h",
-+    "atom/browser/ui/win/notify_icon.cc",
-+    "atom/browser/ui/win/notify_icon.h",
-+    "atom/browser/ui/win/taskbar_host.cc",
-+    "atom/browser/ui/win/taskbar_host.h",
-+    "atom/browser/ui/x/event_disabler.cc",
-+    "atom/browser/ui/x/event_disabler.h",
-+    "atom/browser/ui/x/window_state_watcher.cc",
-+    "atom/browser/ui/x/window_state_watcher.h",
-+    "atom/browser/ui/x/x_window_utils.cc",
-+    "atom/browser/ui/x/x_window_utils.h",
-+    "atom/browser/unresponsive_suppressor.cc",
-+    "atom/browser/unresponsive_suppressor.h",
-+    "atom/browser/web_contents_permission_helper.cc",
-+    "atom/browser/web_contents_permission_helper.h",
-+    "atom/browser/web_contents_preferences.cc",
-+    "atom/browser/web_contents_preferences.h",
-+    "atom/browser/web_contents_zoom_controller.cc",
-+    "atom/browser/web_contents_zoom_controller.h",
-+    "atom/browser/web_dialog_helper.cc",
-+    "atom/browser/web_dialog_helper.h",
-+    "atom/browser/web_view_guest_delegate.cc",
-+    "atom/browser/web_view_guest_delegate.h",
-+    "atom/browser/web_view_manager.cc",
-+    "atom/browser/web_view_manager.h",
-+    "atom/browser/window_list.cc",
-+    "atom/browser/window_list.h",
-+    "atom/browser/window_list_observer.h",
-+    "atom/common/api/api_messages.h",
-+    "atom/common/api/atom_api_asar.cc",
-+    "atom/common/api/atom_api_clipboard.cc",
-+    "atom/common/api/atom_api_clipboard.h",
-+    "atom/common/api/atom_api_clipboard_mac.mm",
-+    "atom/common/api/atom_api_crash_reporter.cc",
-+    "atom/common/api/atom_api_key_weak_map.h",
-+    "atom/common/api/atom_api_native_image.cc",
-+    "atom/common/api/atom_api_native_image.h",
-+    "atom/common/api/atom_api_native_image_mac.mm",
-+    "atom/common/api/atom_api_shell.cc",
-+    "atom/common/api/atom_api_v8_util.cc",
-+    "atom/common/api/atom_bindings.cc",
-+    "atom/common/api/atom_bindings.h",
-+    "atom/common/api/constructor.h",
-+    "atom/common/api/event_emitter_caller.cc",
-+    "atom/common/api/event_emitter_caller.h",
-+    "atom/common/api/features.cc",
-+    "atom/common/api/locker.cc",
-+    "atom/common/api/locker.h",
-+    "atom/common/api/object_life_monitor.cc",
-+    "atom/common/api/object_life_monitor.h",
-+    "atom/common/api/remote_callback_freer.cc",
-+    "atom/common/api/remote_callback_freer.h",
-+    "atom/common/api/remote_object_freer.cc",
-+    "atom/common/api/remote_object_freer.h",
-+    "atom/common/asar/archive.cc",
-+    "atom/common/asar/archive.h",
-+    "atom/common/asar/asar_util.cc",
-+    "atom/common/asar/asar_util.h",
-+    "atom/common/asar/scoped_temporary_file.cc",
-+    "atom/common/asar/scoped_temporary_file.h",
-+    "atom/common/atom_command_line.cc",
-+    "atom/common/atom_command_line.h",
-+    "atom/common/atom_constants.cc",
-+    "atom/common/atom_constants.h",
-+    "atom/common/color_util.cc",
-+    "atom/common/color_util.h",
-+    "atom/common/common_message_generator.cc",
-+    "atom/common/common_message_generator.h",
-+    "atom/common/crash_reporter/crash_reporter.cc",
-+    "atom/common/crash_reporter/crash_reporter.h",
-+    "atom/common/crash_reporter/crash_reporter_linux.cc",
-+    "atom/common/crash_reporter/crash_reporter_linux.h",
-+    "atom/common/crash_reporter/crash_reporter_mac.h",
-+    "atom/common/crash_reporter/crash_reporter_mac.mm",
-+    "atom/common/crash_reporter/crash_reporter_win.cc",
-+    "atom/common/crash_reporter/crash_reporter_win.h",
-+    "atom/common/crash_reporter/linux/crash_dump_handler.cc",
-+    "atom/common/crash_reporter/linux/crash_dump_handler.h",
-+    "atom/common/crash_reporter/win/crash_service.cc",
-+    "atom/common/crash_reporter/win/crash_service.h",
-+    "atom/common/crash_reporter/win/crash_service_main.cc",
-+    "atom/common/crash_reporter/win/crash_service_main.h",
-+    "atom/common/draggable_region.cc",
-+    "atom/common/draggable_region.h",
-+    "atom/common/google_api_key.h",
-+    "atom/common/key_weak_map.h",
-+    "atom/common/keyboard_util.cc",
-+    "atom/common/keyboard_util.h",
-+    "atom/common/mouse_util.cc",
-+    "atom/common/mouse_util.h",
-+    "atom/common/linux/application_info.cc",
-+    "atom/common/native_mate_converters/accelerator_converter.cc",
-+    "atom/common/native_mate_converters/accelerator_converter.h",
-+    "atom/common/native_mate_converters/blink_converter.cc",
-+    "atom/common/native_mate_converters/blink_converter.h",
-+    "atom/common/native_mate_converters/callback.cc",
-+    "atom/common/native_mate_converters/callback.h",
-+    "atom/common/native_mate_converters/content_converter.cc",
-+    "atom/common/native_mate_converters/content_converter.h",
-+    "atom/common/native_mate_converters/file_path_converter.h",
-+    "atom/common/native_mate_converters/gfx_converter.cc",
-+    "atom/common/native_mate_converters/gfx_converter.h",
-+    "atom/common/native_mate_converters/gurl_converter.h",
-+    "atom/common/native_mate_converters/image_converter.cc",
-+    "atom/common/native_mate_converters/image_converter.h",
-+    "atom/common/native_mate_converters/net_converter.cc",
-+    "atom/common/native_mate_converters/net_converter.h",
-+    "atom/common/native_mate_converters/network_converter.cc",
-+    "atom/common/native_mate_converters/network_converter.h",
-+    "atom/common/native_mate_converters/string16_converter.h",
-+    "atom/common/native_mate_converters/ui_base_types_converter.h",
-+    "atom/common/native_mate_converters/v8_value_converter.cc",
-+    "atom/common/native_mate_converters/v8_value_converter.h",
-+    "atom/common/native_mate_converters/value_converter.cc",
-+    "atom/common/native_mate_converters/value_converter.h",
-+    "atom/common/node_bindings.cc",
-+    "atom/common/node_bindings.h",
-+    "atom/common/node_bindings_linux.cc",
-+    "atom/common/node_bindings_linux.h",
-+    "atom/common/node_bindings_mac.cc",
-+    "atom/common/node_bindings_mac.h",
-+    "atom/common/node_bindings_win.cc",
-+    "atom/common/node_bindings_win.h",
-+    "atom/common/node_includes.h",
-+    "atom/common/options_switches.cc",
-+    "atom/common/options_switches.h",
-+    "atom/common/platform_util.h",
-+    "atom/common/platform_util_linux.cc",
-+    "atom/common/platform_util_mac.mm",
-+    "atom/common/platform_util_win.cc",
-+    "atom/common/promise_util.h",
-+    "atom/common/promise_util.cc",
-+    "atom/renderer/api/atom_api_renderer_ipc.h",
-+    "atom/renderer/api/atom_api_renderer_ipc.cc",
-+    "atom/renderer/api/atom_api_spell_check_client.cc",
-+    "atom/renderer/api/atom_api_spell_check_client.h",
-+    "atom/renderer/api/atom_api_web_frame.cc",
-+    "atom/renderer/api/atom_api_web_frame.h",
-+    "atom/renderer/atom_autofill_agent.cc",
-+    "atom/renderer/atom_autofill_agent.h",
-+    "atom/renderer/atom_render_frame_observer.cc",
-+    "atom/renderer/atom_render_frame_observer.h",
-+    "atom/renderer/atom_render_view_observer.cc",
-+    "atom/renderer/atom_render_view_observer.h",
-+    "atom/renderer/atom_renderer_client.cc",
-+    "atom/renderer/atom_renderer_client.h",
-+    "atom/renderer/content_settings_observer.cc",
-+    "atom/renderer/content_settings_observer.h",
-+    "atom/renderer/atom_sandboxed_renderer_client.cc",
-+    "atom/renderer/atom_sandboxed_renderer_client.h",
-+    "atom/renderer/guest_view_container.cc",
-+    "atom/renderer/guest_view_container.h",
-+    "atom/renderer/preferences_manager.cc",
-+    "atom/renderer/preferences_manager.h",
-+    "atom/renderer/renderer_client_base.cc",
-+    "atom/renderer/renderer_client_base.h",
-+    "atom/renderer/web_worker_observer.cc",
-+    "atom/renderer/web_worker_observer.h",
-+    "atom/utility/atom_content_utility_client.cc",
-+    "atom/utility/atom_content_utility_client.h",
-+    "chromium_src/chrome/browser/browser_process.cc",
-+    "chromium_src/chrome/browser/browser_process.h",
-+    "chromium_src/chrome/browser/chrome_process_finder_win.cc",
-+    "chromium_src/chrome/browser/chrome_process_finder_win.h",
-+    "chromium_src/chrome/browser/icon_loader_mac.mm",
-+    "chromium_src/chrome/browser/icon_loader_win.cc",
-+    "chromium_src/chrome/browser/icon_loader.cc",
-+    "chromium_src/chrome/browser/icon_loader.h",
-+    "chromium_src/chrome/browser/icon_manager.cc",
-+    "chromium_src/chrome/browser/icon_manager.h",
-+    "chromium_src/chrome/browser/chrome_notification_types.h",
-+    "chromium_src/chrome/browser/extensions/global_shortcut_listener.cc",
-+    "chromium_src/chrome/browser/extensions/global_shortcut_listener.h",
-+    "chromium_src/chrome/browser/extensions/global_shortcut_listener_mac.mm",
-+    "chromium_src/chrome/browser/extensions/global_shortcut_listener_mac.h",
-+    "chromium_src/chrome/browser/extensions/global_shortcut_listener_x11.cc",
-+    "chromium_src/chrome/browser/extensions/global_shortcut_listener_x11.h",
-+    "chromium_src/chrome/browser/extensions/global_shortcut_listener_win.cc",
-+    "chromium_src/chrome/browser/extensions/global_shortcut_listener_win.h",
-+    "chromium_src/chrome/browser/media/desktop_media_list.h",
-+    "chromium_src/chrome/browser/media/desktop_media_list_observer.h",
-+    "chromium_src/chrome/browser/media/native_desktop_media_list.cc",
-+    "chromium_src/chrome/browser/media/native_desktop_media_list.h",
-+    "chromium_src/chrome/browser/printing/print_job.cc",
-+    "chromium_src/chrome/browser/printing/print_job.h",
-+    "chromium_src/chrome/browser/printing/print_job_manager.cc",
-+    "chromium_src/chrome/browser/printing/print_job_manager.h",
-+    "chromium_src/chrome/browser/printing/print_job_worker.cc",
-+    "chromium_src/chrome/browser/printing/print_job_worker.h",
-+    "chromium_src/chrome/browser/printing/print_job_worker_owner.cc",
-+    "chromium_src/chrome/browser/printing/print_job_worker_owner.h",
-+    "chromium_src/chrome/browser/printing/print_view_manager_base.cc",
-+    "chromium_src/chrome/browser/printing/print_view_manager_base.h",
-+    "chromium_src/chrome/browser/printing/print_view_manager_basic.cc",
-+    "chromium_src/chrome/browser/printing/print_view_manager_basic.h",
-+    "chromium_src/chrome/browser/printing/print_view_manager_observer.h",
-+    "chromium_src/chrome/browser/printing/printer_query.cc",
-+    "chromium_src/chrome/browser/printing/printer_query.h",
-+    "chromium_src/chrome/browser/printing/printing_message_filter.cc",
-+    "chromium_src/chrome/browser/printing/printing_message_filter.h",
-+    "chromium_src/chrome/browser/printing/print_preview_message_handler.cc",
-+    "chromium_src/chrome/browser/printing/print_preview_message_handler.h",
-+    "chromium_src/chrome/browser/process_singleton_posix.cc",
-+    "chromium_src/chrome/browser/process_singleton_win.cc",
-+    "chromium_src/chrome/browser/process_singleton.h",
-+    "chromium_src/chrome/browser/speech/tts_controller.h",
-+    "chromium_src/chrome/browser/speech/tts_controller_impl.cc",
-+    "chromium_src/chrome/browser/speech/tts_controller_impl.h",
-+    "chromium_src/chrome/browser/speech/tts_linux.cc",
-+    "chromium_src/chrome/browser/speech/tts_mac.mm",
-+    "chromium_src/chrome/browser/speech/tts_message_filter.cc",
-+    "chromium_src/chrome/browser/speech/tts_message_filter.h",
-+    "chromium_src/chrome/browser/speech/tts_platform.cc",
-+    "chromium_src/chrome/browser/speech/tts_platform.h",
-+    "chromium_src/chrome/browser/speech/tts_win.cc",
-+    "chromium_src/chrome/browser/ssl/security_state_tab_helper.cc",
-+    "chromium_src/chrome/browser/ssl/security_state_tab_helper.h",
-+    "chromium_src/chrome/browser/ui/browser_dialogs.h",
-+    "chromium_src/chrome/browser/ui/cocoa/color_chooser_mac.mm",
-+    "chromium_src/chrome/browser/ui/views/color_chooser_aura.cc",
-+    "chromium_src/chrome/browser/ui/views/color_chooser_aura.h",
-+    "chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc",
-+    "chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h",
-+    "chromium_src/chrome/common/chrome_constants.cc",
-+    "chromium_src/chrome/common/chrome_constants.h",
-+    "chromium_src/chrome/common/chrome_paths.cc",
-+    "chromium_src/chrome/common/chrome_paths.h",
-+    "chromium_src/chrome/common/chrome_paths_internal.h",
-+    "chromium_src/chrome/common/chrome_paths_linux.cc",
-+    "chromium_src/chrome/common/chrome_paths_mac.mm",
-+    "chromium_src/chrome/common/chrome_paths_win.cc",
-+    "chromium_src/chrome/common/pref_names.cc",
-+    "chromium_src/chrome/common/pref_names.h",
-+    "chromium_src/chrome/common/print_messages.cc",
-+    "chromium_src/chrome/common/print_messages.h",
-+    "chromium_src/chrome/common/tts_messages.h",
-+    "chromium_src/chrome/common/tts_utterance_request.cc",
-+    "chromium_src/chrome/common/tts_utterance_request.h",
-+    "chromium_src/chrome/common/widevine_cdm_constants.cc",
-+    "chromium_src/chrome/common/widevine_cdm_constants.h",
-+    "chromium_src/chrome/renderer/media/chrome_key_systems.cc",
-+    "chromium_src/chrome/renderer/media/chrome_key_systems.h",
-+    "chromium_src/chrome/renderer/printing/print_web_view_helper.cc",
-+    "chromium_src/chrome/renderer/printing/print_web_view_helper_linux.cc",
-+    "chromium_src/chrome/renderer/printing/print_web_view_helper_mac.mm",
-+    "chromium_src/chrome/renderer/printing/print_web_view_helper_pdf_win.cc",
-+    "chromium_src/chrome/renderer/printing/print_web_view_helper.h",
-+    "chromium_src/chrome/renderer/spellchecker/spellcheck_worditerator.cc",
-+    "chromium_src/chrome/renderer/spellchecker/spellcheck_worditerator.h",
-+    "chromium_src/chrome/renderer/tts_dispatcher.cc",
-+    "chromium_src/chrome/renderer/tts_dispatcher.h",
-+    "chromium_src/chrome/utility/utility_message_handler.h",
-+    "chromium_src/extensions/browser/app_window/size_constraints.cc",
-+    "chromium_src/extensions/browser/app_window/size_constraints.h",
-+    "chromium_src/extensions/common/url_pattern.cc",
-+    "chromium_src/extensions/common/url_pattern.h",
-+    "chromium_src/library_loaders/libspeechd_loader.cc",
-+    "chromium_src/library_loaders/libspeechd.h",
-+  ]
-+
-+  lib_sources_linux = [
-+    "chromium_src/chrome/browser/icon_loader_auralinux.cc",
-+  ]
-+  lib_sources_nss = [
-+    "chromium_src/chrome/browser/certificate_manager_model.cc",
-+    "chromium_src/chrome/browser/certificate_manager_model.h",
-+  ]
-+
-+  lib_sources_win = [
-+    "chromium_src/chrome/browser/ui/views/color_chooser_dialog.cc",
-+    "chromium_src/chrome/browser/ui/views/color_chooser_dialog.h",
-+    "chromium_src/chrome/browser/ui/views/color_chooser_win.cc",
-+    "chromium_src/chrome/browser/printing/pdf_to_emf_converter.cc",
-+    "chromium_src/chrome/browser/printing/pdf_to_emf_converter.h",
-+    "chromium_src/chrome/utility/printing_handler_win.cc",
-+    "chromium_src/chrome/utility/printing_handler_win.h",
-+  ]
-+
-+  app_sources = [
-+    "atom/app/atom_main.cc",
-+    "atom/app/atom_main.h",
-+  ]
-+
-+  framework_sources = [
-+    "atom/app/atom_library_main.h",
-+    "atom/app/atom_library_main.mm",
-+  ]
-+
-+  login_helper_sources = [
-+    "atom/app/atom_login_helper.mm",
-+  ]
-+}
-removed in remote
-  base   100644 31fb96254ecfb6ac9a382ffbde0ef34b310d247e filenames.gypi
-  our    100644 f57860558f06b7e5d8a50f48cfc7e53044df0bc6 filenames.gypi
-@@ -1,798 +0,0 @@
--{
--  'variables': {
--    'app_sources': [
--      'atom/app/atom_main.cc',
--      'atom/app/atom_main.h',
--    ],
--    'bundle_sources': [
--      'atom/browser/resources/mac/electron.icns',
--    ],
--    'js_sources': [
--      'lib/browser/api/app.js',
--      'lib/browser/api/auto-updater.js',
--      'lib/browser/api/auto-updater/auto-updater-native.js',
--      'lib/browser/api/auto-updater/auto-updater-win.js',
--      'lib/browser/api/auto-updater/squirrel-update-win.js',
--      'lib/browser/api/browser-view.js',
--      'lib/browser/api/browser-window.js',
--      'lib/browser/api/content-tracing.js',
--      'lib/browser/api/dialog.js',
--      'lib/browser/api/exports/electron.js',
--      'lib/browser/api/global-shortcut.js',
--      'lib/browser/api/ipc-main.js',
--      'lib/browser/api/in-app-purchase.js',
--      'lib/browser/api/menu-item-roles.js',
--      'lib/browser/api/menu-item.js',
--      'lib/browser/api/menu-utils.js',
--      'lib/browser/api/menu.js',
--      'lib/browser/api/module-list.js',
--      'lib/browser/api/navigation-controller.js',
--      'lib/browser/api/net.js',
--      'lib/browser/api/net-log.js',
--      'lib/browser/api/notification.js',
--      'lib/browser/api/power-monitor.js',
--      'lib/browser/api/power-save-blocker.js',
--      'lib/browser/api/protocol.js',
--      'lib/browser/api/screen.js',
--      'lib/browser/api/session.js',
--      'lib/browser/api/system-preferences.js',
--      'lib/browser/api/top-level-window.js',
--      'lib/browser/api/touch-bar.js',
--      'lib/browser/api/tray.js',
--      'lib/browser/api/view.js',
--      'lib/browser/api/web-contents.js',
--      'lib/browser/api/web-contents-view.js',
--      'lib/browser/chrome-extension.js',
--      'lib/browser/guest-view-manager.js',
--      'lib/browser/guest-window-manager.js',
--      'lib/browser/init.js',
--      'lib/browser/objects-registry.js',
--      'lib/browser/rpc-server.js',
--      'lib/common/api/callbacks-registry.js',
--      'lib/common/api/clipboard.js',
--      'lib/common/api/crash-reporter.js',
--      'lib/common/api/deprecate.js',
--      'lib/common/api/deprecations.js',
--      'lib/common/api/is-promise.js',
--      'lib/common/api/exports/electron.js',
--      'lib/common/api/module-list.js',
--      'lib/common/api/native-image.js',
--      'lib/common/api/shell.js',
--      'lib/common/atom-binding-setup.js',
--      'lib/common/buffer-utils.js',
--      'lib/common/init.js',
--      'lib/common/parse-features-string.js',
--      'lib/common/reset-search-paths.js',
--      'lib/renderer/chrome-api.js',
--      'lib/renderer/content-scripts-injector.js',
--      'lib/renderer/init.js',
--      'lib/renderer/inspector.js',
--      'lib/renderer/override.js',
--      'lib/renderer/security-warnings.js',
--      'lib/renderer/web-frame-init.js',
--      'lib/renderer/window-setup.js',
--      'lib/renderer/web-view/guest-view-internal.js',
--      'lib/renderer/web-view/web-view.js',
--      'lib/renderer/web-view/web-view-attributes.js',
--      'lib/renderer/web-view/web-view-constants.js',
--      'lib/renderer/api/exports/electron.js',
--      'lib/renderer/api/ipc-renderer.js',
--      'lib/renderer/api/module-list.js',
--      'lib/renderer/api/remote.js',
--      'lib/renderer/api/screen.js',
--      'lib/renderer/api/web-frame.js',
--      'lib/renderer/extensions/event.js',
--      'lib/renderer/extensions/i18n.js',
--      'lib/renderer/extensions/storage.js',
--      'lib/renderer/extensions/web-navigation.js',
--      'lib/worker/init.js',
--    ],
--    'js2c_sources': [
--      'lib/common/asar.js',
--      'lib/common/asar_init.js',
--    ],
--    'default_app_sources': [
--      'default_app/default_app.js',
--      'default_app/icon.png',
--      'default_app/index.html',
--      'default_app/main.js',
--      'default_app/package.json',
--      'default_app/renderer.js',
--      'default_app/styles.css',
--      'node_modules/octicons/build/build.css',
--      'node_modules/octicons/build/svg/gist.svg',
--      'node_modules/octicons/build/svg/mark-github.svg',
--      'node_modules/octicons/build/svg/gear.svg',
--      'node_modules/octicons/build/svg/star.svg',
--      'node_modules/octicons/build/svg/gift.svg',
--    ],
--    'lib_sources': [
--      'atom/app/atom_content_client.cc',
--      'atom/app/atom_content_client.h',
--      'atom/app/atom_main_delegate.cc',
--      'atom/app/atom_main_delegate.h',
--      'atom/app/atom_main_delegate_mac.mm',
--      'atom/app/command_line_args.cc',
--      'atom/app/command_line_args.h',
--      'atom/app/uv_task_runner.cc',
--      'atom/app/uv_task_runner.h',
--      'atom/browser/api/atom_api_app.cc',
--      'atom/browser/api/atom_api_app.h',
--      'atom/browser/api/atom_api_auto_updater.cc',
--      'atom/browser/api/atom_api_auto_updater.h',
--      'atom/browser/api/atom_api_browser_view.cc',
--      'atom/browser/api/atom_api_browser_view.h',
--      'atom/browser/api/atom_api_content_tracing.cc',
--      'atom/browser/api/atom_api_cookies.cc',
--      'atom/browser/api/atom_api_cookies.h',
--      'atom/browser/api/atom_api_debugger.cc',
--      'atom/browser/api/atom_api_debugger.h',
--      'atom/browser/api/atom_api_dialog.cc',
--      'atom/browser/api/atom_api_download_item.cc',
--      'atom/browser/api/atom_api_download_item.h',
--      'atom/browser/api/atom_api_global_shortcut.cc',
--      'atom/browser/api/atom_api_global_shortcut.h',
--      'atom/browser/api/atom_api_in_app_purchase.cc',
--      'atom/browser/api/atom_api_in_app_purchase.h',
--      'atom/browser/api/atom_api_menu.cc',
--      'atom/browser/api/atom_api_menu.h',
--      'atom/browser/api/atom_api_menu_mac.h',
--      'atom/browser/api/atom_api_menu_mac.mm',
--      'atom/browser/api/atom_api_menu_views.cc',
--      'atom/browser/api/atom_api_menu_views.h',
--      'atom/browser/api/atom_api_net.cc',
--      'atom/browser/api/atom_api_net.h',
--      'atom/browser/api/atom_api_net_log.cc',
--      'atom/browser/api/atom_api_net_log.h',
--      'atom/browser/api/atom_api_notification.cc',
--      'atom/browser/api/atom_api_notification.h',
--      'atom/browser/api/atom_api_power_monitor_mac.mm',
--      'atom/browser/api/atom_api_power_monitor_win.cc',
--      'atom/browser/api/atom_api_power_monitor.cc',
--      'atom/browser/api/atom_api_power_monitor.h',
--      'atom/browser/api/atom_api_power_save_blocker.cc',
--      'atom/browser/api/atom_api_power_save_blocker.h',
--      'atom/browser/api/atom_api_protocol.cc',
--      'atom/browser/api/atom_api_protocol.h',
--      'atom/browser/api/atom_api_render_process_preferences.cc',
--      'atom/browser/api/atom_api_render_process_preferences.h',
--      'atom/browser/api/atom_api_screen.cc',
--      'atom/browser/api/atom_api_screen.h',
--      'atom/browser/api/atom_api_session.cc',
--      'atom/browser/api/atom_api_session.h',
--      'atom/browser/api/atom_api_system_preferences.cc',
--      'atom/browser/api/atom_api_system_preferences.h',
--      'atom/browser/api/atom_api_system_preferences_mac.mm',
--      'atom/browser/api/atom_api_system_preferences_win.cc',
--      'atom/browser/api/atom_api_top_level_window.cc',
--      'atom/browser/api/atom_api_top_level_window.h',
--      'atom/browser/api/atom_api_tray.cc',
--      'atom/browser/api/atom_api_tray.h',
--      'atom/browser/api/atom_api_url_request.cc',
--      'atom/browser/api/atom_api_url_request.h',
--      'atom/browser/api/atom_api_view.cc',
--      'atom/browser/api/atom_api_view.h',
--      'atom/browser/api/atom_api_web_contents.cc',
--      'atom/browser/api/atom_api_web_contents.h',
--      'atom/browser/api/atom_api_web_contents_mac.mm',
--      'atom/browser/api/atom_api_web_contents_view.cc',
--      'atom/browser/api/atom_api_web_contents_view.h',
--      'atom/browser/api/atom_api_web_request.cc',
--      'atom/browser/api/atom_api_web_request.h',
--      'atom/browser/api/atom_api_web_view_manager.cc',
--      'atom/browser/api/atom_api_browser_window.cc',
--      'atom/browser/api/atom_api_browser_window.h',
--      'atom/browser/api/atom_api_browser_window_mac.mm',
--      'atom/browser/api/atom_api_browser_window_views.cc',
--      'atom/browser/api/event.cc',
--      'atom/browser/api/event.h',
--      'atom/browser/api/event_emitter.cc',
--      'atom/browser/api/event_emitter.h',
--      'atom/browser/api/event_subscriber.cc',
--      'atom/browser/api/event_subscriber.h',
--      'atom/browser/api/trackable_object.cc',
--      'atom/browser/api/trackable_object.h',
--      'atom/browser/api/frame_subscriber.cc',
--      'atom/browser/api/frame_subscriber.h',
--      'atom/browser/api/save_page_handler.cc',
--      'atom/browser/api/save_page_handler.h',
--      'atom/browser/auto_updater.cc',
--      'atom/browser/auto_updater.h',
--      'atom/browser/auto_updater_mac.mm',
--      'atom/browser/atom_blob_reader.cc',
--      'atom/browser/atom_blob_reader.h',
--      'atom/browser/atom_browser_client.cc',
--      'atom/browser/atom_browser_client.h',
--      'atom/browser/atom_browser_context.cc',
--      'atom/browser/atom_browser_context.h',
--      'atom/browser/atom_download_manager_delegate.cc',
--      'atom/browser/atom_download_manager_delegate.h',
--      'atom/browser/atom_browser_main_parts.cc',
--      'atom/browser/atom_browser_main_parts.h',
--      'atom/browser/atom_browser_main_parts_mac.mm',
--      'atom/browser/atom_browser_main_parts_posix.cc',
--      'atom/browser/atom_javascript_dialog_manager.cc',
--      'atom/browser/atom_javascript_dialog_manager.h',
--      'atom/browser/atom_permission_manager.cc',
--      'atom/browser/atom_permission_manager.h',
--      'atom/browser/atom_quota_permission_context.cc',
--      'atom/browser/atom_quota_permission_context.h',
--      'atom/browser/atom_resource_dispatcher_host_delegate.cc',
--      'atom/browser/atom_resource_dispatcher_host_delegate.h',
--      'atom/browser/atom_speech_recognition_manager_delegate.cc',
--      'atom/browser/atom_speech_recognition_manager_delegate.h',
--      'atom/browser/atom_web_ui_controller_factory.cc',
--      'atom/browser/atom_web_ui_controller_factory.h',
--      'atom/browser/bridge_task_runner.cc',
--      'atom/browser/bridge_task_runner.h',
--      'atom/browser/browser.cc',
--      'atom/browser/browser.h',
--      'atom/browser/browser_linux.cc',
--      'atom/browser/browser_mac.mm',
--      'atom/browser/browser_win.cc',
--      'atom/browser/browser_observer.h',
--      'atom/browser/child_web_contents_tracker.cc',
--      'atom/browser/child_web_contents_tracker.h',
--      'atom/browser/common_web_contents_delegate_mac.mm',
--      'atom/browser/common_web_contents_delegate_views.cc',
--      'atom/browser/common_web_contents_delegate.cc',
--      'atom/browser/common_web_contents_delegate.h',
--      'atom/browser/javascript_environment.cc',
--      'atom/browser/javascript_environment.h',
--      'atom/browser/lib/bluetooth_chooser.cc',
--      'atom/browser/lib/bluetooth_chooser.h',
--      'atom/browser/lib/power_observer.h',
--      'atom/browser/lib/power_observer_linux.h',
--      'atom/browser/lib/power_observer_linux.cc',
--      'atom/browser/loader/layered_resource_handler.cc',
--      'atom/browser/loader/layered_resource_handler.h',
--      'atom/browser/login_handler.cc',
--      'atom/browser/login_handler.h',
--      'atom/browser/mac/atom_application.h',
--      'atom/browser/mac/atom_application.mm',
--      'atom/browser/mac/atom_application_delegate.h',
--      'atom/browser/mac/atom_application_delegate.mm',
--      'atom/browser/mac/dict_util.h',
--      'atom/browser/mac/dict_util.mm',
--      'atom/browser/mac/in_app_purchase.h',
--      'atom/browser/mac/in_app_purchase.mm',
--      'atom/browser/mac/in_app_purchase_observer.h',
--      'atom/browser/mac/in_app_purchase_observer.mm',
--      'atom/browser/mac/in_app_purchase_product.h',
--      'atom/browser/mac/in_app_purchase_product.mm',
--      'atom/browser/native_browser_view.cc',
--      'atom/browser/native_browser_view.h',
--      'atom/browser/native_browser_view_mac.h',
--      'atom/browser/native_browser_view_mac.mm',
--      'atom/browser/native_browser_view_views.h',
--      'atom/browser/native_browser_view_views.cc',
--      'atom/browser/native_window.cc',
--      'atom/browser/native_window.h',
--      'atom/browser/native_window_views_win.cc',
--      'atom/browser/native_window_views.cc',
--      'atom/browser/native_window_views.h',
--      'atom/browser/native_window_mac.h',
--      'atom/browser/native_window_mac.mm',
--      'atom/browser/native_window_observer.h',
--      'atom/browser/net/about_protocol_handler.cc',
--      'atom/browser/net/about_protocol_handler.h',
--      'atom/browser/net/asar/asar_protocol_handler.cc',
--      'atom/browser/net/asar/asar_protocol_handler.h',
--      'atom/browser/net/asar/url_request_asar_job.cc',
--      'atom/browser/net/asar/url_request_asar_job.h',
--      'atom/browser/net/atom_cert_verifier.cc',
--      'atom/browser/net/atom_cert_verifier.h',
--      'atom/browser/net/atom_network_delegate.cc',
--      'atom/browser/net/atom_network_delegate.h',
--      'atom/browser/net/atom_url_request.cc',
--      'atom/browser/net/atom_url_request.h',
--      'atom/browser/net/atom_url_request_job_factory.cc',
--      'atom/browser/net/atom_url_request_job_factory.h',
--      'atom/browser/net/http_protocol_handler.cc',
--      'atom/browser/net/http_protocol_handler.h',
--      'atom/browser/net/js_asker.cc',
--      'atom/browser/net/js_asker.h',
--      'atom/browser/net/url_request_about_job.cc',
--      'atom/browser/net/url_request_about_job.h',
--      'atom/browser/net/url_request_async_asar_job.cc',
--      'atom/browser/net/url_request_async_asar_job.h',
--      'atom/browser/net/url_request_string_job.cc',
--      'atom/browser/net/url_request_string_job.h',
--      'atom/browser/net/url_request_buffer_job.cc',
--      'atom/browser/net/url_request_buffer_job.h',
--      'atom/browser/net/url_request_fetch_job.cc',
--      'atom/browser/net/url_request_fetch_job.h',
--      'atom/browser/net/url_request_stream_job.cc',
--      'atom/browser/net/url_request_stream_job.h',
--      'atom/browser/node_debugger.cc',
--      'atom/browser/node_debugger.h',
--      'atom/browser/relauncher_linux.cc',
--      'atom/browser/relauncher_mac.cc',
--      'atom/browser/relauncher_win.cc',
--      'atom/browser/relauncher.cc',
--      'atom/browser/relauncher.h',
--      'atom/browser/render_process_preferences.cc',
--      'atom/browser/render_process_preferences.h',
--      'atom/browser/request_context_delegate.cc',
--      'atom/browser/request_context_delegate.h',
--      'atom/browser/session_preferences.cc',
--      'atom/browser/session_preferences.h',
--      'atom/browser/special_storage_policy.cc',
--      'atom/browser/special_storage_policy.h',
--      'atom/browser/ui/accelerator_util.cc',
--      'atom/browser/ui/accelerator_util.h',
--      'atom/browser/ui/accelerator_util_mac.mm',
--      'atom/browser/ui/accelerator_util_views.cc',
--      'atom/browser/ui/atom_menu_model.cc',
--      'atom/browser/ui/atom_menu_model.h',
--      'atom/browser/ui/autofill_popup.cc',
--      'atom/browser/ui/autofill_popup.h',
--      'atom/browser/ui/certificate_trust.h',
--      'atom/browser/ui/certificate_trust_mac.mm',
--      'atom/browser/ui/certificate_trust_win.cc',
--      'atom/browser/ui/cocoa/atom_bundle_mover.h',
--      'atom/browser/ui/cocoa/atom_bundle_mover.mm',
--      'atom/browser/ui/cocoa/atom_menu_controller.h',
--      'atom/browser/ui/cocoa/atom_menu_controller.mm',
--      'atom/browser/ui/cocoa/atom_native_widget_mac.h',
--      'atom/browser/ui/cocoa/atom_native_widget_mac.mm',
--      'atom/browser/ui/cocoa/atom_ns_window.h',
--      'atom/browser/ui/cocoa/atom_ns_window.mm',
--      'atom/browser/ui/cocoa/atom_ns_window_delegate.h',
--      'atom/browser/ui/cocoa/atom_ns_window_delegate.mm',
--      'atom/browser/ui/cocoa/atom_preview_item.h',
--      'atom/browser/ui/cocoa/atom_preview_item.mm',
--      'atom/browser/ui/cocoa/atom_touch_bar.h',
--      'atom/browser/ui/cocoa/atom_touch_bar.mm',
--      'atom/browser/ui/cocoa/delayed_native_view_host.cc',
--      'atom/browser/ui/cocoa/delayed_native_view_host.h',
--      'atom/browser/ui/cocoa/views_delegate_mac.h',
--      'atom/browser/ui/cocoa/views_delegate_mac.mm',
--      'atom/browser/ui/cocoa/root_view_mac.mm',
--      'atom/browser/ui/cocoa/root_view_mac.h',
--      'atom/browser/ui/cocoa/touch_bar_forward_declarations.h',
--      'atom/browser/ui/drag_util_mac.mm',
--      'atom/browser/ui/drag_util_views.cc',
--      'atom/browser/ui/drag_util.h',
--      'atom/browser/ui/file_dialog.h',
--      'atom/browser/ui/file_dialog_gtk.cc',
--      'atom/browser/ui/file_dialog_mac.mm',
--      'atom/browser/ui/file_dialog_win.cc',
--      'atom/browser/ui/message_box.h',
--      'atom/browser/ui/message_box_gtk.cc',
--      'atom/browser/ui/message_box_mac.mm',
--      'atom/browser/ui/message_box_win.cc',
--      'atom/browser/ui/cocoa/NSColor+Hex.mm',
--      'atom/browser/ui/cocoa/NSColor+Hex.h',
--      'atom/browser/ui/cocoa/NSString+ANSI.mm',
--      'atom/browser/ui/cocoa/NSString+ANSI.h',
--      'atom/browser/ui/tray_icon.cc',
--      'atom/browser/ui/tray_icon.h',
--      'atom/browser/ui/tray_icon_gtk.cc',
--      'atom/browser/ui/tray_icon_gtk.h',
--      'atom/browser/ui/tray_icon_cocoa.h',
--      'atom/browser/ui/tray_icon_cocoa.mm',
--      'atom/browser/ui/tray_icon_observer.h',
--      'atom/browser/ui/tray_icon_win.cc',
--      'atom/browser/ui/views/autofill_popup_view.cc',
--      'atom/browser/ui/views/autofill_popup_view.h',
--      'atom/browser/ui/views/frameless_view.cc',
--      'atom/browser/ui/views/frameless_view.h',
--      'atom/browser/ui/views/global_menu_bar_x11.cc',
--      'atom/browser/ui/views/global_menu_bar_x11.h',
--      'atom/browser/ui/views/menu_bar.cc',
--      'atom/browser/ui/views/menu_bar.h',
--      'atom/browser/ui/views/menu_delegate.cc',
--      'atom/browser/ui/views/menu_delegate.h',
--      'atom/browser/ui/views/menu_model_adapter.cc',
--      'atom/browser/ui/views/menu_model_adapter.h',
--      'atom/browser/ui/views/native_frame_view.cc',
--      'atom/browser/ui/views/native_frame_view.h',
--      'atom/browser/ui/views/root_view.cc',
--      'atom/browser/ui/views/root_view.h',
--      'atom/browser/ui/views/submenu_button.cc',
--      'atom/browser/ui/views/submenu_button.h',
--      'atom/browser/ui/views/win_frame_view.cc',
--      'atom/browser/ui/views/win_frame_view.h',
--      'atom/browser/ui/win/atom_desktop_native_widget_aura.cc',
--      'atom/browser/ui/win/atom_desktop_native_widget_aura.h',
--      'atom/browser/ui/win/atom_desktop_window_tree_host_win.cc',
--      'atom/browser/ui/win/atom_desktop_window_tree_host_win.h',
--      'atom/browser/ui/win/jump_list.cc',
--      'atom/browser/ui/win/jump_list.h',
--      'atom/browser/ui/win/message_handler_delegate.cc',
--      'atom/browser/ui/win/message_handler_delegate.h',
--      'atom/browser/ui/win/notify_icon_host.cc',
--      'atom/browser/ui/win/notify_icon_host.h',
--      'atom/browser/ui/win/notify_icon.cc',
--      'atom/browser/ui/win/notify_icon.h',
--      'atom/browser/ui/win/taskbar_host.cc',
--      'atom/browser/ui/win/taskbar_host.h',
--      'atom/browser/ui/x/event_disabler.cc',
--      'atom/browser/ui/x/event_disabler.h',
--      'atom/browser/ui/x/window_state_watcher.cc',
--      'atom/browser/ui/x/window_state_watcher.h',
--      'atom/browser/ui/x/x_window_utils.cc',
--      'atom/browser/ui/x/x_window_utils.h',
--      'atom/browser/unresponsive_suppressor.cc',
--      'atom/browser/unresponsive_suppressor.h',
--      'atom/browser/web_contents_permission_helper.cc',
--      'atom/browser/web_contents_permission_helper.h',
--      'atom/browser/web_contents_preferences.cc',
--      'atom/browser/web_contents_preferences.h',
--      'atom/browser/web_contents_zoom_controller.cc',
--      'atom/browser/web_contents_zoom_controller.h',
--      'atom/browser/web_dialog_helper.cc',
--      'atom/browser/web_dialog_helper.h',
--      'atom/browser/web_view_guest_delegate.cc',
--      'atom/browser/web_view_guest_delegate.h',
--      'atom/browser/web_view_manager.cc',
--      'atom/browser/web_view_manager.h',
--      'atom/browser/window_list.cc',
--      'atom/browser/window_list.h',
--      'atom/browser/window_list_observer.h',
--      'atom/common/api/api_messages.h',
--      'atom/common/api/atom_api_asar.cc',
--      'atom/common/api/atom_api_clipboard.cc',
--      'atom/common/api/atom_api_clipboard.h',
--      'atom/common/api/atom_api_clipboard_mac.mm',
--      'atom/common/api/atom_api_crash_reporter.cc',
--      'atom/common/api/atom_api_key_weak_map.h',
--      'atom/common/api/atom_api_native_image.cc',
--      'atom/common/api/atom_api_native_image.h',
--      'atom/common/api/atom_api_native_image_mac.mm',
--      'atom/common/api/atom_api_shell.cc',
--      'atom/common/api/atom_api_v8_util.cc',
--      'atom/common/api/atom_bindings.cc',
--      'atom/common/api/atom_bindings.h',
--      'atom/common/api/constructor.h',
--      'atom/common/api/event_emitter_caller.cc',
--      'atom/common/api/event_emitter_caller.h',
--      'atom/common/api/features.cc',
--      'atom/common/api/locker.cc',
--      'atom/common/api/locker.h',
--      'atom/common/api/object_life_monitor.cc',
--      'atom/common/api/object_life_monitor.h',
--      'atom/common/api/remote_callback_freer.cc',
--      'atom/common/api/remote_callback_freer.h',
--      'atom/common/api/remote_object_freer.cc',
--      'atom/common/api/remote_object_freer.h',
--      'atom/common/asar/archive.cc',
--      'atom/common/asar/archive.h',
--      'atom/common/asar/asar_util.cc',
--      'atom/common/asar/asar_util.h',
--      'atom/common/asar/scoped_temporary_file.cc',
--      'atom/common/asar/scoped_temporary_file.h',
--      'atom/common/atom_command_line.cc',
--      'atom/common/atom_command_line.h',
--      'atom/common/atom_constants.cc',
--      'atom/common/atom_constants.h',
--      'atom/common/color_util.cc',
--      'atom/common/color_util.h',
--      'atom/common/common_message_generator.cc',
--      'atom/common/common_message_generator.h',
--      'atom/common/crash_reporter/crash_reporter.cc',
--      'atom/common/crash_reporter/crash_reporter.h',
--      'atom/common/crash_reporter/crash_reporter_linux.cc',
--      'atom/common/crash_reporter/crash_reporter_linux.h',
--      'atom/common/crash_reporter/crash_reporter_mac.h',
--      'atom/common/crash_reporter/crash_reporter_mac.mm',
--      'atom/common/crash_reporter/crash_reporter_win.cc',
--      'atom/common/crash_reporter/crash_reporter_win.h',
--      'atom/common/crash_reporter/linux/crash_dump_handler.cc',
--      'atom/common/crash_reporter/linux/crash_dump_handler.h',
--      'atom/common/crash_reporter/win/crash_service.cc',
--      'atom/common/crash_reporter/win/crash_service.h',
--      'atom/common/crash_reporter/win/crash_service_main.cc',
--      'atom/common/crash_reporter/win/crash_service_main.h',
--      'atom/common/draggable_region.cc',
--      'atom/common/draggable_region.h',
--      'atom/common/google_api_key.h',
--      'atom/common/key_weak_map.h',
--      'atom/common/keyboard_util.cc',
--      'atom/common/keyboard_util.h',
--      'atom/common/mouse_util.cc',
--      'atom/common/mouse_util.h',
--      'atom/common/linux/application_info.cc',
--      'atom/common/native_mate_converters/accelerator_converter.cc',
--      'atom/common/native_mate_converters/accelerator_converter.h',
--      'atom/common/native_mate_converters/blink_converter.cc',
--      'atom/common/native_mate_converters/blink_converter.h',
--      'atom/common/native_mate_converters/callback.cc',
--      'atom/common/native_mate_converters/callback.h',
--      'atom/common/native_mate_converters/content_converter.cc',
--      'atom/common/native_mate_converters/content_converter.h',
--      'atom/common/native_mate_converters/file_path_converter.h',
--      'atom/common/native_mate_converters/gfx_converter.cc',
--      'atom/common/native_mate_converters/gfx_converter.h',
--      'atom/common/native_mate_converters/gurl_converter.h',
--      'atom/common/native_mate_converters/image_converter.cc',
--      'atom/common/native_mate_converters/image_converter.h',
--      'atom/common/native_mate_converters/net_converter.cc',
--      'atom/common/native_mate_converters/net_converter.h',
--      'atom/common/native_mate_converters/network_converter.cc',
--      'atom/common/native_mate_converters/network_converter.h',
--      'atom/common/native_mate_converters/string16_converter.h',
--      'atom/common/native_mate_converters/ui_base_types_converter.h',
--      'atom/common/native_mate_converters/v8_value_converter.cc',
--      'atom/common/native_mate_converters/v8_value_converter.h',
--      'atom/common/native_mate_converters/value_converter.cc',
--      'atom/common/native_mate_converters/value_converter.h',
--      'atom/common/node_bindings.cc',
--      'atom/common/node_bindings.h',
--      'atom/common/node_bindings_linux.cc',
--      'atom/common/node_bindings_linux.h',
--      'atom/common/node_bindings_mac.cc',
--      'atom/common/node_bindings_mac.h',
--      'atom/common/node_bindings_win.cc',
--      'atom/common/node_bindings_win.h',
--      'atom/common/node_includes.h',
--      'atom/common/options_switches.cc',
--      'atom/common/options_switches.h',
--      'atom/common/platform_util.h',
--      'atom/common/platform_util_linux.cc',
--      'atom/common/platform_util_mac.mm',
--      'atom/common/platform_util_win.cc',
--      'atom/common/promise_util.h',
--      'atom/common/promise_util.cc',
--      'atom/renderer/api/atom_api_renderer_ipc.h',
--      'atom/renderer/api/atom_api_renderer_ipc.cc',
--      'atom/renderer/api/atom_api_spell_check_client.cc',
--      'atom/renderer/api/atom_api_spell_check_client.h',
--      'atom/renderer/api/atom_api_web_frame.cc',
--      'atom/renderer/api/atom_api_web_frame.h',
--      'atom/renderer/atom_autofill_agent.cc',
--      'atom/renderer/atom_autofill_agent.h',
--      'atom/renderer/atom_render_frame_observer.cc',
--      'atom/renderer/atom_render_frame_observer.h',
--      'atom/renderer/atom_render_view_observer.cc',
--      'atom/renderer/atom_render_view_observer.h',
--      'atom/renderer/atom_renderer_client.cc',
--      'atom/renderer/atom_renderer_client.h',
--      'atom/renderer/content_settings_observer.cc',
--      'atom/renderer/content_settings_observer.h',
--      'atom/renderer/atom_sandboxed_renderer_client.cc',
--      'atom/renderer/atom_sandboxed_renderer_client.h',
--      'atom/renderer/guest_view_container.cc',
--      'atom/renderer/guest_view_container.h',
--      'atom/renderer/preferences_manager.cc',
--      'atom/renderer/preferences_manager.h',
--      'atom/renderer/renderer_client_base.cc',
--      'atom/renderer/renderer_client_base.h',
--      'atom/renderer/web_worker_observer.cc',
--      'atom/renderer/web_worker_observer.h',
--      'atom/utility/atom_content_utility_client.cc',
--      'atom/utility/atom_content_utility_client.h',
--      'chromium_src/chrome/browser/browser_process.cc',
--      'chromium_src/chrome/browser/browser_process.h',
--      'chromium_src/chrome/browser/chrome_process_finder_win.cc',
--      'chromium_src/chrome/browser/chrome_process_finder_win.h',
--      'chromium_src/chrome/browser/icon_loader_mac.mm',
--      'chromium_src/chrome/browser/icon_loader_win.cc',
--      'chromium_src/chrome/browser/icon_loader.cc',
--      'chromium_src/chrome/browser/icon_loader.h',
--      'chromium_src/chrome/browser/icon_manager.cc',
--      'chromium_src/chrome/browser/icon_manager.h',
--      'chromium_src/chrome/browser/chrome_notification_types.h',
--      'chromium_src/chrome/browser/extensions/global_shortcut_listener.cc',
--      'chromium_src/chrome/browser/extensions/global_shortcut_listener.h',
--      'chromium_src/chrome/browser/extensions/global_shortcut_listener_mac.mm',
--      'chromium_src/chrome/browser/extensions/global_shortcut_listener_mac.h',
--      'chromium_src/chrome/browser/extensions/global_shortcut_listener_x11.cc',
--      'chromium_src/chrome/browser/extensions/global_shortcut_listener_x11.h',
--      'chromium_src/chrome/browser/extensions/global_shortcut_listener_win.cc',
--      'chromium_src/chrome/browser/extensions/global_shortcut_listener_win.h',
--      'chromium_src/chrome/browser/media/desktop_media_list.h',
--      'chromium_src/chrome/browser/media/desktop_media_list_observer.h',
--      'chromium_src/chrome/browser/media/native_desktop_media_list.cc',
--      'chromium_src/chrome/browser/media/native_desktop_media_list.h',
--      'chromium_src/chrome/browser/printing/print_job.cc',
--      'chromium_src/chrome/browser/printing/print_job.h',
--      'chromium_src/chrome/browser/printing/print_job_manager.cc',
--      'chromium_src/chrome/browser/printing/print_job_manager.h',
--      'chromium_src/chrome/browser/printing/print_job_worker.cc',
--      'chromium_src/chrome/browser/printing/print_job_worker.h',
--      'chromium_src/chrome/browser/printing/print_job_worker_owner.cc',
--      'chromium_src/chrome/browser/printing/print_job_worker_owner.h',
--      'chromium_src/chrome/browser/printing/print_view_manager_base.cc',
--      'chromium_src/chrome/browser/printing/print_view_manager_base.h',
--      'chromium_src/chrome/browser/printing/print_view_manager_basic.cc',
--      'chromium_src/chrome/browser/printing/print_view_manager_basic.h',
--      'chromium_src/chrome/browser/printing/print_view_manager_observer.h',
--      'chromium_src/chrome/browser/printing/printer_query.cc',
--      'chromium_src/chrome/browser/printing/printer_query.h',
--      'chromium_src/chrome/browser/printing/printing_message_filter.cc',
--      'chromium_src/chrome/browser/printing/printing_message_filter.h',
--      'chromium_src/chrome/browser/printing/print_preview_message_handler.cc',
--      'chromium_src/chrome/browser/printing/print_preview_message_handler.h',
--      'chromium_src/chrome/browser/process_singleton_posix.cc',
--      'chromium_src/chrome/browser/process_singleton_win.cc',
--      'chromium_src/chrome/browser/process_singleton.h',
--      'chromium_src/chrome/browser/speech/tts_controller.h',
--      'chromium_src/chrome/browser/speech/tts_controller_impl.cc',
--      'chromium_src/chrome/browser/speech/tts_controller_impl.h',
--      'chromium_src/chrome/browser/speech/tts_linux.cc',
--      'chromium_src/chrome/browser/speech/tts_mac.mm',
--      'chromium_src/chrome/browser/speech/tts_message_filter.cc',
--      'chromium_src/chrome/browser/speech/tts_message_filter.h',
--      'chromium_src/chrome/browser/speech/tts_platform.cc',
--      'chromium_src/chrome/browser/speech/tts_platform.h',
--      'chromium_src/chrome/browser/speech/tts_win.cc',
--      'chromium_src/chrome/browser/ssl/security_state_tab_helper.cc',
--      'chromium_src/chrome/browser/ssl/security_state_tab_helper.h',
--      'chromium_src/chrome/browser/ui/browser_dialogs.h',
--      'chromium_src/chrome/browser/ui/cocoa/color_chooser_mac.mm',
--      'chromium_src/chrome/browser/ui/views/color_chooser_aura.cc',
--      'chromium_src/chrome/browser/ui/views/color_chooser_aura.h',
--      'chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc',
--      'chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h',
--      'chromium_src/chrome/common/chrome_constants.cc',
--      'chromium_src/chrome/common/chrome_constants.h',
--      'chromium_src/chrome/common/chrome_paths.cc',
--      'chromium_src/chrome/common/chrome_paths.h',
--      'chromium_src/chrome/common/chrome_paths_internal.h',
--      'chromium_src/chrome/common/chrome_paths_linux.cc',
--      'chromium_src/chrome/common/chrome_paths_mac.mm',
--      'chromium_src/chrome/common/chrome_paths_win.cc',
--      'chromium_src/chrome/common/pref_names.cc',
--      'chromium_src/chrome/common/pref_names.h',
--      'chromium_src/chrome/common/print_messages.cc',
--      'chromium_src/chrome/common/print_messages.h',
--      'chromium_src/chrome/common/tts_messages.h',
--      'chromium_src/chrome/common/tts_utterance_request.cc',
--      'chromium_src/chrome/common/tts_utterance_request.h',
--      'chromium_src/chrome/common/widevine_cdm_constants.cc',
--      'chromium_src/chrome/common/widevine_cdm_constants.h',
--      'chromium_src/chrome/renderer/media/chrome_key_systems.cc',
--      'chromium_src/chrome/renderer/media/chrome_key_systems.h',
--      'chromium_src/chrome/renderer/printing/print_web_view_helper.cc',
--      'chromium_src/chrome/renderer/printing/print_web_view_helper_linux.cc',
--      'chromium_src/chrome/renderer/printing/print_web_view_helper_mac.mm',
--      'chromium_src/chrome/renderer/printing/print_web_view_helper_pdf_win.cc',
--      'chromium_src/chrome/renderer/printing/print_web_view_helper.h',
--      'chromium_src/chrome/renderer/spellchecker/spellcheck_worditerator.cc',
--      'chromium_src/chrome/renderer/spellchecker/spellcheck_worditerator.h',
--      'chromium_src/chrome/renderer/tts_dispatcher.cc',
--      'chromium_src/chrome/renderer/tts_dispatcher.h',
--      'chromium_src/chrome/utility/utility_message_handler.h',
--      'chromium_src/extensions/browser/app_window/size_constraints.cc',
--      'chromium_src/extensions/browser/app_window/size_constraints.h',
--      'chromium_src/extensions/common/url_pattern.cc',
--      'chromium_src/extensions/common/url_pattern.h',
--      'chromium_src/library_loaders/libspeechd_loader.cc',
--      'chromium_src/library_loaders/libspeechd.h',
--      '<@(native_mate_files)',
--      '<(SHARED_INTERMEDIATE_DIR)/atom_natives.h',
--    ],
--    'lib_sources_linux': [
--      'chromium_src/chrome/browser/icon_loader_auralinux.cc',
--    ],
--    'lib_sources_nss': [
--      'chromium_src/chrome/browser/certificate_manager_model.cc',
--      'chromium_src/chrome/browser/certificate_manager_model.h',
--    ],
--    'lib_sources_win': [
--      'chromium_src/chrome/browser/ui/views/color_chooser_dialog.cc',
--      'chromium_src/chrome/browser/ui/views/color_chooser_dialog.h',
--      'chromium_src/chrome/browser/ui/views/color_chooser_win.cc',
--      'chromium_src/chrome/browser/printing/pdf_to_emf_converter.cc',
--      'chromium_src/chrome/browser/printing/pdf_to_emf_converter.h',
--      'chromium_src/chrome/utility/printing_handler_win.cc',
--      'chromium_src/chrome/utility/printing_handler_win.h',
--    ],
--    'framework_sources': [
--      'atom/app/atom_library_main.h',
--      'atom/app/atom_library_main.mm',
--    ],
--    'login_helper_sources': [
--      'atom/app/atom_login_helper.mm',
--    ],
--    'locales': [
--      'am', 'ar', 'bg', 'bn', 'ca', 'cs', 'da', 'de', 'el', 'en-GB',
--      'en-US', 'es-419', 'es', 'et', 'fa', 'fi', 'fil', 'fr', 'gu', 'he',
--      'hi', 'hr', 'hu', 'id', 'it', 'ja', 'kn', 'ko', 'lt', 'lv',
--      'ml', 'mr', 'ms', 'nb', 'nl', 'pl', 'pt-BR', 'pt-PT', 'ro', 'ru',
--      'sk', 'sl', 'sr', 'sv', 'sw', 'ta', 'te', 'th', 'tr', 'uk',
--      'vi', 'zh-CN', 'zh-TW',
--    ],
--    'conditions': [
--      ['OS=="win"', {
--        'app_sources': [
--          'atom/browser/resources/win/resource.h',
--          'atom/browser/resources/win/atom.ico',
--          'atom/browser/resources/win/atom.rc',
--          # Cursors.
--          '<(libchromiumcontent_src_dir)/ui/resources/cursors/aliasb.cur',
--          '<(libchromiumcontent_src_dir)/ui/resources/cursors/cell.cur',
--          '<(libchromiumcontent_src_dir)/ui/resources/cursors/col_resize.cur',
--          '<(libchromiumcontent_src_dir)/ui/resources/cursors/copy.cur',
--          '<(libchromiumcontent_src_dir)/ui/resources/cursors/hand_grab.cur',
--          '<(libchromiumcontent_src_dir)/ui/resources/cursors/hand_grabbing.cur',
--          '<(libchromiumcontent_src_dir)/ui/resources/cursors/none.cur',
--          '<(libchromiumcontent_src_dir)/ui/resources/cursors/pan_east.cur',
--          '<(libchromiumcontent_src_dir)/ui/resources/cursors/pan_middle.cur',
--          '<(libchromiumcontent_src_dir)/ui/resources/cursors/pan_north.cur',
--          '<(libchromiumcontent_src_dir)/ui/resources/cursors/pan_north_east.cur',
--          '<(libchromiumcontent_src_dir)/ui/resources/cursors/pan_north_west.cur',
--          '<(libchromiumcontent_src_dir)/ui/resources/cursors/pan_south.cur',
--          '<(libchromiumcontent_src_dir)/ui/resources/cursors/pan_south_east.cur',
--          '<(libchromiumcontent_src_dir)/ui/resources/cursors/pan_south_west.cur',
--          '<(libchromiumcontent_src_dir)/ui/resources/cursors/pan_west.cur',
--          '<(libchromiumcontent_src_dir)/ui/resources/cursors/row_resize.cur',
--          '<(libchromiumcontent_src_dir)/ui/resources/cursors/vertical_text.cur',
--          '<(libchromiumcontent_src_dir)/ui/resources/cursors/zoom_in.cur',
--          '<(libchromiumcontent_src_dir)/ui/resources/cursors/zoom_out.cur',
--        ],
--      }],  # OS=="win"
--      ['enable_desktop_capturer==1', {
--        'js_sources': [
--          'lib/browser/desktop-capturer.js',
--          'lib/renderer/api/desktop-capturer.js',
--        ],
--        'lib_sources': [
--          'atom/browser/api/atom_api_desktop_capturer.cc',
--          'atom/browser/api/atom_api_desktop_capturer.h',
--        ],
--      }],  # enable_desktop_capturer
--      ['enable_osr==1', {
--        'lib_sources': [
--          'atom/browser/api/atom_api_web_contents_osr.cc',
--          'atom/browser/osr/osr_web_contents_view_mac.mm',
--          'atom/browser/osr/osr_web_contents_view.cc',
--          'atom/browser/osr/osr_web_contents_view.h',
--          'atom/browser/osr/osr_output_device.cc',
--          'atom/browser/osr/osr_output_device.h',
--          'atom/browser/osr/osr_render_widget_host_view.cc',
--          'atom/browser/osr/osr_render_widget_host_view.h',
--          'atom/browser/osr/osr_render_widget_host_view_mac.mm',
--          'atom/browser/osr/osr_view_proxy.cc',
--          'atom/browser/osr/osr_view_proxy.h',
--        ],
--      }],  # enable_osr==1
--      ['enable_pdf_viewer==1', {
--        'lib_sources': [
--          'atom/browser/ui/webui/pdf_viewer_handler.cc',
--          'atom/browser/ui/webui/pdf_viewer_handler.h',
--          'atom/browser/ui/webui/pdf_viewer_ui.cc',
--          'atom/browser/ui/webui/pdf_viewer_ui.h',
--          'chromium_src/components/pdf/renderer/pepper_pdf_host.cc',
--          'chromium_src/components/pdf/renderer/pepper_pdf_host.h',
--          '<(SHARED_INTERMEDIATE_DIR)/grit/pdf_viewer_resources_map.cc',
--          '<(SHARED_INTERMEDIATE_DIR)/grit/pdf_viewer_resources_map.h',
--        ],
--      }],  # enable_pdf_viewer
--      ['enable_run_as_node==1', {
--        'lib_sources': [
--          'atom/app/node_main.cc',
--          'atom/app/node_main.h',
--        ],
--      }],  # enable_run_as_node
--      ['enable_view_api==1', {
--        'js_sources': [
--          'lib/browser/api/box-layout.js',
--          'lib/browser/api/button.js',
--          'lib/browser/api/label-button.js',
--          'lib/browser/api/layout-manager.js',
--          'lib/browser/api/text-field.js',
--        ],
--        'lib_sources': [
--          'atom/browser/api/atom_api_box_layout.cc',
--          'atom/browser/api/atom_api_box_layout.h',
--          'atom/browser/api/atom_api_button.cc',
--          'atom/browser/api/atom_api_button.h',
--          'atom/browser/api/atom_api_label_button.cc',
--          'atom/browser/api/atom_api_label_button.h',
--          'atom/browser/api/atom_api_layout_manager.cc',
--          'atom/browser/api/atom_api_layout_manager.h',
--          'atom/browser/api/atom_api_text_field.cc',
--          'atom/browser/api/atom_api_text_field.h',
--        ],
--      }],  # enable_view_api
--      ['mas_build==1', {
--        'lib_sources': [
--          'atom/browser/api/atom_api_app_mas.mm',
--        ],
--      }],  # mas_build==1
--    ],
--  },
--}
-changed in both
-  base   100644 1f65283eff02d2187ac2dc3f8ef02addde387959 package.json
-  our    100644 c081cd89450cd50efba1ec280ff1349a96ea3ce0 package.json
-  their  100644 bc5c0e28bd7eca2b44cc08becdbe72e6f81942e8 package.json
-@@ -45,17 +45,9 @@
-   "private": true,
-   "scripts": {
-     "asar": "asar",
--    "bootstrap:dev": "python ./script/bootstrap.py -d -v",
--    "bootstrap": "python ./script/bootstrap.py -v",
-     "browserify": "browserify",
-     "bump-version": "./script/bump-version.py",
--    "build": "python ./script/build.py",
--    "build:dev": "python ./script/build.py -c D",
--    "build:release": "python ./script/build.py -c R",
--    "rebuild-test-modules": "python ./script/rebuild-test-modules.py",
-     "check-tls": "python ./script/tls.py",
--    "clean": "python ./script/clean.py",
--    "clean-build": "python ./script/clean.py --build",
-     "clang-format": "find atom/ brightray/ chromium_src/ -iname *.h -o -iname *.cc -o -iname *.mm | xargs clang-format -i",
-     "coverage": "npm run instrument-code-coverage && npm test -- --use_instrumented_asar",
-     "instrument-code-coverage": "electabul instrument --input-path ./lib --output-path ./out/coverage/electron.asar",
-@@ -76,7 +68,6 @@
-     "prepack": "check-for-leaks",
-     "prepush": "check-for-leaks",
-     "prepare-release": "node ./script/prepare-release.js",
--    "prerelease": "python ./script/bootstrap.py -v --dev && npm run build",
-     "release": "node ./script/release.js",
-     "repl": "python ./script/start.py --interactive",
-     "start": "python ./script/start.py",
-removed in remote
-  base   100755 e4aaf89e216b0164f15882a3040e8cac70bf1fd9 script/bootstrap.py
-  our    100755 e4aaf89e216b0164f15882a3040e8cac70bf1fd9 script/bootstrap.py
-@@ -1,300 +0,0 @@
--#!/usr/bin/env python
--
--import argparse
--import errno
--import os
--import re
--import subprocess
--import sys
--
--from lib.config import BASE_URL, PLATFORM, MIPS64EL_SYSROOT_URL, \
--                       MIPS64EL_GCC, MIPS64EL_GCC_URL, enable_verbose_mode, \
--                       is_verbose_mode, get_target_arch
--from lib.util import execute, execute_stdout, get_electron_version, \
--                     scoped_cwd, download, update_node_modules
--from tls import check_tls
--
--SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
--VENDOR_DIR = os.path.join(SOURCE_ROOT, 'vendor')
--DOWNLOAD_DIR = os.path.join(VENDOR_DIR, 'download')
--PYTHON_26_URL = 'https://chromium.googlesource.com/chromium/deps/python_26'
--
--def main():
--  os.chdir(SOURCE_ROOT)
--
--  args = parse_args()
--  defines = args_to_defines(args)
--  if not args.yes and PLATFORM != 'win32':
--    check_root()
--  if args.verbose:
--    enable_verbose_mode()
--  if sys.platform == 'cygwin':
--    update_win32_python()
--
--  check_tls(args.verbose)
--
--  update_submodules()
--
--  libcc_source_path = args.libcc_source_path
--  libcc_shared_library_path = args.libcc_shared_library_path
--  libcc_static_library_path = args.libcc_static_library_path
--
--  if args.target_arch == 'mips64el':
--    download_mips64el_toolchain()
--
--  if args.target_arch.startswith('arm'):
--    download_native_mksnapshot(args.target_arch)
--
--  # Redirect to use local libchromiumcontent build.
--  if args.build_release_libcc or args.build_debug_libcc:
--    build_libchromiumcontent(args.verbose, args.target_arch,
--                             args.build_debug_libcc, args.update_libcc)
--    dist_dir = os.path.join(VENDOR_DIR, 'libchromiumcontent', 'dist', 'main')
--    libcc_source_path = os.path.join(dist_dir, 'src')
--    libcc_shared_library_path = os.path.join(dist_dir, 'shared_library')
--    libcc_static_library_path = os.path.join(dist_dir, 'static_library')
--
--  if PLATFORM != 'win32':
--    if not args.disable_clang and args.clang_dir == '':
--      # Download prebuilt clang binaries.
--      update_clang()
--
--  setup_python_libs()
--  update_node_modules('.')
--  setup_libchromiumcontent(args.dev, args.target_arch, args.url,
--                           libcc_source_path, libcc_shared_library_path,
--                           libcc_static_library_path)
--
--  if PLATFORM == 'linux' and args.target_arch != 'mips64el':
--    download_sysroot(args.target_arch)
--
--  create_chrome_version_h()
--  touch_config_gypi()
--  run_update(defines, args.msvs)
--
--
--def parse_args():
--  parser = argparse.ArgumentParser(description='Bootstrap this project')
--  parser.add_argument('-u', '--url',
--                      help='The base URL from which to download '
--                      'libchromiumcontent (i.e., the URL you passed to '
--                      'libchromiumcontent\'s script/upload script',
--                      default=BASE_URL,
--                      required=False)
--  parser.add_argument('-v', '--verbose',
--                      action='store_true',
--                      help='Prints the output of the subprocesses')
--  parser.add_argument('-d', '--dev', action='store_true',
--                      help='Do not download static_library build')
--  parser.add_argument('-y', '--yes', '--assume-yes',
--                      action='store_true',
--                      help='Run non-interactively by assuming "yes" to all ' \
--                           'prompts.')
--  parser.add_argument('--msvs', action='store_true',
--                      help='Generate Visual Studio project')
--  parser.add_argument('--target_arch', default=get_target_arch(),
--                      help='Manually specify the arch to build for')
--  parser.add_argument('--clang_dir', default='', help='Path to clang binaries')
--  parser.add_argument('--disable_clang', action='store_true',
--                      help='Use compilers other than clang for building')
--  build_libcc = parser.add_mutually_exclusive_group()
--  build_libcc.add_argument('--build_release_libcc', action='store_true',
--                           help='Build release version of libchromiumcontent')
--  build_libcc.add_argument('--build_debug_libcc', action='store_true',
--                           help='Build debug version of libchromiumcontent')
--  parser.add_argument('--update_libcc', default=False,
--                      action='store_true', help=('force gclient invocation to '
--                      'update libchromiumcontent'))
--  parser.add_argument('--libcc_source_path', required=False,
--                      help='The source path of libchromiumcontent. ' \
--                           'NOTE: All options of libchromiumcontent are ' \
--                           'required OR let electron choose it')
--  parser.add_argument('--libcc_shared_library_path', required=False,
--                      help='The shared library path of libchromiumcontent.')
--  parser.add_argument('--libcc_static_library_path', required=False,
--                      help='The static library path of libchromiumcontent.')
--  parser.add_argument('--defines', default='',
--                      help='The build variables passed to gyp')
--  parser.add_argument('--cc_wrapper',
--                      help='Sets cc_wrapper for build. E.g. $(which sccache)')
--  return parser.parse_args()
--
--
--def args_to_defines(args):
--  defines = args.defines
--  if args.disable_clang:
--    defines += ' clang=0'
--  if args.clang_dir:
--    defines += ' make_clang_dir=' + args.clang_dir
--    defines += ' clang_use_chrome_plugins=0'
--  if args.cc_wrapper is not None:
--    defines += ' cc_wrapper=' + args.cc_wrapper
--  return defines
--
--
--def check_root():
--  if os.geteuid() == 0:
--    print "We suggest not running this as root, unless you're really sure."
--    choice = raw_input("Do you want to continue? [y/N]: ")
--    if choice not in ('y', 'Y'):
--      sys.exit(0)
--
--
--def update_submodules():
--  execute_stdout(['git', 'submodule', 'sync', '--recursive'])
--  execute_stdout(['git', 'submodule', 'update', '--init', '--recursive'])
--
--
--def setup_python_libs():
--  for lib in ('requests', 'boto'):
--    with scoped_cwd(os.path.join(VENDOR_DIR, lib)):
--      execute_stdout([sys.executable, 'setup.py', 'build'])
--
--
--def setup_libchromiumcontent(is_dev, target_arch, url,
--                             libcc_source_path,
--                             libcc_shared_library_path,
--                             libcc_static_library_path):
--  target_dir = os.path.join(DOWNLOAD_DIR, 'libchromiumcontent')
--  script = os.path.join(VENDOR_DIR, 'libchromiumcontent', 'script',
--                        'download')
--  args = ['-f', '-c', get_libchromiumcontent_commit(), '--target_arch',
--          target_arch, url, target_dir]
--  if (libcc_source_path != None and
--      libcc_shared_library_path != None and
--      libcc_static_library_path != None):
--    args += ['--libcc_source_path', libcc_source_path,
--            '--libcc_shared_library_path', libcc_shared_library_path,
--            '--libcc_static_library_path', libcc_static_library_path]
--    mkdir_p(target_dir)
--  else:
--    mkdir_p(DOWNLOAD_DIR)
--  if is_verbose_mode():
--    args += ['-v']
--  if is_dev:
--    subprocess.check_call([sys.executable, script] + args)
--  else:
--    subprocess.check_call([sys.executable, script, '-s'] + args)
--
--
--def update_win32_python():
--  with scoped_cwd(VENDOR_DIR):
--    if not os.path.exists('python_26'):
--      execute_stdout(['git', 'clone', PYTHON_26_URL])
--
--
--def build_libchromiumcontent(verbose, target_arch, debug,
--                             force_update):
--  args = [sys.executable,
--          os.path.join(SOURCE_ROOT, 'script', 'build-libchromiumcontent.py')]
--  if debug:
--    args += ['-d']
--  if force_update:
--    args += ['--force-update']
--  if verbose:
--    args += ['-v']
--  execute_stdout(args + ['--target_arch', target_arch])
--
--
--def update_clang():
--  execute_stdout([os.path.join(SOURCE_ROOT, 'script', 'update-clang.sh')])
--
--
--def download_sysroot(target_arch):
--  if target_arch == 'ia32':
--    target_arch = 'i386'
--  if target_arch == 'x64':
--    target_arch = 'amd64'
--  execute_stdout([sys.executable,
--                  os.path.join(SOURCE_ROOT, 'script', 'install-sysroot.py'),
--                  '--arch', target_arch],
--                  cwd=VENDOR_DIR)
--
--
--def download_mips64el_toolchain():
--  # Download sysroot image.
--  if not os.path.exists(os.path.join(VENDOR_DIR,
--                                     'debian_jessie_mips64-sysroot')):
--    tar_name = 'debian_jessie_mips64-sysroot.tar.bz2'
--    download(tar_name, MIPS64EL_SYSROOT_URL,
--             os.path.join(SOURCE_ROOT, tar_name))
--    subprocess.call(['tar', '-jxf', tar_name, '-C', VENDOR_DIR])
--    os.remove(tar_name)
--  # Download toolchain.
--  if not os.path.exists(os.path.join(VENDOR_DIR, MIPS64EL_GCC)):
--    tar_name = MIPS64EL_GCC + '.tar.gz'
--    download(tar_name, MIPS64EL_GCC_URL, os.path.join(SOURCE_ROOT, tar_name))
--    subprocess.check_call(['tar', '-xf', tar_name, '-C', VENDOR_DIR])
--    os.remove(tar_name)
--
--def download_native_mksnapshot(arch):
--  if not os.path.exists(os.path.join(VENDOR_DIR,
--                                     'native_mksnapshot')):
--    tar_name = 'native-mksnapshot.tar.bz2'
--    url = '{0}/linux/{1}/{2}/{3}'.format(BASE_URL, arch,
--           get_libchromiumcontent_commit(), tar_name)
--    download(tar_name, url, os.path.join(SOURCE_ROOT, tar_name))
--    subprocess.call(['tar', '-jxf', tar_name, '-C', VENDOR_DIR])
--    os.remove(tar_name)
--
--def create_chrome_version_h():
--  version_file = os.path.join(VENDOR_DIR, 'libchromiumcontent', 'VERSION')
--  target_file = os.path.join(SOURCE_ROOT, 'atom', 'common', 'chrome_version.h')
--  template_file = os.path.join(SOURCE_ROOT, 'script', 'chrome_version.h.in')
--
--  with open(version_file, 'r') as f:
--    version = f.read()
--  with open(template_file, 'r') as f:
--    template = f.read()
--  content = template.replace('{PLACEHOLDER}', version.strip())
--
--  # We update the file only if the content has changed (ignoring line ending
--  # differences).
--  should_write = True
--  if os.path.isfile(target_file):
--    with open(target_file, 'r') as f:
--      should_write = f.read().replace('r', '') != content.replace('r', '')
--  if should_write:
--    with open(target_file, 'w') as f:
--      f.write(content)
--
--
--def touch_config_gypi():
--  config_gypi = os.path.join(SOURCE_ROOT, 'vendor', 'node', 'config.gypi')
--  with open(config_gypi, 'w+') as f:
--    content = "\n{'variables':{}}"
--    if f.read() != content:
--      f.write(content)
--
--
--def run_update(defines, msvs):
--  args = [sys.executable, os.path.join(SOURCE_ROOT, 'script', 'update.py')]
--  if defines:
--    args += ['--defines', defines]
--  if msvs:
--    args += ['--msvs']
--
--  execute_stdout(args)
--
--
--def get_libchromiumcontent_commit():
--  commit = os.getenv('LIBCHROMIUMCONTENT_COMMIT')
--  if commit:
--    return commit
--
--  # Extract full SHA-1 of libcc submodule commit
--  output = execute(['git', 'submodule', 'status', 'vendor/libchromiumcontent'])
--  commit = re.split('^(?:\s*)([a-f0-9]{40})(?:\s+)', output)[1]
--  return commit
--
--
--def mkdir_p(path):
--  try:
--    os.makedirs(path)
--  except OSError as e:
--    if e.errno != errno.EEXIST:
--      raise
--
--
--if __name__ == '__main__':
--  sys.exit(main())
-removed in remote
-  base   100755 fb2b95d3bb71a25ce1ca58acf596afdc0f2cc5bd script/build.py
-  our    100755 fb2b95d3bb71a25ce1ca58acf596afdc0f2cc5bd script/build.py
-@@ -1,106 +0,0 @@
--#!/usr/bin/env python
--
--import argparse
--import os
--import subprocess
--import sys
--
--from lib.config import MIPS64EL_GCC, get_target_arch, build_env, \
--                       enable_verbose_mode, is_verbose_mode
--from lib.util import electron_gyp, import_vs_env
--
--
--CONFIGURATIONS = ['Release', 'Debug']
--SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
--VENDOR_DIR = os.path.join(SOURCE_ROOT, 'vendor')
--LIBCC_SOURCE_ROOT = os.path.join(SOURCE_ROOT, 'vendor', 'libchromiumcontent')
--LIBCC_DIST_MAIN = os.path.join(LIBCC_SOURCE_ROOT, 'dist', 'main')
--GCLIENT_DONE = os.path.join(SOURCE_ROOT, '.gclient_done')
--
--
--def main():
--  os.chdir(SOURCE_ROOT)
--
--  args = parse_args()
--  if args.verbose:
--    enable_verbose_mode()
--
--  # Update the VS build env.
--  import_vs_env(get_target_arch())
--
--  # decide which ninja executable to use
--  ninja_path = args.ninja_path
--  if not ninja_path:
--    ninja_path = os.path.join('vendor', 'depot_tools', 'ninja')
--    if sys.platform == 'win32':
--      ninja_path += '.exe'
--
--  # decide how to invoke ninja
--  ninja = [ninja_path]
--  if is_verbose_mode():
--    ninja.append('-v')
--
--  if args.libcc:
--    if ('D' not in args.configuration
--        or not os.path.exists(GCLIENT_DONE)
--        or not os.path.exists(os.path.join(LIBCC_DIST_MAIN, 'build.ninja'))):
--      sys.stderr.write('--libcc should only be used when '
--                       'libchromiumcontent was built with bootstrap.py -d '
--                       '--debug_libchromiumcontent' + os.linesep)
--      sys.exit(1)
--    script = os.path.join(LIBCC_SOURCE_ROOT, 'script', 'build')
--    subprocess.check_call([sys.executable, script, '-D', '-t',
--                           get_target_arch()])
--    subprocess.check_call(ninja + ['-C', LIBCC_DIST_MAIN])
--
--  env = build_env()
--  for config in args.configuration:
--    build_path = os.path.join('out', config[0])
--    build_args = ['-C', build_path, args.target]
--    if args.compdb:
--      build_args += ['-t', 'compdb', 'cxx', 'cc']
--      compdb = open(r'compile_commands.json','w')
--      ret = subprocess.call(ninja + build_args, env=env, stdout=compdb)
--      compdb.close()
--    else:
--      ret = subprocess.call(ninja + build_args, env=env)
--    if ret != 0:
--      sys.exit(ret)
--
--
--def parse_args():
--  parser = argparse.ArgumentParser(description='Build project')
--  parser.add_argument('-c', '--configuration',
--                      help='Build with Release or Debug configuration',
--                      nargs='+',
--                      default=CONFIGURATIONS,
--                      required=False)
--  parser.add_argument('-v', '--verbose',
--                      action='store_true',
--                      default=False,
--                      help='Verbose output')
--  parser.add_argument('-t', '--target',
--                      help='Build specified target',
--                      default=electron_gyp()['project_name%'],
--                      required=False)
--  parser.add_argument('--libcc',
--                      help=(
--                        'Build libchromiumcontent first. Should be used only '
--                        'when libchromiumcontent as built with boostrap.py '
--                        '-d --debug_libchromiumcontent.'
--                      ),
--                      action='store_true', default=False)
--  parser.add_argument('--ninja-path',
--                      help='Path of ninja command to use.',
--                      required=False)
--  parser.add_argument('--compdb',
--                      help=(
--                        'Generate JSON compilation database. This will not '
--                        'trigger actual build. '
--                      ),
--                      action='store_true', default=False)
--  return parser.parse_args()
--
--
--if __name__ == '__main__':
--  sys.exit(main())
-removed in remote
-  base   100755 d1ccaa252db32a0c0d19513136bd12597809d811 script/clean.py
-  our    100755 d1ccaa252db32a0c0d19513136bd12597809d811 script/clean.py
-@@ -1,46 +0,0 @@
--#!/usr/bin/env python
--
--import argparse
--import os
--import sys
--
--from lib.util import rm_rf
--
--
--SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
--
--
--def main():
--  os.chdir(SOURCE_ROOT)
--
--  args = parse_args()
--
--  remove_directory('dist')
--  remove_directory('out')
--
--  if not args.build:
--    remove_directory('node_modules')
--    remove_directory('spec/node_modules')
--
--    remove_directory('vendor/download/libchromiumcontent')
--    remove_directory('vendor/libchromiumcontent/src')
--
--    remove_directory(os.path.expanduser('~/.node-gyp'))
--
--
--def parse_args():
--  parser = argparse.ArgumentParser(description='Remove generated and' \
--                                               'downloaded build files')
--  parser.add_argument('-b', '--build',
--                      help='Only remove out and dist directories',
--                      action='store_true')
--  return parser.parse_args()
--
--
--def remove_directory(directory):
--  print 'Removing %s' % directory
--  rm_rf(directory)
--
--
--if __name__ == '__main__':
--  sys.exit(main())
-removed in remote
-  base   100755 ae5ce3707c38e61716f96cf5e7627cc909597fb8 script/create-dist.py
-  our    100755 4a6c0c7ce8f275175e48c4c380ff33627f7a5961 script/create-dist.py
-@@ -1,372 +0,0 @@
--#!/usr/bin/env python
--
--import argparse
--import glob
--import os
--import re
--import shutil
--import subprocess
--import sys
--import stat
--if sys.platform == "win32":
--  import _winreg
--
--from lib.config import BASE_URL, PLATFORM, build_env, \
--                       enable_verbose_mode, get_target_arch, get_zip_name
--
--from lib.util import add_exec_bit, electron_features, electron_gyp, \
--                     execute, get_electron_version, make_zip, \
--                     parse_version, rm_rf, scoped_cwd
--
--from lib.env_util import get_vs_location
--
--
--ELECTRON_VERSION = get_electron_version()
--
--SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
--DIST_DIR = os.path.join(SOURCE_ROOT, 'dist')
--OUT_DIR = os.path.join(SOURCE_ROOT, 'out', 'R')
--CHROMIUM_DIR = os.path.join(SOURCE_ROOT, 'vendor', 'download',
--                            'libchromiumcontent', 'static_library')
--NATIVE_MKSNAPSHOT_DIR = os.path.join(SOURCE_ROOT, 'vendor', 'native_mksnapshot')
--
--PROJECT_NAME = electron_gyp()['project_name%']
--PRODUCT_NAME = electron_gyp()['product_name%']
--PDF_VIEWER_ENABLED = electron_features()['enable_pdf_viewer%']
--
--TARGET_BINARIES = {
--  'darwin': [
--  ],
--  'win32': [
--    '{0}.exe'.format(PROJECT_NAME),  # 'electron.exe'
--    'content_shell.pak',
--    'd3dcompiler_47.dll',
--    'icudtl.dat',
--    'libEGL.dll',
--    'libGLESv2.dll',
--    'ffmpeg.dll',
--    'node.dll',
--    'blink_image_resources_200_percent.pak',
--    'content_resources_200_percent.pak',
--    'ui_resources_200_percent.pak',
--    'views_resources_200_percent.pak',
--    'natives_blob.bin',
--    'v8_context_snapshot.bin',
--  ],
--  'linux': [
--    PROJECT_NAME,  # 'electron'
--    'content_shell.pak',
--    'icudtl.dat',
--    'libffmpeg.so',
--    'libnode.so',
--    'blink_image_resources_200_percent.pak',
--    'content_resources_200_percent.pak',
--    'ui_resources_200_percent.pak',
--    'views_resources_200_percent.pak',
--    'natives_blob.bin',
--    'v8_context_snapshot.bin',
--  ],
--}
--TARGET_BINARIES_EXT = []
--TARGET_DIRECTORIES = {
--  'darwin': [
--    '{0}.app'.format(PRODUCT_NAME),
--  ],
--  'win32': [
--    'resources',
--    'locales',
--  ],
--  'linux': [
--    'resources',
--    'locales',
--  ],
--}
--
--
--def main():
--  args = parse_args()
--
--  if args.chromium_dir:
--    globals().update(CHROMIUM_DIR=args.chromium_dir)
--
--  if args.verbose:
--    enable_verbose_mode()
--
--  rm_rf(DIST_DIR)
--  os.makedirs(DIST_DIR)
--
--  force_build()
--  create_symbols()
--  copy_binaries()
--  copy_chrome_binary('chromedriver')
--  copy_chrome_binary('mksnapshot')
--  copy_license()
--  if PLATFORM == 'win32':
--    copy_vcruntime_binaries()
--    copy_ucrt_binaries()
--
--  if PLATFORM != 'win32' and not args.no_api_docs:
--    create_api_json_schema()
--    create_typescript_definitions()
--
--  if PLATFORM == 'linux':
--    strip_binaries()
--
--  create_version()
--  create_dist_zip()
--  create_chrome_binary_zip('chromedriver', ELECTRON_VERSION)
--  create_chrome_binary_zip('mksnapshot', ELECTRON_VERSION)
--  create_ffmpeg_zip()
--  create_symbols_zip()
--
--
--def force_build():
--  build = os.path.join(SOURCE_ROOT, 'script', 'build.py')
--  execute([sys.executable, build, '-c', 'Release'])
--
--
--def copy_binaries():
--  for binary in TARGET_BINARIES[PLATFORM]:
--    shutil.copy2(os.path.join(OUT_DIR, binary), DIST_DIR)
--
--  if PLATFORM != 'darwin' and PDF_VIEWER_ENABLED:
--    shutil.copy2(os.path.join(OUT_DIR, 'pdf_viewer_resources.pak'),
--                 DIST_DIR)
--
--  for directory in TARGET_DIRECTORIES[PLATFORM]:
--    shutil.copytree(os.path.join(OUT_DIR, directory),
--                    os.path.join(DIST_DIR, directory),
--                    symlinks=True)
--
--
--def copy_chrome_binary(binary):
--  if PLATFORM == 'win32':
--    binary += '.exe'
--  src = os.path.join(CHROMIUM_DIR, binary)
--  dest = os.path.join(DIST_DIR, binary)
--
--  # Copy file and keep the executable bit.
--  shutil.copyfile(src, dest)
--  add_exec_bit(dest)
--
--def copy_vcruntime_binaries():
--  arch = get_target_arch()
--  if arch == "ia32":
--    arch = "x86"
--  subkey = r"SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\\"
--  with _winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE, subkey + arch, 0,
--                       _winreg.KEY_READ | _winreg.KEY_WOW64_32KEY) as key:
--    runtime_version = _winreg.QueryValueEx(key, "Version")[0][1:]
--
--  version_parts = parse_version(runtime_version)
--  if len(version_parts) > 3:
--    runtime_version = '.'.join(version_parts[0:3])
--
--  vs_location = get_vs_location('[15.0,16.0)')
--
--  crt_dir = os.path.join(vs_location, 'VC', 'Redist', 'MSVC', runtime_version,
--                          arch, 'Microsoft.VC141.CRT')
--
--  dlls = ["msvcp140.dll", "vcruntime140.dll"]
--
--  # Note: copyfile is used to remove the read-only flag
--  for dll in dlls:
--    shutil.copyfile(os.path.join(crt_dir, dll), os.path.join(DIST_DIR, dll))
--    TARGET_BINARIES_EXT.append(dll)
--
--
--def copy_ucrt_binaries():
--  with _winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE,
--                       r"SOFTWARE\Microsoft\Windows Kits\Installed Roots"
--                       ) as key:
--    ucrt_dir = _winreg.QueryValueEx(key, "KitsRoot10")[0]
--
--  arch = get_target_arch()
--  if arch == "ia32":
--    arch = "x86"
--
--  ucrt_dir += r"Redist\ucrt\DLLs\{0}".format(arch)
--
--  dlls = glob.glob(os.path.join(ucrt_dir, '*.dll'))
--  if len(dlls) == 0:
--    raise Exception('UCRT files not found')
--
--  for dll in dlls:
--    shutil.copy2(dll, DIST_DIR)
--    TARGET_BINARIES_EXT.append(os.path.basename(dll))
--
--
--def copy_license():
--  shutil.copy2(os.path.join(CHROMIUM_DIR, '..', 'LICENSES.chromium.html'),
--               DIST_DIR)
--  shutil.copy2(os.path.join(SOURCE_ROOT, 'LICENSE'), DIST_DIR)
--
--def create_api_json_schema():
--  node_bin_dir = os.path.join(SOURCE_ROOT, 'node_modules', '.bin')
--  env = os.environ.copy()
--  env['PATH'] = os.path.pathsep.join([node_bin_dir, env['PATH']])
--  outfile = os.path.relpath(os.path.join(DIST_DIR, 'electron-api.json'))
--  execute(['electron-docs-linter', 'docs', '--outfile={0}'.format(outfile),
--           '--version={}'.format(ELECTRON_VERSION.replace('v', ''))],
--          env=env)
--
--def create_typescript_definitions():
--  node_bin_dir = os.path.join(SOURCE_ROOT, 'node_modules', '.bin')
--  env = os.environ.copy()
--  env['PATH'] = os.path.pathsep.join([node_bin_dir, env['PATH']])
--  infile = os.path.relpath(os.path.join(DIST_DIR, 'electron-api.json'))
--  outfile = os.path.relpath(os.path.join(DIST_DIR, 'electron.d.ts'))
--  execute(['electron-typescript-definitions', '--in={0}'.format(infile),
--           '--out={0}'.format(outfile)], env=env)
--
--def strip_binaries():
--  for binary in TARGET_BINARIES[PLATFORM]:
--    if binary.endswith('.so') or '.' not in binary:
--      strip_binary(os.path.join(DIST_DIR, binary))
--
--
--def strip_binary(binary_path):
--  if get_target_arch() == 'arm':
--    strip = 'arm-linux-gnueabihf-strip'
--  elif get_target_arch() == 'arm64':
--    strip = 'aarch64-linux-gnu-strip'
--  elif get_target_arch() == 'mips64el':
--    strip = 'mips64el-redhat-linux-strip'
--  else:
--    strip = 'strip'
--  execute([strip, binary_path], env=build_env())
--
--
--def create_version():
--  version_path = os.path.join(SOURCE_ROOT, 'dist', 'version')
--  with open(version_path, 'w') as version_file:
--    version_file.write(ELECTRON_VERSION)
--
--
--def create_symbols():
--  if get_target_arch() == 'mips64el':
--    return
--
--  destination = os.path.join(DIST_DIR, '{0}.breakpad.syms'.format(PROJECT_NAME))
--  dump_symbols = os.path.join(SOURCE_ROOT, 'script', 'dump-symbols.py')
--  execute([sys.executable, dump_symbols, destination])
--
--  if PLATFORM == 'darwin':
--    dsyms = glob.glob(os.path.join(OUT_DIR, '*.dSYM'))
--    for dsym in dsyms:
--      shutil.copytree(dsym, os.path.join(DIST_DIR, os.path.basename(dsym)))
--  elif PLATFORM == 'win32':
--    pdbs = glob.glob(os.path.join(OUT_DIR, '*.pdb'))
--    for pdb in pdbs:
--      shutil.copy2(pdb, DIST_DIR)
--
--
--def create_dist_zip():
--  dist_name = get_zip_name(PROJECT_NAME, ELECTRON_VERSION)
--  zip_file = os.path.join(SOURCE_ROOT, 'dist', dist_name)
--
--  with scoped_cwd(DIST_DIR):
--    files = TARGET_BINARIES[PLATFORM] + TARGET_BINARIES_EXT + ['LICENSE',
--            'LICENSES.chromium.html', 'version']
--    if PLATFORM != 'darwin' and PDF_VIEWER_ENABLED:
--      files += ['pdf_viewer_resources.pak']
--    dirs = TARGET_DIRECTORIES[PLATFORM]
--    make_zip(zip_file, files, dirs)
--
--
--def create_chrome_binary_zip(binary, version):
--  file_suffix = ''
--  create_native_mksnapshot = False
--  if binary == 'mksnapshot':
--    arch = get_target_arch()
--    if arch.startswith('arm'):
--      # if the arch is arm/arm64 the mksnapshot executable is an x64 binary,
--      # so name it as such.
--      file_suffix = 'x64'
--      create_native_mksnapshot = True
--  dist_name = get_zip_name(binary, version, file_suffix)
--  zip_file = os.path.join(SOURCE_ROOT, 'dist', dist_name)
--
--  files = ['LICENSE', 'LICENSES.chromium.html']
--  if PLATFORM == 'win32':
--    files += [binary + '.exe']
--  else:
--    files += [binary]
--
--  with scoped_cwd(DIST_DIR):
--    make_zip(zip_file, files, [])
--
--  if create_native_mksnapshot == True:
--    # Create a zip with the native version of the mksnapshot binary.
--    src = os.path.join(NATIVE_MKSNAPSHOT_DIR, binary)
--    dest = os.path.join(DIST_DIR, binary)
--    # Copy file and keep the executable bit.
--    shutil.copyfile(src, dest)
--    add_exec_bit(dest)
--
--    dist_name = get_zip_name(binary, version)
--    zip_file = os.path.join(SOURCE_ROOT, 'dist', dist_name)
--    with scoped_cwd(DIST_DIR):
--      make_zip(zip_file, files, [])
--
--def create_ffmpeg_zip():
--  dist_name = get_zip_name('ffmpeg', ELECTRON_VERSION)
--  zip_file = os.path.join(SOURCE_ROOT, 'dist', dist_name)
--
--  if PLATFORM == 'darwin':
--    ffmpeg_name = 'libffmpeg.dylib'
--  elif PLATFORM == 'linux':
--    ffmpeg_name = 'libffmpeg.so'
--  elif PLATFORM == 'win32':
--    ffmpeg_name = 'ffmpeg.dll'
--
--  shutil.copy2(os.path.join(CHROMIUM_DIR, '..', 'ffmpeg', ffmpeg_name),
--               DIST_DIR)
--
--  if PLATFORM == 'linux':
--    strip_binary(os.path.join(DIST_DIR, ffmpeg_name))
--
--  with scoped_cwd(DIST_DIR):
--    make_zip(zip_file, [ffmpeg_name, 'LICENSE', 'LICENSES.chromium.html'], [])
--
--
--def create_symbols_zip():
--  if get_target_arch() == 'mips64el':
--    return
--
--  dist_name = get_zip_name(PROJECT_NAME, ELECTRON_VERSION, 'symbols')
--  zip_file = os.path.join(DIST_DIR, dist_name)
--  licenses = ['LICENSE', 'LICENSES.chromium.html', 'version']
--
--  with scoped_cwd(DIST_DIR):
--    dirs = ['{0}.breakpad.syms'.format(PROJECT_NAME)]
--    make_zip(zip_file, licenses, dirs)
--
--  if PLATFORM == 'darwin':
--    dsym_name = get_zip_name(PROJECT_NAME, ELECTRON_VERSION, 'dsym')
--    with scoped_cwd(DIST_DIR):
--      dsyms = glob.glob('*.dSYM')
--      make_zip(os.path.join(DIST_DIR, dsym_name), licenses, dsyms)
--  elif PLATFORM == 'win32':
--    pdb_name = get_zip_name(PROJECT_NAME, ELECTRON_VERSION, 'pdb')
--    with scoped_cwd(DIST_DIR):
--      pdbs = glob.glob('*.pdb')
--      make_zip(os.path.join(DIST_DIR, pdb_name), pdbs + licenses, [])
--
--
--def parse_args():
--  parser = argparse.ArgumentParser(description='Create Electron Distribution')
--  parser.add_argument('--no_api_docs',
--                      action='store_true',
--                      help='Skip generating the Electron API Documentation!')
--  parser.add_argument('--chromium_dir',
--                     help='Specify a custom libchromiumcontent dist directory '
--                        + 'if manually compiled')
--  parser.add_argument('-v', '--verbose',
--                      action='store_true',
--                      help='Prints the output of the subprocesses')
--  return parser.parse_args()
--
--
--if __name__ == '__main__':
--  sys.exit(main())
-removed in remote
-  base   100755 673de5c5b9a2e16f21b86b041dbda8b92f60c334 script/create-node-headers.py
-  our    100755 673de5c5b9a2e16f21b86b041dbda8b92f60c334 script/create-node-headers.py
-@@ -1,113 +0,0 @@
--#!/usr/bin/env python
--
--import argparse
--import os
--import shutil
--import sys
--import tarfile
--
--from lib.util import safe_mkdir, scoped_cwd
--
--
--SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
--DIST_DIR    = os.path.join(SOURCE_ROOT, 'dist')
--NODE_DIR    = os.path.join(SOURCE_ROOT, 'vendor', 'node')
--OUT_DIR     = os.path.join(SOURCE_ROOT, 'out', 'R')
--
--HEADERS_SUFFIX = [
--  '.h',
--  '.gypi',
--]
--HEADERS_DIRS = [
--  'src',
--  'deps/http_parser',
--  'deps/zlib',
--  'deps/uv',
--  'deps/npm',
--  'deps/mdb_v8',
--  'deps/v8/include'
--]
--HEADERS_FILES = [
--  'common.gypi',
--  'config.gypi',
--]
--
--
--def main():
--  args = parse_args()
--
--  safe_mkdir(args.directory)
--
--  node_headers_dir = os.path.join(args.directory,
--                                  'node-{0}'.format(args.version))
--  iojs_headers_dir = os.path.join(args.directory,
--                                  'iojs-{0}'.format(args.version))
--  iojs2_headers_dir = os.path.join(args.directory,
--                                   'iojs-{0}-headers'.format(args.version))
--
--  copy_headers(node_headers_dir)
--  create_header_tarball(args.directory, node_headers_dir)
--
--  copy_headers(iojs_headers_dir)
--  create_header_tarball(args.directory, iojs_headers_dir)
--
--  copy_headers(iojs2_headers_dir)
--  create_header_tarball(args.directory, iojs2_headers_dir)
--
--
--def parse_args():
--  parser = argparse.ArgumentParser(description='create node header tarballs')
--  parser.add_argument('-v', '--version', help='Specify the version',
--                      required=True)
--  parser.add_argument('-d', '--directory', help='Specify the output directory',
--                      default=DIST_DIR,
--                      required=False)
--  return parser.parse_args()
--
--
--def copy_headers(dist_headers_dir):
--  safe_mkdir(dist_headers_dir)
--
--  # Copy standard node headers from node. repository.
--  for include_path in HEADERS_DIRS:
--    abs_path = os.path.join(NODE_DIR, include_path)
--    for dirpath, _, filenames in os.walk(abs_path):
--      for filename in filenames:
--        extension = os.path.splitext(filename)[1]
--        if extension not in HEADERS_SUFFIX:
--          continue
--        copy_source_file(os.path.join(dirpath, filename), NODE_DIR,
--                         dist_headers_dir)
--  for other_file in HEADERS_FILES:
--    copy_source_file(os.path.join(NODE_DIR, other_file), NODE_DIR,
--                     dist_headers_dir)
--
--  # Copy V8 headers from chromium's repository.
--  src = os.path.join(SOURCE_ROOT, 'vendor', 'download', 'libchromiumcontent',
--                     'src')
--  for dirpath, _, filenames in os.walk(os.path.join(src, 'v8')):
--    for filename in filenames:
--      extension = os.path.splitext(filename)[1]
--      if extension not in HEADERS_SUFFIX:
--        continue
--      copy_source_file(os.path.join(dirpath, filename), src,
--                       os.path.join(dist_headers_dir, 'deps'))
--
--
--def create_header_tarball(directory, dist_headers_dir):
--  target = dist_headers_dir + '.tar.gz'
--  with scoped_cwd(directory):
--    tarball = tarfile.open(name=target, mode='w:gz')
--    tarball.add(os.path.relpath(dist_headers_dir))
--    tarball.close()
--
--
--def copy_source_file(source, start, destination):
--  relative = os.path.relpath(source, start=start)
--  final_destination = os.path.join(destination, relative)
--  safe_mkdir(os.path.dirname(final_destination))
--  shutil.copy2(source, final_destination)
--
--
--if __name__ == '__main__':
--  sys.exit(main())
-changed in both
-  base   100644 43fbe0e0378b20221319a1b8c065312375bdb663 script/lib/util.py
-  our    100644 d479d5a9556534c5d98ae1fdc97397cdd14376f5 script/lib/util.py
-  their  100644 6c1b9ccd7bfa3346ac1f59bff3412d1568698030 script/lib/util.py
-@@ -28,28 +28,6 @@
-   NPM += '.cmd'
- 
- 
--def get_host_arch():
--  """Returns the host architecture with a predictable string."""
--  host_arch = platform.machine()
--
--  # Convert machine type to format recognized by gyp.
--  if re.match(r'i.86', host_arch) or host_arch == 'i86pc':
--    host_arch = 'ia32'
--  elif host_arch in ['x86_64', 'amd64']:
--    host_arch = 'x64'
--  elif host_arch.startswith('arm'):
--    host_arch = 'arm'
--
--  # platform.machine is based on running kernel. It's possible to use 64-bit
--  # kernel with 32-bit userland, e.g. to give linker slightly more memory.
--  # Distinguish between different userland bitness by querying
--  # the python binary.
--  if host_arch == 'x64' and platform.architecture()[0] == '32bit':
--    host_arch = 'ia32'
--
--  return host_arch
--
--
- def tempdir(prefix=''):
-   directory = tempfile.mkdtemp(prefix=prefix)
-   atexit.register(shutil.rmtree, directory)
-@@ -189,35 +167,6 @@
-     execute(argv, env, cwd)
- 
- 
--def electron_gyp():
--  SOURCE_ROOT = os.path.abspath(os.path.join(__file__, '..', '..', '..'))
--  gyp = os.path.join(SOURCE_ROOT, 'electron.gyp')
--  with open(gyp) as f:
--    obj = eval(f.read());
--    return obj['variables']
--
--def electron_features():
--  SOURCE_ROOT = os.path.abspath(os.path.join(__file__, '..', '..', '..'))
--  gyp = os.path.join(SOURCE_ROOT, 'features.gypi')
--  with open(gyp) as f:
--    obj = eval(f.read());
--    return obj['variables']['variables']
--
--def get_electron_version():
--  return 'v' + electron_gyp()['version%']
--
--
--def parse_version(version):
--  if version[0] == 'v':
--    version = version[1:]
--
--  vs = version.split('.')
--  if len(vs) > 4:
--    return vs[0:4]
--  else:
--    return vs + ['0'] * (4 - len(vs))
--
--
- def boto_path_dirs():
-   return [
-     os.path.join(BOTO_DIR, 'build', 'lib'),
-@@ -245,6 +194,7 @@
-   ] + files
- 
-   run_boto_script(access_key, secret_key, 's3put', *args)
-+<<<<<<< .our
- 
- 
- def import_vs_env(target_arch):
-@@ -363,3 +313,5 @@
-   if pre is None:
-     return major + '.' + minor + '.' + patch
-   return major + "." + minor + "." + patch + '-' + pre
-+=======
-+>>>>>>> .their
-removed in remote
-  base   100755 839ddf997348196edda8e3980aa727541fadd835 script/start.py
-  our    100755 839ddf997348196edda8e3980aa727541fadd835 script/start.py
-@@ -1,40 +0,0 @@
--#!/usr/bin/env python
--
--import os
--import subprocess
--import sys
--
--from lib.util import electron_gyp
--
--
--SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
--
--PROJECT_NAME = electron_gyp()['project_name%']
--PRODUCT_NAME = electron_gyp()['product_name%']
--
--
--def main():
--  os.chdir(SOURCE_ROOT)
--
--  config = 'D'
--  if '-R' in sys.argv:
--    config = 'R'
--
--  if sys.platform == 'darwin':
--    electron = os.path.join(SOURCE_ROOT, 'out', config,
--                              '{0}.app'.format(PRODUCT_NAME), 'Contents',
--                              'MacOS', PRODUCT_NAME)
--  elif sys.platform == 'win32':
--    electron = os.path.join(SOURCE_ROOT, 'out', config,
--                              '{0}.exe'.format(PROJECT_NAME))
--  else:
--    electron = os.path.join(SOURCE_ROOT, 'out', config, PROJECT_NAME)
--
--  try:
--    subprocess.check_call([electron] + sys.argv[1:])
--  except KeyboardInterrupt:
--    return -1
--
--
--if __name__ == '__main__':
--  sys.exit(main())
-removed in remote
-  base   100755 5b4e201d76ab3689bc8847d6141b2fff1a852174 script/update.py
-  our    100755 5b4e201d76ab3689bc8847d6141b2fff1a852174 script/update.py
-@@ -1,105 +0,0 @@
--#!/usr/bin/env python
--
--import argparse
--import os
--import platform
--import subprocess
--import sys
--
--from lib.config import get_target_arch, PLATFORM
--from lib.util import get_host_arch, import_vs_env
--
--
--SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
--
--
--def main():
--  os.chdir(SOURCE_ROOT)
--
--  if PLATFORM != 'win32' and platform.architecture()[0] != '64bit':
--    print 'Electron is required to be built on a 64bit machine'
--    return 1
--
--  update_external_binaries()
--  return update_gyp()
--
--
--def parse_args():
--  parser = argparse.ArgumentParser(description='Update build configurations')
--  parser.add_argument('--defines', default='',
--                      help='The build variables passed to gyp')
--  group = parser.add_mutually_exclusive_group(required=False)
--  group.add_argument('--msvs', action='store_true',
--                      help='Generate Visual Studio project')
--  group.add_argument('--xcode', action='store_true',
--                      help='Generate XCode project')
--  return parser.parse_args()
--
--
--def update_external_binaries():
--  uf = os.path.join('script', 'update-external-binaries.py')
--  subprocess.check_call([sys.executable, uf])
--
--
--def update_gyp():
--  # Since gyp doesn't support specify link_settings for each configuration,
--  # we are not able to link to different libraries in  "Debug" and "Release"
--  # configurations.
--  # In order to work around this, we decided to generate the configuration
--  # for twice, one is to generate "Debug" config, the other one to generate
--  # the "Release" config. And the settings are controlled by the variable
--  # "libchromiumcontent_component" which is defined before running gyp.
--  target_arch = get_target_arch()
--  return (run_gyp(target_arch, 0) or run_gyp(target_arch, 1))
--
--
--def run_gyp(target_arch, component):
--  # Update the VS build env.
--  import_vs_env(target_arch)
--
--  env = os.environ.copy()
--  if PLATFORM == 'linux' and target_arch != get_host_arch():
--    env['GYP_CROSSCOMPILE'] = '1'
--  elif PLATFORM == 'win32':
--    env['GYP_MSVS_VERSION'] = '2017'
--  python = sys.executable
--  if sys.platform == 'cygwin':
--    # Force using win32 python on cygwin.
--    python = os.path.join('vendor', 'python_26', 'python.exe')
--  gyp = os.path.join('vendor', 'gyp', 'gyp_main.py')
--  gyp_pylib = os.path.join(os.path.dirname(gyp), 'pylib')
--  # Avoid using the old gyp lib in system.
--  env['PYTHONPATH'] = os.path.pathsep.join([gyp_pylib,
--                                            env.get('PYTHONPATH', '')])
--  # Whether to build for Mac App Store.
--  if os.environ.has_key('MAS_BUILD'):
--    mas_build = 1
--  else:
--    mas_build = 0
--
--  defines = [
--    '-Dlibchromiumcontent_component={0}'.format(component),
--    '-Dtarget_arch={0}'.format(target_arch),
--    '-Dhost_arch={0}'.format(get_host_arch()),
--    '-Dlibrary=static_library',
--    '-Dmas_build={0}'.format(mas_build),
--  ]
--
--  # Add the defines passed from command line.
--  args = parse_args()
--  for define in [d.strip() for d in args.defines.split(' ')]:
--    if define:
--      defines += ['-D' + define]
--
--  generator = 'ninja'
--  if args.msvs:
--    generator = 'msvs-ninja'
--  elif args.xcode:
--    generator = 'xcode-ninja'
--
--  return subprocess.call([python, gyp, '-f', generator, '--depth', '.',
--                          'electron.gyp', '-Icommon.gypi'] + defines, env=env)
--
--
--if __name__ == '__main__':
--  sys.exit(main())
-removed in remote
-  base   100644 697add78e42191741cee1b015cdcf4f801c570e7 toolchain.gypi
-  our    100644 697add78e42191741cee1b015cdcf4f801c570e7 toolchain.gypi
-@@ -1,362 +0,0 @@
--{
--  'variables': {
--    # Clang stuff.
--    'make_clang_dir%': 'vendor/llvm-build/Release+Asserts',
--    # Set this to true when building with Clang.
--    'clang%': 1,
--
--    # Set this to the absolute path to sccache when building with sccache
--    'cc_wrapper%': '',
--
--    # Path to mips64el toolchain.
--    'make_mips64_dir%': 'vendor/gcc-4.8.3-d197-n64-loongson/usr',
--
--    'variables': {
--      # The minimum macOS SDK version to use.
--      'mac_sdk_min%': '10.12',
--
--      # Set ARM architecture version.
--      'arm_version%': 7,
--
--      # Set NEON compilation flags.
--      'arm_neon%': 1,
--
--      # Abosulte path to source root.
--      'source_root%': '<!(node <(DEPTH)/tools/atom_source_root.js)',
--    },
--
--    # Copy conditionally-set variables out one scope.
--    'mac_sdk_min%': '<(mac_sdk_min)',
--    'arm_version%': '<(arm_version)',
--    'arm_neon%': '<(arm_neon)',
--    'source_root%': '<(source_root)',
--
--    # Variables to control Link-Time Optimization (LTO).
--    'use_lto%': 0,
--    'use_lto_o2%': 0,
--
--    'conditions': [
--      # Do not use Clang on Windows or when building for mips64el.
--      ['OS=="win" or target_arch=="mips64el"', {
--        'clang%': 0,
--      }],  # OS=="win"
--
--      # Search for the available version of SDK.
--      ['OS=="mac"', {
--        'mac_sdk%': '<!(python <(DEPTH)/tools/mac/find_sdk.py <(mac_sdk_min))',
--      }],
--
--      ['OS=="linux"', {
--        'variables': {
--          # The system libdir used for this ABI.
--          'system_libdir%': 'lib',
--
--          # Setting the path to sysroot.
--          'conditions': [
--            ['target_arch=="arm"', {
--              # sysroot needs to be an absolute path otherwise it generates
--              # incorrect results when passed to pkg-config
--              'sysroot%': '<(source_root)/vendor/debian_stretch_arm-sysroot',
--            }],
--            ['target_arch=="arm64"', {
--              'sysroot%': '<(source_root)/vendor/debian_stretch_arm64-sysroot',
--            }],
--            ['target_arch=="ia32"', {
--              'sysroot%': '<(source_root)/vendor/debian_stretch_i386-sysroot',
--            }],
--            ['target_arch=="x64"', {
--              'sysroot%': '<(source_root)/vendor/debian_stretch_amd64-sysroot',
--            }],
--            ['target_arch=="mips64el"', {
--              'sysroot%': '<(source_root)/vendor/debian_jessie_mips64-sysroot',
--            }],
--          ],
--        },
--        # Copy conditionally-set variables out one scope.
--        'sysroot%': '<(sysroot)',
--        'system_libdir%': '<(system_libdir)',
--
--        # Redirect pkg-config to search from sysroot.
--        'pkg-config%': '<(source_root)/tools/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)" "<(system_libdir)"',
--      }],
--
--      # Set default compiler flags depending on ARM version.
--      ['arm_version==6', {
--        'arm_arch%': 'armv6',
--        'arm_tune%': '',
--        'arm_fpu%': 'vfp',
--        'arm_float_abi%': 'softfp',
--        'arm_thumb%': 0,
--      }],  # arm_version==6
--      ['arm_version==7', {
--        'arm_arch%': 'armv7-a',
--        'arm_tune%': 'generic-armv7-a',
--        'conditions': [
--          ['arm_neon==1', {
--            'arm_fpu%': 'neon',
--          }, {
--            'arm_fpu%': 'vfpv3-d16',
--          }],
--        ],
--        'arm_float_abi%': 'hard',
--        'arm_thumb%': 1,
--      }],  # arm_version==7
--    ],
--  },
--  'conditions': [
--    # Setup cc_wrapper
--    ['cc_wrapper!=""', {
--      'make_global_settings': [
--        ['CC_wrapper', '<(cc_wrapper)'],
--        ['CXX_wrapper', '<(cc_wrapper)'],
--        ['CC.host_wrapper', '<(cc_wrapper)'],
--        ['CXX.host_wrapper', '<(cc_wrapper)']
--      ],
--    }],
--    # Setup building with clang.
--    ['clang==1', {
--      'make_global_settings': [
--        ['CC', '<(make_clang_dir)/bin/clang'],
--        ['CXX', '<(make_clang_dir)/bin/clang++'],
--        ['CC.host', '$(CC)'],
--        ['CXX.host', '$(CXX)'],
--      ],
--      'target_defaults': {
--        'xcode_settings': {
--          'CC': '<(make_clang_dir)/bin/clang',
--          'LDPLUSPLUS': '<(make_clang_dir)/bin/clang++',
--          'OTHER_CFLAGS': [
--            '-fcolor-diagnostics',
--          ],
--
--          'GCC_C_LANGUAGE_STANDARD': 'c99',  # -std=c99
--          'CLANG_CXX_LIBRARY': 'libc++',  # -stdlib=libc++
--          'CLANG_CXX_LANGUAGE_STANDARD': 'c++14',  # -std=c++14
--        },
--        'target_conditions': [
--          ['_target_name in ["electron", "brightray"]', {
--            'conditions': [
--              ['OS=="mac"', {
--                'xcode_settings': {
--                  'OTHER_CFLAGS': [
--                    "-Xclang",
--                    "-load",
--                    "-Xclang",
--                    "<(source_root)/<(make_clang_dir)/lib/libFindBadConstructs.dylib",
--                    "-Xclang",
--                    "-add-plugin",
--                    "-Xclang",
--                    "find-bad-constructs",
--                  ],
--                },
--              }, {  # OS=="mac"
--                'cflags_cc': [
--                  "-Xclang",
--                  "-load",
--                  "-Xclang",
--                  "<(source_root)/<(make_clang_dir)/lib/libFindBadConstructs.so",
--                  "-Xclang",
--                  "-add-plugin",
--                  "-Xclang",
--                  "find-bad-constructs",
--                ],
--              }],
--            ],
--          }],
--          ['OS=="mac" and _type in ["executable", "shared_library"]', {
--            'xcode_settings': {
--              # On some machines setting CLANG_CXX_LIBRARY doesn't work for
--              # linker.
--              'OTHER_LDFLAGS': [ '-stdlib=libc++' ],
--            },
--          }],
--          ['OS=="linux" and _toolset=="target"', {
--            'cflags_cc': [
--              '-std=c++14',
--              '-nostdinc++',
--              '-isystem<(libchromiumcontent_src_dir)/buildtools/third_party/libc++/trunk/include',
--              '-isystem<(libchromiumcontent_src_dir)/buildtools/third_party/libc++abi/trunk/include',
--            ],
--            'ldflags': [
--              '-nostdlib++',
--            ],
--          }],
--          ['OS=="linux" and _toolset=="host"', {
--            'cflags_cc': [
--              '-std=c++14',
--            ],
--          }],
--        ],
--      },
--    }],  # clang==1
--
--    ['target_arch=="mips64el"', {
--      'make_global_settings': [
--        ['CC', '<(make_mips64_dir)/bin/mips64el-redhat-linux-gcc'],
--        ['CXX', '<(make_mips64_dir)/bin/mips64el-redhat-linux-g++'],
--        ['CC.host', '$(CC)'],
--        ['CXX.host', '$(CXX)'],
--      ],
--      'target_defaults': {
--        'cflags_cc': [
--          '-std=c++14',
--        ],
--      },
--    }],
--
--    # Specify the SDKROOT.
--    ['OS=="mac"', {
--      'target_defaults': {
--        'xcode_settings': {
--          'SDKROOT': 'macosx<(mac_sdk)',  # -isysroot
--        },
--      },
--    }],
--
--    # Setup sysroot environment.
--    ['OS=="linux" and target_arch in ["arm", "ia32", "x64", "arm64", "mips64el"]', {
--      'target_defaults': {
--        'target_conditions': [
--          ['_toolset=="target"', {
--            # Do not use 'cflags' to make sure sysroot is appended at last.
--            'cflags_cc': [
--              '--sysroot=<(sysroot)',
--            ],
--            'cflags_c': [
--              '--sysroot=<(sysroot)',
--            ],
--            'ldflags': [
--              '--sysroot=<(sysroot)',
--              '<!(<(source_root)/tools/linux/sysroot_ld_path.sh <(sysroot))',
--            ],
--          }]
--        ],
--      },
--    }],  # sysroot
--
--    # Setup cross-compilation on Linux.
--    ['OS=="linux"', {
--      'target_defaults': {
--        'target_conditions': [
--          ['target_arch=="ia32" and _toolset=="target"', {
--            'asflags': [
--              '-32',
--            ],
--            'cflags': [
--              '-msse2',
--              '-mfpmath=sse',
--              '-mmmx',  # Allows mmintrin.h for MMX intrinsics.
--              '-m32',
--            ],
--            'ldflags': [
--              '-m32',
--            ],
--          }],  # target_arch=="ia32" and _toolset=="target"
--          ['target_arch=="x64" and _toolset=="target"', {
--            'cflags': [
--              '-m64',
--              '-march=x86-64',
--            ],
--            'ldflags': [
--              '-m64',
--            ],
--          }],  # target_arch=="x64" and _toolset=="target"
--          ['target_arch=="arm" and _toolset=="target"', {
--            'conditions': [
--              ['clang==0', {
--                'cflags_cc': [
--                  '-Wno-abi',
--                ],
--              }],
--              ['clang==1 and arm_arch!=""', {
--                'cflags': [
--                  '-target arm-linux-gnueabihf',
--                ],
--                'ldflags': [
--                  '-target arm-linux-gnueabihf',
--                ],
--              }],
--              ['arm_arch!=""', {
--                'cflags': [
--                  '-march=<(arm_arch)',
--                ],
--                'conditions': [
--                  ['use_lto==1 or use_lto_o2==1', {
--                    'ldflags': [
--                      '-march=<(arm_arch)',
--                    ],
--                  }],
--                ],
--              }],
--              ['arm_tune!=""', {
--                'cflags': [
--                  '-mtune=<(arm_tune)',
--                ],
--                'conditions': [
--                  ['use_lto==1 or use_lto_o2==1', {
--                    'ldflags': [
--                      '-mtune=<(arm_tune)',
--                    ],
--                  }],
--                ],
--              }],
--              ['arm_fpu!=""', {
--                'cflags': [
--                  '-mfpu=<(arm_fpu)',
--                ],
--                'conditions': [
--                  ['use_lto==1 or use_lto_o2==1', {
--                    'ldflags': [
--                      '-mfpu=<(arm_fpu)',
--                    ],
--                  }],
--                ],
--              }],
--              ['arm_float_abi!=""', {
--                'cflags': [
--                  '-mfloat-abi=<(arm_float_abi)',
--                ],
--                'conditions': [
--                  ['use_lto==1 or use_lto_o2==1', {
--                    'ldflags': [
--                      '-mfloat-abi=<(arm_float_abi)',
--                    ],
--                  }],
--                ],
--              }],
--              ['arm_thumb==1', {
--                'cflags': [
--                  '-mthumb',
--                ],
--                'conditions': [
--                  ['use_lto==1 or use_lto_o2==1', {
--                    'ldflags': [
--                      '-mthumb',
--                    ],
--                  }],
--                ],
--              }],
--            ],
--          }],  # target_arch=="arm64" and _toolset=="target"
--          ['target_arch=="arm64" and _toolset=="target"', {
--            'conditions': [
--              ['clang==0', {
--                'cflags_cc': [
--                  '-Wno-abi',
--                ],
--              }],
--              ['clang==1 and arm_arch!=""', {
--                'cflags': [
--                  '-target  aarch64-linux-gnu',
--                ],
--                'ldflags': [
--                  '-target  aarch64-linux-gnu',
--                ],
--              }],
--            ],
--          }],  # target_arch=="arm" and _toolset=="target"
--        ],
--      },
--    }],  # OS=="linux"
--  ],
--}
-removed in remote
-  base   160000 f5f20660f20c281c1cbf1097ed55204b50711846 vendor/breakpad
-  our    160000 f5f20660f20c281c1cbf1097ed55204b50711846 vendor/breakpad
-removed in remote
-  base   160000 f72fa99d3e3d65e3bb9bed9d83429459d6f80c0d vendor/crashpad
-  our    160000 f72fa99d3e3d65e3bb9bed9d83429459d6f80c0d vendor/crashpad
-removed in remote
-  base   160000 eea8c793998f7d8b3c58bd7414b3fea62343df25 vendor/gyp
-  our    160000 eea8c793998f7d8b3c58bd7414b3fea62343df25 vendor/gyp
-removed in remote
-  base   160000 d6411e421b0b2f0105d274ac4e5c90dc979463ca vendor/libchromiumcontent
-  our    160000 c85470a1c379b1c4bedb372c146521bc4be9b75d vendor/libchromiumcontent
-removed in remote
-  base   160000 a782199c99b5716582791fe8145756fd5bcfde27 vendor/node
-  our    160000 ece0a06ac8147efb5b5af431c21f312f1884616e vendor/node
-removed in remote
-  base   160000 a5251e497fb52e699b28f627e3cbb6d8cefb62df vendor/pdf_viewer
-  our    160000 a5251e497fb52e699b28f627e3cbb6d8cefb62df vendor/pdf_viewer
-removed in remote
-  base   100644 3e78eea25f8be0334d38f0d566ef539fef981596 vsts.yml
-  our    100644 84bd69c2b2868ac23bc30061aa208ad38fbb9506 vsts.yml
-@@ -1,97 +0,0 @@
--resources:
--- repo: self
--steps:
--- bash: |
--    if [ "$ELECTRON_RELEASE" == "1" ]; then
--      echo 'Bootstrapping Electron for release build'
--      script/bootstrap.py --target_arch=$TARGET_ARCH
--    else
--      echo 'Bootstrapping Electron for debug build'
--      script/bootstrap.py --target_arch=$TARGET_ARCH --dev
--    fi
--  name: Bootstrap
--
--- bash: |
--    npm run lint
--  name: Lint
--  condition: and(succeeded(), ne(variables['ELECTRON_RELEASE'], '1'))
--
--- bash: |
--    if [ "$ELECTRON_RELEASE" == "1" ]; then
--      echo 'Building Electron for release'
--      script/build.py -c R
--    else
--      echo 'Building Electron for debug'
--      script/build.py -c D
--    fi
--  name: Build
--
--- bash: |
--    echo 'Creating Electron release distribution'
--    script/create-dist.py
--  name: Create_distribution
--  condition: and(succeeded(), eq(variables['ELECTRON_RELEASE'], '1'))
--
--- bash: |
--    if [ "$UPLOAD_TO_S3" != "1" ]; then
--      echo 'Uploading Electron release distribution to github releases'
--      ELECTRON_S3_BUCKET="$(s3_bucket)" ELECTRON_S3_ACCESS_KEY="$(s3_access_key)" ELECTRON_S3_SECRET_KEY="$(s3_secret_key)" ELECTRON_GITHUB_TOKEN="$(github_token)" script/upload.py
--    else
--      echo 'Uploading Electron release distribution to s3'
--      ELECTRON_S3_BUCKET="$(s3_bucket)" ELECTRON_S3_ACCESS_KEY="$(s3_access_key)" ELECTRON_S3_SECRET_KEY="$(s3_secret_key)" ELECTRON_GITHUB_TOKEN="$(github_token)" script/upload.py --upload_to_s3
--    fi
--  name: Upload_distribution
--  condition: and(succeeded(), eq(variables['ELECTRON_RELEASE'], '1'))
--
--- bash: |
--    echo 'Testing Electron build'
--    mkdir junit
--    export MOCHA_FILE="junit/test-results.xml"
--    export MOCHA_REPORTER="mocha-junit-reporter"
--    if [ "$ELECTRON_RELEASE" == "1" ]; then
--      script/test.py --ci --rebuild_native_modules -c R
--    else
--      script/test.py --ci --rebuild_native_modules
--    fi
--  name: Test
--  condition: or(ne(variables['ELECTRON_RELEASE'], '1'), eq(variables['UPLOAD_TO_S3'], '1'))
--
--- bash: |
--    echo 'Verifying ffmpeg on build'
--    if [ "$ELECTRON_RELEASE" == "1" ]; then
--      script/verify-ffmpeg.py -c R
--    else
--      script/verify-ffmpeg.py
--    fi
--  name: Verify_FFmpeg
--  condition: or(ne(variables['ELECTRON_RELEASE'], '1'), eq(variables['UPLOAD_TO_S3'], '1'))
--
--- task: PublishTestResults@2
--  displayName: Publish Test Results
--  inputs:
--    testResultsFiles: '**/test-*.xml'
--  condition: and(always(), eq(variables['MOCHA_FILE'], 'test-results.xml'))
--
--- bash: |
--    export BUILD_URL="${SYSTEM_TEAMFOUNDATIONCOLLECTIONURI}${SYSTEM_TEAMPROJECT}/_build/results?buildId=${BUILD_BUILDID}"
--    export MESSAGE="Build failed for *<$BUILD_URL|$BUILD_DEFINITIONNAME>* nightly build."
--    curl -g -H "Content-Type: application/json" -X POST \
--    -d "{\"text\": \"$MESSAGE\", \"attachments\": [{\"color\": \"#FC5C3C\",\"title\": \"$BUILD_DEFINITIONNAME nightly build results\",\"title_link\": \"$BUILD_URL\"}]}" $(slack_webhook)
--  name: Post_Slack_Notification_on_Failure
--  condition: failed()
--
--- bash: |
--    export BUILD_URL="${SYSTEM_TEAMFOUNDATIONCOLLECTIONURI}${SYSTEM_TEAMPROJECT}/_build/results?buildId=${BUILD_BUILDID}"
--    export MESSAGE="Build succeeded for *<$BUILD_URL|$BUILD_DEFINITIONNAME>* nightly build."
--    curl -g -H "Content-Type: application/json" -X POST \
--    -d "{\"text\": \"$MESSAGE\", \"attachments\": [{\"color\": \"#FC5C3C\",\"title\": \"$BUILD_DEFINITIONNAME nightly build results\",\"title_link\": \"$BUILD_URL\"}]}" $(slack_webhook)
--  name: Post_Slack_Notification_on_Success
--  condition: succeeded()
--
--- task: PublishBuildArtifacts@1
--  displayName: Publish Build Artifacts
--  inputs:
--    PathtoPublish: '$(Build.SourcesDirectory)/out'
--    ArtifactName: out
--
--- task: mspremier.PostBuildCleanup.PostBuildCleanup-task.PostBuildCleanup@3
diff --git a/app/test/fixtures/merge-parser/electron/merge-deprecate-node-integration-default-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-deprecate-node-integration-default-into-master.txt
deleted file mode 100644
index f0ccd00333c..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-deprecate-node-integration-default-into-master.txt
+++ /dev/null
@@ -1,2277 +0,0 @@
-changed in both
-  base   100644 548ea394436b4d8184ff402b772c94c8ecf9a16d atom/browser/api/atom_api_web_contents.cc
-  our    100644 20a1ac2e672f08ffea528b6e094ba530ff8083d1 atom/browser/api/atom_api_web_contents.cc
-  their  100644 7c265be94d853d25368ca5723a6eb97adc6d4448 atom/browser/api/atom_api_web_contents.cc
-@@ -312,9 +312,9 @@
- 
- WebContents::WebContents(v8::Isolate* isolate,
-                          content::WebContents* web_contents,
--                         Type type)
-+                         Type type,
-+                         const mate::Dictionary& options)
-     : content::WebContentsObserver(web_contents), type_(type) {
--  const mate::Dictionary options = mate::Dictionary::CreateEmpty(isolate);
-   if (type == REMOTE) {
-     web_contents->SetUserAgentOverride(GetBrowserContext()->GetUserAgent());
-     Init(isolate);
-@@ -533,7 +533,13 @@
-                                      content::WebContents* new_contents) {
-   v8::Locker locker(isolate());
-   v8::HandleScope handle_scope(isolate());
--  auto api_web_contents = CreateFrom(isolate(), new_contents, BROWSER_WINDOW);
-+  mate::Dictionary options = mate::Dictionary::CreateEmpty(isolate());
-+  // Merge in parent webcontents options BEFORE we constuct an API web contents
-+  // and therefore before we construct a WebPreferences object.  This solves
-+  // both a security and deprecation race condition
-+  mate::ConvertFromV8(isolate(), GetLastWebPreferences(isolate()), &options);
-+  auto api_web_contents = CreateFrom(isolate(), new_contents, BROWSER_WINDOW,
-+                                     options);
-   Emit("-web-contents-created", api_web_contents, target_url, frame_name);
- }
- 
-@@ -2081,23 +2087,32 @@
- mate::Handle<WebContents> WebContents::CreateFrom(
-     v8::Isolate* isolate,
-     content::WebContents* web_contents) {
--  // We have an existing WebContents object in JS.
--  auto* existing = TrackableObject::FromWrappedClass(isolate, web_contents);
--  if (existing)
--    return mate::CreateHandle(isolate, static_cast<WebContents*>(existing));
--
--  // Otherwise create a new WebContents wrapper object.
--  return mate::CreateHandle(isolate,
--                            new WebContents(isolate, web_contents, REMOTE));
-+  return CreateFrom(isolate, web_contents, REMOTE);
- }
- 
- mate::Handle<WebContents> WebContents::CreateFrom(
-     v8::Isolate* isolate,
-     content::WebContents* web_contents,
-     Type type) {
-+  const mate::Dictionary options = mate::Dictionary::CreateEmpty(isolate);
-+
-+  return CreateFrom(isolate, web_contents, type, options);
-+}
-+
-+mate::Handle<WebContents> WebContents::CreateFrom(
-+    v8::Isolate* isolate,
-+    content::WebContents* web_contents,
-+    Type type,
-+    const mate::Dictionary& options) {
-+  // We have an existing WebContents object in JS.
-+  auto* existing = TrackableObject::FromWrappedClass(isolate, web_contents);
-+  if (existing)
-+    return mate::CreateHandle(isolate, static_cast<WebContents*>(existing));
-+
-   // Otherwise create a new WebContents wrapper object.
-   return mate::CreateHandle(isolate,
--                            new WebContents(isolate, web_contents, type));
-+                            new WebContents(isolate, web_contents, type,
-+                                            options));
- }
- 
- // static
-changed in both
-  base   100644 2155656ccbdcc34731bcb01b99a89b7c321a96da atom/browser/api/atom_api_web_contents.h
-  our    100644 7939f8268aa8c3371623e0c15f3b6001d7f1efa4 atom/browser/api/atom_api_web_contents.h
-  their  100644 d7332ff87e83111b358220a06678c4ef89abf242 atom/browser/api/atom_api_web_contents.h
-@@ -89,6 +89,11 @@
-       v8::Isolate* isolate,
-       content::WebContents* web_contents,
-       Type type);
-+  static mate::Handle<WebContents> CreateFrom(
-+      v8::Isolate* isolate,
-+      content::WebContents* web_contents,
-+      Type type,
-+      const mate::Dictionary& options);
- 
-   // Create a new WebContents.
-   static mate::Handle<WebContents> Create(v8::Isolate* isolate,
-@@ -263,7 +268,8 @@
-  protected:
-   WebContents(v8::Isolate* isolate,
-               content::WebContents* web_contents,
--              Type type);
-+              Type type,
-+              const mate::Dictionary& options);
-   WebContents(v8::Isolate* isolate, const mate::Dictionary& options);
-   ~WebContents() override;
- 
-changed in both
-  base   100644 1046a55b05791d48316afee7052e8fa2e23d131c atom/browser/web_contents_preferences.cc
-  our    100644 c21c93383155091a7481cdd4e741cefad90a4a55 atom/browser/web_contents_preferences.cc
-  their  100644 63e2257de01f8f5e8cb2c58c7089689693270f72 atom/browser/web_contents_preferences.cc
-@@ -8,6 +8,7 @@
- #include <string>
- #include <vector>
- 
-+#include "atom/browser/api/atom_api_web_contents.h"
- #include "atom/browser/native_window.h"
- #include "atom/browser/web_view_manager.h"
- #include "atom/common/native_mate_converters/value_converter.h"
-@@ -99,7 +100,13 @@
-   // Set WebPreferences defaults onto the JS object
-   SetDefaultBoolIfUndefined(options::kPlugins, false);
-   SetDefaultBoolIfUndefined(options::kExperimentalFeatures, false);
-+<<<<<<< .our
-   bool node = SetDefaultBoolIfUndefined(options::kNodeIntegration, true);
-+=======
-+  SetDefaultBoolIfUndefined(options::kExperimentalCanvasFeatures, false);
-+  bool node = SetDefaultBoolIfUndefined(options::kNodeIntegration, true,
-+                                        Status::Deprecated);
-+>>>>>>> .their
-   SetDefaultBoolIfUndefined(options::kNodeIntegrationInWorker, false);
-   SetDefaultBoolIfUndefined(options::kWebviewTag, node);
-   SetDefaultBoolIfUndefined(options::kSandbox, false);
-@@ -134,6 +141,7 @@
- 
- bool WebContentsPreferences::SetDefaultBoolIfUndefined(
-     const base::StringPiece& key,
-+<<<<<<< .our
-     bool val) {
-   auto* current_value =
-       preference_.FindKeyOfType(key, base::Value::Type::BOOLEAN);
-@@ -141,6 +149,20 @@
-     return current_value->GetBool();
-   } else {
-     preference_.SetKey(key, base::Value(val));
-+=======
-+    bool val,
-+    Status status) {
-+  bool existing;
-+  if (!dict_.GetBoolean(key, &existing)) {
-+    dict_.SetBoolean(key, val);
-+    if (status == Status::Deprecated && web_contents_) {
-+      auto internal_contents = atom::api::WebContents::CreateFrom(
-+          v8::Isolate::GetCurrent(), web_contents_);
-+      internal_contents->Emit("-deprecated-default",
-+                              std::string("webPreferences.") + key.data(), val,
-+                              !val);
-+    }
-+>>>>>>> .their
-     return val;
-   }
- }
-changed in both
-  base   100644 f08a614bf8c1a4df9a0df6acf28c882f79beabf0 atom/browser/web_contents_preferences.h
-  our    100644 d835347afcd259f473f95271a2c19e42afcc6f2b atom/browser/web_contents_preferences.h
-  their  100644 fd51f0a0b82f98fdd57b9f51cc159cb41cbba4b2 atom/browser/web_contents_preferences.h
-@@ -29,6 +29,11 @@
- class WebContentsPreferences
-     : public content::WebContentsUserData<WebContentsPreferences> {
-  public:
-+  enum class Status {
-+    Deprecated,
-+    Stable
-+  };
-+
-   // Get self from WebContents.
-   static WebContentsPreferences* From(content::WebContents* web_contents);
- 
-@@ -70,7 +75,10 @@
-   static content::WebContents* GetWebContentsFromProcessID(int process_id);
- 
-   // Set preference value to given bool if user did not provide value
--  bool SetDefaultBoolIfUndefined(const base::StringPiece& key, bool val);
-+  bool SetDefaultBoolIfUndefined(
-+      const base::StringPiece& key,
-+      bool val,
-+      Status status = Status::Stable);
- 
-   static std::vector<WebContentsPreferences*> instances_;
- 
-changed in both
-  base   100644 e6ba9eea2cb5938fe71ab7c18a47921d3959061e default_app/default_app.js
-  our    100644 1b9da74e503ab4afa8d2c530cd45332f0868a463 default_app/default_app.js
-  their  100644 c4a18daf32ecad93c3f6fc62ed23fd6a5361a0f7 default_app/default_app.js
-@@ -16,6 +16,7 @@
-       autoHideMenuBar: true,
-       backgroundColor: '#FFFFFF',
-       webPreferences: {
-+        nodeIntegration: true,
-         nodeIntegrationInWorker: true
-       },
-       useContentSize: true,
-changed in both
-  base   100644 f5f53f44a312935eaf4db5112923b947dab0876d lib/browser/api/web-contents.js
-  our    100644 8f5bd037b14d05db7396bb8b5de1a29fdef167ae lib/browser/api/web-contents.js
-  their  100644 001dbc4e7e32183bb0c93e3fa4308df0e2bf541e lib/browser/api/web-contents.js
-@@ -293,6 +293,10 @@
-     ipcMain.emit(channel, event, ...args)
-   })
- 
-+  this.on('-deprecated-default', function (event, key, oldDefault, newDefault) {
-+    deprecate.warnDefault(key, oldDefault, newDefault)
-+  })
-+
-   // Handle context menu action request from pepper plugin.
-   this.on('pepper-context-menu', function (event, params, callback) {
-     // Access Menu via electron.Menu to prevent circular require.
-merged
-  result 100644 6c34d5219b1275de2f2ae823521de733096b4269 lib/browser/chrome-extension.js
-  our    100644 4132aedadd759f56db7eceabd6327d1b29aa09eb lib/browser/chrome-extension.js
-@@ -86,7 +86,8 @@
-   const contents = webContents.create({
-     partition: 'persist:__chrome_extension',
-     isBackgroundPage: true,
--    commandLineSwitches: ['--background-page']
-+    commandLineSwitches: ['--background-page'],
-+    nodeIntegration: true
-   })
-   backgroundPages[manifest.extensionId] = { html: html, webContents: contents, name: name }
-   contents.loadURL(url.format({
-changed in both
-  base   100644 da2663e6060a71f400c26ed59f1d6c27a59f1e9f lib/browser/guest-view-manager.js
-  our    100644 1e4029e39a981c85fb6ff18c5ccd52f81b3c56f2 lib/browser/guest-view-manager.js
-  their  100644 77ad77f5fc1113f8e3be0c5f4f7a247a7655d36b lib/browser/guest-view-manager.js
-@@ -61,7 +61,8 @@
-   const guest = webContents.create({
-     isGuest: true,
-     partition: params.partition,
--    embedder: embedder
-+    embedder: embedder,
-+    nodeIntegration: true
-   })
-   guestInstances[guestInstanceId] = {
-     guest: guest,
-changed in both
-  base   100644 8e2aa3bb988208ec4f266d3169020daca4068de3 lib/browser/guest-window-manager.js
-  our    100644 7253c1942b0956ae6b9b0c80a23470fc26669b8a lib/browser/guest-window-manager.js
-  their  100644 7985dec4b9ef1ddfc7b88ea4885d7f7136060369 lib/browser/guest-window-manager.js
-merged
-  result 100644 e5e851365a10b0a43194d5d943307659a84eb081 lib/common/api/deprecate.js
-  our    100644 4a42b2a693acea99ee2581c31a0f15fa9873f1b9 lib/common/api/deprecate.js
-@@ -31,6 +31,12 @@
-   return deprecate.log(`'${oldName}' is deprecated. Use '${newName}' instead.`)
- }
- 
-+deprecate.warnDefault = (propName, oldDefault, newDefault) => {
-+  return deprecate.log(`The default value of '${propName}' is changing from \
-+'${oldDefault}' to '${newDefault}' in a future release. If you want to keep \
-+the current value, please explicitly declare the property.`)
-+}
-+
- let deprecationHandler = null
- 
- // Print deprecation message.
-changed in both
-  base   100644 37c5520a1d27d6988eb30267b7a8ca6ae83d2b20 spec/api-app-spec.js
-  our    100644 d224eda2989332c18d655cef05a8bacc2eb6d4b8 spec/api-app-spec.js
-  their  100644 a1dcb7097576e5b41ac002d8166073dc93ad0bac spec/api-app-spec.js
-@@ -31,7 +31,8 @@
-       window = new BrowserWindow({
-         show: false,
-         width: 400,
--        height: 400
-+        height: 400,
-+        webPreferences: { nodeIntegration: true }
-       })
-     })
- 
-@@ -311,7 +312,10 @@
-         password: 'electron'
-       }
- 
--      w = new BrowserWindow({ show: false })
-+      w = new BrowserWindow({
-+        show: false,
-+        webPreferences: { nodeIntegration: true }
-+      })
- 
-       w.webContents.on('did-finish-load', () => {
-         expect(w.webContents.getTitle()).to.equal('authorized')
-@@ -350,7 +354,10 @@
-         expect(w.id).to.equal(window.id)
-         done()
-       })
--      w = new BrowserWindow({ show: false })
-+      w = new BrowserWindow({
-+        show: false,
-+        webPreferences: { nodeIntegration: true }
-+      })
-       w.emit('focus')
-     })
- 
-@@ -359,7 +366,10 @@
-         expect(w.id).to.equal(window.id)
-         done()
-       })
--      w = new BrowserWindow({ show: false })
-+      w = new BrowserWindow({
-+        show: false,
-+        webPreferences: { nodeIntegration: true }
-+      })
-       w.emit('blur')
-     })
- 
-@@ -370,7 +380,10 @@
-           done()
-         })
-       })
--      w = new BrowserWindow({ show: false })
-+      w = new BrowserWindow({
-+        show: false,
-+        webPreferences: { nodeIntegration: true }
-+      })
-     })
- 
-     it('should emit web-contents-created event when a webContents is created', (done) => {
-@@ -380,7 +393,10 @@
-           done()
-         })
-       })
--      w = new BrowserWindow({ show: false })
-+      w = new BrowserWindow({
-+        show: false,
-+        webPreferences: { nodeIntegration: true }
-+      })
-     })
-   })
- 
-@@ -548,6 +564,7 @@
-       w = new BrowserWindow({
-         show: false,
-         webPreferences: {
-+          nodeIntegration: true,
-           partition: 'empty-certificate'
-         }
-       })
-merged
-  result 100644 d0b075376181ca9937dbc8a0bcfeb5bac9edfc8b spec/api-browser-view-spec.js
-  our    100644 968912a4abf3d759a1363e2420d2c21b7923dbd6 spec/api-browser-view-spec.js
-@@ -10,6 +10,13 @@
- const {expect} = chai
- chai.use(dirtyChai)
- 
-+const createBrowserView = () =>
-+  new BrowserView({
-+    webPreferences: {
-+      nodeIntegration: true
-+    }
-+  })
-+
- describe('BrowserView module', () => {
-   let w = null
-   let view = null
-@@ -20,7 +27,8 @@
-       width: 400,
-       height: 400,
-       webPreferences: {
--        backgroundThrottling: false
-+        backgroundThrottling: false,
-+        nodeIntegration: true
-       }
-     })
-   })
-@@ -36,14 +44,14 @@
- 
-   describe('BrowserView.destroy()', () => {
-     it('does not throw', () => {
--      view = new BrowserView()
-+      view = createBrowserView()
-       view.destroy()
-     })
-   })
- 
-   describe('BrowserView.isDestroyed()', () => {
-     it('returns correct value', () => {
--      view = new BrowserView()
-+      view = createBrowserView()
-       expect(view.isDestroyed()).to.be.false()
-       view.destroy()
-       expect(view.isDestroyed()).to.be.true()
-@@ -52,12 +60,12 @@
- 
-   describe('BrowserView.setBackgroundColor()', () => {
-     it('does not throw for valid args', () => {
--      view = new BrowserView()
-+      view = createBrowserView()
-       view.setBackgroundColor('#000')
-     })
- 
-     it('throws for invalid args', () => {
--      view = new BrowserView()
-+      view = createBrowserView()
-       expect(() => {
-         view.setBackgroundColor(null)
-       }).to.throw(/conversion failure/)
-@@ -66,13 +74,13 @@
- 
-   describe('BrowserView.setAutoResize()', () => {
-     it('does not throw for valid args', () => {
--      view = new BrowserView()
-+      view = createBrowserView()
-       view.setAutoResize({})
-       view.setAutoResize({ width: true, height: false })
-     })
- 
-     it('throws for invalid args', () => {
--      view = new BrowserView()
-+      view = createBrowserView()
-       expect(() => {
-         view.setAutoResize(null)
-       }).to.throw(/conversion failure/)
-@@ -81,12 +89,12 @@
- 
-   describe('BrowserView.setBounds()', () => {
-     it('does not throw for valid args', () => {
--      view = new BrowserView()
-+      view = createBrowserView()
-       view.setBounds({ x: 0, y: 0, width: 1, height: 1 })
-     })
- 
-     it('throws for invalid args', () => {
--      view = new BrowserView()
-+      view = createBrowserView()
-       expect(() => {
-         view.setBounds(null)
-       }).to.throw(/conversion failure/)
-@@ -98,12 +106,12 @@
- 
-   describe('BrowserWindow.setBrowserView()', () => {
-     it('does not throw for valid args', () => {
--      view = new BrowserView()
-+      view = createBrowserView()
-       w.setBrowserView(view)
-     })
- 
-     it('does not throw if called multiple times with same view', () => {
--      view = new BrowserView()
-+      view = createBrowserView()
-       w.setBrowserView(view)
-       w.setBrowserView(view)
-       w.setBrowserView(view)
-@@ -112,7 +120,7 @@
- 
-   describe('BrowserWindow.getBrowserView()', () => {
-     it('returns the set view', () => {
--      view = new BrowserView()
-+      view = createBrowserView()
-       w.setBrowserView(view)
-       expect(view.id).to.not.be.null()
- 
-@@ -128,7 +136,7 @@
- 
-   describe('BrowserView.webContents.getOwnerBrowserWindow()', () => {
-     it('points to owning window', () => {
--      view = new BrowserView()
-+      view = createBrowserView()
-       expect(view.webContents.getOwnerBrowserWindow()).to.be.null()
- 
-       w.setBrowserView(view)
-@@ -141,7 +149,7 @@
- 
-   describe('BrowserView.fromId()', () => {
-     it('returns the view with given id', () => {
--      view = new BrowserView()
-+      view = createBrowserView()
-       w.setBrowserView(view)
-       expect(view.id).to.not.be.null()
- 
-@@ -152,7 +160,7 @@
- 
-   describe('BrowserView.fromWebContents()', () => {
-     it('returns the view with given id', () => {
--      view = new BrowserView()
-+      view = createBrowserView()
-       w.setBrowserView(view)
-       expect(view.id).to.not.be.null()
- 
-@@ -163,7 +171,7 @@
- 
-   describe('BrowserView.getAllViews()', () => {
-     it('returns all views', () => {
--      view = new BrowserView()
-+      view = createBrowserView()
-       w.setBrowserView(view)
-       expect(view.id).to.not.be.null()
- 
-merged
-  result 100644 9076697016660ed26e65c95f407052abd1417702 spec/api-browser-window-affinity-spec.js
-  our    100644 f90e784bed5115013032d52be3eaae0ae14c9e8b spec/api-browser-window-affinity-spec.js
-@@ -19,7 +19,9 @@
-         show: false,
-         width: 400,
-         height: 400,
--        webPreferences: webPrefs || {}
-+        webPreferences: Object.assign({
-+          nodeIntegration: true
-+        }, webPrefs || {})
-       })
-       w.webContents.on('did-finish-load', () => { resolve(w) })
-       w.loadURL(`file://${path.join(fixtures, 'api', 'blank.html')}`)
-changed in both
-  base   100644 6ab2b56938b014d02178be2bb2c0467193e32365 spec/api-browser-window-spec.js
-  our    100644 f4cba12ec19d224bc46fca898db42a99baf4972e spec/api-browser-window-spec.js
-  their  100644 ffffbf41fc8f21b378e387bace245ac92637bd55 spec/api-browser-window-spec.js
-@@ -18,7 +18,18 @@
- const isCI = remote.getGlobal('isCi')
- const nativeModulesEnabled = remote.getGlobal('nativeModulesEnabled')
- 
-+<<<<<<< .our
- chai.use(dirtyChai)
-+=======
-+const createNodeWindow = (opts = {}) =>
-+  new BrowserWindow({
-+    ...opts,
-+    webPreferences: {
-+      nodeIntegration: true,
-+      ...(opts.webPreferences || {})
-+    }
-+  })
-+>>>>>>> .their
- 
- describe('BrowserWindow module', () => {
-   const fixtures = path.resolve(__dirname, 'fixtures')
-@@ -99,13 +110,32 @@
-     server = null
-   })
- 
-+<<<<<<< .our
-   beforeEach(openTheWindow)
-+=======
-+  beforeEach(() => {
-+    w = createNodeWindow({
-+      show: false,
-+      width: 400,
-+      height: 400,
-+      webPreferences: {
-+        backgroundThrottling: false
-+      }
-+    })
-+  })
-+>>>>>>> .their
- 
-   afterEach(closeTheWindow)
- 
-   describe('BrowserWindow constructor', () => {
-     it('allows passing void 0 as the webContents', () => {
-+<<<<<<< .our
-       openTheWindow({
-+=======
-+      w.close()
-+      w = null
-+      w = createNodeWindow({
-+>>>>>>> .their
-         webContents: void 0
-       })
-     })
-@@ -179,7 +209,7 @@
-       function * genNavigationEvent () {
-         let eventOptions = null
-         while ((eventOptions = events.shift()) && events.length) {
--          let w = new BrowserWindow({show: false})
-+          let w = createNodeWindow({show: false})
-           eventOptions.id = w.id
-           eventOptions.responseEvent = responseEvent
-           ipcRenderer.send('test-webcontents-navigation-observer', eventOptions)
-@@ -275,6 +305,14 @@
-     })
- 
-     describe('POST navigations', () => {
-+      beforeEach(() => {
-+        // FIXME: App::CanCreateWindow does not inherit webPreferences
-+        //        so it uses deprecated defaults
-+        remote.getGlobal('process').throwDeprecation = false
-+      })
-+      afterEach(() => {
-+        remote.getGlobal('process').throwDeprecation = true
-+      })
-       afterEach(() => { w.webContents.session.webRequest.onBeforeSendHeaders(null) })
- 
-       it('supports specifying POST data', (done) => {
-@@ -435,8 +473,16 @@
-       expect(image.isEmpty()).to.be.true()
-     })
- 
-+<<<<<<< .our
-     it('preserves transparency', async () => {
-       const w = await openTheWindow({
-+=======
-+    it('preserves transparency', (done) => {
-+      w.close()
-+      const width = 400
-+      const height = 400
-+      w = createNodeWindow({
-+>>>>>>> .their
-         show: false,
-         width: 400,
-         height: 400,
-@@ -518,7 +564,7 @@
-     })
-     it('works for a frameless window', () => {
-       w.destroy()
--      w = new BrowserWindow({
-+      w = createNodeWindow({
-         show: false,
-         frame: false,
-         width: 400,
-@@ -543,7 +589,7 @@
-     })
-     it('works for a frameless window', (done) => {
-       w.destroy()
--      w = new BrowserWindow({
-+      w = createNodeWindow({
-         show: false,
-         frame: false,
-         width: 300,
-@@ -745,7 +791,7 @@
-     })
- 
-     it('does not throw', (done) => {
--      const tabbedWindow = new BrowserWindow({})
-+      const tabbedWindow = createNodeWindow({})
-       assert.doesNotThrow(() => {
-         w.addTabbedWindow(tabbedWindow)
-       })
-@@ -846,7 +892,11 @@
-   describe('BrowserWindow.fromWebContents(webContents)', () => {
-     let contents = null
- 
--    beforeEach(() => { contents = webContents.create({}) })
-+    beforeEach(() => {
-+      contents = webContents.create({
-+        nodeIntegration: true
-+      })
-+    })
- 
-     afterEach(() => { contents.destroy() })
- 
-@@ -859,7 +909,11 @@
-   describe('BrowserWindow.fromDevToolsWebContents(webContents)', () => {
-     let contents = null
- 
--    beforeEach(() => { contents = webContents.create({}) })
-+    beforeEach(() => {
-+      contents = webContents.create({
-+        nodeIntegration: true
-+      })
-+    })
- 
-     afterEach(() => { contents.destroy() })
- 
-@@ -886,7 +940,11 @@
-     let bv = null
- 
-     beforeEach(() => {
--      bv = new BrowserView()
-+      bv = new BrowserView({
-+        webPreferences: {
-+          nodeIntegration: true
-+        }
-+      })
-       w.setBrowserView(bv)
-     })
- 
-@@ -908,7 +966,7 @@
-   describe('BrowserWindow.setOpacity(opacity)', () => {
-     it('make window with initial opacity', () => {
-       w.destroy()
--      w = new BrowserWindow({
-+      w = createNodeWindow({
-         show: false,
-         width: 400,
-         height: 400,
-@@ -942,7 +1000,7 @@
-   describe('"useContentSize" option', () => {
-     it('make window created with content size when used', () => {
-       w.destroy()
--      w = new BrowserWindow({
-+      w = createNodeWindow({
-         show: false,
-         width: 400,
-         height: 400,
-@@ -959,7 +1017,7 @@
-     })
-     it('works for a frameless window', () => {
-       w.destroy()
--      w = new BrowserWindow({
-+      w = createNodeWindow({
-         show: false,
-         frame: false,
-         width: 400,
-@@ -988,7 +1046,7 @@
- 
-     it('creates browser window with hidden title bar', () => {
-       w.destroy()
--      w = new BrowserWindow({
-+      w = createNodeWindow({
-         show: false,
-         width: 400,
-         height: 400,
-@@ -999,7 +1057,7 @@
-     })
-     it('creates browser window with hidden inset title bar', () => {
-       w.destroy()
--      w = new BrowserWindow({
-+      w = createNodeWindow({
-         show: false,
-         width: 400,
-         height: 400,
-@@ -1019,7 +1077,7 @@
- 
-     beforeEach(() => {
-       w.destroy()
--      w = new BrowserWindow({
-+      w = createNodeWindow({
-         show: true,
-         width: 400,
-         height: 400,
-@@ -1051,7 +1109,7 @@
- 
-     it('sets the window width to the page width when used', () => {
-       w.destroy()
--      w = new BrowserWindow({
-+      w = createNodeWindow({
-         show: false,
-         width: 500,
-         height: 400,
-@@ -1065,11 +1123,11 @@
-   describe('"tabbingIdentifier" option', () => {
-     it('can be set on a window', () => {
-       w.destroy()
--      w = new BrowserWindow({
-+      w = createNodeWindow({
-         tabbingIdentifier: 'group1'
-       })
-       w.destroy()
--      w = new BrowserWindow({
-+      w = createNodeWindow({
-         tabbingIdentifier: 'group2',
-         frame: false
-       })
-@@ -1087,7 +1145,7 @@
-           done()
-         })
-         w.destroy()
--        w = new BrowserWindow({
-+        w = createNodeWindow({
-           show: false,
-           webPreferences: {
-             preload: preload
-@@ -1102,7 +1160,7 @@
-           done()
-         })
-         w.destroy()
--        w = new BrowserWindow({
-+        w = createNodeWindow({
-           show: false,
-           webPreferences: {
-             preload: preload
-@@ -1139,7 +1197,7 @@
-           done()
-         })
-         w.destroy()
--        w = new BrowserWindow({
-+        w = createNodeWindow({
-           show: false,
-           webPreferences: {
-             preload: path.join(fixtures, 'module', 'set-global-preload-3.js')
-@@ -1157,7 +1215,7 @@
-           done()
-         })
-         w.destroy()
--        w = new BrowserWindow({
-+        w = createNodeWindow({
-           show: false,
-           webPreferences: {
-             preload: preload,
-@@ -1174,7 +1232,7 @@
-           done()
-         })
-         w.destroy()
--        w = new BrowserWindow({
-+        w = createNodeWindow({
-           show: false,
-           webPreferences: {
-             preload: preload,
-@@ -1194,7 +1252,7 @@
-           done()
-         })
-         w.destroy()
--        w = new BrowserWindow({
-+        w = createNodeWindow({
-           show: false,
-           webPreferences: {
-             preload: preload,
-@@ -1246,7 +1304,7 @@
-           done()
-         })
-         w.destroy()
--        w = new BrowserWindow({
-+        w = createNodeWindow({
-           show: false,
-           webPreferences: {
-             sandbox: true,
-@@ -1263,7 +1321,7 @@
-           done()
-         })
-         w.destroy()
--        w = new BrowserWindow({
-+        w = createNodeWindow({
-           show: false,
-           webPreferences: {
-             sandbox: true,
-@@ -1275,7 +1333,7 @@
- 
-       it('exposes "exit" event to preload script', function (done) {
-         w.destroy()
--        w = new BrowserWindow({
-+        w = createNodeWindow({
-           show: false,
-           webPreferences: {
-             sandbox: true,
-@@ -1297,9 +1355,10 @@
- 
-       it('should open windows in same domain with cross-scripting enabled', (done) => {
-         w.destroy()
--        w = new BrowserWindow({
-+        w = createNodeWindow({
-           show: false,
-           webPreferences: {
-+            nodeIntegration: false,
-             sandbox: true,
-             preload: preload
-           }
-@@ -1326,7 +1385,7 @@
- 
-       it('should open windows in another domain with cross-scripting disabled', (done) => {
-         w.destroy()
--        w = new BrowserWindow({
-+        w = createNodeWindow({
-           show: false,
-           webPreferences: {
-             sandbox: true,
-@@ -1365,7 +1424,7 @@
- 
-       it('should inherit the sandbox setting in opened windows', (done) => {
-         w.destroy()
--        w = new BrowserWindow({
-+        w = createNodeWindow({
-           show: false,
-           webPreferences: {
-             sandbox: true
-@@ -1383,7 +1442,7 @@
- 
-       it('should open windows with the options configured via new-window event listeners', (done) => {
-         w.destroy()
--        w = new BrowserWindow({
-+        w = createNodeWindow({
-           show: false,
-           webPreferences: {
-             sandbox: true
-@@ -1402,7 +1461,7 @@
- 
-       it('should set ipc event sender correctly', (done) => {
-         w.destroy()
--        w = new BrowserWindow({
-+        w = createNodeWindow({
-           show: false,
-           webPreferences: {
-             sandbox: true,
-@@ -1468,7 +1527,7 @@
- 
-       it('can get printer list', (done) => {
-         w.destroy()
--        w = new BrowserWindow({
-+        w = createNodeWindow({
-           show: false,
-           webPreferences: {
-             sandbox: true,
-@@ -1485,7 +1544,7 @@
- 
-       it('can print to PDF', (done) => {
-         w.destroy()
--        w = new BrowserWindow({
-+        w = createNodeWindow({
-           show: false,
-           webPreferences: {
-             sandbox: true,
-@@ -1505,7 +1564,7 @@
- 
-       it('supports calling preventDefault on new-window events', (done) => {
-         w.destroy()
--        w = new BrowserWindow({
-+        w = createNodeWindow({
-           show: false,
-           webPreferences: {
-             sandbox: true
-@@ -1526,7 +1585,7 @@
- 
-       it('releases memory after popup is closed', (done) => {
-         w.destroy()
--        w = new BrowserWindow({
-+        w = createNodeWindow({
-           show: false,
-           webPreferences: {
-             preload: preload,
-@@ -1549,7 +1608,7 @@
-       // see #9387
-       it('properly manages remote object references after page reload', (done) => {
-         w.destroy()
--        w = new BrowserWindow({
-+        w = createNodeWindow({
-           show: false,
-           webPreferences: {
-             preload: preload,
-@@ -1582,7 +1641,7 @@
- 
-       it('properly manages remote object references after page reload in child window', (done) => {
-         w.destroy()
--        w = new BrowserWindow({
-+        w = createNodeWindow({
-           show: false,
-           webPreferences: {
-             preload: preload,
-@@ -1631,7 +1690,7 @@
-         })
-         remote.process.env.sandboxmain = 'foo'
-         w.destroy()
--        w = new BrowserWindow({
-+        w = createNodeWindow({
-           show: false,
-           webPreferences: {
-             sandbox: true,
-@@ -1643,7 +1702,7 @@
- 
-       it('webview in sandbox renderer', async () => {
-         w.destroy()
--        w = new BrowserWindow({
-+        w = createNodeWindow({
-           show: false,
-           webPreferences: {
-             sandbox: true,
-@@ -1662,7 +1721,7 @@
-     describe('nativeWindowOpen option', () => {
-       beforeEach(() => {
-         w.destroy()
--        w = new BrowserWindow({
-+        w = createNodeWindow({
-           show: false,
-           webPreferences: {
-             nativeWindowOpen: true
-@@ -1713,7 +1772,7 @@
-       })
-       it('should inherit the nativeWindowOpen setting in opened windows', (done) => {
-         w.destroy()
--        w = new BrowserWindow({
-+        w = createNodeWindow({
-           show: false,
-           webPreferences: {
-             nativeWindowOpen: true
-@@ -1730,7 +1789,7 @@
-       })
-       it('should open windows with the options configured via new-window event listeners', (done) => {
-         w.destroy()
--        w = new BrowserWindow({
-+        w = createNodeWindow({
-           show: false,
-           webPreferences: {
-             nativeWindowOpen: true
-@@ -1751,7 +1810,7 @@
-         await serveFileFromProtocol('bar', path.join(fixtures, 'api', 'window-open-location-final.html'))
- 
-         w.destroy()
--        w = new BrowserWindow({
-+        w = createNodeWindow({
-           show: true,
-           webPreferences: {
-             nodeIntegration: false,
-@@ -1776,7 +1835,7 @@
-   describe('nativeWindowOpen + contextIsolation options', () => {
-     beforeEach(() => {
-       w.destroy()
--      w = new BrowserWindow({
-+      w = createNodeWindow({
-         show: false,
-         webPreferences: {
-           nativeWindowOpen: true,
-@@ -1882,7 +1941,7 @@
-     afterEach(() => { ipcMain.removeAllListeners('pong') })
- 
-     it('visibilityState is initially visible despite window being hidden', (done) => {
--      w = new BrowserWindow({ show: false, width: 100, height: 100 })
-+      w = createNodeWindow({ show: false, width: 100, height: 100 })
- 
-       let readyToShow = false
-       w.once('ready-to-show', () => {
-@@ -1900,7 +1959,7 @@
-       w.loadURL(`file://${path.join(fixtures, 'pages', 'visibilitychange.html')}`)
-     })
-     it('visibilityState changes when window is hidden', (done) => {
--      w = new BrowserWindow({width: 100, height: 100})
-+      w = createNodeWindow({width: 100, height: 100})
- 
-       onNextVisibilityChange((visibilityState, hidden) => {
-         assert.equal(visibilityState, 'visible')
-@@ -1918,7 +1977,7 @@
-       w.loadURL(`file://${path.join(fixtures, 'pages', 'visibilitychange.html')}`)
-     })
-     it('visibilityState changes when window is shown', (done) => {
--      w = new BrowserWindow({width: 100, height: 100})
-+      w = createNodeWindow({width: 100, height: 100})
- 
-       onNextVisibilityChange((visibilityState, hidden) => {
-         onVisibilityChange((visibilityState, hidden) => {
-@@ -1944,7 +2003,7 @@
-         return done()
-       }
- 
--      w = new BrowserWindow({width: 100, height: 100})
-+      w = createNodeWindow({width: 100, height: 100})
- 
-       onNextVisibilityChange((visibilityState, hidden) => {
-         onVisibilityChange((visibilityState, hidden) => {
-@@ -1970,7 +2029,7 @@
-         return done()
-       }
- 
--      w = new BrowserWindow({width: 100, height: 100})
-+      w = createNodeWindow({width: 100, height: 100})
- 
-       onNextVisibilityChange((visibilityState, hidden) => {
-         assert.equal(visibilityState, 'visible')
-@@ -1988,7 +2047,7 @@
-       w.loadURL(`file://${path.join(fixtures, 'pages', 'visibilitychange.html')}`)
-     })
-     it('visibilityState remains visible if backgroundThrottling is disabled', (done) => {
--      w = new BrowserWindow({
-+      w = createNodeWindow({
-         show: false,
-         width: 100,
-         height: 100,
-@@ -2040,7 +2099,7 @@
-     })
-     it('emits when window.open is called with no webPreferences', (done) => {
-       w.destroy()
--      w = new BrowserWindow({ show: false })
-+      w = createNodeWindow({ show: false })
-       w.webContents.once('new-window', function (e, url, frameName, disposition, options, additionalFeatures) {
-         e.preventDefault()
-         assert.equal(url, 'http://host/')
-@@ -2111,7 +2170,7 @@
-         sheet.close()
-         done()
-       })
--      sheet = new BrowserWindow({
-+      sheet = createNodeWindow({
-         modal: true,
-         parent: w
-       })
-@@ -2133,7 +2192,7 @@
- 
-     it('emits when window has closed a sheet', (done) => {
-       w.show()
--      sheet = new BrowserWindow({
-+      sheet = createNodeWindow({
-         modal: true,
-         parent: w
-       })
-@@ -2230,7 +2289,7 @@
-   describe('BrowserWindow options argument is optional', () => {
-     it('should create a window with default size (800x600)', () => {
-       w.destroy()
--      w = new BrowserWindow()
-+      w = createNodeWindow()
-       const size = w.getSize()
-       assert.equal(size[0], 800)
-       assert.equal(size[1], 600)
-@@ -2240,7 +2299,7 @@
-   describe('window states', () => {
-     it('does not resize frameless windows when states change', () => {
-       w.destroy()
--      w = new BrowserWindow({
-+      w = createNodeWindow({
-         frame: false,
-         width: 300,
-         height: 200,
-@@ -2271,7 +2330,7 @@
-     describe('resizable state', () => {
-       it('can be changed with resizable option', () => {
-         w.destroy()
--        w = new BrowserWindow({show: false, resizable: false})
-+        w = createNodeWindow({show: false, resizable: false})
-         assert.equal(w.isResizable(), false)
- 
-         if (process.platform === 'darwin') {
-@@ -2289,12 +2348,12 @@
- 
-       it('works for a frameless window', () => {
-         w.destroy()
--        w = new BrowserWindow({show: false, frame: false})
-+        w = createNodeWindow({show: false, frame: false})
-         assert.equal(w.isResizable(), true)
- 
-         if (process.platform === 'win32') {
-           w.destroy()
--          w = new BrowserWindow({show: false, thickFrame: false})
-+          w = createNodeWindow({show: false, thickFrame: false})
-           assert.equal(w.isResizable(), false)
-         }
-       })
-@@ -2302,7 +2361,7 @@
-       if (process.platform === 'win32') {
-         it('works for a window smaller than 64x64', () => {
-           w.destroy()
--          w = new BrowserWindow({
-+          w = createNodeWindow({
-             show: false,
-             frame: false,
-             resizable: false,
-@@ -2370,7 +2429,7 @@
-     describe('movable state', () => {
-       it('can be changed with movable option', () => {
-         w.destroy()
--        w = new BrowserWindow({show: false, movable: false})
-+        w = createNodeWindow({show: false, movable: false})
-         assert.equal(w.isMovable(), false)
-       })
-       it('can be changed with setMovable method', () => {
-@@ -2385,7 +2444,7 @@
-     describe('minimizable state', () => {
-       it('can be changed with minimizable option', () => {
-         w.destroy()
--        w = new BrowserWindow({show: false, minimizable: false})
-+        w = createNodeWindow({show: false, minimizable: false})
-         assert.equal(w.isMinimizable(), false)
-       })
- 
-@@ -2401,7 +2460,7 @@
-     describe('maximizable state', () => {
-       it('can be changed with maximizable option', () => {
-         w.destroy()
--        w = new BrowserWindow({show: false, maximizable: false})
-+        w = createNodeWindow({show: false, maximizable: false})
-         assert.equal(w.isMaximizable(), false)
-       })
- 
-@@ -2450,7 +2509,7 @@
- 
-       it('can be changed with fullscreenable option', () => {
-         w.destroy()
--        w = new BrowserWindow({show: false, fullscreenable: false})
-+        w = createNodeWindow({show: false, fullscreenable: false})
-         assert.equal(w.isFullScreenable(), false)
-       })
- 
-@@ -2474,7 +2533,7 @@
- 
-       it('can be changed with setKiosk method', (done) => {
-         w.destroy()
--        w = new BrowserWindow()
-+        w = createNodeWindow()
-         w.setKiosk(true)
-         assert.equal(w.isKiosk(), true)
- 
-@@ -2498,7 +2557,7 @@
- 
-       it('resizable flag should be set to true and restored', (done) => {
-         w.destroy()
--        w = new BrowserWindow({ resizable: false })
-+        w = createNodeWindow({ resizable: false })
-         w.once('enter-full-screen', () => {
-           assert.equal(w.isResizable(), true)
-           w.setFullScreen(false)
-@@ -2522,7 +2581,7 @@
- 
-       it('can be changed with setFullScreen method', (done) => {
-         w.destroy()
--        w = new BrowserWindow()
-+        w = createNodeWindow()
-         w.once('enter-full-screen', () => {
-           assert.equal(w.isFullScreen(), true)
-           w.setFullScreen(false)
-@@ -2536,7 +2595,7 @@
- 
-       it('should not be changed by setKiosk method', (done) => {
-         w.destroy()
--        w = new BrowserWindow()
-+        w = createNodeWindow()
-         w.once('enter-full-screen', () => {
-           assert.equal(w.isFullScreen(), true)
-           w.setKiosk(true)
-@@ -2555,7 +2614,7 @@
-     describe('closable state', () => {
-       it('can be changed with closable option', () => {
-         w.destroy()
--        w = new BrowserWindow({show: false, closable: false})
-+        w = createNodeWindow({show: false, closable: false})
-         assert.equal(w.isClosable(), false)
-       })
- 
-@@ -2574,7 +2633,7 @@
-       it('can be changed with hasShadow option', () => {
-         w.destroy()
-         let hasShadow = process.platform !== 'darwin'
--        w = new BrowserWindow({show: false, hasShadow: hasShadow})
-+        w = createNodeWindow({show: false, hasShadow: hasShadow})
-         assert.equal(w.hasShadow(), hasShadow)
-       })
- 
-@@ -2594,7 +2653,7 @@
-     it('should restore the previous window size', () => {
-       if (w != null) w.destroy()
- 
--      w = new BrowserWindow({
-+      w = createNodeWindow({
-         minWidth: 800,
-         width: 800
-       })
-@@ -2609,7 +2668,7 @@
-   describe('BrowserWindow.unmaximize()', () => {
-     it('should restore the previous window position', () => {
-       if (w != null) w.destroy()
--      w = new BrowserWindow()
-+      w = createNodeWindow()
- 
-       const initialPosition = w.getPosition()
-       w.maximize()
-@@ -2663,7 +2722,7 @@
-     // TODO(alexeykuzmin): [Ch66] Enable the test. Fails on CI bots, passes locally.
-     xit('exits HTML fullscreen when window leaves fullscreen', (done) => {
-       w.destroy()
--      w = new BrowserWindow()
-+      w = createNodeWindow()
-       w.webContents.once('did-finish-load', () => {
-         w.once('enter-full-screen', () => {
-           w.once('leave-html-full-screen', () => {
-@@ -2682,7 +2741,7 @@
- 
-     beforeEach(() => {
-       if (c != null) c.destroy()
--      c = new BrowserWindow({show: false, parent: w})
-+      c = createNodeWindow({show: false, parent: w})
-     })
- 
-     afterEach(() => {
-@@ -2720,7 +2779,7 @@
- 
-       beforeEach(() => {
-         if (c != null) c.destroy()
--        c = new BrowserWindow({show: false})
-+        c = createNodeWindow({show: false})
-       })
- 
-       it('sets parent window', () => {
-@@ -2758,7 +2817,7 @@
- 
-       beforeEach(() => {
-         if (c != null) c.destroy()
--        c = new BrowserWindow({show: false, parent: w, modal: true})
-+        c = createNodeWindow({show: false, parent: w, modal: true})
-       })
- 
-       it('disables parent window', () => {
-@@ -2775,7 +2834,7 @@
-         c.close()
-       })
-       it('disables parent window recursively', () => {
--        let c2 = new BrowserWindow({show: false, parent: w, modal: true})
-+        let c2 = createNodeWindow({show: false, parent: w, modal: true})
-         c.show()
-         assert.equal(w.isEnabled(), false)
-         c2.show()
-@@ -2936,7 +2995,7 @@
-       if (w != null) {
-         w.destroy()
-       }
--      w = new BrowserWindow({
-+      w = createNodeWindow({
-         show: false,
-         webPreferences: {
-           partition: 'temp'
-@@ -3145,7 +3204,7 @@
- 
-     beforeEach(() => {
-       if (w != null) w.destroy()
--      w = new BrowserWindow({
-+      w = createNodeWindow({
-         show: false,
-         webPreferences: {
-           contextIsolation: true,
-@@ -3153,7 +3212,7 @@
-         }
-       })
-       if (ws != null) ws.destroy()
--      ws = new BrowserWindow({
-+      ws = createNodeWindow({
-         show: false,
-         webPreferences: {
-           sandbox: true,
-@@ -3219,7 +3278,7 @@
-       }
- 
-       if (w != null) w.destroy()
--      w = new BrowserWindow({
-+      w = createNodeWindow({
-         width: 100,
-         height: 100,
-         show: false,
-@@ -3248,7 +3307,7 @@
-       })
- 
-       it('is false for regular window', () => {
--        let c = new BrowserWindow({show: false})
-+        let c = createNodeWindow({show: false})
-         assert.equal(c.webContents.isOffscreen(), false)
-         c.destroy()
-       })
-merged
-  result 100644 9118f2249d486c2472c7e309ba633284f193d727 spec/api-crash-reporter-spec.js
-  our    100644 dd31b91e1244785412b87db96bb141599e5ccb0f spec/api-crash-reporter-spec.js
-@@ -39,7 +39,14 @@
- 
-       beforeEach(() => {
-         stopServer = null
--        w = new BrowserWindow(Object.assign({ show: false }, browserWindowOpts))
-+        w = new BrowserWindow({
-+          show: false,
-+          ...browserWindowOpts,
-+          webPreferences: {
-+            nodeIntegration: true,
-+            ...(browserWindowOpts.webPreferences || {})
-+          }
-+        })
-       })
- 
-       afterEach(() => closeWindow(w).then(() => { w = null }))
-merged
-  result 100644 78fccc0d7870407e8da73257ffbdbf2de488058e spec/api-debugger-spec.js
-  our    100644 0f5cc614c98bfe6c679575bc1a9c76e3b145ac71 spec/api-debugger-spec.js
-@@ -16,7 +16,8 @@
-     w = new BrowserWindow({
-       show: false,
-       width: 400,
--      height: 400
-+      height: 400,
-+      webPreferences: { nodeIntegration: true }
-     })
-   })
- 
-merged
-  result 100644 2bb1f5eb628b7e04d94ead49a2e7ed0b831620a6 spec/api-ipc-main-spec.js
-  our    100644 e31369faca4d4ee7ff24fdae4aa9a404ed8d28f4 spec/api-ipc-main-spec.js
-@@ -11,6 +11,13 @@
- const {remote} = require('electron')
- const {ipcMain, BrowserWindow} = remote
- 
-+const createWindow = () => new BrowserWindow({
-+  show: false,
-+  webPreferences: {
-+    nodeIntegration: true
-+  }
-+})
-+
- describe('ipc main module', () => {
-   const fixtures = path.join(__dirname, 'fixtures')
- 
-@@ -22,7 +29,7 @@
-     afterEach(() => { ipcMain.removeAllListeners('send-sync-message') })
- 
-     it('does not crash when reply is not sent and browser is destroyed', (done) => {
--      w = new BrowserWindow({ show: false })
-+      w = createWindow()
-       ipcMain.once('send-sync-message', (event) => {
-         event.returnValue = null
-         done()
-@@ -31,7 +38,7 @@
-     })
- 
-     it('does not crash when reply is sent by multiple listeners', (done) => {
--      w = new BrowserWindow({ show: false })
-+      w = createWindow()
-       ipcMain.on('send-sync-message', (event) => {
-         event.returnValue = null
-       })
-@@ -45,7 +52,7 @@
- 
-   describe('remote listeners', () => {
-     it('can be added and removed correctly', () => {
--      w = new BrowserWindow({ show: false })
-+      w = createWindow()
-       const listener = () => {}
- 
-       w.on('test', listener)
-@@ -69,7 +76,7 @@
- 
-   describe('remote objects registry', () => {
-     it('does not dereference until the render view is deleted (regression)', (done) => {
--      w = new BrowserWindow({ show: false })
-+      w = createWindow()
- 
-       ipcMain.once('error-message', (event, message) => {
-         const correctMsgStart = message.startsWith('Cannot call function \'getURL\' on missing remote object')
-merged
-  result 100644 207347df22e59935ea9602d118a76fa2b2bb2b5a spec/api-ipc-renderer-spec.js
-  our    100644 748851ec1c0a7e499bdfd9d0ae4cd1be1d02d705 spec/api-ipc-renderer-spec.js
-@@ -132,7 +132,11 @@
-   describe('ipcRenderer.sendTo', () => {
-     let contents = null
- 
--    beforeEach(() => { contents = webContents.create({}) })
-+    beforeEach(() => {
-+      contents = webContents.create({
-+        nodeIntegration: true
-+      })
-+    })
- 
-     afterEach(() => {
-       ipcRenderer.removeAllListeners('pong')
-@@ -158,7 +162,12 @@
- 
-   describe('remote listeners', () => {
-     it('detaches listeners subscribed to destroyed renderers, and shows a warning', (done) => {
--      w = new BrowserWindow({ show: false })
-+      w = new BrowserWindow({
-+        show: false,
-+        webPreferences: {
-+          nodeIntegration: true
-+        }
-+      })
- 
-       w.webContents.once('did-finish-load', () => {
-         w.webContents.once('did-finish-load', () => {
-merged
-  result 100644 29d2f5ef1516c30caad9e442d40c8e0901e9ff54 spec/api-menu-item-spec.js
-  our    100644 fb3ee998eace4401d6f129930d802677ce5feb85 spec/api-menu-item-spec.js
-@@ -9,6 +9,16 @@
- const {expect} = chai
- chai.use(dirtyChai)
- 
-+const createWindow = () =>
-+  new BrowserWindow({
-+    show: false,
-+    width: 200,
-+    height: 200,
-+    webPreferences: {
-+      nodeIntegration: false
-+    }
-+  })
-+
- describe('MenuItems', () => {
-   describe('MenuItem.click', () => {
-     it('should be called with the item object passed', done => {
-@@ -142,7 +152,7 @@
- 
-   describe('MenuItem role execution', () => {
-     it('does not try to execute roles without a valid role property', () => {
--      let win = new BrowserWindow({show: false, width: 200, height: 200})
-+      let win = createWindow()
-       let item = new MenuItem({role: 'asdfghjkl'})
- 
-       const canExecute = roles.execute(item.role, win, win.webContents)
-@@ -152,7 +162,7 @@
-     })
- 
-     it('executes roles with native role functions', () => {
--      let win = new BrowserWindow({show: false, width: 200, height: 200})
-+      let win = createWindow()
-       let item = new MenuItem({role: 'reload'})
- 
-       const canExecute = roles.execute(item.role, win, win.webContents)
-@@ -162,7 +172,7 @@
-     })
- 
-     it('execute roles with non-native role functions', () => {
--      let win = new BrowserWindow({show: false, width: 200, height: 200})
-+      let win = createWindow()
-       let item = new MenuItem({role: 'resetzoom'})
- 
-       const canExecute = roles.execute(item.role, win, win.webContents)
-changed in both
-  base   100644 99b0f3cf34c5d043ae98bc9da3b001001389c88c spec/api-menu-spec.js
-  our    100644 ed2749700c6c8bf299f507d52606c1ae3f597e5c spec/api-menu-spec.js
-  their  100644 9e57b5a82467c84fe4231b895e76f70b8c5fd74a spec/api-menu-spec.js
-@@ -634,7 +634,14 @@
-     let menu
- 
-     beforeEach(() => {
--      w = new BrowserWindow({show: false, width: 200, height: 200})
-+      w = new BrowserWindow({
-+        show: false,
-+        width: 200,
-+        height: 200,
-+        webPreferences: {
-+          nodeIntegration: true
-+        }
-+      })
-       menu = Menu.buildFromTemplate([
-         {label: '1'},
-         {label: '2'},
-merged
-  result 100644 5d54d60f690bcf0e0aa0b0e23a0d6d0f05ffa0ef spec/api-protocol-spec.js
-  our    100644 cd2e451989836c1a8bf14666088f8364d31081b8 spec/api-protocol-spec.js
-@@ -464,7 +464,9 @@
-         const handler = (request, callback) => callback({url: redirectURL})
-         protocol.registerHttpProtocol(protocolName, handler, (error) => {
-           if (error) return done(error)
--          contents = webContents.create({})
-+          contents = webContents.create({
-+            nodeIntegration: true
-+          })
-           contents.on('did-finish-load', () => {
-             assert.equal(contents.getURL(), url)
-             server.close()
-@@ -970,7 +972,12 @@
-     let success = null
- 
-     beforeEach(() => {
--      w = new BrowserWindow({show: false})
-+      w = new BrowserWindow({
-+        show: false,
-+        webPreferences: {
-+          nodeIntegration: true
-+        }
-+      })
-       success = false
-     })
- 
-changed in both
-  base   100644 7ac14e1f1f88549aa6594e96906cc77906c0accd spec/api-session-spec.js
-  our    100644 b9093d1d6335ece5ca713a668a67bf3b40f4fabe spec/api-session-spec.js
-  their  100644 c62a58edd1c4084e0721c3d219d8eead7d50cfa8 spec/api-session-spec.js
-@@ -23,7 +23,10 @@
-     w = new BrowserWindow({
-       show: false,
-       width: 400,
--      height: 400
-+      height: 400,
-+      webPreferences: {
-+        nodeIntegration: true
-+      }
-     })
-   })
- 
-@@ -241,7 +244,10 @@
-       w = new BrowserWindow({
-         show: false,
-         width: 400,
--        height: 400
-+        height: 400,
-+        webPreferences: {
-+          nodeIntegration: true
-+        }
-       })
-     })
- 
-@@ -447,6 +453,7 @@
-       w = new BrowserWindow({
-         show: false,
-         webPreferences: {
-+          nodeIntegration: true,
-           partition: partitionName
-         }
-       })
-@@ -507,7 +514,12 @@
-       const url = `${scheme}://host`
-       before(() => {
-         if (w != null) w.destroy()
--        w = new BrowserWindow({show: false})
-+        w = new BrowserWindow({
-+          show: false,
-+          webPreferences: {
-+            nodeIntegration: true
-+          }
-+        })
-       })
- 
-       after((done) => {
-merged
-  result 100644 b38363cb5959304cf44e7f7822a44307d3449074 spec/api-touch-bar-spec.js
-  our    100644 18dd414f688e099179f8e8d6b558e8f87ac21465 spec/api-touch-bar-spec.js
-@@ -37,7 +37,11 @@
-     let window
- 
-     beforeEach(() => {
--      window = new BrowserWindow()
-+      window = new BrowserWindow({
-+        webPreferences: {
-+          nodeIntegration: true
-+        }
-+      })
-     })
- 
-     afterEach(() => {
-changed in both
-  base   100644 b1b1d206a2934dbc0e6d3b57cffdc9b9345d7b7a spec/api-web-contents-spec.js
-  our    100644 be02cb3f84001a541d64b11fe6eda50fc32e8afd spec/api-web-contents-spec.js
-  their  100644 b092a9024b666df77cde194480910c15c38c5005 spec/api-web-contents-spec.js
-@@ -29,7 +29,8 @@
-       width: 400,
-       height: 400,
-       webPreferences: {
--        backgroundThrottling: false
-+        backgroundThrottling: false,
-+        nodeIntegration: true
-       }
-     })
-   })
-@@ -100,7 +101,12 @@
- 
-   describe('setDevToolsWebContents() API', () => {
-     it('sets arbitry webContents as devtools', (done) => {
--      let devtools = new BrowserWindow({show: false})
-+      let devtools = new BrowserWindow({
-+        show: false,
-+        webPreferences: {
-+          nodeIntegration: true
-+        }
-+      })
-       devtools.webContents.once('dom-ready', () => {
-         assert.ok(devtools.getURL().startsWith('chrome-devtools://devtools'))
-         devtools.webContents.executeJavaScript('InspectorFrontendHost.constructor.name', (name) => {
-@@ -457,7 +463,10 @@
- 
-     it('can propagate zoom level across same session', (done) => {
-       const w2 = new BrowserWindow({
--        show: false
-+        show: false,
-+        webPreferences: {
-+          nodeIntegration: true
-+        }
-       })
-       w2.webContents.on('did-finish-load', () => {
-         w.webContents.getZoomLevel((zoomLevel1) => {
-@@ -481,6 +490,7 @@
-       const w2 = new BrowserWindow({
-         show: false,
-         webPreferences: {
-+          nodeIntegration: true,
-           partition: 'temp'
-         }
-       })
-@@ -541,7 +551,10 @@
-     it('cannot propagate when used with webframe', (done) => {
-       let finalZoomLevel = 0
-       const w2 = new BrowserWindow({
--        show: false
-+        show: false,
-+        webPreferences: {
-+          nodeIntegration: true
-+        }
-       })
-       w2.webContents.on('did-finish-load', () => {
-         w.webContents.getZoomLevel((zoomLevel1) => {
-@@ -782,6 +795,7 @@
-       w = new BrowserWindow({
-         show: false,
-         webPreferences: {
-+          nodeIntegration: false,
-           sandbox: true
-         }
-       })
-merged
-  result 100644 542ed3047ecb703168c3fd87459da037ace52899 spec/api-web-contents-view-spec.js
-  our    100644 b61ddb6163868dbae155670436ad02f7bd7dfa65 spec/api-web-contents-view-spec.js
-@@ -9,13 +9,17 @@
-   afterEach(() => closeWindow(w).then(() => { w = null }))
- 
-   it('can be used as content view', () => {
--    const web = webContents.create({})
-+    const web = webContents.create({
-+      nodeIntegration: true
-+    })
-     w = new TopLevelWindow({show: false})
-     w.setContentView(new WebContentsView(web))
-   })
- 
-   it('prevents adding same WebContents', () => {
--    const web = webContents.create({})
-+    const web = webContents.create({
-+      nodeIntegration: true
-+    })
-     w = new TopLevelWindow({show: false})
-     w.setContentView(new WebContentsView(web))
-     assert.throws(() => {
-changed in both
-  base   100644 5a03ca22685eb3e5c54b2feb1efb9b2d51d07ed6 spec/api-web-frame-spec.js
-  our    100644 b8fd10b5d3f1319640fb209c707c758d0a0403d2 spec/api-web-frame-spec.js
-  their  100644 5c4a79a49651312067d0c0900ee46d4279815c7f spec/api-web-frame-spec.js
-@@ -109,7 +109,12 @@
-       runNumber++
- 
-       const url = standardScheme + '://fake-host'
--      w = new BrowserWindow({show: false})
-+      w = new BrowserWindow({
-+        show: false,
-+        webPreferences: {
-+          nodeIntegration: true
-+        }
-+      })
-       after(function (done) {
-         protocol.unregisterProtocol(corsScheme, function () {
-           protocol.unregisterProtocol(standardScheme, function () {
-changed in both
-  base   100644 131619d5f21985ae1b904f53a37af8959a9ff11e spec/asar-spec.js
-  our    100644 489f68c96d41e80c308560a98486a07756a03be7 spec/asar-spec.js
-  their  100644 7c6cb14dcee9c660daaf98040aa7154ba29346bd spec/asar-spec.js
-@@ -11,6 +11,16 @@
- const ipcMain = remote.require('electron').ipcMain
- const BrowserWindow = remote.require('electron').BrowserWindow
- 
-+const createWindow = () =>
-+  new BrowserWindow({
-+    show: false,
-+    width: 400,
-+    height: 400,
-+    webPreferences: {
-+      nodeIntegration: true
-+    }
-+  })
-+
- describe('asar package', function () {
-   var fixtures = path.join(__dirname, 'fixtures')
- 
-@@ -1058,11 +1068,7 @@
-         ipcMain.removeAllListeners('dirname')
-       })
- 
--      w = new BrowserWindow({
--        show: false,
--        width: 400,
--        height: 400
--      })
-+      w = createWindow()
-       var p = path.resolve(fixtures, 'asar', 'web.asar', 'index.html')
-       var u = url.format({
-         protocol: 'file',
-@@ -1081,11 +1087,7 @@
-         ipcMain.removeAllListeners('ping')
-       })
- 
--      w = new BrowserWindow({
--        show: false,
--        width: 400,
--        height: 400
--      })
-+      w = createWindow()
-       var p = path.resolve(fixtures, 'asar', 'script.asar', 'index.html')
-       var u = url.format({
-         protocol: 'file',
-@@ -1106,11 +1108,7 @@
-         ipcMain.removeAllListeners('asar-video')
-       })
- 
--      w = new BrowserWindow({
--        show: false,
--        width: 400,
--        height: 400
--      })
-+      w = createWindow()
-       var p = path.resolve(fixtures, 'asar', 'video.asar', 'index.html')
-       var u = url.format({
-         protocol: 'file',
-changed in both
-  base   100644 98975eccc24b9e433d6da8f7dd95590f7e7eaa7d spec/chromium-spec.js
-  our    100644 d90269769d269e4054d25cba4b6c4ac8a1929aa6 spec/chromium-spec.js
-  their  100644 3d46a9a6886b210014c254e79ec87e85493cf4a6 spec/chromium-spec.js
-@@ -72,7 +72,12 @@
- 
-   describe('accessing key names also used as Node.js module names', () => {
-     it('does not crash', (done) => {
--      w = new BrowserWindow({show: false})
-+      w = new BrowserWindow({
-+        show: false,
-+        webPreferences: {
-+          nodeIntegration: true
-+        }
-+      })
-       w.webContents.once('did-finish-load', () => { done() })
-       w.webContents.once('crashed', () => done(new Error('WebContents crashed.')))
-       w.loadURL(`file://${fixtures}/pages/external-string.html`)
-@@ -128,6 +133,7 @@
-       w = new BrowserWindow({
-         show: false,
-         webPreferences: {
-+          nodeIntegration: true,
-           session: ses
-         }
-       })
-@@ -168,6 +174,7 @@
-       w = new BrowserWindow({
-         show: false,
-         webPreferences: {
-+          nodeIntegration: true,
-           partition: 'sw-file-scheme-spec'
-         }
-       })
-@@ -205,7 +212,10 @@
- 
-       w = new BrowserWindow({
-         show: false,
--        webPreferences: { session: customSession }
-+        webPreferences: {
-+          nodeIntegration: true,
-+          session: customSession
-+        }
-       })
-       w.webContents.on('ipc-message', (event, args) => {
-         if (args[0] === 'reload') {
-@@ -261,7 +271,12 @@
- 
-     for (const show of [true, false]) {
-       it(`inherits parent visibility over parent {show=${show}} option`, (done) => {
--        const w = new BrowserWindow({show})
-+        const w = new BrowserWindow({
-+          show,
-+          webPreferences: {
-+            nodeIntegration: true
-+          }
-+        })
- 
-         // toggle visibility
-         if (show) {
-@@ -516,7 +531,12 @@
-     let url = `file://${fixtures}/pages/window-opener.html`
- 
-     it('is null for main window', (done) => {
--      w = new BrowserWindow({ show: false })
-+      w = new BrowserWindow({
-+        show: false,
-+        webPreferences: {
-+          nodeIntegration: true
-+        }
-+      })
-       w.webContents.once('ipc-message', (event, args) => {
-         assert.deepEqual(args, ['opener', null])
-         done()
-@@ -906,7 +926,9 @@
-       })
- 
-       beforeEach(() => {
--        contents = webContents.create({})
-+        contents = webContents.create({
-+          nodeIntegration: true
-+        })
-       })
- 
-       afterEach(() => {
-@@ -1076,6 +1098,7 @@
-         w = new BrowserWindow({
-           show: false,
-           webPreferences: {
-+            nodeIntegration: true,
-             preload: path.join(fixtures, 'module', preload),
-             plugins: plugins
-           }
-@@ -1196,7 +1219,12 @@
- 
-     describe('window.history.pushState', () => {
-       it('should push state after calling history.pushState() from the same url', (done) => {
--        w = new BrowserWindow({ show: false })
-+        w = new BrowserWindow({
-+          show: false,
-+          webPreferences: {
-+            nodeIntegration: true
-+          }
-+        })
-         w.webContents.once('did-finish-load', () => {
-           // History should have current page by now.
-           assert.equal(w.webContents.length(), 1)
-merged
-  result 100644 ec3f35d66516aedb1e21a7de227c3a6fb7f9260f spec/fixtures/api/exit-closes-all-windows-app/main.js
-  our    100644 c97d8d1f195ba4cb44abeddbe70872507ed538b8 spec/fixtures/api/exit-closes-all-windows-app/main.js
-@@ -3,7 +3,12 @@
- const windows = []
- 
- function createWindow (id) {
--  const window = new BrowserWindow({show: false})
-+  const window = new BrowserWindow({
-+    show: false,
-+    webPreferences: {
-+      nodeIntegration: true
-+    }
-+  })
-   window.loadURL(`data:,window${id}`)
-   windows.push(window)
- }
-changed in both
-  base   100644 19b69e0189b16aa76e6d1f75ee5b2aabaaab031d spec/fixtures/api/mixed-sandbox-app/main.js
-  our    100644 3a6945b0f2a1cb645a6ca7b0a97356c0164cc3b8 spec/fixtures/api/mixed-sandbox-app/main.js
-  their  100644 2a3d7fdd0d012127ebb0aa45e8f9279ea1cccfbf spec/fixtures/api/mixed-sandbox-app/main.js
-@@ -13,6 +13,7 @@
- let currentWindowSandboxed = false
- 
- app.once('ready', () => {
-+<<<<<<< .our
-   function testWindow (isSandboxed, callback) {
-     currentWindowSandboxed = isSandboxed
-     let currentWindow = new BrowserWindow({
-@@ -36,6 +37,27 @@
-     })
-     currentWindow.webContents.openDevTools()
-   }
-+=======
-+  sandboxWindow = new BrowserWindow({
-+    show: false,
-+    webPreferences: {
-+      nodeIntegration: true,
-+      preload: path.join(__dirname, 'electron-app-mixed-sandbox-preload.js'),
-+      sandbox: true
-+    }
-+  })
-+  sandboxWindow.loadURL('about:blank')
-+
-+  noSandboxWindow = new BrowserWindow({
-+    show: false,
-+    webPreferences: {
-+      nodeIntegration: true,
-+      preload: path.join(__dirname, 'electron-app-mixed-sandbox-preload.js'),
-+      sandbox: false
-+    }
-+  })
-+  noSandboxWindow.loadURL('about:blank')
-+>>>>>>> .their
- 
-   const argv = {
-     sandbox: null,
-merged
-  result 100644 c64b4c603ade1450cef57479f3d493217660177b spec/fixtures/no-proprietary-codecs.js
-  our    100644 23a7d815a9249d4191d7d5045a83fa683b14824b spec/fixtures/no-proprietary-codecs.js
-@@ -15,7 +15,10 @@
- 
- app.once('ready', () => {
-   window = new BrowserWindow({
--    show: false
-+    show: false,
-+    webPreferences: {
-+      nodeIntegration: true
-+    }
-   })
- 
-   window.loadURL(url.format({
-merged
-  result 100644 19821b33b2c09ae2a3e5be70ad8ba2fc8b07cacc spec/modules-spec.js
-  our    100644 b996b8f4839bff2160bffb69e55263b16a4178d7 spec/modules-spec.js
-@@ -147,7 +147,12 @@
-       let w
- 
-       beforeEach(() => {
--        w = new BrowserWindow({show: false})
-+        w = new BrowserWindow({
-+          show: false,
-+          webPreferences: {
-+            nodeIntegration: true
-+          }
-+        })
-       })
- 
-       afterEach(async () => {
-merged
-  result 100644 982cbd6140ea8bce00c310981841b2556ee0ac4f spec/security-warnings-spec.js
-  our    100644 6315a9420e01b5db19596f0dd5731d47ce02acf6 spec/security-warnings-spec.js
-@@ -59,7 +59,10 @@
-   })
- 
-   it('should warn about Node.js integration with remote content', (done) => {
--    w = new BrowserWindow({ show: false })
-+    w = new BrowserWindow({
-+      show: false,
-+      webPreferences: { nodeIntegration: true }
-+    })
-     w.webContents.once('console-message', (e, level, message) => {
-       assert(message.includes('Node.js Integration with Remote Content'), message)
-       done()
-changed in both
-  base   100644 d920426df3d9595b9366cb7f3e93a7c5471640f9 spec/static/main.js
-  our    100644 5659c44c8de4456a25e0026e29199b827c89cb08 spec/static/main.js
-  their  100644 274a4b79e0065bc153e363c18f11cc48f61032b0 spec/static/main.js
-@@ -131,7 +131,8 @@
-     width: 800,
-     height: 600,
-     webPreferences: {
--      backgroundThrottling: false
-+      backgroundThrottling: false,
-+      nodeIntegration: true
-     }
-   })
-   window.loadURL(url.format({
-@@ -274,7 +275,13 @@
-     }
-   }
-   foo.baz2 = foo.baz
--  const window = new BrowserWindow({show: false, foo: foo})
-+  const window = new BrowserWindow({
-+    show: false,
-+    foo: foo,
-+    webPreferences: {
-+      nodeIntegration: true
-+    }
-+  })
-   event.returnValue = window.id
- })
- 
-@@ -366,7 +373,9 @@
-     contents = w.webContents
-     destroy = () => w.close()
-   } else {
--    contents = webContents.create()
-+    contents = webContents.create({
-+      nodeIntegration: true
-+    })
-     destroy = () => contents.destroy()
-   }
- 
-changed in both
-  base   100644 1025cf74457837d221f90d27640e97354572036c spec/webview-spec.js
-  our    100644 db75a4e3754e24a5e6740be61be4f4098c58006e spec/webview-spec.js
-  their  100644 43e913769c1fdd6ad5797a8537c4a62c5d10eade spec/webview-spec.js
-@@ -25,9 +25,15 @@
-   let webview = null
-   let w = null
- 
--  const openTheWindow = async (...args) => {
-+  const openTheWindow = async (opts, ...args) => {
-     await closeTheWindow()
--    w = new BrowserWindow(...args)
-+    w = new BrowserWindow({
-+      ...opts,
-+      webPreferences: {
-+        nodeIntegration: true,
-+        ...(opts.webPreferences || {})
-+      }
-+    }, ...args)
-     return w
-   }
- 
-@@ -1256,6 +1262,240 @@
-     expect(tabId).to.be.not.equal(w.webContents.id)
-   })
- 
-+<<<<<<< .our
-+=======
-+  // TODO(alexeykuzmin): Some tests rashe a renderer process.
-+  // Fix them and enable the tests.
-+  xdescribe('guestinstance attribute', () => {
-+    it('before loading there is no attribute', () => {
-+      loadWebView(webview)  // Don't wait for loading to finish.
-+      assert(!webview.hasAttribute('guestinstance'))
-+    })
-+
-+    it('loading a page sets the guest view', async () => {
-+      await loadWebView(webview, {
-+        src: `file://${fixtures}/api/blank.html`
-+      })
-+
-+      const instance = webview.getAttribute('guestinstance')
-+      assert.equal(instance, parseInt(instance))
-+
-+      const guest = getGuestWebContents(parseInt(instance))
-+      assert.equal(guest, webview.getWebContents())
-+    })
-+
-+    it('deleting the attribute destroys the webview', async () => {
-+      await loadWebView(webview, {
-+        src: `file://${fixtures}/api/blank.html`
-+      })
-+
-+      const instance = parseInt(webview.getAttribute('guestinstance'))
-+      const waitForDestroy = waitForEvent(webview, 'destroyed')
-+      webview.removeAttribute('guestinstance')
-+
-+      await waitForDestroy
-+      expect(getGuestWebContents(instance)).to.equal(undefined)
-+    })
-+
-+    it('setting the attribute on a new webview moves the contents', (done) => {
-+      const loadListener = () => {
-+        const webContents = webview.getWebContents()
-+        const instance = webview.getAttribute('guestinstance')
-+
-+        const destroyListener = () => {
-+          assert.equal(webContents, webview2.getWebContents())
-+
-+          // Make sure that events are hooked up to the right webview now
-+          webview2.addEventListener('console-message', (e) => {
-+            assert.equal(e.message, 'a')
-+            document.body.removeChild(webview2)
-+            done()
-+          })
-+
-+          webview2.src = `file://${fixtures}/pages/a.html`
-+        }
-+        webview.addEventListener('destroyed', destroyListener, {once: true})
-+
-+        const webview2 = new WebView()
-+        loadWebView(webview2, {
-+          guestinstance: instance
-+        })
-+      }
-+      webview.addEventListener('did-finish-load', loadListener, {once: true})
-+      loadWebView(webview, {
-+        src: `file://${fixtures}/api/blank.html`
-+      })
-+    })
-+
-+    it('setting the attribute to an invalid guestinstance does nothing', async () => {
-+      await loadWebView(webview, {
-+        src: `file://${fixtures}/api/blank.html`
-+      })
-+      webview.setAttribute('guestinstance', 55)
-+
-+      // Make sure that events are still hooked up to the webview
-+      const waitForMessage = waitForEvent(webview, 'console-message')
-+      webview.src = `file://${fixtures}/pages/a.html`
-+      const {message} = await waitForMessage
-+      assert.equal(message, 'a')
-+    })
-+
-+    it('setting the attribute on an existing webview moves the contents', (done) => {
-+      const load1Listener = () => {
-+        const webContents = webview.getWebContents()
-+        const instance = webview.getAttribute('guestinstance')
-+        let destroyedInstance
-+
-+        const destroyListener = () => {
-+          assert.equal(webContents, webview2.getWebContents())
-+          assert.equal(null, getGuestWebContents(parseInt(destroyedInstance)))
-+
-+          // Make sure that events are hooked up to the right webview now
-+          webview2.addEventListener('console-message', (e) => {
-+            assert.equal(e.message, 'a')
-+            document.body.removeChild(webview2)
-+            done()
-+          })
-+
-+          webview2.src = 'file://' + fixtures + '/pages/a.html'
-+        }
-+        webview.addEventListener('destroyed', destroyListener, {once: true})
-+
-+        const webview2 = new WebView()
-+        const load2Listener = () => {
-+          destroyedInstance = webview2.getAttribute('guestinstance')
-+          assert.notEqual(instance, destroyedInstance)
-+
-+          webview2.setAttribute('guestinstance', instance)
-+        }
-+        webview2.addEventListener('did-finish-load', load2Listener, {once: true})
-+        loadWebView(webview2, {
-+          src: `file://${fixtures}/api/blank.html`
-+        })
-+      }
-+
-+      webview.addEventListener('did-finish-load', load1Listener, {once: true})
-+      loadWebView(webview, {
-+        src: `file://${fixtures}/api/blank.html`
-+      })
-+    })
-+
-+    it('moving a guest back to its original webview should work', (done) => {
-+      loadWebView(webview, {
-+        src: `file://${fixtures}/api/blank.html`
-+      }).then(() => {
-+        const webContents = webview.getWebContents()
-+        const instance = webview.getAttribute('guestinstance')
-+
-+        const destroy1Listener = () => {
-+          assert.equal(webContents, webview2.getWebContents())
-+          assert.equal(null, webview.getWebContents())
-+
-+          const destroy2Listener = () => {
-+            assert.equal(webContents, webview.getWebContents())
-+            assert.equal(null, webview2.getWebContents())
-+
-+            // Make sure that events are hooked up to the right webview now
-+            webview.addEventListener('console-message', (e) => {
-+              document.body.removeChild(webview2)
-+              assert.equal(e.message, 'a')
-+              done()
-+            })
-+
-+            webview.src = `file://${fixtures}/pages/a.html`
-+          }
-+          webview2.addEventListener('destroyed', destroy2Listener, {once: true})
-+          webview.setAttribute('guestinstance', instance)
-+        }
-+        webview.addEventListener('destroyed', destroy1Listener, {once: true})
-+
-+        const webview2 = new WebView()
-+        loadWebView(webview2, {guestinstance: instance})
-+      })
-+    })
-+
-+    // FIXME(alexeykuzmin): This test only passes if the previous test ^
-+    // is run alongside.
-+    it('setting the attribute on a webview in a different window moves the contents', (done) => {
-+      loadWebView(webview, {
-+        src: `file://${fixtures}/api/blank.html`
-+      }).then(() => {
-+        const instance = webview.getAttribute('guestinstance')
-+
-+        w = new BrowserWindow({
-+          show: false,
-+          webPreferences: {
-+            nodeIntegration: true
-+          }
-+        })
-+        w.webContents.once('did-finish-load', () => {
-+          ipcMain.once('pong', () => {
-+            assert(!webview.hasAttribute('guestinstance'))
-+            done()
-+          })
-+
-+          w.webContents.send('guestinstance', instance)
-+        })
-+        w.loadURL(`file://${fixtures}/pages/webview-move-to-window.html`)
-+      })
-+    })
-+
-+    it('does not delete the guestinstance attribute when moving the webview to another parent node', (done) => {
-+      webview.addEventListener('dom-ready', function domReadyListener () {
-+        webview.addEventListener('did-attach', () => {
-+          assert(webview.guestinstance != null)
-+          assert(webview.getWebContents() != null)
-+          done()
-+        })
-+
-+        document.body.replaceChild(webview, div)
-+      })
-+      webview.src = `file://${fixtures}/pages/a.html`
-+
-+      const div = document.createElement('div')
-+      div.appendChild(webview)
-+      document.body.appendChild(div)
-+    })
-+
-+    it('does not destroy the webContents when hiding/showing the webview (regression)', (done) => {
-+      webview.addEventListener('dom-ready', function () {
-+        const instance = webview.getAttribute('guestinstance')
-+        assert(instance != null)
-+
-+        // Wait for event directly since attach happens asynchronously over IPC
-+        ipcMain.once('ELECTRON_GUEST_VIEW_MANAGER_ATTACH_GUEST', () => {
-+          assert(webview.getWebContents() != null)
-+          assert.equal(instance, webview.getAttribute('guestinstance'))
-+          done()
-+        })
-+
-+        webview.style.display = 'none'
-+        webview.offsetHeight // eslint-disable-line
-+        webview.style.display = 'block'
-+      }, {once: true})
-+      loadWebView(webview, {src: `file://${fixtures}/pages/a.html`})
-+    })
-+
-+    it('does not reload the webContents when hiding/showing the webview (regression)', (done) => {
-+      webview.addEventListener('dom-ready', function () {
-+        webview.addEventListener('did-start-loading', () => {
-+          done(new Error('webview started loading unexpectedly'))
-+        })
-+
-+        // Wait for event directly since attach happens asynchronously over IPC
-+        webview.addEventListener('did-attach', () => {
-+          done()
-+        })
-+
-+        webview.style.display = 'none'
-+        webview.offsetHeight  // eslint-disable-line
-+        webview.style.display = 'block'
-+      }, {once: true})
-+      loadWebView(webview, {src: `file://${fixtures}/pages/a.html`})
-+    })
-+  })
-+
-+>>>>>>> .their
-   describe('DOM events', () => {
-     let div
- 
diff --git a/app/test/fixtures/merge-parser/electron/merge-dialog-refactor-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-dialog-refactor-into-master.txt
deleted file mode 100644
index ad349090d5b..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-dialog-refactor-into-master.txt
+++ /dev/null
@@ -1,511 +0,0 @@
-changed in both
-  base   100644 a69cba8b969eeb8c7f06b9d246981d9291dae0ed docs/api/dialog.md
-  our    100644 11101ae3ec01954b61266051ee74078ebfe8b299 docs/api/dialog.md
-  their  100644 b5305dd70baa738b2125f53c2b7a4017c29e02ea docs/api/dialog.md
-@@ -23,10 +23,10 @@
- 
- The `dialog` module has the following methods:
- 
--### `dialog.showOpenDialog([browserWindow, ]options[, callback])`
-+### `dialog.showOpenDialog(options)`
- 
--* `browserWindow` [BrowserWindow](browser-window.md) (optional)
- * `options` Object
-+  * `browserWindow` [BrowserWindow](browser-window.md) (optional)
-   * `title` String (optional)
-   * `defaultPath` String (optional)
-   * `buttonLabel` String (optional) - Custom label for the confirmation button, when
-@@ -51,9 +51,9 @@
-   * `message` String (optional) _macOS_ - Message to display above input
-     boxes.
-   * `securityScopedBookmarks` Boolean (optional) _masOS_ _mas_ - Create [security scoped bookmarks](https://developer.apple.com/library/content/documentation/Security/Conceptual/AppSandboxDesignGuide/AppSandboxInDepth/AppSandboxInDepth.html#//apple_ref/doc/uid/TP40011183-CH3-SW16) when packaged for the Mac App Store.
--* `callback` Function (optional)
--  * `filePaths` String[] - An array of file paths chosen by the user
--  * `bookmarks` String[] _macOS_ _mas_ - An array matching the `filePaths` array of base64 encoded strings which contains security scoped bookmark data. `securityScopedBookmarks` must be enabled for this to be populated.
-+  * `callback` Function (optional)
-+    * `filePaths` String[] - An array of file paths chosen by the user
-+    * `bookmarks` String[] _macOS_ _mas_ - An array matching the `filePaths` array of base64 encoded strings which contains security scoped bookmark data. `securityScopedBookmarks` must be enabled for this to be populated.
- 
- Returns `String[]`, an array of file paths chosen by the user,
- if the callback is provided it returns `undefined`.
-@@ -86,10 +86,10 @@
- `['openFile', 'openDirectory']` on these platforms, a directory selector will be
- shown.
- 
--### `dialog.showSaveDialog([browserWindow, ]options[, callback])`
-+### `dialog.showSaveDialog(options)`
- 
--* `browserWindow` [BrowserWindow](browser-window.md) (optional)
- * `options` Object
-+  * `browserWindow` [BrowserWindow](browser-window.md) (optional)
-   * `title` String (optional)
-   * `defaultPath` String (optional) - Absolute directory path, absolute file
-     path, or file name to use by default.
-@@ -102,9 +102,9 @@
-   * `showsTagField` Boolean (optional) _macOS_ - Show the tags input box,
-     defaults to `true`.
-   * `securityScopedBookmarks` Boolean (optional) _masOS_ _mas_ - Create a [security scoped bookmark](https://developer.apple.com/library/content/documentation/Security/Conceptual/AppSandboxDesignGuide/AppSandboxInDepth/AppSandboxInDepth.html#//apple_ref/doc/uid/TP40011183-CH3-SW16) when packaged for the Mac App Store. If this option is enabled and the file doesn't already exist a blank file will be created at the chosen path.
--* `callback` Function (optional)
--  * `filename` String
--  * `bookmark` String _macOS_ _mas_ - Base64 encoded string which contains the security scoped bookmark data for the saved file. `securityScopedBookmarks` must be enabled for this to be present.
-+  * `callback` Function (optional)
-+    * `filename` String
-+    * `bookmark` String _macOS_ _mas_ - Base64 encoded string which contains the security scoped bookmark data for the saved file. `securityScopedBookmarks` must be enabled for this to be present.
- 
- Returns `String`, the path of the file chosen by the user,
- if a callback is provided it returns `undefined`.
-@@ -117,10 +117,10 @@
- If a `callback` is passed, the API call will be asynchronous and the result
- will be passed via `callback(filename)`.
- 
--### `dialog.showMessageBox([browserWindow, ]options[, callback])`
-+### `dialog.showMessageBox(options)`
- 
--* `browserWindow` [BrowserWindow](browser-window.md) (optional)
- * `options` Object
-+  * `browserWindow` [BrowserWindow](browser-window.md) (optional)
-   * `type` String (optional) - Can be `"none"`, `"info"`, `"error"`, `"question"` or
-   `"warning"`. On Windows, `"question"` displays the same icon as `"info"`, unless
-   you set an icon using the `"icon"` option. On macOS, both `"warning"` and
-@@ -155,10 +155,10 @@
-     untouched on Windows. For example, a button label of `Vie&w` will be
-     converted to `Vie_w` on Linux and `View` on macOS and can be selected
-     via `Alt-W` on Windows and Linux.
--* `callback` Function (optional)
--  * `response` Number - The index of the button that was clicked.
--  * `checkboxChecked` Boolean - The checked state of the checkbox if
--    `checkboxLabel` was set. Otherwise `false`.
-+  * `callback` Function (optional)
-+    * `response` Number - The index of the button that was clicked.
-+    * `checkboxChecked` Boolean - The checked state of the checkbox if
-+      `checkboxLabel` was set. Otherwise `false`.
- 
- Returns `Integer`, the index of the clicked button, if a callback is provided
- it returns undefined.
-merged
-  result 100644 96ba70832349719b898b0919ccab869fb639031f lib/browser/api/dialog.js
-  our    100644 d7545a7687a6c168a79c09c9e7866af05d336d12 lib/browser/api/dialog.js
-@@ -1,6 +1,6 @@
- 'use strict'
- 
--const {app, BrowserWindow} = require('electron')
-+const {app} = require('electron')
- const binding = process.atomBinding('dialog')
- const v8Util = process.atomBinding('v8_util')
- 
-@@ -15,32 +15,17 @@
-   treatPackageAsDirectory: 1 << 7
- }
- 
-+const Type = {
-+  OPEN: 'open',
-+  SAVE: 'save'
-+}
-+
- const messageBoxTypes = ['none', 'info', 'warning', 'error', 'question']
- 
- const messageBoxOptions = {
-   noLink: 1 << 0
- }
- 
--const parseArgs = function (window, options, callback, ...args) {
--  if (window != null && window.constructor !== BrowserWindow) {
--    // Shift.
--    [callback, options, window] = [options, window, null]
--  }
--
--  if ((callback == null) && typeof options === 'function') {
--    // Shift.
--    [callback, options] = [options, null]
--  }
--
--  // Fallback to using very last argument as the callback function
--  const lastArgument = args[args.length - 1]
--  if ((callback == null) && typeof lastArgument === 'function') {
--    callback = lastArgument
--  }
--
--  return [window, options, callback]
--}
--
- const normalizeAccessKey = (text) => {
-   if (typeof text !== 'string') return text
- 
-@@ -70,195 +55,135 @@
-   }
- }
- 
--module.exports = {
--  showOpenDialog: function (...args) {
--    checkAppInitialized()
--
--    let [window, options, callback] = parseArgs(...args)
--
--    if (options == null) {
--      options = {
--        title: 'Open',
--        properties: ['openFile']
--      }
--    }
--
--    let {buttonLabel, defaultPath, filters, properties, title, message, securityScopedBookmarks = false} = options
--
--    if (properties == null) {
--      properties = ['openFile']
--    } else if (!Array.isArray(properties)) {
--      throw new TypeError('Properties must be an array')
--    }
-+const setupDialog = (type, {
-+    window,
-+    buttonLabel = '',
-+    defaultPath = '',
-+    filters = [],
-+    properties = ['openFile'],
-+    title = '',
-+    message = '',
-+    securityScopedBookmarks = false,
-+    callback,
-+    nameFieldLabel = '',
-+    showsTagField = true
-+  }) => {
-+  if (!Array.isArray(properties)) {
-+    throw new TypeError('Properties must be an array')
-+  }
- 
--    let dialogProperties = 0
-+  let dialogProperties = 0
-+  // check extra parameters for showOpenDialog
-+  if (type === Type.OPEN) {
-     for (const prop in fileDialogProperties) {
-       if (properties.includes(prop)) {
-         dialogProperties |= fileDialogProperties[prop]
-       }
-     }
-+  }
- 
--    if (title == null) {
--      title = ''
--    } else if (typeof title !== 'string') {
--      throw new TypeError('Title must be a string')
--    }
-+  // check parameter types
-+  if (typeof title !== 'string') {
-+    throw new TypeError('Title must be a string')
-+  }
-+  if (typeof buttonLabel !== 'string') {
-+    throw new TypeError('Button label must be a string')
-+  }
-+  if (typeof defaultPath !== 'string') {
-+    throw new TypeError('Default path must be a string')
-+  }
-+  if (typeof message !== 'string') {
-+    throw new TypeError('Message must be a string')
-+  }
- 
--    if (buttonLabel == null) {
--      buttonLabel = ''
--    } else if (typeof buttonLabel !== 'string') {
--      throw new TypeError('Button label must be a string')
-+  // check extra parameters for showSaveDialog
-+  if (type === Type.SAVE) {
-+    if (typeof nameFieldLabel !== 'string') {
-+      throw new TypeError('Name field label must be a string')
-     }
--
--    if (defaultPath == null) {
--      defaultPath = ''
--    } else if (typeof defaultPath !== 'string') {
--      throw new TypeError('Default path must be a string')
-+    if (typeof showsTagField !== 'boolean') {
-+      throw new TypeError('Shows tag option must be a boolean')
-     }
-+  }
- 
--    if (filters == null) {
--      filters = []
--    }
-+  let wrappedCallback = null
-+  if (typeof callback === 'function') {
-+    wrappedCallback = (success, result, bookmarkData) => success ? callback(result, bookmarkData) : callback()
-+  }
- 
--    if (message == null) {
--      message = ''
--    } else if (typeof message !== 'string') {
--      throw new TypeError('Message must be a string')
--    }
-+  let settings
-+  if (type === Type.OPEN) {
-+    settings = {window, buttonLabel, defaultPath, filters, properties, title, message, securityScopedBookmarks, callback}
-+  } else {
-+    settings = {window, buttonLabel, defaultPath, filters, title, message, securityScopedBookmarks, callback, nameFieldLabel, showsTagField}
-+  }
-+
-+  return {settings, dialogProperties, wrappedCallback}
-+}
- 
--    const wrappedCallback = typeof callback === 'function' ? function (success, result, bookmarkData) {
--      return success ? callback(result, bookmarkData) : callback()
--    } : null
--    const settings = {title, buttonLabel, defaultPath, filters, message, securityScopedBookmarks, window}
-+module.exports = {
-+  showOpenDialog: function (options = {
-+    title: 'Open',
-+    properties: ['openFile']
-+  }) {
-+    checkAppInitialized()
-+
-+    const {settings, dialogProperties, wrappedCallback} = setupDialog(Type.OPEN, options)
-     settings.properties = dialogProperties
-     return binding.showOpenDialog(settings, wrappedCallback)
-   },
- 
--  showSaveDialog: function (...args) {
-+  showSaveDialog: function (options = {title: 'Save'}) {
-     checkAppInitialized()
- 
--    let [window, options, callback] = parseArgs(...args)
--
--    if (options == null) {
--      options = {
--        title: 'Save'
--      }
--    }
--
--    let {buttonLabel, defaultPath, filters, title, message, securityScopedBookmarks = false, nameFieldLabel, showsTagField} = options
--
--    if (title == null) {
--      title = ''
--    } else if (typeof title !== 'string') {
--      throw new TypeError('Title must be a string')
--    }
--
--    if (buttonLabel == null) {
--      buttonLabel = ''
--    } else if (typeof buttonLabel !== 'string') {
--      throw new TypeError('Button label must be a string')
--    }
--
--    if (defaultPath == null) {
--      defaultPath = ''
--    } else if (typeof defaultPath !== 'string') {
--      throw new TypeError('Default path must be a string')
--    }
--
--    if (filters == null) {
--      filters = []
--    }
--
--    if (message == null) {
--      message = ''
--    } else if (typeof message !== 'string') {
--      throw new TypeError('Message must be a string')
--    }
--
--    if (nameFieldLabel == null) {
--      nameFieldLabel = ''
--    } else if (typeof nameFieldLabel !== 'string') {
--      throw new TypeError('Name field label must be a string')
--    }
--
--    if (showsTagField == null) {
--      showsTagField = true
--    }
--
--    const wrappedCallback = typeof callback === 'function' ? function (success, result, bookmarkData) {
--      return success ? callback(result, bookmarkData) : callback()
--    } : null
--    const settings = {title, buttonLabel, defaultPath, filters, message, securityScopedBookmarks, nameFieldLabel, showsTagField, window}
-+    const {settings, wrappedCallback} = setupDialog(Type.SAVE, options)
-     return binding.showSaveDialog(settings, wrappedCallback)
-   },
- 
--  showMessageBox: function (...args) {
-+  showMessageBox: ({
-+      window,
-+      buttons = [],
-+      cancelId,
-+      checkboxLabel = '',
-+      checkboxChecked = false,
-+      defaultId = -1,
-+      detail = '',
-+      icon,
-+      normalizeAccessKeys,
-+      noLink,
-+      message = '',
-+      title = '',
-+      type = 'none',
-+      callback
-+    }) => {
-     checkAppInitialized()
- 
--    let [window, options, callback] = parseArgs(...args)
--
--    if (options == null) {
--      options = {
--        type: 'none'
--      }
--    }
--
--    let {
--      buttons, cancelId, checkboxLabel, checkboxChecked, defaultId, detail,
--      icon, message, title, type
--    } = options
--
--    if (type == null) {
--      type = 'none'
--    }
--
--    const messageBoxType = messageBoxTypes.indexOf(type)
--    if (messageBoxType === -1) {
-+    // check type value validity
-+    let messageBoxType = messageBoxTypes.indexOf(type)
-+    if (!messageBoxTypes.include(type)) {
-       throw new TypeError('Invalid message box type')
-     }
--
--    if (buttons == null) {
--      buttons = []
--    } else if (!Array.isArray(buttons)) {
-+    if (!Array.isArray(buttons)) {
-       throw new TypeError('Buttons must be an array')
-     }
--
--    if (options.normalizeAccessKeys) {
--      buttons = buttons.map(normalizeAccessKey)
--    }
--
--    if (title == null) {
--      title = ''
--    } else if (typeof title !== 'string') {
-+    if (typeof title !== 'string') {
-       throw new TypeError('Title must be a string')
-     }
--
--    if (message == null) {
--      message = ''
--    } else if (typeof message !== 'string') {
-+    if (typeof message !== 'string') {
-       throw new TypeError('Message must be a string')
-     }
--
--    if (detail == null) {
--      detail = ''
--    } else if (typeof detail !== 'string') {
-+    if (typeof detail !== 'string') {
-       throw new TypeError('Detail must be a string')
-     }
--
--    checkboxChecked = !!checkboxChecked
--
--    if (checkboxLabel == null) {
--      checkboxLabel = ''
--    } else if (typeof checkboxLabel !== 'string') {
--      throw new TypeError('checkboxLabel must be a string')
-+    if (typeof checkboxLabel !== 'string') {
-+      throw new TypeError('Checkbox label must be a string')
-     }
--
--    if (icon == null) {
--      icon = null
-+    if (typeof checkboxChecked !== 'boolean') {
-+      throw new TypeError('Checkbox checked value must be a boolean')
-     }
- 
--    if (defaultId == null) {
--      defaultId = -1
-+    if (normalizeAccessKeys) {
-+      buttons = buttons.map(normalizeAccessKey)
-     }
- 
-     // Choose a default button to get selected when dialog is cancelled.
-@@ -273,31 +198,35 @@
-       }
-     }
- 
--    const flags = options.noLink ? messageBoxOptions.noLink : 0
-+    const flags = noLink ? messageBoxOptions.noLink : 0
-+
-     return binding.showMessageBox(messageBoxType, buttons, defaultId, cancelId,
-                                   flags, title, message, detail, checkboxLabel,
-                                   checkboxChecked, icon, window, callback)
-   },
- 
--  showErrorBox: function (...args) {
-+  showErrorBox: (...args) => {
-     return binding.showErrorBox(...args)
-   },
- 
--  showCertificateTrustDialog: function (...args) {
--    let [window, options, callback] = parseArgs(...args)
--
--    if (options == null || typeof options !== 'object') {
-+  showCertificateTrustDialog: ({
-+      window,
-+      certificate,
-+      message = '',
-+      callback
-+    }) => {
-+    if (arguments == null || typeof arguments !== 'object') {
-       throw new TypeError('options must be an object')
-     }
- 
--    let {certificate, message} = options
-     if (certificate == null || typeof certificate !== 'object') {
-       throw new TypeError('certificate must be an object')
-     }
-+    if (callback == null || typeof callback !== 'function') {
-+      throw new TypeError('You must pass in a valid callback')
-+    }
- 
--    if (message == null) {
--      message = ''
--    } else if (typeof message !== 'string') {
-+    if (typeof message !== 'string') {
-       throw new TypeError('message must be a string')
-     }
- 
-changed in both
-  base   100644 601e28ca53ca622759f9901a1227995ec47872ac spec/api-dialog-spec.js
-  our    100644 da43cc1dde89d99491403b651a2045707550b016 spec/api-dialog-spec.js
-  their  100644 cc40655cc653e1bad5a6e142a15e7026d4200437 spec/api-dialog-spec.js
-@@ -52,6 +52,7 @@
- 
-   describe('showMessageBox', () => {
-     it('throws errors when the options are invalid', () => {
-+<<<<<<< .our
-       expect(() => {
-         dialog.showMessageBox(undefined, {type: 'not-a-valid-type'})
-       }).to.throw(/Invalid message box type/)
-@@ -59,6 +60,15 @@
-       expect(() => {
-         dialog.showMessageBox(null, {buttons: false})
-       }).to.throw(/Buttons must be an array/)
-+=======
-+      assert.throws(() => {
-+        dialog.showMessageBox({type: 'not-a-valid-type'})
-+      }, /Invalid message box type/)
-+
-+      assert.throws(() => {
-+        dialog.showMessageBox({buttons: false})
-+      }, /Buttons must be an array/)
-+>>>>>>> .their
- 
-       expect(() => {
-         dialog.showMessageBox({title: 300})
-@@ -104,9 +114,15 @@
-         dialog.showCertificateTrustDialog({})
-       }).to.throw(/certificate must be an object/)
- 
-+<<<<<<< .our
-       expect(() => {
-         dialog.showCertificateTrustDialog({certificate: {}, message: false})
-       }).to.throw(/message must be a string/)
-+=======
-+      assert.throws(() => {
-+        dialog.showCertificateTrustDialog({certificate: {}, message: false, callback: () => {}})
-+      }, /message must be a string/)
-+>>>>>>> .their
-     })
-   })
- })
diff --git a/app/test/fixtures/merge-parser/electron/merge-disable-executable-stack_1-7-x-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-disable-executable-stack_1-7-x-into-master.txt
deleted file mode 100644
index c5d3a32ab30..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-disable-executable-stack_1-7-x-into-master.txt
+++ /dev/null
@@ -1,5132 +0,0 @@
-added in both
-  our    100644 6d44d618aabcce04c60344f2274dec5b0c2a1f68 .circleci/config.yml
-  their  100644 057acfd93df62e6396b9968efd39b195dd10cfb3 .circleci/config.yml
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- notify-slack-failure: &notify-slack-failure
-   run:
-     name: Send a slack notification on failure
-@@ -348,10 +349,13 @@
-   docker:
-     - image: electronbuilds/electron:0.0.8
-   <<: *build-steps
-+=======
-+>>>>>>> .their
- 
- version: 2
- jobs:
-   electron-linux-arm:
-+<<<<<<< .our
-     environment:
-       TARGET_ARCH: arm
-     <<: *build-defaults
-@@ -668,12 +672,323 @@
-       GN_EXTRA_ARGS: 'is_mas_build = true'
-     <<: *gn-mac-build-machine
-     <<: *gn-mac-build-steps
-+=======
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: arm
-+    resource_class: 2xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Zip out directory
-+          command: |
-+            if [ "$ELECTRON_RELEASE" != "1" ]; then
-+              zip -r electron.zip out/D
-+            fi
-+      - persist_to_workspace:
-+          root: /home/builduser
-+          paths:
-+            - project/out
-+      - store_artifacts:
-+          path: electron.zip
-+  electron-linux-ia32:
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: ia32
-+          DISPLAY: ':99.0'
-+    resource_class: xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Setup for headless testing
-+          command: sh -e /etc/init.d/xvfb start
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                out/D/electron --version
-+                mkdir junit
-+                script/test.py --ci --rebuild_native_modules
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+      - store_test_results:
-+          path: junit
-+      - store_artifacts:
-+          path: junit
-+  electron-linux-mips64el:
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: mips64el
-+    resource_class: xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+
-+  electron-linux-x64:
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: x64
-+          DISPLAY: ':99.0'
-+    resource_class: xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Setup for headless testing
-+          command: sh -e /etc/init.d/xvfb start
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                mkdir junit
-+                script/test.py --ci --rebuild_native_modules
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+      - run:
-+          name: Generate Typescript Definitions
-+          command: npm run create-typescript-definitions
-+      - store_test_results:
-+          path: junit
-+      - store_artifacts:
-+          path: junit
-+      - store_artifacts:
-+          path: out/electron.d.ts
-+      - store_artifacts:
-+          path: out/electron-api.json
-+>>>>>>> .their
- 
- workflows:
-   version: 2
-   build-arm:
-     jobs:
-       - electron-linux-arm
-+<<<<<<< .our
-       - electron-linux-arm-test:
-           requires:
-             - electron-linux-arm
-@@ -683,12 +998,15 @@
-       - electron-linux-arm64-test:
-           requires:
-             - electron-linux-arm64
-+=======
-+>>>>>>> .their
-   build-ia32:
-     jobs:
-       - electron-linux-ia32
-   build-x64:
-     jobs:
-       - electron-linux-x64
-+<<<<<<< .our
-   build-osx-x64:
-     jobs:
-       - electron-osx-x64
-@@ -745,3 +1063,5 @@
-       - electron-gn-linux-arm64-release-fyi
-       - electron-gn-mas-release-fyi
-       - electron-gn-osx-release-fyi
-+=======
-+>>>>>>> .their
-added in remote
-  their  100644 51ad1b492dcbbd0c79bb9986bac35f1e3a007c2a Jenkinsfile
-@@ -0,0 +1,44 @@
-+pipeline {
-+  agent none
-+  stages {
-+    stage('Build') {
-+      parallel {
-+        stage('electron-osx-x64') {
-+            agent {
-+              label 'osx'
-+            }
-+            steps {
-+              sh 'script/bootstrap.py --target_arch=x64 --dev'
-+              sh 'npm run lint'
-+              sh 'script/build.py -c D'
-+              sh 'script/test.py --ci --rebuild_native_modules'
-+            }
-+            post {
-+              always {
-+                cleanWs()
-+              }
-+            }
-+        }
-+        stage('electron-mas-x64') {
-+          agent {
-+            label 'osx'
-+          }
-+          environment {
-+            MAS_BUILD = '1'
-+          }
-+          steps {
-+            sh 'script/bootstrap.py --target_arch=x64 --dev'
-+            sh 'npm run lint'
-+            sh 'script/build.py -c D'
-+            sh 'script/test.py --ci --rebuild_native_modules'
-+          }
-+          post {
-+            always {
-+              cleanWs()
-+            }
-+          }
-+        }
-+      }
-+    }
-+  }
-+}
-changed in both
-  base   100644 e1603fa5942f7b000c3385648530255032e775a2 atom/app/atom_library_main.h
-  our    100644 2c7a27caa20a411558010c3c58bd78e7850c0737 atom/app/atom_library_main.h
-  their  100644 63d285bb5e4838578d23505d7738c9ac88575df1 atom/app/atom_library_main.h
-@@ -9,7 +9,12 @@
- 
- #if defined(OS_MACOSX)
- extern "C" {
-+<<<<<<< .our
- __attribute__((visibility("default"))) int AtomMain(int argc, char* argv[]);
-+=======
-+__attribute__((visibility("default")))
-+int AtomMain(int argc, char* argv[]);
-+>>>>>>> .their
- 
- #ifdef ENABLE_RUN_AS_NODE
- __attribute__((visibility("default"))) int AtomInitializeICUandStartNode(
-changed in both
-  base   100644 7ee7522934689937f7be7b0f866134bf611c7d69 atom/app/atom_library_main.mm
-  our    100644 57a519fcd0db28548ea75034cf92191161183385 atom/app/atom_library_main.mm
-  their  100644 ae096acd4a931d397e285643d36580625dde14bf atom/app/atom_library_main.mm
-@@ -14,6 +14,10 @@
- #include "brightray/common/mac/main_application_bundle.h"
- #include "content/public/app/content_main.h"
- 
-+<<<<<<< .our
-+=======
-+#if defined(OS_MACOSX)
-+>>>>>>> .their
- int AtomMain(int argc, char* argv[]) {
-   atom::AtomMainDelegate delegate;
-   content::ContentMainParams params(&delegate);
-changed in both
-  base   100644 de8e2b6068786b21f45e2a04490e46c8ffb15656 atom/app/atom_main.cc
-  our    100644 fc77100d9acb58221c35f364c4db7866a44d347d atom/app/atom_main.cc
-  their  100644 a9f39ab51547c6e86e47449b11250827e961abde atom/app/atom_main.cc
-@@ -71,7 +71,11 @@
- 
- #ifdef _DEBUG
-   // Don't display assert dialog boxes in CI test runs
-+<<<<<<< .our
-   static const char* kCI = "ELECTRON_CI";
-+=======
-+  static const auto kCI = "ELECTRON_CI";
-+>>>>>>> .their
-   bool is_ci = IsEnvSet(kCI);
-   if (!is_ci) {
-     for (int i = 0; i < arguments.argc; ++i) {
-@@ -88,6 +92,7 @@
- 
-     _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG | _CRTDBG_MODE_FILE);
-     _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);
-+<<<<<<< .our
- 
-     _set_error_mode(_OUT_TO_STDERR);
-   }
-@@ -98,6 +103,14 @@
- #else
-   bool run_as_node = false;
- #endif
-+=======
-+
-+    _set_error_mode(_OUT_TO_STDERR);
-+  }
-+#endif
-+
-+  bool run_as_node = IsEnvSet(kRunAsNode);
-+>>>>>>> .their
- 
-   // Make sure the output is printed to console.
-   if (run_as_node || !IsEnvSet("ELECTRON_NO_ATTACH_CONSOLE"))
-@@ -117,7 +130,13 @@
-   // from within the CRT's atexit facility, ensuring the heap functions are
-   // still active. The second invocation from the OS loader will be a no-op.
-   extern void NTAPI OnThreadExit(PVOID module, DWORD reason, PVOID reserved);
-+<<<<<<< .our
-   atexit([]() { OnThreadExit(nullptr, DLL_THREAD_DETACH, nullptr); });
-+=======
-+  atexit([]() {
-+    OnThreadExit(nullptr, DLL_THREAD_DETACH, nullptr);
-+  });
-+>>>>>>> .their
- #endif
- 
- #ifdef ENABLE_RUN_AS_NODE
-@@ -132,10 +151,14 @@
-     auto ret = atom::NodeMain(argv.size(), argv.data());
-     std::for_each(argv.begin(), argv.end(), free);
-     return ret;
-+<<<<<<< .our
-   }
- #endif
- 
-   if (IsEnvSet("ELECTRON_INTERNAL_CRASH_SERVICE")) {
-+=======
-+  } else if (IsEnvSet("ELECTRON_INTERNAL_CRASH_SERVICE")) {
-+>>>>>>> .their
-     return crash_service::Main(cmd);
-   }
- 
-@@ -156,7 +179,10 @@
- #elif defined(OS_LINUX)  // defined(OS_WIN)
- 
- int main(int argc, char* argv[]) {
-+<<<<<<< .our
- #ifdef ENABLE_RUN_AS_NODE
-+=======
-+>>>>>>> .their
-   if (IsEnvSet(kRunAsNode)) {
-     base::i18n::InitializeICU();
-     base::AtExitManager atexit_manager;
-@@ -175,7 +201,10 @@
- #else  // defined(OS_LINUX)
- 
- int main(int argc, char* argv[]) {
-+<<<<<<< .our
- #ifdef ENABLE_RUN_AS_NODE
-+=======
-+>>>>>>> .their
-   if (IsEnvSet(kRunAsNode)) {
-     return AtomInitializeICUandStartNode(argc, argv);
-   }
-added in both
-  our    100644 23e870cf4a32aecfc246a81edad46971b4456a55 atom/app/command_line_args.cc
-  their  100644 a5f0183991a2df7890c4d389a3fcd4b99e0574e0 atom/app/command_line_args.cc
-@@ -2,15 +2,30 @@
- // Use of this source code is governed by the MIT license that can be
- // found in the LICENSE file.
- 
-+<<<<<<< .our
- #include "atom/app/command_line_args.h"
- 
-+=======
-+#include <string>
-+
-+#include "atom/app/command_line_args.h"
-+
-+#include "base/strings/string_util.h"
-+#include "base/strings/utf_string_conversions.h"
-+#include "content/public/common/content_switches.h"
-+
-+>>>>>>> .their
- namespace {
- 
- bool IsUrlArg(const base::CommandLine::CharType* arg) {
-   // the first character must be a letter for this to be a URL
-   auto c = *arg;
-   if (('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z')) {
-+<<<<<<< .our
-     for (auto* p = arg + 1; *p; ++p) {
-+=======
-+    for (auto p = arg + 1; *p; ++p) {
-+>>>>>>> .their
-       c = *p;
- 
-       // colon indicates that the argument starts with a URI scheme
-@@ -31,12 +46,1323 @@
-   return false;
- }
- 
-+<<<<<<< .our
-+=======
-+const char* blacklist[] = {
-+  // node
-+  "inspect",
-+  "inspect-brk",
-+
-+
-+  // chromium switches:
-+  // find ./ \( -name "*switches.cc" -o -name "*switch_list.h" \) \
-+  //   | xargs grep -P --no-filename '"\S+"[);]$' \
-+  //   | perl -pe 's|^.*?"(\S+)"[);]$|  "$1",|'; \
-+  //   | LANG="C" sort | uniq
-+  "/prefetch:1",
-+  "/prefetch:2",
-+  "/prefetch:3",
-+  "/prefetch:4",
-+  "/prefetch:5",
-+  "/prefetch:6",
-+  "/prefetch:8",
-+  "0",
-+  "?",
-+  "BlacklistOnly",
-+  "ChromeOSMemoryPressureHandling",
-+  "Disabled",
-+  "NewProfileManagement",
-+  "OnlineCheckOnly",
-+  "SafeSites",
-+  "accept-resource-provider",
-+  "adaboost",
-+  "aec-refined-adaptive-filter",
-+  "agc-startup-min-volume",
-+  "aggressive",
-+  "aggressive-cache-discard",
-+  "aggressive-tab-discard",
-+  "all-toolchains",
-+  "allow-cross-origin-auth-prompt",
-+  "allow-external-pages",
-+  "allow-failed-policy-fetch-for-test",
-+  "allow-file-access-from-files",
-+  "allow-hidden-media-playback",
-+  "allow-http-background-page",
-+  "allow-http-screen-capture",
-+  "allow-insecure-localhost",
-+  "allow-legacy-extension-manifests",
-+  "allow-loopback-in-peer-connection",
-+  "allow-nacl-crxfs-api",
-+  "allow-nacl-file-handle-api",
-+  "allow-nacl-socket-api",
-+  "allow-no-sandbox-job",
-+  "allow-outdated-plugins",
-+  "allow-ra-in-dev-mode",
-+  "allow-running-insecure-content",
-+  "allow-sandbox-debugging",
-+  "allow-silent-push",
-+  "alsa-check-close-timeout",
-+  "alsa-enable-upsampling",
-+  "alsa-fixed-output-sample-rate",
-+  "alsa-input-device",
-+  "alsa-output-avail-min",
-+  "alsa-output-buffer-size",
-+  "alsa-output-device",
-+  "alsa-output-period-size",
-+  "alsa-output-start-threshold",
-+  "also-emit-success-logs",
-+  "always-authorize-plugins",
-+  "always-on",
-+  "always-use-complex-text",
-+  "alwaystrue",
-+  "android-fonts-path",
-+  "android-stderr-port",
-+  "android-stdin-port",
-+  "android-stdout-port",
-+  "angle",
-+  "app",
-+  "app-auto-launched",
-+  "app-id",
-+  "app-mode-auth-code",
-+  "app-mode-oauth-token",
-+  "app-mode-oem-manifest",
-+  "app-shell-allow-roaming",
-+  "app-shell-host-window-size",
-+  "app-shell-preferred-network",
-+  "app-shell-refresh-token",
-+  "app-shell-user",
-+  "apple",
-+  "apps-gallery-download-url",
-+  "apps-gallery-update-url",
-+  "apps-gallery-url",
-+  "apps-keep-chrome-alive-in-tests",
-+  "arc-availability",
-+  "arc-available",
-+  "args",
-+  "artifacts-dir",
-+  "ash-adjustable-large-cursor",
-+  "ash-animate-from-boot-splash-screen",
-+  "ash-constrain-pointer-to-root",
-+  "ash-copy-host-background-at-boot",
-+  "ash-debug-shortcuts",
-+  "ash-dev-shortcuts",
-+  "ash-disable-maximize-mode-window-backdrop",
-+  "ash-disable-screen-orientation-lock",
-+  "ash-disable-touch-exploration-mode",
-+  "ash-enable-docked-windows",
-+  "ash-enable-magnifier-key-scroller",
-+  "ash-enable-mirrored-screen",
-+  "ash-enable-palette-on-all-displays",
-+  "ash-enable-software-mirroring",
-+  "ash-enable-unified-desktop",
-+  "ash-force-enable-palette",
-+  "ash-hide-notifications-for-factory",
-+  "ash-host-window-bounds",
-+  "ash-shelf-color",
-+  "ash-touch-hud",
-+  "ash-webui-init",
-+  "attestation-server",
-+  "audio-buffer-size",
-+  "aura-legacy-power-button",
-+  "auth-ext-path",
-+  "auth-server-whitelist",
-+  "auth-spnego-account-type",
-+  "auto",
-+  "auto-open-devtools-for-tabs",
-+  "auto-select-desktop-capture-source",
-+  "blink-settings",
-+  "bootstrap",
-+  "browser-subprocess-path",
-+  "browser-test",
-+  "bwsi",
-+  "bypass-app-banner-engagement-checks",
-+  "canvas-msaa-sample-count",
-+  "cast-initial-screen-height",
-+  "cast-initial-screen-width",
-+  "cc-layer-tree-test-long-timeout",
-+  "cc-layer-tree-test-no-timeout",
-+  "cc-rebaseline-pixeltests",
-+  "cellular-first",
-+  "cellular-only",
-+  "check-for-update-interval",
-+  "check-layout-test-sys-deps",
-+  "child-process",
-+  "child-wallpaper-large",
-+  "child-wallpaper-small",
-+  "cipher-suite-blacklist",
-+  "class",
-+  "clear-token-service",
-+  "cloud-print-file",
-+  "cloud-print-file-type",
-+  "cloud-print-job-title",
-+  "cloud-print-print-ticket",
-+  "cloud-print-setup-proxy",
-+  "cloud-print-url",
-+  "cloud-print-xmpp-endpoint",
-+  "color",
-+  "compensate-for-unstable-pinch-zoom",
-+  "compile-shader-always-succeeds",
-+  "component-updater",
-+  "connectivity-check-url",
-+  "conservative",
-+  "content-image-texture-target",
-+  "content-shell-host-window-size",
-+  "controller",
-+  "crash-dumps-dir",
-+  "crash-on-failure",
-+  "crash-on-hang-threads",
-+  "crash-server-url",
-+  "crash-test",
-+  "crashpad-handler",
-+  "create-browser-on-startup-for-tests",
-+  "create-default-gl-context",
-+  "cros-region",
-+  "cros-regions-mode",
-+  "crosh-command",
-+  "cryptauth-http-host",
-+  "custom-devtools-frontend",
-+  "custom-launcher-page",
-+  "custom_summary",
-+  "d3d11",
-+  "d3d9",
-+  "daemon",
-+  "dark_muted",
-+  "dark_vibrant",
-+  "data-path",
-+  "data-reduction-proxy-config-url",
-+  "data-reduction-proxy-enable-quic-on-non-core-proxies",
-+  "data-reduction-proxy-experiment",
-+  "data-reduction-proxy-http-proxies",
-+  "data-reduction-proxy-lo-fi",
-+  "data-reduction-proxy-pingback-url",
-+  "data-reduction-proxy-secure-proxy-check-url",
-+  "data-reduction-proxy-server-experiments-disabled",
-+  "data-reduction-proxy-warmup-url",
-+  "dbus-stub",
-+  "debug-devtools",
-+  "debug-enable-frame-toggle",
-+  "debug-packed-apps",
-+  "debug-print",
-+  "default",
-+  "default-tile-height",
-+  "default-tile-width",
-+  "default-wallpaper-is-oem",
-+  "default-wallpaper-large",
-+  "default-wallpaper-small",
-+  "demo",
-+  "derelict-detection-timeout",
-+  "derelict-idle-timeout",
-+  "desktop",
-+  "desktop-window-1080p",
-+  "deterministic-fetch",
-+  "device-management-url",
-+  "device-scale-factor",
-+  "devtools-flags",
-+  "diagnostics",
-+  "diagnostics-format",
-+  "diagnostics-recovery",
-+  "disable",
-+  "disable-2d-canvas-clip-aa",
-+  "disable-2d-canvas-image-chromium",
-+  "disable-3d-apis",
-+  "disable-accelerated-2d-canvas",
-+  "disable-accelerated-jpeg-decoding",
-+  "disable-accelerated-mjpeg-decode",
-+  "disable-accelerated-video-decode",
-+  "disable-account-consistency",
-+  "disable-add-to-shelf",
-+  "disable-app-info-dialog-mac",
-+  "disable-app-list-dismiss-on-blur",
-+  "disable-app-window-cycling",
-+  "disable-appcontainer",
-+  "disable-arc-data-wipe",
-+  "disable-arc-opt-in-verification",
-+  "disable-audio-support-for-desktop-share",
-+  "disable-autofill-keyboard-accessory-view",
-+  "disable-avfoundation-overlays",
-+  "disable-background-networking",
-+  "disable-background-timer-throttling",
-+  "disable-backgrounding-occluded-windows",
-+  "disable-backing-store-limit",
-+  "disable-blink-features",
-+  "disable-boot-animation",
-+  "disable-breakpad",
-+  "disable-browser-task-scheduler",
-+  "disable-bundled-ppapi-flash",
-+  "disable-canvas-aa",
-+  "disable-captive-portal-bypass-proxy",
-+  "disable-cast-streaming-hw-encoding",
-+  "disable-clear-browsing-data-counters",
-+  "disable-client-side-phishing-detection",
-+  "disable-cloud-import",
-+  "disable-component-cloud-policy",
-+  "disable-component-extensions-with-background-pages",
-+  "disable-component-update",
-+  "disable-composited-antialiasing",
-+  "disable-contextual-search",
-+  "disable-d3d11",
-+  "disable-databases",
-+  "disable-datasaver-prompt",
-+  "disable-default-apps",
-+  "disable-demo-mode",
-+  "disable-device-disabling",
-+  "disable-device-discovery-notifications",
-+  "disable-dinosaur-easter-egg",
-+  "disable-direct-composition",
-+  "disable-directwrite-for-ui",
-+  "disable-display-color-calibration",
-+  "disable-display-list-2d-canvas",
-+  "disable-distance-field-text",
-+  "disable-domain-blocking-for-3d-apis",
-+  "disable-domain-reliability",
-+  "disable-download-image-renaming",
-+  "disable-drive-search-in-app-launcher",
-+  "disable-dwm-composition",
-+  "disable-eol-notification",
-+  "disable-es3-apis",
-+  "disable-es3-gl-context",
-+  "disable-extensions",
-+  "disable-extensions-except",
-+  "disable-extensions-file-access-check",
-+  "disable-extensions-http-throttling",
-+  "disable-fast-web-scroll-view-insets",
-+  "disable-features",
-+  "disable-field-trial-config",
-+  "disable-file-system",
-+  "disable-flash-3d",
-+  "disable-flash-stage3d",
-+  "disable-fullscreen-low-power-mode",
-+  "disable-fullscreen-tab-detaching",
-+  "disable-gaia-services",
-+  "disable-gesture-editing",
-+  "disable-gesture-requirement-for-media-playback",
-+  "disable-gesture-requirement-for-presentation",
-+  "disable-gesture-typing",
-+  "disable-gl-drawing-for-tests",
-+  "disable-gl-error-limit",
-+  "disable-gl-extensions",
-+  "disable-glsl-translator",
-+  "disable-gpu",
-+  "disable-gpu-async-worker-context",
-+  "disable-gpu-compositing",
-+  "disable-gpu-driver-bug-workarounds",
-+  "disable-gpu-early-init",
-+  "disable-gpu-memory-buffer-compositor-resources",
-+  "disable-gpu-memory-buffer-video-frames",
-+  "disable-gpu-process-crash-limit",
-+  "disable-gpu-program-cache",
-+  "disable-gpu-rasterization",
-+  "disable-gpu-sandbox",
-+  "disable-gpu-shader-disk-cache",
-+  "disable-gpu-vsync",
-+  "disable-gpu-watchdog",
-+  "disable-hang-monitor",
-+  "disable-hid-detection-on-oobe",
-+  "disable-hide-inactive-stacked-tab-close-buttons",
-+  "disable-histogram-customizer",
-+  "disable-hosted-app-shim-creation",
-+  "disable-hosted-apps-in-windows",
-+  "disable-http2",
-+  "disable-in-process-stack-traces",
-+  "disable-infobars",
-+  "disable-input-ime-api",
-+  "disable-input-view",
-+  "disable-ios-password-generation",
-+  "disable-ios-password-suggestions",
-+  "disable-ios-physical-web",
-+  "disable-javascript-harmony-shipping",
-+  "disable-kill-after-bad-ipc",
-+  "disable-lcd-text",
-+  "disable-legacy-window",
-+  "disable-local-storage",
-+  "disable-logging",
-+  "disable-login-animations",
-+  "disable-low-end-device-mode",
-+  "disable-low-latency-dxva",
-+  "disable-low-res-tiling",
-+  "disable-lru-snapshot-cache",
-+  "disable-mac-overlays",
-+  "disable-mac-views-native-app-windows",
-+  "disable-main-frame-before-activation",
-+  "disable-md-oobe",
-+  "disable-media-session-api",
-+  "disable-media-suspend",
-+  "disable-merge-key-char-events",
-+  "disable-minimize-on-second-launcher-item-click",
-+  "disable-mojo-renderer",
-+  "disable-mtp-write-support",
-+  "disable-multi-display-layout",
-+  "disable-namespace-sandbox",
-+  "disable-native-gpu-memory-buffers",
-+  "disable-network-portal-notification",
-+  "disable-new-bookmark-apps",
-+  "disable-new-channel-switcher-ui",
-+  "disable-new-kiosk-ui",
-+  "disable-new-korean-ime",
-+  "disable-new-profile-management",
-+  "disable-new-zip-unpacker",
-+  "disable-notifications",
-+  "disable-ntp-popular-sites",
-+  "disable-nv12-dxgi-video",
-+  "disable-offer-store-unmasked-wallet-cards",
-+  "disable-offer-upload-credit-cards",
-+  "disable-office-editing-component-extension",
-+  "disable-offline-auto-reload",
-+  "disable-offline-auto-reload-visible-only",
-+  "disable-overlay-scrollbar",
-+  "disable-overscroll-edge-effect",
-+  "disable-panel-fitting",
-+  "disable-partial-raster",
-+  "disable-password-generation",
-+  "disable-payment-request",
-+  "disable-pepper-3d",
-+  "disable-pepper-3d-image-chromium",
-+  "disable-per-monitor-dpi",
-+  "disable-permission-action-reporting",
-+  "disable-permissions-api",
-+  "disable-physical-keyboard-autocorrect",
-+  "disable-pinch",
-+  "disable-pnacl-crash-throttling",
-+  "disable-popup-blocking",
-+  "disable-prefer-compositing-to-lcd-text",
-+  "disable-presentation-api",
-+  "disable-print-preview",
-+  "disable-prompt-on-repost",
-+  "disable-pull-to-refresh-effect",
-+  "disable-push-api-background-mode",
-+  "disable-quic",
-+  "disable-reading-from-canvas",
-+  "disable-remote-core-animation",
-+  "disable-remote-fonts",
-+  "disable-remote-playback-api",
-+  "disable-renderer-accessibility",
-+  "disable-renderer-backgrounding",
-+  "disable-renderer-priority-management",
-+  "disable-resize-lock",
-+  "disable-rgba-4444-textures",
-+  "disable-rollback-option",
-+  "disable-rtc-smoothness-algorithm",
-+  "disable-screen-orientation-lock",
-+  "disable-search-geolocation-disclosure",
-+  "disable-seccomp-filter-sandbox",
-+  "disable-settings-window",
-+  "disable-setuid-sandbox",
-+  "disable-shader-name-hashing",
-+  "disable-shared-workers",
-+  "disable-signin-scoped-device-id",
-+  "disable-single-click-autofill",
-+  "disable-slimming-paint-invalidation",
-+  "disable-smart-virtual-keyboard",
-+  "disable-smooth-scrolling",
-+  "disable-software-rasterizer",
-+  "disable-speech-api",
-+  "disable-suggestions-ui",
-+  "disable-sync",
-+  "disable-sync-app-list",
-+  "disable-sync-types",
-+  "disable-system-timezone-automatic-detection",
-+  "disable-tab-for-desktop-share",
-+  "disable-tab-strip-autoscroll-new-tabs",
-+  "disable-threaded-animation",
-+  "disable-threaded-compositing",
-+  "disable-threaded-scrolling",
-+  "disable-touch-adjustment",
-+  "disable-touch-drag-drop",
-+  "disable-translate",
-+  "disable-translate-new-ux",
-+  "disable-usb-keyboard-detect",
-+  "disable-v8-idle-tasks",
-+  "disable-vaapi-accelerated-video-encode",
-+  "disable-views-rect-based-targeting",
-+  "disable-virtual-keyboard-overscroll",
-+  "disable-voice-input",
-+  "disable-volume-adjust-sound",
-+  "disable-wake-on-wifi",
-+  "disable-web-notification-custom-layouts",
-+  "disable-web-security",
-+  "disable-webgl",
-+  "disable-webgl-image-chromium",
-+  "disable-webrtc-encryption",
-+  "disable-webrtc-hw-decoding",
-+  "disable-webrtc-hw-encoding",
-+  "disable-webrtc-hw-vp8-encoding",
-+  "disable-win32k-lockdown",
-+  "disable-xss-auditor",
-+  "disable-zero-browsers-open-for-tests",
-+  "disable-zero-copy",
-+  "disable-zero-copy-dxgi-video",
-+  "disabled",
-+  "disk-cache-dir",
-+  "disk-cache-size",
-+  "display",
-+  "dmg-device",
-+  "dns-log-details",
-+  "dom-automation",
-+  "dotfile",
-+  "duck-flash",
-+  "dump-browser-histograms",
-+  "dump-dom",
-+  "eafe-path",
-+  "eafe-url",
-+  "early-tracing",
-+  "easy-unlock-app-path",
-+  "edge-touch-filtering",
-+  "egl",
-+  "elevate",
-+  "embedded-extension-options",
-+  "emphasize-titles-in-omnibox-dropdown",
-+  "emulate-shader-precision",
-+  "enable-accelerated-2d-canvas",
-+  "enable-accelerated-vpx-decode",
-+  "enable-accessibility-tab-switcher",
-+  "enable-account-consistency",
-+  "enable-ad",
-+  "enable-adaptive-selection-handle-orientation",
-+  "enable-add-to-shelf",
-+  "enable-aggressive-domstorage-flushing",
-+  "enable-android-wallpapers-app",
-+  "enable-app-info-dialog-mac",
-+  "enable-app-list",
-+  "enable-app-window-cycling",
-+  "enable-appcontainer",
-+  "enable-arc",
-+  "enable-arc-oobe-optin",
-+  "enable-audio-debug-recordings-from-extension",
-+  "enable-autofill-keyboard-accessory-view",
-+  "enable-automation",
-+  "enable-benchmarking",
-+  "enable-ble-advertising-in-apps",
-+  "enable-blink-features",
-+  "enable-bookmark-undo",
-+  "enable-browser-side-navigation",
-+  "enable-browser-task-scheduler",
-+  "enable-canvas-2d-dynamic-rendering-mode-switching",
-+  "enable-checker-imaging",
-+  "enable-chromevox-arc-support",
-+  "enable-clear-browsing-data-counters",
-+  "enable-cloud-print-proxy",
-+  "enable-cloud-print-xps",
-+  "enable-color-correct-rendering",
-+  "enable-color-correct-rendering-default-mode",
-+  "enable-consumer-kiosk",
-+  "enable-content-intent-detection",
-+  "enable-contextual-search",
-+  "enable-crash-reporter",
-+  "enable-crash-reporter-for-testing",
-+  "enable-crx-hash-check",
-+  "enable-data-reduction-proxy-bypass-warning",
-+  "enable-data-reduction-proxy-carrier-test",
-+  "enable-data-reduction-proxy-force-pingback",
-+  "enable-data-reduction-proxy-lite-page",
-+  "enable-data-reduction-proxy-savings-promo",
-+  "enable-datasaver-prompt",
-+  "enable-default-media-session",
-+  "enable-device-discovery-notifications",
-+  "enable-devtools-experiments",
-+  "enable-display-list-2d-canvas",
-+  "enable-distance-field-text",
-+  "enable-distillability-service",
-+  "enable-dom-distiller",
-+  "enable-domain-reliability",
-+  "enable-download-image-renaming",
-+  "enable-drive-search-in-app-launcher",
-+  "enable-drm-atomic",
-+  "enable-embedded-extension-options",
-+  "enable-es3-apis",
-+  "enable-exclusive-audio",
-+  "enable-experimental-accessibility-features",
-+  "enable-experimental-canvas-features",
-+  "enable-experimental-extension-apis",
-+  "enable-experimental-input-view-features",
-+  "enable-experimental-web-platform-features",
-+  "enable-extension-activity-log-testing",
-+  "enable-extension-activity-logging",
-+  "enable-extension-assets-sharing",
-+  "enable-fast-unload",
-+  "enable-fast-web-scroll-view-insets",
-+  "enable-features",
-+  "enable-first-run-ui-transitions",
-+  "enable-floating-virtual-keyboard",
-+  "enable-font-antialiasing",
-+  "enable-fullscreen-tab-detaching",
-+  "enable-fullscreen-toolbar-reveal",
-+  "enable-google-branded-context-menu",
-+  "enable-gpu-async-worker-context",
-+  "enable-gpu-benchmarking",
-+  "enable-gpu-client-logging",
-+  "enable-gpu-client-tracing",
-+  "enable-gpu-command-logging",
-+  "enable-gpu-debugging",
-+  "enable-gpu-driver-debug-logging",
-+  "enable-gpu-memory-buffer-compositor-resources",
-+  "enable-gpu-memory-buffer-video-frames",
-+  "enable-gpu-rasterization",
-+  "enable-gpu-service-logging",
-+  "enable-gpu-service-tracing",
-+  "enable-grouped-history",
-+  "enable-hardware-overlays",
-+  "enable-harfbuzz-rendertext",
-+  "enable-hdr-output",
-+  "enable-heap-profiling",
-+  "enable-hosted-app-quit-notification",
-+  "enable-hosted-apps-in-windows",
-+  "enable-hosted-mode",
-+  "enable-hotword-hardware",
-+  "enable-hung-renderer-infobar",
-+  "enable-inband-text-tracks",
-+  "enable-input-ime-api",
-+  "enable-ios-handoff-to-other-devices",
-+  "enable-ios-password-generation",
-+  "enable-ios-physical-web",
-+  "enable-kiosk-mode",
-+  "enable-layer-lists",
-+  "enable-lcd-text",
-+  "enable-leak-detection",
-+  "enable-local-file-accesses",
-+  "enable-local-sync-backend",
-+  "enable-logging",
-+  "enable-longpress-drag-selection",
-+  "enable-low-end-device-mode",
-+  "enable-low-res-tiling",
-+  "enable-lru-snapshot-cache",
-+  "enable-mac-views-native-app-windows",
-+  "enable-main-frame-before-activation",
-+  "enable-md-feedback",
-+  "enable-md-policy-page",
-+  "enable-media-suspend",
-+  "enable-merge-key-char-events",
-+  "enable-message-center-always-scroll-up-upon-notification-removal",
-+  "enable-nacl",
-+  "enable-nacl-debug",
-+  "enable-nacl-nonsfi-mode",
-+  "enable-native-cups",
-+  "enable-native-gpu-memory-buffers",
-+  "enable-natural-scroll-default",
-+  "enable-navigation-tracing",
-+  "enable-net-benchmarking",
-+  "enable-network-information",
-+  "enable-network-portal-notification",
-+  "enable-new-bookmark-apps",
-+  "enable-ntp-popular-sites",
-+  "enable-ntp-search-engine-country-detection",
-+  "enable-offer-store-unmasked-wallet-cards",
-+  "enable-offer-upload-credit-cards",
-+  "enable-offline-auto-reload",
-+  "enable-offline-auto-reload-visible-only",
-+  "enable-osk-overscroll",
-+  "enable-overlay-scrollbar",
-+  "enable-override-bookmarks-ui",
-+  "enable-partial-raster",
-+  "enable-password-generation",
-+  "enable-payment-request",
-+  "enable-pepper-testing",
-+  "enable-per-monitor-dpi",
-+  "enable-permission-action-reporting",
-+  "enable-physical-keyboard-autocorrect",
-+  "enable-pinch",
-+  "enable-pixel-output-in-tests",
-+  "enable-plugin-placeholder-testing",
-+  "enable-potentially-annoying-security-features",
-+  "enable-power-overlay",
-+  "enable-precache",
-+  "enable-precise-memory-info",
-+  "enable-prefer-compositing-to-lcd-text",
-+  "enable-print-browser",
-+  "enable-print-preview-register-promos",
-+  "enable-profile-shortcut-manager",
-+  "enable-profiling",
-+  "enable-proximity-auth-bluetooth-low-energy-discovery",
-+  "enable-proximity-auth-proximity-detection",
-+  "enable-push-api-background-mode",
-+  "enable-quic",
-+  "enable-reader-mode-toolbar-icon",
-+  "enable-refresh-token-annotation-request",
-+  "enable-request-tablet-site",
-+  "enable-rgba-4444-textures",
-+  "enable-sandbox",
-+  "enable-sandbox-logging",
-+  "enable-screenshot-testing-with-mode",
-+  "enable-scripts-require-action",
-+  "enable-scroll-prediction",
-+  "enable-service-manager-tracing",
-+  "enable-settings-window",
-+  "enable-sgi-video-sync",
-+  "enable-single-click-autofill",
-+  "enable-site-engagement-eviction-policy",
-+  "enable-site-settings",
-+  "enable-skia-benchmarking",
-+  "enable-slimming-paint-invalidation",
-+  "enable-slimming-paint-v2",
-+  "enable-smooth-scrolling",
-+  "enable-spatial-navigation",
-+  "enable-spdy-proxy-auth",
-+  "enable-speech-dispatcher",
-+  "enable-spelling-feedback-field-trial",
-+  "enable-spotlight-actions",
-+  "enable-stats-collection-bindings",
-+  "enable-stats-table",
-+  "enable-strict-mixed-content-checking",
-+  "enable-strict-powerful-feature-restrictions",
-+  "enable-suggestions-ui",
-+  "enable-suggestions-with-substring-match",
-+  "enable-supervised-user-managed-bookmarks-folder",
-+  "enable-swap-buffers-with-bounds",
-+  "enable-sync-app-list",
-+  "enable-sync-articles",
-+  "enable-tab-audio-muting",
-+  "enable-tcp-fastopen",
-+  "enable-tether",
-+  "enable-threaded-compositing",
-+  "enable-threaded-texture-mailboxes",
-+  "enable-thumbnail-retargeting",
-+  "enable-tile-compression",
-+  "enable-touch-calibration-setting",
-+  "enable-touch-drag-drop",
-+  "enable-touch-support-for-screen-magnifier",
-+  "enable-touchpad-three-finger-click",
-+  "enable-touchview",
-+  "enable-trace-app-source",
-+  "enable-tracing",
-+  "enable-tracing-output",
-+  "enable-translate-new-ux",
-+  "enable-true-color-rendering",
-+  "enable-ui-devtools",
-+  "enable-use-zoom-for-dsf",
-+  "enable-user-controlled-alternate-protocol-ports",
-+  "enable-user-metrics",
-+  "enable-usermedia-screen-capturing",
-+  "enable-video-player-chromecast-support",
-+  "enable-viewport",
-+  "enable-virtual-keyboard",
-+  "enable-vp9-in-mp4",
-+  "enable-vtune-support",
-+  "enable-vulkan",
-+  "enable-wayland-server",
-+  "enable-web-notification-custom-layouts",
-+  "enable-webfonts-intervention-trigger",
-+  "enable-webfonts-intervention-v2",
-+  "enable-webgl-draft-extensions",
-+  "enable-webgl-image-chromium",
-+  "enable-webrtc-event-logging-from-extension",
-+  "enable-webrtc-stun-origin",
-+  "enable-webvr",
-+  "enable-wifi-credential-sync",
-+  "enable-win7-webrtc-hw-h264-decoding",
-+  "enable-zero-copy",
-+  "enabled",
-+  "enabled-2g",
-+  "enabled-3g",
-+  "enabled-slow2g",
-+  "encode-binary",
-+  "enforce",
-+  "enforce-gl-minimums",
-+  "enforce-webrtc-ip-permission-check",
-+  "enforce_strict",
-+  "enterprise-disable-arc",
-+  "enterprise-enable-forced-re-enrollment",
-+  "enterprise-enable-zero-touch-enrollment",
-+  "enterprise-enrollment-initial-modulus",
-+  "enterprise-enrollment-modulus-limit",
-+  "error-console",
-+  "explicitly-allowed-ports",
-+  "expose-internals-for-testing",
-+  "extension-content-verification",
-+  "extension-process",
-+  "extensions-install-verification",
-+  "extensions-multi-account",
-+  "extensions-not-webstore",
-+  "extensions-on-chrome-urls",
-+  "extensions-update-frequency",
-+  "extra-search-query-params",
-+  "fail-on-unused-args",
-+  "fake-variations-channel",
-+  "false",
-+  "fast",
-+  "fast-start",
-+  "feedback-server",
-+  "field-trial-handle",
-+  "first-exec-after-boot",
-+  "flag-switches-begin",
-+  "flag-switches-end",
-+  "font-cache-shared-handle",
-+  "force-android-app-mode",
-+  "force-app-mode",
-+  "force-desktop-ios-promotion",
-+  "force-dev-mode-highlighting",
-+  "force-device-scale-factor",
-+  "force-display-list-2d-canvas",
-+  "force-fieldtrial-params",
-+  "force-fieldtrials",
-+  "force-first-run",
-+  "force-first-run-ui",
-+  "force-gpu-mem-available-mb",
-+  "force-gpu-rasterization",
-+  "force-happiness-tracking-system",
-+  "force-load-easy-unlock-app-in-tests",
-+  "force-local-ntp",
-+  "force-login-manager-in-tests",
-+  "force-mediafoundation",
-+  "force-overlay-fullscreen-video",
-+  "force-pnacl-subzero",
-+  "force-renderer-accessibility",
-+  "force-show-update-menu-badge",
-+  "force-show-update-menu-item",
-+  "force-system-compositor-mode",
-+  "force-ui-direction",
-+  "force-variation-ids",
-+  "force-video-overlays",
-+  "force-wave-audio",
-+  "force-webrtc-ip-handling-policy",
-+  "full-memory-crash-report",
-+  "gaia-url",
-+  "gcm-checkin-url",
-+  "gcm-mcs-endpoint",
-+  "gcm-registration-url",
-+  "generate-accessibility-test-expectations",
-+  "gl",
-+  "gl-composited-texture-quad-border",
-+  "gl-shader-interm-output",
-+  "gles",
-+  "golden-screenshots-dir",
-+  "google-apis-url",
-+  "google-base-url",
-+  "google-doodle-url",
-+  "google-profile-info",
-+  "google-url",
-+  "gpu-active-device-id",
-+  "gpu-active-vendor-id",
-+  "gpu-device-id",
-+  "gpu-driver-bug-workarounds",
-+  "gpu-driver-date",
-+  "gpu-driver-vendor",
-+  "gpu-driver-version",
-+  "gpu-launcher",
-+  "gpu-no-complete-info-collection",
-+  "gpu-no-context-lost",
-+  "gpu-process",
-+  "gpu-program-cache-size-kb",
-+  "gpu-rasterization-msaa-sample-count",
-+  "gpu-sandbox-allow-sysv-shm",
-+  "gpu-sandbox-failures-fatal",
-+  "gpu-sandbox-start-early",
-+  "gpu-secondary-device-ids",
-+  "gpu-secondary-vendor-ids",
-+  "gpu-startup-dialog",
-+  "gpu-testing-device-id",
-+  "gpu-testing-driver-date",
-+  "gpu-testing-gl-renderer",
-+  "gpu-testing-gl-vendor",
-+  "gpu-testing-gl-version",
-+  "gpu-testing-os-version",
-+  "gpu-testing-secondary-device-ids",
-+  "gpu-testing-secondary-vendor-ids",
-+  "gpu-testing-vendor-id",
-+  "gpu-vendor-id",
-+  "guest-wallpaper-large",
-+  "guest-wallpaper-small",
-+  "h",
-+  "has-chromeos-diamond-key",
-+  "headless",
-+  "help",
-+  "hide",
-+  "hide-icons",
-+  "hide-scrollbars",
-+  "history-entry-requires-user-gesture",
-+  "homedir",
-+  "homepage",
-+  "host",
-+  "host-pairing-oobe",
-+  "host-resolver-retry-attempts",
-+  "host-resolver-rules",
-+  "host-rules",
-+  "icu-data-dir",
-+  "ignore-autocomplete-off-autofill",
-+  "ignore-certificate-errors",
-+  "ignore-gpu-blacklist",
-+  "ignore-missing-cdm-host-file",
-+  "ignore-urlfetcher-cert-requests",
-+  "ignore-user-profile-mapping-for-tests",
-+  "in-process-gpu",
-+  "incognito",
-+  "inert-visual-viewport",
-+  "input",
-+  "inspect",
-+  "inspect-brk",
-+  "install-chrome-app",
-+  "install-supervised-user-whitelists",
-+  "instant-process",
-+  "interests-url",
-+  "invalidation-use-gcm-channel",
-+  "ipc-connection-timeout",
-+  "ipc-dump-directory",
-+  "ipc-fuzzer-testcase",
-+  "is-running-in-mash",
-+  "isolate-extensions",
-+  "isolate-sites-for-testing",
-+  "javascript-harmony",
-+  "js-flags",
-+  "keep-alive-for-test",
-+  "kiosk",
-+  "kiosk-printing",
-+  "lang",
-+  "last-launched-app",
-+  "light_muted",
-+  "light_vibrant",
-+  "load-and-launch-app",
-+  "load-apps",
-+  "load-extension",
-+  "load-media-router-component-extension",
-+  "local-heuristics-only-for-password-generation",
-+  "local-ntp-reload",
-+  "local-sync-backend-dir",
-+  "log-gpu-control-list-decisions",
-+  "log-level",
-+  "log-net-log",
-+  "login-manager",
-+  "login-profile",
-+  "login-user",
-+  "lso-url",
-+  "ltr",
-+  "main-frame-resizes-are-orientation-changes",
-+  "make-chrome-default",
-+  "make-default-browser",
-+  "managed-user-id",
-+  "managed-user-sync-token",
-+  "mark-non-secure-as",
-+  "markdown",
-+  "market-url-for-testing",
-+  "mash",
-+  "material",
-+  "material-design-ink-drop-animation-speed",
-+  "material-hybrid",
-+  "max-gum-fps",
-+  "max-untiled-layer-height",
-+  "max-untiled-layer-width",
-+  "media-cache-size",
-+  "mem-pressure-system-reserved-kb",
-+  "memory-metrics",
-+  "memory-pressure-off",
-+  "memory-pressure-thresholds",
-+  "memory-pressure-thresholds-mb",
-+  "message-center-changes-while-open",
-+  "metrics-client-id",
-+  "metrics-recording-only",
-+  "mhtml-generator-option",
-+  "mock",
-+  "mojo-channel-token",
-+  "mojo-local-storage",
-+  "mojo-pipe-token",
-+  "monitoring-destination-id",
-+  "mse-audio-buffer-size-limit",
-+  "mse-video-buffer-size-limit",
-+  "mute-audio",
-+  "nacl-broker",
-+  "nacl-dangerous-no-sandbox-nonsfi",
-+  "nacl-debug-mask",
-+  "nacl-gdb",
-+  "nacl-gdb-script",
-+  "nacl-loader",
-+  "nacl-loader-nonsfi",
-+  "native",
-+  "native-crx-bindings",
-+  "net-log-capture-mode",
-+  "netifs-to-ignore",
-+  "network-country-iso",
-+  "new-profile-management",
-+  "new-window",
-+  "no-default-browser-check",
-+  "no-experiments",
-+  "no-first-run",
-+  "no-managed-user-acknowledgment-check",
-+  "no-network-profile-warning",
-+  "no-pings",
-+  "no-proxy-server",
-+  "no-referrers",
-+  "no-sandbox",
-+  "no-service-autorun",
-+  "no-startup-window",
-+  "no-use-mus-in-renderer",
-+  "no-wifi",
-+  "no-zygote",
-+  "nocolor",
-+  "noerrdialogs",
-+  "non-material",
-+  "non-secure",
-+  "none",
-+  "normal_muted",
-+  "normal_vibrant",
-+  "note-taking-app-ids",
-+  "ntp-snippets-add-incomplete",
-+  "ntp-switch-to-existing-tab",
-+  "null",
-+  "num-pac-threads",
-+  "num-raster-threads",
-+  "oauth2-client-id",
-+  "oauth2-client-secret",
-+  "off",
-+  "on",
-+  "oobe-bootstrapping-master",
-+  "oobe-guest-session",
-+  "oobe-skip-postlogin",
-+  "oobe-timer-interval",
-+  "open-ash",
-+  "opengraph",
-+  "origin-to-force-quic-on",
-+  "origin-trial-disabled-features",
-+  "origin-trial-disabled-tokens",
-+  "origin-trial-public-key",
-+  "original-process-start-time",
-+  "osmesa",
-+  "output",
-+  "override",
-+  "override-metrics-upload-url",
-+  "override-plugin-power-saver-for-testing",
-+  "override-use-software-gl-for-tests",
-+  "overscroll-history-navigation",
-+  "ozone-dump-file",
-+  "ozone-platform",
-+  "pack-extension",
-+  "pack-extension-key",
-+  "parent-profile",
-+  "parent-window",
-+  "passive-listeners-default",
-+  "password-store",
-+  "permission-request-api-scope",
-+  "permission-request-api-url",
-+  "power-stub",
-+  "ppapi",
-+  "ppapi-antialiased-text-enabled",
-+  "ppapi-broker",
-+  "ppapi-flash-args",
-+  "ppapi-flash-path",
-+  "ppapi-flash-version",
-+  "ppapi-in-process",
-+  "ppapi-plugin-launcher",
-+  "ppapi-startup-dialog",
-+  "ppapi-subpixel-rendering-setting",
-+  "precache-config-settings-url",
-+  "precache-manifest-url-prefix",
-+  "prerender-from-omnibox",
-+  "previous-app",
-+  "primary",
-+  "primordial-pipe-token",
-+  "privet-ipv6-only",
-+  "process-per-site",
-+  "process-per-tab",
-+  "process-service-name",
-+  "product-version",
-+  "profile-directory",
-+  "profiler-timing",
-+  "profiling-at-start",
-+  "profiling-file",
-+  "profiling-flush",
-+  "progress-bar-animation",
-+  "progress-bar-completion",
-+  "prompt-for-external-extensions",
-+  "proxy-auto-detect",
-+  "proxy-bypass-list",
-+  "proxy-pac-url",
-+  "proxy-server",
-+  "q",
-+  "quic-connection-options",
-+  "quic-host-whitelist",
-+  "quic-max-packet-length",
-+  "quic-version",
-+  "rdp_desktop_session",
-+  "reader-mode-feedback",
-+  "reader-mode-heuristics",
-+  "rebaseline-pixel-tests",
-+  "reduce-security-for-testing",
-+  "reduced-referrer-granularity",
-+  "register-font-files",
-+  "register-pepper-plugins",
-+  "relauncher",
-+  "remote-debugging-address",
-+  "remote-debugging-port",
-+  "remote-debugging-socket-name",
-+  "remote-debugging-targets",
-+  "renderer",
-+  "renderer-client-id",
-+  "renderer-cmd-prefix",
-+  "renderer-process-limit",
-+  "renderer-startup-dialog",
-+  "renderer-wait-for-java-debugger",
-+  "repl",
-+  "report-vp9-as-an-unsupported-mime-type",
-+  "require-audio-hardware-for-testing",
-+  "reset-app-list-install-state",
-+  "reset-variation-state",
-+  "restore-last-session",
-+  "root",
-+  "root-layer-scrolls",
-+  "rtl",
-+  "run-layout-test",
-+  "runtime-deps-list-file",
-+  "safebrowsing-disable-auto-update",
-+  "safebrowsing-disable-download-protection",
-+  "safebrowsing-disable-extension-blacklist",
-+  "safebrowsing-manual-download-blacklist",
-+  "sandbox-ipc",
-+  "save-page-as-mhtml",
-+  "saveas-menu-label",
-+  "screen-config",
-+  "screenshot",
-+  "script-executable",
-+  "scripts-require-action",
-+  "scroll-end-effect",
-+  "secondary",
-+  "secondary-display-layout",
-+  "secondary-ui-md",
-+  "service",
-+  "service-overrides",
-+  "service-request-channel-token",
-+  "shared-files",
-+  "shill-stub",
-+  "show-app-list",
-+  "show-autofill-signatures",
-+  "show-autofill-type-predictions",
-+  "show-component-extension-options",
-+  "show-composited-layer-borders",
-+  "show-fps-counter",
-+  "show-icons",
-+  "show-layer-animation-bounds",
-+  "show-mac-overlay-borders",
-+  "show-overdraw-feedback",
-+  "show-paint-rects",
-+  "show-property-changed-rects",
-+  "show-saved-copy",
-+  "show-screenspace-rects",
-+  "show-surface-damage-rects",
-+  "show_summary",
-+  "silent-debugger-extension-api",
-+  "silent-launch",
-+  "simulate-critical-update",
-+  "simulate-elevated-recovery",
-+  "simulate-outdated",
-+  "simulate-outdated-no-au",
-+  "simulate-upgrade",
-+  "single-process",
-+  "site-per-process",
-+  "skip-gpu-data-loading",
-+  "skip-nostore-all",
-+  "skip-nostore-main",
-+  "skip-reencoding-on-skp-capture",
-+  "slow",
-+  "slow-connections-only",
-+  "slow-down-raster-scale-factor",
-+  "sms-test-messages",
-+  "spdy-proxy-auth-fallback",
-+  "spdy-proxy-auth-origin",
-+  "spdy-proxy-auth-value",
-+  "spelling-service-feedback-interval-seconds",
-+  "spelling-service-feedback-url",
-+  "ssl-key-log-file",
-+  "ssl-version-max",
-+  "ssl-version-min",
-+  "stable-release-mode",
-+  "start-fullscreen",
-+  "start-maximized",
-+  "start-stack-profiler",
-+  "started",
-+  "stub",
-+  "stub-cros-settings",
-+  "supports-dual-gpus",
-+  "swiftshader",
-+  "swiftshader-path",
-+  "swiftshader-webgl",
-+  "sync-allow-insecure-xmpp-connection",
-+  "sync-deferred-startup-timeout-seconds",
-+  "sync-disable-deferred-startup",
-+  "sync-enable-get-update-avoidance",
-+  "sync-notification-host-port",
-+  "sync-on-draw-hardware",
-+  "sync-short-initial-retry-override",
-+  "sync-short-nudge-delay-for-test",
-+  "sync-url",
-+  "system-developer-mode",
-+  "system-log-upload-frequency",
-+  "tab-management-experiment-type-disabled",
-+  "tab-management-experiment-type-elderberry",
-+  "task-profiler",
-+  "team-drives",
-+  "test-auto-update-ui",
-+  "test-child-process",
-+  "test-cros-gaia-id-migration",
-+  "test-do-not-initialize-icu",
-+  "test-gl-lib",
-+  "test-launcher-batch-limit",
-+  "test-launcher-bot-mode",
-+  "test-launcher-debug-launcher",
-+  "test-launcher-filter-file",
-+  "test-launcher-force-run-broken-tests",
-+  "test-launcher-jobs",
-+  "test-launcher-list-tests",
-+  "test-launcher-output",
-+  "test-launcher-print-test-stdio",
-+  "test-launcher-print-writable-path",
-+  "test-launcher-retry-limit",
-+  "test-launcher-shard-index",
-+  "test-launcher-summary-output",
-+  "test-launcher-timeout",
-+  "test-launcher-total-shards",
-+  "test-launcher-trace",
-+  "test-name",
-+  "test-tiny-timeout",
-+  "test-type",
-+  "testing-fixed-http-port",
-+  "testing-fixed-https-port",
-+  "threads",
-+  "time",
-+  "timeout",
-+  "tls1",
-+  "tls1.1",
-+  "tls1.2",
-+  "tls1.3",
-+  "top-chrome-md",
-+  "top-controls-hide-threshold",
-+  "top-controls-show-threshold",
-+  "top-document-isolation",
-+  "touch-calibration",
-+  "touch-devices",
-+  "touch-events",
-+  "touch-noise-filtering",
-+  "touch-selection-strategy",
-+  "trace-config-file",
-+  "trace-export-events-to-etw",
-+  "trace-shutdown",
-+  "trace-shutdown-file",
-+  "trace-startup",
-+  "trace-startup-duration",
-+  "trace-startup-file",
-+  "trace-to-console",
-+  "trace-to-file",
-+  "trace-to-file-name",
-+  "trace-upload-url",
-+  "tracelog",
-+  "translate-ranker-model-url",
-+  "translate-script-url",
-+  "translate-security-origin",
-+  "true",
-+  "try-chrome-again",
-+  "try-supported-channel-layouts",
-+  "type",
-+  "ui-disable-partial-swap",
-+  "ui-enable-layer-lists",
-+  "ui-enable-rgba-4444-textures",
-+  "ui-enable-zero-copy",
-+  "ui-prioritize-in-gpu-process",
-+  "ui-show-fps-counter",
-+  "ui-show-layer-animation-bounds",
-+  "ui-show-layer-borders",
-+  "ui-show-paint-rects",
-+  "ui-show-property-changed-rects",
-+  "ui-show-screenspace-rects",
-+  "ui-show-surface-damage-rects",
-+  "ui-slow-animations",
-+  "ui-test-action-max-timeout",
-+  "ui-test-action-timeout",
-+  "uninstall",
-+  "unlimited-storage",
-+  "unsafe-pac-url",
-+  "unsafely-treat-insecure-origin-as-secure",
-+  "use-angle",
-+  "use-cras",
-+  "use-fake-device-for-media-stream",
-+  "use-fake-ui-for-media-stream",
-+  "use-file-for-fake-audio-capture",
-+  "use-file-for-fake-video-capture",
-+  "use-first-display-as-internal",
-+  "use-gl",
-+  "use-gpu-in-tests",
-+  "use-mobile-user-agent",
-+  "use-mock-keychain",
-+  "use-new-virtual-keyboard-behavior",
-+  "use-passthrough-cmd-decoder",
-+  "use-simple-cache-backend",
-+  "use-test-config",
-+  "use_new_features_summary",
-+  "user-agent",
-+  "user-always-affiliated",
-+  "user-data-dir",
-+  "utility",
-+  "utility-allowed-dir",
-+  "utility-cmd-prefix",
-+  "utility-run-elevated",
-+  "v",
-+  "v8-cache-options",
-+  "v8-cache-strategies-for-cache-storage",
-+  "validate-crx",
-+  "validate-input-event-stream",
-+  "variations-server-url",
-+  "version",
-+  "video-image-texture-target",
-+  "video-threads",
-+  "video-underflow-threshold-ms",
-+  "viewer-launch-via-appid",
-+  "virtual-time-budget",
-+  "vmodule",
-+  "wait-for-debugger",
-+  "wait-for-debugger-children",
-+  "wake-on-wifi-packet",
-+  "wallet-service-use-sandbox",
-+  "watcher",
-+  "waveout-buffers",
-+  "webapk-server-url",
-+  "webrtc-stun-probe-trial",
-+  "webview-enable-safebrowsing-support",
-+  "webview-sandboxed-renderer",
-+  "whitelisted-extension-id",
-+  "win-jumplist-action",
-+  "window-position",
-+  "window-size",
-+  "window-workspace",
-+  "windows10-custom-titlebar",
-+  "windows8-search",
-+  "winhttp-proxy-resolver",
-+  "wm-window-animations-disabled",
-+  "zygote",
-+  "zygote-cmd-prefix"
-+};
-+
-+bool IsBlacklistedArg(const base::CommandLine::CharType* arg) {
-+#if defined(OS_WIN)
-+  const auto converted = base::WideToUTF8(arg);
-+  const char* a = converted.c_str();
-+#else
-+  const char* a = arg;
-+#endif
-+
-+  static const char* prefixes[] = {"--", "-", "/"};
-+
-+  int prefix_length = 0;
-+  for (auto& prefix : prefixes) {
-+    if (base::StartsWith(a, prefix, base::CompareCase::SENSITIVE)) {
-+      prefix_length = strlen(prefix);
-+      break;
-+    }
-+  }
-+
-+  if (prefix_length > 0) {
-+    a += prefix_length;
-+    std::string switch_name =
-+        base::ToLowerASCII(base::StringPiece(a, strcspn(a, "=")));
-+    for (auto& item : blacklist) {
-+      if (switch_name == item)
-+        return true;
-+    }
-+  }
-+
-+  return false;
-+}
-+
-+>>>>>>> .their
- }  // namespace
- 
- namespace atom {
- 
- bool CheckCommandLineArguments(int argc, base::CommandLine::CharType** argv) {
-   const base::CommandLine::StringType dashdash(2, '-');
-+<<<<<<< .our
-   bool block_args = false;
-   for (int i = 0; i < argc; ++i) {
-     if (argv[i] == dashdash)
-@@ -45,6 +1371,17 @@
-       return false;
-     } else if (IsUrlArg(argv[i])) {
-       block_args = true;
-+=======
-+  bool block_blacklisted_args = false;
-+  for (int i = 0; i < argc; ++i) {
-+    if (argv[i] == dashdash)
-+      break;
-+    if (block_blacklisted_args) {
-+      if (IsBlacklistedArg(argv[i]))
-+        return false;
-+    } else if (IsUrlArg(argv[i])) {
-+      block_blacklisted_args = true;
-+>>>>>>> .their
-     }
-   }
-   return true;
-added in both
-  our    100644 2c0acc1648ff3b4bc574f000643069f8ef8e94bb atom/app/command_line_args.h
-  their  100644 1f5fd756868898e7a304c754d89625059d36441f atom/app/command_line_args.h
-@@ -14,3 +14,7 @@
- }  // namespace atom
- 
- #endif  // ATOM_APP_COMMAND_LINE_ARGS_H_
-+<<<<<<< .our
-+=======
-+
-+>>>>>>> .their
-changed in both
-  base   100644 06d4dd8aaf5b1d64db4b8b6a1ed11f67ab5e9835 atom/browser/api/atom_api_app.cc
-  our    100644 089a2b63d1bae3afebea925582a3aac81ddeaa4f atom/browser/api/atom_api_app.cc
-  their  100644 620abed67081a04788d03f358f787ad0bb7502df atom/browser/api/atom_api_app.cc
-@@ -618,7 +618,10 @@
- }
- 
- void App::OnPreMainMessageLoopRun() {
-+<<<<<<< .our
-   content::BrowserChildProcessObserver::Add(this);
-+=======
-+>>>>>>> .their
-   if (process_singleton_) {
-     process_singleton_->OnBrowserReady();
-   }
-changed in both
-  base   100644 694a3e3047303a953f098610504c65ce7b4c9003 atom/browser/api/atom_api_app.h
-  our    100644 ee0ad42c05fe33be17146b79cbe3422953516621 atom/browser/api/atom_api_app.h
-  their  100644 15141391e067d1b44a45255a1b5cca265ea0b5a8 atom/browser/api/atom_api_app.h
-changed in both
-  base   100644 7496b8389aceee1db3a028b86d50a7bdc56d375b atom/browser/api/atom_api_notification.cc
-  our    100644 06d22455c7024a41799d5003a755588bb67437a9 atom/browser/api/atom_api_notification.cc
-  their  100644 ef5b9ce1296a3e6f535ae1f77614028ca4dfa6d9 atom/browser/api/atom_api_notification.cc
-@@ -72,7 +72,10 @@
-     opts.Get("hasReply", &has_reply_);
-     opts.Get("actions", &actions_);
-     opts.Get("sound", &sound_);
-+<<<<<<< .our
-     opts.Get("closeButtonText", &close_button_text_);
-+=======
-+>>>>>>> .their
-   }
- }
- 
-@@ -123,8 +126,13 @@
-   return actions_;
- }
- 
-+<<<<<<< .our
- base::string16 Notification::GetCloseButtonText() const {
-   return close_button_text_;
-+=======
-+base::string16 Notification::GetSound() const {
-+  return sound_;
-+>>>>>>> .their
- }
- 
- // Setters
-@@ -161,8 +169,13 @@
-   actions_ = actions;
- }
- 
-+<<<<<<< .our
- void Notification::SetCloseButtonText(const base::string16& text) {
-   close_button_text_ = text;
-+=======
-+void Notification::SetSound(const base::string16& new_sound) {
-+  sound_ = new_sound;
-+>>>>>>> .their
- }
- 
- void Notification::NotificationAction(int index) {
-@@ -211,7 +224,10 @@
-       options.reply_placeholder = reply_placeholder_;
-       options.actions = actions_;
-       options.sound = sound_;
-+<<<<<<< .our
-       options.close_button_text = close_button_text_;
-+=======
-+>>>>>>> .their
-       notification_->Show(options);
-     }
-   }
-@@ -241,8 +257,13 @@
-       .SetProperty("sound", &Notification::GetSound, &Notification::SetSound)
-       .SetProperty("actions", &Notification::GetActions,
-                    &Notification::SetActions)
-+<<<<<<< .our
-       .SetProperty("closeButtonText", &Notification::GetCloseButtonText,
-                    &Notification::SetCloseButtonText);
-+=======
-+      .SetProperty("sound", &Notification::GetSound,
-+                   &Notification::SetSound);
-+>>>>>>> .their
- }
- 
- }  // namespace api
-changed in both
-  base   100644 9c2dcd4b5107932ab668464d6199f7a3193100f0 atom/browser/api/atom_api_notification.h
-  our    100644 91a5b72c983c95b20315384091048e50ad08d27f atom/browser/api/atom_api_notification.h
-  their  100644 d4679e7c2c90df3b8e20cd95c8e3a96a412b2492 atom/browser/api/atom_api_notification.h
-@@ -56,7 +56,11 @@
-   base::string16 GetReplyPlaceholder() const;
-   base::string16 GetSound() const;
-   std::vector<brightray::NotificationAction> GetActions() const;
-+<<<<<<< .our
-   base::string16 GetCloseButtonText() const;
-+=======
-+  base::string16 GetSound() const;
-+>>>>>>> .their
- 
-   // Prop Setters
-   void SetTitle(const base::string16& new_title);
-@@ -67,7 +71,11 @@
-   void SetReplyPlaceholder(const base::string16& new_reply_placeholder);
-   void SetSound(const base::string16& sound);
-   void SetActions(const std::vector<brightray::NotificationAction>& actions);
-+<<<<<<< .our
-   void SetCloseButtonText(const base::string16& text);
-+=======
-+  void SetSound(const base::string16& sound);
-+>>>>>>> .their
- 
-  private:
-   base::string16 title_;
-@@ -81,7 +89,11 @@
-   base::string16 reply_placeholder_;
-   base::string16 sound_;
-   std::vector<brightray::NotificationAction> actions_;
-+<<<<<<< .our
-   base::string16 close_button_text_;
-+=======
-+  base::string16 sound_;
-+>>>>>>> .their
- 
-   brightray::NotificationPresenter* presenter_;
- 
-changed in both
-  base   100644 a23d2817b87df8c7bfb63465afbb8b0852bd8b2f atom/browser/api/atom_api_web_contents.cc
-  our    100644 20a1ac2e672f08ffea528b6e094ba530ff8083d1 atom/browser/api/atom_api_web_contents.cc
-  their  100644 95fb99a2351be4df43415302bca700042a4c9f16 atom/browser/api/atom_api_web_contents.cc
-@@ -397,8 +397,8 @@
-     options.Get("transparent", &transparent);
- 
-     content::WebContents::CreateParams params(session->browser_context());
--    auto* view = new OffScreenWebContentsView(
--        transparent, base::Bind(&WebContents::OnPaint, base::Unretained(this)));
-+    auto* view = new OffScreenWebContentsView(transparent,
-+        base::Bind(&WebContents::OnPaint, base::Unretained(this)));
-     params.view = view;
-     params.delegate_view = view;
- 
-@@ -1742,7 +1742,12 @@
-     return;
- 
- #if defined(ENABLE_OSR)
-+<<<<<<< .our
-   auto* osr_wcv = GetOffScreenWebContentsView();
-+=======
-+  const auto* wc_impl = static_cast<content::WebContentsImpl*>(web_contents());
-+  auto* osr_wcv = static_cast<OffScreenWebContentsView*>(wc_impl->GetView());
-+>>>>>>> .their
-   if (osr_wcv)
-     osr_wcv->SetPainting(true);
- #endif
-@@ -1753,7 +1758,12 @@
-     return;
- 
- #if defined(ENABLE_OSR)
-+<<<<<<< .our
-   auto* osr_wcv = GetOffScreenWebContentsView();
-+=======
-+  const auto* wc_impl = static_cast<content::WebContentsImpl*>(web_contents());
-+  auto* osr_wcv = static_cast<OffScreenWebContentsView*>(wc_impl->GetView());
-+>>>>>>> .their
-   if (osr_wcv)
-     osr_wcv->SetPainting(false);
- #endif
-@@ -1764,7 +1774,13 @@
-     return false;
- 
- #if defined(ENABLE_OSR)
-+<<<<<<< .our
-   auto* osr_wcv = GetOffScreenWebContentsView();
-+=======
-+  const auto* wc_impl = static_cast<content::WebContentsImpl*>(web_contents());
-+  auto* osr_wcv = static_cast<OffScreenWebContentsView*>(wc_impl->GetView());
-+
-+>>>>>>> .their
-   return osr_wcv && osr_wcv->IsPainting();
- #else
-   return false;
-@@ -1776,7 +1792,13 @@
-     return;
- 
- #if defined(ENABLE_OSR)
-+<<<<<<< .our
-   auto* osr_wcv = GetOffScreenWebContentsView();
-+=======
-+  const auto* wc_impl = static_cast<content::WebContentsImpl*>(web_contents());
-+  auto* osr_wcv = static_cast<OffScreenWebContentsView*>(wc_impl->GetView());
-+
-+>>>>>>> .their
-   if (osr_wcv)
-     osr_wcv->SetFrameRate(frame_rate);
- #endif
-@@ -1787,7 +1809,13 @@
-     return 0;
- 
- #if defined(ENABLE_OSR)
-+<<<<<<< .our
-   auto* osr_wcv = GetOffScreenWebContentsView();
-+=======
-+  const auto* wc_impl = static_cast<content::WebContentsImpl*>(web_contents());
-+  auto* osr_wcv = static_cast<OffScreenWebContentsView*>(wc_impl->GetView());
-+
-+>>>>>>> .their
-   return osr_wcv ? osr_wcv->GetFrameRate() : 0;
- #else
-   return 0;
-@@ -1871,6 +1899,7 @@
-   return mate::ConvertToV8(isolate, *web_preferences->preference());
- }
- 
-+<<<<<<< .our
- v8::Local<v8::Value> WebContents::GetLastWebPreferences(
-     v8::Isolate* isolate) const {
-   auto* web_preferences = WebContentsPreferences::From(web_contents());
-@@ -1880,6 +1909,17 @@
- }
- 
- v8::Local<v8::Value> WebContents::GetOwnerBrowserWindow() const {
-+=======
-+v8::Local<v8::Value> WebContents::GetLastWebPreferences(v8::Isolate* isolate) {
-+  WebContentsPreferences* web_preferences =
-+      WebContentsPreferences::FromWebContents(web_contents());
-+  if (!web_preferences)
-+    return v8::Null(isolate);
-+  return mate::ConvertToV8(isolate, *web_preferences->last_web_preferences());
-+}
-+
-+v8::Local<v8::Value> WebContents::GetOwnerBrowserWindow() {
-+>>>>>>> .their
-   if (owner_window())
-     return BrowserWindow::From(isolate(), owner_window());
-   else
-changed in both
-  base   100644 1270a0ce2c79edab0c1be08450f06eef7b8cdd49 atom/browser/api/atom_api_web_contents.h
-  our    100644 7939f8268aa8c3371623e0c15f3b6001d7f1efa4 atom/browser/api/atom_api_web_contents.h
-  their  100644 99e64f8ff8d9dc41eadc8d022d149e68679382f7 atom/browser/api/atom_api_web_contents.h
-@@ -234,8 +234,13 @@
-   v8::Local<v8::Value> GetPreloadPath(v8::Isolate* isolate) const;
- 
-   // Returns the web preferences of current WebContents.
-+<<<<<<< .our
-   v8::Local<v8::Value> GetWebPreferences(v8::Isolate* isolate) const;
-   v8::Local<v8::Value> GetLastWebPreferences(v8::Isolate* isolate) const;
-+=======
-+  v8::Local<v8::Value> GetWebPreferences(v8::Isolate* isolate);
-+  v8::Local<v8::Value> GetLastWebPreferences(v8::Isolate* isolate);
-+>>>>>>> .their
- 
-   // Returns the owner window.
-   v8::Local<v8::Value> GetOwnerBrowserWindow() const;
-changed in both
-  base   100644 61c97f2c35ce3c9e76cee59f9e4becd9649c993b atom/browser/atom_browser_client.cc
-  our    100644 57c4ee582405e6d501ec23940ccb10689ecd64a1 atom/browser/atom_browser_client.cc
-  their  100644 713b1bc6ec037aaa9f845b98d26a959d7d7688bc atom/browser/atom_browser_client.cc
-@@ -27,6 +27,7 @@
- #include "base/command_line.h"
- #include "base/environment.h"
- #include "base/files/file_util.h"
-+#include "base/path_service.h"
- #include "base/stl_util.h"
- #include "base/strings/string_number_conversions.h"
- #include "base/strings/string_util.h"
-@@ -296,6 +297,7 @@
-     base::CommandLine* command_line,
-     int process_id) {
-   // Make sure we're about to launch a known executable
-+<<<<<<< .our
-   {
-     base::FilePath child_path;
-     PathService::Get(content::CHILD_PROCESS_EXE, &child_path);
-@@ -303,6 +305,11 @@
-     base::ThreadRestrictions::ScopedAllowIO allow_io;
-     CHECK(base::MakeAbsoluteFilePath(command_line->GetProgram()) == child_path);
-   }
-+=======
-+  base::FilePath child_path;
-+  PathService::Get(content::CHILD_PROCESS_EXE, &child_path);
-+  CHECK(base::MakeAbsoluteFilePath(command_line->GetProgram()) == child_path);
-+>>>>>>> .their
- 
-   std::string process_type =
-       command_line->GetSwitchValueASCII(::switches::kProcessType);
-changed in both
-  base   100644 190898fdef9afb08c5110185136d3016bfd7edc2 atom/browser/atom_browser_main_parts.cc
-  our    100644 5229b19ca9af7845a3f2f13b7e0913f633b68b1d atom/browser/atom_browser_main_parts.cc
-  their  100644 89ab75c33cbe8bac8b50be241ae0ac82ea000ac6 atom/browser/atom_browser_main_parts.cc
-@@ -223,7 +223,10 @@
-   Browser::Get()->DidFinishLaunching(base::DictionaryValue());
- #endif
- 
-+<<<<<<< .our
-   // Notify observers that main thread message loop was initialized.
-+=======
-+>>>>>>> .their
-   Browser::Get()->PreMainMessageLoopRun();
- }
- 
-changed in both
-  base   100644 c714dc1f46ab633127a65a997e1adca4b240d2e8 atom/browser/browser.cc
-  our    100644 ce35de64d60c6767ac52596c1b32e7bde5ceefa0 atom/browser/browser.cc
-  their  100644 1e4bc5e8e72c21735530960fe617e07c3afeaa0c atom/browser/browser.cc
-changed in both
-  base   100644 2204eafdd5503ab90c67659c2d3c377dd745cc68 atom/browser/browser.h
-  our    100644 aed7d25c37da59c0dd5e09940a064c329353a0b2 atom/browser/browser.h
-  their  100644 d0f929caf1792c3e62bc7e6f52ad9cf0b9655a91 atom/browser/browser.h
-@@ -238,7 +238,13 @@
- 
-   void PreMainMessageLoopRun();
- 
-+<<<<<<< .our
-   void AddObserver(BrowserObserver* obs) { observers_.AddObserver(obs); }
-+=======
-+  void AddObserver(BrowserObserver* obs) {
-+    observers_.AddObserver(obs);
-+  }
-+>>>>>>> .their
- 
-   void RemoveObserver(BrowserObserver* obs) { observers_.RemoveObserver(obs); }
- 
-changed in both
-  base   100644 3e50fc228b9ad5699dba2e2ecb70ee6212d6e5c1 atom/browser/browser_observer.h
-  our    100644 d518e8d6a7c6e8e30c09498883719a58c8a9f5e8 atom/browser/browser_observer.h
-  their  100644 fce24d8ac792e2262b1c5097d3b82bccfb0c2ca7 atom/browser/browser_observer.h
-changed in both
-  base   100644 1ad07a90869708c653e38f0ee7924bcff761419d atom/browser/mac/atom_application_delegate.mm
-  our    100644 683f7a84bcaa2c47bb78cf299314a5afeb15639b atom/browser/mac/atom_application_delegate.mm
-  their  100644 ccf51133ce2594f2095455e2f30172ffcf7f2f72 atom/browser/mac/atom_application_delegate.mm
-@@ -8,13 +8,21 @@
- #import "atom/browser/mac/atom_application.h"
- #include "atom/browser/mac/dict_util.h"
- #include "base/allocator/allocator_shim.h"
-+<<<<<<< .our
- #include "base/allocator/buildflags.h"
-+=======
-+#include "base/allocator/features.h"
-+>>>>>>> .their
- #include "base/mac/mac_util.h"
- #include "base/mac/scoped_objc_class_swizzler.h"
- #include "base/strings/sys_string_conversions.h"
- #include "base/values.h"
- 
-+<<<<<<< .our
- #if BUILDFLAG(USE_ALLOCATOR_SHIM)
-+=======
-+#if BUILDFLAG(USE_EXPERIMENTAL_ALLOCATOR_SHIM)
-+>>>>>>> .their
- // On macOS 10.12, the IME system attempts to allocate a 2^64 size buffer,
- // which would typically cause an OOM crash. To avoid this, the problematic
- // method is swizzled out and the make-OOM-fatal bit is disabled for the
-@@ -35,7 +43,11 @@
-   base::allocator::SetCallNewHandlerOnMallocFailure(true);
- }
- @end
-+<<<<<<< .our
- #endif  // BUILDFLAG(USE_ALLOCATOR_SHIM)
-+=======
-+#endif  // BUILDFLAG(USE_EXPERIMENTAL_ALLOCATOR_SHIM)
-+>>>>>>> .their
- 
- @implementation AtomApplicationDelegate
- 
-@@ -65,7 +77,11 @@
-     atom::Browser::Get()->DidFinishLaunching(base::DictionaryValue());
-   }
- 
-+<<<<<<< .our
- #if BUILDFLAG(USE_ALLOCATOR_SHIM)
-+=======
-+#if BUILDFLAG(USE_EXPERIMENTAL_ALLOCATOR_SHIM)
-+>>>>>>> .their
-   // Disable fatal OOM to hack around an OS bug https://crbug.com/654695.
-   if (base::mac::IsOS10_12()) {
-     g_swizzle_imk_input_session = new base::mac::ScopedObjCClassSwizzler(
-changed in both
-  base   100644 949e5e9ec96d42d75e975e6e4facc249079bce9e atom/browser/native_browser_view.cc
-  our    100644 6460f2bfbd22f7809ce92325ffb36ddbe3512a9f atom/browser/native_browser_view.cc
-  their  100644 c97fe683e6c56b17a32eede8d397d2c2d47efa2b atom/browser/native_browser_view.cc
-changed in both
-  base   100644 236f615c2b0664ee0c2f2c80182a1a6070956170 atom/browser/native_browser_view.h
-  our    100644 56937e4c8c69e3605d2b6cc71a0877b74ff4e83d atom/browser/native_browser_view.h
-  their  100644 7c154b60b00e25c42847ceefb98723b50ea03dd0 atom/browser/native_browser_view.h
-@@ -48,7 +48,11 @@
- 
-   // Called when the window needs to update its draggable region.
-   virtual void UpdateDraggableRegions(
-+<<<<<<< .our
-       const std::vector<gfx::Rect>& system_drag_exclude_areas) {}
-+=======
-+    const std::vector<gfx::Rect>& system_drag_exclude_areas) {}
-+>>>>>>> .their
- 
-  protected:
-   explicit NativeBrowserView(
-changed in both
-  base   100644 4e7aa429ce27ae12e495ab579247d2d244fdd18f atom/browser/native_browser_view_mac.h
-  our    100644 726ca75433e8091a344ef8d731e51c27f8a23450 atom/browser/native_browser_view_mac.h
-  their  100644 0b04edad729faa8e2f79b4653426db1d941dafe3 atom/browser/native_browser_view_mac.h
-@@ -23,6 +23,8 @@
-   void SetAutoResizeFlags(uint8_t flags) override;
-   void SetBounds(const gfx::Rect& bounds) override;
-   void SetBackgroundColor(SkColor color) override;
-+  void UpdateDraggableRegions(
-+      const std::vector<gfx::Rect>& system_drag_exclude_areas) override;
- 
-   void UpdateDraggableRegions(
-       const std::vector<gfx::Rect>& system_drag_exclude_areas) override;
-changed in both
-  base   100644 2ce2adc1f4fe02a600c18c2c7b0852e1fcf27710 atom/browser/native_browser_view_mac.mm
-  our    100644 0416e26e89f1e0f37366ef1798b4359da0729225 atom/browser/native_browser_view_mac.mm
-  their  100644 3d77b2a84891a724336e83af2284543470a57cf1 atom/browser/native_browser_view_mac.mm
-@@ -15,16 +15,25 @@
- 
- @interface DragRegionView : NSView
- 
-+<<<<<<< .our
- @property(assign) NSPoint initialLocation;
-+=======
-+@property (assign) NSPoint initialLocation;
-+>>>>>>> .their
- 
- @end
- 
- @interface NSWindow ()
-+<<<<<<< .our
- - (void)performWindowDragWithEvent:(NSEvent*)event;
-+=======
-+- (void)performWindowDragWithEvent:(NSEvent *)event;
-+>>>>>>> .their
- @end
- 
- @implementation DragRegionView
- 
-+<<<<<<< .our
- @synthesize initialLocation;
- 
- - (BOOL)mouseDownCanMoveWindow {
-@@ -56,32 +65,67 @@
-   }
- 
-   if (self.window.styleMask & NSFullScreenWindowMask) {
-+=======
-+- (BOOL)mouseDownCanMoveWindow
-+{
-+  return NO;
-+}
-+
-+- (NSView *)hitTest:(NSPoint)aPoint
-+{
-+    // Pass-through events that don't hit one of the exclusion zones
-+    for (NSView *exlusion_zones in [self subviews]) {
-+      if ([exlusion_zones hitTest:aPoint])
-+        return nil;
-+    }
-+
-+    return self;
-+}
-+
-+- (void)mouseDown:(NSEvent *)event
-+{
-+  if ([self.window respondsToSelector:@selector(performWindowDragWithEvent)]) {
-+    [self.window performWindowDragWithEvent:event];
-+>>>>>>> .their
-     return;
-   }
- 
-   self.initialLocation = [event locationInWindow];
- }
- 
-+<<<<<<< .our
- - (void)mouseDragged:(NSEvent*)theEvent {
-+=======
-+- (void)mouseDragged:(NSEvent *)theEvent
-+{
-+>>>>>>> .their
-   if ([self.window respondsToSelector:@selector(performWindowDragWithEvent)]) {
-     return;
-   }
- 
-+<<<<<<< .our
-   if (self.window.styleMask & NSFullScreenWindowMask) {
-     return;
-   }
- 
-+=======
-+>>>>>>> .their
-   NSPoint currentLocation = [NSEvent mouseLocation];
-   NSPoint newOrigin;
- 
-   NSRect screenFrame = [[NSScreen mainScreen] frame];
-+<<<<<<< .our
-   NSSize screenSize = screenFrame.size;
-   NSRect windowFrame = [self.window frame];
-   NSSize windowSize = windowFrame.size;
-+=======
-+  NSRect windowFrame = [self.window frame];
-+>>>>>>> .their
- 
-   newOrigin.x = currentLocation.x - self.initialLocation.x;
-   newOrigin.y = currentLocation.y - self.initialLocation.y;
- 
-+<<<<<<< .our
-   BOOL inMenuBar = (newOrigin.y + windowSize.height) >
-                    (screenFrame.origin.y + screenSize.height);
-   BOOL screenAboveMainScreen = false;
-@@ -116,6 +160,11 @@
-   if (inMenuBar && !screenAboveMainScreen) {
-     newOrigin.y = screenFrame.origin.y +
-                   (screenFrame.size.height - windowFrame.size.height);
-+=======
-+  // Don't let window get dragged up under the menu bar
-+  if ((newOrigin.y + windowFrame.size.height) > (screenFrame.origin.y + screenFrame.size.height)) {
-+    newOrigin.y = screenFrame.origin.y + (screenFrame.size.height - windowFrame.size.height);
-+>>>>>>> .their
-   }
- 
-   // Move the window to the new location
-@@ -195,6 +244,7 @@
- }
- 
- void NativeBrowserViewMac::UpdateDraggableRegions(
-+<<<<<<< .our
-     const std::vector<gfx::Rect>& drag_exclude_rects) {
-   NSView* web_view = GetWebContents()->GetNativeView();
-   NSView* inspectable_view = GetInspectableWebContentsView()->GetNativeView();
-@@ -229,6 +279,58 @@
-             initWithFrame:drag_region_view_exclude_rect]);
-     [drag_region_view addSubview:exclude_drag_region_view];
-   }
-+=======
-+    const std::vector<gfx::Rect>& system_drag_exclude_areas) {
-+  NSView* webView = GetInspectableWebContentsView()->GetNativeView();
-+
-+  NSInteger superViewHeight = NSHeight([webView.superview bounds]);
-+  NSInteger webViewHeight = NSHeight([webView bounds]);
-+  NSInteger webViewWidth = NSWidth([webView bounds]);
-+  NSInteger webViewX = NSMinX([webView frame]);
-+  NSInteger webViewY = 0;
-+
-+  // Apple's NSViews have their coordinate system originate at the bottom left,
-+  // meaning that we need to be a bit smarter when it comes to calculating our
-+  // current top offset
-+  if (webViewHeight > superViewHeight) {
-+    webViewY = std::abs(webViewHeight - superViewHeight - (std::abs(NSMinY([webView frame]))));
-+  } else {
-+    webViewY = superViewHeight - NSMaxY([webView frame]);
-+  }
-+
-+  // Remove all DraggableRegionViews that are added last time.
-+  // Note that [webView subviews] returns the view's mutable internal array and
-+  // it should be copied to avoid mutating the original array while enumerating
-+  // it.
-+  base::scoped_nsobject<NSArray> subviews([[webView subviews] copy]);
-+  for (NSView* subview in subviews.get())
-+    if ([subview isKindOfClass:[DragRegionView class]])
-+      [subview removeFromSuperview];
-+
-+  // Create one giant NSView that is draggable.
-+  base::scoped_nsobject<NSView> dragRegion(
-+        [[DragRegionView alloc] initWithFrame:NSZeroRect]);
-+    [dragRegion setFrame:NSMakeRect(0,
-+                                    0,
-+                                    webViewWidth,
-+                                    webViewHeight)];
-+
-+  // Then, on top of that, add "exclusion zones"
-+  for (auto iter = system_drag_exclude_areas.begin();
-+       iter != system_drag_exclude_areas.end();
-+       ++iter) {
-+    base::scoped_nsobject<NSView> controlRegion(
-+        [[ExcludeDragRegionView alloc] initWithFrame:NSZeroRect]);
-+    [controlRegion setFrame:NSMakeRect(iter->x() - webViewX,
-+                                       webViewHeight - iter->bottom() + webViewY,
-+                                       iter->width(),
-+                                       iter->height())];
-+    [dragRegion addSubview:controlRegion];
-+  }
-+
-+  // Add the DragRegion to the WebView
-+  [webView addSubview:dragRegion];
-+>>>>>>> .their
- }
- 
- // static
-changed in both
-  base   100644 3dfb88d5398fc9c6c2985cd3df58c5a10ea56462 atom/browser/native_window_mac.h
-  our    100644 44a78198f44cdba9875e3fb27c8e2c87eaa6f33b atom/browser/native_window_mac.h
-  their  100644 45636eb7025e1c7250db17496e3553ce9422b2e4 atom/browser/native_window_mac.h
-@@ -163,7 +163,16 @@
-   void InternalSetParentWindow(NativeWindow* parent, bool attach);
-   void ShowWindowButton(NSWindowButton button);
- 
-+<<<<<<< .our
-   void SetForwardMouseMessages(bool forward);
-+=======
-+  void InstallView();
-+  void UninstallView();
-+
-+  // Install the drag view, which will cover the whole window and decides
-+  // whether we can drag.
-+  void UpdateDraggableRegionViews(const std::vector<DraggableRegion>& regions);
-+>>>>>>> .their
- 
-   AtomNSWindow* window_;  // Weak ref, managed by widget_.
- 
-changed in both
-  base   100644 2719c672954ab0eb2b8090fb25c9c9965c99e410 atom/browser/native_window_mac.mm
-  our    100644 004263ec127709067e903ffbf31003b8844226b4 atom/browser/native_window_mac.mm
-  their  100644 a0af83de3574e3a86f1e0064c8212dd6c526d40d atom/browser/native_window_mac.mm
-@@ -1387,10 +1387,45 @@
-     [parent->GetNativeWindow() addChildWindow:window_ ordered:NSWindowAbove];
- }
- 
-+<<<<<<< .our
- void NativeWindowMac::ShowWindowButton(NSWindowButton button) {
-   auto view = [window_ standardWindowButton:button];
-   [view.superview addSubview:view positioned:NSWindowAbove relativeTo:nil];
- }
-+=======
-+  // Remove all ControlRegionViews that are added last time.
-+  // Note that [webView subviews] returns the view's mutable internal array and
-+  // it should be copied to avoid mutating the original array while enumerating
-+  // it.
-+  base::scoped_nsobject<NSArray> subviews([[webView subviews] copy]);
-+  for (NSView* subview in subviews.get())
-+    if ([subview isKindOfClass:[ControlRegionView class]])
-+      [subview removeFromSuperview];
-+
-+  // Draggable regions is implemented by having the whole web view draggable
-+  // (mouseDownCanMoveWindow) and overlaying regions that are not draggable.
-+  std::vector<gfx::Rect> system_drag_exclude_areas =
-+      CalculateNonDraggableRegions(regions, webViewWidth, webViewHeight);
-+
-+  if (browser_view_) {
-+    browser_view_->UpdateDraggableRegions(system_drag_exclude_areas);
-+  }
-+
-+  // Create and add a ControlRegionView for each region that needs to be
-+  // excluded from the dragging.
-+  for (std::vector<gfx::Rect>::const_iterator iter =
-+           system_drag_exclude_areas.begin();
-+       iter != system_drag_exclude_areas.end();
-+       ++iter) {
-+    base::scoped_nsobject<NSView> controlRegion(
-+        [[ControlRegionView alloc] initWithFrame:NSZeroRect]);
-+    [controlRegion setFrame:NSMakeRect(iter->x(),
-+                                       webViewHeight - iter->bottom(),
-+                                       iter->width(),
-+                                       iter->height())];
-+    [webView addSubview:controlRegion];
-+  }
-+>>>>>>> .their
- 
- void NativeWindowMac::SetForwardMouseMessages(bool forward) {
-   [window_ setAcceptsMouseMovedEvents:forward];
-changed in both
-  base   100644 ad02ed620d6d94ba15e7f8d154063a0968178110 atom/browser/net/asar/url_request_asar_job.cc
-  our    100644 85eb2e1dd142b6d64aafb5350ae47603db989e8f atom/browser/net/asar/url_request_asar_job.cc
-  their  100644 5c4472a315911a6c2da533b35d489f8f9da5cd53 atom/browser/net/asar/url_request_asar_job.cc
-@@ -243,6 +243,24 @@
-     meta_info->mime_type_result = net::GetWellKnownMimeTypeFromExtension(
-         file_extension.substr(1), &meta_info->mime_type);
-   }
-+<<<<<<< .our
-+=======
-+
-+  // We use GetWellKnownMimeTypeFromExtension() to ensure that configurations
-+  // that may have been set by other programs on a user's machine don't affect
-+  // the mime type returned (in particular, JS should always be
-+  // (application/javascript). See https://crbug.com/797712. Using an accurate
-+  // mime type is necessary at least for modules and sw, which enforce strict
-+  // mime type requirements.
-+  // TODO(deepak1556): Revert this when sw support is removed for file scheme.
-+  base::FilePath::StringType file_extension = file_path.Extension();
-+  if (file_extension.empty()) {
-+    meta_info->mime_type_result = false;
-+  } else {
-+    meta_info->mime_type_result = net::GetWellKnownMimeTypeFromExtension(
-+        file_extension.substr(1), &meta_info->mime_type);
-+  }
-+>>>>>>> .their
- }
- 
- void URLRequestAsarJob::DidFetchMetaInfo(const FileMetaInfo* meta_info) {
-changed in both
-  base   100644 ff426dd08c8e39bcb23aeff2cdf03f2db414529e atom/browser/net/url_request_fetch_job.cc
-  our    100644 68539433f4de80a96bc672de3a2834b299d6c04b atom/browser/net/url_request_fetch_job.cc
-  their  100644 04d0ddd1e6af761c8e36d6cb93b99866a886457a atom/browser/net/url_request_fetch_job.cc
-changed in both
-  base   100644 c35e364236f68545a869ecfb34a6b9f496c0511f atom/browser/osr/osr_output_device.cc
-  our    100644 e5c1e7fd95fc6443e77f86c86645c51ca36d0d9b atom/browser/osr/osr_output_device.cc
-  their  100644 1234a17b842074ca4236066f09994cccf1a6a83b atom/browser/osr/osr_output_device.cc
-@@ -80,7 +80,11 @@
-     return;
-   active_ = active;
- 
-+<<<<<<< .our
-   if (!active_ && !pending_damage_rect_.IsEmpty() && paint)
-+=======
-+  if (active_ && paint)
-+>>>>>>> .their
-     OnPaint(gfx::Rect(viewport_pixel_size_));
- }
- 
-changed in both
-  base   100644 5710bc41b8319597ae37c0cb995e42b24562de17 atom/browser/osr/osr_output_device.h
-  our    100644 4c62414fd0c57ba650c04e23a75fe9be82999b2e atom/browser/osr/osr_output_device.h
-  their  100644 a65865316fa4398d8aa161264a30dd19762eae27 atom/browser/osr/osr_output_device.h
-changed in both
-  base   100644 11523a660b8f1d6972254117e84fd69588b1421a atom/browser/osr/osr_render_widget_host_view.cc
-  our    100644 4a2a0747fe2e6bf38c8999b80dbfea31e52a17fd atom/browser/osr/osr_render_widget_host_view.cc
-  their  100644 e2e521dbadd20313ebb92af117a21c407ffe05b5 atom/browser/osr/osr_render_widget_host_view.cc
-@@ -259,12 +259,27 @@
-       native_window_(native_window),
-       transparent_(transparent),
-       callback_(callback),
-+<<<<<<< .our
-       frame_rate_(frame_rate),
-+=======
-+      parent_callback_(nullptr),
-+      frame_rate_(frame_rate),
-+      frame_rate_threshold_us_(0),
-+      last_time_(base::Time::Now()),
-+>>>>>>> .their
-       scale_factor_(kDefaultScaleFactor),
-       size_(native_window->GetSize()),
-       painting_(painting),
-       is_showing_(!render_widget_host_->is_hidden()),
-+<<<<<<< .our
-       mouse_wheel_phase_handler_(render_widget_host_, this),
-+=======
-+      is_destroyed_(false),
-+      popup_position_(gfx::Rect()),
-+      hold_resize_(false),
-+      pending_resize_(false),
-+      paint_callback_running_(false),
-+>>>>>>> .their
-       weak_ptr_factory_(this) {
-   DCHECK(render_widget_host_);
-   bool is_guest_view_hack = parent_host_view_ != nullptr;
-@@ -292,9 +307,13 @@
-   compositor_.reset(
-       new ui::Compositor(context_factory_private->AllocateFrameSinkId(),
-                          content::GetContextFactory(), context_factory_private,
-+<<<<<<< .our
-                          base::ThreadTaskRunnerHandle::Get(),
-                          features::IsSurfaceSynchronizationEnabled(),
-                          false /* enable_pixel_canvas */));
-+=======
-+                         base::ThreadTaskRunnerHandle::Get()));
-+>>>>>>> .their
-   compositor_->SetAcceleratedWidget(gfx::kNullAcceleratedWidget);
-   compositor_->SetRootLayer(root_layer_.get());
- #endif
-@@ -713,8 +732,18 @@
-   }
- 
-   return new OffScreenRenderWidgetHostView(
-+<<<<<<< .our
-       transparent_, true, embedder_host_view->GetFrameRate(), callback_,
-       render_widget_host, embedder_host_view, native_window_);
-+=======
-+      transparent_,
-+      true,
-+      embedder_host_view->GetFrameRate(),
-+      callback_,
-+      render_widget_host,
-+      embedder_host_view,
-+      native_window_);
-+>>>>>>> .their
- }
- 
- #if !defined(OS_MACOSX)
-@@ -1204,7 +1233,11 @@
- 
-   SetupFrameRate(true);
- 
-+<<<<<<< .our
-   for (auto* guest_host_view : guest_host_views_)
-+=======
-+  for (auto guest_host_view : guest_host_views_)
-+>>>>>>> .their
-     guest_host_view->SetFrameRate(frame_rate);
- }
- 
-@@ -1233,10 +1266,15 @@
- 
-   frame_rate_threshold_us_ = 1000000 / frame_rate_;
- 
-+<<<<<<< .our
-   if (GetCompositor()) {
-     GetCompositor()->SetAuthoritativeVSyncInterval(
-         base::TimeDelta::FromMicroseconds(frame_rate_threshold_us_));
-   }
-+=======
-+  GetCompositor()->SetAuthoritativeVSyncInterval(
-+      base::TimeDelta::FromMicroseconds(frame_rate_threshold_us_));
-+>>>>>>> .their
- 
-   if (copy_frame_generator_.get()) {
-     copy_frame_generator_->set_frame_rate_threshold_us(
-changed in both
-  base   100644 dc204a311ff557a1f2b38c2933fbcec47c8751a7 atom/browser/osr/osr_render_widget_host_view.h
-  our    100644 b81f6310f864c00fea50b1aac49dc89173eaa302 atom/browser/osr/osr_render_widget_host_view.h
-  their  100644 a4b5593cf28a2b09c28c4285efa7a0cdae2b76da atom/browser/osr/osr_render_widget_host_view.h
-@@ -317,6 +317,8 @@
-   viz::LocalSurfaceId local_surface_id_;
-   viz::ParentLocalSurfaceIdAllocator local_surface_id_allocator_;
- 
-+  bool paint_callback_running_;
-+
-   std::unique_ptr<ui::Layer> root_layer_;
-   std::unique_ptr<ui::Compositor> compositor_;
-   std::unique_ptr<content::DelegatedFrameHost> delegated_frame_host_;
-changed in both
-  base   100644 0e10abf6a034ab604f51553eb905b18e18f45552 atom/browser/osr/osr_web_contents_view.cc
-  our    100644 c8223df0d8c6f3436d323059686e42684ff98462 atom/browser/osr/osr_web_contents_view.cc
-  their  100644 4cbc6a5c42f9762b81fc4d601ebb534dedcd4914 atom/browser/osr/osr_web_contents_view.cc
-@@ -13,9 +13,18 @@
- namespace atom {
- 
- OffScreenWebContentsView::OffScreenWebContentsView(
-+<<<<<<< .our
-     bool transparent,
-     const OnPaintCallback& callback)
-     : transparent_(transparent), callback_(callback) {
-+=======
-+    bool transparent, const OnPaintCallback& callback)
-+    : transparent_(transparent),
-+      painting_(true),
-+      frame_rate_(60),
-+      callback_(callback),
-+      web_contents_(nullptr) {
-+>>>>>>> .their
- #if defined(OS_MACOSX)
-   PlatformCreate();
- #endif
-@@ -104,8 +113,18 @@
- 
-   auto* relay = NativeWindowRelay::FromWebContents(web_contents_);
-   return new OffScreenRenderWidgetHostView(
-+<<<<<<< .our
-       transparent_, painting_, GetFrameRate(), callback_, render_widget_host,
-       nullptr, relay->window.get());
-+=======
-+      transparent_,
-+      painting_,
-+      GetFrameRate(),
-+      callback_,
-+      render_widget_host,
-+      nullptr,
-+      relay->window.get());
-+>>>>>>> .their
- }
- 
- content::RenderWidgetHostViewBase*
-@@ -124,8 +143,18 @@
-               : web_contents_impl->GetRenderWidgetHostView());
- 
-   return new OffScreenRenderWidgetHostView(
-+<<<<<<< .our
-       transparent_, true, view->GetFrameRate(), callback_, render_widget_host,
-       view, relay->window.get());
-+=======
-+      transparent_,
-+      true,
-+      view->GetFrameRate(),
-+      callback_,
-+      render_widget_host,
-+      view,
-+      relay->window.get());
-+>>>>>>> .their
- }
- 
- void OffScreenWebContentsView::SetPageTitle(const base::string16& title) {}
-@@ -209,6 +238,42 @@
-   }
- }
- 
-+void OffScreenWebContentsView::SetPainting(bool painting) {
-+  auto* view = GetView();
-+  if (view != nullptr) {
-+    view->SetPainting(painting);
-+  } else {
-+    painting_ = painting;
-+  }
-+}
-+
-+bool OffScreenWebContentsView::IsPainting() const {
-+  auto* view = GetView();
-+  if (view != nullptr) {
-+    return view->IsPainting();
-+  } else {
-+    return painting_;
-+  }
-+}
-+
-+void OffScreenWebContentsView::SetFrameRate(int frame_rate) {
-+  auto* view = GetView();
-+  if (view != nullptr) {
-+    view->SetFrameRate(frame_rate);
-+  } else {
-+    frame_rate_ = frame_rate;
-+  }
-+}
-+
-+int OffScreenWebContentsView::GetFrameRate() const {
-+  auto* view = GetView();
-+  if (view != nullptr) {
-+    return view->GetFrameRate();
-+  } else {
-+    return frame_rate_;
-+  }
-+}
-+
- OffScreenRenderWidgetHostView* OffScreenWebContentsView::GetView() const {
-   if (web_contents_) {
-     return static_cast<OffScreenRenderWidgetHostView*>(
-changed in both
-  base   100644 ffb3b38619c4521f9947fe29e3871ed06d97978e atom/browser/osr/osr_web_contents_view.h
-  our    100644 206ab9dd3421af522a12aba615c6f040ba176ba4 atom/browser/osr/osr_web_contents_view.h
-  their  100644 788e55bf316d8069811fc026bf610ad231371fce atom/browser/osr/osr_web_contents_view.h
-@@ -83,8 +83,13 @@
-   OffScreenRenderWidgetHostView* GetView() const;
- 
-   const bool transparent_;
-+<<<<<<< .our
-   bool painting_ = true;
-   int frame_rate_ = 60;
-+=======
-+  bool painting_;
-+  int frame_rate_;
-+>>>>>>> .their
-   OnPaintCallback callback_;
- 
-   // Weak refs.
-changed in both
-  base   100644 9610d80693b1670f696f82812442419504d61454 atom/browser/relauncher.cc
-  our    100644 35c6785e3d87d21eaea27ad5818434d870326047 atom/browser/relauncher.cc
-  their  100644 9dfb6edd06661f302ca7498a2ba34f0ce70c938b atom/browser/relauncher.cc
-changed in both
-  base   100644 e4207b2f46835a44089d4e23a5e973e5ff401f4d atom/browser/resources/mac/Info.plist
-  our    100644 9094f0f7335edf833d51f688851e6a105de60433 atom/browser/resources/mac/Info.plist
-  their  100644 9c73b60bb029729505847b2ea45f4b99a9906423 atom/browser/resources/mac/Info.plist
-@@ -17,9 +17,15 @@
-   <key>CFBundleIconFile</key>
-   <string>electron.icns</string>
-   <key>CFBundleVersion</key>
-+<<<<<<< .our
-   <string>4.0.0</string>
-   <key>CFBundleShortVersionString</key>
-   <string>4.0.0</string>
-+=======
-+  <string>1.7.14</string>
-+  <key>CFBundleShortVersionString</key>
-+  <string>1.7.14</string>
-+>>>>>>> .their
-   <key>LSApplicationCategoryType</key>
-   <string>public.app-category.developer-tools</string>
-   <key>LSMinimumSystemVersion</key>
-changed in both
-  base   100644 9035ccc9e4608312b0fef482afaafbc0f2fb8486 atom/browser/resources/win/atom.rc
-  our    100644 c0bd831e8bddf10180f75cd40694831e2e98622d atom/browser/resources/win/atom.rc
-  their  100644 716b9876fbed86e5ba7e7e3204030d377d9b6bfc atom/browser/resources/win/atom.rc
-@@ -56,8 +56,13 @@
- //
- 
- VS_VERSION_INFO VERSIONINFO
-+<<<<<<< .our
-  FILEVERSION 4,0,0,20180821
-  PRODUCTVERSION 4,0,0,20180821
-+=======
-+ FILEVERSION 1,7,14,0
-+ PRODUCTVERSION 1,7,14,0
-+>>>>>>> .their
-  FILEFLAGSMASK 0x3fL
- #ifdef _DEBUG
-  FILEFLAGS 0x1L
-@@ -74,12 +79,20 @@
-         BEGIN
-             VALUE "CompanyName", "GitHub, Inc."
-             VALUE "FileDescription", "Electron"
-+<<<<<<< .our
-             VALUE "FileVersion", "4.0.0"
-+=======
-+            VALUE "FileVersion", "1.7.14"
-+>>>>>>> .their
-             VALUE "InternalName", "electron.exe"
-             VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
-             VALUE "OriginalFilename", "electron.exe"
-             VALUE "ProductName", "Electron"
-+<<<<<<< .our
-             VALUE "ProductVersion", "4.0.0"
-+=======
-+            VALUE "ProductVersion", "1.7.14"
-+>>>>>>> .their
-             VALUE "SquirrelAwareVersion", "1"
-         END
-     END
-changed in both
-  base   100644 26662cf48502d880f6c18d9cb3236a42e2a813e4 atom/browser/ui/cocoa/atom_touch_bar.h
-  our    100644 fd6bb0cdc449d6d8f48a208f3300e857045d4686 atom/browser/ui/cocoa/atom_touch_bar.h
-  their  100644 d36e45898ea54f9e4205786f6b1fe9592c5acd67 atom/browser/ui/cocoa/atom_touch_bar.h
-@@ -17,9 +17,13 @@
- #include "native_mate/constructor.h"
- #include "native_mate/persistent_dictionary.h"
- 
-+<<<<<<< .our
- @interface AtomTouchBar : NSObject <NSScrubberDelegate,
-                                     NSScrubberDataSource,
-                                     NSScrubberFlowLayoutDelegate> {
-+=======
-+@interface AtomTouchBar : NSObject<NSScrubberDelegate, NSScrubberDataSource, NSScrubberFlowLayoutDelegate> {
-+>>>>>>> .their
-  @protected
-   std::vector<mate::PersistentDictionary> ordered_settings_;
-   std::map<std::string, mate::PersistentDictionary> settings_;
-changed in both
-  base   100644 30a3e6643fb89ca09e4310f789b20f1e22b1962c atom/browser/ui/cocoa/atom_touch_bar.mm
-  our    100644 72777c491f8a6024b61ed8cd3b849a5637f394a7 atom/browser/ui/cocoa/atom_touch_bar.mm
-  their  100644 366cb9e2d0c8adc3cee70a87d08f8ea9f2eca9d2 atom/browser/ui/cocoa/atom_touch_bar.mm
-@@ -765,15 +765,21 @@
-   return itemView;
- }
- 
-+<<<<<<< .our
- - (NSSize)scrubber:(NSScrubber*)scrubber
-                 layout:(NSScrubberFlowLayout*)layout
-     sizeForItemAtIndex:(NSInteger)itemIndex API_AVAILABLE(macosx(10.12.2)) {
-+=======
-+- (NSSize)scrubber:(NSScrubber *)scrubber layout:(NSScrubberFlowLayout *)layout sizeForItemAtIndex:(NSInteger)itemIndex
-+{
-+>>>>>>> .their
-   NSInteger width = 50;
-   NSInteger height = 30;
-   NSInteger margin = 15;
-   NSSize defaultSize = NSMakeSize(width, height);
- 
-   std::string s_id([[scrubber identifier] UTF8String]);
-+<<<<<<< .our
-   if (![self hasItemWithID:s_id])
-     return defaultSize;
- 
-@@ -784,12 +790,22 @@
- 
-   if (itemIndex >= static_cast<NSInteger>(items.size()))
-     return defaultSize;
-+=======
-+  if (![self hasItemWithID:s_id]) return defaultSize;
-+
-+  mate::PersistentDictionary settings = settings_[s_id];
-+  std::vector<mate::PersistentDictionary> items;
-+  if (!settings.Get("items", &items)) return defaultSize;
-+
-+  if (itemIndex >= static_cast<NSInteger>(items.size())) return defaultSize;
-+>>>>>>> .their
- 
-   mate::PersistentDictionary item = items[itemIndex];
-   std::string title;
- 
-   if (item.Get("label", &title)) {
-     NSSize size = NSMakeSize(CGFLOAT_MAX, CGFLOAT_MAX);
-+<<<<<<< .our
-     NSRect textRect = [base::SysUTF8ToNSString(title)
-         boundingRectWithSize:size
-                      options:NSStringDrawingUsesLineFragmentOrigin |
-@@ -797,6 +813,11 @@
-                   attributes:@{
-                     NSFontAttributeName : [NSFont systemFontOfSize:0]
-                   }];
-+=======
-+    NSRect textRect = [base::SysUTF8ToNSString(title) boundingRectWithSize:size
-+                                          options:NSStringDrawingUsesLineFragmentOrigin |   NSStringDrawingUsesFontLeading
-+                                          attributes:@{ NSFontAttributeName: [NSFont systemFontOfSize:0]}];
-+>>>>>>> .their
- 
-     width = textRect.size.width + margin;
-   } else {
-changed in both
-  base   100644 6fe7c820a1ccda7befcabbb6b9e740cab8d33afc atom/browser/ui/cocoa/touch_bar_forward_declarations.h
-  our    100644 281672c30420d3e1abb77cb96db69e375f4d5ea7 atom/browser/ui/cocoa/touch_bar_forward_declarations.h
-  their  100644 062723bca670a1bb5a5b4c34524d7eecfa52f50d atom/browser/ui/cocoa/touch_bar_forward_declarations.h
-@@ -14,11 +14,16 @@
- #pragma clang assume_nonnull begin
- 
- @class NSTouchBar, NSTouchBarItem;
-+<<<<<<< .our
- @class NSScrubber, NSScrubberItemView, NSScrubberArrangedView,
-     NSScrubberTextItemView, NSScrubberImageItemView, NSScrubberSelectionStyle;
- @protocol NSTouchBarDelegate
- , NSScrubberDelegate, NSScrubberDataSource, NSScrubberFlowLayoutDelegate,
-     NSScrubberFlowLayout;
-+=======
-+@class NSScrubber, NSScrubberItemView, NSScrubberArrangedView, NSScrubberTextItemView, NSScrubberImageItemView, NSScrubberSelectionStyle;
-+@protocol NSTouchBarDelegate, NSScrubberDelegate, NSScrubberDataSource, NSScrubberFlowLayoutDelegate, NSScrubberFlowLayout;
-+>>>>>>> .their
- 
- typedef float NSTouchBarItemPriority;
- static const NSTouchBarItemPriority NSTouchBarItemPriorityHigh = 1000;
-@@ -150,10 +155,17 @@
- 
- @end
- 
-+<<<<<<< .our
- @interface NSScrubberFlowLayout : NSObject
- @end
- 
- @interface NSScrubberSelectionStyle : NSObject <NSCoding>
-+=======
-+@interface NSScrubberFlowLayout: NSObject
-+@end
-+
-+@interface NSScrubberSelectionStyle : NSObject<NSCoding>
-+>>>>>>> .their
- 
- @property(class, strong, readonly)
-     NSScrubberSelectionStyle* outlineOverlayStyle;
-@@ -245,6 +257,12 @@
- 
- @end
- 
-+@protocol NSScrubberFlowLayoutDelegate<NSObject>
-+
-+- (NSSize)scrubber:(NSScrubber *)scrubber layout:(NSScrubberFlowLayout *)layout sizeForItemAtIndex:(NSInteger)itemIndex;
-+
-+@end
-+
- #pragma clang assume_nonnull end
- 
- #elif MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_12_1
-changed in both
-  base   100644 be9c15e7238987eeb533d6b981edea5b4125f8be atom/browser/ui/file_dialog_mac.mm
-  our    100644 18b18a8b240cda5512ae49e0afde5c749bdf75c0 atom/browser/ui/file_dialog_mac.mm
-  their  100644 cdc10d6cb430b6521e262ba5d19acaeb23859f42 atom/browser/ui/file_dialog_mac.mm
-@@ -94,6 +94,7 @@
- 
-   // Passing empty array to setAllowedFileTypes will cause exception.
-   NSArray* file_types = nil;
-+<<<<<<< .our
-   NSUInteger count = [file_types_list count];
-   if (count > 0) {
-     file_types = [[file_types_list objectAtIndex:0] allObjects];
-@@ -102,6 +103,11 @@
-     if ([file_types count] == 0 || [file_types containsObject:@"*"])
-       file_types = nil;
-   }
-+=======
-+  if ([file_type_set count])
-+    file_types = [file_type_set allObjects];
-+
-+>>>>>>> .their
-   [dialog setAllowedFileTypes:file_types];
- 
-   if (count <= 1)
-changed in both
-  base   100644 cc621625818feaeddf4fb76cd9103c822795e652 atom/browser/web_contents_preferences.cc
-  our    100644 c21c93383155091a7481cdd4e741cefad90a4a55 atom/browser/web_contents_preferences.cc
-  their  100644 701791b41d871d605367604e872f17668a7d24b5 atom/browser/web_contents_preferences.cc
-@@ -97,6 +97,7 @@
-   instances_.push_back(this);
- 
-   // Set WebPreferences defaults onto the JS object
-+<<<<<<< .our
-   SetDefaultBoolIfUndefined(options::kPlugins, false);
-   SetDefaultBoolIfUndefined(options::kExperimentalFeatures, false);
-   bool node = SetDefaultBoolIfUndefined(options::kNodeIntegration, true);
-@@ -104,11 +105,22 @@
-   SetDefaultBoolIfUndefined(options::kWebviewTag, node);
-   SetDefaultBoolIfUndefined(options::kSandbox, false);
-   SetDefaultBoolIfUndefined(options::kNativeWindowOpen, false);
-+=======
-+  SetDefaultBoolIfUndefined("plugins", false);
-+  SetDefaultBoolIfUndefined(options::kExperimentalFeatures, false);
-+  SetDefaultBoolIfUndefined(options::kExperimentalCanvasFeatures, false);
-+  bool node = SetDefaultBoolIfUndefined(options::kNodeIntegration, true);
-+  SetDefaultBoolIfUndefined(options::kNodeIntegrationInWorker, false);
-+  SetDefaultBoolIfUndefined(options::kWebviewTag, node);
-+  SetDefaultBoolIfUndefined("sandbox", false);
-+  SetDefaultBoolIfUndefined("nativeWindowOpen", false);
-+>>>>>>> .their
-   SetDefaultBoolIfUndefined(options::kContextIsolation, false);
-   SetDefaultBoolIfUndefined("javascript", true);
-   SetDefaultBoolIfUndefined("images", true);
-   SetDefaultBoolIfUndefined("textAreasAreResizable", true);
-   SetDefaultBoolIfUndefined("webgl", true);
-+<<<<<<< .our
-   bool webSecurity = true;
-   SetDefaultBoolIfUndefined(options::kWebSecurity, webSecurity);
-   // If webSecurity was explicity set to false, let's inherit that into
-@@ -125,6 +137,15 @@
-   SetDefaultBoolIfUndefined(options::kOffscreen, false);
- 
-   last_preference_ = preference_.Clone();
-+=======
-+  SetDefaultBoolIfUndefined("webSecurity", true);
-+  SetDefaultBoolIfUndefined("allowRunningInsecureContent", false);
-+  #if defined(OS_MACOSX)
-+  SetDefaultBoolIfUndefined(options::kScrollBounce, false);
-+  #endif
-+  SetDefaultBoolIfUndefined("offscreen", false);
-+  last_web_preferences_.MergeDictionary(&web_preferences_);
-+>>>>>>> .their
- }
- 
- WebContentsPreferences::~WebContentsPreferences() {
-@@ -154,6 +175,16 @@
-   return default_value;
- }
- 
-+bool WebContentsPreferences::SetDefaultBoolIfUndefined(const std::string key,
-+                                                       bool val) {
-+  bool existing;
-+  if (!web_preferences_.GetBoolean(key, &existing)) {
-+    web_preferences_.SetBoolean(key, val);
-+    return val;
-+  }
-+  return existing;
-+}
-+
- void WebContentsPreferences::Merge(const base::DictionaryValue& extend) {
-   if (preference_.is_dict())
-     static_cast<base::DictionaryValue*>(&preference_)->MergeDictionary(&extend);
-@@ -212,8 +243,18 @@
-   return FromWebContents(web_contents);
- }
- 
-+<<<<<<< .our
- void WebContentsPreferences::AppendCommandLineSwitches(
-     base::CommandLine* command_line) {
-+=======
-+  // We are appending args to a webContents so let's save the current state
-+  // of our preferences object so that during the lifetime of the WebContents
-+  // we can fetch the options used to initally configure the WebContents
-+  self->last_web_preferences_.Clear();
-+  self->last_web_preferences_.MergeDictionary(&web_preferences);
-+
-+  bool b;
-+>>>>>>> .their
-   // Check if plugins are enabled.
-   if (IsEnabled(options::kPlugins))
-     command_line->AppendSwitch(switches::kEnablePlugins);
-changed in both
-  base   100644 366aa1d9520847d6b81e673cc5a2156d53cc5ba5 atom/browser/web_contents_preferences.h
-  our    100644 d835347afcd259f473f95271a2c19e42afcc6f2b atom/browser/web_contents_preferences.h
-  their  100644 be277487d1d669b5e85676ff1a7ca4da365c0572 atom/browser/web_contents_preferences.h
-@@ -59,8 +59,15 @@
-   bool GetPreloadPath(base::FilePath::StringType* path) const;
- 
-   // Returns the web preferences.
-+<<<<<<< .our
-   base::Value* preference() { return &preference_; }
-   base::Value* last_preference() { return &last_preference_; }
-+=======
-+  base::DictionaryValue* web_preferences() { return &web_preferences_; }
-+  base::DictionaryValue* last_web_preferences() {
-+    return &last_web_preferences_;
-+  }
-+>>>>>>> .their
- 
-  private:
-   friend class content::WebContentsUserData<WebContentsPreferences>;
-@@ -75,6 +82,14 @@
-   static std::vector<WebContentsPreferences*> instances_;
- 
-   content::WebContents* web_contents_;
-+<<<<<<< .our
-+=======
-+  base::DictionaryValue web_preferences_;
-+  base::DictionaryValue last_web_preferences_;
-+
-+  // Set preference value to given bool if user did not provide value
-+  bool SetDefaultBoolIfUndefined(const std::string key, bool val);
-+>>>>>>> .their
- 
-   base::Value preference_ = base::Value(base::Value::Type::DICTIONARY);
-   base::Value last_preference_ = base::Value(base::Value::Type::DICTIONARY);
-changed in both
-  base   100644 08880ffe4a3591d9010f55ef18ce288e69101fe1 atom/common/atom_command_line.cc
-  our    100644 287e43f75fef778948ef9acdac8b9a7edfe07d0a atom/common/atom_command_line.cc
-  their  100644 54420b533a6b2600a87c95645b73bc01fbf0122f atom/common/atom_command_line.cc
-changed in both
-  base   100644 0f58ceb5123e85577732993552c326640d71de54 atom/common/atom_version.h
-  our    100644 65e7d19911559a40b1b258319df5fe0fa180354f atom/common/atom_version.h
-  their  100644 de73cf36a580cf06533066f631edfe17419fce23 atom/common/atom_version.h
-@@ -5,10 +5,22 @@
- #ifndef ATOM_COMMON_ATOM_VERSION_H_
- #define ATOM_COMMON_ATOM_VERSION_H_
- 
-+<<<<<<< .our
- #define ATOM_MAJOR_VERSION 4
- #define ATOM_MINOR_VERSION 0
- #define ATOM_PATCH_VERSION 0
- #define ATOM_PRE_RELEASE_VERSION -nightly.20180821
-+=======
-+#define ATOM_MAJOR_VERSION 1
-+#define ATOM_MINOR_VERSION 7
-+#define ATOM_PATCH_VERSION 14
-+// #define ATOM_PRE_RELEASE_VERSION
-+#define ATOM_VERSION_IS_RELEASE 1
-+
-+#ifndef ATOM_TAG
-+# define ATOM_TAG ""
-+#endif
-+>>>>>>> .their
- 
- #ifndef ATOM_STRINGIFY
- #define ATOM_STRINGIFY(n) ATOM_STRINGIFY_HELPER(n)
-changed in both
-  base   100644 03e96ae8a4f3cb7e656143fb46dff58eb924fa12 atom/common/node_bindings.cc
-  our    100644 e6aded2e661af919c2d89c2f9bd46b4921d4aec4 atom/common/node_bindings.cc
-  their  100644 84792c58207dd85de2d2b60bd789417346c31b50 atom/common/node_bindings.cc
-@@ -228,8 +228,12 @@
- }
- 
- node::Environment* NodeBindings::CreateEnvironment(
-+<<<<<<< .our
-     v8::Handle<v8::Context> context,
-     node::MultiIsolatePlatform* platform) {
-+=======
-+    v8::Handle<v8::Context> context) {
-+>>>>>>> .their
- #if defined(OS_WIN)
-   auto& atom_args = AtomCommandLine::argv();
-   std::vector<std::string> args(atom_args.size());
-@@ -255,8 +259,13 @@
-   base::FilePath resources_path = GetResourcesPath(browser_env_ == BROWSER);
-   base::FilePath script_path =
-       resources_path.Append(FILE_PATH_LITERAL("electron.asar"))
-+<<<<<<< .our
-           .Append(process_type)
-           .Append(FILE_PATH_LITERAL("init.js"));
-+=======
-+                    .Append(process_type)
-+                    .Append(FILE_PATH_LITERAL("init.js"));
-+>>>>>>> .their
-   args.insert(args.begin() + 1, script_path.AsUTF8Unsafe());
- 
-   std::unique_ptr<const char* []> c_argv = StringVectorToArgArray(args);
-changed in both
-  base   100644 a56d2e24c0e77dcdcfd240c366daede6e3f2f709 brightray/browser/mac/cocoa_notification.mm
-  our    100644 57f53931e972adac9cbadf643c737b21d6b9b712 brightray/browser/mac/cocoa_notification.mm
-  their  100644 cd7b69ef4058ebc5ccf3396474551f2fc065d20f brightray/browser/mac/cocoa_notification.mm
-@@ -48,7 +48,13 @@
- 
-   if (options.silent) {
-     [notification_ setSoundName:nil];
-+<<<<<<< .our
-   } else if (options.sound.empty()) {
-+=======
-+  } else if (options.sound != nil) {
-+    [notification_ setSoundName:base::SysUTF16ToNSString(options.sound)];
-+  } else {
-+>>>>>>> .their
-     [notification_ setSoundName:NSUserNotificationDefaultSoundName];
-   } else {
-     [notification_ setSoundName:base::SysUTF16ToNSString(options.sound)];
-changed in both
-  base   100644 017fdd85261df0df1b885ef8a15fed74ed86c8de brightray/browser/notification.h
-  our    100644 efb8752f3595f81d8f080573924791cd1411ae84 brightray/browser/notification.h
-  their  100644 69efcff386f544f84074eb39781e3daa083ae64f brightray/browser/notification.h
-changed in both
-  base   100644 eab6c35479a3551de482e323fce00a962de423a5 chromium_src/chrome/browser/process_singleton.h
-  our    100644 b2909e8d1852c8fa69daa21b83432bb7c36f17c9 chromium_src/chrome/browser/process_singleton.h
-  their  100644 d77f5b41df88e4dba037c5946715bf690e28f95e chromium_src/chrome/browser/process_singleton.h
-changed in both
-  base   100644 e1e25cf91de0195202cae646dda4f124ee161dc2 chromium_src/chrome/browser/process_singleton_posix.cc
-  our    100644 4891743710d16673c6a72d76a303f6ac56a5ad32 chromium_src/chrome/browser/process_singleton_posix.cc
-  their  100644 1943ad51f635b19379753b67bc45d8ad316d6eb1 chromium_src/chrome/browser/process_singleton_posix.cc
-@@ -883,8 +883,15 @@
- void ProcessSingleton::StartListeningOnSocket() {
-   watcher_ = new LinuxWatcher(this);
-   BrowserThread::PostTask(
-+<<<<<<< .our
-       BrowserThread::IO, FROM_HERE,
-       base::Bind(&ProcessSingleton::LinuxWatcher::StartListening, watcher_,
-+=======
-+      BrowserThread::IO,
-+      FROM_HERE,
-+      base::Bind(&ProcessSingleton::LinuxWatcher::StartListening,
-+                 watcher_,
-+>>>>>>> .their
-                  sock_));
- }
- 
-changed in both
-  base   100644 b488ad457674287187b9b0edf24a423f774ff9c6 chromium_src/chrome/browser/process_singleton_win.cc
-  our    100644 6d0d102430ff700e703cef7e3189403c4a35218f chromium_src/chrome/browser/process_singleton_win.cc
-  their  100644 cce6054d1230c396f18a1eb358aa87faf1b29fd5 chromium_src/chrome/browser/process_singleton_win.cc
-changed in both
-  base   100644 9036102668286db7ca4d338dc8f326f1bd3653b7 docs/api/notification.md
-  our    100644 08776a9d3b8fb0969a5538981a2dd991b248fb82 docs/api/notification.md
-  their  100644 6dab356bbda50812a241fa150f39a03580d8cfae docs/api/notification.md
-@@ -30,6 +30,7 @@
- ### `new Notification([options])` _Experimental_
- 
- * `options` Object
-+<<<<<<< .our
-   * `title` String - A title for the notification, which will be shown at the top of the notification window when it is shown.
-   * `subtitle` String (optional) _macOS_ - A subtitle for the notification, which will be displayed below the title.
-   * `body` String - The body text of the notification, which will be displayed below the title or subtitle.
-@@ -40,6 +41,18 @@
-   * `sound` String (optional) _macOS_ - The name of the sound file to play when the notification is shown.
-   * `actions` [NotificationAction[]](structures/notification-action.md) (optional) _macOS_ - Actions to add to the notification. Please read the available actions and limitations in the `NotificationAction` documentation.
-   * `closeButtonText` String (optional) _macOS_ - A custom title for the close button of an alert. An empty string will cause the default localized text to be used.
-+=======
-+  * `title` String - A title for the notification, which will be shown at the top of the notification window when it is shown
-+  * `subtitle` String - (optional) A subtitle for the notification, which will be displayed below the title. _macOS_
-+  * `body` String - The body text of the notification, which will be displayed below the title or subtitle
-+  * `silent` Boolean - (optional) Whether or not to emit an OS notification noise when showing the notification
-+  * `icon` [NativeImage](native-image.md) - (optional) An icon to use in the notification
-+  * `hasReply` Boolean - (optional) Whether or not to add an inline reply option to the notification.  _macOS_
-+  * `replyPlaceholder` String - (optional) The placeholder to write in the inline reply input field. _macOS_
-+  * `sound` String - (optional) The name of the sound file to play when the notification is shown. _macOS_
-+  * `actions` [NotificationAction[]](structures/notification-action.md) - (optional) Actions to add to the notification.  Please read the available actions and limitations in the `NotificationAction` documentation _macOS_
-+
-+>>>>>>> .their
- 
- ### Instance Events
- 
-@@ -104,6 +117,7 @@
- not immediately show it to the user, you need to call this method before the OS
- will display it.
- 
-+<<<<<<< .our
- If the notification has been shown before, this method will dismiss the previously
- shown notification and create a new one with identical properties.
- 
-@@ -111,6 +125,8 @@
- 
- Dismisses the notification.
- 
-+=======
-+>>>>>>> .their
- ### Playing Sounds
- 
- On macOS, you can specify the name of the sound you'd like to play when the
-changed in both
-  base   100644 456fc207fe98260b4f971154f9260fad685fc563 docs/api/touch-bar-button.md
-  our    100644 4f3e2906ecd35c700c47edf358cd8ef2a4977050 docs/api/touch-bar-button.md
-  their  100644 461c0c5155227adf2306cb37865151aec48f7f7e docs/api/touch-bar-button.md
-changed in both
-  base   100644 17d416608b94068be43459bf2ce9ca18fc4dcedc electron.gyp
-  our    100644 944ddab2a3fd879044e31677e4bac2843fffbdee electron.gyp
-  their  100644 9c4ebe599dbc028dc3c5fbceaa68259189d8102e electron.gyp
-@@ -4,7 +4,11 @@
-     'product_name%': 'Electron',
-     'company_name%': 'GitHub, Inc',
-     'company_abbr%': 'github',
-+<<<<<<< .our
-     'version%': '4.0.0-nightly.20180821',
-+=======
-+    'version%': '1.7.14',
-+>>>>>>> .their
-     'js2c_input_dir': '<(SHARED_INTERMEDIATE_DIR)/js2c',
-   },
-   'includes': [
-@@ -255,6 +259,11 @@
-               ],
-             },
-           ],
-+          'link_settings': {
-+            'ldflags': [
-+              '-Wl,-z,noexecstack',
-+            ],
-+          },
-         }],  # OS=="linux"
-       ],
-     },  # target <(project_name)
-changed in both
-  base   100644 e90fe322ba15d1613f7fa300427bcb96c10d351f filenames.gypi
-  our    100644 f57860558f06b7e5d8a50f48cfc7e53044df0bc6 filenames.gypi
-  their  100644 22d8b072a7bbd28e0a9c67896210d54640b1628a filenames.gypi
-@@ -114,6 +114,11 @@
-       'atom/app/atom_main_delegate_mac.mm',
-       'atom/app/command_line_args.cc',
-       'atom/app/command_line_args.h',
-+<<<<<<< .our
-+=======
-+      'atom/app/node_main.cc',
-+      'atom/app/node_main.h',
-+>>>>>>> .their
-       'atom/app/uv_task_runner.cc',
-       'atom/app/uv_task_runner.h',
-       'atom/browser/api/atom_api_app.cc',
-changed in both
-  base   100644 55b8372f52cf485ea5f812baed5f48296bacb962 lib/browser/api/auto-updater/auto-updater-win.js
-  our    100644 7fead4aabb4a8768db4e4d3bc13da4927cf3c42e lib/browser/api/auto-updater/auto-updater-win.js
-  their  100644 fced1258797756160d28cd1a16e0e5515d39bf5b lib/browser/api/auto-updater/auto-updater-win.js
-changed in both
-  base   100644 4783a9dd98852f303fe50e6fd03dabdecd6d0693 lib/browser/api/auto-updater/squirrel-update-win.js
-  our    100644 fecf7958cd0afd54e978f011f5f87eea751faf6d lib/browser/api/auto-updater/squirrel-update-win.js
-  their  100644 60345f1a1abead139d280b14457e558c6467de45 lib/browser/api/auto-updater/squirrel-update-win.js
-changed in both
-  base   100644 731f82838af35a13442a2723b843cf0bcfb4717c lib/browser/guest-view-manager.js
-  our    100644 1e4029e39a981c85fb6ff18c5ccd52f81b3c56f2 lib/browser/guest-view-manager.js
-  their  100644 039753b7aef48f9ff8e9f507f7cb5d13458413b5 lib/browser/guest-view-manager.js
-changed in both
-  base   100644 bd9473dda879723625af24c0f98de2855234a2c7 lib/browser/guest-window-manager.js
-  our    100644 7253c1942b0956ae6b9b0c80a23470fc26669b8a lib/browser/guest-window-manager.js
-  their  100644 479232ec4178163a0af9b0def6a6b81416b01b1c lib/browser/guest-window-manager.js
-@@ -65,7 +65,11 @@
-   // Inherit certain option values from parent window
-   const webPreferences = embedder.getLastWebPreferences()
-   for (const [name, value] of inheritedWebPreferences) {
-+<<<<<<< .our
-     if (webPreferences[name] === value) {
-+=======
-+    if (embedder.getLastWebPreferences()[name] === value) {
-+>>>>>>> .their
-       options.webPreferences[name] = value
-     }
-   }
-changed in both
-  base   100644 570c63f4e7915198292dae1cd9e84e7ecd725386 package.json
-  our    100644 c081cd89450cd50efba1ec280ff1349a96ea3ce0 package.json
-  their  100644 765429855ebca6aab6245a75bd461b44a198ecd8 package.json
-@@ -1,17 +1,25 @@
- {
-   "name": "electron",
-+<<<<<<< .our
-   "version": "4.0.0-nightly.20180821",
-+=======
-+  "version": "1.7.14",
-+>>>>>>> .their
-   "repository": "https://github.com/electron/electron",
-   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
-   "devDependencies": {
-     "asar": "^0.11.0",
-     "browserify": "^13.1.0",
-     "check-for-leaks": "^1.0.2",
-+<<<<<<< .our
-     "clang-format": "^1.2.3",
-+=======
-+>>>>>>> .their
-     "colors": "^1.1.2",
-     "dotenv-safe": "^4.0.4",
-     "dugite": "^1.45.0",
-     "electabul": "~0.0.4",
-+<<<<<<< .our
-     "electron-docs-linter": "^2.3.4",
-     "electron-typescript-definitions": "^1.3.6",
-     "github": "^9.2.0",
-@@ -24,6 +32,15 @@
-     "octicons": "^7.3.0",
-     "remark-cli": "^4.0.0",
-     "remark-preset-lint-markdown-style-guide": "^2.1.1",
-+=======
-+    "electron-docs-linter": "^2.3.3",
-+    "electron-typescript-definitions": "~1.2.11",
-+    "github": "^9.2.0",
-+    "heads": "^1.3.0",
-+    "husky": "^0.14.3",
-+    "minimist": "^1.2.0",
-+    "nugget": "^2.0.1",
-+>>>>>>> .their
-     "request": "^2.68.0",
-     "semver": "^5.5.0",
-     "serve": "^6.5.8",
-@@ -69,6 +86,10 @@
-     "lint:js-in-markdown": "standard-markdown docs",
-     "create-api-json": "electron-docs-linter docs --outfile=out/electron-api.json --version=$npm_package_version",
-     "create-typescript-definitions": "npm run create-api-json && electron-typescript-definitions --in=out/electron-api.json --out=out/electron.d.ts",
-+<<<<<<< .our
-+=======
-+    "merge-release": "node ./script/merge-release.js",
-+>>>>>>> .their
-     "mock-release": "node ./script/ci-release-build.js",
-     "preinstall": "node -e 'process.exit(0)'",
-     "publish-to-npm": "node ./script/publish-to-npm.js",
-changed in both
-  base   100755 4db30b71fca9996003fe44a71fa9d81499677bd2 script/bump-version.py
-  our    100755 564adb2116312b0f6d0351096bd89cb373cd3bab script/bump-version.py
-  their  100755 28424aaa8ee614b0dfffc7468adb2266f05440cb script/bump-version.py
-@@ -12,6 +12,7 @@
- SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
- 
- def main():
-+<<<<<<< .our
- 
-   parser = argparse.ArgumentParser(
-     description='Bump version numbers. Must specify at least one of the three'
-@@ -94,6 +95,77 @@
-   if args.dry_run:
-     print 'new version number would be: {0}\n'.format(version + suffix)
-     return 0
-+=======
-+
-+  parser = argparse.ArgumentParser(
-+    description='Bump version numbers. Must specify at least one of the three'
-+               +' options:\n'
-+               +'   --bump=patch to increment patch version, or\n'
-+               +'   --stable to promote current beta to stable, or\n'
-+               +'   --version={version} to set version number directly\n'
-+               +'Note that you can use both --bump and --stable '
-+               +'simultaneously.',
-+               formatter_class=argparse.RawTextHelpFormatter
-+  )
-+  parser.add_argument(
-+    '--version',
-+    default=None,
-+    dest='new_version',
-+    help='new version number'
-+  )
-+  parser.add_argument(
-+    '--bump',
-+    action='store',
-+    default=None,
-+    dest='bump',
-+    help='increment [major | minor | patch | beta]'
-+  )
-+  parser.add_argument(
-+    '--stable',
-+    action='store_true',
-+    default= False,
-+    dest='stable',
-+    help='promote to stable (i.e. remove `-beta.x` suffix)'
-+  )
-+  parser.add_argument(
-+    '--dry-run',
-+    action='store_true',
-+    default= False,
-+    dest='dry_run',
-+    help='just to check that version number is correct'
-+  )
-+
-+  args = parser.parse_args()
-+
-+  if args.new_version == None and args.bump == None and args.stable == False:
-+    parser.print_help()
-+    return 1
-+
-+  increments = ['major', 'minor', 'patch', 'beta']
-+
-+  curr_version = get_electron_version()
-+  versions = parse_version(re.sub('-beta', '', curr_version))
-+
-+  if args.bump in increments:
-+    versions = increase_version(versions, increments.index(args.bump))
-+    if versions[3] == '0':
-+      # beta starts at 1
-+      versions = increase_version(versions, increments.index('beta'))
-+
-+  if args.stable == True:
-+    versions[3] = '0'
-+
-+  if args.new_version != None:
-+    versions = parse_version(re.sub('-beta', '', args.new_version))
-+
-+  version = '.'.join(versions[:3])
-+  suffix = '' if versions[3] == '0' else '-beta.' + versions[3]
-+
-+  if args.dry_run:
-+    print 'new version number would be: {0}\n'.format(version + suffix)
-+    return 0
-+
-+>>>>>>> .their
- 
-   with scoped_cwd(SOURCE_ROOT):
-     update_electron_gyp(version, suffix)
-@@ -104,9 +176,12 @@
-     tag_version(version, suffix)
- 
-   print 'Bumped to version: {0}'.format(version + suffix)
-+<<<<<<< .our
- 
- def not_reached():
-   raise Exception('Unreachable code was reached')
-+=======
-+>>>>>>> .their
- 
- def increase_version(versions, index):
-   for i in range(index + 1, 4):
-@@ -116,8 +191,12 @@
- 
- 
- def update_electron_gyp(version, suffix):
-+<<<<<<< .our
-   pattern = re.compile(" *'version%' *: *'[0-9.]+(-beta[0-9.]*)?(-dev)?"
-     + "(-nightly[0-9.]*)?'")
-+=======
-+  pattern = re.compile(" *'version%' *: *'[0-9.]+(-beta[0-9.]*)?'")
-+>>>>>>> .their
-   with open('electron.gyp', 'r') as f:
-     lines = f.readlines()
- 
-@@ -209,6 +288,7 @@
- 
- 
- def tag_version(version, suffix):
-+<<<<<<< .our
-   execute([
-     'git',
-     'commit',
-@@ -217,6 +297,9 @@
-     'Bump v{0}'.format(version + suffix),
-     '-n'
-   ])
-+=======
-+  execute(['git', 'commit', '-a', '-m', 'Bump v{0}'.format(version + suffix)])
-+>>>>>>> .their
- 
- 
- if __name__ == '__main__':
-added in both
-  our    100644 be9f9597387f5f8b7bfddc61c202f32ce4c6d478 script/ci-release-build.js
-  their  100644 eb37ece8a892e696dbcc1815c3b9a2ccca79437b script/ci-release-build.js
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- require('dotenv-safe').load()
- 
- const assert = require('assert')
-@@ -23,6 +24,18 @@
-   'electron-release-osx-x64'
- ]
- 
-+=======
-+const assert = require('assert')
-+const request = require('request')
-+const buildAppVeyorURL = 'https://windows-ci.electronjs.org/api/builds'
-+
-+const circleCIJobs = [
-+  'electron-linux-arm',
-+  'electron-linux-ia32',
-+  'electron-linux-x64'
-+]
-+
-+>>>>>>> .their
- async function makeRequest (requestOptions, parseResponse) {
-   return new Promise((resolve, reject) => {
-     request(requestOptions, (err, res, body) => {
-@@ -34,6 +47,7 @@
-           resolve(body)
-         }
-       } else {
-+<<<<<<< .our
-         console.error('Error occurred while requesting:', requestOptions.url)
-         if (parseResponse) {
-           try {
-@@ -41,6 +55,10 @@
-           } catch (err) {
-             console.log('Error: ', `(status ${res.statusCode})`, err || res.body, requestOptions)
-           }
-+=======
-+        if (parseResponse) {
-+          console.log('Error: ', `(status ${res.statusCode})`, err || JSON.parse(res.body), requestOptions)
-+>>>>>>> .their
-         } else {
-           console.log('Error: ', `(status ${res.statusCode})`, err || res.body, requestOptions)
-         }
-@@ -50,7 +68,12 @@
-   })
- }
- 
-+<<<<<<< .our
- async function circleCIcall (buildUrl, targetBranch, job, options) {
-+=======
-+async function circleCIcall (buildUrl, targetBranch, job, ghRelease) {
-+  assert(process.env.CIRCLE_TOKEN, 'CIRCLE_TOKEN not found in environment')
-+>>>>>>> .their
-   console.log(`Triggering CircleCI to run build job: ${job} on branch: ${targetBranch} with release flag.`)
-   let buildRequest = {
-     'build_parameters': {
-@@ -58,16 +81,23 @@
-     }
-   }
- 
-+<<<<<<< .our
-   if (options.ghRelease) {
-+=======
-+  if (ghRelease) {
-+>>>>>>> .their
-     buildRequest.build_parameters.ELECTRON_RELEASE = 1
-   } else {
-     buildRequest.build_parameters.RUN_RELEASE_BUILD = 'true'
-   }
- 
-+<<<<<<< .our
-   if (options.automaticRelease) {
-     buildRequest.build_parameters.AUTO_RELEASE = 'true'
-   }
- 
-+=======
-+>>>>>>> .their
-   let circleResponse = await makeRequest({
-     method: 'POST',
-     url: buildUrl,
-@@ -79,6 +109,7 @@
-   }, true).catch(err => {
-     console.log('Error calling CircleCI:', err)
-   })
-+<<<<<<< .our
-   console.log(`CircleCI release build request for ${job} successful.  Check ${circleResponse.build_url} for status.`)
- }
- 
-@@ -97,15 +128,29 @@
-   let environmentVariables = {}
- 
-   if (options.ghRelease) {
-+=======
-+  console.log(`Check ${circleResponse.build_url} for status. (${job})`)
-+}
-+
-+async function buildAppVeyor (targetBranch, ghRelease) {
-+  console.log(`Triggering AppVeyor to run build on branch: ${targetBranch} with release flag.`)
-+  assert(process.env.APPVEYOR_TOKEN, 'APPVEYOR_TOKEN not found in environment')
-+  let environmentVariables = {}
-+
-+  if (ghRelease) {
-+>>>>>>> .their
-     environmentVariables.ELECTRON_RELEASE = 1
-   } else {
-     environmentVariables.RUN_RELEASE_BUILD = 'true'
-   }
- 
-+<<<<<<< .our
-   if (options.automaticRelease) {
-     environmentVariables.AUTO_RELEASE = 'true'
-   }
- 
-+=======
-+>>>>>>> .their
-   const requestOpts = {
-     url: buildAppVeyorURL,
-     auth: {
-@@ -116,7 +161,11 @@
-     },
-     body: JSON.stringify({
-       accountName: 'AppVeyor',
-+<<<<<<< .our
-       projectSlug: appVeyorJobs[job],
-+=======
-+      projectSlug: 'electron',
-+>>>>>>> .their
-       branch: targetBranch,
-       environmentVariables
-     }),
-@@ -125,6 +174,7 @@
-   let appVeyorResponse = await makeRequest(requestOpts, true).catch(err => {
-     console.log('Error calling AppVeyor:', err)
-   })
-+<<<<<<< .our
-   const buildUrl = `https://windows-ci.electronjs.org/project/AppVeyor/${appVeyorJobs[job]}/build/${appVeyorResponse.version}`
-   console.log(`AppVeyor release build request for ${job} successful.  Check build status at ${buildUrl}`)
- }
-@@ -202,10 +252,27 @@
-   console.log(`VSTS release build request for ${build.name} successful. Check ${vstsResponse._links.web.href} for status.`)
- }
- 
-+=======
-+  const buildUrl = `https://windows-ci.electronjs.org/project/AppVeyor/electron/build/${appVeyorResponse.version}`
-+  console.log(`AppVeyor release build request successful.  Check build status at ${buildUrl}`)
-+}
-+
-+function buildCircleCI (targetBranch, ghRelease, job) {
-+  const circleBuildUrl = `https://circleci.com/api/v1.1/project/github/electron/electron/tree/${targetBranch}?circle-token=${process.env.CIRCLE_TOKEN}`
-+  if (job) {
-+    assert(circleCIJobs.includes(job), `Unknown CI job name: ${job}.`)
-+    circleCIcall(circleBuildUrl, targetBranch, job, ghRelease)
-+  } else {
-+    circleCIJobs.forEach((job) => circleCIcall(circleBuildUrl, targetBranch, job, ghRelease))
-+  }
-+}
-+
-+>>>>>>> .their
- function runRelease (targetBranch, options) {
-   if (options.ci) {
-     switch (options.ci) {
-       case 'CircleCI': {
-+<<<<<<< .our
-         buildCircleCI(targetBranch, options)
-         break
-       }
-@@ -226,12 +293,26 @@
-     buildCircleCI(targetBranch, options)
-     buildAppVeyor(targetBranch, options)
-     buildVSTS(targetBranch, options)
-+=======
-+        buildCircleCI(targetBranch, options.ghRelease, options.job)
-+        break
-+      }
-+      case 'AppVeyor': {
-+        buildAppVeyor(targetBranch, options.ghRelease)
-+        break
-+      }
-+    }
-+  } else {
-+    buildCircleCI(targetBranch, options.ghRelease, options.job)
-+    buildAppVeyor(targetBranch, options.ghRelease)
-+>>>>>>> .their
-   }
- }
- 
- module.exports = runRelease
- 
- if (require.main === module) {
-+<<<<<<< .our
-   const args = require('minimist')(process.argv.slice(2), {
-     boolean: ['ghRelease', 'automaticRelease']
-   })
-@@ -239,6 +320,13 @@
-   if (args._.length < 1) {
-     console.log(`Trigger CI to build release builds of electron.
-     Usage: ci-release-build.js [--job=CI_JOB_NAME] [--ci=CircleCI|AppVeyor|VSTS] [--ghRelease] [--automaticRelease] TARGET_BRANCH
-+=======
-+  const args = require('minimist')(process.argv.slice(2))
-+  const targetBranch = args._[0]
-+  if (args._.length < 1) {
-+    console.log(`Trigger CI to build release builds of electron.
-+    Usage: ci-release-build.js [--job=CI_JOB_NAME] [--ci=CircleCI|AppVeyor] [--ghRelease] TARGET_BRANCH
-+>>>>>>> .their
-     `)
-     process.exit(0)
-   }
-changed in both
-  base   100755 96e6ea2e751eea50df6e4d1014c5ce9ce9e726bb script/cibuild
-  our    100755 758dc2c794e642430ab6a0d966e7a41863be947c script/cibuild
-  their  100755 36e9e13fe98bce5d93a28e9711b36ae96d909fd6 script/cibuild
-@@ -57,6 +57,20 @@
-   if os.environ.has_key('TARGET_ARCH'):
-     target_arch = os.environ['TARGET_ARCH']
- 
-+<<<<<<< .our
-+=======
-+  is_travis = (os.getenv('TRAVIS') == 'true')
-+  if is_travis and PLATFORM == 'linux':
-+    print 'Setup travis CI'
-+    execute(['sudo', 'apt-get', 'update'])
-+    deps = LINUX_DEPS
-+    if target_arch == 'arm':
-+      deps += LINUX_DEPS_ARM
-+    else:
-+      deps += LINUX_DEPS_NO_ARM
-+    execute(['sudo', 'apt-get', 'install'] + deps)
-+
-+>>>>>>> .their
-   if PLATFORM == 'linux' and target_arch == 'x64':
-     os.environ['DISPLAY'] = ':99.0'
-     execute(['sh', '-e', '/etc/init.d/xvfb', 'start'])
-added in remote
-  their  100755 a33a208c32e4395a09cec65b121991443af1f373 script/merge-release.js
-@@ -0,0 +1,116 @@
-+#!/usr/bin/env node
-+
-+require('colors')
-+const assert = require('assert')
-+const branchToRelease = process.argv[2]
-+const fail = '\u2717'.red
-+const { GitProcess, GitError } = require('dugite')
-+const pass = '\u2713'.green
-+const path = require('path')
-+const pkg = require('../package.json')
-+
-+assert(process.env.ELECTRON_GITHUB_TOKEN, 'ELECTRON_GITHUB_TOKEN not found in environment')
-+if (!branchToRelease) {
-+  console.log(`Usage: merge-release branch`)
-+  process.exit(1)
-+}
-+const gitDir = path.resolve(__dirname, '..')
-+
-+async function callGit (args, errorMessage, successMessage) {
-+  let gitResult = await GitProcess.exec(args, gitDir)
-+  if (gitResult.exitCode === 0) {
-+    console.log(`${pass} ${successMessage}`)
-+    return true
-+  } else {
-+    console.log(`${fail} ${errorMessage} ${gitResult.stderr}`)
-+    process.exit(1)
-+  }
-+}
-+
-+async function checkoutBranch (branchName) {
-+  console.log(`Checking out ${branchName}.`)
-+  let errorMessage = `Error checking out branch ${branchName}:`
-+  let successMessage = `Successfully checked out branch ${branchName}.`
-+  return callGit(['checkout', branchName], errorMessage, successMessage)
-+}
-+
-+async function commitMerge () {
-+  console.log(`Committing the merge for v${pkg.version}`)
-+  let errorMessage = `Error committing merge:`
-+  let successMessage = `Successfully committed the merge for v${pkg.version}`
-+  let gitArgs = ['commit', '-m', `v${pkg.version}`]
-+  return callGit(gitArgs, errorMessage, successMessage)
-+}
-+
-+async function mergeReleaseIntoBranch (branchName) {
-+  console.log(`Merging release branch into ${branchName}.`)
-+  let mergeArgs = ['merge', 'release-1-7-x', '--squash']
-+  let mergeDetails = await GitProcess.exec(mergeArgs, gitDir)
-+  if (mergeDetails.exitCode === 0) {
-+    return true
-+  } else {
-+    const error = GitProcess.parseError(mergeDetails.stderr)
-+    if (error === GitError.MergeConflicts) {
-+      console.log(`${fail} Could not merge release branch into ${branchName} ` +
-+        `due to merge conflicts.`)
-+      return false
-+    } else {
-+      console.log(`${fail} Could not merge release branch into ${branchName} ` +
-+        `due to an error: ${mergeDetails.stderr}.`)
-+      process.exit(1)
-+    }
-+  }
-+}
-+
-+async function pushBranch (branchName) {
-+  console.log(`Pushing branch ${branchName}.`)
-+  let pushArgs = ['push', 'origin', branchName]
-+  let errorMessage = `Could not push branch ${branchName} due to an error:`
-+  let successMessage = `Successfully pushed branch ${branchName}.`
-+  return callGit(pushArgs, errorMessage, successMessage)
-+}
-+
-+async function pull () {
-+  console.log(`Performing a git pull`)
-+  let errorMessage = `Could not pull due to an error:`
-+  let successMessage = `Successfully performed a git pull`
-+  return callGit(['pull'], errorMessage, successMessage)
-+}
-+
-+async function rebase (targetBranch) {
-+  console.log(`Rebasing release branch from ${targetBranch}`)
-+  let errorMessage = `Could not rebase due to an error:`
-+  let successMessage = `Successfully rebased release branch from ` +
-+    `${targetBranch}`
-+  return callGit(['rebase', targetBranch], errorMessage, successMessage)
-+}
-+
-+async function mergeRelease () {
-+  await checkoutBranch(branchToRelease)
-+  let mergeSuccess = await mergeReleaseIntoBranch(branchToRelease)
-+  if (mergeSuccess) {
-+    console.log(`${pass} Successfully merged release branch into ` +
-+      `${branchToRelease}.`)
-+    await commitMerge()
-+    let pushSuccess = await pushBranch(branchToRelease)
-+    if (pushSuccess) {
-+      console.log(`${pass} Success!!! ${branchToRelease} now has the latest release!`)
-+    }
-+  } else {
-+    console.log(`Trying rebase of ${branchToRelease} into release branch.`)
-+    await pull()
-+    await checkoutBranch('release-1-7-x')
-+    let rebaseResult = await rebase(branchToRelease)
-+    if (rebaseResult) {
-+      let pushResult = pushBranch('HEAD')
-+      if (pushResult) {
-+        console.log(`Rebase of ${branchToRelease} into release branch was ` +
-+          `successful.  Let release builds run and then try this step again.`)
-+      }
-+      // Exit as failure so release doesn't continue
-+      process.exit(1)
-+    }
-+  }
-+}
-+
-+mergeRelease()
-added in both
-  our    100755 72a28b719bf1ff7770692caef86c76746c4d8edf script/prepare-release.js
-  their  100755 3e7baefd0cc37db804c6019b597200c02a281c1e script/prepare-release.js
-@@ -1,5 +1,6 @@
- #!/usr/bin/env node
- 
-+<<<<<<< .our
- if (!process.env.CI) require('dotenv-safe').load()
- require('colors')
- const args = require('minimist')(process.argv.slice(2), {
-@@ -9,20 +10,39 @@
- const { execSync } = require('child_process')
- const fail = '\u2717'.red
- const { GitProcess } = require('dugite')
-+=======
-+require('colors')
-+const args = require('minimist')(process.argv.slice(2))
-+const assert = require('assert')
-+const ciReleaseBuild = require('./ci-release-build')
-+const { execSync } = require('child_process')
-+const fail = '\u2717'.red
-+const { GitProcess, GitError } = require('dugite')
-+>>>>>>> .their
- const GitHub = require('github')
- const pass = '\u2713'.green
- const path = require('path')
- const pkg = require('../package.json')
- const readline = require('readline')
- const versionType = args._[0]
-+<<<<<<< .our
- const targetRepo = versionType === 'nightly' ? 'nightlies' : 'electron'
-+=======
-+>>>>>>> .their
- 
- // TODO (future) automatically determine version based on conventional commits
- // via conventional-recommended-bump
- 
-+<<<<<<< .our
- if (!versionType && !args.notesOnly) {
-   console.log(`Usage: prepare-release versionType [stable | beta | nightly]` +
-      ` (--stable) (--notesOnly) (--automaticRelease) (--branch)`)
-+=======
-+assert(process.env.ELECTRON_GITHUB_TOKEN, 'ELECTRON_GITHUB_TOKEN not found in environment')
-+if (!versionType && !args.notesOnly) {
-+  console.log(`Usage: prepare-release versionType [major | minor | patch | beta]` +
-+     ` (--stable) (--notesOnly)`)
-+>>>>>>> .their
-   process.exit(1)
- }
- 
-@@ -30,12 +50,37 @@
- const gitDir = path.resolve(__dirname, '..')
- github.authenticate({type: 'token', token: process.env.ELECTRON_GITHUB_TOKEN})
- 
-+<<<<<<< .our
- async function getNewVersion (dryRun) {
-   if (!dryRun) {
-     console.log(`Bumping for new "${versionType}" version.`)
-   }
-   let bumpScript = path.join(__dirname, 'bump-version.py')
-   let scriptArgs = [bumpScript, '--bump', versionType]
-+=======
-+async function createReleaseBranch () {
-+  console.log(`Creating release branch.`)
-+  let checkoutDetails = await GitProcess.exec([ 'checkout', '-b', 'release-1-7-x' ], gitDir)
-+  if (checkoutDetails.exitCode === 0) {
-+    console.log(`${pass} Successfully created the release branch.`)
-+  } else {
-+    const error = GitProcess.parseError(checkoutDetails.stderr)
-+    if (error === GitError.BranchAlreadyExists) {
-+      console.log(`${fail} Release branch already exists, aborting prepare ` +
-+        `release process.`)
-+    } else {
-+      console.log(`${fail} Error creating release branch: ` +
-+        `${checkoutDetails.stderr}`)
-+    }
-+    process.exit(1)
-+  }
-+}
-+
-+function getNewVersion (dryRun) {
-+  console.log(`Bumping for new "${versionType}" version.`)
-+  let bumpScript = path.join(__dirname, 'bump-version.py')
-+  let scriptArgs = [bumpScript, `--bump ${versionType}`]
-+>>>>>>> .their
-   if (args.stable) {
-     scriptArgs.push('--stable')
-   }
-@@ -52,7 +97,10 @@
-     return newVersion
-   } catch (err) {
-     console.log(`${fail} Could not bump version, error was:`, err)
-+<<<<<<< .our
-     throw err
-+=======
-+>>>>>>> .their
-   }
- }
- 
-@@ -74,6 +122,7 @@
- }
- 
- async function getReleaseNotes (currentBranch) {
-+<<<<<<< .our
-   if (versionType === 'nightly') {
-     return 'Nightlies do not get release notes, please compare tags for info'
-   }
-@@ -81,6 +130,12 @@
-   let githubOpts = {
-     owner: 'electron',
-     repo: targetRepo,
-+=======
-+  console.log(`Generating release notes for ${currentBranch}.`)
-+  let githubOpts = {
-+    owner: 'electron',
-+    repo: 'electron',
-+>>>>>>> .their
-     base: `v${pkg.version}`,
-     head: currentBranch
-   }
-@@ -142,11 +197,18 @@
- 
- async function createRelease (branchToTarget, isBeta) {
-   let releaseNotes = await getReleaseNotes(branchToTarget)
-+<<<<<<< .our
-   let newVersion = await getNewVersion()
-   await tagRelease(newVersion)
-   const githubOpts = {
-     owner: 'electron',
-     repo: targetRepo
-+=======
-+  let newVersion = getNewVersion()
-+  const githubOpts = {
-+    owner: 'electron',
-+    repo: 'electron'
-+>>>>>>> .their
-   }
-   console.log(`Checking for existing draft release.`)
-   let releases = await github.repos.getReleases(githubOpts)
-@@ -164,6 +226,7 @@
-   githubOpts.draft = true
-   githubOpts.name = `electron ${newVersion}`
-   if (isBeta) {
-+<<<<<<< .our
-     if (newVersion.indexOf('nightly') > 0) {
-       githubOpts.body = `Note: This is a nightly release.  Please file new issues ` +
-         `for any bugs you find in it.\n \n This release is published to npm ` +
-@@ -175,13 +238,23 @@
-         `under the beta tag and can be installed via npm install electron@beta, ` +
-         `or npm i electron@${newVersion.substr(1)}.\n \n ${releaseNotes}`
-     }
-+=======
-+    githubOpts.body = `Note: This is a beta release.  Please file new issues ` +
-+      `for any bugs you find in it.\n \n This release is published to npm ` +
-+      `under the beta tag and can be installed via npm install electron@beta, ` +
-+      `or npm i electron@${newVersion.substr(1)}.\n \n ${releaseNotes}`
-+>>>>>>> .their
-     githubOpts.name = `${githubOpts.name}`
-     githubOpts.prerelease = true
-   } else {
-     githubOpts.body = releaseNotes
-   }
-   githubOpts.tag_name = newVersion
-+<<<<<<< .our
-   githubOpts.target_commitish = newVersion.indexOf('nightly') !== -1 ? 'master' : branchToTarget
-+=======
-+  githubOpts.target_commitish = branchToTarget
-+>>>>>>> .their
-   await github.repos.createRelease(githubOpts)
-     .catch(err => {
-       console.log(`${fail} Error creating new release: `, err)
-@@ -190,6 +263,7 @@
-   console.log(`${pass} Draft release for ${newVersion} has been created.`)
- }
- 
-+<<<<<<< .our
- async function pushRelease (branch) {
-   let pushDetails = await GitProcess.exec(['push', 'origin', `HEAD:${branch}`, '--follow-tags'], gitDir)
-   if (pushDetails.exitCode === 0) {
-@@ -197,11 +271,21 @@
-       `release builds to finish before running "npm run release".`)
-   } else {
-     console.log(`${fail} Error pushing the release: ` +
-+=======
-+async function pushRelease () {
-+  let pushDetails = await GitProcess.exec(['push', 'origin', 'HEAD'], gitDir)
-+  if (pushDetails.exitCode === 0) {
-+    console.log(`${pass} Successfully pushed the release branch.  Wait for ` +
-+      `release builds to finish before running "npm run release".`)
-+  } else {
-+    console.log(`${fail} Error pushing the release branch: ` +
-+>>>>>>> .their
-         `${pushDetails.stderr}`)
-     process.exit(1)
-   }
- }
- 
-+<<<<<<< .our
- async function runReleaseBuilds (branch) {
-   await ciReleaseBuild(branch, {
-     ghRelease: true,
-@@ -229,6 +313,17 @@
-   } else {
-     response = await promptForVersion(newVersion)
-   }
-+=======
-+async function runReleaseBuilds () {
-+  await ciReleaseBuild('release-1-7-x', {
-+    ghRelease: true
-+  })
-+}
-+
-+async function verifyNewVersion () {
-+  let newVersion = await getNewVersion(true)
-+  let response = await promptForVersion(newVersion)
-+>>>>>>> .their
-   if (response.match(/^y/i)) {
-     console.log(`${pass} Starting release of ${newVersion}`)
-   } else {
-@@ -250,6 +345,7 @@
-   })
- }
- 
-+<<<<<<< .our
- // function to determine if there have been commits to master since the last release
- async function changesToRelease () {
-   let lastCommitWasRelease = new RegExp(`^Bump v[0-9.]*(-beta[0-9.]*)?(-nightly[0-9.]*)?$`, 'g')
-@@ -278,6 +374,19 @@
-         process.exit(1)
-       }
-     }
-+=======
-+async function prepareRelease (isBeta, notesOnly) {
-+  let currentBranch = await getCurrentBranch(gitDir)
-+  if (notesOnly) {
-+    let releaseNotes = await getReleaseNotes(currentBranch)
-+    console.log(`Draft release notes are: ${releaseNotes}`)
-+  } else {
-+    await verifyNewVersion()
-+    await createReleaseBranch()
-+    await createRelease(currentBranch, isBeta)
-+    await pushRelease()
-+    await runReleaseBuilds()
-+>>>>>>> .their
-   }
- }
- 
-added in remote
-  their  100755 78b63933009cf47cc50130dabaa8fe6f5f73b30f script/prerelease.js
-@@ -0,0 +1,112 @@
-+#!/usr/bin/env node
-+
-+require('colors')
-+const assert = require('assert')
-+const GitHub = require('github')
-+const heads = require('heads')
-+const pkg = require('../package.json')
-+const pass = '\u2713'.green
-+const fail = '\u2717'.red
-+let failureCount = 0
-+
-+assert(process.env.ELECTRON_GITHUB_TOKEN, 'ELECTRON_GITHUB_TOKEN not found in environment')
-+
-+const github = new GitHub()
-+github.authenticate({type: 'token', token: process.env.ELECTRON_GITHUB_TOKEN})
-+github.repos.getReleases({owner: 'electron', repo: 'electron'})
-+  .then(res => {
-+    const releases = res.data
-+    const drafts = releases
-+      .filter(release => release.draft) // comment out for testing
-+      // .filter(release => release.tag_name === 'v1.7.5') // uncomment for testing
-+
-+    check(drafts.length === 1, 'one draft exists', true)
-+    const draft = drafts[0]
-+
-+    check(draft.tag_name === `v${pkg.version}`, `draft release version matches local package.json (v${pkg.version})`)
-+    check(draft.prerelease, 'draft is a prerelease')
-+    check(draft.body.length > 50 && !draft.body.includes('(placeholder)'), 'draft has release notes')
-+
-+    const requiredAssets = assetsForVersion(draft.tag_name).sort()
-+    const extantAssets = draft.assets.map(asset => asset.name).sort()
-+
-+    requiredAssets.forEach(asset => {
-+      check(extantAssets.includes(asset), asset)
-+    })
-+
-+    const s3Urls = s3UrlsForVersion(draft.tag_name)
-+    heads(s3Urls)
-+      .then(results => {
-+        results.forEach((result, i) => {
-+          check(result === 200, s3Urls[i])
-+        })
-+
-+        process.exit(failureCount > 0 ? 1 : 0)
-+      })
-+      .catch(err => {
-+        console.error('Error making HEAD requests for S3 assets')
-+        console.error(err)
-+        process.exit(1)
-+      })
-+  })
-+
-+function check (condition, statement, exitIfFail = false) {
-+  if (condition) {
-+    console.log(`${pass} ${statement}`)
-+  } else {
-+    failureCount++
-+    console.log(`${fail} ${statement}`)
-+    if (exitIfFail) process.exit(1)
-+  }
-+}
-+
-+function assetsForVersion (version) {
-+  const patterns = [
-+    'electron-{{VERSION}}-darwin-x64-dsym.zip',
-+    'electron-{{VERSION}}-darwin-x64-symbols.zip',
-+    'electron-{{VERSION}}-darwin-x64.zip',
-+    'electron-{{VERSION}}-linux-arm-symbols.zip',
-+    'electron-{{VERSION}}-linux-arm.zip',
-+    'electron-{{VERSION}}-linux-armv7l-symbols.zip',
-+    'electron-{{VERSION}}-linux-armv7l.zip',
-+    'electron-{{VERSION}}-linux-ia32-symbols.zip',
-+    'electron-{{VERSION}}-linux-ia32.zip',
-+    'electron-{{VERSION}}-linux-x64-symbols.zip',
-+    'electron-{{VERSION}}-linux-x64.zip',
-+    'electron-{{VERSION}}-mas-x64-dsym.zip',
-+    'electron-{{VERSION}}-mas-x64-symbols.zip',
-+    'electron-{{VERSION}}-mas-x64.zip',
-+    'electron-{{VERSION}}-win32-ia32-pdb.zip',
-+    'electron-{{VERSION}}-win32-ia32-symbols.zip',
-+    'electron-{{VERSION}}-win32-ia32.zip',
-+    'electron-{{VERSION}}-win32-x64-pdb.zip',
-+    'electron-{{VERSION}}-win32-x64-symbols.zip',
-+    'electron-{{VERSION}}-win32-x64.zip',
-+    'electron-api.json',
-+    'electron.d.ts',
-+    'ffmpeg-{{VERSION}}-darwin-x64.zip',
-+    'ffmpeg-{{VERSION}}-linux-arm.zip',
-+    'ffmpeg-{{VERSION}}-linux-armv7l.zip',
-+    'ffmpeg-{{VERSION}}-linux-ia32.zip',
-+    'ffmpeg-{{VERSION}}-linux-x64.zip',
-+    'ffmpeg-{{VERSION}}-mas-x64.zip',
-+    'ffmpeg-{{VERSION}}-win32-ia32.zip',
-+    'ffmpeg-{{VERSION}}-win32-x64.zip'
-+  ]
-+  return patterns.map(pattern => pattern.replace(/{{VERSION}}/g, version))
-+}
-+
-+function s3UrlsForVersion (version) {
-+  const bucket = 'https://gh-contractor-zcbenz.s3.amazonaws.com/'
-+  const patterns = [
-+    'atom-shell/dist/{{VERSION}}/iojs-{{VERSION}}-headers.tar.gz',
-+    'atom-shell/dist/{{VERSION}}/iojs-{{VERSION}}.tar.gz',
-+    'atom-shell/dist/{{VERSION}}/node-{{VERSION}}.tar.gz',
-+    'atom-shell/dist/{{VERSION}}/node.lib',
-+    'atom-shell/dist/{{VERSION}}/win-x64/iojs.lib',
-+    'atom-shell/dist/{{VERSION}}/win-x86/iojs.lib',
-+    'atom-shell/dist/{{VERSION}}/x64/node.lib',
-+    'atom-shell/dist/index.json'
-+  ]
-+  return patterns.map(pattern => bucket + pattern.replace(/{{VERSION}}/g, version))
-+}
-added in both
-  our    100755 84e00ad4f309201f151c3f8fcbaf9ee536c9b6cb script/release.js
-  their  100755 54379f8ff9ea9fc19a0ba3349c0019f23383b94f script/release.js
-@@ -1,8 +1,14 @@
- #!/usr/bin/env node
- 
-+<<<<<<< .our
- if (!process.env.CI) require('dotenv-safe').load()
- require('colors')
- const args = require('minimist')(process.argv.slice(2))
-+=======
-+require('colors')
-+const args = require('minimist')(process.argv.slice(2))
-+const assert = require('assert')
-+>>>>>>> .their
- const fs = require('fs')
- const { execSync } = require('child_process')
- const GitHub = require('github')
-@@ -16,16 +22,30 @@
- const sumchecker = require('sumchecker')
- const temp = require('temp').track()
- const { URL } = require('url')
-+<<<<<<< .our
- const targetRepo = pkgVersion.indexOf('nightly') > 0 ? 'nightlies' : 'electron'
- let failureCount = 0
- 
-+=======
-+let failureCount = 0
-+
-+assert(process.env.ELECTRON_GITHUB_TOKEN, 'ELECTRON_GITHUB_TOKEN not found in environment')
-+
-+>>>>>>> .their
- const github = new GitHub({
-   followRedirects: false
- })
- github.authenticate({type: 'token', token: process.env.ELECTRON_GITHUB_TOKEN})
-+<<<<<<< .our
- 
- async function getDraftRelease (version, skipValidation) {
-   let releaseInfo = await github.repos.getReleases({owner: 'electron', repo: targetRepo})
-+=======
-+const gitDir = path.resolve(__dirname, '..')
-+
-+async function getDraftRelease (version, skipValidation) {
-+  let releaseInfo = await github.repos.getReleases({owner: 'electron', repo: 'electron'})
-+>>>>>>> .their
-   let drafts
-   let versionToCheck
-   if (version) {
-@@ -49,8 +69,13 @@
-   return draft
- }
- 
-+<<<<<<< .our
- async function validateReleaseAssets (release, validatingRelease) {
-   const requiredAssets = assetsForVersion(release.tag_name, validatingRelease).sort()
-+=======
-+async function validateReleaseAssets (release) {
-+  const requiredAssets = assetsForVersion(release.tag_name).sort()
-+>>>>>>> .their
-   const extantAssets = release.assets.map(asset => asset.name).sort()
-   const downloadUrls = release.assets.map(asset => asset.browser_download_url).sort()
- 
-@@ -60,6 +85,7 @@
-   })
-   check((failureCount === 0), `All required GitHub assets exist for release`, true)
- 
-+<<<<<<< .our
-   if (!validatingRelease || !release.draft) {
-     if (release.draft) {
-       await verifyAssets(release)
-@@ -72,6 +98,18 @@
-     const s3Urls = s3UrlsForVersion(release.tag_name)
-     await verifyShasums(s3Urls, true)
-   }
-+=======
-+  if (release.draft) {
-+    await verifyAssets(release)
-+  } else {
-+    await verifyShasums(downloadUrls)
-+      .catch(err => {
-+        console.log(`${fail} error verifyingShasums`, err)
-+      })
-+  }
-+  const s3Urls = s3UrlsForVersion(release.tag_name)
-+  await verifyShasums(s3Urls, true)
-+>>>>>>> .their
- }
- 
- function check (condition, statement, exitIfFail = false) {
-@@ -84,13 +122,22 @@
-   }
- }
- 
-+<<<<<<< .our
- function assetsForVersion (version, validatingRelease) {
-+=======
-+function assetsForVersion (version) {
-+>>>>>>> .their
-   const patterns = [
-     `electron-${version}-darwin-x64-dsym.zip`,
-     `electron-${version}-darwin-x64-symbols.zip`,
-     `electron-${version}-darwin-x64.zip`,
-+<<<<<<< .our
-     `electron-${version}-linux-arm64-symbols.zip`,
-     `electron-${version}-linux-arm64.zip`,
-+=======
-+    `electron-${version}-linux-arm-symbols.zip`,
-+    `electron-${version}-linux-arm.zip`,
-+>>>>>>> .their
-     `electron-${version}-linux-armv7l-symbols.zip`,
-     `electron-${version}-linux-armv7l.zip`,
-     `electron-${version}-linux-ia32-symbols.zip`,
-@@ -109,17 +156,27 @@
-     `electron-api.json`,
-     `electron.d.ts`,
-     `ffmpeg-${version}-darwin-x64.zip`,
-+<<<<<<< .our
-     `ffmpeg-${version}-linux-arm64.zip`,
-+=======
-+    `ffmpeg-${version}-linux-arm.zip`,
-+>>>>>>> .their
-     `ffmpeg-${version}-linux-armv7l.zip`,
-     `ffmpeg-${version}-linux-ia32.zip`,
-     `ffmpeg-${version}-linux-x64.zip`,
-     `ffmpeg-${version}-mas-x64.zip`,
-     `ffmpeg-${version}-win32-ia32.zip`,
-+<<<<<<< .our
-     `ffmpeg-${version}-win32-x64.zip`
-   ]
-   if (!validatingRelease) {
-     patterns.push('SHASUMS256.txt')
-   }
-+=======
-+    `ffmpeg-${version}-win32-x64.zip`,
-+    `SHASUMS256.txt`
-+  ]
-+>>>>>>> .their
-   return patterns
- }
- 
-@@ -141,6 +198,7 @@
- }
- 
- function checkVersion () {
-+<<<<<<< .our
-   if (args.skipVersionCheck) return
- 
-   console.log(`Verifying that app version matches package version ${pkgVersion}.`)
-@@ -150,6 +208,11 @@
-     scriptArgs.unshift('-R')
-   }
-   let appVersion = runScript(startScript, scriptArgs).trim()
-+=======
-+  console.log(`Verifying that app version matches package version ${pkgVersion}.`)
-+  let startScript = path.join(__dirname, 'start.py')
-+  let appVersion = runScript(startScript, ['--version']).trim()
-+>>>>>>> .their
-   check((pkgVersion.indexOf(appVersion) === 0), `App version ${appVersion} matches ` +
-     `package version ${pkgVersion}.`, true)
- }
-@@ -180,7 +243,11 @@
- function uploadIndexJson () {
-   console.log('Uploading index.json to S3.')
-   let scriptPath = path.join(__dirname, 'upload-index-json.py')
-+<<<<<<< .our
-   runScript(scriptPath, [pkgVersion])
-+=======
-+  runScript(scriptPath, [])
-+>>>>>>> .their
-   console.log(`${pass} Done uploading index.json to S3.`)
- }
- 
-@@ -191,7 +258,11 @@
-     console.log(`${fileName} already exists on GitHub; deleting before creating new file.`)
-     await github.repos.deleteAsset({
-       owner: 'electron',
-+<<<<<<< .our
-       repo: targetRepo,
-+=======
-+      repo: 'electron',
-+>>>>>>> .their
-       id: existingAssets[0].id
-     }).catch(err => {
-       console.log(`${fail} Error deleting ${fileName} on GitHub:`, err)
-@@ -210,7 +281,11 @@
- async function uploadShasumFile (filePath, fileName, release) {
-   let githubOpts = {
-     owner: 'electron',
-+<<<<<<< .our
-     repo: targetRepo,
-+=======
-+    repo: 'electron',
-+>>>>>>> .their
-     id: release.id,
-     filePath,
-     name: fileName
-@@ -245,7 +320,11 @@
- async function publishRelease (release) {
-   let githubOpts = {
-     owner: 'electron',
-+<<<<<<< .our
-     repo: targetRepo,
-+=======
-+    repo: 'electron',
-+>>>>>>> .their
-     id: release.id,
-     tag_name: release.tag_name,
-     draft: false
-@@ -259,6 +338,7 @@
- 
- async function makeRelease (releaseToValidate) {
-   if (releaseToValidate) {
-+<<<<<<< .our
-     if (releaseToValidate === true) {
-       releaseToValidate = pkgVersion
-     } else {
-@@ -267,18 +347,31 @@
-     console.log(`Validating release ${releaseToValidate}`)
-     let release = await getDraftRelease(releaseToValidate)
-     await validateReleaseAssets(release, true)
-+=======
-+    console.log(`Validating release ${args.validateRelease}`)
-+    let release = await getDraftRelease(args.validateRelease)
-+    await validateReleaseAssets(release)
-+>>>>>>> .their
-   } else {
-     checkVersion()
-     let draftRelease = await getDraftRelease()
-     uploadNodeShasums()
-     uploadIndexJson()
-+<<<<<<< .our
- 
-+=======
-+>>>>>>> .their
-     await createReleaseShasums(draftRelease)
-     // Fetch latest version of release before verifying
-     draftRelease = await getDraftRelease(pkgVersion, true)
-     await validateReleaseAssets(draftRelease)
-+<<<<<<< .our
-     await tagLibCC()
-     await publishRelease(draftRelease)
-+=======
-+    await publishRelease(draftRelease)
-+    await cleanupReleaseBranch()
-+>>>>>>> .their
-     console.log(`${pass} SUCCESS!!! Release has been published. Please run ` +
-       `"npm run publish-to-npm" to publish release to npm.`)
-   }
-@@ -300,7 +393,11 @@
-   let downloadDir = await makeTempDir()
-   let githubOpts = {
-     owner: 'electron',
-+<<<<<<< .our
-     repo: targetRepo,
-+=======
-+    repo: 'electron',
-+>>>>>>> .their
-     headers: {
-       Accept: 'application/octet-stream'
-     }
-@@ -446,6 +543,7 @@
-     `shasums defined in ${validationArgs.shaSumFile}.`)
- }
- 
-+<<<<<<< .our
- async function tagLibCC () {
-   const tag = `electron-${pkg.version}`
-   const libccDir = path.join(path.resolve(__dirname, '..'), 'vendor', 'libchromiumcontent')
-@@ -462,6 +560,26 @@
-   } else {
-     console.log(`${fail} Error tagging libchromiumcontent with ${tag}: ` +
-       `${tagDetails.stderr}`)
-+=======
-+async function cleanupReleaseBranch () {
-+  console.log(`Cleaning up release branch.`)
-+  let errorMessage = `Could not delete local release branch.`
-+  let successMessage = `Successfully deleted local release branch.`
-+  await callGit(['branch', '-D', 'release-1-7-x'], errorMessage, successMessage)
-+  errorMessage = `Could not delete remote release branch.`
-+  successMessage = `Successfully deleted remote release branch.`
-+  return callGit(['push', 'origin', ':release'], errorMessage, successMessage)
-+}
-+
-+async function callGit (args, errorMessage, successMessage) {
-+  let gitResult = await GitProcess.exec(args, gitDir)
-+  if (gitResult.exitCode === 0) {
-+    console.log(`${pass} ${successMessage}`)
-+    return true
-+  } else {
-+    console.log(`${fail} ${errorMessage} ${gitResult.stderr}`)
-+    process.exit(1)
-+>>>>>>> .their
-   }
- }
- 
-changed in both
-  base   100755 94cdb4e9ce644b87fbe0d18ea8c7ad5234486250 script/update-external-binaries.py
-  our    100755 0bc9d0f632057f4a17aa811340ba21631433f173 script/update-external-binaries.py
-  their  100755 a207ad3a1a15e5b01eb85ba382267aa2594dbd98 script/update-external-binaries.py
-@@ -8,7 +8,12 @@
- from lib.util import add_exec_bit, download, extract_zip, rm_rf, \
-                      safe_mkdir, tempdir
- 
-+<<<<<<< .our
- VERSION = 'v1.4.0'
-+=======
-+
-+VERSION = 'v1.2.2'
-+>>>>>>> .their
- SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
- FRAMEWORKS_URL = 'http://github.com/electron/electron-frameworks/releases' \
-                  '/download/' + VERSION
-added in both
-  our    100644 2facda2daa1b8a8ccb63a28198a15b7e7ecb0880 script/upload-to-github.js
-  their  100644 7c3f8d9c11ce7b75f307850663efd2e571e8644a script/upload-to-github.js
-@@ -1,16 +1,24 @@
-+<<<<<<< .our
- if (!process.env.CI) require('dotenv-safe').load()
- 
-+=======
-+>>>>>>> .their
- const GitHub = require('github')
- const github = new GitHub()
- github.authenticate({type: 'token', token: process.env.ELECTRON_GITHUB_TOKEN})
- 
-+<<<<<<< .our
- if (process.argv.length < 6) {
-+=======
-+if (process.argv.length < 5) {
-+>>>>>>> .their
-   console.log('Usage: upload-to-github filePath fileName releaseId')
-   process.exit(1)
- }
- let filePath = process.argv[2]
- let fileName = process.argv[3]
- let releaseId = process.argv[4]
-+<<<<<<< .our
- let releaseVersion = process.argv[5]
- 
- const targetRepo = releaseVersion.indexOf('nightly') > 0 ? 'nightlies' : 'electron'
-@@ -18,6 +26,12 @@
- let githubOpts = {
-   owner: 'electron',
-   repo: targetRepo,
-+=======
-+
-+let githubOpts = {
-+  owner: 'electron',
-+  repo: 'electron',
-+>>>>>>> .their
-   id: releaseId,
-   filePath: filePath,
-   name: fileName
-@@ -39,7 +53,11 @@
-           console.log(`${fileName} already exists; will delete before retrying upload.`)
-           github.repos.deleteAsset({
-             owner: 'electron',
-+<<<<<<< .our
-             repo: targetRepo,
-+=======
-+            repo: 'electron',
-+>>>>>>> .their
-             id: existingAssets[0].id
-           }).then(uploadToGitHub).catch(uploadToGitHub)
-         } else {
-changed in both
-  base   100755 455ed789e0a081bc411adb02b75995bede18c25f script/upload.py
-  our    100755 2d9eaa201265971ca01acaea6e84a440e5db0532 script/upload.py
-  their  100755 4da630433812b51ff0ebbdf89f68c71d90ab8046 script/upload.py
-@@ -51,6 +51,7 @@
-     return 1
- 
-   tag_exists = False
-+<<<<<<< .our
-   release = get_release(args.version)
-   if not release['draft']:
-     tag_exists = True
-@@ -84,6 +85,55 @@
-     # Upload the x64 binary for arm/arm64 mksnapshot
-     mksnapshot = get_zip_name('mksnapshot', ELECTRON_VERSION, 'x64')
-     upload_electron(release, os.path.join(DIST_DIR, mksnapshot), args)
-+=======
-+  for r in releases:
-+    if not r['draft'] and r['tag_name'] == args.version:
-+      release = r
-+      tag_exists = True
-+      break
-+
-+  if not args.upload_to_s3:
-+    assert tag_exists == args.overwrite, \
-+          'You have to pass --overwrite to overwrite a published release'
-+    if not args.overwrite:
-+      release = create_or_get_release_draft(github, releases, args.version,
-+                                            tag_exists)
-+
-+  # Upload Electron with GitHub Releases API.
-+  upload_electron(github, release, os.path.join(DIST_DIR, DIST_NAME),
-+                  args.upload_to_s3)
-+  if get_target_arch() != 'mips64el':
-+    upload_electron(github, release, os.path.join(DIST_DIR, SYMBOLS_NAME),
-+                    args.upload_to_s3)
-+  if PLATFORM == 'darwin':
-+    upload_electron(github, release, os.path.join(DIST_DIR,
-+                    'electron-api.json'), args.upload_to_s3)
-+    upload_electron(github, release, os.path.join(DIST_DIR, 'electron.d.ts'),
-+                    args.upload_to_s3)
-+    upload_electron(github, release, os.path.join(DIST_DIR, DSYM_NAME),
-+                    args.upload_to_s3)
-+  elif PLATFORM == 'win32':
-+    upload_electron(github, release, os.path.join(DIST_DIR, PDB_NAME),
-+                    args.upload_to_s3)
-+
-+  # Upload free version of ffmpeg.
-+  ffmpeg = get_zip_name('ffmpeg', ELECTRON_VERSION)
-+  upload_electron(github, release, os.path.join(DIST_DIR, ffmpeg),
-+                  args.upload_to_s3)
-+
-+  # Upload chromedriver and mksnapshot for minor version update.
-+  if parse_version(args.version)[2] == '0':
-+    chromedriver = get_zip_name('chromedriver', ELECTRON_VERSION)
-+    upload_electron(github, release, os.path.join(DIST_DIR, chromedriver),
-+                    args.upload_to_s3)
-+    mksnapshot = get_zip_name('mksnapshot', ELECTRON_VERSION)
-+    upload_electron(github, release, os.path.join(DIST_DIR, mksnapshot),
-+                    args.upload_to_s3)
-+
-+  if PLATFORM == 'win32' and not tag_exists and not args.upload_to_s3:
-+    # Upload PDBs to Windows symbol server.
-+    run_python_script('upload-windows-pdb.py')
-+>>>>>>> .their
- 
-   if not tag_exists and not args.upload_to_s3:
-     # Upload symbols to symbol server.
-@@ -149,7 +199,66 @@
-   return dist_time > int(head_time)
- 
- 
-+<<<<<<< .our
- def upload_electron(release, file_path, args):
-+=======
-+def get_text_with_editor(name):
-+  editor = os.environ.get('EDITOR', 'nano')
-+  initial_message = '\n# Please enter the body of your release note for %s.' \
-+                    % name
-+
-+  t = tempfile.NamedTemporaryFile(suffix='.tmp', delete=False)
-+  t.write(initial_message)
-+  t.close()
-+  subprocess.call([editor, t.name])
-+
-+  text = ''
-+  for line in open(t.name, 'r'):
-+    if len(line) == 0 or line[0] != '#':
-+      text += line
-+
-+  os.unlink(t.name)
-+  return text
-+
-+def create_or_get_release_draft(github, releases, tag, tag_exists):
-+  # Search for existing draft.
-+  for release in releases:
-+    if release['draft'] and release['tag_name'] == tag:
-+      return release
-+
-+  if tag_exists:
-+    tag = 'do-not-publish-me'
-+  return create_release_draft(github, tag)
-+
-+
-+def create_release_draft(github, tag):
-+  name = '{0} {1} beta'.format(PROJECT_NAME, tag)
-+  if os.environ.has_key('CI'):
-+    body = '(placeholder)'
-+  else:
-+    body = get_text_with_editor(name)
-+  if body == '':
-+    sys.stderr.write('Quit due to empty release note.\n')
-+    sys.exit(0)
-+
-+  data = dict(tag_name=tag, name=name, body=body, draft=True, prerelease=True)
-+  r = github.repos(ELECTRON_REPO).releases.post(data=data)
-+  return r
-+
-+
-+def upload_electron(github, release, file_path, upload_to_s3):
-+
-+  # if upload_to_s3 is set, skip github upload.
-+  if upload_to_s3:
-+    bucket, access_key, secret_key = s3_config()
-+    key_prefix = 'electron-artifacts/{0}'.format(release['tag_name'])
-+    s3put(bucket, access_key, secret_key, os.path.dirname(file_path),
-+          key_prefix, [file_path])
-+    upload_sha256_checksum(release['tag_name'], file_path, key_prefix)
-+    return
-+
-+  # Delete the original file before uploading in CI.
-+>>>>>>> .their
-   filename = os.path.basename(file_path)
- 
-   # if upload_to_s3 is set, skip github upload.
-@@ -165,6 +274,7 @@
-     return
- 
-   # Upload the file.
-+<<<<<<< .our
-   upload_io_to_github(release, filename, file_path, args.version)
- 
-   # Upload the checksum file.
-@@ -177,6 +287,27 @@
-   script_path = os.path.join(SOURCE_ROOT, 'script', 'upload-to-github.js')
-   execute(['node', script_path, filepath, filename, str(release['id']),
-           version])
-+=======
-+  upload_io_to_github(release, filename, file_path)
-+
-+  # Upload the checksum file.
-+  upload_sha256_checksum(release['tag_name'], file_path)
-+
-+  # Upload ARM assets without the v7l suffix for backwards compatibility
-+  # TODO Remove for 2.0
-+  if 'armv7l' in filename:
-+    arm_filename = filename.replace('armv7l', 'arm')
-+    arm_file_path = os.path.join(os.path.dirname(file_path), arm_filename)
-+    shutil.copy2(file_path, arm_file_path)
-+    upload_electron(github, release, arm_file_path, upload_to_s3)
-+
-+
-+def upload_io_to_github(release, filename, filepath):
-+  print 'Uploading %s to Github' % \
-+      (filename)
-+  script_path = os.path.join(SOURCE_ROOT, 'script', 'upload-to-github.js')
-+  execute(['node', script_path, filepath, filename, str(release['id'])])
-+>>>>>>> .their
- 
- 
- def upload_sha256_checksum(version, file_path, key_prefix=None):
-changed in both
-  base   100644 1df816807ddb0fb20d91f9a6536381126ff9ebb7 spec/api-app-spec.js
-  our    100644 d224eda2989332c18d655cef05a8bacc2eb6d4b8 spec/api-app-spec.js
-  their  100644 a8c288e771ecb3f1fd8807f7dc9a776769395b03 spec/api-app-spec.js
-@@ -196,6 +196,7 @@
-     })
-   })
- 
-+<<<<<<< .our
-   // TODO(MarshallOfSound) - Remove in 4.0.0
-   describe('app.makeSingleInstance', () => {
-     it('prevents the second launch of app', function (done) {
-@@ -233,11 +234,41 @@
-           expect(code).to.equal(1)
-           done()
-         })
-+=======
-+  describe('app.makeSingleInstance', function () {
-+    it('prevents the second launch of app', function (done) {
-+      this.timeout(120000)
-+      const appPath = path.join(__dirname, 'fixtures', 'api', 'singleton')
-+      // First launch should exit with 0.
-+      let secondLaunched = false
-+      const first = ChildProcess.spawn(remote.process.execPath, [appPath])
-+      let launchOnce = true
-+      first.stdout.on('data', (data) => {
-+        if (data.toString().trim() === 'launched' && launchOnce) {
-+          launchOnce = false
-+          // Second launch should exit with 1.
-+          const second = ChildProcess.spawn(remote.process.execPath, [appPath])
-+          second.once('exit', (code) => {
-+            assert.ok(!secondLaunched)
-+            assert.equal(code, 1)
-+            secondLaunched = true
-+          })
-+        }
-+      })
-+      first.once('exit', (code) => {
-+        assert.ok(secondLaunched)
-+        assert.equal(code, 0)
-+        done()
-+>>>>>>> .their
-       })
-     })
-   })
- 
-+<<<<<<< .our
-   describe('app.relaunch', () => {
-+=======
-+  describe('app.relaunch', function () {
-+>>>>>>> .their
-     let server = null
-     const socketPath = process.platform === 'win32' ? '\\\\.\\pipe\\electron-app-relaunch' : '/tmp/electron-app-relaunch'
- 
-@@ -294,8 +325,16 @@
-     })
-   })
- 
-+<<<<<<< .our
-   xdescribe('app.importCertificate', () => {
-     let w = null
-+=======
-+  xdescribe('app.importCertificate', function () {
-+    if (process.platform !== 'linux') return
-+
-+    this.timeout(120000)
-+    var w = null
-+>>>>>>> .their
- 
-     before(function () {
-       if (process.platform !== 'linux') {
-@@ -535,7 +574,11 @@
-     })
-   })
- 
-+<<<<<<< .our
-   describe('select-client-certificate event', () => {
-+=======
-+  xdescribe('select-client-certificate event', function () {
-+>>>>>>> .their
-     let w = null
- 
-     before(function () {
-@@ -688,6 +731,54 @@
-         this.skip()
-       }
-     })
-+<<<<<<< .our
-+=======
-+
-+    it('does not launch for blacklisted argument', function (done) {
-+      const appPath = path.join(__dirname, 'fixtures', 'api', 'quit-app')
-+      // App should exit with non 123 code.
-+      const first = ChildProcess.spawn(remote.process.execPath, [appPath, 'electron-test://?', '--no-sandbox', '--gpu-launcher=cmd.exe /c start calc'])
-+      first.once('exit', (code) => {
-+        assert.notEqual(code, 123)
-+        done()
-+      })
-+    })
-+
-+    it('launches successfully for multiple uris in cmd args', function (done) {
-+      const appPath = path.join(__dirname, 'fixtures', 'api', 'quit-app')
-+      // App should exit with code 123.
-+      const first = ChildProcess.spawn(remote.process.execPath, [appPath, 'http://electronjs.org', 'electron-test://testdata'])
-+      first.once('exit', (code) => {
-+        assert.equal(code, 123)
-+        done()
-+      })
-+    })
-+
-+    it('does not launch for encoded space', function (done) {
-+      const appPath = path.join(__dirname, 'fixtures', 'api', 'quit-app')
-+      // App should exit with non 123 code.
-+      const first = ChildProcess.spawn(remote.process.execPath, [appPath, 'electron-test://?', '--no-sandbox', '--gpu-launcher%20"cmd.exe /c start calc'])
-+      first.once('exit', (code) => {
-+        assert.notEqual(code, 123)
-+        done()
-+      })
-+    })
-+
-+    it('launches successfully for argnames similar to blacklisted ones', function (done) {
-+      const appPath = path.join(__dirname, 'fixtures', 'api', 'quit-app')
-+      // inspect is blacklisted, but inspector should work, and app launch should succeed
-+      const first = ChildProcess.spawn(remote.process.execPath, [appPath, 'electron-test://?', '--inspector'])
-+      first.once('exit', (code) => {
-+        assert.equal(code, 123)
-+        done()
-+      })
-+    })
-+  })
-+
-+  describe('getFileIcon() API', function () {
-+    // FIXME Get these specs running on Linux CI
-+    if (process.platform === 'linux' && isCI) return
-+>>>>>>> .their
- 
-     it('does not launch for argument following a URL', done => {
-       const appPath = path.join(__dirname, 'fixtures', 'api', 'quit-app')
-changed in both
-  base   100644 52c9b5fb47e3f559785104958b65824d511fa986 spec/api-browser-window-spec.js
-  our    100644 f4cba12ec19d224bc46fca898db42a99baf4972e spec/api-browser-window-spec.js
-  their  100644 f4222145dba6f9e773d7d657cc688ad9efb55afa spec/api-browser-window-spec.js
-changed in both
-  base   100644 2f9f2b2795adbe396b683ed9854c6675a50d6ba4 spec/chromium-spec.js
-  our    100644 d90269769d269e4054d25cba4b6c4ac8a1929aa6 spec/chromium-spec.js
-  their  100644 e18b1a141eac068348eb34d064a357929b243a5f spec/chromium-spec.js
-@@ -319,8 +319,12 @@
-       b = window.open(windowUrl, '', 'nodeIntegration=no,show=no')
-     })
- 
-+<<<<<<< .our
-     // TODO(codebytere): re-enable this test
-     xit('disables node integration when it is disabled on the parent window for chrome devtools URLs', (done) => {
-+=======
-+    it('disables node integration when it is disabled on the parent window for chrome devtools URLs', (done) => {
-+>>>>>>> .their
-       let b
-       app.once('web-contents-created', (event, contents) => {
-         contents.once('did-finish-load', () => {
-added in both
-  our    100644 3202a7a180d6d48c70706d5ef244652872b24bbc spec/fixtures/api/singleton/main.js
-  their  100644 665987c8400f1183d009e3aad3bfab0860529de1 spec/fixtures/api/singleton/main.js
-@@ -1,5 +1,6 @@
- const {app} = require('electron')
- 
-+<<<<<<< .our
- app.once('ready', () => {
-   console.log('started')  // ping parent
- })
-@@ -11,5 +12,18 @@
- })
- 
- if (!gotTheLock) {
-+=======
-+console.log('launched')
-+
-+process.on('uncaughtException', () => {
-+  app.exit(2)
-+})
-+
-+const shouldExit = app.makeSingleInstance(() => {
-+  process.nextTick(() => app.exit(0))
-+})
-+
-+if (shouldExit) {
-+>>>>>>> .their
-   app.exit(1)
- }
-changed in both
-  base   100644 1211b3ea8bb8f45b69c4479ce9c4ce42a2d84373 spec/package.json
-  our    100644 37dec32f876cbe6a0b07b78922140397947a818a spec/package.json
-  their  100644 0bedddc69f0b1c930b90ced3f38726649e82fe49 spec/package.json
-@@ -13,11 +13,19 @@
-     "dirty-chai": "^2.0.1",
-     "graceful-fs": "^4.1.11",
-     "mkdirp": "^0.5.1",
-+<<<<<<< .our
-     "mocha": "^5.2.0",
-     "mocha-junit-reporter": "^1.17.0",
-     "multiparty": "^4.1.4",
-     "q": "^1.5.1",
-     "send": "^0.16.2",
-+=======
-+    "mocha": "^3.1.0",
-+    "mocha-junit-reporter": "^1.14.0",
-+    "multiparty": "^4.1.3",
-+    "q": "^1.4.1",
-+    "send": "^0.14.1",
-+>>>>>>> .their
-     "temp": "^0.8.3",
-     "walkdir": "0.0.12",
-     "winreg": "^1.2.4",
-changed in both
-  base   100644 74a9e6d278e9e96968d8e3b75303456b4a756825 spec/static/index.html
-  our    100644 fc1e153c0af2908cf7ee4c3ea4f05522de04f0f8 spec/static/index.html
-  their  100644 39f523f7d96b322ce39323040426ef517ee3c261 spec/static/index.html
-@@ -44,12 +44,24 @@
-   const { Coverage } = require('electabul')
-   const Mocha = require('mocha')
- 
-+<<<<<<< .our
-   const mocha = new Mocha(process.env.MOCHA_REPORTER
-     ? { reporter: process.env.MOCHA_REPORTER }
-     : undefined)
- 
-   if (!process.env.MOCHA_REPORTER) {
-     mocha.ui('bdd').reporter(isCi ? 'tap' : 'html')
-+=======
-+  var Mocha = require('mocha');
-+  var mochaOpts = {};
-+  if (process.env.MOCHA_REPORTER) {
-+    mochaOpts.reporter = process.env.MOCHA_REPORTER;
-+  }
-+  var mocha = new Mocha(mochaOpts);
-+
-+  if (!process.env.MOCHA_REPORTER) {
-+    mocha.ui('bdd').reporter(isCi ? 'tap' : 'html');
-+>>>>>>> .their
-   }
-   mocha.timeout(isCi ? 30000 : 10000)
- 
-changed in both
-  base   160000 92e2d6a9657444dfbdcb89f986c8705bdda3dccf vendor/libchromiumcontent
-  our    160000 c85470a1c379b1c4bedb372c146521bc4be9b75d vendor/libchromiumcontent
-  their  160000 2f7b83669315f9492380334d1a8b1cd9bc758efd vendor/libchromiumcontent
-changed in both
-  base   160000 dfa72e2c73e0442d27746e0f8716d0427f7f9b27 vendor/node
-  our    160000 ece0a06ac8147efb5b5af431c21f312f1884616e vendor/node
-  their  160000 a992f2ff412b85606ec1d4c1eb00ad832fa1e640 vendor/node
diff --git a/app/test/fixtures/merge-parser/electron/merge-docs-index-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-docs-index-into-master.txt
deleted file mode 100644
index 5af7994fddf..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-docs-index-into-master.txt
+++ /dev/null
@@ -1,343 +0,0 @@
-changed in both
-  base   100644 92bccccbd8f42cd6ae7f0db96b976967c64661ff docs/README.md
-  our    100644 f7b956e8feb95ceb64743ad260a1759e5a298afe docs/README.md
-  their  100644 88f3af820fac9e5b4ed49db19d6113c3bb4952c0 docs/README.md
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- # Official Guides
- 
- Please make sure that you use the documents that match your Electron version.
-@@ -8,6 +9,57 @@
- [browse by tag](https://github.com/electron/electron/tree/v1.4.0)
- on GitHub by opening the "Switch branches/tags" dropdown and selecting the tag
- that matches your version.
-+=======
-+# Guides to Electron Development
-+
-+- Development Environment
-+    - Setting up Windows
-+    - Setting up Mac
-+    - Setting up Linux
-+- Installing Electron
-+    - Global vs Local
-+    - [Versioning](tutorial/electron-versioning)
-+    - Alternatives (prebuilt-compile)
-+- Creating an App
-+    - Choosing an Editor
-+    - [Quick Start](tutorial/quick-start.md)
-+    - Boilerplates (.e.g. Typescript)
-+    - Electron Forge
-+- Electron APIs
-+    - Main and Renderer Processes
-+    - IPC
-+- User Interface
-+    - Browser Windows
-+    - Menus
-+    - Dialogs
-+    - Keyboard Shortcuts
-+- Chromium
-+    - Renderer Process
-+    - JavaScript Support
-+- Node
-+    - Renderer and Main Process
-+    - Node Core Modules
-+    - Using npm Modules
-+    - Native Modules
-+- Debugging
-+    - Chromium DevTools
-+    - Extensions
-+    - Devtron
-+    - Node Debugger
-+    - Userland Tools
-+- Testing
-+    - Unit Testing
-+    - Integration Testing
-+    - spectron
-+    - electron-mocha
-+- Security
-+    - Node Integration
-+    - Remote Content
-+- Signing
-+- Packaging 
-+- Releasing
-+- Updating
-+>>>>>>> .their
- 
- ## FAQ
- 
-added in remote
-  their  100644 cedae617e3289e13d9c2b5d83bef6c5dec3a794e docs/tutorial/processes.md
-@@ -0,0 +1,62 @@
-+# Processes
-+
-+## Main Process
-+
-+The main process, commonly a file named `main.js`, is the entry point to every
-+Electron app. It controls the life of the app, from open to close. It also
-+manages native elements such as the Menu, Menu Bar, Dock, Tray, etc.  The
-+main process is responsible for creating each new renderer process in the app.
-+The full Node API is built in.
-+
-+Every app's main process file is specified in the `main` property in
-+`package.json`. This is how `electron .` knows what file to execute at startup.
-+
-+In Chromium, this process is referred to as the "browser process". It is
-+renamed in Electron to avoid confusion with renderer processes.
-+
-+## Renderer Process
-+
-+The renderer process is a browser window in your app. Unlike the main process,
-+there can be multiple of these and each is run in a separate process.
-+They can also be hidden.
-+
-+In normal browsers, web pages usually run in a sandboxed environment and are not
-+allowed access to native resources. Electron users, however, have the power to
-+use Node.js APIs in web pages allowing lower level operating system
-+interactions.
-+
-+## Differences Between the Main Process and Renderer Process
-+
-+The main process creates web pages by creating `BrowserWindow` instances. Each
-+`BrowserWindow` instance runs the web page in its own renderer process. When a
-+`BrowserWindow` instance is destroyed, the corresponding renderer process
-+is also terminated.
-+
-+The main process manages all web pages and their corresponding renderer
-+processes. Each renderer process is isolated and only cares about the web page
-+running in it.
-+
-+In web pages, calling native GUI related APIs is not allowed because managing
-+native GUI resources in web pages is very dangerous and it is easy to leak
-+resources. If you want to perform GUI operations in a web page, the renderer
-+process of the web page must communicate with the main process to request that
-+the main process perform those operations.
-+
-+In Electron, we have several ways to communicate between the main process and
-+renderer processes. Like [`ipcRenderer`](api/ipc-renderer.md) and
-+[`ipcMain`](api/ipc-main.md) modules for sending messages, and the
-+[remote](api/remote.md) module for RPC style communication. There is also
-+an FAQ entry on [how to share data between web pages][share-data].
-+
-+### The `process` Global
-+
-+Like Node.js, all Electron processes have a `process` object which is 
-+available in both the main and renderer processes. It contains information 
-+about the currently running process. It inherits from the Node.js `process` 
-+object but includes additional information like the current versions of 
-+Chromium, V8, Node.js, etc.
-+
-+For more info, see the [`process` API documentation](api/process.md).
-+
-+[share-data]: faq.md#how-to-share-data-between-web-pages
-+
-changed in both
-  base   100644 a641a0d0c756011d74d0275fa6c453ca670ffddb docs/tutorial/quick-start.md
-  our    100644 dbc77f49051853ea6fd60357a814b088e5734383 docs/tutorial/quick-start.md
-  their  100644 9f4502372ecdb542905e80914f2849584c43302d docs/tutorial/quick-start.md
-@@ -8,6 +8,7 @@
- The old "Quick Start" document that used to live here has been split up into
- two documents:
- 
-+<<<<<<< .our
- * To check out how a simple Electron app is built, see
- [Writing Your First Electron App][first-app]
- * To check out the process architecture, see
-@@ -20,3 +21,198 @@
- [processes]: ./application-architecture.md#main-and-renderer-processes
- [readme]: ../
- 
-+=======
-+## Write your First Electron App
-+
-+Generally, an Electron app is structured like this:
-+
-+```text
-+your-app/
-+├── package.json
-+├── main.js
-+└── index.html
-+```
-+
-+The format of `package.json` is exactly the same as that of Node's modules, and
-+the script specified by the `main` field is the startup script of your app,
-+which will run the main process. An example of your `package.json` might look
-+like this:
-+
-+```json
-+{
-+  "name"    : "your-app",
-+  "version" : "0.1.0",
-+  "main"    : "main.js"
-+}
-+```
-+
-+__Note__: If the `main` field is not present in `package.json`, Electron will
-+attempt to load an `index.js`.
-+
-+The `main.js` should create windows and handle system events, a typical
-+example being:
-+
-+```javascript
-+const {app, BrowserWindow} = require('electron')
-+const path = require('path')
-+const url = require('url')
-+
-+// Keep a global reference of the window object, if you don't, the window will
-+// be closed automatically when the JavaScript object is garbage collected.
-+let win
-+
-+function createWindow () {
-+  // Create the browser window.
-+  win = new BrowserWindow({width: 800, height: 600})
-+
-+  // and load the index.html of the app.
-+  win.loadURL(url.format({
-+    pathname: path.join(__dirname, 'index.html'),
-+    protocol: 'file:',
-+    slashes: true
-+  }))
-+
-+  // Open the DevTools.
-+  win.webContents.openDevTools()
-+
-+  // Emitted when the window is closed.
-+  win.on('closed', () => {
-+    // Dereference the window object, usually you would store windows
-+    // in an array if your app supports multi windows, this is the time
-+    // when you should delete the corresponding element.
-+    win = null
-+  })
-+}
-+
-+// This method will be called when Electron has finished
-+// initialization and is ready to create browser windows.
-+// Some APIs can only be used after this event occurs.
-+app.on('ready', createWindow)
-+
-+// Quit when all windows are closed.
-+app.on('window-all-closed', () => {
-+  // On macOS it is common for applications and their menu bar
-+  // to stay active until the user quits explicitly with Cmd + Q
-+  if (process.platform !== 'darwin') {
-+    app.quit()
-+  }
-+})
-+
-+app.on('activate', () => {
-+  // On macOS it's common to re-create a window in the app when the
-+  // dock icon is clicked and there are no other windows open.
-+  if (win === null) {
-+    createWindow()
-+  }
-+})
-+
-+// In this file you can include the rest of your app's specific main process
-+// code. You can also put them in separate files and require them here.
-+```
-+
-+Finally the `index.html` is the web page you want to show:
-+
-+```html
-+<!DOCTYPE html>
-+<html>
-+  <head>
-+    <meta charset="UTF-8">
-+    <title>Hello World!</title>
-+  </head>
-+  <body>
-+    <h1>Hello World!</h1>
-+    We are using node <script>document.write(process.versions.node)</script>,
-+    Chrome <script>document.write(process.versions.chrome)</script>,
-+    and Electron <script>document.write(process.versions.electron)</script>.
-+  </body>
-+</html>
-+```
-+
-+## Run your app
-+
-+Once you've created your initial `main.js`, `index.html`, and `package.json` files,
-+you'll probably want to try running your app locally to test it and make sure it's
-+working as expected.
-+
-+### `electron`
-+
-+[`electron`](https://github.com/electron-userland/electron-prebuilt) is
-+an `npm` module that contains pre-compiled versions of Electron.
-+
-+If you've installed it globally with `npm`, then you will only need to run the
-+following in your app's source directory:
-+
-+```bash
-+electron .
-+```
-+
-+If you've installed it locally, then run:
-+
-+#### macOS / Linux
-+
-+```bash
-+$ ./node_modules/.bin/electron .
-+```
-+
-+#### Windows
-+
-+```
-+$ .\node_modules\.bin\electron .
-+```
-+
-+### Manually Downloaded Electron Binary
-+
-+If you downloaded Electron manually, you can also use the included
-+binary to execute your app directly.
-+
-+#### macOS
-+
-+```bash
-+$ ./Electron.app/Contents/MacOS/Electron your-app/
-+```
-+
-+#### Linux
-+
-+```bash
-+$ ./electron/electron your-app/
-+```
-+
-+#### Windows
-+
-+```
-+$ .\electron\electron.exe your-app\
-+```
-+
-+`Electron.app` here is part of the Electron's release package, you can download
-+it from [here](https://github.com/electron/electron/releases).
-+
-+### Run as a distribution
-+
-+After you're done writing your app, you can create a distribution by
-+following the [Application Distribution](./application-distribution.md) guide
-+and then executing the packaged app.
-+
-+### Try this Example
-+
-+Clone and run the code in this tutorial by using the [`electron/electron-quick-start`](https://github.com/electron/electron-quick-start)
-+repository.
-+
-+**Note**: Running this requires [Git](https://git-scm.com) and [Node.js](https://nodejs.org/en/download/) (which includes [npm](https://npmjs.org)) on your system.
-+
-+```bash
-+# Clone the repository
-+$ git clone https://github.com/electron/electron-quick-start
-+# Go into the repository
-+$ cd electron-quick-start
-+# Install dependencies
-+$ npm install
-+# Run the app
-+$ npm start
-+```
-+
-+For more example apps, see the
-+[list of boilerplates](https://electron.atom.io/community/#boilerplates)
-+created by the awesome electron community.
-+
-+[share-data]: ../faq.md#how-to-share-data-between-web-pages
-+>>>>>>> .their
diff --git a/app/test/fixtures/merge-parser/electron/merge-enable-pdf-plugin-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-enable-pdf-plugin-into-master.txt
deleted file mode 100644
index be099a5743c..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-enable-pdf-plugin-into-master.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-merged
-  result 100644 5022302700f45bd875996efdc27f43cd9d9b8b0a atom/app/atom_content_client.cc
-  our    100644 f17ae3137032f0b0e26eb735d37cfb3daaeebcfc atom/app/atom_content_client.cc
-@@ -30,6 +30,7 @@
- #if defined(ENABLE_PDF_VIEWER)
- #include "atom/common/atom_constants.h"
- #include "pdf/pdf.h"
-+#include "pdf/pdf_ppapi.h"
- #endif  // defined(ENABLE_PDF_VIEWER)
- 
- namespace atom {
-merged
-  result 100644 3621d64ef8b8077243b8c6038b39cbfca58fc89f atom/browser/atom_resource_dispatcher_host_delegate.cc
-  our    100644 934b0ebaa49b711490c58fc73b91985633cba439 atom/browser/atom_resource_dispatcher_host_delegate.cc
-@@ -17,7 +17,9 @@
- 
- #if defined(ENABLE_PDF_VIEWER)
- #include "atom/common/atom_constants.h"
-+#include "atom/common/options_switches.h"
- #include "base/strings/stringprintf.h"
-+#include "content/public/browser/download_request_utils.h"
- #include "content/public/browser/stream_info.h"
- #include "net/url_request/url_request.h"
- #endif  // defined(ENABLE_PDF_VIEWER)
-@@ -76,7 +78,7 @@
-         content::BrowserContext::GetDownloadManager(browser_context);
- 
-     download_manager->DownloadUrl(
--        content::DownloadUrlParameters::CreateForWebContentsMainFrame(
-+        content::DownloadRequestUtils::CreateDownloadForWebContentsMainFrame(
-             web_contents, original_url, NO_TRAFFIC_ANNOTATION_YET));
-     return;
-   }
-changed in both
-  base   100644 23d7d9907c2351fc3d7e6cd42a1e836524d727b1 features.gypi
-  our    100644 86543a4db1195223a3556fa71583038f15d79a0a features.gypi
-  their  100644 f8b835f7e436c99cc0b1ae0d6dcaa2fb855e4267 features.gypi
-@@ -3,8 +3,13 @@
-   'variables': {
-     'variables': {
-       'enable_desktop_capturer%': 1,
-+<<<<<<< .our
-       'enable_osr%': 1,
-       'enable_pdf_viewer%': 0,  # FIXME(deepak1556)
-+=======
-+      'enable_osr%': 0,  # FIXME(alexeykuzmin)
-+      'enable_pdf_viewer%': 1,  # FIXME(deepak1556)
-+>>>>>>> .their
-       'enable_run_as_node%': 1,
-       'enable_view_api%': 0,
-       'enable_pepper_flash%': 1,
diff --git a/app/test/fixtures/merge-parser/electron/merge-enable-weak-ptr-dcheck-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-enable-weak-ptr-dcheck-into-master.txt
deleted file mode 100644
index b827d62ac70..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-enable-weak-ptr-dcheck-into-master.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-changed in both
-  base   100644 8aec763b31771896ffc2a38a9ab80d3373f24a6c DEPS
-  our    100644 b3b9d650b27274f4f98f7408319b1e6b35f63abf DEPS
-  their  100644 8e71aa33161a9d4652625d8cd003b8d950eb7aed DEPS
-@@ -2,7 +2,11 @@
-   'chromium_version':
-     '66.0.3359.181',
-   'libchromiumcontent_revision':
-+<<<<<<< .our
-     'c85470a1c379b1c4bedb372c146521bc4be9b75d',
-+=======
-+    '40d7857234c85c05932eac11adae3c030c84d041',
-+>>>>>>> .their
-   'node_version':
-     'ece0a06ac8147efb5b5af431c21f312f1884616e',
- 
-changed in both
-  base   160000 5ff3486fc02a6a7b4b9e31d81034c4583c21114a vendor/libchromiumcontent
-  our    160000 c85470a1c379b1c4bedb372c146521bc4be9b75d vendor/libchromiumcontent
-  their  160000 40d7857234c85c05932eac11adae3c030c84d041 vendor/libchromiumcontent
diff --git a/app/test/fixtures/merge-parser/electron/merge-event-subscriber-clean-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-event-subscriber-clean-into-master.txt
deleted file mode 100644
index 9d2203c1c4d..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-event-subscriber-clean-into-master.txt
+++ /dev/null
@@ -1,885 +0,0 @@
-removed in remote
-  base   100644 6ad4610d5d541fd1ef7c1e811175a272ed0c06ce atom/browser/api/event_subscriber.cc
-  our    100644 afcd8012766c483d17ccee157f2edd078742733d atom/browser/api/event_subscriber.cc
-@@ -1,121 +0,0 @@
--// Copyright (c) 2017 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--#include <string>
--
--#include "atom/browser/api/event_subscriber.h"
--#include "atom/common/native_mate_converters/callback.h"
--
--namespace {
--
--// A FunctionTemplate lifetime is bound to the v8 context, so it can be safely
--// stored as a global here since there's only one for the main process.
--v8::Global<v8::FunctionTemplate> g_cached_template;
--
--struct JSHandlerData {
--  JSHandlerData(v8::Isolate* isolate,
--                mate::internal::EventSubscriberBase* subscriber)
--      : handle_(isolate, v8::External::New(isolate, this)),
--        subscriber_(subscriber) {
--    handle_.SetWeak(this, GC, v8::WeakCallbackType::kFinalizer);
--  }
--
--  static void GC(const v8::WeakCallbackInfo<JSHandlerData>& data) {
--    delete data.GetParameter();
--  }
--
--  v8::Global<v8::External> handle_;
--  mate::internal::EventSubscriberBase* subscriber_;
--};
--
--void InvokeCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
--  v8::Locker locker(info.GetIsolate());
--  v8::HandleScope handle_scope(info.GetIsolate());
--  v8::Local<v8::Context> context = info.GetIsolate()->GetCurrentContext();
--  v8::Context::Scope context_scope(context);
--  mate::Arguments args(info);
--  v8::Local<v8::Value> handler, event;
--  args.GetNext(&handler);
--  args.GetNext(&event);
--  DCHECK(handler->IsExternal());
--  DCHECK(event->IsString());
--  JSHandlerData* handler_data = static_cast<JSHandlerData*>(
--      v8::Local<v8::External>::Cast(handler)->Value());
--  handler_data->subscriber_->EventEmitted(mate::V8ToString(event), &args);
--}
--
--}  // namespace
--
--namespace mate {
--
--namespace internal {
--
--EventSubscriberBase::EventSubscriberBase(v8::Isolate* isolate,
--                                         v8::Local<v8::Object> emitter)
--    : isolate_(isolate), emitter_(isolate, emitter) {
--  if (g_cached_template.IsEmpty()) {
--    g_cached_template = v8::Global<v8::FunctionTemplate>(
--        isolate_, v8::FunctionTemplate::New(isolate_, InvokeCallback));
--  }
--}
--
--EventSubscriberBase::~EventSubscriberBase() {
--  if (!isolate_) {
--    return;
--  }
--  RemoveAllListeners();
--  emitter_.Reset();
--  DCHECK_EQ(js_handlers_.size(), 0u);
--}
--
--void EventSubscriberBase::On(const std::string& event_name) {
--  DCHECK(js_handlers_.find(event_name) == js_handlers_.end());
--  v8::Locker locker(isolate_);
--  v8::Isolate::Scope isolate_scope(isolate_);
--  v8::HandleScope handle_scope(isolate_);
--  auto fn_template = g_cached_template.Get(isolate_);
--  auto event = mate::StringToV8(isolate_, event_name);
--  auto* js_handler_data = new JSHandlerData(isolate_, this);
--  v8::Local<v8::Value> fn = internal::BindFunctionWith(
--      isolate_, isolate_->GetCurrentContext(), fn_template->GetFunction(),
--      js_handler_data->handle_.Get(isolate_), event);
--  js_handlers_.insert(
--      std::make_pair(event_name, v8::Global<v8::Value>(isolate_, fn)));
--  internal::ValueVector converted_args = {event, fn};
--  internal::CallMethodWithArgs(isolate_, emitter_.Get(isolate_), "on",
--                               &converted_args);
--}
--
--void EventSubscriberBase::Off(const std::string& event_name) {
--  v8::Locker locker(isolate_);
--  v8::Isolate::Scope isolate_scope(isolate_);
--  v8::HandleScope handle_scope(isolate_);
--  auto js_handler = js_handlers_.find(event_name);
--  DCHECK(js_handler != js_handlers_.end());
--  RemoveListener(js_handler);
--}
--
--void EventSubscriberBase::RemoveAllListeners() {
--  v8::Locker locker(isolate_);
--  v8::Isolate::Scope isolate_scope(isolate_);
--  v8::HandleScope handle_scope(isolate_);
--  while (!js_handlers_.empty()) {
--    RemoveListener(js_handlers_.begin());
--  }
--}
--
--std::map<std::string, v8::Global<v8::Value>>::iterator
--EventSubscriberBase::RemoveListener(
--    std::map<std::string, v8::Global<v8::Value>>::iterator it) {
--  internal::ValueVector args = {StringToV8(isolate_, it->first),
--                                it->second.Get(isolate_)};
--  internal::CallMethodWithArgs(
--      isolate_, v8::Local<v8::Object>::Cast(emitter_.Get(isolate_)),
--      "removeListener", &args);
--  it->second.Reset();
--  return js_handlers_.erase(it);
--}
--
--}  // namespace internal
--
--}  // namespace mate
-removed in remote
-  base   100644 8f09a61460a5aaa934f6d8c0129eaf7ba57ccb1e atom/browser/api/event_subscriber.h
-  our    100644 8e9dcf518d988978597582c147877c5f233b91ab atom/browser/api/event_subscriber.h
-@@ -1,139 +0,0 @@
--// Copyright (c) 2017 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_API_EVENT_SUBSCRIBER_H_
--#define ATOM_BROWSER_API_EVENT_SUBSCRIBER_H_
--
--#include <map>
--#include <string>
--
--#include "atom/common/api/event_emitter_caller.h"
--#include "base/synchronization/lock.h"
--#include "content/public/browser/browser_thread.h"
--#include "native_mate/arguments.h"
--
--namespace mate {
--
--namespace internal {
--
--class EventSubscriberBase {
-- public:
--  EventSubscriberBase(v8::Isolate* isolate, v8::Local<v8::Object> emitter);
--  virtual ~EventSubscriberBase();
--  virtual void EventEmitted(const std::string& event_name,
--                            mate::Arguments* args) = 0;
--
-- protected:
--  void On(const std::string& event_name);
--  void Off(const std::string& event_name);
--  void RemoveAllListeners();
--
-- private:
--  std::map<std::string, v8::Global<v8::Value>>::iterator RemoveListener(
--      std::map<std::string, v8::Global<v8::Value>>::iterator it);
--
--  v8::Isolate* isolate_;
--  v8::Global<v8::Object> emitter_;
--  std::map<std::string, v8::Global<v8::Value>> js_handlers_;
--
--  DISALLOW_COPY_AND_ASSIGN(EventSubscriberBase);
--};
--
--}  // namespace internal
--
--template <typename HandlerType>
--class EventSubscriber : internal::EventSubscriberBase {
-- public:
--  using EventCallback = void (HandlerType::*)(mate::Arguments* args);
--  // Alias to unique_ptr with deleter.
--  using unique_ptr = std::unique_ptr<EventSubscriber<HandlerType>,
--                                     void (*)(EventSubscriber<HandlerType>*)>;
--  // EventSubscriber should only be created/deleted in the main thread since it
--  // communicates with the V8 engine. This smart pointer makes it simpler to
--  // bind the lifetime of EventSubscriber with a class whose lifetime is managed
--  // by a non-UI thread.
--  class SafePtr : public unique_ptr {
--   public:
--    SafePtr() : SafePtr(nullptr) {}
--    explicit SafePtr(EventSubscriber<HandlerType>* ptr)
--        : unique_ptr(ptr, Deleter) {}
--
--   private:
--    // Custom deleter that schedules destructor invocation to the main thread.
--    static void Deleter(EventSubscriber<HandlerType>* ptr) {
--      DCHECK(
--          !::content::BrowserThread::CurrentlyOn(::content::BrowserThread::UI));
--      DCHECK(ptr);
--      // Acquire handler lock and reset handler_ to ensure that any new events
--      // emitted will be ignored after this function returns
--      base::AutoLock auto_lock(ptr->handler_lock_);
--      ptr->handler_ = nullptr;
--      content::BrowserThread::PostTask(
--          content::BrowserThread::UI, FROM_HERE,
--          base::BindOnce(
--              [](EventSubscriber<HandlerType>* subscriber) {
--                {
--                  // It is possible that this function will execute in the UI
--                  // thread before the outer function has returned and destroyed
--                  // its auto_lock. We need to acquire the lock before deleting
--                  // or risk a crash.
--                  base::AutoLock auto_lock(subscriber->handler_lock_);
--                }
--                delete subscriber;
--              },
--              ptr));
--    }
--  };
--
--  EventSubscriber(HandlerType* handler,
--                  v8::Isolate* isolate,
--                  v8::Local<v8::Object> emitter)
--      : EventSubscriberBase(isolate, emitter), handler_(handler) {
--    DCHECK_CURRENTLY_ON(::content::BrowserThread::UI);
--  }
--
--  void On(const std::string& event, EventCallback callback) {
--    DCHECK_CURRENTLY_ON(::content::BrowserThread::UI);
--    EventSubscriberBase::On(event);
--    callbacks_.insert(std::make_pair(event, callback));
--  }
--
--  void Off(const std::string& event) {
--    DCHECK_CURRENTLY_ON(::content::BrowserThread::UI);
--    EventSubscriberBase::Off(event);
--    DCHECK(callbacks_.find(event) != callbacks_.end());
--    callbacks_.erase(callbacks_.find(event));
--  }
--
--  void RemoveAllListeners() {
--    DCHECK_CURRENTLY_ON(::content::BrowserThread::UI);
--    EventSubscriberBase::RemoveAllListeners();
--    callbacks_.clear();
--  }
--
-- private:
--  void EventEmitted(const std::string& event_name,
--                    mate::Arguments* args) override {
--    DCHECK_CURRENTLY_ON(::content::BrowserThread::UI);
--    base::AutoLock auto_lock(handler_lock_);
--    if (!handler_) {
--      // handler_ was probably destroyed by another thread and we should not
--      // access it.
--      return;
--    }
--    auto it = callbacks_.find(event_name);
--    if (it != callbacks_.end()) {
--      auto method = it->second;
--      (handler_->*method)(args);
--    }
--  }
--
--  HandlerType* handler_;
--  base::Lock handler_lock_;
--  std::map<std::string, EventCallback> callbacks_;
--};
--
--}  // namespace mate
--
--#endif  // ATOM_BROWSER_API_EVENT_SUBSCRIBER_H_
-added in remote
-  their  100644 7954b0240eee95725eaca0e42358ef9e29c08f0b atom/browser/api/stream_subscriber.cc
-@@ -0,0 +1,114 @@
-+// Copyright (c) 2017 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "atom/browser/api/stream_subscriber.h"
-+
-+#include <string>
-+
-+#include "atom/browser/net/url_request_stream_job.h"
-+#include "atom/common/api/event_emitter_caller.h"
-+#include "atom/common/native_mate_converters/callback.h"
-+
-+#include "atom/common/node_includes.h"
-+
-+namespace mate {
-+
-+StreamSubscriber::StreamSubscriber(
-+    v8::Isolate* isolate,
-+    v8::Local<v8::Object> emitter,
-+    base::WeakPtr<atom::URLRequestStreamJob> url_job)
-+    : isolate_(isolate),
-+      emitter_(isolate, emitter),
-+      url_job_(url_job),
-+      weak_factory_(this) {
-+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-+  auto weak_self = weak_factory_.GetWeakPtr();
-+  On("data", base::Bind(&StreamSubscriber::OnData, weak_self));
-+  On("end", base::Bind(&StreamSubscriber::OnEnd, weak_self));
-+  On("error", base::Bind(&StreamSubscriber::OnError, weak_self));
-+}
-+
-+StreamSubscriber::~StreamSubscriber() {
-+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-+  RemoveAllListeners();
-+}
-+
-+void StreamSubscriber::On(const std::string& event, EventCallback&& callback) {  // NOLINT
-+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-+  DCHECK(js_handlers_.find(event) == js_handlers_.end());
-+
-+  v8::Locker locker(isolate_);
-+  v8::Isolate::Scope isolate_scope(isolate_);
-+  v8::HandleScope handle_scope(isolate_);
-+
-+  // emitter.on(event, EventEmitted)
-+  auto fn = CallbackToV8(isolate_, callback);
-+  js_handlers_[event] = v8::Global<v8::Value>(isolate_, fn);
-+  internal::ValueVector args = { StringToV8(isolate_, event), fn };
-+  internal::CallMethodWithArgs(isolate_, emitter_.Get(isolate_), "on", &args);
-+}
-+
-+void StreamSubscriber::Off(const std::string& event) {
-+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-+  DCHECK(js_handlers_.find(event) != js_handlers_.end());
-+
-+  v8::Locker locker(isolate_);
-+  v8::Isolate::Scope isolate_scope(isolate_);
-+  v8::HandleScope handle_scope(isolate_);
-+  auto js_handler = js_handlers_.find(event);
-+  DCHECK(js_handler != js_handlers_.end());
-+  RemoveListener(js_handler);
-+}
-+
-+void StreamSubscriber::OnData(mate::Arguments* args) {
-+  v8::Local<v8::Value> buf;
-+  args->GetNext(&buf);
-+  if (!node::Buffer::HasInstance(buf)) {
-+    args->ThrowError("data must be Buffer");
-+    return;
-+  }
-+
-+  const char* data = node::Buffer::Data(buf);
-+  size_t length = node::Buffer::Length(buf);
-+  if (length == 0)
-+    return;
-+
-+  // Pass the data to the URLJob in IO thread.
-+  std::vector<char> buffer(data, data + length);
-+  content::BrowserThread::PostTask(
-+      content::BrowserThread::IO, FROM_HERE,
-+      base::Bind(&atom::URLRequestStreamJob::OnData,
-+                 url_job_, base::Passed(&buffer)));
-+}
-+
-+void StreamSubscriber::OnEnd(mate::Arguments* args) {
-+  content::BrowserThread::PostTask(
-+      content::BrowserThread::IO, FROM_HERE,
-+      base::Bind(&atom::URLRequestStreamJob::OnEnd, url_job_));
-+}
-+
-+void StreamSubscriber::OnError(mate::Arguments* args) {
-+  content::BrowserThread::PostTask(
-+      content::BrowserThread::IO, FROM_HERE,
-+      base::Bind(&atom::URLRequestStreamJob::OnError, url_job_));
-+}
-+
-+void StreamSubscriber::RemoveAllListeners() {
-+  v8::Locker locker(isolate_);
-+  v8::Isolate::Scope isolate_scope(isolate_);
-+  v8::HandleScope handle_scope(isolate_);
-+  while (!js_handlers_.empty()) {
-+    RemoveListener(js_handlers_.begin());
-+  }
-+}
-+
-+void StreamSubscriber::RemoveListener(JSHandlersMap::iterator it) {
-+  internal::ValueVector args = { StringToV8(isolate_, it->first),
-+                                 it->second.Get(isolate_) };
-+  internal::CallMethodWithArgs(isolate_, emitter_.Get(isolate_),
-+                               "removeListener", &args);
-+  js_handlers_.erase(it);
-+}
-+
-+}  // namespace mate
-added in remote
-  their  100644 10184e4ec6c58dbdc0a4fa2ba5aa7a091a0032c4 atom/browser/api/stream_subscriber.h
-@@ -0,0 +1,57 @@
-+// Copyright (c) 2017 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ATOM_BROWSER_API_STREAM_SUBSCRIBER_H_
-+#define ATOM_BROWSER_API_STREAM_SUBSCRIBER_H_
-+
-+#include <map>
-+#include <string>
-+#include <vector>
-+
-+#include "base/callback.h"
-+#include "base/memory/weak_ptr.h"
-+#include "content/public/browser/browser_thread.h"
-+#include "v8/include/v8.h"
-+
-+namespace atom {
-+class URLRequestStreamJob;
-+}
-+
-+namespace mate {
-+
-+class Arguments;
-+
-+class StreamSubscriber {
-+ public:
-+  StreamSubscriber(v8::Isolate* isolate,
-+                  v8::Local<v8::Object> emitter,
-+                  base::WeakPtr<atom::URLRequestStreamJob> url_job);
-+  ~StreamSubscriber();
-+
-+ private:
-+  using JSHandlersMap = std::map<std::string, v8::Global<v8::Value>>;
-+  using EventCallback = base::Callback<void(mate::Arguments* args)>;
-+
-+  void On(const std::string& event, EventCallback&& callback);  // NOLINT
-+  void Off(const std::string& event);
-+
-+  void OnData(mate::Arguments* args);
-+  void OnEnd(mate::Arguments* args);
-+  void OnError(mate::Arguments* args);
-+
-+  void RemoveAllListeners();
-+  void RemoveListener(JSHandlersMap::iterator it);
-+
-+  v8::Isolate* isolate_;
-+  v8::Global<v8::Object> emitter_;
-+  base::WeakPtr<atom::URLRequestStreamJob> url_job_;
-+
-+  JSHandlersMap js_handlers_;
-+
-+  base::WeakPtrFactory<StreamSubscriber> weak_factory_;
-+};
-+
-+}  // namespace mate
-+
-+#endif  // ATOM_BROWSER_API_STREAM_SUBSCRIBER_H_
-changed in both
-  base   100644 99e4e74cd776fcb26a60beb1d0102010dc182b40 atom/browser/net/url_request_stream_job.cc
-  our    100644 f52e2822df8a783ac0c90ccaf6837cc17335ea29 atom/browser/net/url_request_stream_job.cc
-  their  100644 dbcefe431d14a0870a2b6de214c5f0583a973e99 atom/browser/net/url_request_stream_job.cc
-@@ -2,11 +2,12 @@
- // Use of this source code is governed by the MIT license that can be
- // found in the LICENSE file.
- 
-+#include "atom/browser/net/url_request_stream_job.h"
-+
- #include <algorithm>
- #include <ostream>
- #include <string>
- 
--#include "atom/browser/net/url_request_stream_job.h"
- #include "atom/common/api/event_emitter_caller.h"
- #include "atom/common/atom_constants.h"
- #include "atom/common/native_mate_converters/net_converter.h"
-@@ -14,6 +15,7 @@
- #include "base/strings/string_number_conversions.h"
- #include "base/strings/string_util.h"
- #include "base/time/time.h"
-+#include "net/base/net_errors.h"
- #include "net/filter/gzip_source_stream.h"
- 
- namespace atom {
-@@ -21,16 +23,32 @@
- URLRequestStreamJob::URLRequestStreamJob(net::URLRequest* request,
-                                          net::NetworkDelegate* network_delegate)
-     : JsAsker<net::URLRequestJob>(request, network_delegate),
-+<<<<<<< .our
-       weak_factory_(this) {}
- 
- URLRequestStreamJob::~URLRequestStreamJob() = default;
-+=======
-+      pending_buf_(nullptr),
-+      pending_buf_size_(0),
-+      ended_(false),
-+      has_error_(false),
-+      response_headers_(nullptr),
-+      weak_factory_(this) {}
-+
-+URLRequestStreamJob::~URLRequestStreamJob() {
-+  if (subscriber_) {
-+    content::BrowserThread::DeleteSoon(content::BrowserThread::UI, FROM_HERE,
-+                                       std::move(subscriber_));
-+  }
-+}
-+>>>>>>> .their
- 
- void URLRequestStreamJob::BeforeStartInUI(v8::Isolate* isolate,
-                                           v8::Local<v8::Value> value) {
-   if (value->IsNull() || value->IsUndefined() || !value->IsObject()) {
-     // Invalid opts.
-     ended_ = true;
--    errored_ = true;
-+    has_error_ = true;
-     return;
-   }
- 
-@@ -68,69 +86,89 @@
-       !data.Get("removeListener", &value) || !value->IsFunction()) {
-     // If data is passed but it is not a stream, signal an error.
-     ended_ = true;
--    errored_ = true;
-+    has_error_ = true;
-     return;
-   }
- 
--  subscriber_.reset(new mate::EventSubscriber<URLRequestStreamJob>(
--      this, isolate, data.GetHandle()));
--  subscriber_->On("data", &URLRequestStreamJob::OnData);
--  subscriber_->On("end", &URLRequestStreamJob::OnEnd);
--  subscriber_->On("error", &URLRequestStreamJob::OnError);
-+  subscriber_.reset(new mate::StreamSubscriber(isolate, data.GetHandle(),
-+                                              weak_factory_.GetWeakPtr()));
- }
- 
- void URLRequestStreamJob::StartAsync(std::unique_ptr<base::Value> options) {
-+  if (has_error_) {
-+    OnError();
-+    return;
-+  }
-   NotifyHeadersComplete();
- }
- 
--void URLRequestStreamJob::OnData(mate::Arguments* args) {
--  v8::Local<v8::Value> node_data;
--  args->GetNext(&node_data);
--  if (node_data->IsUint8Array()) {
--    const char* data = node::Buffer::Data(node_data);
--    size_t data_size = node::Buffer::Length(node_data);
--    std::copy(data, data + data_size, std::back_inserter(buffer_));
-+void URLRequestStreamJob::OnData(std::vector<char>&& buffer) {  // NOLINT
-+  if (write_buffer_.empty()) {
-+    // Quick branch without copying.
-+    write_buffer_ = std::move(buffer);
-   } else {
--    NOTREACHED();
-+    // write_buffer_ += buffer
-+    size_t len = write_buffer_.size();
-+    write_buffer_.resize(len + buffer.size());
-+    std::copy(buffer.begin(), buffer.end(), write_buffer_.begin() + len);
-   }
--  if (pending_io_buf_) {
--    CopyMoreData(pending_io_buf_, pending_io_buf_size_);
-+
-+  // Copy to output.
-+  if (pending_buf_) {
-+    int len = BufferCopy(&write_buffer_, pending_buf_.get(), pending_buf_size_);
-+    write_buffer_.erase(write_buffer_.begin(), write_buffer_.begin() + len);
-+    ReadRawDataComplete(len);
-   }
- }
- 
--void URLRequestStreamJob::OnEnd(mate::Arguments* args) {
-+void URLRequestStreamJob::OnEnd() {
-   ended_ = true;
--  if (pending_io_buf_) {
--    CopyMoreData(pending_io_buf_, pending_io_buf_size_);
--  }
-+  ReadRawDataComplete(0);
- }
- 
--void URLRequestStreamJob::OnError(mate::Arguments* args) {
--  errored_ = true;
--  if (pending_io_buf_) {
--    CopyMoreData(pending_io_buf_, pending_io_buf_size_);
--  }
-+void URLRequestStreamJob::OnError() {
-+  NotifyStartError(net::URLRequestStatus(net::URLRequestStatus::FAILED,
-+                                         net::ERR_FAILED));
- }
- 
- int URLRequestStreamJob::ReadRawData(net::IOBuffer* dest, int dest_size) {
-+<<<<<<< .our
-   content::BrowserThread::PostTask(
-       content::BrowserThread::UI, FROM_HERE,
-       base::BindOnce(&URLRequestStreamJob::CopyMoreData,
-                      weak_factory_.GetWeakPtr(), WrapRefCounted(dest),
-                      dest_size));
-   return net::ERR_IO_PENDING;
-+=======
-+  if (ended_)
-+    return 0;
-+
-+  // When write_buffer_ is empty, there is no data valable yet, we have to save
-+  // the dest buffer util DataAvailable.
-+  if (write_buffer_.empty()) {
-+    pending_buf_ = dest;
-+    pending_buf_size_ = dest_size;
-+    return net::ERR_IO_PENDING;
-+  }
-+
-+  // Read from the write buffer and clear them after reading.
-+  int len = BufferCopy(&write_buffer_, dest, dest_size);
-+  write_buffer_.erase(write_buffer_.begin(), write_buffer_.begin() + len);
-+  return len;
-+>>>>>>> .their
- }
- 
- void URLRequestStreamJob::DoneReading() {
--  subscriber_.reset();
--  buffer_.clear();
--  ended_ = true;
-+  content::BrowserThread::DeleteSoon(content::BrowserThread::UI, FROM_HERE,
-+                                     std::move(subscriber_));
-+  write_buffer_.clear();
- }
- 
- void URLRequestStreamJob::DoneReadingRedirectResponse() {
-   DoneReading();
- }
- 
-+<<<<<<< .our
- void URLRequestStreamJob::CopyMoreDataDone(scoped_refptr<net::IOBuffer> io_buf,
-                                            int status) {
-   if (status <= 0) {
-@@ -169,6 +207,8 @@
-   }
- }
- 
-+=======
-+>>>>>>> .their
- std::unique_ptr<net::SourceStream> URLRequestStreamJob::SetUpSourceStream() {
-   std::unique_ptr<net::SourceStream> source =
-       net::URLRequestJob::SetUpSourceStream();
-@@ -199,4 +239,11 @@
-   info->headers = response_headers_;
- }
- 
-+int URLRequestStreamJob::BufferCopy(std::vector<char>* source,
-+                                    net::IOBuffer* target, int target_size) {
-+  int bytes_written = std::min(static_cast<int>(source->size()), target_size);
-+  memcpy(target->data(), source->data(), bytes_written);
-+  return bytes_written;
-+}
-+
- }  // namespace atom
-changed in both
-  base   100644 372cad7e2d5f8c1039c9ac6d8bcfaf48cafd73d2 atom/browser/net/url_request_stream_job.h
-  our    100644 742ded7f1b95b3b76d636bb152f1e94d5937906a atom/browser/net/url_request_stream_job.h
-  their  100644 a967ca145322b9d424c0936a5d78f79089510c33 atom/browser/net/url_request_stream_job.h
-@@ -5,10 +5,11 @@
- #ifndef ATOM_BROWSER_NET_URL_REQUEST_STREAM_JOB_H_
- #define ATOM_BROWSER_NET_URL_REQUEST_STREAM_JOB_H_
- 
--#include <deque>
-+#include <memory>
- #include <string>
-+#include <vector>
- 
--#include "atom/browser/api/event_subscriber.h"
-+#include "atom/browser/api/stream_subscriber.h"
- #include "atom/browser/net/js_asker.h"
- #include "base/memory/ref_counted_memory.h"
- #include "native_mate/persistent_dictionary.h"
-@@ -25,9 +26,9 @@
-                       net::NetworkDelegate* network_delegate);
-   ~URLRequestStreamJob() override;
- 
--  void OnData(mate::Arguments* args);
--  void OnEnd(mate::Arguments* args);
--  void OnError(mate::Arguments* args);
-+  void OnData(std::vector<char>&& buffer);  // NOLINT
-+  void OnEnd();
-+  void OnError();
- 
-   // URLRequestJob
-   void GetResponseInfo(net::HttpResponseInfo* info) override;
-@@ -47,17 +48,29 @@
-   void StartAsync(std::unique_ptr<base::Value> options) override;
-   void OnResponse(bool success, std::unique_ptr<base::Value> value);
- 
--  // Callback after data is asynchronously read from the file into |buf|.
--  void CopyMoreData(scoped_refptr<net::IOBuffer> io_buf, int io_buf_size);
--  void CopyMoreDataDone(scoped_refptr<net::IOBuffer> io_buf, int read_count);
-+  int BufferCopy(std::vector<char>* source,
-+                 net::IOBuffer* target, int target_size);
- 
-+  // Saved arguments passed to ReadRawData.
-+  scoped_refptr<net::IOBuffer> pending_buf_;
-+  int pending_buf_size_;
-+
-+  // Saved arguments passed to OnData.
-+  std::vector<char> write_buffer_;
-+
-+<<<<<<< .our
-   std::deque<char> buffer_;
-   bool ended_ = false;
-   bool errored_ = false;
-   scoped_refptr<net::IOBuffer> pending_io_buf_;
-   int pending_io_buf_size_ = 0;
-+=======
-+  bool ended_;
-+  bool has_error_;
-+>>>>>>> .their
-   scoped_refptr<net::HttpResponseHeaders> response_headers_;
--  mate::EventSubscriber<URLRequestStreamJob>::SafePtr subscriber_;
-+  std::unique_ptr<mate::StreamSubscriber> subscriber_;
-+
-   base::WeakPtrFactory<URLRequestStreamJob> weak_factory_;
- 
-   DISALLOW_COPY_AND_ASSIGN(URLRequestStreamJob);
-changed in both
-  base   100644 0132ae7858279e5548ddfb73b75a4019c3539428 atom/common/native_mate_converters/callback.cc
-  our    100644 f33cec720ea5df1c17c8d02d4aa2b70d2979e13b atom/common/native_mate_converters/callback.cc
-  their  100644 62d928d2cdfa09b65073759d7ab77dd19c555181 atom/common/native_mate_converters/callback.cc
-@@ -4,6 +4,8 @@
- 
- #include "atom/common/native_mate_converters/callback.h"
- 
-+#include "native_mate/dictionary.h"
-+
- using content::BrowserThread;
- 
- namespace mate {
-@@ -13,6 +15,22 @@
- namespace {
- 
- struct TranslaterHolder {
-+  explicit TranslaterHolder(v8::Isolate* isolate)
-+      : handle(isolate, v8::External::New(isolate, this)) {
-+    handle.SetWeak(this, &GC, v8::WeakCallbackType::kFinalizer);
-+  }
-+  ~TranslaterHolder() {
-+    if (!handle.IsEmpty()) {
-+      handle.ClearWeak();
-+      handle.Reset();
-+    }
-+  }
-+
-+  static void GC(const v8::WeakCallbackInfo<TranslaterHolder>& data) {
-+    delete data.GetParameter();
-+  }
-+
-+  v8::Global<v8::External> handle;
-   Translater translater;
- };
- 
-@@ -22,20 +40,27 @@
- void CallTranslater(v8::Local<v8::External> external,
-                     v8::Local<v8::Object> state,
-                     mate::Arguments* args) {
-+  // Whether the callback should only be called for once.
-   v8::Isolate* isolate = args->isolate();
-+  bool one_time = state->Has(mate::StringToSymbol(isolate, "oneTime"));
- 
-   // Check if the callback has already been called.
--  v8::Local<v8::String> called_symbol = mate::StringToSymbol(isolate, "called");
--  if (state->Has(called_symbol)) {
--    args->ThrowError("callback can only be called for once");
--    return;
--  } else {
--    state->Set(called_symbol, v8::Boolean::New(isolate, true));
-+  if (one_time) {
-+    auto called_symbol = mate::StringToSymbol(isolate, "called");
-+    if (state->Has(called_symbol)) {
-+      args->ThrowError("callback can only be called for once");
-+      return;
-+    } else {
-+      state->Set(called_symbol, v8::Boolean::New(isolate, true));
-+    }
-   }
- 
-   TranslaterHolder* holder = static_cast<TranslaterHolder*>(external->Value());
-   holder->translater.Run(args);
--  delete holder;
-+
-+  // Free immediately for one-time callback.
-+  if (one_time)
-+    delete holder;
- }
- 
- }  // namespace
-@@ -90,8 +115,12 @@
- }
- 
- v8::Local<v8::Value> CreateFunctionFromTranslater(
-+<<<<<<< .our
-     v8::Isolate* isolate,
-     const Translater& translater) {
-+=======
-+    v8::Isolate* isolate, const Translater& translater, bool one_time) {
-+>>>>>>> .their
-   // The FunctionTemplate is cached.
-   if (g_call_translater.IsEmpty())
-     g_call_translater.Reset(isolate, mate::CreateFunctionTemplate(
-@@ -99,11 +128,22 @@
- 
-   v8::Local<v8::FunctionTemplate> call_translater =
-       v8::Local<v8::FunctionTemplate>::New(isolate, g_call_translater);
--  auto* holder = new TranslaterHolder;
-+  auto* holder = new TranslaterHolder(isolate);
-   holder->translater = translater;
-+<<<<<<< .our
-   return BindFunctionWith(
-       isolate, isolate->GetCurrentContext(), call_translater->GetFunction(),
-       v8::External::New(isolate, holder), v8::Object::New(isolate));
-+=======
-+  Dictionary state = mate::Dictionary::CreateEmpty(isolate);
-+  if (one_time)
-+    state.Set("oneTime", true);
-+  return BindFunctionWith(isolate,
-+                          isolate->GetCurrentContext(),
-+                          call_translater->GetFunction(),
-+                          holder->handle.Get(isolate),
-+                          state.GetHandle());
-+>>>>>>> .their
- }
- 
- // func.bind(func, arg1).
-changed in both
-  base   100644 fc93e83d312bd722227507610a9e26fd94e8111f atom/common/native_mate_converters/callback.h
-  our    100644 06140a3a7a7a928143e44e22113288b514409929 atom/common/native_mate_converters/callback.h
-  their  100644 a71ec2d212c20e88555e86d3c1c813223eb530bc atom/common/native_mate_converters/callback.h
-@@ -108,8 +108,13 @@
- 
- // Helper to pass a C++ funtion to JavaScript.
- using Translater = base::Callback<void(Arguments* args)>;
-+<<<<<<< .our
- v8::Local<v8::Value> CreateFunctionFromTranslater(v8::Isolate* isolate,
-                                                   const Translater& translater);
-+=======
-+v8::Local<v8::Value> CreateFunctionFromTranslater(
-+    v8::Isolate* isolate, const Translater& translater, bool one_time);
-+>>>>>>> .their
- v8::Local<v8::Value> BindFunctionWith(v8::Isolate* isolate,
-                                       v8::Local<v8::Context> context,
-                                       v8::Local<v8::Function> func,
-@@ -152,9 +157,17 @@
-                                    const base::RepeatingCallback<Sig>& val) {
-     // We don't use CreateFunctionTemplate here because it creates a new
-     // FunctionTemplate everytime, which is cached by V8 and causes leaks.
-+<<<<<<< .our
-     internal::Translater translater =
-         base::BindRepeating(&internal::NativeFunctionInvoker<Sig>::Go, val);
-     return internal::CreateFunctionFromTranslater(isolate, translater);
-+=======
-+    internal::Translater translater = base::Bind(
-+        &internal::NativeFunctionInvoker<Sig>::Go, val);
-+    // To avoid memory leak, we ensure that the callback can only be called
-+    // for once.
-+    return internal::CreateFunctionFromTranslater(isolate, translater, true);
-+>>>>>>> .their
-   }
-   static bool FromV8(v8::Isolate* isolate,
-                      v8::Local<v8::Value> val,
-@@ -168,6 +181,16 @@
-   }
- };
- 
-+// Convert a callback to V8 without the call number limitation, this can easily
-+// cause memory leaks so use it with caution.
-+template<typename Sig>
-+v8::Local<v8::Value> CallbackToV8(v8::Isolate* isolate,
-+                                  const base::Callback<Sig>& val) {
-+  internal::Translater translater = base::Bind(
-+      &internal::NativeFunctionInvoker<Sig>::Go, val);
-+  return internal::CreateFunctionFromTranslater(isolate, translater, false);
-+}
-+
- }  // namespace mate
- 
- #endif  // ATOM_COMMON_NATIVE_MATE_CONVERTERS_CALLBACK_H_
-changed in both
-  base   100644 e9f0f43b97ec2de992952404c00227f3075a791c filenames.gypi
-  our    100644 f57860558f06b7e5d8a50f48cfc7e53044df0bc6 filenames.gypi
-  their  100644 e5c5f50049c531d2dffcd563d9c9e4447cec90c0 filenames.gypi
-@@ -188,8 +188,8 @@
-       'atom/browser/api/event.h',
-       'atom/browser/api/event_emitter.cc',
-       'atom/browser/api/event_emitter.h',
--      'atom/browser/api/event_subscriber.cc',
--      'atom/browser/api/event_subscriber.h',
-+      'atom/browser/api/stream_subscriber.cc',
-+      'atom/browser/api/stream_subscriber.h',
-       'atom/browser/api/trackable_object.cc',
-       'atom/browser/api/trackable_object.h',
-       'atom/browser/api/frame_subscriber.cc',
diff --git a/app/test/fixtures/merge-parser/electron/merge-expect-browser-window-spec-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-expect-browser-window-spec-into-master.txt
deleted file mode 100644
index 62f10553859..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-expect-browser-window-spec-into-master.txt
+++ /dev/null
@@ -1,3980 +0,0 @@
-changed in both
-  base   100644 711354fd6dff0c7cd231a39ef6cfd1c71d80d035 spec/api-browser-window-spec.js
-  our    100644 f4cba12ec19d224bc46fca898db42a99baf4972e spec/api-browser-window-spec.js
-  their  100644 e08cb69dc2de9de419c8a6fa50f1818e9080d8b6 spec/api-browser-window-spec.js
-@@ -1,6 +1,9 @@
- 'use strict'
- 
-+<<<<<<< .our
- const assert = require('assert')
-+=======
-+>>>>>>> .their
- const chai = require('chai')
- const dirtyChai = require('dirty-chai')
- const fs = require('fs')
-@@ -9,7 +12,14 @@
- const qs = require('querystring')
- const http = require('http')
- const {closeWindow} = require('./window-helpers')
-+<<<<<<< .our
- const {emittedOnce} = require('./events-helpers')
-+=======
-+
-+const {expect} = chai
-+chai.use(dirtyChai)
-+
-+>>>>>>> .their
- const {ipcRenderer, remote, screen} = require('electron')
- const {app, ipcMain, BrowserWindow, BrowserView, protocol, session, webContents} = remote
- 
-@@ -18,15 +28,20 @@
- const isCI = remote.getGlobal('isCi')
- const nativeModulesEnabled = remote.getGlobal('nativeModulesEnabled')
- 
-+<<<<<<< .our
- chai.use(dirtyChai)
- 
- describe('BrowserWindow module', () => {
-+=======
-+describe.only('BrowserWindow module', () => {
-+>>>>>>> .their
-   const fixtures = path.resolve(__dirname, 'fixtures')
-   let w = null
-   let ws = null
-   let server
-   let postData
- 
-+<<<<<<< .our
-   const defaultOptions = {
-     show: false,
-     width: 400,
-@@ -48,8 +63,11 @@
-   const closeTheWindow = function () {
-     return closeWindow(w).then(() => { w = null })
-   }
-+=======
-+  const closeTheWindow = () => closeWindow(w).then(() => { w = null })
-+>>>>>>> .their
- 
--  before((done) => {
-+  before(done => {
-     const filePath = path.join(fixtures, 'pages', 'a.html')
-     const fileStats = fs.statSync(filePath)
-     postData = [
-@@ -69,7 +87,7 @@
-       function respond () {
-         if (req.method === 'POST') {
-           let body = ''
--          req.on('data', (data) => {
-+          req.on('data', data => {
-             if (data) body += data
-           })
-           req.on('end', () => {
-@@ -105,16 +123,22 @@
- 
-   describe('BrowserWindow constructor', () => {
-     it('allows passing void 0 as the webContents', () => {
-+<<<<<<< .our
-       openTheWindow({
-         webContents: void 0
-       })
-+=======
-+      w.close()
-+      w = null
-+      w = new BrowserWindow({ webContents: void 0 })
-+>>>>>>> .their
-     })
-   })
- 
-   describe('BrowserWindow.close()', () => {
-     let server
- 
--    before((done) => {
-+    before(done => {
-       server = http.createServer((request, response) => {
-         switch (request.url) {
-           case '/404':
-@@ -148,23 +172,26 @@
-       server = null
-     })
- 
--    it('should emit unload handler', (done) => {
-+    it('should emit unload handler', done => {
-       w.webContents.on('did-finish-load', () => { w.close() })
-       w.once('closed', () => {
-         const test = path.join(fixtures, 'api', 'unload')
-         const content = fs.readFileSync(test)
-         fs.unlinkSync(test)
--        assert.equal(String(content), 'unload')
-+
-+        expect(String(content)).to.equal('unload')
-         done()
-       })
--      w.loadURL('file://' + path.join(fixtures, 'api', 'unload.html'))
-+      w.loadURL(`file://${path.join(fixtures, 'api', 'unload.html')}`)
-     })
--    it('should emit beforeunload handler', (done) => {
-+
-+    it('should emit beforeunload handler', done => {
-       w.once('onbeforeunload', () => { done() })
-       w.webContents.on('did-finish-load', () => { w.close() })
-       w.loadURL(`file://${path.join(fixtures, 'api', 'beforeunload-false.html')}`)
-     })
--    it('should not crash when invoked synchronously inside navigation observer', (done) => {
-+
-+    it('should not crash when invoked synchronously inside navigation observer', done => {
-       const events = [
-         { name: 'did-start-loading', url: `${server.url}/200` },
-         { name: 'dom-ready', url: `${server.url}/200` },
-@@ -196,17 +223,19 @@
-   })
- 
-   describe('window.close()', () => {
--    it('should emit unload handler', (done) => {
-+    it('should emit unload handler', done => {
-       w.once('closed', () => {
-         const test = path.join(fixtures, 'api', 'close')
-         const content = fs.readFileSync(test)
-         fs.unlinkSync(test)
--        assert.equal(String(content), 'close')
-+
-+        expect(String(content)).to.equal('close')
-         done()
-       })
-       w.loadURL(`file://${path.join(fixtures, 'api', 'close.html')}`)
-     })
--    it('should emit beforeunload handler', (done) => {
-+
-+    it('should emit beforeunload handler', done => {
-       w.once('onbeforeunload', () => { done() })
-       w.loadURL(`file://${path.join(fixtures, 'api', 'close-beforeunload-false.html')}`)
-     })
-@@ -216,58 +245,104 @@
-     it('prevents users to access methods of webContents', () => {
-       const contents = w.webContents
-       w.destroy()
-+<<<<<<< .our
-       assert.throws(() => {
-         contents.getProcessId()
-       }, /Object has been destroyed/)
-+=======
-+      expect(() => {
-+        contents.getId()
-+      }).to.throw(/Object has been destroyed/)
-+>>>>>>> .their
-     })
-   })
- 
-   describe('BrowserWindow.loadURL(url)', () => {
--    it('should emit did-start-loading event', (done) => {
-+    it('should emit did-start-loading event', done => {
-       w.webContents.on('did-start-loading', () => { done() })
-       w.loadURL('about:blank')
-     })
--    it('should emit ready-to-show event', (done) => {
-+
-+    it('should emit ready-to-show event', done => {
-       w.on('ready-to-show', () => { done() })
-       w.loadURL('about:blank')
-     })
-+<<<<<<< .our
-     it('should emit did-fail-load event for files that do not exist', (done) => {
-+=======
-+
-+    // TODO(nitsakh): Deprecated
-+    it('should emit did-get-response-details(deprecated) event', done => {
-+      // expected {fileName: resourceType} pairs
-+      const expectedResources = {
-+        'did-get-response-details.html': 'mainFrame',
-+        'logo.png': 'image'
-+      }
-+
-+      let responses = 0
-+      w.webContents.on('-did-get-response-details', (event, status, newUrl, oldUrl, responseCode, method, referrer, headers, resourceType) => {
-+        responses += 1
-+        const fileName = newUrl.slice(newUrl.lastIndexOf('/') + 1)
-+        const expectedType = expectedResources[fileName]
-+
-+        expect(!!expectedType).to.be(true, `Unexpected response details for ${newUrl}`)
-+        expect(status).to.be.a('boolean', 'status should be boolean')
-+        expect(responseCode).to.equal(200)
-+        expect(method).to.equal('GET')
-+
-+        expect(referrer).to.be.a('string', 'referrer should be string')
-+        expect(!!headers).to.equal(true, 'headers should be present')
-+
-+        expect(headers).to.be.an('object', 'headers should be object')
-+        expect(resourceType).to.equal(expectedType, 'Incorrect resourceType')
-+
-+        if (responses === Object.keys(expectedResources).length) done()
-+      })
-+      w.loadURL(`file://${path.join(fixtures, 'pages', 'did-get-response-details.html')}`)
-+    })
-+
-+    it('should emit did-fail-load event for files that do not exist', done => {
-+>>>>>>> .their
-       w.webContents.on('did-fail-load', (event, code, desc, url, isMainFrame) => {
--        assert.equal(code, -6)
--        assert.equal(desc, 'ERR_FILE_NOT_FOUND')
--        assert.equal(isMainFrame, true)
-+        expect(code).to.equal(-6)
-+        expect(desc).to.equal('ERR_FILE_NOT_FOUND')
-+        expect(isMainFrame).equal(true)
-         done()
-       })
-       w.loadURL('file://a.txt')
-     })
--    it('should emit did-fail-load event for invalid URL', (done) => {
-+
-+    it('should emit did-fail-load event for invalid URL', done => {
-       w.webContents.on('did-fail-load', (event, code, desc, url, isMainFrame) => {
--        assert.equal(desc, 'ERR_INVALID_URL')
--        assert.equal(code, -300)
--        assert.equal(isMainFrame, true)
-+        expect(desc).to.equal('ERR_INVALID_URL')
-+        expect(code).to.equal(-300)
-+        expect(isMainFrame).to.equal(true)
-         done()
-       })
-       w.loadURL('http://example:port')
-     })
--    it('should set `mainFrame = false` on did-fail-load events in iframes', (done) => {
-+
-+    it('should set `mainFrame = false` on did-fail-load events in iframes', done => {
-       w.webContents.on('did-fail-load', (event, code, desc, url, isMainFrame) => {
--        assert.equal(isMainFrame, false)
-+        expect(isMainFrame).to.equal(false)
-         done()
-       })
-       w.loadURL(`file://${path.join(fixtures, 'api', 'did-fail-load-iframe.html')}`)
-     })
--    it('does not crash in did-fail-provisional-load handler', (done) => {
-+
-+    it('does not crash in did-fail-provisional-load handler', done => {
-       w.webContents.once('did-fail-provisional-load', () => {
-         w.loadURL('http://127.0.0.1:11111')
-         done()
-       })
-       w.loadURL('http://127.0.0.1:11111')
-     })
--    it('should emit did-fail-load event for URL exceeding character limit', (done) => {
-+
-+    it('should emit did-fail-load event for URL exceeding character limit', done => {
-       w.webContents.on('did-fail-load', (event, code, desc, url, isMainFrame) => {
--        assert.equal(desc, 'ERR_INVALID_URL')
--        assert.equal(code, -300)
--        assert.equal(isMainFrame, true)
-+        expect(desc).to.equal('ERR_INVALID_URL')
-+        expect(code).to.equal(-300)
-+        expect(isMainFrame).to.equal(true)
-         done()
-       })
-       const data = Buffer.alloc(2 * 1024 * 1024).toString('base64')
-@@ -277,14 +352,15 @@
-     describe('POST navigations', () => {
-       afterEach(() => { w.webContents.session.webRequest.onBeforeSendHeaders(null) })
- 
--      it('supports specifying POST data', (done) => {
-+      it('supports specifying POST data', done => {
-         w.webContents.on('did-finish-load', () => done())
-         w.loadURL(server.url, {postData: postData})
-       })
--      it('sets the content type header on URL encoded forms', (done) => {
-+
-+      it('sets the content type header on URL encoded forms', done => {
-         w.webContents.on('did-finish-load', () => {
-           w.webContents.session.webRequest.onBeforeSendHeaders((details, callback) => {
--            assert.equal(details.requestHeaders['content-type'], 'application/x-www-form-urlencoded')
-+            expect(details.requestHeaders['content-type']).to.equal('application/x-www-form-urlencoded')
-             done()
-           })
-           w.webContents.executeJavaScript(`
-@@ -297,10 +373,12 @@
-         })
-         w.loadURL(server.url)
-       })
--      it('sets the content type header on multi part forms', (done) => {
-+
-+      it('sets the content type header on multi part forms', done => {
-         w.webContents.on('did-finish-load', () => {
-           w.webContents.session.webRequest.onBeforeSendHeaders((details, callback) => {
--            assert(details.requestHeaders['content-type'].startsWith('multipart/form-data; boundary=----WebKitFormBoundary'))
-+            const headers = details.requestHeaders['content-type']
-+            expect(headers).includes('multipart/form-data; boundary=----WebKitFormBoundary')
-             done()
-           })
-           w.webContents.executeJavaScript(`
-@@ -320,9 +398,9 @@
-       })
-     })
- 
--    it('should support support base url for data urls', (done) => {
-+    it('should support support base url for data urls', done => {
-       ipcMain.once('answer', (event, test) => {
--        assert.equal(test, 'test')
-+        expect(test).to.equal('test')
-         done()
-       })
-       w.loadURL('data:text/html,<script src="loaded-from-dataurl.js"></script>', {baseURLForDataURL: `file://${path.join(fixtures, 'api')}${path.sep}`})
-@@ -330,7 +408,7 @@
-   })
- 
-   describe('will-navigate event', () => {
--    it('allows the window to be closed from the event listener', (done) => {
-+    it('allows the window to be closed from the event listener', done => {
-       ipcRenderer.send('close-on-will-navigate', w.id)
-       ipcRenderer.once('closed-on-will-navigate', () => { done() })
-       w.loadURL(`file://${fixtures}/pages/will-navigate.html`)
-@@ -346,15 +424,15 @@
- 
-     it('should focus on window', () => {
-       w.show()
--      assert(w.isFocused())
-+      expect(w.isFocused()).to.equal(true)
-     })
-     it('should make the window visible', () => {
-       w.show()
--      assert(w.isVisible())
-+      expect(w.isVisible()).to.equal(true)
-     })
--    it('emits when window is shown', (done) => {
-+    it('emits when window is shown', done => {
-       w.once('show', () => {
--        assert.equal(w.isVisible(), true)
-+        expect(w.isVisible()).to.equal(true)
-         done()
-       })
-       w.show()
-@@ -370,17 +448,19 @@
- 
-     it('should defocus on window', () => {
-       w.hide()
--      assert(!w.isFocused())
-+      expect(w.isFocused()).to.equal(false)
-     })
-+
-     it('should make the window not visible', () => {
-       w.show()
-       w.hide()
--      assert(!w.isVisible())
-+      expect(!w.isVisible()).to.equal(false)
-     })
--    it('emits when window is hidden', (done) => {
-+
-+    it('emits when window is hidden', done => {
-       w.show()
-       w.once('hide', () => {
--        assert.equal(w.isVisible(), false)
-+        expect(w.isVisible()).to.equal(false)
-         done()
-       })
-       w.hide()
-@@ -390,31 +470,36 @@
-   describe('BrowserWindow.showInactive()', () => {
-     it('should not focus on window', () => {
-       w.showInactive()
--      assert(!w.isFocused())
-+      expect(w.isFocused()).to.be(false)
-     })
-   })
- 
-   describe('BrowserWindow.focus()', () => {
-     it('does not make the window become visible', () => {
--      assert.equal(w.isVisible(), false)
-+      expect(w.isVisible()).to.equal(false)
-       w.focus()
--      assert.equal(w.isVisible(), false)
-+      expect(w.isVisible()).to.equal(false)
-     })
-   })
- 
-   describe('BrowserWindow.blur()', () => {
-     it('removes focus from window', () => {
-       w.blur()
--      assert(!w.isFocused())
-+      expect(w.isFocused()).to.equal(false)
-     })
-   })
- 
-+<<<<<<< .our
-   // TODO(alexeykuzmin): [Ch66] Enable the test. Passes locally.
-   xdescribe('BrowserWindow.getFocusedWindow()', (done) => {
-     it('returns the opener window when dev tools window is focused', (done) => {
-+=======
-+  describe('BrowserWindow.getFocusedWindow()', done => {
-+    it('returns the opener window when dev tools window is focused', done => {
-+>>>>>>> .their
-       w.show()
-       w.webContents.once('devtools-focused', () => {
--        assert.deepEqual(BrowserWindow.getFocusedWindow(), w)
-+        expect(BrowserWindow.getFocusedWindow()).to.deep.equal(w)
-         done()
-       })
-       w.webContents.openDevTools({mode: 'undocked'})
-@@ -422,6 +507,7 @@
-   })
- 
-   describe('BrowserWindow.capturePage(rect, callback)', () => {
-+<<<<<<< .our
-     it('calls the callback with a Buffer', async () => {
-       const image = await new Promise((resolve) => {
-         w.capturePage({
-@@ -430,19 +516,39 @@
-           width: 100,
-           height: 100
-         }, resolve)
-+=======
-+    it('calls the callback with a Buffer', done => {
-+      w.capturePage({
-+        x: 0,
-+        y: 0,
-+        width: 100,
-+        height: 100
-+      }, (image) => {
-+        expect(image.isEmpty()).to.equal(true)
-+        done()
-+>>>>>>> .their
-       })
- 
-       expect(image.isEmpty()).to.be.true()
-     })
- 
-+<<<<<<< .our
-     it('preserves transparency', async () => {
-       const w = await openTheWindow({
-+=======
-+    it('preserves transparency', done => {
-+      w.close()
-+      const width = 400
-+      const height = 400
-+      w = new BrowserWindow({
-+>>>>>>> .their
-         show: false,
-         width: 400,
-         height: 400,
-         transparent: true
-       })
-       w.loadURL('data:text/html,<html><body background-color: rgba(255,255,255,0)></body></html>')
-+<<<<<<< .our
-       await emittedOnce(w, 'ready-to-show')
-       w.show()
- 
-@@ -452,11 +558,27 @@
-       // Check the 25th byte in the PNG.
-       // Values can be 0,2,3,4, or 6. We want 6, which is RGB + Alpha
-       expect(imgBuffer[25]).to.equal(6)
-+=======
-+      w.once('ready-to-show', () => {
-+        w.show()
-+        w.capturePage((image) => {
-+          let imgBuffer = image.toPNG()
-+          // Check 25th byte in the PNG
-+          // Values can be 0,2,3,4, or 6. We want 6, which is RGB + Alpha
-+          expect(imgBuffer[25]).to.equal(6)
-+          done()
-+        })
-+      })
-+>>>>>>> .their
-     })
-   })
- 
-   describe('BrowserWindow.setSize(width, height)', () => {
-+<<<<<<< .our
-     it('sets the window size', async () => {
-+=======
-+    it('sets the window size', done => {
-+>>>>>>> .their
-       const size = [300, 400]
- 
-       const resized = emittedOnce(w, 'resize')
-@@ -469,8 +591,8 @@
- 
-   describe('BrowserWindow.setMinimum/MaximumSize(width, height)', () => {
-     it('sets the maximum and minimum size of the window', () => {
--      assert.deepEqual(w.getMinimumSize(), [0, 0])
--      assert.deepEqual(w.getMaximumSize(), [0, 0])
-+      expect(w.getMinimumSize()).to.deep.equal([0, 0])
-+      expect(w.getMaximumSize()).to.deep.equal([0, 0])
- 
-       w.setMinimumSize(100, 100)
-       assertBoundsEqual(w.getMinimumSize(), [100, 100])
-@@ -483,7 +605,7 @@
-   })
- 
-   describe('BrowserWindow.setAspectRatio(ratio)', () => {
--    it('resets the behaviour when passing in 0', (done) => {
-+    it('resets the behaviour when passing in 0', done => {
-       const size = [300, 400]
-       w.setAspectRatio(1 / 2)
-       w.setAspectRatio(0)
-@@ -496,12 +618,12 @@
-   })
- 
-   describe('BrowserWindow.setPosition(x, y)', () => {
--    it('sets the window position', (done) => {
-+    it('sets the window position', done => {
-       const pos = [10, 10]
-       w.once('move', () => {
-         const newPos = w.getPosition()
--        assert.equal(newPos[0], pos[0])
--        assert.equal(newPos[1], pos[1])
-+        expect(newPos[0]).to.equal(pos[0])
-+        expect(newPos[1]).to.equal(pos[1])
-         done()
-       })
-       w.setPosition(pos[0], pos[1])
-@@ -513,9 +635,10 @@
-       const size = [400, 400]
-       w.setContentSize(size[0], size[1])
-       var after = w.getContentSize()
--      assert.equal(after[0], size[0])
--      assert.equal(after[1], size[1])
-+      expect(after[0]).to.equal(size[0])
-+      expect(after[1]).to.equal(size[1])
-     })
-+
-     it('works for a frameless window', () => {
-       w.destroy()
-       w = new BrowserWindow({
-@@ -527,13 +650,13 @@
-       const size = [400, 400]
-       w.setContentSize(size[0], size[1])
-       const after = w.getContentSize()
--      assert.equal(after[0], size[0])
--      assert.equal(after[1], size[1])
-+      expect(after[0]).to.equal(size[0])
-+      expect(after[1]).to.equal(size[1])
-     })
-   })
- 
-   describe('BrowserWindow.setContentBounds(bounds)', () => {
--    it('sets the content size and position', (done) => {
-+    it('sets the content size and position', done => {
-       const bounds = {x: 10, y: 10, width: 250, height: 250}
-       w.once('resize', () => {
-         assertBoundsEqual(w.getContentBounds(), bounds)
-@@ -541,7 +664,8 @@
-       })
-       w.setContentBounds(bounds)
-     })
--    it('works for a frameless window', (done) => {
-+
-+    it('works for a frameless window', done => {
-       w.destroy()
-       w = new BrowserWindow({
-         show: false,
-@@ -551,7 +675,7 @@
-       })
-       const bounds = {x: 10, y: 10, width: 250, height: 250}
-       w.once('resize', () => {
--        assert.deepEqual(w.getContentBounds(), bounds)
-+        expect(w.getContentBounds()).to.deep.equal(bounds)
-         done()
-       })
-       w.setContentBounds(bounds)
-@@ -560,7 +684,7 @@
- 
-   describe('BrowserWindow.setProgressBar(progress)', () => {
-     it('sets the progress', () => {
--      assert.doesNotThrow(() => {
-+      expect(() => {
-         if (process.platform === 'darwin') {
-           app.dock.setIcon(path.join(fixtures, 'assets', 'logo.png'))
-         }
-@@ -570,35 +694,36 @@
-           app.dock.setIcon(null)
-         }
-         w.setProgressBar(-1)
--      })
-+      }).to.not.throw()
-     })
-+
-     it('sets the progress using "paused" mode', () => {
--      assert.doesNotThrow(() => {
--        w.setProgressBar(0.5, {mode: 'paused'})
--      })
-+      expect(() => { w.setProgressBar(0.5, {mode: 'paused'}) }).to.not.throw()
-     })
-+
-     it('sets the progress using "error" mode', () => {
--      assert.doesNotThrow(() => {
--        w.setProgressBar(0.5, {mode: 'error'})
--      })
-+      expect(() => { w.setProgressBar(0.5, {mode: 'error'}) })
-     })
-+
-     it('sets the progress using "normal" mode', () => {
--      assert.doesNotThrow(() => {
--        w.setProgressBar(0.5, {mode: 'normal'})
--      })
-+      expect(() => { w.setProgressBar(0.5, {mode: 'normal'}) }).to.not.throw()
-     })
-   })
- 
-   describe('BrowserWindow.setAlwaysOnTop(flag, level)', () => {
-     it('sets the window as always on top', () => {
--      assert.equal(w.isAlwaysOnTop(), false)
-+      expect(w.isAlwaysOnTop()).to.equal(false)
-+
-       w.setAlwaysOnTop(true, 'screen-saver')
--      assert.equal(w.isAlwaysOnTop(), true)
-+      expect(w.isAlwaysOnTop()).to.equal(true)
-+
-       w.setAlwaysOnTop(false)
--      assert.equal(w.isAlwaysOnTop(), false)
-+      expect(w.isAlwaysOnTop()).to.equal(false)
-+
-       w.setAlwaysOnTop(true)
--      assert.equal(w.isAlwaysOnTop(), true)
-+      expect(w.isAlwaysOnTop()).to.equal(true)
-     })
-+
-     it('raises an error when relativeLevel is out of bounds', function () {
-       if (process.platform !== 'darwin') {
-         // FIXME(alexeykuzmin): Skip the test instead of marking it as passed.
-@@ -609,13 +734,8 @@
-         return
-       }
- 
--      assert.throws(() => {
--        w.setAlwaysOnTop(true, '', -2147483644)
--      })
--
--      assert.throws(() => {
--        w.setAlwaysOnTop(true, '', 2147483632)
--      })
-+      expect(() => { w.setAlwaysOnTop(true, '', -2147483644) }).to.throw()
-+      expect(() => { w.setAlwaysOnTop(true, '', 2147483632) }).to.throw()
-     })
-   })
- 
-@@ -628,13 +748,16 @@
-     })
- 
-     it('resets the windows level on minimize', () => {
--      assert.equal(w.isAlwaysOnTop(), false)
-+      expect(w.isAlwaysOnTop()).to.equal(false)
-+
-       w.setAlwaysOnTop(true, 'screen-saver')
--      assert.equal(w.isAlwaysOnTop(), true)
-+      expect(w.isAlwaysOnTop()).to.equal(true)
-+
-       w.minimize()
--      assert.equal(w.isAlwaysOnTop(), false)
-+      expect(w.isAlwaysOnTop()).to.equal(false)
-+
-       w.restore()
--      assert.equal(w.isAlwaysOnTop(), true)
-+      expect(w.isAlwaysOnTop()).to.equal(true)
-     })
-   })
- 
-@@ -647,10 +770,10 @@
-       })
- 
-       it('allows changing cursor auto-hiding', () => {
--        assert.doesNotThrow(() => {
-+        expect(() => {
-           w.setAutoHideCursor(false)
-           w.setAutoHideCursor(true)
--        })
-+        }).to.not.throw()
-       })
-     })
- 
-@@ -662,7 +785,7 @@
-       })
- 
-       it('is not available', () => {
--        assert.ok(!w.setAutoHideCursor)
-+        expect(!w.setAutoHideCursor).to.equal(true)
-       })
-     })
-   })
-@@ -675,9 +798,7 @@
-     })
- 
-     it('does not throw', () => {
--      assert.doesNotThrow(() => {
--        w.selectPreviousTab()
--      })
-+      expect(() => { w.selectPreviousTab() }).to.not.throw()
-     })
-   })
- 
-@@ -689,9 +810,7 @@
-     })
- 
-     it('does not throw', () => {
--      assert.doesNotThrow(() => {
--        w.selectNextTab()
--      })
-+      expect(() => { w.selectNextTab() }).to.not.throw()
-     })
-   })
- 
-@@ -703,9 +822,7 @@
-     })
- 
-     it('does not throw', () => {
--      assert.doesNotThrow(() => {
--        w.mergeAllWindows()
--      })
-+      expect(() => { w.mergeAllWindows() }).to.not.throw()
-     })
-   })
- 
-@@ -717,9 +834,7 @@
-     })
- 
-     it('does not throw', () => {
--      assert.doesNotThrow(() => {
--        w.moveTabToNewWindow()
--      })
-+      expect(() => { w.moveTabToNewWindow() }).to.not.throw()
-     })
-   })
- 
-@@ -731,9 +846,7 @@
-     })
- 
-     it('does not throw', () => {
--      assert.doesNotThrow(() => {
--        w.toggleTabBar()
--      })
-+      expect(() => { w.toggleTabBar() }).to.not.throw()
-     })
-   })
- 
-@@ -744,24 +857,24 @@
-       }
-     })
- 
--    it('does not throw', (done) => {
-+    it('does not throw', done => {
-       const tabbedWindow = new BrowserWindow({})
--      assert.doesNotThrow(() => {
--        w.addTabbedWindow(tabbedWindow)
--      })
-+      expect(() => { w.addTabbedWindow(tabbedWindow) }).to.not.throw()
- 
--      assert.equal(BrowserWindow.getAllWindows().length, 3) // Test window + w + tabbedWindow
-+      // Test window + w + tabbedWindow
-+      expect(BrowserWindow.getAllWindows()).to.have.length(3)
- 
-       closeWindow(tabbedWindow, {assertSingleWindow: false}).then(() => {
--        assert.equal(BrowserWindow.getAllWindows().length, 2) // Test window + w
-+        // Test window + w
-+        expect(BrowserWindow.getAllWindows()).to.have.length(3)
-         done()
-       })
-     })
- 
-     it('throws when called on itself', () => {
--      assert.throws(() => {
-+      expect(() => {
-         w.addTabbedWindow(w)
--      }, /AddTabbedWindow cannot be called by a window on itself./)
-+      }).to.throw(/AddTabbedWindow cannot be called by a window on itself./)
-     })
-   })
- 
-@@ -794,13 +907,13 @@
- 
-   describe('BrowserWindow.setVibrancy(type)', () => {
-     it('allows setting, changing, and removing the vibrancy', () => {
--      assert.doesNotThrow(() => {
-+      expect(() => {
-         w.setVibrancy('light')
-         w.setVibrancy('dark')
-         w.setVibrancy(null)
-         w.setVibrancy('ultra-dark')
-         w.setVibrancy('')
--      })
-+      }).to.not.throw()
-     })
-   })
- 
-@@ -814,7 +927,7 @@
-     it('supports setting the app details', () => {
-       const iconPath = path.join(fixtures, 'assets', 'icon.ico')
- 
--      assert.doesNotThrow(() => {
-+      expect(() => {
-         w.setAppDetails({appId: 'my.app.id'})
-         w.setAppDetails({appIconPath: iconPath, appIconIndex: 0})
-         w.setAppDetails({appIconPath: iconPath})
-@@ -829,17 +942,17 @@
-           relaunchDisplayName: 'My app name'
-         })
-         w.setAppDetails({})
--      })
-+      }).to.not.throw()
- 
--      assert.throws(() => {
-+      expect(() => {
-         w.setAppDetails()
--      }, /Insufficient number of arguments\./)
-+      }).to.throw(/Insufficient number of arguments\./)
-     })
-   })
- 
-   describe('BrowserWindow.fromId(id)', () => {
-     it('returns the window with id', () => {
--      assert.equal(w.id, BrowserWindow.fromId(w.id).id)
-+      expect(w.id).to.equal(BrowserWindow.fromId(w.id).id)
-     })
-   })
- 
-@@ -851,8 +964,8 @@
-     afterEach(() => { contents.destroy() })
- 
-     it('returns the window with the webContents', () => {
--      assert.equal(BrowserWindow.fromWebContents(w.webContents).id, w.id)
--      assert.equal(BrowserWindow.fromWebContents(contents), undefined)
-+      expect(BrowserWindow.fromWebContents(w.webContents).id).to.equal(w.id)
-+      expect(BrowserWindow.fromWebContents(contents)).to.equal(undefined)
-     })
-   })
- 
-@@ -863,11 +976,11 @@
- 
-     afterEach(() => { contents.destroy() })
- 
--    it('returns the window with the webContents', (done) => {
-+    it('returns the window with the webContents', done => {
-       w.webContents.once('devtools-opened', () => {
--        assert.equal(BrowserWindow.fromDevToolsWebContents(w.devToolsWebContents).id, w.id)
--        assert.equal(BrowserWindow.fromDevToolsWebContents(w.webContents), undefined)
--        assert.equal(BrowserWindow.fromDevToolsWebContents(contents), undefined)
-+        expect(BrowserWindow.fromDevToolsWebContents(w.devToolsWebContents).id).to.equal(w.id)
-+        expect(BrowserWindow.fromDevToolsWebContents(w.webContents)).to.equal(undefined)
-+        expect(BrowserWindow.fromDevToolsWebContents(contents)).to.equal(undefined)
-         done()
-       })
-       w.webContents.openDevTools()
-@@ -896,12 +1009,12 @@
-     })
- 
-     it('returns the window with the browserView', () => {
--      assert.equal(BrowserWindow.fromBrowserView(bv).id, w.id)
-+      expect(BrowserWindow.fromBrowserView(bv).id).to.equal(w.id)
-     })
- 
-     it('returns undefined if not attached', () => {
-       w.setBrowserView(null)
--      assert.equal(BrowserWindow.fromBrowserView(bv), undefined)
-+      expect(BrowserWindow.fromBrowserView(bv)).to.equal(undefined)
-     })
-   })
- 
-@@ -914,16 +1027,17 @@
-         height: 400,
-         opacity: 0.5
-       })
--      assert.equal(w.getOpacity(), 0.5)
-+      expect(w.getOpacity()).to.equal(0.5)
-     })
-+
-     it('allows setting the opacity', () => {
--      assert.doesNotThrow(() => {
-+      expect(() => {
-         w.setOpacity(0.0)
--        assert.equal(w.getOpacity(), 0.0)
-+        expect(w.getOpacity()).to.equal(0.0)
-         w.setOpacity(0.5)
--        assert.equal(w.getOpacity(), 0.5)
-+        expect(w.getOpacity()).to.equal(0.5)
-         w.setOpacity(1.0)
--        assert.equal(w.getOpacity(), 1.0)
-+        expect(w.getOpacity()).to.equal(1.0)
-       })
-     })
-   })
-@@ -949,14 +1063,16 @@
-         useContentSize: true
-       })
-       const contentSize = w.getContentSize()
--      assert.equal(contentSize[0], 400)
--      assert.equal(contentSize[1], 400)
-+      expect(contentSize[0]).to.equal(400)
-+      expect(contentSize[1]).to.equal(400)
-     })
-+
-     it('make window created with window size when not used', () => {
-       const size = w.getSize()
--      assert.equal(size[0], 400)
--      assert.equal(size[1], 400)
-+      expect(size[0]).to.equal(400)
-+      expect(size[1]).to.equal(400)
-     })
-+
-     it('works for a frameless window', () => {
-       w.destroy()
-       w = new BrowserWindow({
-@@ -967,11 +1083,11 @@
-         useContentSize: true
-       })
-       const contentSize = w.getContentSize()
--      assert.equal(contentSize[0], 400)
--      assert.equal(contentSize[1], 400)
-+      expect(contentSize[0]).to.equal(400)
-+      expect(contentSize[1]).to.equal(400)
-       const size = w.getSize()
--      assert.equal(size[0], 400)
--      assert.equal(size[1], 400)
-+      expect(size[0]).to.equal(400)
-+      expect(size[1]).to.equal(400)
-     })
-   })
- 
-@@ -995,8 +1111,9 @@
-         titleBarStyle: 'hidden'
-       })
-       const contentSize = w.getContentSize()
--      assert.equal(contentSize[1], 400)
-+      expect(contentSize[1]).to.equal(400)
-     })
-+
-     it('creates browser window with hidden inset title bar', () => {
-       w.destroy()
-       w = new BrowserWindow({
-@@ -1006,7 +1123,7 @@
-         titleBarStyle: 'hiddenInset'
-       })
-       const contentSize = w.getContentSize()
--      assert.equal(contentSize[1], 400)
-+      expect(contentSize[1]).to.equal(400)
-     })
-   })
- 
-@@ -1030,9 +1147,10 @@
-     it('can move the window out of screen', () => {
-       w.setPosition(-10, -10)
-       const after = w.getPosition()
--      assert.equal(after[0], -10)
--      assert.equal(after[1], -10)
-+      expect(after[0]).to.equal(-10)
-+      expect(after[1]).to.equal(-10)
-     })
-+
-     it('can set the window larger than screen', () => {
-       const size = screen.getPrimaryDisplay().size
-       size.width += 100
-@@ -1058,7 +1176,7 @@
-         zoomToPageWidth: true
-       })
-       w.maximize()
--      assert.equal(w.getSize()[0], 500)
-+      expect(w.getSize()[0]).to.equal(500)
-     })
-   })
- 
-@@ -1080,10 +1198,10 @@
-     afterEach(() => { ipcMain.removeAllListeners('answer') })
- 
-     describe('"preload" option', () => {
--      it('loads the script before other scripts in window', (done) => {
-+      it('loads the script before other scripts in window', done => {
-         const preload = path.join(fixtures, 'module', 'set-global.js')
-         ipcMain.once('answer', (event, test) => {
--          assert.equal(test, 'preload')
-+          expect(test).to.equal('preload')
-           done()
-         })
-         w.destroy()
-@@ -1095,10 +1213,11 @@
-         })
-         w.loadURL(`file://${path.join(fixtures, 'api', 'preload.html')}`)
-       })
--      it('can successfully delete the Buffer global', (done) => {
-+
-+      it('can successfully delete the Buffer global', done => {
-         const preload = path.join(fixtures, 'module', 'delete-buffer.js')
-         ipcMain.once('answer', (event, test) => {
--          assert.equal(test.toString(), 'buffer')
-+          expect(test.toString()).to.equal('buffer')
-           done()
-         })
-         w.destroy()
-@@ -1112,7 +1231,7 @@
-       })
-     })
- 
--    describe('session preload scripts', function () {
-+    describe('session preload scripts', () => {
-       const preloads = [
-         path.join(fixtures, 'module', 'set-global-preload-1.js'),
-         path.join(fixtures, 'module', 'set-global-preload-2.js')
-@@ -1120,24 +1239,26 @@
-       const defaultSession = session.defaultSession
- 
-       beforeEach(() => {
--        assert.deepEqual(defaultSession.getPreloads(), [])
-+        expect(defaultSession.getPreloads()).to.deep.equal([])
-         defaultSession.setPreloads(preloads)
-       })
-+
-       afterEach(() => {
-         defaultSession.setPreloads([])
-       })
- 
--      it('can set multiple session preload script', function () {
--        assert.deepEqual(defaultSession.getPreloads(), preloads)
-+      it('can set multiple session preload script', () => {
-+        expect(defaultSession.getPreloads()).to.deep.equal(preloads)
-       })
- 
--      it('loads the script before other scripts in window including normal preloads', function (done) {
--        ipcMain.once('vars', function (event, preload1, preload2, preload3) {
--          assert.equal(preload1, 'preload-1')
--          assert.equal(preload2, 'preload-1-2')
--          assert.equal(preload3, 'preload-1-2-3')
-+      it('loads the script before other scripts in window including normal preloads', done => {
-+        ipcMain.once('vars', (event, preload1, preload2, preload3) => {
-+          expect(preload1).to.equal('preload-1')
-+          expect(preload2).to.equal('preload-1-2')
-+          expect(preload3).equal('preload-1-2-3')
-           done()
-         })
-+
-         w.destroy()
-         w = new BrowserWindow({
-           show: false,
-@@ -1145,15 +1266,15 @@
-             preload: path.join(fixtures, 'module', 'set-global-preload-3.js')
-           }
-         })
--        w.loadURL('file://' + path.join(fixtures, 'api', 'preloads.html'))
-+        w.loadURL(`file://${path.join(fixtures, 'api', 'preloads.html')}`)
-       })
-     })
- 
-     describe('"additionalArguments" option', () => {
--      it('adds extra args to process.argv in the renderer process', (done) => {
-+      it('adds extra args to process.argv in the renderer process', done => {
-         const preload = path.join(fixtures, 'module', 'check-arguments.js')
-         ipcMain.once('answer', (event, argv) => {
--          assert.ok(argv.includes('--my-magic-arg'))
-+          expect(argv).to.include('--my-magic-arg')
-           done()
-         })
-         w.destroy()
-@@ -1167,12 +1288,13 @@
-         w.loadURL(`file://${path.join(fixtures, 'api', 'blank.html')}`)
-       })
- 
--      it('adds extra value args to process.argv in the renderer process', (done) => {
-+      it('adds extra value args to process.argv in the renderer process', done => {
-         const preload = path.join(fixtures, 'module', 'check-arguments.js')
-         ipcMain.once('answer', (event, argv) => {
--          assert.ok(argv.includes('--my-magic-arg=foo'))
-+          expect(argv).to.include('--my-magic-arg=foo')
-           done()
-         })
-+
-         w.destroy()
-         w = new BrowserWindow({
-           show: false,
-@@ -1186,13 +1308,14 @@
-     })
- 
-     describe('"node-integration" option', () => {
--      it('disables node integration when specified to false', (done) => {
-+      it('disables node integration when specified to false', done => {
-         const preload = path.join(fixtures, 'module', 'send-later.js')
-         ipcMain.once('answer', (event, typeofProcess, typeofBuffer) => {
--          assert.equal(typeofProcess, 'undefined')
--          assert.equal(typeofBuffer, 'undefined')
-+          expect(typeofProcess).to.equal('undefined')
-+          expect(typeofBuffer).to.equal('undefined')
-           done()
-         })
-+
-         w.destroy()
-         w = new BrowserWindow({
-           show: false,
-@@ -1228,23 +1351,24 @@
-         })
-       }
- 
--      before((done) => {
-+      before(done => {
-         protocol.interceptStringProtocol('http', crossDomainHandler, () => {
-           done()
-         })
-       })
- 
--      after((done) => {
-+      after(done => {
-         protocol.uninterceptProtocol('http', () => {
-           done()
-         })
-       })
- 
--      it('exposes ipcRenderer to preload script', (done) => {
--        ipcMain.once('answer', function (event, test) {
--          assert.equal(test, 'preload')
-+      it('exposes ipcRenderer to preload script', done => {
-+        ipcMain.once('answer', (event, test) => {
-+          expect(test).to.equal('preload')
-           done()
-         })
-+
-         w.destroy()
-         w = new BrowserWindow({
-           show: false,
-@@ -1253,13 +1377,13 @@
-             preload: preload
-           }
-         })
--        w.loadURL('file://' + path.join(fixtures, 'api', 'preload.html'))
-+        w.loadURL(`file://${path.join(fixtures, 'api', 'preload.html')}`)
-       })
- 
--      it('exposes ipcRenderer to preload script (path has special chars)', function (done) {
-+      it('exposes ipcRenderer to preload script (path has special chars)', done => {
-         const preloadSpecialChars = path.join(fixtures, 'module', 'preload-sandboxæø åü.js')
--        ipcMain.once('answer', function (event, test) {
--          assert.equal(test, 'preload')
-+        ipcMain.once('answer', (event, test) => {
-+          expect(test).to.equal('preload')
-           done()
-         })
-         w.destroy()
-@@ -1270,10 +1394,10 @@
-             preload: preloadSpecialChars
-           }
-         })
--        w.loadURL('file://' + path.join(fixtures, 'api', 'preload.html'))
-+        w.loadURL(`file://${path.join(fixtures, 'api', 'preload.html')}`)
-       })
- 
--      it('exposes "exit" event to preload script', function (done) {
-+      it('exposes "exit" event to preload script', done => {
-         w.destroy()
-         w = new BrowserWindow({
-           show: false,
-@@ -1283,19 +1407,20 @@
-           }
-         })
-         let htmlPath = path.join(fixtures, 'api', 'sandbox.html?exit-event')
--        const pageUrl = 'file://' + htmlPath
-+        const pageUrl = `file://${htmlPath}`
-+
-         w.loadURL(pageUrl)
--        ipcMain.once('answer', function (event, url) {
-+        ipcMain.once('answer', (event, url) => {
-           let expectedUrl = pageUrl
-           if (process.platform === 'win32') {
--            expectedUrl = 'file:///' + htmlPath.replace(/\\/g, '/')
-+            expectedUrl = `file:///${htmlPath.replace(/\\/g, '/')}`
-           }
--          assert.equal(url, expectedUrl)
-+          expect(url).to.equal(expectedUrl)
-           done()
-         })
-       })
- 
--      it('should open windows in same domain with cross-scripting enabled', (done) => {
-+      it('should open windows in same domain with cross-scripting enabled', done => {
-         w.destroy()
-         w = new BrowserWindow({
-           show: false,
-@@ -1304,27 +1429,30 @@
-             preload: preload
-           }
-         })
-+
-         ipcRenderer.send('set-web-preferences-on-next-new-window', w.webContents.id, 'preload', preload)
-         let htmlPath = path.join(fixtures, 'api', 'sandbox.html?window-open')
--        const pageUrl = 'file://' + htmlPath
-+        const pageUrl = `file://${htmlPath}`
-         w.loadURL(pageUrl)
-+
-         w.webContents.once('new-window', (e, url, frameName, disposition, options) => {
-           let expectedUrl = pageUrl
-           if (process.platform === 'win32') {
--            expectedUrl = 'file:///' + htmlPath.replace(/\\/g, '/')
-+            expectedUrl = `file:///${htmlPath.replace(/\\/g, '/')}`
-           }
--          assert.equal(url, expectedUrl)
--          assert.equal(frameName, 'popup!')
--          assert.equal(options.width, 500)
--          assert.equal(options.height, 600)
--          ipcMain.once('answer', function (event, html) {
--            assert.equal(html, '<h1>scripting from opener</h1>')
-+          expect(url).to.equal(expectedUrl)
-+          expect(frameName).to.equal('popup!')
-+          expect(options.width).to.equal(500)
-+          expect(options.height).to.equal(600)
-+
-+          ipcMain.once('answer', (event, html) => {
-+            expect(html).equal('<h1>scripting from opener</h1>')
-             done()
-           })
-         })
-       })
- 
--      it('should open windows in another domain with cross-scripting disabled', (done) => {
-+      it('should open windows in another domain with cross-scripting disabled', done => {
-         w.destroy()
-         w = new BrowserWindow({
-           show: false,
-@@ -1333,20 +1461,23 @@
-             preload: preload
-           }
-         })
-+
-         ipcRenderer.send('set-web-preferences-on-next-new-window', w.webContents.id, 'preload', preload)
-         let htmlPath = path.join(fixtures, 'api', 'sandbox.html?window-open-external')
--        const pageUrl = 'file://' + htmlPath
-+        const pageUrl = `file://${htmlPath}`
-         let popupWindow
-         w.loadURL(pageUrl)
-+
-         w.webContents.once('new-window', (e, url, frameName, disposition, options) => {
--          assert.equal(url, 'http://www.google.com/#q=electron')
--          assert.equal(options.width, 505)
--          assert.equal(options.height, 605)
--          ipcMain.once('child-loaded', function (event, openerIsNull, html) {
--            assert(openerIsNull)
--            assert.equal(html, '<h1>http://www.google.com/#q=electron</h1>')
--            ipcMain.once('answer', function (event, exceptionMessage) {
--              assert(/Blocked a frame with origin/.test(exceptionMessage))
-+          expect(url).to.equal('http://www.google.com/#q=electron')
-+          expect(options.width).to.equal(505)
-+          expect(options.height).to.equal(605)
-+
-+          ipcMain.once('child-loaded', (event, openerIsNull, html) => {
-+            expect(openerIsNull).to.be.true()
-+            expect(html).to.equal('<h1>http://www.google.com/#q=electron</h1>')
-+            ipcMain.once('answer', (event, exceptionMessage) => {
-+              expect(/Blocked a frame with origin/.test(exceptionMessage)).to.be.true()
- 
-               // FIXME this popup window should be closed in sandbox.html
-               closeWindow(popupWindow, {assertSingleWindow: false}).then(() => {
-@@ -1358,12 +1489,12 @@
-           })
-         })
- 
--        app.once('browser-window-created', function (event, window) {
-+        app.once('browser-window-created', (event, window) => {
-           popupWindow = window
-         })
-       })
- 
--      it('should inherit the sandbox setting in opened windows', (done) => {
-+      it('should inherit the sandbox setting in opened windows', done => {
-         w.destroy()
-         w = new BrowserWindow({
-           show: false,
-@@ -1375,13 +1506,13 @@
-         const preloadPath = path.join(fixtures, 'api', 'new-window-preload.js')
-         ipcRenderer.send('set-web-preferences-on-next-new-window', w.webContents.id, 'preload', preloadPath)
-         ipcMain.once('answer', (event, args) => {
--          assert.equal(args.includes('--enable-sandbox'), true)
-+          expect(args).to.include('--enable-sandbox')
-           done()
-         })
-         w.loadURL(`file://${path.join(fixtures, 'api', 'new-window.html')}`)
-       })
- 
--      it('should open windows with the options configured via new-window event listeners', (done) => {
-+      it('should open windows with the options configured via new-window event listeners', done => {
-         w.destroy()
-         w = new BrowserWindow({
-           show: false,
-@@ -1394,13 +1525,13 @@
-         ipcRenderer.send('set-web-preferences-on-next-new-window', w.webContents.id, 'preload', preloadPath)
-         ipcRenderer.send('set-web-preferences-on-next-new-window', w.webContents.id, 'foo', 'bar')
-         ipcMain.once('answer', (event, args, webPreferences) => {
--          assert.equal(webPreferences.foo, 'bar')
-+          expect(webPreferences.foo).to.equal('bar')
-           done()
-         })
-         w.loadURL(`file://${path.join(fixtures, 'api', 'new-window.html')}`)
-       })
- 
--      it('should set ipc event sender correctly', (done) => {
-+      it('should set ipc event sender correctly', done => {
-         w.destroy()
-         w = new BrowserWindow({
-           show: false,
-@@ -1409,24 +1540,31 @@
-             preload: preload
-           }
-         })
-+<<<<<<< .our
-         ipcRenderer.send('set-web-preferences-on-next-new-window', w.webContents.id, 'preload', preload)
-+=======
-+>>>>>>> .their
- 
-         let htmlPath = path.join(fixtures, 'api', 'sandbox.html?verify-ipc-sender')
--        const pageUrl = 'file://' + htmlPath
-+        const pageUrl = `file://${htmlPath}`
-         let childWc
-+
-         w.webContents.once('new-window', (e, url, frameName, disposition, options) => {
-           childWc = options.webContents
--          assert.notEqual(w.webContents, childWc)
-+          expect(w.webContents).to.not.equal(childWc)
-         })
--        ipcMain.once('parent-ready', function (event) {
--          assert.equal(w.webContents, event.sender)
-+
-+        ipcMain.once('parent-ready', event => {
-+          expect(w.webContents).to.equal(event.sender)
-           event.sender.send('verified')
-         })
--        ipcMain.once('child-ready', function (event) {
--          assert(childWc)
--          assert.equal(childWc, event.sender)
-+
-+        ipcMain.once('child-ready', event => {
-+          expect(childWc).to.exist()
-+          expect(childWc).to.equal(event.sender)
-           event.sender.send('verified')
-         })
-+
-         waitForEvents(ipcMain, [
-           'parent-answer',
-           'child-answer'
-@@ -1435,23 +1573,23 @@
-       })
- 
-       describe('event handling', () => {
--        it('works for window events', (done) => {
-+        it('works for window events', done => {
-           waitForEvents(w, [
-             'page-title-updated'
-           ], done)
--          w.loadURL('file://' + path.join(fixtures, 'api', 'sandbox.html?window-events'))
-+          w.loadURL(`file://${path.join(fixtures, 'api', 'sandbox.html?window-events')}`)
-         })
- 
--        it('works for stop events', (done) => {
-+        it('works for stop events', done => {
-           waitForEvents(w.webContents, [
-             'did-navigate',
-             'did-fail-load',
-             'did-stop-loading'
-           ], done)
--          w.loadURL('file://' + path.join(fixtures, 'api', 'sandbox.html?webcontents-stop'))
-+          w.loadURL(`file://${path.join(fixtures, 'api', 'sandbox.html?webcontents-stop')}`)
-         })
- 
--        it('works for web contents events', (done) => {
-+        it('works for web contents events', done => {
-           waitForEvents(w.webContents, [
-             'did-finish-load',
-             'did-frame-finish-load',
-@@ -1462,11 +1600,11 @@
-             'did-frame-finish-load',
-             'dom-ready'
-           ], done)
--          w.loadURL('file://' + path.join(fixtures, 'api', 'sandbox.html?webcontents-events'))
-+          w.loadURL(`file://${path.join(fixtures, 'api', 'sandbox.html?webcontents-events')}`)
-         })
-       })
- 
--      it('can get printer list', (done) => {
-+      it('can get printer list', done => {
-         w.destroy()
-         w = new BrowserWindow({
-           show: false,
-@@ -1475,15 +1613,16 @@
-             preload: preload
-           }
-         })
-+
-         w.loadURL('data:text/html,%3Ch1%3EHello%2C%20World!%3C%2Fh1%3E')
-         w.webContents.once('did-finish-load', () => {
-           const printers = w.webContents.getPrinters()
--          assert.equal(Array.isArray(printers), true)
-+          expect(printers).to.be.an('array')
-           done()
-         })
-       })
- 
--      it('can print to PDF', (done) => {
-+      it('can print to PDF', done => {
-         w.destroy()
-         w = new BrowserWindow({
-           show: false,
-@@ -1492,18 +1631,19 @@
-             preload: preload
-           }
-         })
-+
-         w.loadURL('data:text/html,%3Ch1%3EHello%2C%20World!%3C%2Fh1%3E')
-         w.webContents.once('did-finish-load', () => {
--          w.webContents.printToPDF({}, function (error, data) {
--            assert.equal(error, null)
--            assert.equal(data instanceof Buffer, true)
--            assert.notEqual(data.length, 0)
-+          w.webContents.printToPDF({}, (error, data) => {
-+            expect(error).to.be.null()
-+            expect(data).to.be.an.instanceOf('Buffer')
-+            expect(data.length).to.not.equal(0)
-             done()
-           })
-         })
-       })
- 
--      it('supports calling preventDefault on new-window events', (done) => {
-+      it('supports calling preventDefault on new-window events', done => {
-         w.destroy()
-         w = new BrowserWindow({
-           show: false,
-@@ -1511,20 +1651,21 @@
-             sandbox: true
-           }
-         })
-+
-         const initialWebContents = webContents.getAllWebContents().map((i) => i.id)
-         ipcRenderer.send('prevent-next-new-window', w.webContents.id)
-         w.webContents.once('new-window', () => {
-           // We need to give it some time so the windows get properly disposed (at least on OSX).
-           setTimeout(() => {
-             const currentWebContents = webContents.getAllWebContents().map((i) => i.id)
--            assert.deepEqual(currentWebContents, initialWebContents)
-+            expect(currentWebContents).to.deep.equal(initialWebContents)
-             done()
-           }, 100)
-         })
--        w.loadURL('file://' + path.join(fixtures, 'pages', 'window-open.html'))
-+        w.loadURL(`file://${path.join(fixtures, 'pages', 'window-open.html')}`)
-       })
- 
--      it('releases memory after popup is closed', (done) => {
-+      it('releases memory after popup is closed', done => {
-         w.destroy()
-         w = new BrowserWindow({
-           show: false,
-@@ -1533,21 +1674,22 @@
-             sandbox: true
-           }
-         })
--        w.loadURL('file://' + path.join(fixtures, 'api', 'sandbox.html?allocate-memory'))
--        ipcMain.once('answer', function (event, {bytesBeforeOpen, bytesAfterOpen, bytesAfterClose}) {
-+
-+        w.loadURL(`file://${path.join(fixtures, 'api', 'sandbox.html?allocate-memory')}`)
-+        ipcMain.once('answer', (event, {bytesBeforeOpen, bytesAfterOpen, bytesAfterClose}) => {
-           const memoryIncreaseByOpen = bytesAfterOpen - bytesBeforeOpen
-           const memoryDecreaseByClose = bytesAfterOpen - bytesAfterClose
-           // decreased memory should be less than increased due to factors we
-           // can't control, but given the amount of memory allocated in the
-           // fixture, we can reasonably expect decrease to be at least 70% of
-           // increase
--          assert(memoryDecreaseByClose > memoryIncreaseByOpen * 0.7)
-+          expect(memoryDecreaseByClose > memoryIncreaseByOpen * 0.7).to.be.true()
-           done()
-         })
-       })
- 
-       // see #9387
--      it('properly manages remote object references after page reload', (done) => {
-+      it('properly manages remote object references after page reload', done => {
-         w.destroy()
-         w = new BrowserWindow({
-           show: false,
-@@ -1556,31 +1698,31 @@
-             sandbox: true
-           }
-         })
--        w.loadURL('file://' + path.join(fixtures, 'api', 'sandbox.html?reload-remote'))
-+        w.loadURL(`file://${path.join(fixtures, 'api', 'sandbox.html?reload-remote')}`)
- 
--        ipcMain.on('get-remote-module-path', (event) => {
-+        ipcMain.on('get-remote-module-path', event => {
-           event.returnValue = path.join(fixtures, 'module', 'hello.js')
-         })
- 
-         let reload = false
--        ipcMain.on('reloaded', (event) => {
-+        ipcMain.on('reloaded', event => {
-           event.returnValue = reload
-           reload = !reload
-         })
- 
--        ipcMain.once('reload', (event) => {
-+        ipcMain.once('reload', event => {
-           event.sender.reload()
-         })
- 
-         ipcMain.once('answer', (event, arg) => {
-           ipcMain.removeAllListeners('reloaded')
-           ipcMain.removeAllListeners('get-remote-module-path')
--          assert.equal(arg, 'hi')
-+          expect(arg).to.equal('hi')
-           done()
-         })
-       })
- 
--      it('properly manages remote object references after page reload in child window', (done) => {
-+      it('properly manages remote object references after page reload in child window', done => {
-         w.destroy()
-         w = new BrowserWindow({
-           show: false,
-@@ -1589,32 +1731,37 @@
-             sandbox: true
-           }
-         })
-+<<<<<<< .our
-         ipcRenderer.send('set-web-preferences-on-next-new-window', w.webContents.id, 'preload', preload)
- 
-         w.loadURL('file://' + path.join(fixtures, 'api', 'sandbox.html?reload-remote-child'))
-+=======
-+        w.loadURL(`file://${path.join(fixtures, 'api', 'sandbox.html?reload-remote-child')}`)
-+>>>>>>> .their
- 
--        ipcMain.on('get-remote-module-path', (event) => {
-+        ipcMain.on('get-remote-module-path', event => {
-           event.returnValue = path.join(fixtures, 'module', 'hello-child.js')
-         })
- 
-         let reload = false
--        ipcMain.on('reloaded', (event) => {
-+        ipcMain.on('reloaded', event => {
-           event.returnValue = reload
-           reload = !reload
-         })
- 
--        ipcMain.once('reload', (event) => {
-+        ipcMain.once('reload', event => {
-           event.sender.reload()
-         })
- 
-         ipcMain.once('answer', (event, arg) => {
-           ipcMain.removeAllListeners('reloaded')
-           ipcMain.removeAllListeners('get-remote-module-path')
--          assert.equal(arg, 'hi child window')
-+          expect(arg).to.equal('hi child window')
-           done()
-         })
-       })
- 
-+<<<<<<< .our
-       it('validates process APIs access in sandboxed renderer', (done) => {
-         ipcMain.once('answer', function (event, test) {
-           assert.equal(test.pid, w.webContents.getOSProcessId())
-@@ -1627,8 +1774,14 @@
-           assert.equal(test.type, 'renderer')
-           assert.equal(test.version, remote.process.version)
-           assert.deepEqual(test.versions, remote.process.versions)
-+=======
-+      it('validate process.env access in sandbox renderer', done => {
-+        ipcMain.once('answer', (event, test) => {
-+          expect(test).to.equal('foo')
-+>>>>>>> .their
-           done()
-         })
-+
-         remote.process.env.sandboxmain = 'foo'
-         w.destroy()
-         w = new BrowserWindow({
-@@ -1638,7 +1791,7 @@
-             preload: preload
-           }
-         })
--        w.loadURL('file://' + path.join(fixtures, 'api', 'preload.html'))
-+        w.loadURL(`file://${path.join(fixtures, 'api', 'preload.html')}`)
-       })
- 
-       it('webview in sandbox renderer', async () => {
-@@ -1670,48 +1823,53 @@
-         })
-       })
- 
--      it('opens window of about:blank with cross-scripting enabled', (done) => {
-+      it('opens window of about:blank with cross-scripting enabled', done => {
-         ipcMain.once('answer', (event, content) => {
--          assert.equal(content, 'Hello')
-+          expect(content).to.equal('Hello')
-           done()
-         })
-         w.loadURL(`file://${path.join(fixtures, 'api', 'native-window-open-blank.html')}`)
-       })
--      it('opens window of same domain with cross-scripting enabled', (done) => {
-+
-+      it('opens window of same domain with cross-scripting enabled', done => {
-         ipcMain.once('answer', (event, content) => {
--          assert.equal(content, 'Hello')
-+          expect(content).to.equal('Hello')
-           done()
-         })
-         w.loadURL(`file://${path.join(fixtures, 'api', 'native-window-open-file.html')}`)
-       })
--      it('blocks accessing cross-origin frames', (done) => {
-+
-+      it('blocks accessing cross-origin frames', done => {
-         ipcMain.once('answer', (event, content) => {
--          assert.equal(content, 'Blocked a frame with origin "file://" from accessing a cross-origin frame.')
-+          expect(content).to.equal('Blocked a frame with origin "file://" from accessing a cross-origin frame.')
-           done()
-         })
-         w.loadURL(`file://${path.join(fixtures, 'api', 'native-window-open-cross-origin.html')}`)
-       })
--      it('opens window from <iframe> tags', (done) => {
-+
-+      it('opens window from <iframe> tags', done => {
-         ipcMain.once('answer', (event, content) => {
--          assert.equal(content, 'Hello')
-+          expect(content).to.equal('Hello')
-           done()
-         })
-         w.loadURL(`file://${path.join(fixtures, 'api', 'native-window-open-iframe.html')}`)
-       })
--      it('loads native addons correctly after reload', (done) => {
-+
-+      it('loads native addons correctly after reload', done => {
-         if (!nativeModulesEnabled) return done()
- 
-         ipcMain.once('answer', (event, content) => {
--          assert.equal(content, 'function')
-+          expect(content).to.equal('function')
-           ipcMain.once('answer', (event, content) => {
--            assert.equal(content, 'function')
-+            expect(content).to.equal('function')
-             done()
-           })
-           w.reload()
-         })
-         w.loadURL(`file://${path.join(fixtures, 'api', 'native-window-open-native-addon.html')}`)
-       })
--      it('should inherit the nativeWindowOpen setting in opened windows', (done) => {
-+
-+      it('should inherit the nativeWindowOpen setting in opened windows', done => {
-         w.destroy()
-         w = new BrowserWindow({
-           show: false,
-@@ -1723,12 +1881,13 @@
-         const preloadPath = path.join(fixtures, 'api', 'new-window-preload.js')
-         ipcRenderer.send('set-web-preferences-on-next-new-window', w.webContents.id, 'preload', preloadPath)
-         ipcMain.once('answer', (event, args) => {
--          assert.equal(args.includes('--native-window-open'), true)
-+          expect(args).to.include('--native-window-open')
-           done()
-         })
-         w.loadURL(`file://${path.join(fixtures, 'api', 'new-window.html')}`)
-       })
--      it('should open windows with the options configured via new-window event listeners', (done) => {
-+
-+      it('should open windows with the options configured via new-window event listeners', done => {
-         w.destroy()
-         w = new BrowserWindow({
-           show: false,
-@@ -1741,11 +1900,12 @@
-         ipcRenderer.send('set-web-preferences-on-next-new-window', w.webContents.id, 'preload', preloadPath)
-         ipcRenderer.send('set-web-preferences-on-next-new-window', w.webContents.id, 'foo', 'bar')
-         ipcMain.once('answer', (event, args, webPreferences) => {
--          assert.equal(webPreferences.foo, 'bar')
-+          expect(webPreferences.foo).to.equal('bar')
-           done()
-         })
-         w.loadURL(`file://${path.join(fixtures, 'api', 'new-window.html')}`)
-       })
-+
-       it('retains the original web preferences when window.location is changed to a new origin', async () => {
-         await serveFileFromProtocol('foo', path.join(fixtures, 'api', 'window-open-location-change.html'))
-         await serveFileFromProtocol('bar', path.join(fixtures, 'api', 'window-open-location-final.html'))
-@@ -1762,9 +1922,9 @@
-         return new Promise((resolve, reject) => {
-           ipcRenderer.send('set-web-preferences-on-next-new-window', w.webContents.id, 'preload', path.join(fixtures, 'api', 'window-open-preload.js'))
-           ipcMain.once('answer', (event, args, typeofProcess) => {
--            assert.equal(args.includes('--node-integration=false'), true)
--            assert.equal(args.includes('--native-window-open'), true)
--            assert.equal(typeofProcess, 'undefined')
-+            expect(args).to.include('--node-integration=false')
-+            expect(args).to.include('--native-window-open')
-+            expect(typeofProcess).to.equal('undefined')
-             resolve()
-           })
-           w.loadURL(`file://${path.join(fixtures, 'api', 'window-open-location-open.html')}`)
-@@ -1786,9 +1946,9 @@
-       })
-     })
- 
--    it('opens window with cross-scripting enabled from isolated context', (done) => {
-+    it('opens window with cross-scripting enabled from isolated context', done => {
-       ipcMain.once('answer', (event, content) => {
--        assert.equal(content, 'Hello')
-+        expect(content).to.equal('Hello')
-         done()
-       })
-       w.loadURL(`file://${path.join(fixtures, 'api', 'native-window-open-isolated.html')}`)
-@@ -1796,19 +1956,22 @@
-   })
- 
-   describe('beforeunload handler', () => {
--    it('returning undefined would not prevent close', (done) => {
-+    it('returning undefined would not prevent close', done => {
-       w.once('closed', () => { done() })
--      w.loadURL('file://' + path.join(fixtures, 'api', 'close-beforeunload-undefined.html'))
-+      w.loadURL(`file://${path.join(fixtures, 'api', 'close-beforeunload-undefined.html')}`)
-     })
--    it('returning false would prevent close', (done) => {
-+
-+    it('returning false would prevent close', done => {
-       w.once('onbeforeunload', () => { done() })
-       w.loadURL(`file://${path.join(fixtures, 'api', 'close-beforeunload-false.html')}`)
-     })
--    it('returning empty string would prevent close', (done) => {
-+
-+    it('returning empty string would prevent close', done => {
-       w.once('onbeforeunload', () => { done() })
-       w.loadURL(`file://${path.join(fixtures, 'api', 'close-beforeunload-empty-string.html')}`)
-     })
--    it('emits for each close attempt', (done) => {
-+
-+    it('emits for each close attempt', done => {
-       let beforeUnloadCount = 0
-       w.on('onbeforeunload', () => {
-         beforeUnloadCount += 1
-@@ -1821,7 +1984,8 @@
-       w.webContents.once('did-finish-load', () => { w.close() })
-       w.loadURL(`file://${path.join(fixtures, 'api', 'beforeunload-false-prevent3.html')}`)
-     })
--    it('emits for each reload attempt', (done) => {
-+
-+    it('emits for each reload attempt', done => {
-       let beforeUnloadCount = 0
-       w.on('onbeforeunload', () => {
-         beforeUnloadCount += 1
-@@ -1833,13 +1997,14 @@
-       })
-       w.webContents.once('did-finish-load', () => {
-         w.webContents.once('did-finish-load', () => {
--          assert.fail('Reload was not prevented')
-+          expect.fail('Reload was not prevented')
-         })
-         w.reload()
-       })
-       w.loadURL(`file://${path.join(fixtures, 'api', 'beforeunload-false-prevent3.html')}`)
-     })
--    it('emits for each navigation attempt', (done) => {
-+
-+    it('emits for each navigation attempt', done => {
-       let beforeUnloadCount = 0
-       w.on('onbeforeunload', () => {
-         beforeUnloadCount += 1
-@@ -1851,7 +2016,7 @@
-       })
-       w.webContents.once('did-finish-load', () => {
-         w.webContents.once('did-finish-load', () => {
--          assert.fail('Navigation was not prevented')
-+          expect.fail('Navigation was not prevented')
-         })
-         w.loadURL('about:blank')
-       })
-@@ -1881,7 +2046,7 @@
- 
-     afterEach(() => { ipcMain.removeAllListeners('pong') })
- 
--    it('visibilityState is initially visible despite window being hidden', (done) => {
-+    it('visibilityState is initially visible despite window being hidden', done => {
-       w = new BrowserWindow({ show: false, width: 100, height: 100 })
- 
-       let readyToShow = false
-@@ -1890,25 +2055,26 @@
-       })
- 
-       onNextVisibilityChange((visibilityState, hidden) => {
--        assert.equal(readyToShow, false)
--        assert.equal(visibilityState, 'visible')
--        assert.equal(hidden, false)
-+        expect(readyToShow).to.be.false()
-+        expect(visibilityState).to.equal('visible')
-+        expect(hidden).to.be.false()
- 
-         done()
-       })
- 
-       w.loadURL(`file://${path.join(fixtures, 'pages', 'visibilitychange.html')}`)
-     })
--    it('visibilityState changes when window is hidden', (done) => {
-+
-+    it('visibilityState changes when window is hidden', done => {
-       w = new BrowserWindow({width: 100, height: 100})
- 
-       onNextVisibilityChange((visibilityState, hidden) => {
--        assert.equal(visibilityState, 'visible')
--        assert.equal(hidden, false)
-+        expect(visibilityState).to.equal('visible')
-+        expect(hidden).to.be.false()
- 
-         onNextVisibilityChange((visibilityState, hidden) => {
--          assert.equal(visibilityState, 'hidden')
--          assert.equal(hidden, true)
-+          expect(visibilityState).to.equal('hidden')
-+          expect(hidden).to.be.true()
-           done()
-         })
- 
-@@ -1917,13 +2083,14 @@
- 
-       w.loadURL(`file://${path.join(fixtures, 'pages', 'visibilitychange.html')}`)
-     })
--    it('visibilityState changes when window is shown', (done) => {
-+
-+    it('visibilityState changes when window is shown', done => {
-       w = new BrowserWindow({width: 100, height: 100})
- 
-       onNextVisibilityChange((visibilityState, hidden) => {
-         onVisibilityChange((visibilityState, hidden) => {
-           if (!hidden) {
--            assert.equal(visibilityState, 'visible')
-+            expect(visibilityState).to.equal('visible')
-             done()
-           }
-         })
-@@ -1934,7 +2101,8 @@
- 
-       w.loadURL(`file://${path.join(fixtures, 'pages', 'visibilitychange.html')}`)
-     })
--    it('visibilityState changes when window is shown inactive', function (done) {
-+
-+    it('visibilityState changes when window is shown inactive', done => {
-       if (isCI && process.platform === 'win32') {
-         // FIXME(alexeykuzmin): Skip the test instead of marking it as passed.
-         // afterEach hook won't be run if a test is skipped dynamically.
-@@ -1949,7 +2117,7 @@
-       onNextVisibilityChange((visibilityState, hidden) => {
-         onVisibilityChange((visibilityState, hidden) => {
-           if (!hidden) {
--            assert.equal(visibilityState, 'visible')
-+            expect(visibilityState).to.equal('visible')
-             done()
-           }
-         })
-@@ -1960,7 +2128,8 @@
- 
-       w.loadURL(`file://${path.join(fixtures, 'pages', 'visibilitychange.html')}`)
-     })
--    it('visibilityState changes when window is minimized', function (done) {
-+
-+    it('visibilityState changes when window is minimized', done => {
-       if (isCI && process.platform === 'linux') {
-         // FIXME(alexeykuzmin): Skip the test instead of marking it as passed.
-         // afterEach hook won't be run if a test is skipped dynamically.
-@@ -1973,12 +2142,12 @@
-       w = new BrowserWindow({width: 100, height: 100})
- 
-       onNextVisibilityChange((visibilityState, hidden) => {
--        assert.equal(visibilityState, 'visible')
--        assert.equal(hidden, false)
-+        expect(visibilityState).to.equal('visible')
-+        expect(hidden).to.be.false()
- 
-         onNextVisibilityChange((visibilityState, hidden) => {
--          assert.equal(visibilityState, 'hidden')
--          assert.equal(hidden, true)
-+          expect(visibilityState).to.equal('hidden')
-+          expect(hidden).to.be.true()
-           done()
-         })
- 
-@@ -1987,7 +2156,8 @@
- 
-       w.loadURL(`file://${path.join(fixtures, 'pages', 'visibilitychange.html')}`)
-     })
--    it('visibilityState remains visible if backgroundThrottling is disabled', (done) => {
-+
-+    it('visibilityState remains visible if backgroundThrottling is disabled', done => {
-       w = new BrowserWindow({
-         show: false,
-         width: 100,
-@@ -1998,8 +2168,8 @@
-       })
- 
-       onNextVisibilityChange((visibilityState, hidden) => {
--        assert.equal(visibilityState, 'visible')
--        assert.equal(hidden, false)
-+        expect(visibilityState).to.equal('visible')
-+        expect(hidden).to.be.false()
- 
-         onNextVisibilityChange((visibilityState, hidden) => {
-           done(new Error(`Unexpected visibility change event. visibilityState: ${visibilityState} hidden: ${hidden}`))
-@@ -2028,33 +2198,35 @@
-       }
-     })
- 
--    it('emits when window.open is called', (done) => {
-+    it('emits when window.open is called', done => {
-       w.webContents.once('new-window', (e, url, frameName, disposition, options, additionalFeatures) => {
-         e.preventDefault()
--        assert.equal(url, 'http://host/')
--        assert.equal(frameName, 'host')
--        assert.equal(additionalFeatures[0], 'this-is-not-a-standard-feature')
-+        expect(url).to.equal('http://host/')
-+        expect(frameName).to.equal('host')
-+        expect(additionalFeatures[0]).to.equal('this-is-not-a-standard-feature')
-         done()
-       })
-       w.loadURL(`file://${fixtures}/pages/window-open.html`)
-     })
--    it('emits when window.open is called with no webPreferences', (done) => {
-+
-+    it('emits when window.open is called with no webPreferences', done => {
-       w.destroy()
-       w = new BrowserWindow({ show: false })
--      w.webContents.once('new-window', function (e, url, frameName, disposition, options, additionalFeatures) {
-+      w.webContents.once('new-window', (e, url, frameName, disposition, options, additionalFeatures) => {
-         e.preventDefault()
--        assert.equal(url, 'http://host/')
--        assert.equal(frameName, 'host')
--        assert.equal(additionalFeatures[0], 'this-is-not-a-standard-feature')
-+        expect(url).to.equal('http://host/')
-+        expect(frameName).to.equal('host')
-+        expect(additionalFeatures[0]).to.equal('this-is-not-a-standard-feature')
-         done()
-       })
-       w.loadURL(`file://${fixtures}/pages/window-open.html`)
-     })
--    it('emits when link with target is called', (done) => {
-+
-+    it('emits when link with target is called', done => {
-       w.webContents.once('new-window', (e, url, frameName) => {
-         e.preventDefault()
--        assert.equal(url, 'http://host/')
--        assert.equal(frameName, 'target')
-+        expect(url).to.equal('http://host/')
-+        expect(frameName).to.equal('target')
-         done()
-       })
-       w.loadURL(`file://${fixtures}/pages/target-name.html`)
-@@ -2064,7 +2236,7 @@
-   describe('maximize event', () => {
-     if (isCI) return
- 
--    it('emits when window is maximized', (done) => {
-+    it('emits when window is maximized', done => {
-       w.once('maximize', () => { done() })
-       w.show()
-       w.maximize()
-@@ -2074,7 +2246,7 @@
-   describe('unmaximize event', () => {
-     if (isCI) return
- 
--    it('emits when window is unmaximized', (done) => {
-+    it('emits when window is unmaximized', done => {
-       w.once('unmaximize', () => { done() })
-       w.show()
-       w.maximize()
-@@ -2085,7 +2257,7 @@
-   describe('minimize event', () => {
-     if (isCI) return
- 
--    it('emits when window is minimized', (done) => {
-+    it('emits when window is minimized', done => {
-       w.once('minimize', () => { done() })
-       w.show()
-       w.minimize()
-@@ -2105,7 +2277,7 @@
-       return closeWindow(sheet, {assertSingleWindow: false}).then(() => { sheet = null })
-     })
- 
--    it('emits when window opens a sheet', (done) => {
-+    it('emits when window opens a sheet', done => {
-       w.show()
-       w.once('sheet-begin', () => {
-         sheet.close()
-@@ -2131,7 +2303,7 @@
-       return closeWindow(sheet, {assertSingleWindow: false}).then(() => { sheet = null })
-     })
- 
--    it('emits when window has closed a sheet', (done) => {
-+    it('emits when window has closed a sheet', done => {
-       w.show()
-       sheet = new BrowserWindow({
-         modal: true,
-@@ -2155,37 +2327,39 @@
-       }
-     })
- 
--    it('subscribes to frame updates', (done) => {
-+    it('subscribes to frame updates', done => {
-       let called = false
-       w.loadURL(`file://${fixtures}/api/frame-subscriber.html`)
-       w.webContents.on('dom-ready', () => {
--        w.webContents.beginFrameSubscription(function (data) {
-+        w.webContents.beginFrameSubscription(data => {
-           // This callback might be called twice.
-           if (called) return
-           called = true
- 
--          assert.notEqual(data.length, 0)
-+          expect(data.length).to.not.equal(0)
-           w.webContents.endFrameSubscription()
-           done()
-         })
-       })
-     })
--    it('subscribes to frame updates (only dirty rectangle)', (done) => {
-+
-+    it('subscribes to frame updates (only dirty rectangle)', done => {
-       let called = false
-       w.loadURL(`file://${fixtures}/api/frame-subscriber.html`)
-       w.webContents.on('dom-ready', () => {
--        w.webContents.beginFrameSubscription(true, (data) => {
-+        w.webContents.beginFrameSubscription(true, data => {
-           // This callback might be called twice.
-           if (called) return
-           called = true
- 
--          assert.notEqual(data.length, 0)
-+          expect(data.length).to.not.equal(0)
-           w.webContents.endFrameSubscription()
-           done()
-         })
-       })
-     })
--    it('throws error when subscriber is not well defined', (done) => {
-+
-+    it('throws error when subscriber is not well defined', done => {
-       w.loadURL(`file://${fixtures}'/api/frame-subscriber.html`)
-       try {
-         w.webContents.beginFrameSubscription(true, true)
-@@ -2213,13 +2387,13 @@
-       }
-     })
- 
--    it('should save page to disk', (done) => {
-+    it('should save page to disk', done => {
-       w.webContents.on('did-finish-load', () => {
--        w.webContents.savePage(savePageHtmlPath, 'HTMLComplete', function (error) {
--          assert.equal(error, null)
--          assert(fs.existsSync(savePageHtmlPath))
--          assert(fs.existsSync(savePageJsPath))
--          assert(fs.existsSync(savePageCssPath))
-+        w.webContents.savePage(savePageHtmlPath, 'HTMLComplete', error => {
-+          expect(error).to.be.null()
-+          expect(fs.existsSync(savePageHtmlPath)).to.be.true()
-+          expect(fs.existsSync(savePageJsPath)).to.be.true()
-+          expect(fs.existsSync(savePageCssPath)).to.be.true()
-           done()
-         })
-       })
-@@ -2232,8 +2406,8 @@
-       w.destroy()
-       w = new BrowserWindow()
-       const size = w.getSize()
--      assert.equal(size[0], 800)
--      assert.equal(size[1], 600)
-+      expect(size[0]).to.equal(800)
-+      expect(size[1]).to.equal(600)
-     })
-   })
- 
-@@ -2249,53 +2423,53 @@
- 
-       w.setMinimizable(false)
-       w.setMinimizable(true)
--      assert.deepEqual(w.getSize(), [300, 200])
-+      expect(w.getSize()).to.deep.equal([300, 200])
- 
-       w.setResizable(false)
-       w.setResizable(true)
--      assert.deepEqual(w.getSize(), [300, 200])
-+      expect(w.getSize()).to.deep.equal([300, 200])
- 
-       w.setMaximizable(false)
-       w.setMaximizable(true)
--      assert.deepEqual(w.getSize(), [300, 200])
-+      expect(w.getSize()).to.deep.equal([300, 200])
- 
-       w.setFullScreenable(false)
-       w.setFullScreenable(true)
--      assert.deepEqual(w.getSize(), [300, 200])
-+      expect(w.getSize()).to.deep.equal([300, 200])
- 
-       w.setClosable(false)
-       w.setClosable(true)
--      assert.deepEqual(w.getSize(), [300, 200])
-+      expect(w.getSize()).to.deep.equal([300, 200])
-     })
- 
-     describe('resizable state', () => {
-       it('can be changed with resizable option', () => {
-         w.destroy()
-         w = new BrowserWindow({show: false, resizable: false})
--        assert.equal(w.isResizable(), false)
-+        expect(w.isResizable()).to.equal.false()
- 
-         if (process.platform === 'darwin') {
--          assert.equal(w.isMaximizable(), true)
-+          expect(w.isResizable()).to.equal.true()
-         }
-       })
- 
-       it('can be changed with setResizable method', () => {
--        assert.equal(w.isResizable(), true)
-+        expect(w.isResizable()).to.equal.true()
-         w.setResizable(false)
--        assert.equal(w.isResizable(), false)
-+        expect(w.isResizable()).to.equal.false()
-         w.setResizable(true)
--        assert.equal(w.isResizable(), true)
-+        expect(w.isResizable()).to.equal.false()
-       })
- 
-       it('works for a frameless window', () => {
-         w.destroy()
-         w = new BrowserWindow({show: false, frame: false})
--        assert.equal(w.isResizable(), true)
-+        expect(w.isResizable()).to.equal.true()
- 
-         if (process.platform === 'win32') {
-           w.destroy()
-           w = new BrowserWindow({show: false, thickFrame: false})
--          assert.equal(w.isResizable(), false)
-+          expect(w.isResizable()).to.equal.false()
-         }
-       })
- 
-@@ -2319,18 +2493,19 @@
-     })
- 
-     describe('loading main frame state', () => {
--      it('is true when the main frame is loading', (done) => {
-+      it('is true when the main frame is loading', done => {
-         w.webContents.on('did-start-loading', () => {
--          assert.equal(w.webContents.isLoadingMainFrame(), true)
-+          expect(w.webContents.isLoadingMainFrame()).to.be.true()
-           done()
-         })
-         w.webContents.loadURL(server.url)
-       })
--      it('is false when only a subframe is loading', (done) => {
-+
-+      it('is false when only a subframe is loading', done => {
-         w.webContents.once('did-finish-load', () => {
--          assert.equal(w.webContents.isLoadingMainFrame(), false)
-+          expect(w.webContents.isLoadingMainFrame()).to.be.false()
-           w.webContents.on('did-start-loading', () => {
--            assert.equal(w.webContents.isLoadingMainFrame(), false)
-+            expect(w.webContents.isLoadingMainFrame()).to.be.true()
-             done()
-           })
-           w.webContents.executeJavaScript(`
-@@ -2341,11 +2516,12 @@
-         })
-         w.webContents.loadURL(server.url)
-       })
--      it('is true when navigating to pages from the same origin', (done) => {
-+
-+      it('is true when navigating to pages from the same origin', done => {
-         w.webContents.once('did-finish-load', () => {
--          assert.equal(w.webContents.isLoadingMainFrame(), false)
-+          expect(w.webContents.isLoadingMainFrame()).to.be.false()
-           w.webContents.on('did-start-loading', () => {
--            assert.equal(w.webContents.isLoadingMainFrame(), true)
-+            expect(w.webContents.isLoadingMainFrame()).to.be.true()
-             done()
-           })
-           w.webContents.loadURL(`${server.url}/page2`)
-@@ -2371,14 +2547,15 @@
-       it('can be changed with movable option', () => {
-         w.destroy()
-         w = new BrowserWindow({show: false, movable: false})
--        assert.equal(w.isMovable(), false)
-+        expect(w.isMovable()).to.be.false()
-       })
-+
-       it('can be changed with setMovable method', () => {
--        assert.equal(w.isMovable(), true)
-+        expect(w.isMovable()).to.be.true()
-         w.setMovable(false)
--        assert.equal(w.isMovable(), false)
-+        expect(w.isMovable()).to.be.false()
-         w.setMovable(true)
--        assert.equal(w.isMovable(), true)
-+        expect(w.isMovable()).to.be.true()
-       })
-     })
- 
-@@ -2386,15 +2563,15 @@
-       it('can be changed with minimizable option', () => {
-         w.destroy()
-         w = new BrowserWindow({show: false, minimizable: false})
--        assert.equal(w.isMinimizable(), false)
-+        expect(w.isMinimizable()).to.be.false()
-       })
- 
-       it('can be changed with setMinimizable method', () => {
--        assert.equal(w.isMinimizable(), true)
-+        expect(w.isMinimizable()).to.be.true()
-         w.setMinimizable(false)
--        assert.equal(w.isMinimizable(), false)
-+        expect(w.isMinimizable()).to.be.false()
-         w.setMinimizable(true)
--        assert.equal(w.isMinimizable(), true)
-+        expect(w.isMinimizable()).to.be.true()
-       })
-     })
- 
-@@ -2402,31 +2579,31 @@
-       it('can be changed with maximizable option', () => {
-         w.destroy()
-         w = new BrowserWindow({show: false, maximizable: false})
--        assert.equal(w.isMaximizable(), false)
-+        expect(w.isMaximizable()).to.be.false()
-       })
- 
-       it('can be changed with setMaximizable method', () => {
--        assert.equal(w.isMaximizable(), true)
-+        expect(w.isMaximizable()).to.be.true()
-         w.setMaximizable(false)
--        assert.equal(w.isMaximizable(), false)
-+        expect(w.isMaximizable()).to.be.false()
-         w.setMaximizable(true)
--        assert.equal(w.isMaximizable(), true)
-+        expect(w.isMaximizable()).to.be.true()
-       })
- 
-       it('is not affected when changing other states', () => {
-         w.setMaximizable(false)
--        assert.equal(w.isMaximizable(), false)
-+        expect(w.isMaximizable()).to.be.false()
-         w.setMinimizable(false)
--        assert.equal(w.isMaximizable(), false)
-+        expect(w.isMaximizable()).to.be.false()
-         w.setClosable(false)
--        assert.equal(w.isMaximizable(), false)
-+        expect(w.isMaximizable()).to.be.false()
- 
-         w.setMaximizable(true)
--        assert.equal(w.isMaximizable(), true)
-+        expect(w.isMaximizable()).to.be.true()
-         w.setClosable(true)
--        assert.equal(w.isMaximizable(), true)
-+        expect(w.isMaximizable()).to.be.true()
-         w.setFullScreenable(false)
--        assert.equal(w.isMaximizable(), true)
-+        expect(w.isMaximizable()).to.be.true()
-       })
-     })
- 
-@@ -2436,7 +2613,7 @@
- 
-       it('is set to false when resizable state is set to false', () => {
-         w.setResizable(false)
--        assert.equal(w.isMaximizable(), false)
-+        expect(w.isMaximizable()).to.be.false()
-       })
-     })
- 
-@@ -2451,15 +2628,15 @@
-       it('can be changed with fullscreenable option', () => {
-         w.destroy()
-         w = new BrowserWindow({show: false, fullscreenable: false})
--        assert.equal(w.isFullScreenable(), false)
-+        expect(w.isFullScreenable()).to.be.false()
-       })
- 
-       it('can be changed with setFullScreenable method', () => {
--        assert.equal(w.isFullScreenable(), true)
-+        expect(w.isFullScreenable()).to.be.true()
-         w.setFullScreenable(false)
--        assert.equal(w.isFullScreenable(), false)
-+        expect(w.isFullScreenable()).to.be.false()
-         w.setFullScreenable(true)
--        assert.equal(w.isFullScreenable(), true)
-+        expect(w.isFullScreenable()).to.be.false()
-       })
-     })
- 
-@@ -2472,15 +2649,15 @@
-         }
-       })
- 
--      it('can be changed with setKiosk method', (done) => {
-+      it('can be changed with setKiosk method', done => {
-         w.destroy()
-         w = new BrowserWindow()
-         w.setKiosk(true)
--        assert.equal(w.isKiosk(), true)
-+        expect(w.isKiosk()).to.be.true()
- 
-         w.once('enter-full-screen', () => {
-           w.setKiosk(false)
--          assert.equal(w.isKiosk(), false)
-+          expect(w.isKiosk()).to.be.false()
-         })
-         w.once('leave-full-screen', () => {
-           done()
-@@ -2496,15 +2673,15 @@
-         }
-       })
- 
--      it('resizable flag should be set to true and restored', (done) => {
-+      it('resizable flag should be set to true and restored', done => {
-         w.destroy()
-         w = new BrowserWindow({ resizable: false })
-         w.once('enter-full-screen', () => {
--          assert.equal(w.isResizable(), true)
-+          expect(w.isResizable()).to.be.true()
-           w.setFullScreen(false)
-         })
-         w.once('leave-full-screen', () => {
--          assert.equal(w.isResizable(), false)
-+          expect(w.isResizable()).to.be.false()
-           done()
-         })
-         w.setFullScreen(true)
-@@ -2520,32 +2697,32 @@
-         }
-       })
- 
--      it('can be changed with setFullScreen method', (done) => {
-+      it('can be changed with setFullScreen method', done => {
-         w.destroy()
-         w = new BrowserWindow()
-         w.once('enter-full-screen', () => {
--          assert.equal(w.isFullScreen(), true)
-+          expect(w.isFullScreen()).to.be.true()
-           w.setFullScreen(false)
-         })
-         w.once('leave-full-screen', () => {
--          assert.equal(w.isFullScreen(), false)
-+          expect(w.isFullScreen()).to.be.false()
-           done()
-         })
-         w.setFullScreen(true)
-       })
- 
--      it('should not be changed by setKiosk method', (done) => {
-+      it('should not be changed by setKiosk method', done => {
-         w.destroy()
-         w = new BrowserWindow()
-         w.once('enter-full-screen', () => {
--          assert.equal(w.isFullScreen(), true)
-+          expect(w.isFullScreen()).to.be.true()
-           w.setKiosk(true)
-           w.setKiosk(false)
--          assert.equal(w.isFullScreen(), true)
-+          expect(w.isFullScreen()).to.be.true()
-           w.setFullScreen(false)
-         })
-         w.once('leave-full-screen', () => {
--          assert.equal(w.isFullScreen(), false)
-+          expect(w.isFullScreen()).to.be.false()
-           done()
-         })
-         w.setFullScreen(true)
-@@ -2556,15 +2733,15 @@
-       it('can be changed with closable option', () => {
-         w.destroy()
-         w = new BrowserWindow({show: false, closable: false})
--        assert.equal(w.isClosable(), false)
-+        expect(w.isClosable()).to.be.false()
-       })
- 
-       it('can be changed with setClosable method', () => {
--        assert.equal(w.isClosable(), true)
-+        expect(w.isClosable()).to.be.true()
-         w.setClosable(false)
--        assert.equal(w.isClosable(), false)
-+        expect(w.isClosable()).to.be.false()
-         w.setClosable(true)
--        assert.equal(w.isClosable(), true)
-+        expect(w.isClosable()).to.be.true()
-       })
-     })
- 
-@@ -2575,17 +2752,17 @@
-         w.destroy()
-         let hasShadow = process.platform !== 'darwin'
-         w = new BrowserWindow({show: false, hasShadow: hasShadow})
--        assert.equal(w.hasShadow(), hasShadow)
-+        expect(w.hasShadow()).to.equal(hasShadow)
-       })
- 
-       it('can be changed with setHasShadow method', () => {
-         if (process.platform !== 'darwin') return
- 
--        assert.equal(w.hasShadow(), true)
-+        expect(w.hasShadow()).to.be.true()
-         w.setHasShadow(false)
--        assert.equal(w.hasShadow(), false)
-+        expect(w.hasShadow()).to.be.false()
-         w.setHasShadow(true)
--        assert.equal(w.hasShadow(), true)
-+        expect(w.hasShadow()).to.be.true()
-       })
-     })
-   })
-@@ -2626,25 +2803,26 @@
-       }
-     })
- 
--    it('should restore a normal visible window from a fullscreen startup state', (done) => {
-+    it('should restore a normal visible window from a fullscreen startup state', done => {
-       w.webContents.once('did-finish-load', () => {
-         // start fullscreen and hidden
-         w.setFullScreen(true)
-         w.once('show', () => { w.setFullScreen(false) })
-         w.once('leave-full-screen', () => {
--          assert.equal(w.isVisible(), true)
--          assert.equal(w.isFullScreen(), false)
-+          expect(w.isVisible()).to.be.true()
-+          expect(w.isFullScreen()).to.be.false()
-           done()
-         })
-         w.show()
-       })
-       w.loadURL('about:blank')
-     })
--    it('should keep window hidden if already in hidden state', (done) => {
-+
-+    it('should keep window hidden if already in hidden state', done => {
-       w.webContents.once('did-finish-load', () => {
-         w.once('leave-full-screen', () => {
--          assert.equal(w.isVisible(), false)
--          assert.equal(w.isFullScreen(), false)
-+          expect(w.isVisible()).to.be.false()
-+          expect(w.isFullScreen()).to.be.false()
-           done()
-         })
-         w.setFullScreen(false)
-@@ -2692,22 +2870,24 @@
- 
-     describe('parent option', () => {
-       it('sets parent window', () => {
--        assert.equal(c.getParentWindow(), w)
-+        expect(c.getParentWindow()).to.equal(w)
-       })
-+
-       it('adds window to child windows of parent', () => {
--        assert.deepEqual(w.getChildWindows(), [c])
-+        expect(w.getChildWindows()).to.deep.equal([c])
-       })
--      it('removes from child windows of parent when window is closed', (done) => {
-+
-+      it('removes from child windows of parent when window is closed', done => {
-         c.once('closed', () => {
--          assert.deepEqual(w.getChildWindows(), [])
-+          expect(w.getChildWindows()).to.deepe.equal([])
-           done()
-         })
-         c.close()
-       })
- 
-       it('should not affect the show option', () => {
--        assert.equal(c.isVisible(), false)
--        assert.equal(c.getParentWindow().isVisible(), false)
-+        expect(c.isVisible()).to.be.false()
-+        expect(c.getParentWindow().isVisible()).to.be.false()
-       })
-     })
- 
-@@ -2724,23 +2904,25 @@
-       })
- 
-       it('sets parent window', () => {
--        assert.equal(w.getParentWindow(), null)
--        assert.equal(c.getParentWindow(), null)
-+        expect(w.getParentWindow()).to.be.null()
-+        expect(c.getParentWindow()).to.be.null()
-         c.setParentWindow(w)
--        assert.equal(c.getParentWindow(), w)
-+        expect(c.getParentWindow()).to.equal(w)
-         c.setParentWindow(null)
--        assert.equal(c.getParentWindow(), null)
-+        expect(c.getParentWindow()).to.be.null()
-       })
-+
-       it('adds window to child windows of parent', () => {
--        assert.deepEqual(w.getChildWindows(), [])
-+        expect(w.getChildWindows()).to.deep.equal([])
-         c.setParentWindow(w)
--        assert.deepEqual(w.getChildWindows(), [c])
-+        expect(w.getChildWindows()).to.deep.equal([c])
-         c.setParentWindow(null)
--        assert.deepEqual(w.getChildWindows(), [])
-+        expect(w.getChildWindows()).to.deep.equal([])
-       })
--      it('removes from child windows of parent when window is closed', (done) => {
-+
-+      it('removes from child windows of parent when window is closed', done => {
-         c.once('closed', () => {
--          assert.deepEqual(w.getChildWindows(), [])
-+          expect(w.getChildWindows()).to.deep.equal([])
-           done()
-         })
-         c.setParentWindow(w)
-@@ -2762,41 +2944,46 @@
-       })
- 
-       it('disables parent window', () => {
--        assert.equal(w.isEnabled(), true)
-+        expect(w.isEnabled()).to.be.true()
-         c.show()
--        assert.equal(w.isEnabled(), false)
-+        expect(w.isEnabled()).to.be.false()
-       })
--      it('enables parent window when closed', (done) => {
-+
-+      it('enables parent window when closed', done => {
-         c.once('closed', () => {
--          assert.equal(w.isEnabled(), true)
-+          expect(w.isEnabled()).to.be.true()
-           done()
-         })
-         c.show()
-         c.close()
-       })
-+
-       it('disables parent window recursively', () => {
-         let c2 = new BrowserWindow({show: false, parent: w, modal: true})
-         c.show()
--        assert.equal(w.isEnabled(), false)
-+        expect(w.isEnabled()).to.be.false()
-+
-         c2.show()
--        assert.equal(w.isEnabled(), false)
-+        expect(w.isEnabled()).to.be.false()
-+
-         c.destroy()
--        assert.equal(w.isEnabled(), false)
-+        expect(w.isEnabled()).to.be.false()
-+
-         c2.destroy()
--        assert.equal(w.isEnabled(), true)
-+        expect(w.isEnabled()).to.be.true()
-       })
-     })
-   })
- 
-   describe('window.webContents.send(channel, args...)', () => {
-     it('throws an error when the channel is missing', () => {
--      assert.throws(() => {
-+      expect(() => {
-         w.webContents.send()
--      }, 'Missing required channel argument')
-+      }).to.throw('Missing required channel argument')
- 
--      assert.throws(() => {
-+      expect(() => {
-         w.webContents.send(null)
--      }, 'Missing required channel argument')
-+      }).to.throw('Missing required channel argument')
-     })
-   })
- 
-@@ -2932,10 +3119,8 @@
-       })
-     })
- 
--    it('works when used with partitions', (done) => {
--      if (w != null) {
--        w.destroy()
--      }
-+    it('works when used with partitions', done => {
-+      if (w != null) w.destroy()
-       w = new BrowserWindow({
-         show: false,
-         webPreferences: {
-@@ -2943,7 +3128,7 @@
-         }
-       })
- 
--      var extensionPath = path.join(__dirname, 'fixtures', 'devtools-extensions', 'foo')
-+      const extensionPath = path.join(__dirname, 'fixtures', 'devtools-extensions', 'foo')
-       BrowserWindow.removeDevToolsExtension('foo')
-       BrowserWindow.addDevToolsExtension(extensionPath)
- 
-@@ -2952,34 +3137,34 @@
-       w.loadURL('about:blank')
-       w.webContents.openDevTools({mode: 'bottom'})
- 
--      ipcMain.once('answer', function (event, message) {
--        assert.equal(message.runtimeId, 'foo')
-+      ipcMain.once('answer', (event, message) => {
-+        expect(message.runtimeId).to.equal('foo')
-         done()
-       })
-     })
- 
-     it('serializes the registered extensions on quit', () => {
--      var extensionName = 'foo'
--      var extensionPath = path.join(__dirname, 'fixtures', 'devtools-extensions', extensionName)
--      var serializedPath = path.join(app.getPath('userData'), 'DevTools Extensions')
-+      const extensionName = 'foo'
-+      const extensionPath = path.join(__dirname, 'fixtures', 'devtools-extensions', extensionName)
-+      const serializedPath = path.join(app.getPath('userData'), 'DevTools Extensions')
- 
-       BrowserWindow.addDevToolsExtension(extensionPath)
-       app.emit('will-quit')
--      assert.deepEqual(JSON.parse(fs.readFileSync(serializedPath)), [extensionPath])
-+      expect(JSON.parse(fs.readFileSync(serializedPath))).to.deep.equal([extensionPath])
- 
-       BrowserWindow.removeDevToolsExtension(extensionName)
-       app.emit('will-quit')
--      assert.equal(fs.existsSync(serializedPath), false)
-+      expect(fs.existsSync(serializedPath)).to.be.false()
-     })
- 
-     describe('BrowserWindow.addExtension', () => {
-       beforeEach(() => {
-         BrowserWindow.removeExtension('foo')
--        assert.equal(BrowserWindow.getExtensions().hasOwnProperty('foo'), false)
-+        expect(BrowserWindow.getExtensions().hasOwnProperty('foo')).to.be.false()
- 
--        var extensionPath = path.join(__dirname, 'fixtures', 'devtools-extensions', 'foo')
-+        const extensionPath = path.join(__dirname, 'fixtures', 'devtools-extensions', 'foo')
-         BrowserWindow.addExtension(extensionPath)
--        assert.equal(BrowserWindow.getExtensions().hasOwnProperty('foo'), true)
-+        expect(BrowserWindow.getExtensions().hasOwnProperty('foo')).to.be.true()
- 
-         showLastDevToolsPanel()
- 
-@@ -2987,15 +3172,15 @@
-       })
- 
-       it('throws errors for missing manifest.json files', () => {
--        assert.throws(() => {
-+        expect(() => {
-           BrowserWindow.addExtension(path.join(__dirname, 'does-not-exist'))
--        }, /ENOENT: no such file or directory/)
-+        }).to.throw(/ENOENT: no such file or directory/)
-       })
- 
-       it('throws errors for invalid manifest.json files', () => {
--        assert.throws(() => {
-+        expect(() => {
-           BrowserWindow.addExtension(path.join(__dirname, 'fixtures', 'devtools-extensions', 'bad-manifest'))
--        }, /Unexpected token }/)
-+        }).to.throw(/Unexpected token }/)
-       })
-     })
-   })
-@@ -3018,62 +3203,70 @@
- 
-     it('doesnt throw when no calback is provided', () => {
-       const result = ipcRenderer.sendSync('executeJavaScript', code, false)
--      assert.equal(result, 'success')
-+      expect(result).to.equal('success')
-     })
--    it('returns result when calback is provided', (done) => {
-+
-+    it('returns result when calback is provided', done => {
-       ipcRenderer.send('executeJavaScript', code, true)
--      ipcRenderer.once('executeJavaScript-response', function (event, result) {
--        assert.equal(result, expected)
-+      ipcRenderer.once('executeJavaScript-response', (event, result) => {
-+        expect(result).to.equal(expected)
-         done()
-       })
-     })
--    it('returns result if the code returns an asyncronous promise', (done) => {
-+
-+    it('returns result if the code returns an asyncronous promise', done => {
-       ipcRenderer.send('executeJavaScript', asyncCode, true)
-       ipcRenderer.once('executeJavaScript-response', (event, result) => {
--        assert.equal(result, expected)
-+        expect(result).to.equal(expected)
-         done()
-       })
-     })
--    it('resolves the returned promise with the result when a callback is specified', (done) => {
-+
-+    it('resolves the returned promise with the result when a callback is specified', done => {
-       ipcRenderer.send('executeJavaScript', code, true)
-       ipcRenderer.once('executeJavaScript-promise-response', (event, result) => {
--        assert.equal(result, expected)
-+        expect(result).to.equal(expected)
-         done()
-       })
-     })
--    it('resolves the returned promise with the result when no callback is specified', (done) => {
-+
-+    it('resolves the returned promise with the result when no callback is specified', done => {
-       ipcRenderer.send('executeJavaScript', code, false)
-       ipcRenderer.once('executeJavaScript-promise-response', (event, result) => {
--        assert.equal(result, expected)
-+        expect(result).to.equal(expected)
-         done()
-       })
-     })
--    it('resolves the returned promise with the result if the code returns an asyncronous promise', (done) => {
-+
-+    it('resolves the returned promise with the result if the code returns an asyncronous promise', done => {
-       ipcRenderer.send('executeJavaScript', asyncCode, true)
-       ipcRenderer.once('executeJavaScript-promise-response', (event, result) => {
--        assert.equal(result, expected)
-+        expect(result).to.equal(expected)
-         done()
-       })
-     })
--    it('rejects the returned promise if an async error is thrown', (done) => {
-+
-+    it('rejects the returned promise if an async error is thrown', done => {
-       ipcRenderer.send('executeJavaScript', badAsyncCode, true)
-       ipcRenderer.once('executeJavaScript-promise-error', (event, error) => {
--        assert.equal(error, expectedErrorMsg)
-+        expect(error).to.equal(expectedErrorMsg)
-         done()
-       })
-     })
-+
-     it('rejects the returned promise with an error if an Error.prototype is thrown', async () => {
-       for (const error in errorTypes) {
-         await new Promise((resolve) => {
-           ipcRenderer.send('executeJavaScript', `Promise.reject(new ${error.name}("Wamp-wamp")`, true)
-           ipcRenderer.once('executeJavaScript-promise-error-name', (event, name) => {
--            assert.equal(name, error.name)
-+            expect(name).to.equal(error.name)
-             resolve()
-           })
-         })
-       }
-     })
--    it('works after page load and during subframe load', (done) => {
-+
-+    it('works after page load and during subframe load', done => {
-       w.webContents.once('did-finish-load', () => {
-         // initiate a sub-frame load, then try and execute script during it
-         w.webContents.executeJavaScript(`
-@@ -3088,17 +3281,19 @@
-       })
-       w.loadURL(server.url)
-     })
--    it('executes after page load', (done) => {
--      w.webContents.executeJavaScript(code, (result) => {
--        assert.equal(result, expected)
-+
-+    it('executes after page load', done => {
-+      w.webContents.executeJavaScript(code, result => {
-+        expect(result).to.equal(expected)
-         done()
-       })
-       w.loadURL(server.url)
-     })
--    it('works with result objects that have DOM class prototypes', (done) => {
--      w.webContents.executeJavaScript('document.location', (result) => {
--        assert.equal(result.origin, server.url)
--        assert.equal(result.protocol, 'http:')
-+
-+    it('works with result objects that have DOM class prototypes', done => {
-+      w.webContents.executeJavaScript('document.location', result => {
-+        expect(result.origin).to.equal(server.url)
-+        expect(result.protocol).to.equal('http:')
-         done()
-       })
-       w.loadURL(server.url)
-@@ -3113,10 +3308,10 @@
-     })
- 
-     it('opens the path in Quick Look on macOS', () => {
--      assert.doesNotThrow(() => {
-+      expect(() => {
-         w.previewFile(__filename)
-         w.closeFilePreview()
--      })
-+      }).to.not.throw()
-     })
-   })
- 
-@@ -3167,41 +3362,45 @@
-       if (ws != null) ws.destroy()
-     })
- 
--    it('separates the page context from the Electron/preload context', (done) => {
-+    it('separates the page context from the Electron/preload context', done => {
-       ipcMain.once('isolated-world', (event, data) => {
--        assert.deepEqual(data, expectedContextData)
-+        expect(data).to.deep.equal(expectedContextData)
-         done()
-       })
-       w.loadURL(`file://${fixtures}/api/isolated.html`)
-     })
--    it('recreates the contexts on reload', (done) => {
-+
-+    it('recreates the contexts on reload', done => {
-       w.webContents.once('did-finish-load', () => {
-         ipcMain.once('isolated-world', (event, data) => {
--          assert.deepEqual(data, expectedContextData)
-+          expect(data).to.deep.equal(expectedContextData)
-           done()
-         })
-         w.webContents.reload()
-       })
-       w.loadURL(`file://${fixtures}/api/isolated.html`)
-     })
--    it('enables context isolation on child windows', (done) => {
-+
-+    it('enables context isolation on child windows', done => {
-       app.once('browser-window-created', (event, window) => {
--        assert.equal(window.webContents.getLastWebPreferences().contextIsolation, true)
-+        expect(window.webContents.getLastWebPreferences().contextIsolation).to.be.true()
-         done()
-       })
-       w.loadURL(`file://${fixtures}/pages/window-open.html`)
-     })
--    it('separates the page context from the Electron/preload context with sandbox on', (done) => {
-+
-+    it('separates the page context from the Electron/preload context with sandbox on', done => {
-       ipcMain.once('isolated-sandbox-world', (event, data) => {
--        assert.deepEqual(data, expectedContextData)
-+        expect(data).to.deep.equal(expectedContextData)
-         done()
-       })
-       w.loadURL(`file://${fixtures}/api/isolated.html`)
-     })
--    it('recreates the contexts on reload with sandbox on', (done) => {
-+
-+    it('recreates the contexts on reload with sandbox on', done => {
-       w.webContents.once('did-finish-load', () => {
-         ipcMain.once('isolated-sandbox-world', (event, data) => {
--          assert.deepEqual(data, expectedContextData)
-+          expect(data).to.deep.equal(expectedContextData)
-           done()
-         })
-         w.webContents.reload()
-@@ -3230,85 +3429,85 @@
-       })
-     })
- 
--    it('creates offscreen window with correct size', (done) => {
--      w.webContents.once('paint', function (event, rect, data) {
--        assert.notEqual(data.length, 0)
-+    it('creates offscreen window with correct size', done => {
-+      w.webContents.once('paint', (event, rect, data) => {
-+        expect(data.length).to.not.equal(0)
-         let size = data.getSize()
-         assertWithinDelta(size.width, 100, 2, 'width')
-         assertWithinDelta(size.height, 100, 2, 'height')
-         done()
-       })
--      w.loadURL('file://' + fixtures + '/api/offscreen-rendering.html')
-+      w.loadURL(`file://${fixtures}/api/offscreen-rendering.html`)
-     })
- 
-     describe('window.webContents.isOffscreen()', () => {
-       it('is true for offscreen type', () => {
--        w.loadURL('file://' + fixtures + '/api/offscreen-rendering.html')
--        assert.equal(w.webContents.isOffscreen(), true)
-+        w.loadURL(`file://${fixtures}/api/offscreen-rendering.html`)
-+        expect(w.webContents.isOffscreen()).to.be.true()
-       })
- 
-       it('is false for regular window', () => {
-         let c = new BrowserWindow({show: false})
--        assert.equal(c.webContents.isOffscreen(), false)
-+        expect(c.webContents.isOffscreen()).to.be.false()
-         c.destroy()
-       })
-     })
- 
-     describe('window.webContents.isPainting()', () => {
--      it('returns whether is currently painting', (done) => {
--        w.webContents.once('paint', function (event, rect, data) {
--          assert.equal(w.webContents.isPainting(), true)
-+      it('returns whether is currently painting', done => {
-+        w.webContents.once('paint', (event, rect, data) => {
-+          expect(w.webContents.isPainting()).to.be.true()
-           done()
-         })
--        w.loadURL('file://' + fixtures + '/api/offscreen-rendering.html')
-+        w.loadURL(`file://{$fixtures}/api/offscreen-rendering.html`)
-       })
-     })
- 
-     describe('window.webContents.stopPainting()', () => {
--      it('stops painting', (done) => {
-+      it('stops painting', done => {
-         w.webContents.on('dom-ready', () => {
-           w.webContents.stopPainting()
--          assert.equal(w.webContents.isPainting(), false)
-+          expect(w.webContents.isPainting()).to.be.false()
-           done()
-         })
--        w.loadURL('file://' + fixtures + '/api/offscreen-rendering.html')
-+        w.loadURL(`file://${fixtures}/api/offscreen-rendering.html`)
-       })
-     })
- 
-     describe('window.webContents.startPainting()', () => {
--      it('starts painting', (done) => {
-+      it('starts painting', done => {
-         w.webContents.on('dom-ready', () => {
-           w.webContents.stopPainting()
-           w.webContents.startPainting()
--          w.webContents.once('paint', function (event, rect, data) {
--            assert.equal(w.webContents.isPainting(), true)
-+          w.webContents.once('paint', (event, rect, data) => {
-+            expect(w.webContents.isPainting()).to.be.true()
-             done()
-           })
-         })
--        w.loadURL('file://' + fixtures + '/api/offscreen-rendering.html')
-+        w.loadURL(`file://${fixtures}/api/offscreen-rendering.html`)
-       })
-     })
- 
-     describe('window.webContents.getFrameRate()', () => {
--      it('has default frame rate', (done) => {
--        w.webContents.once('paint', function (event, rect, data) {
--          assert.equal(w.webContents.getFrameRate(), 60)
-+      it('has default frame rate', done => {
-+        w.webContents.once('paint', (event, rect, data) => {
-+          expect(w.webContents.getFrameRate()).to.equal(60)
-           done()
-         })
--        w.loadURL('file://' + fixtures + '/api/offscreen-rendering.html')
-+        w.loadURL(`file://${fixtures}/api/offscreen-rendering.html`)
-       })
-     })
- 
-     describe('window.webContents.setFrameRate(frameRate)', () => {
--      it('sets custom frame rate', (done) => {
-+      it('sets custom frame rate', done => {
-         w.webContents.on('dom-ready', () => {
-           w.webContents.setFrameRate(30)
--          w.webContents.once('paint', function (event, rect, data) {
--            assert.equal(w.webContents.getFrameRate(), 30)
-+          w.webContents.once('paint', (event, rect, data) => {
-+            expect(w.webContents.getFrameRate()).to.equal(30)
-             done()
-           })
-         })
--        w.loadURL('file://' + fixtures + '/api/offscreen-rendering.html')
-+        w.loadURL(`file://${fixtures}/api/offscreen-rendering.html`)
-       })
-     })
-   })
-@@ -3316,7 +3515,7 @@
- 
- const assertBoundsEqual = (actual, expect) => {
-   if (!isScaleFactorRounding()) {
--    assert.deepEqual(expect, actual)
-+    expect(expect).to.deep.equal(actual)
-   } else if (Array.isArray(actual)) {
-     assertWithinDelta(actual[0], expect[0], 1, 'x')
-     assertWithinDelta(actual[1], expect[1], 1, 'y')
-@@ -3330,7 +3529,7 @@
- 
- const assertWithinDelta = (actual, expect, delta, label) => {
-   const result = Math.abs(actual - expect)
--  assert.ok(result <= delta, `${label} value of ${actual} was not within ${delta} of ${expect}`)
-+  expect(result <= delta).to.be.true(`${label} value of ${actual} was not within ${delta} of ${expect}`)
- }
- 
- // Is the display's scale factor possibly causing rounding of pixel coordinate
-added in both
-  our    100644 5bc7ea1f27b7e56669c336a1f6cbae29c662b052 spec/package-lock.json
-  their  100644 16d9e144e8cadc7206d4e2981c4a1855c06dc712 spec/package-lock.json
-@@ -27,12 +27,15 @@
-       "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
-       "dev": true
-     },
-+<<<<<<< .our
-     "async-limiter": {
-       "version": "1.0.0",
-       "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
-       "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "balanced-match": {
-       "version": "1.0.0",
-       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-@@ -40,6 +43,7 @@
-       "dev": true
-     },
-     "basic-auth": {
-+<<<<<<< .our
-       "version": "2.0.0",
-       "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.0.tgz",
-       "integrity": "sha1-AV2z81PgLlY3d1X5YnQuiYHnu7o=",
-@@ -55,6 +59,12 @@
-           "dev": true
-         }
-       }
-+=======
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-1.1.0.tgz",
-+      "integrity": "sha1-RSIe5Cn37h5QNb4/UVM/HN/SmIQ=",
-+      "dev": true
-+>>>>>>> .their
-     },
-     "bindings": {
-       "version": "1.3.0",
-@@ -80,6 +90,7 @@
-       }
-     },
-     "browser-stdout": {
-+<<<<<<< .our
-       "version": "1.3.1",
-       "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
-       "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
-@@ -89,6 +100,23 @@
-       "version": "4.1.0",
-       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-       "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-+=======
-+      "version": "1.3.0",
-+      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz",
-+      "integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8=",
-+      "dev": true
-+    },
-+    "builtin-modules": {
-+      "version": "1.1.1",
-+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
-+      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
-+      "dev": true
-+    },
-+    "camelcase": {
-+      "version": "3.0.0",
-+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-+      "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "chai": {
-@@ -127,6 +155,7 @@
-       "dev": true
-     },
-     "cliui": {
-+<<<<<<< .our
-       "version": "4.1.0",
-       "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
-       "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
-@@ -135,6 +164,33 @@
-         "string-width": "^2.1.1",
-         "strip-ansi": "^4.0.0",
-         "wrap-ansi": "^2.0.0"
-+=======
-+      "version": "3.2.0",
-+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-+      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-+      "dev": true,
-+      "requires": {
-+        "string-width": "^1.0.1",
-+        "strip-ansi": "^3.0.1",
-+        "wrap-ansi": "^2.0.0"
-+      },
-+      "dependencies": {
-+        "ansi-regex": {
-+          "version": "2.1.1",
-+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-+          "dev": true
-+        },
-+        "strip-ansi": {
-+          "version": "3.0.1",
-+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-+          "dev": true,
-+          "requires": {
-+            "ansi-regex": "^2.0.0"
-+          }
-+        }
-+>>>>>>> .their
-       }
-     },
-     "code-point-at": {
-@@ -150,10 +206,20 @@
-       "dev": true
-     },
-     "commander": {
-+<<<<<<< .our
-       "version": "2.15.1",
-       "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
-       "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
-       "dev": true
-+=======
-+      "version": "2.9.0",
-+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
-+      "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
-+      "dev": true,
-+      "requires": {
-+        "graceful-readlink": ">= 1.0.0"
-+      }
-+>>>>>>> .their
-     },
-     "concat-map": {
-       "version": "0.0.1",
-@@ -161,6 +227,7 @@
-       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "cross-spawn": {
-       "version": "5.1.0",
-       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-@@ -172,6 +239,8 @@
-         "which": "^1.2.9"
-       }
-     },
-+=======
-+>>>>>>> .their
-     "crypt": {
-       "version": "0.0.2",
-       "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
-@@ -195,9 +264,15 @@
-       }
-     },
-     "debug": {
-+<<<<<<< .our
-       "version": "2.6.9",
-       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-+=======
-+      "version": "2.6.8",
-+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-+      "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "ms": "2.0.0"
-@@ -231,9 +306,15 @@
-       "dev": true
-     },
-     "diff": {
-+<<<<<<< .our
-       "version": "3.5.0",
-       "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
-       "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
-+=======
-+      "version": "3.2.0",
-+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz",
-+      "integrity": "sha1-yc45Okt8vQsFinJck98pkCeGj/k=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "dirty-chai": {
-@@ -260,6 +341,18 @@
-       "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
-       "dev": true
-     },
-+<<<<<<< .our
-+=======
-+    "error-ex": {
-+      "version": "1.3.1",
-+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz",
-+      "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=",
-+      "dev": true,
-+      "requires": {
-+        "is-arrayish": "^0.2.1"
-+      }
-+    },
-+>>>>>>> .their
-     "escape-html": {
-       "version": "1.0.3",
-       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-@@ -280,7 +373,11 @@
-     },
-     "event-stream": {
-       "version": "3.3.4",
-+<<<<<<< .our
-       "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
-+=======
-+      "resolved": "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
-+>>>>>>> .their
-       "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
-       "dev": true,
-       "requires": {
-@@ -293,6 +390,7 @@
-         "through": "~2.3.1"
-       }
-     },
-+<<<<<<< .our
-     "execa": {
-       "version": "0.7.0",
-       "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-@@ -308,6 +406,8 @@
-         "strip-eof": "^1.0.0"
-       }
-     },
-+=======
-+>>>>>>> .their
-     "fd-slicer": {
-       "version": "1.0.1",
-       "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
-@@ -318,12 +418,22 @@
-       }
-     },
-     "find-up": {
-+<<<<<<< .our
-       "version": "2.1.0",
-       "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-       "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-       "dev": true,
-       "requires": {
-         "locate-path": "^2.0.0"
-+=======
-+      "version": "1.1.2",
-+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-+      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-+      "dev": true,
-+      "requires": {
-+        "path-exists": "^2.0.0",
-+        "pinkie-promise": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "fresh": {
-@@ -356,6 +466,7 @@
-       "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "get-stream": {
-       "version": "3.0.0",
-       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-@@ -366,12 +477,22 @@
-       "version": "7.1.2",
-       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-       "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+=======
-+    "glob": {
-+      "version": "7.1.1",
-+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz",
-+      "integrity": "sha1-gFIR3wT6rxxjo2ADBs31reULLsg=",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "fs.realpath": "^1.0.0",
-         "inflight": "^1.0.4",
-         "inherits": "2",
-+<<<<<<< .our
-         "minimatch": "^3.0.4",
-+=======
-+        "minimatch": "^3.0.2",
-+>>>>>>> .their
-         "once": "^1.3.0",
-         "path-is-absolute": "^1.0.0"
-       }
-@@ -382,6 +503,7 @@
-       "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "growl": {
-       "version": "1.10.5",
-       "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
-@@ -392,6 +514,24 @@
-       "version": "3.0.0",
-       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-       "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-+=======
-+    "graceful-readlink": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
-+      "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
-+      "dev": true
-+    },
-+    "growl": {
-+      "version": "1.9.2",
-+      "resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz",
-+      "integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=",
-+      "dev": true
-+    },
-+    "has-flag": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-+      "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "he": {
-@@ -406,6 +546,15 @@
-       "integrity": "sha512-ciq6hFsSG/Bpt2DmrZJtv+56zpPdnq+NQ4ijEFrveKN0ZG1mhl/LdT1NQZ9se6ty1fACcI4d4vYqC9v8EYpH2A==",
-       "dev": true
-     },
-+<<<<<<< .our
-+=======
-+    "hosted-git-info": {
-+      "version": "2.6.0",
-+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.0.tgz",
-+      "integrity": "sha512-lIbgIIQA3lz5XaB6vxakj6sDHADJiZadYEJB+FgA+C4nubM1NwcuvUr9EJPmnH1skZqpqUzWborWo8EIUi0Sdw==",
-+      "dev": true
-+    },
-+>>>>>>> .their
-     "http-errors": {
-       "version": "1.6.3",
-       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-@@ -440,12 +589,22 @@
-       "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
-       "dev": true
-     },
-+<<<<<<< .our
-+=======
-+    "is-arrayish": {
-+      "version": "0.2.1",
-+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-+      "dev": true
-+    },
-+>>>>>>> .their
-     "is-buffer": {
-       "version": "1.1.6",
-       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-       "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-       "dev": true
-     },
-+<<<<<<< .our
-     "is-fullwidth-code-point": {
-       "version": "2.0.0",
-       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-@@ -462,6 +621,36 @@
-       "version": "2.0.0",
-       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-       "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-+=======
-+    "is-builtin-module": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
-+      "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
-+      "dev": true,
-+      "requires": {
-+        "builtin-modules": "^1.0.0"
-+      }
-+    },
-+    "is-fullwidth-code-point": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-+      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-+      "dev": true,
-+      "requires": {
-+        "number-is-nan": "^1.0.0"
-+      }
-+    },
-+    "is-utf8": {
-+      "version": "0.2.1",
-+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-+      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
-+      "dev": true
-+    },
-+    "json3": {
-+      "version": "3.3.2",
-+      "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
-+      "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "lcid": {
-@@ -473,6 +662,7 @@
-         "invert-kv": "^1.0.0"
-       }
-     },
-+<<<<<<< .our
-     "locate-path": {
-       "version": "2.0.0",
-       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-@@ -499,6 +689,95 @@
-         "yallist": "^2.1.2"
-       }
-     },
-+=======
-+    "load-json-file": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-+      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-+      "dev": true,
-+      "requires": {
-+        "graceful-fs": "^4.1.2",
-+        "parse-json": "^2.2.0",
-+        "pify": "^2.0.0",
-+        "pinkie-promise": "^2.0.0",
-+        "strip-bom": "^2.0.0"
-+      }
-+    },
-+    "lodash._baseassign": {
-+      "version": "3.2.0",
-+      "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
-+      "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=",
-+      "dev": true,
-+      "requires": {
-+        "lodash._basecopy": "^3.0.0",
-+        "lodash.keys": "^3.0.0"
-+      }
-+    },
-+    "lodash._basecopy": {
-+      "version": "3.0.1",
-+      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
-+      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
-+      "dev": true
-+    },
-+    "lodash._basecreate": {
-+      "version": "3.0.3",
-+      "resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz",
-+      "integrity": "sha1-G8ZhYU2qf8MRt9A78WgGoCE8+CE=",
-+      "dev": true
-+    },
-+    "lodash._getnative": {
-+      "version": "3.9.1",
-+      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-+      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
-+      "dev": true
-+    },
-+    "lodash._isiterateecall": {
-+      "version": "3.0.9",
-+      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
-+      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
-+      "dev": true
-+    },
-+    "lodash.create": {
-+      "version": "3.1.1",
-+      "resolved": "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz",
-+      "integrity": "sha1-1/KEnw29p+BGgruM1yqwIkYd6+c=",
-+      "dev": true,
-+      "requires": {
-+        "lodash._baseassign": "^3.0.0",
-+        "lodash._basecreate": "^3.0.0",
-+        "lodash._isiterateecall": "^3.0.0"
-+      }
-+    },
-+    "lodash.isarguments": {
-+      "version": "3.1.0",
-+      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
-+      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
-+      "dev": true
-+    },
-+    "lodash.isarray": {
-+      "version": "3.0.4",
-+      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-+      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
-+      "dev": true
-+    },
-+    "lodash.keys": {
-+      "version": "3.1.2",
-+      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
-+      "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
-+      "dev": true,
-+      "requires": {
-+        "lodash._getnative": "^3.0.0",
-+        "lodash.isarguments": "^3.0.0",
-+        "lodash.isarray": "^3.0.0"
-+      }
-+    },
-+    "long": {
-+      "version": "3.2.0",
-+      "resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz",
-+      "integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=",
-+      "dev": true
-+    },
-+>>>>>>> .their
-     "map-stream": {
-       "version": "0.1.0",
-       "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
-@@ -516,6 +795,7 @@
-         "is-buffer": "~1.1.1"
-       }
-     },
-+<<<<<<< .our
-     "mem": {
-       "version": "1.1.0",
-       "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
-@@ -525,18 +805,23 @@
-         "mimic-fn": "^1.0.0"
-       }
-     },
-+=======
-+>>>>>>> .their
-     "mime": {
-       "version": "1.4.1",
-       "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-       "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
-       "dev": true
-     },
-+<<<<<<< .our
-     "mimic-fn": {
-       "version": "1.2.0",
-       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-       "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "minimatch": {
-       "version": "3.0.4",
-       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-@@ -570,6 +855,7 @@
-       }
-     },
-     "mocha": {
-+<<<<<<< .our
-       "version": "5.2.0",
-       "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz",
-       "integrity": "sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==",
-@@ -597,6 +883,25 @@
-             "ms": "2.0.0"
-           }
-         }
-+=======
-+      "version": "3.5.3",
-+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-3.5.3.tgz",
-+      "integrity": "sha512-/6na001MJWEtYxHOV1WLfsmR4YIynkUEhBwzsb+fk2qmQ3iqsi258l/Q2MWHJMImAcNpZ8DEdYAK72NHoIQ9Eg==",
-+      "dev": true,
-+      "requires": {
-+        "browser-stdout": "1.3.0",
-+        "commander": "2.9.0",
-+        "debug": "2.6.8",
-+        "diff": "3.2.0",
-+        "escape-string-regexp": "1.0.5",
-+        "glob": "7.1.1",
-+        "growl": "1.9.2",
-+        "he": "1.1.1",
-+        "json3": "3.3.2",
-+        "lodash.create": "3.1.1",
-+        "mkdirp": "0.5.1",
-+        "supports-color": "3.1.2"
-+>>>>>>> .their
-       }
-     },
-     "mocha-junit-reporter": {
-@@ -634,6 +939,7 @@
-       "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==",
-       "optional": true
-     },
-+<<<<<<< .our
-     "npm-run-path": {
-       "version": "2.0.2",
-       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-@@ -641,6 +947,18 @@
-       "dev": true,
-       "requires": {
-         "path-key": "^2.0.0"
-+=======
-+    "normalize-package-data": {
-+      "version": "2.4.0",
-+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-+      "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
-+      "dev": true,
-+      "requires": {
-+        "hosted-git-info": "^2.1.4",
-+        "is-builtin-module": "^1.0.0",
-+        "semver": "2 || 3 || 4 || 5",
-+        "validate-npm-package-license": "^3.0.1"
-+>>>>>>> .their
-       }
-     },
-     "number-is-nan": {
-@@ -677,6 +995,7 @@
-         "wordwrap": "~0.0.2"
-       }
-     },
-+<<<<<<< .our
-     "os-locale": {
-       "version": "2.1.0",
-       "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
-@@ -686,6 +1005,21 @@
-         "execa": "^0.7.0",
-         "lcid": "^1.0.0",
-         "mem": "^1.1.0"
-+=======
-+    "options": {
-+      "version": "0.0.6",
-+      "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz",
-+      "integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8=",
-+      "dev": true
-+    },
-+    "os-locale": {
-+      "version": "1.4.0",
-+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-+      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-+      "dev": true,
-+      "requires": {
-+        "lcid": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "os-tmpdir": {
-@@ -694,6 +1028,7 @@
-       "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "p-finally": {
-       "version": "1.0.0",
-       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-@@ -730,17 +1065,50 @@
-       "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-       "dev": true
-     },
-+=======
-+    "parse-json": {
-+      "version": "2.2.0",
-+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-+      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-+      "dev": true,
-+      "requires": {
-+        "error-ex": "^1.2.0"
-+      }
-+    },
-+    "path-exists": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-+      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-+      "dev": true,
-+      "requires": {
-+        "pinkie-promise": "^2.0.0"
-+      }
-+    },
-+>>>>>>> .their
-     "path-is-absolute": {
-       "version": "1.0.1",
-       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-       "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "path-key": {
-       "version": "2.0.1",
-       "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-       "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
-       "dev": true
-+=======
-+    "path-type": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-+      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-+      "dev": true,
-+      "requires": {
-+        "graceful-fs": "^4.1.2",
-+        "pify": "^2.0.0",
-+        "pinkie-promise": "^2.0.0"
-+      }
-+>>>>>>> .their
-     },
-     "pathval": {
-       "version": "1.1.0",
-@@ -763,12 +1131,36 @@
-       "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "pseudomap": {
-       "version": "1.0.2",
-       "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-       "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
-       "dev": true
-     },
-+=======
-+    "pify": {
-+      "version": "2.3.0",
-+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-+      "dev": true
-+    },
-+    "pinkie": {
-+      "version": "2.0.4",
-+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-+      "dev": true
-+    },
-+    "pinkie-promise": {
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-+      "dev": true,
-+      "requires": {
-+        "pinkie": "^2.0.0"
-+      }
-+    },
-+>>>>>>> .their
-     "put": {
-       "version": "0.0.6",
-       "resolved": "https://registry.npmjs.org/put/-/put-0.0.6.tgz",
-@@ -787,6 +1179,30 @@
-       "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=",
-       "dev": true
-     },
-+<<<<<<< .our
-+=======
-+    "read-pkg": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-+      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-+      "dev": true,
-+      "requires": {
-+        "load-json-file": "^1.0.0",
-+        "normalize-package-data": "^2.3.2",
-+        "path-type": "^1.0.0"
-+      }
-+    },
-+    "read-pkg-up": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-+      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-+      "dev": true,
-+      "requires": {
-+        "find-up": "^1.0.0",
-+        "read-pkg": "^1.0.0"
-+      }
-+    },
-+>>>>>>> .their
-     "require-directory": {
-       "version": "2.1.1",
-       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-@@ -826,6 +1242,15 @@
-       "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-       "dev": true
-     },
-+<<<<<<< .our
-+=======
-+    "semver": {
-+      "version": "5.5.0",
-+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
-+      "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
-+      "dev": true
-+    },
-+>>>>>>> .their
-     "send": {
-       "version": "0.16.2",
-       "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
-@@ -870,6 +1295,7 @@
-       "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-       "dev": true
-     },
-+<<<<<<< .our
-     "shebang-command": {
-       "version": "1.2.0",
-       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-@@ -889,6 +1315,38 @@
-       "version": "3.0.2",
-       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-       "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
-+=======
-+    "spdx-correct": {
-+      "version": "3.0.0",
-+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz",
-+      "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==",
-+      "dev": true,
-+      "requires": {
-+        "spdx-expression-parse": "^3.0.0",
-+        "spdx-license-ids": "^3.0.0"
-+      }
-+    },
-+    "spdx-exceptions": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz",
-+      "integrity": "sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==",
-+      "dev": true
-+    },
-+    "spdx-expression-parse": {
-+      "version": "3.0.0",
-+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
-+      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
-+      "dev": true,
-+      "requires": {
-+        "spdx-exceptions": "^2.1.0",
-+        "spdx-license-ids": "^3.0.0"
-+      }
-+    },
-+    "spdx-license-ids": {
-+      "version": "3.0.0",
-+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz",
-+      "integrity": "sha512-2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "split": {
-@@ -916,6 +1374,7 @@
-       }
-     },
-     "string-width": {
-+<<<<<<< .our
-       "version": "2.1.1",
-       "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-       "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-@@ -923,6 +1382,33 @@
-       "requires": {
-         "is-fullwidth-code-point": "^2.0.0",
-         "strip-ansi": "^4.0.0"
-+=======
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-+      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-+      "dev": true,
-+      "requires": {
-+        "code-point-at": "^1.0.0",
-+        "is-fullwidth-code-point": "^1.0.0",
-+        "strip-ansi": "^3.0.0"
-+      },
-+      "dependencies": {
-+        "ansi-regex": {
-+          "version": "2.1.1",
-+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-+          "dev": true
-+        },
-+        "strip-ansi": {
-+          "version": "3.0.1",
-+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-+          "dev": true,
-+          "requires": {
-+            "ansi-regex": "^2.0.0"
-+          }
-+        }
-+>>>>>>> .their
-       }
-     },
-     "strip-ansi": {
-@@ -934,6 +1420,7 @@
-         "ansi-regex": "^3.0.0"
-       }
-     },
-+<<<<<<< .our
-     "strip-eof": {
-       "version": "1.0.0",
-       "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-@@ -947,6 +1434,24 @@
-       "dev": true,
-       "requires": {
-         "has-flag": "^3.0.0"
-+=======
-+    "strip-bom": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-+      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-+      "dev": true,
-+      "requires": {
-+        "is-utf8": "^0.2.0"
-+      }
-+    },
-+    "supports-color": {
-+      "version": "3.1.2",
-+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz",
-+      "integrity": "sha1-cqJiiU2dQIuVbKBf83su2KbiotU=",
-+      "dev": true,
-+      "requires": {
-+        "has-flag": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "temp": {
-@@ -971,6 +1476,7 @@
-       "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-       "dev": true
-     },
-+<<<<<<< .our
-     "walkdir": {
-       "version": "0.0.12",
-       "resolved": "https://registry.npmjs.org/walkdir/-/walkdir-0.0.12.tgz",
-@@ -990,6 +1496,34 @@
-       "version": "2.0.0",
-       "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-       "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-+=======
-+    "ultron": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz",
-+      "integrity": "sha1-rOEWq1V80Zc4ak6I9GhTeMiy5Po=",
-+      "dev": true
-+    },
-+    "validate-npm-package-license": {
-+      "version": "3.0.3",
-+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz",
-+      "integrity": "sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==",
-+      "dev": true,
-+      "requires": {
-+        "spdx-correct": "^3.0.0",
-+        "spdx-expression-parse": "^3.0.0"
-+      }
-+    },
-+    "walkdir": {
-+      "version": "0.0.11",
-+      "resolved": "https://registry.npmjs.org/walkdir/-/walkdir-0.0.11.tgz",
-+      "integrity": "sha1-oW0CXrkxvQO1LzCMrtD0D86+lTI=",
-+      "dev": true
-+    },
-+    "which-module": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-+      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "winreg": {
-@@ -1020,6 +1554,7 @@
-           "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-           "dev": true
-         },
-+<<<<<<< .our
-         "is-fullwidth-code-point": {
-           "version": "1.0.0",
-           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-@@ -1040,6 +1575,8 @@
-             "strip-ansi": "^3.0.0"
-           }
-         },
-+=======
-+>>>>>>> .their
-         "strip-ansi": {
-           "version": "3.0.1",
-           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-@@ -1058,12 +1595,22 @@
-       "dev": true
-     },
-     "ws": {
-+<<<<<<< .our
-       "version": "5.2.0",
-       "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.0.tgz",
-       "integrity": "sha512-c18dMeW+PEQdDFzkhDsnBAlS4Z8KGStBQQUcQ5mf7Nf689jyGk0594L+i9RaQuf4gog6SvWLJorz2NfSaqxZ7w==",
-       "dev": true,
-       "requires": {
-         "async-limiter": "~1.0.0"
-+=======
-+      "version": "1.1.5",
-+      "resolved": "https://registry.npmjs.org/ws/-/ws-1.1.5.tgz",
-+      "integrity": "sha512-o3KqipXNUdS7wpQzBHSe180lBGO60SoK0yVo3CYJgb2MkobuWuBX6dhkYP5ORCLd55y+SaflMOV5fqAB53ux4w==",
-+      "dev": true,
-+      "requires": {
-+        "options": ">=0.0.5",
-+        "ultron": "1.0.x"
-+>>>>>>> .their
-       }
-     },
-     "xml": {
-@@ -1087,6 +1634,7 @@
-       "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "yallist": {
-       "version": "2.1.2",
-       "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-@@ -1120,6 +1668,36 @@
-       "dev": true,
-       "requires": {
-         "camelcase": "^4.1.0"
-+=======
-+    "yargs": {
-+      "version": "6.6.0",
-+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz",
-+      "integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=",
-+      "dev": true,
-+      "requires": {
-+        "camelcase": "^3.0.0",
-+        "cliui": "^3.2.0",
-+        "decamelize": "^1.1.1",
-+        "get-caller-file": "^1.0.1",
-+        "os-locale": "^1.4.0",
-+        "read-pkg-up": "^1.0.1",
-+        "require-directory": "^2.1.1",
-+        "require-main-filename": "^1.0.1",
-+        "set-blocking": "^2.0.0",
-+        "string-width": "^1.0.2",
-+        "which-module": "^1.0.0",
-+        "y18n": "^3.2.1",
-+        "yargs-parser": "^4.2.0"
-+      }
-+    },
-+    "yargs-parser": {
-+      "version": "4.2.1",
-+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz",
-+      "integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=",
-+      "dev": true,
-+      "requires": {
-+        "camelcase": "^3.0.0"
-+>>>>>>> .their
-       }
-     }
-   }
diff --git a/app/test/fixtures/merge-parser/electron/merge-expect-more-specs-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-expect-more-specs-into-master.txt
deleted file mode 100644
index bfbded0a06a..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-expect-more-specs-into-master.txt
+++ /dev/null
@@ -1,298 +0,0 @@
-merged
-  result 100644 9820ddfae4751c478b2d7f1625a4b89bd77e6a12 spec/api-notification-spec.js
-  our    100644 f2e9a4f801c111b427bf37def51d66b2204f7cf6 spec/api-notification-spec.js
-@@ -1,4 +1,8 @@
--const assert = require('assert')
-+const chai = require('chai')
-+const dirtyChai = require('dirty-chai')
-+
-+const {expect} = chai
-+chai.use(dirtyChai)
- 
- const {Notification} = require('electron').remote
- 
-@@ -13,29 +17,29 @@
-       closeButtonText: 'closeButtonText'
-     })
- 
--    assert.equal(n.title, 'title')
-+    expect(n.title).to.equal('title')
-     n.title = 'title1'
--    assert.equal(n.title, 'title1')
-+    expect(n.title).to.equal('title1')
- 
--    assert.equal(n.subtitle, 'subtitle')
-+    expect(n.subtitle).equal('subtitle')
-     n.subtitle = 'subtitle1'
--    assert.equal(n.subtitle, 'subtitle1')
-+    expect(n.subtitle).equal('subtitle1')
- 
--    assert.equal(n.body, 'body')
-+    expect(n.body).to.equal('body')
-     n.body = 'body1'
--    assert.equal(n.body, 'body1')
-+    expect(n.body).to.equal('body1')
- 
--    assert.equal(n.replyPlaceholder, 'replyPlaceholder')
-+    expect(n.replyPlaceholder).to.equal('replyPlaceholder')
-     n.replyPlaceholder = 'replyPlaceholder1'
--    assert.equal(n.replyPlaceholder, 'replyPlaceholder1')
-+    expect(n.replyPlaceholder).to.equal('replyPlaceholder1')
- 
--    assert.equal(n.sound, 'sound')
-+    expect(n.sound).to.equal('sound')
-     n.sound = 'sound1'
--    assert.equal(n.sound, 'sound1')
-+    expect(n.sound).to.equal('sound1')
- 
--    assert.equal(n.closeButtonText, 'closeButtonText')
-+    expect(n.closeButtonText).to.equal('closeButtonText')
-     n.closeButtonText = 'closeButtonText1'
--    assert.equal(n.closeButtonText, 'closeButtonText1')
-+    expect(n.closeButtonText).to.equal('closeButtonText1')
-   })
- 
-   it('inits, gets and sets basic boolean properties correctly', () => {
-@@ -44,13 +48,13 @@
-       hasReply: true
-     })
- 
--    assert.equal(n.silent, true)
-+    expect(n.silent).to.be.true()
-     n.silent = false
--    assert.equal(n.silent, false)
-+    expect(n.silent).to.be.false()
- 
--    assert.equal(n.hasReply, true)
-+    expect(n.hasReply).to.be.true()
-     n.hasReply = false
--    assert.equal(n.hasReply, false)
-+    expect(n.hasReply).to.be.false()
-   })
- 
-   it('inits, gets and sets actions correctly', () => {
-@@ -66,10 +70,10 @@
-       ]
-     })
- 
--    assert.equal(n.actions[0].type, 'button')
--    assert.equal(n.actions[0].text, '1')
--    assert.equal(n.actions[1].type, 'button')
--    assert.equal(n.actions[1].text, '2')
-+    expect(n.actions[0].type).to.equal('button')
-+    expect(n.actions[0].text).to.equal('1')
-+    expect(n.actions[1].type).to.equal('button')
-+    expect(n.actions[1].text).to.equal('2')
- 
-     n.actions = [
-       {
-@@ -81,10 +85,10 @@
-       }
-     ]
- 
--    assert.equal(n.actions[0].type, 'button')
--    assert.equal(n.actions[0].text, '3')
--    assert.equal(n.actions[1].type, 'button')
--    assert.equal(n.actions[1].text, '4')
-+    expect(n.actions[0].type).to.equal('button')
-+    expect(n.actions[0].text).to.equal('3')
-+    expect(n.actions[1].type).to.equal('button')
-+    expect(n.actions[1].text).to.equal('4')
-   })
- 
-   // TODO(sethlu): Find way to test init with notification icon?
-merged
-  result 100644 9b53c95b8523947fbe9c8868bd9979bbc36bbccf spec/api-power-monitor-spec.js
-  our    100644 aa1e3b050ce0e8c604725c93f3b7d21c75ed1f55 spec/api-power-monitor-spec.js
-@@ -6,10 +6,14 @@
- //
- // See https://pypi.python.org/pypi/python-dbusmock for more information about
- // python-dbusmock.
--const assert = require('assert')
-+const chai = require('chai')
-+const dirtyChai = require('dirty-chai')
- const dbus = require('dbus-native')
- const Promise = require('bluebird')
- 
-+const {expect} = chai
-+chai.use(dirtyChai)
-+
- const skip = process.platform !== 'linux' || !process.env.DBUS_SYSTEM_BUS_ADDRESS
- 
- // TODO(alexeykuzmin): [Ch66] Crashes on Linux ia32. Fix it and enable back.
-@@ -27,9 +31,7 @@
-       reset = Promise.promisify(logindMock.Reset, {context: logindMock})
-     })
- 
--    after(async () => {
--      await reset()
--    })
-+    after(async () => { await reset() })
-   }
- 
-   (skip ? describe.skip : describe)('when powerMonitor module is loaded with dbus mock', () => {
-@@ -41,7 +43,7 @@
-       return cb
-     }
- 
--    before((done) => {
-+    before(done => {
-       logindMock.on('MethodCalled', onceMethodCalled(done))
-       // lazy load powerMonitor after we listen to MethodCalled mock signal
-       dbusMockPowerMonitor = require('electron').remote.powerMonitor
-@@ -49,8 +51,8 @@
- 
-     it('should call Inhibit to delay suspend', async () => {
-       const calls = await getCalls()
--      assert.equal(calls.length, 1)
--      assert.deepEqual(calls[0].slice(1), [
-+      expect(calls.length).to.equal(1)
-+      expect(calls[0].slice(1)).to.deep.equal([
-         'Inhibit', [
-           [[{type: 's', child: []}], ['sleep']],
-           [[{type: 's', child: []}], ['electron']],
-@@ -68,7 +70,7 @@
-       })
- 
-       describe('when PrepareForSleep(false) signal is sent by logind', () => {
--        it('should emit "resume" event', (done) => {
-+        it('should emit "resume" event', done => {
-           dbusMockPowerMonitor.once('resume', () => done())
-           emitSignal('org.freedesktop.login1.Manager', 'PrepareForSleep',
-             'b', [['b', false]])
-@@ -76,8 +78,8 @@
- 
-         it('should have called Inhibit again', async () => {
-           const calls = await getCalls()
--          assert.equal(calls.length, 2)
--          assert.deepEqual(calls[1].slice(1), [
-+          expect(calls.length).to.equal(2)
-+          expect(calls[1].slice(1)).to.deep.equal([
-             'Inhibit', [
-               [[{type: 's', child: []}], ['sleep']],
-               [[{type: 's', child: []}], ['electron']],
-@@ -92,14 +94,14 @@
-     describe('when a listener is added to shutdown event', () => {
-       before(async () => {
-         const calls = await getCalls()
--        assert.equal(calls.length, 2)
-+        expect(calls.length).to.equal(2)
-         dbusMockPowerMonitor.once('shutdown', () => { })
-       })
- 
-       it('should call Inhibit to delay shutdown', async () => {
-         const calls = await getCalls()
--        assert.equal(calls.length, 3)
--        assert.deepEqual(calls[2].slice(1), [
-+        expect(calls.length).to.equal(3)
-+        expect(calls[2].slice(1)).to.deep.equal([
-           'Inhibit', [
-             [[{type: 's', child: []}], ['shutdown']],
-             [[{type: 's', child: []}], ['electron']],
-@@ -110,7 +112,7 @@
-       })
- 
-       describe('when PrepareForShutdown(true) signal is sent by logind', () => {
--        it('should emit "shutdown" event', (done) => {
-+        it('should emit "shutdown" event', done => {
-           dbusMockPowerMonitor.once('shutdown', () => { done() })
-           emitSignal('org.freedesktop.login1.Manager', 'PrepareForShutdown',
-             'b', [['b', true]])
-@@ -126,35 +128,32 @@
-     })
- 
-     describe('powerMonitor.querySystemIdleState', () => {
--      it('notify current system idle state', (done) => {
--        powerMonitor.querySystemIdleState(1, (idleState) => {
--          assert.ok(idleState)
-+      it('notify current system idle state', done => {
-+        powerMonitor.querySystemIdleState(1, idleState => {
-+          expect(idleState).to.be.true()
-           done()
-         })
-       })
- 
-       it('does not accept non positive integer threshold', () => {
--        assert.throws(() => {
--          powerMonitor.querySystemIdleState(-1, (idleState) => {
--          })
--        })
-+        expect(() => {
-+          powerMonitor.querySystemIdleState(-1, (idleState) => {})
-+        }).to.throw()
- 
--        assert.throws(() => {
--          powerMonitor.querySystemIdleState(NaN, (idleState) => {
--          })
--        })
-+        expect(() => {
-+          powerMonitor.querySystemIdleState(NaN, (idleState) => {})
-+        }).to.throw()
- 
--        assert.throws(() => {
--          powerMonitor.querySystemIdleState('a', (idleState) => {
--          })
--        })
-+        expect(() => {
-+          powerMonitor.querySystemIdleState('a', (idleState) => {})
-+        }).to.throw()
-       })
-     })
- 
-     describe('powerMonitor.querySystemIdleTime', () => {
--      it('notify current system idle time', (done) => {
--        powerMonitor.querySystemIdleTime((idleTime) => {
--          assert.ok(idleTime >= 0)
-+      it('notify current system idle time', done => {
-+        powerMonitor.querySystemIdleTime(idleTime => {
-+          expect(idleTime).to.be.at.least(0)
-           done()
-         })
-       })
-merged
-  result 100644 50d5bef547616a864243ca5326b268ac6929c805 spec/api-power-save-blocker-spec.js
-  our    100644 be97bcb301a675c711740ca5073608098223edae spec/api-power-save-blocker-spec.js
-@@ -1,13 +1,17 @@
- const {powerSaveBlocker} = require('electron').remote
--const assert = require('assert')
-+const chai = require('chai')
-+const dirtyChai = require('dirty-chai')
-+
-+const {expect} = chai
-+chai.use(dirtyChai)
- 
- describe('powerSaveBlocker module', () => {
-   it('can be started and stopped', () => {
--    assert.equal(powerSaveBlocker.isStarted(-1), false)
-+    expect(powerSaveBlocker.isStarted(-1)).to.be.false()
-     const id = powerSaveBlocker.start('prevent-app-suspension')
--    assert.ok(id != null)
--    assert.equal(powerSaveBlocker.isStarted(id), true)
-+    expect(id).to.not.be.null()
-+    expect(powerSaveBlocker.isStarted(id)).to.be.true()
-     powerSaveBlocker.stop(id)
--    assert.equal(powerSaveBlocker.isStarted(id), false)
-+    expect(powerSaveBlocker.isStarted(id)).to.be.false()
-   })
- })
-changed in both
-  base   100644 1de5e1a19dc7175eac1338b89d0f882a37bd91c0 spec/api-process-spec.js
-  our    100644 ad8f1faea14208d2659c505105c1e70938bba2b9 spec/api-process-spec.js
-  their  100644 4fc37cf7f0051bd7235e903887ecb645f238a5b3 spec/api-process-spec.js
-@@ -31,6 +31,7 @@
-       expect(ioCounters.readTransferCount).to.be.a('number')
-       expect(ioCounters.writeTransferCount).to.be.a('number')
-       expect(ioCounters.otherTransferCount).to.be.a('number')
-+<<<<<<< .our
-     })
-   })
- 
-@@ -49,6 +50,8 @@
-       const systemMemoryInfo = process.getSystemMemoryInfo()
-       expect(systemMemoryInfo.free).to.be.a('number')
-       expect(systemMemoryInfo.total).to.be.a('number')
-+=======
-+>>>>>>> .their
-     })
-   })
- 
diff --git a/app/test/fixtures/merge-parser/electron/merge-fetch_job_uaf_patch-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-fetch_job_uaf_patch-into-master.txt
deleted file mode 100644
index 77c5ab89cc2..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-fetch_job_uaf_patch-into-master.txt
+++ /dev/null
@@ -1,393 +0,0 @@
-changed in both
-  base   100644 ff426dd08c8e39bcb23aeff2cdf03f2db414529e atom/browser/net/url_request_fetch_job.cc
-  our    100644 68539433f4de80a96bc672de3a2834b299d6c04b atom/browser/net/url_request_fetch_job.cc
-  their  100644 1663889c22eab0ed2ba50e3b29616e82f3740d74 atom/browser/net/url_request_fetch_job.cc
-@@ -12,12 +12,15 @@
- #include "base/guid.h"
- #include "base/memory/ptr_util.h"
- #include "base/strings/string_util.h"
-+#include "brightray/browser/url_request_context_getter.h"
-+#include "content/browser/streams/stream_context.h"
- #include "native_mate/dictionary.h"
- #include "net/base/io_buffer.h"
- #include "net/base/net_errors.h"
- #include "net/http/http_response_headers.h"
- #include "net/url_request/url_fetcher.h"
- #include "net/url_request/url_fetcher_response_writer.h"
-+#include "url/url_constants.h"
- 
- using content::BrowserThread;
- 
-@@ -62,7 +65,9 @@
-       job_->HeadersCompleted();
-       first_write_ = false;
-     }
--    return job_->DataAvailable(buffer, num_bytes, callback);
-+
-+    job_->stream()->AddData(buffer->data(), num_bytes);
-+    return num_bytes;
-   }
-   int Finish(int net_error, const net::CompletionCallback& callback) override {
-     return net::OK;
-@@ -79,9 +84,15 @@
- 
- URLRequestFetchJob::URLRequestFetchJob(net::URLRequest* request,
-                                        net::NetworkDelegate* network_delegate)
-+<<<<<<< .our
-     : JsAsker<net::URLRequestJob>(request, network_delegate) {}
- 
- URLRequestFetchJob::~URLRequestFetchJob() = default;
-+=======
-+    : JsAsker<net::URLRequestJob>(request, network_delegate),
-+      pending_buffer_size_(0),
-+      total_bytes_read_(0) {}
-+>>>>>>> .their
- 
- void URLRequestFetchJob::BeforeStartInUI(v8::Isolate* isolate,
-                                          v8::Local<v8::Value> value) {
-@@ -166,7 +177,22 @@
-   fetcher_->SetExtraRequestHeaders(
-       request()->extra_request_headers().ToString());
- 
--  fetcher_->Start();
-+  // Create readable stream for URLFetcher response.
-+  content::StreamContext* stream_context =
-+      static_cast<brightray::URLRequestContextGetter*>(request_context_getter())
-+          ->stream_context();
-+
-+  if (stream_context) {
-+    GURL stream_url(std::string(url::kBlobScheme) + ":" +
-+                    formated_url.GetOrigin().spec() + base::GenerateGUID());
-+    stream_ =
-+        new content::Stream(stream_context->registry(), nullptr, stream_url);
-+    stream_->SetReadObserver(this);
-+    fetcher_->Start();
-+  } else {
-+    NotifyStartError(net::URLRequestStatus(net::URLRequestStatus::CANCELED,
-+                                           net::ERR_ABORTED));
-+  }
- }
- 
- void URLRequestFetchJob::HeadersCompleted() {
-@@ -175,6 +201,7 @@
-   NotifyHeadersComplete();
- }
- 
-+<<<<<<< .our
- int URLRequestFetchJob::DataAvailable(net::IOBuffer* buffer,
-                                       int num_bytes,
-                                       const net::CompletionCallback& callback) {
-@@ -196,25 +223,57 @@
-   return bytes_read;
- }
- 
-+=======
-+>>>>>>> .their
- void URLRequestFetchJob::Kill() {
-   JsAsker<URLRequestJob>::Kill();
-+  ClearStream();
-   fetcher_.reset();
- }
- 
-+void URLRequestFetchJob::OnDataAvailable(content::Stream* stream) {
-+  if (!pending_buffer_.get())
-+    return;
-+
-+  int result = 0;
-+  auto state = stream_->ReadRawData(pending_buffer_.get(), pending_buffer_size_,
-+                                    &result);
-+  if (state == content::Stream::STREAM_ABORTED)
-+    result = net::ERR_CONNECTION_RESET;
-+
-+  // Clear the buffers before notifying the read is complete, so that it is
-+  // safe for the observer to read.
-+  pending_buffer_ = nullptr;
-+  pending_buffer_size_ = 0;
-+
-+  if (result > 0)
-+    total_bytes_read_ += result;
-+  ReadRawDataComplete(result);
-+}
-+
- int URLRequestFetchJob::ReadRawData(net::IOBuffer* dest, int dest_size) {
-   if (GetResponseCode() == 204) {
-     request()->set_received_response_content_length(prefilter_bytes_read());
-     return net::OK;
-   }
- 
--  // When write_buffer_ is empty, there is no data valable yet, we have to save
--  // the dest buffer util DataAvailable.
--  if (!write_buffer_.get()) {
--    pending_buffer_ = dest;
--    pending_buffer_size_ = dest_size;
--    return net::ERR_IO_PENDING;
-+  int bytes_read = 0;
-+  switch (stream_->ReadRawData(dest, dest_size, &bytes_read)) {
-+    case content::Stream::STREAM_HAS_DATA:
-+      total_bytes_read_ += bytes_read;
-+      return bytes_read;
-+    case content::Stream::STREAM_COMPLETE:
-+      return stream_->GetStatus();
-+    case content::Stream::STREAM_EMPTY:
-+      pending_buffer_ = dest;
-+      pending_buffer_size_ = dest_size;
-+      return net::ERR_IO_PENDING;
-+    case content::Stream::STREAM_ABORTED:
-+      // Handle this as connection reset.
-+      return net::ERR_CONNECTION_RESET;
-   }
- 
-+<<<<<<< .our
-   // Read from the write buffer and clear them after reading.
-   int bytes_read =
-       BufferCopy(write_buffer_.get(), write_num_bytes_, dest, dest_size);
-@@ -222,6 +281,10 @@
-   ClearWriteBuffer();
-   write_callback.Run(bytes_read);
-   return bytes_read;
-+=======
-+  NOTREACHED();
-+  return net::ERR_FAILED;
-+>>>>>>> .their
- }
- 
- bool URLRequestFetchJob::GetMimeType(std::string* mime_type) const {
-@@ -243,11 +306,18 @@
-   return response_info_->headers->response_code();
- }
- 
--void URLRequestFetchJob::OnURLFetchComplete(const net::URLFetcher* source) {
--  ClearPendingBuffer();
--  ClearWriteBuffer();
-+int64_t URLRequestFetchJob::GetTotalReceivedBytes() const {
-+  int64_t total_received_bytes = 0;
-+  if (response_info_)
-+    total_received_bytes = response_info_->headers->raw_headers().size();
-+  if (stream_.get())
-+    total_received_bytes += total_bytes_read_;
-+  return total_received_bytes;
-+}
- 
--  if (fetcher_->GetStatus().is_success()) {
-+void URLRequestFetchJob::OnURLFetchComplete(const net::URLFetcher* source) {
-+  auto status = fetcher_->GetStatus();
-+  if (status.is_success()) {
-     if (!response_info_) {
-       // Since we notify header completion only after first write there will be
-       // no response object constructed for http respones with no content 204.
-@@ -255,14 +325,20 @@
-       HeadersCompleted();
-       return;
-     }
-+<<<<<<< .our
-     if (request_->status().is_io_pending()) {
-       ReadRawDataComplete(0);
-     }
-+=======
-+    stream_->Finalize(0);
-+>>>>>>> .their
-   } else {
--    NotifyStartError(fetcher_->GetStatus());
-+    stream_->Finalize(status.error());
-+    NotifyStartError(status);
-   }
- }
- 
-+<<<<<<< .our
- int URLRequestFetchJob::BufferCopy(net::IOBuffer* source,
-                                    int num_bytes,
-                                    net::IOBuffer* target,
-@@ -281,6 +357,11 @@
-   write_buffer_ = nullptr;
-   write_num_bytes_ = 0;
-   write_callback_.Reset();
-+=======
-+void URLRequestFetchJob::ClearStream() {
-+  stream_->RemoveReadObserver(this);
-+  stream_ = nullptr;
-+>>>>>>> .their
- }
- 
- }  // namespace atom
-changed in both
-  base   100644 11ef11b7331ce8c14927f2c7e8f2f86116a6e534 atom/browser/net/url_request_fetch_job.h
-  our    100644 c38be1cbf86c72ac427b136cd5ebcb7fc0256d21 atom/browser/net/url_request_fetch_job.h
-  their  100644 5bd11e9ca4d7de018814007bcfe6dd7f5365e016 atom/browser/net/url_request_fetch_job.h
-@@ -18,16 +18,21 @@
- class AtomBrowserContext;
- 
- class URLRequestFetchJob : public JsAsker<net::URLRequestJob>,
-+<<<<<<< .our
-                            public net::URLFetcherDelegate {
-+=======
-+                           public net::URLFetcherDelegate,
-+                           public brightray::URLRequestContextGetter::Delegate,
-+                           public content::StreamReadObserver {
-+>>>>>>> .their
-  public:
-   URLRequestFetchJob(net::URLRequest*, net::NetworkDelegate*);
-   ~URLRequestFetchJob() override;
- 
-   // Called by response writer.
-   void HeadersCompleted();
--  int DataAvailable(net::IOBuffer* buffer,
--                    int num_bytes,
--                    const net::CompletionCallback& callback);
-+
-+  content::Stream* stream() const { return stream_.get(); }
- 
-  protected:
-   // JsAsker:
-@@ -40,31 +45,45 @@
-   bool GetMimeType(std::string* mime_type) const override;
-   void GetResponseInfo(net::HttpResponseInfo* info) override;
-   int GetResponseCode() const override;
-+  int64_t GetTotalReceivedBytes() const override;
- 
-   // net::URLFetcherDelegate:
-   void OnURLFetchComplete(const net::URLFetcher* source) override;
- 
-+  // content::StreamReadObserver:
-+  void OnDataAvailable(content::Stream* stream) override;
-+
-  private:
-+<<<<<<< .our
-   int BufferCopy(net::IOBuffer* source,
-                  int num_bytes,
-                  net::IOBuffer* target,
-                  int target_size);
-   void ClearPendingBuffer();
-   void ClearWriteBuffer();
-+=======
-+  void ClearStream();
-+>>>>>>> .their
- 
-   scoped_refptr<AtomBrowserContext> custom_browser_context_;
-   scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_;
-   std::unique_ptr<net::URLFetcher> fetcher_;
-   std::unique_ptr<net::HttpResponseInfo> response_info_;
-+  scoped_refptr<content::Stream> stream_;
- 
-   // Saved arguments passed to ReadRawData.
-   scoped_refptr<net::IOBuffer> pending_buffer_;
-+<<<<<<< .our
-   int pending_buffer_size_ = 0;
- 
-   // Saved arguments passed to DataAvailable.
-   scoped_refptr<net::IOBuffer> write_buffer_;
-   int write_num_bytes_ = 0;
-   net::CompletionCallback write_callback_;
-+=======
-+  int pending_buffer_size_;
-+  int total_bytes_read_;
-+>>>>>>> .their
- 
-   DISALLOW_COPY_AND_ASSIGN(URLRequestFetchJob);
- };
-changed in both
-  base   100644 3dfff106e0b5d60a481b70135317ae2fd8137002 brightray/browser/browser_context.cc
-  our    100644 1eff7344e9aef78bb88720c38c0f75fb92e6bc09 brightray/browser/browser_context.cc
-  their  100644 a1781e0c6a2058bb4ed0b1b79fd0957f185e08af brightray/browser/browser_context.cc
-@@ -17,6 +17,7 @@
- #include "components/prefs/pref_registry_simple.h"
- #include "components/prefs/pref_service.h"
- #include "components/prefs/pref_service_factory.h"
-+#include "content/browser/streams/stream_context.h"
- #include "content/public/browser/browser_thread.h"
- #include "content/public/browser/storage_partition.h"
- #include "net/base/escape.h"
-@@ -130,6 +131,10 @@
-   return media_device_id_salt_->GetSalt();
- }
- 
-+content::StreamContext* BrowserContext::GetStreamContext() {
-+  return content::StreamContext::GetFor(this);
-+}
-+
- base::FilePath BrowserContext::GetPath() const {
-   return path_;
- }
-changed in both
-  base   100644 16b37b935fe9737623b7366f026443a147f1b6c0 brightray/browser/browser_context.h
-  our    100644 1fb1c59b8043dbb711a364fca3c357c11993bedc brightray/browser/browser_context.h
-  their  100644 e740f4579f6b130fb4c0921be0afc4f8190048fe brightray/browser/browser_context.h
-@@ -82,6 +82,16 @@
-   // Subclasses should override this to register custom preferences.
-   virtual void RegisterPrefs(PrefRegistrySimple* pref_registry) {}
- 
-+<<<<<<< .our
-+=======
-+  // URLRequestContextGetter::Delegate:
-+  net::NetworkDelegate* CreateNetworkDelegate() override;
-+  MediaDeviceIDSalt* GetMediaDeviceIDSalt() override;
-+  content::StreamContext* GetStreamContext() override;
-+
-+  base::FilePath GetPath() const override;
-+
-+>>>>>>> .their
-  private:
-   friend class base::RefCountedThreadSafe<BrowserContext,
-                                           BrowserContextDeleter>;
-changed in both
-  base   100644 a7ced2ea7be77b563e6707336c4179953ba9ff80 brightray/browser/url_request_context_getter.h
-  our    100644 941a5782b14a941bb25a7a9ef6ca6d73f8bc3ec1 brightray/browser/url_request_context_getter.h
-  their  100644 d1fa00c48582469a743cb04c3b907486baf4fb0c brightray/browser/url_request_context_getter.h
-@@ -22,6 +22,10 @@
- #include "base/debug/leak_tracker.h"
- #endif
- 
-+namespace content {
-+class StreamContext;
-+}
-+
- namespace net {
- class HostMappingRules;
- class HostResolver;
-@@ -52,6 +56,7 @@
-         net::URLRequestContext* url_request_context,
-         content::ProtocolHandlerMap* protocol_handlers) = 0;
-     virtual net::HttpCache::BackendFactory* CreateHttpCacheBackendFactory(
-+<<<<<<< .our
-         const base::FilePath& base_path) = 0;
-     virtual std::unique_ptr<net::CertVerifier> CreateCertVerifier(
-         RequireCTDelegate* ct_delegate) = 0;
-@@ -59,6 +64,18 @@
-         std::vector<std::string>* cookie_schemes) {}
-     virtual void OnCookieChanged(const net::CanonicalCookie& cookie,
-                                  net::CookieChangeCause cause) {}
-+=======
-+        const base::FilePath& base_path);
-+    virtual std::unique_ptr<net::CertVerifier> CreateCertVerifier();
-+    virtual net::SSLConfigService* CreateSSLConfigService();
-+    virtual std::vector<std::string> GetCookieableSchemes();
-+    virtual net::TransportSecurityState::RequireCTDelegate*
-+    GetRequireCTDelegate() {
-+      return nullptr;
-+    }
-+    virtual MediaDeviceIDSalt* GetMediaDeviceIDSalt() { return nullptr; }
-+    virtual content::StreamContext* GetStreamContext() { return nullptr; }
-+>>>>>>> .their
-   };
- 
-   URLRequestContextGetter(
-@@ -76,11 +93,20 @@
-       const override;
- 
-   net::URLRequestJobFactory* job_factory() const { return job_factory_; }
-+<<<<<<< .our
-   void set_delegate(Delegate* delegate) { delegate_ = delegate; }
- 
-   // Discard reference to URLRequestContext and inform observers to
-   // shutdown. Must be called only on IO thread.
-   void NotifyContextShuttingDown(std::unique_ptr<ResourceContext>);
-+=======
-+  MediaDeviceIDSalt* GetMediaDeviceIDSalt() const {
-+    return delegate_->GetMediaDeviceIDSalt();
-+  }
-+  content::StreamContext* stream_context() const {
-+    return delegate_->GetStreamContext();
-+  }
-+>>>>>>> .their
- 
-  private:
-   friend class BrowserContext;
diff --git a/app/test/fixtures/merge-parser/electron/merge-fix-mixed-sandbox-tests-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-fix-mixed-sandbox-tests-into-master.txt
deleted file mode 100644
index 29fd3eb4e4a..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-fix-mixed-sandbox-tests-into-master.txt
+++ /dev/null
@@ -1,30485 +0,0 @@
-added in both
-  our    100644 6d44d618aabcce04c60344f2274dec5b0c2a1f68 .circleci/config.yml
-  their  100644 7bc5ddc6be0269ab0ed88cc2a569de36ba93e5fa .circleci/config.yml
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- notify-slack-failure: &notify-slack-failure
-   run:
-     name: Send a slack notification on failure
-@@ -19,6 +20,8 @@
-       fi
-     when: on_success
- 
-+=======
-+>>>>>>> .their
- build-steps: &build-steps
-   steps:
-     - checkout
-@@ -122,7 +125,11 @@
-               script/verify-ffmpeg.py
-             else
-               echo 'Verifying ffmpeg on release build'
-+<<<<<<< .our
-               script/verify-ffmpeg.py -c R
-+=======
-+              script/verify-ffmpeg.py -R
-+>>>>>>> .their
-             fi
-           else
-             echo 'Skipping tests due to configuration'
-@@ -134,8 +141,11 @@
-           if [ "$CREATE_TYPESCRIPT_DEFS" == "true" ]; then
-             npm run create-typescript-definitions
-           fi
-+<<<<<<< .our
-     - <<: *notify-slack-failure
-     - <<: *notify-slack-success
-+=======
-+>>>>>>> .their
-     - persist_to_workspace:
-         root: out
-         paths:
-@@ -147,6 +157,7 @@
-     - store_artifacts:
-         path: out
- 
-+<<<<<<< .our
- gn-build-steps: &gn-build-steps
-   steps:
-     - run:
-@@ -344,6 +355,8 @@
-     xcode: "8.3.3"
-   resource_class: large
- 
-+=======
-+>>>>>>> .their
- build-defaults: &build-defaults
-   docker:
-     - image: electronbuilds/electron:0.0.8
-@@ -386,7 +399,10 @@
-     environment:
-       TARGET_ARCH: arm
-       RUN_RELEASE_BUILD: true
-+<<<<<<< .our
-       NIGHTLY_BUILD: true
-+=======
-+>>>>>>> .their
-     <<: *build-defaults
-     resource_class: 2xlarge
- 
-@@ -425,7 +441,10 @@
-     environment:
-       TARGET_ARCH: arm64
-       RUN_RELEASE_BUILD: true
-+<<<<<<< .our
-       NIGHTLY_BUILD: true
-+=======
-+>>>>>>> .their
-     <<: *build-defaults
-     resource_class: 2xlarge
- 
-@@ -442,7 +461,10 @@
-     environment:
-       TARGET_ARCH: ia32
-       RUN_RELEASE_BUILD: true
-+<<<<<<< .our
-       NIGHTLY_BUILD: true
-+=======
-+>>>>>>> .their
-     <<: *build-defaults
-     resource_class: xlarge
- 
-@@ -466,7 +488,10 @@
-     environment:
-       TARGET_ARCH: x64
-       RUN_RELEASE_BUILD: true
-+<<<<<<< .our
-       NIGHTLY_BUILD: true
-+=======
-+>>>>>>> .their
-     <<: *build-defaults
-     resource_class: xlarge
- 
-@@ -484,7 +509,10 @@
-       TARGET_ARCH: x64
-       RUN_RELEASE_BUILD: true
-       INSTALL_MACOS_NODE: true
-+<<<<<<< .our
-       NIGHTLY_BUILD: true
-+=======
-+>>>>>>> .their
-     macos:
-       xcode: "8.3.3"
-     <<: *build-steps
-@@ -505,11 +533,15 @@
-       MAS_BUILD: 1
-       RUN_RELEASE_BUILD: true
-       INSTALL_MACOS_NODE: true
-+<<<<<<< .our
-       NIGHTLY_BUILD: true
-+=======
-+>>>>>>> .their
-     macos:
-       xcode: "8.3.3"
-     <<: *build-steps
- 
-+<<<<<<< .our
-   electron-gn-linux-x64-debug-fyi:
-     environment:
-       DISPLAY: ':99.0'
-@@ -668,6 +700,8 @@
-       GN_EXTRA_ARGS: 'is_mas_build = true'
-     <<: *gn-mac-build-machine
-     <<: *gn-mac-build-steps
-+=======
-+>>>>>>> .their
- 
- workflows:
-   version: 2
-@@ -695,6 +729,7 @@
-   build-mas-x64:
-     jobs:
-       - electron-mas-x64
-+<<<<<<< .our
-   build-gn-linux:
-     jobs:
-       - electron-gn-linux-x64-debug-fyi
-@@ -711,6 +746,8 @@
-       - electron-gn-mas-testing-fyi
-       - electron-gn-osx-debug-fyi
-       - electron-gn-osx-testing-fyi
-+=======
-+>>>>>>> .their
- 
-   nightly-release-test:
-     triggers:
-@@ -720,7 +757,10 @@
-             branches:
-               only:
-                 - master
-+<<<<<<< .our
-                 - 3-0-x
-+=======
-+>>>>>>> .their
-                 - 2-0-x
-                 - 1-8-x
-                 - 1-7-x
-@@ -730,6 +770,7 @@
-       - electron-linux-ia32-release-nightly
-       - electron-linux-x64-release-nightly
- 
-+<<<<<<< .our
-   nightly-gn-release-test:
-     triggers:
-       - schedule:
-@@ -745,3 +786,13 @@
-       - electron-gn-linux-arm64-release-fyi
-       - electron-gn-mas-release-fyi
-       - electron-gn-osx-release-fyi
-+=======
-+experimental:
-+  notify:
-+    branches:
-+      only:
-+        - master
-+        - 2-0-x
-+        - 1-8-x
-+        - 1-7-x
-+>>>>>>> .their
-added in both
-  our    100644 e9c110640201b62255ffa62eea2a6f4ccbadb34f .github/ISSUE_TEMPLATE.md
-  their  100644 7a21d0e22a6442a1cc509acbdb4ca9bf865a3014 .github/ISSUE_TEMPLATE.md
-@@ -7,11 +7,19 @@
- - If you need general advice, join our Slack: http://atom-slack.herokuapp.com
- -->
- 
-+<<<<<<< .our
- * Output of `node_modules/.bin/electron --version`:
- * Operating System (Platform and Version):
- 
- <!-- If this used to work -->
- * Output of `node_modules/.bin/electron --version` on last known working Electron version (if applicable):
-+=======
-+* Electron version:
-+* Operating system:
-+
-+<!-- If this used to work -->
-+* Last known working Electron version: 
-+>>>>>>> .their
- 
- ### Expected behavior
- 
-added in both
-  our    100644 10cb69a7a8e4ca3b2e9ca08515eacced297bb277 .github/ISSUE_TEMPLATE/Bug_report.md
-  their  100644 a5cad57bfaef1e29296926448a251d1fe3e5419f .github/ISSUE_TEMPLATE/Bug_report.md
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- ---
- name: Bug report
- about: Create a report to help us improve Electron
-@@ -30,3 +31,37 @@
- 
- **Additional Information**
- Add any other context about the problem here.
-+=======
-+---
-+name: Bug report
-+about: Create a report to help us improve Electron
-+
-+---
-+
-+* Electron Version:
-+* Operating System (Platform and Version):
-+* Last known working Electron version: 
-+
-+**Expected Behavior**
-+A clear and concise description of what you expected to happen.
-+
-+**Actual behavior**
-+A clear and concise description of what actually happened.
-+
-+**To Reproduce**
-+Your best chance of getting this bug looked at quickly is to provide a REPOSITORY that can be cloned and run.
-+
-+You can fork [electron-quick-start](https://github.com/electron/electron-quick-start) and include a link to the branch with your changes.
-+
-+If you provide a URL, please list the commands required to clone/setup/run your repo e.g.
-+```sh
-+$ git clone $YOUR_URL -b $BRANCH
-+$ npm install
-+$ npm start || electron .
-+```
-+**Screenshots**
-+If applicable, add screenshots to help explain your problem.
-+
-+**Additional Information**
-+Add any other context about the problem here.
-+>>>>>>> .their
-added in both
-  our    100644 51c2e6c8d52c9343a0853d2d2ec5b205a3aca790 .github/ISSUE_TEMPLATE/Feature_request.md
-  their  100644 9f3aa9e21d7bf082f3d486f49603406bb10fd8f5 .github/ISSUE_TEMPLATE/Feature_request.md
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- ---
- name: Feature request
- about: Suggest an idea for Electron
-@@ -15,3 +16,22 @@
- 
- **Additional context**
- Add any other context or screenshots about the feature request here.
-+=======
-+---
-+name: Feature request
-+about: Suggest an idea for Electron
-+
-+---
-+
-+**Is your feature request related to a problem? Please describe.**
-+A clear and concise description of what the problem is.
-+
-+**Describe the solution you'd like**
-+A clear and concise description of what you want to happen.
-+
-+**Describe alternatives you've considered**
-+A clear and concise description of any alternative solutions or features you've considered.
-+
-+**Additional context**
-+Add any other context or screenshots about the feature request here.
-+>>>>>>> .their
-added in both
-  our    100644 67a1646fee28c2c19cd1ec7301b587c0c8d6cb66 .github/PULL_REQUEST_TEMPLATE.md
-  their  100644 9a2d96970f629ee5eedadaac694d2423f6fb6005 .github/PULL_REQUEST_TEMPLATE.md
-@@ -1,4 +1,7 @@
-+<<<<<<< .our
- ##### Description of Change
-+=======
-+>>>>>>> .their
- <!--
- Thank you for your Pull Request. Please provide a description above and review
- the requirements below.
-@@ -13,10 +16,14 @@
- - [ ] `npm test` passes
- - [ ] tests are [changed or added](https://github.com/electron/electron/blob/master/docs/development/testing.md)
- - [ ] relevant documentation is changed or added
-+<<<<<<< .our
- - [ ] PR title follows semantic [commit guidelines](https://github.com/electron/electron/blob/master/docs/development/pull-requests.md#commit-message-guidelines)
- 
- 
- ##### Release Notes
- <!-- Used to describe release notes for future release versions. See https://github.com/electron/clerk/blob/master/README.md for details. -->
- 
--Notes: <!-- One-line Change Summary Here-->
-\ No newline at end of file
-+Notes: <!-- One-line Change Summary Here-->
-+=======
-+- [ ] commit messages or PR title follow semantic [commit guidelines](https://github.com/electron/electron/blob/master/docs/development/pull-requests.md#commit-message-guidelines)
-+>>>>>>> .their
-added in both
-  our    100644 ff8d1b64f1b2f68ceaf63ce74ede3b01625586ba .github/config.yml
-  their  100644 3c222c2f14dcbcab344059e6e4031edec6935f3c .github/config.yml
-@@ -12,7 +12,11 @@
- newPRWelcomeComment: |
-   💖 Thanks for opening this pull request! 💖
- 
-+<<<<<<< .our
-   We use [semantic commit messages](https://github.com/electron/electron/blob/master/docs/development/pull-requests.md#commit-message-guidelines) to streamline the release process. Before your pull request can be merged, you should **update your pull request title** to start with a semantic prefix.
-+=======
-+  We use [semantic commit messages](https://github.com/electron/electron/blob/master/docs/development/pull-requests.md#commit-message-guidelines) to streamline the release process. Before your pull request can be merged, you should **update your pull request title** to start with a semantic prefix, OR prefix at least one of your commit messages.
-+>>>>>>> .their
- 
-   Examples of commit messages with semantic prefixes:
- 
-added in both
-  our    100644 f393b1cdcef87b41bb3ed47ebae59757fed3a780 .gitignore
-  their  100644 665fb6fa10444592991a714828b60ca08daa4a2f .gitignore
-@@ -50,5 +50,8 @@
- # npm package
- /npm/dist
- /npm/path.txt
-+<<<<<<< .our
- 
--.npmrc
-\ No newline at end of file
-+.npmrc
-+=======
-+>>>>>>> .their
-added in both
-  our    100644 d00c4b1e3d3523641210ff20fda41d76c9eb546c BUILD.gn
-  their  100644 4a71e5550f6c7b8b74fcd15ceffdace06c8f9f52 BUILD.gn
-@@ -1,5 +1,6 @@
- import("//build/config/locales.gni")
- import("//tools/grit/repack.gni")
-+<<<<<<< .our
- import("//tools/v8_context_snapshot/v8_context_snapshot.gni")
- import("build/asar.gni")
- import("build/npm.gni")
-@@ -7,6 +8,10 @@
- import("//build/config/win/manifest.gni")
- import("electron_paks.gni")
- import("//third_party/ffmpeg/ffmpeg_options.gni")
-+=======
-+import("build/asar.gni")
-+import("build/npm.gni")
-+>>>>>>> .their
- 
- if (is_mac) {
-   import("//build/config/mac/rules.gni")
-@@ -31,6 +36,7 @@
- 
-   enable_desktop_capturer = true
-   enable_run_as_node = true
-+<<<<<<< .our
-   enable_osr = false
- }
- 
-@@ -47,6 +53,20 @@
-                 ],
-                 "scope",
-                 [ "filenames.gypi" ])
-+=======
-+  enable_osr = true
-+}
-+
-+filenames_gypi = exec_script(
-+  "//build/gypi_to_gn.py",
-+  [
-+    rebase_path("filenames.gypi"),
-+    "--replace=<(SHARED_INTERMEDIATE_DIR)=$target_gen_dir",
-+  ],
-+  "scope",
-+  [ "filenames.gypi" ]
-+)
-+>>>>>>> .their
- 
- config("branding") {
-   defines = [
-@@ -68,6 +88,7 @@
-   }
- }
- 
-+<<<<<<< .our
- npm_action("atom_browserify_sandbox") {
-   deps = [
-     ":atom_js2c_copy",
-@@ -85,6 +106,59 @@
-     "./lib/sandboxed_renderer/api/exports/path.js:path",
-     "-r",
-     "./lib/sandboxed_renderer/api/exports/child_process.js:child_process",
-+=======
-+config("native_mate_config") {
-+  include_dirs = [
-+    "//third_party/native_mate",
-+  ]
-+  cflags_cc = [
-+    "-Wno-deprecated-declarations",
-+  ]
-+  cflags_objcc = cflags_cc
-+}
-+
-+source_set("native_mate") {
-+  deps = [
-+    "//base",
-+    "//net",
-+    "//v8:v8_headers",
-+    "build/node",
-+  ]
-+  public_configs = [ ":native_mate_config" ]
-+  sources = [
-+    "//third_party/native_mate/native_mate/arguments.cc",
-+    "//third_party/native_mate/native_mate/arguments.h",
-+    "//third_party/native_mate/native_mate/compat.h",
-+    "//third_party/native_mate/native_mate/constructor.h",
-+    "//third_party/native_mate/native_mate/converter.cc",
-+    "//third_party/native_mate/native_mate/converter.h",
-+    "//third_party/native_mate/native_mate/dictionary.cc",
-+    "//third_party/native_mate/native_mate/dictionary.h",
-+    "//third_party/native_mate/native_mate/function_template.cc",
-+    "//third_party/native_mate/native_mate/function_template.h",
-+    "//third_party/native_mate/native_mate/handle.h",
-+    "//third_party/native_mate/native_mate/object_template_builder.cc",
-+    "//third_party/native_mate/native_mate/object_template_builder.h",
-+    "//third_party/native_mate/native_mate/persistent_dictionary.cc",
-+    "//third_party/native_mate/native_mate/persistent_dictionary.h",
-+    "//third_party/native_mate/native_mate/scoped_persistent.h",
-+    "//third_party/native_mate/native_mate/wrappable.cc",
-+    "//third_party/native_mate/native_mate/wrappable.h",
-+    "//third_party/native_mate/native_mate/wrappable_base.h",
-+  ]
-+}
-+
-+npm_action("atom_browserify_sandbox") {
-+  deps = [ ":atom_js2c_copy" ]
-+
-+  sandbox_args = [
-+    "lib/sandboxed_renderer/init.js",
-+    "-r", "./lib/sandboxed_renderer/api/exports/electron.js:electron",
-+    "-r", "./lib/sandboxed_renderer/api/exports/fs.js:fs",
-+    "-r", "./lib/sandboxed_renderer/api/exports/os.js:os",
-+    "-r", "./lib/sandboxed_renderer/api/exports/path.js:path",
-+    "-r", "./lib/sandboxed_renderer/api/exports/child_process.js:child_process",
-+>>>>>>> .their
-   ]
- 
-   inputs = [
-@@ -95,6 +169,7 @@
-     "lib/sandboxed_renderer/api/exports/path.js",
-     "lib/sandboxed_renderer/api/exports/child_process.js",
-   ]
-+<<<<<<< .our
-   outputs = [
-     "$target_gen_dir/js2c/preload_bundle.js",
-   ]
-@@ -123,6 +198,26 @@
-            "-o",
-            rebase_path(outputs[0]),
-          ]
-+=======
-+  outputs = [ "$target_gen_dir/js2c/preload_bundle.js" ]
-+
-+  script = "browserify"
-+  args = sandbox_args + [
-+    "-o", rebase_path(outputs[0])
-+  ]
-+}
-+
-+npm_action("atom_browserify_isolated") {
-+  deps = [ ":atom_js2c_copy" ]
-+
-+  inputs = [ "lib/isolated_renderer/init.js" ]
-+  outputs = [ "$target_gen_dir/js2c/isolated_bundle.js" ]
-+
-+  script = "browserify"
-+  args = inputs + [
-+    "-o", rebase_path(outputs[0])
-+  ]
-+>>>>>>> .their
- }
- 
- copy("atom_js2c_copy") {
-@@ -130,16 +225,26 @@
-     "lib/common/asar.js",
-     "lib/common/asar_init.js",
-   ]
-+<<<<<<< .our
-   outputs = [
-     "$target_gen_dir/js2c/{{source_file_part}}",
-   ]
-+=======
-+  outputs = [ "$target_gen_dir/js2c/{{source_file_part}}" ]
-+>>>>>>> .their
- }
- 
- action("atom_js2c") {
-   deps = [
-+<<<<<<< .our
-     ":atom_browserify_isolated",
-     ":atom_browserify_sandbox",
-     ":atom_js2c_copy",
-+=======
-+    ":atom_js2c_copy",
-+    ":atom_browserify_sandbox",
-+    ":atom_browserify_isolated",
-+>>>>>>> .their
-   ]
- 
-   js2c_sources = filenames_gypi.js2c_sources
-@@ -151,6 +256,7 @@
- 
-   inputs = js2c_sources + browserify_sources
- 
-+<<<<<<< .our
-   outputs = [
-     "$target_gen_dir/atom_natives.h",
-   ]
-@@ -159,10 +265,21 @@
-   args = [ rebase_path("//third_party/electron_node") ] +
-          rebase_path(outputs, root_build_dir) +
-          [ rebase_path("$target_gen_dir/js2c", root_build_dir) ]
-+=======
-+  outputs = [ "$target_gen_dir/atom_natives.h" ]
-+
-+  script = "tools/js2c.py"
-+  args = [
-+    rebase_path("//third_party/electron_node")
-+  ] + rebase_path(outputs, root_build_dir) + [
-+    rebase_path("$target_gen_dir/js2c", root_build_dir)
-+  ]
-+>>>>>>> .their
- }
- 
- asar("js2asar") {
-   sources = filenames_gypi.js_sources
-+<<<<<<< .our
-   if (enable_desktop_capturer) {
-     sources += [
-       "lib/browser/desktop-capturer.js",
-@@ -172,11 +289,15 @@
-   outputs = [
-     "$root_out_dir/resources/electron.asar",
-   ]
-+=======
-+  outputs = [ "$root_out_dir/resources/electron.asar" ]
-+>>>>>>> .their
-   root = "lib"
- }
- 
- asar("app2asar") {
-   sources = filenames_gypi.default_app_sources
-+<<<<<<< .our
-   outputs = [
-     "$root_out_dir/resources/default_app.asar",
-   ]
-@@ -187,10 +308,25 @@
-   configs += [ "//v8:external_startup_data" ]
-   configs += [ "//third_party/electron_node:node_internals" ]
- 
-+=======
-+  outputs = [ "$root_out_dir/resources/default_app.asar" ]
-+  root = "default_app"
-+}
-+
-+group("electron") {
-+  deps = [ ":electron_lib" ]
-+}
-+
-+static_library("electron_lib") {
-+  configs += [
-+    "//v8:external_startup_data",
-+  ]
-+>>>>>>> .their
-   public_configs = [
-     ":branding",
-     ":features",
-   ]
-+<<<<<<< .our
- 
-   deps = [
-     ":atom_js2c",
-@@ -198,15 +334,22 @@
-     "native_mate",
-     "//base",
-     "//base:i18n",
-+=======
-+  deps = [
-+>>>>>>> .their
-     "//chrome/common:constants",
-     "//components/cdm/renderer",
-     "//components/network_session_configurator/common",
-     "//components/prefs",
-     "//components/printing/common",
-     "//components/security_state/content",
-+<<<<<<< .our
-     "//components/viz/service",
-     "//content/public/app:both",
-     "//content/public/child",
-+=======
-+    "//content/public/browser",
-+>>>>>>> .their
-     "//device/geolocation",
-     "//gin",
-     "//net:net_resources",
-@@ -214,6 +357,7 @@
-     "//ppapi/proxy",
-     "//ppapi/shared_impl",
-     "//printing",
-+<<<<<<< .our
-     "//services/device/wake_lock/power_save_blocker",  # TODO: this requires a visibility patch to chromium src
-     "//skia",
-     "//third_party/WebKit/public:blink",
-@@ -228,10 +372,64 @@
-     "//v8",
-   ]
- 
-+=======
-+    "//services/device/wake_lock/power_save_blocker", # TODO: this requires a visibility patch to chromium src
-+    "//skia",
-+    "//third_party/WebKit/public:blink",
-+    "//third_party/boringssl",
-+    "//third_party/crashpad/crashpad/client",
-+    "//third_party/leveldatabase",
-+    "//third_party/libyuv",
-+    "//third_party/webrtc/modules/desktop_capture",
-+    "//third_party/webrtc/modules/desktop_capture:primitives",
-+    "//ui/events:dom_keycode_converter",
-+    "//ui/views",
-+    "//v8",
-+    ":atom_js2c",
-+    ":native_mate",
-+    "brightray",
-+    "build/node",
-+  ]
-+  if (is_mac) {
-+    deps += [
-+      "//ui/accelerated_widget_mac",
-+      "//base/allocator:features",
-+    ]
-+  }
-+  if (is_linux) {
-+    deps += [
-+      "//build/config/linux/gtk3",
-+      "//chrome/browser/ui/libgtkui",
-+      "//device/bluetooth",
-+      "//third_party/breakpad:client",
-+      "//ui/events/devices/x11",
-+      "//ui/events/platform/x11",
-+      "//ui/native_theme",
-+      "//ui/views/controls/webview",
-+      "//ui/wm",
-+    ]
-+    configs += [ ":gio_unix" ]
-+  }
-+  defines = [
-+    # This is defined in skia/skia_common.gypi.
-+    "SK_SUPPORT_LEGACY_GETTOPDEVICE",
-+    # Disable warnings for g_settings_list_schemas.
-+    "GLIB_DISABLE_DEPRECATION_WARNINGS",
-+
-+    # Import V8 symbols from shared library (node.dll / libnode.so)
-+    "USING_V8_SHARED",
-+    "USING_V8_PLATFORM_SHARED",
-+    "USING_V8_BASE_SHARED",
-+
-+    # Enables SkBitmap size 64 operations
-+    #"SK_SUPPORT_LEGACY_SAFESIZE64", # doesn't seem to be needed to build?
-+  ]
-+>>>>>>> .their
-   include_dirs = [
-     "chromium_src",
-     ".",
-     "$target_gen_dir",
-+<<<<<<< .our
- 
-     # TODO(nornagon): replace usage of SchemeRegistry by an actually exported
-     # API of blink, then delete this include dir.
-@@ -240,6 +438,21 @@
- 
-   defines = []
-   libs = []
-+=======
-+    # TODO(nornagon): replace usage of SchemeRegistry by an actually exported
-+    # API of blink, then delete this include dir.
-+    "//third_party/WebKit/Source",
-+    # NOTE(nornagon): other chromium files use the full path to include
-+    # crashpad; this is just here for compatibility between GN and GYP, so that
-+    # the #includes can be agnostic about where crashpad is vendored.
-+    "//third_party/crashpad",
-+  ]
-+  if (is_linux) {
-+    include_dirs += [
-+      "//third_party/breakpad",
-+    ]
-+  }
-+>>>>>>> .their
- 
-   extra_source_filters = []
-   if (!is_linux) {
-@@ -249,7 +462,10 @@
-       "*_x11.cc",
-       "*_gtk.h",
-       "*_gtk.cc",
-+<<<<<<< .our
-       "*\blibrary_loaders/*",
-+=======
-+>>>>>>> .their
-     ]
-   }
-   if (!is_win) {
-@@ -268,6 +484,7 @@
-     ]
-   }
- 
-+<<<<<<< .our
-   set_sources_assignment_filter(
-       sources_assignment_filter + extra_source_filters)
-   sources = filenames_gypi.lib_sources
-@@ -349,6 +566,12 @@
-     deps += [ "//pdf" ]
-   }
- 
-+=======
-+  set_sources_assignment_filter(sources_assignment_filter + extra_source_filters)
-+  sources = filenames_gypi.lib_sources
-+  set_sources_assignment_filter(sources_assignment_filter)
-+
-+>>>>>>> .their
-   if (enable_run_as_node) {
-     sources += [
-       "atom/app/node_main.cc",
-@@ -371,18 +594,27 @@
-       "atom/browser/osr/osr_web_contents_view_mac.mm",
-     ]
-     deps += [
-+<<<<<<< .our
-       "//components/viz/service",
-       "//ui/compositor",
-+=======
-+      "//ui/compositor",
-+      "//components/viz/service",
-+>>>>>>> .their
-     ]
-   }
- 
-   if (enable_desktop_capturer) {
-+<<<<<<< .our
-     deps += [ "//third_party/webrtc/modules/desktop_capture" ]
-+=======
-+>>>>>>> .their
-     sources += [
-       "atom/browser/api/atom_api_desktop_capturer.cc",
-       "atom/browser/api/atom_api_desktop_capturer.h",
-     ]
-   }
-+<<<<<<< .our
- }
- 
- electron_paks("packed_resources") {
-@@ -391,32 +623,69 @@
-     copy_data_to_bundle = true
-   } else {
-     output_dir = root_out_dir
-+=======
-+
-+  if (is_mac) {
-+    libs = [
-+      "Squirrel.framework",
-+      "ReactiveCocoa.framework",
-+      "Mantle.framework",
-+    ]
-+    cflags_objcc = [
-+      "-F", rebase_path("external_binaries", root_build_dir)
-+    ]
-+    if (true) { # !is_mas_build
-+      # ReactiveCocoa which is used by Squirrel requires using __weak.
-+      cflags_objcc += [ "-fobjc-weak" ]
-+    }
-+  }
-+  if (is_linux) {
-+    sources += filenames_gypi.lib_sources_linux
-+    sources += filenames_gypi.lib_sources_nss
-+>>>>>>> .their
-   }
- }
- 
- if (is_mac) {
-   electron_framework_name = electron_product_name + " Framework"
-   electron_helper_name = electron_product_name + " Helper"
-+<<<<<<< .our
-   electron_login_helper_name = electron_product_name + " Login Helper"
-+=======
-+>>>>>>> .their
-   electron_framework_version = "A"
-   electron_mac_bundle_id = "com.$electron_company_abbr.$electron_project_name"
- 
-   mac_xib_bundle_data("electron_xibs") {
-+<<<<<<< .our
-     sources = [
-       "atom/common/resources/mac/MainMenu.xib",
-     ]
-+=======
-+    sources = [ "atom/common/resources/mac/MainMenu.xib" ]
-+>>>>>>> .their
-   }
- 
-   bundle_data("electron_framework_resources") {
-     public_deps = [
-+<<<<<<< .our
-       ":packed_resources",
-     ]
-     sources = []
-+=======
-+      "//content/shell:pak",
-+      ":electron_locales",
-+    ]
-+    sources = [
-+      "$root_out_dir/content_shell.pak",
-+    ]
-+>>>>>>> .their
-     if (icu_use_data_file) {
-       sources += [ "$root_out_dir/icudtl.dat" ]
-       public_deps += [ "//third_party/icu:icudata" ]
-     }
-     if (v8_use_external_startup_data) {
-+<<<<<<< .our
-       sources += [ "$root_out_dir/natives_blob.bin" ]
-       public_deps += [ "//v8" ]
-       if (use_v8_context_snapshot) {
-@@ -425,12 +694,20 @@
-       } else {
-         sources += [ "$root_out_dir/snapshot_blob.bin" ]
-       }
-+=======
-+      sources += [
-+        "$root_out_dir/natives_blob.bin",
-+        "$root_out_dir/snapshot_blob.bin",
-+      ]
-+      public_deps += [ "//v8" ]
-+>>>>>>> .their
-     }
-     outputs = [
-       "{{bundle_resources_dir}}/{{source_file_part}}",
-     ]
-   }
- 
-+<<<<<<< .our
-   if (!is_component_build) {
-     bundle_data("electron_framework_libraries") {
-       sources = []
-@@ -453,6 +730,19 @@
-   }
- 
-   bundle_data("electron_crashpad_helper") {
-+=======
-+  bundle_data("electron_framework_libraries") {
-+    public_deps = [ "build/node" ]
-+    sources = [
-+      "$root_out_dir/libnode.dylib"
-+    ]
-+    outputs = [
-+      "{{bundle_contents_dir}}/Libraries/{{source_file_part}}"
-+    ]
-+  }
-+
-+  bundle_data("electron_framework_helpers") {
-+>>>>>>> .their
-     sources = [
-       "$root_out_dir/crashpad_handler",
-     ]
-@@ -470,6 +760,7 @@
-     output_name = electron_framework_name
-     framework_version = electron_framework_version
-     framework_contents = [ "Resources" ]
-+<<<<<<< .our
-     public_deps = [
-       ":electron_lib",
-     ]
-@@ -485,6 +776,25 @@
-     extra_substitutions = [ "ATOM_BUNDLE_ID=$electron_mac_bundle_id.framework" ]
- 
-     include_dirs = [ "." ]
-+=======
-+    public_deps = [ ":electron_lib" ]
-+    deps = [
-+      "//base",
-+      "//base:i18n",
-+      ":electron_framework_helpers",
-+      ":electron_framework_libraries",
-+      ":electron_framework_resources",
-+      ":electron_xibs",
-+    ]
-+    info_plist = "atom/common/resources/mac/Info.plist"
-+    extra_substitutions = [
-+      "ATOM_BUNDLE_ID=$electron_mac_bundle_id.framework",
-+    ]
-+
-+    include_dirs = [
-+      ".",
-+    ]
-+>>>>>>> .their
-     sources = filenames_gypi.framework_sources
- 
-     libs = [
-@@ -497,8 +807,12 @@
-       "StoreKit.framework",
-     ]
-     ldflags = [
-+<<<<<<< .our
-       "-F",
-       rebase_path("external_binaries", root_build_dir),
-+=======
-+      "-F", rebase_path("external_binaries", root_build_dir),
-+>>>>>>> .their
-       "-Wl,-install_name,@rpath/$output_name.framework/$output_name",
-       "-rpath",
-       "@loader_path/Libraries",
-@@ -506,13 +820,18 @@
-     if (is_component_build) {
-       ldflags += [
-         "-rpath",
-+<<<<<<< .our
-         "@executable_path/../../../../../..",
-+=======
-+        "@executable_path/../../../../../.."
-+>>>>>>> .their
-       ]
-     }
-   }
- 
-   mac_app_bundle("electron_helper_app") {
-     output_name = electron_helper_name
-+<<<<<<< .our
-     deps = [
-       ":electron_framework+link",
-     ]
-@@ -520,6 +839,15 @@
-     include_dirs = [ "." ]
-     info_plist = "atom/renderer/resources/mac/Info.plist"
-     extra_substitutions = [ "ATOM_BUNDLE_ID=$electron_mac_bundle_id.helper" ]
-+=======
-+    deps = [ ":electron_framework+link" ]
-+    sources = filenames_gypi.app_sources
-+    include_dirs = [ "." ]
-+    info_plist = "atom/renderer/resources/mac/Info.plist"
-+    extra_substitutions = [
-+      "ATOM_BUNDLE_ID=$electron_mac_bundle_id.helper",
-+    ]
-+>>>>>>> .their
-     ldflags = [
-       "-rpath",
-       "@executable_path/../../..",
-@@ -530,6 +858,7 @@
-     sources = [
-       "$root_out_dir/$electron_framework_name.framework",
-       "$root_out_dir/$electron_helper_name.app",
-+<<<<<<< .our
-     ]
-     if (!is_mas_build) {
-       sources += [
-@@ -538,6 +867,12 @@
-         "external_binaries/Squirrel.framework",
-       ]
-     }
-+=======
-+      "external_binaries/Squirrel.framework",
-+      "external_binaries/ReactiveCocoa.framework",
-+      "external_binaries/Mantle.framework",
-+    ]
-+>>>>>>> .their
-     outputs = [
-       "{{bundle_contents_dir}}/Frameworks/{{source_file_part}}",
-     ]
-@@ -547,6 +882,7 @@
-     ]
-   }
- 
-+<<<<<<< .our
-   mac_app_bundle("electron_login_helper") {
-     output_name = electron_login_helper_name
-     sources = filenames_gypi.login_helper_sources
-@@ -581,6 +917,44 @@
-     outputs = [
-       "{{bundle_resources_dir}}/{{source_file_part}}",
-     ]
-+=======
-+  bundle_data("electron_app_resources") {
-+    public_deps = [
-+      ":js2asar",
-+      ":app2asar",
-+    ]
-+    sources = [
-+      "$root_out_dir/resources/electron.asar",
-+      "$root_out_dir/resources/default_app.asar",
-+    ]
-+    outputs = [
-+      "{{bundle_resources_dir}}/{{source_file_part}}"
-+    ]
-+  }
-+
-+  repack_locales("electron_locales") {
-+    source_patterns = [
-+      "${root_gen_dir}/content/app/strings/content_strings_",
-+    ]
-+    deps = [
-+      "//content/app/strings",
-+    ]
-+
-+    input_locales = locales
-+
-+    if (is_mac) {
-+      output_locales = locales_as_mac_outputs
-+    } else {
-+      output_locales = locales
-+    }
-+
-+    if (is_mac) {
-+      output_dir = "$root_gen_dir/repack"
-+      copy_data_to_bundle = true
-+    } else {
-+      output_dir = root_out_dir
-+    }
-+>>>>>>> .their
-   }
- 
-   mac_app_bundle("electron_app") {
-@@ -591,16 +965,24 @@
-       ":electron_app_framework_bundle_data",
-       ":electron_app_resources",
-     ]
-+<<<<<<< .our
-     if (is_mas_build) {
-       deps += [ ":electron_login_helper_app" ]
-     }
-     info_plist = "atom/browser/resources/mac/Info.plist"
-     extra_substitutions = [ "ATOM_BUNDLE_ID=$electron_mac_bundle_id" ]
-+=======
-+    info_plist = "atom/browser/resources/mac/Info.plist"
-+    extra_substitutions = [
-+      "ATOM_BUNDLE_ID=$electron_mac_bundle_id",
-+    ]
-+>>>>>>> .their
-     ldflags = [
-       "-rpath",
-       "@executable_path/../Frameworks",
-     ]
-   }
-+<<<<<<< .our
- } else {
-   windows_manifest("electron_app_manifest") {
-     sources = [
-@@ -610,12 +992,18 @@
-     ]
-   }
- 
-+=======
-+}
-+
-+if (is_linux) {
-+>>>>>>> .their
-   executable("electron_app") {
-     output_name = electron_project_name
-     sources = filenames_gypi.app_sources
-     include_dirs = [ "." ]
-     deps = [
-       ":app2asar",
-+<<<<<<< .our
-       ":electron_app_manifest",
-       ":electron_lib",
-       ":js2asar",
-@@ -814,3 +1202,16 @@
- group("electron") {
-   deps = [ ":electron_app" ]
- }
-+=======
-+      ":electron_lib",
-+      ":js2asar",
-+      "//build/config:exe_and_shlib_deps",
-+      "//chrome:packed_resources",
-+      "//content/shell:copy_shell_resources",
-+      "//content/shell:pak",
-+      "//third_party/WebKit/public:image_resources",
-+      "//ui/strings",
-+    ]
-+  }
-+}
-+>>>>>>> .their
-added in both
-  our    100644 b3b9d650b27274f4f98f7408319b1e6b35f63abf DEPS
-  their  100644 3de2d30f4655533910aeb12603e1c0be1c7c89b3 DEPS
-@@ -1,16 +1,27 @@
- vars = {
-   'chromium_version':
-+<<<<<<< .our
-     '66.0.3359.181',
-   'libchromiumcontent_revision':
-     'c85470a1c379b1c4bedb372c146521bc4be9b75d',
-   'node_version':
-     'ece0a06ac8147efb5b5af431c21f312f1884616e',
-+=======
-+    '63.0.3239.150',
-+  'libchromiumcontent_revision':
-+    '1c542968990da951df27c8a0371a4ab5494a5a6c',
-+  'node_version':
-+    'v9.7.0-33-g538a5023af',
-+  'native_mate_revision':
-+    '4cd7d113915de0cc08e9a218be35bff9c7361906',
-+>>>>>>> .their
- 
-   'chromium_git':
-     'https://chromium.googlesource.com',
- 
-   'electron_git':
-     'https://github.com/electron',
-+<<<<<<< .our
- 
-   'checkout_nacl':
-     False,
-@@ -18,6 +29,8 @@
-     True,
-   'checkout_oculus_sdk':
-     False,
-+=======
-+>>>>>>> .their
- }
- 
- deps = {
-@@ -27,15 +40,24 @@
-     (Var("electron_git")) + '/libchromiumcontent.git@' + (Var("libchromiumcontent_revision")),
-   'src/third_party/electron_node':
-     (Var("electron_git")) + '/node.git@' + (Var("node_version")),
-+<<<<<<< .our
-+=======
-+  'src/third_party/native_mate':
-+    (Var("electron_git")) + '/native-mate.git@' + (Var("native_mate_revision")),
-+>>>>>>> .their
- }
- 
- hooks = [
-   {
-     'action': [
-+<<<<<<< .our
-       'python',
-       'src/libchromiumcontent/script/apply-patches',
-       '--project-root=.',
-       '--commit'
-+=======
-+      'src/libchromiumcontent/script/apply-patches'
-+>>>>>>> .their
-     ],
-     'pattern':
-       'src/libchromiumcontent',
-@@ -44,7 +66,10 @@
-   },
-   {
-     'action': [
-+<<<<<<< .our
-       'python',
-+=======
-+>>>>>>> .their
-       'src/electron/script/update-external-binaries.py'
-     ],
-     'pattern':
-@@ -54,9 +79,26 @@
-   },
-   {
-     'action': [
-+<<<<<<< .our
-       'python',
-       '-c',
-       'import os; os.chdir("src"); os.chdir("electron"); os.system("npm install")',
-+=======
-+      'bash',
-+      '-c',
-+      # NOTE(nornagon): this ridiculous {{}} stuff is because these strings get
-+      # variable-substituted twice by gclient.
-+      'echo -e "#\\n{{{{\'variables\':{{{{}}}}}}}}" > src/third_party/electron_node/config.gypi',
-+    ],
-+    'pattern': 'src/third_party/electron_node',
-+    'name': 'touch_node_config_gypi'
-+  },
-+  {
-+    'action': [
-+      'bash',
-+      '-c',
-+      'cd src/electron; npm install',
-+>>>>>>> .their
-     ],
-     'pattern': 'src/electron/package.json',
-     'name': 'electron_npm_deps'
-@@ -67,6 +109,7 @@
-   'src',
-   'src/libchromiumcontent',
- ]
-+<<<<<<< .our
- 
- gclient_gn_args = [
-   'checkout_libaom',
-@@ -74,3 +117,5 @@
-   'checkout_oculus_sdk'
- ]
- gclient_gn_args_file =  'src/build/config/gclient_args.gni'
-+=======
-+>>>>>>> .their
-added in both
-  our    100644 67a2b2124619d866f67d849f57f3548ba28be26a appveyor.yml
-  their  100644 60a97ce048a579888762a2b167b7368e01001c2b appveyor.yml
-@@ -3,7 +3,11 @@
-   except:
-   - /^release$|^release-\d-\d-x$/
- build_cloud: electron-16
-+<<<<<<< .our
- image: electron-16-vs2017-15.4.5
-+=======
-+image: electron-16-vs2017
-+>>>>>>> .their
- environment:
-   DISABLE_CRASH_REPORTER_TESTS: true
- build_script:
-added in both
-  our    100644 fc77100d9acb58221c35f364c4db7866a44d347d atom/app/atom_main.cc
-  their  100644 d6f3e0a1cfa59ce910557e8b04f001db9f9ad8aa atom/app/atom_main.cc
-@@ -71,7 +71,11 @@
- 
- #ifdef _DEBUG
-   // Don't display assert dialog boxes in CI test runs
-+<<<<<<< .our
-   static const char* kCI = "ELECTRON_CI";
-+=======
-+  static const auto kCI = "ELECTRON_CI";
-+>>>>>>> .their
-   bool is_ci = IsEnvSet(kCI);
-   if (!is_ci) {
-     for (int i = 0; i < arguments.argc; ++i) {
-added in both
-  our    100644 b3b5b8f2a8f24b8928f69a286c80e8a3b8464366 atom/app/atom_main_delegate.cc
-  their  100644 40be88a55abf6b054aad50b4c20c270588ac69a9 atom/app/atom_main_delegate.cc
-@@ -131,6 +131,11 @@
-   brightray::MainDelegate::PreSandboxStartup();
- 
-   auto* command_line = base::CommandLine::ForCurrentProcess();
-+<<<<<<< .our
-+=======
-+  std::string process_type =
-+      command_line->GetSwitchValueASCII(::switches::kProcessType);
-+>>>>>>> .their
- 
-   // Only append arguments for browser process.
-   if (!IsBrowserProcess(command_line))
-added in both
-  our    100644 089a2b63d1bae3afebea925582a3aac81ddeaa4f atom/browser/api/atom_api_app.cc
-  their  100644 57116862783196f37dc1f5cfbd196b81e41a0350 atom/browser/api/atom_api_app.cc
-@@ -667,17 +667,28 @@
- }
- #endif
- 
-+<<<<<<< .our
- void App::OnLogin(scoped_refptr<LoginHandler> login_handler,
-+=======
-+void App::OnLogin(LoginHandler* login_handler,
-+>>>>>>> .their
-                   const base::DictionaryValue& request_details) {
-   v8::Locker locker(isolate());
-   v8::HandleScope handle_scope(isolate());
-   bool prevent_default = false;
-   content::WebContents* web_contents = login_handler->GetWebContents();
-   if (web_contents) {
-+<<<<<<< .our
-     prevent_default = Emit(
-         "login", WebContents::CreateFrom(isolate(), web_contents),
-         request_details, login_handler->auth_info(),
-         base::Bind(&PassLoginInformation, base::RetainedRef(login_handler)));
-+=======
-+    prevent_default =
-+        Emit("login", WebContents::CreateFrom(isolate(), web_contents),
-+             request_details, login_handler->auth_info(),
-+             base::Bind(&PassLoginInformation, WrapRefCounted(login_handler)));
-+>>>>>>> .their
-   }
- 
-   // Default behavior is to always cancel the auth.
-@@ -990,8 +1001,12 @@
-                             const net::CompletionCallback& callback) {
-   auto browser_context = AtomBrowserContext::From("", false);
-   if (!certificate_manager_model_) {
-+<<<<<<< .our
-     auto copy = base::DictionaryValue::From(
-         base::Value::ToUniquePtrValue(options.Clone()));
-+=======
-+    std::unique_ptr<base::DictionaryValue> copy = options.CreateDeepCopy();
-+>>>>>>> .their
-     CertificateManagerModel::Create(
-         browser_context.get(),
-         base::Bind(&App::OnCertificateManagerModelCreated,
-@@ -1115,10 +1130,13 @@
-     mate::Dictionary memory_dict = mate::Dictionary::CreateEmpty(isolate);
-     mate::Dictionary cpu_dict = mate::Dictionary::CreateEmpty(isolate);
- 
-+<<<<<<< .our
-     pid_dict.SetHidden("simple", true);
-     memory_dict.SetHidden("simple", true);
-     cpu_dict.SetHidden("simple", true);
- 
-+=======
-+>>>>>>> .their
-     memory_dict.Set(
-         "workingSetSize",
-         static_cast<double>(
-@@ -1224,7 +1242,10 @@
-       .SetMethod("getName", base::Bind(&Browser::GetName, browser))
-       .SetMethod("setName", base::Bind(&Browser::SetName, browser))
-       .SetMethod("isReady", base::Bind(&Browser::is_ready, browser))
-+<<<<<<< .our
-       .SetMethod("whenReady", base::Bind(&Browser::WhenReady, browser))
-+=======
-+>>>>>>> .their
-       .SetMethod("addRecentDocument",
-                  base::Bind(&Browser::AddRecentDocument, browser))
-       .SetMethod("clearRecentDocuments",
-added in both
-  our    100644 ee0ad42c05fe33be17146b79cbe3422953516621 atom/browser/api/atom_api_app.h
-  their  100644 6093ad05b6343c85799789a9dc68abbf7294dc88 atom/browser/api/atom_api_app.h
-@@ -15,7 +15,10 @@
- #include "atom/browser/browser.h"
- #include "atom/browser/browser_observer.h"
- #include "atom/common/native_mate_converters/callback.h"
-+<<<<<<< .our
- #include "atom/common/promise_util.h"
-+=======
-+>>>>>>> .their
- #include "base/process/process_iterator.h"
- #include "base/task/cancelable_task_tracker.h"
- #include "chrome/browser/icon_manager.h"
-@@ -99,7 +102,11 @@
-   void OnActivate(bool has_visible_windows) override;
-   void OnWillFinishLaunching() override;
-   void OnFinishLaunching(const base::DictionaryValue& launch_info) override;
-+<<<<<<< .our
-   void OnLogin(scoped_refptr<LoginHandler> login_handler,
-+=======
-+  void OnLogin(LoginHandler* login_handler,
-+>>>>>>> .their
-                const base::DictionaryValue& request_details) override;
-   void OnAccessibilitySupportChanged() override;
-   void OnPreMainMessageLoopRun() override;
-added in both
-  our    100644 d0ae6f4ea78407c70e4cce6ff1181ce01e395133 atom/browser/api/atom_api_browser_window.cc
-  their  100644 1b0ed8d2950d6a2a24887bed802140372e9acc73 atom/browser/api/atom_api_browser_window.cc
-@@ -55,7 +55,11 @@
-     base::DictionaryValue web_preferences_dict;
-     if (mate::ConvertFromV8(isolate, web_preferences.GetHandle(),
-                             &web_preferences_dict)) {
-+<<<<<<< .our
-       existing_preferences->Clear();
-+=======
-+      existing_preferences->dict()->Clear();
-+>>>>>>> .their
-       existing_preferences->Merge(web_preferences_dict);
-     }
-   } else {
-added in both
-  our    100644 daccf443927abdf444845613b6e2916d167f96f3 atom/browser/api/atom_api_cookies.cc
-  their  100644 f55ed136adfb15fed7065a60df6320de90c63fdb atom/browser/api/atom_api_cookies.cc
-@@ -5,7 +5,10 @@
- #include "atom/browser/api/atom_api_cookies.h"
- 
- #include "atom/browser/atom_browser_context.h"
-+<<<<<<< .our
- #include "atom/browser/request_context_delegate.h"
-+=======
-+>>>>>>> .their
- #include "atom/common/native_mate_converters/callback.h"
- #include "atom/common/native_mate_converters/gurl_converter.h"
- #include "atom/common/native_mate_converters/value_converter.h"
-@@ -254,16 +257,23 @@
- Cookies::Cookies(v8::Isolate* isolate, AtomBrowserContext* browser_context)
-     : browser_context_(browser_context) {
-   Init(isolate);
-+<<<<<<< .our
-   cookie_change_subscription_ =
-       browser_context->GetRequestContextDelegate()
-           ->RegisterCookieChangeCallback(
-               base::Bind(&Cookies::OnCookieChanged, base::Unretained(this)));
-+=======
-+  auto subscription = browser_context->RegisterCookieChangeCallback(
-+      base::Bind(&Cookies::OnCookieChanged, base::Unretained(this)));
-+  browser_context->set_cookie_change_subscription(std::move(subscription));
-+>>>>>>> .their
- }
- 
- Cookies::~Cookies() {}
- 
- void Cookies::Get(const base::DictionaryValue& filter,
-                   const GetCallback& callback) {
-+<<<<<<< .our
-   auto copy = base::DictionaryValue::From(
-       base::Value::ToUniquePtrValue(filter.Clone()));
-   auto* getter = browser_context_->GetRequestContext();
-@@ -271,6 +281,14 @@
-       BrowserThread::IO, FROM_HERE,
-       base::BindOnce(GetCookiesOnIO, base::RetainedRef(getter), std::move(copy),
-                      callback));
-+=======
-+  std::unique_ptr<base::DictionaryValue> copied(filter.CreateDeepCopy());
-+  auto* getter = browser_context_->GetRequestContext();
-+  content::BrowserThread::PostTask(
-+      BrowserThread::IO, FROM_HERE,
-+      base::BindOnce(GetCookiesOnIO, base::RetainedRef(getter),
-+                     std::move(copied), callback));
-+>>>>>>> .their
- }
- 
- void Cookies::Remove(const GURL& url,
-@@ -285,6 +303,7 @@
- 
- void Cookies::Set(const base::DictionaryValue& details,
-                   const SetCallback& callback) {
-+<<<<<<< .our
-   auto copy = base::DictionaryValue::From(
-       base::Value::ToUniquePtrValue(details.Clone()));
-   auto* getter = browser_context_->GetRequestContext();
-@@ -292,6 +311,14 @@
-       BrowserThread::IO, FROM_HERE,
-       base::BindOnce(SetCookieOnIO, base::RetainedRef(getter), std::move(copy),
-                      callback));
-+=======
-+  std::unique_ptr<base::DictionaryValue> copied(details.CreateDeepCopy());
-+  auto* getter = browser_context_->GetRequestContext();
-+  content::BrowserThread::PostTask(
-+      BrowserThread::IO, FROM_HERE,
-+      base::BindOnce(SetCookieOnIO, base::RetainedRef(getter),
-+                     std::move(copied), callback));
-+>>>>>>> .their
- }
- 
- void Cookies::FlushStore(const base::Closure& callback) {
-added in both
-  our    100644 8a83a64ca1012e11cb9629ea172f578eca545abe atom/browser/api/atom_api_cookies.h
-  their  100644 403e22623302087ac93283d37981d4e02f7596d9 atom/browser/api/atom_api_cookies.h
-@@ -9,7 +9,11 @@
- 
- #include "atom/browser/api/trackable_object.h"
- #include "atom/browser/net/cookie_details.h"
-+<<<<<<< .our
- #include "base/callback_list.h"
-+=======
-+#include "base/callback.h"
-+>>>>>>> .their
- #include "native_mate/handle.h"
- #include "net/cookies/canonical_cookie.h"
- 
-@@ -59,8 +63,11 @@
-   void OnCookieChanged(const CookieDetails*);
- 
-  private:
-+<<<<<<< .our
-   std::unique_ptr<base::CallbackList<void(const CookieDetails*)>::Subscription>
-       cookie_change_subscription_;
-+=======
-+>>>>>>> .their
-   scoped_refptr<AtomBrowserContext> browser_context_;
- 
-   DISALLOW_COPY_AND_ASSIGN(Cookies);
-added in both
-  our    100644 deaf680c996ce0dd74af45e7c7c95f711884bb07 atom/browser/api/atom_api_protocol.h
-  their  100644 ab5e34872c6e9f346c31efd7e9135ce6bfa90393 atom/browser/api/atom_api_protocol.h
-@@ -78,13 +78,21 @@
-         net::URLRequest* request,
-         net::NetworkDelegate* network_delegate) const override {
-       RequestJob* request_job = new RequestJob(request, network_delegate);
-+<<<<<<< .our
-       request_job->SetHandlerInfo(isolate_, request_context_, handler_);
-+=======
-+      request_job->SetHandlerInfo(isolate_, request_context_.get(), handler_);
-+>>>>>>> .their
-       return request_job;
-     }
- 
-    private:
-     v8::Isolate* isolate_;
-+<<<<<<< .our
-     net::URLRequestContextGetter* request_context_;
-+=======
-+    scoped_refptr<net::URLRequestContextGetter> request_context_;
-+>>>>>>> .their
-     Protocol::Handler handler_;
- 
-     DISALLOW_COPY_AND_ASSIGN(CustomProtocolHandler);
-added in both
-  our    100644 658f913bb60b66ae1bf3aae97d7d9158e56f7ee0 atom/browser/api/atom_api_session.cc
-  their  100644 2ca8ae0e26ddeaa9db681e3bfb9d98582e4c154a atom/browser/api/atom_api_session.cc
-@@ -244,7 +244,11 @@
-       : callback_(callback),
-         original_thread_(base::ThreadTaskRunnerHandle::Get()) {
-     scoped_refptr<net::URLRequestContextGetter> context_getter =
-+<<<<<<< .our
-         browser_context->GetRequestContext();
-+=======
-+        browser_context->url_request_context_getter();
-+>>>>>>> .their
-     context_getter->GetNetworkTaskRunner()->PostTask(
-         FROM_HERE, base::BindOnce(&ResolveProxyHelper::ResolveProxy,
-                                   base::Unretained(this), context_getter, url));
-@@ -453,6 +457,18 @@
-   network_delegate->SetDevToolsNetworkEmulationClientId(client_id);
- }
- 
-+<<<<<<< .our
-+=======
-+// Clear protocol handlers in IO thread.
-+void ClearJobFactoryInIO(
-+    scoped_refptr<brightray::URLRequestContextGetter> request_context_getter) {
-+  auto* job_factory = static_cast<AtomURLRequestJobFactory*>(
-+      request_context_getter->job_factory());
-+  if (job_factory)
-+    job_factory->Clear();
-+}
-+
-+>>>>>>> .their
- void DestroyGlobalHandle(v8::Isolate* isolate,
-                          const v8::Global<v8::Value>& global_handle) {
-   v8::Locker locker(isolate);
-@@ -486,6 +502,13 @@
- }
- 
- Session::~Session() {
-+<<<<<<< .our
-+=======
-+  auto* getter = browser_context_->GetRequestContext();
-+  content::BrowserThread::PostTask(
-+      content::BrowserThread::IO, FROM_HERE,
-+      base::BindOnce(ClearJobFactoryInIO, base::RetainedRef(getter)));
-+>>>>>>> .their
-   content::BrowserContext::GetDownloadManager(browser_context())
-       ->RemoveObserver(this);
-   DestroyGlobalHandle(isolate(), cookies_);
-@@ -584,9 +607,16 @@
-       devtools_network_emulation_client_id_, std::move(conditions));
-   BrowserThread::PostTask(
-       BrowserThread::IO, FROM_HERE,
-+<<<<<<< .our
-       base::BindOnce(&SetDevToolsNetworkEmulationClientIdInIO,
-                      base::RetainedRef(browser_context_->GetRequestContext()),
-                      devtools_network_emulation_client_id_));
-+=======
-+      base::BindOnce(
-+          &SetDevToolsNetworkEmulationClientIdInIO,
-+          base::RetainedRef(browser_context_->url_request_context_getter()),
-+          devtools_network_emulation_client_id_));
-+>>>>>>> .their
- }
- 
- void Session::DisableNetworkEmulation() {
-@@ -595,9 +625,16 @@
-       devtools_network_emulation_client_id_, std::move(conditions));
-   BrowserThread::PostTask(
-       BrowserThread::IO, FROM_HERE,
-+<<<<<<< .our
-       base::BindOnce(&SetDevToolsNetworkEmulationClientIdInIO,
-                      base::RetainedRef(browser_context_->GetRequestContext()),
-                      std::string()));
-+=======
-+      base::BindOnce(
-+          &SetDevToolsNetworkEmulationClientIdInIO,
-+          base::RetainedRef(browser_context_->url_request_context_getter()),
-+          std::string()));
-+>>>>>>> .their
- }
- 
- void Session::SetCertVerifyProc(v8::Local<v8::Value> val,
-added in both
-  our    100644 e0ef26a9fc46818056581a69169395e741ce2efe atom/browser/api/atom_api_system_preferences.h
-  their  100644 bfd64e80159dc46806360f14fd609ba24ccc09cb atom/browser/api/atom_api_system_preferences.h
-@@ -50,6 +50,14 @@
- #if defined(OS_WIN)
-   bool IsAeroGlassEnabled();
- 
-+<<<<<<< .our
-+=======
-+  typedef HRESULT(STDAPICALLTYPE* DwmGetColorizationColor)(DWORD*, BOOL*);
-+  DwmGetColorizationColor dwmGetColorizationColor =
-+      (DwmGetColorizationColor)GetProcAddress(LoadLibraryW(L"dwmapi.dll"),
-+                                              "DwmGetColorizationColor");
-+
-+>>>>>>> .their
-   std::string GetAccentColor();
-   std::string GetColor(const std::string& color, mate::Arguments* args);
- 
-added in both
-  our    100644 0a24d1abf45fe7ff244386ea238b0e7b03b2df00 atom/browser/api/atom_api_system_preferences_win.cc
-  their  100644 b3fd74d59d9bcb53a23712f4a48206af191d45a6 atom/browser/api/atom_api_system_preferences_win.cc
-@@ -2,7 +2,10 @@
- // Use of this source code is governed by the MIT license that can be
- // found in the LICENSE file.
- 
-+<<<<<<< .our
- #include <dwmapi.h>
-+=======
-+>>>>>>> .their
- #include <iomanip>
- 
- #include "atom/browser/api/atom_api_system_preferences.h"
-@@ -39,7 +42,11 @@
-   DWORD color = 0;
-   BOOL opaque = FALSE;
- 
-+<<<<<<< .our
-   if (FAILED(DwmGetColorizationColor(&color, &opaque))) {
-+=======
-+  if (FAILED(dwmGetColorizationColor(&color, &opaque))) {
-+>>>>>>> .their
-     return "";
-   }
- 
-added in both
-  our    100644 c8db6b0bb468a2a722d8d830a9b2cb4bf2ce116b atom/browser/api/atom_api_top_level_window.cc
-  their  100644 f1f61c66752baf0b4bc5a6e94a639142b276e670 atom/browser/api/atom_api_top_level_window.cc
-@@ -194,6 +194,7 @@
-   Emit("restore");
- }
- 
-+<<<<<<< .our
- void TopLevelWindow::OnWindowWillResize(const gfx::Rect& new_bounds,
-                                         bool* prevent_default) {
-   if (Emit("will-resize", new_bounds)) {
-@@ -201,6 +202,8 @@
-   }
- }
- 
-+=======
-+>>>>>>> .their
- void TopLevelWindow::OnWindowResize() {
-   Emit("resize");
- }
-@@ -578,10 +581,13 @@
-   return window_->GetOpacity();
- }
- 
-+<<<<<<< .our
- void TopLevelWindow::SetShape(const std::vector<gfx::Rect>& rects) {
-   window_->widget()->SetShape(std::make_unique<std::vector<gfx::Rect>>(rects));
- }
- 
-+=======
-+>>>>>>> .their
- void TopLevelWindow::SetRepresentedFilename(const std::string& filename) {
-   window_->SetRepresentedFilename(filename);
- }
-@@ -749,6 +755,7 @@
-     args->ThrowError("AddTabbedWindow cannot be called by a window on itself.");
- }
- 
-+<<<<<<< .our
- void TopLevelWindow::SetWindowButtonVisibility(bool visible,
-                                                mate::Arguments* args) {
-   if (!window_->SetWindowButtonVisibility(visible)) {
-@@ -756,6 +763,8 @@
-   }
- }
- 
-+=======
-+>>>>>>> .their
- void TopLevelWindow::SetAutoHideMenuBar(bool auto_hide) {
-   window_->SetAutoHideMenuBar(auto_hide);
- }
-@@ -828,7 +837,11 @@
-     args->ThrowError();
-     return false;
-   }
-+<<<<<<< .our
-   auto* window = static_cast<NativeWindowViews*>(window_.get());
-+=======
-+  auto window = static_cast<NativeWindowViews*>(window_.get());
-+>>>>>>> .their
-   return window->taskbar_host().SetThumbarButtons(
-       window_->GetAcceleratedWidget(), buttons);
- #else
-@@ -1011,7 +1024,10 @@
-       .SetMethod("hasShadow", &TopLevelWindow::HasShadow)
-       .SetMethod("setOpacity", &TopLevelWindow::SetOpacity)
-       .SetMethod("getOpacity", &TopLevelWindow::GetOpacity)
-+<<<<<<< .our
-       .SetMethod("setShape", &TopLevelWindow::SetShape)
-+=======
-+>>>>>>> .their
-       .SetMethod("setRepresentedFilename",
-                  &TopLevelWindow::SetRepresentedFilename)
-       .SetMethod("getRepresentedFilename",
-@@ -1049,8 +1065,11 @@
-       .SetMethod("moveTabToNewWindow", &TopLevelWindow::MoveTabToNewWindow)
-       .SetMethod("toggleTabBar", &TopLevelWindow::ToggleTabBar)
-       .SetMethod("addTabbedWindow", &TopLevelWindow::AddTabbedWindow)
-+<<<<<<< .our
-       .SetMethod("setWindowButtonVisibility",
-                  &TopLevelWindow::SetWindowButtonVisibility)
-+=======
-+>>>>>>> .their
- #endif
-       .SetMethod("setAutoHideMenuBar", &TopLevelWindow::SetAutoHideMenuBar)
-       .SetMethod("isMenuBarAutoHide", &TopLevelWindow::IsMenuBarAutoHide)
-added in both
-  our    100644 ac4c7670a544abc25029314122ba6124a81cc81a atom/browser/api/atom_api_top_level_window.h
-  their  100644 5a76fd229c6b1cd1737199c5a502bb069e81dd64 atom/browser/api/atom_api_top_level_window.h
-@@ -60,8 +60,11 @@
-   void OnWindowUnmaximize() override;
-   void OnWindowMinimize() override;
-   void OnWindowRestore() override;
-+<<<<<<< .our
-   void OnWindowWillResize(const gfx::Rect& new_bounds,
-                           bool* prevent_default) override;
-+=======
-+>>>>>>> .their
-   void OnWindowResize() override;
-   void OnWindowMove() override;
-   void OnWindowMoved() override;
-@@ -148,7 +151,10 @@
-   bool HasShadow();
-   void SetOpacity(const double opacity);
-   double GetOpacity();
-+<<<<<<< .our
-   void SetShape(const std::vector<gfx::Rect>& rects);
-+=======
-+>>>>>>> .their
-   void SetRepresentedFilename(const std::string& filename);
-   std::string GetRepresentedFilename();
-   void SetDocumentEdited(bool edited);
-@@ -176,7 +182,10 @@
-   void MoveTabToNewWindow();
-   void ToggleTabBar();
-   void AddTabbedWindow(NativeWindow* window, mate::Arguments* args);
-+<<<<<<< .our
-   void SetWindowButtonVisibility(bool visible, mate::Arguments* args);
-+=======
-+>>>>>>> .their
-   void SetAutoHideMenuBar(bool auto_hide);
-   bool IsMenuBarAutoHide();
-   void SetMenuBarVisibility(bool visible);
-added in both
-  our    100644 9f18d97d2656fbc5dc62b7bcea05a8acab63e847 atom/browser/api/atom_api_url_request.cc
-  their  100644 51c7969e31f44c9c08dbc5aa7ccc8b1e60fff863 atom/browser/api/atom_api_url_request.cc
-@@ -125,6 +125,7 @@
-   return IsFlagSet(ResponseStateFlags::kFailed);
- }
- 
-+<<<<<<< .our
- mate::Dictionary URLRequest::GetUploadProgress(v8::Isolate* isolate) {
-   mate::Dictionary progress = mate::Dictionary::CreateEmpty(isolate);
- 
-@@ -137,6 +138,8 @@
-   return progress;
- }
- 
-+=======
-+>>>>>>> .their
- URLRequest::URLRequest(v8::Isolate* isolate, v8::Local<v8::Object> wrapper) {
-   InitWith(isolate, wrapper);
- }
-@@ -195,7 +198,10 @@
-       .SetMethod("setChunkedUpload", &URLRequest::SetChunkedUpload)
-       .SetMethod("followRedirect", &URLRequest::FollowRedirect)
-       .SetMethod("_setLoadFlags", &URLRequest::SetLoadFlags)
-+<<<<<<< .our
-       .SetMethod("getUploadProgress", &URLRequest::GetUploadProgress)
-+=======
-+>>>>>>> .their
-       .SetProperty("notStarted", &URLRequest::NotStarted)
-       .SetProperty("finished", &URLRequest::Finished)
-       // Response APi
-added in both
-  our    100644 4a5a2b65160bf0590c9e890e52d0531b799b583a atom/browser/api/atom_api_url_request.h
-  their  100644 3b5e667d7590b9398b6d41632f0f016f1a6c27d5 atom/browser/api/atom_api_url_request.h
-@@ -112,7 +112,10 @@
-   void OnResponseData(scoped_refptr<const net::IOBufferWithSize> data);
-   void OnResponseCompleted();
-   void OnError(const std::string& error, bool isRequestError);
-+<<<<<<< .our
-   mate::Dictionary GetUploadProgress(v8::Isolate* isolate);
-+=======
-+>>>>>>> .their
- 
-  protected:
-   explicit URLRequest(v8::Isolate* isolate, v8::Local<v8::Object> wrapper);
-added in both
-  our    100644 20a1ac2e672f08ffea528b6e094ba530ff8083d1 atom/browser/api/atom_api_web_contents.cc
-  their  100644 170e1d7cedd9cf89fddd6688a608559fb43ca261 atom/browser/api/atom_api_web_contents.cc
-@@ -121,6 +121,31 @@
- namespace mate {
- 
- template <>
-+<<<<<<< .our
-+=======
-+struct Converter<atom::SetSizeParams> {
-+  static bool FromV8(v8::Isolate* isolate,
-+                     v8::Local<v8::Value> val,
-+                     atom::SetSizeParams* out) {
-+    mate::Dictionary params;
-+    if (!ConvertFromV8(isolate, val, &params))
-+      return false;
-+    bool autosize;
-+    if (params.Get("enableAutoSize", &autosize))
-+      out->enable_auto_size.reset(new bool(autosize));
-+    gfx::Size size;
-+    if (params.Get("min", &size))
-+      out->min_size.reset(new gfx::Size(size));
-+    if (params.Get("max", &size))
-+      out->max_size.reset(new gfx::Size(size));
-+    if (params.Get("normal", &size))
-+      out->normal_size.reset(new gfx::Size(size));
-+    return true;
-+  }
-+};
-+
-+template <>
-+>>>>>>> .their
- struct Converter<PrintSettings> {
-   static bool FromV8(v8::Isolate* isolate,
-                      v8::Local<v8::Value> val,
-@@ -374,8 +399,12 @@
-                                             GURL("chrome-guest://fake-host"));
-     content::WebContents::CreateParams params(session->browser_context(),
-                                               site_instance);
-+<<<<<<< .our
-     guest_delegate_.reset(
-         new WebViewGuestDelegate(embedder_->web_contents(), this));
-+=======
-+    guest_delegate_.reset(new WebViewGuestDelegate);
-+>>>>>>> .their
-     params.guest_delegate = guest_delegate_.get();
- 
- #if defined(ENABLE_OSR)
-@@ -427,7 +456,11 @@
-                                             mate::Handle<api::Session> session,
-                                             const mate::Dictionary& options) {
-   Observe(web_contents);
-+<<<<<<< .our
-   InitWithWebContents(web_contents, session->browser_context(), IsGuest());
-+=======
-+  InitWithWebContents(web_contents, session->browser_context());
-+>>>>>>> .their
- 
-   managed_web_contents()->GetView()->SetDelegate(this);
- 
-@@ -460,6 +493,11 @@
-   web_contents->SetUserAgentOverride(GetBrowserContext()->GetUserAgent());
- 
-   if (IsGuest()) {
-+<<<<<<< .our
-+=======
-+    guest_delegate_->Initialize(this);
-+
-+>>>>>>> .their
-     NativeWindow* owner_window = nullptr;
-     if (embedder_) {
-       // New WebContents's owner_window is the embedder's owner_window.
-@@ -481,6 +519,7 @@
-   if (managed_web_contents()) {
-     managed_web_contents()->GetView()->SetDelegate(nullptr);
- 
-+<<<<<<< .our
-     RenderViewDeleted(web_contents()->GetRenderViewHost());
- 
-     if (type_ == BROWSER_WINDOW && owner_window()) {
-@@ -493,6 +532,29 @@
-     // destroy the webContents in the next tick. So we have to manually
-     // call it here to make sure "destroyed" event is emitted.
-     WebContentsDestroyed();
-+=======
-+    // For webview we need to tell content module to do some cleanup work before
-+    // destroying it.
-+    if (type_ == WEB_VIEW)
-+      guest_delegate_->Destroy();
-+
-+    RenderViewDeleted(web_contents()->GetRenderViewHost());
-+
-+    if (type_ == WEB_VIEW) {
-+      DestroyWebContents(false /* async */);
-+    } else {
-+      if (type_ == BROWSER_WINDOW && owner_window()) {
-+        for (ExtendedWebContentsObserver& observer : observers_)
-+          observer.OnCloseContents();
-+      } else {
-+        DestroyWebContents(true /* async */);
-+      }
-+      // The WebContentsDestroyed will not be called automatically because we
-+      // destroy the webContents in the next tick. So we have to manually
-+      // call it here to make sure "destroyed" event is emitted.
-+      WebContentsDestroyed();
-+    }
-+>>>>>>> .their
-   }
- }
- 
-@@ -752,6 +814,16 @@
-   return dialog_manager_.get();
- }
- 
-+<<<<<<< .our
-+=======
-+void WebContents::ResizeDueToAutoResize(content::WebContents* web_contents,
-+                                        const gfx::Size& new_size) {
-+  if (IsGuest()) {
-+    guest_delegate_->ResizeDueToAutoResize(new_size);
-+  }
-+}
-+
-+>>>>>>> .their
- void WebContents::BeforeUnloadFired(const base::TimeTicks& proceed_time) {
-   // Do nothing, we override this method just to avoid compilation error since
-   // there are two virtual functions named BeforeUnloadFired.
-@@ -896,8 +968,11 @@
-         Emit("did-navigate", url, http_response_code, http_status_text);
-       }
-     }
-+<<<<<<< .our
-     if (IsGuest())
-       Emit("load-commit", url, is_main_frame);
-+=======
-+>>>>>>> .their
-   } else {
-     auto url = navigation_handle->GetURL();
-     int code = navigation_handle->GetNetErrorCode();
-@@ -1038,8 +1113,12 @@
- // 1. call webContents.destroy();
- // 2. garbage collection;
- // 3. user closes the window of webContents;
-+<<<<<<< .our
- // 4. the embedder detaches the frame.
- // For webview only #4 will happen, for BrowserWindow both #1 and #3 may
-+=======
-+// For webview only #1 will happen, for BrowserWindow both #1 and #3 may
-+>>>>>>> .their
- // happen. The #2 should never happen for webContents, because webview is
- // managed by GuestViewManager, and BrowserWindow's webContents is managed
- // by api::BrowserWindow.
-@@ -1047,7 +1126,10 @@
- // sure "destroyed" event is emitted. For #3, the content::WebContents will
- // be destroyed on close, and WebContentsDestroyed would be called for it, so
- // we need to make sure the api::WebContents is also deleted.
-+<<<<<<< .our
- // For #4, the WebContents will be destroyed by embedder.
-+=======
-+>>>>>>> .their
- void WebContents::WebContentsDestroyed() {
-   // Cleanup relationships with other parts.
-   RemoveFromWeakMap();
-@@ -1058,6 +1140,7 @@
- 
-   Emit("destroyed");
- 
-+<<<<<<< .our
-   // For guest view based on OOPIF, the WebContents is released by the embedder
-   // frame, and we need to clear the reference to the memory.
-   if (IsGuest() && managed_web_contents()) {
-@@ -1065,6 +1148,8 @@
-     ResetManagedWebContents(false);
-   }
- 
-+=======
-+>>>>>>> .their
-   // Destroy the native class in next tick.
-   base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, GetDestroyClosure());
- }
-@@ -1075,12 +1160,30 @@
-        details.is_same_document, details.did_replace_entry);
- }
- 
-+<<<<<<< .our
-+=======
-+int64_t WebContents::GetIDForContents(content::WebContents* web_contents) {
-+  int64_t process_id = web_contents->GetMainFrame()->GetProcess()->GetID();
-+  int64_t routing_id = web_contents->GetMainFrame()->GetRoutingID();
-+  int64_t rv = (process_id << 32) + routing_id;
-+  return rv;
-+}
-+
-+int64_t WebContents::GetID() const {
-+  return WebContents::GetIDForContents(web_contents());
-+}
-+
-+>>>>>>> .their
- int WebContents::GetProcessID() const {
-   return web_contents()->GetMainFrame()->GetProcess()->GetID();
- }
- 
- base::ProcessId WebContents::GetOSProcessID() const {
-+<<<<<<< .our
-   base::ProcessHandle process_handle =
-+=======
-+  auto process_handle =
-+>>>>>>> .their
-       web_contents()->GetMainFrame()->GetProcess()->GetHandle();
-   return base::GetProcId(process_handle);
- }
-@@ -1090,7 +1193,11 @@
- }
- 
- bool WebContents::Equal(const WebContents* web_contents) const {
-+<<<<<<< .our
-   return ID() == web_contents->ID();
-+=======
-+  return GetID() == web_contents->GetID();
-+>>>>>>> .their
- }
- 
- void WebContents::LoadURL(const GURL& url, const mate::Dictionary& options) {
-@@ -1101,6 +1208,13 @@
-     return;
-   }
- 
-+<<<<<<< .our
-+=======
-+  if (guest_delegate_ && !guest_delegate_->IsAttached()) {
-+    return;
-+  }
-+
-+>>>>>>> .their
-   content::NavigationController::LoadURLParams params(url);
- 
-   if (!options.Get("httpReferrer", &params.referrer)) {
-@@ -1142,8 +1256,13 @@
-   if (view) {
-     auto* web_preferences = WebContentsPreferences::From(web_contents());
-     std::string color_name;
-+<<<<<<< .our
-     if (web_preferences->GetPreference(options::kBackgroundColor,
-                                        &color_name)) {
-+=======
-+    if (web_preferences->dict()->GetString(options::kBackgroundColor,
-+                                           &color_name)) {
-+>>>>>>> .their
-       view->SetBackgroundColor(ParseHexColor(color_name));
-     } else {
-       view->SetBackgroundColor(SK_ColorTRANSPARENT);
-@@ -1391,10 +1510,13 @@
-   return web_contents()->IsAudioMuted();
- }
- 
-+<<<<<<< .our
- bool WebContents::IsCurrentlyAudible() {
-   return web_contents()->IsCurrentlyAudible();
- }
- 
-+=======
-+>>>>>>> .their
- void WebContents::Print(mate::Arguments* args) {
-   PrintSettings settings = {false, false, base::string16()};
-   if (args->Length() >= 1 && !args->GetNext(&settings)) {
-@@ -1715,6 +1837,7 @@
-   }
- }
- 
-+<<<<<<< .our
- bool WebContents::IsGuest() const {
-   return type_ == WEB_VIEW;
- }
-@@ -1723,6 +1846,15 @@
-                                  int embedder_frame_id) {
-   if (guest_delegate_)
-     guest_delegate_->AttachToIframe(embedder_web_contents, embedder_frame_id);
-+=======
-+void WebContents::SetSize(const SetSizeParams& params) {
-+  if (guest_delegate_)
-+    guest_delegate_->SetSize(params);
-+}
-+
-+bool WebContents::IsGuest() const {
-+  return type_ == WEB_VIEW;
-+>>>>>>> .their
- }
- 
- bool WebContents::IsOffScreen() const {
-@@ -1823,7 +1955,11 @@
-   zoom_controller_->SetZoomLevel(level);
- }
- 
-+<<<<<<< .our
- double WebContents::GetZoomLevel() const {
-+=======
-+double WebContents::GetZoomLevel() {
-+>>>>>>> .their
-   return zoom_controller_->GetZoomLevel();
- }
- 
-@@ -1832,7 +1968,11 @@
-   SetZoomLevel(level);
- }
- 
-+<<<<<<< .our
- double WebContents::GetZoomFactor() const {
-+=======
-+double WebContents::GetZoomFactor() {
-+>>>>>>> .their
-   auto level = GetZoomLevel();
-   return content::ZoomLevelToZoomFactor(level);
- }
-@@ -1853,6 +1993,7 @@
-   rfh->Send(reply_msg);
- }
- 
-+<<<<<<< .our
- v8::Local<v8::Value> WebContents::GetPreloadPath(v8::Isolate* isolate) const {
-   if (auto* web_preferences = WebContentsPreferences::From(web_contents())) {
-     base::FilePath::StringType preload;
-@@ -1880,6 +2021,24 @@
- }
- 
- v8::Local<v8::Value> WebContents::GetOwnerBrowserWindow() const {
-+=======
-+v8::Local<v8::Value> WebContents::GetWebPreferences(v8::Isolate* isolate) {
-+  auto* web_preferences = WebContentsPreferences::From(web_contents());
-+  if (!web_preferences)
-+    return v8::Null(isolate);
-+  return mate::ConvertToV8(isolate, *web_preferences->dict());
-+}
-+
-+v8::Local<v8::Value> WebContents::GetLastWebPreferences(v8::Isolate* isolate) {
-+  WebContentsPreferences* web_preferences =
-+      WebContentsPreferences::FromWebContents(web_contents());
-+  if (!web_preferences)
-+    return v8::Null(isolate);
-+  return mate::ConvertToV8(isolate, *web_preferences->last_dict());
-+}
-+
-+v8::Local<v8::Value> WebContents::GetOwnerBrowserWindow() {
-+>>>>>>> .their
-   if (owner_window())
-     return BrowserWindow::From(isolate(), owner_window());
-   else
-@@ -1961,6 +2120,10 @@
-   prototype->SetClassName(mate::StringToV8(isolate, "WebContents"));
-   mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
-       .MakeDestroyable()
-+<<<<<<< .our
-+=======
-+      .SetMethod("getId", &WebContents::GetID)
-+>>>>>>> .their
-       .SetMethod("getProcessId", &WebContents::GetProcessID)
-       .SetMethod("getOSProcessId", &WebContents::GetOSProcessID)
-       .SetMethod("equal", &WebContents::Equal)
-@@ -1990,7 +2153,10 @@
-       .SetMethod("setIgnoreMenuShortcuts", &WebContents::SetIgnoreMenuShortcuts)
-       .SetMethod("setAudioMuted", &WebContents::SetAudioMuted)
-       .SetMethod("isAudioMuted", &WebContents::IsAudioMuted)
-+<<<<<<< .our
-       .SetMethod("isCurrentlyAudible", &WebContents::IsCurrentlyAudible)
-+=======
-+>>>>>>> .their
-       .SetMethod("undo", &WebContents::Undo)
-       .SetMethod("redo", &WebContents::Redo)
-       .SetMethod("cut", &WebContents::Cut)
-@@ -2012,8 +2178,13 @@
-       .SetMethod("beginFrameSubscription", &WebContents::BeginFrameSubscription)
-       .SetMethod("endFrameSubscription", &WebContents::EndFrameSubscription)
-       .SetMethod("startDrag", &WebContents::StartDrag)
-+<<<<<<< .our
-       .SetMethod("isGuest", &WebContents::IsGuest)
-       .SetMethod("attachToIframe", &WebContents::AttachToIframe)
-+=======
-+      .SetMethod("setSize", &WebContents::SetSize)
-+      .SetMethod("isGuest", &WebContents::IsGuest)
-+>>>>>>> .their
-       .SetMethod("isOffscreen", &WebContents::IsOffScreen)
-       .SetMethod("startPainting", &WebContents::StartPainting)
-       .SetMethod("stopPainting", &WebContents::StopPainting)
-@@ -2026,7 +2197,10 @@
-       .SetMethod("setZoomFactor", &WebContents::SetZoomFactor)
-       .SetMethod("_getZoomFactor", &WebContents::GetZoomFactor)
-       .SetMethod("getType", &WebContents::GetType)
-+<<<<<<< .our
-       .SetMethod("_getPreloadPath", &WebContents::GetPreloadPath)
-+=======
-+>>>>>>> .their
-       .SetMethod("getWebPreferences", &WebContents::GetWebPreferences)
-       .SetMethod("getLastWebPreferences", &WebContents::GetLastWebPreferences)
-       .SetMethod("getOwnerBrowserWindow", &WebContents::GetOwnerBrowserWindow)
-added in both
-  our    100644 7939f8268aa8c3371623e0c15f3b6001d7f1efa4 atom/browser/api/atom_api_web_contents.h
-  their  100644 2155656ccbdcc34731bcb01b99a89b7c321a96da atom/browser/api/atom_api_web_contents.h
-@@ -42,6 +42,10 @@
- 
- namespace atom {
- 
-+<<<<<<< .our
-+=======
-+struct SetSizeParams;
-+>>>>>>> .their
- class AtomBrowserContext;
- class AtomJavaScriptDialogManager;
- class WebContentsZoomController;
-@@ -97,9 +101,18 @@
-   static void BuildPrototype(v8::Isolate* isolate,
-                              v8::Local<v8::FunctionTemplate> prototype);
- 
-+<<<<<<< .our
-   // Notifies to destroy any guest web contents before destroying self.
-   void DestroyWebContents(bool async);
- 
-+=======
-+  static int64_t GetIDForContents(content::WebContents* web_contents);
-+
-+  // Notifies to destroy any guest web contents before destroying self.
-+  void DestroyWebContents(bool async);
-+
-+  int64_t GetID() const;
-+>>>>>>> .their
-   int GetProcessID() const;
-   base::ProcessId GetOSProcessID() const;
-   Type GetType() const;
-@@ -139,7 +152,10 @@
-   void SetIgnoreMenuShortcuts(bool ignore);
-   void SetAudioMuted(bool muted);
-   bool IsAudioMuted();
-+<<<<<<< .our
-   bool IsCurrentlyAudible();
-+=======
-+>>>>>>> .their
-   void Print(mate::Arguments* args);
-   std::vector<printing::PrinterBasicInfo> GetPrinterList();
-   void SetEmbedder(const WebContents* embedder);
-@@ -196,9 +212,14 @@
-   void CapturePage(mate::Arguments* args);
- 
-   // Methods for creating <webview>.
-+<<<<<<< .our
-   bool IsGuest() const;
-   void AttachToIframe(content::WebContents* embedder_web_contents,
-                       int embedder_frame_id);
-+=======
-+  void SetSize(const SetSizeParams& params);
-+  bool IsGuest() const;
-+>>>>>>> .their
- 
-   // Methods for offscreen rendering
-   bool IsOffScreen() const;
-@@ -213,9 +234,15 @@
- 
-   // Methods for zoom handling.
-   void SetZoomLevel(double level);
-+<<<<<<< .our
-   double GetZoomLevel() const;
-   void SetZoomFactor(double factor);
-   double GetZoomFactor() const;
-+=======
-+  double GetZoomLevel();
-+  void SetZoomFactor(double factor);
-+  double GetZoomFactor();
-+>>>>>>> .their
- 
-   // Callback triggered on permission response.
-   void OnEnterFullscreenModeForTab(content::WebContents* source,
-@@ -230,6 +257,7 @@
-                       const std::vector<std::string>& features,
-                       const scoped_refptr<network::ResourceRequestBody>& body);
- 
-+<<<<<<< .our
-   // Returns the preload script path of current WebContents.
-   v8::Local<v8::Value> GetPreloadPath(v8::Isolate* isolate) const;
- 
-@@ -239,6 +267,14 @@
- 
-   // Returns the owner window.
-   v8::Local<v8::Value> GetOwnerBrowserWindow() const;
-+=======
-+  // Returns the web preferences of current WebContents.
-+  v8::Local<v8::Value> GetWebPreferences(v8::Isolate* isolate);
-+  v8::Local<v8::Value> GetLastWebPreferences(v8::Isolate* isolate);
-+
-+  // Returns the owner window.
-+  v8::Local<v8::Value> GetOwnerBrowserWindow();
-+>>>>>>> .their
- 
-   // Grants the child process the capability to access URLs with the origin of
-   // the specified URL.
-@@ -340,6 +376,11 @@
-       const content::BluetoothChooser::EventHandler& handler) override;
-   content::JavaScriptDialogManager* GetJavaScriptDialogManager(
-       content::WebContents* source) override;
-+<<<<<<< .our
-+=======
-+  void ResizeDueToAutoResize(content::WebContents* web_contents,
-+                             const gfx::Size& new_size) override;
-+>>>>>>> .their
- 
-   // content::WebContentsObserver:
-   void BeforeUnloadFired(const base::TimeTicks& proceed_time) override;
-added in both
-  our    100644 c088196f833160ac964e67030fa083302dd090b0 atom/browser/api/atom_api_web_request.cc
-  their  100644 ac265fb168ae6d90844c00d5c40e0646875d0cab atom/browser/api/atom_api_web_request.cc
-@@ -95,7 +95,11 @@
-   }
- 
-   brightray::URLRequestContextGetter* url_request_context_getter =
-+<<<<<<< .our
-       browser_context_->GetRequestContext();
-+=======
-+      browser_context_->url_request_context_getter();
-+>>>>>>> .their
-   if (!url_request_context_getter)
-     return;
-   BrowserThread::PostTask(
-added in both
-  our    100644 e24d6306f62a63331304617c969db410db0ae0c4 atom/browser/api/atom_api_web_view_manager.cc
-  their  100644 27fb2cf3fc3956ae5366a2e86ed50fbda3f94072 atom/browser/api/atom_api_web_view_manager.cc
-@@ -10,7 +10,10 @@
- #include "atom/common/options_switches.h"
- #include "content/public/browser/browser_context.h"
- #include "native_mate/dictionary.h"
-+<<<<<<< .our
- 
-+=======
-+>>>>>>> .their
- // Must be the last in the includes list.
- // See https://github.com/electron/electron/issues/10363
- #include "atom/common/node_includes.h"
-added in both
-  our    100644 7bcb7ab9370a8b3fe245c9569c93dbbdac0a0697 atom/browser/api/frame_subscriber.cc
-  their  100644 4b1234d5677e15b9c77d1e8a80e2be159b7d75e7 atom/browser/api/frame_subscriber.cc
-@@ -83,7 +83,11 @@
-                                        : frame;
- 
-   size_t rgb_row_size = bitmap.width() * bitmap.bytesPerPixel();
-+<<<<<<< .our
-   auto* source = static_cast<const char*>(bitmap.getPixels());
-+=======
-+  auto source = static_cast<const char*>(bitmap.getPixels());
-+>>>>>>> .their
- 
-   v8::MaybeLocal<v8::Object> buffer =
-       node::Buffer::Copy(isolate_, source, rgb_row_size * bitmap.height());
-added in both
-  our    100644 d3e82855417cb59c0449f1c1b685970ffaea2af6 atom/browser/api/frame_subscriber.h
-  their  100644 3de976f3051139f7ebd3a63da7455faf9d69ef76 atom/browser/api/frame_subscriber.h
-@@ -29,7 +29,11 @@
-                   content::WebContents* web_contents,
-                   const FrameCaptureCallback& callback,
-                   bool only_dirty);
-+<<<<<<< .our
-   ~FrameSubscriber() override;
-+=======
-+  ~FrameSubscriber();
-+>>>>>>> .their
- 
-  private:
-   gfx::Rect GetDamageRect();
-added in both
-  our    100644 57c4ee582405e6d501ec23940ccb10689ecd64a1 atom/browser/atom_browser_client.cc
-  their  100644 9475e5f79fa614f3dab4f488b6d14ef10fc2da97 atom/browser/atom_browser_client.cc
-@@ -17,6 +17,10 @@
- #include "atom/browser/atom_resource_dispatcher_host_delegate.h"
- #include "atom/browser/atom_speech_recognition_manager_delegate.h"
- #include "atom/browser/child_web_contents_tracker.h"
-+<<<<<<< .our
-+=======
-+#include "atom/browser/login_handler.h"
-+>>>>>>> .their
- #include "atom/browser/native_window.h"
- #include "atom/browser/session_preferences.h"
- #include "atom/browser/web_contents_permission_helper.h"
-@@ -31,6 +35,10 @@
- #include "base/strings/string_number_conversions.h"
- #include "base/strings/string_util.h"
- #include "chrome/browser/printing/printing_message_filter.h"
-+<<<<<<< .our
-+=======
-+#include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h"
-+>>>>>>> .their
- #include "chrome/browser/speech/tts_message_filter.h"
- #include "content/public/browser/browser_ppapi_host.h"
- #include "content/public/browser/client_certificate_delegate.h"
-@@ -60,10 +68,13 @@
- #include "net/ssl/client_cert_store.h"
- #endif
- 
-+<<<<<<< .our
- #if defined(ENABLE_PEPPER_FLASH)
- #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h"
- #endif  // defined(ENABLE_PEPPER_FLASH)
- 
-+=======
-+>>>>>>> .their
- using content::BrowserThread;
- 
- namespace atom {
-@@ -251,11 +262,19 @@
-     return;
- 
-   // Do we have an affinity site to manage ?
-+<<<<<<< .our
-   auto* web_contents = content::WebContents::FromRenderFrameHost(rfh);
-   auto* web_preferences = WebContentsPreferences::From(web_contents);
-   std::string affinity;
-   if (web_preferences &&
-       web_preferences->GetPreference("affinity", &affinity) &&
-+=======
-+  std::string affinity;
-+  auto* web_contents = content::WebContents::FromRenderFrameHost(rfh);
-+  auto* web_preferences = WebContentsPreferences::From(web_contents);
-+  if (web_preferences &&
-+      web_preferences->dict()->GetString("affinity", &affinity) &&
-+>>>>>>> .their
-       !affinity.empty()) {
-     affinity = base::ToLowerASCII(affinity);
-     auto iter = site_per_affinities.find(affinity);
-@@ -343,14 +362,26 @@
-       web_preferences->AppendCommandLineSwitches(command_line);
-     SessionPreferences::AppendExtraCommandLineSwitches(
-         web_contents->GetBrowserContext(), command_line);
-+<<<<<<< .our
-+=======
-+
-+    auto context_id = atom::api::WebContents::GetIDForContents(web_contents);
-+    command_line->AppendSwitchASCII(switches::kContextId,
-+                                    base::IntToString(context_id));
-+>>>>>>> .their
-   }
- }
- 
- void AtomBrowserClient::DidCreatePpapiPlugin(content::BrowserPpapiHost* host) {
-+<<<<<<< .our
- #if defined(ENABLE_PEPPER_FLASH)
-   host->GetPpapiHost()->AddHostFactoryFilter(
-       base::WrapUnique(new ChromeBrowserPepperHostFactory(host)));
- #endif
-+=======
-+  host->GetPpapiHost()->AddHostFactoryFilter(
-+      base::WrapUnique(new chrome::ChromeBrowserPepperHostFactory(host)));
-+>>>>>>> .their
- }
- 
- void AtomBrowserClient::GetGeolocationRequestContext(
-@@ -495,6 +526,22 @@
- #endif
- }
- 
-+<<<<<<< .our
-+=======
-+content::ResourceDispatcherHostLoginDelegate*
-+AtomBrowserClient::CreateLoginDelegate(
-+    net::AuthChallengeInfo* auth_info,
-+    content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
-+    bool is_main_frame,
-+    const GURL& url,
-+    bool first_auth_attempt,
-+    const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-+        auth_required_callback) {
-+  return new LoginHandler(auth_info, web_contents_getter, url,
-+                          auth_required_callback);
-+}
-+
-+>>>>>>> .their
- brightray::BrowserMainParts* AtomBrowserClient::OverrideCreateBrowserMainParts(
-     const content::MainFunctionParams&) {
-   v8::V8::Initialize();  // Init V8 before creating main parts.
-added in both
-  our    100644 a0284cf3f72e9cd4292b636948f92bb09b97f0ae atom/browser/atom_browser_client.h
-  their  100644 51cd6ebc6f01b916af0889b7308909a416b92bf0 atom/browser/atom_browser_client.h
-@@ -106,6 +106,17 @@
-   void SiteInstanceDeleting(content::SiteInstance* site_instance) override;
-   std::unique_ptr<net::ClientCertStore> CreateClientCertStore(
-       content::ResourceContext* resource_context) override;
-+<<<<<<< .our
-+=======
-+  content::ResourceDispatcherHostLoginDelegate* CreateLoginDelegate(
-+      net::AuthChallengeInfo* auth_info,
-+      content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
-+      bool is_main_frame,
-+      const GURL& url,
-+      bool first_auth_attempt,
-+      const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-+          auth_required_callback) override;
-+>>>>>>> .their
- 
-   // brightray::BrowserClient:
-   brightray::BrowserMainParts* OverrideCreateBrowserMainParts(
-added in both
-  our    100644 e036cbc8103f19a034ce386940462f8a23ea6807 atom/browser/atom_browser_context.cc
-  their  100644 e3dbfedc0c2d70762301b86f3138cc325131e7f5 atom/browser/atom_browser_context.cc
-@@ -4,31 +4,79 @@
- 
- #include "atom/browser/atom_browser_context.h"
- 
-+<<<<<<< .our
-+=======
-+#include "atom/browser/api/atom_api_protocol.h"
-+>>>>>>> .their
- #include "atom/browser/atom_blob_reader.h"
- #include "atom/browser/atom_browser_main_parts.h"
- #include "atom/browser/atom_download_manager_delegate.h"
- #include "atom/browser/atom_permission_manager.h"
- #include "atom/browser/browser.h"
-+<<<<<<< .our
- #include "atom/browser/request_context_delegate.h"
- #include "atom/browser/special_storage_policy.h"
-+=======
-+#include "atom/browser/net/about_protocol_handler.h"
-+#include "atom/browser/net/asar/asar_protocol_handler.h"
-+#include "atom/browser/net/atom_cert_verifier.h"
-+#include "atom/browser/net/atom_network_delegate.h"
-+#include "atom/browser/net/atom_url_request_job_factory.h"
-+#include "atom/browser/net/cookie_details.h"
-+#include "atom/browser/net/http_protocol_handler.h"
-+>>>>>>> .their
- #include "atom/browser/web_view_manager.h"
- #include "atom/common/atom_version.h"
- #include "atom/common/chrome_version.h"
- #include "atom/common/options_switches.h"
- #include "base/command_line.h"
- #include "base/files/file_path.h"
-+<<<<<<< .our
- #include "base/path_service.h"
- #include "base/strings/stringprintf.h"
-+=======
-+#include "base/memory/ptr_util.h"
-+#include "base/path_service.h"
-+#include "base/strings/string_util.h"
-+#include "base/strings/stringprintf.h"
-+#include "base/task_scheduler/post_task.h"
-+>>>>>>> .their
- #include "chrome/common/chrome_paths.h"
- #include "chrome/common/pref_names.h"
- #include "components/prefs/pref_registry_simple.h"
- #include "content/browser/blob_storage/chrome_blob_storage_context.h"
-+<<<<<<< .our
- #include "content/public/common/user_agent.h"
-+=======
-+#include "content/public/browser/browser_thread.h"
-+#include "content/public/browser/storage_partition.h"
-+#include "content/public/common/url_constants.h"
-+#include "content/public/common/user_agent.h"
-+#include "net/ftp/ftp_network_layer.h"
-+#include "net/url_request/data_protocol_handler.h"
-+#include "net/url_request/ftp_protocol_handler.h"
-+#include "net/url_request/url_request_context.h"
-+#include "net/url_request/url_request_intercepting_job_factory.h"
-+#include "url/url_constants.h"
-+
-+using content::BrowserThread;
-+>>>>>>> .their
- 
- namespace atom {
- 
- namespace {
- 
-+<<<<<<< .our
-+=======
-+class NoCacheBackend : public net::HttpCache::BackendFactory {
-+  int CreateBackend(net::NetLog* net_log,
-+                    std::unique_ptr<disk_cache::Backend>* backend,
-+                    const net::CompletionCallback& callback) override {
-+    return net::ERR_FAILED;
-+  }
-+};
-+
-+>>>>>>> .their
- std::string RemoveWhitespace(const std::string& str) {
-   std::string trimmed;
-   if (base::RemoveChars(str, " ", &trimmed))
-@@ -42,9 +90,13 @@
- AtomBrowserContext::AtomBrowserContext(const std::string& partition,
-                                        bool in_memory,
-                                        const base::DictionaryValue& options)
-+<<<<<<< .our
-     : brightray::BrowserContext(partition, in_memory),
-       url_request_context_getter_(nullptr),
-       storage_policy_(new SpecialStoragePolicy) {
-+=======
-+    : brightray::BrowserContext(partition, in_memory) {
-+>>>>>>> .their
-   // Construct user agent string.
-   Browser* browser = Browser::Get();
-   std::string name = RemoveWhitespace(browser->GetName());
-@@ -60,24 +112,104 @@
-   user_agent_ = content::BuildUserAgentFromProduct(user_agent);
- 
-   // Read options.
-+<<<<<<< .our
-   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-   bool use_cache = !command_line->HasSwitch(switches::kDisableHttpCache);
-   options.GetBoolean("cache", &use_cache);
- 
-   request_context_delegate_.reset(new RequestContextDelegate(use_cache));
-+=======
-+  use_cache_ = true;
-+  options.GetBoolean("cache", &use_cache_);
-+>>>>>>> .their
- 
-   // Initialize Pref Registry in brightray.
-   InitPrefs();
- }
- 
-+<<<<<<< .our
- AtomBrowserContext::~AtomBrowserContext() {
-   url_request_context_getter_->set_delegate(nullptr);
- }
-+=======
-+AtomBrowserContext::~AtomBrowserContext() {}
-+>>>>>>> .their
- 
- void AtomBrowserContext::SetUserAgent(const std::string& user_agent) {
-   user_agent_ = user_agent;
- }
- 
-+<<<<<<< .our
-+=======
-+std::unique_ptr<base::CallbackList<void(const CookieDetails*)>::Subscription>
-+AtomBrowserContext::RegisterCookieChangeCallback(
-+    const base::Callback<void(const CookieDetails*)>& cb) {
-+  return cookie_change_sub_list_.Add(cb);
-+}
-+
-+std::unique_ptr<net::NetworkDelegate>
-+AtomBrowserContext::CreateNetworkDelegate() {
-+  return std::make_unique<AtomNetworkDelegate>();
-+}
-+
-+std::string AtomBrowserContext::GetUserAgent() {
-+  return user_agent_;
-+}
-+
-+std::unique_ptr<net::URLRequestJobFactory>
-+AtomBrowserContext::CreateURLRequestJobFactory(
-+    content::ProtocolHandlerMap* protocol_handlers) {
-+  std::unique_ptr<AtomURLRequestJobFactory> job_factory(
-+      new AtomURLRequestJobFactory);
-+
-+  for (auto& it : *protocol_handlers) {
-+    job_factory->SetProtocolHandler(it.first,
-+                                    base::WrapUnique(it.second.release()));
-+  }
-+  protocol_handlers->clear();
-+
-+  job_factory->SetProtocolHandler(url::kAboutScheme,
-+                                  base::WrapUnique(new AboutProtocolHandler));
-+  job_factory->SetProtocolHandler(
-+      url::kDataScheme, base::WrapUnique(new net::DataProtocolHandler));
-+  job_factory->SetProtocolHandler(
-+      url::kFileScheme,
-+      base::WrapUnique(
-+          new asar::AsarProtocolHandler(base::CreateTaskRunnerWithTraits(
-+              {base::MayBlock(), base::TaskPriority::USER_VISIBLE,
-+               base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN}))));
-+  job_factory->SetProtocolHandler(
-+      url::kHttpScheme,
-+      base::WrapUnique(new HttpProtocolHandler(url::kHttpScheme)));
-+  job_factory->SetProtocolHandler(
-+      url::kHttpsScheme,
-+      base::WrapUnique(new HttpProtocolHandler(url::kHttpsScheme)));
-+  job_factory->SetProtocolHandler(
-+      url::kWsScheme,
-+      base::WrapUnique(new HttpProtocolHandler(url::kWsScheme)));
-+  job_factory->SetProtocolHandler(
-+      url::kWssScheme,
-+      base::WrapUnique(new HttpProtocolHandler(url::kWssScheme)));
-+
-+  auto* host_resolver =
-+      url_request_context_getter()->GetURLRequestContext()->host_resolver();
-+  job_factory->SetProtocolHandler(
-+      url::kFtpScheme, net::FtpProtocolHandler::Create(host_resolver));
-+
-+  return std::move(job_factory);
-+}
-+
-+net::HttpCache::BackendFactory*
-+AtomBrowserContext::CreateHttpCacheBackendFactory(
-+    const base::FilePath& base_path) {
-+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-+  if (!use_cache_ || command_line->HasSwitch(switches::kDisableHttpCache))
-+    return new NoCacheBackend;
-+  else
-+    return brightray::BrowserContext::CreateHttpCacheBackendFactory(base_path);
-+}
-+
-+>>>>>>> .their
- content::DownloadManagerDelegate*
- AtomBrowserContext::GetDownloadManagerDelegate() {
-   if (!download_manager_delegate_.get()) {
-@@ -100,8 +232,29 @@
-   return permission_manager_.get();
- }
- 
-+<<<<<<< .our
- storage::SpecialStoragePolicy* AtomBrowserContext::GetSpecialStoragePolicy() {
-   return storage_policy_.get();
-+=======
-+std::unique_ptr<net::CertVerifier> AtomBrowserContext::CreateCertVerifier(
-+    brightray::RequireCTDelegate* ct_delegate) {
-+  return base::WrapUnique(new AtomCertVerifier(ct_delegate));
-+}
-+
-+std::vector<std::string> AtomBrowserContext::GetCookieableSchemes() {
-+  auto default_schemes = brightray::BrowserContext::GetCookieableSchemes();
-+  const auto& standard_schemes = atom::api::GetStandardSchemes();
-+  default_schemes.insert(default_schemes.end(), standard_schemes.begin(),
-+                         standard_schemes.end());
-+  return default_schemes;
-+}
-+
-+void AtomBrowserContext::NotifyCookieChange(const net::CanonicalCookie& cookie,
-+                                            bool removed,
-+                                            net::CookieChangeCause cause) {
-+  CookieDetails cookie_details(&cookie, removed, cause);
-+  cookie_change_sub_list_.Notify(&cookie_details);
-+>>>>>>> .their
- }
- 
- void AtomBrowserContext::RegisterPrefs(PrefRegistrySimple* pref_registry) {
-@@ -114,6 +267,7 @@
-   pref_registry->RegisterDictionaryPref(prefs::kDevToolsFileSystemPaths);
- }
- 
-+<<<<<<< .our
- std::string AtomBrowserContext::GetUserAgent() const {
-   return user_agent_;
- }
-@@ -124,6 +278,8 @@
-   url_request_context_getter_ = getter;
- }
- 
-+=======
-+>>>>>>> .their
- AtomBlobReader* AtomBrowserContext::GetBlobReader() {
-   if (!blob_reader_.get()) {
-     content::ChromeBlobStorageContext* blob_context =
-added in both
-  our    100644 9e6a841ceb8d11069a1a094bf7dbbd3a788918b3 atom/browser/atom_browser_context.h
-  their  100644 b60a4e682b0a77acf31def4ea2ef0b7dae187b99 atom/browser/atom_browser_context.h
-@@ -8,6 +8,7 @@
- #include <string>
- #include <vector>
- 
-+<<<<<<< .our
- #include "base/memory/scoped_refptr.h"
- #include "brightray/browser/browser_context.h"
- 
-@@ -15,14 +16,26 @@
- class SpecialStoragePolicy;
- }
- 
-+=======
-+#include "base/callback_list.h"
-+#include "brightray/browser/browser_context.h"
-+
-+>>>>>>> .their
- namespace atom {
- 
- class AtomBlobReader;
- class AtomDownloadManagerDelegate;
-+<<<<<<< .our
- class AtomPermissionManager;
- class RequestContextDelegate;
- class SpecialStoragePolicy;
- class WebViewManager;
-+=======
-+class AtomNetworkDelegate;
-+class AtomPermissionManager;
-+class WebViewManager;
-+struct CookieDetails;
-+>>>>>>> .their
- 
- class AtomBrowserContext : public brightray::BrowserContext {
-  public:
-@@ -35,12 +48,34 @@
-       const base::DictionaryValue& options = base::DictionaryValue());
- 
-   void SetUserAgent(const std::string& user_agent);
-+<<<<<<< .our
-   AtomBlobReader* GetBlobReader();
-+=======
-+  // Register callbacks that needs to notified on any cookie store changes.
-+  std::unique_ptr<base::CallbackList<void(const CookieDetails*)>::Subscription>
-+  RegisterCookieChangeCallback(
-+      const base::Callback<void(const CookieDetails*)>& cb);
-+
-+  // brightray::URLRequestContextGetter::Delegate:
-+  std::unique_ptr<net::NetworkDelegate> CreateNetworkDelegate() override;
-+  std::string GetUserAgent() override;
-+  std::unique_ptr<net::URLRequestJobFactory> CreateURLRequestJobFactory(
-+      content::ProtocolHandlerMap* protocol_handlers) override;
-+  net::HttpCache::BackendFactory* CreateHttpCacheBackendFactory(
-+      const base::FilePath& base_path) override;
-+  std::unique_ptr<net::CertVerifier> CreateCertVerifier(
-+      brightray::RequireCTDelegate* ct_delegate) override;
-+  std::vector<std::string> GetCookieableSchemes() override;
-+  void NotifyCookieChange(const net::CanonicalCookie& cookie,
-+                          bool removed,
-+                          net::CookieChangeCause cause) override;
-+>>>>>>> .their
- 
-   // content::BrowserContext:
-   content::DownloadManagerDelegate* GetDownloadManagerDelegate() override;
-   content::BrowserPluginGuestManager* GetGuestManager() override;
-   content::PermissionManager* GetPermissionManager() override;
-+<<<<<<< .our
-   storage::SpecialStoragePolicy* GetSpecialStoragePolicy() override;
- 
-   // brightray::BrowserContext:
-@@ -51,6 +86,19 @@
- 
-   RequestContextDelegate* GetRequestContextDelegate() const {
-     return request_context_delegate_.get();
-+=======
-+
-+  // brightray::BrowserContext:
-+  void RegisterPrefs(PrefRegistrySimple* pref_registry) override;
-+
-+  AtomBlobReader* GetBlobReader();
-+
-+  void set_cookie_change_subscription(
-+      std::unique_ptr<
-+          base::CallbackList<void(const CookieDetails*)>::Subscription>
-+          subscription) {
-+    cookie_change_subscription_.swap(subscription);
-+>>>>>>> .their
-   }
- 
-  protected:
-@@ -60,6 +108,7 @@
-   ~AtomBrowserContext() override;
- 
-  private:
-+<<<<<<< .our
-   brightray::URLRequestContextGetter* url_request_context_getter_;
- 
-   std::unique_ptr<AtomDownloadManagerDelegate> download_manager_delegate_;
-@@ -69,6 +118,18 @@
-   std::unique_ptr<AtomBlobReader> blob_reader_;
-   std::unique_ptr<RequestContextDelegate> request_context_delegate_;
-   std::string user_agent_;
-+=======
-+  std::unique_ptr<AtomDownloadManagerDelegate> download_manager_delegate_;
-+  std::unique_ptr<WebViewManager> guest_manager_;
-+  std::unique_ptr<AtomPermissionManager> permission_manager_;
-+  std::unique_ptr<AtomBlobReader> blob_reader_;
-+  std::string user_agent_;
-+  bool use_cache_;
-+
-+  base::CallbackList<void(const CookieDetails*)> cookie_change_sub_list_;
-+  std::unique_ptr<base::CallbackList<void(const CookieDetails*)>::Subscription>
-+      cookie_change_subscription_;
-+>>>>>>> .their
- 
-   DISALLOW_COPY_AND_ASSIGN(AtomBrowserContext);
- };
-added in both
-  our    100644 25fc326ebac3f2a5beb9199194067dae12c8229b atom/browser/atom_javascript_dialog_manager.cc
-  their  100644 c0c7be6302796cf774923757b466084816d897fe atom/browser/atom_javascript_dialog_manager.cc
-@@ -62,7 +62,11 @@
-   std::string checkbox;
-   if (origin_counts_[origin] > 1 && web_preferences &&
-       web_preferences->IsEnabled("safeDialogs") &&
-+<<<<<<< .our
-       !web_preferences->GetPreference("safeDialogsMessage", &checkbox)) {
-+=======
-+      !web_preferences->dict()->GetString("safeDialogsMessage", &checkbox)) {
-+>>>>>>> .their
-     checkbox = "Prevent this app from creating additional dialogs";
-   }
- 
-added in both
-  our    100644 ce35de64d60c6767ac52596c1b32e7bde5ceefa0 atom/browser/browser.cc
-  their  100644 2897b1157257b1646a0a52776d64afa90fc845a0 atom/browser/browser.cc
-@@ -8,7 +8,10 @@
- 
- #include "atom/browser/atom_browser_main_parts.h"
- #include "atom/browser/browser_observer.h"
-+<<<<<<< .our
- #include "atom/browser/login_handler.h"
-+=======
-+>>>>>>> .their
- #include "atom/browser/native_window.h"
- #include "atom/browser/window_list.h"
- #include "base/files/file_util.h"
-@@ -155,13 +158,17 @@
-     base::CreateDirectoryAndGetError(user_data, nullptr);
- 
-   is_ready_ = true;
-+<<<<<<< .our
-   if (ready_promise_) {
-     ready_promise_->Resolve();
-   }
-+=======
-+>>>>>>> .their
-   for (BrowserObserver& observer : observers_)
-     observer.OnFinishLaunching(launch_info);
- }
- 
-+<<<<<<< .our
- util::Promise* Browser::WhenReady(v8::Isolate* isolate) {
-   if (!ready_promise_) {
-     ready_promise_ = new util::Promise(isolate);
-@@ -172,13 +179,19 @@
-   return ready_promise_;
- }
- 
-+=======
-+>>>>>>> .their
- void Browser::OnAccessibilitySupportChanged() {
-   for (BrowserObserver& observer : observers_)
-     observer.OnAccessibilitySupportChanged();
- }
- 
- void Browser::RequestLogin(
-+<<<<<<< .our
-     scoped_refptr<LoginHandler> login_handler,
-+=======
-+    LoginHandler* login_handler,
-+>>>>>>> .their
-     std::unique_ptr<base::DictionaryValue> request_details) {
-   for (BrowserObserver& observer : observers_)
-     observer.OnLogin(login_handler, *(request_details.get()));
-added in both
-  our    100644 aed7d25c37da59c0dd5e09940a064c329353a0b2 atom/browser/browser.h
-  their  100644 39cc0f9812ac766ff70f3eabb62882c04a2bfd4f atom/browser/browser.h
-@@ -10,7 +10,10 @@
- 
- #include "atom/browser/browser_observer.h"
- #include "atom/browser/window_list_observer.h"
-+<<<<<<< .our
- #include "atom/common/promise_util.h"
-+=======
-+>>>>>>> .their
- #include "base/compiler_specific.h"
- #include "base/macros.h"
- #include "base/observer_list.h"
-@@ -34,6 +37,10 @@
- namespace atom {
- 
- class AtomMenuModel;
-+<<<<<<< .our
-+=======
-+class LoginHandler;
-+>>>>>>> .their
- 
- // This class is used for control application-wide operations.
- class Browser : public WindowListObserver {
-@@ -191,10 +198,13 @@
-     base::string16 description;
-     base::FilePath icon_path;
-     int icon_index;
-+<<<<<<< .our
- 
-     UserTask();
-     UserTask(const UserTask&);
-     ~UserTask();
-+=======
-+>>>>>>> .their
-   };
- 
-   // Add a custom task to jump list.
-@@ -233,7 +243,11 @@
-   void OnAccessibilitySupportChanged();
- 
-   // Request basic auth login.
-+<<<<<<< .our
-   void RequestLogin(scoped_refptr<LoginHandler> login_handler,
-+=======
-+  void RequestLogin(LoginHandler* login_handler,
-+>>>>>>> .their
-                     std::unique_ptr<base::DictionaryValue> request_details);
- 
-   void PreMainMessageLoopRun();
-@@ -245,7 +259,10 @@
-   bool is_shutting_down() const { return is_shutdown_; }
-   bool is_quiting() const { return is_quiting_; }
-   bool is_ready() const { return is_ready_; }
-+<<<<<<< .our
-   util::Promise* WhenReady(v8::Isolate* isolate);
-+=======
-+>>>>>>> .their
- 
-  protected:
-   // Returns the version of application bundle or executable file.
-@@ -281,8 +298,11 @@
- 
-   int badge_count_ = 0;
- 
-+<<<<<<< .our
-   util::Promise* ready_promise_ = nullptr;
- 
-+=======
-+>>>>>>> .their
- #if defined(OS_MACOSX)
-   base::DictionaryValue about_panel_options_;
- #endif
-added in both
-  our    100644 27e347eccebf006336d5d110c81717ecc45af9c3 atom/browser/browser_mac.mm
-  their  100644 19b27416a16dfedbe960ee42d6e6a98ca197a6cb atom/browser/browser_mac.mm
-@@ -336,9 +336,16 @@
-   for (base::DictionaryValue::Iterator iter(options); !iter.IsAtEnd();
-        iter.Advance()) {
-     std::string key = iter.key();
-+<<<<<<< .our
-     if (!key.empty() && iter.value().is_string()) {
-       key[0] = base::ToUpperASCII(key[0]);
-       about_panel_options_.SetString(key, iter.value().GetString());
-+=======
-+    std::string value;
-+    if (!key.empty() && iter.value().GetAsString(&value)) {
-+      key[0] = base::ToUpperASCII(key[0]);
-+      about_panel_options_.SetString(key, value);
-+>>>>>>> .their
-     }
-   }
- }
-added in both
-  our    100644 d518e8d6a7c6e8e30c09498883719a58c8a9f5e8 atom/browser/browser_observer.h
-  their  100644 fb47492aef564c347b0d574678e3ddbdff46c17e atom/browser/browser_observer.h
-@@ -7,8 +7,11 @@
- 
- #include <string>
- 
-+<<<<<<< .our
- #include "atom/browser/login_handler.h"
- #include "base/memory/scoped_refptr.h"
-+=======
-+>>>>>>> .their
- #include "build/build_config.h"
- 
- namespace base {
-@@ -17,6 +20,11 @@
- 
- namespace atom {
- 
-+<<<<<<< .our
-+=======
-+class LoginHandler;
-+
-+>>>>>>> .their
- class BrowserObserver {
-  public:
-   // The browser is about to close all windows.
-@@ -49,7 +57,11 @@
-   virtual void OnFinishLaunching(const base::DictionaryValue& launch_info) {}
- 
-   // The browser requests HTTP login.
-+<<<<<<< .our
-   virtual void OnLogin(scoped_refptr<LoginHandler> login_handler,
-+=======
-+  virtual void OnLogin(LoginHandler* login_handler,
-+>>>>>>> .their
-                        const base::DictionaryValue& request_details) {}
- 
-   // The browser's accessibility suppport has changed.
-added in both
-  our    100644 fc3b9f330a4958b0b1e30d41c2bebe091b135856 atom/browser/browser_win.cc
-  their  100644 d109129afbb40471006560d895d94aa7e9a0e288 atom/browser/browser_win.cc
-@@ -84,10 +84,13 @@
- 
- }  // namespace
- 
-+<<<<<<< .our
- Browser::UserTask::UserTask() = default;
- Browser::UserTask::UserTask(const UserTask&) = default;
- Browser::UserTask::~UserTask() = default;
- 
-+=======
-+>>>>>>> .their
- void Browser::Focus() {
-   // On Windows we just focus on the first window found for this process.
-   DWORD pid = GetCurrentProcessId();
-added in both
-  our    100644 b3b1195e044cd2c74b246aa13e9e85953d694477 atom/browser/common_web_contents_delegate.cc
-  their  100644 d5ab67eef25b489e46569076d5bd63ab92a6d325 atom/browser/common_web_contents_delegate.cc
-@@ -152,8 +152,12 @@
- 
- void CommonWebContentsDelegate::InitWithWebContents(
-     content::WebContents* web_contents,
-+<<<<<<< .our
-     AtomBrowserContext* browser_context,
-     bool is_guest) {
-+=======
-+    AtomBrowserContext* browser_context) {
-+>>>>>>> .their
-   browser_context_ = browser_context;
-   web_contents->SetDelegate(this);
- 
-@@ -166,8 +170,12 @@
-       !web_preferences || web_preferences->IsEnabled(options::kOffscreen);
- 
-   // Create InspectableWebContents.
-+<<<<<<< .our
-   web_contents_.reset(
-       brightray::InspectableWebContents::Create(web_contents, is_guest));
-+=======
-+  web_contents_.reset(brightray::InspectableWebContents::Create(web_contents));
-+>>>>>>> .their
-   web_contents_->SetDelegate(this);
- }
- 
-added in both
-  our    100644 5da5d20975b8e795e34c9d8c7649f6f0eb3d0a50 atom/browser/common_web_contents_delegate.h
-  their  100644 962f573dde88188d1964cb2d3aed084b2fdfc86f atom/browser/common_web_contents_delegate.h
-@@ -42,8 +42,12 @@
-   // Creates a InspectableWebContents object and takes onwership of
-   // |web_contents|.
-   void InitWithWebContents(content::WebContents* web_contents,
-+<<<<<<< .our
-                            AtomBrowserContext* browser_context,
-                            bool is_guest);
-+=======
-+                           AtomBrowserContext* browser_context);
-+>>>>>>> .their
- 
-   // Set the window as owner window.
-   void SetOwnerWindow(NativeWindow* owner_window);
-added in both
-  our    100644 2063c6197fce449d1692f1b067c17e043b1d37e4 atom/browser/login_handler.cc
-  their  100644 0bba530d6086001a6d4d049c6355487c6e5bf613 atom/browser/login_handler.cc
-@@ -5,7 +5,10 @@
- #include "atom/browser/login_handler.h"
- 
- #include "atom/browser/browser.h"
-+<<<<<<< .our
- #include "atom/common/native_mate_converters/net_converter.h"
-+=======
-+>>>>>>> .their
- #include "base/values.h"
- #include "content/public/browser/browser_thread.h"
- #include "content/public/browser/web_contents.h"
-@@ -16,6 +19,7 @@
- namespace atom {
- 
- LoginHandler::LoginHandler(
-+<<<<<<< .our
-     net::URLRequest* request,
-     const net::AuthChallengeInfo& auth_info,
-     const net::NetworkDelegate::AuthCallback& callback,
-@@ -33,15 +37,37 @@
- 
-   web_contents_getter_ =
-       resource_request_info->GetWebContentsGetterForRequest();
-+=======
-+    net::AuthChallengeInfo* auth_info,
-+    content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
-+    const GURL& url,
-+    const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-+        auth_required_callback)
-+    : auth_info_(auth_info),
-+      web_contents_getter_(web_contents_getter),
-+      auth_required_callback_(auth_required_callback) {
-+  // Fill request details on IO thread.
-+  // TODO(deepak1556): Fill in method and referrer details to
-+  // avoid breaking the app login event.
-+  std::unique_ptr<base::DictionaryValue> request_details(
-+      new base::DictionaryValue);
-+  request_details->SetKey("url", base::Value(url.spec()));
-+>>>>>>> .their
- 
-   BrowserThread::PostTask(
-       BrowserThread::UI, FROM_HERE,
-       base::BindOnce(&Browser::RequestLogin, base::Unretained(Browser::Get()),
-+<<<<<<< .our
-                      base::RetainedRef(this), std::move(request_details)));
-+=======
-+                     base::RetainedRef(WrapRefCounted(this)),
-+                     std::move(request_details)));
-+>>>>>>> .their
- }
- 
- LoginHandler::~LoginHandler() {}
- 
-+<<<<<<< .our
- void LoginHandler::Login(const base::string16& username,
-                          const base::string16& password) {
-   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-@@ -50,10 +76,26 @@
-       BrowserThread::IO, FROM_HERE,
-       base::BindOnce(&LoginHandler::DoLogin, weak_factory_.GetWeakPtr(),
-                      username, password));
-+=======
-+content::WebContents* LoginHandler::GetWebContents() const {
-+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-+  return web_contents_getter_.Run();
-+}
-+
-+void LoginHandler::Login(const base::string16& username,
-+                         const base::string16& password) {
-+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-+  if (TestAndSetAuthHandled())
-+    return;
-+  BrowserThread::PostTask(
-+      BrowserThread::IO, FROM_HERE,
-+      base::BindOnce(&LoginHandler::DoLogin, this, username, password));
-+>>>>>>> .their
- }
- 
- void LoginHandler::CancelAuth() {
-   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-+<<<<<<< .our
- 
-   BrowserThread::PostTask(
-       BrowserThread::IO, FROM_HERE,
-@@ -69,22 +111,52 @@
- content::WebContents* LoginHandler::GetWebContents() const {
-   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-   return web_contents_getter_.Run();
-+=======
-+  if (TestAndSetAuthHandled())
-+    return;
-+  BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
-+                          base::BindOnce(&LoginHandler::DoCancelAuth, this));
-+}
-+
-+void LoginHandler::OnRequestCancelled() {
-+  TestAndSetAuthHandled();
-+  auth_required_callback_.Reset();
-+}
-+
-+// Marks authentication as handled and returns the previous handled state.
-+bool LoginHandler::TestAndSetAuthHandled() {
-+  base::AutoLock lock(handled_auth_lock_);
-+  bool was_handled = handled_auth_;
-+  handled_auth_ = true;
-+  return was_handled;
-+>>>>>>> .their
- }
- 
- void LoginHandler::DoCancelAuth() {
-   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-+<<<<<<< .our
-   if (!auth_callback_.is_null())
-     std::move(auth_callback_)
-         .Run(net::NetworkDelegate::AUTH_REQUIRED_RESPONSE_CANCEL_AUTH);
-+=======
-+  if (!auth_required_callback_.is_null())
-+    std::move(auth_required_callback_).Run(base::nullopt);
-+>>>>>>> .their
- }
- 
- void LoginHandler::DoLogin(const base::string16& username,
-                            const base::string16& password) {
-   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-+<<<<<<< .our
-   if (!auth_callback_.is_null()) {
-     credentials_->Set(username, password);
-     std::move(auth_callback_)
-         .Run(net::NetworkDelegate::AUTH_REQUIRED_RESPONSE_SET_AUTH);
-+=======
-+  if (!auth_required_callback_.is_null()) {
-+    std::move(auth_required_callback_)
-+        .Run(net::AuthCredentials(username, password));
-+>>>>>>> .their
-   }
- }
- 
-added in both
-  our    100644 e7f1c5be0094506e01d2cccc0073fa864dfefb56 atom/browser/login_handler.h
-  their  100644 80ff986e0be400c13388607abfe48fe51ac6d512 atom/browser/login_handler.h
-@@ -6,16 +6,25 @@
- #define ATOM_BROWSER_LOGIN_HANDLER_H_
- 
- #include "base/callback.h"
-+<<<<<<< .our
- #include "base/memory/ref_counted.h"
- #include "base/memory/weak_ptr.h"
- #include "base/strings/string16.h"
- #include "content/public/browser/resource_request_info.h"
- #include "net/base/network_delegate.h"
-+=======
-+#include "base/optional.h"
-+#include "base/strings/string16.h"
-+#include "base/synchronization/lock.h"
-+#include "content/public/browser/resource_dispatcher_host_login_delegate.h"
-+#include "content/public/browser/resource_request_info.h"
-+>>>>>>> .their
- 
- namespace content {
- class WebContents;
- }
- 
-+<<<<<<< .our
- namespace atom {
- 
- // Handles the HTTP basic auth, must be created on IO thread.
-@@ -26,10 +35,33 @@
-                const net::NetworkDelegate::AuthCallback& callback,
-                net::AuthCredentials* credentials,
-                const content::ResourceRequestInfo* resource_request_info);
-+=======
-+namespace net {
-+class AuthChallengeInfo;
-+class AuthCredentials;
-+}  // namespace net
-+
-+namespace atom {
-+
-+// Handles the HTTP basic auth, must be created on IO thread.
-+class LoginHandler : public content::ResourceDispatcherHostLoginDelegate {
-+ public:
-+  LoginHandler(
-+      net::AuthChallengeInfo* auth_info,
-+      content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
-+      const GURL& url,
-+      const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-+          auth_required_callback);
-+
-+  // Returns the WebContents associated with the request, must be called on UI
-+  // thread.
-+  content::WebContents* GetWebContents() const;
-+>>>>>>> .their
- 
-   // The auth is cancelled, must be called on UI thread.
-   void CancelAuth();
- 
-+<<<<<<< .our
-   // The URLRequest associated with the auth is destroyed.
-   void NotifyRequestDestroyed();
- 
-@@ -48,23 +80,55 @@
- 
-   ~LoginHandler();
- 
-+=======
-+  // Login with |username| and |password|, must be called on UI thread.
-+  void Login(const base::string16& username, const base::string16& password);
-+
-+  const net::AuthChallengeInfo* auth_info() const { return auth_info_.get(); }
-+
-+ protected:
-+  ~LoginHandler() override;
-+
-+  // content::ResourceDispatcherHostLoginDelegate:
-+  void OnRequestCancelled() override;
-+
-+ private:
-+>>>>>>> .their
-   // Must be called on IO thread.
-   void DoCancelAuth();
-   void DoLogin(const base::string16& username, const base::string16& password);
- 
-+<<<<<<< .our
-   // Credentials to be used for the auth.
-   net::AuthCredentials* credentials_;
- 
-   // Who/where/what asked for the authentication.
-   const net::AuthChallengeInfo& auth_info_;
-+=======
-+  // Marks authentication as handled and returns the previous handled
-+  // state.
-+  bool TestAndSetAuthHandled();
-+
-+  // True if we've handled auth (Login or CancelAuth has been called).
-+  bool handled_auth_ = false;
-+  mutable base::Lock handled_auth_lock_;
-+
-+  // Who/where/what asked for the authentication.
-+  scoped_refptr<net::AuthChallengeInfo> auth_info_;
-+>>>>>>> .their
- 
-   // WebContents associated with the login request.
-   content::ResourceRequestInfo::WebContentsGetter web_contents_getter_;
- 
-+<<<<<<< .our
-   // Called with preferred value of net::NetworkDelegate::AuthRequiredResponse.
-   net::NetworkDelegate::AuthCallback auth_callback_;
- 
-   base::WeakPtrFactory<LoginHandler> weak_factory_;
-+=======
-+  base::Callback<void(const base::Optional<net::AuthCredentials>&)>
-+      auth_required_callback_;
-+>>>>>>> .their
- 
-   DISALLOW_COPY_AND_ASSIGN(LoginHandler);
- };
-added in both
-  our    100644 4ff2bcfcabfd34d8563f9ed213c03655a99dd9c6 atom/browser/native_window.cc
-  their  100644 4048e2a32b251859efccb22d8fc03d8a6d22d672 atom/browser/native_window.cc
-@@ -355,10 +355,13 @@
-   return true;
- }
- 
-+<<<<<<< .our
- bool NativeWindow::SetWindowButtonVisibility(bool visible) {
-   return false;
- }
- 
-+=======
-+>>>>>>> .their
- double NativeWindow::GetAspectRatio() {
-   return aspect_ratio_;
- }
-@@ -458,12 +461,15 @@
-     observer.OnWindowRestore();
- }
- 
-+<<<<<<< .our
- void NativeWindow::NotifyWindowWillResize(const gfx::Rect& new_bounds,
-                                           bool* prevent_default) {
-   for (NativeWindowObserver& observer : observers_)
-     observer.OnWindowWillResize(new_bounds, prevent_default);
- }
- 
-+=======
-+>>>>>>> .their
- void NativeWindow::NotifyWindowResize() {
-   for (NativeWindowObserver& observer : observers_)
-     observer.OnWindowResize();
-added in both
-  our    100644 35b67e2dd230692c415a32aae5f0a5e99ab74ac0 atom/browser/native_window.h
-  their  100644 759d7cb202101710855c3fabada43c976c8543df atom/browser/native_window.h
-@@ -187,9 +187,12 @@
-   virtual void ToggleTabBar();
-   virtual bool AddTabbedWindow(NativeWindow* window);
- 
-+<<<<<<< .our
-   // Returns false if unsupported.
-   virtual bool SetWindowButtonVisibility(bool visible);
- 
-+=======
-+>>>>>>> .their
-   // Toggle the menu bar.
-   virtual void SetAutoHideMenuBar(bool auto_hide);
-   virtual bool IsMenuBarAutoHide();
-@@ -236,8 +239,11 @@
-   void NotifyWindowMinimize();
-   void NotifyWindowRestore();
-   void NotifyWindowMove();
-+<<<<<<< .our
-   void NotifyWindowWillResize(const gfx::Rect& new_bounds,
-                               bool* prevent_default);
-+=======
-+>>>>>>> .their
-   void NotifyWindowResize();
-   void NotifyWindowMoved();
-   void NotifyWindowScrollTouchBegin();
-added in both
-  our    100644 44a78198f44cdba9875e3fb27c8e2c87eaa6f33b atom/browser/native_window_mac.h
-  their  100644 54891c5b35af7a88c842e95b9b72a2f2be363681 atom/browser/native_window_mac.h
-@@ -119,8 +119,11 @@
-   void ToggleTabBar() override;
-   bool AddTabbedWindow(NativeWindow* window) override;
- 
-+<<<<<<< .our
-   bool SetWindowButtonVisibility(bool visible) override;
- 
-+=======
-+>>>>>>> .their
-   void SetVibrancy(const std::string& type) override;
-   void SetTouchBar(
-       const std::vector<mate::PersistentDictionary>& items) override;
-@@ -195,10 +198,13 @@
-   // The "titleBarStyle" option.
-   TitleBarStyle title_bar_style_ = NORMAL;
- 
-+<<<<<<< .our
-   // The visibility mode of window button controls when explicitly set through
-   // setWindowButtonVisibility().
-   base::Optional<bool> window_button_visibility_;
- 
-+=======
-+>>>>>>> .their
-   // Simple (pre-Lion) Fullscreen Settings
-   bool always_simple_fullscreen_ = false;
-   bool is_simple_fullscreen_ = false;
-added in both
-  our    100644 004263ec127709067e903ffbf31003b8844226b4 atom/browser/native_window_mac.mm
-  their  100644 2d8149668e5988c2f26c39678a57a9780ca150c6 atom/browser/native_window_mac.mm
-@@ -884,9 +884,14 @@
-       // Resize the window to accomodate the _entire_ screen size
-       fullscreenFrame.size.height -=
-           [[[NSApplication sharedApplication] mainMenu] menuBarHeight];
-+<<<<<<< .our
-     } else if (!window_button_visibility_.has_value()) {
-       // Lets keep previous behaviour - hide window controls in titled
-       // fullscreen mode when not specified otherwise.
-+=======
-+    } else {
-+      // No need to hide the title, but we should still hide the window buttons
-+>>>>>>> .their
-       [[window standardWindowButton:NSWindowZoomButton] setHidden:YES];
-       [[window standardWindowButton:NSWindowMiniaturizeButton] setHidden:YES];
-       [[window standardWindowButton:NSWindowCloseButton] setHidden:YES];
-@@ -905,6 +910,7 @@
-     if (!fullscreen_window_title()) {
-       // Restore the titlebar
-       SetStyleMask(true, NSTitledWindowMask);
-+<<<<<<< .our
-     }
- 
-     // Restore window controls visibility state
-@@ -916,6 +922,15 @@
-     [[window standardWindowButton:NSWindowCloseButton]
-         setHidden:window_button_hidden];
- 
-+=======
-+    } else {
-+      // Show the window buttons
-+      [[window standardWindowButton:NSWindowZoomButton] setHidden:NO];
-+      [[window standardWindowButton:NSWindowMiniaturizeButton] setHidden:NO];
-+      [[window standardWindowButton:NSWindowCloseButton] setHidden:NO];
-+    }
-+
-+>>>>>>> .their
-     [window setFrame:original_frame_ display:YES animate:YES];
- 
-     [NSApp setPresentationOptions:simple_fullscreen_options_];
-@@ -1153,6 +1168,7 @@
-   return true;
- }
- 
-+<<<<<<< .our
- bool NativeWindowMac::SetWindowButtonVisibility(bool visible) {
-   if (title_bar_style_ == CUSTOM_BUTTONS_ON_HOVER) {
-     return false;
-@@ -1166,6 +1182,8 @@
-   return true;
- }
- 
-+=======
-+>>>>>>> .their
- void NativeWindowMac::SetVibrancy(const std::string& type) {
-   if (@available(macOS 10.10, *)) {
-     NSView* vibrant_view = [window_ vibrantView];
-added in both
-  our    100644 c2a86ea6b65cd6091fa7e8018bed0b11c7390f23 atom/browser/native_window_observer.h
-  their  100644 33e9eb643254c9066bfafbae993d2f98c624a5f3 atom/browser/native_window_observer.h
-@@ -16,10 +16,13 @@
- #include <windows.h>
- #endif
- 
-+<<<<<<< .our
- namespace gfx {
- class Rect;
- }
- 
-+=======
-+>>>>>>> .their
- namespace atom {
- 
- class NativeWindowObserver {
-@@ -67,8 +70,11 @@
-   virtual void OnWindowUnmaximize() {}
-   virtual void OnWindowMinimize() {}
-   virtual void OnWindowRestore() {}
-+<<<<<<< .our
-   virtual void OnWindowWillResize(const gfx::Rect& new_bounds,
-                                   bool* prevent_default) {}
-+=======
-+>>>>>>> .their
-   virtual void OnWindowResize() {}
-   virtual void OnWindowMove() {}
-   virtual void OnWindowMoved() {}
-added in both
-  our    100644 0e61d18b915924eb3d3d14e40d1cbbd199631bed atom/browser/native_window_views_win.cc
-  their  100644 c9802b2e0a83680a2df01e18cd2674e4d114f2af atom/browser/native_window_views_win.cc
-@@ -164,7 +164,11 @@
- 
-       const DWORD obj_id = static_cast<DWORD>(l_param);
- 
-+<<<<<<< .our
-       if (obj_id != static_cast<DWORD>(OBJID_CLIENT)) {
-+=======
-+      if (obj_id != OBJID_CLIENT) {
-+>>>>>>> .their
-         return false;
-       }
- 
-@@ -174,7 +178,11 @@
- 
-       checked_for_a11y_support_ = true;
- 
-+<<<<<<< .our
-       auto* const axState = content::BrowserAccessibilityState::GetInstance();
-+=======
-+      const auto axState = content::BrowserAccessibilityState::GetInstance();
-+>>>>>>> .their
-       if (axState && !axState->IsAccessibleBrowser()) {
-         axState->OnScreenReaderDetected();
-         Browser::Get()->OnAccessibilitySupportChanged();
-@@ -187,6 +195,7 @@
-       if (HIWORD(w_param) == THBN_CLICKED)
-         return taskbar_host_.HandleThumbarButtonEvent(LOWORD(w_param));
-       return false;
-+<<<<<<< .our
-     case WM_SIZING: {
-       bool prevent_default = false;
-       NotifyWindowWillResize(gfx::Rect(*reinterpret_cast<RECT*>(l_param)),
-@@ -197,6 +206,8 @@
-       }
-       return false;
-     }
-+=======
-+>>>>>>> .their
-     case WM_SIZE: {
-       // Handle window state change.
-       HandleSizeEvent(w_param, l_param);
-@@ -208,8 +219,12 @@
-     }
-     case WM_MOVING: {
-       if (!movable_)
-+<<<<<<< .our
-         ::GetWindowRect(GetAcceleratedWidget(),
-                         reinterpret_cast<RECT*>(l_param));
-+=======
-+        ::GetWindowRect(GetAcceleratedWidget(), (LPRECT)l_param);
-+>>>>>>> .their
-       return false;
-     }
-     case WM_MOVE: {
-@@ -289,8 +304,11 @@
-               NotifyWindowRestore();
-             }
-             break;
-+<<<<<<< .our
-           default:
-             break;
-+=======
-+>>>>>>> .their
-         }
-       }
-       break;
-@@ -363,7 +381,11 @@
-   // the cursor since they are in a state where they would otherwise ignore all
-   // mouse input.
-   if (w_param == WM_MOUSEMOVE) {
-+<<<<<<< .our
-     for (auto* window : forwarding_windows_) {
-+=======
-+    for (auto window : forwarding_windows_) {
-+>>>>>>> .their
-       // At first I considered enumerating windows to check whether the cursor
-       // was directly above the window, but since nothing bad seems to happen
-       // if we post the message even if some other window occludes it I have
-added in both
-  our    100644 e71ea74317b69f31a5aac8e723902748972fed8f atom/browser/net/atom_network_delegate.cc
-  their  100644 2708de29712df615defbf95a109dc1b4a3c6400d atom/browser/net/atom_network_delegate.cc
-@@ -7,17 +7,24 @@
- #include <utility>
- 
- #include "atom/browser/api/atom_api_web_contents.h"
-+<<<<<<< .our
- #include "atom/browser/login_handler.h"
- #include "atom/common/native_mate_converters/net_converter.h"
- #include "atom/common/options_switches.h"
- #include "base/command_line.h"
-+=======
-+#include "atom/common/native_mate_converters/net_converter.h"
-+>>>>>>> .their
- #include "base/stl_util.h"
- #include "base/strings/string_util.h"
- #include "content/public/browser/browser_thread.h"
- #include "content/public/browser/render_frame_host.h"
-+<<<<<<< .our
- #include "content/public/browser/resource_request_info.h"
- #include "net/base/load_flags.h"
- #include "net/base/net_errors.h"
-+=======
-+>>>>>>> .their
- #include "net/url_request/url_request.h"
- #include "services/network/throttling/throttling_network_transaction.h"
- 
-@@ -128,7 +135,11 @@
-   std::string key;
-   std::string value;
-   while (headers->EnumerateHeaderLines(&iter, &key, &value)) {
-+<<<<<<< .our
-     if (dict->FindKey(key)) {
-+=======
-+    if (dict->HasKey(key)) {
-+>>>>>>> .their
-       base::ListValue* values = nullptr;
-       if (dict->GetList(key, &values))
-         values->AppendString(value);
-@@ -189,10 +200,16 @@
-     headers->Clear();
-     for (base::DictionaryValue::Iterator it(*dict); !it.IsAtEnd();
-          it.Advance()) {
-+<<<<<<< .our
-       if (it.value().is_string()) {
-         std::string value = it.value().GetString();
-         headers->SetHeader(it.key(), value);
-       }
-+=======
-+      std::string value;
-+      if (it.value().GetAsString(&value))
-+        headers->SetHeader(it.key(), value);
-+>>>>>>> .their
-     }
-   }
- }
-@@ -238,6 +255,7 @@
- AtomNetworkDelegate::ResponseListenerInfo::ResponseListenerInfo() = default;
- AtomNetworkDelegate::ResponseListenerInfo::~ResponseListenerInfo() = default;
- 
-+<<<<<<< .our
- AtomNetworkDelegate::AtomNetworkDelegate() {
-   auto* command_line = base::CommandLine::ForCurrentProcess();
-   if (command_line->HasSwitch(switches::kIgnoreConnectionsLimit)) {
-@@ -247,6 +265,9 @@
-         value, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
-   }
- }
-+=======
-+AtomNetworkDelegate::AtomNetworkDelegate() {}
-+>>>>>>> .their
- 
- AtomNetworkDelegate::~AtomNetworkDelegate() {}
- 
-@@ -277,6 +298,7 @@
-     net::URLRequest* request,
-     const net::CompletionCallback& callback,
-     GURL* new_url) {
-+<<<<<<< .our
-   if (!base::ContainsKey(response_listeners_, kOnBeforeRequest)) {
-     for (const auto& domain : ignore_connections_limit_domains_) {
-       if (request->url().DomainIs(domain)) {
-@@ -288,6 +310,11 @@
-     }
-     return net::OK;
-   }
-+=======
-+  if (!base::ContainsKey(response_listeners_, kOnBeforeRequest))
-+    return brightray::NetworkDelegate::OnBeforeURLRequest(request, callback,
-+                                                          new_url);
-+>>>>>>> .their
- 
-   return HandleResponseEvent(kOnBeforeRequest, request, callback, new_url);
- }
-@@ -301,7 +328,12 @@
-                            kDevToolsEmulateNetworkConditionsClientId,
-                        client_id_);
-   if (!base::ContainsKey(response_listeners_, kOnBeforeSendHeaders))
-+<<<<<<< .our
-     return net::OK;
-+=======
-+    return brightray::NetworkDelegate::OnBeforeStartTransaction(
-+        request, callback, headers);
-+>>>>>>> .their
- 
-   return HandleResponseEvent(kOnBeforeSendHeaders, request, callback, headers,
-                              *headers);
-@@ -310,8 +342,15 @@
- void AtomNetworkDelegate::OnStartTransaction(
-     net::URLRequest* request,
-     const net::HttpRequestHeaders& headers) {
-+<<<<<<< .our
-   if (!base::ContainsKey(simple_listeners_, kOnSendHeaders))
-     return;
-+=======
-+  if (!base::ContainsKey(simple_listeners_, kOnSendHeaders)) {
-+    brightray::NetworkDelegate::OnStartTransaction(request, headers);
-+    return;
-+  }
-+>>>>>>> .their
- 
-   HandleSimpleEvent(kOnSendHeaders, request, headers);
- }
-@@ -323,7 +362,12 @@
-     scoped_refptr<net::HttpResponseHeaders>* override,
-     GURL* allowed) {
-   if (!base::ContainsKey(response_listeners_, kOnHeadersReceived))
-+<<<<<<< .our
-     return net::OK;
-+=======
-+    return brightray::NetworkDelegate::OnHeadersReceived(
-+        request, callback, original, override, allowed);
-+>>>>>>> .their
- 
-   return HandleResponseEvent(
-       kOnHeadersReceived, request, callback,
-@@ -332,8 +376,15 @@
- 
- void AtomNetworkDelegate::OnBeforeRedirect(net::URLRequest* request,
-                                            const GURL& new_location) {
-+<<<<<<< .our
-   if (!base::ContainsKey(simple_listeners_, kOnBeforeRedirect))
-     return;
-+=======
-+  if (!base::ContainsKey(simple_listeners_, kOnBeforeRedirect)) {
-+    brightray::NetworkDelegate::OnBeforeRedirect(request, new_location);
-+    return;
-+  }
-+>>>>>>> .their
- 
-   HandleSimpleEvent(kOnBeforeRedirect, request, new_location,
-                     request->response_headers(), request->GetSocketAddress(),
-@@ -342,8 +393,15 @@
- 
- void AtomNetworkDelegate::OnResponseStarted(net::URLRequest* request,
-                                             int net_error) {
-+<<<<<<< .our
-   if (!base::ContainsKey(simple_listeners_, kOnResponseStarted))
-     return;
-+=======
-+  if (!base::ContainsKey(simple_listeners_, kOnResponseStarted)) {
-+    brightray::NetworkDelegate::OnResponseStarted(request, net_error);
-+    return;
-+  }
-+>>>>>>> .their
- 
-   if (request->status().status() != net::URLRequestStatus::SUCCESS)
-     return;
-@@ -361,6 +419,7 @@
-     // Error event.
-     OnErrorOccurred(request, started);
-     return;
-+<<<<<<< .our
-   }
- 
-   if (request->response_headers() &&
-@@ -372,12 +431,27 @@
- 
-   if (!base::ContainsKey(simple_listeners_, kOnCompleted))
-     return;
-+=======
-+  } else if (request->response_headers() &&
-+             net::HttpResponseHeaders::IsRedirectResponseCode(
-+                 request->response_headers()->response_code())) {
-+    // Redirect event.
-+    brightray::NetworkDelegate::OnCompleted(request, started);
-+    return;
-+  }
-+
-+  if (!base::ContainsKey(simple_listeners_, kOnCompleted)) {
-+    brightray::NetworkDelegate::OnCompleted(request, started);
-+    return;
-+  }
-+>>>>>>> .their
- 
-   HandleSimpleEvent(kOnCompleted, request, request->response_headers(),
-                     request->was_cached());
- }
- 
- void AtomNetworkDelegate::OnURLRequestDestroyed(net::URLRequest* request) {
-+<<<<<<< .our
-   const auto& it = login_handler_map_.find(request->identifier());
-   if (it != login_handler_map_.end()) {
-     it->second->NotifyRequestDestroyed();
-@@ -464,6 +538,17 @@
-                                           bool started) {
-   if (!base::ContainsKey(simple_listeners_, kOnErrorOccurred))
-     return;
-+=======
-+  callbacks_.erase(request->identifier());
-+}
-+
-+void AtomNetworkDelegate::OnErrorOccurred(net::URLRequest* request,
-+                                          bool started) {
-+  if (!base::ContainsKey(simple_listeners_, kOnErrorOccurred)) {
-+    brightray::NetworkDelegate::OnCompleted(request, started);
-+    return;
-+  }
-+>>>>>>> .their
- 
-   HandleSimpleEvent(kOnErrorOccurred, request, request->was_cached(),
-                     request->status());
-@@ -542,8 +627,12 @@
-     uint64_t id,
-     T out,
-     const base::DictionaryValue& response) {
-+<<<<<<< .our
-   auto copy = base::DictionaryValue::From(
-       base::Value::ToUniquePtrValue(response.Clone()));
-+=======
-+  std::unique_ptr<base::DictionaryValue> copy = response.CreateDeepCopy();
-+>>>>>>> .their
-   BrowserThread::PostTask(
-       BrowserThread::IO, FROM_HERE,
-       base::BindOnce(&AtomNetworkDelegate::OnListenerResultInIO<T>,
-added in both
-  our    100644 39a7a8ddfcda17fd7d022331132b54485d07a279 atom/browser/net/atom_network_delegate.h
-  their  100644 9288b70cb422caf38485d33212ec4a4be4ceb97e atom/browser/net/atom_network_delegate.h
-@@ -8,14 +8,24 @@
- #include <map>
- #include <set>
- #include <string>
-+<<<<<<< .our
- #include <vector>
-+=======
-+>>>>>>> .their
- 
- #include "base/callback.h"
- #include "base/synchronization/lock.h"
- #include "base/values.h"
-+<<<<<<< .our
- #include "content/public/browser/resource_request_info.h"
- #include "extensions/common/url_pattern.h"
- #include "net/base/network_delegate.h"
-+=======
-+#include "brightray/browser/network_delegate.h"
-+#include "content/public/browser/resource_request_info.h"
-+#include "extensions/common/url_pattern.h"
-+#include "net/base/net_errors.h"
-+>>>>>>> .their
- #include "net/http/http_request_headers.h"
- #include "net/http/http_response_headers.h"
- 
-@@ -27,9 +37,13 @@
- 
- const char* ResourceTypeToString(content::ResourceType type);
- 
-+<<<<<<< .our
- class LoginHandler;
- 
- class AtomNetworkDelegate : public net::NetworkDelegate {
-+=======
-+class AtomNetworkDelegate : public brightray::NetworkDelegate {
-+>>>>>>> .their
-  public:
-   using ResponseCallback = base::Callback<void(const base::DictionaryValue&)>;
-   using SimpleListener = base::Callback<void(const base::DictionaryValue&)>;
-@@ -88,10 +102,13 @@
-   int OnBeforeStartTransaction(net::URLRequest* request,
-                                const net::CompletionCallback& callback,
-                                net::HttpRequestHeaders* headers) override;
-+<<<<<<< .our
-   void OnBeforeSendHeaders(net::URLRequest* request,
-                            const net::ProxyInfo& proxy_info,
-                            const net::ProxyRetryInfoMap& proxy_retry_info,
-                            net::HttpRequestHeaders* headers) override {}
-+=======
-+>>>>>>> .their
-   void OnStartTransaction(net::URLRequest* request,
-                           const net::HttpRequestHeaders& headers) override;
-   int OnHeadersReceived(
-@@ -103,6 +120,7 @@
-   void OnBeforeRedirect(net::URLRequest* request,
-                         const GURL& new_location) override;
-   void OnResponseStarted(net::URLRequest* request, int net_error) override;
-+<<<<<<< .our
-   void OnNetworkBytesReceived(net::URLRequest* request,
-                               int64_t bytes_read) override {}
-   void OnNetworkBytesSent(net::URLRequest* request,
-@@ -140,6 +158,10 @@
-                                const GURL& endpoint) const override;
-   bool OnCanUseReportingClient(const url::Origin& origin,
-                                const GURL& endpoint) const override;
-+=======
-+  void OnCompleted(net::URLRequest* request, bool started) override;
-+  void OnURLRequestDestroyed(net::URLRequest* request) override;
-+>>>>>>> .their
- 
-  private:
-   void OnErrorOccurred(net::URLRequest* request, bool started);
-@@ -165,11 +187,17 @@
-                             T out,
-                             const base::DictionaryValue& response);
- 
-+<<<<<<< .our
-   std::map<uint64_t, scoped_refptr<LoginHandler>> login_handler_map_;
-   std::map<SimpleEvent, SimpleListenerInfo> simple_listeners_;
-   std::map<ResponseEvent, ResponseListenerInfo> response_listeners_;
-   std::map<uint64_t, net::CompletionCallback> callbacks_;
-   std::vector<std::string> ignore_connections_limit_domains_;
-+=======
-+  std::map<SimpleEvent, SimpleListenerInfo> simple_listeners_;
-+  std::map<ResponseEvent, ResponseListenerInfo> response_listeners_;
-+  std::map<uint64_t, net::CompletionCallback> callbacks_;
-+>>>>>>> .their
- 
-   // Client id for devtools network emulation.
-   std::string client_id_;
-added in both
-  our    100644 5ffbfd65a48b4459b2ebca66a5c2259f18ed80a8 atom/browser/net/atom_url_request.cc
-  their  100644 1aac780d88213871ab258845f8a0e3baf990cf27 atom/browser/net/atom_url_request.cc
-@@ -70,8 +70,16 @@
-     return nullptr;
-   }
-   scoped_refptr<brightray::URLRequestContextGetter> request_context_getter(
-+<<<<<<< .our
-       browser_context->GetRequestContext());
-   DCHECK(request_context_getter);
-+=======
-+      browser_context->url_request_context_getter());
-+  DCHECK(request_context_getter);
-+  if (!request_context_getter) {
-+    return nullptr;
-+  }
-+>>>>>>> .their
-   scoped_refptr<AtomURLRequest> atom_url_request(new AtomURLRequest(delegate));
-   if (content::BrowserThread::PostTask(
-           content::BrowserThread::IO, FROM_HERE,
-@@ -501,6 +509,7 @@
-     delegate_->OnError(error, isRequestError);
- }
- 
-+<<<<<<< .our
- void AtomURLRequest::GetUploadProgress(mate::Dictionary* progress) const {
-   net::UploadProgress upload_progress;
-   if (request_) {
-@@ -513,4 +522,6 @@
-   progress->Set("total", upload_progress.size());
- }
- 
-+=======
-+>>>>>>> .their
- }  // namespace atom
-added in both
-  our    100644 fde7b161385fb431b2d807012a00679a4bdb507a atom/browser/net/atom_url_request.h
-  their  100644 2b03ad7bc37ce6cfec1ff79ce183d37adf90749b atom/browser/net/atom_url_request.h
-@@ -43,7 +43,10 @@
-   void PassLoginInformation(const base::string16& username,
-                             const base::string16& password) const;
-   void SetLoadFlags(int flags) const;
-+<<<<<<< .our
-   void GetUploadProgress(mate::Dictionary* progress) const;
-+=======
-+>>>>>>> .their
- 
-  protected:
-   // Overrides of net::URLRequest::Delegate
-added in both
-  our    100644 59e3ab881c2355c2ed29b806de59ef372c170b62 atom/browser/net/js_asker.cc
-  their  100644 daf978082f102937d142dcddbdd860c92c709dbe atom/browser/net/js_asker.cc
-@@ -62,8 +62,13 @@
-     if (dict->GetInteger("error", error))
-       return true;
-   } else if (value->is_int()) {
-+<<<<<<< .our
-     *error = value->GetInt();
-     return true;
-+=======
-+    if (value->GetAsInteger(error))
-+      return true;
-+>>>>>>> .their
-   }
-   return false;
- }
-added in both
-  our    100644 1c15fd39b9d479b441b0931564f9e2c3f9de37c7 atom/browser/net/url_request_async_asar_job.cc
-  their  100644 06959032411d27e69ec441577b7a1987a2117080 atom/browser/net/url_request_async_asar_job.cc
-@@ -7,7 +7,10 @@
- #include <string>
- 
- #include "atom/common/atom_constants.h"
-+<<<<<<< .our
- #include "base/strings/utf_string_conversions.h"
-+=======
-+>>>>>>> .their
- #include "base/task_scheduler/post_task.h"
- 
- namespace atom {
-@@ -18,6 +21,7 @@
-     : JsAsker<asar::URLRequestAsarJob>(request, network_delegate) {}
- 
- void URLRequestAsyncAsarJob::StartAsync(std::unique_ptr<base::Value> options) {
-+<<<<<<< .our
-   std::string file_path;
-   if (options->is_dict()) {
-     auto* path_value =
-@@ -26,6 +30,14 @@
-       file_path = path_value->GetString();
-   } else if (options->is_string()) {
-     file_path = options->GetString();
-+=======
-+  base::FilePath::StringType file_path;
-+  if (options->is_dict()) {
-+    static_cast<base::DictionaryValue*>(options.get())
-+        ->GetString("path", &file_path);
-+  } else if (options->is_string()) {
-+    options->GetAsString(&file_path);
-+>>>>>>> .their
-   }
- 
-   if (file_path.empty()) {
-@@ -36,11 +48,15 @@
-         base::CreateSequencedTaskRunnerWithTraits(
-             {base::MayBlock(), base::TaskPriority::USER_VISIBLE,
-              base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN}),
-+<<<<<<< .our
- #if defined(OS_WIN)
-         base::FilePath(base::UTF8ToWide(file_path)));
- #else
-         base::FilePath(file_path));
- #endif
-+=======
-+        base::FilePath(file_path));
-+>>>>>>> .their
-     asar::URLRequestAsarJob::Start();
-   }
- }
-added in both
-  our    100644 68539433f4de80a96bc672de3a2834b299d6c04b atom/browser/net/url_request_fetch_job.cc
-  their  100644 09f7277ab6595e0e21d99e53a63d84ef6259de6d atom/browser/net/url_request_fetch_job.cc
-@@ -9,7 +9,10 @@
- 
- #include "atom/browser/api/atom_api_session.h"
- #include "atom/browser/atom_browser_context.h"
-+<<<<<<< .our
- #include "base/guid.h"
-+=======
-+>>>>>>> .their
- #include "base/memory/ptr_util.h"
- #include "base/strings/string_util.h"
- #include "native_mate/dictionary.h"
-@@ -94,15 +97,27 @@
-   if (options.Get("session", &val)) {
-     if (val->IsNull()) {
-       // We have to create the URLRequestContextGetter on UI thread.
-+<<<<<<< .our
-       custom_browser_context_ =
-           AtomBrowserContext::From(base::GenerateGUID(), true);
-       url_request_context_getter_ =
-           custom_browser_context_->GetRequestContext();
-+=======
-+      url_request_context_getter_ = new brightray::URLRequestContextGetter(
-+          this, nullptr, base::FilePath(), true,
-+          BrowserThread::GetTaskRunnerForThread(BrowserThread::IO), nullptr,
-+          content::URLRequestInterceptorScopedVector());
-+>>>>>>> .their
-     } else {
-       mate::Handle<api::Session> session;
-       if (mate::ConvertFromV8(isolate, val, &session) && !session.IsEmpty()) {
-         AtomBrowserContext* browser_context = session->browser_context();
-+<<<<<<< .our
-         url_request_context_getter_ = browser_context->GetRequestContext();
-+=======
-+        url_request_context_getter_ =
-+            browser_context->url_request_context_getter();
-+>>>>>>> .their
-       }
-     }
-   }
-added in both
-  our    100644 c38be1cbf86c72ac427b136cd5ebcb7fc0256d21 atom/browser/net/url_request_fetch_job.h
-  their  100644 d952074b20978f506fe727c182133e2122f7c572 atom/browser/net/url_request_fetch_job.h
-@@ -8,6 +8,7 @@
- #include <string>
- 
- #include "atom/browser/net/js_asker.h"
-+<<<<<<< .our
- #include "content/browser/streams/stream.h"
- #include "content/browser/streams/stream_read_observer.h"
- #include "net/url_request/url_fetcher_delegate.h"
-@@ -19,6 +20,18 @@
- 
- class URLRequestFetchJob : public JsAsker<net::URLRequestJob>,
-                            public net::URLFetcherDelegate {
-+=======
-+#include "brightray/browser/url_request_context_getter.h"
-+#include "content/browser/streams/stream.h"
-+#include "content/browser/streams/stream_read_observer.h"
-+#include "net/url_request/url_fetcher_delegate.h"
-+
-+namespace atom {
-+
-+class URLRequestFetchJob : public JsAsker<net::URLRequestJob>,
-+                           public net::URLFetcherDelegate,
-+                           public brightray::URLRequestContextGetter::Delegate {
-+>>>>>>> .their
-  public:
-   URLRequestFetchJob(net::URLRequest*, net::NetworkDelegate*);
-   ~URLRequestFetchJob() override;
-@@ -52,7 +65,10 @@
-   void ClearPendingBuffer();
-   void ClearWriteBuffer();
- 
-+<<<<<<< .our
-   scoped_refptr<AtomBrowserContext> custom_browser_context_;
-+=======
-+>>>>>>> .their
-   scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_;
-   std::unique_ptr<net::URLFetcher> fetcher_;
-   std::unique_ptr<net::HttpResponseInfo> response_info_;
-added in both
-  our    100644 31381ff118665f10a53e13fbe0044046738ca230 atom/browser/net/url_request_string_job.cc
-  their  100644 453dd0bb6615880d75f73294d22e67ec9975b7c3 atom/browser/net/url_request_string_job.cc
-@@ -25,7 +25,11 @@
-     dict->GetString("charset", &charset_);
-     dict->GetString("data", &data_);
-   } else if (options->is_string()) {
-+<<<<<<< .our
-     data_ = options->GetString();
-+=======
-+    options->GetAsString(&data_);
-+>>>>>>> .their
-   }
-   net::URLRequestSimpleJob::Start();
- }
-added in both
-  our    100644 4a2a0747fe2e6bf38c8999b80dbfea31e52a17fd atom/browser/osr/osr_render_widget_host_view.cc
-  their  100644 669785cbaa7762ebb8220632db229b24e58ebdca atom/browser/osr/osr_render_widget_host_view.cc
-@@ -264,7 +264,10 @@
-       size_(native_window->GetSize()),
-       painting_(painting),
-       is_showing_(!render_widget_host_->is_hidden()),
-+<<<<<<< .our
-       mouse_wheel_phase_handler_(render_widget_host_, this),
-+=======
-+>>>>>>> .their
-       weak_ptr_factory_(this) {
-   DCHECK(render_widget_host_);
-   bool is_guest_view_hack = parent_host_view_ != nullptr;
-@@ -280,8 +283,15 @@
- 
-   local_surface_id_ = local_surface_id_allocator_.GenerateId();
- 
-+<<<<<<< .our
- #if defined(OS_MACOSX)
-   last_frame_root_background_color_ = SK_ColorTRANSPARENT;
-+=======
-+  // Surface synchronization is not supported with OSR.
-+  DCHECK(!features::IsSurfaceSynchronizationEnabled());
-+
-+#if defined(OS_MACOSX)
-+>>>>>>> .their
-   CreatePlatformWidget(is_guest_view_hack);
- #else
-   // On macOS the ui::Compositor is created/owned by the platform view.
-@@ -302,7 +312,11 @@
- 
-   native_window_->AddObserver(this);
- 
-+<<<<<<< .our
-   ResizeRootLayer(false);
-+=======
-+  ResizeRootLayer();
-+>>>>>>> .their
-   render_widget_host_->SetView(this);
-   InstallTransparency();
- }
-@@ -384,7 +398,11 @@
-   parent_host_view_->set_child_host_view(this);
-   parent_host_view_->Hide();
- 
-+<<<<<<< .our
-   ResizeRootLayer(false);
-+=======
-+  ResizeRootLayer();
-+>>>>>>> .their
-   Show();
- }
- 
-@@ -513,10 +531,13 @@
-   TRACE_EVENT0("electron",
-                "OffScreenRenderWidgetHostView::SubmitCompositorFrame");
- 
-+<<<<<<< .our
- #if defined(OS_MACOSX)
-   last_frame_root_background_color_ = frame.metadata.root_background_color;
- #endif
- 
-+=======
-+>>>>>>> .their
-   if (frame.metadata.root_scroll_offset != last_scroll_offset_) {
-     last_scroll_offset_ = frame.metadata.root_scroll_offset;
-   }
-@@ -582,7 +603,11 @@
- 
-   popup_position_ = pos;
- 
-+<<<<<<< .our
-   ResizeRootLayer(false);
-+=======
-+  ResizeRootLayer();
-+>>>>>>> .their
-   Show();
- }
- 
-@@ -746,6 +771,13 @@
-   return std::make_unique<content::CompositorResizeLock>(this, desired_size);
- }
- 
-+<<<<<<< .our
-+=======
-+viz::LocalSurfaceId OffScreenRenderWidgetHostView::GetLocalSurfaceId() const {
-+  return local_surface_id_;
-+}
-+
-+>>>>>>> .their
- void OffScreenRenderWidgetHostView::OnFirstSurfaceActivation(
-     const viz::SurfaceInfo& surface_info) {}
- 
-@@ -773,6 +805,7 @@
-   return render_widget_host_->auto_resize_enabled();
- }
- 
-+<<<<<<< .our
- viz::LocalSurfaceId OffScreenRenderWidgetHostView::GetLocalSurfaceId() const {
-   return local_surface_id_;
- }
-@@ -793,6 +826,10 @@
- #endif
- }
- 
-+=======
-+#endif  // !defined(OS_MACOSX)
-+
-+>>>>>>> .their
- bool OffScreenRenderWidgetHostView::TransformPointToLocalCoordSpace(
-     const gfx::PointF& point,
-     const viz::SurfaceId& original_surface,
-@@ -899,7 +936,11 @@
-   DCHECK(!copy_frame_generator_);
-   DCHECK(!software_output_device_);
- 
-+<<<<<<< .our
-   ResizeRootLayer(false);
-+=======
-+  ResizeRootLayer();
-+>>>>>>> .their
- 
-   software_output_device_ = new OffScreenOutputDevice(
-       transparent_, base::Bind(&OffScreenRenderWidgetHostView::OnPaint,
-@@ -1051,7 +1092,11 @@
-     return;
-   }
- 
-+<<<<<<< .our
-   ResizeRootLayer(false);
-+=======
-+  ResizeRootLayer();
-+>>>>>>> .their
-   if (render_widget_host_)
-     render_widget_host_->WasResized();
-   GetDelegatedFrameHost()->WasResized(local_surface_id_, size_,
-@@ -1113,6 +1158,7 @@
-       return;
-     }
-   }
-+<<<<<<< .our
- 
-   blink::WebMouseWheelEvent mouse_wheel_event(event);
- 
-@@ -1136,6 +1182,20 @@
-             popup_mouse_wheel_event.PositionInWidget().y);
- 
-         popup_host_view_->SendMouseWheelEvent(popup_mouse_wheel_event);
-+=======
-+  if (!IsPopupWidget()) {
-+    if (popup_host_view_) {
-+      if (popup_host_view_->popup_position_.Contains(
-+              event.PositionInWidget().x, event.PositionInWidget().y)) {
-+        blink::WebMouseWheelEvent popup_event(event);
-+        popup_event.SetPositionInWidget(
-+            popup_event.PositionInWidget().x -
-+                popup_host_view_->popup_position_.x(),
-+            popup_event.PositionInWidget().y -
-+                popup_host_view_->popup_position_.y());
-+        popup_host_view_->ProcessMouseWheelEvent(popup_event,
-+                                                 ui::LatencyInfo());
-+>>>>>>> .their
-         return;
-       } else {
-         // Scrolling outside of the popup widget so destroy it.
-@@ -1146,6 +1206,7 @@
-             base::BindOnce(&OffScreenRenderWidgetHostView::CancelWidget,
-                            popup_host_view_->weak_ptr_factory_.GetWeakPtr()));
-       }
-+<<<<<<< .our
-     } else if (!guest_host_views_.empty()) {
-       for (auto guest_host_view : guest_host_views_) {
-         if (!guest_host_view->render_widget_host_ ||
-@@ -1168,6 +1229,8 @@
-           return;
-         }
-       }
-+=======
-+>>>>>>> .their
-     }
-   }
-   if (!render_widget_host_)
-@@ -1233,10 +1296,15 @@
- 
-   frame_rate_threshold_us_ = 1000000 / frame_rate_;
- 
-+<<<<<<< .our
-   if (GetCompositor()) {
-     GetCompositor()->SetAuthoritativeVSyncInterval(
-         base::TimeDelta::FromMicroseconds(frame_rate_threshold_us_));
-   }
-+=======
-+  GetCompositor()->SetAuthoritativeVSyncInterval(
-+      base::TimeDelta::FromMicroseconds(frame_rate_threshold_us_));
-+>>>>>>> .their
- 
-   if (copy_frame_generator_.get()) {
-     copy_frame_generator_->set_frame_rate_threshold_us(
-@@ -1265,7 +1333,11 @@
-   }
- }
- 
-+<<<<<<< .our
- void OffScreenRenderWidgetHostView::ResizeRootLayer(bool force) {
-+=======
-+void OffScreenRenderWidgetHostView::ResizeRootLayer() {
-+>>>>>>> .their
-   SetupFrameRate(false);
- 
-   const float compositorScaleFactor = GetCompositor()->device_scale_factor();
-@@ -1277,8 +1349,12 @@
-   else
-     size = popup_position_.size();
- 
-+<<<<<<< .our
-   if (!force && !scaleFactorDidChange &&
-       size == GetRootLayer()->bounds().size())
-+=======
-+  if (!scaleFactorDidChange && size == GetRootLayer()->bounds().size())
-+>>>>>>> .their
-     return;
- 
-   const gfx::Size& size_in_pixels =
-added in both
-  our    100644 b81f6310f864c00fea50b1aac49dc89173eaa302 atom/browser/osr/osr_render_widget_host_view.h
-  their  100644 10cc7530f8b177d667f170fb08b32d6c44dd957d atom/browser/osr/osr_render_widget_host_view.h
-@@ -27,7 +27,10 @@
- #include "content/browser/frame_host/render_widget_host_view_guest.h"
- #include "content/browser/renderer_host/compositor_resize_lock.h"
- #include "content/browser/renderer_host/delegated_frame_host.h"
-+<<<<<<< .our
- #include "content/browser/renderer_host/input/mouse_wheel_phase_handler.h"
-+=======
-+>>>>>>> .their
- #include "content/browser/renderer_host/render_widget_host_impl.h"
- #include "content/browser/renderer_host/render_widget_host_view_base.h"
- #include "content/browser/web_contents/web_contents_view.h"
-@@ -109,12 +112,19 @@
-   void SetNeedsBeginFrames(bool needs_begin_frames) override;
-   void SetWantsAnimateOnlyBeginFrames() override;
- #if defined(OS_MACOSX)
-+<<<<<<< .our
-+=======
-+  ui::AcceleratedWidgetMac* GetAcceleratedWidgetMac() const override;
-+>>>>>>> .their
-   void SetActive(bool active) override;
-   void ShowDefinitionForSelection() override;
-   bool SupportsSpeech() const override;
-   void SpeakSelection() override;
-   bool IsSpeaking() const override;
-+<<<<<<< .our
-   bool ShouldContinueToPauseForFrame() override;
-+=======
-+>>>>>>> .their
-   void StopSpeaking() override;
- #endif  // defined(OS_MACOSX)
- 
-@@ -170,6 +180,10 @@
-   bool DelegatedFrameCanCreateResizeLock() const override;
-   std::unique_ptr<content::CompositorResizeLock>
-   DelegatedFrameHostCreateResizeLock() override;
-+<<<<<<< .our
-+=======
-+  viz::LocalSurfaceId GetLocalSurfaceId() const override;
-+>>>>>>> .their
-   void OnFirstSurfaceActivation(const viz::SurfaceInfo& surface_info) override;
-   void OnBeginFrame(base::TimeTicks frame_time) override;
-   void OnFrameTokenChanged(uint32_t frame_token) override;
-@@ -181,11 +195,14 @@
-   bool IsAutoResizeEnabled() const override;
- #endif  // !defined(OS_MACOSX)
- 
-+<<<<<<< .our
-   viz::LocalSurfaceId GetLocalSurfaceId() const override;
-   viz::FrameSinkId GetFrameSinkId() override;
- 
-   void DidNavigate() override;
- 
-+=======
-+>>>>>>> .their
-   bool TransformPointToLocalCoordSpace(const gfx::PointF& point,
-                                        const viz::SurfaceId& original_surface,
-                                        gfx::PointF* transformed_point) override;
-@@ -210,9 +227,12 @@
- #if defined(OS_MACOSX)
-   void CreatePlatformWidget(bool is_guest_view_hack);
-   void DestroyPlatformWidget();
-+<<<<<<< .our
-   SkColor last_frame_root_background_color() const {
-     return last_frame_root_background_color_;
-   }
-+=======
-+>>>>>>> .their
- #endif
- 
-   void CancelWidget();
-@@ -268,9 +288,17 @@
-     child_host_view_ = child_view;
-   }
- 
-+<<<<<<< .our
-  private:
-   void SetupFrameRate(bool force);
-   void ResizeRootLayer(bool force);
-+=======
-+  viz::LocalSurfaceId local_surface_id() const { return local_surface_id_; }
-+
-+ private:
-+  void SetupFrameRate(bool force);
-+  void ResizeRootLayer();
-+>>>>>>> .their
- 
-   viz::FrameSinkId AllocateFrameSinkId(bool is_guest_view_hack);
- 
-@@ -331,8 +359,11 @@
- #if defined(OS_MACOSX)
-   std::unique_ptr<content::BrowserCompositorMac> browser_compositor_;
- 
-+<<<<<<< .our
-   SkColor last_frame_root_background_color_;
- 
-+=======
-+>>>>>>> .their
-   // Can not be managed by smart pointer because its header can not be included
-   // in the file that has the destructor.
-   MacHelper* mac_helper_;
-@@ -341,8 +372,11 @@
-   std::string selected_text_;
- #endif
- 
-+<<<<<<< .our
-   content::MouseWheelPhaseHandler mouse_wheel_phase_handler_;
- 
-+=======
-+>>>>>>> .their
-   viz::mojom::CompositorFrameSinkClient* renderer_compositor_frame_sink_ =
-       nullptr;
- 
-added in both
-  our    100644 8af4ce6ec263a6fba9f3c736ff74247c86787dbc atom/browser/osr/osr_render_widget_host_view_mac.mm
-  their  100644 81d39897f656613002d24a329eeb92d055d4be20 atom/browser/osr/osr_render_widget_host_view_mac.mm
-@@ -22,7 +22,11 @@
-   virtual ~MacHelper() {}
- 
-   // content::BrowserCompositorMacClient:
-+<<<<<<< .our
-   SkColor BrowserCompositorMacGetGutterColor() const override {
-+=======
-+  SkColor BrowserCompositorMacGetGutterColor(SkColor color) const override {
-+>>>>>>> .their
-     // When making an element on the page fullscreen the element's background
-     // may not match the page's, so use black as the gutter color to avoid
-     // flashes of brighter colors during the transition.
-@@ -30,7 +34,11 @@
-         view_->render_widget_host()->delegate()->IsFullscreenForCurrentTab()) {
-       return SK_ColorBLACK;
-     }
-+<<<<<<< .our
-     return view_->last_frame_root_background_color();
-+=======
-+    return color;
-+>>>>>>> .their
-   }
- 
-   void BrowserCompositorMacOnBeginFrame() override {}
-@@ -81,7 +89,11 @@
- 
- void OffScreenRenderWidgetHostView::StopSpeaking() {}
- 
-+<<<<<<< .our
- bool OffScreenRenderWidgetHostView::ShouldContinueToPauseForFrame() {
-+=======
-+bool CefRenderWidgetHostViewOSR::ShouldContinueToPauseForFrame() {
-+>>>>>>> .their
-   return browser_compositor_->ShouldContinueToPauseForFrame();
- }
- 
-@@ -98,10 +110,13 @@
-   delete mac_helper_;
- }
- 
-+<<<<<<< .our
- viz::LocalSurfaceId OffScreenRenderWidgetHostView::GetLocalSurfaceId() const {
-   return browser_compositor_->GetRendererLocalSurfaceId();
- }
- 
-+=======
-+>>>>>>> .their
- ui::Compositor* OffScreenRenderWidgetHostView::GetCompositor() const {
-   return browser_compositor_->GetCompositor();
- }
-added in both
-  our    100644 ae60f3c21ca91f7065da3eb0926ee62a27cb5e97 atom/browser/render_process_preferences.cc
-  their  100644 1d11181776616d20bbd3c349559423b76d08aa7e atom/browser/render_process_preferences.cc
-@@ -21,8 +21,12 @@
- 
- int RenderProcessPreferences::AddEntry(const base::DictionaryValue& entry) {
-   int id = ++next_id_;
-+<<<<<<< .our
-   entries_[id] =
-       base::DictionaryValue::From(base::Value::ToUniquePtrValue(entry.Clone()));
-+=======
-+  entries_[id] = entry.CreateDeepCopy();
-+>>>>>>> .their
-   cache_needs_update_ = true;
-   return id;
- }
-added in both
-  our    100644 9094f0f7335edf833d51f688851e6a105de60433 atom/browser/resources/mac/Info.plist
-  their  100644 70a794e41b94870bf45efa8f692d25f8c43998cd atom/browser/resources/mac/Info.plist
-@@ -17,9 +17,15 @@
-   <key>CFBundleIconFile</key>
-   <string>electron.icns</string>
-   <key>CFBundleVersion</key>
-+<<<<<<< .our
-   <string>4.0.0</string>
-   <key>CFBundleShortVersionString</key>
-   <string>4.0.0</string>
-+=======
-+  <string>3.0.0</string>
-+  <key>CFBundleShortVersionString</key>
-+  <string>3.0.0</string>
-+>>>>>>> .their
-   <key>LSApplicationCategoryType</key>
-   <string>public.app-category.developer-tools</string>
-   <key>LSMinimumSystemVersion</key>
-added in both
-  our    100644 c0bd831e8bddf10180f75cd40694831e2e98622d atom/browser/resources/win/atom.rc
-  their  100644 03ab5dec688ab7f66a211225297bc5093f971457 atom/browser/resources/win/atom.rc
-@@ -1,6 +1,10 @@
- // Microsoft Visual C++ generated resource script.
- //
-+<<<<<<< .our
- #include "ui\\resources\\grit\\ui_unscaled_resources.h"
-+=======
-+#include "grit\\ui_unscaled_resources.h"
-+>>>>>>> .their
- #include "resource.h"
- #include <winresrc.h>
- #ifdef IDC_STATIC
-@@ -56,8 +60,13 @@
- //
- 
- VS_VERSION_INFO VERSIONINFO
-+<<<<<<< .our
-  FILEVERSION 4,0,0,20180821
-  PRODUCTVERSION 4,0,0,20180821
-+=======
-+ FILEVERSION 3,0,0,4
-+ PRODUCTVERSION 3,0,0,4
-+>>>>>>> .their
-  FILEFLAGSMASK 0x3fL
- #ifdef _DEBUG
-  FILEFLAGS 0x1L
-@@ -74,12 +83,20 @@
-         BEGIN
-             VALUE "CompanyName", "GitHub, Inc."
-             VALUE "FileDescription", "Electron"
-+<<<<<<< .our
-             VALUE "FileVersion", "4.0.0"
-+=======
-+            VALUE "FileVersion", "3.0.0"
-+>>>>>>> .their
-             VALUE "InternalName", "electron.exe"
-             VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
-             VALUE "OriginalFilename", "electron.exe"
-             VALUE "ProductName", "Electron"
-+<<<<<<< .our
-             VALUE "ProductVersion", "4.0.0"
-+=======
-+            VALUE "ProductVersion", "3.0.0"
-+>>>>>>> .their
-             VALUE "SquirrelAwareVersion", "1"
-         END
-     END
-added in both
-  our    100644 f3dc0e0cc6ae044daf9cc499061db98f387d7dea atom/browser/ui/certificate_trust_win.cc
-  their  100644 6179b08607041c38996d7faef8f7f456e42e4ac4 atom/browser/ui/certificate_trust_win.cc
-@@ -20,8 +20,13 @@
- // This requires prompting the user to confirm they trust the certificate.
- BOOL AddToTrustedRootStore(const PCCERT_CONTEXT cert_context,
-                            const scoped_refptr<net::X509Certificate>& cert) {
-+<<<<<<< .our
-   auto* root_cert_store = CertOpenStore(
-       CERT_STORE_PROV_SYSTEM, 0, NULL, CERT_SYSTEM_STORE_CURRENT_USER, L"Root");
-+=======
-+  auto root_cert_store = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, NULL,
-+                                       CERT_SYSTEM_STORE_CURRENT_USER, L"Root");
-+>>>>>>> .their
- 
-   if (root_cert_store == NULL) {
-     return false;
-@@ -32,7 +37,11 @@
- 
-   if (result) {
-     // force Chromium to reload it's database for this certificate
-+<<<<<<< .our
-     auto* cert_db = net::CertDatabase::GetInstance();
-+=======
-+    auto cert_db = net::CertDatabase::GetInstance();
-+>>>>>>> .their
-     cert_db->NotifyObserversCertDBChanged();
-   }
- 
-added in both
-  our    100644 aaaf933e106080002d198ad6c15e637043609618 atom/browser/ui/cocoa/atom_ns_window.mm
-  their  100644 56ed5dc2319ccc62ad26919460a416a8c1ccc047 atom/browser/ui/cocoa/atom_ns_window.mm
-@@ -173,12 +173,20 @@
-       buttonFrame.origin.x += NSWidth(
-           [[self standardWindowButton:NSWindowMiniaturizeButton] frame]);
-       buttonFrame.origin.x += windowButtonsInterButtonSpacing_;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+      // fallthrough
-+>>>>>>> .their
-     case NSWindowMiniaturizeButton:
-       buttonFrame.origin.x +=
-           NSWidth([[self standardWindowButton:NSWindowCloseButton] frame]);
-       buttonFrame.origin.x += windowButtonsInterButtonSpacing_;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+      // fallthrough
-+>>>>>>> .their
-     default:
-       break;
-   }
-added in both
-  our    100644 c58da546dc8dab14b6f32e284727342bc8096d0c atom/browser/ui/cocoa/atom_ns_window_delegate.mm
-  their  100644 78bfe1fcd7b523290c190bdbe9b04ae250a6af1b atom/browser/ui/cocoa/atom_ns_window_delegate.mm
-@@ -112,6 +112,7 @@
-                extraHeightPlusFrame);
-   }
- 
-+<<<<<<< .our
-   {
-     bool prevent_default = false;
-     gfx::Rect new_bounds(gfx::Point(sender.frame.origin), gfx::Size(newSize));
-@@ -121,6 +122,8 @@
-     }
-   }
- 
-+=======
-+>>>>>>> .their
-   return newSize;
- }
- 
-added in both
-  our    100644 becc1806610ae54c005b3e8aef17a9ef19d730bf atom/browser/ui/file_dialog.h
-  their  100644 efa50062bb8284149a893c9bff174ed1cdb10ced atom/browser/ui/file_dialog.h
-@@ -66,7 +66,10 @@
-   bool security_scoped_bookmarks = false;
- 
-   DialogSettings();
-+<<<<<<< .our
-   DialogSettings(const DialogSettings&);
-+=======
-+>>>>>>> .their
-   ~DialogSettings();
- };
- 
-added in both
-  our    100644 dab125ec881bc75ff608dbbfddff972169049e54 atom/browser/ui/file_dialog_win.cc
-  their  100644 2d708086bfdf28bd31dd735360e36ed6222a6a16 atom/browser/ui/file_dialog_win.cc
-@@ -6,10 +6,16 @@
- 
- #include <windows.h>  // windows.h must be included first
- 
-+<<<<<<< .our
- #include <atlbase.h>  // atlbase.h for CComPtr
- 
- #include <shlobj.h>
- #include <shobjidl.h>
-+=======
-+#include <atlbase.h>
-+#include <commdlg.h>
-+#include <shlobj.h>
-+>>>>>>> .their
- 
- #include "atom/browser/native_window_views.h"
- #include "atom/browser/unresponsive_suppressor.h"
-@@ -21,11 +27,19 @@
- #include "base/threading/thread.h"
- #include "base/threading/thread_task_runner_handle.h"
- #include "base/win/registry.h"
-+<<<<<<< .our
-+=======
-+#include "third_party/wtl/include/atlapp.h"
-+#include "third_party/wtl/include/atldlgs.h"
-+>>>>>>> .their
- 
- namespace file_dialog {
- 
- DialogSettings::DialogSettings() = default;
-+<<<<<<< .our
- DialogSettings::DialogSettings(const DialogSettings&) = default;
-+=======
-+>>>>>>> .their
- DialogSettings::~DialogSettings() = default;
- 
- namespace {
-@@ -64,6 +78,90 @@
-   }
- }
- 
-+<<<<<<< .our
-+=======
-+// Generic class to delegate common open/save dialog's behaviours, users need to
-+// call interface methods via GetPtr().
-+template <typename T>
-+class FileDialog {
-+ public:
-+  FileDialog(const DialogSettings& settings, int options) {
-+    std::wstring file_part;
-+    if (!IsDirectory(settings.default_path))
-+      file_part = settings.default_path.BaseName().value();
-+
-+    std::vector<std::wstring> buffer;
-+    std::vector<COMDLG_FILTERSPEC> filterspec;
-+    ConvertFilters(settings.filters, &buffer, &filterspec);
-+
-+    dialog_.reset(new T(file_part.c_str(), options, NULL, filterspec.data(),
-+                        filterspec.size()));
-+
-+    if (!settings.title.empty())
-+      GetPtr()->SetTitle(base::UTF8ToUTF16(settings.title).c_str());
-+
-+    if (!settings.button_label.empty())
-+      GetPtr()->SetOkButtonLabel(
-+          base::UTF8ToUTF16(settings.button_label).c_str());
-+
-+    // By default, *.* will be added to the file name if file type is "*.*". In
-+    // Electron, we disable it to make a better experience.
-+    //
-+    // From MSDN: https://msdn.microsoft.com/en-us/library/windows/desktop/
-+    // bb775970(v=vs.85).aspx
-+    //
-+    // If SetDefaultExtension is not called, the dialog will not update
-+    // automatically when user choose a new file type in the file dialog.
-+    //
-+    // We set file extension to the first none-wildcard extension to make
-+    // sure the dialog will update file extension automatically.
-+    for (size_t i = 0; i < filterspec.size(); ++i) {
-+      if (std::wstring(filterspec[i].pszSpec) != L"*.*") {
-+        // SetFileTypeIndex is regarded as one-based index.
-+        GetPtr()->SetFileTypeIndex(i + 1);
-+        GetPtr()->SetDefaultExtension(filterspec[i].pszSpec);
-+        break;
-+      }
-+    }
-+
-+    if (settings.default_path.IsAbsolute()) {
-+      SetDefaultFolder(settings.default_path);
-+    }
-+  }
-+
-+  bool Show(atom::NativeWindow* parent_window) {
-+    atom::UnresponsiveSuppressor suppressor;
-+    HWND window = parent_window
-+                      ? static_cast<atom::NativeWindowViews*>(parent_window)
-+                            ->GetAcceleratedWidget()
-+                      : NULL;
-+    return dialog_->DoModal(window) == IDOK;
-+  }
-+
-+  T* GetDialog() { return dialog_.get(); }
-+
-+  IFileDialog* GetPtr() const { return dialog_->GetPtr(); }
-+
-+ private:
-+  // Set up the initial directory for the dialog.
-+  void SetDefaultFolder(const base::FilePath file_path) {
-+    std::wstring directory = IsDirectory(file_path)
-+                                 ? file_path.value()
-+                                 : file_path.DirName().value();
-+
-+    ATL::CComPtr<IShellItem> folder_item;
-+    HRESULT hr = SHCreateItemFromParsingName(directory.c_str(), NULL,
-+                                             IID_PPV_ARGS(&folder_item));
-+    if (SUCCEEDED(hr))
-+      GetPtr()->SetFolder(folder_item);
-+  }
-+
-+  std::unique_ptr<T> dialog_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(FileDialog);
-+};
-+
-+>>>>>>> .their
- struct RunState {
-   base::Thread* dialog_thread;
-   scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner;
-@@ -103,6 +201,7 @@
- 
- }  // namespace
- 
-+<<<<<<< .our
- static HRESULT GetFileNameFromShellItem(IShellItem* pShellItem,
-                                         SIGDN type,
-                                         LPWSTR lpstr,
-@@ -207,6 +306,11 @@
-     return false;
- 
-   DWORD options = FOS_FORCEFILESYSTEM | FOS_FILEMUSTEXIST;
-+=======
-+bool ShowOpenDialog(const DialogSettings& settings,
-+                    std::vector<base::FilePath>* paths) {
-+  int options = FOS_FORCEFILESYSTEM | FOS_FILEMUSTEXIST;
-+>>>>>>> .their
-   if (settings.properties & FILE_DIALOG_OPEN_DIRECTORY)
-     options |= FOS_PICKFOLDERS;
-   if (settings.properties & FILE_DIALOG_MULTI_SELECTIONS)
-@@ -215,6 +319,7 @@
-     options |= FOS_FORCESHOWHIDDEN;
-   if (settings.properties & FILE_DIALOG_PROMPT_TO_CREATE)
-     options |= FOS_CREATEPROMPT;
-+<<<<<<< .our
-   file_open_dialog->SetOptions(options);
- 
-   ApplySettings(file_open_dialog, settings);
-@@ -224,6 +329,16 @@
- 
-   ATL::CComPtr<IShellItemArray> items;
-   hr = file_open_dialog->GetResults(&items);
-+=======
-+
-+  FileDialog<CShellFileOpenDialog> open_dialog(settings, options);
-+  if (!open_dialog.Show(settings.parent_window))
-+    return false;
-+
-+  ATL::CComPtr<IShellItemArray> items;
-+  HRESULT hr =
-+      static_cast<IFileOpenDialog*>(open_dialog.GetPtr())->GetResults(&items);
-+>>>>>>> .their
-   if (FAILED(hr))
-     return false;
- 
-@@ -240,8 +355,13 @@
-       return false;
- 
-     wchar_t file_name[MAX_PATH];
-+<<<<<<< .our
-     hr = GetFileNameFromShellItem(item, SIGDN_FILESYSPATH, file_name, MAX_PATH);
- 
-+=======
-+    hr = CShellFileOpenDialog::GetFileNameFromShellItem(item, SIGDN_FILESYSPATH,
-+                                                        file_name, MAX_PATH);
-+>>>>>>> .their
-     if (FAILED(hr))
-       return false;
- 
-@@ -265,6 +385,7 @@
- }
- 
- bool ShowSaveDialog(const DialogSettings& settings, base::FilePath* path) {
-+<<<<<<< .our
-   ATL::CComPtr<IFileSaveDialog> file_save_dialog;
-   HRESULT hr = file_save_dialog.CoCreateInstance(CLSID_FileSaveDialog);
-   if (FAILED(hr))
-@@ -291,6 +412,19 @@
-   *path = base::FilePath(result_path);
-   CoTaskMemFree(result_path);
- 
-+=======
-+  FileDialog<CShellFileSaveDialog> save_dialog(
-+      settings, FOS_FORCEFILESYSTEM | FOS_PATHMUSTEXIST | FOS_OVERWRITEPROMPT);
-+  if (!save_dialog.Show(settings.parent_window))
-+    return false;
-+
-+  wchar_t buffer[MAX_PATH];
-+  HRESULT hr = save_dialog.GetDialog()->GetFilePath(buffer, MAX_PATH);
-+  if (FAILED(hr))
-+    return false;
-+
-+  *path = base::FilePath(buffer);
-+>>>>>>> .their
-   return true;
- }
- 
-added in both
-  our    100644 ee2f59dc8c84ba0bf5fe049a133f403d550a9473 atom/browser/ui/message_box_mac.mm
-  their  100644 a29ebff7bead0b798a2fbe962f6ff0f9bd0b5f16 atom/browser/ui/message_box_mac.mm
-@@ -97,6 +97,14 @@
-   NSArray* ns_buttons = [alert buttons];
-   int button_count = static_cast<int>([ns_buttons count]);
- 
-+<<<<<<< .our
-+=======
-+  // Bind cancel id button to escape key if there is more than one button
-+  if (button_count > 1 && cancel_id >= 0 && cancel_id < button_count) {
-+    [[ns_buttons objectAtIndex:cancel_id] setKeyEquivalent:@"\e"];
-+  }
-+
-+>>>>>>> .their
-   if (default_id >= 0 && default_id < button_count) {
-     // Focus the button at default_id if the user opted to do so.
-     // The first button added gets set as the default selected.
-@@ -105,11 +113,14 @@
-     [[ns_buttons objectAtIndex:default_id] setKeyEquivalent:@"\r"];
-   }
- 
-+<<<<<<< .our
-   // Bind cancel id button to escape key if there is more than one button
-   if (button_count > 1 && cancel_id >= 0 && cancel_id < button_count) {
-     [[ns_buttons objectAtIndex:cancel_id] setKeyEquivalent:@"\e"];
-   }
- 
-+=======
-+>>>>>>> .their
-   if (!checkbox_label.empty()) {
-     alert.showsSuppressionButton = YES;
-     alert.suppressionButton.title = base::SysUTF8ToNSString(checkbox_label);
-added in both
-  our    100644 b0e73f550e1d3a91f15e8d2d0604518027f75298 atom/browser/ui/message_box_win.cc
-  their  100644 e5a0e61379d0b7f294253e3bf1daa005dccfbfbd atom/browser/ui/message_box_win.cc
-@@ -128,8 +128,11 @@
-       case MESSAGE_BOX_TYPE_ERROR:
-         config.pszMainIcon = TD_ERROR_ICON;
-         break;
-+<<<<<<< .our
-       case MESSAGE_BOX_TYPE_NONE:
-         break;
-+=======
-+>>>>>>> .their
-     }
-   }
- 
-added in both
-  our    100644 e838d3cc217b5ffdb77226beff0d7217539f23f9 atom/browser/ui/views/menu_bar.cc
-  their  100644 535af8f2803187d737e1f5e42507d95b9b7272c2 atom/browser/ui/views/menu_bar.cc
-@@ -29,8 +29,13 @@
-     : background_color_(kDefaultColor), window_(window) {
-   RefreshColorCache();
-   UpdateViewColors();
-+<<<<<<< .our
-   SetLayoutManager(
-       std::make_unique<views::BoxLayout>(views::BoxLayout::kHorizontal));
-+=======
-+  SetLayoutManager(std::make_unique<views::BoxLayout>(
-+      views::BoxLayout::kHorizontal));
-+>>>>>>> .their
-   window_->GetFocusManager()->AddFocusChangeListener(this);
- }
- 
-@@ -178,7 +183,11 @@
-   }
- #elif defined(OS_WIN)
-   for (auto* child : GetChildrenInZOrder()) {
-+<<<<<<< .our
-     auto* button = static_cast<SubmenuButton*>(child);
-+=======
-+    auto button = static_cast<SubmenuButton*>(child);
-+>>>>>>> .their
-     button->SetUnderlineColor(color_utils::GetSysSkColor(COLOR_MENUTEXT));
-   }
- #endif
-added in both
-  our    100644 8f2139cb90fab876a1db1b17cac016997a3904ba atom/browser/ui/views/win_frame_view.cc
-  their  100644 91fdb8a966809633d934f97b46861aa4ef4c8120 atom/browser/ui/views/win_frame_view.cc
-@@ -10,7 +10,15 @@
- 
- namespace atom {
- 
-+<<<<<<< .our
- const char WinFrameView::kViewClassName[] = "WinFrameView";
-+=======
-+namespace {
-+
-+const char kViewClassName[] = "WinFrameView";
-+
-+}  // namespace
-+>>>>>>> .their
- 
- WinFrameView::WinFrameView() {}
- 
-added in both
-  our    100644 a6ffd7f363304913bb124908f138258bb804e56f atom/browser/ui/views/win_frame_view.h
-  their  100644 b2c1ef3a15de9a222233a27193ed811a8add09f6 atom/browser/ui/views/win_frame_view.h
-@@ -11,9 +11,14 @@
- 
- class WinFrameView : public FramelessView {
-  public:
-+<<<<<<< .our
-   static const char kViewClassName[];
-   WinFrameView();
-   ~WinFrameView() override;
-+=======
-+  WinFrameView();
-+  virtual ~WinFrameView();
-+>>>>>>> .their
- 
-   // views::NonClientFrameView:
-   gfx::Rect GetWindowBoundsForClientBounds(
-added in both
-  our    100644 39197cdccc994ee96aad07d8f5db01258fcb66a4 atom/browser/ui/webui/pdf_viewer_handler.cc
-  their  100644 4b63c3dc7112a85f594061bb262def495da69582 atom/browser/ui/webui/pdf_viewer_handler.cc
-@@ -112,8 +112,12 @@
-     PopulateStreamInfo(stream_info.get(), stream_, original_url_);
-     ResolveJavascriptCallback(*callback_id, *stream_info);
-   } else {
-+<<<<<<< .our
-     initialize_callback_id_ =
-         base::Value::ToUniquePtrValue(callback_id.Clone());
-+=======
-+    initialize_callback_id_ = callback_id->CreateDeepCopy();
-+>>>>>>> .their
-   }
- 
-   auto zoom_controller =
-added in both
-  our    100644 4a76126214e7ae0063fa379c64aaca6be9f17d20 atom/browser/ui/win/jump_list.cc
-  their  100644 6af235e756c227c0b1d7fed0446e08ee10352800 atom/browser/ui/win/jump_list.cc
-@@ -144,6 +144,7 @@
- 
- namespace atom {
- 
-+<<<<<<< .our
- JumpListItem::JumpListItem() = default;
- JumpListItem::JumpListItem(const JumpListItem&) = default;
- JumpListItem::~JumpListItem() = default;
-@@ -151,12 +152,17 @@
- JumpListCategory::JumpListCategory(const JumpListCategory&) = default;
- JumpListCategory::~JumpListCategory() = default;
- 
-+=======
-+>>>>>>> .their
- JumpList::JumpList(const base::string16& app_id) : app_id_(app_id) {
-   destinations_.CoCreateInstance(CLSID_DestinationList);
- }
- 
-+<<<<<<< .our
- JumpList::~JumpList() = default;
- 
-+=======
-+>>>>>>> .their
- bool JumpList::Begin(int* min_items, std::vector<JumpListItem>* removed_items) {
-   DCHECK(destinations_);
-   if (!destinations_)
-@@ -275,9 +281,15 @@
-         result = JumpListResult::GENERIC_ERROR;
-     }
-   } else {
-+<<<<<<< .our
-     HRESULT hr = destinations_->AppendCategory(category.name.c_str(), items);
-     if (FAILED(hr)) {
-       if (hr == static_cast<HRESULT>(0x80040F03)) {
-+=======
-+    auto hr = destinations_->AppendCategory(category.name.c_str(), items);
-+    if (FAILED(hr)) {
-+      if (hr == 0x80040F03) {
-+>>>>>>> .their
-         LOG(ERROR) << "Failed to append custom category "
-                    << "'" << category.name << "' "
-                    << "to Jump List due to missing file type registration.";
-added in both
-  our    100644 59d9a21a6c31f4d8fa5ebc0261630f3383138e84 atom/browser/ui/win/jump_list.h
-  their  100644 fc4ab085fc0db76b0d392abd5402adf35abe6ba1 atom/browser/ui/win/jump_list.h
-@@ -51,10 +51,13 @@
-   base::string16 description;
-   base::FilePath icon_path;
-   int icon_index = 0;
-+<<<<<<< .our
- 
-   JumpListItem();
-   JumpListItem(const JumpListItem&);
-   ~JumpListItem();
-+=======
-+>>>>>>> .their
- };
- 
- struct JumpListCategory {
-@@ -74,10 +77,13 @@
-   Type type = Type::TASKS;
-   base::string16 name;
-   std::vector<JumpListItem> items;
-+<<<<<<< .our
- 
-   JumpListCategory();
-   JumpListCategory(const JumpListCategory&);
-   ~JumpListCategory();
-+=======
-+>>>>>>> .their
- };
- 
- // Creates or removes a custom Jump List for an app.
-@@ -88,7 +94,10 @@
-   // custom Jump List should be created/removed, it's usually obtained by
-   // calling GetCurrentProcessExplicitAppUserModelID().
-   explicit JumpList(const base::string16& app_id);
-+<<<<<<< .our
-   ~JumpList();
-+=======
-+>>>>>>> .their
- 
-   // Starts a new transaction, must be called before appending any categories,
-   // aborting or committing. After the method returns |min_items| will indicate
-added in both
-  our    100644 bd4c17d2fcee53c7c106b0912252848cd6de0dc7 atom/browser/ui/win/notify_icon.h
-  their  100644 aed548ecb6188ccdfd71b93684a613ee2fe21d1a atom/browser/ui/win/notify_icon.h
-@@ -32,7 +32,11 @@
-  public:
-   // Constructor which provides this icon's unique ID and messaging window.
-   NotifyIcon(NotifyIconHost* host, UINT id, HWND window, UINT message);
-+<<<<<<< .our
-   ~NotifyIcon() override;
-+=======
-+  virtual ~NotifyIcon();
-+>>>>>>> .their
- 
-   // Handles a click event from the user - if |left_button_click| is true and
-   // there is a registered observer, passes the click event to the observer,
-added in both
-  our    100644 c4b92a24aefb3afa3ff2929eea59940d439e8709 atom/browser/ui/win/taskbar_host.cc
-  their  100644 e023fdc8c836899b7a8b9a80d4bc57edb365f3cc atom/browser/ui/win/taskbar_host.cc
-@@ -50,11 +50,14 @@
- 
- }  // namespace
- 
-+<<<<<<< .our
- TaskbarHost::ThumbarButton::ThumbarButton() = default;
- TaskbarHost::ThumbarButton::ThumbarButton(const TaskbarHost::ThumbarButton&) =
-     default;
- TaskbarHost::ThumbarButton::~ThumbarButton() = default;
- 
-+=======
-+>>>>>>> .their
- TaskbarHost::TaskbarHost() {}
- 
- TaskbarHost::~TaskbarHost() {}
-added in both
-  our    100644 2182d377a7736f5e135d2f518c2a0a838cd0d1a0 atom/browser/ui/win/taskbar_host.h
-  their  100644 31199cf22837b604beca1fe92627b53cf6f71e8f atom/browser/ui/win/taskbar_host.h
-@@ -26,10 +26,13 @@
-     gfx::Image icon;
-     std::vector<std::string> flags;
-     base::Closure clicked_callback;
-+<<<<<<< .our
- 
-     ThumbarButton();
-     ThumbarButton(const ThumbarButton&);
-     ~ThumbarButton();
-+=======
-+>>>>>>> .their
-   };
- 
-   TaskbarHost();
-added in both
-  our    100644 c21c93383155091a7481cdd4e741cefad90a4a55 atom/browser/web_contents_preferences.cc
-  their  100644 1046a55b05791d48316afee7052e8fa2e23d131c atom/browser/web_contents_preferences.cc
-@@ -15,7 +15,10 @@
- #include "base/command_line.h"
- #include "base/memory/ptr_util.h"
- #include "base/strings/string_number_conversions.h"
-+<<<<<<< .our
- #include "base/strings/utf_string_conversions.h"
-+=======
-+>>>>>>> .their
- #include "cc/base/switches.h"
- #include "content/public/browser/render_frame_host.h"
- #include "content/public/browser/render_process_host.h"
-@@ -30,6 +33,7 @@
- 
- DEFINE_WEB_CONTENTS_USER_DATA_KEY(atom::WebContentsPreferences);
- 
-+<<<<<<< .our
- namespace {
- 
- bool GetAsString(const base::Value* val,
-@@ -75,6 +79,8 @@
- 
- }  // namespace
- 
-+=======
-+>>>>>>> .their
- namespace atom {
- 
- // static
-@@ -91,7 +97,11 @@
-   copied.Delete("isGuest");
-   copied.Delete("session");
- 
-+<<<<<<< .our
-   mate::ConvertFromV8(isolate, copied.GetHandle(), &preference_);
-+=======
-+  mate::ConvertFromV8(isolate, copied.GetHandle(), &dict_);
-+>>>>>>> .their
-   web_contents->SetUserData(UserDataKey(), base::WrapUnique(this));
- 
-   instances_.push_back(this);
-@@ -99,6 +109,10 @@
-   // Set WebPreferences defaults onto the JS object
-   SetDefaultBoolIfUndefined(options::kPlugins, false);
-   SetDefaultBoolIfUndefined(options::kExperimentalFeatures, false);
-+<<<<<<< .our
-+=======
-+  SetDefaultBoolIfUndefined(options::kExperimentalCanvasFeatures, false);
-+>>>>>>> .their
-   bool node = SetDefaultBoolIfUndefined(options::kNodeIntegration, true);
-   SetDefaultBoolIfUndefined(options::kNodeIntegrationInWorker, false);
-   SetDefaultBoolIfUndefined(options::kWebviewTag, node);
-@@ -124,7 +138,11 @@
- #endif
-   SetDefaultBoolIfUndefined(options::kOffscreen, false);
- 
-+<<<<<<< .our
-   last_preference_ = preference_.Clone();
-+=======
-+  last_dict_ = std::move(*dict_.CreateDeepCopy());
-+>>>>>>> .their
- }
- 
- WebContentsPreferences::~WebContentsPreferences() {
-@@ -135,6 +153,7 @@
- bool WebContentsPreferences::SetDefaultBoolIfUndefined(
-     const base::StringPiece& key,
-     bool val) {
-+<<<<<<< .our
-   auto* current_value =
-       preference_.FindKeyOfType(key, base::Value::Type::BOOLEAN);
-   if (current_value) {
-@@ -191,6 +210,25 @@
-     }
-   }
-   return false;
-+=======
-+  bool existing;
-+  if (!dict_.GetBoolean(key, &existing)) {
-+    dict_.SetBoolean(key, val);
-+    return val;
-+  }
-+  return existing;
-+}
-+
-+bool WebContentsPreferences::IsEnabled(const base::StringPiece& name,
-+                                       bool default_value) {
-+  bool bool_value = default_value;
-+  dict_.GetBoolean(name, &bool_value);
-+  return bool_value;
-+}
-+
-+void WebContentsPreferences::Merge(const base::DictionaryValue& extend) {
-+  dict_.MergeDictionary(&extend);
-+>>>>>>> .their
- }
- 
- // static
-@@ -214,6 +252,7 @@
- 
- void WebContentsPreferences::AppendCommandLineSwitches(
-     base::CommandLine* command_line) {
-+<<<<<<< .our
-   // Check if plugins are enabled.
-   if (IsEnabled(options::kPlugins))
-     command_line->AppendSwitch(switches::kEnablePlugins);
-@@ -230,17 +269,45 @@
- 
-   // Whether to enable node integration in Worker.
-   if (IsEnabled(options::kNodeIntegrationInWorker))
-+=======
-+  bool b;
-+  // Check if plugins are enabled.
-+  if (dict_.GetBoolean(options::kPlugins, &b) && b)
-+    command_line->AppendSwitch(switches::kEnablePlugins);
-+
-+  // Experimental flags.
-+  if (dict_.GetBoolean(options::kExperimentalFeatures, &b) && b)
-+    command_line->AppendSwitch(
-+        ::switches::kEnableExperimentalWebPlatformFeatures);
-+  if (dict_.GetBoolean(options::kExperimentalCanvasFeatures, &b) && b)
-+    command_line->AppendSwitch(::switches::kEnableExperimentalCanvasFeatures);
-+
-+  // Check if we have node integration specified.
-+  bool node_integration = true;
-+  dict_.GetBoolean(options::kNodeIntegration, &node_integration);
-+  command_line->AppendSwitchASCII(switches::kNodeIntegration,
-+                                  node_integration ? "true" : "false");
-+
-+  // Whether to enable node integration in Worker.
-+  if (dict_.GetBoolean(options::kNodeIntegrationInWorker, &b) && b)
-+>>>>>>> .their
-     command_line->AppendSwitch(switches::kNodeIntegrationInWorker);
- 
-   // Check if webview tag creation is enabled, default to nodeIntegration value.
-   // TODO(kevinsawicki): Default to false in 2.0
-+<<<<<<< .our
-   bool webview_tag = IsEnabled(options::kWebviewTag, enable_node_integration);
-+=======
-+  bool webview_tag = node_integration;
-+  dict_.GetBoolean(options::kWebviewTag, &webview_tag);
-+>>>>>>> .their
-   command_line->AppendSwitchASCII(switches::kWebviewTag,
-                                   webview_tag ? "true" : "false");
- 
-   // If the `sandbox` option was passed to the BrowserWindow's webPreferences,
-   // pass `--enable-sandbox` to the renderer so it won't have any node.js
-   // integration.
-+<<<<<<< .our
-   if (IsEnabled(options::kSandbox))
-     command_line->AppendSwitch(switches::kEnableSandbox);
-   else if (!command_line->HasSwitch(switches::kEnableSandbox))
-@@ -248,10 +315,18 @@
- 
-   // Check if nativeWindowOpen is enabled.
-   if (IsEnabled(options::kNativeWindowOpen))
-+=======
-+  if (dict_.GetBoolean(options::kSandbox, &b) && b)
-+    command_line->AppendSwitch(switches::kEnableSandbox);
-+  else if (!command_line->HasSwitch(switches::kEnableSandbox))
-+    command_line->AppendSwitch(::switches::kNoSandbox);
-+  if (dict_.GetBoolean(options::kNativeWindowOpen, &b) && b)
-+>>>>>>> .their
-     command_line->AppendSwitch(switches::kNativeWindowOpen);
- 
-   // The preload script.
-   base::FilePath::StringType preload;
-+<<<<<<< .our
-   if (GetPreloadPath(&preload))
-     command_line->AppendSwitchNative(switches::kPreloadScript, preload);
- 
-@@ -260,39 +335,80 @@
-       preference_.FindKeyOfType(options::kCustomArgs, base::Value::Type::LIST);
-   if (customArgs) {
-     for (const auto& customArg : customArgs->GetList()) {
-+=======
-+  if (dict_.GetString(options::kPreloadScript, &preload)) {
-+    if (base::FilePath(preload).IsAbsolute())
-+      command_line->AppendSwitchNative(switches::kPreloadScript, preload);
-+    else
-+      LOG(ERROR) << "preload script must have absolute path.";
-+  } else if (dict_.GetString(options::kPreloadURL, &preload)) {
-+    // Translate to file path if there is "preload-url" option.
-+    base::FilePath preload_path;
-+    if (net::FileURLToFilePath(GURL(preload), &preload_path))
-+      command_line->AppendSwitchPath(switches::kPreloadScript, preload_path);
-+    else
-+      LOG(ERROR) << "preload url must be file:// protocol.";
-+  }
-+
-+  // Custom args for renderer process
-+  base::Value* customArgs;
-+  if (dict_.Get(options::kCustomArgs, &customArgs) && customArgs->is_list()) {
-+    for (const base::Value& customArg : customArgs->GetList()) {
-+>>>>>>> .their
-       if (customArg.is_string())
-         command_line->AppendArg(customArg.GetString());
-     }
-   }
- 
-   // Run Electron APIs and preload script in isolated world
-+<<<<<<< .our
-   if (IsEnabled(options::kContextIsolation))
-+=======
-+  if (dict_.GetBoolean(options::kContextIsolation, &b) && b)
-+>>>>>>> .their
-     command_line->AppendSwitch(switches::kContextIsolation);
- 
-   // --background-color.
-   std::string s;
-+<<<<<<< .our
-   if (GetAsString(&preference_, options::kBackgroundColor, &s))
-+=======
-+  if (dict_.GetString(options::kBackgroundColor, &s))
-+>>>>>>> .their
-     command_line->AppendSwitchASCII(switches::kBackgroundColor, s);
- 
-   // --guest-instance-id, which is used to identify guest WebContents.
-   int guest_instance_id = 0;
-+<<<<<<< .our
-   if (GetAsInteger(&preference_, options::kGuestInstanceID, &guest_instance_id))
-+=======
-+  if (dict_.GetInteger(options::kGuestInstanceID, &guest_instance_id))
-+>>>>>>> .their
-     command_line->AppendSwitchASCII(switches::kGuestInstanceID,
-                                     base::IntToString(guest_instance_id));
- 
-   // Pass the opener's window id.
-   int opener_id;
-+<<<<<<< .our
-   if (GetAsInteger(&preference_, options::kOpenerID, &opener_id))
-+=======
-+  if (dict_.GetInteger(options::kOpenerID, &opener_id))
-+>>>>>>> .their
-     command_line->AppendSwitchASCII(switches::kOpenerID,
-                                     base::IntToString(opener_id));
- 
- #if defined(OS_MACOSX)
-   // Enable scroll bounce.
-+<<<<<<< .our
-   if (IsEnabled(options::kScrollBounce))
-+=======
-+  if (dict_.GetBoolean(options::kScrollBounce, &b) && b)
-+>>>>>>> .their
-     command_line->AppendSwitch(switches::kScrollBounce);
- #endif
- 
-   // Custom command line switches.
-+<<<<<<< .our
-   auto* args =
-       preference_.FindKeyOfType("commandLineSwitches", base::Value::Type::LIST);
-   if (args) {
-@@ -302,15 +418,31 @@
-         if (!arg_val.empty())
-           command_line->AppendSwitch(arg_val);
-       }
-+=======
-+  const base::ListValue* args;
-+  if (dict_.GetList("commandLineSwitches", &args)) {
-+    for (size_t i = 0; i < args->GetSize(); ++i) {
-+      std::string arg;
-+      if (args->GetString(i, &arg) && !arg.empty())
-+        command_line->AppendSwitch(arg);
-+>>>>>>> .their
-     }
-   }
- 
-   // Enable blink features.
-+<<<<<<< .our
-   if (GetAsString(&preference_, options::kEnableBlinkFeatures, &s))
-     command_line->AppendSwitchASCII(::switches::kEnableBlinkFeatures, s);
- 
-   // Disable blink features.
-   if (GetAsString(&preference_, options::kDisableBlinkFeatures, &s))
-+=======
-+  if (dict_.GetString(options::kEnableBlinkFeatures, &s))
-+    command_line->AppendSwitchASCII(::switches::kEnableBlinkFeatures, s);
-+
-+  // Disable blink features.
-+  if (dict_.GetString(options::kDisableBlinkFeatures, &s))
-+>>>>>>> .their
-     command_line->AppendSwitchASCII(::switches::kDisableBlinkFeatures, s);
- 
-   if (guest_instance_id) {
-@@ -337,11 +469,16 @@
-   // We are appending args to a webContents so let's save the current state
-   // of our preferences object so that during the lifetime of the WebContents
-   // we can fetch the options used to initally configure the WebContents
-+<<<<<<< .our
-   last_preference_ = preference_.Clone();
-+=======
-+  last_dict_ = std::move(*dict_.CreateDeepCopy());
-+>>>>>>> .their
- }
- 
- void WebContentsPreferences::OverrideWebkitPrefs(
-     content::WebPreferences* prefs) {
-+<<<<<<< .our
-   prefs->javascript_enabled = IsEnabled("javascript", true /* default_value */);
-   prefs->images_enabled = IsEnabled("images", true /* default_value */);
-   prefs->text_areas_are_resizable =
-@@ -392,4 +529,66 @@
-     prefs->default_encoding = encoding;
- }
- 
-+=======
-+  bool b;
-+  if (dict_.GetBoolean("javascript", &b))
-+    prefs->javascript_enabled = b;
-+  if (dict_.GetBoolean("images", &b))
-+    prefs->images_enabled = b;
-+  if (dict_.GetBoolean("textAreasAreResizable", &b))
-+    prefs->text_areas_are_resizable = b;
-+  if (dict_.GetBoolean("webgl", &b)) {
-+    prefs->webgl1_enabled = b;
-+    prefs->webgl2_enabled = b;
-+  }
-+  if (dict_.GetBoolean(options::kWebSecurity, &b)) {
-+    prefs->web_security_enabled = b;
-+    prefs->allow_running_insecure_content = !b;
-+  }
-+  if (dict_.GetBoolean(options::kAllowRunningInsecureContent, &b))
-+    prefs->allow_running_insecure_content = b;
-+  if (dict_.GetBoolean("navigateOnDragDrop", &b))
-+    prefs->navigate_on_drag_drop = b;
-+  const base::DictionaryValue* fonts = nullptr;
-+  if (dict_.GetDictionary("defaultFontFamily", &fonts)) {
-+    base::string16 font;
-+    if (fonts->GetString("standard", &font))
-+      prefs->standard_font_family_map[content::kCommonScript] = font;
-+    if (fonts->GetString("serif", &font))
-+      prefs->serif_font_family_map[content::kCommonScript] = font;
-+    if (fonts->GetString("sansSerif", &font))
-+      prefs->sans_serif_font_family_map[content::kCommonScript] = font;
-+    if (fonts->GetString("monospace", &font))
-+      prefs->fixed_font_family_map[content::kCommonScript] = font;
-+    if (fonts->GetString("cursive", &font))
-+      prefs->cursive_font_family_map[content::kCommonScript] = font;
-+    if (fonts->GetString("fantasy", &font))
-+      prefs->fantasy_font_family_map[content::kCommonScript] = font;
-+  }
-+  int size;
-+  if (GetInteger("defaultFontSize", &size))
-+    prefs->default_font_size = size;
-+  if (GetInteger("defaultMonospaceFontSize", &size))
-+    prefs->default_fixed_font_size = size;
-+  if (GetInteger("minimumFontSize", &size))
-+    prefs->minimum_font_size = size;
-+  std::string encoding;
-+  if (dict_.GetString("defaultEncoding", &encoding))
-+    prefs->default_encoding = encoding;
-+}
-+
-+bool WebContentsPreferences::GetInteger(const base::StringPiece& attribute_name,
-+                                        int* val) {
-+  // if it is already an integer, no conversion needed
-+  if (dict_.GetInteger(attribute_name, val))
-+    return true;
-+
-+  std::string str;
-+  if (dict_.GetString(attribute_name, &str))
-+    return base::StringToInt(str, val);
-+
-+  return false;
-+}
-+
-+>>>>>>> .their
- }  // namespace atom
-added in both
-  our    100644 d835347afcd259f473f95271a2c19e42afcc6f2b atom/browser/web_contents_preferences.h
-  their  100644 f08a614bf8c1a4df9a0df6acf28c882f79beabf0 atom/browser/web_contents_preferences.h
-@@ -37,8 +37,12 @@
-   ~WebContentsPreferences() override;
- 
-   // A simple way to know whether a Boolean property is enabled.
-+<<<<<<< .our
-   bool IsEnabled(const base::StringPiece& name,
-                  bool default_value = false) const;
-+=======
-+  bool IsEnabled(const base::StringPiece& name, bool default_value = false);
-+>>>>>>> .their
- 
-   // $.extend(|web_preferences|, |new_web_preferences|).
-   void Merge(const base::DictionaryValue& new_web_preferences);
-@@ -49,6 +53,7 @@
-   // Modify the WebPreferences according to preferences.
-   void OverrideWebkitPrefs(content::WebPreferences* prefs);
- 
-+<<<<<<< .our
-   // Clear the current WebPreferences.
-   void Clear();
- 
-@@ -61,6 +66,12 @@
-   // Returns the web preferences.
-   base::Value* preference() { return &preference_; }
-   base::Value* last_preference() { return &last_preference_; }
-+=======
-+  // Returns the web preferences.
-+  base::DictionaryValue* dict() { return &dict_; }
-+  const base::DictionaryValue* dict() const { return &dict_; }
-+  base::DictionaryValue* last_dict() { return &last_dict_; }
-+>>>>>>> .their
- 
-  private:
-   friend class content::WebContentsUserData<WebContentsPreferences>;
-@@ -72,12 +83,23 @@
-   // Set preference value to given bool if user did not provide value
-   bool SetDefaultBoolIfUndefined(const base::StringPiece& key, bool val);
- 
-+<<<<<<< .our
-+=======
-+  // Get preferences value as integer possibly coercing it from a string
-+  bool GetInteger(const base::StringPiece& attribute_name, int* val);
-+
-+>>>>>>> .their
-   static std::vector<WebContentsPreferences*> instances_;
- 
-   content::WebContents* web_contents_;
- 
-+<<<<<<< .our
-   base::Value preference_ = base::Value(base::Value::Type::DICTIONARY);
-   base::Value last_preference_ = base::Value(base::Value::Type::DICTIONARY);
-+=======
-+  base::DictionaryValue dict_;
-+  base::DictionaryValue last_dict_;
-+>>>>>>> .their
- 
-   DISALLOW_COPY_AND_ASSIGN(WebContentsPreferences);
- };
-added in both
-  our    100644 35b8e4635cff23875091db7f35bea349cf1460c2 atom/browser/web_contents_zoom_controller.cc
-  their  100644 489321810cfedb77f00739fca971c44dfd556700 atom/browser/web_contents_zoom_controller.cc
-@@ -228,9 +228,12 @@
- }
- 
- void WebContentsZoomController::WebContentsDestroyed() {
-+<<<<<<< .our
-   for (Observer& observer : observers_)
-     observer.OnZoomControllerWebContentsDestroyed();
- 
-+=======
-+>>>>>>> .their
-   observers_.Clear();
-   embedder_zoom_controller_ = nullptr;
- }
-added in both
-  our    100644 bafbbbfb491b4d0e70f2b44d974877fcd2e73ba8 atom/browser/web_contents_zoom_controller.h
-  their  100644 478326f1b82fc5f42e4af20cdf09e23b376f0e05 atom/browser/web_contents_zoom_controller.h
-@@ -24,7 +24,10 @@
-     virtual void OnZoomLevelChanged(content::WebContents* web_contents,
-                                     double level,
-                                     bool is_temporary) {}
-+<<<<<<< .our
-     virtual void OnZoomControllerWebContentsDestroyed() {}
-+=======
-+>>>>>>> .their
- 
-    protected:
-     virtual ~Observer() {}
-added in both
-  our    100644 74c8573d13f15bcaa189abdc40fa0cd8e48f89be atom/browser/web_dialog_helper.cc
-  their  100644 f39f77a643522bba10cc2f764b0d5daf02f35d42 atom/browser/web_dialog_helper.cc
-@@ -220,7 +220,10 @@
-     switch (params.mode) {
-       case content::FileChooserParams::OpenMultiple:
-         flags |= file_dialog::FILE_DIALOG_MULTI_SELECTIONS;
-+<<<<<<< .our
-         FALLTHROUGH;
-+=======
-+>>>>>>> .their
-       case content::FileChooserParams::Open:
-         flags |= file_dialog::FILE_DIALOG_OPEN_FILE;
-         flags |= file_dialog::FILE_DIALOG_TREAT_PACKAGE_APP_AS_DIRECTORY;
-added in both
-  our    100644 27fbff7e9e3633bd17c54b4c67ba4a1d5993e449 atom/browser/web_view_guest_delegate.cc
-  their  100644 ed8e2d87c7609fe2e1b11d20fa5a664107bcfca2 atom/browser/web_view_guest_delegate.cc
-@@ -7,15 +7,22 @@
- #include "atom/browser/api/atom_api_web_contents.h"
- #include "atom/common/native_mate_converters/gurl_converter.h"
- #include "content/browser/web_contents/web_contents_impl.h"
-+<<<<<<< .our
- #include "content/public/browser/navigation_handle.h"
- #include "content/public/browser/render_frame_host.h"
- #include "content/public/browser/render_process_host.h"
-+=======
-+#include "content/public/browser/guest_host.h"
-+#include "content/public/browser/navigation_handle.h"
-+#include "content/public/browser/render_frame_host.h"
-+>>>>>>> .their
- #include "content/public/browser/render_view_host.h"
- #include "content/public/browser/render_widget_host.h"
- #include "content/public/browser/render_widget_host_view.h"
- 
- namespace atom {
- 
-+<<<<<<< .our
- WebViewGuestDelegate::WebViewGuestDelegate(content::WebContents* embedder,
-                                            api::WebContents* api_web_contents)
-     : embedder_web_contents_(embedder), api_web_contents_(api_web_contents) {}
-@@ -41,11 +48,115 @@
-   // frame |embedder_frame| hosts the inner WebContents.
-   api_web_contents_->web_contents()->AttachToOuterWebContentsFrame(
-       embedder_web_contents_, embedder_frame);
-+=======
-+namespace {
-+
-+const int kDefaultWidth = 300;
-+const int kDefaultHeight = 300;
-+
-+}  // namespace
-+
-+SetSizeParams::SetSizeParams() = default;
-+SetSizeParams::~SetSizeParams() = default;
-+
-+WebViewGuestDelegate::WebViewGuestDelegate() {}
-+
-+WebViewGuestDelegate::~WebViewGuestDelegate() {}
-+
-+void WebViewGuestDelegate::Initialize(api::WebContents* api_web_contents) {
-+  api_web_contents_ = api_web_contents;
-+  Observe(api_web_contents->GetWebContents());
-+}
-+
-+void WebViewGuestDelegate::Destroy() {
-+  // Give the content module an opportunity to perform some cleanup.
-+  ResetZoomController();
-+  guest_host_->WillDestroy();
-+  guest_host_ = nullptr;
-+}
-+
-+void WebViewGuestDelegate::SetSize(const SetSizeParams& params) {
-+  bool enable_auto_size =
-+      params.enable_auto_size ? *params.enable_auto_size : auto_size_enabled_;
-+  gfx::Size min_size = params.min_size ? *params.min_size : min_auto_size_;
-+  gfx::Size max_size = params.max_size ? *params.max_size : max_auto_size_;
-+
-+  if (params.normal_size)
-+    normal_size_ = *params.normal_size;
-+
-+  min_auto_size_ = min_size;
-+  min_auto_size_.SetToMin(max_size);
-+  max_auto_size_ = max_size;
-+  max_auto_size_.SetToMax(min_size);
-+
-+  enable_auto_size &= !min_auto_size_.IsEmpty() && !max_auto_size_.IsEmpty();
-+
-+  auto* rvh = web_contents()->GetRenderViewHost();
-+  if (enable_auto_size) {
-+    // Autosize is being enabled.
-+    rvh->EnableAutoResize(min_auto_size_, max_auto_size_);
-+    normal_size_.SetSize(0, 0);
-+  } else {
-+    // Autosize is being disabled.
-+    // Use default width/height if missing from partially defined normal size.
-+    if (normal_size_.width() && !normal_size_.height())
-+      normal_size_.set_height(GetDefaultSize().height());
-+    if (!normal_size_.width() && normal_size_.height())
-+      normal_size_.set_width(GetDefaultSize().width());
-+
-+    gfx::Size new_size;
-+    if (!normal_size_.IsEmpty()) {
-+      new_size = normal_size_;
-+    } else if (!guest_size_.IsEmpty()) {
-+      new_size = guest_size_;
-+    } else {
-+      new_size = GetDefaultSize();
-+    }
-+
-+    bool changed_due_to_auto_resize = false;
-+    if (auto_size_enabled_) {
-+      // Autosize was previously enabled.
-+      rvh->DisableAutoResize(new_size);
-+      changed_due_to_auto_resize = true;
-+    } else {
-+      // Autosize was already disabled.
-+      guest_host_->SizeContents(new_size);
-+    }
-+
-+    UpdateGuestSize(new_size, changed_due_to_auto_resize);
-+  }
-+
-+  auto_size_enabled_ = enable_auto_size;
-+}
-+
-+void WebViewGuestDelegate::ResizeDueToAutoResize(const gfx::Size& new_size) {
-+  UpdateGuestSize(new_size, auto_size_enabled_);
-+}
-+
-+void WebViewGuestDelegate::DidFinishNavigation(
-+    content::NavigationHandle* navigation_handle) {
-+  if (navigation_handle->HasCommitted() && !navigation_handle->IsErrorPage()) {
-+    auto is_main_frame = navigation_handle->IsInMainFrame();
-+    auto url = navigation_handle->GetURL();
-+    api_web_contents_->Emit("load-commit", url, is_main_frame);
-+  }
-+}
-+
-+void WebViewGuestDelegate::DidDetach() {
-+  attached_ = false;
-+  ResetZoomController();
-+}
-+
-+void WebViewGuestDelegate::DidAttach(int guest_proxy_routing_id) {
-+  attached_ = true;
-+  api_web_contents_->Emit("did-attach");
-+>>>>>>> .their
- 
-   ResetZoomController();
- 
-   embedder_zoom_controller_ =
-       WebContentsZoomController::FromWebContents(embedder_web_contents_);
-+<<<<<<< .our
-   embedder_zoom_controller_->AddObserver(this);
-   auto* zoom_controller = api_web_contents_->GetZoomController();
-   zoom_controller->SetEmbedderZoomController(embedder_zoom_controller_);
-@@ -59,6 +170,29 @@
- 
- content::WebContents* WebViewGuestDelegate::GetOwnerWebContents() const {
-   return embedder_web_contents_;
-+=======
-+  auto* zoom_controller = api_web_contents_->GetZoomController();
-+  embedder_zoom_controller_->AddObserver(this);
-+  zoom_controller->SetEmbedderZoomController(embedder_zoom_controller_);
-+}
-+
-+content::WebContents* WebViewGuestDelegate::GetOwnerWebContents() const {
-+  return embedder_web_contents_;
-+}
-+
-+void WebViewGuestDelegate::SetGuestHost(content::GuestHost* guest_host) {
-+  guest_host_ = guest_host;
-+}
-+
-+void WebViewGuestDelegate::WillAttach(
-+    content::WebContents* embedder_web_contents,
-+    int element_instance_id,
-+    bool is_full_page_plugin,
-+    const base::Closure& completion_callback) {
-+  embedder_web_contents_ = embedder_web_contents;
-+  is_full_page_plugin_ = is_full_page_plugin;
-+  completion_callback.Run();
-+>>>>>>> .their
- }
- 
- void WebViewGuestDelegate::OnZoomLevelChanged(
-@@ -77,8 +211,28 @@
-   }
- }
- 
-+<<<<<<< .our
- void WebViewGuestDelegate::OnZoomControllerWebContentsDestroyed() {
-   ResetZoomController();
-+=======
-+void WebViewGuestDelegate::UpdateGuestSize(const gfx::Size& new_size,
-+                                           bool due_to_auto_resize) {
-+  if (due_to_auto_resize)
-+    api_web_contents_->Emit("size-changed", guest_size_.width(),
-+                            guest_size_.height(), new_size.width(),
-+                            new_size.height());
-+  guest_size_ = new_size;
-+}
-+
-+gfx::Size WebViewGuestDelegate::GetDefaultSize() const {
-+  if (is_full_page_plugin_) {
-+    // Full page plugins default to the size of the owner's viewport.
-+    return embedder_web_contents_->GetRenderWidgetHostView()
-+        ->GetVisibleViewportSize();
-+  } else {
-+    return gfx::Size(kDefaultWidth, kDefaultHeight);
-+  }
-+>>>>>>> .their
- }
- 
- void WebViewGuestDelegate::ResetZoomController() {
-@@ -88,6 +242,13 @@
-   }
- }
- 
-+<<<<<<< .our
-+=======
-+bool WebViewGuestDelegate::CanBeEmbeddedInsideCrossProcessFrames() {
-+  return true;
-+}
-+
-+>>>>>>> .their
- content::RenderWidgetHost* WebViewGuestDelegate::GetOwnerRenderWidgetHost() {
-   return embedder_web_contents_->GetRenderViewHost()->GetWidget();
- }
-added in both
-  our    100644 6d9f440588d1d38a869ca6b6a33fd31031091efa atom/browser/web_view_guest_delegate.h
-  their  100644 784ca99275dd97e32b22a68d1bc49a804e48b213 atom/browser/web_view_guest_delegate.h
-@@ -7,6 +7,10 @@
- 
- #include "atom/browser/web_contents_zoom_controller.h"
- #include "content/public/browser/browser_plugin_guest_delegate.h"
-+<<<<<<< .our
-+=======
-+#include "content/public/browser/web_contents_observer.h"
-+>>>>>>> .their
- 
- namespace atom {
- 
-@@ -14,6 +18,7 @@
- class WebContents;
- }
- 
-+<<<<<<< .our
- class WebViewGuestDelegate : public content::BrowserPluginGuestDelegate,
-                              public WebContentsZoomController::Observer {
-  public:
-@@ -33,14 +38,88 @@
-   content::SiteInstance* GetOwnerSiteInstance() final;
-   content::WebContents* CreateNewGuestWindow(
-       const content::WebContents::CreateParams& create_params) final;
-+=======
-+// A struct of parameters for SetSize(). The parameters are all declared as
-+// scoped pointers since they are all optional. Null pointers indicate that the
-+// parameter has not been provided, and the last used value should be used. Note
-+// that when |enable_auto_size| is true, providing |normal_size| is not
-+// meaningful. This is because the normal size of the guestview is overridden
-+// whenever autosizing occurs.
-+struct SetSizeParams {
-+  SetSizeParams();
-+  ~SetSizeParams();
-+
-+  std::unique_ptr<bool> enable_auto_size;
-+  std::unique_ptr<gfx::Size> min_size;
-+  std::unique_ptr<gfx::Size> max_size;
-+  std::unique_ptr<gfx::Size> normal_size;
-+};
-+
-+class WebViewGuestDelegate : public content::BrowserPluginGuestDelegate,
-+                             public content::WebContentsObserver,
-+                             public WebContentsZoomController::Observer {
-+ public:
-+  WebViewGuestDelegate();
-+  ~WebViewGuestDelegate() override;
-+
-+  void Initialize(api::WebContents* api_web_contents);
-+
-+  // Called when the WebContents is going to be destroyed.
-+  void Destroy();
-+
-+  // Used to toggle autosize mode for this GuestView, and set both the automatic
-+  // and normal sizes.
-+  void SetSize(const SetSizeParams& params);
-+
-+  // Invoked when the contents auto-resized and the container should match it.
-+  void ResizeDueToAutoResize(const gfx::Size& new_size);
-+
-+  // Return true if attached.
-+  bool IsAttached() const { return attached_; }
-+
-+ protected:
-+  // content::WebContentsObserver:
-+  void DidFinishNavigation(
-+      content::NavigationHandle* navigation_handle) override;
-+
-+  // content::BrowserPluginGuestDelegate:
-+  void DidAttach(int guest_proxy_routing_id) final;
-+  void DidDetach() final;
-+  content::WebContents* GetOwnerWebContents() const final;
-+  void SetGuestHost(content::GuestHost* guest_host) final;
-+  void WillAttach(content::WebContents* embedder_web_contents,
-+                  int element_instance_id,
-+                  bool is_full_page_plugin,
-+                  const base::Closure& completion_callback) final;
-+  bool CanBeEmbeddedInsideCrossProcessFrames() override;
-+  content::RenderWidgetHost* GetOwnerRenderWidgetHost() override;
-+  content::SiteInstance* GetOwnerSiteInstance() override;
-+  content::WebContents* CreateNewGuestWindow(
-+      const content::WebContents::CreateParams& create_params) override;
-+>>>>>>> .their
- 
-   // WebContentsZoomController::Observer:
-   void OnZoomLevelChanged(content::WebContents* web_contents,
-                           double level,
-                           bool is_temporary) override;
-+<<<<<<< .our
-   void OnZoomControllerWebContentsDestroyed() override;
- 
-  private:
-+=======
-+
-+ private:
-+  // This method is invoked when the contents auto-resized to give the container
-+  // an opportunity to match it if it wishes.
-+  //
-+  // This gives the derived class an opportunity to inform its container element
-+  // or perform other actions.
-+  void UpdateGuestSize(const gfx::Size& new_size, bool due_to_auto_resize);
-+
-+  // Returns the default size of the guestview.
-+  gfx::Size GetDefaultSize() const;
-+
-+>>>>>>> .their
-   void ResetZoomController();
- 
-   // The WebContents that attaches this guest view.
-@@ -50,6 +129,37 @@
-   // to subscribe for zoom changes.
-   WebContentsZoomController* embedder_zoom_controller_ = nullptr;
- 
-+<<<<<<< .our
-+=======
-+  // The size of the container element.
-+  gfx::Size element_size_;
-+
-+  // The size of the guest content. Note: In autosize mode, the container
-+  // element may not match the size of the guest.
-+  gfx::Size guest_size_;
-+
-+  // A pointer to the guest_host.
-+  content::GuestHost* guest_host_ = nullptr;
-+
-+  // Indicates whether autosize mode is enabled or not.
-+  bool auto_size_enabled_ = false;
-+
-+  // The maximum size constraints of the container element in autosize mode.
-+  gfx::Size max_auto_size_;
-+
-+  // The minimum size constraints of the container element in autosize mode.
-+  gfx::Size min_auto_size_;
-+
-+  // The size that will be used when autosize mode is disabled.
-+  gfx::Size normal_size_;
-+
-+  // Whether the guest view is inside a plugin document.
-+  bool is_full_page_plugin_ = false;
-+
-+  // Whether attached.
-+  bool attached_ = false;
-+
-+>>>>>>> .their
-   api::WebContents* api_web_contents_ = nullptr;
- 
-   DISALLOW_COPY_AND_ASSIGN(WebViewGuestDelegate);
-added in both
-  our    100644 09edfdaac9107386241505d2d5763b1b24aa73a4 atom/common/api/atom_api_native_image.cc
-  their  100644 7b274b38cae7e44b0737912e93a7015c64a60895 atom/common/api/atom_api_native_image.cc
-@@ -245,14 +245,23 @@
- 
-   // First try loading the icon with specified size.
-   if (!hicon_path_.empty()) {
-+<<<<<<< .our
-     hicons_[size] = ReadICOFromPath(size, hicon_path_);
-+=======
-+    hicons_[size] = std::move(ReadICOFromPath(size, hicon_path_));
-+>>>>>>> .their
-     return hicons_[size].get();
-   }
- 
-   // Then convert the image to ICO.
-   if (image_.IsEmpty())
-     return NULL;
-+<<<<<<< .our
-   hicons_[size] = IconUtil::CreateHICONFromSkBitmap(image_.AsBitmap());
-+=======
-+  hicons_[size] =
-+      std::move(IconUtil::CreateHICONFromSkBitmap(image_.AsBitmap()));
-+>>>>>>> .their
-   return hicons_[size].get();
- }
- #endif
-added in both
-  our    100644 3dba3d63673ca8eb02044bd1335a3095f0194971 atom/common/api/atom_bindings.cc
-  their  100644 ee02ed3f6a28bcc15407465ae0cc34f71664d9dc atom/common/api/atom_bindings.cc
-@@ -14,7 +14,10 @@
- #include "atom/common/native_mate_converters/string16_converter.h"
- #include "atom/common/node_includes.h"
- #include "base/logging.h"
-+<<<<<<< .our
- #include "base/process/process_info.h"
-+=======
-+>>>>>>> .their
- #include "base/process/process_metrics_iocounters.h"
- #include "base/sys_info.h"
- #include "native_mate/dictionary.h"
-@@ -56,10 +59,16 @@
-   dict.SetMethod("log", &Log);
-   dict.SetMethod("getHeapStatistics", &GetHeapStatistics);
-   dict.SetMethod("getProcessMemoryInfo", &GetProcessMemoryInfo);
-+<<<<<<< .our
-   dict.SetMethod("getCreationTime", &GetCreationTime);
-   dict.SetMethod("getSystemMemoryInfo", &GetSystemMemoryInfo);
-   dict.SetMethod("getCPUUsage", base::Bind(&AtomBindings::GetCPUUsage,
-                                            base::Unretained(metrics_.get())));
-+=======
-+  dict.SetMethod("getSystemMemoryInfo", &GetSystemMemoryInfo);
-+  dict.SetMethod("getCPUUsage", base::Bind(&AtomBindings::GetCPUUsage,
-+                                           base::Unretained(this)));
-+>>>>>>> .their
-   dict.SetMethod("getIOCounters", &GetIOCounters);
- #if defined(OS_POSIX)
-   dict.SetMethod("setFdLimit", &base::SetFdLimit);
-@@ -135,7 +144,10 @@
-   isolate->GetHeapStatistics(&v8_heap_stats);
- 
-   mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
-+<<<<<<< .our
-   dict.SetHidden("simple", true);
-+=======
-+>>>>>>> .their
-   dict.Set("totalHeapSize",
-            static_cast<double>(v8_heap_stats.total_heap_size() >> 10));
-   dict.Set(
-@@ -164,7 +176,10 @@
-   auto metrics = base::ProcessMetrics::CreateCurrentProcessMetrics();
- 
-   mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
-+<<<<<<< .our
-   dict.SetHidden("simple", true);
-+=======
-+>>>>>>> .their
-   dict.Set("workingSetSize",
-            static_cast<double>(metrics->GetWorkingSetSize() >> 10));
-   dict.Set("peakWorkingSetSize",
-@@ -180,6 +195,7 @@
- }
- 
- // static
-+<<<<<<< .our
- v8::Local<v8::Value> AtomBindings::GetCreationTime(v8::Isolate* isolate) {
-   auto timeValue = base::CurrentProcessInfo::CreationTime();
-   if (timeValue.is_null()) {
-@@ -190,6 +206,8 @@
- }
- 
- // static
-+=======
-+>>>>>>> .their
- v8::Local<v8::Value> AtomBindings::GetSystemMemoryInfo(v8::Isolate* isolate,
-                                                        mate::Arguments* args) {
-   base::SystemMemoryInfoKB mem_info;
-@@ -199,7 +217,10 @@
-   }
- 
-   mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
-+<<<<<<< .our
-   dict.SetHidden("simple", true);
-+=======
-+>>>>>>> .their
-   dict.Set("total", mem_info.total);
- 
-   // See Chromium's "base/process/process_metrics.h" for an explanation.
-@@ -220,6 +241,7 @@
-   return dict.GetHandle();
- }
- 
-+<<<<<<< .our
- // static
- v8::Local<v8::Value> AtomBindings::GetCPUUsage(base::ProcessMetrics* metrics,
-                                                v8::Isolate* isolate) {
-@@ -228,11 +250,22 @@
-   int processor_count = base::SysInfo::NumberOfProcessors();
-   dict.Set("percentCPUUsage",
-            metrics->GetPlatformIndependentCPUUsage() / processor_count);
-+=======
-+v8::Local<v8::Value> AtomBindings::GetCPUUsage(v8::Isolate* isolate) {
-+  mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
-+  int processor_count = base::SysInfo::NumberOfProcessors();
-+  dict.Set("percentCPUUsage",
-+           metrics_->GetPlatformIndependentCPUUsage() / processor_count);
-+>>>>>>> .their
- 
-   // NB: This will throw NOTIMPLEMENTED() on Windows
-   // For backwards compatibility, we'll return 0
- #if !defined(OS_WIN)
-+<<<<<<< .our
-   dict.Set("idleWakeupsPerSecond", metrics->GetIdleWakeupsPerSecond());
-+=======
-+  dict.Set("idleWakeupsPerSecond", metrics_->GetIdleWakeupsPerSecond());
-+>>>>>>> .their
- #else
-   dict.Set("idleWakeupsPerSecond", 0);
- #endif
-@@ -245,7 +278,10 @@
-   auto metrics = base::ProcessMetrics::CreateCurrentProcessMetrics();
-   base::IoCounters io_counters;
-   mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
-+<<<<<<< .our
-   dict.SetHidden("simple", true);
-+=======
-+>>>>>>> .their
- 
-   if (metrics->GetIOCounters(&io_counters)) {
-     dict.Set("readOperationCount", io_counters.ReadOperationCount);
-added in both
-  our    100644 ba8385c979b15286fd7647582e7d0aee93e1974e atom/common/api/atom_bindings.h
-  their  100644 46a5f36bdcea9adb76c091b17bbed47a0ba8a2ea atom/common/api/atom_bindings.h
-@@ -37,11 +37,17 @@
-   static void Hang();
-   static v8::Local<v8::Value> GetHeapStatistics(v8::Isolate* isolate);
-   static v8::Local<v8::Value> GetProcessMemoryInfo(v8::Isolate* isolate);
-+<<<<<<< .our
-   static v8::Local<v8::Value> GetCreationTime(v8::Isolate* isolate);
-   static v8::Local<v8::Value> GetSystemMemoryInfo(v8::Isolate* isolate,
-                                                   mate::Arguments* args);
-   static v8::Local<v8::Value> GetCPUUsage(base::ProcessMetrics* metrics,
-                                           v8::Isolate* isolate);
-+=======
-+  static v8::Local<v8::Value> GetSystemMemoryInfo(v8::Isolate* isolate,
-+                                                  mate::Arguments* args);
-+  v8::Local<v8::Value> GetCPUUsage(v8::Isolate* isolate);
-+>>>>>>> .their
-   static v8::Local<v8::Value> GetIOCounters(v8::Isolate* isolate);
- 
-  private:
-added in both
-  our    100644 9b37f94a4dc462c0cc84e0182654ff2571952df9 atom/common/asar/archive.cc
-  their  100644 769efec0a2b0d402428ab10ced26feeb5c6157c5 atom/common/asar/archive.cc
-@@ -221,13 +221,21 @@
-   if (!GetNodeFromPath(path.AsUTF8Unsafe(), header_.get(), &node))
-     return false;
- 
-+<<<<<<< .our
-   if (node->FindKey("link")) {
-+=======
-+  if (node->HasKey("link")) {
-+>>>>>>> .their
-     stats->is_file = false;
-     stats->is_link = true;
-     return true;
-   }
- 
-+<<<<<<< .our
-   if (node->FindKey("files")) {
-+=======
-+  if (node->HasKey("files")) {
-+>>>>>>> .their
-     stats->is_file = false;
-     stats->is_directory = true;
-     return true;
-added in both
-  our    100644 65e7d19911559a40b1b258319df5fe0fa180354f atom/common/atom_version.h
-  their  100644 2c98e7bf0a7a1dcc263da8d63a03aa9f7f4ae1d1 atom/common/atom_version.h
-@@ -5,10 +5,17 @@
- #ifndef ATOM_COMMON_ATOM_VERSION_H_
- #define ATOM_COMMON_ATOM_VERSION_H_
- 
-+<<<<<<< .our
- #define ATOM_MAJOR_VERSION 4
- #define ATOM_MINOR_VERSION 0
- #define ATOM_PATCH_VERSION 0
- #define ATOM_PRE_RELEASE_VERSION -nightly.20180821
-+=======
-+#define ATOM_MAJOR_VERSION 3
-+#define ATOM_MINOR_VERSION 0
-+#define ATOM_PATCH_VERSION 0
-+#define ATOM_PRE_RELEASE_VERSION -beta.4
-+>>>>>>> .their
- 
- #ifndef ATOM_STRINGIFY
- #define ATOM_STRINGIFY(n) ATOM_STRINGIFY_HELPER(n)
-added in both
-  our    100644 89a2a5966d6caf3c13643065ef084e98b69efcaf atom/common/crash_reporter/crash_reporter_win.h
-  their  100644 f7f1c6b28455a52daf0860028df1054788ddde54 atom/common/crash_reporter/crash_reporter_win.h
-@@ -11,7 +11,11 @@
- 
- #include "atom/common/crash_reporter/crash_reporter.h"
- #include "base/compiler_specific.h"
-+<<<<<<< .our
- #include "breakpad/src/client/windows/handler/exception_handler.h"
-+=======
-+#include "vendor/breakpad/src/client/windows/handler/exception_handler.h"
-+>>>>>>> .their
- 
- namespace base {
- template <typename T>
-@@ -40,7 +44,11 @@
-   friend struct base::DefaultSingletonTraits<CrashReporterWin>;
- 
-   CrashReporterWin();
-+<<<<<<< .our
-   ~CrashReporterWin() override;
-+=======
-+  virtual ~CrashReporterWin();
-+>>>>>>> .their
- 
-   static bool FilterCallback(void* context,
-                              EXCEPTION_POINTERS* exinfo,
-@@ -65,9 +73,13 @@
-   google_breakpad::CustomClientInfo custom_info_;
- 
-   bool skip_system_crash_handler_ = false;
-+<<<<<<< .our
- #ifdef _WIN64
-   bool code_range_registered_ = false;
- #endif
-+=======
-+  bool code_range_registered_ = false;
-+>>>>>>> .their
-   std::unique_ptr<google_breakpad::ExceptionHandler> breakpad_;
- 
-   DISALLOW_COPY_AND_ASSIGN(CrashReporterWin);
-added in both
-  our    100644 8b0e3de5cecdda5c97237ebd5d6e0bbbd99a280b atom/common/crash_reporter/linux/crash_dump_handler.cc
-  their  100644 ccc8d0d538e3a23a85f7dc3dd2d2650f6cb88bcd atom/common/crash_reporter/linux/crash_dump_handler.cc
-@@ -15,7 +15,11 @@
- #include "base/posix/eintr_wrapper.h"
- #include "breakpad/src/client/linux/minidump_writer/directory_reader.h"
- #include "breakpad/src/common/linux/linux_libc_support.h"
-+<<<<<<< .our
- #include "breakpad/src/common/memory_allocator.h"
-+=======
-+#include "breakpad/src/common/memory.h"
-+>>>>>>> .their
- 
- #include "third_party/lss/linux_syscall_support.h"
- 
-added in both
-  our    100644 d13111f495be844df10deebacd572560021bbb4e atom/common/crash_reporter/win/crash_service.cc
-  their  100644 a1a6ab6d7908389bdc0a400cf751fde809408115 atom/common/crash_reporter/win/crash_service.cc
-@@ -17,9 +17,15 @@
- #include "base/strings/string_util.h"
- #include "base/time/time.h"
- #include "base/win/windows_version.h"
-+<<<<<<< .our
- #include "breakpad/src/client/windows/crash_generation/client_info.h"
- #include "breakpad/src/client/windows/crash_generation/crash_generation_server.h"
- #include "breakpad/src/client/windows/sender/crash_report_sender.h"
-+=======
-+#include "vendor/breakpad/src/client/windows/crash_generation/client_info.h"
-+#include "vendor/breakpad/src/client/windows/crash_generation/crash_generation_server.h"
-+#include "vendor/breakpad/src/client/windows/sender/crash_report_sender.h"
-+>>>>>>> .their
- 
- namespace breakpad {
- 
-@@ -132,7 +138,11 @@
-   wcx.lpfnWndProc = CrashSvcWndProc;
-   wcx.hInstance = instance;
-   wcx.lpszClassName = class_name.c_str();
-+<<<<<<< .our
-   ::RegisterClassExW(&wcx);
-+=======
-+  ATOM atom = ::RegisterClassExW(&wcx);
-+>>>>>>> .their
-   DWORD style = visible ? WS_POPUPWINDOW | WS_VISIBLE : WS_OVERLAPPED;
- 
-   // The window size is zero but being a popup window still shows in the
-@@ -487,6 +497,10 @@
-   // Build the SDDL string for the label.
-   std::wstring sddl = L"S:(ML;;NW;;;S-1-16-4096)";
- 
-+<<<<<<< .our
-+=======
-+  DWORD error = ERROR_SUCCESS;
-+>>>>>>> .their
-   PSECURITY_DESCRIPTOR sec_desc = NULL;
- 
-   PACL sacl = NULL;
-added in both
-  our    100644 d0a12cb6d91b9688c1bed496e64d6bbaccaf244a atom/common/keyboard_util.cc
-  their  100644 b8caa1f1b00d652a67ecd103e5ce3a78b70c01f4 atom/common/keyboard_util.cc
-@@ -88,108 +88,171 @@
- 
-     case ')':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '0':
-       return ui::VKEY_0;
-     case '!':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '1':
-       return ui::VKEY_1;
-     case '@':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '2':
-       return ui::VKEY_2;
-     case '#':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '3':
-       return ui::VKEY_3;
-     case '$':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '4':
-       return ui::VKEY_4;
-     case '%':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '5':
-       return ui::VKEY_5;
-     case '^':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '6':
-       return ui::VKEY_6;
-     case '&':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '7':
-       return ui::VKEY_7;
-     case '*':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '8':
-       return ui::VKEY_8;
-     case '(':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '9':
-       return ui::VKEY_9;
- 
-     case ':':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case ';':
-       return ui::VKEY_OEM_1;
-     case '+':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '=':
-       return ui::VKEY_OEM_PLUS;
-     case '<':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case ',':
-       return ui::VKEY_OEM_COMMA;
-     case '_':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '-':
-       return ui::VKEY_OEM_MINUS;
-     case '>':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '.':
-       return ui::VKEY_OEM_PERIOD;
-     case '?':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '/':
-       return ui::VKEY_OEM_2;
-     case '~':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '`':
-       return ui::VKEY_OEM_3;
-     case '{':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '[':
-       return ui::VKEY_OEM_4;
-     case '|':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '\\':
-       return ui::VKEY_OEM_5;
-     case '}':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case ']':
-       return ui::VKEY_OEM_6;
-     case '"':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '\'':
-       return ui::VKEY_OEM_7;
- 
-added in both
-  our    100644 2684aa7dda07ac79e47823c3cf9bf00d3f5cf3f5 atom/common/native_mate_converters/content_converter.cc
-  their  100644 46364e21266a93c7c496d87acbf6cc4ff4965194 atom/common/native_mate_converters/content_converter.cc
-@@ -43,12 +43,18 @@
-     case content::MenuItem::CHECKABLE_OPTION:
-     case content::MenuItem::GROUP:
-       v8_item.Set("checked", item.checked);
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case content::MenuItem::OPTION:
-     case content::MenuItem::SUBMENU:
-       v8_item.Set("label", item.label);
-       v8_item.Set("enabled", item.enabled);
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     default:
-       v8_item.Set("type", item.type);
-   }
-added in both
-  our    100644 db54210e7c095da593c6f5b9f4ed1eafb91b945d atom/common/native_mate_converters/net_converter.cc
-  their  100644 d3890bbff79276627528e7ced7eb69ffcf367f43 atom/common/native_mate_converters/net_converter.cc
-@@ -160,7 +160,11 @@
-     std::string value;
-     while (headers->EnumerateHeaderLines(&iter, &key, &value)) {
-       key = base::ToLowerASCII(key);
-+<<<<<<< .our
-       if (response_headers.FindKey(key)) {
-+=======
-+      if (response_headers.HasKey(key)) {
-+>>>>>>> .their
-         base::ListValue* values = nullptr;
-         if (response_headers.GetList(key, &values))
-           values->AppendString(value);
-@@ -239,9 +243,14 @@
-     if (reader->AsBytesReader()) {
-       const net::UploadBytesElementReader* bytes_reader =
-           reader->AsBytesReader();
-+<<<<<<< .our
-       auto bytes = std::make_unique<base::Value>(
-           std::vector<char>(bytes_reader->bytes(),
-                             bytes_reader->bytes() + bytes_reader->length()));
-+=======
-+      std::unique_ptr<base::Value> bytes(base::Value::CreateWithCopiedBuffer(
-+          bytes_reader->bytes(), bytes_reader->length()));
-+>>>>>>> .their
-       upload_data_dict->Set("bytes", std::move(bytes));
-     } else if (reader->AsFileReader()) {
-       const net::UploadFileElementReader* file_reader = reader->AsFileReader();
-added in both
-  our    100644 61a6563a617030684081e4934044865fdc3c6540 atom/common/native_mate_converters/network_converter.cc
-  their  100644 1f98a5b8ebd548f54a8113f186c5344618dcd027 atom/common/native_mate_converters/network_converter.cc
-@@ -6,7 +6,10 @@
- 
- #include <string>
- #include <utility>
-+<<<<<<< .our
- #include <vector>
-+=======
-+>>>>>>> .their
- 
- #include "atom/common/native_mate_converters/value_converter.h"
- #include "native_mate/dictionary.h"
-@@ -26,8 +29,13 @@
-     auto post_data_dict = std::make_unique<base::DictionaryValue>();
-     auto type = element.type();
-     if (type == network::DataElement::TYPE_BYTES) {
-+<<<<<<< .our
-       auto bytes = std::make_unique<base::Value>(std::vector<char>(
-           element.bytes(), element.bytes() + (element.length())));
-+=======
-+      auto bytes = base::Value::CreateWithCopiedBuffer(
-+          element.bytes(), static_cast<size_t>(element.length()));
-+>>>>>>> .their
-       post_data_dict->SetString("type", "rawData");
-       post_data_dict->Set("bytes", std::move(bytes));
-     } else if (type == network::DataElement::TYPE_FILE) {
-added in both
-  our    100644 3fa070771d6843e9428e560c746965b095961e2a atom/common/native_mate_converters/v8_value_converter.cc
-  their  100644 fbc410bdcb7111bf2ee86dbe07538957de486b68 atom/common/native_mate_converters/v8_value_converter.cc
-@@ -8,7 +8,10 @@
- #include <memory>
- #include <string>
- #include <utility>
-+<<<<<<< .our
- #include <vector>
-+=======
-+>>>>>>> .their
- 
- #include "base/logging.h"
- #include "base/values.h"
-@@ -163,22 +166,42 @@
-       return v8::Null(isolate);
- 
-     case base::Value::Type::BOOLEAN: {
-+<<<<<<< .our
-       bool val = value->GetBool();
-+=======
-+      bool val = false;
-+      value->GetAsBoolean(&val);
-+>>>>>>> .their
-       return v8::Boolean::New(isolate, val);
-     }
- 
-     case base::Value::Type::INTEGER: {
-+<<<<<<< .our
-       int val = value->GetInt();
-+=======
-+      int val = 0;
-+      value->GetAsInteger(&val);
-+>>>>>>> .their
-       return v8::Integer::New(isolate, val);
-     }
- 
-     case base::Value::Type::DOUBLE: {
-+<<<<<<< .our
-       double val = value->GetDouble();
-+=======
-+      double val = 0.0;
-+      value->GetAsDouble(&val);
-+>>>>>>> .their
-       return v8::Number::New(isolate, val);
-     }
- 
-     case base::Value::Type::STRING: {
-+<<<<<<< .our
-       std::string val = value->GetString();
-+=======
-+      std::string val;
-+      value->GetAsString(&val);
-+>>>>>>> .their
-       return v8::String::NewFromUtf8(isolate, val.c_str(),
-                                      v8::String::kNormalString, val.length());
-     }
-@@ -342,8 +365,13 @@
-   if (val->IsRegExp()) {
-     if (!reg_exp_allowed_)
-       // JSON.stringify converts to an object.
-+<<<<<<< .our
-       return FromV8Object(val->ToObject(context).ToLocalChecked(), state,
-                           isolate);
-+=======
-+      return FromV8Object(val->ToObject(context).ToLocalChecked(),
-+          state, isolate);
-+>>>>>>> .their
-     return new base::Value(
-         *v8::String::Utf8Value(val->ToString(context).ToLocalChecked()));
-   }
-@@ -356,8 +384,13 @@
-     if (!function_allowed_)
-       // JSON.stringify refuses to convert function(){}.
-       return nullptr;
-+<<<<<<< .our
-     return FromV8Object(val->ToObject(context).ToLocalChecked(), state,
-                         isolate);
-+=======
-+    return FromV8Object(val->ToObject(context).ToLocalChecked(),
-+        state, isolate);
-+>>>>>>> .their
-   }
- 
-   if (node::Buffer::HasInstance(val)) {
-@@ -365,8 +398,13 @@
-   }
- 
-   if (val->IsObject()) {
-+<<<<<<< .our
-     return FromV8Object(val->ToObject(context).ToLocalChecked(), state,
-                         isolate);
-+=======
-+    return FromV8Object(val->ToObject(context).ToLocalChecked(),
-+        state, isolate);
-+>>>>>>> .their
-   }
- 
-   LOG(ERROR) << "Unexpected v8 value type encountered.";
-@@ -415,9 +453,15 @@
- base::Value* V8ValueConverter::FromNodeBuffer(v8::Local<v8::Value> value,
-                                               FromV8ValueState* state,
-                                               v8::Isolate* isolate) const {
-+<<<<<<< .our
-   return new base::Value(std::vector<char>(
-       node::Buffer::Data(value),
-       node::Buffer::Data(value) + node::Buffer::Length(value)));
-+=======
-+  return base::Value::CreateWithCopiedBuffer(node::Buffer::Data(value),
-+                                             node::Buffer::Length(value))
-+      .release();
-+>>>>>>> .their
- }
- 
- base::Value* V8ValueConverter::FromV8Object(v8::Local<v8::Object> val,
-added in both
-  our    100644 a71cc70f83d2526596a75d8daf036f905ca099be atom/common/native_mate_converters/value_converter.cc
-  their  100644 0412a0118f2b5f6e2801f02e6089f9d12214d311 atom/common/native_mate_converters/value_converter.cc
-@@ -30,6 +30,7 @@
-   return converter.ToV8Value(&val, isolate->GetCurrentContext());
- }
- 
-+<<<<<<< .our
- bool Converter<base::Value>::FromV8(v8::Isolate* isolate,
-                                     v8::Local<v8::Value> val,
-                                     base::Value* out) {
-@@ -50,6 +51,8 @@
-   return converter.ToV8Value(&val, isolate->GetCurrentContext());
- }
- 
-+=======
-+>>>>>>> .their
- bool Converter<base::ListValue>::FromV8(v8::Isolate* isolate,
-                                         v8::Local<v8::Value> val,
-                                         base::ListValue* out) {
-added in both
-  our    100644 b2ea5def0aa9646791c635c15e0ed504dc0af465 atom/common/native_mate_converters/value_converter.h
-  their  100644 a53b2724b0883ab343f6262f7e506deb39e5b34d atom/common/native_mate_converters/value_converter.h
-@@ -10,7 +10,10 @@
- namespace base {
- class DictionaryValue;
- class ListValue;
-+<<<<<<< .our
- class Value;
-+=======
-+>>>>>>> .their
- }  // namespace base
- 
- namespace mate {
-@@ -25,6 +28,7 @@
- };
- 
- template <>
-+<<<<<<< .our
- struct Converter<base::Value> {
-   static bool FromV8(v8::Isolate* isolate,
-                      v8::Local<v8::Value> val,
-@@ -34,6 +38,8 @@
- };
- 
- template <>
-+=======
-+>>>>>>> .their
- struct Converter<base::ListValue> {
-   static bool FromV8(v8::Isolate* isolate,
-                      v8::Local<v8::Value> val,
-added in both
-  our    100644 e6aded2e661af919c2d89c2f9bd46b4921d4aec4 atom/common/node_bindings.cc
-  their  100644 a26747cf03c85a7ada7e84a2bda860791a4d73e2 atom/common/node_bindings.cc
-@@ -15,6 +15,10 @@
- #include "base/base_paths.h"
- #include "base/command_line.h"
- #include "base/environment.h"
-+<<<<<<< .our
-+=======
-+#include "base/files/file_path.h"
-+>>>>>>> .their
- #include "base/path_service.h"
- #include "base/run_loop.h"
- #include "base/strings/utf_string_conversions.h"
-@@ -194,10 +198,13 @@
-   return g_is_initialized;
- }
- 
-+<<<<<<< .our
- base::FilePath::StringType NodeBindings::GetHelperResourcesPath() {
-   return GetResourcesPath(false).value();
- }
- 
-+=======
-+>>>>>>> .their
- void NodeBindings::Initialize() {
-   // Open node's error reporting system for browser process.
-   node::g_standalone_mode = browser_env_ == BROWSER;
-added in both
-  our    100644 5e5ec8e5300ba2c1917e3e9d7e2e8ea1ee341e3b atom/common/node_bindings.h
-  their  100644 7c8cad46cc6927de6746ea65b7db536245baad20 atom/common/node_bindings.h
-@@ -5,7 +5,10 @@
- #ifndef ATOM_COMMON_NODE_BINDINGS_H_
- #define ATOM_COMMON_NODE_BINDINGS_H_
- 
-+<<<<<<< .our
- #include "base/files/file_path.h"
-+=======
-+>>>>>>> .their
- #include "base/macros.h"
- #include "base/memory/weak_ptr.h"
- #include "base/single_thread_task_runner.h"
-@@ -34,7 +37,10 @@
-   static NodeBindings* Create(BrowserEnvironment browser_env);
-   static void RegisterBuiltinModules();
-   static bool IsInitialized();
-+<<<<<<< .our
-   static base::FilePath::StringType GetHelperResourcesPath();
-+=======
-+>>>>>>> .their
- 
-   virtual ~NodeBindings();
- 
-added in both
-  our    100644 e41fb585f57114de00376f52e0d97277e6eca94b atom/common/node_bindings_win.cc
-  their  100644 4a5ff5c51406d0b051f6d790b111a3477da561bf atom/common/node_bindings_win.cc
-@@ -8,6 +8,13 @@
- 
- #include "base/logging.h"
- 
-+<<<<<<< .our
-+=======
-+extern "C" {
-+#include "vendor/node/deps/uv/src/win/internal.h"
-+}
-+
-+>>>>>>> .their
- namespace atom {
- 
- NodeBindingsWin::NodeBindingsWin(BrowserEnvironment browser_env)
-added in both
-  our    100644 77fe5f43b54c8d53bfc5a4a29c9c0a6f62bea423 atom/common/node_bindings_win.h
-  their  100644 793586d88da8a40c86a322bef383f118404d2480 atom/common/node_bindings_win.h
-@@ -13,7 +13,11 @@
- class NodeBindingsWin : public NodeBindings {
-  public:
-   explicit NodeBindingsWin(BrowserEnvironment browser_env);
-+<<<<<<< .our
-   ~NodeBindingsWin() override;
-+=======
-+  virtual ~NodeBindingsWin();
-+>>>>>>> .their
- 
-  private:
-   void PollEvents() override;
-added in both
-  our    100644 fa1a7499a8b082fe9007f04041b46e58502b3ad9 atom/common/node_includes.h
-  their  100644 edd4812e01c29f9307a21b59db876106ae8fc8ec atom/common/node_includes.h
-@@ -9,9 +9,13 @@
- 
- // Include common headers for using node APIs.
- 
-+<<<<<<< .our
- #ifdef NODE_SHARED_MODE
- #define BUILDING_NODE_EXTENSION
- #endif
-+=======
-+#define BUILDING_NODE_EXTENSION
-+>>>>>>> .their
- 
- // The following define makes sure that we do not include the macros
- // again. But we still need the tracing functions, so declaring them.
-added in both
-  our    100644 8b1836f80c583e4db68971ff1b00ca4f86356b45 atom/common/options_switches.cc
-  their  100644 f85d1a97c177b5458cca5bab2ba6b2f05c2c9337 atom/common/options_switches.cc
-@@ -118,6 +118,10 @@
- 
- // Web runtime features.
- const char kExperimentalFeatures[] = "experimentalFeatures";
-+<<<<<<< .our
-+=======
-+const char kExperimentalCanvasFeatures[] = "experimentalCanvasFeatures";
-+>>>>>>> .their
- 
- // Opener window's ID.
- const char kOpenerID[] = "openerId";
-@@ -188,9 +192,19 @@
- // The application path
- const char kAppPath[] = "app-path";
- 
-+<<<<<<< .our
- // The command line switch versions of the options.
- const char kBackgroundColor[] = "background-color";
- const char kPreloadScript[] = "preload";
-+=======
-+// The context ID for this process
-+const char kContextId[] = "context-id";
-+
-+// The command line switch versions of the options.
-+const char kBackgroundColor[] = "background-color";
-+const char kPreloadScript[] = "preload";
-+const char kPreloadURL[] = "preload-url";
-+>>>>>>> .their
- const char kPreloadScripts[] = "preload-scripts";
- const char kNodeIntegration[] = "node-integration";
- const char kContextIsolation[] = "context-isolation";
-@@ -210,12 +224,15 @@
- // Widevine CDM version.
- const char kWidevineCdmVersion[] = "widevine-cdm-version";
- 
-+<<<<<<< .our
- // Forces the maximum disk space to be used by the disk cache, in bytes.
- const char kDiskCacheSize[] = "disk-cache-size";
- 
- // Ignore the limit of 6 connections per host.
- const char kIgnoreConnectionsLimit[] = "ignore-connections-limit";
- 
-+=======
-+>>>>>>> .their
- }  // namespace switches
- 
- }  // namespace atom
-added in both
-  our    100644 5f6d7e9d38120668ed06922ced2f8d6a6e27a52b atom/common/options_switches.h
-  their  100644 fa8e7e8c42999063122001969a7fccb2e5de6182 atom/common/options_switches.h
-@@ -61,6 +61,10 @@
- extern const char kContextIsolation[];
- extern const char kGuestInstanceID[];
- extern const char kExperimentalFeatures[];
-+<<<<<<< .our
-+=======
-+extern const char kExperimentalCanvasFeatures[];
-+>>>>>>> .their
- extern const char kOpenerID[];
- extern const char kScrollBounce[];
- extern const char kEnableBlinkFeatures[];
-@@ -92,9 +96,17 @@
- extern const char kSecureSchemes[];
- extern const char kAppUserModelId[];
- extern const char kAppPath[];
-+<<<<<<< .our
- 
- extern const char kBackgroundColor[];
- extern const char kPreloadScript[];
-+=======
-+extern const char kContextId[];
-+
-+extern const char kBackgroundColor[];
-+extern const char kPreloadScript[];
-+extern const char kPreloadURL[];
-+>>>>>>> .their
- extern const char kPreloadScripts[];
- extern const char kNodeIntegration[];
- extern const char kContextIsolation[];
-@@ -109,9 +121,12 @@
- extern const char kWidevineCdmPath[];
- extern const char kWidevineCdmVersion[];
- 
-+<<<<<<< .our
- extern const char kDiskCacheSize[];
- extern const char kIgnoreConnectionsLimit[];
- 
-+=======
-+>>>>>>> .their
- }  // namespace switches
- 
- }  // namespace atom
-added in both
-  our    100644 34576be95f2552aaa985dacb3f36406dfc29d54c atom/common/platform_util_win.cc
-  their  100644 193e2ece0042367113ee23512b5b3ee6d4785fca atom/common/platform_util_win.cc
-@@ -31,12 +31,32 @@
- 
- namespace {
- 
-+<<<<<<< .our
-+=======
-+// Old ShellExecute crashes the process when the command for a given scheme
-+// is empty. This function tells if it is.
-+bool ValidateShellCommandForScheme(const std::string& scheme) {
-+  base::win::RegKey key;
-+  base::string16 registry_path =
-+      base::ASCIIToUTF16(scheme) + L"\\shell\\open\\command";
-+  key.Open(HKEY_CLASSES_ROOT, registry_path.c_str(), KEY_READ);
-+  if (!key.Valid())
-+    return false;
-+  DWORD size = 0;
-+  key.ReadValue(NULL, NULL, &size, NULL);
-+  if (size <= 2)
-+    return false;
-+  return true;
-+}
-+
-+>>>>>>> .their
- // Required COM implementation of IFileOperationProgressSink so we can
- // precheck files before deletion to make sure they can be move to the
- // Recycle Bin.
- class DeleteFileProgressSink : public IFileOperationProgressSink {
-  public:
-   DeleteFileProgressSink();
-+<<<<<<< .our
-   virtual ~DeleteFileProgressSink() = default;
- 
-  private:
-@@ -75,17 +95,55 @@
-                                            HRESULT,
-                                            IShellItem*) override;
-   HRESULT STDMETHODCALLTYPE PreNewItem(DWORD, IShellItem*, LPCWSTR) override;
-+=======
-+
-+ private:
-+  ULONG STDMETHODCALLTYPE AddRef(void);
-+  ULONG STDMETHODCALLTYPE Release(void);
-+  HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, LPVOID* ppvObj);
-+  HRESULT STDMETHODCALLTYPE StartOperations(void);
-+  HRESULT STDMETHODCALLTYPE FinishOperations(HRESULT);
-+  HRESULT STDMETHODCALLTYPE PreRenameItem(DWORD, IShellItem*, LPCWSTR);
-+  HRESULT STDMETHODCALLTYPE
-+  PostRenameItem(DWORD, IShellItem*, LPCWSTR, HRESULT, IShellItem*);
-+  HRESULT STDMETHODCALLTYPE PreMoveItem(DWORD,
-+                                        IShellItem*,
-+                                        IShellItem*,
-+                                        LPCWSTR);
-+  HRESULT STDMETHODCALLTYPE
-+  PostMoveItem(DWORD, IShellItem*, IShellItem*, LPCWSTR, HRESULT, IShellItem*);
-+  HRESULT STDMETHODCALLTYPE PreCopyItem(DWORD,
-+                                        IShellItem*,
-+                                        IShellItem*,
-+                                        LPCWSTR);
-+  HRESULT STDMETHODCALLTYPE
-+  PostCopyItem(DWORD, IShellItem*, IShellItem*, LPCWSTR, HRESULT, IShellItem*);
-+  HRESULT STDMETHODCALLTYPE PreDeleteItem(DWORD, IShellItem*);
-+  HRESULT STDMETHODCALLTYPE PostDeleteItem(DWORD,
-+                                           IShellItem*,
-+                                           HRESULT,
-+                                           IShellItem*);
-+  HRESULT STDMETHODCALLTYPE PreNewItem(DWORD, IShellItem*, LPCWSTR);
-+>>>>>>> .their
-   HRESULT STDMETHODCALLTYPE PostNewItem(DWORD,
-                                         IShellItem*,
-                                         LPCWSTR,
-                                         LPCWSTR,
-                                         DWORD,
-                                         HRESULT,
-+<<<<<<< .our
-                                         IShellItem*) override;
-   HRESULT STDMETHODCALLTYPE UpdateProgress(UINT, UINT) override;
-   HRESULT STDMETHODCALLTYPE ResetTimer(void) override;
-   HRESULT STDMETHODCALLTYPE PauseTimer(void) override;
-   HRESULT STDMETHODCALLTYPE ResumeTimer(void) override;
-+=======
-+                                        IShellItem*);
-+  HRESULT STDMETHODCALLTYPE UpdateProgress(UINT, UINT);
-+  HRESULT STDMETHODCALLTYPE ResetTimer(void);
-+  HRESULT STDMETHODCALLTYPE PauseTimer(void);
-+  HRESULT STDMETHODCALLTYPE ResumeTimer(void);
-+>>>>>>> .their
- 
-   ULONG m_cRef;
- };
-@@ -240,6 +298,36 @@
-   if (dir.empty())
-     return false;
- 
-+<<<<<<< .our
-+=======
-+  typedef HRESULT(WINAPI * SHOpenFolderAndSelectItemsFuncPtr)(
-+      PCIDLIST_ABSOLUTE pidl_Folder, UINT cidl, PCUITEMID_CHILD_ARRAY pidls,
-+      DWORD flags);
-+
-+  static SHOpenFolderAndSelectItemsFuncPtr open_folder_and_select_itemsPtr =
-+      NULL;
-+  static bool initialize_open_folder_proc = true;
-+  if (initialize_open_folder_proc) {
-+    initialize_open_folder_proc = false;
-+    // The SHOpenFolderAndSelectItems API is exposed by shell32 version 6
-+    // and does not exist in Win2K. We attempt to retrieve this function export
-+    // from shell32 and if it does not exist, we just invoke ShellExecute to
-+    // open the folder thus losing the functionality to select the item in
-+    // the process.
-+    HMODULE shell32_base = GetModuleHandle(L"shell32.dll");
-+    if (!shell32_base) {
-+      NOTREACHED() << " " << __FUNCTION__ << "(): Can't open shell32.dll";
-+      return false;
-+    }
-+    open_folder_and_select_itemsPtr =
-+        reinterpret_cast<SHOpenFolderAndSelectItemsFuncPtr>(
-+            GetProcAddress(shell32_base, "SHOpenFolderAndSelectItems"));
-+  }
-+  if (!open_folder_and_select_itemsPtr) {
-+    return ui::win::OpenFolderViaShell(dir);
-+  }
-+
-+>>>>>>> .their
-   Microsoft::WRL::ComPtr<IShellFolder> desktop;
-   HRESULT hr = SHGetDesktopFolder(desktop.GetAddressOf());
-   if (FAILED(hr))
-@@ -263,8 +351,13 @@
- 
-   const ITEMIDLIST* highlight[] = {file_item};
- 
-+<<<<<<< .our
-   hr = SHOpenFolderAndSelectItems(dir_item, arraysize(highlight), highlight,
-                                   NULL);
-+=======
-+  hr = (*open_folder_and_select_itemsPtr)(dir_item, arraysize(highlight),
-+                                          highlight, NULL);
-+>>>>>>> .their
-   if (!FAILED(hr))
-     return true;
- 
-@@ -275,8 +368,14 @@
-     return ui::win::OpenFolderViaShell(dir);
-   } else {
-     LPTSTR message = NULL;
-+<<<<<<< .our
-     FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
-                   0, hr, 0, reinterpret_cast<LPTSTR>(&message), 0, NULL);
-+=======
-+    DWORD message_length = FormatMessage(
-+        FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, 0, hr, 0,
-+        reinterpret_cast<LPTSTR>(&message), 0, NULL);
-+>>>>>>> .their
-     LOG(WARNING) << " " << __FUNCTION__ << "(): Can't open full_path = \""
-                  << full_path.value() << "\""
-                  << " hr = " << hr << " " << reinterpret_cast<LPTSTR>(&message);
-added in both
-  our    100644 f0f7ef249d73876f7107d3d3865e8fc71ee33945 atom/renderer/api/atom_api_web_frame.cc
-  their  100644 68bb084a2fc7d7dc1728473397a4a4dcf73ad273 atom/renderer/api/atom_api_web_frame.cc
-@@ -13,7 +13,10 @@
- #include "atom/renderer/api/atom_api_spell_check_client.h"
- #include "base/memory/memory_pressure_listener.h"
- #include "content/public/renderer/render_frame.h"
-+<<<<<<< .our
- #include "content/public/renderer/render_frame_observer.h"
-+=======
-+>>>>>>> .their
- #include "content/public/renderer/render_frame_visitor.h"
- #include "content/public/renderer/render_view.h"
- #include "native_mate/dictionary.h"
-@@ -63,6 +66,7 @@
- 
- namespace {
- 
-+<<<<<<< .our
- content::RenderFrame* GetRenderFrame(v8::Local<v8::Value> value) {
-   v8::Local<v8::Context> context =
-       v8::Local<v8::Object>::Cast(value)->CreationContext();
-@@ -86,6 +90,8 @@
-   void OnDestruct() final {}
- };
- 
-+=======
-+>>>>>>> .their
- class ScriptExecutionCallback : public blink::WebScriptExecutionCallback {
-  public:
-   using CompletionCallback =
-@@ -194,6 +200,7 @@
-       blink::WebString::FromUTF16(name), options);
- }
- 
-+<<<<<<< .our
- int WebFrame::GetWebFrameId(v8::Local<v8::Value> content_window) {
-   // Get the WebLocalFrame before (possibly) executing any user-space JS while
-   // getting the |params|. We track the status of the RenderFrame via an
-@@ -211,6 +218,22 @@
-   DCHECK(parent_frame->IsWebLocalFrame());
- 
-   return render_frame->GetRoutingID();
-+=======
-+void WebFrame::RegisterElementResizeCallback(
-+    int element_instance_id,
-+    const GuestViewContainer::ResizeCallback& callback) {
-+  auto* guest_view_container = GuestViewContainer::FromID(element_instance_id);
-+  if (guest_view_container)
-+    guest_view_container->RegisterElementResizeCallback(callback);
-+}
-+
-+void WebFrame::AttachGuest(int id) {
-+  content::RenderFrame::FromWebFrame(web_frame_)->AttachGuest(id);
-+}
-+
-+void WebFrame::DetachGuest(int id) {
-+  content::RenderFrame::FromWebFrame(web_frame_)->DetachGuest(id);
-+>>>>>>> .their
- }
- 
- void WebFrame::SetSpellCheckProvider(mate::Arguments* args,
-@@ -491,7 +514,14 @@
-                  &WebFrame::SetLayoutZoomLevelLimits)
-       .SetMethod("registerEmbedderCustomElement",
-                  &WebFrame::RegisterEmbedderCustomElement)
-+<<<<<<< .our
-       .SetMethod("getWebFrameId", &WebFrame::GetWebFrameId)
-+=======
-+      .SetMethod("registerElementResizeCallback",
-+                 &WebFrame::RegisterElementResizeCallback)
-+      .SetMethod("attachGuest", &WebFrame::AttachGuest)
-+      .SetMethod("detachGuest", &WebFrame::DetachGuest)
-+>>>>>>> .their
-       .SetMethod("setSpellCheckProvider", &WebFrame::SetSpellCheckProvider)
-       .SetMethod("registerURLSchemeAsBypassingCSP",
-                  &WebFrame::RegisterURLSchemeAsBypassingCSP)
-added in both
-  our    100644 4cc6386abcb41cfa29fdc002f6fb267329bb112d atom/renderer/api/atom_api_web_frame.h
-  their  100644 3c28b19ff754140fc83f43bc2e1f8fdc76b39153 atom/renderer/api/atom_api_web_frame.h
-@@ -9,6 +9,10 @@
- #include <string>
- #include <vector>
- 
-+<<<<<<< .our
-+=======
-+#include "atom/renderer/guest_view_container.h"
-+>>>>>>> .their
- #include "native_mate/handle.h"
- #include "native_mate/wrappable.h"
- #include "third_party/WebKit/public/platform/WebCache.h"
-@@ -53,7 +57,15 @@
-   v8::Local<v8::Value> RegisterEmbedderCustomElement(
-       const base::string16& name,
-       v8::Local<v8::Object> options);
-+<<<<<<< .our
-   int GetWebFrameId(v8::Local<v8::Value> content_window);
-+=======
-+  void RegisterElementResizeCallback(
-+      int element_instance_id,
-+      const GuestViewContainer::ResizeCallback& callback);
-+  void AttachGuest(int element_instance_id);
-+  void DetachGuest(int element_instance_id);
-+>>>>>>> .their
- 
-   // Set the provider that will be used by SpellCheckClient for spell check.
-   void SetSpellCheckProvider(mate::Arguments* args,
-added in both
-  our    100644 6e29fe45a69f44856d7fca449ec1be4eaf6970a2 atom/renderer/atom_sandboxed_renderer_client.cc
-  their  100644 90bed16db1b9f5dac547f80385176ef4cd89e1c9 atom/renderer/atom_sandboxed_renderer_client.cc
-@@ -16,7 +16,10 @@
- #include "base/command_line.h"
- #include "base/files/file_path.h"
- #include "base/path_service.h"
-+<<<<<<< .our
- #include "base/process/process_handle.h"
-+=======
-+>>>>>>> .their
- #include "chrome/renderer/printing/print_web_view_helper.h"
- #include "content/public/renderer/render_frame.h"
- #include "native_mate/dictionary.h"
-@@ -90,11 +93,32 @@
-   return path.value();
- }
- 
-+<<<<<<< .our
- v8::Local<v8::Value> CreatePreloadScript(v8::Isolate* isolate,
-                                          v8::Local<v8::String> preloadSrc) {
-   auto script = v8::Script::Compile(preloadSrc);
-   auto func = script->Run();
-   return func;
-+=======
-+void InitializeBindings(v8::Local<v8::Object> binding,
-+                        v8::Local<v8::Context> context) {
-+  auto* isolate = context->GetIsolate();
-+  mate::Dictionary b(isolate, binding);
-+  b.SetMethod("get", GetBinding);
-+  b.SetMethod("crash", AtomBindings::Crash);
-+  b.SetMethod("hang", AtomBindings::Hang);
-+  b.SetMethod("getArgv", GetArgv);
-+  b.SetMethod("getExecPath", GetExecPath);
-+  b.SetMethod("getHeapStatistics", &AtomBindings::GetHeapStatistics);
-+  b.SetMethod("getProcessMemoryInfo", &AtomBindings::GetProcessMemoryInfo);
-+  b.SetMethod("getSystemMemoryInfo", &AtomBindings::GetSystemMemoryInfo);
-+
-+  // Pass in CLI flags needed to setup the renderer
-+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-+  if (command_line->HasSwitch(switches::kGuestInstanceID))
-+    b.Set(options::kGuestInstanceID,
-+          command_line->GetSwitchValueASCII(switches::kGuestInstanceID));
-+>>>>>>> .their
- }
- 
- class AtomSandboxedRenderFrameObserver : public AtomRenderFrameObserver {
-@@ -132,11 +156,15 @@
- AtomSandboxedRendererClient::AtomSandboxedRendererClient() {
-   // Explicitly register electron's builtin modules.
-   NodeBindings::RegisterBuiltinModules();
-+<<<<<<< .our
-   metrics_ = base::ProcessMetrics::CreateCurrentProcessMetrics();
-+=======
-+>>>>>>> .their
- }
- 
- AtomSandboxedRendererClient::~AtomSandboxedRendererClient() {}
- 
-+<<<<<<< .our
- void AtomSandboxedRendererClient::InitializeBindings(
-     v8::Local<v8::Object> binding,
-     v8::Local<v8::Context> context) {
-@@ -164,6 +192,8 @@
-           command_line->GetSwitchValueASCII(switches::kGuestInstanceID));
- }
- 
-+=======
-+>>>>>>> .their
- void AtomSandboxedRendererClient::RenderFrameCreated(
-     content::RenderFrame* render_frame) {
-   new AtomSandboxedRenderFrameObserver(render_frame, this);
-@@ -185,12 +215,23 @@
-   if (!render_frame->IsMainFrame() && !IsDevTools(render_frame))
-     return;
- 
-+<<<<<<< .our
-+=======
-+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-+  base::FilePath preload_script_path =
-+      command_line->GetSwitchValuePath(switches::kPreloadScript);
-+
-+>>>>>>> .their
-   auto* isolate = context->GetIsolate();
-   v8::HandleScope handle_scope(isolate);
-   v8::Context::Scope context_scope(context);
-   // Wrap the bundle into a function that receives the binding object and the
-   // preload script path as arguments.
-+<<<<<<< .our
-   std::string left = "(function(binding, require) {\n";
-+=======
-+  std::string left = "(function(binding, preloadPath, require) {\n";
-+>>>>>>> .their
-   std::string right = "\n})";
-   // Compile the wrapper and run it to get the function object
-   auto script = v8::Script::Compile(v8::String::Concat(
-@@ -203,10 +244,17 @@
-   auto binding = v8::Object::New(isolate);
-   InitializeBindings(binding, context);
-   AddRenderBindings(isolate, binding);
-+<<<<<<< .our
-   v8::Local<v8::Value> args[] = {binding};
-   // Execute the function with proper arguments
-   ignore_result(
-       func->Call(context, v8::Null(isolate), node::arraysize(args), args));
-+=======
-+  v8::Local<v8::Value> args[] = {
-+      binding, mate::ConvertToV8(isolate, preload_script_path.value())};
-+  // Execute the function with proper arguments
-+  ignore_result(func->Call(context, v8::Null(isolate), 2, args));
-+>>>>>>> .their
- }
- 
- void AtomSandboxedRendererClient::WillReleaseScriptContext(
-added in both
-  our    100644 4afef42dfd43d9e177d93a3c49b115c34f7e2e6a atom/renderer/atom_sandboxed_renderer_client.h
-  their  100644 1ebf4429794f47996c8f92f66b1c5b0295365b06 atom/renderer/atom_sandboxed_renderer_client.h
-@@ -8,7 +8,10 @@
- #include <vector>
- 
- #include "atom/renderer/renderer_client_base.h"
-+<<<<<<< .our
- #include "base/process/process_metrics.h"
-+=======
-+>>>>>>> .their
- 
- namespace atom {
- 
-@@ -17,8 +20,11 @@
-   AtomSandboxedRendererClient();
-   ~AtomSandboxedRendererClient() override;
- 
-+<<<<<<< .our
-   void InitializeBindings(v8::Local<v8::Object> binding,
-                           v8::Local<v8::Context> context);
-+=======
-+>>>>>>> .their
-   void InvokeIpcCallback(v8::Handle<v8::Context> context,
-                          const std::string& callback_name,
-                          std::vector<v8::Handle<v8::Value>> args);
-@@ -33,8 +39,11 @@
-   void RenderViewCreated(content::RenderView*) override;
- 
-  private:
-+<<<<<<< .our
-   std::unique_ptr<base::ProcessMetrics> metrics_;
- 
-+=======
-+>>>>>>> .their
-   DISALLOW_COPY_AND_ASSIGN(AtomSandboxedRendererClient);
- };
- 
-added in both
-  our    100644 3c591201532e4510010f5bc895da3c16780d08d9 atom/renderer/preferences_manager.cc
-  their  100644 2c6540cd5f40b7244e70a55f9c146571ec91e4a1 atom/renderer/preferences_manager.cc
-@@ -26,9 +26,13 @@
- 
- void PreferencesManager::OnUpdatePreferences(
-     const base::ListValue& preferences) {
-+<<<<<<< .our
-   auto copy =
-       base::ListValue::From(base::Value::ToUniquePtrValue(preferences.Clone()));
-   preferences_.swap(copy);
-+=======
-+  preferences_ = preferences.CreateDeepCopy();
-+>>>>>>> .their
- }
- 
- }  // namespace atom
-added in both
-  our    100644 69490420ef5b8f87e7cb8fd97ebd5ec4509fa1ae atom/renderer/renderer_client_base.cc
-  their  100644 6ec8b892ac91c9083576493d8b0f1f3d02b5b3e9 atom/renderer/renderer_client_base.cc
-@@ -14,16 +14,27 @@
- #include "atom/renderer/atom_render_frame_observer.h"
- #include "atom/renderer/atom_render_view_observer.h"
- #include "atom/renderer/content_settings_observer.h"
-+<<<<<<< .our
-+=======
-+#include "atom/renderer/guest_view_container.h"
-+>>>>>>> .their
- #include "atom/renderer/preferences_manager.h"
- #include "base/command_line.h"
- #include "base/process/process_handle.h"
- #include "base/strings/string_split.h"
- #include "base/strings/stringprintf.h"
- #include "chrome/renderer/media/chrome_key_systems.h"
-+<<<<<<< .our
- #include "chrome/renderer/printing/print_web_view_helper.h"
- #include "chrome/renderer/tts_dispatcher.h"
- #include "content/public/common/content_constants.h"
- #include "content/public/renderer/render_frame.h"
-+=======
-+#include "chrome/renderer/pepper/pepper_helper.h"
-+#include "chrome/renderer/printing/print_web_view_helper.h"
-+#include "chrome/renderer/tts_dispatcher.h"
-+#include "content/public/common/content_constants.h"
-+>>>>>>> .their
- #include "content/public/renderer/render_view.h"
- #include "native_mate/dictionary.h"
- #include "third_party/WebKit/Source/platform/weborigin/SchemeRegistry.h"
-@@ -46,10 +57,13 @@
- #include "atom/common/atom_constants.h"
- #endif  // defined(ENABLE_PDF_VIEWER)
- 
-+<<<<<<< .our
- #if defined(ENABLE_PEPPER_FLASH)
- #include "chrome/renderer/pepper/pepper_helper.h"
- #endif  // defined(ENABLE_PEPPER_FLASH)
- 
-+=======
-+>>>>>>> .their
- // This is defined in later versions of Chromium, remove this if you see
- // compiler complaining duplicate defines.
- #if defined(OS_WIN) || defined(OS_FUCHSIA)
-@@ -95,7 +109,11 @@
- void RendererClientBase::DidCreateScriptContext(
-     v8::Handle<v8::Context> context,
-     content::RenderFrame* render_frame) {
-+<<<<<<< .our
-   // global.setHidden("contextId", `${processId}-${++next_context_id_}`)
-+=======
-+  // global.setHidden("contextId", `${processId}-${++nextContextId}`)
-+>>>>>>> .their
-   std::string context_id = base::StringPrintf(
-       "%" CrPRIdPid "-%d", base::GetCurrentProcId(), ++next_context_id_);
-   v8::Isolate* isolate = context->GetIsolate();
-@@ -164,9 +182,13 @@
- #if defined(TOOLKIT_VIEWS)
-   new AutofillAgent(render_frame);
- #endif
-+<<<<<<< .our
- #if defined(ENABLE_PEPPER_FLASH)
-   new PepperHelper(render_frame);
- #endif
-+=======
-+  new PepperHelper(render_frame);
-+>>>>>>> .their
-   new ContentSettingsObserver(render_frame);
-   new printing::PrintWebViewHelper(render_frame);
- 
-@@ -224,6 +246,20 @@
-   return true;
- }
- 
-+<<<<<<< .our
-+=======
-+content::BrowserPluginDelegate* RendererClientBase::CreateBrowserPluginDelegate(
-+    content::RenderFrame* render_frame,
-+    const std::string& mime_type,
-+    const GURL& original_url) {
-+  if (mime_type == content::kBrowserPluginMimeType) {
-+    return new GuestViewContainer(render_frame);
-+  } else {
-+    return nullptr;
-+  }
-+}
-+
-+>>>>>>> .their
- void RendererClientBase::AddSupportedKeySystems(
-     std::vector<std::unique_ptr<::media::KeySystemProperties>>* key_systems) {
-   AddChromeKeySystems(key_systems);
-added in both
-  our    100644 f04be0a0fb555fce88aa006c6c6623cc8730d4ed atom/renderer/renderer_client_base.h
-  their  100644 2b13f8b038cb0cfe7198a010685bf1b4ad8af208 atom/renderer/renderer_client_base.h
-@@ -46,6 +46,13 @@
-   bool OverrideCreatePlugin(content::RenderFrame* render_frame,
-                             const blink::WebPluginParams& params,
-                             blink::WebPlugin** plugin) override;
-+<<<<<<< .our
-+=======
-+  content::BrowserPluginDelegate* CreateBrowserPluginDelegate(
-+      content::RenderFrame* render_frame,
-+      const std::string& mime_type,
-+      const GURL& original_url) override;
-+>>>>>>> .their
-   void AddSupportedKeySystems(
-       std::vector<std::unique_ptr<::media::KeySystemProperties>>* key_systems)
-       override;
-added in both
-  our    100644 166c01b8686498ecb9cb1929e872309441eeaf36 brightray/BUILD.gn
-  their  100644 c2185726abdf17d7c24010a0b076b7e33496f2ad brightray/BUILD.gn
-@@ -1,14 +1,48 @@
- import("//build/config/ui.gni")
- 
-+<<<<<<< .our
- filenames_gypi = exec_script("//build/gypi_to_gn.py",
-                              [ rebase_path("filenames.gypi") ],
-                              "scope",
-                              [ "filenames.gypi" ])
-+=======
-+filenames_gypi = exec_script(
-+  "//build/gypi_to_gn.py",
-+  [ rebase_path("filenames.gypi") ],
-+  "scope",
-+  [ "filenames.gypi" ]
-+)
-+
-+
-+if (is_linux) {
-+  # TODO: Experiment with using //tools/generate_library_loader for generating
-+  # the libnotify loader.
-+  copy("libnotify_headers") {
-+    sources = [
-+      "/usr/include/libnotify/notify.h",
-+      "/usr/include/libnotify/notification.h",
-+      "/usr/include/libnotify/notify-enum-types.h",
-+      "/usr/include/libnotify/notify-features.h",
-+    ]
-+    outputs = [ "$target_gen_dir/libnotify-copy/libnotify/{{source_file_part}}" ]
-+  }
-+  config("libnotify_config") {
-+    include_dirs = [ "$target_gen_dir/libnotify-copy" ]
-+  }
-+  group("libnotify") {
-+    deps = [ ":libnotify_headers" ]
-+    public_configs = [ ":libnotify_config" ]
-+  }
-+}
-+>>>>>>> .their
- 
- static_library("brightray") {
-   deps = [
-     "//base",
-+<<<<<<< .our
-     "//base:base_static",
-+=======
-+>>>>>>> .their
-     "//components/network_session_configurator/common",
-     "//components/prefs",
-     "//content/public/browser",
-@@ -18,6 +52,7 @@
-     "//ui/views",
-   ]
- 
-+<<<<<<< .our
-   include_dirs = [ ".." ]
- 
-   defines = [
-@@ -27,6 +62,21 @@
- 
-   if (is_linux) {
-     deps += [ "//build/config/linux/gtk" ]
-+=======
-+  include_dirs = [
-+    "..",
-+  ]
-+
-+  defines = [
-+    "DISABLE_NACL=1",
-+  ]
-+
-+  if (is_linux) {
-+    deps += [
-+      "//build/config/linux/gtk3",
-+      ":libnotify",
-+    ]
-+>>>>>>> .their
-   }
- 
-   extra_source_filters = []
-@@ -38,8 +88,12 @@
-     ]
-   }
- 
-+<<<<<<< .our
-   set_sources_assignment_filter(
-       sources_assignment_filter + extra_source_filters)
-+=======
-+  set_sources_assignment_filter(sources_assignment_filter + extra_source_filters)
-+>>>>>>> .their
-   sources = filenames_gypi.brightray_sources
-   set_sources_assignment_filter(sources_assignment_filter)
- }
-added in both
-  our    100644 8a945dc0219293d90e30162e4691a4d871071f4f brightray/brightray.gypi
-  their  100644 33d42bc8069ce4031cbb4375e37194c923b9de89 brightray/brightray.gypi
-@@ -155,7 +155,14 @@
-               'WEBRTC_MAC',
-              ],
-           }],  # OS=="mac"
-+<<<<<<< .our
-           ['OS=="win"', {            
-+=======
-+          ['OS=="win"', {
-+            'include_dirs': [
-+              '<(libchromiumcontent_src_dir)/third_party/wtl/include',
-+            ],
-+>>>>>>> .their
-             'defines': [
-               '_WIN32_WINNT=0x0602',
-               'WINVER=0x0602',
-@@ -205,7 +212,10 @@
-           'SKIA_DLL',
-           'USING_V8_SHARED',
-           'WEBKIT_DLL',
-+<<<<<<< .our
-           'V8_ENABLE_CHECKS',
-+=======
-+>>>>>>> .their
-         ],
-         'msvs_settings': {
-           'VCCLCompilerTool': {
-added in both
-  our    100644 1eff7344e9aef78bb88720c38c0f75fb92e6bc09 brightray/browser/browser_context.cc
-  their  100644 6123937cb564831e21373b48405f7ba8d3f5efe1 brightray/browser/browser_context.cc
-@@ -11,6 +11,11 @@
- #include "brightray/browser/brightray_paths.h"
- #include "brightray/browser/browser_client.h"
- #include "brightray/browser/inspectable_web_contents_impl.h"
-+<<<<<<< .our
-+=======
-+#include "brightray/browser/network_delegate.h"
-+#include "brightray/browser/special_storage_policy.h"
-+>>>>>>> .their
- #include "brightray/browser/zoom_level_delegate.h"
- #include "brightray/common/application_info.h"
- #include "components/prefs/json_pref_store.h"
-@@ -18,6 +23,10 @@
- #include "components/prefs/pref_service.h"
- #include "components/prefs/pref_service_factory.h"
- #include "content/public/browser/browser_thread.h"
-+<<<<<<< .our
-+=======
-+#include "content/public/browser/resource_context.h"
-+>>>>>>> .their
- #include "content/public/browser/storage_partition.h"
- #include "net/base/escape.h"
- 
-@@ -34,10 +43,32 @@
- 
- }  // namespace
- 
-+<<<<<<< .our
- // static
- void BrowserContextDeleter::Destruct(const BrowserContext* browser_context) {
-   browser_context->OnDestruct();
- }
-+=======
-+class BrowserContext::ResourceContext : public content::ResourceContext {
-+ public:
-+  ResourceContext() : getter_(nullptr) {}
-+
-+  void set_url_request_context_getter(URLRequestContextGetter* getter) {
-+    getter_ = getter;
-+  }
-+
-+ private:
-+  net::HostResolver* GetHostResolver() override {
-+    return getter_->host_resolver();
-+  }
-+
-+  net::URLRequestContext* GetRequestContext() override {
-+    return getter_->GetURLRequestContext();
-+  }
-+
-+  URLRequestContextGetter* getter_;
-+};
-+>>>>>>> .their
- 
- // static
- BrowserContext::BrowserContextMap BrowserContext::browser_context_map_;
-@@ -54,6 +85,11 @@
- 
- BrowserContext::BrowserContext(const std::string& partition, bool in_memory)
-     : in_memory_(in_memory),
-+<<<<<<< .our
-+=======
-+      resource_context_(new ResourceContext),
-+      storage_policy_(new SpecialStoragePolicy),
-+>>>>>>> .their
-       weak_factory_(this) {
-   if (!PathService::Get(DIR_USER_DATA, &path_)) {
-     PathService::Get(DIR_APP_DATA, &path_);
-@@ -68,8 +104,11 @@
- 
-   content::BrowserContext::Initialize(this, path_);
- 
-+<<<<<<< .our
-   io_handle_ = new URLRequestContextGetter::Handle(GetWeakPtr());
- 
-+=======
-+>>>>>>> .their
-   browser_context_map_[PartitionKey(partition, in_memory)] = GetWeakPtr();
- }
- 
-@@ -77,6 +116,7 @@
-   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-   NotifyWillBeDestroyed(this);
-   ShutdownStoragePartitions();
-+<<<<<<< .our
-   io_handle_->ShutdownOnUIThread();
- }
- 
-@@ -85,6 +125,15 @@
-     delete this;
-   } else {
-     BrowserThread::DeleteSoon(BrowserThread::UI, FROM_HERE, this);
-+=======
-+  if (BrowserThread::IsMessageLoopValid(BrowserThread::IO)) {
-+    BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE,
-+                              resource_context_.release());
-+    BrowserThread::PostTask(
-+        BrowserThread::IO, FROM_HERE,
-+        base::BindOnce(&URLRequestContextGetter::NotifyContextShutdownOnIO,
-+                       base::RetainedRef(url_request_getter_)));
-+>>>>>>> .their
-   }
- }
- 
-@@ -118,10 +167,24 @@
- net::URLRequestContextGetter* BrowserContext::CreateRequestContext(
-     content::ProtocolHandlerMap* protocol_handlers,
-     content::URLRequestInterceptorScopedVector protocol_interceptors) {
-+<<<<<<< .our
-   return io_handle_
-       ->CreateMainRequestContextGetter(protocol_handlers,
-                                        std::move(protocol_interceptors))
-       .get();
-+=======
-+  DCHECK(!url_request_getter_.get());
-+  url_request_getter_ = new URLRequestContextGetter(
-+      this, static_cast<NetLog*>(BrowserClient::Get()->GetNetLog()), GetPath(),
-+      in_memory_, BrowserThread::GetTaskRunnerForThread(BrowserThread::IO),
-+      protocol_handlers, std::move(protocol_interceptors));
-+  resource_context_->set_url_request_context_getter(url_request_getter_.get());
-+  return url_request_getter_.get();
-+}
-+
-+std::unique_ptr<net::NetworkDelegate> BrowserContext::CreateNetworkDelegate() {
-+  return std::make_unique<NetworkDelegate>();
-+>>>>>>> .their
- }
- 
- std::string BrowserContext::GetMediaDeviceIDSalt() {
-@@ -147,7 +210,11 @@
- }
- 
- content::ResourceContext* BrowserContext::GetResourceContext() {
-+<<<<<<< .our
-   return io_handle_->GetResourceContext();
-+=======
-+  return resource_context_.get();
-+>>>>>>> .their
- }
- 
- content::DownloadManagerDelegate* BrowserContext::GetDownloadManagerDelegate() {
-@@ -158,6 +225,13 @@
-   return nullptr;
- }
- 
-+<<<<<<< .our
-+=======
-+storage::SpecialStoragePolicy* BrowserContext::GetSpecialStoragePolicy() {
-+  return storage_policy_.get();
-+}
-+
-+>>>>>>> .their
- content::PushMessagingService* BrowserContext::GetPushMessagingService() {
-   return nullptr;
- }
-@@ -186,19 +260,29 @@
-     bool in_memory,
-     content::ProtocolHandlerMap* protocol_handlers,
-     content::URLRequestInterceptorScopedVector request_interceptors) {
-+<<<<<<< .our
-   NOTREACHED();
-+=======
-+>>>>>>> .their
-   return nullptr;
- }
- 
- net::URLRequestContextGetter* BrowserContext::CreateMediaRequestContext() {
-+<<<<<<< .our
-   return io_handle_->GetMainRequestContextGetter().get();
-+=======
-+  return url_request_getter_.get();
-+>>>>>>> .their
- }
- 
- net::URLRequestContextGetter*
- BrowserContext::CreateMediaRequestContextForStoragePartition(
-     const base::FilePath& partition_path,
-     bool in_memory) {
-+<<<<<<< .our
-   NOTREACHED();
-+=======
-+>>>>>>> .their
-   return nullptr;
- }
- 
-added in both
-  our    100644 1fb1c59b8043dbb711a364fca3c357c11993bedc brightray/browser/browser_context.h
-  their  100644 8f3de784cfe25b64b2dd767f5efd91845a3aecb6 brightray/browser/browser_context.h
-@@ -17,6 +17,7 @@
- class PrefRegistrySimple;
- class PrefService;
- 
-+<<<<<<< .our
- namespace brightray {
- 
- class BrowserContext;
-@@ -28,6 +29,17 @@
- class BrowserContext
-     : public base::RefCountedThreadSafe<BrowserContext, BrowserContextDeleter>,
-       public content::BrowserContext {
-+=======
-+namespace storage {
-+class SpecialStoragePolicy;
-+}
-+
-+namespace brightray {
-+
-+class BrowserContext : public base::RefCounted<BrowserContext>,
-+                       public content::BrowserContext,
-+                       public brightray::URLRequestContextGetter::Delegate {
-+>>>>>>> .their
-  public:
-   // Get the BrowserContext according to its |partition| and |in_memory|,
-   // empty pointer when be returned when there is no matching BrowserContext.
-@@ -48,6 +60,10 @@
-   content::ResourceContext* GetResourceContext() override;
-   content::DownloadManagerDelegate* GetDownloadManagerDelegate() override;
-   content::BrowserPluginGuestManager* GetGuestManager() override;
-+<<<<<<< .our
-+=======
-+  storage::SpecialStoragePolicy* GetSpecialStoragePolicy() override;
-+>>>>>>> .their
-   content::PushMessagingService* GetPushMessagingService() override;
-   content::SSLHostStateDelegate* GetSSLHostStateDelegate() override;
-   content::BackgroundFetchDelegate* GetBackgroundFetchDelegate() override;
-@@ -67,14 +83,24 @@
-       const base::FilePath& partition_path,
-       bool in_memory) override;
-   std::string GetMediaDeviceIDSalt() override;
-+<<<<<<< .our
-   base::FilePath GetPath() const override;
-+=======
-+
-+  URLRequestContextGetter* url_request_context_getter() const {
-+    return url_request_getter_.get();
-+  }
-+>>>>>>> .their
- 
-   void InitPrefs();
-   PrefService* prefs() { return prefs_.get(); }
- 
-+<<<<<<< .our
-   virtual std::string GetUserAgent() const = 0;
-   virtual void OnMainRequestContextCreated(URLRequestContextGetter* getter) {}
- 
-+=======
-+>>>>>>> .their
-  protected:
-   BrowserContext(const std::string& partition, bool in_memory);
-   ~BrowserContext() override;
-@@ -82,6 +108,7 @@
-   // Subclasses should override this to register custom preferences.
-   virtual void RegisterPrefs(PrefRegistrySimple* pref_registry) {}
- 
-+<<<<<<< .our
-  private:
-   friend class base::RefCountedThreadSafe<BrowserContext,
-                                           BrowserContextDeleter>;
-@@ -90,6 +117,18 @@
- 
-   void RegisterInternalPrefs(PrefRegistrySimple* pref_registry);
-   void OnDestruct() const;
-+=======
-+  // URLRequestContextGetter::Delegate:
-+  std::unique_ptr<net::NetworkDelegate> CreateNetworkDelegate() override;
-+
-+  base::FilePath GetPath() const override;
-+
-+ private:
-+  friend class base::RefCounted<BrowserContext>;
-+  class ResourceContext;
-+
-+  void RegisterInternalPrefs(PrefRegistrySimple* pref_registry);
-+>>>>>>> .their
- 
-   // partition_id => browser_context
-   struct PartitionKey {
-@@ -116,11 +155,19 @@
-   base::FilePath path_;
-   bool in_memory_;
- 
-+<<<<<<< .our
-   std::unique_ptr<PrefService> prefs_;
-   std::unique_ptr<MediaDeviceIDSalt> media_device_id_salt_;
-   // Self-destructing class responsible for creating URLRequestContextGetter
-   // on the UI thread and deletes itself on the IO thread.
-   URLRequestContextGetter::Handle* io_handle_;
-+=======
-+  std::unique_ptr<ResourceContext> resource_context_;
-+  scoped_refptr<URLRequestContextGetter> url_request_getter_;
-+  scoped_refptr<storage::SpecialStoragePolicy> storage_policy_;
-+  std::unique_ptr<PrefService> prefs_;
-+  std::unique_ptr<MediaDeviceIDSalt> media_device_id_salt_;
-+>>>>>>> .their
- 
-   base::WeakPtrFactory<BrowserContext> weak_factory_;
- 
-added in both
-  our    100644 78d0ef15ef1343e7db123f97182bac7f9a98b3eb brightray/browser/browser_main_parts.cc
-  their  100644 8fc4c1adc99cbcc7c1c7edc64c0bce1fbd8b48d6 brightray/browser/browser_main_parts.cc
-@@ -185,6 +185,15 @@
-       cmd_line->GetSwitchValueASCII(switches::kEnableFeatures);
-   auto disable_features =
-       cmd_line->GetSwitchValueASCII(switches::kDisableFeatures);
-+<<<<<<< .our
-+=======
-+
-+  // TODO(deepak1556): Disable guest webcontents based on OOPIF feature.
-+  // Disable surface synchronization and async wheel events to make OSR work.
-+  disable_features +=
-+      ",GuestViewCrossProcessFrames,SurfaceSynchronization,AsyncWheelEvents";
-+
-+>>>>>>> .their
-   auto feature_list = std::make_unique<base::FeatureList>();
-   feature_list->InitializeFromCommandLine(enable_features, disable_features);
-   base::FeatureList::SetInstance(std::move(feature_list));
-added in both
-  our    100644 ab6d87d6c69228f75863789de8407a54cb151617 brightray/browser/inspectable_web_contents.cc
-  their  100644 f389f75db62f311bddf82ba47cd484148ba2838a brightray/browser/inspectable_web_contents.cc
-@@ -5,9 +5,20 @@
- namespace brightray {
- 
- InspectableWebContents* InspectableWebContents::Create(
-+<<<<<<< .our
-     content::WebContents* web_contents,
-     bool is_guest) {
-   return new InspectableWebContentsImpl(web_contents, is_guest);
-+=======
-+    const content::WebContents::CreateParams& create_params) {
-+  auto* contents = content::WebContents::Create(create_params);
-+  return Create(contents);
-+}
-+
-+InspectableWebContents* InspectableWebContents::Create(
-+    content::WebContents* web_contents) {
-+  return new InspectableWebContentsImpl(web_contents);
-+>>>>>>> .their
- }
- 
- }  // namespace brightray
-added in both
-  our    100644 4abaa03c5f9c9895d427e156aaa64f1c0be3b1bc brightray/browser/inspectable_web_contents.h
-  their  100644 7b0a010b9e217dc017e228718e19f24099566f66 brightray/browser/inspectable_web_contents.h
-@@ -20,10 +20,19 @@
- 
- class InspectableWebContents {
-  public:
-+<<<<<<< .our
-   // The returned InspectableWebContents takes ownership of the passed-in
-   // WebContents.
-   static InspectableWebContents* Create(content::WebContents* web_contents,
-                                         bool is_guest);
-+=======
-+  static InspectableWebContents* Create(
-+      const content::WebContents::CreateParams&);
-+
-+  // The returned InspectableWebContents takes ownership of the passed-in
-+  // WebContents.
-+  static InspectableWebContents* Create(content::WebContents*);
-+>>>>>>> .their
- 
-   virtual ~InspectableWebContents() {}
- 
-@@ -35,8 +44,11 @@
-   virtual void SetDelegate(InspectableWebContentsDelegate* delegate) = 0;
-   virtual InspectableWebContentsDelegate* GetDelegate() const = 0;
- 
-+<<<<<<< .our
-   virtual bool IsGuest() const = 0;
-   virtual void ReleaseWebContents() = 0;
-+=======
-+>>>>>>> .their
-   virtual void SetDevToolsWebContents(content::WebContents* devtools) = 0;
-   virtual void SetDockState(const std::string& state) = 0;
-   virtual void ShowDevTools() = 0;
-added in both
-  our    100644 32b5743b8db53ef2628d062e9942e30ec7c52b2f brightray/browser/inspectable_web_contents_impl.cc
-  their  100644 426df497c60bbd12bc475f5a3f26d7cc51e04710 brightray/browser/inspectable_web_contents_impl.cc
-@@ -202,6 +202,7 @@
- }
- 
- InspectableWebContentsImpl::InspectableWebContentsImpl(
-+<<<<<<< .our
-     content::WebContents* web_contents,
-     bool is_guest)
-     : frontend_loaded_(false),
-@@ -216,6 +217,17 @@
-       weak_factory_(this) {
-   if (is_guest)
-     return;
-+=======
-+    content::WebContents* web_contents)
-+    : frontend_loaded_(false),
-+      can_dock_(true),
-+      delegate_(nullptr),
-+      web_contents_(web_contents),
-+      weak_factory_(this) {
-+  auto* context =
-+      static_cast<BrowserContext*>(web_contents_->GetBrowserContext());
-+  pref_service_ = context->prefs();
-+>>>>>>> .their
-   auto* bounds_dict = pref_service_->GetDictionary(kDevToolsBoundsPref);
-   if (bounds_dict) {
-     DictionaryToRect(*bounds_dict, &devtools_bounds_);
-@@ -240,6 +252,11 @@
-           display.y() + (display.height() - devtools_bounds_.height()) / 2);
-     }
-   }
-+<<<<<<< .our
-+=======
-+
-+  view_.reset(CreateInspectableContentsView(this));
-+>>>>>>> .their
- }
- 
- InspectableWebContentsImpl::~InspectableWebContentsImpl() {
-@@ -285,6 +302,7 @@
-   return delegate_;
- }
- 
-+<<<<<<< .our
- bool InspectableWebContentsImpl::IsGuest() const {
-   return is_guest_;
- }
-@@ -293,6 +311,8 @@
-   web_contents_.release();
- }
- 
-+=======
-+>>>>>>> .their
- void InspectableWebContentsImpl::SetDockState(const std::string& state) {
-   if (state == "detach") {
-     can_dock_ = false;
-@@ -343,8 +363,12 @@
-       managed_devtools_web_contents_.reset();
-     }
-     embedder_message_dispatcher_.reset();
-+<<<<<<< .our
-     if (!IsGuest())
-       web_contents_->Focus();
-+=======
-+    web_contents_->Focus();
-+>>>>>>> .their
-   }
- }
- 
-@@ -484,7 +508,11 @@
-   net::URLFetcher* fetcher =
-       (net::URLFetcher::Create(gurl, net::URLFetcher::GET, this)).release();
-   pending_requests_[fetcher] = callback;
-+<<<<<<< .our
-   fetcher->SetRequestContext(browser_context->GetRequestContext());
-+=======
-+  fetcher->SetRequestContext(browser_context->url_request_context_getter());
-+>>>>>>> .their
-   fetcher->SetExtraRequestHeaders(headers);
-   fetcher->SaveResponseWithWriter(
-       std::unique_ptr<net::URLFetcherResponseWriter>(
-added in both
-  our    100644 3f0fe0093cf724e9f090a036a259e823c12f9294 brightray/browser/inspectable_web_contents_impl.h
-  their  100644 c75f46fed4270ac77aa4bad5196eb3f4578bcd3a brightray/browser/inspectable_web_contents_impl.h
-@@ -39,7 +39,11 @@
-  public:
-   static void RegisterPrefs(PrefRegistrySimple* pref_registry);
- 
-+<<<<<<< .our
-   InspectableWebContentsImpl(content::WebContents* web_contents, bool is_guest);
-+=======
-+  explicit InspectableWebContentsImpl(content::WebContents*);
-+>>>>>>> .their
-   ~InspectableWebContentsImpl() override;
- 
-   InspectableWebContentsView* GetView() const override;
-@@ -48,8 +52,11 @@
- 
-   void SetDelegate(InspectableWebContentsDelegate* delegate) override;
-   InspectableWebContentsDelegate* GetDelegate() const override;
-+<<<<<<< .our
-   bool IsGuest() const override;
-   void ReleaseWebContents() override;
-+=======
-+>>>>>>> .their
-   void SetDevToolsWebContents(content::WebContents* devtools) override;
-   void SetDockState(const std::string& state) override;
-   void ShowDevTools() override;
-@@ -216,7 +223,10 @@
-   // The external devtools assigned by SetDevToolsWebContents.
-   content::WebContents* external_devtools_web_contents_ = nullptr;
- 
-+<<<<<<< .our
-   bool is_guest_;
-+=======
-+>>>>>>> .their
-   std::unique_ptr<InspectableWebContentsView> view_;
- 
-   using ExtensionsAPIs = std::map<std::string, std::string>;
-added in both
-  our    100644 e0693507fe09bba95e2dd9623950e40e42ff555b brightray/browser/mac/bry_inspectable_web_contents_view.h
-  their  100644 2a99ff0e9f9f751a914d64cbd535ec98d7471565 brightray/browser/mac/bry_inspectable_web_contents_view.h
-@@ -14,7 +14,10 @@
-  @private
-   brightray::InspectableWebContentsViewMac* inspectableWebContentsView_;
- 
-+<<<<<<< .our
-   base::scoped_nsobject<NSView> fake_view_;
-+=======
-+>>>>>>> .their
-   base::scoped_nsobject<NSWindow> devtools_window_;
-   BOOL devtools_visible_;
-   BOOL devtools_docked_;
-added in both
-  our    100644 1a9139e7af5cf58ee00eaeecdefd5cbe18e96870 brightray/browser/mac/bry_inspectable_web_contents_view.mm
-  their  100644 b72a489ba77450fe38a14b957b1113f392b24b29 brightray/browser/mac/bry_inspectable_web_contents_view.mm
-@@ -32,6 +32,7 @@
-              name:NSWindowDidBecomeMainNotification
-            object:nil];
- 
-+<<<<<<< .our
-   if (inspectableWebContentsView_->inspectable_web_contents()->IsGuest()) {
-     fake_view_.reset([[NSView alloc] init]);
-     [fake_view_ setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
-@@ -43,6 +44,13 @@
-     [contentsView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
-     [self addSubview:contentsView];
-   }
-+=======
-+  auto* contents =
-+      inspectableWebContentsView_->inspectable_web_contents()->GetWebContents();
-+  auto contentsView = contents->GetNativeView();
-+  [contentsView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
-+  [self addSubview:contentsView];
-+>>>>>>> .their
- 
-   // See https://code.google.com/p/chromium/issues/detail?id=348490.
-   [self setWantsLayer:YES];
-@@ -81,7 +89,11 @@
-   if (visible && devtools_docked_) {
-     webContents->SetAllowOtherViews(true);
-     devToolsWebContents->SetAllowOtherViews(true);
-+<<<<<<< .our
-   } else if (!inspectable_web_contents->IsGuest()) {
-+=======
-+  } else {
-+>>>>>>> .their
-     webContents->SetAllowOtherViews(false);
-   }
- 
-@@ -200,7 +212,11 @@
- - (void)viewDidBecomeFirstResponder:(NSNotification*)notification {
-   auto* inspectable_web_contents =
-       inspectableWebContentsView_->inspectable_web_contents();
-+<<<<<<< .our
-   if (!inspectable_web_contents || inspectable_web_contents->IsGuest())
-+=======
-+  if (!inspectable_web_contents)
-+>>>>>>> .their
-     return;
-   auto* webContents = inspectable_web_contents->GetWebContents();
-   auto webContentsView = webContents->GetNativeView();
-added in both
-  our    100644 80e6615be13d8dd8fd244c1b2c90b3630e893578 brightray/browser/mac/cocoa_notification.h
-  their  100644 066528ee490b8821bd797c49805cd34bbcdf0bc0 brightray/browser/mac/cocoa_notification.h
-@@ -31,7 +31,10 @@
-   void NotificationActivated();
-   void NotificationActivated(NSUserNotificationAction* action)
-     API_AVAILABLE(macosx(10.10));
-+<<<<<<< .our
-   void NotificationDismissed();
-+=======
-+>>>>>>> .their
- 
-   NSUserNotification* notification() const { return notification_; }
- 
-added in both
-  our    100644 57f53931e972adac9cbadf643c737b21d6b9b712 brightray/browser/mac/cocoa_notification.mm
-  their  100644 6b576497d41a9b747b702d5502583637d96606df brightray/browser/mac/cocoa_notification.mm
-@@ -156,6 +156,7 @@
-   this->LogAction("button clicked");
- }
- 
-+<<<<<<< .our
- void CocoaNotification::NotificationDismissed() {
-   if (delegate())
-     delegate()->NotificationClosed();
-@@ -163,6 +164,8 @@
-   this->LogAction("dismissed");
- }
- 
-+=======
-+>>>>>>> .their
- void CocoaNotification::LogAction(const char* action) {
-   if (getenv("ELECTRON_DEBUG_NOTIFICATIONS")) {
-     NSString* identifier = [notification_ valueForKey:@"identifier"];
-added in both
-  our    100644 ddf0cbfa888d3f3be47db890c842900ce52d2411 brightray/browser/mac/notification_center_delegate.mm
-  their  100644 7ae24b8979b441e7583583ade5aa2708cfb1b994 brightray/browser/mac/notification_center_delegate.mm
-@@ -65,6 +65,7 @@
-   return YES;
- }
- 
-+<<<<<<< .our
- #if !defined(MAS_BUILD)
- // This undocumented method notifies us if a user closes "Alert" notifications
- // https://chromium.googlesource.com/chromium/src/+/lkgr/chrome/browser/notifications/notification_platform_bridge_mac.mm
-@@ -89,4 +90,6 @@
- }
- #endif
- 
-+=======
-+>>>>>>> .their
- @end
-added in remote
-  their  100644 32981cb8b8d53ee2b797c366dd80d5efcc82d2c9 brightray/browser/network_delegate.cc
-@@ -0,0 +1,161 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE-CHROMIUM file.
-+
-+#include "brightray/browser/network_delegate.h"
-+
-+#include <string>
-+#include <vector>
-+
-+#include "base/command_line.h"
-+#include "base/strings/string_split.h"
-+#include "net/base/load_flags.h"
-+#include "net/base/net_errors.h"
-+#include "net/url_request/url_request.h"
-+
-+namespace brightray {
-+
-+namespace {
-+
-+// Ignore the limit of 6 connections per host.
-+const char kIgnoreConnectionsLimit[] = "ignore-connections-limit";
-+
-+}  // namespace
-+
-+NetworkDelegate::NetworkDelegate() {
-+  auto* command_line = base::CommandLine::ForCurrentProcess();
-+  if (command_line->HasSwitch(kIgnoreConnectionsLimit)) {
-+    std::string value =
-+        command_line->GetSwitchValueASCII(kIgnoreConnectionsLimit);
-+    ignore_connections_limit_domains_ = base::SplitString(
-+        value, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
-+  }
-+}
-+
-+NetworkDelegate::~NetworkDelegate() {}
-+
-+int NetworkDelegate::OnBeforeURLRequest(net::URLRequest* request,
-+                                        const net::CompletionCallback& callback,
-+                                        GURL* new_url) {
-+  for (const auto& domain : ignore_connections_limit_domains_) {
-+    if (request->url().DomainIs(domain)) {
-+      // Allow unlimited concurrent connections.
-+      request->SetPriority(net::MAXIMUM_PRIORITY);
-+      request->SetLoadFlags(request->load_flags() | net::LOAD_IGNORE_LIMITS);
-+      break;
-+    }
-+  }
-+
-+  return net::OK;
-+}
-+
-+int NetworkDelegate::OnBeforeStartTransaction(
-+    net::URLRequest* request,
-+    const net::CompletionCallback& callback,
-+    net::HttpRequestHeaders* headers) {
-+  return net::OK;
-+}
-+
-+void NetworkDelegate::OnStartTransaction(
-+    net::URLRequest* request,
-+    const net::HttpRequestHeaders& headers) {}
-+
-+void NetworkDelegate::OnBeforeSendHeaders(
-+    net::URLRequest* request,
-+    const net::ProxyInfo& proxy_info,
-+    const net::ProxyRetryInfoMap& proxy_retry_info,
-+    net::HttpRequestHeaders* headers) {}
-+
-+int NetworkDelegate::OnHeadersReceived(
-+    net::URLRequest* request,
-+    const net::CompletionCallback& callback,
-+    const net::HttpResponseHeaders* original_response_headers,
-+    scoped_refptr<net::HttpResponseHeaders>* override_response_headers,
-+    GURL* allowed_unsafe_redirect_url) {
-+  return net::OK;
-+}
-+
-+void NetworkDelegate::OnBeforeRedirect(net::URLRequest* request,
-+                                       const GURL& new_location) {}
-+
-+void NetworkDelegate::OnResponseStarted(net::URLRequest* request,
-+                                        int net_error) {}
-+
-+void NetworkDelegate::OnNetworkBytesReceived(net::URLRequest* request,
-+                                             int64_t bytes_read) {}
-+
-+void NetworkDelegate::OnNetworkBytesSent(net::URLRequest* request,
-+                                         int64_t bytes_sent) {}
-+
-+void NetworkDelegate::OnCompleted(net::URLRequest* request, bool started) {}
-+
-+void NetworkDelegate::OnURLRequestDestroyed(net::URLRequest* request) {}
-+
-+void NetworkDelegate::OnPACScriptError(int line_number,
-+                                       const base::string16& error) {}
-+
-+NetworkDelegate::AuthRequiredResponse NetworkDelegate::OnAuthRequired(
-+    net::URLRequest* request,
-+    const net::AuthChallengeInfo& auth_info,
-+    const AuthCallback& callback,
-+    net::AuthCredentials* credentials) {
-+  return AUTH_REQUIRED_RESPONSE_NO_ACTION;
-+}
-+
-+bool NetworkDelegate::OnCanGetCookies(const net::URLRequest& request,
-+                                      const net::CookieList& cookie_list) {
-+  return true;
-+}
-+
-+bool NetworkDelegate::OnCanSetCookie(const net::URLRequest& request,
-+                                     const net::CanonicalCookie& cookie_line,
-+                                     net::CookieOptions* options) {
-+  return true;
-+}
-+
-+bool NetworkDelegate::OnCanAccessFile(
-+    const net::URLRequest& request,
-+    const base::FilePath& original_path,
-+    const base::FilePath& absolute_path) const {
-+  return true;
-+}
-+
-+bool NetworkDelegate::OnCanEnablePrivacyMode(
-+    const GURL& url,
-+    const GURL& first_party_for_cookies) const {
-+  return false;
-+}
-+
-+bool NetworkDelegate::OnAreExperimentalCookieFeaturesEnabled() const {
-+  return true;
-+}
-+
-+bool NetworkDelegate::OnCancelURLRequestWithPolicyViolatingReferrerHeader(
-+    const net::URLRequest& request,
-+    const GURL& target_url,
-+    const GURL& referrer_url) const {
-+  return false;
-+}
-+
-+// TODO(deepak1556) : Enable after hooking into the reporting service
-+// https://crbug.com/704259
-+bool NetworkDelegate::OnCanQueueReportingReport(
-+    const url::Origin& origin) const {
-+  return false;
-+}
-+
-+void NetworkDelegate::OnCanSendReportingReports(
-+    std::set<url::Origin> origins,
-+    base::OnceCallback<void(std::set<url::Origin>)> result_callback) const {}
-+
-+bool NetworkDelegate::OnCanSetReportingClient(const url::Origin& origin,
-+                                              const GURL& endpoint) const {
-+  return false;
-+}
-+
-+bool NetworkDelegate::OnCanUseReportingClient(const url::Origin& origin,
-+                                              const GURL& endpoint) const {
-+  return false;
-+}
-+
-+}  // namespace brightray
-added in remote
-  their  100644 77625e5c86b13bdd3619d82d59f98d6acdcf9e36 brightray/browser/network_delegate.h
-@@ -0,0 +1,88 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE-CHROMIUM file.
-+
-+#ifndef BRIGHTRAY_BROWSER_NETWORK_DELEGATE_H_
-+#define BRIGHTRAY_BROWSER_NETWORK_DELEGATE_H_
-+
-+#include <set>
-+#include <string>
-+#include <vector>
-+
-+#include "net/base/network_delegate.h"
-+
-+namespace brightray {
-+
-+class NetworkDelegate : public net::NetworkDelegate {
-+ public:
-+  NetworkDelegate();
-+  ~NetworkDelegate() override;
-+
-+ protected:
-+  int OnBeforeURLRequest(net::URLRequest* request,
-+                         const net::CompletionCallback& callback,
-+                         GURL* new_url) override;
-+  int OnBeforeStartTransaction(net::URLRequest* request,
-+                               const net::CompletionCallback& callback,
-+                               net::HttpRequestHeaders* headers) override;
-+  void OnBeforeSendHeaders(net::URLRequest* request,
-+                           const net::ProxyInfo& proxy_info,
-+                           const net::ProxyRetryInfoMap& proxy_retry_info,
-+                           net::HttpRequestHeaders* headers) override;
-+  void OnStartTransaction(net::URLRequest* request,
-+                          const net::HttpRequestHeaders& headers) override;
-+  int OnHeadersReceived(
-+      net::URLRequest* request,
-+      const net::CompletionCallback& callback,
-+      const net::HttpResponseHeaders* original_response_headers,
-+      scoped_refptr<net::HttpResponseHeaders>* override_response_headers,
-+      GURL* allowed_unsafe_redirect_url) override;
-+  void OnBeforeRedirect(net::URLRequest* request,
-+                        const GURL& new_location) override;
-+  void OnResponseStarted(net::URLRequest* request, int net_error) override;
-+  void OnNetworkBytesReceived(net::URLRequest* request,
-+                              int64_t bytes_read) override;
-+  void OnNetworkBytesSent(net::URLRequest* request,
-+                          int64_t bytes_sent) override;
-+  void OnCompleted(net::URLRequest* request, bool started) override;
-+  void OnURLRequestDestroyed(net::URLRequest* request) override;
-+  void OnPACScriptError(int line_number, const base::string16& error) override;
-+  AuthRequiredResponse OnAuthRequired(
-+      net::URLRequest* request,
-+      const net::AuthChallengeInfo& auth_info,
-+      const AuthCallback& callback,
-+      net::AuthCredentials* credentials) override;
-+  bool OnCanGetCookies(const net::URLRequest& request,
-+                       const net::CookieList& cookie_list) override;
-+  bool OnCanSetCookie(const net::URLRequest& request,
-+                      const net::CanonicalCookie& cookie_line,
-+                      net::CookieOptions* options) override;
-+  bool OnCanAccessFile(const net::URLRequest& request,
-+                       const base::FilePath& original_path,
-+                       const base::FilePath& absolute_path) const override;
-+  bool OnCanEnablePrivacyMode(
-+      const GURL& url,
-+      const GURL& first_party_for_cookies) const override;
-+  bool OnAreExperimentalCookieFeaturesEnabled() const override;
-+  bool OnCancelURLRequestWithPolicyViolatingReferrerHeader(
-+      const net::URLRequest& request,
-+      const GURL& target_url,
-+      const GURL& referrer_url) const override;
-+  bool OnCanQueueReportingReport(const url::Origin& origin) const override;
-+  void OnCanSendReportingReports(std::set<url::Origin> origins,
-+                                 base::OnceCallback<void(std::set<url::Origin>)>
-+                                     result_callback) const override;
-+  bool OnCanSetReportingClient(const url::Origin& origin,
-+                               const GURL& endpoint) const override;
-+  bool OnCanUseReportingClient(const url::Origin& origin,
-+                               const GURL& endpoint) const override;
-+
-+ private:
-+  std::vector<std::string> ignore_connections_limit_domains_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(NetworkDelegate);
-+};
-+
-+}  // namespace brightray
-+
-+#endif  // BRIGHTRAY_BROWSER_NETWORK_DELEGATE_H_
-added in remote
-  their  100644 e662441dedbfe3c5cf08e8dcce3413153c1fcf82 brightray/browser/special_storage_policy.cc
-@@ -0,0 +1,41 @@
-+// Copyright 2014 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "brightray/browser/special_storage_policy.h"
-+
-+namespace brightray {
-+
-+SpecialStoragePolicy::SpecialStoragePolicy() {}
-+
-+SpecialStoragePolicy::~SpecialStoragePolicy() {}
-+
-+bool SpecialStoragePolicy::IsStorageProtected(const GURL& origin) {
-+  return true;
-+}
-+
-+bool SpecialStoragePolicy::IsStorageUnlimited(const GURL& origin) {
-+  return true;
-+}
-+
-+bool SpecialStoragePolicy::IsStorageDurable(const GURL& origin) {
-+  return true;
-+}
-+
-+bool SpecialStoragePolicy::HasIsolatedStorage(const GURL& origin) {
-+  return false;
-+}
-+
-+bool SpecialStoragePolicy::IsStorageSessionOnly(const GURL& origin) {
-+  return false;
-+}
-+
-+bool SpecialStoragePolicy::HasSessionOnlyOrigins() {
-+  return false;
-+}
-+
-+bool SpecialStoragePolicy::ShouldDeleteCookieOnExit(const GURL& origin) {
-+  return false;
-+}
-+
-+}  // namespace brightray
-added in remote
-  their  100644 2d02cdd293438d4f10863c4cf6a7932dc20a3666 brightray/browser/special_storage_policy.h
-@@ -0,0 +1,31 @@
-+// Copyright 2014 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef BRIGHTRAY_BROWSER_SPECIAL_STORAGE_POLICY_H_
-+#define BRIGHTRAY_BROWSER_SPECIAL_STORAGE_POLICY_H_
-+
-+#include "storage/browser/quota/special_storage_policy.h"
-+
-+namespace brightray {
-+
-+class SpecialStoragePolicy : public storage::SpecialStoragePolicy {
-+ public:
-+  SpecialStoragePolicy();
-+
-+  // storage::SpecialStoragePolicy implementation.
-+  bool IsStorageProtected(const GURL& origin) override;
-+  bool IsStorageUnlimited(const GURL& origin) override;
-+  bool IsStorageDurable(const GURL& origin) override;
-+  bool HasIsolatedStorage(const GURL& origin) override;
-+  bool IsStorageSessionOnly(const GURL& origin) override;
-+  bool HasSessionOnlyOrigins() override;
-+  bool ShouldDeleteCookieOnExit(const GURL& origin) override;
-+
-+ protected:
-+  ~SpecialStoragePolicy() override;
-+};
-+
-+}  // namespace brightray
-+
-+#endif  // BRIGHTRAY_BROWSER_SPECIAL_STORAGE_POLICY_H_
-added in both
-  our    100644 c07ba80cbc522030af580adc5d8676ed31d592d1 brightray/browser/url_request_context_getter.cc
-  their  100644 68041972af79509c018d6ec045461bf0b2b50a83 brightray/browser/url_request_context_getter.cc
-@@ -12,15 +12,24 @@
- #include "base/strings/string_util.h"
- #include "base/task_scheduler/post_task.h"
- #include "brightray/browser/browser_client.h"
-+<<<<<<< .our
- #include "brightray/browser/browser_context.h"
- #include "brightray/browser/net/require_ct_delegate.h"
- #include "brightray/browser/net_log.h"
-+=======
-+#include "brightray/browser/net/require_ct_delegate.h"
-+#include "brightray/browser/net_log.h"
-+#include "brightray/browser/network_delegate.h"
-+>>>>>>> .their
- #include "brightray/common/switches.h"
- #include "components/network_session_configurator/common/network_switches.h"
- #include "content/public/browser/browser_thread.h"
- #include "content/public/browser/cookie_store_factory.h"
- #include "content/public/browser/devtools_network_transaction_factory.h"
-+<<<<<<< .our
- #include "content/public/browser/resource_context.h"
-+=======
-+>>>>>>> .their
- #include "net/base/host_mapping_rules.h"
- #include "net/cert/cert_verifier.h"
- #include "net/cert/ct_known_logs.h"
-@@ -59,6 +68,7 @@
- 
- namespace brightray {
- 
-+<<<<<<< .our
- class ResourceContext : public content::ResourceContext {
-  public:
-   ResourceContext() = default;
-@@ -160,6 +170,85 @@
-       base_path_(base_path),
-       in_memory_(in_memory),
-       user_agent_(user_agent),
-+=======
-+std::string URLRequestContextGetter::Delegate::GetUserAgent() {
-+  return base::EmptyString();
-+}
-+
-+std::unique_ptr<net::NetworkDelegate>
-+URLRequestContextGetter::Delegate::CreateNetworkDelegate() {
-+  return nullptr;
-+}
-+
-+std::unique_ptr<net::URLRequestJobFactory>
-+URLRequestContextGetter::Delegate::CreateURLRequestJobFactory(
-+    content::ProtocolHandlerMap* protocol_handlers) {
-+  std::unique_ptr<net::URLRequestJobFactoryImpl> job_factory(
-+      new net::URLRequestJobFactoryImpl);
-+
-+  for (auto& it : *protocol_handlers) {
-+    job_factory->SetProtocolHandler(it.first,
-+                                    base::WrapUnique(it.second.release()));
-+  }
-+  protocol_handlers->clear();
-+
-+  job_factory->SetProtocolHandler(
-+      url::kDataScheme, base::WrapUnique(new net::DataProtocolHandler));
-+  job_factory->SetProtocolHandler(
-+      url::kFileScheme,
-+      base::WrapUnique(
-+          new net::FileProtocolHandler(base::CreateTaskRunnerWithTraits(
-+              {base::MayBlock(), base::TaskPriority::USER_VISIBLE,
-+               base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN}))));
-+
-+  return std::move(job_factory);
-+}
-+
-+net::HttpCache::BackendFactory*
-+URLRequestContextGetter::Delegate::CreateHttpCacheBackendFactory(
-+    const base::FilePath& base_path) {
-+  auto* command_line = base::CommandLine::ForCurrentProcess();
-+  int max_size = 0;
-+  base::StringToInt(command_line->GetSwitchValueASCII(switches::kDiskCacheSize),
-+                    &max_size);
-+
-+  base::FilePath cache_path = base_path.Append(FILE_PATH_LITERAL("Cache"));
-+  return new net::HttpCache::DefaultBackend(
-+      net::DISK_CACHE, net::CACHE_BACKEND_DEFAULT, cache_path, max_size);
-+}
-+
-+std::unique_ptr<net::CertVerifier>
-+URLRequestContextGetter::Delegate::CreateCertVerifier(
-+    RequireCTDelegate* ct_delegate) {
-+  return net::CertVerifier::CreateDefault();
-+}
-+
-+net::SSLConfigService*
-+URLRequestContextGetter::Delegate::CreateSSLConfigService() {
-+  return new net::SSLConfigServiceDefaults;
-+}
-+
-+std::vector<std::string>
-+URLRequestContextGetter::Delegate::GetCookieableSchemes() {
-+  return {"http", "https", "ws", "wss"};
-+}
-+
-+URLRequestContextGetter::URLRequestContextGetter(
-+    Delegate* delegate,
-+    NetLog* net_log,
-+    const base::FilePath& base_path,
-+    bool in_memory,
-+    scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
-+    content::ProtocolHandlerMap* protocol_handlers,
-+    content::URLRequestInterceptorScopedVector protocol_interceptors)
-+    : delegate_(delegate),
-+      net_log_(net_log),
-+      base_path_(base_path),
-+      in_memory_(in_memory),
-+      io_task_runner_(io_task_runner),
-+      protocol_interceptors_(std::move(protocol_interceptors)),
-+      job_factory_(nullptr),
-+>>>>>>> .their
-       context_shutting_down_(false) {
-   // Must first be created on the UI thread.
-   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-@@ -167,16 +256,27 @@
-   if (protocol_handlers)
-     std::swap(protocol_handlers_, *protocol_handlers);
- 
-+<<<<<<< .our
-+=======
-+  if (delegate_)
-+    user_agent_ = delegate_->GetUserAgent();
-+
-+>>>>>>> .their
-   // We must create the proxy config service on the UI loop on Linux because it
-   // must synchronously run on the glib message loop. This will be passed to
-   // the URLRequestContextStorage on the IO thread in GetURLRequestContext().
-   proxy_config_service_ =
-       net::ProxyResolutionService::CreateSystemProxyConfigService(
-+<<<<<<< .our
-           BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
-+=======
-+          io_task_runner_);
-+>>>>>>> .their
- }
- 
- URLRequestContextGetter::~URLRequestContextGetter() {}
- 
-+<<<<<<< .our
- void URLRequestContextGetter::NotifyContextShuttingDown(
-     std::unique_ptr<ResourceContext> resource_context) {
-   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-@@ -191,6 +291,37 @@
-   http_auth_preferences_.reset();
-   host_mapping_rules_.reset();
-   ct_delegate_.reset();
-+=======
-+void URLRequestContextGetter::NotifyContextShutdownOnIO() {
-+  context_shutting_down_ = true;
-+  cookie_change_sub_.reset();
-+  http_network_session_.reset();
-+  http_auth_preferences_.reset();
-+  host_mapping_rules_.reset();
-+  url_request_context_.reset();
-+  storage_.reset();
-+  ct_delegate_.reset();
-+  net::URLRequestContextGetter::NotifyContextShuttingDown();
-+}
-+
-+void URLRequestContextGetter::OnCookieChanged(
-+    const net::CanonicalCookie& cookie,
-+    net::CookieChangeCause cause) {
-+  DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-+
-+  if (!delegate_ || context_shutting_down_)
-+    return;
-+
-+  content::BrowserThread::PostTask(
-+      content::BrowserThread::UI, FROM_HERE,
-+      base::BindOnce(&Delegate::NotifyCookieChange, base::Unretained(delegate_),
-+                     cookie, !(cause == net::CookieChangeCause::INSERTED),
-+                     cause));
-+}
-+
-+net::HostResolver* URLRequestContextGetter::host_resolver() {
-+  return url_request_context_->host_resolver();
-+>>>>>>> .their
- }
- 
- net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
-@@ -218,13 +349,20 @@
-     auto cookie_path = in_memory_
-                            ? base::FilePath()
-                            : base_path_.Append(FILE_PATH_LITERAL("Cookies"));
-+<<<<<<< .our
-     std::unique_ptr<net::CookieStore> cookie_store = content::CreateCookieStore(
-         content::CookieStoreConfig(cookie_path, false, false, nullptr));
-+=======
-+    std::unique_ptr<net::CookieStore> cookie_store =
-+        content::CreateCookieStore(content::CookieStoreConfig(
-+            cookie_path, false, false, nullptr));
-+>>>>>>> .their
-     storage_->set_cookie_store(std::move(cookie_store));
- 
-     // Set custom schemes that can accept cookies.
-     net::CookieMonster* cookie_monster =
-         static_cast<net::CookieMonster*>(url_request_context_->cookie_store());
-+<<<<<<< .our
-     std::vector<std::string> cookie_schemes({"http", "https", "ws", "wss"});
-     delegate_->GetCookieableSchemes(&cookie_schemes);
-     cookie_monster->SetCookieableSchemes(cookie_schemes);
-@@ -235,6 +373,16 @@
-                              .AddCallbackForAllChanges(base::Bind(
-                                  &URLRequestContextGetter::OnCookieChanged,
-                                  base::RetainedRef(this)));
-+=======
-+    cookie_monster->SetCookieableSchemes(delegate_->GetCookieableSchemes());
-+    // Cookie store will outlive notifier by order of declaration
-+    // in the header.
-+    cookie_change_sub_ =
-+        url_request_context_->cookie_store()
-+            ->GetChangeDispatcher()
-+            .AddCallbackForAllChanges(
-+                base::Bind(&URLRequestContextGetter::OnCookieChanged, this));
-+>>>>>>> .their
- 
-     storage_->set_channel_id_service(std::make_unique<net::ChannelIDService>(
-         new net::DefaultChannelIDStore(nullptr)));
-@@ -315,7 +463,11 @@
-     storage_->set_transport_security_state(std::move(transport_security_state));
-     storage_->set_cert_verifier(
-         delegate_->CreateCertVerifier(ct_delegate_.get()));
-+<<<<<<< .our
-     storage_->set_ssl_config_service(new net::SSLConfigServiceDefaults());
-+=======
-+    storage_->set_ssl_config_service(delegate_->CreateSSLConfigService());
-+>>>>>>> .their
-     storage_->set_http_auth_handler_factory(std::move(auth_handler_factory));
-     std::unique_ptr<net::HttpServerProperties> server_properties(
-         new net::HttpServerPropertiesImpl);
-@@ -368,8 +520,12 @@
-         std::move(backend), false));
- 
-     std::unique_ptr<net::URLRequestJobFactory> job_factory =
-+<<<<<<< .our
-         delegate_->CreateURLRequestJobFactory(url_request_context_.get(),
-                                               &protocol_handlers_);
-+=======
-+        delegate_->CreateURLRequestJobFactory(&protocol_handlers_);
-+>>>>>>> .their
-     job_factory_ = job_factory.get();
- 
-     // Set up interceptors in the reverse order.
-@@ -387,9 +543,12 @@
-     storage_->set_job_factory(std::move(top_job_factory));
-   }
- 
-+<<<<<<< .our
-   if (resource_context_)
-     resource_context_->request_context_ = url_request_context_.get();
- 
-+=======
-+>>>>>>> .their
-   return url_request_context_.get();
- }
- 
-@@ -398,6 +557,7 @@
-   return BrowserThread::GetTaskRunnerForThread(BrowserThread::IO);
- }
- 
-+<<<<<<< .our
- void URLRequestContextGetter::OnCookieChanged(
-     const net::CanonicalCookie& cookie,
-     net::CookieChangeCause cause) const {
-@@ -405,4 +565,6 @@
-     delegate_->OnCookieChanged(cookie, cause);
- }
- 
-+=======
-+>>>>>>> .their
- }  // namespace brightray
-added in both
-  our    100644 941a5782b14a941bb25a7a9ef6ca6d73f8bc3ec1 brightray/browser/url_request_context_getter.h
-  their  100644 b990d479a06cb7c26f306bf50179eb87c9af4472 brightray/browser/url_request_context_getter.h
-@@ -22,6 +22,13 @@
- #include "base/debug/leak_tracker.h"
- #endif
- 
-+<<<<<<< .our
-+=======
-+namespace base {
-+class MessageLoop;
-+}
-+
-+>>>>>>> .their
- namespace net {
- class HostMappingRules;
- class HostResolver;
-@@ -34,8 +41,11 @@
- 
- namespace brightray {
- 
-+<<<<<<< .our
- class BrowserContext;
- class ResourceContext;
-+=======
-+>>>>>>> .their
- class RequireCTDelegate;
- class NetLog;
- 
-@@ -46,6 +56,7 @@
-     Delegate() {}
-     virtual ~Delegate() {}
- 
-+<<<<<<< .our
-     virtual std::unique_ptr<net::NetworkDelegate> CreateNetworkDelegate() = 0;
-     virtual std::unique_ptr<net::URLRequestJobFactory>
-     CreateURLRequestJobFactory(
-@@ -70,11 +81,42 @@
-       content::ProtocolHandlerMap* protocol_handlers,
-       content::URLRequestInterceptorScopedVector protocol_interceptors);
- 
-+=======
-+    virtual std::unique_ptr<net::NetworkDelegate> CreateNetworkDelegate();
-+    virtual std::string GetUserAgent();
-+    virtual std::unique_ptr<net::URLRequestJobFactory>
-+    CreateURLRequestJobFactory(content::ProtocolHandlerMap* protocol_handlers);
-+    virtual net::HttpCache::BackendFactory* CreateHttpCacheBackendFactory(
-+        const base::FilePath& base_path);
-+    virtual std::unique_ptr<net::CertVerifier> CreateCertVerifier(
-+        RequireCTDelegate* ct_delegate);
-+    virtual net::SSLConfigService* CreateSSLConfigService();
-+    virtual std::vector<std::string> GetCookieableSchemes();
-+    virtual void NotifyCookieChange(const net::CanonicalCookie& cookie,
-+                                    bool removed,
-+                                    net::CookieChangeCause cause) {}
-+  };
-+
-+  URLRequestContextGetter(
-+      Delegate* delegate,
-+      NetLog* net_log,
-+      const base::FilePath& base_path,
-+      bool in_memory,
-+      scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
-+      content::ProtocolHandlerMap* protocol_handlers,
-+      content::URLRequestInterceptorScopedVector protocol_interceptors);
-+
-+  // net::CookieChangeDispatcher::CookieChangedCallback implementation.
-+  void OnCookieChanged(const net::CanonicalCookie& cookie,
-+                       net::CookieChangeCause cause);
-+
-+>>>>>>> .their
-   // net::URLRequestContextGetter:
-   net::URLRequestContext* GetURLRequestContext() override;
-   scoped_refptr<base::SingleThreadTaskRunner> GetNetworkTaskRunner()
-       const override;
- 
-+<<<<<<< .our
-   net::URLRequestJobFactory* job_factory() const { return job_factory_; }
-   void set_delegate(Delegate* delegate) { delegate_ = delegate; }
- 
-@@ -116,6 +158,24 @@
-   // net::CookieChangeDispatcher::CookieChangedCallback implementation.
-   void OnCookieChanged(const net::CanonicalCookie& cookie,
-                        net::CookieChangeCause cause) const;
-+=======
-+  net::HostResolver* host_resolver();
-+  net::URLRequestJobFactory* job_factory() const { return job_factory_; }
-+
-+  void NotifyContextShutdownOnIO();
-+
-+ private:
-+  ~URLRequestContextGetter() override;
-+
-+  Delegate* delegate_;
-+
-+  NetLog* net_log_;
-+  base::FilePath base_path_;
-+  bool in_memory_;
-+  scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
-+
-+  std::string user_agent_;
-+>>>>>>> .their
- 
- #if DCHECK_IS_ON()
-   base::debug::LeakTracker<URLRequestContextGetter> leak_tracker_;
-@@ -129,6 +189,7 @@
-   std::unique_ptr<net::HttpAuthPreferences> http_auth_preferences_;
-   std::unique_ptr<net::HttpNetworkSession> http_network_session_;
-   std::unique_ptr<net::CookieChangeSubscription> cookie_change_sub_;
-+<<<<<<< .our
- 
-   net::URLRequestJobFactory* job_factory_;
-   Delegate* delegate_;
-@@ -139,6 +200,13 @@
-   base::FilePath base_path_;
-   bool in_memory_;
-   std::string user_agent_;
-+=======
-+  content::ProtocolHandlerMap protocol_handlers_;
-+  content::URLRequestInterceptorScopedVector protocol_interceptors_;
-+
-+  net::URLRequestJobFactory* job_factory_;  // weak ref
-+
-+>>>>>>> .their
-   bool context_shutting_down_;
- 
-   DISALLOW_COPY_AND_ASSIGN(URLRequestContextGetter);
-added in both
-  our    100644 7cca54f03144d59595ee3f79c8ee8b6cf30c257e brightray/browser/views/inspectable_web_contents_view_views.cc
-  their  100644 e95ffd05ee3c1d1dc59c29f60c470eb04524a461 brightray/browser/views/inspectable_web_contents_view_views.cc
-@@ -81,8 +81,12 @@
-       title_(base::ASCIIToUTF16("Developer Tools")) {
-   set_owned_by_client();
- 
-+<<<<<<< .our
-   if (!inspectable_web_contents_->IsGuest() &&
-       inspectable_web_contents_->GetWebContents()->GetNativeView()) {
-+=======
-+  if (inspectable_web_contents_->GetWebContents()->GetNativeView()) {
-+>>>>>>> .their
-     views::WebView* contents_web_view = new views::WebView(nullptr);
-     contents_web_view->SetWebContents(
-         inspectable_web_contents_->GetWebContents());
-added in both
-  our    100644 f954489704cf1147b13937bc3a228898f45cb38d brightray/browser/win/notification_presenter_win.h
-  their  100644 2a1a779bfa3d53e693b50d3b7f669a6afd92efaa brightray/browser/win/notification_presenter_win.h
-@@ -35,7 +35,11 @@
- class NotificationPresenterWin : public NotificationPresenter {
-  public:
-   NotificationPresenterWin();
-+<<<<<<< .our
-   ~NotificationPresenterWin() override;
-+=======
-+  ~NotificationPresenterWin();
-+>>>>>>> .their
- 
-   bool Init();
- 
-added in both
-  our    100644 cbfea8360b983a139736c01e93f0fda5b104f900 brightray/browser/win/notification_presenter_win7.cc
-  their  100644 9a1ede3642afae305a6f5b1f388d04646f6b765b brightray/browser/win/notification_presenter_win7.cc
-@@ -13,8 +13,13 @@
- 
- Win32Notification* NotificationPresenterWin7::GetNotificationObjectByRef(
-     const DesktopNotificationController::Notification& ref) {
-+<<<<<<< .our
-   for (auto* n : this->notifications()) {
-     auto* w32n = static_cast<Win32Notification*>(n);
-+=======
-+  for (auto n : this->notifications()) {
-+    auto w32n = static_cast<Win32Notification*>(n);
-+>>>>>>> .their
-     if (w32n->GetRef() == ref)
-       return w32n;
-   }
-@@ -24,8 +29,13 @@
- 
- Win32Notification* NotificationPresenterWin7::GetNotificationObjectByTag(
-     const std::string& tag) {
-+<<<<<<< .our
-   for (auto* n : this->notifications()) {
-     auto* w32n = static_cast<Win32Notification*>(n);
-+=======
-+  for (auto n : this->notifications()) {
-+    auto w32n = static_cast<Win32Notification*>(n);
-+>>>>>>> .their
-     if (w32n->GetTag() == tag)
-       return w32n;
-   }
-@@ -35,14 +45,22 @@
- 
- void NotificationPresenterWin7::OnNotificationClicked(
-     Notification& notification) {
-+<<<<<<< .our
-   auto* n = GetNotificationObjectByRef(notification);
-+=======
-+  auto n = GetNotificationObjectByRef(notification);
-+>>>>>>> .their
-   if (n)
-     n->NotificationClicked();
- }
- 
- void NotificationPresenterWin7::OnNotificationDismissed(
-     Notification& notification) {
-+<<<<<<< .our
-   auto* n = GetNotificationObjectByRef(notification);
-+=======
-+  auto n = GetNotificationObjectByRef(notification);
-+>>>>>>> .their
-   if (n)
-     n->NotificationDismissed();
- }
-added in both
-  our    100644 f07d43105fc1b99b7421e38b7d937a280738a6b6 brightray/browser/win/win32_desktop_notifications/common.h
-  their  100644 967ad247481f224e0c4f305337d6127ffd9cfa19 brightray/browser/win/win32_desktop_notifications/common.h
-@@ -36,7 +36,11 @@
-         GetProcAddress(GetModuleHandle(TEXT("shcore")), "GetDpiForMonitor"));
- 
-     if (GetDpiForMonitor) {
-+<<<<<<< .our
-       auto* monitor = MonitorFromPoint({}, MONITOR_DEFAULTTOPRIMARY);
-+=======
-+      auto monitor = MonitorFromPoint({}, MONITOR_DEFAULTTOPRIMARY);
-+>>>>>>> .their
-       if (GetDpiForMonitor(monitor, 0, &dpi_x, &dpi_y) == S_OK)
-         return;
-     }
-added in both
-  our    100644 71395a49d82f7be8a3ffd66e4795af968973a274 brightray/browser/win/win32_desktop_notifications/desktop_notification_controller.cc
-  their  100644 0840d9e6364dc743458588dd21464f32ea946adf brightray/browser/win/win32_desktop_notifications/desktop_notification_controller.cc
-@@ -1,9 +1,14 @@
-+<<<<<<< .our
- #ifndef NOMINMAX
- #define NOMINMAX
- #endif
- #ifndef WIN32_LEAN_AND_MEAN
- #define WIN32_LEAN_AND_MEAN
- #endif
-+=======
-+#define NOMINMAX
-+#define WIN32_LEAN_AND_MEAN
-+>>>>>>> .their
- #include "brightray/browser/win/win32_desktop_notifications/desktop_notification_controller.h"
- #include <windowsx.h>
- #include <algorithm>
-@@ -39,9 +44,12 @@
-   return ret;
- }
- 
-+<<<<<<< .our
- const TCHAR DesktopNotificationController::class_name_[] =
-       TEXT("DesktopNotificationController");
- 
-+=======
-+>>>>>>> .their
- HINSTANCE DesktopNotificationController::RegisterWndClasses() {
-   // We keep a static `module` variable which serves a dual purpose:
-   // 1. Stores the HINSTANCE where the window classes are registered,
-@@ -90,7 +98,11 @@
-                                                         LPARAM lparam) {
-   switch (message) {
-     case WM_CREATE: {
-+<<<<<<< .our
-       auto*& cs = reinterpret_cast<const CREATESTRUCT*&>(lparam);
-+=======
-+      auto& cs = reinterpret_cast<const CREATESTRUCT*&>(lparam);
-+>>>>>>> .their
-       SetWindowLongPtr(hwnd, 0, (LONG_PTR)cs->lpCreateParams);
-     } break;
- 
-@@ -101,7 +113,11 @@
-       return 0;
- 
-     case WM_DISPLAYCHANGE: {
-+<<<<<<< .our
-       auto* inst = Get(hwnd);
-+=======
-+      auto inst = Get(hwnd);
-+>>>>>>> .their
-       inst->ClearAssets();
-       inst->AnimateAll();
-     } break;
-@@ -189,13 +205,21 @@
-       POINT origin = {work_area.right,
-                       work_area.bottom - metrics.Y(toast_margin_)};
- 
-+<<<<<<< .our
-       auto* hdwp = BeginDeferWindowPos(static_cast<int>(instances_.size()));
-+=======
-+      auto hdwp = BeginDeferWindowPos(static_cast<int>(instances_.size()));
-+>>>>>>> .their
- 
-       for (auto&& inst : instances_) {
-         if (!inst.hwnd)
-           continue;
- 
-+<<<<<<< .our
-         auto* notification = Toast::Get(inst.hwnd);
-+=======
-+        auto notification = Toast::Get(inst.hwnd);
-+>>>>>>> .their
-         hdwp = notification->Animate(hdwp, origin);
-         if (!hdwp)
-           break;
-@@ -252,7 +276,11 @@
-     int target_pos = 0;
-     for (auto&& inst : instances_) {
-       if (inst.hwnd) {
-+<<<<<<< .our
-         auto* toast = Toast::Get(inst.hwnd);
-+=======
-+        auto toast = Toast::Get(inst.hwnd);
-+>>>>>>> .their
- 
-         if (toast->IsHighlighted())
-           target_pos = toast->GetVerticalPosition();
-@@ -295,9 +323,15 @@
-   }
- 
-   // Dismiss active toast
-+<<<<<<< .our
-   auto* hwnd = GetToast(notification.data_.get());
-   if (hwnd) {
-     auto* toast = Toast::Get(hwnd);
-+=======
-+  auto hwnd = GetToast(notification.data_.get());
-+  if (hwnd) {
-+    auto toast = Toast::Get(hwnd);
-+>>>>>>> .their
-     toast->Dismiss();
-   }
- }
-@@ -310,8 +344,13 @@
- }
- 
- void DesktopNotificationController::CreateToast(NotificationLink&& data) {
-+<<<<<<< .our
-   auto* hinstance = RegisterWndClasses();
-   auto* hwnd = Toast::Create(hinstance, data);
-+=======
-+  auto hinstance = RegisterWndClasses();
-+  auto hwnd = Toast::Create(hinstance, data);
-+>>>>>>> .their
-   if (hwnd) {
-     int toast_pos = 0;
-     if (!instances_.empty()) {
-@@ -319,7 +358,11 @@
-       _ASSERT(item.hwnd);
- 
-       ScreenMetrics scr;
-+<<<<<<< .our
-       auto* toast = Toast::Get(item.hwnd);
-+=======
-+      auto toast = Toast::Get(item.hwnd);
-+>>>>>>> .their
-       toast_pos = toast->GetVerticalPosition() + toast->GetHeight() +
-                   scr.Y(toast_margin_);
-     }
-@@ -333,7 +376,11 @@
-                                       NULL, hinstance, this);
-     }
- 
-+<<<<<<< .our
-     auto* toast = Toast::Get(hwnd);
-+=======
-+    auto toast = Toast::Get(hwnd);
-+>>>>>>> .their
-     toast->PopUp(toast_pos);
-   }
- }
-@@ -363,18 +410,24 @@
-   }
- }
- 
-+<<<<<<< .our
- DesktopNotificationController::Notification::Notification() = default;
- DesktopNotificationController::Notification::Notification(
-   const DesktopNotificationController::Notification&) = default;
- 
-+=======
-+>>>>>>> .their
- DesktopNotificationController::Notification::Notification(
-     const shared_ptr<NotificationData>& data)
-     : data_(data) {
-   _ASSERT(data != nullptr);
- }
- 
-+<<<<<<< .our
- DesktopNotificationController::Notification::~Notification() = default;
- 
-+=======
-+>>>>>>> .their
- bool DesktopNotificationController::Notification::operator==(
-     const Notification& other) const {
-   return data_ == other.data_;
-@@ -405,9 +458,15 @@
-   data_->body_text = move(body_text);
-   data_->image = CopyBitmap(image);
- 
-+<<<<<<< .our
-   auto* hwnd = data_->controller->GetToast(data_.get());
-   if (hwnd) {
-     auto* toast = Toast::Get(hwnd);
-+=======
-+  auto hwnd = data_->controller->GetToast(data_.get());
-+  if (hwnd) {
-+    auto toast = Toast::Get(hwnd);
-+>>>>>>> .their
-     toast->ResetContents();
-   }
- 
-@@ -422,7 +481,11 @@
- }
- 
- DesktopNotificationController::NotificationLink::~NotificationLink() {
-+<<<<<<< .our
-   auto* p = get();
-+=======
-+  auto p = get();
-+>>>>>>> .their
-   if (p)
-     p->controller = nullptr;
- }
-added in both
-  our    100644 d6d8fd35a2958b39dc0f6a76b4ee110b2951c832 brightray/browser/win/win32_desktop_notifications/desktop_notification_controller.h
-  their  100644 ad62fa727b453510e07917ee718e830e8ac84d2d brightray/browser/win/win32_desktop_notifications/desktop_notification_controller.h
-@@ -76,7 +76,12 @@
-   void DestroyToast(ToastInstance& inst);
- 
-  private:
-+<<<<<<< .our
-   static const TCHAR class_name_[];
-+=======
-+  static constexpr const TCHAR class_name_[] =
-+      TEXT("DesktopNotificationController");
-+>>>>>>> .their
- 
-   HWND hwnd_controller_ = NULL;
-   HFONT caption_font_ = NULL, body_font_ = NULL;
-@@ -87,10 +92,15 @@
- 
- class DesktopNotificationController::Notification {
-  public:
-+<<<<<<< .our
-   Notification();
-   explicit Notification(const std::shared_ptr<NotificationData>& data);
-   Notification(const Notification&);
-   ~Notification();
-+=======
-+  Notification() = default;
-+  explicit Notification(const std::shared_ptr<NotificationData>& data);
-+>>>>>>> .their
- 
-   bool operator==(const Notification& other) const;
- 
-added in both
-  our    100644 061eb977a8dc58f07aff1370467f88b10aec8003 brightray/browser/win/win32_desktop_notifications/toast.cc
-  their  100644 9a1e7cb099e83e4b6af7c5bcdde3f5c83d09e454 brightray/browser/win/win32_desktop_notifications/toast.cc
-@@ -1,11 +1,18 @@
-+<<<<<<< .our
- #ifndef NOMINMAX
- #define NOMINMAX
- #endif
-+=======
-+#define NOMINMAX
-+>>>>>>> .their
- #include "brightray/browser/win/win32_desktop_notifications/toast.h"
- #include <uxtheme.h>
- #include <windowsx.h>
- #include <algorithm>
-+<<<<<<< .our
- #include "base/logging.h"
-+=======
-+>>>>>>> .their
- #include "brightray/browser/win/win32_desktop_notifications/common.h"
- 
- #pragma comment(lib, "msimg32.lib")
-@@ -86,7 +93,11 @@
-       if (GetDIBits(hdc_screen, bitmap, 0, 0, 0,
-                     reinterpret_cast<BITMAPINFO*>(&bmi), DIB_RGB_COLORS) &&
-           bmi.biSizeImage > 0 && (bmi.biSizeImage % 4) == 0) {
-+<<<<<<< .our
-         auto* buf = reinterpret_cast<BYTE*>(
-+=======
-+        auto buf = reinterpret_cast<BYTE*>(
-+>>>>>>> .their
-             _aligned_malloc(bmi.biSizeImage, sizeof(DWORD)));
- 
-         if (buf) {
-@@ -120,12 +131,20 @@
-     bmi.biCompression = BI_RGB;
- 
-     void* color_bits;
-+<<<<<<< .our
-     auto* color_bitmap =
-+=======
-+    auto color_bitmap =
-+>>>>>>> .their
-         CreateDIBSection(NULL, reinterpret_cast<BITMAPINFO*>(&bmi),
-                          DIB_RGB_COLORS, &color_bits, NULL, 0);
- 
-     void* alpha_bits;
-+<<<<<<< .our
-     auto* alpha_bitmap =
-+=======
-+    auto alpha_bitmap =
-+>>>>>>> .their
-         CreateDIBSection(NULL, reinterpret_cast<BITMAPINFO*>(&bmi),
-                          DIB_RGB_COLORS, &alpha_bits, NULL, 0);
- 
-@@ -151,9 +170,15 @@
-       GdiFlush();
- 
-       // apply the alpha channel
-+<<<<<<< .our
-       auto* dest = reinterpret_cast<BYTE*>(color_bits);
-       auto* src = reinterpret_cast<const BYTE*>(alpha_bits);
-       auto* end = src + (width * height * 4);
-+=======
-+      auto dest = reinterpret_cast<BYTE*>(color_bits);
-+      auto src = reinterpret_cast<const BYTE*>(alpha_bits);
-+      auto end = src + (width * height * 4);
-+>>>>>>> .their
-       while (src != end) {
-         dest[3] = src[0];
-         dest += 4;
-@@ -184,9 +209,12 @@
-   return result_bitmap;
- }
- 
-+<<<<<<< .our
- const TCHAR DesktopNotificationController::Toast::class_name_[] =
-     TEXT("DesktopNotificationToast");
- 
-+=======
-+>>>>>>> .their
- DesktopNotificationController::Toast::Toast(HWND hwnd,
-                                             shared_ptr<NotificationData>* data)
-     : hwnd_(hwnd), data_(*data) {
-@@ -220,10 +248,17 @@
-                                                       LPARAM lparam) {
-   switch (message) {
-     case WM_CREATE: {
-+<<<<<<< .our
-       auto*& cs = reinterpret_cast<const CREATESTRUCT*&>(lparam);
-       auto* data =
-           static_cast<shared_ptr<NotificationData>*>(cs->lpCreateParams);
-       auto* inst = new Toast(hwnd, data);
-+=======
-+      auto& cs = reinterpret_cast<const CREATESTRUCT*&>(lparam);
-+      auto data =
-+          static_cast<shared_ptr<NotificationData>*>(cs->lpCreateParams);
-+      auto inst = new Toast(hwnd, data);
-+>>>>>>> .their
-       SetWindowLongPtr(hwnd, 0, (LONG_PTR)inst);
-     } break;
- 
-@@ -242,7 +277,11 @@
-       return 0;
- 
-     case WM_LBUTTONDOWN: {
-+<<<<<<< .our
-       auto* inst = Get(hwnd);
-+=======
-+      auto inst = Get(hwnd);
-+>>>>>>> .their
- 
-       inst->Dismiss();
- 
-@@ -255,7 +294,11 @@
-       return 0;
- 
-     case WM_MOUSEMOVE: {
-+<<<<<<< .our
-       auto* inst = Get(hwnd);
-+=======
-+      auto inst = Get(hwnd);
-+>>>>>>> .their
-       if (!inst->is_highlighted_) {
-         inst->is_highlighted_ = true;
- 
-@@ -275,7 +318,11 @@
-       return 0;
- 
-     case WM_MOUSELEAVE: {
-+<<<<<<< .our
-       auto* inst = Get(hwnd);
-+=======
-+      auto inst = Get(hwnd);
-+>>>>>>> .their
-       inst->is_highlighted_ = false;
-       inst->is_close_hot_ = false;
-       inst->UpdateContents();
-@@ -289,7 +336,11 @@
-       return 0;
- 
-     case WM_WINDOWPOSCHANGED: {
-+<<<<<<< .our
-       auto*& wp = reinterpret_cast<WINDOWPOS*&>(lparam);
-+=======
-+      auto& wp = reinterpret_cast<WINDOWPOS*&>(lparam);
-+>>>>>>> .their
-       if (wp->flags & SWP_HIDEWINDOW) {
-         if (!IsWindowVisible(hwnd))
-           Get(hwnd)->is_highlighted_ = false;
-@@ -363,7 +414,11 @@
- 
-   // Draw background
-   {
-+<<<<<<< .our
-     auto* brush = CreateSolidBrush(back_color);
-+=======
-+    auto brush = CreateSolidBrush(back_color);
-+>>>>>>> .their
- 
-     RECT rc = {0, 0, toast_size_.cx, toast_size_.cy};
-     FillRect(hdc_, &rc, brush);
-@@ -374,8 +429,13 @@
-   SetBkMode(hdc_, TRANSPARENT);
- 
-   const auto close = L'\x2715';
-+<<<<<<< .our
-   auto* caption_font = data_->controller->GetCaptionFont();
-   auto* body_font = data_->controller->GetBodyFont();
-+=======
-+  auto caption_font = data_->controller->GetCaptionFont();
-+  auto body_font = data_->controller->GetBodyFont();
-+>>>>>>> .their
- 
-   TEXTMETRIC tm_cap;
-   SelectFont(hdc_, caption_font);
-@@ -526,7 +586,11 @@
-     if (new_size.cx != this->toast_size_.cx ||
-         new_size.cy != this->toast_size_.cy) {
-       HDC hdc_screen = GetDC(NULL);
-+<<<<<<< .our
-       auto* new_bitmap =
-+=======
-+      auto new_bitmap =
-+>>>>>>> .their
-           CreateCompatibleBitmap(hdc_screen, new_size.cx, new_size.cy);
-       ReleaseDC(NULL, hdc_screen);
- 
-@@ -567,7 +631,11 @@
-             auto b1 = UpdateLayeredWindowIndirect(hwnd_, &ulw);
-             ulw.prcDirty = &dirty2;
-             auto b2 = UpdateLayeredWindowIndirect(hwnd_, &ulw);
-+<<<<<<< .our
-             DCHECK(b1 && b2);
-+=======
-+            _ASSERT(b1 && b2);
-+>>>>>>> .their
-           }
- 
-           return;
-@@ -739,21 +807,33 @@
-   // ULWI fails, which can happen when one of the dimensions is zero (e.g.
-   // at the beginning of ease-in).
- 
-+<<<<<<< .our
-   UpdateLayeredWindowIndirect(hwnd_, &ulw);
-+=======
-+  auto ulw_result = UpdateLayeredWindowIndirect(hwnd_, &ulw);
-+>>>>>>> .their
-   hdwp = DeferWindowPos(hdwp, hwnd_, HWND_TOPMOST, pt.x, pt.y, size.cx, size.cy,
-                         dwpFlags);
-   return hdwp;
- }
- 
- void DesktopNotificationController::Toast::StartEaseIn() {
-+<<<<<<< .our
-   DCHECK(!ease_in_active_);
-+=======
-+  _ASSERT(!ease_in_active_);
-+>>>>>>> .their
-   ease_in_start_ = GetTickCount();
-   ease_in_active_ = true;
-   data_->controller->StartAnimation();
- }
- 
- void DesktopNotificationController::Toast::StartEaseOut() {
-+<<<<<<< .our
-   DCHECK(!ease_out_active_);
-+=======
-+  _ASSERT(!ease_out_active_);
-+>>>>>>> .their
-   ease_out_start_ = GetTickCount();
-   ease_out_active_ = true;
-   data_->controller->StartAnimation();
-added in both
-  our    100644 5a0e91b5e5ca02a51d4938c853c8b14903a403b4 brightray/browser/win/win32_desktop_notifications/toast.h
-  their  100644 967697ac8ccaf5a72825446137b845ed64b44acd brightray/browser/win/win32_desktop_notifications/toast.h
-@@ -64,7 +64,11 @@
-   float AnimateStackCollapse();
- 
-  private:
-+<<<<<<< .our
-   static const TCHAR class_name_[];
-+=======
-+  static constexpr const TCHAR class_name_[] = TEXT("DesktopNotificationToast");
-+>>>>>>> .their
- 
-   const HWND hwnd_;
-   HDC hdc_;
-added in both
-  our    100644 adeb55656b5130e4cc09b7a5d82b78cc50a3b873 brightray/browser/win/win32_notification.cc
-  their  100644 d459438ea952de679d2197dec90656a87f8e2351 brightray/browser/win/win32_notification.cc
-@@ -1,6 +1,10 @@
-+<<<<<<< .our
- #ifndef WIN32_LEAN_AND_MEAN
- #define WIN32_LEAN_AND_MEAN
- #endif
-+=======
-+#define WIN32_LEAN_AND_MEAN
-+>>>>>>> .their
- 
- #include "brightray/browser/win/win32_notification.h"
- 
-@@ -13,7 +17,11 @@
- namespace brightray {
- 
- void Win32Notification::Show(const NotificationOptions& options) {
-+<<<<<<< .our
-   auto* presenter = static_cast<NotificationPresenterWin7*>(this->presenter());
-+=======
-+  auto presenter = static_cast<NotificationPresenterWin7*>(this->presenter());
-+>>>>>>> .their
-   if (!presenter)
-     return;
- 
-added in both
-  our    100644 a87ca051ff4ca81b0e4d6130ca3c7a2106204bdd brightray/browser/win/windows_toast_notification.cc
-  their  100644 72adba548493129d094fc044ae76ddf616dc10a3 brightray/browser/win/windows_toast_notification.cc
-@@ -80,7 +80,11 @@
- }
- 
- void WindowsToastNotification::Show(const NotificationOptions& options) {
-+<<<<<<< .our
-   auto* presenter_win = static_cast<NotificationPresenterWin*>(presenter());
-+=======
-+  auto presenter_win = static_cast<NotificationPresenterWin*>(presenter());
-+>>>>>>> .their
-   std::wstring icon_path =
-       presenter_win->SaveIconToFilesystem(options.icon, options.icon_url);
- 
-added in both
-  our    100644 6e368fb38dcb9e2fbf6d6108e39c5cfb25a5b7a5 brightray/browser/win/windows_toast_notification.h
-  their  100644 62c8b844c753ae5a35c676cdca1adcab8018f65b brightray/browser/win/windows_toast_notification.h
-@@ -47,7 +47,11 @@
- 
-   WindowsToastNotification(NotificationDelegate* delegate,
-                            NotificationPresenter* presenter);
-+<<<<<<< .our
-   ~WindowsToastNotification() override;
-+=======
-+  ~WindowsToastNotification();
-+>>>>>>> .their
- 
-  protected:
-   // Notification:
-@@ -108,7 +112,11 @@
-                                               DesktopToastFailedEventHandler> {
-  public:
-   explicit ToastEventHandler(Notification* notification);
-+<<<<<<< .our
-   ~ToastEventHandler() override;
-+=======
-+  ~ToastEventHandler();
-+>>>>>>> .their
- 
-   IFACEMETHODIMP Invoke(
-       ABI::Windows::UI::Notifications::IToastNotification* sender,
-added in both
-  our    100644 407866f006d51ac528efaba97cb3750687229900 brightray/common/application_info.h
-  their  100644 a4918cc7c3d5b3f73a5e50b2adeccbb4e527c127 brightray/common/application_info.h
-@@ -2,7 +2,10 @@
- #define BRIGHTRAY_COMMON_APPLICATION_INFO_H_
- 
- #if defined(OS_WIN)
-+<<<<<<< .our
- #include "base/strings/string16.h"
-+=======
-+>>>>>>> .their
- #include "brightray/browser/win/scoped_hstring.h"
- #endif
- 
-added in both
-  our    100644 a0256372bbdbbc1d77cb84885faab42a27f55c9f brightray/common/application_info_win.cc
-  their  100644 49a3720f01e97316b58791c9c6e8333c8d0d8314 brightray/common/application_info_win.cc
-@@ -22,14 +22,22 @@
- const wchar_t kAppUserModelIDFormat[] = L"electron.app.$1";
- 
- std::string GetApplicationName() {
-+<<<<<<< .our
-   auto* module = GetModuleHandle(nullptr);
-+=======
-+  auto module = GetModuleHandle(nullptr);
-+>>>>>>> .their
-   std::unique_ptr<FileVersionInfo> info(
-       FileVersionInfo::CreateFileVersionInfoForModule(module));
-   return base::UTF16ToUTF8(info->product_name());
- }
- 
- std::string GetApplicationVersion() {
-+<<<<<<< .our
-   auto* module = GetModuleHandle(nullptr);
-+=======
-+  auto module = GetModuleHandle(nullptr);
-+>>>>>>> .their
-   std::unique_ptr<FileVersionInfo> info(
-       FileVersionInfo::CreateFileVersionInfoForModule(module));
-   return base::UTF16ToUTF8(info->product_version());
-added in both
-  our    100644 c25cb5f0c02e6b29139cb44f01d8aab69b713381 brightray/common/main_delegate.cc
-  their  100644 5f94601be9163415329b6fa5bf372ecb8445bb79 brightray/common/main_delegate.cc
-@@ -48,6 +48,7 @@
-   if (initialized)
-     ui::ResourceBundle::CleanupSharedInstance();
- 
-+<<<<<<< .our
-   // Load other resource files.
-   base::FilePath pak_dir;
- #if defined(OS_MACOSX)
-@@ -70,6 +71,21 @@
-   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
-   bundle.ReloadLocaleResources(locale);
- 
-+=======
-+  ui::ResourceBundle::InitSharedInstanceWithLocale(
-+      locale, nullptr, ui::ResourceBundle::DO_NOT_LOAD_COMMON_RESOURCES);
-+
-+  ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
-+  bundle.ReloadLocaleResources(locale);
-+
-+  // Load other resource files.
-+  base::FilePath pak_dir;
-+#if defined(OS_MACOSX)
-+  pak_dir = base::mac::FrameworkBundlePath().Append("Resources");
-+#else
-+  PathService::Get(base::DIR_MODULE, &pak_dir);
-+#endif
-+>>>>>>> .their
-   bundle.AddDataPackFromPath(
-       pak_dir.Append(FILE_PATH_LITERAL("content_shell.pak")),
-       ui::GetSupportedScaleFactors()[0]);
-@@ -90,7 +106,10 @@
-   bundle.AddDataPackFromPath(
-       pak_dir.Append(FILE_PATH_LITERAL("views_resources_200_percent.pak")),
-       ui::SCALE_FACTOR_200P);
-+<<<<<<< .our
- #endif
-+=======
-+>>>>>>> .their
- }
- 
- MainDelegate::MainDelegate() {}
-added in both
-  our    100644 ef7a138375bd73c593b44bc93390318f3d24453f brightray/common/switches.cc
-  their  100644 9985f9f15e0b79203aabf417f41d5b50c7d24bb5 brightray/common/switches.cc
-@@ -50,6 +50,12 @@
- const char kAuthNegotiateDelegateWhitelist[] =
-     "auth-negotiate-delegate-whitelist";
- 
-+<<<<<<< .our
-+=======
-+// Forces the maximum disk space to be used by the disk cache, in bytes.
-+const char kDiskCacheSize[] = "disk-cache-size";
-+
-+>>>>>>> .their
- }  // namespace switches
- 
- }  // namespace brightray
-added in both
-  our    100644 3af00813830f724d193c923d3d5794be2be793b2 brightray/common/switches.h
-  their  100644 6262f5f962ca204cd3ccc354f7d85662a484902f brightray/common/switches.h
-@@ -17,6 +17,10 @@
- extern const char kDisableHttp2[];
- extern const char kAuthServerWhitelist[];
- extern const char kAuthNegotiateDelegateWhitelist[];
-+<<<<<<< .our
-+=======
-+extern const char kDiskCacheSize[];
-+>>>>>>> .their
- 
- }  // namespace switches
- 
-added in both
-  our    100644 b9e2d96175f8ee2d407db9c49b2e2b74756327de brightray/filenames.gypi
-  their  100644 0d79b5faf74f5e113b69137d6f2ab9986ff79f09 brightray/filenames.gypi
-@@ -51,6 +51,11 @@
-       'browser/net/require_ct_delegate.h',
-       'browser/net_log.cc',
-       'browser/net_log.h',
-+<<<<<<< .our
-+=======
-+      'browser/network_delegate.cc',
-+      'browser/network_delegate.h',
-+>>>>>>> .their
-       'browser/notification_delegate.h',
-       'browser/notification_presenter.cc',
-       'browser/notification_presenter.h',
-@@ -79,6 +84,11 @@
-       'browser/win/win32_notification.h',
-       'browser/win/windows_toast_notification.cc',
-       'browser/win/windows_toast_notification.h',
-+<<<<<<< .our
-+=======
-+      'browser/special_storage_policy.cc',
-+      'browser/special_storage_policy.h',
-+>>>>>>> .their
-       'browser/url_request_context_getter.cc',
-       'browser/url_request_context_getter.h',
-       'browser/views/inspectable_web_contents_view_views.h',
-added in both
-  our    100644 110a1d892892d3e27618574c45ae9c12757eb280 build/asar.gni
-  their  100644 d9298e82d42b072c6b0c0173f913561c80eafd32 build/asar.gni
-@@ -1,5 +1,6 @@
- import("npm.gni")
- 
-+<<<<<<< .our
- # Run an action with a given working directory. Behaves identically to the
- # action() target type, with the exception that it changes directory before
- # running the script.
-@@ -30,11 +31,14 @@
-   }
- }
- 
-+=======
-+>>>>>>> .their
- template("asar") {
-   assert(defined(invoker.sources),
-          "Need sources in $target_name listing the JS files.")
-   assert(defined(invoker.outputs),
-          "Need asar name (as 1-element array, e.g. \$root_out_dir/foo.asar)")
-+<<<<<<< .our
-   assert(defined(invoker.root), "Need asar root directory")
-   asar_root = invoker.root
- 
-@@ -46,5 +50,27 @@
-     script = "//electron/tools/js2asar.py"
-     cwd = rebase_path(get_path_info(".", "abspath"))
-     args = rebase_path(outputs, cwd) + [ asar_root ] + rebase_path(sources, ".")
-+=======
-+  assert(defined(invoker.root),
-+         "Need asar root directory")
-+  asar_root = invoker.root
-+  copy_target_name = target_name + "_inputs"
-+  copy(copy_target_name) {
-+    sources = invoker.sources
-+    outputs = [
-+      "$target_gen_dir/$target_name/{{source_target_relative}}"
-+    ]
-+  }
-+  npm_action(target_name) {
-+    forward_variables_from(invoker, ["deps", "public_deps"])
-+    deps = [":$copy_target_name"]
-+    sources = invoker.sources
-+    script = "asar"
-+    outputs = invoker.outputs
-+    args = [
-+      "pack",
-+      rebase_path("$target_gen_dir/$target_name/$asar_root")
-+    ] + rebase_path(outputs)
-+>>>>>>> .their
-   }
- }
-added in remote
-  their  100644 59a181b1ac668b563384e6d3f40b3693845532b3 build/node/BUILD.gn
-@@ -0,0 +1,113 @@
-+action("configure_node") {
-+  script = "//third_party/electron_node/configure"
-+  args = [
-+    "--enable-static",
-+    "--release-urlbase=https://atom.io/download/electron",
-+    "--shared",
-+    "--shared-openssl",
-+    "--shared-openssl-includes=" + rebase_path("//third_party/boringssl/src/include"),
-+    "--shared-openssl-libname=boringssl",
-+    "--shared-openssl-libpath=" + rebase_path(root_out_dir),
-+    "--without-npm",
-+    "--without-bundled-v8",
-+    "--without-dtrace",
-+    "--without-etw",
-+    "--without-perfctr",
-+    "--without-v8-platform",
-+    "--without-intl",
-+    "--prefix=",
-+    "--config-out-dir=" + rebase_path(target_gen_dir),
-+    "--no-run-gyp",
-+  ]
-+  outputs = [
-+    "$target_gen_dir/config.gypi",
-+  ]
-+}
-+
-+action("gyp_node") {
-+  script = "//tools/gyp/gyp_main.py"
-+  deps = [ ":configure_node" ]
-+  inputs = [
-+    "//third_party/electron_node/common.gypi",
-+    "//third_party/electron_node/node.gyp",
-+    "//third_party/electron_node/node.gypi",
-+    "$target_gen_dir/config.gypi",
-+    "node_override.gypi",
-+  ]
-+  outputs = [
-+    "$target_out_dir/Release/build.ninja",
-+  ]
-+
-+  # TODO(jeremy): should shlib_suffix be set inside node.gypi?
-+  if (is_mac) {
-+    shlib_suffix = "dylib"
-+  } else if (is_linux) {
-+    shlib_suffix = "so"
-+  }
-+  args = [
-+    "-I", rebase_path("$target_gen_dir/config.gypi", root_build_dir),
-+    "-I", rebase_path("node_override.gypi", root_build_dir),
-+    "-I", rebase_path("//third_party/electron_node/common.gypi", root_build_dir),
-+    "-D", "component=shared_library",
-+    "-D", "target_arch=$target_cpu",
-+    "-D", "host_arch=$host_cpu",
-+    "-D", "config_gypi=" + rebase_path("$target_gen_dir/config.gypi"),
-+    "-Goutput_dir=./$target_out_dir", # bizarrely, gyp generates from the build root instead of from cwd
-+    "-fninja",
-+    rebase_path("//third_party/electron_node/node.gyp", root_build_dir),
-+  ]
-+}
-+
-+action("build_node") {
-+  deps = [
-+    "//third_party/boringssl",
-+    "//third_party/icu",
-+    "//v8",
-+    "//v8:v8_libbase",
-+    "//v8:v8_libplatform",
-+    ":gyp_node",
-+  ]
-+  script = "//electron/build/run-ninja.py"
-+  args = [
-+    "-C", rebase_path(target_out_dir, root_build_dir) + "/Release",
-+    "node_lib"
-+  ]
-+  if (is_mac) {
-+    outputs = [ "$target_out_dir/Release/libnode.dylib" ]
-+  }
-+  if (is_linux) {
-+    outputs = [ "$target_out_dir/Release/lib/libnode.so" ]
-+  }
-+}
-+
-+node_libs = get_target_outputs(":build_node")
-+
-+copy("copy_node") {
-+  deps = [ ":build_node" ]
-+  sources = node_libs
-+  outputs = [ "$root_out_dir/{{source_file_part}}" ]
-+}
-+
-+config("node_config") {
-+  include_dirs = [
-+    "//third_party/electron_node/src",
-+    "//third_party/electron_node/deps/uv/include",
-+    "//third_party/electron_node/deps/cares/include",
-+  ]
-+  libs = node_libs
-+  cflags_cc = [
-+    "-Wno-deprecated-declarations",
-+  ]
-+  defines = [
-+    # We need to access internal implementations of Node.
-+    "NODE_WANT_INTERNALS=1",
-+    "NODE_SHARED_MODE",
-+    "HAVE_OPENSSL=1",
-+    "HAVE_INSPECTOR=1",
-+  ]
-+}
-+
-+group("node") {
-+  public_configs = [ ":node_config" ]
-+  public_deps = [ ":copy_node" ]
-+}
-added in remote
-  their  100644 01ff4ff249786f56c7162ab4d0272711e61395a9 build/node/node_override.gypi
-@@ -0,0 +1,41 @@
-+{
-+  'variables': {
-+    # Node disables the inspector unless icu is enabled. But node doesn't know
-+    # that we're building v8 with icu, so force it on.
-+    'v8_enable_inspector': 1,
-+
-+    # By default, node will build a dylib called something like
-+    # libnode.$node_module_version.dylib, which is inconvenient for our
-+    # purposes (since it makes the library's name unpredictable). This forces
-+    # it to drop the module_version from the filename and just produce
-+    # `libnode.dylib`.
-+    'shlib_suffix': 'dylib',
-+  },
-+  'target_defaults': {
-+    'target_conditions': [
-+      ['_target_name=="node_lib"', {
-+        'include_dirs': [
-+          '../../../v8',
-+          '../../../v8/include',
-+          '../../../third_party/icu/source/common',
-+          '../../../third_party/icu/source/i18n',
-+        ],
-+        'libraries': [
-+          '../../../../../../libv8.dylib',
-+          '../../../../../../libv8_libbase.dylib',
-+          '../../../../../../libv8_libplatform.dylib',
-+          '../../../../../../libicuuc.dylib',
-+        ],
-+        'defines': [
-+          # These will no longer be necessary once
-+          # https://github.com/google/boringssl/commit/a02ed04d527e1b57b4efaa0b4f9bdbc1ed5975b2
-+          # is in the past for Electron
-+          'EVP_CIPH_CCM_MODE=0',
-+          'EVP_CIPH_WRAP_MODE=0',
-+          'EVP_CIPHER_CTX_FLAG_WRAP_ALLOW=0',
-+          'EVP_CIPHER_CTX_set_flags(...)',
-+        ],
-+      }],
-+    ],
-+  },
-+}
-added in remote
-  their  100644 802b17d51df17893196e59446fcbf6fb495310e4 build/node/toolchain.gypi
-@@ -0,0 +1,35 @@
-+{
-+  'variables': {
-+    'llvm_dir': '<(chromium_src_dir)/third_party/llvm-build/Release+Asserts',
-+  },
-+  'conditions': [
-+    ['clang==1', {
-+      'make_global_settings': [
-+        ['CC', '<(llvm_dir)/bin/clang'],
-+        ['CXX', '<(llvm_dir)/bin/clang++'],
-+        ['CC.host', '$(CC)'],
-+        ['CXX.host', '$(CXX)'],
-+      ],
-+      'target_defaults': {
-+        'target_conditions': [
-+          ['OS=="linux" and _toolset=="target"', {
-+            'cflags_cc': [
-+              '-std=gnu++14',
-+              '-nostdinc++',
-+              '-isystem<(chromium_src_dir)/buildtools/third_party/libc++/trunk/include',
-+              '-isystem<(chromium_src_dir)/buildtools/third_party/libc++abi/trunk/include',
-+            ],
-+            'ldflags': [
-+              '-nostdlib++',
-+            ],
-+          }],
-+          ['OS=="linux" and _toolset=="host"', {
-+            'cflags_cc': [
-+              '-std=gnu++14',
-+            ],
-+          }],
-+        ],
-+      },
-+    }],  # clang==1
-+  ],
-+}
-added in both
-  our    100644 1a8b6dddefd1d868bb9d2453655223742b227976 chromium_src/chrome/browser/extensions/global_shortcut_listener_win.h
-  their  100644 83e9fdff283fb9e582ed7cd65365ec88cd925530 chromium_src/chrome/browser/extensions/global_shortcut_listener_win.h
-@@ -21,17 +21,30 @@
- class GlobalShortcutListenerWin : public GlobalShortcutListener {
-  public:
-   GlobalShortcutListenerWin();
-+<<<<<<< .our
-   ~GlobalShortcutListenerWin() override;
-+=======
-+  virtual ~GlobalShortcutListenerWin();
-+>>>>>>> .their
- 
-  private:
-   // The implementation of our Window Proc, called by SingletonHwndObserver.
-   void OnWndProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam);
- 
-   // GlobalShortcutListener implementation.
-+<<<<<<< .our
-   void StartListening() override;
-   void StopListening() override;
-   bool RegisterAcceleratorImpl(const ui::Accelerator& accelerator) override;
-   void UnregisterAcceleratorImpl(const ui::Accelerator& accelerator) override;
-+=======
-+  virtual void StartListening() override;
-+  virtual void StopListening() override;
-+  virtual bool RegisterAcceleratorImpl(
-+      const ui::Accelerator& accelerator) override;
-+  virtual void UnregisterAcceleratorImpl(
-+      const ui::Accelerator& accelerator) override;
-+>>>>>>> .their
- 
-   // Whether this object is listening for global shortcuts.
-   bool is_listening_;
-added in remote
-  their  100644 28229a178e6ca1103e5b0fdffc9718a5bd8d79b8 chromium_src/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc
-@@ -0,0 +1,94 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h"
-+
-+#include "build/build_config.h"
-+#include "chrome/browser/renderer_host/pepper/pepper_broker_message_filter.h"
-+#include "chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h"
-+#include "chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.h"
-+#include "chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h"
-+#include "chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h"
-+#include "content/public/browser/browser_ppapi_host.h"
-+#include "ppapi/host/message_filter_host.h"
-+#include "ppapi/host/ppapi_host.h"
-+#include "ppapi/host/resource_host.h"
-+#include "ppapi/proxy/ppapi_messages.h"
-+#include "ppapi/shared_impl/ppapi_permissions.h"
-+
-+using ppapi::host::MessageFilterHost;
-+using ppapi::host::ResourceHost;
-+using ppapi::host::ResourceMessageFilter;
-+
-+namespace chrome {
-+
-+ChromeBrowserPepperHostFactory::ChromeBrowserPepperHostFactory(
-+    content::BrowserPpapiHost* host)
-+    : host_(host) {}
-+
-+ChromeBrowserPepperHostFactory::~ChromeBrowserPepperHostFactory() {}
-+
-+std::unique_ptr<ResourceHost>
-+ChromeBrowserPepperHostFactory::CreateResourceHost(
-+    ppapi::host::PpapiHost* host,
-+    PP_Resource resource,
-+    PP_Instance instance,
-+    const IPC::Message& message) {
-+  DCHECK(host == host_->GetPpapiHost());
-+
-+  // Make sure the plugin is giving us a valid instance for this resource.
-+  if (!host_->IsValidInstance(instance))
-+    return std::unique_ptr<ResourceHost>();
-+
-+  // Private interfaces.
-+  if (host_->GetPpapiHost()->permissions().HasPermission(
-+          ppapi::PERMISSION_PRIVATE)) {
-+    switch (message.type()) {
-+      case PpapiHostMsg_Broker_Create::ID: {
-+        scoped_refptr<ResourceMessageFilter> broker_filter(
-+            new PepperBrokerMessageFilter(instance, host_));
-+        return std::unique_ptr<ResourceHost>(new MessageFilterHost(
-+            host_->GetPpapiHost(), instance, resource, broker_filter));
-+      }
-+    }
-+  }
-+
-+  // Flash interfaces.
-+  if (host_->GetPpapiHost()->permissions().HasPermission(
-+          ppapi::PERMISSION_FLASH)) {
-+    switch (message.type()) {
-+      case PpapiHostMsg_Flash_Create::ID:
-+        return std::unique_ptr<ResourceHost>(
-+            new PepperFlashBrowserHost(host_, instance, resource));
-+      case PpapiHostMsg_FlashClipboard_Create::ID: {
-+        scoped_refptr<ResourceMessageFilter> clipboard_filter(
-+            new PepperFlashClipboardMessageFilter);
-+        return std::unique_ptr<ResourceHost>(new MessageFilterHost(
-+            host_->GetPpapiHost(), instance, resource, clipboard_filter));
-+      }
-+      case PpapiHostMsg_FlashDRM_Create::ID:
-+        return std::unique_ptr<ResourceHost>(
-+            new chrome::PepperFlashDRMHost(host_, instance, resource));
-+    }
-+  }
-+
-+  // Permissions for the following interfaces will be checked at the
-+  // time of the corresponding instance's methods calls (because
-+  // permission check can be performed only on the UI
-+  // thread). Currently these interfaces are available only for
-+  // whitelisted apps which may not have access to the other private
-+  // interfaces.
-+  if (message.type() == PpapiHostMsg_IsolatedFileSystem_Create::ID) {
-+    PepperIsolatedFileSystemMessageFilter* isolated_fs_filter =
-+        PepperIsolatedFileSystemMessageFilter::Create(instance, host_);
-+    if (!isolated_fs_filter)
-+      return std::unique_ptr<ResourceHost>();
-+    return std::unique_ptr<ResourceHost>(
-+        new MessageFilterHost(host, instance, resource, isolated_fs_filter));
-+  }
-+
-+  return std::unique_ptr<ResourceHost>();
-+}
-+
-+}  // namespace chrome
-added in remote
-  their  100644 84385140ceca7e4eb2e16b2a0802714fd0aa392b chromium_src/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h
-@@ -0,0 +1,38 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_BROWSER_RENDERER_HOST_PEPPER_CHROME_BROWSER_PEPPER_HOST_FACTORY_H_
-+#define CHROME_BROWSER_RENDERER_HOST_PEPPER_CHROME_BROWSER_PEPPER_HOST_FACTORY_H_
-+
-+#include "base/macros.h"
-+#include "ppapi/host/host_factory.h"
-+
-+namespace content {
-+class BrowserPpapiHost;
-+}  // namespace content
-+
-+namespace chrome {
-+
-+class ChromeBrowserPepperHostFactory : public ppapi::host::HostFactory {
-+ public:
-+  // Non-owning pointer to the filter must outlive this class.
-+  explicit ChromeBrowserPepperHostFactory(content::BrowserPpapiHost* host);
-+  ~ChromeBrowserPepperHostFactory() override;
-+
-+  std::unique_ptr<ppapi::host::ResourceHost> CreateResourceHost(
-+      ppapi::host::PpapiHost* host,
-+      PP_Resource resource,
-+      PP_Instance instance,
-+      const IPC::Message& message) override;
-+
-+ private:
-+  // Non-owning pointer.
-+  content::BrowserPpapiHost* host_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(ChromeBrowserPepperHostFactory);
-+};
-+
-+}  // namespace chrome
-+
-+#endif  // CHROME_BROWSER_RENDERER_HOST_PEPPER_CHROME_BROWSER_PEPPER_HOST_FACTORY_H_
-added in remote
-  their  100644 cc10ee85780caa46817802f861e38f9ce9af9d61 chromium_src/chrome/browser/renderer_host/pepper/monitor_finder_mac.h
-@@ -0,0 +1,52 @@
-+// Copyright 2014 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_BROWSER_RENDERER_HOST_PEPPER_MONITOR_FINDER_MAC_H_
-+#define CHROME_BROWSER_RENDERER_HOST_PEPPER_MONITOR_FINDER_MAC_H_
-+
-+#include <ApplicationServices/ApplicationServices.h>
-+#include <stdint.h>
-+
-+#include "base/macros.h"
-+#include "base/memory/ref_counted.h"
-+#include "base/synchronization/lock.h"
-+
-+namespace chrome {
-+
-+// MonitorFinder maps a RenderFrameHost to the display ID on which the widget
-+// is painting. This class operates on the IO thread while the RenderFrameHost
-+// is on the UI thread, so the value returned by GetMonitor() may be 0 until
-+// the information can be retrieved asynchronously.
-+class MonitorFinder : public base::RefCountedThreadSafe<MonitorFinder> {
-+ public:
-+  MonitorFinder(int process_id, int render_frame_id);
-+
-+  // Gets the native display ID for the <process_id, render_frame_id> tuple.
-+  int64_t GetMonitor();
-+
-+  // Checks if the given |monitor_id| represents a built-in display.
-+  static bool IsMonitorBuiltIn(int64_t monitor_id);
-+
-+ private:
-+  friend class base::RefCountedThreadSafe<MonitorFinder>;
-+  ~MonitorFinder();
-+
-+  // Method run on the UI thread to get the display information.
-+  void FetchMonitorFromWidget();
-+
-+  const int process_id_;
-+  const int render_frame_id_;
-+
-+  base::Lock mutex_;  // Protects the two members below.
-+  // Whether one request to FetchMonitorFromWidget() has been made already.
-+  bool request_sent_;
-+  // The native display ID for the RenderFrameHost.
-+  CGDirectDisplayID display_id_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(MonitorFinder);
-+};
-+
-+}  // namespace chrome
-+
-+#endif  // CHROME_BROWSER_RENDERER_HOST_PEPPER_MONITOR_FINDER_H_
-added in remote
-  their  100644 e6e0a62fa67edabae605c17ae87a38df083f70cc chromium_src/chrome/browser/renderer_host/pepper/monitor_finder_mac.mm
-@@ -0,0 +1,61 @@
-+// Copyright 2014 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/browser/renderer_host/pepper/monitor_finder_mac.h"
-+
-+#import <Cocoa/Cocoa.h>
-+
-+#include "content/public/browser/browser_thread.h"
-+#include "content/public/browser/render_frame_host.h"
-+
-+namespace chrome {
-+
-+MonitorFinder::MonitorFinder(int process_id, int render_frame_id)
-+    : process_id_(process_id),
-+      render_frame_id_(render_frame_id),
-+      request_sent_(false),
-+      display_id_(kCGNullDirectDisplay) {}
-+
-+MonitorFinder::~MonitorFinder() {}
-+
-+int64_t MonitorFinder::GetMonitor() {
-+  {
-+    // The plugin may call this method several times, so avoid spamming the UI
-+    // thread with requests by only allowing one outstanding request at a time.
-+    base::AutoLock lock(mutex_);
-+    if (request_sent_)
-+      return display_id_;
-+    request_sent_ = true;
-+  }
-+
-+  content::BrowserThread::PostTask(
-+      content::BrowserThread::UI, FROM_HERE,
-+      base::Bind(&MonitorFinder::FetchMonitorFromWidget, this));
-+  return display_id_;
-+}
-+
-+// static
-+bool MonitorFinder::IsMonitorBuiltIn(int64_t display_id) {
-+  return CGDisplayIsBuiltin(display_id);
-+}
-+
-+void MonitorFinder::FetchMonitorFromWidget() {
-+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-+  content::RenderFrameHost* rfh =
-+      content::RenderFrameHost::FromID(process_id_, render_frame_id_);
-+  if (!rfh)
-+    return;
-+
-+  gfx::NativeView native_view = rfh->GetNativeView();
-+  NSWindow* window = [native_view window];
-+  NSScreen* screen = [window screen];
-+  CGDirectDisplayID display_id =
-+      [[[screen deviceDescription] objectForKey:@"NSScreenNumber"] intValue];
-+
-+  base::AutoLock lock(mutex_);
-+  request_sent_ = false;
-+  display_id_ = display_id;
-+}
-+
-+}  // namespace chrome
-added in remote
-  their  100644 d40ad53dd17d24a24f00b5c669d6e113760a1c0a chromium_src/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc
-@@ -0,0 +1,53 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/browser/renderer_host/pepper/pepper_broker_message_filter.h"
-+
-+#include <string>
-+
-+#include "content/public/browser/browser_ppapi_host.h"
-+#include "content/public/browser/browser_thread.h"
-+#include "content/public/browser/render_process_host.h"
-+#include "ipc/ipc_message_macros.h"
-+#include "ppapi/c/pp_errors.h"
-+#include "ppapi/host/dispatch_host_message.h"
-+#include "ppapi/proxy/ppapi_messages.h"
-+#include "url/gurl.h"
-+
-+using content::BrowserPpapiHost;
-+using content::BrowserThread;
-+
-+namespace chrome {
-+
-+PepperBrokerMessageFilter::PepperBrokerMessageFilter(PP_Instance instance,
-+                                                     BrowserPpapiHost* host)
-+    : document_url_(host->GetDocumentURLForInstance(instance)) {
-+  int unused;
-+  host->GetRenderFrameIDsForInstance(instance, &render_process_id_, &unused);
-+}
-+
-+PepperBrokerMessageFilter::~PepperBrokerMessageFilter() {}
-+
-+scoped_refptr<base::TaskRunner>
-+PepperBrokerMessageFilter::OverrideTaskRunnerForMessage(
-+    const IPC::Message& message) {
-+  return BrowserThread::GetTaskRunnerForThread(BrowserThread::UI);
-+}
-+
-+int32_t PepperBrokerMessageFilter::OnResourceMessageReceived(
-+    const IPC::Message& msg,
-+    ppapi::host::HostMessageContext* context) {
-+  PPAPI_BEGIN_MESSAGE_MAP(PepperBrokerMessageFilter, msg)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL_0(PpapiHostMsg_Broker_IsAllowed,
-+                                        OnIsAllowed)
-+  PPAPI_END_MESSAGE_MAP()
-+  return PP_ERROR_FAILED;
-+}
-+
-+int32_t PepperBrokerMessageFilter::OnIsAllowed(
-+    ppapi::host::HostMessageContext* context) {
-+  return PP_OK;
-+}
-+
-+}  // namespace chrome
-added in remote
-  their  100644 2aad5593b26a1eab56841e56fc56acf1d5cba28b chromium_src/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.h
-@@ -0,0 +1,51 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_BROKER_MESSAGE_FILTER_H_
-+#define CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_BROKER_MESSAGE_FILTER_H_
-+
-+#include "base/compiler_specific.h"
-+#include "ppapi/c/pp_instance.h"
-+#include "ppapi/host/resource_message_filter.h"
-+#include "url/gurl.h"
-+
-+namespace content {
-+class BrowserPpapiHost;
-+}
-+
-+namespace ppapi {
-+namespace host {
-+struct HostMessageContext;
-+}
-+}  // namespace ppapi
-+
-+namespace chrome {
-+
-+// This filter handles messages for the PepperBrokerHost on the UI thread.
-+class PepperBrokerMessageFilter : public ppapi::host::ResourceMessageFilter {
-+ public:
-+  PepperBrokerMessageFilter(PP_Instance instance,
-+                            content::BrowserPpapiHost* host);
-+
-+ private:
-+  ~PepperBrokerMessageFilter() override;
-+
-+  // ppapi::host::ResourceMessageFilter overrides.
-+  scoped_refptr<base::TaskRunner> OverrideTaskRunnerForMessage(
-+      const IPC::Message& message) override;
-+  int32_t OnResourceMessageReceived(
-+      const IPC::Message& msg,
-+      ppapi::host::HostMessageContext* context) override;
-+
-+  int32_t OnIsAllowed(ppapi::host::HostMessageContext* context);
-+
-+  int render_process_id_;
-+  GURL document_url_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(PepperBrokerMessageFilter);
-+};
-+
-+}  // namespace chrome
-+
-+#endif  // CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_BROKER_MESSAGE_FILTER_H_
-added in remote
-  their  100644 901da1ad6e221b55196a1b25a1549fa272b4fdf7 chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc
-@@ -0,0 +1,111 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h"
-+
-+#include "base/time/time.h"
-+#include "content/public/browser/browser_context.h"
-+#include "content/public/browser/browser_ppapi_host.h"
-+#include "content/public/browser/browser_thread.h"
-+#include "content/public/browser/render_process_host.h"
-+#include "ipc/ipc_message_macros.h"
-+#include "ppapi/c/pp_errors.h"
-+#include "ppapi/c/private/ppb_flash.h"
-+#include "ppapi/host/dispatch_host_message.h"
-+#include "ppapi/proxy/ppapi_messages.h"
-+#include "ppapi/proxy/resource_message_params.h"
-+#include "ppapi/shared_impl/time_conversion.h"
-+#include "url/gurl.h"
-+
-+#if defined(OS_WIN)
-+#include <windows.h>
-+#elif defined(OS_MACOSX)
-+#include <CoreServices/CoreServices.h>
-+#endif
-+
-+using content::BrowserPpapiHost;
-+using content::BrowserThread;
-+
-+namespace chrome {
-+
-+PepperFlashBrowserHost::PepperFlashBrowserHost(BrowserPpapiHost* host,
-+                                               PP_Instance instance,
-+                                               PP_Resource resource)
-+    : ResourceHost(host->GetPpapiHost(), instance, resource),
-+      host_(host),
-+      weak_factory_(this) {
-+  int unused;
-+  host->GetRenderFrameIDsForInstance(instance, &render_process_id_, &unused);
-+}
-+
-+PepperFlashBrowserHost::~PepperFlashBrowserHost() {}
-+
-+int32_t PepperFlashBrowserHost::OnResourceMessageReceived(
-+    const IPC::Message& msg,
-+    ppapi::host::HostMessageContext* context) {
-+  PPAPI_BEGIN_MESSAGE_MAP(PepperFlashBrowserHost, msg)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL_0(PpapiHostMsg_Flash_UpdateActivity,
-+                                        OnUpdateActivity)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_Flash_GetLocalTimeZoneOffset,
-+                                      OnGetLocalTimeZoneOffset)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL_0(
-+        PpapiHostMsg_Flash_GetLocalDataRestrictions, OnGetLocalDataRestrictions)
-+  PPAPI_END_MESSAGE_MAP()
-+  return PP_ERROR_FAILED;
-+}
-+
-+int32_t PepperFlashBrowserHost::OnUpdateActivity(
-+    ppapi::host::HostMessageContext* host_context) {
-+#if defined(OS_WIN)
-+  // Reading then writing back the same value to the screensaver timeout system
-+  // setting resets the countdown which prevents the screensaver from turning
-+  // on "for a while". As long as the plugin pings us with this message faster
-+  // than the screensaver timeout, it won't go on.
-+  int value = 0;
-+  if (SystemParametersInfo(SPI_GETSCREENSAVETIMEOUT, 0, &value, 0))
-+    SystemParametersInfo(SPI_SETSCREENSAVETIMEOUT, value, NULL, 0);
-+#elif defined(OS_MACOSX)
-+// UpdateSystemActivity(OverallAct);
-+#else
-+// TODO(brettw) implement this for other platforms.
-+#endif
-+  return PP_OK;
-+}
-+
-+int32_t PepperFlashBrowserHost::OnGetLocalTimeZoneOffset(
-+    ppapi::host::HostMessageContext* host_context,
-+    const base::Time& t) {
-+  // The reason for this processing being in the browser process is that on
-+  // Linux, the localtime calls require filesystem access prohibited by the
-+  // sandbox.
-+  host_context->reply_msg = PpapiPluginMsg_Flash_GetLocalTimeZoneOffsetReply(
-+      ppapi::PPGetLocalTimeZoneOffset(t));
-+  return PP_OK;
-+}
-+
-+int32_t PepperFlashBrowserHost::OnGetLocalDataRestrictions(
-+    ppapi::host::HostMessageContext* context) {
-+  // Getting the Flash LSO settings requires using the CookieSettings which
-+  // belong to the profile which lives on the UI thread. We lazily initialize
-+  // |cookie_settings_| by grabbing the reference from the UI thread and then
-+  // call |GetLocalDataRestrictions| with it.
-+  GURL document_url = host_->GetDocumentURLForInstance(pp_instance());
-+  GURL plugin_url = host_->GetPluginURLForInstance(pp_instance());
-+  GetLocalDataRestrictions(context->MakeReplyMessageContext(), document_url,
-+                           plugin_url);
-+  return PP_OK_COMPLETIONPENDING;
-+}
-+
-+void PepperFlashBrowserHost::GetLocalDataRestrictions(
-+    ppapi::host::ReplyMessageContext reply_context,
-+    const GURL& document_url,
-+    const GURL& plugin_url) {
-+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-+
-+  PP_FlashLSORestrictions restrictions = PP_FLASHLSORESTRICTIONS_NONE;
-+  SendReply(reply_context, PpapiPluginMsg_Flash_GetLocalDataRestrictionsReply(
-+                               static_cast<int32_t>(restrictions)));
-+}
-+
-+}  // namespace chrome
-added in remote
-  their  100644 65e0d02c001c6086d78d09154a515d031293227d chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h
-@@ -0,0 +1,59 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_FLASH_BROWSER_HOST_H_
-+#define CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_FLASH_BROWSER_HOST_H_
-+
-+#include "base/memory/ref_counted.h"
-+#include "base/memory/weak_ptr.h"
-+#include "ppapi/host/host_message_context.h"
-+#include "ppapi/host/resource_host.h"
-+
-+namespace base {
-+class Time;
-+}
-+
-+namespace content {
-+class BrowserPpapiHost;
-+class ResourceContext;
-+}  // namespace content
-+
-+class GURL;
-+
-+namespace chrome {
-+
-+class PepperFlashBrowserHost : public ppapi::host::ResourceHost {
-+ public:
-+  PepperFlashBrowserHost(content::BrowserPpapiHost* host,
-+                         PP_Instance instance,
-+                         PP_Resource resource);
-+  ~PepperFlashBrowserHost() override;
-+
-+  // ppapi::host::ResourceHost override.
-+  int32_t OnResourceMessageReceived(
-+      const IPC::Message& msg,
-+      ppapi::host::HostMessageContext* context) override;
-+
-+ private:
-+  int32_t OnUpdateActivity(ppapi::host::HostMessageContext* host_context);
-+  int32_t OnGetLocalTimeZoneOffset(
-+      ppapi::host::HostMessageContext* host_context,
-+      const base::Time& t);
-+  int32_t OnGetLocalDataRestrictions(ppapi::host::HostMessageContext* context);
-+
-+  void GetLocalDataRestrictions(ppapi::host::ReplyMessageContext reply_context,
-+                                const GURL& document_url,
-+                                const GURL& plugin_url);
-+
-+  content::BrowserPpapiHost* host_;
-+  int render_process_id_;
-+  // For fetching the Flash LSO settings.
-+  base::WeakPtrFactory<PepperFlashBrowserHost> weak_factory_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(PepperFlashBrowserHost);
-+};
-+
-+}  // namespace chrome
-+
-+#endif  // CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_FLASH_BROWSER_HOST_H_
-added in remote
-  their  100644 c62d2d98621d6f8cc651501111af81f7a5ade2c0 chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc
-@@ -0,0 +1,372 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.h"
-+
-+#include <stddef.h>
-+
-+#include "base/pickle.h"
-+#include "base/strings/utf_string_conversions.h"
-+#include "content/public/browser/browser_thread.h"
-+#include "ipc/ipc_message.h"
-+#include "ipc/ipc_message_macros.h"
-+#include "ppapi/c/pp_errors.h"
-+#include "ppapi/c/private/ppb_flash_clipboard.h"
-+#include "ppapi/host/dispatch_host_message.h"
-+#include "ppapi/host/host_message_context.h"
-+#include "ppapi/host/ppapi_host.h"
-+#include "ppapi/proxy/ppapi_messages.h"
-+#include "ppapi/proxy/resource_message_params.h"
-+#include "ui/base/clipboard/scoped_clipboard_writer.h"
-+
-+using content::BrowserThread;
-+
-+namespace chrome {
-+
-+namespace {
-+
-+const size_t kMaxClipboardWriteSize = 1000000;
-+
-+ui::ClipboardType ConvertClipboardType(uint32_t type) {
-+  switch (type) {
-+    case PP_FLASH_CLIPBOARD_TYPE_STANDARD:
-+      return ui::CLIPBOARD_TYPE_COPY_PASTE;
-+    case PP_FLASH_CLIPBOARD_TYPE_SELECTION:
-+      return ui::CLIPBOARD_TYPE_SELECTION;
-+  }
-+  NOTREACHED();
-+  return ui::CLIPBOARD_TYPE_COPY_PASTE;
-+}
-+
-+// Functions to pack/unpack custom data from a pickle. See the header file for
-+// more detail on custom formats in Pepper.
-+// TODO(raymes): Currently pepper custom formats are stored in their own
-+// native format type. However we should be able to store them in the same way
-+// as "Web Custom" formats are. This would allow clipboard data to be shared
-+// between pepper applications and web applications. However currently web apps
-+// assume all data that is placed on the clipboard is UTF16 and pepper allows
-+// arbitrary data so this change would require some reworking of the chrome
-+// clipboard interface for custom data.
-+bool JumpToFormatInPickle(const base::string16& format,
-+                          base::PickleIterator* iter) {
-+  uint32_t size = 0;
-+  if (!iter->ReadUInt32(&size))
-+    return false;
-+  for (uint32_t i = 0; i < size; ++i) {
-+    base::string16 stored_format;
-+    if (!iter->ReadString16(&stored_format))
-+      return false;
-+    if (stored_format == format)
-+      return true;
-+    int skip_length;
-+    if (!iter->ReadLength(&skip_length))
-+      return false;
-+    if (!iter->SkipBytes(skip_length))
-+      return false;
-+  }
-+  return false;
-+}
-+
-+bool IsFormatAvailableInPickle(const base::string16& format,
-+                               const base::Pickle& pickle) {
-+  base::PickleIterator iter(pickle);
-+  return JumpToFormatInPickle(format, &iter);
-+}
-+
-+std::string ReadDataFromPickle(const base::string16& format,
-+                               const base::Pickle& pickle) {
-+  std::string result;
-+  base::PickleIterator iter(pickle);
-+  if (!JumpToFormatInPickle(format, &iter) || !iter.ReadString(&result))
-+    return std::string();
-+  return result;
-+}
-+
-+void WriteDataToPickle(const std::map<base::string16, std::string>& data,
-+                       base::Pickle* pickle) {
-+  pickle->WriteUInt32(data.size());
-+  for (std::map<base::string16, std::string>::const_iterator it = data.begin();
-+       it != data.end(); ++it) {
-+    pickle->WriteString16(it->first);
-+    pickle->WriteString(it->second);
-+  }
-+}
-+
-+}  // namespace
-+
-+PepperFlashClipboardMessageFilter::PepperFlashClipboardMessageFilter() {}
-+
-+PepperFlashClipboardMessageFilter::~PepperFlashClipboardMessageFilter() {}
-+
-+scoped_refptr<base::TaskRunner>
-+PepperFlashClipboardMessageFilter::OverrideTaskRunnerForMessage(
-+    const IPC::Message& msg) {
-+  // Clipboard writes should always occur on the UI thread due to the
-+  // restrictions of various platform APIs. In general, the clipboard is not
-+  // thread-safe, so all clipboard calls should be serviced from the UI thread.
-+  if (msg.type() == PpapiHostMsg_FlashClipboard_WriteData::ID)
-+    return BrowserThread::GetTaskRunnerForThread(BrowserThread::UI);
-+
-+// Windows needs clipboard reads to be serviced from the IO thread because
-+// these are sync IPCs which can result in deadlocks with plugins if serviced
-+// from the UI thread. Note that Windows clipboard calls ARE thread-safe so it
-+// is ok for reads and writes to be serviced from different threads.
-+#if !defined(OS_WIN)
-+  return BrowserThread::GetTaskRunnerForThread(BrowserThread::UI);
-+#else
-+  return BrowserThread::GetTaskRunnerForThread(BrowserThread::IO);
-+#endif
-+}
-+
-+int32_t PepperFlashClipboardMessageFilter::OnResourceMessageReceived(
-+    const IPC::Message& msg,
-+    ppapi::host::HostMessageContext* context) {
-+  PPAPI_BEGIN_MESSAGE_MAP(PepperFlashClipboardMessageFilter, msg)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(
-+        PpapiHostMsg_FlashClipboard_RegisterCustomFormat,
-+        OnMsgRegisterCustomFormat)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(
-+        PpapiHostMsg_FlashClipboard_IsFormatAvailable, OnMsgIsFormatAvailable)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_FlashClipboard_ReadData,
-+                                      OnMsgReadData)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_FlashClipboard_WriteData,
-+                                      OnMsgWriteData)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(
-+        PpapiHostMsg_FlashClipboard_GetSequenceNumber, OnMsgGetSequenceNumber)
-+  PPAPI_END_MESSAGE_MAP()
-+  return PP_ERROR_FAILED;
-+}
-+
-+int32_t PepperFlashClipboardMessageFilter::OnMsgRegisterCustomFormat(
-+    ppapi::host::HostMessageContext* host_context,
-+    const std::string& format_name) {
-+  uint32_t format = custom_formats_.RegisterFormat(format_name);
-+  if (format == PP_FLASH_CLIPBOARD_FORMAT_INVALID)
-+    return PP_ERROR_FAILED;
-+  host_context->reply_msg =
-+      PpapiPluginMsg_FlashClipboard_RegisterCustomFormatReply(format);
-+  return PP_OK;
-+}
-+
-+int32_t PepperFlashClipboardMessageFilter::OnMsgIsFormatAvailable(
-+    ppapi::host::HostMessageContext* host_context,
-+    uint32_t clipboard_type,
-+    uint32_t format) {
-+  if (clipboard_type != PP_FLASH_CLIPBOARD_TYPE_STANDARD) {
-+    NOTIMPLEMENTED();
-+    return PP_ERROR_FAILED;
-+  }
-+
-+  ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
-+  ui::ClipboardType type = ConvertClipboardType(clipboard_type);
-+  bool available = false;
-+  switch (format) {
-+    case PP_FLASH_CLIPBOARD_FORMAT_PLAINTEXT: {
-+      bool plain = clipboard->IsFormatAvailable(
-+          ui::Clipboard::GetPlainTextFormatType(), type);
-+      bool plainw = clipboard->IsFormatAvailable(
-+          ui::Clipboard::GetPlainTextWFormatType(), type);
-+      available = plain || plainw;
-+      break;
-+    }
-+    case PP_FLASH_CLIPBOARD_FORMAT_HTML:
-+      available = clipboard->IsFormatAvailable(
-+          ui::Clipboard::GetHtmlFormatType(), type);
-+      break;
-+    case PP_FLASH_CLIPBOARD_FORMAT_RTF:
-+      available =
-+          clipboard->IsFormatAvailable(ui::Clipboard::GetRtfFormatType(), type);
-+      break;
-+    case PP_FLASH_CLIPBOARD_FORMAT_INVALID:
-+      break;
-+    default:
-+      if (custom_formats_.IsFormatRegistered(format)) {
-+        std::string format_name = custom_formats_.GetFormatName(format);
-+        std::string clipboard_data;
-+        clipboard->ReadData(ui::Clipboard::GetPepperCustomDataFormatType(),
-+                            &clipboard_data);
-+        base::Pickle pickle(clipboard_data.data(), clipboard_data.size());
-+        available =
-+            IsFormatAvailableInPickle(base::UTF8ToUTF16(format_name), pickle);
-+      }
-+      break;
-+  }
-+
-+  return available ? PP_OK : PP_ERROR_FAILED;
-+}
-+
-+int32_t PepperFlashClipboardMessageFilter::OnMsgReadData(
-+    ppapi::host::HostMessageContext* host_context,
-+    uint32_t clipboard_type,
-+    uint32_t format) {
-+  if (clipboard_type != PP_FLASH_CLIPBOARD_TYPE_STANDARD) {
-+    NOTIMPLEMENTED();
-+    return PP_ERROR_FAILED;
-+  }
-+
-+  ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
-+  ui::ClipboardType type = ConvertClipboardType(clipboard_type);
-+  std::string clipboard_string;
-+  int32_t result = PP_ERROR_FAILED;
-+  switch (format) {
-+    case PP_FLASH_CLIPBOARD_FORMAT_PLAINTEXT: {
-+      if (clipboard->IsFormatAvailable(ui::Clipboard::GetPlainTextWFormatType(),
-+                                       type)) {
-+        base::string16 text;
-+        clipboard->ReadText(type, &text);
-+        if (!text.empty()) {
-+          result = PP_OK;
-+          clipboard_string = base::UTF16ToUTF8(text);
-+          break;
-+        }
-+      }
-+      // If the PlainTextW format isn't available or is empty, take the
-+      // ASCII text format.
-+      if (clipboard->IsFormatAvailable(ui::Clipboard::GetPlainTextFormatType(),
-+                                       type)) {
-+        result = PP_OK;
-+        clipboard->ReadAsciiText(type, &clipboard_string);
-+      }
-+      break;
-+    }
-+    case PP_FLASH_CLIPBOARD_FORMAT_HTML: {
-+      if (!clipboard->IsFormatAvailable(ui::Clipboard::GetHtmlFormatType(),
-+                                        type)) {
-+        break;
-+      }
-+
-+      base::string16 html;
-+      std::string url;
-+      uint32_t fragment_start;
-+      uint32_t fragment_end;
-+      clipboard->ReadHTML(type, &html, &url, &fragment_start, &fragment_end);
-+      result = PP_OK;
-+      clipboard_string = base::UTF16ToUTF8(
-+          html.substr(fragment_start, fragment_end - fragment_start));
-+      break;
-+    }
-+    case PP_FLASH_CLIPBOARD_FORMAT_RTF: {
-+      if (!clipboard->IsFormatAvailable(ui::Clipboard::GetRtfFormatType(),
-+                                        type)) {
-+        break;
-+      }
-+      result = PP_OK;
-+      clipboard->ReadRTF(type, &clipboard_string);
-+      break;
-+    }
-+    case PP_FLASH_CLIPBOARD_FORMAT_INVALID:
-+      break;
-+    default: {
-+      if (custom_formats_.IsFormatRegistered(format)) {
-+        base::string16 format_name =
-+            base::UTF8ToUTF16(custom_formats_.GetFormatName(format));
-+        std::string clipboard_data;
-+        clipboard->ReadData(ui::Clipboard::GetPepperCustomDataFormatType(),
-+                            &clipboard_data);
-+        base::Pickle pickle(clipboard_data.data(), clipboard_data.size());
-+        if (IsFormatAvailableInPickle(format_name, pickle)) {
-+          result = PP_OK;
-+          clipboard_string = ReadDataFromPickle(format_name, pickle);
-+        }
-+      }
-+      break;
-+    }
-+  }
-+
-+  if (result == PP_OK) {
-+    host_context->reply_msg =
-+        PpapiPluginMsg_FlashClipboard_ReadDataReply(clipboard_string);
-+  }
-+  return result;
-+}
-+
-+int32_t PepperFlashClipboardMessageFilter::OnMsgWriteData(
-+    ppapi::host::HostMessageContext* host_context,
-+    uint32_t clipboard_type,
-+    const std::vector<uint32_t>& formats,
-+    const std::vector<std::string>& data) {
-+  if (clipboard_type != PP_FLASH_CLIPBOARD_TYPE_STANDARD) {
-+    NOTIMPLEMENTED();
-+    return PP_ERROR_FAILED;
-+  }
-+  if (formats.size() != data.size())
-+    return PP_ERROR_FAILED;
-+
-+  ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
-+  ui::ClipboardType type = ConvertClipboardType(clipboard_type);
-+  // If no formats are passed in clear the clipboard.
-+  if (formats.size() == 0) {
-+    clipboard->Clear(type);
-+    return PP_OK;
-+  }
-+
-+  ui::ScopedClipboardWriter scw(type);
-+  std::map<base::string16, std::string> custom_data_map;
-+  int32_t res = PP_OK;
-+  for (uint32_t i = 0; i < formats.size(); ++i) {
-+    if (data[i].length() > kMaxClipboardWriteSize) {
-+      res = PP_ERROR_NOSPACE;
-+      break;
-+    }
-+
-+    switch (formats[i]) {
-+      case PP_FLASH_CLIPBOARD_FORMAT_PLAINTEXT:
-+        scw.WriteText(base::UTF8ToUTF16(data[i]));
-+        break;
-+      case PP_FLASH_CLIPBOARD_FORMAT_HTML:
-+        scw.WriteHTML(base::UTF8ToUTF16(data[i]), std::string());
-+        break;
-+      case PP_FLASH_CLIPBOARD_FORMAT_RTF:
-+        scw.WriteRTF(data[i]);
-+        break;
-+      case PP_FLASH_CLIPBOARD_FORMAT_INVALID:
-+        res = PP_ERROR_BADARGUMENT;
-+        break;
-+      default:
-+        if (custom_formats_.IsFormatRegistered(formats[i])) {
-+          std::string format_name = custom_formats_.GetFormatName(formats[i]);
-+          custom_data_map[base::UTF8ToUTF16(format_name)] = data[i];
-+        } else {
-+          // Invalid format.
-+          res = PP_ERROR_BADARGUMENT;
-+          break;
-+        }
-+    }
-+
-+    if (res != PP_OK)
-+      break;
-+  }
-+
-+  if (custom_data_map.size() > 0) {
-+    base::Pickle pickle;
-+    WriteDataToPickle(custom_data_map, &pickle);
-+    scw.WritePickledData(pickle,
-+                         ui::Clipboard::GetPepperCustomDataFormatType());
-+  }
-+
-+  if (res != PP_OK) {
-+    // Need to clear the objects so nothing is written.
-+    scw.Reset();
-+  }
-+
-+  return res;
-+}
-+
-+int32_t PepperFlashClipboardMessageFilter::OnMsgGetSequenceNumber(
-+    ppapi::host::HostMessageContext* host_context,
-+    uint32_t clipboard_type) {
-+  if (clipboard_type != PP_FLASH_CLIPBOARD_TYPE_STANDARD) {
-+    NOTIMPLEMENTED();
-+    return PP_ERROR_FAILED;
-+  }
-+
-+  ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
-+  ui::ClipboardType type = ConvertClipboardType(clipboard_type);
-+  int64_t sequence_number = clipboard->GetSequenceNumber(type);
-+  host_context->reply_msg =
-+      PpapiPluginMsg_FlashClipboard_GetSequenceNumberReply(sequence_number);
-+  return PP_OK;
-+}
-+
-+}  // namespace chrome
-added in remote
-  their  100644 b282d54df28cbb43b5a1b49c6272b504565cde2b chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.h
-@@ -0,0 +1,76 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_FLASH_CLIPBOARD_MESSAGE_FILTER_H_
-+#define CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_FLASH_CLIPBOARD_MESSAGE_FILTER_H_
-+
-+#include <string>
-+#include <vector>
-+
-+#include "ppapi/host/resource_message_filter.h"
-+#include "ppapi/shared_impl/flash_clipboard_format_registry.h"
-+
-+namespace ppapi {
-+namespace host {
-+struct HostMessageContext;
-+}
-+}  // namespace ppapi
-+
-+namespace ui {
-+class ScopedClipboardWriter;
-+}
-+
-+namespace chrome {
-+
-+// Resource message filter for accessing the clipboard in Pepper. Pepper
-+// supports reading/writing custom formats from the clipboard. Currently, all
-+// custom formats that are read/written from the clipboard through pepper are
-+// stored in a single real clipboard format (in the same way the "web custom"
-+// clipboard formats are). This is done so that we don't have to have use real
-+// clipboard types for each custom clipboard format which may be a limited
-+// resource on a particular platform.
-+class PepperFlashClipboardMessageFilter
-+    : public ppapi::host::ResourceMessageFilter {
-+ public:
-+  PepperFlashClipboardMessageFilter();
-+
-+ protected:
-+  // ppapi::host::ResourceMessageFilter overrides.
-+  scoped_refptr<base::TaskRunner> OverrideTaskRunnerForMessage(
-+      const IPC::Message& msg) override;
-+  int32_t OnResourceMessageReceived(
-+      const IPC::Message& msg,
-+      ppapi::host::HostMessageContext* context) override;
-+
-+ private:
-+  ~PepperFlashClipboardMessageFilter() override;
-+
-+  int32_t OnMsgRegisterCustomFormat(
-+      ppapi::host::HostMessageContext* host_context,
-+      const std::string& format_name);
-+  int32_t OnMsgIsFormatAvailable(ppapi::host::HostMessageContext* host_context,
-+                                 uint32_t clipboard_type,
-+                                 uint32_t format);
-+  int32_t OnMsgReadData(ppapi::host::HostMessageContext* host_context,
-+                        uint32_t clipoard_type,
-+                        uint32_t format);
-+  int32_t OnMsgWriteData(ppapi::host::HostMessageContext* host_context,
-+                         uint32_t clipboard_type,
-+                         const std::vector<uint32_t>& formats,
-+                         const std::vector<std::string>& data);
-+  int32_t OnMsgGetSequenceNumber(ppapi::host::HostMessageContext* host_context,
-+                                 uint32_t clipboard_type);
-+
-+  int32_t WriteClipboardDataItem(uint32_t format,
-+                                 const std::string& data,
-+                                 ui::ScopedClipboardWriter* scw);
-+
-+  ppapi::FlashClipboardFormatRegistry custom_formats_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(PepperFlashClipboardMessageFilter);
-+};
-+
-+}  // namespace chrome
-+
-+#endif  // CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_FLASH_CLIPBOARD_MESSAGE_FILTER_H_
-added in remote
-  their  100644 06b0b583a6441819cb6486e99a3aa77c4ed906db chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc
-@@ -0,0 +1,216 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h"
-+
-+#include <cmath>
-+
-+#if defined(OS_WIN)
-+#include <Windows.h>
-+#endif
-+
-+#include "base/bind.h"
-+#include "base/compiler_specific.h"
-+#include "base/logging.h"
-+#include "base/memory/ref_counted.h"
-+#include "base/strings/string_number_conversions.h"
-+#include "build/build_config.h"
-+#include "content/public/browser/browser_ppapi_host.h"
-+#include "content/public/browser/browser_thread.h"
-+#include "content/public/browser/child_process_security_policy.h"
-+#include "content/public/browser/render_frame_host.h"
-+#include "content/public/common/pepper_plugin_info.h"
-+#include "net/base/network_interfaces.h"
-+#include "ppapi/c/pp_errors.h"
-+#include "ppapi/host/dispatch_host_message.h"
-+#include "ppapi/host/host_message_context.h"
-+#include "ppapi/host/ppapi_host.h"
-+#include "ppapi/proxy/ppapi_messages.h"
-+
-+#if defined(USE_AURA)
-+#include "ui/aura/window.h"
-+#include "ui/aura/window_tree_host.h"
-+#endif
-+
-+#if defined(OS_MACOSX)
-+#include "chrome/browser/renderer_host/pepper/monitor_finder_mac.h"
-+#endif
-+
-+using content::BrowserPpapiHost;
-+
-+namespace chrome {
-+
-+namespace {
-+
-+const char kVoucherFilename[] = "plugin.vch";
-+
-+#if defined(OS_WIN)
-+bool GetSystemVolumeSerialNumber(std::string* number) {
-+  // Find the system root path (e.g: C:\).
-+  wchar_t system_path[MAX_PATH + 1];
-+  if (!GetSystemDirectoryW(system_path, MAX_PATH))
-+    return false;
-+
-+  wchar_t* first_slash = wcspbrk(system_path, L"\\/");
-+  if (first_slash != NULL)
-+    *(first_slash + 1) = 0;
-+
-+  DWORD number_local = 0;
-+  if (!GetVolumeInformationW(system_path, NULL, 0, &number_local, NULL, NULL,
-+                             NULL, 0))
-+    return false;
-+
-+  *number = base::IntToString(std::abs(static_cast<int>(number_local)));
-+  return true;
-+}
-+#endif
-+
-+}  // namespace
-+
-+#if defined(OS_WIN)
-+// Helper class to get the UI thread which monitor is showing the
-+// window associated with the instance's render view. Since we get
-+// called by the IO thread and we cannot block, the first answer is
-+// of GetMonitor() may be NULL, but eventually it will contain the
-+// right monitor.
-+class MonitorFinder : public base::RefCountedThreadSafe<MonitorFinder> {
-+ public:
-+  MonitorFinder(int process_id, int render_frame_id)
-+      : process_id_(process_id),
-+        render_frame_id_(render_frame_id),
-+        monitor_(NULL),
-+        request_sent_(0) {}
-+
-+  int64_t GetMonitor() {
-+    // We use |request_sent_| as an atomic boolean so that we
-+    // never have more than one task posted at a given time. We
-+    // do this because we don't know how often our client is going
-+    // to call and we can't cache the |monitor_| value.
-+    if (InterlockedCompareExchange(&request_sent_, 1, 0) == 0) {
-+      content::BrowserThread::PostTask(
-+          content::BrowserThread::UI, FROM_HERE,
-+          base::Bind(&MonitorFinder::FetchMonitorFromWidget, this));
-+    }
-+    return reinterpret_cast<int64_t>(monitor_);
-+  }
-+
-+ private:
-+  friend class base::RefCountedThreadSafe<MonitorFinder>;
-+  ~MonitorFinder() {}
-+
-+  void FetchMonitorFromWidget() {
-+    InterlockedExchange(&request_sent_, 0);
-+    content::RenderFrameHost* rfh =
-+        content::RenderFrameHost::FromID(process_id_, render_frame_id_);
-+    if (!rfh)
-+      return;
-+    gfx::NativeView native_view = rfh->GetNativeView();
-+#if defined(USE_AURA)
-+    aura::WindowTreeHost* host = native_view->GetHost();
-+    if (!host)
-+      return;
-+    HWND window = host->GetAcceleratedWidget();
-+#else
-+    HWND window = native_view;
-+#endif
-+    HMONITOR monitor = ::MonitorFromWindow(window, MONITOR_DEFAULTTONULL);
-+    InterlockedExchangePointer(reinterpret_cast<void* volatile*>(&monitor_),
-+                               monitor);
-+  }
-+
-+  const int process_id_;
-+  const int render_frame_id_;
-+  volatile HMONITOR monitor_;
-+  volatile long request_sent_;
-+};
-+#elif !defined(OS_MACOSX)
-+// TODO(cpu): Support Linux someday.
-+class MonitorFinder : public base::RefCountedThreadSafe<MonitorFinder> {
-+ public:
-+  MonitorFinder(int, int) {}
-+  int64_t GetMonitor() { return 0; }
-+
-+ private:
-+  friend class base::RefCountedThreadSafe<MonitorFinder>;
-+  ~MonitorFinder() {}
-+};
-+#endif
-+
-+PepperFlashDRMHost::PepperFlashDRMHost(BrowserPpapiHost* host,
-+                                       PP_Instance instance,
-+                                       PP_Resource resource)
-+    : ppapi::host::ResourceHost(host->GetPpapiHost(), instance, resource),
-+      weak_factory_(this) {
-+  // Grant permissions to read the flash voucher file.
-+  int render_process_id;
-+  int render_frame_id;
-+  bool success = host->GetRenderFrameIDsForInstance(
-+      instance, &render_process_id, &render_frame_id);
-+  base::FilePath plugin_dir = host->GetPluginPath().DirName();
-+  DCHECK(!plugin_dir.empty() && success);
-+  base::FilePath voucher_file = plugin_dir.AppendASCII(kVoucherFilename);
-+  content::ChildProcessSecurityPolicy::GetInstance()->GrantReadFile(
-+      render_process_id, voucher_file);
-+
-+  monitor_finder_ = new MonitorFinder(render_process_id, render_frame_id);
-+  monitor_finder_->GetMonitor();
-+}
-+
-+PepperFlashDRMHost::~PepperFlashDRMHost() {}
-+
-+int32_t PepperFlashDRMHost::OnResourceMessageReceived(
-+    const IPC::Message& msg,
-+    ppapi::host::HostMessageContext* context) {
-+  PPAPI_BEGIN_MESSAGE_MAP(PepperFlashDRMHost, msg)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL_0(PpapiHostMsg_FlashDRM_GetDeviceID,
-+                                        OnHostMsgGetDeviceID)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL_0(PpapiHostMsg_FlashDRM_GetHmonitor,
-+                                        OnHostMsgGetHmonitor)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL_0(PpapiHostMsg_FlashDRM_MonitorIsExternal,
-+                                        OnHostMsgMonitorIsExternal)
-+  PPAPI_END_MESSAGE_MAP()
-+  return PP_ERROR_FAILED;
-+}
-+
-+int32_t PepperFlashDRMHost::OnHostMsgGetDeviceID(
-+    ppapi::host::HostMessageContext* context) {
-+  static std::string id;
-+#if defined(OS_WIN)
-+  if (id.empty() && !GetSystemVolumeSerialNumber(&id))
-+    id = net::GetHostName();
-+#else
-+  if (id.empty())
-+    id = net::GetHostName();
-+#endif
-+  context->reply_msg = PpapiPluginMsg_FlashDRM_GetDeviceIDReply(id);
-+  return PP_OK;
-+}
-+
-+int32_t PepperFlashDRMHost::OnHostMsgGetHmonitor(
-+    ppapi::host::HostMessageContext* context) {
-+  int64_t monitor_id = monitor_finder_->GetMonitor();
-+  if (monitor_id) {
-+    context->reply_msg = PpapiPluginMsg_FlashDRM_GetHmonitorReply(monitor_id);
-+    return PP_OK;
-+  }
-+  return PP_ERROR_FAILED;
-+}
-+
-+int32_t PepperFlashDRMHost::OnHostMsgMonitorIsExternal(
-+    ppapi::host::HostMessageContext* context) {
-+  int64_t monitor_id = monitor_finder_->GetMonitor();
-+  if (!monitor_id)
-+    return PP_ERROR_FAILED;
-+
-+  PP_Bool is_external = PP_FALSE;
-+#if defined(OS_MACOSX)
-+  if (!MonitorFinder::IsMonitorBuiltIn(monitor_id))
-+    is_external = PP_TRUE;
-+#endif
-+  context->reply_msg =
-+      PpapiPluginMsg_FlashDRM_MonitorIsExternalReply(is_external);
-+  return PP_OK;
-+}
-+
-+}  // namespace chrome
-added in remote
-  their  100644 91bba9631e68f08728d5d926528fc80ce4f9cb00 chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h
-@@ -0,0 +1,55 @@
-+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_FLASH_DRM_HOST_H_
-+#define CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_FLASH_DRM_HOST_H_
-+
-+#include <stdint.h>
-+
-+#include <string>
-+
-+#include "base/macros.h"
-+#include "base/memory/weak_ptr.h"
-+#include "ppapi/host/host_message_context.h"
-+#include "ppapi/host/resource_host.h"
-+
-+namespace content {
-+class BrowserPpapiHost;
-+}
-+
-+namespace IPC {
-+class Message;
-+}
-+
-+namespace chrome {
-+class MonitorFinder;
-+
-+class PepperFlashDRMHost : public ppapi::host::ResourceHost {
-+ public:
-+  PepperFlashDRMHost(content::BrowserPpapiHost* host,
-+                     PP_Instance instance,
-+                     PP_Resource resource);
-+  ~PepperFlashDRMHost() override;
-+
-+  // ResourceHost override.
-+  int32_t OnResourceMessageReceived(
-+      const IPC::Message& msg,
-+      ppapi::host::HostMessageContext* context) override;
-+
-+ private:
-+  // IPC message handler.
-+  int32_t OnHostMsgGetDeviceID(ppapi::host::HostMessageContext* context);
-+  int32_t OnHostMsgGetHmonitor(ppapi::host::HostMessageContext* context);
-+  int32_t OnHostMsgMonitorIsExternal(ppapi::host::HostMessageContext* context);
-+
-+  scoped_refptr<MonitorFinder> monitor_finder_;
-+
-+  base::WeakPtrFactory<PepperFlashDRMHost> weak_factory_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(PepperFlashDRMHost);
-+};
-+
-+}  // namespace chrome
-+
-+#endif  // CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_FLASH_DRM_HOST_H_
-added in remote
-  their  100644 be771653066bf4689f9857e6a218dd3c79d9696e chromium_src/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc
-@@ -0,0 +1,106 @@
-+// Copyright 2013 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h"
-+
-+#include "content/public/browser/browser_ppapi_host.h"
-+#include "content/public/browser/browser_thread.h"
-+#include "content/public/browser/child_process_security_policy.h"
-+#include "content/public/browser/render_view_host.h"
-+#include "ppapi/c/pp_errors.h"
-+#include "ppapi/host/dispatch_host_message.h"
-+#include "ppapi/host/host_message_context.h"
-+#include "ppapi/host/ppapi_host.h"
-+#include "ppapi/proxy/ppapi_messages.h"
-+#include "ppapi/shared_impl/file_system_util.h"
-+#include "storage/browser/fileapi/isolated_context.h"
-+
-+namespace chrome {
-+
-+// static
-+PepperIsolatedFileSystemMessageFilter*
-+PepperIsolatedFileSystemMessageFilter::Create(PP_Instance instance,
-+                                              content::BrowserPpapiHost* host) {
-+  int render_process_id;
-+  int unused_render_frame_id;
-+  if (!host->GetRenderFrameIDsForInstance(instance, &render_process_id,
-+                                          &unused_render_frame_id)) {
-+    return NULL;
-+  }
-+  return new PepperIsolatedFileSystemMessageFilter(
-+      render_process_id, host->GetProfileDataDirectory(),
-+      host->GetDocumentURLForInstance(instance), host->GetPpapiHost());
-+}
-+
-+PepperIsolatedFileSystemMessageFilter::PepperIsolatedFileSystemMessageFilter(
-+    int render_process_id,
-+    const base::FilePath& profile_directory,
-+    const GURL& document_url,
-+    ppapi::host::PpapiHost* ppapi_host)
-+    : render_process_id_(render_process_id),
-+      profile_directory_(profile_directory),
-+      document_url_(document_url),
-+      ppapi_host_(ppapi_host) {}
-+
-+PepperIsolatedFileSystemMessageFilter::
-+    ~PepperIsolatedFileSystemMessageFilter() {}
-+
-+scoped_refptr<base::TaskRunner>
-+PepperIsolatedFileSystemMessageFilter::OverrideTaskRunnerForMessage(
-+    const IPC::Message& msg) {
-+  // In order to reach ExtensionSystem, we need to get ProfileManager first.
-+  // ProfileManager lives in UI thread, so we need to do this in UI thread.
-+  return content::BrowserThread::GetTaskRunnerForThread(
-+      content::BrowserThread::UI);
-+}
-+
-+int32_t PepperIsolatedFileSystemMessageFilter::OnResourceMessageReceived(
-+    const IPC::Message& msg,
-+    ppapi::host::HostMessageContext* context) {
-+  PPAPI_BEGIN_MESSAGE_MAP(PepperIsolatedFileSystemMessageFilter, msg)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(
-+        PpapiHostMsg_IsolatedFileSystem_BrowserOpen, OnOpenFileSystem)
-+  PPAPI_END_MESSAGE_MAP()
-+  return PP_ERROR_FAILED;
-+}
-+
-+int32_t PepperIsolatedFileSystemMessageFilter::OnOpenFileSystem(
-+    ppapi::host::HostMessageContext* context,
-+    PP_IsolatedFileSystemType_Private type) {
-+  switch (type) {
-+    case PP_ISOLATEDFILESYSTEMTYPE_PRIVATE_INVALID:
-+    case PP_ISOLATEDFILESYSTEMTYPE_PRIVATE_CRX:
-+      break;
-+    case PP_ISOLATEDFILESYSTEMTYPE_PRIVATE_PLUGINPRIVATE:
-+      return OpenPluginPrivateFileSystem(context);
-+  }
-+  NOTREACHED();
-+  context->reply_msg =
-+      PpapiPluginMsg_IsolatedFileSystem_BrowserOpenReply(std::string());
-+  return PP_ERROR_FAILED;
-+}
-+
-+int32_t PepperIsolatedFileSystemMessageFilter::OpenPluginPrivateFileSystem(
-+    ppapi::host::HostMessageContext* context) {
-+  DCHECK(ppapi_host_);
-+  // Only plugins with private permission can open the filesystem.
-+  if (!ppapi_host_->permissions().HasPermission(ppapi::PERMISSION_PRIVATE))
-+    return PP_ERROR_NOACCESS;
-+
-+  const std::string& root_name = ppapi::IsolatedFileSystemTypeToRootName(
-+      PP_ISOLATEDFILESYSTEMTYPE_PRIVATE_PLUGINPRIVATE);
-+  const std::string& fsid =
-+      storage::IsolatedContext::GetInstance()->RegisterFileSystemForVirtualPath(
-+          storage::kFileSystemTypePluginPrivate, root_name, base::FilePath());
-+
-+  // Grant full access of isolated filesystem to renderer process.
-+  content::ChildProcessSecurityPolicy* policy =
-+      content::ChildProcessSecurityPolicy::GetInstance();
-+  policy->GrantCreateReadWriteFileSystem(render_process_id_, fsid);
-+
-+  context->reply_msg = PpapiPluginMsg_IsolatedFileSystem_BrowserOpenReply(fsid);
-+  return PP_OK;
-+}
-+
-+}  // namespace chrome
-added in remote
-  their  100644 6a24feadd150e0c5ecd1fa44c7e412262ecae55d chromium_src/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h
-@@ -0,0 +1,76 @@
-+// Copyright 2013 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_ISOLATED_FILE_SYSTEM_MESSAGE_FILTER_H_
-+#define CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_ISOLATED_FILE_SYSTEM_MESSAGE_FILTER_H_
-+
-+#include <set>
-+#include <string>
-+
-+#include "base/files/file_path.h"
-+#include "ppapi/c/pp_instance.h"
-+#include "ppapi/c/pp_resource.h"
-+#include "ppapi/c/private/ppb_isolated_file_system_private.h"
-+#include "ppapi/host/resource_host.h"
-+#include "ppapi/host/resource_message_filter.h"
-+#include "url/gurl.h"
-+
-+class Profile;
-+
-+namespace content {
-+class BrowserPpapiHost;
-+}
-+
-+namespace ppapi {
-+namespace host {
-+struct HostMessageContext;
-+}  // namespace host
-+}  // namespace ppapi
-+
-+namespace chrome {
-+
-+class PepperIsolatedFileSystemMessageFilter
-+    : public ppapi::host::ResourceMessageFilter {
-+ public:
-+  static PepperIsolatedFileSystemMessageFilter* Create(
-+      PP_Instance instance,
-+      content::BrowserPpapiHost* host);
-+
-+  // ppapi::host::ResourceMessageFilter implementation.
-+  scoped_refptr<base::TaskRunner> OverrideTaskRunnerForMessage(
-+      const IPC::Message& msg) override;
-+  int32_t OnResourceMessageReceived(
-+      const IPC::Message& msg,
-+      ppapi::host::HostMessageContext* context) override;
-+
-+ private:
-+  PepperIsolatedFileSystemMessageFilter(int render_process_id,
-+                                        const base::FilePath& profile_directory,
-+                                        const GURL& document_url,
-+                                        ppapi::host::PpapiHost* ppapi_host_);
-+
-+  ~PepperIsolatedFileSystemMessageFilter() override;
-+
-+  // Returns filesystem id of isolated filesystem if valid, or empty string
-+  // otherwise.  This must run on the UI thread because ProfileManager only
-+  // allows access on that thread.
-+
-+  int32_t OnOpenFileSystem(ppapi::host::HostMessageContext* context,
-+                           PP_IsolatedFileSystemType_Private type);
-+  int32_t OpenPluginPrivateFileSystem(ppapi::host::HostMessageContext* context);
-+
-+  const int render_process_id_;
-+  // Keep a copy from original thread.
-+  const base::FilePath profile_directory_;
-+  const GURL document_url_;
-+
-+  // Not owned by this object.
-+  ppapi::host::PpapiHost* ppapi_host_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(PepperIsolatedFileSystemMessageFilter);
-+};
-+
-+}  // namespace chrome
-+
-+#endif  // CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_ISOLATED_FILE_SYSTEM_MESSAGE_FILTER_H_
-added in both
-  our    100644 850bd7ad3630604fa35bdb67397eb789e059973a chromium_src/chrome/browser/ui/views/color_chooser_dialog.h
-  their  100644 b23061a386dc0dc235f5924fc559aa3b7d355a56 chromium_src/chrome/browser/ui/views/color_chooser_dialog.h
-@@ -23,6 +23,7 @@
-   ColorChooserDialog(views::ColorChooserListener* listener,
-                      SkColor initial_color,
-                      gfx::NativeWindow owning_window);
-+<<<<<<< .our
- 
-   // BaseShellDialog:
-   bool IsRunning(gfx::NativeWindow owning_window) const override;
-@@ -32,6 +33,15 @@
-   ~ColorChooserDialog() override;
-   friend class base::RefCountedThreadSafe<ColorChooserDialog>;
- 
-+=======
-+  virtual ~ColorChooserDialog();
-+
-+  // BaseShellDialog:
-+  virtual bool IsRunning(gfx::NativeWindow owning_window) const override;
-+  virtual void ListenerDestroyed() override;
-+
-+ private:
-+>>>>>>> .their
-   struct ExecuteOpenParams {
-     ExecuteOpenParams(SkColor color, RunState run_state, HWND owner);
-     SkColor color;
-added in both
-  our    100644 0f8ebfa6366f90e435dc0e854b20cef92fc2964f chromium_src/chrome/browser/ui/views/color_chooser_win.cc
-  their  100644 fc330dd63f1810bc9486428a32f351ec0cdfb3eb chromium_src/chrome/browser/ui/views/color_chooser_win.cc
-@@ -22,6 +22,7 @@
-                                SkColor initial_color);
- 
-   ColorChooserWin(content::WebContents* web_contents, SkColor initial_color);
-+<<<<<<< .our
-   ~ColorChooserWin() override;
- 
-   // content::ColorChooser overrides:
-@@ -31,6 +32,17 @@
-   // views::ColorChooserListener overrides:
-   void OnColorChosen(SkColor color) override;
-   void OnColorChooserDialogClosed() override;
-+=======
-+  ~ColorChooserWin();
-+
-+  // content::ColorChooser overrides:
-+  virtual void End() override;
-+  virtual void SetSelectedColor(SkColor color) override {}
-+
-+  // views::ColorChooserListener overrides:
-+  virtual void OnColorChosen(SkColor color);
-+  virtual void OnColorChooserDialogClosed();
-+>>>>>>> .their
- 
-  private:
-   static ColorChooserWin* current_color_chooser_;
-added in remote
-  their  100644 437d87f8ff5e89c13990e1fba87e7e51de7d962f chromium_src/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc
-@@ -0,0 +1,99 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/renderer/pepper/chrome_renderer_pepper_host_factory.h"
-+
-+#include "base/logging.h"
-+#include "chrome/renderer/pepper/pepper_flash_font_file_host.h"
-+#include "chrome/renderer/pepper/pepper_flash_fullscreen_host.h"
-+#include "chrome/renderer/pepper/pepper_flash_menu_host.h"
-+#include "chrome/renderer/pepper/pepper_flash_renderer_host.h"
-+#include "content/public/renderer/renderer_ppapi_host.h"
-+#include "ppapi/host/ppapi_host.h"
-+#include "ppapi/host/resource_host.h"
-+#include "ppapi/proxy/ppapi_message_utils.h"
-+#include "ppapi/proxy/ppapi_messages.h"
-+#include "ppapi/shared_impl/ppapi_permissions.h"
-+
-+#if defined(ENABLE_PDF_VIEWER)
-+#include "components/pdf/renderer/pepper_pdf_host.h"
-+#endif  // defined(ENABLE_PDF_VIEWER)
-+
-+using ppapi::host::ResourceHost;
-+
-+ChromeRendererPepperHostFactory::ChromeRendererPepperHostFactory(
-+    content::RendererPpapiHost* host)
-+    : host_(host) {}
-+
-+ChromeRendererPepperHostFactory::~ChromeRendererPepperHostFactory() {}
-+
-+std::unique_ptr<ResourceHost>
-+ChromeRendererPepperHostFactory::CreateResourceHost(
-+    ppapi::host::PpapiHost* host,
-+    PP_Resource resource,
-+    PP_Instance instance,
-+    const IPC::Message& message) {
-+  DCHECK_EQ(host_->GetPpapiHost(), host);
-+
-+  // Make sure the plugin is giving us a valid instance for this resource.
-+  if (!host_->IsValidInstance(instance))
-+    return std::unique_ptr<ResourceHost>();
-+
-+  if (host_->GetPpapiHost()->permissions().HasPermission(
-+          ppapi::PERMISSION_FLASH)) {
-+    switch (message.type()) {
-+      case PpapiHostMsg_Flash_Create::ID: {
-+        return std::unique_ptr<ResourceHost>(
-+            new PepperFlashRendererHost(host_, instance, resource));
-+      }
-+      case PpapiHostMsg_FlashFullscreen_Create::ID: {
-+        return std::unique_ptr<ResourceHost>(
-+            new PepperFlashFullscreenHost(host_, instance, resource));
-+      }
-+      case PpapiHostMsg_FlashMenu_Create::ID: {
-+        ppapi::proxy::SerializedFlashMenu serialized_menu;
-+        if (ppapi::UnpackMessage<PpapiHostMsg_FlashMenu_Create>(
-+                message, &serialized_menu)) {
-+          return std::unique_ptr<ResourceHost>(new PepperFlashMenuHost(
-+              host_, instance, resource, serialized_menu));
-+        }
-+        break;
-+      }
-+    }
-+  }
-+
-+  // TODO(raymes): PDF also needs access to the FlashFontFileHost currently.
-+  // We should either rename PPB_FlashFont_File to PPB_FontFile_Private or get
-+  // rid of its use in PDF if possible.
-+  if (host_->GetPpapiHost()->permissions().HasPermission(
-+          ppapi::PERMISSION_FLASH) ||
-+      host_->GetPpapiHost()->permissions().HasPermission(
-+          ppapi::PERMISSION_PRIVATE)) {
-+    switch (message.type()) {
-+      case PpapiHostMsg_FlashFontFile_Create::ID: {
-+        ppapi::proxy::SerializedFontDescription description;
-+        PP_PrivateFontCharset charset;
-+        if (ppapi::UnpackMessage<PpapiHostMsg_FlashFontFile_Create>(
-+                message, &description, &charset)) {
-+          return std::unique_ptr<ResourceHost>(new PepperFlashFontFileHost(
-+              host_, instance, resource, description, charset));
-+        }
-+        break;
-+      }
-+    }
-+  }
-+
-+#if defined(ENABLE_PDF_VIEWER)
-+  if (host_->GetPpapiHost()->permissions().HasPermission(
-+          ppapi::PERMISSION_PRIVATE)) {
-+    switch (message.type()) {
-+      case PpapiHostMsg_PDF_Create::ID: {
-+        return std::make_unique<pdf::PepperPDFHost>(host_, instance, resource);
-+      }
-+    }
-+  }
-+#endif  // defined(ENABLE_PDF_VIEWER)
-+
-+  return std::unique_ptr<ResourceHost>();
-+}
-added in remote
-  their  100644 c52c73b56f048fc522f4879597e870285ec7009d chromium_src/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.h
-@@ -0,0 +1,34 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_RENDERER_PEPPER_CHROME_RENDERER_PEPPER_HOST_FACTORY_H_
-+#define CHROME_RENDERER_PEPPER_CHROME_RENDERER_PEPPER_HOST_FACTORY_H_
-+
-+#include "base/macros.h"
-+#include "ppapi/host/host_factory.h"
-+
-+namespace content {
-+class RendererPpapiHost;
-+}
-+
-+class ChromeRendererPepperHostFactory : public ppapi::host::HostFactory {
-+ public:
-+  explicit ChromeRendererPepperHostFactory(content::RendererPpapiHost* host);
-+  ~ChromeRendererPepperHostFactory() override;
-+
-+  // HostFactory.
-+  std::unique_ptr<ppapi::host::ResourceHost> CreateResourceHost(
-+      ppapi::host::PpapiHost* host,
-+      PP_Resource resource,
-+      PP_Instance instance,
-+      const IPC::Message& message) override;
-+
-+ private:
-+  // Not owned by this object.
-+  content::RendererPpapiHost* host_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(ChromeRendererPepperHostFactory);
-+};
-+
-+#endif  // CHROME_RENDERER_PEPPER_CHROME_RENDERER_PEPPER_HOST_FACTORY_H_
-added in remote
-  their  100644 efdc9316b82976b2e07cb3c8aec06141304f390c chromium_src/chrome/renderer/pepper/pepper_flash_font_file_host.cc
-@@ -0,0 +1,105 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/renderer/pepper/pepper_flash_font_file_host.h"
-+
-+#include "base/sys_byteorder.h"
-+#include "build/build_config.h"
-+#include "content/public/renderer/renderer_ppapi_host.h"
-+#include "ppapi/c/pp_errors.h"
-+#include "ppapi/host/dispatch_host_message.h"
-+#include "ppapi/host/host_message_context.h"
-+#include "ppapi/host/ppapi_host.h"
-+#include "ppapi/proxy/ppapi_messages.h"
-+#include "ppapi/proxy/serialized_structs.h"
-+
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
-+#include "content/public/child/child_process_sandbox_support_linux.h"
-+#include "content/public/common/common_sandbox_support_linux.h"
-+#elif defined(OS_WIN)
-+#include "third_party/skia/include/ports/SkFontMgr.h"
-+#endif
-+
-+PepperFlashFontFileHost::PepperFlashFontFileHost(
-+    content::RendererPpapiHost* host,
-+    PP_Instance instance,
-+    PP_Resource resource,
-+    const ppapi::proxy::SerializedFontDescription& description,
-+    PP_PrivateFontCharset charset)
-+    : ResourceHost(host->GetPpapiHost(), instance, resource) {
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
-+  fd_.reset(content::MatchFontWithFallback(
-+      description.face.c_str(),
-+      description.weight >= PP_BROWSERFONT_TRUSTED_WEIGHT_BOLD,
-+      description.italic, charset, PP_BROWSERFONT_TRUSTED_FAMILY_DEFAULT));
-+#elif defined(OS_WIN)  // defined(OS_LINUX) || defined(OS_OPENBSD)
-+  int weight = description.weight;
-+  if (weight == FW_DONTCARE)
-+    weight = SkFontStyle::kNormal_Weight;
-+  SkFontStyle style(weight, SkFontStyle::kNormal_Width,
-+                    description.italic ? SkFontStyle::kItalic_Slant
-+                                       : SkFontStyle::kUpright_Slant);
-+  sk_sp<SkFontMgr> font_mgr(SkFontMgr::RefDefault());
-+  typeface_ = sk_sp<SkTypeface>(
-+      font_mgr->matchFamilyStyle(description.face.c_str(), style));
-+#endif                 // defined(OS_WIN)
-+}
-+
-+PepperFlashFontFileHost::~PepperFlashFontFileHost() {}
-+
-+int32_t PepperFlashFontFileHost::OnResourceMessageReceived(
-+    const IPC::Message& msg,
-+    ppapi::host::HostMessageContext* context) {
-+  PPAPI_BEGIN_MESSAGE_MAP(PepperFlashFontFileHost, msg)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_FlashFontFile_GetFontTable,
-+                                      OnGetFontTable)
-+  PPAPI_END_MESSAGE_MAP()
-+  return PP_ERROR_FAILED;
-+}
-+bool PepperFlashFontFileHost::GetFontData(uint32_t table,
-+                                          void* buffer,
-+                                          size_t* length) {
-+  bool result = false;
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
-+  int fd = fd_.get();
-+  if (fd != -1)
-+    result = content::GetFontTable(fd, table, 0 /* offset */,
-+                                   reinterpret_cast<uint8_t*>(buffer), length);
-+#elif defined(OS_WIN)
-+  if (typeface_) {
-+    table = base::ByteSwap(table);
-+    if (buffer == NULL) {
-+      *length = typeface_->getTableSize(table);
-+      if (*length > 0)
-+        result = true;
-+    } else {
-+      size_t new_length = typeface_->getTableData(table, 0, *length, buffer);
-+      if (new_length == *length)
-+        result = true;
-+    }
-+  }
-+#endif
-+  return result;
-+}
-+
-+int32_t PepperFlashFontFileHost::OnGetFontTable(
-+    ppapi::host::HostMessageContext* context,
-+    uint32_t table) {
-+  std::string contents;
-+  int32_t result = PP_ERROR_FAILED;
-+  size_t length = 0;
-+  if (GetFontData(table, NULL, &length)) {
-+    contents.resize(length);
-+    uint8_t* contents_ptr =
-+        reinterpret_cast<uint8_t*>(const_cast<char*>(contents.c_str()));
-+    if (GetFontData(table, contents_ptr, &length)) {
-+      result = PP_OK;
-+    } else {
-+      contents.clear();
-+    }
-+  }
-+
-+  context->reply_msg = PpapiPluginMsg_FlashFontFile_GetFontTableReply(contents);
-+  return result;
-+}
-added in remote
-  their  100644 15eb73837b50dbb85d607a84bc3b3a71cf789ac5 chromium_src/chrome/renderer/pepper/pepper_flash_font_file_host.h
-@@ -0,0 +1,56 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_RENDERER_PEPPER_PEPPER_FLASH_FONT_FILE_HOST_H_
-+#define CHROME_RENDERER_PEPPER_PEPPER_FLASH_FONT_FILE_HOST_H_
-+
-+#include "ppapi/c/private/pp_private_font_charset.h"
-+#include "ppapi/host/resource_host.h"
-+
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
-+#include "base/files/scoped_file.h"
-+#elif defined(OS_WIN)
-+#include "third_party/skia/include/core/SkRefCnt.h"
-+#include "third_party/skia/include/core/SkTypeface.h"
-+#endif
-+
-+namespace content {
-+class RendererPpapiHost;
-+}
-+
-+namespace ppapi {
-+namespace proxy {
-+struct SerializedFontDescription;
-+}
-+}  // namespace ppapi
-+
-+class PepperFlashFontFileHost : public ppapi::host::ResourceHost {
-+ public:
-+  PepperFlashFontFileHost(
-+      content::RendererPpapiHost* host,
-+      PP_Instance instance,
-+      PP_Resource resource,
-+      const ppapi::proxy::SerializedFontDescription& description,
-+      PP_PrivateFontCharset charset);
-+  ~PepperFlashFontFileHost() override;
-+
-+  int32_t OnResourceMessageReceived(
-+      const IPC::Message& msg,
-+      ppapi::host::HostMessageContext* context) override;
-+
-+ private:
-+  int32_t OnGetFontTable(ppapi::host::HostMessageContext* context,
-+                         uint32_t table);
-+  bool GetFontData(uint32_t table, void* buffer, size_t* length);
-+
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
-+  base::ScopedFD fd_;
-+#elif defined(OS_WIN)
-+  sk_sp<SkTypeface> typeface_;
-+#endif
-+
-+  DISALLOW_COPY_AND_ASSIGN(PepperFlashFontFileHost);
-+};
-+
-+#endif  // CHROME_RENDERER_PEPPER_PEPPER_FLASH_FONT_FILE_HOST_H_
-added in remote
-  their  100644 f4367ef73ce882cec4392da24413800620237c25 chromium_src/chrome/renderer/pepper/pepper_flash_fullscreen_host.cc
-@@ -0,0 +1,42 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/renderer/pepper/pepper_flash_fullscreen_host.h"
-+
-+#include "content/public/renderer/pepper_plugin_instance.h"
-+#include "content/public/renderer/renderer_ppapi_host.h"
-+#include "ppapi/c/pp_errors.h"
-+#include "ppapi/host/dispatch_host_message.h"
-+#include "ppapi/host/host_message_context.h"
-+#include "ppapi/host/ppapi_host.h"
-+#include "ppapi/proxy/ppapi_messages.h"
-+
-+PepperFlashFullscreenHost::PepperFlashFullscreenHost(
-+    content::RendererPpapiHost* host,
-+    PP_Instance instance,
-+    PP_Resource resource)
-+    : ResourceHost(host->GetPpapiHost(), instance, resource),
-+      renderer_ppapi_host_(host) {}
-+
-+PepperFlashFullscreenHost::~PepperFlashFullscreenHost() {}
-+
-+int32_t PepperFlashFullscreenHost::OnResourceMessageReceived(
-+    const IPC::Message& msg,
-+    ppapi::host::HostMessageContext* context) {
-+  PPAPI_BEGIN_MESSAGE_MAP(PepperFlashFullscreenHost, msg)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(
-+        PpapiHostMsg_FlashFullscreen_SetFullscreen, OnSetFullscreen)
-+  PPAPI_END_MESSAGE_MAP()
-+  return PP_ERROR_FAILED;
-+}
-+
-+int32_t PepperFlashFullscreenHost::OnSetFullscreen(
-+    ppapi::host::HostMessageContext* context,
-+    bool fullscreen) {
-+  content::PepperPluginInstance* plugin_instance =
-+      renderer_ppapi_host_->GetPluginInstance(pp_instance());
-+  if (plugin_instance && plugin_instance->FlashSetFullscreen(fullscreen, true))
-+    return PP_OK;
-+  return PP_ERROR_FAILED;
-+}
-added in remote
-  their  100644 86d0af73aee54451905485e2afa0e4cd08d0037e chromium_src/chrome/renderer/pepper/pepper_flash_fullscreen_host.h
-@@ -0,0 +1,35 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_RENDERER_PEPPER_PEPPER_FLASH_FULLSCREEN_HOST_H_
-+#define CHROME_RENDERER_PEPPER_PEPPER_FLASH_FULLSCREEN_HOST_H_
-+
-+#include "ppapi/host/resource_host.h"
-+
-+namespace content {
-+class RendererPpapiHost;
-+}
-+
-+class PepperFlashFullscreenHost : public ppapi::host::ResourceHost {
-+ public:
-+  PepperFlashFullscreenHost(content::RendererPpapiHost* host,
-+                            PP_Instance instance,
-+                            PP_Resource resource);
-+  ~PepperFlashFullscreenHost() override;
-+
-+  int32_t OnResourceMessageReceived(
-+      const IPC::Message& msg,
-+      ppapi::host::HostMessageContext* context) override;
-+
-+ private:
-+  int32_t OnSetFullscreen(ppapi::host::HostMessageContext* context,
-+                          bool fullscreen);
-+
-+  // Non-owning pointer.
-+  content::RendererPpapiHost* renderer_ppapi_host_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(PepperFlashFullscreenHost);
-+};
-+
-+#endif  // CHROME_RENDERER_PEPPER_PEPPER_FLASH_FULLSCREEN_HOST_H_
-added in remote
-  their  100644 45a79349a1c5e6f0b2767cbb1f5e678358f714b8 chromium_src/chrome/renderer/pepper/pepper_flash_menu_host.cc
-@@ -0,0 +1,201 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/renderer/pepper/pepper_flash_menu_host.h"
-+
-+#include "base/strings/utf_string_conversions.h"
-+#include "content/public/common/context_menu_params.h"
-+#include "content/public/renderer/render_frame.h"
-+#include "content/public/renderer/renderer_ppapi_host.h"
-+#include "ipc/ipc_message.h"
-+#include "ppapi/c/private/ppb_flash_menu.h"
-+#include "ppapi/host/dispatch_host_message.h"
-+#include "ppapi/host/ppapi_host.h"
-+#include "ppapi/proxy/ppapi_messages.h"
-+#include "ppapi/proxy/serialized_flash_menu.h"
-+#include "ui/gfx/geometry/point.h"
-+
-+namespace {
-+
-+// Maximum depth of submenus allowed (e.g., 1 indicates that submenus are
-+// allowed, but not sub-submenus).
-+const size_t kMaxMenuDepth = 2;
-+
-+// Maximum number of entries in any single menu (including separators).
-+const size_t kMaxMenuEntries = 50;
-+
-+// Maximum total number of entries in the |menu_id_map| (see below).
-+// (Limit to 500 real entries; reserve the 0 action as an invalid entry.)
-+const size_t kMaxMenuIdMapEntries = 501;
-+
-+// Converts menu data from one form to another.
-+//  - |depth| is the current nested depth (call it starting with 0).
-+//  - |menu_id_map| is such that |menu_id_map[output_item.action] ==
-+//    input_item.id| (where |action| is what a |MenuItem| has, |id| is what a
-+//    |PP_Flash_MenuItem| has).
-+bool ConvertMenuData(const PP_Flash_Menu* in_menu,
-+                     size_t depth,
-+                     std::vector<content::MenuItem>* out_menu,
-+                     std::vector<int32_t>* menu_id_map) {
-+  if (depth > kMaxMenuDepth || !in_menu)
-+    return false;
-+
-+  // Clear the output, just in case.
-+  out_menu->clear();
-+
-+  if (!in_menu->count)
-+    return true;  // Nothing else to do.
-+
-+  if (!in_menu->items || in_menu->count > kMaxMenuEntries)
-+    return false;
-+  for (uint32_t i = 0; i < in_menu->count; i++) {
-+    content::MenuItem item;
-+
-+    PP_Flash_MenuItem_Type type = in_menu->items[i].type;
-+    switch (type) {
-+      case PP_FLASH_MENUITEM_TYPE_NORMAL:
-+        item.type = content::MenuItem::OPTION;
-+        break;
-+      case PP_FLASH_MENUITEM_TYPE_CHECKBOX:
-+        item.type = content::MenuItem::CHECKABLE_OPTION;
-+        break;
-+      case PP_FLASH_MENUITEM_TYPE_SEPARATOR:
-+        item.type = content::MenuItem::SEPARATOR;
-+        break;
-+      case PP_FLASH_MENUITEM_TYPE_SUBMENU:
-+        item.type = content::MenuItem::SUBMENU;
-+        break;
-+      default:
-+        return false;
-+    }
-+    if (in_menu->items[i].name)
-+      item.label = base::UTF8ToUTF16(in_menu->items[i].name);
-+    if (menu_id_map->size() >= kMaxMenuIdMapEntries)
-+      return false;
-+    item.action = static_cast<unsigned>(menu_id_map->size());
-+    // This sets |(*menu_id_map)[item.action] = in_menu->items[i].id|.
-+    menu_id_map->push_back(in_menu->items[i].id);
-+    item.enabled = PP_ToBool(in_menu->items[i].enabled);
-+    item.checked = PP_ToBool(in_menu->items[i].checked);
-+    if (type == PP_FLASH_MENUITEM_TYPE_SUBMENU) {
-+      if (!ConvertMenuData(in_menu->items[i].submenu, depth + 1, &item.submenu,
-+                           menu_id_map))
-+        return false;
-+    }
-+
-+    out_menu->push_back(item);
-+  }
-+
-+  return true;
-+}
-+
-+}  // namespace
-+
-+PepperFlashMenuHost::PepperFlashMenuHost(
-+    content::RendererPpapiHost* host,
-+    PP_Instance instance,
-+    PP_Resource resource,
-+    const ppapi::proxy::SerializedFlashMenu& serial_menu)
-+    : ppapi::host::ResourceHost(host->GetPpapiHost(), instance, resource),
-+      renderer_ppapi_host_(host),
-+      showing_context_menu_(false),
-+      context_menu_request_id_(0),
-+      has_saved_context_menu_action_(false),
-+      saved_context_menu_action_(0) {
-+  menu_id_map_.push_back(0);  // Reserve |menu_id_map_[0]|.
-+  if (!ConvertMenuData(serial_menu.pp_menu(), 0, &menu_data_, &menu_id_map_)) {
-+    menu_data_.clear();
-+    menu_id_map_.clear();
-+  }
-+}
-+
-+PepperFlashMenuHost::~PepperFlashMenuHost() {
-+  if (showing_context_menu_) {
-+    content::RenderFrame* render_frame =
-+        renderer_ppapi_host_->GetRenderFrameForInstance(pp_instance());
-+    if (render_frame)
-+      render_frame->CancelContextMenu(context_menu_request_id_);
-+  }
-+}
-+
-+int32_t PepperFlashMenuHost::OnResourceMessageReceived(
-+    const IPC::Message& msg,
-+    ppapi::host::HostMessageContext* context) {
-+  PPAPI_BEGIN_MESSAGE_MAP(PepperFlashMenuHost, msg)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_FlashMenu_Show,
-+                                      OnHostMsgShow)
-+  PPAPI_END_MESSAGE_MAP()
-+  return PP_ERROR_FAILED;
-+}
-+
-+int32_t PepperFlashMenuHost::OnHostMsgShow(
-+    ppapi::host::HostMessageContext* context,
-+    const PP_Point& location) {
-+  // Note that all early returns must do a SendMenuReply. The sync result for
-+  // this message isn't used, so to forward the error to the plugin, we need to
-+  // additionally call SendMenuReply explicitly.
-+  if (menu_data_.empty()) {
-+    SendMenuReply(PP_ERROR_FAILED, -1);
-+    return PP_ERROR_FAILED;
-+  }
-+  if (showing_context_menu_) {
-+    SendMenuReply(PP_ERROR_INPROGRESS, -1);
-+    return PP_ERROR_INPROGRESS;
-+  }
-+
-+  content::RenderFrame* render_frame =
-+      renderer_ppapi_host_->GetRenderFrameForInstance(pp_instance());
-+
-+  content::ContextMenuParams params;
-+  params.x = location.x;
-+  params.y = location.y;
-+  params.custom_context.is_pepper_menu = true;
-+  params.custom_context.render_widget_id =
-+      renderer_ppapi_host_->GetRoutingIDForWidget(pp_instance());
-+  params.custom_items = menu_data_;
-+
-+  // Transform the position to be in render frame's coordinates.
-+  gfx::Point render_frame_pt = renderer_ppapi_host_->PluginPointToRenderFrame(
-+      pp_instance(), gfx::Point(location.x, location.y));
-+  params.x = render_frame_pt.x();
-+  params.y = render_frame_pt.y();
-+
-+  showing_context_menu_ = true;
-+  context_menu_request_id_ = render_frame->ShowContextMenu(this, params);
-+
-+  // Note: the show message is sync so this OK is for the sync reply which we
-+  // don't actually use (see the comment in the resource file for this). The
-+  // async message containing the context menu action will be sent in the
-+  // future.
-+  return PP_OK;
-+}
-+
-+void PepperFlashMenuHost::OnMenuAction(int request_id, unsigned action) {
-+  // Just save the action.
-+  DCHECK(!has_saved_context_menu_action_);
-+  has_saved_context_menu_action_ = true;
-+  saved_context_menu_action_ = action;
-+}
-+
-+void PepperFlashMenuHost::OnMenuClosed(int request_id) {
-+  if (has_saved_context_menu_action_ &&
-+      saved_context_menu_action_ < menu_id_map_.size()) {
-+    SendMenuReply(PP_OK, menu_id_map_[saved_context_menu_action_]);
-+    has_saved_context_menu_action_ = false;
-+    saved_context_menu_action_ = 0;
-+  } else {
-+    SendMenuReply(PP_ERROR_USERCANCEL, -1);
-+  }
-+
-+  showing_context_menu_ = false;
-+  context_menu_request_id_ = 0;
-+}
-+
-+void PepperFlashMenuHost::SendMenuReply(int32_t result, int action) {
-+  ppapi::host::ReplyMessageContext reply_context(
-+      ppapi::proxy::ResourceMessageReplyParams(pp_resource(), 0), NULL,
-+      MSG_ROUTING_NONE);
-+  reply_context.params.set_result(result);
-+  host()->SendReply(reply_context, PpapiPluginMsg_FlashMenu_ShowReply(action));
-+}
-added in remote
-  their  100644 a2b4f9cb40098aa65bd8c15759dbbfbcc4fa6674 chromium_src/chrome/renderer/pepper/pepper_flash_menu_host.h
-@@ -0,0 +1,69 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_RENDERER_PEPPER_PEPPER_FLASH_MENU_HOST_H_
-+#define CHROME_RENDERER_PEPPER_PEPPER_FLASH_MENU_HOST_H_
-+
-+#include <vector>
-+
-+#include "base/compiler_specific.h"
-+#include "content/public/renderer/context_menu_client.h"
-+#include "ppapi/c/pp_point.h"
-+#include "ppapi/host/host_message_context.h"
-+#include "ppapi/host/resource_host.h"
-+
-+namespace content {
-+class RendererPpapiHost;
-+struct MenuItem;
-+}  // namespace content
-+
-+namespace ppapi {
-+namespace proxy {
-+class SerializedFlashMenu;
-+}
-+}  // namespace ppapi
-+
-+class PepperFlashMenuHost : public ppapi::host::ResourceHost,
-+                            public content::ContextMenuClient {
-+ public:
-+  PepperFlashMenuHost(content::RendererPpapiHost* host,
-+                      PP_Instance instance,
-+                      PP_Resource resource,
-+                      const ppapi::proxy::SerializedFlashMenu& serial_menu);
-+  ~PepperFlashMenuHost() override;
-+
-+  int32_t OnResourceMessageReceived(
-+      const IPC::Message& msg,
-+      ppapi::host::HostMessageContext* context) override;
-+
-+ private:
-+  int32_t OnHostMsgShow(ppapi::host::HostMessageContext* context,
-+                        const PP_Point& location);
-+
-+  // ContextMenuClient implementation.
-+  void OnMenuAction(int request_id, unsigned action) override;
-+  void OnMenuClosed(int request_id) override;
-+
-+  void SendMenuReply(int32_t result, int action);
-+
-+  content::RendererPpapiHost* renderer_ppapi_host_;
-+
-+  bool showing_context_menu_;
-+  int context_menu_request_id_;
-+
-+  std::vector<content::MenuItem> menu_data_;
-+
-+  // We send |MenuItem|s, which have an |unsigned| "action" field instead of
-+  // an |int32_t| ID. (CONTENT also limits the range of valid values for
-+  // actions.) This maps actions to IDs.
-+  std::vector<int32_t> menu_id_map_;
-+
-+  // Used to send a single context menu "completion" upon menu close.
-+  bool has_saved_context_menu_action_;
-+  unsigned saved_context_menu_action_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(PepperFlashMenuHost);
-+};
-+
-+#endif  // CHROME_RENDERER_PEPPER_PEPPER_FLASH_MENU_HOST_H_
-added in remote
-  their  100644 50015122ccc7e2da02d0e9b2c7014e085c3ffec4 chromium_src/chrome/renderer/pepper/pepper_flash_renderer_host.cc
-@@ -0,0 +1,370 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/renderer/pepper/pepper_flash_renderer_host.h"
-+
-+#include <map>
-+#include <vector>
-+
-+#include "base/lazy_instance.h"
-+#include "base/macros.h"
-+#include "base/metrics/histogram_macros.h"
-+#include "base/strings/string_util.h"
-+#include "content/public/renderer/pepper_plugin_instance.h"
-+#include "content/public/renderer/render_thread.h"
-+#include "content/public/renderer/renderer_ppapi_host.h"
-+#include "ipc/ipc_message_macros.h"
-+#include "net/http/http_util.h"
-+#include "ppapi/c/pp_errors.h"
-+#include "ppapi/c/trusted/ppb_browser_font_trusted.h"
-+#include "ppapi/host/dispatch_host_message.h"
-+#include "ppapi/proxy/host_dispatcher.h"
-+#include "ppapi/proxy/ppapi_messages.h"
-+#include "ppapi/proxy/resource_message_params.h"
-+#include "ppapi/proxy/serialized_structs.h"
-+#include "ppapi/thunk/enter.h"
-+#include "ppapi/thunk/ppb_image_data_api.h"
-+#include "skia/ext/platform_canvas.h"
-+#include "third_party/skia/include/core/SkCanvas.h"
-+#include "third_party/skia/include/core/SkFontStyle.h"
-+#include "third_party/skia/include/core/SkMatrix.h"
-+#include "third_party/skia/include/core/SkPaint.h"
-+#include "third_party/skia/include/core/SkPoint.h"
-+#include "third_party/skia/include/core/SkTypeface.h"
-+#include "ui/gfx/geometry/rect.h"
-+#include "url/gurl.h"
-+
-+using ppapi::thunk::EnterResourceNoLock;
-+using ppapi::thunk::PPB_ImageData_API;
-+
-+namespace {
-+
-+// Some non-simple HTTP request headers that Flash may set.
-+// (Please see http://www.w3.org/TR/cors/#simple-header for the definition of
-+// simple headers.)
-+//
-+// The list and the enum defined below are used to collect data about request
-+// headers used in PPB_Flash.Navigate() calls, in order to understand the impact
-+// of rejecting PPB_Flash.Navigate() requests with non-simple headers.
-+//
-+// TODO(yzshen): We should be able to remove the histogram recording code once
-+// we get the answer.
-+const char* const kRejectedHttpRequestHeaders[] = {
-+    "authorization",     //
-+    "cache-control",     //
-+    "content-encoding",  //
-+    "content-md5",       //
-+    "content-type",      // If the media type is not one of those covered by the
-+                         // simple header definition.
-+    "expires",           //
-+    "from",              //
-+    "if-match",          //
-+    "if-none-match",     //
-+    "if-range",          //
-+    "if-unmodified-since",  //
-+    "pragma",               //
-+    "referer"               //
-+};
-+
-+// Please note that new entries should be added right above
-+// FLASH_NAVIGATE_USAGE_ENUM_COUNT, and existing entries shouldn't be re-ordered
-+// or removed, since this ordering is used in a histogram.
-+enum FlashNavigateUsage {
-+  // This section must be in the same order as kRejectedHttpRequestHeaders.
-+  REJECT_AUTHORIZATION = 0,
-+  REJECT_CACHE_CONTROL,
-+  REJECT_CONTENT_ENCODING,
-+  REJECT_CONTENT_MD5,
-+  REJECT_CONTENT_TYPE,
-+  REJECT_EXPIRES,
-+  REJECT_FROM,
-+  REJECT_IF_MATCH,
-+  REJECT_IF_NONE_MATCH,
-+  REJECT_IF_RANGE,
-+  REJECT_IF_UNMODIFIED_SINCE,
-+  REJECT_PRAGMA,
-+  REJECT_REFERER,
-+
-+  // The navigate request is rejected because of headers not listed above
-+  // (e.g., custom headers).
-+  REJECT_OTHER_HEADERS,
-+
-+  // Total number of rejected navigate requests.
-+  TOTAL_REJECTED_NAVIGATE_REQUESTS,
-+
-+  // Total number of navigate requests.
-+  TOTAL_NAVIGATE_REQUESTS,
-+  FLASH_NAVIGATE_USAGE_ENUM_COUNT
-+};
-+
-+static base::LazyInstance<std::map<std::string, FlashNavigateUsage>>::
-+    DestructorAtExit g_rejected_headers = LAZY_INSTANCE_INITIALIZER;
-+
-+bool IsSimpleHeader(const std::string& lower_case_header_name,
-+                    const std::string& header_value) {
-+  if (lower_case_header_name == "accept" ||
-+      lower_case_header_name == "accept-language" ||
-+      lower_case_header_name == "content-language") {
-+    return true;
-+  }
-+
-+  if (lower_case_header_name == "content-type") {
-+    std::string lower_case_mime_type;
-+    std::string lower_case_charset;
-+    bool had_charset = false;
-+    net::HttpUtil::ParseContentType(header_value, &lower_case_mime_type,
-+                                    &lower_case_charset, &had_charset, NULL);
-+    return lower_case_mime_type == "application/x-www-form-urlencoded" ||
-+           lower_case_mime_type == "multipart/form-data" ||
-+           lower_case_mime_type == "text/plain";
-+  }
-+
-+  return false;
-+}
-+
-+void RecordFlashNavigateUsage(FlashNavigateUsage usage) {
-+  DCHECK_NE(FLASH_NAVIGATE_USAGE_ENUM_COUNT, usage);
-+  UMA_HISTOGRAM_ENUMERATION("Plugin.FlashNavigateUsage", usage,
-+                            FLASH_NAVIGATE_USAGE_ENUM_COUNT);
-+}
-+
-+}  // namespace
-+
-+PepperFlashRendererHost::PepperFlashRendererHost(
-+    content::RendererPpapiHost* host,
-+    PP_Instance instance,
-+    PP_Resource resource)
-+    : ResourceHost(host->GetPpapiHost(), instance, resource),
-+      host_(host),
-+      weak_factory_(this) {}
-+
-+PepperFlashRendererHost::~PepperFlashRendererHost() {
-+  // This object may be destroyed in the middle of a sync message. If that is
-+  // the case, make sure we respond to all the pending navigate calls.
-+  std::vector<ppapi::host::ReplyMessageContext>::reverse_iterator it;
-+  for (it = navigate_replies_.rbegin(); it != navigate_replies_.rend(); ++it)
-+    SendReply(*it, IPC::Message());
-+}
-+
-+int32_t PepperFlashRendererHost::OnResourceMessageReceived(
-+    const IPC::Message& msg,
-+    ppapi::host::HostMessageContext* context) {
-+  PPAPI_BEGIN_MESSAGE_MAP(PepperFlashRendererHost, msg)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_Flash_GetProxyForURL,
-+                                      OnGetProxyForURL)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_Flash_SetInstanceAlwaysOnTop,
-+                                      OnSetInstanceAlwaysOnTop)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_Flash_DrawGlyphs,
-+                                      OnDrawGlyphs)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_Flash_Navigate, OnNavigate)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_Flash_IsRectTopmost,
-+                                      OnIsRectTopmost)
-+  PPAPI_END_MESSAGE_MAP()
-+  return PP_ERROR_FAILED;
-+}
-+
-+int32_t PepperFlashRendererHost::OnGetProxyForURL(
-+    ppapi::host::HostMessageContext* host_context,
-+    const std::string& url) {
-+  GURL gurl(url);
-+  if (!gurl.is_valid())
-+    return PP_ERROR_FAILED;
-+  std::string proxy;
-+  bool result = content::RenderThread::Get()->ResolveProxy(gurl, &proxy);
-+  if (!result)
-+    return PP_ERROR_FAILED;
-+  host_context->reply_msg = PpapiPluginMsg_Flash_GetProxyForURLReply(proxy);
-+  return PP_OK;
-+}
-+
-+int32_t PepperFlashRendererHost::OnSetInstanceAlwaysOnTop(
-+    ppapi::host::HostMessageContext* host_context,
-+    bool on_top) {
-+  content::PepperPluginInstance* plugin_instance =
-+      host_->GetPluginInstance(pp_instance());
-+  if (plugin_instance)
-+    plugin_instance->SetAlwaysOnTop(on_top);
-+  // Since no reply is sent for this message, it doesn't make sense to return an
-+  // error.
-+  return PP_OK;
-+}
-+
-+int32_t PepperFlashRendererHost::OnDrawGlyphs(
-+    ppapi::host::HostMessageContext* host_context,
-+    ppapi::proxy::PPBFlash_DrawGlyphs_Params params) {
-+  return PP_ERROR_FAILED;
-+  // if (params.glyph_indices.size() != params.glyph_advances.size() ||
-+  //     params.glyph_indices.empty())
-+  //   return PP_ERROR_FAILED;
-+  //
-+  // // Set up the typeface.
-+  // int weight = (params.font_desc.weight + 1) * 100;
-+  // SkFontStyle::Slant slant = SkFontStyle::kUpright_Slant;
-+  // if (params.font_desc.italic)
-+  //   slant = SkFontStyle::kItalic_Slant;
-+  // SkFontStyle style(weight, SkFontStyle::kNormal_Width, slant);
-+  // sk_sp<SkTypeface> typeface(
-+  //     SkTypeface::MakeFromName(params.font_desc.face.c_str(), style));
-+  // if (!typeface)
-+  //   return PP_ERROR_FAILED;
-+  //
-+  // EnterResourceNoLock<PPB_ImageData_API> enter(
-+  //     params.image_data.host_resource(), true);
-+  // if (enter.failed())
-+  //   return PP_ERROR_FAILED;
-+  //
-+  // // Set up the canvas.
-+  // PPB_ImageData_API* image = static_cast<PPB_ImageData_API*>(enter.object());
-+  // SkCanvas* canvas = image->GetCanvas();
-+  // bool needs_unmapping = false;
-+  // if (!canvas) {
-+  //   needs_unmapping = true;
-+  //   image->Map();
-+  //   canvas = image->GetCanvas();
-+  //   if (!canvas)
-+  //     return PP_ERROR_FAILED;  // Failure mapping.
-+  // }
-+  //
-+  // SkAutoCanvasRestore acr(canvas, true);
-+  //
-+  // // Clip is applied in pixels before the transform.
-+  // SkRect clip_rect = {
-+  //     SkIntToScalar(params.clip.point.x), SkIntToScalar(params.clip.point.y),
-+  //     SkIntToScalar(params.clip.point.x + params.clip.size.width),
-+  //     SkIntToScalar(params.clip.point.y + params.clip.size.height)};
-+  // canvas->clipRect(clip_rect);
-+  //
-+  // // Convert & set the matrix.
-+  // SkMatrix matrix;
-+  // matrix.set(SkMatrix::kMScaleX, SkFloatToScalar(params.transformation[0][0]));
-+  // matrix.set(SkMatrix::kMSkewX, SkFloatToScalar(params.transformation[0][1]));
-+  // matrix.set(SkMatrix::kMTransX, SkFloatToScalar(params.transformation[0][2]));
-+  // matrix.set(SkMatrix::kMSkewY, SkFloatToScalar(params.transformation[1][0]));
-+  // matrix.set(SkMatrix::kMScaleY, SkFloatToScalar(params.transformation[1][1]));
-+  // matrix.set(SkMatrix::kMTransY, SkFloatToScalar(params.transformation[1][2]));
-+  // matrix.set(SkMatrix::kMPersp0, SkFloatToScalar(params.transformation[2][0]));
-+  // matrix.set(SkMatrix::kMPersp1, SkFloatToScalar(params.transformation[2][1]));
-+  // matrix.set(SkMatrix::kMPersp2, SkFloatToScalar(params.transformation[2][2]));
-+  // canvas->concat(matrix);
-+  //
-+  // SkPaint paint;
-+  // paint.setColor(params.color);
-+  // paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
-+  // paint.setAntiAlias(true);
-+  // paint.setHinting(SkPaint::kFull_Hinting);
-+  // paint.setTextSize(SkIntToScalar(params.font_desc.size));
-+  // paint.setTypeface(std::move(typeface));
-+  // if (params.allow_subpixel_aa) {
-+  //   paint.setSubpixelText(true);
-+  //   paint.setLCDRenderText(true);
-+  // }
-+  //
-+  // SkScalar x = SkIntToScalar(params.position.x);
-+  // SkScalar y = SkIntToScalar(params.position.y);
-+  //
-+  // // Build up the skia advances.
-+  // size_t glyph_count = params.glyph_indices.size();
-+  // if (glyph_count) {
-+  //   std::vector<SkPoint> storage;
-+  //   storage.resize(glyph_count);
-+  //   SkPoint* sk_positions = &storage[0];
-+  //   for (uint32_t i = 0; i < glyph_count; i++) {
-+  //     sk_positions[i].set(x, y);
-+  //     x += SkFloatToScalar(params.glyph_advances[i].x);
-+  //     y += SkFloatToScalar(params.glyph_advances[i].y);
-+  //   }
-+  //
-+  //   canvas->drawPosText(&params.glyph_indices[0], glyph_count * 2, sk_positions,
-+  //                       paint);
-+  // }
-+  //
-+  // if (needs_unmapping)
-+  //   image->Unmap();
-+  //
-+  // return PP_OK;
-+}
-+
-+// CAUTION: This code is subtle because Navigate is a sync call which may
-+// cause re-entrancy or cause the instance to be destroyed. If the instance
-+// is destroyed we need to ensure that we respond to all outstanding sync
-+// messages so that the plugin process does not remain blocked.
-+int32_t PepperFlashRendererHost::OnNavigate(
-+    ppapi::host::HostMessageContext* host_context,
-+    const ppapi::URLRequestInfoData& data,
-+    const std::string& target,
-+    bool from_user_action) {
-+  // If our PepperPluginInstance is already destroyed, just return a failure.
-+  content::PepperPluginInstance* plugin_instance =
-+      host_->GetPluginInstance(pp_instance());
-+  if (!plugin_instance)
-+    return PP_ERROR_FAILED;
-+
-+  std::map<std::string, FlashNavigateUsage>& rejected_headers =
-+      g_rejected_headers.Get();
-+  if (rejected_headers.empty()) {
-+    for (size_t i = 0; i < arraysize(kRejectedHttpRequestHeaders); ++i)
-+      rejected_headers[kRejectedHttpRequestHeaders[i]] =
-+          static_cast<FlashNavigateUsage>(i);
-+  }
-+
-+  net::HttpUtil::HeadersIterator header_iter(data.headers.begin(),
-+                                             data.headers.end(), "\n\r");
-+  bool rejected = false;
-+  while (header_iter.GetNext()) {
-+    std::string lower_case_header_name = base::ToLowerASCII(header_iter.name());
-+    if (!IsSimpleHeader(lower_case_header_name, header_iter.values())) {
-+      rejected = true;
-+
-+      std::map<std::string, FlashNavigateUsage>::const_iterator iter =
-+          rejected_headers.find(lower_case_header_name);
-+      FlashNavigateUsage usage =
-+          iter != rejected_headers.end() ? iter->second : REJECT_OTHER_HEADERS;
-+      RecordFlashNavigateUsage(usage);
-+    }
-+  }
-+
-+  RecordFlashNavigateUsage(TOTAL_NAVIGATE_REQUESTS);
-+  if (rejected) {
-+    RecordFlashNavigateUsage(TOTAL_REJECTED_NAVIGATE_REQUESTS);
-+    return PP_ERROR_NOACCESS;
-+  }
-+
-+  // Navigate may call into Javascript (e.g. with a "javascript:" URL),
-+  // or do things like navigate away from the page, either one of which will
-+  // need to re-enter into the plugin. It is safe, because it is essentially
-+  // equivalent to NPN_GetURL, where Flash would expect re-entrancy.
-+  ppapi::proxy::HostDispatcher* host_dispatcher =
-+      ppapi::proxy::HostDispatcher::GetForInstance(pp_instance());
-+  host_dispatcher->set_allow_plugin_reentrancy();
-+
-+  // Grab a weak pointer to ourselves on the stack so we can check if we are
-+  // still alive.
-+  base::WeakPtr<PepperFlashRendererHost> weak_ptr = weak_factory_.GetWeakPtr();
-+  // Keep track of reply contexts in case we are destroyed during a Navigate
-+  // call. Even if we are destroyed, we still need to send these replies to
-+  // unblock the plugin process.
-+  navigate_replies_.push_back(host_context->MakeReplyMessageContext());
-+  plugin_instance->Navigate(data, target.c_str(), from_user_action);
-+  // This object might have been destroyed by this point. If it is destroyed
-+  // the reply will be sent in the destructor. Otherwise send the reply here.
-+  if (weak_ptr.get()) {
-+    SendReply(navigate_replies_.back(), IPC::Message());
-+    navigate_replies_.pop_back();
-+  }
-+
-+  // Return PP_OK_COMPLETIONPENDING so that no reply is automatically sent.
-+  return PP_OK_COMPLETIONPENDING;
-+}
-+
-+int32_t PepperFlashRendererHost::OnIsRectTopmost(
-+    ppapi::host::HostMessageContext* host_context,
-+    const PP_Rect& rect) {
-+  content::PepperPluginInstance* plugin_instance =
-+      host_->GetPluginInstance(pp_instance());
-+  if (plugin_instance &&
-+      plugin_instance->IsRectTopmost(gfx::Rect(
-+          rect.point.x, rect.point.y, rect.size.width, rect.size.height)))
-+    return PP_OK;
-+  return PP_ERROR_FAILED;
-+}
-added in remote
-  their  100644 b080f1d9fbf0db2e6adaf67dd783b05eeb9d06a0 chromium_src/chrome/renderer/pepper/pepper_flash_renderer_host.h
-@@ -0,0 +1,68 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_RENDERER_PEPPER_PEPPER_FLASH_RENDERER_HOST_H_
-+#define CHROME_RENDERER_PEPPER_PEPPER_FLASH_RENDERER_HOST_H_
-+
-+#include <string>
-+#include <vector>
-+
-+#include "base/memory/weak_ptr.h"
-+#include "ppapi/host/host_message_context.h"
-+#include "ppapi/host/resource_host.h"
-+
-+struct PP_Rect;
-+
-+namespace ppapi {
-+struct URLRequestInfoData;
-+}
-+
-+namespace ppapi {
-+namespace proxy {
-+struct PPBFlash_DrawGlyphs_Params;
-+}
-+}  // namespace ppapi
-+
-+namespace content {
-+class RendererPpapiHost;
-+}
-+
-+class PepperFlashRendererHost : public ppapi::host::ResourceHost {
-+ public:
-+  PepperFlashRendererHost(content::RendererPpapiHost* host,
-+                          PP_Instance instance,
-+                          PP_Resource resource);
-+  ~PepperFlashRendererHost() override;
-+
-+  // ppapi::host::ResourceHost override.
-+  int32_t OnResourceMessageReceived(
-+      const IPC::Message& msg,
-+      ppapi::host::HostMessageContext* context) override;
-+
-+ private:
-+  int32_t OnGetProxyForURL(ppapi::host::HostMessageContext* host_context,
-+                           const std::string& url);
-+  int32_t OnSetInstanceAlwaysOnTop(
-+      ppapi::host::HostMessageContext* host_context,
-+      bool on_top);
-+  int32_t OnDrawGlyphs(ppapi::host::HostMessageContext* host_context,
-+                       ppapi::proxy::PPBFlash_DrawGlyphs_Params params);
-+  int32_t OnNavigate(ppapi::host::HostMessageContext* host_context,
-+                     const ppapi::URLRequestInfoData& data,
-+                     const std::string& target,
-+                     bool from_user_action);
-+  int32_t OnIsRectTopmost(ppapi::host::HostMessageContext* host_context,
-+                          const PP_Rect& rect);
-+
-+  // A stack of ReplyMessageContexts to track Navigate() calls which have not
-+  // yet been replied to.
-+  std::vector<ppapi::host::ReplyMessageContext> navigate_replies_;
-+
-+  content::RendererPpapiHost* host_;
-+  base::WeakPtrFactory<PepperFlashRendererHost> weak_factory_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(PepperFlashRendererHost);
-+};
-+
-+#endif  // CHROME_RENDERER_PEPPER_PEPPER_FLASH_RENDERER_HOST_H_
-added in remote
-  their  100644 eef18560f9e577a77f8dc4eba64bf5907f77a0e2 chromium_src/chrome/renderer/pepper/pepper_helper.cc
-@@ -0,0 +1,30 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/renderer/pepper/pepper_helper.h"
-+
-+#include "chrome/renderer/pepper/chrome_renderer_pepper_host_factory.h"
-+#include "chrome/renderer/pepper/pepper_shared_memory_message_filter.h"
-+#include "content/public/renderer/renderer_ppapi_host.h"
-+#include "ppapi/host/ppapi_host.h"
-+
-+PepperHelper::PepperHelper(content::RenderFrame* render_frame)
-+    : RenderFrameObserver(render_frame) {}
-+
-+PepperHelper::~PepperHelper() {}
-+
-+void PepperHelper::DidCreatePepperPlugin(content::RendererPpapiHost* host) {
-+  // TODO(brettw) figure out how to hook up the host factory. It needs some
-+  // kind of filter-like system to allow dynamic additions.
-+  host->GetPpapiHost()->AddHostFactoryFilter(
-+      std::unique_ptr<ppapi::host::HostFactory>(
-+          new ChromeRendererPepperHostFactory(host)));
-+  host->GetPpapiHost()->AddInstanceMessageFilter(
-+      std::unique_ptr<ppapi::host::InstanceMessageFilter>(
-+          new PepperSharedMemoryMessageFilter(host)));
-+}
-+
-+void PepperHelper::OnDestruct() {
-+  delete this;
-+}
-added in remote
-  their  100644 6157d2c794868d5d2b5f39ddd6f38cbce72a0a9f chromium_src/chrome/renderer/pepper/pepper_helper.h
-@@ -0,0 +1,26 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_RENDERER_PEPPER_PEPPER_HELPER_H_
-+#define CHROME_RENDERER_PEPPER_PEPPER_HELPER_H_
-+
-+#include "base/compiler_specific.h"
-+#include "content/public/renderer/render_frame_observer.h"
-+
-+// This class listens for Pepper creation events from the RenderFrame and
-+// attaches the parts required for Chrome-specific plugin support.
-+class PepperHelper : public content::RenderFrameObserver {
-+ public:
-+  explicit PepperHelper(content::RenderFrame* render_frame);
-+  ~PepperHelper() override;
-+
-+  // RenderFrameObserver.
-+  void DidCreatePepperPlugin(content::RendererPpapiHost* host) override;
-+  void OnDestruct() override;
-+
-+ private:
-+  DISALLOW_COPY_AND_ASSIGN(PepperHelper);
-+};
-+
-+#endif  // CHROME_RENDERER_PEPPER_PEPPER_HELPER_H_
-added in remote
-  their  100644 fb72c2da786b3cbcef7ce149f560821592df1747 chromium_src/chrome/renderer/pepper/pepper_shared_memory_message_filter.cc
-@@ -0,0 +1,63 @@
-+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/renderer/pepper/pepper_shared_memory_message_filter.h"
-+
-+#include <memory>
-+
-+#include "base/memory/shared_memory.h"
-+#include "base/process/process_handle.h"
-+#include "content/public/common/content_client.h"
-+#include "content/public/renderer/pepper_plugin_instance.h"
-+#include "content/public/renderer/render_thread.h"
-+#include "content/public/renderer/renderer_ppapi_host.h"
-+#include "ppapi/host/ppapi_host.h"
-+#include "ppapi/proxy/ppapi_messages.h"
-+#include "ppapi/shared_impl/var_tracker.h"
-+
-+PepperSharedMemoryMessageFilter::PepperSharedMemoryMessageFilter(
-+    content::RendererPpapiHost* host)
-+    : InstanceMessageFilter(host->GetPpapiHost()), host_(host) {}
-+
-+PepperSharedMemoryMessageFilter::~PepperSharedMemoryMessageFilter() {}
-+
-+bool PepperSharedMemoryMessageFilter::OnInstanceMessageReceived(
-+    const IPC::Message& msg) {
-+  bool handled = true;
-+  IPC_BEGIN_MESSAGE_MAP(PepperSharedMemoryMessageFilter, msg)
-+    IPC_MESSAGE_HANDLER(PpapiHostMsg_SharedMemory_CreateSharedMemory,
-+                        OnHostMsgCreateSharedMemory)
-+    IPC_MESSAGE_UNHANDLED(handled = false)
-+  IPC_END_MESSAGE_MAP()
-+  return handled;
-+}
-+
-+bool PepperSharedMemoryMessageFilter::Send(IPC::Message* msg) {
-+  return host_->GetPpapiHost()->Send(msg);
-+}
-+
-+void PepperSharedMemoryMessageFilter::OnHostMsgCreateSharedMemory(
-+    PP_Instance instance,
-+    uint32_t size,
-+    int* host_handle_id,
-+    ppapi::proxy::SerializedHandle* plugin_handle) {
-+  plugin_handle->set_null_shmem();
-+  *host_handle_id = -1;
-+  std::unique_ptr<base::SharedMemory> shm(
-+      content::RenderThread::Get()->HostAllocateSharedMemoryBuffer(size));
-+  if (!shm.get())
-+    return;
-+
-+  base::SharedMemoryHandle host_shm_handle = shm->handle().Duplicate();
-+  *host_handle_id =
-+      content::PepperPluginInstance::Get(instance)
-+          ->GetVarTracker()
-+          ->TrackSharedMemoryHandle(instance, host_shm_handle, size);
-+
-+  // We set auto_close to false since we need our file descriptor to
-+  // actually be duplicated on linux. The shared memory destructor will
-+  // close the original handle for us.
-+  plugin_handle->set_shmem(
-+      host_->ShareSharedMemoryHandleWithRemote(host_shm_handle), size);
-+}
-added in remote
-  their  100644 d1e2dc1719e501561941cafeab4fd95ef0779314 chromium_src/chrome/renderer/pepper/pepper_shared_memory_message_filter.h
-@@ -0,0 +1,46 @@
-+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_RENDERER_PEPPER_PEPPER_SHARED_MEMORY_MESSAGE_FILTER_H_
-+#define CHROME_RENDERER_PEPPER_PEPPER_SHARED_MEMORY_MESSAGE_FILTER_H_
-+
-+#include "ppapi/c/pp_instance.h"
-+#include "ppapi/host/instance_message_filter.h"
-+
-+namespace content {
-+class RendererPpapiHost;
-+}
-+
-+namespace ppapi {
-+namespace proxy {
-+class SerializedHandle;
-+}
-+}  // namespace ppapi
-+
-+// Implements the backend for shared memory messages from a plugin process.
-+class PepperSharedMemoryMessageFilter
-+    : public ppapi::host::InstanceMessageFilter {
-+ public:
-+  explicit PepperSharedMemoryMessageFilter(content::RendererPpapiHost* host);
-+  ~PepperSharedMemoryMessageFilter() override;
-+
-+  // InstanceMessageFilter:
-+  bool OnInstanceMessageReceived(const IPC::Message& msg) override;
-+
-+  bool Send(IPC::Message* msg);
-+
-+ private:
-+  // Message handlers.
-+  void OnHostMsgCreateSharedMemory(
-+      PP_Instance instance,
-+      uint32_t size,
-+      int* host_shm_handle_id,
-+      ppapi::proxy::SerializedHandle* plugin_shm_handle);
-+
-+  content::RendererPpapiHost* host_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(PepperSharedMemoryMessageFilter);
-+};
-+
-+#endif  // CHROME_RENDERER_PEPPER_PEPPER_SHARED_MEMORY_MESSAGE_FILTER_H_
-added in both
-  our    100644 8744574f10aa0235234f87cd1b614572d9ba98e9 chromium_src/chrome/utility/printing_handler_win.h
-  their  100644 d058e7e505569126827ba24b3a42051ba386630c chromium_src/chrome/utility/printing_handler_win.h
-@@ -13,7 +13,11 @@
- 
- namespace printing {
- 
-+<<<<<<< .our
- struct PdfRenderSettings;
-+=======
-+class PdfRenderSettings;
-+>>>>>>> .their
- struct PwgRasterSettings;
- struct PageRange;
- 
-added in both
-  our    100644 1b9da74e503ab4afa8d2c530cd45332f0868a463 default_app/default_app.js
-  their  100644 e6ba9eea2cb5938fe71ab7c18a47921d3959061e default_app/default_app.js
-@@ -18,17 +18,24 @@
-       webPreferences: {
-         nodeIntegrationInWorker: true
-       },
-+<<<<<<< .our
-       useContentSize: true,
-       show: false
-+=======
-+      useContentSize: true
-+>>>>>>> .their
-     }
-     if (process.platform === 'linux') {
-       options.icon = path.join(__dirname, 'icon.png')
-     }
- 
-     mainWindow = new BrowserWindow(options)
-+<<<<<<< .our
- 
-     mainWindow.on('ready-to-show', () => mainWindow.show())
- 
-+=======
-+>>>>>>> .their
-     mainWindow.loadURL(appUrl)
-     mainWindow.focus()
-   })
-added in both
-  our    100644 fd4525f128b5f7718e03998a9d83ae79ff163078 default_app/index.html
-  their  100644 c8564cb57a11cbfea4bea37db09df4cd82dee4fb default_app/index.html
-@@ -2,13 +2,174 @@
- 
- <head>
-   <title>Electron</title>
-+<<<<<<< .our
-   <meta http-equiv="Content-Security-Policy" content="default-src 'none'; script-src 'self'; style-src 'self'; img-src 'self'" />
-   <link href="./styles.css" type="text/css" rel="stylesheet" />
-   <link href="./node_modules/octicons/build/build.css" type="text/css" rel="stylesheet" />
-+=======
-+  <style>
-+    body {
-+      color: #86a5b1;
-+      background-color: #2f3241;
-+      font-family: Roboto, -apple-system, BlinkMacSystemFont, "Helvetica Neue", "Segoe UI", "Oxygen", "Ubuntu", "Cantarell", "Open Sans", sans-serif;
-+      margin: 0;
-+      display: flex;
-+      flex-direction: column;
-+    }
-+
-+    .container {
-+      margin: 15px 30px 30px 30px;
-+      background-color: #2f3241;
-+      flex: 1;
-+      display: flex;
-+      flex-direction: column;
-+    }
-+
-+    .svg-stroke {
-+      stroke: #9feaf9;
-+    }
-+
-+    .svg-fill {
-+      fill: #9feaf9;
-+    }
-+
-+    .vertical-middle {
-+      vertical-align: middle !important;
-+    }
-+
-+    h2, h4, p {
-+      text-align: center;
-+    }
-+
-+    h4 {
-+      font-weight: normal;
-+      margin: 0;
-+      line-height: 3;
-+    }
-+
-+    .hero-icons {
-+      transform-origin: 50% 50%;
-+    }
-+
-+    hero-icon.loop-3 {
-+      transform: translate(79px, 21px);
-+      opacity: 1;
-+    }
-+
-+    .hero-icon {
-+      fill: #c2f5ff;
-+      opacity: 1;
-+      transform-origin: 50% 50%;
-+    }
-+
-+    .hero-app {
-+      fill: #71abb7;
-+      transform-origin: 50% 50%;
-+    }
-+
-+    a {
-+      color: #86a5b1;
-+      text-decoration: none;
-+      transition: all 0.2s;
-+    }
-+
-+    a:hover {
-+      color: #c2f5ff;
-+      text-decoration: none;
-+    }
-+
-+    pre, code, .code {
-+      font-family: "Menlo", "Lucida Console", monospace;
-+      color: #c2f5ff;
-+    }
-+
-+    pre {
-+      background-color: #26282E;
-+      white-space: pre-wrap;
-+      line-height: 2.5;
-+      overflow: auto;
-+      margin: 0 auto;
-+      display: inline-block;
-+      padding: 6px 15px;
-+      text-align: center;
-+      border-radius: 3px;
-+    }
-+
-+    pre.with-prompt:before {
-+      content: "$ ";
-+      opacity: 0.7;
-+    }
-+
-+    code {
-+      padding: 1px 4px;
-+      font-size: 14px;
-+      text-align: center;
-+    }
-+
-+    .versions {
-+      list-style: none;
-+      margin: 0 auto;
-+      padding: 0;
-+      float: none;
-+      clear: both;
-+      overflow: hidden;
-+    }
-+
-+    .versions li {
-+      display: block;
-+      float: left;
-+      border-right: 1px solid rgba(194, 245, 255, 0.4);
-+      padding: 0 20px;
-+      font-size: 13px;
-+      opacity: 0.8;
-+    }
-+
-+    .versions li:last-child {
-+      border: none;
-+    }
-+
-+    nav {
-+      margin: 40px 0 0 0;
-+    }
-+
-+    .linkcol {
-+      width: 19%;
-+      display: inline-block;
-+      text-align: center;
-+    }
-+
-+    .hero-octicon {
-+      display: block;
-+      width: 80px;
-+      height: 80px;
-+      margin: 0;
-+      padding: 0;
-+      font-size: 42px !important;
-+      color: #9feaf9;
-+      text-align: center;
-+      background-color: rgba(194, 245, 255, 0.1);
-+      border-radius: 50%;
-+    }
-+
-+    .hero-octicon:before {
-+      display: block;
-+      padding-top: 20px;
-+    }
-+
-+    .octicon-gist:before { padding-left: 10px; }
-+    .octicon-gear:before { padding-left: 5px; }
-+    .octicon-star:before { padding-left: 6px; }
-+    .octicon-gift:before { padding-left: 2px; }
-+  </style>
-+>>>>>>> .their
- </head>
- 
- <body>
-   <div class="container">
-+<<<<<<< .our
-+=======
-+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/octicons/4.4.0/font/octicons.css">
-+>>>>>>> .their
-     <ul class="versions code">
-       <li class="electron-version"></li>
-       <li class="chrome-version"></li>
-@@ -84,7 +245,13 @@
-     </div>
-   </nav>
- 
-+<<<<<<< .our
-   <script src="./renderer.js"></script>
-+=======
-+  <script>
-+    require('./renderer')
-+  </script>
-+>>>>>>> .their
- </body>
- 
- </html>
-\ No newline at end of file
-added in both
-  our    100644 0e93f684875ca8c4fd8c771c93dce9110de57c15 default_app/main.js
-  their  100644 7fdfc7c3fa3607f1cb664bf50a9b536abe5c40d5 default_app/main.js
-@@ -320,7 +320,11 @@
-   const file = option.file
-   const protocol = url.parse(file).protocol
-   const extension = path.extname(file)
-+<<<<<<< .our
-   if (protocol === 'http:' || protocol === 'https:' || protocol === 'file:' || protocol === 'chrome:') {
-+=======
-+  if (protocol === 'http:' || protocol === 'https:' || protocol === 'file:') {
-+>>>>>>> .their
-     loadApplicationByUrl(file)
-   } else if (extension === '.html' || extension === '.htm') {
-     loadApplicationByUrl('file://' + path.resolve(file))
-added in both
-  our    100644 977aad7ab9d4171d2ab86b599eee1e39b4b82041 default_app/renderer.js
-  their  100644 92e5530ada1aa971e28b276164e1a8885bce9f45 default_app/renderer.js
-@@ -1,5 +1,8 @@
- const {remote, shell} = require('electron')
-+<<<<<<< .our
- const fs = require('fs')
-+=======
-+>>>>>>> .their
- const path = require('path')
- const URL = require('url')
- const electronPath = path.relative(process.cwd(), remote.process.execPath)
-@@ -21,6 +24,7 @@
- document.querySelector('.node-version').innerText = `Node v${process.versions.node}`
- document.querySelector('.v8-version').innerText = `v8 v${process.versions.v8}`
- document.querySelector('.command-example').innerText = `${electronPath} path-to-app`
-+<<<<<<< .our
- 
- function getOcticonSvg (name) {
-   const octiconPath = path.resolve(__dirname, 'node_modules', 'octicons', 'build', 'svg', `${name}.svg`)
-@@ -50,3 +54,5 @@
- for (const element of document.querySelectorAll('.octicon')) {
-   loadSVG(element)
- }
-+=======
-+>>>>>>> .their
-added in both
-  our    100644 14dc557e237404cbbd5bcebabb0e65486dc36926 docs/api/app.md
-  their  100644 740da22d82ee5662e5bb994fa8e1c2eadb907a5e docs/api/app.md
-@@ -881,7 +881,11 @@
- 
- Imports the certificate in pkcs12 format into the platform certificate store.
- `callback` is called with the `result` of import operation, a value of `0`
-+<<<<<<< .our
- indicates success while any other value indicates failure according to Chromium [net_error_list](https://code.google.com/p/chromium/codesearch#chromium/src/net/base/net_error_list.h).
-+=======
-+indicates success while any other value indicates failure according to chromium [net_error_list](https://code.google.com/p/chromium/codesearch#chromium/src/net/base/net_error_list.h).
-+>>>>>>> .their
- 
- ### `app.disableHardwareAcceleration()`
- 
-@@ -1033,7 +1037,11 @@
- stopAccessingSecurityScopedResource()
- ```
- 
-+<<<<<<< .our
- Start accessing a security scoped resource. With this method Electron applications that are packaged for the Mac App Store may reach outside their sandbox to access files chosen by the user. See [Apple's documentation](https://developer.apple.com/library/content/documentation/Security/Conceptual/AppSandboxDesignGuide/AppSandboxInDepth/AppSandboxInDepth.html#//apple_ref/doc/uid/TP40011183-CH3-SW16) for a description of how this system works.
-+=======
-+Start accessing a security scoped resource. With this method electron applications that are packaged for the Mac App Store may reach outside their sandbox to access files chosen by the user. See [Apple's documentation](https://developer.apple.com/library/content/documentation/Security/Conceptual/AppSandboxDesignGuide/AppSandboxInDepth/AppSandboxInDepth.html#//apple_ref/doc/uid/TP40011183-CH3-SW16) for a description of how this system works.
-+>>>>>>> .their
- 
- ### `app.commandLine.appendSwitch(switch[, value])`
- 
-added in both
-  our    100644 7f840f07102aae0f0308742e66692345a84cb84b docs/api/auto-updater.md
-  their  100644 bb181347a0ae9c4f78c48f4932c569db9f2627b5 docs/api/auto-updater.md
-@@ -84,9 +84,12 @@
- 
- On Windows only `releaseName` is available.
- 
-+<<<<<<< .our
- **Note:** It is not strictly necessary to handle this event. A successfully 
- downloaded update will still be applied the next time the application starts.
- 
-+=======
-+>>>>>>> .their
- ### Event: 'before-quit-for-update'
- 
- This event is emitted after a user calls `quitAndInstall()`.
-@@ -125,9 +128,15 @@
- windows first, and automatically call `app.quit()` after all windows have been
- closed.
- 
-+<<<<<<< .our
- **Note:** It is not strictly necessary to call this function to apply an update, 
- as a successfully downloaded update will always be applied the next time the 
- application starts.
-+=======
-+**Note:** If the application is quit without calling this API after the
-+`update-downloaded` event has been emitted, the application will still be
-+replaced by the updated one on the next run.
-+>>>>>>> .their
- 
- [squirrel-mac]: https://github.com/Squirrel/Squirrel.Mac
- [server-support]: https://github.com/Squirrel/Squirrel.Mac#server-support
-added in both
-  our    100644 7e3557fbb399d4691628f059f419a2b5027f4333 docs/api/breaking-changes.md
-  their  100644 1e38f4a8823c0c164efdaf361a306fd2d4a85f24 docs/api/breaking-changes.md
-@@ -182,10 +182,13 @@
- webContents.openDevTools({detach: true})
- // Replace with
- webContents.openDevTools({mode: 'detach'})
-+<<<<<<< .our
- 
- // Removed
- webContents.setSize(options)
- // There is no replacement for this API
-+=======
-+>>>>>>> .their
- ```
- 
- ## `webFrame`
-@@ -202,6 +205,7 @@
- protocol.registerStandardSchemes(['app'], {secure: true})
- ```
- 
-+<<<<<<< .our
- ## `<webview>`
- 
- ```js
-@@ -214,6 +218,8 @@
- // There is no replacement for this API
- ```
- 
-+=======
-+>>>>>>> .their
- ## Node Headers URL
- 
- This is the URL specified as `disturl` in a `.npmrc` file or as the `--dist-url`
-added in both
-  our    100644 dff61dd336f047cf2f6f06228b2df2b98ff2304d docs/api/browser-window.md
-  their  100644 16657f6d55f05711ade1b726966b1889ca96403b docs/api/browser-window.md
-@@ -305,6 +305,11 @@
-     * `plugins` Boolean (optional) - Whether plugins should be enabled. Default is `false`.
-     * `experimentalFeatures` Boolean (optional) - Enables Chromium's experimental features.
-       Default is `false`.
-+<<<<<<< .our
-+=======
-+    * `experimentalCanvasFeatures` Boolean (optional) - Enables Chromium's experimental
-+      canvas features. Default is `false`.
-+>>>>>>> .their
-     * `scrollBounce` Boolean (optional) - Enables scroll bounce (rubber banding) effect on
-       macOS. Default is `false`.
-     * `enableBlinkFeatures` String (optional) - A list of feature strings separated by `,`, like
-@@ -490,6 +495,7 @@
- 
- Emitted when the window is restored from a minimized state.
- 
-+<<<<<<< .our
- #### Event: 'will-resize' _macOS_ _Windows_
- 
- Returns:
-@@ -504,6 +510,11 @@
- #### Event: 'resize'
- 
- Emitted after the window has been resized.
-+=======
-+#### Event: 'resize'
-+
-+Emitted when the window is being resized.
-+>>>>>>> .their
- 
- #### Event: 'move'
- 
-@@ -1273,6 +1284,7 @@
- 
- Returns `Number` - between 0.0 (fully transparent) and 1.0 (fully opaque)
- 
-+<<<<<<< .our
- #### `win.setShape(rects)` _Windows_ _Linux_ _Experimental_
- 
- * `rects` [Rectangle[]](structures/rectangle.md) - Sets a shape on the window.
-@@ -1284,6 +1296,8 @@
- the region will not be received by that window, but will fall through to
- whatever is behind the window.
- 
-+=======
-+>>>>>>> .their
- #### `win.setThumbarButtons(buttons)` _Windows_
- 
- * `buttons` [ThumbarButton[]](structures/thumbar-button.md)
-@@ -1364,6 +1378,7 @@
- 
- Changes window icon.
- 
-+<<<<<<< .our
- #### `win.setWindowButtonVisibility(visible)` _macOS_
- 
- * `visible` Boolean
-@@ -1372,6 +1387,8 @@
- 
- This cannot be called when `titleBarStyle` is set to `customButtonsOnHover`.
- 
-+=======
-+>>>>>>> .their
- #### `win.setAutoHideMenuBar(hide)`
- 
- * `hide` Boolean
-added in both
-  our    100644 b2b28f5adb7de78a0d945e0ed1ee196d6aa45fd1 docs/api/chrome-command-line-switches.md
-  their  100644 132eddfdeb74b007958793ca62a033ecbf8d486d docs/api/chrome-command-line-switches.md
-@@ -60,8 +60,12 @@
- Use a specified proxy server, which overrides the system setting. This switch
- only affects requests with HTTP protocol, including HTTPS and WebSocket
- requests. It is also noteworthy that not all proxy servers support HTTPS and
-+<<<<<<< .our
- WebSocket requests. The proxy URL does not support username and password
- authentication [per Chromium issue](https://bugs.chromium.org/p/chromium/issues/detail?id=615947).
-+=======
-+WebSocket requests.
-+>>>>>>> .their
- 
- ## --proxy-bypass-list=`hosts`
- 
-added in both
-  our    100644 586c17e37ac1afaf7aaac3b213434ab4ecbb1ca2 docs/api/client-request.md
-  their  100644 5cd9562b654a2e8d4483d25254bb2ae72ec5b7bc docs/api/client-request.md
-@@ -215,6 +215,7 @@
- #### `request.followRedirect()`
- 
- Continues any deferred redirection request when the redirection mode is `manual`.
-+<<<<<<< .our
- 
- #### `request.getUploadProgress()`
- 
-@@ -229,3 +230,5 @@
- 
- You can use this method in conjunction with `POST` requests to get the progress
- of a file upload or other data transfer.
-+=======
-+>>>>>>> .their
-added in both
-  our    100644 80d266ab56382901e7745067488d3d316c172294 docs/api/crash-reporter.md
-  their  100644 d8f9f060241760ac723f7202d11edf2b93c04272 docs/api/crash-reporter.md
-@@ -42,7 +42,11 @@
- ### `crashReporter.start(options)`
- 
- * `options` Object
-+<<<<<<< .our
-   * `companyName` String
-+=======
-+  * `companyName` String (optional)
-+>>>>>>> .their
-   * `submitURL` String - URL that crash reports will be sent to as POST.
-   * `productName` String (optional) - Defaults to `app.getName()`.
-   * `uploadToServer` Boolean (optional) - Whether crash reports should be sent to the server
-added in both
-  our    100644 11101ae3ec01954b61266051ee74078ebfe8b299 docs/api/dialog.md
-  their  100644 a69cba8b969eeb8c7f06b9d246981d9291dae0ed docs/api/dialog.md
-@@ -141,7 +141,11 @@
-   * `cancelId` Integer (optional) - The index of the button to be used to cancel the dialog, via
-     the `Esc` key. By default this is assigned to the first button with "cancel" or "no" as the
-     label. If no such labeled buttons exist and this option is not set, `0` will be used as the
-+<<<<<<< .our
-     return value or callback response.
-+=======
-+    return value or callback response. This option is ignored on Windows.
-+>>>>>>> .their
-   * `noLink` Boolean (optional) - On Windows Electron will try to figure out which one of
-     the `buttons` are common buttons (like "Cancel" or "Yes"), and show the
-     others as command links in the dialog. This can make the dialog appear in
-added in both
-  our    100644 ae04a286821de314680b67c9a666e6d2a0f42db0 docs/api/menu-item.md
-  their  100644 f687e43dbc9f5fa925a06ceeaa67bf503fff5c37 docs/api/menu-item.md
-@@ -47,9 +47,12 @@
- The `label` and `accelerator` values are optional when using a `role` and will
- default to appropriate values for each platform.
- 
-+<<<<<<< .our
- Every menu item must have either a `role`, `label`, or in the case of a separator
- a `type`.
- 
-+=======
-+>>>>>>> .their
- The `role` property can have following values:
- 
- * `undo`
-@@ -62,11 +65,19 @@
- * `delete`
- * `minimize` - Minimize current window.
- * `close` - Close current window.
-+<<<<<<< .our
- * `quit` - Quit the application.
- * `reload` - Reload the current window.
- * `forceReload` - Reload the current window ignoring the cache.
- * `toggleDevTools` - Toggle developer tools in the current window.
- * `toggleFullScreen` - Toggle full screen mode on the current window.
-+=======
-+* `quit`- Quit the application.
-+* `reload` - Reload the current window.
-+* `forceReload` - Reload the current window ignoring the cache.
-+* `toggleDevTools` - Toggle developer tools in the current window.
-+* `toggleFullScreen`- Toggle full screen mode on the current window.
-+>>>>>>> .their
- * `resetZoom` - Reset the focused page's zoom level to the original size.
- * `zoomIn` - Zoom in the focused page by 10%.
- * `zoomOut` - Zoom out the focused page by 10%.
-added in both
-  our    100644 e1d6e9958de7f2b95129c9c7e69f0941e466e3e8 docs/api/menu.md
-  their  100644 339a9ef7986b545829195d5e5600a678849f3782 docs/api/menu.md
-@@ -61,7 +61,11 @@
- 
- #### `menu.popup(options)`
- 
-+<<<<<<< .our
- * `options` Object (optional)
-+=======
-+* `options` Object
-+>>>>>>> .their
-   * `window` [BrowserWindow](browser-window.md) (optional) - Default is the focused window.
-   * `x` Number (optional) - Default is the current mouse cursor position.
-     Must be declared if `y` is declared.
-added in both
-  our    100644 1f6b20d2f25c31b48fbb2bfedc6a064ae283424f docs/api/process.md
-  their  100644 e6b34290b92c071ee8e7d4f9aa45ce04fb916ec9 docs/api/process.md
-@@ -16,6 +16,7 @@
- - `getHeapStatistics()`
- - `getProcessMemoryInfo()`
- - `getSystemMemoryInfo()`
-+<<<<<<< .our
- - `getCPUUsage()`
- - `getIOCounters()`
- - `argv`
-@@ -29,6 +30,12 @@
- - `type`
- - `version`
- - `versions`
-+=======
-+- `argv`
-+- `execPath`
-+- `env`
-+- `platform`
-+>>>>>>> .their
- 
- ## Events
- 
-@@ -77,11 +84,14 @@
- 
- A `String` representing the path to the resources directory.
- 
-+<<<<<<< .our
- ### `process.sandboxed`
- 
- A `Boolean`. When the renderer process is sandboxed, this property is `true`,
- otherwise it is `undefined`.
- 
-+=======
-+>>>>>>> .their
- ### `process.throwDeprecation`
- 
- A `Boolean` that controls whether or not deprecation warnings will be thrown as
-@@ -125,6 +135,7 @@
- 
- Causes the main thread of the current process crash.
- 
-+<<<<<<< .our
- ### `process.getCreationTime()`
- 
- Returns `Number | null` - The number of milliseconds since epoch, or `null` if the information is unavailable
-@@ -132,6 +143,8 @@
- Indicates the creation time of the application.
- The time is represented as number of milliseconds since epoch. It returns null if it is unable to get the process creation time.
- 
-+=======
-+>>>>>>> .their
- ### `process.getCPUUsage()`
- 
- Returns [`CPUUsage`](structures/cpu-usage.md)
-added in both
-  our    100644 8a9d242fce0e5b35af4d2a45dfe30153d73a0532 docs/api/sandbox-option.md
-  their  100644 4923f93bbe6d47c86e9c2c5a273c4c469d3a1fa7 docs/api/sandbox-option.md
-@@ -2,7 +2,11 @@
- 
- > Create a browser window with a renderer that can run inside Chromium OS sandbox. With this
- option enabled, the renderer must communicate via IPC to the main process in order to access node APIs.
-+<<<<<<< .our
- However, in order to enable the Chromium OS sandbox, Electron must be run with the `--enable-sandbox`
-+=======
-+However, in order to enable the Chromium OS sandbox, electron must be run with the `--enable-sandbox`
-+>>>>>>> .their
- command line argument.
- 
- One of the key security features of Chromium is that all blink rendering/JavaScript
-@@ -14,14 +18,22 @@
- [Here's](https://www.chromium.org/developers/design-documents/sandbox) more
- information about the sandbox.
- 
-+<<<<<<< .our
- Since a major feature in Electron is the ability to run Node.js in the
- renderer process (making it easier to develop desktop applications using web
- technologies), the sandbox is disabled by electron. This is because
- most Node.js APIs require system access. `require()` for example, is not
-+=======
-+Since a major feature in electron is the ability to run node.js in the
-+renderer process (making it easier to develop desktop applications using web
-+technologies), the sandbox is disabled by electron. This is because
-+most node.js APIs require system access. `require()` for example, is not
-+>>>>>>> .their
- possible without file system permissions, which are not available in a sandboxed
- environment.
- 
- Usually this is not a problem for desktop applications since the code is always
-+<<<<<<< .our
- trusted, but it makes Electron less secure than Chromium for displaying
- untrusted web content. For applications that require more security, the
- `sandbox` flag will force Electron to spawn a classic Chromium renderer that is
-@@ -34,6 +46,20 @@
- Another difference is that sandboxed renderers don't modify any of the default
- JavaScript APIs. Consequently, some APIs such as `window.open` will work as they
- do in Chromium (i.e. they do not return a [`BrowserWindowProxy`](browser-window-proxy.md)).
-+=======
-+trusted, but it makes electron less secure than chromium for displaying
-+untrusted web content. For applications that require more security, the
-+`sandbox` flag will force electron to spawn a classic chromium renderer that is
-+compatible with the sandbox.
-+
-+A sandboxed renderer doesn't have a node.js environment running and doesn't
-+expose node.js JavaScript APIs to client code. The only exception is the preload script,
-+which has access to a subset of the electron renderer API.
-+
-+Another difference is that sandboxed renderers don't modify any of the default
-+JavaScript APIs. Consequently, some APIs such as `window.open` will work as they
-+do in chromium (i.e. they do not return a [`BrowserWindowProxy`](browser-window-proxy.md)).
-+>>>>>>> .their
- 
- ## Example
- 
-@@ -51,9 +77,15 @@
- })
- ```
- 
-+<<<<<<< .our
- In the above code the [`BrowserWindow`](browser-window.md) that was created has Node.js disabled and can communicate
- only via IPC. The use of this option stops Electron from creating a Node.js runtime in the renderer. Also,
- within this new window `window.open` follows the native behaviour (by default Electron creates a [`BrowserWindow`](browser-window.md)
-+=======
-+In the above code the [`BrowserWindow`](browser-window.md) that was created has node.js disabled and can communicate
-+only via IPC. The use of this option stops electron from creating a node.js runtime in the renderer. Also,
-+within this new window `window.open` follows the native behaviour (by default electron creates a [`BrowserWindow`](browser-window.md)
-+>>>>>>> .their
- and returns a proxy to this via `window.open`).
- 
- It is important to note that this option alone won't enable the OS-enforced sandbox. To enable this feature, the
-@@ -75,19 +107,32 @@
- 
- Note that it is not enough to call
- `app.commandLine.appendSwitch('--enable-sandbox')`, as electron/node startup
-+<<<<<<< .our
- code runs after it is possible to make changes to Chromium sandbox settings. The
- switch must be passed to Electron on the command-line:
-+=======
-+code runs after it is possible to make changes to chromium sandbox settings. The
-+switch must be passed to electron on the command-line:
-+>>>>>>> .their
- 
- ```sh
- electron --enable-sandbox app.js
- ```
- 
- It is not possible to have the OS sandbox active only for some renderers, if
-+<<<<<<< .our
- `--enable-sandbox` is enabled, normal Electron windows cannot be created.
- 
- If you need to mix sandboxed and non-sandboxed renderers in one application,
- omit the `--enable-sandbox` argument. Without this argument, windows
- created with `sandbox: true` will still have Node.js disabled and communicate
-+=======
-+`--enable-sandbox` is enabled, normal electron windows cannot be created.
-+
-+If you need to mix sandboxed and non-sandboxed renderers in one application,
-+omit the `--enable-sandbox` argument. Without this argument, windows
-+created with `sandbox: true` will still have node.js disabled and communicate
-+>>>>>>> .their
- only via IPC, which by itself is already a gain from security POV.
- 
- ## Preload
-@@ -112,7 +157,11 @@
- 
- ```js
- // This file is loaded whenever a javascript context is created. It runs in a
-+<<<<<<< .our
- // private scope that can access a subset of Electron renderer APIs. We must be
-+=======
-+// private scope that can access a subset of electron renderer APIs. We must be
-+>>>>>>> .their
- // careful to not leak any objects into the global scope!
- const fs = require('fs')
- const {ipcRenderer} = require('electron')
-@@ -136,7 +185,11 @@
- 
- Important things to notice in the preload script:
- 
-+<<<<<<< .our
- - Even though the sandboxed renderer doesn't have Node.js running, it still has
-+=======
-+- Even though the sandboxed renderer doesn't have node.js running, it still has
-+>>>>>>> .their
-   access to a limited node-like environment: `Buffer`, `process`, `setImmediate`
-   and `require` are available.
- - The preload script can indirectly access all APIs from the main process through the
-@@ -146,7 +199,11 @@
- - The preload script must be contained in a single script, but it is possible to have
-   complex preload code composed with multiple modules by using a tool like
-   browserify, as explained below. In fact, browserify is already used by
-+<<<<<<< .our
-   Electron to provide a node-like environment to the preload script.
-+=======
-+  electron to provide a node-like environment to the preload script.
-+>>>>>>> .their
- 
- To create a browserify bundle and use it as a preload script, something like
- the following should be used:
-@@ -178,7 +235,11 @@
- - `timers`
- - `url`
- 
-+<<<<<<< .our
- More may be added as needed to expose more Electron APIs in the sandbox, but any
-+=======
-+More may be added as needed to expose more electron APIs in the sandbox, but any
-+>>>>>>> .their
- module in the main process can already be used through
- `electron.remote.require`.
- 
-@@ -186,7 +247,11 @@
- 
- Please use the `sandbox` option with care, as it is still an experimental
- feature. We are still not aware of the security implications of exposing some
-+<<<<<<< .our
- Electron renderer APIs to the preload script, but here are some things to
-+=======
-+electron renderer APIs to the preload script, but here are some things to
-+>>>>>>> .their
- consider before rendering untrusted content:
- 
- - A preload script can accidentally leak privileged APIs to untrusted code.
-@@ -194,9 +259,15 @@
-   APIs, effectively granting full access to the system through the `remote`
-   module.
- 
-+<<<<<<< .our
- Since rendering untrusted content in Electron is still uncharted territory,
- the APIs exposed to the sandbox preload script should be considered more
- unstable than the rest of Electron APIs, and may have breaking changes to fix
-+=======
-+Since rendering untrusted content in electron is still uncharted territory,
-+the APIs exposed to the sandbox preload script should be considered more
-+unstable than the rest of electron APIs, and may have breaking changes to fix
-+>>>>>>> .their
- security issues.
- 
- One planned enhancement that should greatly increase security is to block IPC
-added in both
-  our    100644 2eb5574bffe05def2ec3646b200038db15df2e9b docs/api/structures/certificate-principal.md
-  their  100644 12c46382aaf3d098b8845176eda99e9dddd82d83 docs/api/structures/certificate-principal.md
-@@ -1,8 +1,17 @@
- # CertificatePrincipal Object
- 
-+<<<<<<< .our
- * `commonName` String - Common Name.
- * `organizations` String[] - Organization names.
- * `organizationUnits` String[] - Organization Unit names.
- * `locality` String - Locality.
- * `state` String - State or province.
- * `country` String - Country or region.
-+=======
-+* `commonName` String - Common Name
-+* `organizations` String[] - Organization names
-+* `organizationUnits` String[] - Organization Unit names
-+* `locality` String - Locality
-+* `state` String - State or province
-+* `country` String - Country or region
-+>>>>>>> .their
-added in both
-  our    100644 b0e5b8d15165b23035303bafe049c1824a759439 docs/api/structures/gpu-feature-status.md
-  their  100644 f7bf3933d6c4c620c8f4d40fbda8a4c7c6b311ee docs/api/structures/gpu-feature-status.md
-@@ -1,5 +1,6 @@
- # GPUFeatureStatus Object
- 
-+<<<<<<< .our
- * `2d_canvas` String - Canvas.
- * `flash_3d` String - Flash.
- * `flash_stage3d` String - Flash Stage3D.
-@@ -13,6 +14,21 @@
- * `vpx_decode` String - VPx Video Decode.
- * `webgl` String - WebGL.
- * `webgl2` String - WebGL2.
-+=======
-+* `2d_canvas` String - Canvas
-+* `flash_3d` String - Flash
-+* `flash_stage3d` String - Flash Stage3D
-+* `flash_stage3d_baseline` String - Flash Stage3D Baseline profile
-+* `gpu_compositing` String - Compositing
-+* `multiple_raster_threads` String - Multiple Raster Threads
-+* `native_gpu_memory_buffers` String - Native GpuMemoryBuffers
-+* `rasterization` String - Rasterization
-+* `video_decode` String - Video Decode
-+* `video_encode` String - Video Encode
-+* `vpx_decode` String - VPx Video Decode
-+* `webgl` String - WebGL
-+* `webgl2` String - WebGL2
-+>>>>>>> .their
- 
- Possible values:
- 
-added in both
-  our    100644 470dd3a3f7d70f059c0a42736c20213b19372014 docs/api/structures/mime-typed-buffer.md
-  their  100644 08e5cd47a4a9a5f5ec7784c14b26c82502e20155 docs/api/structures/mime-typed-buffer.md
-@@ -1,4 +1,9 @@
- # MimeTypedBuffer Object
- 
-+<<<<<<< .our
- * `mimeType` String - The mimeType of the Buffer that you are sending.
- * `data` Buffer - The actual Buffer content.
-+=======
-+* `mimeType` String - The mimeType of the Buffer that you are sending
-+* `data` Buffer - The actual Buffer content
-+>>>>>>> .their
-added in both
-  our    100644 9f7a000967d09895fe3f43b9792578d6219a43b5 docs/api/structures/rectangle.md
-  their  100644 1a1228bc0b7c8d0d0f0ae3cea09048960f9df197 docs/api/structures/rectangle.md
-@@ -1,6 +1,13 @@
- # Rectangle Object
- 
-+<<<<<<< .our
- * `x` Number - The x coordinate of the origin of the rectangle (must be an integer).
- * `y` Number - The y coordinate of the origin of the rectangle (must be an integer).
- * `width` Number - The width of the rectangle (must be an integer).
- * `height` Number - The height of the rectangle (must be an integer).
-+=======
-+* `x` Number - The x coordinate of the origin of the rectangle (must be an integer)
-+* `y` Number - The y coordinate of the origin of the rectangle (must be an integer)
-+* `width` Number - The width of the rectangle (must be an integer)
-+* `height` Number - The height of the rectangle (must be an integer)
-+>>>>>>> .their
-added in both
-  our    100644 538579684242b9de3921d944b9d2fb64cf957a13 docs/api/structures/scrubber-item.md
-  their  100644 584593b6fde7e089fa296fc891eca05588c108cb docs/api/structures/scrubber-item.md
-@@ -1,4 +1,9 @@
- # ScrubberItem Object
- 
-+<<<<<<< .our
- * `label` String (optional) - The text to appear in this item.
- * `icon` NativeImage (optional) - The image to appear in this item.
-+=======
-+* `label` String (optional) - The text to appear in this item
-+* `icon` NativeImage (optional) - The image to appear in this item
-+>>>>>>> .their
-added in both
-  our    100644 47dfaa24027550db196340bc4f63906b6cf43ee2 docs/api/structures/segmented-control-segment.md
-  their  100644 06a8fd201a190e7787ed7f7c9c55fe31c8f1f37a docs/api/structures/segmented-control-segment.md
-@@ -1,5 +1,11 @@
- # SegmentedControlSegment Object
- 
-+<<<<<<< .our
- * `label` String (optional) - The text to appear in this segment.
- * `icon` NativeImage (optional) - The image to appear in this segment.
- * `enabled` Boolean (optional) - Whether this segment is selectable. Default: true.
-+=======
-+* `label` String (optional) - The text to appear in this segment
-+* `icon` NativeImage (optional) - The image to appear in this segment
-+* `enabled` Boolean (optional) - Whether this segment is selectable. Default: true
-+>>>>>>> .their
-added in both
-  our    100644 ec1fa27e5e7de32e18f4a8ca0ec1969d21054fd4 docs/api/structures/stream-protocol-response.md
-  their  100644 64847075a05e796a32e46c57eec865ae46740eed docs/api/structures/stream-protocol-response.md
-@@ -1,5 +1,11 @@
- # StreamProtocolResponse Object
- 
-+<<<<<<< .our
- * `statusCode` Number - The HTTP response code.
- * `headers` Object - An object containing the response headers.
- * `data` ReadableStream - A Node.js readable stream representing the response body.
-+=======
-+* `statusCode` Number - The HTTP response code
-+* `headers` Object - An object containing the response headers
-+* `data` ReadableStream - A Node.js readable stream representing the response body
-+>>>>>>> .their
-added in both
-  our    100644 8990fe2e97ab62eafdd3f7a4eb8ee782415124c5 docs/api/web-contents.md
-  their  100644 efba30d5be16f7bfa9fa80b644e3b52702baafae docs/api/web-contents.md
-@@ -832,10 +832,13 @@
- 
- Returns `Boolean` - Whether this page has been muted.
- 
-+<<<<<<< .our
- #### `contents.isCurrentlyAudible()`
- 
- Returns `Boolean` - Whether audio is currently playing.
- 
-+=======
-+>>>>>>> .their
- #### `contents.setZoomFactor(factor)`
- 
- * `factor` Number - Zoom factor.
-@@ -1385,6 +1388,26 @@
- 
- Shows pop-up dictionary that searches the selected word on the page.
- 
-+<<<<<<< .our
-+=======
-+#### `contents.setSize(options)`
-+
-+Set the size of the page. This is only supported for `<webview>` guest contents.
-+
-+* `options` Object
-+  * `enableAutoSize` Boolean (optional) - true to make the webview container automatically
-+    resize within the bounds specified by the attributes normal, min and max.
-+  * `normal` [Size](structures/size.md) (optional) - Normal size of the page. This can be used in
-+    combination with the [`disableguestresize`](webview-tag.md#disableguestresize)
-+    attribute to manually resize the webview guest contents.
-+  * `min` [Size](structures/size.md) (optional) - Minimum size of the page. This can be used in
-+    combination with the [`disableguestresize`](webview-tag.md#disableguestresize)
-+    attribute to manually resize the webview guest contents.
-+  * `max` [Size](structures/size.md) (optional) - Maximium size of the page. This can be used in
-+    combination with the [`disableguestresize`](webview-tag.md#disableguestresize)
-+    attribute to manually resize the webview guest contents.
-+
-+>>>>>>> .their
- #### `contents.isOffscreen()`
- 
- Returns `Boolean` - Indicates whether *offscreen rendering* is enabled.
-@@ -1451,7 +1474,11 @@
- 
- #### `contents.getProcessId()`
- 
-+<<<<<<< .our
- Returns `Integer` - The Chromium internal `pid` of the associated renderer. Can
-+=======
-+Returns `Integer` - The chromium internal `pid` of the associated renderer. Can
-+>>>>>>> .their
- be compared to the `frameProcessId` passed by frame specific navigation events
- (e.g. `did-frame-navigate`)
- 
-added in both
-  our    100644 989060ef3e50c5d93db1a914997f1d190edf3cf5 docs/api/web-frame.md
-  their  100644 c891bd5e56716fe4ac49bd23d86716ebd3e002af docs/api/web-frame.md
-@@ -4,7 +4,11 @@
- 
- Process: [Renderer](../glossary.md#renderer-process)
- 
-+<<<<<<< .our
- `webFrame` export of the Electron module is an instance of the `WebFrame`
-+=======
-+`webFrame` export of the electron module is an instance of the `WebFrame`
-+>>>>>>> .their
- class representing the top frame of the current `BrowserWindow`. Sub-frames can
- be retrieved by certain properties and methods (e.g. `webFrame.firstChild`).
- 
-@@ -167,7 +171,10 @@
- Returns `Object`:
- 
- * `images` [MemoryUsageDetails](structures/memory-usage-details.md)
-+<<<<<<< .our
- * `scripts` [MemoryUsageDetails](structures/memory-usage-details.md)
-+=======
-+>>>>>>> .their
- * `cssStyleSheets` [MemoryUsageDetails](structures/memory-usage-details.md)
- * `xslStyleSheets` [MemoryUsageDetails](structures/memory-usage-details.md)
- * `fonts` [MemoryUsageDetails](structures/memory-usage-details.md)
-@@ -232,8 +239,13 @@
-    current renderer process. Routing IDs can be retrieved from `WebFrame`
-    instances (`webFrame.routingId`) and are also passed by frame
-    specific `WebContents` navigation events (e.g. `did-frame-navigate`)
-+<<<<<<< .our
- 
- Returns `WebFrame` - that has the supplied `routingId`, `null` if not found.
-+=======
-+  
-+Returns `WebFrame` - that has the supplied `routingId`, `null` if not found. 
-+>>>>>>> .their
- 
- ## Properties
- 
-added in both
-  our    100644 0904db05accd92a661a6b02275c2166b7a8af2af docs/api/web-request.md
-  their  100644 2d039923d6f14f3231c7177b8c1b4242b3e4126c docs/api/web-request.md
-@@ -9,9 +9,14 @@
- 
- The methods of `WebRequest` accept an optional `filter` and a `listener`. The
- `listener` will be called with `listener(details)` when the API's event has
-+<<<<<<< .our
- happened. The `details` object describes the request.
- 
- ⚠️ Only the last attached `listener` will be used. Passing `null` as `listener` will unsubscribe from the event.
-+=======
-+happened. The `details` object describes the request. Passing `null`
-+as `listener` will unsubscribe from the event.
-+>>>>>>> .their
- 
- The `filter` object has a `urls` property which is an Array of URL
- patterns that will be used to filter out the requests that do not match the URL
-added in both
-  our    100644 8dc16b4a4e92ad132c7722ac400e2be851723f9b docs/api/webview-tag.md
-  their  100644 2f790e4320a143ca9ddf249726122fada8a07382 docs/api/webview-tag.md
-@@ -244,6 +244,62 @@
- The full list of supported feature strings can be found in the
- [RuntimeEnabledFeatures.json5][runtime-enabled-features] file.
- 
-+<<<<<<< .our
-+=======
-+### `guestinstance`
-+
-+```html
-+<webview src="https://www.github.com/" guestinstance="3"></webview>
-+```
-+
-+A value that links the webview to a specific webContents. When a webview
-+first loads a new webContents is created and this attribute is set to its
-+instance identifier. Setting this attribute on a new or existing webview
-+connects it to the existing webContents that currently renders in a different
-+webview.
-+
-+The existing webview will see the `destroy` event and will then create a new
-+webContents when a new url is loaded.
-+
-+### `disableguestresize`
-+
-+```html
-+<webview src="https://www.github.com/" disableguestresize></webview>
-+```
-+
-+When this attribute is present the `webview` contents will be prevented from
-+resizing when the `webview` element itself is resized.
-+
-+This can be used in combination with
-+[`webContents.setSize`](web-contents.md#contentssetsizeoptions) to manually
-+resize the webview contents in reaction to a window size change. This can
-+make resizing faster compared to relying on the webview element bounds to
-+automatically resize the contents.
-+
-+```javascript
-+const {webContents} = require('electron')
-+
-+// We assume that `win` points to a `BrowserWindow` instance containing a
-+// `<webview>` with `disableguestresize`.
-+
-+win.on('resize', () => {
-+  const [width, height] = win.getContentSize()
-+  for (let wc of webContents.getAllWebContents()) {
-+    // Check if `wc` belongs to a webview in the `win` window.
-+    if (wc.hostWebContents &&
-+        wc.hostWebContents.id === win.webContents.id) {
-+      wc.setSize({
-+        normal: {
-+          width: width,
-+          height: height
-+        }
-+      })
-+    }
-+  }
-+})
-+```
-+
-+>>>>>>> .their
- ## Methods
- 
- The `webview` tag has the following methods:
-@@ -407,10 +463,13 @@
- 
- Returns `Boolean` - Whether guest page has been muted.
- 
-+<<<<<<< .our
- #### `<webview>.isCurrentlyAudible()`
- 
- Returns `Boolean` - Whether audio is currently playing.
- 
-+=======
-+>>>>>>> .their
- ### `<webview>.undo()`
- 
- Executes editing command `undo` in page.
-added in both
-  our    100644 cbbdaf4c3d1998ccce8e5438eea1a7c9b00f2e37 docs/development/build-instructions-gn.md
-  their  100644 cdddc4dc8e54b8ce21c4bba333edd128eab5636f docs/development/build-instructions-gn.md
-@@ -3,6 +3,7 @@
- Follow the guidelines below for building Electron with the experimental GN
- build.
- 
-+<<<<<<< .our
- > **NOTE**: The GN build system is in _experimental_ status.
- 
- ## Platform prerequisites
-@@ -61,6 +62,34 @@
-     --name "src/electron" \
-     --unmanaged \
-     https://github.com/electron/electron
-+=======
-+> **NOTE**: The GN build system is in _experimental_ status, and currently only
-+> works on macOS and Linux, in debug mode, as a component build.
-+
-+## Prerequisites
-+
-+See the [macOS](build-instructions-osx.md#prerequisites) or
-+[Linux](build-instructions-linux.md#prerequisites) build instructions for the
-+requirements for your platform. In addition, you'll need to install
-+[`depot_tools`][depot-tools], the toolset used for fetching Chromium and its
-+dependencies.
-+
-+[depot-tools]: http://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/docs/html/depot_tools_tutorial.html#_setting_up
-+
-+## Getting the Code
-+
-+```sh
-+$ mkdir electron-gn && cd electron-gn
-+$ cat > .gclient <<-GCLIENT
-+solutions = [
-+  {
-+    "url": "https://github.com/electron/electron",
-+    "managed": False,
-+    "name": "src/electron",
-+  },
-+]
-+GCLIENT
-+>>>>>>> .their
- $ gclient sync --with_branch_heads --with_tags
- # This will take a while, go get a coffee.
- ```
-@@ -70,6 +99,7 @@
- ```sh
- $ cd src
- $ export CHROMIUM_BUILDTOOLS_PATH=`pwd`/buildtools
-+<<<<<<< .our
- # this next line is needed only if building with sccache
- $ export GN_EXTRA_ARGS="${GN_EXTRA_ARGS} cc_wrapper=\"${PWD}/electron/external_binaries/sccache\""
- $ gn gen out/Default --args="import(\"//electron/build/args/debug.gn\") $GN_EXTRA_ARGS"
-@@ -99,6 +129,16 @@
- ```
- 
- **To build, run `ninja` with the `electron:electron_app` target:**
-+=======
-+$ gn gen out/Default --args='root_extra_deps=["//electron"] is_electron_build=true is_component_build=true use_jumbo_build=true v8_promise_internal_field_count=1 v8_typed_array_max_size_in_heap=0'
-+```
-+
-+This will generate all the ninja files needed for the build. You shouldn't have
-+to run `gn gen` again—if you want to change the build arguments you can run `gn
-+args out/Default` to bring up an editor.
-+
-+To build, run `ninja` with the `electron:electron_app` target:
-+>>>>>>> .their
- 
- ```sh
- $ ninja -C out/Default electron:electron_app
-@@ -110,8 +150,12 @@
- so it will take a while.
- 
- To speed up subsequent builds, you can use [sccache][sccache]. Add the GN arg
-+<<<<<<< .our
- `cc_wrapper = "sccache"` by running `gn args out/Default` to bring up an
- editor and adding a line to the end of the file.
-+=======
-+`cc_wrapper="sccache"` by running `gn args out/Default` to bring up an editor.
-+>>>>>>> .their
- 
- [sccache]: https://github.com/mozilla/sccache
- 
-@@ -119,12 +163,16 @@
- 
- ```sh
- $ ./out/Default/Electron.app/Contents/MacOS/Electron
-+<<<<<<< .our
- # or, on Windows
- $ ./out/Default/electron.exe
-+=======
-+>>>>>>> .their
- # or, on Linux
- $ ./out/Default/electron
- ```
- 
-+<<<<<<< .our
- ### Cross-compiling
- 
- To compile for a platform that isn't the same as the one you're building on,
-@@ -157,17 +205,30 @@
- $ ninja -C out/Default third_party/electron_node:headers
- # Install the test modules with the generated headers
- $ (cd electron/spec && npm i --nodedir=../../out/Default/gen/node_headers)
-+=======
-+## Tests
-+
-+To run the tests, you'll first need to build the test modules against the
-+same version of node.js that was built as part of the build process.
-+
-+```sh
-+$ (cd electron/spec && npm i --nodedir=../../third_party/electron_node)
-+>>>>>>> .their
- ```
- 
- Then, run Electron with `electron/spec` as the argument:
- 
- ```sh
-+<<<<<<< .our
- # on Mac:
- $ ./out/Default/Electron.app/Contents/MacOS/Electron electron/spec
- # on Windows:
- $ ./out/Default/electron.exe electron/spec
- # on Linux:
- $ ./out/Default/electron electron/spec
-+=======
-+$ ./out/Default/Electron.app/Contents/MacOS/Electron electron/spec
-+>>>>>>> .their
- ```
- 
- If you're debugging something, it can be helpful to pass some extra flags to
-added in both
-  our    100644 3276b494aec5d1a49626b8c24d725ec665cf2c62 docs/development/build-instructions-linux.md
-  their  100644 6f7660669bf071628d6d3d9458640a61e5bcda0e docs/development/build-instructions-linux.md
-@@ -12,7 +12,11 @@
-   For a quick test, run the following script:
- 
-   ```sh
-+<<<<<<< .our
-   $ npm run check-tls
-+=======
-+  $ python ./script/tls.py
-+>>>>>>> .their
-   ```
- 
-   If the script returns that your configuration is using an outdated security
-@@ -71,6 +75,7 @@
- Downloading certain files can take a long time. Notice that we are using
- `ninja` to build Electron so there is no `Makefile` generated.
- 
-+<<<<<<< .our
- To bootstrap for a static, non-developer build, run:
- 
- ```sh
-@@ -83,6 +88,11 @@
- ```sh
- $ cd electron
- $ npm run bootstrap:dev
-+=======
-+```sh
-+$ cd electron
-+$ ./script/bootstrap.py --verbose
-+>>>>>>> .their
- ```
- 
- If you are using editor supports [JSON compilation database](http://clang.llvm.org/docs/JSONCompilationDatabase.html) based
-@@ -121,7 +131,11 @@
- If you would like to build both `Release` and `Debug` targets:
- 
- ```sh
-+<<<<<<< .our
- $ npm run build
-+=======
-+$ ./script/build.py
-+>>>>>>> .their
- ```
- 
- This script will cause a very large Electron executable to be placed in
-@@ -137,6 +151,7 @@
- the `dist` directory. After running the `create-dist.py` script, you
- may want to remove the 1.3+ gigabyte binary which is still in `out/R`.
- 
-+<<<<<<< .our
- You can also build either the `Debug` or `Release` target on its own:
- 
- ```sh
-@@ -145,6 +160,12 @@
- 
- ```sh
- $ npm run build:release
-+=======
-+You can also build the `Debug` target only:
-+
-+```sh
-+$ ./script/build.py -c D
-+>>>>>>> .their
- ```
- 
- After building is done, you can find the `electron` debug binary under `out/D`.
-added in both
-  our    100644 22dba096b73d1f99ee323f6822abb54a8b453477 docs/development/build-instructions-osx.md
-  their  100644 157ab0d3e5f38e0c07695128832565f9aeffd27e docs/development/build-instructions-osx.md
-@@ -15,7 +15,11 @@
- This depends on both your version of macOS and Python. For a quick test, run:
- 
- ```sh
-+<<<<<<< .our
- $ npm run check-tls
-+=======
-+$ python ./script/tls.py
-+>>>>>>> .their
- ```
- 
- If the script returns that your configuration is using an outdated security
-@@ -69,6 +73,7 @@
- the build project files. Notice that we're using [ninja](https://ninja-build.org/)
- to build Electron so there is no Xcode project generated.
- 
-+<<<<<<< .our
- To bootstrap for a static, non-developer build, run:
- 
- ```sh
-@@ -81,6 +86,11 @@
- ```sh
- $ cd electron
- $ npm run bootstrap:dev
-+=======
-+```sh
-+$ cd electron
-+$ ./script/bootstrap.py -v
-+>>>>>>> .their
- ```
- 
- If you are using editor supports [JSON compilation database](http://clang.llvm.org/docs/JSONCompilationDatabase.html) based
-@@ -92,6 +102,7 @@
- 
- ## Building
- 
-+<<<<<<< .our
- To build both `Release` and `Debug` targets:
- 
- ```sh
-@@ -106,6 +117,18 @@
- 
- ```sh
- $ npm run build:release
-+=======
-+Build both `Release` and `Debug` targets:
-+
-+```sh
-+$ ./script/build.py
-+```
-+
-+You can also only build the `Debug` target:
-+
-+```sh
-+$ ./script/build.py -c D
-+>>>>>>> .their
- ```
- 
- After building is done, you can find `Electron.app` under `out/D`.
-added in both
-  our    100644 86f9d2b6f82bb28fe8dda7ec2bea9eccd6119fd4 docs/development/build-instructions-windows.md
-  their  100644 0afd0ef3ea4636acfb2f67c05cb913403f9da2b7 docs/development/build-instructions-windows.md
-@@ -4,7 +4,11 @@
- 
- ## Prerequisites
- 
-+<<<<<<< .our
- * Windows 10 / Server 2012 R2 or higher
-+=======
-+* Windows 7 / Server 2008 R2 or higher
-+>>>>>>> .their
- * Visual Studio 2017 15.7.2 or higher - [download VS 2017 Community Edition for
-   free](https://www.visualstudio.com/vs/)
- * [Python 2.7](http://www.python.org/download/releases/2.7/)
-@@ -37,6 +41,7 @@
- the build project files. Notice that we're using `ninja` to build Electron so
- there is no Visual Studio project generated.
- 
-+<<<<<<< .our
- To bootstrap for a static, non-developer build, run:
- 
- ```powershell
-@@ -49,10 +54,16 @@
- ```powershell
- $ cd electron
- $ npm run bootstrap:dev
-+=======
-+```powershell
-+$ cd electron
-+$ python script\bootstrap.py -v
-+>>>>>>> .their
- ```
- 
- ## Building
- 
-+<<<<<<< .our
- Build both `Release` and `Debug` targets:
- 
- ```powershell
-@@ -67,6 +78,18 @@
- 
- ```powershell
- $ npm run build:release
-+=======
-+Build both Release and Debug targets:
-+
-+```powershell
-+$ python script\build.py
-+```
-+
-+You can also only build the Debug target:
-+
-+```powershell
-+$ python script\build.py -c D
-+>>>>>>> .their
- ```
- 
- After building is done, you can find `electron.exe` under `out\D` (debug
-@@ -166,6 +189,7 @@
- 
- You may get this error if you are using Git Bash for building, you should use
- PowerShell or VS2015 Command Prompt instead.
-+<<<<<<< .our
- 
- ### cannot create directory at '...': Filename too long
- 
-@@ -174,3 +198,5 @@
- ```sh
- $ git config --system core.longpaths true
- ```
-+=======
-+>>>>>>> .their
-added in both
-  our    100644 0abaea2417d7e88955bf60c6dd8f2206b51c99af docs/development/coding-style.md
-  their  100644 870cb85c7f1855a089b1adc76b6ea0cc2819d58d docs/development/coding-style.md
-@@ -40,7 +40,11 @@
- 
- ## Documentation
- 
-+<<<<<<< .our
- * Write [remark](https://github.com/remarkjs/remark) markdown style.
-+=======
-+* Write [remark](https://github.com/remarkjs/remark) markdown style
-+>>>>>>> .their
- 
- You can run `npm run lint-docs` to ensure that your documentation changes are
- formatted correctly.
-added in both
-  our    100644 95f4cbab47f5a4ae40f733fd3f8942a63bf4382d docs/development/debug-instructions-windows.md
-  their  100644 b689ef4480365ad1b56c9bdd2fd028f0d797f1be docs/development/debug-instructions-windows.md
-@@ -7,8 +7,11 @@
- and the Electron source code, you can enable step-through debugging
- with breakpoints inside Electron's source code.
- 
-+<<<<<<< .our
- **See also**: There's a wealth of information on debugging Chromium, much of which also applies to Electron, on the Chromium developers site: [Debugging Chromium on Windows](https://www.chromium.org/developers/how-tos/debugging-on-windows).
- 
-+=======
-+>>>>>>> .their
- ## Requirements
- 
- * **A debug build of Electron**: The easiest way is usually building it
-added in both
-  our    100644 6c2234477a35701b5d2e4f845d954bccbb203977 docs/development/debugging-instructions-macos-xcode.md
-  their  100644 e136ee9253cea6fb4debe3c4d73454468cbc8551 docs/development/debugging-instructions-macos-xcode.md
-@@ -1,12 +1,21 @@
- ## Debugging with XCode
- 
- ### Build Debug Electron with Release libchromiumcontent
-+<<<<<<< .our
- You can create a debug build of Electron by following [build instructions for macOS](build-instructions-osx.md).
- The bootstrap process will download Release version of libchromiumcontent by default,
- so you will not be able to step through the Chromium source.
- 
- ### Build Debug Electron with Debug libchromiumcontent
- If you want to debug and step through libchromiumcontent, you will have to run the
-+=======
-+You can create a debug build of electron by following [build instructions for macOS](build-instructions-osx.md).
-+The bootstrap process will download Release version of libchromiumcontent by default,
-+so you will not be able to step through the chromium source.
-+
-+### Build Debug Electron with Debug libchromiumcontent
-+If you want to debug and step through libchromiumcontent, you will have to run the 
-+>>>>>>> .their
- bootsrap script with the `--build_debug_libcc` argument.
- 
- ```sh
-@@ -25,7 +34,11 @@
- ```sh
- $ ./script/build.py -c D --libcc
- ```
-+<<<<<<< .our
- This will build debug Electron with debug version of libchromiumcontent.
-+=======
-+This will build debug electron with debug version of libchromiumcontent.
-+>>>>>>> .their
- 
- ### Generate xcode project for debugging sources (cannot build code from xcode)
- Run the update script with the --xcode argument.
-@@ -37,16 +50,30 @@
- 
- ### Debugging and breakpoints
- 
-+<<<<<<< .our
- Launch Electron app after build.
- You can now open the xcode workspace created above and attach to the Electron process
-+=======
-+Launch electron app after build.
-+You can now open the xcode workspace created above and attach to the electron process
-+>>>>>>> .their
- through the Debug > Attach To Process > Electron debug menu. [Note: If you want to debug
- the renderer process, you need to attach to the Electron Helper as well.]
- 
- You can now set breakpoints in any of the indexed files. However, you will not be able
-+<<<<<<< .our
- to set breakpoints directly in the Chromium source.
- To set break points in the Chromium source, you can choose Debug > Breakpoints > Create
-+=======
-+to set breakpoints directly in the chromium source.
-+To set break points in the chromium source, you can choose Debug > Breakpoints > Create
-+>>>>>>> .their
- Symbolic Breakpoint and set any function name as the symbol. This will set the breakpoint
- for all functions with that name, from all the classes if there are more than one.
- You can also do this step of setting break points prior to attaching the debugger,
- however, actual breakpoints for symbolic breakpoint functions may not show up until the
-+<<<<<<< .our
-+debugger is attached to the app.
-+=======
- debugger is attached to the app.
-+>>>>>>> .their
-added in both
-  our    100644 c7b4ae62d30fe55da6ba4d03ae2df95141920f99 docs/development/pull-requests.md
-  their  100644 3b404343efa0d00e06e5bbab4b81a3b6eb25c737 docs/development/pull-requests.md
-@@ -86,7 +86,14 @@
- uses [semantic commit messages](https://conventionalcommits.org/) to streamline
- the release process.
- 
-+<<<<<<< .our
- Before a pull request can be merged, it **must** have a pull request title with a semantic prefix.
-+=======
-+Before a pull request can be merged, it should include at least one semantic
-+commit message, though it's not necessary for all commits in the pull request
-+to be semantic. Alternatively, you can **update your pull request title**  to
-+start with a semantic prefix.
-+>>>>>>> .their
- 
- Examples of commit messages with semantic prefixes:
- 
-@@ -105,7 +112,10 @@
-   - perf: A code change that improves performance
-   - refactor: A code change that neither fixes a bug nor adds a feature
-   - style: Changes that do not affect the meaning of the code (linting)
-+<<<<<<< .our
-   - vendor: Bumping a dependency like libchromiumcontent or node
-+=======
-+>>>>>>> .their
- 
- Other things to keep in mind when writing a commit message:
- 
-added in both
-  our    100644 85a5fa0a935201521155dc60de45986db5829613 docs/development/releasing.md
-  their  100644 7fe929515bcdffbbbf3e454cbd72fdda0e25c7cb docs/development/releasing.md
-@@ -8,16 +8,25 @@
- information.
- 
- There are a handful of `*_TOKEN` environment variables needed by the release
-+<<<<<<< .our
- scripts:
- 
- * `ELECTRON_GITHUB_TOKEN`:
- Create this by visiting https://github.com/settings/tokens/new?scopes=repo
-+=======
-+scripts. Once you've generated these per-user tokens, you may want to keep
-+them in a local file that you can `source` when starting a release.
-+* `ELECTRON_GITHUB_TOKEN`:
-+Create as described at https://github.com/settings/tokens/new,
-+giving the token repo access scope.
-+>>>>>>> .their
- * `APPVEYOR_TOKEN`:
- Create a token from https://windows-ci.electronjs.org/api-token
- If you don't have an account, ask a team member to add you.
- * `CIRCLE_TOKEN`:
- Create a token from "Personal API Tokens" at https://circleci.com/account/api
- * `VSTS_TOKEN`:
-+<<<<<<< .our
- Create a Personal Access Token at https://github.visualstudio.com/_usersSettings/tokens or https://github.visualstudio.com/_details/security/tokens
- with the scope of `Build (read and execute)`.
- * `ELECTRON_S3_BUCKET`:
-@@ -29,6 +38,10 @@
- of the project. This file is gitignored, and will be loaded into the 
- environment by the release scripts.
- 
-+=======
-+Create a Personal Access Token at https://github.visualstudio.com/_usersSettings/tokens
-+with the scope of `Build (read and execute)`.
-+>>>>>>> .their
- 
- ## Determine which branch to release from
- 
-@@ -73,7 +86,11 @@
- ```
- ### Patch version change
- ```sh
-+<<<<<<< .our
- npm run prepare-release -- patch --stable
-+=======
-+npm run prepare-release -- patch
-+>>>>>>> .their
- ```
- ### Beta version change
- ```sh
-@@ -212,10 +229,13 @@
- ```sh
- $ npm run release -- --validateRelease
- ```
-+<<<<<<< .our
- Note, if you need to run `--validateRelease` more than once to check the assets,
- run it as above the first time, then `node ./script/release.js --validateRelease`
- for subsequent calls so that you don't have to rebuild each time you want to
- check the assets.
-+=======
-+>>>>>>> .their
- 
- ## Publish the release
- 
-@@ -259,6 +279,7 @@
- $ npm run publish-to-npm
- ```
- 
-+<<<<<<< .our
- After publishing, you can check the `latest` release:
- ```sh
- $ npm dist-tag ls electron
-@@ -274,6 +295,8 @@
- $ npm dist-tag add electron@2.0.0 latest
- ```
- 
-+=======
-+>>>>>>> .their
- [the releases page]: https://github.com/electron/electron/releases
- [this bump commit]: https://github.com/electron/electron/commit/78ec1b8f89b3886b856377a1756a51617bc33f5a
- [versioning]: /docs/tutorial/electron-versioning.md
-@@ -303,7 +326,11 @@
- ```
- 
- Additionally you can pass a job name to the script to run an individual job, eg:
-+<<<<<<< .our
- ```sh
-+=======
-+````sh
-+>>>>>>> .their
- node script/ci-release-build.js --ci=AppVeyor --ghRelease --job=electron-x64 TARGET_BRANCH
- ```
- 
-added in both
-  our    100644 1c61b3ee66504a23d72478c2e35a48ebeba3372a docs/development/upgrading-node.md
-  their  100644 821a89391dfd06a158d0fe76272a244ead5f3971 docs/development/upgrading-node.md
-@@ -61,6 +61,7 @@
- 2. Run `script/update` to get the latest libcc
-   - This will be time-consuming
- 3. Remove our copies of the old Node v8 patches
-+<<<<<<< .our
-   - (In libchromiumcontent repo) Read `patches/common/v8/README.md` to see which patchfiles
-     were created during the last update
-   - Remove those files from `patches/common/v8/`:
-@@ -77,6 +78,52 @@
- 7. Apply all patches with the [`get-patch` script](https://github.com/electron/libchromiumcontent/blob/master/script/README.md#get-patch):
-   - `./script/get-patch --repo src/v8 --output-dir patches/v8 --commit abc123 def456 ...`
- 8. Update `patches/common/v8/README.md` with references to all new patches that have been added so that the next person will know which need to be removed.
-+=======
-+  - (In libchromiumcontent repo) Read `patches/v8/README.md` to see which patchfiles
-+    were created during the last update
-+  - Remove those files from `patches/v8/`:
-+    - `git rm` the patchfiles
-+    - edit `patches/v8/README.md`
-+    - commit these removals
-+4. Inspect Node [repo](https://github.com/electron/node) to see what patches upstream Node
-+  used with their v8 after bumping its version
-+  - `git log --oneline deps/V8`
-+5. Create a checklist of the patches. This is useful for tracking your work and for
-+  having a quick reference of commit hashes to use in the `git diff-tree` step below.
-+6. Read `patches/v8/README.md` to see which patchfiles came from the previous version of V8 and therefore need to be removed.
-+  - Delete each patchfile referenced in `patches/v8/README.md`
-+7. For each patch, do:
-+  - (In node repo) `git diff-tree --patch HASH > ~/path_to_libchromiumcontent/patches/v8/xxx-patch_name.patch`
-+    - `xxx` is an incremented three-digit number (to force patch order)
-+    - `patch_name` should loosely match the node commit messages,
-+      e.g. `030-cherry_pick_cc55747,patch` if the Node commit message was "cherry-pick cc55747"
-+  - (remainder of steps in libchromium repo)
-+     Manually edit the `.patch` file to match upstream V8's directory:
-+    - If a diff section has no instances of `deps/V8`, remove it altogether.
-+      - We don’t want those patches because we’re only patching V8.
-+    - Replace instances of `a/deps/v8/filename.ext` with `a/filename.ext`
-+      - This is needed because upstream Node keeps its V8 files in a subdirectory
-+  - Ensure that local status is clean: `git status` to make sure there are no unstaged changes.
-+  - Confirm that the patch applies cleanly with
-+     `script/patch.py -r src/V8 -p patches/v8/xxx-patch_name.patch.patch`
-+  - Create a new copy of the patch:
-+     - `cd src/v8 && git diff > ../../test.patch && cd ../..`
-+     - This is needed because the first patch has Node commit checksums that we don't want
-+  - Confirm that checksums are the only difference between the two patches:
-+     - `diff -u test.patch patches/v8/xxx-patch_name.patch`
-+  - Replace the old patch with the new:
-+     - `mv test.patch patches/v8/xxx-patch_name.patch`
-+  - Add the patched code to the index _without_ committing:
-+     - `cd src/v8 && git add . && cd ../..`
-+     - We don't want to commit the changes (they're kept in the patchfiles)
-+        but need them locally so that they don't show up in subsequent diffs
-+        while we iterate through more patches
-+  - Add the patch file to the index:
-+     - `git add a patches/v8/`
-+  - (Optionally) commit each patch file to ensure you can back up if you mess up a step:
-+     - `git commit patches/v8/`
-+8. Update `patches/v8/README.md` with references to all new patches that have been added so that the next person will know which need to be removed.
-+>>>>>>> .their
- 9. Update Electron's submodule references:
-   ```sh
-   $ cd electron/vendor/node
-@@ -87,8 +134,13 @@
-   electron/vendor/libchromiumcontent$ git checkout upgrade-to-chromium-X
-   electron/vendor/libchromiumcontent$ cd ../..
-   electron$ git add vendor
-+<<<<<<< .our
-   electron$ git commit -m "update submodule references for node and libcc"
-   electron$ git push origin upgrade-to-chromium-<VERSION>
-+=======
-+  electron$ git commit -m "update submodule referefences for node and libc"
-+  electron$ git pso upgrade-to-chromium-62
-+>>>>>>> .their
-   electron$ script/bootstrap.py -d
-   electron$ script/build.py -c -D
-   ```
-added in both
-  our    100644 162300c6e17ce19fef7ee7c3baa1d74a2cb0dc7a docs/tutorial/application-architecture.md
-  their  100644 7411f025823483cb2d755a4a033102e1ca1b1f36 docs/tutorial/application-architecture.md
-@@ -39,7 +39,11 @@
- 
- > #### Aside: Communication Between Processes
- > In Electron, we have several ways to communicate between the main process
-+<<<<<<< .our
- and renderer processes, such as [`ipcRenderer`](../api/ipc-renderer.md) and
-+=======
-+and renderer processes. Like [`ipcRenderer`](../api/ipc-renderer.md) and
-+>>>>>>> .their
- [`ipcMain`](../api/ipc-main.md) modules for sending messages, and the
- [remote](../api/remote.md) module for RPC style communication. There is also
- an FAQ entry on [how to share data between web pages][share-data].
-added in both
-  our    100644 22b861749cb9c5d7fe6982d273856fb3c4bf04c9 docs/tutorial/application-distribution.md
-  their  100644 83d7c7bdfe6ac01d981e1bae47c8303f8de9e4fe docs/tutorial/application-distribution.md
-@@ -141,7 +141,11 @@
- 2. Create a new S3 bucket and create the following empty directory structure:
- 
-     ```sh
-+<<<<<<< .our
-     - electron/
-+=======
-+    - atom-shell/
-+>>>>>>> .their
-       - symbols/
-       - dist/
-     ```
-@@ -150,7 +154,11 @@
- 
-   * `ELECTRON_GITHUB_TOKEN` - a token that can create releases on GitHub
-   * `ELECTRON_S3_ACCESS_KEY`, `ELECTRON_S3_BUCKET`, `ELECTRON_S3_SECRET_KEY` -
-+<<<<<<< .our
-     the place where you'll upload Node.js headers as well as symbols
-+=======
-+    the place where you'll upload node.js headers as well as symbols
-+>>>>>>> .their
-   * `ELECTRON_RELEASE` - Set to `true` and the upload part will run, leave unset
-     and `surf-build` will do CI-type checks, appropriate to run for every
-     pull request.
-added in both
-  our    100644 16eb961fabe09001e621b834b297cada6918c102 docs/tutorial/code-signing.md
-  their  100644 236ebe80ef02f38a094404a79f067120d32adaa7 docs/tutorial/code-signing.md
-@@ -66,7 +66,11 @@
- See the [Windows Store Guide].
- 
- [Apple Developer Program]: https://developer.apple.com/programs/
-+<<<<<<< .our
- [`electron-builder`]: https://github.com/electron-userland/electron-builder
-+=======
-+[`electron-builder`]: https://github.com/electron/electron-builder
-+>>>>>>> .their
- [`electron-forge`]: https://github.com/electron-userland/electron-forge
- [`electron-osx-sign`]: https://github.com/electron-userland/electron-osx-sign
- [`electron-packager`]: https://github.com/electron-userland/electron-packager
-added in both
-  our    100644 9629bb98282d080bc53171a619d83a193041a022 docs/tutorial/electron-versioning.md
-  their  100644 883f20eefa9e59450efaed9fbd4dbafb2632b4e5 docs/tutorial/electron-versioning.md
-@@ -49,7 +49,11 @@
- | Chromium version updates        |                                    | fix-related chromium patches  |
- 
- 
-+<<<<<<< .our
- Note that most Chromium updates will be considered breaking. Fixes that can be backported will likely be cherry-picked as patches.
-+=======
-+Note that most chromium updates will be considered breaking. Fixes that can be backported will likely be cherry-picked as patches.
-+>>>>>>> .their
- 
- # Stabilization Branches
- 
-@@ -136,12 +140,20 @@
- 
- We seek to increase clarity at all levels of the update and releases process. Starting with `2.0.0` we will require pull requests adhere to the [Conventional Commits](https://conventionalcommits.org/) spec, which can be summarized as follows:
- 
-+<<<<<<< .our
- * Commits that would result in a semver **major** bump must start their body with `BREAKING CHANGE:`.
-+=======
-+* Commits that would result in a semver **major** bump must start with `BREAKING CHANGE:`.
-+>>>>>>> .their
- * Commits that would result in a semver **minor** bump must start with `feat:`.
- * Commits that would result in a semver **patch** bump must start with `fix:`.
- 
- * We allow squashing of commits, provided that the squashed message adheres the the above message format.
-+<<<<<<< .our
- * It is acceptable for some commits in a pull request to not include a semantic prefix, as long as the pull request title contains a meaningful encompassing semantic message.
-+=======
-+* It is acceptable for some commits in a pull request to not include a semantic prefix, as long as a later commit in the same pull request contains a meaningful encompassing semantic message.
-+>>>>>>> .their
- 
- # Versionless `master`
- 
-added in both
-  our    100644 081c82031907404938387485dc95414c7de4e4db docs/tutorial/mac-app-store-submission-guide.md
-  their  100644 e8812a85b57f6d10900b8932ebe790c499ba8476 docs/tutorial/mac-app-store-submission-guide.md
-@@ -229,6 +229,20 @@
- See the [Enabling User-Selected File Access documentation][user-selected] for
- more details.
- 
-+<<<<<<< .our
-+=======
-+## Known issues
-+
-+### `shell.openItem(filePath)`
-+
-+This will fail when the app is signed for distribution in the Mac App Store.
-+Subscribe to [#9005](https://github.com/electron/electron/issues/9005) for updates.
-+
-+#### Workaround
-+
-+`shell.openExternal('file://' + filePath)` will open the file in the default application as long as the extension is associated with an installed app.
-+
-+>>>>>>> .their
- ## Cryptographic Algorithms Used by Electron
- 
- Depending on the country and region you are located, Mac App Store may require
-added in both
-  our    100644 77f5d9632f58a1874c3d962b981619872a73a8b2 docs/tutorial/security.md
-  their  100644 70c455236e0b45e540eb55f168feb851625a7f08 docs/tutorial/security.md
-@@ -31,7 +31,11 @@
- developers should be aware that upgrading is a serious undertaking - involving
- hand-editing dozens or even hundreds of files. Given the resources and
- contributions available today, Electron will often not be on the very latest
-+<<<<<<< .our
- version of Chromium, lagging behind by several weeks or a few months.
-+=======
-+version of Chromium, lagging behind by either days or weeks.
-+>>>>>>> .their
- 
- We feel that our current system of updating the Chromium component strikes an
- appropriate balance between the resources we have available and the needs of
-@@ -82,7 +86,11 @@
- 11. [`<webview>`: Do not use `allowpopups`](#11-do-not-use-allowpopups)
- 12. [`<webview>`: Verify options and params](#12-verify-webview-options-before-creation)
- 13. [Disable or limit navigation](#13-disable-or-limit-navigation)
-+<<<<<<< .our
- 14. [Disable or limit creation of new windows](#14-disable-or-limit-creation-of-new-windows)
-+=======
-+14. [Disable or limit creation of new windows](#13-disable-or-limit-creation-of-new-windows)
-+>>>>>>> .their
- 
- ## 1) Only Load Secure Content
- 
-@@ -340,7 +348,16 @@
- Electron can load for that given web page. `https://your-page.com` should
- be allowed to load scripts from the origins you defined while scripts from
- `https://evil.attacker.com` should not be allowed to run. Defining a CSP is an
-+<<<<<<< .our
- easy way to improve your application's security.
-+=======
-+easy way to improve your applications security.
-+
-+### How?
-+
-+Electron respects [the `Content-Security-Policy` HTTP header](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy)
-+and the respective `<meta>` tag.
-+>>>>>>> .their
- 
- The following CSP will allow Electron to execute scripts from the current
- website and from `apis.mydomain.com`.
-@@ -353,6 +370,7 @@
- Content-Security-Policy: script-src 'self' https://apis.mydomain.com
- ```
- 
-+<<<<<<< .our
- ### CSP HTTP Header
- 
- Electron respects the [`Content-Security-Policy` HTTP header](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy)
-@@ -379,6 +397,8 @@
- 
- #### `webRequest.onHeadersReceived([filter, ]listener)`
- 
-+=======
-+>>>>>>> .their
- 
- ## 7) Override and Disable `eval`
- 
-@@ -446,7 +466,11 @@
- _Recommendation is Electron's default_
- 
- Advanced users of Electron can enable experimental Chromium features using the
-+<<<<<<< .our
- `experimentalFeatures` property.
-+=======
-+`experimentalFeatures` and `experimentalCanvasFeatures` properties.
-+>>>>>>> .their
- 
- ### Why?
- 
-@@ -612,13 +636,21 @@
- `https://google.com.attacker.com` through.
- 
- ```js
-+<<<<<<< .our
- const URL = require('url').URL
-+=======
-+const URL = require('url')
-+>>>>>>> .their
- 
- app.on('web-contents-created', (event, contents) => {
-   contents.on('will-navigate', (event, navigationUrl) => {
-     const parsedUrl = new URL(navigationUrl)
- 
-+<<<<<<< .our
-     if (parsedUrl.origin !== 'https://my-own-server.com') {
-+=======
-+    if (parsedUrl.hostname !== 'my-own-server.com') {
-+>>>>>>> .their
-       event.preventDefault()
-     }
-   })
-added in both
-  our    100644 bf01dc632319a6dfa147fcbc8376686778e71714 docs/tutorial/using-pepper-flash-plugin.md
-  their  100644 42ead0d694916bd22dad19e3487ccf73fc9f6190 docs/tutorial/using-pepper-flash-plugin.md
-@@ -7,7 +7,11 @@
- ## Prepare a Copy of Flash Plugin
- 
- On macOS and Linux, the details of the Pepper Flash plugin can be found by
-+<<<<<<< .our
- navigating to `chrome://flash` in the Chrome browser. Its location and version
-+=======
-+navigating to `chrome://plugins` in the Chrome browser. Its location and version
-+>>>>>>> .their
- are useful for Electron's Pepper Flash support. You can also copy it to another
- location.
- 
-added in both
-  our    100644 1ceae13473af2a1ccd888924f342e5137c83e7e5 docs/tutorial/using-selenium-and-webdriver.md
-  their  100644 5df8818d5b83c73469de4b3e5760baa5ee37591a docs/tutorial/using-selenium-and-webdriver.md
-@@ -164,7 +164,11 @@
- [place](https://github.com/electron/electron/blob/master/docs/tutorial/application-distribution.md)
- your app source into Electron's resource directory.
- 
-+<<<<<<< .our
- Alternatively, pass an argument to run with your Electron binary that points to
-+=======
-+Alternatively, pass an argument to run with your electron binary that points to
-+>>>>>>> .their
- your app's folder. This eliminates the need to copy-paste your app into
- Electron's resource directory.
- 
-added in both
-  our    100644 944ddab2a3fd879044e31677e4bac2843fffbdee electron.gyp
-  their  100644 2ecb37df51d808c6fd6cacfcd3f9fa54a88de894 electron.gyp
-@@ -4,7 +4,11 @@
-     'product_name%': 'Electron',
-     'company_name%': 'GitHub, Inc',
-     'company_abbr%': 'github',
-+<<<<<<< .our
-     'version%': '4.0.0-nightly.20180821',
-+=======
-+    'version%': '3.0.0-beta.4',
-+>>>>>>> .their
-     'js2c_input_dir': '<(SHARED_INTERMEDIATE_DIR)/js2c',
-   },
-   'includes': [
-@@ -48,11 +52,14 @@
-           'ENABLE_VIEW_API',
-         ],
-       }],  # enable_view_api
-+<<<<<<< .our
-       ['enable_pepper_flash==1', {
-         'defines': [
-           'ENABLE_PEPPER_FLASH',
-         ],
-       }],  # enable_pepper_flash
-+=======
-+>>>>>>> .their
-     ],
-   },
-   'targets': [
-@@ -163,6 +170,12 @@
-           ],
-         }],  # OS!="mac"
-         ['OS=="win"', {
-+<<<<<<< .our
-+=======
-+          'include_dirs': [
-+            '<(libchromiumcontent_dir)/gen/ui/resources',
-+          ],
-+>>>>>>> .their
-           'msvs_settings': {
-             'VCManifestTool': {
-               'EmbedManifest': 'true',
-@@ -272,6 +285,11 @@
-         'NODE_SHARED_MODE',
-         'HAVE_OPENSSL=1',
-         'HAVE_INSPECTOR=1',
-+<<<<<<< .our
-+=======
-+        # This is defined in skia/skia_common.gypi.
-+        'SK_SUPPORT_LEGACY_GETTOPDEVICE',
-+>>>>>>> .their
-         # Disable warnings for g_settings_list_schemas.
-         'GLIB_DISABLE_DEPRECATION_WARNINGS',
-         # Defined in Chromium but not exposed in its gyp file.
-@@ -285,6 +303,12 @@
-         # See Chromium src/third_party/protobuf/BUILD.gn
-         'GOOGLE_PROTOBUF_NO_RTTI',
-         'GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER',
-+<<<<<<< .our
-+=======
-+
-+        # Enables SkBitmap size 64 operations
-+        'SK_SUPPORT_LEGACY_SAFESIZE64',
-+>>>>>>> .their
-       ],
-       'sources': [
-         '<@(lib_sources)',
-@@ -333,6 +357,7 @@
-             'vendor/pdf_viewer/pdf_viewer.gyp:pdf_viewer',
-           ],
-         }],  # enable_pdf_viewer
-+<<<<<<< .our
-         ['enable_pepper_flash==1', {
-           'include_dirs': [
-             '<(libchromiumcontent_src_dir)/chrome/browser/renderer_host/pepper',
-@@ -352,6 +377,8 @@
-             ],
-           },
-         }],  # enable_pepper_flash
-+=======
-+>>>>>>> .their
-         ['libchromiumcontent_component', {
-           'link_settings': {
-             'libraries': [ '<@(libchromiumcontent_v8_libraries)' ],
-@@ -363,9 +390,13 @@
-           ],
-           'link_settings': {
-             'libraries': [
-+<<<<<<< .our
-               '-ldwmapi.lib',
-               '-limm32.lib',
-               '-lgdi32.lib',
-+=======
-+              '-limm32.lib',
-+>>>>>>> .their
-               '-loleacc.lib',
-               '-lcomctl32.lib',
-               '-lcomdlg32.lib',
-added in both
-  our    100644 86543a4db1195223a3556fa71583038f15d79a0a features.gypi
-  their  100644 ab0c34e8545810ff5e1077d1012b696275f452b1 features.gypi
-@@ -3,17 +3,27 @@
-   'variables': {
-     'variables': {
-       'enable_desktop_capturer%': 1,
-+<<<<<<< .our
-       'enable_osr%': 1,
-       'enable_pdf_viewer%': 0,  # FIXME(deepak1556)
-       'enable_run_as_node%': 1,
-       'enable_view_api%': 0,
-       'enable_pepper_flash%': 1,
-+=======
-+      'enable_osr%': 0,  # FIXME(alexeykuzmin)
-+      'enable_pdf_viewer%': 0,  # FIXME(deepak1556)
-+      'enable_run_as_node%': 1,
-+      'enable_view_api%': 0,
-+>>>>>>> .their
-     },
-     'enable_desktop_capturer%': '<(enable_desktop_capturer)',
-     'enable_osr%': '<(enable_osr)',
-     'enable_pdf_viewer%': '<(enable_pdf_viewer)',
-     'enable_run_as_node%': '<(enable_run_as_node)',
-     'enable_view_api%': '<(enable_view_api)',
-+<<<<<<< .our
-     'enable_pepper_flash%': '<(enable_pepper_flash)',
-+=======
-+>>>>>>> .their
-   },
- }
-added in both
-  our    100644 f57860558f06b7e5d8a50f48cfc7e53044df0bc6 filenames.gypi
-  their  100644 19fb7492250fe763c189e1f727e54a0694148a63 filenames.gypi
-@@ -98,6 +98,7 @@
-       'default_app/main.js',
-       'default_app/package.json',
-       'default_app/renderer.js',
-+<<<<<<< .our
-       'default_app/styles.css',
-       'node_modules/octicons/build/build.css',
-       'node_modules/octicons/build/svg/gist.svg',
-@@ -105,6 +106,8 @@
-       'node_modules/octicons/build/svg/gear.svg',
-       'node_modules/octicons/build/svg/star.svg',
-       'node_modules/octicons/build/svg/gift.svg',
-+=======
-+>>>>>>> .their
-     ],
-     'lib_sources': [
-       'atom/app/atom_content_client.cc',
-@@ -313,12 +316,17 @@
-       'atom/browser/relauncher.h',
-       'atom/browser/render_process_preferences.cc',
-       'atom/browser/render_process_preferences.h',
-+<<<<<<< .our
-       'atom/browser/request_context_delegate.cc',
-       'atom/browser/request_context_delegate.h',
-       'atom/browser/session_preferences.cc',
-       'atom/browser/session_preferences.h',
-       'atom/browser/special_storage_policy.cc',
-       'atom/browser/special_storage_policy.h',
-+=======
-+      'atom/browser/session_preferences.cc',
-+      'atom/browser/session_preferences.h',
-+>>>>>>> .their
-       'atom/browser/ui/accelerator_util.cc',
-       'atom/browser/ui/accelerator_util.h',
-       'atom/browser/ui/accelerator_util_mac.mm',
-@@ -533,8 +541,11 @@
-       'atom/common/platform_util_linux.cc',
-       'atom/common/platform_util_mac.mm',
-       'atom/common/platform_util_win.cc',
-+<<<<<<< .our
-       'atom/common/promise_util.h',
-       'atom/common/promise_util.cc',
-+=======
-+>>>>>>> .their
-       'atom/renderer/api/atom_api_renderer_ipc.h',
-       'atom/renderer/api/atom_api_renderer_ipc.cc',
-       'atom/renderer/api/atom_api_spell_check_client.cc',
-@@ -608,6 +619,23 @@
-       'chromium_src/chrome/browser/process_singleton_posix.cc',
-       'chromium_src/chrome/browser/process_singleton_win.cc',
-       'chromium_src/chrome/browser/process_singleton.h',
-+<<<<<<< .our
-+=======
-+      'chromium_src/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc',
-+      'chromium_src/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h',
-+      'chromium_src/chrome/browser/renderer_host/pepper/monitor_finder_mac.h',
-+      'chromium_src/chrome/browser/renderer_host/pepper/monitor_finder_mac.mm',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.h',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.h',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h',
-+>>>>>>> .their
-       'chromium_src/chrome/browser/speech/tts_controller.h',
-       'chromium_src/chrome/browser/speech/tts_controller_impl.cc',
-       'chromium_src/chrome/browser/speech/tts_controller_impl.h',
-@@ -645,6 +673,23 @@
-       'chromium_src/chrome/common/widevine_cdm_constants.h',
-       'chromium_src/chrome/renderer/media/chrome_key_systems.cc',
-       'chromium_src/chrome/renderer/media/chrome_key_systems.h',
-+<<<<<<< .our
-+=======
-+      'chromium_src/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc',
-+      'chromium_src/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.h',
-+      'chromium_src/chrome/renderer/pepper/pepper_flash_font_file_host.cc',
-+      'chromium_src/chrome/renderer/pepper/pepper_flash_font_file_host.h',
-+      'chromium_src/chrome/renderer/pepper/pepper_flash_fullscreen_host.cc',
-+      'chromium_src/chrome/renderer/pepper/pepper_flash_fullscreen_host.h',
-+      'chromium_src/chrome/renderer/pepper/pepper_flash_menu_host.cc',
-+      'chromium_src/chrome/renderer/pepper/pepper_flash_menu_host.h',
-+      'chromium_src/chrome/renderer/pepper/pepper_flash_renderer_host.cc',
-+      'chromium_src/chrome/renderer/pepper/pepper_flash_renderer_host.h',
-+      'chromium_src/chrome/renderer/pepper/pepper_helper.cc',
-+      'chromium_src/chrome/renderer/pepper/pepper_helper.h',
-+      'chromium_src/chrome/renderer/pepper/pepper_shared_memory_message_filter.cc',
-+      'chromium_src/chrome/renderer/pepper/pepper_shared_memory_message_filter.h',
-+>>>>>>> .their
-       'chromium_src/chrome/renderer/printing/print_web_view_helper.cc',
-       'chromium_src/chrome/renderer/printing/print_web_view_helper_linux.cc',
-       'chromium_src/chrome/renderer/printing/print_web_view_helper_mac.mm',
-added in both
-  our    100644 66f6ae651acf10fb19b8ec068fc5280850dd3d91 lib/browser/api/app.js
-  their  100644 a6d94a20a40051faf01c2c15cd6d492235d17a1d lib/browser/api/app.js
-@@ -12,12 +12,36 @@
- const {EventEmitter} = require('events')
- 
- let dockMenu = null
-+<<<<<<< .our
-+=======
-+let readyPromise = null
-+>>>>>>> .their
- 
- // App is an EventEmitter.
- Object.setPrototypeOf(App.prototype, EventEmitter.prototype)
- EventEmitter.call(app)
- 
- Object.assign(app, {
-+<<<<<<< .our
-+=======
-+  whenReady () {
-+    if (readyPromise !== null) {
-+      return readyPromise
-+    }
-+
-+    if (app.isReady()) {
-+      readyPromise = Promise.resolve()
-+    } else {
-+      readyPromise = new Promise(resolve => {
-+        // XXX(alexeykuzmin): Explicitly ignore any data
-+        // passed to the event handler to avoid memory leaks.
-+        app.once('ready', () => resolve())
-+      })
-+    }
-+
-+    return readyPromise
-+  },
-+>>>>>>> .their
-   setApplicationMenu (menu) {
-     return Menu.setApplicationMenu(menu)
-   },
-added in both
-  our    100644 506e3525c10ce142cafe3fc1bf4de1c255e48503 lib/browser/api/menu.js
-  their  100644 dcc446587913f37a58c86f4d1bf612371589960e lib/browser/api/menu.js
-@@ -47,7 +47,11 @@
-   this.delegate = delegate
- }
- 
-+<<<<<<< .our
- Menu.prototype.popup = function (options = {}) {
-+=======
-+Menu.prototype.popup = function (options) {
-+>>>>>>> .their
-   if (options == null || typeof options !== 'object') {
-     throw new TypeError('Options must be an object')
-   }
-@@ -156,6 +160,7 @@
- 
- Menu.buildFromTemplate = function (template) {
-   if (!Array.isArray(template)) {
-+<<<<<<< .our
-     throw new TypeError('Invalid template for Menu: Menu template must be an array')
-   }
-   const menu = new Menu()
-@@ -166,18 +171,36 @@
-   const sorted = sortTemplate(filtered)
- 
-   sorted.forEach((item) => menu.append(new MenuItem(item)))
-+=======
-+    throw new TypeError('Invalid template for Menu')
-+  }
-+
-+  const menu = new Menu()
-+  const filtered = removeExtraSeparators(template)
-+  const sorted = sortTemplate(filtered)
-+
-+  sorted.forEach((item) => {
-+    if (typeof item !== 'object') {
-+      throw new TypeError('Invalid template for MenuItem')
-+    }
-+    menu.append(new MenuItem(item))
-+  })
-+>>>>>>> .their
- 
-   return menu
- }
- 
- /* Helper Functions */
- 
-+<<<<<<< .our
- // validate the template against having the wrong attribute
- function areValidTemplateItems (template) {
-   return template.every(item =>
-   item != null && typeof item === 'object' && (item.hasOwnProperty('label') || item.hasOwnProperty('role') || item.type === 'separator'))
- }
- 
-+=======
-+>>>>>>> .their
- function sortTemplate (template) {
-   const sorted = sortMenuItems(template)
-   for (let id in sorted) {
-added in both
-  our    100644 3f2d470a270378ce1221c928e549d0857755fa09 lib/browser/api/net.js
-  their  100644 54ef99d407ff3a7d7e853b8ccda350d5f8d47fa8 lib/browser/api/net.js
-@@ -352,10 +352,13 @@
-   abort () {
-     this.urlRequest.cancel()
-   }
-+<<<<<<< .our
- 
-   getUploadProgress () {
-     return this.urlRequest.getUploadProgress()
-   }
-+=======
-+>>>>>>> .their
- }
- 
- function writeAfterEndNT (self, error, callback) {
-added in both
-  our    100644 8f5bd037b14d05db7396bb8b5de1a29fdef167ae lib/browser/api/web-contents.js
-  their  100644 4b3e777b4dcbfe7e6bc55c7e4ffcc12f09d3ecac lib/browser/api/web-contents.js
-@@ -264,12 +264,15 @@
-   })
- }
- 
-+<<<<<<< .our
- // TODO(zcbenz): Remove the stub in 4.0.
- WebContents.prototype.setSize = function () {
-   console.error('The WebContents.setSize method has been removed, see',
-                 'https://github.com/electron/electron/issues/14120 for more.')
- }
- 
-+=======
-+>>>>>>> .their
- // Add JavaScript wrappers for WebContents class.
- WebContents.prototype._init = function () {
-   // The navigation controller.
-added in both
-  our    100644 1e4029e39a981c85fb6ff18c5ccd52f81b3c56f2 lib/browser/guest-view-manager.js
-  their  100644 1e448762686c16d78b8b8fa8385dea06a71ea4c9 lib/browser/guest-view-manager.js
-@@ -46,6 +46,14 @@
- const guestInstances = {}
- const embedderElementsMap = {}
- 
-+<<<<<<< .our
-+=======
-+// Moves the last element of array to the first one.
-+const moveLastToFirst = function (list) {
-+  list.unshift(list.pop())
-+}
-+
-+>>>>>>> .their
- // Generate guestInstanceId.
- const getNextGuestInstanceId = function () {
-   return ++nextGuestInstanceId
-@@ -68,6 +76,7 @@
-     embedder: embedder
-   }
- 
-+<<<<<<< .our
-   // Clear the guest from map when it is destroyed.
-   guest.once('destroyed', () => {
-     if (guestInstanceId in guestInstances) {
-@@ -77,6 +86,12 @@
- 
-   // Init guest web view after attached.
-   guest.once('did-attach', function (event) {
-+=======
-+  watchEmbedder(embedder)
-+
-+  // Init guest web view after attached.
-+  guest.on('did-attach', function (event) {
-+>>>>>>> .their
-     params = this.attachParams
-     delete this.attachParams
- 
-@@ -88,6 +103,24 @@
-       return
-     }
- 
-+<<<<<<< .our
-+=======
-+    this.setSize({
-+      normal: {
-+        width: params.elementWidth,
-+        height: params.elementHeight
-+      },
-+      enableAutoSize: params.autosize,
-+      min: {
-+        width: params.minwidth,
-+        height: params.minheight
-+      },
-+      max: {
-+        width: params.maxwidth,
-+        height: params.maxheight
-+      }
-+    })
-+>>>>>>> .their
-     if (params.src) {
-       const opts = {}
-       if (params.httpreferrer) {
-@@ -103,7 +136,12 @@
-   })
- 
-   const sendToEmbedder = (channel, ...args) => {
-+<<<<<<< .our
-     if (!embedder.isDestroyed()) {
-+=======
-+    const embedder = getEmbedder(guestInstanceId)
-+    if (embedder != null) {
-+>>>>>>> .their
-       embedder.send(`${channel}-${guest.viewInstanceId}`, ...args)
-     }
-   }
-@@ -123,6 +161,14 @@
-     sendToEmbedder('ELECTRON_GUEST_VIEW_INTERNAL_IPC_MESSAGE', channel, ...args)
-   })
- 
-+<<<<<<< .our
-+=======
-+  // Autosize.
-+  guest.on('size-changed', function (_, ...args) {
-+    sendToEmbedder('ELECTRON_GUEST_VIEW_INTERNAL_SIZE_CHANGED', ...args)
-+  })
-+
-+>>>>>>> .their
-   // Notify guest of embedder window visibility when it is ready
-   // FIXME Remove once https://github.com/electron/electron/issues/6828 is fixed
-   guest.on('dom-ready', function () {
-@@ -155,10 +201,17 @@
- }
- 
- // Attach the guest to an element of embedder.
-+<<<<<<< .our
- const attachGuest = function (event, embedderFrameId, elementInstanceId, guestInstanceId, params) {
-   const embedder = event.sender
-   // Destroy the old guest when attaching.
-   const key = `${embedder.id}-${elementInstanceId}`
-+=======
-+const attachGuest = function (event, elementInstanceId, guestInstanceId, params) {
-+  const embedder = event.sender
-+  // Destroy the old guest when attaching.
-+  const key = `${embedder.getId()}-${elementInstanceId}`
-+>>>>>>> .their
-   const oldGuestInstanceId = embedderElementsMap[key]
-   if (oldGuestInstanceId != null) {
-     // Reattachment to the same guest is just a no-op.
-@@ -166,10 +219,14 @@
-       return
-     }
- 
-+<<<<<<< .our
-     const oldGuestInstance = guestInstances[oldGuestInstanceId]
-     if (oldGuestInstance) {
-       oldGuestInstance.guest.destroy()
-     }
-+=======
-+    destroyGuest(embedder, oldGuestInstanceId)
-+>>>>>>> .their
-   }
- 
-   const guestInstance = guestInstances[guestInstanceId]
-@@ -181,7 +238,11 @@
- 
-   // If this guest is already attached to an element then remove it
-   if (guestInstance.elementInstanceId) {
-+<<<<<<< .our
-     const oldKey = `${guestInstance.embedder.id}-${guestInstance.elementInstanceId}`
-+=======
-+    const oldKey = `${guestInstance.embedder.getId()}-${guestInstance.elementInstanceId}`
-+>>>>>>> .their
-     delete embedderElementsMap[oldKey]
- 
-     // Remove guest from embedder if moving across web views
-@@ -242,10 +303,18 @@
-   embedder.emit('will-attach-webview', event, webPreferences, params)
-   if (event.defaultPrevented) {
-     if (guest.viewInstanceId == null) guest.viewInstanceId = params.instanceId
-+<<<<<<< .our
-     guest.destroy()
-     return
-   }
- 
-+=======
-+    destroyGuest(embedder, guestInstanceId)
-+    return
-+  }
-+
-+  webViewManager.addGuest(guestInstanceId, elementInstanceId, embedder, guest, webPreferences)
-+>>>>>>> .their
-   guest.attachParams = params
-   embedderElementsMap[key] = guestInstanceId
- 
-@@ -254,6 +323,7 @@
-   guestInstance.elementInstanceId = elementInstanceId
- 
-   watchEmbedder(embedder)
-+<<<<<<< .our
- 
-   webViewManager.addGuest(guestInstanceId, elementInstanceId, embedder, guest, webPreferences)
-   guest.attachToIframe(embedder, embedderFrameId)
-@@ -261,15 +331,32 @@
- 
- // Remove an guest-embedder relationship.
- const detachGuest = function (embedder, guestInstanceId) {
-+=======
-+}
-+
-+// Destroy an existing guest instance.
-+const destroyGuest = function (embedder, guestInstanceId) {
-+  if (!(guestInstanceId in guestInstances)) {
-+    return
-+  }
-+
-+>>>>>>> .their
-   const guestInstance = guestInstances[guestInstanceId]
-   if (embedder !== guestInstance.embedder) {
-     return
-   }
- 
-   webViewManager.removeGuest(embedder, guestInstanceId)
-+<<<<<<< .our
-   delete guestInstances[guestInstanceId]
- 
-   const key = `${embedder.id}-${guestInstance.elementInstanceId}`
-+=======
-+  guestInstance.guest.destroy()
-+  delete guestInstances[guestInstanceId]
-+
-+  const key = `${embedder.getId()}-${guestInstance.elementInstanceId}`
-+>>>>>>> .their
-   delete embedderElementsMap[key]
- }
- 
-@@ -284,7 +371,11 @@
- 
-   // Forward embedder window visiblity change events to guest
-   const onVisibilityChange = function (visibilityState) {
-+<<<<<<< .our
-     for (const guestInstanceId in guestInstances) {
-+=======
-+    for (const guestInstanceId of Object.keys(guestInstances)) {
-+>>>>>>> .their
-       const guestInstance = guestInstances[guestInstanceId]
-       guestInstance.visibilityState = visibilityState
-       if (guestInstance.embedder === embedder) {
-@@ -294,6 +385,7 @@
-   }
-   embedder.on('-window-visibility-change', onVisibilityChange)
- 
-+<<<<<<< .our
-   embedder.once('will-destroy', () => {
-     // Usually the guestInstances is cleared when guest is destroyed, but it
-     // may happen that the embedder gets manually destroyed earlier than guest,
-@@ -308,6 +400,35 @@
-     embedder.removeListener('-window-visibility-change', onVisibilityChange)
-     watchedEmbedders.delete(embedder)
-   })
-+=======
-+  const destroyEvents = ['will-destroy', 'crashed', 'did-navigate']
-+  const destroy = function () {
-+    for (const guestInstanceId of Object.keys(guestInstances)) {
-+      if (guestInstances[guestInstanceId].embedder === embedder) {
-+        destroyGuest(embedder, parseInt(guestInstanceId))
-+      }
-+    }
-+
-+    for (const event of destroyEvents) {
-+      embedder.removeListener(event, destroy)
-+    }
-+    embedder.removeListener('-window-visibility-change', onVisibilityChange)
-+
-+    watchedEmbedders.delete(embedder)
-+  }
-+
-+  for (const event of destroyEvents) {
-+    embedder.once(event, destroy)
-+
-+    // Users might also listen to the crashed event, so we must ensure the guest
-+    // is destroyed before users' listener gets called. It is done by moving our
-+    // listener to the first one in queue.
-+    const listeners = embedder._events[event]
-+    if (Array.isArray(listeners)) {
-+      moveLastToFirst(listeners)
-+    }
-+  }
-+>>>>>>> .their
- }
- 
- ipcMain.on('ELECTRON_GUEST_VIEW_MANAGER_CREATE_GUEST', function (event, params, requestId) {
-@@ -318,8 +439,22 @@
-   event.returnValue = createGuest(event.sender, params)
- })
- 
-+<<<<<<< .our
- ipcMain.on('ELECTRON_GUEST_VIEW_MANAGER_ATTACH_GUEST', function (event, embedderFrameId, elementInstanceId, guestInstanceId, params) {
-   attachGuest(event, embedderFrameId, elementInstanceId, guestInstanceId, params)
-+=======
-+ipcMain.on('ELECTRON_GUEST_VIEW_MANAGER_ATTACH_GUEST', function (event, elementInstanceId, guestInstanceId, params) {
-+  attachGuest(event, elementInstanceId, guestInstanceId, params)
-+})
-+
-+ipcMain.on('ELECTRON_GUEST_VIEW_MANAGER_DESTROY_GUEST', function (event, guestInstanceId) {
-+  destroyGuest(event.sender, guestInstanceId)
-+})
-+
-+ipcMain.on('ELECTRON_GUEST_VIEW_MANAGER_SET_SIZE', function (event, guestInstanceId, params) {
-+  const guest = getGuest(guestInstanceId)
-+  if (guest != null) guest.setSize(params)
-+>>>>>>> .their
- })
- 
- // Returns WebContents from its guest id.
-added in both
-  our    100644 7253c1942b0956ae6b9b0c80a23470fc26669b8a lib/browser/guest-window-manager.js
-  their  100644 8e2aa3bb988208ec4f266d3169020daca4068de3 lib/browser/guest-window-manager.js
-@@ -27,11 +27,19 @@
-   for (const key in parent) {
-     if (key === 'isBrowserView') continue
-     if (!hasProp.call(parent, key)) continue
-+<<<<<<< .our
-     if (key in child && key !== 'webPreferences') continue
- 
-     const value = parent[key]
-     if (typeof value === 'object') {
-       child[key] = mergeOptions(child[key] || {}, value, visited)
-+=======
-+    if (key in child) continue
-+
-+    const value = parent[key]
-+    if (typeof value === 'object') {
-+      child[key] = mergeOptions({}, value, visited)
-+>>>>>>> .their
-     } else {
-       child[key] = value
-     }
-@@ -63,9 +71,14 @@
-   }
- 
-   // Inherit certain option values from parent window
-+<<<<<<< .our
-   const webPreferences = embedder.getLastWebPreferences()
-   for (const [name, value] of inheritedWebPreferences) {
-     if (webPreferences[name] === value) {
-+=======
-+  for (const [name, value] of inheritedWebPreferences) {
-+    if (embedder.getLastWebPreferences()[name] === value) {
-+>>>>>>> .their
-       options.webPreferences[name] = value
-     }
-   }
-added in both
-  our    100644 f03a23d2f6910d6555bb9469180d1b60b94bc313 lib/browser/objects-registry.js
-  their  100644 c6afe2616153dfd82b190b02f1c4fce582727a76 lib/browser/objects-registry.js
-@@ -2,10 +2,13 @@
- 
- const v8Util = process.atomBinding('v8_util')
- 
-+<<<<<<< .our
- const getOwnerKey = (webContents, contextId) => {
-   return `${webContents.id}-${contextId}`
- }
- 
-+=======
-+>>>>>>> .their
- class ObjectsRegistry {
-   constructor () {
-     this.nextId = 0
-@@ -15,7 +18,11 @@
-     this.storage = {}
- 
-     // Stores the IDs of objects referenced by WebContents.
-+<<<<<<< .our
-     // (ownerKey) => [id]
-+=======
-+    // (webContentsContextId) => [id]
-+>>>>>>> .their
-     this.owners = {}
-   }
- 
-@@ -26,10 +33,17 @@
-     const id = this.saveToStorage(obj)
- 
-     // Add object to the set of referenced objects.
-+<<<<<<< .our
-     const ownerKey = getOwnerKey(webContents, contextId)
-     let owner = this.owners[ownerKey]
-     if (!owner) {
-       owner = this.owners[ownerKey] = new Set()
-+=======
-+    const webContentsContextId = `${webContents.id}-${contextId}`
-+    let owner = this.owners[webContentsContextId]
-+    if (!owner) {
-+      owner = this.owners[webContentsContextId] = new Set()
-+>>>>>>> .their
-       this.registerDeleteListener(webContents, contextId)
-     }
-     if (!owner.has(id)) {
-@@ -50,8 +64,13 @@
-   // Note that an object may be double-freed (cleared when page is reloaded, and
-   // then garbage collected in old page).
-   remove (webContents, contextId, id) {
-+<<<<<<< .our
-     const ownerKey = getOwnerKey(webContents, contextId)
-     let owner = this.owners[ownerKey]
-+=======
-+    const webContentsContextId = `${webContents.id}-${contextId}`
-+    let owner = this.owners[webContentsContextId]
-+>>>>>>> .their
-     if (owner) {
-       // Remove the reference in owner.
-       owner.delete(id)
-@@ -62,13 +81,22 @@
- 
-   // Clear all references to objects refrenced by the WebContents.
-   clear (webContents, contextId) {
-+<<<<<<< .our
-     const ownerKey = getOwnerKey(webContents, contextId)
-     let owner = this.owners[ownerKey]
-+=======
-+    const webContentsContextId = `${webContents.id}-${contextId}`
-+    let owner = this.owners[webContentsContextId]
-+>>>>>>> .their
-     if (!owner) return
- 
-     for (let id of owner) this.dereference(id)
- 
-+<<<<<<< .our
-     delete this.owners[ownerKey]
-+=======
-+    delete this.owners[webContentsContextId]
-+>>>>>>> .their
-   }
- 
-   // Private: Saves the object into storage and assigns an ID for it.
-@@ -87,9 +115,12 @@
- 
-   // Private: Dereference the object from store.
-   dereference (id) {
-+<<<<<<< .our
-     // FIXME(MarshallOfSound): We should remove this once remote deref works well
-     if (process.env.ELECTRON_DISABLE_REMOTE_DEREFERENCING) return
- 
-+=======
-+>>>>>>> .their
-     let pointer = this.storage[id]
-     if (pointer == null) {
-       return
-@@ -101,7 +132,11 @@
-     }
-   }
- 
-+<<<<<<< .our
-   // Private: Clear the storage when renderer process is destroyed.
-+=======
-+  // Private: Clear the storage when renderer process is destoryed.
-+>>>>>>> .their
-   registerDeleteListener (webContents, contextId) {
-     const processId = webContents.getProcessId()
-     const listener = (event, deletedProcessId) => {
-added in both
-  our    100644 ff9f77321de3a4145946b67f3fe2a597f98e2510 lib/browser/rpc-server.js
-  their  100644 342de0f0c4845417f7ee5d88b240dd1077fe35a4 lib/browser/rpc-server.js
-@@ -171,6 +171,10 @@
- // Convert array of meta data from renderer into array of real values.
- const unwrapArgs = function (sender, contextId, args) {
-   const metaToValue = function (meta) {
-+<<<<<<< .our
-+=======
-+    let i, len, member, ref, returnValue
-+>>>>>>> .their
-     switch (meta.type) {
-       case 'value':
-         return meta.value
-@@ -190,13 +194,24 @@
-         let ret = {}
-         Object.defineProperty(ret.constructor, 'name', { value: meta.name })
- 
-+<<<<<<< .our
-         for (const {name, value} of meta.members) {
-           ret[name] = metaToValue(value)
-+=======
-+        ref = meta.members
-+        for (i = 0, len = ref.length; i < len; i++) {
-+          member = ref[i]
-+          ret[member.name] = metaToValue(member.value)
-+>>>>>>> .their
-         }
-         return ret
-       }
-       case 'function-with-return-value':
-+<<<<<<< .our
-         const returnValue = metaToValue(meta.value)
-+=======
-+        returnValue = metaToValue(meta.value)
-+>>>>>>> .their
-         return function () {
-           return returnValue
-         }
-@@ -210,9 +225,15 @@
-           return rendererFunctions.get(objectId)
-         }
- 
-+<<<<<<< .our
-         const processId = sender.getProcessId()
-         let callIntoRenderer = function (...args) {
-           if (!sender.isDestroyed() && processId === sender.getProcessId()) {
-+=======
-+        const webContentsId = sender.getId()
-+        let callIntoRenderer = function (...args) {
-+          if (!sender.isDestroyed() && webContentsId === sender.getId()) {
-+>>>>>>> .their
-             sender.send('ELECTRON_RENDERER_CALLBACK', contextId, meta.id, valueToMeta(sender, contextId, args))
-           } else {
-             removeRemoteListenersAndLogWarning(this, meta, callIntoRenderer)
-@@ -234,8 +255,14 @@
- // Call a function and send reply asynchronously if it's a an asynchronous
- // style function and the caller didn't pass a callback.
- const callFunction = function (event, contextId, func, caller, args) {
-+<<<<<<< .our
-   const funcMarkedAsync = v8Util.getHiddenValue(func, 'asynchronous')
-   const funcPassedCallback = typeof args[args.length - 1] === 'function'
-+=======
-+  let err, funcMarkedAsync, funcName, funcPassedCallback, ref, ret
-+  funcMarkedAsync = v8Util.getHiddenValue(func, 'asynchronous')
-+  funcPassedCallback = typeof args[args.length - 1] === 'function'
-+>>>>>>> .their
-   try {
-     if (funcMarkedAsync && !funcPassedCallback) {
-       args.push(function (ret) {
-@@ -243,15 +270,24 @@
-       })
-       func.apply(caller, args)
-     } else {
-+<<<<<<< .our
-       const ret = func.apply(caller, args)
-+=======
-+      ret = func.apply(caller, args)
-+>>>>>>> .their
-       event.returnValue = valueToMeta(event.sender, contextId, ret, true)
-     }
-   } catch (error) {
-     // Catch functions thrown further down in function invocation and wrap
-     // them with the function name so it's easier to trace things like
-     // `Error processing argument -1.`
-+<<<<<<< .our
-     const funcName = func.name || 'anonymous'
-     const err = new Error(`Could not call remote function '${funcName}'. Check that the function signature is correct. Underlying error: ${error.message}`)
-+=======
-+    funcName = ((ref = func.name) != null) ? ref : 'anonymous'
-+    err = new Error(`Could not call remote function '${funcName}'. Check that the function signature is correct. Underlying error: ${error.message}`)
-+>>>>>>> .their
-     err.cause = error
-     throw err
-   }
-@@ -302,7 +338,14 @@
-       throwRPCError(`Cannot call constructor on missing remote object ${id}`)
-     }
- 
-+<<<<<<< .our
-     event.returnValue = valueToMeta(event.sender, contextId, new constructor(...args))
-+=======
-+    // Call new with array of arguments.
-+    // http://stackoverflow.com/questions/1606797/use-of-apply-with-new-operator-is-this-possible
-+    let obj = new (Function.prototype.bind.apply(constructor, [null].concat(args)))()
-+    event.returnValue = valueToMeta(event.sender, contextId, obj)
-+>>>>>>> .their
-   } catch (error) {
-     event.returnValue = exceptionToMeta(event.sender, contextId, error)
-   }
-@@ -332,7 +375,14 @@
-       throwRPCError(`Cannot call constructor '${method}' on missing remote object ${id}`)
-     }
- 
-+<<<<<<< .our
-     event.returnValue = valueToMeta(event.sender, contextId, new object[method](...args))
-+=======
-+    // Call new with array of arguments.
-+    let constructor = object[method]
-+    let obj = new (Function.prototype.bind.apply(constructor, [null].concat(args)))()
-+    event.returnValue = valueToMeta(event.sender, contextId, obj)
-+>>>>>>> .their
-   } catch (error) {
-     event.returnValue = exceptionToMeta(event.sender, contextId, error)
-   }
-@@ -440,8 +490,12 @@
-   event.returnValue = null
- })
- 
-+<<<<<<< .our
- ipcMain.on('ELECTRON_BROWSER_SANDBOX_LOAD', function (event) {
-   const preloadPath = event.sender._getPreloadPath()
-+=======
-+ipcMain.on('ELECTRON_BROWSER_SANDBOX_LOAD', function (event, preloadPath) {
-+>>>>>>> .their
-   let preloadSrc = null
-   let preloadError = null
-   if (preloadPath) {
-@@ -454,6 +508,7 @@
-   event.returnValue = {
-     preloadSrc: preloadSrc,
-     preloadError: preloadError,
-+<<<<<<< .our
-     process: {
-       arch: process.arch,
-       platform: process.platform,
-@@ -461,5 +516,10 @@
-       version: process.version,
-       versions: process.versions
-     }
-+=======
-+    webContentsId: event.sender.getId(),
-+    platform: process.platform,
-+    env: process.env
-+>>>>>>> .their
-   }
- })
-added in both
-  our    100644 41c3d0c85c69954dddad53c674f84051f25372e4 lib/common/asar.js
-  their  100644 a9c7dc514ed3a37ce197a29d393f206bd5e61112 lib/common/asar.js
-@@ -67,6 +67,7 @@
-   let nextInode = 0
- 
-   const uid = process.getuid != null ? process.getuid() : 0
-+<<<<<<< .our
-   const gid = process.getgid != null ? process.getgid() : 0
- 
-   const fakeTime = new Date()
-@@ -101,6 +102,49 @@
-       msec(stats.ctime), // ctim_msec
-       msec(stats.birthtime) // birthtim_msec
-     )
-+=======
-+
-+  const gid = process.getgid != null ? process.getgid() : 0
-+
-+  const fakeTime = new Date()
-+
-+  const asarStatsToFsStats = function (stats) {
-+    return {
-+      dev: 1,
-+      ino: ++nextInode,
-+      mode: 33188,
-+      nlink: 1,
-+      uid: uid,
-+      gid: gid,
-+      rdev: 0,
-+      atime: stats.atime || fakeTime,
-+      birthtime: stats.birthtime || fakeTime,
-+      mtime: stats.mtime || fakeTime,
-+      ctime: stats.ctime || fakeTime,
-+      size: stats.size,
-+      isFile: function () {
-+        return stats.isFile
-+      },
-+      isDirectory: function () {
-+        return stats.isDirectory
-+      },
-+      isSymbolicLink: function () {
-+        return stats.isLink
-+      },
-+      isBlockDevice: function () {
-+        return false
-+      },
-+      isCharacterDevice: function () {
-+        return false
-+      },
-+      isFIFO: function () {
-+        return false
-+      },
-+      isSocket: function () {
-+        return false
-+      }
-+    }
-+>>>>>>> .their
-   }
- 
-   // Create a ENOENT error.
-@@ -332,6 +376,7 @@
-     const {realpathSync} = fs
-     fs.realpathSync = function (p) {
-       const [isAsar, asarPath, filePath] = splitPath(p)
-+<<<<<<< .our
-       if (!isAsar) return realpathSync.apply(this, arguments)
- 
-       const archive = getOrCreateArchive(asarPath)
-@@ -381,10 +426,33 @@
-       const [isAsar, asarPath, filePath] = splitPath(p)
-       if (!isAsar) return realpath.native.apply(this, arguments)
- 
-+=======
-+      if (!isAsar) {
-+        return realpathSync.apply(this, arguments)
-+      }
-+      const archive = getOrCreateArchive(asarPath)
-+      if (!archive) {
-+        invalidArchiveError(asarPath)
-+      }
-+      const real = archive.realpath(filePath)
-+      if (real === false) {
-+        notFoundError(asarPath, filePath)
-+      }
-+      return path.join(realpathSync(asarPath), real)
-+    }
-+
-+    const {realpath} = fs
-+    fs.realpath = function (p, cache, callback) {
-+      const [isAsar, asarPath, filePath] = splitPath(p)
-+      if (!isAsar) {
-+        return realpath.apply(this, arguments)
-+      }
-+>>>>>>> .their
-       if (typeof cache === 'function') {
-         callback = cache
-         cache = void 0
-       }
-+<<<<<<< .our
- 
-       const archive = getOrCreateArchive(asarPath)
-       if (!archive) return invalidArchiveError(asarPath, callback)
-@@ -394,6 +462,21 @@
- 
-       return realpath.native(asarPath, (err, p) => {
-         return (err) ? callback(err) : callback(null, path.join(p, real))
-+=======
-+      const archive = getOrCreateArchive(asarPath)
-+      if (!archive) {
-+        return invalidArchiveError(asarPath, callback)
-+      }
-+      const real = archive.realpath(filePath)
-+      if (real === false) {
-+        return notFoundError(asarPath, filePath, callback)
-+      }
-+      return realpath(asarPath, function (err, p) {
-+        if (err) {
-+          return callback(err)
-+        }
-+        return callback(null, path.join(p, real))
-+>>>>>>> .their
-       })
-     }
- 
-added in both
-  our    100644 b24f9e28b879154457be0342b9d4b44c0e651253 lib/renderer/security-warnings.js
-  their  100644 41557164ce716dec6d934ce49fe654a22c6658e3 lib/renderer/security-warnings.js
-@@ -210,7 +210,12 @@
-    */
-   warnAboutExperimentalFeatures: () => {
-     const webPreferences = getWebPreferences()
-+<<<<<<< .our
-     if (!webPreferences || (!webPreferences.experimentalFeatures)) {
-+=======
-+    if (!webPreferences || (!webPreferences.experimentalFeatures &&
-+        !webPreferences.experimentalCanvasFeatures)) {
-+>>>>>>> .their
-       return
-     }
- 
-added in both
-  our    100644 6e42c769b70e5223fe97397f87144ec342882f8d lib/renderer/web-view/guest-view-internal.js
-  their  100644 b9b7a8ea3917777c7855d1cc710277cd500237ef lib/renderer/web-view/guest-view-internal.js
-@@ -61,6 +61,10 @@
- module.exports = {
-   registerEvents: function (webView, viewInstanceId) {
-     ipcRenderer.on(`ELECTRON_GUEST_VIEW_INTERNAL_DESTROY_GUEST-${viewInstanceId}`, function () {
-+<<<<<<< .our
-+=======
-+      webFrame.detachGuest(webView.internalInstanceId)
-+>>>>>>> .their
-       webView.guestInstanceId = undefined
-       webView.reset()
-       const domEvent = new Event('destroyed')
-@@ -77,11 +81,28 @@
-       domEvent.args = args
-       webView.dispatchEvent(domEvent)
-     })
-+<<<<<<< .our
-+=======
-+
-+    ipcRenderer.on(`ELECTRON_GUEST_VIEW_INTERNAL_SIZE_CHANGED-${viewInstanceId}`, function (event, ...args) {
-+      const domEvent = new Event('size-changed')
-+      const props = ['oldWidth', 'oldHeight', 'newWidth', 'newHeight']
-+      for (let i = 0; i < props.length; i++) {
-+        const prop = props[i]
-+        domEvent[prop] = args[i]
-+      }
-+      webView.onSizeChanged(domEvent)
-+    })
-+>>>>>>> .their
-   },
-   deregisterEvents: function (viewInstanceId) {
-     ipcRenderer.removeAllListeners(`ELECTRON_GUEST_VIEW_INTERNAL_DESTROY_GUEST-${viewInstanceId}`)
-     ipcRenderer.removeAllListeners(`ELECTRON_GUEST_VIEW_INTERNAL_DISPATCH_EVENT-${viewInstanceId}`)
-     ipcRenderer.removeAllListeners(`ELECTRON_GUEST_VIEW_INTERNAL_IPC_MESSAGE-${viewInstanceId}`)
-+<<<<<<< .our
-+=======
-+    ipcRenderer.removeAllListeners(`ELECTRON_GUEST_VIEW_INTERNAL_SIZE_CHANGED-${viewInstanceId}`)
-+>>>>>>> .their
-   },
-   createGuest: function (params, callback) {
-     requestId++
-@@ -91,11 +112,23 @@
-   createGuestSync: function (params) {
-     return ipcRenderer.sendSync('ELECTRON_GUEST_VIEW_MANAGER_CREATE_GUEST_SYNC', params)
-   },
-+<<<<<<< .our
-   attachGuest: function (elementInstanceId, guestInstanceId, params, contentWindow) {
-     const embedderFrameId = webFrame.getWebFrameId(contentWindow)
-     if (embedderFrameId < 0) {  // this error should not happen.
-       throw new Error('Invalid embedder frame')
-     }
-     ipcRenderer.send('ELECTRON_GUEST_VIEW_MANAGER_ATTACH_GUEST', embedderFrameId, elementInstanceId, guestInstanceId, params)
-+=======
-+  attachGuest: function (elementInstanceId, guestInstanceId, params) {
-+    ipcRenderer.send('ELECTRON_GUEST_VIEW_MANAGER_ATTACH_GUEST', elementInstanceId, guestInstanceId, params)
-+    webFrame.attachGuest(elementInstanceId)
-+  },
-+  destroyGuest: function (guestInstanceId) {
-+    ipcRenderer.send('ELECTRON_GUEST_VIEW_MANAGER_DESTROY_GUEST', guestInstanceId)
-+  },
-+  setSize: function (guestInstanceId, params) {
-+    ipcRenderer.send('ELECTRON_GUEST_VIEW_MANAGER_SET_SIZE', guestInstanceId, params)
-+>>>>>>> .their
-   }
- }
-added in both
-  our    100644 ad9970bd0b9355ac8163c82f6fa7f3ca08a05de6 lib/renderer/web-view/web-view-attributes.js
-  their  100644 204046bd60542657e9213f2b12e5c126ee10ea33 lib/renderer/web-view/web-view-attributes.js
-@@ -1,6 +1,10 @@
- 'use strict'
- 
- const WebViewImpl = require('./web-view')
-+<<<<<<< .our
-+=======
-+const guestViewInternal = require('./guest-view-internal')
-+>>>>>>> .their
- const webViewConstants = require('./web-view-constants')
- const {remote} = require('electron')
- 
-@@ -73,6 +77,42 @@
-   }
- }
- 
-+<<<<<<< .our
-+=======
-+// Attribute used to define the demension limits of autosizing.
-+class AutosizeDimensionAttribute extends WebViewAttribute {
-+  getValue () {
-+    return parseInt(this.webViewImpl.webviewNode.getAttribute(this.name)) || 0
-+  }
-+
-+  handleMutation () {
-+    if (!this.webViewImpl.guestInstanceId) {
-+      return
-+    }
-+    guestViewInternal.setSize(this.webViewImpl.guestInstanceId, {
-+      enableAutoSize: this.webViewImpl.attributes[webViewConstants.ATTRIBUTE_AUTOSIZE].getValue(),
-+      min: {
-+        width: parseInt(this.webViewImpl.attributes[webViewConstants.ATTRIBUTE_MINWIDTH].getValue() || 0),
-+        height: parseInt(this.webViewImpl.attributes[webViewConstants.ATTRIBUTE_MINHEIGHT].getValue() || 0)
-+      },
-+      max: {
-+        width: parseInt(this.webViewImpl.attributes[webViewConstants.ATTRIBUTE_MAXWIDTH].getValue() || 0),
-+        height: parseInt(this.webViewImpl.attributes[webViewConstants.ATTRIBUTE_MAXHEIGHT].getValue() || 0)
-+      }
-+    })
-+  }
-+}
-+
-+// Attribute that specifies whether the webview should be autosized.
-+class AutosizeAttribute extends BooleanAttribute {
-+  constructor (webViewImpl) {
-+    super(webViewConstants.ATTRIBUTE_AUTOSIZE, webViewImpl)
-+  }
-+}
-+
-+AutosizeAttribute.prototype.handleMutation = AutosizeDimensionAttribute.prototype.handleMutation
-+
-+>>>>>>> .their
- // Attribute representing the state of the storage partition.
- class PartitionAttribute extends WebViewAttribute {
-   constructor (webViewImpl) {
-@@ -96,6 +136,46 @@
-   }
- }
- 
-+<<<<<<< .our
-+=======
-+// An attribute that controls the guest instance this webview is connected to
-+class GuestInstanceAttribute extends WebViewAttribute {
-+  constructor (webViewImpl) {
-+    super(webViewConstants.ATTRIBUTE_GUESTINSTANCE, webViewImpl)
-+  }
-+
-+  // Retrieves and returns the attribute's value.
-+  getValue () {
-+    if (this.webViewImpl.webviewNode.hasAttribute(this.name)) {
-+      return parseInt(this.webViewImpl.webviewNode.getAttribute(this.name))
-+    }
-+  }
-+
-+  // Sets the attribute's value.
-+  setValue (value) {
-+    if (!value) {
-+      this.webViewImpl.webviewNode.removeAttribute(this.name)
-+    } else if (!isNaN(value)) {
-+      this.webViewImpl.webviewNode.setAttribute(this.name, value)
-+    }
-+  }
-+
-+  handleMutation (oldValue, newValue) {
-+    if (!newValue) {
-+      this.webViewImpl.reset()
-+      return
-+    }
-+
-+    const intVal = parseInt(newValue)
-+    if (!isNaN(newValue) && remote.getGuestWebContents(intVal)) {
-+      this.webViewImpl.attachGuestInstance(intVal)
-+    } else {
-+      this.setValueIgnoreMutation(oldValue)
-+    }
-+  }
-+}
-+
-+>>>>>>> .their
- // Attribute that handles the location and navigation of the webview.
- class SrcAttribute extends WebViewAttribute {
-   constructor (webViewImpl) {
-@@ -243,6 +323,10 @@
- // Sets up all of the webview attributes.
- WebViewImpl.prototype.setupWebViewAttributes = function () {
-   this.attributes = {}
-+<<<<<<< .our
-+=======
-+  this.attributes[webViewConstants.ATTRIBUTE_AUTOSIZE] = new AutosizeAttribute(this)
-+>>>>>>> .their
-   this.attributes[webViewConstants.ATTRIBUTE_PARTITION] = new PartitionAttribute(this)
-   this.attributes[webViewConstants.ATTRIBUTE_SRC] = new SrcAttribute(this)
-   this.attributes[webViewConstants.ATTRIBUTE_HTTPREFERRER] = new HttpReferrerAttribute(this)
-@@ -254,5 +338,16 @@
-   this.attributes[webViewConstants.ATTRIBUTE_PRELOAD] = new PreloadAttribute(this)
-   this.attributes[webViewConstants.ATTRIBUTE_BLINKFEATURES] = new BlinkFeaturesAttribute(this)
-   this.attributes[webViewConstants.ATTRIBUTE_DISABLEBLINKFEATURES] = new DisableBlinkFeaturesAttribute(this)
-+<<<<<<< .our
-   this.attributes[webViewConstants.ATTRIBUTE_WEBPREFERENCES] = new WebPreferencesAttribute(this)
-+=======
-+  this.attributes[webViewConstants.ATTRIBUTE_GUESTINSTANCE] = new GuestInstanceAttribute(this)
-+  this.attributes[webViewConstants.ATTRIBUTE_DISABLEGUESTRESIZE] = new BooleanAttribute(webViewConstants.ATTRIBUTE_DISABLEGUESTRESIZE, this)
-+  this.attributes[webViewConstants.ATTRIBUTE_WEBPREFERENCES] = new WebPreferencesAttribute(this)
-+
-+  const autosizeAttributes = [webViewConstants.ATTRIBUTE_MAXHEIGHT, webViewConstants.ATTRIBUTE_MAXWIDTH, webViewConstants.ATTRIBUTE_MINHEIGHT, webViewConstants.ATTRIBUTE_MINWIDTH]
-+  autosizeAttributes.forEach((attribute) => {
-+    this.attributes[attribute] = new AutosizeDimensionAttribute(attribute, this)
-+  })
-+>>>>>>> .their
- }
-added in both
-  our    100644 327114be508dcbee0f516e2340e3904475ece859 lib/renderer/web-view/web-view-constants.js
-  their  100644 bf2601822d3319f1e30bb90b6dc7542cdba35ab6 lib/renderer/web-view/web-view-constants.js
-@@ -1,5 +1,13 @@
- module.exports = {
-   // Attributes.
-+<<<<<<< .our
-+=======
-+  ATTRIBUTE_AUTOSIZE: 'autosize',
-+  ATTRIBUTE_MAXHEIGHT: 'maxheight',
-+  ATTRIBUTE_MAXWIDTH: 'maxwidth',
-+  ATTRIBUTE_MINHEIGHT: 'minheight',
-+  ATTRIBUTE_MINWIDTH: 'minwidth',
-+>>>>>>> .their
-   ATTRIBUTE_NAME: 'name',
-   ATTRIBUTE_PARTITION: 'partition',
-   ATTRIBUTE_SRC: 'src',
-@@ -12,6 +20,11 @@
-   ATTRIBUTE_USERAGENT: 'useragent',
-   ATTRIBUTE_BLINKFEATURES: 'blinkfeatures',
-   ATTRIBUTE_DISABLEBLINKFEATURES: 'disableblinkfeatures',
-+<<<<<<< .our
-+=======
-+  ATTRIBUTE_GUESTINSTANCE: 'guestinstance',
-+  ATTRIBUTE_DISABLEGUESTRESIZE: 'disableguestresize',
-+>>>>>>> .their
-   ATTRIBUTE_WEBPREFERENCES: 'webpreferences',
- 
-   // Internal attribute.
-added in both
-  our    100644 574a2b545597f9d1c05ec9b7147585063e90ae89 lib/renderer/web-view/web-view.js
-  their  100644 0f2962e2982c101b749c8c65d0aebb70116a9e51 lib/renderer/web-view/web-view.js
-@@ -6,6 +6,11 @@
- const guestViewInternal = require('./guest-view-internal')
- const webViewConstants = require('./web-view-constants')
- 
-+<<<<<<< .our
-+=======
-+const hasProp = {}.hasOwnProperty
-+
-+>>>>>>> .their
- // An unique ID that can represent current context.
- const contextId = v8Util.getHiddenValue(global, 'contextId')
- 
-@@ -16,6 +21,7 @@
-   return ++nextId
- }
- 
-+<<<<<<< .our
- // A list of removed attributes from 3.0.
- const removedAttributes = [
-   'autoresize',
-@@ -23,11 +29,14 @@
-   'guestinstance'
- ]
- 
-+=======
-+>>>>>>> .their
- // Represents the internal state of the WebView node.
- class WebViewImpl {
-   constructor (webviewNode) {
-     this.webviewNode = webviewNode
-     v8Util.setHiddenValue(this.webviewNode, 'internal', this)
-+<<<<<<< .our
-     this.elementAttached = false
-     this.beforeFirstNavigation = true
- 
-@@ -42,11 +51,21 @@
-     this.on = {}
- 
-     this.internalElement = this.createInternalElement()
-+=======
-+    this.attached = false
-+    this.elementAttached = false
-+    this.beforeFirstNavigation = true
-+
-+    // on* Event handlers.
-+    this.on = {}
-+    this.browserPluginNode = this.createBrowserPluginNode()
-+>>>>>>> .their
-     const shadowRoot = this.webviewNode.attachShadow({mode: 'open'})
-     shadowRoot.innerHTML = '<!DOCTYPE html><style type="text/css">:host { display: flex; }</style>'
-     this.setupWebViewAttributes()
-     this.setupFocusPropagation()
-     this.viewInstanceId = getNextId()
-+<<<<<<< .our
-     shadowRoot.appendChild(this.internalElement)
-   }
- 
-@@ -57,6 +76,17 @@
-     iframeElement.style.border = '0'
-     v8Util.setHiddenValue(iframeElement, 'internal', this)
-     return iframeElement
-+=======
-+    shadowRoot.appendChild(this.browserPluginNode)
-+  }
-+
-+  createBrowserPluginNode () {
-+    // We create BrowserPlugin as a custom element in order to observe changes
-+    // to attributes synchronously.
-+    const browserPluginNode = new WebViewImpl.BrowserPlugin()
-+    v8Util.setHiddenValue(browserPluginNode, 'internal', this)
-+    return browserPluginNode
-+>>>>>>> .their
-   }
- 
-   // Resets some state upon reattaching <webview> element to the DOM.
-@@ -68,6 +98,10 @@
-     // heard back from createGuest yet. We will not reset the flag in this case so
-     // that we don't end up allocating a second guest.
-     if (this.guestInstanceId) {
-+<<<<<<< .our
-+=======
-+      guestViewInternal.destroyGuest(this.guestInstanceId)
-+>>>>>>> .their
-       this.guestInstanceId = void 0
-     }
- 
-@@ -75,12 +109,18 @@
-     this.beforeFirstNavigation = true
-     this.attributes[webViewConstants.ATTRIBUTE_PARTITION].validPartitionId = true
- 
-+<<<<<<< .our
-     // Since attachment swaps a local frame for a remote frame, we need our
-     // internal iframe element to be local again before we can reattach.
-     const newFrame = this.createInternalElement()
-     const oldFrame = this.internalElement
-     this.internalElement = newFrame
-     oldFrame.parentNode.replaceChild(newFrame, oldFrame)
-+=======
-+    // Set guestinstance last since this can trigger the attachedCallback to fire
-+    // when moving the webview using element.replaceChild
-+    this.attributes[webViewConstants.ATTRIBUTE_GUESTINSTANCE].setValueIgnoreMutation(undefined)
-+>>>>>>> .their
-   }
- 
-   // Sets the <webview>.request property.
-@@ -102,12 +142,20 @@
- 
-     // Focus the BrowserPlugin when the <webview> takes focus.
-     this.webviewNode.addEventListener('focus', () => {
-+<<<<<<< .our
-       this.internalElement.focus()
-+=======
-+      this.browserPluginNode.focus()
-+>>>>>>> .their
-     })
- 
-     // Blur the BrowserPlugin when the <webview> loses focus.
-     this.webviewNode.addEventListener('blur', () => {
-+<<<<<<< .our
-       this.internalElement.blur()
-+=======
-+      this.browserPluginNode.blur()
-+>>>>>>> .their
-     })
-   }
- 
-@@ -117,11 +165,14 @@
-   // attribute, if necessary. See BrowserPlugin::UpdateDOMAttribute for more
-   // details.
-   handleWebviewAttributeMutation (attributeName, oldValue, newValue) {
-+<<<<<<< .our
-     if (removedAttributes.includes(attributeName)) {
-       this.reportRemovedAttribute(attributeName)
-       return
-     }
- 
-+=======
-+>>>>>>> .their
-     if (!this.attributes[attributeName] || this.attributes[attributeName].ignoreMutation) {
-       return
-     }
-@@ -130,11 +181,70 @@
-     this.attributes[attributeName].handleMutation(oldValue, newValue)
-   }
- 
-+<<<<<<< .our
-   onElementResize () {
-     const resizeEvent = new Event('resize')
-     resizeEvent.newWidth = this.webviewNode.clientWidth
-     resizeEvent.newHeight = this.webviewNode.clientHeight
-     this.dispatchEvent(resizeEvent)
-+=======
-+  handleBrowserPluginAttributeMutation (attributeName, oldValue, newValue) {
-+    if (attributeName === webViewConstants.ATTRIBUTE_INTERNALINSTANCEID && !oldValue && !!newValue) {
-+      this.browserPluginNode.removeAttribute(webViewConstants.ATTRIBUTE_INTERNALINSTANCEID)
-+      this.internalInstanceId = parseInt(newValue)
-+
-+      // Track when the element resizes using the element resize callback.
-+      webFrame.registerElementResizeCallback(this.internalInstanceId, this.onElementResize.bind(this))
-+      if (this.guestInstanceId) {
-+        guestViewInternal.attachGuest(this.internalInstanceId, this.guestInstanceId, this.buildParams())
-+      }
-+    }
-+  }
-+
-+  onSizeChanged (webViewEvent) {
-+    const {newHeight, newWidth} = webViewEvent
-+    const node = this.webviewNode
-+    const width = node.offsetWidth
-+
-+    // Check the current bounds to make sure we do not resize <webview>
-+    // outside of current constraints.
-+    const maxWidth = this.attributes[webViewConstants.ATTRIBUTE_MAXWIDTH].getValue() | width
-+    const maxHeight = this.attributes[webViewConstants.ATTRIBUTE_MAXHEIGHT].getValue() | width
-+    let minWidth = this.attributes[webViewConstants.ATTRIBUTE_MINWIDTH].getValue() | width
-+    let minHeight = this.attributes[webViewConstants.ATTRIBUTE_MINHEIGHT].getValue() | width
-+    minWidth = Math.min(minWidth, maxWidth)
-+    minHeight = Math.min(minHeight, maxHeight)
-+    if (!this.attributes[webViewConstants.ATTRIBUTE_AUTOSIZE].getValue() || (newWidth >= minWidth && newWidth <= maxWidth && newHeight >= minHeight && newHeight <= maxHeight)) {
-+      node.style.width = `${newWidth}px`
-+      node.style.height = `${newHeight}px`
-+
-+      // Only fire the DOM event if the size of the <webview> has actually
-+      // changed.
-+      this.dispatchEvent(webViewEvent)
-+    }
-+  }
-+
-+  onElementResize (newSize) {
-+    // Dispatch the 'resize' event.
-+    const resizeEvent = new Event('resize', {
-+      bubbles: true
-+    })
-+
-+    // Using client size values, because when a webview is transformed `newSize`
-+    // is incorrect
-+    newSize.width = this.webviewNode.clientWidth
-+    newSize.height = this.webviewNode.clientHeight
-+
-+    resizeEvent.newWidth = newSize.width
-+    resizeEvent.newHeight = newSize.height
-+    this.dispatchEvent(resizeEvent)
-+    if (this.guestInstanceId &&
-+        !this.attributes[webViewConstants.ATTRIBUTE_DISABLEGUESTRESIZE].getValue()) {
-+      guestViewInternal.setSize(this.guestInstanceId, {
-+        normal: newSize
-+      })
-+    }
-+>>>>>>> .their
-   }
- 
-   createGuest () {
-@@ -144,7 +254,10 @@
-   }
- 
-   createGuestSync () {
-+<<<<<<< .our
-     this.beforeFirstNavigation = false
-+=======
-+>>>>>>> .their
-     this.attachGuestInstance(guestViewInternal.createGuestSync(this.buildParams()))
-   }
- 
-@@ -195,14 +308,32 @@
-       userAgentOverride: this.userAgentOverride
-     }
-     for (const attributeName in this.attributes) {
-+<<<<<<< .our
-       if (this.attributes.hasOwnProperty(attributeName)) {
-         params[attributeName] = this.attributes[attributeName].getValue()
-       }
-     }
-+=======
-+      if (hasProp.call(this.attributes, attributeName)) {
-+        params[attributeName] = this.attributes[attributeName].getValue()
-+      }
-+    }
-+
-+    // When the WebView is not participating in layout (display:none)
-+    // then getBoundingClientRect() would report a width and height of 0.
-+    // However, in the case where the WebView has a fixed size we can
-+    // use that value to initially size the guest so as to avoid a relayout of
-+    // the on display:block.
-+    const css = window.getComputedStyle(this.webviewNode, null)
-+    const elementRect = this.webviewNode.getBoundingClientRect()
-+    params.elementWidth = parseInt(elementRect.width) || parseInt(css.getPropertyValue('width'))
-+    params.elementHeight = parseInt(elementRect.height) || parseInt(css.getPropertyValue('height'))
-+>>>>>>> .their
-     return params
-   }
- 
-   attachGuestInstance (guestInstanceId) {
-+<<<<<<< .our
-     if (!this.elementAttached) {
-       // The element could be detached before we got response from browser.
-       return
-@@ -223,6 +354,46 @@
-     console.error(`The "${attributeName}" attribute has been removed from the <webview> tag,`,
-                   'see https://github.com/electron/electron/issues/14120 for more.')
-   }
-+=======
-+    this.guestInstanceId = guestInstanceId
-+    this.attributes[webViewConstants.ATTRIBUTE_GUESTINSTANCE].setValueIgnoreMutation(guestInstanceId)
-+    this.webContents = remote.getGuestWebContents(this.guestInstanceId)
-+    if (!this.internalInstanceId) {
-+      return true
-+    }
-+    return guestViewInternal.attachGuest(this.internalInstanceId, this.guestInstanceId, this.buildParams())
-+  }
-+}
-+
-+// Registers browser plugin <object> custom element.
-+const registerBrowserPluginElement = function () {
-+  const proto = Object.create(HTMLObjectElement.prototype)
-+  proto.createdCallback = function () {
-+    this.setAttribute('type', 'application/browser-plugin')
-+    this.setAttribute('id', `browser-plugin-${getNextId()}`)
-+
-+    // The <object> node fills in the <webview> container.
-+    this.style.flex = '1 1 auto'
-+  }
-+  proto.attributeChangedCallback = function (name, oldValue, newValue) {
-+    const internal = v8Util.getHiddenValue(this, 'internal')
-+    if (internal) {
-+      internal.handleBrowserPluginAttributeMutation(name, oldValue, newValue)
-+    }
-+  }
-+  proto.attachedCallback = function () {
-+    // Load the plugin immediately.
-+    return this.nonExistentAttribute
-+  }
-+  WebViewImpl.BrowserPlugin = webFrame.registerEmbedderCustomElement('browserplugin', {
-+    'extends': 'object',
-+    prototype: proto
-+  })
-+  delete proto.createdCallback
-+  delete proto.attachedCallback
-+  delete proto.detachedCallback
-+  delete proto.attributeChangedCallback
-+>>>>>>> .their
- }
- 
- // Registers <webview> custom element.
-@@ -255,7 +426,16 @@
-     if (!internal.elementAttached) {
-       guestViewInternal.registerEvents(internal, internal.viewInstanceId)
-       internal.elementAttached = true
-+<<<<<<< .our
-       internal.attributes[webViewConstants.ATTRIBUTE_SRC].parse()
-+=======
-+      const instance = internal.attributes[webViewConstants.ATTRIBUTE_GUESTINSTANCE].getValue()
-+      if (instance) {
-+        internal.attachGuestInstance(instance)
-+      } else {
-+        internal.attributes[webViewConstants.ATTRIBUTE_SRC].parse()
-+      }
-+>>>>>>> .their
-     }
-   }
- 
-@@ -288,7 +468,10 @@
-     'inspectElement',
-     'setAudioMuted',
-     'isAudioMuted',
-+<<<<<<< .our
-     'isCurrentlyAudible',
-+=======
-+>>>>>>> .their
-     'undo',
-     'redo',
-     'cut',
-@@ -302,6 +485,10 @@
-     'replaceMisspelling',
-     'findInPage',
-     'stopFindInPage',
-+<<<<<<< .our
-+=======
-+    'getId',
-+>>>>>>> .their
-     'downloadURL',
-     'inspectServiceWorker',
-     'print',
-@@ -387,6 +574,10 @@
-   if (document.readyState === 'loading') {
-     return
-   }
-+<<<<<<< .our
-+=======
-+  registerBrowserPluginElement()
-+>>>>>>> .their
-   registerWebViewElement()
-   window.removeEventListener(event.type, listener, useCapture)
- }
-added in both
-  our    100644 30a3fa55216f6bf7588c3accc07b150a31163b7c lib/sandboxed_renderer/init.js
-  their  100644 94be35da6765bb22c988fe188db07a60a9b0011e lib/sandboxed_renderer/init.js
-@@ -1,5 +1,9 @@
- /* eslint no-eval: "off" */
-+<<<<<<< .our
- /* global binding, Buffer */
-+=======
-+/* global binding, preloadPath, Buffer */
-+>>>>>>> .their
- const events = require('events')
- const electron = require('electron')
- 
-@@ -36,8 +40,19 @@
- ])
- 
- const {
-+<<<<<<< .our
-   preloadSrc, preloadError, process: processProps
- } = electron.ipcRenderer.sendSync('ELECTRON_BROWSER_SANDBOX_LOAD')
-+=======
-+  preloadSrc, preloadError, webContentsId, platform, env
-+} = electron.ipcRenderer.sendSync('ELECTRON_BROWSER_SANDBOX_LOAD', preloadPath)
-+
-+Object.defineProperty(process, 'webContentsId', {
-+  configurable: false,
-+  writable: false,
-+  value: webContentsId
-+})
-+>>>>>>> .their
- 
- require('../renderer/web-frame-init')()
- 
-@@ -49,6 +64,7 @@
- preloadProcess.getHeapStatistics = () => binding.getHeapStatistics()
- preloadProcess.getProcessMemoryInfo = () => binding.getProcessMemoryInfo()
- preloadProcess.getSystemMemoryInfo = () => binding.getSystemMemoryInfo()
-+<<<<<<< .our
- preloadProcess.getCPUUsage = () => binding.getCPUUsage()
- preloadProcess.getIOCounters = () => binding.getIOCounters()
- preloadProcess.argv = process.argv = binding.getArgv()
-@@ -59,6 +75,12 @@
- preloadProcess.type = 'renderer'
- Object.assign(preloadProcess, processProps)
- Object.assign(process, processProps)
-+=======
-+preloadProcess.argv = process.argv = binding.getArgv()
-+preloadProcess.execPath = process.execPath = binding.getExecPath()
-+preloadProcess.platform = process.platform = platform
-+preloadProcess.env = process.env = env
-+>>>>>>> .their
- 
- process.on('exit', () => preloadProcess.emit('exit'))
- 
-@@ -112,8 +134,15 @@
-   ${preloadSrc}
-   })`
- 
-+<<<<<<< .our
-   // eval in window scope
-   const preloadFn = binding.createPreloadScript(preloadWrapperSrc)
-+=======
-+  // eval in window scope:
-+  // http://www.ecma-international.org/ecma-262/5.1/#sec-10.4.2
-+  const geval = eval
-+  const preloadFn = geval(preloadWrapperSrc)
-+>>>>>>> .their
-   const {setImmediate, clearImmediate} = require('timers')
-   preloadFn(preloadRequire, preloadProcess, Buffer, global, setImmediate, clearImmediate)
- } else if (preloadError) {
-added in both
-  our    100644 bac533f6786ffad78ef1e711bc4a94d5b51cd36d native_mate/native_mate/dictionary.cc
-  their  100644 3caff114597440fecf0494c8565b4524602f2694 native_mate/native_mate/dictionary.cc
-@@ -6,6 +6,7 @@
- 
- namespace mate {
- 
-+<<<<<<< .our
- Dictionary::Dictionary() : isolate_(NULL) {}
- 
- Dictionary::Dictionary(v8::Isolate* isolate, v8::Local<v8::Object> object)
-@@ -14,6 +15,20 @@
- Dictionary::Dictionary(const Dictionary& other) = default;
- 
- Dictionary::~Dictionary() = default;
-+=======
-+Dictionary::Dictionary()
-+    : isolate_(NULL) {
-+}
-+
-+Dictionary::Dictionary(v8::Isolate* isolate,
-+                       v8::Local<v8::Object> object)
-+    : isolate_(isolate),
-+      object_(object) {
-+}
-+
-+Dictionary::~Dictionary() {
-+}
-+>>>>>>> .their
- 
- Dictionary Dictionary::CreateEmpty(v8::Isolate* isolate) {
-   return Dictionary(isolate, v8::Object::New(isolate));
-@@ -24,7 +39,11 @@
- }
- 
- v8::Local<v8::Value> Converter<Dictionary>::ToV8(v8::Isolate* isolate,
-+<<<<<<< .our
-                                                  Dictionary val) {
-+=======
-+                                                  Dictionary val) {
-+>>>>>>> .their
-   return val.GetHandle();
- }
- 
-added in both
-  our    100644 63a1350597604f9a0ab3233f7f6f24b0d3a81c22 native_mate/native_mate/dictionary.h
-  their  100644 9e80cb99acfdbedbeacc6a98d2398f9a2c17713f native_mate/native_mate/dictionary.h
-@@ -35,12 +35,19 @@
-  public:
-   Dictionary();
-   Dictionary(v8::Isolate* isolate, v8::Local<v8::Object> object);
-+<<<<<<< .our
-   Dictionary(const Dictionary& other);
-+=======
-+>>>>>>> .their
-   virtual ~Dictionary();
- 
-   static Dictionary CreateEmpty(v8::Isolate* isolate);
- 
-+<<<<<<< .our
-   template <typename T>
-+=======
-+  template<typename T>
-+>>>>>>> .their
-   bool Get(const base::StringPiece& key, T* out) const {
-     // Check for existence before getting, otherwise this method will always
-     // returns true when T == v8::Local<v8::Value>.
-@@ -55,30 +62,54 @@
-     return ConvertFromV8(isolate_, val, out);
-   }
- 
-+<<<<<<< .our
-   template <typename T>
-+=======
-+  template<typename T>
-+>>>>>>> .their
-   bool GetHidden(const base::StringPiece& key, T* out) const {
-     v8::Local<v8::Context> context = isolate_->GetCurrentContext();
-     v8::Local<v8::Private> privateKey =
-         v8::Private::ForApi(isolate_, StringToV8(isolate_, key));
-     v8::Local<v8::Value> value;
-+<<<<<<< .our
-     v8::Maybe<bool> result = GetHandle()->HasPrivate(context, privateKey);
-+=======
-+    v8::Maybe<bool> result =
-+        GetHandle()->HasPrivate(context, privateKey);
-+>>>>>>> .their
-     if (internal::IsTrue(result) &&
-         GetHandle()->GetPrivate(context, privateKey).ToLocal(&value))
-       return ConvertFromV8(isolate_, value, out);
-     return false;
-   }
- 
-+<<<<<<< .our
-   template <typename T>
-+=======
-+  template<typename T>
-+>>>>>>> .their
-   bool Set(const base::StringPiece& key, const T& val) {
-     v8::Local<v8::Value> v8_value;
-     if (!TryConvertToV8(isolate_, val, &v8_value))
-       return false;
-+<<<<<<< .our
-     v8::Maybe<bool> result = GetHandle()->Set(
-         isolate_->GetCurrentContext(), StringToV8(isolate_, key), v8_value);
-     return !result.IsNothing() && result.FromJust();
-   }
- 
-   template <typename T>
-+=======
-+    v8::Maybe<bool> result =
-+        GetHandle()->Set(isolate_->GetCurrentContext(),
-+                         StringToV8(isolate_, key),
-+                         v8_value);
-+    return !result.IsNothing() && result.FromJust();
-+  }
-+
-+  template<typename T>
-+>>>>>>> .their
-   bool SetHidden(const base::StringPiece& key, T val) {
-     v8::Local<v8::Value> v8_value;
-     if (!TryConvertToV8(isolate_, val, &v8_value))
-@@ -91,11 +122,16 @@
-     return !result.IsNothing() && result.FromJust();
-   }
- 
-+<<<<<<< .our
-   template <typename T>
-+=======
-+  template<typename T>
-+>>>>>>> .their
-   bool SetReadOnly(const base::StringPiece& key, T val) {
-     v8::Local<v8::Value> v8_value;
-     if (!TryConvertToV8(isolate_, val, &v8_value))
-       return false;
-+<<<<<<< .our
-     v8::Maybe<bool> result = GetHandle()->DefineOwnProperty(
-         isolate_->GetCurrentContext(), StringToV8(isolate_, key), v8_value,
-         v8::ReadOnly);
-@@ -103,6 +139,17 @@
-   }
- 
-   template <typename T>
-+=======
-+    v8::Maybe<bool> result =
-+        GetHandle()->DefineOwnProperty(isolate_->GetCurrentContext(),
-+                                       StringToV8(isolate_, key),
-+                                       v8_value,
-+                                       v8::ReadOnly);
-+    return !result.IsNothing() && result.FromJust();
-+  }
-+
-+  template<typename T>
-+>>>>>>> .their
-   bool SetMethod(const base::StringPiece& key, const T& callback) {
-     return GetHandle()->Set(
-         StringToV8(isolate_, key),
-@@ -128,9 +175,16 @@
-   v8::Local<v8::Object> object_;
- };
- 
-+<<<<<<< .our
- template <>
- struct Converter<Dictionary> {
-   static v8::Local<v8::Value> ToV8(v8::Isolate* isolate, Dictionary val);
-+=======
-+template<>
-+struct Converter<Dictionary> {
-+  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-+                                    Dictionary val);
-+>>>>>>> .their
-   static bool FromV8(v8::Isolate* isolate,
-                      v8::Local<v8::Value> val,
-                      Dictionary* out);
-added in both
-  our    100644 6a5e5a0253f4f465747fd0a4d96aad2336784d9c native_mate/native_mate/persistent_dictionary.cc
-  their  100644 fd68cdced275ed4848a9b866caea02b50fff8613 native_mate/native_mate/persistent_dictionary.cc
-@@ -6,7 +6,12 @@
- 
- namespace mate {
- 
-+<<<<<<< .our
- PersistentDictionary::PersistentDictionary() {}
-+=======
-+PersistentDictionary::PersistentDictionary() {
-+}
-+>>>>>>> .their
- 
- PersistentDictionary::PersistentDictionary(v8::Isolate* isolate,
-                                            v8::Local<v8::Object> object)
-@@ -14,10 +19,15 @@
-   isolate_ = isolate;
- }
- 
-+<<<<<<< .our
- PersistentDictionary::PersistentDictionary(const PersistentDictionary& other) =
-     default;
- 
- PersistentDictionary::~PersistentDictionary() {}
-+=======
-+PersistentDictionary::~PersistentDictionary() {
-+}
-+>>>>>>> .their
- 
- v8::Local<v8::Object> PersistentDictionary::GetHandle() const {
-   return handle_->NewHandle();
-added in both
-  our    100644 7a83916f1505d53a8694c9d438485177d6cb539e native_mate/native_mate/persistent_dictionary.h
-  their  100644 26c8998632bd80876f5448a86a8f57b25e73801e native_mate/native_mate/persistent_dictionary.h
-@@ -16,16 +16,27 @@
-  public:
-   PersistentDictionary();
-   PersistentDictionary(v8::Isolate* isolate, v8::Local<v8::Object> object);
-+<<<<<<< .our
-   PersistentDictionary(const PersistentDictionary& other);
-   ~PersistentDictionary() override;
-+=======
-+  virtual ~PersistentDictionary();
-+>>>>>>> .their
- 
-   v8::Local<v8::Object> GetHandle() const override;
- 
-  private:
-+<<<<<<< .our
-   scoped_refptr<RefCountedPersistent<v8::Object>> handle_;
- };
- 
- template <>
-+=======
-+  scoped_refptr<RefCountedPersistent<v8::Object> > handle_;
-+};
-+
-+template<>
-+>>>>>>> .their
- struct Converter<PersistentDictionary> {
-   static bool FromV8(v8::Isolate* isolate,
-                      v8::Local<v8::Value> val,
-added in both
-  our    100644 faba6f332e4ac31eb55f08e9a76ae216f0916311 native_mate/native_mate/wrappable.h
-  their  100644 489c5817481b8663ffc2500ec89bf8c1e72dea0e native_mate/native_mate/wrappable.h
-@@ -6,9 +6,15 @@
- #define NATIVE_MATE_WRAPPABLE_H_
- 
- #include "base/bind.h"
-+<<<<<<< .our
- #include "gin/per_isolate_data.h"
- #include "native_mate/constructor.h"
- #include "native_mate/converter.h"
-+=======
-+#include "native_mate/converter.h"
-+#include "native_mate/constructor.h"
-+#include "gin/per_isolate_data.h"
-+>>>>>>> .their
- 
- namespace mate {
- 
-@@ -18,25 +24,42 @@
- 
- }  // namespace internal
- 
-+<<<<<<< .our
- template <typename T>
-+=======
-+template<typename T>
-+>>>>>>> .their
- class Wrappable : public WrappableBase {
-  public:
-   Wrappable() {}
- 
-+<<<<<<< .our
-   template <typename Sig>
-+=======
-+  template<typename Sig>
-+>>>>>>> .their
-   static void SetConstructor(v8::Isolate* isolate,
-                              const base::Callback<Sig>& constructor) {
-     v8::Local<v8::FunctionTemplate> templ = CreateFunctionTemplate(
-         isolate, base::Bind(&internal::InvokeNew<Sig>, constructor));
-     templ->InstanceTemplate()->SetInternalFieldCount(1);
-     T::BuildPrototype(isolate, templ);
-+<<<<<<< .our
-     gin::PerIsolateData::From(isolate)->SetFunctionTemplate(&kWrapperInfo,
-                                                             templ);
-+=======
-+    gin::PerIsolateData::From(isolate)->SetFunctionTemplate(
-+        &kWrapperInfo, templ);
-+>>>>>>> .their
-   }
- 
-   static v8::Local<v8::FunctionTemplate> GetConstructor(v8::Isolate* isolate) {
-     // Fill the object template.
-+<<<<<<< .our
-     auto* data = gin::PerIsolateData::From(isolate);
-+=======
-+    auto data = gin::PerIsolateData::From(isolate);
-+>>>>>>> .their
-     auto templ = data->GetFunctionTemplate(&kWrapperInfo);
-     if (templ.IsEmpty()) {
-       templ = v8::FunctionTemplate::New(isolate);
-@@ -55,9 +78,14 @@
-     // |wrapper| may be empty in some extreme cases, e.g., when
-     // Object.prototype.constructor is overwritten.
-     v8::Local<v8::Object> wrapper;
-+<<<<<<< .our
-     if (!templ->InstanceTemplate()
-              ->NewInstance(isolate->GetCurrentContext())
-              .ToLocal(&wrapper)) {
-+=======
-+    if (!templ->InstanceTemplate()->NewInstance(
-+            isolate->GetCurrentContext()).ToLocal(&wrapper)) {
-+>>>>>>> .their
-       // The current wrappable object will be no longer managed by V8. Delete
-       // this now.
-       delete this;
-@@ -73,8 +101,13 @@
- };
- 
- // static
-+<<<<<<< .our
- template <typename T>
- gin::WrapperInfo Wrappable<T>::kWrapperInfo = {gin::kEmbedderNativeGin};
-+=======
-+template<typename T>
-+gin::WrapperInfo Wrappable<T>::kWrapperInfo = { gin::kEmbedderNativeGin };
-+>>>>>>> .their
- 
- // This converter handles any subclass of Wrappable.
- template <typename T>
-@@ -89,8 +122,13 @@
-   }
- 
-   static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val, T** out) {
-+<<<<<<< .our
-     *out = static_cast<T*>(
-         static_cast<WrappableBase*>(internal::FromV8Impl(isolate, val)));
-+=======
-+    *out = static_cast<T*>(static_cast<WrappableBase*>(
-+        internal::FromV8Impl(isolate, val)));
-+>>>>>>> .their
-     return *out != nullptr;
-   }
- };
-added in both
-  our    100755 ed208de247ef151147c58d9efc4af9519e983f86 npm/install.js
-  their  100755 41052ac07b6fbae10fd64e85097d471c0628063d npm/install.js
-@@ -17,9 +17,13 @@
- 
- var platformPath = getPlatformPath()
- 
-+<<<<<<< .our
- var electronPath = process.env.ELECTRON_OVERRIDE_DIST_PATH || path.join(__dirname, 'dist', platformPath)
- 
- if (installedVersion === version && fs.existsSync(electronPath)) {
-+=======
-+if (installedVersion === version && fs.existsSync(path.join(__dirname, platformPath))) {
-+>>>>>>> .their
-   process.exit(0)
- }
- 
-added in both
-  our    100644 b1d8824658ea05c277e82d1ac6c6febab9c55030 package-lock.json
-  their  100644 740ccefe07491b05045e6163aa6307b974cbd48e package-lock.json
-@@ -1,13 +1,23 @@
- {
-   "name": "electron",
-+<<<<<<< .our
-   "version": "4.0.0-nightly.20180819",
-+=======
-+  "version": "3.0.0-beta.3",
-+>>>>>>> .their
-   "lockfileVersion": 1,
-   "requires": true,
-   "dependencies": {
-     "@types/node": {
-+<<<<<<< .our
-       "version": "7.0.69",
-       "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.69.tgz",
-       "integrity": "sha512-S5NC8HV6HnRipg8nC0j30TPl7ktXjRTKqgyINLNe8K/64UJUI8Lq0sRopXC0hProsV2F5ibj8IqPkl1xpGggrw==",
-+=======
-+      "version": "7.0.68",
-+      "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.68.tgz",
-+      "integrity": "sha512-ym3LNHwJQU0XDyPrTK6NHJTH5YmGKKe0k56in6pg+Wx4HD8fiKrt8xute6/unHvHujCfzmOQTGz1NoEKgFF5Mw==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "JSONStream": {
-@@ -16,8 +26,13 @@
-       "integrity": "sha1-wQI3G27Dp887hHygDCC7D85Mbeo=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "jsonparse": "1.3.1",
-         "through": "2.3.8"
-+=======
-+        "jsonparse": "^1.2.0",
-+        "through": ">=2.2.7 <3"
-+>>>>>>> .their
-       }
-     },
-     "abab": {
-@@ -30,7 +45,11 @@
-     "abbrev": {
-       "version": "1.1.1",
-       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg=",
-+=======
-+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "accepts": {
-@@ -39,7 +58,11 @@
-       "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "mime-types": "2.1.18",
-+=======
-+        "mime-types": "~2.1.18",
-+>>>>>>> .their
-         "negotiator": "0.6.1"
-       }
-     },
-@@ -56,7 +79,11 @@
-       "dev": true,
-       "optional": true,
-       "requires": {
-+<<<<<<< .our
-         "acorn": "2.7.0"
-+=======
-+        "acorn": "^2.1.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "acorn": {
-@@ -74,7 +101,11 @@
-       "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "acorn": "3.3.0"
-+=======
-+        "acorn": "^3.0.4"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "acorn": {
-@@ -91,8 +122,13 @@
-       "integrity": "sha512-efP54n3d1aLfjL2UMdaXa6DsswwzJeI5rqhbFvXMrKiJ6eJFpf+7R0zN7t8IC+XKn2YOAFAv6xbBNgHUkoHWLw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "acorn": "5.5.3",
-         "xtend": "4.0.1"
-+=======
-+        "acorn": "^5.4.1",
-+        "xtend": "^4.0.1"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "acorn": {
-@@ -121,8 +157,13 @@
-       "integrity": "sha1-1t4Q1a9hMtW9aSQn1G/FOFOQlMc=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "extend": "3.0.1",
-         "semver": "5.0.3"
-+=======
-+        "extend": "~3.0.0",
-+        "semver": "~5.0.1"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "semver": {
-@@ -139,10 +180,17 @@
-       "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "co": "4.6.0",
-         "fast-deep-equal": "1.1.0",
-         "fast-json-stable-stringify": "2.0.0",
-         "json-schema-traverse": "0.3.1"
-+=======
-+        "co": "^4.6.0",
-+        "fast-deep-equal": "^1.0.0",
-+        "fast-json-stable-stringify": "^2.0.0",
-+        "json-schema-traverse": "^0.3.0"
-+>>>>>>> .their
-       }
-     },
-     "ajv-keywords": {
-@@ -157,9 +205,15 @@
-       "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "kind-of": "3.2.2",
-         "longest": "1.0.1",
-         "repeat-string": "1.6.1"
-+=======
-+        "kind-of": "^3.0.2",
-+        "longest": "^1.0.1",
-+        "repeat-string": "^1.5.2"
-+>>>>>>> .their
-       }
-     },
-     "amdefine": {
-@@ -174,7 +228,11 @@
-       "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "string-width": "2.1.1"
-+=======
-+        "string-width": "^2.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "ansi-regex": {
-@@ -192,11 +250,19 @@
-         "string-width": {
-           "version": "2.1.1",
-           "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
-           "dev": true,
-           "requires": {
-             "is-fullwidth-code-point": "2.0.0",
-             "strip-ansi": "4.0.0"
-+=======
-+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-+          "dev": true,
-+          "requires": {
-+            "is-fullwidth-code-point": "^2.0.0",
-+            "strip-ansi": "^4.0.0"
-+>>>>>>> .their
-           }
-         },
-         "strip-ansi": {
-@@ -205,7 +271,11 @@
-           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "ansi-regex": "3.0.0"
-+=======
-+            "ansi-regex": "^3.0.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -231,6 +301,7 @@
-     "anymatch": {
-       "version": "1.3.2",
-       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-VT3Lj5HjyImEXf26NMd3IbkLnXo=",
-       "dev": true,
-       "requires": {
-@@ -248,6 +319,19 @@
-       "version": "2.0.0",
-       "resolved": "https://registry.npmjs.org/arg/-/arg-2.0.0.tgz",
-       "integrity": "sha512-XxNTUzKnz1ctK3ZIcI2XUPlD96wbHP2nGqkPKpvk/HNRlPveYrXIVSTk9m3LcqOgDPg3B1nMvdV/K8wZd7PG4w==",
-+=======
-+      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
-+      "dev": true,
-+      "requires": {
-+        "micromatch": "^2.1.5",
-+        "normalize-path": "^2.0.0"
-+      }
-+    },
-+    "arch": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/arch/-/arch-2.1.0.tgz",
-+      "integrity": "sha1-NhOqRhSQZLPB8GB5Gb8dR4boKIk=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "argparse": {
-@@ -256,7 +340,11 @@
-       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "sprintf-js": "1.0.3"
-+=======
-+        "sprintf-js": "~1.0.2"
-+>>>>>>> .their
-       }
-     },
-     "args": {
-@@ -277,7 +365,11 @@
-           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "color-convert": "1.9.1"
-+=======
-+            "color-convert": "^1.9.0"
-+>>>>>>> .their
-           }
-         },
-         "camelcase": {
-@@ -292,9 +384,15 @@
-           "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "ansi-styles": "3.2.1",
-             "escape-string-regexp": "1.0.5",
-             "supports-color": "5.4.0"
-+=======
-+            "ansi-styles": "^3.2.1",
-+            "escape-string-regexp": "^1.0.5",
-+            "supports-color": "^5.3.0"
-+>>>>>>> .their
-           }
-         },
-         "has-flag": {
-@@ -309,7 +407,11 @@
-           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "has-flag": "3.0.0"
-+=======
-+            "has-flag": "^3.0.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -320,13 +422,21 @@
-       "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "arr-flatten": "1.1.0"
-+=======
-+        "arr-flatten": "^1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "arr-flatten": {
-       "version": "1.1.0",
-       "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE=",
-+=======
-+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "array-filter": {
-@@ -371,7 +481,11 @@
-       "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "array-uniq": "1.0.3"
-+=======
-+        "array-uniq": "^1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "array-uniq": {
-@@ -392,8 +506,13 @@
-       "integrity": "sha1-VWpcU2LAhkgyPdrrnenRS8GGTJA=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "define-properties": "1.1.2",
-         "es-abstract": "1.11.0"
-+=======
-+        "define-properties": "^1.1.2",
-+        "es-abstract": "^1.7.0"
-+>>>>>>> .their
-       }
-     },
-     "arrify": {
-@@ -408,6 +527,7 @@
-       "integrity": "sha1-uSbnksMV+MBIxDNx4yWwnJenZGQ=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "chromium-pickle-js": "0.1.0",
-         "commander": "2.15.1",
-         "cuint": "0.2.2",
-@@ -415,6 +535,15 @@
-         "minimatch": "3.0.4",
-         "mkdirp": "0.5.1",
-         "mksnapshot": "0.3.1"
-+=======
-+        "chromium-pickle-js": "^0.1.0",
-+        "commander": "^2.9.0",
-+        "cuint": "^0.2.1",
-+        "glob": "^6.0.4",
-+        "minimatch": "^3.0.0",
-+        "mkdirp": "^0.5.0",
-+        "mksnapshot": "^0.3.0"
-+>>>>>>> .their
-       }
-     },
-     "asn1": {
-@@ -429,9 +558,15 @@
-       "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "bn.js": "4.11.8",
-         "inherits": "2.0.3",
-         "minimalistic-assert": "1.0.1"
-+=======
-+        "bn.js": "^4.0.0",
-+        "inherits": "^2.0.1",
-+        "minimalistic-assert": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "assert": {
-@@ -455,7 +590,11 @@
-       "integrity": "sha1-e9QXhNMkk5h66yOba04cV6hzuRc=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "acorn": "4.0.13"
-+=======
-+        "acorn": "^4.0.3"
-+>>>>>>> .their
-       }
-     },
-     "async": {
-@@ -494,9 +633,15 @@
-       "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "chalk": "1.1.3",
-         "esutils": "2.0.2",
-         "js-tokens": "3.0.2"
-+=======
-+        "chalk": "^1.1.3",
-+        "esutils": "^2.0.2",
-+        "js-tokens": "^3.0.2"
-+>>>>>>> .their
-       }
-     },
-     "bail": {
-@@ -541,7 +686,11 @@
-       "dev": true,
-       "optional": true,
-       "requires": {
-+<<<<<<< .our
-         "tweetnacl": "0.14.5"
-+=======
-+        "tweetnacl": "^0.14.3"
-+>>>>>>> .their
-       }
-     },
-     "binary": {
-@@ -550,8 +699,13 @@
-       "integrity": "sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "buffers": "0.1.1",
-         "chainsaw": "0.1.0"
-+=======
-+        "buffers": "~0.1.1",
-+        "chainsaw": "~0.1.0"
-+>>>>>>> .their
-       }
-     },
-     "binary-extensions": {
-@@ -566,8 +720,13 @@
-       "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "readable-stream": "2.3.6",
-         "safe-buffer": "5.1.2"
-+=======
-+        "readable-stream": "^2.3.5",
-+        "safe-buffer": "^5.1.1"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -582,6 +741,7 @@
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-@@ -589,6 +749,15 @@
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-+=======
-+            "core-util-is": "~1.0.0",
-+            "inherits": "~2.0.3",
-+            "isarray": "~1.0.0",
-+            "process-nextick-args": "~2.0.0",
-+            "safe-buffer": "~5.1.1",
-+            "string_decoder": "~1.1.1",
-+            "util-deprecate": "~1.0.1"
-+>>>>>>> .their
-           }
-         },
-         "string_decoder": {
-@@ -597,7 +766,11 @@
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "safe-buffer": "5.1.2"
-+=======
-+            "safe-buffer": "~5.1.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -611,7 +784,11 @@
-     "bn.js": {
-       "version": "4.11.8",
-       "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-LN4J617jQfSEdGuwMJsyU7GxRC8=",
-+=======
-+      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "boolbase": {
-@@ -626,7 +803,11 @@
-       "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "hoek": "4.2.1"
-+=======
-+        "hoek": "4.x.x"
-+>>>>>>> .their
-       }
-     },
-     "boxen": {
-@@ -635,6 +816,7 @@
-       "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "ansi-align": "2.0.0",
-         "camelcase": "4.1.0",
-         "chalk": "2.4.1",
-@@ -642,6 +824,15 @@
-         "string-width": "2.1.1",
-         "term-size": "1.2.0",
-         "widest-line": "2.0.0"
-+=======
-+        "ansi-align": "^2.0.0",
-+        "camelcase": "^4.0.0",
-+        "chalk": "^2.0.1",
-+        "cli-boxes": "^1.0.0",
-+        "string-width": "^2.0.0",
-+        "term-size": "^1.2.0",
-+        "widest-line": "^2.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "ansi-regex": {
-@@ -656,7 +847,11 @@
-           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "color-convert": "1.9.1"
-+=======
-+            "color-convert": "^1.9.0"
-+>>>>>>> .their
-           }
-         },
-         "camelcase": {
-@@ -671,9 +866,15 @@
-           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "ansi-styles": "3.2.1",
-             "escape-string-regexp": "1.0.5",
-             "supports-color": "5.4.0"
-+=======
-+            "ansi-styles": "^3.2.1",
-+            "escape-string-regexp": "^1.0.5",
-+            "supports-color": "^5.3.0"
-+>>>>>>> .their
-           }
-         },
-         "has-flag": {
-@@ -691,11 +892,19 @@
-         "string-width": {
-           "version": "2.1.1",
-           "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
-           "dev": true,
-           "requires": {
-             "is-fullwidth-code-point": "2.0.0",
-             "strip-ansi": "4.0.0"
-+=======
-+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-+          "dev": true,
-+          "requires": {
-+            "is-fullwidth-code-point": "^2.0.0",
-+            "strip-ansi": "^4.0.0"
-+>>>>>>> .their
-           }
-         },
-         "strip-ansi": {
-@@ -704,7 +913,11 @@
-           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "ansi-regex": "3.0.0"
-+=======
-+            "ansi-regex": "^3.0.0"
-+>>>>>>> .their
-           }
-         },
-         "supports-color": {
-@@ -713,7 +926,11 @@
-           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "has-flag": "3.0.0"
-+=======
-+            "has-flag": "^3.0.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -724,7 +941,11 @@
-       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "balanced-match": "1.0.0",
-+=======
-+        "balanced-match": "^1.0.0",
-+>>>>>>> .their
-         "concat-map": "0.0.1"
-       }
-     },
-@@ -734,9 +955,15 @@
-       "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "expand-range": "1.8.2",
-         "preserve": "0.2.0",
-         "repeat-element": "1.1.2"
-+=======
-+        "expand-range": "^1.8.1",
-+        "preserve": "^0.2.0",
-+        "repeat-element": "^1.1.2"
-+>>>>>>> .their
-       }
-     },
-     "brorand": {
-@@ -751,12 +978,21 @@
-       "integrity": "sha512-erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "JSONStream": "1.3.2",
-         "combine-source-map": "0.8.0",
-         "defined": "1.0.0",
-         "safe-buffer": "5.1.2",
-         "through2": "2.0.3",
-         "umd": "3.0.3"
-+=======
-+        "JSONStream": "^1.0.3",
-+        "combine-source-map": "~0.8.0",
-+        "defined": "^1.0.0",
-+        "safe-buffer": "^5.1.1",
-+        "through2": "^2.0.0",
-+        "umd": "^3.0.0"
-+>>>>>>> .their
-       }
-     },
-     "browser-resolve": {
-@@ -782,6 +1018,7 @@
-       "integrity": "sha1-tanJAgJD8McORnW+yCI7xifkFc4=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "JSONStream": "1.3.2",
-         "assert": "1.4.1",
-         "browser-pack": "6.1.0",
-@@ -829,11 +1066,61 @@
-         "util": "0.10.3",
-         "vm-browserify": "0.0.4",
-         "xtend": "4.0.1"
-+=======
-+        "JSONStream": "^1.0.3",
-+        "assert": "^1.4.0",
-+        "browser-pack": "^6.0.1",
-+        "browser-resolve": "^1.11.0",
-+        "browserify-zlib": "~0.1.2",
-+        "buffer": "^4.1.0",
-+        "cached-path-relative": "^1.0.0",
-+        "concat-stream": "~1.5.1",
-+        "console-browserify": "^1.1.0",
-+        "constants-browserify": "~1.0.0",
-+        "crypto-browserify": "^3.0.0",
-+        "defined": "^1.0.0",
-+        "deps-sort": "^2.0.0",
-+        "domain-browser": "~1.1.0",
-+        "duplexer2": "~0.1.2",
-+        "events": "~1.1.0",
-+        "glob": "^7.1.0",
-+        "has": "^1.0.0",
-+        "htmlescape": "^1.1.0",
-+        "https-browserify": "~0.0.0",
-+        "inherits": "~2.0.1",
-+        "insert-module-globals": "^7.0.0",
-+        "labeled-stream-splicer": "^2.0.0",
-+        "module-deps": "^4.0.8",
-+        "os-browserify": "~0.1.1",
-+        "parents": "^1.0.1",
-+        "path-browserify": "~0.0.0",
-+        "process": "~0.11.0",
-+        "punycode": "^1.3.2",
-+        "querystring-es3": "~0.2.0",
-+        "read-only-stream": "^2.0.0",
-+        "readable-stream": "^2.0.2",
-+        "resolve": "^1.1.4",
-+        "shasum": "^1.0.0",
-+        "shell-quote": "^1.6.1",
-+        "stream-browserify": "^2.0.0",
-+        "stream-http": "^2.0.0",
-+        "string_decoder": "~0.10.0",
-+        "subarg": "^1.0.0",
-+        "syntax-error": "^1.1.1",
-+        "through2": "^2.0.0",
-+        "timers-browserify": "^1.0.1",
-+        "tty-browserify": "~0.0.0",
-+        "url": "~0.11.0",
-+        "util": "~0.10.1",
-+        "vm-browserify": "~0.0.1",
-+        "xtend": "^4.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-           "dev": true,
-           "requires": {
-@@ -843,6 +1130,17 @@
-             "minimatch": "3.0.4",
-             "once": "1.4.0",
-             "path-is-absolute": "1.0.1"
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+          "dev": true,
-+          "requires": {
-+            "fs.realpath": "^1.0.0",
-+            "inflight": "^1.0.4",
-+            "inherits": "2",
-+            "minimatch": "^3.0.4",
-+            "once": "^1.3.0",
-+            "path-is-absolute": "^1.0.0"
-+>>>>>>> .their
-           }
-         },
-         "isarray": {
-@@ -857,6 +1155,7 @@
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-@@ -864,6 +1163,15 @@
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-+=======
-+            "core-util-is": "~1.0.0",
-+            "inherits": "~2.0.3",
-+            "isarray": "~1.0.0",
-+            "process-nextick-args": "~2.0.0",
-+            "safe-buffer": "~5.1.1",
-+            "string_decoder": "~1.1.1",
-+            "util-deprecate": "~1.0.1"
-+>>>>>>> .their
-           },
-           "dependencies": {
-             "string_decoder": {
-@@ -872,7 +1180,11 @@
-               "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-               "dev": true,
-               "requires": {
-+<<<<<<< .our
-                 "safe-buffer": "5.1.2"
-+=======
-+                "safe-buffer": "~5.1.0"
-+>>>>>>> .their
-               }
-             }
-           }
-@@ -885,12 +1197,21 @@
-       "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "buffer-xor": "1.0.3",
-         "cipher-base": "1.0.4",
-         "create-hash": "1.2.0",
-         "evp_bytestokey": "1.0.3",
-         "inherits": "2.0.3",
-         "safe-buffer": "5.1.2"
-+=======
-+        "buffer-xor": "^1.0.3",
-+        "cipher-base": "^1.0.0",
-+        "create-hash": "^1.1.0",
-+        "evp_bytestokey": "^1.0.3",
-+        "inherits": "^2.0.1",
-+        "safe-buffer": "^5.0.1"
-+>>>>>>> .their
-       }
-     },
-     "browserify-cipher": {
-@@ -899,9 +1220,15 @@
-       "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "browserify-aes": "1.2.0",
-         "browserify-des": "1.0.1",
-         "evp_bytestokey": "1.0.3"
-+=======
-+        "browserify-aes": "^1.0.4",
-+        "browserify-des": "^1.0.0",
-+        "evp_bytestokey": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "browserify-des": {
-@@ -910,9 +1237,15 @@
-       "integrity": "sha512-zy0Cobe3hhgpiOM32Tj7KQ3Vl91m0njwsjzZQK1L+JDf11dzP9qIvjreVinsvXrgfjhStXwUWAEpB9D7Gwmayw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "cipher-base": "1.0.4",
-         "des.js": "1.0.0",
-         "inherits": "2.0.3"
-+=======
-+        "cipher-base": "^1.0.1",
-+        "des.js": "^1.0.0",
-+        "inherits": "^2.0.1"
-+>>>>>>> .their
-       }
-     },
-     "browserify-rsa": {
-@@ -921,8 +1254,13 @@
-       "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "bn.js": "4.11.8",
-         "randombytes": "2.0.6"
-+=======
-+        "bn.js": "^4.1.0",
-+        "randombytes": "^2.0.1"
-+>>>>>>> .their
-       }
-     },
-     "browserify-sign": {
-@@ -931,6 +1269,7 @@
-       "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "bn.js": "4.11.8",
-         "browserify-rsa": "4.0.1",
-         "create-hash": "1.2.0",
-@@ -938,6 +1277,15 @@
-         "elliptic": "6.4.0",
-         "inherits": "2.0.3",
-         "parse-asn1": "5.1.1"
-+=======
-+        "bn.js": "^4.1.1",
-+        "browserify-rsa": "^4.0.0",
-+        "create-hash": "^1.1.0",
-+        "create-hmac": "^1.1.2",
-+        "elliptic": "^6.0.0",
-+        "inherits": "^2.0.1",
-+        "parse-asn1": "^5.0.0"
-+>>>>>>> .their
-       }
-     },
-     "browserify-zlib": {
-@@ -946,7 +1294,11 @@
-       "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "pako": "0.2.9"
-+=======
-+        "pako": "~0.2.0"
-+>>>>>>> .their
-       }
-     },
-     "buffer": {
-@@ -955,9 +1307,15 @@
-       "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "base64-js": "1.3.0",
-         "ieee754": "1.1.11",
-         "isarray": "1.0.0"
-+=======
-+        "base64-js": "^1.0.2",
-+        "ieee754": "^1.1.4",
-+        "isarray": "^1.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -974,8 +1332,13 @@
-       "integrity": "sha1-BVFNM78WVtNUDGhPZbEgLpDsowM=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "buffer-alloc-unsafe": "0.1.1",
-         "buffer-fill": "0.1.1"
-+=======
-+        "buffer-alloc-unsafe": "^0.1.0",
-+        "buffer-fill": "^0.1.0"
-+>>>>>>> .their
-       }
-     },
-     "buffer-alloc-unsafe": {
-@@ -1038,7 +1401,11 @@
-       "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "callsites": "0.2.0"
-+=======
-+        "callsites": "^0.2.0"
-+>>>>>>> .their
-       }
-     },
-     "callsites": {
-@@ -1060,9 +1427,15 @@
-       "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "camelcase": "4.1.0",
-         "map-obj": "2.0.0",
-         "quick-lru": "1.1.0"
-+=======
-+        "camelcase": "^4.1.0",
-+        "map-obj": "^2.0.0",
-+        "quick-lru": "^1.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "camelcase": {
-@@ -1098,8 +1471,13 @@
-       "dev": true,
-       "optional": true,
-       "requires": {
-+<<<<<<< .our
-         "align-text": "0.1.4",
-         "lazy-cache": "1.0.4"
-+=======
-+        "align-text": "^0.1.3",
-+        "lazy-cache": "^1.0.3"
-+>>>>>>> .their
-       }
-     },
-     "chainsaw": {
-@@ -1108,7 +1486,11 @@
-       "integrity": "sha1-XqtQsor+WAdNDVgpE4iCi15fvJg=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "traverse": "0.3.9"
-+=======
-+        "traverse": ">=0.3.0 <0.4"
-+>>>>>>> .their
-       }
-     },
-     "chalk": {
-@@ -1117,11 +1499,19 @@
-       "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "ansi-styles": "2.2.1",
-         "escape-string-regexp": "1.0.5",
-         "has-ansi": "2.0.0",
-         "strip-ansi": "3.0.1",
-         "supports-color": "2.0.0"
-+=======
-+        "ansi-styles": "^2.2.1",
-+        "escape-string-regexp": "^1.0.2",
-+        "has-ansi": "^2.0.0",
-+        "strip-ansi": "^3.0.0",
-+        "supports-color": "^2.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "supports-color": {
-@@ -1159,6 +1549,7 @@
-     "check-for-leaks": {
-       "version": "1.2.0",
-       "resolved": "https://registry.npmjs.org/check-for-leaks/-/check-for-leaks-1.2.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-6jtQFk6XV3kzLGKBMZX/jGr4Jsw=",
-       "dev": true,
-       "requires": {
-@@ -1166,6 +1557,15 @@
-         "minimist": "1.2.0",
-         "parse-gitignore": "0.4.0",
-         "walk-sync": "0.3.2"
-+=======
-+      "integrity": "sha512-bJ2Bzo6RtsYqamMnsjtVzowGvBNVrR5IPK8Bd+lx5W1TNgOKMsF+AyNHVkqFqO7cpDZNfny5SaqH6gEovpV5Gw==",
-+      "dev": true,
-+      "requires": {
-+        "anymatch": "^1.3.0",
-+        "minimist": "^1.2.0",
-+        "parse-gitignore": "^0.4.0",
-+        "walk-sync": "^0.3.2"
-+>>>>>>> .their
-       }
-     },
-     "checksum": {
-@@ -1174,7 +1574,11 @@
-       "integrity": "sha1-3GUn1MkL6FYNvR7Uzs8yl9Uo6ek=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "optimist": "0.3.7"
-+=======
-+        "optimist": "~0.3.5"
-+>>>>>>> .their
-       }
-     },
-     "cheerio": {
-@@ -1183,6 +1587,7 @@
-       "integrity": "sha1-qbqoYKP5tZWmuBsahocxIe06Jp4=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "css-select": "1.2.0",
-         "dom-serializer": "0.1.0",
-         "entities": "1.1.1",
-@@ -1199,6 +1604,24 @@
-         "lodash.reduce": "4.6.0",
-         "lodash.reject": "4.6.0",
-         "lodash.some": "4.6.0"
-+=======
-+        "css-select": "~1.2.0",
-+        "dom-serializer": "~0.1.0",
-+        "entities": "~1.1.1",
-+        "htmlparser2": "^3.9.1",
-+        "lodash.assignin": "^4.0.9",
-+        "lodash.bind": "^4.1.4",
-+        "lodash.defaults": "^4.0.1",
-+        "lodash.filter": "^4.4.0",
-+        "lodash.flatten": "^4.2.0",
-+        "lodash.foreach": "^4.3.0",
-+        "lodash.map": "^4.4.0",
-+        "lodash.merge": "^4.4.0",
-+        "lodash.pick": "^4.2.1",
-+        "lodash.reduce": "^4.4.0",
-+        "lodash.reject": "^4.4.0",
-+        "lodash.some": "^4.4.0"
-+>>>>>>> .their
-       }
-     },
-     "chokidar": {
-@@ -1207,6 +1630,7 @@
-       "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "anymatch": "1.3.2",
-         "async-each": "1.0.1",
-         "fsevents": "1.2.4",
-@@ -1216,6 +1640,17 @@
-         "is-glob": "2.0.1",
-         "path-is-absolute": "1.0.1",
-         "readdirp": "2.1.0"
-+=======
-+        "anymatch": "^1.3.0",
-+        "async-each": "^1.0.0",
-+        "fsevents": "^1.0.0",
-+        "glob-parent": "^2.0.0",
-+        "inherits": "^2.0.1",
-+        "is-binary-path": "^1.0.0",
-+        "is-glob": "^2.0.0",
-+        "path-is-absolute": "^1.0.0",
-+        "readdirp": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "chownr": {
-@@ -1239,17 +1674,29 @@
-     "cipher-base": {
-       "version": "1.0.4",
-       "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-h2Dk7MJy9MNjUy+SbYdKriwTl94=",
-       "dev": true,
-       "requires": {
-         "inherits": "2.0.3",
-         "safe-buffer": "5.1.2"
-+=======
-+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-+      "dev": true,
-+      "requires": {
-+        "inherits": "^2.0.1",
-+        "safe-buffer": "^5.0.1"
-+>>>>>>> .their
-       }
-     },
-     "circular-json": {
-       "version": "0.3.3",
-       "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-gVyZ6oT2gJUp0vRXkb34JxE1LWY=",
-+=======
-+      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "clang-format": {
-@@ -1258,9 +1705,15 @@
-       "integrity": "sha512-x90Hac4ERacGDcZSvHKK58Ga0STuMD+Doi5g0iG2zf7wlJef5Huvhs/3BvMRFxwRYyYSdl6mpQNrtfMxE8MQzw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "async": "1.5.2",
-         "glob": "7.1.2",
-         "resolve": "1.7.1"
-+=======
-+        "async": "^1.5.2",
-+        "glob": "^7.0.0",
-+        "resolve": "^1.1.6"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "glob": {
-@@ -1269,12 +1722,21 @@
-           "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "fs.realpath": "1.0.0",
-             "inflight": "1.0.6",
-             "inherits": "2.0.3",
-             "minimatch": "3.0.4",
-             "once": "1.4.0",
-             "path-is-absolute": "1.0.1"
-+=======
-+            "fs.realpath": "^1.0.0",
-+            "inflight": "^1.0.4",
-+            "inherits": "2",
-+            "minimatch": "^3.0.4",
-+            "once": "^1.3.0",
-+            "path-is-absolute": "^1.0.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -1285,9 +1747,15 @@
-       "integrity": "sha1-d83ZTmsmZkTw95Cy9XbL7wOOJ8E=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "lodash.isempty": "4.4.0",
-         "lodash.isplainobject": "4.0.6",
-         "lodash.transform": "4.6.0"
-+=======
-+        "lodash.isempty": "^4.4.0",
-+        "lodash.isplainobject": "^4.0.6",
-+        "lodash.transform": "^4.6.0"
-+>>>>>>> .their
-       }
-     },
-     "cli-boxes": {
-@@ -1302,7 +1770,11 @@
-       "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "restore-cursor": "1.0.1"
-+=======
-+        "restore-cursor": "^1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "cli-spinners": {
-@@ -1323,8 +1795,13 @@
-       "integrity": "sha512-2WNImOvCRe6r63Gk9pShfkwXsVtKCroMAevIbiae021mS850UkWPbevxsBz3tnvjZIEGvlwaqCPsw+4ulzNgJA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "arch": "2.1.1",
-         "execa": "0.8.0"
-+=======
-+        "arch": "^2.1.0",
-+        "execa": "^0.8.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "execa": {
-@@ -1333,6 +1810,7 @@
-           "integrity": "sha1-2NdrvBtVIX7RkP1t1J08d07PyNo=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "cross-spawn": "5.1.0",
-             "get-stream": "3.0.0",
-             "is-stream": "1.1.0",
-@@ -1340,6 +1818,15 @@
-             "p-finally": "1.0.0",
-             "signal-exit": "3.0.2",
-             "strip-eof": "1.0.0"
-+=======
-+            "cross-spawn": "^5.0.1",
-+            "get-stream": "^3.0.0",
-+            "is-stream": "^1.1.0",
-+            "npm-run-path": "^2.0.0",
-+            "p-finally": "^1.0.0",
-+            "signal-exit": "^3.0.0",
-+            "strip-eof": "^1.0.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -1351,8 +1838,13 @@
-       "dev": true,
-       "optional": true,
-       "requires": {
-+<<<<<<< .our
-         "center-align": "0.1.3",
-         "right-align": "0.1.3",
-+=======
-+        "center-align": "^0.1.1",
-+        "right-align": "^0.1.1",
-+>>>>>>> .their
-         "wordwrap": "0.0.2"
-       },
-       "dependencies": {
-@@ -1389,7 +1881,11 @@
-       "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "color-name": "1.1.3"
-+=======
-+        "color-name": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "color-name": {
-@@ -1410,10 +1906,17 @@
-       "integrity": "sha1-pY0N8ELBhvz4IqjoAV9UUNLXmos=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "convert-source-map": "1.1.3",
-         "inline-source-map": "0.6.2",
-         "lodash.memoize": "3.0.4",
-         "source-map": "0.5.7"
-+=======
-+        "convert-source-map": "~1.1.0",
-+        "inline-source-map": "~0.6.0",
-+        "lodash.memoize": "~3.0.3",
-+        "source-map": "~0.5.3"
-+>>>>>>> .their
-       }
-     },
-     "combined-stream": {
-@@ -1422,7 +1925,11 @@
-       "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "delayed-stream": "1.0.0"
-+=======
-+        "delayed-stream": "~1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "commander": {
-@@ -1437,6 +1944,7 @@
-       "integrity": "sha1-md0LpFfh+bxyKxLAjsM+6rMfpkg=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "array-ify": "1.0.0",
-         "dot-prop": "3.0.0"
-       }
-@@ -1471,6 +1979,42 @@
-         "on-headers": "1.0.1",
-         "safe-buffer": "5.1.2",
-         "vary": "1.1.2"
-+=======
-+        "array-ify": "^1.0.0",
-+        "dot-prop": "^3.0.0"
-+      }
-+    },
-+    "compressible": {
-+      "version": "2.0.13",
-+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.13.tgz",
-+      "integrity": "sha1-DRAgq5JLL9tNYnmHXH1tq6a6p6k=",
-+      "dev": true,
-+      "requires": {
-+        "mime-db": ">= 1.33.0 < 2"
-+      }
-+    },
-+    "compression": {
-+      "version": "1.7.2",
-+      "resolved": "http://registry.npmjs.org/compression/-/compression-1.7.2.tgz",
-+      "integrity": "sha1-qv+81qr4VLROuygDU9WtFlH1mmk=",
-+      "dev": true,
-+      "requires": {
-+        "accepts": "~1.3.4",
-+        "bytes": "3.0.0",
-+        "compressible": "~2.0.13",
-+        "debug": "2.6.9",
-+        "on-headers": "~1.0.1",
-+        "safe-buffer": "5.1.1",
-+        "vary": "~1.1.2"
-+      },
-+      "dependencies": {
-+        "safe-buffer": {
-+          "version": "5.1.1",
-+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-+          "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
-+          "dev": true
-+        }
-+>>>>>>> .their
-       }
-     },
-     "concat-map": {
-@@ -1485,9 +2029,15 @@
-       "integrity": "sha1-cIl4Yk2FavQaWnQd790mHadSwmY=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "inherits": "2.0.3",
-         "readable-stream": "2.0.6",
-         "typedarray": "0.0.6"
-+=======
-+        "inherits": "~2.0.1",
-+        "readable-stream": "~2.0.0",
-+        "typedarray": "~0.0.5"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -1508,12 +2058,21 @@
-           "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-             "process-nextick-args": "1.0.7",
-             "string_decoder": "0.10.31",
-             "util-deprecate": "1.0.2"
-+=======
-+            "core-util-is": "~1.0.0",
-+            "inherits": "~2.0.1",
-+            "isarray": "~1.0.0",
-+            "process-nextick-args": "~1.0.6",
-+            "string_decoder": "~0.10.x",
-+            "util-deprecate": "~1.0.1"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -1524,21 +2083,37 @@
-       "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "dot-prop": "4.2.0",
-         "graceful-fs": "4.1.11",
-         "make-dir": "1.3.0",
-         "unique-string": "1.0.0",
-         "write-file-atomic": "2.3.0",
-         "xdg-basedir": "3.0.0"
-+=======
-+        "dot-prop": "^4.1.0",
-+        "graceful-fs": "^4.1.2",
-+        "make-dir": "^1.0.0",
-+        "unique-string": "^1.0.0",
-+        "write-file-atomic": "^2.0.0",
-+        "xdg-basedir": "^3.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "dot-prop": {
-           "version": "4.2.0",
-           "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-HxngwuGqDjJ5fEl5nyg3rGr2nFc=",
-           "dev": true,
-           "requires": {
-             "is-obj": "1.0.1"
-+=======
-+          "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
-+          "dev": true,
-+          "requires": {
-+            "is-obj": "^1.0.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -1549,7 +2124,11 @@
-       "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "date-now": "0.1.4"
-+=======
-+        "date-now": "^0.1.4"
-+>>>>>>> .their
-       }
-     },
-     "constants-browserify": {
-@@ -1576,6 +2155,7 @@
-       "integrity": "sha512-2WcSUst4Y3Z4hHvoMTWXMJr/DmgVdLiMOVY1Kak2LfFz+GIz2KDp5naqbFesYbfXPmaZ5p491dO0FWZIJoJw1Q==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "conventional-changelog-angular": "1.6.6",
-         "conventional-changelog-atom": "0.2.8",
-         "conventional-changelog-codemirror": "0.3.8",
-@@ -1587,6 +2167,19 @@
-         "conventional-changelog-jscs": "0.1.0",
-         "conventional-changelog-jshint": "0.3.8",
-         "conventional-changelog-preset-loader": "1.1.8"
-+=======
-+        "conventional-changelog-angular": "^1.6.6",
-+        "conventional-changelog-atom": "^0.2.8",
-+        "conventional-changelog-codemirror": "^0.3.8",
-+        "conventional-changelog-core": "^2.0.11",
-+        "conventional-changelog-ember": "^0.3.12",
-+        "conventional-changelog-eslint": "^1.0.9",
-+        "conventional-changelog-express": "^0.3.6",
-+        "conventional-changelog-jquery": "^0.1.0",
-+        "conventional-changelog-jscs": "^0.1.0",
-+        "conventional-changelog-jshint": "^0.3.8",
-+        "conventional-changelog-preset-loader": "^1.1.8"
-+>>>>>>> .their
-       }
-     },
-     "conventional-changelog-angular": {
-@@ -1595,8 +2188,13 @@
-       "integrity": "sha512-suQnFSqCxRwyBxY68pYTsFkG0taIdinHLNEAX5ivtw8bCRnIgnpvcHmlR/yjUyZIrNPYAoXlY1WiEKWgSE4BNg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "compare-func": "1.3.2",
-         "q": "1.5.1"
-+=======
-+        "compare-func": "^1.3.1",
-+        "q": "^1.5.1"
-+>>>>>>> .their
-       }
-     },
-     "conventional-changelog-atom": {
-@@ -1605,7 +2203,11 @@
-       "integrity": "sha512-8pPZqhMbrnltNBizjoDCb/Sz85KyUXNDQxuAEYAU5V/eHn0okMBVjqc8aHWYpHrytyZWvMGbayOlDv7i8kEf6g==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "q": "1.5.1"
-+=======
-+        "q": "^1.5.1"
-+>>>>>>> .their
-       }
-     },
-     "conventional-changelog-cli": {
-@@ -1614,11 +2216,19 @@
-       "integrity": "sha512-pnjdIJbxjkZ5VdAX/H1wndr1G10CY8MuZgnXuJhIHglOXfIrXygb7KZC836GW9uo1u8PjEIvIw/bKX0lOmOzZg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "add-stream": "1.0.0",
-         "conventional-changelog": "1.1.24",
-         "lodash": "4.17.10",
-         "meow": "4.0.1",
-         "tempfile": "1.1.1"
-+=======
-+        "add-stream": "^1.0.0",
-+        "conventional-changelog": "^1.1.24",
-+        "lodash": "^4.2.1",
-+        "meow": "^4.0.0",
-+        "tempfile": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "conventional-changelog-codemirror": {
-@@ -1627,7 +2237,11 @@
-       "integrity": "sha512-3HFZKtBXTaUCHvz7ai6nk2+psRIkldDoNzCsom0egDtVmPsvvHZkzjynhdQyULfacRSsBTaiQ0ol6nBOL4dDiQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "q": "1.5.1"
-+=======
-+        "q": "^1.5.1"
-+>>>>>>> .their
-       }
-     },
-     "conventional-changelog-core": {
-@@ -1636,6 +2250,7 @@
-       "integrity": "sha512-HvTE6RlqeEZ/NFPtQeFLsIDOLrGP3bXYr7lFLMhCVsbduF1MXIe8OODkwMFyo1i9ku9NWBwVnVn0jDmIFXjDRg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "conventional-changelog-writer": "3.0.9",
-         "conventional-commits-parser": "2.1.7",
-         "dateformat": "3.0.3",
-@@ -1649,6 +2264,21 @@
-         "read-pkg": "1.1.0",
-         "read-pkg-up": "1.0.1",
-         "through2": "2.0.3"
-+=======
-+        "conventional-changelog-writer": "^3.0.9",
-+        "conventional-commits-parser": "^2.1.7",
-+        "dateformat": "^3.0.0",
-+        "get-pkg-repo": "^1.0.0",
-+        "git-raw-commits": "^1.3.6",
-+        "git-remote-origin-url": "^2.0.0",
-+        "git-semver-tags": "^1.3.6",
-+        "lodash": "^4.2.1",
-+        "normalize-package-data": "^2.3.5",
-+        "q": "^1.5.1",
-+        "read-pkg": "^1.1.0",
-+        "read-pkg-up": "^1.0.1",
-+        "through2": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "conventional-changelog-ember": {
-@@ -1657,7 +2287,11 @@
-       "integrity": "sha512-mmJzA7uzbrOqeF89dMMi6z17O07ORTXlTMArnLG9ZTX4oLaKNolUlxFUFlFm9JUoVWajVpaHQWjxH1EOQ+ARoQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "q": "1.5.1"
-+=======
-+        "q": "^1.5.1"
-+>>>>>>> .their
-       }
-     },
-     "conventional-changelog-eslint": {
-@@ -1666,7 +2300,11 @@
-       "integrity": "sha512-h87nfVh2fdk9fJIvz26wCBsbDC/KxqCc5wSlNMZbXcARtbgNbNDIF7Y7ctokFdnxkzVdaHsbINkh548T9eBA7Q==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "q": "1.5.1"
-+=======
-+        "q": "^1.5.1"
-+>>>>>>> .their
-       }
-     },
-     "conventional-changelog-express": {
-@@ -1675,7 +2313,11 @@
-       "integrity": "sha512-3iWVtBJZ9RnRnZveNDzOD8QRn6g6vUif0qVTWWyi5nUIAbuN1FfPVyKdAlJJfp5Im+dE8Kiy/d2SpaX/0X678Q==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "q": "1.5.1"
-+=======
-+        "q": "^1.5.1"
-+>>>>>>> .their
-       }
-     },
-     "conventional-changelog-jquery": {
-@@ -1684,7 +2326,11 @@
-       "integrity": "sha1-Agg5cWLjhGmG5xJztsecW1+A9RA=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "q": "1.5.1"
-+=======
-+        "q": "^1.4.1"
-+>>>>>>> .their
-       }
-     },
-     "conventional-changelog-jscs": {
-@@ -1693,7 +2339,11 @@
-       "integrity": "sha1-BHnrRDzH1yxYvwvPDvHURKkvDlw=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "q": "1.5.1"
-+=======
-+        "q": "^1.4.1"
-+>>>>>>> .their
-       }
-     },
-     "conventional-changelog-jshint": {
-@@ -1702,8 +2352,13 @@
-       "integrity": "sha512-hn9QU4ZI/5V50wKPJNPGT4gEWgiBFpV6adieILW4MaUFynuDYOvQ71EMSj3EznJyKi/KzuXpc9dGmX8njZMjig==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "compare-func": "1.3.2",
-         "q": "1.5.1"
-+=======
-+        "compare-func": "^1.3.1",
-+        "q": "^1.5.1"
-+>>>>>>> .their
-       }
-     },
-     "conventional-changelog-preset-loader": {
-@@ -1718,6 +2373,7 @@
-       "integrity": "sha512-n9KbsxlJxRQsUnK6wIBRnARacvNnN4C/nxnxCkH+B/R1JS2Fa+DiP1dU4I59mEDEjgnFaN2+9wr1P1s7GYB5/Q==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "compare-func": "1.3.2",
-         "conventional-commits-filter": "1.1.6",
-         "dateformat": "3.0.3",
-@@ -1728,6 +2384,18 @@
-         "semver": "5.5.0",
-         "split": "1.0.1",
-         "through2": "2.0.3"
-+=======
-+        "compare-func": "^1.3.1",
-+        "conventional-commits-filter": "^1.1.6",
-+        "dateformat": "^3.0.0",
-+        "handlebars": "^4.0.2",
-+        "json-stringify-safe": "^5.0.1",
-+        "lodash": "^4.2.1",
-+        "meow": "^4.0.0",
-+        "semver": "^5.5.0",
-+        "split": "^1.0.0",
-+        "through2": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "conventional-commits-filter": {
-@@ -1736,8 +2404,13 @@
-       "integrity": "sha512-KcDgtCRKJCQhyk6VLT7zR+ZOyCnerfemE/CsR3iQpzRRFbLEs0Y6rwk3mpDvtOh04X223z+1xyJ582Stfct/0Q==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "is-subset": "0.1.1",
-         "modify-values": "1.0.1"
-+=======
-+        "is-subset": "^0.1.1",
-+        "modify-values": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "conventional-commits-parser": {
-@@ -1746,6 +2419,7 @@
-       "integrity": "sha512-BoMaddIEJ6B4QVMSDu9IkVImlGOSGA1I2BQyOZHeLQ6qVOJLcLKn97+fL6dGbzWEiqDzfH4OkcveULmeq2MHFQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "JSONStream": "1.3.2",
-         "is-text-path": "1.0.1",
-         "lodash": "4.17.10",
-@@ -1753,6 +2427,15 @@
-         "split2": "2.2.0",
-         "through2": "2.0.3",
-         "trim-off-newlines": "1.0.1"
-+=======
-+        "JSONStream": "^1.0.4",
-+        "is-text-path": "^1.0.0",
-+        "lodash": "^4.2.1",
-+        "meow": "^4.0.0",
-+        "split2": "^2.0.0",
-+        "through2": "^2.0.0",
-+        "trim-off-newlines": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "convert-source-map": {
-@@ -1773,8 +2456,13 @@
-       "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "bn.js": "4.11.8",
-         "elliptic": "6.4.0"
-+=======
-+        "bn.js": "^4.1.0",
-+        "elliptic": "^6.0.0"
-+>>>>>>> .their
-       }
-     },
-     "create-error-class": {
-@@ -1783,7 +2471,11 @@
-       "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "capture-stack-trace": "1.0.0"
-+=======
-+        "capture-stack-trace": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "create-hash": {
-@@ -1792,11 +2484,19 @@
-       "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "cipher-base": "1.0.4",
-         "inherits": "2.0.3",
-         "md5.js": "1.3.4",
-         "ripemd160": "2.0.2",
-         "sha.js": "2.4.11"
-+=======
-+        "cipher-base": "^1.0.1",
-+        "inherits": "^2.0.1",
-+        "md5.js": "^1.3.4",
-+        "ripemd160": "^2.0.1",
-+        "sha.js": "^2.4.0"
-+>>>>>>> .their
-       }
-     },
-     "create-hmac": {
-@@ -1805,12 +2505,21 @@
-       "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "cipher-base": "1.0.4",
-         "create-hash": "1.2.0",
-         "inherits": "2.0.3",
-         "ripemd160": "2.0.2",
-         "safe-buffer": "5.1.2",
-         "sha.js": "2.4.11"
-+=======
-+        "cipher-base": "^1.0.3",
-+        "create-hash": "^1.1.0",
-+        "inherits": "^2.0.1",
-+        "ripemd160": "^2.0.0",
-+        "safe-buffer": "^5.0.1",
-+        "sha.js": "^2.4.8"
-+>>>>>>> .their
-       }
-     },
-     "cross-spawn": {
-@@ -1819,9 +2528,15 @@
-       "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "lru-cache": "4.1.3",
-         "shebang-command": "1.2.0",
-         "which": "1.3.0"
-+=======
-+        "lru-cache": "^4.0.1",
-+        "shebang-command": "^1.2.0",
-+        "which": "^1.2.9"
-+>>>>>>> .their
-       }
-     },
-     "cryptiles": {
-@@ -1830,16 +2545,27 @@
-       "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "boom": "5.2.0"
-+=======
-+        "boom": "5.x.x"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "boom": {
-           "version": "5.2.0",
-           "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-XdnabuOl8wIHdDYpDLcX0/SlTgI=",
-           "dev": true,
-           "requires": {
-             "hoek": "4.2.1"
-+=======
-+          "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
-+          "dev": true,
-+          "requires": {
-+            "hoek": "4.x.x"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -1850,6 +2576,7 @@
-       "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "browserify-cipher": "1.0.1",
-         "browserify-sign": "4.0.4",
-         "create-ecdh": "4.0.3",
-@@ -1861,6 +2588,19 @@
-         "public-encrypt": "4.0.2",
-         "randombytes": "2.0.6",
-         "randomfill": "1.0.4"
-+=======
-+        "browserify-cipher": "^1.0.0",
-+        "browserify-sign": "^4.0.0",
-+        "create-ecdh": "^4.0.0",
-+        "create-hash": "^1.1.0",
-+        "create-hmac": "^1.1.0",
-+        "diffie-hellman": "^5.0.0",
-+        "inherits": "^2.0.1",
-+        "pbkdf2": "^3.0.3",
-+        "public-encrypt": "^4.0.0",
-+        "randombytes": "^2.0.0",
-+        "randomfill": "^1.0.3"
-+>>>>>>> .their
-       }
-     },
-     "crypto-random-string": {
-@@ -1875,10 +2615,17 @@
-       "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "boolbase": "1.0.0",
-         "css-what": "2.1.0",
-         "domutils": "1.5.1",
-         "nth-check": "1.0.1"
-+=======
-+        "boolbase": "~1.0.0",
-+        "css-what": "2.1",
-+        "domutils": "1.5.1",
-+        "nth-check": "~1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "css-what": {
-@@ -1900,7 +2647,11 @@
-       "dev": true,
-       "optional": true,
-       "requires": {
-+<<<<<<< .our
-         "cssom": "0.3.2"
-+=======
-+        "cssom": "0.3.x"
-+>>>>>>> .their
-       }
-     },
-     "cuint": {
-@@ -1915,7 +2666,11 @@
-       "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "array-find-index": "1.0.2"
-+=======
-+        "array-find-index": "^1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "d": {
-@@ -1924,7 +2679,11 @@
-       "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "es5-ext": "0.10.42"
-+=======
-+        "es5-ext": "^0.10.9"
-+>>>>>>> .their
-       }
-     },
-     "dargs": {
-@@ -1933,7 +2692,11 @@
-       "integrity": "sha1-A6nbtLXC8Tm/FK5T8LiipqhvThc=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "number-is-nan": "1.0.1"
-+=======
-+        "number-is-nan": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "dashdash": {
-@@ -1942,7 +2705,11 @@
-       "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "assert-plus": "1.0.0"
-+=======
-+        "assert-plus": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "date-now": {
-@@ -1960,7 +2727,11 @@
-     "debug": {
-       "version": "2.6.9",
-       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
-+=======
-+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "ms": "2.0.0"
-@@ -1984,8 +2755,13 @@
-       "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "decamelize": "1.2.0",
-         "map-obj": "1.0.1"
-+=======
-+        "decamelize": "^1.1.0",
-+        "map-obj": "^1.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "map-obj": {
-@@ -2002,12 +2778,21 @@
-       "integrity": "sha1-rjvLfjTGWHmt/nfhnDD4ZgK0vbA=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "binary": "0.3.0",
-         "graceful-fs": "4.1.11",
-         "mkpath": "0.1.0",
-         "nopt": "3.0.6",
-         "q": "1.5.1",
-         "readable-stream": "1.1.14",
-+=======
-+        "binary": "^0.3.0",
-+        "graceful-fs": "^4.1.3",
-+        "mkpath": "^0.1.0",
-+        "nopt": "^3.0.1",
-+        "q": "^1.1.2",
-+        "readable-stream": "^1.1.8",
-+>>>>>>> .their
-         "touch": "0.0.3"
-       }
-     },
-@@ -2035,8 +2820,13 @@
-       "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "foreach": "2.0.5",
-         "object-keys": "1.0.11"
-+=======
-+        "foreach": "^2.0.5",
-+        "object-keys": "^1.0.8"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "object-keys": {
-@@ -2059,17 +2849,27 @@
-       "integrity": "sha1-TUSr4W7zLHebSXK9FBqAMlApoUo=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "find-root": "1.1.0",
-         "glob": "7.1.2",
-         "ignore": "3.3.8",
-         "pkg-config": "1.1.1",
-         "run-parallel": "1.1.9",
-         "uniq": "1.0.1"
-+=======
-+        "find-root": "^1.0.0",
-+        "glob": "^7.0.5",
-+        "ignore": "^3.0.9",
-+        "pkg-config": "^1.1.0",
-+        "run-parallel": "^1.1.2",
-+        "uniq": "^1.0.1"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-           "dev": true,
-           "requires": {
-@@ -2079,6 +2879,17 @@
-             "minimatch": "3.0.4",
-             "once": "1.4.0",
-             "path-is-absolute": "1.0.1"
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+          "dev": true,
-+          "requires": {
-+            "fs.realpath": "^1.0.0",
-+            "inflight": "^1.0.4",
-+            "inherits": "2",
-+            "minimatch": "^3.0.4",
-+            "once": "^1.3.0",
-+            "path-is-absolute": "^1.0.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -2089,6 +2900,7 @@
-       "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "globby": "5.0.0",
-         "is-path-cwd": "1.0.0",
-         "is-path-in-cwd": "1.0.1",
-@@ -2096,6 +2908,15 @@
-         "pify": "2.3.0",
-         "pinkie-promise": "2.0.1",
-         "rimraf": "2.6.2"
-+=======
-+        "globby": "^5.0.0",
-+        "is-path-cwd": "^1.0.0",
-+        "is-path-in-cwd": "^1.0.0",
-+        "object-assign": "^4.0.1",
-+        "pify": "^2.0.0",
-+        "pinkie-promise": "^2.0.0",
-+        "rimraf": "^2.2.8"
-+>>>>>>> .their
-       }
-     },
-     "delayed-stream": {
-@@ -2116,10 +2937,17 @@
-       "integrity": "sha1-CRckkC6EZYJg65EHSMzNGvbiH7U=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "JSONStream": "1.3.2",
-         "shasum": "1.0.2",
-         "subarg": "1.0.0",
-         "through2": "2.0.3"
-+=======
-+        "JSONStream": "^1.0.3",
-+        "shasum": "^1.0.0",
-+        "subarg": "^1.0.0",
-+        "through2": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "des.js": {
-@@ -2128,8 +2956,13 @@
-       "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "inherits": "2.0.3",
-         "minimalistic-assert": "1.0.1"
-+=======
-+        "inherits": "^2.0.1",
-+        "minimalistic-assert": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "destroy": {
-@@ -2139,6 +2972,7 @@
-       "dev": true
-     },
-     "detect-port": {
-+<<<<<<< .our
-       "version": "1.2.3",
-       "resolved": "https://registry.npmjs.org/detect-port/-/detect-port-1.2.3.tgz",
-       "integrity": "sha512-IDbrX6PxqnYy8jV4wSHBaJlErYKTJvW8OQb9F7xivl1iQLqiUYHGa+nZ61Do6+N5uuOn/pReXKNqI9rUn04vug==",
-@@ -2146,6 +2980,15 @@
-       "requires": {
-         "address": "1.0.3",
-         "debug": "2.6.9"
-+=======
-+      "version": "1.2.2",
-+      "resolved": "https://registry.npmjs.org/detect-port/-/detect-port-1.2.2.tgz",
-+      "integrity": "sha512-06H99JMCwgbYbA+codm97aBhFLAjABftetp+v+Z88Pvvlkawp2N+1bP/9J24+mihrvk9yBvUYTyIj3NixG1CsA==",
-+      "dev": true,
-+      "requires": {
-+        "address": "^1.0.1",
-+        "debug": "^2.6.0"
-+>>>>>>> .their
-       }
-     },
-     "detective": {
-@@ -2154,8 +2997,13 @@
-       "integrity": "sha512-H6PmeeUcZloWtdt4DAkFyzFL94arpHr3NOwwmVILFiy+9Qd4JTxxXrzfyGk/lmct2qVGBwTSwSXagqu2BxmWig==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "acorn": "5.5.3",
-         "defined": "1.0.0"
-+=======
-+        "acorn": "^5.2.1",
-+        "defined": "^1.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "acorn": {
-@@ -2178,9 +3026,15 @@
-       "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "bn.js": "4.11.8",
-         "miller-rabin": "4.0.1",
-         "randombytes": "2.0.6"
-+=======
-+        "bn.js": "^4.1.0",
-+        "miller-rabin": "^4.0.0",
-+        "randombytes": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "doctrine": {
-@@ -2189,7 +3043,11 @@
-       "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "esutils": "2.0.2"
-+=======
-+        "esutils": "^2.0.2"
-+>>>>>>> .their
-       }
-     },
-     "dom-serializer": {
-@@ -2198,8 +3056,13 @@
-       "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "domelementtype": "1.1.3",
-         "entities": "1.1.1"
-+=======
-+        "domelementtype": "~1.1.1",
-+        "entities": "~1.1.1"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "domelementtype": {
-@@ -2228,7 +3091,11 @@
-       "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "domelementtype": "1.3.0"
-+=======
-+        "domelementtype": "1"
-+>>>>>>> .their
-       }
-     },
-     "domutils": {
-@@ -2237,8 +3104,13 @@
-       "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "dom-serializer": "0.1.0",
-         "domelementtype": "1.3.0"
-+=======
-+        "dom-serializer": "0",
-+        "domelementtype": "1"
-+>>>>>>> .their
-       }
-     },
-     "dot-prop": {
-@@ -2247,7 +3119,11 @@
-       "integrity": "sha1-G3CK8JSknJoOfbyteQq6U52sEXc=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "is-obj": "1.0.1"
-+=======
-+        "is-obj": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "dotenv": {
-@@ -2262,7 +3138,11 @@
-       "integrity": "sha1-iw587Y5wsdPF2HTvlCDkBvOUJbM=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "dotenv": "4.0.0"
-+=======
-+        "dotenv": "^4.0.0"
-+>>>>>>> .their
-       }
-     },
-     "dugite": {
-@@ -2271,12 +3151,21 @@
-       "integrity": "sha512-CFd0sWTB2oouat0kJA4/rEQAeh6ZUvCDL9uFOaSBhLX+2CM/YL+ebKJXd8dYVIe8iVXmK5R9P31NVbRw4Ccoxw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "checksum": "0.1.1",
-         "mkdirp": "0.5.1",
-         "progress": "2.0.0",
-         "request": "2.85.0",
-         "rimraf": "2.6.2",
-         "tar": "4.4.2"
-+=======
-+        "checksum": "^0.1.1",
-+        "mkdirp": "^0.5.1",
-+        "progress": "^2.0.0",
-+        "request": "^2.85.0",
-+        "rimraf": "^2.5.4",
-+        "tar": "^4.0.2"
-+>>>>>>> .their
-       }
-     },
-     "duplexer2": {
-@@ -2285,7 +3174,11 @@
-       "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "readable-stream": "2.3.6"
-+=======
-+        "readable-stream": "^2.0.2"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -2300,6 +3193,7 @@
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-@@ -2307,6 +3201,15 @@
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-+=======
-+            "core-util-is": "~1.0.0",
-+            "inherits": "~2.0.3",
-+            "isarray": "~1.0.0",
-+            "process-nextick-args": "~2.0.0",
-+            "safe-buffer": "~5.1.1",
-+            "string_decoder": "~1.1.1",
-+            "util-deprecate": "~1.0.1"
-+>>>>>>> .their
-           }
-         },
-         "string_decoder": {
-@@ -2315,7 +3218,11 @@
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "safe-buffer": "5.1.2"
-+=======
-+            "safe-buffer": "~5.1.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -2332,10 +3239,17 @@
-       "integrity": "sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "end-of-stream": "1.4.1",
-         "inherits": "2.0.3",
-         "readable-stream": "2.3.6",
-         "stream-shift": "1.0.0"
-+=======
-+        "end-of-stream": "^1.0.0",
-+        "inherits": "^2.0.1",
-+        "readable-stream": "^2.0.0",
-+        "stream-shift": "^1.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -2350,6 +3264,7 @@
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-@@ -2357,6 +3272,15 @@
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-+=======
-+            "core-util-is": "~1.0.0",
-+            "inherits": "~2.0.3",
-+            "isarray": "~1.0.0",
-+            "process-nextick-args": "~2.0.0",
-+            "safe-buffer": "~5.1.1",
-+            "string_decoder": "~1.1.1",
-+            "util-deprecate": "~1.0.1"
-+>>>>>>> .their
-           }
-         },
-         "string_decoder": {
-@@ -2365,7 +3289,11 @@
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "safe-buffer": "5.1.2"
-+=======
-+            "safe-buffer": "~5.1.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -2377,7 +3305,11 @@
-       "dev": true,
-       "optional": true,
-       "requires": {
-+<<<<<<< .our
-         "jsbn": "0.1.1"
-+=======
-+        "jsbn": "~0.1.0"
-+>>>>>>> .their
-       }
-     },
-     "ee-first": {
-@@ -2392,6 +3324,7 @@
-       "integrity": "sha1-aBO+LTdwciKVrFXxM0/mu5iymsI=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "asar": "0.12.4",
-         "glob": "7.1.2",
-         "istanbul": "0.4.5",
-@@ -2399,6 +3332,15 @@
-         "rimraf": "2.6.2",
-         "temp": "0.8.3",
-         "yargs": "4.8.1"
-+=======
-+        "asar": "^0.12.1",
-+        "glob": "^7.0.5",
-+        "istanbul": "^0.4.4",
-+        "mkdirp": "^0.5.1",
-+        "rimraf": "^2.5.4",
-+        "temp": "^0.8.3",
-+        "yargs": "^4.8.1"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "asar": {
-@@ -2407,6 +3349,7 @@
-           "integrity": "sha1-LdPxFoguq4wPI7dUeSqCp9n84XE=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "chromium-pickle-js": "0.2.0",
-             "commander": "2.15.1",
-             "cuint": "0.2.2",
-@@ -2414,6 +3357,15 @@
-             "minimatch": "3.0.4",
-             "mkdirp": "0.5.1",
-             "mksnapshot": "0.3.1",
-+=======
-+            "chromium-pickle-js": "^0.2.0",
-+            "commander": "^2.9.0",
-+            "cuint": "^0.2.1",
-+            "glob": "^6.0.4",
-+            "minimatch": "^3.0.3",
-+            "mkdirp": "^0.5.0",
-+            "mksnapshot": "^0.3.0",
-+>>>>>>> .their
-             "tmp": "0.0.28"
-           },
-           "dependencies": {
-@@ -2423,11 +3375,19 @@
-               "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
-               "dev": true,
-               "requires": {
-+<<<<<<< .our
-                 "inflight": "1.0.6",
-                 "inherits": "2.0.3",
-                 "minimatch": "3.0.4",
-                 "once": "1.4.0",
-                 "path-is-absolute": "1.0.1"
-+=======
-+                "inflight": "^1.0.4",
-+                "inherits": "2",
-+                "minimatch": "2 || 3",
-+                "once": "^1.3.0",
-+                "path-is-absolute": "^1.0.0"
-+>>>>>>> .their
-               }
-             }
-           }
-@@ -2441,6 +3401,7 @@
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-           "dev": true,
-           "requires": {
-@@ -2450,6 +3411,17 @@
-             "minimatch": "3.0.4",
-             "once": "1.4.0",
-             "path-is-absolute": "1.0.1"
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+          "dev": true,
-+          "requires": {
-+            "fs.realpath": "^1.0.0",
-+            "inflight": "^1.0.4",
-+            "inherits": "2",
-+            "minimatch": "^3.0.4",
-+            "once": "^1.3.0",
-+            "path-is-absolute": "^1.0.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -2460,6 +3432,7 @@
-       "integrity": "sha1-ARI6T8y2vieswSgAJ7/LJAxUsdI=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "got": "6.7.1",
-         "gunzip-maybe": "1.4.1",
-         "node-dir": "0.1.17",
-@@ -2468,6 +3441,16 @@
-         "pify": "2.3.0",
-         "semver": "5.5.0",
-         "tar-fs": "1.16.2"
-+=======
-+        "got": "^6.3.0",
-+        "gunzip-maybe": "^1.3.1",
-+        "node-dir": "^0.1.12",
-+        "ora": "^0.2.3",
-+        "path-exists": "^3.0.0",
-+        "pify": "^2.3.0",
-+        "semver": "^5.1.0",
-+        "tar-fs": "^1.13.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "ora": {
-@@ -2476,10 +3459,17 @@
-           "integrity": "sha1-N1J9Igrc1Tw5tzVx11QVbV22V6Q=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "chalk": "1.1.3",
-             "cli-cursor": "1.0.2",
-             "cli-spinners": "0.1.2",
-             "object-assign": "4.1.1"
-+=======
-+            "chalk": "^1.1.1",
-+            "cli-cursor": "^1.0.2",
-+            "cli-spinners": "^0.1.2",
-+            "object-assign": "^4.0.1"
-+>>>>>>> .their
-           }
-         },
-         "path-exists": {
-@@ -2496,6 +3486,7 @@
-       "integrity": "sha512-omAdcSUPTzeIUzyMwA3W54mcw09AEy2THUQCDgDV0dAQA2urV5VpEaB3ts66aVQmw8j6AxK/CBAfBcYy5ZW0bw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "cheerio": "0.22.0",
-         "clean-deep": "2.0.2",
-         "decamelize": "1.2.0",
-@@ -2512,6 +3503,24 @@
-         "pify": "2.3.0",
-         "revalidator": "0.3.1",
-         "semver": "5.5.0"
-+=======
-+        "cheerio": "^0.22.0",
-+        "clean-deep": "^2.0.1",
-+        "decamelize": "^1.2.0",
-+        "dedent": "^0.6.0",
-+        "electron-docs": "^2.0.1",
-+        "entities": "^1.1.1",
-+        "keyed-array": "^2.1.2",
-+        "lodash.merge": "^4.6.0",
-+        "lodash.pick": "^4.2.1",
-+        "marky-markdown-lite": "^1.2.0",
-+        "minimist": "^1.2.0",
-+        "ora": "^0.3.0",
-+        "path-exists": "^3.0.0",
-+        "pify": "^2.3.0",
-+        "revalidator": "^0.3.1",
-+        "semver": "^5.3.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "path-exists": {
-@@ -2523,6 +3532,7 @@
-       }
-     },
-     "electron-typescript-definitions": {
-+<<<<<<< .our
-       "version": "1.3.6",
-       "resolved": "https://registry.npmjs.org/electron-typescript-definitions/-/electron-typescript-definitions-1.3.6.tgz",
-       "integrity": "sha512-Wz6tPaaZ22lbfWwF9bzVSki7LMW96xilCT1M8eeNYZG6LcpA9x34jlrAZg5HZWTHXR2tfbTQhSmrY+FEVulD/A==",
-@@ -2538,6 +3548,23 @@
-         "rimraf": "2.6.2",
-         "tslint": "4.5.1",
-         "typescript": "2.9.2"
-+=======
-+      "version": "1.3.5",
-+      "resolved": "https://registry.npmjs.org/electron-typescript-definitions/-/electron-typescript-definitions-1.3.5.tgz",
-+      "integrity": "sha512-7Ryb7AN0Re63oeX3wHytjX0ScVlDcgj+GSBi6Q8aSNpo4B/sffAgZK6P/b4idqF26hp2jPJWcjBMizUb0VNfAQ==",
-+      "dev": true,
-+      "requires": {
-+        "@types/node": "^7.0.18",
-+        "colors": "^1.1.2",
-+        "debug": "^2.6.3",
-+        "electron-docs": "^2.0.0",
-+        "electron-docs-linter": "^2.3.4",
-+        "lodash": "^4.16.1",
-+        "mkdirp": "^0.5.1",
-+        "rimraf": "^2.5.4",
-+        "tslint": "^4.5.1",
-+        "typescript": "^2.2.1"
-+>>>>>>> .their
-       }
-     },
-     "elliptic": {
-@@ -2546,6 +3573,7 @@
-       "integrity": "sha1-ysmvh2LIWDYYcAPI3+GT5eLq5d8=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "bn.js": "4.11.8",
-         "brorand": "1.1.0",
-         "hash.js": "1.1.3",
-@@ -2553,6 +3581,15 @@
-         "inherits": "2.0.3",
-         "minimalistic-assert": "1.0.1",
-         "minimalistic-crypto-utils": "1.0.1"
-+=======
-+        "bn.js": "^4.4.0",
-+        "brorand": "^1.0.1",
-+        "hash.js": "^1.0.0",
-+        "hmac-drbg": "^1.0.0",
-+        "inherits": "^2.0.1",
-+        "minimalistic-assert": "^1.0.0",
-+        "minimalistic-crypto-utils": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "encodeurl": {
-@@ -2567,7 +3604,11 @@
-       "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "once": "1.4.0"
-+=======
-+        "once": "^1.4.0"
-+>>>>>>> .their
-       }
-     },
-     "ensure-posix-path": {
-@@ -2588,7 +3629,11 @@
-       "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "is-arrayish": "0.2.1"
-+=======
-+        "is-arrayish": "^0.2.1"
-+>>>>>>> .their
-       }
-     },
-     "es-abstract": {
-@@ -2597,11 +3642,19 @@
-       "integrity": "sha512-ZnQrE/lXTTQ39ulXZ+J1DTFazV9qBy61x2bY071B+qGco8Z8q1QddsLdt/EF8Ai9hcWH72dWS0kFqXLxOxqslA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "es-to-primitive": "1.1.1",
-         "function-bind": "1.1.1",
-         "has": "1.0.1",
-         "is-callable": "1.1.3",
-         "is-regex": "1.0.4"
-+=======
-+        "es-to-primitive": "^1.1.1",
-+        "function-bind": "^1.1.1",
-+        "has": "^1.0.1",
-+        "is-callable": "^1.1.3",
-+        "is-regex": "^1.0.4"
-+>>>>>>> .their
-       }
-     },
-     "es-to-primitive": {
-@@ -2610,9 +3663,15 @@
-       "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "is-callable": "1.1.3",
-         "is-date-object": "1.0.1",
-         "is-symbol": "1.0.1"
-+=======
-+        "is-callable": "^1.1.1",
-+        "is-date-object": "^1.0.1",
-+        "is-symbol": "^1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "es5-ext": {
-@@ -2621,9 +3680,15 @@
-       "integrity": "sha512-AJxO1rmPe1bDEfSR6TJ/FgMFYuTBhR5R57KW58iCkYACMyFbrkqVyzXSurYoScDGvgyMpk7uRF/lPUPPTmsRSA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "es6-iterator": "2.0.3",
-         "es6-symbol": "3.1.1",
-         "next-tick": "1.0.0"
-+=======
-+        "es6-iterator": "~2.0.3",
-+        "es6-symbol": "~3.1.1",
-+        "next-tick": "1"
-+>>>>>>> .their
-       }
-     },
-     "es6-iterator": {
-@@ -2632,9 +3697,15 @@
-       "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "d": "1.0.0",
-         "es5-ext": "0.10.42",
-         "es6-symbol": "3.1.1"
-+=======
-+        "d": "1",
-+        "es5-ext": "^0.10.35",
-+        "es6-symbol": "^3.1.1"
-+>>>>>>> .their
-       }
-     },
-     "es6-map": {
-@@ -2643,12 +3714,21 @@
-       "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "d": "1.0.0",
-         "es5-ext": "0.10.42",
-         "es6-iterator": "2.0.3",
-         "es6-set": "0.1.5",
-         "es6-symbol": "3.1.1",
-         "event-emitter": "0.3.5"
-+=======
-+        "d": "1",
-+        "es5-ext": "~0.10.14",
-+        "es6-iterator": "~2.0.1",
-+        "es6-set": "~0.1.5",
-+        "es6-symbol": "~3.1.1",
-+        "event-emitter": "~0.3.5"
-+>>>>>>> .their
-       }
-     },
-     "es6-set": {
-@@ -2657,11 +3737,19 @@
-       "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "d": "1.0.0",
-         "es5-ext": "0.10.42",
-         "es6-iterator": "2.0.3",
-         "es6-symbol": "3.1.1",
-         "event-emitter": "0.3.5"
-+=======
-+        "d": "1",
-+        "es5-ext": "~0.10.14",
-+        "es6-iterator": "~2.0.1",
-+        "es6-symbol": "3.1.1",
-+        "event-emitter": "~0.3.5"
-+>>>>>>> .their
-       }
-     },
-     "es6-symbol": {
-@@ -2670,8 +3758,13 @@
-       "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "d": "1.0.0",
-         "es5-ext": "0.10.42"
-+=======
-+        "d": "1",
-+        "es5-ext": "~0.10.14"
-+>>>>>>> .their
-       }
-     },
-     "es6-weak-map": {
-@@ -2680,10 +3773,17 @@
-       "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "d": "1.0.0",
-         "es5-ext": "0.10.42",
-         "es6-iterator": "2.0.3",
-         "es6-symbol": "3.1.1"
-+=======
-+        "d": "1",
-+        "es5-ext": "^0.10.14",
-+        "es6-iterator": "^2.0.1",
-+        "es6-symbol": "^3.1.1"
-+>>>>>>> .their
-       }
-     },
-     "escape-html": {
-@@ -2704,11 +3804,19 @@
-       "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "esprima": "2.7.3",
-         "estraverse": "1.9.3",
-         "esutils": "2.0.2",
-         "optionator": "0.8.2",
-         "source-map": "0.2.0"
-+=======
-+        "esprima": "^2.7.1",
-+        "estraverse": "^1.9.1",
-+        "esutils": "^2.0.2",
-+        "optionator": "^0.8.1",
-+        "source-map": "~0.2.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "source-map": {
-@@ -2718,7 +3826,11 @@
-           "dev": true,
-           "optional": true,
-           "requires": {
-+<<<<<<< .our
-             "amdefine": "1.0.1"
-+=======
-+            "amdefine": ">=0.0.4"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -2729,10 +3841,17 @@
-       "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "es6-map": "0.1.5",
-         "es6-weak-map": "2.0.2",
-         "esrecurse": "4.2.1",
-         "estraverse": "4.2.0"
-+=======
-+        "es6-map": "^0.1.3",
-+        "es6-weak-map": "^2.0.1",
-+        "esrecurse": "^4.1.0",
-+        "estraverse": "^4.1.1"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "estraverse": {
-@@ -2749,6 +3868,7 @@
-       "integrity": "sha1-yPxiAcf0DdCJQbh8CFdnOGpnmsw=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "babel-code-frame": "6.26.0",
-         "chalk": "1.1.3",
-         "concat-stream": "1.5.2",
-@@ -2784,6 +3904,43 @@
-         "table": "3.8.3",
-         "text-table": "0.2.0",
-         "user-home": "2.0.0"
-+=======
-+        "babel-code-frame": "^6.16.0",
-+        "chalk": "^1.1.3",
-+        "concat-stream": "^1.5.2",
-+        "debug": "^2.1.1",
-+        "doctrine": "^2.0.0",
-+        "escope": "^3.6.0",
-+        "espree": "^3.4.0",
-+        "esquery": "^1.0.0",
-+        "estraverse": "^4.2.0",
-+        "esutils": "^2.0.2",
-+        "file-entry-cache": "^2.0.0",
-+        "glob": "^7.0.3",
-+        "globals": "^9.14.0",
-+        "ignore": "^3.2.0",
-+        "imurmurhash": "^0.1.4",
-+        "inquirer": "^0.12.0",
-+        "is-my-json-valid": "^2.10.0",
-+        "is-resolvable": "^1.0.0",
-+        "js-yaml": "^3.5.1",
-+        "json-stable-stringify": "^1.0.0",
-+        "levn": "^0.3.0",
-+        "lodash": "^4.0.0",
-+        "mkdirp": "^0.5.0",
-+        "natural-compare": "^1.4.0",
-+        "optionator": "^0.8.2",
-+        "path-is-inside": "^1.0.1",
-+        "pluralize": "^1.2.1",
-+        "progress": "^1.1.8",
-+        "require-uncached": "^1.0.2",
-+        "shelljs": "^0.7.5",
-+        "strip-bom": "^3.0.0",
-+        "strip-json-comments": "~2.0.1",
-+        "table": "^3.7.8",
-+        "text-table": "~0.2.0",
-+        "user-home": "^2.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "estraverse": {
-@@ -2795,6 +3952,7 @@
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-           "dev": true,
-           "requires": {
-@@ -2804,6 +3962,17 @@
-             "minimatch": "3.0.4",
-             "once": "1.4.0",
-             "path-is-absolute": "1.0.1"
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+          "dev": true,
-+          "requires": {
-+            "fs.realpath": "^1.0.0",
-+            "inflight": "^1.0.4",
-+            "inherits": "2",
-+            "minimatch": "^3.0.4",
-+            "once": "^1.3.0",
-+            "path-is-absolute": "^1.0.0"
-+>>>>>>> .their
-           }
-         },
-         "json-stable-stringify": {
-@@ -2812,7 +3981,11 @@
-           "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "jsonify": "0.0.0"
-+=======
-+            "jsonify": "~0.0.0"
-+>>>>>>> .their
-           }
-         },
-         "progress": {
-@@ -2847,9 +4020,15 @@
-       "integrity": "sha1-Wt2BBujJKNssuiMrzZ76hG49oWw=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "debug": "2.6.9",
-         "object-assign": "4.1.1",
-         "resolve": "1.7.1"
-+=======
-+        "debug": "^2.2.0",
-+        "object-assign": "^4.0.1",
-+        "resolve": "^1.1.6"
-+>>>>>>> .their
-       }
-     },
-     "eslint-module-utils": {
-@@ -2858,8 +4037,13 @@
-       "integrity": "sha1-snA2LNiLGkitMIl2zn+lTphBF0Y=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "debug": "2.6.9",
-         "pkg-dir": "1.0.0"
-+=======
-+        "debug": "^2.6.8",
-+        "pkg-dir": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "eslint-plugin-import": {
-@@ -2868,6 +4052,7 @@
-       "integrity": "sha1-crowb60wXWfEgWNIpGmaQimsi04=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "builtin-modules": "1.1.1",
-         "contains-path": "0.1.0",
-         "debug": "2.6.9",
-@@ -2878,6 +4063,18 @@
-         "lodash.cond": "4.5.2",
-         "minimatch": "3.0.4",
-         "pkg-up": "1.0.0"
-+=======
-+        "builtin-modules": "^1.1.1",
-+        "contains-path": "^0.1.0",
-+        "debug": "^2.2.0",
-+        "doctrine": "1.5.0",
-+        "eslint-import-resolver-node": "^0.2.0",
-+        "eslint-module-utils": "^2.0.0",
-+        "has": "^1.0.1",
-+        "lodash.cond": "^4.3.0",
-+        "minimatch": "^3.0.3",
-+        "pkg-up": "^1.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "doctrine": {
-@@ -2886,8 +4083,13 @@
-           "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "esutils": "2.0.2",
-             "isarray": "1.0.0"
-+=======
-+            "esutils": "^2.0.2",
-+            "isarray": "^1.0.0"
-+>>>>>>> .their
-           }
-         },
-         "isarray": {
-@@ -2901,6 +4103,7 @@
-     "eslint-plugin-node": {
-       "version": "4.2.3",
-       "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-4.2.3.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-wEOQq428u2iHF0Aj1vOnJ2nmO5c=",
-       "dev": true,
-       "requires": {
-@@ -2908,6 +4111,15 @@
-         "minimatch": "3.0.4",
-         "object-assign": "4.1.1",
-         "resolve": "1.7.1",
-+=======
-+      "integrity": "sha512-vIUQPuwbVYdz/CYnlTLsJrRy7iXHQjdEe5wz0XhhdTym3IInM/zZLlPf9nZ2mThsH0QcsieCOWs2vOeCy/22LQ==",
-+      "dev": true,
-+      "requires": {
-+        "ignore": "^3.0.11",
-+        "minimatch": "^3.0.2",
-+        "object-assign": "^4.0.1",
-+        "resolve": "^1.1.7",
-+>>>>>>> .their
-         "semver": "5.3.0"
-       },
-       "dependencies": {
-@@ -2931,11 +4143,19 @@
-       "integrity": "sha1-xUNb6wZ3ThLH2y9qut3L+QDNP3g=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "array.prototype.find": "2.0.4",
-         "doctrine": "1.5.0",
-         "has": "1.0.1",
-         "jsx-ast-utils": "1.4.1",
-         "object.assign": "4.1.0"
-+=======
-+        "array.prototype.find": "^2.0.1",
-+        "doctrine": "^1.2.2",
-+        "has": "^1.0.1",
-+        "jsx-ast-utils": "^1.3.4",
-+        "object.assign": "^4.0.4"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "doctrine": {
-@@ -2944,8 +4164,13 @@
-           "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "esutils": "2.0.2",
-             "isarray": "1.0.0"
-+=======
-+            "esutils": "^2.0.2",
-+            "isarray": "^1.0.0"
-+>>>>>>> .their
-           }
-         },
-         "isarray": {
-@@ -2968,8 +4193,13 @@
-       "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "acorn": "5.5.3",
-         "acorn-jsx": "3.0.1"
-+=======
-+        "acorn": "^5.5.0",
-+        "acorn-jsx": "^3.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "acorn": {
-@@ -2992,7 +4222,11 @@
-       "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "estraverse": "4.2.0"
-+=======
-+        "estraverse": "^4.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "estraverse": {
-@@ -3009,7 +4243,11 @@
-       "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "estraverse": "4.2.0"
-+=======
-+        "estraverse": "^4.1.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "estraverse": {
-@@ -3044,8 +4282,13 @@
-       "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "d": "1.0.0",
-         "es5-ext": "0.10.42"
-+=======
-+        "d": "1",
-+        "es5-ext": "~0.10.14"
-+>>>>>>> .their
-       }
-     },
-     "events": {
-@@ -3057,11 +4300,19 @@
-     "evp_bytestokey": {
-       "version": "1.0.3",
-       "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-f8vbGY3HGVlDLv4ThCaE4FJaywI=",
-       "dev": true,
-       "requires": {
-         "md5.js": "1.3.4",
-         "safe-buffer": "5.1.2"
-+=======
-+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-+      "dev": true,
-+      "requires": {
-+        "md5.js": "^1.3.4",
-+        "safe-buffer": "^5.1.1"
-+>>>>>>> .their
-       }
-     },
-     "execa": {
-@@ -3070,6 +4321,7 @@
-       "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "cross-spawn": "5.1.0",
-         "get-stream": "3.0.0",
-         "is-stream": "1.1.0",
-@@ -3077,6 +4329,15 @@
-         "p-finally": "1.0.0",
-         "signal-exit": "3.0.2",
-         "strip-eof": "1.0.0"
-+=======
-+        "cross-spawn": "^5.0.1",
-+        "get-stream": "^3.0.0",
-+        "is-stream": "^1.1.0",
-+        "npm-run-path": "^2.0.0",
-+        "p-finally": "^1.0.0",
-+        "signal-exit": "^3.0.0",
-+        "strip-eof": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "exit-hook": {
-@@ -3091,7 +4352,11 @@
-       "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "is-posix-bracket": "0.1.1"
-+=======
-+        "is-posix-bracket": "^0.1.0"
-+>>>>>>> .their
-       }
-     },
-     "expand-range": {
-@@ -3100,7 +4365,11 @@
-       "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "fill-range": "2.2.4"
-+=======
-+        "fill-range": "^2.1.0"
-+>>>>>>> .their
-       }
-     },
-     "extend": {
-@@ -3115,7 +4384,11 @@
-       "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "is-extglob": "1.0.0"
-+=======
-+        "is-extglob": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "extsprintf": {
-@@ -3148,7 +4421,11 @@
-       "integrity": "sha512-o2eo/X2syzzERAtN5LcGbiVQ0WwZSlN3qLtadwAz3X8Bu+XWD16dja/KMsjZLiQr+BLGPDnHGkc4yUJf1Xpkpw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "format": "0.2.2"
-+=======
-+        "format": "^0.2.2"
-+>>>>>>> .their
-       }
-     },
-     "figures": {
-@@ -3157,8 +4434,13 @@
-       "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "escape-string-regexp": "1.0.5",
-         "object-assign": "4.1.1"
-+=======
-+        "escape-string-regexp": "^1.0.5",
-+        "object-assign": "^4.1.0"
-+>>>>>>> .their
-       }
-     },
-     "file-entry-cache": {
-@@ -3167,8 +4449,13 @@
-       "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "flat-cache": "1.3.0",
-         "object-assign": "4.1.1"
-+=======
-+        "flat-cache": "^1.2.1",
-+        "object-assign": "^4.0.1"
-+>>>>>>> .their
-       }
-     },
-     "filename-regex": {
-@@ -3189,17 +4476,29 @@
-       "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "is-number": "2.1.0",
-         "isobject": "2.1.0",
-         "randomatic": "3.0.0",
-         "repeat-element": "1.1.2",
-         "repeat-string": "1.6.1"
-+=======
-+        "is-number": "^2.1.0",
-+        "isobject": "^2.0.0",
-+        "randomatic": "^3.0.0",
-+        "repeat-element": "^1.1.2",
-+        "repeat-string": "^1.5.2"
-+>>>>>>> .their
-       }
-     },
-     "find-root": {
-       "version": "1.1.0",
-       "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-q8/Iunb3CMQql7PWhbfpRQv7nOQ=",
-+=======
-+      "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "find-up": {
-@@ -3208,8 +4507,13 @@
-       "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "path-exists": "2.1.0",
-         "pinkie-promise": "2.0.1"
-+=======
-+        "path-exists": "^2.0.0",
-+        "pinkie-promise": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "findup-sync": {
-@@ -3218,7 +4522,11 @@
-       "integrity": "sha1-N5MKpdgWt3fANEXhlmzGeQpMCxY=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "glob": "5.0.15"
-+=======
-+        "glob": "~5.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "glob": {
-@@ -3227,11 +4535,19 @@
-           "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "inflight": "1.0.6",
-             "inherits": "2.0.3",
-             "minimatch": "3.0.4",
-             "once": "1.4.0",
-             "path-is-absolute": "1.0.1"
-+=======
-+            "inflight": "^1.0.4",
-+            "inherits": "2",
-+            "minimatch": "2 || 3",
-+            "once": "^1.3.0",
-+            "path-is-absolute": "^1.0.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -3242,10 +4558,17 @@
-       "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "circular-json": "0.3.3",
-         "del": "2.2.2",
-         "graceful-fs": "4.1.11",
-         "write": "0.2.1"
-+=======
-+        "circular-json": "^0.3.1",
-+        "del": "^2.0.2",
-+        "graceful-fs": "^4.1.2",
-+        "write": "^0.2.1"
-+>>>>>>> .their
-       }
-     },
-     "fn-name": {
-@@ -3260,8 +4583,13 @@
-       "integrity": "sha1-NLkLqyqRGqNHVx2pDyK9NuzYqRk=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "debug": "2.6.9",
-         "stream-consume": "0.1.1"
-+=======
-+        "debug": "^2.2.0",
-+        "stream-consume": "^0.1.0"
-+>>>>>>> .their
-       }
-     },
-     "for-in": {
-@@ -3276,7 +4604,11 @@
-       "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "for-in": "1.0.2"
-+=======
-+        "for-in": "^1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "foreach": {
-@@ -3297,9 +4629,15 @@
-       "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "asynckit": "0.4.0",
-         "combined-stream": "1.0.6",
-         "mime-types": "2.1.18"
-+=======
-+        "asynckit": "^0.4.0",
-+        "combined-stream": "1.0.6",
-+        "mime-types": "^2.1.12"
-+>>>>>>> .their
-       }
-     },
-     "format": {
-@@ -3326,11 +4664,19 @@
-       "integrity": "sha1-muH92UiXeY7at20JGM9C0MMYT6k=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "graceful-fs": "4.1.11",
-         "jsonfile": "2.4.0",
-         "klaw": "1.3.1",
-         "path-is-absolute": "1.0.1",
-         "rimraf": "2.6.2"
-+=======
-+        "graceful-fs": "^4.1.2",
-+        "jsonfile": "^2.1.0",
-+        "klaw": "^1.0.0",
-+        "path-is-absolute": "^1.0.0",
-+        "rimraf": "^2.2.8"
-+>>>>>>> .their
-       }
-     },
-     "fs-minipass": {
-@@ -3339,7 +4685,11 @@
-       "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "minipass": "2.3.0"
-+=======
-+        "minipass": "^2.2.1"
-+>>>>>>> .their
-       }
-     },
-     "fs.realpath": {
-@@ -3355,8 +4705,13 @@
-       "dev": true,
-       "optional": true,
-       "requires": {
-+<<<<<<< .our
-         "nan": "2.10.0",
-         "node-pre-gyp": "0.10.0"
-+=======
-+        "nan": "^2.9.2",
-+        "node-pre-gyp": "^0.10.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "abbrev": {
-@@ -3880,7 +5235,11 @@
-     "function-bind": {
-       "version": "1.1.1",
-       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0=",
-+=======
-+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "generate-function": {
-@@ -3895,7 +5254,11 @@
-       "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "is-property": "1.0.2"
-+=======
-+        "is-property": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "get-caller-file": {
-@@ -3910,11 +5273,19 @@
-       "integrity": "sha1-xztInAbYDMVTbCyFP54FIyBWly0=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "hosted-git-info": "2.6.0",
-         "meow": "3.7.0",
-         "normalize-package-data": "2.4.0",
-         "parse-github-repo-url": "1.4.1",
-         "through2": "2.0.3"
-+=======
-+        "hosted-git-info": "^2.1.4",
-+        "meow": "^3.3.0",
-+        "normalize-package-data": "^2.3.0",
-+        "parse-github-repo-url": "^1.3.0",
-+        "through2": "^2.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "camelcase": {
-@@ -3929,8 +5300,13 @@
-           "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "camelcase": "2.1.1",
-             "map-obj": "1.0.1"
-+=======
-+            "camelcase": "^2.0.0",
-+            "map-obj": "^1.0.0"
-+>>>>>>> .their
-           }
-         },
-         "indent-string": {
-@@ -3939,7 +5315,11 @@
-           "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "repeating": "2.0.1"
-+=======
-+            "repeating": "^2.0.0"
-+>>>>>>> .their
-           }
-         },
-         "map-obj": {
-@@ -3954,6 +5334,7 @@
-           "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "camelcase-keys": "2.1.0",
-             "decamelize": "1.2.0",
-             "loud-rejection": "1.6.0",
-@@ -3964,6 +5345,18 @@
-             "read-pkg-up": "1.0.1",
-             "redent": "1.0.0",
-             "trim-newlines": "1.0.0"
-+=======
-+            "camelcase-keys": "^2.0.0",
-+            "decamelize": "^1.1.2",
-+            "loud-rejection": "^1.0.0",
-+            "map-obj": "^1.0.1",
-+            "minimist": "^1.1.3",
-+            "normalize-package-data": "^2.3.4",
-+            "object-assign": "^4.0.1",
-+            "read-pkg-up": "^1.0.1",
-+            "redent": "^1.0.0",
-+            "trim-newlines": "^1.0.0"
-+>>>>>>> .their
-           }
-         },
-         "redent": {
-@@ -3972,8 +5365,13 @@
-           "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "indent-string": "2.1.0",
-             "strip-indent": "1.0.1"
-+=======
-+            "indent-string": "^2.1.0",
-+            "strip-indent": "^1.0.1"
-+>>>>>>> .their
-           }
-         },
-         "strip-indent": {
-@@ -3982,7 +5380,11 @@
-           "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "get-stdin": "4.0.1"
-+=======
-+            "get-stdin": "^4.0.1"
-+>>>>>>> .their
-           }
-         },
-         "trim-newlines": {
-@@ -4011,7 +5413,11 @@
-       "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "assert-plus": "1.0.0"
-+=======
-+        "assert-plus": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "git-raw-commits": {
-@@ -4020,11 +5426,19 @@
-       "integrity": "sha512-svsK26tQ8vEKnMshTDatSIQSMDdz8CxIIqKsvPqbtV23Etmw6VNaFAitu8zwZ0VrOne7FztwPyRLxK7/DIUTQg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "dargs": "4.1.0",
-         "lodash.template": "4.4.0",
-         "meow": "4.0.1",
-         "split2": "2.2.0",
-         "through2": "2.0.3"
-+=======
-+        "dargs": "^4.0.1",
-+        "lodash.template": "^4.0.2",
-+        "meow": "^4.0.0",
-+        "split2": "^2.0.0",
-+        "through2": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "git-remote-origin-url": {
-@@ -4033,8 +5447,13 @@
-       "integrity": "sha1-UoJlna4hBxRaERJhEq0yFuxfpl8=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "gitconfiglocal": "1.0.0",
-         "pify": "2.3.0"
-+=======
-+        "gitconfiglocal": "^1.0.0",
-+        "pify": "^2.3.0"
-+>>>>>>> .their
-       }
-     },
-     "git-semver-tags": {
-@@ -4043,8 +5462,13 @@
-       "integrity": "sha512-2jHlJnln4D/ECk9FxGEBh3k44wgYdWjWDtMmJPaecjoRmxKo3Y1Lh8GMYuOPu04CHw86NTAODchYjC5pnpMQig==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "meow": "4.0.1",
-         "semver": "5.5.0"
-+=======
-+        "meow": "^4.0.0",
-+        "semver": "^5.5.0"
-+>>>>>>> .their
-       }
-     },
-     "gitconfiglocal": {
-@@ -4053,12 +5477,17 @@
-       "integrity": "sha1-QdBF84UaXqiPA/JMocYXgRRGS5s=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "ini": "1.3.5"
-+=======
-+        "ini": "^1.3.2"
-+>>>>>>> .their
-       }
-     },
-     "github": {
-       "version": "9.3.1",
-       "resolved": "https://registry.npmjs.org/github/-/github-9.3.1.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-ajxanMKhzQtdCXpHuu+50Ryu+J4=",
-       "dev": true,
-       "requires": {
-@@ -4066,6 +5495,15 @@
-         "https-proxy-agent": "1.0.0",
-         "mime": "1.6.0",
-         "netrc": "0.1.4"
-+=======
-+      "integrity": "sha512-LvVb6iR8/7bqYgj0VeAtqys0t427jwIBkv/+or/ssypfIk5R1fnz4aeIEv4udPw6VFoH6vL4gi+foBoD5aazXg==",
-+      "dev": true,
-+      "requires": {
-+        "follow-redirects": "0.0.7",
-+        "https-proxy-agent": "^1.0.0",
-+        "mime": "^1.2.11",
-+        "netrc": "^0.1.4"
-+>>>>>>> .their
-       }
-     },
-     "glob": {
-@@ -4074,11 +5512,19 @@
-       "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "inflight": "1.0.6",
-         "inherits": "2.0.3",
-         "minimatch": "3.0.4",
-         "once": "1.4.0",
-         "path-is-absolute": "1.0.1"
-+=======
-+        "inflight": "^1.0.4",
-+        "inherits": "2",
-+        "minimatch": "2 || 3",
-+        "once": "^1.3.0",
-+        "path-is-absolute": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "glob-base": {
-@@ -4087,8 +5533,13 @@
-       "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "glob-parent": "2.0.0",
-         "is-glob": "2.0.1"
-+=======
-+        "glob-parent": "^2.0.0",
-+        "is-glob": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "glob-parent": {
-@@ -4097,7 +5548,11 @@
-       "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "is-glob": "2.0.1"
-+=======
-+        "is-glob": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "global-dirs": {
-@@ -4106,13 +5561,21 @@
-       "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "ini": "1.3.5"
-+=======
-+        "ini": "^1.3.4"
-+>>>>>>> .their
-       }
-     },
-     "globals": {
-       "version": "9.18.0",
-       "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-qjiWs+abSH8X4x7SFD1pqOMMLYo=",
-+=======
-+      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "globby": {
-@@ -4121,17 +5584,27 @@
-       "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "array-union": "1.0.2",
-         "arrify": "1.0.1",
-         "glob": "7.1.2",
-         "object-assign": "4.1.1",
-         "pify": "2.3.0",
-         "pinkie-promise": "2.0.1"
-+=======
-+        "array-union": "^1.0.1",
-+        "arrify": "^1.0.0",
-+        "glob": "^7.0.3",
-+        "object-assign": "^4.0.1",
-+        "pify": "^2.0.0",
-+        "pinkie-promise": "^2.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-           "dev": true,
-           "requires": {
-@@ -4141,6 +5614,17 @@
-             "minimatch": "3.0.4",
-             "once": "1.4.0",
-             "path-is-absolute": "1.0.1"
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+          "dev": true,
-+          "requires": {
-+            "fs.realpath": "^1.0.0",
-+            "inflight": "^1.0.4",
-+            "inherits": "2",
-+            "minimatch": "^3.0.4",
-+            "once": "^1.3.0",
-+            "path-is-absolute": "^1.0.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -4151,6 +5635,7 @@
-       "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "create-error-class": "3.0.2",
-         "duplexer3": "0.1.4",
-         "get-stream": "3.0.0",
-@@ -4162,6 +5647,19 @@
-         "timed-out": "4.0.1",
-         "unzip-response": "2.0.1",
-         "url-parse-lax": "1.0.0"
-+=======
-+        "create-error-class": "^3.0.0",
-+        "duplexer3": "^0.1.4",
-+        "get-stream": "^3.0.0",
-+        "is-redirect": "^1.0.0",
-+        "is-retry-allowed": "^1.0.0",
-+        "is-stream": "^1.0.0",
-+        "lowercase-keys": "^1.0.0",
-+        "safe-buffer": "^5.0.1",
-+        "timed-out": "^4.0.0",
-+        "unzip-response": "^2.0.1",
-+        "url-parse-lax": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "graceful-fs": {
-@@ -4173,6 +5671,7 @@
-     "gunzip-maybe": {
-       "version": "1.4.1",
-       "resolved": "https://registry.npmjs.org/gunzip-maybe/-/gunzip-maybe-1.4.1.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-Occu2J0bSbpwjhh3ZQBIiQKlICc=",
-       "dev": true,
-       "requires": {
-@@ -4182,6 +5681,17 @@
-         "peek-stream": "1.1.3",
-         "pumpify": "1.5.0",
-         "through2": "2.0.3"
-+=======
-+      "integrity": "sha512-qtutIKMthNJJgeHQS7kZ9FqDq59/Wn0G2HYCRNjpup7yKfVI6/eqwpmroyZGFoCYaG+sW6psNVb4zoLADHpp2g==",
-+      "dev": true,
-+      "requires": {
-+        "browserify-zlib": "^0.1.4",
-+        "is-deflate": "^1.0.0",
-+        "is-gzip": "^1.0.0",
-+        "peek-stream": "^1.1.0",
-+        "pumpify": "^1.3.3",
-+        "through2": "^2.0.3"
-+>>>>>>> .their
-       }
-     },
-     "handlebars": {
-@@ -4190,10 +5700,17 @@
-       "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "async": "1.5.2",
-         "optimist": "0.6.1",
-         "source-map": "0.4.4",
-         "uglify-js": "2.8.29"
-+=======
-+        "async": "^1.4.0",
-+        "optimist": "^0.6.1",
-+        "source-map": "^0.4.4",
-+        "uglify-js": "^2.6"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "minimist": {
-@@ -4208,8 +5725,13 @@
-           "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "minimist": "0.0.10",
-             "wordwrap": "0.0.3"
-+=======
-+            "minimist": "~0.0.1",
-+            "wordwrap": "~0.0.2"
-+>>>>>>> .their
-           }
-         },
-         "source-map": {
-@@ -4218,7 +5740,11 @@
-           "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "amdefine": "1.0.1"
-+=======
-+            "amdefine": ">=0.0.4"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -4235,8 +5761,13 @@
-       "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "ajv": "5.5.2",
-         "har-schema": "2.0.0"
-+=======
-+        "ajv": "^5.1.0",
-+        "har-schema": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "has": {
-@@ -4245,7 +5776,11 @@
-       "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "function-bind": "1.1.1"
-+=======
-+        "function-bind": "^1.0.2"
-+>>>>>>> .their
-       }
-     },
-     "has-ansi": {
-@@ -4254,7 +5789,11 @@
-       "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "ansi-regex": "2.1.1"
-+=======
-+        "ansi-regex": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "has-flag": {
-@@ -4275,23 +5814,37 @@
-       "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "inherits": "2.0.3",
-         "safe-buffer": "5.1.2"
-+=======
-+        "inherits": "^2.0.1",
-+        "safe-buffer": "^5.0.1"
-+>>>>>>> .their
-       }
-     },
-     "hash.js": {
-       "version": "1.1.3",
-       "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-NA3tvmKQGHFRweodd3o0SJNd+EY=",
-       "dev": true,
-       "requires": {
-         "inherits": "2.0.3",
-         "minimalistic-assert": "1.0.1"
-+=======
-+      "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==",
-+      "dev": true,
-+      "requires": {
-+        "inherits": "^2.0.3",
-+        "minimalistic-assert": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "hawk": {
-       "version": "6.0.2",
-       "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-r02RTrBl+bXOTZ0RwcshJu7MMDg=",
-       "dev": true,
-       "requires": {
-@@ -4299,6 +5852,15 @@
-         "cryptiles": "3.1.2",
-         "hoek": "4.2.1",
-         "sntp": "2.1.0"
-+=======
-+      "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
-+      "dev": true,
-+      "requires": {
-+        "boom": "4.x.x",
-+        "cryptiles": "3.x.x",
-+        "hoek": "4.x.x",
-+        "sntp": "2.x.x"
-+>>>>>>> .their
-       }
-     },
-     "hmac-drbg": {
-@@ -4307,9 +5869,15 @@
-       "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "hash.js": "1.1.3",
-         "minimalistic-assert": "1.0.1",
-         "minimalistic-crypto-utils": "1.0.1"
-+=======
-+        "hash.js": "^1.0.3",
-+        "minimalistic-assert": "^1.0.0",
-+        "minimalistic-crypto-utils": "^1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "hoek": {
-@@ -4342,12 +5910,21 @@
-       "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "domelementtype": "1.3.0",
-         "domhandler": "2.4.2",
-         "domutils": "1.5.1",
-         "entities": "1.1.1",
-         "inherits": "2.0.3",
-         "readable-stream": "2.3.6"
-+=======
-+        "domelementtype": "^1.3.0",
-+        "domhandler": "^2.3.0",
-+        "domutils": "^1.5.1",
-+        "entities": "^1.1.1",
-+        "inherits": "^2.0.1",
-+        "readable-stream": "^2.0.2"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -4362,6 +5939,7 @@
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-@@ -4369,6 +5947,15 @@
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-+=======
-+            "core-util-is": "~1.0.0",
-+            "inherits": "~2.0.3",
-+            "isarray": "~1.0.0",
-+            "process-nextick-args": "~2.0.0",
-+            "safe-buffer": "~5.1.1",
-+            "string_decoder": "~1.1.1",
-+            "util-deprecate": "~1.0.1"
-+>>>>>>> .their
-           }
-         },
-         "string_decoder": {
-@@ -4377,7 +5964,11 @@
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "safe-buffer": "5.1.2"
-+=======
-+            "safe-buffer": "~5.1.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -4391,7 +5982,11 @@
-         "depd": "1.1.1",
-         "inherits": "2.0.3",
-         "setprototypeof": "1.0.3",
-+<<<<<<< .our
-         "statuses": "1.5.0"
-+=======
-+        "statuses": ">= 1.3.1 < 2"
-+>>>>>>> .their
-       }
-     },
-     "http-signature": {
-@@ -4400,9 +5995,15 @@
-       "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "assert-plus": "1.0.0",
-         "jsprim": "1.4.1",
-         "sshpk": "1.14.1"
-+=======
-+        "assert-plus": "^1.0.0",
-+        "jsprim": "^1.2.2",
-+        "sshpk": "^1.7.0"
-+>>>>>>> .their
-       }
-     },
-     "https-browserify": {
-@@ -4417,20 +6018,35 @@
-       "integrity": "sha1-NffabEjOTdv6JkiRrFk+5f+GceY=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "agent-base": "2.1.1",
-         "debug": "2.6.9",
-         "extend": "3.0.1"
-+=======
-+        "agent-base": "2",
-+        "debug": "2",
-+        "extend": "3"
-+>>>>>>> .their
-       }
-     },
-     "husky": {
-       "version": "0.14.3",
-       "resolved": "https://registry.npmjs.org/husky/-/husky-0.14.3.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-xp7XTi0neXaaF7qDmbVM4LY8EsM=",
-       "dev": true,
-       "requires": {
-         "is-ci": "1.1.0",
-         "normalize-path": "1.0.0",
-         "strip-indent": "2.0.0"
-+=======
-+      "integrity": "sha512-e21wivqHpstpoiWA/Yi8eFti8E+sQDSS53cpJsPptPs295QTOQR0ZwnHo2TXy1XOpZFD9rPOd3NpmqTK6uMLJA==",
-+      "dev": true,
-+      "requires": {
-+        "is-ci": "^1.0.10",
-+        "normalize-path": "^1.0.0",
-+        "strip-indent": "^2.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "normalize-path": {
-@@ -4489,8 +6105,13 @@
-       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "once": "1.4.0",
-         "wrappy": "1.0.2"
-+=======
-+        "once": "^1.3.0",
-+        "wrappy": "1"
-+>>>>>>> .their
-       }
-     },
-     "inherits": {
-@@ -4511,7 +6132,11 @@
-       "integrity": "sha1-+Tk0ccGKedFyT4Y/o4tYY3Ct4qU=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "source-map": "0.5.7"
-+=======
-+        "source-map": "~0.5.3"
-+>>>>>>> .their
-       }
-     },
-     "inquirer": {
-@@ -4520,6 +6145,7 @@
-       "integrity": "sha1-HvK/1jUE3wvHV4X/+MLEHfEvB34=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "ansi-escapes": "1.4.0",
-         "ansi-regex": "2.1.1",
-         "chalk": "1.1.3",
-@@ -4533,6 +6159,21 @@
-         "string-width": "1.0.2",
-         "strip-ansi": "3.0.1",
-         "through": "2.3.8"
-+=======
-+        "ansi-escapes": "^1.1.0",
-+        "ansi-regex": "^2.0.0",
-+        "chalk": "^1.0.0",
-+        "cli-cursor": "^1.0.1",
-+        "cli-width": "^2.0.0",
-+        "figures": "^1.3.5",
-+        "lodash": "^4.3.0",
-+        "readline2": "^1.0.1",
-+        "run-async": "^0.1.0",
-+        "rx-lite": "^3.1.2",
-+        "string-width": "^1.0.1",
-+        "strip-ansi": "^3.0.0",
-+        "through": "^2.3.6"
-+>>>>>>> .their
-       }
-     },
-     "insert-module-globals": {
-@@ -4541,6 +6182,7 @@
-       "integrity": "sha512-R3sidKJr3SsggqQQ5cEwQb3pWG8RNx0UnpyeiOSR6jorRIeAOzH2gkTWnNdMnyRiVbjrG047K7UCtlMkQ1Mo9w==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "JSONStream": "1.3.2",
-         "combine-source-map": "0.8.0",
-         "concat-stream": "1.6.2",
-@@ -4550,6 +6192,17 @@
-         "process": "0.11.10",
-         "through2": "2.0.3",
-         "xtend": "4.0.1"
-+=======
-+        "JSONStream": "^1.0.3",
-+        "combine-source-map": "^0.8.0",
-+        "concat-stream": "^1.6.1",
-+        "is-buffer": "^1.1.0",
-+        "lexical-scope": "^1.2.0",
-+        "path-is-absolute": "^1.0.1",
-+        "process": "~0.11.0",
-+        "through2": "^2.0.0",
-+        "xtend": "^4.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "concat-stream": {
-@@ -4558,10 +6211,17 @@
-           "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "buffer-from": "1.0.0",
-             "inherits": "2.0.3",
-             "readable-stream": "2.3.6",
-             "typedarray": "0.0.6"
-+=======
-+            "buffer-from": "^1.0.0",
-+            "inherits": "^2.0.3",
-+            "readable-stream": "^2.2.2",
-+            "typedarray": "^0.0.6"
-+>>>>>>> .their
-           }
-         },
-         "isarray": {
-@@ -4576,6 +6236,7 @@
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-@@ -4583,6 +6244,15 @@
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-+=======
-+            "core-util-is": "~1.0.0",
-+            "inherits": "~2.0.3",
-+            "isarray": "~1.0.0",
-+            "process-nextick-args": "~2.0.0",
-+            "safe-buffer": "~5.1.1",
-+            "string_decoder": "~1.1.1",
-+            "util-deprecate": "~1.0.1"
-+>>>>>>> .their
-           }
-         },
-         "string_decoder": {
-@@ -4591,7 +6261,11 @@
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "safe-buffer": "5.1.2"
-+=======
-+            "safe-buffer": "~5.1.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -4638,8 +6312,13 @@
-       "integrity": "sha512-pyfU/0kHdISIgslFfZN9nfY1Gk3MquQgUm1mJTjdkEPpkAKNWuBTSqFwewOpR7N351VkErCiyV71zX7mlQQqsg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "is-alphabetical": "1.0.2",
-         "is-decimal": "1.0.2"
-+=======
-+        "is-alphabetical": "^1.0.0",
-+        "is-decimal": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "is-arrayish": {
-@@ -4654,7 +6333,11 @@
-       "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "binary-extensions": "1.11.0"
-+=======
-+        "binary-extensions": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "is-buffer": {
-@@ -4669,7 +6352,11 @@
-       "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "builtin-modules": "1.1.1"
-+=======
-+        "builtin-modules": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "is-callable": {
-@@ -4684,7 +6371,11 @@
-       "integrity": "sha512-c7TnwxLePuqIlxHgr7xtxzycJPegNHFuIrBkwbf8hc58//+Op1CqFkyS+xnIMkwn9UsJIwc174BIjkyBmSpjKg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "ci-info": "1.1.3"
-+=======
-+        "ci-info": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "is-date-object": {
-@@ -4723,7 +6414,11 @@
-       "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "is-primitive": "2.0.0"
-+=======
-+        "is-primitive": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "is-extendable": {
-@@ -4750,7 +6445,11 @@
-       "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "number-is-nan": "1.0.1"
-+=======
-+        "number-is-nan": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "is-fullwidth-code-point": {
-@@ -4759,7 +6458,11 @@
-       "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "number-is-nan": "1.0.1"
-+=======
-+        "number-is-nan": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "is-glob": {
-@@ -4768,7 +6471,11 @@
-       "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "is-extglob": "1.0.0"
-+=======
-+        "is-extglob": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "is-gzip": {
-@@ -4795,8 +6502,13 @@
-       "integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "global-dirs": "0.1.1",
-         "is-path-inside": "1.0.1"
-+=======
-+        "global-dirs": "^0.1.0",
-+        "is-path-inside": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "is-my-ip-valid": {
-@@ -4811,11 +6523,19 @@
-       "integrity": "sha512-IBhBslgngMQN8DDSppmgDv7RNrlFotuuDsKcrCP3+HbFaVivIBU7u9oiiErw8sH4ynx3+gOGQ3q2otkgiSi6kg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "generate-function": "2.0.0",
-         "generate-object-property": "1.2.0",
-         "is-my-ip-valid": "1.0.0",
-         "jsonpointer": "4.0.1",
-         "xtend": "4.0.1"
-+=======
-+        "generate-function": "^2.0.0",
-+        "generate-object-property": "^1.1.0",
-+        "is-my-ip-valid": "^1.0.0",
-+        "jsonpointer": "^4.0.0",
-+        "xtend": "^4.0.0"
-+>>>>>>> .their
-       }
-     },
-     "is-npm": {
-@@ -4830,7 +6550,11 @@
-       "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "kind-of": "3.2.2"
-+=======
-+        "kind-of": "^3.0.2"
-+>>>>>>> .their
-       }
-     },
-     "is-obj": {
-@@ -4857,7 +6581,11 @@
-       "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "is-path-inside": "1.0.1"
-+=======
-+        "is-path-inside": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "is-path-inside": {
-@@ -4866,7 +6594,11 @@
-       "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "path-is-inside": "1.0.2"
-+=======
-+        "path-is-inside": "^1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "is-plain-obj": {
-@@ -4905,7 +6637,11 @@
-       "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "has": "1.0.1"
-+=======
-+        "has": "^1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "is-resolvable": {
-@@ -4944,7 +6680,11 @@
-       "integrity": "sha1-Thqg+1G/vLPpJogAE5cgLBd1tm4=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "text-extensions": "1.7.0"
-+=======
-+        "text-extensions": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "is-typedarray": {
-@@ -5018,6 +6758,7 @@
-       "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "abbrev": "1.0.9",
-         "async": "1.5.2",
-         "escodegen": "1.8.1",
-@@ -5032,6 +6773,22 @@
-         "supports-color": "3.2.3",
-         "which": "1.3.0",
-         "wordwrap": "1.0.0"
-+=======
-+        "abbrev": "1.0.x",
-+        "async": "1.x",
-+        "escodegen": "1.8.x",
-+        "esprima": "2.7.x",
-+        "glob": "^5.0.15",
-+        "handlebars": "^4.0.1",
-+        "js-yaml": "3.x",
-+        "mkdirp": "0.5.x",
-+        "nopt": "3.x",
-+        "once": "1.x",
-+        "resolve": "1.1.x",
-+        "supports-color": "^3.1.0",
-+        "which": "^1.1.1",
-+        "wordwrap": "^1.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "abbrev": {
-@@ -5046,11 +6803,19 @@
-           "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "inflight": "1.0.6",
-             "inherits": "2.0.3",
-             "minimatch": "3.0.4",
-             "once": "1.4.0",
-             "path-is-absolute": "1.0.1"
-+=======
-+            "inflight": "^1.0.4",
-+            "inherits": "2",
-+            "minimatch": "2 || 3",
-+            "once": "^1.3.0",
-+            "path-is-absolute": "^1.0.0"
-+>>>>>>> .their
-           }
-         },
-         "resolve": {
-@@ -5079,14 +6844,23 @@
-       "integrity": "sha512-saJstZWv7oNeOyBh3+Dx1qWzhW0+e6/8eDzo7p5rDFqxntSztloLtuKu+Ejhtq82jsilwOIZYsCz+lIjthg1Hw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "argparse": "1.0.10",
-         "esprima": "4.0.0"
-+=======
-+        "argparse": "^1.0.7",
-+        "esprima": "^4.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "esprima": {
-           "version": "4.0.0",
-           "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-RJnt3NERDgshi6zy+n9/WfVcqAQ=",
-+=======
-+          "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==",
-+>>>>>>> .their
-           "dev": true
-         }
-       }
-@@ -5105,6 +6879,7 @@
-       "dev": true,
-       "optional": true,
-       "requires": {
-+<<<<<<< .our
-         "abab": "1.0.4",
-         "acorn": "2.7.0",
-         "acorn-globals": "1.0.9",
-@@ -5120,6 +6895,23 @@
-         "webidl-conversions": "2.0.1",
-         "whatwg-url-compat": "0.6.5",
-         "xml-name-validator": "2.0.1"
-+=======
-+        "abab": "^1.0.0",
-+        "acorn": "^2.4.0",
-+        "acorn-globals": "^1.0.4",
-+        "cssom": ">= 0.3.0 < 0.4.0",
-+        "cssstyle": ">= 0.2.29 < 0.3.0",
-+        "escodegen": "^1.6.1",
-+        "nwmatcher": ">= 1.3.7 < 2.0.0",
-+        "parse5": "^1.5.1",
-+        "request": "^2.55.0",
-+        "sax": "^1.1.4",
-+        "symbol-tree": ">= 3.1.0 < 4.0.0",
-+        "tough-cookie": "^2.2.0",
-+        "webidl-conversions": "^2.0.0",
-+        "whatwg-url-compat": "~0.6.5",
-+        "xml-name-validator": ">= 2.0.1 < 3.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "acorn": {
-@@ -5155,7 +6947,11 @@
-       "integrity": "sha1-YRwj6BTbN1Un34URk9tZ3Sryf0U=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "jsonify": "0.0.0"
-+=======
-+        "jsonify": "~0.0.0"
-+>>>>>>> .their
-       }
-     },
-     "json-stringify-safe": {
-@@ -5170,7 +6966,11 @@
-       "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "graceful-fs": "4.1.11"
-+=======
-+        "graceful-fs": "^4.1.6"
-+>>>>>>> .their
-       }
-     },
-     "jsonify": {
-@@ -5221,7 +7021,11 @@
-       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "is-buffer": "1.1.6"
-+=======
-+        "is-buffer": "^1.1.5"
-+>>>>>>> .their
-       }
-     },
-     "klaw": {
-@@ -5230,7 +7034,11 @@
-       "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "graceful-fs": "4.1.11"
-+=======
-+        "graceful-fs": "^4.1.9"
-+>>>>>>> .their
-       }
-     },
-     "labeled-stream-splicer": {
-@@ -5239,9 +7047,15 @@
-       "integrity": "sha512-MC94mHZRvJ3LfykJlTUipBqenZz1pacOZEMhhQ8dMGcDHs0SBE5GbsavUXV7YtP3icBW17W0Zy1I0lfASmo9Pg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "inherits": "2.0.3",
-         "isarray": "2.0.4",
-         "stream-splicer": "2.0.0"
-+=======
-+        "inherits": "^2.0.1",
-+        "isarray": "^2.0.4",
-+        "stream-splicer": "^2.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -5258,7 +7072,11 @@
-       "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "package-json": "4.0.1"
-+=======
-+        "package-json": "^4.0.0"
-+>>>>>>> .their
-       }
-     },
-     "lazy-cache": {
-@@ -5274,7 +7092,11 @@
-       "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "invert-kv": "1.0.0"
-+=======
-+        "invert-kv": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "leven": {
-@@ -5289,8 +7111,13 @@
-       "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "prelude-ls": "1.1.2",
-         "type-check": "0.3.2"
-+=======
-+        "prelude-ls": "~1.1.2",
-+        "type-check": "~0.3.2"
-+>>>>>>> .their
-       }
-     },
-     "lexical-scope": {
-@@ -5299,7 +7126,11 @@
-       "integrity": "sha1-/Ope3HBKSzqHls3KQZw6CvryLfQ=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "astw": "2.2.0"
-+=======
-+        "astw": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "linkify-it": {
-@@ -5308,7 +7139,11 @@
-       "integrity": "sha1-B3NSbDF8j9E71TTuHRgP+Iq/iBo=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "uc.micro": "1.0.5"
-+=======
-+        "uc.micro": "^1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "lint": {
-@@ -5323,11 +7158,19 @@
-       "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "graceful-fs": "4.1.11",
-         "parse-json": "2.2.0",
-         "pify": "2.3.0",
-         "pinkie-promise": "2.0.1",
-         "strip-bom": "2.0.0"
-+=======
-+        "graceful-fs": "^4.1.2",
-+        "parse-json": "^2.2.0",
-+        "pify": "^2.0.0",
-+        "pinkie-promise": "^2.0.0",
-+        "strip-bom": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "load-plugin": {
-@@ -5336,8 +7179,13 @@
-       "integrity": "sha512-FYzamtURIJefQykZGtiClYuZkJBUKzmx8Tc74y8JGAulDzbzVm/C+w/MbAljHRr+REL0cRzy3WgnHE+T8gce5g==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "npm-prefix": "1.2.0",
-         "resolve-from": "4.0.0"
-+=======
-+        "npm-prefix": "^1.2.0",
-+        "resolve-from": "^4.0.0"
-+>>>>>>> .their
-       }
-     },
-     "locate-path": {
-@@ -5346,8 +7194,13 @@
-       "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "p-locate": "2.0.0",
-         "path-exists": "3.0.0"
-+=======
-+        "p-locate": "^2.0.0",
-+        "path-exists": "^3.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "path-exists": {
-@@ -5484,8 +7337,13 @@
-       "integrity": "sha1-5zoDhcg1VZF0bgILmWecaQ5o+6A=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "lodash._reinterpolate": "3.0.0",
-         "lodash.templatesettings": "4.1.0"
-+=======
-+        "lodash._reinterpolate": "~3.0.0",
-+        "lodash.templatesettings": "^4.0.0"
-+>>>>>>> .their
-       }
-     },
-     "lodash.templatesettings": {
-@@ -5494,7 +7352,11 @@
-       "integrity": "sha1-K01OlbpEDZFf8IvImeRVNmZxMxY=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "lodash._reinterpolate": "3.0.0"
-+=======
-+        "lodash._reinterpolate": "~3.0.0"
-+>>>>>>> .their
-       }
-     },
-     "lodash.transform": {
-@@ -5509,7 +7371,11 @@
-       "integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "chalk": "1.1.3"
-+=======
-+        "chalk": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "longest": {
-@@ -5530,8 +7396,13 @@
-       "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "currently-unhandled": "0.4.1",
-         "signal-exit": "3.0.2"
-+=======
-+        "currently-unhandled": "^0.4.1",
-+        "signal-exit": "^3.0.0"
-+>>>>>>> .their
-       }
-     },
-     "lowercase-keys": {
-@@ -5546,8 +7417,13 @@
-       "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "pseudomap": "1.0.2",
-         "yallist": "2.1.2"
-+=======
-+        "pseudomap": "^1.0.2",
-+        "yallist": "^2.1.2"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "yallist": {
-@@ -5564,7 +7440,11 @@
-       "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "pify": "3.0.0"
-+=======
-+        "pify": "^3.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "pify": {
-@@ -5599,11 +7479,19 @@
-       "integrity": "sha1-ztA39Ec+6fUVOsQU933IPJG6knw=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "argparse": "1.0.10",
-         "entities": "1.1.1",
-         "linkify-it": "1.2.4",
-         "mdurl": "1.0.1",
-         "uc.micro": "1.0.5"
-+=======
-+        "argparse": "^1.0.7",
-+        "entities": "~1.1.1",
-+        "linkify-it": "~1.2.2",
-+        "mdurl": "~1.0.1",
-+        "uc.micro": "^1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "markdown-it-named-headers": {
-@@ -5612,7 +7500,11 @@
-       "integrity": "sha1-gu/CgyQkCmsed7mq5QF3HV81HB8=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "string": "3.3.3"
-+=======
-+        "string": "^3.0.1"
-+>>>>>>> .their
-       }
-     },
-     "markdown-table": {
-@@ -5627,10 +7519,17 @@
-       "integrity": "sha1-dO2phLgTZVfe4QZO/RXkBhdAaZc=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "cheerio": "0.20.0",
-         "conventional-changelog-cli": "1.3.22",
-         "is-file": "1.0.0",
-         "markdown-it": "6.1.1",
-+=======
-+        "cheerio": "^0.20.0",
-+        "conventional-changelog-cli": "^1.2.0",
-+        "is-file": "^1.0.0",
-+        "markdown-it": "^6.0.1",
-+>>>>>>> .their
-         "markdown-it-named-headers": "0.0.4"
-       },
-       "dependencies": {
-@@ -5640,12 +7539,21 @@
-           "integrity": "sha1-XHEPK6uVZTJyhCugHG6mGzVF7DU=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "css-select": "1.2.0",
-             "dom-serializer": "0.1.0",
-             "entities": "1.1.1",
-             "htmlparser2": "3.8.3",
-             "jsdom": "7.2.2",
-             "lodash": "4.17.10"
-+=======
-+            "css-select": "~1.2.0",
-+            "dom-serializer": "~0.1.0",
-+            "entities": "~1.1.1",
-+            "htmlparser2": "~3.8.1",
-+            "jsdom": "^7.0.2",
-+            "lodash": "^4.1.0"
-+>>>>>>> .their
-           }
-         },
-         "domhandler": {
-@@ -5654,7 +7562,11 @@
-           "integrity": "sha1-LeWaCCLVAn+r/28DLCsloqir5zg=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "domelementtype": "1.3.0"
-+=======
-+            "domelementtype": "1"
-+>>>>>>> .their
-           }
-         },
-         "htmlparser2": {
-@@ -5663,11 +7575,19 @@
-           "integrity": "sha1-mWwosZFRaovoZQGn15dX5ccMEGg=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "domelementtype": "1.3.0",
-             "domhandler": "2.3.0",
-             "domutils": "1.5.1",
-             "entities": "1.0.0",
-             "readable-stream": "1.1.14"
-+=======
-+            "domelementtype": "1",
-+            "domhandler": "2.3",
-+            "domutils": "1.5",
-+            "entities": "1.0",
-+            "readable-stream": "1.1"
-+>>>>>>> .their
-           },
-           "dependencies": {
-             "entities": {
-@@ -5683,10 +7603,17 @@
-     "matcher-collection": {
-       "version": "1.0.5",
-       "resolved": "https://registry.npmjs.org/matcher-collection/-/matcher-collection-1.0.5.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-LuCVQ4Nyy4iE8FgjQTjAXGROwzk=",
-       "dev": true,
-       "requires": {
-         "minimatch": "3.0.4"
-+=======
-+      "integrity": "sha512-nUCmzKipcJEwYsBVAFh5P+d7JBuhJaW1xs85Hara9xuMLqtCVUrW6DSC0JVIkluxEH2W45nPBM/wjHtBXa/tYA==",
-+      "dev": true,
-+      "requires": {
-+        "minimatch": "^3.0.2"
-+>>>>>>> .their
-       }
-     },
-     "math-random": {
-@@ -5701,8 +7628,13 @@
-       "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "hash-base": "3.0.4",
-         "inherits": "2.0.3"
-+=======
-+        "hash-base": "^3.0.0",
-+        "inherits": "^2.0.1"
-+>>>>>>> .their
-       }
-     },
-     "mdast-comment-marker": {
-@@ -5717,8 +7649,13 @@
-       "integrity": "sha1-zbX4TitqLTEU3zO9BdnLMuPECDo=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unist-util-modify-children": "1.1.2",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unist-util-modify-children": "^1.0.0",
-+        "unist-util-visit": "^1.1.0"
-+>>>>>>> .their
-       }
-     },
-     "mdast-util-heading-style": {
-@@ -5745,6 +7682,7 @@
-       "integrity": "sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "camelcase-keys": "4.2.0",
-         "decamelize-keys": "1.1.0",
-         "loud-rejection": "1.6.0",
-@@ -5754,6 +7692,17 @@
-         "read-pkg-up": "3.0.0",
-         "redent": "2.0.0",
-         "trim-newlines": "2.0.0"
-+=======
-+        "camelcase-keys": "^4.0.0",
-+        "decamelize-keys": "^1.0.0",
-+        "loud-rejection": "^1.0.0",
-+        "minimist": "^1.1.3",
-+        "minimist-options": "^3.0.1",
-+        "normalize-package-data": "^2.3.4",
-+        "read-pkg-up": "^3.0.0",
-+        "redent": "^2.0.0",
-+        "trim-newlines": "^2.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "find-up": {
-@@ -5762,7 +7711,11 @@
-           "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "locate-path": "2.0.0"
-+=======
-+            "locate-path": "^2.0.0"
-+>>>>>>> .their
-           }
-         },
-         "load-json-file": {
-@@ -5771,10 +7724,17 @@
-           "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "graceful-fs": "4.1.11",
-             "parse-json": "4.0.0",
-             "pify": "3.0.0",
-             "strip-bom": "3.0.0"
-+=======
-+            "graceful-fs": "^4.1.2",
-+            "parse-json": "^4.0.0",
-+            "pify": "^3.0.0",
-+            "strip-bom": "^3.0.0"
-+>>>>>>> .their
-           }
-         },
-         "parse-json": {
-@@ -5783,8 +7743,13 @@
-           "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "error-ex": "1.3.1",
-             "json-parse-better-errors": "1.0.2"
-+=======
-+            "error-ex": "^1.3.1",
-+            "json-parse-better-errors": "^1.0.1"
-+>>>>>>> .their
-           }
-         },
-         "path-type": {
-@@ -5793,7 +7758,11 @@
-           "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "pify": "3.0.0"
-+=======
-+            "pify": "^3.0.0"
-+>>>>>>> .their
-           }
-         },
-         "pify": {
-@@ -5808,9 +7777,15 @@
-           "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "load-json-file": "4.0.0",
-             "normalize-package-data": "2.4.0",
-             "path-type": "3.0.0"
-+=======
-+            "load-json-file": "^4.0.0",
-+            "normalize-package-data": "^2.3.2",
-+            "path-type": "^3.0.0"
-+>>>>>>> .their
-           }
-         },
-         "read-pkg-up": {
-@@ -5819,8 +7794,13 @@
-           "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "find-up": "2.1.0",
-             "read-pkg": "3.0.0"
-+=======
-+            "find-up": "^2.0.0",
-+            "read-pkg": "^3.0.0"
-+>>>>>>> .their
-           }
-         },
-         "strip-bom": {
-@@ -5832,6 +7812,7 @@
-       }
-     },
-     "micro": {
-+<<<<<<< .our
-       "version": "9.3.1",
-       "resolved": "https://registry.npmjs.org/micro/-/micro-9.3.1.tgz",
-       "integrity": "sha512-83uimpPJqfwkfKvJl2WWontBlV3hmzrIgyJ+L2uhDXKNk7Ll+/ezK3zBz7TljubpKPqjM0JdT2Ker4MTPmhjgA==",
-@@ -5879,6 +7860,17 @@
-             "has-flag": "3.0.0"
-           }
-         }
-+=======
-+      "version": "9.1.4",
-+      "resolved": "https://registry.npmjs.org/micro/-/micro-9.1.4.tgz",
-+      "integrity": "sha512-2eQ5QpO33LAPQJ/1iA3BrtLzdYlOCAXlstY4vcIj3SEmv0tsWuNZpsfgn1o8xGAYzf15kb+FXnEx8EklXz+pPg==",
-+      "dev": true,
-+      "requires": {
-+        "content-type": "1.0.4",
-+        "is-stream": "1.1.0",
-+        "mri": "1.1.0",
-+        "raw-body": "2.3.2"
-+>>>>>>> .their
-       }
-     },
-     "micro-compress": {
-@@ -5887,7 +7879,11 @@
-       "integrity": "sha1-U/WoC0rQMgyhZaVZtuPfFF1PcE8=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "compression": "1.7.3"
-+=======
-+        "compression": "^1.6.2"
-+>>>>>>> .their
-       }
-     },
-     "micromatch": {
-@@ -5896,6 +7892,7 @@
-       "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "arr-diff": "2.0.0",
-         "array-unique": "0.2.1",
-         "braces": "1.8.5",
-@@ -5909,16 +7906,39 @@
-         "object.omit": "2.0.1",
-         "parse-glob": "3.0.4",
-         "regex-cache": "0.4.4"
-+=======
-+        "arr-diff": "^2.0.0",
-+        "array-unique": "^0.2.1",
-+        "braces": "^1.8.2",
-+        "expand-brackets": "^0.1.4",
-+        "extglob": "^0.3.1",
-+        "filename-regex": "^2.0.0",
-+        "is-extglob": "^1.0.0",
-+        "is-glob": "^2.0.1",
-+        "kind-of": "^3.0.2",
-+        "normalize-path": "^2.0.1",
-+        "object.omit": "^2.0.0",
-+        "parse-glob": "^3.0.4",
-+        "regex-cache": "^0.4.2"
-+>>>>>>> .their
-       }
-     },
-     "miller-rabin": {
-       "version": "4.0.1",
-       "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-8IA1HIZbDcViqEYpZtqlNUPHik0=",
-       "dev": true,
-       "requires": {
-         "bn.js": "4.11.8",
-         "brorand": "1.1.0"
-+=======
-+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
-+      "dev": true,
-+      "requires": {
-+        "bn.js": "^4.0.0",
-+        "brorand": "^1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "mime": {
-@@ -5939,7 +7959,11 @@
-       "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "mime-db": "1.33.0"
-+=======
-+        "mime-db": "~1.33.0"
-+>>>>>>> .their
-       }
-     },
-     "mimic-fn": {
-@@ -5963,10 +7987,17 @@
-     "minimatch": {
-       "version": "3.0.4",
-       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
-       "dev": true,
-       "requires": {
-         "brace-expansion": "1.1.11"
-+=======
-+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-+      "dev": true,
-+      "requires": {
-+        "brace-expansion": "^1.1.7"
-+>>>>>>> .their
-       }
-     },
-     "minimist": {
-@@ -5981,8 +8012,13 @@
-       "integrity": "sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "arrify": "1.0.1",
-         "is-plain-obj": "1.1.0"
-+=======
-+        "arrify": "^1.0.1",
-+        "is-plain-obj": "^1.1.0"
-+>>>>>>> .their
-       }
-     },
-     "minipass": {
-@@ -5991,8 +8027,13 @@
-       "integrity": "sha512-jWC2Eg+Np4bxah7llu1IrUNSJQxtLz/J+pOjTM0nFpJXGAaV18XBWhUn031Q1tAA/TJtA1jgwnOe9S2PQa4Lbg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "safe-buffer": "5.1.2",
-         "yallist": "3.0.2"
-+=======
-+        "safe-buffer": "^5.1.1",
-+        "yallist": "^3.0.0"
-+>>>>>>> .their
-       }
-     },
-     "minizlib": {
-@@ -6001,7 +8042,11 @@
-       "integrity": "sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "minipass": "2.3.0"
-+=======
-+        "minipass": "^2.2.1"
-+>>>>>>> .their
-       }
-     },
-     "mkdirp": {
-@@ -6035,7 +8080,11 @@
-       "requires": {
-         "decompress-zip": "0.3.0",
-         "fs-extra": "0.26.7",
-+<<<<<<< .our
-         "request": "2.85.0"
-+=======
-+        "request": "^2.79.0"
-+>>>>>>> .their
-       }
-     },
-     "modify-values": {
-@@ -6050,6 +8099,7 @@
-       "integrity": "sha1-IyFYM/HaE/1gbMuAh7RIUty4If0=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "JSONStream": "1.3.2",
-         "browser-resolve": "1.11.2",
-         "cached-path-relative": "1.0.1",
-@@ -6065,6 +8115,23 @@
-         "subarg": "1.0.0",
-         "through2": "2.0.3",
-         "xtend": "4.0.1"
-+=======
-+        "JSONStream": "^1.0.3",
-+        "browser-resolve": "^1.7.0",
-+        "cached-path-relative": "^1.0.0",
-+        "concat-stream": "~1.5.0",
-+        "defined": "^1.0.0",
-+        "detective": "^4.0.0",
-+        "duplexer2": "^0.1.2",
-+        "inherits": "^2.0.1",
-+        "parents": "^1.0.0",
-+        "readable-stream": "^2.0.2",
-+        "resolve": "^1.1.3",
-+        "stream-combiner2": "^1.1.1",
-+        "subarg": "^1.0.0",
-+        "through2": "^2.0.0",
-+        "xtend": "^4.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -6079,6 +8146,7 @@
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-@@ -6086,6 +8154,15 @@
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-+=======
-+            "core-util-is": "~1.0.0",
-+            "inherits": "~2.0.3",
-+            "isarray": "~1.0.0",
-+            "process-nextick-args": "~2.0.0",
-+            "safe-buffer": "~5.1.1",
-+            "string_decoder": "~1.1.1",
-+            "util-deprecate": "~1.0.1"
-+>>>>>>> .their
-           }
-         },
-         "string_decoder": {
-@@ -6094,7 +8171,11 @@
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "safe-buffer": "5.1.2"
-+=======
-+            "safe-buffer": "~5.1.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -6154,7 +8235,11 @@
-       "integrity": "sha1-X1Zl2TNRM1yqvvjxxVRRbPXx5OU=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "minimatch": "3.0.4"
-+=======
-+        "minimatch": "^3.0.2"
-+>>>>>>> .their
-       }
-     },
-     "node-fetch": {
-@@ -6175,12 +8260,17 @@
-       "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "abbrev": "1.1.1"
-+=======
-+        "abbrev": "1"
-+>>>>>>> .their
-       }
-     },
-     "normalize-package-data": {
-       "version": "2.4.0",
-       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-EvlaMH1YNSB1oEkHuErIvpisAS8=",
-       "dev": true,
-       "requires": {
-@@ -6188,6 +8278,15 @@
-         "is-builtin-module": "1.0.0",
-         "semver": "5.5.0",
-         "validate-npm-package-license": "3.0.3"
-+=======
-+      "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
-+      "dev": true,
-+      "requires": {
-+        "hosted-git-info": "^2.1.4",
-+        "is-builtin-module": "^1.0.0",
-+        "semver": "2 || 3 || 4 || 5",
-+        "validate-npm-package-license": "^3.0.1"
-+>>>>>>> .their
-       }
-     },
-     "normalize-path": {
-@@ -6196,7 +8295,11 @@
-       "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "remove-trailing-separator": "1.1.0"
-+=======
-+        "remove-trailing-separator": "^1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "npm-prefix": {
-@@ -6205,9 +8308,15 @@
-       "integrity": "sha1-5hlFX3B0ulTMZtbQ033Z8b5ry8A=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "rc": "1.2.7",
-         "shellsubstitute": "1.2.0",
-         "untildify": "2.1.0"
-+=======
-+        "rc": "^1.1.0",
-+        "shellsubstitute": "^1.1.0",
-+        "untildify": "^2.1.0"
-+>>>>>>> .their
-       }
-     },
-     "npm-run-path": {
-@@ -6216,7 +8325,11 @@
-       "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "path-key": "2.0.1"
-+=======
-+        "path-key": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "nth-check": {
-@@ -6225,7 +8338,11 @@
-       "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "boolbase": "1.0.0"
-+=======
-+        "boolbase": "~1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "nugget": {
-@@ -6234,12 +8351,21 @@
-       "integrity": "sha1-IBCVpIfhrTYIGzQy+jytpPjQcbA=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "debug": "2.6.9",
-         "minimist": "1.2.0",
-         "pretty-bytes": "1.0.4",
-         "progress-stream": "1.2.0",
-         "request": "2.85.0",
-         "single-line-log": "1.1.2",
-+=======
-+        "debug": "^2.1.3",
-+        "minimist": "^1.1.0",
-+        "pretty-bytes": "^1.0.2",
-+        "progress-stream": "^1.1.0",
-+        "request": "^2.45.0",
-+        "single-line-log": "^1.1.2",
-+>>>>>>> .their
-         "throttleit": "0.0.2"
-       }
-     },
-@@ -6280,10 +8406,17 @@
-       "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "define-properties": "1.1.2",
-         "function-bind": "1.1.1",
-         "has-symbols": "1.0.0",
-         "object-keys": "1.0.11"
-+=======
-+        "define-properties": "^1.1.2",
-+        "function-bind": "^1.1.1",
-+        "has-symbols": "^1.0.0",
-+        "object-keys": "^1.0.11"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "object-keys": {
-@@ -6300,6 +8433,7 @@
-       "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "for-own": "0.1.5",
-         "is-extendable": "0.1.1"
-       }
-@@ -6311,6 +8445,10 @@
-       "dev": true,
-       "requires": {
-         "object-assign": "4.1.1"
-+=======
-+        "for-own": "^0.1.4",
-+        "is-extendable": "^0.1.1"
-+>>>>>>> .their
-       }
-     },
-     "on-finished": {
-@@ -6334,7 +8472,11 @@
-       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "wrappy": "1.0.2"
-+=======
-+        "wrappy": "1"
-+>>>>>>> .their
-       }
-     },
-     "onetime": {
-@@ -6355,7 +8497,11 @@
-       "integrity": "sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "is-wsl": "1.1.0"
-+=======
-+        "is-wsl": "^1.1.0"
-+>>>>>>> .their
-       }
-     },
-     "optimist": {
-@@ -6364,7 +8510,11 @@
-       "integrity": "sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "wordwrap": "0.0.3"
-+=======
-+        "wordwrap": "~0.0.2"
-+>>>>>>> .their
-       }
-     },
-     "optionator": {
-@@ -6373,12 +8523,21 @@
-       "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "deep-is": "0.1.3",
-         "fast-levenshtein": "2.0.6",
-         "levn": "0.3.0",
-         "prelude-ls": "1.1.2",
-         "type-check": "0.3.2",
-         "wordwrap": "1.0.0"
-+=======
-+        "deep-is": "~0.1.3",
-+        "fast-levenshtein": "~2.0.4",
-+        "levn": "~0.3.0",
-+        "prelude-ls": "~1.1.2",
-+        "type-check": "~0.3.2",
-+        "wordwrap": "~1.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "wordwrap": {
-@@ -6395,10 +8554,17 @@
-       "integrity": "sha1-NnoHitJc+wltpQERXrW0AeB9dJU=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "chalk": "1.1.3",
-         "cli-cursor": "1.0.2",
-         "cli-spinners": "0.2.0",
-         "log-symbols": "1.0.2"
-+=======
-+        "chalk": "^1.1.1",
-+        "cli-cursor": "^1.0.2",
-+        "cli-spinners": "^0.2.0",
-+        "log-symbols": "^1.0.2"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "cli-spinners": {
-@@ -6427,7 +8593,11 @@
-       "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "lcid": "1.0.0"
-+=======
-+        "lcid": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "os-tmpdir": {
-@@ -6448,7 +8618,11 @@
-       "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "p-try": "1.0.0"
-+=======
-+        "p-try": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "p-locate": {
-@@ -6457,7 +8631,11 @@
-       "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "p-limit": "1.2.0"
-+=======
-+        "p-limit": "^1.1.0"
-+>>>>>>> .their
-       }
-     },
-     "p-try": {
-@@ -6472,10 +8650,17 @@
-       "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "got": "6.7.1",
-         "registry-auth-token": "3.3.2",
-         "registry-url": "3.1.0",
-         "semver": "5.5.0"
-+=======
-+        "got": "^6.7.1",
-+        "registry-auth-token": "^3.0.1",
-+        "registry-url": "^3.0.3",
-+        "semver": "^5.1.0"
-+>>>>>>> .their
-       }
-     },
-     "pako": {
-@@ -6490,7 +8675,11 @@
-       "integrity": "sha1-/t1NK/GTp3dF/nHjcdc8MwfZx1E=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "path-platform": "0.11.15"
-+=======
-+        "path-platform": "~0.11.15"
-+>>>>>>> .their
-       }
-     },
-     "parse-asn1": {
-@@ -6499,11 +8688,19 @@
-       "integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "asn1.js": "4.10.1",
-         "browserify-aes": "1.2.0",
-         "create-hash": "1.2.0",
-         "evp_bytestokey": "1.0.3",
-         "pbkdf2": "3.0.16"
-+=======
-+        "asn1.js": "^4.0.0",
-+        "browserify-aes": "^1.0.0",
-+        "create-hash": "^1.1.0",
-+        "evp_bytestokey": "^1.0.0",
-+        "pbkdf2": "^3.0.3"
-+>>>>>>> .their
-       }
-     },
-     "parse-entities": {
-@@ -6512,12 +8709,21 @@
-       "integrity": "sha512-5N9lmQ7tmxfXf+hO3X6KRG6w7uYO/HL9fHalSySTdyn63C3WNvTM/1R8tn1u1larNcEbo3Slcy2bsVDQqvEpUg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "character-entities": "1.2.2",
-         "character-entities-legacy": "1.1.2",
-         "character-reference-invalid": "1.1.2",
-         "is-alphanumerical": "1.0.2",
-         "is-decimal": "1.0.2",
-         "is-hexadecimal": "1.0.2"
-+=======
-+        "character-entities": "^1.0.0",
-+        "character-entities-legacy": "^1.0.0",
-+        "character-reference-invalid": "^1.0.0",
-+        "is-alphanumerical": "^1.0.0",
-+        "is-decimal": "^1.0.0",
-+        "is-hexadecimal": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "parse-github-repo-url": {
-@@ -6532,8 +8738,13 @@
-       "integrity": "sha1-q/cC5LkAUk//eQK2g4YoV7Y/k/4=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "array-unique": "0.3.2",
-         "is-glob": "3.1.0"
-+=======
-+        "array-unique": "^0.3.2",
-+        "is-glob": "^3.1.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "array-unique": {
-@@ -6554,7 +8765,11 @@
-           "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "is-extglob": "2.1.1"
-+=======
-+            "is-extglob": "^2.1.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -6565,10 +8780,17 @@
-       "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "glob-base": "0.3.0",
-         "is-dotfile": "1.0.3",
-         "is-extglob": "1.0.0",
-         "is-glob": "2.0.1"
-+=======
-+        "glob-base": "^0.3.0",
-+        "is-dotfile": "^1.0.0",
-+        "is-extglob": "^1.0.0",
-+        "is-glob": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "parse-json": {
-@@ -6577,7 +8799,11 @@
-       "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "error-ex": "1.3.1"
-+=======
-+        "error-ex": "^1.2.0"
-+>>>>>>> .their
-       }
-     },
-     "parse5": {
-@@ -6599,7 +8825,11 @@
-       "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "pinkie-promise": "2.0.1"
-+=======
-+        "pinkie-promise": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "path-is-absolute": {
-@@ -6638,9 +8868,15 @@
-       "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "graceful-fs": "4.1.11",
-         "pify": "2.3.0",
-         "pinkie-promise": "2.0.1"
-+=======
-+        "graceful-fs": "^4.1.2",
-+        "pify": "^2.0.0",
-+        "pinkie-promise": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "pbkdf2": {
-@@ -6649,11 +8885,19 @@
-       "integrity": "sha512-y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "create-hash": "1.2.0",
-         "create-hmac": "1.1.7",
-         "ripemd160": "2.0.2",
-         "safe-buffer": "5.1.2",
-         "sha.js": "2.4.11"
-+=======
-+        "create-hash": "^1.1.2",
-+        "create-hmac": "^1.1.4",
-+        "ripemd160": "^2.0.1",
-+        "safe-buffer": "^5.0.1",
-+        "sha.js": "^2.4.8"
-+>>>>>>> .their
-       }
-     },
-     "peek-stream": {
-@@ -6662,9 +8906,15 @@
-       "integrity": "sha512-FhJ+YbOSBb9/rIl2ZeE/QHEsWn7PqNYt8ARAY3kIgNGOk13g9FGyIY6JIl/xB/3TFRVoTv5as0l11weORrTekA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "buffer-from": "1.0.0",
-         "duplexify": "3.6.0",
-         "through2": "2.0.3"
-+=======
-+        "buffer-from": "^1.0.0",
-+        "duplexify": "^3.5.0",
-+        "through2": "^2.0.3"
-+>>>>>>> .their
-       }
-     },
-     "performance-now": {
-@@ -6691,7 +8941,11 @@
-       "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "pinkie": "2.0.4"
-+=======
-+        "pinkie": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "pkg-conf": {
-@@ -6700,8 +8954,13 @@
-       "integrity": "sha1-ISZRTKbyq/69FoWW3xi6V4Z/AFg=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "find-up": "2.1.0",
-         "load-json-file": "4.0.0"
-+=======
-+        "find-up": "^2.0.0",
-+        "load-json-file": "^4.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "find-up": {
-@@ -6710,7 +8969,11 @@
-           "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "locate-path": "2.0.0"
-+=======
-+            "locate-path": "^2.0.0"
-+>>>>>>> .their
-           }
-         },
-         "load-json-file": {
-@@ -6719,10 +8982,17 @@
-           "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "graceful-fs": "4.1.11",
-             "parse-json": "4.0.0",
-             "pify": "3.0.0",
-             "strip-bom": "3.0.0"
-+=======
-+            "graceful-fs": "^4.1.2",
-+            "parse-json": "^4.0.0",
-+            "pify": "^3.0.0",
-+            "strip-bom": "^3.0.0"
-+>>>>>>> .their
-           }
-         },
-         "parse-json": {
-@@ -6731,8 +9001,13 @@
-           "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "error-ex": "1.3.1",
-             "json-parse-better-errors": "1.0.2"
-+=======
-+            "error-ex": "^1.3.1",
-+            "json-parse-better-errors": "^1.0.1"
-+>>>>>>> .their
-           }
-         },
-         "pify": {
-@@ -6755,9 +9030,15 @@
-       "integrity": "sha1-VX7yLXPaPIg3EHdmxS6tq94pj+Q=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "debug-log": "1.0.1",
-         "find-root": "1.1.0",
-         "xtend": "4.0.1"
-+=======
-+        "debug-log": "^1.0.0",
-+        "find-root": "^1.0.0",
-+        "xtend": "^4.0.1"
-+>>>>>>> .their
-       }
-     },
-     "pkg-dir": {
-@@ -6766,7 +9047,11 @@
-       "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "find-up": "1.1.2"
-+=======
-+        "find-up": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "pkg-up": {
-@@ -6775,7 +9060,11 @@
-       "integrity": "sha1-Pgj7RhUlxEIWJKM7n35tCvWwWiY=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "find-up": "1.1.2"
-+=======
-+        "find-up": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "plur": {
-@@ -6784,7 +9073,11 @@
-       "integrity": "sha1-dIJFLBoPUI4+NE6uwxLJHCncZVo=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "irregular-plurals": "1.4.0"
-+=======
-+        "irregular-plurals": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "pluralize": {
-@@ -6817,8 +9110,13 @@
-       "integrity": "sha1-CiLoIQYJrTVUL4yNXSFZr/B1HIQ=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "get-stdin": "4.0.1",
-         "meow": "3.7.0"
-+=======
-+        "get-stdin": "^4.0.1",
-+        "meow": "^3.1.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "camelcase": {
-@@ -6833,8 +9131,13 @@
-           "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "camelcase": "2.1.1",
-             "map-obj": "1.0.1"
-+=======
-+            "camelcase": "^2.0.0",
-+            "map-obj": "^1.0.0"
-+>>>>>>> .their
-           }
-         },
-         "indent-string": {
-@@ -6843,7 +9146,11 @@
-           "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "repeating": "2.0.1"
-+=======
-+            "repeating": "^2.0.0"
-+>>>>>>> .their
-           }
-         },
-         "map-obj": {
-@@ -6858,6 +9165,7 @@
-           "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "camelcase-keys": "2.1.0",
-             "decamelize": "1.2.0",
-             "loud-rejection": "1.6.0",
-@@ -6868,6 +9176,18 @@
-             "read-pkg-up": "1.0.1",
-             "redent": "1.0.0",
-             "trim-newlines": "1.0.0"
-+=======
-+            "camelcase-keys": "^2.0.0",
-+            "decamelize": "^1.1.2",
-+            "loud-rejection": "^1.0.0",
-+            "map-obj": "^1.0.1",
-+            "minimist": "^1.1.3",
-+            "normalize-package-data": "^2.3.4",
-+            "object-assign": "^4.0.1",
-+            "read-pkg-up": "^1.0.1",
-+            "redent": "^1.0.0",
-+            "trim-newlines": "^1.0.0"
-+>>>>>>> .their
-           }
-         },
-         "redent": {
-@@ -6876,8 +9196,13 @@
-           "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "indent-string": "2.1.0",
-             "strip-indent": "1.0.1"
-+=======
-+            "indent-string": "^2.1.0",
-+            "strip-indent": "^1.0.1"
-+>>>>>>> .their
-           }
-         },
-         "strip-indent": {
-@@ -6886,7 +9211,11 @@
-           "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "get-stdin": "4.0.1"
-+=======
-+            "get-stdin": "^4.0.1"
-+>>>>>>> .their
-           }
-         },
-         "trim-newlines": {
-@@ -6921,8 +9250,13 @@
-       "integrity": "sha1-LNPP6jO6OonJwSHsM0er6asSX3c=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "speedometer": "0.1.4",
-         "through2": "0.2.3"
-+=======
-+        "speedometer": "~0.1.2",
-+        "through2": "~0.2.3"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "through2": {
-@@ -6931,8 +9265,13 @@
-           "integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "readable-stream": "1.1.14",
-             "xtend": "2.1.2"
-+=======
-+            "readable-stream": "~1.1.9",
-+            "xtend": "~2.1.1"
-+>>>>>>> .their
-           }
-         },
-         "xtend": {
-@@ -6941,7 +9280,11 @@
-           "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "object-keys": "0.4.0"
-+=======
-+            "object-keys": "~0.4.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -6958,11 +9301,19 @@
-       "integrity": "sha512-4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "bn.js": "4.11.8",
-         "browserify-rsa": "4.0.1",
-         "create-hash": "1.2.0",
-         "parse-asn1": "5.1.1",
-         "randombytes": "2.0.6"
-+=======
-+        "bn.js": "^4.1.0",
-+        "browserify-rsa": "^4.0.0",
-+        "create-hash": "^1.1.0",
-+        "parse-asn1": "^5.0.0",
-+        "randombytes": "^2.0.1"
-+>>>>>>> .their
-       }
-     },
-     "pump": {
-@@ -6971,8 +9322,13 @@
-       "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "end-of-stream": "1.4.1",
-         "once": "1.4.0"
-+=======
-+        "end-of-stream": "^1.1.0",
-+        "once": "^1.3.1"
-+>>>>>>> .their
-       }
-     },
-     "pumpify": {
-@@ -6981,9 +9337,15 @@
-       "integrity": "sha512-UWi0klDoq8xtVzlMRgENV9F7iCTZExaJQSQL187UXsxpk9NnrKGqTqqUNYAKGOzucSOxs2+jUnRNI+rLviPhJg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "duplexify": "3.6.0",
-         "inherits": "2.0.3",
-         "pump": "2.0.1"
-+=======
-+        "duplexify": "^3.6.0",
-+        "inherits": "^2.0.3",
-+        "pump": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "punycode": {
-@@ -7028,9 +9390,15 @@
-       "integrity": "sha512-VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "is-number": "4.0.0",
-         "kind-of": "6.0.2",
-         "math-random": "1.0.1"
-+=======
-+        "is-number": "^4.0.0",
-+        "kind-of": "^6.0.0",
-+        "math-random": "^1.0.1"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "is-number": {
-@@ -7053,7 +9421,11 @@
-       "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "safe-buffer": "5.1.2"
-+=======
-+        "safe-buffer": "^5.1.0"
-+>>>>>>> .their
-       }
-     },
-     "randomfill": {
-@@ -7062,8 +9434,13 @@
-       "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "randombytes": "2.0.6",
-         "safe-buffer": "5.1.2"
-+=======
-+        "randombytes": "^2.0.5",
-+        "safe-buffer": "^5.1.0"
-+>>>>>>> .their
-       }
-     },
-     "range-parser": {
-@@ -7090,10 +9467,17 @@
-       "integrity": "sha512-LdLD8xD4zzLsAT5xyushXDNscEjB7+2ulnl8+r1pnESlYtlJtVSoCMBGr30eDRJ3+2Gq89jK9P9e4tCEH1+ywA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "deep-extend": "0.5.1",
-         "ini": "1.3.5",
-         "minimist": "1.2.0",
-         "strip-json-comments": "2.0.1"
-+=======
-+        "deep-extend": "^0.5.1",
-+        "ini": "~1.3.0",
-+        "minimist": "^1.2.0",
-+        "strip-json-comments": "~2.0.1"
-+>>>>>>> .their
-       }
-     },
-     "read-only-stream": {
-@@ -7102,7 +9486,11 @@
-       "integrity": "sha1-JyT9aoET1zdkrCiNQ4YnDB2/F/A=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "readable-stream": "2.3.6"
-+=======
-+        "readable-stream": "^2.0.2"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -7117,6 +9505,7 @@
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-@@ -7124,6 +9513,15 @@
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-+=======
-+            "core-util-is": "~1.0.0",
-+            "inherits": "~2.0.3",
-+            "isarray": "~1.0.0",
-+            "process-nextick-args": "~2.0.0",
-+            "safe-buffer": "~5.1.1",
-+            "string_decoder": "~1.1.1",
-+            "util-deprecate": "~1.0.1"
-+>>>>>>> .their
-           }
-         },
-         "string_decoder": {
-@@ -7132,7 +9530,11 @@
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "safe-buffer": "5.1.2"
-+=======
-+            "safe-buffer": "~5.1.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -7143,9 +9545,15 @@
-       "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "load-json-file": "1.1.0",
-         "normalize-package-data": "2.4.0",
-         "path-type": "1.1.0"
-+=======
-+        "load-json-file": "^1.0.0",
-+        "normalize-package-data": "^2.3.2",
-+        "path-type": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "read-pkg-up": {
-@@ -7154,8 +9562,13 @@
-       "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "find-up": "1.1.2",
-         "read-pkg": "1.1.0"
-+=======
-+        "find-up": "^1.0.0",
-+        "read-pkg": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "readable-stream": {
-@@ -7164,10 +9577,17 @@
-       "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "core-util-is": "1.0.2",
-         "inherits": "2.0.3",
-         "isarray": "0.0.1",
-         "string_decoder": "0.10.31"
-+=======
-+        "core-util-is": "~1.0.0",
-+        "inherits": "~2.0.1",
-+        "isarray": "0.0.1",
-+        "string_decoder": "~0.10.x"
-+>>>>>>> .their
-       }
-     },
-     "readdirp": {
-@@ -7176,10 +9596,17 @@
-       "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "graceful-fs": "4.1.11",
-         "minimatch": "3.0.4",
-         "readable-stream": "2.3.6",
-         "set-immediate-shim": "1.0.1"
-+=======
-+        "graceful-fs": "^4.1.2",
-+        "minimatch": "^3.0.2",
-+        "readable-stream": "^2.0.2",
-+        "set-immediate-shim": "^1.0.1"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -7194,6 +9621,7 @@
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-@@ -7201,6 +9629,15 @@
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-+=======
-+            "core-util-is": "~1.0.0",
-+            "inherits": "~2.0.3",
-+            "isarray": "~1.0.0",
-+            "process-nextick-args": "~2.0.0",
-+            "safe-buffer": "~5.1.1",
-+            "string_decoder": "~1.1.1",
-+            "util-deprecate": "~1.0.1"
-+>>>>>>> .their
-           }
-         },
-         "string_decoder": {
-@@ -7209,7 +9646,11 @@
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "safe-buffer": "5.1.2"
-+=======
-+            "safe-buffer": "~5.1.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -7220,8 +9661,13 @@
-       "integrity": "sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "code-point-at": "1.1.0",
-         "is-fullwidth-code-point": "1.0.0",
-+=======
-+        "code-point-at": "^1.0.0",
-+        "is-fullwidth-code-point": "^1.0.0",
-+>>>>>>> .their
-         "mute-stream": "0.0.5"
-       }
-     },
-@@ -7231,7 +9677,11 @@
-       "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "resolve": "1.7.1"
-+=======
-+        "resolve": "^1.1.6"
-+>>>>>>> .their
-       }
-     },
-     "redent": {
-@@ -7240,17 +9690,29 @@
-       "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "indent-string": "3.2.0",
-         "strip-indent": "2.0.0"
-+=======
-+        "indent-string": "^3.0.0",
-+        "strip-indent": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "regex-cache": {
-       "version": "0.4.4",
-       "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-db3FiioUls7EihKDW8VMjVYjNt0=",
-       "dev": true,
-       "requires": {
-         "is-equal-shallow": "0.1.3"
-+=======
-+      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
-+      "dev": true,
-+      "requires": {
-+        "is-equal-shallow": "^0.1.3"
-+>>>>>>> .their
-       }
-     },
-     "registry-auth-token": {
-@@ -7259,8 +9721,13 @@
-       "integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "rc": "1.2.7",
-         "safe-buffer": "5.1.2"
-+=======
-+        "rc": "^1.1.6",
-+        "safe-buffer": "^5.0.1"
-+>>>>>>> .their
-       }
-     },
-     "registry-url": {
-@@ -7269,7 +9736,11 @@
-       "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "rc": "1.2.7"
-+=======
-+        "rc": "^1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "remark": {
-@@ -7278,9 +9749,15 @@
-       "integrity": "sha512-K0PTsaZvJlXTl9DN6qYlvjTkqSZBFELhROZMrblm2rB+085flN84nz4g/BscKRMqDvhzlK1oQ/xnWQumdeNZYw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "remark-parse": "4.0.0",
-         "remark-stringify": "4.0.0",
-         "unified": "6.2.0"
-+=======
-+        "remark-parse": "^4.0.0",
-+        "remark-stringify": "^4.0.0",
-+        "unified": "^6.0.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-cli": {
-@@ -7289,9 +9766,15 @@
-       "integrity": "sha512-q5GMjGypUS4rTZb3WfMQcGpClSC38A9Ogg1h/HB2GLsqypDetmAfy0X+tuJ6JeyCPVOXXCDgsDCQq4QPqKmxBA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "markdown-extensions": "1.1.1",
-         "remark": "8.0.0",
-         "unified-args": "4.0.0"
-+=======
-+        "markdown-extensions": "^1.1.0",
-+        "remark": "^8.0.0",
-+        "unified-args": "^4.0.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint": {
-@@ -7300,7 +9783,11 @@
-       "integrity": "sha512-wvTTuB5O5pF8SxqahQjjrU3dtuhygYjaGcOZTw+4ACgSE4RBINDlNqN46HjcV3X0ib5GmObJUt5a2mmhtmuTqw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "remark-message-control": "4.1.0"
-+=======
-+        "remark-message-control": "^4.0.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-blockquote-indentation": {
-@@ -7309,12 +9796,21 @@
-       "integrity": "sha512-YrP99MJ3+dQ5JXzq39fUOcYzwcumva/xEM1eFtD2TrQcSdlMLoqYa7gj+aEEhZCjlA5BssTiVoWWW0RjyPPGZw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "mdast-util-to-string": "1.0.4",
-         "plur": "2.1.2",
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "mdast-util-to-string": "^1.0.2",
-+        "plur": "^2.1.2",
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-code-block-style": {
-@@ -7323,10 +9819,17 @@
-       "integrity": "sha512-FRUMhhKwCruH4vkatdMhVO4WlYpysV1NmMILVoK/k+/7uFLSfgvlqo66nzhpMdWL8TQHqdo0LhiXuetGC2WjsQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-definition-case": {
-@@ -7335,10 +9838,17 @@
-       "integrity": "sha512-TxLye5KF4o/rKVTvmPRX5jS9itamFS02yy1IG8bIYcIAJvWsW3GlJaXq4ohK3hKwSQOhtCherEfD6XF9BHLNYQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-definition-spacing": {
-@@ -7347,10 +9857,17 @@
-       "integrity": "sha512-ewzdlFfpTSP11ZuiOln0yfz6Y03aWtgJmLVQNfF1spaT1gURaShjs8Hiilbo719bz96DgvXSZLP6UnkSiZL1vg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-emphasis-marker": {
-@@ -7359,10 +9876,17 @@
-       "integrity": "sha512-QyNsD6y8EZQqhechw0XFGybYMlxn6PFLSlFUO50KSQlJEOgkImN2yJfrNrET2GY4t/fc/uYmeI/q7auUIkLX2w==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-fenced-code-flag": {
-@@ -7371,10 +9895,17 @@
-       "integrity": "sha512-P24T9DRe/nnywPFRpE1UAXAVzN1CX6HmINr15UHbQZo1Cy8KYt7uV9YOR0/XzphtnO/AFenAqZyf7tchW5AUNQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-fenced-code-marker": {
-@@ -7383,10 +9914,17 @@
-       "integrity": "sha512-mX7xAMl5m7xGX+YtOtyXIyv+egD4IQAm6DPGdfunI734QwODwcoBydtpTD56jrY+48nVcQ/anFYT1Blg3Xk3sQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-file-extension": {
-@@ -7395,7 +9933,11 @@
-       "integrity": "sha512-K1Pf5oviaFyCs0FhZqaNZ2odgd5KoV6AlA4nNAMxyylB0Y6t0mYpzECoLSS5Bgxf6f8Op9YbuM2cbjBAsv0dIA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2"
-+=======
-+        "unified-lint-rule": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-final-definition": {
-@@ -7404,10 +9946,17 @@
-       "integrity": "sha512-DK6bphJdQ0xSOQAn+8wOyLIVc3SZW2+ZzCMCLkQnVtHiQ9GHMzFiCkeE3Cq+OClsMI5Yn8wFTHZHPUn58VhNEQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-hard-break-spaces": {
-@@ -7416,10 +9965,17 @@
-       "integrity": "sha512-uh7LqHgRPCphiCvRzBVA4D0Ml2IqPaw89lWJdQ6HvYiV8ChB/OFLBapHi6OKW7NVVVPPJsElPMB/UPUsKFaPTg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-heading-increment": {
-@@ -7428,9 +9984,15 @@
-       "integrity": "sha512-jBAJacXAU5drUpvmymOoFmrdCCNDiz8bzGgJIMjpT0Vyjd0+qdXu2iyFMl/4RkkUli25rpUDXkTHTcxmNbh7Zw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-heading-style": {
-@@ -7439,10 +10001,17 @@
-       "integrity": "sha512-m9Gqr091YdxUtG69xdXYH8fSd3+nsrsMamB/qSWpVSZuWQKZ1mRotr1LO9NphJh6vhw8IfBtG07wgEDn6b40sQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "mdast-util-heading-style": "1.0.3",
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "mdast-util-heading-style": "^1.0.2",
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-link-title-style": {
-@@ -7451,11 +10020,19 @@
-       "integrity": "sha512-91MyqmZjokSzRbgvlKq5sLCJEFkM/MNKT1PDaWa3+GDLBGu7D4eMQGd2x49xX8IdJDEoWy5D8W+2Gb8XKWMUyw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1",
-         "vfile-location": "2.0.3"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1",
-+        "vfile-location": "^2.0.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-list-item-content-indent": {
-@@ -7464,11 +10041,19 @@
-       "integrity": "sha512-R5cdXFFywoBcg+2UUcF9OJ/vt9oqJv+KmTKIQV9CFHWeAfMFiZbxazsSPNaCcO1fW9622hxPCawN/AofDTbP7Q==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "plur": "2.1.2",
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "plur": "^2.1.2",
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-list-item-indent": {
-@@ -7477,11 +10062,19 @@
-       "integrity": "sha512-dSUFGQYtduuaos+5oXH89RTk0rGUe6DFf04q+rxQ7Z3YRbuXhAU2nYeY0/HENYiWJU1xFLteZkDvKMj0NfS3DQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "plur": "2.1.2",
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "plur": "^2.1.2",
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-list-item-spacing": {
-@@ -7490,10 +10083,17 @@
-       "integrity": "sha512-HlPEzRq4LJB6tQ72zgIZ42mOaOSX92O268BLolys/H1x6N29/JNMLfurWqLsrxZrxxHH3H7EUP4dNM2P1kDGBw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-maximum-heading-length": {
-@@ -7502,10 +10102,17 @@
-       "integrity": "sha512-f8ChV9U238gncyvTqmzJ+UpCMj+hFyluWBjVYr2K8CNh+MdSivIxS4zw4170sBRoqNuS3gBxRHG9f4rmdqotJA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "mdast-util-to-string": "1.0.4",
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "mdast-util-to-string": "^1.0.2",
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-maximum-line-length": {
-@@ -7514,10 +10121,17 @@
-       "integrity": "sha512-M4UIXAAbtLgoQbTDVwdKOEFbTKtJSZ+pCW7ZqMFs+cbIN0Svm32LM9+xpVfVU0hLYt3Ypl++EAPfguBNe1PZEw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-auto-link-without-protocol": {
-@@ -7526,11 +10140,19 @@
-       "integrity": "sha512-MHl0hNtF8Rc0lg6iuVP7/0rnp4uZadm3S07/1TiFeqzU22KFxxzcC8980Q4+I8oPZE0d1x80h9DmkNAVFwhDjQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "mdast-util-to-string": "1.0.4",
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "mdast-util-to-string": "^1.0.2",
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-blockquote-without-marker": {
-@@ -7539,11 +10161,19 @@
-       "integrity": "sha512-8VTQ/MP3flvG4U0tFSD+DMVT7F/4u9SnQLb/jjeRC3DzgbsIagIUqpWYAKkc+yBz9S/lgftA92lLP5PrlOa5DA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1",
-         "vfile-location": "2.0.3"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1",
-+        "vfile-location": "^2.0.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-consecutive-blank-lines": {
-@@ -7552,11 +10182,19 @@
-       "integrity": "sha512-IhyUiGTpb/hjtusIVg10q963KeL5CyNfbWOfDZ1KtY2tvdoSPRGrrCuTKo6OG8r1qavM6bU0mtRuIBqNh4lIzA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "plur": "2.1.2",
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "plur": "^2.1.2",
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-duplicate-headings": {
-@@ -7565,11 +10203,19 @@
-       "integrity": "sha512-iZZxyZgwnjvDkydKZzqHBueJvIpGbxnITmgd8xN8TOLZoAg9/KGTQRAkotL1HXNRdkzwggfgB9ONxv/rWtYBmg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "mdast-util-to-string": "1.0.4",
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "mdast-util-to-string": "^1.0.2",
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-emphasis-as-heading": {
-@@ -7578,9 +10224,15 @@
-       "integrity": "sha512-+x17Hrjwne4Mhk2x/Zolnuv/sOclF1oYMDBSEYhBUpn/UAwxhXEXYKkeo0KkWA7Q3+UCLELJvzsk4cGNP6Sgow==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-file-name-articles": {
-@@ -7589,7 +10241,11 @@
-       "integrity": "sha512-SzebnFnilrsINA6QZP1YqPa3SrfSotrLkRWl5FUCoVshBvEFNKJFWXj6Xyt4NjWQ5tJWFtOMysAuHdGT+Odhjg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2"
-+=======
-+        "unified-lint-rule": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-file-name-consecutive-dashes": {
-@@ -7598,7 +10254,11 @@
-       "integrity": "sha512-YP2HBwA00yeD7phvxp4ftiqbfBPfYHPgPfcEcb8oNa1WlUh/58cs9DbSHWKsZG+XLkvEaheC6qUQG02jEKZHPA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2"
-+=======
-+        "unified-lint-rule": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-file-name-irregular-characters": {
-@@ -7607,7 +10267,11 @@
-       "integrity": "sha512-+ks/V6OVMGOPZKw+fe2E4DPvLoslGxvdgtqXq2Nyz0cEdYX8RP45kI79V4w95H7UCJAeOFM9mZzVLvmCY1sEbg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2"
-+=======
-+        "unified-lint-rule": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-file-name-mixed-case": {
-@@ -7616,7 +10280,11 @@
-       "integrity": "sha512-bcqPsow1C0LrsKII1YehUO7VPOER7nze6FzsZZ8/NP+d200OL7Y7VMCqN1kscAvG+PTJgjznyXuLEpy7KQnVFg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2"
-+=======
-+        "unified-lint-rule": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-file-name-outer-dashes": {
-@@ -7625,7 +10293,11 @@
-       "integrity": "sha512-BVEwLrA4kipalgKrxhncpgtmh6eUmHBH1ggC+X3csYR4X5vXv4vHQqpov4I1vMyWxMLMBnq7lTL3Iqp0CS4vwg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2"
-+=======
-+        "unified-lint-rule": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-heading-punctuation": {
-@@ -7634,10 +10306,17 @@
-       "integrity": "sha512-/7kGRmPT+JLxEME1Z/rQn99mP8yr4qXFwcniKYsefR1jl8pCZciwCIp2Tq92Nn+FPELVrpk9sloRBb2JP3UB0A==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "mdast-util-to-string": "1.0.4",
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "mdast-util-to-string": "^1.0.2",
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-inline-padding": {
-@@ -7646,10 +10325,17 @@
-       "integrity": "sha512-nRl6vA45ZPdMz3/rVMZw7WRRqLFuMrzhdkrbrGLjwBovdIeD/IGCEbDA5NR60g2xT9V5dAmKogvHEH1bIr8SdQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "mdast-util-to-string": "1.0.4",
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "mdast-util-to-string": "^1.0.2",
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-literal-urls": {
-@@ -7658,11 +10344,19 @@
-       "integrity": "sha512-YMsZFVYQDt9gvpc6THL76GzyhCR+cK79vjyEOEmX+O3tOjxQstbi0oW6Lngbl1WbpkCW5TWEzSKOorQowYI2wg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "mdast-util-to-string": "1.0.4",
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "mdast-util-to-string": "^1.0.2",
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-multiple-toplevel-headings": {
-@@ -7671,10 +10365,17 @@
-       "integrity": "sha512-LFfgjF3NKFkt0tGNnJ8Exf8+DrVcMRwek5qu5mvh2KrZnmSpm5flYWzUy2UnnIyicDL3CZYC/r3Fjz6CeBYgZA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-shell-dollars": {
-@@ -7683,9 +10384,15 @@
-       "integrity": "sha512-YryHem73PTxjCkuC4HONJWHsmrLyXmF7r+cCH36Ys3vuWsfAbwkbOwpyuPB4KXn+6fHaTUfz/B5BPp3iwzJwyA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-shortcut-reference-image": {
-@@ -7694,9 +10401,15 @@
-       "integrity": "sha512-nUQ+4xB5hKZTCl9gvg7c+W1T3ddsnjgu4zwRza2Bn+21cKmUzx+z9dvlZ4aVuNGmxuWHbKI8/ZkKuB8Eu27vJw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-shortcut-reference-link": {
-@@ -7705,9 +10418,15 @@
-       "integrity": "sha512-A6ZexZ6XyQ7fXebrj5WgW5FkSJ81GobjWyMFVmBxgxPd9GH2BkRsZ10aFSkQQvfKSrqbnOL2vrigGMgbiERRxA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-table-indentation": {
-@@ -7716,10 +10435,17 @@
-       "integrity": "sha512-QrtT1GvJmAoNsWh+gmHFajFlM+ubm9rd3Cbz2OYPix8ZM6g907aIfG2NusJFXL9D8/CExQWYhlBvelFBbHgqbQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-ordered-list-marker-style": {
-@@ -7728,10 +10454,17 @@
-       "integrity": "sha512-LJICUZIxqHHi360EP90zbDP+2QQIVVgPGlz0AatuR9ifd7xqAzraQKxsQajAZpuOepZgjBMTOz9L9W0Znx7ujA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-ordered-list-marker-value": {
-@@ -7740,10 +10473,17 @@
-       "integrity": "sha512-P6fYui3MvuB21+6AYH8Lbe7SVZ2VQL+FVJUuDCBhe01bgx6SajGmQ/f4Iqt0gCHEAaKw7e2B7tdwd36ifbs1EA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-rule-style": {
-@@ -7752,10 +10492,17 @@
-       "integrity": "sha512-dzH+K6DcPIIMBq6LUQgE4dR9TiQGZrQOoULD7m0Y0lIb2EoR2FK5Zd4TgZg/LnvTs6fid37t0xFoaY4/lXV/5Q==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-strong-marker": {
-@@ -7764,10 +10511,17 @@
-       "integrity": "sha512-+bwWKWAqDwqd21Vw+ndqVFh5V27Dp4MKhk9AUlKmcvgJYHuvQ8UfWQdpZcP218ps/4EbwTfyi33TaPyXqOTlXA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-table-cell-padding": {
-@@ -7776,10 +10530,17 @@
-       "integrity": "sha512-o3WwC9YysXbQKf0D5nvhhJPcLagqedLwGdifukdgyaKvuIQVbtWbNv1/UOdB3LL+D+2fUrwrCmnQ8J3E1r0lBw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-table-pipe-alignment": {
-@@ -7788,10 +10549,17 @@
-       "integrity": "sha512-lYfK2gWGN45hYfAOZw5gscQ4uDaO9bJLp+H64jvrTQzBV+OCvB9kRQwI0oIrJAa4XMmipAZR+2XhjNSCfQ0fRA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-table-pipes": {
-@@ -7800,10 +10568,17 @@
-       "integrity": "sha512-VHfDRvcovLBl/cvSjwDoA0xRizdZU33A6F2qFD9A5hu1sDWgGxMLg5m2MOvFlRkUVxSwUv47cuD0/yxB4THYXQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-unordered-list-marker-style": {
-@@ -7812,10 +10587,17 @@
-       "integrity": "sha512-dHYD9cHM9ZJ7BKUZ1nEPGfLAHgUmYxccXtms1GSEM/uyUtR2SU/ao1RwZZ+LvacZFCNZ1yG2yKCJhGI/5U/GrA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-message-control": {
-@@ -7824,9 +10606,15 @@
-       "integrity": "sha512-e1dszks4YKY7hLAkhS2367jBjBpAfvi+kVgSN/tOFrdp3qxITjiNR5fOFnyYF8vvorkQ9uxlKJoZUOW8T7rKDg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "mdast-comment-marker": "1.0.2",
-         "unified-message-control": "1.0.4",
-         "xtend": "4.0.1"
-+=======
-+        "mdast-comment-marker": "^1.0.0",
-+        "unified-message-control": "^1.0.0",
-+        "xtend": "^4.0.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-parse": {
-@@ -7835,6 +10623,7 @@
-       "integrity": "sha512-XZgICP2gJ1MHU7+vQaRM+VA9HEL3X253uwUM/BGgx3iv6TH2B3bF3B8q00DKcyP9YrJV+/7WOWEWBFF/u8cIsw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "collapse-white-space": "1.0.4",
-         "is-alphabetical": "1.0.2",
-         "is-decimal": "1.0.2",
-@@ -7850,6 +10639,23 @@
-         "unist-util-remove-position": "1.1.2",
-         "vfile-location": "2.0.3",
-         "xtend": "4.0.1"
-+=======
-+        "collapse-white-space": "^1.0.2",
-+        "is-alphabetical": "^1.0.0",
-+        "is-decimal": "^1.0.0",
-+        "is-whitespace-character": "^1.0.0",
-+        "is-word-character": "^1.0.0",
-+        "markdown-escapes": "^1.0.0",
-+        "parse-entities": "^1.0.2",
-+        "repeat-string": "^1.5.4",
-+        "state-toggle": "^1.0.0",
-+        "trim": "0.0.1",
-+        "trim-trailing-lines": "^1.0.0",
-+        "unherit": "^1.0.4",
-+        "unist-util-remove-position": "^1.0.0",
-+        "vfile-location": "^2.0.0",
-+        "xtend": "^4.0.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-preset-lint-markdown-style-guide": {
-@@ -7858,6 +10664,7 @@
-       "integrity": "sha512-Ao6fB63WuGtz1fa4rjoI+u1EOu21rWVGPmJlUKZlCICPPB6I815nJ52V0sLYjaw2cs+ZiXsXhdVinN7UpVgXcQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "remark-lint": "6.0.1",
-         "remark-lint-blockquote-indentation": "1.0.1",
-         "remark-lint-code-block-style": "1.0.1",
-@@ -7903,6 +10710,53 @@
-         "remark-lint-table-pipe-alignment": "1.0.1",
-         "remark-lint-table-pipes": "1.0.1",
-         "remark-lint-unordered-list-marker-style": "1.0.1"
-+=======
-+        "remark-lint": "^6.0.0",
-+        "remark-lint-blockquote-indentation": "^1.0.0",
-+        "remark-lint-code-block-style": "^1.0.0",
-+        "remark-lint-definition-case": "^1.0.0",
-+        "remark-lint-definition-spacing": "^1.0.0",
-+        "remark-lint-emphasis-marker": "^1.0.0",
-+        "remark-lint-fenced-code-flag": "^1.0.0",
-+        "remark-lint-fenced-code-marker": "^1.0.0",
-+        "remark-lint-file-extension": "^1.0.0",
-+        "remark-lint-final-definition": "^1.0.0",
-+        "remark-lint-hard-break-spaces": "^1.0.0",
-+        "remark-lint-heading-increment": "^1.0.0",
-+        "remark-lint-heading-style": "^1.0.0",
-+        "remark-lint-link-title-style": "^1.0.0",
-+        "remark-lint-list-item-content-indent": "^1.0.0",
-+        "remark-lint-list-item-indent": "^1.0.0",
-+        "remark-lint-list-item-spacing": "^1.0.0",
-+        "remark-lint-maximum-heading-length": "^1.0.0",
-+        "remark-lint-maximum-line-length": "^1.0.0",
-+        "remark-lint-no-auto-link-without-protocol": "^1.0.0",
-+        "remark-lint-no-blockquote-without-marker": "^2.0.0",
-+        "remark-lint-no-consecutive-blank-lines": "^1.0.0",
-+        "remark-lint-no-duplicate-headings": "^1.0.0",
-+        "remark-lint-no-emphasis-as-heading": "^1.0.0",
-+        "remark-lint-no-file-name-articles": "^1.0.0",
-+        "remark-lint-no-file-name-consecutive-dashes": "^1.0.0",
-+        "remark-lint-no-file-name-irregular-characters": "^1.0.0",
-+        "remark-lint-no-file-name-mixed-case": "^1.0.0",
-+        "remark-lint-no-file-name-outer-dashes": "^1.0.0",
-+        "remark-lint-no-heading-punctuation": "^1.0.0",
-+        "remark-lint-no-inline-padding": "^1.0.0",
-+        "remark-lint-no-literal-urls": "^1.0.0",
-+        "remark-lint-no-multiple-toplevel-headings": "^1.0.0",
-+        "remark-lint-no-shell-dollars": "^1.0.0",
-+        "remark-lint-no-shortcut-reference-image": "^1.0.0",
-+        "remark-lint-no-shortcut-reference-link": "^1.0.0",
-+        "remark-lint-no-table-indentation": "^1.0.0",
-+        "remark-lint-ordered-list-marker-style": "^1.0.0",
-+        "remark-lint-ordered-list-marker-value": "^1.0.0",
-+        "remark-lint-rule-style": "^1.0.0",
-+        "remark-lint-strong-marker": "^1.0.0",
-+        "remark-lint-table-cell-padding": "^1.0.0",
-+        "remark-lint-table-pipe-alignment": "^1.0.0",
-+        "remark-lint-table-pipes": "^1.0.0",
-+        "remark-lint-unordered-list-marker-style": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-stringify": {
-@@ -7911,6 +10765,7 @@
-       "integrity": "sha512-xLuyKTnuQer3ke9hkU38SUYLiTmS078QOnoFavztmbt/pAJtNSkNtFgR0U//uCcmG0qnyxao+PDuatQav46F1w==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "ccount": "1.0.3",
-         "is-alphanumeric": "1.0.0",
-         "is-decimal": "1.0.2",
-@@ -7925,6 +10780,22 @@
-         "stringify-entities": "1.3.2",
-         "unherit": "1.1.1",
-         "xtend": "4.0.1"
-+=======
-+        "ccount": "^1.0.0",
-+        "is-alphanumeric": "^1.0.0",
-+        "is-decimal": "^1.0.0",
-+        "is-whitespace-character": "^1.0.0",
-+        "longest-streak": "^2.0.1",
-+        "markdown-escapes": "^1.0.0",
-+        "markdown-table": "^1.1.0",
-+        "mdast-util-compact": "^1.0.0",
-+        "parse-entities": "^1.0.2",
-+        "repeat-string": "^1.5.4",
-+        "state-toggle": "^1.0.0",
-+        "stringify-entities": "^1.0.1",
-+        "unherit": "^1.0.4",
-+        "xtend": "^4.0.1"
-+>>>>>>> .their
-       }
-     },
-     "remove-trailing-separator": {
-@@ -7951,7 +10822,11 @@
-       "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "is-finite": "1.0.2"
-+=======
-+        "is-finite": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "replace-ext": {
-@@ -7966,6 +10841,7 @@
-       "integrity": "sha512-8H7Ehijd4js+s6wuVPLjwORxD4zeuyjYugprdOXlPSqaApmL/QOy+EB/beICHVCHkGMKNh5rvihb5ov+IDw4mg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "aws-sign2": "0.7.0",
-         "aws4": "1.7.0",
-         "caseless": "0.12.0",
-@@ -7988,6 +10864,30 @@
-         "tough-cookie": "2.3.4",
-         "tunnel-agent": "0.6.0",
-         "uuid": "3.2.1"
-+=======
-+        "aws-sign2": "~0.7.0",
-+        "aws4": "^1.6.0",
-+        "caseless": "~0.12.0",
-+        "combined-stream": "~1.0.5",
-+        "extend": "~3.0.1",
-+        "forever-agent": "~0.6.1",
-+        "form-data": "~2.3.1",
-+        "har-validator": "~5.0.3",
-+        "hawk": "~6.0.2",
-+        "http-signature": "~1.2.0",
-+        "is-typedarray": "~1.0.0",
-+        "isstream": "~0.1.2",
-+        "json-stringify-safe": "~5.0.1",
-+        "mime-types": "~2.1.17",
-+        "oauth-sign": "~0.8.2",
-+        "performance-now": "^2.1.0",
-+        "qs": "~6.5.1",
-+        "safe-buffer": "^5.1.1",
-+        "stringstream": "~0.0.5",
-+        "tough-cookie": "~2.3.3",
-+        "tunnel-agent": "^0.6.0",
-+        "uuid": "^3.1.0"
-+>>>>>>> .their
-       }
-     },
-     "require-directory": {
-@@ -8008,8 +10908,13 @@
-       "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "caller-path": "0.1.0",
-         "resolve-from": "1.0.1"
-+=======
-+        "caller-path": "^0.1.0",
-+        "resolve-from": "^1.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "resolve-from": {
-@@ -8026,7 +10931,11 @@
-       "integrity": "sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "path-parse": "1.0.5"
-+=======
-+        "path-parse": "^1.0.5"
-+>>>>>>> .their
-       }
-     },
-     "resolve-from": {
-@@ -8041,8 +10950,13 @@
-       "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "exit-hook": "1.1.1",
-         "onetime": "1.1.0"
-+=======
-+        "exit-hook": "^1.0.0",
-+        "onetime": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "revalidator": {
-@@ -8058,21 +10972,33 @@
-       "dev": true,
-       "optional": true,
-       "requires": {
-+<<<<<<< .our
-         "align-text": "0.1.4"
-+=======
-+        "align-text": "^0.1.1"
-+>>>>>>> .their
-       }
-     },
-     "rimraf": {
-       "version": "2.6.2",
-       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-LtgVDSShbqhlHm1u8PR8QVjOejY=",
-       "dev": true,
-       "requires": {
-         "glob": "7.1.2"
-+=======
-+      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
-+      "dev": true,
-+      "requires": {
-+        "glob": "^7.0.5"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-           "dev": true,
-           "requires": {
-@@ -8082,6 +11008,17 @@
-             "minimatch": "3.0.4",
-             "once": "1.4.0",
-             "path-is-absolute": "1.0.1"
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+          "dev": true,
-+          "requires": {
-+            "fs.realpath": "^1.0.0",
-+            "inflight": "^1.0.4",
-+            "inherits": "2",
-+            "minimatch": "^3.0.4",
-+            "once": "^1.3.0",
-+            "path-is-absolute": "^1.0.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -8092,8 +11029,13 @@
-       "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "hash-base": "3.0.4",
-         "inherits": "2.0.3"
-+=======
-+        "hash-base": "^3.0.0",
-+        "inherits": "^2.0.1"
-+>>>>>>> .their
-       }
-     },
-     "run-async": {
-@@ -8102,7 +11044,11 @@
-       "integrity": "sha1-yK1KXhEGYeQCp9IbUw4AnyX444k=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "once": "1.4.0"
-+=======
-+        "once": "^1.3.0"
-+>>>>>>> .their
-       }
-     },
-     "run-parallel": {
-@@ -8126,7 +11072,11 @@
-     "sax": {
-       "version": "1.2.4",
-       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-KBYjTiN4vdxOU1T6tcqold9xANk=",
-+=======
-+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-+>>>>>>> .their
-       "dev": true,
-       "optional": true
-     },
-@@ -8142,7 +11092,11 @@
-       "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "semver": "5.5.0"
-+=======
-+        "semver": "^5.0.3"
-+>>>>>>> .their
-       }
-     },
-     "send": {
-@@ -8152,6 +11106,7 @@
-       "dev": true,
-       "requires": {
-         "debug": "2.6.9",
-+<<<<<<< .our
-         "depd": "1.1.2",
-         "destroy": "1.0.4",
-         "encodeurl": "1.0.2",
-@@ -8164,6 +11119,20 @@
-         "on-finished": "2.3.0",
-         "range-parser": "1.2.0",
-         "statuses": "1.4.0"
-+=======
-+        "depd": "~1.1.2",
-+        "destroy": "~1.0.4",
-+        "encodeurl": "~1.0.2",
-+        "escape-html": "~1.0.3",
-+        "etag": "~1.8.1",
-+        "fresh": "0.5.2",
-+        "http-errors": "~1.6.2",
-+        "mime": "1.4.1",
-+        "ms": "2.0.0",
-+        "on-finished": "~2.3.0",
-+        "range-parser": "~1.2.0",
-+        "statuses": "~1.4.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "depd": {
-@@ -8187,15 +11156,22 @@
-       }
-     },
-     "serve": {
-+<<<<<<< .our
-       "version": "6.5.8",
-       "resolved": "https://registry.npmjs.org/serve/-/serve-6.5.8.tgz",
-       "integrity": "sha512-GZYlJz7f6E7Xq6xbg1rTSvQQV9x4v/yYB/sum6egzSBLa/mdk1PViDSX2JvL0Me83sxu3JpEpQELfakDKbGcrw==",
-+=======
-+      "version": "6.5.6",
-+      "resolved": "https://registry.npmjs.org/serve/-/serve-6.5.6.tgz",
-+      "integrity": "sha512-rdbHRzBh94UdZPktcoNjWEUqY0ILanZ8Q+VwNfhw5n93pkCPn86wH8x+hXgRi8II9+xj3DvGMWL/6hGUQyfuXg==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "args": "4.0.0",
-         "basic-auth": "2.0.0",
-         "bluebird": "3.5.1",
-         "boxen": "1.3.0",
-+<<<<<<< .our
-         "chalk": "2.4.1",
-         "clipboardy": "1.2.3",
-         "dargs": "5.1.0",
-@@ -8205,6 +11181,17 @@
-         "handlebars": "4.0.11",
-         "ip": "1.1.5",
-         "micro": "9.3.1",
-+=======
-+        "chalk": "2.4.0",
-+        "clipboardy": "1.2.3",
-+        "dargs": "5.1.0",
-+        "detect-port": "1.2.2",
-+        "filesize": "3.6.1",
-+        "fs-extra": "5.0.0",
-+        "handlebars": "4.0.11",
-+        "ip": "1.1.5",
-+        "micro": "9.1.4",
-+>>>>>>> .their
-         "micro-compress": "1.0.0",
-         "mime-types": "2.1.18",
-         "node-version": "1.1.3",
-@@ -8213,7 +11200,11 @@
-         "path-is-inside": "1.0.2",
-         "path-type": "3.0.0",
-         "send": "0.16.2",
-+<<<<<<< .our
-         "update-check": "1.5.1"
-+=======
-+        "update-check": "1.3.2"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "ansi-styles": {
-@@ -8222,6 +11213,7 @@
-           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "color-convert": "1.9.1"
-           }
-         },
-@@ -8234,6 +11226,20 @@
-             "ansi-styles": "3.2.1",
-             "escape-string-regexp": "1.0.5",
-             "supports-color": "5.4.0"
-+=======
-+            "color-convert": "^1.9.0"
-+          }
-+        },
-+        "chalk": {
-+          "version": "2.4.0",
-+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz",
-+          "integrity": "sha512-Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw==",
-+          "dev": true,
-+          "requires": {
-+            "ansi-styles": "^3.2.1",
-+            "escape-string-regexp": "^1.0.5",
-+            "supports-color": "^5.3.0"
-+>>>>>>> .their
-           }
-         },
-         "dargs": {
-@@ -8243,6 +11249,7 @@
-           "dev": true
-         },
-         "fs-extra": {
-+<<<<<<< .our
-           "version": "6.0.1",
-           "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz",
-           "integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==",
-@@ -8251,6 +11258,16 @@
-             "graceful-fs": "4.1.11",
-             "jsonfile": "4.0.0",
-             "universalify": "0.1.2"
-+=======
-+          "version": "5.0.0",
-+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz",
-+          "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
-+          "dev": true,
-+          "requires": {
-+            "graceful-fs": "^4.1.2",
-+            "jsonfile": "^4.0.0",
-+            "universalify": "^0.1.0"
-+>>>>>>> .their
-           }
-         },
-         "has-flag": {
-@@ -8265,7 +11282,11 @@
-           "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "graceful-fs": "4.1.11"
-+=======
-+            "graceful-fs": "^4.1.6"
-+>>>>>>> .their
-           }
-         },
-         "path-type": {
-@@ -8274,7 +11295,11 @@
-           "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "pify": "3.0.0"
-+=======
-+            "pify": "^3.0.0"
-+>>>>>>> .their
-           }
-         },
-         "pify": {
-@@ -8289,7 +11314,11 @@
-           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "has-flag": "3.0.0"
-+=======
-+            "has-flag": "^3.0.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -8318,8 +11347,13 @@
-       "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "inherits": "2.0.3",
-         "safe-buffer": "5.1.2"
-+=======
-+        "inherits": "^2.0.1",
-+        "safe-buffer": "^5.0.1"
-+>>>>>>> .their
-       }
-     },
-     "shasum": {
-@@ -8328,8 +11362,13 @@
-       "integrity": "sha1-5wEjENj0F/TetXEhUOVni4euVl8=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "json-stable-stringify": "0.0.1",
-         "sha.js": "2.4.11"
-+=======
-+        "json-stable-stringify": "~0.0.0",
-+        "sha.js": "~2.4.4"
-+>>>>>>> .their
-       }
-     },
-     "shebang-command": {
-@@ -8338,7 +11377,11 @@
-       "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "shebang-regex": "1.0.0"
-+=======
-+        "shebang-regex": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "shebang-regex": {
-@@ -8353,10 +11396,17 @@
-       "integrity": "sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "array-filter": "0.0.1",
-         "array-map": "0.0.0",
-         "array-reduce": "0.0.0",
-         "jsonify": "0.0.0"
-+=======
-+        "array-filter": "~0.0.0",
-+        "array-map": "~0.0.0",
-+        "array-reduce": "~0.0.0",
-+        "jsonify": "~0.0.0"
-+>>>>>>> .their
-       }
-     },
-     "shelljs": {
-@@ -8365,14 +11415,21 @@
-       "integrity": "sha1-3svPh0sNHl+3LhSxZKloMEjprLM=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "glob": "7.1.2",
-         "interpret": "1.1.0",
-         "rechoir": "0.6.2"
-+=======
-+        "glob": "^7.0.0",
-+        "interpret": "^1.0.0",
-+        "rechoir": "^0.6.2"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-           "dev": true,
-           "requires": {
-@@ -8382,6 +11439,17 @@
-             "minimatch": "3.0.4",
-             "once": "1.4.0",
-             "path-is-absolute": "1.0.1"
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+          "dev": true,
-+          "requires": {
-+            "fs.realpath": "^1.0.0",
-+            "inflight": "^1.0.4",
-+            "inherits": "2",
-+            "minimatch": "^3.0.4",
-+            "once": "^1.3.0",
-+            "path-is-absolute": "^1.0.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -8404,7 +11472,11 @@
-       "integrity": "sha1-wvg/Jzo+GhbtsJlWYdoO1e8DM2Q=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "string-width": "1.0.2"
-+=======
-+        "string-width": "^1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "slice-ansi": {
-@@ -8425,7 +11497,11 @@
-       "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "hoek": "4.2.1"
-+=======
-+        "hoek": "4.x.x"
-+>>>>>>> .their
-       }
-     },
-     "source-map": {
-@@ -8440,8 +11516,13 @@
-       "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "spdx-expression-parse": "3.0.0",
-         "spdx-license-ids": "3.0.0"
-+=======
-+        "spdx-expression-parse": "^3.0.0",
-+        "spdx-license-ids": "^3.0.0"
-+>>>>>>> .their
-       }
-     },
-     "spdx-exceptions": {
-@@ -8456,8 +11537,13 @@
-       "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "spdx-exceptions": "2.1.0",
-         "spdx-license-ids": "3.0.0"
-+=======
-+        "spdx-exceptions": "^2.1.0",
-+        "spdx-license-ids": "^3.0.0"
-+>>>>>>> .their
-       }
-     },
-     "spdx-license-ids": {
-@@ -8475,19 +11561,33 @@
-     "split": {
-       "version": "1.0.1",
-       "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-YFvZvjA6pZ+zX5Ip++oN3snqB9k=",
-       "dev": true,
-       "requires": {
-         "through": "2.3.8"
-+=======
-+      "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
-+      "dev": true,
-+      "requires": {
-+        "through": "2"
-+>>>>>>> .their
-       }
-     },
-     "split2": {
-       "version": "2.2.0",
-       "resolved": "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-GGsldbz4PoW30YRldWI47k7kJJM=",
-       "dev": true,
-       "requires": {
-         "through2": "2.0.3"
-+=======
-+      "integrity": "sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==",
-+      "dev": true,
-+      "requires": {
-+        "through2": "^2.0.2"
-+>>>>>>> .their
-       }
-     },
-     "sprintf-js": {
-@@ -8502,6 +11602,7 @@
-       "integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "asn1": "0.2.3",
-         "assert-plus": "1.0.0",
-         "bcrypt-pbkdf": "1.0.1",
-@@ -8510,6 +11611,16 @@
-         "getpass": "0.1.7",
-         "jsbn": "0.1.1",
-         "tweetnacl": "0.14.5"
-+=======
-+        "asn1": "~0.2.3",
-+        "assert-plus": "^1.0.0",
-+        "bcrypt-pbkdf": "^1.0.0",
-+        "dashdash": "^1.12.0",
-+        "ecc-jsbn": "~0.1.1",
-+        "getpass": "^0.1.1",
-+        "jsbn": "~0.1.0",
-+        "tweetnacl": "~0.14.0"
-+>>>>>>> .their
-       }
-     },
-     "standard": {
-@@ -8518,6 +11629,7 @@
-       "integrity": "sha512-JURZ+85ExKLQULckDFijdX5WHzN6RC7fgiZNSV4jFQVo+3tPoQGHyBrGekye/yf0aOfb4210EM5qPNlc2cRh4w==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "eslint": "3.19.0",
-         "eslint-config-standard": "10.2.1",
-         "eslint-config-standard-jsx": "4.0.2",
-@@ -8527,6 +11639,17 @@
-         "eslint-plugin-react": "6.10.3",
-         "eslint-plugin-standard": "3.0.1",
-         "standard-engine": "7.0.0"
-+=======
-+        "eslint": "~3.19.0",
-+        "eslint-config-standard": "10.2.1",
-+        "eslint-config-standard-jsx": "4.0.2",
-+        "eslint-plugin-import": "~2.2.0",
-+        "eslint-plugin-node": "~4.2.2",
-+        "eslint-plugin-promise": "~3.5.0",
-+        "eslint-plugin-react": "~6.10.0",
-+        "eslint-plugin-standard": "~3.0.1",
-+        "standard-engine": "~7.0.0"
-+>>>>>>> .their
-       }
-     },
-     "standard-engine": {
-@@ -8535,10 +11658,17 @@
-       "integrity": "sha1-67d7nI/CyBZf+jU72Rug3/Qa9pA=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "deglob": "2.1.0",
-         "get-stdin": "5.0.1",
-         "minimist": "1.2.0",
-         "pkg-conf": "2.1.0"
-+=======
-+        "deglob": "^2.1.0",
-+        "get-stdin": "^5.0.1",
-+        "minimist": "^1.1.0",
-+        "pkg-conf": "^2.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "get-stdin": {
-@@ -8552,6 +11682,7 @@
-     "standard-markdown": {
-       "version": "4.0.2",
-       "resolved": "https://registry.npmjs.org/standard-markdown/-/standard-markdown-4.0.2.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-NaC1bLtX5JzuLXQ9ocmERMNK1Lg=",
-       "dev": true,
-       "requires": {
-@@ -8562,6 +11693,18 @@
-         "lodash.range": "3.2.0",
-         "ora": "1.4.0",
-         "standard": "10.0.3"
-+=======
-+      "integrity": "sha512-h+WTmoGN0qmse8I1VX8VD6V5JeVLXZOPQltvxQP9FfSpSl6RmKYMLTUQ2j/QhdmsdxQKDqulZF/Bf8oEnttIQA==",
-+      "dev": true,
-+      "requires": {
-+        "async": "^2.0.1",
-+        "commander": "^2.9.0",
-+        "globby": "^6.0.0",
-+        "lodash.flatten": "^4.2.0",
-+        "lodash.range": "^3.1.5",
-+        "ora": "^1.2.0",
-+        "standard": "^10.0.2"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "ansi-styles": {
-@@ -8570,7 +11713,11 @@
-           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "color-convert": "1.9.1"
-+=======
-+            "color-convert": "^1.9.0"
-+>>>>>>> .their
-           }
-         },
-         "async": {
-@@ -8579,7 +11726,11 @@
-           "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "lodash": "4.17.10"
-+=======
-+            "lodash": "^4.14.0"
-+>>>>>>> .their
-           }
-         },
-         "chalk": {
-@@ -8588,9 +11739,15 @@
-           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "ansi-styles": "3.2.1",
-             "escape-string-regexp": "1.0.5",
-             "supports-color": "5.4.0"
-+=======
-+            "ansi-styles": "^3.2.1",
-+            "escape-string-regexp": "^1.0.5",
-+            "supports-color": "^5.3.0"
-+>>>>>>> .their
-           }
-         },
-         "cli-cursor": {
-@@ -8599,7 +11756,11 @@
-           "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "restore-cursor": "2.0.0"
-+=======
-+            "restore-cursor": "^2.0.0"
-+>>>>>>> .their
-           }
-         },
-         "cli-spinners": {
-@@ -8611,6 +11772,7 @@
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-           "dev": true,
-           "requires": {
-@@ -8620,6 +11782,17 @@
-             "minimatch": "3.0.4",
-             "once": "1.4.0",
-             "path-is-absolute": "1.0.1"
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+          "dev": true,
-+          "requires": {
-+            "fs.realpath": "^1.0.0",
-+            "inflight": "^1.0.4",
-+            "inherits": "2",
-+            "minimatch": "^3.0.4",
-+            "once": "^1.3.0",
-+            "path-is-absolute": "^1.0.0"
-+>>>>>>> .their
-           }
-         },
-         "globby": {
-@@ -8628,11 +11801,19 @@
-           "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "array-union": "1.0.2",
-             "glob": "7.1.2",
-             "object-assign": "4.1.1",
-             "pify": "2.3.0",
-             "pinkie-promise": "2.0.1"
-+=======
-+            "array-union": "^1.0.1",
-+            "glob": "^7.0.3",
-+            "object-assign": "^4.0.1",
-+            "pify": "^2.0.0",
-+            "pinkie-promise": "^2.0.0"
-+>>>>>>> .their
-           }
-         },
-         "has-flag": {
-@@ -8647,7 +11828,11 @@
-           "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "chalk": "2.4.1"
-+=======
-+            "chalk": "^2.0.1"
-+>>>>>>> .their
-           }
-         },
-         "onetime": {
-@@ -8656,7 +11841,11 @@
-           "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "mimic-fn": "1.2.0"
-+=======
-+            "mimic-fn": "^1.0.0"
-+>>>>>>> .their
-           }
-         },
-         "ora": {
-@@ -8665,10 +11854,17 @@
-           "integrity": "sha512-iMK1DOQxzzh2MBlVsU42G80mnrvUhqsMh74phHtDlrcTZPK0pH6o7l7DRshK+0YsxDyEuaOkziVdvM3T0QTzpw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "chalk": "2.4.1",
-             "cli-cursor": "2.1.0",
-             "cli-spinners": "1.3.1",
-             "log-symbols": "2.2.0"
-+=======
-+            "chalk": "^2.1.0",
-+            "cli-cursor": "^2.1.0",
-+            "cli-spinners": "^1.0.1",
-+            "log-symbols": "^2.1.0"
-+>>>>>>> .their
-           }
-         },
-         "restore-cursor": {
-@@ -8677,8 +11873,13 @@
-           "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "onetime": "2.0.1",
-             "signal-exit": "3.0.2"
-+=======
-+            "onetime": "^2.0.0",
-+            "signal-exit": "^3.0.2"
-+>>>>>>> .their
-           }
-         },
-         "supports-color": {
-@@ -8687,7 +11888,11 @@
-           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "has-flag": "3.0.0"
-+=======
-+            "has-flag": "^3.0.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -8710,8 +11915,13 @@
-       "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "inherits": "2.0.3",
-         "readable-stream": "2.3.6"
-+=======
-+        "inherits": "~2.0.1",
-+        "readable-stream": "^2.0.2"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -8726,6 +11936,7 @@
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-@@ -8733,6 +11944,15 @@
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-+=======
-+            "core-util-is": "~1.0.0",
-+            "inherits": "~2.0.3",
-+            "isarray": "~1.0.0",
-+            "process-nextick-args": "~2.0.0",
-+            "safe-buffer": "~5.1.1",
-+            "string_decoder": "~1.1.1",
-+            "util-deprecate": "~1.0.1"
-+>>>>>>> .their
-           }
-         },
-         "string_decoder": {
-@@ -8741,7 +11961,11 @@
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "safe-buffer": "5.1.2"
-+=======
-+            "safe-buffer": "~5.1.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -8752,8 +11976,13 @@
-       "integrity": "sha1-+02KFCDqNidk4hrUeAOXvry0HL4=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "duplexer2": "0.1.4",
-         "readable-stream": "2.3.6"
-+=======
-+        "duplexer2": "~0.1.0",
-+        "readable-stream": "^2.0.2"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -8768,6 +11997,7 @@
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-@@ -8775,6 +12005,15 @@
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-+=======
-+            "core-util-is": "~1.0.0",
-+            "inherits": "~2.0.3",
-+            "isarray": "~1.0.0",
-+            "process-nextick-args": "~2.0.0",
-+            "safe-buffer": "~5.1.1",
-+            "string_decoder": "~1.1.1",
-+            "util-deprecate": "~1.0.1"
-+>>>>>>> .their
-           }
-         },
-         "string_decoder": {
-@@ -8783,7 +12022,11 @@
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "safe-buffer": "5.1.2"
-+=======
-+            "safe-buffer": "~5.1.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -8800,11 +12043,19 @@
-       "integrity": "sha512-QllfrBhqF1DPcz46WxKTs6Mz1Bpc+8Qm6vbqOpVav5odAXwbyzwnEczoWqtxrsmlO+cJqtPrp/8gWKWjaKLLlA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "builtin-status-codes": "3.0.0",
-         "inherits": "2.0.3",
-         "readable-stream": "2.3.6",
-         "to-arraybuffer": "1.0.1",
-         "xtend": "4.0.1"
-+=======
-+        "builtin-status-codes": "^3.0.0",
-+        "inherits": "^2.0.1",
-+        "readable-stream": "^2.3.6",
-+        "to-arraybuffer": "^1.0.0",
-+        "xtend": "^4.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -8819,6 +12070,7 @@
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-@@ -8826,6 +12078,15 @@
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-+=======
-+            "core-util-is": "~1.0.0",
-+            "inherits": "~2.0.3",
-+            "isarray": "~1.0.0",
-+            "process-nextick-args": "~2.0.0",
-+            "safe-buffer": "~5.1.1",
-+            "string_decoder": "~1.1.1",
-+            "util-deprecate": "~1.0.1"
-+>>>>>>> .their
-           }
-         },
-         "string_decoder": {
-@@ -8834,7 +12095,11 @@
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "safe-buffer": "5.1.2"
-+=======
-+            "safe-buffer": "~5.1.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -8851,8 +12116,13 @@
-       "integrity": "sha1-G2O+Q4oTPktnHMGTUZdgAXWRDYM=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "inherits": "2.0.3",
-         "readable-stream": "2.3.6"
-+=======
-+        "inherits": "^2.0.1",
-+        "readable-stream": "^2.0.2"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -8867,6 +12137,7 @@
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-@@ -8874,6 +12145,15 @@
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-+=======
-+            "core-util-is": "~1.0.0",
-+            "inherits": "~2.0.3",
-+            "isarray": "~1.0.0",
-+            "process-nextick-args": "~2.0.0",
-+            "safe-buffer": "~5.1.1",
-+            "string_decoder": "~1.1.1",
-+            "util-deprecate": "~1.0.1"
-+>>>>>>> .their
-           }
-         },
-         "string_decoder": {
-@@ -8882,7 +12162,11 @@
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "safe-buffer": "5.1.2"
-+=======
-+            "safe-buffer": "~5.1.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -8899,9 +12183,15 @@
-       "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "code-point-at": "1.1.0",
-         "is-fullwidth-code-point": "1.0.0",
-         "strip-ansi": "3.0.1"
-+=======
-+        "code-point-at": "^1.0.0",
-+        "is-fullwidth-code-point": "^1.0.0",
-+        "strip-ansi": "^3.0.0"
-+>>>>>>> .their
-       }
-     },
-     "string_decoder": {
-@@ -8916,10 +12206,17 @@
-       "integrity": "sha512-nrBAQClJAPN2p+uGCVJRPIPakKeKWZ9GtBCmormE7pWOSlHat7+x5A8gx85M7HM5Dt0BP3pP5RhVW77WdbJJ3A==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "character-entities-html4": "1.1.2",
-         "character-entities-legacy": "1.1.2",
-         "is-alphanumerical": "1.0.2",
-         "is-hexadecimal": "1.0.2"
-+=======
-+        "character-entities-html4": "^1.0.0",
-+        "character-entities-legacy": "^1.0.0",
-+        "is-alphanumerical": "^1.0.0",
-+        "is-hexadecimal": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "stringstream": {
-@@ -8934,7 +12231,11 @@
-       "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "ansi-regex": "2.1.1"
-+=======
-+        "ansi-regex": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "strip-bom": {
-@@ -8943,7 +12244,11 @@
-       "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "is-utf8": "0.2.1"
-+=======
-+        "is-utf8": "^0.2.0"
-+>>>>>>> .their
-       }
-     },
-     "strip-eof": {
-@@ -8970,7 +12275,11 @@
-       "integrity": "sha1-9izxdYHplrSPyWVpn1TAauJouNI=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "minimist": "1.2.0"
-+=======
-+        "minimist": "^1.1.0"
-+>>>>>>> .their
-       }
-     },
-     "sumchecker": {
-@@ -8979,7 +12288,11 @@
-       "integrity": "sha1-D0LBDl0F2l1C7qPlbDOZo31sWz4=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "debug": "2.6.9"
-+=======
-+        "debug": "^2.2.0"
-+>>>>>>> .their
-       }
-     },
-     "supports-color": {
-@@ -8988,7 +12301,11 @@
-       "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "has-flag": "1.0.0"
-+=======
-+        "has-flag": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "symbol-tree": {
-@@ -9004,7 +12321,11 @@
-       "integrity": "sha512-YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "acorn-node": "1.3.0"
-+=======
-+        "acorn-node": "^1.2.0"
-+>>>>>>> .their
-       }
-     },
-     "table": {
-@@ -9013,12 +12334,21 @@
-       "integrity": "sha1-K7xULw/amGGnVdOUf+/Ys/UThV8=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "ajv": "4.11.8",
-         "ajv-keywords": "1.5.1",
-         "chalk": "1.1.3",
-         "lodash": "4.17.10",
-         "slice-ansi": "0.0.4",
-         "string-width": "2.1.1"
-+=======
-+        "ajv": "^4.7.0",
-+        "ajv-keywords": "^1.0.0",
-+        "chalk": "^1.1.1",
-+        "lodash": "^4.0.0",
-+        "slice-ansi": "0.0.4",
-+        "string-width": "^2.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "ajv": {
-@@ -9027,8 +12357,13 @@
-           "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "co": "4.6.0",
-             "json-stable-stringify": "1.0.1"
-+=======
-+            "co": "^4.6.0",
-+            "json-stable-stringify": "^1.0.1"
-+>>>>>>> .their
-           }
-         },
-         "ansi-regex": {
-@@ -9049,17 +12384,29 @@
-           "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "jsonify": "0.0.0"
-+=======
-+            "jsonify": "~0.0.0"
-+>>>>>>> .their
-           }
-         },
-         "string-width": {
-           "version": "2.1.1",
-           "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
-           "dev": true,
-           "requires": {
-             "is-fullwidth-code-point": "2.0.0",
-             "strip-ansi": "4.0.0"
-+=======
-+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-+          "dev": true,
-+          "requires": {
-+            "is-fullwidth-code-point": "^2.0.0",
-+            "strip-ansi": "^4.0.0"
-+>>>>>>> .their
-           }
-         },
-         "strip-ansi": {
-@@ -9068,7 +12415,11 @@
-           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "ansi-regex": "3.0.0"
-+=======
-+            "ansi-regex": "^3.0.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -9079,6 +12430,7 @@
-       "integrity": "sha512-BfkE9CciGGgDsATqkikUHrQrraBCO+ke/1f6SFAEMnxyyfN9lxC+nW1NFWMpqH865DhHIy9vQi682gk1X7friw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "chownr": "1.0.1",
-         "fs-minipass": "1.2.5",
-         "minipass": "2.3.0",
-@@ -9086,6 +12438,15 @@
-         "mkdirp": "0.5.1",
-         "safe-buffer": "5.1.2",
-         "yallist": "3.0.2"
-+=======
-+        "chownr": "^1.0.1",
-+        "fs-minipass": "^1.2.5",
-+        "minipass": "^2.2.4",
-+        "minizlib": "^1.1.0",
-+        "mkdirp": "^0.5.0",
-+        "safe-buffer": "^5.1.2",
-+        "yallist": "^3.0.2"
-+>>>>>>> .their
-       }
-     },
-     "tar-fs": {
-@@ -9094,10 +12455,17 @@
-       "integrity": "sha512-LdknWjPEiZC1nOBwhv0JBzfJBGPJar08dZg2rwZe0ZTLQoRGEzgrl7vF3qUEkCHpI/wN9e7RyCuDhMsJUCLPPQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "chownr": "1.0.1",
-         "mkdirp": "0.5.1",
-         "pump": "1.0.3",
-         "tar-stream": "1.6.0"
-+=======
-+        "chownr": "^1.0.1",
-+        "mkdirp": "^0.5.1",
-+        "pump": "^1.0.0",
-+        "tar-stream": "^1.1.2"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "pump": {
-@@ -9106,8 +12474,13 @@
-           "integrity": "sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "end-of-stream": "1.4.1",
-             "once": "1.4.0"
-+=======
-+            "end-of-stream": "^1.1.0",
-+            "once": "^1.3.1"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -9118,6 +12491,7 @@
-       "integrity": "sha512-lh2iAPG/BHNmN6WB9Ybdynk9rEJ5GD/dy4zscHmVlwa1dq2tpE+BH78i5vjYwYVWEaOXGBjzxr89aVACF17Cpw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "bl": "1.2.2",
-         "buffer-alloc": "1.1.0",
-         "end-of-stream": "1.4.1",
-@@ -9125,6 +12499,15 @@
-         "readable-stream": "2.3.6",
-         "to-buffer": "1.1.1",
-         "xtend": "4.0.1"
-+=======
-+        "bl": "^1.0.0",
-+        "buffer-alloc": "^1.1.0",
-+        "end-of-stream": "^1.0.0",
-+        "fs-constants": "^1.0.0",
-+        "readable-stream": "^2.0.0",
-+        "to-buffer": "^1.1.0",
-+        "xtend": "^4.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -9139,6 +12522,7 @@
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-@@ -9146,6 +12530,15 @@
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-+=======
-+            "core-util-is": "~1.0.0",
-+            "inherits": "~2.0.3",
-+            "isarray": "~1.0.0",
-+            "process-nextick-args": "~2.0.0",
-+            "safe-buffer": "~5.1.1",
-+            "string_decoder": "~1.1.1",
-+            "util-deprecate": "~1.0.1"
-+>>>>>>> .their
-           }
-         },
-         "string_decoder": {
-@@ -9154,7 +12547,11 @@
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "safe-buffer": "5.1.2"
-+=======
-+            "safe-buffer": "~5.1.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -9165,8 +12562,13 @@
-       "integrity": "sha1-4Ma8TSa5AxJEEOT+2BEDAU38H1k=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "os-tmpdir": "1.0.2",
-         "rimraf": "2.2.8"
-+=======
-+        "os-tmpdir": "^1.0.0",
-+        "rimraf": "~2.2.6"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "rimraf": {
-@@ -9183,8 +12585,13 @@
-       "integrity": "sha1-W8xOrsxKsscH2LwR2ZzMmiyyh/I=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "os-tmpdir": "1.0.2",
-         "uuid": "2.0.3"
-+=======
-+        "os-tmpdir": "^1.0.0",
-+        "uuid": "^2.0.1"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "uuid": {
-@@ -9201,13 +12608,21 @@
-       "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "execa": "0.7.0"
-+=======
-+        "execa": "^0.7.0"
-+>>>>>>> .their
-       }
-     },
-     "text-extensions": {
-       "version": "1.7.0",
-       "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.7.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-+qq6JiXtdG1WiiPk0KrNm/CKizk=",
-+=======
-+      "integrity": "sha512-AKXZeDq230UaSzaO5s3qQUZOaC7iKbzq0jOFL614R7d9R593HLqAOL0cYoqLdkNrjBSOdmoQI06yigq1TSBXAg==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "text-table": {
-@@ -9234,8 +12649,13 @@
-       "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "readable-stream": "2.3.6",
-         "xtend": "4.0.1"
-+=======
-+        "readable-stream": "^2.1.5",
-+        "xtend": "~4.0.1"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -9250,6 +12670,7 @@
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-@@ -9257,6 +12678,15 @@
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-+=======
-+            "core-util-is": "~1.0.0",
-+            "inherits": "~2.0.3",
-+            "isarray": "~1.0.0",
-+            "process-nextick-args": "~2.0.0",
-+            "safe-buffer": "~5.1.1",
-+            "string_decoder": "~1.1.1",
-+            "util-deprecate": "~1.0.1"
-+>>>>>>> .their
-           }
-         },
-         "string_decoder": {
-@@ -9265,7 +12695,11 @@
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "safe-buffer": "5.1.2"
-+=======
-+            "safe-buffer": "~5.1.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -9282,7 +12716,11 @@
-       "integrity": "sha1-ycWLV1voQHN1y14kYtrO50NZ9B0=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "process": "0.11.10"
-+=======
-+        "process": "~0.11.0"
-+>>>>>>> .their
-       }
-     },
-     "tmp": {
-@@ -9291,7 +12729,11 @@
-       "integrity": "sha1-Fyc1t/YU6nrzlmT6hM8N5OUV0SA=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "os-tmpdir": "1.0.2"
-+=======
-+        "os-tmpdir": "~1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "to-arraybuffer": {
-@@ -9312,9 +12754,15 @@
-       "integrity": "sha512-saGC8/lWdGrEoBMLUtgzhRHWAkQMP8gdldA3MOAUhBwTGEb1RSMVcflHGSx4ZJsdEZ9o1qDBCPp47LCPrbZWow==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "is-buffer": "1.1.6",
-         "vfile": "2.3.0",
-         "x-is-function": "1.0.4"
-+=======
-+        "is-buffer": "^1.1.4",
-+        "vfile": "^2.0.0",
-+        "x-is-function": "^1.0.4"
-+>>>>>>> .their
-       }
-     },
-     "touch": {
-@@ -9323,7 +12771,11 @@
-       "integrity": "sha1-Ua7z1ElXHU8oel2Hyci0kYGg2x0=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "nopt": "1.0.10"
-+=======
-+        "nopt": "~1.0.10"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "nopt": {
-@@ -9332,7 +12784,11 @@
-           "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "abbrev": "1.1.1"
-+=======
-+            "abbrev": "1"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -9343,7 +12799,11 @@
-       "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "punycode": "1.4.1"
-+=======
-+        "punycode": "^1.4.1"
-+>>>>>>> .their
-       }
-     },
-     "tr46": {
-@@ -9395,6 +12855,7 @@
-       "integrity": "sha1-BTVocb7yOkNJBnNABvwYgza6gks=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "babel-code-frame": "6.26.0",
-         "colors": "1.2.5",
-         "diff": "3.5.0",
-@@ -9404,11 +12865,23 @@
-         "resolve": "1.7.1",
-         "tsutils": "1.9.1",
-         "update-notifier": "2.5.0"
-+=======
-+        "babel-code-frame": "^6.20.0",
-+        "colors": "^1.1.2",
-+        "diff": "^3.0.1",
-+        "findup-sync": "~0.3.0",
-+        "glob": "^7.1.1",
-+        "optimist": "~0.6.0",
-+        "resolve": "^1.1.7",
-+        "tsutils": "^1.1.0",
-+        "update-notifier": "^2.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-           "dev": true,
-           "requires": {
-@@ -9418,6 +12891,17 @@
-             "minimatch": "3.0.4",
-             "once": "1.4.0",
-             "path-is-absolute": "1.0.1"
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+          "dev": true,
-+          "requires": {
-+            "fs.realpath": "^1.0.0",
-+            "inflight": "^1.0.4",
-+            "inherits": "2",
-+            "minimatch": "^3.0.4",
-+            "once": "^1.3.0",
-+            "path-is-absolute": "^1.0.0"
-+>>>>>>> .their
-           }
-         },
-         "minimist": {
-@@ -9432,8 +12916,13 @@
-           "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "minimist": "0.0.10",
-             "wordwrap": "0.0.3"
-+=======
-+            "minimist": "~0.0.1",
-+            "wordwrap": "~0.0.2"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -9456,7 +12945,11 @@
-       "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "safe-buffer": "5.1.2"
-+=======
-+        "safe-buffer": "^5.0.1"
-+>>>>>>> .their
-       }
-     },
-     "tweetnacl": {
-@@ -9472,7 +12965,11 @@
-       "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "prelude-ls": "1.1.2"
-+=======
-+        "prelude-ls": "~1.1.2"
-+>>>>>>> .their
-       }
-     },
-     "typedarray": {
-@@ -9500,9 +12997,15 @@
-       "dev": true,
-       "optional": true,
-       "requires": {
-+<<<<<<< .our
-         "source-map": "0.5.7",
-         "uglify-to-browserify": "1.0.2",
-         "yargs": "3.10.0"
-+=======
-+        "source-map": "~0.5.1",
-+        "uglify-to-browserify": "~1.0.0",
-+        "yargs": "~3.10.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "yargs": {
-@@ -9512,9 +13015,15 @@
-           "dev": true,
-           "optional": true,
-           "requires": {
-+<<<<<<< .our
-             "camelcase": "1.2.1",
-             "cliui": "2.1.0",
-             "decamelize": "1.2.0",
-+=======
-+            "camelcase": "^1.0.2",
-+            "cliui": "^2.1.0",
-+            "decamelize": "^1.0.0",
-+>>>>>>> .their
-             "window-size": "0.1.0"
-           }
-         }
-@@ -9539,8 +13048,13 @@
-       "integrity": "sha512-+XZuV691Cn4zHsK0vkKYwBEwB74T3IZIcxrgn2E4rKwTfFyI1zCh7X7grwh9Re08fdPlarIdyWgI8aVB3F5A5g==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "inherits": "2.0.3",
-         "xtend": "4.0.1"
-+=======
-+        "inherits": "^2.0.1",
-+        "xtend": "^4.0.1"
-+>>>>>>> .their
-       }
-     },
-     "unified": {
-@@ -9549,12 +13063,21 @@
-       "integrity": "sha512-1k+KPhlVtqmG99RaTbAv/usu85fcSRu3wY8X+vnsEhIxNP5VbVIDiXnLqyKIG+UMdyTg0ZX9EI6k2AfjJkHPtA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "bail": "1.0.3",
-         "extend": "3.0.1",
-         "is-plain-obj": "1.1.0",
-         "trough": "1.0.2",
-         "vfile": "2.3.0",
-         "x-is-string": "0.1.0"
-+=======
-+        "bail": "^1.0.0",
-+        "extend": "^3.0.0",
-+        "is-plain-obj": "^1.1.0",
-+        "trough": "^1.0.0",
-+        "vfile": "^2.0.0",
-+        "x-is-string": "^0.1.0"
-+>>>>>>> .their
-       }
-     },
-     "unified-args": {
-@@ -9563,12 +13086,21 @@
-       "integrity": "sha1-jZubitNHvrN/QwVipixNNhtCIg8=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "camelcase": "4.1.0",
-         "chalk": "2.4.1",
-         "chokidar": "1.7.0",
-         "minimist": "1.2.0",
-         "text-table": "0.2.0",
-         "unified-engine": "4.0.1"
-+=======
-+        "camelcase": "^4.0.0",
-+        "chalk": "^2.0.0",
-+        "chokidar": "^1.5.1",
-+        "minimist": "^1.2.0",
-+        "text-table": "^0.2.0",
-+        "unified-engine": "^4.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "ansi-styles": {
-@@ -9577,7 +13109,11 @@
-           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "color-convert": "1.9.1"
-+=======
-+            "color-convert": "^1.9.0"
-+>>>>>>> .their
-           }
-         },
-         "camelcase": {
-@@ -9592,9 +13128,15 @@
-           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "ansi-styles": "3.2.1",
-             "escape-string-regexp": "1.0.5",
-             "supports-color": "5.4.0"
-+=======
-+            "ansi-styles": "^3.2.1",
-+            "escape-string-regexp": "^1.0.5",
-+            "supports-color": "^5.3.0"
-+>>>>>>> .their
-           }
-         },
-         "has-flag": {
-@@ -9609,7 +13151,11 @@
-           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "has-flag": "3.0.0"
-+=======
-+            "has-flag": "^3.0.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -9620,6 +13166,7 @@
-       "integrity": "sha1-lpKql/1cTsNoiXeeElFL746GP8M=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "concat-stream": "1.5.2",
-         "debug": "2.6.9",
-         "fault": "1.0.2",
-@@ -9639,6 +13186,27 @@
-         "x-is-function": "1.0.4",
-         "x-is-string": "0.1.0",
-         "xtend": "4.0.1"
-+=======
-+        "concat-stream": "^1.5.1",
-+        "debug": "^2.2.0",
-+        "fault": "^1.0.0",
-+        "fn-name": "^2.0.1",
-+        "glob": "^7.0.3",
-+        "ignore": "^3.2.0",
-+        "is-empty": "^1.0.0",
-+        "is-hidden": "^1.0.1",
-+        "is-object": "^1.0.1",
-+        "js-yaml": "^3.6.1",
-+        "load-plugin": "^2.0.0",
-+        "parse-json": "^2.2.0",
-+        "to-vfile": "^2.0.0",
-+        "trough": "^1.0.0",
-+        "vfile-reporter": "^4.0.0",
-+        "vfile-statistics": "^1.1.0",
-+        "x-is-function": "^1.0.4",
-+        "x-is-string": "^0.1.0",
-+        "xtend": "^4.0.1"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "glob": {
-@@ -9647,12 +13215,21 @@
-           "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "fs.realpath": "1.0.0",
-             "inflight": "1.0.6",
-             "inherits": "2.0.3",
-             "minimatch": "3.0.4",
-             "once": "1.4.0",
-             "path-is-absolute": "1.0.1"
-+=======
-+            "fs.realpath": "^1.0.0",
-+            "inflight": "^1.0.4",
-+            "inherits": "2",
-+            "minimatch": "^3.0.4",
-+            "once": "^1.3.0",
-+            "path-is-absolute": "^1.0.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -9663,7 +13240,11 @@
-       "integrity": "sha512-WkqwMC1aijHE17W3Z1co7aTI+Dzo1jHdwhI66fTClU1yOTbzAsTqlOD6eeR/MI9235Y3nu2jMDcm8GCeq4gaLg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "wrapped": "1.0.1"
-+=======
-+        "wrapped": "^1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "unified-message-control": {
-@@ -9673,8 +13254,13 @@
-       "dev": true,
-       "requires": {
-         "trim": "0.0.1",
-+<<<<<<< .our
-         "unist-util-visit": "1.3.1",
-         "vfile-location": "2.0.3"
-+=======
-+        "unist-util-visit": "^1.0.0",
-+        "vfile-location": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "uniq": {
-@@ -9689,7 +13275,11 @@
-       "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "crypto-random-string": "1.0.0"
-+=======
-+        "crypto-random-string": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "unist-util-generated": {
-@@ -9710,7 +13300,11 @@
-       "integrity": "sha512-GRi04yhng1WqBf5RBzPkOtWAadcZS2gvuOgNn/cyJBYNxtTuyYqTKN0eg4rC1YJwGnzrqfRB3dSKm8cNCjNirg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "array-iterate": "1.1.2"
-+=======
-+        "array-iterate": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "unist-util-position": {
-@@ -9725,7 +13319,11 @@
-       "integrity": "sha512-XxoNOBvq1WXRKXxgnSYbtCF76TJrRoe5++pD4cCBsssSiWSnPEktyFrFLE8LTk3JW5mt9hB0Sk5zn4x/JeWY7Q==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unist-util-visit": "^1.1.0"
-+>>>>>>> .their
-       }
-     },
-     "unist-util-stringify-position": {
-@@ -9740,6 +13338,7 @@
-       "integrity": "sha512-0fdB9EQJU0tho5tK0VzOJzAQpPv2LyLZ030b10GxuzAWEfvd54mpY7BMjQ1L69k2YNvL+SvxRzH0yUIehOO8aA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unist-util-is": "2.1.2"
-       }
-     },
-@@ -9747,6 +13346,15 @@
-       "version": "0.1.2",
-       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-       "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-+=======
-+        "unist-util-is": "^2.1.1"
-+      }
-+    },
-+    "universalify": {
-+      "version": "0.1.1",
-+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz",
-+      "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "unpipe": {
-@@ -9761,7 +13369,11 @@
-       "integrity": "sha1-F+soB5h/dpUunASF/DEdBqgmouA=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "os-homedir": "1.0.2"
-+=======
-+        "os-homedir": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "unzip-response": {
-@@ -9771,9 +13383,15 @@
-       "dev": true
-     },
-     "update-check": {
-+<<<<<<< .our
-       "version": "1.5.1",
-       "resolved": "https://registry.npmjs.org/update-check/-/update-check-1.5.1.tgz",
-       "integrity": "sha512-M3rjq5KwSrWZrm2GVPIQIF+NXpIn5I9mIV67gGoydptQvzRjLp9ZbM6ctFJeNuaWSm5+mNP7aInELjSiLcIw6A==",
-+=======
-+      "version": "1.3.2",
-+      "resolved": "https://registry.npmjs.org/update-check/-/update-check-1.3.2.tgz",
-+      "integrity": "sha512-0iGt63gXrsU4VTw4tIGVVk14H6KLHI7ExNPuSmdDdwUrUAQTBnh1hQcRpnoBWetb3/Ab4YyXK1iDWXP7D0VHTQ==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "registry-auth-token": "3.3.2",
-@@ -9786,6 +13404,7 @@
-       "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "boxen": "1.3.0",
-         "chalk": "2.4.1",
-         "configstore": "3.1.2",
-@@ -9796,6 +13415,18 @@
-         "latest-version": "3.1.0",
-         "semver-diff": "2.1.0",
-         "xdg-basedir": "3.0.0"
-+=======
-+        "boxen": "^1.2.1",
-+        "chalk": "^2.0.1",
-+        "configstore": "^3.0.0",
-+        "import-lazy": "^2.1.0",
-+        "is-ci": "^1.0.10",
-+        "is-installed-globally": "^0.1.0",
-+        "is-npm": "^1.0.0",
-+        "latest-version": "^3.0.0",
-+        "semver-diff": "^2.0.0",
-+        "xdg-basedir": "^3.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "ansi-styles": {
-@@ -9804,7 +13435,11 @@
-           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "color-convert": "1.9.1"
-+=======
-+            "color-convert": "^1.9.0"
-+>>>>>>> .their
-           }
-         },
-         "chalk": {
-@@ -9813,9 +13448,15 @@
-           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "ansi-styles": "3.2.1",
-             "escape-string-regexp": "1.0.5",
-             "supports-color": "5.4.0"
-+=======
-+            "ansi-styles": "^3.2.1",
-+            "escape-string-regexp": "^1.0.5",
-+            "supports-color": "^5.3.0"
-+>>>>>>> .their
-           }
-         },
-         "has-flag": {
-@@ -9830,7 +13471,11 @@
-           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "has-flag": "3.0.0"
-+=======
-+            "has-flag": "^3.0.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -9859,7 +13504,11 @@
-       "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "prepend-http": "1.0.4"
-+=======
-+        "prepend-http": "^1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "user-home": {
-@@ -9868,7 +13517,11 @@
-       "integrity": "sha1-nHC/2Babwdy/SGBODwS4tJzenp8=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "os-homedir": "1.0.2"
-+=======
-+        "os-homedir": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "util": {
-@@ -9906,8 +13559,13 @@
-       "integrity": "sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "spdx-correct": "3.0.0",
-         "spdx-expression-parse": "3.0.0"
-+=======
-+        "spdx-correct": "^3.0.0",
-+        "spdx-expression-parse": "^3.0.0"
-+>>>>>>> .their
-       }
-     },
-     "vary": {
-@@ -9922,9 +13580,15 @@
-       "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "assert-plus": "1.0.0",
-         "core-util-is": "1.0.2",
-         "extsprintf": "1.3.0"
-+=======
-+        "assert-plus": "^1.0.0",
-+        "core-util-is": "1.0.2",
-+        "extsprintf": "^1.2.0"
-+>>>>>>> .their
-       }
-     },
-     "vfile": {
-@@ -9933,10 +13597,17 @@
-       "integrity": "sha512-ASt4mBUHcTpMKD/l5Q+WJXNtshlWxOogYyGYYrg4lt/vuRjC1EFQtlAofL5VmtVNIZJzWYFJjzGWZ0Gw8pzW1w==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "is-buffer": "1.1.6",
-         "replace-ext": "1.0.0",
-         "unist-util-stringify-position": "1.1.2",
-         "vfile-message": "1.0.1"
-+=======
-+        "is-buffer": "^1.1.4",
-+        "replace-ext": "1.0.0",
-+        "unist-util-stringify-position": "^1.0.0",
-+        "vfile-message": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "vfile-location": {
-@@ -9951,7 +13622,11 @@
-       "integrity": "sha512-vSGCkhNvJzO6VcWC6AlJW4NtYOVtS+RgCaqFIYUjoGIlHnFL+i0LbtYvonDWOMcB97uTPT4PRsyYY7REWC9vug==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unist-util-stringify-position": "1.1.2"
-+=======
-+        "unist-util-stringify-position": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "vfile-reporter": {
-@@ -9960,11 +13635,19 @@
-       "integrity": "sha1-6m8K4TQvSEFXOYXgX5QXNvJ96do=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "repeat-string": "1.6.1",
-         "string-width": "1.0.2",
-         "supports-color": "4.5.0",
-         "unist-util-stringify-position": "1.1.2",
-         "vfile-statistics": "1.1.1"
-+=======
-+        "repeat-string": "^1.5.0",
-+        "string-width": "^1.0.0",
-+        "supports-color": "^4.1.0",
-+        "unist-util-stringify-position": "^1.0.0",
-+        "vfile-statistics": "^1.1.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "has-flag": {
-@@ -9979,7 +13662,11 @@
-           "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "has-flag": "2.0.0"
-+=======
-+            "has-flag": "^2.0.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -10002,11 +13689,19 @@
-     "walk-sync": {
-       "version": "0.3.2",
-       "resolved": "https://registry.npmjs.org/walk-sync/-/walk-sync-0.3.2.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-SCcoCvxC0OA1NnxKTjHurA0Tb3U=",
-       "dev": true,
-       "requires": {
-         "ensure-posix-path": "1.0.2",
-         "matcher-collection": "1.0.5"
-+=======
-+      "integrity": "sha512-FMB5VqpLqOCcqrzA9okZFc0wq0Qbmdm396qJxvQZhDpyu0W95G9JCmp74tx7iyYnyOcBtUuKJsgIKAqjozvmmQ==",
-+      "dev": true,
-+      "requires": {
-+        "ensure-posix-path": "^1.0.0",
-+        "matcher-collection": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "webidl-conversions": {
-@@ -10023,16 +13718,27 @@
-       "dev": true,
-       "optional": true,
-       "requires": {
-+<<<<<<< .our
-         "tr46": "0.0.3"
-+=======
-+        "tr46": "~0.0.1"
-+>>>>>>> .their
-       }
-     },
-     "which": {
-       "version": "1.3.0",
-       "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-/wS9/AEO5UfXgL7DjhrBwnd9JTo=",
-       "dev": true,
-       "requires": {
-         "isexe": "2.0.0"
-+=======
-+      "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==",
-+      "dev": true,
-+      "requires": {
-+        "isexe": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "which-module": {
-@@ -10047,7 +13753,11 @@
-       "integrity": "sha1-AUKk6KJD+IgsAjOqDgKBqnYVInM=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "string-width": "2.1.1"
-+=======
-+        "string-width": "^2.1.1"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "ansi-regex": {
-@@ -10068,8 +13778,13 @@
-           "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "is-fullwidth-code-point": "2.0.0",
-             "strip-ansi": "4.0.0"
-+=======
-+            "is-fullwidth-code-point": "^2.0.0",
-+            "strip-ansi": "^4.0.0"
-+>>>>>>> .their
-           }
-         },
-         "strip-ansi": {
-@@ -10078,7 +13793,11 @@
-           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "ansi-regex": "3.0.0"
-+=======
-+            "ansi-regex": "^3.0.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -10102,8 +13821,13 @@
-       "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "string-width": "1.0.2",
-         "strip-ansi": "3.0.1"
-+=======
-+        "string-width": "^1.0.1",
-+        "strip-ansi": "^3.0.1"
-+>>>>>>> .their
-       }
-     },
-     "wrapped": {
-@@ -10113,7 +13837,11 @@
-       "dev": true,
-       "requires": {
-         "co": "3.1.0",
-+<<<<<<< .our
-         "sliced": "1.0.1"
-+=======
-+        "sliced": "^1.0.1"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "co": {
-@@ -10136,18 +13864,31 @@
-       "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "mkdirp": "0.5.1"
-+=======
-+        "mkdirp": "^0.5.1"
-+>>>>>>> .their
-       }
-     },
-     "write-file-atomic": {
-       "version": "2.3.0",
-       "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-H/YVdcLipOjlENb6TiQ8zhg5mas=",
-       "dev": true,
-       "requires": {
-         "graceful-fs": "4.1.11",
-         "imurmurhash": "0.1.4",
-         "signal-exit": "3.0.2"
-+=======
-+      "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==",
-+      "dev": true,
-+      "requires": {
-+        "graceful-fs": "^4.1.11",
-+        "imurmurhash": "^0.1.4",
-+        "signal-exit": "^3.0.2"
-+>>>>>>> .their
-       }
-     },
-     "x-is-function": {
-@@ -10199,6 +13940,7 @@
-       "integrity": "sha1-wMQpJMpKqmsObaFznfshZDn53cA=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "cliui": "3.2.0",
-         "decamelize": "1.2.0",
-         "get-caller-file": "1.0.2",
-@@ -10213,6 +13955,22 @@
-         "window-size": "0.2.0",
-         "y18n": "3.2.1",
-         "yargs-parser": "2.4.1"
-+=======
-+        "cliui": "^3.2.0",
-+        "decamelize": "^1.1.1",
-+        "get-caller-file": "^1.0.1",
-+        "lodash.assign": "^4.0.3",
-+        "os-locale": "^1.4.0",
-+        "read-pkg-up": "^1.0.1",
-+        "require-directory": "^2.1.1",
-+        "require-main-filename": "^1.0.1",
-+        "set-blocking": "^2.0.0",
-+        "string-width": "^1.0.1",
-+        "which-module": "^1.0.0",
-+        "window-size": "^0.2.0",
-+        "y18n": "^3.2.1",
-+        "yargs-parser": "^2.4.1"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "cliui": {
-@@ -10221,9 +13979,15 @@
-           "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "string-width": "1.0.2",
-             "strip-ansi": "3.0.1",
-             "wrap-ansi": "2.1.0"
-+=======
-+            "string-width": "^1.0.1",
-+            "strip-ansi": "^3.0.1",
-+            "wrap-ansi": "^2.0.0"
-+>>>>>>> .their
-           }
-         },
-         "window-size": {
-@@ -10240,8 +14004,13 @@
-       "integrity": "sha1-hVaN488VD/SfpRgl8DqMiA3cxcQ=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "camelcase": "3.0.0",
-         "lodash.assign": "4.2.0"
-+=======
-+        "camelcase": "^3.0.0",
-+        "lodash.assign": "^4.0.6"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "camelcase": {
-added in both
-  our    100644 c081cd89450cd50efba1ec280ff1349a96ea3ce0 package.json
-  their  100644 05affd27f29f51200f04536c969437101089d1eb package.json
-@@ -1,6 +1,10 @@
- {
-   "name": "electron",
-+<<<<<<< .our
-   "version": "4.0.0-nightly.20180821",
-+=======
-+  "version": "3.0.0-beta.4",
-+>>>>>>> .their
-   "repository": "https://github.com/electron/electron",
-   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
-   "devDependencies": {
-@@ -13,7 +17,11 @@
-     "dugite": "^1.45.0",
-     "electabul": "~0.0.4",
-     "electron-docs-linter": "^2.3.4",
-+<<<<<<< .our
-     "electron-typescript-definitions": "^1.3.6",
-+=======
-+    "electron-typescript-definitions": "^1.3.5",
-+>>>>>>> .their
-     "github": "^9.2.0",
-     "html-entities": "^1.2.1",
-     "husky": "^0.14.3",
-@@ -21,12 +29,19 @@
-     "minimist": "^1.2.0",
-     "node-fetch": "^2.1.2",
-     "nugget": "^2.0.1",
-+<<<<<<< .our
-     "octicons": "^7.3.0",
-+=======
-+>>>>>>> .their
-     "remark-cli": "^4.0.0",
-     "remark-preset-lint-markdown-style-guide": "^2.1.1",
-     "request": "^2.68.0",
-     "semver": "^5.5.0",
-+<<<<<<< .our
-     "serve": "^6.5.8",
-+=======
-+    "serve": "^6.5.3",
-+>>>>>>> .their
-     "standard": "^10.0.0",
-     "standard-markdown": "^4.0.0",
-     "sumchecker": "^2.0.2",
-@@ -45,6 +60,7 @@
-   "private": true,
-   "scripts": {
-     "asar": "asar",
-+<<<<<<< .our
-     "bootstrap:dev": "python ./script/bootstrap.py -d -v",
-     "bootstrap": "python ./script/bootstrap.py -v",
-     "browserify": "browserify",
-@@ -54,11 +70,19 @@
-     "build:release": "python ./script/build.py -c R",
-     "rebuild-test-modules": "python ./script/rebuild-test-modules.py",
-     "check-tls": "python ./script/tls.py",
-+=======
-+    "bootstrap": "python ./script/bootstrap.py",
-+    "browserify": "browserify",
-+    "bump-version": "./script/bump-version.py",
-+    "build": "python ./script/build.py -c D",
-+    "rebuild-test-modules": "python ./script/rebuild-test-modules.py",
-+>>>>>>> .their
-     "clean": "python ./script/clean.py",
-     "clean-build": "python ./script/clean.py --build",
-     "clang-format": "find atom/ brightray/ chromium_src/ -iname *.h -o -iname *.cc -o -iname *.mm | xargs clang-format -i",
-     "coverage": "npm run instrument-code-coverage && npm test -- --use_instrumented_asar",
-     "instrument-code-coverage": "electabul instrument --input-path ./lib --output-path ./out/coverage/electron.asar",
-+<<<<<<< .our
-     "lint": "npm run lint:js && npm run lint:cpp && npm run lint:clang-format && npm run lint:py && npm run lint:docs",
-     "lint:js": "standard && cd spec && standard",
-     "lint:clang-format": "python script/run-clang-format.py -r -c atom/ chromium_src/ brightray/ || (echo \"\\nCode not formatted correctly.\" && exit 1)",
-@@ -67,12 +91,26 @@
-     "lint:docs": "remark docs -qf && npm run lint:js-in-markdown && npm run create-typescript-definitions && npm run lint:docs-relative-links",
-     "lint:docs-relative-links": "python ./script/check-relative-doc-links.py",
-     "lint:js-in-markdown": "standard-markdown docs",
-+=======
-+    "lint": "npm run lint-js && npm run lint-cpp && npm run lint-clang-format && npm run lint-py && npm run lint-docs",
-+    "lint-js": "standard && cd spec && standard",
-+    "lint-clang-format": "python script/run-clang-format.py -r -c atom/ chromium_src/ brightray/ || (echo \"\\nCode not formatted correctly.\" && exit 1)",
-+    "lint-cpp": "python ./script/cpplint.py",
-+    "lint-py": "python ./script/pylint.py",
-+    "lint-docs": "remark docs -qf && npm run lint-js-in-markdown && npm run create-typescript-definitions && npm run lint-docs-relative-links",
-+    "lint-docs-relative-links": "python ./script/check-relative-doc-links.py",
-+    "lint-js-in-markdown": "standard-markdown docs",
-+>>>>>>> .their
-     "create-api-json": "electron-docs-linter docs --outfile=out/electron-api.json --version=$npm_package_version",
-     "create-typescript-definitions": "npm run create-api-json && electron-typescript-definitions --in=out/electron-api.json --out=out/electron.d.ts",
-     "mock-release": "node ./script/ci-release-build.js",
-     "preinstall": "node -e 'process.exit(0)'",
-     "publish-to-npm": "node ./script/publish-to-npm.js",
-+<<<<<<< .our
-     "precommit": "python script/run-clang-format.py -r -c atom/ chromium_src/ brightray/ && npm run lint:js && remark docs -qf || (echo \"Code not formatted correctly.\" && exit 1)",
-+=======
-+    "precommit": "python script/run-clang-format.py -r -c atom/ chromium_src/ brightray/ || (echo \"Code not formatted correctly.\" && exit 1)",
-+>>>>>>> .their
-     "prepack": "check-for-leaks",
-     "prepush": "check-for-leaks",
-     "prepare-release": "node ./script/prepare-release.js",
-added in both
-  our    100755 e4aaf89e216b0164f15882a3040e8cac70bf1fd9 script/bootstrap.py
-  their  100755 3195fa459b918bd14baee8b8766cae8461a1ad62 script/bootstrap.py
-@@ -169,8 +169,11 @@
-     mkdir_p(target_dir)
-   else:
-     mkdir_p(DOWNLOAD_DIR)
-+<<<<<<< .our
-   if is_verbose_mode():
-     args += ['-v']
-+=======
-+>>>>>>> .their
-   if is_dev:
-     subprocess.check_call([sys.executable, script] + args)
-   else:
-added in both
-  our    100755 564adb2116312b0f6d0351096bd89cb373cd3bab script/bump-version.py
-  their  100755 c6daf4e26b210c92e0a2f57d8e5a804373b8f8fb script/bump-version.py
-@@ -5,12 +5,21 @@
- import sys
- import argparse
- 
-+<<<<<<< .our
- from lib.util import execute, get_electron_version, parse_version, scoped_cwd, \
- is_nightly, is_beta, is_stable, get_next_nightly, get_next_beta, \
- get_next_stable_from_pre, get_next_stable_from_stable, clean_parse_version
- 
- SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
- 
-+=======
-+from lib.util import execute, get_electron_version, parse_version, scoped_cwd
-+
-+
-+SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
-+
-+
-+>>>>>>> .their
- def main():
- 
-   parser = argparse.ArgumentParser(
-@@ -34,7 +43,18 @@
-     action='store',
-     default=None,
-     dest='bump',
-+<<<<<<< .our
-     help='increment [stable | beta | nightly]'
-+=======
-+    help='increment [major | minor | patch | beta]'
-+  )
-+  parser.add_argument(
-+    '--stable',
-+    action='store_true',
-+    default= False,
-+    dest='stable',
-+    help='promote to stable (i.e. remove `-beta.x` suffix)'
-+>>>>>>> .their
-   )
-   parser.add_argument(
-     '--dry-run',
-@@ -45,6 +65,7 @@
-   )
- 
-   args = parser.parse_args()
-+<<<<<<< .our
-   curr_version = get_electron_version()
- 
-   if args.bump not in ['stable', 'beta', 'nightly']:
-@@ -79,22 +100,50 @@
-       not_reached()
-   else:
-     raise Exception("Invalid current version: " + curr_version)
-+=======
-+>>>>>>> .their
- 
-   if args.new_version == None and args.bump == None and args.stable == False:
-     parser.print_help()
-     return 1
- 
-+<<<<<<< .our
-   versions = clean_parse_version(version)
-   suffix = ''
-   if '-' in version:
-     suffix = '-' + version.split('-')[1]
-     versions[3] = parse_version(version)[3]
-   version = version.split('-')[0]
-+=======
-+  increments = ['major', 'minor', 'patch', 'beta']
-+
-+  curr_version = get_electron_version()
-+  versions = parse_version(re.sub('-beta', '', curr_version))
-+
-+  if args.bump in increments:
-+    versions = increase_version(versions, increments.index(args.bump))
-+    if versions[3] == '0':
-+      # beta starts at 1
-+      versions = increase_version(versions, increments.index('beta'))
-+
-+  if args.stable == True:
-+    versions[3] = '0'
-+
-+  if args.new_version != None:
-+    versions = parse_version(re.sub('-beta', '', args.new_version))
-+
-+  version = '.'.join(versions[:3])
-+  suffix = '' if versions[3] == '0' else '-beta.' + versions[3]
-+>>>>>>> .their
- 
-   if args.dry_run:
-     print 'new version number would be: {0}\n'.format(version + suffix)
-     return 0
- 
-+<<<<<<< .our
-+=======
-+
-+>>>>>>> .their
-   with scoped_cwd(SOURCE_ROOT):
-     update_electron_gyp(version, suffix)
-     update_win_rc(version, versions)
-@@ -105,9 +154,12 @@
- 
-   print 'Bumped to version: {0}'.format(version + suffix)
- 
-+<<<<<<< .our
- def not_reached():
-   raise Exception('Unreachable code was reached')
- 
-+=======
-+>>>>>>> .their
- def increase_version(versions, index):
-   for i in range(index + 1, 4):
-     versions[i] = '0'
-@@ -116,8 +168,12 @@
- 
- 
- def update_electron_gyp(version, suffix):
-+<<<<<<< .our
-   pattern = re.compile(" *'version%' *: *'[0-9.]+(-beta[0-9.]*)?(-dev)?"
-     + "(-nightly[0-9.]*)?'")
-+=======
-+  pattern = re.compile(" *'version%' *: *'[0-9.]+(-beta[0-9.]*)?'")
-+>>>>>>> .their
-   with open('electron.gyp', 'r') as f:
-     lines = f.readlines()
- 
-@@ -209,6 +265,7 @@
- 
- 
- def tag_version(version, suffix):
-+<<<<<<< .our
-   execute([
-     'git',
-     'commit',
-@@ -217,6 +274,10 @@
-     'Bump v{0}'.format(version + suffix),
-     '-n'
-   ])
-+=======
-+  commit_message = 'Bump v{0}'.format(version + suffix)
-+  execute(['git', 'commit', '-a', '--no-verify', '-m', commit_message])
-+>>>>>>> .their
- 
- 
- if __name__ == '__main__':
-added in both
-  our    100644 be9f9597387f5f8b7bfddc61c202f32ce4c6d478 script/ci-release-build.js
-  their  100644 1a15cd55b266363bea4394e970d274b2caa2d716 script/ci-release-build.js
-@@ -1,5 +1,8 @@
-+<<<<<<< .our
- require('dotenv-safe').load()
- 
-+=======
-+>>>>>>> .their
- const assert = require('assert')
- const request = require('request')
- const buildAppVeyorURL = 'https://windows-ci.electronjs.org/api/builds'
-@@ -34,6 +37,7 @@
-           resolve(body)
-         }
-       } else {
-+<<<<<<< .our
-         console.error('Error occurred while requesting:', requestOptions.url)
-         if (parseResponse) {
-           try {
-@@ -41,6 +45,10 @@
-           } catch (err) {
-             console.log('Error: ', `(status ${res.statusCode})`, err || res.body, requestOptions)
-           }
-+=======
-+        if (parseResponse) {
-+          console.log('Error: ', `(status ${res.statusCode})`, err || JSON.parse(res.body), requestOptions)
-+>>>>>>> .their
-         } else {
-           console.log('Error: ', `(status ${res.statusCode})`, err || res.body, requestOptions)
-         }
-@@ -51,6 +59,10 @@
- }
- 
- async function circleCIcall (buildUrl, targetBranch, job, options) {
-+<<<<<<< .our
-+=======
-+  assert(process.env.CIRCLE_TOKEN, 'CIRCLE_TOKEN not found in environment')
-+>>>>>>> .their
-   console.log(`Triggering CircleCI to run build job: ${job} on branch: ${targetBranch} with release flag.`)
-   let buildRequest = {
-     'build_parameters': {
-@@ -83,6 +95,10 @@
- }
- 
- function buildAppVeyor (targetBranch, options) {
-+<<<<<<< .our
-+=======
-+  assert(process.env.APPVEYOR_TOKEN, 'APPVEYOR_TOKEN not found in environment')
-+>>>>>>> .their
-   const validJobs = Object.keys(appVeyorJobs)
-   if (options.job) {
-     assert(validJobs.includes(options.job), `Unknown AppVeyor CI job name: ${options.job}.  Valid values are: ${validJobs}.`)
-@@ -144,6 +160,10 @@
-     assert(vstsJobs.includes(options.job), `Unknown VSTS CI job name: ${options.job}. Valid values are: ${vstsJobs}.`)
-   }
-   console.log(`Triggering VSTS to run build on branch: ${targetBranch} with release flag.`)
-+<<<<<<< .our
-+=======
-+  assert(process.env.VSTS_TOKEN, 'VSTS_TOKEN not found in environment')
-+>>>>>>> .their
-   let environmentVariables = {}
- 
-   if (!options.ghRelease) {
-added in both
-  our    100755 4a6c0c7ce8f275175e48c4c380ff33627f7a5961 script/create-dist.py
-  their  100755 ae5ce3707c38e61716f96cf5e7627cc909597fb8 script/create-dist.py
-@@ -11,6 +11,7 @@
- if sys.platform == "win32":
-   import _winreg
- 
-+<<<<<<< .our
- from lib.config import BASE_URL, PLATFORM, build_env, \
-                        enable_verbose_mode, get_target_arch, get_zip_name
- 
-@@ -18,6 +19,12 @@
-                      execute, get_electron_version, make_zip, \
-                      parse_version, rm_rf, scoped_cwd
- 
-+=======
-+from lib.config import BASE_URL, PLATFORM, enable_verbose_mode, \
-+                       get_target_arch, get_zip_name, build_env
-+from lib.util import scoped_cwd, rm_rf, get_electron_version, make_zip, \
-+                     execute, electron_gyp, electron_features, parse_version
-+>>>>>>> .their
- from lib.env_util import get_vs_location
- 
- 
-@@ -147,7 +154,11 @@
- 
-   # Copy file and keep the executable bit.
-   shutil.copyfile(src, dest)
-+<<<<<<< .our
-   add_exec_bit(dest)
-+=======
-+  os.chmod(dest, os.stat(dest).st_mode | stat.S_IEXEC)
-+>>>>>>> .their
- 
- def copy_vcruntime_binaries():
-   arch = get_target_arch()
-@@ -302,7 +313,11 @@
-     dest = os.path.join(DIST_DIR, binary)
-     # Copy file and keep the executable bit.
-     shutil.copyfile(src, dest)
-+<<<<<<< .our
-     add_exec_bit(dest)
-+=======
-+    os.chmod(dest, os.stat(dest).st_mode | stat.S_IEXEC)
-+>>>>>>> .their
- 
-     dist_name = get_zip_name(binary, version)
-     zip_file = os.path.join(SOURCE_ROOT, 'dist', dist_name)
-added in both
-  our    100644 d8cfb2be8af17bc5536e521848c64b14b155015a script/find-release.js
-  their  100644 3cfd79aae1427c3b432076a869e6cf689d79871f script/find-release.js
-@@ -1,5 +1,8 @@
-+<<<<<<< .our
- if (!process.env.CI) require('dotenv-safe').load()
- 
-+=======
-+>>>>>>> .their
- const GitHub = require('github')
- const github = new GitHub()
- 
-@@ -14,7 +17,11 @@
-   github.authenticate({type: 'token', token: process.env.ELECTRON_GITHUB_TOKEN})
-   let releases = await github.repos.getReleases({
-     owner: 'electron',
-+<<<<<<< .our
-     repo: version.indexOf('nightly') > 0 ? 'nightlies' : 'electron'
-+=======
-+    repo: 'electron'
-+>>>>>>> .their
-   })
-   let targetRelease = releases.data.find(release => {
-     return release.tag_name === version
-added in both
-  our    100644 9b9c8029cb75a9d84c632d04f234c2020542ca68 script/lib/dbus_mock.py
-  their  100644 00b1fd98d7837cfef60460f9d456a5cb8340761c script/lib/dbus_mock.py
-@@ -6,6 +6,7 @@
- import sys
- 
- 
-+<<<<<<< .our
- def stop():
-     DBusTestCase.stop_dbus(DBusTestCase.system_bus_pid)
-     DBusTestCase.stop_dbus(DBusTestCase.session_bus_pid)
-@@ -26,3 +27,19 @@
-         subprocess.check_call(sys.argv[1:])
-     finally:
-         stop()
-+=======
-+def cleanup():
-+    DBusTestCase.stop_dbus(DBusTestCase.system_bus_pid)
-+    DBusTestCase.stop_dbus(DBusTestCase.session_bus_pid)
-+
-+
-+atexit.register(cleanup)
-+
-+dbusmock_log = sys.stdout if is_verbose_mode() else open(os.devnull, 'w')
-+
-+DBusTestCase.start_system_bus()
-+DBusTestCase.spawn_server_template('logind', None, dbusmock_log)
-+
-+DBusTestCase.start_session_bus()
-+DBusTestCase.spawn_server_template('notification_daemon', None, dbusmock_log)
-+>>>>>>> .their
-added in both
-  our    100644 d479d5a9556534c5d98ae1fdc97397cdd14376f5 script/lib/util.py
-  their  100644 3859bf64b43d2b4d42c027ebe1bdc713b3ce56ab script/lib/util.py
-@@ -2,13 +2,19 @@
- 
- import atexit
- import contextlib
-+<<<<<<< .our
- import datetime
-+=======
-+>>>>>>> .their
- import errno
- import platform
- import re
- import shutil
- import ssl
-+<<<<<<< .our
- import stat
-+=======
-+>>>>>>> .their
- import subprocess
- import sys
- import tarfile
-@@ -84,13 +90,20 @@
-     if hasattr(ssl, '_create_unverified_context'):
-       ssl._create_default_https_context = ssl._create_unverified_context
- 
-+<<<<<<< .our
-     print "Downloading %s to %s" % (url, path)
-+=======
-+>>>>>>> .their
-     web_file = urllib2.urlopen(url)
-     file_size = int(web_file.info().getheaders("Content-Length")[0])
-     downloaded_size = 0
-     block_size = 128
- 
-+<<<<<<< .our
-     ci = os.environ.get('CI') is not None
-+=======
-+    ci = os.environ.get('CI') == '1'
-+>>>>>>> .their
- 
-     while True:
-       buf = web_file.read(block_size)
-@@ -296,6 +309,7 @@
-         pass
-     else:
-       execute_stdout(args, env)
-+<<<<<<< .our
- 
- def add_exec_bit(filename):
-   os.chmod(filename, os.stat(filename).st_mode | stat.S_IEXEC)
-@@ -363,3 +377,5 @@
-   if pre is None:
-     return major + '.' + minor + '.' + patch
-   return major + "." + minor + "." + patch + '-' + pre
-+=======
-+>>>>>>> .their
-added in both
-  our    100755 72a28b719bf1ff7770692caef86c76746c4d8edf script/prepare-release.js
-  their  100755 8021fa331da3e8afd8810b8bb4a87eb39e859e75 script/prepare-release.js
-@@ -1,10 +1,17 @@
- #!/usr/bin/env node
- 
-+<<<<<<< .our
- if (!process.env.CI) require('dotenv-safe').load()
-+=======
-+>>>>>>> .their
- require('colors')
- const args = require('minimist')(process.argv.slice(2), {
-   boolean: ['automaticRelease', 'notesOnly', 'stable']
- })
-+<<<<<<< .our
-+=======
-+const assert = require('assert')
-+>>>>>>> .their
- const ciReleaseBuild = require('./ci-release-build')
- const { execSync } = require('child_process')
- const fail = '\u2717'.red
-@@ -15,13 +22,22 @@
- const pkg = require('../package.json')
- const readline = require('readline')
- const versionType = args._[0]
-+<<<<<<< .our
- const targetRepo = versionType === 'nightly' ? 'nightlies' : 'electron'
-+=======
-+>>>>>>> .their
- 
- // TODO (future) automatically determine version based on conventional commits
- // via conventional-recommended-bump
- 
-+<<<<<<< .our
- if (!versionType && !args.notesOnly) {
-   console.log(`Usage: prepare-release versionType [stable | beta | nightly]` +
-+=======
-+assert(process.env.ELECTRON_GITHUB_TOKEN, 'ELECTRON_GITHUB_TOKEN not found in environment')
-+if (!versionType && !args.notesOnly) {
-+  console.log(`Usage: prepare-release versionType [major | minor | patch | beta]` +
-+>>>>>>> .their
-      ` (--stable) (--notesOnly) (--automaticRelease) (--branch)`)
-   process.exit(1)
- }
-@@ -30,12 +46,19 @@
- const gitDir = path.resolve(__dirname, '..')
- github.authenticate({type: 'token', token: process.env.ELECTRON_GITHUB_TOKEN})
- 
-+<<<<<<< .our
- async function getNewVersion (dryRun) {
-   if (!dryRun) {
-     console.log(`Bumping for new "${versionType}" version.`)
-   }
-   let bumpScript = path.join(__dirname, 'bump-version.py')
-   let scriptArgs = [bumpScript, '--bump', versionType]
-+=======
-+function getNewVersion (dryRun) {
-+  console.log(`Bumping for new "${versionType}" version.`)
-+  let bumpScript = path.join(__dirname, 'bump-version.py')
-+  let scriptArgs = [bumpScript, `--bump ${versionType}`]
-+>>>>>>> .their
-   if (args.stable) {
-     scriptArgs.push('--stable')
-   }
-@@ -52,7 +75,10 @@
-     return newVersion
-   } catch (err) {
-     console.log(`${fail} Could not bump version, error was:`, err)
-+<<<<<<< .our
-     throw err
-+=======
-+>>>>>>> .their
-   }
- }
- 
-@@ -74,6 +100,7 @@
- }
- 
- async function getReleaseNotes (currentBranch) {
-+<<<<<<< .our
-   if (versionType === 'nightly') {
-     return 'Nightlies do not get release notes, please compare tags for info'
-   }
-@@ -81,6 +108,12 @@
-   let githubOpts = {
-     owner: 'electron',
-     repo: targetRepo,
-+=======
-+  console.log(`Generating release notes for ${currentBranch}.`)
-+  let githubOpts = {
-+    owner: 'electron',
-+    repo: 'electron',
-+>>>>>>> .their
-     base: `v${pkg.version}`,
-     head: currentBranch
-   }
-@@ -142,11 +175,19 @@
- 
- async function createRelease (branchToTarget, isBeta) {
-   let releaseNotes = await getReleaseNotes(branchToTarget)
-+<<<<<<< .our
-   let newVersion = await getNewVersion()
-   await tagRelease(newVersion)
-   const githubOpts = {
-     owner: 'electron',
-     repo: targetRepo
-+=======
-+  let newVersion = getNewVersion()
-+  await tagRelease(newVersion)
-+  const githubOpts = {
-+    owner: 'electron',
-+    repo: 'electron'
-+>>>>>>> .their
-   }
-   console.log(`Checking for existing draft release.`)
-   let releases = await github.repos.getReleases(githubOpts)
-@@ -164,6 +205,7 @@
-   githubOpts.draft = true
-   githubOpts.name = `electron ${newVersion}`
-   if (isBeta) {
-+<<<<<<< .our
-     if (newVersion.indexOf('nightly') > 0) {
-       githubOpts.body = `Note: This is a nightly release.  Please file new issues ` +
-         `for any bugs you find in it.\n \n This release is published to npm ` +
-@@ -175,13 +217,23 @@
-         `under the beta tag and can be installed via npm install electron@beta, ` +
-         `or npm i electron@${newVersion.substr(1)}.\n \n ${releaseNotes}`
-     }
-+=======
-+    githubOpts.body = `Note: This is a beta release.  Please file new issues ` +
-+      `for any bugs you find in it.\n \n This release is published to npm ` +
-+      `under the beta tag and can be installed via npm install electron@beta, ` +
-+      `or npm i electron@${newVersion.substr(1)}.\n \n ${releaseNotes}`
-+>>>>>>> .their
-     githubOpts.name = `${githubOpts.name}`
-     githubOpts.prerelease = true
-   } else {
-     githubOpts.body = releaseNotes
-   }
-   githubOpts.tag_name = newVersion
-+<<<<<<< .our
-   githubOpts.target_commitish = newVersion.indexOf('nightly') !== -1 ? 'master' : branchToTarget
-+=======
-+  githubOpts.target_commitish = branchToTarget
-+>>>>>>> .their
-   await github.repos.createRelease(githubOpts)
-     .catch(err => {
-       console.log(`${fail} Error creating new release: `, err)
-@@ -222,7 +274,11 @@
- }
- 
- async function verifyNewVersion () {
-+<<<<<<< .our
-   let newVersion = await getNewVersion(true)
-+=======
-+  let newVersion = getNewVersion(true)
-+>>>>>>> .their
-   let response
-   if (args.automaticRelease) {
-     response = 'y'
-@@ -250,6 +306,7 @@
-   })
- }
- 
-+<<<<<<< .our
- // function to determine if there have been commits to master since the last release
- async function changesToRelease () {
-   let lastCommitWasRelease = new RegExp(`^Bump v[0-9.]*(-beta[0-9.]*)?(-nightly[0-9.]*)?$`, 'g')
-@@ -278,6 +335,28 @@
-         process.exit(1)
-       }
-     }
-+=======
-+async function prepareRelease (isBeta, notesOnly) {
-+  if (args.automaticRelease && (pkg.version.indexOf('beta') === -1 ||
-+      versionType !== 'beta')) {
-+    console.log(`${fail} Automatic release is only supported for beta releases`)
-+    process.exit(1)
-+  }
-+  let currentBranch
-+  if (args.branch) {
-+    currentBranch = args.branch
-+  } else {
-+    currentBranch = await getCurrentBranch(gitDir)
-+  }
-+  if (notesOnly) {
-+    let releaseNotes = await getReleaseNotes(currentBranch)
-+    console.log(`Draft release notes are: \n${releaseNotes}`)
-+  } else {
-+    await verifyNewVersion()
-+    await createRelease(currentBranch, isBeta)
-+    await pushRelease(currentBranch)
-+    await runReleaseBuilds(currentBranch)
-+>>>>>>> .their
-   }
- }
- 
-added in both
-  our    100644 27290c513bb28d9bd394575d833f1e6786e3b479 script/publish-to-npm.js
-  their  100644 eb0702ff5ef265b545824ba21ffb4c5d760d5476 script/publish-to-npm.js
-@@ -3,6 +3,7 @@
- const path = require('path')
- const childProcess = require('child_process')
- const GitHubApi = require('github')
-+<<<<<<< .our
- const {GitProcess} = require('dugite')
- const request = require('request')
- const rootPackageJson = require('../package.json')
-@@ -12,6 +13,12 @@
-   process.exit(1)
- }
- 
-+=======
-+const request = require('request')
-+const assert = require('assert')
-+const rootPackageJson = require('../package.json')
-+
-+>>>>>>> .their
- const github = new GitHubApi({
-   // debug: true,
-   headers: { 'User-Agent': 'electron-npm-publisher' },
-@@ -73,7 +80,11 @@
- 
-   return github.repos.getReleases({
-     owner: 'electron',
-+<<<<<<< .our
-     repo: rootPackageJson.version.indexOf('nightly') > 0 ? 'nightlies' : 'electron'
-+=======
-+    repo: 'electron'
-+>>>>>>> .their
-   })
- })
- .then((releases) => {
-@@ -108,6 +119,7 @@
-     })
-   })
- })
-+<<<<<<< .our
- .then(async (release) => {
-   if (release.tag_name.indexOf('nightly') > 0) {
-     const currentBranch = await getCurrentBranch()
-@@ -119,6 +131,10 @@
-   } else {
-     npmTag = release.prerelease ? 'beta' : 'latest'
-   }
-+=======
-+.then((release) => {
-+  npmTag = release.prerelease ? 'beta' : 'latest'
-+>>>>>>> .their
- })
- .then(() => childProcess.execSync('npm pack', { cwd: tempDir }))
- .then(() => {
-@@ -129,14 +145,24 @@
-       env: Object.assign({}, process.env, { electron_config_cache: tempDir }),
-       cwd: tempDir
-     })
-+<<<<<<< .our
-     resolve(tarballPath)
-   })
- })
- .then((tarballPath) => childProcess.execSync(`npm publish ${tarballPath} --tag ${npmTag} --otp=${process.env.ELECTRON_NPM_OTP}`))
-+=======
-+    const checkVersion = childProcess.execSync(`${path.join(tempDir, 'node_modules', '.bin', 'electron')} -v`)
-+    assert.ok((`v${rootPackageJson.version}`.indexOf(checkVersion.toString().trim()) === 0), `Version is correct`)
-+    resolve(tarballPath)
-+  })
-+})
-+.then((tarballPath) => childProcess.execSync(`npm publish ${tarballPath} --tag ${npmTag}`))
-+>>>>>>> .their
- .catch((err) => {
-   console.error(`Error: ${err}`)
-   process.exit(1)
- })
-+<<<<<<< .our
- 
- async function getCurrentBranch () {
-   const gitDir = path.resolve(__dirname, '..')
-@@ -155,3 +181,5 @@
-     process.exit(1)
-   }
- }
-+=======
-+>>>>>>> .their
-added in both
-  our    100755 84e00ad4f309201f151c3f8fcbaf9ee536c9b6cb script/release.js
-  their  100755 23c3e879e501f9c7a399b15a68e332b3197315a8 script/release.js
-@@ -1,8 +1,14 @@
- #!/usr/bin/env node
- 
-+<<<<<<< .our
- if (!process.env.CI) require('dotenv-safe').load()
- require('colors')
- const args = require('minimist')(process.argv.slice(2))
-+=======
-+require('colors')
-+const args = require('minimist')(process.argv.slice(2))
-+const assert = require('assert')
-+>>>>>>> .their
- const fs = require('fs')
- const { execSync } = require('child_process')
- const GitHub = require('github')
-@@ -16,16 +22,27 @@
- const sumchecker = require('sumchecker')
- const temp = require('temp').track()
- const { URL } = require('url')
-+<<<<<<< .our
- const targetRepo = pkgVersion.indexOf('nightly') > 0 ? 'nightlies' : 'electron'
- let failureCount = 0
- 
-+=======
-+let failureCount = 0
-+
-+assert(process.env.ELECTRON_GITHUB_TOKEN, 'ELECTRON_GITHUB_TOKEN not found in environment')
-+
-+>>>>>>> .their
- const github = new GitHub({
-   followRedirects: false
- })
- github.authenticate({type: 'token', token: process.env.ELECTRON_GITHUB_TOKEN})
- 
- async function getDraftRelease (version, skipValidation) {
-+<<<<<<< .our
-   let releaseInfo = await github.repos.getReleases({owner: 'electron', repo: targetRepo})
-+=======
-+  let releaseInfo = await github.repos.getReleases({owner: 'electron', repo: 'electron'})
-+>>>>>>> .their
-   let drafts
-   let versionToCheck
-   if (version) {
-@@ -95,6 +112,10 @@
-     `electron-${version}-linux-armv7l.zip`,
-     `electron-${version}-linux-ia32-symbols.zip`,
-     `electron-${version}-linux-ia32.zip`,
-+<<<<<<< .our
-+=======
-+//    `electron-${version}-linux-mips64el.zip`,
-+>>>>>>> .their
-     `electron-${version}-linux-x64-symbols.zip`,
-     `electron-${version}-linux-x64.zip`,
-     `electron-${version}-mas-x64-dsym.zip`,
-@@ -112,6 +133,10 @@
-     `ffmpeg-${version}-linux-arm64.zip`,
-     `ffmpeg-${version}-linux-armv7l.zip`,
-     `ffmpeg-${version}-linux-ia32.zip`,
-+<<<<<<< .our
-+=======
-+//    `ffmpeg-${version}-linux-mips64el.zip`,
-+>>>>>>> .their
-     `ffmpeg-${version}-linux-x64.zip`,
-     `ffmpeg-${version}-mas-x64.zip`,
-     `ffmpeg-${version}-win32-ia32.zip`,
-@@ -141,8 +166,11 @@
- }
- 
- function checkVersion () {
-+<<<<<<< .our
-   if (args.skipVersionCheck) return
- 
-+=======
-+>>>>>>> .their
-   console.log(`Verifying that app version matches package version ${pkgVersion}.`)
-   let startScript = path.join(__dirname, 'start.py')
-   let scriptArgs = ['--version']
-@@ -180,7 +208,15 @@
- function uploadIndexJson () {
-   console.log('Uploading index.json to S3.')
-   let scriptPath = path.join(__dirname, 'upload-index-json.py')
-+<<<<<<< .our
-   runScript(scriptPath, [pkgVersion])
-+=======
-+  let scriptArgs = []
-+  if (args.automaticRelease) {
-+    scriptArgs.push('-R')
-+  }
-+  runScript(scriptPath, scriptArgs)
-+>>>>>>> .their
-   console.log(`${pass} Done uploading index.json to S3.`)
- }
- 
-@@ -191,7 +227,11 @@
-     console.log(`${fileName} already exists on GitHub; deleting before creating new file.`)
-     await github.repos.deleteAsset({
-       owner: 'electron',
-+<<<<<<< .our
-       repo: targetRepo,
-+=======
-+      repo: 'electron',
-+>>>>>>> .their
-       id: existingAssets[0].id
-     }).catch(err => {
-       console.log(`${fail} Error deleting ${fileName} on GitHub:`, err)
-@@ -210,7 +250,11 @@
- async function uploadShasumFile (filePath, fileName, release) {
-   let githubOpts = {
-     owner: 'electron',
-+<<<<<<< .our
-     repo: targetRepo,
-+=======
-+    repo: 'electron',
-+>>>>>>> .their
-     id: release.id,
-     filePath,
-     name: fileName
-@@ -245,7 +289,11 @@
- async function publishRelease (release) {
-   let githubOpts = {
-     owner: 'electron',
-+<<<<<<< .our
-     repo: targetRepo,
-+=======
-+    repo: 'electron',
-+>>>>>>> .their
-     id: release.id,
-     tag_name: release.tag_name,
-     draft: false
-@@ -272,7 +320,10 @@
-     let draftRelease = await getDraftRelease()
-     uploadNodeShasums()
-     uploadIndexJson()
-+<<<<<<< .our
- 
-+=======
-+>>>>>>> .their
-     await createReleaseShasums(draftRelease)
-     // Fetch latest version of release before verifying
-     draftRelease = await getDraftRelease(pkgVersion, true)
-@@ -300,7 +351,11 @@
-   let downloadDir = await makeTempDir()
-   let githubOpts = {
-     owner: 'electron',
-+<<<<<<< .our
-     repo: targetRepo,
-+=======
-+    repo: 'electron',
-+>>>>>>> .their
-     headers: {
-       Accept: 'application/octet-stream'
-     }
-added in both
-  our    100644 010f094c9a426188a65443b114788a41969115de script/run-clang-format.py
-  their  100644 8b88153946ebc701b1f1f2c7ecbc0b941e6c1832 script/run-clang-format.py
-@@ -19,7 +19,10 @@
- import subprocess
- import sys
- import traceback
-+<<<<<<< .our
- import tempfile
-+=======
-+>>>>>>> .their
- 
- from functools import partial
- 
-@@ -69,8 +72,13 @@
-         difflib.unified_diff(
-             original,
-             reformatted,
-+<<<<<<< .our
-             fromfile='a/{}'.format(diff_file),
-             tofile='b/{}'.format(diff_file),
-+=======
-+            fromfile='{}\t(original)'.format(diff_file),
-+            tofile='{}\t(reformatted)'.format(diff_file),
-+>>>>>>> .their
-             n=3))
- 
- 
-@@ -313,12 +321,15 @@
-                 continue
-             if not args.quiet:
-                 print_diff(outs, use_color=colored_stdout)
-+<<<<<<< .our
-                 with tempfile.NamedTemporaryFile(delete=False) as patch_file:
-                     for line in outs:
-                         patch_file.write(line)
-                     patch_file.write('\n')
-                     print("\nTo apply this patch, run:\n$ git apply {}\n"
-                           .format(patch_file.name))
-+=======
-+>>>>>>> .their
-             if retcode == ExitStatus.SUCCESS:
-                 retcode = ExitStatus.DIFF
-     return retcode
-added in both
-  our    100755 46cada435e1bd6ecaa2111cdf29e5aeb834b227e script/test.py
-  their  100755 cb17102557dca975208140b479168906100cfd74 script/test.py
-@@ -18,9 +18,12 @@
-     # will be picked up by electron.
-     try:
-         import lib.dbus_mock
-+<<<<<<< .our
-         import atexit
-         lib.dbus_mock.start()
-         atexit.register(lib.dbus_mock.stop)
-+=======
-+>>>>>>> .their
-     except ImportError:
-         # If not available, the powerMonitor tests will be skipped since
-         # DBUS_SYSTEM_BUS_ADDRESS will not be set
-@@ -58,8 +61,11 @@
-     electron = os.path.join(SOURCE_ROOT, 'out', config,
-                               '{0}.exe'.format(PROJECT_NAME))
-     resources_path = os.path.join(SOURCE_ROOT, 'out', config)
-+<<<<<<< .our
-     if config != 'R':
-       os.environ['ELECTRON_SKIP_NATIVE_MODULE_TESTS'] = '1'
-+=======
-+>>>>>>> .their
-   else:
-     electron = os.path.join(SOURCE_ROOT, 'out', config, PROJECT_NAME)
-     resources_path = os.path.join(SOURCE_ROOT, 'out', config)
-added in both
-  our    100755 0bc9d0f632057f4a17aa811340ba21631433f173 script/update-external-binaries.py
-  their  100755 e67ac996e2605be675a0431db7fb61fd28a1445c script/update-external-binaries.py
-@@ -4,11 +4,19 @@
- import sys
- import os
- 
-+<<<<<<< .our
- from lib.config import PLATFORM, get_target_arch
- from lib.util import add_exec_bit, download, extract_zip, rm_rf, \
-                      safe_mkdir, tempdir
- 
- VERSION = 'v1.4.0'
-+=======
-+from lib.config import get_target_arch
-+from lib.util import safe_mkdir, rm_rf, extract_zip, tempdir, download
-+
-+
-+VERSION = 'v1.3.0'
-+>>>>>>> .their
- SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
- FRAMEWORKS_URL = 'http://github.com/electron/electron-frameworks/releases' \
-                  '/download/' + VERSION
-@@ -31,6 +39,7 @@
-   elif sys.platform in ['cygwin', 'win32']:
-     download_and_unzip('directxsdk-' + get_target_arch())
- 
-+<<<<<<< .our
-   # get sccache & set exec bit. https://bugs.python.org/issue15795
-   download_and_unzip('sccache-{0}-x64'.format(PLATFORM))
-   appname = 'sccache'
-@@ -38,6 +47,8 @@
-     appname += '.exe'
-   add_exec_bit(os.path.join('external_binaries', appname))
- 
-+=======
-+>>>>>>> .their
-   with open(version_file, 'w') as f:
-     f.write(VERSION)
- 
-added in both
-  our    100755 55d0675d0707d34c806847f3a64aa77f20a4830d script/upload-index-json.py
-  their  100755 f5e5b3c7a6adcaf7005ad9242c1664ad2f243d1f script/upload-index-json.py
-@@ -2,14 +2,22 @@
- 
- import os
- import sys
-+<<<<<<< .our
- import urllib2
- 
- from lib.config import s3_config
- from lib.util import s3put, scoped_cwd, safe_mkdir
-+=======
-+
-+from lib.config import PLATFORM, s3_config
-+from lib.util import electron_gyp, execute, s3put, scoped_cwd
-+
-+>>>>>>> .their
- 
- SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
- OUT_DIR     = os.path.join(SOURCE_ROOT, 'out', 'D')
- 
-+<<<<<<< .our
- BASE_URL = 'https://electron-metadumper.herokuapp.com/?version='
- 
- version = sys.argv[1]
-@@ -42,6 +50,26 @@
- 
-     with open(index_json, "w") as f:
-       f.write(new_content)
-+=======
-+PROJECT_NAME = electron_gyp()['project_name%']
-+PRODUCT_NAME = electron_gyp()['product_name%']
-+
-+
-+def main():
-+  # Upload the index.json.
-+  with scoped_cwd(SOURCE_ROOT):
-+    if sys.platform == 'darwin':
-+      electron = os.path.join(OUT_DIR, '{0}.app'.format(PRODUCT_NAME),
-+                                'Contents', 'MacOS', PRODUCT_NAME)
-+    elif sys.platform == 'win32':
-+      electron = os.path.join(OUT_DIR, '{0}.exe'.format(PROJECT_NAME))
-+    else:
-+      electron = os.path.join(OUT_DIR, PROJECT_NAME)
-+    index_json = os.path.relpath(os.path.join(OUT_DIR, 'index.json'))
-+    execute([electron,
-+             os.path.join('tools', 'dump-version-info.js'),
-+             index_json])
-+>>>>>>> .their
- 
-     bucket, access_key, secret_key = s3_config()
-     s3put(bucket, access_key, secret_key, OUT_DIR, 'atom-shell/dist',
-added in both
-  our    100644 2facda2daa1b8a8ccb63a28198a15b7e7ecb0880 script/upload-to-github.js
-  their  100644 7c3f8d9c11ce7b75f307850663efd2e571e8644a script/upload-to-github.js
-@@ -1,16 +1,24 @@
-+<<<<<<< .our
- if (!process.env.CI) require('dotenv-safe').load()
- 
-+=======
-+>>>>>>> .their
- const GitHub = require('github')
- const github = new GitHub()
- github.authenticate({type: 'token', token: process.env.ELECTRON_GITHUB_TOKEN})
- 
-+<<<<<<< .our
- if (process.argv.length < 6) {
-+=======
-+if (process.argv.length < 5) {
-+>>>>>>> .their
-   console.log('Usage: upload-to-github filePath fileName releaseId')
-   process.exit(1)
- }
- let filePath = process.argv[2]
- let fileName = process.argv[3]
- let releaseId = process.argv[4]
-+<<<<<<< .our
- let releaseVersion = process.argv[5]
- 
- const targetRepo = releaseVersion.indexOf('nightly') > 0 ? 'nightlies' : 'electron'
-@@ -18,6 +26,12 @@
- let githubOpts = {
-   owner: 'electron',
-   repo: targetRepo,
-+=======
-+
-+let githubOpts = {
-+  owner: 'electron',
-+  repo: 'electron',
-+>>>>>>> .their
-   id: releaseId,
-   filePath: filePath,
-   name: fileName
-@@ -39,7 +53,11 @@
-           console.log(`${fileName} already exists; will delete before retrying upload.`)
-           github.repos.deleteAsset({
-             owner: 'electron',
-+<<<<<<< .our
-             repo: targetRepo,
-+=======
-+            repo: 'electron',
-+>>>>>>> .their
-             id: existingAssets[0].id
-           }).then(uploadToGitHub).catch(uploadToGitHub)
-         } else {
-added in both
-  our    100755 2d9eaa201265971ca01acaea6e84a440e5db0532 script/upload.py
-  their  100755 6d71fc69d4d708cae4ee2f5a7d41e60bdc5d2e79 script/upload.py
-@@ -37,7 +37,11 @@
-   args = parse_args()
-   if  args.upload_to_s3:
-     utcnow = datetime.datetime.utcnow()
-+<<<<<<< .our
-     args.upload_timestamp = utcnow.strftime('%Y%m%d')
-+=======
-+    args.upload_timestamp = utcnow.strftime('%Y-%m-%d_%H:%M:%S')
-+>>>>>>> .their
- 
-   if not dist_newer_than_head():
-     run_python_script('create-dist.py')
-@@ -165,18 +169,30 @@
-     return
- 
-   # Upload the file.
-+<<<<<<< .our
-   upload_io_to_github(release, filename, file_path, args.version)
-+=======
-+  upload_io_to_github(release, filename, file_path)
-+>>>>>>> .their
- 
-   # Upload the checksum file.
-   upload_sha256_checksum(args.version, file_path)
- 
- 
-+<<<<<<< .our
- def upload_io_to_github(release, filename, filepath, version):
-   print 'Uploading %s to Github' % \
-       (filename)
-   script_path = os.path.join(SOURCE_ROOT, 'script', 'upload-to-github.js')
-   execute(['node', script_path, filepath, filename, str(release['id']),
-           version])
-+=======
-+def upload_io_to_github(release, filename, filepath):
-+  print 'Uploading %s to Github' % \
-+      (filename)
-+  script_path = os.path.join(SOURCE_ROOT, 'script', 'upload-to-github.js')
-+  execute(['node', script_path, filepath, filename, str(release['id'])])
-+>>>>>>> .their
- 
- 
- def upload_sha256_checksum(version, file_path, key_prefix=None):
-added in both
-  our    100755 5fe196270e64f8d9b5f16483a10425382135cc2e script/verify-ffmpeg.py
-  their  100755 1d78515a4ade0f9f283e9064ad08e3637affb003 script/verify-ffmpeg.py
-@@ -1,5 +1,9 @@
- #!/usr/bin/env python
-+<<<<<<< .our
- import argparse
-+=======
-+
-+>>>>>>> .their
- import os
- import shutil
- import subprocess
-@@ -17,10 +21,21 @@
- 
- 
- def main():
-+<<<<<<< .our
-   args = parse_args()
-   os.chdir(args.source_root)
- 
-   app_path = create_app_copy(args)
-+=======
-+  os.chdir(SOURCE_ROOT)
-+
-+  if len(sys.argv) == 2 and sys.argv[1] == '-R':
-+    config = 'R'
-+  else:
-+    config = 'D'
-+
-+  app_path = create_app_copy(config)
-+>>>>>>> .their
- 
-   if sys.platform == 'darwin':
-     electron = os.path.join(app_path, 'Contents', 'MacOS', PRODUCT_NAME)
-@@ -38,12 +53,20 @@
-     ffmpeg_name = 'libffmpeg.so'
- 
-   # Copy ffmpeg without proprietary codecs into app
-+<<<<<<< .our
-   shutil.copy(os.path.join(args.ffmpeg_path, ffmpeg_name), ffmpeg_app_path)
- 
-   returncode = 0
-   try:
-     test_path = os.path.join(SOURCE_ROOT, 'spec', 'fixtures',
-         'no-proprietary-codecs.js')
-+=======
-+  shutil.copy(os.path.join(FFMPEG_LIBCC_PATH, ffmpeg_name), ffmpeg_app_path)
-+
-+  returncode = 0
-+  try:
-+    test_path = os.path.join('spec', 'fixtures', 'no-proprietary-codecs.js')
-+>>>>>>> .their
-     subprocess.check_call([electron, test_path] + sys.argv[1:])
-   except subprocess.CalledProcessError as e:
-     returncode = e.returncode
-@@ -54,10 +77,16 @@
- 
- 
- # Create copy of app to install ffmpeg library without proprietary codecs into
-+<<<<<<< .our
- def create_app_copy(args):
-   initial_app_path = os.path.join(args.source_root, 'out', args.config)
-   app_path = os.path.join(args.source_root, 'out',
-     args.config + '-no-proprietary-codecs')
-+=======
-+def create_app_copy(config):
-+  initial_app_path = os.path.join(SOURCE_ROOT, 'out', config)
-+  app_path = os.path.join(SOURCE_ROOT, 'out', config + '-no-proprietary-codecs')
-+>>>>>>> .their
- 
-   if sys.platform == 'darwin':
-     app_name = '{0}.app'.format(PRODUCT_NAME)
-@@ -68,6 +97,7 @@
-   shutil.copytree(initial_app_path, app_path, symlinks=True)
-   return app_path
- 
-+<<<<<<< .our
- def parse_args():
-   parser = argparse.ArgumentParser(description='Test non-proprietary ffmpeg')
-   parser.add_argument('-c', '--config',
-@@ -81,6 +111,8 @@
-                       default=FFMPEG_LIBCC_PATH,
-                       required=False)
-   return parser.parse_args()
-+=======
-+>>>>>>> .their
- 
- if __name__ == '__main__':
-   sys.exit(main())
-added in both
-  our    100644 d224eda2989332c18d655cef05a8bacc2eb6d4b8 spec/api-app-spec.js
-  their  100644 605fee365905ed9ad78c00b57fac954856ae87de spec/api-app-spec.js
-@@ -168,9 +168,14 @@
-       const electronPath = remote.getGlobal('process').execPath
- 
-       appProcess = ChildProcess.spawn(electronPath, [appPath])
-+<<<<<<< .our
-       appProcess.on('close', (code, signal) => {
-         expect(signal).to.equal(null, 'exit signal should be null, if you see this please tag @MarshallOfSound')
-         expect(code).to.equal(123, 'exit code should be 123, if you see this please tag @MarshallOfSound')
-+=======
-+      appProcess.on('close', code => {
-+        expect(code).to.equal(123)
-+>>>>>>> .their
-         done()
-       })
-     })
-@@ -796,7 +801,12 @@
-     })
-   })
- 
-+<<<<<<< .our
-   describe('getAppMetrics() API', () => {
-+=======
-+  // TODO(marshallofsound): [Ch66] Failed on Windows x64 + ia32 on CI, passes locally
-+  xdescribe('getAppMetrics() API', () => {
-+>>>>>>> .their
-     it('returns memory and cpu stats of all running electron processes', () => {
-       const appMetrics = app.getAppMetrics()
-       expect(appMetrics).to.be.an('array').and.have.lengthOf.at.least(1, 'App memory info object is not > 0')
-@@ -804,6 +814,7 @@
-       const types = []
-       for (const {memory, pid, type, cpu} of appMetrics) {
-         expect(memory.workingSetSize).to.be.above(0, 'working set size is not > 0')
-+<<<<<<< .our
- 
-         // windows causes failures here due to CI server configuration
-         if (process.platform !== 'win32') {
-@@ -811,6 +822,10 @@
-           expect(memory.sharedBytes).to.be.above(0, 'shared bytes is not > 0')
-         }
- 
-+=======
-+        expect(memory.privateBytes).to.be.above(0, 'private bytes is not > 0')
-+        expect(memory.sharedBytes).to.be.above(0, 'shared bytes is not > 0')
-+>>>>>>> .their
-         expect(pid).to.be.above(0, 'pid is not > 0')
-         expect(type).to.be.a('string').that.is.not.empty()
- 
-@@ -872,12 +887,37 @@
-       it('adds --enable-sandbox to render processes created with sandbox: true', done => {
-         const appPath = path.join(__dirname, 'fixtures', 'api', 'mixed-sandbox-app')
-         appProcess = ChildProcess.spawn(remote.process.execPath, [appPath])
-+<<<<<<< .our
- 
-         server.once('error', error => { done(error) })
- 
-         server.on('connection', client => {
-           client.once('data', data => {
-             const argv = JSON.parse(data)
-+=======
-+        appProcess.stdout.on('data', (data) => {
-+          console.log(`stdout: ${data}`)
-+        })
-+
-+        appProcess.stderr.on('data', (data) => {
-+          console.log(`stderr: ${data}`)
-+        })
-+
-+        appProcess.on('close', (code) => {
-+          console.log(`child process exited with code ${code}`)
-+        })
-+
-+        server.once('error', error => {
-+          console.log('Error in server', error)
-+          done(error)
-+        })
-+
-+        server.on('connection', client => {
-+          console.log('Got connection for app.enableMixedSandbox() is called')
-+          client.once('data', data => {
-+            const argv = JSON.parse(data)
-+            console.log('Got data for app.enableMixedSandbox() is called', argv)
-+>>>>>>> .their
-             expect(argv.sandbox).to.include('--enable-sandbox')
-             expect(argv.sandbox).to.not.include('--no-sandbox')
- 
-@@ -894,12 +934,33 @@
-       it('adds --enable-sandbox to render processes created with sandbox: true', done => {
-         const appPath = path.join(__dirname, 'fixtures', 'api', 'mixed-sandbox-app')
-         appProcess = ChildProcess.spawn(remote.process.execPath, [appPath, '--enable-mixed-sandbox'])
-+<<<<<<< .our
-+=======
-+        appProcess.stdout.on('data', (data) => {
-+          console.log(`stdout: ${data}`)
-+        })
-+
-+        appProcess.stderr.on('data', (data) => {
-+          console.log(`stderr: ${data}`)
-+        })
-+
-+        appProcess.on('close', (code) => {
-+          console.log(`child process exited with code ${code}`)
-+        })
-+>>>>>>> .their
- 
-         server.once('error', error => { done(error) })
- 
-         server.on('connection', client => {
-+<<<<<<< .our
-+          client.once('data', data => {
-+            const argv = JSON.parse(data)
-+=======
-+          console.log('Got connection for --enable-mixed-sandbox')
-           client.once('data', data => {
-             const argv = JSON.parse(data)
-+            console.log('Got data for --enable-mixed-sandbox', argv)
-+>>>>>>> .their
-             expect(argv.sandbox).to.include('--enable-sandbox')
-             expect(argv.sandbox).to.not.include('--no-sandbox')
- 
-added in both
-  our    100644 f4cba12ec19d224bc46fca898db42a99baf4972e spec/api-browser-window-spec.js
-  their  100644 c41e4426edd133bf14d74061d0ef63f00fdd05d0 spec/api-browser-window-spec.js
-@@ -1,8 +1,12 @@
- 'use strict'
- 
- const assert = require('assert')
-+<<<<<<< .our
- const chai = require('chai')
- const dirtyChai = require('dirty-chai')
-+=======
-+const {expect} = require('chai')
-+>>>>>>> .their
- const fs = require('fs')
- const path = require('path')
- const os = require('os')
-@@ -14,12 +18,19 @@
- const {app, ipcMain, BrowserWindow, BrowserView, protocol, session, webContents} = remote
- 
- const features = process.atomBinding('features')
-+<<<<<<< .our
- const {expect} = chai
- const isCI = remote.getGlobal('isCi')
- const nativeModulesEnabled = remote.getGlobal('nativeModulesEnabled')
- 
- chai.use(dirtyChai)
- 
-+=======
-+
-+const isCI = remote.getGlobal('isCi')
-+const nativeModulesEnabled = remote.getGlobal('nativeModulesEnabled')
-+
-+>>>>>>> .their
- describe('BrowserWindow module', () => {
-   const fixtures = path.resolve(__dirname, 'fixtures')
-   let w = null
-@@ -27,6 +38,7 @@
-   let server
-   let postData
- 
-+<<<<<<< .our
-   const defaultOptions = {
-     show: false,
-     width: 400,
-@@ -45,6 +57,8 @@
-     return w
-   }
- 
-+=======
-+>>>>>>> .their
-   const closeTheWindow = function () {
-     return closeWindow(w).then(() => { w = null })
-   }
-@@ -99,13 +113,32 @@
-     server = null
-   })
- 
-+<<<<<<< .our
-   beforeEach(openTheWindow)
-+=======
-+  beforeEach(() => {
-+    w = new BrowserWindow({
-+      show: false,
-+      width: 400,
-+      height: 400,
-+      webPreferences: {
-+        backgroundThrottling: false
-+      }
-+    })
-+  })
-+>>>>>>> .their
- 
-   afterEach(closeTheWindow)
- 
-   describe('BrowserWindow constructor', () => {
-     it('allows passing void 0 as the webContents', () => {
-+<<<<<<< .our
-       openTheWindow({
-+=======
-+      w.close()
-+      w = null
-+      w = new BrowserWindow({
-+>>>>>>> .their
-         webContents: void 0
-       })
-     })
-@@ -217,7 +250,11 @@
-       const contents = w.webContents
-       w.destroy()
-       assert.throws(() => {
-+<<<<<<< .our
-         contents.getProcessId()
-+=======
-+        contents.getId()
-+>>>>>>> .their
-       }, /Object has been destroyed/)
-     })
-   })
-@@ -422,6 +459,7 @@
-   })
- 
-   describe('BrowserWindow.capturePage(rect, callback)', () => {
-+<<<<<<< .our
-     it('calls the callback with a Buffer', async () => {
-       const image = await new Promise((resolve) => {
-         w.capturePage({
-@@ -452,10 +490,46 @@
-       // Check the 25th byte in the PNG.
-       // Values can be 0,2,3,4, or 6. We want 6, which is RGB + Alpha
-       expect(imgBuffer[25]).to.equal(6)
-+=======
-+    it('calls the callback with a Buffer', (done) => {
-+      w.capturePage({
-+        x: 0,
-+        y: 0,
-+        width: 100,
-+        height: 100
-+      }, (image) => {
-+        assert.equal(image.isEmpty(), true)
-+        done()
-+      })
-+    })
-+
-+    it('preserves transparency', (done) => {
-+      w.close()
-+      const width = 400
-+      const height = 400
-+      w = new BrowserWindow({
-+        show: false,
-+        width: width,
-+        height: height,
-+        transparent: true
-+      })
-+      w.loadURL('data:text/html,<html><body background-color: rgba(255,255,255,0)></body></html>')
-+      w.once('ready-to-show', () => {
-+        w.show()
-+        w.capturePage((image) => {
-+          let imgBuffer = image.toPNG()
-+          // Check 25th byte in the PNG
-+          // Values can be 0,2,3,4, or 6. We want 6, which is RGB + Alpha
-+          assert.equal(imgBuffer[25], 6)
-+          done()
-+        })
-+      })
-+>>>>>>> .their
-     })
-   })
- 
-   describe('BrowserWindow.setSize(width, height)', () => {
-+<<<<<<< .our
-     it('sets the window size', async () => {
-       const size = [300, 400]
- 
-@@ -464,6 +538,15 @@
-       await resized
- 
-       assertBoundsEqual(w.getSize(), size)
-+=======
-+    it('sets the window size', (done) => {
-+      const size = [300, 400]
-+      w.once('resize', () => {
-+        assertBoundsEqual(w.getSize(), size)
-+        done()
-+      })
-+      w.setSize(size[0], size[1])
-+>>>>>>> .their
-     })
-   })
- 
-@@ -765,6 +848,7 @@
-     })
-   })
- 
-+<<<<<<< .our
-   describe('BrowserWindow.setWindowButtonVisibility()', () => {
-     before(function () {
-       if (process.platform !== 'darwin') {
-@@ -792,6 +876,8 @@
-     })
-   })
- 
-+=======
-+>>>>>>> .their
-   describe('BrowserWindow.setVibrancy(type)', () => {
-     it('allows setting, changing, and removing the vibrancy', () => {
-       assert.doesNotThrow(() => {
-@@ -928,6 +1014,7 @@
-     })
-   })
- 
-+<<<<<<< .our
-   describe('BrowserWindow.setShape(rects)', () => {
-     it('allows setting shape', () => {
-       assert.doesNotThrow(() => {
-@@ -939,6 +1026,8 @@
-     })
-   })
- 
-+=======
-+>>>>>>> .their
-   describe('"useContentSize" option', () => {
-     it('make window created with content size when used', () => {
-       w.destroy()
-@@ -1409,8 +1498,11 @@
-             preload: preload
-           }
-         })
-+<<<<<<< .our
-         ipcRenderer.send('set-web-preferences-on-next-new-window', w.webContents.id, 'preload', preload)
- 
-+=======
-+>>>>>>> .their
-         let htmlPath = path.join(fixtures, 'api', 'sandbox.html?verify-ipc-sender')
-         const pageUrl = 'file://' + htmlPath
-         let childWc
-@@ -1589,8 +1681,11 @@
-             sandbox: true
-           }
-         })
-+<<<<<<< .our
-         ipcRenderer.send('set-web-preferences-on-next-new-window', w.webContents.id, 'preload', preload)
- 
-+=======
-+>>>>>>> .their
-         w.loadURL('file://' + path.join(fixtures, 'api', 'sandbox.html?reload-remote-child'))
- 
-         ipcMain.on('get-remote-module-path', (event) => {
-@@ -1617,6 +1712,7 @@
- 
-       it('validates process APIs access in sandboxed renderer', (done) => {
-         ipcMain.once('answer', function (event, test) {
-+<<<<<<< .our
-           assert.equal(test.pid, w.webContents.getOSProcessId())
-           assert.equal(test.arch, remote.process.arch)
-           assert.equal(test.platform, remote.process.platform)
-@@ -1627,6 +1723,11 @@
-           assert.equal(test.type, 'renderer')
-           assert.equal(test.version, remote.process.version)
-           assert.deepEqual(test.versions, remote.process.versions)
-+=======
-+          assert.equal(test.platform, remote.process.platform)
-+          assert.deepEqual(test.env, remote.process.env)
-+          assert.equal(test.execPath, remote.process.helperExecPath)
-+>>>>>>> .their
-           done()
-         })
-         remote.process.env.sandboxmain = 'foo'
-added in both
-  our    100644 fb3ee998eace4401d6f129930d802677ce5feb85 spec/api-menu-item-spec.js
-  their  100644 9bbb2e38da2cecb068528ded21307b387da337f1 spec/api-menu-item-spec.js
-@@ -1,11 +1,16 @@
-+<<<<<<< .our
- const chai = require('chai')
- const dirtyChai = require('dirty-chai')
-+=======
-+const assert = require('assert')
-+>>>>>>> .their
- 
- const {remote} = require('electron')
- const {BrowserWindow, app, Menu, MenuItem} = remote
- const roles = require('../lib/browser/api/menu-item-roles')
- const {closeWindow} = require('./window-helpers')
- 
-+<<<<<<< .our
- const {expect} = chai
- chai.use(dirtyChai)
- 
-@@ -17,6 +22,16 @@
-         click: (item) => {
-           expect(item.constructor.name).to.equal('MenuItem')
-           expect(item.label).to.equal('text')
-+=======
-+describe('MenuItems', () => {
-+  describe('MenuItem.click', () => {
-+    it('should be called with the item object passed', (done) => {
-+      const menu = Menu.buildFromTemplate([{
-+        label: 'text',
-+        click: (item) => {
-+          assert.equal(item.constructor.name, 'MenuItem')
-+          assert.equal(item.label, 'text')
-+>>>>>>> .their
-           done()
-         }
-       }])
-@@ -31,9 +46,15 @@
-         type: 'checkbox'
-       }])
- 
-+<<<<<<< .our
-       expect(menu.items[0].checked).to.be.false()
-       menu.delegate.executeCommand(menu, {}, menu.items[0].commandId)
-       expect(menu.items[0].checked).to.be.true()
-+=======
-+      assert.equal(menu.items[0].checked, false)
-+      menu.delegate.executeCommand(menu, {}, menu.items[0].commandId)
-+      assert.equal(menu.items[0].checked, true)
-+>>>>>>> .their
-     })
- 
-     it('clicking an radio item should always make checked property true', () => {
-@@ -43,9 +64,15 @@
-       }])
- 
-       menu.delegate.executeCommand(menu, {}, menu.items[0].commandId)
-+<<<<<<< .our
-       expect(menu.items[0].checked).to.be.true()
-       menu.delegate.executeCommand(menu, {}, menu.items[0].commandId)
-       expect(menu.items[0].checked).to.be.true()
-+=======
-+      assert.equal(menu.items[0].checked, true)
-+      menu.delegate.executeCommand(menu, {}, menu.items[0].commandId)
-+      assert.equal(menu.items[0].checked, true)
-+>>>>>>> .their
-     })
- 
-     describe('MenuItem group properties', () => {
-@@ -100,7 +127,11 @@
-         const groups = findRadioGroups(template)
- 
-         groups.forEach(g => {
-+<<<<<<< .our
-           expect(findChecked(menu.items, g.begin, g.end)).to.deep.equal([g.begin])
-+=======
-+          assert.deepEqual(findChecked(menu.items, g.begin, g.end), [g.begin])
-+>>>>>>> .their
-         })
-       })
- 
-@@ -113,12 +144,20 @@
-           const groupId = menu.items[g.begin].groupId
- 
-           // groupId should be previously unused
-+<<<<<<< .our
-           expect(usedGroupIds.has(groupId)).to.be.false()
-+=======
-+          assert(!usedGroupIds.has(groupId))
-+>>>>>>> .their
-           usedGroupIds.add(groupId)
- 
-           // everything in the group should have the same id
-           for (let i = g.begin; i < g.end; ++i) {
-+<<<<<<< .our
-             expect(menu.items[i].groupId).to.equal(groupId)
-+=======
-+            assert.equal(menu.items[i].groupId, groupId)
-+>>>>>>> .their
-           }
-         })
-       })
-@@ -128,6 +167,7 @@
- 
-         const groups = findRadioGroups(template)
-         groups.forEach(g => {
-+<<<<<<< .our
-           expect(findChecked(menu.items, g.begin, g.end)).to.deep.equal([])
- 
-           menu.items[g.begin].checked = true
-@@ -135,6 +175,15 @@
- 
-           menu.items[g.end - 1].checked = true
-           expect(findChecked(menu.items, g.begin, g.end)).to.deep.equal([g.end - 1])
-+=======
-+          assert.deepEqual(findChecked(menu.items, g.begin, g.end), [])
-+
-+          menu.items[g.begin].checked = true
-+          assert.deepEqual(findChecked(menu.items, g.begin, g.end), [g.begin])
-+
-+          menu.items[g.end - 1].checked = true
-+          assert.deepEqual(findChecked(menu.items, g.begin, g.end), [g.end - 1])
-+>>>>>>> .their
-         })
-       })
-     })
-@@ -146,7 +195,11 @@
-       let item = new MenuItem({role: 'asdfghjkl'})
- 
-       const canExecute = roles.execute(item.role, win, win.webContents)
-+<<<<<<< .our
-       expect(canExecute).to.be.false()
-+=======
-+      assert.equal(false, canExecute)
-+>>>>>>> .their
- 
-       closeWindow(win).then(() => { win = null })
-     })
-@@ -156,7 +209,11 @@
-       let item = new MenuItem({role: 'reload'})
- 
-       const canExecute = roles.execute(item.role, win, win.webContents)
-+<<<<<<< .our
-       expect(canExecute).to.be.true()
-+=======
-+      assert.equal(true, canExecute)
-+>>>>>>> .their
- 
-       closeWindow(win).then(() => { win = null })
-     })
-@@ -166,7 +223,11 @@
-       let item = new MenuItem({role: 'resetzoom'})
- 
-       const canExecute = roles.execute(item.role, win, win.webContents)
-+<<<<<<< .our
-       expect(canExecute).to.be.true()
-+=======
-+      assert.equal(true, canExecute)
-+>>>>>>> .their
- 
-       closeWindow(win).then(() => { win = null })
-     })
-@@ -177,31 +238,53 @@
-       const item = new MenuItem({label: 'item'})
- 
-       const commandId = item.commandId
-+<<<<<<< .our
-       expect(commandId).to.not.be.undefined()
-       item.commandId = `${commandId}-modified`
-       expect(item.commandId).to.equal(commandId)
-+=======
-+      assert(commandId)
-+      item.commandId = `${commandId}-modified`
-+      assert.equal(item.commandId, commandId)
-+>>>>>>> .their
-     })
-   })
- 
-   describe('MenuItem with invalid type', () => {
-     it('throws an exception', () => {
-+<<<<<<< .our
-       expect(() => {
-+=======
-+      assert.throws(() => {
-+>>>>>>> .their
-         Menu.buildFromTemplate([{
-           label: 'text',
-           type: 'not-a-type'
-         }])
-+<<<<<<< .our
-       }).to.throw(/Unknown menu item type: not-a-type/)
-+=======
-+      }, /Unknown menu item type: not-a-type/)
-+>>>>>>> .their
-     })
-   })
- 
-   describe('MenuItem with submenu type and missing submenu', () => {
-     it('throws an exception', () => {
-+<<<<<<< .our
-       expect(() => {
-+=======
-+      assert.throws(() => {
-+>>>>>>> .their
-         Menu.buildFromTemplate([{
-           label: 'text',
-           type: 'submenu'
-         }])
-+<<<<<<< .our
-       }).to.throw(/Invalid submenu/)
-+=======
-+      }, /Invalid submenu/)
-+>>>>>>> .their
-     })
-   })
- 
-@@ -231,7 +314,11 @@
- 
-       for (let role in roleList) {
-         const item = new MenuItem({role})
-+<<<<<<< .our
-         expect(item.getDefaultRoleAccelerator()).to.be.undefined()
-+=======
-+        assert.equal(item.getDefaultRoleAccelerator(), undefined)
-+>>>>>>> .their
-       }
-     })
- 
-@@ -260,7 +347,11 @@
- 
-       for (let role in roleList) {
-         const item = new MenuItem({role})
-+<<<<<<< .our
-         expect(item.label).to.equal(roleList[role])
-+=======
-+        assert.equal(item.label, roleList[role])
-+>>>>>>> .their
-       }
-     })
- 
-@@ -289,7 +380,11 @@
- 
-       for (let role in roleList) {
-         const item = new MenuItem({role})
-+<<<<<<< .our
-         expect(item.getDefaultRoleAccelerator()).to.equal(roleList[role])
-+=======
-+        assert.equal(item.getDefaultRoleAccelerator(), roleList[role])
-+>>>>>>> .their
-       }
-     })
- 
-@@ -300,9 +395,15 @@
-         accelerator: 'D'
-       })
- 
-+<<<<<<< .our
-       expect(item.label).to.equal('Custom Close!')
-       expect(item.accelerator).to.equal('D')
-       expect(item.getDefaultRoleAccelerator()).to.equal('CommandOrControl+W')
-+=======
-+      assert.equal(item.label, 'Custom Close!')
-+      assert.equal(item.accelerator, 'D')
-+      assert.equal(item.getDefaultRoleAccelerator(), 'CommandOrControl+W')
-+>>>>>>> .their
-     })
-   })
- 
-@@ -310,6 +411,7 @@
-     it('includes a default submenu layout when submenu is empty', () => {
-       const item = new MenuItem({role: 'editMenu'})
- 
-+<<<<<<< .our
-       expect(item.label).to.equal('Edit')
-       expect(item.submenu.items[0].role).to.equal('undo')
-       expect(item.submenu.items[1].role).to.equal('redo')
-@@ -328,6 +430,26 @@
-         expect(item.submenu.items[6].role).to.equal('delete')
-         expect(item.submenu.items[7].type).to.equal('separator')
-         expect(item.submenu.items[8].role).to.equal('selectall')
-+=======
-+      assert.equal(item.label, 'Edit')
-+      assert.equal(item.submenu.items[0].role, 'undo')
-+      assert.equal(item.submenu.items[1].role, 'redo')
-+      assert.equal(item.submenu.items[2].type, 'separator')
-+      assert.equal(item.submenu.items[3].role, 'cut')
-+      assert.equal(item.submenu.items[4].role, 'copy')
-+      assert.equal(item.submenu.items[5].role, 'paste')
-+
-+      if (process.platform === 'darwin') {
-+        assert.equal(item.submenu.items[6].role, 'pasteandmatchstyle')
-+        assert.equal(item.submenu.items[7].role, 'delete')
-+        assert.equal(item.submenu.items[8].role, 'selectall')
-+      }
-+
-+      if (process.platform === 'win32') {
-+        assert.equal(item.submenu.items[6].role, 'delete')
-+        assert.equal(item.submenu.items[7].type, 'separator')
-+        assert.equal(item.submenu.items[8].role, 'selectall')
-+>>>>>>> .their
-       }
-     })
- 
-@@ -338,8 +460,13 @@
-           role: 'close'
-         }]
-       })
-+<<<<<<< .our
-       expect(item.label).to.equal('Edit')
-       expect(item.submenu.items[0].role).to.equal('close')
-+=======
-+      assert.equal(item.label, 'Edit')
-+      assert.equal(item.submenu.items[0].role, 'close')
-+>>>>>>> .their
-     })
-   })
- 
-@@ -347,6 +474,7 @@
-     it('includes a default submenu layout when submenu is empty', () => {
-       const item = new MenuItem({role: 'windowMenu'})
- 
-+<<<<<<< .our
-       expect(item.label).to.equal('Window')
-       expect(item.submenu.items[0].role).to.equal('minimize')
-       expect(item.submenu.items[1].role).to.equal('close')
-@@ -354,6 +482,15 @@
-       if (process.platform === 'darwin') {
-         expect(item.submenu.items[2].type).to.equal('separator')
-         expect(item.submenu.items[3].role).to.equal('front')
-+=======
-+      assert.equal(item.label, 'Window')
-+      assert.equal(item.submenu.items[0].role, 'minimize')
-+      assert.equal(item.submenu.items[1].role, 'close')
-+
-+      if (process.platform === 'darwin') {
-+        assert.equal(item.submenu.items[2].type, 'separator')
-+        assert.equal(item.submenu.items[3].role, 'front')
-+>>>>>>> .their
-       }
-     })
- 
-@@ -363,8 +500,13 @@
-         submenu: [{role: 'copy'}]
-       })
- 
-+<<<<<<< .our
-       expect(item.label).to.equal('Window')
-       expect(item.submenu.items[0].role).to.equal('copy')
-+=======
-+      assert.equal(item.label, 'Window')
-+      assert.equal(item.submenu.items[0].role, 'copy')
-+>>>>>>> .their
-     })
-   })
- 
-@@ -383,10 +525,17 @@
-         overrideProperty: 'oops not allowed'
-       }))
- 
-+<<<<<<< .our
-       expect(menu.items[0].customProp).to.equal('foo')
-       expect(menu.items[0].submenu.items[0].label).to.equal('item 1')
-       expect(menu.items[0].submenu.items[0].customProp).to.equal('bar')
-       expect(menu.items[0].submenu.items[0].overrideProperty).to.be.a('function')
-+=======
-+      assert.equal(menu.items[0].customProp, 'foo')
-+      assert.equal(menu.items[0].submenu.items[0].label, 'item 1')
-+      assert.equal(menu.items[0].submenu.items[0].customProp, 'bar')
-+      assert.equal(typeof menu.items[0].submenu.items[0].overrideProperty, 'function')
-+>>>>>>> .their
-     })
-   })
- })
-added in both
-  our    100644 ed2749700c6c8bf299f507d52606c1ae3f597e5c spec/api-menu-spec.js
-  their  100644 4a25e3ce4d7c05892374a0e93928e3a33b643174 spec/api-menu-spec.js
-@@ -1,14 +1,21 @@
-+<<<<<<< .our
- const chai = require('chai')
- const dirtyChai = require('dirty-chai')
-+=======
-+const assert = require('assert')
-+>>>>>>> .their
- 
- const {ipcRenderer, remote} = require('electron')
- const {BrowserWindow, Menu, MenuItem} = remote
- const {sortMenuItems} = require('../lib/browser/api/menu-utils')
- const {closeWindow} = require('./window-helpers')
- 
-+<<<<<<< .our
- const {expect} = chai
- chai.use(dirtyChai)
- 
-+=======
-+>>>>>>> .their
- describe('Menu module', () => {
-   describe('Menu.buildFromTemplate', () => {
-     it('should be able to attach extra fields', () => {
-@@ -18,17 +25,29 @@
-           extra: 'field'
-         }
-       ])
-+<<<<<<< .our
-       expect(menu.items[0].extra).to.equal('field')
-+=======
-+      assert.equal(menu.items[0].extra, 'field')
-+>>>>>>> .their
-     })
- 
-     it('does not modify the specified template', () => {
-       const template = [{label: 'text', submenu: [{label: 'sub'}]}]
-       const result = ipcRenderer.sendSync('eval', `const template = [{label: 'text', submenu: [{label: 'sub'}]}]\nrequire('electron').Menu.buildFromTemplate(template)\ntemplate`)
-+<<<<<<< .our
-       expect(result).to.deep.equal(template)
-     })
- 
-     it('does not throw exceptions for undefined/null values', () => {
-       expect(() => {
-+=======
-+      assert.deepStrictEqual(result, template)
-+    })
-+
-+    it('does not throw exceptions for undefined/null values', () => {
-+      assert.doesNotThrow(() => {
-+>>>>>>> .their
-         Menu.buildFromTemplate([
-           {
-             label: 'text',
-@@ -39,6 +58,7 @@
-             accelerator: null
-           }
-         ])
-+<<<<<<< .our
-       }).to.not.throw()
-     })
- 
-@@ -57,6 +77,9 @@
-       expect(() => {
-         Menu.buildFromTemplate([undefined])
-       }).to.throw(/Invalid template for MenuItem: must have at least one of label, role or type/)
-+=======
-+      })
-+>>>>>>> .their
-     })
- 
-     describe('Menu sorting and building', () => {
-@@ -87,7 +110,11 @@
-             }
-           ]
- 
-+<<<<<<< .our
-           expect(sortMenuItems(items)).to.deep.equal(expected)
-+=======
-+          assert.deepEqual(sortMenuItems(items), expected)
-+>>>>>>> .their
-         })
- 
-         it('resolves cycles by ignoring things that conflict', () => {
-@@ -119,7 +146,11 @@
-             }
-           ]
- 
-+<<<<<<< .our
-           expect(sortMenuItems(items)).to.deep.equal(expected)
-+=======
-+          assert.deepEqual(sortMenuItems(items), expected)
-+>>>>>>> .their
-         })
- 
-         it('ignores references to commands that do not exist', () => {
-@@ -149,7 +180,11 @@
-             }
-           ]
- 
-+<<<<<<< .our
-           expect(sortMenuItems(items)).to.deep.equal(expected)
-+=======
-+          assert.deepEqual(sortMenuItems(items), expected)
-+>>>>>>> .their
-         })
- 
-         it('only respects the first matching [before|after]GroupContaining rule in a given group', () => {
-@@ -199,7 +234,11 @@
-             }
-           ]
- 
-+<<<<<<< .our
-           expect(sortMenuItems(items)).to.deep.equal(expected)
-+=======
-+          assert.deepEqual(sortMenuItems(items), expected)
-+>>>>>>> .their
-         })
-       })
- 
-@@ -241,7 +280,11 @@
-             }
-           ]
- 
-+<<<<<<< .our
-           expect(sortMenuItems(items)).to.deep.equal(expected)
-+=======
-+          assert.deepEqual(sortMenuItems(items), expected)
-+>>>>>>> .their
-         })
- 
-         it("moves all items in the moving item's group", () => {
-@@ -289,7 +332,11 @@
-             }
-           ]
- 
-+<<<<<<< .our
-           expect(sortMenuItems(items)).to.deep.equal(expected)
-+=======
-+          assert.deepEqual(sortMenuItems(items), expected)
-+>>>>>>> .their
-         })
- 
-         it("ignores positions relative to commands that don't exist", () => {
-@@ -339,7 +386,11 @@
-             }
-           ]
- 
-+<<<<<<< .our
-           expect(sortMenuItems(items)).to.deep.equal(expected)
-+=======
-+          assert.deepEqual(sortMenuItems(items), expected)
-+>>>>>>> .their
-         })
- 
-         it('can handle recursive group merging', () => {
-@@ -377,7 +428,11 @@
-             }
-           ]
- 
-+<<<<<<< .our
-           expect(sortMenuItems(items)).to.deep.equal(expected)
-+=======
-+          assert.deepEqual(sortMenuItems(items), expected)
-+>>>>>>> .their
-         })
- 
-         it('can merge multiple groups when given a list of before/after commands', () => {
-@@ -415,7 +470,11 @@
-             }
-           ]
- 
-+<<<<<<< .our
-           expect(sortMenuItems(items)).to.deep.equal(expected)
-+=======
-+          assert.deepEqual(sortMenuItems(items), expected)
-+>>>>>>> .their
-         })
- 
-         it('can merge multiple groups based on both before/after commands', () => {
-@@ -455,7 +514,11 @@
-             }
-           ]
- 
-+<<<<<<< .our
-           expect(sortMenuItems(items)).to.deep.equal(expected)
-+=======
-+          assert.deepEqual(sortMenuItems(items), expected)
-+>>>>>>> .their
-         })
-       })
- 
-@@ -474,9 +537,15 @@
-           }
-         ])
- 
-+<<<<<<< .our
-         expect(menu.items[0].label).to.equal('one')
-         expect(menu.items[1].label).to.equal('two')
-         expect(menu.items[2].label).to.equal('three')
-+=======
-+        assert.equal(menu.items[0].label, 'one')
-+        assert.equal(menu.items[1].label, 'two')
-+        assert.equal(menu.items[2].label, 'three')
-+>>>>>>> .their
-       })
- 
-       it('should position after existing item', () => {
-@@ -495,9 +564,15 @@
-           }
-         ])
- 
-+<<<<<<< .our
-         expect(menu.items[0].label).to.equal('one')
-         expect(menu.items[1].label).to.equal('two')
-         expect(menu.items[2].label).to.equal('three')
-+=======
-+        assert.equal(menu.items[0].label, 'one')
-+        assert.equal(menu.items[1].label, 'two')
-+        assert.equal(menu.items[2].label, 'three')
-+>>>>>>> .their
-       })
- 
-       it('should filter excess menu separators', () => {
-@@ -515,10 +590,17 @@
-           }
-         ])
- 
-+<<<<<<< .our
-         expect(menuOne.items).to.have.length(3)
-         expect(menuOne.items[0].label).to.equal('a')
-         expect(menuOne.items[1].label).to.equal('b')
-         expect(menuOne.items[2].label).to.equal('c')
-+=======
-+        assert.equal(menuOne.items.length, 3)
-+        assert.equal(menuOne.items[0].label, 'a')
-+        assert.equal(menuOne.items[1].label, 'b')
-+        assert.equal(menuOne.items[2].label, 'c')
-+>>>>>>> .their
- 
-         const menuTwo = Menu.buildFromTemplate([
-           {
-@@ -538,10 +620,17 @@
-           }
-         ])
- 
-+<<<<<<< .our
-         expect(menuTwo.items).to.have.length(3)
-         expect(menuTwo.items[0].label).to.equal('a')
-         expect(menuTwo.items[1].label).to.equal('b')
-         expect(menuTwo.items[2].label).to.equal('c')
-+=======
-+        assert.equal(menuTwo.items.length, 3)
-+        assert.equal(menuTwo.items[0].label, 'a')
-+        assert.equal(menuTwo.items[1].label, 'b')
-+        assert.equal(menuTwo.items[2].label, 'c')
-+>>>>>>> .their
-       })
- 
-       it('should continue inserting items at next index when no specifier is present', () => {
-@@ -565,11 +654,19 @@
-           }
-         ])
- 
-+<<<<<<< .our
-         expect(menu.items[0].label).to.equal('one')
-         expect(menu.items[1].label).to.equal('two')
-         expect(menu.items[2].label).to.equal('three')
-         expect(menu.items[3].label).to.equal('four')
-         expect(menu.items[4].label).to.equal('five')
-+=======
-+        assert.equal(menu.items[0].label, 'one')
-+        assert.equal(menu.items[1].label, 'two')
-+        assert.equal(menu.items[2].label, 'three')
-+        assert.equal(menu.items[3].label, 'four')
-+        assert.equal(menu.items[4].label, 'five')
-+>>>>>>> .their
-       })
-     })
-   })
-@@ -589,7 +686,11 @@
-         }
-       ])
-       const fsc = menu.getMenuItemById('fullScreen')
-+<<<<<<< .our
-       expect(menu.items[0].submenu.items[0]).to.equal(fsc)
-+=======
-+      assert.equal(menu.items[0].submenu.items[0], fsc)
-+>>>>>>> .their
-     })
-   })
- 
-@@ -604,10 +705,17 @@
-       const item = new MenuItem({ label: 'inserted' })
- 
-       menu.insert(1, item)
-+<<<<<<< .our
-       expect(menu.items[0].label).to.equal('1')
-       expect(menu.items[1].label).to.equal('inserted')
-       expect(menu.items[2].label).to.equal('2')
-       expect(menu.items[3].label).to.equal('3')
-+=======
-+      assert.equal(menu.items[0].label, '1')
-+      assert.equal(menu.items[1].label, 'inserted')
-+      assert.equal(menu.items[2].label, '2')
-+      assert.equal(menu.items[3].label, '3')
-+>>>>>>> .their
-     })
-   })
- 
-@@ -622,10 +730,17 @@
-       const item = new MenuItem({ label: 'inserted' })
-       menu.append(item)
- 
-+<<<<<<< .our
-       expect(menu.items[0].label).to.equal('1')
-       expect(menu.items[1].label).to.equal('2')
-       expect(menu.items[2].label).to.equal('3')
-       expect(menu.items[3].label).to.equal('inserted')
-+=======
-+      assert.equal(menu.items[0].label, '1')
-+      assert.equal(menu.items[1].label, '2')
-+      assert.equal(menu.items[2].label, '3')
-+      assert.equal(menu.items[3].label, 'inserted')
-+>>>>>>> .their
-     })
-   })
- 
-@@ -649,6 +764,7 @@
-     })
- 
-     it('throws an error if options is not an object', () => {
-+<<<<<<< .our
-       expect(() => {
-         menu.popup('this is a string, not an object')
-       }).to.throw(/Options must be an object/)
-@@ -658,6 +774,11 @@
-       expect(() => {
-         menu.popup({})
-       }).to.not.throw()
-+=======
-+      assert.throws(() => {
-+        menu.popup()
-+      }, /Options must be an object/)
-+>>>>>>> .their
-     })
- 
-     it('should emit menu-will-show event', (done) => {
-@@ -674,17 +795,29 @@
-     it('returns immediately', () => {
-       const input = {window: w, x: 100, y: 101}
-       const output = menu.popup(input)
-+<<<<<<< .our
-       expect(output.x).to.equal(input.x)
-       expect(output.y).to.equal(input.y)
-       expect(output.browserWindow).to.equal(input.window)
-+=======
-+      assert.equal(output.x, input.x)
-+      assert.equal(output.y, input.y)
-+      assert.equal(output.browserWindow, input.window)
-+>>>>>>> .their
-     })
- 
-     it('works without a given BrowserWindow and options', () => {
-       const {browserWindow, x, y} = menu.popup({x: 100, y: 101})
- 
-+<<<<<<< .our
-       expect(browserWindow.constructor.name).to.equal('BrowserWindow')
-       expect(x).to.equal(100)
-       expect(y).to.equal(101)
-+=======
-+      assert.equal(browserWindow.constructor.name, 'BrowserWindow')
-+      assert.equal(x, 100)
-+      assert.equal(y, 101)
-+>>>>>>> .their
-     })
- 
-     it('works with a given BrowserWindow, options and callback', (done) => {
-@@ -695,8 +828,13 @@
-         callback: () => done()
-       })
- 
-+<<<<<<< .our
-       expect(x).to.equal(100)
-       expect(y).to.equal(101)
-+=======
-+      assert.equal(x, 100)
-+      assert.equal(y, 101)
-+>>>>>>> .their
-       menu.closePopup()
-     })
- 
-@@ -714,12 +852,20 @@
-       ])
- 
-       Menu.setApplicationMenu(menu)
-+<<<<<<< .our
-       expect(Menu.getApplicationMenu()).to.not.be.null()
-+=======
-+      assert.notEqual(Menu.getApplicationMenu(), null)
-+>>>>>>> .their
-     })
- 
-     it('unsets a menu with null', () => {
-       Menu.setApplicationMenu(null)
-+<<<<<<< .our
-       expect(Menu.getApplicationMenu()).to.be.null()
-+=======
-+      assert.equal(Menu.getApplicationMenu(), null)
-+>>>>>>> .their
-     })
-   })
- })
-added in both
-  our    100644 0546971b716e0d29d1e76d689be0a182c3f4b52d spec/api-native-image-spec.js
-  their  100644 87399921ff14ac2c594bb88a0c4493d4e9575e49 spec/api-native-image-spec.js
-@@ -1,5 +1,6 @@
- 'use strict'
- 
-+<<<<<<< .our
- const chai = require('chai')
- const dirtyChai = require('dirty-chai')
- const {nativeImage} = require('electron')
-@@ -8,6 +9,14 @@
- const {expect} = chai
- chai.use(dirtyChai)
- 
-+=======
-+/* eslint-disable no-unused-expressions */
-+
-+const {expect} = require('chai')
-+const {nativeImage} = require('electron')
-+const path = require('path')
-+
-+>>>>>>> .their
- describe('nativeImage module', () => {
-   const ImageFormat = {
-     PNG: 'png',
-@@ -113,6 +122,7 @@
-       expect(empty.toDataURL()).to.equal('data:image/png;base64,')
-       expect(empty.toDataURL({scaleFactor: 2.0})).to.equal('data:image/png;base64,')
-       expect(empty.getSize()).to.deep.equal({width: 0, height: 0})
-+<<<<<<< .our
-       expect(empty.getBitmap()).to.be.empty()
-       expect(empty.getBitmap({scaleFactor: 2.0})).to.be.empty()
-       expect(empty.toBitmap()).to.be.empty()
-@@ -123,6 +133,18 @@
- 
-       if (process.platform === 'darwin') {
-         expect(empty.getNativeHandle()).to.be.empty()
-+=======
-+      expect(empty.getBitmap()).to.be.empty
-+      expect(empty.getBitmap({scaleFactor: 2.0})).to.be.empty
-+      expect(empty.toBitmap()).to.be.empty
-+      expect(empty.toBitmap({scaleFactor: 2.0})).to.be.empty
-+      expect(empty.toJPEG(100)).to.be.empty
-+      expect(empty.toPNG()).to.be.empty
-+      expect(empty.toPNG({scaleFactor: 2.0})).to.be.empty
-+
-+      if (process.platform === 'darwin') {
-+        expect(empty.getNativeHandle()).to.be.empty
-+>>>>>>> .their
-       }
-     })
-   })
-@@ -137,7 +159,11 @@
- 
-       const imageB = nativeImage.createFromBuffer(imageA.toPNG())
-       expect(imageB.getSize()).to.deep.equal({width: 538, height: 190})
-+<<<<<<< .our
-       expect(imageA.toBitmap().equals(imageB.toBitmap())).to.be.true()
-+=======
-+      expect(imageA.toBitmap().equals(imageB.toBitmap())).to.be.true
-+>>>>>>> .their
- 
-       const imageC = nativeImage.createFromBuffer(imageA.toJPEG(100))
-       expect(imageC.getSize()).to.deep.equal({width: 538, height: 190})
-@@ -216,7 +242,11 @@
-       expect(imageTwo.getSize()).to.deep.equal(
-           {width: imageData.width, height: imageData.height})
- 
-+<<<<<<< .our
-       expect(imageOne.toBitmap().equals(imageTwo.toBitmap())).to.be.true()
-+=======
-+      expect(imageOne.toBitmap().equals(imageTwo.toBitmap())).to.be.true
-+>>>>>>> .their
-     })
- 
-     it('supports a scale factor', () => {
-@@ -251,7 +281,11 @@
-       expect(imageC.getSize()).to.deep.equal(
-           {width: imageData.width, height: imageData.height})
- 
-+<<<<<<< .our
-       expect(imageB.toBitmap().equals(imageC.toBitmap())).to.be.true()
-+=======
-+      expect(imageB.toBitmap().equals(imageC.toBitmap())).to.be.true
-+>>>>>>> .their
-     })
- 
-     it('supports a scale factor', () => {
-@@ -280,23 +314,37 @@
-     })
- 
-     it('loads images from paths relative to the current working directory', () => {
-+<<<<<<< .our
-       const imagePath = path.relative('.', path.join(__dirname, 'fixtures', 'assets', 'logo.png'))
-       const image = nativeImage.createFromPath(imagePath)
-       expect(image.isEmpty()).to.be.false()
-+=======
-+      const imagePath = `.${path.sep}${path.join('spec', 'fixtures', 'assets', 'logo.png')}`
-+      const image = nativeImage.createFromPath(imagePath)
-+      expect(image.isEmpty()).to.be.false
-+>>>>>>> .their
-       expect(image.getSize()).to.deep.equal({width: 538, height: 190})
-     })
- 
-     it('loads images from paths with `.` segments', () => {
-       const imagePath = `${path.join(__dirname, 'fixtures')}${path.sep}.${path.sep}${path.join('assets', 'logo.png')}`
-       const image = nativeImage.createFromPath(imagePath)
-+<<<<<<< .our
-       expect(image.isEmpty()).to.be.false()
-+=======
-+      expect(image.isEmpty()).to.be.false
-+>>>>>>> .their
-       expect(image.getSize()).to.deep.equal({width: 538, height: 190})
-     })
- 
-     it('loads images from paths with `..` segments', () => {
-       const imagePath = `${path.join(__dirname, 'fixtures', 'api')}${path.sep}..${path.sep}${path.join('assets', 'logo.png')}`
-       const image = nativeImage.createFromPath(imagePath)
-+<<<<<<< .our
-       expect(image.isEmpty()).to.be.false()
-+=======
-+      expect(image.isEmpty()).to.be.false
-+>>>>>>> .their
-       expect(image.getSize()).to.deep.equal({width: 538, height: 190})
-     })
- 
-@@ -327,7 +375,11 @@
- 
-       const imagePath = path.join(__dirname, 'fixtures', 'assets', 'icon.ico')
-       const image = nativeImage.createFromPath(imagePath)
-+<<<<<<< .our
-       expect(image.isEmpty()).to.be.false()
-+=======
-+      expect(image.isEmpty()).to.be.false
-+>>>>>>> .their
-       expect(image.getSize()).to.deep.equal({width: 256, height: 256})
-     })
-   })
-@@ -357,7 +409,11 @@
-       }
- 
-       const image = nativeImage.createFromNamedImage('NSActionTemplate')
-+<<<<<<< .our
-       expect(image.isEmpty()).to.be.false()
-+=======
-+      expect(image.isEmpty()).to.be.false
-+>>>>>>> .their
-     })
- 
-     it('returns allows an HSL shift for a valid image on darwin', function () {
-@@ -368,7 +424,11 @@
-       }
- 
-       const image = nativeImage.createFromNamedImage('NSActionTemplate', [0.5, 0.2, 0.8])
-+<<<<<<< .our
-       expect(image.isEmpty()).to.be.false()
-+=======
-+      expect(image.isEmpty()).to.be.false
-+>>>>>>> .their
-     })
-   })
- 
-@@ -427,7 +487,11 @@
-       const cropB = image.crop({width: 25, height: 64, x: 30, y: 40})
-       expect(cropA.getSize()).to.deep.equal({width: 25, height: 64})
-       expect(cropB.getSize()).to.deep.equal({width: 25, height: 64})
-+<<<<<<< .our
-       expect(cropA.toPNG().equals(cropB.toPNG())).to.be.false()
-+=======
-+      expect(cropA.toPNG().equals(cropB.toPNG())).to.be.false
-+>>>>>>> .their
-     })
-   })
- 
-@@ -473,7 +537,11 @@
-         buffer: 'invalid'
-       })
- 
-+<<<<<<< .our
-       expect(image.isEmpty()).to.be.false()
-+=======
-+      expect(image.isEmpty()).to.be.false
-+>>>>>>> .their
-       expect(image.getSize()).to.deep.equal({width: 1, height: 1})
- 
-       expect(image.toDataURL({scaleFactor: 1.0})).to.equal(imageDataOne.dataUrl)
-@@ -508,7 +576,11 @@
-         dataURL: 'invalid'
-       })
- 
-+<<<<<<< .our
-       expect(image.isEmpty()).to.be.false()
-+=======
-+      expect(image.isEmpty()).to.be.false
-+>>>>>>> .their
-       expect(image.getSize()).to.deep.equal({width: 1, height: 1})
- 
-       expect(image.toDataURL({scaleFactor: 1.0})).to.equal(imageDataOne.dataUrl)
-added in both
-  our    100644 fa282244df66e955c97554c240f8e7bb7ca4cbf3 spec/api-net-log-spec.js
-  their  100644 1e9ca66722dc2f5fccc450729ef405d8d2bd8246 spec/api-net-log-spec.js
-@@ -1,5 +1,9 @@
-+<<<<<<< .our
- const chai = require('chai')
- const dirtyChai = require('dirty-chai')
-+=======
-+const assert = require('assert')
-+>>>>>>> .their
- const http = require('http')
- const fs = require('fs')
- const os = require('os')
-@@ -11,15 +15,22 @@
- const dumpFile = path.join(os.tmpdir(), 'net_log.json')
- const dumpFileDynamic = path.join(os.tmpdir(), 'net_log_dynamic.json')
- 
-+<<<<<<< .our
- const {expect} = chai
- chai.use(dirtyChai)
-+=======
-+>>>>>>> .their
- const isCI = remote.getGlobal('isCi')
- 
- describe('netLog module', () => {
-   let server
-   const connections = new Set()
- 
-+<<<<<<< .our
-   before(done => {
-+=======
-+  before((done) => {
-+>>>>>>> .their
-     server = http.createServer()
-     server.listen(0, '127.0.0.1', () => {
-       server.url = `http://127.0.0.1:${server.address().port}`
-@@ -36,7 +47,11 @@
-     })
-   })
- 
-+<<<<<<< .our
-   after(done => {
-+=======
-+  after((done) => {
-+>>>>>>> .their
-     for (const connection of connections) {
-       connection.destroy()
-     }
-@@ -55,6 +70,7 @@
-     }
-   })
- 
-+<<<<<<< .our
-   it('should begin and end logging to file when .startLogging() and .stopLogging() is called', done => {
-     expect(netLog.currentlyLogging).to.be.false()
-     expect(netLog.currentlyLoggingPath).to.equal('')
-@@ -70,11 +86,30 @@
- 
-       expect(path).to.equal(dumpFileDynamic)
-       expect(fs.existsSync(dumpFileDynamic)).to.be.true()
-+=======
-+  it('should begin and end logging to file when .startLogging() and .stopLogging() is called', (done) => {
-+    assert(!netLog.currentlyLogging)
-+    assert.equal(netLog.currentlyLoggingPath, '')
-+
-+    netLog.startLogging(dumpFileDynamic)
-+
-+    assert(netLog.currentlyLogging)
-+    assert.equal(netLog.currentlyLoggingPath, dumpFileDynamic)
-+
-+    netLog.stopLogging((path) => {
-+      assert(!netLog.currentlyLogging)
-+      assert.equal(netLog.currentlyLoggingPath, '')
-+
-+      assert.equal(path, dumpFileDynamic)
-+
-+      assert(fs.existsSync(dumpFileDynamic))
-+>>>>>>> .their
- 
-       done()
-     })
-   })
- 
-+<<<<<<< .our
-   it('should silence when .stopLogging() is called without calling .startLogging()', done => {
-     expect(netLog.currentlyLogging).to.be.false()
-     expect(netLog.currentlyLoggingPath).to.equal('')
-@@ -84,6 +119,17 @@
-       expect(netLog.currentlyLoggingPath).to.equal('')
- 
-       expect(path).to.equal('')
-+=======
-+  it('should silence when .stopLogging() is called without calling .startLogging()', (done) => {
-+    assert(!netLog.currentlyLogging)
-+    assert.equal(netLog.currentlyLoggingPath, '')
-+
-+    netLog.stopLogging((path) => {
-+      assert(!netLog.currentlyLogging)
-+      assert.equal(netLog.currentlyLoggingPath, '')
-+
-+      assert.equal(path, '')
-+>>>>>>> .their
- 
-       done()
-     })
-@@ -91,7 +137,11 @@
- 
-   // The following tests are skipped on Linux CI
- 
-+<<<<<<< .our
-   it('should begin and end logging automatically when --log-net-log is passed', done => {
-+=======
-+  it('should begin and end logging automatically when --log-net-log is passed', (done) => {
-+>>>>>>> .their
-     if (isCI && process.platform === 'linux') {
-       done()
-       return
-@@ -105,12 +155,20 @@
-       })
- 
-     appProcess.once('exit', () => {
-+<<<<<<< .our
-       expect(fs.existsSync(dumpFile)).to.be.true()
-+=======
-+      assert(fs.existsSync(dumpFile))
-+>>>>>>> .their
-       done()
-     })
-   })
- 
-+<<<<<<< .our
-   it('should begin and end logging automtically when --log-net-log is passed, and behave correctly when .startLogging() and .stopLogging() is called', done => {
-+=======
-+  it('should begin and end logging automtically when --log-net-log is passed, and behave correctly when .startLogging() and .stopLogging() is called', (done) => {
-+>>>>>>> .their
-     if (isCI && process.platform === 'linux') {
-       done()
-       return
-@@ -125,18 +183,31 @@
-         }
-       })
- 
-+<<<<<<< .our
-     appProcess.stdout.on('data', data => {
-+=======
-+    appProcess.stdout.on('data', (data) => {
-+>>>>>>> .their
-       console.log(data.toString())
-     })
- 
-     appProcess.once('exit', () => {
-+<<<<<<< .our
-       expect(fs.existsSync(dumpFile)).to.be.true()
-       expect(fs.existsSync(dumpFileDynamic)).to.be.true()
-+=======
-+      assert(fs.existsSync(dumpFile))
-+      assert(fs.existsSync(dumpFileDynamic))
-+>>>>>>> .their
-       done()
-     })
-   })
- 
-+<<<<<<< .our
-   it('should end logging automatically when only .startLogging() is called', done => {
-+=======
-+  it('should end logging automatically when only .startLogging() is called', (done) => {
-+>>>>>>> .their
-     if (isCI && process.platform === 'linux') {
-       done()
-       return
-@@ -151,7 +222,11 @@
-       })
- 
-     appProcess.once('exit', () => {
-+<<<<<<< .our
-       expect(fs.existsSync(dumpFileDynamic)).to.be.true()
-+=======
-+      assert(fs.existsSync(dumpFileDynamic))
-+>>>>>>> .their
-       done()
-     })
-   })
-added in both
-  our    100644 9ab56d88e50ae5891364cb271362e5ec0c0edd26 spec/api-notification-dbus-spec.js
-  their  100644 81c1b68f31d0c9490742d3bd4b4227abaaf72ca3 spec/api-notification-dbus-spec.js
-@@ -6,7 +6,11 @@
- //
- // See https://pypi.python.org/pypi/python-dbusmock to read about dbusmock.
- 
-+<<<<<<< .our
- const {expect} = require('chai')
-+=======
-+const assert = require('assert')
-+>>>>>>> .their
- const dbus = require('dbus-native')
- const Promise = require('bluebird')
- 
-@@ -27,12 +31,20 @@
-   before(async () => {
-     // init app
-     app.setName(appName)
-+<<<<<<< .our
-     app.setDesktopName(`${appName}.desktop`)
-+=======
-+    app.setDesktopName(appName + '.desktop')
-+>>>>>>> .their
-     // init dbus
-     const path = '/org/freedesktop/Notifications'
-     const iface = 'org.freedesktop.DBus.Mock'
-     const bus = dbus.sessionBus()
-+<<<<<<< .our
-     console.log(`session bus: ${process.env.DBUS_SESSION_BUS_ADDRESS}`)
-+=======
-+    console.log('session bus: ' + process.env.DBUS_SESSION_BUS_ADDRESS)
-+>>>>>>> .their
-     const service = bus.getService(serviceName)
-     const getInterface = Promise.promisify(service.getInterface, {context: service})
-     mock = await getInterface(path, iface)
-@@ -48,10 +60,17 @@
-     app.setVersion(realAppVersion)
-   })
- 
-+<<<<<<< .our
-   describe(`Notification module using ${serviceName}`, () => {
-     function onMethodCalled (done) {
-       function cb (name) {
-         console.log(`onMethodCalled: ${name}`)
-+=======
-+  describe('Notification module using ' + serviceName, () => {
-+    function onMethodCalled (done) {
-+      function cb (name) {
-+        console.log('onMethodCalled: ' + name)
-+>>>>>>> .their
-         if (name === 'Notify') {
-           mock.removeListener('MethodCalled', cb)
-           console.log('done')
-@@ -83,7 +102,11 @@
-       }
-     }
- 
-+<<<<<<< .our
-     before(done => {
-+=======
-+    before((done) => {
-+>>>>>>> .their
-       mock.on('MethodCalled', onMethodCalled(done))
-       // lazy load Notification after we listen to MethodCalled mock signal
-       Notification = require('electron').remote.Notification
-@@ -98,6 +121,7 @@
-       n.show()
-     })
- 
-+<<<<<<< .our
-     it(`should call ${serviceName} to show notifications`, async () => {
-       const calls = await getCalls()
-       expect(calls).to.be.an('array').of.lengthOf.at.least(1)
-@@ -108,6 +132,16 @@
- 
-       let args = unmarshalDBusNotifyArgs(lastCall[2])
-       expect(args).to.deep.equal({
-+=======
-+    it('should call ' + serviceName + ' to show notifications', async () => {
-+      const calls = await getCalls()
-+      assert(calls.length >= 1)
-+      let lastCall = calls[calls.length - 1]
-+      let methodName = lastCall[1]
-+      assert.equal(methodName, 'Notify')
-+      let args = unmarshalDBusNotifyArgs(lastCall[2])
-+      assert.deepEqual(args, {
-+>>>>>>> .their
-         app_name: appName,
-         replaces_id: 0,
-         app_icon: '',
-added in both
-  our    100644 ad8f1faea14208d2659c505105c1e70938bba2b9 spec/api-process-spec.js
-  their  100644 1de5e1a19dc7175eac1338b89d0f882a37bd91c0 spec/api-process-spec.js
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- const {expect} = require('chai')
- 
- describe('process module', () => {
-@@ -13,6 +14,16 @@
-       const cpuUsage = process.getCPUUsage()
-       expect(cpuUsage.percentCPUUsage).to.be.a('number')
-       expect(cpuUsage.idleWakeupsPerSecond).to.be.a('number')
-+=======
-+const assert = require('assert')
-+
-+describe('process module', () => {
-+  describe('process.getCPUUsage()', () => {
-+    it('returns a cpu usage object', () => {
-+      const cpuUsage = process.getCPUUsage()
-+      assert.equal(typeof cpuUsage.percentCPUUsage, 'number')
-+      assert.equal(typeof cpuUsage.idleWakeupsPerSecond, 'number')
-+>>>>>>> .their
-     })
-   })
- 
-@@ -25,6 +36,7 @@
- 
-     it('returns an io counters object', () => {
-       const ioCounters = process.getIOCounters()
-+<<<<<<< .our
-       expect(ioCounters.readOperationCount).to.be.a('number')
-       expect(ioCounters.writeOperationCount).to.be.a('number')
-       expect(ioCounters.otherOperationCount).to.be.a('number')
-@@ -49,12 +61,21 @@
-       const systemMemoryInfo = process.getSystemMemoryInfo()
-       expect(systemMemoryInfo.free).to.be.a('number')
-       expect(systemMemoryInfo.total).to.be.a('number')
-+=======
-+      assert.equal(typeof ioCounters.readOperationCount, 'number')
-+      assert.equal(typeof ioCounters.writeOperationCount, 'number')
-+      assert.equal(typeof ioCounters.otherOperationCount, 'number')
-+      assert.equal(typeof ioCounters.readTransferCount, 'number')
-+      assert.equal(typeof ioCounters.writeTransferCount, 'number')
-+      assert.equal(typeof ioCounters.otherTransferCount, 'number')
-+>>>>>>> .their
-     })
-   })
- 
-   describe('process.getHeapStatistics()', () => {
-     it('returns heap statistics object', () => {
-       const heapStats = process.getHeapStatistics()
-+<<<<<<< .our
-       expect(heapStats.totalHeapSize).to.be.a('number')
-       expect(heapStats.totalHeapSizeExecutable).to.be.a('number')
-       expect(heapStats.totalPhysicalSize).to.be.a('number')
-@@ -64,6 +85,17 @@
-       expect(heapStats.mallocedMemory).to.be.a('number')
-       expect(heapStats.peakMallocedMemory).to.be.a('number')
-       expect(heapStats.doesZapGarbage).to.be.a('boolean')
-+=======
-+      assert.equal(typeof heapStats.totalHeapSize, 'number')
-+      assert.equal(typeof heapStats.totalHeapSizeExecutable, 'number')
-+      assert.equal(typeof heapStats.totalPhysicalSize, 'number')
-+      assert.equal(typeof heapStats.totalAvailableSize, 'number')
-+      assert.equal(typeof heapStats.usedHeapSize, 'number')
-+      assert.equal(typeof heapStats.heapSizeLimit, 'number')
-+      assert.equal(typeof heapStats.mallocedMemory, 'number')
-+      assert.equal(typeof heapStats.peakMallocedMemory, 'number')
-+      assert.equal(typeof heapStats.doesZapGarbage, 'boolean')
-+>>>>>>> .their
-     })
-   })
- })
-added in both
-  our    100644 b9093d1d6335ece5ca713a668a67bf3b40f4fabe spec/api-session-spec.js
-  their  100644 7ac14e1f1f88549aa6594e96906cc77906c0accd spec/api-session-spec.js
-@@ -289,17 +289,24 @@
-       res.end(mockPDF)
-       downloadServer.close()
-     })
-+<<<<<<< .our
- 
-     const isPathEqual = (path1, path2) => {
-       return path.relative(path1, path2) === ''
-     }
-+=======
-+>>>>>>> .their
-     const assertDownload = (event, state, url, mimeType,
-                                    receivedBytes, totalBytes, disposition,
-                                    filename, port, savePath, isCustom) => {
-       assert.equal(state, 'completed')
-       assert.equal(filename, 'mock.pdf')
-+<<<<<<< .our
-       assert.ok(path.isAbsolute(savePath))
-       assert.ok(isPathEqual(savePath, path.join(__dirname, 'fixtures', 'mock.pdf')))
-+=======
-+      assert.equal(savePath, path.join(__dirname, 'fixtures', 'mock.pdf'))
-+>>>>>>> .their
-       if (isCustom) {
-         assert.equal(url, `${protocolName}://item`)
-       } else {
-added in both
-  our    100644 be02cb3f84001a541d64b11fe6eda50fc32e8afd spec/api-web-contents-spec.js
-  their  100644 b1b1d206a2934dbc0e6d3b57cffdc9b9345d7b7a spec/api-web-contents-spec.js
-@@ -4,6 +4,7 @@
- const http = require('http')
- const path = require('path')
- const {closeWindow} = require('./window-helpers')
-+<<<<<<< .our
- const {emittedOnce} = require('./events-helpers')
- const chai = require('chai')
- const dirtyChai = require('dirty-chai')
-@@ -16,6 +17,14 @@
- 
- chai.use(dirtyChai)
- 
-+=======
-+
-+const {ipcRenderer, remote} = require('electron')
-+const {BrowserWindow, webContents, ipcMain, session} = remote
-+
-+const isCi = remote.getGlobal('isCi')
-+
-+>>>>>>> .their
- /* The whole webContents API doesn't use standard callbacks */
- /* eslint-disable standard/no-callback-literal */
- 
-@@ -40,7 +49,11 @@
-     it('returns an array of web contents', (done) => {
-       w.webContents.on('devtools-opened', () => {
-         const all = webContents.getAllWebContents().sort((a, b) => {
-+<<<<<<< .our
-           return a.id - b.id
-+=======
-+          return a.getId() - b.getId()
-+>>>>>>> .their
-         })
- 
-         assert.ok(all.length >= 4)
-@@ -61,15 +74,26 @@
-       if (isCi) return done()
- 
-       const specWebContents = remote.getCurrentWebContents()
-+<<<<<<< .our
-       assert.equal(specWebContents.id, webContents.getFocusedWebContents().id)
- 
-       specWebContents.once('devtools-opened', () => {
-         assert.equal(specWebContents.devToolsWebContents.id, webContents.getFocusedWebContents().id)
-+=======
-+      assert.equal(specWebContents.getId(), webContents.getFocusedWebContents().getId())
-+
-+      specWebContents.once('devtools-opened', () => {
-+        assert.equal(specWebContents.devToolsWebContents.getId(), webContents.getFocusedWebContents().getId())
-+>>>>>>> .their
-         specWebContents.closeDevTools()
-       })
- 
-       specWebContents.once('devtools-closed', () => {
-+<<<<<<< .our
-         assert.equal(specWebContents.id, webContents.getFocusedWebContents().id)
-+=======
-+        assert.equal(specWebContents.getId(), webContents.getFocusedWebContents().getId())
-+>>>>>>> .their
-         done()
-       })
- 
-@@ -122,6 +146,7 @@
-     })
-   })
- 
-+<<<<<<< .our
-   // Disabled because flaky. See #13969
-   xdescribe('isCurrentlyAudible() API', () => {
-     it('returns whether audio is playing', async () => {
-@@ -138,6 +163,8 @@
-     })
-   })
- 
-+=======
-+>>>>>>> .their
-   describe('getWebPreferences() API', () => {
-     it('should not crash when called for devTools webContents', (done) => {
-       w.webContents.openDevTools()
-added in both
-  our    100644 489f68c96d41e80c308560a98486a07756a03be7 spec/asar-spec.js
-  their  100644 74848ab0a299986d85ad67febaef808b4d0a2f6a spec/asar-spec.js
-@@ -297,6 +297,7 @@
-       })
-     })
- 
-+<<<<<<< .our
-     describe('fs.realpathSync', () => {
-       it('returns real path root', () => {
-         const parent = fs.realpathSync(path.join(fixtures, 'asar'))
-@@ -395,71 +396,166 @@
-         const parent = fs.realpathSync.native(path.join(fixtures, 'asar'))
-         const p = path.join('a.asar', 'not-exist')
-         const throws = () => fs.realpathSync.native(path.join(parent, p))
-+=======
-+    describe('fs.realpathSync', function () {
-+      it('returns real path root', function () {
-+        var parent = fs.realpathSync(path.join(fixtures, 'asar'))
-+        var p = 'a.asar'
-+        var r = fs.realpathSync(path.join(parent, p))
-+        assert.equal(r, path.join(parent, p))
-+      })
-+
-+      it('returns real path of a normal file', function () {
-+        var parent = fs.realpathSync(path.join(fixtures, 'asar'))
-+        var p = path.join('a.asar', 'file1')
-+        var r = fs.realpathSync(path.join(parent, p))
-+        assert.equal(r, path.join(parent, p))
-+      })
-+
-+      it('returns real path of a normal directory', function () {
-+        var parent = fs.realpathSync(path.join(fixtures, 'asar'))
-+        var p = path.join('a.asar', 'dir1')
-+        var r = fs.realpathSync(path.join(parent, p))
-+        assert.equal(r, path.join(parent, p))
-+      })
-+
-+      it('returns real path of a linked file', function () {
-+        var parent = fs.realpathSync(path.join(fixtures, 'asar'))
-+        var p = path.join('a.asar', 'link2', 'link1')
-+        var r = fs.realpathSync(path.join(parent, p))
-+        assert.equal(r, path.join(parent, 'a.asar', 'file1'))
-+      })
-+
-+      it('returns real path of a linked directory', function () {
-+        var parent = fs.realpathSync(path.join(fixtures, 'asar'))
-+        var p = path.join('a.asar', 'link2', 'link2')
-+        var r = fs.realpathSync(path.join(parent, p))
-+        assert.equal(r, path.join(parent, 'a.asar', 'dir1'))
-+      })
-+
-+      it('returns real path of an unpacked file', function () {
-+        var parent = fs.realpathSync(path.join(fixtures, 'asar'))
-+        var p = path.join('unpack.asar', 'a.txt')
-+        var r = fs.realpathSync(path.join(parent, p))
-+        assert.equal(r, path.join(parent, p))
-+      })
-+
-+      it('throws ENOENT error when can not find file', function () {
-+        var parent = fs.realpathSync(path.join(fixtures, 'asar'))
-+        var p = path.join('a.asar', 'not-exist')
-+        var throws = function () {
-+          fs.realpathSync(path.join(parent, p))
-+        }
-+>>>>>>> .their
-         assert.throws(throws, /ENOENT/)
-       })
-     })
- 
-+<<<<<<< .our
-     describe('fs.realpath', () => {
-       it('returns real path root', done => {
-         const parent = fs.realpathSync(path.join(fixtures, 'asar'))
-         const p = 'a.asar'
-         fs.realpath(path.join(parent, p), (err, r) => {
-+=======
-+    describe('fs.realpath', function () {
-+      it('returns real path root', function (done) {
-+        var parent = fs.realpathSync(path.join(fixtures, 'asar'))
-+        var p = 'a.asar'
-+        fs.realpath(path.join(parent, p), function (err, r) {
-+>>>>>>> .their
-           assert.equal(err, null)
-           assert.equal(r, path.join(parent, p))
-           done()
-         })
-       })
- 
-+<<<<<<< .our
-       it('returns real path of a normal file', done => {
-         const parent = fs.realpathSync(path.join(fixtures, 'asar'))
-         const p = path.join('a.asar', 'file1')
-         fs.realpath(path.join(parent, p), (err, r) => {
-+=======
-+      it('returns real path of a normal file', function (done) {
-+        var parent = fs.realpathSync(path.join(fixtures, 'asar'))
-+        var p = path.join('a.asar', 'file1')
-+        fs.realpath(path.join(parent, p), function (err, r) {
-+>>>>>>> .their
-           assert.equal(err, null)
-           assert.equal(r, path.join(parent, p))
-           done()
-         })
-       })
- 
-+<<<<<<< .our
-       it('returns real path of a normal directory', done => {
-         const parent = fs.realpathSync(path.join(fixtures, 'asar'))
-         const p = path.join('a.asar', 'dir1')
-         fs.realpath(path.join(parent, p), (err, r) => {
-+=======
-+      it('returns real path of a normal directory', function (done) {
-+        var parent = fs.realpathSync(path.join(fixtures, 'asar'))
-+        var p = path.join('a.asar', 'dir1')
-+        fs.realpath(path.join(parent, p), function (err, r) {
-+>>>>>>> .their
-           assert.equal(err, null)
-           assert.equal(r, path.join(parent, p))
-           done()
-         })
-       })
- 
-+<<<<<<< .our
-       it('returns real path of a linked file', done => {
-         const parent = fs.realpathSync(path.join(fixtures, 'asar'))
-         const p = path.join('a.asar', 'link2', 'link1')
-         fs.realpath(path.join(parent, p), (err, r) => {
-+=======
-+      it('returns real path of a linked file', function (done) {
-+        var parent = fs.realpathSync(path.join(fixtures, 'asar'))
-+        var p = path.join('a.asar', 'link2', 'link1')
-+        fs.realpath(path.join(parent, p), function (err, r) {
-+>>>>>>> .their
-           assert.equal(err, null)
-           assert.equal(r, path.join(parent, 'a.asar', 'file1'))
-           done()
-         })
-       })
- 
-+<<<<<<< .our
-       it('returns real path of a linked directory', done => {
-         const parent = fs.realpathSync(path.join(fixtures, 'asar'))
-         const p = path.join('a.asar', 'link2', 'link2')
-         fs.realpath(path.join(parent, p), (err, r) => {
-+=======
-+      it('returns real path of a linked directory', function (done) {
-+        var parent = fs.realpathSync(path.join(fixtures, 'asar'))
-+        var p = path.join('a.asar', 'link2', 'link2')
-+        fs.realpath(path.join(parent, p), function (err, r) {
-+>>>>>>> .their
-           assert.equal(err, null)
-           assert.equal(r, path.join(parent, 'a.asar', 'dir1'))
-           done()
-         })
-       })
- 
-+<<<<<<< .our
-       it('returns real path of an unpacked file', done => {
-         const parent = fs.realpathSync(path.join(fixtures, 'asar'))
-         const p = path.join('unpack.asar', 'a.txt')
-         fs.realpath(path.join(parent, p), (err, r) => {
-+=======
-+      it('returns real path of an unpacked file', function (done) {
-+        var parent = fs.realpathSync(path.join(fixtures, 'asar'))
-+        var p = path.join('unpack.asar', 'a.txt')
-+        fs.realpath(path.join(parent, p), function (err, r) {
-+>>>>>>> .their
-           assert.equal(err, null)
-           assert.equal(r, path.join(parent, p))
-           done()
-         })
-       })
- 
-+<<<<<<< .our
-       it('throws ENOENT error when can not find file', done => {
-         const parent = fs.realpathSync(path.join(fixtures, 'asar'))
-         const p = path.join('a.asar', 'not-exist')
-@@ -535,12 +631,21 @@
-         const parent = fs.realpathSync.native(path.join(fixtures, 'asar'))
-         const p = path.join('a.asar', 'not-exist')
-         fs.realpath.native(path.join(parent, p), err => {
-+=======
-+      it('throws ENOENT error when can not find file', function (done) {
-+        var parent = fs.realpathSync(path.join(fixtures, 'asar'))
-+        var p = path.join('a.asar', 'not-exist')
-+        fs.realpath(path.join(parent, p), function (err) {
-+>>>>>>> .their
-           assert.equal(err.code, 'ENOENT')
-           done()
-         })
-       })
-     })
-+<<<<<<< .our
- 
-+=======
-+>>>>>>> .their
-     describe('fs.readdirSync', function () {
-       it('reads dirs from root', function () {
-         var p = path.join(fixtures, 'asar', 'a.asar')
-added in both
-  our    100644 d90269769d269e4054d25cba4b6c4ac8a1929aa6 spec/chromium-spec.js
-  their  100644 938798f001b866a34eae50db37c40e314866c28a spec/chromium-spec.js
-@@ -319,7 +319,11 @@
-       b = window.open(windowUrl, '', 'nodeIntegration=no,show=no')
-     })
- 
-+<<<<<<< .our
-     // TODO(codebytere): re-enable this test
-+=======
-+    // TODO(alexeykuzmin): [Ch66] Fix the test.
-+>>>>>>> .their
-     xit('disables node integration when it is disabled on the parent window for chrome devtools URLs', (done) => {
-       let b
-       app.once('web-contents-created', (event, contents) => {
-added in both
-  our    100644 3a6945b0f2a1cb645a6ca7b0a97356c0164cc3b8 spec/fixtures/api/mixed-sandbox-app/main.js
-  their  100644 cb26a2ac52ddc01f286e094b609f9ba6358d2263 spec/fixtures/api/mixed-sandbox-app/main.js
-@@ -10,6 +10,7 @@
-   app.enableMixedSandbox()
- }
- 
-+<<<<<<< .our
- let currentWindowSandboxed = false
- 
- app.once('ready', () => {
-@@ -36,6 +37,29 @@
-     })
-     currentWindow.webContents.openDevTools()
-   }
-+=======
-+let sandboxWindow
-+let noSandboxWindow
-+
-+app.once('ready', () => {
-+  sandboxWindow = new BrowserWindow({
-+    show: false,
-+    webPreferences: {
-+      preload: path.join(__dirname, 'electron-app-mixed-sandbox-preload.js'),
-+      sandbox: true
-+    }
-+  })
-+  sandboxWindow.loadURL('about:blank')
-+
-+  noSandboxWindow = new BrowserWindow({
-+    show: false,
-+    webPreferences: {
-+      preload: path.join(__dirname, 'electron-app-mixed-sandbox-preload.js'),
-+      sandbox: false
-+    }
-+  })
-+  noSandboxWindow.loadURL('about:blank')
-+>>>>>>> .their
- 
-   const argv = {
-     sandbox: null,
-@@ -46,16 +70,23 @@
- 
-   let connected = false
- 
-+<<<<<<< .our
-   testWindow(true, () => {
-     testWindow()
-   })
- 
-+=======
-+>>>>>>> .their
-   function finish () {
-     if (connected && argv.sandbox != null && argv.noSandbox != null &&
-         argv.noSandboxDevtools != null && argv.sandboxDevtools != null) {
-       client.once('end', () => {
-         app.exit(0)
-       })
-+<<<<<<< .our
-+=======
-+      console.log('Calling end with: ', JSON.stringify(argv))
-+>>>>>>> .their
-       client.end(JSON.stringify(argv))
-     }
-   }
-@@ -63,6 +94,7 @@
-   const socketPath = process.platform === 'win32' ? '\\\\.\\pipe\\electron-mixed-sandbox' : '/tmp/electron-mixed-sandbox'
-   const client = net.connect(socketPath, () => {
-     connected = true
-+<<<<<<< .our
-     finish()
-   })
- 
-@@ -71,6 +103,33 @@
-       argv.sandbox = value
-     } else {
-       argv.noSandbox = value
-+=======
-+    console.log('Calling finish from socket connection')
-+    finish()
-+  })
-+
-+  noSandboxWindow.webContents.once('devtools-opened', () => {
-+    argv.noSandboxDevtools = true
-+    console.log('Calling finish from noSandboxWindow devtools-opened')
-+    finish()
-+  })
-+  noSandboxWindow.webContents.openDevTools()
-+
-+  sandboxWindow.webContents.once('devtools-opened', () => {
-+    argv.sandboxDevtools = true
-+    console.log('Calling finish from sandboxWindow devtools-opened')
-+    finish()
-+  })
-+  sandboxWindow.webContents.openDevTools()
-+
-+  ipcMain.on('argv', (event, value) => {
-+    if (event.sender === sandboxWindow.webContents) {
-+      argv.sandbox = value
-+      console.log('Calling finish from sandboxWindow IPC')
-+    } else if (event.sender === noSandboxWindow.webContents) {
-+      argv.noSandbox = value
-+      console.log('Calling finish from noSandboxWindow IPC')
-+>>>>>>> .their
-     }
-     finish()
-   })
-added in both
-  our    100644 6901be56d0c5fa9f0a318edeb235eef60624ac52 spec/fixtures/module/preload-sandbox.js
-  their  100644 38d14a8be50ce4e0eb5804336e8bc1f2e23dac0e spec/fixtures/module/preload-sandbox.js
-@@ -11,6 +11,7 @@
-       window.test = {
-         env: process.env,
-         execPath: process.execPath,
-+<<<<<<< .our
-         pid: process.pid,
-         arch: process.arch,
-         platform: process.platform,
-@@ -19,6 +20,9 @@
-         type: process.type,
-         version: process.version,
-         versions: process.versions
-+=======
-+        platform: process.platform
-+>>>>>>> .their
-       }
-     }
-   } else if (location.href !== 'about:blank') {
-added in both
-  our    100644 675d81e97b7240d61b49fbbbee857144033a0378 spec/fixtures/pages/a.html
-  their  100644 568973aed1cf5d40100d8b233fb9548d61bbebf2 spec/fixtures/pages/a.html
-@@ -1,7 +1,10 @@
- <html>
- <link rel="icon" type="image/png" href="/favicon.png"/>
- <link rel="icon" type="image/png" href="http://test.com/favicon.png"/>
-+<<<<<<< .our
- <meta http-equiv="content-security-policy" content="script-src 'self' 'unsafe-inline'" />
-+=======
-+>>>>>>> .their
- <body>
- <script type="text/javascript" charset="utf-8">
-   console.log('a');
-added in both
-  our    100644 5659c44c8de4456a25e0026e29199b827c89cb08 spec/static/main.js
-  their  100644 21a8515d66d1ccbf34fb549d85f8f1480110bdb8 spec/static/main.js
-@@ -99,7 +99,11 @@
-   })
- }
- 
-+<<<<<<< .our
- global.nativeModulesEnabled = !process.env.ELECTRON_SKIP_NATIVE_MODULE_TESTS
-+=======
-+global.nativeModulesEnabled = process.platform !== 'win32' || process.execPath.toLowerCase().indexOf('\\out\\d\\') === -1
-+>>>>>>> .their
- 
- // Register app as standard scheme.
- global.standardScheme = 'app'
-added in both
-  our    100644 db75a4e3754e24a5e6740be61be4f4098c58006e spec/webview-spec.js
-  their  100644 cf563e350d58072614c92daf8731f732d1899e84 spec/webview-spec.js
-@@ -5,7 +5,11 @@
- const http = require('http')
- const url = require('url')
- const {ipcRenderer, remote} = require('electron')
-+<<<<<<< .our
- const {app, session, ipcMain, BrowserWindow} = remote
-+=======
-+const {app, session, getGuestWebContents, ipcMain, BrowserWindow, webContents} = remote
-+>>>>>>> .their
- const {closeWindow} = require('./window-helpers')
- const {emittedOnce, waitForEvent} = require('./events-helpers')
- 
-@@ -248,6 +252,7 @@
-       })
-     })
- 
-+<<<<<<< .our
-     it('runs in the correct scope when sandboxed', async () => {
-       const message = await startLoadingWebViewAndWaitForMessage(webview, {
-         preload: `${fixtures}/module/preload-context.js`,
-@@ -264,6 +269,8 @@
-       })
-     })
- 
-+=======
-+>>>>>>> .their
-     it('preload script can require modules that still use "process" and "Buffer" when nodeintegration is off', async () => {
-       const message = await startLoadingWebViewAndWaitForMessage(webview, {
-         preload: `${fixtures}/module/preload-node-off-wrapper.js`,
-@@ -692,8 +699,12 @@
-     })
-   })
- 
-+<<<<<<< .our
-   // FIXME(zcbenz): Disabled because of moving to OOPIF webview.
-   xdescribe('setDevToolsWebContents() API', () => {
-+=======
-+  describe('setDevToolsWebContents() API', () => {
-+>>>>>>> .their
-     it('sets webContents of webview as devtools', async () => {
-       const webview2 = new WebView()
-       loadWebView(webview2)
-@@ -1034,7 +1045,11 @@
-       assert.ok(webview.partition)
- 
-       const listener = function (webContents, permission, callback) {
-+<<<<<<< .our
-         if (webContents.id === webview.getWebContents().id) {
-+=======
-+        if (webContents.getId() === webview.getId()) {
-+>>>>>>> .their
-           // requestMIDIAccess with sysex requests both midi and midiSysex so
-           // grant the first midi one and then reject the midiSysex one
-           if (requestedPermission === 'midiSysex' && permission === 'midi') {
-@@ -1120,7 +1135,11 @@
-       webview.partition = 'permissionTest'
-       webview.setAttribute('nodeintegration', 'on')
-       session.fromPartition(webview.partition).setPermissionRequestHandler((webContents, permission, callback) => {
-+<<<<<<< .our
-         if (webContents.id === webview.getWebContents().id) {
-+=======
-+        if (webContents.getId() === webview.getId()) {
-+>>>>>>> .their
-           assert.equal(permission, 'notifications')
-           setTimeout(() => { callback(true) }, 10)
-         }
-@@ -1147,6 +1166,7 @@
- 
-     it('updates when the window is shown after the ready-to-show event', async () => {
-       const w = await openTheWindow({ show: false })
-+<<<<<<< .our
-       const readyToShowSignal = emittedOnce(w, 'ready-to-show')
-       const pongSignal1 = emittedOnce(ipcMain, 'pong')
-       w.loadURL(`file://${fixtures}/pages/webview-visibilitychange.html`)
-@@ -1156,6 +1176,14 @@
-       w.show()
- 
-       const [, visibilityState, hidden] = await pongSignal2
-+=======
-+      w.loadURL(`file://${fixtures}/pages/webview-visibilitychange.html`)
-+
-+      await emittedOnce(w, 'ready-to-show')
-+      w.show()
-+
-+      const [, visibilityState, hidden] = await emittedOnce(ipcMain, 'pong')
-+>>>>>>> .their
-       assert(!hidden)
-       assert.equal(visibilityState, 'visible')
-     })
-@@ -1256,6 +1284,235 @@
-     expect(tabId).to.be.not.equal(w.webContents.id)
-   })
- 
-+<<<<<<< .our
-+=======
-+  // TODO(alexeykuzmin): Some tests rashe a renderer process.
-+  // Fix them and enable the tests.
-+  xdescribe('guestinstance attribute', () => {
-+    it('before loading there is no attribute', () => {
-+      loadWebView(webview)  // Don't wait for loading to finish.
-+      assert(!webview.hasAttribute('guestinstance'))
-+    })
-+
-+    it('loading a page sets the guest view', async () => {
-+      await loadWebView(webview, {
-+        src: `file://${fixtures}/api/blank.html`
-+      })
-+
-+      const instance = webview.getAttribute('guestinstance')
-+      assert.equal(instance, parseInt(instance))
-+
-+      const guest = getGuestWebContents(parseInt(instance))
-+      assert.equal(guest, webview.getWebContents())
-+    })
-+
-+    it('deleting the attribute destroys the webview', async () => {
-+      await loadWebView(webview, {
-+        src: `file://${fixtures}/api/blank.html`
-+      })
-+
-+      const instance = parseInt(webview.getAttribute('guestinstance'))
-+      const waitForDestroy = waitForEvent(webview, 'destroyed')
-+      webview.removeAttribute('guestinstance')
-+
-+      await waitForDestroy
-+      expect(getGuestWebContents(instance)).to.equal(undefined)
-+    })
-+
-+    it('setting the attribute on a new webview moves the contents', (done) => {
-+      const loadListener = () => {
-+        const webContents = webview.getWebContents()
-+        const instance = webview.getAttribute('guestinstance')
-+
-+        const destroyListener = () => {
-+          assert.equal(webContents, webview2.getWebContents())
-+
-+          // Make sure that events are hooked up to the right webview now
-+          webview2.addEventListener('console-message', (e) => {
-+            assert.equal(e.message, 'a')
-+            document.body.removeChild(webview2)
-+            done()
-+          })
-+
-+          webview2.src = `file://${fixtures}/pages/a.html`
-+        }
-+        webview.addEventListener('destroyed', destroyListener, {once: true})
-+
-+        const webview2 = new WebView()
-+        loadWebView(webview2, {
-+          guestinstance: instance
-+        })
-+      }
-+      webview.addEventListener('did-finish-load', loadListener, {once: true})
-+      loadWebView(webview, {
-+        src: `file://${fixtures}/api/blank.html`
-+      })
-+    })
-+
-+    it('setting the attribute to an invalid guestinstance does nothing', async () => {
-+      await loadWebView(webview, {
-+        src: `file://${fixtures}/api/blank.html`
-+      })
-+      webview.setAttribute('guestinstance', 55)
-+
-+      // Make sure that events are still hooked up to the webview
-+      const waitForMessage = waitForEvent(webview, 'console-message')
-+      webview.src = `file://${fixtures}/pages/a.html`
-+      const {message} = await waitForMessage
-+      assert.equal(message, 'a')
-+    })
-+
-+    it('setting the attribute on an existing webview moves the contents', (done) => {
-+      const load1Listener = () => {
-+        const webContents = webview.getWebContents()
-+        const instance = webview.getAttribute('guestinstance')
-+        let destroyedInstance
-+
-+        const destroyListener = () => {
-+          assert.equal(webContents, webview2.getWebContents())
-+          assert.equal(null, getGuestWebContents(parseInt(destroyedInstance)))
-+
-+          // Make sure that events are hooked up to the right webview now
-+          webview2.addEventListener('console-message', (e) => {
-+            assert.equal(e.message, 'a')
-+            document.body.removeChild(webview2)
-+            done()
-+          })
-+
-+          webview2.src = 'file://' + fixtures + '/pages/a.html'
-+        }
-+        webview.addEventListener('destroyed', destroyListener, {once: true})
-+
-+        const webview2 = new WebView()
-+        const load2Listener = () => {
-+          destroyedInstance = webview2.getAttribute('guestinstance')
-+          assert.notEqual(instance, destroyedInstance)
-+
-+          webview2.setAttribute('guestinstance', instance)
-+        }
-+        webview2.addEventListener('did-finish-load', load2Listener, {once: true})
-+        loadWebView(webview2, {
-+          src: `file://${fixtures}/api/blank.html`
-+        })
-+      }
-+
-+      webview.addEventListener('did-finish-load', load1Listener, {once: true})
-+      loadWebView(webview, {
-+        src: `file://${fixtures}/api/blank.html`
-+      })
-+    })
-+
-+    it('moving a guest back to its original webview should work', (done) => {
-+      loadWebView(webview, {
-+        src: `file://${fixtures}/api/blank.html`
-+      }).then(() => {
-+        const webContents = webview.getWebContents()
-+        const instance = webview.getAttribute('guestinstance')
-+
-+        const destroy1Listener = () => {
-+          assert.equal(webContents, webview2.getWebContents())
-+          assert.notStrictEqual(webContents, webview.getWebContents())
-+
-+          const destroy2Listener = () => {
-+            assert.equal(webContents, webview.getWebContents())
-+            assert.notStrictEqual(webContents, webview2.getWebContents())
-+
-+            // Make sure that events are hooked up to the right webview now
-+            webview.addEventListener('console-message', (e) => {
-+              document.body.removeChild(webview2)
-+              assert.equal(e.message, 'a')
-+              done()
-+            })
-+
-+            webview.src = `file://${fixtures}/pages/a.html`
-+          }
-+          webview2.addEventListener('destroyed', destroy2Listener, {once: true})
-+          webview.setAttribute('guestinstance', instance)
-+        }
-+        webview.addEventListener('destroyed', destroy1Listener, {once: true})
-+
-+        const webview2 = new WebView()
-+        loadWebView(webview2, {guestinstance: instance})
-+      })
-+    })
-+
-+    // FIXME(alexeykuzmin): This test only passes if the previous test ^
-+    // is run alongside.
-+    it('setting the attribute on a webview in a different window moves the contents', (done) => {
-+      loadWebView(webview, {
-+        src: `file://${fixtures}/api/blank.html`
-+      }).then(() => {
-+        const instance = webview.getAttribute('guestinstance')
-+
-+        w = new BrowserWindow({ show: false })
-+        w.webContents.once('did-finish-load', () => {
-+          ipcMain.once('pong', () => {
-+            assert(!webview.hasAttribute('guestinstance'))
-+            done()
-+          })
-+
-+          w.webContents.send('guestinstance', instance)
-+        })
-+        w.loadURL(`file://${fixtures}/pages/webview-move-to-window.html`)
-+      })
-+    })
-+
-+    it('does not delete the guestinstance attribute when moving the webview to another parent node', (done) => {
-+      webview.addEventListener('dom-ready', function domReadyListener () {
-+        webview.addEventListener('did-attach', () => {
-+          assert(webview.guestinstance != null)
-+          assert(webview.getWebContents() != null)
-+          done()
-+        })
-+
-+        document.body.replaceChild(webview, div)
-+      })
-+      webview.src = `file://${fixtures}/pages/a.html`
-+
-+      const div = document.createElement('div')
-+      div.appendChild(webview)
-+      document.body.appendChild(div)
-+    })
-+
-+    it('does not destroy the webContents when hiding/showing the webview (regression)', (done) => {
-+      webview.addEventListener('dom-ready', function () {
-+        const instance = webview.getAttribute('guestinstance')
-+        assert(instance != null)
-+
-+        // Wait for event directly since attach happens asynchronously over IPC
-+        ipcMain.once('ELECTRON_GUEST_VIEW_MANAGER_ATTACH_GUEST', () => {
-+          assert(webview.getWebContents() != null)
-+          assert.equal(instance, webview.getAttribute('guestinstance'))
-+          done()
-+        })
-+
-+        webview.style.display = 'none'
-+        webview.offsetHeight // eslint-disable-line
-+        webview.style.display = 'block'
-+      }, {once: true})
-+      loadWebView(webview, {src: `file://${fixtures}/pages/a.html`})
-+    })
-+
-+    it('does not reload the webContents when hiding/showing the webview (regression)', (done) => {
-+      webview.addEventListener('dom-ready', function () {
-+        webview.addEventListener('did-start-loading', () => {
-+          done(new Error('webview started loading unexpectedly'))
-+        })
-+
-+        // Wait for event directly since attach happens asynchronously over IPC
-+        webview.addEventListener('did-attach', () => {
-+          done()
-+        })
-+
-+        webview.style.display = 'none'
-+        webview.offsetHeight  // eslint-disable-line
-+        webview.style.display = 'block'
-+      }, {once: true})
-+      loadWebView(webview, {src: `file://${fixtures}/pages/a.html`})
-+    })
-+  })
-+
-+>>>>>>> .their
-   describe('DOM events', () => {
-     let div
- 
-@@ -1273,34 +1530,163 @@
-     })
- 
-     it('emits resize events', async () => {
-+<<<<<<< .our
-       const firstResizeSignal = waitForEvent(webview, 'resize')
-       const domReadySignal = waitForEvent(webview, 'dom-ready')
- 
-+=======
-+>>>>>>> .their
-       webview.src = `file://${fixtures}/pages/a.html`
-       div.appendChild(webview)
-       document.body.appendChild(div)
- 
-+<<<<<<< .our
-       const firstResizeEvent = await firstResizeSignal
-+=======
-+      const firstResizeEvent = await waitForEvent(webview, 'resize')
-+>>>>>>> .their
-       expect(firstResizeEvent.target).to.equal(webview)
-       expect(firstResizeEvent.newWidth).to.equal(100)
-       expect(firstResizeEvent.newHeight).to.equal(10)
- 
-+<<<<<<< .our
-       await domReadySignal
- 
-       const secondResizeSignal = waitForEvent(webview, 'resize')
-+=======
-+      await waitForEvent(webview, 'dom-ready')
-+>>>>>>> .their
- 
-       const newWidth = 1234
-       const newHeight = 789
-       div.style.width = `${newWidth}px`
-       div.style.height = `${newHeight}px`
- 
-+<<<<<<< .our
-       const secondResizeEvent = await secondResizeSignal
-+=======
-+      const secondResizeEvent = await waitForEvent(webview, 'resize')
-+>>>>>>> .their
-       expect(secondResizeEvent.target).to.equal(webview)
-       expect(secondResizeEvent.newWidth).to.equal(newWidth)
-       expect(secondResizeEvent.newHeight).to.equal(newHeight)
-     })
-   })
- 
-+<<<<<<< .our
-+=======
-+  describe('disableguestresize attribute', () => {
-+    it('does not have attribute by default', () => {
-+      loadWebView(webview)
-+      assert(!webview.hasAttribute('disableguestresize'))
-+    })
-+
-+    it('resizes guest when attribute is not present', async () => {
-+      const INITIAL_SIZE = 200
-+      const w = await openTheWindow(
-+          {show: false, width: INITIAL_SIZE, height: INITIAL_SIZE})
-+      w.loadURL(`file://${fixtures}/pages/webview-guest-resize.html`)
-+      await emittedOnce(ipcMain, 'webview-loaded')
-+
-+      const elementResize = emittedOnce(ipcMain, 'webview-element-resize')
-+          .then(([, width, height]) => {
-+            assert.equal(width, CONTENT_SIZE)
-+            assert.equal(height, CONTENT_SIZE)
-+          })
-+
-+      const guestResize = emittedOnce(ipcMain, 'webview-guest-resize')
-+          .then(([, width, height]) => {
-+            assert.equal(width, CONTENT_SIZE)
-+            assert.equal(height, CONTENT_SIZE)
-+          })
-+
-+      const CONTENT_SIZE = 300
-+      assert(CONTENT_SIZE !== INITIAL_SIZE)
-+      w.setContentSize(CONTENT_SIZE, CONTENT_SIZE)
-+
-+      return Promise.all([elementResize, guestResize])
-+    })
-+
-+    // TODO(alexeykuzmin): [Ch66] Enable the test.
-+    xit('does not resize guest when attribute is present', async () => {
-+      const INITIAL_SIZE = 200
-+      const w = await openTheWindow(
-+          {show: false, width: INITIAL_SIZE, height: INITIAL_SIZE})
-+      w.loadURL(`file://${fixtures}/pages/webview-no-guest-resize.html`)
-+      await emittedOnce(ipcMain, 'webview-loaded')
-+
-+      const noGuestResizePromise = Promise.race([
-+        emittedOnce(ipcMain, 'webview-guest-resize'),
-+        new Promise(resolve => setTimeout(() => resolve(), 500))
-+      ]).then((eventData = null) => {
-+        if (eventData !== null) {
-+          // Means we got the 'webview-guest-resize' event before the time out.
-+          return Promise.reject(new Error('Unexpected guest resize message'))
-+        }
-+      })
-+
-+      const CONTENT_SIZE = 300
-+      assert(CONTENT_SIZE !== INITIAL_SIZE)
-+      w.setContentSize(CONTENT_SIZE, CONTENT_SIZE)
-+
-+      return noGuestResizePromise
-+    })
-+
-+    // TODO(alexeykuzmin): [Ch66] Enable the test.
-+    xit('dispatches element resize event even when attribute is present', async () => {
-+      const INITIAL_SIZE = 200
-+      const w = await openTheWindow(
-+          {show: false, width: INITIAL_SIZE, height: INITIAL_SIZE})
-+      w.loadURL(`file://${fixtures}/pages/webview-no-guest-resize.html`)
-+      await emittedOnce(ipcMain, 'webview-loaded')
-+
-+      const elementResizePromise = emittedOnce(ipcMain, 'webview-element-resize')
-+          .then(([, width, height]) => {
-+            expect(width).to.equal(CONTENT_SIZE)
-+            expect(height).to.equal(CONTENT_SIZE)
-+          })
-+
-+      const CONTENT_SIZE = 300
-+      assert(CONTENT_SIZE !== INITIAL_SIZE)
-+      w.setContentSize(CONTENT_SIZE, CONTENT_SIZE)
-+
-+      return elementResizePromise
-+    })
-+
-+    // TODO(alexeykuzmin): [Ch66] Enable the test.
-+    xit('can be manually resized with setSize even when attribute is present', async () => {
-+      const INITIAL_SIZE = 200
-+      const w = await openTheWindow(
-+          {show: false, width: INITIAL_SIZE, height: INITIAL_SIZE})
-+      w.loadURL(`file://${fixtures}/pages/webview-no-guest-resize.html`)
-+      await emittedOnce(ipcMain, 'webview-loaded')
-+
-+      const GUEST_WIDTH = 10
-+      const GUEST_HEIGHT = 20
-+
-+      const guestResizePromise = emittedOnce(ipcMain, 'webview-guest-resize')
-+          .then(([, width, height]) => {
-+            expect(width).to.be.equal(GUEST_WIDTH)
-+            expect(height).to.be.equal(GUEST_HEIGHT)
-+          })
-+
-+      const wc = webContents.getAllWebContents().find((wc) => {
-+        return wc.hostWebContents &&
-+            wc.hostWebContents.id === w.webContents.id
-+      })
-+      assert(wc)
-+      wc.setSize({
-+        normal: {
-+          width: GUEST_WIDTH,
-+          height: GUEST_HEIGHT
-+        }
-+      })
-+
-+      return guestResizePromise
-+    })
-+  })
-+
-+>>>>>>> .their
-   describe('zoom behavior', () => {
-     const zoomScheme = remote.getGlobal('zoomScheme')
-     const webviewSession = session.fromPartition('webview-temp')
-added in both
-  our    100644 808f646f3cf52981f8d75aa8212f3c97b02f055a spec/window-helpers.js
-  their  100644 5a63100f9d0e6452c35c5d31190b37f840066d2a spec/window-helpers.js
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- const {expect} = require('chai')
- const {BrowserWindow} = require('electron').remote
- 
-@@ -15,5 +16,27 @@
- 
-   if (assertSingleWindow) {
-     expect(BrowserWindow.getAllWindows()).to.have.lengthOf(1)
-+=======
-+const assert = require('assert')
-+const {BrowserWindow} = require('electron').remote
-+
-+exports.closeWindow = (window, {assertSingleWindow} = {assertSingleWindow: true}) => {
-+  if (window == null || window.isDestroyed()) {
-+    if (assertSingleWindow) {
-+      assert.equal(BrowserWindow.getAllWindows().length, 1)
-+    }
-+    return Promise.resolve()
-+  } else {
-+    return new Promise((resolve, reject) => {
-+      window.once('closed', () => {
-+        if (assertSingleWindow) {
-+          assert.equal(BrowserWindow.getAllWindows().length, 1)
-+        }
-+        resolve()
-+      })
-+      window.setClosable(true)
-+      window.close()
-+    })
-+>>>>>>> .their
-   }
- }
-added in both
-  our    100755 145c1298c6fbba0a7863fa32cb25e2c6c8eb7e2c tools/js2asar.py
-  their  100755 adad1751e33d21173eaa0b60a9f987f7f074a6fd tools/js2asar.py
-@@ -16,11 +16,16 @@
-   source_files = sys.argv[3:]
- 
-   output_dir = tempfile.mkdtemp()
-+<<<<<<< .our
-   copy_files(source_files, output_dir, folder_name)
-+=======
-+  copy_files(source_files, output_dir)
-+>>>>>>> .their
-   call_asar(archive, os.path.join(output_dir, folder_name))
-   shutil.rmtree(output_dir)
- 
- 
-+<<<<<<< .our
- def copy_files(source_files, output_dir, folder_name):
-   for source_file in source_files:
-     output_path = os.path.join(output_dir, source_file)
-@@ -28,6 +33,11 @@
-     # the temp one we are making so they end up in the ASAR
-     if not os.path.normpath(source_file).startswith(folder_name + os.sep):
-       output_path = os.path.join(output_dir, folder_name, source_file)
-+=======
-+def copy_files(source_files, output_dir):
-+  for source_file in source_files:
-+    output_path = os.path.join(output_dir, source_file)
-+>>>>>>> .their
-     safe_mkdir(os.path.dirname(output_path))
-     shutil.copy2(source_file, output_path)
- 
-added in both
-  our    160000 f5f20660f20c281c1cbf1097ed55204b50711846 vendor/breakpad
-  their  160000 82f0452e6b687b3c1e14e08d172b2f3fb79ae91a vendor/breakpad
-added in both
-  our    160000 c85470a1c379b1c4bedb372c146521bc4be9b75d vendor/libchromiumcontent
-  their  160000 0106aa2d014dc1cf1f08b1567b65f5af8992f99a vendor/libchromiumcontent
-added in both
-  our    160000 ece0a06ac8147efb5b5af431c21f312f1884616e vendor/node
-  their  160000 a782199c99b5716582791fe8145756fd5bcfde27 vendor/node
-added in both
-  our    100644 84bd69c2b2868ac23bc30061aa208ad38fbb9506 vsts.yml
-  their  100644 72418c7baa6ff63e01b55e0f4051abb2830ea746 vsts.yml
-@@ -59,7 +59,11 @@
- - bash: |
-     echo 'Verifying ffmpeg on build'
-     if [ "$ELECTRON_RELEASE" == "1" ]; then
-+<<<<<<< .our
-       script/verify-ffmpeg.py -c R
-+=======
-+      script/verify-ffmpeg.py -R
-+>>>>>>> .their
-     else
-       script/verify-ffmpeg.py
-     fi
-@@ -69,8 +73,14 @@
- - task: PublishTestResults@2
-   displayName: Publish Test Results
-   inputs:
-+<<<<<<< .our
-     testResultsFiles: '**/test-*.xml'
-   condition: and(always(), eq(variables['MOCHA_FILE'], 'test-results.xml'))
-+=======
-+    testResultsFiles: 'test-results.xml'
-+    searchFolder: junit
-+  condition: and(always(), ne(variables['ELECTRON_RELEASE'], '1'))
-+>>>>>>> .their
- 
- - bash: |
-     export BUILD_URL="${SYSTEM_TEAMFOUNDATIONCOLLECTIONURI}${SYSTEM_TEAMPROJECT}/_build/results?buildId=${BUILD_BUILDID}"
diff --git a/app/test/fixtures/merge-parser/electron/merge-fix-vsts-mac-gn-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-fix-vsts-mac-gn-into-master.txt
deleted file mode 100644
index 9760132bea8..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-fix-vsts-mac-gn-into-master.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-changed in both
-  base   100644 750661e8d5873b5d99d1c1bbfff2d3aa412de1d2 vsts-gn.yml
-  our    100644 3c9985b16c0414cfd9bc6c6648d6411a969fc6ef vsts-gn.yml
-  their  100644 2abd5340dbcf22981114234cc0ed740189e62726 vsts-gn.yml
-@@ -31,9 +31,16 @@
-   - bash: |
-       cd src
-       export CHROMIUM_BUILDTOOLS_PATH=`pwd`/buildtools
-+<<<<<<< .our
-       export SCCACHE_WRAPPER="`pwd`/electron/external_binaries/sccache"
-       export SCCACHE_HELPER="`pwd`/libchromiumcontent/script/sccache"
-       "$SCCACHE_HELPER" --start-server --azure_container "$(SCCACHE_AZURE_BLOB_CONTAINER)" --azure_connection "$(SCCACHE_AZURE_CONNECTION_STRING)"
-+=======
-+      export SCCACHE_WRAPPER="`pwd`/libchromiumcontent/tools/sccache/aad2120/mac/sccache"
-+      export SCCACHE_HELPER="`pwd`/libchromiumcontent/script/sccache"
-+      "$SCCACHE_HELPER" --start-server --azure_container "$(SCCACHE_AZURE_BLOB_CONTAINER)" --azure_connection "$(SCCACHE_AZURE_CONNECTION_STRING)"
-+      "$SCCACHE_WRAPPER" -s
-+>>>>>>> .their
-       echo "##vso[task.setvariable variable=SCCACHE_WRAPPER]$SCCACHE_WRAPPER"
-       echo "##vso[task.setvariable variable=CHROMIUM_BUILDTOOLS_PATH]`pwd`/buildtools"
-       echo "GN gen for: $GN_CONFIG"
diff --git a/app/test/fixtures/merge-parser/electron/merge-gn-add-nonproprietary-ffmpeg-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-gn-add-nonproprietary-ffmpeg-into-master.txt
deleted file mode 100644
index f559ca3d7c8..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-gn-add-nonproprietary-ffmpeg-into-master.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-added in both
-  our    100644 3b5ac0267219454a366cb89ac02eb8fa4d5fa39e build/args/ffmpeg.gn
-  their  100644 5e7dd760ad6ec10e3f880b4a43d9963e5cc17487 build/args/ffmpeg.gn
-@@ -1,3 +1,9 @@
- import("release.gn")
-+<<<<<<< .our
- proprietary_codecs = false
- ffmpeg_branding = "Chromium"
-+=======
-+
-+ffmpeg_branding = "Chromium"
-+proprietary_codecs = false
-+>>>>>>> .their
diff --git a/app/test/fixtures/merge-parser/electron/merge-gn-ci-builds-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-gn-ci-builds-into-master.txt
deleted file mode 100644
index 490a6e541c5..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-gn-ci-builds-into-master.txt
+++ /dev/null
@@ -1,193 +0,0 @@
-changed in both
-  base   100644 3e663d1b625c500580d61cc8d3c8598a7c2f9bcc .circleci/config.yml
-  our    100644 6d44d618aabcce04c60344f2274dec5b0c2a1f68 .circleci/config.yml
-  their  100644 fa90a8c1816207a9b9061f49f0da13e2d3653469 .circleci/config.yml
-@@ -513,10 +513,65 @@
-   electron-gn-linux-x64-debug-fyi:
-     environment:
-       DISPLAY: ':99.0'
-+<<<<<<< .our
-       GN_CONFIG: //electron/build/args/debug.gn
-       RUN_TESTS: false
-     <<: *gn-linux-build-machine
-     <<: *gn-build-steps
-+=======
-+    docker:
-+      - image: electronbuilds/electron:0.0.8
-+    resource_class: 2xlarge
-+    steps:
-+      - run:
-+          name: Setup depot tools
-+          command: |
-+            git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
-+            echo 'export PATH=$PATH:`pwd`/depot_tools' >> $BASH_ENV
-+      - checkout:
-+          path: src/electron
-+      - restore_cache:
-+          paths:
-+            - ~/.gclient-cache
-+          keys:
-+            - v1-gclient-cache-{{ checksum "src/electron/DEPS" }}
-+            - v1-gclient-cache-
-+      - run:
-+          name: Gclient sync
-+          command: |
-+            gclient config \
-+              --name "src/electron" \
-+              --unmanaged \
-+              --cache-dir "$HOME/.gclient-cache" \
-+              "$CIRCLE_REPOSITORY_URL"
-+
-+            gclient sync --with_branch_heads --with_tags
-+      - save_cache:
-+          paths:
-+            - ~/.gclient-cache
-+          key: v1-gclient-cache-{{ checksum "src/electron/DEPS" }}
-+      - run:
-+          name: GN gen
-+          command: |
-+            cd src
-+            echo 'export SCCACHE_WRAPPER="'`pwd`'/libchromiumcontent/tools/sccache/aad2120/linux/sccache"' >> $BASH_ENV
-+            echo 'export CHROMIUM_BUILDTOOLS_PATH=`pwd`/buildtools' >> $BASH_ENV
-+            source $BASH_ENV
-+            gn gen out/Default --args='import("//electron/build/args/debug.gn")'
-+      - run:
-+          name: Ninja build
-+          command: |
-+            cd src
-+            ninja -C out/Default electron:electron_app
-+
-+      - run:
-+          name: Check sccache stats after build
-+          command: $SCCACHE_WRAPPER -s
-+
-+      - run:
-+          name: Check sccache stats after build
-+          command: $SCCACHE_WRAPPER -s
-+>>>>>>> .their
- 
-   electron-gn-linux-x64-testing-fyi:
-     environment:
-changed in both
-  base   160000 ca55cd0d8f7e7eccdefa49f82fcb6ef3789a230b vendor/libchromiumcontent
-  our    160000 c85470a1c379b1c4bedb372c146521bc4be9b75d vendor/libchromiumcontent
-  their  160000 659aa83375805545402eff8b0746784bbf2d64c2 vendor/libchromiumcontent
-added in both
-  our    100644 3c9985b16c0414cfd9bc6c6648d6411a969fc6ef vsts-gn.yml
-  their  100644 df147ba0aca3283a53fa08e9aaafc663385cf03d vsts-gn.yml
-@@ -6,6 +6,7 @@
-     timeoutInMinutes: 180
-   steps:
-   - bash: |
-+<<<<<<< .our
-       git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git "${AGENT_BUILDDIRECTORY}/depot_tools"
-       echo "##vso[task.setvariable variable=PATH]$PATH:${AGENT_BUILDDIRECTORY}/depot_tools"
-     name: Setup_depot_tools
-@@ -25,12 +26,25 @@
-       # BUILD_SOURCEVERSION commit, and so the checkout will fail. Find a
-       # better solution for checking out the commit to be built.
-       (cd src/electron; git fetch origin +"${BUILD_SOURCEBRANCH}"; git checkout "${BUILD_SOURCEVERSION}")
-+=======
-+      git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
-+      echo "##vso[task.setvariable variable=PATH]$PATH:`pwd`/depot_tools"
-+    name: Setup_depot_tools
-+
-+  - bash: |
-+      gclient config \
-+        --name "src/electron" \
-+        --unmanaged \
-+        --cache-dir "/Users/electron/libcc_cache" \
-+        "https://github.com/electron/electron"
-+>>>>>>> .their
-       gclient sync --with_branch_heads --with_tags
-     name: gclient_sync
- 
-   - bash: |
-       cd src
-       export CHROMIUM_BUILDTOOLS_PATH=`pwd`/buildtools
-+<<<<<<< .our
-       export SCCACHE_WRAPPER="`pwd`/electron/external_binaries/sccache"
-       export SCCACHE_HELPER="`pwd`/libchromiumcontent/script/sccache"
-       "$SCCACHE_HELPER" --start-server --azure_container "$(SCCACHE_AZURE_BLOB_CONTAINER)" --azure_connection "$(SCCACHE_AZURE_CONNECTION_STRING)"
-@@ -38,6 +52,14 @@
-       echo "##vso[task.setvariable variable=CHROMIUM_BUILDTOOLS_PATH]`pwd`/buildtools"
-       echo "GN gen for: $GN_CONFIG"
-       gn gen out/Default --args='import("'$GN_CONFIG'") cc_wrapper="'"$SCCACHE_WRAPPER"'"'
-+=======
-+      export SCCACHE_WRAPPER="`pwd`/libchromiumcontent/tools/sccache/aad2120/mac/sccache"
-+      $SCCACHE_WRAPPER --start-server --azure_container "$(SCCACHE_AZURE_BLOB_CONTAINER)" --azure_connection "$(SCCACHE_AZURE_CONNECTION_STRING)"
-+      $SCCACHE_WRAPPER -s
-+      echo "##vso[task.setvariable variable=SCCACHE_WRAPPER]$SCCACHE_WRAPPER"
-+      echo "##vso[task.setvariable variable=CHROMIUM_BUILDTOOLS_PATH]`pwd`/buildtools"
-+      gn gen out/Default --args='import("//electron/build/args/debug.gn") cc_wrapper="'"$SCCACHE_WRAPPER"'"'
-+>>>>>>> .their
-     name: GN_gen
- 
-   - bash: |
-@@ -46,18 +68,28 @@
-     name: Ninja_build
- 
-   - bash: |
-+<<<<<<< .our
-       "$SCCACHE_WRAPPER" -s
-       "$SCCACHE_WRAPPER" --stop-server
-+=======
-+      $SCCACHE_WRAPPER -s
-+      $SCCACHE_WRAPPER --stop-server
-+>>>>>>> .their
-     name: Check_sccache_stats
- 
-   - bash: |
-       set +e
-       cd src
-+<<<<<<< .our
-       ninja -C out/Default third_party/electron_node:headers
-+=======
-+      ninja -C out/Default electron/build/node:headers
-+>>>>>>> .their
-       export npm_config_nodedir="$PWD/out/Default/gen/node_headers"
-       (cd electron/spec && npm install)
-       ./out/Default/Electron.app/Contents/MacOS/Electron electron/spec --ci --enable-logging
-     name: Test
-+<<<<<<< .our
-     condition: and(succeeded(), ne(variables['ELECTRON_RELEASE'], '1'))
- 
-   - bash: |
-@@ -65,11 +97,14 @@
-       ninja -C out/Default electron:electron_dist_zip
-     name: Build_dist_zip
-     condition: and(succeeded(), eq(variables['ELECTRON_RELEASE'], '1'))
-+=======
-+>>>>>>> .their
- 
-   - task: PublishTestResults@2
-     displayName: Publish Test Results
-     inputs:
-       testResultsFiles: '**/test-*.xml'
-+<<<<<<< .our
-     condition: and(always(), eq(variables['MOCHA_FILE'], 'junit/test-results.xml'), ne(variables['ELECTRON_RELEASE'], '1'))
- 
-   - task: PublishBuildArtifacts@1
-@@ -78,6 +113,9 @@
-       PathtoPublish: '$(Build.SourcesDirectory)/out/Default/dist.zip'
-       ArtifactName: dist.zip
-     condition: and(succeeded(), eq(variables['ELECTRON_RELEASE'], '1'))
-+=======
-+    condition: and(always(), eq(variables['MOCHA_FILE'], 'junit/test-results.xml'))
-+>>>>>>> .their
- 
-   - bash: |
-       export BUILD_URL="${SYSTEM_TEAMFOUNDATIONCOLLECTIONURI}${SYSTEM_TEAMPROJECT}/_build/results?buildId=${BUILD_BUILDID}"
-changed in both
-  base   100644 3e78eea25f8be0334d38f0d566ef539fef981596 vsts.yml
-  our    100644 84bd69c2b2868ac23bc30061aa208ad38fbb9506 vsts.yml
-  their  100644 914ab70479aa73622e304bfbecc4dbea4b2393fc vsts.yml
-@@ -70,7 +70,7 @@
-   displayName: Publish Test Results
-   inputs:
-     testResultsFiles: '**/test-*.xml'
--  condition: and(always(), eq(variables['MOCHA_FILE'], 'test-results.xml'))
-+  condition: and(always(), eq(variables['MOCHA_FILE'], 'junit/test-results.xml'))
- 
- - bash: |
-     export BUILD_URL="${SYSTEM_TEAMFOUNDATIONCOLLECTIONURI}${SYSTEM_TEAMPROJECT}/_build/results?buildId=${BUILD_BUILDID}"
diff --git a/app/test/fixtures/merge-parser/electron/merge-gn-ci-sccache-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-gn-ci-sccache-into-master.txt
deleted file mode 100644
index e367211d596..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-gn-ci-sccache-into-master.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-changed in both
-  base   100644 3e663d1b625c500580d61cc8d3c8598a7c2f9bcc .circleci/config.yml
-  our    100644 6d44d618aabcce04c60344f2274dec5b0c2a1f68 .circleci/config.yml
-  their  100644 52762da0692252aa08443dede5326a9d23d8278f .circleci/config.yml
-@@ -513,10 +513,60 @@
-   electron-gn-linux-x64-debug-fyi:
-     environment:
-       DISPLAY: ':99.0'
-+<<<<<<< .our
-       GN_CONFIG: //electron/build/args/debug.gn
-       RUN_TESTS: false
-     <<: *gn-linux-build-machine
-     <<: *gn-build-steps
-+=======
-+    docker:
-+      - image: electronbuilds/electron:0.0.8
-+    resource_class: 2xlarge
-+    steps:
-+      - run:
-+          name: Setup depot tools
-+          command: |
-+            git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
-+            echo 'export PATH=$PATH:`pwd`/depot_tools' >> $BASH_ENV
-+      - checkout:
-+          path: src/electron
-+      - restore_cache:
-+          paths:
-+            - ~/.gclient-cache
-+          keys:
-+            - v1-gclient-cache-{{ checksum "src/electron/DEPS" }}
-+            - v1-gclient-cache-
-+      - run:
-+          name: Gclient sync
-+          command: |
-+            gclient config \
-+              --name "src/electron" \
-+              --unmanaged \
-+              --cache-dir "$HOME/.gclient-cache" \
-+              "$CIRCLE_REPOSITORY_URL"
-+
-+            gclient sync --with_branch_heads --with_tags
-+      - save_cache:
-+          paths:
-+            - ~/.gclient-cache
-+          key: v1-gclient-cache-{{ checksum "src/electron/DEPS" }}
-+      - run:
-+          name: GN gen
-+          command: |
-+            cd src
-+            echo 'export SCCACHE_WRAPPER="'`pwd`'/libchromiumcontent/tools/sccache/aad2120/linux/sccache"' >> $BASH_ENV
-+            echo 'export CHROMIUM_BUILDTOOLS_PATH=`pwd`/buildtools' >> $BASH_ENV
-+            source $BASH_ENV
-+            gn gen out/Default --args='import("//electron/build/args/debug.gn") sccache_wrapper="'"$SCCACHE_WRAPPER"'"'
-+      - run:
-+          name: Ninja build
-+          command: |
-+            cd src
-+            ninja -C out/Default electron:electron_app
-+      - run:
-+          name: Check sccache stats after build
-+          command: $SCCACHE_WRAPPER -s
-+>>>>>>> .their
- 
-   electron-gn-linux-x64-testing-fyi:
-     environment:
diff --git a/app/test/fixtures/merge-parser/electron/merge-gn-circleci-mac-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-gn-circleci-mac-into-master.txt
deleted file mode 100644
index 963a1ef3bda..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-gn-circleci-mac-into-master.txt
+++ /dev/null
@@ -1,209 +0,0 @@
-changed in both
-  base   100644 a986db8904e013bf204a16f9918530d7f17011b9 .circleci/config.yml
-  our    100644 6d44d618aabcce04c60344f2274dec5b0c2a1f68 .circleci/config.yml
-  their  100644 fdd476a10da1b97334699135d695b20d50b9d77a .circleci/config.yml
-@@ -154,15 +154,28 @@
-         command: |
-           git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
-           echo 'export PATH="$PATH:'"$PWD"'/depot_tools"' >> $BASH_ENV
-+<<<<<<< .our
-           echo 'export GIT_CACHE_PATH="$HOME/.gclient-cache"' >> $BASH_ENV
-+=======
-+    - run:
-+        name: Install Node.js 10 on MacOS
-+        command: |
-+          if [ "$INSTALL_MACOS_NODE" == "true" ]; then
-+            echo 'Installing Node.js 10 for MacOS'
-+            brew update
-+            brew install node@10
-+            brew install gnu-tar
-+            echo 'export PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH"' >> $BASH_ENV
-+          fi
-+>>>>>>> .their
-     - checkout:
-         path: src/electron
-     - restore_cache:
-         paths:
-           - ~/.gclient-cache
-         keys:
--          - v1-gclient-cache-{{ arch }}-{{ checksum "src/electron/DEPS" }}
--          - v1-gclient-cache-{{ arch }}-
-+          - v3-gclient-cache-{{ arch }}-{{ checksum "src/electron/DEPS" }}
-+          - v3-gclient-cache-{{ arch }}-
-     - run:
-         name: Gclient sync
-         command: |
-@@ -176,12 +189,17 @@
-     - save_cache:
-         paths:
-           - ~/.gclient-cache
--        key: v1-gclient-cache-{{ arch }}-{{ checksum "src/electron/DEPS" }}
-+        key: v3-gclient-cache-{{ arch }}-{{ checksum "src/electron/DEPS" }}
-     - run:
-         name: GN gen
-         command: |
-           cd src
-+<<<<<<< .our
-           SCCACHE_PATH="$PWD/electron/external_binaries/sccache"
-+=======
-+          SCCACHE_PATH="$PWD/libchromiumcontent/script/sccache"
-+          echo 'export SCCACHE_WRAPPER="'"$SCCACHE_PATH"'"' >> $BASH_ENV
-+>>>>>>> .their
-           echo 'export CHROMIUM_BUILDTOOLS_PATH="'"$PWD"'/buildtools"' >> $BASH_ENV
-           echo 'export SCCACHE_WRAPPER="'"$SCCACHE_PATH"'"'            >> $BASH_ENV
-           source $BASH_ENV
-@@ -230,7 +248,9 @@
-     - run:
-         name: Setup for headless testing
-         command: |
--          sh -e /etc/init.d/xvfb start
-+          if [ "$(uname)" = "Linux" ]; then
-+            sh -e /etc/init.d/xvfb start
-+          fi
-     - run:
-         name: Verify ffmpeg
-         command: |
-@@ -295,6 +315,7 @@
-         name: GN gen
-         command: |
-           cd src
-+<<<<<<< .our
-           SCCACHE_PATH="$PWD/libchromiumcontent/tools/sccache/aad2120/mac/sccache"
-           echo 'export SCCACHE_WRAPPER="'"$SCCACHE_PATH"'"' >> $BASH_ENV
-           echo 'export CHROMIUM_BUILDTOOLS_PATH="'"$PWD"'/buildtools"' >> $BASH_ENV
-@@ -327,6 +348,17 @@
-             (cd electron/spec && npm install)
-             ./out/Default/Electron.app/Contents/MacOS/Electron electron/spec --ci --enable-logging
-           fi
-+=======
-+          ninja -C out/Default electron/build/node:headers
-+          export npm_config_nodedir="$PWD/out/Default/gen/node_headers"
-+          (cd electron/spec && npm install)
-+          if [ "$(uname)" = "Darwin" ]; then
-+            ELECTRON_EXE="./out/Default/Electron.app/Contents/MacOS/Electron"
-+          else
-+            ELECTRON_EXE="./out/Default/electron"
-+          fi
-+          "$ELECTRON_EXE" electron/spec --ci --enable-logging
-+>>>>>>> .their
-     - store_test_results:
-         path: src/junit
-     - store_artifacts:
-@@ -603,6 +635,7 @@
-     <<: *gn-linux-build-machine
-     <<: *gn-build-steps
- 
-+<<<<<<< .our
-   electron-gn-linux-arm64-testing-fyi:
-     environment:
-       GN_CONFIG: //electron/build/args/testing.gn
-@@ -668,35 +701,57 @@
-       GN_EXTRA_ARGS: 'is_mas_build = true'
-     <<: *gn-mac-build-machine
-     <<: *gn-mac-build-steps
-+=======
-+  electron-gn-osx-debug-fyi:
-+    environment:
-+      GN_CONFIG: //electron/build/args/debug.gn
-+      INSTALL_MACOS_NODE: true
-+    macos:
-+      xcode: "8.3.3"
-+    <<: *gn-build-steps
-+
-+  electron-gn-osx-release-fyi:
-+    environment:
-+      GN_CONFIG: //electron/build/args/release.gn
-+      INSTALL_MACOS_NODE: true
-+    macos:
-+      xcode: "8.3.3"
-+    <<: *gn-build-steps
-+>>>>>>> .their
- 
- workflows:
-   version: 2
--  build-arm:
--    jobs:
--      - electron-linux-arm
--      - electron-linux-arm-test:
--          requires:
--            - electron-linux-arm
--  build-arm64:
--    jobs:
--      - electron-linux-arm64
--      - electron-linux-arm64-test:
--          requires:
--            - electron-linux-arm64
--  build-ia32:
--    jobs:
--      - electron-linux-ia32
--  build-x64:
--    jobs:
--      - electron-linux-x64
--  build-osx-x64:
--    jobs:
--      - electron-osx-x64
--  build-mas-x64:
--    jobs:
--      - electron-mas-x64
--  build-gn-linux:
-+#  build-arm:
-+#    jobs:
-+#      - electron-linux-arm
-+#      - electron-linux-arm-test:
-+#          requires:
-+#            - electron-linux-arm
-+#  build-arm64:
-+#    jobs:
-+#      - electron-linux-arm64
-+#      - electron-linux-arm64-test:
-+#          requires:
-+#            - electron-linux-arm64
-+#  build-ia32:
-+#    jobs:
-+#      - electron-linux-ia32
-+#  build-x64:
-+#    jobs:
-+#      - electron-linux-x64
-+#  build-osx-x64:
-+#    jobs:
-+#      - electron-osx-x64
-+#  build-mas-x64:
-+#    jobs:
-+#      - electron-mas-x64
-+#  build-gn-linux:
-+#    jobs:
-+#      - electron-gn-linux-debug-fyi
-+#      - electron-gn-linux-release-fyi
-+  build-gn-osx:
-     jobs:
-+<<<<<<< .our
-       - electron-gn-linux-x64-debug-fyi
-       - electron-gn-linux-x64-testing-fyi
-       - electron-gn-linux-ia32-debug-fyi
-@@ -711,6 +766,10 @@
-       - electron-gn-mas-testing-fyi
-       - electron-gn-osx-debug-fyi
-       - electron-gn-osx-testing-fyi
-+=======
-+      - electron-gn-osx-debug-fyi
-+      - electron-gn-osx-release-fyi
-+>>>>>>> .their
- 
-   nightly-release-test:
-     triggers:
-changed in both
-  base   100644 98735b8ab0182db210153efe6e8a70a12b4dcfce DEPS
-  our    100644 b3b9d650b27274f4f98f7408319b1e6b35f63abf DEPS
-  their  100644 d3de4868b5be1e4801e750713d90edce341bf487 DEPS
-@@ -2,7 +2,11 @@
-   'chromium_version':
-     '66.0.3359.181',
-   'libchromiumcontent_revision':
-+<<<<<<< .our
-     'c85470a1c379b1c4bedb372c146521bc4be9b75d',
-+=======
-+    'ede7e319801ebe51d437e709939e10956c943059',
-+>>>>>>> .their
-   'node_version':
-     'ece0a06ac8147efb5b5af431c21f312f1884616e',
- 
diff --git a/app/test/fixtures/merge-parser/electron/merge-gn-docs-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-gn-docs-into-master.txt
deleted file mode 100644
index 6abe9f11013..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-gn-docs-into-master.txt
+++ /dev/null
@@ -1,79 +0,0 @@
-changed in both
-  base   100644 a35180458a82b0798e47b0f48d10ec433a698f12 BUILD.gn
-  our    100644 d00c4b1e3d3523641210ff20fda41d76c9eb546c BUILD.gn
-  their  100644 c23b6856ebcb12004d45d87a1f71ad5f3e59b16c BUILD.gn
-@@ -214,7 +214,6 @@
-     "//ppapi/proxy",
-     "//ppapi/shared_impl",
-     "//printing",
--    "//services/device/wake_lock/power_save_blocker",  # TODO: this requires a visibility patch to chromium src
-     "//skia",
-     "//third_party/WebKit/public:blink",
-     "//third_party/boringssl",
-@@ -228,13 +227,19 @@
-     "//v8",
-   ]
- 
-+  # TODO: this requires a visibility patch to chromium src. it would be better
-+  # to use the publicly-available API, which I think is mojo-based. Once
-+  # electron switches to using the public API, we can remove this from the deps
-+  # list and remove the visibility patch from chromium.
-+  deps += [ "//services/device/wake_lock/power_save_blocker" ]
-+
-   include_dirs = [
-     "chromium_src",
-     ".",
-     "$target_gen_dir",
- 
-     # TODO(nornagon): replace usage of SchemeRegistry by an actually exported
--    # API of blink, then delete this include dir.
-+    # API of blink, then remove this from the include_dirs.
-     "//third_party/WebKit/Source",
-   ]
- 
-@@ -653,7 +658,6 @@
-       ]
- 
-       deps += [
--        # TODO: move non-windows specific deps into the non-windows-specific list
-         "//third_party/breakpad:breakpad_handler",
-         "//third_party/breakpad:breakpad_sender",
-         "//ui/native_theme:native_theme_browser",
-@@ -672,9 +676,11 @@
-       configs += [ "//build/config/win:windowed" ]
- 
-       ldflags = [
--        # TODO: these are for win7 compatibility, are there other things we need to do for that?
--        "/DELAYLOAD:API-MS-WIN-CORE-WINRT-L1-1-0.DLL",
--        "/DELAYLOAD:API-MS-WIN-CORE-WINRT-STRING-L1-1-0.DLL",
-+        # Windows 7 doesn't have these DLLs.
-+        # TODO: are there other DLLs we need to list here to be win7
-+        # compatible?
-+        "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
-+        "/DELAYLOAD:api-ms-win-core-winrt-string-l1-1-0.dll",
-       ]
-     }
-     if (is_linux) {
-changed in both
-  base   100644 23b15367a7ebdcb504f1b8ef41f8b27fa2e163d2 build/args/release.gn
-  our    100644 dabe767ecc7d8a5ed5280e89b757625948de032d build/args/release.gn
-  their  100644 d73be55c1b977521e28a9638cc945e6513328e65 build/args/release.gn
-@@ -1,9 +1,15 @@
- import("all.gn")
- is_component_build = false
-+<<<<<<< .our
- is_component_ffmpeg = true
- is_official_build = true
- strip_debug_info = true
-+=======
-+is_official_build = true
-+>>>>>>> .their
- 
--# TODO(nornagon): linking non-CFI code (nodejs) with CFI code fails at runtime.
--# Once we can build nodejs with CFI flags matching Electron's, remove this.
--is_cfi = false
-+# By default, Electron builds ffmpeg with proprietary codecs enabled. In order
-+# to facilitate users who don't want to ship proprietary codecs in ffmpeg, or
-+# who have an LGPL requirement to ship ffmpeg as a dynamically linked library,
-+# we build ffmpeg as a shared library.
-+is_component_ffmpeg = true
diff --git a/app/test/fixtures/merge-parser/electron/merge-gn-release-win-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-gn-release-win-into-master.txt
deleted file mode 100644
index 8e638cbe1cb..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-gn-release-win-into-master.txt
+++ /dev/null
@@ -1,190 +0,0 @@
-changed in both
-  base   100644 8344df40b44680c4943976f0e19517d8e6cf434c BUILD.gn
-  our    100644 d00c4b1e3d3523641210ff20fda41d76c9eb546c BUILD.gn
-  their  100644 67ea611f665634200873304c6cd9977a805933ed BUILD.gn
-@@ -32,6 +32,12 @@
-   enable_desktop_capturer = true
-   enable_run_as_node = true
-   enable_osr = false
-+
-+  is_mas_build = false
-+}
-+
-+if (is_mas_build) {
-+  assert(is_mac, "It doesn't make sense to build a MAS build on a non-mac platform")
- }
- 
- if (is_mas_build) {
-@@ -227,7 +233,53 @@
-     "//ui/views",
-     "//v8",
-   ]
-+<<<<<<< .our
- 
-+=======
-+  if (enable_desktop_capturer) {
-+    deps += [ "//third_party/webrtc/modules/desktop_capture" ]
-+  }
-+  if (enable_pdf) {
-+    deps += [ "//pdf" ]
-+  }
-+  if (is_mac) {
-+    deps += [
-+      "//ui/accelerated_widget_mac",
-+      "//third_party/crashpad/crashpad/client",
-+    ]
-+    include_dirs += [
-+      # NOTE(nornagon): other chromium files use the full path to include
-+      # crashpad; this is just here for compatibility between GN and GYP, so that
-+      # the #includes can be agnostic about where crashpad is vendored.
-+      "//third_party/crashpad",
-+    ]
-+  }
-+  if (is_linux) {
-+    deps += [
-+      "//build/config/linux/gtk",
-+      "//chrome/browser/ui/libgtkui",
-+      "//device/bluetooth",
-+      "//ui/events/devices/x11",
-+      "//ui/events/platform/x11",
-+      "//ui/native_theme",
-+      "//ui/views/controls/webview",
-+      "//ui/wm",
-+    ]
-+    configs += [ ":gio_unix" ]
-+  }
-+  defines = [
-+    # Disable warnings for g_settings_list_schemas.
-+    "GLIB_DISABLE_DEPRECATION_WARNINGS",
-+  ]
-+  if (is_component_build) {
-+    defines += [
-+      # Import V8 symbols from shared library (node.dll / libnode.so)
-+      "USING_V8_SHARED",
-+      "USING_V8_PLATFORM_SHARED",
-+      "USING_V8_BASE_SHARED",
-+    ]
-+  }
-+>>>>>>> .their
-   include_dirs = [
-     "chromium_src",
-     ".",
-@@ -385,12 +437,47 @@
-   }
- }
- 
-+<<<<<<< .our
- electron_paks("packed_resources") {
-   if (is_mac) {
-     output_dir = "$root_gen_dir/electron_repack"
-     copy_data_to_bundle = true
-   } else {
-     output_dir = root_out_dir
-+=======
-+
-+  if (is_mas_build) {
-+    deps -= [ "//third_party/crashpad/crashpad/client" ]
-+  }
-+
-+  if (is_mac && !is_mas_build) {
-+    libs = [
-+      "Squirrel.framework",
-+      "ReactiveCocoa.framework",
-+      "Mantle.framework",
-+    ]
-+    cflags_objcc = [
-+      "-F", rebase_path("external_binaries", root_build_dir)
-+    ]
-+    # ReactiveCocoa which is used by Squirrel requires using __weak.
-+    cflags_objcc += [ "-fobjc-weak" ]
-+  }
-+  if (is_linux) {
-+    sources += filenames_gypi.lib_sources_linux
-+    sources += filenames_gypi.lib_sources_nss
-+  }
-+  if (is_win) {
-+    sources += filenames_gypi.lib_sources_win
-+>>>>>>> .their
-+  }
-+  if (is_mas_build) {
-+    sources += [ "atom/browser/api/atom_api_app_mas.mm" ]
-+    sources -= [
-+      "atom/browser/auto_updater_mac.mm",
-+      "atom/common/crash_reporter/crash_reporter_mac.h",
-+      "atom/common/crash_reporter/crash_reporter_mac.mm",
-+    ]
-+    defines += [ "MAS_BUILD" ]
-   }
- }
- 
-@@ -474,6 +561,12 @@
-       ":electron_lib",
-     ]
-     deps = [
-+<<<<<<< .our
-+=======
-+      "//base",
-+      "//base:i18n",
-+      ":electron_framework_libraries",
-+>>>>>>> .their
-       ":electron_framework_resources",
-       ":electron_framework_libraries",
-       ":electron_xibs",
-@@ -533,9 +626,15 @@
-     ]
-     if (!is_mas_build) {
-       sources += [
-+<<<<<<< .our
-         "external_binaries/Mantle.framework",
-         "external_binaries/ReactiveCocoa.framework",
-         "external_binaries/Squirrel.framework",
-+=======
-+        "external_binaries/Squirrel.framework",
-+        "external_binaries/ReactiveCocoa.framework",
-+        "external_binaries/Mantle.framework",
-+>>>>>>> .their
-       ]
-     }
-     outputs = [
-@@ -553,11 +652,26 @@
-     include_dirs = [ "." ]
-     libs = [ "AppKit.framework" ]
-     info_plist = "atom/app/resources/mac/loginhelper-Info.plist"
-+<<<<<<< .our
-     extra_substitutions =
-         [ "ATOM_BUNDLE_ID=$electron_mac_bundle_id.loginhelper" ]
-   }
- 
-   bundle_data("electron_login_helper_app") {
-+=======
-+    extra_substitutions = [
-+      "ATOM_BUNDLE_ID=$electron_mac_bundle_id.loginhelper"
-+    ]
-+  }
-+
-+  bundle_data("electron_login_helper_app") {
-+    public_deps = [ ":electron_login_helper" ]
-+    sources = [ "$root_out_dir/$electron_login_helper_name.app" ]
-+    outputs = [ "{{bundle_contents_dir}}/Library/LoginItems" ]
-+  }
-+
-+  bundle_data("electron_app_resources") {
-+>>>>>>> .their
-     public_deps = [
-       ":electron_login_helper",
-     ]
-@@ -661,6 +775,8 @@
-         "//ui/views/controls/webview",
-         "//ui/wm",
-         "//ui/wm/public",
-+        "//content/public/app:both",
-+        "//content",
-       ]
- 
-       libs = [
-removed in local
-  base   100644 e231e98c5f75f021af9b71d6c5587b7c5349f922 build/node/BUILD.gn
-  their  100644 63e090f210db9f62755ae1e086eaa6d44de764ba build/node/BUILD.gn
-removed in local
-  base   100644 d1e68131dee7972b3dee5be8868ef82a4de8734d build/node/node_override.gypi
-  their  100644 b2480a91ed37eed763903f8dfaa368204ed78285 build/node/node_override.gypi
diff --git a/app/test/fixtures/merge-parser/electron/merge-gn-win-link-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-gn-win-link-into-master.txt
deleted file mode 100644
index adae36c6a59..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-gn-win-link-into-master.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-changed in both
-  base   100644 7924a3df59a30ca33bd03d84022f277bc7c1032c BUILD.gn
-  our    100644 d00c4b1e3d3523641210ff20fda41d76c9eb546c BUILD.gn
-  their  100644 1e1f73e015ab8b326f05816317ad9f4589ec6ccb BUILD.gn
-@@ -329,6 +329,18 @@
-       "//ui/wm",
-     ]
-     configs += [ ":gio_unix" ]
-+<<<<<<< .our
-+=======
-+  }
-+  if (is_win) {
-+    libs = [ "dwmapi.lib" ]
-+  }
-+  defines = [
-+    # Disable warnings for g_settings_list_schemas.
-+    "GLIB_DISABLE_DEPRECATION_WARNINGS",
-+  ]
-+  if (is_component_build) {
-+>>>>>>> .their
-     defines += [
-       # Disable warnings for g_settings_list_schemas.
-       "GLIB_DISABLE_DEPRECATION_WARNINGS",
diff --git a/app/test/fixtures/merge-parser/electron/merge-groundwater-build-zip-1-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-groundwater-build-zip-1-into-master.txt
deleted file mode 100644
index 8958d91ed68..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-groundwater-build-zip-1-into-master.txt
+++ /dev/null
@@ -1,369 +0,0 @@
-changed in both
-  base   100644 d66102fb95300bf4c1c5728efd2382c9e8fad313 .circleci/config.yml
-  our    100644 6d44d618aabcce04c60344f2274dec5b0c2a1f68 .circleci/config.yml
-  their  100644 c1be5e74032fce0cd9f9caf64fde54198fbd229b .circleci/config.yml
-@@ -155,14 +155,24 @@
-           git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
-           echo 'export PATH="$PATH:'"$PWD"'/depot_tools"' >> $BASH_ENV
-           echo 'export GIT_CACHE_PATH="$HOME/.gclient-cache"' >> $BASH_ENV
-+    - run:
-+        name: Install Node.js 10 on MacOS
-+        command: |
-+          if [ "$INSTALL_MACOS_NODE" == "true" ]; then
-+            echo 'Installing Node.js 10 for MacOS'
-+            brew update
-+            brew install node@10
-+            brew install gnu-tar
-+            echo 'export PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH"' >> $BASH_ENV
-+          fi
-     - checkout:
-         path: src/electron
-     - restore_cache:
-         paths:
-           - ~/.gclient-cache
-         keys:
--          - v1-gclient-cache-{{ arch }}-{{ checksum "src/electron/DEPS" }}
--          - v1-gclient-cache-{{ arch }}-
-+          - v3-gclient-cache-{{ arch }}-{{ checksum "src/electron/DEPS" }}
-+          - v3-gclient-cache-{{ arch }}-
-     - run:
-         name: Gclient sync
-         command: |
-@@ -176,12 +186,21 @@
-     - save_cache:
-         paths:
-           - ~/.gclient-cache
--        key: v1-gclient-cache-{{ arch }}-{{ checksum "src/electron/DEPS" }}
-+        key: v3-gclient-cache-{{ arch }}-{{ checksum "src/electron/DEPS" }}
-     - run:
-         name: GN gen
-         command: |
-           cd src
-+<<<<<<< .our
-           SCCACHE_PATH="$PWD/electron/external_binaries/sccache"
-+=======
-+          if [ "$(uname)" = "Linux" ]; then
-+            SCCACHE_PATH="$PWD/libchromiumcontent/tools/sccache/aad2120/linux/sccache"
-+          else
-+            SCCACHE_PATH="$PWD/libchromiumcontent/tools/sccache/aad2120/mac/sccache"
-+          fi
-+          echo 'export SCCACHE_WRAPPER="'"$SCCACHE_PATH"'"' >> $BASH_ENV
-+>>>>>>> .their
-           echo 'export CHROMIUM_BUILDTOOLS_PATH="'"$PWD"'/buildtools"' >> $BASH_ENV
-           echo 'export SCCACHE_WRAPPER="'"$SCCACHE_PATH"'"'            >> $BASH_ENV
-           source $BASH_ENV
-@@ -192,6 +211,7 @@
-           cd src
-           ninja -C out/Default electron:electron_app
-     - run:
-+<<<<<<< .our
-         name: ffmpeg GN gen
-         command: |
-           if [ "$BUILD_FFMPEG" == "true" ]; then
-@@ -220,6 +240,8 @@
-             ninja -C out/native_mksnapshot v8:mksnapshot
-           fi
-     - run:
-+=======
-+>>>>>>> .their
-         name: Build dist.zip
-         command: |
-           cd src
-@@ -230,7 +252,9 @@
-     - run:
-         name: Setup for headless testing
-         command: |
--          sh -e /etc/init.d/xvfb start
-+          if [ "$(uname)" = "Linux" ]; then
-+            sh -e /etc/init.d/xvfb start
-+          fi
-     - run:
-         name: Verify ffmpeg
-         command: |
-@@ -249,7 +273,11 @@
-             ninja -C out/Default third_party/electron_node:headers
-             export npm_config_nodedir="$PWD/out/Default/gen/node_headers"
-             (cd electron/spec && npm install)
--            python electron/script/lib/dbus_mock.py ./out/Default/electron electron/spec --ci --enable-logging
-+            if [ "$(uname)" = "Darwin" ]; then
-+              ./out/Default/Electron.app/Contents/MacOS/Electron electron/spec --ci --enable-logging
-+            else
-+              python electron/script/lib/dbus_mock.py ./out/Default/electron electron/spec --ci --enable-logging
-+            fi
-           fi
-     - store_test_results:
-         path: src/junit
-@@ -257,6 +285,7 @@
-         path: src/junit
-     - store_artifacts:
-         path: src/out/Default/dist.zip
-+<<<<<<< .our
-     - store_artifacts:
-         path: src/out/ffmpeg/libffmpeg.dylib
-     - store_artifacts:
-@@ -343,6 +372,8 @@
-   macos:
-     xcode: "8.3.3"
-   resource_class: large
-+=======
-+>>>>>>> .their
- 
- build-defaults: &build-defaults
-   docker:
-@@ -477,6 +508,7 @@
-       INSTALL_MACOS_NODE: true
-     macos:
-       xcode: "8.3.3"
-+    resource_class: xlarge
-     <<: *build-steps
- 
-   electron-osx-x64-release-nightly:
-@@ -497,6 +529,7 @@
-       INSTALL_MACOS_NODE: true
-     macos:
-       xcode: "8.3.3"
-+    resource_class: 2xlarge
-     <<: *build-steps
- 
-   electron-mas-x64-release-nightly:
-@@ -624,16 +657,29 @@
-     <<: *gn-linux-build-machine
-     <<: *gn-build-steps
- 
-+<<<<<<< .our
-   electron-gn-osx-release-fyi:
-     environment:
-       GN_CONFIG: //electron/build/args/release.gn
-       RUN_TESTS: true
-     <<: *gn-mac-build-machine
-     <<: *gn-mac-build-steps
-+=======
-+  electron-gn-osx-debug-fyi:
-+    environment:
-+      GN_CONFIG: //electron/build/args/debug.gn
-+      INSTALL_MACOS_NODE: true
-+      RUN_TESTS: false
-+    macos:
-+      xcode: "8.3.3"
-+    resource_class: large
-+    <<: *gn-build-steps
-+>>>>>>> .their
- 
-   electron-gn-osx-testing-fyi:
-     environment:
-       GN_CONFIG: //electron/build/args/testing.gn
-+<<<<<<< .our
-       RUN_TESTS: true
-     <<: *gn-mac-build-machine
-     <<: *gn-mac-build-steps
-@@ -652,10 +698,30 @@
-       GN_EXTRA_ARGS: 'is_mas_build = true'
-     <<: *gn-mac-build-machine
-     <<: *gn-mac-build-steps
-+=======
-+      INSTALL_MACOS_NODE: true
-+      RUN_TESTS: true
-+    macos:
-+      xcode: "8.3.3"
-+    resource_class: large
-+    <<: *gn-build-steps
-+
-+  electron-gn-mas-debug-fyi:
-+    environment:
-+      GN_CONFIG: //electron/build/args/debug.gn
-+      INSTALL_MACOS_NODE: true
-+      RUN_TESTS: false
-+      GN_EXTRA_ARGS: 'is_mas_build = true'
-+    macos:
-+      xcode: "8.3.3"
-+    resource_class: large
-+    <<: *gn-build-steps
-+>>>>>>> .their
- 
-   electron-gn-mas-testing-fyi:
-     environment:
-       GN_CONFIG: //electron/build/args/testing.gn
-+<<<<<<< .our
-       RUN_TESTS: true
-       GN_EXTRA_ARGS: 'is_mas_build = true'
-     <<: *gn-mac-build-machine
-@@ -668,6 +734,15 @@
-       GN_EXTRA_ARGS: 'is_mas_build = true'
-     <<: *gn-mac-build-machine
-     <<: *gn-mac-build-steps
-+=======
-+      INSTALL_MACOS_NODE: true
-+      RUN_TESTS: true
-+      GN_EXTRA_ARGS: 'is_mas_build = true'
-+    macos:
-+      xcode: "8.3.3"
-+    resource_class: large
-+    <<: *gn-build-steps
-+>>>>>>> .their
- 
- workflows:
-   version: 2
-@@ -705,12 +780,22 @@
-       - electron-gn-linux-arm-testing-fyi
-       - electron-gn-linux-arm64-debug-fyi
-       - electron-gn-linux-arm64-testing-fyi
-+<<<<<<< .our
-   build-gn-mac:
-     jobs:
-       - electron-gn-mas-debug-fyi
-       - electron-gn-mas-testing-fyi
-       - electron-gn-osx-debug-fyi
-       - electron-gn-osx-testing-fyi
-+=======
-+      - electron-gn-linux-x64-release-fyi
-+  build-gn-mac:
-+    jobs:
-+      - electron-gn-osx-debug-fyi
-+      - electron-gn-osx-testing-fyi
-+      - electron-gn-mas-debug-fyi
-+      - electron-gn-mas-testing-fyi
-+>>>>>>> .their
- 
-   nightly-release-test:
-     triggers:
-changed in both
-  base   100644 932cfd540e24e8c139d2c397a3aad1a78e2d878f BUILD.gn
-  our    100644 d00c4b1e3d3523641210ff20fda41d76c9eb546c BUILD.gn
-  their  100644 1b1e16fc11d7ac5697118fb972a1dba7f481f25d BUILD.gn
-@@ -636,10 +636,13 @@
-       data += [ "$root_out_dir/locales/$locale.pak" ]
-     }
- 
-+<<<<<<< .our
-     if (!is_mac) {
-       data += [ "$root_out_dir/resources" ]
-     }
- 
-+=======
-+>>>>>>> .their
-     public_deps = [
-       "//tools/v8_context_snapshot:v8_context_snapshot",
-     ]
-@@ -685,6 +688,7 @@
-   }
- }
- 
-+<<<<<<< .our
- group("electron_tests") {
-   testonly = true
- 
-@@ -762,6 +766,8 @@
-     "//content/test:content_browsertests",
-   ]
- }
-+=======
-+>>>>>>> .their
- 
- template("dist_zip") {
-   _runtime_deps_target = "${target_name}__deps"
-@@ -779,7 +785,11 @@
-     script = "//electron/build/zip.py"
-     deps = [ ":$_runtime_deps_target" ]
-     forward_variables_from(invoker, [ "outputs" ])
-+<<<<<<< .our
-     args =  rebase_path(outputs + [ _runtime_deps_file ], root_build_dir) + [target_cpu, target_os]
-+=======
-+    args = rebase_path(outputs + [ _runtime_deps_file ], root_build_dir)
-+>>>>>>> .their
-   }
- }
- 
-@@ -804,13 +814,23 @@
-   args = rebase_path(outputs, root_build_dir) + [ electron_version ]
- }
- 
-+<<<<<<< .our
- 
- dist_zip("electron_dist_zip") {
-+=======
-+dist_zip("electron_dist_zip") {
-+  # Shortcut to error early if we try to package a component build
-+  assert(is_component_build == false, "Cannot package a component build")
-+
-+>>>>>>> .their
-   data_deps = [ ":electron_app", ":licenses", ":electron_version" ]
-   outputs = [ "$root_build_dir/dist.zip" ]
- }
- 
-+<<<<<<< .our
- 
-+=======
-+>>>>>>> .their
- group("electron") {
-   deps = [ ":electron_app" ]
- }
-changed in both
-  base   100644 050d6fc2ad0a5ec061c4d1be67914a71e572ab6b appveyor-gn.yml
-  our    100644 282c4952dfcbdc90df13c3935cc4a8ddd82d91e7 appveyor-gn.yml
-  their  100644 afdcda0a9eac58469fdb81db1cb264a9de9bee2f appveyor-gn.yml
-@@ -31,8 +31,11 @@
-   - cd src
-   - gn gen out/Default "--args=import(\"//electron/build/args/%gn_args%.gn\")"
-   - ninja -C out/Default electron:electron_app
-+<<<<<<< .our
-   - gn gen out/ffmpeg "--args=import(\"//electron/build/args/ffmpeg.gn\")"
-   - ninja -C out/ffmpeg third_party/ffmpeg
-+=======
-+>>>>>>> .their
-   - ninja -C out/Default electron:electron_dist_zip
- test_script:
-   - ninja -C out/Default third_party/electron_node:headers
-added in both
-  our    100644 150656e2c2be317b78821a55e6e979ad09594c01 build/zip.py
-  their  100644 d5036dcc24e3dfa6466ed76ee26c9376931e1988 build/zip.py
-@@ -1,5 +1,6 @@
- #!/usr/bin/env python
- import os
-+<<<<<<< .our
- import subprocess
- import sys
- import zipfile
-@@ -48,6 +49,17 @@
-       for dep in dist_files:
-         if target_os == 'linux':
-             strip_binaries(target_cpu, dep)
-+=======
-+import sys
-+import zipfile
-+
-+def main(argv):
-+  dist_zip, runtime_deps = argv
-+  with zipfile.ZipFile(dist_zip, 'w', allowZip64=True) as z:
-+    with open(runtime_deps) as f:
-+      for dep in f.readlines():
-+        dep = dep.strip()
-+>>>>>>> .their
-         if os.path.isdir(dep):
-           for root, dirs, files in os.walk(dep):
-             for file in files:
-changed in both
-  base   100644 eafed53616db1cc4babd59f3b72f3cc1e0c06f2e vsts-gn.yml
-  our    100644 3c9985b16c0414cfd9bc6c6648d6411a969fc6ef vsts-gn.yml
-  their  100644 6759b6b731f295e7d4044d587eded781a84e57e2 vsts-gn.yml
-@@ -31,13 +31,21 @@
-   - bash: |
-       cd src
-       export CHROMIUM_BUILDTOOLS_PATH=`pwd`/buildtools
-+<<<<<<< .our
-       export SCCACHE_WRAPPER="`pwd`/electron/external_binaries/sccache"
-+=======
-+      export SCCACHE_WRAPPER="`pwd`/libchromiumcontent/tools/sccache/aad2120/mac/sccache"
-+>>>>>>> .their
-       export SCCACHE_HELPER="`pwd`/libchromiumcontent/script/sccache"
-       "$SCCACHE_HELPER" --start-server --azure_container "$(SCCACHE_AZURE_BLOB_CONTAINER)" --azure_connection "$(SCCACHE_AZURE_CONNECTION_STRING)"
-       echo "##vso[task.setvariable variable=SCCACHE_WRAPPER]$SCCACHE_WRAPPER"
-       echo "##vso[task.setvariable variable=CHROMIUM_BUILDTOOLS_PATH]`pwd`/buildtools"
-+<<<<<<< .our
-       echo "GN gen for: $GN_CONFIG"
-       gn gen out/Default --args='import("'$GN_CONFIG'") cc_wrapper="'"$SCCACHE_WRAPPER"'"'
-+=======
-+      gn gen out/Default --args='import("'$GN_CONFIG'") cc_wrapper="'"$SCCACHE_PATH"'"'
-+>>>>>>> .their
-     name: GN_gen
- 
-   - bash: |
diff --git a/app/test/fixtures/merge-parser/electron/merge-gyp-refactor-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-gyp-refactor-into-master.txt
deleted file mode 100644
index baf4f0dd2df..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-gyp-refactor-into-master.txt
+++ /dev/null
@@ -1,609 +0,0 @@
-changed in both
-  base   100644 62dfef265ea8b378ba08e76b79ae7efba8773233 electron.gyp
-  our    100644 944ddab2a3fd879044e31677e4bac2843fffbdee electron.gyp
-  their  100644 69bd1ab502943a316241d93537e2089ded9cd5d2 electron.gyp
-@@ -288,6 +288,8 @@
-       ],
-       'sources': [
-         '<@(lib_sources)',
-+        '<@(native_mate_files)',
-+        '<(SHARED_INTERMEDIATE_DIR)/atom_natives.h',
-       ],
-       'include_dirs': [
-         '.',
-@@ -388,6 +390,16 @@
-             'vendor/breakpad/breakpad.gyp:breakpad_sender',
-           ],
-         }],  # OS=="win"
-+        ['OS=="mac"', {
-+          'sources': [
-+            '<@(lib_sources_mac)',
-+          ],
-+        }],
-+        ['OS!="mac"', {
-+          'sources': [
-+            '<@(lib_sources_views)',
-+          ],
-+        }],
-         ['OS=="mac" and mas_build==0', {
-           'dependencies': [
-             'vendor/crashpad/client/client.gyp:crashpad_client',
-changed in both
-  base   100644 44dcc015d58abeab12e4db6124f9c0798ecb539a filenames.gypi
-  our    100644 f57860558f06b7e5d8a50f48cfc7e53044df0bc6 filenames.gypi
-  their  100644 11c4ced9019f518211a6d11b969c13e1613f25fc filenames.gypi
-@@ -111,7 +111,6 @@
-       'atom/app/atom_content_client.h',
-       'atom/app/atom_main_delegate.cc',
-       'atom/app/atom_main_delegate.h',
--      'atom/app/atom_main_delegate_mac.mm',
-       'atom/app/command_line_args.cc',
-       'atom/app/command_line_args.h',
-       'atom/app/uv_task_runner.cc',
-@@ -136,10 +135,6 @@
-       'atom/browser/api/atom_api_in_app_purchase.h',
-       'atom/browser/api/atom_api_menu.cc',
-       'atom/browser/api/atom_api_menu.h',
--      'atom/browser/api/atom_api_menu_mac.h',
--      'atom/browser/api/atom_api_menu_mac.mm',
--      'atom/browser/api/atom_api_menu_views.cc',
--      'atom/browser/api/atom_api_menu_views.h',
-       'atom/browser/api/atom_api_net.cc',
-       'atom/browser/api/atom_api_net.h',
-       'atom/browser/api/atom_api_net_log.cc',
-@@ -162,8 +157,6 @@
-       'atom/browser/api/atom_api_session.h',
-       'atom/browser/api/atom_api_system_preferences.cc',
-       'atom/browser/api/atom_api_system_preferences.h',
--      'atom/browser/api/atom_api_system_preferences_mac.mm',
--      'atom/browser/api/atom_api_system_preferences_win.cc',
-       'atom/browser/api/atom_api_top_level_window.cc',
-       'atom/browser/api/atom_api_top_level_window.h',
-       'atom/browser/api/atom_api_tray.cc',
-@@ -174,16 +167,17 @@
-       'atom/browser/api/atom_api_view.h',
-       'atom/browser/api/atom_api_web_contents.cc',
-       'atom/browser/api/atom_api_web_contents.h',
-+<<<<<<< .our
-       'atom/browser/api/atom_api_web_contents_mac.mm',
-       'atom/browser/api/atom_api_web_contents_view.cc',
-       'atom/browser/api/atom_api_web_contents_view.h',
-+=======
-+>>>>>>> .their
-       'atom/browser/api/atom_api_web_request.cc',
-       'atom/browser/api/atom_api_web_request.h',
-       'atom/browser/api/atom_api_web_view_manager.cc',
-       'atom/browser/api/atom_api_browser_window.cc',
-       'atom/browser/api/atom_api_browser_window.h',
--      'atom/browser/api/atom_api_browser_window_mac.mm',
--      'atom/browser/api/atom_api_browser_window_views.cc',
-       'atom/browser/api/event.cc',
-       'atom/browser/api/event.h',
-       'atom/browser/api/event_emitter.cc',
-@@ -198,7 +192,11 @@
-       'atom/browser/api/save_page_handler.h',
-       'atom/browser/auto_updater.cc',
-       'atom/browser/auto_updater.h',
-+<<<<<<< .our
-       'atom/browser/auto_updater_mac.mm',
-+=======
-+      'atom/browser/atom_access_token_store.h',
-+>>>>>>> .their
-       'atom/browser/atom_blob_reader.cc',
-       'atom/browser/atom_blob_reader.h',
-       'atom/browser/atom_browser_client.cc',
-@@ -209,8 +207,6 @@
-       'atom/browser/atom_download_manager_delegate.h',
-       'atom/browser/atom_browser_main_parts.cc',
-       'atom/browser/atom_browser_main_parts.h',
--      'atom/browser/atom_browser_main_parts_mac.mm',
--      'atom/browser/atom_browser_main_parts_posix.cc',
-       'atom/browser/atom_javascript_dialog_manager.cc',
-       'atom/browser/atom_javascript_dialog_manager.h',
-       'atom/browser/atom_permission_manager.cc',
-@@ -227,14 +223,9 @@
-       'atom/browser/bridge_task_runner.h',
-       'atom/browser/browser.cc',
-       'atom/browser/browser.h',
--      'atom/browser/browser_linux.cc',
--      'atom/browser/browser_mac.mm',
--      'atom/browser/browser_win.cc',
-       'atom/browser/browser_observer.h',
-       'atom/browser/child_web_contents_tracker.cc',
-       'atom/browser/child_web_contents_tracker.h',
--      'atom/browser/common_web_contents_delegate_mac.mm',
--      'atom/browser/common_web_contents_delegate_views.cc',
-       'atom/browser/common_web_contents_delegate.cc',
-       'atom/browser/common_web_contents_delegate.h',
-       'atom/browser/javascript_environment.cc',
-@@ -242,37 +233,14 @@
-       'atom/browser/lib/bluetooth_chooser.cc',
-       'atom/browser/lib/bluetooth_chooser.h',
-       'atom/browser/lib/power_observer.h',
--      'atom/browser/lib/power_observer_linux.h',
--      'atom/browser/lib/power_observer_linux.cc',
-       'atom/browser/loader/layered_resource_handler.cc',
-       'atom/browser/loader/layered_resource_handler.h',
-       'atom/browser/login_handler.cc',
-       'atom/browser/login_handler.h',
--      'atom/browser/mac/atom_application.h',
--      'atom/browser/mac/atom_application.mm',
--      'atom/browser/mac/atom_application_delegate.h',
--      'atom/browser/mac/atom_application_delegate.mm',
--      'atom/browser/mac/dict_util.h',
--      'atom/browser/mac/dict_util.mm',
--      'atom/browser/mac/in_app_purchase.h',
--      'atom/browser/mac/in_app_purchase.mm',
--      'atom/browser/mac/in_app_purchase_observer.h',
--      'atom/browser/mac/in_app_purchase_observer.mm',
--      'atom/browser/mac/in_app_purchase_product.h',
--      'atom/browser/mac/in_app_purchase_product.mm',
-       'atom/browser/native_browser_view.cc',
-       'atom/browser/native_browser_view.h',
--      'atom/browser/native_browser_view_mac.h',
--      'atom/browser/native_browser_view_mac.mm',
--      'atom/browser/native_browser_view_views.h',
--      'atom/browser/native_browser_view_views.cc',
-       'atom/browser/native_window.cc',
-       'atom/browser/native_window.h',
--      'atom/browser/native_window_views_win.cc',
--      'atom/browser/native_window_views.cc',
--      'atom/browser/native_window_views.h',
--      'atom/browser/native_window_mac.h',
--      'atom/browser/native_window_mac.mm',
-       'atom/browser/native_window_observer.h',
-       'atom/browser/net/about_protocol_handler.cc',
-       'atom/browser/net/about_protocol_handler.h',
-@@ -306,9 +274,6 @@
-       'atom/browser/net/url_request_stream_job.h',
-       'atom/browser/node_debugger.cc',
-       'atom/browser/node_debugger.h',
--      'atom/browser/relauncher_linux.cc',
--      'atom/browser/relauncher_mac.cc',
--      'atom/browser/relauncher_win.cc',
-       'atom/browser/relauncher.cc',
-       'atom/browser/relauncher.h',
-       'atom/browser/render_process_preferences.cc',
-@@ -321,13 +286,12 @@
-       'atom/browser/special_storage_policy.h',
-       'atom/browser/ui/accelerator_util.cc',
-       'atom/browser/ui/accelerator_util.h',
--      'atom/browser/ui/accelerator_util_mac.mm',
--      'atom/browser/ui/accelerator_util_views.cc',
-       'atom/browser/ui/atom_menu_model.cc',
-       'atom/browser/ui/atom_menu_model.h',
-       'atom/browser/ui/autofill_popup.cc',
-       'atom/browser/ui/autofill_popup.h',
-       'atom/browser/ui/certificate_trust.h',
-+<<<<<<< .our
-       'atom/browser/ui/certificate_trust_mac.mm',
-       'atom/browser/ui/certificate_trust_win.cc',
-       'atom/browser/ui/cocoa/atom_bundle_mover.h',
-@@ -353,67 +317,14 @@
-       'atom/browser/ui/cocoa/touch_bar_forward_declarations.h',
-       'atom/browser/ui/drag_util_mac.mm',
-       'atom/browser/ui/drag_util_views.cc',
-+=======
-+>>>>>>> .their
-       'atom/browser/ui/drag_util.h',
-       'atom/browser/ui/file_dialog.h',
--      'atom/browser/ui/file_dialog_gtk.cc',
--      'atom/browser/ui/file_dialog_mac.mm',
--      'atom/browser/ui/file_dialog_win.cc',
-       'atom/browser/ui/message_box.h',
--      'atom/browser/ui/message_box_gtk.cc',
--      'atom/browser/ui/message_box_mac.mm',
--      'atom/browser/ui/message_box_win.cc',
--      'atom/browser/ui/cocoa/NSColor+Hex.mm',
--      'atom/browser/ui/cocoa/NSColor+Hex.h',
--      'atom/browser/ui/cocoa/NSString+ANSI.mm',
--      'atom/browser/ui/cocoa/NSString+ANSI.h',
-       'atom/browser/ui/tray_icon.cc',
-       'atom/browser/ui/tray_icon.h',
--      'atom/browser/ui/tray_icon_gtk.cc',
--      'atom/browser/ui/tray_icon_gtk.h',
--      'atom/browser/ui/tray_icon_cocoa.h',
--      'atom/browser/ui/tray_icon_cocoa.mm',
-       'atom/browser/ui/tray_icon_observer.h',
--      'atom/browser/ui/tray_icon_win.cc',
--      'atom/browser/ui/views/autofill_popup_view.cc',
--      'atom/browser/ui/views/autofill_popup_view.h',
--      'atom/browser/ui/views/frameless_view.cc',
--      'atom/browser/ui/views/frameless_view.h',
--      'atom/browser/ui/views/global_menu_bar_x11.cc',
--      'atom/browser/ui/views/global_menu_bar_x11.h',
--      'atom/browser/ui/views/menu_bar.cc',
--      'atom/browser/ui/views/menu_bar.h',
--      'atom/browser/ui/views/menu_delegate.cc',
--      'atom/browser/ui/views/menu_delegate.h',
--      'atom/browser/ui/views/menu_model_adapter.cc',
--      'atom/browser/ui/views/menu_model_adapter.h',
--      'atom/browser/ui/views/native_frame_view.cc',
--      'atom/browser/ui/views/native_frame_view.h',
--      'atom/browser/ui/views/root_view.cc',
--      'atom/browser/ui/views/root_view.h',
--      'atom/browser/ui/views/submenu_button.cc',
--      'atom/browser/ui/views/submenu_button.h',
--      'atom/browser/ui/views/win_frame_view.cc',
--      'atom/browser/ui/views/win_frame_view.h',
--      'atom/browser/ui/win/atom_desktop_native_widget_aura.cc',
--      'atom/browser/ui/win/atom_desktop_native_widget_aura.h',
--      'atom/browser/ui/win/atom_desktop_window_tree_host_win.cc',
--      'atom/browser/ui/win/atom_desktop_window_tree_host_win.h',
--      'atom/browser/ui/win/jump_list.cc',
--      'atom/browser/ui/win/jump_list.h',
--      'atom/browser/ui/win/message_handler_delegate.cc',
--      'atom/browser/ui/win/message_handler_delegate.h',
--      'atom/browser/ui/win/notify_icon_host.cc',
--      'atom/browser/ui/win/notify_icon_host.h',
--      'atom/browser/ui/win/notify_icon.cc',
--      'atom/browser/ui/win/notify_icon.h',
--      'atom/browser/ui/win/taskbar_host.cc',
--      'atom/browser/ui/win/taskbar_host.h',
--      'atom/browser/ui/x/event_disabler.cc',
--      'atom/browser/ui/x/event_disabler.h',
--      'atom/browser/ui/x/window_state_watcher.cc',
--      'atom/browser/ui/x/window_state_watcher.h',
--      'atom/browser/ui/x/x_window_utils.cc',
--      'atom/browser/ui/x/x_window_utils.h',
-       'atom/browser/unresponsive_suppressor.cc',
-       'atom/browser/unresponsive_suppressor.h',
-       'atom/browser/web_contents_permission_helper.cc',
-@@ -435,12 +346,10 @@
-       'atom/common/api/atom_api_asar.cc',
-       'atom/common/api/atom_api_clipboard.cc',
-       'atom/common/api/atom_api_clipboard.h',
--      'atom/common/api/atom_api_clipboard_mac.mm',
-       'atom/common/api/atom_api_crash_reporter.cc',
-       'atom/common/api/atom_api_key_weak_map.h',
-       'atom/common/api/atom_api_native_image.cc',
-       'atom/common/api/atom_api_native_image.h',
--      'atom/common/api/atom_api_native_image_mac.mm',
-       'atom/common/api/atom_api_shell.cc',
-       'atom/common/api/atom_api_v8_util.cc',
-       'atom/common/api/atom_bindings.cc',
-@@ -473,18 +382,6 @@
-       'atom/common/common_message_generator.h',
-       'atom/common/crash_reporter/crash_reporter.cc',
-       'atom/common/crash_reporter/crash_reporter.h',
--      'atom/common/crash_reporter/crash_reporter_linux.cc',
--      'atom/common/crash_reporter/crash_reporter_linux.h',
--      'atom/common/crash_reporter/crash_reporter_mac.h',
--      'atom/common/crash_reporter/crash_reporter_mac.mm',
--      'atom/common/crash_reporter/crash_reporter_win.cc',
--      'atom/common/crash_reporter/crash_reporter_win.h',
--      'atom/common/crash_reporter/linux/crash_dump_handler.cc',
--      'atom/common/crash_reporter/linux/crash_dump_handler.h',
--      'atom/common/crash_reporter/win/crash_service.cc',
--      'atom/common/crash_reporter/win/crash_service.h',
--      'atom/common/crash_reporter/win/crash_service_main.cc',
--      'atom/common/crash_reporter/win/crash_service_main.h',
-       'atom/common/draggable_region.cc',
-       'atom/common/draggable_region.h',
-       'atom/common/google_api_key.h',
-@@ -493,7 +390,6 @@
-       'atom/common/keyboard_util.h',
-       'atom/common/mouse_util.cc',
-       'atom/common/mouse_util.h',
--      'atom/common/linux/application_info.cc',
-       'atom/common/native_mate_converters/accelerator_converter.cc',
-       'atom/common/native_mate_converters/accelerator_converter.h',
-       'atom/common/native_mate_converters/blink_converter.cc',
-@@ -520,21 +416,18 @@
-       'atom/common/native_mate_converters/value_converter.h',
-       'atom/common/node_bindings.cc',
-       'atom/common/node_bindings.h',
--      'atom/common/node_bindings_linux.cc',
--      'atom/common/node_bindings_linux.h',
--      'atom/common/node_bindings_mac.cc',
--      'atom/common/node_bindings_mac.h',
--      'atom/common/node_bindings_win.cc',
--      'atom/common/node_bindings_win.h',
-       'atom/common/node_includes.h',
-       'atom/common/options_switches.cc',
-       'atom/common/options_switches.h',
-       'atom/common/platform_util.h',
-+<<<<<<< .our
-       'atom/common/platform_util_linux.cc',
-       'atom/common/platform_util_mac.mm',
-       'atom/common/platform_util_win.cc',
-       'atom/common/promise_util.h',
-       'atom/common/promise_util.cc',
-+=======
-+>>>>>>> .their
-       'atom/renderer/api/atom_api_renderer_ipc.h',
-       'atom/renderer/api/atom_api_renderer_ipc.cc',
-       'atom/renderer/api/atom_api_spell_check_client.cc',
-@@ -565,10 +458,6 @@
-       'atom/utility/atom_content_utility_client.h',
-       'chromium_src/chrome/browser/browser_process.cc',
-       'chromium_src/chrome/browser/browser_process.h',
--      'chromium_src/chrome/browser/chrome_process_finder_win.cc',
--      'chromium_src/chrome/browser/chrome_process_finder_win.h',
--      'chromium_src/chrome/browser/icon_loader_mac.mm',
--      'chromium_src/chrome/browser/icon_loader_win.cc',
-       'chromium_src/chrome/browser/icon_loader.cc',
-       'chromium_src/chrome/browser/icon_loader.h',
-       'chromium_src/chrome/browser/icon_manager.cc',
-@@ -576,12 +465,6 @@
-       'chromium_src/chrome/browser/chrome_notification_types.h',
-       'chromium_src/chrome/browser/extensions/global_shortcut_listener.cc',
-       'chromium_src/chrome/browser/extensions/global_shortcut_listener.h',
--      'chromium_src/chrome/browser/extensions/global_shortcut_listener_mac.mm',
--      'chromium_src/chrome/browser/extensions/global_shortcut_listener_mac.h',
--      'chromium_src/chrome/browser/extensions/global_shortcut_listener_x11.cc',
--      'chromium_src/chrome/browser/extensions/global_shortcut_listener_x11.h',
--      'chromium_src/chrome/browser/extensions/global_shortcut_listener_win.cc',
--      'chromium_src/chrome/browser/extensions/global_shortcut_listener_win.h',
-       'chromium_src/chrome/browser/media/desktop_media_list.h',
-       'chromium_src/chrome/browser/media/desktop_media_list_observer.h',
-       'chromium_src/chrome/browser/media/native_desktop_media_list.cc',
-@@ -605,35 +488,39 @@
-       'chromium_src/chrome/browser/printing/printing_message_filter.h',
-       'chromium_src/chrome/browser/printing/print_preview_message_handler.cc',
-       'chromium_src/chrome/browser/printing/print_preview_message_handler.h',
--      'chromium_src/chrome/browser/process_singleton_posix.cc',
--      'chromium_src/chrome/browser/process_singleton_win.cc',
-       'chromium_src/chrome/browser/process_singleton.h',
-+<<<<<<< .our
-+=======
-+      'chromium_src/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc',
-+      'chromium_src/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.h',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.h',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h',
-+      'chromium_src/chrome/browser/renderer_host/pepper/widevine_cdm_message_filter.cc',
-+      'chromium_src/chrome/browser/renderer_host/pepper/widevine_cdm_message_filter.h',
-+>>>>>>> .their
-       'chromium_src/chrome/browser/speech/tts_controller.h',
-       'chromium_src/chrome/browser/speech/tts_controller_impl.cc',
-       'chromium_src/chrome/browser/speech/tts_controller_impl.h',
--      'chromium_src/chrome/browser/speech/tts_linux.cc',
--      'chromium_src/chrome/browser/speech/tts_mac.mm',
-       'chromium_src/chrome/browser/speech/tts_message_filter.cc',
-       'chromium_src/chrome/browser/speech/tts_message_filter.h',
-       'chromium_src/chrome/browser/speech/tts_platform.cc',
-       'chromium_src/chrome/browser/speech/tts_platform.h',
--      'chromium_src/chrome/browser/speech/tts_win.cc',
-       'chromium_src/chrome/browser/ssl/security_state_tab_helper.cc',
-       'chromium_src/chrome/browser/ssl/security_state_tab_helper.h',
-       'chromium_src/chrome/browser/ui/browser_dialogs.h',
--      'chromium_src/chrome/browser/ui/cocoa/color_chooser_mac.mm',
--      'chromium_src/chrome/browser/ui/views/color_chooser_aura.cc',
--      'chromium_src/chrome/browser/ui/views/color_chooser_aura.h',
--      'chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc',
--      'chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h',
-       'chromium_src/chrome/common/chrome_constants.cc',
-       'chromium_src/chrome/common/chrome_constants.h',
-       'chromium_src/chrome/common/chrome_paths.cc',
-       'chromium_src/chrome/common/chrome_paths.h',
-       'chromium_src/chrome/common/chrome_paths_internal.h',
--      'chromium_src/chrome/common/chrome_paths_linux.cc',
--      'chromium_src/chrome/common/chrome_paths_mac.mm',
--      'chromium_src/chrome/common/chrome_paths_win.cc',
-       'chromium_src/chrome/common/pref_names.cc',
-       'chromium_src/chrome/common/pref_names.h',
-       'chromium_src/chrome/common/print_messages.cc',
-@@ -646,9 +533,6 @@
-       'chromium_src/chrome/renderer/media/chrome_key_systems.cc',
-       'chromium_src/chrome/renderer/media/chrome_key_systems.h',
-       'chromium_src/chrome/renderer/printing/print_web_view_helper.cc',
--      'chromium_src/chrome/renderer/printing/print_web_view_helper_linux.cc',
--      'chromium_src/chrome/renderer/printing/print_web_view_helper_mac.mm',
--      'chromium_src/chrome/renderer/printing/print_web_view_helper_pdf_win.cc',
-       'chromium_src/chrome/renderer/printing/print_web_view_helper.h',
-       'chromium_src/chrome/renderer/spellchecker/spellcheck_worditerator.cc',
-       'chromium_src/chrome/renderer/spellchecker/spellcheck_worditerator.h',
-@@ -661,22 +545,201 @@
-       'chromium_src/extensions/common/url_pattern.h',
-       'chromium_src/library_loaders/libspeechd_loader.cc',
-       'chromium_src/library_loaders/libspeechd.h',
--      '<@(native_mate_files)',
--      '<(SHARED_INTERMEDIATE_DIR)/atom_natives.h',
-+    ],
-+    'lib_sources_mac': [
-+      'atom/app/atom_main_delegate_mac.mm',
-+      'atom/browser/api/atom_api_browser_window_mac.mm',
-+      'atom/browser/api/atom_api_menu_mac.h',
-+      'atom/browser/api/atom_api_menu_mac.mm',
-+      'atom/browser/api/atom_api_screen_mac.mm',
-+      'atom/browser/api/atom_api_system_preferences_mac.mm',
-+      'atom/browser/api/atom_api_web_contents_mac.mm',
-+      'atom/browser/atom_browser_main_parts_mac.mm',
-+      'atom/browser/atom_browser_main_parts_posix.cc',
-+      'atom/browser/auto_updater_mac.mm',
-+      'atom/browser/browser_mac.mm',
-+      'atom/browser/common_web_contents_delegate_mac.mm',
-+      'atom/browser/mac/atom_application.h',
-+      'atom/browser/mac/atom_application.mm',
-+      'atom/browser/mac/atom_application_delegate.h',
-+      'atom/browser/mac/atom_application_delegate.mm',
-+      'atom/browser/mac/dict_util.h',
-+      'atom/browser/mac/dict_util.mm',
-+      'atom/browser/mac/in_app_purchase.h',
-+      'atom/browser/mac/in_app_purchase.mm',
-+      'atom/browser/mac/in_app_purchase_observer.h',
-+      'atom/browser/mac/in_app_purchase_observer.mm',
-+      'atom/browser/mac/in_app_purchase_product.h',
-+      'atom/browser/mac/in_app_purchase_product.mm',
-+      'atom/browser/native_browser_view_mac.h',
-+      'atom/browser/native_browser_view_mac.mm',
-+      'atom/browser/native_window_mac.h',
-+      'atom/browser/native_window_mac.mm',
-+      'atom/browser/relauncher_mac.cc',
-+      'atom/browser/ui/accelerator_util_mac.mm',
-+      'atom/browser/ui/certificate_trust_mac.mm',
-+      'atom/browser/ui/cocoa/NSColor+Hex.h',
-+      'atom/browser/ui/cocoa/NSColor+Hex.mm',
-+      'atom/browser/ui/cocoa/NSString+ANSI.h',
-+      'atom/browser/ui/cocoa/NSString+ANSI.mm',
-+      'atom/browser/ui/cocoa/atom_bundle_mover.h',
-+      'atom/browser/ui/cocoa/atom_bundle_mover.mm',
-+      'atom/browser/ui/cocoa/atom_menu_controller.h',
-+      'atom/browser/ui/cocoa/atom_menu_controller.mm',
-+      'atom/browser/ui/cocoa/atom_native_widget_mac.h',
-+      'atom/browser/ui/cocoa/atom_native_widget_mac.mm',
-+      'atom/browser/ui/cocoa/atom_ns_window.h',
-+      'atom/browser/ui/cocoa/atom_ns_window.mm',
-+      'atom/browser/ui/cocoa/atom_ns_window_delegate.h',
-+      'atom/browser/ui/cocoa/atom_ns_window_delegate.mm',
-+      'atom/browser/ui/cocoa/atom_preview_item.h',
-+      'atom/browser/ui/cocoa/atom_preview_item.mm',
-+      'atom/browser/ui/cocoa/atom_touch_bar.h',
-+      'atom/browser/ui/cocoa/atom_touch_bar.mm',
-+      'atom/browser/ui/cocoa/touch_bar_forward_declarations.h',
-+      'atom/browser/ui/cocoa/views_delegate_mac.h',
-+      'atom/browser/ui/cocoa/views_delegate_mac.mm',
-+      'atom/browser/ui/drag_util_mac.mm',
-+      'atom/browser/ui/file_dialog_mac.mm',
-+      'atom/browser/ui/message_box_mac.mm',
-+      'atom/browser/ui/tray_icon_cocoa.h',
-+      'atom/browser/ui/tray_icon_cocoa.mm',
-+      'atom/common/api/atom_api_clipboard_mac.mm',
-+      'atom/common/api/atom_api_native_image_mac.mm',
-+      'atom/common/crash_reporter/crash_reporter_mac.h',
-+      'atom/common/crash_reporter/crash_reporter_mac.mm',
-+      'atom/common/node_bindings_mac.cc',
-+      'atom/common/node_bindings_mac.h',
-+      'atom/common/platform_util_mac.mm',
-+      'chromium_src/chrome/browser/extensions/global_shortcut_listener_mac.h',
-+      'chromium_src/chrome/browser/extensions/global_shortcut_listener_mac.mm',
-+      'chromium_src/chrome/browser/icon_loader_mac.mm',
-+      'chromium_src/chrome/browser/process_singleton_posix.cc',
-+      'chromium_src/chrome/browser/renderer_host/pepper/monitor_finder_mac.h',
-+      'chromium_src/chrome/browser/renderer_host/pepper/monitor_finder_mac.mm',
-+      'chromium_src/chrome/browser/speech/tts_mac.mm',
-+      'chromium_src/chrome/browser/ui/cocoa/color_chooser_mac.mm',
-+      'chromium_src/chrome/common/chrome_paths_mac.mm',
-+      'chromium_src/chrome/renderer/printing/print_web_view_helper_mac.mm',
-+    ],
-+    'lib_sources_views': [
-+      'atom/browser/api/atom_api_browser_window_views.cc',
-+      'atom/browser/api/atom_api_menu_views.cc',
-+      'atom/browser/api/atom_api_menu_views.h',
-+      'atom/browser/common_web_contents_delegate_views.cc',
-+      'atom/browser/native_browser_view_views.cc',
-+      'atom/browser/native_browser_view_views.h',
-+      'atom/browser/native_window_views.cc',
-+      'atom/browser/native_window_views.h',
-+      'atom/browser/ui/accelerator_util_views.cc',
-+      'atom/browser/ui/drag_util_views.cc',
-+      'atom/browser/ui/views/autofill_popup_view.cc',
-+      'atom/browser/ui/views/autofill_popup_view.h',
-+      'atom/browser/ui/views/frameless_view.cc',
-+      'atom/browser/ui/views/frameless_view.h',
-+      'atom/browser/ui/views/menu_bar.cc',
-+      'atom/browser/ui/views/menu_bar.h',
-+      'atom/browser/ui/views/menu_delegate.cc',
-+      'atom/browser/ui/views/menu_delegate.h',
-+      'atom/browser/ui/views/menu_model_adapter.cc',
-+      'atom/browser/ui/views/menu_model_adapter.h',
-+      'atom/browser/ui/views/native_frame_view.cc',
-+      'atom/browser/ui/views/native_frame_view.h',
-+      'atom/browser/ui/views/root_view.cc',
-+      'atom/browser/ui/views/root_view.h',
-+      'atom/browser/ui/views/submenu_button.cc',
-+      'atom/browser/ui/views/submenu_button.h',
-+      'atom/browser/ui/views/win_frame_view.cc',
-+      'atom/browser/ui/views/win_frame_view.h',
-+      'chromium_src/chrome/browser/ui/views/color_chooser_aura.cc',
-+      'chromium_src/chrome/browser/ui/views/color_chooser_aura.h',
-     ],
-     'lib_sources_linux': [
-+      'atom/browser/atom_browser_main_parts_posix.cc',
-+      'atom/browser/browser_linux.cc',
-+      'atom/browser/lib/power_observer_linux.cc',
-+      'atom/browser/lib/power_observer_linux.h',
-+      'atom/browser/relauncher_linux.cc',
-+      'atom/browser/ui/file_dialog_gtk.cc',
-+      'atom/browser/ui/message_box_gtk.cc',
-+      'atom/browser/ui/tray_icon_gtk.cc',
-+      'atom/browser/ui/tray_icon_gtk.h',
-+      'atom/browser/ui/views/global_menu_bar_x11.cc',
-+      'atom/browser/ui/views/global_menu_bar_x11.h',
-+      'atom/browser/ui/x/event_disabler.cc',
-+      'atom/browser/ui/x/event_disabler.h',
-+      'atom/browser/ui/x/window_state_watcher.cc',
-+      'atom/browser/ui/x/window_state_watcher.h',
-+      'atom/browser/ui/x/x_window_utils.cc',
-+      'atom/browser/ui/x/x_window_utils.h',
-+      'atom/common/crash_reporter/crash_reporter_linux.cc',
-+      'atom/common/crash_reporter/crash_reporter_linux.h',
-+      'atom/common/crash_reporter/linux/crash_dump_handler.cc',
-+      'atom/common/crash_reporter/linux/crash_dump_handler.h',
-+      'atom/common/linux/application_info.cc',
-+      'atom/common/node_bindings_linux.cc',
-+      'atom/common/node_bindings_linux.h',
-+      'atom/common/platform_util_linux.cc',
-+      'chromium_src/chrome/browser/extensions/global_shortcut_listener_x11.cc',
-+      'chromium_src/chrome/browser/extensions/global_shortcut_listener_x11.h',
-       'chromium_src/chrome/browser/icon_loader_auralinux.cc',
-+      'chromium_src/chrome/browser/process_singleton_posix.cc',
-+      'chromium_src/chrome/browser/speech/tts_linux.cc',
-+      'chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc',
-+      'chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h',
-+      'chromium_src/chrome/common/chrome_paths_linux.cc',
-+      'chromium_src/chrome/renderer/printing/print_web_view_helper_linux.cc',
-     ],
-     'lib_sources_nss': [
-       'chromium_src/chrome/browser/certificate_manager_model.cc',
-       'chromium_src/chrome/browser/certificate_manager_model.h',
-     ],
-     'lib_sources_win': [
-+      'atom/browser/api/atom_api_system_preferences_win.cc',
-+      'atom/browser/browser_win.cc',
-+      'atom/browser/native_window_views_win.cc',
-+      'atom/browser/relauncher_win.cc',
-+      'atom/browser/ui/certificate_trust_win.cc',
-+      'atom/browser/ui/file_dialog_win.cc',
-+      'atom/browser/ui/message_box_win.cc',
-+      'atom/browser/ui/tray_icon_win.cc',
-+      'atom/browser/ui/win/atom_desktop_native_widget_aura.cc',
-+      'atom/browser/ui/win/atom_desktop_native_widget_aura.h',
-+      'atom/browser/ui/win/atom_desktop_window_tree_host_win.cc',
-+      'atom/browser/ui/win/atom_desktop_window_tree_host_win.h',
-+      'atom/browser/ui/win/jump_list.cc',
-+      'atom/browser/ui/win/jump_list.h',
-+      'atom/browser/ui/win/message_handler_delegate.cc',
-+      'atom/browser/ui/win/message_handler_delegate.h',
-+      'atom/browser/ui/win/notify_icon.cc',
-+      'atom/browser/ui/win/notify_icon.h',
-+      'atom/browser/ui/win/notify_icon_host.cc',
-+      'atom/browser/ui/win/notify_icon_host.h',
-+      'atom/browser/ui/win/taskbar_host.cc',
-+      'atom/browser/ui/win/taskbar_host.h',
-+      'atom/common/crash_reporter/crash_reporter_win.cc',
-+      'atom/common/crash_reporter/crash_reporter_win.h',
-+      'atom/common/crash_reporter/win/crash_service.cc',
-+      'atom/common/crash_reporter/win/crash_service.h',
-+      'atom/common/crash_reporter/win/crash_service_main.cc',
-+      'atom/common/crash_reporter/win/crash_service_main.h',
-+      'atom/common/node_bindings_win.cc',
-+      'atom/common/node_bindings_win.h',
-+      'atom/common/platform_util_win.cc',
-+      'chromium_src/chrome/browser/chrome_process_finder_win.cc',
-+      'chromium_src/chrome/browser/chrome_process_finder_win.h',
-+      'chromium_src/chrome/browser/extensions/global_shortcut_listener_win.cc',
-+      'chromium_src/chrome/browser/extensions/global_shortcut_listener_win.h',
-+      'chromium_src/chrome/browser/icon_loader_win.cc',
-+      'chromium_src/chrome/browser/printing/pdf_to_emf_converter.cc',
-+      'chromium_src/chrome/browser/printing/pdf_to_emf_converter.h',
-+      'chromium_src/chrome/browser/process_singleton_win.cc',
-+      'chromium_src/chrome/browser/speech/tts_win.cc',
-       'chromium_src/chrome/browser/ui/views/color_chooser_dialog.cc',
-       'chromium_src/chrome/browser/ui/views/color_chooser_dialog.h',
-       'chromium_src/chrome/browser/ui/views/color_chooser_win.cc',
--      'chromium_src/chrome/browser/printing/pdf_to_emf_converter.cc',
--      'chromium_src/chrome/browser/printing/pdf_to_emf_converter.h',
-+      'chromium_src/chrome/common/chrome_paths_win.cc',
-+      'chromium_src/chrome/renderer/printing/print_web_view_helper_pdf_win.cc',
-       'chromium_src/chrome/utility/printing_handler_win.cc',
-       'chromium_src/chrome/utility/printing_handler_win.h',
-     ],
diff --git a/app/test/fixtures/merge-parser/electron/merge-ipc-filter-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-ipc-filter-into-master.txt
deleted file mode 100644
index 95c514587c8..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-ipc-filter-into-master.txt
+++ /dev/null
@@ -1,94 +0,0 @@
-merged
-  result 100644 5c6d871429c592480e1b82c3573a85227304fe91 lib/browser/api/ipc-main.js
-  our    100644 2c2978e9734402d4dcfb37d098ccfeaa768f53c0 lib/browser/api/ipc-main.js
-@@ -1,16 +1,34 @@
- const EventEmitter = require('events').EventEmitter
- 
--const emitter = new EventEmitter()
-+let ipcFilters = [];
- 
--const removeAllListeners = emitter.removeAllListeners.bind(emitter)
--emitter.removeAllListeners = function (...args) {
--  if (args.length === 0) {
--    throw new Error('Removing all listeners from ipcMain will make Electron internals stop working.  Please specify a event name')
-+class IPCMain extends EventEmitter {
-+  constructor() {
-+    super()
-+    // Do not throw exception when channel name is "error".
-+    this.on('error', () => {})
-+  }
-+
-+  removeAllListeners(...args) {
-+    if (args.length === 0) {
-+      throw new Error('Removing all listeners from ipcMain will make Electron internals stop working.  Please specify a event name')
-+    }
-+    super.removeAllListeners(...args)
-+  }
-+
-+  addFilter(fn) {
-+    if (!ipcFilters.some(testFunction => testFunction === fn)) {
-+      ipcFilters.push(fn)
-+    }
-   }
--  removeAllListeners(...args)
--}
- 
--// Do not throw exception when channel name is "error".
--emitter.on('error', () => {})
-+  removeFilter(fn) {
-+    ipcFilters = ipcFilters.filter(testFunction => testFunction === fn)
-+  }
-+
-+  getFilters() {
-+    return Object.freeze([].concat(ipcFilters))
-+  }
-+}
- 
--module.exports = emitter
-+module.exports = new IPCMain()
-changed in both
-  base   100644 f5f53f44a312935eaf4db5112923b947dab0876d lib/browser/api/web-contents.js
-  our    100644 8f5bd037b14d05db7396bb8b5de1a29fdef167ae lib/browser/api/web-contents.js
-  their  100644 aab4fa05cab90a775ee8ba91d53a4bc4fe8aa6f9 lib/browser/api/web-contents.js
-@@ -264,10 +264,17 @@
-   })
- }
- 
-+<<<<<<< .our
- // TODO(zcbenz): Remove the stub in 4.0.
- WebContents.prototype.setSize = function () {
-   console.error('The WebContents.setSize method has been removed, see',
-                 'https://github.com/electron/electron/issues/14120 for more.')
-+=======
-+// If any one of the filter functions _allows_ the ipc event
-+// it is considered allowed.
-+const allowIpcEvent = (event, channel, args) => {
-+  return ipcMain.getFilters().some(filterFn => filterFn(event, channel, args))
-+>>>>>>> .their
- }
- 
- // Add JavaScript wrappers for WebContents class.
-@@ -281,7 +288,9 @@
- 
-   // Dispatch IPC messages to the ipc module.
-   this.on('ipc-message', function (event, [channel, ...args]) {
--    ipcMain.emit(channel, event, ...args)
-+    if (allowIpcEvent(event, channel, args)) {
-+      ipcMain.emit(channel, event, ...args)
-+    }
-   })
-   this.on('ipc-message-sync', function (event, [channel, ...args]) {
-     Object.defineProperty(event, 'returnValue', {
-@@ -290,7 +299,11 @@
-       },
-       get: function () {}
-     })
--    ipcMain.emit(channel, event, ...args)
-+    if (allowIpcEvent(event, channel, args)) {
-+      ipcMain.emit(channel, event, ...args)
-+    } else {
-+      event.sendReply([undefined])
-+    }
-   })
- 
-   // Handle context menu action request from pepper plugin.
diff --git a/app/test/fixtures/merge-parser/electron/merge-make-cppcheck-happy-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-make-cppcheck-happy-into-master.txt
deleted file mode 100644
index 42db7bc485c..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-make-cppcheck-happy-into-master.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-changed in both
-  base   100644 fdf76f3cb29159c62a2ef9dfec7c6c6351fd28ba atom/app/atom_main_delegate.cc
-  our    100644 b3b5b8f2a8f24b8928f69a286c80e8a3b8464366 atom/app/atom_main_delegate.cc
-  their  100644 f4c610028cb5e42ef0b3a482193568df353a4881 atom/app/atom_main_delegate.cc
-@@ -101,11 +101,14 @@
-   bool enable_stack_dumping = true;
- #else
-   bool enable_stack_dumping = env->HasVar("ELECTRON_ENABLE_STACK_DUMPING");
-+<<<<<<< .our
- #endif
- #if defined(ARCH_CPU_ARM_FAMILY) && defined(ARCH_CPU_32_BITS)
-   // For 32bit ARM enabling stack printing would end up crashing.
-   // https://github.com/electron/electron/pull/11230#issuecomment-363232482
-   enable_stack_dumping = false;
-+=======
-+>>>>>>> .their
- #endif
-   if (enable_stack_dumping)
-     base::debug::EnableInProcessStackDumping();
-changed in both
-  base   100644 8c96f91bfe68e105a12c2d1a3c515a559ea4d6e6 atom/browser/atom_browser_main_parts_posix.cc
-  our    100644 d79e60049f4db41b7b992c412cf271d461227115 atom/browser/atom_browser_main_parts_posix.cc
-  their  100644 d208ea8b7447e8ac0d451eb9f555eb2183c85afc atom/browser/atom_browser_main_parts_posix.cc
-@@ -120,7 +120,12 @@
-   size_t bytes_read = 0;
-   do {
-     ssize_t ret = HANDLE_EINTR(
-+<<<<<<< .our
-         read(shutdown_fd_, reinterpret_cast<char*>(&signal) + bytes_read,
-+=======
-+        read(shutdown_fd_,
-+             reinterpret_cast<char*>(&signal) + bytes_read,
-+>>>>>>> .their
-              sizeof(signal) - bytes_read));
-     if (ret < 0) {
-       NOTREACHED() << "Unexpected error: " << strerror(errno);
-changed in both
-  base   100644 6df090f9cf268fb70cf11d4fef85e1d6dbbfd65a atom/browser/atom_download_manager_delegate.cc
-  our    100644 83276affb18df31ebe64fad6c53960baad498582 atom/browser/atom_download_manager_delegate.cc
-  their  100644 0a79ee0195010c22c5b016a7e98ae6a091c2845c atom/browser/atom_download_manager_delegate.cc
-@@ -97,7 +97,11 @@
-   // Show save dialog if save path was not set already on item
-   file_dialog::DialogSettings settings;
-   settings.parent_window = window;
-+<<<<<<< .our
-   settings.force_detached = offscreen;
-+=======
-+  settings.force_detached = (window != nullptr) && window->is_offscreen_dummy();
-+>>>>>>> .their
-   settings.title = item->GetURL().spec();
-   settings.default_path = default_path;
-   if (path.empty() && file_dialog::ShowSaveDialog(settings, &path)) {
-changed in both
-  base   100644 d113e656084a626b246042f719145614c29bcfaa atom/browser/atom_web_ui_controller_factory.cc
-  our    100644 b4e8c1b130a07e7be99b1cd136cd1d84b7bcd275 atom/browser/atom_web_ui_controller_factory.cc
-  their  100644 3262dc974095405c563feb25bf5d03949462f130 atom/browser/atom_web_ui_controller_factory.cc
-removed in local
-  base   100644 715b2c540ec2c71bb2d67c78adb96a7c4c60f4a8 brightray/browser/net/devtools_network_protocol_handler.cc
-  their  100644 caf738435fdf73fc9c490f619db57207e8ac515b brightray/browser/net/devtools_network_protocol_handler.cc
diff --git a/app/test/fixtures/merge-parser/electron/merge-merge-libcc-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-merge-libcc-into-master.txt
deleted file mode 100644
index d7bd255f9b6..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-merge-libcc-into-master.txt
+++ /dev/null
@@ -1,82080 +0,0 @@
-changed in both
-  base   100644 665fb6fa10444592991a714828b60ca08daa4a2f .gitignore
-  our    100644 f393b1cdcef87b41bb3ed47ebae59757fed3a780 .gitignore
-  their  100644 ad8b8a788b3516d1db12c4673974fbc43447c1e7 .gitignore
-@@ -41,6 +41,7 @@
- /vendor/python_26/
- /vendor/native_mksnapshot
- /vendor/LICENSES.chromium.html
-+/vendor/pyyaml
- node_modules/
- SHASUMS256.txt
- **/yarn.lock
-changed in both
-  base   100644 c21aa53c89db87fb65f97316556a3356459e574e DEPS
-  our    100644 b3b9d650b27274f4f98f7408319b1e6b35f63abf DEPS
-  their  100644 1921a959e2055b0c2459e89351aaf64269eb9fc9 DEPS
-@@ -1,17 +1,26 @@
- vars = {
-   'chromium_version':
-     '66.0.3359.181',
-+<<<<<<< .our
-   'libchromiumcontent_revision':
-     'c85470a1c379b1c4bedb372c146521bc4be9b75d',
-+=======
-+>>>>>>> .their
-   'node_version':
-     'ece0a06ac8147efb5b5af431c21f312f1884616e',
- 
-+  'pyyaml_version':
-+    '3.12',
-+
-   'chromium_git':
-     'https://chromium.googlesource.com',
- 
-   'electron_git':
-     'https://github.com/electron',
- 
-+  'yaml_git':
-+    'https://github.com/yaml',
-+
-   'checkout_nacl':
-     False,
-   'checkout_libaom':
-@@ -23,22 +32,26 @@
- deps = {
-   'src':
-     (Var("chromium_git")) + '/chromium/src.git@' + (Var("chromium_version")),
--  'src/libchromiumcontent':
--    (Var("electron_git")) + '/libchromiumcontent.git@' + (Var("libchromiumcontent_revision")),
-   'src/third_party/electron_node':
-     (Var("electron_git")) + '/node.git@' + (Var("node_version")),
-+  'src/electron/vendor/pyyaml':
-+    (Var("yaml_git")) + '/pyyaml.git@' + (Var("pyyaml_version")),
- }
- 
- hooks = [
-   {
-     'action': [
-       'python',
-+<<<<<<< .our
-       'src/libchromiumcontent/script/apply-patches',
-       '--project-root=.',
-       '--commit'
-+=======
-+      'src/electron/script/apply-patches'
-+>>>>>>> .their
-     ],
-     'pattern':
--      'src/libchromiumcontent',
-+      'src/electron',
-     'name':
-       'patch_chromium'
-   },
-added in remote
-  their  100644 adff925cf212aeed0675a9a22eed12bbce118e43 patches/common/angle/.patches.yaml
-@@ -0,0 +1,6 @@
-+repo: src/third_party/angle
-+patches:
-+-
-+  owners: alespergl
-+  file: dcheck.patch
-+  description: null
-added in remote
-  their  100644 05114b597394ffcd0ee7ad4dfdabed7e70cddd54 patches/common/angle/dcheck.patch
-@@ -0,0 +1,13 @@
-+diff --git a/src/common/debug.h b/src/common/debug.h
-+index 0108ff655..57fbc5ac5 100644
-+--- a/src/common/debug.h
-++++ b/src/common/debug.h
-+@@ -190,7 +190,7 @@ std::ostream &FmtHexInt(std::ostream &os, T value)
-+ 
-+ #define ANGLE_EMPTY_STATEMENT for (;;) break
-+ #if !defined(NDEBUG) || defined(ANGLE_ENABLE_RELEASE_ASSERTS)
-+-#define ANGLE_ENABLE_ASSERTS
-++// #define ANGLE_ENABLE_ASSERTS
-+ #endif
-+ 
-+ #define WARN() ANGLE_LOG(WARN)
-added in remote
-  their  100644 ae59633773d05ff4cd12f15ef9027e1fc096657b patches/common/boringssl/.patches.yaml
-@@ -0,0 +1,6 @@
-+repo: src/third_party/boringssl/src
-+patches:
-+-
-+  owners: nornagon
-+  file: 0001-Implement-legacy-OCSP-APIs-for-libssl.patch
-+  description: see patch header
-added in remote
-  their  100644 d1c0c0d207120e91d3c879b508f18e707d087606 patches/common/boringssl/0001-Implement-legacy-OCSP-APIs-for-libssl.patch
-@@ -0,0 +1,741 @@
-+From 81d4909d00c3628453a8712bc331304bd01d8eaf Mon Sep 17 00:00:00 2001
-+From: David Benjamin <davidben@google.com>
-+Date: Thu, 10 May 2018 19:55:02 -0400
-+Subject: [PATCH] Implement legacy OCSP APIs for libssl.
-+
-+Previously, we'd omitted OpenSSL's OCSP APIs because they depend on a
-+complex OCSP mechanism and encourage the the unreliable server behavior
-+that hampers using OCSP stapling to fix revocation today. (OCSP
-+responses should not be fetched on-demand on a callback. They should be
-+managed like other server credentials and refreshed eagerly, so
-+temporary CA outage does not translate to loss of OCSP.)
-+
-+But most of the APIs are byte-oriented anyway, so they're easy to
-+support. Intentionally omit the one that takes a bunch of OCSP_RESPIDs.
-+
-+The callback is benign on the client (an artifact of OpenSSL reading
-+OCSP and verifying certificates in the wrong order). On the server, it
-+encourages unreliability, but pyOpenSSL/cryptography.io depends on this.
-+Dcument that this is only for compatibility with legacy software.
-+
-+Also tweak a few things for compatilibility. cryptography.io expects
-+SSL_CTX_set_read_ahead to return something, SSL_get_server_tmp_key's
-+signature was wrong, and cryptography.io tries to redefine
-+SSL_get_server_tmp_key if SSL_CTRL_GET_SERVER_TMP_KEY is missing.
-+
-+Change-Id: I2f99711783456bfb7324e9ad972510be8a95e845
-+Reviewed-on: https://boringssl-review.googlesource.com/28404
-+Commit-Queue: David Benjamin <davidben@google.com>
-+CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
-+Reviewed-by: Adam Langley <agl@google.com>
-+---
-+ crypto/err/ssl.errordata  |   1 +
-+ include/openssl/ssl.h     |  64 +++++++++++++--
-+ include/openssl/tls1.h    |   1 +
-+ ssl/handshake.cc          |  16 ++++
-+ ssl/handshake_server.cc   |  16 ++++
-+ ssl/internal.h            |   5 ++
-+ ssl/ssl_lib.cc            |  39 ++++++++-
-+ ssl/test/bssl_shim.cc     |  26 ++++++
-+ ssl/test/runner/alert.go  | 122 +++++++++++++--------------
-+ ssl/test/runner/runner.go | 205 ++++++++++++++++++++++++++++++++++------------
-+ ssl/test/test_config.cc   |   4 +
-+ ssl/test/test_config.h    |   4 +
-+ 12 files changed, 381 insertions(+), 122 deletions(-)
-+
-+diff --git a/crypto/err/ssl.errordata b/crypto/err/ssl.errordata
-+index 7b63bc8..375df9a 100644
-+--- a/crypto/err/ssl.errordata
-++++ b/crypto/err/ssl.errordata
-+@@ -108,6 +108,7 @@ SSL,266,NO_SHARED_GROUP
-+ SSL,280,NO_SUPPORTED_VERSIONS_ENABLED
-+ SSL,185,NULL_SSL_CTX
-+ SSL,186,NULL_SSL_METHOD_PASSED
-++SSL,289,OCSP_CB_ERROR
-+ SSL,187,OLD_SESSION_CIPHER_NOT_RETURNED
-+ SSL,268,OLD_SESSION_PRF_HASH_MISMATCH
-+ SSL,188,OLD_SESSION_VERSION_NOT_RETURNED
-+diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
-+index 35506f7..d46a5af 100644
-+--- a/include/openssl/ssl.h
-++++ b/include/openssl/ssl.h
-+@@ -3715,14 +3715,14 @@ OPENSSL_EXPORT int SSL_set_tmp_rsa(SSL *ssl, const RSA *rsa);
-+ // SSL_CTX_get_read_ahead returns zero.
-+ OPENSSL_EXPORT int SSL_CTX_get_read_ahead(const SSL_CTX *ctx);
-+ 
-+-// SSL_CTX_set_read_ahead does nothing.
-+-OPENSSL_EXPORT void SSL_CTX_set_read_ahead(SSL_CTX *ctx, int yes);
-++// SSL_CTX_set_read_ahead returns one.
-++OPENSSL_EXPORT int SSL_CTX_set_read_ahead(SSL_CTX *ctx, int yes);
-+ 
-+ // SSL_get_read_ahead returns zero.
-+ OPENSSL_EXPORT int SSL_get_read_ahead(const SSL *ssl);
-+ 
-+-// SSL_set_read_ahead does nothing.
-+-OPENSSL_EXPORT void SSL_set_read_ahead(SSL *ssl, int yes);
-++// SSL_set_read_ahead returns one.
-++OPENSSL_EXPORT int SSL_set_read_ahead(SSL *ssl, int yes);
-+ 
-+ // SSL_renegotiate put an error on the error queue and returns zero.
-+ OPENSSL_EXPORT int SSL_renegotiate(SSL *ssl);
-+@@ -3793,7 +3793,7 @@ OPENSSL_EXPORT const COMP_METHOD *SSL_get_current_compression(SSL *ssl);
-+ OPENSSL_EXPORT const COMP_METHOD *SSL_get_current_expansion(SSL *ssl);
-+ 
-+ // SSL_get_server_tmp_key returns zero.
-+-OPENSSL_EXPORT int *SSL_get_server_tmp_key(SSL *ssl, EVP_PKEY **out_key);
-++OPENSSL_EXPORT int SSL_get_server_tmp_key(SSL *ssl, EVP_PKEY **out_key);
-+ 
-+ // SSL_CTX_set_tmp_dh returns 1.
-+ OPENSSL_EXPORT int SSL_CTX_set_tmp_dh(SSL_CTX *ctx, const DH *dh);
-+@@ -4108,6 +4108,58 @@ extern "C++" OPENSSL_EXPORT void SSL_CTX_sess_set_get_cb(
-+                                                  int id_len, int *out_copy));
-+ #endif
-+ 
-++// SSL_set_tlsext_status_type configures a client to request OCSP stapling if
-++// |type| is |TLSEXT_STATUSTYPE_ocsp| and disables it otherwise. It returns one
-++// on success and zero if handshake configuration has already been shed.
-++//
-++// Use |SSL_enable_ocsp_stapling| instead.
-++OPENSSL_EXPORT int SSL_set_tlsext_status_type(SSL *ssl, int type);
-++
-++// SSL_set_tlsext_status_ocsp_resp sets the OCSP response. It returns one on
-++// success and zero on error. On success, |ssl| takes ownership of |resp|, which
-++// must have been allocated by |OPENSSL_malloc|.
-++//
-++// Use |SSL_set_ocsp_response| instead.
-++OPENSSL_EXPORT int SSL_set_tlsext_status_ocsp_resp(SSL *ssl, uint8_t *resp,
-++                                                   size_t resp_len);
-++
-++// SSL_get_tlsext_status_ocsp_resp sets |*out| to point to the OCSP response
-++// from the server. It returns the length of the response. If there was no
-++// response, it sets |*out| to NULL and returns zero.
-++//
-++// Use |SSL_get0_ocsp_response| instead.
-++//
-++// WARNING: the returned data is not guaranteed to be well formed.
-++OPENSSL_EXPORT size_t SSL_get_tlsext_status_ocsp_resp(const SSL *ssl,
-++                                                      const uint8_t **out);
-++
-++// SSL_CTX_set_tlsext_status_cb configures the legacy OpenSSL OCSP callback and
-++// returns one. Though the type signature is the same, this callback has
-++// different behavior for client and server connections:
-++//
-++// For clients, the callback is called after certificate verification. It should
-++// return one for success, zero for a bad OCSP response, and a negative number
-++// for internal error. Instead, handle this as part of certificate verification.
-++// (Historically, OpenSSL verified certificates just before parsing stapled OCSP
-++// responses, but BoringSSL fixes this ordering. All server credentials are
-++// available during verification.)
-++//
-++// Do not use this callback as a server. It is provided for compatibility
-++// purposes only. For servers, it is called to configure server credentials. It
-++// should return |SSL_TLSEXT_ERR_OK| on success, |SSL_TLSEXT_ERR_NOACK| to
-++// ignore OCSP requests, or |SSL_TLSEXT_ERR_ALERT_FATAL| on error. It is usually
-++// used to fetch OCSP responses on demand, which is not ideal. Instead, treat
-++// OCSP responses like other server credentials, such as certificates or SCT
-++// lists. Configure, store, and refresh them eagerly. This avoids downtime if
-++// the CA's OCSP responder is briefly offline.
-++OPENSSL_EXPORT int SSL_CTX_set_tlsext_status_cb(SSL_CTX *ctx,
-++                                                int (*callback)(SSL *ssl,
-++                                                                void *arg));
-++
-++// SSL_CTX_set_tlsext_status_arg sets additional data for
-++// |SSL_CTX_set_tlsext_status_cb|'s callback and returns one.
-++OPENSSL_EXPORT int SSL_CTX_set_tlsext_status_arg(SSL_CTX *ctx, void *arg);
-++
-+ 
-+ // Private structures.
-+ //
-+@@ -4285,6 +4337,7 @@ struct ssl_session_st {
-+ #define SSL_CTRL_GET_NUM_RENEGOTIATIONS doesnt_exist
-+ #define SSL_CTRL_GET_READ_AHEAD doesnt_exist
-+ #define SSL_CTRL_GET_RI_SUPPORT doesnt_exist
-++#define SSL_CTRL_GET_SERVER_TMP_KEY doesnt_exist
-+ #define SSL_CTRL_GET_SESSION_REUSED doesnt_exist
-+ #define SSL_CTRL_GET_SESS_CACHE_MODE doesnt_exist
-+ #define SSL_CTRL_GET_SESS_CACHE_SIZE doesnt_exist
-+@@ -4698,6 +4751,7 @@ OPENSSL_EXPORT bool SSL_apply_handback(SSL *ssl, Span<const uint8_t> handback);
-+ #define SSL_R_NEGOTIATED_TB_WITHOUT_EMS_OR_RI 285
-+ #define SSL_R_SERVER_ECHOED_INVALID_SESSION_ID 286
-+ #define SSL_R_PRIVATE_KEY_OPERATION_FAILED 287
-++#define SSL_R_OCSP_CB_ERROR 289
-+ #define SSL_R_SSLV3_ALERT_CLOSE_NOTIFY 1000
-+ #define SSL_R_SSLV3_ALERT_UNEXPECTED_MESSAGE 1010
-+ #define SSL_R_SSLV3_ALERT_BAD_RECORD_MAC 1020
-+diff --git a/include/openssl/tls1.h b/include/openssl/tls1.h
-+index 3424f3d..7a05969 100644
-+--- a/include/openssl/tls1.h
-++++ b/include/openssl/tls1.h
-+@@ -237,6 +237,7 @@ extern "C" {
-+ #define TLSEXT_TYPE_dummy_pq_padding 54537
-+ 
-+ // status request value from RFC 3546
-++#define TLSEXT_STATUSTYPE_nothing (-1)
-+ #define TLSEXT_STATUSTYPE_ocsp 1
-+ 
-+ // ECPointFormat values from RFC 4492
-+diff --git a/ssl/handshake.cc b/ssl/handshake.cc
-+index 6432424..0a90b9f 100644
-+--- a/ssl/handshake.cc
-++++ b/ssl/handshake.cc
-+@@ -356,6 +356,22 @@ enum ssl_verify_result_t ssl_verify_peer_cert(SSL_HANDSHAKE *hs) {
-+     ssl_send_alert(ssl, SSL3_AL_FATAL, alert);
-+   }
-+ 
-++  // Emulate OpenSSL's client OCSP callback. OpenSSL verifies certificates
-++  // before it receives the OCSP, so it needs a second callback for OCSP.
-++  if (ret == ssl_verify_ok && !ssl->server &&
-++      hs->new_session->ocsp_response != nullptr &&
-++      ssl->ctx->legacy_ocsp_callback != nullptr) {
-++    int cb_ret =
-++        ssl->ctx->legacy_ocsp_callback(ssl, ssl->ctx->legacy_ocsp_callback_arg);
-++    if (cb_ret <= 0) {
-++      OPENSSL_PUT_ERROR(SSL, SSL_R_OCSP_CB_ERROR);
-++      ssl_send_alert(ssl, SSL3_AL_FATAL,
-++                     cb_ret == 0 ? SSL_AD_BAD_CERTIFICATE_STATUS_RESPONSE
-++                                 : SSL_AD_INTERNAL_ERROR);
-++      ret = ssl_verify_invalid;
-++    }
-++  }
-++
-+   return ret;
-+ }
-+ 
-+diff --git a/ssl/handshake_server.cc b/ssl/handshake_server.cc
-+index fa8a241..7a96767 100644
-+--- a/ssl/handshake_server.cc
-++++ b/ssl/handshake_server.cc
-+@@ -534,6 +534,22 @@ static enum ssl_hs_wait_t do_select_certificate(SSL_HANDSHAKE *hs) {
-+     return ssl_hs_error;
-+   }
-+ 
-++  if (hs->ocsp_stapling_requested &&
-++      ssl->ctx->legacy_ocsp_callback != nullptr) {
-++    switch (ssl->ctx->legacy_ocsp_callback(
-++        ssl, ssl->ctx->legacy_ocsp_callback_arg)) {
-++      case SSL_TLSEXT_ERR_OK:
-++        break;
-++      case SSL_TLSEXT_ERR_NOACK:
-++        hs->ocsp_stapling_requested = false;
-++        break;
-++      default:
-++        OPENSSL_PUT_ERROR(SSL, SSL_R_OCSP_CB_ERROR);
-++        ssl_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_INTERNAL_ERROR);
-++        return ssl_hs_error;
-++    }
-++  }
-++
-+   if (ssl_protocol_version(ssl) >= TLS1_3_VERSION) {
-+     // Jump to the TLS 1.3 state machine.
-+     hs->state = state_tls13;
-+diff --git a/ssl/internal.h b/ssl/internal.h
-+index d13d5f2..1cdfb8e 100644
-+--- a/ssl/internal.h
-++++ b/ssl/internal.h
-+@@ -2140,6 +2140,11 @@ struct SSLContext {
-+   // session tickets.
-+   const SSL_TICKET_AEAD_METHOD *ticket_aead_method;
-+ 
-++  // legacy_ocsp_callback implements an OCSP-related callback for OpenSSL
-++  // compatibility.
-++  int (*legacy_ocsp_callback)(SSL *ssl, void *arg);
-++  void *legacy_ocsp_callback_arg;
-++
-+   // verify_sigalgs, if not empty, is the set of signature algorithms
-+   // accepted from the peer in decreasing order of preference.
-+   uint16_t *verify_sigalgs;
-+diff --git a/ssl/ssl_lib.cc b/ssl/ssl_lib.cc
-+index 9f56d54..50608e9 100644
-+--- a/ssl/ssl_lib.cc
-++++ b/ssl/ssl_lib.cc
-+@@ -1591,9 +1591,9 @@ int SSL_CTX_get_read_ahead(const SSL_CTX *ctx) { return 0; }
-+ 
-+ int SSL_get_read_ahead(const SSL *ssl) { return 0; }
-+ 
-+-void SSL_CTX_set_read_ahead(SSL_CTX *ctx, int yes) { }
-++int SSL_CTX_set_read_ahead(SSL_CTX *ctx, int yes) { return 1; }
-+ 
-+-void SSL_set_read_ahead(SSL *ssl, int yes) { }
-++int SSL_set_read_ahead(SSL *ssl, int yes) { return 1; }
-+ 
-+ int SSL_pending(const SSL *ssl) {
-+   return static_cast<int>(ssl->s3->pending_app_data.size());
-+@@ -2205,7 +2205,7 @@ const COMP_METHOD *SSL_get_current_compression(SSL *ssl) { return NULL; }
-+ 
-+ const COMP_METHOD *SSL_get_current_expansion(SSL *ssl) { return NULL; }
-+ 
-+-int *SSL_get_server_tmp_key(SSL *ssl, EVP_PKEY **out_key) { return 0; }
-++int SSL_get_server_tmp_key(SSL *ssl, EVP_PKEY **out_key) { return 0; }
-+ 
-+ void SSL_CTX_set_quiet_shutdown(SSL_CTX *ctx, int mode) {
-+   ctx->quiet_shutdown = (mode != 0);
-+@@ -2717,3 +2717,33 @@ void SSL_CTX_set_ticket_aead_method(SSL_CTX *ctx,
-+                                     const SSL_TICKET_AEAD_METHOD *aead_method) {
-+   ctx->ticket_aead_method = aead_method;
-+ }
-++
-++int SSL_set_tlsext_status_type(SSL *ssl, int type) {
-++  ssl->ocsp_stapling_enabled = type == TLSEXT_STATUSTYPE_ocsp;
-++  return 1;
-++}
-++
-++int SSL_set_tlsext_status_ocsp_resp(SSL *ssl, uint8_t *resp, size_t resp_len) {
-++  if (SSL_set_ocsp_response(ssl, resp, resp_len)) {
-++    OPENSSL_free(resp);
-++    return 1;
-++  }
-++  return 0;
-++}
-++
-++size_t SSL_get_tlsext_status_ocsp_resp(const SSL *ssl, const uint8_t **out) {
-++  size_t ret;
-++  SSL_get0_ocsp_response(ssl, out, &ret);
-++  return ret;
-++}
-++
-++int SSL_CTX_set_tlsext_status_cb(SSL_CTX *ctx,
-++                                 int (*callback)(SSL *ssl, void *arg)) {
-++  ctx->legacy_ocsp_callback = callback;
-++  return 1;
-++}
-++
-++int SSL_CTX_set_tlsext_status_arg(SSL_CTX *ctx, void *arg) {
-++  ctx->legacy_ocsp_callback_arg = arg;
-++  return 1;
-++}
-+diff --git a/ssl/test/bssl_shim.cc b/ssl/test/bssl_shim.cc
-+index ae26ded..3a33d60 100644
-+--- a/ssl/test/bssl_shim.cc
-++++ b/ssl/test/bssl_shim.cc
-+@@ -495,6 +495,7 @@ static bool GetCertificate(SSL *ssl, bssl::UniquePtr<X509> *out_x509,
-+     return false;
-+   }
-+   if (!config->ocsp_response.empty() &&
-++      !config->set_ocsp_in_callback &&
-+       !SSL_set_ocsp_response(ssl, (const uint8_t *)config->ocsp_response.data(),
-+                              config->ocsp_response.size())) {
-+     return false;
-+@@ -1100,6 +1101,27 @@ static void MessageCallback(int is_write, int version, int content_type,
-+   }
-+ }
-+ 
-++static int LegacyOCSPCallback(SSL *ssl, void *arg) {
-++  const TestConfig *config = GetTestConfig(ssl);
-++  if (!SSL_is_server(ssl)) {
-++    return !config->fail_ocsp_callback;
-++  }
-++
-++  if (!config->ocsp_response.empty() &&
-++      config->set_ocsp_in_callback &&
-++      !SSL_set_ocsp_response(ssl, (const uint8_t *)config->ocsp_response.data(),
-++                             config->ocsp_response.size())) {
-++    return SSL_TLSEXT_ERR_ALERT_FATAL;
-++  }
-++  if (config->fail_ocsp_callback) {
-++    return SSL_TLSEXT_ERR_ALERT_FATAL;
-++  }
-++  if (config->decline_ocsp_callback) {
-++    return SSL_TLSEXT_ERR_NOACK;
-++  }
-++  return SSL_TLSEXT_ERR_OK;
-++}
-++
-+ // Connect returns a new socket connected to localhost on |port| or -1 on
-+ // error.
-+ static int Connect(uint16_t port) {
-+@@ -1334,6 +1356,10 @@ static bssl::UniquePtr<SSL_CTX> SetupCtx(SSL_CTX *old_ctx,
-+     SSL_CTX_set_false_start_allowed_without_alpn(ssl_ctx.get(), 1);
-+   }
-+ 
-++  if (config->use_ocsp_callback) {
-++    SSL_CTX_set_tlsext_status_cb(ssl_ctx.get(), LegacyOCSPCallback);
-++  }
-++
-+   if (old_ctx) {
-+     uint8_t keys[48];
-+     if (!SSL_CTX_get_tlsext_ticket_keys(old_ctx, &keys, sizeof(keys)) ||
-+diff --git a/ssl/test/runner/alert.go b/ssl/test/runner/alert.go
-+index 652e9ee..c79725e 100644
-+--- a/ssl/test/runner/alert.go
-++++ b/ssl/test/runner/alert.go
-+@@ -15,69 +15,71 @@ const (
-+ )
-+ 
-+ const (
-+-	alertCloseNotify            alert = 0
-+-	alertEndOfEarlyData         alert = 1
-+-	alertUnexpectedMessage      alert = 10
-+-	alertBadRecordMAC           alert = 20
-+-	alertDecryptionFailed       alert = 21
-+-	alertRecordOverflow         alert = 22
-+-	alertDecompressionFailure   alert = 30
-+-	alertHandshakeFailure       alert = 40
-+-	alertNoCertificate          alert = 41
-+-	alertBadCertificate         alert = 42
-+-	alertUnsupportedCertificate alert = 43
-+-	alertCertificateRevoked     alert = 44
-+-	alertCertificateExpired     alert = 45
-+-	alertCertificateUnknown     alert = 46
-+-	alertIllegalParameter       alert = 47
-+-	alertUnknownCA              alert = 48
-+-	alertAccessDenied           alert = 49
-+-	alertDecodeError            alert = 50
-+-	alertDecryptError           alert = 51
-+-	alertProtocolVersion        alert = 70
-+-	alertInsufficientSecurity   alert = 71
-+-	alertInternalError          alert = 80
-+-	alertInappropriateFallback  alert = 86
-+-	alertUserCanceled           alert = 90
-+-	alertNoRenegotiation        alert = 100
-+-	alertMissingExtension       alert = 109
-+-	alertUnsupportedExtension   alert = 110
-+-	alertUnrecognizedName       alert = 112
-+-	alertUnknownPSKIdentity     alert = 115
-+-	alertCertificateRequired    alert = 116
-++	alertCloseNotify                  alert = 0
-++	alertEndOfEarlyData               alert = 1
-++	alertUnexpectedMessage            alert = 10
-++	alertBadRecordMAC                 alert = 20
-++	alertDecryptionFailed             alert = 21
-++	alertRecordOverflow               alert = 22
-++	alertDecompressionFailure         alert = 30
-++	alertHandshakeFailure             alert = 40
-++	alertNoCertificate                alert = 41
-++	alertBadCertificate               alert = 42
-++	alertUnsupportedCertificate       alert = 43
-++	alertCertificateRevoked           alert = 44
-++	alertCertificateExpired           alert = 45
-++	alertCertificateUnknown           alert = 46
-++	alertIllegalParameter             alert = 47
-++	alertUnknownCA                    alert = 48
-++	alertAccessDenied                 alert = 49
-++	alertDecodeError                  alert = 50
-++	alertDecryptError                 alert = 51
-++	alertProtocolVersion              alert = 70
-++	alertInsufficientSecurity         alert = 71
-++	alertInternalError                alert = 80
-++	alertInappropriateFallback        alert = 86
-++	alertUserCanceled                 alert = 90
-++	alertNoRenegotiation              alert = 100
-++	alertMissingExtension             alert = 109
-++	alertUnsupportedExtension         alert = 110
-++	alertUnrecognizedName             alert = 112
-++	alertBadCertificateStatusResponse alert = 113
-++	alertUnknownPSKIdentity           alert = 115
-++	alertCertificateRequired          alert = 116
-+ )
-+ 
-+ var alertText = map[alert]string{
-+-	alertCloseNotify:            "close notify",
-+-	alertEndOfEarlyData:         "end of early data",
-+-	alertUnexpectedMessage:      "unexpected message",
-+-	alertBadRecordMAC:           "bad record MAC",
-+-	alertDecryptionFailed:       "decryption failed",
-+-	alertRecordOverflow:         "record overflow",
-+-	alertDecompressionFailure:   "decompression failure",
-+-	alertHandshakeFailure:       "handshake failure",
-+-	alertNoCertificate:          "no certificate",
-+-	alertBadCertificate:         "bad certificate",
-+-	alertUnsupportedCertificate: "unsupported certificate",
-+-	alertCertificateRevoked:     "revoked certificate",
-+-	alertCertificateExpired:     "expired certificate",
-+-	alertCertificateUnknown:     "unknown certificate",
-+-	alertIllegalParameter:       "illegal parameter",
-+-	alertUnknownCA:              "unknown certificate authority",
-+-	alertAccessDenied:           "access denied",
-+-	alertDecodeError:            "error decoding message",
-+-	alertDecryptError:           "error decrypting message",
-+-	alertProtocolVersion:        "protocol version not supported",
-+-	alertInsufficientSecurity:   "insufficient security level",
-+-	alertInternalError:          "internal error",
-+-	alertInappropriateFallback:  "inappropriate fallback",
-+-	alertUserCanceled:           "user canceled",
-+-	alertNoRenegotiation:        "no renegotiation",
-+-	alertMissingExtension:       "missing extension",
-+-	alertUnsupportedExtension:   "unsupported extension",
-+-	alertUnrecognizedName:       "unrecognized name",
-+-	alertUnknownPSKIdentity:     "unknown PSK identity",
-+-	alertCertificateRequired:    "certificate required",
-++	alertCloseNotify:                  "close notify",
-++	alertEndOfEarlyData:               "end of early data",
-++	alertUnexpectedMessage:            "unexpected message",
-++	alertBadRecordMAC:                 "bad record MAC",
-++	alertDecryptionFailed:             "decryption failed",
-++	alertRecordOverflow:               "record overflow",
-++	alertDecompressionFailure:         "decompression failure",
-++	alertHandshakeFailure:             "handshake failure",
-++	alertNoCertificate:                "no certificate",
-++	alertBadCertificate:               "bad certificate",
-++	alertUnsupportedCertificate:       "unsupported certificate",
-++	alertCertificateRevoked:           "revoked certificate",
-++	alertCertificateExpired:           "expired certificate",
-++	alertCertificateUnknown:           "unknown certificate",
-++	alertIllegalParameter:             "illegal parameter",
-++	alertUnknownCA:                    "unknown certificate authority",
-++	alertAccessDenied:                 "access denied",
-++	alertDecodeError:                  "error decoding message",
-++	alertDecryptError:                 "error decrypting message",
-++	alertProtocolVersion:              "protocol version not supported",
-++	alertInsufficientSecurity:         "insufficient security level",
-++	alertInternalError:                "internal error",
-++	alertInappropriateFallback:        "inappropriate fallback",
-++	alertUserCanceled:                 "user canceled",
-++	alertNoRenegotiation:              "no renegotiation",
-++	alertMissingExtension:             "missing extension",
-++	alertUnsupportedExtension:         "unsupported extension",
-++	alertBadCertificateStatusResponse: "bad certificate status response",
-++	alertUnrecognizedName:             "unrecognized name",
-++	alertUnknownPSKIdentity:           "unknown PSK identity",
-++	alertCertificateRequired:          "certificate required",
-+ }
-+ 
-+ func (e alert) String() string {
-+diff --git a/ssl/test/runner/runner.go b/ssl/test/runner/runner.go
-+index 510a48b..1a6d0f9 100644
-+--- a/ssl/test/runner/runner.go
-++++ b/ssl/test/runner/runner.go
-+@@ -4744,60 +4744,157 @@ func addStateMachineCoverageTests(config stateMachineTestConfig) {
-+ 	})
-+ 
-+ 	// OCSP stapling tests.
-+-	tests = append(tests, testCase{
-+-		testType: clientTest,
-+-		name:     "OCSPStapling-Client",
-+-		config: Config{
-+-			MaxVersion: VersionTLS12,
-+-		},
-+-		flags: []string{
-+-			"-enable-ocsp-stapling",
-+-			"-expect-ocsp-response",
-+-			base64.StdEncoding.EncodeToString(testOCSPResponse),
-+-			"-verify-peer",
-+-		},
-+-		resumeSession: true,
-+-	})
-+-	tests = append(tests, testCase{
-+-		testType: serverTest,
-+-		name:     "OCSPStapling-Server",
-+-		config: Config{
-+-			MaxVersion: VersionTLS12,
-+-		},
-+-		expectedOCSPResponse: testOCSPResponse,
-+-		flags: []string{
-+-			"-ocsp-response",
-+-			base64.StdEncoding.EncodeToString(testOCSPResponse),
-+-		},
-+-		resumeSession: true,
-+-	})
-+-	tests = append(tests, testCase{
-+-		testType: clientTest,
-+-		name:     "OCSPStapling-Client-TLS13",
-+-		config: Config{
-+-			MaxVersion: VersionTLS13,
-+-		},
-+-		flags: []string{
-+-			"-enable-ocsp-stapling",
-+-			"-expect-ocsp-response",
-+-			base64.StdEncoding.EncodeToString(testOCSPResponse),
-+-			"-verify-peer",
-+-		},
-+-		resumeSession: true,
-+-	})
-+-	tests = append(tests, testCase{
-+-		testType: serverTest,
-+-		name:     "OCSPStapling-Server-TLS13",
-+-		config: Config{
-+-			MaxVersion: VersionTLS13,
-+-		},
-+-		expectedOCSPResponse: testOCSPResponse,
-+-		flags: []string{
-+-			"-ocsp-response",
-+-			base64.StdEncoding.EncodeToString(testOCSPResponse),
-+-		},
-+-		resumeSession: true,
-+-	})
-++	for _, vers := range tlsVersions {
-++		if config.protocol == dtls && !vers.hasDTLS {
-++			continue
-++		}
-++		if vers.version == VersionSSL30 {
-++			continue
-++		}
-++		tests = append(tests, testCase{
-++			testType: clientTest,
-++			name:     "OCSPStapling-Client-" + vers.name,
-++			config: Config{
-++				MaxVersion: vers.version,
-++			},
-++			tls13Variant: vers.tls13Variant,
-++			flags: []string{
-++				"-enable-ocsp-stapling",
-++				"-expect-ocsp-response",
-++				base64.StdEncoding.EncodeToString(testOCSPResponse),
-++				"-verify-peer",
-++			},
-++			resumeSession: true,
-++		})
-++		tests = append(tests, testCase{
-++			testType: serverTest,
-++			name:     "OCSPStapling-Server-" + vers.name,
-++			config: Config{
-++				MaxVersion: vers.version,
-++			},
-++			tls13Variant:         vers.tls13Variant,
-++			expectedOCSPResponse: testOCSPResponse,
-++			flags: []string{
-++				"-ocsp-response",
-++				base64.StdEncoding.EncodeToString(testOCSPResponse),
-++			},
-++			resumeSession: true,
-++		})
-++
-++		// The client OCSP callback is an alternate certificate
-++		// verification callback.
-++		tests = append(tests, testCase{
-++			testType: clientTest,
-++			name:     "ClientOCSPCallback-Pass-" + vers.name,
-++			config: Config{
-++				MaxVersion:   vers.version,
-++				Certificates: []Certificate{rsaCertificate},
-++			},
-++			tls13Variant: vers.tls13Variant,
-++			flags: []string{
-++				"-enable-ocsp-stapling",
-++				"-use-ocsp-callback",
-++			},
-++		})
-++		var expectedLocalError string
-++		if !config.async {
-++			// TODO(davidben): Asynchronous fatal alerts are never
-++			// sent. https://crbug.com/boringssl/130.
-++			expectedLocalError = "remote error: bad certificate status response"
-++		}
-++		tests = append(tests, testCase{
-++			testType: clientTest,
-++			name:     "ClientOCSPCallback-Fail-" + vers.name,
-++			config: Config{
-++				MaxVersion:   vers.version,
-++				Certificates: []Certificate{rsaCertificate},
-++			},
-++			tls13Variant: vers.tls13Variant,
-++			flags: []string{
-++				"-enable-ocsp-stapling",
-++				"-use-ocsp-callback",
-++				"-fail-ocsp-callback",
-++			},
-++			shouldFail:         true,
-++			expectedLocalError: expectedLocalError,
-++			expectedError:      ":OCSP_CB_ERROR:",
-++		})
-++		// The callback does not run if the server does not send an
-++		// OCSP response.
-++		certNoStaple := rsaCertificate
-++		certNoStaple.OCSPStaple = nil
-++		tests = append(tests, testCase{
-++			testType: clientTest,
-++			name:     "ClientOCSPCallback-FailNoStaple-" + vers.name,
-++			config: Config{
-++				MaxVersion:   vers.version,
-++				Certificates: []Certificate{certNoStaple},
-++			},
-++			tls13Variant: vers.tls13Variant,
-++			flags: []string{
-++				"-enable-ocsp-stapling",
-++				"-use-ocsp-callback",
-++				"-fail-ocsp-callback",
-++			},
-++		})
-++
-++		// The server OCSP callback is a legacy mechanism for
-++		// configuring OCSP, used by unreliable server software.
-++		tests = append(tests, testCase{
-++			testType: serverTest,
-++			name:     "ServerOCSPCallback-SetInCallback-" + vers.name,
-++			config: Config{
-++				MaxVersion: vers.version,
-++			},
-++			tls13Variant:         vers.tls13Variant,
-++			expectedOCSPResponse: testOCSPResponse,
-++			flags: []string{
-++				"-use-ocsp-callback",
-++				"-set-ocsp-in-callback",
-++				"-ocsp-response",
-++				base64.StdEncoding.EncodeToString(testOCSPResponse),
-++			},
-++			resumeSession: true,
-++		})
-++
-++		// The callback may decline OCSP, in which case  we act as if
-++		// the client did not support it, even if a response was
-++		// configured.
-++		tests = append(tests, testCase{
-++			testType: serverTest,
-++			name:     "ServerOCSPCallback-Decline-" + vers.name,
-++			config: Config{
-++				MaxVersion: vers.version,
-++			},
-++			tls13Variant:         vers.tls13Variant,
-++			expectedOCSPResponse: []byte{},
-++			flags: []string{
-++				"-use-ocsp-callback",
-++				"-decline-ocsp-callback",
-++				"-ocsp-response",
-++				base64.StdEncoding.EncodeToString(testOCSPResponse),
-++			},
-++			resumeSession: true,
-++		})
-++
-++		// The callback may also signal an internal error.
-++		tests = append(tests, testCase{
-++			testType: serverTest,
-++			name:     "ServerOCSPCallback-Fail-" + vers.name,
-++			config: Config{
-++				MaxVersion: vers.version,
-++			},
-++			tls13Variant: vers.tls13Variant,
-++			flags: []string{
-++				"-use-ocsp-callback",
-++				"-fail-ocsp-callback",
-++				"-ocsp-response",
-++				base64.StdEncoding.EncodeToString(testOCSPResponse),
-++			},
-++			shouldFail:    true,
-++			expectedError: ":OCSP_CB_ERROR:",
-++		})
-++	}
-+ 
-+ 	// Certificate verification tests.
-+ 	for _, vers := range tlsVersions {
-+diff --git a/ssl/test/test_config.cc b/ssl/test/test_config.cc
-+index f50251d..3afb01b 100644
-+--- a/ssl/test/test_config.cc
-++++ b/ssl/test/test_config.cc
-+@@ -133,6 +133,10 @@ const Flag<bool> kBoolFlags[] = {
-+   { "-expect-draft-downgrade", &TestConfig::expect_draft_downgrade },
-+   { "-handoff", &TestConfig::handoff },
-+   { "-expect-dummy-pq-padding", &TestConfig::expect_dummy_pq_padding },
-++  { "-use-ocsp-callback", &TestConfig::use_ocsp_callback },
-++  { "-set-ocsp-in-callback", &TestConfig::set_ocsp_in_callback },
-++  { "-decline-ocsp-callback", &TestConfig::decline_ocsp_callback },
-++  { "-fail-ocsp-callback", &TestConfig::fail_ocsp_callback },
-+ };
-+ 
-+ const Flag<std::string> kStringFlags[] = {
-+diff --git a/ssl/test/test_config.h b/ssl/test/test_config.h
-+index fb479d1..a9eec62 100644
-+--- a/ssl/test/test_config.h
-++++ b/ssl/test/test_config.h
-+@@ -154,6 +154,10 @@ struct TestConfig {
-+   int dummy_pq_padding_len = 0;
-+   bool handoff = false;
-+   bool expect_dummy_pq_padding = false;
-++  bool use_ocsp_callback = false;
-++  bool set_ocsp_in_callback = false;
-++  bool decline_ocsp_callback = false;
-++  bool fail_ocsp_callback = false;
-+ };
-+ 
-+ bool ParseConfig(int argc, char **argv, TestConfig *out_initial,
-+-- 
-+2.7.4
-+
-added in remote
-  their  100644 9a5a68bc9ff774e1395e6d96c7547a37733a787d patches/common/chromium/.patches.yaml
-@@ -0,0 +1,404 @@
-+repo: src
-+patches:
-+-
-+  owners: alespergl
-+  file: build_gn.patch
-+  description: null
-+-
-+  owners: alespergl, deepak1556
-+  file: dcheck.patch
-+  description: |
-+    This disables some debug checks which currently fail when running the Electron
-+    test suite. In general there should be sustained effort to have all debug checks
-+    enabled. If you want to help, choose one of the diffs below and remove it. Then
-+    build Electron (debug configuration) and make sure all tests pass on the CI
-+    systems. Unfortunately the tests don't always cover the check failures, so it's
-+    good to also run some non-trivial Electron app to verify.
-+
-+    Apart from getting rid of a whole diff, you may also be able to replace one diff
-+    with another which enables at least some of the previously disabled checks. For
-+    example, the checks might be disabled for a whole build target, but actually
-+    only one or two specific checks fail. Then it's better to simply comment out the
-+    failing checks and allow the rest of the target to have them enabled.
-+
-+    Please keep the following lists updated.
-+
-+    The ELECTRON_NO_DCHECK build flag disables debug checks universally.
-+    This patch applies the flag to the following GN targets:
-+
-+      third_party/WebKit/Source/core/loader:loader
-+      url:url
-+
-+    These files have debug checks explicitly commented out:
-+
-+      base/memory/weak_ptr.cc
-+      base/process/kill_win.cc
-+      components/viz/service/display/program_binding.h
-+      content/browser/frame_host/navigation_controller_impl.cc
-+      content/browser/frame_host/render_frame_host_impl.cc
-+      content/browser/renderer_host/render_widget_host_view_mac.mm
-+      ppapi/host/ppapi_host.cc
-+      third_party/WebKit/Source/core/dom/Node.cpp
-+      third_party/WebKit/Source/platform/wtf/text/StringImpl.h
-+      ui/base/clipboard/clipboard_win.cc
-+-
-+  owners: zcbenz
-+  file: accelerator.patch
-+  description: null
-+-
-+  owners: alespergl
-+  file: allow_new_privs.patch
-+  description: null
-+-
-+  owners: null
-+  file: app_indicator_icon_menu.patch
-+  description: null
-+-
-+  owners: zcbenz
-+  file: blink_file_path.patch
-+  description: null
-+-
-+  owners: zcbenz
-+  file: blink_local_frame.patch
-+  description: |
-+    According to electron/electron#3699, it is unreliable to use |unload|
-+    event for process.exit('exit'), so we have to do that in
-+    willReleaseScriptContext.
-+
-+    However Chromium then disallowed scripting in willReleaseScriptContext
-+    in https://codereview.chromium.org/1657583002, and crash will happen
-+    when there is code doing that.
-+
-+    This patch reverts the change to fix the crash in Electron.
-+-
-+  owners: null
-+  file: blink_world_context.patch
-+  description: null
-+-
-+  owners: zcbenz
-+  file: browser_compositor_mac.patch
-+  description: null
-+-
-+  owners: null
-+  file: browser_plugin_wheel.patch
-+  description: null
-+-
-+  owners: null
-+  file: build_toolchain_win_patch.patch
-+  description: |
-+    Patch the Windows build toolchain to generate unique PDB names
-+
-+    When the PDB files generated by the `static_library` build are
-+    packaged for distribution they are all copied to a single folder,
-+    some of the PDB files have identical names so they end up
-+    overwriting each other. The missing PDB files cause linker warnings
-+    when building Electron in Release mode, and make it more difficult
-+    to debug release builds.
-+
-+    This patch modifies the PDB naming convention for the
-+    `static_library` build configuration to ensure PDB names are unique.
-+    For example, instead of generating `obj/ui/base/base_cc.pdb` the
-+    build will now generate `obj/ui/base/obj_ui_base_base_cc.pdb`.
-+-
-+  owners: zcbenz
-+  file: can_create_window.patch
-+  description: null
-+-
-+  owners: null
-+  file: compositor_delegate.patch
-+  description: null
-+-
-+  owners: null
-+  file: desktop_screen_win.patch
-+  description: null
-+-
-+  owners: zcbenz
-+  file: disable_hidden.patch
-+  description: null
-+-
-+  owners: zcbenz
-+  file: dom_storage_map.patch
-+  description: null
-+-
-+  owners: zcbenz, deepak1556
-+  file: frame_host_manager.patch
-+  description: null
-+-
-+  owners: tonyganch
-+  file: latency_info.patch
-+  description: null
-+-
-+  owners: zcbenz
-+  file: net_url_request_job.patch
-+  description: null
-+-
-+  owners: alexeykuzmin
-+  file: no_stack_dumping.patch
-+  description: null
-+-
-+  owners: deepak1556
-+  file: out_of_process_instance.patch
-+  description: null
-+-
-+  owners: alexeykuzmin
-+  file: protobuf_build_gn.patch
-+  description: null
-+-
-+  owners: null
-+  file: render_widget_host_view_base.patch
-+  description: null
-+-
-+  owners: zcbenz
-+  file: render_widget_host_view_mac.patch
-+  description: null
-+-
-+  owners: null
-+  file: scoped_clipboard_writer.patch
-+  description: null
-+-
-+  owners: deepak1556
-+  file: stream_resource_handler.patch
-+  description: null
-+-
-+  owners: null
-+  file: thread_capabilities.patch
-+  description: |
-+    Chromium automatically drops all capabilities of renderer threads in
-+    Linux, which may cause issues in a context like Electron, where the main
-+    and renderer threads are supposed to keep inherited permissions over the
-+    system.
-+
-+    See https://github.com/atom/electron/issues/3666
-+-
-+  owners: zcbenz
-+  file: use_transparent_window.patch
-+  description: null
-+-
-+  owners: null
-+  file: web_contents.patch
-+  description: null
-+-
-+  owners: miniak
-+  file: webgl_context_attributes.patch
-+  description: null
-+-
-+  owners: null
-+  file: webview_cross_drag.patch
-+  description: null
-+-
-+  owners: zcbenz
-+  file: worker_context_will_destroy.patch
-+  description: null
-+-
-+  owners: null
-+  file: webui_in_subframes.patch
-+  description: null
-+-
-+  owners: alexeykuzmin
-+  file: export_blink_webdisplayitemlist.patch
-+  description: null
-+-
-+  owners: alexeykuzmin
-+  file: statically_build_power_save_blocker.patch
-+  description: null
-+-
-+  owners: gavignus
-+  file: browser_plugin_guest.patch
-+  description: null
-+-
-+  owners: alexeykuzmin
-+  file: disable_user_gesture_requirement_for_beforeunload_dialogs.patch
-+  description: See https://github.com/electron/electron/issues/10754
-+-
-+  owners: alexeykuzmin
-+  file: add_atomic_lib_to_dependencies_even_for_sysroot_builds.patch
-+  description: null
-+-
-+  owners: zcbenz
-+  file: gin_enable_disable_v8_platform.patch
-+  description: null
-+-
-+  owners: deepak1556
-+  file: disable-recursive-surface-sync.patch
-+  description: null
-+-
-+  owners: deepak1556
-+  file: blink-worker-enable-csp-in-file-scheme.patch
-+  description: null
-+-
-+  owners: zcbenz
-+  file: fix-arm64-linking-error.patch
-+  description: Do not use system freetype for arm64
-+-
-+  owners: brenca
-+  file: disable-redraw-lock.patch
-+  description:  |
-+    Chromium uses a custom window titlebar implementation on Windows when DWM
-+    is disabled (Windows 7 and earlier, non Aero theme). The native titlebar
-+    sometimes painted over this custom titlebar, so a workaround was put in
-+    place to lock redraws in reaction to certain events if DWM is disabled,
-+    since the code assumes that in that case, the custom titlebar is painted.
-+    Electron forces the use of the native titlebar, which the workaround doesn't
-+    take into account, and still locks redraws, causing weird repainting issues
-+    in electron (and other applications). This patch provides a way to disable
-+    the redraw locking mechanism, which fixes these issues. The electron issue
-+    can be found at https://github.com/electron/electron/issues/1821
-+-
-+  owners: MarshallOfSound
-+  file: backport_35dabc0.patch
-+  description: |
-+      Backports "ServiceWorker: Fix a jumbo build error",
-+      see https://chromium-review.googlesource.com/957568
-+      Original change's landed in 67.0.3369.0.
-+-
-+  owners: alexeykuzmin
-+  file: exclude_next_version_mini_installer_from_deps.patch
-+  description: |
-+      It breaks ninja files generation for the "shared_library" configuration.
-+      Probably won't be needed on the next Chromium upgrade (after 66).
-+-
-+  owners: alexeykuzmin
-+  file: allow_chromiumcontent_to_depend_on_device_service.patch
-+  description: By default we cannot depend on it, but we want to use it.
-+-
-+  owners: nitsakh
-+  file: v8_context_snapshot_generator.patch
-+  description: |
-+      v8_context_snapshot_generator is a build time executable.
-+      The patch adds the config.
-+-
-+  owners: codebytere
-+  file: backport_953144.patch
-+  description: |
-+    Fixes failing <webview> loads devtools extensions registered on the parent
-+    window test by baking the screencast module into the remote debugging
-+    configurations of the inspector app. See
-+    https://chromium-review.googlesource.com/c/chromium/src/+/953144 for more
-+    details.
-+-
-+  owners: alexeykuzmin
-+  file: backport_ef091c206.patch
-+  description: |
-+      https://chromium-review.googlesource.com/969968
-+      The change originally landed in 67.0.3378.0.
-+-
-+  owners: torycl
-+  file: crashpad-disabled-windows.patch
-+  description: |
-+      On Windows Electron does not link Crashpad. This causes linking
-+      errors with Chromium where it is enabled by default.
-+      This patch will disable Crashpad in Chromium using fallback
-+      mechanism which uses Breakpad.
-+-
-+  owners: nornagon
-+  file: boringssl_build_gn.patch
-+  description: |
-+    Build BoringSSL with some extra functions that nodejs needs. Only affects
-+    the GN build; with the GYP build, nodejs is still built with OpenSSL.
-+-
-+  owners: deepak1556
-+  file: pepper_flash.patch
-+  description: |
-+    Allows building chrome pepper flash integration for Electron.
-+-
-+  owners: zcbenz
-+  file: no_cache_storage_check.patch
-+  description: |
-+    Do not check for unique origin in CacheStorage, in Electron we may have
-+    scripts running without an origin.
-+-
-+  owners: zcbenz
-+  file: blink_fix_prototype_assert.patch
-+  description: |
-+    A recent Chromium change has accidentally added assertion for the case when
-+    a new window object may not have a prototype attached. In Electron it may
-+    happen when preventDefault for a native new-window event.
-+    https://chromium.googlesource.com/chromium/src/+/f47b361887a31cccf42a6e21a82bccf28372bdaa%5E%21
-+    In the long term we should investigate why it happened, and take a more
-+    formal fix. But for now I'm just make this assertion silently pass away.
-+-
-+  owners: zcbenz
-+  file: disable_scroll_begin_dcheck.patch
-+  description: |
-+    When testing https://github.com/electron/electron/issues/13137 I have met
-+    these assertions. I grouped them together since they are all related to the
-+    ScrollBegin event.
-+-
-+  owners: nornagon
-+  file: libgtkui_export.patch
-+  description: |
-+    Export libgtkui symbols for the GN component build.
-+-
-+  owners: nornagon
-+  file: gtk_visibility.patch
-+  description: |
-+    Allow electron and brightray to depend on GTK in the GN build.
-+-
-+  owners: nornagon
-+  file: sysroot.patch
-+  description: |
-+    Make chrome's install-sysroot scripts point to our custom sysroot builds,
-+    which include extra deps that Electron needs (e.g. libnotify)
-+-
-+  owners: zcbenz
-+  file: mas_blink_no_private_api.patch
-+  description: |
-+    Guard usages in chromium code of private Mac APIs by MAS_BUILD, so they can
-+    be excluded for people who want to submit their apps to the Mac App store.
-+-
-+  owners: zcbenz
-+  file: mas_no_private_api.patch
-+  description: |
-+    Guard usages in blink of private Mac APIs by MAS_BUILD, so they can be
-+    excluded for people who want to submit their apps to the Mac App store.
-+-
-+  owners: nornagon
-+  file: resource_file_conflict.patch
-+  description: |
-+    Resolve conflict between //chrome's .pak files and //electron's. The paths
-+    that chrome code hardcodes require that we generate resources at these
-+    paths, but GN throws errors if there are multiple targets that generate the
-+    same files.
-+-
-+  owners: zcbenz
-+  file: scroll_bounce_flag.patch
-+  description: |
-+    Patch to make scrollBounce option work.
-+-
-+  owners: poiru
-+  file: backport_d65792a.patch
-+  description: |
-+    https://chromium-review.googlesource.com/c/chromium/src/+/1105698
-+    Fixes https://github.com/electron/electron/issues/13256
-+-
-+  owners: zcbenz
-+  file: webview_reattach.patch
-+  description: |
-+    Backports https://chromium-review.googlesource.com/c/chromium/src/+/1161391
-+    Fixes webview not working after renderer process restarted.
-+-
-+  owners: nornagon
-+  file: mas-cfisobjc.patch
-+  description: |
-+    Removes usage of the _CFIsObjC private API.
-+-
-+  owners: nornagon
-+  file: mas-cgdisplayusesforcetogray.patch
-+  description: |
-+    Removes usage of the CGDisplayUsesForceToGray private API.
-+-
-+  owners: nornagon
-+  file: mas-audiodeviceduck.patch
-+  description: |
-+    Removes usage of the AudioDeviceDuck private API.
-+-
-+  owners: nornagon
-+  file: mas-lssetapplicationlaunchservicesserverconnectionstatus.patch
-+  description: |
-+    Removes usage of the _LSSetApplicationLaunchServicesServerConnectionStatus
-+    private API.
-+-
-+  owners: zcbenz
-+  file: allow_webview_file_url.patch
-+  description: |
-+    Allow webview to load non-web URLs.
-added in remote
-  their  100644 b668b9771580c0de607381210d279f0f7c2ac2eb patches/common/chromium/accelerator.patch
-@@ -0,0 +1,86 @@
-+diff --git a/ui/base/accelerators/accelerator.cc b/ui/base/accelerators/accelerator.cc
-+index dd756238a056..878b468311eb 100644
-+--- a/ui/base/accelerators/accelerator.cc
-++++ b/ui/base/accelerators/accelerator.cc
-+@@ -9,6 +9,7 @@
-+ #include "base/i18n/rtl.h"
-+ #include "base/logging.h"
-+ #include "base/strings/string_util.h"
-++#include "base/strings/stringprintf.h"
-+ #include "base/strings/utf_string_conversions.h"
-+ #include "build/build_config.h"
-+ #include "ui/base/l10n/l10n_util.h"
-+@@ -19,9 +20,7 @@
-+ #include <windows.h>
-+ #endif
-+ 
-+-#if !defined(OS_WIN) && (defined(USE_AURA) || defined(OS_MACOSX))
-+ #include "ui/events/keycodes/keyboard_code_conversion.h"
-+-#endif
-+ 
-+ namespace ui {
-+ 
-+@@ -210,7 +209,16 @@ base::string16 Accelerator::GetShortcutText() const {
-+   }
-+ 
-+   base::string16 shortcut;
-++  unsigned int flags = 0;
-+   if (!string_id) {
-++    if (IsShiftDown())
-++        flags = ui::EF_SHIFT_DOWN;
-++    const uint16_t c = DomCodeToUsLayoutCharacter(
-++        UsLayoutKeyboardCodeToDomCode(key_code_), flags);
-++    if (c != 0)
-++      shortcut +=
-++          static_cast<base::string16::value_type>(
-++              base::ToUpperASCII(static_cast<base::char16>(c)));
-+ #if defined(OS_WIN)
-+     // Our fallback is to try translate the key code to a regular character
-+     // unless it is one of digits (VK_0 to VK_9). Some keyboard
-+@@ -219,20 +227,18 @@ base::string16 Accelerator::GetShortcutText() const {
-+     // accent' for '0'). For display in the menu (e.g. Ctrl-0 for the
-+     // default zoom level), we leave VK_[0-9] alone without translation.
-+     wchar_t key;
-+-    if (base::IsAsciiDigit(key_code_))
-++    if (base::IsAsciiDigit(key_code_)) {
-+       key = static_cast<wchar_t>(key_code_);
-+-    else
-+-      key = LOWORD(::MapVirtualKeyW(key_code_, MAPVK_VK_TO_CHAR));
-+-    shortcut += key;
-+-#elif defined(USE_AURA) || defined(OS_MACOSX)
-+-    const uint16_t c = DomCodeToUsLayoutCharacter(
-+-        UsLayoutKeyboardCodeToDomCode(key_code_), false);
-+-    if (c != 0)
-+-      shortcut +=
-+-          static_cast<base::string16::value_type>(base::ToUpperASCII(c));
-++      shortcut = key;
-++    }
-+ #endif
-++    if (key_code_ > VKEY_F1 && key_code_ <= VKEY_F24)
-++      shortcut += base::UTF8ToUTF16(
-++          base::StringPrintf("F%d", key_code_ - VKEY_F1 + 1));
-+   } else {
-+     shortcut = l10n_util::GetStringUTF16(string_id);
-++    if (IsShiftDown())
-++      shortcut = l10n_util::GetStringFUTF16(IDS_APP_SHIFT_MODIFIER, shortcut);
-+   }
-+ 
-+   // Checking whether the character used for the accelerator is alphanumeric.
-+@@ -247,15 +253,13 @@ base::string16 Accelerator::GetShortcutText() const {
-+     shortcut_rtl.assign(shortcut);
-+   }
-+ 
-+-  if (IsShiftDown())
-+-    shortcut = l10n_util::GetStringFUTF16(IDS_APP_SHIFT_MODIFIER, shortcut);
-+-
-+   // Note that we use 'else-if' in order to avoid using Ctrl+Alt as a shortcut.
-+   // See http://blogs.msdn.com/oldnewthing/archive/2004/03/29/101121.aspx for
-+   // more information.
-+   if (IsCtrlDown())
-+     shortcut = l10n_util::GetStringFUTF16(IDS_APP_CONTROL_MODIFIER, shortcut);
-+-  else if (IsAltDown())
-++
-++  if (IsAltDown())
-+     shortcut = l10n_util::GetStringFUTF16(IDS_APP_ALT_MODIFIER, shortcut);
-+ 
-+   if (IsCmdDown()) {
-added in remote
-  their  100644 3b55672a31bea17e1074c1ffdeeb839931669a8a patches/common/chromium/add_atomic_lib_to_dependencies_even_for_sysroot_builds.patch
-@@ -0,0 +1,13 @@
-+diff --git a/base/BUILD.gn b/base/BUILD.gn
-+index b674e703617d..5a7a11d816cf 100644
-+--- a/base/BUILD.gn
-++++ b/base/BUILD.gn
-+@@ -1131,7 +1131,7 @@ component("base") {
-+   # Needed for <atomic> if using newer C++ library than sysroot, except if
-+   # building inside the cros_sdk environment - use host_toolchain as a
-+   # more robust check for this.
-+-  if (!use_sysroot && (is_android || (is_linux && !is_chromecast)) &&
-++  if ((is_android || (is_linux && !is_chromecast)) &&
-+       host_toolchain != "//build/toolchain/cros:host") {
-+     libs = [ "atomic" ]
-+   }
-added in remote
-  their  100644 f62469fd5318628b80102d6ceda6c66fde5d2947 patches/common/chromium/allow_chromiumcontent_to_depend_on_device_service.patch
-@@ -0,0 +1,12 @@
-+diff --git a/services/device/BUILD.gn b/services/device/BUILD.gn
-+index 20301dbd005d..31a7568a8aa8 100644
-+--- a/services/device/BUILD.gn
-++++ b/services/device/BUILD.gn
-+@@ -18,6 +18,7 @@ source_set("lib") {
-+   # dependence should only be for the purpose of embedding the Device Service.
-+   visibility = [
-+     ":test_support",
-++    "//libchromiumcontent/chromiumcontent:device_service",
-+     "//content/browser",
-+   ]
-+   sources = [
-added in remote
-  their  100644 ea19187fd29ac3bc9d68afca17643e0ef6ab2b8d patches/common/chromium/allow_new_privs.patch
-@@ -0,0 +1,13 @@
-+diff --git a/base/process/launch.h b/base/process/launch.h
-+index 20b76fc..9db73bf 100644
-+--- a/base/process/launch.h
-++++ b/base/process/launch.h
-+@@ -147,7 +147,7 @@ struct BASE_EXPORT LaunchOptions {
-+ 
-+   // By default, child processes will have the PR_SET_NO_NEW_PRIVS bit set. If
-+   // true, then this bit will not be set in the new child process.
-+-  bool allow_new_privs = false;
-++  bool allow_new_privs = true;
-+ 
-+   // Sets parent process death signal to SIGKILL.
-+   bool kill_on_parent_death = false;
-added in remote
-  their  100644 af180d1902e77259ca6736fd7f20d4a9464ac8d5 patches/common/chromium/allow_webview_file_url.patch
-@@ -0,0 +1,13 @@
-+diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc
-+index 0c57d20..0916ed0 100644
-+--- a/content/browser/loader/resource_dispatcher_host_impl.cc
-++++ b/content/browser/loader/resource_dispatcher_host_impl.cc
-+@@ -1870,6 +1870,8 @@ void ResourceDispatcherHostImpl::BeginNavigationRequest(
-+       !policy->IsWebSafeScheme(info.common_params.url.scheme()) &&
-+       !is_external_protocol;
-+ 
-++  non_web_url_in_guest = false;
-++
-+   if (is_shutdown_ || non_web_url_in_guest ||
-+       (delegate_ && !delegate_->ShouldBeginRequest(
-+           info.common_params.method,
-added in remote
-  their  100644 baa32495cd75459806610fb8a26569f74b59ef3c patches/common/chromium/app_indicator_icon_menu.patch
-@@ -0,0 +1,13 @@
-+diff --git a/chrome/browser/ui/libgtkui/app_indicator_icon_menu.cc b/chrome/browser/ui/libgtkui/app_indicator_icon_menu.cc
-+index 91674b9..8a4c391 100644
-+--- a/chrome/browser/ui/libgtkui/app_indicator_icon_menu.cc
-++++ b/chrome/browser/ui/libgtkui/app_indicator_icon_menu.cc
-+@@ -116,7 +116,7 @@ void AppIndicatorIconMenu::OnMenuItemActivated(GtkWidget* menu_item) {
-+     return;
-+ 
-+   // The menu item can still be activated by hotkeys even if it is disabled.
-+-  if (menu_model_->IsEnabledAt(id))
-++  if (model->IsEnabledAt(id))
-+     ExecuteCommand(model, id);
-+ }
-+ 
-added in remote
-  their  100644 9a87158dfb0fc9f2d487934bde7bb9d1774fbd22 patches/common/chromium/backport_35dabc0.patch
-@@ -0,0 +1,23 @@
-+diff --git a/content/browser/service_worker/service_worker_version.cc b/content/browser/service_worker/service_worker_version.cc
-+index 2417abcfdae2..13a06d02e012 100644
-+--- a/content/browser/service_worker/service_worker_version.cc
-++++ b/content/browser/service_worker/service_worker_version.cc
-+@@ -53,9 +53,6 @@
-+ #include "third_party/WebKit/public/web/WebConsoleMessage.h"
-+ 
-+ namespace content {
-+-
-+-using StatusCallback = ServiceWorkerVersion::StatusCallback;
-+-
-+ namespace {
-+ 
-+ // Timeout for an installed worker to start.
-+@@ -103,7 +100,7 @@ void RunCallbacks(ServiceWorkerVersion* version,
-+ 
-+ // An adapter to run a |callback| after StartWorker.
-+ void RunCallbackAfterStartWorker(base::WeakPtr<ServiceWorkerVersion> version,
-+-                                 StatusCallback callback,
-++                                 ServiceWorkerVersion::StatusCallback callback,
-+                                  ServiceWorkerStatusCode status) {
-+   if (status == SERVICE_WORKER_OK &&
-+       version->running_status() != EmbeddedWorkerStatus::RUNNING) {
-added in remote
-  their  100644 f49d774ff403e6c1e7a9a5eee5496efbb53365de patches/common/chromium/backport_953144.patch
-@@ -0,0 +1,64 @@
-+diff --git a/content/shell/browser/shell_devtools_frontend.cc b/content/shell/browser/shell_devtools_frontend.cc
-+index 3b3221a..6447347 100644
-+--- a/content/shell/browser/shell_devtools_frontend.cc
-++++ b/content/shell/browser/shell_devtools_frontend.cc
-+@@ -19,8 +19,8 @@
-+ namespace {
-+ static GURL GetFrontendURL() {
-+   int port = ShellDevToolsManagerDelegate::GetHttpHandlerPort();
-+-  return GURL(
-+-      base::StringPrintf("http://127.0.0.1:%d/devtools/inspector.html", port));
-++  return GURL(base::StringPrintf(
-++      "http://127.0.0.1:%d/devtools/devtools_app.html", port));
-+ }
-+ }  // namespace
-+ 
-+diff --git a/third_party/WebKit/Source/devtools/BUILD.gn b/third_party/WebKit/Source/devtools/BUILD.gn
-+index 952b922..9e7b4bf 100644
-+--- a/third_party/WebKit/Source/devtools/BUILD.gn
-++++ b/third_party/WebKit/Source/devtools/BUILD.gn
-+@@ -1048,7 +1048,6 @@
-+   "$resources_out_dir/cm_modes/cm_modes_module.js",
-+   "$resources_out_dir/emulated_devices/emulated_devices_module.js",
-+   "$resources_out_dir/product_registry_impl/product_registry_impl_module.js",
-+-  "$resources_out_dir/screencast/screencast_module.js",
-+ ]
-+ 
-+ devtools_applications = [
-+diff --git a/third_party/WebKit/Source/devtools/front_end/inspector.json b/third_party/WebKit/Source/devtools/front_end/inspector.json
-+index 36c222f..dc2149a 100644
-+--- a/third_party/WebKit/Source/devtools/front_end/inspector.json
-++++ b/third_party/WebKit/Source/devtools/front_end/inspector.json
-+@@ -1,6 +1,6 @@
-+ {
-+   "modules" : [
-+-    { "name": "screencast", "type": "remote" }
-++    { "name": "screencast", "type": "autostart" }
-+   ],
-+   "extends": "devtools_app",
-+   "has_html": true
-+diff --git a/third_party/WebKit/Source/devtools/front_end/main/Main.js b/third_party/WebKit/Source/devtools/front_end/main/Main.js
-+index 4c9d9aa..e6d73b1 100644
-+--- a/third_party/WebKit/Source/devtools/front_end/main/Main.js
-++++ b/third_party/WebKit/Source/devtools/front_end/main/Main.js
-+@@ -212,19 +212,8 @@
-+     this._registerForwardedShortcuts();
-+     this._registerMessageSinkListener();
-+ 
-+-    // Pick first app we could instantiate (for test harness).
-+-    for (const extension of self.runtime.extensions(Common.AppProvider)) {
-+-      try {
-+-        const instance = await extension.instance();
-+-        if (instance) {
-+-          this._showAppUI(instance);
-+-          break;
-+-        }
-+-      } catch (e) {
-+-        console.error(e);
-+-      }
-+-    }
-+     Main.Main.timeEnd('Main._createAppUI');
-++    this._showAppUI(await self.runtime.extension(Common.AppProvider).instance());
-+   }
-+ 
-+   /**
-added in remote
-  their  100644 3d3973cb4655a9314f96f6b09a0d93de06a6ef56 patches/common/chromium/backport_d65792a.patch
-@@ -0,0 +1,12 @@
-+diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc
-+index bf4b1d0..a3b72c4 100644
-+@@ -995,7 +996,8 @@
-+
-+ void Widget::OnSizeConstraintsChanged() {
-+   native_widget_->OnSizeConstraintsChanged();
-+-  non_client_view_->SizeConstraintsChanged();
-++  if (non_client_view_)
-++    non_client_view_->SizeConstraintsChanged();
-+ }
-+
-+ void Widget::OnOwnerClosing() {}
-added in remote
-  their  100644 1aeb60493557a60dd2404b8693b6ae9e76bbf040 patches/common/chromium/backport_ef091c206.patch
-@@ -0,0 +1,29 @@
-+ef091c206803ebe507755cb65a1942b097fbeb32
-+diff --git a/gpu/command_buffer/service/sync_point_manager.cc b/gpu/command_buffer/service/sync_point_manager.cc
-+index 7fdf99e7e134..ac0811194c24 100644
-+--- a/gpu/command_buffer/service/sync_point_manager.cc
-++++ b/gpu/command_buffer/service/sync_point_manager.cc
-+@@ -133,7 +133,6 @@ void SyncPointOrderData::FinishProcessingOrderNumber(uint32_t order_num) {
-+   }
-+ 
-+   for (OrderFence& order_fence : ensure_releases) {
-+-    DLOG(ERROR) << "Client did not release sync token as expected";
-+     order_fence.client_state->EnsureWaitReleased(order_fence.fence_release,
-+                                                  order_fence.release_callback);
-+   }
-+@@ -156,7 +155,6 @@ bool SyncPointOrderData::ValidateReleaseOrderNumber(
-+   // We should have an unprocessed order number lower than the wait order
-+   // number for the wait to be valid. It's not possible for wait order number to
-+   // equal next unprocessed order number, but we handle that defensively.
-+-  DCHECK_NE(wait_order_num, unprocessed_order_nums_.front());
-+   if (wait_order_num <= unprocessed_order_nums_.front())
-+     return false;
-+ 
-+@@ -309,6 +307,7 @@ void SyncPointClientState::EnsureWaitReleased(uint64_t release,
-+ 
-+   if (call_callback) {
-+     // This effectively releases the wait without releasing the fence.
-++    DLOG(ERROR) << "Client did not release sync token as expected";
-+     callback.Run();
-+   }
-+ }
-added in remote
-  their  100644 9998e9bc70258439cb5954d0764cfb0ee9c5b1b9 patches/common/chromium/blink-worker-enable-csp-in-file-scheme.patch
-@@ -0,0 +1,12 @@
-+diff --git a/third_party/WebKit/Source/core/workers/WorkerScriptLoader.cpp b/third_party/WebKit/Source/core/workers/WorkerScriptLoader.cpp
-+index bdd886eff5e3..42a3f0ef6e55 100644
-+--- a/third_party/WebKit/Source/core/workers/WorkerScriptLoader.cpp
-++++ b/third_party/WebKit/Source/core/workers/WorkerScriptLoader.cpp
-+@@ -255,7 +255,6 @@ void WorkerScriptLoader::ProcessContentSecurityPolicy(
-+   // document (which is implemented in WorkerMessagingProxy, and
-+   // m_contentSecurityPolicy should be left as nullptr to inherit the policy).
-+   if (!response.Url().ProtocolIs("blob") &&
-+-      !response.Url().ProtocolIs("file") &&
-+       !response.Url().ProtocolIs("filesystem")) {
-+     content_security_policy_ = ContentSecurityPolicy::Create();
-+     content_security_policy_->SetOverrideURLForSelf(response.Url());
-added in remote
-  their  100644 7ca20c137c244546347abd14f4cd577c7f025ec8 patches/common/chromium/blink_file_path.patch
-@@ -0,0 +1,26 @@
-+diff --git a/third_party/WebKit/Source/core/fileapi/File.h b/third_party/WebKit/Source/core/fileapi/File.h
-+index 0bfe29512050..81439f7ab8f7 100644
-+--- a/third_party/WebKit/Source/core/fileapi/File.h
-++++ b/third_party/WebKit/Source/core/fileapi/File.h
-+@@ -170,6 +170,9 @@ class CORE_EXPORT File final : public Blob {
-+   }
-+   const String& name() const { return name_; }
-+ 
-++  // Getter for the path IDL attribute.
-++  const String& path() const { return GetPath(); }
-++
-+   // Getter for the lastModified IDL attribute,
-+   // http://dev.w3.org/2006/webapi/FileAPI/#file-attrs
-+   long long lastModified() const;
-+diff --git a/third_party/WebKit/Source/core/fileapi/File.idl b/third_party/WebKit/Source/core/fileapi/File.idl
-+index df954bc8f818..4683b2853bb4 100644
-+--- a/third_party/WebKit/Source/core/fileapi/File.idl
-++++ b/third_party/WebKit/Source/core/fileapi/File.idl
-+@@ -32,6 +32,7 @@
-+     Exposed=(Window,Worker)
-+ ] interface File : Blob {
-+     readonly attribute DOMString name;
-++    readonly attribute DOMString path;
-+     readonly attribute long long lastModified;
-+ 
-+     // Non-standard APIs
-added in remote
-  their  100644 5a0b4cbcf9e19eb9434dea6ec58f53f9f8cb9936 patches/common/chromium/blink_fix_prototype_assert.patch
-@@ -0,0 +1,17 @@
-+diff --git a/third_party/WebKit/Source/platform/bindings/V8ObjectConstructor.cpp b/third_party/WebKit/Source/platform/bindings/V8ObjectConstructor.cpp
-+index aedc832..8c26681 100644
-+--- a/third_party/WebKit/Source/platform/bindings/V8ObjectConstructor.cpp
-++++ b/third_party/WebKit/Source/platform/bindings/V8ObjectConstructor.cpp
-+@@ -94,8 +94,10 @@ v8::Local<v8::Function> V8ObjectConstructor::CreateInterfaceObject(
-+     bool get_prototype_value =
-+         interface_object->Get(context, V8AtomicString(isolate, "prototype"))
-+             .ToLocal(&prototype_value);
-+-    CHECK(get_prototype_value);
-+-    CHECK(prototype_value->IsObject());
-++    // CHECK(get_prototype_value);
-++    // CHECK(prototype_value->IsObject());
-++    if (!get_prototype_value || !prototype_value->IsObject())
-++      return v8::Local<v8::Function>();
-+ 
-+     prototype_object = prototype_value.As<v8::Object>();
-+     if (prototype_object->InternalFieldCount() ==
-added in remote
-  their  100644 fd13d0211aa653e2bc2b713bb425808a50a8c4d8 patches/common/chromium/blink_local_frame.patch
-@@ -0,0 +1,26 @@
-+diff --git a/third_party/WebKit/Source/core/frame/LocalFrame.cpp b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
-+index 97a5393d40b4..04f88dd2ea15 100644
-+--- a/third_party/WebKit/Source/core/frame/LocalFrame.cpp
-++++ b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
-+@@ -303,10 +303,6 @@ void LocalFrame::Detach(FrameDetachType type) {
-+   }
-+   CHECK(!view_ || !view_->IsAttached());
-+ 
-+-  // This is the earliest that scripting can be disabled:
-+-  // - FrameLoader::Detach() can fire XHR abort events
-+-  // - Document::Shutdown() can dispose plugins which can run script.
-+-  ScriptForbiddenScope forbid_script;
-+   if (!Client())
-+     return;
-+ 
-+@@ -316,6 +312,10 @@ void LocalFrame::Detach(FrameDetachType type) {
-+   // Notify ScriptController that the frame is closing, since its cleanup ends
-+   // up calling back to LocalFrameClient via WindowProxy.
-+   GetScriptController().ClearForClose();
-++  // This is the earliest that scripting can be disabled:
-++  // - FrameLoader::Detach() can fire XHR abort events
-++  // - Document::Shutdown() can dispose plugins which can run script.
-++  ScriptForbiddenScope forbid_script;
-+ 
-+   // TODO(crbug.com/729196): Trace why LocalFrameView::DetachFromLayout crashes.
-+   CHECK(!view_->IsAttached());
-added in remote
-  their  100644 c7c5eddf16c1d6e3be8d9dd76efc62e1578b04e8 patches/common/chromium/blink_world_context.patch
-@@ -0,0 +1,45 @@
-+diff --git a/third_party/WebKit/Source/core/frame/WebLocalFrameImpl.cpp b/third_party/WebKit/Source/core/frame/WebLocalFrameImpl.cpp
-+index a93834fbe86e..937b7f335693 100644
-+--- a/third_party/WebKit/Source/core/frame/WebLocalFrameImpl.cpp
-++++ b/third_party/WebKit/Source/core/frame/WebLocalFrameImpl.cpp
-+@@ -843,6 +843,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
-+   return MainWorldScriptContext()->Global();
-+ }
-+ 
-++v8::Local<v8::Context> WebLocalFrameImpl::WorldScriptContext(
-++    v8::Isolate* isolate, int world_id) const {
-++  scoped_refptr<DOMWrapperWorld> world = DOMWrapperWorld::EnsureIsolatedWorld(
-++      isolate, world_id);
-++  return ToScriptState(GetFrame(), *world)->GetContext();
-++}
-++
-+ bool WebFrame::ScriptCanAccess(WebFrame* target) {
-+   return BindingSecurity::ShouldAllowAccessToFrame(
-+       CurrentDOMWindow(V8PerIsolateData::MainThreadIsolate()),
-+diff --git a/third_party/WebKit/Source/core/frame/WebLocalFrameImpl.h b/third_party/WebKit/Source/core/frame/WebLocalFrameImpl.h
-+index d66499296ff8..bfea68983fda 100644
-+--- a/third_party/WebKit/Source/core/frame/WebLocalFrameImpl.h
-++++ b/third_party/WebKit/Source/core/frame/WebLocalFrameImpl.h
-+@@ -142,6 +142,8 @@ class CORE_EXPORT WebLocalFrameImpl final
-+       int argc,
-+       v8::Local<v8::Value> argv[]) override;
-+   v8::Local<v8::Context> MainWorldScriptContext() const override;
-++  v8::Local<v8::Context> WorldScriptContext(
-++      v8::Isolate* isolate, int world_id) const override;
-+   v8::Local<v8::Object> GlobalProxy() const override;
-+   void Reload(WebFrameLoadType) override;
-+   void ReloadWithOverrideURL(const WebURL& override_url,
-+diff --git a/third_party/WebKit/public/web/WebLocalFrame.h b/third_party/WebKit/public/web/WebLocalFrame.h
-+index ad0fa84f9511..69f96587b1f1 100644
-+--- a/third_party/WebKit/public/web/WebLocalFrame.h
-++++ b/third_party/WebKit/public/web/WebLocalFrame.h
-+@@ -404,6 +404,9 @@ class WebLocalFrame : public WebFrame {
-+   // be calling this API.
-+   virtual v8::Local<v8::Context> MainWorldScriptContext() const = 0;
-+ 
-++  virtual v8::Local<v8::Context> WorldScriptContext(
-++      v8::Isolate* isolate, int world_id) const = 0;
-++
-+   // Executes script in the context of the current page and returns the value
-+   // that the script evaluated to with callback. Script execution can be
-+   // suspend.
-added in remote
-  their  100644 1b3e7d69ee6b923587067d5895c50eb9bf9364a5 patches/common/chromium/boringssl_build_gn.patch
-@@ -0,0 +1,18 @@
-+diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn
-+index c75fb7c2bb7e..423f4b2ddb10 100644
-+--- a/third_party/boringssl/BUILD.gn
-++++ b/third_party/boringssl/BUILD.gn
-+@@ -44,6 +44,13 @@ config("no_asm_config") {
-+ }
-+ 
-+ all_sources = crypto_sources + ssl_sources
-++if (is_electron_build) {
-++  # Needed to build a nodejs-compatible boringssl.
-++  all_sources += [
-++    "src/decrepit/evp/evp_do_all.c",
-++    "src/decrepit/xts/xts.c",
-++  ]
-++}
-+ 
-+ # Windows' assembly is built with Yasm. The other platforms use the platform
-+ # assembler.
-added in remote
-  their  100644 006862310b59c566877894247da64eef55fff3dc patches/common/chromium/browser_compositor_mac.patch
-@@ -0,0 +1,35 @@
-+diff --git a/content/browser/renderer_host/browser_compositor_view_mac.h b/content/browser/renderer_host/browser_compositor_view_mac.h
-+index 7426062f7381..bd5cd2fcd230 100644
-+--- a/content/browser/renderer_host/browser_compositor_view_mac.h
-++++ b/content/browser/renderer_host/browser_compositor_view_mac.h
-+@@ -54,10 +54,13 @@ class CONTENT_EXPORT BrowserCompositorMac : public DelegatedFrameHostClient {
-+   // These will not return nullptr until Destroy is called.
-+   DelegatedFrameHost* GetDelegatedFrameHost();
-+ 
-++  ui::Layer* GetRootLayer() { return root_layer_.get(); }
-++
-+   // Ensure that the currect compositor frame be cleared (even if it is
-+   // potentially visible).
-+   void ClearCompositorFrame();
-+ 
-++  ui::Compositor* GetCompositor();
-+   gfx::AcceleratedWidget GetAcceleratedWidget();
-+   void DidCreateNewRendererCompositorFrameSink(
-+       viz::mojom::CompositorFrameSinkClient* renderer_compositor_frame_sink);
-+diff --git a/content/browser/renderer_host/browser_compositor_view_mac.mm b/content/browser/renderer_host/browser_compositor_view_mac.mm
-+index 7fcc24c15c37..7c31977b20f9 100644
-+--- a/content/browser/renderer_host/browser_compositor_view_mac.mm
-++++ b/content/browser/renderer_host/browser_compositor_view_mac.mm
-+@@ -208,6 +208,12 @@ BrowserCompositorMac::~BrowserCompositorMac() {
-+     g_spare_recyclable_compositors.Get().clear();
-+ }
-+ 
-++ui::Compositor* BrowserCompositorMac::GetCompositor() {
-++  if (recyclable_compositor_)
-++    return recyclable_compositor_->compositor();
-++  return nullptr;
-++}
-++
-+ gfx::AcceleratedWidget BrowserCompositorMac::GetAcceleratedWidget() {
-+   if (recyclable_compositor_) {
-+     return recyclable_compositor_->accelerated_widget_mac()
-added in remote
-  their  100644 f297907afa78e63b4c5662d4c74eff76689afb48 patches/common/chromium/browser_plugin_guest.patch
-@@ -0,0 +1,18 @@
-+diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc
-+index 964c9a093a3b..f3b3d66ff267 100644
-+--- a/content/browser/browser_plugin/browser_plugin_guest.cc
-++++ b/content/browser/browser_plugin/browser_plugin_guest.cc
-+@@ -214,8 +214,11 @@ void BrowserPluginGuest::Init() {
-+ 
-+   WebContentsImpl* owner_web_contents = static_cast<WebContentsImpl*>(
-+       delegate_->GetOwnerWebContents());
-+-  owner_web_contents->CreateBrowserPluginEmbedderIfNecessary();
-+-  InitInternal(BrowserPluginHostMsg_Attach_Params(), owner_web_contents);
-++  if (nullptr != owner_web_contents)
-++  {
-++      owner_web_contents->CreateBrowserPluginEmbedderIfNecessary();
-++      InitInternal(BrowserPluginHostMsg_Attach_Params(), owner_web_contents);
-++  }
-+ }
-+ 
-+ base::WeakPtr<BrowserPluginGuest> BrowserPluginGuest::AsWeakPtr() {
-added in remote
-  their  100644 00f6f1658bde53377e0af93a29fc51f2b3f59075 patches/common/chromium/browser_plugin_wheel.patch
-@@ -0,0 +1,25 @@
-+diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/browser_plugin.cc
-+index 06762fb..e89b1f0 100644
-+--- a/content/renderer/browser_plugin/browser_plugin.cc
-++++ b/content/renderer/browser_plugin/browser_plugin.cc
-+@@ -448,15 +448,11 @@ blink::WebInputEventResult BrowserPlugin::handleInputEvent(
-+ 
-+   DCHECK(!blink::WebInputEvent::IsTouchEventType(event.GetType()));
-+ 
-+-  // With direct event routing turned on, BrowserPlugin should almost never
-+-  // see wheel events any more. The two exceptions are (1) scroll bubbling, and
-+-  // (2) synthetic mouse wheels generated by touchpad GesturePinch events on
-+-  // Mac, which always go to the mainframe and thus may hit BrowserPlugin if
-+-  // it's in a top-level embedder. In both cases we should indicate the event
-+-  // as not handled (for GesturePinch on Mac, indicating the event has been
-+-  // handled leads to touchpad pinch not working).
-+-  if (event.GetType() == blink::WebInputEvent::kMouseWheel)
-+-    return blink::WebInputEventResult::kNotHandled;
-++  if (event.GetType() == blink::WebInputEvent::kMouseWheel) {
-++    auto wheel_event = static_cast<const blink::WebMouseWheelEvent&>(event);
-++    if (wheel_event.resending_plugin_id == browser_plugin_instance_id_)
-++      return blink::WebInputEventResult::kNotHandled;
-++  }
-+ 
-+   if (blink::WebInputEvent::IsGestureEventType(event.GetType())) {
-+     auto gesture_event = static_cast<const blink::WebGestureEvent&>(event);
-added in remote
-  their  100644 7438e825f9cf2f7be2cb4c14f8d1a84ecb71463e patches/common/chromium/build_gn.patch
-@@ -0,0 +1,91 @@
-+diff --git a/.gn b/.gn
-+index 50a8a2fe9f1e..66ced79f1627 100644
-+--- a/.gn
-++++ b/.gn
-+@@ -259,4 +259,8 @@ exec_script_whitelist =
-+       # Not gypi-to-gn.
-+       "//google_apis/BUILD.gn",
-+       "//printing/BUILD.gn",
-++      # While electron transitions to GN, we use gypi_to_gn to synchronize
-++      # file lists
-++      "//electron/BUILD.gn",
-++      "//electron/brightray/BUILD.gn",
-+     ]
-+diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
-+index 7d60dd920904..d2f2cbc99915 100644
-+--- a/build/config/BUILDCONFIG.gn
-++++ b/build/config/BUILDCONFIG.gn
-+@@ -123,6 +123,10 @@ if (current_os == "") {
-+ #   even if the value is overridden, which is wasteful. See first bullet.
-+ 
-+ declare_args() {
-++  is_electron_build = false
-++  is_electron_gn_build = false
-++  is_mas_build = false
-++
-+   # Set to enable the official build level of optimization. This has nothing
-+   # to do with branding, but enables an additional level of optimization above
-+   # release (!is_debug). This might be better expressed as a tri-state
-+@@ -534,6 +538,7 @@ default_compiler_configs = [
-+   "//build/config/compiler:runtime_library",
-+   "//build/config/coverage:default_coverage",
-+   "//build/config/sanitizers:default_sanitizer_flags",
-++  "//libchromiumcontent/chromiumcontent/config:mas_build",
-+ ]
-+ if (is_win) {
-+   default_compiler_configs += [
-+@@ -660,6 +665,7 @@ template("component") {
-+     _component_mode = "shared_library"
-+   } else if (defined(invoker.static_component_type)) {
-+     assert(invoker.static_component_type == "static_library" ||
-++           (is_electron_build && invoker.static_component_type == "shared_library") ||
-+            invoker.static_component_type == "source_set")
-+     _component_mode = invoker.static_component_type
-+   } else if (is_android || !defined(invoker.sources)) {
-+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-+index 9a10137aa405..bb33e5450eaa 100644
-+--- a/build/config/compiler/BUILD.gn
-++++ b/build/config/compiler/BUILD.gn
-+@@ -579,10 +579,13 @@ config("compiler") {
-+       ldflags += [ "-Wl,--lto-O0" ]
-+     }
-+ 
-+-    cflags += [ "-fwhole-program-vtables" ]
-+-    if (!is_win) {
-+-      ldflags += [ "-fwhole-program-vtables" ]
-+-    }
-++    # -fwhole-program-vtables doesn't work well in Electron right now, as it's
-++    # not a single binary and the optimizations break interfaces used across
-++    # binary boundaries.
-++    # cflags += [ "-fwhole-program-vtables" ]
-++    # if (!is_win) {
-++    #  ldflags += [ "-fwhole-program-vtables" ]
-++    #}
-+ 
-+     # Work-around for http://openradar.appspot.com/20356002
-+     if (is_mac) {
-+diff --git a/build/config/win/BUILD.gn b/build/config/win/BUILD.gn
-+index 1f6bc13e087f..4630045ff554 100644
-+--- a/build/config/win/BUILD.gn
-++++ b/build/config/win/BUILD.gn
-+@@ -314,7 +314,7 @@ config("cfi_linker") {
-+ # See https://msdn.microsoft.com/en-us/library/2kzt1wy3.aspx for a reference of
-+ # what each value does.
-+ config("default_crt") {
-+-  if (is_component_build) {
-++  if (is_component_build || (is_electron_build && !is_electron_gn_build)) {
-+     # Component mode: dynamic CRT. Since the library is shared, it requires
-+     # exceptions or will give errors about things not matching, so keep
-+     # exceptions on.
-+diff --git a/third_party/WebKit/Source/platform/BUILD.gn b/third_party/WebKit/Source/platform/BUILD.gn
-+index dc6e613e7c7e..36abbd583faf 100644
-+--- a/third_party/WebKit/Source/platform/BUILD.gn
-++++ b/third_party/WebKit/Source/platform/BUILD.gn
-+@@ -135,6 +135,7 @@ action("instrumentation_probes") {
-+ }
-+ 
-+ executable("character_data_generator") {
-++  configs += [ "//libchromiumcontent/chromiumcontent/config:build_time_executable" ]
-+   sources = [
-+     "text/CharacterPropertyDataGenerator.cpp",
-+     "text/CharacterPropertyDataGenerator.h",
-added in remote
-  their  100644 6d3aee2c6843490497111947399b26ff48826e45 patches/common/chromium/build_toolchain_win_patch.patch
-@@ -0,0 +1,60 @@
-+diff --git a/build/toolchain/win/BUILD.gn b/build/toolchain/win/BUILD.gn
-+index 53f767a0bddb..661466b779e8 100644
-+--- a/build/toolchain/win/BUILD.gn
-++++ b/build/toolchain/win/BUILD.gn
-+@@ -176,6 +176,12 @@ template("msvc_toolchain") {
-+       ]
-+ 
-+       command = "$env_wrapper$cl /nologo /showIncludes ${clflags} $sys_include_flags{{defines}} {{include_dirs}} {{cflags}} {{cflags_c}} /c {{source}} /Fo{{output}} /Fd\"$pdbname\""
-++
-++      if (is_electron_build && !is_component_build) {
-++        pdbdir = "{{target_out_dir}}"
-++        pdbname = "{{label_name}}_c.pdb"
-++        command = "$python_path $tool_wrapper_path cl-wrapper $env_wrapper$cl /nologo /showIncludes ${clflags} $sys_include_flags{{defines}} {{include_dirs}} {{cflags}} {{cflags_c}} /c {{source}} /Fo{{output}} $pdbdir \"$pdbname\""
-++      }
-+     }
-+ 
-+     tool("cxx") {
-+@@ -192,6 +198,12 @@ template("msvc_toolchain") {
-+       ]
-+ 
-+       command = "$env_wrapper$cl /nologo /showIncludes ${clflags} $sys_include_flags{{defines}} {{include_dirs}} {{cflags}} {{cflags_cc}} /c {{source}} /Fo{{output}} /Fd\"$pdbname\""
-++
-++      if (is_electron_build && !is_component_build) {
-++        pdbdir = "{{target_out_dir}}"
-++        pdbname = "{{label_name}}_cc.pdb"
-++        command = "$python_path $tool_wrapper_path cl-wrapper $env_wrapper$cl /nologo /showIncludes ${clflags} $sys_include_flags{{defines}} {{include_dirs}} {{cflags}} {{cflags_cc}} /c {{source}} /Fo{{output}} $pdbdir \"$pdbname\""
-++      }
-+     }
-+ 
-+     tool("rc") {
-+diff --git a/build/toolchain/win/tool_wrapper.py b/build/toolchain/win/tool_wrapper.py
-+index 3a81368f3469..7c5ef1ea5db4 100644
-+--- a/build/toolchain/win/tool_wrapper.py
-++++ b/build/toolchain/win/tool_wrapper.py
-+@@ -315,6 +315,25 @@ class WinTool(object):
-+     dirname = dirname[0] if dirname else None
-+     return subprocess.call(args, shell=True, env=env, cwd=dirname)
-+ 
-++  def ExecClWrapper(self, *args):
-++    """Invokes cl.exe to compile a C/C++ source file."""
-++    args = list(args)
-++    # Incorporate the PDB output dir into the PDB name to ensure the PDB name
-++    # is unique (see https://github.com/electron/libchromiumcontent/issues/287)
-++    pdb_name = args.pop()
-++    pdb_dir = args.pop()
-++    pdb_filename = '%s/%s_%s' % (pdb_dir, pdb_dir.replace('/', '_'), pdb_name)
-++    # On Windows when args is a sequence instead of a single string
-++    # subprocess.call() will use subprocess.list2cmdline() to convert the
-++    # sequence to a string. Unfortunately the double-quote escaping done by
-++    # subprocess.list2cmdline() mangles the /Fd"path/to/some.pdb" arg to
-++    # /Fd\"path/to/some.pdb\", and cl.exe then fails to parse the PDB filename
-++    # correctly. To work around this we use subprocess.list2cmdline()
-++    # (even though it's not part of the public API) to construct most of the
-++    # command line, and then append the /Fd flag.
-++    pdb_flag = '/Fd"%s"' % pdb_filename
-++    cmdline = '%s %s' % (subprocess.list2cmdline(args), pdb_flag)
-++    return subprocess.call(cmdline, shell=False)
-+ 
-+ if __name__ == '__main__':
-+   sys.exit(main(sys.argv[1:]))
-added in remote
-  their  100644 737a21245fe8cce3b0cddf1ede734a8ddba3fecc patches/common/chromium/can_create_window.patch
-@@ -0,0 +1,234 @@
-+diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
-+index 25841d376bcd..df41213f4c49 100644
-+--- a/content/browser/frame_host/render_frame_host_impl.cc
-++++ b/content/browser/frame_host/render_frame_host_impl.cc
-+@@ -2874,6 +2874,38 @@ void RenderFrameHostImpl::CreateNewWindow(
-+                "frame_tree_node", frame_tree_node_->frame_tree_node_id(), "url",
-+                params->target_url.possibly_invalid_spec());
-+ 
-++  scoped_refptr<network::ResourceRequestBody> body;
-++  if (params->body->has_object) {
-++    body = new network::ResourceRequestBody;
-++    std::vector<network::DataElement> elements;
-++    for (const auto& iter : params->body->elements) {
-++      network::DataElement element;
-++      switch (iter->type) {
-++        case network::DataElement::TYPE_BYTES: {
-++          element.SetToBytes(iter->bytes.data(), iter->bytes.length());
-++          break;
-++        }
-++        case network::DataElement::TYPE_FILE: {
-++          element.SetToFilePathRange(iter->path, iter->offset, iter->length,
-++                                     iter->expected_modification_time);
-++          break;
-++        }
-++        case network::DataElement::TYPE_BLOB: {
-++          element.SetToBlobRange(iter->blob_uuid, iter->offset, iter->length);
-++          break;
-++        }
-++        case network::DataElement::TYPE_DATA_PIPE:
-++        default:
-++          NOTREACHED();
-++          break;
-++      }
-++      elements.push_back(std::move(element));
-++    }
-++    body->swap_elements(&elements);
-++    body->set_identifier(params->body->identifier);
-++    body->set_contains_sensitive_info(params->body->contains_sensitive_info);
-++  }
-++
-+   bool no_javascript_access = false;
-+ 
-+   // Filter out URLs to which navigation is disallowed from this context.
-+@@ -2896,8 +2928,9 @@ void RenderFrameHostImpl::CreateNewWindow(
-+           frame_tree_node_->frame_tree()->GetMainFrame()->GetLastCommittedURL(),
-+           last_committed_origin_.GetURL(), params->window_container_type,
-+           params->target_url, params->referrer, params->frame_name,
-+-          params->disposition, *params->features, params->user_gesture,
-+-          params->opener_suppressed, &no_javascript_access);
-++          params->disposition, *params->features, params->additional_features,
-++          body, params->user_gesture, params->opener_suppressed,
-++          &no_javascript_access);
-+ 
-+   if (!can_create_window) {
-+     std::move(callback).Run(mojom::CreateNewWindowStatus::kIgnore, nullptr);
-+diff --git a/content/common/frame.mojom b/content/common/frame.mojom
-+index e5fbf20747e0..f0d8af2f119b 100644
-+--- a/content/common/frame.mojom
-++++ b/content/common/frame.mojom
-+@@ -9,6 +9,8 @@ import "content/common/service_worker/controller_service_worker.mojom";
-+ import "content/common/url_loader_factory_bundle.mojom";
-+ import "content/public/common/resource_type.mojom";
-+ import "content/public/common/window_container_type.mojom";
-++import "mojo/common/file_path.mojom";
-++import "mojo/common/time.mojom";
-+ import "mojo/common/unguessable_token.mojom";
-+ import "mojo/public/mojom/base/string16.mojom";
-+ import "services/network/public/mojom/url_loader.mojom";
-+@@ -146,6 +148,24 @@ interface FrameFactory {
-+   CreateFrame(int32 frame_routing_id, Frame& frame);
-+ };
-+ 
-++struct DataElement {
-++  int32 type;
-++  int64 length;
-++  string bytes;
-++  mojo.common.mojom.FilePath path;
-++  int64 offset;
-++  mojo.common.mojom.Time expected_modification_time;
-++  url.mojom.Url filesystem_url;
-++  string blob_uuid;
-++};
-++
-++struct ResourceRequestBody {
-++  bool has_object;
-++  int64 identifier;
-++  bool contains_sensitive_info;
-++  array<DataElement> elements;
-++};
-++
-+ struct CreateNewWindowParams {
-+   // True if this open request came in the context of a user gesture.
-+   bool user_gesture;
-+@@ -182,6 +202,10 @@ struct CreateNewWindowParams {
-+ 
-+   // The window features to use for the new window.
-+   blink.mojom.WindowFeatures features;
-++
-++  // Extra fields added by Electron.
-++  array<string> additional_features;
-++  ResourceRequestBody body;
-+ };
-+ 
-+ // Operation result when the renderer asks the browser to create a new window.
-+diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
-+index 37e2d88e28e9..6c366435ddd8 100644
-+--- a/content/public/browser/content_browser_client.cc
-++++ b/content/public/browser/content_browser_client.cc
-+@@ -382,6 +382,8 @@ bool ContentBrowserClient::CanCreateWindow(
-+     const std::string& frame_name,
-+     WindowOpenDisposition disposition,
-+     const blink::mojom::WindowFeatures& features,
-++    const std::vector<std::string>& additional_features,
-++    const scoped_refptr<network::ResourceRequestBody>& body,
-+     bool user_gesture,
-+     bool opener_suppressed,
-+     bool* no_javascript_access) {
-+diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-+index 5373ee07b5cd..746760e8596c 100644
-+--- a/content/public/browser/content_browser_client.h
-++++ b/content/public/browser/content_browser_client.h
-+@@ -150,6 +150,7 @@ class RenderProcessHost;
-+ class RenderViewHost;
-+ class ResourceContext;
-+ class ResourceDispatcherHostLoginDelegate;
-++class ResourceRequestBody;
-+ class SiteInstance;
-+ class SpeechRecognitionManagerDelegate;
-+ class StoragePartition;
-+@@ -625,6 +626,8 @@ class CONTENT_EXPORT ContentBrowserClient {
-+       const std::string& frame_name,
-+       WindowOpenDisposition disposition,
-+       const blink::mojom::WindowFeatures& features,
-++      const std::vector<std::string>& additional_features,
-++      const scoped_refptr<network::ResourceRequestBody>& body,
-+       bool user_gesture,
-+       bool opener_suppressed,
-+       bool* no_javascript_access);
-+diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
-+index a9b91cdcc86d..4168990971e4 100644
-+--- a/content/renderer/render_view_impl.cc
-++++ b/content/renderer/render_view_impl.cc
-+@@ -80,6 +80,7 @@
-+ #include "content/renderer/input/input_handler_manager.h"
-+ #include "content/renderer/internal_document_state_data.h"
-+ #include "content/renderer/loader/request_extra_data.h"
-++#include "content/renderer/loader/web_url_request_util.h"
-+ #include "content/renderer/media/audio_device_factory.h"
-+ #include "content/renderer/media/stream/media_stream_device_observer.h"
-+ #include "content/renderer/media/video_capture_impl_manager.h"
-+@@ -1285,6 +1286,45 @@ WebView* RenderViewImpl::CreateView(WebLocalFrame* creator,
-+   }
-+   params->features = ConvertWebWindowFeaturesToMojoWindowFeatures(features);
-+ 
-++  params->body = mojom::ResourceRequestBody::New();
-++  auto body = GetRequestBodyForWebURLRequest(request);
-++  if (body) {
-++    params->body->has_object = true;
-++    params->body->identifier = body->identifier();
-++    params->body->contains_sensitive_info = body->contains_sensitive_info();
-++    for (const auto& element : *body->elements()) {
-++      content::mojom::DataElementPtr ptr = content::mojom::DataElement::New();
-++      ptr->type = element.type();
-++      switch (element.type()) {
-++        case network::DataElement::TYPE_BYTES: {
-++          ptr->bytes = std::string(element.bytes(), element.length());
-++          break;
-++        }
-++        case network::DataElement::TYPE_FILE: {
-++          ptr->path = element.path();
-++          ptr->offset = element.offset();
-++          ptr->length = element.length();
-++          ptr->expected_modification_time = element.expected_modification_time();
-++          break;
-++        }
-++        case network::DataElement::TYPE_BLOB: {
-++          ptr->blob_uuid = element.blob_uuid();
-++          ptr->offset = element.offset();
-++          ptr->length = element.length();
-++          break;
-++        }
-++        case network::DataElement::TYPE_RAW_FILE:
-++        case network::DataElement::TYPE_DATA_PIPE:
-++        case network::DataElement::TYPE_UNKNOWN:
-++          NOTREACHED();
-++          break;
-++      }
-++      params->body->elements.push_back(std::move(ptr));
-++    }
-++  } else {
-++    params->body->has_object = false;
-++  }
-++
-+   // We preserve this information before sending the message since |params| is
-+   // moved on send.
-+   bool is_background_tab =
-+diff --git a/content/browser/security_exploit_browsertest.cc b/content/browser/security_exploit_browsertest.cc
-+index 0a1f363a673a..adcef6fca779 100644
-+--- a/content/browser/security_exploit_browsertest.cc
-++++ b/content/browser/security_exploit_browsertest.cc
-+@@ -293,6 +293,7 @@ IN_PROC_BROWSER_TEST_F(SecurityExploitBrowserTest,
-+ 
-+   mojom::CreateNewWindowParamsPtr params = mojom::CreateNewWindowParams::New();
-+   params->target_url = GURL("about:blank");
-++  params->body = mojom::ResourceRequestBody::New();
-+   pending_rfh->CreateNewWindow(
-+       std::move(params), base::BindOnce([](mojom::CreateNewWindowStatus,
-+                                            mojom::CreateNewWindowReplyPtr) {}));
-+diff --git a/content/shell/browser/layout_test/layout_test_content_browser_client.cc b/content/shell/browser/layout_test/layout_test_content_browser_client.cc
-+index 2eaee37ec780..9994df95a798 100644
-+--- a/content/shell/browser/layout_test/layout_test_content_browser_client.cc
-++++ b/content/shell/browser/layout_test/layout_test_content_browser_client.cc
-+@@ -182,6 +182,8 @@ bool LayoutTestContentBrowserClient::CanCreateWindow(
-+     const std::string& frame_name,
-+     WindowOpenDisposition disposition,
-+     const blink::mojom::WindowFeatures& features,
-++    const std::vector<std::string>& additional_features,
-++    const scoped_refptr<ResourceRequestBody>& body,
-+     bool user_gesture,
-+     bool opener_suppressed,
-+     bool* no_javascript_access) {
-+diff --git a/content/shell/browser/layout_test/layout_test_content_browser_client.h b/content/shell/browser/layout_test/layout_test_content_browser_client.h
-+index 62b637bc80ce..1a9a06ce4bf6 100644
-+--- a/content/shell/browser/layout_test/layout_test_content_browser_client.h
-++++ b/content/shell/browser/layout_test/layout_test_content_browser_client.h
-+@@ -58,6 +58,8 @@ class LayoutTestContentBrowserClient : public ShellContentBrowserClient {
-+                        const std::string& frame_name,
-+                        WindowOpenDisposition disposition,
-+                        const blink::mojom::WindowFeatures& features,
-++                       const std::vector<std::string>& additional_features,
-++                       const scoped_refptr<ResourceRequestBody>& body,
-+                        bool user_gesture,
-+                        bool opener_suppressed,
-+                        bool* no_javascript_access) override;
-added in remote
-  their  100644 273a5079f8739d5fed75b56ed7a9385abca9fc72 patches/common/chromium/compositor_delegate.patch
-@@ -0,0 +1,72 @@
-+diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc
-+index 45bf6b1b4618..f023beabaa65 100644
-+--- a/content/browser/compositor/gpu_process_transport_factory.cc
-++++ b/content/browser/compositor/gpu_process_transport_factory.cc
-+@@ -491,9 +491,19 @@ void GpuProcessTransportFactory::EstablishedGpuChannel(
-+         // surfaces as they are not following the correct mode.
-+         DisableGpuCompositing(compositor.get());
-+       }
-++
-++      std::unique_ptr<viz::SoftwareOutputDevice> output_device;
-++      if (compositor->delegate()) {
-++        output_device = compositor->delegate()->CreateSoftwareOutputDevice(
-++            compositor.get());
-++      }
-++      if (!output_device) {
-++        output_device = CreateSoftwareOutputDevice(compositor->widget());
-++      }
-++
-+       display_output_surface =
-+           std::make_unique<SoftwareBrowserCompositorOutputSurface>(
-+-              CreateSoftwareOutputDevice(compositor->widget()), vsync_callback,
-++              std::move(output_device), vsync_callback,
-+               compositor->task_runner());
-+     } else {
-+       DCHECK(context_provider);
-+diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h
-+index d842aa55175b..2c2131774b71 100644
-+--- a/ui/compositor/compositor.h
-++++ b/ui/compositor/compositor.h
-+@@ -24,6 +24,7 @@
-+ #include "components/viz/common/surfaces/frame_sink_id.h"
-+ #include "components/viz/common/surfaces/local_surface_id.h"
-+ #include "components/viz/host/host_frame_sink_client.h"
-++#include "components/viz/service/display/software_output_device.h"
-+ #include "third_party/skia/include/core/SkColor.h"
-+ #include "third_party/skia/include/core/SkMatrix44.h"
-+ #include "ui/compositor/compositor_animation_observer.h"
-+@@ -182,6 +183,15 @@ class COMPOSITOR_EXPORT ContextFactory {
-+   virtual void RemoveObserver(ContextFactoryObserver* observer) = 0;
-+ };
-+ 
-++class COMPOSITOR_EXPORT CompositorDelegate {
-++ public:
-++  virtual std::unique_ptr<viz::SoftwareOutputDevice> CreateSoftwareOutputDevice(
-++      ui::Compositor* compositor) = 0;
-++
-++ protected:
-++  virtual ~CompositorDelegate() {}
-++};
-++
-+ // Compositor object to take care of GPU painting.
-+ // A Browser compositor object is responsible for generating the final
-+ // displayable form of pixels comprising a single widget's contents. It draws an
-+@@ -221,6 +231,9 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient,
-+   // Schedules a redraw of the layer tree associated with this compositor.
-+   void ScheduleDraw();
-+ 
-++  CompositorDelegate* delegate() const { return delegate_; }
-++  void SetDelegate(CompositorDelegate* delegate) { delegate_ = delegate; }
-++
-+   // Sets the root of the layer tree drawn by this Compositor. The root layer
-+   // must have no parent. The compositor's root layer is reset if the root layer
-+   // is destroyed. NULL can be passed to reset the root layer, in which case the
-+@@ -426,6 +439,8 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient,
-+   ui::ContextFactory* context_factory_;
-+   ui::ContextFactoryPrivate* context_factory_private_;
-+ 
-++  CompositorDelegate* delegate_ = nullptr;
-++
-+   // The root of the Layer tree drawn by this compositor.
-+   Layer* root_layer_ = nullptr;
-+ 
-added in remote
-  their  100644 b38a9b1bdb038c21fdf24bbe8afe904385b74c32 patches/common/chromium/crashpad-disabled-windows.patch
-@@ -0,0 +1,48 @@
-+diff --git a/components/crash/core/common/BUILD.gn b/components/crash/core/common/BUILD.gn
-+index 4f67529f5c9a..a41bdf709d99 100644
-+--- a/components/crash/core/common/BUILD.gn
-++++ b/components/crash/core/common/BUILD.gn
-+@@ -13,7 +13,7 @@ group("common") {
-+   }
-+ }
-+ 
-+-use_crashpad = is_mac || is_win
-++use_crashpad = is_mac
-+ use_stubs = is_fuchsia
-+ 
-+ # Crashpad's annotation system can store data on a per-module basis (i.e.,
-+@@ -128,7 +128,7 @@ source_set("unit_tests") {
-+     sources += [ "objc_zombie_unittest.mm" ]
-+   }
-+ 
-+-  if (!is_mac && !is_win && !is_fuchsia) {
-++  if (!is_mac && !is_fuchsia) {
-+     include_dirs = [ "//third_party/breakpad/breakpad/src/" ]
-+     sources += [ "crash_key_breakpad_unittest.cc" ]
-+   }
-+diff --git a/components/crash/core/common/crash_key.h b/components/crash/core/common/crash_key.h
-+index 951c7e941962..bdf6bb40e1fb 100644
-+--- a/components/crash/core/common/crash_key.h
-++++ b/components/crash/core/common/crash_key.h
-+@@ -19,7 +19,7 @@
-+ // Annotation interface. Because not all platforms use Crashpad yet, a
-+ // source-compatible interface is provided on top of the older Breakpad
-+ // storage mechanism.
-+-#if (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_WIN)
-++#if (defined(OS_MACOSX) && !defined(OS_IOS))
-+ #define USE_CRASHPAD_ANNOTATION 1
-+ #endif
-+ 
-+diff --git a/components/crash/core/common/crash_key_breakpad.cc b/components/crash/core/common/crash_key_breakpad.cc
-+index 0351e01fa18f..1c355bd89844 100644
-+--- a/components/crash/core/common/crash_key_breakpad.cc
-++++ b/components/crash/core/common/crash_key_breakpad.cc
-+@@ -15,7 +15,7 @@
-+ #include "components/crash/core/common/crash_key_base_support.h"
-+ #include "components/crash/core/common/crash_key_internal.h"
-+ 
-+-#if defined(OS_MACOSX) || defined(OS_IOS) || defined(OS_WIN)
-++#if defined(OS_MACOSX) || defined(OS_IOS)
-+ #error "This file should not be used when Crashpad is available, nor on iOS."
-+ #endif
-+ 
-added in remote
-  their  100644 980814b0fdf6ecd71bc08064923a8f39d77eac2d patches/common/chromium/dcheck.patch
-@@ -0,0 +1,257 @@
-+diff --git a/base/logging.h b/base/logging.h
-+index 582fb89868cd..24d3e82232b6 100644
-+--- a/base/logging.h
-++++ b/base/logging.h
-+@@ -850,7 +850,7 @@ const LogSeverity LOG_DCHECK = LOG_INFO;
-+ 
-+ #else  // !(defined(_PREFAST_) && defined(OS_WIN))
-+ 
-+-#if DCHECK_IS_ON()
-++#if DCHECK_IS_ON() && !defined(ELECTRON_NO_DCHECK)
-+ 
-+ #define DCHECK(condition)                                           \
-+   LAZY_STREAM(LOG_STREAM(DCHECK), !ANALYZER_ASSUME_TRUE(condition)) \
-+diff --git a/base/memory/weak_ptr.cc b/base/memory/weak_ptr.cc
-+index 8879651e6da7..33fe8948a063 100644
-+--- a/base/memory/weak_ptr.cc
-++++ b/base/memory/weak_ptr.cc
-+@@ -23,8 +23,8 @@ void WeakReference::Flag::Invalidate() {
-+ }
-+ 
-+ bool WeakReference::Flag::IsValid() const {
-+-  DCHECK(sequence_checker_.CalledOnValidSequence())
-+-      << "WeakPtrs must be checked on the same sequenced thread.";
-++  // DCHECK(sequence_checker_.CalledOnValidSequence())
-++  //    << "WeakPtrs must be checked on the same sequenced thread.";
-+   return is_valid_;
-+ }
-+ 
-+diff --git a/base/process/kill_win.cc b/base/process/kill_win.cc
-+index 6a0038e2c00d..dd00dfb3e5d0 100644
-+--- a/base/process/kill_win.cc
-++++ b/base/process/kill_win.cc
-+@@ -45,7 +45,7 @@ TerminationStatus GetTerminationStatus(ProcessHandle handle, int* exit_code) {
-+   DWORD tmp_exit_code = 0;
-+ 
-+   if (!::GetExitCodeProcess(handle, &tmp_exit_code)) {
-+-    DPLOG(FATAL) << "GetExitCodeProcess() failed";
-++    // DPLOG(FATAL) << "GetExitCodeProcess() failed";
-+ 
-+     // This really is a random number.  We haven't received any
-+     // information about the exit code, presumably because this
-+diff --git a/components/viz/service/display/program_binding.h b/components/viz/service/display/program_binding.h
-+index 70f1ff97b1ac..d1abd804e988 100644
-+--- a/components/viz/service/display/program_binding.h
-++++ b/components/viz/service/display/program_binding.h
-+@@ -416,7 +416,7 @@ class VIZ_SERVICE_EXPORT Program : public ProgramBindingBase {
-+     if (!ProgramBindingBase::Init(context_provider->ContextGL(),
-+                                   vertex_shader_.GetShaderString(),
-+                                   fragment_shader_.GetShaderString())) {
-+-      DCHECK(IsContextLost(context_provider->ContextGL()));
-++      // DCHECK(IsContextLost(context_provider->ContextGL()));
-+       return;
-+     }
-+ 
-+@@ -428,7 +428,7 @@ class VIZ_SERVICE_EXPORT Program : public ProgramBindingBase {
-+
-+     // Link after binding uniforms
-+     if (!Link(context_provider->ContextGL())) {
-+-      DCHECK(IsContextLost(context_provider->ContextGL()));
-++      // DCHECK(IsContextLost(context_provider->ContextGL()));
-+       return;
-+     }
-+ 
-+diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc
-+index ff1d3fcb6eba..ad6578f645d4 100644
-+--- a/content/browser/frame_host/navigation_controller_impl.cc
-++++ b/content/browser/frame_host/navigation_controller_impl.cc
-+@@ -1079,8 +1079,10 @@ NavigationType NavigationControllerImpl::ClassifyNavigation(
-+     return NAVIGATION_TYPE_NEW_SUBFRAME;
-+   }
-+ 
-+-  // We only clear the session history when navigating to a new page.
-+-  DCHECK(!params.history_list_was_cleared);
-++  // Electron does its own book keeping of navigation entries and we
-++  // expect content to not track any, by clearing history list for
-++  // all navigations.
-++  // DCHECK(!params.history_list_was_cleared);
-+ 
-+   if (rfh->GetParent()) {
-+     // All manual subframes would be did_create_new_entry and handled above, so
-+@@ -1301,7 +1303,10 @@ void NavigationControllerImpl::RendererDidNavigateToNewPage(
-+     new_entry->GetFavicon() = GetLastCommittedEntry()->GetFavicon();
-+   }
-+ 
-+-  DCHECK(!params.history_list_was_cleared || !replace_entry);
-++  // Electron does its own book keeping of navigation entries and we
-++  // expect content to not track any, by clearing history list for
-++  // all navigations.
-++  // DCHECK(!params.history_list_was_cleared || !replace_entry);
-+   // The browser requested to clear the session history when it initiated the
-+   // navigation. Now we know that the renderer has updated its state accordingly
-+   // and it is safe to also clear the browser side history.
-+diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
-+index 346765edaef9..a30e87bfcda6 100644
-+--- a/content/browser/frame_host/render_frame_host_impl.cc
-++++ b/content/browser/frame_host/render_frame_host_impl.cc
-+@@ -2072,8 +2073,10 @@ void RenderFrameHostImpl::AllowBindings(int bindings_flags) {
-+   }
-+ 
-+   enabled_bindings_ |= bindings_flags;
-+-  if (GetParent())
-+-    DCHECK_EQ(GetParent()->GetEnabledBindings(), GetEnabledBindings());
-++  // WebUI in sub frames require binding policy while the parent does not,
-++  // Fix this when we use OOPIF in Electron.
-++  // if (GetParent())
-++  //  DCHECK_EQ(GetParent()->GetEnabledBindings(), GetEnabledBindings());
-+ 
-+   if (render_frame_created_) {
-+     if (!frame_bindings_control_)
-+diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
-+index 79e4cc1a0479..19ba3236477e 100644
-+--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
-++++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
-+@@ -2093,8 +2104,8 @@ - (void)keyEvent:(NSEvent*)theEvent wasKeyEquivalent:(BOOL)equiv {
-+   if (EventIsReservedBySystem(theEvent))
-+     return;
-+ 
-+-  DCHECK([theEvent type] != NSKeyDown ||
-+-         !equiv == !([theEvent modifierFlags] & NSCommandKeyMask));
-++  //DCHECK([theEvent type] != NSKeyDown ||
-++  //       !equiv == !([theEvent modifierFlags] & NSCommandKeyMask));
-+ 
-+   if ([theEvent type] == NSFlagsChanged) {
-+     // Ignore NSFlagsChanged events from the NumLock and Fn keys as
-+diff --git a/ppapi/host/ppapi_host.cc b/ppapi/host/ppapi_host.cc
-+index f3c68fab3de6..b8609daf3ef9 100644
-+--- a/ppapi/host/ppapi_host.cc
-++++ b/ppapi/host/ppapi_host.cc
-+@@ -240,7 +240,7 @@ void PpapiHost::OnHostMsgResourceCreated(
-+       CreateResourceHost(params.pp_resource(), instance, nested_msg);
-+ 
-+   if (!resource_host.get()) {
-+-    NOTREACHED();
-++    // NOTREACHED();
-+     return;
-+   }
-+ 
-+diff --git a/third_party/WebKit/Source/core/loader/BUILD.gn b/third_party/WebKit/Source/core/loader/BUILD.gn
-+index 4da843f7f712..f07f24a07ef2 100644
-+--- a/third_party/WebKit/Source/core/loader/BUILD.gn
-++++ b/third_party/WebKit/Source/core/loader/BUILD.gn
-+@@ -136,4 +136,11 @@ blink_core_sources("loader") {
-+   public_deps = [
-+     "//third_party/WebKit/Source/platform",
-+   ]
-++
-++  if (is_electron_build) {
-++    if (!defined(defines)) {
-++      defines = []
-++    }
-++    defines += [ "ELECTRON_NO_DCHECK" ]
-++  }
-+ }
-+diff --git a/third_party/WebKit/Source/core/dom/Node.cpp b/third_party/WebKit/Source/core/dom/Node.cpp
-+index 922a2561bcef..e31fa34f98ea 100644
-+--- a/third_party/WebKit/Source/core/dom/Node.cpp
-++++ b/third_party/WebKit/Source/core/dom/Node.cpp
-+@@ -2435,7 +2435,7 @@ StaticNodeList* Node::getDestinationInsertionPoints() {
-+ 
-+ HTMLSlotElement* Node::AssignedSlot() const {
-+   // assignedSlot doesn't need to call updateDistribution().
-+-  DCHECK(!IsPseudoElement());
-++  // DCHECK(!IsPseudoElement());
-+   if (ShadowRoot* root = V1ShadowRootOfParent())
-+     return root->AssignedSlotFor(*this);
-+   return nullptr;
-+diff --git a/third_party/WebKit/Source/platform/wtf/text/StringImpl.h b/third_party/WebKit/Source/platform/wtf/text/StringImpl.h
-+index d3f0bccaee19..f58019d00e93 100644
-+--- a/third_party/WebKit/Source/platform/wtf/text/StringImpl.h
-++++ b/third_party/WebKit/Source/platform/wtf/text/StringImpl.h
-+@@ -254,21 +254,21 @@ class WTF_EXPORT StringImpl {
-+   }
-+ 
-+   ALWAYS_INLINE bool HasOneRef() const {
-+-#if DCHECK_IS_ON()
-++#if 0
-+     DCHECK(IsStatic() || verifier_.IsSafeToUse()) << AsciiForDebugging();
-+ #endif
-+     return ref_count_ == 1;
-+   }
-+ 
-+   ALWAYS_INLINE void AddRef() const {
-+-#if DCHECK_IS_ON()
-++#if 0
-+     DCHECK(IsStatic() || verifier_.OnRef(ref_count_)) << AsciiForDebugging();
-+ #endif
-+     ++ref_count_;
-+   }
-+ 
-+   ALWAYS_INLINE void Release() const {
-+-#if DCHECK_IS_ON()
-++#if 0
-+     DCHECK(IsStatic() || verifier_.OnDeref(ref_count_))
-+         << AsciiForDebugging() << " " << CurrentThread();
-+ #endif
-+diff --git a/url/BUILD.gn b/url/BUILD.gn
-+index 82eb115ae666..b4806804cdbf 100644
-+--- a/url/BUILD.gn
-++++ b/url/BUILD.gn
-+@@ -96,6 +96,10 @@ component("url") {
-+     ]
-+     deps += [ "//third_party/icu" ]
-+   }
-++
-++  if (is_electron_build) {
-++    defines += [ "ELECTRON_NO_DCHECK" ]
-++  }
-+ }
-+ 
-+ if (is_android) {
-+diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc
-+index 674b0e9a909c..a1bff6e40f56 100644
-+--- a/ui/base/clipboard/clipboard_win.cc
-++++ b/ui/base/clipboard/clipboard_win.cc
-+@@ -886,9 +886,9 @@ void ClipboardWin::WriteBitmapFromHandle(HBITMAP source_hbitmap,
-+ }
-+ 
-+ void ClipboardWin::WriteToClipboard(unsigned int format, HANDLE handle) {
-+-  DCHECK(clipboard_owner_->hwnd() != NULL);
-++  // DCHECK(clipboard_owner_->hwnd() != NULL);
-+   if (handle && !::SetClipboardData(format, handle)) {
-+-    DCHECK(ERROR_CLIPBOARD_NOT_OPEN != GetLastError());
-++    // DCHECK(ERROR_CLIPBOARD_NOT_OPEN != GetLastError());
-+     FreeData(format, handle);
-+   }
-+ }
-+ diff --git a/third_party/WebKit/Source/core/animation/ElementAnimations.cpp b/third_party/WebKit/Source/core/animation/ElementAnimations.cpp
-+ index 60b8123cd818..dc719dd31dbf 100644
-+ --- a/third_party/WebKit/Source/core/animation/ElementAnimations.cpp
-+ +++ b/third_party/WebKit/Source/core/animation/ElementAnimations.cpp
-+ @@ -108,7 +108,7 @@ void ElementAnimations::UpdateBaseComputedStyle(
-+      base_computed_style_ = nullptr;
-+      return;
-+    }
-+ -#if DCHECK_IS_ON()
-+ +#if 0
-+    if (base_computed_style_ && computed_style)
-+      DCHECK(*base_computed_style_ == *computed_style);
-+  #endif
-+diff --git a/base/process/process_metrics_win.cc b/base/process/process_metrics_win.cc
-+index 61f0bf4ad06f..259783ad67a1 100644
-+--- a/base/process/process_metrics_win.cc
-++++ b/base/process/process_metrics_win.cc
-+@@ -326,10 +326,9 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_counters) const {
-+ ProcessMetrics::ProcessMetrics(ProcessHandle process) : last_system_time_(0) {
-+   if (process) {
-+     HANDLE duplicate_handle;
-+-    BOOL result = ::DuplicateHandle(::GetCurrentProcess(), process,
-+-                                    ::GetCurrentProcess(), &duplicate_handle,
-+-                                    PROCESS_QUERY_INFORMATION, FALSE, 0);
-+-    DCHECK(result);
-++    ::DuplicateHandle(::GetCurrentProcess(), process,
-++                      ::GetCurrentProcess(), &duplicate_handle,
-++                      PROCESS_QUERY_INFORMATION, FALSE, 0);
-+     process_.Set(duplicate_handle);
-+   }
-+ }
-added in remote
-  their  100644 df12ce0cba26e81b2116a27bfd6cdddf9ca7d1e7 patches/common/chromium/desktop_screen_win.patch
-@@ -0,0 +1,13 @@
-+diff --git a/ui/views/widget/desktop_aura/desktop_screen_win.cc b/ui/views/widget/desktop_aura/desktop_screen_win.cc
-+index f772f64..7d13f9f 100644
-+--- a/ui/views/widget/desktop_aura/desktop_screen_win.cc
-++++ b/ui/views/widget/desktop_aura/desktop_screen_win.cc
-+@@ -32,6 +32,8 @@ display::Display DesktopScreenWin::GetDisplayMatching(
-+ }
-+ 
-+ HWND DesktopScreenWin::GetHWNDFromNativeView(gfx::NativeView window) const {
-++  if (!window)
-++    return NULL;
-+   aura::WindowTreeHost* host = window->GetHost();
-+   return host ? host->GetAcceleratedWidget() : NULL;
-+ }
-added in remote
-  their  100644 4a062f12f382036a52004eb113ca1942ca0968f9 patches/common/chromium/disable-recursive-surface-sync.patch
-@@ -0,0 +1,16 @@
-+diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
-+index a9b9d180b0eb..5ad8b93114a7 100644
-+--- a/content/browser/renderer_host/render_widget_host_impl.cc
-++++ b/content/browser/renderer_host/render_widget_host_impl.cc
-+@@ -972,6 +975,11 @@ void RenderWidgetHostImpl::PauseForPendingResizeOrRepaints() {
-+   if (is_hidden())
-+     return;
-+ 
-++  // Do not pause if there is already a pending operation with the
-++  // backing store.
-++  if (in_get_backing_store_)
-++    return;
-++
-+   // Do not pause if there is not a paint or resize already coming.
-+   if (!repaint_ack_pending_ && !resize_ack_pending_)
-+     return;
-added in remote
-  their  100644 4a4b2e89cdb3898ccb44091120037eda4df5c9c5 patches/common/chromium/disable-redraw-lock.patch
-@@ -0,0 +1,60 @@
-+diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-+index c8fb7eecb9c8..3d995aa331b1 100644
-+--- a/ui/views/win/hwnd_message_handler.cc
-++++ b/ui/views/win/hwnd_message_handler.cc
-+@@ -251,6 +251,10 @@ const int kSynthesizedMouseMessagesTimeDifference = 500;
-+
-+ }  // namespace
-+
-++bool HWNDMessageHandlerDelegate::HasNativeFrame() const {
-++  return false;
-++}
-++
-+ // A scoping class that prevents a window from being able to redraw in response
-+ // to invalidations that may occur within it for the lifetime of the object.
-+ //
-+@@ -302,6 +306,7 @@ class HWNDMessageHandler::ScopedRedrawLock {
-+         cancel_unlock_(false),
-+         should_lock_(owner_->IsVisible() && !owner->HasChildRenderingWindow() &&
-+                      ::IsWindow(hwnd_) &&
-++                     !owner_->HasNativeFrame() &&
-+                      (!(GetWindowLong(hwnd_, GWL_STYLE) & WS_CAPTION) ||
-+                       !ui::win::IsAeroGlassEnabled())) {
-+     if (should_lock_)
-+@@ -903,6 +908,10 @@ bool HWNDMessageHandler::HasChildRenderingWindow() {
-+       hwnd());
-+ }
-+
-++bool HWNDMessageHandler::HasNativeFrame() {
-++  return delegate_->HasNativeFrame();
-++}
-++
-+ ////////////////////////////////////////////////////////////////////////////////
-+ // HWNDMessageHandler, gfx::WindowImpl overrides:
-+
-+diff --git a/ui/views/win/hwnd_message_handler.h b/ui/views/win/hwnd_message_handler.h
-+index 5d5765c1928e..d77991cfa737 100644
-+--- a/ui/views/win/hwnd_message_handler.h
-++++ b/ui/views/win/hwnd_message_handler.h
-+@@ -227,6 +227,8 @@ class VIEWS_EXPORT HWNDMessageHandler : public gfx::WindowImpl,
-+   typedef std::set<DWORD> TouchIDs;
-+   enum class DwmFrameState { OFF, ON };
-+
-++  bool HasNativeFrame();
-++
-+   // Overridden from WindowImpl:
-+   HICON GetDefaultWindowIcon() const override;
-+   HICON GetSmallWindowIcon() const override;
-+diff --git a/ui/views/win/hwnd_message_handler_delegate.h b/ui/views/win/hwnd_message_handler_delegate.h
-+index d13f807e4a75..877189d63616 100644
-+--- a/ui/views/win/hwnd_message_handler_delegate.h
-++++ b/ui/views/win/hwnd_message_handler_delegate.h
-+@@ -46,6 +46,8 @@ class VIEWS_EXPORT HWNDMessageHandlerDelegate {
-+   // True if the widget associated with this window has a non-client view.
-+   virtual bool HasNonClientView() const = 0;
-+
-++  virtual bool HasNativeFrame() const;
-++
-+   // Returns who we want to be drawing the frame. Either the system (Windows)
-+   // will handle it or Chrome will custom draw it.
-+   virtual FrameMode GetFrameMode() const = 0;
-added in remote
-  their  100644 740a35075863c0628cf48cd2803842dd01d06e1d patches/common/chromium/disable_hidden.patch
-@@ -0,0 +1,28 @@
-+diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
-+index 77c870b8a075..f1c4076788c5 100644
-+--- a/content/browser/renderer_host/render_widget_host_impl.cc
-++++ b/content/browser/renderer_host/render_widget_host_impl.cc
-+@@ -664,6 +664,9 @@ void RenderWidgetHostImpl::WasHidden() {
-+   if (is_hidden_)
-+     return;
-+ 
-++  if (disable_hidden_)
-++    return;
-++
-+   RejectMouseLockOrUnlockIfNecessary();
-+ 
-+   TRACE_EVENT0("renderer_host", "RenderWidgetHostImpl::WasHidden");
-+diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h
-+index b6aa99e..ef4fa35 100644
-+--- a/content/browser/renderer_host/render_widget_host_impl.h
-++++ b/content/browser/renderer_host/render_widget_host_impl.h
-+@@ -124,6 +124,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl : public RenderWidgetHost,
-+   // RenderWidgetHostImpl.
-+   static RenderWidgetHostImpl* From(RenderWidgetHost* rwh);
-+ 
-++  // Electron: Prevents the widget from getting hidden.
-++  bool disable_hidden_ = false;
-++
-+   void set_hung_renderer_delay(const base::TimeDelta& delay) {
-+     hung_renderer_delay_ = delay;
-+   }
-added in remote
-  their  100644 8a660b9f8e831070f796055f6031370a88520929 patches/common/chromium/disable_scroll_begin_dcheck.patch
-@@ -0,0 +1,26 @@
-+diff --git a/content/browser/renderer_host/input/mouse_wheel_event_queue.cc b/content/browser/renderer_host/input/mouse_wheel_event_queue.cc
-+index 5d5bead..f2ac4d8 100644
-+--- a/content/browser/renderer_host/input/mouse_wheel_event_queue.cc
-++++ b/content/browser/renderer_host/input/mouse_wheel_event_queue.cc
-+@@ -339,7 +339,7 @@ void MouseWheelEventQueue::SendScrollBegin(
-+          (synthetic && !needs_scroll_begin_when_scroll_latching_disabled_) ||
-+          needs_scroll_begin_when_scroll_latching_disabled_);
-+ 
-+-  DCHECK(!scroll_in_progress_);
-++  // DCHECK(!scroll_in_progress_);
-+   scroll_in_progress_ = true;
-+ 
-+   WebGestureEvent scroll_begin(gesture_update);
-+diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
-+index 28ab370..09fb882 100644
-+--- a/content/browser/renderer_host/render_widget_host_impl.cc
-++++ b/content/browser/renderer_host/render_widget_host_impl.cc
-+@@ -1199,7 +1199,7 @@ void RenderWidgetHostImpl::ForwardGestureEventWithLatencyInfo(
-+ 
-+   bool scroll_update_needs_wrapping = false;
-+   if (gesture_event.GetType() == blink::WebInputEvent::kGestureScrollBegin) {
-+-    DCHECK(!is_in_gesture_scroll_[gesture_event.source_device]);
-++    // DCHECK(!is_in_gesture_scroll_[gesture_event.source_device]);
-+     is_in_gesture_scroll_[gesture_event.source_device] = true;
-+   } else if (gesture_event.GetType() ==
-+              blink::WebInputEvent::kGestureScrollEnd) {
-added in remote
-  their  100644 b2ded9964c7f492e42d630474d84606ed67396fe patches/common/chromium/disable_user_gesture_requirement_for_beforeunload_dialogs.patch
-@@ -0,0 +1,15 @@
-+diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp
-+index a39067db8c52..4a0d69dc3fb5 100644
-+--- a/third_party/WebKit/Source/core/dom/Document.cpp
-++++ b/third_party/WebKit/Source/core/dom/Document.cpp
-+@@ -3239,7 +3239,9 @@ bool Document::DispatchBeforeUnloadEvent(ChromeClient& chrome_client,
-+         "Blocked attempt to show a 'beforeunload' confirmation panel for a "
-+         "frame that never had a user gesture since its load. "
-+         "https://www.chromestatus.com/feature/5082396709879808"));
-+-    return true;
-++    // TODO(alexeykuzmin): Uncomment `return true` when Electron tests are fixed.
-++    // See https://github.com/electron/electron/issues/10754
-++    // return true;
-+   }
-+ 
-+   if (did_allow_navigation) {
-added in remote
-  their  100644 29b0772cfc990432c08d8ecd667d1695f561dc65 patches/common/chromium/dom_storage_map.patch
-@@ -0,0 +1,17 @@
-+diff --git a/content/common/dom_storage/dom_storage_map.cc b/content/common/dom_storage/dom_storage_map.cc
-+index 0a6b0176a982..35a1c3c11a58 100644
-+--- a/content/common/dom_storage/dom_storage_map.cc
-++++ b/content/common/dom_storage/dom_storage_map.cc
-+@@ -182,10 +182,12 @@ bool DOMStorageMap::SetItemInternal(MapType* map_type,
-+   size_t new_item_size = size_in_storage(key, value);
-+   size_t new_storage_used = storage_used_ - old_item_size + new_item_size;
-+ 
-++#if 0  // Disable localStorage size limit for Electron.
-+   // Only check quota if the size is increasing, this allows
-+   // shrinking changes to pre-existing files that are over budget.
-+   if (new_item_size > old_item_size && new_storage_used > quota_)
-+     return false;
-++#endif
-+ 
-+   (*map_type)[key] = value;
-+   ResetKeyIterator();
-added in remote
-  their  100644 b4eebe11b896456dab699a583dd1d4341c7295f5 patches/common/chromium/exclude_next_version_mini_installer_from_deps.patch
-@@ -0,0 +1,13 @@
-+diff --git a/chrome/installer/mini_installer/BUILD.gn b/chrome/installer/mini_installer/BUILD.gn
-+index c44f8a110599..2d48cf1ade70 100644
-+--- a/chrome/installer/mini_installer/BUILD.gn
-++++ b/chrome/installer/mini_installer/BUILD.gn
-+@@ -331,7 +331,7 @@ if (is_win) {
-+     testonly = true
-+     data_deps = [
-+       ":mini_installer",
-+-      ":next_version_mini_installer",
-++      # ":next_version_mini_installer",
-+     ]
-+   }
-+ }
-added in remote
-  their  100644 1211e6ab8a45e5601ad6d4c9b241fd8fcbf867d0 patches/common/chromium/export_blink_webdisplayitemlist.patch
-@@ -0,0 +1,21 @@
-+diff --git a/third_party/WebKit/public/platform/WebDisplayItemList.h b/third_party/WebKit/public/platform/WebDisplayItemList.h
-+index 82af75c3727e..548eefc0fae5 100644
-+--- a/third_party/WebKit/public/platform/WebDisplayItemList.h
-++++ b/third_party/WebKit/public/platform/WebDisplayItemList.h
-+@@ -6,6 +6,7 @@
-+ #define WebDisplayItemList_h
-+ 
-+ #include "WebBlendMode.h"
-++#include "WebCommon.h"
-+ #include "WebFloatPoint.h"
-+ #include "WebFloatRect.h"
-+ #include "WebRect.h"
-+@@ -33,7 +34,7 @@ namespace blink {
-+ // 'drawing' items) and operations to be performed when rendering this content
-+ // (stored in 'clip', 'transform', 'filter', etc...). For more details see:
-+ // http://dev.chromium.org/blink/slimming-paint.
-+-class WebDisplayItemList {
-++class BLINK_EXPORT WebDisplayItemList {
-+  public:
-+   virtual ~WebDisplayItemList() = default;
-+ 
-added in remote
-  their  100644 de291eb125275e385e1ee634c78b2f6e63afa838 patches/common/chromium/fix-arm64-linking-error.patch
-@@ -0,0 +1,13 @@
-+diff --git a/skia/BUILD.gn b/skia/BUILD.gn
-+index c0477a6fe82d..3a020f2e2006 100644
-+--- a/skia/BUILD.gn
-++++ b/skia/BUILD.gn
-+@@ -125,7 +125,7 @@ config("skia_library_config") {
-+ 
-+   defines = []
-+ 
-+-  if (!is_ios && !use_system_freetype) {
-++  if (!is_ios && (is_win || is_mac)) {
-+     defines += [ "SK_FREETYPE_MINIMUM_RUNTIME_VERSION=(((FREETYPE_MAJOR) * 0x01000000) | ((FREETYPE_MINOR) * 0x00010000) | ((FREETYPE_PATCH) * 0x00000100))" ]
-+   }
-+ 
-added in remote
-  their  100644 e5028708c335c8c69cee67b36f681a5ed94ab35c patches/common/chromium/frame_host_manager.patch
-@@ -0,0 +1,83 @@
-+diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
-+index e6f6b3012b02..965b58e237ec 100644
-+--- a/content/browser/frame_host/render_frame_host_manager.cc
-++++ b/content/browser/frame_host/render_frame_host_manager.cc
-+@@ -1834,6 +1834,18 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
-+   bool was_server_redirect = request.navigation_handle() &&
-+                              request.navigation_handle()->WasServerRedirect();
-+ 
-++  BrowserContext* browser_context =
-++      delegate_->GetControllerForRenderManager().GetBrowserContext();
-++  // If the navigation can swap SiteInstances, compute the SiteInstance it
-++  // should use.
-++  // TODO(clamy): We should also consider as a candidate SiteInstance the
-++  // speculative SiteInstance that was computed on redirects.
-++  scoped_refptr<SiteInstance> candidate_site_instance =
-++      speculative_render_frame_host_
-++          ? speculative_render_frame_host_->GetSiteInstance()
-++          : content::SiteInstance::CreateForURL(browser_context,
-++                                                request.common_params().url);
-++
-+   if (frame_tree_node_->IsMainFrame()) {
-+     // Renderer-initiated main frame navigations that may require a
-+     // SiteInstance swap are sent to the browser via the OpenURL IPC and are
-+@@ -1850,6 +1862,19 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
-+ 
-+     no_renderer_swap_allowed |=
-+         request.from_begin_navigation() && !can_renderer_initiate_transfer;
-++
-++    bool has_response_started =
-++        (request.state() == NavigationRequest::RESPONSE_STARTED ||
-++         request.state() == NavigationRequest::FAILED) &&
-++        !speculative_render_frame_host_;
-++    // Gives user a chance to choose a custom site instance.
-++    SiteInstance* client_custom_instance = nullptr;
-++    GetContentClient()->browser()->OverrideSiteInstanceForNavigation(
-++        render_frame_host_.get(), browser_context, request.common_params().url,
-++        has_response_started, candidate_site_instance.get(),
-++        &client_custom_instance);
-++    if (client_custom_instance)
-++      return scoped_refptr<SiteInstance>(client_custom_instance);
-+   } else {
-+     // Subframe navigations will use the current renderer, unless specifically
-+     // allowed to swap processes.
-+@@ -1861,18 +1886,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
-+   if (no_renderer_swap_allowed)
-+     return scoped_refptr<SiteInstance>(current_site_instance);
-+ 
-+-  // If the navigation can swap SiteInstances, compute the SiteInstance it
-+-  // should use.
-+-  // TODO(clamy): We should also consider as a candidate SiteInstance the
-+-  // speculative SiteInstance that was computed on redirects.
-+-  SiteInstance* candidate_site_instance =
-+-      speculative_render_frame_host_
-+-          ? speculative_render_frame_host_->GetSiteInstance()
-+-          : nullptr;
-+-
-+   scoped_refptr<SiteInstance> dest_site_instance = GetSiteInstanceForNavigation(
-+       request.common_params().url, request.source_site_instance(),
-+-      request.dest_site_instance(), candidate_site_instance,
-++      request.dest_site_instance(), candidate_site_instance.get(),
-+       request.common_params().transition,
-+       request.restore_type() != RestoreType::NONE, request.is_view_source(),
-+       was_server_redirect);
-+diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-+index 746760e8596c..99d9e0770f32 100644
-+--- a/content/public/browser/content_browser_client.h
-++++ b/content/public/browser/content_browser_client.h
-+@@ -181,6 +181,15 @@ class CONTENT_EXPORT ContentBrowserClient {
-+  public:
-+   virtual ~ContentBrowserClient() {}
-+ 
-++  // Electron: Allows overriding the SiteInstance when navigating.
-++  virtual void OverrideSiteInstanceForNavigation(
-++      RenderFrameHost* render_frame_host,
-++      BrowserContext* browser_context,
-++      const GURL& dest_url,
-++      bool has_response_started,
-++      SiteInstance* candidate_site_instance,
-++      SiteInstance** new_instance) {}
-++
-+   // Allows the embedder to set any number of custom BrowserMainParts
-+   // implementations for the browser startup code. See comments in
-+   // browser_main_parts.h.
-added in remote
-  their  100644 8b128b1377f8897a91c12b9364b84c56aadeaeb1 patches/common/chromium/gin_enable_disable_v8_platform.patch
-@@ -0,0 +1,66 @@
-+diff --git a/gin/isolate_holder.cc b/gin/isolate_holder.cc
-+index 56402d477ca3..8ab11bd18783 100644
-+--- a/gin/isolate_holder.cc
-++++ b/gin/isolate_holder.cc
-+@@ -116,9 +116,10 @@ IsolateHolder::~IsolateHolder() {
-+ void IsolateHolder::Initialize(ScriptMode mode,
-+                                V8ExtrasMode v8_extras_mode,
-+                                v8::ArrayBuffer::Allocator* allocator,
-+-                               const intptr_t* reference_table) {
-++                               const intptr_t* reference_table,
-++                               bool create_v8_platform) {
-+   CHECK(allocator);
-+-  V8Initializer::Initialize(mode, v8_extras_mode);
-++  V8Initializer::Initialize(mode, v8_extras_mode, create_v8_platform);
-+   g_array_buffer_allocator = allocator;
-+   g_reference_table = reference_table;
-+ }
-+diff --git a/gin/public/isolate_holder.h b/gin/public/isolate_holder.h
-+index 2509aca609f9..94003c6031cf 100644
-+--- a/gin/public/isolate_holder.h
-++++ b/gin/public/isolate_holder.h
-+@@ -84,7 +84,8 @@ class GIN_EXPORT IsolateHolder {
-+   static void Initialize(ScriptMode mode,
-+                          V8ExtrasMode v8_extras_mode,
-+                          v8::ArrayBuffer::Allocator* allocator,
-+-                         const intptr_t* reference_table = nullptr);
-++                         const intptr_t* reference_table = nullptr,
-++                         bool create_v8_platform = true);
-+ 
-+   v8::Isolate* isolate() { return isolate_; }
-+ 
-+diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
-+index e03635f4378f..d6274f66da1a 100644
-+--- a/gin/v8_initializer.cc
-++++ b/gin/v8_initializer.cc
-+@@ -321,12 +321,14 @@ base::FilePath V8Initializer::GetSnapshotFilePath(bool abi_32_bit) {
-+ 
-+ // static
-+ void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
-+-                               IsolateHolder::V8ExtrasMode v8_extras_mode) {
-++                               IsolateHolder::V8ExtrasMode v8_extras_mode,
-++                               bool create_v8_platform) {
-+   static bool v8_is_initialized = false;
-+   if (v8_is_initialized)
-+     return;
-+ 
-+-  v8::V8::InitializePlatform(V8Platform::Get());
-++  if (create_v8_platform)
-++    v8::V8::InitializePlatform(V8Platform::Get());
-+ 
-+   if (IsolateHolder::kStrictMode == mode) {
-+     static const char use_strict[] = "--use_strict";
-+diff --git a/gin/v8_initializer.h b/gin/v8_initializer.h
-+index f0a7c5e0fb68..df4ab4f3e4b9 100644
-+--- a/gin/v8_initializer.h
-++++ b/gin/v8_initializer.h
-+@@ -21,7 +21,8 @@ class GIN_EXPORT V8Initializer {
-+  public:
-+   // This should be called by IsolateHolder::Initialize().
-+   static void Initialize(IsolateHolder::ScriptMode mode,
-+-                         IsolateHolder::V8ExtrasMode v8_extras_mode);
-++                         IsolateHolder::V8ExtrasMode v8_extras_mode,
-++                         bool create_v8_platform = true);
-+ 
-+   // Get address and size information for currently loaded snapshot.
-+   // If no snapshot is loaded, the return values are null for addresses
-added in remote
-  their  100644 e4b80bc08e074ea2934e4de4a9de78bbe7b7d709 patches/common/chromium/gtk_visibility.patch
-@@ -0,0 +1,13 @@
-+diff --git a/build/config/linux/gtk/BUILD.gn b/build/config/linux/gtk/BUILD.gn
-+index eb75461..2116f93 100644
-+--- a/build/config/linux/gtk/BUILD.gn
-++++ b/build/config/linux/gtk/BUILD.gn
-+@@ -17,6 +17,8 @@ assert(is_linux, "This file should only be referenced on Linux")
-+ group("gtk") {
-+   visibility = [
-+     "//chrome/test:interactive_ui_tests",
-++    "//electron:*",
-++    "//electron/brightray:*",
-+     "//examples:peerconnection_client",
-+     "//gpu/gles2_conform_support:gles2_conform_test_windowless",
-+     "//remoting/host",
-added in remote
-  their  100644 f349882d127587ac0ef073348afc5625114b81e0 patches/common/chromium/latency_info.patch
-@@ -0,0 +1,100 @@
-+diff --git a/ui/latency/BUILD.gn b/ui/latency/BUILD.gn
-+index e5abf3bd9589..76c65578d0d1 100644
-+--- a/ui/latency/BUILD.gn
-++++ b/ui/latency/BUILD.gn
-+@@ -5,13 +5,14 @@
-+ import("//build/config/jumbo.gni")
-+ import("//testing/test.gni")
-+ 
-+-jumbo_source_set("latency") {
-++component("latency") {
-+   sources = [
-+     "latency_histogram_macros.h",
-+     "latency_info.cc",
-+     "latency_info.h",
-+     "latency_tracker.cc",
-+     "latency_tracker.h",
-++    "ui_latency_export.h",
-+   ]
-+ 
-+   deps = [
-+@@ -22,6 +23,8 @@ jumbo_source_set("latency") {
-+   public_deps = [
-+     "//services/metrics/public/cpp:metrics_cpp",
-+   ]
-++
-++  defines = [ "UI_LATENCY_IMPLEMENTATION" ]
-+ }
-+ 
-+ jumbo_source_set("test_support") {
-+diff --git a/ui/latency/latency_info.h b/ui/latency/latency_info.h
-+index d9d390861562..7b1aa99e8a9c 100644
-+--- a/ui/latency/latency_info.h
-++++ b/ui/latency/latency_info.h
-+@@ -16,6 +16,7 @@
-+ #include "base/time/time.h"
-+ #include "services/metrics/public/cpp/ukm_source_id.h"
-+ #include "ui/gfx/geometry/point_f.h"
-++#include "ui/latency/ui_latency_export.h"
-+ 
-+ #if !defined(OS_IOS)
-+ #include "ipc/ipc_param_traits.h"  // nogncheck
-+@@ -114,7 +115,7 @@ enum SourceEventType {
-+   SOURCE_EVENT_TYPE_LAST = OTHER,
-+ };
-+ 
-+-class LatencyInfo {
-++class UI_LATENCY_EXPORT LatencyInfo {
-+  public:
-+   struct LatencyComponent {
-+     // Nondecreasing number that can be used to determine what events happened
-+diff --git a/ui/latency/latency_tracker.h b/ui/latency/latency_tracker.h
-+index 24397fc4ba6d..ad943fa7ccf7 100644
-+--- a/ui/latency/latency_tracker.h
-++++ b/ui/latency/latency_tracker.h
-+@@ -8,12 +8,13 @@
-+ #include "base/macros.h"
-+ #include "services/metrics/public/cpp/ukm_source_id.h"
-+ #include "ui/latency/latency_info.h"
-++#include "ui/latency/ui_latency_export.h"
-+ 
-+ namespace ui {
-+ 
-+ // Utility class for tracking the latency of events. Relies on LatencyInfo
-+ // components logged by content::RenderWidgetHostLatencyTracker.
-+-class LatencyTracker {
-++class UI_LATENCY_EXPORT LatencyTracker {
-+  public:
-+   explicit LatencyTracker(bool metric_sampling,
-+                           ukm::SourceId ukm_source_id = ukm::kInvalidSourceId);
-+diff --git a/ui/latency/ui_latency_export.h b/ui/latency/ui_latency_export.h
-+new file mode 100644
-+index 0000000..f24ee91
-+--- /dev/null
-++++ b/ui/latency/ui_latency_export.h
-+@@ -0,0 +1,25 @@
-++#ifndef UI_LATENCY_UI_LATENCY_EXPORT_H_
-++#define UI_LATENCY_UI_LATENCY_EXPORT_H_
-++
-++#if defined(COMPONENT_BUILD)
-++#if defined(WIN32)
-++
-++#if defined(UI_LATENCY_IMPLEMENTATION)
-++#define UI_LATENCY_EXPORT __declspec(dllexport)
-++#else
-++#define UI_LATENCY_EXPORT __declspec(dllimport)
-++#endif  // defined(UI_LATENCY_IMPLEMENTATION)
-++
-++#else  // defined(WIN32)
-++#if defined(UI_LATENCY_IMPLEMENTATION)
-++#define UI_LATENCY_EXPORT __attribute__((visibility("default")))
-++#else
-++#define UI_LATENCY_EXPORT
-++#endif
-++#endif
-++
-++#else  // defined(COMPONENT_BUILD)
-++#define UI_LATENCY_EXPORT
-++#endif
-++
-++#endif  // UI_LATENCY_UI_LATENCY_EXPORT_H_
-added in remote
-  their  100644 d0aa9ec2c5cd3addcf4893667c464075e31001f9 patches/common/chromium/libgtkui_export.patch
-@@ -0,0 +1,125 @@
-+diff --git a/chrome/browser/ui/libgtkui/app_indicator_icon.h b/chrome/browser/ui/libgtkui/app_indicator_icon.h
-+index 7815fbb..f17a5c5 100644
-+--- a/chrome/browser/ui/libgtkui/app_indicator_icon.h
-++++ b/chrome/browser/ui/libgtkui/app_indicator_icon.h
-+@@ -12,6 +12,7 @@
-+ #include "base/memory/weak_ptr.h"
-+ #include "base/nix/xdg_util.h"
-+ #include "chrome/browser/ui/libgtkui/gtk_signal.h"
-++#include "chrome/browser/ui/libgtkui/libgtkui_export.h"
-+ #include "ui/views/linux_ui/status_icon_linux.h"
-+ 
-+ typedef struct _AppIndicator AppIndicator;
-+@@ -31,7 +32,7 @@ namespace libgtkui {
-+ class AppIndicatorIconMenu;
-+ 
-+ // Status icon implementation which uses libappindicator.
-+-class AppIndicatorIcon : public views::StatusIconLinux {
-++class LIBGTKUI_EXPORT AppIndicatorIcon : public views::StatusIconLinux {
-+  public:
-+   // The id uniquely identifies the new status icon from other chrome status
-+   // icons.
-+diff --git a/chrome/browser/ui/libgtkui/gtk_status_icon.h b/chrome/browser/ui/libgtkui/gtk_status_icon.h
-+index e4e0da4..af02871 100644
-+--- a/chrome/browser/ui/libgtkui/gtk_status_icon.h
-++++ b/chrome/browser/ui/libgtkui/gtk_status_icon.h
-+@@ -10,6 +10,7 @@
-+ #include "base/macros.h"
-+ #include "base/strings/string16.h"
-+ #include "chrome/browser/ui/libgtkui/gtk_signal.h"
-++#include "chrome/browser/ui/libgtkui/libgtkui_export.h"
-+ #include "ui/base/glib/glib_integers.h"
-+ #include "ui/base/glib/glib_signal.h"
-+ #include "ui/views/linux_ui/status_icon_linux.h"
-+@@ -29,7 +30,7 @@ class AppIndicatorIconMenu;
-+ 
-+ // Status icon implementation which uses the system tray X11 spec (via
-+ // GtkStatusIcon).
-+-class Gtk2StatusIcon : public views::StatusIconLinux {
-++class LIBGTKUI_EXPORT Gtk2StatusIcon : public views::StatusIconLinux {
-+  public:
-+   Gtk2StatusIcon(const gfx::ImageSkia& image, const base::string16& tool_tip);
-+   ~Gtk2StatusIcon() override;
-+diff --git a/chrome/browser/ui/libgtkui/gtk_util.h b/chrome/browser/ui/libgtkui/gtk_util.h
-+index 665ec57..4ccb088 100644
-+--- a/chrome/browser/ui/libgtkui/gtk_util.h
-++++ b/chrome/browser/ui/libgtkui/gtk_util.h
-+@@ -11,6 +11,7 @@
-+ #include "ui/base/glib/scoped_gobject.h"
-+ #include "ui/native_theme/native_theme.h"
-+ #include "ui/views/window/frame_buttons.h"
-++#include "chrome/browser/ui/libgtkui/libgtkui_export.h"
-+ 
-+ namespace aura {
-+ class Window;
-+@@ -51,10 +52,10 @@ SkColor NormalURLColor(SkColor foreground);
-+ // saturation than to look exactly like the foreground color.
-+ SkColor SelectedURLColor(SkColor foreground, SkColor background);
-+ 
-+-void GtkInitFromCommandLine(const base::CommandLine& command_line);
-++LIBGTKUI_EXPORT void GtkInitFromCommandLine(const base::CommandLine& command_line);
-+ 
-+ // Returns the name of the ".desktop" file associated with our running process.
-+-std::string GetDesktopName(base::Environment* env);
-++LIBGTKUI_EXPORT std::string GetDesktopName(base::Environment* env);
-+ 
-+ guint GetGdkKeyCodeForAccelerator(const ui::Accelerator& accelerator);
-+ 
-+@@ -69,7 +70,7 @@ void TurnButtonBlue(GtkWidget* button);
-+ 
-+ // Sets |dialog| as transient for |parent|, which will keep it on top and center
-+ // it above |parent|. Do nothing if |parent| is nullptr.
-+-void SetGtkTransientForAura(GtkWidget* dialog, aura::Window* parent);
-++LIBGTKUI_EXPORT void SetGtkTransientForAura(GtkWidget* dialog, aura::Window* parent);
-+ 
-+ // Gets the transient parent aura window for |dialog|.
-+ aura::Window* GetAuraTransientParent(GtkWidget* dialog);
-+diff --git a/chrome/browser/ui/libgtkui/skia_utils_gtk.h b/chrome/browser/ui/libgtkui/skia_utils_gtk.h
-+index e05fbe9..3afca9a 100644
-+--- a/chrome/browser/ui/libgtkui/skia_utils_gtk.h
-++++ b/chrome/browser/ui/libgtkui/skia_utils_gtk.h
-+@@ -7,6 +7,7 @@
-+ 
-+ #include <stdint.h>
-+ 
-++#include "chrome/browser/ui/libgtkui/libgtkui_export.h"
-+ #include "third_party/skia/include/core/SkColor.h"
-+ 
-+ typedef struct _GdkColor GdkColor;
-+@@ -41,7 +42,7 @@ const SkBitmap GdkPixbufToImageSkia(GdkPixbuf* pixbuf);
-+ // Convert and copy a SkBitmap to a GdkPixbuf. NOTE: this uses BGRAToRGBA, so
-+ // it is an expensive operation.  The returned GdkPixbuf will have a refcount of
-+ // 1, and the caller is responsible for unrefing it when done.
-+-GdkPixbuf* GdkPixbufFromSkBitmap(const SkBitmap& bitmap);
-++LIBGTKUI_EXPORT GdkPixbuf* GdkPixbufFromSkBitmap(const SkBitmap& bitmap);
-+ 
-+ }  // namespace libgtkui
-+ 
-+diff --git a/chrome/browser/ui/libgtkui/unity_service.h b/chrome/browser/ui/libgtkui/unity_service.h
-+index 8d67e14..95fbb27 100644
-+--- a/chrome/browser/ui/libgtkui/unity_service.h
-++++ b/chrome/browser/ui/libgtkui/unity_service.h
-+@@ -5,18 +5,20 @@
-+ #ifndef CHROME_BROWSER_UI_LIBGTKUI_UNITY_SERVICE_H_
-+ #define CHROME_BROWSER_UI_LIBGTKUI_UNITY_SERVICE_H_
-+ 
-++#include "chrome/browser/ui/libgtkui/libgtkui_export.h"
-++
-+ namespace unity {
-+ 
-+ // Returns whether unity is currently running.
-+-bool IsRunning();
-++LIBGTKUI_EXPORT bool IsRunning();
-+ 
-+ // If unity is running, sets the download counter in the dock icon. Any value
-+ // other than 0 displays the badge.
-+-void SetDownloadCount(int count);
-++LIBGTKUI_EXPORT void SetDownloadCount(int count);
-+ 
-+ // If unity is running, sets the download progress bar in the dock icon. Any
-+ // value between 0.0 and 1.0 (exclusive) shows the progress bar.
-+-void SetProgressFraction(float percentage);
-++LIBGTKUI_EXPORT void SetProgressFraction(float percentage);
-+ 
-+ }  // namespace unity
-+ 
-added in remote
-  their  100644 0d4d01c98fd8a638b30be3421bf94bd72898fa52 patches/common/chromium/mas-audiodeviceduck.patch
-@@ -0,0 +1,47 @@
-+From d322e351554a4fa1fbaf529769416041031f07e9 Mon Sep 17 00:00:00 2001
-+From: Jeremy Apthorp <jeremya@chromium.org>
-+Date: Mon, 6 Aug 2018 13:02:53 -0700
-+Subject: fix: [mas] don't call private api AudioDeviceDuck
-+
-+---
-+ media/audio/mac/audio_low_latency_input_mac.cc | 4 ++++
-+ 1 file changed, 4 insertions(+)
-+
-+diff --git a/media/audio/mac/audio_low_latency_input_mac.cc b/media/audio/mac/audio_low_latency_input_mac.cc
-+index 173167b54dfb..1c0fda354d03 100644
-+--- a/media/audio/mac/audio_low_latency_input_mac.cc
-++++ b/media/audio/mac/audio_low_latency_input_mac.cc
-+@@ -28,12 +28,14 @@
-+ 
-+ namespace {
-+ extern "C" {
-++#ifndef MAS_BUILD
-+ // See:
-+ // https://trac.webkit.org/browser/webkit/trunk/Source/WebCore/PAL/pal/spi/cf/CoreAudioSPI.h?rev=228264
-+ OSStatus AudioDeviceDuck(AudioDeviceID inDevice,
-+                          Float32 inDuckedLevel,
-+                          const AudioTimeStamp* __nullable inStartTime,
-+                          Float32 inRampDuration) __attribute__((weak_import));
-++#endif
-+ }
-+ 
-+ }  // namespace
-+@@ -604,6 +606,7 @@ bool AUAudioInputStream::OpenVoiceProcessingAU() {
-+     return false;
-+   }
-+ 
-++#ifndef MAS_BUILD
-+   if (AudioDeviceDuck != nullptr) {
-+     // Undo the ducking.
-+     // Obtain the AudioDeviceID of the default output AudioDevice.
-+@@ -619,6 +622,7 @@ bool AUAudioInputStream::OpenVoiceProcessingAU() {
-+       AudioDeviceDuck(output_device, 1.0, nullptr, 0.5);
-+     }
-+   }
-++#endif
-+ 
-+   return true;
-+ }
-+-- 
-+2.17.0
-+
-added in remote
-  their  100644 efac7300642d9f2570042f9362a82480add013ec patches/common/chromium/mas-cfisobjc.patch
-@@ -0,0 +1,44 @@
-+From 9fb1ac04b1a3e7ec53e27cf1f413469d04360d1e Mon Sep 17 00:00:00 2001
-+From: Jeremy Apthorp <jeremya@chromium.org>
-+Date: Mon, 6 Aug 2018 17:11:14 -0700
-+Subject: fix: [mas] remove usage of _CFIsObjC
-+
-+---
-+ base/mac/foundation_util.mm | 7 +------
-+ 1 file changed, 1 insertion(+), 6 deletions(-)
-+
-+diff --git a/base/mac/foundation_util.mm b/base/mac/foundation_util.mm
-+index aec8c0f6398c..6a6dfc272d45 100644
-+--- a/base/mac/foundation_util.mm
-++++ b/base/mac/foundation_util.mm
-+@@ -25,7 +25,6 @@
-+ extern "C" {
-+ CFTypeID SecACLGetTypeID();
-+ CFTypeID SecTrustedApplicationGetTypeID();
-+-Boolean _CFIsObjC(CFTypeID typeID, CFTypeRef obj);
-+ }  // extern "C"
-+ #endif
-+ 
-+@@ -323,8 +322,7 @@ NSFont* CFToNSCast(CTFontRef cf_val) {
-+       const_cast<NSFont*>(reinterpret_cast<const NSFont*>(cf_val));
-+   DCHECK(!cf_val ||
-+          CTFontGetTypeID() == CFGetTypeID(cf_val) ||
-+-         (_CFIsObjC(CTFontGetTypeID(), cf_val) &&
-+-          [ns_val isKindOfClass:[NSFont class]]));
-++         ([ns_val isKindOfClass:[NSFont class]]));
-+   return ns_val;
-+ }
-+ 
-+@@ -392,9 +390,6 @@ CFCast<CTFontRef>(const CFTypeRef& cf_val) {
-+     return (CTFontRef)(cf_val);
-+   }
-+ 
-+-  if (!_CFIsObjC(CTFontGetTypeID(), cf_val))
-+-    return NULL;
-+-
-+   id<NSObject> ns_val = reinterpret_cast<id>(const_cast<void*>(cf_val));
-+   if ([ns_val isKindOfClass:[NSFont class]]) {
-+     return (CTFontRef)(cf_val);
-+-- 
-+2.17.0
-+
-added in remote
-  their  100644 fe68a4c578e9b9bc1f66da4260c7b4719f340163 patches/common/chromium/mas-cgdisplayusesforcetogray.patch
-@@ -0,0 +1,34 @@
-+From 82d0ef64e22c69c0435608276149977d2811a3f7 Mon Sep 17 00:00:00 2001
-+From: Jeremy Apthorp <nornagon@nornagon.net>
-+Date: Mon, 6 Aug 2018 10:58:46 -0700
-+Subject: fix: [mas] remove usage of CGDisplayUsesForceToGray
-+
-+---
-+ ui/display/mac/screen_mac.mm | 10 ++++++++++
-+ 1 file changed, 10 insertions(+)
-+
-+diff --git a/ui/display/mac/screen_mac.mm b/ui/display/mac/screen_mac.mm
-+index 4850c795480e..ec34b25a6fe8 100644
-+--- a/ui/display/mac/screen_mac.mm
-++++ b/ui/display/mac/screen_mac.mm
-+@@ -106,7 +106,17 @@ Display BuildDisplayForScreen(NSScreen* screen) {
-+ 
-+   display.set_color_depth(NSBitsPerPixelFromDepth([screen depth]));
-+   display.set_depth_per_component(NSBitsPerSampleFromDepth([screen depth]));
-++#ifdef MAS_BUILD
-++  // This is equivalent to the CGDisplayUsesForceToGray() API as at 2018-08-06,
-++  // but avoids usage of the private API.
-++  CFStringRef app = CFSTR("com.apple.CoreGraphics");
-++  CFStringRef key = CFSTR("DisplayUseForcedGray");
-++  Boolean key_valid = false;
-++  display.set_is_monochrome(
-++      CFPreferencesGetAppBooleanValue(key, app, &key_valid));
-++#else
-+   display.set_is_monochrome(CGDisplayUsesForceToGray());
-++#endif
-+ 
-+   // CGDisplayRotation returns a double. Display::SetRotationAsDegree will
-+   // handle the unexpected situations were the angle is not a multiple of 90.
-+-- 
-+2.17.0
-+
-added in remote
-  their  100644 f6cec3294cab0dd98148065f6a9038ccda03d126 patches/common/chromium/mas-lssetapplicationlaunchservicesserverconnectionstatus.patch
-@@ -0,0 +1,27 @@
-+From 3fcbe57ff316894349907bf1c85f71d7487f0932 Mon Sep 17 00:00:00 2001
-+From: Jeremy Apthorp <jeremya@chromium.org>
-+Date: Mon, 6 Aug 2018 13:40:24 -0700
-+Subject: fix: [mas] don't call LaunchServices private api
-+
-+---
-+ content/gpu/gpu_main.cc | 2 ++
-+ 1 file changed, 2 insertions(+)
-+
-+diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
-+index 115f871094bc..aa47a1c1a51e 100644
-+--- a/content/gpu/gpu_main.cc
-++++ b/content/gpu/gpu_main.cc
-+@@ -276,8 +276,10 @@ int GpuMain(const MainFunctionParams& parameters) {
-+     std::unique_ptr<base::MessagePump> pump(new base::MessagePumpNSRunLoop());
-+     main_message_loop.reset(new base::MessageLoop(std::move(pump)));
-+ 
-++#ifndef MAS_BUILD
-+     // Tell LaunchServices to continue without a connection to the daemon.
-+     _LSSetApplicationLaunchServicesServerConnectionStatus(0, nullptr);
-++#endif
-+ #else
-+     main_message_loop.reset(
-+         new base::MessageLoop(base::MessageLoop::TYPE_DEFAULT));
-+-- 
-+2.17.0
-+
-added in remote
-  their  100644 e5b69f967c09989831867854da846349f5e0cf2a patches/common/chromium/mas_blink_no_private_api.patch
-@@ -0,0 +1,112 @@
-+diff --git a/third_party/WebKit/Source/core/paint/ThemePainterMac.mm b/third_party/WebKit/Source/core/paint/ThemePainterMac.mm
-+index 65e6437c22a6..3b726d196427 100644
-+--- a/third_party/WebKit/Source/core/paint/ThemePainterMac.mm
-++++ b/third_party/WebKit/Source/core/paint/ThemePainterMac.mm
-+@@ -43,6 +43,7 @@
-+ 
-+ // The methods in this file are specific to the Mac OS X platform.
-+ 
-++#ifndef MAS_BUILD
-+ // Forward declare Mac SPIs.
-+ extern "C" {
-+ void _NSDrawCarbonThemeBezel(NSRect frame, BOOL enabled, BOOL flipped);
-+@@ -52,6 +53,7 @@ void _NSDrawCarbonThemeListBox(NSRect frame,
-+                                BOOL flipped,
-+                                BOOL always_yes);
-+ }
-++#endif
-+ 
-+ namespace blink {
-+ 
-+@@ -74,10 +76,12 @@ bool ThemePainterMac::PaintTextField(const Node* node,
-+   // behavior change while remaining a fragile solution.
-+   // https://bugs.chromium.org/p/chromium/issues/detail?id=658085#c3
-+   if (!use_ns_text_field_cell) {
-++#ifndef MAS_BUILD
-+     _NSDrawCarbonThemeBezel(
-+         CGRect(r),
-+         LayoutTheme::IsEnabled(node) && !LayoutTheme::IsReadOnlyControl(node),
-+         YES);
-++#endif
-+     return false;
-+   }
-+ 
-+@@ -163,10 +167,12 @@ bool ThemePainterMac::PaintTextArea(const Node* node,
-+                                     const PaintInfo& paint_info,
-+                                     const IntRect& r) {
-+   LocalCurrentGraphicsContext local_context(paint_info.context, r);
-++#ifndef MAS_BUILD
-+   _NSDrawCarbonThemeListBox(
-+       CGRect(r),
-+       LayoutTheme::IsEnabled(node) && !LayoutTheme::IsReadOnlyControl(node),
-+       YES, YES);
-++#endif
-+   return false;
-+ }
-+ 
-+diff --git a/third_party/WebKit/Source/platform/mac/KillRingMac.mm b/third_party/WebKit/Source/platform/mac/KillRingMac.mm
-+index acf60f09fdb9..6376120a954f 100644
-+--- a/third_party/WebKit/Source/platform/mac/KillRingMac.mm
-++++ b/third_party/WebKit/Source/platform/mac/KillRingMac.mm
-+@@ -27,6 +27,7 @@
-+ 
-+ namespace blink {
-+ 
-++#ifndef MAS_BUILD
-+ extern "C" {
-+ 
-+ // Kill ring calls. Would be better to use NSKillRing.h, but that's not
-+@@ -39,38 +40,53 @@ NSString* _NSYankFromKillRing();
-+ void _NSNewKillRingSequence();
-+ void _NSSetKillRingToYankedState();
-+ }
-++#endif
-+ 
-+ static void InitializeKillRingIfNeeded() {
-+   static bool initialized_kill_ring = false;
-+   if (!initialized_kill_ring) {
-+     initialized_kill_ring = true;
-++#ifndef MAS_BUILD
-+     _NSInitializeKillRing();
-++#endif
-+   }
-+ }
-+ 
-+ void KillRing::Append(const String& string) {
-+   InitializeKillRingIfNeeded();
-++#ifndef MAS_BUILD
-+   _NSAppendToKillRing(string);
-++#endif
-+ }
-+ 
-+ void KillRing::Prepend(const String& string) {
-+   InitializeKillRingIfNeeded();
-++#ifndef MAS_BUILD
-+   _NSPrependToKillRing(string);
-++#endif
-+ }
-+ 
-+ String KillRing::Yank() {
-+   InitializeKillRingIfNeeded();
-++#ifndef MAS_BUILD
-+   return _NSYankFromKillRing();
-++#else
-++  return "";
-++#endif
-+ }
-+ 
-+ void KillRing::StartNewSequence() {
-+   InitializeKillRingIfNeeded();
-++#ifndef MAS_BUILD
-+   _NSNewKillRingSequence();
-++#endif
-+ }
-+ 
-+ void KillRing::SetToYankedState() {
-+   InitializeKillRingIfNeeded();
-++#ifndef MAS_BUILD
-+   _NSSetKillRingToYankedState();
-++#endif
-+ }
-+ 
-+ }  // namespace blink
-added in remote
-  their  100644 91ce3951c9d74d2c892d9311d8dcf561fa6cc196 patches/common/chromium/mas_no_private_api.patch
-@@ -0,0 +1,457 @@
-+diff --git a/content/browser/accessibility/browser_accessibility_cocoa.h b/content/browser/accessibility/browser_accessibility_cocoa.h
-+index a03585269db6..e7b028760bba 100644
-+--- a/content/browser/accessibility/browser_accessibility_cocoa.h
-++++ b/content/browser/accessibility/browser_accessibility_cocoa.h
-+@@ -111,7 +111,9 @@ struct AXTextEdit {
-+ @property(nonatomic, readonly) NSNumber* enabled;
-+ // Returns a text marker that points to the last character in the document that
-+ // can be selected with Voiceover.
-++#ifndef MAS_BUILD
-+ @property(nonatomic, readonly) id endTextMarker;
-++#endif
-+ @property(nonatomic, readonly) NSNumber* expanded;
-+ @property(nonatomic, readonly) NSNumber* focused;
-+ @property(nonatomic, readonly) NSNumber* grabbed;
-+@@ -147,12 +149,16 @@ struct AXTextEdit {
-+ @property(nonatomic, readonly) NSArray* selectedChildren;
-+ @property(nonatomic, readonly) NSString* selectedText;
-+ @property(nonatomic, readonly) NSValue* selectedTextRange;
-++#ifndef MAS_BUILD
-+ @property(nonatomic, readonly) id selectedTextMarkerRange;
-++#endif
-+ @property(nonatomic, readonly) NSValue* size;
-+ @property(nonatomic, readonly) NSString* sortDirection;
-+ // Returns a text marker that points to the first character in the document that
-+ // can be selected with Voiceover.
-++#ifndef MAS_BUILD
-+ @property(nonatomic, readonly) id startTextMarker;
-++#endif
-+ // A string indicating the subrole of this object as far as accessibility
-+ // is concerned.
-+ @property(nonatomic, readonly) NSString* subrole;
-+diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/content/browser/accessibility/browser_accessibility_cocoa.mm
-+index 4cff922f28a3..e9c57f7a0879 100644
-+--- a/content/browser/accessibility/browser_accessibility_cocoa.mm
-++++ b/content/browser/accessibility/browser_accessibility_cocoa.mm
-+@@ -119,6 +119,7 @@ NSDictionary* attributeToMethodNameMap = nil;
-+ // VoiceOver uses -1 to mean "no limit" for AXResultsLimit.
-+ const int kAXResultsLimitNoLimit = -1;
-+ 
-++#ifndef MAS_BUILD
-+ extern "C" {
-+ 
-+ // The following are private accessibility APIs required for cursor navigation
-+@@ -325,6 +326,7 @@ NSAttributedString* GetAttributedTextForTextMarkerRange(
-+   AddMisspelledTextAttributes(text_only_objects, attributed_text);
-+   return [attributed_text attributedSubstringFromRange:range];
-+ }
-++#endif
-+ 
-+ // Returns an autoreleased copy of the AXNodeData's attribute.
-+ NSString* NSStringForStringAttribute(
-+@@ -578,7 +580,9 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
-+       {NSAccessibilityDOMIdentifierAttribute, @"domIdentifier"},
-+       {NSAccessibilityEditableAncestorAttribute, @"editableAncestor"},
-+       {NSAccessibilityEnabledAttribute, @"enabled"},
-++#ifndef MAS_BUILD
-+       {NSAccessibilityEndTextMarkerAttribute, @"endTextMarker"},
-++#endif
-+       {NSAccessibilityExpandedAttribute, @"expanded"},
-+       {NSAccessibilityFocusedAttribute, @"focused"},
-+       {NSAccessibilityGrabbedAttribute, @"grabbed"},
-+@@ -609,13 +613,17 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
-+       {NSAccessibilityRowsAttribute, @"rows"},
-+       // TODO(aboxhall): expose
-+       // NSAccessibilityServesAsTitleForUIElementsAttribute
-++#ifndef MAS_BUILD
-+       {NSAccessibilityStartTextMarkerAttribute, @"startTextMarker"},
-++#endif
-+       {NSAccessibilitySelectedAttribute, @"selected"},
-+       {NSAccessibilitySelectedChildrenAttribute, @"selectedChildren"},
-+       {NSAccessibilitySelectedTextAttribute, @"selectedText"},
-+       {NSAccessibilitySelectedTextRangeAttribute, @"selectedTextRange"},
-++#ifndef MAS_BUILD
-+       {NSAccessibilitySelectedTextMarkerRangeAttribute,
-+        @"selectedTextMarkerRange"},
-++#endif
-+       {NSAccessibilitySizeAttribute, @"size"},
-+       {NSAccessibilitySortDirectionAttribute, @"sortDirection"},
-+       {NSAccessibilitySubroleAttribute, @"subrole"},
-+@@ -1069,6 +1077,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
-+                      ax::mojom::Restriction::kDisabled];
-+ }
-+ 
-++#ifndef MAS_BUILD
-+ // Returns a text marker that points to the last character in the document that
-+ // can be selected with VoiceOver.
-+ - (id)endTextMarker {
-+@@ -1080,6 +1089,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
-+   BrowserAccessibilityPositionInstance position = root->CreatePositionAt(0);
-+   return CreateTextMarker(position->CreatePositionAtEndOfAnchor());
-+ }
-++#endif
-+ 
-+ - (NSNumber*)expanded {
-+   if (![self instanceActive])
-+@@ -1892,6 +1902,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
-+   return [NSValue valueWithRange:NSMakeRange(selStart, selLength)];
-+ }
-+ 
-++#ifndef MAS_BUILD
-+ - (id)selectedTextMarkerRange {
-+   if (![self instanceActive])
-+     return nil;
-+@@ -1924,6 +1935,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
-+                                                anchorAffinity, *focusObject,
-+                                                focusOffset, focusAffinity));
-+ }
-++#endif
-+ 
-+ - (NSValue*)size {
-+   if (![self instanceActive])
-+@@ -1956,6 +1968,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
-+   return nil;
-+ }
-+ 
-++#ifndef MAS_BUILD
-+ // Returns a text marker that points to the first character in the document that
-+ // can be selected with VoiceOver.
-+ - (id)startTextMarker {
-+@@ -1967,6 +1980,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
-+   BrowserAccessibilityPositionInstance position = root->CreatePositionAt(0);
-+   return CreateTextMarker(position->CreatePositionAtStartOfAnchor());
-+ }
-++#endif
-+ 
-+ // Returns a subrole based upon the role.
-+ - (NSString*) subrole {
-+@@ -2247,12 +2261,14 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
-+   NSMutableAttributedString* attributedValue =
-+       [[[NSMutableAttributedString alloc] initWithString:value] autorelease];
-+ 
-++#ifndef MAS_BUILD
-+   if (!browserAccessibility_->IsTextOnlyObject()) {
-+     std::vector<const BrowserAccessibility*> textOnlyObjects =
-+         BrowserAccessibilityManager::FindTextOnlyObjectsInRange(
-+             *browserAccessibility_, *browserAccessibility_);
-+     AddMisspelledTextAttributes(textOnlyObjects, attributedValue);
-+   }
-++#endif
-+ 
-+   return [attributedValue attributedSubstringFromRange:range];
-+ }
-+@@ -2372,6 +2388,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
-+     return nil;
-+   }
-+ 
-++#ifndef MAS_BUILD
-+   if ([attribute isEqualToString:@"AXUIElementForTextMarker"]) {
-+     BrowserAccessibilityPositionInstance position =
-+         CreatePositionFromTextMarker(parameter);
-+@@ -2549,6 +2566,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
-+     NSString* text = GetTextForTextMarkerRange(parameter);
-+     return [NSNumber numberWithInt:[text length]];
-+   }
-++#endif
-+ 
-+   if ([attribute isEqualToString:
-+       NSAccessibilityBoundsForRangeParameterizedAttribute]) {
-+@@ -2586,6 +2604,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
-+     return nil;
-+   }
-+ 
-++#ifndef MAS_BUILD
-+   if ([attribute isEqualToString:
-+            NSAccessibilityLineTextMarkerRangeForTextMarkerParameterizedAttribute]) {
-+     BrowserAccessibilityPositionInstance position =
-+@@ -2665,6 +2684,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
-+ 
-+     return @(child->GetIndexInParent());
-+   }
-++#endif
-+ 
-+   return nil;
-+ }
-+diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.mm b/content/browser/accessibility/browser_accessibility_manager_mac.mm
-+index 134f855de654..d588ed98839d 100644
-+--- a/content/browser/accessibility/browser_accessibility_manager_mac.mm
-++++ b/content/browser/accessibility/browser_accessibility_manager_mac.mm
-+@@ -441,6 +441,7 @@ NSDictionary* BrowserAccessibilityManagerMac::
-+       [user_info setObject:native_focus_object
-+                     forKey:NSAccessibilityTextChangeElement];
-+ 
-++#ifndef MAS_BUILD
-+       id selected_text = [native_focus_object selectedTextMarkerRange];
-+       if (selected_text) {
-+         NSString* const NSAccessibilitySelectedTextMarkerRangeAttribute =
-+@@ -448,6 +449,7 @@ NSDictionary* BrowserAccessibilityManagerMac::
-+         [user_info setObject:selected_text
-+                       forKey:NSAccessibilitySelectedTextMarkerRangeAttribute];
-+       }
-++#endif
-+     }
-+   }
-+ 
-+diff --git a/content/renderer/renderer_main_platform_delegate_mac.mm b/content/renderer/renderer_main_platform_delegate_mac.mm
-+index 6b955bdb3724..1775f3b3c1d4 100644
-+--- a/content/renderer/renderer_main_platform_delegate_mac.mm
-++++ b/content/renderer/renderer_main_platform_delegate_mac.mm
-+@@ -22,6 +22,7 @@
-+ #include "sandbox/mac/seatbelt.h"
-+ #include "services/service_manager/sandbox/mac/sandbox_mac.h"
-+ 
-++#ifndef MAS_BUILD
-+ extern "C" {
-+ void CGSSetDenyWindowServerConnections(bool);
-+ void CGSShutdownServerConnections();
-+@@ -30,6 +31,7 @@ void _LSSetApplicationLaunchServicesServerConnectionStatus(
-+     uint64_t flags,
-+     bool (^connection_allowed)(CFDictionaryRef));
-+ };
-++#endif
-+ 
-+ namespace content {
-+ 
-+@@ -38,6 +40,7 @@ namespace {
-+ // This disconnects from the window server, and then indicates that Chrome
-+ // should continue execution without access to launchservicesd.
-+ void DisconnectWindowServer() {
-++#ifndef MAS_BUILD
-+   // Now disconnect from WindowServer, after all objects have been warmed up.
-+   // Shutting down the connection requires connecting to WindowServer,
-+   // so do this before actually engaging the sandbox. This may cause two log
-+@@ -51,6 +54,7 @@ void DisconnectWindowServer() {
-+   SetApplicationIsDaemon(true);
-+   // Tell LaunchServices to continue without a connection to the daemon.
-+   _LSSetApplicationLaunchServicesServerConnectionStatus(0, nullptr);
-++#endif
-+ }
-+ 
-+ // You are about to read a pretty disgusting hack. In a static initializer,
-+diff --git a/device/bluetooth/bluetooth_adapter_mac.mm b/device/bluetooth/bluetooth_adapter_mac.mm
-+index 09123af7c2f0..69d6b926576f 100644
-+--- a/device/bluetooth/bluetooth_adapter_mac.mm
-++++ b/device/bluetooth/bluetooth_adapter_mac.mm
-+@@ -32,6 +32,7 @@
-+ #include "device/bluetooth/bluetooth_low_energy_central_manager_delegate.h"
-+ #include "device/bluetooth/bluetooth_socket_mac.h"
-+ 
-++#ifndef MAS_BUILD
-+ extern "C" {
-+ // Undocumented IOBluetooth Preference API [1]. Used by `blueutil` [2] and
-+ // `Karabiner` [3] to programmatically control the Bluetooth state. Calling the
-+@@ -45,6 +46,7 @@ extern "C" {
-+ // [4] https://support.apple.com/kb/PH25091
-+ void IOBluetoothPreferenceSetControllerPowerState(int state);
-+ }
-++#endif
-+ 
-+ namespace {
-+ 
-+@@ -118,8 +120,10 @@ BluetoothAdapterMac::BluetoothAdapterMac()
-+       controller_state_function_(
-+           base::BindRepeating(&BluetoothAdapterMac::GetHostControllerState,
-+                               base::Unretained(this))),
-++#ifndef MAS_BUILD
-+       power_state_function_(
-+           base::BindRepeating(IOBluetoothPreferenceSetControllerPowerState)),
-++#endif
-+       should_update_name_(true),
-+       classic_discovery_manager_(
-+           BluetoothDiscoveryManagerMac::CreateClassic(this)),
-+@@ -302,8 +306,12 @@ bool BluetoothAdapterMac::IsLowEnergyAvailable() {
-+ }
-+ 
-+ bool BluetoothAdapterMac::SetPoweredImpl(bool powered) {
-++#ifndef MAS_BUILD
-+   power_state_function_.Run(base::strict_cast<int>(powered));
-+   return true;
-++#else
-++  return false;
-++#endif
-+ }
-+ 
-+ void BluetoothAdapterMac::RemovePairingDelegateInternal(
-+diff --git a/media/audio/BUILD.gn b/media/audio/BUILD.gn
-+index 10d786fded92..10e6c6772351 100644
-+--- a/media/audio/BUILD.gn
-++++ b/media/audio/BUILD.gn
-+@@ -189,6 +189,12 @@ source_set("audio") {
-+       "mac/scoped_audio_unit.cc",
-+       "mac/scoped_audio_unit.h",
-+     ]
-++    if (is_mas_build) {
-++      sources -= [
-++        "mac/coreaudio_dispatch_override.cc",
-++        "mac/coreaudio_dispatch_override.h",
-++      ]
-++    }
-+     libs += [
-+       "AudioToolbox.framework",
-+       "AudioUnit.framework",
-+diff --git a/media/audio/mac/audio_manager_mac.cc b/media/audio/mac/audio_manager_mac.cc
-+index 1a74579e310b..0a15778d6825 100644
-+--- a/media/audio/mac/audio_manager_mac.cc
-++++ b/media/audio/mac/audio_manager_mac.cc
-+@@ -993,7 +993,7 @@ AudioParameters AudioManagerMac::GetPreferredOutputStreamParameters(
-+ 
-+ void AudioManagerMac::InitializeOnAudioThread() {
-+   DCHECK(GetTaskRunner()->BelongsToCurrentThread());
-+-  InitializeCoreAudioDispatchOverride();
-++  // InitializeCoreAudioDispatchOverride();
-+   power_observer_.reset(new AudioPowerObserver());
-+ }
-+ 
-+diff --git a/net/dns/dns_config_service_posix.cc b/net/dns/dns_config_service_posix.cc
-+index 706ba6e8e882..3fbe80c91cd9 100644
-+--- a/net/dns/dns_config_service_posix.cc
-++++ b/net/dns/dns_config_service_posix.cc
-+@@ -244,6 +244,7 @@ class DnsConfigServicePosix::Watcher {
-+ 
-+   bool Watch() {
-+     bool success = true;
-++#ifndef MAS_BUILD
-+     if (!config_watcher_.Watch(base::Bind(&Watcher::OnConfigChanged,
-+                                           base::Unretained(this)))) {
-+       LOG(ERROR) << "DNS config watch failed to start.";
-+@@ -265,6 +266,7 @@ class DnsConfigServicePosix::Watcher {
-+                                 DNS_CONFIG_WATCH_MAX);
-+     }
-+ #endif  // !defined(OS_ANDROID) && !defined(OS_IOS)
-++#endif
-+     return success;
-+   }
-+ 
-+diff --git a/sandbox/mac/sandbox_compiler.cc b/sandbox/mac/sandbox_compiler.cc
-+index e524aa7b8510..718d3f963da5 100644
-+--- a/sandbox/mac/sandbox_compiler.cc
-++++ b/sandbox/mac/sandbox_compiler.cc
-+@@ -28,6 +28,7 @@ bool SandboxCompiler::InsertStringParam(const std::string& key,
-+ }
-+ 
-+ bool SandboxCompiler::CompileAndApplyProfile(std::string* error) {
-++#ifndef MAS_BUILD
-+   char* error_internal = nullptr;
-+   std::vector<const char*> params;
-+ 
-+@@ -44,6 +45,7 @@ bool SandboxCompiler::CompileAndApplyProfile(std::string* error) {
-+     sandbox::Seatbelt::FreeError(error_internal);
-+     return false;
-+   }
-++#endif
-+   return true;
-+ }
-+ 
-+diff --git a/sandbox/mac/seatbelt.cc b/sandbox/mac/seatbelt.cc
-+index dfba0bded9e3..876f96999f53 100644
-+--- a/sandbox/mac/seatbelt.cc
-++++ b/sandbox/mac/seatbelt.cc
-+@@ -64,7 +64,11 @@ void Seatbelt::FreeError(char* errorbuf) {
-+ 
-+ // static
-+ bool Seatbelt::IsSandboxed() {
-++#ifndef MAS_BUILD
-+   return ::sandbox_check(getpid(), NULL, 0);
-++#else
-++  return true;
-++#endif
-+ }
-+ 
-+ }  // namespace sandbox
-+diff --git a/sandbox/mac/seatbelt_extension.cc b/sandbox/mac/seatbelt_extension.cc
-+index 9073364142e8..2356add74dfa 100644
-+--- a/sandbox/mac/seatbelt_extension.cc
-++++ b/sandbox/mac/seatbelt_extension.cc
-+@@ -8,6 +8,7 @@
-+ #include "base/memory/ptr_util.h"
-+ #include "sandbox/mac/seatbelt_extension_token.h"
-+ 
-++#ifndef MAS_BUILD
-+ // libsandbox private API.
-+ extern "C" {
-+ extern const char* APP_SANDBOX_READ;
-+@@ -18,6 +19,7 @@ char* sandbox_extension_issue_file(const char* type,
-+                                    const char* path,
-+                                    uint32_t flags);
-+ }
-++#endif
-+ 
-+ namespace sandbox {
-+ 
-+@@ -46,7 +48,11 @@ std::unique_ptr<SeatbeltExtension> SeatbeltExtension::FromToken(
-+ 
-+ bool SeatbeltExtension::Consume() {
-+   DCHECK(!token_.empty());
-++#ifndef MAS_BUILD
-+   handle_ = sandbox_extension_consume(token_.c_str());
-++#else
-++  handle_ = -1;
-++#endif
-+   return handle_ > 0;
-+ }
-+ 
-+@@ -58,7 +64,11 @@ bool SeatbeltExtension::ConsumePermanently() {
-+ }
-+ 
-+ bool SeatbeltExtension::Revoke() {
-++#ifndef MAS_BUILD
-+   int rv = sandbox_extension_release(handle_);
-++#else
-++  int rv = -1;
-++#endif
-+   handle_ = 0;
-+   token_.clear();
-+   return rv == 0;
-+@@ -76,9 +86,11 @@ SeatbeltExtension::SeatbeltExtension(const std::string& token)
-+ char* SeatbeltExtension::IssueToken(SeatbeltExtension::Type type,
-+                                     const std::string& resource) {
-+   switch (type) {
-++#ifndef MAS_BUILD
-+     case FILE_READ:
-+       return sandbox_extension_issue_file(APP_SANDBOX_READ, resource.c_str(),
-+                                           0);
-++#endif
-+     default:
-+       NOTREACHED();
-+       return nullptr;
-+diff --git a/ui/views/cocoa/bridged_native_widget.mm b/ui/views/cocoa/bridged_native_widget.mm
-+index 3c6e9903d7df..ddc9061c64d1 100644
-+--- a/ui/views/cocoa/bridged_native_widget.mm
-++++ b/ui/views/cocoa/bridged_native_widget.mm
-+@@ -43,6 +43,7 @@
-+ #include "ui/views/widget/widget_delegate.h"
-+ #include "ui/views/window/dialog_delegate.h"
-+ 
-++#ifndef MAS_BUILD
-+ extern "C" {
-+ 
-+ typedef int32_t CGSConnection;
-+@@ -52,6 +53,7 @@ CGError CGSSetWindowBackgroundBlurRadius(CGSConnection connection,
-+                                          int radius);
-+ 
-+ }
-++#endif
-+ 
-+ // The NSView that hosts the composited CALayer drawing the UI. It fills the
-+ // window but is not hittable so that accessibility hit tests always go to the
-+@@ -128,7 +130,9 @@ using NSViewComparatorValue = __kindof NSView*;
-+ 
-+ const CGFloat kMavericksMenuOpacity = 251.0 / 255.0;
-+ const CGFloat kYosemiteMenuOpacity = 177.0 / 255.0;
-++#ifndef MAS_BUILD
-+ const int kYosemiteMenuBlur = 80;
-++#endif
-+ 
-+ // Margin at edge and corners of the window that trigger resizing. These match
-+ // actual Cocoa resize margins.
-+@@ -1470,8 +1474,10 @@ void BridgedNativeWidget::AddCompositorSuperview() {
-+     // solid background, but make the CALayer transparent.
-+     if (base::mac::IsAtLeastOS10_10()) {
-+       [background_layer setOpacity:kYosemiteMenuOpacity];
-++#ifndef MAS_BUILD
-+       CGSSetWindowBackgroundBlurRadius(
-+           _CGSDefaultConnection(), [window_ windowNumber], kYosemiteMenuBlur);
-++#endif
-+       // The blur effect does not occur with a fully transparent (or fully
-+       // layer-backed) window. Setting a window background will use square
-+       // corners, so ask the contentView to draw one instead.
-added in remote
-  their  100644 40d195a6fad00b993218f69d34d85f13961c417a patches/common/chromium/net_url_request_job.patch
-@@ -0,0 +1,12 @@
-+diff --git a/net/url_request/url_request_job.h b/net/url_request/url_request_job.h
-+index 2341999..3011bf7 100644
-+--- a/net/url_request/url_request_job.h
-++++ b/net/url_request/url_request_job.h
-+@@ -269,6 +269,7 @@ class NET_EXPORT URLRequestJob : public base::PowerObserver {
-+   void OnCallToDelegate();
-+   void OnCallToDelegateComplete();
-+ 
-++ public:
-+   // Called to read raw (pre-filtered) data from this Job. Reads at most
-+   // |buf_size| bytes into |buf|.
-+   // Possible return values:
-added in remote
-  their  100644 d2c71077169f85668e73ed30c9c072939637f4ce patches/common/chromium/no_cache_storage_check.patch
-@@ -0,0 +1,13 @@
-+diff --git a/content/browser/cache_storage/cache_storage.cc b/content/browser/cache_storage/cache_storage.cc
-+index ce6a21b..10a3b18 100644
-+--- a/content/browser/cache_storage/cache_storage.cc
-++++ b/content/browser/cache_storage/cache_storage.cc
-+@@ -129,7 +129,7 @@ class CacheStorage::CacheLoader {
-+         blob_context_(blob_context),
-+         cache_storage_(cache_storage),
-+         origin_(origin) {
-+-    DCHECK(!origin_.unique());
-++    // DCHECK(!origin_.unique());
-+   }
-+ 
-+   virtual ~CacheLoader() {}
-added in remote
-  their  100644 b4203dcbd9e29af11a995f9d8e4bc4231d8c2ec7 patches/common/chromium/no_stack_dumping.patch
-@@ -0,0 +1,13 @@
-+diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
-+index c283922..397ba80 100644
-+--- a/content/app/content_main_runner.cc
-++++ b/content/app/content_main_runner.cc
-+@@ -657,7 +657,7 @@ class ContentMainRunnerImpl : public ContentMainRunner {
-+ 
-+     InitializeV8IfNeeded(command_line, process_type);
-+ 
-+-#if !defined(OFFICIAL_BUILD)
-++#if 0
-+ #if defined(OS_WIN)
-+     bool should_enable_stack_dump = !process_type.empty();
-+ #else
-added in remote
-  their  100644 d173669afec036dca4cabc7d292609091f1debf4 patches/common/chromium/out_of_process_instance.patch
-@@ -0,0 +1,15 @@
-+diff --git a/pdf/out_of_process_instance.cc b/pdf/out_of_process_instance.cc
-+index 8b9c9f19a3dd..c4d801135053 100644
-+--- a/pdf/out_of_process_instance.cc
-++++ b/pdf/out_of_process_instance.cc
-+@@ -333,7 +333,9 @@ bool OutOfProcessInstance::Init(uint32_t argc,
-+   std::string document_url = document_url_var.AsString();
-+   base::StringPiece document_url_piece(document_url);
-+   is_print_preview_ = IsPrintPreviewUrl(document_url_piece);
-+-  if (!document_url_piece.starts_with(kChromeExtension) && !is_print_preview_)
-++  if (!document_url_piece.starts_with(kChromeExtension) &&
-++      !document_url_piece.starts_with("chrome://pdf-viewer") &&
-++      !is_print_preview_)
-+     return false;
-+ 
-+   // Check if the plugin is full frame. This is passed in from JS.
-added in remote
-  their  100644 b688d98f8848b0b845091322dc30233fc9b22a7f patches/common/chromium/pepper_flash.patch
-@@ -0,0 +1,451 @@
-+diff --git a/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc b/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc
-+index a5ea92f28784..5fd8f4525f83 100644
-+--- a/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc
-++++ b/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc
-+@@ -10,8 +10,10 @@
-+ #include "chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.h"
-+ #include "chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h"
-+ #include "chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h"
-++#if 0
-+ #include "chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.h"
-+ #include "chrome/browser/renderer_host/pepper/pepper_platform_verification_message_filter.h"
-++#endif
-+ #include "content/public/browser/browser_ppapi_host.h"
-+ #include "ppapi/host/message_filter_host.h"
-+ #include "ppapi/host/ppapi_host.h"
-+@@ -51,6 +53,7 @@ ChromeBrowserPepperHostFactory::CreateResourceHost(
-+         return std::unique_ptr<ResourceHost>(new MessageFilterHost(
-+             host_->GetPpapiHost(), instance, resource, broker_filter));
-+       }
-++#if 0
-+       case PpapiHostMsg_PlatformVerification_Create::ID: {
-+         scoped_refptr<ResourceMessageFilter> pv_filter(
-+             new PepperPlatformVerificationMessageFilter(host_, instance));
-+@@ -64,6 +67,7 @@ ChromeBrowserPepperHostFactory::CreateResourceHost(
-+             new MessageFilterHost(host_->GetPpapiHost(), instance, resource,
-+                                   output_protection_filter));
-+       }
-++#endif
-+     }
-+   }
-+ 
-+diff --git a/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc b/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc
-+index f4f1741a8ecf..103238cdd53f 100644
-+--- a/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc
-++++ b/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc
-+@@ -6,10 +6,12 @@
-+ 
-+ #include <string>
-+ 
-++#if 0
-+ #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
-+ #include "chrome/browser/profiles/profile.h"
-+ #include "components/content_settings/core/browser/host_content_settings_map.h"
-+ #include "components/content_settings/core/common/content_settings.h"
-++#endif
-+ #include "content/public/browser/browser_ppapi_host.h"
-+ #include "content/public/browser/browser_thread.h"
-+ #include "content/public/browser/render_process_host.h"
-+@@ -57,6 +59,7 @@ int32_t PepperBrokerMessageFilter::OnIsAllowed(
-+      RenderProcessHost::FromID(render_process_id_);
-+   if (!render_process_host)
-+     return PP_ERROR_FAILED;
-++#if 0
-+   Profile* profile =
-+       Profile::FromBrowserContext(render_process_host->GetBrowserContext());
-+   HostContentSettingsMap* content_settings =
-+@@ -68,5 +71,6 @@ int32_t PepperBrokerMessageFilter::OnIsAllowed(
-+                                           std::string());
-+   if (setting == CONTENT_SETTING_ALLOW)
-+     return PP_OK;
-+-  return PP_ERROR_FAILED;
-++#endif
-++  return PP_OK;
-+ }
-+diff --git a/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc b/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc
-+index 1c1844a9eb71..2c9834b11d34 100644
-+--- a/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc
-++++ b/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc
-+@@ -6,9 +6,11 @@
-+ 
-+ #include "base/time/time.h"
-+ #include "build/build_config.h"
-++#if 0
-+ #include "chrome/browser/content_settings/cookie_settings_factory.h"
-+ #include "chrome/browser/profiles/profile.h"
-+ #include "components/content_settings/core/browser/cookie_settings.h"
-++#endif
-+ #include "content/public/browser/browser_context.h"
-+ #include "content/public/browser/browser_ppapi_host.h"
-+ #include "content/public/browser/browser_thread.h"
-+@@ -40,6 +42,7 @@ using content::ServiceManagerConnection;
-+ 
-+ namespace {
-+ 
-++#if 0
-+ // Get the CookieSettings on the UI thread for the given render process ID.
-+ scoped_refptr<content_settings::CookieSettings> GetCookieSettings(
-+     int render_process_id) {
-+@@ -53,6 +56,7 @@ scoped_refptr<content_settings::CookieSettings> GetCookieSettings(
-+   }
-+   return NULL;
-+ }
-++#endif
-+ 
-+ void PepperBindConnectorRequest(
-+     service_manager::mojom::ConnectorRequest connector_request) {
-+@@ -70,7 +74,9 @@ PepperFlashBrowserHost::PepperFlashBrowserHost(BrowserPpapiHost* host,
-+                                                PP_Instance instance,
-+                                                PP_Resource resource)
-+     : ResourceHost(host->GetPpapiHost(), instance, resource),
-++#if 0
-+       host_(host),
-++#endif
-+       delay_timer_(FROM_HERE, base::TimeDelta::FromSeconds(45), this,
-+                    &PepperFlashBrowserHost::OnDelayTimerFired),
-+       weak_factory_(this) {
-+@@ -122,6 +128,7 @@ int32_t PepperFlashBrowserHost::OnGetLocalTimeZoneOffset(
-+ 
-+ int32_t PepperFlashBrowserHost::OnGetLocalDataRestrictions(
-+     ppapi::host::HostMessageContext* context) {
-++#if 0
-+   // Getting the Flash LSO settings requires using the CookieSettings which
-+   // belong to the profile which lives on the UI thread. We lazily initialize
-+   // |cookie_settings_| by grabbing the reference from the UI thread and then
-+@@ -144,9 +151,11 @@ int32_t PepperFlashBrowserHost::OnGetLocalDataRestrictions(
-+                    document_url,
-+                    plugin_url));
-+   }
-+-  return PP_OK_COMPLETIONPENDING;
-++#endif
-++  return PP_FLASHLSORESTRICTIONS_IN_MEMORY;
-+ }
-+ 
-++#if 0
-+ void PepperFlashBrowserHost::GetLocalDataRestrictions(
-+     ppapi::host::ReplyMessageContext reply_context,
-+     const GURL& document_url,
-+@@ -175,6 +184,7 @@ void PepperFlashBrowserHost::GetLocalDataRestrictions(
-+             PpapiPluginMsg_Flash_GetLocalDataRestrictionsReply(
-+                 static_cast<int32_t>(restrictions)));
-+ }
-++#endif
-+ 
-+ device::mojom::WakeLock* PepperFlashBrowserHost::GetWakeLock() {
-+   // Here is a lazy binding, and will not reconnect after connection error.
-+diff --git a/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h b/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h
-+index ff0b687a51b6..ab6d96cbe9f8 100644
-+--- a/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h
-++++ b/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h
-+@@ -23,9 +23,11 @@ namespace content {
-+ class BrowserPpapiHost;
-+ }
-+ 
-++#if 0
-+ namespace content_settings {
-+ class CookieSettings;
-+ }
-++#endif
-+ 
-+ class GURL;
-+ 
-+@@ -51,15 +53,19 @@ class PepperFlashBrowserHost : public ppapi::host::ResourceHost {
-+       const base::Time& t);
-+   int32_t OnGetLocalDataRestrictions(ppapi::host::HostMessageContext* context);
-+ 
-++#if 0
-+   void GetLocalDataRestrictions(
-+       ppapi::host::ReplyMessageContext reply_context,
-+       const GURL& document_url,
-+       const GURL& plugin_url,
-+       scoped_refptr<content_settings::CookieSettings> cookie_settings);
-++#endif
-+ 
-+   device::mojom::WakeLock* GetWakeLock();
-+ 
-++#if 0
-+   content::BrowserPpapiHost* host_;
-++#endif
-+   int render_process_id_;
-+ 
-+   // Requests a wake lock to prevent going to sleep, and a timer to cancel it
-+@@ -67,8 +73,10 @@ class PepperFlashBrowserHost : public ppapi::host::ResourceHost {
-+   device::mojom::WakeLockPtr wake_lock_;
-+   base::DelayTimer delay_timer_;
-+ 
-++#if 0
-+   // For fetching the Flash LSO settings.
-+   scoped_refptr<content_settings::CookieSettings> cookie_settings_;
-++#endif
-+   base::WeakPtrFactory<PepperFlashBrowserHost> weak_factory_;
-+ 
-+   DISALLOW_COPY_AND_ASSIGN(PepperFlashBrowserHost);
-+diff --git a/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc b/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc
-+index e267746783bd..bc84b44ceb27 100644
-+--- a/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc
-++++ b/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc
-+@@ -18,6 +18,7 @@
-+ #include "content/public/browser/child_process_security_policy.h"
-+ #include "content/public/browser/render_frame_host.h"
-+ #include "content/public/common/pepper_plugin_info.h"
-++#include "net/base/network_interfaces.h"
-+ #include "ppapi/c/pp_errors.h"
-+ #include "ppapi/host/dispatch_host_message.h"
-+ #include "ppapi/host/host_message_context.h"
-+@@ -127,7 +128,9 @@ PepperFlashDRMHost::PepperFlashDRMHost(BrowserPpapiHost* host,
-+   content::ChildProcessSecurityPolicy::GetInstance()->GrantReadFile(
-+       render_process_id, voucher_file);
-+ 
-++#if 0
-+   fetcher_ = new DeviceIDFetcher(render_process_id);
-++#endif
-+   monitor_finder_ = new MonitorFinder(render_process_id, render_frame_id);
-+   monitor_finder_->GetMonitor();
-+ }
-+@@ -150,12 +153,18 @@ int32_t PepperFlashDRMHost::OnResourceMessageReceived(
-+ 
-+ int32_t PepperFlashDRMHost::OnHostMsgGetDeviceID(
-+     ppapi::host::HostMessageContext* context) {
-++#if 0
-+   if (!fetcher_->Start(base::Bind(&PepperFlashDRMHost::GotDeviceID,
-+                                   weak_factory_.GetWeakPtr(),
-+                                   context->MakeReplyMessageContext()))) {
-+     return PP_ERROR_INPROGRESS;
-+   }
-+-  return PP_OK_COMPLETIONPENDING;
-++#endif
-++  static std::string id;
-++  if (id.empty())
-++    id = net::GetHostName();
-++  context->reply_msg = PpapiPluginMsg_FlashDRM_GetDeviceIDReply(id);
-++  return PP_OK;
-+ }
-+ 
-+ int32_t PepperFlashDRMHost::OnHostMsgGetHmonitor(
-+@@ -184,6 +193,7 @@ int32_t PepperFlashDRMHost::OnHostMsgMonitorIsExternal(
-+   return PP_OK;
-+ }
-+ 
-++#if 0
-+ void PepperFlashDRMHost::GotDeviceID(
-+     ppapi::host::ReplyMessageContext reply_context,
-+     const std::string& id,
-+@@ -196,3 +206,4 @@ void PepperFlashDRMHost::GotDeviceID(
-+   host()->SendReply(reply_context,
-+                     PpapiPluginMsg_FlashDRM_GetDeviceIDReply(id));
-+ }
-++#endif
-+diff --git a/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h b/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h
-+index faa83c9d32e5..bbae9c21b59a 100644
-+--- a/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h
-++++ b/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h
-+@@ -11,7 +11,9 @@
-+ 
-+ #include "base/macros.h"
-+ #include "base/memory/weak_ptr.h"
-++#if 0
-+ #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h"
-++#endif
-+ #include "ppapi/host/host_message_context.h"
-+ #include "ppapi/host/resource_host.h"
-+ 
-+@@ -50,7 +52,9 @@ class PepperFlashDRMHost : public ppapi::host::ResourceHost {
-+                    const std::string& id,
-+                    int32_t result);
-+ 
-++#if 0
-+   scoped_refptr<DeviceIDFetcher> fetcher_;
-++#endif
-+   scoped_refptr<MonitorFinder> monitor_finder_;
-+ 
-+   base::WeakPtrFactory<PepperFlashDRMHost> weak_factory_;
-+diff --git a/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc b/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc
-+index 40dde88bf86b..3fe0c6d9b816 100644
-+--- a/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc
-++++ b/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc
-+@@ -7,16 +7,20 @@
-+ #include <stddef.h>
-+ 
-+ #include "base/macros.h"
-++#if 0
-+ #include "chrome/browser/browser_process.h"
-+ #include "chrome/browser/profiles/profile.h"
-+ #include "chrome/browser/profiles/profile_manager.h"
-+ #include "chrome/common/chrome_switches.h"
-+ #include "chrome/common/pepper_permission_util.h"
-++#endif
-+ #include "content/public/browser/browser_ppapi_host.h"
-+ #include "content/public/browser/browser_thread.h"
-+ #include "content/public/browser/child_process_security_policy.h"
-+ #include "content/public/browser/render_view_host.h"
-++#if 0
-+ #include "extensions/features/features.h"
-++#endif
-+ #include "ppapi/c/pp_errors.h"
-+ #include "ppapi/host/dispatch_host_message.h"
-+ #include "ppapi/host/host_message_context.h"
-+@@ -25,12 +29,11 @@
-+ #include "ppapi/shared_impl/file_system_util.h"
-+ #include "storage/browser/fileapi/isolated_context.h"
-+ 
-+-#if BUILDFLAG(ENABLE_EXTENSIONS)
-++#if 0
-+ #include "extensions/browser/extension_registry.h"
-+ #include "extensions/common/constants.h"
-+ #include "extensions/common/extension.h"
-+ #include "extensions/common/extension_set.h"
-+-#endif
-+ 
-+ namespace {
-+ 
-+@@ -40,6 +43,7 @@ const char* kPredefinedAllowedCrxFsOrigins[] = {
-+ };
-+ 
-+ }  // namespace
-++#endif
-+ 
-+ // static
-+ PepperIsolatedFileSystemMessageFilter*
-+@@ -67,8 +71,10 @@ PepperIsolatedFileSystemMessageFilter::PepperIsolatedFileSystemMessageFilter(
-+       profile_directory_(profile_directory),
-+       document_url_(document_url),
-+       ppapi_host_(ppapi_host) {
-++#if 0
-+   for (size_t i = 0; i < arraysize(kPredefinedAllowedCrxFsOrigins); ++i)
-+     allowed_crxfs_origins_.insert(kPredefinedAllowedCrxFsOrigins[i]);
-++#endif
-+ }
-+ 
-+ PepperIsolatedFileSystemMessageFilter::
-+@@ -94,6 +100,7 @@ int32_t PepperIsolatedFileSystemMessageFilter::OnResourceMessageReceived(
-+   return PP_ERROR_FAILED;
-+ }
-+ 
-++#if 0
-+ Profile* PepperIsolatedFileSystemMessageFilter::GetProfile() {
-+   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-+   ProfileManager* profile_manager = g_browser_process->profile_manager();
-+@@ -120,6 +127,7 @@ std::string PepperIsolatedFileSystemMessageFilter::CreateCrxFileSystem(
-+   return std::string();
-+ #endif
-+ }
-++#endif
-+ 
-+ int32_t PepperIsolatedFileSystemMessageFilter::OnOpenFileSystem(
-+     ppapi::host::HostMessageContext* context,
-+@@ -140,7 +148,7 @@ int32_t PepperIsolatedFileSystemMessageFilter::OnOpenFileSystem(
-+ 
-+ int32_t PepperIsolatedFileSystemMessageFilter::OpenCrxFileSystem(
-+     ppapi::host::HostMessageContext* context) {
-+-#if BUILDFLAG(ENABLE_EXTENSIONS)
-++#if 0
-+   Profile* profile = GetProfile();
-+   const extensions::ExtensionSet* extension_set = NULL;
-+   if (profile) {
-+diff --git a/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h b/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h
-+index ffbc2d93ca7c..bc6413de31d2 100644
-+--- a/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h
-++++ b/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h
-+@@ -19,7 +19,9 @@
-+ #include "ppapi/host/resource_message_filter.h"
-+ #include "url/gurl.h"
-+ 
-++#if 0
-+ class Profile;
-++#endif
-+ 
-+ namespace content {
-+ class BrowserPpapiHost;
-+@@ -55,12 +57,14 @@ class PepperIsolatedFileSystemMessageFilter
-+ 
-+   ~PepperIsolatedFileSystemMessageFilter() override;
-+ 
-++#if 0
-+   Profile* GetProfile();
-+ 
-+   // Returns filesystem id of isolated filesystem if valid, or empty string
-+   // otherwise.  This must run on the UI thread because ProfileManager only
-+   // allows access on that thread.
-+   std::string CreateCrxFileSystem(Profile* profile);
-++#endif
-+ 
-+   int32_t OnOpenFileSystem(ppapi::host::HostMessageContext* context,
-+                            PP_IsolatedFileSystemType_Private type);
-+@@ -75,8 +79,10 @@ class PepperIsolatedFileSystemMessageFilter
-+   // Not owned by this object.
-+   ppapi::host::PpapiHost* ppapi_host_;
-+ 
-++#if 0
-+   // Set of origins that can use CrxFs private APIs from NaCl.
-+   std::set<std::string> allowed_crxfs_origins_;
-++#endif
-+ 
-+   DISALLOW_COPY_AND_ASSIGN(PepperIsolatedFileSystemMessageFilter);
-+ };
-+diff --git a/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc b/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc
-+index 611d2b865e6c..e589cb395e6f 100644
-+--- a/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc
-++++ b/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc
-+@@ -11,8 +11,10 @@
-+ #include "chrome/renderer/pepper/pepper_flash_fullscreen_host.h"
-+ #include "chrome/renderer/pepper/pepper_flash_menu_host.h"
-+ #include "chrome/renderer/pepper/pepper_flash_renderer_host.h"
-++#if 0
-+ #include "chrome/renderer/pepper/pepper_uma_host.h"
-+ #include "components/pdf/renderer/pepper_pdf_host.h"
-++#endif
-+ #include "content/public/renderer/renderer_ppapi_host.h"
-+ #include "ppapi/host/ppapi_host.h"
-+ #include "ppapi/host/resource_host.h"
-+@@ -87,6 +89,7 @@ ChromeRendererPepperHostFactory::CreateResourceHost(
-+     }
-+   }
-+ 
-++#if 0
-+   if (host_->GetPpapiHost()->permissions().HasPermission(
-+           ppapi::PERMISSION_PRIVATE)) {
-+     switch (message.type()) {
-+@@ -105,6 +108,7 @@ ChromeRendererPepperHostFactory::CreateResourceHost(
-+       return std::make_unique<PepperUMAHost>(host_, instance, resource);
-+     }
-+   }
-++#endif
-+ 
-+   return nullptr;
-+ }
-+diff --git a/chrome/renderer/pepper/pepper_flash_renderer_host.cc b/chrome/renderer/pepper/pepper_flash_renderer_host.cc
-+index 66a532e2cb41..e776d0e96c4a 100644
-+--- a/chrome/renderer/pepper/pepper_flash_renderer_host.cc
-++++ b/chrome/renderer/pepper/pepper_flash_renderer_host.cc
-+@@ -13,7 +13,9 @@
-+ #include "base/macros.h"
-+ #include "base/metrics/histogram_macros.h"
-+ #include "base/strings/string_util.h"
-++#if 0
-+ #include "components/pdf/renderer/pepper_pdf_host.h"
-++#endif
-+ #include "content/public/renderer/pepper_plugin_instance.h"
-+ #include "content/public/renderer/render_thread.h"
-+ #include "content/public/renderer/renderer_ppapi_host.h"
-+@@ -130,9 +132,11 @@ bool IsSimpleHeader(const std::string& lower_case_header_name,
-+ }
-+ 
-+ void RecordFlashNavigateUsage(FlashNavigateUsage usage) {
-++#if 0
-+   DCHECK_NE(FLASH_NAVIGATE_USAGE_ENUM_COUNT, usage);
-+   UMA_HISTOGRAM_ENUMERATION(
-+       "Plugin.FlashNavigateUsage", usage, FLASH_NAVIGATE_USAGE_ENUM_COUNT);
-++#endif
-+ }
-+ 
-+ }  // namespace
-+@@ -374,6 +378,8 @@ int32_t PepperFlashRendererHost::OnIsRectTopmost(
-+ 
-+ int32_t PepperFlashRendererHost::OnInvokePrinting(
-+     ppapi::host::HostMessageContext* host_context) {
-++#if 0
-+   pdf::PepperPDFHost::InvokePrintingForInstance(pp_instance());
-+-  return PP_OK;
-++#endif
-++  return PP_ERROR_FAILED;
-+ }
-added in remote
-  their  100644 4f134816aa9c4cb88581dfe3855f201a9a0aaec8 patches/common/chromium/protobuf_build_gn.patch
-@@ -0,0 +1,16 @@
-+diff --git a/BUILD.gn b/BUILD.gn
-+index 067416ed38f4..9fa07961c5b8 100644
-+--- a/third_party/protobuf/BUILD.gn
-++++ b/third_party/protobuf/BUILD.gn
-+@@ -599,6 +599,11 @@ if (current_toolchain == host_toolchain) {
-+ 
-+     configs -= [ "//build/config/compiler:chromium_code" ]
-+     configs += [ "//build/config/compiler:no_chromium_code" ]
-++    if (is_win) {
-++      # https://crbug.com/703251
-++      configs -= [ "//build/config/win:default_incremental_linking" ]
-++      configs += [ "//build/config/win:no_incremental_linking" ]
-++    }
-+ 
-+     cflags = protobuf_lite_cflags
-+ 
-added in remote
-  their  100644 6ee52eaac392f9210b185f5eef32aef8507a0d75 patches/common/chromium/render_widget_host_view_base.patch
-@@ -0,0 +1,69 @@
-+diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/content/browser/renderer_host/render_widget_host_view_base.cc
-+index 09a37c1a2c70..ff8c2db3fdae 100644
-+--- a/content/browser/renderer_host/render_widget_host_view_base.cc
-++++ b/content/browser/renderer_host/render_widget_host_view_base.cc
-+@@ -399,6 +399,15 @@ viz::FrameSinkId RenderWidgetHostViewBase::FrameSinkIdAtPoint(
-+   return frame_sink_id.is_valid() ? frame_sink_id : GetFrameSinkId();
-+ }
-+ 
-++RenderWidgetHostViewBase* RenderWidgetHostViewBase::CreateViewForWidget(
-++    RenderWidgetHost* render_widget_host,
-++    RenderWidgetHost* embedder_render_widget_host,
-++    WebContentsView* web_contents_view) {
-++  return web_contents_view->CreateViewForWidget(
-++    render_widget_host,
-++    !!embedder_render_widget_host);
-++}
-++
-+ void RenderWidgetHostViewBase::ProcessMouseEvent(
-+     const blink::WebMouseEvent& event,
-+     const ui::LatencyInfo& latency) {
-+diff --git a/content/browser/renderer_host/render_widget_host_view_base.h b/content/browser/renderer_host/render_widget_host_view_base.h
-+index 17c07af5e63b..746ed0c9231a 100644
-+--- a/content/browser/renderer_host/render_widget_host_view_base.h
-++++ b/content/browser/renderer_host/render_widget_host_view_base.h
-+@@ -21,7 +21,9 @@
-+ #include "components/viz/common/quads/compositor_frame.h"
-+ #include "components/viz/common/surfaces/surface_id.h"
-+ #include "content/browser/renderer_host/event_with_latency_info.h"
-++#include "content/browser/web_contents/web_contents_view.h"
-+ #include "content/common/content_export.h"
-++#include "content/public/browser/render_widget_host.h"
-+ #include "content/public/browser/render_widget_host_view.h"
-+ #include "content/public/common/input_event_ack_state.h"
-+ #include "content/public/common/screen_info.h"
-+@@ -79,10 +81,12 @@ class BrowserAccessibilityManager;
-+ class CursorManager;
-+ class RenderWidgetHostImpl;
-+ class RenderWidgetHostViewBaseObserver;
-++class RenderWidgetHostViewGuest;
-+ class SyntheticGestureTarget;
-+ class TextInputManager;
-+ class TouchSelectionControllerClientManager;
-+ class WebContentsAccessibility;
-++class WebContentsView;
-+ class WebCursor;
-+ struct TextInputState;
-+ 
-+@@ -124,6 +128,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView,
-+   float GetDeviceScaleFactor() const final;
-+   TouchSelectionControllerClientManager*
-+   GetTouchSelectionControllerClientManager() override;
-++
-++  virtual void InitAsGuest(RenderWidgetHostView* parent_host_view,
-++                           RenderWidgetHostViewGuest* guest_view) {}
-+ 
-+   // This only needs to be overridden by RenderWidgetHostViewBase subclasses
-+   // that handle content embedded within other RenderWidgetHostViews.
-+@@ -318,6 +325,11 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView,
-+   virtual void ProcessGestureEvent(const blink::WebGestureEvent& event,
-+                                    const ui::LatencyInfo& latency);
-+ 
-++  virtual RenderWidgetHostViewBase* CreateViewForWidget(
-++      RenderWidgetHost* render_widget_host,
-++      RenderWidgetHost* embedder_render_widget_host,
-++      WebContentsView* web_contents_view);
-++
-+   // Transform a point that is in the coordinate space of a Surface that is
-+   // embedded within the RenderWidgetHostViewBase's Surface to the
-+   // coordinate space of an embedding, or embedded, Surface. Typically this
-added in remote
-  their  100644 c563aae9c092b0193c1a966ed51293d3d25e3b8a patches/common/chromium/render_widget_host_view_mac.patch
-@@ -0,0 +1,95 @@
-+diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
-+index d60210d735b8..b64b779c38a5 100644
-+--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
-++++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
-+@@ -90,6 +90,7 @@
-+ #include "ui/gfx/geometry/size_conversions.h"
-+ #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
-+ #include "ui/gl/gl_switches.h"
-++#include "ui/gl/gpu_switching_manager.h"
-+ 
-+ using content::BrowserAccessibility;
-+ using content::BrowserAccessibilityManager;
-+@@ -140,6 +141,11 @@ RenderWidgetHostView* GetRenderWidgetHostViewToUse(
-+ 
-+ }  // namespace
-+ 
-++@interface NSWindow (AtomCustomMethods)
-++- (BOOL)acceptsFirstMouse;
-++- (BOOL)disableAutoHideCursor;
-++@end
-++
-+ // These are not documented, so use only after checking -respondsToSelector:.
-+ @interface NSApplication (UndocumentedSpeechMethods)
-+ - (void)speakString:(NSString*)string;
-+@@ -1669,6 +1675,12 @@ void RenderWidgetHostViewMac::SetBackgroundColor(SkColor color) {
-+   DCHECK(SkColorGetA(color) == SK_AlphaOPAQUE ||
-+          SkColorGetA(color) == SK_AlphaTRANSPARENT);
-+   bool opaque = SkColorGetA(color) == SK_AlphaOPAQUE;
-++  if (opaque) {
-++    bool wantsTransparent = ui::GpuSwitchingManager::UseTransparent() ||
-++                            ([cocoa_view_ window] && ![[cocoa_view_ window] isOpaque]);
-++    if (wantsTransparent)
-++      opaque = NO;
-++  }
-+   if (background_is_opaque_ != opaque) {
-+     background_is_opaque_ = opaque;
-+     if (render_widget_host_)
-+@@ -1893,6 +1905,9 @@ void RenderWidgetHostViewMac::OnDisplayMetricsChanged(
-+ }
-+ 
-+ - (BOOL)acceptsFirstMouse:(NSEvent*)theEvent {
-++  if ([self.window respondsToSelector:@selector(acceptsFirstMouse)] &&
-++      [self.window acceptsFirstMouse])
-++    return YES;
-+   return [self acceptsMouseEventsWhenInactive];
-+ }
-+ 
-+@@ -2066,6 +2081,7 @@ void RenderWidgetHostViewMac::OnDisplayMetricsChanged(
-+   if (EventIsReservedBySystem(theEvent))
-+     return NO;
-+ 
-++#if 0
-+   // If we return |NO| from this function, cocoa will send the key event to
-+   // the menu and only if the menu does not process the event to |keyDown:|. We
-+   // want to send the event to a renderer _before_ sending it to the menu, so
-+@@ -2079,6 +2095,7 @@ void RenderWidgetHostViewMac::OnDisplayMetricsChanged(
-+     DCHECK(![[NSApp mainMenu] performKeyEquivalent:theEvent]);
-+     return NO;
-+   }
-++#endif
-+ 
-+   // Command key combinations are sent via performKeyEquivalent rather than
-+   // keyDown:. We just forward this on and if WebCore doesn't want to handle
-+@@ -2989,6 +3006,9 @@ void RenderWidgetHostViewMac::OnDisplayMetricsChanged(
-+ // move) for the given event. Customize here to be more selective about which
-+ // key presses to autohide on.
-+ - (BOOL)shouldAutohideCursorForEvent:(NSEvent*)event {
-++  if ([event.window respondsToSelector:@selector(disableAutoHideCursor)] &&
-++      [event.window disableAutoHideCursor])
-++    return NO;
-+   return (renderWidgetHostView_->GetTextInputType() !=
-+               ui::TEXT_INPUT_TYPE_NONE &&
-+           [event type] == NSKeyDown &&
-+@@ -3149,9 +3169,11 @@ void RenderWidgetHostViewMac::OnDisplayMetricsChanged(
-+ // Since this implementation doesn't have to wait any IPC calls, this doesn't
-+ // make any key-typing jank. --hbono 7/23/09
-+ //
-++#ifndef MAS_BUILD
-+ extern "C" {
-+ extern NSString *NSTextInputReplacementRangeAttributeName;
-+ }
-++#endif
-+ 
-+ - (NSArray *)validAttributesForMarkedText {
-+   // This code is just copied from WebKit except renaming variables.
-+@@ -3160,7 +3182,9 @@ extern NSString *NSTextInputReplacementRangeAttributeName;
-+         NSUnderlineStyleAttributeName,
-+         NSUnderlineColorAttributeName,
-+         NSMarkedClauseSegmentAttributeName,
-++#ifndef MAS_BUILD
-+         NSTextInputReplacementRangeAttributeName,
-++#endif
-+         nil]);
-+   }
-+   return validAttributesForMarkedText_.get();
-added in remote
-  their  100644 88ac15f6ffa681de9fbd18ad665433b35bee241a patches/common/chromium/resource_file_conflict.patch
-@@ -0,0 +1,24 @@
-+diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-+index fbcf20c..d2173e2 100644
-+--- a/chrome/BUILD.gn
-++++ b/chrome/BUILD.gn
-+@@ -1656,6 +1656,11 @@ if (is_chrome_branded && !is_android) {
-+   }
-+ }
-+ 
-++if (is_electron_gn_build) {
-++  group("packed_resources") {
-++    public_deps = [ "//electron:packed_resources" ]
-++  }
-++} else {
-+ chrome_paks("packed_resources") {
-+   if (is_mac) {
-+     output_dir = "$root_gen_dir/repack"
-+@@ -1677,6 +1682,7 @@ chrome_paks("packed_resources") {
-+     ]
-+   }
-+ }
-++}
-+ 
-+ repack("browser_tests_pak") {
-+   sources = [
-added in remote
-  their  100644 168d5d57ad0c2b74628d8de35070d780e8839e60 patches/common/chromium/scoped_clipboard_writer.patch
-@@ -0,0 +1,57 @@
-+diff --git a/ui/base/clipboard/scoped_clipboard_writer.cc b/ui/base/clipboard/scoped_clipboard_writer.cc
-+index 6850cd460b1d..6d652cca59b4 100644
-+--- a/ui/base/clipboard/scoped_clipboard_writer.cc
-++++ b/ui/base/clipboard/scoped_clipboard_writer.cc
-+@@ -102,17 +102,16 @@ void ScopedClipboardWriter::WriteImage(const SkBitmap& bitmap) {
-+   objects_[Clipboard::CBF_SMBITMAP] = parameters;
-+ }
-+ 
-+-void ScopedClipboardWriter::WritePickledData(
-+-    const base::Pickle& pickle,
-+-    const Clipboard::FormatType& format) {
-++void ScopedClipboardWriter::WriteData(const char* data,
-++                                      int size,
-++                                      const Clipboard::FormatType& format) {
-+   std::string format_string = format.Serialize();
-+   Clipboard::ObjectMapParam format_parameter(format_string.begin(),
-+                                              format_string.end());
-+   Clipboard::ObjectMapParam data_parameter;
-+ 
-+-  data_parameter.resize(pickle.size());
-+-  memcpy(const_cast<char*>(&data_parameter.front()),
-+-         pickle.data(), pickle.size());
-++  data_parameter.resize(size);
-++  memcpy(const_cast<char*>(&data_parameter.front()), data, size);
-+ 
-+   Clipboard::ObjectMapParams parameters;
-+   parameters.push_back(format_parameter);
-+@@ -121,6 +121,13 @@ void ScopedClipboardWriter::WritePickledData(
-+   objects_[Clipboard::CBF_DATA] = parameters;
-+ }
-+ 
-++void ScopedClipboardWriter::WritePickledData(
-++    const base::Pickle& pickle,
-++    const Clipboard::FormatType& format) {
-++  WriteData(reinterpret_cast<const char*>(pickle.data()), pickle.size(),
-++            format);
-++}
-++
-+ void ScopedClipboardWriter::Reset() {
-+   objects_.clear();
-+   bitmap_.reset();
-+diff --git a/ui/base/clipboard/scoped_clipboard_writer.h b/ui/base/clipboard/scoped_clipboard_writer.h
-+index a7e064561ca9..d5a1b76bc6a7 100644
-+--- a/ui/base/clipboard/scoped_clipboard_writer.h
-++++ b/ui/base/clipboard/scoped_clipboard_writer.h
-+@@ -61,6 +61,11 @@ class UI_BASE_EXPORT ScopedClipboardWriter {
-+   // Used by WebKit to determine whether WebKit wrote the clipboard last
-+   void WriteWebSmartPaste();
-+ 
-++  // Adds arbitrary data to clipboard.
-++  void WriteData(const char* data,
-++                 int size,
-++                 const Clipboard::FormatType& format);
-++
-+   // Adds arbitrary pickled data to clipboard.
-+   void WritePickledData(const base::Pickle& pickle,
-+                         const Clipboard::FormatType& format);
-added in remote
-  their  100644 b405a951abd5016838cf2615099fa56870d2a6c8 patches/common/chromium/scroll_bounce_flag.patch
-@@ -0,0 +1,13 @@
-+diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
-+index 81d3f80..a8c4a57 100644
-+--- a/content/renderer/render_thread_impl.cc
-++++ b/content/renderer/render_thread_impl.cc
-+@@ -1737,7 +1737,7 @@ bool RenderThreadImpl::IsGpuMemoryBufferCompositorResourcesEnabled() {
-+ }
-+ 
-+ bool RenderThreadImpl::IsElasticOverscrollEnabled() {
-+-  return is_elastic_overscroll_enabled_;
-++  return base::CommandLine::ForCurrentProcess()->HasSwitch("scroll-bounce");
-+ }
-+ 
-+ scoped_refptr<base::SingleThreadTaskRunner>
-added in remote
-  their  100644 fb383cb9e290e215bb22865529ff1763643f9154 patches/common/chromium/statically_build_power_save_blocker.patch
-@@ -0,0 +1,21 @@
-+diff --git a/services/device/wake_lock/power_save_blocker/BUILD.gn b/services/device/wake_lock/power_save_blocker/BUILD.gn
-+index e04629ca1a93..299e6efd75f9 100644
-+--- a/services/device/wake_lock/power_save_blocker/BUILD.gn
-++++ b/services/device/wake_lock/power_save_blocker/BUILD.gn
-+@@ -9,7 +9,7 @@ if (is_android) {
-+   import("//build/config/android/rules.gni")
-+ }
-+ 
-+-source_set("power_save_blocker") {
-++static_library("power_save_blocker") {
-+   visibility = [
-+     # //remoting runs in a separate process which is outside of the context of
-+     # the ServiceManager-based world. Instead of embedding a Service Manager
-+@@ -18,6 +18,7 @@ source_set("power_save_blocker") {
-+     "//remoting/host:*",
-+     "//remoting/host/win:*",
-+     "//services/device/wake_lock:*",
-++    "//electron:*",
-+   ]
-+ 
-+   sources = [
-added in remote
-  their  100644 a14ca699bafcd61f736b0d1f33a38187ecf74c88 patches/common/chromium/stream_resource_handler.patch
-@@ -0,0 +1,21 @@
-+diff --git a/content/browser/loader/stream_resource_handler.h b/content/browser/loader/stream_resource_handler.h
-+index 9f69994..ae8d1630 100644
-+--- a/content/browser/loader/stream_resource_handler.h
-++++ b/content/browser/loader/stream_resource_handler.h
-+@@ -11,6 +11,7 @@
-+ #include "base/memory/ref_counted.h"
-+ #include "content/browser/loader/resource_handler.h"
-+ #include "content/browser/loader/stream_writer.h"
-++#include "content/common/content_export.h"
-+ 
-+ namespace net {
-+ class URLRequest;
-+@@ -22,7 +23,7 @@ class ResourceController;
-+ class StreamRegistry;
-+ 
-+ // Redirect this resource to a stream.
-+-class StreamResourceHandler : public ResourceHandler {
-++class CONTENT_EXPORT StreamResourceHandler : public ResourceHandler {
-+  public:
-+   // |origin| will be used to construct the URL for the Stream. See
-+   // WebCore::BlobURL and and WebCore::SecurityOrigin in Blink to understand
-added in remote
-  their  100644 875431a56511fe983dd39f324e1322288a6574c8 patches/common/chromium/sysroot.patch
-@@ -0,0 +1,149 @@
-+diff --git a/build/config/sysroot.gni b/build/config/sysroot.gni
-+index d5daf2df2e41..46999e2e2198 100644
-+--- a/build/config/sysroot.gni
-++++ b/build/config/sysroot.gni
-+@@ -32,17 +32,17 @@ if (current_os == target_os && current_cpu == target_cpu &&
-+   # By default build against a sysroot image downloaded from Cloud Storage
-+   # during gclient runhooks.
-+   if (current_cpu == "x64") {
-+-    sysroot = "$target_sysroot_dir/debian_sid_amd64-sysroot"
-++    sysroot = "$target_sysroot_dir/debian_stretch_amd64-sysroot"
-+   } else if (current_cpu == "x86") {
-+-    sysroot = "$target_sysroot_dir/debian_sid_i386-sysroot"
-++    sysroot = "$target_sysroot_dir/debian_stretch_i386-sysroot"
-+   } else if (current_cpu == "mipsel") {
-+-    sysroot = "$target_sysroot_dir/debian_sid_mips-sysroot"
-++    sysroot = "$target_sysroot_dir/debian_stretch_mips-sysroot"
-+   } else if (current_cpu == "mips64el") {
-+-    sysroot = "$target_sysroot_dir/debian_sid_mips64el-sysroot"
-++    sysroot = "$target_sysroot_dir/debian_stretch_mips64el-sysroot"
-+   } else if (current_cpu == "arm") {
-+-    sysroot = "$target_sysroot_dir/debian_sid_arm-sysroot"
-++    sysroot = "$target_sysroot_dir/debian_stretch_arm-sysroot"
-+   } else if (current_cpu == "arm64") {
-+-    sysroot = "$target_sysroot_dir/debian_sid_arm64-sysroot"
-++    sysroot = "$target_sysroot_dir/debian_stretch_arm64-sysroot"
-+   } else {
-+     assert(false, "No linux sysroot for cpu: $target_cpu")
-+   }
-+diff --git a/build/linux/sysroot_scripts/install-sysroot.py b/build/linux/sysroot_scripts/install-sysroot.py
-+index 6fb13c8bc6d8..b50e34d84ba6 100755
-+--- a/build/linux/sysroot_scripts/install-sysroot.py
-++++ b/build/linux/sysroot_scripts/install-sysroot.py
-+@@ -32,8 +32,8 @@ import urllib2
-+ SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-+ sys.path.append(os.path.dirname(os.path.dirname(SCRIPT_DIR)))
-+ 
-+-URL_PREFIX = 'https://commondatastorage.googleapis.com'
-+-URL_PATH = 'chrome-linux-sysroot/toolchain'
-++URL_PREFIX = 'http://s3.amazonaws.com'
-++URL_PATH = 'gh-contractor-zcbenz/toolchain'
-+ 
-+ VALID_ARCHS = ('arm', 'arm64', 'i386', 'amd64', 'mips', 'mips64el')
-+ 
-+@@ -87,7 +87,7 @@ def main(args):
-+ def InstallDefaultSysrootForArch(target_arch):
-+   if target_arch not in VALID_ARCHS:
-+     raise Error('Unknown architecture: %s' % target_arch)
-+-  InstallSysroot('Sid', target_arch)
-++  InstallSysroot('Stretch', target_arch)
-+ 
-+ 
-+ def InstallSysroot(target_platform, target_arch):
-+diff --git a/build/linux/sysroot_scripts/sysroots.json b/build/linux/sysroot_scripts/sysroots.json
-+index 870a994ec9f3..d916f24a099f 100644
-+--- a/build/linux/sysroot_scripts/sysroots.json
-++++ b/build/linux/sysroot_scripts/sysroots.json
-+@@ -1,74 +1,38 @@
-+ {
-+-    "sid_amd64": {
-+-        "Revision": "15b7efb900d75f7316c6e713e80f87b9904791b1",
-+-        "Sha1Sum": "85ac8d5e0f6cff99fc323fd3d29cb73e2aa970e2",
-+-        "SysrootDir": "debian_sid_amd64-sysroot",
-+-        "Tarball": "debian_sid_amd64_sysroot.tar.xz"
-+-    },
-+-    "sid_arm": {
-+-        "Revision": "15b7efb900d75f7316c6e713e80f87b9904791b1",
-+-        "Sha1Sum": "ed31924757f11885a21793dc4b928d07ab25740c",
-+-        "SysrootDir": "debian_sid_arm-sysroot",
-+-        "Tarball": "debian_sid_arm_sysroot.tar.xz"
-+-    },
-+-    "sid_arm64": {
-+-        "Revision": "15b7efb900d75f7316c6e713e80f87b9904791b1",
-+-        "Sha1Sum": "b9447285e58c5260bd9fa2737d1f0d1f82156738",
-+-        "SysrootDir": "debian_sid_arm64-sysroot",
-+-        "Tarball": "debian_sid_arm64_sysroot.tar.xz"
-+-    },
-+-    "sid_i386": {
-+-        "Revision": "15b7efb900d75f7316c6e713e80f87b9904791b1",
-+-        "Sha1Sum": "f09856d93f39e8df84ffd9c04881f44e6cbc0508",
-+-        "SysrootDir": "debian_sid_i386-sysroot",
-+-        "Tarball": "debian_sid_i386_sysroot.tar.xz"
-+-    },
-+-    "sid_mips": {
-+-        "Revision": "15b7efb900d75f7316c6e713e80f87b9904791b1",
-+-        "Sha1Sum": "90586b566b567b2bcf49e7fd112f0c8189bbd07b",
-+-        "SysrootDir": "debian_sid_mips-sysroot",
-+-        "Tarball": "debian_sid_mips_sysroot.tar.xz"
-+-    },
-+-    "sid_mips64el": {
-+-        "Revision": "15b7efb900d75f7316c6e713e80f87b9904791b1",
-+-        "Sha1Sum": "f90c3b81485ffebb283afddb1a72bc61e14c593d",
-+-        "SysrootDir": "debian_sid_mips64el-sysroot",
-+-        "Tarball": "debian_sid_mips64el_sysroot.tar.xz"
-+-    },
-+     "stretch_amd64": {
-+-        "Revision": "3c248ba4290a5ad07085b7af07e6785bf1ae5b66",
-+-        "Sha1Sum": "a668aafe335848c6e4aed11d0b32ea2d5c5a124d",
-++        "Revision": "02772eaba5440a79c6bd2d9cb7e42fa836950366",
-++        "Sha1Sum": "69457fddca3500e2dde124f77f8382b0a18d765e",
-+         "SysrootDir": "debian_stretch_amd64-sysroot",
-+-        "Tarball": "debian_stretch_amd64_sysroot.tar.xz"
-++        "Tarball": "debian_stretch_amd64_sysroot.tgz"
-+     },
-+     "stretch_arm": {
-+-        "Revision": "3c248ba4290a5ad07085b7af07e6785bf1ae5b66",
-+-        "Sha1Sum": "4658f558326d93d8a69fe6940bc19cf7de32cf4d",
-++        "Revision": "02772eaba5440a79c6bd2d9cb7e42fa836950366",
-++        "Sha1Sum": "3e880f69177992ce02b05deeac619f7591b30287",
-+         "SysrootDir": "debian_stretch_arm-sysroot",
-+-        "Tarball": "debian_stretch_arm_sysroot.tar.xz"
-++        "Tarball": "debian_stretch_arm_sysroot.tgz"
-+     },
-+     "stretch_arm64": {
-+-        "Revision": "3c248ba4290a5ad07085b7af07e6785bf1ae5b66",
-+-        "Sha1Sum": "a3c530ff8a5d9be34dd6fc07a05188ea947116cf",
-++        "Revision": "02772eaba5440a79c6bd2d9cb7e42fa836950366",
-++        "Sha1Sum": "8fd58c7d4b38fa3c6785573c6310cf6ca6c88312",
-+         "SysrootDir": "debian_stretch_arm64-sysroot",
-+-        "Tarball": "debian_stretch_arm64_sysroot.tar.xz"
-++        "Tarball": "debian_stretch_arm64_sysroot.tgz"
-+     },
-+     "stretch_i386": {
-+-        "Revision": "3c248ba4290a5ad07085b7af07e6785bf1ae5b66",
-+-        "Sha1Sum": "98425d632814b45289ca6c3acb38d8e11c487ec6",
-++        "Revision": "02772eaba5440a79c6bd2d9cb7e42fa836950366",
-++        "Sha1Sum": "1bd14db5eb0466064659126d398b38220013fb38",
-+         "SysrootDir": "debian_stretch_i386-sysroot",
-+-        "Tarball": "debian_stretch_i386_sysroot.tar.xz"
-++        "Tarball": "debian_stretch_i386_sysroot.tgz"
-+     },
-+     "stretch_mips": {
-+-        "Revision": "3c248ba4290a5ad07085b7af07e6785bf1ae5b66",
-+-        "Sha1Sum": "dcb078646b49c94298cf702acc5ece28a689fea4",
-++        "Revision": "02772eaba5440a79c6bd2d9cb7e42fa836950366",
-++        "Sha1Sum": "285751660ffab14e6d052c8ddb5c90752a51704d",
-+         "SysrootDir": "debian_stretch_mips-sysroot",
-+-        "Tarball": "debian_stretch_mips_sysroot.tar.xz"
-++        "Tarball": "debian_stretch_mips_sysroot.tgz"
-+     },
-+     "stretch_mips64el": {
-+-        "Revision": "3c248ba4290a5ad07085b7af07e6785bf1ae5b66",
-+-        "Sha1Sum": "a68c72c6b6d4fad8d43e268cc081ce6afeaa79e4",
-++        "Revision": "02772eaba5440a79c6bd2d9cb7e42fa836950366",
-++        "Sha1Sum": "23f51f29bc35a550092dde41dc823780fdb50f9e",
-+         "SysrootDir": "debian_stretch_mips64el-sysroot",
-+-        "Tarball": "debian_stretch_mips64el_sysroot.tar.xz"
-++        "Tarball": "debian_stretch_mips64el_sysroot.tgz"
-+     }
-+ }
-added in remote
-  their  100644 97feca572859036369b0cb469e0011917564004b patches/common/chromium/thread_capabilities.patch
-@@ -0,0 +1,15 @@
-+diff --git a/sandbox/linux/services/credentials.cc b/sandbox/linux/services/credentials.cc
-+index 50a109e..3ee9159 100644
-+--- a/sandbox/linux/services/credentials.cc
-++++ b/sandbox/linux/services/credentials.cc
-+@@ -358,8 +358,10 @@ pid_t Credentials::ForkAndDropCapabilitiesInChild() {
-+     return pid;
-+   }
-+ 
-++#if 0
-+   // Since we just forked, we are single threaded.
-+   PCHECK(DropAllCapabilitiesOnCurrentThread());
-++#endif
-+   return 0;
-+ }
-+ 
-added in remote
-  their  100644 1dc8a9be400f6b64fccb9f00bcde31360fa9deab patches/common/chromium/use_transparent_window.patch
-@@ -0,0 +1,48 @@
-+diff --git a/ui/gl/gpu_switching_manager.cc b/ui/gl/gpu_switching_manager.cc
-+index be7156465809..cee3b1af3dc5 100644
-+--- a/ui/gl/gpu_switching_manager.cc
-++++ b/ui/gl/gpu_switching_manager.cc
-+@@ -4,6 +4,12 @@
-+ 
-+ #include "ui/gl/gpu_switching_manager.h"
-+ 
-++namespace {
-++
-++bool g_use_transparent = false;
-++
-++}  // namespace
-++
-+ namespace ui {
-+ 
-+ // static
-+@@ -11,6 +17,16 @@ GpuSwitchingManager* GpuSwitchingManager::GetInstance() {
-+   return base::Singleton<GpuSwitchingManager>::get();
-+ }
-+ 
-++// static
-++void GpuSwitchingManager::SetTransparent(bool transparent) {
-++  g_use_transparent = transparent;
-++}
-++
-++// static
-++bool GpuSwitchingManager::UseTransparent() {
-++  return g_use_transparent;
-++}
-++
-+ GpuSwitchingManager::GpuSwitchingManager() {}
-+ 
-+ GpuSwitchingManager::~GpuSwitchingManager() {}
-+diff --git a/ui/gl/gpu_switching_manager.h b/ui/gl/gpu_switching_manager.h
-+index 4308bbed9398..a7cafcfccdff 100644
-+--- a/ui/gl/gpu_switching_manager.h
-++++ b/ui/gl/gpu_switching_manager.h
-+@@ -18,6 +18,9 @@ class GL_EXPORT GpuSwitchingManager {
-+   // Getter for the singleton. This will return NULL on failure.
-+   static GpuSwitchingManager* GetInstance();
-+ 
-++  static void SetTransparent(bool transparent);
-++  static bool UseTransparent();
-++
-+   void AddObserver(GpuSwitchingObserver* observer);
-+   void RemoveObserver(GpuSwitchingObserver* observer);
-+ 
-added in remote
-  their  100644 5dfb4ec87cc00ee6ed70ce5229d0078d25f6c765 patches/common/chromium/v8_context_snapshot_generator.patch
-@@ -0,0 +1,12 @@
-+diff --git a/tools/v8_context_snapshot/BUILD.gn b/tools/v8_context_snapshot/BUILD.gn
-+index d6691a527f25..000105b86f53 100644
-+--- a/tools/v8_context_snapshot/BUILD.gn
-++++ b/tools/v8_context_snapshot/BUILD.gn
-+@@ -105,6 +105,7 @@ if (use_v8_context_snapshot) {
-+     configs += [
-+       "//v8:external_startup_data",
-+       ":disable_icf",
-++      "//libchromiumcontent/chromiumcontent/config:build_time_executable"
-+     ]
-+   }
-+ }
-added in remote
-  their  100644 c207586ed14902ae2a28282aad6d0103bd3bbd43 patches/common/chromium/web_contents.patch
-@@ -0,0 +1,115 @@
-+diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-+index 018534073da1..48f3d0e7343b 100644
-+--- a/content/browser/web_contents/web_contents_impl.cc
-++++ b/content/browser/web_contents/web_contents_impl.cc
-+@@ -1759,6 +1759,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
-+   std::string unique_name;
-+   frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name);
-+ 
-++  if (params.view && params.delegate_view) {
-++    view_.reset(params.view);
-++    render_view_host_delegate_view_ = params.delegate_view;
-++  }
-++
-++  if (!view_) {
-+   WebContentsViewDelegate* delegate =
-+       GetContentClient()->browser()->GetWebContentsViewDelegate(this);
-+ 
-+@@ -1774,6 +1780,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
-+           &render_view_host_delegate_view_);
-+     }
-+   }
-++  }  //  !view_
-+   CHECK(render_view_host_delegate_view_);
-+   CHECK(view_.get());
-+ 
-+diff --git a/content/browser/web_contents/web_contents_view_guest.cc b/content/browser/web_contents/web_contents_view_guest.cc
-+index 699570cc1390..454830098cb9 100644
-+--- a/content/browser/web_contents/web_contents_view_guest.cc
-++++ b/content/browser/web_contents/web_contents_view_guest.cc
-+@@ -67,21 +67,27 @@ gfx::NativeWindow WebContentsViewGuest::GetTopLevelNativeWindow() const {
-+ 
-+ void WebContentsViewGuest::OnGuestAttached(WebContentsView* parent_view) {
-+ #if defined(USE_AURA)
-++  if (!platform_view_->GetNativeView())
-++    return;
-+   // In aura, ScreenPositionClient doesn't work properly if we do
-+   // not have the native view associated with this WebContentsViewGuest in the
-+   // view hierarchy. We add this view as embedder's child here.
-+   // This would go in WebContentsViewGuest::CreateView, but that is too early to
-+   // access embedder_web_contents(). Therefore, we do it here.
-+   if (!base::FeatureList::IsEnabled(features::kMash))
-+-    parent_view->GetNativeView()->AddChild(platform_view_->GetNativeView());
-++    if (parent_view->GetNativeView() != platform_view_->GetNativeView())
-++      parent_view->GetNativeView()->AddChild(platform_view_->GetNativeView());
-+ #endif  // defined(USE_AURA)
-+ }
-+ 
-+ void WebContentsViewGuest::OnGuestDetached(WebContentsView* old_parent_view) {
-+ #if defined(USE_AURA)
-++  if (!platform_view_->GetNativeView())
-++    return;
-+   if (!base::FeatureList::IsEnabled(features::kMash)) {
-+-    old_parent_view->GetNativeView()->RemoveChild(
-+-        platform_view_->GetNativeView());
-++    if (old_parent_view->GetNativeView() != platform_view_->GetNativeView())
-++      old_parent_view->GetNativeView()->RemoveChild(
-++          platform_view_->GetNativeView());
-+   }
-+ #endif  // defined(USE_AURA)
-+ }
-+@@ -146,11 +152,22 @@ RenderWidgetHostViewBase* WebContentsViewGuest::CreateViewForWidget(
-+         render_widget_host->GetView());
-+   }
-+ 
-++  RenderWidgetHost* embedder_render_widget_host =
-++    guest_->embedder_web_contents()->GetRenderViewHost()->GetWidget();
-++  RenderWidgetHostViewBase* embedder_render_widget_host_view =
-++      static_cast<RenderWidgetHostViewBase*>(
-++        embedder_render_widget_host->GetView());
-+   RenderWidgetHostViewBase* platform_widget =
-+-      platform_view_->CreateViewForWidget(render_widget_host, true);
-+-
-+-  return RenderWidgetHostViewGuest::Create(render_widget_host, guest_,
-+-                                           platform_widget->GetWeakPtr());
-++      embedder_render_widget_host_view->CreateViewForWidget(
-++        render_widget_host,
-++        embedder_render_widget_host,
-++        platform_view_.get());
-++  RenderWidgetHostViewGuest* guest_view = RenderWidgetHostViewGuest::Create(
-++    render_widget_host, guest_, platform_widget->GetWeakPtr());
-++  platform_widget->InitAsGuest(embedder_render_widget_host->GetView(),
-++                               guest_view);
-++
-++  return guest_view;
-+ }
-+ 
-+ RenderWidgetHostViewBase* WebContentsViewGuest::CreateViewForPopupWidget(
-+diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
-+index a13db5f4dd61..621124decfdc 100644
-+--- a/content/public/browser/web_contents.h
-++++ b/content/public/browser/web_contents.h
-+@@ -69,9 +69,12 @@ class BrowserPluginGuestDelegate;
-+ class InterstitialPage;
-+ class RenderFrameHost;
-+ class RenderViewHost;
-++class RenderViewHostDelegateView;
-+ class RenderWidgetHost;
-+ class RenderWidgetHostView;
-++class RenderWidgetHostViewBase;
-+ class WebContentsDelegate;
-++class WebContentsView;
-+ struct CustomContextMenuContext;
-+ struct DropData;
-+ struct Manifest;
-+@@ -172,6 +175,10 @@ class WebContents : public PageNavigator,
-+     // navigation requires a dedicated or privileged process, such as a WebUI.
-+     bool initialize_renderer;
-+ 
-++    // Optionally specify the view and delegate view.
-++    content::WebContentsView* view = nullptr;
-++    content::RenderViewHostDelegateView* delegate_view = nullptr;
-++
-+     // Sandboxing flags set on the new WebContents.
-+     blink::WebSandboxFlags starting_sandbox_flags;
-+   };
-added in remote
-  their  100644 7acb9f2f54e35f751da4930af298ce758b478d91 patches/common/chromium/webgl_context_attributes.patch
-@@ -0,0 +1,111 @@
-+diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
-+index 0affacaa0294..0c321d51364d 100644
-+--- a/content/renderer/renderer_blink_platform_impl.cc
-++++ b/content/renderer/renderer_blink_platform_impl.cc
-+@@ -1136,8 +1136,10 @@ RendererBlinkPlatformImpl::CreateOffscreenGraphicsContext3DProvider(
-+   attributes.sample_buffers = 0;
-+   attributes.bind_generates_resource = false;
-+   attributes.enable_raster_interface = web_attributes.enable_raster_interface;
-+-  // Prefer discrete GPU for WebGL.
-+-  attributes.gpu_preference = gl::PreferDiscreteGpu;
-++
-++  attributes.gpu_preference = web_attributes.prefer_integrated_gpu
-++      ? gl::PreferIntegratedGpu
-++      : gl::PreferDiscreteGpu;
-+ 
-+   attributes.fail_if_major_perf_caveat =
-+       web_attributes.fail_if_major_performance_caveat;
-+diff --git a/third_party/WebKit/Source/core/html/canvas/CanvasContextCreationAttributesCore.h b/third_party/WebKit/Source/core/html/canvas/CanvasContextCreationAttributesCore.h
-+index ca4543a10e69..a1f5e5c9f906 100644
-+--- a/third_party/WebKit/Source/core/html/canvas/CanvasContextCreationAttributesCore.h
-++++ b/third_party/WebKit/Source/core/html/canvas/CanvasContextCreationAttributesCore.h
-+@@ -30,6 +30,7 @@ class CORE_EXPORT CanvasContextCreationAttributesCore {
-+   String pixel_format = "8-8-8-8";
-+   bool premultiplied_alpha = true;
-+   bool preserve_drawing_buffer = false;
-++  String power_preference = "default";
-+   bool stencil = false;
-+ 
-+   // This attribute is of type XRDevice, defined in modules/xr/XRDevice.h
-+diff --git a/third_party/WebKit/Source/modules/canvas/htmlcanvas/CanvasContextCreationAttributesModule.idl b/third_party/WebKit/Source/modules/canvas/htmlcanvas/CanvasContextCreationAttributesModule.idl
-+index 7419bb20d316..5b04af00fab4 100644
-+--- a/third_party/WebKit/Source/modules/canvas/htmlcanvas/CanvasContextCreationAttributesModule.idl
-++++ b/third_party/WebKit/Source/modules/canvas/htmlcanvas/CanvasContextCreationAttributesModule.idl
-+@@ -28,6 +28,12 @@ enum CanvasPixelFormat {
-+     "float16",
-+ };
-+ 
-++enum CanvasPowerPreference {
-++    "default",
-++    "low-power",
-++    "high-performance",
-++};
-++
-+ [PermissiveDictionaryConversion]
-+ dictionary CanvasContextCreationAttributesModule {
-+     // This is an experimental feature, but it is not hidden behind a flag in
-+@@ -47,6 +53,7 @@ dictionary CanvasContextCreationAttributesModule {
-+     boolean antialias = true;
-+     boolean premultipliedAlpha = true;
-+     boolean preserveDrawingBuffer = false;
-++    CanvasPowerPreference powerPreference = "default";
-+     boolean failIfMajorPerformanceCaveat = false;
-+     [RuntimeEnabled=WebXR] XRDevice compatibleXRDevice = null;
-+ };
-+diff --git a/third_party/WebKit/Source/modules/webgl/WebGLContextAttributeHelpers.cpp b/third_party/WebKit/Source/modules/webgl/WebGLContextAttributeHelpers.cpp
-+index 332fa9fb0547..e8fae4b01c39 100644
-+--- a/third_party/WebKit/Source/modules/webgl/WebGLContextAttributeHelpers.cpp
-++++ b/third_party/WebKit/Source/modules/webgl/WebGLContextAttributeHelpers.cpp
-+@@ -18,6 +18,7 @@ WebGLContextAttributes ToWebGLContextAttributes(
-+   result.setAntialias(attrs.antialias);
-+   result.setPremultipliedAlpha(attrs.premultiplied_alpha);
-+   result.setPreserveDrawingBuffer(attrs.preserve_drawing_buffer);
-++  result.setPowerPreference(attrs.power_preference);
-+   result.setFailIfMajorPerformanceCaveat(
-+       attrs.fail_if_major_performance_caveat);
-+   result.setCompatibleXRDevice(
-+@@ -30,6 +31,7 @@ Platform::ContextAttributes ToPlatformContextAttributes(
-+     unsigned web_gl_version,
-+     bool support_own_offscreen_surface) {
-+   Platform::ContextAttributes result;
-++  result.prefer_integrated_gpu = attrs.power_preference == "low-power";
-+   result.fail_if_major_performance_caveat =
-+       attrs.fail_if_major_performance_caveat;
-+   result.web_gl_version = web_gl_version;
-+diff --git a/third_party/WebKit/Source/modules/webgl/WebGLContextAttributes.idl b/third_party/WebKit/Source/modules/webgl/WebGLContextAttributes.idl
-+index 180673be9bd0..0af29cbc9402 100644
-+--- a/third_party/WebKit/Source/modules/webgl/WebGLContextAttributes.idl
-++++ b/third_party/WebKit/Source/modules/webgl/WebGLContextAttributes.idl
-+@@ -26,6 +26,12 @@
-+ 
-+ // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.2
-+ 
-++enum WebGLPowerPreference {
-++    "default",
-++    "low-power",
-++    "high-performance",
-++};
-++
-+ dictionary WebGLContextAttributes {
-+     boolean alpha = true;
-+     boolean depth = true;
-+@@ -33,6 +39,7 @@ dictionary WebGLContextAttributes {
-+     boolean antialias = true;
-+     boolean premultipliedAlpha = true;
-+     boolean preserveDrawingBuffer = false;
-++    WebGLPowerPreference powerPreference = "default";
-+     boolean failIfMajorPerformanceCaveat = false;
-+     [RuntimeEnabled=WebXR] XRDevice compatibleXRDevice = null;
-+ };
-+diff --git a/third_party/WebKit/public/platform/Platform.h b/third_party/WebKit/public/platform/Platform.h
-+index 2cd7334..98ecb84 100644
-+--- a/third_party/WebKit/public/platform/Platform.h
-++++ b/third_party/WebKit/public/platform/Platform.h
-+@@ -466,6 +466,7 @@ class BLINK_PLATFORM_EXPORT Platform {
-+   // GPU ----------------------------------------------------------------
-+   //
-+   struct ContextAttributes {
-++    bool prefer_integrated_gpu = false;
-+     bool fail_if_major_performance_caveat = false;
-+     unsigned web_gl_version = 0;
-+     // Offscreen contexts usually share a surface for the default frame buffer
-added in remote
-  their  100644 dd4ac0fbad96f14e3d7050596d90675ffa759f04 patches/common/chromium/webui_in_subframes.patch
-@@ -0,0 +1,138 @@
-+diff --git a/content/browser/frame_host/render_frame_host_delegate.cc b/content/browser/frame_host/render_frame_host_delegate.cc
-+index 4d0a8ea553c5..0fac0b22ff2f 100644
-+--- a/content/browser/frame_host/render_frame_host_delegate.cc
-++++ b/content/browser/frame_host/render_frame_host_delegate.cc
-+@@ -89,8 +89,10 @@ bool RenderFrameHostDelegate::ShouldRouteMessageEvent(
-+ }
-+ 
-+ std::unique_ptr<WebUIImpl>
-+-RenderFrameHostDelegate::CreateWebUIForRenderFrameHost(const GURL& url) {
-+-  return nullptr;
-++RenderFrameHostDelegate::CreateWebUIForRenderFrameHost(
-++    const GURL& url,
-++    const std::string& frame_name) {
-++  return nullptr;
-+ }
-+ 
-+ bool RenderFrameHostDelegate::ShouldAllowRunningInsecureContent(
-+diff --git a/content/browser/frame_host/render_frame_host_delegate.h b/content/browser/frame_host/render_frame_host_delegate.h
-+index 197b64b49fd6..2e94b03c4f44 100644
-+--- a/content/browser/frame_host/render_frame_host_delegate.h
-++++ b/content/browser/frame_host/render_frame_host_delegate.h
-+@@ -234,7 +234,8 @@ class CONTENT_EXPORT RenderFrameHostDelegate {
-+   // Creates a WebUI object for a frame navigating to |url|. If no WebUI
-+   // applies, returns null.
-+   virtual std::unique_ptr<WebUIImpl> CreateWebUIForRenderFrameHost(
-+-      const GURL& url);
-++      const GURL& url,
-++      const std::string& frame_name);
-+ 
-+   // Called by |frame| to notify that it has received an update on focused
-+   // element. |bounds_in_root_view| is the rectangle containing the element that
-+diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
-+index 1f566ef1f437..bb2f59d62315 100644
-+--- a/content/browser/frame_host/render_frame_host_impl.cc
-++++ b/content/browser/frame_host/render_frame_host_impl.cc
-+@@ -20,6 +20,7 @@
-+ #include "base/process/kill.h"
-+ #include "base/task_scheduler/post_task.h"
-+ #include "base/time/time.h"
-++#include "base/unguessable_token.h"
-+ #include "build/build_config.h"
-+ #include "cc/base/switches.h"
-+ #include "content/browser/accessibility/browser_accessibility_manager.h"
-+@@ -3468,8 +3514,23 @@ bool RenderFrameHostImpl::UpdatePendingWebUI(const GURL& dest_url,
-+       DCHECK(web_ui_);
-+       should_reuse_web_ui_ = true;
-+     } else {
-++      // Give the frame a name if it does not already have one.
-++      // The reason is web ui code base the frame look up on the frame name.
-++      std::string frame_name = GetFrameName();
-++      if (frame_name.empty() && !frame_tree_node_->IsMainFrame()) {
-++        frame_name = base::StringPrintf("frame_%i", frame_tree_node_->frame_tree_node_id());
-++        frame_tree_node_->SetFrameName(
-++            frame_name, frame_name + base::UnguessableToken::Create().ToString());
-++      }
-++
-++      // If the web ui is in subframes, the parent frame bindings does not have the web ui binding,
-++      // so we reset the bindings for the subframes.
-++      if (!frame_tree_node_->IsMainFrame() && new_web_ui_type != WebUI::kNoWebUI) {
-++        entry_bindings = NavigationEntryImpl::kInvalidBindings;
-++      }
-++
-+       // Otherwise create a new pending WebUI.
-+-      pending_web_ui_ = delegate_->CreateWebUIForRenderFrameHost(dest_url);
-++      pending_web_ui_ = delegate_->CreateWebUIForRenderFrameHost(dest_url, frame_name);
-+       DCHECK(pending_web_ui_);
-+       pending_web_ui_type_ = new_web_ui_type;
-+ 
-+diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-+index f985ea2bceab..779cfd79312d 100644
-+--- a/content/browser/web_contents/web_contents_impl.cc
-++++ b/content/browser/web_contents/web_contents_impl.cc
-+@@ -768,6 +768,25 @@ RenderFrameHostManager* WebContentsImpl::GetRenderManagerForTesting() {
-+   return GetRenderManager();
-+ }
-+
-++void SendMessageToFrameTreeWebUIs(RenderFrameHostImpl* parent_frame_host,
-++                                  const IPC::Message& message,
-++                                  int& dispatch_count) {
-++  // Get the web ui or the pending one if it's not yet commited.
-++  WebUIImpl* web_ui = parent_frame_host->web_ui()
-++      ? parent_frame_host->web_ui()
-++      : parent_frame_host->pending_web_ui();
-++  if (web_ui && web_ui->OnMessageReceived(message, parent_frame_host)) {
-++    ++dispatch_count;
-++  }
-++
-++  size_t child_count = parent_frame_host->frame_tree_node()->child_count();
-++  for (size_t i = 0; i < child_count; ++i) {
-++    RenderFrameHostImpl* sub_frame_host =
-++        parent_frame_host->frame_tree_node()->child_at(i)->current_frame_host();
-++    SendMessageToFrameTreeWebUIs(sub_frame_host, message, dispatch_count);
-++  }
-++}
-++
-+ bool WebContentsImpl::OnMessageReceived(RenderViewHostImpl* render_view_host,
-+                                         const IPC::Message& message) {
-+   for (auto& observer : observers_) {
-+@@ -809,9 +828,10 @@ bool WebContentsImpl::OnMessageReceived(RenderViewHostImpl* render_view_host,
-+
-+ bool WebContentsImpl::OnMessageReceived(RenderFrameHostImpl* render_frame_host,
-+                                         const IPC::Message& message) {
-+-  {
-+-    WebUIImpl* web_ui = render_frame_host->web_ui();
-+-    if (web_ui && web_ui->OnMessageReceived(message, render_frame_host))
-++  int dispatch_count = 0;
-++  if (render_frame_host) {
-++    SendMessageToFrameTreeWebUIs(render_frame_host, message, dispatch_count);
-++    if (dispatch_count > 0)
-+       return true;
-+   }
-+
-+@@ -5021,8 +5043,9 @@ NavigationControllerImpl& WebContentsImpl::GetControllerForRenderManager() {
-+ }
-+ 
-+ std::unique_ptr<WebUIImpl> WebContentsImpl::CreateWebUIForRenderFrameHost(
-+-    const GURL& url) {
-+-  return CreateWebUI(url);
-++    const GURL& url,
-++    const std::string& frame_name) {
-++  return CreateWebUI(url/*, frame_name*/);
-+ }
-+ 
-+ NavigationEntry*
-+diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
-+index 84a01a83c72a..49d0a4b547c2 100644
-+--- a/content/browser/web_contents/web_contents_impl.h
-++++ b/content/browser/web_contents/web_contents_impl.h
-+@@ -534,7 +534,8 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
-+       SiteInstance* source_site_instance) const override;
-+   void EnsureOpenerProxiesExist(RenderFrameHost* source_rfh) override;
-+   std::unique_ptr<WebUIImpl> CreateWebUIForRenderFrameHost(
-+-      const GURL& url) override;
-++      const GURL& url,
-++      const std::string& frame_name) override;
-+   void SetFocusedFrame(FrameTreeNode* node, SiteInstance* source) override;
-+   void DidCallFocus() override;
-+   RenderFrameHost* GetFocusedFrameIncludingInnerWebContents() override;
-added in remote
-  their  100644 d12c3f87753ee34c89b61cc0f38ec6ee86c13be3 patches/common/chromium/webview_cross_drag.patch
-@@ -0,0 +1,24 @@
-+diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
-+index 1bfef2c..0ba2260 100644
-+--- a/content/browser/web_contents/web_contents_view_aura.cc
-++++ b/content/browser/web_contents/web_contents_view_aura.cc
-+@@ -675,6 +675,7 @@ gfx::NativeView WebContentsViewAura::GetRenderWidgetHostViewParent() const {
-+ 
-+ bool WebContentsViewAura::IsValidDragTarget(
-+     RenderWidgetHostImpl* target_rwh) const {
-++  return true;
-+   return target_rwh->GetProcess()->GetID() == drag_start_process_id_ ||
-+       GetRenderViewHostID(web_contents_->GetRenderViewHost()) !=
-+       drag_start_view_id_;
-+diff --git a/content/browser/web_contents/web_drag_dest_mac.mm b/content/browser/web_contents/web_drag_dest_mac.mm
-+index 37ed265..814a37d 100644
-+--- a/content/browser/web_contents/web_drag_dest_mac.mm
-++++ b/content/browser/web_contents/web_drag_dest_mac.mm
-+@@ -348,6 +348,7 @@ - (void)setDragStartTrackersForProcess:(int)processID {
-+ }
-+ 
-+ - (bool)isValidDragTarget:(content::RenderWidgetHostImpl*)targetRWH {
-++  return YES;
-+   return targetRWH->GetProcess()->GetID() == dragStartProcessID_ ||
-+          GetRenderViewHostID(webContents_->GetRenderViewHost()) !=
-+              dragStartViewID_;
-added in remote
-  their  100644 d5f0e4dcfd683cea092bbe3dcd0b5e44207eb5dc patches/common/chromium/webview_reattach.patch
-@@ -0,0 +1,16 @@
-+diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-+index b2d1e63..bc2cf9a 100644
-+--- a/content/browser/web_contents/web_contents_impl.cc
-++++ b/content/browser/web_contents/web_contents_impl.cc
-+@@ -4562,6 +4562,11 @@ void WebContentsImpl::NotifyViewSwapped(RenderViewHost* old_host,
-+   for (auto& observer : observers_)
-+     observer.RenderViewHostChanged(old_host, new_host);
-+ 
-++  // If this is an inner WebContents that has swapped views, we need to reattach
-++  // it to its outer WebContents.
-++  if (node_.outer_web_contents())
-++    ReattachToOuterWebContentsFrame();
-++
-+   // Ensure that the associated embedder gets cleared after a RenderViewHost
-+   // gets swapped, so we don't reuse the same embedder next time a
-+   // RenderViewHost is attached to this WebContents.
-added in remote
-  their  100644 9b7bf67560895faf34ee88589de078ff3a23ead0 patches/common/chromium/worker_context_will_destroy.patch
-@@ -0,0 +1,74 @@
-+diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
-+index 0e554ba8467a..8e56489a5152 100644
-+--- a/content/public/renderer/content_renderer_client.h
-++++ b/content/public/renderer/content_renderer_client.h
-+@@ -351,6 +351,11 @@ class CONTENT_EXPORT ContentRendererClient {
-+   virtual void DidInitializeWorkerContextOnWorkerThread(
-+       v8::Local<v8::Context> context) {}
-+ 
-++  // Notifies that a worker context will be destroyed. This function is called
-++  // from the worker thread.
-++  virtual void WillDestroyWorkerContextOnWorkerThread(
-++      v8::Local<v8::Context> context) {}
-++
-+   // Overwrites the given URL to use an HTML5 embed if possible.
-+   // An empty URL is returned if the URL is not overriden.
-+   virtual GURL OverrideFlashEmbedWithHTML(const GURL& url);
-+diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
-+index 0affacaa0294..eca456faa640 100644
-+--- a/content/renderer/renderer_blink_platform_impl.cc
-++++ b/content/renderer/renderer_blink_platform_impl.cc
-+@@ -1402,6 +1404,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
-+   WorkerThreadRegistry::Instance()->WillStopCurrentWorkerThread();
-+ }
-+ 
-++void RendererBlinkPlatformImpl::WorkerContextWillDestroy(
-++    const v8::Local<v8::Context>& worker) {
-++  GetContentClient()->renderer()->WillDestroyWorkerContextOnWorkerThread(
-++      worker);
-++}
-++
-+ void RendererBlinkPlatformImpl::WorkerContextCreated(
-+     const v8::Local<v8::Context>& worker) {
-+   GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread(
-+diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
-+index e8a4578009d1..e9ba4e7f391f 100644
-+--- a/content/renderer/renderer_blink_platform_impl.h
-++++ b/content/renderer/renderer_blink_platform_impl.h
-+@@ -219,6 +219,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
-+   void DidStartWorkerThread() override;
-+   void WillStopWorkerThread() override;
-+   void WorkerContextCreated(const v8::Local<v8::Context>& worker) override;
-++  void WorkerContextWillDestroy(const v8::Local<v8::Context>& worker) override;
-+ 
-+   // Set the PlatformEventObserverBase in |platform_event_observers_| associated
-+   // with |type| to |observer|. If there was already an observer associated to
-+diff --git a/third_party/WebKit/Source/core/workers/WorkerThread.cpp b/third_party/WebKit/Source/core/workers/WorkerThread.cpp
-+index a522ba4dbdf7..6991078b36f5 100644
-+--- a/third_party/WebKit/Source/core/workers/WorkerThread.cpp
-++++ b/third_party/WebKit/Source/core/workers/WorkerThread.cpp
-+@@ -481,6 +481,12 @@ void WorkerThread::PrepareForShutdownOnWorkerThread() {
-+       SetExitCode(ExitCode::kGracefullyTerminated);
-+   }
-+ 
-++  {
-++    v8::HandleScope handle_scope(GetIsolate());
-++    Platform::Current()->WorkerContextWillDestroy(
-++        GlobalScope()->ScriptController()->GetContext());
-++  }
-++
-+   inspector_task_runner_->Dispose();
-+   GetWorkerReportingProxy().WillDestroyWorkerGlobalScope();
-+   probe::AllAsyncTasksCanceled(GlobalScope());
-+diff --git a/third_party/WebKit/public/platform/Platform.h b/third_party/WebKit/public/platform/Platform.h
-+index 98ecb84..0779d4a 100644
-+--- a/third_party/WebKit/public/platform/Platform.h
-++++ b/third_party/WebKit/public/platform/Platform.h
-+@@ -596,6 +596,7 @@ class BLINK_PLATFORM_EXPORT Platform {
-+   virtual void DidStartWorkerThread() {}
-+   virtual void WillStopWorkerThread() {}
-+   virtual void WorkerContextCreated(const v8::Local<v8::Context>& worker) {}
-++  virtual void WorkerContextWillDestroy(const v8::Local<v8::Context>& worker) {}
-+   virtual bool AllowScriptExtensionForServiceWorker(const WebURL& script_url) {
-+     return false;
-+   }
-added in remote
-  their  100644 59e88b8aebd951792542e538a96b5f5c37b12b53 patches/common/crashpad/.patches.yaml
-@@ -0,0 +1,8 @@
-+repo: src/third_party/crashpad/crashpad
-+patches:
-+-
-+  owners: nornagon
-+  file: http_status.patch
-+  description: |
-+    Accept all HTTP codes in [200, 300) as successful, instead of just 200.
-+    For example HockeyApp responds with 202.
-added in remote
-  their  100644 6668f8c2be82b8da233f7e3b04fffb4e99b6cd55 patches/common/crashpad/http_status.patch
-@@ -0,0 +1,54 @@
-+From 800aa10d300af0f3fe162ae586b6b1ebe0566ab4 Mon Sep 17 00:00:00 2001
-+From: Catalin Fratila <catalinf@microsoft.com>
-+Date: Fri, 19 May 2017 09:28:53 +0200
-+Subject: [PATCH] Handle everything not in [200, 300) as error. For example
-+ HockeyApp responds with 202.
-+
-+(cherry picked from commit f7c320766756a8aaa45ccbcff2945053d9f7e109)
-+(cherry picked from commit 1875fddc7e671b14d8b54068301d9648d12e9dc2)
-+(cherry picked from commit 670fb453b0c3d6ae0a0d5923f68df02464337617)
-+---
-+ util/net/http_transport_libcurl.cc | 2 +-
-+ util/net/http_transport_mac.mm     | 2 +-
-+ util/net/http_transport_win.cc     | 2 +-
-+ 3 files changed, 3 insertions(+), 3 deletions(-)
-+
-+diff --git a/util/net/http_transport_libcurl.cc b/util/net/http_transport_libcurl.cc
-+index c16a593..0e262b0 100644
-+--- a/util/net/http_transport_libcurl.cc
-++++ b/util/net/http_transport_libcurl.cc
-+@@ -338,7 +338,7 @@ bool HTTPTransportLibcurl::ExecuteSynchronously(std::string* response_body) {
-+     return false;
-+   }
-+ 
-+-  if (status != 200) {
-++  if (status < 200 || status >= 300) {
-+     LOG(ERROR) << base::StringPrintf("HTTP status %ld", status);
-+     return false;
-+   }
-+diff --git a/util/net/http_transport_mac.mm b/util/net/http_transport_mac.mm
-+index 8d5f78c..a6434c2 100644
-+--- a/util/net/http_transport_mac.mm
-++++ b/util/net/http_transport_mac.mm
-+@@ -293,7 +293,7 @@ static void Unschedule(CFReadStreamRef stream,
-+       return false;
-+     }
-+     NSInteger http_status = [http_response statusCode];
-+-    if (http_status != 200) {
-++    if (http_status < 200 || http_status >= 300) {
-+       LOG(ERROR) << base::StringPrintf("HTTP status %ld",
-+                                        implicit_cast<long>(http_status));
-+       return false;
-+diff --git a/util/net/http_transport_win.cc b/util/net/http_transport_win.cc
-+index 18d343c..40c3061 100644
-+--- a/util/net/http_transport_win.cc
-++++ b/util/net/http_transport_win.cc
-+@@ -375,7 +375,7 @@ bool HTTPTransportWin::ExecuteSynchronously(std::string* response_body) {
-+     return false;
-+   }
-+ 
-+-  if (status_code != 200) {
-++  if (status_code < 200 || status_code >= 300) {
-+     LOG(ERROR) << base::StringPrintf("HTTP status %lu", status_code);
-+     return false;
-+   }
-added in remote
-  their  100644 49452738dcd2f4a446584fd7ba62a99e65457b67 patches/common/ffmpeg/.patches.yaml
-@@ -0,0 +1,15 @@
-+repo: src/third_party/ffmpeg
-+patches:
-+-
-+  owners: alespergl
-+  file: build_gn.patch
-+  description: |
-+    Chromium's Mac toolchain sets the "install_name" linker parameter only
-+    when "is_component_build" is true, but we want to set even if it's false,
-+    because we are making a dylib which will be distributed inside a bundle.
-+-
-+  owners: alexeykuzmin
-+  file: fix_build_on_linux_x86.patch
-+  description: |
-+    Builds on Linux x86 fail with a clang error. See https://crbug.com/796379.
-+    Once it's fixed the patch can be removed.
-added in remote
-  their  100644 9e8fb4b9ddd17f03a9787f1305327c55b5c391db patches/common/ffmpeg/build_gn.patch
-@@ -0,0 +1,15 @@
-+diff --git a/BUILD.gn b/BUILD.gn
-+index 6ebb34b68d..9d17fc30c5 100755
-+--- a/BUILD.gn
-++++ b/BUILD.gn
-+@@ -420,6 +420,10 @@ if (is_component_ffmpeg) {
-+     # So we can append below and assume they're defined.
-+     ldflags = []
-+ 
-++    if (!is_component_build && is_mac) {
-++      ldflags += [ "-Wl,-install_name,@rpath/libffmpeg.dylib" ]
-++    }
-++
-+     if (is_posix && !is_mac) {
-+       # Fixes warnings PIC relocation when building as component.
-+       ldflags += [
-added in remote
-  their  100644 52d5f756815b39a14792a624e68a2edd21be2337 patches/common/ffmpeg/fix_build_on_linux_x86.patch
-@@ -0,0 +1,13 @@
-+diff --git a/BUILD.gn b/BUILD.gn
-+index ff09111634..fa7712a3a3 100755
-+--- a/BUILD.gn
-++++ b/BUILD.gn
-+@@ -247,7 +247,7 @@ target(link_target_type, "ffmpeg_internal") {
-+     # On POSIX x86, sanitizers will fail to compiler the H264 CABAC code due to
-+     # insufficient registers unless we disable EBP usage. crbug.com/786760
-+     if (target_cpu == "x86") {
-+-      if (using_sanitizer) {
-++      if (using_sanitizer || is_electron_build) {
-+         defines += [ "HAVE_EBP_AVAILABLE=0" ]
-+       } else {
-+         defines += [ "HAVE_EBP_AVAILABLE=1" ]
-added in remote
-  their  100644 fd0c4645c3daf2be59c59118d83990096152970e patches/common/icu/.patches.yaml
-@@ -0,0 +1,10 @@
-+repo: src/third_party/icu
-+patches:
-+-
-+  owners: alespergl
-+  file: build_gn.patch
-+  description: null
-+-
-+  owners: zcbenz
-+  file: no_inline_default_constructor.patch
-+  description: null
-added in remote
-  their  100644 f9d9b74595ad330d7c2123455501fc0d36d618e8 patches/common/icu/build_gn.patch
-@@ -0,0 +1,63 @@
-+diff --git a/BUILD.gn b/BUILD.gn
-+index 76914cd7..a44d7896 100644
-+--- a/BUILD.gn
-++++ b/BUILD.gn
-+@@ -34,7 +34,7 @@ config("icu_config") {
-+     "U_ENABLE_DYLOAD=0",
-+   ]
-+ 
-+-  if (!is_component_build) {
-++  if (!is_component_build && !(is_electron_build && !is_electron_gn_build)) {
-+     defines += [ "U_STATIC_IMPLEMENTATION" ]
-+   }
-+ 
-+@@ -537,6 +537,24 @@ component("icui18n") {
-+     ":icuuc",
-+   ]
-+ 
-++  # In Electron all of ICU is in one binary, hence we must build with
-++  # U_COMBINED_IMPLEMENTATION defined.
-++  # Also, for the "static_library" configuration, keep icui18n as
-++  # a shared library so that other Chromium targets build cleanly.
-++  if (is_electron_build && !is_electron_gn_build) {
-++    defines += [ "U_COMBINED_IMPLEMENTATION" ]
-++
-++    if (!is_component_build) {
-++      static_component_type = "shared_library"
-++
-++      # Because GN already applied the wrong defaults (see the
-++      # set_defaults("component") statement in BUILDCONFIG.gn) we must reset
-++      # the configs and assign those for shared libraries.
-++      configs = []
-++      configs = default_shared_library_configs
-++    }
-++  }
-++
-+   # ICU uses RTTI, replace the default "no rtti" config.
-+   configs -= [
-+     "//build/config/compiler:no_rtti",  # ICU uses RTTI.
-+@@ -945,6 +963,24 @@ component("icuuc") {
-+     ":icudata",
-+   ]
-+ 
-++  # In Electron all of ICU is in one binary, hence we must build with
-++  # U_COMBINED_IMPLEMENTATION defined.
-++  # Also, for the "static_library" configuration, keep icuuc as
-++  # a shared library so that other Chromium targets build cleanly.
-++  if (is_electron_build && !is_electron_gn_build) {
-++    defines += [ "U_COMBINED_IMPLEMENTATION" ]
-++
-++    if (!is_component_build) {
-++      static_component_type = "shared_library"
-++
-++      # Because GN already applied the wrong defaults (see the
-++      # set_defaults("component") statement in BUILDCONFIG.gn) we must reset
-++      # the configs and assign those for shared libraries.
-++      configs = []
-++      configs = default_shared_library_configs
-++    }
-++  }
-++
-+   configs -= [
-+     "//build/config/compiler:no_rtti",  # ICU uses RTTI.
-+     "//build/config/compiler:chromium_code",
-added in remote
-  their  100644 a5ef18446eacc406e8a6348c294d16d9c21c0ee3 patches/common/icu/no_inline_default_constructor.patch
-@@ -0,0 +1,44 @@
-+diff --git a/source/common/unicode/unistr.h b/source/common/unicode/unistr.h
-+index e0ab0b9e..fe4c673b 100644
-+--- a/source/common/unicode/unistr.h
-++++ b/source/common/unicode/unistr.h
-+@@ -2957,7 +2957,7 @@ public:
-+   /** Construct an empty UnicodeString.
-+    * @stable ICU 2.0
-+    */
-+-  inline UnicodeString();
-++  UnicodeString();
-+ 
-+   /**
-+    * Construct a UnicodeString with capacity to hold <TT>capacity</TT> char16_ts
-+@@ -3915,15 +3915,6 @@ UnicodeString::getArrayStart() const {
-+     fUnion.fStackFields.fBuffer : fUnion.fFields.fArray;
-+ }
-+ 
-+-//========================================
-+-// Default constructor
-+-//========================================
-+-
-+-inline
-+-UnicodeString::UnicodeString() {
-+-  fUnion.fStackFields.fLengthAndFlags=kShortString;
-+-}
-+-
-+ inline UnicodeString::UnicodeString(const std::nullptr_t /*text*/) {
-+   fUnion.fStackFields.fLengthAndFlags=kShortString;
-+ }
-+diff --git a/source/common/unistr.cpp b/source/common/unistr.cpp
-+index 1bfb71aa..5495ee91 100644
-+--- a/source/common/unistr.cpp
-++++ b/source/common/unistr.cpp
-+@@ -146,7 +146,9 @@ UnicodeString::releaseArray() {
-+ // Constructors
-+ //========================================
-+ 
-+-// The default constructor is inline in unistr.h.
-++UnicodeString::UnicodeString() {
-++  fUnion.fStackFields.fLengthAndFlags=kShortString;
-++}
-+ 
-+ UnicodeString::UnicodeString(int32_t capacity, UChar32 c, int32_t count) {
-+   fUnion.fFields.fLengthAndFlags = 0;
-added in remote
-  their  100644 cf0b365c1dd1f0cf3a51d4cf30267cd9549fd0ee patches/common/skia/.patches.yaml
-@@ -0,0 +1,6 @@
-+repo: src/third_party/skia
-+patches:
-+-
-+  owners: alespergl
-+  file: dcheck.patch
-+  description: null
-added in remote
-  their  100644 604304295cd24a5ac7f1cb3467c891da5736d41c patches/common/skia/dcheck.patch
-@@ -0,0 +1,13 @@
-+diff --git a/include/core/SkPostConfig.h b/include/core/SkPostConfig.h
-+index c34397cde6..5a55535eeb 100644
-+--- a/include/core/SkPostConfig.h
-++++ b/include/core/SkPostConfig.h
-+@@ -18,7 +18,7 @@
-+     #ifdef NDEBUG
-+         #define SK_RELEASE
-+     #else
-+-        #define SK_DEBUG
-++        #define SK_RELEASE
-+     #endif
-+ #endif
-+ 
-added in remote
-  their  100644 b19b0587bdf8b2f483db4402ba93a274f95fc235 patches/common/v8/.patches.yaml
-@@ -0,0 +1,62 @@
-+repo: src/v8
-+patches:
-+-
-+  owners: alespergl
-+  file: build_gn.patch
-+  description: null
-+-
-+  owners: zcbenz
-+  file: array_buffer.patch
-+  description: null
-+-
-+  owners: zcbenz
-+  file: ostreams.patch
-+  description: null
-+-
-+  owners: alexeykuzmin,alespergl
-+  file: export_platform.patch
-+  description: |
-+    v8::Platform::SystemClockTimeMillis must be exported so that node::NodePlatform can call it
-+-
-+  owners: alespergl
-+  file: dcheck.patch
-+  description: null
-+-
-+  owners: nitsakh
-+  file: disable-warning-win.patch
-+  description:
-+    Disable unit test windows build warning
-+-
-+  owners: alexeykuzmin
-+  file: backport_b767cde1e7.patch
-+  description: Node 10.0.0 needs it.
-+-
-+  owners: alexeykuzmin
-+  file: backport_39d546a.patch
-+  description: Node 10.0.0 needs it.
-+-
-+  owners: alexeykuzmin
-+  file: backport_ff0a97933.patch
-+  description: Node 10.2.0 needs it.
-+-
-+  owners: alexeykuzmin
-+  file: backport_9fb02b526.patch
-+  description: Node 10.2.0 needs it.
-+-
-+  owners: alexeykuzmin
-+  file: backport_23652c5f.patch
-+  description: Node 10.2.0 needs it.
-+-
-+  owners: alexeykuzmin
-+  file: backport_b49206d.patch
-+  description: Node 10.2.0 needs it.
-+-
-+  owners: nitsakh
-+  file: backport_50206308.patch
-+  description: |
-+    Part (1/2) of backporting the array splice perf regression caused in ch66
-+-
-+  owners: nitsakh
-+  file: backport_2eb23a17.patch
-+  description: |
-+    Part (2/2) of backporting the array splice perf regression caused in ch66
-added in remote
-  their  100644 3871967d53354005e7002fd48bb7498a97680b20 patches/common/v8/array_buffer.patch
-@@ -0,0 +1,31 @@
-+diff --git a/include/v8.h b/include/v8.h
-+index 277cbd442a..49c9f7c9a6 100644
-+--- a/include/v8.h
-++++ b/include/v8.h
-+@@ -7281,6 +7281,9 @@ class V8_EXPORT Isolate {
-+   V8_DEPRECATED("CpuProfiler should be created with CpuProfiler::New call.",
-+                 CpuProfiler* GetCpuProfiler());
-+ 
-++  /** Returns the ArrayBuffer::Allocator used in this isolate. */
-++  ArrayBuffer::Allocator* GetArrayBufferAllocator();
-++
-+   /** Returns true if this isolate has a current context. */
-+   bool InContext();
-+ 
-+diff --git a/src/api.cc b/src/api.cc
-+index 8531cd5c05..fc0d96c74a 100644
-+--- a/src/api.cc
-++++ b/src/api.cc
-+@@ -8076,6 +8076,12 @@ CpuProfiler* Isolate::GetCpuProfiler() {
-+ }
-+ 
-+ 
-++ArrayBuffer::Allocator* Isolate::GetArrayBufferAllocator() {
-++  i::Isolate* isolate = reinterpret_cast<i::Isolate*>(this);
-++  return isolate->array_buffer_allocator();
-++}
-++
-++
-+ bool Isolate::InContext() {
-+   i::Isolate* isolate = reinterpret_cast<i::Isolate*>(this);
-+   return isolate->context() != nullptr;
-added in remote
-  their  100644 6aee5c1b2f32e14114b449771c86ada57f56a0a1 patches/common/v8/backport_23652c5f.patch
-@@ -0,0 +1,161 @@
-+23652c5f4cd07dd6304f78b407541c6a02caf60e
-+diff --git a/include/libplatform/v8-tracing.h b/include/libplatform/v8-tracing.h
-+index 9dcf3d7bca..e430e7c350 100644
-+--- a/include/libplatform/v8-tracing.h
-++++ b/include/libplatform/v8-tracing.h
-+@@ -112,6 +112,8 @@ class V8_PLATFORM_EXPORT TraceWriter {
-+   virtual void Flush() = 0;
-+ 
-+   static TraceWriter* CreateJSONTraceWriter(std::ostream& stream);
-++  static TraceWriter* CreateJSONTraceWriter(std::ostream& stream,
-++                                            const std::string& tag);
-+ 
-+  private:
-+   // Disallow copy and assign
-+diff --git a/src/libplatform/tracing/trace-writer.cc b/src/libplatform/tracing/trace-writer.cc
-+index 36a8783499..7bfc766469 100644
-+--- a/src/libplatform/tracing/trace-writer.cc
-++++ b/src/libplatform/tracing/trace-writer.cc
-+@@ -119,8 +119,12 @@ void JSONTraceWriter::AppendArgValue(ConvertableToTraceFormat* value) {
-+   stream_ << arg_stringified;
-+ }
-+ 
-+-JSONTraceWriter::JSONTraceWriter(std::ostream& stream) : stream_(stream) {
-+-  stream_ << "{\"traceEvents\":[";
-++JSONTraceWriter::JSONTraceWriter(std::ostream& stream)
-++    : JSONTraceWriter(stream, "traceEvents") {}
-++
-++JSONTraceWriter::JSONTraceWriter(std::ostream& stream, const std::string& tag)
-++    : stream_(stream) {
-++  stream_ << "{\"" << tag << "\":[";
-+ }
-+ 
-+ JSONTraceWriter::~JSONTraceWriter() { stream_ << "]}"; }
-+@@ -171,6 +175,11 @@ TraceWriter* TraceWriter::CreateJSONTraceWriter(std::ostream& stream) {
-+   return new JSONTraceWriter(stream);
-+ }
-+ 
-++TraceWriter* TraceWriter::CreateJSONTraceWriter(std::ostream& stream,
-++                                                const std::string& tag) {
-++  return new JSONTraceWriter(stream, tag);
-++}
-++
-+ }  // namespace tracing
-+ }  // namespace platform
-+ }  // namespace v8
-+diff --git a/src/libplatform/tracing/trace-writer.h b/src/libplatform/tracing/trace-writer.h
-+index 7e1bdc24d6..d811351389 100644
-+--- a/src/libplatform/tracing/trace-writer.h
-++++ b/src/libplatform/tracing/trace-writer.h
-+@@ -14,6 +14,7 @@ namespace tracing {
-+ class JSONTraceWriter : public TraceWriter {
-+  public:
-+   explicit JSONTraceWriter(std::ostream& stream);
-++  JSONTraceWriter(std::ostream& stream, const std::string& tag);
-+   ~JSONTraceWriter();
-+   void AppendTraceEvent(TraceObject* trace_event) override;
-+   void Flush() override;
-+diff --git a/test/cctest/libplatform/test-tracing.cc b/test/cctest/libplatform/test-tracing.cc
-+index da202057de..b949785bcf 100644
-+--- a/test/cctest/libplatform/test-tracing.cc
-++++ b/test/cctest/libplatform/test-tracing.cc
-+@@ -128,44 +128,42 @@ TEST(TestTraceBufferRingBuffer) {
-+   delete ring_buffer;
-+ }
-+ 
-+-TEST(TestJSONTraceWriter) {
-+-  std::ostringstream stream;
-+-  // Create a scope for the tracing controller to terminate the trace writer.
-+-  {
-+-    v8::Platform* old_platform = i::V8::GetCurrentPlatform();
-+-    std::unique_ptr<v8::Platform> default_platform(
-+-        v8::platform::NewDefaultPlatform());
-+-    i::V8::SetPlatformForTesting(default_platform.get());
-+-    auto tracing =
-+-        base::make_unique<v8::platform::tracing::TracingController>();
-+-    v8::platform::tracing::TracingController* tracing_controller =
-+-        tracing.get();
-+-    static_cast<v8::platform::DefaultPlatform*>(default_platform.get())
-+-        ->SetTracingController(std::move(tracing));
-+-    TraceWriter* writer = TraceWriter::CreateJSONTraceWriter(stream);
-++void PopulateJSONWriter(TraceWriter* writer) {
-++  v8::Platform* old_platform = i::V8::GetCurrentPlatform();
-++  std::unique_ptr<v8::Platform> default_platform(
-++      v8::platform::NewDefaultPlatform());
-++  i::V8::SetPlatformForTesting(default_platform.get());
-++  auto tracing = base::make_unique<v8::platform::tracing::TracingController>();
-++  v8::platform::tracing::TracingController* tracing_controller = tracing.get();
-++  static_cast<v8::platform::DefaultPlatform*>(default_platform.get())
-++      ->SetTracingController(std::move(tracing));
-+ 
-+-    TraceBuffer* ring_buffer =
-+-        TraceBuffer::CreateTraceBufferRingBuffer(1, writer);
-+-    tracing_controller->Initialize(ring_buffer);
-+-    TraceConfig* trace_config = new TraceConfig();
-+-    trace_config->AddIncludedCategory("v8-cat");
-+-    tracing_controller->StartTracing(trace_config);
-++  TraceBuffer* ring_buffer =
-++      TraceBuffer::CreateTraceBufferRingBuffer(1, writer);
-++  tracing_controller->Initialize(ring_buffer);
-++  TraceConfig* trace_config = new TraceConfig();
-++  trace_config->AddIncludedCategory("v8-cat");
-++  tracing_controller->StartTracing(trace_config);
-+ 
-+-    TraceObject trace_object;
-+-    trace_object.InitializeForTesting(
-+-        'X', tracing_controller->GetCategoryGroupEnabled("v8-cat"), "Test0",
-+-        v8::internal::tracing::kGlobalScope, 42, 123, 0, nullptr, nullptr,
-+-        nullptr, nullptr, TRACE_EVENT_FLAG_HAS_ID, 11, 22, 100, 50, 33, 44);
-+-    writer->AppendTraceEvent(&trace_object);
-+-    trace_object.InitializeForTesting(
-+-        'Y', tracing_controller->GetCategoryGroupEnabled("v8-cat"), "Test1",
-+-        v8::internal::tracing::kGlobalScope, 43, 456, 0, nullptr, nullptr,
-+-        nullptr, nullptr, 0, 55, 66, 110, 55, 77, 88);
-+-    writer->AppendTraceEvent(&trace_object);
-+-    tracing_controller->StopTracing();
-+-    i::V8::SetPlatformForTesting(old_platform);
-+-  }
-++  TraceObject trace_object;
-++  trace_object.InitializeForTesting(
-++      'X', tracing_controller->GetCategoryGroupEnabled("v8-cat"), "Test0",
-++      v8::internal::tracing::kGlobalScope, 42, 123, 0, nullptr, nullptr,
-++      nullptr, nullptr, TRACE_EVENT_FLAG_HAS_ID, 11, 22, 100, 50, 33, 44);
-++  writer->AppendTraceEvent(&trace_object);
-++  trace_object.InitializeForTesting(
-++      'Y', tracing_controller->GetCategoryGroupEnabled("v8-cat"), "Test1",
-++      v8::internal::tracing::kGlobalScope, 43, 456, 0, nullptr, nullptr,
-++      nullptr, nullptr, 0, 55, 66, 110, 55, 77, 88);
-++  writer->AppendTraceEvent(&trace_object);
-++  tracing_controller->StopTracing();
-++  i::V8::SetPlatformForTesting(old_platform);
-++}
-+ 
-++TEST(TestJSONTraceWriter) {
-++  std::ostringstream stream;
-++  TraceWriter* writer = TraceWriter::CreateJSONTraceWriter(stream);
-++  PopulateJSONWriter(writer);
-+   std::string trace_str = stream.str();
-+   std::string expected_trace_str =
-+       "{\"traceEvents\":[{\"pid\":11,\"tid\":22,\"ts\":100,\"tts\":50,"
-+@@ -177,6 +175,21 @@ TEST(TestJSONTraceWriter) {
-+   CHECK_EQ(expected_trace_str, trace_str);
-+ }
-+ 
-++TEST(TestJSONTraceWriterWithCustomtag) {
-++  std::ostringstream stream;
-++  TraceWriter* writer = TraceWriter::CreateJSONTraceWriter(stream, "customTag");
-++  PopulateJSONWriter(writer);
-++  std::string trace_str = stream.str();
-++  std::string expected_trace_str =
-++      "{\"customTag\":[{\"pid\":11,\"tid\":22,\"ts\":100,\"tts\":50,"
-++      "\"ph\":\"X\",\"cat\":\"v8-cat\",\"name\":\"Test0\",\"dur\":33,"
-++      "\"tdur\":44,\"id\":\"0x2a\",\"args\":{}},{\"pid\":55,\"tid\":66,"
-++      "\"ts\":110,\"tts\":55,\"ph\":\"Y\",\"cat\":\"v8-cat\",\"name\":"
-++      "\"Test1\",\"dur\":77,\"tdur\":88,\"args\":{}}]}";
-++
-++  CHECK_EQ(expected_trace_str, trace_str);
-++}
-++
-+ TEST(TestTracingController) {
-+   v8::Platform* old_platform = i::V8::GetCurrentPlatform();
-+   std::unique_ptr<v8::Platform> default_platform(
-added in remote
-  their  100644 7192ae7a7011e5df3ca207a377551af6b59b7a12 patches/common/v8/backport_2eb23a17.patch
-@@ -0,0 +1,1008 @@
-+From 29409d7906f3e434562c492493e7299a64ac0608 Mon Sep 17 00:00:00 2001
-+From: Sigurd Schneider <sigurds@chromium.org>
-+Date: Thu, 26 Apr 2018 18:54:18 +0200
-+Subject: [PATCH] Version 6.7.288.19 (cherry-pick)
-+
-+Merged a2126f027128df6144d83db09cd841799c6b73dd
-+
-+Reland "[builtins] Separate species protectors for Array, TypedArray, Promise"
-+
-+TBR=bmeurer@chromium.org, hablich@chromium.org
-+
-+Bug: chromium:835347
-+Cq-Include-Trybots: luci.chromium.try:linux_chromium_rel_ng
-+Change-Id: Id2ff04fb9e923ae6532d8800c2d9c770cfd945a9
-+Reviewed-on: https://chromium-review.googlesource.com/1030553
-+Reviewed-by: Sigurd Schneider <sigurds@chromium.org>
-+Cr-Commit-Position: refs/branch-heads/6.7@{#36}
-+Cr-Branched-From: 8457e810efd34381448d51d93f50079cf1f6a812-refs/heads/6.7.288@{#2}
-+Cr-Branched-From: e921be5c4f2c6407936bde750992dedbf47c1016-refs/heads/master@{#52547}
-+(cherry picked from commit 2eb23a17cc9af7fb9c7a64d0c9c794772642d77d)
-+---
-+ src/builtins/builtins-array-gen.cc                 |  6 +-
-+ src/builtins/builtins-array.cc                     |  4 +-
-+ src/builtins/builtins-promise-gen.cc               |  4 +-
-+ src/builtins/builtins-typedarray-gen.cc            |  2 +-
-+ src/code-stub-assembler.cc                         | 20 ++++-
-+ src/code-stub-assembler.h                          | 94 ++++++++++++----------
-+ src/compiler/js-call-reducer.cc                    | 24 +++---
-+ src/heap/heap.h                                    |  8 +-
-+ src/heap/setup-heap-internal.cc                    | 10 ++-
-+ src/isolate-inl.h                                  | 16 +++-
-+ src/isolate.cc                                     | 27 +++++--
-+ src/isolate.h                                      |  8 +-
-+ src/lookup.cc                                      | 64 ++++++++++-----
-+ src/objects.cc                                     |  2 +-
-+ src/runtime/runtime-array.cc                       |  2 +-
-+ src/runtime/runtime-test.cc                        | 17 +++-
-+ src/runtime/runtime.h                              |  4 +-
-+ test/cctest/test-typedarrays.cc                    |  6 +-
-+ .../es6/array-species-constructor-accessor.js      |  2 +-
-+ .../es6/array-species-constructor-delete.js        |  2 +-
-+ test/mjsunit/es6/array-species-constructor.js      |  2 +-
-+ test/mjsunit/es6/array-species-delete.js           |  2 +-
-+ test/mjsunit/es6/array-species-modified.js         |  2 +-
-+ .../es6/array-species-parent-constructor.js        |  2 +-
-+ test/mjsunit/es6/array-species-proto.js            |  2 +-
-+ test/mjsunit/harmony/regexp-named-captures.js      | 22 ++---
-+ test/mjsunit/keyed-store-generic.js                |  4 +-
-+ tools/v8heapconst.py                               | 57 ++++++-------
-+ 28 files changed, 263 insertions(+), 152 deletions(-)
-+
-+diff --git a/src/builtins/builtins-array-gen.cc b/src/builtins/builtins-array-gen.cc
-+index 52a6222882..e44f6cddcc 100644
-+--- a/src/builtins/builtins-array-gen.cc
-++++ b/src/builtins/builtins-array-gen.cc
-+@@ -807,7 +807,7 @@ Node* ArrayBuiltinsAssembler::FindProcessor(Node* k_value, Node* k) {
-+     GotoIfNot(IsPrototypeInitialArrayPrototype(context(), original_map),
-+               &runtime);
-+ 
-+-    Node* species_protector = SpeciesProtectorConstant();
-++    Node* species_protector = ArraySpeciesProtectorConstant();
-+     Node* value =
-+         LoadObjectField(species_protector, PropertyCell::kValueOffset);
-+     TNode<Smi> const protector_invalid =
-+@@ -853,7 +853,7 @@ Node* ArrayBuiltinsAssembler::FindProcessor(Node* k_value, Node* k) {
-+     GotoIfNot(IsPrototypeInitialArrayPrototype(context(), original_map),
-+               &runtime);
-+ 
-+-    Node* species_protector = SpeciesProtectorConstant();
-++    Node* species_protector = ArraySpeciesProtectorConstant();
-+     Node* value =
-+         LoadObjectField(species_protector, PropertyCell::kValueOffset);
-+     Node* const protector_invalid = SmiConstant(Isolate::kProtectorInvalid);
-+@@ -1146,7 +1146,7 @@ class ArrayPrototypeSliceCodeStubAssembler : public CodeStubAssembler {
-+ 
-+     GotoIf(IsNoElementsProtectorCellInvalid(), slow);
-+ 
-+-    GotoIf(IsSpeciesProtectorCellInvalid(), slow);
-++    GotoIf(IsArraySpeciesProtectorCellInvalid(), slow);
-+ 
-+     // Bailout if receiver has slow elements.
-+     Node* elements_kind = LoadMapElementsKind(map);
-+diff --git a/src/builtins/builtins-array.cc b/src/builtins/builtins-array.cc
-+index 7e3f948cbe..15a77e5eae 100644
-+--- a/src/builtins/builtins-array.cc
-++++ b/src/builtins/builtins-array.cc
-+@@ -248,7 +248,7 @@ BUILTIN(ArraySplice) {
-+           // If this is a subclass of Array, then call out to JS.
-+           !Handle<JSArray>::cast(receiver)->HasArrayPrototype(isolate) ||
-+           // If anything with @@species has been messed with, call out to JS.
-+-          !isolate->IsSpeciesLookupChainIntact())) {
-++          !isolate->IsArraySpeciesLookupChainIntact())) {
-+     return CallJsIntrinsic(isolate, isolate->array_splice(), args);
-+   }
-+   Handle<JSArray> array = Handle<JSArray>::cast(receiver);
-+@@ -1118,7 +1118,7 @@ BUILTIN(ArrayConcat) {
-+   // Avoid a real species read to avoid extra lookups to the array constructor
-+   if (V8_LIKELY(receiver->IsJSArray() &&
-+                 Handle<JSArray>::cast(receiver)->HasArrayPrototype(isolate) &&
-+-                isolate->IsSpeciesLookupChainIntact())) {
-++                isolate->IsArraySpeciesLookupChainIntact())) {
-+     if (Fast_ArrayConcat(isolate, &args).ToHandle(&result_array)) {
-+       return *result_array;
-+     }
-+diff --git a/src/builtins/builtins-promise-gen.cc b/src/builtins/builtins-promise-gen.cc
-+index 032d0ef100..4d61f3eada 100644
-+--- a/src/builtins/builtins-promise-gen.cc
-++++ b/src/builtins/builtins-promise-gen.cc
-+@@ -536,7 +536,7 @@ void PromiseBuiltinsAssembler::BranchIfPromiseSpeciesLookupChainIntact(
-+   GotoIfForceSlowPath(if_slow);
-+   GotoIfNot(WordEqual(LoadMapPrototype(promise_map), promise_prototype),
-+             if_slow);
-+-  Branch(IsSpeciesProtectorCellInvalid(), if_slow, if_fast);
-++  Branch(IsPromiseSpeciesProtectorCellInvalid(), if_slow, if_fast);
-+ }
-+ 
-+ void PromiseBuiltinsAssembler::BranchIfPromiseThenLookupChainIntact(
-+@@ -1174,7 +1174,7 @@ TF_BUILTIN(PromiseResolve, PromiseBuiltinsAssembler) {
-+       LoadContextElement(native_context, Context::PROMISE_FUNCTION_INDEX);
-+   GotoIfNot(WordEqual(LoadMapPrototype(value_map), promise_prototype),
-+             &if_slow_constructor);
-+-  GotoIf(IsSpeciesProtectorCellInvalid(), &if_slow_constructor);
-++  GotoIf(IsPromiseSpeciesProtectorCellInvalid(), &if_slow_constructor);
-+ 
-+   // If the {constructor} is the Promise function, we just immediately
-+   // return the {value} here and don't bother wrapping it into a
-+diff --git a/src/builtins/builtins-typedarray-gen.cc b/src/builtins/builtins-typedarray-gen.cc
-+index 2a4f23b003..2316c7e8ca 100644
-+--- a/src/builtins/builtins-typedarray-gen.cc
-++++ b/src/builtins/builtins-typedarray-gen.cc
-+@@ -829,7 +829,7 @@ TNode<Object> TypedArrayBuiltinsAssembler::TypedArraySpeciesConstructor(
-+   var_constructor = default_constructor;
-+   Node* map = LoadMap(exemplar);
-+   GotoIfNot(IsPrototypeTypedArrayPrototype(context, map), &slow);
-+-  Branch(IsSpeciesProtectorCellInvalid(), &slow, &done);
-++  Branch(IsTypedArraySpeciesProtectorCellInvalid(), &slow, &done);
-+ 
-+   BIND(&slow);
-+   var_constructor =
-+diff --git a/src/code-stub-assembler.cc b/src/code-stub-assembler.cc
-+index d3c81d0e81..f1ac210ce7 100644
-+--- a/src/code-stub-assembler.cc
-++++ b/src/code-stub-assembler.cc
-+@@ -997,7 +997,7 @@ void CodeStubAssembler::BranchIfFastJSArray(Node* object, Node* context,
-+ void CodeStubAssembler::BranchIfFastJSArrayForCopy(Node* object, Node* context,
-+                                                    Label* if_true,
-+                                                    Label* if_false) {
-+-  GotoIf(IsSpeciesProtectorCellInvalid(), if_false);
-++  GotoIf(IsArraySpeciesProtectorCellInvalid(), if_false);
-+   BranchIfFastJSArray(object, context, if_true, if_false);
-+ }
-+ 
-+@@ -4354,9 +4354,23 @@ Node* CodeStubAssembler::IsPromiseThenProtectorCellInvalid() {
-+   return WordEqual(cell_value, invalid);
-+ }
-+ 
-+-Node* CodeStubAssembler::IsSpeciesProtectorCellInvalid() {
-++Node* CodeStubAssembler::IsArraySpeciesProtectorCellInvalid() {
-+   Node* invalid = SmiConstant(Isolate::kProtectorInvalid);
-+-  Node* cell = LoadRoot(Heap::kSpeciesProtectorRootIndex);
-++  Node* cell = LoadRoot(Heap::kArraySpeciesProtectorRootIndex);
-++  Node* cell_value = LoadObjectField(cell, PropertyCell::kValueOffset);
-++  return WordEqual(cell_value, invalid);
-++}
-++
-++Node* CodeStubAssembler::IsTypedArraySpeciesProtectorCellInvalid() {
-++  Node* invalid = SmiConstant(Isolate::kProtectorInvalid);
-++  Node* cell = LoadRoot(Heap::kTypedArraySpeciesProtectorRootIndex);
-++  Node* cell_value = LoadObjectField(cell, PropertyCell::kValueOffset);
-++  return WordEqual(cell_value, invalid);
-++}
-++
-++Node* CodeStubAssembler::IsPromiseSpeciesProtectorCellInvalid() {
-++  Node* invalid = SmiConstant(Isolate::kProtectorInvalid);
-++  Node* cell = LoadRoot(Heap::kPromiseSpeciesProtectorRootIndex);
-+   Node* cell_value = LoadObjectField(cell, PropertyCell::kValueOffset);
-+   return WordEqual(cell_value, invalid);
-+ }
-+diff --git a/src/code-stub-assembler.h b/src/code-stub-assembler.h
-+index 8fca0b667f..47394a56ae 100644
-+--- a/src/code-stub-assembler.h
-++++ b/src/code-stub-assembler.h
-+@@ -22,48 +22,54 @@ class StubCache;
-+ 
-+ enum class PrimitiveType { kBoolean, kNumber, kString, kSymbol };
-+ 
-+-#define HEAP_CONSTANT_LIST(V)                                                 \
-+-  V(AccessorInfoMap, accessor_info_map, AccessorInfoMap)                      \
-+-  V(AccessorPairMap, accessor_pair_map, AccessorPairMap)                      \
-+-  V(AllocationSiteMap, allocation_site_map, AllocationSiteMap)                \
-+-  V(BooleanMap, boolean_map, BooleanMap)                                      \
-+-  V(CodeMap, code_map, CodeMap)                                               \
-+-  V(EmptyPropertyDictionary, empty_property_dictionary,                       \
-+-    EmptyPropertyDictionary)                                                  \
-+-  V(EmptyFixedArray, empty_fixed_array, EmptyFixedArray)                      \
-+-  V(EmptySlowElementDictionary, empty_slow_element_dictionary,                \
-+-    EmptySlowElementDictionary)                                               \
-+-  V(empty_string, empty_string, EmptyString)                                  \
-+-  V(EmptyWeakCell, empty_weak_cell, EmptyWeakCell)                            \
-+-  V(FalseValue, false_value, False)                                           \
-+-  V(FeedbackVectorMap, feedback_vector_map, FeedbackVectorMap)                \
-+-  V(FixedArrayMap, fixed_array_map, FixedArrayMap)                            \
-+-  V(FixedCOWArrayMap, fixed_cow_array_map, FixedCOWArrayMap)                  \
-+-  V(FixedDoubleArrayMap, fixed_double_array_map, FixedDoubleArrayMap)         \
-+-  V(FunctionTemplateInfoMap, function_template_info_map,                      \
-+-    FunctionTemplateInfoMap)                                                  \
-+-  V(GlobalPropertyCellMap, global_property_cell_map, PropertyCellMap)         \
-+-  V(has_instance_symbol, has_instance_symbol, HasInstanceSymbol)              \
-+-  V(HeapNumberMap, heap_number_map, HeapNumberMap)                            \
-+-  V(length_string, length_string, LengthString)                               \
-+-  V(ManyClosuresCellMap, many_closures_cell_map, ManyClosuresCellMap)         \
-+-  V(MetaMap, meta_map, MetaMap)                                               \
-+-  V(MinusZeroValue, minus_zero_value, MinusZero)                              \
-+-  V(MutableHeapNumberMap, mutable_heap_number_map, MutableHeapNumberMap)      \
-+-  V(NanValue, nan_value, Nan)                                                 \
-+-  V(NoClosuresCellMap, no_closures_cell_map, NoClosuresCellMap)               \
-+-  V(NullValue, null_value, Null)                                              \
-+-  V(OneClosureCellMap, one_closure_cell_map, OneClosureCellMap)               \
-+-  V(prototype_string, prototype_string, PrototypeString)                      \
-+-  V(SpeciesProtector, species_protector, SpeciesProtector)                    \
-+-  V(StoreHandler0Map, store_handler0_map, StoreHandler0Map)                   \
-+-  V(SymbolMap, symbol_map, SymbolMap)                                         \
-+-  V(TheHoleValue, the_hole_value, TheHole)                                    \
-+-  V(TrueValue, true_value, True)                                              \
-+-  V(Tuple2Map, tuple2_map, Tuple2Map)                                         \
-+-  V(Tuple3Map, tuple3_map, Tuple3Map)                                         \
-+-  V(UndefinedValue, undefined_value, Undefined)                               \
-+-  V(WeakCellMap, weak_cell_map, WeakCellMap)                                  \
-++#define HEAP_CONSTANT_LIST(V)                                              \
-++  V(AccessorInfoMap, accessor_info_map, AccessorInfoMap)                   \
-++  V(AccessorPairMap, accessor_pair_map, AccessorPairMap)                   \
-++  V(AllocationSiteMap, allocation_site_map, AllocationSiteMap)             \
-++  V(BooleanMap, boolean_map, BooleanMap)                                   \
-++  V(CodeMap, code_map, CodeMap)                                            \
-++  V(EmptyPropertyDictionary, empty_property_dictionary,                    \
-++    EmptyPropertyDictionary)                                               \
-++  V(EmptyFixedArray, empty_fixed_array, EmptyFixedArray)                   \
-++  V(EmptySlowElementDictionary, empty_slow_element_dictionary,             \
-++    EmptySlowElementDictionary)                                            \
-++  V(empty_string, empty_string, EmptyString)                               \
-++  V(EmptyWeakCell, empty_weak_cell, EmptyWeakCell)                         \
-++  V(FalseValue, false_value, False)                                        \
-++  V(FeedbackVectorMap, feedback_vector_map, FeedbackVectorMap)             \
-++  V(FixedArrayMap, fixed_array_map, FixedArrayMap)                         \
-++  V(FixedCOWArrayMap, fixed_cow_array_map, FixedCOWArrayMap)               \
-++  V(FixedDoubleArrayMap, fixed_double_array_map, FixedDoubleArrayMap)      \
-++  V(FunctionTemplateInfoMap, function_template_info_map,                   \
-++    FunctionTemplateInfoMap)                                               \
-++  V(GlobalPropertyCellMap, global_property_cell_map, PropertyCellMap)      \
-++  V(has_instance_symbol, has_instance_symbol, HasInstanceSymbol)           \
-++  V(HeapNumberMap, heap_number_map, HeapNumberMap)                         \
-++  V(iterator_symbol, iterator_symbol, IteratorSymbol)                      \
-++  V(length_string, length_string, LengthString)                            \
-++  V(ManyClosuresCellMap, many_closures_cell_map, ManyClosuresCellMap)      \
-++  V(MetaMap, meta_map, MetaMap)                                            \
-++  V(MinusZeroValue, minus_zero_value, MinusZero)                           \
-++  V(MutableHeapNumberMap, mutable_heap_number_map, MutableHeapNumberMap)   \
-++  V(NanValue, nan_value, Nan)                                              \
-++  V(NoClosuresCellMap, no_closures_cell_map, NoClosuresCellMap)            \
-++  V(NullValue, null_value, Null)                                           \
-++  V(OneClosureCellMap, one_closure_cell_map, OneClosureCellMap)            \
-++  V(prototype_string, prototype_string, PrototypeString)                   \
-++  V(ArraySpeciesProtector, array_species_protector, ArraySpeciesProtector) \
-++  V(TypedArraySpeciesProtector, typed_array_species_protector,             \
-++    TypedArraySpeciesProtector)                                            \
-++  V(PromiseSpeciesProtector, promise_species_protector,                    \
-++    PromiseSpeciesProtector)                                               \
-++  V(StoreHandler0Map, store_handler0_map, StoreHandler0Map)                \
-++  V(SymbolMap, symbol_map, SymbolMap)                                      \
-++  V(TheHoleValue, the_hole_value, TheHole)                                 \
-++  V(TransitionArrayMap, transition_array_map, TransitionArrayMap)          \
-++  V(TrueValue, true_value, True)                                           \
-++  V(Tuple2Map, tuple2_map, Tuple2Map)                                      \
-++  V(Tuple3Map, tuple3_map, Tuple3Map)                                      \
-++  V(UndefinedValue, undefined_value, Undefined)                            \
-++  V(WeakCellMap, weak_cell_map, WeakCellMap)                               \
-+   V(SharedFunctionInfoMap, shared_function_info_map, SharedFunctionInfoMap)
-+ 
-+ // Returned from IteratorBuiltinsAssembler::GetIterator(). Struct is declared
-+@@ -1187,7 +1193,9 @@ class V8_EXPORT_PRIVATE CodeStubAssembler : public compiler::CodeAssembler {
-+   }
-+ 
-+   Node* IsPromiseThenProtectorCellInvalid();
-+-  Node* IsSpeciesProtectorCellInvalid();
-++  Node* IsArraySpeciesProtectorCellInvalid();
-++  Node* IsTypedArraySpeciesProtectorCellInvalid();
-++  Node* IsPromiseSpeciesProtectorCellInvalid();
-+ 
-+   // True iff |object| is a Smi or a HeapNumber.
-+   Node* IsNumber(Node* object);
-+diff --git a/src/compiler/js-call-reducer.cc b/src/compiler/js-call-reducer.cc
-+index 417191c680..66ef88e650 100644
-+--- a/src/compiler/js-call-reducer.cc
-++++ b/src/compiler/js-call-reducer.cc
-+@@ -1453,7 +1453,7 @@ Reduction JSCallReducer::ReduceArrayMap(Node* node,
-+   if (result == NodeProperties::kNoReceiverMaps) return NoChange();
-+ 
-+   // Ensure that any changes to the Array species constructor cause deopt.
-+-  if (!isolate()->IsSpeciesLookupChainIntact()) return NoChange();
-++  if (!isolate()->IsArraySpeciesLookupChainIntact()) return NoChange();
-+ 
-+   const ElementsKind kind = receiver_maps[0]->elements_kind();
-+ 
-+@@ -1464,7 +1464,7 @@ Reduction JSCallReducer::ReduceArrayMap(Node* node,
-+     if (receiver_map->elements_kind() != kind) return NoChange();
-+   }
-+ 
-+-  dependencies()->AssumePropertyCell(factory()->species_protector());
-++  dependencies()->AssumePropertyCell(factory()->array_species_protector());
-+ 
-+   Handle<JSFunction> handle_constructor(
-+       JSFunction::cast(
-+@@ -1653,7 +1653,7 @@ Reduction JSCallReducer::ReduceArrayFilter(Node* node,
-+   if (result == NodeProperties::kNoReceiverMaps) return NoChange();
-+ 
-+   // And ensure that any changes to the Array species constructor cause deopt.
-+-  if (!isolate()->IsSpeciesLookupChainIntact()) return NoChange();
-++  if (!isolate()->IsArraySpeciesLookupChainIntact()) return NoChange();
-+ 
-+   const ElementsKind kind = receiver_maps[0]->elements_kind();
-+   // The output array is packed (filter doesn't visit holes).
-+@@ -1668,7 +1668,7 @@ Reduction JSCallReducer::ReduceArrayFilter(Node* node,
-+     if (receiver_map->elements_kind() != kind) return NoChange();
-+   }
-+ 
-+-  dependencies()->AssumePropertyCell(factory()->species_protector());
-++  dependencies()->AssumePropertyCell(factory()->array_species_protector());
-+ 
-+   Handle<Map> initial_map(
-+       Map::cast(native_context()->GetInitialJSArrayMap(packed_kind)));
-+@@ -2245,7 +2245,7 @@ Reduction JSCallReducer::ReduceArrayEvery(Node* node,
-+   if (result == NodeProperties::kNoReceiverMaps) return NoChange();
-+ 
-+   // And ensure that any changes to the Array species constructor cause deopt.
-+-  if (!isolate()->IsSpeciesLookupChainIntact()) return NoChange();
-++  if (!isolate()->IsArraySpeciesLookupChainIntact()) return NoChange();
-+ 
-+   const ElementsKind kind = receiver_maps[0]->elements_kind();
-+ 
-+@@ -2256,7 +2256,7 @@ Reduction JSCallReducer::ReduceArrayEvery(Node* node,
-+     if (receiver_map->elements_kind() != kind) return NoChange();
-+   }
-+ 
-+-  dependencies()->AssumePropertyCell(factory()->species_protector());
-++  dependencies()->AssumePropertyCell(factory()->array_species_protector());
-+ 
-+   // If we have unreliable maps, we need a map check.
-+   if (result == NodeProperties::kUnreliableReceiverMaps) {
-+@@ -2465,7 +2465,7 @@ Reduction JSCallReducer::ReduceArraySome(Node* node,
-+   if (result == NodeProperties::kNoReceiverMaps) return NoChange();
-+ 
-+   // And ensure that any changes to the Array species constructor cause deopt.
-+-  if (!isolate()->IsSpeciesLookupChainIntact()) return NoChange();
-++  if (!isolate()->IsArraySpeciesLookupChainIntact()) return NoChange();
-+ 
-+   if (receiver_maps.size() == 0) return NoChange();
-+ 
-+@@ -2478,7 +2478,7 @@ Reduction JSCallReducer::ReduceArraySome(Node* node,
-+     if (receiver_map->elements_kind() != kind) return NoChange();
-+   }
-+ 
-+-  dependencies()->AssumePropertyCell(factory()->species_protector());
-++  dependencies()->AssumePropertyCell(factory()->array_species_protector());
-+ 
-+   Node* k = jsgraph()->ZeroConstant();
-+ 
-+@@ -4997,7 +4997,7 @@ Reduction JSCallReducer::ReducePromisePrototypeFinally(Node* node) {
-+   // lookup of "constructor" on JSPromise instances, whoch [[Prototype]] is
-+   // the initial %PromisePrototype%, and the Symbol.species lookup on the
-+   // %PromisePrototype%.
-+-  if (!isolate()->IsSpeciesLookupChainIntact()) return NoChange();
-++  if (!isolate()->IsPromiseSpeciesLookupChainIntact()) return NoChange();
-+ 
-+   // Check if we know something about {receiver} already.
-+   ZoneHandleSet<Map> receiver_maps;
-+@@ -5018,7 +5018,7 @@ Reduction JSCallReducer::ReducePromisePrototypeFinally(Node* node) {
-+   // Add a code dependency on the necessary protectors.
-+   dependencies()->AssumePropertyCell(factory()->promise_hook_protector());
-+   dependencies()->AssumePropertyCell(factory()->promise_then_protector());
-+-  dependencies()->AssumePropertyCell(factory()->species_protector());
-++  dependencies()->AssumePropertyCell(factory()->promise_species_protector());
-+ 
-+   // If the {receiver_maps} aren't reliable, we need to repeat the
-+   // map check here, guarded by the CALL_IC.
-+@@ -5144,7 +5144,7 @@ Reduction JSCallReducer::ReducePromisePrototypeThen(Node* node) {
-+   // guards the "constructor" lookup on all JSPromise instances and the
-+   // initial Promise.prototype, as well as the  Symbol.species lookup on
-+   // the Promise constructor.
-+-  if (!isolate()->IsSpeciesLookupChainIntact()) return NoChange();
-++  if (!isolate()->IsPromiseSpeciesLookupChainIntact()) return NoChange();
-+ 
-+   // Check if we know something about {receiver} already.
-+   ZoneHandleSet<Map> receiver_maps;
-+@@ -5166,7 +5166,7 @@ Reduction JSCallReducer::ReducePromisePrototypeThen(Node* node) {
-+ 
-+   // Add a code dependency on the necessary protectors.
-+   dependencies()->AssumePropertyCell(factory()->promise_hook_protector());
-+-  dependencies()->AssumePropertyCell(factory()->species_protector());
-++  dependencies()->AssumePropertyCell(factory()->promise_species_protector());
-+ 
-+   // If the {receiver_maps} aren't reliable, we need to repeat the
-+   // map check here, guarded by the CALL_IC.
-+diff --git a/src/heap/heap.h b/src/heap/heap.h
-+index 63bcfb2990..2bb2efc1be 100644
-+--- a/src/heap/heap.h
-++++ b/src/heap/heap.h
-+@@ -213,7 +213,9 @@ using v8::MemoryPressureLevel;
-+   V(Cell, array_constructor_protector, ArrayConstructorProtector)              \
-+   V(PropertyCell, no_elements_protector, NoElementsProtector)                  \
-+   V(Cell, is_concat_spreadable_protector, IsConcatSpreadableProtector)         \
-+-  V(PropertyCell, species_protector, SpeciesProtector)                         \
-++  V(PropertyCell, array_species_protector, ArraySpeciesProtector)              \
-++  V(PropertyCell, typed_array_species_protector, TypedArraySpeciesProtector)   \
-++  V(PropertyCell, promise_species_protector, PromiseSpeciesProtector)          \
-+   V(Cell, string_length_protector, StringLengthProtector)                      \
-+   V(Cell, fast_array_iteration_protector, FastArrayIterationProtector)         \
-+   V(PropertyCell, array_iterator_protector, ArrayIteratorProtector)            \
-+@@ -378,7 +380,9 @@ using v8::MemoryPressureLevel;
-+   V(SloppyArgumentsElementsMap)         \
-+   V(SmallOrderedHashMapMap)             \
-+   V(SmallOrderedHashSetMap)             \
-+-  V(SpeciesProtector)                   \
-++  V(ArraySpeciesProtector)              \
-++  V(TypedArraySpeciesProtector)         \
-++  V(PromiseSpeciesProtector)            \
-+   V(StaleRegister)                      \
-+   V(StringLengthProtector)              \
-+   V(StringTableMap)                     \
-+diff --git a/src/heap/setup-heap-internal.cc b/src/heap/setup-heap-internal.cc
-+index 8a7aca1694..f854594daa 100644
-+--- a/src/heap/setup-heap-internal.cc
-++++ b/src/heap/setup-heap-internal.cc
-+@@ -633,7 +633,15 @@ void Heap::CreateInitialObjects() {
-+ 
-+   cell = factory->NewPropertyCell(factory->empty_string());
-+   cell->set_value(Smi::FromInt(Isolate::kProtectorValid));
-+-  set_species_protector(*cell);
-++  set_array_species_protector(*cell);
-++
-++  cell = factory->NewPropertyCell(factory->empty_string());
-++  cell->set_value(Smi::FromInt(Isolate::kProtectorValid));
-++  set_typed_array_species_protector(*cell);
-++
-++  cell = factory->NewPropertyCell(factory->empty_string());
-++  cell->set_value(Smi::FromInt(Isolate::kProtectorValid));
-++  set_promise_species_protector(*cell);
-+ 
-+   Handle<Cell> string_length_overflow_cell = factory->NewCell(
-+       handle(Smi::FromInt(Isolate::kProtectorValid), isolate()));
-+diff --git a/src/isolate-inl.h b/src/isolate-inl.h
-+index 9da1aa4110..7b4df21ad3 100644
-+--- a/src/isolate-inl.h
-++++ b/src/isolate-inl.h
-+@@ -131,7 +131,7 @@ bool Isolate::IsArrayConstructorIntact() {
-+   return array_constructor_cell->value() == Smi::FromInt(kProtectorValid);
-+ }
-+ 
-+-bool Isolate::IsSpeciesLookupChainIntact() {
-++bool Isolate::IsArraySpeciesLookupChainIntact() {
-+   // Note: It would be nice to have debug checks to make sure that the
-+   // species protector is accurate, but this would be hard to do for most of
-+   // what the protector stands for:
-+@@ -144,7 +144,19 @@ bool Isolate::IsSpeciesLookupChainIntact() {
-+   // done here. In place, there are mjsunit tests harmony/array-species* which
-+   // ensure that behavior is correct in various invalid protector cases.
-+ 
-+-  PropertyCell* species_cell = heap()->species_protector();
-++  PropertyCell* species_cell = heap()->array_species_protector();
-++  return species_cell->value()->IsSmi() &&
-++         Smi::ToInt(species_cell->value()) == kProtectorValid;
-++}
-++
-++bool Isolate::IsTypedArraySpeciesLookupChainIntact() {
-++  PropertyCell* species_cell = heap()->typed_array_species_protector();
-++  return species_cell->value()->IsSmi() &&
-++         Smi::ToInt(species_cell->value()) == kProtectorValid;
-++}
-++
-++bool Isolate::IsPromiseSpeciesLookupChainIntact() {
-++  PropertyCell* species_cell = heap()->promise_species_protector();
-+   return species_cell->value()->IsSmi() &&
-+          Smi::ToInt(species_cell->value()) == kProtectorValid;
-+ }
-+diff --git a/src/isolate.cc b/src/isolate.cc
-+index 21d932efea..7ed8e045b1 100644
-+--- a/src/isolate.cc
-++++ b/src/isolate.cc
-+@@ -3512,11 +3512,28 @@ void Isolate::InvalidateArrayConstructorProtector() {
-+   DCHECK(!IsArrayConstructorIntact());
-+ }
-+ 
-+-void Isolate::InvalidateSpeciesProtector() {
-+-  DCHECK(factory()->species_protector()->value()->IsSmi());
-+-  DCHECK(IsSpeciesLookupChainIntact());
-+-  factory()->species_protector()->set_value(Smi::FromInt(kProtectorInvalid));
-+-  DCHECK(!IsSpeciesLookupChainIntact());
-++void Isolate::InvalidateArraySpeciesProtector() {
-++  DCHECK(factory()->array_species_protector()->value()->IsSmi());
-++  DCHECK(IsArraySpeciesLookupChainIntact());
-++  factory()->array_species_protector()->set_value(
-++      Smi::FromInt(kProtectorInvalid));
-++  DCHECK(!IsArraySpeciesLookupChainIntact());
-++}
-++
-++void Isolate::InvalidateTypedArraySpeciesProtector() {
-++  DCHECK(factory()->typed_array_species_protector()->value()->IsSmi());
-++  DCHECK(IsTypedArraySpeciesLookupChainIntact());
-++  factory()->typed_array_species_protector()->set_value(
-++      Smi::FromInt(kProtectorInvalid));
-++  DCHECK(!IsTypedArraySpeciesLookupChainIntact());
-++}
-++
-++void Isolate::InvalidatePromiseSpeciesProtector() {
-++  DCHECK(factory()->promise_species_protector()->value()->IsSmi());
-++  DCHECK(IsPromiseSpeciesLookupChainIntact());
-++  factory()->promise_species_protector()->set_value(
-++      Smi::FromInt(kProtectorInvalid));
-++  DCHECK(!IsPromiseSpeciesLookupChainIntact());
-+ }
-+ 
-+ void Isolate::InvalidateStringLengthOverflowProtector() {
-+diff --git a/src/isolate.h b/src/isolate.h
-+index 3f03e65fea..61814f6605 100644
-+--- a/src/isolate.h
-++++ b/src/isolate.h
-+@@ -1076,7 +1076,9 @@ class Isolate {
-+   bool IsNoElementsProtectorIntact(Context* context);
-+   bool IsNoElementsProtectorIntact();
-+ 
-+-  inline bool IsSpeciesLookupChainIntact();
-++  inline bool IsArraySpeciesLookupChainIntact();
-++  inline bool IsTypedArraySpeciesLookupChainIntact();
-++  inline bool IsPromiseSpeciesLookupChainIntact();
-+   bool IsIsConcatSpreadableLookupChainIntact();
-+   bool IsIsConcatSpreadableLookupChainIntact(JSReceiver* receiver);
-+   inline bool IsStringLengthOverflowIntact();
-+@@ -1112,7 +1114,9 @@ class Isolate {
-+     UpdateNoElementsProtectorOnSetElement(object);
-+   }
-+   void InvalidateArrayConstructorProtector();
-+-  void InvalidateSpeciesProtector();
-++  void InvalidateArraySpeciesProtector();
-++  void InvalidateTypedArraySpeciesProtector();
-++  void InvalidatePromiseSpeciesProtector();
-+   void InvalidateIsConcatSpreadableProtector();
-+   void InvalidateStringLengthOverflowProtector();
-+   void InvalidateArrayIteratorProtector();
-+diff --git a/src/lookup.cc b/src/lookup.cc
-+index 58ad9318dd..6de87cbbe9 100644
-+--- a/src/lookup.cc
-++++ b/src/lookup.cc
-+@@ -260,14 +260,27 @@ void LookupIterator::InternalUpdateProtector() {
-+   if (isolate_->bootstrapper()->IsActive()) return;
-+ 
-+   if (*name_ == heap()->constructor_string()) {
-+-    if (!isolate_->IsSpeciesLookupChainIntact()) return;
-++    if (!isolate_->IsArraySpeciesLookupChainIntact() &&
-++        !isolate_->IsTypedArraySpeciesLookupChainIntact() &&
-++        !isolate_->IsPromiseSpeciesLookupChainIntact())
-++      return;
-+     // Setting the constructor property could change an instance's @@species
-+-    if (holder_->IsJSArray() || holder_->IsJSPromise() ||
-+-        holder_->IsJSTypedArray()) {
-++    if (holder_->IsJSArray()) {
-++      if (!isolate_->IsArraySpeciesLookupChainIntact()) return;
-+       isolate_->CountUsage(
-+           v8::Isolate::UseCounterFeature::kArrayInstanceConstructorModified);
-+-      isolate_->InvalidateSpeciesProtector();
-+-    } else if (holder_->map()->is_prototype_map()) {
-++      isolate_->InvalidateArraySpeciesProtector();
-++      return;
-++    } else if (holder_->IsJSPromise()) {
-++      if (!isolate_->IsPromiseSpeciesLookupChainIntact()) return;
-++      isolate_->InvalidatePromiseSpeciesProtector();
-++      return;
-++    } else if (holder_->IsJSTypedArray()) {
-++      if (!isolate_->IsTypedArraySpeciesLookupChainIntact()) return;
-++      isolate_->InvalidateTypedArraySpeciesProtector();
-++      return;
-++    }
-++    if (holder_->map()->is_prototype_map()) {
-+       DisallowHeapAllocation no_gc;
-+       // Setting the constructor of Array.prototype, Promise.prototype or
-+       // %TypedArray%.prototype of any realm also needs to invalidate the
-+@@ -276,26 +289,41 @@ void LookupIterator::InternalUpdateProtector() {
-+       // have different prototypes for each type, and their parent prototype is
-+       // pointing the same TYPED_ARRAY_PROTOTYPE.
-+       if (isolate_->IsInAnyContext(*holder_,
-+-                                   Context::INITIAL_ARRAY_PROTOTYPE_INDEX) ||
-+-          isolate_->IsInAnyContext(*holder_,
-+-                                   Context::PROMISE_PROTOTYPE_INDEX) ||
-+-          isolate_->IsInAnyContext(holder_->map()->prototype(),
-+-                                   Context::TYPED_ARRAY_PROTOTYPE_INDEX)) {
-+-        isolate_->CountUsage(v8::Isolate::UseCounterFeature::
-+-                                 kArrayPrototypeConstructorModified);
-+-        isolate_->InvalidateSpeciesProtector();
-++                                   Context::INITIAL_ARRAY_PROTOTYPE_INDEX)) {
-++        if (!isolate_->IsArraySpeciesLookupChainIntact()) return;
-++        isolate_->CountUsage(
-++            v8::Isolate::UseCounterFeature::kArrayPrototypeConstructorModified);
-++        isolate_->InvalidateArraySpeciesProtector();
-++      } else if (isolate_->IsInAnyContext(*holder_,
-++                                          Context::PROMISE_PROTOTYPE_INDEX)) {
-++        if (!isolate_->IsPromiseSpeciesLookupChainIntact()) return;
-++        isolate_->InvalidatePromiseSpeciesProtector();
-++      } else if (isolate_->IsInAnyContext(
-++                     holder_->map()->prototype(),
-++                     Context::TYPED_ARRAY_PROTOTYPE_INDEX)) {
-++        if (!isolate_->IsTypedArraySpeciesLookupChainIntact()) return;
-++        isolate_->InvalidateTypedArraySpeciesProtector();
-+       }
-+     }
-+   } else if (*name_ == heap()->species_symbol()) {
-+-    if (!isolate_->IsSpeciesLookupChainIntact()) return;
-++    if (!isolate_->IsArraySpeciesLookupChainIntact() &&
-++        !isolate_->IsTypedArraySpeciesLookupChainIntact() &&
-++        !isolate_->IsPromiseSpeciesLookupChainIntact())
-++      return;
-+     // Setting the Symbol.species property of any Array, Promise or TypedArray
-+     // constructor invalidates the @@species protector
-+-    if (isolate_->IsInAnyContext(*holder_, Context::ARRAY_FUNCTION_INDEX) ||
-+-        isolate_->IsInAnyContext(*holder_, Context::PROMISE_FUNCTION_INDEX) ||
-+-        IsTypedArrayFunctionInAnyContext(isolate_, *holder_)) {
-++    if (isolate_->IsInAnyContext(*holder_, Context::ARRAY_FUNCTION_INDEX)) {
-++      if (!isolate_->IsArraySpeciesLookupChainIntact()) return;
-+       isolate_->CountUsage(
-+           v8::Isolate::UseCounterFeature::kArraySpeciesModified);
-+-      isolate_->InvalidateSpeciesProtector();
-++      isolate_->InvalidateArraySpeciesProtector();
-++    } else if (isolate_->IsInAnyContext(*holder_,
-++                                        Context::PROMISE_FUNCTION_INDEX)) {
-++      if (!isolate_->IsPromiseSpeciesLookupChainIntact()) return;
-++      isolate_->InvalidatePromiseSpeciesProtector();
-++    } else if (IsTypedArrayFunctionInAnyContext(isolate_, *holder_)) {
-++      if (!isolate_->IsTypedArraySpeciesLookupChainIntact()) return;
-++      isolate_->InvalidateTypedArraySpeciesProtector();
-+     }
-+   } else if (*name_ == heap()->is_concat_spreadable_symbol()) {
-+     if (!isolate_->IsIsConcatSpreadableLookupChainIntact()) return;
-+diff --git a/src/objects.cc b/src/objects.cc
-+index 9e80224d93..b2c2274fcd 100644
-+--- a/src/objects.cc
-++++ b/src/objects.cc
-+@@ -2366,7 +2366,7 @@ MaybeHandle<Object> Object::ArraySpeciesConstructor(
-+   Handle<Object> default_species = isolate->array_function();
-+   if (original_array->IsJSArray() &&
-+       Handle<JSArray>::cast(original_array)->HasArrayPrototype(isolate) &&
-+-      isolate->IsSpeciesLookupChainIntact()) {
-++      isolate->IsArraySpeciesLookupChainIntact()) {
-+     return default_species;
-+   }
-+   Handle<Object> constructor = isolate->factory()->undefined_value();
-+diff --git a/src/runtime/runtime-array.cc b/src/runtime/runtime-array.cc
-+index 648606a274..f2f824ab21 100644
-+--- a/src/runtime/runtime-array.cc
-++++ b/src/runtime/runtime-array.cc
-+@@ -391,7 +391,7 @@ RUNTIME_FUNCTION(Runtime_TrySliceSimpleNonFastElements) {
-+   // implementation.
-+   if (receiver->IsJSArray()) {
-+     // This "fastish" path must make sure the destination array is a JSArray.
-+-    if (!isolate->IsSpeciesLookupChainIntact() ||
-++    if (!isolate->IsArraySpeciesLookupChainIntact() ||
-+         !JSArray::cast(*receiver)->HasArrayPrototype(isolate)) {
-+       return Smi::FromInt(0);
-+     }
-+diff --git a/src/runtime/runtime-test.cc b/src/runtime/runtime-test.cc
-+index 6b2f3467fc..6192747ab2 100644
-+--- a/src/runtime/runtime-test.cc
-++++ b/src/runtime/runtime-test.cc
-+@@ -839,11 +839,24 @@ TYPED_ARRAYS(FIXED_TYPED_ARRAYS_CHECK_RUNTIME_FUNCTION)
-+ 
-+ #undef FIXED_TYPED_ARRAYS_CHECK_RUNTIME_FUNCTION
-+ 
-++RUNTIME_FUNCTION(Runtime_ArraySpeciesProtector) {
-++  SealHandleScope shs(isolate);
-++  DCHECK_EQ(0, args.length());
-++  return isolate->heap()->ToBoolean(isolate->IsArraySpeciesLookupChainIntact());
-++}
-+ 
-+-RUNTIME_FUNCTION(Runtime_SpeciesProtector) {
-++RUNTIME_FUNCTION(Runtime_TypedArraySpeciesProtector) {
-+   SealHandleScope shs(isolate);
-+   DCHECK_EQ(0, args.length());
-+-  return isolate->heap()->ToBoolean(isolate->IsSpeciesLookupChainIntact());
-++  return isolate->heap()->ToBoolean(
-++      isolate->IsTypedArraySpeciesLookupChainIntact());
-++}
-++
-++RUNTIME_FUNCTION(Runtime_PromiseSpeciesProtector) {
-++  SealHandleScope shs(isolate);
-++  DCHECK_EQ(0, args.length());
-++  return isolate->heap()->ToBoolean(
-++      isolate->IsPromiseSpeciesLookupChainIntact());
-+ }
-+ 
-+ // Take a compiled wasm module, serialize it and copy the buffer into an array
-+diff --git a/src/runtime/runtime.h b/src/runtime/runtime.h
-+index 2bfd280803..b196da83b5 100644
-+--- a/src/runtime/runtime.h
-++++ b/src/runtime/runtime.h
-+@@ -587,7 +587,9 @@ namespace internal {
-+   F(SetForceSlowPath, 1, 1)                   \
-+   F(SetWasmCompileControls, 2, 1)             \
-+   F(SetWasmInstantiateControls, 0, 1)         \
-+-  F(SpeciesProtector, 0, 1)                   \
-++  F(ArraySpeciesProtector, 0, 1)              \
-++  F(TypedArraySpeciesProtector, 0, 1)         \
-++  F(PromiseSpeciesProtector, 0, 1)            \
-+   F(SystemBreak, 0, 1)                        \
-+   F(TraceEnter, 0, 1)                         \
-+   F(TraceExit, 1, 1)                          \
-+diff --git a/test/cctest/test-typedarrays.cc b/test/cctest/test-typedarrays.cc
-+index 7ec9197b65..bab6e0f2f6 100644
-+--- a/test/cctest/test-typedarrays.cc
-++++ b/test/cctest/test-typedarrays.cc
-+@@ -117,12 +117,12 @@ void TestSpeciesProtector(char* code,
-+ 
-+       v8::internal::Isolate* i_isolate =
-+           reinterpret_cast<v8::internal::Isolate*>(isolate);
-+-      CHECK(i_isolate->IsSpeciesLookupChainIntact());
-++      CHECK(i_isolate->IsTypedArraySpeciesLookupChainIntact());
-+       CompileRun(code);
-+       if (invalidates_species_protector) {
-+-        CHECK(!i_isolate->IsSpeciesLookupChainIntact());
-++        CHECK(!i_isolate->IsTypedArraySpeciesLookupChainIntact());
-+       } else {
-+-        CHECK(i_isolate->IsSpeciesLookupChainIntact());
-++        CHECK(i_isolate->IsTypedArraySpeciesLookupChainIntact());
-+       }
-+ 
-+       v8::Local<v8::Value> my_typed_array = CompileRun("MyTypedArray");
-+diff --git a/test/mjsunit/es6/array-species-constructor-accessor.js b/test/mjsunit/es6/array-species-constructor-accessor.js
-+index 7ebf328a8a..7185d98b58 100644
-+--- a/test/mjsunit/es6/array-species-constructor-accessor.js
-++++ b/test/mjsunit/es6/array-species-constructor-accessor.js
-+@@ -18,7 +18,7 @@ assertEquals(1, x.concat([1])[0]);
-+ class MyArray extends Array { }
-+ 
-+ Object.defineProperty(x, 'constructor', {get() { return MyArray; }});
-+-assertFalse(%SpeciesProtector());
-++assertFalse(%ArraySpeciesProtector());
-+ 
-+ assertEquals(MyArray, x.map(()=>{}).constructor);
-+ assertEquals(MyArray, x.filter(()=>{}).constructor);
-+diff --git a/test/mjsunit/es6/array-species-constructor-delete.js b/test/mjsunit/es6/array-species-constructor-delete.js
-+index fff22a2a8c..3b85d52565 100644
-+--- a/test/mjsunit/es6/array-species-constructor-delete.js
-++++ b/test/mjsunit/es6/array-species-constructor-delete.js
-+@@ -19,7 +19,7 @@ class MyArray extends Array { }
-+ 
-+ Object.prototype.constructor = MyArray;
-+ delete Array.prototype.constructor;
-+-assertFalse(%SpeciesProtector());
-++assertFalse(%ArraySpeciesProtector());
-+ 
-+ assertEquals(MyArray, x.map(()=>{}).constructor);
-+ assertEquals(MyArray, x.filter(()=>{}).constructor);
-+diff --git a/test/mjsunit/es6/array-species-constructor.js b/test/mjsunit/es6/array-species-constructor.js
-+index 0d888f46ee..07e897d458 100644
-+--- a/test/mjsunit/es6/array-species-constructor.js
-++++ b/test/mjsunit/es6/array-species-constructor.js
-+@@ -18,7 +18,7 @@ assertEquals(1, x.concat([1])[0]);
-+ class MyArray extends Array { }
-+ 
-+ x.constructor = MyArray;
-+-assertFalse(%SpeciesProtector());
-++assertFalse(%ArraySpeciesProtector());
-+ 
-+ assertEquals(MyArray, x.map(()=>{}).constructor);
-+ assertEquals(MyArray, x.filter(()=>{}).constructor);
-+diff --git a/test/mjsunit/es6/array-species-delete.js b/test/mjsunit/es6/array-species-delete.js
-+index 16a2fa26f9..2f0f50a1b2 100644
-+--- a/test/mjsunit/es6/array-species-delete.js
-++++ b/test/mjsunit/es6/array-species-delete.js
-+@@ -19,7 +19,7 @@ class MyArray extends Array { }
-+ 
-+ Object.prototype[Symbol.species] = MyArray;
-+ delete Array[Symbol.species];
-+-assertFalse(%SpeciesProtector());
-++assertFalse(%ArraySpeciesProtector());
-+ 
-+ assertEquals(MyArray, x.map(()=>{}).constructor);
-+ assertEquals(MyArray, x.filter(()=>{}).constructor);
-+diff --git a/test/mjsunit/es6/array-species-modified.js b/test/mjsunit/es6/array-species-modified.js
-+index 58feb31669..d5a707997a 100644
-+--- a/test/mjsunit/es6/array-species-modified.js
-++++ b/test/mjsunit/es6/array-species-modified.js
-+@@ -18,7 +18,7 @@ assertEquals(1, x.concat([1])[0]);
-+ class MyArray extends Array { }
-+ 
-+ Object.defineProperty(Array, Symbol.species, {value: MyArray});
-+-assertFalse(%SpeciesProtector());
-++assertFalse(%ArraySpeciesProtector());
-+ 
-+ assertEquals(MyArray, x.map(()=>{}).constructor);
-+ assertEquals(MyArray, x.filter(()=>{}).constructor);
-+diff --git a/test/mjsunit/es6/array-species-parent-constructor.js b/test/mjsunit/es6/array-species-parent-constructor.js
-+index b4fb1d56e3..8a861fb05d 100644
-+--- a/test/mjsunit/es6/array-species-parent-constructor.js
-++++ b/test/mjsunit/es6/array-species-parent-constructor.js
-+@@ -18,7 +18,7 @@ assertEquals(1, x.concat([1])[0]);
-+ class MyArray extends Array { }
-+ 
-+ Array.prototype.constructor = MyArray;
-+-assertFalse(%SpeciesProtector());
-++assertFalse(%ArraySpeciesProtector());
-+ 
-+ assertEquals(MyArray, x.map(()=>{}).constructor);
-+ assertEquals(MyArray, x.filter(()=>{}).constructor);
-+diff --git a/test/mjsunit/es6/array-species-proto.js b/test/mjsunit/es6/array-species-proto.js
-+index 6b55881cd6..d8e2ae5ddd 100644
-+--- a/test/mjsunit/es6/array-species-proto.js
-++++ b/test/mjsunit/es6/array-species-proto.js
-+@@ -18,7 +18,7 @@ assertEquals(1, x.concat([1])[0]);
-+ class MyArray extends Array { }
-+ 
-+ x.__proto__ = MyArray.prototype;
-+-assertTrue(%SpeciesProtector());
-++assertTrue(%ArraySpeciesProtector());
-+ 
-+ assertEquals(MyArray, x.map(()=>{}).constructor);
-+ assertEquals(MyArray, x.filter(()=>{}).constructor);
-+diff --git a/test/mjsunit/harmony/regexp-named-captures.js b/test/mjsunit/harmony/regexp-named-captures.js
-+index 72041b99bf..aab8393392 100644
-+--- a/test/mjsunit/harmony/regexp-named-captures.js
-++++ b/test/mjsunit/harmony/regexp-named-captures.js
-+@@ -425,7 +425,7 @@ function toSlowMode(re) {
-+ {
-+   const re = /./;
-+   const result = re.exec("a");
-+-  assertTrue(%SpeciesProtector());
-++  assertTrue(%ArraySpeciesProtector());
-+   assertEquals(result.__proto__, Array.prototype);
-+   assertTrue(result.hasOwnProperty('groups'));
-+   assertArrayEquals(["a"], result);
-+@@ -433,7 +433,7 @@ function toSlowMode(re) {
-+   assertEquals(undefined, result.groups);
-+ 
-+   Array.prototype.groups = { a: "b" };
-+-  assertTrue(%SpeciesProtector());
-++  assertTrue(%ArraySpeciesProtector());
-+   assertEquals("$<a>", "a".replace(re, "$<a>"));
-+   Array.prototype.groups = undefined;
-+ }
-+@@ -441,7 +441,7 @@ function toSlowMode(re) {
-+ {
-+   const re = toSlowMode(/./);
-+   const result = re.exec("a");
-+-  assertTrue(%SpeciesProtector());
-++  assertTrue(%ArraySpeciesProtector());
-+   assertEquals(result.__proto__, Array.prototype);
-+   assertTrue(result.hasOwnProperty('groups'));
-+   assertArrayEquals(["a"], result);
-+@@ -449,7 +449,7 @@ function toSlowMode(re) {
-+   assertEquals(undefined, result.groups);
-+ 
-+   Array.prototype.groups = { a: "b" };
-+-  assertTrue(%SpeciesProtector());
-++  assertTrue(%ArraySpeciesProtector());
-+   assertEquals("$<a>", "a".replace(re, "$<a>"));
-+   Array.prototype.groups = undefined;
-+ }
-+@@ -457,7 +457,7 @@ function toSlowMode(re) {
-+ {
-+   const re = /(?<a>a).|(?<x>x)/;
-+   const result = re.exec("ab");
-+-  assertTrue(%SpeciesProtector());
-++  assertTrue(%ArraySpeciesProtector());
-+   assertEquals(result.__proto__, Array.prototype);
-+   assertTrue(result.hasOwnProperty('groups'));
-+   assertArrayEquals(["ab", "a", undefined], result);
-+@@ -467,7 +467,7 @@ function toSlowMode(re) {
-+   // a is a matched named capture, b is an unmatched named capture, and z
-+   // is not a named capture.
-+   Array.prototype.groups = { a: "b", x: "y", z: "z" };
-+-  assertTrue(%SpeciesProtector());
-++  assertTrue(%ArraySpeciesProtector());
-+   assertEquals("a", "ab".replace(re, "$<a>"));
-+   assertEquals("", "ab".replace(re, "$<x>"));
-+   assertEquals("", "ab".replace(re, "$<z>"));
-+@@ -477,7 +477,7 @@ function toSlowMode(re) {
-+ {
-+   const re = toSlowMode(/(?<a>a).|(?<x>x)/);
-+   const result = re.exec("ab");
-+-  assertTrue(%SpeciesProtector());
-++  assertTrue(%ArraySpeciesProtector());
-+   assertEquals(result.__proto__, Array.prototype);
-+   assertTrue(result.hasOwnProperty('groups'));
-+   assertArrayEquals(["ab", "a", undefined], result);
-+@@ -487,7 +487,7 @@ function toSlowMode(re) {
-+   // a is a matched named capture, b is an unmatched named capture, and z
-+   // is not a named capture.
-+   Array.prototype.groups = { a: "b", x: "y", z: "z" };
-+-  assertTrue(%SpeciesProtector());
-++  assertTrue(%ArraySpeciesProtector());
-+   assertEquals("a", "ab".replace(re, "$<a>"));
-+   assertEquals("", "ab".replace(re, "$<x>"));
-+   assertEquals("", "ab".replace(re, "$<z>"));
-+@@ -506,13 +506,13 @@ function toSlowMode(re) {
-+ 
-+   const re = new FakeRegExp();
-+   const result = re.exec("ab");
-+-  assertTrue(%SpeciesProtector());
-++  assertTrue(%ArraySpeciesProtector());
-+   assertEquals(result.__proto__, Array.prototype);
-+   assertFalse(result.hasOwnProperty('groups'));
-+ 
-+   Array.prototype.groups = { a: "b" };
-+   Array.prototype.groups.__proto__.b = "c";
-+-  assertTrue(%SpeciesProtector());
-++  assertTrue(%ArraySpeciesProtector());
-+   assertEquals("b", "ab".replace(re, "$<a>"));
-+   assertEquals("c", "ab".replace(re, "$<b>"));
-+   Array.prototype.groups = undefined;
-+@@ -531,7 +531,7 @@ function toSlowMode(re) {
-+ 
-+   const re = new FakeRegExp();
-+   const result = re.exec("ab");
-+-  assertTrue(%SpeciesProtector());
-++  assertTrue(%ArraySpeciesProtector());
-+   assertEquals(result.__proto__, Array.prototype);
-+   assertTrue(result.hasOwnProperty('groups'));
-+   assertEquals({ a: "b" }, result.groups);
-+diff --git a/test/mjsunit/keyed-store-generic.js b/test/mjsunit/keyed-store-generic.js
-+index c2c48dd96d..e5d6ab41f2 100644
-+--- a/test/mjsunit/keyed-store-generic.js
-++++ b/test/mjsunit/keyed-store-generic.js
-+@@ -16,7 +16,7 @@ f("make it generic", 0, 0);
-+ 
-+ (function TestSpeciesProtector() {
-+   function MyArray() {}
-+-  assertTrue(%SpeciesProtector());
-++  assertTrue(%ArraySpeciesProtector());
-+   f(Array.prototype, "constructor", MyArray);
-+-  assertFalse(%SpeciesProtector());
-++  assertFalse(%ArraySpeciesProtector());
-+ })();
-+diff --git a/tools/v8heapconst.py b/tools/v8heapconst.py
-+index 5659cdd03c..b4a98dcc11 100644
-+--- a/tools/v8heapconst.py
-++++ b/tools/v8heapconst.py
-+@@ -322,34 +322,35 @@ KNOWN_OBJECTS = {
-+   ("OLD_SPACE", 0x02519): "TerminationException",
-+   ("OLD_SPACE", 0x02579): "OptimizedOut",
-+   ("OLD_SPACE", 0x025d1): "StaleRegister",
-+-  ("OLD_SPACE", 0x02651): "EmptyByteArray",
-+-  ("OLD_SPACE", 0x02661): "EmptyFixedUint8Array",
-+-  ("OLD_SPACE", 0x02681): "EmptyFixedInt8Array",
-+-  ("OLD_SPACE", 0x026a1): "EmptyFixedUint16Array",
-+-  ("OLD_SPACE", 0x026c1): "EmptyFixedInt16Array",
-+-  ("OLD_SPACE", 0x026e1): "EmptyFixedUint32Array",
-+-  ("OLD_SPACE", 0x02701): "EmptyFixedInt32Array",
-+-  ("OLD_SPACE", 0x02721): "EmptyFixedFloat32Array",
-+-  ("OLD_SPACE", 0x02741): "EmptyFixedFloat64Array",
-+-  ("OLD_SPACE", 0x02761): "EmptyFixedUint8ClampedArray",
-+-  ("OLD_SPACE", 0x027c1): "EmptyScript",
-+-  ("OLD_SPACE", 0x02849): "ManyClosuresCell",
-+-  ("OLD_SPACE", 0x02859): "EmptySloppyArgumentsElements",
-+-  ("OLD_SPACE", 0x02879): "EmptySlowElementDictionary",
-+-  ("OLD_SPACE", 0x028c1): "EmptyOrderedHashMap",
-+-  ("OLD_SPACE", 0x028e9): "EmptyOrderedHashSet",
-+-  ("OLD_SPACE", 0x02911): "EmptyPropertyCell",
-+-  ("OLD_SPACE", 0x02939): "EmptyWeakCell",
-+-  ("OLD_SPACE", 0x029a9): "NoElementsProtector",
-+-  ("OLD_SPACE", 0x029d1): "IsConcatSpreadableProtector",
-+-  ("OLD_SPACE", 0x029e1): "SpeciesProtector",
-+-  ("OLD_SPACE", 0x02a09): "StringLengthProtector",
-+-  ("OLD_SPACE", 0x02a19): "FastArrayIterationProtector",
-+-  ("OLD_SPACE", 0x02a29): "ArrayIteratorProtector",
-+-  ("OLD_SPACE", 0x02a51): "ArrayBufferNeuteringProtector",
-+-  ("OLD_SPACE", 0x02ac9): "InfinityValue",
-+-  ("OLD_SPACE", 0x02ad9): "MinusZeroValue",
-+-  ("OLD_SPACE", 0x02ae9): "MinusInfinityValue",
-++  ("OLD_SPACE", 0x02661): "EmptyByteArray",
-++  ("OLD_SPACE", 0x02681): "EmptyFixedUint8Array",
-++  ("OLD_SPACE", 0x026a1): "EmptyFixedInt8Array",
-++  ("OLD_SPACE", 0x026c1): "EmptyFixedUint16Array",
-++  ("OLD_SPACE", 0x026e1): "EmptyFixedInt16Array",
-++  ("OLD_SPACE", 0x02701): "EmptyFixedUint32Array",
-++  ("OLD_SPACE", 0x02721): "EmptyFixedInt32Array",
-++  ("OLD_SPACE", 0x02741): "EmptyFixedFloat32Array",
-++  ("OLD_SPACE", 0x02761): "EmptyFixedFloat64Array",
-++  ("OLD_SPACE", 0x02781): "EmptyFixedUint8ClampedArray",
-++  ("OLD_SPACE", 0x027e1): "EmptyScript",
-++  ("OLD_SPACE", 0x02879): "ManyClosuresCell",
-++  ("OLD_SPACE", 0x02889): "EmptySloppyArgumentsElements",
-++  ("OLD_SPACE", 0x028a9): "EmptySlowElementDictionary",
-++  ("OLD_SPACE", 0x028f1): "EmptyOrderedHashMap",
-++  ("OLD_SPACE", 0x02919): "EmptyOrderedHashSet",
-++  ("OLD_SPACE", 0x02951): "EmptyPropertyCell",
-++  ("OLD_SPACE", 0x02979): "EmptyWeakCell",
-++  ("OLD_SPACE", 0x029e9): "NoElementsProtector",
-++  ("OLD_SPACE", 0x02a11): "IsConcatSpreadableProtector",
-++  ("OLD_SPACE", 0x02a21): "ArraySpeciesProtector",
-++  ("OLD_SPACE", 0x02a49): "TypedArraySpeciesProtector",
-++  ("OLD_SPACE", 0x02a71): "PromiseSpeciesProtector",
-++  ("OLD_SPACE", 0x02a99): "StringLengthProtector",
-++  ("OLD_SPACE", 0x02aa9): "ArrayIteratorProtector",
-++  ("OLD_SPACE", 0x02ad1): "ArrayBufferNeuteringProtector",
-++  ("OLD_SPACE", 0x02b59): "InfinityValue",
-++  ("OLD_SPACE", 0x02b69): "MinusZeroValue",
-++  ("OLD_SPACE", 0x02b79): "MinusInfinityValue",
-+ }
-+ 
-+ # List of known V8 Frame Markers.
-+-- 
-+2.11.0 (Apple Git-81)
-+
-added in remote
-  their  100644 a07fc6f3eb1e672c280c56a67de5c80f4f6bc94d patches/common/v8/backport_39d546a.patch
-@@ -0,0 +1,84 @@
-+39d546a24022b62b00aedf7b556ac6c9e2306aab
-+diff --git a/AUTHORS b/AUTHORS
-+index 3251716f2a..4b5163961d 100644
-+--- a/AUTHORS
-++++ b/AUTHORS
-+@@ -70,6 +70,7 @@ Felix Geisendörfer <haimuiba@gmail.com>
-+ Filipe David Manana <fdmanana@gmail.com>
-+ Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
-+ Geoffrey Garside <ggarside@gmail.com>
-++Gus Caplan <me@gus.host>
-+ Gwang Yoon Hwang <ryumiel@company100.net>
-+ Henrique Ferreiro <henrique.ferreiro@gmail.com>
-+ Hirofumi Mako <mkhrfm@gmail.com>
-+diff --git a/include/v8.h b/include/v8.h
-+index 6cfc787e8c..29566f4303 100644
-+--- a/include/v8.h
-++++ b/include/v8.h
-+@@ -2378,6 +2378,11 @@ class V8_EXPORT Value : public Data {
-+ 
-+   bool IsWebAssemblyCompiledModule() const;
-+ 
-++  /**
-++   * Returns true if the value is a Module Namespace Object.
-++   */
-++  bool IsModuleNamespaceObject() const;
-++
-+   V8_WARN_UNUSED_RESULT MaybeLocal<Boolean> ToBoolean(
-+       Local<Context> context) const;
-+   V8_WARN_UNUSED_RESULT MaybeLocal<Number> ToNumber(
-+diff --git a/src/api.cc b/src/api.cc
-+index 8b177d041d..6dd669ee11 100644
-+--- a/src/api.cc
-++++ b/src/api.cc
-+@@ -3583,6 +3583,10 @@ bool Value::IsSetIterator() const {
-+ 
-+ bool Value::IsPromise() const { return Utils::OpenHandle(this)->IsJSPromise(); }
-+ 
-++bool Value::IsModuleNamespaceObject() const {
-++  return Utils::OpenHandle(this)->IsJSModuleNamespace();
-++}
-++
-+ MaybeLocal<String> Value::ToString(Local<Context> context) const {
-+   auto obj = Utils::OpenHandle(this);
-+   if (obj->IsString()) return ToApiHandle<String>(obj);
-+diff --git a/test/cctest/test-api.cc b/test/cctest/test-api.cc
-+index 54afc61f4c..b7483a7c5e 100644
-+--- a/test/cctest/test-api.cc
-++++ b/test/cctest/test-api.cc
-+@@ -27239,6 +27239,35 @@ TEST(ImportMeta) {
-+   CHECK(result->StrictEquals(Local<v8::Value>::Cast(v8::Utils::ToLocal(meta))));
-+ }
-+ 
-++TEST(GetModuleNamespace) {
-++  LocalContext context;
-++  v8::Isolate* isolate = context->GetIsolate();
-++  v8::HandleScope scope(isolate);
-++
-++  Local<String> url = v8_str("www.google.com");
-++  Local<String> source_text = v8_str("export default 5; export const a = 10;");
-++  v8::ScriptOrigin origin(url, Local<v8::Integer>(), Local<v8::Integer>(),
-++                          Local<v8::Boolean>(), Local<v8::Integer>(),
-++                          Local<v8::Value>(), Local<v8::Boolean>(),
-++                          Local<v8::Boolean>(), True(isolate));
-++  v8::ScriptCompiler::Source source(source_text, origin);
-++  Local<Module> module =
-++      v8::ScriptCompiler::CompileModule(isolate, &source).ToLocalChecked();
-++  module->InstantiateModule(context.local(), UnexpectedModuleResolveCallback)
-++      .ToChecked();
-++  module->Evaluate(context.local()).ToLocalChecked();
-++
-++  Local<Value> ns_val = module->GetModuleNamespace();
-++  CHECK(ns_val->IsModuleNamespaceObject());
-++  Local<Object> ns = ns_val.As<Object>();
-++  CHECK(ns->Get(context.local(), v8_str("default"))
-++            .ToLocalChecked()
-++            ->StrictEquals(v8::Number::New(isolate, 5)));
-++  CHECK(ns->Get(context.local(), v8_str("a"))
-++            .ToLocalChecked()
-++            ->StrictEquals(v8::Number::New(isolate, 10)));
-++}
-++
-+ TEST(GlobalTemplateWithDoubleProperty) {
-+   v8::Isolate* isolate = CcTest::isolate();
-+   v8::HandleScope handle_scope(isolate);
-added in remote
-  their  100644 539d49c9718ef8917508c95b84104e383de9ac14 patches/common/v8/backport_50206308.patch
-@@ -0,0 +1,235 @@
-+From 5020630808043615f2f6fbbfba1ea73342bebd69 Mon Sep 17 00:00:00 2001
-+From: Daniel Clifford <danno@chromium.org>
-+Date: Wed, 28 Mar 2018 13:30:16 +0200
-+Subject: [PATCH] Remove legacy C++ implementation of Array#slice
-+
-+Change-Id: Ifdeda00ad55aa937a6a414e7e566e6640ccd83c0
-+Reviewed-on: https://chromium-review.googlesource.com/980936
-+Reviewed-by: Yang Guo <yangguo@chromium.org>
-+Commit-Queue: Daniel Clifford <danno@chromium.org>
-+Cr-Commit-Position: refs/heads/master@{#52278}
-+---
-+ src/bootstrapper.cc                 |  8 ++---
-+ src/builtins/builtins-array.cc      | 69 -------------------------------------
-+ src/builtins/builtins-definitions.h |  1 -
-+ src/contexts.h                      |  1 -
-+ src/debug/debug-evaluate.cc         |  1 -
-+ src/flag-definitions.h              |  2 +-
-+ src/js/array.js                     | 43 +++--------------------
-+ 7 files changed, 8 insertions(+), 117 deletions(-)
-+
-+diff --git a/src/bootstrapper.cc b/src/bootstrapper.cc
-+index 95d98078f3..626251202d 100644
-+--- a/src/bootstrapper.cc
-++++ b/src/bootstrapper.cc
-+@@ -1658,12 +1658,8 @@ void Genesis::InitializeGlobal(Handle<JSGlobalObject> global_object,
-+     SimpleInstallFunction(proto, "shift", Builtins::kArrayPrototypeShift, 0,
-+                           false);
-+     SimpleInstallFunction(proto, "unshift", Builtins::kArrayUnshift, 1, false);
-+-    if (FLAG_enable_experimental_builtins) {
-+-      SimpleInstallFunction(proto, "slice", Builtins::kArrayPrototypeSlice, 2,
-+-                            false);
-+-    } else {
-+-      SimpleInstallFunction(proto, "slice", Builtins::kArraySlice, 2, false);
-+-    }
-++    SimpleInstallFunction(proto, "slice", Builtins::kArrayPrototypeSlice, 2,
-++                          false);
-+     SimpleInstallFunction(proto, "splice", Builtins::kArraySplice, 2, false);
-+     SimpleInstallFunction(proto, "includes", Builtins::kArrayIncludes, 1,
-+                           false);
-+diff --git a/src/builtins/builtins-array.cc b/src/builtins/builtins-array.cc
-+index f400e824f0..7e3f948cbe 100644
-+--- a/src/builtins/builtins-array.cc
-++++ b/src/builtins/builtins-array.cc
-+@@ -240,75 +240,6 @@ BUILTIN(ArrayUnshift) {
-+   return Smi::FromInt(new_length);
-+ }
-+ 
-+-BUILTIN(ArraySlice) {
-+-  HandleScope scope(isolate);
-+-  Handle<Object> receiver = args.receiver();
-+-  int len = -1;
-+-  int relative_start = 0;
-+-  int relative_end = 0;
-+-
-+-  if (receiver->IsJSArray()) {
-+-    DisallowHeapAllocation no_gc;
-+-    JSArray* array = JSArray::cast(*receiver);
-+-    if (V8_UNLIKELY(!array->HasFastElements() ||
-+-                    !IsJSArrayFastElementMovingAllowed(isolate, array) ||
-+-                    !isolate->IsSpeciesLookupChainIntact() ||
-+-                    // If this is a subclass of Array, then call out to JS
-+-                    !array->HasArrayPrototype(isolate))) {
-+-      AllowHeapAllocation allow_allocation;
-+-      return CallJsIntrinsic(isolate, isolate->array_slice(), args);
-+-    }
-+-    len = Smi::ToInt(array->length());
-+-  } else if (receiver->IsJSObject() &&
-+-             JSSloppyArgumentsObject::GetSloppyArgumentsLength(
-+-                 isolate, Handle<JSObject>::cast(receiver), &len)) {
-+-    // Array.prototype.slice.call(arguments, ...) is quite a common idiom
-+-    // (notably more than 50% of invocations in Web apps).
-+-    // Treat it in C++ as well.
-+-    DCHECK(JSObject::cast(*receiver)->HasFastElements() ||
-+-           JSObject::cast(*receiver)->HasFastArgumentsElements());
-+-  } else {
-+-    AllowHeapAllocation allow_allocation;
-+-    return CallJsIntrinsic(isolate, isolate->array_slice(), args);
-+-  }
-+-  DCHECK_LE(0, len);
-+-  int argument_count = args.length() - 1;
-+-  // Note carefully chosen defaults---if argument is missing,
-+-  // it's undefined which gets converted to 0 for relative_start
-+-  // and to len for relative_end.
-+-  relative_start = 0;
-+-  relative_end = len;
-+-  if (argument_count > 0) {
-+-    DisallowHeapAllocation no_gc;
-+-    if (!ClampedToInteger(isolate, args[1], &relative_start)) {
-+-      AllowHeapAllocation allow_allocation;
-+-      return CallJsIntrinsic(isolate, isolate->array_slice(), args);
-+-    }
-+-    if (argument_count > 1) {
-+-      Object* end_arg = args[2];
-+-      // slice handles the end_arg specially
-+-      if (end_arg->IsUndefined(isolate)) {
-+-        relative_end = len;
-+-      } else if (!ClampedToInteger(isolate, end_arg, &relative_end)) {
-+-        AllowHeapAllocation allow_allocation;
-+-        return CallJsIntrinsic(isolate, isolate->array_slice(), args);
-+-      }
-+-    }
-+-  }
-+-
-+-  // ECMAScript 232, 3rd Edition, Section 15.4.4.10, step 6.
-+-  uint32_t actual_start = (relative_start < 0) ? Max(len + relative_start, 0)
-+-                                               : Min(relative_start, len);
-+-
-+-  // ECMAScript 232, 3rd Edition, Section 15.4.4.10, step 8.
-+-  uint32_t actual_end =
-+-      (relative_end < 0) ? Max(len + relative_end, 0) : Min(relative_end, len);
-+-
-+-  Handle<JSObject> object = Handle<JSObject>::cast(receiver);
-+-  ElementsAccessor* accessor = object->GetElementsAccessor();
-+-  return *accessor->Slice(object, actual_start, actual_end);
-+-}
-+-
-+ BUILTIN(ArraySplice) {
-+   HandleScope scope(isolate);
-+   Handle<Object> receiver = args.receiver();
-+diff --git a/src/builtins/builtins-definitions.h b/src/builtins/builtins-definitions.h
-+index f31cf707cb..5d2b160f78 100644
-+--- a/src/builtins/builtins-definitions.h
-++++ b/src/builtins/builtins-definitions.h
-+@@ -269,7 +269,6 @@ namespace internal {
-+   CPP(ArrayShift)                                                              \
-+   TFJ(ArrayPrototypeShift, SharedFunctionInfo::kDontAdaptArgumentsSentinel)    \
-+   /* ES6 #sec-array.prototype.slice */                                         \
-+-  CPP(ArraySlice)                                                              \
-+   TFJ(ArrayPrototypeSlice, SharedFunctionInfo::kDontAdaptArgumentsSentinel)    \
-+   /* ES6 #sec-array.prototype.splice */                                        \
-+   CPP(ArraySplice)                                                             \
-+diff --git a/src/contexts.h b/src/contexts.h
-+index 03b32ab586..bb55d91c9c 100644
-+--- a/src/contexts.h
-++++ b/src/contexts.h
-+@@ -69,7 +69,6 @@ enum ContextLookupFlags {
-+   V(ARRAY_PUSH_INDEX, JSFunction, array_push)                             \
-+   V(ARRAY_SHIFT_INDEX, JSFunction, array_shift)                           \
-+   V(ARRAY_SPLICE_INDEX, JSFunction, array_splice)                         \
-+-  V(ARRAY_SLICE_INDEX, JSFunction, array_slice)                           \
-+   V(ARRAY_UNSHIFT_INDEX, JSFunction, array_unshift)                       \
-+   V(ARRAY_ENTRIES_ITERATOR_INDEX, JSFunction, array_entries_iterator)     \
-+   V(ARRAY_FOR_EACH_ITERATOR_INDEX, JSFunction, array_for_each_iterator)   \
-+diff --git a/src/debug/debug-evaluate.cc b/src/debug/debug-evaluate.cc
-+index c937be4fe0..d9defc778c 100644
-+--- a/src/debug/debug-evaluate.cc
-++++ b/src/debug/debug-evaluate.cc
-+@@ -616,7 +616,6 @@ bool BuiltinHasNoSideEffect(Builtins::Name id) {
-+     case Builtins::kArrayEvery:
-+     case Builtins::kArraySome:
-+     case Builtins::kArrayConcat:
-+-    case Builtins::kArraySlice:
-+     case Builtins::kArrayFilter:
-+     case Builtins::kArrayMap:
-+     case Builtins::kArrayReduce:
-+diff --git a/src/flag-definitions.h b/src/flag-definitions.h
-+index 21cd9b2d3c..a05571700f 100644
-+--- a/src/flag-definitions.h
-++++ b/src/flag-definitions.h
-+@@ -832,7 +832,7 @@ DEFINE_BOOL(expose_trigger_failure, false, "expose trigger-failure extension")
-+ DEFINE_INT(stack_trace_limit, 10, "number of stack frames to capture")
-+ DEFINE_BOOL(builtins_in_stack_traces, false,
-+             "show built-in functions in stack traces")
-+-DEFINE_BOOL(enable_experimental_builtins, true,
-++DEFINE_BOOL(enable_experimental_builtins, false,
-+             "enable new csa-based experimental builtins")
-+ DEFINE_BOOL(disallow_code_generation_from_strings, false,
-+             "disallow eval and friends")
-+diff --git a/src/js/array.js b/src/js/array.js
-+index c293f8e8c8..5b393263da 100644
-+--- a/src/js/array.js
-++++ b/src/js/array.js
-+@@ -578,46 +578,14 @@ function ArrayUnshiftFallback(arg1) {  // length == 1
-+ }
-+ 
-+ 
-++// Oh the humanity... don't remove the following function because js2c for some
-++// reason gets symbol minifiation wrong if it's not there. Instead of spending
-++// the time fixing js2c (which will go away when all of the internal .js runtime
-++// files are gone), just keep this work-around.
-+ function ArraySliceFallback(start, end) {
-+-  var array = TO_OBJECT(this);
-+-  var len = TO_LENGTH(array.length);
-+-  var start_i = TO_INTEGER(start);
-+-  var end_i = len;
-+-
-+-  if (!IS_UNDEFINED(end)) end_i = TO_INTEGER(end);
-+-
-+-  if (start_i < 0) {
-+-    start_i += len;
-+-    if (start_i < 0) start_i = 0;
-+-  } else {
-+-    if (start_i > len) start_i = len;
-+-  }
-+-
-+-  if (end_i < 0) {
-+-    end_i += len;
-+-    if (end_i < 0) end_i = 0;
-+-  } else {
-+-    if (end_i > len) end_i = len;
-+-  }
-+-
-+-  var result = ArraySpeciesCreate(array, MathMax(end_i - start_i, 0));
-+-
-+-  if (end_i < start_i) return result;
-+-
-+-  if (UseSparseVariant(array, len, IS_ARRAY(array), end_i - start_i)) {
-+-    %NormalizeElements(array);
-+-    if (IS_ARRAY(result)) %NormalizeElements(result);
-+-    SparseSlice(array, start_i, end_i - start_i, len, result);
-+-  } else {
-+-    SimpleSlice(array, start_i, end_i - start_i, len, result);
-+-  }
-+-
-+-  result.length = end_i - start_i;
-+-
-+-  return result;
-++  return null;
-+ }
-+ 
-+-
-+ function ComputeSpliceStartIndex(start_i, len) {
-+   if (start_i < 0) {
-+     start_i += len;
-+@@ -1229,7 +1197,6 @@ utils.Export(function(to) {
-+   "array_push", ArrayPushFallback,
-+   "array_shift", ArrayShiftFallback,
-+   "array_splice", ArraySpliceFallback,
-+-  "array_slice", ArraySliceFallback,
-+   "array_unshift", ArrayUnshiftFallback,
-+ ]);
-+ 
-+-- 
-+2.11.0 (Apple Git-81)
-+
-added in remote
-  their  100644 5ffb19e7d237a4f9a535f770b6184db59fd9727b patches/common/v8/backport_9fb02b526.patch
-@@ -0,0 +1,114 @@
-+9fb02b526f1cd3b859a530a01adb08bc0d089f4f
-+diff --git a/src/builtins/builtins-api.cc b/src/builtins/builtins-api.cc
-+index 7e2d3e219e..c26c1a9fd1 100644
-+--- a/src/builtins/builtins-api.cc
-++++ b/src/builtins/builtins-api.cc
-+@@ -22,17 +22,21 @@ namespace {
-+ // Returns the holder JSObject if the function can legally be called with this
-+ // receiver.  Returns nullptr if the call is illegal.
-+ // TODO(dcarney): CallOptimization duplicates this logic, merge.
-+-JSObject* GetCompatibleReceiver(Isolate* isolate, FunctionTemplateInfo* info,
-+-                                JSObject* receiver) {
-++JSReceiver* GetCompatibleReceiver(Isolate* isolate, FunctionTemplateInfo* info,
-++                                  JSReceiver* receiver) {
-+   Object* recv_type = info->signature();
-+   // No signature, return holder.
-+   if (!recv_type->IsFunctionTemplateInfo()) return receiver;
-++  // A Proxy cannot have been created from the signature template.
-++  if (!receiver->IsJSObject()) return nullptr;
-++
-++  JSObject* js_obj_receiver = JSObject::cast(receiver);
-+   FunctionTemplateInfo* signature = FunctionTemplateInfo::cast(recv_type);
-+ 
-+   // Check the receiver. Fast path for receivers with no hidden prototypes.
-+-  if (signature->IsTemplateFor(receiver)) return receiver;
-+-  if (!receiver->map()->has_hidden_prototype()) return nullptr;
-+-  for (PrototypeIterator iter(isolate, receiver, kStartAtPrototype,
-++  if (signature->IsTemplateFor(js_obj_receiver)) return receiver;
-++  if (!js_obj_receiver->map()->has_hidden_prototype()) return nullptr;
-++  for (PrototypeIterator iter(isolate, js_obj_receiver, kStartAtPrototype,
-+                               PrototypeIterator::END_AT_NON_HIDDEN);
-+        !iter.IsAtEnd(); iter.Advance()) {
-+     JSObject* current = iter.GetCurrent<JSObject>();
-+@@ -46,8 +50,8 @@ V8_WARN_UNUSED_RESULT MaybeHandle<Object> HandleApiCallHelper(
-+     Isolate* isolate, Handle<HeapObject> function,
-+     Handle<HeapObject> new_target, Handle<FunctionTemplateInfo> fun_data,
-+     Handle<Object> receiver, BuiltinArguments args) {
-+-  Handle<JSObject> js_receiver;
-+-  JSObject* raw_holder;
-++  Handle<JSReceiver> js_receiver;
-++  JSReceiver* raw_holder;
-+   if (is_construct) {
-+     DCHECK(args.receiver()->IsTheHole(isolate));
-+     if (fun_data->instance_template()->IsUndefined(isolate)) {
-+@@ -69,21 +73,18 @@ V8_WARN_UNUSED_RESULT MaybeHandle<Object> HandleApiCallHelper(
-+     raw_holder = *js_receiver;
-+   } else {
-+     DCHECK(receiver->IsJSReceiver());
-+-
-+-    if (!receiver->IsJSObject()) {
-+-      // This function cannot be called with the given receiver.  Abort!
-+-      THROW_NEW_ERROR(
-+-          isolate, NewTypeError(MessageTemplate::kIllegalInvocation), Object);
-+-    }
-+-
-+-    js_receiver = Handle<JSObject>::cast(receiver);
-++    js_receiver = Handle<JSReceiver>::cast(receiver);
-+ 
-+     if (!fun_data->accept_any_receiver() &&
-+-        js_receiver->IsAccessCheckNeeded() &&
-+-        !isolate->MayAccess(handle(isolate->context()), js_receiver)) {
-+-      isolate->ReportFailedAccessCheck(js_receiver);
-+-      RETURN_EXCEPTION_IF_SCHEDULED_EXCEPTION(isolate, Object);
-+-      return isolate->factory()->undefined_value();
-++        js_receiver->IsAccessCheckNeeded()) {
-++      // Proxies never need access checks.
-++      DCHECK(js_receiver->IsJSObject());
-++      Handle<JSObject> js_obj_receiver = Handle<JSObject>::cast(js_receiver);
-++      if (!isolate->MayAccess(handle(isolate->context()), js_obj_receiver)) {
-++        isolate->ReportFailedAccessCheck(js_obj_receiver);
-++        RETURN_EXCEPTION_IF_SCHEDULED_EXCEPTION(isolate, Object);
-++        return isolate->factory()->undefined_value();
-++      }
-+     }
-+ 
-+     raw_holder = GetCompatibleReceiver(isolate, *fun_data, *js_receiver);
-+diff --git a/test/cctest/test-api.cc b/test/cctest/test-api.cc
-+index 7887cbfa75..0605f439e5 100644
-+--- a/test/cctest/test-api.cc
-++++ b/test/cctest/test-api.cc
-+@@ -1088,6 +1088,34 @@ THREADED_PROFILED_TEST(FunctionTemplate) {
-+   TestFunctionTemplateAccessor(construct_callback, Return239Callback);
-+ }
-+ 
-++static void FunctionCallbackForProxyTest(
-++    const v8::FunctionCallbackInfo<Value>& info) {
-++  info.GetReturnValue().Set(info.This());
-++}
-++
-++THREADED_TEST(FunctionTemplateWithProxy) {
-++  LocalContext env;
-++  v8::Isolate* isolate = env->GetIsolate();
-++  v8::HandleScope scope(isolate);
-++
-++  v8::Local<v8::FunctionTemplate> function_template =
-++      v8::FunctionTemplate::New(isolate, FunctionCallbackForProxyTest);
-++  v8::Local<v8::Function> function =
-++      function_template->GetFunction(env.local()).ToLocalChecked();
-++  CHECK((*env)->Global()->Set(env.local(), v8_str("f"), function).FromJust());
-++  v8::Local<v8::Value> proxy =
-++      CompileRun("var proxy = new Proxy({}, {}); proxy");
-++  CHECK(proxy->IsProxy());
-++
-++  v8::Local<v8::Value> result = CompileRun("f(proxy)");
-++  CHECK(result->Equals(env.local(), (*env)->Global()).FromJust());
-++
-++  result = CompileRun("f.call(proxy)");
-++  CHECK(result->Equals(env.local(), proxy).FromJust());
-++
-++  result = CompileRun("Reflect.apply(f, proxy, [1])");
-++  CHECK(result->Equals(env.local(), proxy).FromJust());
-++}
-+ 
-+ static void SimpleCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
-+   ApiTestFuzzer::Fuzz();
-added in remote
-  their  100644 1bcfb4e302079f0335689af6202f12559997554b patches/common/v8/backport_b49206d.patch
-@@ -0,0 +1,284 @@
-+diff --git a/src/isolate.cc b/src/isolate.cc
-+index 38506bfc25..37a5578763 100644
-+--- a/src/isolate.cc
-++++ b/src/isolate.cc
-+@@ -8,6 +8,7 @@
-+ 
-+ #include <fstream>  // NOLINT(readability/streams)
-+ #include <sstream>
-++#include <unordered_map>
-+ 
-+ #include "src/api.h"
-+ #include "src/assembler-inl.h"
-+@@ -136,8 +137,6 @@ void ThreadLocalTop::Free() {
-+ base::Thread::LocalStorageKey Isolate::isolate_key_;
-+ base::Thread::LocalStorageKey Isolate::thread_id_key_;
-+ base::Thread::LocalStorageKey Isolate::per_isolate_thread_data_key_;
-+-base::LazyMutex Isolate::thread_data_table_mutex_ = LAZY_MUTEX_INITIALIZER;
-+-Isolate::ThreadDataTable* Isolate::thread_data_table_ = nullptr;
-+ base::Atomic32 Isolate::isolate_counter_ = 0;
-+ #if DEBUG
-+ base::Atomic32 Isolate::isolate_key_created_ = 0;
-+@@ -148,13 +147,13 @@ Isolate::PerIsolateThreadData*
-+   ThreadId thread_id = ThreadId::Current();
-+   PerIsolateThreadData* per_thread = nullptr;
-+   {
-+-    base::LockGuard<base::Mutex> lock_guard(thread_data_table_mutex_.Pointer());
-+-    per_thread = thread_data_table_->Lookup(this, thread_id);
-++    base::LockGuard<base::Mutex> lock_guard(&thread_data_table_mutex_);
-++    per_thread = thread_data_table_.Lookup(thread_id);
-+     if (per_thread == nullptr) {
-+       per_thread = new PerIsolateThreadData(this, thread_id);
-+-      thread_data_table_->Insert(per_thread);
-++      thread_data_table_.Insert(per_thread);
-+     }
-+-    DCHECK(thread_data_table_->Lookup(this, thread_id) == per_thread);
-++    DCHECK(thread_data_table_.Lookup(thread_id) == per_thread);
-+   }
-+   return per_thread;
-+ }
-+@@ -165,12 +164,11 @@ void Isolate::DiscardPerThreadDataForThisThread() {
-+   if (thread_id_int) {
-+     ThreadId thread_id = ThreadId(thread_id_int);
-+     DCHECK(!thread_manager_->mutex_owner_.Equals(thread_id));
-+-    base::LockGuard<base::Mutex> lock_guard(thread_data_table_mutex_.Pointer());
-+-    PerIsolateThreadData* per_thread =
-+-        thread_data_table_->Lookup(this, thread_id);
-++    base::LockGuard<base::Mutex> lock_guard(&thread_data_table_mutex_);
-++    PerIsolateThreadData* per_thread = thread_data_table_.Lookup(thread_id);
-+     if (per_thread) {
-+       DCHECK(!per_thread->thread_state_);
-+-      thread_data_table_->Remove(per_thread);
-++      thread_data_table_.Remove(per_thread);
-+     }
-+   }
-+ }
-+@@ -186,23 +184,20 @@ Isolate::PerIsolateThreadData* Isolate::FindPerThreadDataForThread(
-+     ThreadId thread_id) {
-+   PerIsolateThreadData* per_thread = nullptr;
-+   {
-+-    base::LockGuard<base::Mutex> lock_guard(thread_data_table_mutex_.Pointer());
-+-    per_thread = thread_data_table_->Lookup(this, thread_id);
-++    base::LockGuard<base::Mutex> lock_guard(&thread_data_table_mutex_);
-++    per_thread = thread_data_table_.Lookup(thread_id);
-+   }
-+   return per_thread;
-+ }
-+ 
-+ 
-+ void Isolate::InitializeOncePerProcess() {
-+-  base::LockGuard<base::Mutex> lock_guard(thread_data_table_mutex_.Pointer());
-+-  CHECK_NULL(thread_data_table_);
-+   isolate_key_ = base::Thread::CreateThreadLocalKey();
-+ #if DEBUG
-+   base::Relaxed_Store(&isolate_key_created_, 1);
-+ #endif
-+   thread_id_key_ = base::Thread::CreateThreadLocalKey();
-+   per_isolate_thread_data_key_ = base::Thread::CreateThreadLocalKey();
-+-  thread_data_table_ = new Isolate::ThreadDataTable();
-+ }
-+ 
-+ Address Isolate::get_address_from_id(IsolateAddressId id) {
-+@@ -2240,14 +2235,9 @@ char* Isolate::RestoreThread(char* from) {
-+   return from + sizeof(ThreadLocalTop);
-+ }
-+ 
-+-Isolate::ThreadDataTable::ThreadDataTable() : list_(nullptr) {}
-++Isolate::ThreadDataTable::ThreadDataTable() : table_() {}
-+ 
-+-Isolate::ThreadDataTable::~ThreadDataTable() {
-+-  // TODO(svenpanne) The assertion below would fire if an embedder does not
-+-  // cleanly dispose all Isolates before disposing v8, so we are conservative
-+-  // and leave it out for now.
-+-  // DCHECK_NULL(list_);
-+-}
-++Isolate::ThreadDataTable::~ThreadDataTable() {}
-+ 
-+ void Isolate::ReleaseManagedObjects() {
-+   Isolate::ManagedObjectFinalizer* current =
-+@@ -2294,40 +2284,30 @@ Isolate::PerIsolateThreadData::~PerIsolateThreadData() {
-+ #endif
-+ }
-+ 
-+-
-+-Isolate::PerIsolateThreadData*
-+-    Isolate::ThreadDataTable::Lookup(Isolate* isolate,
-+-                                     ThreadId thread_id) {
-+-  for (PerIsolateThreadData* data = list_; data != nullptr;
-+-       data = data->next_) {
-+-    if (data->Matches(isolate, thread_id)) return data;
-+-  }
-+-  return nullptr;
-++Isolate::PerIsolateThreadData* Isolate::ThreadDataTable::Lookup(
-++    ThreadId thread_id) {
-++  auto t = table_.find(thread_id);
-++  if (t == table_.end()) return nullptr;
-++  return t->second;
-+ }
-+ 
-+ 
-+ void Isolate::ThreadDataTable::Insert(Isolate::PerIsolateThreadData* data) {
-+-  if (list_ != nullptr) list_->prev_ = data;
-+-  data->next_ = list_;
-+-  list_ = data;
-++  bool inserted = table_.insert(std::make_pair(data->thread_id_, data)).second;
-++  CHECK(inserted);
-+ }
-+ 
-+ 
-+ void Isolate::ThreadDataTable::Remove(PerIsolateThreadData* data) {
-+-  if (list_ == data) list_ = data->next_;
-+-  if (data->next_ != nullptr) data->next_->prev_ = data->prev_;
-+-  if (data->prev_ != nullptr) data->prev_->next_ = data->next_;
-++  table_.erase(data->thread_id_);
-+   delete data;
-+ }
-+ 
-+-
-+-void Isolate::ThreadDataTable::RemoveAllThreads(Isolate* isolate) {
-+-  PerIsolateThreadData* data = list_;
-+-  while (data != nullptr) {
-+-    PerIsolateThreadData* next = data->next_;
-+-    if (data->isolate() == isolate) Remove(data);
-+-    data = next;
-++void Isolate::ThreadDataTable::RemoveAllThreads() {
-++  for (auto& x : table_) {
-++    delete x.second;
-+   }
-++  table_.clear();
-+ }
-+ 
-+ 
-+@@ -2502,10 +2482,6 @@ Isolate::Isolate(bool enable_serializer)
-+       cancelable_task_manager_(new CancelableTaskManager()),
-+       abort_on_uncaught_exception_callback_(nullptr),
-+       total_regexp_code_generated_(0) {
-+-  {
-+-    base::LockGuard<base::Mutex> lock_guard(thread_data_table_mutex_.Pointer());
-+-    CHECK(thread_data_table_);
-+-  }
-+   id_ = base::Relaxed_AtomicIncrement(&isolate_counter_, 1);
-+   TRACE_ISOLATE(constructor);
-+ 
-+@@ -2563,8 +2539,8 @@ void Isolate::TearDown() {
-+   Deinit();
-+ 
-+   {
-+-    base::LockGuard<base::Mutex> lock_guard(thread_data_table_mutex_.Pointer());
-+-    thread_data_table_->RemoveAllThreads(this);
-++    base::LockGuard<base::Mutex> lock_guard(&thread_data_table_mutex_);
-++    thread_data_table_.RemoveAllThreads();
-+   }
-+ 
-+ #ifdef DEBUG
-+@@ -2578,12 +2554,6 @@ void Isolate::TearDown() {
-+ }
-+ 
-+ 
-+-void Isolate::GlobalTearDown() {
-+-  delete thread_data_table_;
-+-  thread_data_table_ = nullptr;
-+-}
-+-
-+-
-+ void Isolate::ClearSerializerData() {
-+   delete external_reference_table_;
-+   external_reference_table_ = nullptr;
-+diff --git a/src/isolate.h b/src/isolate.h
-+index 5538992af1..40135ef324 100644
-+--- a/src/isolate.h
-++++ b/src/isolate.h
-+@@ -8,6 +8,7 @@
-+ #include <cstddef>
-+ #include <memory>
-+ #include <queue>
-++#include <unordered_map>
-+ #include <vector>
-+ 
-+ #include "include/v8.h"
-+@@ -247,6 +248,8 @@ class ThreadId {
-+     return *this;
-+   }
-+ 
-++  bool operator==(const ThreadId& other) const { return Equals(other); }
-++
-+   // Returns ThreadId for current thread.
-+   static ThreadId Current() { return ThreadId(GetCurrentThreadId()); }
-+ 
-+@@ -287,7 +290,6 @@ class ThreadId {
-+   friend class Isolate;
-+ };
-+ 
-+-
-+ #define FIELD_ACCESSOR(type, name)                 \
-+   inline void set_##name(type v) { name##_ = v; }  \
-+   inline type name() const { return name##_; }
-+@@ -550,8 +552,6 @@ class Isolate {
-+ 
-+   void ReleaseManagedObjects();
-+ 
-+-  static void GlobalTearDown();
-+-
-+   void ClearSerializerData();
-+ 
-+   // Find the PerThread for this particular (isolate, thread) combination
-+@@ -1371,20 +1371,24 @@ class Isolate {
-+   void* embedder_data_[Internals::kNumIsolateDataSlots];
-+   Heap heap_;
-+ 
-+-  // The per-process lock should be acquired before the ThreadDataTable is
-+-  // modified.
-+   class ThreadDataTable {
-+    public:
-+     ThreadDataTable();
-+     ~ThreadDataTable();
-+ 
-+-    PerIsolateThreadData* Lookup(Isolate* isolate, ThreadId thread_id);
-++    PerIsolateThreadData* Lookup(ThreadId thread_id);
-+     void Insert(PerIsolateThreadData* data);
-+     void Remove(PerIsolateThreadData* data);
-+-    void RemoveAllThreads(Isolate* isolate);
-++    void RemoveAllThreads();
-+ 
-+    private:
-+-    PerIsolateThreadData* list_;
-++    struct Hasher {
-++      std::size_t operator()(const ThreadId& t) const {
-++        return std::hash<int>()(t.ToInteger());
-++      }
-++    };
-++
-++    std::unordered_map<ThreadId, PerIsolateThreadData*, Hasher> table_;
-+   };
-+ 
-+   // These items form a stack synchronously with threads Enter'ing and Exit'ing
-+@@ -1412,12 +1416,15 @@ class Isolate {
-+     DISALLOW_COPY_AND_ASSIGN(EntryStackItem);
-+   };
-+ 
-+-  static base::LazyMutex thread_data_table_mutex_;
-++  // TODO(kenton@cloudflare.com): This mutex can be removed if
-++  // thread_data_table_ is always accessed under the isolate lock. I do not
-++  // know if this is the case, so I'm preserving it for now.
-++  base::Mutex thread_data_table_mutex_;
-+ 
-+   static base::Thread::LocalStorageKey per_isolate_thread_data_key_;
-+   static base::Thread::LocalStorageKey isolate_key_;
-+   static base::Thread::LocalStorageKey thread_id_key_;
-+-  static ThreadDataTable* thread_data_table_;
-++  ThreadDataTable thread_data_table_;
-+ 
-+   // A global counter for all generated Isolates, might overflow.
-+   static base::Atomic32 isolate_counter_;
-+diff --git a/src/v8.cc b/src/v8.cc
-+index ab4918efec..d3b4c471a4 100644
-+--- a/src/v8.cc
-++++ b/src/v8.cc
-+@@ -49,7 +49,6 @@ void V8::TearDown() {
-+   Bootstrapper::TearDownExtensions();
-+   ElementsAccessor::TearDown();
-+   RegisteredExtension::UnregisterAll();
-+-  Isolate::GlobalTearDown();
-+   sampler::Sampler::TearDown();
-+   FlagList::ResetAllFlags();  // Frees memory held by string arguments.
-+ }
-added in remote
-  their  100644 238d8945f90acf595c52a7d228deae25ce2f59b0 patches/common/v8/backport_b767cde1e7.patch
-@@ -0,0 +1,15 @@
-+b767cde1e7bb94b3fea13f2d7e10cd90e6813d6c
-+diff --git a/src/runtime/runtime-intl.cc b/src/runtime/runtime-intl.cc
-+index c359a1e5a1..198610a652 100644
-+--- a/src/runtime/runtime-intl.cc
-++++ b/src/runtime/runtime-intl.cc
-+@@ -620,8 +620,7 @@ RUNTIME_FUNCTION(Runtime_PluralRulesSelect) {
-+   icu::UnicodeString result = plural_rules->select(rounded);
-+   return *isolate->factory()
-+               ->NewStringFromTwoByte(Vector<const uint16_t>(
-+-                  reinterpret_cast<const uint16_t*>(
-+-                      icu::toUCharPtr(result.getBuffer())),
-++                  reinterpret_cast<const uint16_t*>(result.getBuffer()),
-+                   result.length()))
-+               .ToHandleChecked();
-+ }
-added in remote
-  their  100644 9e8bbc8b30341f91fab54f7dd268696e89fae1d2 patches/common/v8/backport_ff0a97933.patch
-@@ -0,0 +1,89 @@
-+ff0a979333408f544f081489411814b84df6e2d9
-+diff --git a/include/v8.h b/include/v8.h
-+index 07ee083695..a09932383f 100644
-+--- a/include/v8.h
-++++ b/include/v8.h
-+@@ -3493,6 +3498,17 @@ class V8_EXPORT Object : public Value {
-+    */
-+   V8_DEPRECATE_SOON("Keep track of isolate correctly", Isolate* GetIsolate());
-+
-++  /**
-++   * If this object is a Set, Map, WeakSet or WeakMap, this returns a
-++   * representation of the elements of this object as an array.
-++   * If this object is a SetIterator or MapIterator, this returns all
-++   * elements of the underlying collection, starting at the iterator's current
-++   * position.
-++   * For other types, this will return an empty MaybeLocal<Array> (without
-++   * scheduling an exception).
-++   */
-++  MaybeLocal<Array> PreviewEntries(bool* is_key_value);
-++
-+   static Local<Object> New(Isolate* isolate);
-+
-+   V8_INLINE static Object* Cast(Value* obj);
-+diff --git a/src/api.cc b/src/api.cc
-+index e65f114edb..4302b6c604 100644
-+--- a/src/api.cc
-++++ b/src/api.cc
-+@@ -9543,21 +9543,20 @@ int debug::EstimatedValueSize(Isolate* v8_isolate, v8::Local<v8::Value> value) {
-+   return i::Handle<i::HeapObject>::cast(object)->Size();
-+ }
-+ 
-+-v8::MaybeLocal<v8::Array> debug::EntriesPreview(Isolate* v8_isolate,
-+-                                                v8::Local<v8::Value> value,
-+-                                                bool* is_key_value) {
-+-  i::Isolate* isolate = reinterpret_cast<i::Isolate*>(v8_isolate);
-+-  ENTER_V8_NO_SCRIPT_NO_EXCEPTION(isolate);
-+-  if (value->IsMap()) {
-++v8::MaybeLocal<v8::Array> v8::Object::PreviewEntries(bool* is_key_value) {
-++  if (IsMap()) {
-+     *is_key_value = true;
-+-    return value.As<Map>()->AsArray();
-++    return Map::Cast(this)->AsArray();
-+   }
-+-  if (value->IsSet()) {
-++  if (IsSet()) {
-+     *is_key_value = false;
-+-    return value.As<Set>()->AsArray();
-++    return Set::Cast(this)->AsArray();
-+   }
-+ 
-+-  i::Handle<i::Object> object = Utils::OpenHandle(*value);
-++  i::Handle<i::JSReceiver> object = Utils::OpenHandle(this);
-++  i::Isolate* isolate = object->GetIsolate();
-++  Isolate* v8_isolate = reinterpret_cast<Isolate*>(isolate);
-++  ENTER_V8_NO_SCRIPT_NO_EXCEPTION(isolate);
-+   if (object->IsJSWeakCollection()) {
-+     *is_key_value = object->IsJSWeakMap();
-+     return Utils::ToLocal(i::JSWeakCollection::GetEntries(
-+diff --git a/src/debug/debug-interface.h b/src/debug/debug-interface.h
-+index 01124bf7fc..2210b4e87f 100644
-+--- a/src/debug/debug-interface.h
-++++ b/src/debug/debug-interface.h
-+@@ -212,10 +212,6 @@ void ResetBlackboxedStateCache(Isolate* isolate,
-+ 
-+ int EstimatedValueSize(Isolate* isolate, v8::Local<v8::Value> value);
-+ 
-+-v8::MaybeLocal<v8::Array> EntriesPreview(Isolate* isolate,
-+-                                         v8::Local<v8::Value> value,
-+-                                         bool* is_key_value);
-+-
-+ enum Builtin {
-+   kObjectKeys,
-+   kObjectGetPrototypeOf,
-+diff --git a/src/inspector/v8-debugger.cc b/src/inspector/v8-debugger.cc
-+index 5dee98853b..28212a1993 100644
-+--- a/src/inspector/v8-debugger.cc
-++++ b/src/inspector/v8-debugger.cc
-+@@ -29,8 +29,10 @@ v8::MaybeLocal<v8::Array> collectionsEntries(v8::Local<v8::Context> context,
-+   v8::Isolate* isolate = context->GetIsolate();
-+   v8::Local<v8::Array> entries;
-+   bool isKeyValue = false;
-+-  if (!v8::debug::EntriesPreview(isolate, value, &isKeyValue).ToLocal(&entries))
-++  if (!value->IsObject() ||
-++      !value.As<v8::Object>()->PreviewEntries(&isKeyValue).ToLocal(&entries)) {
-+     return v8::MaybeLocal<v8::Array>();
-++  }
-+ 
-+   v8::Local<v8::Array> wrappedEntries = v8::Array::New(isolate);
-+   CHECK(!isKeyValue || wrappedEntries->Length() % 2 == 0);
-added in remote
-  their  100644 72c455d9db754a1caa293967767f84923a19083f patches/common/v8/build_gn.patch
-@@ -0,0 +1,130 @@
-+diff --git a/BUILD.gn b/BUILD.gn
-+index 494ba22f29..6071422d7d 100644
-+--- a/BUILD.gn
-++++ b/BUILD.gn
-+@@ -157,7 +157,7 @@ config("internal_config") {
-+ 
-+   include_dirs = [ "." ]
-+ 
-+-  if (is_component_build) {
-++  if (is_component_build || is_electron_build) {
-+     defines = [ "BUILDING_V8_SHARED" ]
-+   }
-+ }
-+@@ -174,6 +174,20 @@ config("libplatform_config") {
-+   if (is_component_build) {
-+     defines = [ "USING_V8_PLATFORM_SHARED" ]
-+   }
-++
-++  # For Electron "static_library" all V8 symbols are together in one DLL.
-++  # V8 targets which depend on libplatform need to be built with
-++  # BUILDING_V8_PLATFORM_SHARED in order to declare its symbols as exported.
-++  #
-++  # Caveat:
-++  # This setting applies to _all_ dependent targets, even those outside
-++  # of V8! Currently there are no other targets dependent on v8_libplatform
-++  # which Electron would consume, so we don't need to do more complicated tweaks
-++  # but be aware of this and check that it's still the case when upgrading
-++  # to newer Chromium version.
-++  if (is_electron_build && !is_electron_gn_build && !is_component_build) {
-++    defines = [ "BUILDING_V8_PLATFORM_SHARED" ]
-++  }
-+ }
-+ 
-+ # This config should be applied to code using the libbase.
-+@@ -185,6 +199,20 @@ config("libbase_config") {
-+   if (is_android && current_toolchain != host_toolchain) {
-+     libs += [ "log" ]
-+   }
-++
-++  # For Electron "static_library" all V8 symbols are together in one DLL.
-++  # V8 targets which depend on libbase need to be built with
-++  # BUILDING_V8_BASE_SHARED in order to declare its symbols as exported.
-++  #
-++  # Caveat:
-++  # This setting applies to _all_ dependent targets, even those outside
-++  # of V8! Currently there are no other targets dependent on v8_libbase
-++  # which Electron would consume, so we don't need to do more complicated tweaks
-++  # but be aware of this and check that it's still the case when upgrading
-++  # to newer Chromium version.
-++  if (is_electron_build && !is_electron_gn_build && !is_component_build) {
-++    defines = [ "BUILDING_V8_BASE_SHARED" ]
-++  }
-+ }
-+ 
-+ # This config should be applied to code using the libsampler.
-+@@ -209,7 +209,7 @@ config("libsampler_config") {
-+ # itself.
-+ config("external_config") {
-+   defines = []
-+-  if (is_component_build) {
-++  if (is_component_build || (is_electron_build && !is_electron_gn_build)) {
-+     defines += [ "USING_V8_SHARED" ]
-+   }
-+   if (v8_enable_v8_checks) {
-+@@ -2674,6 +2674,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
-+ 
-+     configs = [ ":internal_config" ]
-+ 
-++    configs += [ "//libchromiumcontent/chromiumcontent/config:build_time_executable" ]
-++
-+     deps = [
-+       ":v8_base",
-+       ":v8_init",
-+@@ -2667,7 +2697,7 @@ group("v8_fuzzers") {
-+   ]
-+ }
-+ 
-+-if (is_component_build) {
-++if (is_component_build || (is_electron_build && !is_electron_gn_build)) {
-+   v8_component("v8") {
-+     sources = [
-+       "src/v8dll-main.cc",
-+@@ -2681,6 +2711,13 @@ if (is_component_build) {
-+     configs = [ ":internal_config" ]
-+ 
-+     public_configs = [ ":external_config" ]
-++
-++    # For Electron "static_library" keep V8 as a shared library. This is only
-++    # needed so that other targets in Chromium build cleanly. Electron doesn't
-++    # need the DLL.
-++    if (is_electron_build && !is_electron_gn_build && !is_component_build) {
-++      static_component_type = "shared_library"
-++    }
-+   }
-+ 
-+   v8_component("v8_for_testing") {
-+diff --git a/gni/v8.gni b/gni/v8.gni
-+index 9a2bb3dff4..53be2017c7 100644
-+--- a/gni/v8.gni
-++++ b/gni/v8.gni
-+@@ -164,6 +164,16 @@ template("v8_executable") {
-+ 
-+ template("v8_component") {
-+   component(target_name) {
-++    # If this is a non-component build, but this target forces itself to be
-++    # a shared library, we must reset the default configs that were applied
-++    # (see the set_defaults("component") statement in BUILDCONFIG.gn)
-++    # and assign those for shared libraries.
-++    if (defined(invoker.static_component_type) &&
-++        invoker.static_component_type == "shared_library") {
-++      configs = []
-++      configs = default_shared_library_configs
-++    }
-++
-+     forward_variables_from(invoker, "*", [ "configs" ])
-+     configs += invoker.configs
-+     configs -= v8_remove_configs
-+diff --git a/src/inspector/BUILD.gn b/src/inspector/BUILD.gn
-+index 699b1bcbd4..11fc31d851 100644
-+--- a/src/inspector/BUILD.gn
-++++ b/src/inspector/BUILD.gn
-+@@ -79,7 +79,7 @@ action("inspector_injected_script") {
-+ 
-+ config("inspector_config") {
-+   visibility = [ ":*" ]  # Only targets in this file can depend on this.
-+-  if (is_component_build) {
-++  if (is_component_build || is_electron_build) {
-+     defines = [ "BUILDING_V8_SHARED" ]
-+   }
-+ }
-added in remote
-  their  100644 a5cd0ae26d270f403e073627cfa2d45d64cfe453 patches/common/v8/dcheck.patch
-@@ -0,0 +1,30 @@
-+diff --git a/src/api.cc b/src/api.cc
-+index 8531cd5c05..47254c9f5c 100644
-+--- a/src/api.cc
-++++ b/src/api.cc
-+@@ -8598,7 +8604,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
-+ 
-+ 
-+ void Isolate::RunMicrotasks() {
-+-  DCHECK_NE(MicrotasksPolicy::kScoped, GetMicrotasksPolicy());
-++  // DCHECK_NE(MicrotasksPolicy::kScoped, GetMicrotasksPolicy());
-+   reinterpret_cast<i::Isolate*>(this)->RunMicrotasks();
-+ }
-+ 
-+diff --git a/src/heap/heap.cc b/src/heap/heap.cc
-+index 62a5856f34..c59dfad2c8 100644
-+--- a/src/heap/heap.cc
-++++ b/src/heap/heap.cc
-+@@ -5963,9 +5963,9 @@ void Heap::TearDown() {
-+ void Heap::AddGCPrologueCallback(v8::Isolate::GCCallbackWithData callback,
-+                                  GCType gc_type, void* data) {
-+   DCHECK_NOT_NULL(callback);
-+-  DCHECK(gc_prologue_callbacks_.end() ==
-+-         std::find(gc_prologue_callbacks_.begin(), gc_prologue_callbacks_.end(),
-+-                   GCCallbackTuple(callback, gc_type, data)));
-++//  DCHECK(gc_prologue_callbacks_.end() ==
-++//         std::find(gc_prologue_callbacks_.begin(), gc_prologue_callbacks_.end(),
-++//                   GCCallbackTuple(callback, gc_type, data)));
-+   gc_prologue_callbacks_.emplace_back(callback, gc_type, data);
-+ }
-+ 
-added in remote
-  their  100644 b0755916f4f5201dc71ee5a4948c4abd0f129065 patches/common/v8/disable-warning-win.patch
-@@ -0,0 +1,15 @@
-+diff --git a/test/unittests/base/bits-unittest.cc b/test/unittests/base/bits-unittest.cc
-+index 45fb921797..8c9f249609 100644
-+--- a/test/unittests/base/bits-unittest.cc
-++++ b/test/unittests/base/bits-unittest.cc
-+@@ -13,7 +13,9 @@
-+ #else
-+ #define DISABLE_IN_RELEASE(Name) DISABLED_##Name
-+ #endif
-+-
-++#ifdef _WIN32
-++#pragma warning(disable:4724 4723)  // Disable potential divide by 0 warnings
-++#endif
-+ namespace v8 {
-+ namespace base {
-+ namespace bits {
-added in remote
-  their  100644 4cf709058efc56f0d67ae4b8002a295828ae060d patches/common/v8/export_platform.patch
-@@ -0,0 +1,22 @@
-+diff --git a/include/v8-platform.h b/include/v8-platform.h
-+index f814543e66..45bdf53162 100644
-+--- a/include/v8-platform.h
-++++ b/include/v8-platform.h
-+@@ -10,6 +10,8 @@
-+ #include <memory>
-+ #include <string>
-+ 
-++#include "v8.h"
-++
-+ namespace v8 {
-+ 
-+ class Isolate;
-+@@ -297,7 +299,7 @@ class Platform {
-+    * since epoch. Useful for implementing |CurrentClockTimeMillis| if
-+    * nothing special needed.
-+    */
-+-  static double SystemClockTimeMillis();
-++  V8_EXPORT static double SystemClockTimeMillis();
-+ };
-+ 
-+ }  // namespace v8
-added in remote
-  their  100644 0dd64167d86faf5ef9ccafe834d06cd9af51dfa3 patches/common/v8/ostreams.patch
-@@ -0,0 +1,13 @@
-+diff --git a/src/ostreams.h b/src/ostreams.h
-+index e72c8ee..9f25bca 100644
-+--- a/src/ostreams.h
-++++ b/src/ostreams.h
-+@@ -34,7 +34,7 @@ class OFStreamBase : public std::streambuf {
-+ 
-+ 
-+ // An output stream writing to a file.
-+-class V8_EXPORT_PRIVATE OFStream : public std::ostream {
-++class V8_EXPORT_PRIVATE OFStream : public NON_EXPORTED_BASE(std::ostream) {
-+  public:
-+   explicit OFStream(FILE* f);
-+   virtual ~OFStream();
-added in remote
-  their  100644 d76937f341cbe909942f59906845290ba31a36b8 patches/common/webrtc/.patches.yaml
-@@ -0,0 +1,34 @@
-+repo: src/third_party/webrtc
-+patches:
-+-
-+  owners: null
-+  file: webrtc-desktop_capturer_mac.patch
-+  description: null
-+-
-+  owners: null
-+  file: webrtc-rwlock_null.patch
-+  description: null
-+-
-+  owners: nitsakh
-+  file: disable-warning-win.patch
-+  description:
-+    Disable windows warning
-+-
-+  owners: alexeykuzmin
-+  file: allow_chromiumcontent_to_depend_on_webrtc_common.patch
-+  description: |
-+    ERROR at //chromiumcontent/BUILD.gn:152:3: Dependency not allowed.
-+      static_library("webrtc_common") {
-+      ^--------------------------------
-+    The item //chromiumcontent:webrtc_common
-+    can not depend on //third_party/webrtc:webrtc_common
-+    because it is not in //third_party/webrtc:webrtc_common's visibility list: [
-+      //third_party/webrtc/*
-+      //third_party/webrtc_overrides/*
-+    ]
-+-
-+  owners: alexeykuzmin
-+  file: backport_a157e0809.patch
-+  description:
-+    VP9 temporal index bounds check. Landed in 67.0.3396.62.
-+    https://webrtc-review.googlesource.com/73701
-added in remote
-  their  100644 82146555d211194099b1f38b71e71e59efe125c8 patches/common/webrtc/allow_chromiumcontent_to_depend_on_webrtc_common.patch
-@@ -0,0 +1,15 @@
-+diff --git a/webrtc.gni b/webrtc.gni
-+index f32e490f7..6bc8d1205 100644
-+--- a/webrtc.gni
-++++ b/webrtc.gni
-+@@ -274,6 +274,10 @@ if (build_with_chromium) {
-+   webrtc_default_visibility += [ webrtc_root + "/../webrtc_overrides/*" ]
-+ }
-+ 
-++if (is_electron_build) {
-++  webrtc_default_visibility += [ "//libchromiumcontent/chromiumcontent:webrtc_common" ]
-++}
-++
-+ template("rtc_test") {
-+   test(target_name) {
-+     forward_variables_from(invoker,
-added in remote
-  their  100644 260477f2acde0c26a7d01c50835506dd18316851 patches/common/webrtc/backport_a157e0809.patch
-@@ -0,0 +1,18 @@
-+a157e080931581b5f6f3f9bc580a137e6062e45b
-+diff --git a/modules/video_coding/rtp_frame_reference_finder.cc b/modules/video_coding/rtp_frame_reference_finder.cc
-+index be05e56070..09b2593531 100644
-+--- a/modules/video_coding/rtp_frame_reference_finder.cc
-++++ b/modules/video_coding/rtp_frame_reference_finder.cc
-+@@ -533,6 +533,12 @@ bool RtpFrameReferenceFinder::MissingRequiredFrameVp9(uint16_t picture_id,
-+   size_t gof_idx = diff % info.gof->num_frames_in_gof;
-+   size_t temporal_idx = info.gof->temporal_idx[gof_idx];
-+ 
-++  if (temporal_idx >= kMaxTemporalLayers) {
-++    RTC_LOG(LS_WARNING) << "At most " << kMaxTemporalLayers << " temporal "
-++                        << "layers are supported.";
-++    return true;
-++  }
-++
-+   // For every reference this frame has, check if there is a frame missing in
-+   // the interval (|ref_pid|, |picture_id|) in any of the lower temporal
-+   // layers. If so, we are missing a required frame.
-added in remote
-  their  100644 cd454ca091f6db12e886025fc2e5249c9afc6eb7 patches/common/webrtc/disable-warning-win.patch
-@@ -0,0 +1,16 @@
-+diff --git a/rtc_base/thread.cc b/rtc_base/thread.cc
-+index 1bc0c0cd8..51208e4f0 100644
-+--- a/rtc_base/thread.cc
-++++ b/rtc_base/thread.cc
-+@@ -23,7 +23,10 @@
-+ #include "rtc_base/stringutils.h"
-+ #include "rtc_base/timeutils.h"
-+ #include "rtc_base/trace_event.h"
-+-
-++#ifdef _WIN32
-++//Warning on windows because ThreadManager destructor never returns
-++#pragma warning(disable:4722)
-++#endif
-+ namespace rtc {
-+ 
-+ ThreadManager* ThreadManager::Instance() {
-added in remote
-  their  100644 28b661e07819eb53d046fefc203291c310042063 patches/common/webrtc/webrtc-desktop_capturer_mac.patch
-@@ -0,0 +1,121 @@
-+diff --git a/modules/desktop_capture/screen_capturer_mac.mm b/modules/desktop_capture/screen_capturer_mac.mm
-+index 6f2690f28..7d297f56e 100644
-+--- a/modules/desktop_capture/screen_capturer_mac.mm
-++++ b/modules/desktop_capture/screen_capturer_mac.mm
-+@@ -36,6 +36,7 @@
-+ #include "rtc_base/macutils.h"
-+ #include "rtc_base/timeutils.h"
-+ #include "sdk/objc/Framework/Classes/Common/scoped_cftyperef.h"
-++#include "system_wrappers/include/rw_lock_wrapper.h"
-+ 
-+ namespace webrtc {
-+ 
-+@@ -48,20 +49,32 @@ namespace {
-+ // destroy itself once it's done.
-+ class DisplayStreamManager {
-+  public:
-+-  int GetUniqueId() { return ++unique_id_generator_; }
-+-  void DestroyStream(int unique_id) {
-+-    auto it = display_stream_wrappers_.find(unique_id);
-+-    RTC_CHECK(it != display_stream_wrappers_.end());
-+-    RTC_CHECK(!it->second.active);
-+-    CFRelease(it->second.stream);
-+-    display_stream_wrappers_.erase(it);
-++  DisplayStreamManager() : rw_lock_(RWLockWrapper::CreateRWLock()) {}
-++  RWLockWrapper* GetLock() {return rw_lock_.get();};
-+ 
-+-    if (ready_for_self_destruction_ && display_stream_wrappers_.empty())
-++  int GetUniqueId() {
-++    WriteLockScoped scoped_display_stream_manager_lock(*rw_lock_);
-++    return ++unique_id_generator_;
-++  }
-++  void DestroyStream(int unique_id) {
-++    bool finalize;
-++    {
-++      WriteLockScoped scoped_display_stream_manager_lock(*rw_lock_);
-++      auto it = display_stream_wrappers_.find(unique_id);
-++      RTC_CHECK(it != display_stream_wrappers_.end());
-++      RTC_CHECK(!it->second.active);
-++      CFRelease(it->second.stream);
-++      display_stream_wrappers_.erase(it);
-++      finalize = ready_for_self_destruction_ && display_stream_wrappers_.empty();
-++    }
-++    if (finalize) {
-+       delete this;
-++    }
-+   }
-+ 
-+   void SaveStream(int unique_id,
-+                   CGDisplayStreamRef stream) {
-++    WriteLockScoped scoped_display_stream_manager_lock(*rw_lock_);
-+     RTC_CHECK(unique_id <= unique_id_generator_);
-+     DisplayStreamWrapper wrapper;
-+     wrapper.stream = stream;
-+@@ -69,6 +82,7 @@ class DisplayStreamManager {
-+   }
-+ 
-+   void UnregisterActiveStreams() {
-++    WriteLockScoped scoped_display_stream_manager_lock(*rw_lock_);
-+     for (auto& pair : display_stream_wrappers_) {
-+       DisplayStreamWrapper& wrapper = pair.second;
-+       if (wrapper.active) {
-+@@ -83,15 +97,23 @@ class DisplayStreamManager {
-+   }
-+ 
-+   void PrepareForSelfDestruction() {
-+-    ready_for_self_destruction_ = true;
-+-
-+-    if (display_stream_wrappers_.empty())
-++    bool finalize;
-++    {
-++      WriteLockScoped scoped_display_stream_manager_lock(*rw_lock_);
-++      ready_for_self_destruction_ = true;
-++      finalize = display_stream_wrappers_.empty();
-++    }
-++    if (finalize) {
-+       delete this;
-++    }
-+   }
-+ 
-+   // Once the DisplayStreamManager is ready for destruction, the
-+   // ScreenCapturerMac is no longer present. Any updates should be ignored.
-+-  bool ShouldIgnoreUpdates() { return ready_for_self_destruction_; }
-++  // Note: not thread-safe! Acquire and release a lock manually.
-++  bool ShouldIgnoreUpdates() {
-++     return ready_for_self_destruction_;
-++  }
-+ 
-+  private:
-+   struct DisplayStreamWrapper {
-+@@ -106,6 +128,7 @@ class DisplayStreamManager {
-+   std::map<int, DisplayStreamWrapper> display_stream_wrappers_;
-+   int unique_id_generator_ = 0;
-+   bool ready_for_self_destruction_ = false;
-++  std::unique_ptr<RWLockWrapper> rw_lock_;
-+ };
-+ 
-+ // Standard Mac displays have 72dpi, but we report 96dpi for
-+@@ -659,9 +682,6 @@ bool ScreenCapturerMac::RegisterRefreshAndMoveHandlers() {
-+             return;
-+           }
-+ 
-+-          if (manager->ShouldIgnoreUpdates())
-+-            return;
-+-
-+           // Only pay attention to frame updates.
-+           if (status != kCGDisplayStreamFrameStatusFrameComplete)
-+             return;
-+@@ -672,7 +692,12 @@ bool ScreenCapturerMac::RegisterRefreshAndMoveHandlers() {
-+           if (count != 0) {
-+             // According to CGDisplayStream.h, it's safe to call
-+             // CGDisplayStreamStop() from within the callback.
-+-            ScreenRefresh(count, rects, display_origin);
-++            manager->GetLock()->AcquireLockShared();
-++            bool screen_capturer_mac_invalidated = manager->ShouldIgnoreUpdates();
-++            if (!screen_capturer_mac_invalidated) {
-++              ScreenRefresh(count, rects, display_origin);
-++            }
-++            manager->GetLock()->ReleaseLockShared();
-+           }
-+         };
-+ 
-added in remote
-  their  100644 97b0f3670249777fdda4bd261cdb61d172b406cd patches/common/webrtc/webrtc-rwlock_null.patch
-@@ -0,0 +1,37 @@
-+diff --git a/system_wrappers/source/rw_lock.cc b/system_wrappers/source/rw_lock.cc
-+index c38c44ad75..5ed1912d3f 100644
-+--- a/system_wrappers/source/rw_lock.cc
-++++ b/system_wrappers/source/rw_lock.cc
-+@@ -9,8 +9,10 @@
-+  */
-+ 
-+ #include "system_wrappers/include/rw_lock_wrapper.h"
-++#include "system_wrappers/include/sleep.h"
-+ 
-+ #include <assert.h>
-++#include <stdlib.h>
-+ 
-+ #if defined(_WIN32)
-+ #include "system_wrappers/source/rw_lock_win.h"
-+@@ -21,11 +23,19 @@
-+ namespace webrtc {
-+ 
-+ RWLockWrapper* RWLockWrapper::CreateRWLock() {
-++  RWLockWrapper* rw_lock_ptr;
-+ #ifdef _WIN32
-+-  return RWLockWin::Create();
-++  rw_lock_ptr = RWLockWin::Create();
-+ #else
-+-  return RWLockPosix::Create();
-++  rw_lock_ptr = RWLockPosix::Create();
-+ #endif
-++  if (rw_lock_ptr != NULL) {
-++    return rw_lock_ptr;
-++  } else {
-++    int msec_wait = 10 + (rand() % 90);
-++    SleepMs(msec_wait);
-++    return CreateRWLock();
-++  }
-+ }
-+ 
-+ }  // namespace webrtc
-added in remote
-  their  100644 6c68cd069685bd1e083925c9eac9654de24dffe0 patches/mips64el/chromium/.patches.yaml
-@@ -0,0 +1,38 @@
-+repo: src
-+patches:
-+-
-+  owners: null
-+  file: Add-support-for-using-seccomp_bpf-on-mips64el.patch
-+  description: null
-+-
-+  owners: null
-+  file: Set-kernal-page-size-to-16K-on-loongson-MIPS-archtec.patch
-+  description: null
-+-
-+  owners: null
-+  file: Add-mips64el-redhat-linux-to-gcc_toolchain-for-mips6.patch
-+  description: null
-+-
-+  owners: null
-+  file: Fix-mips-cross-toolchain-build-src-crypto-ec-p256-64.patch
-+  description: null
-+-
-+  owners: null
-+  file: Fix-error-about-relocation-truncated-to-fit-R_MIPS_C.patch
-+  description: null
-+-
-+  owners: zcbenz
-+  file: backport-sqlite-8a87f7e.patch
-+  description: null
-+-
-+  owners: zcbenz
-+  file: backport-sqlite-9851f2e.patch
-+  description: null
-+-
-+  owners: zcbenz
-+  file: backport-sqlite-3d8ec48.patch
-+  description: null
-+-
-+  owners: zcbenz
-+  file: support-old-nss.patch
-+  description: null
-added in remote
-  their  100644 4bc2bfc6a37a6c76b615678b29bd8439ce131d17 patches/mips64el/chromium/Add-mips64el-redhat-linux-to-gcc_toolchain-for-mips6.patch
-@@ -0,0 +1,35 @@
-+From c225042994cebe5717013bde26bbad757fefaa17 Mon Sep 17 00:00:00 2001
-+From: Wang Qing <wangqing-hf@loongson.cn>
-+Date: Thu, 28 Sep 2017 14:24:17 +0800
-+Subject: [PATCH] Add mips64el-redhat-linux- to gcc_toolchain for mips64el
-+ cross compile on x64.
-+
-+---
-+ build/toolchain/linux/BUILD.gn | 10 +++++-----
-+ 1 file changed, 5 insertions(+), 5 deletions(-)
-+
-+diff --git a/build/toolchain/linux/BUILD.gn b/build/toolchain/linux/BUILD.gn
-+index bd37707..2fbc4d6e 100644
-+--- a/build/toolchain/linux/BUILD.gn
-++++ b/build/toolchain/linux/BUILD.gn
-+@@ -172,12 +172,12 @@ gcc_toolchain("mipsel") {
-+ }
-+ 
-+ gcc_toolchain("mips64el") {
-+-  cc = "gcc"
-+-  cxx = "g++"
-+-  ar = "ar"
-++  cc = "mips64el-loongson-linux-gcc"
-++  cxx = "mips64el-loongson-linux-g++"
-++  ar = "mips64el-loongson-linux-ar"
-+   ld = cxx
-+-  readelf = "readelf"
-+-  nm = "nm"
-++  readelf = "mips64el-loongson-linux-readelf"
-++  nm = "mips64el-loongson-linux-nm"
-+ 
-+   toolchain_args = {
-+     cc_wrapper = ""
-+-- 
-+2.1.0
-+
-added in remote
-  their  100644 d04f9cc19fa165df48099ec502a2c86498cb7b9b patches/mips64el/chromium/Add-support-for-using-seccomp_bpf-on-mips64el.patch
-@@ -0,0 +1,911 @@
-+From d49a019f05d0daead9859dbf21a9f159a8d13e54 Mon Sep 17 00:00:00 2001
-+From: Wang Qing <wangqing-hf@loongson.cn>
-+Date: Fri, 14 Jul 2017 16:21:21 +0800
-+Subject: [PATCH] Add support for using seccomp_bpf on mips64el.
-+
-+Currently, seccomp_bpf is not supported on mips64el, and the build
-+configuration sets use_seccomp_bpf=false on mips64el. This CL adds
-+support for seccomp-bpf on mips64el, and resolves many compiler errors
-+when compiling on mips64el.
-+
-+This patch merge into chromium master branch:
-+https://chromium.googlesource.com/chromium/src/+/534d7ce2af699715acfc4fe516ef3c2ffee65bc5
-+
-+BUG: 742738
-+R= machenbach@chromium.org, brettw@chromium.org
-+---
-+ base/macros.h                                      | 10 +++
-+ .../sandbox_linux/sandbox_seccomp_bpf_linux.cc     |  4 +-
-+ sandbox/features.gni                               |  5 +-
-+ sandbox/linux/BUILD.gn                             |  1 +
-+ sandbox/linux/bpf_dsl/linux_syscall_ranges.h       |  9 ++-
-+ sandbox/linux/bpf_dsl/seccomp_macros.h             | 63 +++++++++++++++-
-+ sandbox/linux/bpf_dsl/syscall_set.cc               |  5 +-
-+ .../linux/seccomp-bpf-helpers/baseline_policy.cc   |  8 +-
-+ .../linux/seccomp-bpf-helpers/sigsys_handlers.cc   |  2 +-
-+ sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc  | 88 ++++++++++++----------
-+ sandbox/linux/seccomp-bpf-helpers/syscall_sets.h   | 13 ++--
-+ sandbox/linux/seccomp-bpf/syscall.cc               | 51 ++++++++++++-
-+ sandbox/linux/system_headers/linux_seccomp.h       |  3 +
-+ sandbox/linux/system_headers/linux_signal.h        |  9 ++-
-+ sandbox/linux/system_headers/linux_syscalls.h      |  4 +-
-+ sandbox/linux/system_headers/linux_ucontext.h      |  4 +-
-+ .../linux/system_headers/mips64_linux_syscalls.h   |  2 +-
-+ .../linux/system_headers/mips64_linux_ucontext.h   | 50 ++++++++++++
-+ sandbox/linux/system_headers/mips_linux_syscalls.h |  2 +-
-+ 20 files changed, 267 insertions(+), 67 deletions(-)
-+ create mode 100644 sandbox/linux/system_headers/mips64_linux_ucontext.h
-+
-+diff --git a/base/macros.h b/base/macros.h
-+index 154d4b0..d88119a 100644
-+--- a/base/macros.h
-++++ b/base/macros.h
-+@@ -12,6 +12,16 @@
-+ 
-+ #include <stddef.h>  // For size_t.
-+ 
-++// Distinguish mips32.
-++#if defined(__mips__) && (_MIPS_SIM == _ABIO32)
-++#define __mips32__
-++#endif
-++
-++// Distinguish mips64.
-++#if defined(__mips__) && (_MIPS_SIM == _ABI64)
-++#define __mips64__
-++#endif
-++
-+ // Put this in the declarations for a class to be uncopyable.
-+ #define DISALLOW_COPY(TypeName) \
-+   TypeName(const TypeName&) = delete
-+diff --git a/content/common/sandbox_linux/sandbox_seccomp_bpf_linux.cc b/content/common/sandbox_linux/sandbox_seccomp_bpf_linux.cc
-+index 9b27f94..1ab05a7 100644
-+--- a/content/common/sandbox_linux/sandbox_seccomp_bpf_linux.cc
-++++ b/content/common/sandbox_linux/sandbox_seccomp_bpf_linux.cc
-+@@ -47,9 +47,9 @@ using sandbox::bpf_dsl::ResultExpr;
-+ 
-+ // Make sure that seccomp-bpf does not get disabled by mistake. Also make sure
-+ // that we think twice about this when adding a new architecture.
-+-#if !defined(ARCH_CPU_ARM64)
-++#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_MIPS64EL)
-+ #error "Seccomp-bpf disabled on supported architecture!"
-+-#endif  // !defined(ARCH_CPU_ARM64)
-++#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_MIPS64EL)
-+ 
-+ #endif  //
-+ 
-+diff --git a/sandbox/features.gni b/sandbox/features.gni
-+index aa18c04..89693c5 100644
-+--- a/sandbox/features.gni
-++++ b/sandbox/features.gni
-+@@ -4,13 +4,14 @@
-+ 
-+ import("//build/config/nacl/config.gni")
-+ 
-+-# The seccomp-bpf sandbox is only supported on five architectures
-++# The seccomp-bpf sandbox is only supported on six architectures
-+ # currently.
-+ # Do not disable seccomp_bpf anywhere without talking to
-+ # security@chromium.org!
-+ use_seccomp_bpf =
-+     (is_linux || is_android) &&
-+     (current_cpu == "x86" || current_cpu == "x64" || current_cpu == "arm" ||
-+-     current_cpu == "arm64" || current_cpu == "mipsel")
-++     current_cpu == "arm64" || current_cpu == "mipsel" ||
-++     current_cpu == "mips64el")
-+ 
-+ use_seccomp_bpf = use_seccomp_bpf || is_nacl_nonsfi
-+diff --git a/sandbox/linux/BUILD.gn b/sandbox/linux/BUILD.gn
-+index 421d8b0..4b321e2 100644
-+--- a/sandbox/linux/BUILD.gn
-++++ b/sandbox/linux/BUILD.gn
-+@@ -431,6 +431,7 @@ source_set("sandbox_services_headers") {
-+     "system_headers/linux_time.h",
-+     "system_headers/linux_ucontext.h",
-+     "system_headers/mips64_linux_syscalls.h",
-++    "system_headers/mips64_linux_ucontext.h",
-+     "system_headers/mips_linux_syscalls.h",
-+     "system_headers/mips_linux_ucontext.h",
-+     "system_headers/x86_32_linux_syscalls.h",
-+diff --git a/sandbox/linux/bpf_dsl/linux_syscall_ranges.h b/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
-+index a747770..334a00b 100644
-+--- a/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
-++++ b/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
-+@@ -33,16 +33,19 @@
-+ #define MIN_GHOST_SYSCALL   (MIN_PRIVATE_SYSCALL + 0xfff0u)
-+ #define MAX_SYSCALL         (MIN_GHOST_SYSCALL + 4u)
-+ 
-+-#elif defined(__mips__) && (_MIPS_SIM == _ABIO32)
-++#elif defined(__mips32__)
-+ 
-+ #include <asm/unistd.h>  // for __NR_O32_Linux and __NR_Linux_syscalls
-+ #define MIN_SYSCALL         __NR_O32_Linux
-+ #define MAX_PUBLIC_SYSCALL  (MIN_SYSCALL + __NR_Linux_syscalls)
-+ #define MAX_SYSCALL         MAX_PUBLIC_SYSCALL
-+ 
-+-#elif defined(__mips__) && (_MIPS_SIM == _ABI64)
-++#elif defined(__mips64__)
-+ 
-+-#error "Add support to header file"
-++#include <asm/unistd.h>  // for __NR_64_Linux and __NR_64_Linux_syscalls
-++#define MIN_SYSCALL         __NR_64_Linux
-++#define MAX_PUBLIC_SYSCALL  (MIN_SYSCALL + __NR_64_Linux_syscalls)
-++#define MAX_SYSCALL         MAX_PUBLIC_SYSCALL
-+ 
-+ #elif defined(__aarch64__)
-+ 
-+diff --git a/sandbox/linux/bpf_dsl/seccomp_macros.h b/sandbox/linux/bpf_dsl/seccomp_macros.h
-+index af70f21..e4e8142 100644
-+--- a/sandbox/linux/bpf_dsl/seccomp_macros.h
-++++ b/sandbox/linux/bpf_dsl/seccomp_macros.h
-+@@ -190,7 +190,7 @@ typedef user_regs regs_struct;
-+ #define SECCOMP_PT_PARM5(_regs)   (_regs).REG_r4
-+ #define SECCOMP_PT_PARM6(_regs)   (_regs).REG_r5
-+ 
-+-#elif defined(__mips__) && (_MIPS_SIM == _MIPS_SIM_ABI32)
-++#elif defined(__mips32__)
-+ #define SECCOMP_ARCH        AUDIT_ARCH_MIPSEL
-+ #define SYSCALL_EIGHT_ARGS
-+ // MIPS sigcontext_t is different from i386/x86_64 and ARM.
-+@@ -224,7 +224,7 @@ typedef user_regs regs_struct;
-+ #define SECCOMP_ARG_LSB_IDX(nr) (offsetof(struct arch_seccomp_data, args) +   \
-+                                  8*(nr) + 0)
-+ 
-+-// On Mips we don't have structures like user_regs or user_regs_struct in
-++// On MIPS we don't have structures like user_regs or user_regs_struct in
-+ // sys/user.h that we could use, so we just define regs_struct directly.
-+ struct regs_struct {
-+   unsigned long long regs[32];
-+@@ -244,6 +244,65 @@ struct regs_struct {
-+ #define SECCOMP_PT_PARM3(_regs)   (_regs).REG_a2
-+ #define SECCOMP_PT_PARM4(_regs)   (_regs).REG_a3
-+ 
-++#elif defined(__mips64__)
-++#define SECCOMP_ARCH        AUDIT_ARCH_MIPSEL64
-++#define SYSCALL_EIGHT_ARGS
-++// MIPS sigcontext_t is different from i386/x86_64 and ARM.
-++// See </arch/mips/include/uapi/asm/sigcontext.h> in the Linux kernel.
-++#define SECCOMP_REG(_ctx, _reg) ((_ctx)->uc_mcontext.gregs[_reg])
-++// Based on MIPS n64 ABI syscall convention.
-++// On MIPS, when an indirect syscall is being made (syscall(__NR_foo)),
-++// the real identifier (__NR_foo) is not in v0, but in a0.
-++#define SECCOMP_RESULT(_ctx)    SECCOMP_REG(_ctx, 2)
-++#define SECCOMP_SYSCALL(_ctx)   SECCOMP_REG(_ctx, 2)
-++#define SECCOMP_IP(_ctx)        (_ctx)->uc_mcontext.pc
-++#define SECCOMP_PARM1(_ctx)     SECCOMP_REG(_ctx, 4)
-++#define SECCOMP_PARM2(_ctx)     SECCOMP_REG(_ctx, 5)
-++#define SECCOMP_PARM3(_ctx)     SECCOMP_REG(_ctx, 6)
-++#define SECCOMP_PARM4(_ctx)     SECCOMP_REG(_ctx, 7)
-++#define SECCOMP_PARM5(_ctx)     SECCOMP_REG(_ctx, 8)
-++#define SECCOMP_PARM6(_ctx)     SECCOMP_REG(_ctx, 9)
-++#define SECCOMP_PARM7(_ctx)     SECCOMP_REG(_ctx, 10)
-++#define SECCOMP_PARM8(_ctx)     SECCOMP_REG(_ctx, 11)
-++#define SECCOMP_NR_IDX          (offsetof(struct arch_seccomp_data, nr))
-++#define SECCOMP_ARCH_IDX        (offsetof(struct arch_seccomp_data, arch))
-++#define SECCOMP_IP_MSB_IDX      (offsetof(struct arch_seccomp_data,           \
-++                                          instruction_pointer) + 4)
-++#define SECCOMP_IP_LSB_IDX      (offsetof(struct arch_seccomp_data,           \
-++                                          instruction_pointer) + 0)
-++#define SECCOMP_ARG_MSB_IDX(nr) (offsetof(struct arch_seccomp_data, args) +   \
-++                                 8*(nr) + 4)
-++#define SECCOMP_ARG_LSB_IDX(nr) (offsetof(struct arch_seccomp_data, args) +   \
-++                                 8*(nr) + 0)
-++
-++// On MIPS we don't have structures like user_regs or user_regs_struct in
-++// sys/user.h that we could use, so we just define regs_struct directly.
-++struct regs_struct {
-++  unsigned long long regs[32];
-++};
-++
-++#define REG_a7 regs[11]
-++#define REG_a6 regs[10]
-++#define REG_a5 regs[9]
-++#define REG_a4 regs[8]
-++#define REG_a3 regs[7]
-++#define REG_a2 regs[6]
-++#define REG_a1 regs[5]
-++#define REG_a0 regs[4]
-++#define REG_v1 regs[3]
-++#define REG_v0 regs[2]
-++
-++#define SECCOMP_PT_RESULT(_regs)  (_regs).REG_v0
-++#define SECCOMP_PT_SYSCALL(_regs) (_regs).REG_v0
-++#define SECCOMP_PT_PARM1(_regs)   (_regs).REG_a0
-++#define SECCOMP_PT_PARM2(_regs)   (_regs).REG_a1
-++#define SECCOMP_PT_PARM3(_regs)   (_regs).REG_a2
-++#define SECCOMP_PT_PARM4(_regs)   (_regs).REG_a3
-++#define SECCOMP_PT_PARM5(_regs)   (_regs).REG_a4
-++#define SECCOMP_PT_PARM6(_regs)   (_regs).REG_a5
-++#define SECCOMP_PT_PARM7(_regs)   (_regs).REG_a6
-++#define SECCOMP_PT_PARM8(_regs)   (_regs).REG_a7
-++
-+ #elif defined(__aarch64__)
-+ struct regs_struct {
-+   unsigned long long regs[31];
-+diff --git a/sandbox/linux/bpf_dsl/syscall_set.cc b/sandbox/linux/bpf_dsl/syscall_set.cc
-+index 3d61fa3..b975a2b 100644
-+--- a/sandbox/linux/bpf_dsl/syscall_set.cc
-++++ b/sandbox/linux/bpf_dsl/syscall_set.cc
-+@@ -14,9 +14,12 @@ namespace sandbox {
-+ 
-+ namespace {
-+ 
-+-#if defined(__mips__) && (_MIPS_SIM == _MIPS_SIM_ABI32)
-++#if defined(__mips32__)
-+ // This is true for Mips O32 ABI.
-+ static_assert(MIN_SYSCALL == __NR_Linux, "min syscall number should be 4000");
-++#elif defined(__mips64__)
-++// This is true for MIPS N64 ABI.
-++static_assert(MIN_SYSCALL == __NR_Linux, "min syscall number should be 5000");
-+ #else
-+ // This true for supported architectures (Intel and ARM EABI).
-+ static_assert(MIN_SYSCALL == 0u,
-+diff --git a/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc b/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
-+index 4889a9a..d06e765 100644
-+--- a/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
-++++ b/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
-+@@ -86,7 +86,7 @@ bool IsBaselinePolicyWatched(int sysno) {
-+          SyscallSets::IsNuma(sysno) ||
-+          SyscallSets::IsPrctl(sysno) ||
-+          SyscallSets::IsProcessGroupOrSession(sysno) ||
-+-#if defined(__i386__) || defined(__mips__)
-++#if defined(__i386__) || defined(__mips32__)
-+          SyscallSets::IsSocketCall(sysno) ||
-+ #endif
-+ #if defined(__arm__)
-+@@ -147,7 +147,7 @@ ResultExpr EvaluateSyscallImpl(int fs_denied_errno,
-+   if (sysno == __NR_fcntl)
-+     return RestrictFcntlCommands();
-+ 
-+-#if defined(__i386__) || defined(__arm__) || defined(__mips__)
-++#if defined(__i386__) || defined(__arm__) || defined(__mips32__)
-+   if (sysno == __NR_fcntl64)
-+     return RestrictFcntlCommands();
-+ #endif
-+@@ -191,7 +191,7 @@ ResultExpr EvaluateSyscallImpl(int fs_denied_errno,
-+     return RestrictMmapFlags();
-+ #endif
-+ 
-+-#if defined(__i386__) || defined(__arm__) || defined(__mips__)
-++#if defined(__i386__) || defined(__arm__) || defined(__mips32__)
-+   if (sysno == __NR_mmap2)
-+     return RestrictMmapFlags();
-+ #endif
-+@@ -241,7 +241,7 @@ ResultExpr EvaluateSyscallImpl(int fs_denied_errno,
-+     return Error(EPERM);
-+   }
-+ 
-+-#if defined(__i386__) || defined(__mips__)
-++#if defined(__i386__) || defined(__mips32__)
-+   if (SyscallSets::IsSocketCall(sysno))
-+     return RestrictSocketcallCommand();
-+ #endif
-+diff --git a/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc b/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
-+index e6c64de..68890d2 100644
-+--- a/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
-++++ b/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
-+@@ -95,7 +95,7 @@ void PrintSyscallError(uint32_t sysno) {
-+     sysno_base10[i] = '0' + mod;
-+   }
-+ 
-+-#if defined(__mips__) && (_MIPS_SIM == _MIPS_SIM_ABI32)
-++#if defined(__mips32__)
-+   static const char kSeccompErrorPrefix[] = __FILE__
-+       ":**CRASHING**:" SECCOMP_MESSAGE_COMMON_CONTENT " in syscall 4000 + ";
-+ #else
-+diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-+index 1d9f95c..9f1cdef 100644
-+--- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-++++ b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-+@@ -28,7 +28,7 @@ bool SyscallSets::IsKill(int sysno) {
-+ bool SyscallSets::IsAllowedGettime(int sysno) {
-+   switch (sysno) {
-+     case __NR_gettimeofday:
-+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-++#if defined(__i386__) || defined(__x86_64__) || defined(__mips32__)
-+     case __NR_time:
-+ #endif
-+       return true;
-+@@ -38,11 +38,11 @@ bool SyscallSets::IsAllowedGettime(int sysno) {
-+     case __NR_clock_gettime:
-+     case __NR_clock_nanosleep:  // Could be allowed.
-+     case __NR_clock_settime:    // Privileged.
-+-#if defined(__i386__) || defined(__mips__)
-++#if defined(__i386__) || defined(__mips32__)
-+     case __NR_ftime:  // Obsolete.
-+ #endif
-+     case __NR_settimeofday:  // Privileged.
-+-#if defined(__i386__) || defined(__mips__)
-++#if defined(__i386__) || defined(__mips32__)
-+     case __NR_stime:
-+ #endif
-+     default:
-+@@ -97,7 +97,9 @@ bool SyscallSets::IsFileSystem(int sysno) {
-+     case __NR_stat:  // EPERM not a valid errno.
-+     case __NR_symlink:
-+     case __NR_unlink:
-++#if !defined(__mips64__)
-+     case __NR_uselib:  // Neither EPERM, nor ENOENT are valid errno.
-++#endif
-+     case __NR_ustat:   // Same as above. Deprecated.
-+     case __NR_utimes:
-+ #endif  // !defined(__aarch64__)
-+@@ -108,7 +110,7 @@ bool SyscallSets::IsFileSystem(int sysno) {
-+     case __NR_fchownat:  // Should be called chownat ?
-+ #if defined(__x86_64__) || defined(__aarch64__)
-+     case __NR_newfstatat:  // fstatat(). EPERM not a valid errno.
-+-#elif defined(__i386__) || defined(__arm__) || defined(__mips__)
-++#elif defined(__i386__) || defined(__arm__) || defined(__mips32__)
-+     case __NR_fstatat64:
-+ #endif
-+ #if defined(__i386__) || defined(__arm__)
-+@@ -117,7 +119,7 @@ bool SyscallSets::IsFileSystem(int sysno) {
-+     case __NR_linkat:
-+     case __NR_lookup_dcookie:  // ENOENT not a valid errno.
-+ 
-+-#if defined(__i386__) || defined(__arm__) || defined(__mips__)
-++#if defined(__i386__) || defined(__arm__) || defined(__mips32__)
-+     case __NR_lstat64:
-+ #endif
-+     case __NR_memfd_create:
-+@@ -131,16 +133,16 @@ bool SyscallSets::IsFileSystem(int sysno) {
-+     case __NR_readlinkat:
-+     case __NR_renameat:
-+     case __NR_renameat2:
-+-#if defined(__i386__) || defined(__arm__) || defined(__mips__)
-++#if defined(__i386__) || defined(__arm__) || defined(__mips32__)
-+     case __NR_stat64:
-+ #endif
-+     case __NR_statfs:  // EPERM not a valid errno.
-+-#if defined(__i386__) || defined(__arm__) || defined(__mips__)
-++#if defined(__i386__) || defined(__arm__) || defined(__mips32__)
-+     case __NR_statfs64:
-+ #endif
-+     case __NR_symlinkat:
-+     case __NR_truncate:
-+-#if defined(__i386__) || defined(__arm__) || defined(__mips__)
-++#if defined(__i386__) || defined(__arm__) || defined(__mips32__)
-+     case __NR_truncate64:
-+ #endif
-+     case __NR_unlinkat:
-+@@ -157,7 +159,7 @@ bool SyscallSets::IsFileSystem(int sysno) {
-+ bool SyscallSets::IsAllowedFileSystemAccessViaFd(int sysno) {
-+   switch (sysno) {
-+     case __NR_fstat:
-+-#if defined(__i386__) || defined(__arm__) || defined(__mips__)
-++#if defined(__i386__) || defined(__arm__) || defined(__mips32__)
-+     case __NR_fstat64:
-+ #endif
-+       return true;
-+@@ -174,7 +176,7 @@ bool SyscallSets::IsAllowedFileSystemAccessViaFd(int sysno) {
-+     case __NR_fdatasync:  // EPERM not a valid errno.
-+     case __NR_flock:      // EPERM not a valid errno.
-+     case __NR_fstatfs:    // Give information about the whole filesystem.
-+-#if defined(__i386__) || defined(__arm__) || defined(__mips__)
-++#if defined(__i386__) || defined(__arm__) || defined(__mips32__)
-+     case __NR_fstatfs64:
-+ #endif
-+     case __NR_fsync:  // EPERM not a valid errno.
-+@@ -202,14 +204,14 @@ bool SyscallSets::IsDeniedFileSystemAccessViaFd(int sysno) {
-+ #if defined(__i386__) || defined(__arm__)
-+     case __NR_fchown32:
-+ #endif
-+-#if defined(__i386__) || defined(__arm__) || defined(__mips__)
-++#if defined(__i386__) || defined(__arm__) || defined(__mips32__)
-+     case __NR_ftruncate64:
-+ #endif
-+ #if !defined(__aarch64__)
-+     case __NR_getdents:    // EPERM not a valid errno.
-+ #endif
-+     case __NR_getdents64:  // EPERM not a valid errno.
-+-#if defined(__i386__) || defined(__mips__)
-++#if defined(__i386__) || defined(__mips32__)
-+     case __NR_readdir:
-+ #endif
-+       return true;
-+@@ -299,7 +301,7 @@ bool SyscallSets::IsAllowedSignalHandling(int sysno) {
-+     case __NR_rt_sigaction:
-+     case __NR_rt_sigprocmask:
-+     case __NR_rt_sigreturn:
-+-#if defined(__i386__) || defined(__arm__) || defined(__mips__)
-++#if defined(__i386__) || defined(__arm__) || defined(__mips32__)
-+     case __NR_sigaction:
-+     case __NR_sigprocmask:
-+     case __NR_sigreturn:
-+@@ -315,11 +317,11 @@ bool SyscallSets::IsAllowedSignalHandling(int sysno) {
-+     case __NR_signalfd:
-+ #endif
-+     case __NR_signalfd4:
-+-#if defined(__i386__) || defined(__arm__) || defined(__mips__)
-++#if defined(__i386__) || defined(__arm__) || defined(__mips32__)
-+     case __NR_sigpending:
-+     case __NR_sigsuspend:
-+ #endif
-+-#if defined(__i386__) || defined(__mips__)
-++#if defined(__i386__) || defined(__mips32__)
-+     case __NR_signal:
-+     case __NR_sgetmask:  // Obsolete.
-+     case __NR_ssetmask:
-+@@ -343,7 +345,7 @@ bool SyscallSets::IsAllowedOperationOnFd(int sysno) {
-+ #endif
-+       return true;
-+     case __NR_fcntl:
-+-#if defined(__i386__) || defined(__arm__) || defined(__mips__)
-++#if defined(__i386__) || defined(__arm__) || defined(__mips32__)
-+     case __NR_fcntl64:
-+ #endif
-+     default:
-+@@ -460,12 +462,14 @@ bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) {
-+   }
-+ }
-+ 
-+-#if defined(__i386__) || defined(__mips__)
-++#if defined(__i386__) || defined(__mips32__)
-+ // Big multiplexing system call for sockets.
-+ bool SyscallSets::IsSocketCall(int sysno) {
-+   switch (sysno) {
-++#if !defined(__mips64__)
-+     case __NR_socketcall:
-+       return true;
-++#endif
-+     default:
-+       return false;
-+   }
-+@@ -500,10 +504,10 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) {
-+     defined(__aarch64__)
-+     case __NR_mmap:
-+ #endif
-+-#if defined(__i386__) || defined(__arm__) || defined(__mips__)
-++#if defined(__i386__) || defined(__arm__) || defined(__mips32__)
-+     case __NR_mmap2:
-+ #endif
-+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-++#if defined(__i386__) || defined(__x86_64__) || defined(__mips32__)
-+     case __NR_modify_ldt:
-+ #endif
-+     case __NR_mprotect:
-+@@ -524,7 +528,7 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) {
-+ bool SyscallSets::IsAllowedGeneralIo(int sysno) {
-+   switch (sysno) {
-+     case __NR_lseek:
-+-#if defined(__i386__) || defined(__arm__) || defined(__mips__)
-++#if defined(__i386__) || defined(__arm__) || defined(__mips32__)
-+     case __NR__llseek:
-+ #endif
-+ #if !defined(__aarch64__)
-+@@ -534,7 +538,7 @@ bool SyscallSets::IsAllowedGeneralIo(int sysno) {
-+     case __NR_pselect6:
-+     case __NR_read:
-+     case __NR_readv:
-+-#if defined(__arm__) || defined(__mips__)
-++#if defined(__arm__) || defined(__mips32__)
-+     case __NR_recv:
-+ #endif
-+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
-+@@ -548,7 +552,7 @@ bool SyscallSets::IsAllowedGeneralIo(int sysno) {
-+ #if defined(__i386__) || defined(__arm__) || defined(__mips__)
-+     case __NR__newselect:
-+ #endif
-+-#if defined(__arm__) || defined(__mips__)
-++#if defined(__arm__) || defined(__mips32__)
-+     case __NR_send:
-+ #endif
-+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
-+@@ -566,7 +570,7 @@ bool SyscallSets::IsAllowedGeneralIo(int sysno) {
-+     case __NR_pwritev:
-+     case __NR_recvmmsg:  // Could specify source.
-+     case __NR_sendfile:
-+-#if defined(__i386__) || defined(__arm__) || defined(__mips__)
-++#if defined(__i386__) || defined(__arm__) || defined(__mips32__)
-+     case __NR_sendfile64:
-+ #endif
-+     case __NR_sendmmsg:  // Could specify destination.
-+@@ -608,7 +612,7 @@ bool SyscallSets::IsAllowedBasicScheduler(int sysno) {
-+     case __NR_nanosleep:
-+       return true;
-+     case __NR_getpriority:
-+-#if defined(__i386__) || defined(__arm__) || defined(__mips__)
-++#if defined(__i386__) || defined(__arm__) || defined(__mips32__)
-+     case __NR_nice:
-+ #endif
-+     case __NR_setpriority:
-+@@ -619,7 +623,7 @@ bool SyscallSets::IsAllowedBasicScheduler(int sysno) {
-+ 
-+ bool SyscallSets::IsAdminOperation(int sysno) {
-+   switch (sysno) {
-+-#if defined(__i386__) || defined(__arm__) || defined(__mips__)
-++#if defined(__i386__) || defined(__arm__) || defined(__mips32__)
-+     case __NR_bdflush:
-+ #endif
-+     case __NR_kexec_load:
-+@@ -667,7 +671,7 @@ bool SyscallSets::IsFsControl(int sysno) {
-+     case __NR_quotactl:
-+     case __NR_swapoff:
-+     case __NR_swapon:
-+-#if defined(__i386__) || defined(__mips__)
-++#if defined(__i386__) || defined(__mips32__)
-+     case __NR_umount:
-+ #endif
-+     case __NR_umount2:
-+@@ -718,7 +722,7 @@ bool SyscallSets::IsGlobalProcessEnvironment(int sysno) {
-+ #if defined(__i386__) || defined(__arm__)
-+     case __NR_ugetrlimit:
-+ #endif
-+-#if defined(__i386__) || defined(__mips__)
-++#if defined(__i386__) || defined(__mips32__)
-+     case __NR_ulimit:
-+ #endif
-+     case __NR_getrusage:
-+@@ -799,10 +803,9 @@ bool SyscallSets::IsKeyManagement(int sysno) {
-+   }
-+ }
-+ 
-+-#if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__)
-+-bool SyscallSets::IsSystemVSemaphores(int sysno) {
-+-  switch (sysno) {
-+-    case __NR_semctl:
-++#if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) || \
-++    defined(__mips64__)
-++bool SyscallSets::IsSystemVSemaphores(int sysno) { switch (sysno) { case __NR_semctl:
-+     case __NR_semget:
-+     case __NR_semop:
-+     case __NR_semtimedop:
-+@@ -813,7 +816,8 @@ bool SyscallSets::IsSystemVSemaphores(int sysno) {
-+ }
-+ #endif
-+ 
-+-#if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__)
-++#if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) || \
-++    defined(__mips64__)
-+ // These give a lot of ambient authority and bypass the setuid sandbox.
-+ bool SyscallSets::IsSystemVSharedMemory(int sysno) {
-+   switch (sysno) {
-+@@ -828,7 +832,8 @@ bool SyscallSets::IsSystemVSharedMemory(int sysno) {
-+ }
-+ #endif
-+ 
-+-#if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__)
-++#if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) || \
-++    defined(__mips64__)
-+ bool SyscallSets::IsSystemVMessageQueue(int sysno) {
-+   switch (sysno) {
-+     case __NR_msgctl:
-+@@ -842,12 +847,14 @@ bool SyscallSets::IsSystemVMessageQueue(int sysno) {
-+ }
-+ #endif
-+ 
-+-#if defined(__i386__) || defined(__mips__)
-++#if defined(__i386__) || defined(__mips32__)
-+ // Big system V multiplexing system call.
-+ bool SyscallSets::IsSystemVIpc(int sysno) {
-+   switch (sysno) {
-++#if !defined(__mips64__)
-+     case __NR_ipc:
-+       return true;
-++#endif
-+     default:
-+       return false;
-+   }
-+@@ -855,10 +862,11 @@ bool SyscallSets::IsSystemVIpc(int sysno) {
-+ #endif
-+ 
-+ bool SyscallSets::IsAnySystemV(int sysno) {
-+-#if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__)
-++#if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) \
-++    || defined(__mips64__)
-+   return IsSystemVMessageQueue(sysno) || IsSystemVSemaphores(sysno) ||
-+          IsSystemVSharedMemory(sysno);
-+-#elif defined(__i386__) || defined(__mips__)
-++#elif defined(__i386__) || defined(__mips32__)
-+   return IsSystemVIpc(sysno);
-+ #endif
-+ }
-+@@ -973,13 +981,13 @@ bool SyscallSets::IsMisc(int sysno) {
-+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-+     case __NR_afs_syscall:
-+ #endif
-+-#if defined(__i386__) || defined(__mips__)
-++#if defined(__i386__) || defined(__mips32__)
-+     case __NR_break:
-+ #endif
-+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-+     case __NR_getpmsg:
-+ #endif
-+-#if defined(__i386__) || defined(__mips__)
-++#if defined(__i386__) || defined(__mips32__)
-+     case __NR_gtty:
-+     case __NR_idle:
-+     case __NR_lock:
-+@@ -993,7 +1001,7 @@ bool SyscallSets::IsMisc(int sysno) {
-+ #if defined(__x86_64__)
-+     case __NR_security:
-+ #endif
-+-#if defined(__i386__) || defined(__mips__)
-++#if defined(__i386__) || defined(__mips32__)
-+     case __NR_stty:
-+ #endif
-+ #if defined(__x86_64__)
-+@@ -1048,7 +1056,9 @@ bool SyscallSets::IsMipsPrivate(int sysno) {
-+ bool SyscallSets::IsMipsMisc(int sysno) {
-+   switch (sysno) {
-+     case __NR_sysmips:
-++#if !defined(__mips64__)
-+     case __NR_unused150:
-++#endif
-+       return true;
-+     default:
-+       return false;
-+diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
-+index 5ba6335..c31d5e9 100644
-+--- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
-++++ b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
-+@@ -42,7 +42,7 @@ class SANDBOX_EXPORT SyscallSets {
-+   static bool IsAllowedGetOrModifySocket(int sysno);
-+   static bool IsDeniedGetOrModifySocket(int sysno);
-+ 
-+-#if defined(__i386__) || defined(__mips__)
-++#if defined(__i386__) || defined(__mips32__)
-+   // Big multiplexing system call for sockets.
-+   static bool IsSocketCall(int sysno);
-+ #endif
-+@@ -70,19 +70,22 @@ class SANDBOX_EXPORT SyscallSets {
-+   // Asynchronous I/O API.
-+   static bool IsAsyncIo(int sysno);
-+   static bool IsKeyManagement(int sysno);
-+-#if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__)
-++#if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) || \
-++    defined(__mips64__)
-+   static bool IsSystemVSemaphores(int sysno);
-+ #endif
-+-#if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__)
-++#if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) || \
-++    defined(__mips64__)
-+   // These give a lot of ambient authority and bypass the setuid sandbox.
-+   static bool IsSystemVSharedMemory(int sysno);
-+ #endif
-+ 
-+-#if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__)
-++#if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) || \
-++    defined(__mips64__)
-+   static bool IsSystemVMessageQueue(int sysno);
-+ #endif
-+ 
-+-#if defined(__i386__) || defined(__mips__)
-++#if defined(__i386__) || defined(__mips32__)
-+   // Big system V multiplexing system call.
-+   static bool IsSystemVIpc(int sysno);
-+ #endif
-+diff --git a/sandbox/linux/seccomp-bpf/syscall.cc b/sandbox/linux/seccomp-bpf/syscall.cc
-+index 4d55936..d6db70f 100644
-+--- a/sandbox/linux/seccomp-bpf/syscall.cc
-++++ b/sandbox/linux/seccomp-bpf/syscall.cc
-+@@ -188,7 +188,7 @@ asm(// We need to be able to tell the kernel exactly where we made a
-+     ".fnend\n"
-+ #endif
-+     "9:.size SyscallAsm, 9b-SyscallAsm\n"
-+-#elif defined(__mips__)
-++#elif defined(__mips32__)
-+     ".text\n"
-+     ".option pic2\n"
-+     ".align 4\n"
-+@@ -240,6 +240,53 @@ asm(// We need to be able to tell the kernel exactly where we made a
-+     ".set    pop\n"
-+     ".end    SyscallAsm\n"
-+     ".size   SyscallAsm,.-SyscallAsm\n"
-++#elif defined(__mips64__)
-++    ".text\n"
-++    ".option pic2\n"
-++    ".global SyscallAsm\n"
-++    ".type SyscallAsm, @function\n"
-++    "SyscallAsm:.ent SyscallAsm\n"
-++    ".frame  $sp, 16, $ra\n"
-++    ".set   push\n"
-++    ".set   noreorder\n"
-++    "daddiu  $sp, $sp, -16\n"
-++    ".cpsetup $25, 0, SyscallAsm\n"
-++    "sd     $ra, 8($sp)\n"
-++    // Check if "v0" is negative. If so, do not attempt to make a
-++    // system call. Instead, compute the return address that is visible
-++    // to the kernel after we execute "syscall". This address can be
-++    // used as a marker that BPF code inspects.
-++    "bgez   $v0, 1f\n"
-++    " nop\n"
-++    // This is equivalent to "la $v0, 2f".
-++    // LA macro has to be avoided since LLVM-AS has issue with LA in PIC mode
-++    // https://llvm.org/bugs/show_bug.cgi?id=27644
-++    "ld     $v0, %got(2f)($gp)\n"
-++    "daddiu  $v0, $v0, %lo(2f)\n"
-++    "b      2f\n"
-++    " nop\n"
-++    // On MIPS N64 all eight arguments go to registers a0 - a7
-++    // We can go ahead and directly copy the entries from the arguments array
-++    // into the appropriate CPU registers.
-++    "1:ld     $a7, 56($a0)\n"
-++    "ld     $a6, 48($a0)\n"
-++    "ld     $a5, 40($a0)\n"
-++    "ld     $a4, 32($a0)\n"
-++    "ld     $a3, 24($a0)\n"
-++    "ld     $a2, 16($a0)\n"
-++    "ld     $a1, 8($a0)\n"
-++    "ld     $a0, 0($a0)\n"
-++    // Enter the kernel
-++    "syscall\n"
-++    // This is our "magic" return address that the BPF filter sees.
-++    // Restore the return address from the stack.
-++    "2:ld     $ra, 8($sp)\n"
-++    ".cpreturn\n"
-++    "jr     $ra\n"
-++    "daddiu  $sp, $sp, 16\n"
-++    ".set    pop\n"
-++    ".end    SyscallAsm\n"
-++    ".size   SyscallAsm,.-SyscallAsm\n"
-+ #elif defined(__aarch64__)
-+     ".text\n"
-+     ".align 2\n"
-+@@ -358,7 +405,7 @@ intptr_t Syscall::Call(int nr,
-+     ret = inout;
-+   }
-+ #elif defined(__mips__)
-+-  int err_status;
-++  intptr_t err_status;
-+   intptr_t ret = Syscall::SandboxSyscallRaw(nr, args, &err_status);
-+ 
-+   if (err_status) {
-+diff --git a/sandbox/linux/system_headers/linux_seccomp.h b/sandbox/linux/system_headers/linux_seccomp.h
-+index 3deb3d2..a60fe2a 100644
-+--- a/sandbox/linux/system_headers/linux_seccomp.h
-++++ b/sandbox/linux/system_headers/linux_seccomp.h
-+@@ -48,6 +48,9 @@
-+ #ifndef AUDIT_ARCH_MIPSEL
-+ #define AUDIT_ARCH_MIPSEL (EM_MIPS|__AUDIT_ARCH_LE)
-+ #endif
-++#ifndef AUDIT_ARCH_MIPSEL64
-++#define AUDIT_ARCH_MIPSEL64 (EM_MIPS|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
-++#endif
-+ #ifndef AUDIT_ARCH_AARCH64
-+ #define AUDIT_ARCH_AARCH64 (EM_AARCH64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
-+ #endif
-+diff --git a/sandbox/linux/system_headers/linux_signal.h b/sandbox/linux/system_headers/linux_signal.h
-+index fb9a47b..5ac4fdb 100644
-+--- a/sandbox/linux/system_headers/linux_signal.h
-++++ b/sandbox/linux/system_headers/linux_signal.h
-+@@ -116,13 +116,20 @@ typedef siginfo_t LinuxSigInfo;
-+ #endif  // !defined(__native_client_nonsfi__)
-+ 
-+ // struct sigset_t is different size in PNaCl from the Linux's.
-+-#if defined(__mips__)
-++#if defined(__mips32__)
-+ #if !defined(_NSIG_WORDS)
-+ #define _NSIG_WORDS 4
-+ #endif
-+ struct LinuxSigSet {
-+   unsigned long sig[_NSIG_WORDS];
-+ };
-++#elif defined(__mips64__)
-++#if !defined(_NSIG_WORDS)
-++#define _NSIG_WORDS 2
-++#endif
-++struct LinuxSigSet {
-++  unsigned long sig[_NSIG_WORDS];
-++};
-+ #else
-+ typedef uint64_t LinuxSigSet;
-+ #endif
-+diff --git a/sandbox/linux/system_headers/linux_syscalls.h b/sandbox/linux/system_headers/linux_syscalls.h
-+index 2b441e4..761c08a 100644
-+--- a/sandbox/linux/system_headers/linux_syscalls.h
-++++ b/sandbox/linux/system_headers/linux_syscalls.h
-+@@ -21,11 +21,11 @@
-+ #include "sandbox/linux/system_headers/arm_linux_syscalls.h"
-+ #endif
-+ 
-+-#if defined(__mips__) && (_MIPS_SIM == _ABIO32)
-++#if defined(__mips32__)
-+ #include "sandbox/linux/system_headers/mips_linux_syscalls.h"
-+ #endif
-+ 
-+-#if defined(__mips__) && (_MIPS_SIM == _ABI64)
-++#if defined(__mips64__)
-+ #include "sandbox/linux/system_headers/mips64_linux_syscalls.h"
-+ #endif
-+ 
-+diff --git a/sandbox/linux/system_headers/linux_ucontext.h b/sandbox/linux/system_headers/linux_ucontext.h
-+index ea4d8a6..e97d727 100644
-+--- a/sandbox/linux/system_headers/linux_ucontext.h
-++++ b/sandbox/linux/system_headers/linux_ucontext.h
-+@@ -13,8 +13,10 @@
-+ #include "sandbox/linux/system_headers/i386_linux_ucontext.h"
-+ #elif defined(__x86_64__)
-+ #include "sandbox/linux/system_headers/x86_64_linux_ucontext.h"
-+-#elif defined(__mips__)
-++#elif defined(__mips32__)
-+ #include "sandbox/linux/system_headers/mips_linux_ucontext.h"
-++#elif defined(__mips64__)
-++#include "sandbox/linux/system_headers/mips64_linux_ucontext.h"
-+ #elif defined(__aarch64__)
-+ #include "sandbox/linux/system_headers/arm64_linux_ucontext.h"
-+ #else
-+diff --git a/sandbox/linux/system_headers/mips64_linux_syscalls.h b/sandbox/linux/system_headers/mips64_linux_syscalls.h
-+index 90f3d1be..ec75815 100644
-+--- a/sandbox/linux/system_headers/mips64_linux_syscalls.h
-++++ b/sandbox/linux/system_headers/mips64_linux_syscalls.h
-+@@ -6,7 +6,7 @@
-+ #ifndef SANDBOX_LINUX_SYSTEM_HEADERS_MIPS64_LINUX_SYSCALLS_H_
-+ #define SANDBOX_LINUX_SYSTEM_HEADERS_MIPS64_LINUX_SYSCALLS_H_
-+ 
-+-#if !defined(__mips__) || (_MIPS_SIM != _ABI64)
-++#if !defined(__mips__)
-+ #error "Including header on wrong architecture"
-+ #endif
-+ 
-+diff --git a/sandbox/linux/system_headers/mips64_linux_ucontext.h b/sandbox/linux/system_headers/mips64_linux_ucontext.h
-+new file mode 100644
-+index 0000000..3d10479
-+--- /dev/null
-++++ b/sandbox/linux/system_headers/mips64_linux_ucontext.h
-+@@ -0,0 +1,50 @@
-++// Copyright 2014 The Chromium Authors. All rights reserved.
-++// Use of this source code is governed by a BSD-style license that can be
-++// found in the LICENSE file.
-++
-++#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_MIPS64_LINUX_UCONTEXT_H_
-++#define SANDBOX_LINUX_SYSTEM_HEADERS_MIPS64_LINUX_UCONTEXT_H_
-++
-++#include <stdint.h>
-++
-++// This is mostly copied from breakpad (common/android/include/sys/ucontext.h),
-++// except we do use sigset_t for uc_sigmask instead of a custom type.
-++#if !defined(__BIONIC_HAVE_UCONTEXT_T)
-++// Ensure that 'stack_t' is defined.
-++#include <asm/signal.h>
-++
-++// We also need greg_t for the sandbox, include it in this header as well.
-++typedef unsigned long greg_t;
-++
-++typedef struct {
-++  uint64_t gregs[32];
-++  uint64_t fpregs[32];
-++  uint64_t mdhi;
-++  uint64_t hi1;
-++  uint64_t hi2;
-++  uint64_t hi3;
-++  uint64_t mdlo;
-++  uint64_t lo1;
-++  uint64_t lo2;
-++  uint64_t lo3;
-++  uint64_t pc;
-++  uint32_t fpc_csr;
-++  uint32_t used_math;
-++  uint32_t dsp;
-++  uint32_t reserved;
-++} mcontext_t;
-++
-++typedef struct ucontext {
-++  uint32_t uc_flags;
-++  struct ucontext* uc_link;
-++  stack_t uc_stack;
-++  mcontext_t uc_mcontext;
-++  sigset_t uc_sigmask;
-++  // Other fields are not used by Google Breakpad. Don't define them.
-++} ucontext_t;
-++
-++#else
-++#include <sys/ucontext.h>
-++#endif  // __BIONIC_HAVE_UCONTEXT_T
-++
-++#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS64_LINUX_UCONTEXT_H_
-+diff --git a/sandbox/linux/system_headers/mips_linux_syscalls.h b/sandbox/linux/system_headers/mips_linux_syscalls.h
-+index 784d6b8..ddbf97f 100644
-+--- a/sandbox/linux/system_headers/mips_linux_syscalls.h
-++++ b/sandbox/linux/system_headers/mips_linux_syscalls.h
-+@@ -6,7 +6,7 @@
-+ #ifndef SANDBOX_LINUX_SYSTEM_HEADERS_MIPS_LINUX_SYSCALLS_H_
-+ #define SANDBOX_LINUX_SYSTEM_HEADERS_MIPS_LINUX_SYSCALLS_H_
-+ 
-+-#if !defined(__mips__) || (_MIPS_SIM != _ABIO32)
-++#if !defined(__mips__)
-+ #error "Including header on wrong architecture"
-+ #endif
-+ 
-+-- 
-+2.1.0
-+
-added in remote
-  their  100644 78ce108c0f7e2634268034401854593534cd5463 patches/mips64el/chromium/Fix-error-about-relocation-truncated-to-fit-R_MIPS_C.patch
-@@ -0,0 +1,46 @@
-+From 0c64df90e4ca25644ac5aa3f35ab4884f697165e Mon Sep 17 00:00:00 2001
-+From: Wang Qing <wangqing-hf@loongson.cn>
-+Date: Mon, 9 Oct 2017 16:53:22 +0800
-+Subject: [PATCH] Fix error about "relocation truncated to fit: R_MIPS_CALL16"
-+ when cross-compiling shared_library with is_debug on x64.
-+
-+---
-+ content/common/BUILD.gn | 5 +++++
-+ ppapi/proxy/BUILD.gn    | 5 +++++
-+ 2 files changed, 10 insertions(+)
-+
-+diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
-+index fd5c0dc..e91e8348 100644
-+--- a/content/common/BUILD.gn
-++++ b/content/common/BUILD.gn
-+@@ -15,6 +15,11 @@ if (is_mac) {
-+   import("//build/config/mac/mac_sdk.gni")
-+ }
-+ 
-++if (is_debug && current_cpu == "mips64el") {
-++  cflags_cc = [ "-mxgot" ]
-++  cflags_cc += [ "-mlong-calls" ]
-++}
-++
-+ # For feature flags internal to content. See content/public/common:features
-+ # for feature flags that clients of contents need to know about.
-+ buildflag_header("features") {
-+diff --git a/ppapi/proxy/BUILD.gn b/ppapi/proxy/BUILD.gn
-+index b572778..a2630f20 100644
-+--- a/ppapi/proxy/BUILD.gn
-++++ b/ppapi/proxy/BUILD.gn
-+@@ -8,6 +8,11 @@ config("proxy_implementation") {
-+   defines = [ "PPAPI_PROXY_IMPLEMENTATION" ]
-+ }
-+ 
-++if (is_debug && current_cpu == "mips64el") {
-++  cflags_cc = [ "-mxgot" ]
-++  cflags_cc += [ "-mlong-calls" ]
-++}
-++
-+ component("proxy") {
-+   output_name = "ppapi_proxy"
-+ 
-+-- 
-+2.7.4
-+
-added in remote
-  their  100644 2eeda95744e67765e2c539a42913065537030631 patches/mips64el/chromium/Fix-mips-cross-toolchain-build-src-crypto-ec-p256-64.patch
-@@ -0,0 +1,30 @@
-+From 317dff3f396f5e0fc7010a76d7ccbcb708e515a3 Mon Sep 17 00:00:00 2001
-+From: Wang Qing <wangqing-hf@loongson.cn>
-+Date: Sat, 30 Sep 2017 09:30:05 +0800
-+Subject: [PATCH] Fix mips cross-toolchain build src/crypto/ec/p256-64.c with
-+ -O2.
-+
-+---
-+ third_party/boringssl/BUILD.gn | 6 ++++++
-+ 1 file changed, 6 insertions(+)
-+
-+diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn
-+index abe39b2..a7bd880 100644
-+--- a/third_party/boringssl/BUILD.gn
-++++ b/third_party/boringssl/BUILD.gn
-+@@ -32,6 +32,12 @@ config("internal_config") {
-+   ]
-+   if (is_posix) {
-+     cflags_c = [ "-std=c99" ]
-++    # TODO(wangqing): Fix mips cross-toolchain build src/crypto/ec/p256-64.c
-++    # with -O2.
-++    if (current_cpu == "mips64el" && current_cpu != host_cpu) {
-++      cflags_c += [ "-O1" ]
-++    }
-++
-+     defines += [ "_XOPEN_SOURCE=700" ]
-+   }
-+ }
-+-- 
-+2.7.4
-+
-added in remote
-  their  100644 72564d7f904638087953af5da70d0d1f6888ff4e patches/mips64el/chromium/Set-kernal-page-size-to-16K-on-loongson-MIPS-archtec.patch
-@@ -0,0 +1,57 @@
-+From 81bbd23ad0649bfd381eaeecbd58c2c43ba08122 Mon Sep 17 00:00:00 2001
-+From: Wang Qing <wangqing-hf@loongson.cn>
-+Date: Thu, 14 Sep 2017 20:51:10 +0800
-+Subject: [PATCH] Set kernal page size to 16K on loongson(MIPS) archtecture.
-+
-+This patch is specail used for mips64.
-+---
-+ base/allocator/partition_allocator/page_allocator.h  | 7 +++++++
-+ base/allocator/partition_allocator/partition_alloc.h | 5 +++++
-+ 2 files changed, 12 insertions(+)
-+
-+diff --git a/base/allocator/partition_allocator/page_allocator.h b/base/allocator/partition_allocator/page_allocator.h
-+index f57beb7..0ef1705 100644
-+--- a/base/allocator/partition_allocator/page_allocator.h
-++++ b/base/allocator/partition_allocator/page_allocator.h
-+@@ -17,6 +17,8 @@ namespace base {
-+ 
-+ #if defined(OS_WIN)
-+ static const size_t kPageAllocationGranularityShift = 16;  // 64KB
-++#elif __mips__
-++static const size_t kPageAllocationGranularityShift = 14;  // 64KB
-+ #else
-+ static const size_t kPageAllocationGranularityShift = 12;  // 4KB
-+ #endif
-+@@ -29,7 +31,12 @@ static const size_t kPageAllocationGranularityBaseMask =
-+ 
-+ // All Blink-supported systems have 4096 sized system pages and can handle
-+ // permissions and commit / decommit at this granularity.
-++// But, on mips have 16384 sized system pages.
-++#ifdef __mips__
-++static const size_t kSystemPageSize = 16384;
-++#else
-+ static const size_t kSystemPageSize = 4096;
-++#endif
-+ static const size_t kSystemPageOffsetMask = kSystemPageSize - 1;
-+ static const size_t kSystemPageBaseMask = ~kSystemPageOffsetMask;
-+ 
-+diff --git a/base/allocator/partition_allocator/partition_alloc.h b/base/allocator/partition_allocator/partition_alloc.h
-+index c720a50..67c3598 100644
-+--- a/base/allocator/partition_allocator/partition_alloc.h
-++++ b/base/allocator/partition_allocator/partition_alloc.h
-+@@ -94,7 +94,12 @@ static const size_t kBucketShift = (kAllocationGranularity == 8) ? 3 : 2;
-+ // system page of the span. For our current max slot span size of 64k and other
-+ // constant values, we pack _all_ PartitionAllocGeneric() sizes perfectly up
-+ // against the end of a system page.
-++// On mips have 16KB pagesize, So kPartitionPageSize is 64KB.
-++#ifdef __mips__
-++static const size_t kPartitionPageShift = 16;  // 64KB
-++#else
-+ static const size_t kPartitionPageShift = 14;  // 16KB
-++#endif
-+ static const size_t kPartitionPageSize = 1 << kPartitionPageShift;
-+ static const size_t kPartitionPageOffsetMask = kPartitionPageSize - 1;
-+ static const size_t kPartitionPageBaseMask = ~kPartitionPageOffsetMask;
-+-- 
-+2.1.0
-+
-added in remote
-  their  100644 2ce380dd579480e9f74648b840e557d6ac6278af patches/mips64el/chromium/backport-sqlite-3d8ec48.patch
-@@ -0,0 +1,18215 @@
-+commit 787328864729c4f9db19b11b9d5e929b694b0d68
-+Author: Victor Costan <pwnall@chromium.org>
-+Date:   Tue Feb 6 23:56:15 2018 +0000
-+
-+    sqlite: Prefix SQLite API methods with chrome_.
-+    
-+    In component builds, SQLite's API methods are exported from the
-+    chromium_sqlite component, which means they are visible to the dynamic
-+    library loader. This opens up the following possibilities:
-+    
-+    1) A system library calls into our SQLite instead of calling into the
-+       system's SQLite library which it was built against. The patches in
-+       our SQLite version lead to different behavior from the system's
-+       SQLite, which can cause subtle failures. This happens if the dynamic
-+       library loader resolves the system library's symbol imports with our
-+       SQLite's exported symbols.
-+    2) A system library loads the system SQLite, and we end up calling into
-+       it, instead of calling into our version of SQLite. This happens if
-+       the dynamic library loader resolves our symbol imports with the
-+       system's SQLite library.
-+    
-+    Both possibilities above lead to the possibility that the component
-+    build will behave differently from the release build, in subtle and
-+    potentially non-deterministic ways. This is not a purely academic
-+    concern. https://crbug.com/807487 happened because we use NSS on Linux,
-+    and NSS invokes SQLite via a complex plugin system. On non-component builds,
-+    NSS (a system library) loads and uses the system version of SQLite. On
-+    component builds, NSS ends up using our SQLite.
-+    
-+    This CL fixes the problem by adding a chrome_ prefix to all the symbols
-+    exported from SQLite3. In C++ libraries, namespaces can make prefixing
-+    easy. Unfortunately, SQLite is a C library, so the prefixing is fairly
-+    heavy-handed. A high-level overview of the approach follows:
-+    
-+    * An extract_sqlite_api Python script reads SQLite's header, extracts
-+      the names of all exported symbols, and writes a header file consisting
-+      of renaming preprocessor macros, e.g.
-+          #define sqlite3_init chrome_sqlite3_init
-+      David Benjamin <davidben@chromium.org> designed the approach and wrote
-+      the original version of the script.
-+    * The script that we use to generate SQLite's amalgamation now also
-+      invokes the extract_sqlite_api script described above, and saves the
-+      output to amalgamation/rename_exports.h.
-+    * The SQLite component exposes an sqlite3.h header that must be used by
-+      all SQLite3 users in Chromium. This header now #includes
-+      rename_exports.h (containing the renaming preprocessor macros) before
-+      #including amalgamation/sqlite3.h.
-+    * sqlite3.c (the main output of the amalgamation process) does not
-+      #include "sqlite3.h". However, in order to facilitate autoconf builds,
-+      it does #include a "config.h", if a certain preprocessor define
-+      exists. We abuse that define to have sqlite.c always load config.h,
-+      and have config.h load our rename_exports.h.
-+    
-+    This CL also adds a PRESUBMIT.py that runs unit tests for the
-+    extract_sqlite_api Python script, which ensures that the script will not
-+    break accidentally. Both the unit tests and the PRESUBIMT script are
-+    inspired from //tools/vim.
-+    
-+    Bug: 807093, 807487
-+    Change-Id: If3868ba119ffd4ccbb06d1a6fcd4cc2ecd9ef2ae
-+    Reviewed-on: https://chromium-review.googlesource.com/898549
-+    Reviewed-by: Chris Mumford <cmumford@chromium.org>
-+    Commit-Queue: Victor Costan <pwnall@chromium.org>
-+    Cr-Commit-Position: refs/heads/master@{#534843}
-+
-+diff --git a/third_party/sqlite/BUILD.gn b/third_party/sqlite/BUILD.gn
-+index c23f10a..f30d6fa 100644
-+--- a/third_party/sqlite/BUILD.gn
-++++ b/third_party/sqlite/BUILD.gn
-+@@ -75,13 +75,14 @@ config("chromium_sqlite3_compile_options") {
-+     # syntax working but execution failing.  Review:
-+     #   src/src/parse.py
-+     #   src/tool/mkkeywordhash.c
-+-  ]
-+ 
-+-  # Pull in config.h on Linux.  This allows use of preprocessor macros which
-+-  # are not available to the build config.
-+-  if (is_linux) {
-+-    defines += [ "_HAVE_SQLITE_CONFIG_H" ]
-+-  }
-++    # Chromium does not use sqlite3_{enable_}load_extension().
-++    # Asides from giving us fairly minor code savings, this option disables code
-++    # that breaks our method for renaming SQLite's exported symbols. Last,
-++    # there's a tiny security benefit to knowing that WebSQL can't possibly
-++    # reach extension loading code.
-++    "SQLITE_OMIT_LOAD_EXTENSION",
-++  ]
-+ 
-+   if (using_sanitizer) {
-+     # Limit max length of data blobs and queries for fuzzing builds by 128 MB.
-+@@ -138,7 +139,13 @@ if (!use_system_sqlite) {
-+     ]
-+ 
-+     cflags = []
-+-    defines = []
-++    defines = [
-++      # The generated sqlite3.c does not include sqlite3.h, so we cannot easily
-++      # inject the renaming macros in amalgamation/export_renames.h. However,
-++      # if the macro below is defined, sqlite3.c will #include "config.h", which
-++      # can be used to inject the macros.
-++      "_HAVE_SQLITE_CONFIG_H",
-++    ]
-+ 
-+     if (is_component_build) {
-+       if (is_win) {
-+@@ -168,7 +175,10 @@ if (!use_system_sqlite) {
-+       ]
-+     }
-+ 
-+-    include_dirs = [ "amalgamation" ]
-++    include_dirs = [
-++      ".",  # sqlite3.h here must override the one in amalgamation/.
-++      "amalgamation",
-++    ]
-+ 
-+     configs -= [ "//build/config/compiler:chromium_code" ]
-+     configs += [
-+@@ -222,11 +232,14 @@ if (!use_system_sqlite) {
-+ 
-+   if (is_linux) {
-+     executable("sqlite_shell") {
-+-      # So shell.c can find the correct sqlite3.h.
-+-      include_dirs = [ "amalgamation" ]
-++      include_dirs = [
-++        # shell.c contains an '#include "sqlite3.h", which we want to be
-++        # resolved to //third_party/sqlite/shell.h.
-++        ".",
-++      ]
-+ 
-+       sources = [
-+-        "amalgamation/shell.c",
-++        "amalgamation/shell/shell.c",
-+         "src/src/shell_icu_linux.c",
-+ 
-+         # Include a dummy c++ file to force linking of libstdc++.
-+diff --git a/third_party/sqlite/PRESUBMIT.py b/third_party/sqlite/PRESUBMIT.py
-+new file mode 100644
-+index 0000000..c80b754b
-+--- /dev/null
-++++ b/third_party/sqlite/PRESUBMIT.py
-+@@ -0,0 +1,18 @@
-++# Copyright 2018 The Chromium Authors. All rights reserved.
-++# Use of this source code is governed by a BSD-style license that can be
-++# found in the LICENSE file.
-++"""Presubmit tests for /third_party/sqlite.
-++
-++Runs Python unit tests in /third_party/sqlite/scripts on upload.
-++"""
-++
-++
-++def CheckChangeOnUpload(input_api, output_api):
-++  results = []
-++
-++  results += input_api.RunTests(
-++      input_api.canned_checks.GetUnitTests(input_api, output_api, [
-++          'scripts/extract_sqlite_api_unittest.py'
-++      ]))
-++
-++  return results
-+diff --git a/third_party/sqlite/README.chromium b/third_party/sqlite/README.chromium
-+index 8a0fd02..0b8a1b5 100644
-+--- a/third_party/sqlite/README.chromium
-++++ b/third_party/sqlite/README.chromium
-+@@ -42,7 +42,7 @@ The directory structure is as follows. Files common to all third_party projects
-+                   build, which merges all the code in one .c file and one .h
-+                   file. See https://www.sqlite.org/amalgamation.html
-+ * amalgamation/config.h - Linux build configuration
-+-* google_generate_amalgamation.sh - Script that generates the amalgamation
-++* scripts/ - Scripts that generate the files in the amalgamation
-+ * sqlite.h - The header used by the rest of Chromium to include SQLite. This
-+              forwards to amalgamation/sqlite3.h
-+ * fuzz/ - Google OSS-Fuzz (ClusterFuzz) testing for Chromium's SQLite build
-+@@ -54,7 +54,7 @@ The directory structure is as follows. Files common to all third_party projects
-+ third_party/sqlite/src is the patched source from SQLite.  This is used to
-+ generate the amalgamation, a concatenation of all of the files into a giant
-+ sqlite3.c.  To prototype, edit in src/, then call
-+-  ./google_generate_amalgamation.sh
-++  ./scripts/generate_amalgamation.sh
-+ to regenerate sqlite3.c.  The code in src/ is much easier to edit, and the
-+ SQLite test framework can easily be run.  During development it may be
-+ convenient to modify BUILD.gn based on src/main.mk to just pull in the src/
-+@@ -101,8 +101,8 @@ git add patches/*.patch
-+ git commit -m "Rebuild patches for sqlite_${BASE}"
-+ 
-+ # Re-generate the amalgamation.
-+-./google_generate_amalgamation.sh
-+-git commit -m 'google_generate_amalgamation.sh' amalgamation/
-++./scripts/generate_amalgamation.sh
-++git commit -m './scripts/generate_amalgamation.sh' amalgamation/
-+ # At this point everything should build and work.
-+ 
-+ # Do a squash upload.  This should add your single patch to patches/, and apply
-+@@ -204,16 +204,23 @@ git rebase sqlite-new-base
-+ 
-+ #### Finally, create the branch that we'll upload.
-+ git new-branch --upstream-current sqlite-new-cl
-+-./google_generate_amalgamation.sh
-++./scripts/generate_amalgamation.sh
-++
-++#### Validate the upgrade.
-+ # The goal is to have a set of reasonably-independent CLs which can be
-+ # understood separately, so that future importers can sensibly determine how to
-+ # handle conflicts.  So use git-rebase and slipstream fixups back into their
-+ # original CL until everything builds and works.
-+ cd ../..
-+ ninja -C out/Default
-++# Check that extract_sqlite_api.py added chrome_ to all exported symbols.
-++# Only "_fini" and "_init" should be unprefixed.
-++nm -B out/Default/libchromium_sqlite3.so | cut -c 18- | sort | grep '^T'
-+ out/Default/sql_unittests
-+ third_party/WebKit/Tools/Scripts/run-webkit-tests -t Default storage/websql/*
-+ cd third_party/sqlite
-++
-++#### Create the review.
-+ # Rebuild the patch set.
-+ git rm patches/*
-+ git format-patch --output-directory=patches --ignore-space-change \
-+diff --git a/third_party/sqlite/amalgamation/README b/third_party/sqlite/amalgamation/README
-+deleted file mode 100644
-+index 472000f..0000000
-+--- a/third_party/sqlite/amalgamation/README
-++++ /dev/null
-+@@ -1,10 +0,0 @@
-+-DO NOT EDIT FILES IN THIS DIRECTORY.
-+-
-+-These files are automatically generated from the sqlite originals.  If
-+-you edit these files, your edits will be dropped in a future import of
-+-the sqlite code.
-+-
-+-See ../google_generate_amalgamation.sh for information on how these
-+-files are built.
-+-
-+-Scott Hess, April 6, 2011.
-+diff --git a/third_party/sqlite/amalgamation/README.md b/third_party/sqlite/amalgamation/README.md
-+new file mode 100644
-+index 0000000..1175041
-+--- /dev/null
-++++ b/third_party/sqlite/amalgamation/README.md
-+@@ -0,0 +1,8 @@
-++** DO NOT EDIT FILES IN THIS DIRECTORY. **
-++
-++These files are automatically generated from the sqlite originals. If you
-++edit these files, your edits will be dropped in a future import of the sqlite
-++code.
-++
-++See the contents of `../scripts` for information on how these files are
-++built.
-+\ No newline at end of file
-+diff --git a/third_party/sqlite/amalgamation/config.h b/third_party/sqlite/amalgamation/config.h
-+index 9980ed7..652a13e 100644
-+--- a/third_party/sqlite/amalgamation/config.h
-++++ b/third_party/sqlite/amalgamation/config.h
-+@@ -1,41 +1,41 @@
-+-/* On Windows and OSX, SQLite uses preprocessor macros to configure itself.  On
-+- * Linux, it expects config.h from autoconf.  autoconf generates config.h by
-+- * compiling a series of probe programs, and Chromium's build system has no
-+- * "configure" phase to put such generation in.  This file is a workaround for
-+- * this issue.
-+- */
-+-/* TODO(shess): Expand this to OSX and Windows? */
-+-/* TODO(shess): Consider config_linux.h, config_mac.h, config_win.h? */
-+-
-+-/* NOTE(shess): This file is included by sqlite3.c, be very careful about adding
-+- * #include lines.
-+- */
-+-/* TODO(shess): Consider using build/build_config.h for OS_ macros. */
-+-/* TODO(shess): build_config.h uses unistd.h, perhaps for portability reasons,
-+- * but AFAICT there are no current portability concerns here.  limits.h is
-+- * another alternative.
-+- */
-++// Copyright 2018 The Chromium Authors. All rights reserved.
-++// Use of this source code is governed by a BSD-style license that can be
-++// found in the LICENSE file.
-++
-++#ifndef THIRD_PARTY_SQLITE_AMALGAMATION_CONFIG_H_
-++#define THIRD_PARTY_SQLITE_AMALGAMATION_CONFIG_H_
-++
-++// This file is included by sqlite3.c fairly early.
-++
-++// We prefix chrome_ to SQLite's exported symbols, so that we don't clash with
-++// other SQLite libraries loaded by the system libraries. This only matters when
-++// using the component build, where our SQLite's symbols are visible to the
-++// dynamic library loader.
-++#include "third_party/sqlite/amalgamation/rename_exports.h"
-++
-++// Linux-specific configuration fixups.
-++#if defined(__linux__)
-+ 
-+ // features.h, included below, indirectly includes sys/mman.h. The latter header
-+ // only defines mremap if _GNU_SOURCE is defined. Depending on the order of the
-+ // files in the amalgamation, removing the define below may result in a build
-+ // error on Linux.
-+ #if defined(__GNUC__) && !defined(_GNU_SOURCE)
-+-# define _GNU_SOURCE
-++#define _GNU_SOURCE
-+ #endif
-+-
-+ #include <features.h>
-+ 
-+-/* SQLite wants to track malloc sizes.  On OSX it uses malloc_size(), on
-+- * Windows _msize(), elsewhere it handles it manually by enlarging the malloc
-+- * and injecting a field.  Enable malloc_usable_size() for Linux.
-+- *
-+- * malloc_usable_size() is not exported by the Android NDK.  It is not
-+- * implemented by uclibc.
-+- */
-+-#if defined(__linux__) && !defined(__UCLIBC__)
-++// SQLite wants to track malloc sizes. On OSX it uses malloc_size(), on Windows
-++// _msize(), elsewhere it handles it manually by enlarging the malloc and
-++// injecting a field. Enable malloc_usable_size() for Linux.
-++//
-++// malloc_usable_size() is not exported by the Android NDK. It is not
-++// implemented by uclibc.
-++#if !defined(__UCLIBC__) && !defined(__ANDROID__)
-+ #define HAVE_MALLOC_H 1
-+ #define HAVE_MALLOC_USABLE_SIZE 1
-+ #endif
-+ 
-+-/* TODO(shess): Eat other config options from gn and gyp? */
-++#endif  // defined(__linux__)
-++
-++#endif  // THIRD_PARTY_SQLITE_AMALGAMATION_CONFIG_H_
-+diff --git a/third_party/sqlite/amalgamation/rename_exports.h b/third_party/sqlite/amalgamation/rename_exports.h
-+new file mode 100644
-+index 0000000..ea018ac
-+--- /dev/null
-++++ b/third_party/sqlite/amalgamation/rename_exports.h
-+@@ -0,0 +1,353 @@
-++// Copyright 2018 The Chromium Authors. All rights reserved.
-++// Use of this source code is governed by a BSD-style license that can be
-++// found in the LICENSE file.
-++
-++// This file is generated by extract_sqlite_api.py.
-++
-++#ifndef THIRD_PARTY_SQLITE_AMALGAMATION_RENAME_EXPORTS_H_
-++#define THIRD_PARTY_SQLITE_AMALGAMATION_RENAME_EXPORTS_H_
-++
-++#define sqlite3_activate_cerod chrome_sqlite3_activate_cerod  // Lines 5424-5426
-++#define sqlite3_activate_see chrome_sqlite3_activate_see      // Lines 5414-5416
-++#define sqlite3_aggregate_context chrome_sqlite3_aggregate_context  // Line 4961
-++#define sqlite3_aggregate_count chrome_sqlite3_aggregate_count      // Line 4766
-++#define sqlite3_auto_extension chrome_sqlite3_auto_extension        // Line 6055
-++#define sqlite3_backup_finish chrome_sqlite3_backup_finish          // Line 7840
-++#define sqlite3_backup_init chrome_sqlite3_backup_init  // Lines 7833-7838
-++#define sqlite3_backup_pagecount chrome_sqlite3_backup_pagecount  // Line 7842
-++#define sqlite3_backup_remaining chrome_sqlite3_backup_remaining  // Line 7841
-++#define sqlite3_backup_step chrome_sqlite3_backup_step            // Line 7839
-++#define sqlite3_bind_blob chrome_sqlite3_bind_blob                // Line 3979
-++#define sqlite3_bind_blob64 chrome_sqlite3_bind_blob64  // Lines 3980-3981
-++#define sqlite3_bind_double chrome_sqlite3_bind_double  // Line 3982
-++#define sqlite3_bind_int chrome_sqlite3_bind_int        // Line 3983
-++#define sqlite3_bind_int64 chrome_sqlite3_bind_int64    // Line 3984
-++#define sqlite3_bind_null chrome_sqlite3_bind_null      // Line 3985
-++#define sqlite3_bind_parameter_count \
-++  chrome_sqlite3_bind_parameter_count  // Line 4014
-++#define sqlite3_bind_parameter_index \
-++  chrome_sqlite3_bind_parameter_index  // Line 4060
-++#define sqlite3_bind_parameter_name \
-++  chrome_sqlite3_bind_parameter_name                        // Line 4042
-++#define sqlite3_bind_pointer chrome_sqlite3_bind_pointer    // Line 3991
-++#define sqlite3_bind_text chrome_sqlite3_bind_text          // Line 3986
-++#define sqlite3_bind_text16 chrome_sqlite3_bind_text16      // Line 3987
-++#define sqlite3_bind_text64 chrome_sqlite3_bind_text64      // Lines 3988-3989
-++#define sqlite3_bind_value chrome_sqlite3_bind_value        // Line 3990
-++#define sqlite3_bind_zeroblob chrome_sqlite3_bind_zeroblob  // Line 3992
-++#define sqlite3_bind_zeroblob64 chrome_sqlite3_bind_zeroblob64  // Line 3993
-++#define sqlite3_blob_bytes chrome_sqlite3_blob_bytes            // Line 6596
-++#define sqlite3_blob_close chrome_sqlite3_blob_close            // Line 6580
-++#define sqlite3_blob_open chrome_sqlite3_blob_open        // Lines 6524-6532
-++#define sqlite3_blob_read chrome_sqlite3_blob_read        // Line 6625
-++#define sqlite3_blob_reopen chrome_sqlite3_blob_reopen    // Line 6557
-++#define sqlite3_blob_write chrome_sqlite3_blob_write      // Line 6667
-++#define sqlite3_busy_handler chrome_sqlite3_busy_handler  // Line 2386
-++#define sqlite3_busy_timeout chrome_sqlite3_busy_timeout  // Line 2409
-++#define sqlite3_cancel_auto_extension \
-++  chrome_sqlite3_cancel_auto_extension                        // Line 6067
-++#define sqlite3_changes chrome_sqlite3_changes                // Line 2228
-++#define sqlite3_clear_bindings chrome_sqlite3_clear_bindings  // Line 4070
-++#define sqlite3_close chrome_sqlite3_close                    // Line 331
-++#define sqlite3_close_v2 chrome_sqlite3_close_v2              // Line 332
-++#define sqlite3_collation_needed \
-++  chrome_sqlite3_collation_needed  // Lines 5363-5367
-++#define sqlite3_collation_needed16 \
-++  chrome_sqlite3_collation_needed16                           // Lines 5368-5372
-++#define sqlite3_column_blob chrome_sqlite3_column_blob        // Line 4536
-++#define sqlite3_column_bytes chrome_sqlite3_column_bytes      // Line 4543
-++#define sqlite3_column_bytes16 chrome_sqlite3_column_bytes16  // Line 4544
-++#define sqlite3_column_count chrome_sqlite3_column_count      // Line 4086
-++#define sqlite3_column_database_name \
-++  chrome_sqlite3_column_database_name  // Line 4164
-++#define sqlite3_column_database_name16 \
-++  chrome_sqlite3_column_database_name16                             // Line 4165
-++#define sqlite3_column_decltype chrome_sqlite3_column_decltype      // Line 4201
-++#define sqlite3_column_decltype16 chrome_sqlite3_column_decltype16  // Line 4202
-++#define sqlite3_column_double chrome_sqlite3_column_double          // Line 4537
-++#define sqlite3_column_int chrome_sqlite3_column_int                // Line 4538
-++#define sqlite3_column_int64 chrome_sqlite3_column_int64            // Line 4539
-++#define sqlite3_column_name chrome_sqlite3_column_name              // Line 4115
-++#define sqlite3_column_name16 chrome_sqlite3_column_name16          // Line 4116
-++#define sqlite3_column_origin_name \
-++  chrome_sqlite3_column_origin_name  // Line 4168
-++#define sqlite3_column_origin_name16 \
-++  chrome_sqlite3_column_origin_name16                               // Line 4169
-++#define sqlite3_column_table_name chrome_sqlite3_column_table_name  // Line 4166
-++#define sqlite3_column_table_name16 \
-++  chrome_sqlite3_column_table_name16                                // Line 4167
-++#define sqlite3_column_text chrome_sqlite3_column_text              // Line 4540
-++#define sqlite3_column_text16 chrome_sqlite3_column_text16          // Line 4541
-++#define sqlite3_column_type chrome_sqlite3_column_type              // Line 4545
-++#define sqlite3_column_value chrome_sqlite3_column_value            // Line 4542
-++#define sqlite3_commit_hook chrome_sqlite3_commit_hook              // Line 5670
-++#define sqlite3_compileoption_get chrome_sqlite3_compileoption_get  // Line 191
-++#define sqlite3_compileoption_used \
-++  chrome_sqlite3_compileoption_used                                 // Line 190
-++#define sqlite3_complete chrome_sqlite3_complete                    // Line 2324
-++#define sqlite3_complete16 chrome_sqlite3_complete16                // Line 2325
-++#define sqlite3_config chrome_sqlite3_config                        // Line 1507
-++#define sqlite3_context_db_handle chrome_sqlite3_context_db_handle  // Line 4988
-++#define sqlite3_create_collation \
-++  chrome_sqlite3_create_collation  // Lines 5313-5319
-++#define sqlite3_create_collation16 \
-++  chrome_sqlite3_create_collation16  // Lines 5328-5334
-++#define sqlite3_create_collation_v2 \
-++  chrome_sqlite3_create_collation_v2  // Lines 5320-5327
-++#define sqlite3_create_function \
-++  chrome_sqlite3_create_function  // Lines 4700-4709
-++#define sqlite3_create_function16 \
-++  chrome_sqlite3_create_function16  // Lines 4710-4719
-++#define sqlite3_create_function_v2 \
-++  chrome_sqlite3_create_function_v2                         // Lines 4720-4730
-++#define sqlite3_create_module chrome_sqlite3_create_module  // Lines 6327-6332
-++#define sqlite3_create_module_v2 \
-++  chrome_sqlite3_create_module_v2                             // Lines 6333-6339
-++#define sqlite3_data_count chrome_sqlite3_data_count          // Line 4307
-++#define sqlite3_data_directory chrome_sqlite3_data_directory  // Line 5541
-++#define sqlite3_db_cacheflush chrome_sqlite3_db_cacheflush    // Line 8524
-++#define sqlite3_db_config chrome_sqlite3_db_config            // Line 1526
-++#define sqlite3_db_filename chrome_sqlite3_db_filename        // Line 5595
-++#define sqlite3_db_handle chrome_sqlite3_db_handle            // Line 5578
-++#define sqlite3_db_mutex chrome_sqlite3_db_mutex              // Line 6971
-++#define sqlite3_db_readonly chrome_sqlite3_db_readonly        // Line 5605
-++#define sqlite3_db_release_memory chrome_sqlite3_db_release_memory  // Line 5793
-++#define sqlite3_db_status chrome_sqlite3_db_status                  // Line 7200
-++#define sqlite3_declare_vtab chrome_sqlite3_declare_vtab            // Line 6396
-++#define sqlite3_enable_load_extension \
-++  chrome_sqlite3_enable_load_extension  // Line 6017
-++#define sqlite3_enable_shared_cache \
-++  chrome_sqlite3_enable_shared_cache                      // Line 5763
-++#define sqlite3_errcode chrome_sqlite3_errcode            // Line 3403
-++#define sqlite3_errmsg chrome_sqlite3_errmsg              // Line 3405
-++#define sqlite3_errmsg16 chrome_sqlite3_errmsg16          // Line 3406
-++#define sqlite3_errstr chrome_sqlite3_errstr              // Line 3407
-++#define sqlite3_exec chrome_sqlite3_exec                  // Lines 403-409
-++#define sqlite3_expanded_sql chrome_sqlite3_expanded_sql  // Line 3748
-++#define sqlite3_expired chrome_sqlite3_expired            // Line 4767
-++#define sqlite3_extended_errcode chrome_sqlite3_extended_errcode  // Line 3404
-++#define sqlite3_extended_result_codes \
-++  chrome_sqlite3_extended_result_codes                        // Line 2103
-++#define sqlite3_file_control chrome_sqlite3_file_control      // Line 7006
-++#define sqlite3_finalize chrome_sqlite3_finalize              // Line 4573
-++#define sqlite3_free chrome_sqlite3_free                      // Line 2695
-++#define sqlite3_free_table chrome_sqlite3_free_table          // Line 2492
-++#define sqlite3_get_autocommit chrome_sqlite3_get_autocommit  // Line 5565
-++#define sqlite3_get_auxdata chrome_sqlite3_get_auxdata        // Line 5047
-++#define sqlite3_get_table chrome_sqlite3_get_table            // Lines 2484-2491
-++#define sqlite3_global_recover chrome_sqlite3_global_recover  // Line 4769
-++#define sqlite3_initialize chrome_sqlite3_initialize          // Line 1471
-++#define sqlite3_interrupt chrome_sqlite3_interrupt            // Line 2289
-++#define sqlite3_key chrome_sqlite3_key                        // Lines 5382-5385
-++#define sqlite3_key_v2 chrome_sqlite3_key_v2                  // Lines 5386-5390
-++#define sqlite3_last_insert_rowid chrome_sqlite3_last_insert_rowid  // Line 2165
-++#define sqlite3_libversion chrome_sqlite3_libversion                // Line 163
-++#define sqlite3_libversion_number chrome_sqlite3_libversion_number  // Line 165
-++#define sqlite3_limit chrome_sqlite3_limit                          // Line 3475
-++#define sqlite3_load_extension chrome_sqlite3_load_extension  // Lines 5985-5990
-++#define sqlite3_log chrome_sqlite3_log                        // Line 8061
-++#define sqlite3_malloc chrome_sqlite3_malloc                  // Line 2691
-++#define sqlite3_malloc64 chrome_sqlite3_malloc64              // Line 2692
-++#define sqlite3_memory_alarm chrome_sqlite3_memory_alarm      // Lines 4771-4772
-++#define sqlite3_memory_highwater chrome_sqlite3_memory_highwater  // Line 2722
-++#define sqlite3_memory_used chrome_sqlite3_memory_used            // Line 2721
-++#define sqlite3_mprintf chrome_sqlite3_mprintf                    // Line 2598
-++#define sqlite3_msize chrome_sqlite3_msize                        // Line 2696
-++#define sqlite3_mutex_alloc chrome_sqlite3_mutex_alloc            // Line 6816
-++#define sqlite3_mutex_enter chrome_sqlite3_mutex_enter            // Line 6818
-++#define sqlite3_mutex_free chrome_sqlite3_mutex_free              // Line 6817
-++#define sqlite3_mutex_held chrome_sqlite3_mutex_held              // Line 6930
-++#define sqlite3_mutex_leave chrome_sqlite3_mutex_leave            // Line 6820
-++#define sqlite3_mutex_notheld chrome_sqlite3_mutex_notheld        // Line 6931
-++#define sqlite3_mutex_try chrome_sqlite3_mutex_try                // Line 6819
-++#define sqlite3_next_stmt chrome_sqlite3_next_stmt                // Line 5621
-++#define sqlite3_open chrome_sqlite3_open        // Lines 3303-3306
-++#define sqlite3_open16 chrome_sqlite3_open16    // Lines 3307-3310
-++#define sqlite3_open_v2 chrome_sqlite3_open_v2  // Lines 3311-3316
-++#define sqlite3_os_end chrome_sqlite3_os_end    // Line 1474
-++#define sqlite3_os_init chrome_sqlite3_os_init  // Line 1473
-++#define sqlite3_overload_function chrome_sqlite3_overload_function  // Line 6415
-++#define sqlite3_prepare chrome_sqlite3_prepare            // Lines 3670-3676
-++#define sqlite3_prepare16 chrome_sqlite3_prepare16        // Lines 3692-3698
-++#define sqlite3_prepare16_v2 chrome_sqlite3_prepare16_v2  // Lines 3699-3705
-++#define sqlite3_prepare16_v3 chrome_sqlite3_prepare16_v3  // Lines 3706-3713
-++#define sqlite3_prepare_v2 chrome_sqlite3_prepare_v2      // Lines 3677-3683
-++#define sqlite3_prepare_v3 chrome_sqlite3_prepare_v3      // Lines 3684-3691
-++#define sqlite3_preupdate_count chrome_sqlite3_preupdate_count  // Line 8623
-++#define sqlite3_preupdate_depth chrome_sqlite3_preupdate_depth  // Line 8624
-++#define sqlite3_preupdate_hook chrome_sqlite3_preupdate_hook  // Lines 8609-8621
-++#define sqlite3_preupdate_new chrome_sqlite3_preupdate_new    // Line 8625
-++#define sqlite3_preupdate_old chrome_sqlite3_preupdate_old    // Line 8622
-++#define sqlite3_profile chrome_sqlite3_profile                // Lines 2946-2947
-++#define sqlite3_progress_handler chrome_sqlite3_progress_handler  // Line 3074
-++#define sqlite3_randomness chrome_sqlite3_randomness              // Line 2745
-++#define sqlite3_realloc chrome_sqlite3_realloc                    // Line 2693
-++#define sqlite3_realloc64 chrome_sqlite3_realloc64                // Line 2694
-++#define sqlite3_rekey chrome_sqlite3_rekey                    // Lines 5400-5403
-++#define sqlite3_rekey_v2 chrome_sqlite3_rekey_v2              // Lines 5404-5408
-++#define sqlite3_release_memory chrome_sqlite3_release_memory  // Line 5779
-++#define sqlite3_reset chrome_sqlite3_reset                    // Line 4600
-++#define sqlite3_reset_auto_extension \
-++  chrome_sqlite3_reset_auto_extension                         // Line 6075
-++#define sqlite3_result_blob chrome_sqlite3_result_blob        // Line 5195
-++#define sqlite3_result_blob64 chrome_sqlite3_result_blob64    // Lines 5196-5197
-++#define sqlite3_result_double chrome_sqlite3_result_double    // Line 5198
-++#define sqlite3_result_error chrome_sqlite3_result_error      // Line 5199
-++#define sqlite3_result_error16 chrome_sqlite3_result_error16  // Line 5200
-++#define sqlite3_result_error_code chrome_sqlite3_result_error_code  // Line 5203
-++#define sqlite3_result_error_nomem \
-++  chrome_sqlite3_result_error_nomem  // Line 5202
-++#define sqlite3_result_error_toobig \
-++  chrome_sqlite3_result_error_toobig                            // Line 5201
-++#define sqlite3_result_int chrome_sqlite3_result_int            // Line 5204
-++#define sqlite3_result_int64 chrome_sqlite3_result_int64        // Line 5205
-++#define sqlite3_result_null chrome_sqlite3_result_null          // Line 5206
-++#define sqlite3_result_pointer chrome_sqlite3_result_pointer    // Line 5214
-++#define sqlite3_result_subtype chrome_sqlite3_result_subtype    // Line 5231
-++#define sqlite3_result_text chrome_sqlite3_result_text          // Line 5207
-++#define sqlite3_result_text16 chrome_sqlite3_result_text16      // Line 5210
-++#define sqlite3_result_text16be chrome_sqlite3_result_text16be  // Line 5212
-++#define sqlite3_result_text16le chrome_sqlite3_result_text16le  // Line 5211
-++#define sqlite3_result_text64 chrome_sqlite3_result_text64  // Lines 5208-5209
-++#define sqlite3_result_value chrome_sqlite3_result_value    // Line 5213
-++#define sqlite3_result_zeroblob chrome_sqlite3_result_zeroblob      // Line 5215
-++#define sqlite3_result_zeroblob64 chrome_sqlite3_result_zeroblob64  // Line 5216
-++#define sqlite3_rollback_hook chrome_sqlite3_rollback_hook          // Line 5671
-++#define sqlite3_rtree_geometry_callback \
-++  chrome_sqlite3_rtree_geometry_callback  // Lines 8872-8877
-++#define sqlite3_rtree_query_callback \
-++  chrome_sqlite3_rtree_query_callback                         // Lines 8898-8904
-++#define sqlite3_set_authorizer chrome_sqlite3_set_authorizer  // Lines 2836-2840
-++#define sqlite3_set_auxdata chrome_sqlite3_set_auxdata        // Line 5048
-++#define sqlite3_set_last_insert_rowid \
-++  chrome_sqlite3_set_last_insert_rowid                      // Line 2175
-++#define sqlite3_shutdown chrome_sqlite3_shutdown            // Line 1472
-++#define sqlite3_sleep chrome_sqlite3_sleep                  // Line 5446
-++#define sqlite3_snapshot_cmp chrome_sqlite3_snapshot_cmp    // Lines 8792-8795
-++#define sqlite3_snapshot_free chrome_sqlite3_snapshot_free  // Line 8768
-++#define sqlite3_snapshot_get chrome_sqlite3_snapshot_get    // Lines 8713-8717
-++#define sqlite3_snapshot_open chrome_sqlite3_snapshot_open  // Lines 8751-8755
-++#define sqlite3_snapshot_recover chrome_sqlite3_snapshot_recover    // Line 8817
-++#define sqlite3_snprintf chrome_sqlite3_snprintf                    // Line 2600
-++#define sqlite3_soft_heap_limit chrome_sqlite3_soft_heap_limit      // Line 5857
-++#define sqlite3_soft_heap_limit64 chrome_sqlite3_soft_heap_limit64  // Line 5846
-++#define sqlite3_sourceid chrome_sqlite3_sourceid                    // Line 164
-++#define sqlite3_sql chrome_sqlite3_sql                              // Line 3747
-++#define sqlite3_status chrome_sqlite3_status                        // Line 7090
-++#define sqlite3_status64 chrome_sqlite3_status64            // Lines 7091-7096
-++#define sqlite3_step chrome_sqlite3_step                    // Line 4286
-++#define sqlite3_stmt_busy chrome_sqlite3_stmt_busy          // Line 3805
-++#define sqlite3_stmt_readonly chrome_sqlite3_stmt_readonly  // Line 3784
-++#define sqlite3_stmt_scanstatus \
-++  chrome_sqlite3_stmt_scanstatus  // Lines 8476-8481
-++#define sqlite3_stmt_scanstatus_reset \
-++  chrome_sqlite3_stmt_scanstatus_reset                    // Line 8492
-++#define sqlite3_stmt_status chrome_sqlite3_stmt_status    // Line 7343
-++#define sqlite3_strglob chrome_sqlite3_strglob            // Line 7992
-++#define sqlite3_stricmp chrome_sqlite3_stricmp            // Line 7974
-++#define sqlite3_strlike chrome_sqlite3_strlike            // Line 8038
-++#define sqlite3_strnicmp chrome_sqlite3_strnicmp          // Line 7975
-++#define sqlite3_system_errno chrome_sqlite3_system_errno  // Line 8638
-++#define sqlite3_table_column_metadata \
-++  chrome_sqlite3_table_column_metadata                        // Lines 5929-5939
-++#define sqlite3_temp_directory chrome_sqlite3_temp_directory  // Line 5504
-++#define sqlite3_test_control chrome_sqlite3_test_control      // Line 7025
-++#define sqlite3_thread_cleanup chrome_sqlite3_thread_cleanup  // Line 4770
-++#define sqlite3_threadsafe chrome_sqlite3_threadsafe          // Line 230
-++#define sqlite3_total_changes chrome_sqlite3_total_changes    // Line 2252
-++#define sqlite3_trace chrome_sqlite3_trace                    // Lines 2944-2945
-++#define sqlite3_trace_v2 chrome_sqlite3_trace_v2              // Lines 3035-3040
-++#define sqlite3_transfer_bindings chrome_sqlite3_transfer_bindings  // Line 4768
-++#define sqlite3_unlock_notify chrome_sqlite3_unlock_notify    // Lines 7959-7963
-++#define sqlite3_update_hook chrome_sqlite3_update_hook        // Lines 5722-5726
-++#define sqlite3_uri_boolean chrome_sqlite3_uri_boolean        // Line 3358
-++#define sqlite3_uri_int64 chrome_sqlite3_uri_int64            // Line 3359
-++#define sqlite3_uri_parameter chrome_sqlite3_uri_parameter    // Line 3357
-++#define sqlite3_user_data chrome_sqlite3_user_data            // Line 4976
-++#define sqlite3_value_blob chrome_sqlite3_value_blob          // Line 4874
-++#define sqlite3_value_bytes chrome_sqlite3_value_bytes        // Line 4883
-++#define sqlite3_value_bytes16 chrome_sqlite3_value_bytes16    // Line 4884
-++#define sqlite3_value_double chrome_sqlite3_value_double      // Line 4875
-++#define sqlite3_value_dup chrome_sqlite3_value_dup            // Line 4915
-++#define sqlite3_value_free chrome_sqlite3_value_free          // Line 4916
-++#define sqlite3_value_int chrome_sqlite3_value_int            // Line 4876
-++#define sqlite3_value_int64 chrome_sqlite3_value_int64        // Line 4877
-++#define sqlite3_value_nochange chrome_sqlite3_value_nochange  // Line 4887
-++#define sqlite3_value_numeric_type \
-++  chrome_sqlite3_value_numeric_type                               // Line 4886
-++#define sqlite3_value_pointer chrome_sqlite3_value_pointer        // Line 4878
-++#define sqlite3_value_subtype chrome_sqlite3_value_subtype        // Line 4899
-++#define sqlite3_value_text chrome_sqlite3_value_text              // Line 4879
-++#define sqlite3_value_text16 chrome_sqlite3_value_text16          // Line 4880
-++#define sqlite3_value_text16be chrome_sqlite3_value_text16be      // Line 4882
-++#define sqlite3_value_text16le chrome_sqlite3_value_text16le      // Line 4881
-++#define sqlite3_value_type chrome_sqlite3_value_type              // Line 4885
-++#define sqlite3_version chrome_sqlite3_version                    // Line 162
-++#define sqlite3_vfs_find chrome_sqlite3_vfs_find                  // Line 6698
-++#define sqlite3_vfs_register chrome_sqlite3_vfs_register          // Line 6699
-++#define sqlite3_vfs_unregister chrome_sqlite3_vfs_unregister      // Line 6700
-++#define sqlite3_vmprintf chrome_sqlite3_vmprintf                  // Line 2599
-++#define sqlite3_vsnprintf chrome_sqlite3_vsnprintf                // Line 2601
-++#define sqlite3_vtab_collation chrome_sqlite3_vtab_collation      // Line 8371
-++#define sqlite3_vtab_config chrome_sqlite3_vtab_config            // Line 8284
-++#define sqlite3_vtab_nochange chrome_sqlite3_vtab_nochange        // Line 8356
-++#define sqlite3_vtab_on_conflict chrome_sqlite3_vtab_on_conflict  // Line 8337
-++#define sqlite3_wal_autocheckpoint \
-++  chrome_sqlite3_wal_autocheckpoint                           // Line 8132
-++#define sqlite3_wal_checkpoint chrome_sqlite3_wal_checkpoint  // Line 8154
-++#define sqlite3_wal_checkpoint_v2 \
-++  chrome_sqlite3_wal_checkpoint_v2                            // Lines 8248-8254
-++#define sqlite3_wal_hook chrome_sqlite3_wal_hook              // Lines 8097-8101
-++#define sqlite3changegroup_add chrome_sqlite3changegroup_add  // Line 9826
-++#define sqlite3changegroup_add_strm \
-++  chrome_sqlite3changegroup_add_strm  // Lines 10250-10253
-++#define sqlite3changegroup_delete chrome_sqlite3changegroup_delete  // Line 9861
-++#define sqlite3changegroup_new chrome_sqlite3changegroup_new        // Line 9749
-++#define sqlite3changegroup_output \
-++  chrome_sqlite3changegroup_output  // Lines 9852-9856
-++#define sqlite3changegroup_output_strm \
-++  chrome_sqlite3changegroup_output_strm  // Lines 10254-10257
-++#define sqlite3changeset_apply \
-++  chrome_sqlite3changeset_apply  // Lines 10005-10019
-++#define sqlite3changeset_apply_strm \
-++  chrome_sqlite3changeset_apply_strm  // Lines 10206-10220
-++#define sqlite3changeset_concat \
-++  chrome_sqlite3changeset_concat  // Lines 9699-9706
-++#define sqlite3changeset_concat_strm \
-++  chrome_sqlite3changeset_concat_strm  // Lines 10221-10228
-++#define sqlite3changeset_conflict \
-++  chrome_sqlite3changeset_conflict  // Lines 9591-9595
-++#define sqlite3changeset_finalize chrome_sqlite3changeset_finalize  // Line 9640
-++#define sqlite3changeset_fk_conflicts \
-++  chrome_sqlite3changeset_fk_conflicts  // Lines 9607-9610
-++#define sqlite3changeset_invert \
-++  chrome_sqlite3changeset_invert  // Lines 9670-9673
-++#define sqlite3changeset_invert_strm \
-++  chrome_sqlite3changeset_invert_strm                       // Lines 10229-10234
-++#define sqlite3changeset_new chrome_sqlite3changeset_new    // Lines 9564-9568
-++#define sqlite3changeset_next chrome_sqlite3changeset_next  // Line 9440
-++#define sqlite3changeset_old chrome_sqlite3changeset_old    // Lines 9531-9535
-++#define sqlite3changeset_op chrome_sqlite3changeset_op      // Lines 9468-9474
-++#define sqlite3changeset_pk chrome_sqlite3changeset_pk      // Lines 9501-9505
-++#define sqlite3changeset_start chrome_sqlite3changeset_start  // Lines 9411-9415
-++#define sqlite3changeset_start_strm \
-++  chrome_sqlite3changeset_start_strm                        // Lines 10235-10239
-++#define sqlite3session_attach chrome_sqlite3session_attach  // Lines 9130-9133
-++#define sqlite3session_changeset \
-++  chrome_sqlite3session_changeset  // Lines 9257-9261
-++#define sqlite3session_changeset_strm \
-++  chrome_sqlite3session_changeset_strm                      // Lines 10240-10244
-++#define sqlite3session_create chrome_sqlite3session_create  // Lines 9004-9008
-++#define sqlite3session_delete chrome_sqlite3session_delete  // Line 9022
-++#define sqlite3session_diff chrome_sqlite3session_diff      // Lines 9319-9324
-++#define sqlite3session_enable chrome_sqlite3session_enable  // Line 9042
-++#define sqlite3session_indirect chrome_sqlite3session_indirect  // Line 9071
-++#define sqlite3session_isempty chrome_sqlite3session_isempty    // Line 9376
-++#define sqlite3session_patchset \
-++  chrome_sqlite3session_patchset  // Lines 9355-9359
-++#define sqlite3session_patchset_strm \
-++  chrome_sqlite3session_patchset_strm  // Lines 10245-10249
-++#define sqlite3session_table_filter \
-++  chrome_sqlite3session_table_filter  // Lines 9144-9151
-++
-++#endif  // THIRD_PARTY_SQLITE_AMALGAMATION_RENAME_EXPORTS_H_
-+diff --git a/third_party/sqlite/amalgamation/shell.c b/third_party/sqlite/amalgamation/shell.c
-+deleted file mode 100644
-+index 1b3e555..0000000
-+--- a/third_party/sqlite/amalgamation/shell.c
-++++ /dev/null
-+@@ -1,8393 +0,0 @@
-+-/* DO NOT EDIT!
-+-** This file is automatically generated by the script in the canonical
-+-** SQLite source tree at tool/mkshellc.tcl.  That script combines source
-+-** code from various constituent source files of SQLite into this single
-+-** "shell.c" file used to implement the SQLite command-line shell.
-+-**
-+-** Most of the code found below comes from the "src/shell.c.in" file in
-+-** the canonical SQLite source tree.  That main file contains "INCLUDE"
-+-** lines that specify other files in the canonical source tree that are
-+-** inserted to getnerate this complete program source file.
-+-**
-+-** The code from multiple files is combined into this single "shell.c"
-+-** source file to help make the command-line program easier to compile.
-+-**
-+-** To modify this program, get a copy of the canonical SQLite source tree,
-+-** edit the src/shell.c.in" and/or some of the other files that are included
-+-** by "src/shell.c.in", then rerun the tool/mkshellc.tcl script.
-+-*/
-+-/*
-+-** 2001 September 15
-+-**
-+-** The author disclaims copyright to this source code.  In place of
-+-** a legal notice, here is a blessing:
-+-**
-+-**    May you do good and not evil.
-+-**    May you find forgiveness for yourself and forgive others.
-+-**    May you share freely, never taking more than you give.
-+-**
-+-*************************************************************************
-+-** This file contains code to implement the "sqlite" command line
-+-** utility for accessing SQLite databases.
-+-*/
-+-#if (defined(_WIN32) || defined(WIN32)) && !defined(_CRT_SECURE_NO_WARNINGS)
-+-/* This needs to come before any includes for MSVC compiler */
-+-#define _CRT_SECURE_NO_WARNINGS
-+-#endif
-+-
-+-/*
-+-** Warning pragmas copied from msvc.h in the core.
-+-*/
-+-#if defined(_MSC_VER)
-+-#pragma warning(disable : 4054)
-+-#pragma warning(disable : 4055)
-+-#pragma warning(disable : 4100)
-+-#pragma warning(disable : 4127)
-+-#pragma warning(disable : 4130)
-+-#pragma warning(disable : 4152)
-+-#pragma warning(disable : 4189)
-+-#pragma warning(disable : 4206)
-+-#pragma warning(disable : 4210)
-+-#pragma warning(disable : 4232)
-+-#pragma warning(disable : 4244)
-+-#pragma warning(disable : 4305)
-+-#pragma warning(disable : 4306)
-+-#pragma warning(disable : 4702)
-+-#pragma warning(disable : 4706)
-+-#endif /* defined(_MSC_VER) */
-+-
-+-/*
-+-** No support for loadable extensions in VxWorks.
-+-*/
-+-#if (defined(__RTP__) || defined(_WRS_KERNEL)) && !SQLITE_OMIT_LOAD_EXTENSION
-+-# define SQLITE_OMIT_LOAD_EXTENSION 1
-+-#endif
-+-
-+-/*
-+-** Enable large-file support for fopen() and friends on unix.
-+-*/
-+-#ifndef SQLITE_DISABLE_LFS
-+-# define _LARGE_FILE       1
-+-# ifndef _FILE_OFFSET_BITS
-+-#   define _FILE_OFFSET_BITS 64
-+-# endif
-+-# define _LARGEFILE_SOURCE 1
-+-#endif
-+-
-+-#include <stdlib.h>
-+-#include <string.h>
-+-#include <stdio.h>
-+-#include <assert.h>
-+-#include "sqlite3.h"
-+-#if SQLITE_USER_AUTHENTICATION
-+-# include "sqlite3userauth.h"
-+-#endif
-+-#include <ctype.h>
-+-#include <stdarg.h>
-+-
-+-#if !defined(_WIN32) && !defined(WIN32)
-+-# include <signal.h>
-+-# if !defined(__RTP__) && !defined(_WRS_KERNEL)
-+-#  include <pwd.h>
-+-# endif
-+-# include <unistd.h>
-+-# include <sys/types.h>
-+-#endif
-+-
-+-#if HAVE_READLINE
-+-# include <readline/readline.h>
-+-# include <readline/history.h>
-+-#endif
-+-
-+-#if HAVE_EDITLINE
-+-# include <editline/readline.h>
-+-#endif
-+-
-+-#if HAVE_EDITLINE || HAVE_READLINE
-+-
-+-# define shell_add_history(X) add_history(X)
-+-# define shell_read_history(X) read_history(X)
-+-# define shell_write_history(X) write_history(X)
-+-# define shell_stifle_history(X) stifle_history(X)
-+-# define shell_readline(X) readline(X)
-+-
-+-#elif HAVE_LINENOISE
-+-
-+-# include "linenoise.h"
-+-# define shell_add_history(X) linenoiseHistoryAdd(X)
-+-# define shell_read_history(X) linenoiseHistoryLoad(X)
-+-# define shell_write_history(X) linenoiseHistorySave(X)
-+-# define shell_stifle_history(X) linenoiseHistorySetMaxLen(X)
-+-# define shell_readline(X) linenoise(X)
-+-
-+-#else
-+-
-+-# define shell_read_history(X)
-+-# define shell_write_history(X)
-+-# define shell_stifle_history(X)
-+-
-+-# define SHELL_USE_LOCAL_GETLINE 1
-+-#endif
-+-
-+-
-+-#if defined(_WIN32) || defined(WIN32)
-+-# include <io.h>
-+-# include <fcntl.h>
-+-# define isatty(h) _isatty(h)
-+-# ifndef access
-+-#  define access(f,m) _access((f),(m))
-+-# endif
-+-# undef popen
-+-# define popen _popen
-+-# undef pclose
-+-# define pclose _pclose
-+-#else
-+- /* Make sure isatty() has a prototype. */
-+- extern int isatty(int);
-+-
-+-# if !defined(__RTP__) && !defined(_WRS_KERNEL)
-+-  /* popen and pclose are not C89 functions and so are
-+-  ** sometimes omitted from the <stdio.h> header */
-+-   extern FILE *popen(const char*,const char*);
-+-   extern int pclose(FILE*);
-+-# else
-+-#  define SQLITE_OMIT_POPEN 1
-+-# endif
-+-#endif
-+-
-+-#if defined(_WIN32_WCE)
-+-/* Windows CE (arm-wince-mingw32ce-gcc) does not provide isatty()
-+- * thus we always assume that we have a console. That can be
-+- * overridden with the -batch command line option.
-+- */
-+-#define isatty(x) 1
-+-#endif
-+-
-+-/* ctype macros that work with signed characters */
-+-#define IsSpace(X)  isspace((unsigned char)X)
-+-#define IsDigit(X)  isdigit((unsigned char)X)
-+-#define ToLower(X)  (char)tolower((unsigned char)X)
-+-
-+-#if defined(_WIN32) || defined(WIN32)
-+-#include <windows.h>
-+-
-+-/* string conversion routines only needed on Win32 */
-+-extern char *sqlite3_win32_unicode_to_utf8(LPCWSTR);
-+-extern char *sqlite3_win32_mbcs_to_utf8_v2(const char *, int);
-+-extern char *sqlite3_win32_utf8_to_mbcs_v2(const char *, int);
-+-extern LPWSTR sqlite3_win32_utf8_to_unicode(const char *zText);
-+-#endif
-+-
-+-/* On Windows, we normally run with output mode of TEXT so that \n characters
-+-** are automatically translated into \r\n.  However, this behavior needs
-+-** to be disabled in some cases (ex: when generating CSV output and when
-+-** rendering quoted strings that contain \n characters).  The following
-+-** routines take care of that.
-+-*/
-+-#if defined(_WIN32) || defined(WIN32)
-+-static void setBinaryMode(FILE *file, int isOutput){
-+-  if( isOutput ) fflush(file);
-+-  _setmode(_fileno(file), _O_BINARY);
-+-}
-+-static void setTextMode(FILE *file, int isOutput){
-+-  if( isOutput ) fflush(file);
-+-  _setmode(_fileno(file), _O_TEXT);
-+-}
-+-#else
-+-# define setBinaryMode(X,Y)
-+-# define setTextMode(X,Y)
-+-#endif
-+-
-+-
-+-/* True if the timer is enabled */
-+-static int enableTimer = 0;
-+-
-+-/* Return the current wall-clock time */
-+-static sqlite3_int64 timeOfDay(void){
-+-  static sqlite3_vfs *clockVfs = 0;
-+-  sqlite3_int64 t;
-+-  if( clockVfs==0 ) clockVfs = sqlite3_vfs_find(0);
-+-  if( clockVfs->iVersion>=2 && clockVfs->xCurrentTimeInt64!=0 ){
-+-    clockVfs->xCurrentTimeInt64(clockVfs, &t);
-+-  }else{
-+-    double r;
-+-    clockVfs->xCurrentTime(clockVfs, &r);
-+-    t = (sqlite3_int64)(r*86400000.0);
-+-  }
-+-  return t;
-+-}
-+-
-+-#if !defined(_WIN32) && !defined(WIN32) && !defined(__minux)
-+-#include <sys/time.h>
-+-#include <sys/resource.h>
-+-
-+-/* VxWorks does not support getrusage() as far as we can determine */
-+-#if defined(_WRS_KERNEL) || defined(__RTP__)
-+-struct rusage {
-+-  struct timeval ru_utime; /* user CPU time used */
-+-  struct timeval ru_stime; /* system CPU time used */
-+-};
-+-#define getrusage(A,B) memset(B,0,sizeof(*B))
-+-#endif
-+-
-+-/* Saved resource information for the beginning of an operation */
-+-static struct rusage sBegin;  /* CPU time at start */
-+-static sqlite3_int64 iBegin;  /* Wall-clock time at start */
-+-
-+-/*
-+-** Begin timing an operation
-+-*/
-+-static void beginTimer(void){
-+-  if( enableTimer ){
-+-    getrusage(RUSAGE_SELF, &sBegin);
-+-    iBegin = timeOfDay();
-+-  }
-+-}
-+-
-+-/* Return the difference of two time_structs in seconds */
-+-static double timeDiff(struct timeval *pStart, struct timeval *pEnd){
-+-  return (pEnd->tv_usec - pStart->tv_usec)*0.000001 +
-+-         (double)(pEnd->tv_sec - pStart->tv_sec);
-+-}
-+-
-+-/*
-+-** Print the timing results.
-+-*/
-+-static void endTimer(void){
-+-  if( enableTimer ){
-+-    sqlite3_int64 iEnd = timeOfDay();
-+-    struct rusage sEnd;
-+-    getrusage(RUSAGE_SELF, &sEnd);
-+-    printf("Run Time: real %.3f user %f sys %f\n",
-+-       (iEnd - iBegin)*0.001,
-+-       timeDiff(&sBegin.ru_utime, &sEnd.ru_utime),
-+-       timeDiff(&sBegin.ru_stime, &sEnd.ru_stime));
-+-  }
-+-}
-+-
-+-#define BEGIN_TIMER beginTimer()
-+-#define END_TIMER endTimer()
-+-#define HAS_TIMER 1
-+-
-+-#elif (defined(_WIN32) || defined(WIN32))
-+-
-+-/* Saved resource information for the beginning of an operation */
-+-static HANDLE hProcess;
-+-static FILETIME ftKernelBegin;
-+-static FILETIME ftUserBegin;
-+-static sqlite3_int64 ftWallBegin;
-+-typedef BOOL (WINAPI *GETPROCTIMES)(HANDLE, LPFILETIME, LPFILETIME,
-+-                                    LPFILETIME, LPFILETIME);
-+-static GETPROCTIMES getProcessTimesAddr = NULL;
-+-
-+-/*
-+-** Check to see if we have timer support.  Return 1 if necessary
-+-** support found (or found previously).
-+-*/
-+-static int hasTimer(void){
-+-  if( getProcessTimesAddr ){
-+-    return 1;
-+-  } else {
-+-    /* GetProcessTimes() isn't supported in WIN95 and some other Windows
-+-    ** versions. See if the version we are running on has it, and if it
-+-    ** does, save off a pointer to it and the current process handle.
-+-    */
-+-    hProcess = GetCurrentProcess();
-+-    if( hProcess ){
-+-      HINSTANCE hinstLib = LoadLibrary(TEXT("Kernel32.dll"));
-+-      if( NULL != hinstLib ){
-+-        getProcessTimesAddr =
-+-            (GETPROCTIMES) GetProcAddress(hinstLib, "GetProcessTimes");
-+-        if( NULL != getProcessTimesAddr ){
-+-          return 1;
-+-        }
-+-        FreeLibrary(hinstLib);
-+-      }
-+-    }
-+-  }
-+-  return 0;
-+-}
-+-
-+-/*
-+-** Begin timing an operation
-+-*/
-+-static void beginTimer(void){
-+-  if( enableTimer && getProcessTimesAddr ){
-+-    FILETIME ftCreation, ftExit;
-+-    getProcessTimesAddr(hProcess,&ftCreation,&ftExit,
-+-                        &ftKernelBegin,&ftUserBegin);
-+-    ftWallBegin = timeOfDay();
-+-  }
-+-}
-+-
-+-/* Return the difference of two FILETIME structs in seconds */
-+-static double timeDiff(FILETIME *pStart, FILETIME *pEnd){
-+-  sqlite_int64 i64Start = *((sqlite_int64 *) pStart);
-+-  sqlite_int64 i64End = *((sqlite_int64 *) pEnd);
-+-  return (double) ((i64End - i64Start) / 10000000.0);
-+-}
-+-
-+-/*
-+-** Print the timing results.
-+-*/
-+-static void endTimer(void){
-+-  if( enableTimer && getProcessTimesAddr){
-+-    FILETIME ftCreation, ftExit, ftKernelEnd, ftUserEnd;
-+-    sqlite3_int64 ftWallEnd = timeOfDay();
-+-    getProcessTimesAddr(hProcess,&ftCreation,&ftExit,&ftKernelEnd,&ftUserEnd);
-+-    printf("Run Time: real %.3f user %f sys %f\n",
-+-       (ftWallEnd - ftWallBegin)*0.001,
-+-       timeDiff(&ftUserBegin, &ftUserEnd),
-+-       timeDiff(&ftKernelBegin, &ftKernelEnd));
-+-  }
-+-}
-+-
-+-#define BEGIN_TIMER beginTimer()
-+-#define END_TIMER endTimer()
-+-#define HAS_TIMER hasTimer()
-+-
-+-#else
-+-#define BEGIN_TIMER
-+-#define END_TIMER
-+-#define HAS_TIMER 0
-+-#endif
-+-
-+-/*
-+-** Used to prevent warnings about unused parameters
-+-*/
-+-#define UNUSED_PARAMETER(x) (void)(x)
-+-
-+-/*
-+-** If the following flag is set, then command execution stops
-+-** at an error if we are not interactive.
-+-*/
-+-static int bail_on_error = 0;
-+-
-+-/*
-+-** Threat stdin as an interactive input if the following variable
-+-** is true.  Otherwise, assume stdin is connected to a file or pipe.
-+-*/
-+-static int stdin_is_interactive = 1;
-+-
-+-/*
-+-** On Windows systems we have to know if standard output is a console
-+-** in order to translate UTF-8 into MBCS.  The following variable is
-+-** true if translation is required.
-+-*/
-+-static int stdout_is_console = 1;
-+-
-+-/*
-+-** The following is the open SQLite database.  We make a pointer
-+-** to this database a static variable so that it can be accessed
-+-** by the SIGINT handler to interrupt database processing.
-+-*/
-+-static sqlite3 *globalDb = 0;
-+-
-+-/*
-+-** True if an interrupt (Control-C) has been received.
-+-*/
-+-static volatile int seenInterrupt = 0;
-+-
-+-/*
-+-** This is the name of our program. It is set in main(), used
-+-** in a number of other places, mostly for error messages.
-+-*/
-+-static char *Argv0;
-+-
-+-/*
-+-** Prompt strings. Initialized in main. Settable with
-+-**   .prompt main continue
-+-*/
-+-static char mainPrompt[20];     /* First line prompt. default: "sqlite> "*/
-+-static char continuePrompt[20]; /* Continuation prompt. default: "   ...> " */
-+-
-+-/*
-+-** Render output like fprintf().  Except, if the output is going to the
-+-** console and if this is running on a Windows machine, translate the
-+-** output from UTF-8 into MBCS.
-+-*/
-+-#if defined(_WIN32) || defined(WIN32)
-+-void utf8_printf(FILE *out, const char *zFormat, ...){
-+-  va_list ap;
-+-  va_start(ap, zFormat);
-+-  if( stdout_is_console && (out==stdout || out==stderr) ){
-+-    char *z1 = sqlite3_vmprintf(zFormat, ap);
-+-    char *z2 = sqlite3_win32_utf8_to_mbcs_v2(z1, 0);
-+-    sqlite3_free(z1);
-+-    fputs(z2, out);
-+-    sqlite3_free(z2);
-+-  }else{
-+-    vfprintf(out, zFormat, ap);
-+-  }
-+-  va_end(ap);
-+-}
-+-#elif !defined(utf8_printf)
-+-# define utf8_printf fprintf
-+-#endif
-+-
-+-/*
-+-** Render output like fprintf().  This should not be used on anything that
-+-** includes string formatting (e.g. "%s").
-+-*/
-+-#if !defined(raw_printf)
-+-# define raw_printf fprintf
-+-#endif
-+-
-+-/*
-+-** Write I/O traces to the following stream.
-+-*/
-+-#ifdef SQLITE_ENABLE_IOTRACE
-+-static FILE *iotrace = 0;
-+-#endif
-+-
-+-/*
-+-** This routine works like printf in that its first argument is a
-+-** format string and subsequent arguments are values to be substituted
-+-** in place of % fields.  The result of formatting this string
-+-** is written to iotrace.
-+-*/
-+-#ifdef SQLITE_ENABLE_IOTRACE
-+-static void SQLITE_CDECL iotracePrintf(const char *zFormat, ...){
-+-  va_list ap;
-+-  char *z;
-+-  if( iotrace==0 ) return;
-+-  va_start(ap, zFormat);
-+-  z = sqlite3_vmprintf(zFormat, ap);
-+-  va_end(ap);
-+-  utf8_printf(iotrace, "%s", z);
-+-  sqlite3_free(z);
-+-}
-+-#endif
-+-
-+-/*
-+-** Output string zUtf to stream pOut as w characters.  If w is negative,
-+-** then right-justify the text.  W is the width in UTF-8 characters, not
-+-** in bytes.  This is different from the %*.*s specification in printf
-+-** since with %*.*s the width is measured in bytes, not characters.
-+-*/
-+-static void utf8_width_print(FILE *pOut, int w, const char *zUtf){
-+-  int i;
-+-  int n;
-+-  int aw = w<0 ? -w : w;
-+-  char zBuf[1000];
-+-  if( aw>(int)sizeof(zBuf)/3 ) aw = (int)sizeof(zBuf)/3;
-+-  for(i=n=0; zUtf[i]; i++){
-+-    if( (zUtf[i]&0xc0)!=0x80 ){
-+-      n++;
-+-      if( n==aw ){
-+-        do{ i++; }while( (zUtf[i]&0xc0)==0x80 );
-+-        break;
-+-      }
-+-    }
-+-  }
-+-  if( n>=aw ){
-+-    utf8_printf(pOut, "%.*s", i, zUtf);
-+-  }else if( w<0 ){
-+-    utf8_printf(pOut, "%*s%s", aw-n, "", zUtf);
-+-  }else{
-+-    utf8_printf(pOut, "%s%*s", zUtf, aw-n, "");
-+-  }
-+-}
-+-
-+-
-+-/*
-+-** Determines if a string is a number of not.
-+-*/
-+-static int isNumber(const char *z, int *realnum){
-+-  if( *z=='-' || *z=='+' ) z++;
-+-  if( !IsDigit(*z) ){
-+-    return 0;
-+-  }
-+-  z++;
-+-  if( realnum ) *realnum = 0;
-+-  while( IsDigit(*z) ){ z++; }
-+-  if( *z=='.' ){
-+-    z++;
-+-    if( !IsDigit(*z) ) return 0;
-+-    while( IsDigit(*z) ){ z++; }
-+-    if( realnum ) *realnum = 1;
-+-  }
-+-  if( *z=='e' || *z=='E' ){
-+-    z++;
-+-    if( *z=='+' || *z=='-' ) z++;
-+-    if( !IsDigit(*z) ) return 0;
-+-    while( IsDigit(*z) ){ z++; }
-+-    if( realnum ) *realnum = 1;
-+-  }
-+-  return *z==0;
-+-}
-+-
-+-/*
-+-** Compute a string length that is limited to what can be stored in
-+-** lower 30 bits of a 32-bit signed integer.
-+-*/
-+-static int strlen30(const char *z){
-+-  const char *z2 = z;
-+-  while( *z2 ){ z2++; }
-+-  return 0x3fffffff & (int)(z2 - z);
-+-}
-+-
-+-/*
-+-** Return the length of a string in characters.  Multibyte UTF8 characters
-+-** count as a single character.
-+-*/
-+-static int strlenChar(const char *z){
-+-  int n = 0;
-+-  while( *z ){
-+-    if( (0xc0&*(z++))!=0x80 ) n++;
-+-  }
-+-  return n;
-+-}
-+-
-+-/*
-+-** This routine reads a line of text from FILE in, stores
-+-** the text in memory obtained from malloc() and returns a pointer
-+-** to the text.  NULL is returned at end of file, or if malloc()
-+-** fails.
-+-**
-+-** If zLine is not NULL then it is a malloced buffer returned from
-+-** a previous call to this routine that may be reused.
-+-*/
-+-static char *local_getline(char *zLine, FILE *in){
-+-  int nLine = zLine==0 ? 0 : 100;
-+-  int n = 0;
-+-
-+-  while( 1 ){
-+-    if( n+100>nLine ){
-+-      nLine = nLine*2 + 100;
-+-      zLine = realloc(zLine, nLine);
-+-      if( zLine==0 ) return 0;
-+-    }
-+-    if( fgets(&zLine[n], nLine - n, in)==0 ){
-+-      if( n==0 ){
-+-        free(zLine);
-+-        return 0;
-+-      }
-+-      zLine[n] = 0;
-+-      break;
-+-    }
-+-    while( zLine[n] ) n++;
-+-    if( n>0 && zLine[n-1]=='\n' ){
-+-      n--;
-+-      if( n>0 && zLine[n-1]=='\r' ) n--;
-+-      zLine[n] = 0;
-+-      break;
-+-    }
-+-  }
-+-#if defined(_WIN32) || defined(WIN32)
-+-  /* For interactive input on Windows systems, translate the
-+-  ** multi-byte characterset characters into UTF-8. */
-+-  if( stdin_is_interactive && in==stdin ){
-+-    char *zTrans = sqlite3_win32_mbcs_to_utf8_v2(zLine, 0);
-+-    if( zTrans ){
-+-      int nTrans = strlen30(zTrans)+1;
-+-      if( nTrans>nLine ){
-+-        zLine = realloc(zLine, nTrans);
-+-        if( zLine==0 ){
-+-          sqlite3_free(zTrans);
-+-          return 0;
-+-        }
-+-      }
-+-      memcpy(zLine, zTrans, nTrans);
-+-      sqlite3_free(zTrans);
-+-    }
-+-  }
-+-#endif /* defined(_WIN32) || defined(WIN32) */
-+-  return zLine;
-+-}
-+-
-+-/*
-+-** Retrieve a single line of input text.
-+-**
-+-** If in==0 then read from standard input and prompt before each line.
-+-** If isContinuation is true, then a continuation prompt is appropriate.
-+-** If isContinuation is zero, then the main prompt should be used.
-+-**
-+-** If zPrior is not NULL then it is a buffer from a prior call to this
-+-** routine that can be reused.
-+-**
-+-** The result is stored in space obtained from malloc() and must either
-+-** be freed by the caller or else passed back into this routine via the
-+-** zPrior argument for reuse.
-+-*/
-+-static char *one_input_line(FILE *in, char *zPrior, int isContinuation){
-+-  char *zPrompt;
-+-  char *zResult;
-+-  if( in!=0 ){
-+-    zResult = local_getline(zPrior, in);
-+-  }else{
-+-    zPrompt = isContinuation ? continuePrompt : mainPrompt;
-+-#if SHELL_USE_LOCAL_GETLINE
-+-    printf("%s", zPrompt);
-+-    fflush(stdout);
-+-    zResult = local_getline(zPrior, stdin);
-+-#else
-+-    free(zPrior);
-+-    zResult = shell_readline(zPrompt);
-+-    if( zResult && *zResult ) shell_add_history(zResult);
-+-#endif
-+-  }
-+-  return zResult;
-+-}
-+-/*
-+-** A variable length string to which one can append text.
-+-*/
-+-typedef struct ShellText ShellText;
-+-struct ShellText {
-+-  char *z;
-+-  int n;
-+-  int nAlloc;
-+-};
-+-
-+-/*
-+-** Initialize and destroy a ShellText object
-+-*/
-+-static void initText(ShellText *p){
-+-  memset(p, 0, sizeof(*p));
-+-}
-+-static void freeText(ShellText *p){
-+-  free(p->z);
-+-  initText(p);
-+-}
-+-
-+-/* zIn is either a pointer to a NULL-terminated string in memory obtained
-+-** from malloc(), or a NULL pointer. The string pointed to by zAppend is
-+-** added to zIn, and the result returned in memory obtained from malloc().
-+-** zIn, if it was not NULL, is freed.
-+-**
-+-** If the third argument, quote, is not '\0', then it is used as a
-+-** quote character for zAppend.
-+-*/
-+-static void appendText(ShellText *p, char const *zAppend, char quote){
-+-  int len;
-+-  int i;
-+-  int nAppend = strlen30(zAppend);
-+-
-+-  len = nAppend+p->n+1;
-+-  if( quote ){
-+-    len += 2;
-+-    for(i=0; i<nAppend; i++){
-+-      if( zAppend[i]==quote ) len++;
-+-    }
-+-  }
-+-
-+-  if( p->n+len>=p->nAlloc ){
-+-    p->nAlloc = p->nAlloc*2 + len + 20;
-+-    p->z = realloc(p->z, p->nAlloc);
-+-    if( p->z==0 ){
-+-      memset(p, 0, sizeof(*p));
-+-      return;
-+-    }
-+-  }
-+-
-+-  if( quote ){
-+-    char *zCsr = p->z+p->n;
-+-    *zCsr++ = quote;
-+-    for(i=0; i<nAppend; i++){
-+-      *zCsr++ = zAppend[i];
-+-      if( zAppend[i]==quote ) *zCsr++ = quote;
-+-    }
-+-    *zCsr++ = quote;
-+-    p->n = (int)(zCsr - p->z);
-+-    *zCsr = '\0';
-+-  }else{
-+-    memcpy(p->z+p->n, zAppend, nAppend);
-+-    p->n += nAppend;
-+-    p->z[p->n] = '\0';
-+-  }
-+-}
-+-
-+-/*
-+-** Attempt to determine if identifier zName needs to be quoted, either
-+-** because it contains non-alphanumeric characters, or because it is an
-+-** SQLite keyword.  Be conservative in this estimate:  When in doubt assume
-+-** that quoting is required.
-+-**
-+-** Return '"' if quoting is required.  Return 0 if no quoting is required.
-+-*/
-+-static char quoteChar(const char *zName){
-+-  /* All SQLite keywords, in alphabetical order */
-+-  static const char *azKeywords[] = {
-+-    "ABORT", "ACTION", "ADD", "AFTER", "ALL", "ALTER", "ANALYZE", "AND", "AS",
-+-    "ASC", "ATTACH", "AUTOINCREMENT", "BEFORE", "BEGIN", "BETWEEN", "BY",
-+-    "CASCADE", "CASE", "CAST", "CHECK", "COLLATE", "COLUMN", "COMMIT",
-+-    "CONFLICT", "CONSTRAINT", "CREATE", "CROSS", "CURRENT_DATE",
-+-    "CURRENT_TIME", "CURRENT_TIMESTAMP", "DATABASE", "DEFAULT", "DEFERRABLE",
-+-    "DEFERRED", "DELETE", "DESC", "DETACH", "DISTINCT", "DROP", "EACH",
-+-    "ELSE", "END", "ESCAPE", "EXCEPT", "EXCLUSIVE", "EXISTS", "EXPLAIN",
-+-    "FAIL", "FOR", "FOREIGN", "FROM", "FULL", "GLOB", "GROUP", "HAVING", "IF",
-+-    "IGNORE", "IMMEDIATE", "IN", "INDEX", "INDEXED", "INITIALLY", "INNER",
-+-    "INSERT", "INSTEAD", "INTERSECT", "INTO", "IS", "ISNULL", "JOIN", "KEY",
-+-    "LEFT", "LIKE", "LIMIT", "MATCH", "NATURAL", "NO", "NOT", "NOTNULL",
-+-    "NULL", "OF", "OFFSET", "ON", "OR", "ORDER", "OUTER", "PLAN", "PRAGMA",
-+-    "PRIMARY", "QUERY", "RAISE", "RECURSIVE", "REFERENCES", "REGEXP",
-+-    "REINDEX", "RELEASE", "RENAME", "REPLACE", "RESTRICT", "RIGHT",
-+-    "ROLLBACK", "ROW", "SAVEPOINT", "SELECT", "SET", "TABLE", "TEMP",
-+-    "TEMPORARY", "THEN", "TO", "TRANSACTION", "TRIGGER", "UNION", "UNIQUE",
-+-    "UPDATE", "USING", "VACUUM", "VALUES", "VIEW", "VIRTUAL", "WHEN", "WHERE",
-+-    "WITH", "WITHOUT",
-+-  };
-+-  int i, lwr, upr, mid, c;
-+-  if( !isalpha((unsigned char)zName[0]) && zName[0]!='_' ) return '"';
-+-  for(i=0; zName[i]; i++){
-+-    if( !isalnum((unsigned char)zName[i]) && zName[i]!='_' ) return '"';
-+-  }
-+-  lwr = 0;
-+-  upr = sizeof(azKeywords)/sizeof(azKeywords[0]) - 1;
-+-  while( lwr<=upr ){
-+-    mid = (lwr+upr)/2;
-+-    c = sqlite3_stricmp(azKeywords[mid], zName);
-+-    if( c==0 ) return '"';
-+-    if( c<0 ){
-+-      lwr = mid+1;
-+-    }else{
-+-      upr = mid-1;
-+-    }
-+-  }
-+-  return 0;
-+-}
-+-
-+-/*
-+-** SQL function:  shell_add_schema(S,X)
-+-**
-+-** Add the schema name X to the CREATE statement in S and return the result.
-+-** Examples:
-+-**
-+-**    CREATE TABLE t1(x)   ->   CREATE TABLE xyz.t1(x);
-+-**
-+-** Also works on
-+-**
-+-**    CREATE INDEX
-+-**    CREATE UNIQUE INDEX
-+-**    CREATE VIEW
-+-**    CREATE TRIGGER
-+-**    CREATE VIRTUAL TABLE
-+-**
-+-** This UDF is used by the .schema command to insert the schema name of
-+-** attached databases into the middle of the sqlite_master.sql field.
-+-*/
-+-static void shellAddSchemaName(
-+-  sqlite3_context *pCtx,
-+-  int nVal,
-+-  sqlite3_value **apVal
-+-){
-+-  static const char *aPrefix[] = {
-+-     "TABLE",
-+-     "INDEX",
-+-     "UNIQUE INDEX",
-+-     "VIEW",
-+-     "TRIGGER",
-+-     "VIRTUAL TABLE"
-+-  };
-+-  int i = 0;
-+-  const char *zIn = (const char*)sqlite3_value_text(apVal[0]);
-+-  const char *zSchema = (const char*)sqlite3_value_text(apVal[1]);
-+-  assert( nVal==2 );
-+-  if( zIn!=0 && strncmp(zIn, "CREATE ", 7)==0 ){
-+-    for(i=0; i<(int)(sizeof(aPrefix)/sizeof(aPrefix[0])); i++){
-+-      int n = strlen30(aPrefix[i]);
-+-      if( strncmp(zIn+7, aPrefix[i], n)==0 && zIn[n+7]==' ' ){
-+-        char cQuote = quoteChar(zSchema);
-+-        char *z;
-+-        if( cQuote ){
-+-         z = sqlite3_mprintf("%.*s \"%w\".%s", n+7, zIn, zSchema, zIn+n+8);
-+-        }else{
-+-          z = sqlite3_mprintf("%.*s %s.%s", n+7, zIn, zSchema, zIn+n+8);
-+-        }
-+-        sqlite3_result_text(pCtx, z, -1, sqlite3_free);
-+-        return;
-+-      }
-+-    }
-+-  }
-+-  sqlite3_result_value(pCtx, apVal[0]);
-+-}
-+-
-+-/*
-+-** The source code for several run-time loadable extensions is inserted
-+-** below by the ../tool/mkshellc.tcl script.  Before processing that included
-+-** code, we need to override some macros to make the included program code
-+-** work here in the middle of this regular program.
-+-*/
-+-#define SQLITE_EXTENSION_INIT1
-+-#define SQLITE_EXTENSION_INIT2(X) (void)(X)
-+-
-+-/************************* Begin ../ext/misc/shathree.c ******************/
-+-/*
-+-** 2017-03-08
-+-**
-+-** The author disclaims copyright to this source code.  In place of
-+-** a legal notice, here is a blessing:
-+-**
-+-**    May you do good and not evil.
-+-**    May you find forgiveness for yourself and forgive others.
-+-**    May you share freely, never taking more than you give.
-+-**
-+-******************************************************************************
-+-**
-+-** This SQLite extension implements a functions that compute SHA1 hashes.
-+-** Two SQL functions are implemented:
-+-**
-+-**     sha3(X,SIZE)
-+-**     sha3_query(Y,SIZE)
-+-**
-+-** The sha3(X) function computes the SHA3 hash of the input X, or NULL if
-+-** X is NULL.
-+-**
-+-** The sha3_query(Y) function evalutes all queries in the SQL statements of Y
-+-** and returns a hash of their results.
-+-**
-+-** The SIZE argument is optional.  If omitted, the SHA3-256 hash algorithm
-+-** is used.  If SIZE is included it must be one of the integers 224, 256,
-+-** 384, or 512, to determine SHA3 hash variant that is computed.
-+-*/
-+-SQLITE_EXTENSION_INIT1
-+-#include <assert.h>
-+-#include <string.h>
-+-#include <stdarg.h>
-+-typedef sqlite3_uint64 u64;
-+-
-+-/******************************************************************************
-+-** The Hash Engine
-+-*/
-+-/*
-+-** Macros to determine whether the machine is big or little endian,
-+-** and whether or not that determination is run-time or compile-time.
-+-**
-+-** For best performance, an attempt is made to guess at the byte-order
-+-** using C-preprocessor macros.  If that is unsuccessful, or if
-+-** -DSHA3_BYTEORDER=0 is set, then byte-order is determined
-+-** at run-time.
-+-*/
-+-#ifndef SHA3_BYTEORDER
-+-# if defined(i386)     || defined(__i386__)   || defined(_M_IX86) ||    \
-+-     defined(__x86_64) || defined(__x86_64__) || defined(_M_X64)  ||    \
-+-     defined(_M_AMD64) || defined(_M_ARM)     || defined(__x86)   ||    \
-+-     defined(__arm__)
-+-#   define SHA3_BYTEORDER    1234
-+-# elif defined(sparc)    || defined(__ppc__)
-+-#   define SHA3_BYTEORDER    4321
-+-# else
-+-#   define SHA3_BYTEORDER 0
-+-# endif
-+-#endif
-+-
-+-
-+-/*
-+-** State structure for a SHA3 hash in progress
-+-*/
-+-typedef struct SHA3Context SHA3Context;
-+-struct SHA3Context {
-+-  union {
-+-    u64 s[25];                /* Keccak state. 5x5 lines of 64 bits each */
-+-    unsigned char x[1600];    /* ... or 1600 bytes */
-+-  } u;
-+-  unsigned nRate;        /* Bytes of input accepted per Keccak iteration */
-+-  unsigned nLoaded;      /* Input bytes loaded into u.x[] so far this cycle */
-+-  unsigned ixMask;       /* Insert next input into u.x[nLoaded^ixMask]. */
-+-};
-+-
-+-/*
-+-** A single step of the Keccak mixing function for a 1600-bit state
-+-*/
-+-static void KeccakF1600Step(SHA3Context *p){
-+-  int i;
-+-  u64 B0, B1, B2, B3, B4;
-+-  u64 C0, C1, C2, C3, C4;
-+-  u64 D0, D1, D2, D3, D4;
-+-  static const u64 RC[] = {
-+-    0x0000000000000001ULL,  0x0000000000008082ULL,
-+-    0x800000000000808aULL,  0x8000000080008000ULL,
-+-    0x000000000000808bULL,  0x0000000080000001ULL,
-+-    0x8000000080008081ULL,  0x8000000000008009ULL,
-+-    0x000000000000008aULL,  0x0000000000000088ULL,
-+-    0x0000000080008009ULL,  0x000000008000000aULL,
-+-    0x000000008000808bULL,  0x800000000000008bULL,
-+-    0x8000000000008089ULL,  0x8000000000008003ULL,
-+-    0x8000000000008002ULL,  0x8000000000000080ULL,
-+-    0x000000000000800aULL,  0x800000008000000aULL,
-+-    0x8000000080008081ULL,  0x8000000000008080ULL,
-+-    0x0000000080000001ULL,  0x8000000080008008ULL
-+-  };
-+-# define A00 (p->u.s[0])
-+-# define A01 (p->u.s[1])
-+-# define A02 (p->u.s[2])
-+-# define A03 (p->u.s[3])
-+-# define A04 (p->u.s[4])
-+-# define A10 (p->u.s[5])
-+-# define A11 (p->u.s[6])
-+-# define A12 (p->u.s[7])
-+-# define A13 (p->u.s[8])
-+-# define A14 (p->u.s[9])
-+-# define A20 (p->u.s[10])
-+-# define A21 (p->u.s[11])
-+-# define A22 (p->u.s[12])
-+-# define A23 (p->u.s[13])
-+-# define A24 (p->u.s[14])
-+-# define A30 (p->u.s[15])
-+-# define A31 (p->u.s[16])
-+-# define A32 (p->u.s[17])
-+-# define A33 (p->u.s[18])
-+-# define A34 (p->u.s[19])
-+-# define A40 (p->u.s[20])
-+-# define A41 (p->u.s[21])
-+-# define A42 (p->u.s[22])
-+-# define A43 (p->u.s[23])
-+-# define A44 (p->u.s[24])
-+-# define ROL64(a,x) ((a<<x)|(a>>(64-x)))
-+-
-+-  for(i=0; i<24; i+=4){
-+-    C0 = A00^A10^A20^A30^A40;
-+-    C1 = A01^A11^A21^A31^A41;
-+-    C2 = A02^A12^A22^A32^A42;
-+-    C3 = A03^A13^A23^A33^A43;
-+-    C4 = A04^A14^A24^A34^A44;
-+-    D0 = C4^ROL64(C1, 1);
-+-    D1 = C0^ROL64(C2, 1);
-+-    D2 = C1^ROL64(C3, 1);
-+-    D3 = C2^ROL64(C4, 1);
-+-    D4 = C3^ROL64(C0, 1);
-+-
-+-    B0 = (A00^D0);
-+-    B1 = ROL64((A11^D1), 44);
-+-    B2 = ROL64((A22^D2), 43);
-+-    B3 = ROL64((A33^D3), 21);
-+-    B4 = ROL64((A44^D4), 14);
-+-    A00 =   B0 ^((~B1)&  B2 );
-+-    A00 ^= RC[i];
-+-    A11 =   B1 ^((~B2)&  B3 );
-+-    A22 =   B2 ^((~B3)&  B4 );
-+-    A33 =   B3 ^((~B4)&  B0 );
-+-    A44 =   B4 ^((~B0)&  B1 );
-+-
-+-    B2 = ROL64((A20^D0), 3);
-+-    B3 = ROL64((A31^D1), 45);
-+-    B4 = ROL64((A42^D2), 61);
-+-    B0 = ROL64((A03^D3), 28);
-+-    B1 = ROL64((A14^D4), 20);
-+-    A20 =   B0 ^((~B1)&  B2 );
-+-    A31 =   B1 ^((~B2)&  B3 );
-+-    A42 =   B2 ^((~B3)&  B4 );
-+-    A03 =   B3 ^((~B4)&  B0 );
-+-    A14 =   B4 ^((~B0)&  B1 );
-+-
-+-    B4 = ROL64((A40^D0), 18);
-+-    B0 = ROL64((A01^D1), 1);
-+-    B1 = ROL64((A12^D2), 6);
-+-    B2 = ROL64((A23^D3), 25);
-+-    B3 = ROL64((A34^D4), 8);
-+-    A40 =   B0 ^((~B1)&  B2 );
-+-    A01 =   B1 ^((~B2)&  B3 );
-+-    A12 =   B2 ^((~B3)&  B4 );
-+-    A23 =   B3 ^((~B4)&  B0 );
-+-    A34 =   B4 ^((~B0)&  B1 );
-+-
-+-    B1 = ROL64((A10^D0), 36);
-+-    B2 = ROL64((A21^D1), 10);
-+-    B3 = ROL64((A32^D2), 15);
-+-    B4 = ROL64((A43^D3), 56);
-+-    B0 = ROL64((A04^D4), 27);
-+-    A10 =   B0 ^((~B1)&  B2 );
-+-    A21 =   B1 ^((~B2)&  B3 );
-+-    A32 =   B2 ^((~B3)&  B4 );
-+-    A43 =   B3 ^((~B4)&  B0 );
-+-    A04 =   B4 ^((~B0)&  B1 );
-+-
-+-    B3 = ROL64((A30^D0), 41);
-+-    B4 = ROL64((A41^D1), 2);
-+-    B0 = ROL64((A02^D2), 62);
-+-    B1 = ROL64((A13^D3), 55);
-+-    B2 = ROL64((A24^D4), 39);
-+-    A30 =   B0 ^((~B1)&  B2 );
-+-    A41 =   B1 ^((~B2)&  B3 );
-+-    A02 =   B2 ^((~B3)&  B4 );
-+-    A13 =   B3 ^((~B4)&  B0 );
-+-    A24 =   B4 ^((~B0)&  B1 );
-+-
-+-    C0 = A00^A20^A40^A10^A30;
-+-    C1 = A11^A31^A01^A21^A41;
-+-    C2 = A22^A42^A12^A32^A02;
-+-    C3 = A33^A03^A23^A43^A13;
-+-    C4 = A44^A14^A34^A04^A24;
-+-    D0 = C4^ROL64(C1, 1);
-+-    D1 = C0^ROL64(C2, 1);
-+-    D2 = C1^ROL64(C3, 1);
-+-    D3 = C2^ROL64(C4, 1);
-+-    D4 = C3^ROL64(C0, 1);
-+-
-+-    B0 = (A00^D0);
-+-    B1 = ROL64((A31^D1), 44);
-+-    B2 = ROL64((A12^D2), 43);
-+-    B3 = ROL64((A43^D3), 21);
-+-    B4 = ROL64((A24^D4), 14);
-+-    A00 =   B0 ^((~B1)&  B2 );
-+-    A00 ^= RC[i+1];
-+-    A31 =   B1 ^((~B2)&  B3 );
-+-    A12 =   B2 ^((~B3)&  B4 );
-+-    A43 =   B3 ^((~B4)&  B0 );
-+-    A24 =   B4 ^((~B0)&  B1 );
-+-
-+-    B2 = ROL64((A40^D0), 3);
-+-    B3 = ROL64((A21^D1), 45);
-+-    B4 = ROL64((A02^D2), 61);
-+-    B0 = ROL64((A33^D3), 28);
-+-    B1 = ROL64((A14^D4), 20);
-+-    A40 =   B0 ^((~B1)&  B2 );
-+-    A21 =   B1 ^((~B2)&  B3 );
-+-    A02 =   B2 ^((~B3)&  B4 );
-+-    A33 =   B3 ^((~B4)&  B0 );
-+-    A14 =   B4 ^((~B0)&  B1 );
-+-
-+-    B4 = ROL64((A30^D0), 18);
-+-    B0 = ROL64((A11^D1), 1);
-+-    B1 = ROL64((A42^D2), 6);
-+-    B2 = ROL64((A23^D3), 25);
-+-    B3 = ROL64((A04^D4), 8);
-+-    A30 =   B0 ^((~B1)&  B2 );
-+-    A11 =   B1 ^((~B2)&  B3 );
-+-    A42 =   B2 ^((~B3)&  B4 );
-+-    A23 =   B3 ^((~B4)&  B0 );
-+-    A04 =   B4 ^((~B0)&  B1 );
-+-
-+-    B1 = ROL64((A20^D0), 36);
-+-    B2 = ROL64((A01^D1), 10);
-+-    B3 = ROL64((A32^D2), 15);
-+-    B4 = ROL64((A13^D3), 56);
-+-    B0 = ROL64((A44^D4), 27);
-+-    A20 =   B0 ^((~B1)&  B2 );
-+-    A01 =   B1 ^((~B2)&  B3 );
-+-    A32 =   B2 ^((~B3)&  B4 );
-+-    A13 =   B3 ^((~B4)&  B0 );
-+-    A44 =   B4 ^((~B0)&  B1 );
-+-
-+-    B3 = ROL64((A10^D0), 41);
-+-    B4 = ROL64((A41^D1), 2);
-+-    B0 = ROL64((A22^D2), 62);
-+-    B1 = ROL64((A03^D3), 55);
-+-    B2 = ROL64((A34^D4), 39);
-+-    A10 =   B0 ^((~B1)&  B2 );
-+-    A41 =   B1 ^((~B2)&  B3 );
-+-    A22 =   B2 ^((~B3)&  B4 );
-+-    A03 =   B3 ^((~B4)&  B0 );
-+-    A34 =   B4 ^((~B0)&  B1 );
-+-
-+-    C0 = A00^A40^A30^A20^A10;
-+-    C1 = A31^A21^A11^A01^A41;
-+-    C2 = A12^A02^A42^A32^A22;
-+-    C3 = A43^A33^A23^A13^A03;
-+-    C4 = A24^A14^A04^A44^A34;
-+-    D0 = C4^ROL64(C1, 1);
-+-    D1 = C0^ROL64(C2, 1);
-+-    D2 = C1^ROL64(C3, 1);
-+-    D3 = C2^ROL64(C4, 1);
-+-    D4 = C3^ROL64(C0, 1);
-+-
-+-    B0 = (A00^D0);
-+-    B1 = ROL64((A21^D1), 44);
-+-    B2 = ROL64((A42^D2), 43);
-+-    B3 = ROL64((A13^D3), 21);
-+-    B4 = ROL64((A34^D4), 14);
-+-    A00 =   B0 ^((~B1)&  B2 );
-+-    A00 ^= RC[i+2];
-+-    A21 =   B1 ^((~B2)&  B3 );
-+-    A42 =   B2 ^((~B3)&  B4 );
-+-    A13 =   B3 ^((~B4)&  B0 );
-+-    A34 =   B4 ^((~B0)&  B1 );
-+-
-+-    B2 = ROL64((A30^D0), 3);
-+-    B3 = ROL64((A01^D1), 45);
-+-    B4 = ROL64((A22^D2), 61);
-+-    B0 = ROL64((A43^D3), 28);
-+-    B1 = ROL64((A14^D4), 20);
-+-    A30 =   B0 ^((~B1)&  B2 );
-+-    A01 =   B1 ^((~B2)&  B3 );
-+-    A22 =   B2 ^((~B3)&  B4 );
-+-    A43 =   B3 ^((~B4)&  B0 );
-+-    A14 =   B4 ^((~B0)&  B1 );
-+-
-+-    B4 = ROL64((A10^D0), 18);
-+-    B0 = ROL64((A31^D1), 1);
-+-    B1 = ROL64((A02^D2), 6);
-+-    B2 = ROL64((A23^D3), 25);
-+-    B3 = ROL64((A44^D4), 8);
-+-    A10 =   B0 ^((~B1)&  B2 );
-+-    A31 =   B1 ^((~B2)&  B3 );
-+-    A02 =   B2 ^((~B3)&  B4 );
-+-    A23 =   B3 ^((~B4)&  B0 );
-+-    A44 =   B4 ^((~B0)&  B1 );
-+-
-+-    B1 = ROL64((A40^D0), 36);
-+-    B2 = ROL64((A11^D1), 10);
-+-    B3 = ROL64((A32^D2), 15);
-+-    B4 = ROL64((A03^D3), 56);
-+-    B0 = ROL64((A24^D4), 27);
-+-    A40 =   B0 ^((~B1)&  B2 );
-+-    A11 =   B1 ^((~B2)&  B3 );
-+-    A32 =   B2 ^((~B3)&  B4 );
-+-    A03 =   B3 ^((~B4)&  B0 );
-+-    A24 =   B4 ^((~B0)&  B1 );
-+-
-+-    B3 = ROL64((A20^D0), 41);
-+-    B4 = ROL64((A41^D1), 2);
-+-    B0 = ROL64((A12^D2), 62);
-+-    B1 = ROL64((A33^D3), 55);
-+-    B2 = ROL64((A04^D4), 39);
-+-    A20 =   B0 ^((~B1)&  B2 );
-+-    A41 =   B1 ^((~B2)&  B3 );
-+-    A12 =   B2 ^((~B3)&  B4 );
-+-    A33 =   B3 ^((~B4)&  B0 );
-+-    A04 =   B4 ^((~B0)&  B1 );
-+-
-+-    C0 = A00^A30^A10^A40^A20;
-+-    C1 = A21^A01^A31^A11^A41;
-+-    C2 = A42^A22^A02^A32^A12;
-+-    C3 = A13^A43^A23^A03^A33;
-+-    C4 = A34^A14^A44^A24^A04;
-+-    D0 = C4^ROL64(C1, 1);
-+-    D1 = C0^ROL64(C2, 1);
-+-    D2 = C1^ROL64(C3, 1);
-+-    D3 = C2^ROL64(C4, 1);
-+-    D4 = C3^ROL64(C0, 1);
-+-
-+-    B0 = (A00^D0);
-+-    B1 = ROL64((A01^D1), 44);
-+-    B2 = ROL64((A02^D2), 43);
-+-    B3 = ROL64((A03^D3), 21);
-+-    B4 = ROL64((A04^D4), 14);
-+-    A00 =   B0 ^((~B1)&  B2 );
-+-    A00 ^= RC[i+3];
-+-    A01 =   B1 ^((~B2)&  B3 );
-+-    A02 =   B2 ^((~B3)&  B4 );
-+-    A03 =   B3 ^((~B4)&  B0 );
-+-    A04 =   B4 ^((~B0)&  B1 );
-+-
-+-    B2 = ROL64((A10^D0), 3);
-+-    B3 = ROL64((A11^D1), 45);
-+-    B4 = ROL64((A12^D2), 61);
-+-    B0 = ROL64((A13^D3), 28);
-+-    B1 = ROL64((A14^D4), 20);
-+-    A10 =   B0 ^((~B1)&  B2 );
-+-    A11 =   B1 ^((~B2)&  B3 );
-+-    A12 =   B2 ^((~B3)&  B4 );
-+-    A13 =   B3 ^((~B4)&  B0 );
-+-    A14 =   B4 ^((~B0)&  B1 );
-+-
-+-    B4 = ROL64((A20^D0), 18);
-+-    B0 = ROL64((A21^D1), 1);
-+-    B1 = ROL64((A22^D2), 6);
-+-    B2 = ROL64((A23^D3), 25);
-+-    B3 = ROL64((A24^D4), 8);
-+-    A20 =   B0 ^((~B1)&  B2 );
-+-    A21 =   B1 ^((~B2)&  B3 );
-+-    A22 =   B2 ^((~B3)&  B4 );
-+-    A23 =   B3 ^((~B4)&  B0 );
-+-    A24 =   B4 ^((~B0)&  B1 );
-+-
-+-    B1 = ROL64((A30^D0), 36);
-+-    B2 = ROL64((A31^D1), 10);
-+-    B3 = ROL64((A32^D2), 15);
-+-    B4 = ROL64((A33^D3), 56);
-+-    B0 = ROL64((A34^D4), 27);
-+-    A30 =   B0 ^((~B1)&  B2 );
-+-    A31 =   B1 ^((~B2)&  B3 );
-+-    A32 =   B2 ^((~B3)&  B4 );
-+-    A33 =   B3 ^((~B4)&  B0 );
-+-    A34 =   B4 ^((~B0)&  B1 );
-+-
-+-    B3 = ROL64((A40^D0), 41);
-+-    B4 = ROL64((A41^D1), 2);
-+-    B0 = ROL64((A42^D2), 62);
-+-    B1 = ROL64((A43^D3), 55);
-+-    B2 = ROL64((A44^D4), 39);
-+-    A40 =   B0 ^((~B1)&  B2 );
-+-    A41 =   B1 ^((~B2)&  B3 );
-+-    A42 =   B2 ^((~B3)&  B4 );
-+-    A43 =   B3 ^((~B4)&  B0 );
-+-    A44 =   B4 ^((~B0)&  B1 );
-+-  }
-+-}
-+-
-+-/*
-+-** Initialize a new hash.  iSize determines the size of the hash
-+-** in bits and should be one of 224, 256, 384, or 512.  Or iSize
-+-** can be zero to use the default hash size of 256 bits.
-+-*/
-+-static void SHA3Init(SHA3Context *p, int iSize){
-+-  memset(p, 0, sizeof(*p));
-+-  if( iSize>=128 && iSize<=512 ){
-+-    p->nRate = (1600 - ((iSize + 31)&~31)*2)/8;
-+-  }else{
-+-    p->nRate = (1600 - 2*256)/8;
-+-  }
-+-#if SHA3_BYTEORDER==1234
-+-  /* Known to be little-endian at compile-time. No-op */
-+-#elif SHA3_BYTEORDER==4321
-+-  p->ixMask = 7;  /* Big-endian */
-+-#else
-+-  {
-+-    static unsigned int one = 1;
-+-    if( 1==*(unsigned char*)&one ){
-+-      /* Little endian.  No byte swapping. */
-+-      p->ixMask = 0;
-+-    }else{
-+-      /* Big endian.  Byte swap. */
-+-      p->ixMask = 7;
-+-    }
-+-  }
-+-#endif
-+-}
-+-
-+-/*
-+-** Make consecutive calls to the SHA3Update function to add new content
-+-** to the hash
-+-*/
-+-static void SHA3Update(
-+-  SHA3Context *p,
-+-  const unsigned char *aData,
-+-  unsigned int nData
-+-){
-+-  unsigned int i = 0;
-+-#if SHA3_BYTEORDER==1234
-+-  if( (p->nLoaded % 8)==0 && ((aData - (const unsigned char*)0)&7)==0 ){
-+-    for(; i+7<nData; i+=8){
-+-      p->u.s[p->nLoaded/8] ^= *(u64*)&aData[i];
-+-      p->nLoaded += 8;
-+-      if( p->nLoaded>=p->nRate ){
-+-        KeccakF1600Step(p);
-+-        p->nLoaded = 0;
-+-      }
-+-    }
-+-  }
-+-#endif
-+-  for(; i<nData; i++){
-+-#if SHA3_BYTEORDER==1234
-+-    p->u.x[p->nLoaded] ^= aData[i];
-+-#elif SHA3_BYTEORDER==4321
-+-    p->u.x[p->nLoaded^0x07] ^= aData[i];
-+-#else
-+-    p->u.x[p->nLoaded^p->ixMask] ^= aData[i];
-+-#endif
-+-    p->nLoaded++;
-+-    if( p->nLoaded==p->nRate ){
-+-      KeccakF1600Step(p);
-+-      p->nLoaded = 0;
-+-    }
-+-  }
-+-}
-+-
-+-/*
-+-** After all content has been added, invoke SHA3Final() to compute
-+-** the final hash.  The function returns a pointer to the binary
-+-** hash value.
-+-*/
-+-static unsigned char *SHA3Final(SHA3Context *p){
-+-  unsigned int i;
-+-  if( p->nLoaded==p->nRate-1 ){
-+-    const unsigned char c1 = 0x86;
-+-    SHA3Update(p, &c1, 1);
-+-  }else{
-+-    const unsigned char c2 = 0x06;
-+-    const unsigned char c3 = 0x80;
-+-    SHA3Update(p, &c2, 1);
-+-    p->nLoaded = p->nRate - 1;
-+-    SHA3Update(p, &c3, 1);
-+-  }
-+-  for(i=0; i<p->nRate; i++){
-+-    p->u.x[i+p->nRate] = p->u.x[i^p->ixMask];
-+-  }
-+-  return &p->u.x[p->nRate];
-+-}
-+-/* End of the hashing logic
-+-*****************************************************************************/
-+-
-+-/*
-+-** Implementation of the sha3(X,SIZE) function.
-+-**
-+-** Return a BLOB which is the SIZE-bit SHA3 hash of X.  The default
-+-** size is 256.  If X is a BLOB, it is hashed as is.
-+-** For all other non-NULL types of input, X is converted into a UTF-8 string
-+-** and the string is hashed without the trailing 0x00 terminator.  The hash
-+-** of a NULL value is NULL.
-+-*/
-+-static void sha3Func(
-+-  sqlite3_context *context,
-+-  int argc,
-+-  sqlite3_value **argv
-+-){
-+-  SHA3Context cx;
-+-  int eType = sqlite3_value_type(argv[0]);
-+-  int nByte = sqlite3_value_bytes(argv[0]);
-+-  int iSize;
-+-  if( argc==1 ){
-+-    iSize = 256;
-+-  }else{
-+-    iSize = sqlite3_value_int(argv[1]);
-+-    if( iSize!=224 && iSize!=256 && iSize!=384 && iSize!=512 ){
-+-      sqlite3_result_error(context, "SHA3 size should be one of: 224 256 "
-+-                                    "384 512", -1);
-+-      return;
-+-    }
-+-  }
-+-  if( eType==SQLITE_NULL ) return;
-+-  SHA3Init(&cx, iSize);
-+-  if( eType==SQLITE_BLOB ){
-+-    SHA3Update(&cx, sqlite3_value_blob(argv[0]), nByte);
-+-  }else{
-+-    SHA3Update(&cx, sqlite3_value_text(argv[0]), nByte);
-+-  }
-+-  sqlite3_result_blob(context, SHA3Final(&cx), iSize/8, SQLITE_TRANSIENT);
-+-}
-+-
-+-/* Compute a string using sqlite3_vsnprintf() with a maximum length
-+-** of 50 bytes and add it to the hash.
-+-*/
-+-static void hash_step_vformat(
-+-  SHA3Context *p,                 /* Add content to this context */
-+-  const char *zFormat,
-+-  ...
-+-){
-+-  va_list ap;
-+-  int n;
-+-  char zBuf[50];
-+-  va_start(ap, zFormat);
-+-  sqlite3_vsnprintf(sizeof(zBuf),zBuf,zFormat,ap);
-+-  va_end(ap);
-+-  n = (int)strlen(zBuf);
-+-  SHA3Update(p, (unsigned char*)zBuf, n);
-+-}
-+-
-+-/*
-+-** Implementation of the sha3_query(SQL,SIZE) function.
-+-**
-+-** This function compiles and runs the SQL statement(s) given in the
-+-** argument. The results are hashed using a SIZE-bit SHA3.  The default
-+-** size is 256.
-+-**
-+-** The format of the byte stream that is hashed is summarized as follows:
-+-**
-+-**       S<n>:<sql>
-+-**       R
-+-**       N
-+-**       I<int>
-+-**       F<ieee-float>
-+-**       B<size>:<bytes>
-+-**       T<size>:<text>
-+-**
-+-** <sql> is the original SQL text for each statement run and <n> is
-+-** the size of that text.  The SQL text is UTF-8.  A single R character
-+-** occurs before the start of each row.  N means a NULL value.
-+-** I mean an 8-byte little-endian integer <int>.  F is a floating point
-+-** number with an 8-byte little-endian IEEE floating point value <ieee-float>.
-+-** B means blobs of <size> bytes.  T means text rendered as <size>
-+-** bytes of UTF-8.  The <n> and <size> values are expressed as an ASCII
-+-** text integers.
-+-**
-+-** For each SQL statement in the X input, there is one S segment.  Each
-+-** S segment is followed by zero or more R segments, one for each row in the
-+-** result set.  After each R, there are one or more N, I, F, B, or T segments,
-+-** one for each column in the result set.  Segments are concatentated directly
-+-** with no delimiters of any kind.
-+-*/
-+-static void sha3QueryFunc(
-+-  sqlite3_context *context,
-+-  int argc,
-+-  sqlite3_value **argv
-+-){
-+-  sqlite3 *db = sqlite3_context_db_handle(context);
-+-  const char *zSql = (const char*)sqlite3_value_text(argv[0]);
-+-  sqlite3_stmt *pStmt = 0;
-+-  int nCol;                   /* Number of columns in the result set */
-+-  int i;                      /* Loop counter */
-+-  int rc;
-+-  int n;
-+-  const char *z;
-+-  SHA3Context cx;
-+-  int iSize;
-+-
-+-  if( argc==1 ){
-+-    iSize = 256;
-+-  }else{
-+-    iSize = sqlite3_value_int(argv[1]);
-+-    if( iSize!=224 && iSize!=256 && iSize!=384 && iSize!=512 ){
-+-      sqlite3_result_error(context, "SHA3 size should be one of: 224 256 "
-+-                                    "384 512", -1);
-+-      return;
-+-    }
-+-  }
-+-  if( zSql==0 ) return;
-+-  SHA3Init(&cx, iSize);
-+-  while( zSql[0] ){
-+-    rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, &zSql);
-+-    if( rc ){
-+-      char *zMsg = sqlite3_mprintf("error SQL statement [%s]: %s",
-+-                                   zSql, sqlite3_errmsg(db));
-+-      sqlite3_finalize(pStmt);
-+-      sqlite3_result_error(context, zMsg, -1);
-+-      sqlite3_free(zMsg);
-+-      return;
-+-    }
-+-    if( !sqlite3_stmt_readonly(pStmt) ){
-+-      char *zMsg = sqlite3_mprintf("non-query: [%s]", sqlite3_sql(pStmt));
-+-      sqlite3_finalize(pStmt);
-+-      sqlite3_result_error(context, zMsg, -1);
-+-      sqlite3_free(zMsg);
-+-      return;
-+-    }
-+-    nCol = sqlite3_column_count(pStmt);
-+-    z = sqlite3_sql(pStmt);
-+-    n = (int)strlen(z);
-+-    hash_step_vformat(&cx,"S%d:",n);
-+-    SHA3Update(&cx,(unsigned char*)z,n);
-+-
-+-    /* Compute a hash over the result of the query */
-+-    while( SQLITE_ROW==sqlite3_step(pStmt) ){
-+-      SHA3Update(&cx,(const unsigned char*)"R",1);
-+-      for(i=0; i<nCol; i++){
-+-        switch( sqlite3_column_type(pStmt,i) ){
-+-          case SQLITE_NULL: {
-+-            SHA3Update(&cx, (const unsigned char*)"N",1);
-+-            break;
-+-          }
-+-          case SQLITE_INTEGER: {
-+-            sqlite3_uint64 u;
-+-            int j;
-+-            unsigned char x[9];
-+-            sqlite3_int64 v = sqlite3_column_int64(pStmt,i);
-+-            memcpy(&u, &v, 8);
-+-            for(j=8; j>=1; j--){
-+-              x[j] = u & 0xff;
-+-              u >>= 8;
-+-            }
-+-            x[0] = 'I';
-+-            SHA3Update(&cx, x, 9);
-+-            break;
-+-          }
-+-          case SQLITE_FLOAT: {
-+-            sqlite3_uint64 u;
-+-            int j;
-+-            unsigned char x[9];
-+-            double r = sqlite3_column_double(pStmt,i);
-+-            memcpy(&u, &r, 8);
-+-            for(j=8; j>=1; j--){
-+-              x[j] = u & 0xff;
-+-              u >>= 8;
-+-            }
-+-            x[0] = 'F';
-+-            SHA3Update(&cx,x,9);
-+-            break;
-+-          }
-+-          case SQLITE_TEXT: {
-+-            int n2 = sqlite3_column_bytes(pStmt, i);
-+-            const unsigned char *z2 = sqlite3_column_text(pStmt, i);
-+-            hash_step_vformat(&cx,"T%d:",n2);
-+-            SHA3Update(&cx, z2, n2);
-+-            break;
-+-          }
-+-          case SQLITE_BLOB: {
-+-            int n2 = sqlite3_column_bytes(pStmt, i);
-+-            const unsigned char *z2 = sqlite3_column_blob(pStmt, i);
-+-            hash_step_vformat(&cx,"B%d:",n2);
-+-            SHA3Update(&cx, z2, n2);
-+-            break;
-+-          }
-+-        }
-+-      }
-+-    }
-+-    sqlite3_finalize(pStmt);
-+-  }
-+-  sqlite3_result_blob(context, SHA3Final(&cx), iSize/8, SQLITE_TRANSIENT);
-+-}
-+-
-+-
-+-#ifdef _WIN32
-+-
-+-#endif
-+-int sqlite3_shathree_init(
-+-  sqlite3 *db,
-+-  char **pzErrMsg,
-+-  const sqlite3_api_routines *pApi
-+-){
-+-  int rc = SQLITE_OK;
-+-  SQLITE_EXTENSION_INIT2(pApi);
-+-  (void)pzErrMsg;  /* Unused parameter */
-+-  rc = sqlite3_create_function(db, "sha3", 1, SQLITE_UTF8, 0,
-+-                               sha3Func, 0, 0);
-+-  if( rc==SQLITE_OK ){
-+-    rc = sqlite3_create_function(db, "sha3", 2, SQLITE_UTF8, 0,
-+-                                 sha3Func, 0, 0);
-+-  }
-+-  if( rc==SQLITE_OK ){
-+-    rc = sqlite3_create_function(db, "sha3_query", 1, SQLITE_UTF8, 0,
-+-                                 sha3QueryFunc, 0, 0);
-+-  }
-+-  if( rc==SQLITE_OK ){
-+-    rc = sqlite3_create_function(db, "sha3_query", 2, SQLITE_UTF8, 0,
-+-                                 sha3QueryFunc, 0, 0);
-+-  }
-+-  return rc;
-+-}
-+-
-+-/************************* End ../ext/misc/shathree.c ********************/
-+-/************************* Begin ../ext/misc/fileio.c ******************/
-+-/*
-+-** 2014-06-13
-+-**
-+-** The author disclaims copyright to this source code.  In place of
-+-** a legal notice, here is a blessing:
-+-**
-+-**    May you do good and not evil.
-+-**    May you find forgiveness for yourself and forgive others.
-+-**    May you share freely, never taking more than you give.
-+-**
-+-******************************************************************************
-+-**
-+-** This SQLite extension implements SQL functions readfile() and
-+-** writefile().
-+-*/
-+-SQLITE_EXTENSION_INIT1
-+-#include <stdio.h>
-+-
-+-/*
-+-** Implementation of the "readfile(X)" SQL function.  The entire content
-+-** of the file named X is read and returned as a BLOB.  NULL is returned
-+-** if the file does not exist or is unreadable.
-+-*/
-+-static void readfileFunc(
-+-  sqlite3_context *context,
-+-  int argc,
-+-  sqlite3_value **argv
-+-){
-+-  const char *zName;
-+-  FILE *in;
-+-  long nIn;
-+-  void *pBuf;
-+-
-+-  (void)(argc);  /* Unused parameter */
-+-  zName = (const char*)sqlite3_value_text(argv[0]);
-+-  if( zName==0 ) return;
-+-  in = fopen(zName, "rb");
-+-  if( in==0 ) return;
-+-  fseek(in, 0, SEEK_END);
-+-  nIn = ftell(in);
-+-  rewind(in);
-+-  pBuf = sqlite3_malloc( nIn );
-+-  if( pBuf && 1==fread(pBuf, nIn, 1, in) ){
-+-    sqlite3_result_blob(context, pBuf, nIn, sqlite3_free);
-+-  }else{
-+-    sqlite3_free(pBuf);
-+-  }
-+-  fclose(in);
-+-}
-+-
-+-/*
-+-** Implementation of the "writefile(X,Y)" SQL function.  The argument Y
-+-** is written into file X.  The number of bytes written is returned.  Or
-+-** NULL is returned if something goes wrong, such as being unable to open
-+-** file X for writing.
-+-*/
-+-static void writefileFunc(
-+-  sqlite3_context *context,
-+-  int argc,
-+-  sqlite3_value **argv
-+-){
-+-  FILE *out;
-+-  const char *z;
-+-  sqlite3_int64 rc;
-+-  const char *zFile;
-+-
-+-  (void)(argc);  /* Unused parameter */
-+-  zFile = (const char*)sqlite3_value_text(argv[0]);
-+-  if( zFile==0 ) return;
-+-  out = fopen(zFile, "wb");
-+-  if( out==0 ) return;
-+-  z = (const char*)sqlite3_value_blob(argv[1]);
-+-  if( z==0 ){
-+-    rc = 0;
-+-  }else{
-+-    rc = fwrite(z, 1, sqlite3_value_bytes(argv[1]), out);
-+-  }
-+-  fclose(out);
-+-  sqlite3_result_int64(context, rc);
-+-}
-+-
-+-
-+-#ifdef _WIN32
-+-
-+-#endif
-+-int sqlite3_fileio_init(
-+-  sqlite3 *db,
-+-  char **pzErrMsg,
-+-  const sqlite3_api_routines *pApi
-+-){
-+-  int rc = SQLITE_OK;
-+-  SQLITE_EXTENSION_INIT2(pApi);
-+-  (void)pzErrMsg;  /* Unused parameter */
-+-  rc = sqlite3_create_function(db, "readfile", 1, SQLITE_UTF8, 0,
-+-                               readfileFunc, 0, 0);
-+-  if( rc==SQLITE_OK ){
-+-    rc = sqlite3_create_function(db, "writefile", 2, SQLITE_UTF8, 0,
-+-                                 writefileFunc, 0, 0);
-+-  }
-+-  return rc;
-+-}
-+-
-+-/************************* End ../ext/misc/fileio.c ********************/
-+-/************************* Begin ../ext/misc/completion.c ******************/
-+-/*
-+-** 2017-07-10
-+-**
-+-** The author disclaims copyright to this source code.  In place of
-+-** a legal notice, here is a blessing:
-+-**
-+-**    May you do good and not evil.
-+-**    May you find forgiveness for yourself and forgive others.
-+-**    May you share freely, never taking more than you give.
-+-**
-+-*************************************************************************
-+-**
-+-** This file implements an eponymous virtual table that returns suggested
-+-** completions for a partial SQL input.
-+-**
-+-** Suggested usage:
-+-**
-+-**     SELECT DISTINCT candidate COLLATE nocase
-+-**       FROM completion($prefix,$wholeline)
-+-**      ORDER BY 1;
-+-**
-+-** The two query parameters are optional.  $prefix is the text of the
-+-** current word being typed and that is to be completed.  $wholeline is
-+-** the complete input line, used for context.
-+-**
-+-** The raw completion() table might return the same candidate multiple
-+-** times, for example if the same column name is used to two or more
-+-** tables.  And the candidates are returned in an arbitrary order.  Hence,
-+-** the DISTINCT and ORDER BY are recommended.
-+-**
-+-** This virtual table operates at the speed of human typing, and so there
-+-** is no attempt to make it fast.  Even a slow implementation will be much
-+-** faster than any human can type.
-+-**
-+-*/
-+-SQLITE_EXTENSION_INIT1
-+-#include <assert.h>
-+-#include <string.h>
-+-#include <ctype.h>
-+-
-+-#ifndef SQLITE_OMIT_VIRTUALTABLE
-+-
-+-/* completion_vtab is a subclass of sqlite3_vtab which will
-+-** serve as the underlying representation of a completion virtual table
-+-*/
-+-typedef struct completion_vtab completion_vtab;
-+-struct completion_vtab {
-+-  sqlite3_vtab base;  /* Base class - must be first */
-+-  sqlite3 *db;        /* Database connection for this completion vtab */
-+-};
-+-
-+-/* completion_cursor is a subclass of sqlite3_vtab_cursor which will
-+-** serve as the underlying representation of a cursor that scans
-+-** over rows of the result
-+-*/
-+-typedef struct completion_cursor completion_cursor;
-+-struct completion_cursor {
-+-  sqlite3_vtab_cursor base;  /* Base class - must be first */
-+-  sqlite3 *db;               /* Database connection for this cursor */
-+-  int nPrefix, nLine;        /* Number of bytes in zPrefix and zLine */
-+-  char *zPrefix;             /* The prefix for the word we want to complete */
-+-  char *zLine;               /* The whole that we want to complete */
-+-  const char *zCurrentRow;   /* Current output row */
-+-  sqlite3_stmt *pStmt;       /* Current statement */
-+-  sqlite3_int64 iRowid;      /* The rowid */
-+-  int ePhase;                /* Current phase */
-+-  int j;                     /* inter-phase counter */
-+-};
-+-
-+-/* Values for ePhase:
-+-*/
-+-#define COMPLETION_FIRST_PHASE   1
-+-#define COMPLETION_KEYWORDS      1
-+-#define COMPLETION_PRAGMAS       2
-+-#define COMPLETION_FUNCTIONS     3
-+-#define COMPLETION_COLLATIONS    4
-+-#define COMPLETION_INDEXES       5
-+-#define COMPLETION_TRIGGERS      6
-+-#define COMPLETION_DATABASES     7
-+-#define COMPLETION_TABLES        8
-+-#define COMPLETION_COLUMNS       9
-+-#define COMPLETION_MODULES       10
-+-#define COMPLETION_EOF           11
-+-
-+-/*
-+-** The completionConnect() method is invoked to create a new
-+-** completion_vtab that describes the completion virtual table.
-+-**
-+-** Think of this routine as the constructor for completion_vtab objects.
-+-**
-+-** All this routine needs to do is:
-+-**
-+-**    (1) Allocate the completion_vtab object and initialize all fields.
-+-**
-+-**    (2) Tell SQLite (via the sqlite3_declare_vtab() interface) what the
-+-**        result set of queries against completion will look like.
-+-*/
-+-static int completionConnect(
-+-  sqlite3 *db,
-+-  void *pAux,
-+-  int argc, const char *const*argv,
-+-  sqlite3_vtab **ppVtab,
-+-  char **pzErr
-+-){
-+-  completion_vtab *pNew;
-+-  int rc;
-+-
-+-  (void)(pAux);    /* Unused parameter */
-+-  (void)(argc);    /* Unused parameter */
-+-  (void)(argv);    /* Unused parameter */
-+-  (void)(pzErr);   /* Unused parameter */
-+-
-+-/* Column numbers */
-+-#define COMPLETION_COLUMN_CANDIDATE 0  /* Suggested completion of the input */
-+-#define COMPLETION_COLUMN_PREFIX    1  /* Prefix of the word to be completed */
-+-#define COMPLETION_COLUMN_WHOLELINE 2  /* Entire line seen so far */
-+-#define COMPLETION_COLUMN_PHASE     3  /* ePhase - used for debugging only */
-+-
-+-  rc = sqlite3_declare_vtab(db,
-+-      "CREATE TABLE x("
-+-      "  candidate TEXT,"
-+-      "  prefix TEXT HIDDEN,"
-+-      "  wholeline TEXT HIDDEN,"
-+-      "  phase INT HIDDEN"        /* Used for debugging only */
-+-      ")");
-+-  if( rc==SQLITE_OK ){
-+-    pNew = sqlite3_malloc( sizeof(*pNew) );
-+-    *ppVtab = (sqlite3_vtab*)pNew;
-+-    if( pNew==0 ) return SQLITE_NOMEM;
-+-    memset(pNew, 0, sizeof(*pNew));
-+-    pNew->db = db;
-+-  }
-+-  return rc;
-+-}
-+-
-+-/*
-+-** This method is the destructor for completion_cursor objects.
-+-*/
-+-static int completionDisconnect(sqlite3_vtab *pVtab){
-+-  sqlite3_free(pVtab);
-+-  return SQLITE_OK;
-+-}
-+-
-+-/*
-+-** Constructor for a new completion_cursor object.
-+-*/
-+-static int completionOpen(sqlite3_vtab *p, sqlite3_vtab_cursor **ppCursor){
-+-  completion_cursor *pCur;
-+-  pCur = sqlite3_malloc( sizeof(*pCur) );
-+-  if( pCur==0 ) return SQLITE_NOMEM;
-+-  memset(pCur, 0, sizeof(*pCur));
-+-  pCur->db = ((completion_vtab*)p)->db;
-+-  *ppCursor = &pCur->base;
-+-  return SQLITE_OK;
-+-}
-+-
-+-/*
-+-** Reset the completion_cursor.
-+-*/
-+-static void completionCursorReset(completion_cursor *pCur){
-+-  sqlite3_free(pCur->zPrefix);   pCur->zPrefix = 0;  pCur->nPrefix = 0;
-+-  sqlite3_free(pCur->zLine);     pCur->zLine = 0;    pCur->nLine = 0;
-+-  sqlite3_finalize(pCur->pStmt); pCur->pStmt = 0;
-+-  pCur->j = 0;
-+-}
-+-
-+-/*
-+-** Destructor for a completion_cursor.
-+-*/
-+-static int completionClose(sqlite3_vtab_cursor *cur){
-+-  completionCursorReset((completion_cursor*)cur);
-+-  sqlite3_free(cur);
-+-  return SQLITE_OK;
-+-}
-+-
-+-/*
-+-** All SQL keywords understood by SQLite
-+-*/
-+-static const char *completionKwrds[] = {
-+-  "ABORT", "ACTION", "ADD", "AFTER", "ALL", "ALTER", "ANALYZE", "AND", "AS",
-+-  "ASC", "ATTACH", "AUTOINCREMENT", "BEFORE", "BEGIN", "BETWEEN", "BY",
-+-  "CASCADE", "CASE", "CAST", "CHECK", "COLLATE", "COLUMN", "COMMIT",
-+-  "CONFLICT", "CONSTRAINT", "CREATE", "CROSS", "CURRENT_DATE",
-+-  "CURRENT_TIME", "CURRENT_TIMESTAMP", "DATABASE", "DEFAULT", "DEFERRABLE",
-+-  "DEFERRED", "DELETE", "DESC", "DETACH", "DISTINCT", "DROP", "EACH",
-+-  "ELSE", "END", "ESCAPE", "EXCEPT", "EXCLUSIVE", "EXISTS", "EXPLAIN",
-+-  "FAIL", "FOR", "FOREIGN", "FROM", "FULL", "GLOB", "GROUP", "HAVING", "IF",
-+-  "IGNORE", "IMMEDIATE", "IN", "INDEX", "INDEXED", "INITIALLY", "INNER",
-+-  "INSERT", "INSTEAD", "INTERSECT", "INTO", "IS", "ISNULL", "JOIN", "KEY",
-+-  "LEFT", "LIKE", "LIMIT", "MATCH", "NATURAL", "NO", "NOT", "NOTNULL",
-+-  "NULL", "OF", "OFFSET", "ON", "OR", "ORDER", "OUTER", "PLAN", "PRAGMA",
-+-  "PRIMARY", "QUERY", "RAISE", "RECURSIVE", "REFERENCES", "REGEXP",
-+-  "REINDEX", "RELEASE", "RENAME", "REPLACE", "RESTRICT", "RIGHT",
-+-  "ROLLBACK", "ROW", "SAVEPOINT", "SELECT", "SET", "TABLE", "TEMP",
-+-  "TEMPORARY", "THEN", "TO", "TRANSACTION", "TRIGGER", "UNION", "UNIQUE",
-+-  "UPDATE", "USING", "VACUUM", "VALUES", "VIEW", "VIRTUAL", "WHEN", "WHERE",
-+-  "WITH", "WITHOUT",
-+-};
-+-#define completionKwCount \
-+-   (int)(sizeof(completionKwrds)/sizeof(completionKwrds[0]))
-+-
-+-/*
-+-** Advance a completion_cursor to its next row of output.
-+-**
-+-** The ->ePhase, ->j, and ->pStmt fields of the completion_cursor object
-+-** record the current state of the scan.  This routine sets ->zCurrentRow
-+-** to the current row of output and then returns.  If no more rows remain,
-+-** then ->ePhase is set to COMPLETION_EOF which will signal the virtual
-+-** table that has reached the end of its scan.
-+-**
-+-** The current implementation just lists potential identifiers and
-+-** keywords and filters them by zPrefix.  Future enhancements should
-+-** take zLine into account to try to restrict the set of identifiers and
-+-** keywords based on what would be legal at the current point of input.
-+-*/
-+-static int completionNext(sqlite3_vtab_cursor *cur){
-+-  completion_cursor *pCur = (completion_cursor*)cur;
-+-  int eNextPhase = 0;  /* Next phase to try if current phase reaches end */
-+-  int iCol = -1;       /* If >=0, step pCur->pStmt and use the i-th column */
-+-  pCur->iRowid++;
-+-  while( pCur->ePhase!=COMPLETION_EOF ){
-+-    switch( pCur->ePhase ){
-+-      case COMPLETION_KEYWORDS: {
-+-        if( pCur->j >= completionKwCount ){
-+-          pCur->zCurrentRow = 0;
-+-          pCur->ePhase = COMPLETION_DATABASES;
-+-        }else{
-+-          pCur->zCurrentRow = completionKwrds[pCur->j++];
-+-        }
-+-        iCol = -1;
-+-        break;
-+-      }
-+-      case COMPLETION_DATABASES: {
-+-        if( pCur->pStmt==0 ){
-+-          sqlite3_prepare_v2(pCur->db, "PRAGMA database_list", -1,
-+-                             &pCur->pStmt, 0);
-+-        }
-+-        iCol = 1;
-+-        eNextPhase = COMPLETION_TABLES;
-+-        break;
-+-      }
-+-      case COMPLETION_TABLES: {
-+-        if( pCur->pStmt==0 ){
-+-          sqlite3_stmt *pS2;
-+-          char *zSql = 0;
-+-          const char *zSep = "";
-+-          sqlite3_prepare_v2(pCur->db, "PRAGMA database_list", -1, &pS2, 0);
-+-          while( sqlite3_step(pS2)==SQLITE_ROW ){
-+-            const char *zDb = (const char*)sqlite3_column_text(pS2, 1);
-+-            zSql = sqlite3_mprintf(
-+-               "%z%s"
-+-               "SELECT name FROM \"%w\".sqlite_master"
-+-               " WHERE type='table'",
-+-               zSql, zSep, zDb
-+-            );
-+-            if( zSql==0 ) return SQLITE_NOMEM;
-+-            zSep = " UNION ";
-+-          }
-+-          sqlite3_finalize(pS2);
-+-          sqlite3_prepare_v2(pCur->db, zSql, -1, &pCur->pStmt, 0);
-+-          sqlite3_free(zSql);
-+-        }
-+-        iCol = 0;
-+-        eNextPhase = COMPLETION_COLUMNS;
-+-        break;
-+-      }
-+-      case COMPLETION_COLUMNS: {
-+-        if( pCur->pStmt==0 ){
-+-          sqlite3_stmt *pS2;
-+-          char *zSql = 0;
-+-          const char *zSep = "";
-+-          sqlite3_prepare_v2(pCur->db, "PRAGMA database_list", -1, &pS2, 0);
-+-          while( sqlite3_step(pS2)==SQLITE_ROW ){
-+-            const char *zDb = (const char*)sqlite3_column_text(pS2, 1);
-+-            zSql = sqlite3_mprintf(
-+-               "%z%s"
-+-               "SELECT pti.name FROM \"%w\".sqlite_master AS sm"
-+-                       " JOIN pragma_table_info(sm.name,%Q) AS pti"
-+-               " WHERE sm.type='table'",
-+-               zSql, zSep, zDb, zDb
-+-            );
-+-            if( zSql==0 ) return SQLITE_NOMEM;
-+-            zSep = " UNION ";
-+-          }
-+-          sqlite3_finalize(pS2);
-+-          sqlite3_prepare_v2(pCur->db, zSql, -1, &pCur->pStmt, 0);
-+-          sqlite3_free(zSql);
-+-        }
-+-        iCol = 0;
-+-        eNextPhase = COMPLETION_EOF;
-+-        break;
-+-      }
-+-    }
-+-    if( iCol<0 ){
-+-      /* This case is when the phase presets zCurrentRow */
-+-      if( pCur->zCurrentRow==0 ) continue;
-+-    }else{
-+-      if( sqlite3_step(pCur->pStmt)==SQLITE_ROW ){
-+-        /* Extract the next row of content */
-+-        pCur->zCurrentRow = (const char*)sqlite3_column_text(pCur->pStmt, iCol);
-+-      }else{
-+-        /* When all rows are finished, advance to the next phase */
-+-        sqlite3_finalize(pCur->pStmt);
-+-        pCur->pStmt = 0;
-+-        pCur->ePhase = eNextPhase;
-+-        continue;
-+-      }
-+-    }
-+-    if( pCur->nPrefix==0 ) break;
-+-    if( sqlite3_strnicmp(pCur->zPrefix, pCur->zCurrentRow, pCur->nPrefix)==0 ){
-+-      break;
-+-    }
-+-  }
-+-
-+-  return SQLITE_OK;
-+-}
-+-
-+-/*
-+-** Return values of columns for the row at which the completion_cursor
-+-** is currently pointing.
-+-*/
-+-static int completionColumn(
-+-  sqlite3_vtab_cursor *cur,   /* The cursor */
-+-  sqlite3_context *ctx,       /* First argument to sqlite3_result_...() */
-+-  int i                       /* Which column to return */
-+-){
-+-  completion_cursor *pCur = (completion_cursor*)cur;
-+-  switch( i ){
-+-    case COMPLETION_COLUMN_CANDIDATE: {
-+-      sqlite3_result_text(ctx, pCur->zCurrentRow, -1, SQLITE_TRANSIENT);
-+-      break;
-+-    }
-+-    case COMPLETION_COLUMN_PREFIX: {
-+-      sqlite3_result_text(ctx, pCur->zPrefix, -1, SQLITE_TRANSIENT);
-+-      break;
-+-    }
-+-    case COMPLETION_COLUMN_WHOLELINE: {
-+-      sqlite3_result_text(ctx, pCur->zLine, -1, SQLITE_TRANSIENT);
-+-      break;
-+-    }
-+-    case COMPLETION_COLUMN_PHASE: {
-+-      sqlite3_result_int(ctx, pCur->ePhase);
-+-      break;
-+-    }
-+-  }
-+-  return SQLITE_OK;
-+-}
-+-
-+-/*
-+-** Return the rowid for the current row.  In this implementation, the
-+-** rowid is the same as the output value.
-+-*/
-+-static int completionRowid(sqlite3_vtab_cursor *cur, sqlite_int64 *pRowid){
-+-  completion_cursor *pCur = (completion_cursor*)cur;
-+-  *pRowid = pCur->iRowid;
-+-  return SQLITE_OK;
-+-}
-+-
-+-/*
-+-** Return TRUE if the cursor has been moved off of the last
-+-** row of output.
-+-*/
-+-static int completionEof(sqlite3_vtab_cursor *cur){
-+-  completion_cursor *pCur = (completion_cursor*)cur;
-+-  return pCur->ePhase >= COMPLETION_EOF;
-+-}
-+-
-+-/*
-+-** This method is called to "rewind" the completion_cursor object back
-+-** to the first row of output.  This method is always called at least
-+-** once prior to any call to completionColumn() or completionRowid() or
-+-** completionEof().
-+-*/
-+-static int completionFilter(
-+-  sqlite3_vtab_cursor *pVtabCursor,
-+-  int idxNum, const char *idxStr,
-+-  int argc, sqlite3_value **argv
-+-){
-+-  completion_cursor *pCur = (completion_cursor *)pVtabCursor;
-+-  int iArg = 0;
-+-  (void)(idxStr);   /* Unused parameter */
-+-  (void)(argc);     /* Unused parameter */
-+-  completionCursorReset(pCur);
-+-  if( idxNum & 1 ){
-+-    pCur->nPrefix = sqlite3_value_bytes(argv[iArg]);
-+-    if( pCur->nPrefix>0 ){
-+-      pCur->zPrefix = sqlite3_mprintf("%s", sqlite3_value_text(argv[iArg]));
-+-      if( pCur->zPrefix==0 ) return SQLITE_NOMEM;
-+-    }
-+-    iArg++;
-+-  }
-+-  if( idxNum & 2 ){
-+-    pCur->nLine = sqlite3_value_bytes(argv[iArg]);
-+-    if( pCur->nLine>0 ){
-+-      pCur->zLine = sqlite3_mprintf("%s", sqlite3_value_text(argv[iArg]));
-+-      if( pCur->zLine==0 ) return SQLITE_NOMEM;
-+-    }
-+-    iArg++;
-+-  }
-+-  if( pCur->zLine!=0 && pCur->zPrefix==0 ){
-+-    int i = pCur->nLine;
-+-    while( i>0 && (isalnum(pCur->zLine[i-1]) || pCur->zLine[i-1]=='_') ){
-+-      i--;
-+-    }
-+-    pCur->nPrefix = pCur->nLine - i;
-+-    if( pCur->nPrefix>0 ){
-+-      pCur->zPrefix = sqlite3_mprintf("%.*s", pCur->nPrefix, pCur->zLine + i);
-+-      if( pCur->zPrefix==0 ) return SQLITE_NOMEM;
-+-    }
-+-  }
-+-  pCur->iRowid = 0;
-+-  pCur->ePhase = COMPLETION_FIRST_PHASE;
-+-  return completionNext(pVtabCursor);
-+-}
-+-
-+-/*
-+-** SQLite will invoke this method one or more times while planning a query
-+-** that uses the completion virtual table.  This routine needs to create
-+-** a query plan for each invocation and compute an estimated cost for that
-+-** plan.
-+-**
-+-** There are two hidden parameters that act as arguments to the table-valued
-+-** function:  "prefix" and "wholeline".  Bit 0 of idxNum is set if "prefix"
-+-** is available and bit 1 is set if "wholeline" is available.
-+-*/
-+-static int completionBestIndex(
-+-  sqlite3_vtab *tab,
-+-  sqlite3_index_info *pIdxInfo
-+-){
-+-  int i;                 /* Loop over constraints */
-+-  int idxNum = 0;        /* The query plan bitmask */
-+-  int prefixIdx = -1;    /* Index of the start= constraint, or -1 if none */
-+-  int wholelineIdx = -1; /* Index of the stop= constraint, or -1 if none */
-+-  int nArg = 0;          /* Number of arguments that completeFilter() expects */
-+-  const struct sqlite3_index_constraint *pConstraint;
-+-
-+-  (void)(tab);    /* Unused parameter */
-+-  pConstraint = pIdxInfo->aConstraint;
-+-  for(i=0; i<pIdxInfo->nConstraint; i++, pConstraint++){
-+-    if( pConstraint->usable==0 ) continue;
-+-    if( pConstraint->op!=SQLITE_INDEX_CONSTRAINT_EQ ) continue;
-+-    switch( pConstraint->iColumn ){
-+-      case COMPLETION_COLUMN_PREFIX:
-+-        prefixIdx = i;
-+-        idxNum |= 1;
-+-        break;
-+-      case COMPLETION_COLUMN_WHOLELINE:
-+-        wholelineIdx = i;
-+-        idxNum |= 2;
-+-        break;
-+-    }
-+-  }
-+-  if( prefixIdx>=0 ){
-+-    pIdxInfo->aConstraintUsage[prefixIdx].argvIndex = ++nArg;
-+-    pIdxInfo->aConstraintUsage[prefixIdx].omit = 1;
-+-  }
-+-  if( wholelineIdx>=0 ){
-+-    pIdxInfo->aConstraintUsage[wholelineIdx].argvIndex = ++nArg;
-+-    pIdxInfo->aConstraintUsage[wholelineIdx].omit = 1;
-+-  }
-+-  pIdxInfo->idxNum = idxNum;
-+-  pIdxInfo->estimatedCost = (double)5000 - 1000*nArg;
-+-  pIdxInfo->estimatedRows = 500 - 100*nArg;
-+-  return SQLITE_OK;
-+-}
-+-
-+-/*
-+-** This following structure defines all the methods for the
-+-** completion virtual table.
-+-*/
-+-static sqlite3_module completionModule = {
-+-  0,                         /* iVersion */
-+-  0,                         /* xCreate */
-+-  completionConnect,         /* xConnect */
-+-  completionBestIndex,       /* xBestIndex */
-+-  completionDisconnect,      /* xDisconnect */
-+-  0,                         /* xDestroy */
-+-  completionOpen,            /* xOpen - open a cursor */
-+-  completionClose,           /* xClose - close a cursor */
-+-  completionFilter,          /* xFilter - configure scan constraints */
-+-  completionNext,            /* xNext - advance a cursor */
-+-  completionEof,             /* xEof - check for end of scan */
-+-  completionColumn,          /* xColumn - read data */
-+-  completionRowid,           /* xRowid - read data */
-+-  0,                         /* xUpdate */
-+-  0,                         /* xBegin */
-+-  0,                         /* xSync */
-+-  0,                         /* xCommit */
-+-  0,                         /* xRollback */
-+-  0,                         /* xFindMethod */
-+-  0,                         /* xRename */
-+-  0,                         /* xSavepoint */
-+-  0,                         /* xRelease */
-+-  0                          /* xRollbackTo */
-+-};
-+-
-+-#endif /* SQLITE_OMIT_VIRTUALTABLE */
-+-
-+-int sqlite3CompletionVtabInit(sqlite3 *db){
-+-  int rc = SQLITE_OK;
-+-#ifndef SQLITE_OMIT_VIRTUALTABLE
-+-  rc = sqlite3_create_module(db, "completion", &completionModule, 0);
-+-#endif
-+-  return rc;
-+-}
-+-
-+-#ifdef _WIN32
-+-
-+-#endif
-+-int sqlite3_completion_init(
-+-  sqlite3 *db,
-+-  char **pzErrMsg,
-+-  const sqlite3_api_routines *pApi
-+-){
-+-  int rc = SQLITE_OK;
-+-  SQLITE_EXTENSION_INIT2(pApi);
-+-  (void)(pzErrMsg);  /* Unused parameter */
-+-#ifndef SQLITE_OMIT_VIRTUALTABLE
-+-  rc = sqlite3CompletionVtabInit(db);
-+-#endif
-+-  return rc;
-+-}
-+-
-+-/************************* End ../ext/misc/completion.c ********************/
-+-
-+-#if defined(SQLITE_ENABLE_SESSION)
-+-/*
-+-** State information for a single open session
-+-*/
-+-typedef struct OpenSession OpenSession;
-+-struct OpenSession {
-+-  char *zName;             /* Symbolic name for this session */
-+-  int nFilter;             /* Number of xFilter rejection GLOB patterns */
-+-  char **azFilter;         /* Array of xFilter rejection GLOB patterns */
-+-  sqlite3_session *p;      /* The open session */
-+-};
-+-#endif
-+-
-+-/*
-+-** Shell output mode information from before ".explain on",
-+-** saved so that it can be restored by ".explain off"
-+-*/
-+-typedef struct SavedModeInfo SavedModeInfo;
-+-struct SavedModeInfo {
-+-  int valid;          /* Is there legit data in here? */
-+-  int mode;           /* Mode prior to ".explain on" */
-+-  int showHeader;     /* The ".header" setting prior to ".explain on" */
-+-  int colWidth[100];  /* Column widths prior to ".explain on" */
-+-};
-+-
-+-/*
-+-** State information about the database connection is contained in an
-+-** instance of the following structure.
-+-*/
-+-typedef struct ShellState ShellState;
-+-struct ShellState {
-+-  sqlite3 *db;           /* The database */
-+-  int autoExplain;       /* Automatically turn on .explain mode */
-+-  int autoEQP;           /* Run EXPLAIN QUERY PLAN prior to seach SQL stmt */
-+-  int statsOn;           /* True to display memory stats before each finalize */
-+-  int scanstatsOn;       /* True to display scan stats before each finalize */
-+-  int outCount;          /* Revert to stdout when reaching zero */
-+-  int cnt;               /* Number of records displayed so far */
-+-  FILE *out;             /* Write results here */
-+-  FILE *traceOut;        /* Output for sqlite3_trace() */
-+-  int nErr;              /* Number of errors seen */
-+-  int mode;              /* An output mode setting */
-+-  int cMode;             /* temporary output mode for the current query */
-+-  int normalMode;        /* Output mode before ".explain on" */
-+-  int writableSchema;    /* True if PRAGMA writable_schema=ON */
-+-  int showHeader;        /* True to show column names in List or Column mode */
-+-  int nCheck;            /* Number of ".check" commands run */
-+-  unsigned shellFlgs;    /* Various flags */
-+-  char *zDestTable;      /* Name of destination table when MODE_Insert */
-+-  char zTestcase[30];    /* Name of current test case */
-+-  char colSeparator[20]; /* Column separator character for several modes */
-+-  char rowSeparator[20]; /* Row separator character for MODE_Ascii */
-+-  int colWidth[100];     /* Requested width of each column when in column mode*/
-+-  int actualWidth[100];  /* Actual width of each column */
-+-  char nullValue[20];    /* The text to print when a NULL comes back from
-+-                         ** the database */
-+-  char outfile[FILENAME_MAX]; /* Filename for *out */
-+-  const char *zDbFilename;    /* name of the database file */
-+-  char *zFreeOnClose;         /* Filename to free when closing */
-+-  const char *zVfs;           /* Name of VFS to use */
-+-  sqlite3_stmt *pStmt;   /* Current statement if any. */
-+-  FILE *pLog;            /* Write log output here */
-+-  int *aiIndent;         /* Array of indents used in MODE_Explain */
-+-  int nIndent;           /* Size of array aiIndent[] */
-+-  int iIndent;           /* Index of current op in aiIndent[] */
-+-#if defined(SQLITE_ENABLE_SESSION)
-+-  int nSession;             /* Number of active sessions */
-+-  OpenSession aSession[4];  /* Array of sessions.  [0] is in focus. */
-+-#endif
-+-};
-+-
-+-/*
-+-** These are the allowed shellFlgs values
-+-*/
-+-#define SHFLG_Pagecache      0x00000001 /* The --pagecache option is used */
-+-#define SHFLG_Lookaside      0x00000002 /* Lookaside memory is used */
-+-#define SHFLG_Backslash      0x00000004 /* The --backslash option is used */
-+-#define SHFLG_PreserveRowid  0x00000008 /* .dump preserves rowid values */
-+-#define SHFLG_Newlines       0x00000010 /* .dump --newline flag */
-+-#define SHFLG_CountChanges   0x00000020 /* .changes setting */
-+-#define SHFLG_Echo           0x00000040 /* .echo or --echo setting */
-+-
-+-/*
-+-** Macros for testing and setting shellFlgs
-+-*/
-+-#define ShellHasFlag(P,X)    (((P)->shellFlgs & (X))!=0)
-+-#define ShellSetFlag(P,X)    ((P)->shellFlgs|=(X))
-+-#define ShellClearFlag(P,X)  ((P)->shellFlgs&=(~(X)))
-+-
-+-/*
-+-** These are the allowed modes.
-+-*/
-+-#define MODE_Line     0  /* One column per line.  Blank line between records */
-+-#define MODE_Column   1  /* One record per line in neat columns */
-+-#define MODE_List     2  /* One record per line with a separator */
-+-#define MODE_Semi     3  /* Same as MODE_List but append ";" to each line */
-+-#define MODE_Html     4  /* Generate an XHTML table */
-+-#define MODE_Insert   5  /* Generate SQL "insert" statements */
-+-#define MODE_Quote    6  /* Quote values as for SQL */
-+-#define MODE_Tcl      7  /* Generate ANSI-C or TCL quoted elements */
-+-#define MODE_Csv      8  /* Quote strings, numbers are plain */
-+-#define MODE_Explain  9  /* Like MODE_Column, but do not truncate data */
-+-#define MODE_Ascii   10  /* Use ASCII unit and record separators (0x1F/0x1E) */
-+-#define MODE_Pretty  11  /* Pretty-print schemas */
-+-
-+-static const char *modeDescr[] = {
-+-  "line",
-+-  "column",
-+-  "list",
-+-  "semi",
-+-  "html",
-+-  "insert",
-+-  "quote",
-+-  "tcl",
-+-  "csv",
-+-  "explain",
-+-  "ascii",
-+-  "prettyprint",
-+-};
-+-
-+-/*
-+-** These are the column/row/line separators used by the various
-+-** import/export modes.
-+-*/
-+-#define SEP_Column    "|"
-+-#define SEP_Row       "\n"
-+-#define SEP_Tab       "\t"
-+-#define SEP_Space     " "
-+-#define SEP_Comma     ","
-+-#define SEP_CrLf      "\r\n"
-+-#define SEP_Unit      "\x1F"
-+-#define SEP_Record    "\x1E"
-+-
-+-/*
-+-** Number of elements in an array
-+-*/
-+-#define ArraySize(X)  (int)(sizeof(X)/sizeof(X[0]))
-+-
-+-/*
-+-** A callback for the sqlite3_log() interface.
-+-*/
-+-static void shellLog(void *pArg, int iErrCode, const char *zMsg){
-+-  ShellState *p = (ShellState*)pArg;
-+-  if( p->pLog==0 ) return;
-+-  utf8_printf(p->pLog, "(%d) %s\n", iErrCode, zMsg);
-+-  fflush(p->pLog);
-+-}
-+-
-+-/*
-+-** Output the given string as a hex-encoded blob (eg. X'1234' )
-+-*/
-+-static void output_hex_blob(FILE *out, const void *pBlob, int nBlob){
-+-  int i;
-+-  char *zBlob = (char *)pBlob;
-+-  raw_printf(out,"X'");
-+-  for(i=0; i<nBlob; i++){ raw_printf(out,"%02x",zBlob[i]&0xff); }
-+-  raw_printf(out,"'");
-+-}
-+-
-+-/*
-+-** Find a string that is not found anywhere in z[].  Return a pointer
-+-** to that string.
-+-**
-+-** Try to use zA and zB first.  If both of those are already found in z[]
-+-** then make up some string and store it in the buffer zBuf.
-+-*/
-+-static const char *unused_string(
-+-  const char *z,                    /* Result must not appear anywhere in z */
-+-  const char *zA, const char *zB,   /* Try these first */
-+-  char *zBuf                        /* Space to store a generated string */
-+-){
-+-  unsigned i = 0;
-+-  if( strstr(z, zA)==0 ) return zA;
-+-  if( strstr(z, zB)==0 ) return zB;
-+-  do{
-+-    sqlite3_snprintf(20,zBuf,"(%s%u)", zA, i++);
-+-  }while( strstr(z,zBuf)!=0 );
-+-  return zBuf;
-+-}
-+-
-+-/*
-+-** Output the given string as a quoted string using SQL quoting conventions.
-+-**
-+-** See also: output_quoted_escaped_string()
-+-*/
-+-static void output_quoted_string(FILE *out, const char *z){
-+-  int i;
-+-  char c;
-+-  setBinaryMode(out, 1);
-+-  for(i=0; (c = z[i])!=0 && c!='\''; i++){}
-+-  if( c==0 ){
-+-    utf8_printf(out,"'%s'",z);
-+-  }else{
-+-    raw_printf(out, "'");
-+-    while( *z ){
-+-      for(i=0; (c = z[i])!=0 && c!='\''; i++){}
-+-      if( c=='\'' ) i++;
-+-      if( i ){
-+-        utf8_printf(out, "%.*s", i, z);
-+-        z += i;
-+-      }
-+-      if( c=='\'' ){
-+-        raw_printf(out, "'");
-+-        continue;
-+-      }
-+-      if( c==0 ){
-+-        break;
-+-      }
-+-      z++;
-+-    }
-+-    raw_printf(out, "'");
-+-  }
-+-  setTextMode(out, 1);
-+-}
-+-
-+-/*
-+-** Output the given string as a quoted string using SQL quoting conventions.
-+-** Additionallly , escape the "\n" and "\r" characters so that they do not
-+-** get corrupted by end-of-line translation facilities in some operating
-+-** systems.
-+-**
-+-** This is like output_quoted_string() but with the addition of the \r\n
-+-** escape mechanism.
-+-*/
-+-static void output_quoted_escaped_string(FILE *out, const char *z){
-+-  int i;
-+-  char c;
-+-  setBinaryMode(out, 1);
-+-  for(i=0; (c = z[i])!=0 && c!='\'' && c!='\n' && c!='\r'; i++){}
-+-  if( c==0 ){
-+-    utf8_printf(out,"'%s'",z);
-+-  }else{
-+-    const char *zNL = 0;
-+-    const char *zCR = 0;
-+-    int nNL = 0;
-+-    int nCR = 0;
-+-    char zBuf1[20], zBuf2[20];
-+-    for(i=0; z[i]; i++){
-+-      if( z[i]=='\n' ) nNL++;
-+-      if( z[i]=='\r' ) nCR++;
-+-    }
-+-    if( nNL ){
-+-      raw_printf(out, "replace(");
-+-      zNL = unused_string(z, "\\n", "\\012", zBuf1);
-+-    }
-+-    if( nCR ){
-+-      raw_printf(out, "replace(");
-+-      zCR = unused_string(z, "\\r", "\\015", zBuf2);
-+-    }
-+-    raw_printf(out, "'");
-+-    while( *z ){
-+-      for(i=0; (c = z[i])!=0 && c!='\n' && c!='\r' && c!='\''; i++){}
-+-      if( c=='\'' ) i++;
-+-      if( i ){
-+-        utf8_printf(out, "%.*s", i, z);
-+-        z += i;
-+-      }
-+-      if( c=='\'' ){
-+-        raw_printf(out, "'");
-+-        continue;
-+-      }
-+-      if( c==0 ){
-+-        break;
-+-      }
-+-      z++;
-+-      if( c=='\n' ){
-+-        raw_printf(out, "%s", zNL);
-+-        continue;
-+-      }
-+-      raw_printf(out, "%s", zCR);
-+-    }
-+-    raw_printf(out, "'");
-+-    if( nCR ){
-+-      raw_printf(out, ",'%s',char(13))", zCR);
-+-    }
-+-    if( nNL ){
-+-      raw_printf(out, ",'%s',char(10))", zNL);
-+-    }
-+-  }
-+-  setTextMode(out, 1);
-+-}
-+-
-+-/*
-+-** Output the given string as a quoted according to C or TCL quoting rules.
-+-*/
-+-static void output_c_string(FILE *out, const char *z){
-+-  unsigned int c;
-+-  fputc('"', out);
-+-  while( (c = *(z++))!=0 ){
-+-    if( c=='\\' ){
-+-      fputc(c, out);
-+-      fputc(c, out);
-+-    }else if( c=='"' ){
-+-      fputc('\\', out);
-+-      fputc('"', out);
-+-    }else if( c=='\t' ){
-+-      fputc('\\', out);
-+-      fputc('t', out);
-+-    }else if( c=='\n' ){
-+-      fputc('\\', out);
-+-      fputc('n', out);
-+-    }else if( c=='\r' ){
-+-      fputc('\\', out);
-+-      fputc('r', out);
-+-    }else if( !isprint(c&0xff) ){
-+-      raw_printf(out, "\\%03o", c&0xff);
-+-    }else{
-+-      fputc(c, out);
-+-    }
-+-  }
-+-  fputc('"', out);
-+-}
-+-
-+-/*
-+-** Output the given string with characters that are special to
-+-** HTML escaped.
-+-*/
-+-static void output_html_string(FILE *out, const char *z){
-+-  int i;
-+-  if( z==0 ) z = "";
-+-  while( *z ){
-+-    for(i=0;   z[i]
-+-            && z[i]!='<'
-+-            && z[i]!='&'
-+-            && z[i]!='>'
-+-            && z[i]!='\"'
-+-            && z[i]!='\'';
-+-        i++){}
-+-    if( i>0 ){
-+-      utf8_printf(out,"%.*s",i,z);
-+-    }
-+-    if( z[i]=='<' ){
-+-      raw_printf(out,"&lt;");
-+-    }else if( z[i]=='&' ){
-+-      raw_printf(out,"&amp;");
-+-    }else if( z[i]=='>' ){
-+-      raw_printf(out,"&gt;");
-+-    }else if( z[i]=='\"' ){
-+-      raw_printf(out,"&quot;");
-+-    }else if( z[i]=='\'' ){
-+-      raw_printf(out,"&#39;");
-+-    }else{
-+-      break;
-+-    }
-+-    z += i + 1;
-+-  }
-+-}
-+-
-+-/*
-+-** If a field contains any character identified by a 1 in the following
-+-** array, then the string must be quoted for CSV.
-+-*/
-+-static const char needCsvQuote[] = {
-+-  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-+-  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-+-  1, 0, 1, 0, 0, 0, 0, 1,   0, 0, 0, 0, 0, 0, 0, 0,
-+-  0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
-+-  0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
-+-  0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
-+-  0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
-+-  0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 1,
-+-  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-+-  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-+-  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-+-  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-+-  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-+-  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-+-  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-+-  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-+-};
-+-
-+-/*
-+-** Output a single term of CSV.  Actually, p->colSeparator is used for
-+-** the separator, which may or may not be a comma.  p->nullValue is
-+-** the null value.  Strings are quoted if necessary.  The separator
-+-** is only issued if bSep is true.
-+-*/
-+-static void output_csv(ShellState *p, const char *z, int bSep){
-+-  FILE *out = p->out;
-+-  if( z==0 ){
-+-    utf8_printf(out,"%s",p->nullValue);
-+-  }else{
-+-    int i;
-+-    int nSep = strlen30(p->colSeparator);
-+-    for(i=0; z[i]; i++){
-+-      if( needCsvQuote[((unsigned char*)z)[i]]
-+-         || (z[i]==p->colSeparator[0] &&
-+-             (nSep==1 || memcmp(z, p->colSeparator, nSep)==0)) ){
-+-        i = 0;
-+-        break;
-+-      }
-+-    }
-+-    if( i==0 ){
-+-      putc('"', out);
-+-      for(i=0; z[i]; i++){
-+-        if( z[i]=='"' ) putc('"', out);
-+-        putc(z[i], out);
-+-      }
-+-      putc('"', out);
-+-    }else{
-+-      utf8_printf(out, "%s", z);
-+-    }
-+-  }
-+-  if( bSep ){
-+-    utf8_printf(p->out, "%s", p->colSeparator);
-+-  }
-+-}
-+-
-+-#ifdef SIGINT
-+-/*
-+-** This routine runs when the user presses Ctrl-C
-+-*/
-+-static void interrupt_handler(int NotUsed){
-+-  UNUSED_PARAMETER(NotUsed);
-+-  seenInterrupt++;
-+-  if( seenInterrupt>2 ) exit(1);
-+-  if( globalDb ) sqlite3_interrupt(globalDb);
-+-}
-+-#endif
-+-
-+-#ifndef SQLITE_OMIT_AUTHORIZATION
-+-/*
-+-** When the ".auth ON" is set, the following authorizer callback is
-+-** invoked.  It always returns SQLITE_OK.
-+-*/
-+-static int shellAuth(
-+-  void *pClientData,
-+-  int op,
-+-  const char *zA1,
-+-  const char *zA2,
-+-  const char *zA3,
-+-  const char *zA4
-+-){
-+-  ShellState *p = (ShellState*)pClientData;
-+-  static const char *azAction[] = { 0,
-+-     "CREATE_INDEX",         "CREATE_TABLE",         "CREATE_TEMP_INDEX",
-+-     "CREATE_TEMP_TABLE",    "CREATE_TEMP_TRIGGER",  "CREATE_TEMP_VIEW",
-+-     "CREATE_TRIGGER",       "CREATE_VIEW",          "DELETE",
-+-     "DROP_INDEX",           "DROP_TABLE",           "DROP_TEMP_INDEX",
-+-     "DROP_TEMP_TABLE",      "DROP_TEMP_TRIGGER",    "DROP_TEMP_VIEW",
-+-     "DROP_TRIGGER",         "DROP_VIEW",            "INSERT",
-+-     "PRAGMA",               "READ",                 "SELECT",
-+-     "TRANSACTION",          "UPDATE",               "ATTACH",
-+-     "DETACH",               "ALTER_TABLE",          "REINDEX",
-+-     "ANALYZE",              "CREATE_VTABLE",        "DROP_VTABLE",
-+-     "FUNCTION",             "SAVEPOINT",            "RECURSIVE"
-+-  };
-+-  int i;
-+-  const char *az[4];
-+-  az[0] = zA1;
-+-  az[1] = zA2;
-+-  az[2] = zA3;
-+-  az[3] = zA4;
-+-  utf8_printf(p->out, "authorizer: %s", azAction[op]);
-+-  for(i=0; i<4; i++){
-+-    raw_printf(p->out, " ");
-+-    if( az[i] ){
-+-      output_c_string(p->out, az[i]);
-+-    }else{
-+-      raw_printf(p->out, "NULL");
-+-    }
-+-  }
-+-  raw_printf(p->out, "\n");
-+-  return SQLITE_OK;
-+-}
-+-#endif
-+-
-+-/*
-+-** Print a schema statement.  Part of MODE_Semi and MODE_Pretty output.
-+-**
-+-** This routine converts some CREATE TABLE statements for shadow tables
-+-** in FTS3/4/5 into CREATE TABLE IF NOT EXISTS statements.
-+-*/
-+-static void printSchemaLine(FILE *out, const char *z, const char *zTail){
-+-  if( sqlite3_strglob("CREATE TABLE ['\"]*", z)==0 ){
-+-    utf8_printf(out, "CREATE TABLE IF NOT EXISTS %s%s", z+13, zTail);
-+-  }else{
-+-    utf8_printf(out, "%s%s", z, zTail);
-+-  }
-+-}
-+-static void printSchemaLineN(FILE *out, char *z, int n, const char *zTail){
-+-  char c = z[n];
-+-  z[n] = 0;
-+-  printSchemaLine(out, z, zTail);
-+-  z[n] = c;
-+-}
-+-
-+-/*
-+-** This is the callback routine that the shell
-+-** invokes for each row of a query result.
-+-*/
-+-static int shell_callback(
-+-  void *pArg,
-+-  int nArg,        /* Number of result columns */
-+-  char **azArg,    /* Text of each result column */
-+-  char **azCol,    /* Column names */
-+-  int *aiType      /* Column types */
-+-){
-+-  int i;
-+-  ShellState *p = (ShellState*)pArg;
-+-
-+-  if( azArg==0 ) return 0;
-+-  switch( p->cMode ){
-+-    case MODE_Line: {
-+-      int w = 5;
-+-      if( azArg==0 ) break;
-+-      for(i=0; i<nArg; i++){
-+-        int len = strlen30(azCol[i] ? azCol[i] : "");
-+-        if( len>w ) w = len;
-+-      }
-+-      if( p->cnt++>0 ) utf8_printf(p->out, "%s", p->rowSeparator);
-+-      for(i=0; i<nArg; i++){
-+-        utf8_printf(p->out,"%*s = %s%s", w, azCol[i],
-+-                azArg[i] ? azArg[i] : p->nullValue, p->rowSeparator);
-+-      }
-+-      break;
-+-    }
-+-    case MODE_Explain:
-+-    case MODE_Column: {
-+-      static const int aExplainWidths[] = {4, 13, 4, 4, 4, 13, 2, 13};
-+-      const int *colWidth;
-+-      int showHdr;
-+-      char *rowSep;
-+-      if( p->cMode==MODE_Column ){
-+-        colWidth = p->colWidth;
-+-        showHdr = p->showHeader;
-+-        rowSep = p->rowSeparator;
-+-      }else{
-+-        colWidth = aExplainWidths;
-+-        showHdr = 1;
-+-        rowSep = SEP_Row;
-+-      }
-+-      if( p->cnt++==0 ){
-+-        for(i=0; i<nArg; i++){
-+-          int w, n;
-+-          if( i<ArraySize(p->colWidth) ){
-+-            w = colWidth[i];
-+-          }else{
-+-            w = 0;
-+-          }
-+-          if( w==0 ){
-+-            w = strlenChar(azCol[i] ? azCol[i] : "");
-+-            if( w<10 ) w = 10;
-+-            n = strlenChar(azArg && azArg[i] ? azArg[i] : p->nullValue);
-+-            if( w<n ) w = n;
-+-          }
-+-          if( i<ArraySize(p->actualWidth) ){
-+-            p->actualWidth[i] = w;
-+-          }
-+-          if( showHdr ){
-+-            utf8_width_print(p->out, w, azCol[i]);
-+-            utf8_printf(p->out, "%s", i==nArg-1 ? rowSep : "  ");
-+-          }
-+-        }
-+-        if( showHdr ){
-+-          for(i=0; i<nArg; i++){
-+-            int w;
-+-            if( i<ArraySize(p->actualWidth) ){
-+-               w = p->actualWidth[i];
-+-               if( w<0 ) w = -w;
-+-            }else{
-+-               w = 10;
-+-            }
-+-            utf8_printf(p->out,"%-*.*s%s",w,w,
-+-                   "----------------------------------------------------------"
-+-                   "----------------------------------------------------------",
-+-                    i==nArg-1 ? rowSep : "  ");
-+-          }
-+-        }
-+-      }
-+-      if( azArg==0 ) break;
-+-      for(i=0; i<nArg; i++){
-+-        int w;
-+-        if( i<ArraySize(p->actualWidth) ){
-+-           w = p->actualWidth[i];
-+-        }else{
-+-           w = 10;
-+-        }
-+-        if( p->cMode==MODE_Explain && azArg[i] && strlenChar(azArg[i])>w ){
-+-          w = strlenChar(azArg[i]);
-+-        }
-+-        if( i==1 && p->aiIndent && p->pStmt ){
-+-          if( p->iIndent<p->nIndent ){
-+-            utf8_printf(p->out, "%*.s", p->aiIndent[p->iIndent], "");
-+-          }
-+-          p->iIndent++;
-+-        }
-+-        utf8_width_print(p->out, w, azArg[i] ? azArg[i] : p->nullValue);
-+-        utf8_printf(p->out, "%s", i==nArg-1 ? rowSep : "  ");
-+-      }
-+-      break;
-+-    }
-+-    case MODE_Semi: {   /* .schema and .fullschema output */
-+-      printSchemaLine(p->out, azArg[0], ";\n");
-+-      break;
-+-    }
-+-    case MODE_Pretty: {  /* .schema and .fullschema with --indent */
-+-      char *z;
-+-      int j;
-+-      int nParen = 0;
-+-      char cEnd = 0;
-+-      char c;
-+-      int nLine = 0;
-+-      assert( nArg==1 );
-+-      if( azArg[0]==0 ) break;
-+-      if( sqlite3_strlike("CREATE VIEW%", azArg[0], 0)==0
-+-       || sqlite3_strlike("CREATE TRIG%", azArg[0], 0)==0
-+-      ){
-+-        utf8_printf(p->out, "%s;\n", azArg[0]);
-+-        break;
-+-      }
-+-      z = sqlite3_mprintf("%s", azArg[0]);
-+-      j = 0;
-+-      for(i=0; IsSpace(z[i]); i++){}
-+-      for(; (c = z[i])!=0; i++){
-+-        if( IsSpace(c) ){
-+-          if( z[j-1]=='\r' ) z[j-1] = '\n';
-+-          if( IsSpace(z[j-1]) || z[j-1]=='(' ) continue;
-+-        }else if( (c=='(' || c==')') && j>0 && IsSpace(z[j-1]) ){
-+-          j--;
-+-        }
-+-        z[j++] = c;
-+-      }
-+-      while( j>0 && IsSpace(z[j-1]) ){ j--; }
-+-      z[j] = 0;
-+-      if( strlen30(z)>=79 ){
-+-        for(i=j=0; (c = z[i])!=0; i++){
-+-          if( c==cEnd ){
-+-            cEnd = 0;
-+-          }else if( c=='"' || c=='\'' || c=='`' ){
-+-            cEnd = c;
-+-          }else if( c=='[' ){
-+-            cEnd = ']';
-+-          }else if( c=='(' ){
-+-            nParen++;
-+-          }else if( c==')' ){
-+-            nParen--;
-+-            if( nLine>0 && nParen==0 && j>0 ){
-+-              printSchemaLineN(p->out, z, j, "\n");
-+-              j = 0;
-+-            }
-+-          }
-+-          z[j++] = c;
-+-          if( nParen==1 && (c=='(' || c==',' || c=='\n') ){
-+-            if( c=='\n' ) j--;
-+-            printSchemaLineN(p->out, z, j, "\n  ");
-+-            j = 0;
-+-            nLine++;
-+-            while( IsSpace(z[i+1]) ){ i++; }
-+-          }
-+-        }
-+-        z[j] = 0;
-+-      }
-+-      printSchemaLine(p->out, z, ";\n");
-+-      sqlite3_free(z);
-+-      break;
-+-    }
-+-    case MODE_List: {
-+-      if( p->cnt++==0 && p->showHeader ){
-+-        for(i=0; i<nArg; i++){
-+-          utf8_printf(p->out,"%s%s",azCol[i],
-+-                  i==nArg-1 ? p->rowSeparator : p->colSeparator);
-+-        }
-+-      }
-+-      if( azArg==0 ) break;
-+-      for(i=0; i<nArg; i++){
-+-        char *z = azArg[i];
-+-        if( z==0 ) z = p->nullValue;
-+-        utf8_printf(p->out, "%s", z);
-+-        if( i<nArg-1 ){
-+-          utf8_printf(p->out, "%s", p->colSeparator);
-+-        }else{
-+-          utf8_printf(p->out, "%s", p->rowSeparator);
-+-        }
-+-      }
-+-      break;
-+-    }
-+-    case MODE_Html: {
-+-      if( p->cnt++==0 && p->showHeader ){
-+-        raw_printf(p->out,"<TR>");
-+-        for(i=0; i<nArg; i++){
-+-          raw_printf(p->out,"<TH>");
-+-          output_html_string(p->out, azCol[i]);
-+-          raw_printf(p->out,"</TH>\n");
-+-        }
-+-        raw_printf(p->out,"</TR>\n");
-+-      }
-+-      if( azArg==0 ) break;
-+-      raw_printf(p->out,"<TR>");
-+-      for(i=0; i<nArg; i++){
-+-        raw_printf(p->out,"<TD>");
-+-        output_html_string(p->out, azArg[i] ? azArg[i] : p->nullValue);
-+-        raw_printf(p->out,"</TD>\n");
-+-      }
-+-      raw_printf(p->out,"</TR>\n");
-+-      break;
-+-    }
-+-    case MODE_Tcl: {
-+-      if( p->cnt++==0 && p->showHeader ){
-+-        for(i=0; i<nArg; i++){
-+-          output_c_string(p->out,azCol[i] ? azCol[i] : "");
-+-          if(i<nArg-1) utf8_printf(p->out, "%s", p->colSeparator);
-+-        }
-+-        utf8_printf(p->out, "%s", p->rowSeparator);
-+-      }
-+-      if( azArg==0 ) break;
-+-      for(i=0; i<nArg; i++){
-+-        output_c_string(p->out, azArg[i] ? azArg[i] : p->nullValue);
-+-        if(i<nArg-1) utf8_printf(p->out, "%s", p->colSeparator);
-+-      }
-+-      utf8_printf(p->out, "%s", p->rowSeparator);
-+-      break;
-+-    }
-+-    case MODE_Csv: {
-+-      setBinaryMode(p->out, 1);
-+-      if( p->cnt++==0 && p->showHeader ){
-+-        for(i=0; i<nArg; i++){
-+-          output_csv(p, azCol[i] ? azCol[i] : "", i<nArg-1);
-+-        }
-+-        utf8_printf(p->out, "%s", p->rowSeparator);
-+-      }
-+-      if( nArg>0 ){
-+-        for(i=0; i<nArg; i++){
-+-          output_csv(p, azArg[i], i<nArg-1);
-+-        }
-+-        utf8_printf(p->out, "%s", p->rowSeparator);
-+-      }
-+-      setTextMode(p->out, 1);
-+-      break;
-+-    }
-+-    case MODE_Insert: {
-+-      if( azArg==0 ) break;
-+-      utf8_printf(p->out,"INSERT INTO %s",p->zDestTable);
-+-      if( p->showHeader ){
-+-        raw_printf(p->out,"(");
-+-        for(i=0; i<nArg; i++){
-+-          if( i>0 ) raw_printf(p->out, ",");
-+-          if( quoteChar(azCol[i]) ){
-+-            char *z = sqlite3_mprintf("\"%w\"", azCol[i]);
-+-            utf8_printf(p->out, "%s", z);
-+-            sqlite3_free(z);
-+-          }else{
-+-            raw_printf(p->out, "%s", azCol[i]);
-+-          }
-+-        }
-+-        raw_printf(p->out,")");
-+-      }
-+-      p->cnt++;
-+-      for(i=0; i<nArg; i++){
-+-        raw_printf(p->out, i>0 ? "," : " VALUES(");
-+-        if( (azArg[i]==0) || (aiType && aiType[i]==SQLITE_NULL) ){
-+-          utf8_printf(p->out,"NULL");
-+-        }else if( aiType && aiType[i]==SQLITE_TEXT ){
-+-          if( ShellHasFlag(p, SHFLG_Newlines) ){
-+-            output_quoted_string(p->out, azArg[i]);
-+-          }else{
-+-            output_quoted_escaped_string(p->out, azArg[i]);
-+-          }
-+-        }else if( aiType && aiType[i]==SQLITE_INTEGER ){
-+-          utf8_printf(p->out,"%s", azArg[i]);
-+-        }else if( aiType && aiType[i]==SQLITE_FLOAT ){
-+-          char z[50];
-+-          double r = sqlite3_column_double(p->pStmt, i);
-+-          sqlite3_snprintf(50,z,"%!.20g", r);
-+-          raw_printf(p->out, "%s", z);
-+-        }else if( aiType && aiType[i]==SQLITE_BLOB && p->pStmt ){
-+-          const void *pBlob = sqlite3_column_blob(p->pStmt, i);
-+-          int nBlob = sqlite3_column_bytes(p->pStmt, i);
-+-          output_hex_blob(p->out, pBlob, nBlob);
-+-        }else if( isNumber(azArg[i], 0) ){
-+-          utf8_printf(p->out,"%s", azArg[i]);
-+-        }else if( ShellHasFlag(p, SHFLG_Newlines) ){
-+-          output_quoted_string(p->out, azArg[i]);
-+-        }else{
-+-          output_quoted_escaped_string(p->out, azArg[i]);
-+-        }
-+-      }
-+-      raw_printf(p->out,");\n");
-+-      break;
-+-    }
-+-    case MODE_Quote: {
-+-      if( azArg==0 ) break;
-+-      if( p->cnt==0 && p->showHeader ){
-+-        for(i=0; i<nArg; i++){
-+-          if( i>0 ) raw_printf(p->out, ",");
-+-          output_quoted_string(p->out, azCol[i]);
-+-        }
-+-        raw_printf(p->out,"\n");
-+-      }
-+-      p->cnt++;
-+-      for(i=0; i<nArg; i++){
-+-        if( i>0 ) raw_printf(p->out, ",");
-+-        if( (azArg[i]==0) || (aiType && aiType[i]==SQLITE_NULL) ){
-+-          utf8_printf(p->out,"NULL");
-+-        }else if( aiType && aiType[i]==SQLITE_TEXT ){
-+-          output_quoted_string(p->out, azArg[i]);
-+-        }else if( aiType && aiType[i]==SQLITE_INTEGER ){
-+-          utf8_printf(p->out,"%s", azArg[i]);
-+-        }else if( aiType && aiType[i]==SQLITE_FLOAT ){
-+-          char z[50];
-+-          double r = sqlite3_column_double(p->pStmt, i);
-+-          sqlite3_snprintf(50,z,"%!.20g", r);
-+-          raw_printf(p->out, "%s", z);
-+-        }else if( aiType && aiType[i]==SQLITE_BLOB && p->pStmt ){
-+-          const void *pBlob = sqlite3_column_blob(p->pStmt, i);
-+-          int nBlob = sqlite3_column_bytes(p->pStmt, i);
-+-          output_hex_blob(p->out, pBlob, nBlob);
-+-        }else if( isNumber(azArg[i], 0) ){
-+-          utf8_printf(p->out,"%s", azArg[i]);
-+-        }else{
-+-          output_quoted_string(p->out, azArg[i]);
-+-        }
-+-      }
-+-      raw_printf(p->out,"\n");
-+-      break;
-+-    }
-+-    case MODE_Ascii: {
-+-      if( p->cnt++==0 && p->showHeader ){
-+-        for(i=0; i<nArg; i++){
-+-          if( i>0 ) utf8_printf(p->out, "%s", p->colSeparator);
-+-          utf8_printf(p->out,"%s",azCol[i] ? azCol[i] : "");
-+-        }
-+-        utf8_printf(p->out, "%s", p->rowSeparator);
-+-      }
-+-      if( azArg==0 ) break;
-+-      for(i=0; i<nArg; i++){
-+-        if( i>0 ) utf8_printf(p->out, "%s", p->colSeparator);
-+-        utf8_printf(p->out,"%s",azArg[i] ? azArg[i] : p->nullValue);
-+-      }
-+-      utf8_printf(p->out, "%s", p->rowSeparator);
-+-      break;
-+-    }
-+-  }
-+-  return 0;
-+-}
-+-
-+-/*
-+-** This is the callback routine that the SQLite library
-+-** invokes for each row of a query result.
-+-*/
-+-static int callback(void *pArg, int nArg, char **azArg, char **azCol){
-+-  /* since we don't have type info, call the shell_callback with a NULL value */
-+-  return shell_callback(pArg, nArg, azArg, azCol, NULL);
-+-}
-+-
-+-/*
-+-** This is the callback routine from sqlite3_exec() that appends all
-+-** output onto the end of a ShellText object.
-+-*/
-+-static int captureOutputCallback(void *pArg, int nArg, char **azArg, char **az){
-+-  ShellText *p = (ShellText*)pArg;
-+-  int i;
-+-  UNUSED_PARAMETER(az);
-+-  if( azArg==0 ) return 0;
-+-  if( p->n ) appendText(p, "|", 0);
-+-  for(i=0; i<nArg; i++){
-+-    if( i ) appendText(p, ",", 0);
-+-    if( azArg[i] ) appendText(p, azArg[i], 0);
-+-  }
-+-  return 0;
-+-}
-+-
-+-/*
-+-** Generate an appropriate SELFTEST table in the main database.
-+-*/
-+-static void createSelftestTable(ShellState *p){
-+-  char *zErrMsg = 0;
-+-  sqlite3_exec(p->db,
-+-    "SAVEPOINT selftest_init;\n"
-+-    "CREATE TABLE IF NOT EXISTS selftest(\n"
-+-    "  tno INTEGER PRIMARY KEY,\n"   /* Test number */
-+-    "  op TEXT,\n"                   /* Operator:  memo run */
-+-    "  cmd TEXT,\n"                  /* Command text */
-+-    "  ans TEXT\n"                   /* Desired answer */
-+-    ");"
-+-    "CREATE TEMP TABLE [_shell$self](op,cmd,ans);\n"
-+-    "INSERT INTO [_shell$self](rowid,op,cmd)\n"
-+-    "  VALUES(coalesce((SELECT (max(tno)+100)/10 FROM selftest),10),\n"
-+-    "         'memo','Tests generated by --init');\n"
-+-    "INSERT INTO [_shell$self]\n"
-+-    "  SELECT 'run',\n"
-+-    "    'SELECT hex(sha3_query(''SELECT type,name,tbl_name,sql "
-+-                                 "FROM sqlite_master ORDER BY 2'',224))',\n"
-+-    "    hex(sha3_query('SELECT type,name,tbl_name,sql "
-+-                          "FROM sqlite_master ORDER BY 2',224));\n"
-+-    "INSERT INTO [_shell$self]\n"
-+-    "  SELECT 'run',"
-+-    "    'SELECT hex(sha3_query(''SELECT * FROM \"' ||"
-+-    "        printf('%w',name) || '\" NOT INDEXED'',224))',\n"
-+-    "    hex(sha3_query(printf('SELECT * FROM \"%w\" NOT INDEXED',name),224))\n"
-+-    "  FROM (\n"
-+-    "    SELECT name FROM sqlite_master\n"
-+-    "     WHERE type='table'\n"
-+-    "       AND name<>'selftest'\n"
-+-    "       AND coalesce(rootpage,0)>0\n"
-+-    "  )\n"
-+-    " ORDER BY name;\n"
-+-    "INSERT INTO [_shell$self]\n"
-+-    "  VALUES('run','PRAGMA integrity_check','ok');\n"
-+-    "INSERT INTO selftest(tno,op,cmd,ans)"
-+-    "  SELECT rowid*10,op,cmd,ans FROM [_shell$self];\n"
-+-    "DROP TABLE [_shell$self];"
-+-    ,0,0,&zErrMsg);
-+-  if( zErrMsg ){
-+-    utf8_printf(stderr, "SELFTEST initialization failure: %s\n", zErrMsg);
-+-    sqlite3_free(zErrMsg);
-+-  }
-+-  sqlite3_exec(p->db, "RELEASE selftest_init",0,0,0);
-+-}
-+-
-+-
-+-/*
-+-** Set the destination table field of the ShellState structure to
-+-** the name of the table given.  Escape any quote characters in the
-+-** table name.
-+-*/
-+-static void set_table_name(ShellState *p, const char *zName){
-+-  int i, n;
-+-  char cQuote;
-+-  char *z;
-+-
-+-  if( p->zDestTable ){
-+-    free(p->zDestTable);
-+-    p->zDestTable = 0;
-+-  }
-+-  if( zName==0 ) return;
-+-  cQuote = quoteChar(zName);
-+-  n = strlen30(zName);
-+-  if( cQuote ) n += n+2;
-+-  z = p->zDestTable = malloc( n+1 );
-+-  if( z==0 ){
-+-    raw_printf(stderr,"Error: out of memory\n");
-+-    exit(1);
-+-  }
-+-  n = 0;
-+-  if( cQuote ) z[n++] = cQuote;
-+-  for(i=0; zName[i]; i++){
-+-    z[n++] = zName[i];
-+-    if( zName[i]==cQuote ) z[n++] = cQuote;
-+-  }
-+-  if( cQuote ) z[n++] = cQuote;
-+-  z[n] = 0;
-+-}
-+-
-+-
-+-/*
-+-** Execute a query statement that will generate SQL output.  Print
-+-** the result columns, comma-separated, on a line and then add a
-+-** semicolon terminator to the end of that line.
-+-**
-+-** If the number of columns is 1 and that column contains text "--"
-+-** then write the semicolon on a separate line.  That way, if a
-+-** "--" comment occurs at the end of the statement, the comment
-+-** won't consume the semicolon terminator.
-+-*/
-+-static int run_table_dump_query(
-+-  ShellState *p,           /* Query context */
-+-  const char *zSelect,     /* SELECT statement to extract content */
-+-  const char *zFirstRow    /* Print before first row, if not NULL */
-+-){
-+-  sqlite3_stmt *pSelect;
-+-  int rc;
-+-  int nResult;
-+-  int i;
-+-  const char *z;
-+-  rc = sqlite3_prepare_v2(p->db, zSelect, -1, &pSelect, 0);
-+-  if( rc!=SQLITE_OK || !pSelect ){
-+-    utf8_printf(p->out, "/**** ERROR: (%d) %s *****/\n", rc,
-+-                sqlite3_errmsg(p->db));
-+-    if( (rc&0xff)!=SQLITE_CORRUPT ) p->nErr++;
-+-    return rc;
-+-  }
-+-  rc = sqlite3_step(pSelect);
-+-  nResult = sqlite3_column_count(pSelect);
-+-  while( rc==SQLITE_ROW ){
-+-    if( zFirstRow ){
-+-      utf8_printf(p->out, "%s", zFirstRow);
-+-      zFirstRow = 0;
-+-    }
-+-    z = (const char*)sqlite3_column_text(pSelect, 0);
-+-    utf8_printf(p->out, "%s", z);
-+-    for(i=1; i<nResult; i++){
-+-      utf8_printf(p->out, ",%s", sqlite3_column_text(pSelect, i));
-+-    }
-+-    if( z==0 ) z = "";
-+-    while( z[0] && (z[0]!='-' || z[1]!='-') ) z++;
-+-    if( z[0] ){
-+-      raw_printf(p->out, "\n;\n");
-+-    }else{
-+-      raw_printf(p->out, ";\n");
-+-    }
-+-    rc = sqlite3_step(pSelect);
-+-  }
-+-  rc = sqlite3_finalize(pSelect);
-+-  if( rc!=SQLITE_OK ){
-+-    utf8_printf(p->out, "/**** ERROR: (%d) %s *****/\n", rc,
-+-                sqlite3_errmsg(p->db));
-+-    if( (rc&0xff)!=SQLITE_CORRUPT ) p->nErr++;
-+-  }
-+-  return rc;
-+-}
-+-
-+-/*
-+-** Allocate space and save off current error string.
-+-*/
-+-static char *save_err_msg(
-+-  sqlite3 *db            /* Database to query */
-+-){
-+-  int nErrMsg = 1+strlen30(sqlite3_errmsg(db));
-+-  char *zErrMsg = sqlite3_malloc64(nErrMsg);
-+-  if( zErrMsg ){
-+-    memcpy(zErrMsg, sqlite3_errmsg(db), nErrMsg);
-+-  }
-+-  return zErrMsg;
-+-}
-+-
-+-#ifdef __linux__
-+-/*
-+-** Attempt to display I/O stats on Linux using /proc/PID/io
-+-*/
-+-static void displayLinuxIoStats(FILE *out){
-+-  FILE *in;
-+-  char z[200];
-+-  sqlite3_snprintf(sizeof(z), z, "/proc/%d/io", getpid());
-+-  in = fopen(z, "rb");
-+-  if( in==0 ) return;
-+-  while( fgets(z, sizeof(z), in)!=0 ){
-+-    static const struct {
-+-      const char *zPattern;
-+-      const char *zDesc;
-+-    } aTrans[] = {
-+-      { "rchar: ",                  "Bytes received by read():" },
-+-      { "wchar: ",                  "Bytes sent to write():"    },
-+-      { "syscr: ",                  "Read() system calls:"      },
-+-      { "syscw: ",                  "Write() system calls:"     },
-+-      { "read_bytes: ",             "Bytes read from storage:"  },
-+-      { "write_bytes: ",            "Bytes written to storage:" },
-+-      { "cancelled_write_bytes: ",  "Cancelled write bytes:"    },
-+-    };
-+-    int i;
-+-    for(i=0; i<ArraySize(aTrans); i++){
-+-      int n = (int)strlen(aTrans[i].zPattern);
-+-      if( strncmp(aTrans[i].zPattern, z, n)==0 ){
-+-        utf8_printf(out, "%-36s %s", aTrans[i].zDesc, &z[n]);
-+-        break;
-+-      }
-+-    }
-+-  }
-+-  fclose(in);
-+-}
-+-#endif
-+-
-+-/*
-+-** Display a single line of status using 64-bit values.
-+-*/
-+-static void displayStatLine(
-+-  ShellState *p,            /* The shell context */
-+-  char *zLabel,             /* Label for this one line */
-+-  char *zFormat,            /* Format for the result */
-+-  int iStatusCtrl,          /* Which status to display */
-+-  int bReset                /* True to reset the stats */
-+-){
-+-  sqlite3_int64 iCur = -1;
-+-  sqlite3_int64 iHiwtr = -1;
-+-  int i, nPercent;
-+-  char zLine[200];
-+-  sqlite3_status64(iStatusCtrl, &iCur, &iHiwtr, bReset);
-+-  for(i=0, nPercent=0; zFormat[i]; i++){
-+-    if( zFormat[i]=='%' ) nPercent++;
-+-  }
-+-  if( nPercent>1 ){
-+-    sqlite3_snprintf(sizeof(zLine), zLine, zFormat, iCur, iHiwtr);
-+-  }else{
-+-    sqlite3_snprintf(sizeof(zLine), zLine, zFormat, iHiwtr);
-+-  }
-+-  raw_printf(p->out, "%-36s %s\n", zLabel, zLine);
-+-}
-+-
-+-/*
-+-** Display memory stats.
-+-*/
-+-static int display_stats(
-+-  sqlite3 *db,                /* Database to query */
-+-  ShellState *pArg,           /* Pointer to ShellState */
-+-  int bReset                  /* True to reset the stats */
-+-){
-+-  int iCur;
-+-  int iHiwtr;
-+-
-+-  if( pArg && pArg->out ){
-+-    displayStatLine(pArg, "Memory Used:",
-+-       "%lld (max %lld) bytes", SQLITE_STATUS_MEMORY_USED, bReset);
-+-    displayStatLine(pArg, "Number of Outstanding Allocations:",
-+-       "%lld (max %lld)", SQLITE_STATUS_MALLOC_COUNT, bReset);
-+-    if( pArg->shellFlgs & SHFLG_Pagecache ){
-+-      displayStatLine(pArg, "Number of Pcache Pages Used:",
-+-         "%lld (max %lld) pages", SQLITE_STATUS_PAGECACHE_USED, bReset);
-+-    }
-+-    displayStatLine(pArg, "Number of Pcache Overflow Bytes:",
-+-       "%lld (max %lld) bytes", SQLITE_STATUS_PAGECACHE_OVERFLOW, bReset);
-+-    displayStatLine(pArg, "Largest Allocation:",
-+-       "%lld bytes", SQLITE_STATUS_MALLOC_SIZE, bReset);
-+-    displayStatLine(pArg, "Largest Pcache Allocation:",
-+-       "%lld bytes", SQLITE_STATUS_PAGECACHE_SIZE, bReset);
-+-#ifdef YYTRACKMAXSTACKDEPTH
-+-    displayStatLine(pArg, "Deepest Parser Stack:",
-+-       "%lld (max %lld)", SQLITE_STATUS_PARSER_STACK, bReset);
-+-#endif
-+-  }
-+-
-+-  if( pArg && pArg->out && db ){
-+-    if( pArg->shellFlgs & SHFLG_Lookaside ){
-+-      iHiwtr = iCur = -1;
-+-      sqlite3_db_status(db, SQLITE_DBSTATUS_LOOKASIDE_USED,
-+-                        &iCur, &iHiwtr, bReset);
-+-      raw_printf(pArg->out,
-+-              "Lookaside Slots Used:                %d (max %d)\n",
-+-              iCur, iHiwtr);
-+-      sqlite3_db_status(db, SQLITE_DBSTATUS_LOOKASIDE_HIT,
-+-                        &iCur, &iHiwtr, bReset);
-+-      raw_printf(pArg->out, "Successful lookaside attempts:       %d\n",
-+-              iHiwtr);
-+-      sqlite3_db_status(db, SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE,
-+-                        &iCur, &iHiwtr, bReset);
-+-      raw_printf(pArg->out, "Lookaside failures due to size:      %d\n",
-+-              iHiwtr);
-+-      sqlite3_db_status(db, SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL,
-+-                        &iCur, &iHiwtr, bReset);
-+-      raw_printf(pArg->out, "Lookaside failures due to OOM:       %d\n",
-+-              iHiwtr);
-+-    }
-+-    iHiwtr = iCur = -1;
-+-    sqlite3_db_status(db, SQLITE_DBSTATUS_CACHE_USED, &iCur, &iHiwtr, bReset);
-+-    raw_printf(pArg->out, "Pager Heap Usage:                    %d bytes\n",
-+-            iCur);
-+-    iHiwtr = iCur = -1;
-+-    sqlite3_db_status(db, SQLITE_DBSTATUS_CACHE_HIT, &iCur, &iHiwtr, 1);
-+-    raw_printf(pArg->out, "Page cache hits:                     %d\n", iCur);
-+-    iHiwtr = iCur = -1;
-+-    sqlite3_db_status(db, SQLITE_DBSTATUS_CACHE_MISS, &iCur, &iHiwtr, 1);
-+-    raw_printf(pArg->out, "Page cache misses:                   %d\n", iCur);
-+-    iHiwtr = iCur = -1;
-+-    sqlite3_db_status(db, SQLITE_DBSTATUS_CACHE_WRITE, &iCur, &iHiwtr, 1);
-+-    raw_printf(pArg->out, "Page cache writes:                   %d\n", iCur);
-+-    iHiwtr = iCur = -1;
-+-    sqlite3_db_status(db, SQLITE_DBSTATUS_SCHEMA_USED, &iCur, &iHiwtr, bReset);
-+-    raw_printf(pArg->out, "Schema Heap Usage:                   %d bytes\n",
-+-            iCur);
-+-    iHiwtr = iCur = -1;
-+-    sqlite3_db_status(db, SQLITE_DBSTATUS_STMT_USED, &iCur, &iHiwtr, bReset);
-+-    raw_printf(pArg->out, "Statement Heap/Lookaside Usage:      %d bytes\n",
-+-            iCur);
-+-  }
-+-
-+-  if( pArg && pArg->out && db && pArg->pStmt ){
-+-    iCur = sqlite3_stmt_status(pArg->pStmt, SQLITE_STMTSTATUS_FULLSCAN_STEP,
-+-                               bReset);
-+-    raw_printf(pArg->out, "Fullscan Steps:                      %d\n", iCur);
-+-    iCur = sqlite3_stmt_status(pArg->pStmt, SQLITE_STMTSTATUS_SORT, bReset);
-+-    raw_printf(pArg->out, "Sort Operations:                     %d\n", iCur);
-+-    iCur = sqlite3_stmt_status(pArg->pStmt, SQLITE_STMTSTATUS_AUTOINDEX,bReset);
-+-    raw_printf(pArg->out, "Autoindex Inserts:                   %d\n", iCur);
-+-    iCur = sqlite3_stmt_status(pArg->pStmt, SQLITE_STMTSTATUS_VM_STEP, bReset);
-+-    raw_printf(pArg->out, "Virtual Machine Steps:               %d\n", iCur);
-+-  }
-+-
-+-#ifdef __linux__
-+-  displayLinuxIoStats(pArg->out);
-+-#endif
-+-
-+-  /* Do not remove this machine readable comment: extra-stats-output-here */
-+-
-+-  return 0;
-+-}
-+-
-+-/*
-+-** Display scan stats.
-+-*/
-+-static void display_scanstats(
-+-  sqlite3 *db,                    /* Database to query */
-+-  ShellState *pArg                /* Pointer to ShellState */
-+-){
-+-#ifndef SQLITE_ENABLE_STMT_SCANSTATUS
-+-  UNUSED_PARAMETER(db);
-+-  UNUSED_PARAMETER(pArg);
-+-#else
-+-  int i, k, n, mx;
-+-  raw_printf(pArg->out, "-------- scanstats --------\n");
-+-  mx = 0;
-+-  for(k=0; k<=mx; k++){
-+-    double rEstLoop = 1.0;
-+-    for(i=n=0; 1; i++){
-+-      sqlite3_stmt *p = pArg->pStmt;
-+-      sqlite3_int64 nLoop, nVisit;
-+-      double rEst;
-+-      int iSid;
-+-      const char *zExplain;
-+-      if( sqlite3_stmt_scanstatus(p, i, SQLITE_SCANSTAT_NLOOP, (void*)&nLoop) ){
-+-        break;
-+-      }
-+-      sqlite3_stmt_scanstatus(p, i, SQLITE_SCANSTAT_SELECTID, (void*)&iSid);
-+-      if( iSid>mx ) mx = iSid;
-+-      if( iSid!=k ) continue;
-+-      if( n==0 ){
-+-        rEstLoop = (double)nLoop;
-+-        if( k>0 ) raw_printf(pArg->out, "-------- subquery %d -------\n", k);
-+-      }
-+-      n++;
-+-      sqlite3_stmt_scanstatus(p, i, SQLITE_SCANSTAT_NVISIT, (void*)&nVisit);
-+-      sqlite3_stmt_scanstatus(p, i, SQLITE_SCANSTAT_EST, (void*)&rEst);
-+-      sqlite3_stmt_scanstatus(p, i, SQLITE_SCANSTAT_EXPLAIN, (void*)&zExplain);
-+-      utf8_printf(pArg->out, "Loop %2d: %s\n", n, zExplain);
-+-      rEstLoop *= rEst;
-+-      raw_printf(pArg->out,
-+-          "         nLoop=%-8lld nRow=%-8lld estRow=%-8lld estRow/Loop=%-8g\n",
-+-          nLoop, nVisit, (sqlite3_int64)(rEstLoop+0.5), rEst
-+-      );
-+-    }
-+-  }
-+-  raw_printf(pArg->out, "---------------------------\n");
-+-#endif
-+-}
-+-
-+-/*
-+-** Parameter azArray points to a zero-terminated array of strings. zStr
-+-** points to a single nul-terminated string. Return non-zero if zStr
-+-** is equal, according to strcmp(), to any of the strings in the array.
-+-** Otherwise, return zero.
-+-*/
-+-static int str_in_array(const char *zStr, const char **azArray){
-+-  int i;
-+-  for(i=0; azArray[i]; i++){
-+-    if( 0==strcmp(zStr, azArray[i]) ) return 1;
-+-  }
-+-  return 0;
-+-}
-+-
-+-/*
-+-** If compiled statement pSql appears to be an EXPLAIN statement, allocate
-+-** and populate the ShellState.aiIndent[] array with the number of
-+-** spaces each opcode should be indented before it is output.
-+-**
-+-** The indenting rules are:
-+-**
-+-**     * For each "Next", "Prev", "VNext" or "VPrev" instruction, indent
-+-**       all opcodes that occur between the p2 jump destination and the opcode
-+-**       itself by 2 spaces.
-+-**
-+-**     * For each "Goto", if the jump destination is earlier in the program
-+-**       and ends on one of:
-+-**          Yield  SeekGt  SeekLt  RowSetRead  Rewind
-+-**       or if the P1 parameter is one instead of zero,
-+-**       then indent all opcodes between the earlier instruction
-+-**       and "Goto" by 2 spaces.
-+-*/
-+-static void explain_data_prepare(ShellState *p, sqlite3_stmt *pSql){
-+-  const char *zSql;               /* The text of the SQL statement */
-+-  const char *z;                  /* Used to check if this is an EXPLAIN */
-+-  int *abYield = 0;               /* True if op is an OP_Yield */
-+-  int nAlloc = 0;                 /* Allocated size of p->aiIndent[], abYield */
-+-  int iOp;                        /* Index of operation in p->aiIndent[] */
-+-
-+-  const char *azNext[] = { "Next", "Prev", "VPrev", "VNext", "SorterNext",
-+-                           "NextIfOpen", "PrevIfOpen", 0 };
-+-  const char *azYield[] = { "Yield", "SeekLT", "SeekGT", "RowSetRead",
-+-                            "Rewind", 0 };
-+-  const char *azGoto[] = { "Goto", 0 };
-+-
-+-  /* Try to figure out if this is really an EXPLAIN statement. If this
-+-  ** cannot be verified, return early.  */
-+-  if( sqlite3_column_count(pSql)!=8 ){
-+-    p->cMode = p->mode;
-+-    return;
-+-  }
-+-  zSql = sqlite3_sql(pSql);
-+-  if( zSql==0 ) return;
-+-  for(z=zSql; *z==' ' || *z=='\t' || *z=='\n' || *z=='\f' || *z=='\r'; z++);
-+-  if( sqlite3_strnicmp(z, "explain", 7) ){
-+-    p->cMode = p->mode;
-+-    return;
-+-  }
-+-
-+-  for(iOp=0; SQLITE_ROW==sqlite3_step(pSql); iOp++){
-+-    int i;
-+-    int iAddr = sqlite3_column_int(pSql, 0);
-+-    const char *zOp = (const char*)sqlite3_column_text(pSql, 1);
-+-
-+-    /* Set p2 to the P2 field of the current opcode. Then, assuming that
-+-    ** p2 is an instruction address, set variable p2op to the index of that
-+-    ** instruction in the aiIndent[] array. p2 and p2op may be different if
-+-    ** the current instruction is part of a sub-program generated by an
-+-    ** SQL trigger or foreign key.  */
-+-    int p2 = sqlite3_column_int(pSql, 3);
-+-    int p2op = (p2 + (iOp-iAddr));
-+-
-+-    /* Grow the p->aiIndent array as required */
-+-    if( iOp>=nAlloc ){
-+-      if( iOp==0 ){
-+-        /* Do further verfication that this is explain output.  Abort if
-+-        ** it is not */
-+-        static const char *explainCols[] = {
-+-           "addr", "opcode", "p1", "p2", "p3", "p4", "p5", "comment" };
-+-        int jj;
-+-        for(jj=0; jj<ArraySize(explainCols); jj++){
-+-          if( strcmp(sqlite3_column_name(pSql,jj),explainCols[jj])!=0 ){
-+-            p->cMode = p->mode;
-+-            sqlite3_reset(pSql);
-+-            return;
-+-          }
-+-        }
-+-      }
-+-      nAlloc += 100;
-+-      p->aiIndent = (int*)sqlite3_realloc64(p->aiIndent, nAlloc*sizeof(int));
-+-      abYield = (int*)sqlite3_realloc64(abYield, nAlloc*sizeof(int));
-+-    }
-+-    abYield[iOp] = str_in_array(zOp, azYield);
-+-    p->aiIndent[iOp] = 0;
-+-    p->nIndent = iOp+1;
-+-
-+-    if( str_in_array(zOp, azNext) ){
-+-      for(i=p2op; i<iOp; i++) p->aiIndent[i] += 2;
-+-    }
-+-    if( str_in_array(zOp, azGoto) && p2op<p->nIndent
-+-     && (abYield[p2op] || sqlite3_column_int(pSql, 2))
-+-    ){
-+-      for(i=p2op; i<iOp; i++) p->aiIndent[i] += 2;
-+-    }
-+-  }
-+-
-+-  p->iIndent = 0;
-+-  sqlite3_free(abYield);
-+-  sqlite3_reset(pSql);
-+-}
-+-
-+-/*
-+-** Free the array allocated by explain_data_prepare().
-+-*/
-+-static void explain_data_delete(ShellState *p){
-+-  sqlite3_free(p->aiIndent);
-+-  p->aiIndent = 0;
-+-  p->nIndent = 0;
-+-  p->iIndent = 0;
-+-}
-+-
-+-/*
-+-** Disable and restore .wheretrace and .selecttrace settings.
-+-*/
-+-#if defined(SQLITE_DEBUG) && defined(SQLITE_ENABLE_SELECTTRACE)
-+-extern int sqlite3SelectTrace;
-+-static int savedSelectTrace;
-+-#endif
-+-#if defined(SQLITE_DEBUG) && defined(SQLITE_ENABLE_WHERETRACE)
-+-extern int sqlite3WhereTrace;
-+-static int savedWhereTrace;
-+-#endif
-+-static void disable_debug_trace_modes(void){
-+-#if defined(SQLITE_DEBUG) && defined(SQLITE_ENABLE_SELECTTRACE)
-+-  savedSelectTrace = sqlite3SelectTrace;
-+-  sqlite3SelectTrace = 0;
-+-#endif
-+-#if defined(SQLITE_DEBUG) && defined(SQLITE_ENABLE_WHERETRACE)
-+-  savedWhereTrace = sqlite3WhereTrace;
-+-  sqlite3WhereTrace = 0;
-+-#endif
-+-}
-+-static void restore_debug_trace_modes(void){
-+-#if defined(SQLITE_DEBUG) && defined(SQLITE_ENABLE_SELECTTRACE)
-+-  sqlite3SelectTrace = savedSelectTrace;
-+-#endif
-+-#if defined(SQLITE_DEBUG) && defined(SQLITE_ENABLE_WHERETRACE)
-+-  sqlite3WhereTrace = savedWhereTrace;
-+-#endif
-+-}
-+-
-+-/*
-+-** Run a prepared statement
-+-*/
-+-static void exec_prepared_stmt(
-+-  ShellState *pArg,                                /* Pointer to ShellState */
-+-  sqlite3_stmt *pStmt,                             /* Statment to run */
-+-  int (*xCallback)(void*,int,char**,char**,int*)   /* Callback function */
-+-){
-+-  int rc;
-+-
-+-  /* perform the first step.  this will tell us if we
-+-  ** have a result set or not and how wide it is.
-+-  */
-+-  rc = sqlite3_step(pStmt);
-+-  /* if we have a result set... */
-+-  if( SQLITE_ROW == rc ){
-+-    /* if we have a callback... */
-+-    if( xCallback ){
-+-      /* allocate space for col name ptr, value ptr, and type */
-+-      int nCol = sqlite3_column_count(pStmt);
-+-      void *pData = sqlite3_malloc64(3*nCol*sizeof(const char*) + 1);
-+-      if( !pData ){
-+-        rc = SQLITE_NOMEM;
-+-      }else{
-+-        char **azCols = (char **)pData;      /* Names of result columns */
-+-        char **azVals = &azCols[nCol];       /* Results */
-+-        int *aiTypes = (int *)&azVals[nCol]; /* Result types */
-+-        int i, x;
-+-        assert(sizeof(int) <= sizeof(char *));
-+-        /* save off ptrs to column names */
-+-        for(i=0; i<nCol; i++){
-+-          azCols[i] = (char *)sqlite3_column_name(pStmt, i);
-+-        }
-+-        do{
-+-          /* extract the data and data types */
-+-          for(i=0; i<nCol; i++){
-+-            aiTypes[i] = x = sqlite3_column_type(pStmt, i);
-+-            if( x==SQLITE_BLOB && pArg && pArg->cMode==MODE_Insert ){
-+-              azVals[i] = "";
-+-            }else{
-+-              azVals[i] = (char*)sqlite3_column_text(pStmt, i);
-+-            }
-+-            if( !azVals[i] && (aiTypes[i]!=SQLITE_NULL) ){
-+-              rc = SQLITE_NOMEM;
-+-              break; /* from for */
-+-            }
-+-          } /* end for */
-+-
-+-          /* if data and types extracted successfully... */
-+-          if( SQLITE_ROW == rc ){
-+-            /* call the supplied callback with the result row data */
-+-            if( xCallback(pArg, nCol, azVals, azCols, aiTypes) ){
-+-              rc = SQLITE_ABORT;
-+-            }else{
-+-              rc = sqlite3_step(pStmt);
-+-            }
-+-          }
-+-        } while( SQLITE_ROW == rc );
-+-        sqlite3_free(pData);
-+-      }
-+-    }else{
-+-      do{
-+-        rc = sqlite3_step(pStmt);
-+-      } while( rc == SQLITE_ROW );
-+-    }
-+-  }
-+-}
-+-
-+-/*
-+-** Execute a statement or set of statements.  Print
-+-** any result rows/columns depending on the current mode
-+-** set via the supplied callback.
-+-**
-+-** This is very similar to SQLite's built-in sqlite3_exec()
-+-** function except it takes a slightly different callback
-+-** and callback data argument.
-+-*/
-+-static int shell_exec(
-+-  sqlite3 *db,                              /* An open database */
-+-  const char *zSql,                         /* SQL to be evaluated */
-+-  int (*xCallback)(void*,int,char**,char**,int*),   /* Callback function */
-+-                                            /* (not the same as sqlite3_exec) */
-+-  ShellState *pArg,                         /* Pointer to ShellState */
-+-  char **pzErrMsg                           /* Error msg written here */
-+-){
-+-  sqlite3_stmt *pStmt = NULL;     /* Statement to execute. */
-+-  int rc = SQLITE_OK;             /* Return Code */
-+-  int rc2;
-+-  const char *zLeftover;          /* Tail of unprocessed SQL */
-+-
-+-  if( pzErrMsg ){
-+-    *pzErrMsg = NULL;
-+-  }
-+-
-+-  while( zSql[0] && (SQLITE_OK == rc) ){
-+-    static const char *zStmtSql;
-+-    rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, &zLeftover);
-+-    if( SQLITE_OK != rc ){
-+-      if( pzErrMsg ){
-+-        *pzErrMsg = save_err_msg(db);
-+-      }
-+-    }else{
-+-      if( !pStmt ){
-+-        /* this happens for a comment or white-space */
-+-        zSql = zLeftover;
-+-        while( IsSpace(zSql[0]) ) zSql++;
-+-        continue;
-+-      }
-+-      zStmtSql = sqlite3_sql(pStmt);
-+-      if( zStmtSql==0 ) zStmtSql = "";
-+-      while( IsSpace(zStmtSql[0]) ) zStmtSql++;
-+-
-+-      /* save off the prepared statment handle and reset row count */
-+-      if( pArg ){
-+-        pArg->pStmt = pStmt;
-+-        pArg->cnt = 0;
-+-      }
-+-
-+-      /* echo the sql statement if echo on */
-+-      if( pArg && ShellHasFlag(pArg, SHFLG_Echo) ){
-+-        utf8_printf(pArg->out, "%s\n", zStmtSql ? zStmtSql : zSql);
-+-      }
-+-
-+-      /* Show the EXPLAIN QUERY PLAN if .eqp is on */
-+-      if( pArg && pArg->autoEQP && sqlite3_strlike("EXPLAIN%",zStmtSql,0)!=0 ){
-+-        sqlite3_stmt *pExplain;
-+-        char *zEQP;
-+-        disable_debug_trace_modes();
-+-        zEQP = sqlite3_mprintf("EXPLAIN QUERY PLAN %s", zStmtSql);
-+-        rc = sqlite3_prepare_v2(db, zEQP, -1, &pExplain, 0);
-+-        if( rc==SQLITE_OK ){
-+-          while( sqlite3_step(pExplain)==SQLITE_ROW ){
-+-            raw_printf(pArg->out,"--EQP-- %d,",sqlite3_column_int(pExplain, 0));
-+-            raw_printf(pArg->out,"%d,", sqlite3_column_int(pExplain, 1));
-+-            raw_printf(pArg->out,"%d,", sqlite3_column_int(pExplain, 2));
-+-            utf8_printf(pArg->out,"%s\n", sqlite3_column_text(pExplain, 3));
-+-          }
-+-        }
-+-        sqlite3_finalize(pExplain);
-+-        sqlite3_free(zEQP);
-+-        if( pArg->autoEQP>=2 ){
-+-          /* Also do an EXPLAIN for ".eqp full" mode */
-+-          zEQP = sqlite3_mprintf("EXPLAIN %s", zStmtSql);
-+-          rc = sqlite3_prepare_v2(db, zEQP, -1, &pExplain, 0);
-+-          if( rc==SQLITE_OK ){
-+-            pArg->cMode = MODE_Explain;
-+-            explain_data_prepare(pArg, pExplain);
-+-            exec_prepared_stmt(pArg, pExplain, xCallback);
-+-            explain_data_delete(pArg);
-+-          }
-+-          sqlite3_finalize(pExplain);
-+-          sqlite3_free(zEQP);
-+-        }
-+-        restore_debug_trace_modes();
-+-      }
-+-
-+-      if( pArg ){
-+-        pArg->cMode = pArg->mode;
-+-        if( pArg->autoExplain
-+-         && sqlite3_column_count(pStmt)==8
-+-         && sqlite3_strlike("EXPLAIN%", zStmtSql,0)==0
-+-        ){
-+-          pArg->cMode = MODE_Explain;
-+-        }
-+-
-+-        /* If the shell is currently in ".explain" mode, gather the extra
-+-        ** data required to add indents to the output.*/
-+-        if( pArg->cMode==MODE_Explain ){
-+-          explain_data_prepare(pArg, pStmt);
-+-        }
-+-      }
-+-
-+-      exec_prepared_stmt(pArg, pStmt, xCallback);
-+-      explain_data_delete(pArg);
-+-
-+-      /* print usage stats if stats on */
-+-      if( pArg && pArg->statsOn ){
-+-        display_stats(db, pArg, 0);
-+-      }
-+-
-+-      /* print loop-counters if required */
-+-      if( pArg && pArg->scanstatsOn ){
-+-        display_scanstats(db, pArg);
-+-      }
-+-
-+-      /* Finalize the statement just executed. If this fails, save a
-+-      ** copy of the error message. Otherwise, set zSql to point to the
-+-      ** next statement to execute. */
-+-      rc2 = sqlite3_finalize(pStmt);
-+-      if( rc!=SQLITE_NOMEM ) rc = rc2;
-+-      if( rc==SQLITE_OK ){
-+-        zSql = zLeftover;
-+-        while( IsSpace(zSql[0]) ) zSql++;
-+-      }else if( pzErrMsg ){
-+-        *pzErrMsg = save_err_msg(db);
-+-      }
-+-
-+-      /* clear saved stmt handle */
-+-      if( pArg ){
-+-        pArg->pStmt = NULL;
-+-      }
-+-    }
-+-  } /* end while */
-+-
-+-  return rc;
-+-}
-+-
-+-/*
-+-** Release memory previously allocated by tableColumnList().
-+-*/
-+-static void freeColumnList(char **azCol){
-+-  int i;
-+-  for(i=1; azCol[i]; i++){
-+-    sqlite3_free(azCol[i]);
-+-  }
-+-  /* azCol[0] is a static string */
-+-  sqlite3_free(azCol);
-+-}
-+-
-+-/*
-+-** Return a list of pointers to strings which are the names of all
-+-** columns in table zTab.   The memory to hold the names is dynamically
-+-** allocated and must be released by the caller using a subsequent call
-+-** to freeColumnList().
-+-**
-+-** The azCol[0] entry is usually NULL.  However, if zTab contains a rowid
-+-** value that needs to be preserved, then azCol[0] is filled in with the
-+-** name of the rowid column.
-+-**
-+-** The first regular column in the table is azCol[1].  The list is terminated
-+-** by an entry with azCol[i]==0.
-+-*/
-+-static char **tableColumnList(ShellState *p, const char *zTab){
-+-  char **azCol = 0;
-+-  sqlite3_stmt *pStmt;
-+-  char *zSql;
-+-  int nCol = 0;
-+-  int nAlloc = 0;
-+-  int nPK = 0;       /* Number of PRIMARY KEY columns seen */
-+-  int isIPK = 0;     /* True if one PRIMARY KEY column of type INTEGER */
-+-  int preserveRowid = ShellHasFlag(p, SHFLG_PreserveRowid);
-+-  int rc;
-+-
-+-  zSql = sqlite3_mprintf("PRAGMA table_info=%Q", zTab);
-+-  rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
-+-  sqlite3_free(zSql);
-+-  if( rc ) return 0;
-+-  while( sqlite3_step(pStmt)==SQLITE_ROW ){
-+-    if( nCol>=nAlloc-2 ){
-+-      nAlloc = nAlloc*2 + nCol + 10;
-+-      azCol = sqlite3_realloc(azCol, nAlloc*sizeof(azCol[0]));
-+-      if( azCol==0 ){
-+-        raw_printf(stderr, "Error: out of memory\n");
-+-        exit(1);
-+-      }
-+-    }
-+-    azCol[++nCol] = sqlite3_mprintf("%s", sqlite3_column_text(pStmt, 1));
-+-    if( sqlite3_column_int(pStmt, 5) ){
-+-      nPK++;
-+-      if( nPK==1
-+-       && sqlite3_stricmp((const char*)sqlite3_column_text(pStmt,2),
-+-                          "INTEGER")==0
-+-      ){
-+-        isIPK = 1;
-+-      }else{
-+-        isIPK = 0;
-+-      }
-+-    }
-+-  }
-+-  sqlite3_finalize(pStmt);
-+-  if( azCol==0 ) return 0;
-+-  azCol[0] = 0;
-+-  azCol[nCol+1] = 0;
-+-
-+-  /* The decision of whether or not a rowid really needs to be preserved
-+-  ** is tricky.  We never need to preserve a rowid for a WITHOUT ROWID table
-+-  ** or a table with an INTEGER PRIMARY KEY.  We are unable to preserve
-+-  ** rowids on tables where the rowid is inaccessible because there are other
-+-  ** columns in the table named "rowid", "_rowid_", and "oid".
-+-  */
-+-  if( preserveRowid && isIPK ){
-+-    /* If a single PRIMARY KEY column with type INTEGER was seen, then it
-+-    ** might be an alise for the ROWID.  But it might also be a WITHOUT ROWID
-+-    ** table or a INTEGER PRIMARY KEY DESC column, neither of which are
-+-    ** ROWID aliases.  To distinguish these cases, check to see if
-+-    ** there is a "pk" entry in "PRAGMA index_list".  There will be
-+-    ** no "pk" index if the PRIMARY KEY really is an alias for the ROWID.
-+-    */
-+-    zSql = sqlite3_mprintf("SELECT 1 FROM pragma_index_list(%Q)"
-+-                           " WHERE origin='pk'", zTab);
-+-    rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
-+-    sqlite3_free(zSql);
-+-    if( rc ){
-+-      freeColumnList(azCol);
-+-      return 0;
-+-    }
-+-    rc = sqlite3_step(pStmt);
-+-    sqlite3_finalize(pStmt);
-+-    preserveRowid = rc==SQLITE_ROW;
-+-  }
-+-  if( preserveRowid ){
-+-    /* Only preserve the rowid if we can find a name to use for the
-+-    ** rowid */
-+-    static char *azRowid[] = { "rowid", "_rowid_", "oid" };
-+-    int i, j;
-+-    for(j=0; j<3; j++){
-+-      for(i=1; i<=nCol; i++){
-+-        if( sqlite3_stricmp(azRowid[j],azCol[i])==0 ) break;
-+-      }
-+-      if( i>nCol ){
-+-        /* At this point, we know that azRowid[j] is not the name of any
-+-        ** ordinary column in the table.  Verify that azRowid[j] is a valid
-+-        ** name for the rowid before adding it to azCol[0].  WITHOUT ROWID
-+-        ** tables will fail this last check */
-+-        rc = sqlite3_table_column_metadata(p->db,0,zTab,azRowid[j],0,0,0,0,0);
-+-        if( rc==SQLITE_OK ) azCol[0] = azRowid[j];
-+-        break;
-+-      }
-+-    }
-+-  }
-+-  return azCol;
-+-}
-+-
-+-/*
-+-** Toggle the reverse_unordered_selects setting.
-+-*/
-+-static void toggleSelectOrder(sqlite3 *db){
-+-  sqlite3_stmt *pStmt = 0;
-+-  int iSetting = 0;
-+-  char zStmt[100];
-+-  sqlite3_prepare_v2(db, "PRAGMA reverse_unordered_selects", -1, &pStmt, 0);
-+-  if( sqlite3_step(pStmt)==SQLITE_ROW ){
-+-    iSetting = sqlite3_column_int(pStmt, 0);
-+-  }
-+-  sqlite3_finalize(pStmt);
-+-  sqlite3_snprintf(sizeof(zStmt), zStmt,
-+-       "PRAGMA reverse_unordered_selects(%d)", !iSetting);
-+-  sqlite3_exec(db, zStmt, 0, 0, 0);
-+-}
-+-
-+-/*
-+-** This is a different callback routine used for dumping the database.
-+-** Each row received by this callback consists of a table name,
-+-** the table type ("index" or "table") and SQL to create the table.
-+-** This routine should print text sufficient to recreate the table.
-+-*/
-+-static int dump_callback(void *pArg, int nArg, char **azArg, char **azNotUsed){
-+-  int rc;
-+-  const char *zTable;
-+-  const char *zType;
-+-  const char *zSql;
-+-  ShellState *p = (ShellState *)pArg;
-+-
-+-  UNUSED_PARAMETER(azNotUsed);
-+-  if( nArg!=3 || azArg==0 ) return 0;
-+-  zTable = azArg[0];
-+-  zType = azArg[1];
-+-  zSql = azArg[2];
-+-
-+-  if( strcmp(zTable, "sqlite_sequence")==0 ){
-+-    raw_printf(p->out, "DELETE FROM sqlite_sequence;\n");
-+-  }else if( sqlite3_strglob("sqlite_stat?", zTable)==0 ){
-+-    raw_printf(p->out, "ANALYZE sqlite_master;\n");
-+-  }else if( strncmp(zTable, "sqlite_", 7)==0 ){
-+-    return 0;
-+-  }else if( strncmp(zSql, "CREATE VIRTUAL TABLE", 20)==0 ){
-+-    char *zIns;
-+-    if( !p->writableSchema ){
-+-      raw_printf(p->out, "PRAGMA writable_schema=ON;\n");
-+-      p->writableSchema = 1;
-+-    }
-+-    zIns = sqlite3_mprintf(
-+-       "INSERT INTO sqlite_master(type,name,tbl_name,rootpage,sql)"
-+-       "VALUES('table','%q','%q',0,'%q');",
-+-       zTable, zTable, zSql);
-+-    utf8_printf(p->out, "%s\n", zIns);
-+-    sqlite3_free(zIns);
-+-    return 0;
-+-  }else{
-+-    printSchemaLine(p->out, zSql, ";\n");
-+-  }
-+-
-+-  if( strcmp(zType, "table")==0 ){
-+-    ShellText sSelect;
-+-    ShellText sTable;
-+-    char **azCol;
-+-    int i;
-+-    char *savedDestTable;
-+-    int savedMode;
-+-
-+-    azCol = tableColumnList(p, zTable);
-+-    if( azCol==0 ){
-+-      p->nErr++;
-+-      return 0;
-+-    }
-+-
-+-    /* Always quote the table name, even if it appears to be pure ascii,
-+-    ** in case it is a keyword. Ex:  INSERT INTO "table" ... */
-+-    initText(&sTable);
-+-    appendText(&sTable, zTable, quoteChar(zTable));
-+-    /* If preserving the rowid, add a column list after the table name.
-+-    ** In other words:  "INSERT INTO tab(rowid,a,b,c,...) VALUES(...)"
-+-    ** instead of the usual "INSERT INTO tab VALUES(...)".
-+-    */
-+-    if( azCol[0] ){
-+-      appendText(&sTable, "(", 0);
-+-      appendText(&sTable, azCol[0], 0);
-+-      for(i=1; azCol[i]; i++){
-+-        appendText(&sTable, ",", 0);
-+-        appendText(&sTable, azCol[i], quoteChar(azCol[i]));
-+-      }
-+-      appendText(&sTable, ")", 0);
-+-    }
-+-
-+-    /* Build an appropriate SELECT statement */
-+-    initText(&sSelect);
-+-    appendText(&sSelect, "SELECT ", 0);
-+-    if( azCol[0] ){
-+-      appendText(&sSelect, azCol[0], 0);
-+-      appendText(&sSelect, ",", 0);
-+-    }
-+-    for(i=1; azCol[i]; i++){
-+-      appendText(&sSelect, azCol[i], quoteChar(azCol[i]));
-+-      if( azCol[i+1] ){
-+-        appendText(&sSelect, ",", 0);
-+-      }
-+-    }
-+-    freeColumnList(azCol);
-+-    appendText(&sSelect, " FROM ", 0);
-+-    appendText(&sSelect, zTable, quoteChar(zTable));
-+-
-+-    savedDestTable = p->zDestTable;
-+-    savedMode = p->mode;
-+-    p->zDestTable = sTable.z;
-+-    p->mode = p->cMode = MODE_Insert;
-+-    rc = shell_exec(p->db, sSelect.z, shell_callback, p, 0);
-+-    if( (rc&0xff)==SQLITE_CORRUPT ){
-+-      raw_printf(p->out, "/****** CORRUPTION ERROR *******/\n");
-+-      toggleSelectOrder(p->db);
-+-      shell_exec(p->db, sSelect.z, shell_callback, p, 0);
-+-      toggleSelectOrder(p->db);
-+-    }
-+-    p->zDestTable = savedDestTable;
-+-    p->mode = savedMode;
-+-    freeText(&sTable);
-+-    freeText(&sSelect);
-+-    if( rc ) p->nErr++;
-+-  }
-+-  return 0;
-+-}
-+-
-+-/*
-+-** Run zQuery.  Use dump_callback() as the callback routine so that
-+-** the contents of the query are output as SQL statements.
-+-**
-+-** If we get a SQLITE_CORRUPT error, rerun the query after appending
-+-** "ORDER BY rowid DESC" to the end.
-+-*/
-+-static int run_schema_dump_query(
-+-  ShellState *p,
-+-  const char *zQuery
-+-){
-+-  int rc;
-+-  char *zErr = 0;
-+-  rc = sqlite3_exec(p->db, zQuery, dump_callback, p, &zErr);
-+-  if( rc==SQLITE_CORRUPT ){
-+-    char *zQ2;
-+-    int len = strlen30(zQuery);
-+-    raw_printf(p->out, "/****** CORRUPTION ERROR *******/\n");
-+-    if( zErr ){
-+-      utf8_printf(p->out, "/****** %s ******/\n", zErr);
-+-      sqlite3_free(zErr);
-+-      zErr = 0;
-+-    }
-+-    zQ2 = malloc( len+100 );
-+-    if( zQ2==0 ) return rc;
-+-    sqlite3_snprintf(len+100, zQ2, "%s ORDER BY rowid DESC", zQuery);
-+-    rc = sqlite3_exec(p->db, zQ2, dump_callback, p, &zErr);
-+-    if( rc ){
-+-      utf8_printf(p->out, "/****** ERROR: %s ******/\n", zErr);
-+-    }else{
-+-      rc = SQLITE_CORRUPT;
-+-    }
-+-    sqlite3_free(zErr);
-+-    free(zQ2);
-+-  }
-+-  return rc;
-+-}
-+-
-+-/*
-+-** Text of a help message
-+-*/
-+-static char zHelp[] =
-+-#ifndef SQLITE_OMIT_AUTHORIZATION
-+-  ".auth ON|OFF           Show authorizer callbacks\n"
-+-#endif
-+-  ".backup ?DB? FILE      Backup DB (default \"main\") to FILE\n"
-+-  ".bail on|off           Stop after hitting an error.  Default OFF\n"
-+-  ".binary on|off         Turn binary output on or off.  Default OFF\n"
-+-  ".cd DIRECTORY          Change the working directory to DIRECTORY\n"
-+-  ".changes on|off        Show number of rows changed by SQL\n"
-+-  ".check GLOB            Fail if output since .testcase does not match\n"
-+-  ".clone NEWDB           Clone data into NEWDB from the existing database\n"
-+-  ".databases             List names and files of attached databases\n"
-+-  ".dbinfo ?DB?           Show status information about the database\n"
-+-  ".dump ?TABLE? ...      Dump the database in an SQL text format\n"
-+-  "                         If TABLE specified, only dump tables matching\n"
-+-  "                         LIKE pattern TABLE.\n"
-+-  ".echo on|off           Turn command echo on or off\n"
-+-  ".eqp on|off|full       Enable or disable automatic EXPLAIN QUERY PLAN\n"
-+-  ".exit                  Exit this program\n"
-+-/* Because explain mode comes on automatically now, the ".explain" mode
-+-** is removed from the help screen.  It is still supported for legacy, however */
-+-/*".explain ?on|off|auto? Turn EXPLAIN output mode on or off or to automatic\n"*/
-+-  ".fullschema ?--indent? Show schema and the content of sqlite_stat tables\n"
-+-  ".headers on|off        Turn display of headers on or off\n"
-+-  ".help                  Show this message\n"
-+-  ".import FILE TABLE     Import data from FILE into TABLE\n"
-+-#ifndef SQLITE_OMIT_TEST_CONTROL
-+-  ".imposter INDEX TABLE  Create imposter table TABLE on index INDEX\n"
-+-#endif
-+-  ".indexes ?TABLE?       Show names of all indexes\n"
-+-  "                         If TABLE specified, only show indexes for tables\n"
-+-  "                         matching LIKE pattern TABLE.\n"
-+-#ifdef SQLITE_ENABLE_IOTRACE
-+-  ".iotrace FILE          Enable I/O diagnostic logging to FILE\n"
-+-#endif
-+-  ".limit ?LIMIT? ?VAL?   Display or change the value of an SQLITE_LIMIT\n"
-+-  ".lint OPTIONS          Report potential schema issues. Options:\n"
-+-  "                         fkey-indexes     Find missing foreign key indexes\n"
-+-#ifndef SQLITE_OMIT_LOAD_EXTENSION
-+-  ".load FILE ?ENTRY?     Load an extension library\n"
-+-#endif
-+-  ".log FILE|off          Turn logging on or off.  FILE can be stderr/stdout\n"
-+-  ".mode MODE ?TABLE?     Set output mode where MODE is one of:\n"
-+-  "                         ascii    Columns/rows delimited by 0x1F and 0x1E\n"
-+-  "                         csv      Comma-separated values\n"
-+-  "                         column   Left-aligned columns.  (See .width)\n"
-+-  "                         html     HTML <table> code\n"
-+-  "                         insert   SQL insert statements for TABLE\n"
-+-  "                         line     One value per line\n"
-+-  "                         list     Values delimited by \"|\"\n"
-+-  "                         quote    Escape answers as for SQL\n"
-+-  "                         tabs     Tab-separated values\n"
-+-  "                         tcl      TCL list elements\n"
-+-  ".nullvalue STRING      Use STRING in place of NULL values\n"
-+-  ".once FILENAME         Output for the next SQL command only to FILENAME\n"
-+-  ".open ?OPTIONS? ?FILE? Close existing database and reopen FILE\n"
-+-  "                         The --new option starts with an empty file\n"
-+-  ".output ?FILENAME?     Send output to FILENAME or stdout\n"
-+-  ".print STRING...       Print literal STRING\n"
-+-  ".prompt MAIN CONTINUE  Replace the standard prompts\n"
-+-  ".quit                  Exit this program\n"
-+-  ".read FILENAME         Execute SQL in FILENAME\n"
-+-  ".restore ?DB? FILE     Restore content of DB (default \"main\") from FILE\n"
-+-  ".save FILE             Write in-memory database into FILE\n"
-+-  ".scanstats on|off      Turn sqlite3_stmt_scanstatus() metrics on or off\n"
-+-  ".schema ?PATTERN?      Show the CREATE statements matching PATTERN\n"
-+-  "                          Add --indent for pretty-printing\n"
-+-  ".selftest ?--init?     Run tests defined in the SELFTEST table\n"
-+-  ".separator COL ?ROW?   Change the column separator and optionally the row\n"
-+-  "                         separator for both the output mode and .import\n"
-+-#if defined(SQLITE_ENABLE_SESSION)
-+-  ".session CMD ...       Create or control sessions\n"
-+-#endif
-+-  ".sha3sum ?OPTIONS...?  Compute a SHA3 hash of database content\n"
-+-  ".shell CMD ARGS...     Run CMD ARGS... in a system shell\n"
-+-  ".show                  Show the current values for various settings\n"
-+-  ".stats ?on|off?        Show stats or turn stats on or off\n"
-+-  ".system CMD ARGS...    Run CMD ARGS... in a system shell\n"
-+-  ".tables ?TABLE?        List names of tables\n"
-+-  "                         If TABLE specified, only list tables matching\n"
-+-  "                         LIKE pattern TABLE.\n"
-+-  ".testcase NAME         Begin redirecting output to 'testcase-out.txt'\n"
-+-  ".timeout MS            Try opening locked tables for MS milliseconds\n"
-+-  ".timer on|off          Turn SQL timer on or off\n"
-+-  ".trace FILE|off        Output each SQL statement as it is run\n"
-+-  ".vfsinfo ?AUX?         Information about the top-level VFS\n"
-+-  ".vfslist               List all available VFSes\n"
-+-  ".vfsname ?AUX?         Print the name of the VFS stack\n"
-+-  ".width NUM1 NUM2 ...   Set column widths for \"column\" mode\n"
-+-  "                         Negative values right-justify\n"
-+-;
-+-
-+-#if defined(SQLITE_ENABLE_SESSION)
-+-/*
-+-** Print help information for the ".sessions" command
-+-*/
-+-void session_help(ShellState *p){
-+-  raw_printf(p->out,
-+-    ".session ?NAME? SUBCOMMAND ?ARGS...?\n"
-+-    "If ?NAME? is omitted, the first defined session is used.\n"
-+-    "Subcommands:\n"
-+-    "   attach TABLE             Attach TABLE\n"
-+-    "   changeset FILE           Write a changeset into FILE\n"
-+-    "   close                    Close one session\n"
-+-    "   enable ?BOOLEAN?         Set or query the enable bit\n"
-+-    "   filter GLOB...           Reject tables matching GLOBs\n"
-+-    "   indirect ?BOOLEAN?       Mark or query the indirect status\n"
-+-    "   isempty                  Query whether the session is empty\n"
-+-    "   list                     List currently open session names\n"
-+-    "   open DB NAME             Open a new session on DB\n"
-+-    "   patchset FILE            Write a patchset into FILE\n"
-+-  );
-+-}
-+-#endif
-+-
-+-
-+-/* Forward reference */
-+-static int process_input(ShellState *p, FILE *in);
-+-
-+-/*
-+-** Read the content of file zName into memory obtained from sqlite3_malloc64()
-+-** and return a pointer to the buffer. The caller is responsible for freeing
-+-** the memory.
-+-**
-+-** If parameter pnByte is not NULL, (*pnByte) is set to the number of bytes
-+-** read.
-+-**
-+-** For convenience, a nul-terminator byte is always appended to the data read
-+-** from the file before the buffer is returned. This byte is not included in
-+-** the final value of (*pnByte), if applicable.
-+-**
-+-** NULL is returned if any error is encountered. The final value of *pnByte
-+-** is undefined in this case.
-+-*/
-+-static char *readFile(const char *zName, int *pnByte){
-+-  FILE *in = fopen(zName, "rb");
-+-  long nIn;
-+-  size_t nRead;
-+-  char *pBuf;
-+-  if( in==0 ) return 0;
-+-  fseek(in, 0, SEEK_END);
-+-  nIn = ftell(in);
-+-  rewind(in);
-+-  pBuf = sqlite3_malloc64( nIn+1 );
-+-  if( pBuf==0 ) return 0;
-+-  nRead = fread(pBuf, nIn, 1, in);
-+-  fclose(in);
-+-  if( nRead!=1 ){
-+-    sqlite3_free(pBuf);
-+-    return 0;
-+-  }
-+-  pBuf[nIn] = 0;
-+-  if( pnByte ) *pnByte = nIn;
-+-  return pBuf;
-+-}
-+-
-+-#if defined(SQLITE_ENABLE_SESSION)
-+-/*
-+-** Close a single OpenSession object and release all of its associated
-+-** resources.
-+-*/
-+-static void session_close(OpenSession *pSession){
-+-  int i;
-+-  sqlite3session_delete(pSession->p);
-+-  sqlite3_free(pSession->zName);
-+-  for(i=0; i<pSession->nFilter; i++){
-+-    sqlite3_free(pSession->azFilter[i]);
-+-  }
-+-  sqlite3_free(pSession->azFilter);
-+-  memset(pSession, 0, sizeof(OpenSession));
-+-}
-+-#endif
-+-
-+-/*
-+-** Close all OpenSession objects and release all associated resources.
-+-*/
-+-#if defined(SQLITE_ENABLE_SESSION)
-+-static void session_close_all(ShellState *p){
-+-  int i;
-+-  for(i=0; i<p->nSession; i++){
-+-    session_close(&p->aSession[i]);
-+-  }
-+-  p->nSession = 0;
-+-}
-+-#else
-+-# define session_close_all(X)
-+-#endif
-+-
-+-/*
-+-** Implementation of the xFilter function for an open session.  Omit
-+-** any tables named by ".session filter" but let all other table through.
-+-*/
-+-#if defined(SQLITE_ENABLE_SESSION)
-+-static int session_filter(void *pCtx, const char *zTab){
-+-  OpenSession *pSession = (OpenSession*)pCtx;
-+-  int i;
-+-  for(i=0; i<pSession->nFilter; i++){
-+-    if( sqlite3_strglob(pSession->azFilter[i], zTab)==0 ) return 0;
-+-  }
-+-  return 1;
-+-}
-+-#endif
-+-
-+-/*
-+-** Make sure the database is open.  If it is not, then open it.  If
-+-** the database fails to open, print an error message and exit.
-+-*/
-+-static void open_db(ShellState *p, int keepAlive){
-+-  if( p->db==0 ){
-+-    sqlite3_initialize();
-+-    sqlite3_open(p->zDbFilename, &p->db);
-+-    globalDb = p->db;
-+-    if( p->db==0 || SQLITE_OK!=sqlite3_errcode(p->db) ){
-+-      utf8_printf(stderr,"Error: unable to open database \"%s\": %s\n",
-+-          p->zDbFilename, sqlite3_errmsg(p->db));
-+-      if( keepAlive ) return;
-+-      exit(1);
-+-    }
-+-#ifndef SQLITE_OMIT_LOAD_EXTENSION
-+-    sqlite3_enable_load_extension(p->db, 1);
-+-#endif
-+-    sqlite3_fileio_init(p->db, 0, 0);
-+-    sqlite3_shathree_init(p->db, 0, 0);
-+-    sqlite3_completion_init(p->db, 0, 0);
-+-    sqlite3_create_function(p->db, "shell_add_schema", 2, SQLITE_UTF8, 0,
-+-                            shellAddSchemaName, 0, 0);
-+-  }
-+-}
-+-
-+-#if HAVE_READLINE || HAVE_EDITLINE
-+-/*
-+-** Readline completion callbacks
-+-*/
-+-static char *readline_completion_generator(const char *text, int state){
-+-  static sqlite3_stmt *pStmt = 0;
-+-  char *zRet;
-+-  if( state==0 ){
-+-    char *zSql;
-+-    sqlite3_finalize(pStmt);
-+-    zSql = sqlite3_mprintf("SELECT DISTINCT candidate COLLATE nocase"
-+-                           "  FROM completion(%Q) ORDER BY 1", text);
-+-    sqlite3_prepare_v2(globalDb, zSql, -1, &pStmt, 0);
-+-    sqlite3_free(zSql);
-+-  }
-+-  if( sqlite3_step(pStmt)==SQLITE_ROW ){
-+-    zRet = strdup((const char*)sqlite3_column_text(pStmt, 0));
-+-  }else{
-+-    sqlite3_finalize(pStmt);
-+-    pStmt = 0;
-+-    zRet = 0;
-+-  }
-+-  return zRet;
-+-}
-+-static char **readline_completion(const char *zText, int iStart, int iEnd){
-+-  rl_attempted_completion_over = 1;
-+-  return rl_completion_matches(zText, readline_completion_generator);
-+-}
-+-
-+-#elif HAVE_LINENOISE
-+-/*
-+-** Linenoise completion callback
-+-*/
-+-static void linenoise_completion(const char *zLine, linenoiseCompletions *lc){
-+-  int nLine = (int)strlen(zLine);
-+-  int i, iStart;
-+-  sqlite3_stmt *pStmt = 0;
-+-  char *zSql;
-+-  char zBuf[1000];
-+-
-+-  if( nLine>sizeof(zBuf)-30 ) return;
-+-  if( zLine[0]=='.' ) return;
-+-  for(i=nLine-1; i>=0 && (isalnum(zLine[i]) || zLine[i]=='_'); i--){}
-+-  if( i==nLine-1 ) return;
-+-  iStart = i+1;
-+-  memcpy(zBuf, zLine, iStart);
-+-  zSql = sqlite3_mprintf("SELECT DISTINCT candidate COLLATE nocase"
-+-                         "  FROM completion(%Q,%Q) ORDER BY 1",
-+-                         &zLine[iStart], zLine);
-+-  sqlite3_prepare_v2(globalDb, zSql, -1, &pStmt, 0);
-+-  sqlite3_free(zSql);
-+-  sqlite3_exec(globalDb, "PRAGMA page_count", 0, 0, 0); /* Load the schema */
-+-  while( sqlite3_step(pStmt)==SQLITE_ROW ){
-+-    const char *zCompletion = (const char*)sqlite3_column_text(pStmt, 0);
-+-    int nCompletion = sqlite3_column_bytes(pStmt, 0);
-+-    if( iStart+nCompletion < sizeof(zBuf)-1 ){
-+-      memcpy(zBuf+iStart, zCompletion, nCompletion+1);
-+-      linenoiseAddCompletion(lc, zBuf);
-+-    }
-+-  }
-+-  sqlite3_finalize(pStmt);
-+-}
-+-#endif
-+-
-+-/*
-+-** Do C-language style dequoting.
-+-**
-+-**    \a    -> alarm
-+-**    \b    -> backspace
-+-**    \t    -> tab
-+-**    \n    -> newline
-+-**    \v    -> vertical tab
-+-**    \f    -> form feed
-+-**    \r    -> carriage return
-+-**    \s    -> space
-+-**    \"    -> "
-+-**    \'    -> '
-+-**    \\    -> backslash
-+-**    \NNN  -> ascii character NNN in octal
-+-*/
-+-static void resolve_backslashes(char *z){
-+-  int i, j;
-+-  char c;
-+-  while( *z && *z!='\\' ) z++;
-+-  for(i=j=0; (c = z[i])!=0; i++, j++){
-+-    if( c=='\\' && z[i+1]!=0 ){
-+-      c = z[++i];
-+-      if( c=='a' ){
-+-        c = '\a';
-+-      }else if( c=='b' ){
-+-        c = '\b';
-+-      }else if( c=='t' ){
-+-        c = '\t';
-+-      }else if( c=='n' ){
-+-        c = '\n';
-+-      }else if( c=='v' ){
-+-        c = '\v';
-+-      }else if( c=='f' ){
-+-        c = '\f';
-+-      }else if( c=='r' ){
-+-        c = '\r';
-+-      }else if( c=='"' ){
-+-        c = '"';
-+-      }else if( c=='\'' ){
-+-        c = '\'';
-+-      }else if( c=='\\' ){
-+-        c = '\\';
-+-      }else if( c>='0' && c<='7' ){
-+-        c -= '0';
-+-        if( z[i+1]>='0' && z[i+1]<='7' ){
-+-          i++;
-+-          c = (c<<3) + z[i] - '0';
-+-          if( z[i+1]>='0' && z[i+1]<='7' ){
-+-            i++;
-+-            c = (c<<3) + z[i] - '0';
-+-          }
-+-        }
-+-      }
-+-    }
-+-    z[j] = c;
-+-  }
-+-  if( j<i ) z[j] = 0;
-+-}
-+-
-+-/*
-+-** Return the value of a hexadecimal digit.  Return -1 if the input
-+-** is not a hex digit.
-+-*/
-+-static int hexDigitValue(char c){
-+-  if( c>='0' && c<='9' ) return c - '0';
-+-  if( c>='a' && c<='f' ) return c - 'a' + 10;
-+-  if( c>='A' && c<='F' ) return c - 'A' + 10;
-+-  return -1;
-+-}
-+-
-+-/*
-+-** Interpret zArg as an integer value, possibly with suffixes.
-+-*/
-+-static sqlite3_int64 integerValue(const char *zArg){
-+-  sqlite3_int64 v = 0;
-+-  static const struct { char *zSuffix; int iMult; } aMult[] = {
-+-    { "KiB", 1024 },
-+-    { "MiB", 1024*1024 },
-+-    { "GiB", 1024*1024*1024 },
-+-    { "KB",  1000 },
-+-    { "MB",  1000000 },
-+-    { "GB",  1000000000 },
-+-    { "K",   1000 },
-+-    { "M",   1000000 },
-+-    { "G",   1000000000 },
-+-  };
-+-  int i;
-+-  int isNeg = 0;
-+-  if( zArg[0]=='-' ){
-+-    isNeg = 1;
-+-    zArg++;
-+-  }else if( zArg[0]=='+' ){
-+-    zArg++;
-+-  }
-+-  if( zArg[0]=='0' && zArg[1]=='x' ){
-+-    int x;
-+-    zArg += 2;
-+-    while( (x = hexDigitValue(zArg[0]))>=0 ){
-+-      v = (v<<4) + x;
-+-      zArg++;
-+-    }
-+-  }else{
-+-    while( IsDigit(zArg[0]) ){
-+-      v = v*10 + zArg[0] - '0';
-+-      zArg++;
-+-    }
-+-  }
-+-  for(i=0; i<ArraySize(aMult); i++){
-+-    if( sqlite3_stricmp(aMult[i].zSuffix, zArg)==0 ){
-+-      v *= aMult[i].iMult;
-+-      break;
-+-    }
-+-  }
-+-  return isNeg? -v : v;
-+-}
-+-
-+-/*
-+-** Interpret zArg as either an integer or a boolean value.  Return 1 or 0
-+-** for TRUE and FALSE.  Return the integer value if appropriate.
-+-*/
-+-static int booleanValue(const char *zArg){
-+-  int i;
-+-  if( zArg[0]=='0' && zArg[1]=='x' ){
-+-    for(i=2; hexDigitValue(zArg[i])>=0; i++){}
-+-  }else{
-+-    for(i=0; zArg[i]>='0' && zArg[i]<='9'; i++){}
-+-  }
-+-  if( i>0 && zArg[i]==0 ) return (int)(integerValue(zArg) & 0xffffffff);
-+-  if( sqlite3_stricmp(zArg, "on")==0 || sqlite3_stricmp(zArg,"yes")==0 ){
-+-    return 1;
-+-  }
-+-  if( sqlite3_stricmp(zArg, "off")==0 || sqlite3_stricmp(zArg,"no")==0 ){
-+-    return 0;
-+-  }
-+-  utf8_printf(stderr, "ERROR: Not a boolean value: \"%s\". Assuming \"no\".\n",
-+-          zArg);
-+-  return 0;
-+-}
-+-
-+-/*
-+-** Set or clear a shell flag according to a boolean value.
-+-*/
-+-static void setOrClearFlag(ShellState *p, unsigned mFlag, const char *zArg){
-+-  if( booleanValue(zArg) ){
-+-    ShellSetFlag(p, mFlag);
-+-  }else{
-+-    ShellClearFlag(p, mFlag);
-+-  }
-+-}
-+-
-+-/*
-+-** Close an output file, assuming it is not stderr or stdout
-+-*/
-+-static void output_file_close(FILE *f){
-+-  if( f && f!=stdout && f!=stderr ) fclose(f);
-+-}
-+-
-+-/*
-+-** Try to open an output file.   The names "stdout" and "stderr" are
-+-** recognized and do the right thing.  NULL is returned if the output
-+-** filename is "off".
-+-*/
-+-static FILE *output_file_open(const char *zFile){
-+-  FILE *f;
-+-  if( strcmp(zFile,"stdout")==0 ){
-+-    f = stdout;
-+-  }else if( strcmp(zFile, "stderr")==0 ){
-+-    f = stderr;
-+-  }else if( strcmp(zFile, "off")==0 ){
-+-    f = 0;
-+-  }else{
-+-    f = fopen(zFile, "wb");
-+-    if( f==0 ){
-+-      utf8_printf(stderr, "Error: cannot open \"%s\"\n", zFile);
-+-    }
-+-  }
-+-  return f;
-+-}
-+-
-+-#if !defined(SQLITE_UNTESTABLE)
-+-#if !defined(SQLITE_OMIT_TRACE) && !defined(SQLITE_OMIT_FLOATING_POINT)
-+-/*
-+-** A routine for handling output from sqlite3_trace().
-+-*/
-+-static int sql_trace_callback(
-+-  unsigned mType,
-+-  void *pArg,
-+-  void *pP,
-+-  void *pX
-+-){
-+-  FILE *f = (FILE*)pArg;
-+-  UNUSED_PARAMETER(mType);
-+-  UNUSED_PARAMETER(pP);
-+-  if( f ){
-+-    const char *z = (const char*)pX;
-+-    int i = (int)strlen(z);
-+-    while( i>0 && z[i-1]==';' ){ i--; }
-+-    utf8_printf(f, "%.*s;\n", i, z);
-+-  }
-+-  return 0;
-+-}
-+-#endif
-+-#endif
-+-
-+-/*
-+-** A no-op routine that runs with the ".breakpoint" doc-command.  This is
-+-** a useful spot to set a debugger breakpoint.
-+-*/
-+-static void test_breakpoint(void){
-+-  static int nCall = 0;
-+-  nCall++;
-+-}
-+-
-+-/*
-+-** An object used to read a CSV and other files for import.
-+-*/
-+-typedef struct ImportCtx ImportCtx;
-+-struct ImportCtx {
-+-  const char *zFile;  /* Name of the input file */
-+-  FILE *in;           /* Read the CSV text from this input stream */
-+-  char *z;            /* Accumulated text for a field */
-+-  int n;              /* Number of bytes in z */
-+-  int nAlloc;         /* Space allocated for z[] */
-+-  int nLine;          /* Current line number */
-+-  int bNotFirst;      /* True if one or more bytes already read */
-+-  int cTerm;          /* Character that terminated the most recent field */
-+-  int cColSep;        /* The column separator character.  (Usually ",") */
-+-  int cRowSep;        /* The row separator character.  (Usually "\n") */
-+-};
-+-
-+-/* Append a single byte to z[] */
-+-static void import_append_char(ImportCtx *p, int c){
-+-  if( p->n+1>=p->nAlloc ){
-+-    p->nAlloc += p->nAlloc + 100;
-+-    p->z = sqlite3_realloc64(p->z, p->nAlloc);
-+-    if( p->z==0 ){
-+-      raw_printf(stderr, "out of memory\n");
-+-      exit(1);
-+-    }
-+-  }
-+-  p->z[p->n++] = (char)c;
-+-}
-+-
-+-/* Read a single field of CSV text.  Compatible with rfc4180 and extended
-+-** with the option of having a separator other than ",".
-+-**
-+-**   +  Input comes from p->in.
-+-**   +  Store results in p->z of length p->n.  Space to hold p->z comes
-+-**      from sqlite3_malloc64().
-+-**   +  Use p->cSep as the column separator.  The default is ",".
-+-**   +  Use p->rSep as the row separator.  The default is "\n".
-+-**   +  Keep track of the line number in p->nLine.
-+-**   +  Store the character that terminates the field in p->cTerm.  Store
-+-**      EOF on end-of-file.
-+-**   +  Report syntax errors on stderr
-+-*/
-+-static char *SQLITE_CDECL csv_read_one_field(ImportCtx *p){
-+-  int c;
-+-  int cSep = p->cColSep;
-+-  int rSep = p->cRowSep;
-+-  p->n = 0;
-+-  c = fgetc(p->in);
-+-  if( c==EOF || seenInterrupt ){
-+-    p->cTerm = EOF;
-+-    return 0;
-+-  }
-+-  if( c=='"' ){
-+-    int pc, ppc;
-+-    int startLine = p->nLine;
-+-    int cQuote = c;
-+-    pc = ppc = 0;
-+-    while( 1 ){
-+-      c = fgetc(p->in);
-+-      if( c==rSep ) p->nLine++;
-+-      if( c==cQuote ){
-+-        if( pc==cQuote ){
-+-          pc = 0;
-+-          continue;
-+-        }
-+-      }
-+-      if( (c==cSep && pc==cQuote)
-+-       || (c==rSep && pc==cQuote)
-+-       || (c==rSep && pc=='\r' && ppc==cQuote)
-+-       || (c==EOF && pc==cQuote)
-+-      ){
-+-        do{ p->n--; }while( p->z[p->n]!=cQuote );
-+-        p->cTerm = c;
-+-        break;
-+-      }
-+-      if( pc==cQuote && c!='\r' ){
-+-        utf8_printf(stderr, "%s:%d: unescaped %c character\n",
-+-                p->zFile, p->nLine, cQuote);
-+-      }
-+-      if( c==EOF ){
-+-        utf8_printf(stderr, "%s:%d: unterminated %c-quoted field\n",
-+-                p->zFile, startLine, cQuote);
-+-        p->cTerm = c;
-+-        break;
-+-      }
-+-      import_append_char(p, c);
-+-      ppc = pc;
-+-      pc = c;
-+-    }
-+-  }else{
-+-    /* If this is the first field being parsed and it begins with the
-+-    ** UTF-8 BOM  (0xEF BB BF) then skip the BOM */
-+-    if( (c&0xff)==0xef && p->bNotFirst==0 ){
-+-      import_append_char(p, c);
-+-      c = fgetc(p->in);
-+-      if( (c&0xff)==0xbb ){
-+-        import_append_char(p, c);
-+-        c = fgetc(p->in);
-+-        if( (c&0xff)==0xbf ){
-+-          p->bNotFirst = 1;
-+-          p->n = 0;
-+-          return csv_read_one_field(p);
-+-        }
-+-      }
-+-    }
-+-    while( c!=EOF && c!=cSep && c!=rSep ){
-+-      import_append_char(p, c);
-+-      c = fgetc(p->in);
-+-    }
-+-    if( c==rSep ){
-+-      p->nLine++;
-+-      if( p->n>0 && p->z[p->n-1]=='\r' ) p->n--;
-+-    }
-+-    p->cTerm = c;
-+-  }
-+-  if( p->z ) p->z[p->n] = 0;
-+-  p->bNotFirst = 1;
-+-  return p->z;
-+-}
-+-
-+-/* Read a single field of ASCII delimited text.
-+-**
-+-**   +  Input comes from p->in.
-+-**   +  Store results in p->z of length p->n.  Space to hold p->z comes
-+-**      from sqlite3_malloc64().
-+-**   +  Use p->cSep as the column separator.  The default is "\x1F".
-+-**   +  Use p->rSep as the row separator.  The default is "\x1E".
-+-**   +  Keep track of the row number in p->nLine.
-+-**   +  Store the character that terminates the field in p->cTerm.  Store
-+-**      EOF on end-of-file.
-+-**   +  Report syntax errors on stderr
-+-*/
-+-static char *SQLITE_CDECL ascii_read_one_field(ImportCtx *p){
-+-  int c;
-+-  int cSep = p->cColSep;
-+-  int rSep = p->cRowSep;
-+-  p->n = 0;
-+-  c = fgetc(p->in);
-+-  if( c==EOF || seenInterrupt ){
-+-    p->cTerm = EOF;
-+-    return 0;
-+-  }
-+-  while( c!=EOF && c!=cSep && c!=rSep ){
-+-    import_append_char(p, c);
-+-    c = fgetc(p->in);
-+-  }
-+-  if( c==rSep ){
-+-    p->nLine++;
-+-  }
-+-  p->cTerm = c;
-+-  if( p->z ) p->z[p->n] = 0;
-+-  return p->z;
-+-}
-+-
-+-/*
-+-** Try to transfer data for table zTable.  If an error is seen while
-+-** moving forward, try to go backwards.  The backwards movement won't
-+-** work for WITHOUT ROWID tables.
-+-*/
-+-static void tryToCloneData(
-+-  ShellState *p,
-+-  sqlite3 *newDb,
-+-  const char *zTable
-+-){
-+-  sqlite3_stmt *pQuery = 0;
-+-  sqlite3_stmt *pInsert = 0;
-+-  char *zQuery = 0;
-+-  char *zInsert = 0;
-+-  int rc;
-+-  int i, j, n;
-+-  int nTable = (int)strlen(zTable);
-+-  int k = 0;
-+-  int cnt = 0;
-+-  const int spinRate = 10000;
-+-
-+-  zQuery = sqlite3_mprintf("SELECT * FROM \"%w\"", zTable);
-+-  rc = sqlite3_prepare_v2(p->db, zQuery, -1, &pQuery, 0);
-+-  if( rc ){
-+-    utf8_printf(stderr, "Error %d: %s on [%s]\n",
-+-            sqlite3_extended_errcode(p->db), sqlite3_errmsg(p->db),
-+-            zQuery);
-+-    goto end_data_xfer;
-+-  }
-+-  n = sqlite3_column_count(pQuery);
-+-  zInsert = sqlite3_malloc64(200 + nTable + n*3);
-+-  if( zInsert==0 ){
-+-    raw_printf(stderr, "out of memory\n");
-+-    goto end_data_xfer;
-+-  }
-+-  sqlite3_snprintf(200+nTable,zInsert,
-+-                   "INSERT OR IGNORE INTO \"%s\" VALUES(?", zTable);
-+-  i = (int)strlen(zInsert);
-+-  for(j=1; j<n; j++){
-+-    memcpy(zInsert+i, ",?", 2);
-+-    i += 2;
-+-  }
-+-  memcpy(zInsert+i, ");", 3);
-+-  rc = sqlite3_prepare_v2(newDb, zInsert, -1, &pInsert, 0);
-+-  if( rc ){
-+-    utf8_printf(stderr, "Error %d: %s on [%s]\n",
-+-            sqlite3_extended_errcode(newDb), sqlite3_errmsg(newDb),
-+-            zQuery);
-+-    goto end_data_xfer;
-+-  }
-+-  for(k=0; k<2; k++){
-+-    while( (rc = sqlite3_step(pQuery))==SQLITE_ROW ){
-+-      for(i=0; i<n; i++){
-+-        switch( sqlite3_column_type(pQuery, i) ){
-+-          case SQLITE_NULL: {
-+-            sqlite3_bind_null(pInsert, i+1);
-+-            break;
-+-          }
-+-          case SQLITE_INTEGER: {
-+-            sqlite3_bind_int64(pInsert, i+1, sqlite3_column_int64(pQuery,i));
-+-            break;
-+-          }
-+-          case SQLITE_FLOAT: {
-+-            sqlite3_bind_double(pInsert, i+1, sqlite3_column_double(pQuery,i));
-+-            break;
-+-          }
-+-          case SQLITE_TEXT: {
-+-            sqlite3_bind_text(pInsert, i+1,
-+-                             (const char*)sqlite3_column_text(pQuery,i),
-+-                             -1, SQLITE_STATIC);
-+-            break;
-+-          }
-+-          case SQLITE_BLOB: {
-+-            sqlite3_bind_blob(pInsert, i+1, sqlite3_column_blob(pQuery,i),
-+-                                            sqlite3_column_bytes(pQuery,i),
-+-                                            SQLITE_STATIC);
-+-            break;
-+-          }
-+-        }
-+-      } /* End for */
-+-      rc = sqlite3_step(pInsert);
-+-      if( rc!=SQLITE_OK && rc!=SQLITE_ROW && rc!=SQLITE_DONE ){
-+-        utf8_printf(stderr, "Error %d: %s\n", sqlite3_extended_errcode(newDb),
-+-                        sqlite3_errmsg(newDb));
-+-      }
-+-      sqlite3_reset(pInsert);
-+-      cnt++;
-+-      if( (cnt%spinRate)==0 ){
-+-        printf("%c\b", "|/-\\"[(cnt/spinRate)%4]);
-+-        fflush(stdout);
-+-      }
-+-    } /* End while */
-+-    if( rc==SQLITE_DONE ) break;
-+-    sqlite3_finalize(pQuery);
-+-    sqlite3_free(zQuery);
-+-    zQuery = sqlite3_mprintf("SELECT * FROM \"%w\" ORDER BY rowid DESC;",
-+-                             zTable);
-+-    rc = sqlite3_prepare_v2(p->db, zQuery, -1, &pQuery, 0);
-+-    if( rc ){
-+-      utf8_printf(stderr, "Warning: cannot step \"%s\" backwards", zTable);
-+-      break;
-+-    }
-+-  } /* End for(k=0...) */
-+-
-+-end_data_xfer:
-+-  sqlite3_finalize(pQuery);
-+-  sqlite3_finalize(pInsert);
-+-  sqlite3_free(zQuery);
-+-  sqlite3_free(zInsert);
-+-}
-+-
-+-
-+-/*
-+-** Try to transfer all rows of the schema that match zWhere.  For
-+-** each row, invoke xForEach() on the object defined by that row.
-+-** If an error is encountered while moving forward through the
-+-** sqlite_master table, try again moving backwards.
-+-*/
-+-static void tryToCloneSchema(
-+-  ShellState *p,
-+-  sqlite3 *newDb,
-+-  const char *zWhere,
-+-  void (*xForEach)(ShellState*,sqlite3*,const char*)
-+-){
-+-  sqlite3_stmt *pQuery = 0;
-+-  char *zQuery = 0;
-+-  int rc;
-+-  const unsigned char *zName;
-+-  const unsigned char *zSql;
-+-  char *zErrMsg = 0;
-+-
-+-  zQuery = sqlite3_mprintf("SELECT name, sql FROM sqlite_master"
-+-                           " WHERE %s", zWhere);
-+-  rc = sqlite3_prepare_v2(p->db, zQuery, -1, &pQuery, 0);
-+-  if( rc ){
-+-    utf8_printf(stderr, "Error: (%d) %s on [%s]\n",
-+-                    sqlite3_extended_errcode(p->db), sqlite3_errmsg(p->db),
-+-                    zQuery);
-+-    goto end_schema_xfer;
-+-  }
-+-  while( (rc = sqlite3_step(pQuery))==SQLITE_ROW ){
-+-    zName = sqlite3_column_text(pQuery, 0);
-+-    zSql = sqlite3_column_text(pQuery, 1);
-+-    printf("%s... ", zName); fflush(stdout);
-+-    sqlite3_exec(newDb, (const char*)zSql, 0, 0, &zErrMsg);
-+-    if( zErrMsg ){
-+-      utf8_printf(stderr, "Error: %s\nSQL: [%s]\n", zErrMsg, zSql);
-+-      sqlite3_free(zErrMsg);
-+-      zErrMsg = 0;
-+-    }
-+-    if( xForEach ){
-+-      xForEach(p, newDb, (const char*)zName);
-+-    }
-+-    printf("done\n");
-+-  }
-+-  if( rc!=SQLITE_DONE ){
-+-    sqlite3_finalize(pQuery);
-+-    sqlite3_free(zQuery);
-+-    zQuery = sqlite3_mprintf("SELECT name, sql FROM sqlite_master"
-+-                             " WHERE %s ORDER BY rowid DESC", zWhere);
-+-    rc = sqlite3_prepare_v2(p->db, zQuery, -1, &pQuery, 0);
-+-    if( rc ){
-+-      utf8_printf(stderr, "Error: (%d) %s on [%s]\n",
-+-                      sqlite3_extended_errcode(p->db), sqlite3_errmsg(p->db),
-+-                      zQuery);
-+-      goto end_schema_xfer;
-+-    }
-+-    while( (rc = sqlite3_step(pQuery))==SQLITE_ROW ){
-+-      zName = sqlite3_column_text(pQuery, 0);
-+-      zSql = sqlite3_column_text(pQuery, 1);
-+-      printf("%s... ", zName); fflush(stdout);
-+-      sqlite3_exec(newDb, (const char*)zSql, 0, 0, &zErrMsg);
-+-      if( zErrMsg ){
-+-        utf8_printf(stderr, "Error: %s\nSQL: [%s]\n", zErrMsg, zSql);
-+-        sqlite3_free(zErrMsg);
-+-        zErrMsg = 0;
-+-      }
-+-      if( xForEach ){
-+-        xForEach(p, newDb, (const char*)zName);
-+-      }
-+-      printf("done\n");
-+-    }
-+-  }
-+-end_schema_xfer:
-+-  sqlite3_finalize(pQuery);
-+-  sqlite3_free(zQuery);
-+-}
-+-
-+-/*
-+-** Open a new database file named "zNewDb".  Try to recover as much information
-+-** as possible out of the main database (which might be corrupt) and write it
-+-** into zNewDb.
-+-*/
-+-static void tryToClone(ShellState *p, const char *zNewDb){
-+-  int rc;
-+-  sqlite3 *newDb = 0;
-+-  if( access(zNewDb,0)==0 ){
-+-    utf8_printf(stderr, "File \"%s\" already exists.\n", zNewDb);
-+-    return;
-+-  }
-+-  rc = sqlite3_open(zNewDb, &newDb);
-+-  if( rc ){
-+-    utf8_printf(stderr, "Cannot create output database: %s\n",
-+-            sqlite3_errmsg(newDb));
-+-  }else{
-+-    sqlite3_exec(p->db, "PRAGMA writable_schema=ON;", 0, 0, 0);
-+-    sqlite3_exec(newDb, "BEGIN EXCLUSIVE;", 0, 0, 0);
-+-    tryToCloneSchema(p, newDb, "type='table'", tryToCloneData);
-+-    tryToCloneSchema(p, newDb, "type!='table'", 0);
-+-    sqlite3_exec(newDb, "COMMIT;", 0, 0, 0);
-+-    sqlite3_exec(p->db, "PRAGMA writable_schema=OFF;", 0, 0, 0);
-+-  }
-+-  sqlite3_close(newDb);
-+-}
-+-
-+-/*
-+-** Change the output file back to stdout
-+-*/
-+-static void output_reset(ShellState *p){
-+-  if( p->outfile[0]=='|' ){
-+-#ifndef SQLITE_OMIT_POPEN
-+-    pclose(p->out);
-+-#endif
-+-  }else{
-+-    output_file_close(p->out);
-+-  }
-+-  p->outfile[0] = 0;
-+-  p->out = stdout;
-+-}
-+-
-+-/*
-+-** Run an SQL command and return the single integer result.
-+-*/
-+-static int db_int(ShellState *p, const char *zSql){
-+-  sqlite3_stmt *pStmt;
-+-  int res = 0;
-+-  sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
-+-  if( pStmt && sqlite3_step(pStmt)==SQLITE_ROW ){
-+-    res = sqlite3_column_int(pStmt,0);
-+-  }
-+-  sqlite3_finalize(pStmt);
-+-  return res;
-+-}
-+-
-+-/*
-+-** Convert a 2-byte or 4-byte big-endian integer into a native integer
-+-*/
-+-static unsigned int get2byteInt(unsigned char *a){
-+-  return (a[0]<<8) + a[1];
-+-}
-+-static unsigned int get4byteInt(unsigned char *a){
-+-  return (a[0]<<24) + (a[1]<<16) + (a[2]<<8) + a[3];
-+-}
-+-
-+-/*
-+-** Implementation of the ".info" command.
-+-**
-+-** Return 1 on error, 2 to exit, and 0 otherwise.
-+-*/
-+-static int shell_dbinfo_command(ShellState *p, int nArg, char **azArg){
-+-  static const struct { const char *zName; int ofst; } aField[] = {
-+-     { "file change counter:",  24  },
-+-     { "database page count:",  28  },
-+-     { "freelist page count:",  36  },
-+-     { "schema cookie:",        40  },
-+-     { "schema format:",        44  },
-+-     { "default cache size:",   48  },
-+-     { "autovacuum top root:",  52  },
-+-     { "incremental vacuum:",   64  },
-+-     { "text encoding:",        56  },
-+-     { "user version:",         60  },
-+-     { "application id:",       68  },
-+-     { "software version:",     96  },
-+-  };
-+-  static const struct { const char *zName; const char *zSql; } aQuery[] = {
-+-     { "number of tables:",
-+-       "SELECT count(*) FROM %s WHERE type='table'" },
-+-     { "number of indexes:",
-+-       "SELECT count(*) FROM %s WHERE type='index'" },
-+-     { "number of triggers:",
-+-       "SELECT count(*) FROM %s WHERE type='trigger'" },
-+-     { "number of views:",
-+-       "SELECT count(*) FROM %s WHERE type='view'" },
-+-     { "schema size:",
-+-       "SELECT total(length(sql)) FROM %s" },
-+-  };
-+-  int i;
-+-  char *zSchemaTab;
-+-  char *zDb = nArg>=2 ? azArg[1] : "main";
-+-  sqlite3_stmt *pStmt = 0;
-+-  unsigned char aHdr[100];
-+-  open_db(p, 0);
-+-  if( p->db==0 ) return 1;
-+-  sqlite3_prepare_v2(p->db,"SELECT data FROM sqlite_dbpage(?1) WHERE pgno=1",
-+-                     -1, &pStmt, 0);
-+-  sqlite3_bind_text(pStmt, 1, zDb, -1, SQLITE_STATIC);
-+-  if( sqlite3_step(pStmt)==SQLITE_ROW
-+-   && sqlite3_column_bytes(pStmt,0)>100
-+-  ){
-+-    memcpy(aHdr, sqlite3_column_blob(pStmt,0), 100);
-+-    sqlite3_finalize(pStmt);
-+-  }else{
-+-    raw_printf(stderr, "unable to read database header\n");
-+-    sqlite3_finalize(pStmt);
-+-    return 1;
-+-  }
-+-  i = get2byteInt(aHdr+16);
-+-  if( i==1 ) i = 65536;
-+-  utf8_printf(p->out, "%-20s %d\n", "database page size:", i);
-+-  utf8_printf(p->out, "%-20s %d\n", "write format:", aHdr[18]);
-+-  utf8_printf(p->out, "%-20s %d\n", "read format:", aHdr[19]);
-+-  utf8_printf(p->out, "%-20s %d\n", "reserved bytes:", aHdr[20]);
-+-  for(i=0; i<ArraySize(aField); i++){
-+-    int ofst = aField[i].ofst;
-+-    unsigned int val = get4byteInt(aHdr + ofst);
-+-    utf8_printf(p->out, "%-20s %u", aField[i].zName, val);
-+-    switch( ofst ){
-+-      case 56: {
-+-        if( val==1 ) raw_printf(p->out, " (utf8)");
-+-        if( val==2 ) raw_printf(p->out, " (utf16le)");
-+-        if( val==3 ) raw_printf(p->out, " (utf16be)");
-+-      }
-+-    }
-+-    raw_printf(p->out, "\n");
-+-  }
-+-  if( zDb==0 ){
-+-    zSchemaTab = sqlite3_mprintf("main.sqlite_master");
-+-  }else if( strcmp(zDb,"temp")==0 ){
-+-    zSchemaTab = sqlite3_mprintf("%s", "sqlite_temp_master");
-+-  }else{
-+-    zSchemaTab = sqlite3_mprintf("\"%w\".sqlite_master", zDb);
-+-  }
-+-  for(i=0; i<ArraySize(aQuery); i++){
-+-    char *zSql = sqlite3_mprintf(aQuery[i].zSql, zSchemaTab);
-+-    int val = db_int(p, zSql);
-+-    sqlite3_free(zSql);
-+-    utf8_printf(p->out, "%-20s %d\n", aQuery[i].zName, val);
-+-  }
-+-  sqlite3_free(zSchemaTab);
-+-  return 0;
-+-}
-+-
-+-/*
-+-** Print the current sqlite3_errmsg() value to stderr and return 1.
-+-*/
-+-static int shellDatabaseError(sqlite3 *db){
-+-  const char *zErr = sqlite3_errmsg(db);
-+-  utf8_printf(stderr, "Error: %s\n", zErr);
-+-  return 1;
-+-}
-+-
-+-/*
-+-** Print an out-of-memory message to stderr and return 1.
-+-*/
-+-static int shellNomemError(void){
-+-  raw_printf(stderr, "Error: out of memory\n");
-+-  return 1;
-+-}
-+-
-+-/*
-+-** Compare the pattern in zGlob[] against the text in z[].  Return TRUE
-+-** if they match and FALSE (0) if they do not match.
-+-**
-+-** Globbing rules:
-+-**
-+-**      '*'       Matches any sequence of zero or more characters.
-+-**
-+-**      '?'       Matches exactly one character.
-+-**
-+-**     [...]      Matches one character from the enclosed list of
-+-**                characters.
-+-**
-+-**     [^...]     Matches one character not in the enclosed list.
-+-**
-+-**      '#'       Matches any sequence of one or more digits with an
-+-**                optional + or - sign in front
-+-**
-+-**      ' '       Any span of whitespace matches any other span of
-+-**                whitespace.
-+-**
-+-** Extra whitespace at the end of z[] is ignored.
-+-*/
-+-static int testcase_glob(const char *zGlob, const char *z){
-+-  int c, c2;
-+-  int invert;
-+-  int seen;
-+-
-+-  while( (c = (*(zGlob++)))!=0 ){
-+-    if( IsSpace(c) ){
-+-      if( !IsSpace(*z) ) return 0;
-+-      while( IsSpace(*zGlob) ) zGlob++;
-+-      while( IsSpace(*z) ) z++;
-+-    }else if( c=='*' ){
-+-      while( (c=(*(zGlob++))) == '*' || c=='?' ){
-+-        if( c=='?' && (*(z++))==0 ) return 0;
-+-      }
-+-      if( c==0 ){
-+-        return 1;
-+-      }else if( c=='[' ){
-+-        while( *z && testcase_glob(zGlob-1,z)==0 ){
-+-          z++;
-+-        }
-+-        return (*z)!=0;
-+-      }
-+-      while( (c2 = (*(z++)))!=0 ){
-+-        while( c2!=c ){
-+-          c2 = *(z++);
-+-          if( c2==0 ) return 0;
-+-        }
-+-        if( testcase_glob(zGlob,z) ) return 1;
-+-      }
-+-      return 0;
-+-    }else if( c=='?' ){
-+-      if( (*(z++))==0 ) return 0;
-+-    }else if( c=='[' ){
-+-      int prior_c = 0;
-+-      seen = 0;
-+-      invert = 0;
-+-      c = *(z++);
-+-      if( c==0 ) return 0;
-+-      c2 = *(zGlob++);
-+-      if( c2=='^' ){
-+-        invert = 1;
-+-        c2 = *(zGlob++);
-+-      }
-+-      if( c2==']' ){
-+-        if( c==']' ) seen = 1;
-+-        c2 = *(zGlob++);
-+-      }
-+-      while( c2 && c2!=']' ){
-+-        if( c2=='-' && zGlob[0]!=']' && zGlob[0]!=0 && prior_c>0 ){
-+-          c2 = *(zGlob++);
-+-          if( c>=prior_c && c<=c2 ) seen = 1;
-+-          prior_c = 0;
-+-        }else{
-+-          if( c==c2 ){
-+-            seen = 1;
-+-          }
-+-          prior_c = c2;
-+-        }
-+-        c2 = *(zGlob++);
-+-      }
-+-      if( c2==0 || (seen ^ invert)==0 ) return 0;
-+-    }else if( c=='#' ){
-+-      if( (z[0]=='-' || z[0]=='+') && IsDigit(z[1]) ) z++;
-+-      if( !IsDigit(z[0]) ) return 0;
-+-      z++;
-+-      while( IsDigit(z[0]) ){ z++; }
-+-    }else{
-+-      if( c!=(*(z++)) ) return 0;
-+-    }
-+-  }
-+-  while( IsSpace(*z) ){ z++; }
-+-  return *z==0;
-+-}
-+-
-+-
-+-/*
-+-** Compare the string as a command-line option with either one or two
-+-** initial "-" characters.
-+-*/
-+-static int optionMatch(const char *zStr, const char *zOpt){
-+-  if( zStr[0]!='-' ) return 0;
-+-  zStr++;
-+-  if( zStr[0]=='-' ) zStr++;
-+-  return strcmp(zStr, zOpt)==0;
-+-}
-+-
-+-/*
-+-** Delete a file.
-+-*/
-+-int shellDeleteFile(const char *zFilename){
-+-  int rc;
-+-#ifdef _WIN32
-+-  wchar_t *z = sqlite3_win32_utf8_to_unicode(zFilename);
-+-  rc = _wunlink(z);
-+-  sqlite3_free(z);
-+-#else
-+-  rc = unlink(zFilename);
-+-#endif
-+-  return rc;
-+-}
-+-
-+-
-+-/*
-+-** The implementation of SQL scalar function fkey_collate_clause(), used
-+-** by the ".lint fkey-indexes" command. This scalar function is always
-+-** called with four arguments - the parent table name, the parent column name,
-+-** the child table name and the child column name.
-+-**
-+-**   fkey_collate_clause('parent-tab', 'parent-col', 'child-tab', 'child-col')
-+-**
-+-** If either of the named tables or columns do not exist, this function
-+-** returns an empty string. An empty string is also returned if both tables
-+-** and columns exist but have the same default collation sequence. Or,
-+-** if both exist but the default collation sequences are different, this
-+-** function returns the string " COLLATE <parent-collation>", where
-+-** <parent-collation> is the default collation sequence of the parent column.
-+-*/
-+-static void shellFkeyCollateClause(
-+-  sqlite3_context *pCtx,
-+-  int nVal,
-+-  sqlite3_value **apVal
-+-){
-+-  sqlite3 *db = sqlite3_context_db_handle(pCtx);
-+-  const char *zParent;
-+-  const char *zParentCol;
-+-  const char *zParentSeq;
-+-  const char *zChild;
-+-  const char *zChildCol;
-+-  const char *zChildSeq = 0;  /* Initialize to avoid false-positive warning */
-+-  int rc;
-+-
-+-  assert( nVal==4 );
-+-  zParent = (const char*)sqlite3_value_text(apVal[0]);
-+-  zParentCol = (const char*)sqlite3_value_text(apVal[1]);
-+-  zChild = (const char*)sqlite3_value_text(apVal[2]);
-+-  zChildCol = (const char*)sqlite3_value_text(apVal[3]);
-+-
-+-  sqlite3_result_text(pCtx, "", -1, SQLITE_STATIC);
-+-  rc = sqlite3_table_column_metadata(
-+-      db, "main", zParent, zParentCol, 0, &zParentSeq, 0, 0, 0
-+-  );
-+-  if( rc==SQLITE_OK ){
-+-    rc = sqlite3_table_column_metadata(
-+-        db, "main", zChild, zChildCol, 0, &zChildSeq, 0, 0, 0
-+-    );
-+-  }
-+-
-+-  if( rc==SQLITE_OK && sqlite3_stricmp(zParentSeq, zChildSeq) ){
-+-    char *z = sqlite3_mprintf(" COLLATE %s", zParentSeq);
-+-    sqlite3_result_text(pCtx, z, -1, SQLITE_TRANSIENT);
-+-    sqlite3_free(z);
-+-  }
-+-}
-+-
-+-
-+-/*
-+-** The implementation of dot-command ".lint fkey-indexes".
-+-*/
-+-static int lintFkeyIndexes(
-+-  ShellState *pState,             /* Current shell tool state */
-+-  char **azArg,                   /* Array of arguments passed to dot command */
-+-  int nArg                        /* Number of entries in azArg[] */
-+-){
-+-  sqlite3 *db = pState->db;       /* Database handle to query "main" db of */
-+-  FILE *out = pState->out;        /* Stream to write non-error output to */
-+-  int bVerbose = 0;               /* If -verbose is present */
-+-  int bGroupByParent = 0;         /* If -groupbyparent is present */
-+-  int i;                          /* To iterate through azArg[] */
-+-  const char *zIndent = "";       /* How much to indent CREATE INDEX by */
-+-  int rc;                         /* Return code */
-+-  sqlite3_stmt *pSql = 0;         /* Compiled version of SQL statement below */
-+-
-+-  /*
-+-  ** This SELECT statement returns one row for each foreign key constraint
-+-  ** in the schema of the main database. The column values are:
-+-  **
-+-  ** 0. The text of an SQL statement similar to:
-+-  **
-+-  **      "EXPLAIN QUERY PLAN SELECT rowid FROM child_table WHERE child_key=?"
-+-  **
-+-  **    This is the same SELECT that the foreign keys implementation needs
-+-  **    to run internally on child tables. If there is an index that can
-+-  **    be used to optimize this query, then it can also be used by the FK
-+-  **    implementation to optimize DELETE or UPDATE statements on the parent
-+-  **    table.
-+-  **
-+-  ** 1. A GLOB pattern suitable for sqlite3_strglob(). If the plan output by
-+-  **    the EXPLAIN QUERY PLAN command matches this pattern, then the schema
-+-  **    contains an index that can be used to optimize the query.
-+-  **
-+-  ** 2. Human readable text that describes the child table and columns. e.g.
-+-  **
-+-  **       "child_table(child_key1, child_key2)"
-+-  **
-+-  ** 3. Human readable text that describes the parent table and columns. e.g.
-+-  **
-+-  **       "parent_table(parent_key1, parent_key2)"
-+-  **
-+-  ** 4. A full CREATE INDEX statement for an index that could be used to
-+-  **    optimize DELETE or UPDATE statements on the parent table. e.g.
-+-  **
-+-  **       "CREATE INDEX child_table_child_key ON child_table(child_key)"
-+-  **
-+-  ** 5. The name of the parent table.
-+-  **
-+-  ** These six values are used by the C logic below to generate the report.
-+-  */
-+-  const char *zSql =
-+-  "SELECT "
-+-    "     'EXPLAIN QUERY PLAN SELECT rowid FROM ' || quote(s.name) || ' WHERE '"
-+-    "  || group_concat(quote(s.name) || '.' || quote(f.[from]) || '=?' "
-+-    "  || fkey_collate_clause("
-+-    "       f.[table], COALESCE(f.[to], p.[name]), s.name, f.[from]),' AND ')"
-+-    ", "
-+-    "     'SEARCH TABLE ' || s.name || ' USING COVERING INDEX*('"
-+-    "  || group_concat('*=?', ' AND ') || ')'"
-+-    ", "
-+-    "     s.name  || '(' || group_concat(f.[from],  ', ') || ')'"
-+-    ", "
-+-    "     f.[table] || '(' || group_concat(COALESCE(f.[to], p.[name])) || ')'"
-+-    ", "
-+-    "     'CREATE INDEX ' || quote(s.name ||'_'|| group_concat(f.[from], '_'))"
-+-    "  || ' ON ' || quote(s.name) || '('"
-+-    "  || group_concat(quote(f.[from]) ||"
-+-    "        fkey_collate_clause("
-+-    "          f.[table], COALESCE(f.[to], p.[name]), s.name, f.[from]), ', ')"
-+-    "  || ');'"
-+-    ", "
-+-    "     f.[table] "
-+-    "FROM sqlite_master AS s, pragma_foreign_key_list(s.name) AS f "
-+-    "LEFT JOIN pragma_table_info AS p ON (pk-1=seq AND p.arg=f.[table]) "
-+-    "GROUP BY s.name, f.id "
-+-    "ORDER BY (CASE WHEN ? THEN f.[table] ELSE s.name END)"
-+-  ;
-+-  const char *zGlobIPK = "SEARCH TABLE * USING INTEGER PRIMARY KEY (rowid=?)";
-+-
-+-  for(i=2; i<nArg; i++){
-+-    int n = (int)strlen(azArg[i]);
-+-    if( n>1 && sqlite3_strnicmp("-verbose", azArg[i], n)==0 ){
-+-      bVerbose = 1;
-+-    }
-+-    else if( n>1 && sqlite3_strnicmp("-groupbyparent", azArg[i], n)==0 ){
-+-      bGroupByParent = 1;
-+-      zIndent = "    ";
-+-    }
-+-    else{
-+-      raw_printf(stderr, "Usage: %s %s ?-verbose? ?-groupbyparent?\n",
-+-          azArg[0], azArg[1]
-+-      );
-+-      return SQLITE_ERROR;
-+-    }
-+-  }
-+-
-+-  /* Register the fkey_collate_clause() SQL function */
-+-  rc = sqlite3_create_function(db, "fkey_collate_clause", 4, SQLITE_UTF8,
-+-      0, shellFkeyCollateClause, 0, 0
-+-  );
-+-
-+-
-+-  if( rc==SQLITE_OK ){
-+-    rc = sqlite3_prepare_v2(db, zSql, -1, &pSql, 0);
-+-  }
-+-  if( rc==SQLITE_OK ){
-+-    sqlite3_bind_int(pSql, 1, bGroupByParent);
-+-  }
-+-
-+-  if( rc==SQLITE_OK ){
-+-    int rc2;
-+-    char *zPrev = 0;
-+-    while( SQLITE_ROW==sqlite3_step(pSql) ){
-+-      int res = -1;
-+-      sqlite3_stmt *pExplain = 0;
-+-      const char *zEQP = (const char*)sqlite3_column_text(pSql, 0);
-+-      const char *zGlob = (const char*)sqlite3_column_text(pSql, 1);
-+-      const char *zFrom = (const char*)sqlite3_column_text(pSql, 2);
-+-      const char *zTarget = (const char*)sqlite3_column_text(pSql, 3);
-+-      const char *zCI = (const char*)sqlite3_column_text(pSql, 4);
-+-      const char *zParent = (const char*)sqlite3_column_text(pSql, 5);
-+-
-+-      rc = sqlite3_prepare_v2(db, zEQP, -1, &pExplain, 0);
-+-      if( rc!=SQLITE_OK ) break;
-+-      if( SQLITE_ROW==sqlite3_step(pExplain) ){
-+-        const char *zPlan = (const char*)sqlite3_column_text(pExplain, 3);
-+-        res = (
-+-              0==sqlite3_strglob(zGlob, zPlan)
-+-           || 0==sqlite3_strglob(zGlobIPK, zPlan)
-+-        );
-+-      }
-+-      rc = sqlite3_finalize(pExplain);
-+-      if( rc!=SQLITE_OK ) break;
-+-
-+-      if( res<0 ){
-+-        raw_printf(stderr, "Error: internal error");
-+-        break;
-+-      }else{
-+-        if( bGroupByParent
-+-        && (bVerbose || res==0)
-+-        && (zPrev==0 || sqlite3_stricmp(zParent, zPrev))
-+-        ){
-+-          raw_printf(out, "-- Parent table %s\n", zParent);
-+-          sqlite3_free(zPrev);
-+-          zPrev = sqlite3_mprintf("%s", zParent);
-+-        }
-+-
-+-        if( res==0 ){
-+-          raw_printf(out, "%s%s --> %s\n", zIndent, zCI, zTarget);
-+-        }else if( bVerbose ){
-+-          raw_printf(out, "%s/* no extra indexes required for %s -> %s */\n",
-+-              zIndent, zFrom, zTarget
-+-          );
-+-        }
-+-      }
-+-    }
-+-    sqlite3_free(zPrev);
-+-
-+-    if( rc!=SQLITE_OK ){
-+-      raw_printf(stderr, "%s\n", sqlite3_errmsg(db));
-+-    }
-+-
-+-    rc2 = sqlite3_finalize(pSql);
-+-    if( rc==SQLITE_OK && rc2!=SQLITE_OK ){
-+-      rc = rc2;
-+-      raw_printf(stderr, "%s\n", sqlite3_errmsg(db));
-+-    }
-+-  }else{
-+-    raw_printf(stderr, "%s\n", sqlite3_errmsg(db));
-+-  }
-+-
-+-  return rc;
-+-}
-+-
-+-/*
-+-** Implementation of ".lint" dot command.
-+-*/
-+-static int lintDotCommand(
-+-  ShellState *pState,             /* Current shell tool state */
-+-  char **azArg,                   /* Array of arguments passed to dot command */
-+-  int nArg                        /* Number of entries in azArg[] */
-+-){
-+-  int n;
-+-  n = (nArg>=2 ? (int)strlen(azArg[1]) : 0);
-+-  if( n<1 || sqlite3_strnicmp(azArg[1], "fkey-indexes", n) ) goto usage;
-+-  return lintFkeyIndexes(pState, azArg, nArg);
-+-
-+- usage:
-+-  raw_printf(stderr, "Usage %s sub-command ?switches...?\n", azArg[0]);
-+-  raw_printf(stderr, "Where sub-commands are:\n");
-+-  raw_printf(stderr, "    fkey-indexes\n");
-+-  return SQLITE_ERROR;
-+-}
-+-
-+-
-+-/*
-+-** If an input line begins with "." then invoke this routine to
-+-** process that line.
-+-**
-+-** Return 1 on error, 2 to exit, and 0 otherwise.
-+-*/
-+-static int do_meta_command(char *zLine, ShellState *p){
-+-  int h = 1;
-+-  int nArg = 0;
-+-  int n, c;
-+-  int rc = 0;
-+-  char *azArg[50];
-+-
-+-  /* Parse the input line into tokens.
-+-  */
-+-  while( zLine[h] && nArg<ArraySize(azArg) ){
-+-    while( IsSpace(zLine[h]) ){ h++; }
-+-    if( zLine[h]==0 ) break;
-+-    if( zLine[h]=='\'' || zLine[h]=='"' ){
-+-      int delim = zLine[h++];
-+-      azArg[nArg++] = &zLine[h];
-+-      while( zLine[h] && zLine[h]!=delim ){
-+-        if( zLine[h]=='\\' && delim=='"' && zLine[h+1]!=0 ) h++;
-+-        h++;
-+-      }
-+-      if( zLine[h]==delim ){
-+-        zLine[h++] = 0;
-+-      }
-+-      if( delim=='"' ) resolve_backslashes(azArg[nArg-1]);
-+-    }else{
-+-      azArg[nArg++] = &zLine[h];
-+-      while( zLine[h] && !IsSpace(zLine[h]) ){ h++; }
-+-      if( zLine[h] ) zLine[h++] = 0;
-+-      resolve_backslashes(azArg[nArg-1]);
-+-    }
-+-  }
-+-
-+-  /* Process the input line.
-+-  */
-+-  if( nArg==0 ) return 0; /* no tokens, no error */
-+-  n = strlen30(azArg[0]);
-+-  c = azArg[0][0];
-+-
-+-#ifndef SQLITE_OMIT_AUTHORIZATION
-+-  if( c=='a' && strncmp(azArg[0], "auth", n)==0 ){
-+-    if( nArg!=2 ){
-+-      raw_printf(stderr, "Usage: .auth ON|OFF\n");
-+-      rc = 1;
-+-      goto meta_command_exit;
-+-    }
-+-    open_db(p, 0);
-+-    if( booleanValue(azArg[1]) ){
-+-      sqlite3_set_authorizer(p->db, shellAuth, p);
-+-    }else{
-+-      sqlite3_set_authorizer(p->db, 0, 0);
-+-    }
-+-  }else
-+-#endif
-+-
-+-  if( (c=='b' && n>=3 && strncmp(azArg[0], "backup", n)==0)
-+-   || (c=='s' && n>=3 && strncmp(azArg[0], "save", n)==0)
-+-  ){
-+-    const char *zDestFile = 0;
-+-    const char *zDb = 0;
-+-    sqlite3 *pDest;
-+-    sqlite3_backup *pBackup;
-+-    int j;
-+-    for(j=1; j<nArg; j++){
-+-      const char *z = azArg[j];
-+-      if( z[0]=='-' ){
-+-        while( z[0]=='-' ) z++;
-+-        /* No options to process at this time */
-+-        {
-+-          utf8_printf(stderr, "unknown option: %s\n", azArg[j]);
-+-          return 1;
-+-        }
-+-      }else if( zDestFile==0 ){
-+-        zDestFile = azArg[j];
-+-      }else if( zDb==0 ){
-+-        zDb = zDestFile;
-+-        zDestFile = azArg[j];
-+-      }else{
-+-        raw_printf(stderr, "too many arguments to .backup\n");
-+-        return 1;
-+-      }
-+-    }
-+-    if( zDestFile==0 ){
-+-      raw_printf(stderr, "missing FILENAME argument on .backup\n");
-+-      return 1;
-+-    }
-+-    if( zDb==0 ) zDb = "main";
-+-    rc = sqlite3_open(zDestFile, &pDest);
-+-    if( rc!=SQLITE_OK ){
-+-      utf8_printf(stderr, "Error: cannot open \"%s\"\n", zDestFile);
-+-      sqlite3_close(pDest);
-+-      return 1;
-+-    }
-+-    open_db(p, 0);
-+-    pBackup = sqlite3_backup_init(pDest, "main", p->db, zDb);
-+-    if( pBackup==0 ){
-+-      utf8_printf(stderr, "Error: %s\n", sqlite3_errmsg(pDest));
-+-      sqlite3_close(pDest);
-+-      return 1;
-+-    }
-+-    while(  (rc = sqlite3_backup_step(pBackup,100))==SQLITE_OK ){}
-+-    sqlite3_backup_finish(pBackup);
-+-    if( rc==SQLITE_DONE ){
-+-      rc = 0;
-+-    }else{
-+-      utf8_printf(stderr, "Error: %s\n", sqlite3_errmsg(pDest));
-+-      rc = 1;
-+-    }
-+-    sqlite3_close(pDest);
-+-  }else
-+-
-+-  if( c=='b' && n>=3 && strncmp(azArg[0], "bail", n)==0 ){
-+-    if( nArg==2 ){
-+-      bail_on_error = booleanValue(azArg[1]);
-+-    }else{
-+-      raw_printf(stderr, "Usage: .bail on|off\n");
-+-      rc = 1;
-+-    }
-+-  }else
-+-
-+-  if( c=='b' && n>=3 && strncmp(azArg[0], "binary", n)==0 ){
-+-    if( nArg==2 ){
-+-      if( booleanValue(azArg[1]) ){
-+-        setBinaryMode(p->out, 1);
-+-      }else{
-+-        setTextMode(p->out, 1);
-+-      }
-+-    }else{
-+-      raw_printf(stderr, "Usage: .binary on|off\n");
-+-      rc = 1;
-+-    }
-+-  }else
-+-
-+-  if( c=='c' && strcmp(azArg[0],"cd")==0 ){
-+-    if( nArg==2 ){
-+-#if defined(_WIN32) || defined(WIN32)
-+-      wchar_t *z = sqlite3_win32_utf8_to_unicode(azArg[1]);
-+-      rc = !SetCurrentDirectoryW(z);
-+-      sqlite3_free(z);
-+-#else
-+-      rc = chdir(azArg[1]);
-+-#endif
-+-      if( rc ){
-+-        utf8_printf(stderr, "Cannot change to directory \"%s\"\n", azArg[1]);
-+-        rc = 1;
-+-      }
-+-    }else{
-+-      raw_printf(stderr, "Usage: .cd DIRECTORY\n");
-+-      rc = 1;
-+-    }
-+-  }else
-+-
-+-  /* The undocumented ".breakpoint" command causes a call to the no-op
-+-  ** routine named test_breakpoint().
-+-  */
-+-  if( c=='b' && n>=3 && strncmp(azArg[0], "breakpoint", n)==0 ){
-+-    test_breakpoint();
-+-  }else
-+-
-+-  if( c=='c' && n>=3 && strncmp(azArg[0], "changes", n)==0 ){
-+-    if( nArg==2 ){
-+-      setOrClearFlag(p, SHFLG_CountChanges, azArg[1]);
-+-    }else{
-+-      raw_printf(stderr, "Usage: .changes on|off\n");
-+-      rc = 1;
-+-    }
-+-  }else
-+-
-+-  /* Cancel output redirection, if it is currently set (by .testcase)
-+-  ** Then read the content of the testcase-out.txt file and compare against
-+-  ** azArg[1].  If there are differences, report an error and exit.
-+-  */
-+-  if( c=='c' && n>=3 && strncmp(azArg[0], "check", n)==0 ){
-+-    char *zRes = 0;
-+-    output_reset(p);
-+-    if( nArg!=2 ){
-+-      raw_printf(stderr, "Usage: .check GLOB-PATTERN\n");
-+-      rc = 2;
-+-    }else if( (zRes = readFile("testcase-out.txt", 0))==0 ){
-+-      raw_printf(stderr, "Error: cannot read 'testcase-out.txt'\n");
-+-      rc = 2;
-+-    }else if( testcase_glob(azArg[1],zRes)==0 ){
-+-      utf8_printf(stderr,
-+-                 "testcase-%s FAILED\n Expected: [%s]\n      Got: [%s]\n",
-+-                 p->zTestcase, azArg[1], zRes);
-+-      rc = 1;
-+-    }else{
-+-      utf8_printf(stdout, "testcase-%s ok\n", p->zTestcase);
-+-      p->nCheck++;
-+-    }
-+-    sqlite3_free(zRes);
-+-  }else
-+-
-+-  if( c=='c' && strncmp(azArg[0], "clone", n)==0 ){
-+-    if( nArg==2 ){
-+-      tryToClone(p, azArg[1]);
-+-    }else{
-+-      raw_printf(stderr, "Usage: .clone FILENAME\n");
-+-      rc = 1;
-+-    }
-+-  }else
-+-
-+-  if( c=='d' && n>1 && strncmp(azArg[0], "databases", n)==0 ){
-+-    ShellState data;
-+-    char *zErrMsg = 0;
-+-    open_db(p, 0);
-+-    memcpy(&data, p, sizeof(data));
-+-    data.showHeader = 0;
-+-    data.cMode = data.mode = MODE_List;
-+-    sqlite3_snprintf(sizeof(data.colSeparator),data.colSeparator,": ");
-+-    data.cnt = 0;
-+-    sqlite3_exec(p->db, "SELECT name, file FROM pragma_database_list",
-+-                 callback, &data, &zErrMsg);
-+-    if( zErrMsg ){
-+-      utf8_printf(stderr,"Error: %s\n", zErrMsg);
-+-      sqlite3_free(zErrMsg);
-+-      rc = 1;
-+-    }
-+-  }else
-+-
-+-  if( c=='d' && strncmp(azArg[0], "dbinfo", n)==0 ){
-+-    rc = shell_dbinfo_command(p, nArg, azArg);
-+-  }else
-+-
-+-  if( c=='d' && strncmp(azArg[0], "dump", n)==0 ){
-+-    const char *zLike = 0;
-+-    int i;
-+-    int savedShowHeader = p->showHeader;
-+-    ShellClearFlag(p, SHFLG_PreserveRowid|SHFLG_Newlines);
-+-    for(i=1; i<nArg; i++){
-+-      if( azArg[i][0]=='-' ){
-+-        const char *z = azArg[i]+1;
-+-        if( z[0]=='-' ) z++;
-+-        if( strcmp(z,"preserve-rowids")==0 ){
-+-#ifdef SQLITE_OMIT_VIRTUALTABLE
-+-          raw_printf(stderr, "The --preserve-rowids option is not compatible"
-+-                             " with SQLITE_OMIT_VIRTUALTABLE\n");
-+-          rc = 1;
-+-          goto meta_command_exit;
-+-#else
-+-          ShellSetFlag(p, SHFLG_PreserveRowid);
-+-#endif
-+-        }else
-+-        if( strcmp(z,"newlines")==0 ){
-+-          ShellSetFlag(p, SHFLG_Newlines);
-+-        }else
-+-        {
-+-          raw_printf(stderr, "Unknown option \"%s\" on \".dump\"\n", azArg[i]);
-+-          rc = 1;
-+-          goto meta_command_exit;
-+-        }
-+-      }else if( zLike ){
-+-        raw_printf(stderr, "Usage: .dump ?--preserve-rowids? "
-+-                           "?--newlines? ?LIKE-PATTERN?\n");
-+-        rc = 1;
-+-        goto meta_command_exit;
-+-      }else{
-+-        zLike = azArg[i];
-+-      }
-+-    }
-+-    open_db(p, 0);
-+-    /* When playing back a "dump", the content might appear in an order
-+-    ** which causes immediate foreign key constraints to be violated.
-+-    ** So disable foreign-key constraint enforcement to prevent problems. */
-+-    raw_printf(p->out, "PRAGMA foreign_keys=OFF;\n");
-+-    raw_printf(p->out, "BEGIN TRANSACTION;\n");
-+-    p->writableSchema = 0;
-+-    p->showHeader = 0;
-+-    /* Set writable_schema=ON since doing so forces SQLite to initialize
-+-    ** as much of the schema as it can even if the sqlite_master table is
-+-    ** corrupt. */
-+-    sqlite3_exec(p->db, "SAVEPOINT dump; PRAGMA writable_schema=ON", 0, 0, 0);
-+-    p->nErr = 0;
-+-    if( zLike==0 ){
-+-      run_schema_dump_query(p,
-+-        "SELECT name, type, sql FROM sqlite_master "
-+-        "WHERE sql NOT NULL AND type=='table' AND name!='sqlite_sequence'"
-+-      );
-+-      run_schema_dump_query(p,
-+-        "SELECT name, type, sql FROM sqlite_master "
-+-        "WHERE name=='sqlite_sequence'"
-+-      );
-+-      run_table_dump_query(p,
-+-        "SELECT sql FROM sqlite_master "
-+-        "WHERE sql NOT NULL AND type IN ('index','trigger','view')", 0
-+-      );
-+-    }else{
-+-      char *zSql;
-+-      zSql = sqlite3_mprintf(
-+-        "SELECT name, type, sql FROM sqlite_master "
-+-        "WHERE tbl_name LIKE %Q AND type=='table'"
-+-        "  AND sql NOT NULL", zLike);
-+-      run_schema_dump_query(p,zSql);
-+-      sqlite3_free(zSql);
-+-      zSql = sqlite3_mprintf(
-+-        "SELECT sql FROM sqlite_master "
-+-        "WHERE sql NOT NULL"
-+-        "  AND type IN ('index','trigger','view')"
-+-        "  AND tbl_name LIKE %Q", zLike);
-+-      run_table_dump_query(p, zSql, 0);
-+-      sqlite3_free(zSql);
-+-    }
-+-    if( p->writableSchema ){
-+-      raw_printf(p->out, "PRAGMA writable_schema=OFF;\n");
-+-      p->writableSchema = 0;
-+-    }
-+-    sqlite3_exec(p->db, "PRAGMA writable_schema=OFF;", 0, 0, 0);
-+-    sqlite3_exec(p->db, "RELEASE dump;", 0, 0, 0);
-+-    raw_printf(p->out, p->nErr ? "ROLLBACK; -- due to errors\n" : "COMMIT;\n");
-+-    p->showHeader = savedShowHeader;
-+-  }else
-+-
-+-  if( c=='e' && strncmp(azArg[0], "echo", n)==0 ){
-+-    if( nArg==2 ){
-+-      setOrClearFlag(p, SHFLG_Echo, azArg[1]);
-+-    }else{
-+-      raw_printf(stderr, "Usage: .echo on|off\n");
-+-      rc = 1;
-+-    }
-+-  }else
-+-
-+-  if( c=='e' && strncmp(azArg[0], "eqp", n)==0 ){
-+-    if( nArg==2 ){
-+-      if( strcmp(azArg[1],"full")==0 ){
-+-        p->autoEQP = 2;
-+-      }else{
-+-        p->autoEQP = booleanValue(azArg[1]);
-+-      }
-+-    }else{
-+-      raw_printf(stderr, "Usage: .eqp on|off|full\n");
-+-      rc = 1;
-+-    }
-+-  }else
-+-
-+-  if( c=='e' && strncmp(azArg[0], "exit", n)==0 ){
-+-    if( nArg>1 && (rc = (int)integerValue(azArg[1]))!=0 ) exit(rc);
-+-    rc = 2;
-+-  }else
-+-
-+-  /* The ".explain" command is automatic now.  It is largely pointless.  It
-+-  ** retained purely for backwards compatibility */
-+-  if( c=='e' && strncmp(azArg[0], "explain", n)==0 ){
-+-    int val = 1;
-+-    if( nArg>=2 ){
-+-      if( strcmp(azArg[1],"auto")==0 ){
-+-        val = 99;
-+-      }else{
-+-        val =  booleanValue(azArg[1]);
-+-      }
-+-    }
-+-    if( val==1 && p->mode!=MODE_Explain ){
-+-      p->normalMode = p->mode;
-+-      p->mode = MODE_Explain;
-+-      p->autoExplain = 0;
-+-    }else if( val==0 ){
-+-      if( p->mode==MODE_Explain ) p->mode = p->normalMode;
-+-      p->autoExplain = 0;
-+-    }else if( val==99 ){
-+-      if( p->mode==MODE_Explain ) p->mode = p->normalMode;
-+-      p->autoExplain = 1;
-+-    }
-+-  }else
-+-
-+-  if( c=='f' && strncmp(azArg[0], "fullschema", n)==0 ){
-+-    ShellState data;
-+-    char *zErrMsg = 0;
-+-    int doStats = 0;
-+-    memcpy(&data, p, sizeof(data));
-+-    data.showHeader = 0;
-+-    data.cMode = data.mode = MODE_Semi;
-+-    if( nArg==2 && optionMatch(azArg[1], "indent") ){
-+-      data.cMode = data.mode = MODE_Pretty;
-+-      nArg = 1;
-+-    }
-+-    if( nArg!=1 ){
-+-      raw_printf(stderr, "Usage: .fullschema ?--indent?\n");
-+-      rc = 1;
-+-      goto meta_command_exit;
-+-    }
-+-    open_db(p, 0);
-+-    rc = sqlite3_exec(p->db,
-+-       "SELECT sql FROM"
-+-       "  (SELECT sql sql, type type, tbl_name tbl_name, name name, rowid x"
-+-       "     FROM sqlite_master UNION ALL"
-+-       "   SELECT sql, type, tbl_name, name, rowid FROM sqlite_temp_master) "
-+-       "WHERE type!='meta' AND sql NOTNULL AND name NOT LIKE 'sqlite_%' "
-+-       "ORDER BY rowid",
-+-       callback, &data, &zErrMsg
-+-    );
-+-    if( rc==SQLITE_OK ){
-+-      sqlite3_stmt *pStmt;
-+-      rc = sqlite3_prepare_v2(p->db,
-+-               "SELECT rowid FROM sqlite_master"
-+-               " WHERE name GLOB 'sqlite_stat[134]'",
-+-               -1, &pStmt, 0);
-+-      doStats = sqlite3_step(pStmt)==SQLITE_ROW;
-+-      sqlite3_finalize(pStmt);
-+-    }
-+-    if( doStats==0 ){
-+-      raw_printf(p->out, "/* No STAT tables available */\n");
-+-    }else{
-+-      raw_printf(p->out, "ANALYZE sqlite_master;\n");
-+-      sqlite3_exec(p->db, "SELECT 'ANALYZE sqlite_master'",
-+-                   callback, &data, &zErrMsg);
-+-      data.cMode = data.mode = MODE_Insert;
-+-      data.zDestTable = "sqlite_stat1";
-+-      shell_exec(p->db, "SELECT * FROM sqlite_stat1",
-+-                 shell_callback, &data,&zErrMsg);
-+-      data.zDestTable = "sqlite_stat3";
-+-      shell_exec(p->db, "SELECT * FROM sqlite_stat3",
-+-                 shell_callback, &data,&zErrMsg);
-+-      data.zDestTable = "sqlite_stat4";
-+-      shell_exec(p->db, "SELECT * FROM sqlite_stat4",
-+-                 shell_callback, &data, &zErrMsg);
-+-      raw_printf(p->out, "ANALYZE sqlite_master;\n");
-+-    }
-+-  }else
-+-
-+-  if( c=='h' && strncmp(azArg[0], "headers", n)==0 ){
-+-    if( nArg==2 ){
-+-      p->showHeader = booleanValue(azArg[1]);
-+-    }else{
-+-      raw_printf(stderr, "Usage: .headers on|off\n");
-+-      rc = 1;
-+-    }
-+-  }else
-+-
-+-  if( c=='h' && strncmp(azArg[0], "help", n)==0 ){
-+-    utf8_printf(p->out, "%s", zHelp);
-+-  }else
-+-
-+-  if( c=='i' && strncmp(azArg[0], "import", n)==0 ){
-+-    char *zTable;               /* Insert data into this table */
-+-    char *zFile;                /* Name of file to extra content from */
-+-    sqlite3_stmt *pStmt = NULL; /* A statement */
-+-    int nCol;                   /* Number of columns in the table */
-+-    int nByte;                  /* Number of bytes in an SQL string */
-+-    int i, j;                   /* Loop counters */
-+-    int needCommit;             /* True to COMMIT or ROLLBACK at end */
-+-    int nSep;                   /* Number of bytes in p->colSeparator[] */
-+-    char *zSql;                 /* An SQL statement */
-+-    ImportCtx sCtx;             /* Reader context */
-+-    char *(SQLITE_CDECL *xRead)(ImportCtx*); /* Func to read one value */
-+-    int (SQLITE_CDECL *xCloser)(FILE*);      /* Func to close file */
-+-
-+-    if( nArg!=3 ){
-+-      raw_printf(stderr, "Usage: .import FILE TABLE\n");
-+-      goto meta_command_exit;
-+-    }
-+-    zFile = azArg[1];
-+-    zTable = azArg[2];
-+-    seenInterrupt = 0;
-+-    memset(&sCtx, 0, sizeof(sCtx));
-+-    open_db(p, 0);
-+-    nSep = strlen30(p->colSeparator);
-+-    if( nSep==0 ){
-+-      raw_printf(stderr,
-+-                 "Error: non-null column separator required for import\n");
-+-      return 1;
-+-    }
-+-    if( nSep>1 ){
-+-      raw_printf(stderr, "Error: multi-character column separators not allowed"
-+-                      " for import\n");
-+-      return 1;
-+-    }
-+-    nSep = strlen30(p->rowSeparator);
-+-    if( nSep==0 ){
-+-      raw_printf(stderr, "Error: non-null row separator required for import\n");
-+-      return 1;
-+-    }
-+-    if( nSep==2 && p->mode==MODE_Csv && strcmp(p->rowSeparator, SEP_CrLf)==0 ){
-+-      /* When importing CSV (only), if the row separator is set to the
-+-      ** default output row separator, change it to the default input
-+-      ** row separator.  This avoids having to maintain different input
-+-      ** and output row separators. */
-+-      sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_Row);
-+-      nSep = strlen30(p->rowSeparator);
-+-    }
-+-    if( nSep>1 ){
-+-      raw_printf(stderr, "Error: multi-character row separators not allowed"
-+-                      " for import\n");
-+-      return 1;
-+-    }
-+-    sCtx.zFile = zFile;
-+-    sCtx.nLine = 1;
-+-    if( sCtx.zFile[0]=='|' ){
-+-#ifdef SQLITE_OMIT_POPEN
-+-      raw_printf(stderr, "Error: pipes are not supported in this OS\n");
-+-      return 1;
-+-#else
-+-      sCtx.in = popen(sCtx.zFile+1, "r");
-+-      sCtx.zFile = "<pipe>";
-+-      xCloser = pclose;
-+-#endif
-+-    }else{
-+-      sCtx.in = fopen(sCtx.zFile, "rb");
-+-      xCloser = fclose;
-+-    }
-+-    if( p->mode==MODE_Ascii ){
-+-      xRead = ascii_read_one_field;
-+-    }else{
-+-      xRead = csv_read_one_field;
-+-    }
-+-    if( sCtx.in==0 ){
-+-      utf8_printf(stderr, "Error: cannot open \"%s\"\n", zFile);
-+-      return 1;
-+-    }
-+-    sCtx.cColSep = p->colSeparator[0];
-+-    sCtx.cRowSep = p->rowSeparator[0];
-+-    zSql = sqlite3_mprintf("SELECT * FROM %s", zTable);
-+-    if( zSql==0 ){
-+-      raw_printf(stderr, "Error: out of memory\n");
-+-      xCloser(sCtx.in);
-+-      return 1;
-+-    }
-+-    nByte = strlen30(zSql);
-+-    rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
-+-    import_append_char(&sCtx, 0);    /* To ensure sCtx.z is allocated */
-+-    if( rc && sqlite3_strglob("no such table: *", sqlite3_errmsg(p->db))==0 ){
-+-      char *zCreate = sqlite3_mprintf("CREATE TABLE %s", zTable);
-+-      char cSep = '(';
-+-      while( xRead(&sCtx) ){
-+-        zCreate = sqlite3_mprintf("%z%c\n  \"%w\" TEXT", zCreate, cSep, sCtx.z);
-+-        cSep = ',';
-+-        if( sCtx.cTerm!=sCtx.cColSep ) break;
-+-      }
-+-      if( cSep=='(' ){
-+-        sqlite3_free(zCreate);
-+-        sqlite3_free(sCtx.z);
-+-        xCloser(sCtx.in);
-+-        utf8_printf(stderr,"%s: empty file\n", sCtx.zFile);
-+-        return 1;
-+-      }
-+-      zCreate = sqlite3_mprintf("%z\n)", zCreate);
-+-      rc = sqlite3_exec(p->db, zCreate, 0, 0, 0);
-+-      sqlite3_free(zCreate);
-+-      if( rc ){
-+-        utf8_printf(stderr, "CREATE TABLE %s(...) failed: %s\n", zTable,
-+-                sqlite3_errmsg(p->db));
-+-        sqlite3_free(sCtx.z);
-+-        xCloser(sCtx.in);
-+-        return 1;
-+-      }
-+-      rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
-+-    }
-+-    sqlite3_free(zSql);
-+-    if( rc ){
-+-      if (pStmt) sqlite3_finalize(pStmt);
-+-      utf8_printf(stderr,"Error: %s\n", sqlite3_errmsg(p->db));
-+-      xCloser(sCtx.in);
-+-      return 1;
-+-    }
-+-    nCol = sqlite3_column_count(pStmt);
-+-    sqlite3_finalize(pStmt);
-+-    pStmt = 0;
-+-    if( nCol==0 ) return 0; /* no columns, no error */
-+-    zSql = sqlite3_malloc64( nByte*2 + 20 + nCol*2 );
-+-    if( zSql==0 ){
-+-      raw_printf(stderr, "Error: out of memory\n");
-+-      xCloser(sCtx.in);
-+-      return 1;
-+-    }
-+-    sqlite3_snprintf(nByte+20, zSql, "INSERT INTO \"%w\" VALUES(?", zTable);
-+-    j = strlen30(zSql);
-+-    for(i=1; i<nCol; i++){
-+-      zSql[j++] = ',';
-+-      zSql[j++] = '?';
-+-    }
-+-    zSql[j++] = ')';
-+-    zSql[j] = 0;
-+-    rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
-+-    sqlite3_free(zSql);
-+-    if( rc ){
-+-      utf8_printf(stderr, "Error: %s\n", sqlite3_errmsg(p->db));
-+-      if (pStmt) sqlite3_finalize(pStmt);
-+-      xCloser(sCtx.in);
-+-      return 1;
-+-    }
-+-    needCommit = sqlite3_get_autocommit(p->db);
-+-    if( needCommit ) sqlite3_exec(p->db, "BEGIN", 0, 0, 0);
-+-    do{
-+-      int startLine = sCtx.nLine;
-+-      for(i=0; i<nCol; i++){
-+-        char *z = xRead(&sCtx);
-+-        /*
-+-        ** Did we reach end-of-file before finding any columns?
-+-        ** If so, stop instead of NULL filling the remaining columns.
-+-        */
-+-        if( z==0 && i==0 ) break;
-+-        /*
-+-        ** Did we reach end-of-file OR end-of-line before finding any
-+-        ** columns in ASCII mode?  If so, stop instead of NULL filling
-+-        ** the remaining columns.
-+-        */
-+-        if( p->mode==MODE_Ascii && (z==0 || z[0]==0) && i==0 ) break;
-+-        sqlite3_bind_text(pStmt, i+1, z, -1, SQLITE_TRANSIENT);
-+-        if( i<nCol-1 && sCtx.cTerm!=sCtx.cColSep ){
-+-          utf8_printf(stderr, "%s:%d: expected %d columns but found %d - "
-+-                          "filling the rest with NULL\n",
-+-                          sCtx.zFile, startLine, nCol, i+1);
-+-          i += 2;
-+-          while( i<=nCol ){ sqlite3_bind_null(pStmt, i); i++; }
-+-        }
-+-      }
-+-      if( sCtx.cTerm==sCtx.cColSep ){
-+-        do{
-+-          xRead(&sCtx);
-+-          i++;
-+-        }while( sCtx.cTerm==sCtx.cColSep );
-+-        utf8_printf(stderr, "%s:%d: expected %d columns but found %d - "
-+-                        "extras ignored\n",
-+-                        sCtx.zFile, startLine, nCol, i);
-+-      }
-+-      if( i>=nCol ){
-+-        sqlite3_step(pStmt);
-+-        rc = sqlite3_reset(pStmt);
-+-        if( rc!=SQLITE_OK ){
-+-          utf8_printf(stderr, "%s:%d: INSERT failed: %s\n", sCtx.zFile,
-+-                      startLine, sqlite3_errmsg(p->db));
-+-        }
-+-      }
-+-    }while( sCtx.cTerm!=EOF );
-+-
-+-    xCloser(sCtx.in);
-+-    sqlite3_free(sCtx.z);
-+-    sqlite3_finalize(pStmt);
-+-    if( needCommit ) sqlite3_exec(p->db, "COMMIT", 0, 0, 0);
-+-  }else
-+-
-+-#ifndef SQLITE_UNTESTABLE
-+-  if( c=='i' && strncmp(azArg[0], "imposter", n)==0 ){
-+-    char *zSql;
-+-    char *zCollist = 0;
-+-    sqlite3_stmt *pStmt;
-+-    int tnum = 0;
-+-    int i;
-+-    if( nArg!=3 ){
-+-      utf8_printf(stderr, "Usage: .imposter INDEX IMPOSTER\n");
-+-      rc = 1;
-+-      goto meta_command_exit;
-+-    }
-+-    open_db(p, 0);
-+-    zSql = sqlite3_mprintf("SELECT rootpage FROM sqlite_master"
-+-                           " WHERE name='%q' AND type='index'", azArg[1]);
-+-    sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
-+-    sqlite3_free(zSql);
-+-    if( sqlite3_step(pStmt)==SQLITE_ROW ){
-+-      tnum = sqlite3_column_int(pStmt, 0);
-+-    }
-+-    sqlite3_finalize(pStmt);
-+-    if( tnum==0 ){
-+-      utf8_printf(stderr, "no such index: \"%s\"\n", azArg[1]);
-+-      rc = 1;
-+-      goto meta_command_exit;
-+-    }
-+-    zSql = sqlite3_mprintf("PRAGMA index_xinfo='%q'", azArg[1]);
-+-    rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
-+-    sqlite3_free(zSql);
-+-    i = 0;
-+-    while( sqlite3_step(pStmt)==SQLITE_ROW ){
-+-      char zLabel[20];
-+-      const char *zCol = (const char*)sqlite3_column_text(pStmt,2);
-+-      i++;
-+-      if( zCol==0 ){
-+-        if( sqlite3_column_int(pStmt,1)==-1 ){
-+-          zCol = "_ROWID_";
-+-        }else{
-+-          sqlite3_snprintf(sizeof(zLabel),zLabel,"expr%d",i);
-+-          zCol = zLabel;
-+-        }
-+-      }
-+-      if( zCollist==0 ){
-+-        zCollist = sqlite3_mprintf("\"%w\"", zCol);
-+-      }else{
-+-        zCollist = sqlite3_mprintf("%z,\"%w\"", zCollist, zCol);
-+-      }
-+-    }
-+-    sqlite3_finalize(pStmt);
-+-    zSql = sqlite3_mprintf(
-+-          "CREATE TABLE \"%w\"(%s,PRIMARY KEY(%s))WITHOUT ROWID",
-+-          azArg[2], zCollist, zCollist);
-+-    sqlite3_free(zCollist);
-+-    rc = sqlite3_test_control(SQLITE_TESTCTRL_IMPOSTER, p->db, "main", 1, tnum);
-+-    if( rc==SQLITE_OK ){
-+-      rc = sqlite3_exec(p->db, zSql, 0, 0, 0);
-+-      sqlite3_test_control(SQLITE_TESTCTRL_IMPOSTER, p->db, "main", 0, 0);
-+-      if( rc ){
-+-        utf8_printf(stderr, "Error in [%s]: %s\n", zSql, sqlite3_errmsg(p->db));
-+-      }else{
-+-        utf8_printf(stdout, "%s;\n", zSql);
-+-        raw_printf(stdout,
-+-           "WARNING: writing to an imposter table will corrupt the index!\n"
-+-        );
-+-      }
-+-    }else{
-+-      raw_printf(stderr, "SQLITE_TESTCTRL_IMPOSTER returns %d\n", rc);
-+-      rc = 1;
-+-    }
-+-    sqlite3_free(zSql);
-+-  }else
-+-#endif /* !defined(SQLITE_OMIT_TEST_CONTROL) */
-+-
-+-#ifdef SQLITE_ENABLE_IOTRACE
-+-  if( c=='i' && strncmp(azArg[0], "iotrace", n)==0 ){
-+-    SQLITE_API extern void (SQLITE_CDECL *sqlite3IoTrace)(const char*, ...);
-+-    if( iotrace && iotrace!=stdout ) fclose(iotrace);
-+-    iotrace = 0;
-+-    if( nArg<2 ){
-+-      sqlite3IoTrace = 0;
-+-    }else if( strcmp(azArg[1], "-")==0 ){
-+-      sqlite3IoTrace = iotracePrintf;
-+-      iotrace = stdout;
-+-    }else{
-+-      iotrace = fopen(azArg[1], "w");
-+-      if( iotrace==0 ){
-+-        utf8_printf(stderr, "Error: cannot open \"%s\"\n", azArg[1]);
-+-        sqlite3IoTrace = 0;
-+-        rc = 1;
-+-      }else{
-+-        sqlite3IoTrace = iotracePrintf;
-+-      }
-+-    }
-+-  }else
-+-#endif
-+-
-+-  if( c=='l' && n>=5 && strncmp(azArg[0], "limits", n)==0 ){
-+-    static const struct {
-+-       const char *zLimitName;   /* Name of a limit */
-+-       int limitCode;            /* Integer code for that limit */
-+-    } aLimit[] = {
-+-      { "length",                SQLITE_LIMIT_LENGTH                    },
-+-      { "sql_length",            SQLITE_LIMIT_SQL_LENGTH                },
-+-      { "column",                SQLITE_LIMIT_COLUMN                    },
-+-      { "expr_depth",            SQLITE_LIMIT_EXPR_DEPTH                },
-+-      { "compound_select",       SQLITE_LIMIT_COMPOUND_SELECT           },
-+-      { "vdbe_op",               SQLITE_LIMIT_VDBE_OP                   },
-+-      { "function_arg",          SQLITE_LIMIT_FUNCTION_ARG              },
-+-      { "attached",              SQLITE_LIMIT_ATTACHED                  },
-+-      { "like_pattern_length",   SQLITE_LIMIT_LIKE_PATTERN_LENGTH       },
-+-      { "variable_number",       SQLITE_LIMIT_VARIABLE_NUMBER           },
-+-      { "trigger_depth",         SQLITE_LIMIT_TRIGGER_DEPTH             },
-+-      { "worker_threads",        SQLITE_LIMIT_WORKER_THREADS            },
-+-    };
-+-    int i, n2;
-+-    open_db(p, 0);
-+-    if( nArg==1 ){
-+-      for(i=0; i<ArraySize(aLimit); i++){
-+-        printf("%20s %d\n", aLimit[i].zLimitName,
-+-               sqlite3_limit(p->db, aLimit[i].limitCode, -1));
-+-      }
-+-    }else if( nArg>3 ){
-+-      raw_printf(stderr, "Usage: .limit NAME ?NEW-VALUE?\n");
-+-      rc = 1;
-+-      goto meta_command_exit;
-+-    }else{
-+-      int iLimit = -1;
-+-      n2 = strlen30(azArg[1]);
-+-      for(i=0; i<ArraySize(aLimit); i++){
-+-        if( sqlite3_strnicmp(aLimit[i].zLimitName, azArg[1], n2)==0 ){
-+-          if( iLimit<0 ){
-+-            iLimit = i;
-+-          }else{
-+-            utf8_printf(stderr, "ambiguous limit: \"%s\"\n", azArg[1]);
-+-            rc = 1;
-+-            goto meta_command_exit;
-+-          }
-+-        }
-+-      }
-+-      if( iLimit<0 ){
-+-        utf8_printf(stderr, "unknown limit: \"%s\"\n"
-+-                        "enter \".limits\" with no arguments for a list.\n",
-+-                         azArg[1]);
-+-        rc = 1;
-+-        goto meta_command_exit;
-+-      }
-+-      if( nArg==3 ){
-+-        sqlite3_limit(p->db, aLimit[iLimit].limitCode,
-+-                      (int)integerValue(azArg[2]));
-+-      }
-+-      printf("%20s %d\n", aLimit[iLimit].zLimitName,
-+-             sqlite3_limit(p->db, aLimit[iLimit].limitCode, -1));
-+-    }
-+-  }else
-+-
-+-  if( c=='l' && n>2 && strncmp(azArg[0], "lint", n)==0 ){
-+-    open_db(p, 0);
-+-    lintDotCommand(p, azArg, nArg);
-+-  }else
-+-
-+-#ifndef SQLITE_OMIT_LOAD_EXTENSION
-+-  if( c=='l' && strncmp(azArg[0], "load", n)==0 ){
-+-    const char *zFile, *zProc;
-+-    char *zErrMsg = 0;
-+-    if( nArg<2 ){
-+-      raw_printf(stderr, "Usage: .load FILE ?ENTRYPOINT?\n");
-+-      rc = 1;
-+-      goto meta_command_exit;
-+-    }
-+-    zFile = azArg[1];
-+-    zProc = nArg>=3 ? azArg[2] : 0;
-+-    open_db(p, 0);
-+-    rc = sqlite3_load_extension(p->db, zFile, zProc, &zErrMsg);
-+-    if( rc!=SQLITE_OK ){
-+-      utf8_printf(stderr, "Error: %s\n", zErrMsg);
-+-      sqlite3_free(zErrMsg);
-+-      rc = 1;
-+-    }
-+-  }else
-+-#endif
-+-
-+-  if( c=='l' && strncmp(azArg[0], "log", n)==0 ){
-+-    if( nArg!=2 ){
-+-      raw_printf(stderr, "Usage: .log FILENAME\n");
-+-      rc = 1;
-+-    }else{
-+-      const char *zFile = azArg[1];
-+-      output_file_close(p->pLog);
-+-      p->pLog = output_file_open(zFile);
-+-    }
-+-  }else
-+-
-+-  if( c=='m' && strncmp(azArg[0], "mode", n)==0 ){
-+-    const char *zMode = nArg>=2 ? azArg[1] : "";
-+-    int n2 = (int)strlen(zMode);
-+-    int c2 = zMode[0];
-+-    if( c2=='l' && n2>2 && strncmp(azArg[1],"lines",n2)==0 ){
-+-      p->mode = MODE_Line;
-+-      sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_Row);
-+-    }else if( c2=='c' && strncmp(azArg[1],"columns",n2)==0 ){
-+-      p->mode = MODE_Column;
-+-      sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_Row);
-+-    }else if( c2=='l' && n2>2 && strncmp(azArg[1],"list",n2)==0 ){
-+-      p->mode = MODE_List;
-+-      sqlite3_snprintf(sizeof(p->colSeparator), p->colSeparator, SEP_Column);
-+-      sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_Row);
-+-    }else if( c2=='h' && strncmp(azArg[1],"html",n2)==0 ){
-+-      p->mode = MODE_Html;
-+-    }else if( c2=='t' && strncmp(azArg[1],"tcl",n2)==0 ){
-+-      p->mode = MODE_Tcl;
-+-      sqlite3_snprintf(sizeof(p->colSeparator), p->colSeparator, SEP_Space);
-+-      sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_Row);
-+-    }else if( c2=='c' && strncmp(azArg[1],"csv",n2)==0 ){
-+-      p->mode = MODE_Csv;
-+-      sqlite3_snprintf(sizeof(p->colSeparator), p->colSeparator, SEP_Comma);
-+-      sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_CrLf);
-+-    }else if( c2=='t' && strncmp(azArg[1],"tabs",n2)==0 ){
-+-      p->mode = MODE_List;
-+-      sqlite3_snprintf(sizeof(p->colSeparator), p->colSeparator, SEP_Tab);
-+-    }else if( c2=='i' && strncmp(azArg[1],"insert",n2)==0 ){
-+-      p->mode = MODE_Insert;
-+-      set_table_name(p, nArg>=3 ? azArg[2] : "table");
-+-    }else if( c2=='q' && strncmp(azArg[1],"quote",n2)==0 ){
-+-      p->mode = MODE_Quote;
-+-    }else if( c2=='a' && strncmp(azArg[1],"ascii",n2)==0 ){
-+-      p->mode = MODE_Ascii;
-+-      sqlite3_snprintf(sizeof(p->colSeparator), p->colSeparator, SEP_Unit);
-+-      sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_Record);
-+-    }else if( nArg==1 ){
-+-      raw_printf(p->out, "current output mode: %s\n", modeDescr[p->mode]);
-+-    }else{
-+-      raw_printf(stderr, "Error: mode should be one of: "
-+-         "ascii column csv html insert line list quote tabs tcl\n");
-+-      rc = 1;
-+-    }
-+-    p->cMode = p->mode;
-+-  }else
-+-
-+-  if( c=='n' && strncmp(azArg[0], "nullvalue", n)==0 ){
-+-    if( nArg==2 ){
-+-      sqlite3_snprintf(sizeof(p->nullValue), p->nullValue,
-+-                       "%.*s", (int)ArraySize(p->nullValue)-1, azArg[1]);
-+-    }else{
-+-      raw_printf(stderr, "Usage: .nullvalue STRING\n");
-+-      rc = 1;
-+-    }
-+-  }else
-+-
-+-  if( c=='o' && strncmp(azArg[0], "open", n)==0 && n>=2 ){
-+-    char *zNewFilename;  /* Name of the database file to open */
-+-    int iName = 1;       /* Index in azArg[] of the filename */
-+-    int newFlag = 0;     /* True to delete file before opening */
-+-    /* Close the existing database */
-+-    session_close_all(p);
-+-    sqlite3_close(p->db);
-+-    p->db = 0;
-+-    p->zDbFilename = 0;
-+-    sqlite3_free(p->zFreeOnClose);
-+-    p->zFreeOnClose = 0;
-+-    /* Check for command-line arguments */
-+-    for(iName=1; iName<nArg && azArg[iName][0]=='-'; iName++){
-+-      const char *z = azArg[iName];
-+-      if( optionMatch(z,"new") ){
-+-        newFlag = 1;
-+-      }else if( z[0]=='-' ){
-+-        utf8_printf(stderr, "unknown option: %s\n", z);
-+-        rc = 1;
-+-        goto meta_command_exit;
-+-      }
-+-    }
-+-    /* If a filename is specified, try to open it first */
-+-    zNewFilename = nArg>iName ? sqlite3_mprintf("%s", azArg[iName]) : 0;
-+-    if( zNewFilename ){
-+-      if( newFlag ) shellDeleteFile(zNewFilename);
-+-      p->zDbFilename = zNewFilename;
-+-      open_db(p, 1);
-+-      if( p->db==0 ){
-+-        utf8_printf(stderr, "Error: cannot open '%s'\n", zNewFilename);
-+-        sqlite3_free(zNewFilename);
-+-      }else{
-+-        p->zFreeOnClose = zNewFilename;
-+-      }
-+-    }
-+-    if( p->db==0 ){
-+-      /* As a fall-back open a TEMP database */
-+-      p->zDbFilename = 0;
-+-      open_db(p, 0);
-+-    }
-+-  }else
-+-
-+-  if( c=='o'
-+-   && (strncmp(azArg[0], "output", n)==0 || strncmp(azArg[0], "once", n)==0)
-+-  ){
-+-    const char *zFile = nArg>=2 ? azArg[1] : "stdout";
-+-    if( nArg>2 ){
-+-      utf8_printf(stderr, "Usage: .%s FILE\n", azArg[0]);
-+-      rc = 1;
-+-      goto meta_command_exit;
-+-    }
-+-    if( n>1 && strncmp(azArg[0], "once", n)==0 ){
-+-      if( nArg<2 ){
-+-        raw_printf(stderr, "Usage: .once FILE\n");
-+-        rc = 1;
-+-        goto meta_command_exit;
-+-      }
-+-      p->outCount = 2;
-+-    }else{
-+-      p->outCount = 0;
-+-    }
-+-    output_reset(p);
-+-    if( zFile[0]=='|' ){
-+-#ifdef SQLITE_OMIT_POPEN
-+-      raw_printf(stderr, "Error: pipes are not supported in this OS\n");
-+-      rc = 1;
-+-      p->out = stdout;
-+-#else
-+-      p->out = popen(zFile + 1, "w");
-+-      if( p->out==0 ){
-+-        utf8_printf(stderr,"Error: cannot open pipe \"%s\"\n", zFile + 1);
-+-        p->out = stdout;
-+-        rc = 1;
-+-      }else{
-+-        sqlite3_snprintf(sizeof(p->outfile), p->outfile, "%s", zFile);
-+-      }
-+-#endif
-+-    }else{
-+-      p->out = output_file_open(zFile);
-+-      if( p->out==0 ){
-+-        if( strcmp(zFile,"off")!=0 ){
-+-          utf8_printf(stderr,"Error: cannot write to \"%s\"\n", zFile);
-+-        }
-+-        p->out = stdout;
-+-        rc = 1;
-+-      } else {
-+-        sqlite3_snprintf(sizeof(p->outfile), p->outfile, "%s", zFile);
-+-      }
-+-    }
-+-  }else
-+-
-+-  if( c=='p' && n>=3 && strncmp(azArg[0], "print", n)==0 ){
-+-    int i;
-+-    for(i=1; i<nArg; i++){
-+-      if( i>1 ) raw_printf(p->out, " ");
-+-      utf8_printf(p->out, "%s", azArg[i]);
-+-    }
-+-    raw_printf(p->out, "\n");
-+-  }else
-+-
-+-  if( c=='p' && strncmp(azArg[0], "prompt", n)==0 ){
-+-    if( nArg >= 2) {
-+-      strncpy(mainPrompt,azArg[1],(int)ArraySize(mainPrompt)-1);
-+-    }
-+-    if( nArg >= 3) {
-+-      strncpy(continuePrompt,azArg[2],(int)ArraySize(continuePrompt)-1);
-+-    }
-+-  }else
-+-
-+-  if( c=='q' && strncmp(azArg[0], "quit", n)==0 ){
-+-    rc = 2;
-+-  }else
-+-
-+-  if( c=='r' && n>=3 && strncmp(azArg[0], "read", n)==0 ){
-+-    FILE *alt;
-+-    if( nArg!=2 ){
-+-      raw_printf(stderr, "Usage: .read FILE\n");
-+-      rc = 1;
-+-      goto meta_command_exit;
-+-    }
-+-    alt = fopen(azArg[1], "rb");
-+-    if( alt==0 ){
-+-      utf8_printf(stderr,"Error: cannot open \"%s\"\n", azArg[1]);
-+-      rc = 1;
-+-    }else{
-+-      rc = process_input(p, alt);
-+-      fclose(alt);
-+-    }
-+-  }else
-+-
-+-  if( c=='r' && n>=3 && strncmp(azArg[0], "restore", n)==0 ){
-+-    const char *zSrcFile;
-+-    const char *zDb;
-+-    sqlite3 *pSrc;
-+-    sqlite3_backup *pBackup;
-+-    int nTimeout = 0;
-+-
-+-    if( nArg==2 ){
-+-      zSrcFile = azArg[1];
-+-      zDb = "main";
-+-    }else if( nArg==3 ){
-+-      zSrcFile = azArg[2];
-+-      zDb = azArg[1];
-+-    }else{
-+-      raw_printf(stderr, "Usage: .restore ?DB? FILE\n");
-+-      rc = 1;
-+-      goto meta_command_exit;
-+-    }
-+-    rc = sqlite3_open(zSrcFile, &pSrc);
-+-    if( rc!=SQLITE_OK ){
-+-      utf8_printf(stderr, "Error: cannot open \"%s\"\n", zSrcFile);
-+-      sqlite3_close(pSrc);
-+-      return 1;
-+-    }
-+-    open_db(p, 0);
-+-    pBackup = sqlite3_backup_init(p->db, zDb, pSrc, "main");
-+-    if( pBackup==0 ){
-+-      utf8_printf(stderr, "Error: %s\n", sqlite3_errmsg(p->db));
-+-      sqlite3_close(pSrc);
-+-      return 1;
-+-    }
-+-    while( (rc = sqlite3_backup_step(pBackup,100))==SQLITE_OK
-+-          || rc==SQLITE_BUSY  ){
-+-      if( rc==SQLITE_BUSY ){
-+-        if( nTimeout++ >= 3 ) break;
-+-        sqlite3_sleep(100);
-+-      }
-+-    }
-+-    sqlite3_backup_finish(pBackup);
-+-    if( rc==SQLITE_DONE ){
-+-      rc = 0;
-+-    }else if( rc==SQLITE_BUSY || rc==SQLITE_LOCKED ){
-+-      raw_printf(stderr, "Error: source database is busy\n");
-+-      rc = 1;
-+-    }else{
-+-      utf8_printf(stderr, "Error: %s\n", sqlite3_errmsg(p->db));
-+-      rc = 1;
-+-    }
-+-    sqlite3_close(pSrc);
-+-  }else
-+-
-+-
-+-  if( c=='s' && strncmp(azArg[0], "scanstats", n)==0 ){
-+-    if( nArg==2 ){
-+-      p->scanstatsOn = booleanValue(azArg[1]);
-+-#ifndef SQLITE_ENABLE_STMT_SCANSTATUS
-+-      raw_printf(stderr, "Warning: .scanstats not available in this build.\n");
-+-#endif
-+-    }else{
-+-      raw_printf(stderr, "Usage: .scanstats on|off\n");
-+-      rc = 1;
-+-    }
-+-  }else
-+-
-+-  if( c=='s' && strncmp(azArg[0], "schema", n)==0 ){
-+-    ShellText sSelect;
-+-    ShellState data;
-+-    char *zErrMsg = 0;
-+-    const char *zDiv = 0;
-+-    int iSchema = 0;
-+-
-+-    open_db(p, 0);
-+-    memcpy(&data, p, sizeof(data));
-+-    data.showHeader = 0;
-+-    data.cMode = data.mode = MODE_Semi;
-+-    initText(&sSelect);
-+-    if( nArg>=2 && optionMatch(azArg[1], "indent") ){
-+-      data.cMode = data.mode = MODE_Pretty;
-+-      nArg--;
-+-      if( nArg==2 ) azArg[1] = azArg[2];
-+-    }
-+-    if( nArg==2 && azArg[1][0]!='-' ){
-+-      int i;
-+-      for(i=0; azArg[1][i]; i++) azArg[1][i] = ToLower(azArg[1][i]);
-+-      if( strcmp(azArg[1],"sqlite_master")==0 ){
-+-        char *new_argv[2], *new_colv[2];
-+-        new_argv[0] = "CREATE TABLE sqlite_master (\n"
-+-                      "  type text,\n"
-+-                      "  name text,\n"
-+-                      "  tbl_name text,\n"
-+-                      "  rootpage integer,\n"
-+-                      "  sql text\n"
-+-                      ")";
-+-        new_argv[1] = 0;
-+-        new_colv[0] = "sql";
-+-        new_colv[1] = 0;
-+-        callback(&data, 1, new_argv, new_colv);
-+-        rc = SQLITE_OK;
-+-      }else if( strcmp(azArg[1],"sqlite_temp_master")==0 ){
-+-        char *new_argv[2], *new_colv[2];
-+-        new_argv[0] = "CREATE TEMP TABLE sqlite_temp_master (\n"
-+-                      "  type text,\n"
-+-                      "  name text,\n"
-+-                      "  tbl_name text,\n"
-+-                      "  rootpage integer,\n"
-+-                      "  sql text\n"
-+-                      ")";
-+-        new_argv[1] = 0;
-+-        new_colv[0] = "sql";
-+-        new_colv[1] = 0;
-+-        callback(&data, 1, new_argv, new_colv);
-+-        rc = SQLITE_OK;
-+-      }else{
-+-        zDiv = "(";
-+-      }
-+-    }else if( nArg==1 ){
-+-      zDiv = "(";
-+-    }else{
-+-      raw_printf(stderr, "Usage: .schema ?--indent? ?LIKE-PATTERN?\n");
-+-      rc = 1;
-+-      goto meta_command_exit;
-+-    }
-+-    if( zDiv ){
-+-      sqlite3_stmt *pStmt = 0;
-+-      rc = sqlite3_prepare_v2(p->db, "SELECT name FROM pragma_database_list",
-+-                              -1, &pStmt, 0);
-+-      if( rc ){
-+-        utf8_printf(stderr, "Error: %s\n", sqlite3_errmsg(p->db));
-+-        sqlite3_finalize(pStmt);
-+-        rc = 1;
-+-        goto meta_command_exit;
-+-      }
-+-      appendText(&sSelect, "SELECT sql FROM", 0);
-+-      iSchema = 0;
-+-      while( sqlite3_step(pStmt)==SQLITE_ROW ){
-+-        const char *zDb = (const char*)sqlite3_column_text(pStmt, 0);
-+-        char zScNum[30];
-+-        sqlite3_snprintf(sizeof(zScNum), zScNum, "%d", ++iSchema);
-+-        appendText(&sSelect, zDiv, 0);
-+-        zDiv = " UNION ALL ";
-+-        if( strcmp(zDb, "main")!=0 ){
-+-          appendText(&sSelect, "SELECT shell_add_schema(sql,", 0);
-+-          appendText(&sSelect, zDb, '"');
-+-          appendText(&sSelect, ") AS sql, type, tbl_name, name, rowid,", 0);
-+-          appendText(&sSelect, zScNum, 0);
-+-          appendText(&sSelect, " AS snum, ", 0);
-+-          appendText(&sSelect, zDb, '\'');
-+-          appendText(&sSelect, " AS sname FROM ", 0);
-+-          appendText(&sSelect, zDb, '"');
-+-          appendText(&sSelect, ".sqlite_master", 0);
-+-        }else{
-+-          appendText(&sSelect, "SELECT sql, type, tbl_name, name, rowid, ", 0);
-+-          appendText(&sSelect, zScNum, 0);
-+-          appendText(&sSelect, " AS snum, 'main' AS sname FROM sqlite_master",0);
-+-        }
-+-      }
-+-      sqlite3_finalize(pStmt);
-+-      appendText(&sSelect, ") WHERE ", 0);
-+-      if( nArg>1 ){
-+-        char *zQarg = sqlite3_mprintf("%Q", azArg[1]);
-+-        if( strchr(azArg[1], '.') ){
-+-          appendText(&sSelect, "lower(printf('%s.%s',sname,tbl_name))", 0);
-+-        }else{
-+-          appendText(&sSelect, "lower(tbl_name)", 0);
-+-        }
-+-        appendText(&sSelect, strchr(azArg[1], '*') ? " GLOB " : " LIKE ", 0);
-+-        appendText(&sSelect, zQarg, 0);
-+-        appendText(&sSelect, " AND ", 0);
-+-        sqlite3_free(zQarg);
-+-      }
-+-      appendText(&sSelect, "type!='meta' AND sql IS NOT NULL"
-+-                           " ORDER BY snum, rowid", 0);
-+-      rc = sqlite3_exec(p->db, sSelect.z, callback, &data, &zErrMsg);
-+-      freeText(&sSelect);
-+-    }
-+-    if( zErrMsg ){
-+-      utf8_printf(stderr,"Error: %s\n", zErrMsg);
-+-      sqlite3_free(zErrMsg);
-+-      rc = 1;
-+-    }else if( rc != SQLITE_OK ){
-+-      raw_printf(stderr,"Error: querying schema information\n");
-+-      rc = 1;
-+-    }else{
-+-      rc = 0;
-+-    }
-+-  }else
-+-
-+-#if defined(SQLITE_DEBUG) && defined(SQLITE_ENABLE_SELECTTRACE)
-+-  if( c=='s' && n==11 && strncmp(azArg[0], "selecttrace", n)==0 ){
-+-    sqlite3SelectTrace = (int)integerValue(azArg[1]);
-+-  }else
-+-#endif
-+-
-+-#if defined(SQLITE_ENABLE_SESSION)
-+-  if( c=='s' && strncmp(azArg[0],"session",n)==0 && n>=3 ){
-+-    OpenSession *pSession = &p->aSession[0];
-+-    char **azCmd = &azArg[1];
-+-    int iSes = 0;
-+-    int nCmd = nArg - 1;
-+-    int i;
-+-    if( nArg<=1 ) goto session_syntax_error;
-+-    open_db(p, 0);
-+-    if( nArg>=3 ){
-+-      for(iSes=0; iSes<p->nSession; iSes++){
-+-        if( strcmp(p->aSession[iSes].zName, azArg[1])==0 ) break;
-+-      }
-+-      if( iSes<p->nSession ){
-+-        pSession = &p->aSession[iSes];
-+-        azCmd++;
-+-        nCmd--;
-+-      }else{
-+-        pSession = &p->aSession[0];
-+-        iSes = 0;
-+-      }
-+-    }
-+-
-+-    /* .session attach TABLE
-+-    ** Invoke the sqlite3session_attach() interface to attach a particular
-+-    ** table so that it is never filtered.
-+-    */
-+-    if( strcmp(azCmd[0],"attach")==0 ){
-+-      if( nCmd!=2 ) goto session_syntax_error;
-+-      if( pSession->p==0 ){
-+-        session_not_open:
-+-        raw_printf(stderr, "ERROR: No sessions are open\n");
-+-      }else{
-+-        rc = sqlite3session_attach(pSession->p, azCmd[1]);
-+-        if( rc ){
-+-          raw_printf(stderr, "ERROR: sqlite3session_attach() returns %d\n", rc);
-+-          rc = 0;
-+-        }
-+-      }
-+-    }else
-+-
-+-    /* .session changeset FILE
-+-    ** .session patchset FILE
-+-    ** Write a changeset or patchset into a file.  The file is overwritten.
-+-    */
-+-    if( strcmp(azCmd[0],"changeset")==0 || strcmp(azCmd[0],"patchset")==0 ){
-+-      FILE *out = 0;
-+-      if( nCmd!=2 ) goto session_syntax_error;
-+-      if( pSession->p==0 ) goto session_not_open;
-+-      out = fopen(azCmd[1], "wb");
-+-      if( out==0 ){
-+-        utf8_printf(stderr, "ERROR: cannot open \"%s\" for writing\n", azCmd[1]);
-+-      }else{
-+-        int szChng;
-+-        void *pChng;
-+-        if( azCmd[0][0]=='c' ){
-+-          rc = sqlite3session_changeset(pSession->p, &szChng, &pChng);
-+-        }else{
-+-          rc = sqlite3session_patchset(pSession->p, &szChng, &pChng);
-+-        }
-+-        if( rc ){
-+-          printf("Error: error code %d\n", rc);
-+-          rc = 0;
-+-        }
-+-        if( pChng
-+-          && fwrite(pChng, szChng, 1, out)!=1 ){
-+-          raw_printf(stderr, "ERROR: Failed to write entire %d-byte output\n",
-+-                  szChng);
-+-        }
-+-        sqlite3_free(pChng);
-+-        fclose(out);
-+-      }
-+-    }else
-+-
-+-    /* .session close
-+-    ** Close the identified session
-+-    */
-+-    if( strcmp(azCmd[0], "close")==0 ){
-+-      if( nCmd!=1 ) goto session_syntax_error;
-+-      if( p->nSession ){
-+-        session_close(pSession);
-+-        p->aSession[iSes] = p->aSession[--p->nSession];
-+-      }
-+-    }else
-+-
-+-    /* .session enable ?BOOLEAN?
-+-    ** Query or set the enable flag
-+-    */
-+-    if( strcmp(azCmd[0], "enable")==0 ){
-+-      int ii;
-+-      if( nCmd>2 ) goto session_syntax_error;
-+-      ii = nCmd==1 ? -1 : booleanValue(azCmd[1]);
-+-      if( p->nSession ){
-+-        ii = sqlite3session_enable(pSession->p, ii);
-+-        utf8_printf(p->out, "session %s enable flag = %d\n",
-+-                    pSession->zName, ii);
-+-      }
-+-    }else
-+-
-+-    /* .session filter GLOB ....
-+-    ** Set a list of GLOB patterns of table names to be excluded.
-+-    */
-+-    if( strcmp(azCmd[0], "filter")==0 ){
-+-      int ii, nByte;
-+-      if( nCmd<2 ) goto session_syntax_error;
-+-      if( p->nSession ){
-+-        for(ii=0; ii<pSession->nFilter; ii++){
-+-          sqlite3_free(pSession->azFilter[ii]);
-+-        }
-+-        sqlite3_free(pSession->azFilter);
-+-        nByte = sizeof(pSession->azFilter[0])*(nCmd-1);
-+-        pSession->azFilter = sqlite3_malloc( nByte );
-+-        if( pSession->azFilter==0 ){
-+-          raw_printf(stderr, "Error: out or memory\n");
-+-          exit(1);
-+-        }
-+-        for(ii=1; ii<nCmd; ii++){
-+-          pSession->azFilter[ii-1] = sqlite3_mprintf("%s", azCmd[ii]);
-+-        }
-+-        pSession->nFilter = ii-1;
-+-      }
-+-    }else
-+-
-+-    /* .session indirect ?BOOLEAN?
-+-    ** Query or set the indirect flag
-+-    */
-+-    if( strcmp(azCmd[0], "indirect")==0 ){
-+-      int ii;
-+-      if( nCmd>2 ) goto session_syntax_error;
-+-      ii = nCmd==1 ? -1 : booleanValue(azCmd[1]);
-+-      if( p->nSession ){
-+-        ii = sqlite3session_indirect(pSession->p, ii);
-+-        utf8_printf(p->out, "session %s indirect flag = %d\n",
-+-                    pSession->zName, ii);
-+-      }
-+-    }else
-+-
-+-    /* .session isempty
-+-    ** Determine if the session is empty
-+-    */
-+-    if( strcmp(azCmd[0], "isempty")==0 ){
-+-      int ii;
-+-      if( nCmd!=1 ) goto session_syntax_error;
-+-      if( p->nSession ){
-+-        ii = sqlite3session_isempty(pSession->p);
-+-        utf8_printf(p->out, "session %s isempty flag = %d\n",
-+-                    pSession->zName, ii);
-+-      }
-+-    }else
-+-
-+-    /* .session list
-+-    ** List all currently open sessions
-+-    */
-+-    if( strcmp(azCmd[0],"list")==0 ){
-+-      for(i=0; i<p->nSession; i++){
-+-        utf8_printf(p->out, "%d %s\n", i, p->aSession[i].zName);
-+-      }
-+-    }else
-+-
-+-    /* .session open DB NAME
-+-    ** Open a new session called NAME on the attached database DB.
-+-    ** DB is normally "main".
-+-    */
-+-    if( strcmp(azCmd[0],"open")==0 ){
-+-      char *zName;
-+-      if( nCmd!=3 ) goto session_syntax_error;
-+-      zName = azCmd[2];
-+-      if( zName[0]==0 ) goto session_syntax_error;
-+-      for(i=0; i<p->nSession; i++){
-+-        if( strcmp(p->aSession[i].zName,zName)==0 ){
-+-          utf8_printf(stderr, "Session \"%s\" already exists\n", zName);
-+-          goto meta_command_exit;
-+-        }
-+-      }
-+-      if( p->nSession>=ArraySize(p->aSession) ){
-+-        raw_printf(stderr, "Maximum of %d sessions\n", ArraySize(p->aSession));
-+-        goto meta_command_exit;
-+-      }
-+-      pSession = &p->aSession[p->nSession];
-+-      rc = sqlite3session_create(p->db, azCmd[1], &pSession->p);
-+-      if( rc ){
-+-        raw_printf(stderr, "Cannot open session: error code=%d\n", rc);
-+-        rc = 0;
-+-        goto meta_command_exit;
-+-      }
-+-      pSession->nFilter = 0;
-+-      sqlite3session_table_filter(pSession->p, session_filter, pSession);
-+-      p->nSession++;
-+-      pSession->zName = sqlite3_mprintf("%s", zName);
-+-    }else
-+-    /* If no command name matches, show a syntax error */
-+-    session_syntax_error:
-+-    session_help(p);
-+-  }else
-+-#endif
-+-
-+-#ifdef SQLITE_DEBUG
-+-  /* Undocumented commands for internal testing.  Subject to change
-+-  ** without notice. */
-+-  if( c=='s' && n>=10 && strncmp(azArg[0], "selftest-", 9)==0 ){
-+-    if( strncmp(azArg[0]+9, "boolean", n-9)==0 ){
-+-      int i, v;
-+-      for(i=1; i<nArg; i++){
-+-        v = booleanValue(azArg[i]);
-+-        utf8_printf(p->out, "%s: %d 0x%x\n", azArg[i], v, v);
-+-      }
-+-    }
-+-    if( strncmp(azArg[0]+9, "integer", n-9)==0 ){
-+-      int i; sqlite3_int64 v;
-+-      for(i=1; i<nArg; i++){
-+-        char zBuf[200];
-+-        v = integerValue(azArg[i]);
-+-        sqlite3_snprintf(sizeof(zBuf),zBuf,"%s: %lld 0x%llx\n", azArg[i],v,v);
-+-        utf8_printf(p->out, "%s", zBuf);
-+-      }
-+-    }
-+-  }else
-+-#endif
-+-
-+-  if( c=='s' && n>=4 && strncmp(azArg[0],"selftest",n)==0 ){
-+-    int bIsInit = 0;         /* True to initialize the SELFTEST table */
-+-    int bVerbose = 0;        /* Verbose output */
-+-    int bSelftestExists;     /* True if SELFTEST already exists */
-+-    int i, k;                /* Loop counters */
-+-    int nTest = 0;           /* Number of tests runs */
-+-    int nErr = 0;            /* Number of errors seen */
-+-    ShellText str;           /* Answer for a query */
-+-    sqlite3_stmt *pStmt = 0; /* Query against the SELFTEST table */
-+-
-+-    open_db(p,0);
-+-    for(i=1; i<nArg; i++){
-+-      const char *z = azArg[i];
-+-      if( z[0]=='-' && z[1]=='-' ) z++;
-+-      if( strcmp(z,"-init")==0 ){
-+-        bIsInit = 1;
-+-      }else
-+-      if( strcmp(z,"-v")==0 ){
-+-        bVerbose++;
-+-      }else
-+-      {
-+-        utf8_printf(stderr, "Unknown option \"%s\" on \"%s\"\n",
-+-                    azArg[i], azArg[0]);
-+-        raw_printf(stderr, "Should be one of: --init -v\n");
-+-        rc = 1;
-+-        goto meta_command_exit;
-+-      }
-+-    }
-+-    if( sqlite3_table_column_metadata(p->db,"main","selftest",0,0,0,0,0,0)
-+-           != SQLITE_OK ){
-+-      bSelftestExists = 0;
-+-    }else{
-+-      bSelftestExists = 1;
-+-    }
-+-    if( bIsInit ){
-+-      createSelftestTable(p);
-+-      bSelftestExists = 1;
-+-    }
-+-    initText(&str);
-+-    appendText(&str, "x", 0);
-+-    for(k=bSelftestExists; k>=0; k--){
-+-      if( k==1 ){
-+-        rc = sqlite3_prepare_v2(p->db,
-+-            "SELECT tno,op,cmd,ans FROM selftest ORDER BY tno",
-+-            -1, &pStmt, 0);
-+-      }else{
-+-        rc = sqlite3_prepare_v2(p->db,
-+-          "VALUES(0,'memo','Missing SELFTEST table - default checks only',''),"
-+-          "      (1,'run','PRAGMA integrity_check','ok')",
-+-          -1, &pStmt, 0);
-+-      }
-+-      if( rc ){
-+-        raw_printf(stderr, "Error querying the selftest table\n");
-+-        rc = 1;
-+-        sqlite3_finalize(pStmt);
-+-        goto meta_command_exit;
-+-      }
-+-      for(i=1; sqlite3_step(pStmt)==SQLITE_ROW; i++){
-+-        int tno = sqlite3_column_int(pStmt, 0);
-+-        const char *zOp = (const char*)sqlite3_column_text(pStmt, 1);
-+-        const char *zSql = (const char*)sqlite3_column_text(pStmt, 2);
-+-        const char *zAns = (const char*)sqlite3_column_text(pStmt, 3);
-+-
-+-        k = 0;
-+-        if( bVerbose>0 ){
-+-          char *zQuote = sqlite3_mprintf("%q", zSql);
-+-          printf("%d: %s %s\n", tno, zOp, zSql);
-+-          sqlite3_free(zQuote);
-+-        }
-+-        if( strcmp(zOp,"memo")==0 ){
-+-          utf8_printf(p->out, "%s\n", zSql);
-+-        }else
-+-        if( strcmp(zOp,"run")==0 ){
-+-          char *zErrMsg = 0;
-+-          str.n = 0;
-+-          str.z[0] = 0;
-+-          rc = sqlite3_exec(p->db, zSql, captureOutputCallback, &str, &zErrMsg);
-+-          nTest++;
-+-          if( bVerbose ){
-+-            utf8_printf(p->out, "Result: %s\n", str.z);
-+-          }
-+-          if( rc || zErrMsg ){
-+-            nErr++;
-+-            rc = 1;
-+-            utf8_printf(p->out, "%d: error-code-%d: %s\n", tno, rc, zErrMsg);
-+-            sqlite3_free(zErrMsg);
-+-          }else if( strcmp(zAns,str.z)!=0 ){
-+-            nErr++;
-+-            rc = 1;
-+-            utf8_printf(p->out, "%d: Expected: [%s]\n", tno, zAns);
-+-            utf8_printf(p->out, "%d:      Got: [%s]\n", tno, str.z);
-+-          }
-+-        }else
-+-        {
-+-          utf8_printf(stderr,
-+-            "Unknown operation \"%s\" on selftest line %d\n", zOp, tno);
-+-          rc = 1;
-+-          break;
-+-        }
-+-      } /* End loop over rows of content from SELFTEST */
-+-      sqlite3_finalize(pStmt);
-+-    } /* End loop over k */
-+-    freeText(&str);
-+-    utf8_printf(p->out, "%d errors out of %d tests\n", nErr, nTest);
-+-  }else
-+-
-+-  if( c=='s' && strncmp(azArg[0], "separator", n)==0 ){
-+-    if( nArg<2 || nArg>3 ){
-+-      raw_printf(stderr, "Usage: .separator COL ?ROW?\n");
-+-      rc = 1;
-+-    }
-+-    if( nArg>=2 ){
-+-      sqlite3_snprintf(sizeof(p->colSeparator), p->colSeparator,
-+-                       "%.*s", (int)ArraySize(p->colSeparator)-1, azArg[1]);
-+-    }
-+-    if( nArg>=3 ){
-+-      sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator,
-+-                       "%.*s", (int)ArraySize(p->rowSeparator)-1, azArg[2]);
-+-    }
-+-  }else
-+-
-+-  if( c=='s' && n>=4 && strncmp(azArg[0],"sha3sum",n)==0 ){
-+-    const char *zLike = 0;   /* Which table to checksum. 0 means everything */
-+-    int i;                   /* Loop counter */
-+-    int bSchema = 0;         /* Also hash the schema */
-+-    int bSeparate = 0;       /* Hash each table separately */
-+-    int iSize = 224;         /* Hash algorithm to use */
-+-    int bDebug = 0;          /* Only show the query that would have run */
-+-    sqlite3_stmt *pStmt;     /* For querying tables names */
-+-    char *zSql;              /* SQL to be run */
-+-    char *zSep;              /* Separator */
-+-    ShellText sSql;          /* Complete SQL for the query to run the hash */
-+-    ShellText sQuery;        /* Set of queries used to read all content */
-+-    open_db(p, 0);
-+-    for(i=1; i<nArg; i++){
-+-      const char *z = azArg[i];
-+-      if( z[0]=='-' ){
-+-        z++;
-+-        if( z[0]=='-' ) z++;
-+-        if( strcmp(z,"schema")==0 ){
-+-          bSchema = 1;
-+-        }else
-+-        if( strcmp(z,"sha3-224")==0 || strcmp(z,"sha3-256")==0
-+-         || strcmp(z,"sha3-384")==0 || strcmp(z,"sha3-512")==0
-+-        ){
-+-          iSize = atoi(&z[5]);
-+-        }else
-+-        if( strcmp(z,"debug")==0 ){
-+-          bDebug = 1;
-+-        }else
-+-        {
-+-          utf8_printf(stderr, "Unknown option \"%s\" on \"%s\"\n",
-+-                      azArg[i], azArg[0]);
-+-          raw_printf(stderr, "Should be one of: --schema"
-+-                             " --sha3-224 --sha3-255 --sha3-384 --sha3-512\n");
-+-          rc = 1;
-+-          goto meta_command_exit;
-+-        }
-+-      }else if( zLike ){
-+-        raw_printf(stderr, "Usage: .sha3sum ?OPTIONS? ?LIKE-PATTERN?\n");
-+-        rc = 1;
-+-        goto meta_command_exit;
-+-      }else{
-+-        zLike = z;
-+-        bSeparate = 1;
-+-        if( sqlite3_strlike("sqlite_%", zLike, 0)==0 ) bSchema = 1;
-+-      }
-+-    }
-+-    if( bSchema ){
-+-      zSql = "SELECT lower(name) FROM sqlite_master"
-+-             " WHERE type='table' AND coalesce(rootpage,0)>1"
-+-             " UNION ALL SELECT 'sqlite_master'"
-+-             " ORDER BY 1 collate nocase";
-+-    }else{
-+-      zSql = "SELECT lower(name) FROM sqlite_master"
-+-             " WHERE type='table' AND coalesce(rootpage,0)>1"
-+-             " AND name NOT LIKE 'sqlite_%'"
-+-             " ORDER BY 1 collate nocase";
-+-    }
-+-    sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
-+-    initText(&sQuery);
-+-    initText(&sSql);
-+-    appendText(&sSql, "WITH [sha3sum$query](a,b) AS(",0);
-+-    zSep = "VALUES(";
-+-    while( SQLITE_ROW==sqlite3_step(pStmt) ){
-+-      const char *zTab = (const char*)sqlite3_column_text(pStmt,0);
-+-      if( zLike && sqlite3_strlike(zLike, zTab, 0)!=0 ) continue;
-+-      if( strncmp(zTab, "sqlite_",7)!=0 ){
-+-        appendText(&sQuery,"SELECT * FROM ", 0);
-+-        appendText(&sQuery,zTab,'"');
-+-        appendText(&sQuery," NOT INDEXED;", 0);
-+-      }else if( strcmp(zTab, "sqlite_master")==0 ){
-+-        appendText(&sQuery,"SELECT type,name,tbl_name,sql FROM sqlite_master"
-+-                           " ORDER BY name;", 0);
-+-      }else if( strcmp(zTab, "sqlite_sequence")==0 ){
-+-        appendText(&sQuery,"SELECT name,seq FROM sqlite_sequence"
-+-                           " ORDER BY name;", 0);
-+-      }else if( strcmp(zTab, "sqlite_stat1")==0 ){
-+-        appendText(&sQuery,"SELECT tbl,idx,stat FROM sqlite_stat1"
-+-                           " ORDER BY tbl,idx;", 0);
-+-      }else if( strcmp(zTab, "sqlite_stat3")==0
-+-             || strcmp(zTab, "sqlite_stat4")==0 ){
-+-        appendText(&sQuery, "SELECT * FROM ", 0);
-+-        appendText(&sQuery, zTab, 0);
-+-        appendText(&sQuery, " ORDER BY tbl, idx, rowid;\n", 0);
-+-      }
-+-      appendText(&sSql, zSep, 0);
-+-      appendText(&sSql, sQuery.z, '\'');
-+-      sQuery.n = 0;
-+-      appendText(&sSql, ",", 0);
-+-      appendText(&sSql, zTab, '\'');
-+-      zSep = "),(";
-+-    }
-+-    sqlite3_finalize(pStmt);
-+-    if( bSeparate ){
-+-      zSql = sqlite3_mprintf(
-+-          "%s))"
-+-          " SELECT lower(hex(sha3_query(a,%d))) AS hash, b AS label"
-+-          "   FROM [sha3sum$query]",
-+-          sSql.z, iSize);
-+-    }else{
-+-      zSql = sqlite3_mprintf(
-+-          "%s))"
-+-          " SELECT lower(hex(sha3_query(group_concat(a,''),%d))) AS hash"
-+-          "   FROM [sha3sum$query]",
-+-          sSql.z, iSize);
-+-    }
-+-    freeText(&sQuery);
-+-    freeText(&sSql);
-+-    if( bDebug ){
-+-      utf8_printf(p->out, "%s\n", zSql);
-+-    }else{
-+-      shell_exec(p->db, zSql, shell_callback, p, 0);
-+-    }
-+-    sqlite3_free(zSql);
-+-  }else
-+-
-+-  if( c=='s'
-+-   && (strncmp(azArg[0], "shell", n)==0 || strncmp(azArg[0],"system",n)==0)
-+-  ){
-+-    char *zCmd;
-+-    int i, x;
-+-    if( nArg<2 ){
-+-      raw_printf(stderr, "Usage: .system COMMAND\n");
-+-      rc = 1;
-+-      goto meta_command_exit;
-+-    }
-+-    zCmd = sqlite3_mprintf(strchr(azArg[1],' ')==0?"%s":"\"%s\"", azArg[1]);
-+-    for(i=2; i<nArg; i++){
-+-      zCmd = sqlite3_mprintf(strchr(azArg[i],' ')==0?"%z %s":"%z \"%s\"",
-+-                             zCmd, azArg[i]);
-+-    }
-+-    x = system(zCmd);
-+-    sqlite3_free(zCmd);
-+-    if( x ) raw_printf(stderr, "System command returns %d\n", x);
-+-  }else
-+-
-+-  if( c=='s' && strncmp(azArg[0], "show", n)==0 ){
-+-    static const char *azBool[] = { "off", "on", "full", "unk" };
-+-    int i;
-+-    if( nArg!=1 ){
-+-      raw_printf(stderr, "Usage: .show\n");
-+-      rc = 1;
-+-      goto meta_command_exit;
-+-    }
-+-    utf8_printf(p->out, "%12.12s: %s\n","echo",
-+-                                  azBool[ShellHasFlag(p, SHFLG_Echo)]);
-+-    utf8_printf(p->out, "%12.12s: %s\n","eqp", azBool[p->autoEQP&3]);
-+-    utf8_printf(p->out, "%12.12s: %s\n","explain",
-+-         p->mode==MODE_Explain ? "on" : p->autoExplain ? "auto" : "off");
-+-    utf8_printf(p->out,"%12.12s: %s\n","headers", azBool[p->showHeader!=0]);
-+-    utf8_printf(p->out, "%12.12s: %s\n","mode", modeDescr[p->mode]);
-+-    utf8_printf(p->out, "%12.12s: ", "nullvalue");
-+-      output_c_string(p->out, p->nullValue);
-+-      raw_printf(p->out, "\n");
-+-    utf8_printf(p->out,"%12.12s: %s\n","output",
-+-            strlen30(p->outfile) ? p->outfile : "stdout");
-+-    utf8_printf(p->out,"%12.12s: ", "colseparator");
-+-      output_c_string(p->out, p->colSeparator);
-+-      raw_printf(p->out, "\n");
-+-    utf8_printf(p->out,"%12.12s: ", "rowseparator");
-+-      output_c_string(p->out, p->rowSeparator);
-+-      raw_printf(p->out, "\n");
-+-    utf8_printf(p->out, "%12.12s: %s\n","stats", azBool[p->statsOn!=0]);
-+-    utf8_printf(p->out, "%12.12s: ", "width");
-+-    for (i=0;i<(int)ArraySize(p->colWidth) && p->colWidth[i] != 0;i++) {
-+-      raw_printf(p->out, "%d ", p->colWidth[i]);
-+-    }
-+-    raw_printf(p->out, "\n");
-+-    utf8_printf(p->out, "%12.12s: %s\n", "filename",
-+-                p->zDbFilename ? p->zDbFilename : "");
-+-  }else
-+-
-+-  if( c=='s' && strncmp(azArg[0], "stats", n)==0 ){
-+-    if( nArg==2 ){
-+-      p->statsOn = booleanValue(azArg[1]);
-+-    }else if( nArg==1 ){
-+-      display_stats(p->db, p, 0);
-+-    }else{
-+-      raw_printf(stderr, "Usage: .stats ?on|off?\n");
-+-      rc = 1;
-+-    }
-+-  }else
-+-
-+-  if( (c=='t' && n>1 && strncmp(azArg[0], "tables", n)==0)
-+-   || (c=='i' && (strncmp(azArg[0], "indices", n)==0
-+-                 || strncmp(azArg[0], "indexes", n)==0) )
-+-  ){
-+-    sqlite3_stmt *pStmt;
-+-    char **azResult;
-+-    int nRow, nAlloc;
-+-    int ii;
-+-    ShellText s;
-+-    initText(&s);
-+-    open_db(p, 0);
-+-    rc = sqlite3_prepare_v2(p->db, "PRAGMA database_list", -1, &pStmt, 0);
-+-    if( rc ) return shellDatabaseError(p->db);
-+-
-+-    if( nArg>2 && c=='i' ){
-+-      /* It is an historical accident that the .indexes command shows an error
-+-      ** when called with the wrong number of arguments whereas the .tables
-+-      ** command does not. */
-+-      raw_printf(stderr, "Usage: .indexes ?LIKE-PATTERN?\n");
-+-      rc = 1;
-+-      goto meta_command_exit;
-+-    }
-+-    for(ii=0; sqlite3_step(pStmt)==SQLITE_ROW; ii++){
-+-      const char *zDbName = (const char*)sqlite3_column_text(pStmt, 1);
-+-      if( zDbName==0 ) continue;
-+-      if( s.z && s.z[0] ) appendText(&s, " UNION ALL ", 0);
-+-      if( sqlite3_stricmp(zDbName, "main")==0 ){
-+-        appendText(&s, "SELECT name FROM ", 0);
-+-      }else{
-+-        appendText(&s, "SELECT ", 0);
-+-        appendText(&s, zDbName, '\'');
-+-        appendText(&s, "||'.'||name FROM ", 0);
-+-      }
-+-      appendText(&s, zDbName, '"');
-+-      appendText(&s, ".sqlite_master ", 0);
-+-      if( c=='t' ){
-+-        appendText(&s," WHERE type IN ('table','view')"
-+-                      "   AND name NOT LIKE 'sqlite_%'"
-+-                      "   AND name LIKE ?1", 0);
-+-      }else{
-+-        appendText(&s," WHERE type='index'"
-+-                      "   AND tbl_name LIKE ?1", 0);
-+-      }
-+-    }
-+-    rc = sqlite3_finalize(pStmt);
-+-    appendText(&s, " ORDER BY 1", 0);
-+-    rc = sqlite3_prepare_v2(p->db, s.z, -1, &pStmt, 0);
-+-    freeText(&s);
-+-    if( rc ) return shellDatabaseError(p->db);
-+-
-+-    /* Run the SQL statement prepared by the above block. Store the results
-+-    ** as an array of nul-terminated strings in azResult[].  */
-+-    nRow = nAlloc = 0;
-+-    azResult = 0;
-+-    if( nArg>1 ){
-+-      sqlite3_bind_text(pStmt, 1, azArg[1], -1, SQLITE_TRANSIENT);
-+-    }else{
-+-      sqlite3_bind_text(pStmt, 1, "%", -1, SQLITE_STATIC);
-+-    }
-+-    while( sqlite3_step(pStmt)==SQLITE_ROW ){
-+-      if( nRow>=nAlloc ){
-+-        char **azNew;
-+-        int n2 = nAlloc*2 + 10;
-+-        azNew = sqlite3_realloc64(azResult, sizeof(azResult[0])*n2);
-+-        if( azNew==0 ){
-+-          rc = shellNomemError();
-+-          break;
-+-        }
-+-        nAlloc = n2;
-+-        azResult = azNew;
-+-      }
-+-      azResult[nRow] = sqlite3_mprintf("%s", sqlite3_column_text(pStmt, 0));
-+-      if( 0==azResult[nRow] ){
-+-        rc = shellNomemError();
-+-        break;
-+-      }
-+-      nRow++;
-+-    }
-+-    if( sqlite3_finalize(pStmt)!=SQLITE_OK ){
-+-      rc = shellDatabaseError(p->db);
-+-    }
-+-
-+-    /* Pretty-print the contents of array azResult[] to the output */
-+-    if( rc==0 && nRow>0 ){
-+-      int len, maxlen = 0;
-+-      int i, j;
-+-      int nPrintCol, nPrintRow;
-+-      for(i=0; i<nRow; i++){
-+-        len = strlen30(azResult[i]);
-+-        if( len>maxlen ) maxlen = len;
-+-      }
-+-      nPrintCol = 80/(maxlen+2);
-+-      if( nPrintCol<1 ) nPrintCol = 1;
-+-      nPrintRow = (nRow + nPrintCol - 1)/nPrintCol;
-+-      for(i=0; i<nPrintRow; i++){
-+-        for(j=i; j<nRow; j+=nPrintRow){
-+-          char *zSp = j<nPrintRow ? "" : "  ";
-+-          utf8_printf(p->out, "%s%-*s", zSp, maxlen,
-+-                      azResult[j] ? azResult[j]:"");
-+-        }
-+-        raw_printf(p->out, "\n");
-+-      }
-+-    }
-+-
-+-    for(ii=0; ii<nRow; ii++) sqlite3_free(azResult[ii]);
-+-    sqlite3_free(azResult);
-+-  }else
-+-
-+-  /* Begin redirecting output to the file "testcase-out.txt" */
-+-  if( c=='t' && strcmp(azArg[0],"testcase")==0 ){
-+-    output_reset(p);
-+-    p->out = output_file_open("testcase-out.txt");
-+-    if( p->out==0 ){
-+-      raw_printf(stderr, "Error: cannot open 'testcase-out.txt'\n");
-+-    }
-+-    if( nArg>=2 ){
-+-      sqlite3_snprintf(sizeof(p->zTestcase), p->zTestcase, "%s", azArg[1]);
-+-    }else{
-+-      sqlite3_snprintf(sizeof(p->zTestcase), p->zTestcase, "?");
-+-    }
-+-  }else
-+-
-+-#ifndef SQLITE_UNTESTABLE
-+-  if( c=='t' && n>=8 && strncmp(azArg[0], "testctrl", n)==0 && nArg>=2 ){
-+-    static const struct {
-+-       const char *zCtrlName;   /* Name of a test-control option */
-+-       int ctrlCode;            /* Integer code for that option */
-+-    } aCtrl[] = {
-+-      { "prng_save",             SQLITE_TESTCTRL_PRNG_SAVE              },
-+-      { "prng_restore",          SQLITE_TESTCTRL_PRNG_RESTORE           },
-+-      { "prng_reset",            SQLITE_TESTCTRL_PRNG_RESET             },
-+-      { "bitvec_test",           SQLITE_TESTCTRL_BITVEC_TEST            },
-+-      { "fault_install",         SQLITE_TESTCTRL_FAULT_INSTALL          },
-+-      { "benign_malloc_hooks",   SQLITE_TESTCTRL_BENIGN_MALLOC_HOOKS    },
-+-      { "pending_byte",          SQLITE_TESTCTRL_PENDING_BYTE           },
-+-      { "assert",                SQLITE_TESTCTRL_ASSERT                 },
-+-      { "always",                SQLITE_TESTCTRL_ALWAYS                 },
-+-      { "reserve",               SQLITE_TESTCTRL_RESERVE                },
-+-      { "optimizations",         SQLITE_TESTCTRL_OPTIMIZATIONS          },
-+-      { "iskeyword",             SQLITE_TESTCTRL_ISKEYWORD              },
-+-      { "byteorder",             SQLITE_TESTCTRL_BYTEORDER              },
-+-      { "never_corrupt",         SQLITE_TESTCTRL_NEVER_CORRUPT          },
-+-      { "imposter",              SQLITE_TESTCTRL_IMPOSTER               },
-+-    };
-+-    int testctrl = -1;
-+-    int rc2 = 0;
-+-    int i, n2;
-+-    open_db(p, 0);
-+-
-+-    /* convert testctrl text option to value. allow any unique prefix
-+-    ** of the option name, or a numerical value. */
-+-    n2 = strlen30(azArg[1]);
-+-    for(i=0; i<ArraySize(aCtrl); i++){
-+-      if( strncmp(azArg[1], aCtrl[i].zCtrlName, n2)==0 ){
-+-        if( testctrl<0 ){
-+-          testctrl = aCtrl[i].ctrlCode;
-+-        }else{
-+-          utf8_printf(stderr, "ambiguous option name: \"%s\"\n", azArg[1]);
-+-          testctrl = -1;
-+-          break;
-+-        }
-+-      }
-+-    }
-+-    if( testctrl<0 ) testctrl = (int)integerValue(azArg[1]);
-+-    if( (testctrl<SQLITE_TESTCTRL_FIRST) || (testctrl>SQLITE_TESTCTRL_LAST) ){
-+-      utf8_printf(stderr,"Error: invalid testctrl option: %s\n", azArg[1]);
-+-    }else{
-+-      switch(testctrl){
-+-
-+-        /* sqlite3_test_control(int, db, int) */
-+-        case SQLITE_TESTCTRL_OPTIMIZATIONS:
-+-        case SQLITE_TESTCTRL_RESERVE:
-+-          if( nArg==3 ){
-+-            int opt = (int)strtol(azArg[2], 0, 0);
-+-            rc2 = sqlite3_test_control(testctrl, p->db, opt);
-+-            raw_printf(p->out, "%d (0x%08x)\n", rc2, rc2);
-+-          } else {
-+-            utf8_printf(stderr,"Error: testctrl %s takes a single int option\n",
-+-                    azArg[1]);
-+-          }
-+-          break;
-+-
-+-        /* sqlite3_test_control(int) */
-+-        case SQLITE_TESTCTRL_PRNG_SAVE:
-+-        case SQLITE_TESTCTRL_PRNG_RESTORE:
-+-        case SQLITE_TESTCTRL_PRNG_RESET:
-+-        case SQLITE_TESTCTRL_BYTEORDER:
-+-          if( nArg==2 ){
-+-            rc2 = sqlite3_test_control(testctrl);
-+-            raw_printf(p->out, "%d (0x%08x)\n", rc2, rc2);
-+-          } else {
-+-            utf8_printf(stderr,"Error: testctrl %s takes no options\n",
-+-                        azArg[1]);
-+-          }
-+-          break;
-+-
-+-        /* sqlite3_test_control(int, uint) */
-+-        case SQLITE_TESTCTRL_PENDING_BYTE:
-+-          if( nArg==3 ){
-+-            unsigned int opt = (unsigned int)integerValue(azArg[2]);
-+-            rc2 = sqlite3_test_control(testctrl, opt);
-+-            raw_printf(p->out, "%d (0x%08x)\n", rc2, rc2);
-+-          } else {
-+-            utf8_printf(stderr,"Error: testctrl %s takes a single unsigned"
-+-                           " int option\n", azArg[1]);
-+-          }
-+-          break;
-+-
-+-        /* sqlite3_test_control(int, int) */
-+-        case SQLITE_TESTCTRL_ASSERT:
-+-        case SQLITE_TESTCTRL_ALWAYS:
-+-        case SQLITE_TESTCTRL_NEVER_CORRUPT:
-+-          if( nArg==3 ){
-+-            int opt = booleanValue(azArg[2]);
-+-            rc2 = sqlite3_test_control(testctrl, opt);
-+-            raw_printf(p->out, "%d (0x%08x)\n", rc2, rc2);
-+-          } else {
-+-            utf8_printf(stderr,"Error: testctrl %s takes a single int option\n",
-+-                            azArg[1]);
-+-          }
-+-          break;
-+-
-+-        /* sqlite3_test_control(int, char *) */
-+-#ifdef SQLITE_N_KEYWORD
-+-        case SQLITE_TESTCTRL_ISKEYWORD:
-+-          if( nArg==3 ){
-+-            const char *opt = azArg[2];
-+-            rc2 = sqlite3_test_control(testctrl, opt);
-+-            raw_printf(p->out, "%d (0x%08x)\n", rc2, rc2);
-+-          } else {
-+-            utf8_printf(stderr,
-+-                        "Error: testctrl %s takes a single char * option\n",
-+-                        azArg[1]);
-+-          }
-+-          break;
-+-#endif
-+-
-+-        case SQLITE_TESTCTRL_IMPOSTER:
-+-          if( nArg==5 ){
-+-            rc2 = sqlite3_test_control(testctrl, p->db,
-+-                          azArg[2],
-+-                          integerValue(azArg[3]),
-+-                          integerValue(azArg[4]));
-+-            raw_printf(p->out, "%d (0x%08x)\n", rc2, rc2);
-+-          }else{
-+-            raw_printf(stderr,"Usage: .testctrl imposter dbName onoff tnum\n");
-+-          }
-+-          break;
-+-
-+-        case SQLITE_TESTCTRL_BITVEC_TEST:
-+-        case SQLITE_TESTCTRL_FAULT_INSTALL:
-+-        case SQLITE_TESTCTRL_BENIGN_MALLOC_HOOKS:
-+-        default:
-+-          utf8_printf(stderr,
-+-                      "Error: CLI support for testctrl %s not implemented\n",
-+-                      azArg[1]);
-+-          break;
-+-      }
-+-    }
-+-  }else
-+-#endif /* !defined(SQLITE_UNTESTABLE) */
-+-
-+-  if( c=='t' && n>4 && strncmp(azArg[0], "timeout", n)==0 ){
-+-    open_db(p, 0);
-+-    sqlite3_busy_timeout(p->db, nArg>=2 ? (int)integerValue(azArg[1]) : 0);
-+-  }else
-+-
-+-  if( c=='t' && n>=5 && strncmp(azArg[0], "timer", n)==0 ){
-+-    if( nArg==2 ){
-+-      enableTimer = booleanValue(azArg[1]);
-+-      if( enableTimer && !HAS_TIMER ){
-+-        raw_printf(stderr, "Error: timer not available on this system.\n");
-+-        enableTimer = 0;
-+-      }
-+-    }else{
-+-      raw_printf(stderr, "Usage: .timer on|off\n");
-+-      rc = 1;
-+-    }
-+-  }else
-+-
-+-  if( c=='t' && strncmp(azArg[0], "trace", n)==0 ){
-+-    open_db(p, 0);
-+-    if( nArg!=2 ){
-+-      raw_printf(stderr, "Usage: .trace FILE|off\n");
-+-      rc = 1;
-+-      goto meta_command_exit;
-+-    }
-+-    output_file_close(p->traceOut);
-+-    p->traceOut = output_file_open(azArg[1]);
-+-#if !defined(SQLITE_OMIT_TRACE) && !defined(SQLITE_OMIT_FLOATING_POINT)
-+-    if( p->traceOut==0 ){
-+-      sqlite3_trace_v2(p->db, 0, 0, 0);
-+-    }else{
-+-      sqlite3_trace_v2(p->db, SQLITE_TRACE_STMT, sql_trace_callback,p->traceOut);
-+-    }
-+-#endif
-+-  }else
-+-
-+-#if SQLITE_USER_AUTHENTICATION
-+-  if( c=='u' && strncmp(azArg[0], "user", n)==0 ){
-+-    if( nArg<2 ){
-+-      raw_printf(stderr, "Usage: .user SUBCOMMAND ...\n");
-+-      rc = 1;
-+-      goto meta_command_exit;
-+-    }
-+-    open_db(p, 0);
-+-    if( strcmp(azArg[1],"login")==0 ){
-+-      if( nArg!=4 ){
-+-        raw_printf(stderr, "Usage: .user login USER PASSWORD\n");
-+-        rc = 1;
-+-        goto meta_command_exit;
-+-      }
-+-      rc = sqlite3_user_authenticate(p->db, azArg[2], azArg[3],
-+-                                    (int)strlen(azArg[3]));
-+-      if( rc ){
-+-        utf8_printf(stderr, "Authentication failed for user %s\n", azArg[2]);
-+-        rc = 1;
-+-      }
-+-    }else if( strcmp(azArg[1],"add")==0 ){
-+-      if( nArg!=5 ){
-+-        raw_printf(stderr, "Usage: .user add USER PASSWORD ISADMIN\n");
-+-        rc = 1;
-+-        goto meta_command_exit;
-+-      }
-+-      rc = sqlite3_user_add(p->db, azArg[2],
-+-                            azArg[3], (int)strlen(azArg[3]),
-+-                            booleanValue(azArg[4]));
-+-      if( rc ){
-+-        raw_printf(stderr, "User-Add failed: %d\n", rc);
-+-        rc = 1;
-+-      }
-+-    }else if( strcmp(azArg[1],"edit")==0 ){
-+-      if( nArg!=5 ){
-+-        raw_printf(stderr, "Usage: .user edit USER PASSWORD ISADMIN\n");
-+-        rc = 1;
-+-        goto meta_command_exit;
-+-      }
-+-      rc = sqlite3_user_change(p->db, azArg[2],
-+-                              azArg[3], (int)strlen(azArg[3]),
-+-                              booleanValue(azArg[4]));
-+-      if( rc ){
-+-        raw_printf(stderr, "User-Edit failed: %d\n", rc);
-+-        rc = 1;
-+-      }
-+-    }else if( strcmp(azArg[1],"delete")==0 ){
-+-      if( nArg!=3 ){
-+-        raw_printf(stderr, "Usage: .user delete USER\n");
-+-        rc = 1;
-+-        goto meta_command_exit;
-+-      }
-+-      rc = sqlite3_user_delete(p->db, azArg[2]);
-+-      if( rc ){
-+-        raw_printf(stderr, "User-Delete failed: %d\n", rc);
-+-        rc = 1;
-+-      }
-+-    }else{
-+-      raw_printf(stderr, "Usage: .user login|add|edit|delete ...\n");
-+-      rc = 1;
-+-      goto meta_command_exit;
-+-    }
-+-  }else
-+-#endif /* SQLITE_USER_AUTHENTICATION */
-+-
-+-  if( c=='v' && strncmp(azArg[0], "version", n)==0 ){
-+-    utf8_printf(p->out, "SQLite %s %s\n" /*extra-version-info*/,
-+-        sqlite3_libversion(), sqlite3_sourceid());
-+-  }else
-+-
-+-  if( c=='v' && strncmp(azArg[0], "vfsinfo", n)==0 ){
-+-    const char *zDbName = nArg==2 ? azArg[1] : "main";
-+-    sqlite3_vfs *pVfs = 0;
-+-    if( p->db ){
-+-      sqlite3_file_control(p->db, zDbName, SQLITE_FCNTL_VFS_POINTER, &pVfs);
-+-      if( pVfs ){
-+-        utf8_printf(p->out, "vfs.zName      = \"%s\"\n", pVfs->zName);
-+-        raw_printf(p->out, "vfs.iVersion   = %d\n", pVfs->iVersion);
-+-        raw_printf(p->out, "vfs.szOsFile   = %d\n", pVfs->szOsFile);
-+-        raw_printf(p->out, "vfs.mxPathname = %d\n", pVfs->mxPathname);
-+-      }
-+-    }
-+-  }else
-+-
-+-  if( c=='v' && strncmp(azArg[0], "vfslist", n)==0 ){
-+-    sqlite3_vfs *pVfs;
-+-    sqlite3_vfs *pCurrent = 0;
-+-    if( p->db ){
-+-      sqlite3_file_control(p->db, "main", SQLITE_FCNTL_VFS_POINTER, &pCurrent);
-+-    }
-+-    for(pVfs=sqlite3_vfs_find(0); pVfs; pVfs=pVfs->pNext){
-+-      utf8_printf(p->out, "vfs.zName      = \"%s\"%s\n", pVfs->zName,
-+-           pVfs==pCurrent ? "  <--- CURRENT" : "");
-+-      raw_printf(p->out, "vfs.iVersion   = %d\n", pVfs->iVersion);
-+-      raw_printf(p->out, "vfs.szOsFile   = %d\n", pVfs->szOsFile);
-+-      raw_printf(p->out, "vfs.mxPathname = %d\n", pVfs->mxPathname);
-+-      if( pVfs->pNext ){
-+-        raw_printf(p->out, "-----------------------------------\n");
-+-      }
-+-    }
-+-  }else
-+-
-+-  if( c=='v' && strncmp(azArg[0], "vfsname", n)==0 ){
-+-    const char *zDbName = nArg==2 ? azArg[1] : "main";
-+-    char *zVfsName = 0;
-+-    if( p->db ){
-+-      sqlite3_file_control(p->db, zDbName, SQLITE_FCNTL_VFSNAME, &zVfsName);
-+-      if( zVfsName ){
-+-        utf8_printf(p->out, "%s\n", zVfsName);
-+-        sqlite3_free(zVfsName);
-+-      }
-+-    }
-+-  }else
-+-
-+-#if defined(SQLITE_DEBUG) && defined(SQLITE_ENABLE_WHERETRACE)
-+-  if( c=='w' && strncmp(azArg[0], "wheretrace", n)==0 ){
-+-    sqlite3WhereTrace = nArg>=2 ? booleanValue(azArg[1]) : 0xff;
-+-  }else
-+-#endif
-+-
-+-  if( c=='w' && strncmp(azArg[0], "width", n)==0 ){
-+-    int j;
-+-    assert( nArg<=ArraySize(azArg) );
-+-    for(j=1; j<nArg && j<ArraySize(p->colWidth); j++){
-+-      p->colWidth[j-1] = (int)integerValue(azArg[j]);
-+-    }
-+-  }else
-+-
-+-  {
-+-    utf8_printf(stderr, "Error: unknown command or invalid arguments: "
-+-      " \"%s\". Enter \".help\" for help\n", azArg[0]);
-+-    rc = 1;
-+-  }
-+-
-+-meta_command_exit:
-+-  if( p->outCount ){
-+-    p->outCount--;
-+-    if( p->outCount==0 ) output_reset(p);
-+-  }
-+-  return rc;
-+-}
-+-
-+-/*
-+-** Return TRUE if a semicolon occurs anywhere in the first N characters
-+-** of string z[].
-+-*/
-+-static int line_contains_semicolon(const char *z, int N){
-+-  int i;
-+-  for(i=0; i<N; i++){  if( z[i]==';' ) return 1; }
-+-  return 0;
-+-}
-+-
-+-/*
-+-** Test to see if a line consists entirely of whitespace.
-+-*/
-+-static int _all_whitespace(const char *z){
-+-  for(; *z; z++){
-+-    if( IsSpace(z[0]) ) continue;
-+-    if( *z=='/' && z[1]=='*' ){
-+-      z += 2;
-+-      while( *z && (*z!='*' || z[1]!='/') ){ z++; }
-+-      if( *z==0 ) return 0;
-+-      z++;
-+-      continue;
-+-    }
-+-    if( *z=='-' && z[1]=='-' ){
-+-      z += 2;
-+-      while( *z && *z!='\n' ){ z++; }
-+-      if( *z==0 ) return 1;
-+-      continue;
-+-    }
-+-    return 0;
-+-  }
-+-  return 1;
-+-}
-+-
-+-/*
-+-** Return TRUE if the line typed in is an SQL command terminator other
-+-** than a semi-colon.  The SQL Server style "go" command is understood
-+-** as is the Oracle "/".
-+-*/
-+-static int line_is_command_terminator(const char *zLine){
-+-  while( IsSpace(zLine[0]) ){ zLine++; };
-+-  if( zLine[0]=='/' && _all_whitespace(&zLine[1]) ){
-+-    return 1;  /* Oracle */
-+-  }
-+-  if( ToLower(zLine[0])=='g' && ToLower(zLine[1])=='o'
-+-         && _all_whitespace(&zLine[2]) ){
-+-    return 1;  /* SQL Server */
-+-  }
-+-  return 0;
-+-}
-+-
-+-/*
-+-** Return true if zSql is a complete SQL statement.  Return false if it
-+-** ends in the middle of a string literal or C-style comment.
-+-*/
-+-static int line_is_complete(char *zSql, int nSql){
-+-  int rc;
-+-  if( zSql==0 ) return 1;
-+-  zSql[nSql] = ';';
-+-  zSql[nSql+1] = 0;
-+-  rc = sqlite3_complete(zSql);
-+-  zSql[nSql] = 0;
-+-  return rc;
-+-}
-+-
-+-/*
-+-** Run a single line of SQL
-+-*/
-+-static int runOneSqlLine(ShellState *p, char *zSql, FILE *in, int startline){
-+-  int rc;
-+-  char *zErrMsg = 0;
-+-
-+-  open_db(p, 0);
-+-  if( ShellHasFlag(p,SHFLG_Backslash) ) resolve_backslashes(zSql);
-+-  BEGIN_TIMER;
-+-  rc = shell_exec(p->db, zSql, shell_callback, p, &zErrMsg);
-+-  END_TIMER;
-+-  if( rc || zErrMsg ){
-+-    char zPrefix[100];
-+-    if( in!=0 || !stdin_is_interactive ){
-+-      sqlite3_snprintf(sizeof(zPrefix), zPrefix,
-+-                       "Error: near line %d:", startline);
-+-    }else{
-+-      sqlite3_snprintf(sizeof(zPrefix), zPrefix, "Error:");
-+-    }
-+-    if( zErrMsg!=0 ){
-+-      utf8_printf(stderr, "%s %s\n", zPrefix, zErrMsg);
-+-      sqlite3_free(zErrMsg);
-+-      zErrMsg = 0;
-+-    }else{
-+-      utf8_printf(stderr, "%s %s\n", zPrefix, sqlite3_errmsg(p->db));
-+-    }
-+-    return 1;
-+-  }else if( ShellHasFlag(p, SHFLG_CountChanges) ){
-+-    raw_printf(p->out, "changes: %3d   total_changes: %d\n",
-+-            sqlite3_changes(p->db), sqlite3_total_changes(p->db));
-+-  }
-+-  return 0;
-+-}
-+-
-+-
-+-/*
-+-** Read input from *in and process it.  If *in==0 then input
-+-** is interactive - the user is typing it it.  Otherwise, input
-+-** is coming from a file or device.  A prompt is issued and history
-+-** is saved only if input is interactive.  An interrupt signal will
-+-** cause this routine to exit immediately, unless input is interactive.
-+-**
-+-** Return the number of errors.
-+-*/
-+-static int process_input(ShellState *p, FILE *in){
-+-  char *zLine = 0;          /* A single input line */
-+-  char *zSql = 0;           /* Accumulated SQL text */
-+-  int nLine;                /* Length of current line */
-+-  int nSql = 0;             /* Bytes of zSql[] used */
-+-  int nAlloc = 0;           /* Allocated zSql[] space */
-+-  int nSqlPrior = 0;        /* Bytes of zSql[] used by prior line */
-+-  int rc;                   /* Error code */
-+-  int errCnt = 0;           /* Number of errors seen */
-+-  int lineno = 0;           /* Current line number */
-+-  int startline = 0;        /* Line number for start of current input */
-+-
-+-  while( errCnt==0 || !bail_on_error || (in==0 && stdin_is_interactive) ){
-+-    fflush(p->out);
-+-    zLine = one_input_line(in, zLine, nSql>0);
-+-    if( zLine==0 ){
-+-      /* End of input */
-+-      if( in==0 && stdin_is_interactive ) printf("\n");
-+-      break;
-+-    }
-+-    if( seenInterrupt ){
-+-      if( in!=0 ) break;
-+-      seenInterrupt = 0;
-+-    }
-+-    lineno++;
-+-    if( nSql==0 && _all_whitespace(zLine) ){
-+-      if( ShellHasFlag(p, SHFLG_Echo) ) printf("%s\n", zLine);
-+-      continue;
-+-    }
-+-    if( zLine && zLine[0]=='.' && nSql==0 ){
-+-      if( ShellHasFlag(p, SHFLG_Echo) ) printf("%s\n", zLine);
-+-      rc = do_meta_command(zLine, p);
-+-      if( rc==2 ){ /* exit requested */
-+-        break;
-+-      }else if( rc ){
-+-        errCnt++;
-+-      }
-+-      continue;
-+-    }
-+-    if( line_is_command_terminator(zLine) && line_is_complete(zSql, nSql) ){
-+-      memcpy(zLine,";",2);
-+-    }
-+-    nLine = strlen30(zLine);
-+-    if( nSql+nLine+2>=nAlloc ){
-+-      nAlloc = nSql+nLine+100;
-+-      zSql = realloc(zSql, nAlloc);
-+-      if( zSql==0 ){
-+-        raw_printf(stderr, "Error: out of memory\n");
-+-        exit(1);
-+-      }
-+-    }
-+-    nSqlPrior = nSql;
-+-    if( nSql==0 ){
-+-      int i;
-+-      for(i=0; zLine[i] && IsSpace(zLine[i]); i++){}
-+-      assert( nAlloc>0 && zSql!=0 );
-+-      memcpy(zSql, zLine+i, nLine+1-i);
-+-      startline = lineno;
-+-      nSql = nLine-i;
-+-    }else{
-+-      zSql[nSql++] = '\n';
-+-      memcpy(zSql+nSql, zLine, nLine+1);
-+-      nSql += nLine;
-+-    }
-+-    if( nSql && line_contains_semicolon(&zSql[nSqlPrior], nSql-nSqlPrior)
-+-                && sqlite3_complete(zSql) ){
-+-      errCnt += runOneSqlLine(p, zSql, in, startline);
-+-      nSql = 0;
-+-      if( p->outCount ){
-+-        output_reset(p);
-+-        p->outCount = 0;
-+-      }
-+-    }else if( nSql && _all_whitespace(zSql) ){
-+-      if( ShellHasFlag(p, SHFLG_Echo) ) printf("%s\n", zSql);
-+-      nSql = 0;
-+-    }
-+-  }
-+-  if( nSql && !_all_whitespace(zSql) ){
-+-    runOneSqlLine(p, zSql, in, startline);
-+-  }
-+-  free(zSql);
-+-  free(zLine);
-+-  return errCnt>0;
-+-}
-+-
-+-/*
-+-** Return a pathname which is the user's home directory.  A
-+-** 0 return indicates an error of some kind.
-+-*/
-+-static char *find_home_dir(int clearFlag){
-+-  static char *home_dir = NULL;
-+-  if( clearFlag ){
-+-    free(home_dir);
-+-    home_dir = 0;
-+-    return 0;
-+-  }
-+-  if( home_dir ) return home_dir;
-+-
-+-#if !defined(_WIN32) && !defined(WIN32) && !defined(_WIN32_WCE) \
-+-     && !defined(__RTP__) && !defined(_WRS_KERNEL)
-+-  {
-+-    struct passwd *pwent;
-+-    uid_t uid = getuid();
-+-    if( (pwent=getpwuid(uid)) != NULL) {
-+-      home_dir = pwent->pw_dir;
-+-    }
-+-  }
-+-#endif
-+-
-+-#if defined(_WIN32_WCE)
-+-  /* Windows CE (arm-wince-mingw32ce-gcc) does not provide getenv()
-+-   */
-+-  home_dir = "/";
-+-#else
-+-
-+-#if defined(_WIN32) || defined(WIN32)
-+-  if (!home_dir) {
-+-    home_dir = getenv("USERPROFILE");
-+-  }
-+-#endif
-+-
-+-  if (!home_dir) {
-+-    home_dir = getenv("HOME");
-+-  }
-+-
-+-#if defined(_WIN32) || defined(WIN32)
-+-  if (!home_dir) {
-+-    char *zDrive, *zPath;
-+-    int n;
-+-    zDrive = getenv("HOMEDRIVE");
-+-    zPath = getenv("HOMEPATH");
-+-    if( zDrive && zPath ){
-+-      n = strlen30(zDrive) + strlen30(zPath) + 1;
-+-      home_dir = malloc( n );
-+-      if( home_dir==0 ) return 0;
-+-      sqlite3_snprintf(n, home_dir, "%s%s", zDrive, zPath);
-+-      return home_dir;
-+-    }
-+-    home_dir = "c:\\";
-+-  }
-+-#endif
-+-
-+-#endif /* !_WIN32_WCE */
-+-
-+-  if( home_dir ){
-+-    int n = strlen30(home_dir) + 1;
-+-    char *z = malloc( n );
-+-    if( z ) memcpy(z, home_dir, n);
-+-    home_dir = z;
-+-  }
-+-
-+-  return home_dir;
-+-}
-+-
-+-/*
-+-** Read input from the file given by sqliterc_override.  Or if that
-+-** parameter is NULL, take input from ~/.sqliterc
-+-**
-+-** Returns the number of errors.
-+-*/
-+-static void process_sqliterc(
-+-  ShellState *p,                  /* Configuration data */
-+-  const char *sqliterc_override   /* Name of config file. NULL to use default */
-+-){
-+-  char *home_dir = NULL;
-+-  const char *sqliterc = sqliterc_override;
-+-  char *zBuf = 0;
-+-  FILE *in = NULL;
-+-
-+-  if (sqliterc == NULL) {
-+-    home_dir = find_home_dir(0);
-+-    if( home_dir==0 ){
-+-      raw_printf(stderr, "-- warning: cannot find home directory;"
-+-                      " cannot read ~/.sqliterc\n");
-+-      return;
-+-    }
-+-    sqlite3_initialize();
-+-    zBuf = sqlite3_mprintf("%s/.sqliterc",home_dir);
-+-    sqliterc = zBuf;
-+-  }
-+-  in = fopen(sqliterc,"rb");
-+-  if( in ){
-+-    if( stdin_is_interactive ){
-+-      utf8_printf(stderr,"-- Loading resources from %s\n",sqliterc);
-+-    }
-+-    process_input(p,in);
-+-    fclose(in);
-+-  }
-+-  sqlite3_free(zBuf);
-+-}
-+-
-+-/*
-+-** Show available command line options
-+-*/
-+-static const char zOptions[] =
-+-  "   -ascii               set output mode to 'ascii'\n"
-+-  "   -bail                stop after hitting an error\n"
-+-  "   -batch               force batch I/O\n"
-+-  "   -column              set output mode to 'column'\n"
-+-  "   -cmd COMMAND         run \"COMMAND\" before reading stdin\n"
-+-  "   -csv                 set output mode to 'csv'\n"
-+-  "   -echo                print commands before execution\n"
-+-  "   -init FILENAME       read/process named file\n"
-+-  "   -[no]header          turn headers on or off\n"
-+-#if defined(SQLITE_ENABLE_MEMSYS3) || defined(SQLITE_ENABLE_MEMSYS5)
-+-  "   -heap SIZE           Size of heap for memsys3 or memsys5\n"
-+-#endif
-+-  "   -help                show this message\n"
-+-  "   -html                set output mode to HTML\n"
-+-  "   -interactive         force interactive I/O\n"
-+-  "   -line                set output mode to 'line'\n"
-+-  "   -list                set output mode to 'list'\n"
-+-  "   -lookaside SIZE N    use N entries of SZ bytes for lookaside memory\n"
-+-  "   -mmap N              default mmap size set to N\n"
-+-#ifdef SQLITE_ENABLE_MULTIPLEX
-+-  "   -multiplex           enable the multiplexor VFS\n"
-+-#endif
-+-  "   -newline SEP         set output row separator. Default: '\\n'\n"
-+-  "   -nullvalue TEXT      set text string for NULL values. Default ''\n"
-+-  "   -pagecache SIZE N    use N slots of SZ bytes each for page cache memory\n"
-+-  "   -quote               set output mode to 'quote'\n"
-+-  "   -separator SEP       set output column separator. Default: '|'\n"
-+-  "   -stats               print memory stats before each finalize\n"
-+-  "   -version             show SQLite version\n"
-+-  "   -vfs NAME            use NAME as the default VFS\n"
-+-#ifdef SQLITE_ENABLE_VFSTRACE
-+-  "   -vfstrace            enable tracing of all VFS calls\n"
-+-#endif
-+-;
-+-static void usage(int showDetail){
-+-  utf8_printf(stderr,
-+-      "Usage: %s [OPTIONS] FILENAME [SQL]\n"
-+-      "FILENAME is the name of an SQLite database. A new database is created\n"
-+-      "if the file does not previously exist.\n", Argv0);
-+-  if( showDetail ){
-+-    utf8_printf(stderr, "OPTIONS include:\n%s", zOptions);
-+-  }else{
-+-    raw_printf(stderr, "Use the -help option for additional information\n");
-+-  }
-+-  exit(1);
-+-}
-+-
-+-/*
-+-** Initialize the state information in data
-+-*/
-+-static void main_init(ShellState *data) {
-+-  memset(data, 0, sizeof(*data));
-+-  data->normalMode = data->cMode = data->mode = MODE_List;
-+-  data->autoExplain = 1;
-+-  memcpy(data->colSeparator,SEP_Column, 2);
-+-  memcpy(data->rowSeparator,SEP_Row, 2);
-+-  data->showHeader = 0;
-+-  data->shellFlgs = SHFLG_Lookaside;
-+-  sqlite3_config(SQLITE_CONFIG_URI, 1);
-+-  sqlite3_config(SQLITE_CONFIG_LOG, shellLog, data);
-+-  sqlite3_config(SQLITE_CONFIG_MULTITHREAD);
-+-  sqlite3_snprintf(sizeof(mainPrompt), mainPrompt,"sqlite> ");
-+-  sqlite3_snprintf(sizeof(continuePrompt), continuePrompt,"   ...> ");
-+-}
-+-
-+-/*
-+-** Output text to the console in a font that attracts extra attention.
-+-*/
-+-#ifdef _WIN32
-+-static void printBold(const char *zText){
-+-  HANDLE out = GetStdHandle(STD_OUTPUT_HANDLE);
-+-  CONSOLE_SCREEN_BUFFER_INFO defaultScreenInfo;
-+-  GetConsoleScreenBufferInfo(out, &defaultScreenInfo);
-+-  SetConsoleTextAttribute(out,
-+-         FOREGROUND_RED|FOREGROUND_INTENSITY
-+-  );
-+-  printf("%s", zText);
-+-  SetConsoleTextAttribute(out, defaultScreenInfo.wAttributes);
-+-}
-+-#else
-+-static void printBold(const char *zText){
-+-  printf("\033[1m%s\033[0m", zText);
-+-}
-+-#endif
-+-
-+-/*
-+-** Get the argument to an --option.  Throw an error and die if no argument
-+-** is available.
-+-*/
-+-static char *cmdline_option_value(int argc, char **argv, int i){
-+-  if( i==argc ){
-+-    utf8_printf(stderr, "%s: Error: missing argument to %s\n",
-+-            argv[0], argv[argc-1]);
-+-    exit(1);
-+-  }
-+-  return argv[i];
-+-}
-+-
-+-#ifndef SQLITE_SHELL_IS_UTF8
-+-#  if (defined(_WIN32) || defined(WIN32)) && defined(_MSC_VER)
-+-#    define SQLITE_SHELL_IS_UTF8          (0)
-+-#  else
-+-#    define SQLITE_SHELL_IS_UTF8          (1)
-+-#  endif
-+-#endif
-+-
-+-#if SQLITE_SHELL_IS_UTF8
-+-int SQLITE_CDECL main(int argc, char **argv){
-+-#else
-+-int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
-+-  char **argv;
-+-#endif
-+-  char *zErrMsg = 0;
-+-  ShellState data;
-+-  const char *zInitFile = 0;
-+-  int i;
-+-  int rc = 0;
-+-  int warnInmemoryDb = 0;
-+-  int readStdin = 1;
-+-  int nCmd = 0;
-+-  char **azCmd = 0;
-+-
-+-  setBinaryMode(stdin, 0);
-+-  setvbuf(stderr, 0, _IONBF, 0); /* Make sure stderr is unbuffered */
-+-  stdin_is_interactive = isatty(0);
-+-  stdout_is_console = isatty(1);
-+-
-+-#if USE_SYSTEM_SQLITE+0!=1
-+-  if( strncmp(sqlite3_sourceid(),SQLITE_SOURCE_ID,60)!=0 ){
-+-    utf8_printf(stderr, "SQLite header and source version mismatch\n%s\n%s\n",
-+-            sqlite3_sourceid(), SQLITE_SOURCE_ID);
-+-    exit(1);
-+-  }
-+-#endif
-+-  main_init(&data);
-+-#if !SQLITE_SHELL_IS_UTF8
-+-  sqlite3_initialize();
-+-  argv = sqlite3_malloc64(sizeof(argv[0])*argc);
-+-  if( argv==0 ){
-+-    raw_printf(stderr, "out of memory\n");
-+-    exit(1);
-+-  }
-+-  for(i=0; i<argc; i++){
-+-    argv[i] = sqlite3_win32_unicode_to_utf8(wargv[i]);
-+-    if( argv[i]==0 ){
-+-      raw_printf(stderr, "out of memory\n");
-+-      exit(1);
-+-    }
-+-  }
-+-#endif
-+-  assert( argc>=1 && argv && argv[0] );
-+-  Argv0 = argv[0];
-+-
-+-  /* Make sure we have a valid signal handler early, before anything
-+-  ** else is done.
-+-  */
-+-#ifdef SIGINT
-+-  signal(SIGINT, interrupt_handler);
-+-#endif
-+-
-+-#ifdef SQLITE_SHELL_DBNAME_PROC
-+-  {
-+-    /* If the SQLITE_SHELL_DBNAME_PROC macro is defined, then it is the name
-+-    ** of a C-function that will provide the name of the database file.  Use
-+-    ** this compile-time option to embed this shell program in larger
-+-    ** applications. */
-+-    extern void SQLITE_SHELL_DBNAME_PROC(const char**);
-+-    SQLITE_SHELL_DBNAME_PROC(&data.zDbFilename);
-+-    warnInmemoryDb = 0;
-+-  }
-+-#endif
-+-
-+-  /* Begin evanm patch. */
-+-#if !defined(__APPLE__)
-+-  extern int sqlite_shell_init_icu();
-+-  if( !sqlite_shell_init_icu() ){
-+-    fprintf(stderr, "%s: warning: couldn't find icudt38.dll; "
-+-                    "queries against ICU FTS tables will fail.\n", argv[0]);
-+-  }
-+-#endif /* !defined(__APPLE__) */
-+-  /* End evanm patch. */
-+-
-+-  /* Do an initial pass through the command-line argument to locate
-+-  ** the name of the database file, the name of the initialization file,
-+-  ** the size of the alternative malloc heap,
-+-  ** and the first command to execute.
-+-  */
-+-  for(i=1; i<argc; i++){
-+-    char *z;
-+-    z = argv[i];
-+-    if( z[0]!='-' ){
-+-      if( data.zDbFilename==0 ){
-+-        data.zDbFilename = z;
-+-      }else{
-+-        /* Excesss arguments are interpreted as SQL (or dot-commands) and
-+-        ** mean that nothing is read from stdin */
-+-        readStdin = 0;
-+-        nCmd++;
-+-        azCmd = realloc(azCmd, sizeof(azCmd[0])*nCmd);
-+-        if( azCmd==0 ){
-+-          raw_printf(stderr, "out of memory\n");
-+-          exit(1);
-+-        }
-+-        azCmd[nCmd-1] = z;
-+-      }
-+-    }
-+-    if( z[1]=='-' ) z++;
-+-    if( strcmp(z,"-separator")==0
-+-     || strcmp(z,"-nullvalue")==0
-+-     || strcmp(z,"-newline")==0
-+-     || strcmp(z,"-cmd")==0
-+-    ){
-+-      (void)cmdline_option_value(argc, argv, ++i);
-+-    }else if( strcmp(z,"-init")==0 ){
-+-      zInitFile = cmdline_option_value(argc, argv, ++i);
-+-    }else if( strcmp(z,"-batch")==0 ){
-+-      /* Need to check for batch mode here to so we can avoid printing
-+-      ** informational messages (like from process_sqliterc) before
-+-      ** we do the actual processing of arguments later in a second pass.
-+-      */
-+-      stdin_is_interactive = 0;
-+-    }else if( strcmp(z,"-heap")==0 ){
-+-#if defined(SQLITE_ENABLE_MEMSYS3) || defined(SQLITE_ENABLE_MEMSYS5)
-+-      const char *zSize;
-+-      sqlite3_int64 szHeap;
-+-
-+-      zSize = cmdline_option_value(argc, argv, ++i);
-+-      szHeap = integerValue(zSize);
-+-      if( szHeap>0x7fff0000 ) szHeap = 0x7fff0000;
-+-      sqlite3_config(SQLITE_CONFIG_HEAP, malloc((int)szHeap), (int)szHeap, 64);
-+-#else
-+-      (void)cmdline_option_value(argc, argv, ++i);
-+-#endif
-+-    }else if( strcmp(z,"-pagecache")==0 ){
-+-      int n, sz;
-+-      sz = (int)integerValue(cmdline_option_value(argc,argv,++i));
-+-      if( sz>70000 ) sz = 70000;
-+-      if( sz<0 ) sz = 0;
-+-      n = (int)integerValue(cmdline_option_value(argc,argv,++i));
-+-      sqlite3_config(SQLITE_CONFIG_PAGECACHE,
-+-                    (n>0 && sz>0) ? malloc(n*sz) : 0, sz, n);
-+-      data.shellFlgs |= SHFLG_Pagecache;
-+-    }else if( strcmp(z,"-lookaside")==0 ){
-+-      int n, sz;
-+-      sz = (int)integerValue(cmdline_option_value(argc,argv,++i));
-+-      if( sz<0 ) sz = 0;
-+-      n = (int)integerValue(cmdline_option_value(argc,argv,++i));
-+-      if( n<0 ) n = 0;
-+-      sqlite3_config(SQLITE_CONFIG_LOOKASIDE, sz, n);
-+-      if( sz*n==0 ) data.shellFlgs &= ~SHFLG_Lookaside;
-+-#ifdef SQLITE_ENABLE_VFSTRACE
-+-    }else if( strcmp(z,"-vfstrace")==0 ){
-+-      extern int vfstrace_register(
-+-         const char *zTraceName,
-+-         const char *zOldVfsName,
-+-         int (*xOut)(const char*,void*),
-+-         void *pOutArg,
-+-         int makeDefault
-+-      );
-+-      vfstrace_register("trace",0,(int(*)(const char*,void*))fputs,stderr,1);
-+-#endif
-+-#ifdef SQLITE_ENABLE_MULTIPLEX
-+-    }else if( strcmp(z,"-multiplex")==0 ){
-+-      extern int sqlite3_multiple_initialize(const char*,int);
-+-      sqlite3_multiplex_initialize(0, 1);
-+-#endif
-+-    }else if( strcmp(z,"-mmap")==0 ){
-+-      sqlite3_int64 sz = integerValue(cmdline_option_value(argc,argv,++i));
-+-      sqlite3_config(SQLITE_CONFIG_MMAP_SIZE, sz, sz);
-+-    }else if( strcmp(z,"-vfs")==0 ){
-+-      sqlite3_vfs *pVfs = sqlite3_vfs_find(cmdline_option_value(argc,argv,++i));
-+-      if( pVfs ){
-+-        sqlite3_vfs_register(pVfs, 1);
-+-      }else{
-+-        utf8_printf(stderr, "no such VFS: \"%s\"\n", argv[i]);
-+-        exit(1);
-+-      }
-+-    }
-+-  }
-+-  if( data.zDbFilename==0 ){
-+-#ifndef SQLITE_OMIT_MEMORYDB
-+-    data.zDbFilename = ":memory:";
-+-    warnInmemoryDb = argc==1;
-+-#else
-+-    utf8_printf(stderr,"%s: Error: no database filename specified\n", Argv0);
-+-    return 1;
-+-#endif
-+-  }
-+-  data.out = stdout;
-+-
-+-  /* Go ahead and open the database file if it already exists.  If the
-+-  ** file does not exist, delay opening it.  This prevents empty database
-+-  ** files from being created if a user mistypes the database name argument
-+-  ** to the sqlite command-line tool.
-+-  */
-+-  if( access(data.zDbFilename, 0)==0 ){
-+-    open_db(&data, 0);
-+-  }
-+-
-+-  /* Process the initialization file if there is one.  If no -init option
-+-  ** is given on the command line, look for a file named ~/.sqliterc and
-+-  ** try to process it.
-+-  */
-+-  process_sqliterc(&data,zInitFile);
-+-
-+-  /* Make a second pass through the command-line argument and set
-+-  ** options.  This second pass is delayed until after the initialization
-+-  ** file is processed so that the command-line arguments will override
-+-  ** settings in the initialization file.
-+-  */
-+-  for(i=1; i<argc; i++){
-+-    char *z = argv[i];
-+-    if( z[0]!='-' ) continue;
-+-    if( z[1]=='-' ){ z++; }
-+-    if( strcmp(z,"-init")==0 ){
-+-      i++;
-+-    }else if( strcmp(z,"-html")==0 ){
-+-      data.mode = MODE_Html;
-+-    }else if( strcmp(z,"-list")==0 ){
-+-      data.mode = MODE_List;
-+-    }else if( strcmp(z,"-quote")==0 ){
-+-      data.mode = MODE_Quote;
-+-    }else if( strcmp(z,"-line")==0 ){
-+-      data.mode = MODE_Line;
-+-    }else if( strcmp(z,"-column")==0 ){
-+-      data.mode = MODE_Column;
-+-    }else if( strcmp(z,"-csv")==0 ){
-+-      data.mode = MODE_Csv;
-+-      memcpy(data.colSeparator,",",2);
-+-    }else if( strcmp(z,"-ascii")==0 ){
-+-      data.mode = MODE_Ascii;
-+-      sqlite3_snprintf(sizeof(data.colSeparator), data.colSeparator,
-+-                       SEP_Unit);
-+-      sqlite3_snprintf(sizeof(data.rowSeparator), data.rowSeparator,
-+-                       SEP_Record);
-+-    }else if( strcmp(z,"-separator")==0 ){
-+-      sqlite3_snprintf(sizeof(data.colSeparator), data.colSeparator,
-+-                       "%s",cmdline_option_value(argc,argv,++i));
-+-    }else if( strcmp(z,"-newline")==0 ){
-+-      sqlite3_snprintf(sizeof(data.rowSeparator), data.rowSeparator,
-+-                       "%s",cmdline_option_value(argc,argv,++i));
-+-    }else if( strcmp(z,"-nullvalue")==0 ){
-+-      sqlite3_snprintf(sizeof(data.nullValue), data.nullValue,
-+-                       "%s",cmdline_option_value(argc,argv,++i));
-+-    }else if( strcmp(z,"-header")==0 ){
-+-      data.showHeader = 1;
-+-    }else if( strcmp(z,"-noheader")==0 ){
-+-      data.showHeader = 0;
-+-    }else if( strcmp(z,"-echo")==0 ){
-+-      ShellSetFlag(&data, SHFLG_Echo);
-+-    }else if( strcmp(z,"-eqp")==0 ){
-+-      data.autoEQP = 1;
-+-    }else if( strcmp(z,"-eqpfull")==0 ){
-+-      data.autoEQP = 2;
-+-    }else if( strcmp(z,"-stats")==0 ){
-+-      data.statsOn = 1;
-+-    }else if( strcmp(z,"-scanstats")==0 ){
-+-      data.scanstatsOn = 1;
-+-    }else if( strcmp(z,"-backslash")==0 ){
-+-      /* Undocumented command-line option: -backslash
-+-      ** Causes C-style backslash escapes to be evaluated in SQL statements
-+-      ** prior to sending the SQL into SQLite.  Useful for injecting
-+-      ** crazy bytes in the middle of SQL statements for testing and debugging.
-+-      */
-+-      ShellSetFlag(&data, SHFLG_Backslash);
-+-    }else if( strcmp(z,"-bail")==0 ){
-+-      bail_on_error = 1;
-+-    }else if( strcmp(z,"-version")==0 ){
-+-      printf("%s %s\n", sqlite3_libversion(), sqlite3_sourceid());
-+-      return 0;
-+-    }else if( strcmp(z,"-interactive")==0 ){
-+-      stdin_is_interactive = 1;
-+-    }else if( strcmp(z,"-batch")==0 ){
-+-      stdin_is_interactive = 0;
-+-    }else if( strcmp(z,"-heap")==0 ){
-+-      i++;
-+-    }else if( strcmp(z,"-pagecache")==0 ){
-+-      i+=2;
-+-    }else if( strcmp(z,"-lookaside")==0 ){
-+-      i+=2;
-+-    }else if( strcmp(z,"-mmap")==0 ){
-+-      i++;
-+-    }else if( strcmp(z,"-vfs")==0 ){
-+-      i++;
-+-#ifdef SQLITE_ENABLE_VFSTRACE
-+-    }else if( strcmp(z,"-vfstrace")==0 ){
-+-      i++;
-+-#endif
-+-#ifdef SQLITE_ENABLE_MULTIPLEX
-+-    }else if( strcmp(z,"-multiplex")==0 ){
-+-      i++;
-+-#endif
-+-    }else if( strcmp(z,"-help")==0 ){
-+-      usage(1);
-+-    }else if( strcmp(z,"-cmd")==0 ){
-+-      /* Run commands that follow -cmd first and separately from commands
-+-      ** that simply appear on the command-line.  This seems goofy.  It would
-+-      ** be better if all commands ran in the order that they appear.  But
-+-      ** we retain the goofy behavior for historical compatibility. */
-+-      if( i==argc-1 ) break;
-+-      z = cmdline_option_value(argc,argv,++i);
-+-      if( z[0]=='.' ){
-+-        rc = do_meta_command(z, &data);
-+-        if( rc && bail_on_error ) return rc==2 ? 0 : rc;
-+-      }else{
-+-        open_db(&data, 0);
-+-        rc = shell_exec(data.db, z, shell_callback, &data, &zErrMsg);
-+-        if( zErrMsg!=0 ){
-+-          utf8_printf(stderr,"Error: %s\n", zErrMsg);
-+-          if( bail_on_error ) return rc!=0 ? rc : 1;
-+-        }else if( rc!=0 ){
-+-          utf8_printf(stderr,"Error: unable to process SQL \"%s\"\n", z);
-+-          if( bail_on_error ) return rc;
-+-        }
-+-      }
-+-    }else{
-+-      utf8_printf(stderr,"%s: Error: unknown option: %s\n", Argv0, z);
-+-      raw_printf(stderr,"Use -help for a list of options.\n");
-+-      return 1;
-+-    }
-+-    data.cMode = data.mode;
-+-  }
-+-
-+-  if( !readStdin ){
-+-    /* Run all arguments that do not begin with '-' as if they were separate
-+-    ** command-line inputs, except for the argToSkip argument which contains
-+-    ** the database filename.
-+-    */
-+-    for(i=0; i<nCmd; i++){
-+-      if( azCmd[i][0]=='.' ){
-+-        rc = do_meta_command(azCmd[i], &data);
-+-        if( rc ) return rc==2 ? 0 : rc;
-+-      }else{
-+-        open_db(&data, 0);
-+-        rc = shell_exec(data.db, azCmd[i], shell_callback, &data, &zErrMsg);
-+-        if( zErrMsg!=0 ){
-+-          utf8_printf(stderr,"Error: %s\n", zErrMsg);
-+-          return rc!=0 ? rc : 1;
-+-        }else if( rc!=0 ){
-+-          utf8_printf(stderr,"Error: unable to process SQL: %s\n", azCmd[i]);
-+-          return rc;
-+-        }
-+-      }
-+-    }
-+-    free(azCmd);
-+-  }else{
-+-    /* Run commands received from standard input
-+-    */
-+-    if( stdin_is_interactive ){
-+-      char *zHome;
-+-      char *zHistory = 0;
-+-      int nHistory;
-+-      printf(
-+-        "SQLite version %s %.19s\n" /*extra-version-info*/
-+-        "Enter \".help\" for usage hints.\n",
-+-        sqlite3_libversion(), sqlite3_sourceid()
-+-      );
-+-      if( warnInmemoryDb ){
-+-        printf("Connected to a ");
-+-        printBold("transient in-memory database");
-+-        printf(".\nUse \".open FILENAME\" to reopen on a "
-+-               "persistent database.\n");
-+-      }
-+-      zHome = find_home_dir(0);
-+-      if( zHome ){
-+-        nHistory = strlen30(zHome) + 20;
-+-        if( (zHistory = malloc(nHistory))!=0 ){
-+-          sqlite3_snprintf(nHistory, zHistory,"%s/.sqlite_history", zHome);
-+-        }
-+-      }
-+-      if( zHistory ){ shell_read_history(zHistory); }
-+-#if HAVE_READLINE || HAVE_EDITLINE
-+-      rl_attempted_completion_function = readline_completion;
-+-#elif HAVE_LINENOISE
-+-      linenoiseSetCompletionCallback(linenoise_completion);
-+-#endif
-+-      rc = process_input(&data, 0);
-+-      if( zHistory ){
-+-        shell_stifle_history(2000);
-+-        shell_write_history(zHistory);
-+-        free(zHistory);
-+-      }
-+-    }else{
-+-      rc = process_input(&data, stdin);
-+-    }
-+-  }
-+-  set_table_name(&data, 0);
-+-  if( data.db ){
-+-    session_close_all(&data);
-+-    sqlite3_close(data.db);
-+-  }
-+-  sqlite3_free(data.zFreeOnClose);
-+-  find_home_dir(1);
-+-#if !SQLITE_SHELL_IS_UTF8
-+-  for(i=0; i<argc; i++) sqlite3_free(argv[i]);
-+-  sqlite3_free(argv);
-+-#endif
-+-  return rc;
-+-}
-+-
-+diff --git a/third_party/sqlite/amalgamation/shell/shell.c b/third_party/sqlite/amalgamation/shell/shell.c
-+new file mode 100644
-+index 0000000..1b3e555
-+--- /dev/null
-++++ b/third_party/sqlite/amalgamation/shell/shell.c
-+@@ -0,0 +1,8393 @@
-++/* DO NOT EDIT!
-++** This file is automatically generated by the script in the canonical
-++** SQLite source tree at tool/mkshellc.tcl.  That script combines source
-++** code from various constituent source files of SQLite into this single
-++** "shell.c" file used to implement the SQLite command-line shell.
-++**
-++** Most of the code found below comes from the "src/shell.c.in" file in
-++** the canonical SQLite source tree.  That main file contains "INCLUDE"
-++** lines that specify other files in the canonical source tree that are
-++** inserted to getnerate this complete program source file.
-++**
-++** The code from multiple files is combined into this single "shell.c"
-++** source file to help make the command-line program easier to compile.
-++**
-++** To modify this program, get a copy of the canonical SQLite source tree,
-++** edit the src/shell.c.in" and/or some of the other files that are included
-++** by "src/shell.c.in", then rerun the tool/mkshellc.tcl script.
-++*/
-++/*
-++** 2001 September 15
-++**
-++** The author disclaims copyright to this source code.  In place of
-++** a legal notice, here is a blessing:
-++**
-++**    May you do good and not evil.
-++**    May you find forgiveness for yourself and forgive others.
-++**    May you share freely, never taking more than you give.
-++**
-++*************************************************************************
-++** This file contains code to implement the "sqlite" command line
-++** utility for accessing SQLite databases.
-++*/
-++#if (defined(_WIN32) || defined(WIN32)) && !defined(_CRT_SECURE_NO_WARNINGS)
-++/* This needs to come before any includes for MSVC compiler */
-++#define _CRT_SECURE_NO_WARNINGS
-++#endif
-++
-++/*
-++** Warning pragmas copied from msvc.h in the core.
-++*/
-++#if defined(_MSC_VER)
-++#pragma warning(disable : 4054)
-++#pragma warning(disable : 4055)
-++#pragma warning(disable : 4100)
-++#pragma warning(disable : 4127)
-++#pragma warning(disable : 4130)
-++#pragma warning(disable : 4152)
-++#pragma warning(disable : 4189)
-++#pragma warning(disable : 4206)
-++#pragma warning(disable : 4210)
-++#pragma warning(disable : 4232)
-++#pragma warning(disable : 4244)
-++#pragma warning(disable : 4305)
-++#pragma warning(disable : 4306)
-++#pragma warning(disable : 4702)
-++#pragma warning(disable : 4706)
-++#endif /* defined(_MSC_VER) */
-++
-++/*
-++** No support for loadable extensions in VxWorks.
-++*/
-++#if (defined(__RTP__) || defined(_WRS_KERNEL)) && !SQLITE_OMIT_LOAD_EXTENSION
-++# define SQLITE_OMIT_LOAD_EXTENSION 1
-++#endif
-++
-++/*
-++** Enable large-file support for fopen() and friends on unix.
-++*/
-++#ifndef SQLITE_DISABLE_LFS
-++# define _LARGE_FILE       1
-++# ifndef _FILE_OFFSET_BITS
-++#   define _FILE_OFFSET_BITS 64
-++# endif
-++# define _LARGEFILE_SOURCE 1
-++#endif
-++
-++#include <stdlib.h>
-++#include <string.h>
-++#include <stdio.h>
-++#include <assert.h>
-++#include "sqlite3.h"
-++#if SQLITE_USER_AUTHENTICATION
-++# include "sqlite3userauth.h"
-++#endif
-++#include <ctype.h>
-++#include <stdarg.h>
-++
-++#if !defined(_WIN32) && !defined(WIN32)
-++# include <signal.h>
-++# if !defined(__RTP__) && !defined(_WRS_KERNEL)
-++#  include <pwd.h>
-++# endif
-++# include <unistd.h>
-++# include <sys/types.h>
-++#endif
-++
-++#if HAVE_READLINE
-++# include <readline/readline.h>
-++# include <readline/history.h>
-++#endif
-++
-++#if HAVE_EDITLINE
-++# include <editline/readline.h>
-++#endif
-++
-++#if HAVE_EDITLINE || HAVE_READLINE
-++
-++# define shell_add_history(X) add_history(X)
-++# define shell_read_history(X) read_history(X)
-++# define shell_write_history(X) write_history(X)
-++# define shell_stifle_history(X) stifle_history(X)
-++# define shell_readline(X) readline(X)
-++
-++#elif HAVE_LINENOISE
-++
-++# include "linenoise.h"
-++# define shell_add_history(X) linenoiseHistoryAdd(X)
-++# define shell_read_history(X) linenoiseHistoryLoad(X)
-++# define shell_write_history(X) linenoiseHistorySave(X)
-++# define shell_stifle_history(X) linenoiseHistorySetMaxLen(X)
-++# define shell_readline(X) linenoise(X)
-++
-++#else
-++
-++# define shell_read_history(X)
-++# define shell_write_history(X)
-++# define shell_stifle_history(X)
-++
-++# define SHELL_USE_LOCAL_GETLINE 1
-++#endif
-++
-++
-++#if defined(_WIN32) || defined(WIN32)
-++# include <io.h>
-++# include <fcntl.h>
-++# define isatty(h) _isatty(h)
-++# ifndef access
-++#  define access(f,m) _access((f),(m))
-++# endif
-++# undef popen
-++# define popen _popen
-++# undef pclose
-++# define pclose _pclose
-++#else
-++ /* Make sure isatty() has a prototype. */
-++ extern int isatty(int);
-++
-++# if !defined(__RTP__) && !defined(_WRS_KERNEL)
-++  /* popen and pclose are not C89 functions and so are
-++  ** sometimes omitted from the <stdio.h> header */
-++   extern FILE *popen(const char*,const char*);
-++   extern int pclose(FILE*);
-++# else
-++#  define SQLITE_OMIT_POPEN 1
-++# endif
-++#endif
-++
-++#if defined(_WIN32_WCE)
-++/* Windows CE (arm-wince-mingw32ce-gcc) does not provide isatty()
-++ * thus we always assume that we have a console. That can be
-++ * overridden with the -batch command line option.
-++ */
-++#define isatty(x) 1
-++#endif
-++
-++/* ctype macros that work with signed characters */
-++#define IsSpace(X)  isspace((unsigned char)X)
-++#define IsDigit(X)  isdigit((unsigned char)X)
-++#define ToLower(X)  (char)tolower((unsigned char)X)
-++
-++#if defined(_WIN32) || defined(WIN32)
-++#include <windows.h>
-++
-++/* string conversion routines only needed on Win32 */
-++extern char *sqlite3_win32_unicode_to_utf8(LPCWSTR);
-++extern char *sqlite3_win32_mbcs_to_utf8_v2(const char *, int);
-++extern char *sqlite3_win32_utf8_to_mbcs_v2(const char *, int);
-++extern LPWSTR sqlite3_win32_utf8_to_unicode(const char *zText);
-++#endif
-++
-++/* On Windows, we normally run with output mode of TEXT so that \n characters
-++** are automatically translated into \r\n.  However, this behavior needs
-++** to be disabled in some cases (ex: when generating CSV output and when
-++** rendering quoted strings that contain \n characters).  The following
-++** routines take care of that.
-++*/
-++#if defined(_WIN32) || defined(WIN32)
-++static void setBinaryMode(FILE *file, int isOutput){
-++  if( isOutput ) fflush(file);
-++  _setmode(_fileno(file), _O_BINARY);
-++}
-++static void setTextMode(FILE *file, int isOutput){
-++  if( isOutput ) fflush(file);
-++  _setmode(_fileno(file), _O_TEXT);
-++}
-++#else
-++# define setBinaryMode(X,Y)
-++# define setTextMode(X,Y)
-++#endif
-++
-++
-++/* True if the timer is enabled */
-++static int enableTimer = 0;
-++
-++/* Return the current wall-clock time */
-++static sqlite3_int64 timeOfDay(void){
-++  static sqlite3_vfs *clockVfs = 0;
-++  sqlite3_int64 t;
-++  if( clockVfs==0 ) clockVfs = sqlite3_vfs_find(0);
-++  if( clockVfs->iVersion>=2 && clockVfs->xCurrentTimeInt64!=0 ){
-++    clockVfs->xCurrentTimeInt64(clockVfs, &t);
-++  }else{
-++    double r;
-++    clockVfs->xCurrentTime(clockVfs, &r);
-++    t = (sqlite3_int64)(r*86400000.0);
-++  }
-++  return t;
-++}
-++
-++#if !defined(_WIN32) && !defined(WIN32) && !defined(__minux)
-++#include <sys/time.h>
-++#include <sys/resource.h>
-++
-++/* VxWorks does not support getrusage() as far as we can determine */
-++#if defined(_WRS_KERNEL) || defined(__RTP__)
-++struct rusage {
-++  struct timeval ru_utime; /* user CPU time used */
-++  struct timeval ru_stime; /* system CPU time used */
-++};
-++#define getrusage(A,B) memset(B,0,sizeof(*B))
-++#endif
-++
-++/* Saved resource information for the beginning of an operation */
-++static struct rusage sBegin;  /* CPU time at start */
-++static sqlite3_int64 iBegin;  /* Wall-clock time at start */
-++
-++/*
-++** Begin timing an operation
-++*/
-++static void beginTimer(void){
-++  if( enableTimer ){
-++    getrusage(RUSAGE_SELF, &sBegin);
-++    iBegin = timeOfDay();
-++  }
-++}
-++
-++/* Return the difference of two time_structs in seconds */
-++static double timeDiff(struct timeval *pStart, struct timeval *pEnd){
-++  return (pEnd->tv_usec - pStart->tv_usec)*0.000001 +
-++         (double)(pEnd->tv_sec - pStart->tv_sec);
-++}
-++
-++/*
-++** Print the timing results.
-++*/
-++static void endTimer(void){
-++  if( enableTimer ){
-++    sqlite3_int64 iEnd = timeOfDay();
-++    struct rusage sEnd;
-++    getrusage(RUSAGE_SELF, &sEnd);
-++    printf("Run Time: real %.3f user %f sys %f\n",
-++       (iEnd - iBegin)*0.001,
-++       timeDiff(&sBegin.ru_utime, &sEnd.ru_utime),
-++       timeDiff(&sBegin.ru_stime, &sEnd.ru_stime));
-++  }
-++}
-++
-++#define BEGIN_TIMER beginTimer()
-++#define END_TIMER endTimer()
-++#define HAS_TIMER 1
-++
-++#elif (defined(_WIN32) || defined(WIN32))
-++
-++/* Saved resource information for the beginning of an operation */
-++static HANDLE hProcess;
-++static FILETIME ftKernelBegin;
-++static FILETIME ftUserBegin;
-++static sqlite3_int64 ftWallBegin;
-++typedef BOOL (WINAPI *GETPROCTIMES)(HANDLE, LPFILETIME, LPFILETIME,
-++                                    LPFILETIME, LPFILETIME);
-++static GETPROCTIMES getProcessTimesAddr = NULL;
-++
-++/*
-++** Check to see if we have timer support.  Return 1 if necessary
-++** support found (or found previously).
-++*/
-++static int hasTimer(void){
-++  if( getProcessTimesAddr ){
-++    return 1;
-++  } else {
-++    /* GetProcessTimes() isn't supported in WIN95 and some other Windows
-++    ** versions. See if the version we are running on has it, and if it
-++    ** does, save off a pointer to it and the current process handle.
-++    */
-++    hProcess = GetCurrentProcess();
-++    if( hProcess ){
-++      HINSTANCE hinstLib = LoadLibrary(TEXT("Kernel32.dll"));
-++      if( NULL != hinstLib ){
-++        getProcessTimesAddr =
-++            (GETPROCTIMES) GetProcAddress(hinstLib, "GetProcessTimes");
-++        if( NULL != getProcessTimesAddr ){
-++          return 1;
-++        }
-++        FreeLibrary(hinstLib);
-++      }
-++    }
-++  }
-++  return 0;
-++}
-++
-++/*
-++** Begin timing an operation
-++*/
-++static void beginTimer(void){
-++  if( enableTimer && getProcessTimesAddr ){
-++    FILETIME ftCreation, ftExit;
-++    getProcessTimesAddr(hProcess,&ftCreation,&ftExit,
-++                        &ftKernelBegin,&ftUserBegin);
-++    ftWallBegin = timeOfDay();
-++  }
-++}
-++
-++/* Return the difference of two FILETIME structs in seconds */
-++static double timeDiff(FILETIME *pStart, FILETIME *pEnd){
-++  sqlite_int64 i64Start = *((sqlite_int64 *) pStart);
-++  sqlite_int64 i64End = *((sqlite_int64 *) pEnd);
-++  return (double) ((i64End - i64Start) / 10000000.0);
-++}
-++
-++/*
-++** Print the timing results.
-++*/
-++static void endTimer(void){
-++  if( enableTimer && getProcessTimesAddr){
-++    FILETIME ftCreation, ftExit, ftKernelEnd, ftUserEnd;
-++    sqlite3_int64 ftWallEnd = timeOfDay();
-++    getProcessTimesAddr(hProcess,&ftCreation,&ftExit,&ftKernelEnd,&ftUserEnd);
-++    printf("Run Time: real %.3f user %f sys %f\n",
-++       (ftWallEnd - ftWallBegin)*0.001,
-++       timeDiff(&ftUserBegin, &ftUserEnd),
-++       timeDiff(&ftKernelBegin, &ftKernelEnd));
-++  }
-++}
-++
-++#define BEGIN_TIMER beginTimer()
-++#define END_TIMER endTimer()
-++#define HAS_TIMER hasTimer()
-++
-++#else
-++#define BEGIN_TIMER
-++#define END_TIMER
-++#define HAS_TIMER 0
-++#endif
-++
-++/*
-++** Used to prevent warnings about unused parameters
-++*/
-++#define UNUSED_PARAMETER(x) (void)(x)
-++
-++/*
-++** If the following flag is set, then command execution stops
-++** at an error if we are not interactive.
-++*/
-++static int bail_on_error = 0;
-++
-++/*
-++** Threat stdin as an interactive input if the following variable
-++** is true.  Otherwise, assume stdin is connected to a file or pipe.
-++*/
-++static int stdin_is_interactive = 1;
-++
-++/*
-++** On Windows systems we have to know if standard output is a console
-++** in order to translate UTF-8 into MBCS.  The following variable is
-++** true if translation is required.
-++*/
-++static int stdout_is_console = 1;
-++
-++/*
-++** The following is the open SQLite database.  We make a pointer
-++** to this database a static variable so that it can be accessed
-++** by the SIGINT handler to interrupt database processing.
-++*/
-++static sqlite3 *globalDb = 0;
-++
-++/*
-++** True if an interrupt (Control-C) has been received.
-++*/
-++static volatile int seenInterrupt = 0;
-++
-++/*
-++** This is the name of our program. It is set in main(), used
-++** in a number of other places, mostly for error messages.
-++*/
-++static char *Argv0;
-++
-++/*
-++** Prompt strings. Initialized in main. Settable with
-++**   .prompt main continue
-++*/
-++static char mainPrompt[20];     /* First line prompt. default: "sqlite> "*/
-++static char continuePrompt[20]; /* Continuation prompt. default: "   ...> " */
-++
-++/*
-++** Render output like fprintf().  Except, if the output is going to the
-++** console and if this is running on a Windows machine, translate the
-++** output from UTF-8 into MBCS.
-++*/
-++#if defined(_WIN32) || defined(WIN32)
-++void utf8_printf(FILE *out, const char *zFormat, ...){
-++  va_list ap;
-++  va_start(ap, zFormat);
-++  if( stdout_is_console && (out==stdout || out==stderr) ){
-++    char *z1 = sqlite3_vmprintf(zFormat, ap);
-++    char *z2 = sqlite3_win32_utf8_to_mbcs_v2(z1, 0);
-++    sqlite3_free(z1);
-++    fputs(z2, out);
-++    sqlite3_free(z2);
-++  }else{
-++    vfprintf(out, zFormat, ap);
-++  }
-++  va_end(ap);
-++}
-++#elif !defined(utf8_printf)
-++# define utf8_printf fprintf
-++#endif
-++
-++/*
-++** Render output like fprintf().  This should not be used on anything that
-++** includes string formatting (e.g. "%s").
-++*/
-++#if !defined(raw_printf)
-++# define raw_printf fprintf
-++#endif
-++
-++/*
-++** Write I/O traces to the following stream.
-++*/
-++#ifdef SQLITE_ENABLE_IOTRACE
-++static FILE *iotrace = 0;
-++#endif
-++
-++/*
-++** This routine works like printf in that its first argument is a
-++** format string and subsequent arguments are values to be substituted
-++** in place of % fields.  The result of formatting this string
-++** is written to iotrace.
-++*/
-++#ifdef SQLITE_ENABLE_IOTRACE
-++static void SQLITE_CDECL iotracePrintf(const char *zFormat, ...){
-++  va_list ap;
-++  char *z;
-++  if( iotrace==0 ) return;
-++  va_start(ap, zFormat);
-++  z = sqlite3_vmprintf(zFormat, ap);
-++  va_end(ap);
-++  utf8_printf(iotrace, "%s", z);
-++  sqlite3_free(z);
-++}
-++#endif
-++
-++/*
-++** Output string zUtf to stream pOut as w characters.  If w is negative,
-++** then right-justify the text.  W is the width in UTF-8 characters, not
-++** in bytes.  This is different from the %*.*s specification in printf
-++** since with %*.*s the width is measured in bytes, not characters.
-++*/
-++static void utf8_width_print(FILE *pOut, int w, const char *zUtf){
-++  int i;
-++  int n;
-++  int aw = w<0 ? -w : w;
-++  char zBuf[1000];
-++  if( aw>(int)sizeof(zBuf)/3 ) aw = (int)sizeof(zBuf)/3;
-++  for(i=n=0; zUtf[i]; i++){
-++    if( (zUtf[i]&0xc0)!=0x80 ){
-++      n++;
-++      if( n==aw ){
-++        do{ i++; }while( (zUtf[i]&0xc0)==0x80 );
-++        break;
-++      }
-++    }
-++  }
-++  if( n>=aw ){
-++    utf8_printf(pOut, "%.*s", i, zUtf);
-++  }else if( w<0 ){
-++    utf8_printf(pOut, "%*s%s", aw-n, "", zUtf);
-++  }else{
-++    utf8_printf(pOut, "%s%*s", zUtf, aw-n, "");
-++  }
-++}
-++
-++
-++/*
-++** Determines if a string is a number of not.
-++*/
-++static int isNumber(const char *z, int *realnum){
-++  if( *z=='-' || *z=='+' ) z++;
-++  if( !IsDigit(*z) ){
-++    return 0;
-++  }
-++  z++;
-++  if( realnum ) *realnum = 0;
-++  while( IsDigit(*z) ){ z++; }
-++  if( *z=='.' ){
-++    z++;
-++    if( !IsDigit(*z) ) return 0;
-++    while( IsDigit(*z) ){ z++; }
-++    if( realnum ) *realnum = 1;
-++  }
-++  if( *z=='e' || *z=='E' ){
-++    z++;
-++    if( *z=='+' || *z=='-' ) z++;
-++    if( !IsDigit(*z) ) return 0;
-++    while( IsDigit(*z) ){ z++; }
-++    if( realnum ) *realnum = 1;
-++  }
-++  return *z==0;
-++}
-++
-++/*
-++** Compute a string length that is limited to what can be stored in
-++** lower 30 bits of a 32-bit signed integer.
-++*/
-++static int strlen30(const char *z){
-++  const char *z2 = z;
-++  while( *z2 ){ z2++; }
-++  return 0x3fffffff & (int)(z2 - z);
-++}
-++
-++/*
-++** Return the length of a string in characters.  Multibyte UTF8 characters
-++** count as a single character.
-++*/
-++static int strlenChar(const char *z){
-++  int n = 0;
-++  while( *z ){
-++    if( (0xc0&*(z++))!=0x80 ) n++;
-++  }
-++  return n;
-++}
-++
-++/*
-++** This routine reads a line of text from FILE in, stores
-++** the text in memory obtained from malloc() and returns a pointer
-++** to the text.  NULL is returned at end of file, or if malloc()
-++** fails.
-++**
-++** If zLine is not NULL then it is a malloced buffer returned from
-++** a previous call to this routine that may be reused.
-++*/
-++static char *local_getline(char *zLine, FILE *in){
-++  int nLine = zLine==0 ? 0 : 100;
-++  int n = 0;
-++
-++  while( 1 ){
-++    if( n+100>nLine ){
-++      nLine = nLine*2 + 100;
-++      zLine = realloc(zLine, nLine);
-++      if( zLine==0 ) return 0;
-++    }
-++    if( fgets(&zLine[n], nLine - n, in)==0 ){
-++      if( n==0 ){
-++        free(zLine);
-++        return 0;
-++      }
-++      zLine[n] = 0;
-++      break;
-++    }
-++    while( zLine[n] ) n++;
-++    if( n>0 && zLine[n-1]=='\n' ){
-++      n--;
-++      if( n>0 && zLine[n-1]=='\r' ) n--;
-++      zLine[n] = 0;
-++      break;
-++    }
-++  }
-++#if defined(_WIN32) || defined(WIN32)
-++  /* For interactive input on Windows systems, translate the
-++  ** multi-byte characterset characters into UTF-8. */
-++  if( stdin_is_interactive && in==stdin ){
-++    char *zTrans = sqlite3_win32_mbcs_to_utf8_v2(zLine, 0);
-++    if( zTrans ){
-++      int nTrans = strlen30(zTrans)+1;
-++      if( nTrans>nLine ){
-++        zLine = realloc(zLine, nTrans);
-++        if( zLine==0 ){
-++          sqlite3_free(zTrans);
-++          return 0;
-++        }
-++      }
-++      memcpy(zLine, zTrans, nTrans);
-++      sqlite3_free(zTrans);
-++    }
-++  }
-++#endif /* defined(_WIN32) || defined(WIN32) */
-++  return zLine;
-++}
-++
-++/*
-++** Retrieve a single line of input text.
-++**
-++** If in==0 then read from standard input and prompt before each line.
-++** If isContinuation is true, then a continuation prompt is appropriate.
-++** If isContinuation is zero, then the main prompt should be used.
-++**
-++** If zPrior is not NULL then it is a buffer from a prior call to this
-++** routine that can be reused.
-++**
-++** The result is stored in space obtained from malloc() and must either
-++** be freed by the caller or else passed back into this routine via the
-++** zPrior argument for reuse.
-++*/
-++static char *one_input_line(FILE *in, char *zPrior, int isContinuation){
-++  char *zPrompt;
-++  char *zResult;
-++  if( in!=0 ){
-++    zResult = local_getline(zPrior, in);
-++  }else{
-++    zPrompt = isContinuation ? continuePrompt : mainPrompt;
-++#if SHELL_USE_LOCAL_GETLINE
-++    printf("%s", zPrompt);
-++    fflush(stdout);
-++    zResult = local_getline(zPrior, stdin);
-++#else
-++    free(zPrior);
-++    zResult = shell_readline(zPrompt);
-++    if( zResult && *zResult ) shell_add_history(zResult);
-++#endif
-++  }
-++  return zResult;
-++}
-++/*
-++** A variable length string to which one can append text.
-++*/
-++typedef struct ShellText ShellText;
-++struct ShellText {
-++  char *z;
-++  int n;
-++  int nAlloc;
-++};
-++
-++/*
-++** Initialize and destroy a ShellText object
-++*/
-++static void initText(ShellText *p){
-++  memset(p, 0, sizeof(*p));
-++}
-++static void freeText(ShellText *p){
-++  free(p->z);
-++  initText(p);
-++}
-++
-++/* zIn is either a pointer to a NULL-terminated string in memory obtained
-++** from malloc(), or a NULL pointer. The string pointed to by zAppend is
-++** added to zIn, and the result returned in memory obtained from malloc().
-++** zIn, if it was not NULL, is freed.
-++**
-++** If the third argument, quote, is not '\0', then it is used as a
-++** quote character for zAppend.
-++*/
-++static void appendText(ShellText *p, char const *zAppend, char quote){
-++  int len;
-++  int i;
-++  int nAppend = strlen30(zAppend);
-++
-++  len = nAppend+p->n+1;
-++  if( quote ){
-++    len += 2;
-++    for(i=0; i<nAppend; i++){
-++      if( zAppend[i]==quote ) len++;
-++    }
-++  }
-++
-++  if( p->n+len>=p->nAlloc ){
-++    p->nAlloc = p->nAlloc*2 + len + 20;
-++    p->z = realloc(p->z, p->nAlloc);
-++    if( p->z==0 ){
-++      memset(p, 0, sizeof(*p));
-++      return;
-++    }
-++  }
-++
-++  if( quote ){
-++    char *zCsr = p->z+p->n;
-++    *zCsr++ = quote;
-++    for(i=0; i<nAppend; i++){
-++      *zCsr++ = zAppend[i];
-++      if( zAppend[i]==quote ) *zCsr++ = quote;
-++    }
-++    *zCsr++ = quote;
-++    p->n = (int)(zCsr - p->z);
-++    *zCsr = '\0';
-++  }else{
-++    memcpy(p->z+p->n, zAppend, nAppend);
-++    p->n += nAppend;
-++    p->z[p->n] = '\0';
-++  }
-++}
-++
-++/*
-++** Attempt to determine if identifier zName needs to be quoted, either
-++** because it contains non-alphanumeric characters, or because it is an
-++** SQLite keyword.  Be conservative in this estimate:  When in doubt assume
-++** that quoting is required.
-++**
-++** Return '"' if quoting is required.  Return 0 if no quoting is required.
-++*/
-++static char quoteChar(const char *zName){
-++  /* All SQLite keywords, in alphabetical order */
-++  static const char *azKeywords[] = {
-++    "ABORT", "ACTION", "ADD", "AFTER", "ALL", "ALTER", "ANALYZE", "AND", "AS",
-++    "ASC", "ATTACH", "AUTOINCREMENT", "BEFORE", "BEGIN", "BETWEEN", "BY",
-++    "CASCADE", "CASE", "CAST", "CHECK", "COLLATE", "COLUMN", "COMMIT",
-++    "CONFLICT", "CONSTRAINT", "CREATE", "CROSS", "CURRENT_DATE",
-++    "CURRENT_TIME", "CURRENT_TIMESTAMP", "DATABASE", "DEFAULT", "DEFERRABLE",
-++    "DEFERRED", "DELETE", "DESC", "DETACH", "DISTINCT", "DROP", "EACH",
-++    "ELSE", "END", "ESCAPE", "EXCEPT", "EXCLUSIVE", "EXISTS", "EXPLAIN",
-++    "FAIL", "FOR", "FOREIGN", "FROM", "FULL", "GLOB", "GROUP", "HAVING", "IF",
-++    "IGNORE", "IMMEDIATE", "IN", "INDEX", "INDEXED", "INITIALLY", "INNER",
-++    "INSERT", "INSTEAD", "INTERSECT", "INTO", "IS", "ISNULL", "JOIN", "KEY",
-++    "LEFT", "LIKE", "LIMIT", "MATCH", "NATURAL", "NO", "NOT", "NOTNULL",
-++    "NULL", "OF", "OFFSET", "ON", "OR", "ORDER", "OUTER", "PLAN", "PRAGMA",
-++    "PRIMARY", "QUERY", "RAISE", "RECURSIVE", "REFERENCES", "REGEXP",
-++    "REINDEX", "RELEASE", "RENAME", "REPLACE", "RESTRICT", "RIGHT",
-++    "ROLLBACK", "ROW", "SAVEPOINT", "SELECT", "SET", "TABLE", "TEMP",
-++    "TEMPORARY", "THEN", "TO", "TRANSACTION", "TRIGGER", "UNION", "UNIQUE",
-++    "UPDATE", "USING", "VACUUM", "VALUES", "VIEW", "VIRTUAL", "WHEN", "WHERE",
-++    "WITH", "WITHOUT",
-++  };
-++  int i, lwr, upr, mid, c;
-++  if( !isalpha((unsigned char)zName[0]) && zName[0]!='_' ) return '"';
-++  for(i=0; zName[i]; i++){
-++    if( !isalnum((unsigned char)zName[i]) && zName[i]!='_' ) return '"';
-++  }
-++  lwr = 0;
-++  upr = sizeof(azKeywords)/sizeof(azKeywords[0]) - 1;
-++  while( lwr<=upr ){
-++    mid = (lwr+upr)/2;
-++    c = sqlite3_stricmp(azKeywords[mid], zName);
-++    if( c==0 ) return '"';
-++    if( c<0 ){
-++      lwr = mid+1;
-++    }else{
-++      upr = mid-1;
-++    }
-++  }
-++  return 0;
-++}
-++
-++/*
-++** SQL function:  shell_add_schema(S,X)
-++**
-++** Add the schema name X to the CREATE statement in S and return the result.
-++** Examples:
-++**
-++**    CREATE TABLE t1(x)   ->   CREATE TABLE xyz.t1(x);
-++**
-++** Also works on
-++**
-++**    CREATE INDEX
-++**    CREATE UNIQUE INDEX
-++**    CREATE VIEW
-++**    CREATE TRIGGER
-++**    CREATE VIRTUAL TABLE
-++**
-++** This UDF is used by the .schema command to insert the schema name of
-++** attached databases into the middle of the sqlite_master.sql field.
-++*/
-++static void shellAddSchemaName(
-++  sqlite3_context *pCtx,
-++  int nVal,
-++  sqlite3_value **apVal
-++){
-++  static const char *aPrefix[] = {
-++     "TABLE",
-++     "INDEX",
-++     "UNIQUE INDEX",
-++     "VIEW",
-++     "TRIGGER",
-++     "VIRTUAL TABLE"
-++  };
-++  int i = 0;
-++  const char *zIn = (const char*)sqlite3_value_text(apVal[0]);
-++  const char *zSchema = (const char*)sqlite3_value_text(apVal[1]);
-++  assert( nVal==2 );
-++  if( zIn!=0 && strncmp(zIn, "CREATE ", 7)==0 ){
-++    for(i=0; i<(int)(sizeof(aPrefix)/sizeof(aPrefix[0])); i++){
-++      int n = strlen30(aPrefix[i]);
-++      if( strncmp(zIn+7, aPrefix[i], n)==0 && zIn[n+7]==' ' ){
-++        char cQuote = quoteChar(zSchema);
-++        char *z;
-++        if( cQuote ){
-++         z = sqlite3_mprintf("%.*s \"%w\".%s", n+7, zIn, zSchema, zIn+n+8);
-++        }else{
-++          z = sqlite3_mprintf("%.*s %s.%s", n+7, zIn, zSchema, zIn+n+8);
-++        }
-++        sqlite3_result_text(pCtx, z, -1, sqlite3_free);
-++        return;
-++      }
-++    }
-++  }
-++  sqlite3_result_value(pCtx, apVal[0]);
-++}
-++
-++/*
-++** The source code for several run-time loadable extensions is inserted
-++** below by the ../tool/mkshellc.tcl script.  Before processing that included
-++** code, we need to override some macros to make the included program code
-++** work here in the middle of this regular program.
-++*/
-++#define SQLITE_EXTENSION_INIT1
-++#define SQLITE_EXTENSION_INIT2(X) (void)(X)
-++
-++/************************* Begin ../ext/misc/shathree.c ******************/
-++/*
-++** 2017-03-08
-++**
-++** The author disclaims copyright to this source code.  In place of
-++** a legal notice, here is a blessing:
-++**
-++**    May you do good and not evil.
-++**    May you find forgiveness for yourself and forgive others.
-++**    May you share freely, never taking more than you give.
-++**
-++******************************************************************************
-++**
-++** This SQLite extension implements a functions that compute SHA1 hashes.
-++** Two SQL functions are implemented:
-++**
-++**     sha3(X,SIZE)
-++**     sha3_query(Y,SIZE)
-++**
-++** The sha3(X) function computes the SHA3 hash of the input X, or NULL if
-++** X is NULL.
-++**
-++** The sha3_query(Y) function evalutes all queries in the SQL statements of Y
-++** and returns a hash of their results.
-++**
-++** The SIZE argument is optional.  If omitted, the SHA3-256 hash algorithm
-++** is used.  If SIZE is included it must be one of the integers 224, 256,
-++** 384, or 512, to determine SHA3 hash variant that is computed.
-++*/
-++SQLITE_EXTENSION_INIT1
-++#include <assert.h>
-++#include <string.h>
-++#include <stdarg.h>
-++typedef sqlite3_uint64 u64;
-++
-++/******************************************************************************
-++** The Hash Engine
-++*/
-++/*
-++** Macros to determine whether the machine is big or little endian,
-++** and whether or not that determination is run-time or compile-time.
-++**
-++** For best performance, an attempt is made to guess at the byte-order
-++** using C-preprocessor macros.  If that is unsuccessful, or if
-++** -DSHA3_BYTEORDER=0 is set, then byte-order is determined
-++** at run-time.
-++*/
-++#ifndef SHA3_BYTEORDER
-++# if defined(i386)     || defined(__i386__)   || defined(_M_IX86) ||    \
-++     defined(__x86_64) || defined(__x86_64__) || defined(_M_X64)  ||    \
-++     defined(_M_AMD64) || defined(_M_ARM)     || defined(__x86)   ||    \
-++     defined(__arm__)
-++#   define SHA3_BYTEORDER    1234
-++# elif defined(sparc)    || defined(__ppc__)
-++#   define SHA3_BYTEORDER    4321
-++# else
-++#   define SHA3_BYTEORDER 0
-++# endif
-++#endif
-++
-++
-++/*
-++** State structure for a SHA3 hash in progress
-++*/
-++typedef struct SHA3Context SHA3Context;
-++struct SHA3Context {
-++  union {
-++    u64 s[25];                /* Keccak state. 5x5 lines of 64 bits each */
-++    unsigned char x[1600];    /* ... or 1600 bytes */
-++  } u;
-++  unsigned nRate;        /* Bytes of input accepted per Keccak iteration */
-++  unsigned nLoaded;      /* Input bytes loaded into u.x[] so far this cycle */
-++  unsigned ixMask;       /* Insert next input into u.x[nLoaded^ixMask]. */
-++};
-++
-++/*
-++** A single step of the Keccak mixing function for a 1600-bit state
-++*/
-++static void KeccakF1600Step(SHA3Context *p){
-++  int i;
-++  u64 B0, B1, B2, B3, B4;
-++  u64 C0, C1, C2, C3, C4;
-++  u64 D0, D1, D2, D3, D4;
-++  static const u64 RC[] = {
-++    0x0000000000000001ULL,  0x0000000000008082ULL,
-++    0x800000000000808aULL,  0x8000000080008000ULL,
-++    0x000000000000808bULL,  0x0000000080000001ULL,
-++    0x8000000080008081ULL,  0x8000000000008009ULL,
-++    0x000000000000008aULL,  0x0000000000000088ULL,
-++    0x0000000080008009ULL,  0x000000008000000aULL,
-++    0x000000008000808bULL,  0x800000000000008bULL,
-++    0x8000000000008089ULL,  0x8000000000008003ULL,
-++    0x8000000000008002ULL,  0x8000000000000080ULL,
-++    0x000000000000800aULL,  0x800000008000000aULL,
-++    0x8000000080008081ULL,  0x8000000000008080ULL,
-++    0x0000000080000001ULL,  0x8000000080008008ULL
-++  };
-++# define A00 (p->u.s[0])
-++# define A01 (p->u.s[1])
-++# define A02 (p->u.s[2])
-++# define A03 (p->u.s[3])
-++# define A04 (p->u.s[4])
-++# define A10 (p->u.s[5])
-++# define A11 (p->u.s[6])
-++# define A12 (p->u.s[7])
-++# define A13 (p->u.s[8])
-++# define A14 (p->u.s[9])
-++# define A20 (p->u.s[10])
-++# define A21 (p->u.s[11])
-++# define A22 (p->u.s[12])
-++# define A23 (p->u.s[13])
-++# define A24 (p->u.s[14])
-++# define A30 (p->u.s[15])
-++# define A31 (p->u.s[16])
-++# define A32 (p->u.s[17])
-++# define A33 (p->u.s[18])
-++# define A34 (p->u.s[19])
-++# define A40 (p->u.s[20])
-++# define A41 (p->u.s[21])
-++# define A42 (p->u.s[22])
-++# define A43 (p->u.s[23])
-++# define A44 (p->u.s[24])
-++# define ROL64(a,x) ((a<<x)|(a>>(64-x)))
-++
-++  for(i=0; i<24; i+=4){
-++    C0 = A00^A10^A20^A30^A40;
-++    C1 = A01^A11^A21^A31^A41;
-++    C2 = A02^A12^A22^A32^A42;
-++    C3 = A03^A13^A23^A33^A43;
-++    C4 = A04^A14^A24^A34^A44;
-++    D0 = C4^ROL64(C1, 1);
-++    D1 = C0^ROL64(C2, 1);
-++    D2 = C1^ROL64(C3, 1);
-++    D3 = C2^ROL64(C4, 1);
-++    D4 = C3^ROL64(C0, 1);
-++
-++    B0 = (A00^D0);
-++    B1 = ROL64((A11^D1), 44);
-++    B2 = ROL64((A22^D2), 43);
-++    B3 = ROL64((A33^D3), 21);
-++    B4 = ROL64((A44^D4), 14);
-++    A00 =   B0 ^((~B1)&  B2 );
-++    A00 ^= RC[i];
-++    A11 =   B1 ^((~B2)&  B3 );
-++    A22 =   B2 ^((~B3)&  B4 );
-++    A33 =   B3 ^((~B4)&  B0 );
-++    A44 =   B4 ^((~B0)&  B1 );
-++
-++    B2 = ROL64((A20^D0), 3);
-++    B3 = ROL64((A31^D1), 45);
-++    B4 = ROL64((A42^D2), 61);
-++    B0 = ROL64((A03^D3), 28);
-++    B1 = ROL64((A14^D4), 20);
-++    A20 =   B0 ^((~B1)&  B2 );
-++    A31 =   B1 ^((~B2)&  B3 );
-++    A42 =   B2 ^((~B3)&  B4 );
-++    A03 =   B3 ^((~B4)&  B0 );
-++    A14 =   B4 ^((~B0)&  B1 );
-++
-++    B4 = ROL64((A40^D0), 18);
-++    B0 = ROL64((A01^D1), 1);
-++    B1 = ROL64((A12^D2), 6);
-++    B2 = ROL64((A23^D3), 25);
-++    B3 = ROL64((A34^D4), 8);
-++    A40 =   B0 ^((~B1)&  B2 );
-++    A01 =   B1 ^((~B2)&  B3 );
-++    A12 =   B2 ^((~B3)&  B4 );
-++    A23 =   B3 ^((~B4)&  B0 );
-++    A34 =   B4 ^((~B0)&  B1 );
-++
-++    B1 = ROL64((A10^D0), 36);
-++    B2 = ROL64((A21^D1), 10);
-++    B3 = ROL64((A32^D2), 15);
-++    B4 = ROL64((A43^D3), 56);
-++    B0 = ROL64((A04^D4), 27);
-++    A10 =   B0 ^((~B1)&  B2 );
-++    A21 =   B1 ^((~B2)&  B3 );
-++    A32 =   B2 ^((~B3)&  B4 );
-++    A43 =   B3 ^((~B4)&  B0 );
-++    A04 =   B4 ^((~B0)&  B1 );
-++
-++    B3 = ROL64((A30^D0), 41);
-++    B4 = ROL64((A41^D1), 2);
-++    B0 = ROL64((A02^D2), 62);
-++    B1 = ROL64((A13^D3), 55);
-++    B2 = ROL64((A24^D4), 39);
-++    A30 =   B0 ^((~B1)&  B2 );
-++    A41 =   B1 ^((~B2)&  B3 );
-++    A02 =   B2 ^((~B3)&  B4 );
-++    A13 =   B3 ^((~B4)&  B0 );
-++    A24 =   B4 ^((~B0)&  B1 );
-++
-++    C0 = A00^A20^A40^A10^A30;
-++    C1 = A11^A31^A01^A21^A41;
-++    C2 = A22^A42^A12^A32^A02;
-++    C3 = A33^A03^A23^A43^A13;
-++    C4 = A44^A14^A34^A04^A24;
-++    D0 = C4^ROL64(C1, 1);
-++    D1 = C0^ROL64(C2, 1);
-++    D2 = C1^ROL64(C3, 1);
-++    D3 = C2^ROL64(C4, 1);
-++    D4 = C3^ROL64(C0, 1);
-++
-++    B0 = (A00^D0);
-++    B1 = ROL64((A31^D1), 44);
-++    B2 = ROL64((A12^D2), 43);
-++    B3 = ROL64((A43^D3), 21);
-++    B4 = ROL64((A24^D4), 14);
-++    A00 =   B0 ^((~B1)&  B2 );
-++    A00 ^= RC[i+1];
-++    A31 =   B1 ^((~B2)&  B3 );
-++    A12 =   B2 ^((~B3)&  B4 );
-++    A43 =   B3 ^((~B4)&  B0 );
-++    A24 =   B4 ^((~B0)&  B1 );
-++
-++    B2 = ROL64((A40^D0), 3);
-++    B3 = ROL64((A21^D1), 45);
-++    B4 = ROL64((A02^D2), 61);
-++    B0 = ROL64((A33^D3), 28);
-++    B1 = ROL64((A14^D4), 20);
-++    A40 =   B0 ^((~B1)&  B2 );
-++    A21 =   B1 ^((~B2)&  B3 );
-++    A02 =   B2 ^((~B3)&  B4 );
-++    A33 =   B3 ^((~B4)&  B0 );
-++    A14 =   B4 ^((~B0)&  B1 );
-++
-++    B4 = ROL64((A30^D0), 18);
-++    B0 = ROL64((A11^D1), 1);
-++    B1 = ROL64((A42^D2), 6);
-++    B2 = ROL64((A23^D3), 25);
-++    B3 = ROL64((A04^D4), 8);
-++    A30 =   B0 ^((~B1)&  B2 );
-++    A11 =   B1 ^((~B2)&  B3 );
-++    A42 =   B2 ^((~B3)&  B4 );
-++    A23 =   B3 ^((~B4)&  B0 );
-++    A04 =   B4 ^((~B0)&  B1 );
-++
-++    B1 = ROL64((A20^D0), 36);
-++    B2 = ROL64((A01^D1), 10);
-++    B3 = ROL64((A32^D2), 15);
-++    B4 = ROL64((A13^D3), 56);
-++    B0 = ROL64((A44^D4), 27);
-++    A20 =   B0 ^((~B1)&  B2 );
-++    A01 =   B1 ^((~B2)&  B3 );
-++    A32 =   B2 ^((~B3)&  B4 );
-++    A13 =   B3 ^((~B4)&  B0 );
-++    A44 =   B4 ^((~B0)&  B1 );
-++
-++    B3 = ROL64((A10^D0), 41);
-++    B4 = ROL64((A41^D1), 2);
-++    B0 = ROL64((A22^D2), 62);
-++    B1 = ROL64((A03^D3), 55);
-++    B2 = ROL64((A34^D4), 39);
-++    A10 =   B0 ^((~B1)&  B2 );
-++    A41 =   B1 ^((~B2)&  B3 );
-++    A22 =   B2 ^((~B3)&  B4 );
-++    A03 =   B3 ^((~B4)&  B0 );
-++    A34 =   B4 ^((~B0)&  B1 );
-++
-++    C0 = A00^A40^A30^A20^A10;
-++    C1 = A31^A21^A11^A01^A41;
-++    C2 = A12^A02^A42^A32^A22;
-++    C3 = A43^A33^A23^A13^A03;
-++    C4 = A24^A14^A04^A44^A34;
-++    D0 = C4^ROL64(C1, 1);
-++    D1 = C0^ROL64(C2, 1);
-++    D2 = C1^ROL64(C3, 1);
-++    D3 = C2^ROL64(C4, 1);
-++    D4 = C3^ROL64(C0, 1);
-++
-++    B0 = (A00^D0);
-++    B1 = ROL64((A21^D1), 44);
-++    B2 = ROL64((A42^D2), 43);
-++    B3 = ROL64((A13^D3), 21);
-++    B4 = ROL64((A34^D4), 14);
-++    A00 =   B0 ^((~B1)&  B2 );
-++    A00 ^= RC[i+2];
-++    A21 =   B1 ^((~B2)&  B3 );
-++    A42 =   B2 ^((~B3)&  B4 );
-++    A13 =   B3 ^((~B4)&  B0 );
-++    A34 =   B4 ^((~B0)&  B1 );
-++
-++    B2 = ROL64((A30^D0), 3);
-++    B3 = ROL64((A01^D1), 45);
-++    B4 = ROL64((A22^D2), 61);
-++    B0 = ROL64((A43^D3), 28);
-++    B1 = ROL64((A14^D4), 20);
-++    A30 =   B0 ^((~B1)&  B2 );
-++    A01 =   B1 ^((~B2)&  B3 );
-++    A22 =   B2 ^((~B3)&  B4 );
-++    A43 =   B3 ^((~B4)&  B0 );
-++    A14 =   B4 ^((~B0)&  B1 );
-++
-++    B4 = ROL64((A10^D0), 18);
-++    B0 = ROL64((A31^D1), 1);
-++    B1 = ROL64((A02^D2), 6);
-++    B2 = ROL64((A23^D3), 25);
-++    B3 = ROL64((A44^D4), 8);
-++    A10 =   B0 ^((~B1)&  B2 );
-++    A31 =   B1 ^((~B2)&  B3 );
-++    A02 =   B2 ^((~B3)&  B4 );
-++    A23 =   B3 ^((~B4)&  B0 );
-++    A44 =   B4 ^((~B0)&  B1 );
-++
-++    B1 = ROL64((A40^D0), 36);
-++    B2 = ROL64((A11^D1), 10);
-++    B3 = ROL64((A32^D2), 15);
-++    B4 = ROL64((A03^D3), 56);
-++    B0 = ROL64((A24^D4), 27);
-++    A40 =   B0 ^((~B1)&  B2 );
-++    A11 =   B1 ^((~B2)&  B3 );
-++    A32 =   B2 ^((~B3)&  B4 );
-++    A03 =   B3 ^((~B4)&  B0 );
-++    A24 =   B4 ^((~B0)&  B1 );
-++
-++    B3 = ROL64((A20^D0), 41);
-++    B4 = ROL64((A41^D1), 2);
-++    B0 = ROL64((A12^D2), 62);
-++    B1 = ROL64((A33^D3), 55);
-++    B2 = ROL64((A04^D4), 39);
-++    A20 =   B0 ^((~B1)&  B2 );
-++    A41 =   B1 ^((~B2)&  B3 );
-++    A12 =   B2 ^((~B3)&  B4 );
-++    A33 =   B3 ^((~B4)&  B0 );
-++    A04 =   B4 ^((~B0)&  B1 );
-++
-++    C0 = A00^A30^A10^A40^A20;
-++    C1 = A21^A01^A31^A11^A41;
-++    C2 = A42^A22^A02^A32^A12;
-++    C3 = A13^A43^A23^A03^A33;
-++    C4 = A34^A14^A44^A24^A04;
-++    D0 = C4^ROL64(C1, 1);
-++    D1 = C0^ROL64(C2, 1);
-++    D2 = C1^ROL64(C3, 1);
-++    D3 = C2^ROL64(C4, 1);
-++    D4 = C3^ROL64(C0, 1);
-++
-++    B0 = (A00^D0);
-++    B1 = ROL64((A01^D1), 44);
-++    B2 = ROL64((A02^D2), 43);
-++    B3 = ROL64((A03^D3), 21);
-++    B4 = ROL64((A04^D4), 14);
-++    A00 =   B0 ^((~B1)&  B2 );
-++    A00 ^= RC[i+3];
-++    A01 =   B1 ^((~B2)&  B3 );
-++    A02 =   B2 ^((~B3)&  B4 );
-++    A03 =   B3 ^((~B4)&  B0 );
-++    A04 =   B4 ^((~B0)&  B1 );
-++
-++    B2 = ROL64((A10^D0), 3);
-++    B3 = ROL64((A11^D1), 45);
-++    B4 = ROL64((A12^D2), 61);
-++    B0 = ROL64((A13^D3), 28);
-++    B1 = ROL64((A14^D4), 20);
-++    A10 =   B0 ^((~B1)&  B2 );
-++    A11 =   B1 ^((~B2)&  B3 );
-++    A12 =   B2 ^((~B3)&  B4 );
-++    A13 =   B3 ^((~B4)&  B0 );
-++    A14 =   B4 ^((~B0)&  B1 );
-++
-++    B4 = ROL64((A20^D0), 18);
-++    B0 = ROL64((A21^D1), 1);
-++    B1 = ROL64((A22^D2), 6);
-++    B2 = ROL64((A23^D3), 25);
-++    B3 = ROL64((A24^D4), 8);
-++    A20 =   B0 ^((~B1)&  B2 );
-++    A21 =   B1 ^((~B2)&  B3 );
-++    A22 =   B2 ^((~B3)&  B4 );
-++    A23 =   B3 ^((~B4)&  B0 );
-++    A24 =   B4 ^((~B0)&  B1 );
-++
-++    B1 = ROL64((A30^D0), 36);
-++    B2 = ROL64((A31^D1), 10);
-++    B3 = ROL64((A32^D2), 15);
-++    B4 = ROL64((A33^D3), 56);
-++    B0 = ROL64((A34^D4), 27);
-++    A30 =   B0 ^((~B1)&  B2 );
-++    A31 =   B1 ^((~B2)&  B3 );
-++    A32 =   B2 ^((~B3)&  B4 );
-++    A33 =   B3 ^((~B4)&  B0 );
-++    A34 =   B4 ^((~B0)&  B1 );
-++
-++    B3 = ROL64((A40^D0), 41);
-++    B4 = ROL64((A41^D1), 2);
-++    B0 = ROL64((A42^D2), 62);
-++    B1 = ROL64((A43^D3), 55);
-++    B2 = ROL64((A44^D4), 39);
-++    A40 =   B0 ^((~B1)&  B2 );
-++    A41 =   B1 ^((~B2)&  B3 );
-++    A42 =   B2 ^((~B3)&  B4 );
-++    A43 =   B3 ^((~B4)&  B0 );
-++    A44 =   B4 ^((~B0)&  B1 );
-++  }
-++}
-++
-++/*
-++** Initialize a new hash.  iSize determines the size of the hash
-++** in bits and should be one of 224, 256, 384, or 512.  Or iSize
-++** can be zero to use the default hash size of 256 bits.
-++*/
-++static void SHA3Init(SHA3Context *p, int iSize){
-++  memset(p, 0, sizeof(*p));
-++  if( iSize>=128 && iSize<=512 ){
-++    p->nRate = (1600 - ((iSize + 31)&~31)*2)/8;
-++  }else{
-++    p->nRate = (1600 - 2*256)/8;
-++  }
-++#if SHA3_BYTEORDER==1234
-++  /* Known to be little-endian at compile-time. No-op */
-++#elif SHA3_BYTEORDER==4321
-++  p->ixMask = 7;  /* Big-endian */
-++#else
-++  {
-++    static unsigned int one = 1;
-++    if( 1==*(unsigned char*)&one ){
-++      /* Little endian.  No byte swapping. */
-++      p->ixMask = 0;
-++    }else{
-++      /* Big endian.  Byte swap. */
-++      p->ixMask = 7;
-++    }
-++  }
-++#endif
-++}
-++
-++/*
-++** Make consecutive calls to the SHA3Update function to add new content
-++** to the hash
-++*/
-++static void SHA3Update(
-++  SHA3Context *p,
-++  const unsigned char *aData,
-++  unsigned int nData
-++){
-++  unsigned int i = 0;
-++#if SHA3_BYTEORDER==1234
-++  if( (p->nLoaded % 8)==0 && ((aData - (const unsigned char*)0)&7)==0 ){
-++    for(; i+7<nData; i+=8){
-++      p->u.s[p->nLoaded/8] ^= *(u64*)&aData[i];
-++      p->nLoaded += 8;
-++      if( p->nLoaded>=p->nRate ){
-++        KeccakF1600Step(p);
-++        p->nLoaded = 0;
-++      }
-++    }
-++  }
-++#endif
-++  for(; i<nData; i++){
-++#if SHA3_BYTEORDER==1234
-++    p->u.x[p->nLoaded] ^= aData[i];
-++#elif SHA3_BYTEORDER==4321
-++    p->u.x[p->nLoaded^0x07] ^= aData[i];
-++#else
-++    p->u.x[p->nLoaded^p->ixMask] ^= aData[i];
-++#endif
-++    p->nLoaded++;
-++    if( p->nLoaded==p->nRate ){
-++      KeccakF1600Step(p);
-++      p->nLoaded = 0;
-++    }
-++  }
-++}
-++
-++/*
-++** After all content has been added, invoke SHA3Final() to compute
-++** the final hash.  The function returns a pointer to the binary
-++** hash value.
-++*/
-++static unsigned char *SHA3Final(SHA3Context *p){
-++  unsigned int i;
-++  if( p->nLoaded==p->nRate-1 ){
-++    const unsigned char c1 = 0x86;
-++    SHA3Update(p, &c1, 1);
-++  }else{
-++    const unsigned char c2 = 0x06;
-++    const unsigned char c3 = 0x80;
-++    SHA3Update(p, &c2, 1);
-++    p->nLoaded = p->nRate - 1;
-++    SHA3Update(p, &c3, 1);
-++  }
-++  for(i=0; i<p->nRate; i++){
-++    p->u.x[i+p->nRate] = p->u.x[i^p->ixMask];
-++  }
-++  return &p->u.x[p->nRate];
-++}
-++/* End of the hashing logic
-++*****************************************************************************/
-++
-++/*
-++** Implementation of the sha3(X,SIZE) function.
-++**
-++** Return a BLOB which is the SIZE-bit SHA3 hash of X.  The default
-++** size is 256.  If X is a BLOB, it is hashed as is.
-++** For all other non-NULL types of input, X is converted into a UTF-8 string
-++** and the string is hashed without the trailing 0x00 terminator.  The hash
-++** of a NULL value is NULL.
-++*/
-++static void sha3Func(
-++  sqlite3_context *context,
-++  int argc,
-++  sqlite3_value **argv
-++){
-++  SHA3Context cx;
-++  int eType = sqlite3_value_type(argv[0]);
-++  int nByte = sqlite3_value_bytes(argv[0]);
-++  int iSize;
-++  if( argc==1 ){
-++    iSize = 256;
-++  }else{
-++    iSize = sqlite3_value_int(argv[1]);
-++    if( iSize!=224 && iSize!=256 && iSize!=384 && iSize!=512 ){
-++      sqlite3_result_error(context, "SHA3 size should be one of: 224 256 "
-++                                    "384 512", -1);
-++      return;
-++    }
-++  }
-++  if( eType==SQLITE_NULL ) return;
-++  SHA3Init(&cx, iSize);
-++  if( eType==SQLITE_BLOB ){
-++    SHA3Update(&cx, sqlite3_value_blob(argv[0]), nByte);
-++  }else{
-++    SHA3Update(&cx, sqlite3_value_text(argv[0]), nByte);
-++  }
-++  sqlite3_result_blob(context, SHA3Final(&cx), iSize/8, SQLITE_TRANSIENT);
-++}
-++
-++/* Compute a string using sqlite3_vsnprintf() with a maximum length
-++** of 50 bytes and add it to the hash.
-++*/
-++static void hash_step_vformat(
-++  SHA3Context *p,                 /* Add content to this context */
-++  const char *zFormat,
-++  ...
-++){
-++  va_list ap;
-++  int n;
-++  char zBuf[50];
-++  va_start(ap, zFormat);
-++  sqlite3_vsnprintf(sizeof(zBuf),zBuf,zFormat,ap);
-++  va_end(ap);
-++  n = (int)strlen(zBuf);
-++  SHA3Update(p, (unsigned char*)zBuf, n);
-++}
-++
-++/*
-++** Implementation of the sha3_query(SQL,SIZE) function.
-++**
-++** This function compiles and runs the SQL statement(s) given in the
-++** argument. The results are hashed using a SIZE-bit SHA3.  The default
-++** size is 256.
-++**
-++** The format of the byte stream that is hashed is summarized as follows:
-++**
-++**       S<n>:<sql>
-++**       R
-++**       N
-++**       I<int>
-++**       F<ieee-float>
-++**       B<size>:<bytes>
-++**       T<size>:<text>
-++**
-++** <sql> is the original SQL text for each statement run and <n> is
-++** the size of that text.  The SQL text is UTF-8.  A single R character
-++** occurs before the start of each row.  N means a NULL value.
-++** I mean an 8-byte little-endian integer <int>.  F is a floating point
-++** number with an 8-byte little-endian IEEE floating point value <ieee-float>.
-++** B means blobs of <size> bytes.  T means text rendered as <size>
-++** bytes of UTF-8.  The <n> and <size> values are expressed as an ASCII
-++** text integers.
-++**
-++** For each SQL statement in the X input, there is one S segment.  Each
-++** S segment is followed by zero or more R segments, one for each row in the
-++** result set.  After each R, there are one or more N, I, F, B, or T segments,
-++** one for each column in the result set.  Segments are concatentated directly
-++** with no delimiters of any kind.
-++*/
-++static void sha3QueryFunc(
-++  sqlite3_context *context,
-++  int argc,
-++  sqlite3_value **argv
-++){
-++  sqlite3 *db = sqlite3_context_db_handle(context);
-++  const char *zSql = (const char*)sqlite3_value_text(argv[0]);
-++  sqlite3_stmt *pStmt = 0;
-++  int nCol;                   /* Number of columns in the result set */
-++  int i;                      /* Loop counter */
-++  int rc;
-++  int n;
-++  const char *z;
-++  SHA3Context cx;
-++  int iSize;
-++
-++  if( argc==1 ){
-++    iSize = 256;
-++  }else{
-++    iSize = sqlite3_value_int(argv[1]);
-++    if( iSize!=224 && iSize!=256 && iSize!=384 && iSize!=512 ){
-++      sqlite3_result_error(context, "SHA3 size should be one of: 224 256 "
-++                                    "384 512", -1);
-++      return;
-++    }
-++  }
-++  if( zSql==0 ) return;
-++  SHA3Init(&cx, iSize);
-++  while( zSql[0] ){
-++    rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, &zSql);
-++    if( rc ){
-++      char *zMsg = sqlite3_mprintf("error SQL statement [%s]: %s",
-++                                   zSql, sqlite3_errmsg(db));
-++      sqlite3_finalize(pStmt);
-++      sqlite3_result_error(context, zMsg, -1);
-++      sqlite3_free(zMsg);
-++      return;
-++    }
-++    if( !sqlite3_stmt_readonly(pStmt) ){
-++      char *zMsg = sqlite3_mprintf("non-query: [%s]", sqlite3_sql(pStmt));
-++      sqlite3_finalize(pStmt);
-++      sqlite3_result_error(context, zMsg, -1);
-++      sqlite3_free(zMsg);
-++      return;
-++    }
-++    nCol = sqlite3_column_count(pStmt);
-++    z = sqlite3_sql(pStmt);
-++    n = (int)strlen(z);
-++    hash_step_vformat(&cx,"S%d:",n);
-++    SHA3Update(&cx,(unsigned char*)z,n);
-++
-++    /* Compute a hash over the result of the query */
-++    while( SQLITE_ROW==sqlite3_step(pStmt) ){
-++      SHA3Update(&cx,(const unsigned char*)"R",1);
-++      for(i=0; i<nCol; i++){
-++        switch( sqlite3_column_type(pStmt,i) ){
-++          case SQLITE_NULL: {
-++            SHA3Update(&cx, (const unsigned char*)"N",1);
-++            break;
-++          }
-++          case SQLITE_INTEGER: {
-++            sqlite3_uint64 u;
-++            int j;
-++            unsigned char x[9];
-++            sqlite3_int64 v = sqlite3_column_int64(pStmt,i);
-++            memcpy(&u, &v, 8);
-++            for(j=8; j>=1; j--){
-++              x[j] = u & 0xff;
-++              u >>= 8;
-++            }
-++            x[0] = 'I';
-++            SHA3Update(&cx, x, 9);
-++            break;
-++          }
-++          case SQLITE_FLOAT: {
-++            sqlite3_uint64 u;
-++            int j;
-++            unsigned char x[9];
-++            double r = sqlite3_column_double(pStmt,i);
-++            memcpy(&u, &r, 8);
-++            for(j=8; j>=1; j--){
-++              x[j] = u & 0xff;
-++              u >>= 8;
-++            }
-++            x[0] = 'F';
-++            SHA3Update(&cx,x,9);
-++            break;
-++          }
-++          case SQLITE_TEXT: {
-++            int n2 = sqlite3_column_bytes(pStmt, i);
-++            const unsigned char *z2 = sqlite3_column_text(pStmt, i);
-++            hash_step_vformat(&cx,"T%d:",n2);
-++            SHA3Update(&cx, z2, n2);
-++            break;
-++          }
-++          case SQLITE_BLOB: {
-++            int n2 = sqlite3_column_bytes(pStmt, i);
-++            const unsigned char *z2 = sqlite3_column_blob(pStmt, i);
-++            hash_step_vformat(&cx,"B%d:",n2);
-++            SHA3Update(&cx, z2, n2);
-++            break;
-++          }
-++        }
-++      }
-++    }
-++    sqlite3_finalize(pStmt);
-++  }
-++  sqlite3_result_blob(context, SHA3Final(&cx), iSize/8, SQLITE_TRANSIENT);
-++}
-++
-++
-++#ifdef _WIN32
-++
-++#endif
-++int sqlite3_shathree_init(
-++  sqlite3 *db,
-++  char **pzErrMsg,
-++  const sqlite3_api_routines *pApi
-++){
-++  int rc = SQLITE_OK;
-++  SQLITE_EXTENSION_INIT2(pApi);
-++  (void)pzErrMsg;  /* Unused parameter */
-++  rc = sqlite3_create_function(db, "sha3", 1, SQLITE_UTF8, 0,
-++                               sha3Func, 0, 0);
-++  if( rc==SQLITE_OK ){
-++    rc = sqlite3_create_function(db, "sha3", 2, SQLITE_UTF8, 0,
-++                                 sha3Func, 0, 0);
-++  }
-++  if( rc==SQLITE_OK ){
-++    rc = sqlite3_create_function(db, "sha3_query", 1, SQLITE_UTF8, 0,
-++                                 sha3QueryFunc, 0, 0);
-++  }
-++  if( rc==SQLITE_OK ){
-++    rc = sqlite3_create_function(db, "sha3_query", 2, SQLITE_UTF8, 0,
-++                                 sha3QueryFunc, 0, 0);
-++  }
-++  return rc;
-++}
-++
-++/************************* End ../ext/misc/shathree.c ********************/
-++/************************* Begin ../ext/misc/fileio.c ******************/
-++/*
-++** 2014-06-13
-++**
-++** The author disclaims copyright to this source code.  In place of
-++** a legal notice, here is a blessing:
-++**
-++**    May you do good and not evil.
-++**    May you find forgiveness for yourself and forgive others.
-++**    May you share freely, never taking more than you give.
-++**
-++******************************************************************************
-++**
-++** This SQLite extension implements SQL functions readfile() and
-++** writefile().
-++*/
-++SQLITE_EXTENSION_INIT1
-++#include <stdio.h>
-++
-++/*
-++** Implementation of the "readfile(X)" SQL function.  The entire content
-++** of the file named X is read and returned as a BLOB.  NULL is returned
-++** if the file does not exist or is unreadable.
-++*/
-++static void readfileFunc(
-++  sqlite3_context *context,
-++  int argc,
-++  sqlite3_value **argv
-++){
-++  const char *zName;
-++  FILE *in;
-++  long nIn;
-++  void *pBuf;
-++
-++  (void)(argc);  /* Unused parameter */
-++  zName = (const char*)sqlite3_value_text(argv[0]);
-++  if( zName==0 ) return;
-++  in = fopen(zName, "rb");
-++  if( in==0 ) return;
-++  fseek(in, 0, SEEK_END);
-++  nIn = ftell(in);
-++  rewind(in);
-++  pBuf = sqlite3_malloc( nIn );
-++  if( pBuf && 1==fread(pBuf, nIn, 1, in) ){
-++    sqlite3_result_blob(context, pBuf, nIn, sqlite3_free);
-++  }else{
-++    sqlite3_free(pBuf);
-++  }
-++  fclose(in);
-++}
-++
-++/*
-++** Implementation of the "writefile(X,Y)" SQL function.  The argument Y
-++** is written into file X.  The number of bytes written is returned.  Or
-++** NULL is returned if something goes wrong, such as being unable to open
-++** file X for writing.
-++*/
-++static void writefileFunc(
-++  sqlite3_context *context,
-++  int argc,
-++  sqlite3_value **argv
-++){
-++  FILE *out;
-++  const char *z;
-++  sqlite3_int64 rc;
-++  const char *zFile;
-++
-++  (void)(argc);  /* Unused parameter */
-++  zFile = (const char*)sqlite3_value_text(argv[0]);
-++  if( zFile==0 ) return;
-++  out = fopen(zFile, "wb");
-++  if( out==0 ) return;
-++  z = (const char*)sqlite3_value_blob(argv[1]);
-++  if( z==0 ){
-++    rc = 0;
-++  }else{
-++    rc = fwrite(z, 1, sqlite3_value_bytes(argv[1]), out);
-++  }
-++  fclose(out);
-++  sqlite3_result_int64(context, rc);
-++}
-++
-++
-++#ifdef _WIN32
-++
-++#endif
-++int sqlite3_fileio_init(
-++  sqlite3 *db,
-++  char **pzErrMsg,
-++  const sqlite3_api_routines *pApi
-++){
-++  int rc = SQLITE_OK;
-++  SQLITE_EXTENSION_INIT2(pApi);
-++  (void)pzErrMsg;  /* Unused parameter */
-++  rc = sqlite3_create_function(db, "readfile", 1, SQLITE_UTF8, 0,
-++                               readfileFunc, 0, 0);
-++  if( rc==SQLITE_OK ){
-++    rc = sqlite3_create_function(db, "writefile", 2, SQLITE_UTF8, 0,
-++                                 writefileFunc, 0, 0);
-++  }
-++  return rc;
-++}
-++
-++/************************* End ../ext/misc/fileio.c ********************/
-++/************************* Begin ../ext/misc/completion.c ******************/
-++/*
-++** 2017-07-10
-++**
-++** The author disclaims copyright to this source code.  In place of
-++** a legal notice, here is a blessing:
-++**
-++**    May you do good and not evil.
-++**    May you find forgiveness for yourself and forgive others.
-++**    May you share freely, never taking more than you give.
-++**
-++*************************************************************************
-++**
-++** This file implements an eponymous virtual table that returns suggested
-++** completions for a partial SQL input.
-++**
-++** Suggested usage:
-++**
-++**     SELECT DISTINCT candidate COLLATE nocase
-++**       FROM completion($prefix,$wholeline)
-++**      ORDER BY 1;
-++**
-++** The two query parameters are optional.  $prefix is the text of the
-++** current word being typed and that is to be completed.  $wholeline is
-++** the complete input line, used for context.
-++**
-++** The raw completion() table might return the same candidate multiple
-++** times, for example if the same column name is used to two or more
-++** tables.  And the candidates are returned in an arbitrary order.  Hence,
-++** the DISTINCT and ORDER BY are recommended.
-++**
-++** This virtual table operates at the speed of human typing, and so there
-++** is no attempt to make it fast.  Even a slow implementation will be much
-++** faster than any human can type.
-++**
-++*/
-++SQLITE_EXTENSION_INIT1
-++#include <assert.h>
-++#include <string.h>
-++#include <ctype.h>
-++
-++#ifndef SQLITE_OMIT_VIRTUALTABLE
-++
-++/* completion_vtab is a subclass of sqlite3_vtab which will
-++** serve as the underlying representation of a completion virtual table
-++*/
-++typedef struct completion_vtab completion_vtab;
-++struct completion_vtab {
-++  sqlite3_vtab base;  /* Base class - must be first */
-++  sqlite3 *db;        /* Database connection for this completion vtab */
-++};
-++
-++/* completion_cursor is a subclass of sqlite3_vtab_cursor which will
-++** serve as the underlying representation of a cursor that scans
-++** over rows of the result
-++*/
-++typedef struct completion_cursor completion_cursor;
-++struct completion_cursor {
-++  sqlite3_vtab_cursor base;  /* Base class - must be first */
-++  sqlite3 *db;               /* Database connection for this cursor */
-++  int nPrefix, nLine;        /* Number of bytes in zPrefix and zLine */
-++  char *zPrefix;             /* The prefix for the word we want to complete */
-++  char *zLine;               /* The whole that we want to complete */
-++  const char *zCurrentRow;   /* Current output row */
-++  sqlite3_stmt *pStmt;       /* Current statement */
-++  sqlite3_int64 iRowid;      /* The rowid */
-++  int ePhase;                /* Current phase */
-++  int j;                     /* inter-phase counter */
-++};
-++
-++/* Values for ePhase:
-++*/
-++#define COMPLETION_FIRST_PHASE   1
-++#define COMPLETION_KEYWORDS      1
-++#define COMPLETION_PRAGMAS       2
-++#define COMPLETION_FUNCTIONS     3
-++#define COMPLETION_COLLATIONS    4
-++#define COMPLETION_INDEXES       5
-++#define COMPLETION_TRIGGERS      6
-++#define COMPLETION_DATABASES     7
-++#define COMPLETION_TABLES        8
-++#define COMPLETION_COLUMNS       9
-++#define COMPLETION_MODULES       10
-++#define COMPLETION_EOF           11
-++
-++/*
-++** The completionConnect() method is invoked to create a new
-++** completion_vtab that describes the completion virtual table.
-++**
-++** Think of this routine as the constructor for completion_vtab objects.
-++**
-++** All this routine needs to do is:
-++**
-++**    (1) Allocate the completion_vtab object and initialize all fields.
-++**
-++**    (2) Tell SQLite (via the sqlite3_declare_vtab() interface) what the
-++**        result set of queries against completion will look like.
-++*/
-++static int completionConnect(
-++  sqlite3 *db,
-++  void *pAux,
-++  int argc, const char *const*argv,
-++  sqlite3_vtab **ppVtab,
-++  char **pzErr
-++){
-++  completion_vtab *pNew;
-++  int rc;
-++
-++  (void)(pAux);    /* Unused parameter */
-++  (void)(argc);    /* Unused parameter */
-++  (void)(argv);    /* Unused parameter */
-++  (void)(pzErr);   /* Unused parameter */
-++
-++/* Column numbers */
-++#define COMPLETION_COLUMN_CANDIDATE 0  /* Suggested completion of the input */
-++#define COMPLETION_COLUMN_PREFIX    1  /* Prefix of the word to be completed */
-++#define COMPLETION_COLUMN_WHOLELINE 2  /* Entire line seen so far */
-++#define COMPLETION_COLUMN_PHASE     3  /* ePhase - used for debugging only */
-++
-++  rc = sqlite3_declare_vtab(db,
-++      "CREATE TABLE x("
-++      "  candidate TEXT,"
-++      "  prefix TEXT HIDDEN,"
-++      "  wholeline TEXT HIDDEN,"
-++      "  phase INT HIDDEN"        /* Used for debugging only */
-++      ")");
-++  if( rc==SQLITE_OK ){
-++    pNew = sqlite3_malloc( sizeof(*pNew) );
-++    *ppVtab = (sqlite3_vtab*)pNew;
-++    if( pNew==0 ) return SQLITE_NOMEM;
-++    memset(pNew, 0, sizeof(*pNew));
-++    pNew->db = db;
-++  }
-++  return rc;
-++}
-++
-++/*
-++** This method is the destructor for completion_cursor objects.
-++*/
-++static int completionDisconnect(sqlite3_vtab *pVtab){
-++  sqlite3_free(pVtab);
-++  return SQLITE_OK;
-++}
-++
-++/*
-++** Constructor for a new completion_cursor object.
-++*/
-++static int completionOpen(sqlite3_vtab *p, sqlite3_vtab_cursor **ppCursor){
-++  completion_cursor *pCur;
-++  pCur = sqlite3_malloc( sizeof(*pCur) );
-++  if( pCur==0 ) return SQLITE_NOMEM;
-++  memset(pCur, 0, sizeof(*pCur));
-++  pCur->db = ((completion_vtab*)p)->db;
-++  *ppCursor = &pCur->base;
-++  return SQLITE_OK;
-++}
-++
-++/*
-++** Reset the completion_cursor.
-++*/
-++static void completionCursorReset(completion_cursor *pCur){
-++  sqlite3_free(pCur->zPrefix);   pCur->zPrefix = 0;  pCur->nPrefix = 0;
-++  sqlite3_free(pCur->zLine);     pCur->zLine = 0;    pCur->nLine = 0;
-++  sqlite3_finalize(pCur->pStmt); pCur->pStmt = 0;
-++  pCur->j = 0;
-++}
-++
-++/*
-++** Destructor for a completion_cursor.
-++*/
-++static int completionClose(sqlite3_vtab_cursor *cur){
-++  completionCursorReset((completion_cursor*)cur);
-++  sqlite3_free(cur);
-++  return SQLITE_OK;
-++}
-++
-++/*
-++** All SQL keywords understood by SQLite
-++*/
-++static const char *completionKwrds[] = {
-++  "ABORT", "ACTION", "ADD", "AFTER", "ALL", "ALTER", "ANALYZE", "AND", "AS",
-++  "ASC", "ATTACH", "AUTOINCREMENT", "BEFORE", "BEGIN", "BETWEEN", "BY",
-++  "CASCADE", "CASE", "CAST", "CHECK", "COLLATE", "COLUMN", "COMMIT",
-++  "CONFLICT", "CONSTRAINT", "CREATE", "CROSS", "CURRENT_DATE",
-++  "CURRENT_TIME", "CURRENT_TIMESTAMP", "DATABASE", "DEFAULT", "DEFERRABLE",
-++  "DEFERRED", "DELETE", "DESC", "DETACH", "DISTINCT", "DROP", "EACH",
-++  "ELSE", "END", "ESCAPE", "EXCEPT", "EXCLUSIVE", "EXISTS", "EXPLAIN",
-++  "FAIL", "FOR", "FOREIGN", "FROM", "FULL", "GLOB", "GROUP", "HAVING", "IF",
-++  "IGNORE", "IMMEDIATE", "IN", "INDEX", "INDEXED", "INITIALLY", "INNER",
-++  "INSERT", "INSTEAD", "INTERSECT", "INTO", "IS", "ISNULL", "JOIN", "KEY",
-++  "LEFT", "LIKE", "LIMIT", "MATCH", "NATURAL", "NO", "NOT", "NOTNULL",
-++  "NULL", "OF", "OFFSET", "ON", "OR", "ORDER", "OUTER", "PLAN", "PRAGMA",
-++  "PRIMARY", "QUERY", "RAISE", "RECURSIVE", "REFERENCES", "REGEXP",
-++  "REINDEX", "RELEASE", "RENAME", "REPLACE", "RESTRICT", "RIGHT",
-++  "ROLLBACK", "ROW", "SAVEPOINT", "SELECT", "SET", "TABLE", "TEMP",
-++  "TEMPORARY", "THEN", "TO", "TRANSACTION", "TRIGGER", "UNION", "UNIQUE",
-++  "UPDATE", "USING", "VACUUM", "VALUES", "VIEW", "VIRTUAL", "WHEN", "WHERE",
-++  "WITH", "WITHOUT",
-++};
-++#define completionKwCount \
-++   (int)(sizeof(completionKwrds)/sizeof(completionKwrds[0]))
-++
-++/*
-++** Advance a completion_cursor to its next row of output.
-++**
-++** The ->ePhase, ->j, and ->pStmt fields of the completion_cursor object
-++** record the current state of the scan.  This routine sets ->zCurrentRow
-++** to the current row of output and then returns.  If no more rows remain,
-++** then ->ePhase is set to COMPLETION_EOF which will signal the virtual
-++** table that has reached the end of its scan.
-++**
-++** The current implementation just lists potential identifiers and
-++** keywords and filters them by zPrefix.  Future enhancements should
-++** take zLine into account to try to restrict the set of identifiers and
-++** keywords based on what would be legal at the current point of input.
-++*/
-++static int completionNext(sqlite3_vtab_cursor *cur){
-++  completion_cursor *pCur = (completion_cursor*)cur;
-++  int eNextPhase = 0;  /* Next phase to try if current phase reaches end */
-++  int iCol = -1;       /* If >=0, step pCur->pStmt and use the i-th column */
-++  pCur->iRowid++;
-++  while( pCur->ePhase!=COMPLETION_EOF ){
-++    switch( pCur->ePhase ){
-++      case COMPLETION_KEYWORDS: {
-++        if( pCur->j >= completionKwCount ){
-++          pCur->zCurrentRow = 0;
-++          pCur->ePhase = COMPLETION_DATABASES;
-++        }else{
-++          pCur->zCurrentRow = completionKwrds[pCur->j++];
-++        }
-++        iCol = -1;
-++        break;
-++      }
-++      case COMPLETION_DATABASES: {
-++        if( pCur->pStmt==0 ){
-++          sqlite3_prepare_v2(pCur->db, "PRAGMA database_list", -1,
-++                             &pCur->pStmt, 0);
-++        }
-++        iCol = 1;
-++        eNextPhase = COMPLETION_TABLES;
-++        break;
-++      }
-++      case COMPLETION_TABLES: {
-++        if( pCur->pStmt==0 ){
-++          sqlite3_stmt *pS2;
-++          char *zSql = 0;
-++          const char *zSep = "";
-++          sqlite3_prepare_v2(pCur->db, "PRAGMA database_list", -1, &pS2, 0);
-++          while( sqlite3_step(pS2)==SQLITE_ROW ){
-++            const char *zDb = (const char*)sqlite3_column_text(pS2, 1);
-++            zSql = sqlite3_mprintf(
-++               "%z%s"
-++               "SELECT name FROM \"%w\".sqlite_master"
-++               " WHERE type='table'",
-++               zSql, zSep, zDb
-++            );
-++            if( zSql==0 ) return SQLITE_NOMEM;
-++            zSep = " UNION ";
-++          }
-++          sqlite3_finalize(pS2);
-++          sqlite3_prepare_v2(pCur->db, zSql, -1, &pCur->pStmt, 0);
-++          sqlite3_free(zSql);
-++        }
-++        iCol = 0;
-++        eNextPhase = COMPLETION_COLUMNS;
-++        break;
-++      }
-++      case COMPLETION_COLUMNS: {
-++        if( pCur->pStmt==0 ){
-++          sqlite3_stmt *pS2;
-++          char *zSql = 0;
-++          const char *zSep = "";
-++          sqlite3_prepare_v2(pCur->db, "PRAGMA database_list", -1, &pS2, 0);
-++          while( sqlite3_step(pS2)==SQLITE_ROW ){
-++            const char *zDb = (const char*)sqlite3_column_text(pS2, 1);
-++            zSql = sqlite3_mprintf(
-++               "%z%s"
-++               "SELECT pti.name FROM \"%w\".sqlite_master AS sm"
-++                       " JOIN pragma_table_info(sm.name,%Q) AS pti"
-++               " WHERE sm.type='table'",
-++               zSql, zSep, zDb, zDb
-++            );
-++            if( zSql==0 ) return SQLITE_NOMEM;
-++            zSep = " UNION ";
-++          }
-++          sqlite3_finalize(pS2);
-++          sqlite3_prepare_v2(pCur->db, zSql, -1, &pCur->pStmt, 0);
-++          sqlite3_free(zSql);
-++        }
-++        iCol = 0;
-++        eNextPhase = COMPLETION_EOF;
-++        break;
-++      }
-++    }
-++    if( iCol<0 ){
-++      /* This case is when the phase presets zCurrentRow */
-++      if( pCur->zCurrentRow==0 ) continue;
-++    }else{
-++      if( sqlite3_step(pCur->pStmt)==SQLITE_ROW ){
-++        /* Extract the next row of content */
-++        pCur->zCurrentRow = (const char*)sqlite3_column_text(pCur->pStmt, iCol);
-++      }else{
-++        /* When all rows are finished, advance to the next phase */
-++        sqlite3_finalize(pCur->pStmt);
-++        pCur->pStmt = 0;
-++        pCur->ePhase = eNextPhase;
-++        continue;
-++      }
-++    }
-++    if( pCur->nPrefix==0 ) break;
-++    if( sqlite3_strnicmp(pCur->zPrefix, pCur->zCurrentRow, pCur->nPrefix)==0 ){
-++      break;
-++    }
-++  }
-++
-++  return SQLITE_OK;
-++}
-++
-++/*
-++** Return values of columns for the row at which the completion_cursor
-++** is currently pointing.
-++*/
-++static int completionColumn(
-++  sqlite3_vtab_cursor *cur,   /* The cursor */
-++  sqlite3_context *ctx,       /* First argument to sqlite3_result_...() */
-++  int i                       /* Which column to return */
-++){
-++  completion_cursor *pCur = (completion_cursor*)cur;
-++  switch( i ){
-++    case COMPLETION_COLUMN_CANDIDATE: {
-++      sqlite3_result_text(ctx, pCur->zCurrentRow, -1, SQLITE_TRANSIENT);
-++      break;
-++    }
-++    case COMPLETION_COLUMN_PREFIX: {
-++      sqlite3_result_text(ctx, pCur->zPrefix, -1, SQLITE_TRANSIENT);
-++      break;
-++    }
-++    case COMPLETION_COLUMN_WHOLELINE: {
-++      sqlite3_result_text(ctx, pCur->zLine, -1, SQLITE_TRANSIENT);
-++      break;
-++    }
-++    case COMPLETION_COLUMN_PHASE: {
-++      sqlite3_result_int(ctx, pCur->ePhase);
-++      break;
-++    }
-++  }
-++  return SQLITE_OK;
-++}
-++
-++/*
-++** Return the rowid for the current row.  In this implementation, the
-++** rowid is the same as the output value.
-++*/
-++static int completionRowid(sqlite3_vtab_cursor *cur, sqlite_int64 *pRowid){
-++  completion_cursor *pCur = (completion_cursor*)cur;
-++  *pRowid = pCur->iRowid;
-++  return SQLITE_OK;
-++}
-++
-++/*
-++** Return TRUE if the cursor has been moved off of the last
-++** row of output.
-++*/
-++static int completionEof(sqlite3_vtab_cursor *cur){
-++  completion_cursor *pCur = (completion_cursor*)cur;
-++  return pCur->ePhase >= COMPLETION_EOF;
-++}
-++
-++/*
-++** This method is called to "rewind" the completion_cursor object back
-++** to the first row of output.  This method is always called at least
-++** once prior to any call to completionColumn() or completionRowid() or
-++** completionEof().
-++*/
-++static int completionFilter(
-++  sqlite3_vtab_cursor *pVtabCursor,
-++  int idxNum, const char *idxStr,
-++  int argc, sqlite3_value **argv
-++){
-++  completion_cursor *pCur = (completion_cursor *)pVtabCursor;
-++  int iArg = 0;
-++  (void)(idxStr);   /* Unused parameter */
-++  (void)(argc);     /* Unused parameter */
-++  completionCursorReset(pCur);
-++  if( idxNum & 1 ){
-++    pCur->nPrefix = sqlite3_value_bytes(argv[iArg]);
-++    if( pCur->nPrefix>0 ){
-++      pCur->zPrefix = sqlite3_mprintf("%s", sqlite3_value_text(argv[iArg]));
-++      if( pCur->zPrefix==0 ) return SQLITE_NOMEM;
-++    }
-++    iArg++;
-++  }
-++  if( idxNum & 2 ){
-++    pCur->nLine = sqlite3_value_bytes(argv[iArg]);
-++    if( pCur->nLine>0 ){
-++      pCur->zLine = sqlite3_mprintf("%s", sqlite3_value_text(argv[iArg]));
-++      if( pCur->zLine==0 ) return SQLITE_NOMEM;
-++    }
-++    iArg++;
-++  }
-++  if( pCur->zLine!=0 && pCur->zPrefix==0 ){
-++    int i = pCur->nLine;
-++    while( i>0 && (isalnum(pCur->zLine[i-1]) || pCur->zLine[i-1]=='_') ){
-++      i--;
-++    }
-++    pCur->nPrefix = pCur->nLine - i;
-++    if( pCur->nPrefix>0 ){
-++      pCur->zPrefix = sqlite3_mprintf("%.*s", pCur->nPrefix, pCur->zLine + i);
-++      if( pCur->zPrefix==0 ) return SQLITE_NOMEM;
-++    }
-++  }
-++  pCur->iRowid = 0;
-++  pCur->ePhase = COMPLETION_FIRST_PHASE;
-++  return completionNext(pVtabCursor);
-++}
-++
-++/*
-++** SQLite will invoke this method one or more times while planning a query
-++** that uses the completion virtual table.  This routine needs to create
-++** a query plan for each invocation and compute an estimated cost for that
-++** plan.
-++**
-++** There are two hidden parameters that act as arguments to the table-valued
-++** function:  "prefix" and "wholeline".  Bit 0 of idxNum is set if "prefix"
-++** is available and bit 1 is set if "wholeline" is available.
-++*/
-++static int completionBestIndex(
-++  sqlite3_vtab *tab,
-++  sqlite3_index_info *pIdxInfo
-++){
-++  int i;                 /* Loop over constraints */
-++  int idxNum = 0;        /* The query plan bitmask */
-++  int prefixIdx = -1;    /* Index of the start= constraint, or -1 if none */
-++  int wholelineIdx = -1; /* Index of the stop= constraint, or -1 if none */
-++  int nArg = 0;          /* Number of arguments that completeFilter() expects */
-++  const struct sqlite3_index_constraint *pConstraint;
-++
-++  (void)(tab);    /* Unused parameter */
-++  pConstraint = pIdxInfo->aConstraint;
-++  for(i=0; i<pIdxInfo->nConstraint; i++, pConstraint++){
-++    if( pConstraint->usable==0 ) continue;
-++    if( pConstraint->op!=SQLITE_INDEX_CONSTRAINT_EQ ) continue;
-++    switch( pConstraint->iColumn ){
-++      case COMPLETION_COLUMN_PREFIX:
-++        prefixIdx = i;
-++        idxNum |= 1;
-++        break;
-++      case COMPLETION_COLUMN_WHOLELINE:
-++        wholelineIdx = i;
-++        idxNum |= 2;
-++        break;
-++    }
-++  }
-++  if( prefixIdx>=0 ){
-++    pIdxInfo->aConstraintUsage[prefixIdx].argvIndex = ++nArg;
-++    pIdxInfo->aConstraintUsage[prefixIdx].omit = 1;
-++  }
-++  if( wholelineIdx>=0 ){
-++    pIdxInfo->aConstraintUsage[wholelineIdx].argvIndex = ++nArg;
-++    pIdxInfo->aConstraintUsage[wholelineIdx].omit = 1;
-++  }
-++  pIdxInfo->idxNum = idxNum;
-++  pIdxInfo->estimatedCost = (double)5000 - 1000*nArg;
-++  pIdxInfo->estimatedRows = 500 - 100*nArg;
-++  return SQLITE_OK;
-++}
-++
-++/*
-++** This following structure defines all the methods for the
-++** completion virtual table.
-++*/
-++static sqlite3_module completionModule = {
-++  0,                         /* iVersion */
-++  0,                         /* xCreate */
-++  completionConnect,         /* xConnect */
-++  completionBestIndex,       /* xBestIndex */
-++  completionDisconnect,      /* xDisconnect */
-++  0,                         /* xDestroy */
-++  completionOpen,            /* xOpen - open a cursor */
-++  completionClose,           /* xClose - close a cursor */
-++  completionFilter,          /* xFilter - configure scan constraints */
-++  completionNext,            /* xNext - advance a cursor */
-++  completionEof,             /* xEof - check for end of scan */
-++  completionColumn,          /* xColumn - read data */
-++  completionRowid,           /* xRowid - read data */
-++  0,                         /* xUpdate */
-++  0,                         /* xBegin */
-++  0,                         /* xSync */
-++  0,                         /* xCommit */
-++  0,                         /* xRollback */
-++  0,                         /* xFindMethod */
-++  0,                         /* xRename */
-++  0,                         /* xSavepoint */
-++  0,                         /* xRelease */
-++  0                          /* xRollbackTo */
-++};
-++
-++#endif /* SQLITE_OMIT_VIRTUALTABLE */
-++
-++int sqlite3CompletionVtabInit(sqlite3 *db){
-++  int rc = SQLITE_OK;
-++#ifndef SQLITE_OMIT_VIRTUALTABLE
-++  rc = sqlite3_create_module(db, "completion", &completionModule, 0);
-++#endif
-++  return rc;
-++}
-++
-++#ifdef _WIN32
-++
-++#endif
-++int sqlite3_completion_init(
-++  sqlite3 *db,
-++  char **pzErrMsg,
-++  const sqlite3_api_routines *pApi
-++){
-++  int rc = SQLITE_OK;
-++  SQLITE_EXTENSION_INIT2(pApi);
-++  (void)(pzErrMsg);  /* Unused parameter */
-++#ifndef SQLITE_OMIT_VIRTUALTABLE
-++  rc = sqlite3CompletionVtabInit(db);
-++#endif
-++  return rc;
-++}
-++
-++/************************* End ../ext/misc/completion.c ********************/
-++
-++#if defined(SQLITE_ENABLE_SESSION)
-++/*
-++** State information for a single open session
-++*/
-++typedef struct OpenSession OpenSession;
-++struct OpenSession {
-++  char *zName;             /* Symbolic name for this session */
-++  int nFilter;             /* Number of xFilter rejection GLOB patterns */
-++  char **azFilter;         /* Array of xFilter rejection GLOB patterns */
-++  sqlite3_session *p;      /* The open session */
-++};
-++#endif
-++
-++/*
-++** Shell output mode information from before ".explain on",
-++** saved so that it can be restored by ".explain off"
-++*/
-++typedef struct SavedModeInfo SavedModeInfo;
-++struct SavedModeInfo {
-++  int valid;          /* Is there legit data in here? */
-++  int mode;           /* Mode prior to ".explain on" */
-++  int showHeader;     /* The ".header" setting prior to ".explain on" */
-++  int colWidth[100];  /* Column widths prior to ".explain on" */
-++};
-++
-++/*
-++** State information about the database connection is contained in an
-++** instance of the following structure.
-++*/
-++typedef struct ShellState ShellState;
-++struct ShellState {
-++  sqlite3 *db;           /* The database */
-++  int autoExplain;       /* Automatically turn on .explain mode */
-++  int autoEQP;           /* Run EXPLAIN QUERY PLAN prior to seach SQL stmt */
-++  int statsOn;           /* True to display memory stats before each finalize */
-++  int scanstatsOn;       /* True to display scan stats before each finalize */
-++  int outCount;          /* Revert to stdout when reaching zero */
-++  int cnt;               /* Number of records displayed so far */
-++  FILE *out;             /* Write results here */
-++  FILE *traceOut;        /* Output for sqlite3_trace() */
-++  int nErr;              /* Number of errors seen */
-++  int mode;              /* An output mode setting */
-++  int cMode;             /* temporary output mode for the current query */
-++  int normalMode;        /* Output mode before ".explain on" */
-++  int writableSchema;    /* True if PRAGMA writable_schema=ON */
-++  int showHeader;        /* True to show column names in List or Column mode */
-++  int nCheck;            /* Number of ".check" commands run */
-++  unsigned shellFlgs;    /* Various flags */
-++  char *zDestTable;      /* Name of destination table when MODE_Insert */
-++  char zTestcase[30];    /* Name of current test case */
-++  char colSeparator[20]; /* Column separator character for several modes */
-++  char rowSeparator[20]; /* Row separator character for MODE_Ascii */
-++  int colWidth[100];     /* Requested width of each column when in column mode*/
-++  int actualWidth[100];  /* Actual width of each column */
-++  char nullValue[20];    /* The text to print when a NULL comes back from
-++                         ** the database */
-++  char outfile[FILENAME_MAX]; /* Filename for *out */
-++  const char *zDbFilename;    /* name of the database file */
-++  char *zFreeOnClose;         /* Filename to free when closing */
-++  const char *zVfs;           /* Name of VFS to use */
-++  sqlite3_stmt *pStmt;   /* Current statement if any. */
-++  FILE *pLog;            /* Write log output here */
-++  int *aiIndent;         /* Array of indents used in MODE_Explain */
-++  int nIndent;           /* Size of array aiIndent[] */
-++  int iIndent;           /* Index of current op in aiIndent[] */
-++#if defined(SQLITE_ENABLE_SESSION)
-++  int nSession;             /* Number of active sessions */
-++  OpenSession aSession[4];  /* Array of sessions.  [0] is in focus. */
-++#endif
-++};
-++
-++/*
-++** These are the allowed shellFlgs values
-++*/
-++#define SHFLG_Pagecache      0x00000001 /* The --pagecache option is used */
-++#define SHFLG_Lookaside      0x00000002 /* Lookaside memory is used */
-++#define SHFLG_Backslash      0x00000004 /* The --backslash option is used */
-++#define SHFLG_PreserveRowid  0x00000008 /* .dump preserves rowid values */
-++#define SHFLG_Newlines       0x00000010 /* .dump --newline flag */
-++#define SHFLG_CountChanges   0x00000020 /* .changes setting */
-++#define SHFLG_Echo           0x00000040 /* .echo or --echo setting */
-++
-++/*
-++** Macros for testing and setting shellFlgs
-++*/
-++#define ShellHasFlag(P,X)    (((P)->shellFlgs & (X))!=0)
-++#define ShellSetFlag(P,X)    ((P)->shellFlgs|=(X))
-++#define ShellClearFlag(P,X)  ((P)->shellFlgs&=(~(X)))
-++
-++/*
-++** These are the allowed modes.
-++*/
-++#define MODE_Line     0  /* One column per line.  Blank line between records */
-++#define MODE_Column   1  /* One record per line in neat columns */
-++#define MODE_List     2  /* One record per line with a separator */
-++#define MODE_Semi     3  /* Same as MODE_List but append ";" to each line */
-++#define MODE_Html     4  /* Generate an XHTML table */
-++#define MODE_Insert   5  /* Generate SQL "insert" statements */
-++#define MODE_Quote    6  /* Quote values as for SQL */
-++#define MODE_Tcl      7  /* Generate ANSI-C or TCL quoted elements */
-++#define MODE_Csv      8  /* Quote strings, numbers are plain */
-++#define MODE_Explain  9  /* Like MODE_Column, but do not truncate data */
-++#define MODE_Ascii   10  /* Use ASCII unit and record separators (0x1F/0x1E) */
-++#define MODE_Pretty  11  /* Pretty-print schemas */
-++
-++static const char *modeDescr[] = {
-++  "line",
-++  "column",
-++  "list",
-++  "semi",
-++  "html",
-++  "insert",
-++  "quote",
-++  "tcl",
-++  "csv",
-++  "explain",
-++  "ascii",
-++  "prettyprint",
-++};
-++
-++/*
-++** These are the column/row/line separators used by the various
-++** import/export modes.
-++*/
-++#define SEP_Column    "|"
-++#define SEP_Row       "\n"
-++#define SEP_Tab       "\t"
-++#define SEP_Space     " "
-++#define SEP_Comma     ","
-++#define SEP_CrLf      "\r\n"
-++#define SEP_Unit      "\x1F"
-++#define SEP_Record    "\x1E"
-++
-++/*
-++** Number of elements in an array
-++*/
-++#define ArraySize(X)  (int)(sizeof(X)/sizeof(X[0]))
-++
-++/*
-++** A callback for the sqlite3_log() interface.
-++*/
-++static void shellLog(void *pArg, int iErrCode, const char *zMsg){
-++  ShellState *p = (ShellState*)pArg;
-++  if( p->pLog==0 ) return;
-++  utf8_printf(p->pLog, "(%d) %s\n", iErrCode, zMsg);
-++  fflush(p->pLog);
-++}
-++
-++/*
-++** Output the given string as a hex-encoded blob (eg. X'1234' )
-++*/
-++static void output_hex_blob(FILE *out, const void *pBlob, int nBlob){
-++  int i;
-++  char *zBlob = (char *)pBlob;
-++  raw_printf(out,"X'");
-++  for(i=0; i<nBlob; i++){ raw_printf(out,"%02x",zBlob[i]&0xff); }
-++  raw_printf(out,"'");
-++}
-++
-++/*
-++** Find a string that is not found anywhere in z[].  Return a pointer
-++** to that string.
-++**
-++** Try to use zA and zB first.  If both of those are already found in z[]
-++** then make up some string and store it in the buffer zBuf.
-++*/
-++static const char *unused_string(
-++  const char *z,                    /* Result must not appear anywhere in z */
-++  const char *zA, const char *zB,   /* Try these first */
-++  char *zBuf                        /* Space to store a generated string */
-++){
-++  unsigned i = 0;
-++  if( strstr(z, zA)==0 ) return zA;
-++  if( strstr(z, zB)==0 ) return zB;
-++  do{
-++    sqlite3_snprintf(20,zBuf,"(%s%u)", zA, i++);
-++  }while( strstr(z,zBuf)!=0 );
-++  return zBuf;
-++}
-++
-++/*
-++** Output the given string as a quoted string using SQL quoting conventions.
-++**
-++** See also: output_quoted_escaped_string()
-++*/
-++static void output_quoted_string(FILE *out, const char *z){
-++  int i;
-++  char c;
-++  setBinaryMode(out, 1);
-++  for(i=0; (c = z[i])!=0 && c!='\''; i++){}
-++  if( c==0 ){
-++    utf8_printf(out,"'%s'",z);
-++  }else{
-++    raw_printf(out, "'");
-++    while( *z ){
-++      for(i=0; (c = z[i])!=0 && c!='\''; i++){}
-++      if( c=='\'' ) i++;
-++      if( i ){
-++        utf8_printf(out, "%.*s", i, z);
-++        z += i;
-++      }
-++      if( c=='\'' ){
-++        raw_printf(out, "'");
-++        continue;
-++      }
-++      if( c==0 ){
-++        break;
-++      }
-++      z++;
-++    }
-++    raw_printf(out, "'");
-++  }
-++  setTextMode(out, 1);
-++}
-++
-++/*
-++** Output the given string as a quoted string using SQL quoting conventions.
-++** Additionallly , escape the "\n" and "\r" characters so that they do not
-++** get corrupted by end-of-line translation facilities in some operating
-++** systems.
-++**
-++** This is like output_quoted_string() but with the addition of the \r\n
-++** escape mechanism.
-++*/
-++static void output_quoted_escaped_string(FILE *out, const char *z){
-++  int i;
-++  char c;
-++  setBinaryMode(out, 1);
-++  for(i=0; (c = z[i])!=0 && c!='\'' && c!='\n' && c!='\r'; i++){}
-++  if( c==0 ){
-++    utf8_printf(out,"'%s'",z);
-++  }else{
-++    const char *zNL = 0;
-++    const char *zCR = 0;
-++    int nNL = 0;
-++    int nCR = 0;
-++    char zBuf1[20], zBuf2[20];
-++    for(i=0; z[i]; i++){
-++      if( z[i]=='\n' ) nNL++;
-++      if( z[i]=='\r' ) nCR++;
-++    }
-++    if( nNL ){
-++      raw_printf(out, "replace(");
-++      zNL = unused_string(z, "\\n", "\\012", zBuf1);
-++    }
-++    if( nCR ){
-++      raw_printf(out, "replace(");
-++      zCR = unused_string(z, "\\r", "\\015", zBuf2);
-++    }
-++    raw_printf(out, "'");
-++    while( *z ){
-++      for(i=0; (c = z[i])!=0 && c!='\n' && c!='\r' && c!='\''; i++){}
-++      if( c=='\'' ) i++;
-++      if( i ){
-++        utf8_printf(out, "%.*s", i, z);
-++        z += i;
-++      }
-++      if( c=='\'' ){
-++        raw_printf(out, "'");
-++        continue;
-++      }
-++      if( c==0 ){
-++        break;
-++      }
-++      z++;
-++      if( c=='\n' ){
-++        raw_printf(out, "%s", zNL);
-++        continue;
-++      }
-++      raw_printf(out, "%s", zCR);
-++    }
-++    raw_printf(out, "'");
-++    if( nCR ){
-++      raw_printf(out, ",'%s',char(13))", zCR);
-++    }
-++    if( nNL ){
-++      raw_printf(out, ",'%s',char(10))", zNL);
-++    }
-++  }
-++  setTextMode(out, 1);
-++}
-++
-++/*
-++** Output the given string as a quoted according to C or TCL quoting rules.
-++*/
-++static void output_c_string(FILE *out, const char *z){
-++  unsigned int c;
-++  fputc('"', out);
-++  while( (c = *(z++))!=0 ){
-++    if( c=='\\' ){
-++      fputc(c, out);
-++      fputc(c, out);
-++    }else if( c=='"' ){
-++      fputc('\\', out);
-++      fputc('"', out);
-++    }else if( c=='\t' ){
-++      fputc('\\', out);
-++      fputc('t', out);
-++    }else if( c=='\n' ){
-++      fputc('\\', out);
-++      fputc('n', out);
-++    }else if( c=='\r' ){
-++      fputc('\\', out);
-++      fputc('r', out);
-++    }else if( !isprint(c&0xff) ){
-++      raw_printf(out, "\\%03o", c&0xff);
-++    }else{
-++      fputc(c, out);
-++    }
-++  }
-++  fputc('"', out);
-++}
-++
-++/*
-++** Output the given string with characters that are special to
-++** HTML escaped.
-++*/
-++static void output_html_string(FILE *out, const char *z){
-++  int i;
-++  if( z==0 ) z = "";
-++  while( *z ){
-++    for(i=0;   z[i]
-++            && z[i]!='<'
-++            && z[i]!='&'
-++            && z[i]!='>'
-++            && z[i]!='\"'
-++            && z[i]!='\'';
-++        i++){}
-++    if( i>0 ){
-++      utf8_printf(out,"%.*s",i,z);
-++    }
-++    if( z[i]=='<' ){
-++      raw_printf(out,"&lt;");
-++    }else if( z[i]=='&' ){
-++      raw_printf(out,"&amp;");
-++    }else if( z[i]=='>' ){
-++      raw_printf(out,"&gt;");
-++    }else if( z[i]=='\"' ){
-++      raw_printf(out,"&quot;");
-++    }else if( z[i]=='\'' ){
-++      raw_printf(out,"&#39;");
-++    }else{
-++      break;
-++    }
-++    z += i + 1;
-++  }
-++}
-++
-++/*
-++** If a field contains any character identified by a 1 in the following
-++** array, then the string must be quoted for CSV.
-++*/
-++static const char needCsvQuote[] = {
-++  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-++  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-++  1, 0, 1, 0, 0, 0, 0, 1,   0, 0, 0, 0, 0, 0, 0, 0,
-++  0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
-++  0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
-++  0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
-++  0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
-++  0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 1,
-++  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-++  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-++  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-++  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-++  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-++  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-++  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-++  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-++};
-++
-++/*
-++** Output a single term of CSV.  Actually, p->colSeparator is used for
-++** the separator, which may or may not be a comma.  p->nullValue is
-++** the null value.  Strings are quoted if necessary.  The separator
-++** is only issued if bSep is true.
-++*/
-++static void output_csv(ShellState *p, const char *z, int bSep){
-++  FILE *out = p->out;
-++  if( z==0 ){
-++    utf8_printf(out,"%s",p->nullValue);
-++  }else{
-++    int i;
-++    int nSep = strlen30(p->colSeparator);
-++    for(i=0; z[i]; i++){
-++      if( needCsvQuote[((unsigned char*)z)[i]]
-++         || (z[i]==p->colSeparator[0] &&
-++             (nSep==1 || memcmp(z, p->colSeparator, nSep)==0)) ){
-++        i = 0;
-++        break;
-++      }
-++    }
-++    if( i==0 ){
-++      putc('"', out);
-++      for(i=0; z[i]; i++){
-++        if( z[i]=='"' ) putc('"', out);
-++        putc(z[i], out);
-++      }
-++      putc('"', out);
-++    }else{
-++      utf8_printf(out, "%s", z);
-++    }
-++  }
-++  if( bSep ){
-++    utf8_printf(p->out, "%s", p->colSeparator);
-++  }
-++}
-++
-++#ifdef SIGINT
-++/*
-++** This routine runs when the user presses Ctrl-C
-++*/
-++static void interrupt_handler(int NotUsed){
-++  UNUSED_PARAMETER(NotUsed);
-++  seenInterrupt++;
-++  if( seenInterrupt>2 ) exit(1);
-++  if( globalDb ) sqlite3_interrupt(globalDb);
-++}
-++#endif
-++
-++#ifndef SQLITE_OMIT_AUTHORIZATION
-++/*
-++** When the ".auth ON" is set, the following authorizer callback is
-++** invoked.  It always returns SQLITE_OK.
-++*/
-++static int shellAuth(
-++  void *pClientData,
-++  int op,
-++  const char *zA1,
-++  const char *zA2,
-++  const char *zA3,
-++  const char *zA4
-++){
-++  ShellState *p = (ShellState*)pClientData;
-++  static const char *azAction[] = { 0,
-++     "CREATE_INDEX",         "CREATE_TABLE",         "CREATE_TEMP_INDEX",
-++     "CREATE_TEMP_TABLE",    "CREATE_TEMP_TRIGGER",  "CREATE_TEMP_VIEW",
-++     "CREATE_TRIGGER",       "CREATE_VIEW",          "DELETE",
-++     "DROP_INDEX",           "DROP_TABLE",           "DROP_TEMP_INDEX",
-++     "DROP_TEMP_TABLE",      "DROP_TEMP_TRIGGER",    "DROP_TEMP_VIEW",
-++     "DROP_TRIGGER",         "DROP_VIEW",            "INSERT",
-++     "PRAGMA",               "READ",                 "SELECT",
-++     "TRANSACTION",          "UPDATE",               "ATTACH",
-++     "DETACH",               "ALTER_TABLE",          "REINDEX",
-++     "ANALYZE",              "CREATE_VTABLE",        "DROP_VTABLE",
-++     "FUNCTION",             "SAVEPOINT",            "RECURSIVE"
-++  };
-++  int i;
-++  const char *az[4];
-++  az[0] = zA1;
-++  az[1] = zA2;
-++  az[2] = zA3;
-++  az[3] = zA4;
-++  utf8_printf(p->out, "authorizer: %s", azAction[op]);
-++  for(i=0; i<4; i++){
-++    raw_printf(p->out, " ");
-++    if( az[i] ){
-++      output_c_string(p->out, az[i]);
-++    }else{
-++      raw_printf(p->out, "NULL");
-++    }
-++  }
-++  raw_printf(p->out, "\n");
-++  return SQLITE_OK;
-++}
-++#endif
-++
-++/*
-++** Print a schema statement.  Part of MODE_Semi and MODE_Pretty output.
-++**
-++** This routine converts some CREATE TABLE statements for shadow tables
-++** in FTS3/4/5 into CREATE TABLE IF NOT EXISTS statements.
-++*/
-++static void printSchemaLine(FILE *out, const char *z, const char *zTail){
-++  if( sqlite3_strglob("CREATE TABLE ['\"]*", z)==0 ){
-++    utf8_printf(out, "CREATE TABLE IF NOT EXISTS %s%s", z+13, zTail);
-++  }else{
-++    utf8_printf(out, "%s%s", z, zTail);
-++  }
-++}
-++static void printSchemaLineN(FILE *out, char *z, int n, const char *zTail){
-++  char c = z[n];
-++  z[n] = 0;
-++  printSchemaLine(out, z, zTail);
-++  z[n] = c;
-++}
-++
-++/*
-++** This is the callback routine that the shell
-++** invokes for each row of a query result.
-++*/
-++static int shell_callback(
-++  void *pArg,
-++  int nArg,        /* Number of result columns */
-++  char **azArg,    /* Text of each result column */
-++  char **azCol,    /* Column names */
-++  int *aiType      /* Column types */
-++){
-++  int i;
-++  ShellState *p = (ShellState*)pArg;
-++
-++  if( azArg==0 ) return 0;
-++  switch( p->cMode ){
-++    case MODE_Line: {
-++      int w = 5;
-++      if( azArg==0 ) break;
-++      for(i=0; i<nArg; i++){
-++        int len = strlen30(azCol[i] ? azCol[i] : "");
-++        if( len>w ) w = len;
-++      }
-++      if( p->cnt++>0 ) utf8_printf(p->out, "%s", p->rowSeparator);
-++      for(i=0; i<nArg; i++){
-++        utf8_printf(p->out,"%*s = %s%s", w, azCol[i],
-++                azArg[i] ? azArg[i] : p->nullValue, p->rowSeparator);
-++      }
-++      break;
-++    }
-++    case MODE_Explain:
-++    case MODE_Column: {
-++      static const int aExplainWidths[] = {4, 13, 4, 4, 4, 13, 2, 13};
-++      const int *colWidth;
-++      int showHdr;
-++      char *rowSep;
-++      if( p->cMode==MODE_Column ){
-++        colWidth = p->colWidth;
-++        showHdr = p->showHeader;
-++        rowSep = p->rowSeparator;
-++      }else{
-++        colWidth = aExplainWidths;
-++        showHdr = 1;
-++        rowSep = SEP_Row;
-++      }
-++      if( p->cnt++==0 ){
-++        for(i=0; i<nArg; i++){
-++          int w, n;
-++          if( i<ArraySize(p->colWidth) ){
-++            w = colWidth[i];
-++          }else{
-++            w = 0;
-++          }
-++          if( w==0 ){
-++            w = strlenChar(azCol[i] ? azCol[i] : "");
-++            if( w<10 ) w = 10;
-++            n = strlenChar(azArg && azArg[i] ? azArg[i] : p->nullValue);
-++            if( w<n ) w = n;
-++          }
-++          if( i<ArraySize(p->actualWidth) ){
-++            p->actualWidth[i] = w;
-++          }
-++          if( showHdr ){
-++            utf8_width_print(p->out, w, azCol[i]);
-++            utf8_printf(p->out, "%s", i==nArg-1 ? rowSep : "  ");
-++          }
-++        }
-++        if( showHdr ){
-++          for(i=0; i<nArg; i++){
-++            int w;
-++            if( i<ArraySize(p->actualWidth) ){
-++               w = p->actualWidth[i];
-++               if( w<0 ) w = -w;
-++            }else{
-++               w = 10;
-++            }
-++            utf8_printf(p->out,"%-*.*s%s",w,w,
-++                   "----------------------------------------------------------"
-++                   "----------------------------------------------------------",
-++                    i==nArg-1 ? rowSep : "  ");
-++          }
-++        }
-++      }
-++      if( azArg==0 ) break;
-++      for(i=0; i<nArg; i++){
-++        int w;
-++        if( i<ArraySize(p->actualWidth) ){
-++           w = p->actualWidth[i];
-++        }else{
-++           w = 10;
-++        }
-++        if( p->cMode==MODE_Explain && azArg[i] && strlenChar(azArg[i])>w ){
-++          w = strlenChar(azArg[i]);
-++        }
-++        if( i==1 && p->aiIndent && p->pStmt ){
-++          if( p->iIndent<p->nIndent ){
-++            utf8_printf(p->out, "%*.s", p->aiIndent[p->iIndent], "");
-++          }
-++          p->iIndent++;
-++        }
-++        utf8_width_print(p->out, w, azArg[i] ? azArg[i] : p->nullValue);
-++        utf8_printf(p->out, "%s", i==nArg-1 ? rowSep : "  ");
-++      }
-++      break;
-++    }
-++    case MODE_Semi: {   /* .schema and .fullschema output */
-++      printSchemaLine(p->out, azArg[0], ";\n");
-++      break;
-++    }
-++    case MODE_Pretty: {  /* .schema and .fullschema with --indent */
-++      char *z;
-++      int j;
-++      int nParen = 0;
-++      char cEnd = 0;
-++      char c;
-++      int nLine = 0;
-++      assert( nArg==1 );
-++      if( azArg[0]==0 ) break;
-++      if( sqlite3_strlike("CREATE VIEW%", azArg[0], 0)==0
-++       || sqlite3_strlike("CREATE TRIG%", azArg[0], 0)==0
-++      ){
-++        utf8_printf(p->out, "%s;\n", azArg[0]);
-++        break;
-++      }
-++      z = sqlite3_mprintf("%s", azArg[0]);
-++      j = 0;
-++      for(i=0; IsSpace(z[i]); i++){}
-++      for(; (c = z[i])!=0; i++){
-++        if( IsSpace(c) ){
-++          if( z[j-1]=='\r' ) z[j-1] = '\n';
-++          if( IsSpace(z[j-1]) || z[j-1]=='(' ) continue;
-++        }else if( (c=='(' || c==')') && j>0 && IsSpace(z[j-1]) ){
-++          j--;
-++        }
-++        z[j++] = c;
-++      }
-++      while( j>0 && IsSpace(z[j-1]) ){ j--; }
-++      z[j] = 0;
-++      if( strlen30(z)>=79 ){
-++        for(i=j=0; (c = z[i])!=0; i++){
-++          if( c==cEnd ){
-++            cEnd = 0;
-++          }else if( c=='"' || c=='\'' || c=='`' ){
-++            cEnd = c;
-++          }else if( c=='[' ){
-++            cEnd = ']';
-++          }else if( c=='(' ){
-++            nParen++;
-++          }else if( c==')' ){
-++            nParen--;
-++            if( nLine>0 && nParen==0 && j>0 ){
-++              printSchemaLineN(p->out, z, j, "\n");
-++              j = 0;
-++            }
-++          }
-++          z[j++] = c;
-++          if( nParen==1 && (c=='(' || c==',' || c=='\n') ){
-++            if( c=='\n' ) j--;
-++            printSchemaLineN(p->out, z, j, "\n  ");
-++            j = 0;
-++            nLine++;
-++            while( IsSpace(z[i+1]) ){ i++; }
-++          }
-++        }
-++        z[j] = 0;
-++      }
-++      printSchemaLine(p->out, z, ";\n");
-++      sqlite3_free(z);
-++      break;
-++    }
-++    case MODE_List: {
-++      if( p->cnt++==0 && p->showHeader ){
-++        for(i=0; i<nArg; i++){
-++          utf8_printf(p->out,"%s%s",azCol[i],
-++                  i==nArg-1 ? p->rowSeparator : p->colSeparator);
-++        }
-++      }
-++      if( azArg==0 ) break;
-++      for(i=0; i<nArg; i++){
-++        char *z = azArg[i];
-++        if( z==0 ) z = p->nullValue;
-++        utf8_printf(p->out, "%s", z);
-++        if( i<nArg-1 ){
-++          utf8_printf(p->out, "%s", p->colSeparator);
-++        }else{
-++          utf8_printf(p->out, "%s", p->rowSeparator);
-++        }
-++      }
-++      break;
-++    }
-++    case MODE_Html: {
-++      if( p->cnt++==0 && p->showHeader ){
-++        raw_printf(p->out,"<TR>");
-++        for(i=0; i<nArg; i++){
-++          raw_printf(p->out,"<TH>");
-++          output_html_string(p->out, azCol[i]);
-++          raw_printf(p->out,"</TH>\n");
-++        }
-++        raw_printf(p->out,"</TR>\n");
-++      }
-++      if( azArg==0 ) break;
-++      raw_printf(p->out,"<TR>");
-++      for(i=0; i<nArg; i++){
-++        raw_printf(p->out,"<TD>");
-++        output_html_string(p->out, azArg[i] ? azArg[i] : p->nullValue);
-++        raw_printf(p->out,"</TD>\n");
-++      }
-++      raw_printf(p->out,"</TR>\n");
-++      break;
-++    }
-++    case MODE_Tcl: {
-++      if( p->cnt++==0 && p->showHeader ){
-++        for(i=0; i<nArg; i++){
-++          output_c_string(p->out,azCol[i] ? azCol[i] : "");
-++          if(i<nArg-1) utf8_printf(p->out, "%s", p->colSeparator);
-++        }
-++        utf8_printf(p->out, "%s", p->rowSeparator);
-++      }
-++      if( azArg==0 ) break;
-++      for(i=0; i<nArg; i++){
-++        output_c_string(p->out, azArg[i] ? azArg[i] : p->nullValue);
-++        if(i<nArg-1) utf8_printf(p->out, "%s", p->colSeparator);
-++      }
-++      utf8_printf(p->out, "%s", p->rowSeparator);
-++      break;
-++    }
-++    case MODE_Csv: {
-++      setBinaryMode(p->out, 1);
-++      if( p->cnt++==0 && p->showHeader ){
-++        for(i=0; i<nArg; i++){
-++          output_csv(p, azCol[i] ? azCol[i] : "", i<nArg-1);
-++        }
-++        utf8_printf(p->out, "%s", p->rowSeparator);
-++      }
-++      if( nArg>0 ){
-++        for(i=0; i<nArg; i++){
-++          output_csv(p, azArg[i], i<nArg-1);
-++        }
-++        utf8_printf(p->out, "%s", p->rowSeparator);
-++      }
-++      setTextMode(p->out, 1);
-++      break;
-++    }
-++    case MODE_Insert: {
-++      if( azArg==0 ) break;
-++      utf8_printf(p->out,"INSERT INTO %s",p->zDestTable);
-++      if( p->showHeader ){
-++        raw_printf(p->out,"(");
-++        for(i=0; i<nArg; i++){
-++          if( i>0 ) raw_printf(p->out, ",");
-++          if( quoteChar(azCol[i]) ){
-++            char *z = sqlite3_mprintf("\"%w\"", azCol[i]);
-++            utf8_printf(p->out, "%s", z);
-++            sqlite3_free(z);
-++          }else{
-++            raw_printf(p->out, "%s", azCol[i]);
-++          }
-++        }
-++        raw_printf(p->out,")");
-++      }
-++      p->cnt++;
-++      for(i=0; i<nArg; i++){
-++        raw_printf(p->out, i>0 ? "," : " VALUES(");
-++        if( (azArg[i]==0) || (aiType && aiType[i]==SQLITE_NULL) ){
-++          utf8_printf(p->out,"NULL");
-++        }else if( aiType && aiType[i]==SQLITE_TEXT ){
-++          if( ShellHasFlag(p, SHFLG_Newlines) ){
-++            output_quoted_string(p->out, azArg[i]);
-++          }else{
-++            output_quoted_escaped_string(p->out, azArg[i]);
-++          }
-++        }else if( aiType && aiType[i]==SQLITE_INTEGER ){
-++          utf8_printf(p->out,"%s", azArg[i]);
-++        }else if( aiType && aiType[i]==SQLITE_FLOAT ){
-++          char z[50];
-++          double r = sqlite3_column_double(p->pStmt, i);
-++          sqlite3_snprintf(50,z,"%!.20g", r);
-++          raw_printf(p->out, "%s", z);
-++        }else if( aiType && aiType[i]==SQLITE_BLOB && p->pStmt ){
-++          const void *pBlob = sqlite3_column_blob(p->pStmt, i);
-++          int nBlob = sqlite3_column_bytes(p->pStmt, i);
-++          output_hex_blob(p->out, pBlob, nBlob);
-++        }else if( isNumber(azArg[i], 0) ){
-++          utf8_printf(p->out,"%s", azArg[i]);
-++        }else if( ShellHasFlag(p, SHFLG_Newlines) ){
-++          output_quoted_string(p->out, azArg[i]);
-++        }else{
-++          output_quoted_escaped_string(p->out, azArg[i]);
-++        }
-++      }
-++      raw_printf(p->out,");\n");
-++      break;
-++    }
-++    case MODE_Quote: {
-++      if( azArg==0 ) break;
-++      if( p->cnt==0 && p->showHeader ){
-++        for(i=0; i<nArg; i++){
-++          if( i>0 ) raw_printf(p->out, ",");
-++          output_quoted_string(p->out, azCol[i]);
-++        }
-++        raw_printf(p->out,"\n");
-++      }
-++      p->cnt++;
-++      for(i=0; i<nArg; i++){
-++        if( i>0 ) raw_printf(p->out, ",");
-++        if( (azArg[i]==0) || (aiType && aiType[i]==SQLITE_NULL) ){
-++          utf8_printf(p->out,"NULL");
-++        }else if( aiType && aiType[i]==SQLITE_TEXT ){
-++          output_quoted_string(p->out, azArg[i]);
-++        }else if( aiType && aiType[i]==SQLITE_INTEGER ){
-++          utf8_printf(p->out,"%s", azArg[i]);
-++        }else if( aiType && aiType[i]==SQLITE_FLOAT ){
-++          char z[50];
-++          double r = sqlite3_column_double(p->pStmt, i);
-++          sqlite3_snprintf(50,z,"%!.20g", r);
-++          raw_printf(p->out, "%s", z);
-++        }else if( aiType && aiType[i]==SQLITE_BLOB && p->pStmt ){
-++          const void *pBlob = sqlite3_column_blob(p->pStmt, i);
-++          int nBlob = sqlite3_column_bytes(p->pStmt, i);
-++          output_hex_blob(p->out, pBlob, nBlob);
-++        }else if( isNumber(azArg[i], 0) ){
-++          utf8_printf(p->out,"%s", azArg[i]);
-++        }else{
-++          output_quoted_string(p->out, azArg[i]);
-++        }
-++      }
-++      raw_printf(p->out,"\n");
-++      break;
-++    }
-++    case MODE_Ascii: {
-++      if( p->cnt++==0 && p->showHeader ){
-++        for(i=0; i<nArg; i++){
-++          if( i>0 ) utf8_printf(p->out, "%s", p->colSeparator);
-++          utf8_printf(p->out,"%s",azCol[i] ? azCol[i] : "");
-++        }
-++        utf8_printf(p->out, "%s", p->rowSeparator);
-++      }
-++      if( azArg==0 ) break;
-++      for(i=0; i<nArg; i++){
-++        if( i>0 ) utf8_printf(p->out, "%s", p->colSeparator);
-++        utf8_printf(p->out,"%s",azArg[i] ? azArg[i] : p->nullValue);
-++      }
-++      utf8_printf(p->out, "%s", p->rowSeparator);
-++      break;
-++    }
-++  }
-++  return 0;
-++}
-++
-++/*
-++** This is the callback routine that the SQLite library
-++** invokes for each row of a query result.
-++*/
-++static int callback(void *pArg, int nArg, char **azArg, char **azCol){
-++  /* since we don't have type info, call the shell_callback with a NULL value */
-++  return shell_callback(pArg, nArg, azArg, azCol, NULL);
-++}
-++
-++/*
-++** This is the callback routine from sqlite3_exec() that appends all
-++** output onto the end of a ShellText object.
-++*/
-++static int captureOutputCallback(void *pArg, int nArg, char **azArg, char **az){
-++  ShellText *p = (ShellText*)pArg;
-++  int i;
-++  UNUSED_PARAMETER(az);
-++  if( azArg==0 ) return 0;
-++  if( p->n ) appendText(p, "|", 0);
-++  for(i=0; i<nArg; i++){
-++    if( i ) appendText(p, ",", 0);
-++    if( azArg[i] ) appendText(p, azArg[i], 0);
-++  }
-++  return 0;
-++}
-++
-++/*
-++** Generate an appropriate SELFTEST table in the main database.
-++*/
-++static void createSelftestTable(ShellState *p){
-++  char *zErrMsg = 0;
-++  sqlite3_exec(p->db,
-++    "SAVEPOINT selftest_init;\n"
-++    "CREATE TABLE IF NOT EXISTS selftest(\n"
-++    "  tno INTEGER PRIMARY KEY,\n"   /* Test number */
-++    "  op TEXT,\n"                   /* Operator:  memo run */
-++    "  cmd TEXT,\n"                  /* Command text */
-++    "  ans TEXT\n"                   /* Desired answer */
-++    ");"
-++    "CREATE TEMP TABLE [_shell$self](op,cmd,ans);\n"
-++    "INSERT INTO [_shell$self](rowid,op,cmd)\n"
-++    "  VALUES(coalesce((SELECT (max(tno)+100)/10 FROM selftest),10),\n"
-++    "         'memo','Tests generated by --init');\n"
-++    "INSERT INTO [_shell$self]\n"
-++    "  SELECT 'run',\n"
-++    "    'SELECT hex(sha3_query(''SELECT type,name,tbl_name,sql "
-++                                 "FROM sqlite_master ORDER BY 2'',224))',\n"
-++    "    hex(sha3_query('SELECT type,name,tbl_name,sql "
-++                          "FROM sqlite_master ORDER BY 2',224));\n"
-++    "INSERT INTO [_shell$self]\n"
-++    "  SELECT 'run',"
-++    "    'SELECT hex(sha3_query(''SELECT * FROM \"' ||"
-++    "        printf('%w',name) || '\" NOT INDEXED'',224))',\n"
-++    "    hex(sha3_query(printf('SELECT * FROM \"%w\" NOT INDEXED',name),224))\n"
-++    "  FROM (\n"
-++    "    SELECT name FROM sqlite_master\n"
-++    "     WHERE type='table'\n"
-++    "       AND name<>'selftest'\n"
-++    "       AND coalesce(rootpage,0)>0\n"
-++    "  )\n"
-++    " ORDER BY name;\n"
-++    "INSERT INTO [_shell$self]\n"
-++    "  VALUES('run','PRAGMA integrity_check','ok');\n"
-++    "INSERT INTO selftest(tno,op,cmd,ans)"
-++    "  SELECT rowid*10,op,cmd,ans FROM [_shell$self];\n"
-++    "DROP TABLE [_shell$self];"
-++    ,0,0,&zErrMsg);
-++  if( zErrMsg ){
-++    utf8_printf(stderr, "SELFTEST initialization failure: %s\n", zErrMsg);
-++    sqlite3_free(zErrMsg);
-++  }
-++  sqlite3_exec(p->db, "RELEASE selftest_init",0,0,0);
-++}
-++
-++
-++/*
-++** Set the destination table field of the ShellState structure to
-++** the name of the table given.  Escape any quote characters in the
-++** table name.
-++*/
-++static void set_table_name(ShellState *p, const char *zName){
-++  int i, n;
-++  char cQuote;
-++  char *z;
-++
-++  if( p->zDestTable ){
-++    free(p->zDestTable);
-++    p->zDestTable = 0;
-++  }
-++  if( zName==0 ) return;
-++  cQuote = quoteChar(zName);
-++  n = strlen30(zName);
-++  if( cQuote ) n += n+2;
-++  z = p->zDestTable = malloc( n+1 );
-++  if( z==0 ){
-++    raw_printf(stderr,"Error: out of memory\n");
-++    exit(1);
-++  }
-++  n = 0;
-++  if( cQuote ) z[n++] = cQuote;
-++  for(i=0; zName[i]; i++){
-++    z[n++] = zName[i];
-++    if( zName[i]==cQuote ) z[n++] = cQuote;
-++  }
-++  if( cQuote ) z[n++] = cQuote;
-++  z[n] = 0;
-++}
-++
-++
-++/*
-++** Execute a query statement that will generate SQL output.  Print
-++** the result columns, comma-separated, on a line and then add a
-++** semicolon terminator to the end of that line.
-++**
-++** If the number of columns is 1 and that column contains text "--"
-++** then write the semicolon on a separate line.  That way, if a
-++** "--" comment occurs at the end of the statement, the comment
-++** won't consume the semicolon terminator.
-++*/
-++static int run_table_dump_query(
-++  ShellState *p,           /* Query context */
-++  const char *zSelect,     /* SELECT statement to extract content */
-++  const char *zFirstRow    /* Print before first row, if not NULL */
-++){
-++  sqlite3_stmt *pSelect;
-++  int rc;
-++  int nResult;
-++  int i;
-++  const char *z;
-++  rc = sqlite3_prepare_v2(p->db, zSelect, -1, &pSelect, 0);
-++  if( rc!=SQLITE_OK || !pSelect ){
-++    utf8_printf(p->out, "/**** ERROR: (%d) %s *****/\n", rc,
-++                sqlite3_errmsg(p->db));
-++    if( (rc&0xff)!=SQLITE_CORRUPT ) p->nErr++;
-++    return rc;
-++  }
-++  rc = sqlite3_step(pSelect);
-++  nResult = sqlite3_column_count(pSelect);
-++  while( rc==SQLITE_ROW ){
-++    if( zFirstRow ){
-++      utf8_printf(p->out, "%s", zFirstRow);
-++      zFirstRow = 0;
-++    }
-++    z = (const char*)sqlite3_column_text(pSelect, 0);
-++    utf8_printf(p->out, "%s", z);
-++    for(i=1; i<nResult; i++){
-++      utf8_printf(p->out, ",%s", sqlite3_column_text(pSelect, i));
-++    }
-++    if( z==0 ) z = "";
-++    while( z[0] && (z[0]!='-' || z[1]!='-') ) z++;
-++    if( z[0] ){
-++      raw_printf(p->out, "\n;\n");
-++    }else{
-++      raw_printf(p->out, ";\n");
-++    }
-++    rc = sqlite3_step(pSelect);
-++  }
-++  rc = sqlite3_finalize(pSelect);
-++  if( rc!=SQLITE_OK ){
-++    utf8_printf(p->out, "/**** ERROR: (%d) %s *****/\n", rc,
-++                sqlite3_errmsg(p->db));
-++    if( (rc&0xff)!=SQLITE_CORRUPT ) p->nErr++;
-++  }
-++  return rc;
-++}
-++
-++/*
-++** Allocate space and save off current error string.
-++*/
-++static char *save_err_msg(
-++  sqlite3 *db            /* Database to query */
-++){
-++  int nErrMsg = 1+strlen30(sqlite3_errmsg(db));
-++  char *zErrMsg = sqlite3_malloc64(nErrMsg);
-++  if( zErrMsg ){
-++    memcpy(zErrMsg, sqlite3_errmsg(db), nErrMsg);
-++  }
-++  return zErrMsg;
-++}
-++
-++#ifdef __linux__
-++/*
-++** Attempt to display I/O stats on Linux using /proc/PID/io
-++*/
-++static void displayLinuxIoStats(FILE *out){
-++  FILE *in;
-++  char z[200];
-++  sqlite3_snprintf(sizeof(z), z, "/proc/%d/io", getpid());
-++  in = fopen(z, "rb");
-++  if( in==0 ) return;
-++  while( fgets(z, sizeof(z), in)!=0 ){
-++    static const struct {
-++      const char *zPattern;
-++      const char *zDesc;
-++    } aTrans[] = {
-++      { "rchar: ",                  "Bytes received by read():" },
-++      { "wchar: ",                  "Bytes sent to write():"    },
-++      { "syscr: ",                  "Read() system calls:"      },
-++      { "syscw: ",                  "Write() system calls:"     },
-++      { "read_bytes: ",             "Bytes read from storage:"  },
-++      { "write_bytes: ",            "Bytes written to storage:" },
-++      { "cancelled_write_bytes: ",  "Cancelled write bytes:"    },
-++    };
-++    int i;
-++    for(i=0; i<ArraySize(aTrans); i++){
-++      int n = (int)strlen(aTrans[i].zPattern);
-++      if( strncmp(aTrans[i].zPattern, z, n)==0 ){
-++        utf8_printf(out, "%-36s %s", aTrans[i].zDesc, &z[n]);
-++        break;
-++      }
-++    }
-++  }
-++  fclose(in);
-++}
-++#endif
-++
-++/*
-++** Display a single line of status using 64-bit values.
-++*/
-++static void displayStatLine(
-++  ShellState *p,            /* The shell context */
-++  char *zLabel,             /* Label for this one line */
-++  char *zFormat,            /* Format for the result */
-++  int iStatusCtrl,          /* Which status to display */
-++  int bReset                /* True to reset the stats */
-++){
-++  sqlite3_int64 iCur = -1;
-++  sqlite3_int64 iHiwtr = -1;
-++  int i, nPercent;
-++  char zLine[200];
-++  sqlite3_status64(iStatusCtrl, &iCur, &iHiwtr, bReset);
-++  for(i=0, nPercent=0; zFormat[i]; i++){
-++    if( zFormat[i]=='%' ) nPercent++;
-++  }
-++  if( nPercent>1 ){
-++    sqlite3_snprintf(sizeof(zLine), zLine, zFormat, iCur, iHiwtr);
-++  }else{
-++    sqlite3_snprintf(sizeof(zLine), zLine, zFormat, iHiwtr);
-++  }
-++  raw_printf(p->out, "%-36s %s\n", zLabel, zLine);
-++}
-++
-++/*
-++** Display memory stats.
-++*/
-++static int display_stats(
-++  sqlite3 *db,                /* Database to query */
-++  ShellState *pArg,           /* Pointer to ShellState */
-++  int bReset                  /* True to reset the stats */
-++){
-++  int iCur;
-++  int iHiwtr;
-++
-++  if( pArg && pArg->out ){
-++    displayStatLine(pArg, "Memory Used:",
-++       "%lld (max %lld) bytes", SQLITE_STATUS_MEMORY_USED, bReset);
-++    displayStatLine(pArg, "Number of Outstanding Allocations:",
-++       "%lld (max %lld)", SQLITE_STATUS_MALLOC_COUNT, bReset);
-++    if( pArg->shellFlgs & SHFLG_Pagecache ){
-++      displayStatLine(pArg, "Number of Pcache Pages Used:",
-++         "%lld (max %lld) pages", SQLITE_STATUS_PAGECACHE_USED, bReset);
-++    }
-++    displayStatLine(pArg, "Number of Pcache Overflow Bytes:",
-++       "%lld (max %lld) bytes", SQLITE_STATUS_PAGECACHE_OVERFLOW, bReset);
-++    displayStatLine(pArg, "Largest Allocation:",
-++       "%lld bytes", SQLITE_STATUS_MALLOC_SIZE, bReset);
-++    displayStatLine(pArg, "Largest Pcache Allocation:",
-++       "%lld bytes", SQLITE_STATUS_PAGECACHE_SIZE, bReset);
-++#ifdef YYTRACKMAXSTACKDEPTH
-++    displayStatLine(pArg, "Deepest Parser Stack:",
-++       "%lld (max %lld)", SQLITE_STATUS_PARSER_STACK, bReset);
-++#endif
-++  }
-++
-++  if( pArg && pArg->out && db ){
-++    if( pArg->shellFlgs & SHFLG_Lookaside ){
-++      iHiwtr = iCur = -1;
-++      sqlite3_db_status(db, SQLITE_DBSTATUS_LOOKASIDE_USED,
-++                        &iCur, &iHiwtr, bReset);
-++      raw_printf(pArg->out,
-++              "Lookaside Slots Used:                %d (max %d)\n",
-++              iCur, iHiwtr);
-++      sqlite3_db_status(db, SQLITE_DBSTATUS_LOOKASIDE_HIT,
-++                        &iCur, &iHiwtr, bReset);
-++      raw_printf(pArg->out, "Successful lookaside attempts:       %d\n",
-++              iHiwtr);
-++      sqlite3_db_status(db, SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE,
-++                        &iCur, &iHiwtr, bReset);
-++      raw_printf(pArg->out, "Lookaside failures due to size:      %d\n",
-++              iHiwtr);
-++      sqlite3_db_status(db, SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL,
-++                        &iCur, &iHiwtr, bReset);
-++      raw_printf(pArg->out, "Lookaside failures due to OOM:       %d\n",
-++              iHiwtr);
-++    }
-++    iHiwtr = iCur = -1;
-++    sqlite3_db_status(db, SQLITE_DBSTATUS_CACHE_USED, &iCur, &iHiwtr, bReset);
-++    raw_printf(pArg->out, "Pager Heap Usage:                    %d bytes\n",
-++            iCur);
-++    iHiwtr = iCur = -1;
-++    sqlite3_db_status(db, SQLITE_DBSTATUS_CACHE_HIT, &iCur, &iHiwtr, 1);
-++    raw_printf(pArg->out, "Page cache hits:                     %d\n", iCur);
-++    iHiwtr = iCur = -1;
-++    sqlite3_db_status(db, SQLITE_DBSTATUS_CACHE_MISS, &iCur, &iHiwtr, 1);
-++    raw_printf(pArg->out, "Page cache misses:                   %d\n", iCur);
-++    iHiwtr = iCur = -1;
-++    sqlite3_db_status(db, SQLITE_DBSTATUS_CACHE_WRITE, &iCur, &iHiwtr, 1);
-++    raw_printf(pArg->out, "Page cache writes:                   %d\n", iCur);
-++    iHiwtr = iCur = -1;
-++    sqlite3_db_status(db, SQLITE_DBSTATUS_SCHEMA_USED, &iCur, &iHiwtr, bReset);
-++    raw_printf(pArg->out, "Schema Heap Usage:                   %d bytes\n",
-++            iCur);
-++    iHiwtr = iCur = -1;
-++    sqlite3_db_status(db, SQLITE_DBSTATUS_STMT_USED, &iCur, &iHiwtr, bReset);
-++    raw_printf(pArg->out, "Statement Heap/Lookaside Usage:      %d bytes\n",
-++            iCur);
-++  }
-++
-++  if( pArg && pArg->out && db && pArg->pStmt ){
-++    iCur = sqlite3_stmt_status(pArg->pStmt, SQLITE_STMTSTATUS_FULLSCAN_STEP,
-++                               bReset);
-++    raw_printf(pArg->out, "Fullscan Steps:                      %d\n", iCur);
-++    iCur = sqlite3_stmt_status(pArg->pStmt, SQLITE_STMTSTATUS_SORT, bReset);
-++    raw_printf(pArg->out, "Sort Operations:                     %d\n", iCur);
-++    iCur = sqlite3_stmt_status(pArg->pStmt, SQLITE_STMTSTATUS_AUTOINDEX,bReset);
-++    raw_printf(pArg->out, "Autoindex Inserts:                   %d\n", iCur);
-++    iCur = sqlite3_stmt_status(pArg->pStmt, SQLITE_STMTSTATUS_VM_STEP, bReset);
-++    raw_printf(pArg->out, "Virtual Machine Steps:               %d\n", iCur);
-++  }
-++
-++#ifdef __linux__
-++  displayLinuxIoStats(pArg->out);
-++#endif
-++
-++  /* Do not remove this machine readable comment: extra-stats-output-here */
-++
-++  return 0;
-++}
-++
-++/*
-++** Display scan stats.
-++*/
-++static void display_scanstats(
-++  sqlite3 *db,                    /* Database to query */
-++  ShellState *pArg                /* Pointer to ShellState */
-++){
-++#ifndef SQLITE_ENABLE_STMT_SCANSTATUS
-++  UNUSED_PARAMETER(db);
-++  UNUSED_PARAMETER(pArg);
-++#else
-++  int i, k, n, mx;
-++  raw_printf(pArg->out, "-------- scanstats --------\n");
-++  mx = 0;
-++  for(k=0; k<=mx; k++){
-++    double rEstLoop = 1.0;
-++    for(i=n=0; 1; i++){
-++      sqlite3_stmt *p = pArg->pStmt;
-++      sqlite3_int64 nLoop, nVisit;
-++      double rEst;
-++      int iSid;
-++      const char *zExplain;
-++      if( sqlite3_stmt_scanstatus(p, i, SQLITE_SCANSTAT_NLOOP, (void*)&nLoop) ){
-++        break;
-++      }
-++      sqlite3_stmt_scanstatus(p, i, SQLITE_SCANSTAT_SELECTID, (void*)&iSid);
-++      if( iSid>mx ) mx = iSid;
-++      if( iSid!=k ) continue;
-++      if( n==0 ){
-++        rEstLoop = (double)nLoop;
-++        if( k>0 ) raw_printf(pArg->out, "-------- subquery %d -------\n", k);
-++      }
-++      n++;
-++      sqlite3_stmt_scanstatus(p, i, SQLITE_SCANSTAT_NVISIT, (void*)&nVisit);
-++      sqlite3_stmt_scanstatus(p, i, SQLITE_SCANSTAT_EST, (void*)&rEst);
-++      sqlite3_stmt_scanstatus(p, i, SQLITE_SCANSTAT_EXPLAIN, (void*)&zExplain);
-++      utf8_printf(pArg->out, "Loop %2d: %s\n", n, zExplain);
-++      rEstLoop *= rEst;
-++      raw_printf(pArg->out,
-++          "         nLoop=%-8lld nRow=%-8lld estRow=%-8lld estRow/Loop=%-8g\n",
-++          nLoop, nVisit, (sqlite3_int64)(rEstLoop+0.5), rEst
-++      );
-++    }
-++  }
-++  raw_printf(pArg->out, "---------------------------\n");
-++#endif
-++}
-++
-++/*
-++** Parameter azArray points to a zero-terminated array of strings. zStr
-++** points to a single nul-terminated string. Return non-zero if zStr
-++** is equal, according to strcmp(), to any of the strings in the array.
-++** Otherwise, return zero.
-++*/
-++static int str_in_array(const char *zStr, const char **azArray){
-++  int i;
-++  for(i=0; azArray[i]; i++){
-++    if( 0==strcmp(zStr, azArray[i]) ) return 1;
-++  }
-++  return 0;
-++}
-++
-++/*
-++** If compiled statement pSql appears to be an EXPLAIN statement, allocate
-++** and populate the ShellState.aiIndent[] array with the number of
-++** spaces each opcode should be indented before it is output.
-++**
-++** The indenting rules are:
-++**
-++**     * For each "Next", "Prev", "VNext" or "VPrev" instruction, indent
-++**       all opcodes that occur between the p2 jump destination and the opcode
-++**       itself by 2 spaces.
-++**
-++**     * For each "Goto", if the jump destination is earlier in the program
-++**       and ends on one of:
-++**          Yield  SeekGt  SeekLt  RowSetRead  Rewind
-++**       or if the P1 parameter is one instead of zero,
-++**       then indent all opcodes between the earlier instruction
-++**       and "Goto" by 2 spaces.
-++*/
-++static void explain_data_prepare(ShellState *p, sqlite3_stmt *pSql){
-++  const char *zSql;               /* The text of the SQL statement */
-++  const char *z;                  /* Used to check if this is an EXPLAIN */
-++  int *abYield = 0;               /* True if op is an OP_Yield */
-++  int nAlloc = 0;                 /* Allocated size of p->aiIndent[], abYield */
-++  int iOp;                        /* Index of operation in p->aiIndent[] */
-++
-++  const char *azNext[] = { "Next", "Prev", "VPrev", "VNext", "SorterNext",
-++                           "NextIfOpen", "PrevIfOpen", 0 };
-++  const char *azYield[] = { "Yield", "SeekLT", "SeekGT", "RowSetRead",
-++                            "Rewind", 0 };
-++  const char *azGoto[] = { "Goto", 0 };
-++
-++  /* Try to figure out if this is really an EXPLAIN statement. If this
-++  ** cannot be verified, return early.  */
-++  if( sqlite3_column_count(pSql)!=8 ){
-++    p->cMode = p->mode;
-++    return;
-++  }
-++  zSql = sqlite3_sql(pSql);
-++  if( zSql==0 ) return;
-++  for(z=zSql; *z==' ' || *z=='\t' || *z=='\n' || *z=='\f' || *z=='\r'; z++);
-++  if( sqlite3_strnicmp(z, "explain", 7) ){
-++    p->cMode = p->mode;
-++    return;
-++  }
-++
-++  for(iOp=0; SQLITE_ROW==sqlite3_step(pSql); iOp++){
-++    int i;
-++    int iAddr = sqlite3_column_int(pSql, 0);
-++    const char *zOp = (const char*)sqlite3_column_text(pSql, 1);
-++
-++    /* Set p2 to the P2 field of the current opcode. Then, assuming that
-++    ** p2 is an instruction address, set variable p2op to the index of that
-++    ** instruction in the aiIndent[] array. p2 and p2op may be different if
-++    ** the current instruction is part of a sub-program generated by an
-++    ** SQL trigger or foreign key.  */
-++    int p2 = sqlite3_column_int(pSql, 3);
-++    int p2op = (p2 + (iOp-iAddr));
-++
-++    /* Grow the p->aiIndent array as required */
-++    if( iOp>=nAlloc ){
-++      if( iOp==0 ){
-++        /* Do further verfication that this is explain output.  Abort if
-++        ** it is not */
-++        static const char *explainCols[] = {
-++           "addr", "opcode", "p1", "p2", "p3", "p4", "p5", "comment" };
-++        int jj;
-++        for(jj=0; jj<ArraySize(explainCols); jj++){
-++          if( strcmp(sqlite3_column_name(pSql,jj),explainCols[jj])!=0 ){
-++            p->cMode = p->mode;
-++            sqlite3_reset(pSql);
-++            return;
-++          }
-++        }
-++      }
-++      nAlloc += 100;
-++      p->aiIndent = (int*)sqlite3_realloc64(p->aiIndent, nAlloc*sizeof(int));
-++      abYield = (int*)sqlite3_realloc64(abYield, nAlloc*sizeof(int));
-++    }
-++    abYield[iOp] = str_in_array(zOp, azYield);
-++    p->aiIndent[iOp] = 0;
-++    p->nIndent = iOp+1;
-++
-++    if( str_in_array(zOp, azNext) ){
-++      for(i=p2op; i<iOp; i++) p->aiIndent[i] += 2;
-++    }
-++    if( str_in_array(zOp, azGoto) && p2op<p->nIndent
-++     && (abYield[p2op] || sqlite3_column_int(pSql, 2))
-++    ){
-++      for(i=p2op; i<iOp; i++) p->aiIndent[i] += 2;
-++    }
-++  }
-++
-++  p->iIndent = 0;
-++  sqlite3_free(abYield);
-++  sqlite3_reset(pSql);
-++}
-++
-++/*
-++** Free the array allocated by explain_data_prepare().
-++*/
-++static void explain_data_delete(ShellState *p){
-++  sqlite3_free(p->aiIndent);
-++  p->aiIndent = 0;
-++  p->nIndent = 0;
-++  p->iIndent = 0;
-++}
-++
-++/*
-++** Disable and restore .wheretrace and .selecttrace settings.
-++*/
-++#if defined(SQLITE_DEBUG) && defined(SQLITE_ENABLE_SELECTTRACE)
-++extern int sqlite3SelectTrace;
-++static int savedSelectTrace;
-++#endif
-++#if defined(SQLITE_DEBUG) && defined(SQLITE_ENABLE_WHERETRACE)
-++extern int sqlite3WhereTrace;
-++static int savedWhereTrace;
-++#endif
-++static void disable_debug_trace_modes(void){
-++#if defined(SQLITE_DEBUG) && defined(SQLITE_ENABLE_SELECTTRACE)
-++  savedSelectTrace = sqlite3SelectTrace;
-++  sqlite3SelectTrace = 0;
-++#endif
-++#if defined(SQLITE_DEBUG) && defined(SQLITE_ENABLE_WHERETRACE)
-++  savedWhereTrace = sqlite3WhereTrace;
-++  sqlite3WhereTrace = 0;
-++#endif
-++}
-++static void restore_debug_trace_modes(void){
-++#if defined(SQLITE_DEBUG) && defined(SQLITE_ENABLE_SELECTTRACE)
-++  sqlite3SelectTrace = savedSelectTrace;
-++#endif
-++#if defined(SQLITE_DEBUG) && defined(SQLITE_ENABLE_WHERETRACE)
-++  sqlite3WhereTrace = savedWhereTrace;
-++#endif
-++}
-++
-++/*
-++** Run a prepared statement
-++*/
-++static void exec_prepared_stmt(
-++  ShellState *pArg,                                /* Pointer to ShellState */
-++  sqlite3_stmt *pStmt,                             /* Statment to run */
-++  int (*xCallback)(void*,int,char**,char**,int*)   /* Callback function */
-++){
-++  int rc;
-++
-++  /* perform the first step.  this will tell us if we
-++  ** have a result set or not and how wide it is.
-++  */
-++  rc = sqlite3_step(pStmt);
-++  /* if we have a result set... */
-++  if( SQLITE_ROW == rc ){
-++    /* if we have a callback... */
-++    if( xCallback ){
-++      /* allocate space for col name ptr, value ptr, and type */
-++      int nCol = sqlite3_column_count(pStmt);
-++      void *pData = sqlite3_malloc64(3*nCol*sizeof(const char*) + 1);
-++      if( !pData ){
-++        rc = SQLITE_NOMEM;
-++      }else{
-++        char **azCols = (char **)pData;      /* Names of result columns */
-++        char **azVals = &azCols[nCol];       /* Results */
-++        int *aiTypes = (int *)&azVals[nCol]; /* Result types */
-++        int i, x;
-++        assert(sizeof(int) <= sizeof(char *));
-++        /* save off ptrs to column names */
-++        for(i=0; i<nCol; i++){
-++          azCols[i] = (char *)sqlite3_column_name(pStmt, i);
-++        }
-++        do{
-++          /* extract the data and data types */
-++          for(i=0; i<nCol; i++){
-++            aiTypes[i] = x = sqlite3_column_type(pStmt, i);
-++            if( x==SQLITE_BLOB && pArg && pArg->cMode==MODE_Insert ){
-++              azVals[i] = "";
-++            }else{
-++              azVals[i] = (char*)sqlite3_column_text(pStmt, i);
-++            }
-++            if( !azVals[i] && (aiTypes[i]!=SQLITE_NULL) ){
-++              rc = SQLITE_NOMEM;
-++              break; /* from for */
-++            }
-++          } /* end for */
-++
-++          /* if data and types extracted successfully... */
-++          if( SQLITE_ROW == rc ){
-++            /* call the supplied callback with the result row data */
-++            if( xCallback(pArg, nCol, azVals, azCols, aiTypes) ){
-++              rc = SQLITE_ABORT;
-++            }else{
-++              rc = sqlite3_step(pStmt);
-++            }
-++          }
-++        } while( SQLITE_ROW == rc );
-++        sqlite3_free(pData);
-++      }
-++    }else{
-++      do{
-++        rc = sqlite3_step(pStmt);
-++      } while( rc == SQLITE_ROW );
-++    }
-++  }
-++}
-++
-++/*
-++** Execute a statement or set of statements.  Print
-++** any result rows/columns depending on the current mode
-++** set via the supplied callback.
-++**
-++** This is very similar to SQLite's built-in sqlite3_exec()
-++** function except it takes a slightly different callback
-++** and callback data argument.
-++*/
-++static int shell_exec(
-++  sqlite3 *db,                              /* An open database */
-++  const char *zSql,                         /* SQL to be evaluated */
-++  int (*xCallback)(void*,int,char**,char**,int*),   /* Callback function */
-++                                            /* (not the same as sqlite3_exec) */
-++  ShellState *pArg,                         /* Pointer to ShellState */
-++  char **pzErrMsg                           /* Error msg written here */
-++){
-++  sqlite3_stmt *pStmt = NULL;     /* Statement to execute. */
-++  int rc = SQLITE_OK;             /* Return Code */
-++  int rc2;
-++  const char *zLeftover;          /* Tail of unprocessed SQL */
-++
-++  if( pzErrMsg ){
-++    *pzErrMsg = NULL;
-++  }
-++
-++  while( zSql[0] && (SQLITE_OK == rc) ){
-++    static const char *zStmtSql;
-++    rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, &zLeftover);
-++    if( SQLITE_OK != rc ){
-++      if( pzErrMsg ){
-++        *pzErrMsg = save_err_msg(db);
-++      }
-++    }else{
-++      if( !pStmt ){
-++        /* this happens for a comment or white-space */
-++        zSql = zLeftover;
-++        while( IsSpace(zSql[0]) ) zSql++;
-++        continue;
-++      }
-++      zStmtSql = sqlite3_sql(pStmt);
-++      if( zStmtSql==0 ) zStmtSql = "";
-++      while( IsSpace(zStmtSql[0]) ) zStmtSql++;
-++
-++      /* save off the prepared statment handle and reset row count */
-++      if( pArg ){
-++        pArg->pStmt = pStmt;
-++        pArg->cnt = 0;
-++      }
-++
-++      /* echo the sql statement if echo on */
-++      if( pArg && ShellHasFlag(pArg, SHFLG_Echo) ){
-++        utf8_printf(pArg->out, "%s\n", zStmtSql ? zStmtSql : zSql);
-++      }
-++
-++      /* Show the EXPLAIN QUERY PLAN if .eqp is on */
-++      if( pArg && pArg->autoEQP && sqlite3_strlike("EXPLAIN%",zStmtSql,0)!=0 ){
-++        sqlite3_stmt *pExplain;
-++        char *zEQP;
-++        disable_debug_trace_modes();
-++        zEQP = sqlite3_mprintf("EXPLAIN QUERY PLAN %s", zStmtSql);
-++        rc = sqlite3_prepare_v2(db, zEQP, -1, &pExplain, 0);
-++        if( rc==SQLITE_OK ){
-++          while( sqlite3_step(pExplain)==SQLITE_ROW ){
-++            raw_printf(pArg->out,"--EQP-- %d,",sqlite3_column_int(pExplain, 0));
-++            raw_printf(pArg->out,"%d,", sqlite3_column_int(pExplain, 1));
-++            raw_printf(pArg->out,"%d,", sqlite3_column_int(pExplain, 2));
-++            utf8_printf(pArg->out,"%s\n", sqlite3_column_text(pExplain, 3));
-++          }
-++        }
-++        sqlite3_finalize(pExplain);
-++        sqlite3_free(zEQP);
-++        if( pArg->autoEQP>=2 ){
-++          /* Also do an EXPLAIN for ".eqp full" mode */
-++          zEQP = sqlite3_mprintf("EXPLAIN %s", zStmtSql);
-++          rc = sqlite3_prepare_v2(db, zEQP, -1, &pExplain, 0);
-++          if( rc==SQLITE_OK ){
-++            pArg->cMode = MODE_Explain;
-++            explain_data_prepare(pArg, pExplain);
-++            exec_prepared_stmt(pArg, pExplain, xCallback);
-++            explain_data_delete(pArg);
-++          }
-++          sqlite3_finalize(pExplain);
-++          sqlite3_free(zEQP);
-++        }
-++        restore_debug_trace_modes();
-++      }
-++
-++      if( pArg ){
-++        pArg->cMode = pArg->mode;
-++        if( pArg->autoExplain
-++         && sqlite3_column_count(pStmt)==8
-++         && sqlite3_strlike("EXPLAIN%", zStmtSql,0)==0
-++        ){
-++          pArg->cMode = MODE_Explain;
-++        }
-++
-++        /* If the shell is currently in ".explain" mode, gather the extra
-++        ** data required to add indents to the output.*/
-++        if( pArg->cMode==MODE_Explain ){
-++          explain_data_prepare(pArg, pStmt);
-++        }
-++      }
-++
-++      exec_prepared_stmt(pArg, pStmt, xCallback);
-++      explain_data_delete(pArg);
-++
-++      /* print usage stats if stats on */
-++      if( pArg && pArg->statsOn ){
-++        display_stats(db, pArg, 0);
-++      }
-++
-++      /* print loop-counters if required */
-++      if( pArg && pArg->scanstatsOn ){
-++        display_scanstats(db, pArg);
-++      }
-++
-++      /* Finalize the statement just executed. If this fails, save a
-++      ** copy of the error message. Otherwise, set zSql to point to the
-++      ** next statement to execute. */
-++      rc2 = sqlite3_finalize(pStmt);
-++      if( rc!=SQLITE_NOMEM ) rc = rc2;
-++      if( rc==SQLITE_OK ){
-++        zSql = zLeftover;
-++        while( IsSpace(zSql[0]) ) zSql++;
-++      }else if( pzErrMsg ){
-++        *pzErrMsg = save_err_msg(db);
-++      }
-++
-++      /* clear saved stmt handle */
-++      if( pArg ){
-++        pArg->pStmt = NULL;
-++      }
-++    }
-++  } /* end while */
-++
-++  return rc;
-++}
-++
-++/*
-++** Release memory previously allocated by tableColumnList().
-++*/
-++static void freeColumnList(char **azCol){
-++  int i;
-++  for(i=1; azCol[i]; i++){
-++    sqlite3_free(azCol[i]);
-++  }
-++  /* azCol[0] is a static string */
-++  sqlite3_free(azCol);
-++}
-++
-++/*
-++** Return a list of pointers to strings which are the names of all
-++** columns in table zTab.   The memory to hold the names is dynamically
-++** allocated and must be released by the caller using a subsequent call
-++** to freeColumnList().
-++**
-++** The azCol[0] entry is usually NULL.  However, if zTab contains a rowid
-++** value that needs to be preserved, then azCol[0] is filled in with the
-++** name of the rowid column.
-++**
-++** The first regular column in the table is azCol[1].  The list is terminated
-++** by an entry with azCol[i]==0.
-++*/
-++static char **tableColumnList(ShellState *p, const char *zTab){
-++  char **azCol = 0;
-++  sqlite3_stmt *pStmt;
-++  char *zSql;
-++  int nCol = 0;
-++  int nAlloc = 0;
-++  int nPK = 0;       /* Number of PRIMARY KEY columns seen */
-++  int isIPK = 0;     /* True if one PRIMARY KEY column of type INTEGER */
-++  int preserveRowid = ShellHasFlag(p, SHFLG_PreserveRowid);
-++  int rc;
-++
-++  zSql = sqlite3_mprintf("PRAGMA table_info=%Q", zTab);
-++  rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
-++  sqlite3_free(zSql);
-++  if( rc ) return 0;
-++  while( sqlite3_step(pStmt)==SQLITE_ROW ){
-++    if( nCol>=nAlloc-2 ){
-++      nAlloc = nAlloc*2 + nCol + 10;
-++      azCol = sqlite3_realloc(azCol, nAlloc*sizeof(azCol[0]));
-++      if( azCol==0 ){
-++        raw_printf(stderr, "Error: out of memory\n");
-++        exit(1);
-++      }
-++    }
-++    azCol[++nCol] = sqlite3_mprintf("%s", sqlite3_column_text(pStmt, 1));
-++    if( sqlite3_column_int(pStmt, 5) ){
-++      nPK++;
-++      if( nPK==1
-++       && sqlite3_stricmp((const char*)sqlite3_column_text(pStmt,2),
-++                          "INTEGER")==0
-++      ){
-++        isIPK = 1;
-++      }else{
-++        isIPK = 0;
-++      }
-++    }
-++  }
-++  sqlite3_finalize(pStmt);
-++  if( azCol==0 ) return 0;
-++  azCol[0] = 0;
-++  azCol[nCol+1] = 0;
-++
-++  /* The decision of whether or not a rowid really needs to be preserved
-++  ** is tricky.  We never need to preserve a rowid for a WITHOUT ROWID table
-++  ** or a table with an INTEGER PRIMARY KEY.  We are unable to preserve
-++  ** rowids on tables where the rowid is inaccessible because there are other
-++  ** columns in the table named "rowid", "_rowid_", and "oid".
-++  */
-++  if( preserveRowid && isIPK ){
-++    /* If a single PRIMARY KEY column with type INTEGER was seen, then it
-++    ** might be an alise for the ROWID.  But it might also be a WITHOUT ROWID
-++    ** table or a INTEGER PRIMARY KEY DESC column, neither of which are
-++    ** ROWID aliases.  To distinguish these cases, check to see if
-++    ** there is a "pk" entry in "PRAGMA index_list".  There will be
-++    ** no "pk" index if the PRIMARY KEY really is an alias for the ROWID.
-++    */
-++    zSql = sqlite3_mprintf("SELECT 1 FROM pragma_index_list(%Q)"
-++                           " WHERE origin='pk'", zTab);
-++    rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
-++    sqlite3_free(zSql);
-++    if( rc ){
-++      freeColumnList(azCol);
-++      return 0;
-++    }
-++    rc = sqlite3_step(pStmt);
-++    sqlite3_finalize(pStmt);
-++    preserveRowid = rc==SQLITE_ROW;
-++  }
-++  if( preserveRowid ){
-++    /* Only preserve the rowid if we can find a name to use for the
-++    ** rowid */
-++    static char *azRowid[] = { "rowid", "_rowid_", "oid" };
-++    int i, j;
-++    for(j=0; j<3; j++){
-++      for(i=1; i<=nCol; i++){
-++        if( sqlite3_stricmp(azRowid[j],azCol[i])==0 ) break;
-++      }
-++      if( i>nCol ){
-++        /* At this point, we know that azRowid[j] is not the name of any
-++        ** ordinary column in the table.  Verify that azRowid[j] is a valid
-++        ** name for the rowid before adding it to azCol[0].  WITHOUT ROWID
-++        ** tables will fail this last check */
-++        rc = sqlite3_table_column_metadata(p->db,0,zTab,azRowid[j],0,0,0,0,0);
-++        if( rc==SQLITE_OK ) azCol[0] = azRowid[j];
-++        break;
-++      }
-++    }
-++  }
-++  return azCol;
-++}
-++
-++/*
-++** Toggle the reverse_unordered_selects setting.
-++*/
-++static void toggleSelectOrder(sqlite3 *db){
-++  sqlite3_stmt *pStmt = 0;
-++  int iSetting = 0;
-++  char zStmt[100];
-++  sqlite3_prepare_v2(db, "PRAGMA reverse_unordered_selects", -1, &pStmt, 0);
-++  if( sqlite3_step(pStmt)==SQLITE_ROW ){
-++    iSetting = sqlite3_column_int(pStmt, 0);
-++  }
-++  sqlite3_finalize(pStmt);
-++  sqlite3_snprintf(sizeof(zStmt), zStmt,
-++       "PRAGMA reverse_unordered_selects(%d)", !iSetting);
-++  sqlite3_exec(db, zStmt, 0, 0, 0);
-++}
-++
-++/*
-++** This is a different callback routine used for dumping the database.
-++** Each row received by this callback consists of a table name,
-++** the table type ("index" or "table") and SQL to create the table.
-++** This routine should print text sufficient to recreate the table.
-++*/
-++static int dump_callback(void *pArg, int nArg, char **azArg, char **azNotUsed){
-++  int rc;
-++  const char *zTable;
-++  const char *zType;
-++  const char *zSql;
-++  ShellState *p = (ShellState *)pArg;
-++
-++  UNUSED_PARAMETER(azNotUsed);
-++  if( nArg!=3 || azArg==0 ) return 0;
-++  zTable = azArg[0];
-++  zType = azArg[1];
-++  zSql = azArg[2];
-++
-++  if( strcmp(zTable, "sqlite_sequence")==0 ){
-++    raw_printf(p->out, "DELETE FROM sqlite_sequence;\n");
-++  }else if( sqlite3_strglob("sqlite_stat?", zTable)==0 ){
-++    raw_printf(p->out, "ANALYZE sqlite_master;\n");
-++  }else if( strncmp(zTable, "sqlite_", 7)==0 ){
-++    return 0;
-++  }else if( strncmp(zSql, "CREATE VIRTUAL TABLE", 20)==0 ){
-++    char *zIns;
-++    if( !p->writableSchema ){
-++      raw_printf(p->out, "PRAGMA writable_schema=ON;\n");
-++      p->writableSchema = 1;
-++    }
-++    zIns = sqlite3_mprintf(
-++       "INSERT INTO sqlite_master(type,name,tbl_name,rootpage,sql)"
-++       "VALUES('table','%q','%q',0,'%q');",
-++       zTable, zTable, zSql);
-++    utf8_printf(p->out, "%s\n", zIns);
-++    sqlite3_free(zIns);
-++    return 0;
-++  }else{
-++    printSchemaLine(p->out, zSql, ";\n");
-++  }
-++
-++  if( strcmp(zType, "table")==0 ){
-++    ShellText sSelect;
-++    ShellText sTable;
-++    char **azCol;
-++    int i;
-++    char *savedDestTable;
-++    int savedMode;
-++
-++    azCol = tableColumnList(p, zTable);
-++    if( azCol==0 ){
-++      p->nErr++;
-++      return 0;
-++    }
-++
-++    /* Always quote the table name, even if it appears to be pure ascii,
-++    ** in case it is a keyword. Ex:  INSERT INTO "table" ... */
-++    initText(&sTable);
-++    appendText(&sTable, zTable, quoteChar(zTable));
-++    /* If preserving the rowid, add a column list after the table name.
-++    ** In other words:  "INSERT INTO tab(rowid,a,b,c,...) VALUES(...)"
-++    ** instead of the usual "INSERT INTO tab VALUES(...)".
-++    */
-++    if( azCol[0] ){
-++      appendText(&sTable, "(", 0);
-++      appendText(&sTable, azCol[0], 0);
-++      for(i=1; azCol[i]; i++){
-++        appendText(&sTable, ",", 0);
-++        appendText(&sTable, azCol[i], quoteChar(azCol[i]));
-++      }
-++      appendText(&sTable, ")", 0);
-++    }
-++
-++    /* Build an appropriate SELECT statement */
-++    initText(&sSelect);
-++    appendText(&sSelect, "SELECT ", 0);
-++    if( azCol[0] ){
-++      appendText(&sSelect, azCol[0], 0);
-++      appendText(&sSelect, ",", 0);
-++    }
-++    for(i=1; azCol[i]; i++){
-++      appendText(&sSelect, azCol[i], quoteChar(azCol[i]));
-++      if( azCol[i+1] ){
-++        appendText(&sSelect, ",", 0);
-++      }
-++    }
-++    freeColumnList(azCol);
-++    appendText(&sSelect, " FROM ", 0);
-++    appendText(&sSelect, zTable, quoteChar(zTable));
-++
-++    savedDestTable = p->zDestTable;
-++    savedMode = p->mode;
-++    p->zDestTable = sTable.z;
-++    p->mode = p->cMode = MODE_Insert;
-++    rc = shell_exec(p->db, sSelect.z, shell_callback, p, 0);
-++    if( (rc&0xff)==SQLITE_CORRUPT ){
-++      raw_printf(p->out, "/****** CORRUPTION ERROR *******/\n");
-++      toggleSelectOrder(p->db);
-++      shell_exec(p->db, sSelect.z, shell_callback, p, 0);
-++      toggleSelectOrder(p->db);
-++    }
-++    p->zDestTable = savedDestTable;
-++    p->mode = savedMode;
-++    freeText(&sTable);
-++    freeText(&sSelect);
-++    if( rc ) p->nErr++;
-++  }
-++  return 0;
-++}
-++
-++/*
-++** Run zQuery.  Use dump_callback() as the callback routine so that
-++** the contents of the query are output as SQL statements.
-++**
-++** If we get a SQLITE_CORRUPT error, rerun the query after appending
-++** "ORDER BY rowid DESC" to the end.
-++*/
-++static int run_schema_dump_query(
-++  ShellState *p,
-++  const char *zQuery
-++){
-++  int rc;
-++  char *zErr = 0;
-++  rc = sqlite3_exec(p->db, zQuery, dump_callback, p, &zErr);
-++  if( rc==SQLITE_CORRUPT ){
-++    char *zQ2;
-++    int len = strlen30(zQuery);
-++    raw_printf(p->out, "/****** CORRUPTION ERROR *******/\n");
-++    if( zErr ){
-++      utf8_printf(p->out, "/****** %s ******/\n", zErr);
-++      sqlite3_free(zErr);
-++      zErr = 0;
-++    }
-++    zQ2 = malloc( len+100 );
-++    if( zQ2==0 ) return rc;
-++    sqlite3_snprintf(len+100, zQ2, "%s ORDER BY rowid DESC", zQuery);
-++    rc = sqlite3_exec(p->db, zQ2, dump_callback, p, &zErr);
-++    if( rc ){
-++      utf8_printf(p->out, "/****** ERROR: %s ******/\n", zErr);
-++    }else{
-++      rc = SQLITE_CORRUPT;
-++    }
-++    sqlite3_free(zErr);
-++    free(zQ2);
-++  }
-++  return rc;
-++}
-++
-++/*
-++** Text of a help message
-++*/
-++static char zHelp[] =
-++#ifndef SQLITE_OMIT_AUTHORIZATION
-++  ".auth ON|OFF           Show authorizer callbacks\n"
-++#endif
-++  ".backup ?DB? FILE      Backup DB (default \"main\") to FILE\n"
-++  ".bail on|off           Stop after hitting an error.  Default OFF\n"
-++  ".binary on|off         Turn binary output on or off.  Default OFF\n"
-++  ".cd DIRECTORY          Change the working directory to DIRECTORY\n"
-++  ".changes on|off        Show number of rows changed by SQL\n"
-++  ".check GLOB            Fail if output since .testcase does not match\n"
-++  ".clone NEWDB           Clone data into NEWDB from the existing database\n"
-++  ".databases             List names and files of attached databases\n"
-++  ".dbinfo ?DB?           Show status information about the database\n"
-++  ".dump ?TABLE? ...      Dump the database in an SQL text format\n"
-++  "                         If TABLE specified, only dump tables matching\n"
-++  "                         LIKE pattern TABLE.\n"
-++  ".echo on|off           Turn command echo on or off\n"
-++  ".eqp on|off|full       Enable or disable automatic EXPLAIN QUERY PLAN\n"
-++  ".exit                  Exit this program\n"
-++/* Because explain mode comes on automatically now, the ".explain" mode
-++** is removed from the help screen.  It is still supported for legacy, however */
-++/*".explain ?on|off|auto? Turn EXPLAIN output mode on or off or to automatic\n"*/
-++  ".fullschema ?--indent? Show schema and the content of sqlite_stat tables\n"
-++  ".headers on|off        Turn display of headers on or off\n"
-++  ".help                  Show this message\n"
-++  ".import FILE TABLE     Import data from FILE into TABLE\n"
-++#ifndef SQLITE_OMIT_TEST_CONTROL
-++  ".imposter INDEX TABLE  Create imposter table TABLE on index INDEX\n"
-++#endif
-++  ".indexes ?TABLE?       Show names of all indexes\n"
-++  "                         If TABLE specified, only show indexes for tables\n"
-++  "                         matching LIKE pattern TABLE.\n"
-++#ifdef SQLITE_ENABLE_IOTRACE
-++  ".iotrace FILE          Enable I/O diagnostic logging to FILE\n"
-++#endif
-++  ".limit ?LIMIT? ?VAL?   Display or change the value of an SQLITE_LIMIT\n"
-++  ".lint OPTIONS          Report potential schema issues. Options:\n"
-++  "                         fkey-indexes     Find missing foreign key indexes\n"
-++#ifndef SQLITE_OMIT_LOAD_EXTENSION
-++  ".load FILE ?ENTRY?     Load an extension library\n"
-++#endif
-++  ".log FILE|off          Turn logging on or off.  FILE can be stderr/stdout\n"
-++  ".mode MODE ?TABLE?     Set output mode where MODE is one of:\n"
-++  "                         ascii    Columns/rows delimited by 0x1F and 0x1E\n"
-++  "                         csv      Comma-separated values\n"
-++  "                         column   Left-aligned columns.  (See .width)\n"
-++  "                         html     HTML <table> code\n"
-++  "                         insert   SQL insert statements for TABLE\n"
-++  "                         line     One value per line\n"
-++  "                         list     Values delimited by \"|\"\n"
-++  "                         quote    Escape answers as for SQL\n"
-++  "                         tabs     Tab-separated values\n"
-++  "                         tcl      TCL list elements\n"
-++  ".nullvalue STRING      Use STRING in place of NULL values\n"
-++  ".once FILENAME         Output for the next SQL command only to FILENAME\n"
-++  ".open ?OPTIONS? ?FILE? Close existing database and reopen FILE\n"
-++  "                         The --new option starts with an empty file\n"
-++  ".output ?FILENAME?     Send output to FILENAME or stdout\n"
-++  ".print STRING...       Print literal STRING\n"
-++  ".prompt MAIN CONTINUE  Replace the standard prompts\n"
-++  ".quit                  Exit this program\n"
-++  ".read FILENAME         Execute SQL in FILENAME\n"
-++  ".restore ?DB? FILE     Restore content of DB (default \"main\") from FILE\n"
-++  ".save FILE             Write in-memory database into FILE\n"
-++  ".scanstats on|off      Turn sqlite3_stmt_scanstatus() metrics on or off\n"
-++  ".schema ?PATTERN?      Show the CREATE statements matching PATTERN\n"
-++  "                          Add --indent for pretty-printing\n"
-++  ".selftest ?--init?     Run tests defined in the SELFTEST table\n"
-++  ".separator COL ?ROW?   Change the column separator and optionally the row\n"
-++  "                         separator for both the output mode and .import\n"
-++#if defined(SQLITE_ENABLE_SESSION)
-++  ".session CMD ...       Create or control sessions\n"
-++#endif
-++  ".sha3sum ?OPTIONS...?  Compute a SHA3 hash of database content\n"
-++  ".shell CMD ARGS...     Run CMD ARGS... in a system shell\n"
-++  ".show                  Show the current values for various settings\n"
-++  ".stats ?on|off?        Show stats or turn stats on or off\n"
-++  ".system CMD ARGS...    Run CMD ARGS... in a system shell\n"
-++  ".tables ?TABLE?        List names of tables\n"
-++  "                         If TABLE specified, only list tables matching\n"
-++  "                         LIKE pattern TABLE.\n"
-++  ".testcase NAME         Begin redirecting output to 'testcase-out.txt'\n"
-++  ".timeout MS            Try opening locked tables for MS milliseconds\n"
-++  ".timer on|off          Turn SQL timer on or off\n"
-++  ".trace FILE|off        Output each SQL statement as it is run\n"
-++  ".vfsinfo ?AUX?         Information about the top-level VFS\n"
-++  ".vfslist               List all available VFSes\n"
-++  ".vfsname ?AUX?         Print the name of the VFS stack\n"
-++  ".width NUM1 NUM2 ...   Set column widths for \"column\" mode\n"
-++  "                         Negative values right-justify\n"
-++;
-++
-++#if defined(SQLITE_ENABLE_SESSION)
-++/*
-++** Print help information for the ".sessions" command
-++*/
-++void session_help(ShellState *p){
-++  raw_printf(p->out,
-++    ".session ?NAME? SUBCOMMAND ?ARGS...?\n"
-++    "If ?NAME? is omitted, the first defined session is used.\n"
-++    "Subcommands:\n"
-++    "   attach TABLE             Attach TABLE\n"
-++    "   changeset FILE           Write a changeset into FILE\n"
-++    "   close                    Close one session\n"
-++    "   enable ?BOOLEAN?         Set or query the enable bit\n"
-++    "   filter GLOB...           Reject tables matching GLOBs\n"
-++    "   indirect ?BOOLEAN?       Mark or query the indirect status\n"
-++    "   isempty                  Query whether the session is empty\n"
-++    "   list                     List currently open session names\n"
-++    "   open DB NAME             Open a new session on DB\n"
-++    "   patchset FILE            Write a patchset into FILE\n"
-++  );
-++}
-++#endif
-++
-++
-++/* Forward reference */
-++static int process_input(ShellState *p, FILE *in);
-++
-++/*
-++** Read the content of file zName into memory obtained from sqlite3_malloc64()
-++** and return a pointer to the buffer. The caller is responsible for freeing
-++** the memory.
-++**
-++** If parameter pnByte is not NULL, (*pnByte) is set to the number of bytes
-++** read.
-++**
-++** For convenience, a nul-terminator byte is always appended to the data read
-++** from the file before the buffer is returned. This byte is not included in
-++** the final value of (*pnByte), if applicable.
-++**
-++** NULL is returned if any error is encountered. The final value of *pnByte
-++** is undefined in this case.
-++*/
-++static char *readFile(const char *zName, int *pnByte){
-++  FILE *in = fopen(zName, "rb");
-++  long nIn;
-++  size_t nRead;
-++  char *pBuf;
-++  if( in==0 ) return 0;
-++  fseek(in, 0, SEEK_END);
-++  nIn = ftell(in);
-++  rewind(in);
-++  pBuf = sqlite3_malloc64( nIn+1 );
-++  if( pBuf==0 ) return 0;
-++  nRead = fread(pBuf, nIn, 1, in);
-++  fclose(in);
-++  if( nRead!=1 ){
-++    sqlite3_free(pBuf);
-++    return 0;
-++  }
-++  pBuf[nIn] = 0;
-++  if( pnByte ) *pnByte = nIn;
-++  return pBuf;
-++}
-++
-++#if defined(SQLITE_ENABLE_SESSION)
-++/*
-++** Close a single OpenSession object and release all of its associated
-++** resources.
-++*/
-++static void session_close(OpenSession *pSession){
-++  int i;
-++  sqlite3session_delete(pSession->p);
-++  sqlite3_free(pSession->zName);
-++  for(i=0; i<pSession->nFilter; i++){
-++    sqlite3_free(pSession->azFilter[i]);
-++  }
-++  sqlite3_free(pSession->azFilter);
-++  memset(pSession, 0, sizeof(OpenSession));
-++}
-++#endif
-++
-++/*
-++** Close all OpenSession objects and release all associated resources.
-++*/
-++#if defined(SQLITE_ENABLE_SESSION)
-++static void session_close_all(ShellState *p){
-++  int i;
-++  for(i=0; i<p->nSession; i++){
-++    session_close(&p->aSession[i]);
-++  }
-++  p->nSession = 0;
-++}
-++#else
-++# define session_close_all(X)
-++#endif
-++
-++/*
-++** Implementation of the xFilter function for an open session.  Omit
-++** any tables named by ".session filter" but let all other table through.
-++*/
-++#if defined(SQLITE_ENABLE_SESSION)
-++static int session_filter(void *pCtx, const char *zTab){
-++  OpenSession *pSession = (OpenSession*)pCtx;
-++  int i;
-++  for(i=0; i<pSession->nFilter; i++){
-++    if( sqlite3_strglob(pSession->azFilter[i], zTab)==0 ) return 0;
-++  }
-++  return 1;
-++}
-++#endif
-++
-++/*
-++** Make sure the database is open.  If it is not, then open it.  If
-++** the database fails to open, print an error message and exit.
-++*/
-++static void open_db(ShellState *p, int keepAlive){
-++  if( p->db==0 ){
-++    sqlite3_initialize();
-++    sqlite3_open(p->zDbFilename, &p->db);
-++    globalDb = p->db;
-++    if( p->db==0 || SQLITE_OK!=sqlite3_errcode(p->db) ){
-++      utf8_printf(stderr,"Error: unable to open database \"%s\": %s\n",
-++          p->zDbFilename, sqlite3_errmsg(p->db));
-++      if( keepAlive ) return;
-++      exit(1);
-++    }
-++#ifndef SQLITE_OMIT_LOAD_EXTENSION
-++    sqlite3_enable_load_extension(p->db, 1);
-++#endif
-++    sqlite3_fileio_init(p->db, 0, 0);
-++    sqlite3_shathree_init(p->db, 0, 0);
-++    sqlite3_completion_init(p->db, 0, 0);
-++    sqlite3_create_function(p->db, "shell_add_schema", 2, SQLITE_UTF8, 0,
-++                            shellAddSchemaName, 0, 0);
-++  }
-++}
-++
-++#if HAVE_READLINE || HAVE_EDITLINE
-++/*
-++** Readline completion callbacks
-++*/
-++static char *readline_completion_generator(const char *text, int state){
-++  static sqlite3_stmt *pStmt = 0;
-++  char *zRet;
-++  if( state==0 ){
-++    char *zSql;
-++    sqlite3_finalize(pStmt);
-++    zSql = sqlite3_mprintf("SELECT DISTINCT candidate COLLATE nocase"
-++                           "  FROM completion(%Q) ORDER BY 1", text);
-++    sqlite3_prepare_v2(globalDb, zSql, -1, &pStmt, 0);
-++    sqlite3_free(zSql);
-++  }
-++  if( sqlite3_step(pStmt)==SQLITE_ROW ){
-++    zRet = strdup((const char*)sqlite3_column_text(pStmt, 0));
-++  }else{
-++    sqlite3_finalize(pStmt);
-++    pStmt = 0;
-++    zRet = 0;
-++  }
-++  return zRet;
-++}
-++static char **readline_completion(const char *zText, int iStart, int iEnd){
-++  rl_attempted_completion_over = 1;
-++  return rl_completion_matches(zText, readline_completion_generator);
-++}
-++
-++#elif HAVE_LINENOISE
-++/*
-++** Linenoise completion callback
-++*/
-++static void linenoise_completion(const char *zLine, linenoiseCompletions *lc){
-++  int nLine = (int)strlen(zLine);
-++  int i, iStart;
-++  sqlite3_stmt *pStmt = 0;
-++  char *zSql;
-++  char zBuf[1000];
-++
-++  if( nLine>sizeof(zBuf)-30 ) return;
-++  if( zLine[0]=='.' ) return;
-++  for(i=nLine-1; i>=0 && (isalnum(zLine[i]) || zLine[i]=='_'); i--){}
-++  if( i==nLine-1 ) return;
-++  iStart = i+1;
-++  memcpy(zBuf, zLine, iStart);
-++  zSql = sqlite3_mprintf("SELECT DISTINCT candidate COLLATE nocase"
-++                         "  FROM completion(%Q,%Q) ORDER BY 1",
-++                         &zLine[iStart], zLine);
-++  sqlite3_prepare_v2(globalDb, zSql, -1, &pStmt, 0);
-++  sqlite3_free(zSql);
-++  sqlite3_exec(globalDb, "PRAGMA page_count", 0, 0, 0); /* Load the schema */
-++  while( sqlite3_step(pStmt)==SQLITE_ROW ){
-++    const char *zCompletion = (const char*)sqlite3_column_text(pStmt, 0);
-++    int nCompletion = sqlite3_column_bytes(pStmt, 0);
-++    if( iStart+nCompletion < sizeof(zBuf)-1 ){
-++      memcpy(zBuf+iStart, zCompletion, nCompletion+1);
-++      linenoiseAddCompletion(lc, zBuf);
-++    }
-++  }
-++  sqlite3_finalize(pStmt);
-++}
-++#endif
-++
-++/*
-++** Do C-language style dequoting.
-++**
-++**    \a    -> alarm
-++**    \b    -> backspace
-++**    \t    -> tab
-++**    \n    -> newline
-++**    \v    -> vertical tab
-++**    \f    -> form feed
-++**    \r    -> carriage return
-++**    \s    -> space
-++**    \"    -> "
-++**    \'    -> '
-++**    \\    -> backslash
-++**    \NNN  -> ascii character NNN in octal
-++*/
-++static void resolve_backslashes(char *z){
-++  int i, j;
-++  char c;
-++  while( *z && *z!='\\' ) z++;
-++  for(i=j=0; (c = z[i])!=0; i++, j++){
-++    if( c=='\\' && z[i+1]!=0 ){
-++      c = z[++i];
-++      if( c=='a' ){
-++        c = '\a';
-++      }else if( c=='b' ){
-++        c = '\b';
-++      }else if( c=='t' ){
-++        c = '\t';
-++      }else if( c=='n' ){
-++        c = '\n';
-++      }else if( c=='v' ){
-++        c = '\v';
-++      }else if( c=='f' ){
-++        c = '\f';
-++      }else if( c=='r' ){
-++        c = '\r';
-++      }else if( c=='"' ){
-++        c = '"';
-++      }else if( c=='\'' ){
-++        c = '\'';
-++      }else if( c=='\\' ){
-++        c = '\\';
-++      }else if( c>='0' && c<='7' ){
-++        c -= '0';
-++        if( z[i+1]>='0' && z[i+1]<='7' ){
-++          i++;
-++          c = (c<<3) + z[i] - '0';
-++          if( z[i+1]>='0' && z[i+1]<='7' ){
-++            i++;
-++            c = (c<<3) + z[i] - '0';
-++          }
-++        }
-++      }
-++    }
-++    z[j] = c;
-++  }
-++  if( j<i ) z[j] = 0;
-++}
-++
-++/*
-++** Return the value of a hexadecimal digit.  Return -1 if the input
-++** is not a hex digit.
-++*/
-++static int hexDigitValue(char c){
-++  if( c>='0' && c<='9' ) return c - '0';
-++  if( c>='a' && c<='f' ) return c - 'a' + 10;
-++  if( c>='A' && c<='F' ) return c - 'A' + 10;
-++  return -1;
-++}
-++
-++/*
-++** Interpret zArg as an integer value, possibly with suffixes.
-++*/
-++static sqlite3_int64 integerValue(const char *zArg){
-++  sqlite3_int64 v = 0;
-++  static const struct { char *zSuffix; int iMult; } aMult[] = {
-++    { "KiB", 1024 },
-++    { "MiB", 1024*1024 },
-++    { "GiB", 1024*1024*1024 },
-++    { "KB",  1000 },
-++    { "MB",  1000000 },
-++    { "GB",  1000000000 },
-++    { "K",   1000 },
-++    { "M",   1000000 },
-++    { "G",   1000000000 },
-++  };
-++  int i;
-++  int isNeg = 0;
-++  if( zArg[0]=='-' ){
-++    isNeg = 1;
-++    zArg++;
-++  }else if( zArg[0]=='+' ){
-++    zArg++;
-++  }
-++  if( zArg[0]=='0' && zArg[1]=='x' ){
-++    int x;
-++    zArg += 2;
-++    while( (x = hexDigitValue(zArg[0]))>=0 ){
-++      v = (v<<4) + x;
-++      zArg++;
-++    }
-++  }else{
-++    while( IsDigit(zArg[0]) ){
-++      v = v*10 + zArg[0] - '0';
-++      zArg++;
-++    }
-++  }
-++  for(i=0; i<ArraySize(aMult); i++){
-++    if( sqlite3_stricmp(aMult[i].zSuffix, zArg)==0 ){
-++      v *= aMult[i].iMult;
-++      break;
-++    }
-++  }
-++  return isNeg? -v : v;
-++}
-++
-++/*
-++** Interpret zArg as either an integer or a boolean value.  Return 1 or 0
-++** for TRUE and FALSE.  Return the integer value if appropriate.
-++*/
-++static int booleanValue(const char *zArg){
-++  int i;
-++  if( zArg[0]=='0' && zArg[1]=='x' ){
-++    for(i=2; hexDigitValue(zArg[i])>=0; i++){}
-++  }else{
-++    for(i=0; zArg[i]>='0' && zArg[i]<='9'; i++){}
-++  }
-++  if( i>0 && zArg[i]==0 ) return (int)(integerValue(zArg) & 0xffffffff);
-++  if( sqlite3_stricmp(zArg, "on")==0 || sqlite3_stricmp(zArg,"yes")==0 ){
-++    return 1;
-++  }
-++  if( sqlite3_stricmp(zArg, "off")==0 || sqlite3_stricmp(zArg,"no")==0 ){
-++    return 0;
-++  }
-++  utf8_printf(stderr, "ERROR: Not a boolean value: \"%s\". Assuming \"no\".\n",
-++          zArg);
-++  return 0;
-++}
-++
-++/*
-++** Set or clear a shell flag according to a boolean value.
-++*/
-++static void setOrClearFlag(ShellState *p, unsigned mFlag, const char *zArg){
-++  if( booleanValue(zArg) ){
-++    ShellSetFlag(p, mFlag);
-++  }else{
-++    ShellClearFlag(p, mFlag);
-++  }
-++}
-++
-++/*
-++** Close an output file, assuming it is not stderr or stdout
-++*/
-++static void output_file_close(FILE *f){
-++  if( f && f!=stdout && f!=stderr ) fclose(f);
-++}
-++
-++/*
-++** Try to open an output file.   The names "stdout" and "stderr" are
-++** recognized and do the right thing.  NULL is returned if the output
-++** filename is "off".
-++*/
-++static FILE *output_file_open(const char *zFile){
-++  FILE *f;
-++  if( strcmp(zFile,"stdout")==0 ){
-++    f = stdout;
-++  }else if( strcmp(zFile, "stderr")==0 ){
-++    f = stderr;
-++  }else if( strcmp(zFile, "off")==0 ){
-++    f = 0;
-++  }else{
-++    f = fopen(zFile, "wb");
-++    if( f==0 ){
-++      utf8_printf(stderr, "Error: cannot open \"%s\"\n", zFile);
-++    }
-++  }
-++  return f;
-++}
-++
-++#if !defined(SQLITE_UNTESTABLE)
-++#if !defined(SQLITE_OMIT_TRACE) && !defined(SQLITE_OMIT_FLOATING_POINT)
-++/*
-++** A routine for handling output from sqlite3_trace().
-++*/
-++static int sql_trace_callback(
-++  unsigned mType,
-++  void *pArg,
-++  void *pP,
-++  void *pX
-++){
-++  FILE *f = (FILE*)pArg;
-++  UNUSED_PARAMETER(mType);
-++  UNUSED_PARAMETER(pP);
-++  if( f ){
-++    const char *z = (const char*)pX;
-++    int i = (int)strlen(z);
-++    while( i>0 && z[i-1]==';' ){ i--; }
-++    utf8_printf(f, "%.*s;\n", i, z);
-++  }
-++  return 0;
-++}
-++#endif
-++#endif
-++
-++/*
-++** A no-op routine that runs with the ".breakpoint" doc-command.  This is
-++** a useful spot to set a debugger breakpoint.
-++*/
-++static void test_breakpoint(void){
-++  static int nCall = 0;
-++  nCall++;
-++}
-++
-++/*
-++** An object used to read a CSV and other files for import.
-++*/
-++typedef struct ImportCtx ImportCtx;
-++struct ImportCtx {
-++  const char *zFile;  /* Name of the input file */
-++  FILE *in;           /* Read the CSV text from this input stream */
-++  char *z;            /* Accumulated text for a field */
-++  int n;              /* Number of bytes in z */
-++  int nAlloc;         /* Space allocated for z[] */
-++  int nLine;          /* Current line number */
-++  int bNotFirst;      /* True if one or more bytes already read */
-++  int cTerm;          /* Character that terminated the most recent field */
-++  int cColSep;        /* The column separator character.  (Usually ",") */
-++  int cRowSep;        /* The row separator character.  (Usually "\n") */
-++};
-++
-++/* Append a single byte to z[] */
-++static void import_append_char(ImportCtx *p, int c){
-++  if( p->n+1>=p->nAlloc ){
-++    p->nAlloc += p->nAlloc + 100;
-++    p->z = sqlite3_realloc64(p->z, p->nAlloc);
-++    if( p->z==0 ){
-++      raw_printf(stderr, "out of memory\n");
-++      exit(1);
-++    }
-++  }
-++  p->z[p->n++] = (char)c;
-++}
-++
-++/* Read a single field of CSV text.  Compatible with rfc4180 and extended
-++** with the option of having a separator other than ",".
-++**
-++**   +  Input comes from p->in.
-++**   +  Store results in p->z of length p->n.  Space to hold p->z comes
-++**      from sqlite3_malloc64().
-++**   +  Use p->cSep as the column separator.  The default is ",".
-++**   +  Use p->rSep as the row separator.  The default is "\n".
-++**   +  Keep track of the line number in p->nLine.
-++**   +  Store the character that terminates the field in p->cTerm.  Store
-++**      EOF on end-of-file.
-++**   +  Report syntax errors on stderr
-++*/
-++static char *SQLITE_CDECL csv_read_one_field(ImportCtx *p){
-++  int c;
-++  int cSep = p->cColSep;
-++  int rSep = p->cRowSep;
-++  p->n = 0;
-++  c = fgetc(p->in);
-++  if( c==EOF || seenInterrupt ){
-++    p->cTerm = EOF;
-++    return 0;
-++  }
-++  if( c=='"' ){
-++    int pc, ppc;
-++    int startLine = p->nLine;
-++    int cQuote = c;
-++    pc = ppc = 0;
-++    while( 1 ){
-++      c = fgetc(p->in);
-++      if( c==rSep ) p->nLine++;
-++      if( c==cQuote ){
-++        if( pc==cQuote ){
-++          pc = 0;
-++          continue;
-++        }
-++      }
-++      if( (c==cSep && pc==cQuote)
-++       || (c==rSep && pc==cQuote)
-++       || (c==rSep && pc=='\r' && ppc==cQuote)
-++       || (c==EOF && pc==cQuote)
-++      ){
-++        do{ p->n--; }while( p->z[p->n]!=cQuote );
-++        p->cTerm = c;
-++        break;
-++      }
-++      if( pc==cQuote && c!='\r' ){
-++        utf8_printf(stderr, "%s:%d: unescaped %c character\n",
-++                p->zFile, p->nLine, cQuote);
-++      }
-++      if( c==EOF ){
-++        utf8_printf(stderr, "%s:%d: unterminated %c-quoted field\n",
-++                p->zFile, startLine, cQuote);
-++        p->cTerm = c;
-++        break;
-++      }
-++      import_append_char(p, c);
-++      ppc = pc;
-++      pc = c;
-++    }
-++  }else{
-++    /* If this is the first field being parsed and it begins with the
-++    ** UTF-8 BOM  (0xEF BB BF) then skip the BOM */
-++    if( (c&0xff)==0xef && p->bNotFirst==0 ){
-++      import_append_char(p, c);
-++      c = fgetc(p->in);
-++      if( (c&0xff)==0xbb ){
-++        import_append_char(p, c);
-++        c = fgetc(p->in);
-++        if( (c&0xff)==0xbf ){
-++          p->bNotFirst = 1;
-++          p->n = 0;
-++          return csv_read_one_field(p);
-++        }
-++      }
-++    }
-++    while( c!=EOF && c!=cSep && c!=rSep ){
-++      import_append_char(p, c);
-++      c = fgetc(p->in);
-++    }
-++    if( c==rSep ){
-++      p->nLine++;
-++      if( p->n>0 && p->z[p->n-1]=='\r' ) p->n--;
-++    }
-++    p->cTerm = c;
-++  }
-++  if( p->z ) p->z[p->n] = 0;
-++  p->bNotFirst = 1;
-++  return p->z;
-++}
-++
-++/* Read a single field of ASCII delimited text.
-++**
-++**   +  Input comes from p->in.
-++**   +  Store results in p->z of length p->n.  Space to hold p->z comes
-++**      from sqlite3_malloc64().
-++**   +  Use p->cSep as the column separator.  The default is "\x1F".
-++**   +  Use p->rSep as the row separator.  The default is "\x1E".
-++**   +  Keep track of the row number in p->nLine.
-++**   +  Store the character that terminates the field in p->cTerm.  Store
-++**      EOF on end-of-file.
-++**   +  Report syntax errors on stderr
-++*/
-++static char *SQLITE_CDECL ascii_read_one_field(ImportCtx *p){
-++  int c;
-++  int cSep = p->cColSep;
-++  int rSep = p->cRowSep;
-++  p->n = 0;
-++  c = fgetc(p->in);
-++  if( c==EOF || seenInterrupt ){
-++    p->cTerm = EOF;
-++    return 0;
-++  }
-++  while( c!=EOF && c!=cSep && c!=rSep ){
-++    import_append_char(p, c);
-++    c = fgetc(p->in);
-++  }
-++  if( c==rSep ){
-++    p->nLine++;
-++  }
-++  p->cTerm = c;
-++  if( p->z ) p->z[p->n] = 0;
-++  return p->z;
-++}
-++
-++/*
-++** Try to transfer data for table zTable.  If an error is seen while
-++** moving forward, try to go backwards.  The backwards movement won't
-++** work for WITHOUT ROWID tables.
-++*/
-++static void tryToCloneData(
-++  ShellState *p,
-++  sqlite3 *newDb,
-++  const char *zTable
-++){
-++  sqlite3_stmt *pQuery = 0;
-++  sqlite3_stmt *pInsert = 0;
-++  char *zQuery = 0;
-++  char *zInsert = 0;
-++  int rc;
-++  int i, j, n;
-++  int nTable = (int)strlen(zTable);
-++  int k = 0;
-++  int cnt = 0;
-++  const int spinRate = 10000;
-++
-++  zQuery = sqlite3_mprintf("SELECT * FROM \"%w\"", zTable);
-++  rc = sqlite3_prepare_v2(p->db, zQuery, -1, &pQuery, 0);
-++  if( rc ){
-++    utf8_printf(stderr, "Error %d: %s on [%s]\n",
-++            sqlite3_extended_errcode(p->db), sqlite3_errmsg(p->db),
-++            zQuery);
-++    goto end_data_xfer;
-++  }
-++  n = sqlite3_column_count(pQuery);
-++  zInsert = sqlite3_malloc64(200 + nTable + n*3);
-++  if( zInsert==0 ){
-++    raw_printf(stderr, "out of memory\n");
-++    goto end_data_xfer;
-++  }
-++  sqlite3_snprintf(200+nTable,zInsert,
-++                   "INSERT OR IGNORE INTO \"%s\" VALUES(?", zTable);
-++  i = (int)strlen(zInsert);
-++  for(j=1; j<n; j++){
-++    memcpy(zInsert+i, ",?", 2);
-++    i += 2;
-++  }
-++  memcpy(zInsert+i, ");", 3);
-++  rc = sqlite3_prepare_v2(newDb, zInsert, -1, &pInsert, 0);
-++  if( rc ){
-++    utf8_printf(stderr, "Error %d: %s on [%s]\n",
-++            sqlite3_extended_errcode(newDb), sqlite3_errmsg(newDb),
-++            zQuery);
-++    goto end_data_xfer;
-++  }
-++  for(k=0; k<2; k++){
-++    while( (rc = sqlite3_step(pQuery))==SQLITE_ROW ){
-++      for(i=0; i<n; i++){
-++        switch( sqlite3_column_type(pQuery, i) ){
-++          case SQLITE_NULL: {
-++            sqlite3_bind_null(pInsert, i+1);
-++            break;
-++          }
-++          case SQLITE_INTEGER: {
-++            sqlite3_bind_int64(pInsert, i+1, sqlite3_column_int64(pQuery,i));
-++            break;
-++          }
-++          case SQLITE_FLOAT: {
-++            sqlite3_bind_double(pInsert, i+1, sqlite3_column_double(pQuery,i));
-++            break;
-++          }
-++          case SQLITE_TEXT: {
-++            sqlite3_bind_text(pInsert, i+1,
-++                             (const char*)sqlite3_column_text(pQuery,i),
-++                             -1, SQLITE_STATIC);
-++            break;
-++          }
-++          case SQLITE_BLOB: {
-++            sqlite3_bind_blob(pInsert, i+1, sqlite3_column_blob(pQuery,i),
-++                                            sqlite3_column_bytes(pQuery,i),
-++                                            SQLITE_STATIC);
-++            break;
-++          }
-++        }
-++      } /* End for */
-++      rc = sqlite3_step(pInsert);
-++      if( rc!=SQLITE_OK && rc!=SQLITE_ROW && rc!=SQLITE_DONE ){
-++        utf8_printf(stderr, "Error %d: %s\n", sqlite3_extended_errcode(newDb),
-++                        sqlite3_errmsg(newDb));
-++      }
-++      sqlite3_reset(pInsert);
-++      cnt++;
-++      if( (cnt%spinRate)==0 ){
-++        printf("%c\b", "|/-\\"[(cnt/spinRate)%4]);
-++        fflush(stdout);
-++      }
-++    } /* End while */
-++    if( rc==SQLITE_DONE ) break;
-++    sqlite3_finalize(pQuery);
-++    sqlite3_free(zQuery);
-++    zQuery = sqlite3_mprintf("SELECT * FROM \"%w\" ORDER BY rowid DESC;",
-++                             zTable);
-++    rc = sqlite3_prepare_v2(p->db, zQuery, -1, &pQuery, 0);
-++    if( rc ){
-++      utf8_printf(stderr, "Warning: cannot step \"%s\" backwards", zTable);
-++      break;
-++    }
-++  } /* End for(k=0...) */
-++
-++end_data_xfer:
-++  sqlite3_finalize(pQuery);
-++  sqlite3_finalize(pInsert);
-++  sqlite3_free(zQuery);
-++  sqlite3_free(zInsert);
-++}
-++
-++
-++/*
-++** Try to transfer all rows of the schema that match zWhere.  For
-++** each row, invoke xForEach() on the object defined by that row.
-++** If an error is encountered while moving forward through the
-++** sqlite_master table, try again moving backwards.
-++*/
-++static void tryToCloneSchema(
-++  ShellState *p,
-++  sqlite3 *newDb,
-++  const char *zWhere,
-++  void (*xForEach)(ShellState*,sqlite3*,const char*)
-++){
-++  sqlite3_stmt *pQuery = 0;
-++  char *zQuery = 0;
-++  int rc;
-++  const unsigned char *zName;
-++  const unsigned char *zSql;
-++  char *zErrMsg = 0;
-++
-++  zQuery = sqlite3_mprintf("SELECT name, sql FROM sqlite_master"
-++                           " WHERE %s", zWhere);
-++  rc = sqlite3_prepare_v2(p->db, zQuery, -1, &pQuery, 0);
-++  if( rc ){
-++    utf8_printf(stderr, "Error: (%d) %s on [%s]\n",
-++                    sqlite3_extended_errcode(p->db), sqlite3_errmsg(p->db),
-++                    zQuery);
-++    goto end_schema_xfer;
-++  }
-++  while( (rc = sqlite3_step(pQuery))==SQLITE_ROW ){
-++    zName = sqlite3_column_text(pQuery, 0);
-++    zSql = sqlite3_column_text(pQuery, 1);
-++    printf("%s... ", zName); fflush(stdout);
-++    sqlite3_exec(newDb, (const char*)zSql, 0, 0, &zErrMsg);
-++    if( zErrMsg ){
-++      utf8_printf(stderr, "Error: %s\nSQL: [%s]\n", zErrMsg, zSql);
-++      sqlite3_free(zErrMsg);
-++      zErrMsg = 0;
-++    }
-++    if( xForEach ){
-++      xForEach(p, newDb, (const char*)zName);
-++    }
-++    printf("done\n");
-++  }
-++  if( rc!=SQLITE_DONE ){
-++    sqlite3_finalize(pQuery);
-++    sqlite3_free(zQuery);
-++    zQuery = sqlite3_mprintf("SELECT name, sql FROM sqlite_master"
-++                             " WHERE %s ORDER BY rowid DESC", zWhere);
-++    rc = sqlite3_prepare_v2(p->db, zQuery, -1, &pQuery, 0);
-++    if( rc ){
-++      utf8_printf(stderr, "Error: (%d) %s on [%s]\n",
-++                      sqlite3_extended_errcode(p->db), sqlite3_errmsg(p->db),
-++                      zQuery);
-++      goto end_schema_xfer;
-++    }
-++    while( (rc = sqlite3_step(pQuery))==SQLITE_ROW ){
-++      zName = sqlite3_column_text(pQuery, 0);
-++      zSql = sqlite3_column_text(pQuery, 1);
-++      printf("%s... ", zName); fflush(stdout);
-++      sqlite3_exec(newDb, (const char*)zSql, 0, 0, &zErrMsg);
-++      if( zErrMsg ){
-++        utf8_printf(stderr, "Error: %s\nSQL: [%s]\n", zErrMsg, zSql);
-++        sqlite3_free(zErrMsg);
-++        zErrMsg = 0;
-++      }
-++      if( xForEach ){
-++        xForEach(p, newDb, (const char*)zName);
-++      }
-++      printf("done\n");
-++    }
-++  }
-++end_schema_xfer:
-++  sqlite3_finalize(pQuery);
-++  sqlite3_free(zQuery);
-++}
-++
-++/*
-++** Open a new database file named "zNewDb".  Try to recover as much information
-++** as possible out of the main database (which might be corrupt) and write it
-++** into zNewDb.
-++*/
-++static void tryToClone(ShellState *p, const char *zNewDb){
-++  int rc;
-++  sqlite3 *newDb = 0;
-++  if( access(zNewDb,0)==0 ){
-++    utf8_printf(stderr, "File \"%s\" already exists.\n", zNewDb);
-++    return;
-++  }
-++  rc = sqlite3_open(zNewDb, &newDb);
-++  if( rc ){
-++    utf8_printf(stderr, "Cannot create output database: %s\n",
-++            sqlite3_errmsg(newDb));
-++  }else{
-++    sqlite3_exec(p->db, "PRAGMA writable_schema=ON;", 0, 0, 0);
-++    sqlite3_exec(newDb, "BEGIN EXCLUSIVE;", 0, 0, 0);
-++    tryToCloneSchema(p, newDb, "type='table'", tryToCloneData);
-++    tryToCloneSchema(p, newDb, "type!='table'", 0);
-++    sqlite3_exec(newDb, "COMMIT;", 0, 0, 0);
-++    sqlite3_exec(p->db, "PRAGMA writable_schema=OFF;", 0, 0, 0);
-++  }
-++  sqlite3_close(newDb);
-++}
-++
-++/*
-++** Change the output file back to stdout
-++*/
-++static void output_reset(ShellState *p){
-++  if( p->outfile[0]=='|' ){
-++#ifndef SQLITE_OMIT_POPEN
-++    pclose(p->out);
-++#endif
-++  }else{
-++    output_file_close(p->out);
-++  }
-++  p->outfile[0] = 0;
-++  p->out = stdout;
-++}
-++
-++/*
-++** Run an SQL command and return the single integer result.
-++*/
-++static int db_int(ShellState *p, const char *zSql){
-++  sqlite3_stmt *pStmt;
-++  int res = 0;
-++  sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
-++  if( pStmt && sqlite3_step(pStmt)==SQLITE_ROW ){
-++    res = sqlite3_column_int(pStmt,0);
-++  }
-++  sqlite3_finalize(pStmt);
-++  return res;
-++}
-++
-++/*
-++** Convert a 2-byte or 4-byte big-endian integer into a native integer
-++*/
-++static unsigned int get2byteInt(unsigned char *a){
-++  return (a[0]<<8) + a[1];
-++}
-++static unsigned int get4byteInt(unsigned char *a){
-++  return (a[0]<<24) + (a[1]<<16) + (a[2]<<8) + a[3];
-++}
-++
-++/*
-++** Implementation of the ".info" command.
-++**
-++** Return 1 on error, 2 to exit, and 0 otherwise.
-++*/
-++static int shell_dbinfo_command(ShellState *p, int nArg, char **azArg){
-++  static const struct { const char *zName; int ofst; } aField[] = {
-++     { "file change counter:",  24  },
-++     { "database page count:",  28  },
-++     { "freelist page count:",  36  },
-++     { "schema cookie:",        40  },
-++     { "schema format:",        44  },
-++     { "default cache size:",   48  },
-++     { "autovacuum top root:",  52  },
-++     { "incremental vacuum:",   64  },
-++     { "text encoding:",        56  },
-++     { "user version:",         60  },
-++     { "application id:",       68  },
-++     { "software version:",     96  },
-++  };
-++  static const struct { const char *zName; const char *zSql; } aQuery[] = {
-++     { "number of tables:",
-++       "SELECT count(*) FROM %s WHERE type='table'" },
-++     { "number of indexes:",
-++       "SELECT count(*) FROM %s WHERE type='index'" },
-++     { "number of triggers:",
-++       "SELECT count(*) FROM %s WHERE type='trigger'" },
-++     { "number of views:",
-++       "SELECT count(*) FROM %s WHERE type='view'" },
-++     { "schema size:",
-++       "SELECT total(length(sql)) FROM %s" },
-++  };
-++  int i;
-++  char *zSchemaTab;
-++  char *zDb = nArg>=2 ? azArg[1] : "main";
-++  sqlite3_stmt *pStmt = 0;
-++  unsigned char aHdr[100];
-++  open_db(p, 0);
-++  if( p->db==0 ) return 1;
-++  sqlite3_prepare_v2(p->db,"SELECT data FROM sqlite_dbpage(?1) WHERE pgno=1",
-++                     -1, &pStmt, 0);
-++  sqlite3_bind_text(pStmt, 1, zDb, -1, SQLITE_STATIC);
-++  if( sqlite3_step(pStmt)==SQLITE_ROW
-++   && sqlite3_column_bytes(pStmt,0)>100
-++  ){
-++    memcpy(aHdr, sqlite3_column_blob(pStmt,0), 100);
-++    sqlite3_finalize(pStmt);
-++  }else{
-++    raw_printf(stderr, "unable to read database header\n");
-++    sqlite3_finalize(pStmt);
-++    return 1;
-++  }
-++  i = get2byteInt(aHdr+16);
-++  if( i==1 ) i = 65536;
-++  utf8_printf(p->out, "%-20s %d\n", "database page size:", i);
-++  utf8_printf(p->out, "%-20s %d\n", "write format:", aHdr[18]);
-++  utf8_printf(p->out, "%-20s %d\n", "read format:", aHdr[19]);
-++  utf8_printf(p->out, "%-20s %d\n", "reserved bytes:", aHdr[20]);
-++  for(i=0; i<ArraySize(aField); i++){
-++    int ofst = aField[i].ofst;
-++    unsigned int val = get4byteInt(aHdr + ofst);
-++    utf8_printf(p->out, "%-20s %u", aField[i].zName, val);
-++    switch( ofst ){
-++      case 56: {
-++        if( val==1 ) raw_printf(p->out, " (utf8)");
-++        if( val==2 ) raw_printf(p->out, " (utf16le)");
-++        if( val==3 ) raw_printf(p->out, " (utf16be)");
-++      }
-++    }
-++    raw_printf(p->out, "\n");
-++  }
-++  if( zDb==0 ){
-++    zSchemaTab = sqlite3_mprintf("main.sqlite_master");
-++  }else if( strcmp(zDb,"temp")==0 ){
-++    zSchemaTab = sqlite3_mprintf("%s", "sqlite_temp_master");
-++  }else{
-++    zSchemaTab = sqlite3_mprintf("\"%w\".sqlite_master", zDb);
-++  }
-++  for(i=0; i<ArraySize(aQuery); i++){
-++    char *zSql = sqlite3_mprintf(aQuery[i].zSql, zSchemaTab);
-++    int val = db_int(p, zSql);
-++    sqlite3_free(zSql);
-++    utf8_printf(p->out, "%-20s %d\n", aQuery[i].zName, val);
-++  }
-++  sqlite3_free(zSchemaTab);
-++  return 0;
-++}
-++
-++/*
-++** Print the current sqlite3_errmsg() value to stderr and return 1.
-++*/
-++static int shellDatabaseError(sqlite3 *db){
-++  const char *zErr = sqlite3_errmsg(db);
-++  utf8_printf(stderr, "Error: %s\n", zErr);
-++  return 1;
-++}
-++
-++/*
-++** Print an out-of-memory message to stderr and return 1.
-++*/
-++static int shellNomemError(void){
-++  raw_printf(stderr, "Error: out of memory\n");
-++  return 1;
-++}
-++
-++/*
-++** Compare the pattern in zGlob[] against the text in z[].  Return TRUE
-++** if they match and FALSE (0) if they do not match.
-++**
-++** Globbing rules:
-++**
-++**      '*'       Matches any sequence of zero or more characters.
-++**
-++**      '?'       Matches exactly one character.
-++**
-++**     [...]      Matches one character from the enclosed list of
-++**                characters.
-++**
-++**     [^...]     Matches one character not in the enclosed list.
-++**
-++**      '#'       Matches any sequence of one or more digits with an
-++**                optional + or - sign in front
-++**
-++**      ' '       Any span of whitespace matches any other span of
-++**                whitespace.
-++**
-++** Extra whitespace at the end of z[] is ignored.
-++*/
-++static int testcase_glob(const char *zGlob, const char *z){
-++  int c, c2;
-++  int invert;
-++  int seen;
-++
-++  while( (c = (*(zGlob++)))!=0 ){
-++    if( IsSpace(c) ){
-++      if( !IsSpace(*z) ) return 0;
-++      while( IsSpace(*zGlob) ) zGlob++;
-++      while( IsSpace(*z) ) z++;
-++    }else if( c=='*' ){
-++      while( (c=(*(zGlob++))) == '*' || c=='?' ){
-++        if( c=='?' && (*(z++))==0 ) return 0;
-++      }
-++      if( c==0 ){
-++        return 1;
-++      }else if( c=='[' ){
-++        while( *z && testcase_glob(zGlob-1,z)==0 ){
-++          z++;
-++        }
-++        return (*z)!=0;
-++      }
-++      while( (c2 = (*(z++)))!=0 ){
-++        while( c2!=c ){
-++          c2 = *(z++);
-++          if( c2==0 ) return 0;
-++        }
-++        if( testcase_glob(zGlob,z) ) return 1;
-++      }
-++      return 0;
-++    }else if( c=='?' ){
-++      if( (*(z++))==0 ) return 0;
-++    }else if( c=='[' ){
-++      int prior_c = 0;
-++      seen = 0;
-++      invert = 0;
-++      c = *(z++);
-++      if( c==0 ) return 0;
-++      c2 = *(zGlob++);
-++      if( c2=='^' ){
-++        invert = 1;
-++        c2 = *(zGlob++);
-++      }
-++      if( c2==']' ){
-++        if( c==']' ) seen = 1;
-++        c2 = *(zGlob++);
-++      }
-++      while( c2 && c2!=']' ){
-++        if( c2=='-' && zGlob[0]!=']' && zGlob[0]!=0 && prior_c>0 ){
-++          c2 = *(zGlob++);
-++          if( c>=prior_c && c<=c2 ) seen = 1;
-++          prior_c = 0;
-++        }else{
-++          if( c==c2 ){
-++            seen = 1;
-++          }
-++          prior_c = c2;
-++        }
-++        c2 = *(zGlob++);
-++      }
-++      if( c2==0 || (seen ^ invert)==0 ) return 0;
-++    }else if( c=='#' ){
-++      if( (z[0]=='-' || z[0]=='+') && IsDigit(z[1]) ) z++;
-++      if( !IsDigit(z[0]) ) return 0;
-++      z++;
-++      while( IsDigit(z[0]) ){ z++; }
-++    }else{
-++      if( c!=(*(z++)) ) return 0;
-++    }
-++  }
-++  while( IsSpace(*z) ){ z++; }
-++  return *z==0;
-++}
-++
-++
-++/*
-++** Compare the string as a command-line option with either one or two
-++** initial "-" characters.
-++*/
-++static int optionMatch(const char *zStr, const char *zOpt){
-++  if( zStr[0]!='-' ) return 0;
-++  zStr++;
-++  if( zStr[0]=='-' ) zStr++;
-++  return strcmp(zStr, zOpt)==0;
-++}
-++
-++/*
-++** Delete a file.
-++*/
-++int shellDeleteFile(const char *zFilename){
-++  int rc;
-++#ifdef _WIN32
-++  wchar_t *z = sqlite3_win32_utf8_to_unicode(zFilename);
-++  rc = _wunlink(z);
-++  sqlite3_free(z);
-++#else
-++  rc = unlink(zFilename);
-++#endif
-++  return rc;
-++}
-++
-++
-++/*
-++** The implementation of SQL scalar function fkey_collate_clause(), used
-++** by the ".lint fkey-indexes" command. This scalar function is always
-++** called with four arguments - the parent table name, the parent column name,
-++** the child table name and the child column name.
-++**
-++**   fkey_collate_clause('parent-tab', 'parent-col', 'child-tab', 'child-col')
-++**
-++** If either of the named tables or columns do not exist, this function
-++** returns an empty string. An empty string is also returned if both tables
-++** and columns exist but have the same default collation sequence. Or,
-++** if both exist but the default collation sequences are different, this
-++** function returns the string " COLLATE <parent-collation>", where
-++** <parent-collation> is the default collation sequence of the parent column.
-++*/
-++static void shellFkeyCollateClause(
-++  sqlite3_context *pCtx,
-++  int nVal,
-++  sqlite3_value **apVal
-++){
-++  sqlite3 *db = sqlite3_context_db_handle(pCtx);
-++  const char *zParent;
-++  const char *zParentCol;
-++  const char *zParentSeq;
-++  const char *zChild;
-++  const char *zChildCol;
-++  const char *zChildSeq = 0;  /* Initialize to avoid false-positive warning */
-++  int rc;
-++
-++  assert( nVal==4 );
-++  zParent = (const char*)sqlite3_value_text(apVal[0]);
-++  zParentCol = (const char*)sqlite3_value_text(apVal[1]);
-++  zChild = (const char*)sqlite3_value_text(apVal[2]);
-++  zChildCol = (const char*)sqlite3_value_text(apVal[3]);
-++
-++  sqlite3_result_text(pCtx, "", -1, SQLITE_STATIC);
-++  rc = sqlite3_table_column_metadata(
-++      db, "main", zParent, zParentCol, 0, &zParentSeq, 0, 0, 0
-++  );
-++  if( rc==SQLITE_OK ){
-++    rc = sqlite3_table_column_metadata(
-++        db, "main", zChild, zChildCol, 0, &zChildSeq, 0, 0, 0
-++    );
-++  }
-++
-++  if( rc==SQLITE_OK && sqlite3_stricmp(zParentSeq, zChildSeq) ){
-++    char *z = sqlite3_mprintf(" COLLATE %s", zParentSeq);
-++    sqlite3_result_text(pCtx, z, -1, SQLITE_TRANSIENT);
-++    sqlite3_free(z);
-++  }
-++}
-++
-++
-++/*
-++** The implementation of dot-command ".lint fkey-indexes".
-++*/
-++static int lintFkeyIndexes(
-++  ShellState *pState,             /* Current shell tool state */
-++  char **azArg,                   /* Array of arguments passed to dot command */
-++  int nArg                        /* Number of entries in azArg[] */
-++){
-++  sqlite3 *db = pState->db;       /* Database handle to query "main" db of */
-++  FILE *out = pState->out;        /* Stream to write non-error output to */
-++  int bVerbose = 0;               /* If -verbose is present */
-++  int bGroupByParent = 0;         /* If -groupbyparent is present */
-++  int i;                          /* To iterate through azArg[] */
-++  const char *zIndent = "";       /* How much to indent CREATE INDEX by */
-++  int rc;                         /* Return code */
-++  sqlite3_stmt *pSql = 0;         /* Compiled version of SQL statement below */
-++
-++  /*
-++  ** This SELECT statement returns one row for each foreign key constraint
-++  ** in the schema of the main database. The column values are:
-++  **
-++  ** 0. The text of an SQL statement similar to:
-++  **
-++  **      "EXPLAIN QUERY PLAN SELECT rowid FROM child_table WHERE child_key=?"
-++  **
-++  **    This is the same SELECT that the foreign keys implementation needs
-++  **    to run internally on child tables. If there is an index that can
-++  **    be used to optimize this query, then it can also be used by the FK
-++  **    implementation to optimize DELETE or UPDATE statements on the parent
-++  **    table.
-++  **
-++  ** 1. A GLOB pattern suitable for sqlite3_strglob(). If the plan output by
-++  **    the EXPLAIN QUERY PLAN command matches this pattern, then the schema
-++  **    contains an index that can be used to optimize the query.
-++  **
-++  ** 2. Human readable text that describes the child table and columns. e.g.
-++  **
-++  **       "child_table(child_key1, child_key2)"
-++  **
-++  ** 3. Human readable text that describes the parent table and columns. e.g.
-++  **
-++  **       "parent_table(parent_key1, parent_key2)"
-++  **
-++  ** 4. A full CREATE INDEX statement for an index that could be used to
-++  **    optimize DELETE or UPDATE statements on the parent table. e.g.
-++  **
-++  **       "CREATE INDEX child_table_child_key ON child_table(child_key)"
-++  **
-++  ** 5. The name of the parent table.
-++  **
-++  ** These six values are used by the C logic below to generate the report.
-++  */
-++  const char *zSql =
-++  "SELECT "
-++    "     'EXPLAIN QUERY PLAN SELECT rowid FROM ' || quote(s.name) || ' WHERE '"
-++    "  || group_concat(quote(s.name) || '.' || quote(f.[from]) || '=?' "
-++    "  || fkey_collate_clause("
-++    "       f.[table], COALESCE(f.[to], p.[name]), s.name, f.[from]),' AND ')"
-++    ", "
-++    "     'SEARCH TABLE ' || s.name || ' USING COVERING INDEX*('"
-++    "  || group_concat('*=?', ' AND ') || ')'"
-++    ", "
-++    "     s.name  || '(' || group_concat(f.[from],  ', ') || ')'"
-++    ", "
-++    "     f.[table] || '(' || group_concat(COALESCE(f.[to], p.[name])) || ')'"
-++    ", "
-++    "     'CREATE INDEX ' || quote(s.name ||'_'|| group_concat(f.[from], '_'))"
-++    "  || ' ON ' || quote(s.name) || '('"
-++    "  || group_concat(quote(f.[from]) ||"
-++    "        fkey_collate_clause("
-++    "          f.[table], COALESCE(f.[to], p.[name]), s.name, f.[from]), ', ')"
-++    "  || ');'"
-++    ", "
-++    "     f.[table] "
-++    "FROM sqlite_master AS s, pragma_foreign_key_list(s.name) AS f "
-++    "LEFT JOIN pragma_table_info AS p ON (pk-1=seq AND p.arg=f.[table]) "
-++    "GROUP BY s.name, f.id "
-++    "ORDER BY (CASE WHEN ? THEN f.[table] ELSE s.name END)"
-++  ;
-++  const char *zGlobIPK = "SEARCH TABLE * USING INTEGER PRIMARY KEY (rowid=?)";
-++
-++  for(i=2; i<nArg; i++){
-++    int n = (int)strlen(azArg[i]);
-++    if( n>1 && sqlite3_strnicmp("-verbose", azArg[i], n)==0 ){
-++      bVerbose = 1;
-++    }
-++    else if( n>1 && sqlite3_strnicmp("-groupbyparent", azArg[i], n)==0 ){
-++      bGroupByParent = 1;
-++      zIndent = "    ";
-++    }
-++    else{
-++      raw_printf(stderr, "Usage: %s %s ?-verbose? ?-groupbyparent?\n",
-++          azArg[0], azArg[1]
-++      );
-++      return SQLITE_ERROR;
-++    }
-++  }
-++
-++  /* Register the fkey_collate_clause() SQL function */
-++  rc = sqlite3_create_function(db, "fkey_collate_clause", 4, SQLITE_UTF8,
-++      0, shellFkeyCollateClause, 0, 0
-++  );
-++
-++
-++  if( rc==SQLITE_OK ){
-++    rc = sqlite3_prepare_v2(db, zSql, -1, &pSql, 0);
-++  }
-++  if( rc==SQLITE_OK ){
-++    sqlite3_bind_int(pSql, 1, bGroupByParent);
-++  }
-++
-++  if( rc==SQLITE_OK ){
-++    int rc2;
-++    char *zPrev = 0;
-++    while( SQLITE_ROW==sqlite3_step(pSql) ){
-++      int res = -1;
-++      sqlite3_stmt *pExplain = 0;
-++      const char *zEQP = (const char*)sqlite3_column_text(pSql, 0);
-++      const char *zGlob = (const char*)sqlite3_column_text(pSql, 1);
-++      const char *zFrom = (const char*)sqlite3_column_text(pSql, 2);
-++      const char *zTarget = (const char*)sqlite3_column_text(pSql, 3);
-++      const char *zCI = (const char*)sqlite3_column_text(pSql, 4);
-++      const char *zParent = (const char*)sqlite3_column_text(pSql, 5);
-++
-++      rc = sqlite3_prepare_v2(db, zEQP, -1, &pExplain, 0);
-++      if( rc!=SQLITE_OK ) break;
-++      if( SQLITE_ROW==sqlite3_step(pExplain) ){
-++        const char *zPlan = (const char*)sqlite3_column_text(pExplain, 3);
-++        res = (
-++              0==sqlite3_strglob(zGlob, zPlan)
-++           || 0==sqlite3_strglob(zGlobIPK, zPlan)
-++        );
-++      }
-++      rc = sqlite3_finalize(pExplain);
-++      if( rc!=SQLITE_OK ) break;
-++
-++      if( res<0 ){
-++        raw_printf(stderr, "Error: internal error");
-++        break;
-++      }else{
-++        if( bGroupByParent
-++        && (bVerbose || res==0)
-++        && (zPrev==0 || sqlite3_stricmp(zParent, zPrev))
-++        ){
-++          raw_printf(out, "-- Parent table %s\n", zParent);
-++          sqlite3_free(zPrev);
-++          zPrev = sqlite3_mprintf("%s", zParent);
-++        }
-++
-++        if( res==0 ){
-++          raw_printf(out, "%s%s --> %s\n", zIndent, zCI, zTarget);
-++        }else if( bVerbose ){
-++          raw_printf(out, "%s/* no extra indexes required for %s -> %s */\n",
-++              zIndent, zFrom, zTarget
-++          );
-++        }
-++      }
-++    }
-++    sqlite3_free(zPrev);
-++
-++    if( rc!=SQLITE_OK ){
-++      raw_printf(stderr, "%s\n", sqlite3_errmsg(db));
-++    }
-++
-++    rc2 = sqlite3_finalize(pSql);
-++    if( rc==SQLITE_OK && rc2!=SQLITE_OK ){
-++      rc = rc2;
-++      raw_printf(stderr, "%s\n", sqlite3_errmsg(db));
-++    }
-++  }else{
-++    raw_printf(stderr, "%s\n", sqlite3_errmsg(db));
-++  }
-++
-++  return rc;
-++}
-++
-++/*
-++** Implementation of ".lint" dot command.
-++*/
-++static int lintDotCommand(
-++  ShellState *pState,             /* Current shell tool state */
-++  char **azArg,                   /* Array of arguments passed to dot command */
-++  int nArg                        /* Number of entries in azArg[] */
-++){
-++  int n;
-++  n = (nArg>=2 ? (int)strlen(azArg[1]) : 0);
-++  if( n<1 || sqlite3_strnicmp(azArg[1], "fkey-indexes", n) ) goto usage;
-++  return lintFkeyIndexes(pState, azArg, nArg);
-++
-++ usage:
-++  raw_printf(stderr, "Usage %s sub-command ?switches...?\n", azArg[0]);
-++  raw_printf(stderr, "Where sub-commands are:\n");
-++  raw_printf(stderr, "    fkey-indexes\n");
-++  return SQLITE_ERROR;
-++}
-++
-++
-++/*
-++** If an input line begins with "." then invoke this routine to
-++** process that line.
-++**
-++** Return 1 on error, 2 to exit, and 0 otherwise.
-++*/
-++static int do_meta_command(char *zLine, ShellState *p){
-++  int h = 1;
-++  int nArg = 0;
-++  int n, c;
-++  int rc = 0;
-++  char *azArg[50];
-++
-++  /* Parse the input line into tokens.
-++  */
-++  while( zLine[h] && nArg<ArraySize(azArg) ){
-++    while( IsSpace(zLine[h]) ){ h++; }
-++    if( zLine[h]==0 ) break;
-++    if( zLine[h]=='\'' || zLine[h]=='"' ){
-++      int delim = zLine[h++];
-++      azArg[nArg++] = &zLine[h];
-++      while( zLine[h] && zLine[h]!=delim ){
-++        if( zLine[h]=='\\' && delim=='"' && zLine[h+1]!=0 ) h++;
-++        h++;
-++      }
-++      if( zLine[h]==delim ){
-++        zLine[h++] = 0;
-++      }
-++      if( delim=='"' ) resolve_backslashes(azArg[nArg-1]);
-++    }else{
-++      azArg[nArg++] = &zLine[h];
-++      while( zLine[h] && !IsSpace(zLine[h]) ){ h++; }
-++      if( zLine[h] ) zLine[h++] = 0;
-++      resolve_backslashes(azArg[nArg-1]);
-++    }
-++  }
-++
-++  /* Process the input line.
-++  */
-++  if( nArg==0 ) return 0; /* no tokens, no error */
-++  n = strlen30(azArg[0]);
-++  c = azArg[0][0];
-++
-++#ifndef SQLITE_OMIT_AUTHORIZATION
-++  if( c=='a' && strncmp(azArg[0], "auth", n)==0 ){
-++    if( nArg!=2 ){
-++      raw_printf(stderr, "Usage: .auth ON|OFF\n");
-++      rc = 1;
-++      goto meta_command_exit;
-++    }
-++    open_db(p, 0);
-++    if( booleanValue(azArg[1]) ){
-++      sqlite3_set_authorizer(p->db, shellAuth, p);
-++    }else{
-++      sqlite3_set_authorizer(p->db, 0, 0);
-++    }
-++  }else
-++#endif
-++
-++  if( (c=='b' && n>=3 && strncmp(azArg[0], "backup", n)==0)
-++   || (c=='s' && n>=3 && strncmp(azArg[0], "save", n)==0)
-++  ){
-++    const char *zDestFile = 0;
-++    const char *zDb = 0;
-++    sqlite3 *pDest;
-++    sqlite3_backup *pBackup;
-++    int j;
-++    for(j=1; j<nArg; j++){
-++      const char *z = azArg[j];
-++      if( z[0]=='-' ){
-++        while( z[0]=='-' ) z++;
-++        /* No options to process at this time */
-++        {
-++          utf8_printf(stderr, "unknown option: %s\n", azArg[j]);
-++          return 1;
-++        }
-++      }else if( zDestFile==0 ){
-++        zDestFile = azArg[j];
-++      }else if( zDb==0 ){
-++        zDb = zDestFile;
-++        zDestFile = azArg[j];
-++      }else{
-++        raw_printf(stderr, "too many arguments to .backup\n");
-++        return 1;
-++      }
-++    }
-++    if( zDestFile==0 ){
-++      raw_printf(stderr, "missing FILENAME argument on .backup\n");
-++      return 1;
-++    }
-++    if( zDb==0 ) zDb = "main";
-++    rc = sqlite3_open(zDestFile, &pDest);
-++    if( rc!=SQLITE_OK ){
-++      utf8_printf(stderr, "Error: cannot open \"%s\"\n", zDestFile);
-++      sqlite3_close(pDest);
-++      return 1;
-++    }
-++    open_db(p, 0);
-++    pBackup = sqlite3_backup_init(pDest, "main", p->db, zDb);
-++    if( pBackup==0 ){
-++      utf8_printf(stderr, "Error: %s\n", sqlite3_errmsg(pDest));
-++      sqlite3_close(pDest);
-++      return 1;
-++    }
-++    while(  (rc = sqlite3_backup_step(pBackup,100))==SQLITE_OK ){}
-++    sqlite3_backup_finish(pBackup);
-++    if( rc==SQLITE_DONE ){
-++      rc = 0;
-++    }else{
-++      utf8_printf(stderr, "Error: %s\n", sqlite3_errmsg(pDest));
-++      rc = 1;
-++    }
-++    sqlite3_close(pDest);
-++  }else
-++
-++  if( c=='b' && n>=3 && strncmp(azArg[0], "bail", n)==0 ){
-++    if( nArg==2 ){
-++      bail_on_error = booleanValue(azArg[1]);
-++    }else{
-++      raw_printf(stderr, "Usage: .bail on|off\n");
-++      rc = 1;
-++    }
-++  }else
-++
-++  if( c=='b' && n>=3 && strncmp(azArg[0], "binary", n)==0 ){
-++    if( nArg==2 ){
-++      if( booleanValue(azArg[1]) ){
-++        setBinaryMode(p->out, 1);
-++      }else{
-++        setTextMode(p->out, 1);
-++      }
-++    }else{
-++      raw_printf(stderr, "Usage: .binary on|off\n");
-++      rc = 1;
-++    }
-++  }else
-++
-++  if( c=='c' && strcmp(azArg[0],"cd")==0 ){
-++    if( nArg==2 ){
-++#if defined(_WIN32) || defined(WIN32)
-++      wchar_t *z = sqlite3_win32_utf8_to_unicode(azArg[1]);
-++      rc = !SetCurrentDirectoryW(z);
-++      sqlite3_free(z);
-++#else
-++      rc = chdir(azArg[1]);
-++#endif
-++      if( rc ){
-++        utf8_printf(stderr, "Cannot change to directory \"%s\"\n", azArg[1]);
-++        rc = 1;
-++      }
-++    }else{
-++      raw_printf(stderr, "Usage: .cd DIRECTORY\n");
-++      rc = 1;
-++    }
-++  }else
-++
-++  /* The undocumented ".breakpoint" command causes a call to the no-op
-++  ** routine named test_breakpoint().
-++  */
-++  if( c=='b' && n>=3 && strncmp(azArg[0], "breakpoint", n)==0 ){
-++    test_breakpoint();
-++  }else
-++
-++  if( c=='c' && n>=3 && strncmp(azArg[0], "changes", n)==0 ){
-++    if( nArg==2 ){
-++      setOrClearFlag(p, SHFLG_CountChanges, azArg[1]);
-++    }else{
-++      raw_printf(stderr, "Usage: .changes on|off\n");
-++      rc = 1;
-++    }
-++  }else
-++
-++  /* Cancel output redirection, if it is currently set (by .testcase)
-++  ** Then read the content of the testcase-out.txt file and compare against
-++  ** azArg[1].  If there are differences, report an error and exit.
-++  */
-++  if( c=='c' && n>=3 && strncmp(azArg[0], "check", n)==0 ){
-++    char *zRes = 0;
-++    output_reset(p);
-++    if( nArg!=2 ){
-++      raw_printf(stderr, "Usage: .check GLOB-PATTERN\n");
-++      rc = 2;
-++    }else if( (zRes = readFile("testcase-out.txt", 0))==0 ){
-++      raw_printf(stderr, "Error: cannot read 'testcase-out.txt'\n");
-++      rc = 2;
-++    }else if( testcase_glob(azArg[1],zRes)==0 ){
-++      utf8_printf(stderr,
-++                 "testcase-%s FAILED\n Expected: [%s]\n      Got: [%s]\n",
-++                 p->zTestcase, azArg[1], zRes);
-++      rc = 1;
-++    }else{
-++      utf8_printf(stdout, "testcase-%s ok\n", p->zTestcase);
-++      p->nCheck++;
-++    }
-++    sqlite3_free(zRes);
-++  }else
-++
-++  if( c=='c' && strncmp(azArg[0], "clone", n)==0 ){
-++    if( nArg==2 ){
-++      tryToClone(p, azArg[1]);
-++    }else{
-++      raw_printf(stderr, "Usage: .clone FILENAME\n");
-++      rc = 1;
-++    }
-++  }else
-++
-++  if( c=='d' && n>1 && strncmp(azArg[0], "databases", n)==0 ){
-++    ShellState data;
-++    char *zErrMsg = 0;
-++    open_db(p, 0);
-++    memcpy(&data, p, sizeof(data));
-++    data.showHeader = 0;
-++    data.cMode = data.mode = MODE_List;
-++    sqlite3_snprintf(sizeof(data.colSeparator),data.colSeparator,": ");
-++    data.cnt = 0;
-++    sqlite3_exec(p->db, "SELECT name, file FROM pragma_database_list",
-++                 callback, &data, &zErrMsg);
-++    if( zErrMsg ){
-++      utf8_printf(stderr,"Error: %s\n", zErrMsg);
-++      sqlite3_free(zErrMsg);
-++      rc = 1;
-++    }
-++  }else
-++
-++  if( c=='d' && strncmp(azArg[0], "dbinfo", n)==0 ){
-++    rc = shell_dbinfo_command(p, nArg, azArg);
-++  }else
-++
-++  if( c=='d' && strncmp(azArg[0], "dump", n)==0 ){
-++    const char *zLike = 0;
-++    int i;
-++    int savedShowHeader = p->showHeader;
-++    ShellClearFlag(p, SHFLG_PreserveRowid|SHFLG_Newlines);
-++    for(i=1; i<nArg; i++){
-++      if( azArg[i][0]=='-' ){
-++        const char *z = azArg[i]+1;
-++        if( z[0]=='-' ) z++;
-++        if( strcmp(z,"preserve-rowids")==0 ){
-++#ifdef SQLITE_OMIT_VIRTUALTABLE
-++          raw_printf(stderr, "The --preserve-rowids option is not compatible"
-++                             " with SQLITE_OMIT_VIRTUALTABLE\n");
-++          rc = 1;
-++          goto meta_command_exit;
-++#else
-++          ShellSetFlag(p, SHFLG_PreserveRowid);
-++#endif
-++        }else
-++        if( strcmp(z,"newlines")==0 ){
-++          ShellSetFlag(p, SHFLG_Newlines);
-++        }else
-++        {
-++          raw_printf(stderr, "Unknown option \"%s\" on \".dump\"\n", azArg[i]);
-++          rc = 1;
-++          goto meta_command_exit;
-++        }
-++      }else if( zLike ){
-++        raw_printf(stderr, "Usage: .dump ?--preserve-rowids? "
-++                           "?--newlines? ?LIKE-PATTERN?\n");
-++        rc = 1;
-++        goto meta_command_exit;
-++      }else{
-++        zLike = azArg[i];
-++      }
-++    }
-++    open_db(p, 0);
-++    /* When playing back a "dump", the content might appear in an order
-++    ** which causes immediate foreign key constraints to be violated.
-++    ** So disable foreign-key constraint enforcement to prevent problems. */
-++    raw_printf(p->out, "PRAGMA foreign_keys=OFF;\n");
-++    raw_printf(p->out, "BEGIN TRANSACTION;\n");
-++    p->writableSchema = 0;
-++    p->showHeader = 0;
-++    /* Set writable_schema=ON since doing so forces SQLite to initialize
-++    ** as much of the schema as it can even if the sqlite_master table is
-++    ** corrupt. */
-++    sqlite3_exec(p->db, "SAVEPOINT dump; PRAGMA writable_schema=ON", 0, 0, 0);
-++    p->nErr = 0;
-++    if( zLike==0 ){
-++      run_schema_dump_query(p,
-++        "SELECT name, type, sql FROM sqlite_master "
-++        "WHERE sql NOT NULL AND type=='table' AND name!='sqlite_sequence'"
-++      );
-++      run_schema_dump_query(p,
-++        "SELECT name, type, sql FROM sqlite_master "
-++        "WHERE name=='sqlite_sequence'"
-++      );
-++      run_table_dump_query(p,
-++        "SELECT sql FROM sqlite_master "
-++        "WHERE sql NOT NULL AND type IN ('index','trigger','view')", 0
-++      );
-++    }else{
-++      char *zSql;
-++      zSql = sqlite3_mprintf(
-++        "SELECT name, type, sql FROM sqlite_master "
-++        "WHERE tbl_name LIKE %Q AND type=='table'"
-++        "  AND sql NOT NULL", zLike);
-++      run_schema_dump_query(p,zSql);
-++      sqlite3_free(zSql);
-++      zSql = sqlite3_mprintf(
-++        "SELECT sql FROM sqlite_master "
-++        "WHERE sql NOT NULL"
-++        "  AND type IN ('index','trigger','view')"
-++        "  AND tbl_name LIKE %Q", zLike);
-++      run_table_dump_query(p, zSql, 0);
-++      sqlite3_free(zSql);
-++    }
-++    if( p->writableSchema ){
-++      raw_printf(p->out, "PRAGMA writable_schema=OFF;\n");
-++      p->writableSchema = 0;
-++    }
-++    sqlite3_exec(p->db, "PRAGMA writable_schema=OFF;", 0, 0, 0);
-++    sqlite3_exec(p->db, "RELEASE dump;", 0, 0, 0);
-++    raw_printf(p->out, p->nErr ? "ROLLBACK; -- due to errors\n" : "COMMIT;\n");
-++    p->showHeader = savedShowHeader;
-++  }else
-++
-++  if( c=='e' && strncmp(azArg[0], "echo", n)==0 ){
-++    if( nArg==2 ){
-++      setOrClearFlag(p, SHFLG_Echo, azArg[1]);
-++    }else{
-++      raw_printf(stderr, "Usage: .echo on|off\n");
-++      rc = 1;
-++    }
-++  }else
-++
-++  if( c=='e' && strncmp(azArg[0], "eqp", n)==0 ){
-++    if( nArg==2 ){
-++      if( strcmp(azArg[1],"full")==0 ){
-++        p->autoEQP = 2;
-++      }else{
-++        p->autoEQP = booleanValue(azArg[1]);
-++      }
-++    }else{
-++      raw_printf(stderr, "Usage: .eqp on|off|full\n");
-++      rc = 1;
-++    }
-++  }else
-++
-++  if( c=='e' && strncmp(azArg[0], "exit", n)==0 ){
-++    if( nArg>1 && (rc = (int)integerValue(azArg[1]))!=0 ) exit(rc);
-++    rc = 2;
-++  }else
-++
-++  /* The ".explain" command is automatic now.  It is largely pointless.  It
-++  ** retained purely for backwards compatibility */
-++  if( c=='e' && strncmp(azArg[0], "explain", n)==0 ){
-++    int val = 1;
-++    if( nArg>=2 ){
-++      if( strcmp(azArg[1],"auto")==0 ){
-++        val = 99;
-++      }else{
-++        val =  booleanValue(azArg[1]);
-++      }
-++    }
-++    if( val==1 && p->mode!=MODE_Explain ){
-++      p->normalMode = p->mode;
-++      p->mode = MODE_Explain;
-++      p->autoExplain = 0;
-++    }else if( val==0 ){
-++      if( p->mode==MODE_Explain ) p->mode = p->normalMode;
-++      p->autoExplain = 0;
-++    }else if( val==99 ){
-++      if( p->mode==MODE_Explain ) p->mode = p->normalMode;
-++      p->autoExplain = 1;
-++    }
-++  }else
-++
-++  if( c=='f' && strncmp(azArg[0], "fullschema", n)==0 ){
-++    ShellState data;
-++    char *zErrMsg = 0;
-++    int doStats = 0;
-++    memcpy(&data, p, sizeof(data));
-++    data.showHeader = 0;
-++    data.cMode = data.mode = MODE_Semi;
-++    if( nArg==2 && optionMatch(azArg[1], "indent") ){
-++      data.cMode = data.mode = MODE_Pretty;
-++      nArg = 1;
-++    }
-++    if( nArg!=1 ){
-++      raw_printf(stderr, "Usage: .fullschema ?--indent?\n");
-++      rc = 1;
-++      goto meta_command_exit;
-++    }
-++    open_db(p, 0);
-++    rc = sqlite3_exec(p->db,
-++       "SELECT sql FROM"
-++       "  (SELECT sql sql, type type, tbl_name tbl_name, name name, rowid x"
-++       "     FROM sqlite_master UNION ALL"
-++       "   SELECT sql, type, tbl_name, name, rowid FROM sqlite_temp_master) "
-++       "WHERE type!='meta' AND sql NOTNULL AND name NOT LIKE 'sqlite_%' "
-++       "ORDER BY rowid",
-++       callback, &data, &zErrMsg
-++    );
-++    if( rc==SQLITE_OK ){
-++      sqlite3_stmt *pStmt;
-++      rc = sqlite3_prepare_v2(p->db,
-++               "SELECT rowid FROM sqlite_master"
-++               " WHERE name GLOB 'sqlite_stat[134]'",
-++               -1, &pStmt, 0);
-++      doStats = sqlite3_step(pStmt)==SQLITE_ROW;
-++      sqlite3_finalize(pStmt);
-++    }
-++    if( doStats==0 ){
-++      raw_printf(p->out, "/* No STAT tables available */\n");
-++    }else{
-++      raw_printf(p->out, "ANALYZE sqlite_master;\n");
-++      sqlite3_exec(p->db, "SELECT 'ANALYZE sqlite_master'",
-++                   callback, &data, &zErrMsg);
-++      data.cMode = data.mode = MODE_Insert;
-++      data.zDestTable = "sqlite_stat1";
-++      shell_exec(p->db, "SELECT * FROM sqlite_stat1",
-++                 shell_callback, &data,&zErrMsg);
-++      data.zDestTable = "sqlite_stat3";
-++      shell_exec(p->db, "SELECT * FROM sqlite_stat3",
-++                 shell_callback, &data,&zErrMsg);
-++      data.zDestTable = "sqlite_stat4";
-++      shell_exec(p->db, "SELECT * FROM sqlite_stat4",
-++                 shell_callback, &data, &zErrMsg);
-++      raw_printf(p->out, "ANALYZE sqlite_master;\n");
-++    }
-++  }else
-++
-++  if( c=='h' && strncmp(azArg[0], "headers", n)==0 ){
-++    if( nArg==2 ){
-++      p->showHeader = booleanValue(azArg[1]);
-++    }else{
-++      raw_printf(stderr, "Usage: .headers on|off\n");
-++      rc = 1;
-++    }
-++  }else
-++
-++  if( c=='h' && strncmp(azArg[0], "help", n)==0 ){
-++    utf8_printf(p->out, "%s", zHelp);
-++  }else
-++
-++  if( c=='i' && strncmp(azArg[0], "import", n)==0 ){
-++    char *zTable;               /* Insert data into this table */
-++    char *zFile;                /* Name of file to extra content from */
-++    sqlite3_stmt *pStmt = NULL; /* A statement */
-++    int nCol;                   /* Number of columns in the table */
-++    int nByte;                  /* Number of bytes in an SQL string */
-++    int i, j;                   /* Loop counters */
-++    int needCommit;             /* True to COMMIT or ROLLBACK at end */
-++    int nSep;                   /* Number of bytes in p->colSeparator[] */
-++    char *zSql;                 /* An SQL statement */
-++    ImportCtx sCtx;             /* Reader context */
-++    char *(SQLITE_CDECL *xRead)(ImportCtx*); /* Func to read one value */
-++    int (SQLITE_CDECL *xCloser)(FILE*);      /* Func to close file */
-++
-++    if( nArg!=3 ){
-++      raw_printf(stderr, "Usage: .import FILE TABLE\n");
-++      goto meta_command_exit;
-++    }
-++    zFile = azArg[1];
-++    zTable = azArg[2];
-++    seenInterrupt = 0;
-++    memset(&sCtx, 0, sizeof(sCtx));
-++    open_db(p, 0);
-++    nSep = strlen30(p->colSeparator);
-++    if( nSep==0 ){
-++      raw_printf(stderr,
-++                 "Error: non-null column separator required for import\n");
-++      return 1;
-++    }
-++    if( nSep>1 ){
-++      raw_printf(stderr, "Error: multi-character column separators not allowed"
-++                      " for import\n");
-++      return 1;
-++    }
-++    nSep = strlen30(p->rowSeparator);
-++    if( nSep==0 ){
-++      raw_printf(stderr, "Error: non-null row separator required for import\n");
-++      return 1;
-++    }
-++    if( nSep==2 && p->mode==MODE_Csv && strcmp(p->rowSeparator, SEP_CrLf)==0 ){
-++      /* When importing CSV (only), if the row separator is set to the
-++      ** default output row separator, change it to the default input
-++      ** row separator.  This avoids having to maintain different input
-++      ** and output row separators. */
-++      sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_Row);
-++      nSep = strlen30(p->rowSeparator);
-++    }
-++    if( nSep>1 ){
-++      raw_printf(stderr, "Error: multi-character row separators not allowed"
-++                      " for import\n");
-++      return 1;
-++    }
-++    sCtx.zFile = zFile;
-++    sCtx.nLine = 1;
-++    if( sCtx.zFile[0]=='|' ){
-++#ifdef SQLITE_OMIT_POPEN
-++      raw_printf(stderr, "Error: pipes are not supported in this OS\n");
-++      return 1;
-++#else
-++      sCtx.in = popen(sCtx.zFile+1, "r");
-++      sCtx.zFile = "<pipe>";
-++      xCloser = pclose;
-++#endif
-++    }else{
-++      sCtx.in = fopen(sCtx.zFile, "rb");
-++      xCloser = fclose;
-++    }
-++    if( p->mode==MODE_Ascii ){
-++      xRead = ascii_read_one_field;
-++    }else{
-++      xRead = csv_read_one_field;
-++    }
-++    if( sCtx.in==0 ){
-++      utf8_printf(stderr, "Error: cannot open \"%s\"\n", zFile);
-++      return 1;
-++    }
-++    sCtx.cColSep = p->colSeparator[0];
-++    sCtx.cRowSep = p->rowSeparator[0];
-++    zSql = sqlite3_mprintf("SELECT * FROM %s", zTable);
-++    if( zSql==0 ){
-++      raw_printf(stderr, "Error: out of memory\n");
-++      xCloser(sCtx.in);
-++      return 1;
-++    }
-++    nByte = strlen30(zSql);
-++    rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
-++    import_append_char(&sCtx, 0);    /* To ensure sCtx.z is allocated */
-++    if( rc && sqlite3_strglob("no such table: *", sqlite3_errmsg(p->db))==0 ){
-++      char *zCreate = sqlite3_mprintf("CREATE TABLE %s", zTable);
-++      char cSep = '(';
-++      while( xRead(&sCtx) ){
-++        zCreate = sqlite3_mprintf("%z%c\n  \"%w\" TEXT", zCreate, cSep, sCtx.z);
-++        cSep = ',';
-++        if( sCtx.cTerm!=sCtx.cColSep ) break;
-++      }
-++      if( cSep=='(' ){
-++        sqlite3_free(zCreate);
-++        sqlite3_free(sCtx.z);
-++        xCloser(sCtx.in);
-++        utf8_printf(stderr,"%s: empty file\n", sCtx.zFile);
-++        return 1;
-++      }
-++      zCreate = sqlite3_mprintf("%z\n)", zCreate);
-++      rc = sqlite3_exec(p->db, zCreate, 0, 0, 0);
-++      sqlite3_free(zCreate);
-++      if( rc ){
-++        utf8_printf(stderr, "CREATE TABLE %s(...) failed: %s\n", zTable,
-++                sqlite3_errmsg(p->db));
-++        sqlite3_free(sCtx.z);
-++        xCloser(sCtx.in);
-++        return 1;
-++      }
-++      rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
-++    }
-++    sqlite3_free(zSql);
-++    if( rc ){
-++      if (pStmt) sqlite3_finalize(pStmt);
-++      utf8_printf(stderr,"Error: %s\n", sqlite3_errmsg(p->db));
-++      xCloser(sCtx.in);
-++      return 1;
-++    }
-++    nCol = sqlite3_column_count(pStmt);
-++    sqlite3_finalize(pStmt);
-++    pStmt = 0;
-++    if( nCol==0 ) return 0; /* no columns, no error */
-++    zSql = sqlite3_malloc64( nByte*2 + 20 + nCol*2 );
-++    if( zSql==0 ){
-++      raw_printf(stderr, "Error: out of memory\n");
-++      xCloser(sCtx.in);
-++      return 1;
-++    }
-++    sqlite3_snprintf(nByte+20, zSql, "INSERT INTO \"%w\" VALUES(?", zTable);
-++    j = strlen30(zSql);
-++    for(i=1; i<nCol; i++){
-++      zSql[j++] = ',';
-++      zSql[j++] = '?';
-++    }
-++    zSql[j++] = ')';
-++    zSql[j] = 0;
-++    rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
-++    sqlite3_free(zSql);
-++    if( rc ){
-++      utf8_printf(stderr, "Error: %s\n", sqlite3_errmsg(p->db));
-++      if (pStmt) sqlite3_finalize(pStmt);
-++      xCloser(sCtx.in);
-++      return 1;
-++    }
-++    needCommit = sqlite3_get_autocommit(p->db);
-++    if( needCommit ) sqlite3_exec(p->db, "BEGIN", 0, 0, 0);
-++    do{
-++      int startLine = sCtx.nLine;
-++      for(i=0; i<nCol; i++){
-++        char *z = xRead(&sCtx);
-++        /*
-++        ** Did we reach end-of-file before finding any columns?
-++        ** If so, stop instead of NULL filling the remaining columns.
-++        */
-++        if( z==0 && i==0 ) break;
-++        /*
-++        ** Did we reach end-of-file OR end-of-line before finding any
-++        ** columns in ASCII mode?  If so, stop instead of NULL filling
-++        ** the remaining columns.
-++        */
-++        if( p->mode==MODE_Ascii && (z==0 || z[0]==0) && i==0 ) break;
-++        sqlite3_bind_text(pStmt, i+1, z, -1, SQLITE_TRANSIENT);
-++        if( i<nCol-1 && sCtx.cTerm!=sCtx.cColSep ){
-++          utf8_printf(stderr, "%s:%d: expected %d columns but found %d - "
-++                          "filling the rest with NULL\n",
-++                          sCtx.zFile, startLine, nCol, i+1);
-++          i += 2;
-++          while( i<=nCol ){ sqlite3_bind_null(pStmt, i); i++; }
-++        }
-++      }
-++      if( sCtx.cTerm==sCtx.cColSep ){
-++        do{
-++          xRead(&sCtx);
-++          i++;
-++        }while( sCtx.cTerm==sCtx.cColSep );
-++        utf8_printf(stderr, "%s:%d: expected %d columns but found %d - "
-++                        "extras ignored\n",
-++                        sCtx.zFile, startLine, nCol, i);
-++      }
-++      if( i>=nCol ){
-++        sqlite3_step(pStmt);
-++        rc = sqlite3_reset(pStmt);
-++        if( rc!=SQLITE_OK ){
-++          utf8_printf(stderr, "%s:%d: INSERT failed: %s\n", sCtx.zFile,
-++                      startLine, sqlite3_errmsg(p->db));
-++        }
-++      }
-++    }while( sCtx.cTerm!=EOF );
-++
-++    xCloser(sCtx.in);
-++    sqlite3_free(sCtx.z);
-++    sqlite3_finalize(pStmt);
-++    if( needCommit ) sqlite3_exec(p->db, "COMMIT", 0, 0, 0);
-++  }else
-++
-++#ifndef SQLITE_UNTESTABLE
-++  if( c=='i' && strncmp(azArg[0], "imposter", n)==0 ){
-++    char *zSql;
-++    char *zCollist = 0;
-++    sqlite3_stmt *pStmt;
-++    int tnum = 0;
-++    int i;
-++    if( nArg!=3 ){
-++      utf8_printf(stderr, "Usage: .imposter INDEX IMPOSTER\n");
-++      rc = 1;
-++      goto meta_command_exit;
-++    }
-++    open_db(p, 0);
-++    zSql = sqlite3_mprintf("SELECT rootpage FROM sqlite_master"
-++                           " WHERE name='%q' AND type='index'", azArg[1]);
-++    sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
-++    sqlite3_free(zSql);
-++    if( sqlite3_step(pStmt)==SQLITE_ROW ){
-++      tnum = sqlite3_column_int(pStmt, 0);
-++    }
-++    sqlite3_finalize(pStmt);
-++    if( tnum==0 ){
-++      utf8_printf(stderr, "no such index: \"%s\"\n", azArg[1]);
-++      rc = 1;
-++      goto meta_command_exit;
-++    }
-++    zSql = sqlite3_mprintf("PRAGMA index_xinfo='%q'", azArg[1]);
-++    rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
-++    sqlite3_free(zSql);
-++    i = 0;
-++    while( sqlite3_step(pStmt)==SQLITE_ROW ){
-++      char zLabel[20];
-++      const char *zCol = (const char*)sqlite3_column_text(pStmt,2);
-++      i++;
-++      if( zCol==0 ){
-++        if( sqlite3_column_int(pStmt,1)==-1 ){
-++          zCol = "_ROWID_";
-++        }else{
-++          sqlite3_snprintf(sizeof(zLabel),zLabel,"expr%d",i);
-++          zCol = zLabel;
-++        }
-++      }
-++      if( zCollist==0 ){
-++        zCollist = sqlite3_mprintf("\"%w\"", zCol);
-++      }else{
-++        zCollist = sqlite3_mprintf("%z,\"%w\"", zCollist, zCol);
-++      }
-++    }
-++    sqlite3_finalize(pStmt);
-++    zSql = sqlite3_mprintf(
-++          "CREATE TABLE \"%w\"(%s,PRIMARY KEY(%s))WITHOUT ROWID",
-++          azArg[2], zCollist, zCollist);
-++    sqlite3_free(zCollist);
-++    rc = sqlite3_test_control(SQLITE_TESTCTRL_IMPOSTER, p->db, "main", 1, tnum);
-++    if( rc==SQLITE_OK ){
-++      rc = sqlite3_exec(p->db, zSql, 0, 0, 0);
-++      sqlite3_test_control(SQLITE_TESTCTRL_IMPOSTER, p->db, "main", 0, 0);
-++      if( rc ){
-++        utf8_printf(stderr, "Error in [%s]: %s\n", zSql, sqlite3_errmsg(p->db));
-++      }else{
-++        utf8_printf(stdout, "%s;\n", zSql);
-++        raw_printf(stdout,
-++           "WARNING: writing to an imposter table will corrupt the index!\n"
-++        );
-++      }
-++    }else{
-++      raw_printf(stderr, "SQLITE_TESTCTRL_IMPOSTER returns %d\n", rc);
-++      rc = 1;
-++    }
-++    sqlite3_free(zSql);
-++  }else
-++#endif /* !defined(SQLITE_OMIT_TEST_CONTROL) */
-++
-++#ifdef SQLITE_ENABLE_IOTRACE
-++  if( c=='i' && strncmp(azArg[0], "iotrace", n)==0 ){
-++    SQLITE_API extern void (SQLITE_CDECL *sqlite3IoTrace)(const char*, ...);
-++    if( iotrace && iotrace!=stdout ) fclose(iotrace);
-++    iotrace = 0;
-++    if( nArg<2 ){
-++      sqlite3IoTrace = 0;
-++    }else if( strcmp(azArg[1], "-")==0 ){
-++      sqlite3IoTrace = iotracePrintf;
-++      iotrace = stdout;
-++    }else{
-++      iotrace = fopen(azArg[1], "w");
-++      if( iotrace==0 ){
-++        utf8_printf(stderr, "Error: cannot open \"%s\"\n", azArg[1]);
-++        sqlite3IoTrace = 0;
-++        rc = 1;
-++      }else{
-++        sqlite3IoTrace = iotracePrintf;
-++      }
-++    }
-++  }else
-++#endif
-++
-++  if( c=='l' && n>=5 && strncmp(azArg[0], "limits", n)==0 ){
-++    static const struct {
-++       const char *zLimitName;   /* Name of a limit */
-++       int limitCode;            /* Integer code for that limit */
-++    } aLimit[] = {
-++      { "length",                SQLITE_LIMIT_LENGTH                    },
-++      { "sql_length",            SQLITE_LIMIT_SQL_LENGTH                },
-++      { "column",                SQLITE_LIMIT_COLUMN                    },
-++      { "expr_depth",            SQLITE_LIMIT_EXPR_DEPTH                },
-++      { "compound_select",       SQLITE_LIMIT_COMPOUND_SELECT           },
-++      { "vdbe_op",               SQLITE_LIMIT_VDBE_OP                   },
-++      { "function_arg",          SQLITE_LIMIT_FUNCTION_ARG              },
-++      { "attached",              SQLITE_LIMIT_ATTACHED                  },
-++      { "like_pattern_length",   SQLITE_LIMIT_LIKE_PATTERN_LENGTH       },
-++      { "variable_number",       SQLITE_LIMIT_VARIABLE_NUMBER           },
-++      { "trigger_depth",         SQLITE_LIMIT_TRIGGER_DEPTH             },
-++      { "worker_threads",        SQLITE_LIMIT_WORKER_THREADS            },
-++    };
-++    int i, n2;
-++    open_db(p, 0);
-++    if( nArg==1 ){
-++      for(i=0; i<ArraySize(aLimit); i++){
-++        printf("%20s %d\n", aLimit[i].zLimitName,
-++               sqlite3_limit(p->db, aLimit[i].limitCode, -1));
-++      }
-++    }else if( nArg>3 ){
-++      raw_printf(stderr, "Usage: .limit NAME ?NEW-VALUE?\n");
-++      rc = 1;
-++      goto meta_command_exit;
-++    }else{
-++      int iLimit = -1;
-++      n2 = strlen30(azArg[1]);
-++      for(i=0; i<ArraySize(aLimit); i++){
-++        if( sqlite3_strnicmp(aLimit[i].zLimitName, azArg[1], n2)==0 ){
-++          if( iLimit<0 ){
-++            iLimit = i;
-++          }else{
-++            utf8_printf(stderr, "ambiguous limit: \"%s\"\n", azArg[1]);
-++            rc = 1;
-++            goto meta_command_exit;
-++          }
-++        }
-++      }
-++      if( iLimit<0 ){
-++        utf8_printf(stderr, "unknown limit: \"%s\"\n"
-++                        "enter \".limits\" with no arguments for a list.\n",
-++                         azArg[1]);
-++        rc = 1;
-++        goto meta_command_exit;
-++      }
-++      if( nArg==3 ){
-++        sqlite3_limit(p->db, aLimit[iLimit].limitCode,
-++                      (int)integerValue(azArg[2]));
-++      }
-++      printf("%20s %d\n", aLimit[iLimit].zLimitName,
-++             sqlite3_limit(p->db, aLimit[iLimit].limitCode, -1));
-++    }
-++  }else
-++
-++  if( c=='l' && n>2 && strncmp(azArg[0], "lint", n)==0 ){
-++    open_db(p, 0);
-++    lintDotCommand(p, azArg, nArg);
-++  }else
-++
-++#ifndef SQLITE_OMIT_LOAD_EXTENSION
-++  if( c=='l' && strncmp(azArg[0], "load", n)==0 ){
-++    const char *zFile, *zProc;
-++    char *zErrMsg = 0;
-++    if( nArg<2 ){
-++      raw_printf(stderr, "Usage: .load FILE ?ENTRYPOINT?\n");
-++      rc = 1;
-++      goto meta_command_exit;
-++    }
-++    zFile = azArg[1];
-++    zProc = nArg>=3 ? azArg[2] : 0;
-++    open_db(p, 0);
-++    rc = sqlite3_load_extension(p->db, zFile, zProc, &zErrMsg);
-++    if( rc!=SQLITE_OK ){
-++      utf8_printf(stderr, "Error: %s\n", zErrMsg);
-++      sqlite3_free(zErrMsg);
-++      rc = 1;
-++    }
-++  }else
-++#endif
-++
-++  if( c=='l' && strncmp(azArg[0], "log", n)==0 ){
-++    if( nArg!=2 ){
-++      raw_printf(stderr, "Usage: .log FILENAME\n");
-++      rc = 1;
-++    }else{
-++      const char *zFile = azArg[1];
-++      output_file_close(p->pLog);
-++      p->pLog = output_file_open(zFile);
-++    }
-++  }else
-++
-++  if( c=='m' && strncmp(azArg[0], "mode", n)==0 ){
-++    const char *zMode = nArg>=2 ? azArg[1] : "";
-++    int n2 = (int)strlen(zMode);
-++    int c2 = zMode[0];
-++    if( c2=='l' && n2>2 && strncmp(azArg[1],"lines",n2)==0 ){
-++      p->mode = MODE_Line;
-++      sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_Row);
-++    }else if( c2=='c' && strncmp(azArg[1],"columns",n2)==0 ){
-++      p->mode = MODE_Column;
-++      sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_Row);
-++    }else if( c2=='l' && n2>2 && strncmp(azArg[1],"list",n2)==0 ){
-++      p->mode = MODE_List;
-++      sqlite3_snprintf(sizeof(p->colSeparator), p->colSeparator, SEP_Column);
-++      sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_Row);
-++    }else if( c2=='h' && strncmp(azArg[1],"html",n2)==0 ){
-++      p->mode = MODE_Html;
-++    }else if( c2=='t' && strncmp(azArg[1],"tcl",n2)==0 ){
-++      p->mode = MODE_Tcl;
-++      sqlite3_snprintf(sizeof(p->colSeparator), p->colSeparator, SEP_Space);
-++      sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_Row);
-++    }else if( c2=='c' && strncmp(azArg[1],"csv",n2)==0 ){
-++      p->mode = MODE_Csv;
-++      sqlite3_snprintf(sizeof(p->colSeparator), p->colSeparator, SEP_Comma);
-++      sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_CrLf);
-++    }else if( c2=='t' && strncmp(azArg[1],"tabs",n2)==0 ){
-++      p->mode = MODE_List;
-++      sqlite3_snprintf(sizeof(p->colSeparator), p->colSeparator, SEP_Tab);
-++    }else if( c2=='i' && strncmp(azArg[1],"insert",n2)==0 ){
-++      p->mode = MODE_Insert;
-++      set_table_name(p, nArg>=3 ? azArg[2] : "table");
-++    }else if( c2=='q' && strncmp(azArg[1],"quote",n2)==0 ){
-++      p->mode = MODE_Quote;
-++    }else if( c2=='a' && strncmp(azArg[1],"ascii",n2)==0 ){
-++      p->mode = MODE_Ascii;
-++      sqlite3_snprintf(sizeof(p->colSeparator), p->colSeparator, SEP_Unit);
-++      sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_Record);
-++    }else if( nArg==1 ){
-++      raw_printf(p->out, "current output mode: %s\n", modeDescr[p->mode]);
-++    }else{
-++      raw_printf(stderr, "Error: mode should be one of: "
-++         "ascii column csv html insert line list quote tabs tcl\n");
-++      rc = 1;
-++    }
-++    p->cMode = p->mode;
-++  }else
-++
-++  if( c=='n' && strncmp(azArg[0], "nullvalue", n)==0 ){
-++    if( nArg==2 ){
-++      sqlite3_snprintf(sizeof(p->nullValue), p->nullValue,
-++                       "%.*s", (int)ArraySize(p->nullValue)-1, azArg[1]);
-++    }else{
-++      raw_printf(stderr, "Usage: .nullvalue STRING\n");
-++      rc = 1;
-++    }
-++  }else
-++
-++  if( c=='o' && strncmp(azArg[0], "open", n)==0 && n>=2 ){
-++    char *zNewFilename;  /* Name of the database file to open */
-++    int iName = 1;       /* Index in azArg[] of the filename */
-++    int newFlag = 0;     /* True to delete file before opening */
-++    /* Close the existing database */
-++    session_close_all(p);
-++    sqlite3_close(p->db);
-++    p->db = 0;
-++    p->zDbFilename = 0;
-++    sqlite3_free(p->zFreeOnClose);
-++    p->zFreeOnClose = 0;
-++    /* Check for command-line arguments */
-++    for(iName=1; iName<nArg && azArg[iName][0]=='-'; iName++){
-++      const char *z = azArg[iName];
-++      if( optionMatch(z,"new") ){
-++        newFlag = 1;
-++      }else if( z[0]=='-' ){
-++        utf8_printf(stderr, "unknown option: %s\n", z);
-++        rc = 1;
-++        goto meta_command_exit;
-++      }
-++    }
-++    /* If a filename is specified, try to open it first */
-++    zNewFilename = nArg>iName ? sqlite3_mprintf("%s", azArg[iName]) : 0;
-++    if( zNewFilename ){
-++      if( newFlag ) shellDeleteFile(zNewFilename);
-++      p->zDbFilename = zNewFilename;
-++      open_db(p, 1);
-++      if( p->db==0 ){
-++        utf8_printf(stderr, "Error: cannot open '%s'\n", zNewFilename);
-++        sqlite3_free(zNewFilename);
-++      }else{
-++        p->zFreeOnClose = zNewFilename;
-++      }
-++    }
-++    if( p->db==0 ){
-++      /* As a fall-back open a TEMP database */
-++      p->zDbFilename = 0;
-++      open_db(p, 0);
-++    }
-++  }else
-++
-++  if( c=='o'
-++   && (strncmp(azArg[0], "output", n)==0 || strncmp(azArg[0], "once", n)==0)
-++  ){
-++    const char *zFile = nArg>=2 ? azArg[1] : "stdout";
-++    if( nArg>2 ){
-++      utf8_printf(stderr, "Usage: .%s FILE\n", azArg[0]);
-++      rc = 1;
-++      goto meta_command_exit;
-++    }
-++    if( n>1 && strncmp(azArg[0], "once", n)==0 ){
-++      if( nArg<2 ){
-++        raw_printf(stderr, "Usage: .once FILE\n");
-++        rc = 1;
-++        goto meta_command_exit;
-++      }
-++      p->outCount = 2;
-++    }else{
-++      p->outCount = 0;
-++    }
-++    output_reset(p);
-++    if( zFile[0]=='|' ){
-++#ifdef SQLITE_OMIT_POPEN
-++      raw_printf(stderr, "Error: pipes are not supported in this OS\n");
-++      rc = 1;
-++      p->out = stdout;
-++#else
-++      p->out = popen(zFile + 1, "w");
-++      if( p->out==0 ){
-++        utf8_printf(stderr,"Error: cannot open pipe \"%s\"\n", zFile + 1);
-++        p->out = stdout;
-++        rc = 1;
-++      }else{
-++        sqlite3_snprintf(sizeof(p->outfile), p->outfile, "%s", zFile);
-++      }
-++#endif
-++    }else{
-++      p->out = output_file_open(zFile);
-++      if( p->out==0 ){
-++        if( strcmp(zFile,"off")!=0 ){
-++          utf8_printf(stderr,"Error: cannot write to \"%s\"\n", zFile);
-++        }
-++        p->out = stdout;
-++        rc = 1;
-++      } else {
-++        sqlite3_snprintf(sizeof(p->outfile), p->outfile, "%s", zFile);
-++      }
-++    }
-++  }else
-++
-++  if( c=='p' && n>=3 && strncmp(azArg[0], "print", n)==0 ){
-++    int i;
-++    for(i=1; i<nArg; i++){
-++      if( i>1 ) raw_printf(p->out, " ");
-++      utf8_printf(p->out, "%s", azArg[i]);
-++    }
-++    raw_printf(p->out, "\n");
-++  }else
-++
-++  if( c=='p' && strncmp(azArg[0], "prompt", n)==0 ){
-++    if( nArg >= 2) {
-++      strncpy(mainPrompt,azArg[1],(int)ArraySize(mainPrompt)-1);
-++    }
-++    if( nArg >= 3) {
-++      strncpy(continuePrompt,azArg[2],(int)ArraySize(continuePrompt)-1);
-++    }
-++  }else
-++
-++  if( c=='q' && strncmp(azArg[0], "quit", n)==0 ){
-++    rc = 2;
-++  }else
-++
-++  if( c=='r' && n>=3 && strncmp(azArg[0], "read", n)==0 ){
-++    FILE *alt;
-++    if( nArg!=2 ){
-++      raw_printf(stderr, "Usage: .read FILE\n");
-++      rc = 1;
-++      goto meta_command_exit;
-++    }
-++    alt = fopen(azArg[1], "rb");
-++    if( alt==0 ){
-++      utf8_printf(stderr,"Error: cannot open \"%s\"\n", azArg[1]);
-++      rc = 1;
-++    }else{
-++      rc = process_input(p, alt);
-++      fclose(alt);
-++    }
-++  }else
-++
-++  if( c=='r' && n>=3 && strncmp(azArg[0], "restore", n)==0 ){
-++    const char *zSrcFile;
-++    const char *zDb;
-++    sqlite3 *pSrc;
-++    sqlite3_backup *pBackup;
-++    int nTimeout = 0;
-++
-++    if( nArg==2 ){
-++      zSrcFile = azArg[1];
-++      zDb = "main";
-++    }else if( nArg==3 ){
-++      zSrcFile = azArg[2];
-++      zDb = azArg[1];
-++    }else{
-++      raw_printf(stderr, "Usage: .restore ?DB? FILE\n");
-++      rc = 1;
-++      goto meta_command_exit;
-++    }
-++    rc = sqlite3_open(zSrcFile, &pSrc);
-++    if( rc!=SQLITE_OK ){
-++      utf8_printf(stderr, "Error: cannot open \"%s\"\n", zSrcFile);
-++      sqlite3_close(pSrc);
-++      return 1;
-++    }
-++    open_db(p, 0);
-++    pBackup = sqlite3_backup_init(p->db, zDb, pSrc, "main");
-++    if( pBackup==0 ){
-++      utf8_printf(stderr, "Error: %s\n", sqlite3_errmsg(p->db));
-++      sqlite3_close(pSrc);
-++      return 1;
-++    }
-++    while( (rc = sqlite3_backup_step(pBackup,100))==SQLITE_OK
-++          || rc==SQLITE_BUSY  ){
-++      if( rc==SQLITE_BUSY ){
-++        if( nTimeout++ >= 3 ) break;
-++        sqlite3_sleep(100);
-++      }
-++    }
-++    sqlite3_backup_finish(pBackup);
-++    if( rc==SQLITE_DONE ){
-++      rc = 0;
-++    }else if( rc==SQLITE_BUSY || rc==SQLITE_LOCKED ){
-++      raw_printf(stderr, "Error: source database is busy\n");
-++      rc = 1;
-++    }else{
-++      utf8_printf(stderr, "Error: %s\n", sqlite3_errmsg(p->db));
-++      rc = 1;
-++    }
-++    sqlite3_close(pSrc);
-++  }else
-++
-++
-++  if( c=='s' && strncmp(azArg[0], "scanstats", n)==0 ){
-++    if( nArg==2 ){
-++      p->scanstatsOn = booleanValue(azArg[1]);
-++#ifndef SQLITE_ENABLE_STMT_SCANSTATUS
-++      raw_printf(stderr, "Warning: .scanstats not available in this build.\n");
-++#endif
-++    }else{
-++      raw_printf(stderr, "Usage: .scanstats on|off\n");
-++      rc = 1;
-++    }
-++  }else
-++
-++  if( c=='s' && strncmp(azArg[0], "schema", n)==0 ){
-++    ShellText sSelect;
-++    ShellState data;
-++    char *zErrMsg = 0;
-++    const char *zDiv = 0;
-++    int iSchema = 0;
-++
-++    open_db(p, 0);
-++    memcpy(&data, p, sizeof(data));
-++    data.showHeader = 0;
-++    data.cMode = data.mode = MODE_Semi;
-++    initText(&sSelect);
-++    if( nArg>=2 && optionMatch(azArg[1], "indent") ){
-++      data.cMode = data.mode = MODE_Pretty;
-++      nArg--;
-++      if( nArg==2 ) azArg[1] = azArg[2];
-++    }
-++    if( nArg==2 && azArg[1][0]!='-' ){
-++      int i;
-++      for(i=0; azArg[1][i]; i++) azArg[1][i] = ToLower(azArg[1][i]);
-++      if( strcmp(azArg[1],"sqlite_master")==0 ){
-++        char *new_argv[2], *new_colv[2];
-++        new_argv[0] = "CREATE TABLE sqlite_master (\n"
-++                      "  type text,\n"
-++                      "  name text,\n"
-++                      "  tbl_name text,\n"
-++                      "  rootpage integer,\n"
-++                      "  sql text\n"
-++                      ")";
-++        new_argv[1] = 0;
-++        new_colv[0] = "sql";
-++        new_colv[1] = 0;
-++        callback(&data, 1, new_argv, new_colv);
-++        rc = SQLITE_OK;
-++      }else if( strcmp(azArg[1],"sqlite_temp_master")==0 ){
-++        char *new_argv[2], *new_colv[2];
-++        new_argv[0] = "CREATE TEMP TABLE sqlite_temp_master (\n"
-++                      "  type text,\n"
-++                      "  name text,\n"
-++                      "  tbl_name text,\n"
-++                      "  rootpage integer,\n"
-++                      "  sql text\n"
-++                      ")";
-++        new_argv[1] = 0;
-++        new_colv[0] = "sql";
-++        new_colv[1] = 0;
-++        callback(&data, 1, new_argv, new_colv);
-++        rc = SQLITE_OK;
-++      }else{
-++        zDiv = "(";
-++      }
-++    }else if( nArg==1 ){
-++      zDiv = "(";
-++    }else{
-++      raw_printf(stderr, "Usage: .schema ?--indent? ?LIKE-PATTERN?\n");
-++      rc = 1;
-++      goto meta_command_exit;
-++    }
-++    if( zDiv ){
-++      sqlite3_stmt *pStmt = 0;
-++      rc = sqlite3_prepare_v2(p->db, "SELECT name FROM pragma_database_list",
-++                              -1, &pStmt, 0);
-++      if( rc ){
-++        utf8_printf(stderr, "Error: %s\n", sqlite3_errmsg(p->db));
-++        sqlite3_finalize(pStmt);
-++        rc = 1;
-++        goto meta_command_exit;
-++      }
-++      appendText(&sSelect, "SELECT sql FROM", 0);
-++      iSchema = 0;
-++      while( sqlite3_step(pStmt)==SQLITE_ROW ){
-++        const char *zDb = (const char*)sqlite3_column_text(pStmt, 0);
-++        char zScNum[30];
-++        sqlite3_snprintf(sizeof(zScNum), zScNum, "%d", ++iSchema);
-++        appendText(&sSelect, zDiv, 0);
-++        zDiv = " UNION ALL ";
-++        if( strcmp(zDb, "main")!=0 ){
-++          appendText(&sSelect, "SELECT shell_add_schema(sql,", 0);
-++          appendText(&sSelect, zDb, '"');
-++          appendText(&sSelect, ") AS sql, type, tbl_name, name, rowid,", 0);
-++          appendText(&sSelect, zScNum, 0);
-++          appendText(&sSelect, " AS snum, ", 0);
-++          appendText(&sSelect, zDb, '\'');
-++          appendText(&sSelect, " AS sname FROM ", 0);
-++          appendText(&sSelect, zDb, '"');
-++          appendText(&sSelect, ".sqlite_master", 0);
-++        }else{
-++          appendText(&sSelect, "SELECT sql, type, tbl_name, name, rowid, ", 0);
-++          appendText(&sSelect, zScNum, 0);
-++          appendText(&sSelect, " AS snum, 'main' AS sname FROM sqlite_master",0);
-++        }
-++      }
-++      sqlite3_finalize(pStmt);
-++      appendText(&sSelect, ") WHERE ", 0);
-++      if( nArg>1 ){
-++        char *zQarg = sqlite3_mprintf("%Q", azArg[1]);
-++        if( strchr(azArg[1], '.') ){
-++          appendText(&sSelect, "lower(printf('%s.%s',sname,tbl_name))", 0);
-++        }else{
-++          appendText(&sSelect, "lower(tbl_name)", 0);
-++        }
-++        appendText(&sSelect, strchr(azArg[1], '*') ? " GLOB " : " LIKE ", 0);
-++        appendText(&sSelect, zQarg, 0);
-++        appendText(&sSelect, " AND ", 0);
-++        sqlite3_free(zQarg);
-++      }
-++      appendText(&sSelect, "type!='meta' AND sql IS NOT NULL"
-++                           " ORDER BY snum, rowid", 0);
-++      rc = sqlite3_exec(p->db, sSelect.z, callback, &data, &zErrMsg);
-++      freeText(&sSelect);
-++    }
-++    if( zErrMsg ){
-++      utf8_printf(stderr,"Error: %s\n", zErrMsg);
-++      sqlite3_free(zErrMsg);
-++      rc = 1;
-++    }else if( rc != SQLITE_OK ){
-++      raw_printf(stderr,"Error: querying schema information\n");
-++      rc = 1;
-++    }else{
-++      rc = 0;
-++    }
-++  }else
-++
-++#if defined(SQLITE_DEBUG) && defined(SQLITE_ENABLE_SELECTTRACE)
-++  if( c=='s' && n==11 && strncmp(azArg[0], "selecttrace", n)==0 ){
-++    sqlite3SelectTrace = (int)integerValue(azArg[1]);
-++  }else
-++#endif
-++
-++#if defined(SQLITE_ENABLE_SESSION)
-++  if( c=='s' && strncmp(azArg[0],"session",n)==0 && n>=3 ){
-++    OpenSession *pSession = &p->aSession[0];
-++    char **azCmd = &azArg[1];
-++    int iSes = 0;
-++    int nCmd = nArg - 1;
-++    int i;
-++    if( nArg<=1 ) goto session_syntax_error;
-++    open_db(p, 0);
-++    if( nArg>=3 ){
-++      for(iSes=0; iSes<p->nSession; iSes++){
-++        if( strcmp(p->aSession[iSes].zName, azArg[1])==0 ) break;
-++      }
-++      if( iSes<p->nSession ){
-++        pSession = &p->aSession[iSes];
-++        azCmd++;
-++        nCmd--;
-++      }else{
-++        pSession = &p->aSession[0];
-++        iSes = 0;
-++      }
-++    }
-++
-++    /* .session attach TABLE
-++    ** Invoke the sqlite3session_attach() interface to attach a particular
-++    ** table so that it is never filtered.
-++    */
-++    if( strcmp(azCmd[0],"attach")==0 ){
-++      if( nCmd!=2 ) goto session_syntax_error;
-++      if( pSession->p==0 ){
-++        session_not_open:
-++        raw_printf(stderr, "ERROR: No sessions are open\n");
-++      }else{
-++        rc = sqlite3session_attach(pSession->p, azCmd[1]);
-++        if( rc ){
-++          raw_printf(stderr, "ERROR: sqlite3session_attach() returns %d\n", rc);
-++          rc = 0;
-++        }
-++      }
-++    }else
-++
-++    /* .session changeset FILE
-++    ** .session patchset FILE
-++    ** Write a changeset or patchset into a file.  The file is overwritten.
-++    */
-++    if( strcmp(azCmd[0],"changeset")==0 || strcmp(azCmd[0],"patchset")==0 ){
-++      FILE *out = 0;
-++      if( nCmd!=2 ) goto session_syntax_error;
-++      if( pSession->p==0 ) goto session_not_open;
-++      out = fopen(azCmd[1], "wb");
-++      if( out==0 ){
-++        utf8_printf(stderr, "ERROR: cannot open \"%s\" for writing\n", azCmd[1]);
-++      }else{
-++        int szChng;
-++        void *pChng;
-++        if( azCmd[0][0]=='c' ){
-++          rc = sqlite3session_changeset(pSession->p, &szChng, &pChng);
-++        }else{
-++          rc = sqlite3session_patchset(pSession->p, &szChng, &pChng);
-++        }
-++        if( rc ){
-++          printf("Error: error code %d\n", rc);
-++          rc = 0;
-++        }
-++        if( pChng
-++          && fwrite(pChng, szChng, 1, out)!=1 ){
-++          raw_printf(stderr, "ERROR: Failed to write entire %d-byte output\n",
-++                  szChng);
-++        }
-++        sqlite3_free(pChng);
-++        fclose(out);
-++      }
-++    }else
-++
-++    /* .session close
-++    ** Close the identified session
-++    */
-++    if( strcmp(azCmd[0], "close")==0 ){
-++      if( nCmd!=1 ) goto session_syntax_error;
-++      if( p->nSession ){
-++        session_close(pSession);
-++        p->aSession[iSes] = p->aSession[--p->nSession];
-++      }
-++    }else
-++
-++    /* .session enable ?BOOLEAN?
-++    ** Query or set the enable flag
-++    */
-++    if( strcmp(azCmd[0], "enable")==0 ){
-++      int ii;
-++      if( nCmd>2 ) goto session_syntax_error;
-++      ii = nCmd==1 ? -1 : booleanValue(azCmd[1]);
-++      if( p->nSession ){
-++        ii = sqlite3session_enable(pSession->p, ii);
-++        utf8_printf(p->out, "session %s enable flag = %d\n",
-++                    pSession->zName, ii);
-++      }
-++    }else
-++
-++    /* .session filter GLOB ....
-++    ** Set a list of GLOB patterns of table names to be excluded.
-++    */
-++    if( strcmp(azCmd[0], "filter")==0 ){
-++      int ii, nByte;
-++      if( nCmd<2 ) goto session_syntax_error;
-++      if( p->nSession ){
-++        for(ii=0; ii<pSession->nFilter; ii++){
-++          sqlite3_free(pSession->azFilter[ii]);
-++        }
-++        sqlite3_free(pSession->azFilter);
-++        nByte = sizeof(pSession->azFilter[0])*(nCmd-1);
-++        pSession->azFilter = sqlite3_malloc( nByte );
-++        if( pSession->azFilter==0 ){
-++          raw_printf(stderr, "Error: out or memory\n");
-++          exit(1);
-++        }
-++        for(ii=1; ii<nCmd; ii++){
-++          pSession->azFilter[ii-1] = sqlite3_mprintf("%s", azCmd[ii]);
-++        }
-++        pSession->nFilter = ii-1;
-++      }
-++    }else
-++
-++    /* .session indirect ?BOOLEAN?
-++    ** Query or set the indirect flag
-++    */
-++    if( strcmp(azCmd[0], "indirect")==0 ){
-++      int ii;
-++      if( nCmd>2 ) goto session_syntax_error;
-++      ii = nCmd==1 ? -1 : booleanValue(azCmd[1]);
-++      if( p->nSession ){
-++        ii = sqlite3session_indirect(pSession->p, ii);
-++        utf8_printf(p->out, "session %s indirect flag = %d\n",
-++                    pSession->zName, ii);
-++      }
-++    }else
-++
-++    /* .session isempty
-++    ** Determine if the session is empty
-++    */
-++    if( strcmp(azCmd[0], "isempty")==0 ){
-++      int ii;
-++      if( nCmd!=1 ) goto session_syntax_error;
-++      if( p->nSession ){
-++        ii = sqlite3session_isempty(pSession->p);
-++        utf8_printf(p->out, "session %s isempty flag = %d\n",
-++                    pSession->zName, ii);
-++      }
-++    }else
-++
-++    /* .session list
-++    ** List all currently open sessions
-++    */
-++    if( strcmp(azCmd[0],"list")==0 ){
-++      for(i=0; i<p->nSession; i++){
-++        utf8_printf(p->out, "%d %s\n", i, p->aSession[i].zName);
-++      }
-++    }else
-++
-++    /* .session open DB NAME
-++    ** Open a new session called NAME on the attached database DB.
-++    ** DB is normally "main".
-++    */
-++    if( strcmp(azCmd[0],"open")==0 ){
-++      char *zName;
-++      if( nCmd!=3 ) goto session_syntax_error;
-++      zName = azCmd[2];
-++      if( zName[0]==0 ) goto session_syntax_error;
-++      for(i=0; i<p->nSession; i++){
-++        if( strcmp(p->aSession[i].zName,zName)==0 ){
-++          utf8_printf(stderr, "Session \"%s\" already exists\n", zName);
-++          goto meta_command_exit;
-++        }
-++      }
-++      if( p->nSession>=ArraySize(p->aSession) ){
-++        raw_printf(stderr, "Maximum of %d sessions\n", ArraySize(p->aSession));
-++        goto meta_command_exit;
-++      }
-++      pSession = &p->aSession[p->nSession];
-++      rc = sqlite3session_create(p->db, azCmd[1], &pSession->p);
-++      if( rc ){
-++        raw_printf(stderr, "Cannot open session: error code=%d\n", rc);
-++        rc = 0;
-++        goto meta_command_exit;
-++      }
-++      pSession->nFilter = 0;
-++      sqlite3session_table_filter(pSession->p, session_filter, pSession);
-++      p->nSession++;
-++      pSession->zName = sqlite3_mprintf("%s", zName);
-++    }else
-++    /* If no command name matches, show a syntax error */
-++    session_syntax_error:
-++    session_help(p);
-++  }else
-++#endif
-++
-++#ifdef SQLITE_DEBUG
-++  /* Undocumented commands for internal testing.  Subject to change
-++  ** without notice. */
-++  if( c=='s' && n>=10 && strncmp(azArg[0], "selftest-", 9)==0 ){
-++    if( strncmp(azArg[0]+9, "boolean", n-9)==0 ){
-++      int i, v;
-++      for(i=1; i<nArg; i++){
-++        v = booleanValue(azArg[i]);
-++        utf8_printf(p->out, "%s: %d 0x%x\n", azArg[i], v, v);
-++      }
-++    }
-++    if( strncmp(azArg[0]+9, "integer", n-9)==0 ){
-++      int i; sqlite3_int64 v;
-++      for(i=1; i<nArg; i++){
-++        char zBuf[200];
-++        v = integerValue(azArg[i]);
-++        sqlite3_snprintf(sizeof(zBuf),zBuf,"%s: %lld 0x%llx\n", azArg[i],v,v);
-++        utf8_printf(p->out, "%s", zBuf);
-++      }
-++    }
-++  }else
-++#endif
-++
-++  if( c=='s' && n>=4 && strncmp(azArg[0],"selftest",n)==0 ){
-++    int bIsInit = 0;         /* True to initialize the SELFTEST table */
-++    int bVerbose = 0;        /* Verbose output */
-++    int bSelftestExists;     /* True if SELFTEST already exists */
-++    int i, k;                /* Loop counters */
-++    int nTest = 0;           /* Number of tests runs */
-++    int nErr = 0;            /* Number of errors seen */
-++    ShellText str;           /* Answer for a query */
-++    sqlite3_stmt *pStmt = 0; /* Query against the SELFTEST table */
-++
-++    open_db(p,0);
-++    for(i=1; i<nArg; i++){
-++      const char *z = azArg[i];
-++      if( z[0]=='-' && z[1]=='-' ) z++;
-++      if( strcmp(z,"-init")==0 ){
-++        bIsInit = 1;
-++      }else
-++      if( strcmp(z,"-v")==0 ){
-++        bVerbose++;
-++      }else
-++      {
-++        utf8_printf(stderr, "Unknown option \"%s\" on \"%s\"\n",
-++                    azArg[i], azArg[0]);
-++        raw_printf(stderr, "Should be one of: --init -v\n");
-++        rc = 1;
-++        goto meta_command_exit;
-++      }
-++    }
-++    if( sqlite3_table_column_metadata(p->db,"main","selftest",0,0,0,0,0,0)
-++           != SQLITE_OK ){
-++      bSelftestExists = 0;
-++    }else{
-++      bSelftestExists = 1;
-++    }
-++    if( bIsInit ){
-++      createSelftestTable(p);
-++      bSelftestExists = 1;
-++    }
-++    initText(&str);
-++    appendText(&str, "x", 0);
-++    for(k=bSelftestExists; k>=0; k--){
-++      if( k==1 ){
-++        rc = sqlite3_prepare_v2(p->db,
-++            "SELECT tno,op,cmd,ans FROM selftest ORDER BY tno",
-++            -1, &pStmt, 0);
-++      }else{
-++        rc = sqlite3_prepare_v2(p->db,
-++          "VALUES(0,'memo','Missing SELFTEST table - default checks only',''),"
-++          "      (1,'run','PRAGMA integrity_check','ok')",
-++          -1, &pStmt, 0);
-++      }
-++      if( rc ){
-++        raw_printf(stderr, "Error querying the selftest table\n");
-++        rc = 1;
-++        sqlite3_finalize(pStmt);
-++        goto meta_command_exit;
-++      }
-++      for(i=1; sqlite3_step(pStmt)==SQLITE_ROW; i++){
-++        int tno = sqlite3_column_int(pStmt, 0);
-++        const char *zOp = (const char*)sqlite3_column_text(pStmt, 1);
-++        const char *zSql = (const char*)sqlite3_column_text(pStmt, 2);
-++        const char *zAns = (const char*)sqlite3_column_text(pStmt, 3);
-++
-++        k = 0;
-++        if( bVerbose>0 ){
-++          char *zQuote = sqlite3_mprintf("%q", zSql);
-++          printf("%d: %s %s\n", tno, zOp, zSql);
-++          sqlite3_free(zQuote);
-++        }
-++        if( strcmp(zOp,"memo")==0 ){
-++          utf8_printf(p->out, "%s\n", zSql);
-++        }else
-++        if( strcmp(zOp,"run")==0 ){
-++          char *zErrMsg = 0;
-++          str.n = 0;
-++          str.z[0] = 0;
-++          rc = sqlite3_exec(p->db, zSql, captureOutputCallback, &str, &zErrMsg);
-++          nTest++;
-++          if( bVerbose ){
-++            utf8_printf(p->out, "Result: %s\n", str.z);
-++          }
-++          if( rc || zErrMsg ){
-++            nErr++;
-++            rc = 1;
-++            utf8_printf(p->out, "%d: error-code-%d: %s\n", tno, rc, zErrMsg);
-++            sqlite3_free(zErrMsg);
-++          }else if( strcmp(zAns,str.z)!=0 ){
-++            nErr++;
-++            rc = 1;
-++            utf8_printf(p->out, "%d: Expected: [%s]\n", tno, zAns);
-++            utf8_printf(p->out, "%d:      Got: [%s]\n", tno, str.z);
-++          }
-++        }else
-++        {
-++          utf8_printf(stderr,
-++            "Unknown operation \"%s\" on selftest line %d\n", zOp, tno);
-++          rc = 1;
-++          break;
-++        }
-++      } /* End loop over rows of content from SELFTEST */
-++      sqlite3_finalize(pStmt);
-++    } /* End loop over k */
-++    freeText(&str);
-++    utf8_printf(p->out, "%d errors out of %d tests\n", nErr, nTest);
-++  }else
-++
-++  if( c=='s' && strncmp(azArg[0], "separator", n)==0 ){
-++    if( nArg<2 || nArg>3 ){
-++      raw_printf(stderr, "Usage: .separator COL ?ROW?\n");
-++      rc = 1;
-++    }
-++    if( nArg>=2 ){
-++      sqlite3_snprintf(sizeof(p->colSeparator), p->colSeparator,
-++                       "%.*s", (int)ArraySize(p->colSeparator)-1, azArg[1]);
-++    }
-++    if( nArg>=3 ){
-++      sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator,
-++                       "%.*s", (int)ArraySize(p->rowSeparator)-1, azArg[2]);
-++    }
-++  }else
-++
-++  if( c=='s' && n>=4 && strncmp(azArg[0],"sha3sum",n)==0 ){
-++    const char *zLike = 0;   /* Which table to checksum. 0 means everything */
-++    int i;                   /* Loop counter */
-++    int bSchema = 0;         /* Also hash the schema */
-++    int bSeparate = 0;       /* Hash each table separately */
-++    int iSize = 224;         /* Hash algorithm to use */
-++    int bDebug = 0;          /* Only show the query that would have run */
-++    sqlite3_stmt *pStmt;     /* For querying tables names */
-++    char *zSql;              /* SQL to be run */
-++    char *zSep;              /* Separator */
-++    ShellText sSql;          /* Complete SQL for the query to run the hash */
-++    ShellText sQuery;        /* Set of queries used to read all content */
-++    open_db(p, 0);
-++    for(i=1; i<nArg; i++){
-++      const char *z = azArg[i];
-++      if( z[0]=='-' ){
-++        z++;
-++        if( z[0]=='-' ) z++;
-++        if( strcmp(z,"schema")==0 ){
-++          bSchema = 1;
-++        }else
-++        if( strcmp(z,"sha3-224")==0 || strcmp(z,"sha3-256")==0
-++         || strcmp(z,"sha3-384")==0 || strcmp(z,"sha3-512")==0
-++        ){
-++          iSize = atoi(&z[5]);
-++        }else
-++        if( strcmp(z,"debug")==0 ){
-++          bDebug = 1;
-++        }else
-++        {
-++          utf8_printf(stderr, "Unknown option \"%s\" on \"%s\"\n",
-++                      azArg[i], azArg[0]);
-++          raw_printf(stderr, "Should be one of: --schema"
-++                             " --sha3-224 --sha3-255 --sha3-384 --sha3-512\n");
-++          rc = 1;
-++          goto meta_command_exit;
-++        }
-++      }else if( zLike ){
-++        raw_printf(stderr, "Usage: .sha3sum ?OPTIONS? ?LIKE-PATTERN?\n");
-++        rc = 1;
-++        goto meta_command_exit;
-++      }else{
-++        zLike = z;
-++        bSeparate = 1;
-++        if( sqlite3_strlike("sqlite_%", zLike, 0)==0 ) bSchema = 1;
-++      }
-++    }
-++    if( bSchema ){
-++      zSql = "SELECT lower(name) FROM sqlite_master"
-++             " WHERE type='table' AND coalesce(rootpage,0)>1"
-++             " UNION ALL SELECT 'sqlite_master'"
-++             " ORDER BY 1 collate nocase";
-++    }else{
-++      zSql = "SELECT lower(name) FROM sqlite_master"
-++             " WHERE type='table' AND coalesce(rootpage,0)>1"
-++             " AND name NOT LIKE 'sqlite_%'"
-++             " ORDER BY 1 collate nocase";
-++    }
-++    sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
-++    initText(&sQuery);
-++    initText(&sSql);
-++    appendText(&sSql, "WITH [sha3sum$query](a,b) AS(",0);
-++    zSep = "VALUES(";
-++    while( SQLITE_ROW==sqlite3_step(pStmt) ){
-++      const char *zTab = (const char*)sqlite3_column_text(pStmt,0);
-++      if( zLike && sqlite3_strlike(zLike, zTab, 0)!=0 ) continue;
-++      if( strncmp(zTab, "sqlite_",7)!=0 ){
-++        appendText(&sQuery,"SELECT * FROM ", 0);
-++        appendText(&sQuery,zTab,'"');
-++        appendText(&sQuery," NOT INDEXED;", 0);
-++      }else if( strcmp(zTab, "sqlite_master")==0 ){
-++        appendText(&sQuery,"SELECT type,name,tbl_name,sql FROM sqlite_master"
-++                           " ORDER BY name;", 0);
-++      }else if( strcmp(zTab, "sqlite_sequence")==0 ){
-++        appendText(&sQuery,"SELECT name,seq FROM sqlite_sequence"
-++                           " ORDER BY name;", 0);
-++      }else if( strcmp(zTab, "sqlite_stat1")==0 ){
-++        appendText(&sQuery,"SELECT tbl,idx,stat FROM sqlite_stat1"
-++                           " ORDER BY tbl,idx;", 0);
-++      }else if( strcmp(zTab, "sqlite_stat3")==0
-++             || strcmp(zTab, "sqlite_stat4")==0 ){
-++        appendText(&sQuery, "SELECT * FROM ", 0);
-++        appendText(&sQuery, zTab, 0);
-++        appendText(&sQuery, " ORDER BY tbl, idx, rowid;\n", 0);
-++      }
-++      appendText(&sSql, zSep, 0);
-++      appendText(&sSql, sQuery.z, '\'');
-++      sQuery.n = 0;
-++      appendText(&sSql, ",", 0);
-++      appendText(&sSql, zTab, '\'');
-++      zSep = "),(";
-++    }
-++    sqlite3_finalize(pStmt);
-++    if( bSeparate ){
-++      zSql = sqlite3_mprintf(
-++          "%s))"
-++          " SELECT lower(hex(sha3_query(a,%d))) AS hash, b AS label"
-++          "   FROM [sha3sum$query]",
-++          sSql.z, iSize);
-++    }else{
-++      zSql = sqlite3_mprintf(
-++          "%s))"
-++          " SELECT lower(hex(sha3_query(group_concat(a,''),%d))) AS hash"
-++          "   FROM [sha3sum$query]",
-++          sSql.z, iSize);
-++    }
-++    freeText(&sQuery);
-++    freeText(&sSql);
-++    if( bDebug ){
-++      utf8_printf(p->out, "%s\n", zSql);
-++    }else{
-++      shell_exec(p->db, zSql, shell_callback, p, 0);
-++    }
-++    sqlite3_free(zSql);
-++  }else
-++
-++  if( c=='s'
-++   && (strncmp(azArg[0], "shell", n)==0 || strncmp(azArg[0],"system",n)==0)
-++  ){
-++    char *zCmd;
-++    int i, x;
-++    if( nArg<2 ){
-++      raw_printf(stderr, "Usage: .system COMMAND\n");
-++      rc = 1;
-++      goto meta_command_exit;
-++    }
-++    zCmd = sqlite3_mprintf(strchr(azArg[1],' ')==0?"%s":"\"%s\"", azArg[1]);
-++    for(i=2; i<nArg; i++){
-++      zCmd = sqlite3_mprintf(strchr(azArg[i],' ')==0?"%z %s":"%z \"%s\"",
-++                             zCmd, azArg[i]);
-++    }
-++    x = system(zCmd);
-++    sqlite3_free(zCmd);
-++    if( x ) raw_printf(stderr, "System command returns %d\n", x);
-++  }else
-++
-++  if( c=='s' && strncmp(azArg[0], "show", n)==0 ){
-++    static const char *azBool[] = { "off", "on", "full", "unk" };
-++    int i;
-++    if( nArg!=1 ){
-++      raw_printf(stderr, "Usage: .show\n");
-++      rc = 1;
-++      goto meta_command_exit;
-++    }
-++    utf8_printf(p->out, "%12.12s: %s\n","echo",
-++                                  azBool[ShellHasFlag(p, SHFLG_Echo)]);
-++    utf8_printf(p->out, "%12.12s: %s\n","eqp", azBool[p->autoEQP&3]);
-++    utf8_printf(p->out, "%12.12s: %s\n","explain",
-++         p->mode==MODE_Explain ? "on" : p->autoExplain ? "auto" : "off");
-++    utf8_printf(p->out,"%12.12s: %s\n","headers", azBool[p->showHeader!=0]);
-++    utf8_printf(p->out, "%12.12s: %s\n","mode", modeDescr[p->mode]);
-++    utf8_printf(p->out, "%12.12s: ", "nullvalue");
-++      output_c_string(p->out, p->nullValue);
-++      raw_printf(p->out, "\n");
-++    utf8_printf(p->out,"%12.12s: %s\n","output",
-++            strlen30(p->outfile) ? p->outfile : "stdout");
-++    utf8_printf(p->out,"%12.12s: ", "colseparator");
-++      output_c_string(p->out, p->colSeparator);
-++      raw_printf(p->out, "\n");
-++    utf8_printf(p->out,"%12.12s: ", "rowseparator");
-++      output_c_string(p->out, p->rowSeparator);
-++      raw_printf(p->out, "\n");
-++    utf8_printf(p->out, "%12.12s: %s\n","stats", azBool[p->statsOn!=0]);
-++    utf8_printf(p->out, "%12.12s: ", "width");
-++    for (i=0;i<(int)ArraySize(p->colWidth) && p->colWidth[i] != 0;i++) {
-++      raw_printf(p->out, "%d ", p->colWidth[i]);
-++    }
-++    raw_printf(p->out, "\n");
-++    utf8_printf(p->out, "%12.12s: %s\n", "filename",
-++                p->zDbFilename ? p->zDbFilename : "");
-++  }else
-++
-++  if( c=='s' && strncmp(azArg[0], "stats", n)==0 ){
-++    if( nArg==2 ){
-++      p->statsOn = booleanValue(azArg[1]);
-++    }else if( nArg==1 ){
-++      display_stats(p->db, p, 0);
-++    }else{
-++      raw_printf(stderr, "Usage: .stats ?on|off?\n");
-++      rc = 1;
-++    }
-++  }else
-++
-++  if( (c=='t' && n>1 && strncmp(azArg[0], "tables", n)==0)
-++   || (c=='i' && (strncmp(azArg[0], "indices", n)==0
-++                 || strncmp(azArg[0], "indexes", n)==0) )
-++  ){
-++    sqlite3_stmt *pStmt;
-++    char **azResult;
-++    int nRow, nAlloc;
-++    int ii;
-++    ShellText s;
-++    initText(&s);
-++    open_db(p, 0);
-++    rc = sqlite3_prepare_v2(p->db, "PRAGMA database_list", -1, &pStmt, 0);
-++    if( rc ) return shellDatabaseError(p->db);
-++
-++    if( nArg>2 && c=='i' ){
-++      /* It is an historical accident that the .indexes command shows an error
-++      ** when called with the wrong number of arguments whereas the .tables
-++      ** command does not. */
-++      raw_printf(stderr, "Usage: .indexes ?LIKE-PATTERN?\n");
-++      rc = 1;
-++      goto meta_command_exit;
-++    }
-++    for(ii=0; sqlite3_step(pStmt)==SQLITE_ROW; ii++){
-++      const char *zDbName = (const char*)sqlite3_column_text(pStmt, 1);
-++      if( zDbName==0 ) continue;
-++      if( s.z && s.z[0] ) appendText(&s, " UNION ALL ", 0);
-++      if( sqlite3_stricmp(zDbName, "main")==0 ){
-++        appendText(&s, "SELECT name FROM ", 0);
-++      }else{
-++        appendText(&s, "SELECT ", 0);
-++        appendText(&s, zDbName, '\'');
-++        appendText(&s, "||'.'||name FROM ", 0);
-++      }
-++      appendText(&s, zDbName, '"');
-++      appendText(&s, ".sqlite_master ", 0);
-++      if( c=='t' ){
-++        appendText(&s," WHERE type IN ('table','view')"
-++                      "   AND name NOT LIKE 'sqlite_%'"
-++                      "   AND name LIKE ?1", 0);
-++      }else{
-++        appendText(&s," WHERE type='index'"
-++                      "   AND tbl_name LIKE ?1", 0);
-++      }
-++    }
-++    rc = sqlite3_finalize(pStmt);
-++    appendText(&s, " ORDER BY 1", 0);
-++    rc = sqlite3_prepare_v2(p->db, s.z, -1, &pStmt, 0);
-++    freeText(&s);
-++    if( rc ) return shellDatabaseError(p->db);
-++
-++    /* Run the SQL statement prepared by the above block. Store the results
-++    ** as an array of nul-terminated strings in azResult[].  */
-++    nRow = nAlloc = 0;
-++    azResult = 0;
-++    if( nArg>1 ){
-++      sqlite3_bind_text(pStmt, 1, azArg[1], -1, SQLITE_TRANSIENT);
-++    }else{
-++      sqlite3_bind_text(pStmt, 1, "%", -1, SQLITE_STATIC);
-++    }
-++    while( sqlite3_step(pStmt)==SQLITE_ROW ){
-++      if( nRow>=nAlloc ){
-++        char **azNew;
-++        int n2 = nAlloc*2 + 10;
-++        azNew = sqlite3_realloc64(azResult, sizeof(azResult[0])*n2);
-++        if( azNew==0 ){
-++          rc = shellNomemError();
-++          break;
-++        }
-++        nAlloc = n2;
-++        azResult = azNew;
-++      }
-++      azResult[nRow] = sqlite3_mprintf("%s", sqlite3_column_text(pStmt, 0));
-++      if( 0==azResult[nRow] ){
-++        rc = shellNomemError();
-++        break;
-++      }
-++      nRow++;
-++    }
-++    if( sqlite3_finalize(pStmt)!=SQLITE_OK ){
-++      rc = shellDatabaseError(p->db);
-++    }
-++
-++    /* Pretty-print the contents of array azResult[] to the output */
-++    if( rc==0 && nRow>0 ){
-++      int len, maxlen = 0;
-++      int i, j;
-++      int nPrintCol, nPrintRow;
-++      for(i=0; i<nRow; i++){
-++        len = strlen30(azResult[i]);
-++        if( len>maxlen ) maxlen = len;
-++      }
-++      nPrintCol = 80/(maxlen+2);
-++      if( nPrintCol<1 ) nPrintCol = 1;
-++      nPrintRow = (nRow + nPrintCol - 1)/nPrintCol;
-++      for(i=0; i<nPrintRow; i++){
-++        for(j=i; j<nRow; j+=nPrintRow){
-++          char *zSp = j<nPrintRow ? "" : "  ";
-++          utf8_printf(p->out, "%s%-*s", zSp, maxlen,
-++                      azResult[j] ? azResult[j]:"");
-++        }
-++        raw_printf(p->out, "\n");
-++      }
-++    }
-++
-++    for(ii=0; ii<nRow; ii++) sqlite3_free(azResult[ii]);
-++    sqlite3_free(azResult);
-++  }else
-++
-++  /* Begin redirecting output to the file "testcase-out.txt" */
-++  if( c=='t' && strcmp(azArg[0],"testcase")==0 ){
-++    output_reset(p);
-++    p->out = output_file_open("testcase-out.txt");
-++    if( p->out==0 ){
-++      raw_printf(stderr, "Error: cannot open 'testcase-out.txt'\n");
-++    }
-++    if( nArg>=2 ){
-++      sqlite3_snprintf(sizeof(p->zTestcase), p->zTestcase, "%s", azArg[1]);
-++    }else{
-++      sqlite3_snprintf(sizeof(p->zTestcase), p->zTestcase, "?");
-++    }
-++  }else
-++
-++#ifndef SQLITE_UNTESTABLE
-++  if( c=='t' && n>=8 && strncmp(azArg[0], "testctrl", n)==0 && nArg>=2 ){
-++    static const struct {
-++       const char *zCtrlName;   /* Name of a test-control option */
-++       int ctrlCode;            /* Integer code for that option */
-++    } aCtrl[] = {
-++      { "prng_save",             SQLITE_TESTCTRL_PRNG_SAVE              },
-++      { "prng_restore",          SQLITE_TESTCTRL_PRNG_RESTORE           },
-++      { "prng_reset",            SQLITE_TESTCTRL_PRNG_RESET             },
-++      { "bitvec_test",           SQLITE_TESTCTRL_BITVEC_TEST            },
-++      { "fault_install",         SQLITE_TESTCTRL_FAULT_INSTALL          },
-++      { "benign_malloc_hooks",   SQLITE_TESTCTRL_BENIGN_MALLOC_HOOKS    },
-++      { "pending_byte",          SQLITE_TESTCTRL_PENDING_BYTE           },
-++      { "assert",                SQLITE_TESTCTRL_ASSERT                 },
-++      { "always",                SQLITE_TESTCTRL_ALWAYS                 },
-++      { "reserve",               SQLITE_TESTCTRL_RESERVE                },
-++      { "optimizations",         SQLITE_TESTCTRL_OPTIMIZATIONS          },
-++      { "iskeyword",             SQLITE_TESTCTRL_ISKEYWORD              },
-++      { "byteorder",             SQLITE_TESTCTRL_BYTEORDER              },
-++      { "never_corrupt",         SQLITE_TESTCTRL_NEVER_CORRUPT          },
-++      { "imposter",              SQLITE_TESTCTRL_IMPOSTER               },
-++    };
-++    int testctrl = -1;
-++    int rc2 = 0;
-++    int i, n2;
-++    open_db(p, 0);
-++
-++    /* convert testctrl text option to value. allow any unique prefix
-++    ** of the option name, or a numerical value. */
-++    n2 = strlen30(azArg[1]);
-++    for(i=0; i<ArraySize(aCtrl); i++){
-++      if( strncmp(azArg[1], aCtrl[i].zCtrlName, n2)==0 ){
-++        if( testctrl<0 ){
-++          testctrl = aCtrl[i].ctrlCode;
-++        }else{
-++          utf8_printf(stderr, "ambiguous option name: \"%s\"\n", azArg[1]);
-++          testctrl = -1;
-++          break;
-++        }
-++      }
-++    }
-++    if( testctrl<0 ) testctrl = (int)integerValue(azArg[1]);
-++    if( (testctrl<SQLITE_TESTCTRL_FIRST) || (testctrl>SQLITE_TESTCTRL_LAST) ){
-++      utf8_printf(stderr,"Error: invalid testctrl option: %s\n", azArg[1]);
-++    }else{
-++      switch(testctrl){
-++
-++        /* sqlite3_test_control(int, db, int) */
-++        case SQLITE_TESTCTRL_OPTIMIZATIONS:
-++        case SQLITE_TESTCTRL_RESERVE:
-++          if( nArg==3 ){
-++            int opt = (int)strtol(azArg[2], 0, 0);
-++            rc2 = sqlite3_test_control(testctrl, p->db, opt);
-++            raw_printf(p->out, "%d (0x%08x)\n", rc2, rc2);
-++          } else {
-++            utf8_printf(stderr,"Error: testctrl %s takes a single int option\n",
-++                    azArg[1]);
-++          }
-++          break;
-++
-++        /* sqlite3_test_control(int) */
-++        case SQLITE_TESTCTRL_PRNG_SAVE:
-++        case SQLITE_TESTCTRL_PRNG_RESTORE:
-++        case SQLITE_TESTCTRL_PRNG_RESET:
-++        case SQLITE_TESTCTRL_BYTEORDER:
-++          if( nArg==2 ){
-++            rc2 = sqlite3_test_control(testctrl);
-++            raw_printf(p->out, "%d (0x%08x)\n", rc2, rc2);
-++          } else {
-++            utf8_printf(stderr,"Error: testctrl %s takes no options\n",
-++                        azArg[1]);
-++          }
-++          break;
-++
-++        /* sqlite3_test_control(int, uint) */
-++        case SQLITE_TESTCTRL_PENDING_BYTE:
-++          if( nArg==3 ){
-++            unsigned int opt = (unsigned int)integerValue(azArg[2]);
-++            rc2 = sqlite3_test_control(testctrl, opt);
-++            raw_printf(p->out, "%d (0x%08x)\n", rc2, rc2);
-++          } else {
-++            utf8_printf(stderr,"Error: testctrl %s takes a single unsigned"
-++                           " int option\n", azArg[1]);
-++          }
-++          break;
-++
-++        /* sqlite3_test_control(int, int) */
-++        case SQLITE_TESTCTRL_ASSERT:
-++        case SQLITE_TESTCTRL_ALWAYS:
-++        case SQLITE_TESTCTRL_NEVER_CORRUPT:
-++          if( nArg==3 ){
-++            int opt = booleanValue(azArg[2]);
-++            rc2 = sqlite3_test_control(testctrl, opt);
-++            raw_printf(p->out, "%d (0x%08x)\n", rc2, rc2);
-++          } else {
-++            utf8_printf(stderr,"Error: testctrl %s takes a single int option\n",
-++                            azArg[1]);
-++          }
-++          break;
-++
-++        /* sqlite3_test_control(int, char *) */
-++#ifdef SQLITE_N_KEYWORD
-++        case SQLITE_TESTCTRL_ISKEYWORD:
-++          if( nArg==3 ){
-++            const char *opt = azArg[2];
-++            rc2 = sqlite3_test_control(testctrl, opt);
-++            raw_printf(p->out, "%d (0x%08x)\n", rc2, rc2);
-++          } else {
-++            utf8_printf(stderr,
-++                        "Error: testctrl %s takes a single char * option\n",
-++                        azArg[1]);
-++          }
-++          break;
-++#endif
-++
-++        case SQLITE_TESTCTRL_IMPOSTER:
-++          if( nArg==5 ){
-++            rc2 = sqlite3_test_control(testctrl, p->db,
-++                          azArg[2],
-++                          integerValue(azArg[3]),
-++                          integerValue(azArg[4]));
-++            raw_printf(p->out, "%d (0x%08x)\n", rc2, rc2);
-++          }else{
-++            raw_printf(stderr,"Usage: .testctrl imposter dbName onoff tnum\n");
-++          }
-++          break;
-++
-++        case SQLITE_TESTCTRL_BITVEC_TEST:
-++        case SQLITE_TESTCTRL_FAULT_INSTALL:
-++        case SQLITE_TESTCTRL_BENIGN_MALLOC_HOOKS:
-++        default:
-++          utf8_printf(stderr,
-++                      "Error: CLI support for testctrl %s not implemented\n",
-++                      azArg[1]);
-++          break;
-++      }
-++    }
-++  }else
-++#endif /* !defined(SQLITE_UNTESTABLE) */
-++
-++  if( c=='t' && n>4 && strncmp(azArg[0], "timeout", n)==0 ){
-++    open_db(p, 0);
-++    sqlite3_busy_timeout(p->db, nArg>=2 ? (int)integerValue(azArg[1]) : 0);
-++  }else
-++
-++  if( c=='t' && n>=5 && strncmp(azArg[0], "timer", n)==0 ){
-++    if( nArg==2 ){
-++      enableTimer = booleanValue(azArg[1]);
-++      if( enableTimer && !HAS_TIMER ){
-++        raw_printf(stderr, "Error: timer not available on this system.\n");
-++        enableTimer = 0;
-++      }
-++    }else{
-++      raw_printf(stderr, "Usage: .timer on|off\n");
-++      rc = 1;
-++    }
-++  }else
-++
-++  if( c=='t' && strncmp(azArg[0], "trace", n)==0 ){
-++    open_db(p, 0);
-++    if( nArg!=2 ){
-++      raw_printf(stderr, "Usage: .trace FILE|off\n");
-++      rc = 1;
-++      goto meta_command_exit;
-++    }
-++    output_file_close(p->traceOut);
-++    p->traceOut = output_file_open(azArg[1]);
-++#if !defined(SQLITE_OMIT_TRACE) && !defined(SQLITE_OMIT_FLOATING_POINT)
-++    if( p->traceOut==0 ){
-++      sqlite3_trace_v2(p->db, 0, 0, 0);
-++    }else{
-++      sqlite3_trace_v2(p->db, SQLITE_TRACE_STMT, sql_trace_callback,p->traceOut);
-++    }
-++#endif
-++  }else
-++
-++#if SQLITE_USER_AUTHENTICATION
-++  if( c=='u' && strncmp(azArg[0], "user", n)==0 ){
-++    if( nArg<2 ){
-++      raw_printf(stderr, "Usage: .user SUBCOMMAND ...\n");
-++      rc = 1;
-++      goto meta_command_exit;
-++    }
-++    open_db(p, 0);
-++    if( strcmp(azArg[1],"login")==0 ){
-++      if( nArg!=4 ){
-++        raw_printf(stderr, "Usage: .user login USER PASSWORD\n");
-++        rc = 1;
-++        goto meta_command_exit;
-++      }
-++      rc = sqlite3_user_authenticate(p->db, azArg[2], azArg[3],
-++                                    (int)strlen(azArg[3]));
-++      if( rc ){
-++        utf8_printf(stderr, "Authentication failed for user %s\n", azArg[2]);
-++        rc = 1;
-++      }
-++    }else if( strcmp(azArg[1],"add")==0 ){
-++      if( nArg!=5 ){
-++        raw_printf(stderr, "Usage: .user add USER PASSWORD ISADMIN\n");
-++        rc = 1;
-++        goto meta_command_exit;
-++      }
-++      rc = sqlite3_user_add(p->db, azArg[2],
-++                            azArg[3], (int)strlen(azArg[3]),
-++                            booleanValue(azArg[4]));
-++      if( rc ){
-++        raw_printf(stderr, "User-Add failed: %d\n", rc);
-++        rc = 1;
-++      }
-++    }else if( strcmp(azArg[1],"edit")==0 ){
-++      if( nArg!=5 ){
-++        raw_printf(stderr, "Usage: .user edit USER PASSWORD ISADMIN\n");
-++        rc = 1;
-++        goto meta_command_exit;
-++      }
-++      rc = sqlite3_user_change(p->db, azArg[2],
-++                              azArg[3], (int)strlen(azArg[3]),
-++                              booleanValue(azArg[4]));
-++      if( rc ){
-++        raw_printf(stderr, "User-Edit failed: %d\n", rc);
-++        rc = 1;
-++      }
-++    }else if( strcmp(azArg[1],"delete")==0 ){
-++      if( nArg!=3 ){
-++        raw_printf(stderr, "Usage: .user delete USER\n");
-++        rc = 1;
-++        goto meta_command_exit;
-++      }
-++      rc = sqlite3_user_delete(p->db, azArg[2]);
-++      if( rc ){
-++        raw_printf(stderr, "User-Delete failed: %d\n", rc);
-++        rc = 1;
-++      }
-++    }else{
-++      raw_printf(stderr, "Usage: .user login|add|edit|delete ...\n");
-++      rc = 1;
-++      goto meta_command_exit;
-++    }
-++  }else
-++#endif /* SQLITE_USER_AUTHENTICATION */
-++
-++  if( c=='v' && strncmp(azArg[0], "version", n)==0 ){
-++    utf8_printf(p->out, "SQLite %s %s\n" /*extra-version-info*/,
-++        sqlite3_libversion(), sqlite3_sourceid());
-++  }else
-++
-++  if( c=='v' && strncmp(azArg[0], "vfsinfo", n)==0 ){
-++    const char *zDbName = nArg==2 ? azArg[1] : "main";
-++    sqlite3_vfs *pVfs = 0;
-++    if( p->db ){
-++      sqlite3_file_control(p->db, zDbName, SQLITE_FCNTL_VFS_POINTER, &pVfs);
-++      if( pVfs ){
-++        utf8_printf(p->out, "vfs.zName      = \"%s\"\n", pVfs->zName);
-++        raw_printf(p->out, "vfs.iVersion   = %d\n", pVfs->iVersion);
-++        raw_printf(p->out, "vfs.szOsFile   = %d\n", pVfs->szOsFile);
-++        raw_printf(p->out, "vfs.mxPathname = %d\n", pVfs->mxPathname);
-++      }
-++    }
-++  }else
-++
-++  if( c=='v' && strncmp(azArg[0], "vfslist", n)==0 ){
-++    sqlite3_vfs *pVfs;
-++    sqlite3_vfs *pCurrent = 0;
-++    if( p->db ){
-++      sqlite3_file_control(p->db, "main", SQLITE_FCNTL_VFS_POINTER, &pCurrent);
-++    }
-++    for(pVfs=sqlite3_vfs_find(0); pVfs; pVfs=pVfs->pNext){
-++      utf8_printf(p->out, "vfs.zName      = \"%s\"%s\n", pVfs->zName,
-++           pVfs==pCurrent ? "  <--- CURRENT" : "");
-++      raw_printf(p->out, "vfs.iVersion   = %d\n", pVfs->iVersion);
-++      raw_printf(p->out, "vfs.szOsFile   = %d\n", pVfs->szOsFile);
-++      raw_printf(p->out, "vfs.mxPathname = %d\n", pVfs->mxPathname);
-++      if( pVfs->pNext ){
-++        raw_printf(p->out, "-----------------------------------\n");
-++      }
-++    }
-++  }else
-++
-++  if( c=='v' && strncmp(azArg[0], "vfsname", n)==0 ){
-++    const char *zDbName = nArg==2 ? azArg[1] : "main";
-++    char *zVfsName = 0;
-++    if( p->db ){
-++      sqlite3_file_control(p->db, zDbName, SQLITE_FCNTL_VFSNAME, &zVfsName);
-++      if( zVfsName ){
-++        utf8_printf(p->out, "%s\n", zVfsName);
-++        sqlite3_free(zVfsName);
-++      }
-++    }
-++  }else
-++
-++#if defined(SQLITE_DEBUG) && defined(SQLITE_ENABLE_WHERETRACE)
-++  if( c=='w' && strncmp(azArg[0], "wheretrace", n)==0 ){
-++    sqlite3WhereTrace = nArg>=2 ? booleanValue(azArg[1]) : 0xff;
-++  }else
-++#endif
-++
-++  if( c=='w' && strncmp(azArg[0], "width", n)==0 ){
-++    int j;
-++    assert( nArg<=ArraySize(azArg) );
-++    for(j=1; j<nArg && j<ArraySize(p->colWidth); j++){
-++      p->colWidth[j-1] = (int)integerValue(azArg[j]);
-++    }
-++  }else
-++
-++  {
-++    utf8_printf(stderr, "Error: unknown command or invalid arguments: "
-++      " \"%s\". Enter \".help\" for help\n", azArg[0]);
-++    rc = 1;
-++  }
-++
-++meta_command_exit:
-++  if( p->outCount ){
-++    p->outCount--;
-++    if( p->outCount==0 ) output_reset(p);
-++  }
-++  return rc;
-++}
-++
-++/*
-++** Return TRUE if a semicolon occurs anywhere in the first N characters
-++** of string z[].
-++*/
-++static int line_contains_semicolon(const char *z, int N){
-++  int i;
-++  for(i=0; i<N; i++){  if( z[i]==';' ) return 1; }
-++  return 0;
-++}
-++
-++/*
-++** Test to see if a line consists entirely of whitespace.
-++*/
-++static int _all_whitespace(const char *z){
-++  for(; *z; z++){
-++    if( IsSpace(z[0]) ) continue;
-++    if( *z=='/' && z[1]=='*' ){
-++      z += 2;
-++      while( *z && (*z!='*' || z[1]!='/') ){ z++; }
-++      if( *z==0 ) return 0;
-++      z++;
-++      continue;
-++    }
-++    if( *z=='-' && z[1]=='-' ){
-++      z += 2;
-++      while( *z && *z!='\n' ){ z++; }
-++      if( *z==0 ) return 1;
-++      continue;
-++    }
-++    return 0;
-++  }
-++  return 1;
-++}
-++
-++/*
-++** Return TRUE if the line typed in is an SQL command terminator other
-++** than a semi-colon.  The SQL Server style "go" command is understood
-++** as is the Oracle "/".
-++*/
-++static int line_is_command_terminator(const char *zLine){
-++  while( IsSpace(zLine[0]) ){ zLine++; };
-++  if( zLine[0]=='/' && _all_whitespace(&zLine[1]) ){
-++    return 1;  /* Oracle */
-++  }
-++  if( ToLower(zLine[0])=='g' && ToLower(zLine[1])=='o'
-++         && _all_whitespace(&zLine[2]) ){
-++    return 1;  /* SQL Server */
-++  }
-++  return 0;
-++}
-++
-++/*
-++** Return true if zSql is a complete SQL statement.  Return false if it
-++** ends in the middle of a string literal or C-style comment.
-++*/
-++static int line_is_complete(char *zSql, int nSql){
-++  int rc;
-++  if( zSql==0 ) return 1;
-++  zSql[nSql] = ';';
-++  zSql[nSql+1] = 0;
-++  rc = sqlite3_complete(zSql);
-++  zSql[nSql] = 0;
-++  return rc;
-++}
-++
-++/*
-++** Run a single line of SQL
-++*/
-++static int runOneSqlLine(ShellState *p, char *zSql, FILE *in, int startline){
-++  int rc;
-++  char *zErrMsg = 0;
-++
-++  open_db(p, 0);
-++  if( ShellHasFlag(p,SHFLG_Backslash) ) resolve_backslashes(zSql);
-++  BEGIN_TIMER;
-++  rc = shell_exec(p->db, zSql, shell_callback, p, &zErrMsg);
-++  END_TIMER;
-++  if( rc || zErrMsg ){
-++    char zPrefix[100];
-++    if( in!=0 || !stdin_is_interactive ){
-++      sqlite3_snprintf(sizeof(zPrefix), zPrefix,
-++                       "Error: near line %d:", startline);
-++    }else{
-++      sqlite3_snprintf(sizeof(zPrefix), zPrefix, "Error:");
-++    }
-++    if( zErrMsg!=0 ){
-++      utf8_printf(stderr, "%s %s\n", zPrefix, zErrMsg);
-++      sqlite3_free(zErrMsg);
-++      zErrMsg = 0;
-++    }else{
-++      utf8_printf(stderr, "%s %s\n", zPrefix, sqlite3_errmsg(p->db));
-++    }
-++    return 1;
-++  }else if( ShellHasFlag(p, SHFLG_CountChanges) ){
-++    raw_printf(p->out, "changes: %3d   total_changes: %d\n",
-++            sqlite3_changes(p->db), sqlite3_total_changes(p->db));
-++  }
-++  return 0;
-++}
-++
-++
-++/*
-++** Read input from *in and process it.  If *in==0 then input
-++** is interactive - the user is typing it it.  Otherwise, input
-++** is coming from a file or device.  A prompt is issued and history
-++** is saved only if input is interactive.  An interrupt signal will
-++** cause this routine to exit immediately, unless input is interactive.
-++**
-++** Return the number of errors.
-++*/
-++static int process_input(ShellState *p, FILE *in){
-++  char *zLine = 0;          /* A single input line */
-++  char *zSql = 0;           /* Accumulated SQL text */
-++  int nLine;                /* Length of current line */
-++  int nSql = 0;             /* Bytes of zSql[] used */
-++  int nAlloc = 0;           /* Allocated zSql[] space */
-++  int nSqlPrior = 0;        /* Bytes of zSql[] used by prior line */
-++  int rc;                   /* Error code */
-++  int errCnt = 0;           /* Number of errors seen */
-++  int lineno = 0;           /* Current line number */
-++  int startline = 0;        /* Line number for start of current input */
-++
-++  while( errCnt==0 || !bail_on_error || (in==0 && stdin_is_interactive) ){
-++    fflush(p->out);
-++    zLine = one_input_line(in, zLine, nSql>0);
-++    if( zLine==0 ){
-++      /* End of input */
-++      if( in==0 && stdin_is_interactive ) printf("\n");
-++      break;
-++    }
-++    if( seenInterrupt ){
-++      if( in!=0 ) break;
-++      seenInterrupt = 0;
-++    }
-++    lineno++;
-++    if( nSql==0 && _all_whitespace(zLine) ){
-++      if( ShellHasFlag(p, SHFLG_Echo) ) printf("%s\n", zLine);
-++      continue;
-++    }
-++    if( zLine && zLine[0]=='.' && nSql==0 ){
-++      if( ShellHasFlag(p, SHFLG_Echo) ) printf("%s\n", zLine);
-++      rc = do_meta_command(zLine, p);
-++      if( rc==2 ){ /* exit requested */
-++        break;
-++      }else if( rc ){
-++        errCnt++;
-++      }
-++      continue;
-++    }
-++    if( line_is_command_terminator(zLine) && line_is_complete(zSql, nSql) ){
-++      memcpy(zLine,";",2);
-++    }
-++    nLine = strlen30(zLine);
-++    if( nSql+nLine+2>=nAlloc ){
-++      nAlloc = nSql+nLine+100;
-++      zSql = realloc(zSql, nAlloc);
-++      if( zSql==0 ){
-++        raw_printf(stderr, "Error: out of memory\n");
-++        exit(1);
-++      }
-++    }
-++    nSqlPrior = nSql;
-++    if( nSql==0 ){
-++      int i;
-++      for(i=0; zLine[i] && IsSpace(zLine[i]); i++){}
-++      assert( nAlloc>0 && zSql!=0 );
-++      memcpy(zSql, zLine+i, nLine+1-i);
-++      startline = lineno;
-++      nSql = nLine-i;
-++    }else{
-++      zSql[nSql++] = '\n';
-++      memcpy(zSql+nSql, zLine, nLine+1);
-++      nSql += nLine;
-++    }
-++    if( nSql && line_contains_semicolon(&zSql[nSqlPrior], nSql-nSqlPrior)
-++                && sqlite3_complete(zSql) ){
-++      errCnt += runOneSqlLine(p, zSql, in, startline);
-++      nSql = 0;
-++      if( p->outCount ){
-++        output_reset(p);
-++        p->outCount = 0;
-++      }
-++    }else if( nSql && _all_whitespace(zSql) ){
-++      if( ShellHasFlag(p, SHFLG_Echo) ) printf("%s\n", zSql);
-++      nSql = 0;
-++    }
-++  }
-++  if( nSql && !_all_whitespace(zSql) ){
-++    runOneSqlLine(p, zSql, in, startline);
-++  }
-++  free(zSql);
-++  free(zLine);
-++  return errCnt>0;
-++}
-++
-++/*
-++** Return a pathname which is the user's home directory.  A
-++** 0 return indicates an error of some kind.
-++*/
-++static char *find_home_dir(int clearFlag){
-++  static char *home_dir = NULL;
-++  if( clearFlag ){
-++    free(home_dir);
-++    home_dir = 0;
-++    return 0;
-++  }
-++  if( home_dir ) return home_dir;
-++
-++#if !defined(_WIN32) && !defined(WIN32) && !defined(_WIN32_WCE) \
-++     && !defined(__RTP__) && !defined(_WRS_KERNEL)
-++  {
-++    struct passwd *pwent;
-++    uid_t uid = getuid();
-++    if( (pwent=getpwuid(uid)) != NULL) {
-++      home_dir = pwent->pw_dir;
-++    }
-++  }
-++#endif
-++
-++#if defined(_WIN32_WCE)
-++  /* Windows CE (arm-wince-mingw32ce-gcc) does not provide getenv()
-++   */
-++  home_dir = "/";
-++#else
-++
-++#if defined(_WIN32) || defined(WIN32)
-++  if (!home_dir) {
-++    home_dir = getenv("USERPROFILE");
-++  }
-++#endif
-++
-++  if (!home_dir) {
-++    home_dir = getenv("HOME");
-++  }
-++
-++#if defined(_WIN32) || defined(WIN32)
-++  if (!home_dir) {
-++    char *zDrive, *zPath;
-++    int n;
-++    zDrive = getenv("HOMEDRIVE");
-++    zPath = getenv("HOMEPATH");
-++    if( zDrive && zPath ){
-++      n = strlen30(zDrive) + strlen30(zPath) + 1;
-++      home_dir = malloc( n );
-++      if( home_dir==0 ) return 0;
-++      sqlite3_snprintf(n, home_dir, "%s%s", zDrive, zPath);
-++      return home_dir;
-++    }
-++    home_dir = "c:\\";
-++  }
-++#endif
-++
-++#endif /* !_WIN32_WCE */
-++
-++  if( home_dir ){
-++    int n = strlen30(home_dir) + 1;
-++    char *z = malloc( n );
-++    if( z ) memcpy(z, home_dir, n);
-++    home_dir = z;
-++  }
-++
-++  return home_dir;
-++}
-++
-++/*
-++** Read input from the file given by sqliterc_override.  Or if that
-++** parameter is NULL, take input from ~/.sqliterc
-++**
-++** Returns the number of errors.
-++*/
-++static void process_sqliterc(
-++  ShellState *p,                  /* Configuration data */
-++  const char *sqliterc_override   /* Name of config file. NULL to use default */
-++){
-++  char *home_dir = NULL;
-++  const char *sqliterc = sqliterc_override;
-++  char *zBuf = 0;
-++  FILE *in = NULL;
-++
-++  if (sqliterc == NULL) {
-++    home_dir = find_home_dir(0);
-++    if( home_dir==0 ){
-++      raw_printf(stderr, "-- warning: cannot find home directory;"
-++                      " cannot read ~/.sqliterc\n");
-++      return;
-++    }
-++    sqlite3_initialize();
-++    zBuf = sqlite3_mprintf("%s/.sqliterc",home_dir);
-++    sqliterc = zBuf;
-++  }
-++  in = fopen(sqliterc,"rb");
-++  if( in ){
-++    if( stdin_is_interactive ){
-++      utf8_printf(stderr,"-- Loading resources from %s\n",sqliterc);
-++    }
-++    process_input(p,in);
-++    fclose(in);
-++  }
-++  sqlite3_free(zBuf);
-++}
-++
-++/*
-++** Show available command line options
-++*/
-++static const char zOptions[] =
-++  "   -ascii               set output mode to 'ascii'\n"
-++  "   -bail                stop after hitting an error\n"
-++  "   -batch               force batch I/O\n"
-++  "   -column              set output mode to 'column'\n"
-++  "   -cmd COMMAND         run \"COMMAND\" before reading stdin\n"
-++  "   -csv                 set output mode to 'csv'\n"
-++  "   -echo                print commands before execution\n"
-++  "   -init FILENAME       read/process named file\n"
-++  "   -[no]header          turn headers on or off\n"
-++#if defined(SQLITE_ENABLE_MEMSYS3) || defined(SQLITE_ENABLE_MEMSYS5)
-++  "   -heap SIZE           Size of heap for memsys3 or memsys5\n"
-++#endif
-++  "   -help                show this message\n"
-++  "   -html                set output mode to HTML\n"
-++  "   -interactive         force interactive I/O\n"
-++  "   -line                set output mode to 'line'\n"
-++  "   -list                set output mode to 'list'\n"
-++  "   -lookaside SIZE N    use N entries of SZ bytes for lookaside memory\n"
-++  "   -mmap N              default mmap size set to N\n"
-++#ifdef SQLITE_ENABLE_MULTIPLEX
-++  "   -multiplex           enable the multiplexor VFS\n"
-++#endif
-++  "   -newline SEP         set output row separator. Default: '\\n'\n"
-++  "   -nullvalue TEXT      set text string for NULL values. Default ''\n"
-++  "   -pagecache SIZE N    use N slots of SZ bytes each for page cache memory\n"
-++  "   -quote               set output mode to 'quote'\n"
-++  "   -separator SEP       set output column separator. Default: '|'\n"
-++  "   -stats               print memory stats before each finalize\n"
-++  "   -version             show SQLite version\n"
-++  "   -vfs NAME            use NAME as the default VFS\n"
-++#ifdef SQLITE_ENABLE_VFSTRACE
-++  "   -vfstrace            enable tracing of all VFS calls\n"
-++#endif
-++;
-++static void usage(int showDetail){
-++  utf8_printf(stderr,
-++      "Usage: %s [OPTIONS] FILENAME [SQL]\n"
-++      "FILENAME is the name of an SQLite database. A new database is created\n"
-++      "if the file does not previously exist.\n", Argv0);
-++  if( showDetail ){
-++    utf8_printf(stderr, "OPTIONS include:\n%s", zOptions);
-++  }else{
-++    raw_printf(stderr, "Use the -help option for additional information\n");
-++  }
-++  exit(1);
-++}
-++
-++/*
-++** Initialize the state information in data
-++*/
-++static void main_init(ShellState *data) {
-++  memset(data, 0, sizeof(*data));
-++  data->normalMode = data->cMode = data->mode = MODE_List;
-++  data->autoExplain = 1;
-++  memcpy(data->colSeparator,SEP_Column, 2);
-++  memcpy(data->rowSeparator,SEP_Row, 2);
-++  data->showHeader = 0;
-++  data->shellFlgs = SHFLG_Lookaside;
-++  sqlite3_config(SQLITE_CONFIG_URI, 1);
-++  sqlite3_config(SQLITE_CONFIG_LOG, shellLog, data);
-++  sqlite3_config(SQLITE_CONFIG_MULTITHREAD);
-++  sqlite3_snprintf(sizeof(mainPrompt), mainPrompt,"sqlite> ");
-++  sqlite3_snprintf(sizeof(continuePrompt), continuePrompt,"   ...> ");
-++}
-++
-++/*
-++** Output text to the console in a font that attracts extra attention.
-++*/
-++#ifdef _WIN32
-++static void printBold(const char *zText){
-++  HANDLE out = GetStdHandle(STD_OUTPUT_HANDLE);
-++  CONSOLE_SCREEN_BUFFER_INFO defaultScreenInfo;
-++  GetConsoleScreenBufferInfo(out, &defaultScreenInfo);
-++  SetConsoleTextAttribute(out,
-++         FOREGROUND_RED|FOREGROUND_INTENSITY
-++  );
-++  printf("%s", zText);
-++  SetConsoleTextAttribute(out, defaultScreenInfo.wAttributes);
-++}
-++#else
-++static void printBold(const char *zText){
-++  printf("\033[1m%s\033[0m", zText);
-++}
-++#endif
-++
-++/*
-++** Get the argument to an --option.  Throw an error and die if no argument
-++** is available.
-++*/
-++static char *cmdline_option_value(int argc, char **argv, int i){
-++  if( i==argc ){
-++    utf8_printf(stderr, "%s: Error: missing argument to %s\n",
-++            argv[0], argv[argc-1]);
-++    exit(1);
-++  }
-++  return argv[i];
-++}
-++
-++#ifndef SQLITE_SHELL_IS_UTF8
-++#  if (defined(_WIN32) || defined(WIN32)) && defined(_MSC_VER)
-++#    define SQLITE_SHELL_IS_UTF8          (0)
-++#  else
-++#    define SQLITE_SHELL_IS_UTF8          (1)
-++#  endif
-++#endif
-++
-++#if SQLITE_SHELL_IS_UTF8
-++int SQLITE_CDECL main(int argc, char **argv){
-++#else
-++int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
-++  char **argv;
-++#endif
-++  char *zErrMsg = 0;
-++  ShellState data;
-++  const char *zInitFile = 0;
-++  int i;
-++  int rc = 0;
-++  int warnInmemoryDb = 0;
-++  int readStdin = 1;
-++  int nCmd = 0;
-++  char **azCmd = 0;
-++
-++  setBinaryMode(stdin, 0);
-++  setvbuf(stderr, 0, _IONBF, 0); /* Make sure stderr is unbuffered */
-++  stdin_is_interactive = isatty(0);
-++  stdout_is_console = isatty(1);
-++
-++#if USE_SYSTEM_SQLITE+0!=1
-++  if( strncmp(sqlite3_sourceid(),SQLITE_SOURCE_ID,60)!=0 ){
-++    utf8_printf(stderr, "SQLite header and source version mismatch\n%s\n%s\n",
-++            sqlite3_sourceid(), SQLITE_SOURCE_ID);
-++    exit(1);
-++  }
-++#endif
-++  main_init(&data);
-++#if !SQLITE_SHELL_IS_UTF8
-++  sqlite3_initialize();
-++  argv = sqlite3_malloc64(sizeof(argv[0])*argc);
-++  if( argv==0 ){
-++    raw_printf(stderr, "out of memory\n");
-++    exit(1);
-++  }
-++  for(i=0; i<argc; i++){
-++    argv[i] = sqlite3_win32_unicode_to_utf8(wargv[i]);
-++    if( argv[i]==0 ){
-++      raw_printf(stderr, "out of memory\n");
-++      exit(1);
-++    }
-++  }
-++#endif
-++  assert( argc>=1 && argv && argv[0] );
-++  Argv0 = argv[0];
-++
-++  /* Make sure we have a valid signal handler early, before anything
-++  ** else is done.
-++  */
-++#ifdef SIGINT
-++  signal(SIGINT, interrupt_handler);
-++#endif
-++
-++#ifdef SQLITE_SHELL_DBNAME_PROC
-++  {
-++    /* If the SQLITE_SHELL_DBNAME_PROC macro is defined, then it is the name
-++    ** of a C-function that will provide the name of the database file.  Use
-++    ** this compile-time option to embed this shell program in larger
-++    ** applications. */
-++    extern void SQLITE_SHELL_DBNAME_PROC(const char**);
-++    SQLITE_SHELL_DBNAME_PROC(&data.zDbFilename);
-++    warnInmemoryDb = 0;
-++  }
-++#endif
-++
-++  /* Begin evanm patch. */
-++#if !defined(__APPLE__)
-++  extern int sqlite_shell_init_icu();
-++  if( !sqlite_shell_init_icu() ){
-++    fprintf(stderr, "%s: warning: couldn't find icudt38.dll; "
-++                    "queries against ICU FTS tables will fail.\n", argv[0]);
-++  }
-++#endif /* !defined(__APPLE__) */
-++  /* End evanm patch. */
-++
-++  /* Do an initial pass through the command-line argument to locate
-++  ** the name of the database file, the name of the initialization file,
-++  ** the size of the alternative malloc heap,
-++  ** and the first command to execute.
-++  */
-++  for(i=1; i<argc; i++){
-++    char *z;
-++    z = argv[i];
-++    if( z[0]!='-' ){
-++      if( data.zDbFilename==0 ){
-++        data.zDbFilename = z;
-++      }else{
-++        /* Excesss arguments are interpreted as SQL (or dot-commands) and
-++        ** mean that nothing is read from stdin */
-++        readStdin = 0;
-++        nCmd++;
-++        azCmd = realloc(azCmd, sizeof(azCmd[0])*nCmd);
-++        if( azCmd==0 ){
-++          raw_printf(stderr, "out of memory\n");
-++          exit(1);
-++        }
-++        azCmd[nCmd-1] = z;
-++      }
-++    }
-++    if( z[1]=='-' ) z++;
-++    if( strcmp(z,"-separator")==0
-++     || strcmp(z,"-nullvalue")==0
-++     || strcmp(z,"-newline")==0
-++     || strcmp(z,"-cmd")==0
-++    ){
-++      (void)cmdline_option_value(argc, argv, ++i);
-++    }else if( strcmp(z,"-init")==0 ){
-++      zInitFile = cmdline_option_value(argc, argv, ++i);
-++    }else if( strcmp(z,"-batch")==0 ){
-++      /* Need to check for batch mode here to so we can avoid printing
-++      ** informational messages (like from process_sqliterc) before
-++      ** we do the actual processing of arguments later in a second pass.
-++      */
-++      stdin_is_interactive = 0;
-++    }else if( strcmp(z,"-heap")==0 ){
-++#if defined(SQLITE_ENABLE_MEMSYS3) || defined(SQLITE_ENABLE_MEMSYS5)
-++      const char *zSize;
-++      sqlite3_int64 szHeap;
-++
-++      zSize = cmdline_option_value(argc, argv, ++i);
-++      szHeap = integerValue(zSize);
-++      if( szHeap>0x7fff0000 ) szHeap = 0x7fff0000;
-++      sqlite3_config(SQLITE_CONFIG_HEAP, malloc((int)szHeap), (int)szHeap, 64);
-++#else
-++      (void)cmdline_option_value(argc, argv, ++i);
-++#endif
-++    }else if( strcmp(z,"-pagecache")==0 ){
-++      int n, sz;
-++      sz = (int)integerValue(cmdline_option_value(argc,argv,++i));
-++      if( sz>70000 ) sz = 70000;
-++      if( sz<0 ) sz = 0;
-++      n = (int)integerValue(cmdline_option_value(argc,argv,++i));
-++      sqlite3_config(SQLITE_CONFIG_PAGECACHE,
-++                    (n>0 && sz>0) ? malloc(n*sz) : 0, sz, n);
-++      data.shellFlgs |= SHFLG_Pagecache;
-++    }else if( strcmp(z,"-lookaside")==0 ){
-++      int n, sz;
-++      sz = (int)integerValue(cmdline_option_value(argc,argv,++i));
-++      if( sz<0 ) sz = 0;
-++      n = (int)integerValue(cmdline_option_value(argc,argv,++i));
-++      if( n<0 ) n = 0;
-++      sqlite3_config(SQLITE_CONFIG_LOOKASIDE, sz, n);
-++      if( sz*n==0 ) data.shellFlgs &= ~SHFLG_Lookaside;
-++#ifdef SQLITE_ENABLE_VFSTRACE
-++    }else if( strcmp(z,"-vfstrace")==0 ){
-++      extern int vfstrace_register(
-++         const char *zTraceName,
-++         const char *zOldVfsName,
-++         int (*xOut)(const char*,void*),
-++         void *pOutArg,
-++         int makeDefault
-++      );
-++      vfstrace_register("trace",0,(int(*)(const char*,void*))fputs,stderr,1);
-++#endif
-++#ifdef SQLITE_ENABLE_MULTIPLEX
-++    }else if( strcmp(z,"-multiplex")==0 ){
-++      extern int sqlite3_multiple_initialize(const char*,int);
-++      sqlite3_multiplex_initialize(0, 1);
-++#endif
-++    }else if( strcmp(z,"-mmap")==0 ){
-++      sqlite3_int64 sz = integerValue(cmdline_option_value(argc,argv,++i));
-++      sqlite3_config(SQLITE_CONFIG_MMAP_SIZE, sz, sz);
-++    }else if( strcmp(z,"-vfs")==0 ){
-++      sqlite3_vfs *pVfs = sqlite3_vfs_find(cmdline_option_value(argc,argv,++i));
-++      if( pVfs ){
-++        sqlite3_vfs_register(pVfs, 1);
-++      }else{
-++        utf8_printf(stderr, "no such VFS: \"%s\"\n", argv[i]);
-++        exit(1);
-++      }
-++    }
-++  }
-++  if( data.zDbFilename==0 ){
-++#ifndef SQLITE_OMIT_MEMORYDB
-++    data.zDbFilename = ":memory:";
-++    warnInmemoryDb = argc==1;
-++#else
-++    utf8_printf(stderr,"%s: Error: no database filename specified\n", Argv0);
-++    return 1;
-++#endif
-++  }
-++  data.out = stdout;
-++
-++  /* Go ahead and open the database file if it already exists.  If the
-++  ** file does not exist, delay opening it.  This prevents empty database
-++  ** files from being created if a user mistypes the database name argument
-++  ** to the sqlite command-line tool.
-++  */
-++  if( access(data.zDbFilename, 0)==0 ){
-++    open_db(&data, 0);
-++  }
-++
-++  /* Process the initialization file if there is one.  If no -init option
-++  ** is given on the command line, look for a file named ~/.sqliterc and
-++  ** try to process it.
-++  */
-++  process_sqliterc(&data,zInitFile);
-++
-++  /* Make a second pass through the command-line argument and set
-++  ** options.  This second pass is delayed until after the initialization
-++  ** file is processed so that the command-line arguments will override
-++  ** settings in the initialization file.
-++  */
-++  for(i=1; i<argc; i++){
-++    char *z = argv[i];
-++    if( z[0]!='-' ) continue;
-++    if( z[1]=='-' ){ z++; }
-++    if( strcmp(z,"-init")==0 ){
-++      i++;
-++    }else if( strcmp(z,"-html")==0 ){
-++      data.mode = MODE_Html;
-++    }else if( strcmp(z,"-list")==0 ){
-++      data.mode = MODE_List;
-++    }else if( strcmp(z,"-quote")==0 ){
-++      data.mode = MODE_Quote;
-++    }else if( strcmp(z,"-line")==0 ){
-++      data.mode = MODE_Line;
-++    }else if( strcmp(z,"-column")==0 ){
-++      data.mode = MODE_Column;
-++    }else if( strcmp(z,"-csv")==0 ){
-++      data.mode = MODE_Csv;
-++      memcpy(data.colSeparator,",",2);
-++    }else if( strcmp(z,"-ascii")==0 ){
-++      data.mode = MODE_Ascii;
-++      sqlite3_snprintf(sizeof(data.colSeparator), data.colSeparator,
-++                       SEP_Unit);
-++      sqlite3_snprintf(sizeof(data.rowSeparator), data.rowSeparator,
-++                       SEP_Record);
-++    }else if( strcmp(z,"-separator")==0 ){
-++      sqlite3_snprintf(sizeof(data.colSeparator), data.colSeparator,
-++                       "%s",cmdline_option_value(argc,argv,++i));
-++    }else if( strcmp(z,"-newline")==0 ){
-++      sqlite3_snprintf(sizeof(data.rowSeparator), data.rowSeparator,
-++                       "%s",cmdline_option_value(argc,argv,++i));
-++    }else if( strcmp(z,"-nullvalue")==0 ){
-++      sqlite3_snprintf(sizeof(data.nullValue), data.nullValue,
-++                       "%s",cmdline_option_value(argc,argv,++i));
-++    }else if( strcmp(z,"-header")==0 ){
-++      data.showHeader = 1;
-++    }else if( strcmp(z,"-noheader")==0 ){
-++      data.showHeader = 0;
-++    }else if( strcmp(z,"-echo")==0 ){
-++      ShellSetFlag(&data, SHFLG_Echo);
-++    }else if( strcmp(z,"-eqp")==0 ){
-++      data.autoEQP = 1;
-++    }else if( strcmp(z,"-eqpfull")==0 ){
-++      data.autoEQP = 2;
-++    }else if( strcmp(z,"-stats")==0 ){
-++      data.statsOn = 1;
-++    }else if( strcmp(z,"-scanstats")==0 ){
-++      data.scanstatsOn = 1;
-++    }else if( strcmp(z,"-backslash")==0 ){
-++      /* Undocumented command-line option: -backslash
-++      ** Causes C-style backslash escapes to be evaluated in SQL statements
-++      ** prior to sending the SQL into SQLite.  Useful for injecting
-++      ** crazy bytes in the middle of SQL statements for testing and debugging.
-++      */
-++      ShellSetFlag(&data, SHFLG_Backslash);
-++    }else if( strcmp(z,"-bail")==0 ){
-++      bail_on_error = 1;
-++    }else if( strcmp(z,"-version")==0 ){
-++      printf("%s %s\n", sqlite3_libversion(), sqlite3_sourceid());
-++      return 0;
-++    }else if( strcmp(z,"-interactive")==0 ){
-++      stdin_is_interactive = 1;
-++    }else if( strcmp(z,"-batch")==0 ){
-++      stdin_is_interactive = 0;
-++    }else if( strcmp(z,"-heap")==0 ){
-++      i++;
-++    }else if( strcmp(z,"-pagecache")==0 ){
-++      i+=2;
-++    }else if( strcmp(z,"-lookaside")==0 ){
-++      i+=2;
-++    }else if( strcmp(z,"-mmap")==0 ){
-++      i++;
-++    }else if( strcmp(z,"-vfs")==0 ){
-++      i++;
-++#ifdef SQLITE_ENABLE_VFSTRACE
-++    }else if( strcmp(z,"-vfstrace")==0 ){
-++      i++;
-++#endif
-++#ifdef SQLITE_ENABLE_MULTIPLEX
-++    }else if( strcmp(z,"-multiplex")==0 ){
-++      i++;
-++#endif
-++    }else if( strcmp(z,"-help")==0 ){
-++      usage(1);
-++    }else if( strcmp(z,"-cmd")==0 ){
-++      /* Run commands that follow -cmd first and separately from commands
-++      ** that simply appear on the command-line.  This seems goofy.  It would
-++      ** be better if all commands ran in the order that they appear.  But
-++      ** we retain the goofy behavior for historical compatibility. */
-++      if( i==argc-1 ) break;
-++      z = cmdline_option_value(argc,argv,++i);
-++      if( z[0]=='.' ){
-++        rc = do_meta_command(z, &data);
-++        if( rc && bail_on_error ) return rc==2 ? 0 : rc;
-++      }else{
-++        open_db(&data, 0);
-++        rc = shell_exec(data.db, z, shell_callback, &data, &zErrMsg);
-++        if( zErrMsg!=0 ){
-++          utf8_printf(stderr,"Error: %s\n", zErrMsg);
-++          if( bail_on_error ) return rc!=0 ? rc : 1;
-++        }else if( rc!=0 ){
-++          utf8_printf(stderr,"Error: unable to process SQL \"%s\"\n", z);
-++          if( bail_on_error ) return rc;
-++        }
-++      }
-++    }else{
-++      utf8_printf(stderr,"%s: Error: unknown option: %s\n", Argv0, z);
-++      raw_printf(stderr,"Use -help for a list of options.\n");
-++      return 1;
-++    }
-++    data.cMode = data.mode;
-++  }
-++
-++  if( !readStdin ){
-++    /* Run all arguments that do not begin with '-' as if they were separate
-++    ** command-line inputs, except for the argToSkip argument which contains
-++    ** the database filename.
-++    */
-++    for(i=0; i<nCmd; i++){
-++      if( azCmd[i][0]=='.' ){
-++        rc = do_meta_command(azCmd[i], &data);
-++        if( rc ) return rc==2 ? 0 : rc;
-++      }else{
-++        open_db(&data, 0);
-++        rc = shell_exec(data.db, azCmd[i], shell_callback, &data, &zErrMsg);
-++        if( zErrMsg!=0 ){
-++          utf8_printf(stderr,"Error: %s\n", zErrMsg);
-++          return rc!=0 ? rc : 1;
-++        }else if( rc!=0 ){
-++          utf8_printf(stderr,"Error: unable to process SQL: %s\n", azCmd[i]);
-++          return rc;
-++        }
-++      }
-++    }
-++    free(azCmd);
-++  }else{
-++    /* Run commands received from standard input
-++    */
-++    if( stdin_is_interactive ){
-++      char *zHome;
-++      char *zHistory = 0;
-++      int nHistory;
-++      printf(
-++        "SQLite version %s %.19s\n" /*extra-version-info*/
-++        "Enter \".help\" for usage hints.\n",
-++        sqlite3_libversion(), sqlite3_sourceid()
-++      );
-++      if( warnInmemoryDb ){
-++        printf("Connected to a ");
-++        printBold("transient in-memory database");
-++        printf(".\nUse \".open FILENAME\" to reopen on a "
-++               "persistent database.\n");
-++      }
-++      zHome = find_home_dir(0);
-++      if( zHome ){
-++        nHistory = strlen30(zHome) + 20;
-++        if( (zHistory = malloc(nHistory))!=0 ){
-++          sqlite3_snprintf(nHistory, zHistory,"%s/.sqlite_history", zHome);
-++        }
-++      }
-++      if( zHistory ){ shell_read_history(zHistory); }
-++#if HAVE_READLINE || HAVE_EDITLINE
-++      rl_attempted_completion_function = readline_completion;
-++#elif HAVE_LINENOISE
-++      linenoiseSetCompletionCallback(linenoise_completion);
-++#endif
-++      rc = process_input(&data, 0);
-++      if( zHistory ){
-++        shell_stifle_history(2000);
-++        shell_write_history(zHistory);
-++        free(zHistory);
-++      }
-++    }else{
-++      rc = process_input(&data, stdin);
-++    }
-++  }
-++  set_table_name(&data, 0);
-++  if( data.db ){
-++    session_close_all(&data);
-++    sqlite3_close(data.db);
-++  }
-++  sqlite3_free(data.zFreeOnClose);
-++  find_home_dir(1);
-++#if !SQLITE_SHELL_IS_UTF8
-++  for(i=0; i<argc; i++) sqlite3_free(argv[i]);
-++  sqlite3_free(argv);
-++#endif
-++  return rc;
-++}
-++
-+diff --git a/third_party/sqlite/google_generate_amalgamation.sh b/third_party/sqlite/google_generate_amalgamation.sh
-+deleted file mode 100755
-+index 0a1c0fc..0000000
-+--- a/third_party/sqlite/google_generate_amalgamation.sh
-++++ /dev/null
-+@@ -1,18 +0,0 @@
-+-#!/bin/bash
-+-#
-+-# Copyright (c) 2015 The Chromium Authors. All rights reserved.
-+-# Use of this source code is governed by a BSD-style license that can be
-+-# found in the LICENSE file.
-+-
-+-cd src
-+-
-+-mkdir bld
-+-cd bld
-+-../configure
-+-FILES="shell.c sqlite3.h sqlite3.c"
-+-OPTS=""
-+-make "OPTS=$OPTS" $FILES
-+-cp -f $FILES ../../amalgamation
-+-
-+-cd ..
-+-rm -rf bld
-+diff --git a/third_party/sqlite/scripts/extract_sqlite_api.py b/third_party/sqlite/scripts/extract_sqlite_api.py
-+new file mode 100755
-+index 0000000..f82f502
-+--- /dev/null
-++++ b/third_party/sqlite/scripts/extract_sqlite_api.py
-+@@ -0,0 +1,350 @@
-++#!/usr/bin/env python
-++#
-++# Copyright 2018 The Chromium Authors. All rights reserved.
-++# Use of this source code is governed by a BSD-style license that can be
-++# found in the LICENSE file.
-++
-++'''
-++Parses SQLite source code and produces renaming macros for its exported symbols.
-++
-++Usage:
-++    extract_sqlite_api.py sqlite.h rename_macros.h
-++
-++For example, the following renaming macro is produced for sqlite3_initialize().
-++
-++    #define sqlite3_initialize chrome_sqlite3_initialize
-++'''
-++
-++import re
-++import sys
-++
-++def ExtractLineTuples(string):
-++  '''Returns a list of lines, with start/end whitespace stripped.
-++
-++  Each line is a tuple of (line number, string).
-++  '''
-++  raw_lines = string.split('\n')
-++  stripped_lines = [line.strip() for line in raw_lines]
-++  return list(enumerate(stripped_lines, start=1))
-++
-++def ExtractPreprocessorDirectives(lines):
-++  '''Extracts preprocessor directives from lines of C code.
-++
-++  Each input line should be a tuple of (line number, string).
-++
-++  Returns a list of preprocessor directives, and a list of C code lines with the
-++  preprocessor directives removed. The returned code lines are a subset of the
-++  input tuples.
-++  '''
-++  code_lines = []
-++  directives = []
-++  in_directive = False
-++  last_directive = []
-++  for line_tuple in lines:
-++    line = line_tuple[1]
-++    # Preprocessor directives start with #.
-++    if not in_directive:
-++      if len(line) > 0 and line[0] == '#':
-++        in_directive = True
-++        last_directive = []
-++
-++    # Preprocessor directives use \ as a line continuation character.
-++    if in_directive:
-++      if line[-1] == '\\':
-++        line = line[:-1]
-++      else:
-++        in_directive = False
-++      last_directive.append(line)
-++
-++      if not in_directive:
-++        directives.append('\n'.join(last_directive))
-++    else:
-++      code_lines.append(line_tuple)
-++
-++  return directives, code_lines
-++
-++
-++# Regular expression used to parse a macro definition.
-++DEFINITION_RE = re.compile(r'^\#\s*define\s+(\w+)(\s|$)')
-++
-++def ExtractDefineMacroName(line):
-++  '''Extracts the macro name from a non-function preprocessor definition.
-++
-++  Returns None if the preprocessor line is not a preprocessor macro definition.
-++  Macro functions are not considered preprocessor definitions.
-++  '''
-++  match = DEFINITION_RE.match(line)
-++  if match is None:
-++    return None
-++  return match.group(1)
-++
-++
-++# Matches C++-style // single-line comments.
-++SINGLE_LINE_COMMENT_RE = re.compile(r'//.*$')
-++# Matches C-style /* multi-line comments */.
-++MULTI_LINE_COMMENT_RE = re.compile(r'/\*.*?\*/', flags=re.MULTILINE|re.DOTALL)
-++def RemoveLineComments(line):
-++  '''Returns the given C code line with comments removed.
-++
-++  This handles both C-style /* comments */ and C++-style // comments, but cannot
-++  tackle C-style comments that extend over multiple lines.
-++  '''
-++  return SINGLE_LINE_COMMENT_RE.sub('', MULTI_LINE_COMMENT_RE.sub('', line))
-++
-++
-++def RemoveComments(code_tuples):
-++  'Returns the given C code tuples with all comments removed.'
-++
-++  output_tuples = []
-++  in_comment = False
-++  for line_number, line in code_tuples:
-++    if in_comment:
-++      if '*/' in line:
-++        _, line = line.split('*/', 1)
-++        in_comment = False
-++    if not in_comment:
-++      line = RemoveLineComments(line)
-++      if '/*' in line:
-++        line, _ = line.split('/*', 1)
-++        in_comment = True
-++      output_tuples.append((line_number, line))
-++  return output_tuples
-++
-++
-++# Splits a line of C code into statement pieces.
-++STATEMENT_BREAK_RE = re.compile(r'[;{}]')
-++
-++def ToStatementTuples(code_tuples):
-++  '''Converts C code lines into statements.
-++
-++  The input is tuples of (line number, line code string). The output is
-++  tuples of (min line, max line, statement).
-++
-++  The function considers ; { and } to be statement separators. This is
-++  sufficiently correct, given our goal.
-++  '''
-++  statements = []
-++  current_statement = ''
-++  current_start = 0
-++
-++  for line_number, line in code_tuples:
-++    pieces = STATEMENT_BREAK_RE.split(line)
-++    for piece in pieces[:-1]:  # The last piece is an unfinished statement.
-++      if current_statement != '':
-++        current_statement = current_statement + '\n' + piece
-++        statements.append(
-++            (current_start, line_number, current_statement.strip()))
-++        current_statement = ''
-++      else:
-++        statements.append((line_number, line_number, piece.strip()))
-++
-++    if current_statement == '':
-++      current_start = line_number
-++    if pieces[-1] != '':
-++      current_statement = current_statement + '\n' + pieces[-1]
-++
-++  return statements
-++
-++
-++# Used to break down a line into words.
-++WHITESPACE_RE = re.compile(r'\s+')
-++
-++# Features unsupported by our extractor.
-++#
-++# We do not support parsing struct and enum literals because sqlite typedefs
-++# them before incorporating them into exported symbols. We can avoid matching
-++# curly braces because we do not support enum, struct, or union, and we only
-++# need to consider declarations involving typedef names and primitive types.
-++UNSUPPORTED_KEYWORDS = set([
-++  'enum',
-++  'struct',
-++  'union',
-++  'typedef'
-++])
-++
-++# Type qualifiers that we can skip over.
-++#
-++# We discard storage-class specifiers and type qualifiers. For purposes of
-++# finding the end of declaration specifiers, they are not needed. This
-++# additionally discards any pointer type qualifiers.
-++QUALIFIER_KEYWORDS = set([
-++  'extern',
-++  'static',
-++  'auto',
-++  'register',
-++  'const',
-++  'volatile',
-++])
-++
-++# Keywords used in composite primitive types.
-++#
-++# Types using these keywords may have more than one keyword, e.g.
-++# "long long int".
-++COMPOSITE_TYPE_SPECIFIERS = set([
-++  'char',
-++  'short',
-++  'int',
-++  'long',
-++  'float',
-++  'double',
-++  'signed',
-++  'unsigned',
-++])
-++
-++# Matches an identifier.
-++IDENTIFIER_RE = re.compile(r'^[a-zA-Z_0-9]+$')
-++
-++def ExtractApiExport(macro_names, api_export_macro, statement):
-++  '''Extracts the symbol name from a statement exporting a function.
-++
-++  Returns None if the statement does not export a symbol. Throws ValueError if
-++  the parser cannot understand the statement.
-++  '''
-++  # See http://www.open-std.org/jtc1/sc22/wg14/www/docs/n1256.pdf, section 6.7
-++  # for how to parse C declarations. Note that a declaration is a number of
-++  # declaration-specifiers, followed by a list of declarators with optional
-++  # initializer. Multiple declarators would be a declaration like:
-++  #
-++  # int a, b;
-++  #
-++  # While, in principle, one could declare a pair of C functions like this, no
-++  # one does it. We assume there is only one declarator.
-++  #
-++  # int foo(int), bar(int, int);
-++  #
-++  # Jumping to section 6.7.5, a declarator includes some optional pointer
-++  # specifiers (which may have type qualifiers like 'const' embedded, e.g. 'int
-++  # * const * const foo') and some grouping. Note, however, that in all cases,
-++  # the declaration name is the first non-type-qualifier identifier.
-++  #
-++  # Thus our goal is to skip the declaration specifiers and get to the
-++  # declarators.
-++
-++  # Simplification: get rid of pointer characters.
-++  statement = statement.replace('*', ' ')
-++
-++  # Simplification: make sure each open parenthesis is each own word.
-++  statement = statement.replace('(', ' ( ')
-++  statement = statement.replace('[', ' [ ')
-++
-++  words = WHITESPACE_RE.split(statement)
-++
-++  # Ignore statements that don't deal with exporting symbols.
-++  if api_export_macro not in words:
-++    return None
-++
-++  seen_composite_type = False
-++  seen_simple_type = False
-++  for word in words:
-++    if word in UNSUPPORTED_KEYWORDS:
-++      raise ValueError("Unsupported keyword %s" % word)
-++
-++    if word in QUALIFIER_KEYWORDS:
-++      continue
-++
-++    # Per section 6.7.2, we must have at least one type specifier (so the first
-++    # token is one). Moreover, clause 2 implies that if we have a typedef name,
-++    # enum, struct, or union, it is the only type specifier. If we have a
-++    # keyword such as 'int', we may have one or more of such keywords.
-++
-++    if word in COMPOSITE_TYPE_SPECIFIERS:
-++      if seen_simple_type:
-++        raise ValueError('Mixed simple (struct_name) and composite (int) types')
-++      seen_composite_type = True
-++      continue
-++
-++    # We assume that macros are only used for qualifiers, which can be skipped.
-++    if word in macro_names or word == api_export_macro:
-++      continue
-++
-++    if not seen_composite_type and not seen_simple_type:
-++      seen_simple_type = True
-++      if IDENTIFIER_RE.match(word) is None:
-++        raise ValueError(
-++            "%s parsed as type name, which doesn't make sense" % word)
-++      continue
-++
-++    if IDENTIFIER_RE.match(word) is None:
-++      raise ValueError(
-++          "%s parsed as symbol name, which doesn't make sense" % word)
-++    return word
-++
-++  raise ValueError('Failed to find symbol name')
-++
-++
-++def ExportedSymbolLine(symbol_prefix, symbol, statement_tuple):
-++  'Returns an output line for an exported symbol.'
-++  if statement_tuple[0] == statement_tuple[1]:
-++    lines = 'Line %d' % statement_tuple[0]
-++  else:
-++    lines = 'Lines %d-%d' % (statement_tuple[0], statement_tuple[1])
-++  return '#define %s %s%s  // %s' % (symbol, symbol_prefix, symbol, lines)
-++
-++
-++def ExportedExceptionLine(exception, statement_tuple):
-++  'Returns an output line for a parsing failure.'
-++
-++  # Output a TODO without a name so the broken parsing result doesn't
-++  # accidentally get checked in.
-++  return '// TODO: Lines %d-%d -- %s' % (
-++      statement_tuple[0], statement_tuple[1], exception.message)
-++
-++
-++def ProcessSource(api_export_macro, symbol_prefix, header_line, footer_line,
-++                  file_content):
-++  'Returns a list of lines that rename exported symbols in an C program file.'
-++
-++  line_tuples = ExtractLineTuples(file_content)
-++  line_tuples = RemoveComments(line_tuples)
-++  directives, code_tuples = ExtractPreprocessorDirectives(line_tuples)
-++  macro_names = set(
-++      name for name in
-++      [ExtractDefineMacroName(directive) for directive in directives]
-++      if name is not None)
-++  statement_tuples = ToStatementTuples(code_tuples)
-++
-++  output_lines = []
-++  for statement_tuple in statement_tuples:
-++    line = statement_tuple[2]
-++    try:
-++      symbol_name = ExtractApiExport(macro_names, api_export_macro, line)
-++      if symbol_name:
-++        output_lines.append(
-++            ExportedSymbolLine(symbol_prefix, symbol_name, statement_tuple))
-++    except ValueError as exception:
-++      output_lines.append(ExportedExceptionLine(exception, statement_tuple))
-++
-++  output_lines.sort()
-++  return [header_line] + output_lines + [footer_line]
-++
-++
-++def ProcessSourceFile(api_export_macro, symbol_prefix, header_line,
-++                      footer_line, input_file, output_file):
-++  'Reads in a C program file and outputs macros renaming exported symbols.'
-++
-++  with open(input_file, 'r') as f:
-++    file_content = f.read()
-++  output_lines = ProcessSource(api_export_macro, symbol_prefix, header_line,
-++                               footer_line, file_content)
-++  output_lines.append('')
-++  with open(output_file, 'w') as f:
-++    f.write('\n'.join(output_lines))
-++
-++header_line='''// Copyright 2018 The Chromium Authors. All rights reserved.
-++// Use of this source code is governed by a BSD-style license that can be
-++// found in the LICENSE file.
-++
-++// This file is generated by extract_sqlite_api.py.
-++
-++#ifndef THIRD_PARTY_SQLITE_AMALGAMATION_RENAME_EXPORTS_H_
-++#define THIRD_PARTY_SQLITE_AMALGAMATION_RENAME_EXPORTS_H_
-++'''
-++
-++footer_line ='''
-++#endif  // THIRD_PARTY_SQLITE_AMALGAMATION_RENAME_EXPORTS_H_
-++'''
-++
-++if __name__ == '__main__':
-++  ProcessSourceFile(api_export_macro='SQLITE_API', symbol_prefix='chrome_',
-++                    header_line=header_line, footer_line=footer_line,
-++                    input_file=sys.argv[1], output_file=sys.argv[2])
-+diff --git a/third_party/sqlite/scripts/extract_sqlite_api_unittest.py b/third_party/sqlite/scripts/extract_sqlite_api_unittest.py
-+new file mode 100755
-+index 0000000..e612b20
-+--- /dev/null
-++++ b/third_party/sqlite/scripts/extract_sqlite_api_unittest.py
-+@@ -0,0 +1,286 @@
-++#!/usr/bin/env python
-++
-++# Copyright 2018 The Chromium Authors. All rights reserved.
-++# Use of this source code is governed by a BSD-style license that can be
-++# found in the LICENSE file.
-++"""Tests for extract_sqlite_api.py.
-++
-++These tests should be getting picked up by the PRESUBMIT.py in this directory.
-++"""
-++
-++import imp
-++import os
-++import shutil
-++import sys
-++import tempfile
-++import unittest
-++
-++class ExtractSqliteApiUnittest(unittest.TestCase):
-++  def setUp(self):
-++    self.test_root = tempfile.mkdtemp()
-++    source_path = os.path.join(
-++        os.path.dirname(os.path.realpath(__file__)), 'extract_sqlite_api.py')
-++    self.extractor = imp.load_source('extract_api', source_path)
-++
-++  def tearDown(self):
-++    if self.test_root:
-++      shutil.rmtree(self.test_root)
-++
-++  def testExtractLineTuples(self):
-++    golden = [(1, 'Line1'), (2, ''), (3, 'Line 2'), (4, 'Line3'), (5, '')]
-++    text_with_newline = "Line1\n\nLine 2  \nLine3\n"
-++    self.assertEqual(self.extractor.ExtractLineTuples(text_with_newline),
-++                     golden)
-++
-++    golden = [(1, 'Line1'), (2, ''), (3, 'Line 2'), (4, 'Line3')]
-++    text_without_newline = "Line1\n\nLine 2  \nLine3"
-++    self.assertEqual(self.extractor.ExtractLineTuples(text_without_newline),
-++                     golden)
-++
-++  def testExtractPreprocessorDirectives(self):
-++    lines = [
-++      (1, '// Header comment'),
-++      (2, '#define DIRECTIVE 1'),
-++      (3, 'int main() { // \\'),
-++      (4, '}'),
-++      (5, ''),
-++      (6, '#define MULTILINE \\'),
-++      (7, 'MORE_MULTILINE_DIRECTIVE\\'),
-++      (8, 'END_MULTILINE_DIRECTIVE'),
-++      (9, 'void code() { }'),
-++    ]
-++
-++    directives, code_lines = self.extractor.ExtractPreprocessorDirectives(lines)
-++    self.assertEqual(directives, [
-++      '#define DIRECTIVE 1',
-++      '#define MULTILINE \nMORE_MULTILINE_DIRECTIVE\nEND_MULTILINE_DIRECTIVE',
-++    ])
-++    self.assertEqual(code_lines, [
-++      (1, '// Header comment'),
-++      (3, 'int main() { // \\'),
-++      (4, '}'),
-++      (5, ''),
-++      (9, 'void code() { }'),
-++    ])
-++
-++  def testExtractDefineMacroName(self):
-++    self.assertEqual(
-++        'SQLITE_API', self.extractor.ExtractDefineMacroName(
-++            '#define SQLITE_API 1'))
-++    self.assertEqual(
-++        'SQLITE_API', self.extractor.ExtractDefineMacroName(
-++            '#define SQLITE_API'))
-++    self.assertEqual(
-++        'SQLITE_API', self.extractor.ExtractDefineMacroName(
-++            '#define SQLITE_API\n1'))
-++    self.assertEqual(
-++        'SQLITE_API', self.extractor.ExtractDefineMacroName(
-++            '#    define   SQLITE_API   1'))
-++    self.assertEqual(
-++        'SQLITE_API', self.extractor.ExtractDefineMacroName(
-++            '#\tdefine\tSQLITE_API\t1'))
-++    self.assertEqual(
-++        None, self.extractor.ExtractDefineMacroName(
-++            ' #define SQLITE_API 1'))
-++    self.assertEqual(
-++        None, self.extractor.ExtractDefineMacroName(
-++            ' #define SQLITE_API() 1'))
-++    self.assertEqual(None, self.extractor.ExtractDefineMacroName(''))
-++
-++  def testRemoveLineComments(self):
-++    self.assertEqual(
-++        'word;', self.extractor.RemoveLineComments('word;'))
-++    self.assertEqual(
-++        '', self.extractor.RemoveLineComments(''))
-++    self.assertEqual(
-++        '', self.extractor.RemoveLineComments('// comment'))
-++    self.assertEqual(
-++        '', self.extractor.RemoveLineComments('/* comment */'))
-++    self.assertEqual(
-++        'word;', self.extractor.RemoveLineComments('wo/*comment*/rd;'))
-++    self.assertEqual(
-++        'word;*/', self.extractor.RemoveLineComments('wo/*comment*/rd;*/'))
-++    self.assertEqual(
-++        'word;*/', self.extractor.RemoveLineComments('wo/*/*comment*/rd;*/'))
-++    self.assertEqual(
-++        'word;', self.extractor.RemoveLineComments('wo/*comm//ent*/rd;'))
-++
-++  def testRemoveComments(self):
-++    lines = [
-++      (1, 'code();'),
-++      (2, 'more_code(); /* with comment */ more_code();'),
-++      (3, '/**'),
-++      (4, 'Spec text'),
-++      (5, '**/ spec_code();'),
-++      (6, 'late_code(); /* with comment */ more_late_code(); /* late comment'),
-++      (7, 'ends here // C++ trap */ code(); // /* C trap'),
-++      (8, 'last_code();'),
-++    ]
-++
-++    self.assertEqual(self.extractor.RemoveComments(lines), [
-++      (1, 'code();'),
-++      (2, 'more_code();  more_code();'),
-++      (3, ''),
-++      (5, ' spec_code();'),
-++      (6, 'late_code();  more_late_code(); '),
-++      (7, ' code(); '),
-++      (8, 'last_code();'),
-++    ])
-++
-++  def testToStatementTuples(self):
-++    lines = [
-++      (1, 'void function();'),
-++      (2, 'int main('),
-++      (3, '  int argc, char* argv) {'),
-++      (4, '  statement1; statement2;'),
-++      (5, '}'),
-++      (6, 'stat'),
-++      (7, 'ement4; statement5; sta'),
-++      (8, 'tem'),
-++      (9, 'ent6; statement7;')
-++    ]
-++
-++    self.assertEqual(self.extractor.ToStatementTuples(lines), [
-++      (1, 1, 'void function()'),
-++      (2, 3, 'int main(\n  int argc, char* argv)'),
-++      (4, 4, 'statement1'),
-++      (4, 4, 'statement2'),
-++      (5, 5, ''),
-++      (6, 7, 'stat\nement4'),
-++      (7, 7, 'statement5'),
-++      (7, 9, 'sta\ntem\nent6'),
-++      (9, 9, 'statement7'),
-++    ])
-++
-++  def testExtractApiExport(self):
-++    self.assertEqual(
-++        'sqlite3_init',
-++        self.extractor.ExtractApiExport(
-++            set(), 'SQLITE_API', 'SQLITE_API void sqlite3_init()'))
-++    self.assertEqual(
-++        'sqlite3_sleep',
-++        self.extractor.ExtractApiExport(
-++            set(), 'SQLITE_API', 'SQLITE_API int sqlite3_sleep(int ms)'))
-++    self.assertEqual(
-++        'sqlite3_sleep',
-++        self.extractor.ExtractApiExport(
-++            set(), 'SQLITE_API',
-++            'SQLITE_API long long sqlite3_sleep(int ms)'))
-++    self.assertEqual(
-++        'sqlite3rbu_temp_size',
-++        self.extractor.ExtractApiExport(
-++            set(), 'SQLITE_API',
-++            'SQLITE_API sqlite3_int64 sqlite3rbu_temp_size(sqlite3rbu *pRbu)'))
-++    self.assertEqual(
-++        'sqlite3_expired',
-++        self.extractor.ExtractApiExport(
-++            set(['SQLITE_DEPRECATED']), 'SQLITE_API',
-++            'SQLITE_API SQLITE_DEPRECATED int sqlite3_expired(sqlite3_stmt*)'))
-++    # SQLite's header actually #defines double (in some cases).
-++    self.assertEqual(
-++        'sqlite3_column_double',
-++        self.extractor.ExtractApiExport(
-++            set(['double']), 'SQLITE_API',
-++            'SQLITE_API double sqlite3_column_double(sqlite3_stmt*, int iCol)'))
-++    self.assertEqual(
-++        'sqlite3_temp_directory',
-++        self.extractor.ExtractApiExport(
-++            set(['SQLITE_EXTERN']), 'SQLITE_API',
-++            'SQLITE_API SQLITE_EXTERN char *sqlite3_temp_directory'))
-++    self.assertEqual(
-++        'sqlite3_version',
-++        self.extractor.ExtractApiExport(
-++            set(['SQLITE_EXTERN']), 'SQLITE_API',
-++            'SQLITE_API SQLITE_EXTERN const char sqlite3_version[]'))
-++    self.assertEqual(
-++        None,
-++        self.extractor.ExtractApiExport(
-++            set(['SQLITE_DEPRECATED']), 'SQLITE_API',
-++            'NOT_SQLITE_API struct sqlite_type sqlite3_sleep(int ms)'))
-++
-++    with self.assertRaisesRegexp(ValueError, 'Mixed simple .* and composite'):
-++      self.extractor.ExtractApiExport(
-++          set(), 'SQLITE_API', 'SQLITE_API void int sqlite3_sleep(int ms)')
-++    with self.assertRaisesRegexp(ValueError, 'Unsupported keyword struct'):
-++      self.extractor.ExtractApiExport(
-++          set(), 'SQLITE_API',
-++          'SQLITE_API struct sqlite_type sqlite3_sleep(int ms)')
-++    with self.assertRaisesRegexp(ValueError, 'int\+\+ parsed as type name'):
-++      self.extractor.ExtractApiExport(
-++          set(), 'SQLITE_API', 'SQLITE_API int++ sqlite3_sleep(int ms)')
-++    with self.assertRaisesRegexp(ValueError, 'sqlite3\+sleep parsed as symbol'):
-++      self.extractor.ExtractApiExport(
-++          set(), 'SQLITE_API', 'SQLITE_API int sqlite3+sleep(int ms)')
-++
-++  def testExportedSymbolLine(self):
-++    self.assertEqual(
-++        '#define sqlite3_sleep chrome_sqlite3_sleep  // Line 42',
-++        self.extractor.ExportedSymbolLine(
-++            'chrome_', 'sqlite3_sleep',
-++            (42, 42, 'SQLITE_API int chrome_sqlite3_sleep(int ms)')))
-++    self.assertEqual(
-++        '#define sqlite3_sleep chrome_sqlite3_sleep  // Lines 42-44',
-++        self.extractor.ExportedSymbolLine(
-++            'chrome_', 'sqlite3_sleep',
-++            (42, 44, 'SQLITE_API int chrome_sqlite3_sleep(int ms)')))
-++
-++  def testExportedExceptionLine(self):
-++    self.assertEqual(
-++        '// TODO: Lines 42-44 -- Something went wrong',
-++        self.extractor.ExportedExceptionLine(
-++            ValueError('Something went wrong'),
-++            (42, 44, 'SQLITE_API int chrome_sqlite3_sleep(int ms)')))
-++
-++  def testProcessSource(self):
-++    file_content = '\n'.join([
-++      '/*',
-++      'struct sqlite_type sqlite3_sleep;  // Remove comments',
-++      '*/',
-++      '#define SQLITE_DEPRECATED',
-++      'SQLITE_API int sqlite3_sleep(int ms);',
-++      'SQLITE_API struct sqlite_type sqlite3_sleep(int ms);',
-++      'SQLITE_API SQLITE_DEPRECATED int sqlite3_expired(sqlite3_stmt*);',
-++    ])
-++    golden_output = [
-++      '// Header',
-++      '#define sqlite3_expired chrome_sqlite3_expired  // Line 7',
-++      '#define sqlite3_sleep chrome_sqlite3_sleep  // Line 5',
-++      '// TODO: Lines 6-6 -- Unsupported keyword struct',
-++      '// Footer',
-++    ]
-++    self.assertEqual(
-++        golden_output,
-++        self.extractor.ProcessSource('SQLITE_API', 'chrome_', '// Header',
-++                                     '// Footer', file_content))
-++
-++  def testProcessSourceFile(self):
-++    file_content = '\n'.join([
-++      '/*',
-++      'struct sqlite_type sqlite3_sleep;  // Remove comments',
-++      '*/',
-++      '#define SQLITE_DEPRECATED',
-++      'SQLITE_API int sqlite3_sleep(int ms);',
-++      'SQLITE_API struct sqlite_type sqlite3_sleep(int ms);',
-++      'SQLITE_API SQLITE_DEPRECATED int sqlite3_expired(sqlite3_stmt*);',
-++    ])
-++    golden_output = '\n'.join([
-++      '// Header',
-++      '#define sqlite3_expired chrome_sqlite3_expired  // Line 7',
-++      '#define sqlite3_sleep chrome_sqlite3_sleep  // Line 5',
-++      '// TODO: Lines 6-6 -- Unsupported keyword struct',
-++      '// Footer',
-++      '',
-++    ])
-++
-++    input_file = os.path.join(self.test_root, 'input.h')
-++    output_file = os.path.join(self.test_root, 'macros.h')
-++    with open(input_file, 'w') as f:
-++      f.write(file_content)
-++    self.extractor.ProcessSourceFile(
-++        'SQLITE_API', 'chrome_', '// Header', '// Footer', input_file,
-++        output_file)
-++    with open(output_file, 'r') as f:
-++      self.assertEqual(f.read(), golden_output)
-++
-++if __name__ == '__main__':
-++  unittest.main()
-+diff --git a/third_party/sqlite/scripts/generate_amalgamation.sh b/third_party/sqlite/scripts/generate_amalgamation.sh
-+new file mode 100755
-+index 0000000..b1950a3
-+--- /dev/null
-++++ b/third_party/sqlite/scripts/generate_amalgamation.sh
-+@@ -0,0 +1,27 @@
-++#!/bin/bash
-++#
-++# Copyright (c) 2015 The Chromium Authors. All rights reserved.
-++# Use of this source code is governed by a BSD-style license that can be
-++# found in the LICENSE file.
-++
-++cd src
-++
-++mkdir bld
-++cd bld
-++../configure
-++
-++OPTS=""
-++make "OPTS=$OPTS" shell.c sqlite3.h sqlite3.c
-++cp -f sqlite3.h sqlite3.c ../../amalgamation
-++
-++# shell.c must be placed in a different directory from sqlite3.h, because it
-++# contains an '#include "sqlite3.h"' that we want to resolve to our custom
-++# //third_party/sqlite/sqlite3.h, not to the sqlite3.h produced here.
-++mkdir -p ../../amalgamation/shell/
-++cp -f shell.c ../../amalgamation/shell/
-++
-++cd ..
-++rm -rf bld
-++
-++../scripts/extract_sqlite_api.py ../amalgamation/sqlite3.h \
-++                                 ../amalgamation/rename_exports.h
-+\ No newline at end of file
-+diff --git a/third_party/sqlite/sqlite3.h b/third_party/sqlite/sqlite3.h
-+index 27094db..8db7fbd 100644
-+--- a/third_party/sqlite/sqlite3.h
-++++ b/third_party/sqlite/sqlite3.h
-+@@ -4,15 +4,21 @@
-+ 
-+ #ifndef THIRD_PARTY_SQLITE_SQLITE3_H_
-+ #define THIRD_PARTY_SQLITE_SQLITE3_H_
-+-#pragma once
-+ 
-+-// This is a shim header to include the right sqlite3 header.
-+-// Use this instead of referencing the sqlite3 header directly.
-++// This is a shim header to include the right sqlite3 headers.
-++// Use this instead of referencing sqlite3 headers directly.
-+ 
-+ #if defined(USE_SYSTEM_SQLITE)
-+ #include <sqlite3.h>
-+ #else
-++
-++// We prefix chrome_ to SQLite's exported symbols, so that we don't clash with
-++// other SQLite libraries loaded by the system libraries. This only matters when
-++// using the component build, where our SQLite's symbols are visible to the
-++// dynamic library loader.
-++#include "third_party/sqlite/amalgamation/rename_exports.h"
-+ #include "third_party/sqlite/amalgamation/sqlite3.h"
-+-#endif
-++
-++#endif  // defined(USE_SYSTEM_SQLITE)
-+ 
-+ #endif  // THIRD_PARTY_SQLITE_SQLITE3_H_
-added in remote
-  their  100644 372219150ffbeffc243def37907f5f506a84aa91 patches/mips64el/chromium/backport-sqlite-8a87f7e.patch
-@@ -0,0 +1,53617 @@
-+commit e0f29fbf1b81b5aa9ecc4b55c09dec21a73394ec
-+Author: Victor Costan <pwnall@chromium.org>
-+Date:   Fri Nov 10 01:29:30 2017 +0000
-+
-+    sqlite: Upgrade from 3.20.1 to 3.21.0.
-+    
-+    Release notes for the new version:
-+    https://sqlite.org/releaselog/3_21_0.html
-+    
-+    Patch 0003 (Modify default VFS to support WebDatabase) was updated to
-+    reflect conflicts introduced by the following commits:
-+    * https://www.sqlite.org/src/info/3075cfa07489eaf1
-+    * https://www.sqlite.org/src/info/1a7e0b61c8a6bdd3
-+    
-+    The patch was updated to reflect the rename of pUnused to
-+    pPreallocatedUnused and an extra assert added. Both changes were in
-+    src/os_unix.c.
-+    
-+    Patch 0004 (Virtual table supporting recovery of corrupted databases)
-+    was updated to reflect the addition of new compile-time flags to
-+    main.mk.
-+    
-+    Patch 0005 (Custom shell.c helpers to load Chromium's ICU data) was
-+    updated to reflect conflicts introduced by
-+    https://www.sqlite.org/src/info/36acc0a97fdcc6f5 which replaced
-+    src/shell.c with src/shell.c.in, which is used to generate src/shell.c
-+    via Tcl. The change in the build process also introduced conflicts in
-+    main.mk.
-+    
-+    Patch 0009 (Fix _CRT_RAND_S conflict in sqliteInt.h) was removed
-+    completely. It is no longer necessary, because
-+    https://www.sqlite.org/src/info/3a2793aa65727cbb removed the use of
-+    _CRT_RAND_S in src/sqliteInt.h.
-+    
-+    Patches 0012 and 0013 were removed, because they were backports for
-+    upstream changes that fixed clusterfuzz issues. Upgrading removed the
-+    need for backports altogether.
-+    
-+    The new SQLite release allows ATTACH and DETACH to be used inside
-+    transactions, so sql/connection_unittest.cc was updated to reflect the
-+    new behavior. The test for attaching databases was broken into two
-+    tests, covering the behavior with and without a transaction. The former
-+    test (covering the behavior with a transaction) has separate
-+    implementations for iOS, where we use the system SQLite, which might be
-+    old, and every other platform, where we ship our own SQLite version.
-+    
-+    Bug: 780626, 701522
-+    Change-Id: I7a8378cb317966388ebe9903d9e61162d3b3d3c9
-+    Reviewed-on: https://chromium-review.googlesource.com/754522
-+    Reviewed-by: Chris Mumford <cmumford@chromium.org>
-+    Commit-Queue: Victor Costan <pwnall@chromium.org>
-+    Cr-Commit-Position: refs/heads/master@{#515403}
-+
-+diff --git a/sql/connection.h b/sql/connection.h
-+index 8b96407..e1e020d 100644
-+--- a/sql/connection.h
-++++ b/sql/connection.h
-+@@ -392,8 +392,14 @@ class SQL_EXPORT Connection {
-+   // handle under |attachment_point|.  |attachment_point| should only
-+   // contain characters from [a-zA-Z0-9_].
-+   //
-+-  // Note that calling attach or detach with an open transaction is an
-+-  // error.
-++  // Attaching a database while a transaction is open will have
-++  // platform-dependent results, as explained below.
-++  //
-++  // On the SQLite version shipped with Chrome (3.21+, Oct 2017), databases can
-++  // be attached while a transaction is opened. However, these databases cannot
-++  // be detached until the transaction is committed or aborted. On iOS, the
-++  // built-in SQLite might not be older than 3.21. In that case, attaching a
-++  // database while a transaction is open results in a error.
-+   bool AttachDatabase(const base::FilePath& other_db_path,
-+                       const char* attachment_point);
-+   bool DetachDatabase(const char* attachment_point);
-+diff --git a/sql/connection_unittest.cc b/sql/connection_unittest.cc
-+index 4ee8b02..7bd01b4 100644
-+--- a/sql/connection_unittest.cc
-++++ b/sql/connection_unittest.cc
-+@@ -27,7 +27,7 @@
-+ 
-+ #if defined(OS_IOS) && defined(USE_SYSTEM_SQLITE)
-+ #include "base/ios/ios_util.h"
-+-#endif
-++#endif  // defined(OS_IOS) && defined(USE_SYSTEM_SQLITE)
-+ 
-+ namespace sql {
-+ namespace test {
-+@@ -228,7 +228,7 @@ class ScopedUmaskSetter {
-+   mode_t old_umask_;
-+   DISALLOW_IMPLICIT_CONSTRUCTORS(ScopedUmaskSetter);
-+ };
-+-#endif
-++#endif  // defined(OS_POSIX)
-+ 
-+ // SQLite function to adjust mock time by |argv[0]| milliseconds.
-+ void sqlite_adjust_millis(sql::test::ScopedMockTimeSource* time_mock,
-+@@ -847,7 +847,7 @@ TEST_F(SQLConnectionTest, RazeAndCloseDiagnostics) {
-+         db().IsSQLValid(kSimpleSql);
-+       }, "Illegal use of connection without a db");
-+   }
-+-#endif
-++#endif  // !defined(OS_ANDROID) && !defined(OS_IOS) && !defined(OS_FUCHSIA)
-+ }
-+ 
-+ // TODO(shess): Spin up a background thread to hold other_db, to more
-+@@ -901,7 +901,7 @@ TEST_F(SQLConnectionTest, SetTempDirForSQL) {
-+   // database file'.
-+   ASSERT_TRUE(meta_table.Init(&db(), 4, 4));
-+ }
-+-#endif
-++#endif  // defined(OS_ANDROID)
-+ 
-+ TEST_F(SQLConnectionTest, Delete) {
-+   EXPECT_TRUE(db().Execute("CREATE TABLE x (x)"));
-+@@ -1035,8 +1035,7 @@ TEST_F(SQLConnectionTest, Poison) {
-+   EXPECT_FALSE(db().CommitTransaction());
-+ }
-+ 
-+-// Test attaching and detaching databases from the connection.
-+-TEST_F(SQLConnectionTest, Attach) {
-++TEST_F(SQLConnectionTest, AttachDatabase) {
-+   EXPECT_TRUE(db().Execute("CREATE TABLE foo (a, b)"));
-+ 
-+   // Create a database to attach to.
-+@@ -1053,21 +1052,69 @@ TEST_F(SQLConnectionTest, Attach) {
-+   // Cannot see the attached database, yet.
-+   EXPECT_FALSE(db().IsSQLValid("SELECT count(*) from other.bar"));
-+ 
-++  EXPECT_TRUE(db().AttachDatabase(attach_path, kAttachmentPoint));
-++  EXPECT_TRUE(db().IsSQLValid("SELECT count(*) from other.bar"));
-++
-++  // Queries can touch both databases after the ATTACH.
-++  EXPECT_TRUE(db().Execute("INSERT INTO foo SELECT a, b FROM other.bar"));
-++  {
-++    sql::Statement s(db().GetUniqueStatement("SELECT COUNT(*) FROM foo"));
-++    ASSERT_TRUE(s.Step());
-++    EXPECT_EQ(1, s.ColumnInt(0));
-++  }
-++
-++  EXPECT_TRUE(db().DetachDatabase(kAttachmentPoint));
-++  EXPECT_FALSE(db().IsSQLValid("SELECT count(*) from other.bar"));
-++}
-++
-++TEST_F(SQLConnectionTest, AttachDatabaseWithOpenTransaction) {
-++  EXPECT_TRUE(db().Execute("CREATE TABLE foo (a, b)"));
-++
-++  // Create a database to attach to.
-++  base::FilePath attach_path =
-++      db_path().DirName().AppendASCII("SQLConnectionAttach.db");
-++  const char kAttachmentPoint[] = "other";
-++  {
-++    sql::Connection other_db;
-++    ASSERT_TRUE(other_db.Open(attach_path));
-++    EXPECT_TRUE(other_db.Execute("CREATE TABLE bar (a, b)"));
-++    EXPECT_TRUE(other_db.Execute("INSERT INTO bar VALUES ('hello', 'world')"));
-++  }
-++
-++  // Cannot see the attached database, yet.
-++  EXPECT_FALSE(db().IsSQLValid("SELECT count(*) from other.bar"));
-++
-++#if defined(OS_IOS) && defined(USE_SYSTEM_SQLITE)
-++  // SQLite before 3.21 does not support ATTACH and DETACH in transactions.
-++
-+   // Attach fails in a transaction.
-+   EXPECT_TRUE(db().BeginTransaction());
-+   {
-+     sql::test::ScopedErrorExpecter expecter;
-+     expecter.ExpectError(SQLITE_ERROR);
-+     EXPECT_FALSE(db().AttachDatabase(attach_path, kAttachmentPoint));
-++    EXPECT_FALSE(db().IsSQLValid("SELECT count(*) from other.bar"));
-++    ASSERT_TRUE(expecter.SawExpectedErrors());
-++  }
-++
-++  // Detach also fails in a transaction.
-++  {
-++    sql::test::ScopedErrorExpecter expecter;
-++    expecter.ExpectError(SQLITE_ERROR);
-++    EXPECT_FALSE(db().DetachDatabase(kAttachmentPoint));
-+     ASSERT_TRUE(expecter.SawExpectedErrors());
-+   }
-+ 
-+-  // Attach succeeds when the transaction is closed.
-+   db().RollbackTransaction();
-++#else   // defined(OS_IOS) && defined(USE_SYSTEM_SQLITE)
-++  // Chrome's SQLite (3.21+) supports ATTACH and DETACH in transactions.
-++
-++  // Attach succeeds in a transaction.
-++  EXPECT_TRUE(db().BeginTransaction());
-+   EXPECT_TRUE(db().AttachDatabase(attach_path, kAttachmentPoint));
-+   EXPECT_TRUE(db().IsSQLValid("SELECT count(*) from other.bar"));
-+ 
-+-  // Queries can touch both databases.
-++  // Queries can touch both databases after the ATTACH.
-+   EXPECT_TRUE(db().Execute("INSERT INTO foo SELECT a, b FROM other.bar"));
-+   {
-+     sql::Statement s(db().GetUniqueStatement("SELECT COUNT(*) FROM foo"));
-+@@ -1075,8 +1122,7 @@ TEST_F(SQLConnectionTest, Attach) {
-+     EXPECT_EQ(1, s.ColumnInt(0));
-+   }
-+ 
-+-  // Detach also fails in a transaction.
-+-  EXPECT_TRUE(db().BeginTransaction());
-++  // Detaching the same database fails, database is locked in the transaction.
-+   {
-+     sql::test::ScopedErrorExpecter expecter;
-+     expecter.ExpectError(SQLITE_ERROR);
-+@@ -1085,11 +1131,11 @@ TEST_F(SQLConnectionTest, Attach) {
-+     ASSERT_TRUE(expecter.SawExpectedErrors());
-+   }
-+ 
-+-  // Detach succeeds outside of a transaction.
-++  // Detach succeeds when the transaction is closed.
-+   db().RollbackTransaction();
-+   EXPECT_TRUE(db().DetachDatabase(kAttachmentPoint));
-+-
-+   EXPECT_FALSE(db().IsSQLValid("SELECT count(*) from other.bar"));
-++#endif  // defined(OS_IOS) && defined(USE_SYSTEM_SQLITE)
-+ }
-+ 
-+ TEST_F(SQLConnectionTest, Basic_QuickIntegrityCheck) {
-+@@ -1564,7 +1610,7 @@ TEST_F(SQLConnectionTest, GetAppropriateMmapSize) {
-+     ASSERT_EQ(0UL, db().GetAppropriateMmapSize());
-+     return;
-+   }
-+-#endif
-++#endif  // defined(OS_IOS) && defined(USE_SYSTEM_SQLITE)
-+ 
-+   const size_t kMmapAlot = 25 * 1024 * 1024;
-+   int64_t mmap_status = MetaTable::kMmapFailure;
-+@@ -1616,7 +1662,7 @@ TEST_F(SQLConnectionTest, GetAppropriateMmapSizeAltStatus) {
-+     ASSERT_EQ(0UL, db().GetAppropriateMmapSize());
-+     return;
-+   }
-+-#endif
-++#endif  // defined(OS_IOS) && defined(USE_SYSTEM_SQLITE)
-+ 
-+   const size_t kMmapAlot = 25 * 1024 * 1024;
-+ 
-+@@ -1665,7 +1711,7 @@ TEST_F(SQLConnectionTest, CompileError) {
-+         db().GetUniqueStatement("SELECT x");
-+       }, "SQL compile error no such column: x");
-+   }
-+-#endif
-++#endif  // !defined(OS_ANDROID) && !defined(OS_IOS) && !defined(OS_FUCHSIA)
-+ }
-+ 
-+ }  // namespace sql
-+diff --git a/third_party/sqlite/BUILD.gn b/third_party/sqlite/BUILD.gn
-+index a518797..795bd8b 100644
-+--- a/third_party/sqlite/BUILD.gn
-++++ b/third_party/sqlite/BUILD.gn
-+@@ -204,7 +204,7 @@ if (!use_system_sqlite) {
-+       include_dirs = [ "amalgamation" ]
-+ 
-+       sources = [
-+-        "src/src/shell.c",
-++        "amalgamation/shell.c",
-+         "src/src/shell_icu_linux.c",
-+ 
-+         # Include a dummy c++ file to force linking of libstdc++.
-+diff --git a/third_party/sqlite/README.chromium b/third_party/sqlite/README.chromium
-+index 247200b..8a0fd02 100644
-+--- a/third_party/sqlite/README.chromium
-++++ b/third_party/sqlite/README.chromium
-+@@ -1,6 +1,6 @@
-+ Name: sqlite
-+ URL: https://sqlite.org/
-+-Version: 3.20.patched
-++Version: 3.21.0
-+ Included In Release: Yes
-+ Security Critical: Yes
-+ License: Public domain
-+diff --git a/third_party/sqlite/amalgamation/shell.c b/third_party/sqlite/amalgamation/shell.c
-+new file mode 100644
-+index 0000000..1b3e555
-+--- /dev/null
-++++ b/third_party/sqlite/amalgamation/shell.c
-+@@ -0,0 +1,8393 @@
-++/* DO NOT EDIT!
-++** This file is automatically generated by the script in the canonical
-++** SQLite source tree at tool/mkshellc.tcl.  That script combines source
-++** code from various constituent source files of SQLite into this single
-++** "shell.c" file used to implement the SQLite command-line shell.
-++**
-++** Most of the code found below comes from the "src/shell.c.in" file in
-++** the canonical SQLite source tree.  That main file contains "INCLUDE"
-++** lines that specify other files in the canonical source tree that are
-++** inserted to getnerate this complete program source file.
-++**
-++** The code from multiple files is combined into this single "shell.c"
-++** source file to help make the command-line program easier to compile.
-++**
-++** To modify this program, get a copy of the canonical SQLite source tree,
-++** edit the src/shell.c.in" and/or some of the other files that are included
-++** by "src/shell.c.in", then rerun the tool/mkshellc.tcl script.
-++*/
-++/*
-++** 2001 September 15
-++**
-++** The author disclaims copyright to this source code.  In place of
-++** a legal notice, here is a blessing:
-++**
-++**    May you do good and not evil.
-++**    May you find forgiveness for yourself and forgive others.
-++**    May you share freely, never taking more than you give.
-++**
-++*************************************************************************
-++** This file contains code to implement the "sqlite" command line
-++** utility for accessing SQLite databases.
-++*/
-++#if (defined(_WIN32) || defined(WIN32)) && !defined(_CRT_SECURE_NO_WARNINGS)
-++/* This needs to come before any includes for MSVC compiler */
-++#define _CRT_SECURE_NO_WARNINGS
-++#endif
-++
-++/*
-++** Warning pragmas copied from msvc.h in the core.
-++*/
-++#if defined(_MSC_VER)
-++#pragma warning(disable : 4054)
-++#pragma warning(disable : 4055)
-++#pragma warning(disable : 4100)
-++#pragma warning(disable : 4127)
-++#pragma warning(disable : 4130)
-++#pragma warning(disable : 4152)
-++#pragma warning(disable : 4189)
-++#pragma warning(disable : 4206)
-++#pragma warning(disable : 4210)
-++#pragma warning(disable : 4232)
-++#pragma warning(disable : 4244)
-++#pragma warning(disable : 4305)
-++#pragma warning(disable : 4306)
-++#pragma warning(disable : 4702)
-++#pragma warning(disable : 4706)
-++#endif /* defined(_MSC_VER) */
-++
-++/*
-++** No support for loadable extensions in VxWorks.
-++*/
-++#if (defined(__RTP__) || defined(_WRS_KERNEL)) && !SQLITE_OMIT_LOAD_EXTENSION
-++# define SQLITE_OMIT_LOAD_EXTENSION 1
-++#endif
-++
-++/*
-++** Enable large-file support for fopen() and friends on unix.
-++*/
-++#ifndef SQLITE_DISABLE_LFS
-++# define _LARGE_FILE       1
-++# ifndef _FILE_OFFSET_BITS
-++#   define _FILE_OFFSET_BITS 64
-++# endif
-++# define _LARGEFILE_SOURCE 1
-++#endif
-++
-++#include <stdlib.h>
-++#include <string.h>
-++#include <stdio.h>
-++#include <assert.h>
-++#include "sqlite3.h"
-++#if SQLITE_USER_AUTHENTICATION
-++# include "sqlite3userauth.h"
-++#endif
-++#include <ctype.h>
-++#include <stdarg.h>
-++
-++#if !defined(_WIN32) && !defined(WIN32)
-++# include <signal.h>
-++# if !defined(__RTP__) && !defined(_WRS_KERNEL)
-++#  include <pwd.h>
-++# endif
-++# include <unistd.h>
-++# include <sys/types.h>
-++#endif
-++
-++#if HAVE_READLINE
-++# include <readline/readline.h>
-++# include <readline/history.h>
-++#endif
-++
-++#if HAVE_EDITLINE
-++# include <editline/readline.h>
-++#endif
-++
-++#if HAVE_EDITLINE || HAVE_READLINE
-++
-++# define shell_add_history(X) add_history(X)
-++# define shell_read_history(X) read_history(X)
-++# define shell_write_history(X) write_history(X)
-++# define shell_stifle_history(X) stifle_history(X)
-++# define shell_readline(X) readline(X)
-++
-++#elif HAVE_LINENOISE
-++
-++# include "linenoise.h"
-++# define shell_add_history(X) linenoiseHistoryAdd(X)
-++# define shell_read_history(X) linenoiseHistoryLoad(X)
-++# define shell_write_history(X) linenoiseHistorySave(X)
-++# define shell_stifle_history(X) linenoiseHistorySetMaxLen(X)
-++# define shell_readline(X) linenoise(X)
-++
-++#else
-++
-++# define shell_read_history(X)
-++# define shell_write_history(X)
-++# define shell_stifle_history(X)
-++
-++# define SHELL_USE_LOCAL_GETLINE 1
-++#endif
-++
-++
-++#if defined(_WIN32) || defined(WIN32)
-++# include <io.h>
-++# include <fcntl.h>
-++# define isatty(h) _isatty(h)
-++# ifndef access
-++#  define access(f,m) _access((f),(m))
-++# endif
-++# undef popen
-++# define popen _popen
-++# undef pclose
-++# define pclose _pclose
-++#else
-++ /* Make sure isatty() has a prototype. */
-++ extern int isatty(int);
-++
-++# if !defined(__RTP__) && !defined(_WRS_KERNEL)
-++  /* popen and pclose are not C89 functions and so are
-++  ** sometimes omitted from the <stdio.h> header */
-++   extern FILE *popen(const char*,const char*);
-++   extern int pclose(FILE*);
-++# else
-++#  define SQLITE_OMIT_POPEN 1
-++# endif
-++#endif
-++
-++#if defined(_WIN32_WCE)
-++/* Windows CE (arm-wince-mingw32ce-gcc) does not provide isatty()
-++ * thus we always assume that we have a console. That can be
-++ * overridden with the -batch command line option.
-++ */
-++#define isatty(x) 1
-++#endif
-++
-++/* ctype macros that work with signed characters */
-++#define IsSpace(X)  isspace((unsigned char)X)
-++#define IsDigit(X)  isdigit((unsigned char)X)
-++#define ToLower(X)  (char)tolower((unsigned char)X)
-++
-++#if defined(_WIN32) || defined(WIN32)
-++#include <windows.h>
-++
-++/* string conversion routines only needed on Win32 */
-++extern char *sqlite3_win32_unicode_to_utf8(LPCWSTR);
-++extern char *sqlite3_win32_mbcs_to_utf8_v2(const char *, int);
-++extern char *sqlite3_win32_utf8_to_mbcs_v2(const char *, int);
-++extern LPWSTR sqlite3_win32_utf8_to_unicode(const char *zText);
-++#endif
-++
-++/* On Windows, we normally run with output mode of TEXT so that \n characters
-++** are automatically translated into \r\n.  However, this behavior needs
-++** to be disabled in some cases (ex: when generating CSV output and when
-++** rendering quoted strings that contain \n characters).  The following
-++** routines take care of that.
-++*/
-++#if defined(_WIN32) || defined(WIN32)
-++static void setBinaryMode(FILE *file, int isOutput){
-++  if( isOutput ) fflush(file);
-++  _setmode(_fileno(file), _O_BINARY);
-++}
-++static void setTextMode(FILE *file, int isOutput){
-++  if( isOutput ) fflush(file);
-++  _setmode(_fileno(file), _O_TEXT);
-++}
-++#else
-++# define setBinaryMode(X,Y)
-++# define setTextMode(X,Y)
-++#endif
-++
-++
-++/* True if the timer is enabled */
-++static int enableTimer = 0;
-++
-++/* Return the current wall-clock time */
-++static sqlite3_int64 timeOfDay(void){
-++  static sqlite3_vfs *clockVfs = 0;
-++  sqlite3_int64 t;
-++  if( clockVfs==0 ) clockVfs = sqlite3_vfs_find(0);
-++  if( clockVfs->iVersion>=2 && clockVfs->xCurrentTimeInt64!=0 ){
-++    clockVfs->xCurrentTimeInt64(clockVfs, &t);
-++  }else{
-++    double r;
-++    clockVfs->xCurrentTime(clockVfs, &r);
-++    t = (sqlite3_int64)(r*86400000.0);
-++  }
-++  return t;
-++}
-++
-++#if !defined(_WIN32) && !defined(WIN32) && !defined(__minux)
-++#include <sys/time.h>
-++#include <sys/resource.h>
-++
-++/* VxWorks does not support getrusage() as far as we can determine */
-++#if defined(_WRS_KERNEL) || defined(__RTP__)
-++struct rusage {
-++  struct timeval ru_utime; /* user CPU time used */
-++  struct timeval ru_stime; /* system CPU time used */
-++};
-++#define getrusage(A,B) memset(B,0,sizeof(*B))
-++#endif
-++
-++/* Saved resource information for the beginning of an operation */
-++static struct rusage sBegin;  /* CPU time at start */
-++static sqlite3_int64 iBegin;  /* Wall-clock time at start */
-++
-++/*
-++** Begin timing an operation
-++*/
-++static void beginTimer(void){
-++  if( enableTimer ){
-++    getrusage(RUSAGE_SELF, &sBegin);
-++    iBegin = timeOfDay();
-++  }
-++}
-++
-++/* Return the difference of two time_structs in seconds */
-++static double timeDiff(struct timeval *pStart, struct timeval *pEnd){
-++  return (pEnd->tv_usec - pStart->tv_usec)*0.000001 +
-++         (double)(pEnd->tv_sec - pStart->tv_sec);
-++}
-++
-++/*
-++** Print the timing results.
-++*/
-++static void endTimer(void){
-++  if( enableTimer ){
-++    sqlite3_int64 iEnd = timeOfDay();
-++    struct rusage sEnd;
-++    getrusage(RUSAGE_SELF, &sEnd);
-++    printf("Run Time: real %.3f user %f sys %f\n",
-++       (iEnd - iBegin)*0.001,
-++       timeDiff(&sBegin.ru_utime, &sEnd.ru_utime),
-++       timeDiff(&sBegin.ru_stime, &sEnd.ru_stime));
-++  }
-++}
-++
-++#define BEGIN_TIMER beginTimer()
-++#define END_TIMER endTimer()
-++#define HAS_TIMER 1
-++
-++#elif (defined(_WIN32) || defined(WIN32))
-++
-++/* Saved resource information for the beginning of an operation */
-++static HANDLE hProcess;
-++static FILETIME ftKernelBegin;
-++static FILETIME ftUserBegin;
-++static sqlite3_int64 ftWallBegin;
-++typedef BOOL (WINAPI *GETPROCTIMES)(HANDLE, LPFILETIME, LPFILETIME,
-++                                    LPFILETIME, LPFILETIME);
-++static GETPROCTIMES getProcessTimesAddr = NULL;
-++
-++/*
-++** Check to see if we have timer support.  Return 1 if necessary
-++** support found (or found previously).
-++*/
-++static int hasTimer(void){
-++  if( getProcessTimesAddr ){
-++    return 1;
-++  } else {
-++    /* GetProcessTimes() isn't supported in WIN95 and some other Windows
-++    ** versions. See if the version we are running on has it, and if it
-++    ** does, save off a pointer to it and the current process handle.
-++    */
-++    hProcess = GetCurrentProcess();
-++    if( hProcess ){
-++      HINSTANCE hinstLib = LoadLibrary(TEXT("Kernel32.dll"));
-++      if( NULL != hinstLib ){
-++        getProcessTimesAddr =
-++            (GETPROCTIMES) GetProcAddress(hinstLib, "GetProcessTimes");
-++        if( NULL != getProcessTimesAddr ){
-++          return 1;
-++        }
-++        FreeLibrary(hinstLib);
-++      }
-++    }
-++  }
-++  return 0;
-++}
-++
-++/*
-++** Begin timing an operation
-++*/
-++static void beginTimer(void){
-++  if( enableTimer && getProcessTimesAddr ){
-++    FILETIME ftCreation, ftExit;
-++    getProcessTimesAddr(hProcess,&ftCreation,&ftExit,
-++                        &ftKernelBegin,&ftUserBegin);
-++    ftWallBegin = timeOfDay();
-++  }
-++}
-++
-++/* Return the difference of two FILETIME structs in seconds */
-++static double timeDiff(FILETIME *pStart, FILETIME *pEnd){
-++  sqlite_int64 i64Start = *((sqlite_int64 *) pStart);
-++  sqlite_int64 i64End = *((sqlite_int64 *) pEnd);
-++  return (double) ((i64End - i64Start) / 10000000.0);
-++}
-++
-++/*
-++** Print the timing results.
-++*/
-++static void endTimer(void){
-++  if( enableTimer && getProcessTimesAddr){
-++    FILETIME ftCreation, ftExit, ftKernelEnd, ftUserEnd;
-++    sqlite3_int64 ftWallEnd = timeOfDay();
-++    getProcessTimesAddr(hProcess,&ftCreation,&ftExit,&ftKernelEnd,&ftUserEnd);
-++    printf("Run Time: real %.3f user %f sys %f\n",
-++       (ftWallEnd - ftWallBegin)*0.001,
-++       timeDiff(&ftUserBegin, &ftUserEnd),
-++       timeDiff(&ftKernelBegin, &ftKernelEnd));
-++  }
-++}
-++
-++#define BEGIN_TIMER beginTimer()
-++#define END_TIMER endTimer()
-++#define HAS_TIMER hasTimer()
-++
-++#else
-++#define BEGIN_TIMER
-++#define END_TIMER
-++#define HAS_TIMER 0
-++#endif
-++
-++/*
-++** Used to prevent warnings about unused parameters
-++*/
-++#define UNUSED_PARAMETER(x) (void)(x)
-++
-++/*
-++** If the following flag is set, then command execution stops
-++** at an error if we are not interactive.
-++*/
-++static int bail_on_error = 0;
-++
-++/*
-++** Threat stdin as an interactive input if the following variable
-++** is true.  Otherwise, assume stdin is connected to a file or pipe.
-++*/
-++static int stdin_is_interactive = 1;
-++
-++/*
-++** On Windows systems we have to know if standard output is a console
-++** in order to translate UTF-8 into MBCS.  The following variable is
-++** true if translation is required.
-++*/
-++static int stdout_is_console = 1;
-++
-++/*
-++** The following is the open SQLite database.  We make a pointer
-++** to this database a static variable so that it can be accessed
-++** by the SIGINT handler to interrupt database processing.
-++*/
-++static sqlite3 *globalDb = 0;
-++
-++/*
-++** True if an interrupt (Control-C) has been received.
-++*/
-++static volatile int seenInterrupt = 0;
-++
-++/*
-++** This is the name of our program. It is set in main(), used
-++** in a number of other places, mostly for error messages.
-++*/
-++static char *Argv0;
-++
-++/*
-++** Prompt strings. Initialized in main. Settable with
-++**   .prompt main continue
-++*/
-++static char mainPrompt[20];     /* First line prompt. default: "sqlite> "*/
-++static char continuePrompt[20]; /* Continuation prompt. default: "   ...> " */
-++
-++/*
-++** Render output like fprintf().  Except, if the output is going to the
-++** console and if this is running on a Windows machine, translate the
-++** output from UTF-8 into MBCS.
-++*/
-++#if defined(_WIN32) || defined(WIN32)
-++void utf8_printf(FILE *out, const char *zFormat, ...){
-++  va_list ap;
-++  va_start(ap, zFormat);
-++  if( stdout_is_console && (out==stdout || out==stderr) ){
-++    char *z1 = sqlite3_vmprintf(zFormat, ap);
-++    char *z2 = sqlite3_win32_utf8_to_mbcs_v2(z1, 0);
-++    sqlite3_free(z1);
-++    fputs(z2, out);
-++    sqlite3_free(z2);
-++  }else{
-++    vfprintf(out, zFormat, ap);
-++  }
-++  va_end(ap);
-++}
-++#elif !defined(utf8_printf)
-++# define utf8_printf fprintf
-++#endif
-++
-++/*
-++** Render output like fprintf().  This should not be used on anything that
-++** includes string formatting (e.g. "%s").
-++*/
-++#if !defined(raw_printf)
-++# define raw_printf fprintf
-++#endif
-++
-++/*
-++** Write I/O traces to the following stream.
-++*/
-++#ifdef SQLITE_ENABLE_IOTRACE
-++static FILE *iotrace = 0;
-++#endif
-++
-++/*
-++** This routine works like printf in that its first argument is a
-++** format string and subsequent arguments are values to be substituted
-++** in place of % fields.  The result of formatting this string
-++** is written to iotrace.
-++*/
-++#ifdef SQLITE_ENABLE_IOTRACE
-++static void SQLITE_CDECL iotracePrintf(const char *zFormat, ...){
-++  va_list ap;
-++  char *z;
-++  if( iotrace==0 ) return;
-++  va_start(ap, zFormat);
-++  z = sqlite3_vmprintf(zFormat, ap);
-++  va_end(ap);
-++  utf8_printf(iotrace, "%s", z);
-++  sqlite3_free(z);
-++}
-++#endif
-++
-++/*
-++** Output string zUtf to stream pOut as w characters.  If w is negative,
-++** then right-justify the text.  W is the width in UTF-8 characters, not
-++** in bytes.  This is different from the %*.*s specification in printf
-++** since with %*.*s the width is measured in bytes, not characters.
-++*/
-++static void utf8_width_print(FILE *pOut, int w, const char *zUtf){
-++  int i;
-++  int n;
-++  int aw = w<0 ? -w : w;
-++  char zBuf[1000];
-++  if( aw>(int)sizeof(zBuf)/3 ) aw = (int)sizeof(zBuf)/3;
-++  for(i=n=0; zUtf[i]; i++){
-++    if( (zUtf[i]&0xc0)!=0x80 ){
-++      n++;
-++      if( n==aw ){
-++        do{ i++; }while( (zUtf[i]&0xc0)==0x80 );
-++        break;
-++      }
-++    }
-++  }
-++  if( n>=aw ){
-++    utf8_printf(pOut, "%.*s", i, zUtf);
-++  }else if( w<0 ){
-++    utf8_printf(pOut, "%*s%s", aw-n, "", zUtf);
-++  }else{
-++    utf8_printf(pOut, "%s%*s", zUtf, aw-n, "");
-++  }
-++}
-++
-++
-++/*
-++** Determines if a string is a number of not.
-++*/
-++static int isNumber(const char *z, int *realnum){
-++  if( *z=='-' || *z=='+' ) z++;
-++  if( !IsDigit(*z) ){
-++    return 0;
-++  }
-++  z++;
-++  if( realnum ) *realnum = 0;
-++  while( IsDigit(*z) ){ z++; }
-++  if( *z=='.' ){
-++    z++;
-++    if( !IsDigit(*z) ) return 0;
-++    while( IsDigit(*z) ){ z++; }
-++    if( realnum ) *realnum = 1;
-++  }
-++  if( *z=='e' || *z=='E' ){
-++    z++;
-++    if( *z=='+' || *z=='-' ) z++;
-++    if( !IsDigit(*z) ) return 0;
-++    while( IsDigit(*z) ){ z++; }
-++    if( realnum ) *realnum = 1;
-++  }
-++  return *z==0;
-++}
-++
-++/*
-++** Compute a string length that is limited to what can be stored in
-++** lower 30 bits of a 32-bit signed integer.
-++*/
-++static int strlen30(const char *z){
-++  const char *z2 = z;
-++  while( *z2 ){ z2++; }
-++  return 0x3fffffff & (int)(z2 - z);
-++}
-++
-++/*
-++** Return the length of a string in characters.  Multibyte UTF8 characters
-++** count as a single character.
-++*/
-++static int strlenChar(const char *z){
-++  int n = 0;
-++  while( *z ){
-++    if( (0xc0&*(z++))!=0x80 ) n++;
-++  }
-++  return n;
-++}
-++
-++/*
-++** This routine reads a line of text from FILE in, stores
-++** the text in memory obtained from malloc() and returns a pointer
-++** to the text.  NULL is returned at end of file, or if malloc()
-++** fails.
-++**
-++** If zLine is not NULL then it is a malloced buffer returned from
-++** a previous call to this routine that may be reused.
-++*/
-++static char *local_getline(char *zLine, FILE *in){
-++  int nLine = zLine==0 ? 0 : 100;
-++  int n = 0;
-++
-++  while( 1 ){
-++    if( n+100>nLine ){
-++      nLine = nLine*2 + 100;
-++      zLine = realloc(zLine, nLine);
-++      if( zLine==0 ) return 0;
-++    }
-++    if( fgets(&zLine[n], nLine - n, in)==0 ){
-++      if( n==0 ){
-++        free(zLine);
-++        return 0;
-++      }
-++      zLine[n] = 0;
-++      break;
-++    }
-++    while( zLine[n] ) n++;
-++    if( n>0 && zLine[n-1]=='\n' ){
-++      n--;
-++      if( n>0 && zLine[n-1]=='\r' ) n--;
-++      zLine[n] = 0;
-++      break;
-++    }
-++  }
-++#if defined(_WIN32) || defined(WIN32)
-++  /* For interactive input on Windows systems, translate the
-++  ** multi-byte characterset characters into UTF-8. */
-++  if( stdin_is_interactive && in==stdin ){
-++    char *zTrans = sqlite3_win32_mbcs_to_utf8_v2(zLine, 0);
-++    if( zTrans ){
-++      int nTrans = strlen30(zTrans)+1;
-++      if( nTrans>nLine ){
-++        zLine = realloc(zLine, nTrans);
-++        if( zLine==0 ){
-++          sqlite3_free(zTrans);
-++          return 0;
-++        }
-++      }
-++      memcpy(zLine, zTrans, nTrans);
-++      sqlite3_free(zTrans);
-++    }
-++  }
-++#endif /* defined(_WIN32) || defined(WIN32) */
-++  return zLine;
-++}
-++
-++/*
-++** Retrieve a single line of input text.
-++**
-++** If in==0 then read from standard input and prompt before each line.
-++** If isContinuation is true, then a continuation prompt is appropriate.
-++** If isContinuation is zero, then the main prompt should be used.
-++**
-++** If zPrior is not NULL then it is a buffer from a prior call to this
-++** routine that can be reused.
-++**
-++** The result is stored in space obtained from malloc() and must either
-++** be freed by the caller or else passed back into this routine via the
-++** zPrior argument for reuse.
-++*/
-++static char *one_input_line(FILE *in, char *zPrior, int isContinuation){
-++  char *zPrompt;
-++  char *zResult;
-++  if( in!=0 ){
-++    zResult = local_getline(zPrior, in);
-++  }else{
-++    zPrompt = isContinuation ? continuePrompt : mainPrompt;
-++#if SHELL_USE_LOCAL_GETLINE
-++    printf("%s", zPrompt);
-++    fflush(stdout);
-++    zResult = local_getline(zPrior, stdin);
-++#else
-++    free(zPrior);
-++    zResult = shell_readline(zPrompt);
-++    if( zResult && *zResult ) shell_add_history(zResult);
-++#endif
-++  }
-++  return zResult;
-++}
-++/*
-++** A variable length string to which one can append text.
-++*/
-++typedef struct ShellText ShellText;
-++struct ShellText {
-++  char *z;
-++  int n;
-++  int nAlloc;
-++};
-++
-++/*
-++** Initialize and destroy a ShellText object
-++*/
-++static void initText(ShellText *p){
-++  memset(p, 0, sizeof(*p));
-++}
-++static void freeText(ShellText *p){
-++  free(p->z);
-++  initText(p);
-++}
-++
-++/* zIn is either a pointer to a NULL-terminated string in memory obtained
-++** from malloc(), or a NULL pointer. The string pointed to by zAppend is
-++** added to zIn, and the result returned in memory obtained from malloc().
-++** zIn, if it was not NULL, is freed.
-++**
-++** If the third argument, quote, is not '\0', then it is used as a
-++** quote character for zAppend.
-++*/
-++static void appendText(ShellText *p, char const *zAppend, char quote){
-++  int len;
-++  int i;
-++  int nAppend = strlen30(zAppend);
-++
-++  len = nAppend+p->n+1;
-++  if( quote ){
-++    len += 2;
-++    for(i=0; i<nAppend; i++){
-++      if( zAppend[i]==quote ) len++;
-++    }
-++  }
-++
-++  if( p->n+len>=p->nAlloc ){
-++    p->nAlloc = p->nAlloc*2 + len + 20;
-++    p->z = realloc(p->z, p->nAlloc);
-++    if( p->z==0 ){
-++      memset(p, 0, sizeof(*p));
-++      return;
-++    }
-++  }
-++
-++  if( quote ){
-++    char *zCsr = p->z+p->n;
-++    *zCsr++ = quote;
-++    for(i=0; i<nAppend; i++){
-++      *zCsr++ = zAppend[i];
-++      if( zAppend[i]==quote ) *zCsr++ = quote;
-++    }
-++    *zCsr++ = quote;
-++    p->n = (int)(zCsr - p->z);
-++    *zCsr = '\0';
-++  }else{
-++    memcpy(p->z+p->n, zAppend, nAppend);
-++    p->n += nAppend;
-++    p->z[p->n] = '\0';
-++  }
-++}
-++
-++/*
-++** Attempt to determine if identifier zName needs to be quoted, either
-++** because it contains non-alphanumeric characters, or because it is an
-++** SQLite keyword.  Be conservative in this estimate:  When in doubt assume
-++** that quoting is required.
-++**
-++** Return '"' if quoting is required.  Return 0 if no quoting is required.
-++*/
-++static char quoteChar(const char *zName){
-++  /* All SQLite keywords, in alphabetical order */
-++  static const char *azKeywords[] = {
-++    "ABORT", "ACTION", "ADD", "AFTER", "ALL", "ALTER", "ANALYZE", "AND", "AS",
-++    "ASC", "ATTACH", "AUTOINCREMENT", "BEFORE", "BEGIN", "BETWEEN", "BY",
-++    "CASCADE", "CASE", "CAST", "CHECK", "COLLATE", "COLUMN", "COMMIT",
-++    "CONFLICT", "CONSTRAINT", "CREATE", "CROSS", "CURRENT_DATE",
-++    "CURRENT_TIME", "CURRENT_TIMESTAMP", "DATABASE", "DEFAULT", "DEFERRABLE",
-++    "DEFERRED", "DELETE", "DESC", "DETACH", "DISTINCT", "DROP", "EACH",
-++    "ELSE", "END", "ESCAPE", "EXCEPT", "EXCLUSIVE", "EXISTS", "EXPLAIN",
-++    "FAIL", "FOR", "FOREIGN", "FROM", "FULL", "GLOB", "GROUP", "HAVING", "IF",
-++    "IGNORE", "IMMEDIATE", "IN", "INDEX", "INDEXED", "INITIALLY", "INNER",
-++    "INSERT", "INSTEAD", "INTERSECT", "INTO", "IS", "ISNULL", "JOIN", "KEY",
-++    "LEFT", "LIKE", "LIMIT", "MATCH", "NATURAL", "NO", "NOT", "NOTNULL",
-++    "NULL", "OF", "OFFSET", "ON", "OR", "ORDER", "OUTER", "PLAN", "PRAGMA",
-++    "PRIMARY", "QUERY", "RAISE", "RECURSIVE", "REFERENCES", "REGEXP",
-++    "REINDEX", "RELEASE", "RENAME", "REPLACE", "RESTRICT", "RIGHT",
-++    "ROLLBACK", "ROW", "SAVEPOINT", "SELECT", "SET", "TABLE", "TEMP",
-++    "TEMPORARY", "THEN", "TO", "TRANSACTION", "TRIGGER", "UNION", "UNIQUE",
-++    "UPDATE", "USING", "VACUUM", "VALUES", "VIEW", "VIRTUAL", "WHEN", "WHERE",
-++    "WITH", "WITHOUT",
-++  };
-++  int i, lwr, upr, mid, c;
-++  if( !isalpha((unsigned char)zName[0]) && zName[0]!='_' ) return '"';
-++  for(i=0; zName[i]; i++){
-++    if( !isalnum((unsigned char)zName[i]) && zName[i]!='_' ) return '"';
-++  }
-++  lwr = 0;
-++  upr = sizeof(azKeywords)/sizeof(azKeywords[0]) - 1;
-++  while( lwr<=upr ){
-++    mid = (lwr+upr)/2;
-++    c = sqlite3_stricmp(azKeywords[mid], zName);
-++    if( c==0 ) return '"';
-++    if( c<0 ){
-++      lwr = mid+1;
-++    }else{
-++      upr = mid-1;
-++    }
-++  }
-++  return 0;
-++}
-++
-++/*
-++** SQL function:  shell_add_schema(S,X)
-++**
-++** Add the schema name X to the CREATE statement in S and return the result.
-++** Examples:
-++**
-++**    CREATE TABLE t1(x)   ->   CREATE TABLE xyz.t1(x);
-++**
-++** Also works on
-++**
-++**    CREATE INDEX
-++**    CREATE UNIQUE INDEX
-++**    CREATE VIEW
-++**    CREATE TRIGGER
-++**    CREATE VIRTUAL TABLE
-++**
-++** This UDF is used by the .schema command to insert the schema name of
-++** attached databases into the middle of the sqlite_master.sql field.
-++*/
-++static void shellAddSchemaName(
-++  sqlite3_context *pCtx,
-++  int nVal,
-++  sqlite3_value **apVal
-++){
-++  static const char *aPrefix[] = {
-++     "TABLE",
-++     "INDEX",
-++     "UNIQUE INDEX",
-++     "VIEW",
-++     "TRIGGER",
-++     "VIRTUAL TABLE"
-++  };
-++  int i = 0;
-++  const char *zIn = (const char*)sqlite3_value_text(apVal[0]);
-++  const char *zSchema = (const char*)sqlite3_value_text(apVal[1]);
-++  assert( nVal==2 );
-++  if( zIn!=0 && strncmp(zIn, "CREATE ", 7)==0 ){
-++    for(i=0; i<(int)(sizeof(aPrefix)/sizeof(aPrefix[0])); i++){
-++      int n = strlen30(aPrefix[i]);
-++      if( strncmp(zIn+7, aPrefix[i], n)==0 && zIn[n+7]==' ' ){
-++        char cQuote = quoteChar(zSchema);
-++        char *z;
-++        if( cQuote ){
-++         z = sqlite3_mprintf("%.*s \"%w\".%s", n+7, zIn, zSchema, zIn+n+8);
-++        }else{
-++          z = sqlite3_mprintf("%.*s %s.%s", n+7, zIn, zSchema, zIn+n+8);
-++        }
-++        sqlite3_result_text(pCtx, z, -1, sqlite3_free);
-++        return;
-++      }
-++    }
-++  }
-++  sqlite3_result_value(pCtx, apVal[0]);
-++}
-++
-++/*
-++** The source code for several run-time loadable extensions is inserted
-++** below by the ../tool/mkshellc.tcl script.  Before processing that included
-++** code, we need to override some macros to make the included program code
-++** work here in the middle of this regular program.
-++*/
-++#define SQLITE_EXTENSION_INIT1
-++#define SQLITE_EXTENSION_INIT2(X) (void)(X)
-++
-++/************************* Begin ../ext/misc/shathree.c ******************/
-++/*
-++** 2017-03-08
-++**
-++** The author disclaims copyright to this source code.  In place of
-++** a legal notice, here is a blessing:
-++**
-++**    May you do good and not evil.
-++**    May you find forgiveness for yourself and forgive others.
-++**    May you share freely, never taking more than you give.
-++**
-++******************************************************************************
-++**
-++** This SQLite extension implements a functions that compute SHA1 hashes.
-++** Two SQL functions are implemented:
-++**
-++**     sha3(X,SIZE)
-++**     sha3_query(Y,SIZE)
-++**
-++** The sha3(X) function computes the SHA3 hash of the input X, or NULL if
-++** X is NULL.
-++**
-++** The sha3_query(Y) function evalutes all queries in the SQL statements of Y
-++** and returns a hash of their results.
-++**
-++** The SIZE argument is optional.  If omitted, the SHA3-256 hash algorithm
-++** is used.  If SIZE is included it must be one of the integers 224, 256,
-++** 384, or 512, to determine SHA3 hash variant that is computed.
-++*/
-++SQLITE_EXTENSION_INIT1
-++#include <assert.h>
-++#include <string.h>
-++#include <stdarg.h>
-++typedef sqlite3_uint64 u64;
-++
-++/******************************************************************************
-++** The Hash Engine
-++*/
-++/*
-++** Macros to determine whether the machine is big or little endian,
-++** and whether or not that determination is run-time or compile-time.
-++**
-++** For best performance, an attempt is made to guess at the byte-order
-++** using C-preprocessor macros.  If that is unsuccessful, or if
-++** -DSHA3_BYTEORDER=0 is set, then byte-order is determined
-++** at run-time.
-++*/
-++#ifndef SHA3_BYTEORDER
-++# if defined(i386)     || defined(__i386__)   || defined(_M_IX86) ||    \
-++     defined(__x86_64) || defined(__x86_64__) || defined(_M_X64)  ||    \
-++     defined(_M_AMD64) || defined(_M_ARM)     || defined(__x86)   ||    \
-++     defined(__arm__)
-++#   define SHA3_BYTEORDER    1234
-++# elif defined(sparc)    || defined(__ppc__)
-++#   define SHA3_BYTEORDER    4321
-++# else
-++#   define SHA3_BYTEORDER 0
-++# endif
-++#endif
-++
-++
-++/*
-++** State structure for a SHA3 hash in progress
-++*/
-++typedef struct SHA3Context SHA3Context;
-++struct SHA3Context {
-++  union {
-++    u64 s[25];                /* Keccak state. 5x5 lines of 64 bits each */
-++    unsigned char x[1600];    /* ... or 1600 bytes */
-++  } u;
-++  unsigned nRate;        /* Bytes of input accepted per Keccak iteration */
-++  unsigned nLoaded;      /* Input bytes loaded into u.x[] so far this cycle */
-++  unsigned ixMask;       /* Insert next input into u.x[nLoaded^ixMask]. */
-++};
-++
-++/*
-++** A single step of the Keccak mixing function for a 1600-bit state
-++*/
-++static void KeccakF1600Step(SHA3Context *p){
-++  int i;
-++  u64 B0, B1, B2, B3, B4;
-++  u64 C0, C1, C2, C3, C4;
-++  u64 D0, D1, D2, D3, D4;
-++  static const u64 RC[] = {
-++    0x0000000000000001ULL,  0x0000000000008082ULL,
-++    0x800000000000808aULL,  0x8000000080008000ULL,
-++    0x000000000000808bULL,  0x0000000080000001ULL,
-++    0x8000000080008081ULL,  0x8000000000008009ULL,
-++    0x000000000000008aULL,  0x0000000000000088ULL,
-++    0x0000000080008009ULL,  0x000000008000000aULL,
-++    0x000000008000808bULL,  0x800000000000008bULL,
-++    0x8000000000008089ULL,  0x8000000000008003ULL,
-++    0x8000000000008002ULL,  0x8000000000000080ULL,
-++    0x000000000000800aULL,  0x800000008000000aULL,
-++    0x8000000080008081ULL,  0x8000000000008080ULL,
-++    0x0000000080000001ULL,  0x8000000080008008ULL
-++  };
-++# define A00 (p->u.s[0])
-++# define A01 (p->u.s[1])
-++# define A02 (p->u.s[2])
-++# define A03 (p->u.s[3])
-++# define A04 (p->u.s[4])
-++# define A10 (p->u.s[5])
-++# define A11 (p->u.s[6])
-++# define A12 (p->u.s[7])
-++# define A13 (p->u.s[8])
-++# define A14 (p->u.s[9])
-++# define A20 (p->u.s[10])
-++# define A21 (p->u.s[11])
-++# define A22 (p->u.s[12])
-++# define A23 (p->u.s[13])
-++# define A24 (p->u.s[14])
-++# define A30 (p->u.s[15])
-++# define A31 (p->u.s[16])
-++# define A32 (p->u.s[17])
-++# define A33 (p->u.s[18])
-++# define A34 (p->u.s[19])
-++# define A40 (p->u.s[20])
-++# define A41 (p->u.s[21])
-++# define A42 (p->u.s[22])
-++# define A43 (p->u.s[23])
-++# define A44 (p->u.s[24])
-++# define ROL64(a,x) ((a<<x)|(a>>(64-x)))
-++
-++  for(i=0; i<24; i+=4){
-++    C0 = A00^A10^A20^A30^A40;
-++    C1 = A01^A11^A21^A31^A41;
-++    C2 = A02^A12^A22^A32^A42;
-++    C3 = A03^A13^A23^A33^A43;
-++    C4 = A04^A14^A24^A34^A44;
-++    D0 = C4^ROL64(C1, 1);
-++    D1 = C0^ROL64(C2, 1);
-++    D2 = C1^ROL64(C3, 1);
-++    D3 = C2^ROL64(C4, 1);
-++    D4 = C3^ROL64(C0, 1);
-++
-++    B0 = (A00^D0);
-++    B1 = ROL64((A11^D1), 44);
-++    B2 = ROL64((A22^D2), 43);
-++    B3 = ROL64((A33^D3), 21);
-++    B4 = ROL64((A44^D4), 14);
-++    A00 =   B0 ^((~B1)&  B2 );
-++    A00 ^= RC[i];
-++    A11 =   B1 ^((~B2)&  B3 );
-++    A22 =   B2 ^((~B3)&  B4 );
-++    A33 =   B3 ^((~B4)&  B0 );
-++    A44 =   B4 ^((~B0)&  B1 );
-++
-++    B2 = ROL64((A20^D0), 3);
-++    B3 = ROL64((A31^D1), 45);
-++    B4 = ROL64((A42^D2), 61);
-++    B0 = ROL64((A03^D3), 28);
-++    B1 = ROL64((A14^D4), 20);
-++    A20 =   B0 ^((~B1)&  B2 );
-++    A31 =   B1 ^((~B2)&  B3 );
-++    A42 =   B2 ^((~B3)&  B4 );
-++    A03 =   B3 ^((~B4)&  B0 );
-++    A14 =   B4 ^((~B0)&  B1 );
-++
-++    B4 = ROL64((A40^D0), 18);
-++    B0 = ROL64((A01^D1), 1);
-++    B1 = ROL64((A12^D2), 6);
-++    B2 = ROL64((A23^D3), 25);
-++    B3 = ROL64((A34^D4), 8);
-++    A40 =   B0 ^((~B1)&  B2 );
-++    A01 =   B1 ^((~B2)&  B3 );
-++    A12 =   B2 ^((~B3)&  B4 );
-++    A23 =   B3 ^((~B4)&  B0 );
-++    A34 =   B4 ^((~B0)&  B1 );
-++
-++    B1 = ROL64((A10^D0), 36);
-++    B2 = ROL64((A21^D1), 10);
-++    B3 = ROL64((A32^D2), 15);
-++    B4 = ROL64((A43^D3), 56);
-++    B0 = ROL64((A04^D4), 27);
-++    A10 =   B0 ^((~B1)&  B2 );
-++    A21 =   B1 ^((~B2)&  B3 );
-++    A32 =   B2 ^((~B3)&  B4 );
-++    A43 =   B3 ^((~B4)&  B0 );
-++    A04 =   B4 ^((~B0)&  B1 );
-++
-++    B3 = ROL64((A30^D0), 41);
-++    B4 = ROL64((A41^D1), 2);
-++    B0 = ROL64((A02^D2), 62);
-++    B1 = ROL64((A13^D3), 55);
-++    B2 = ROL64((A24^D4), 39);
-++    A30 =   B0 ^((~B1)&  B2 );
-++    A41 =   B1 ^((~B2)&  B3 );
-++    A02 =   B2 ^((~B3)&  B4 );
-++    A13 =   B3 ^((~B4)&  B0 );
-++    A24 =   B4 ^((~B0)&  B1 );
-++
-++    C0 = A00^A20^A40^A10^A30;
-++    C1 = A11^A31^A01^A21^A41;
-++    C2 = A22^A42^A12^A32^A02;
-++    C3 = A33^A03^A23^A43^A13;
-++    C4 = A44^A14^A34^A04^A24;
-++    D0 = C4^ROL64(C1, 1);
-++    D1 = C0^ROL64(C2, 1);
-++    D2 = C1^ROL64(C3, 1);
-++    D3 = C2^ROL64(C4, 1);
-++    D4 = C3^ROL64(C0, 1);
-++
-++    B0 = (A00^D0);
-++    B1 = ROL64((A31^D1), 44);
-++    B2 = ROL64((A12^D2), 43);
-++    B3 = ROL64((A43^D3), 21);
-++    B4 = ROL64((A24^D4), 14);
-++    A00 =   B0 ^((~B1)&  B2 );
-++    A00 ^= RC[i+1];
-++    A31 =   B1 ^((~B2)&  B3 );
-++    A12 =   B2 ^((~B3)&  B4 );
-++    A43 =   B3 ^((~B4)&  B0 );
-++    A24 =   B4 ^((~B0)&  B1 );
-++
-++    B2 = ROL64((A40^D0), 3);
-++    B3 = ROL64((A21^D1), 45);
-++    B4 = ROL64((A02^D2), 61);
-++    B0 = ROL64((A33^D3), 28);
-++    B1 = ROL64((A14^D4), 20);
-++    A40 =   B0 ^((~B1)&  B2 );
-++    A21 =   B1 ^((~B2)&  B3 );
-++    A02 =   B2 ^((~B3)&  B4 );
-++    A33 =   B3 ^((~B4)&  B0 );
-++    A14 =   B4 ^((~B0)&  B1 );
-++
-++    B4 = ROL64((A30^D0), 18);
-++    B0 = ROL64((A11^D1), 1);
-++    B1 = ROL64((A42^D2), 6);
-++    B2 = ROL64((A23^D3), 25);
-++    B3 = ROL64((A04^D4), 8);
-++    A30 =   B0 ^((~B1)&  B2 );
-++    A11 =   B1 ^((~B2)&  B3 );
-++    A42 =   B2 ^((~B3)&  B4 );
-++    A23 =   B3 ^((~B4)&  B0 );
-++    A04 =   B4 ^((~B0)&  B1 );
-++
-++    B1 = ROL64((A20^D0), 36);
-++    B2 = ROL64((A01^D1), 10);
-++    B3 = ROL64((A32^D2), 15);
-++    B4 = ROL64((A13^D3), 56);
-++    B0 = ROL64((A44^D4), 27);
-++    A20 =   B0 ^((~B1)&  B2 );
-++    A01 =   B1 ^((~B2)&  B3 );
-++    A32 =   B2 ^((~B3)&  B4 );
-++    A13 =   B3 ^((~B4)&  B0 );
-++    A44 =   B4 ^((~B0)&  B1 );
-++
-++    B3 = ROL64((A10^D0), 41);
-++    B4 = ROL64((A41^D1), 2);
-++    B0 = ROL64((A22^D2), 62);
-++    B1 = ROL64((A03^D3), 55);
-++    B2 = ROL64((A34^D4), 39);
-++    A10 =   B0 ^((~B1)&  B2 );
-++    A41 =   B1 ^((~B2)&  B3 );
-++    A22 =   B2 ^((~B3)&  B4 );
-++    A03 =   B3 ^((~B4)&  B0 );
-++    A34 =   B4 ^((~B0)&  B1 );
-++
-++    C0 = A00^A40^A30^A20^A10;
-++    C1 = A31^A21^A11^A01^A41;
-++    C2 = A12^A02^A42^A32^A22;
-++    C3 = A43^A33^A23^A13^A03;
-++    C4 = A24^A14^A04^A44^A34;
-++    D0 = C4^ROL64(C1, 1);
-++    D1 = C0^ROL64(C2, 1);
-++    D2 = C1^ROL64(C3, 1);
-++    D3 = C2^ROL64(C4, 1);
-++    D4 = C3^ROL64(C0, 1);
-++
-++    B0 = (A00^D0);
-++    B1 = ROL64((A21^D1), 44);
-++    B2 = ROL64((A42^D2), 43);
-++    B3 = ROL64((A13^D3), 21);
-++    B4 = ROL64((A34^D4), 14);
-++    A00 =   B0 ^((~B1)&  B2 );
-++    A00 ^= RC[i+2];
-++    A21 =   B1 ^((~B2)&  B3 );
-++    A42 =   B2 ^((~B3)&  B4 );
-++    A13 =   B3 ^((~B4)&  B0 );
-++    A34 =   B4 ^((~B0)&  B1 );
-++
-++    B2 = ROL64((A30^D0), 3);
-++    B3 = ROL64((A01^D1), 45);
-++    B4 = ROL64((A22^D2), 61);
-++    B0 = ROL64((A43^D3), 28);
-++    B1 = ROL64((A14^D4), 20);
-++    A30 =   B0 ^((~B1)&  B2 );
-++    A01 =   B1 ^((~B2)&  B3 );
-++    A22 =   B2 ^((~B3)&  B4 );
-++    A43 =   B3 ^((~B4)&  B0 );
-++    A14 =   B4 ^((~B0)&  B1 );
-++
-++    B4 = ROL64((A10^D0), 18);
-++    B0 = ROL64((A31^D1), 1);
-++    B1 = ROL64((A02^D2), 6);
-++    B2 = ROL64((A23^D3), 25);
-++    B3 = ROL64((A44^D4), 8);
-++    A10 =   B0 ^((~B1)&  B2 );
-++    A31 =   B1 ^((~B2)&  B3 );
-++    A02 =   B2 ^((~B3)&  B4 );
-++    A23 =   B3 ^((~B4)&  B0 );
-++    A44 =   B4 ^((~B0)&  B1 );
-++
-++    B1 = ROL64((A40^D0), 36);
-++    B2 = ROL64((A11^D1), 10);
-++    B3 = ROL64((A32^D2), 15);
-++    B4 = ROL64((A03^D3), 56);
-++    B0 = ROL64((A24^D4), 27);
-++    A40 =   B0 ^((~B1)&  B2 );
-++    A11 =   B1 ^((~B2)&  B3 );
-++    A32 =   B2 ^((~B3)&  B4 );
-++    A03 =   B3 ^((~B4)&  B0 );
-++    A24 =   B4 ^((~B0)&  B1 );
-++
-++    B3 = ROL64((A20^D0), 41);
-++    B4 = ROL64((A41^D1), 2);
-++    B0 = ROL64((A12^D2), 62);
-++    B1 = ROL64((A33^D3), 55);
-++    B2 = ROL64((A04^D4), 39);
-++    A20 =   B0 ^((~B1)&  B2 );
-++    A41 =   B1 ^((~B2)&  B3 );
-++    A12 =   B2 ^((~B3)&  B4 );
-++    A33 =   B3 ^((~B4)&  B0 );
-++    A04 =   B4 ^((~B0)&  B1 );
-++
-++    C0 = A00^A30^A10^A40^A20;
-++    C1 = A21^A01^A31^A11^A41;
-++    C2 = A42^A22^A02^A32^A12;
-++    C3 = A13^A43^A23^A03^A33;
-++    C4 = A34^A14^A44^A24^A04;
-++    D0 = C4^ROL64(C1, 1);
-++    D1 = C0^ROL64(C2, 1);
-++    D2 = C1^ROL64(C3, 1);
-++    D3 = C2^ROL64(C4, 1);
-++    D4 = C3^ROL64(C0, 1);
-++
-++    B0 = (A00^D0);
-++    B1 = ROL64((A01^D1), 44);
-++    B2 = ROL64((A02^D2), 43);
-++    B3 = ROL64((A03^D3), 21);
-++    B4 = ROL64((A04^D4), 14);
-++    A00 =   B0 ^((~B1)&  B2 );
-++    A00 ^= RC[i+3];
-++    A01 =   B1 ^((~B2)&  B3 );
-++    A02 =   B2 ^((~B3)&  B4 );
-++    A03 =   B3 ^((~B4)&  B0 );
-++    A04 =   B4 ^((~B0)&  B1 );
-++
-++    B2 = ROL64((A10^D0), 3);
-++    B3 = ROL64((A11^D1), 45);
-++    B4 = ROL64((A12^D2), 61);
-++    B0 = ROL64((A13^D3), 28);
-++    B1 = ROL64((A14^D4), 20);
-++    A10 =   B0 ^((~B1)&  B2 );
-++    A11 =   B1 ^((~B2)&  B3 );
-++    A12 =   B2 ^((~B3)&  B4 );
-++    A13 =   B3 ^((~B4)&  B0 );
-++    A14 =   B4 ^((~B0)&  B1 );
-++
-++    B4 = ROL64((A20^D0), 18);
-++    B0 = ROL64((A21^D1), 1);
-++    B1 = ROL64((A22^D2), 6);
-++    B2 = ROL64((A23^D3), 25);
-++    B3 = ROL64((A24^D4), 8);
-++    A20 =   B0 ^((~B1)&  B2 );
-++    A21 =   B1 ^((~B2)&  B3 );
-++    A22 =   B2 ^((~B3)&  B4 );
-++    A23 =   B3 ^((~B4)&  B0 );
-++    A24 =   B4 ^((~B0)&  B1 );
-++
-++    B1 = ROL64((A30^D0), 36);
-++    B2 = ROL64((A31^D1), 10);
-++    B3 = ROL64((A32^D2), 15);
-++    B4 = ROL64((A33^D3), 56);
-++    B0 = ROL64((A34^D4), 27);
-++    A30 =   B0 ^((~B1)&  B2 );
-++    A31 =   B1 ^((~B2)&  B3 );
-++    A32 =   B2 ^((~B3)&  B4 );
-++    A33 =   B3 ^((~B4)&  B0 );
-++    A34 =   B4 ^((~B0)&  B1 );
-++
-++    B3 = ROL64((A40^D0), 41);
-++    B4 = ROL64((A41^D1), 2);
-++    B0 = ROL64((A42^D2), 62);
-++    B1 = ROL64((A43^D3), 55);
-++    B2 = ROL64((A44^D4), 39);
-++    A40 =   B0 ^((~B1)&  B2 );
-++    A41 =   B1 ^((~B2)&  B3 );
-++    A42 =   B2 ^((~B3)&  B4 );
-++    A43 =   B3 ^((~B4)&  B0 );
-++    A44 =   B4 ^((~B0)&  B1 );
-++  }
-++}
-++
-++/*
-++** Initialize a new hash.  iSize determines the size of the hash
-++** in bits and should be one of 224, 256, 384, or 512.  Or iSize
-++** can be zero to use the default hash size of 256 bits.
-++*/
-++static void SHA3Init(SHA3Context *p, int iSize){
-++  memset(p, 0, sizeof(*p));
-++  if( iSize>=128 && iSize<=512 ){
-++    p->nRate = (1600 - ((iSize + 31)&~31)*2)/8;
-++  }else{
-++    p->nRate = (1600 - 2*256)/8;
-++  }
-++#if SHA3_BYTEORDER==1234
-++  /* Known to be little-endian at compile-time. No-op */
-++#elif SHA3_BYTEORDER==4321
-++  p->ixMask = 7;  /* Big-endian */
-++#else
-++  {
-++    static unsigned int one = 1;
-++    if( 1==*(unsigned char*)&one ){
-++      /* Little endian.  No byte swapping. */
-++      p->ixMask = 0;
-++    }else{
-++      /* Big endian.  Byte swap. */
-++      p->ixMask = 7;
-++    }
-++  }
-++#endif
-++}
-++
-++/*
-++** Make consecutive calls to the SHA3Update function to add new content
-++** to the hash
-++*/
-++static void SHA3Update(
-++  SHA3Context *p,
-++  const unsigned char *aData,
-++  unsigned int nData
-++){
-++  unsigned int i = 0;
-++#if SHA3_BYTEORDER==1234
-++  if( (p->nLoaded % 8)==0 && ((aData - (const unsigned char*)0)&7)==0 ){
-++    for(; i+7<nData; i+=8){
-++      p->u.s[p->nLoaded/8] ^= *(u64*)&aData[i];
-++      p->nLoaded += 8;
-++      if( p->nLoaded>=p->nRate ){
-++        KeccakF1600Step(p);
-++        p->nLoaded = 0;
-++      }
-++    }
-++  }
-++#endif
-++  for(; i<nData; i++){
-++#if SHA3_BYTEORDER==1234
-++    p->u.x[p->nLoaded] ^= aData[i];
-++#elif SHA3_BYTEORDER==4321
-++    p->u.x[p->nLoaded^0x07] ^= aData[i];
-++#else
-++    p->u.x[p->nLoaded^p->ixMask] ^= aData[i];
-++#endif
-++    p->nLoaded++;
-++    if( p->nLoaded==p->nRate ){
-++      KeccakF1600Step(p);
-++      p->nLoaded = 0;
-++    }
-++  }
-++}
-++
-++/*
-++** After all content has been added, invoke SHA3Final() to compute
-++** the final hash.  The function returns a pointer to the binary
-++** hash value.
-++*/
-++static unsigned char *SHA3Final(SHA3Context *p){
-++  unsigned int i;
-++  if( p->nLoaded==p->nRate-1 ){
-++    const unsigned char c1 = 0x86;
-++    SHA3Update(p, &c1, 1);
-++  }else{
-++    const unsigned char c2 = 0x06;
-++    const unsigned char c3 = 0x80;
-++    SHA3Update(p, &c2, 1);
-++    p->nLoaded = p->nRate - 1;
-++    SHA3Update(p, &c3, 1);
-++  }
-++  for(i=0; i<p->nRate; i++){
-++    p->u.x[i+p->nRate] = p->u.x[i^p->ixMask];
-++  }
-++  return &p->u.x[p->nRate];
-++}
-++/* End of the hashing logic
-++*****************************************************************************/
-++
-++/*
-++** Implementation of the sha3(X,SIZE) function.
-++**
-++** Return a BLOB which is the SIZE-bit SHA3 hash of X.  The default
-++** size is 256.  If X is a BLOB, it is hashed as is.
-++** For all other non-NULL types of input, X is converted into a UTF-8 string
-++** and the string is hashed without the trailing 0x00 terminator.  The hash
-++** of a NULL value is NULL.
-++*/
-++static void sha3Func(
-++  sqlite3_context *context,
-++  int argc,
-++  sqlite3_value **argv
-++){
-++  SHA3Context cx;
-++  int eType = sqlite3_value_type(argv[0]);
-++  int nByte = sqlite3_value_bytes(argv[0]);
-++  int iSize;
-++  if( argc==1 ){
-++    iSize = 256;
-++  }else{
-++    iSize = sqlite3_value_int(argv[1]);
-++    if( iSize!=224 && iSize!=256 && iSize!=384 && iSize!=512 ){
-++      sqlite3_result_error(context, "SHA3 size should be one of: 224 256 "
-++                                    "384 512", -1);
-++      return;
-++    }
-++  }
-++  if( eType==SQLITE_NULL ) return;
-++  SHA3Init(&cx, iSize);
-++  if( eType==SQLITE_BLOB ){
-++    SHA3Update(&cx, sqlite3_value_blob(argv[0]), nByte);
-++  }else{
-++    SHA3Update(&cx, sqlite3_value_text(argv[0]), nByte);
-++  }
-++  sqlite3_result_blob(context, SHA3Final(&cx), iSize/8, SQLITE_TRANSIENT);
-++}
-++
-++/* Compute a string using sqlite3_vsnprintf() with a maximum length
-++** of 50 bytes and add it to the hash.
-++*/
-++static void hash_step_vformat(
-++  SHA3Context *p,                 /* Add content to this context */
-++  const char *zFormat,
-++  ...
-++){
-++  va_list ap;
-++  int n;
-++  char zBuf[50];
-++  va_start(ap, zFormat);
-++  sqlite3_vsnprintf(sizeof(zBuf),zBuf,zFormat,ap);
-++  va_end(ap);
-++  n = (int)strlen(zBuf);
-++  SHA3Update(p, (unsigned char*)zBuf, n);
-++}
-++
-++/*
-++** Implementation of the sha3_query(SQL,SIZE) function.
-++**
-++** This function compiles and runs the SQL statement(s) given in the
-++** argument. The results are hashed using a SIZE-bit SHA3.  The default
-++** size is 256.
-++**
-++** The format of the byte stream that is hashed is summarized as follows:
-++**
-++**       S<n>:<sql>
-++**       R
-++**       N
-++**       I<int>
-++**       F<ieee-float>
-++**       B<size>:<bytes>
-++**       T<size>:<text>
-++**
-++** <sql> is the original SQL text for each statement run and <n> is
-++** the size of that text.  The SQL text is UTF-8.  A single R character
-++** occurs before the start of each row.  N means a NULL value.
-++** I mean an 8-byte little-endian integer <int>.  F is a floating point
-++** number with an 8-byte little-endian IEEE floating point value <ieee-float>.
-++** B means blobs of <size> bytes.  T means text rendered as <size>
-++** bytes of UTF-8.  The <n> and <size> values are expressed as an ASCII
-++** text integers.
-++**
-++** For each SQL statement in the X input, there is one S segment.  Each
-++** S segment is followed by zero or more R segments, one for each row in the
-++** result set.  After each R, there are one or more N, I, F, B, or T segments,
-++** one for each column in the result set.  Segments are concatentated directly
-++** with no delimiters of any kind.
-++*/
-++static void sha3QueryFunc(
-++  sqlite3_context *context,
-++  int argc,
-++  sqlite3_value **argv
-++){
-++  sqlite3 *db = sqlite3_context_db_handle(context);
-++  const char *zSql = (const char*)sqlite3_value_text(argv[0]);
-++  sqlite3_stmt *pStmt = 0;
-++  int nCol;                   /* Number of columns in the result set */
-++  int i;                      /* Loop counter */
-++  int rc;
-++  int n;
-++  const char *z;
-++  SHA3Context cx;
-++  int iSize;
-++
-++  if( argc==1 ){
-++    iSize = 256;
-++  }else{
-++    iSize = sqlite3_value_int(argv[1]);
-++    if( iSize!=224 && iSize!=256 && iSize!=384 && iSize!=512 ){
-++      sqlite3_result_error(context, "SHA3 size should be one of: 224 256 "
-++                                    "384 512", -1);
-++      return;
-++    }
-++  }
-++  if( zSql==0 ) return;
-++  SHA3Init(&cx, iSize);
-++  while( zSql[0] ){
-++    rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, &zSql);
-++    if( rc ){
-++      char *zMsg = sqlite3_mprintf("error SQL statement [%s]: %s",
-++                                   zSql, sqlite3_errmsg(db));
-++      sqlite3_finalize(pStmt);
-++      sqlite3_result_error(context, zMsg, -1);
-++      sqlite3_free(zMsg);
-++      return;
-++    }
-++    if( !sqlite3_stmt_readonly(pStmt) ){
-++      char *zMsg = sqlite3_mprintf("non-query: [%s]", sqlite3_sql(pStmt));
-++      sqlite3_finalize(pStmt);
-++      sqlite3_result_error(context, zMsg, -1);
-++      sqlite3_free(zMsg);
-++      return;
-++    }
-++    nCol = sqlite3_column_count(pStmt);
-++    z = sqlite3_sql(pStmt);
-++    n = (int)strlen(z);
-++    hash_step_vformat(&cx,"S%d:",n);
-++    SHA3Update(&cx,(unsigned char*)z,n);
-++
-++    /* Compute a hash over the result of the query */
-++    while( SQLITE_ROW==sqlite3_step(pStmt) ){
-++      SHA3Update(&cx,(const unsigned char*)"R",1);
-++      for(i=0; i<nCol; i++){
-++        switch( sqlite3_column_type(pStmt,i) ){
-++          case SQLITE_NULL: {
-++            SHA3Update(&cx, (const unsigned char*)"N",1);
-++            break;
-++          }
-++          case SQLITE_INTEGER: {
-++            sqlite3_uint64 u;
-++            int j;
-++            unsigned char x[9];
-++            sqlite3_int64 v = sqlite3_column_int64(pStmt,i);
-++            memcpy(&u, &v, 8);
-++            for(j=8; j>=1; j--){
-++              x[j] = u & 0xff;
-++              u >>= 8;
-++            }
-++            x[0] = 'I';
-++            SHA3Update(&cx, x, 9);
-++            break;
-++          }
-++          case SQLITE_FLOAT: {
-++            sqlite3_uint64 u;
-++            int j;
-++            unsigned char x[9];
-++            double r = sqlite3_column_double(pStmt,i);
-++            memcpy(&u, &r, 8);
-++            for(j=8; j>=1; j--){
-++              x[j] = u & 0xff;
-++              u >>= 8;
-++            }
-++            x[0] = 'F';
-++            SHA3Update(&cx,x,9);
-++            break;
-++          }
-++          case SQLITE_TEXT: {
-++            int n2 = sqlite3_column_bytes(pStmt, i);
-++            const unsigned char *z2 = sqlite3_column_text(pStmt, i);
-++            hash_step_vformat(&cx,"T%d:",n2);
-++            SHA3Update(&cx, z2, n2);
-++            break;
-++          }
-++          case SQLITE_BLOB: {
-++            int n2 = sqlite3_column_bytes(pStmt, i);
-++            const unsigned char *z2 = sqlite3_column_blob(pStmt, i);
-++            hash_step_vformat(&cx,"B%d:",n2);
-++            SHA3Update(&cx, z2, n2);
-++            break;
-++          }
-++        }
-++      }
-++    }
-++    sqlite3_finalize(pStmt);
-++  }
-++  sqlite3_result_blob(context, SHA3Final(&cx), iSize/8, SQLITE_TRANSIENT);
-++}
-++
-++
-++#ifdef _WIN32
-++
-++#endif
-++int sqlite3_shathree_init(
-++  sqlite3 *db,
-++  char **pzErrMsg,
-++  const sqlite3_api_routines *pApi
-++){
-++  int rc = SQLITE_OK;
-++  SQLITE_EXTENSION_INIT2(pApi);
-++  (void)pzErrMsg;  /* Unused parameter */
-++  rc = sqlite3_create_function(db, "sha3", 1, SQLITE_UTF8, 0,
-++                               sha3Func, 0, 0);
-++  if( rc==SQLITE_OK ){
-++    rc = sqlite3_create_function(db, "sha3", 2, SQLITE_UTF8, 0,
-++                                 sha3Func, 0, 0);
-++  }
-++  if( rc==SQLITE_OK ){
-++    rc = sqlite3_create_function(db, "sha3_query", 1, SQLITE_UTF8, 0,
-++                                 sha3QueryFunc, 0, 0);
-++  }
-++  if( rc==SQLITE_OK ){
-++    rc = sqlite3_create_function(db, "sha3_query", 2, SQLITE_UTF8, 0,
-++                                 sha3QueryFunc, 0, 0);
-++  }
-++  return rc;
-++}
-++
-++/************************* End ../ext/misc/shathree.c ********************/
-++/************************* Begin ../ext/misc/fileio.c ******************/
-++/*
-++** 2014-06-13
-++**
-++** The author disclaims copyright to this source code.  In place of
-++** a legal notice, here is a blessing:
-++**
-++**    May you do good and not evil.
-++**    May you find forgiveness for yourself and forgive others.
-++**    May you share freely, never taking more than you give.
-++**
-++******************************************************************************
-++**
-++** This SQLite extension implements SQL functions readfile() and
-++** writefile().
-++*/
-++SQLITE_EXTENSION_INIT1
-++#include <stdio.h>
-++
-++/*
-++** Implementation of the "readfile(X)" SQL function.  The entire content
-++** of the file named X is read and returned as a BLOB.  NULL is returned
-++** if the file does not exist or is unreadable.
-++*/
-++static void readfileFunc(
-++  sqlite3_context *context,
-++  int argc,
-++  sqlite3_value **argv
-++){
-++  const char *zName;
-++  FILE *in;
-++  long nIn;
-++  void *pBuf;
-++
-++  (void)(argc);  /* Unused parameter */
-++  zName = (const char*)sqlite3_value_text(argv[0]);
-++  if( zName==0 ) return;
-++  in = fopen(zName, "rb");
-++  if( in==0 ) return;
-++  fseek(in, 0, SEEK_END);
-++  nIn = ftell(in);
-++  rewind(in);
-++  pBuf = sqlite3_malloc( nIn );
-++  if( pBuf && 1==fread(pBuf, nIn, 1, in) ){
-++    sqlite3_result_blob(context, pBuf, nIn, sqlite3_free);
-++  }else{
-++    sqlite3_free(pBuf);
-++  }
-++  fclose(in);
-++}
-++
-++/*
-++** Implementation of the "writefile(X,Y)" SQL function.  The argument Y
-++** is written into file X.  The number of bytes written is returned.  Or
-++** NULL is returned if something goes wrong, such as being unable to open
-++** file X for writing.
-++*/
-++static void writefileFunc(
-++  sqlite3_context *context,
-++  int argc,
-++  sqlite3_value **argv
-++){
-++  FILE *out;
-++  const char *z;
-++  sqlite3_int64 rc;
-++  const char *zFile;
-++
-++  (void)(argc);  /* Unused parameter */
-++  zFile = (const char*)sqlite3_value_text(argv[0]);
-++  if( zFile==0 ) return;
-++  out = fopen(zFile, "wb");
-++  if( out==0 ) return;
-++  z = (const char*)sqlite3_value_blob(argv[1]);
-++  if( z==0 ){
-++    rc = 0;
-++  }else{
-++    rc = fwrite(z, 1, sqlite3_value_bytes(argv[1]), out);
-++  }
-++  fclose(out);
-++  sqlite3_result_int64(context, rc);
-++}
-++
-++
-++#ifdef _WIN32
-++
-++#endif
-++int sqlite3_fileio_init(
-++  sqlite3 *db,
-++  char **pzErrMsg,
-++  const sqlite3_api_routines *pApi
-++){
-++  int rc = SQLITE_OK;
-++  SQLITE_EXTENSION_INIT2(pApi);
-++  (void)pzErrMsg;  /* Unused parameter */
-++  rc = sqlite3_create_function(db, "readfile", 1, SQLITE_UTF8, 0,
-++                               readfileFunc, 0, 0);
-++  if( rc==SQLITE_OK ){
-++    rc = sqlite3_create_function(db, "writefile", 2, SQLITE_UTF8, 0,
-++                                 writefileFunc, 0, 0);
-++  }
-++  return rc;
-++}
-++
-++/************************* End ../ext/misc/fileio.c ********************/
-++/************************* Begin ../ext/misc/completion.c ******************/
-++/*
-++** 2017-07-10
-++**
-++** The author disclaims copyright to this source code.  In place of
-++** a legal notice, here is a blessing:
-++**
-++**    May you do good and not evil.
-++**    May you find forgiveness for yourself and forgive others.
-++**    May you share freely, never taking more than you give.
-++**
-++*************************************************************************
-++**
-++** This file implements an eponymous virtual table that returns suggested
-++** completions for a partial SQL input.
-++**
-++** Suggested usage:
-++**
-++**     SELECT DISTINCT candidate COLLATE nocase
-++**       FROM completion($prefix,$wholeline)
-++**      ORDER BY 1;
-++**
-++** The two query parameters are optional.  $prefix is the text of the
-++** current word being typed and that is to be completed.  $wholeline is
-++** the complete input line, used for context.
-++**
-++** The raw completion() table might return the same candidate multiple
-++** times, for example if the same column name is used to two or more
-++** tables.  And the candidates are returned in an arbitrary order.  Hence,
-++** the DISTINCT and ORDER BY are recommended.
-++**
-++** This virtual table operates at the speed of human typing, and so there
-++** is no attempt to make it fast.  Even a slow implementation will be much
-++** faster than any human can type.
-++**
-++*/
-++SQLITE_EXTENSION_INIT1
-++#include <assert.h>
-++#include <string.h>
-++#include <ctype.h>
-++
-++#ifndef SQLITE_OMIT_VIRTUALTABLE
-++
-++/* completion_vtab is a subclass of sqlite3_vtab which will
-++** serve as the underlying representation of a completion virtual table
-++*/
-++typedef struct completion_vtab completion_vtab;
-++struct completion_vtab {
-++  sqlite3_vtab base;  /* Base class - must be first */
-++  sqlite3 *db;        /* Database connection for this completion vtab */
-++};
-++
-++/* completion_cursor is a subclass of sqlite3_vtab_cursor which will
-++** serve as the underlying representation of a cursor that scans
-++** over rows of the result
-++*/
-++typedef struct completion_cursor completion_cursor;
-++struct completion_cursor {
-++  sqlite3_vtab_cursor base;  /* Base class - must be first */
-++  sqlite3 *db;               /* Database connection for this cursor */
-++  int nPrefix, nLine;        /* Number of bytes in zPrefix and zLine */
-++  char *zPrefix;             /* The prefix for the word we want to complete */
-++  char *zLine;               /* The whole that we want to complete */
-++  const char *zCurrentRow;   /* Current output row */
-++  sqlite3_stmt *pStmt;       /* Current statement */
-++  sqlite3_int64 iRowid;      /* The rowid */
-++  int ePhase;                /* Current phase */
-++  int j;                     /* inter-phase counter */
-++};
-++
-++/* Values for ePhase:
-++*/
-++#define COMPLETION_FIRST_PHASE   1
-++#define COMPLETION_KEYWORDS      1
-++#define COMPLETION_PRAGMAS       2
-++#define COMPLETION_FUNCTIONS     3
-++#define COMPLETION_COLLATIONS    4
-++#define COMPLETION_INDEXES       5
-++#define COMPLETION_TRIGGERS      6
-++#define COMPLETION_DATABASES     7
-++#define COMPLETION_TABLES        8
-++#define COMPLETION_COLUMNS       9
-++#define COMPLETION_MODULES       10
-++#define COMPLETION_EOF           11
-++
-++/*
-++** The completionConnect() method is invoked to create a new
-++** completion_vtab that describes the completion virtual table.
-++**
-++** Think of this routine as the constructor for completion_vtab objects.
-++**
-++** All this routine needs to do is:
-++**
-++**    (1) Allocate the completion_vtab object and initialize all fields.
-++**
-++**    (2) Tell SQLite (via the sqlite3_declare_vtab() interface) what the
-++**        result set of queries against completion will look like.
-++*/
-++static int completionConnect(
-++  sqlite3 *db,
-++  void *pAux,
-++  int argc, const char *const*argv,
-++  sqlite3_vtab **ppVtab,
-++  char **pzErr
-++){
-++  completion_vtab *pNew;
-++  int rc;
-++
-++  (void)(pAux);    /* Unused parameter */
-++  (void)(argc);    /* Unused parameter */
-++  (void)(argv);    /* Unused parameter */
-++  (void)(pzErr);   /* Unused parameter */
-++
-++/* Column numbers */
-++#define COMPLETION_COLUMN_CANDIDATE 0  /* Suggested completion of the input */
-++#define COMPLETION_COLUMN_PREFIX    1  /* Prefix of the word to be completed */
-++#define COMPLETION_COLUMN_WHOLELINE 2  /* Entire line seen so far */
-++#define COMPLETION_COLUMN_PHASE     3  /* ePhase - used for debugging only */
-++
-++  rc = sqlite3_declare_vtab(db,
-++      "CREATE TABLE x("
-++      "  candidate TEXT,"
-++      "  prefix TEXT HIDDEN,"
-++      "  wholeline TEXT HIDDEN,"
-++      "  phase INT HIDDEN"        /* Used for debugging only */
-++      ")");
-++  if( rc==SQLITE_OK ){
-++    pNew = sqlite3_malloc( sizeof(*pNew) );
-++    *ppVtab = (sqlite3_vtab*)pNew;
-++    if( pNew==0 ) return SQLITE_NOMEM;
-++    memset(pNew, 0, sizeof(*pNew));
-++    pNew->db = db;
-++  }
-++  return rc;
-++}
-++
-++/*
-++** This method is the destructor for completion_cursor objects.
-++*/
-++static int completionDisconnect(sqlite3_vtab *pVtab){
-++  sqlite3_free(pVtab);
-++  return SQLITE_OK;
-++}
-++
-++/*
-++** Constructor for a new completion_cursor object.
-++*/
-++static int completionOpen(sqlite3_vtab *p, sqlite3_vtab_cursor **ppCursor){
-++  completion_cursor *pCur;
-++  pCur = sqlite3_malloc( sizeof(*pCur) );
-++  if( pCur==0 ) return SQLITE_NOMEM;
-++  memset(pCur, 0, sizeof(*pCur));
-++  pCur->db = ((completion_vtab*)p)->db;
-++  *ppCursor = &pCur->base;
-++  return SQLITE_OK;
-++}
-++
-++/*
-++** Reset the completion_cursor.
-++*/
-++static void completionCursorReset(completion_cursor *pCur){
-++  sqlite3_free(pCur->zPrefix);   pCur->zPrefix = 0;  pCur->nPrefix = 0;
-++  sqlite3_free(pCur->zLine);     pCur->zLine = 0;    pCur->nLine = 0;
-++  sqlite3_finalize(pCur->pStmt); pCur->pStmt = 0;
-++  pCur->j = 0;
-++}
-++
-++/*
-++** Destructor for a completion_cursor.
-++*/
-++static int completionClose(sqlite3_vtab_cursor *cur){
-++  completionCursorReset((completion_cursor*)cur);
-++  sqlite3_free(cur);
-++  return SQLITE_OK;
-++}
-++
-++/*
-++** All SQL keywords understood by SQLite
-++*/
-++static const char *completionKwrds[] = {
-++  "ABORT", "ACTION", "ADD", "AFTER", "ALL", "ALTER", "ANALYZE", "AND", "AS",
-++  "ASC", "ATTACH", "AUTOINCREMENT", "BEFORE", "BEGIN", "BETWEEN", "BY",
-++  "CASCADE", "CASE", "CAST", "CHECK", "COLLATE", "COLUMN", "COMMIT",
-++  "CONFLICT", "CONSTRAINT", "CREATE", "CROSS", "CURRENT_DATE",
-++  "CURRENT_TIME", "CURRENT_TIMESTAMP", "DATABASE", "DEFAULT", "DEFERRABLE",
-++  "DEFERRED", "DELETE", "DESC", "DETACH", "DISTINCT", "DROP", "EACH",
-++  "ELSE", "END", "ESCAPE", "EXCEPT", "EXCLUSIVE", "EXISTS", "EXPLAIN",
-++  "FAIL", "FOR", "FOREIGN", "FROM", "FULL", "GLOB", "GROUP", "HAVING", "IF",
-++  "IGNORE", "IMMEDIATE", "IN", "INDEX", "INDEXED", "INITIALLY", "INNER",
-++  "INSERT", "INSTEAD", "INTERSECT", "INTO", "IS", "ISNULL", "JOIN", "KEY",
-++  "LEFT", "LIKE", "LIMIT", "MATCH", "NATURAL", "NO", "NOT", "NOTNULL",
-++  "NULL", "OF", "OFFSET", "ON", "OR", "ORDER", "OUTER", "PLAN", "PRAGMA",
-++  "PRIMARY", "QUERY", "RAISE", "RECURSIVE", "REFERENCES", "REGEXP",
-++  "REINDEX", "RELEASE", "RENAME", "REPLACE", "RESTRICT", "RIGHT",
-++  "ROLLBACK", "ROW", "SAVEPOINT", "SELECT", "SET", "TABLE", "TEMP",
-++  "TEMPORARY", "THEN", "TO", "TRANSACTION", "TRIGGER", "UNION", "UNIQUE",
-++  "UPDATE", "USING", "VACUUM", "VALUES", "VIEW", "VIRTUAL", "WHEN", "WHERE",
-++  "WITH", "WITHOUT",
-++};
-++#define completionKwCount \
-++   (int)(sizeof(completionKwrds)/sizeof(completionKwrds[0]))
-++
-++/*
-++** Advance a completion_cursor to its next row of output.
-++**
-++** The ->ePhase, ->j, and ->pStmt fields of the completion_cursor object
-++** record the current state of the scan.  This routine sets ->zCurrentRow
-++** to the current row of output and then returns.  If no more rows remain,
-++** then ->ePhase is set to COMPLETION_EOF which will signal the virtual
-++** table that has reached the end of its scan.
-++**
-++** The current implementation just lists potential identifiers and
-++** keywords and filters them by zPrefix.  Future enhancements should
-++** take zLine into account to try to restrict the set of identifiers and
-++** keywords based on what would be legal at the current point of input.
-++*/
-++static int completionNext(sqlite3_vtab_cursor *cur){
-++  completion_cursor *pCur = (completion_cursor*)cur;
-++  int eNextPhase = 0;  /* Next phase to try if current phase reaches end */
-++  int iCol = -1;       /* If >=0, step pCur->pStmt and use the i-th column */
-++  pCur->iRowid++;
-++  while( pCur->ePhase!=COMPLETION_EOF ){
-++    switch( pCur->ePhase ){
-++      case COMPLETION_KEYWORDS: {
-++        if( pCur->j >= completionKwCount ){
-++          pCur->zCurrentRow = 0;
-++          pCur->ePhase = COMPLETION_DATABASES;
-++        }else{
-++          pCur->zCurrentRow = completionKwrds[pCur->j++];
-++        }
-++        iCol = -1;
-++        break;
-++      }
-++      case COMPLETION_DATABASES: {
-++        if( pCur->pStmt==0 ){
-++          sqlite3_prepare_v2(pCur->db, "PRAGMA database_list", -1,
-++                             &pCur->pStmt, 0);
-++        }
-++        iCol = 1;
-++        eNextPhase = COMPLETION_TABLES;
-++        break;
-++      }
-++      case COMPLETION_TABLES: {
-++        if( pCur->pStmt==0 ){
-++          sqlite3_stmt *pS2;
-++          char *zSql = 0;
-++          const char *zSep = "";
-++          sqlite3_prepare_v2(pCur->db, "PRAGMA database_list", -1, &pS2, 0);
-++          while( sqlite3_step(pS2)==SQLITE_ROW ){
-++            const char *zDb = (const char*)sqlite3_column_text(pS2, 1);
-++            zSql = sqlite3_mprintf(
-++               "%z%s"
-++               "SELECT name FROM \"%w\".sqlite_master"
-++               " WHERE type='table'",
-++               zSql, zSep, zDb
-++            );
-++            if( zSql==0 ) return SQLITE_NOMEM;
-++            zSep = " UNION ";
-++          }
-++          sqlite3_finalize(pS2);
-++          sqlite3_prepare_v2(pCur->db, zSql, -1, &pCur->pStmt, 0);
-++          sqlite3_free(zSql);
-++        }
-++        iCol = 0;
-++        eNextPhase = COMPLETION_COLUMNS;
-++        break;
-++      }
-++      case COMPLETION_COLUMNS: {
-++        if( pCur->pStmt==0 ){
-++          sqlite3_stmt *pS2;
-++          char *zSql = 0;
-++          const char *zSep = "";
-++          sqlite3_prepare_v2(pCur->db, "PRAGMA database_list", -1, &pS2, 0);
-++          while( sqlite3_step(pS2)==SQLITE_ROW ){
-++            const char *zDb = (const char*)sqlite3_column_text(pS2, 1);
-++            zSql = sqlite3_mprintf(
-++               "%z%s"
-++               "SELECT pti.name FROM \"%w\".sqlite_master AS sm"
-++                       " JOIN pragma_table_info(sm.name,%Q) AS pti"
-++               " WHERE sm.type='table'",
-++               zSql, zSep, zDb, zDb
-++            );
-++            if( zSql==0 ) return SQLITE_NOMEM;
-++            zSep = " UNION ";
-++          }
-++          sqlite3_finalize(pS2);
-++          sqlite3_prepare_v2(pCur->db, zSql, -1, &pCur->pStmt, 0);
-++          sqlite3_free(zSql);
-++        }
-++        iCol = 0;
-++        eNextPhase = COMPLETION_EOF;
-++        break;
-++      }
-++    }
-++    if( iCol<0 ){
-++      /* This case is when the phase presets zCurrentRow */
-++      if( pCur->zCurrentRow==0 ) continue;
-++    }else{
-++      if( sqlite3_step(pCur->pStmt)==SQLITE_ROW ){
-++        /* Extract the next row of content */
-++        pCur->zCurrentRow = (const char*)sqlite3_column_text(pCur->pStmt, iCol);
-++      }else{
-++        /* When all rows are finished, advance to the next phase */
-++        sqlite3_finalize(pCur->pStmt);
-++        pCur->pStmt = 0;
-++        pCur->ePhase = eNextPhase;
-++        continue;
-++      }
-++    }
-++    if( pCur->nPrefix==0 ) break;
-++    if( sqlite3_strnicmp(pCur->zPrefix, pCur->zCurrentRow, pCur->nPrefix)==0 ){
-++      break;
-++    }
-++  }
-++
-++  return SQLITE_OK;
-++}
-++
-++/*
-++** Return values of columns for the row at which the completion_cursor
-++** is currently pointing.
-++*/
-++static int completionColumn(
-++  sqlite3_vtab_cursor *cur,   /* The cursor */
-++  sqlite3_context *ctx,       /* First argument to sqlite3_result_...() */
-++  int i                       /* Which column to return */
-++){
-++  completion_cursor *pCur = (completion_cursor*)cur;
-++  switch( i ){
-++    case COMPLETION_COLUMN_CANDIDATE: {
-++      sqlite3_result_text(ctx, pCur->zCurrentRow, -1, SQLITE_TRANSIENT);
-++      break;
-++    }
-++    case COMPLETION_COLUMN_PREFIX: {
-++      sqlite3_result_text(ctx, pCur->zPrefix, -1, SQLITE_TRANSIENT);
-++      break;
-++    }
-++    case COMPLETION_COLUMN_WHOLELINE: {
-++      sqlite3_result_text(ctx, pCur->zLine, -1, SQLITE_TRANSIENT);
-++      break;
-++    }
-++    case COMPLETION_COLUMN_PHASE: {
-++      sqlite3_result_int(ctx, pCur->ePhase);
-++      break;
-++    }
-++  }
-++  return SQLITE_OK;
-++}
-++
-++/*
-++** Return the rowid for the current row.  In this implementation, the
-++** rowid is the same as the output value.
-++*/
-++static int completionRowid(sqlite3_vtab_cursor *cur, sqlite_int64 *pRowid){
-++  completion_cursor *pCur = (completion_cursor*)cur;
-++  *pRowid = pCur->iRowid;
-++  return SQLITE_OK;
-++}
-++
-++/*
-++** Return TRUE if the cursor has been moved off of the last
-++** row of output.
-++*/
-++static int completionEof(sqlite3_vtab_cursor *cur){
-++  completion_cursor *pCur = (completion_cursor*)cur;
-++  return pCur->ePhase >= COMPLETION_EOF;
-++}
-++
-++/*
-++** This method is called to "rewind" the completion_cursor object back
-++** to the first row of output.  This method is always called at least
-++** once prior to any call to completionColumn() or completionRowid() or
-++** completionEof().
-++*/
-++static int completionFilter(
-++  sqlite3_vtab_cursor *pVtabCursor,
-++  int idxNum, const char *idxStr,
-++  int argc, sqlite3_value **argv
-++){
-++  completion_cursor *pCur = (completion_cursor *)pVtabCursor;
-++  int iArg = 0;
-++  (void)(idxStr);   /* Unused parameter */
-++  (void)(argc);     /* Unused parameter */
-++  completionCursorReset(pCur);
-++  if( idxNum & 1 ){
-++    pCur->nPrefix = sqlite3_value_bytes(argv[iArg]);
-++    if( pCur->nPrefix>0 ){
-++      pCur->zPrefix = sqlite3_mprintf("%s", sqlite3_value_text(argv[iArg]));
-++      if( pCur->zPrefix==0 ) return SQLITE_NOMEM;
-++    }
-++    iArg++;
-++  }
-++  if( idxNum & 2 ){
-++    pCur->nLine = sqlite3_value_bytes(argv[iArg]);
-++    if( pCur->nLine>0 ){
-++      pCur->zLine = sqlite3_mprintf("%s", sqlite3_value_text(argv[iArg]));
-++      if( pCur->zLine==0 ) return SQLITE_NOMEM;
-++    }
-++    iArg++;
-++  }
-++  if( pCur->zLine!=0 && pCur->zPrefix==0 ){
-++    int i = pCur->nLine;
-++    while( i>0 && (isalnum(pCur->zLine[i-1]) || pCur->zLine[i-1]=='_') ){
-++      i--;
-++    }
-++    pCur->nPrefix = pCur->nLine - i;
-++    if( pCur->nPrefix>0 ){
-++      pCur->zPrefix = sqlite3_mprintf("%.*s", pCur->nPrefix, pCur->zLine + i);
-++      if( pCur->zPrefix==0 ) return SQLITE_NOMEM;
-++    }
-++  }
-++  pCur->iRowid = 0;
-++  pCur->ePhase = COMPLETION_FIRST_PHASE;
-++  return completionNext(pVtabCursor);
-++}
-++
-++/*
-++** SQLite will invoke this method one or more times while planning a query
-++** that uses the completion virtual table.  This routine needs to create
-++** a query plan for each invocation and compute an estimated cost for that
-++** plan.
-++**
-++** There are two hidden parameters that act as arguments to the table-valued
-++** function:  "prefix" and "wholeline".  Bit 0 of idxNum is set if "prefix"
-++** is available and bit 1 is set if "wholeline" is available.
-++*/
-++static int completionBestIndex(
-++  sqlite3_vtab *tab,
-++  sqlite3_index_info *pIdxInfo
-++){
-++  int i;                 /* Loop over constraints */
-++  int idxNum = 0;        /* The query plan bitmask */
-++  int prefixIdx = -1;    /* Index of the start= constraint, or -1 if none */
-++  int wholelineIdx = -1; /* Index of the stop= constraint, or -1 if none */
-++  int nArg = 0;          /* Number of arguments that completeFilter() expects */
-++  const struct sqlite3_index_constraint *pConstraint;
-++
-++  (void)(tab);    /* Unused parameter */
-++  pConstraint = pIdxInfo->aConstraint;
-++  for(i=0; i<pIdxInfo->nConstraint; i++, pConstraint++){
-++    if( pConstraint->usable==0 ) continue;
-++    if( pConstraint->op!=SQLITE_INDEX_CONSTRAINT_EQ ) continue;
-++    switch( pConstraint->iColumn ){
-++      case COMPLETION_COLUMN_PREFIX:
-++        prefixIdx = i;
-++        idxNum |= 1;
-++        break;
-++      case COMPLETION_COLUMN_WHOLELINE:
-++        wholelineIdx = i;
-++        idxNum |= 2;
-++        break;
-++    }
-++  }
-++  if( prefixIdx>=0 ){
-++    pIdxInfo->aConstraintUsage[prefixIdx].argvIndex = ++nArg;
-++    pIdxInfo->aConstraintUsage[prefixIdx].omit = 1;
-++  }
-++  if( wholelineIdx>=0 ){
-++    pIdxInfo->aConstraintUsage[wholelineIdx].argvIndex = ++nArg;
-++    pIdxInfo->aConstraintUsage[wholelineIdx].omit = 1;
-++  }
-++  pIdxInfo->idxNum = idxNum;
-++  pIdxInfo->estimatedCost = (double)5000 - 1000*nArg;
-++  pIdxInfo->estimatedRows = 500 - 100*nArg;
-++  return SQLITE_OK;
-++}
-++
-++/*
-++** This following structure defines all the methods for the
-++** completion virtual table.
-++*/
-++static sqlite3_module completionModule = {
-++  0,                         /* iVersion */
-++  0,                         /* xCreate */
-++  completionConnect,         /* xConnect */
-++  completionBestIndex,       /* xBestIndex */
-++  completionDisconnect,      /* xDisconnect */
-++  0,                         /* xDestroy */
-++  completionOpen,            /* xOpen - open a cursor */
-++  completionClose,           /* xClose - close a cursor */
-++  completionFilter,          /* xFilter - configure scan constraints */
-++  completionNext,            /* xNext - advance a cursor */
-++  completionEof,             /* xEof - check for end of scan */
-++  completionColumn,          /* xColumn - read data */
-++  completionRowid,           /* xRowid - read data */
-++  0,                         /* xUpdate */
-++  0,                         /* xBegin */
-++  0,                         /* xSync */
-++  0,                         /* xCommit */
-++  0,                         /* xRollback */
-++  0,                         /* xFindMethod */
-++  0,                         /* xRename */
-++  0,                         /* xSavepoint */
-++  0,                         /* xRelease */
-++  0                          /* xRollbackTo */
-++};
-++
-++#endif /* SQLITE_OMIT_VIRTUALTABLE */
-++
-++int sqlite3CompletionVtabInit(sqlite3 *db){
-++  int rc = SQLITE_OK;
-++#ifndef SQLITE_OMIT_VIRTUALTABLE
-++  rc = sqlite3_create_module(db, "completion", &completionModule, 0);
-++#endif
-++  return rc;
-++}
-++
-++#ifdef _WIN32
-++
-++#endif
-++int sqlite3_completion_init(
-++  sqlite3 *db,
-++  char **pzErrMsg,
-++  const sqlite3_api_routines *pApi
-++){
-++  int rc = SQLITE_OK;
-++  SQLITE_EXTENSION_INIT2(pApi);
-++  (void)(pzErrMsg);  /* Unused parameter */
-++#ifndef SQLITE_OMIT_VIRTUALTABLE
-++  rc = sqlite3CompletionVtabInit(db);
-++#endif
-++  return rc;
-++}
-++
-++/************************* End ../ext/misc/completion.c ********************/
-++
-++#if defined(SQLITE_ENABLE_SESSION)
-++/*
-++** State information for a single open session
-++*/
-++typedef struct OpenSession OpenSession;
-++struct OpenSession {
-++  char *zName;             /* Symbolic name for this session */
-++  int nFilter;             /* Number of xFilter rejection GLOB patterns */
-++  char **azFilter;         /* Array of xFilter rejection GLOB patterns */
-++  sqlite3_session *p;      /* The open session */
-++};
-++#endif
-++
-++/*
-++** Shell output mode information from before ".explain on",
-++** saved so that it can be restored by ".explain off"
-++*/
-++typedef struct SavedModeInfo SavedModeInfo;
-++struct SavedModeInfo {
-++  int valid;          /* Is there legit data in here? */
-++  int mode;           /* Mode prior to ".explain on" */
-++  int showHeader;     /* The ".header" setting prior to ".explain on" */
-++  int colWidth[100];  /* Column widths prior to ".explain on" */
-++};
-++
-++/*
-++** State information about the database connection is contained in an
-++** instance of the following structure.
-++*/
-++typedef struct ShellState ShellState;
-++struct ShellState {
-++  sqlite3 *db;           /* The database */
-++  int autoExplain;       /* Automatically turn on .explain mode */
-++  int autoEQP;           /* Run EXPLAIN QUERY PLAN prior to seach SQL stmt */
-++  int statsOn;           /* True to display memory stats before each finalize */
-++  int scanstatsOn;       /* True to display scan stats before each finalize */
-++  int outCount;          /* Revert to stdout when reaching zero */
-++  int cnt;               /* Number of records displayed so far */
-++  FILE *out;             /* Write results here */
-++  FILE *traceOut;        /* Output for sqlite3_trace() */
-++  int nErr;              /* Number of errors seen */
-++  int mode;              /* An output mode setting */
-++  int cMode;             /* temporary output mode for the current query */
-++  int normalMode;        /* Output mode before ".explain on" */
-++  int writableSchema;    /* True if PRAGMA writable_schema=ON */
-++  int showHeader;        /* True to show column names in List or Column mode */
-++  int nCheck;            /* Number of ".check" commands run */
-++  unsigned shellFlgs;    /* Various flags */
-++  char *zDestTable;      /* Name of destination table when MODE_Insert */
-++  char zTestcase[30];    /* Name of current test case */
-++  char colSeparator[20]; /* Column separator character for several modes */
-++  char rowSeparator[20]; /* Row separator character for MODE_Ascii */
-++  int colWidth[100];     /* Requested width of each column when in column mode*/
-++  int actualWidth[100];  /* Actual width of each column */
-++  char nullValue[20];    /* The text to print when a NULL comes back from
-++                         ** the database */
-++  char outfile[FILENAME_MAX]; /* Filename for *out */
-++  const char *zDbFilename;    /* name of the database file */
-++  char *zFreeOnClose;         /* Filename to free when closing */
-++  const char *zVfs;           /* Name of VFS to use */
-++  sqlite3_stmt *pStmt;   /* Current statement if any. */
-++  FILE *pLog;            /* Write log output here */
-++  int *aiIndent;         /* Array of indents used in MODE_Explain */
-++  int nIndent;           /* Size of array aiIndent[] */
-++  int iIndent;           /* Index of current op in aiIndent[] */
-++#if defined(SQLITE_ENABLE_SESSION)
-++  int nSession;             /* Number of active sessions */
-++  OpenSession aSession[4];  /* Array of sessions.  [0] is in focus. */
-++#endif
-++};
-++
-++/*
-++** These are the allowed shellFlgs values
-++*/
-++#define SHFLG_Pagecache      0x00000001 /* The --pagecache option is used */
-++#define SHFLG_Lookaside      0x00000002 /* Lookaside memory is used */
-++#define SHFLG_Backslash      0x00000004 /* The --backslash option is used */
-++#define SHFLG_PreserveRowid  0x00000008 /* .dump preserves rowid values */
-++#define SHFLG_Newlines       0x00000010 /* .dump --newline flag */
-++#define SHFLG_CountChanges   0x00000020 /* .changes setting */
-++#define SHFLG_Echo           0x00000040 /* .echo or --echo setting */
-++
-++/*
-++** Macros for testing and setting shellFlgs
-++*/
-++#define ShellHasFlag(P,X)    (((P)->shellFlgs & (X))!=0)
-++#define ShellSetFlag(P,X)    ((P)->shellFlgs|=(X))
-++#define ShellClearFlag(P,X)  ((P)->shellFlgs&=(~(X)))
-++
-++/*
-++** These are the allowed modes.
-++*/
-++#define MODE_Line     0  /* One column per line.  Blank line between records */
-++#define MODE_Column   1  /* One record per line in neat columns */
-++#define MODE_List     2  /* One record per line with a separator */
-++#define MODE_Semi     3  /* Same as MODE_List but append ";" to each line */
-++#define MODE_Html     4  /* Generate an XHTML table */
-++#define MODE_Insert   5  /* Generate SQL "insert" statements */
-++#define MODE_Quote    6  /* Quote values as for SQL */
-++#define MODE_Tcl      7  /* Generate ANSI-C or TCL quoted elements */
-++#define MODE_Csv      8  /* Quote strings, numbers are plain */
-++#define MODE_Explain  9  /* Like MODE_Column, but do not truncate data */
-++#define MODE_Ascii   10  /* Use ASCII unit and record separators (0x1F/0x1E) */
-++#define MODE_Pretty  11  /* Pretty-print schemas */
-++
-++static const char *modeDescr[] = {
-++  "line",
-++  "column",
-++  "list",
-++  "semi",
-++  "html",
-++  "insert",
-++  "quote",
-++  "tcl",
-++  "csv",
-++  "explain",
-++  "ascii",
-++  "prettyprint",
-++};
-++
-++/*
-++** These are the column/row/line separators used by the various
-++** import/export modes.
-++*/
-++#define SEP_Column    "|"
-++#define SEP_Row       "\n"
-++#define SEP_Tab       "\t"
-++#define SEP_Space     " "
-++#define SEP_Comma     ","
-++#define SEP_CrLf      "\r\n"
-++#define SEP_Unit      "\x1F"
-++#define SEP_Record    "\x1E"
-++
-++/*
-++** Number of elements in an array
-++*/
-++#define ArraySize(X)  (int)(sizeof(X)/sizeof(X[0]))
-++
-++/*
-++** A callback for the sqlite3_log() interface.
-++*/
-++static void shellLog(void *pArg, int iErrCode, const char *zMsg){
-++  ShellState *p = (ShellState*)pArg;
-++  if( p->pLog==0 ) return;
-++  utf8_printf(p->pLog, "(%d) %s\n", iErrCode, zMsg);
-++  fflush(p->pLog);
-++}
-++
-++/*
-++** Output the given string as a hex-encoded blob (eg. X'1234' )
-++*/
-++static void output_hex_blob(FILE *out, const void *pBlob, int nBlob){
-++  int i;
-++  char *zBlob = (char *)pBlob;
-++  raw_printf(out,"X'");
-++  for(i=0; i<nBlob; i++){ raw_printf(out,"%02x",zBlob[i]&0xff); }
-++  raw_printf(out,"'");
-++}
-++
-++/*
-++** Find a string that is not found anywhere in z[].  Return a pointer
-++** to that string.
-++**
-++** Try to use zA and zB first.  If both of those are already found in z[]
-++** then make up some string and store it in the buffer zBuf.
-++*/
-++static const char *unused_string(
-++  const char *z,                    /* Result must not appear anywhere in z */
-++  const char *zA, const char *zB,   /* Try these first */
-++  char *zBuf                        /* Space to store a generated string */
-++){
-++  unsigned i = 0;
-++  if( strstr(z, zA)==0 ) return zA;
-++  if( strstr(z, zB)==0 ) return zB;
-++  do{
-++    sqlite3_snprintf(20,zBuf,"(%s%u)", zA, i++);
-++  }while( strstr(z,zBuf)!=0 );
-++  return zBuf;
-++}
-++
-++/*
-++** Output the given string as a quoted string using SQL quoting conventions.
-++**
-++** See also: output_quoted_escaped_string()
-++*/
-++static void output_quoted_string(FILE *out, const char *z){
-++  int i;
-++  char c;
-++  setBinaryMode(out, 1);
-++  for(i=0; (c = z[i])!=0 && c!='\''; i++){}
-++  if( c==0 ){
-++    utf8_printf(out,"'%s'",z);
-++  }else{
-++    raw_printf(out, "'");
-++    while( *z ){
-++      for(i=0; (c = z[i])!=0 && c!='\''; i++){}
-++      if( c=='\'' ) i++;
-++      if( i ){
-++        utf8_printf(out, "%.*s", i, z);
-++        z += i;
-++      }
-++      if( c=='\'' ){
-++        raw_printf(out, "'");
-++        continue;
-++      }
-++      if( c==0 ){
-++        break;
-++      }
-++      z++;
-++    }
-++    raw_printf(out, "'");
-++  }
-++  setTextMode(out, 1);
-++}
-++
-++/*
-++** Output the given string as a quoted string using SQL quoting conventions.
-++** Additionallly , escape the "\n" and "\r" characters so that they do not
-++** get corrupted by end-of-line translation facilities in some operating
-++** systems.
-++**
-++** This is like output_quoted_string() but with the addition of the \r\n
-++** escape mechanism.
-++*/
-++static void output_quoted_escaped_string(FILE *out, const char *z){
-++  int i;
-++  char c;
-++  setBinaryMode(out, 1);
-++  for(i=0; (c = z[i])!=0 && c!='\'' && c!='\n' && c!='\r'; i++){}
-++  if( c==0 ){
-++    utf8_printf(out,"'%s'",z);
-++  }else{
-++    const char *zNL = 0;
-++    const char *zCR = 0;
-++    int nNL = 0;
-++    int nCR = 0;
-++    char zBuf1[20], zBuf2[20];
-++    for(i=0; z[i]; i++){
-++      if( z[i]=='\n' ) nNL++;
-++      if( z[i]=='\r' ) nCR++;
-++    }
-++    if( nNL ){
-++      raw_printf(out, "replace(");
-++      zNL = unused_string(z, "\\n", "\\012", zBuf1);
-++    }
-++    if( nCR ){
-++      raw_printf(out, "replace(");
-++      zCR = unused_string(z, "\\r", "\\015", zBuf2);
-++    }
-++    raw_printf(out, "'");
-++    while( *z ){
-++      for(i=0; (c = z[i])!=0 && c!='\n' && c!='\r' && c!='\''; i++){}
-++      if( c=='\'' ) i++;
-++      if( i ){
-++        utf8_printf(out, "%.*s", i, z);
-++        z += i;
-++      }
-++      if( c=='\'' ){
-++        raw_printf(out, "'");
-++        continue;
-++      }
-++      if( c==0 ){
-++        break;
-++      }
-++      z++;
-++      if( c=='\n' ){
-++        raw_printf(out, "%s", zNL);
-++        continue;
-++      }
-++      raw_printf(out, "%s", zCR);
-++    }
-++    raw_printf(out, "'");
-++    if( nCR ){
-++      raw_printf(out, ",'%s',char(13))", zCR);
-++    }
-++    if( nNL ){
-++      raw_printf(out, ",'%s',char(10))", zNL);
-++    }
-++  }
-++  setTextMode(out, 1);
-++}
-++
-++/*
-++** Output the given string as a quoted according to C or TCL quoting rules.
-++*/
-++static void output_c_string(FILE *out, const char *z){
-++  unsigned int c;
-++  fputc('"', out);
-++  while( (c = *(z++))!=0 ){
-++    if( c=='\\' ){
-++      fputc(c, out);
-++      fputc(c, out);
-++    }else if( c=='"' ){
-++      fputc('\\', out);
-++      fputc('"', out);
-++    }else if( c=='\t' ){
-++      fputc('\\', out);
-++      fputc('t', out);
-++    }else if( c=='\n' ){
-++      fputc('\\', out);
-++      fputc('n', out);
-++    }else if( c=='\r' ){
-++      fputc('\\', out);
-++      fputc('r', out);
-++    }else if( !isprint(c&0xff) ){
-++      raw_printf(out, "\\%03o", c&0xff);
-++    }else{
-++      fputc(c, out);
-++    }
-++  }
-++  fputc('"', out);
-++}
-++
-++/*
-++** Output the given string with characters that are special to
-++** HTML escaped.
-++*/
-++static void output_html_string(FILE *out, const char *z){
-++  int i;
-++  if( z==0 ) z = "";
-++  while( *z ){
-++    for(i=0;   z[i]
-++            && z[i]!='<'
-++            && z[i]!='&'
-++            && z[i]!='>'
-++            && z[i]!='\"'
-++            && z[i]!='\'';
-++        i++){}
-++    if( i>0 ){
-++      utf8_printf(out,"%.*s",i,z);
-++    }
-++    if( z[i]=='<' ){
-++      raw_printf(out,"&lt;");
-++    }else if( z[i]=='&' ){
-++      raw_printf(out,"&amp;");
-++    }else if( z[i]=='>' ){
-++      raw_printf(out,"&gt;");
-++    }else if( z[i]=='\"' ){
-++      raw_printf(out,"&quot;");
-++    }else if( z[i]=='\'' ){
-++      raw_printf(out,"&#39;");
-++    }else{
-++      break;
-++    }
-++    z += i + 1;
-++  }
-++}
-++
-++/*
-++** If a field contains any character identified by a 1 in the following
-++** array, then the string must be quoted for CSV.
-++*/
-++static const char needCsvQuote[] = {
-++  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-++  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-++  1, 0, 1, 0, 0, 0, 0, 1,   0, 0, 0, 0, 0, 0, 0, 0,
-++  0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
-++  0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
-++  0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
-++  0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
-++  0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 1,
-++  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-++  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-++  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-++  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-++  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-++  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-++  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-++  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-++};
-++
-++/*
-++** Output a single term of CSV.  Actually, p->colSeparator is used for
-++** the separator, which may or may not be a comma.  p->nullValue is
-++** the null value.  Strings are quoted if necessary.  The separator
-++** is only issued if bSep is true.
-++*/
-++static void output_csv(ShellState *p, const char *z, int bSep){
-++  FILE *out = p->out;
-++  if( z==0 ){
-++    utf8_printf(out,"%s",p->nullValue);
-++  }else{
-++    int i;
-++    int nSep = strlen30(p->colSeparator);
-++    for(i=0; z[i]; i++){
-++      if( needCsvQuote[((unsigned char*)z)[i]]
-++         || (z[i]==p->colSeparator[0] &&
-++             (nSep==1 || memcmp(z, p->colSeparator, nSep)==0)) ){
-++        i = 0;
-++        break;
-++      }
-++    }
-++    if( i==0 ){
-++      putc('"', out);
-++      for(i=0; z[i]; i++){
-++        if( z[i]=='"' ) putc('"', out);
-++        putc(z[i], out);
-++      }
-++      putc('"', out);
-++    }else{
-++      utf8_printf(out, "%s", z);
-++    }
-++  }
-++  if( bSep ){
-++    utf8_printf(p->out, "%s", p->colSeparator);
-++  }
-++}
-++
-++#ifdef SIGINT
-++/*
-++** This routine runs when the user presses Ctrl-C
-++*/
-++static void interrupt_handler(int NotUsed){
-++  UNUSED_PARAMETER(NotUsed);
-++  seenInterrupt++;
-++  if( seenInterrupt>2 ) exit(1);
-++  if( globalDb ) sqlite3_interrupt(globalDb);
-++}
-++#endif
-++
-++#ifndef SQLITE_OMIT_AUTHORIZATION
-++/*
-++** When the ".auth ON" is set, the following authorizer callback is
-++** invoked.  It always returns SQLITE_OK.
-++*/
-++static int shellAuth(
-++  void *pClientData,
-++  int op,
-++  const char *zA1,
-++  const char *zA2,
-++  const char *zA3,
-++  const char *zA4
-++){
-++  ShellState *p = (ShellState*)pClientData;
-++  static const char *azAction[] = { 0,
-++     "CREATE_INDEX",         "CREATE_TABLE",         "CREATE_TEMP_INDEX",
-++     "CREATE_TEMP_TABLE",    "CREATE_TEMP_TRIGGER",  "CREATE_TEMP_VIEW",
-++     "CREATE_TRIGGER",       "CREATE_VIEW",          "DELETE",
-++     "DROP_INDEX",           "DROP_TABLE",           "DROP_TEMP_INDEX",
-++     "DROP_TEMP_TABLE",      "DROP_TEMP_TRIGGER",    "DROP_TEMP_VIEW",
-++     "DROP_TRIGGER",         "DROP_VIEW",            "INSERT",
-++     "PRAGMA",               "READ",                 "SELECT",
-++     "TRANSACTION",          "UPDATE",               "ATTACH",
-++     "DETACH",               "ALTER_TABLE",          "REINDEX",
-++     "ANALYZE",              "CREATE_VTABLE",        "DROP_VTABLE",
-++     "FUNCTION",             "SAVEPOINT",            "RECURSIVE"
-++  };
-++  int i;
-++  const char *az[4];
-++  az[0] = zA1;
-++  az[1] = zA2;
-++  az[2] = zA3;
-++  az[3] = zA4;
-++  utf8_printf(p->out, "authorizer: %s", azAction[op]);
-++  for(i=0; i<4; i++){
-++    raw_printf(p->out, " ");
-++    if( az[i] ){
-++      output_c_string(p->out, az[i]);
-++    }else{
-++      raw_printf(p->out, "NULL");
-++    }
-++  }
-++  raw_printf(p->out, "\n");
-++  return SQLITE_OK;
-++}
-++#endif
-++
-++/*
-++** Print a schema statement.  Part of MODE_Semi and MODE_Pretty output.
-++**
-++** This routine converts some CREATE TABLE statements for shadow tables
-++** in FTS3/4/5 into CREATE TABLE IF NOT EXISTS statements.
-++*/
-++static void printSchemaLine(FILE *out, const char *z, const char *zTail){
-++  if( sqlite3_strglob("CREATE TABLE ['\"]*", z)==0 ){
-++    utf8_printf(out, "CREATE TABLE IF NOT EXISTS %s%s", z+13, zTail);
-++  }else{
-++    utf8_printf(out, "%s%s", z, zTail);
-++  }
-++}
-++static void printSchemaLineN(FILE *out, char *z, int n, const char *zTail){
-++  char c = z[n];
-++  z[n] = 0;
-++  printSchemaLine(out, z, zTail);
-++  z[n] = c;
-++}
-++
-++/*
-++** This is the callback routine that the shell
-++** invokes for each row of a query result.
-++*/
-++static int shell_callback(
-++  void *pArg,
-++  int nArg,        /* Number of result columns */
-++  char **azArg,    /* Text of each result column */
-++  char **azCol,    /* Column names */
-++  int *aiType      /* Column types */
-++){
-++  int i;
-++  ShellState *p = (ShellState*)pArg;
-++
-++  if( azArg==0 ) return 0;
-++  switch( p->cMode ){
-++    case MODE_Line: {
-++      int w = 5;
-++      if( azArg==0 ) break;
-++      for(i=0; i<nArg; i++){
-++        int len = strlen30(azCol[i] ? azCol[i] : "");
-++        if( len>w ) w = len;
-++      }
-++      if( p->cnt++>0 ) utf8_printf(p->out, "%s", p->rowSeparator);
-++      for(i=0; i<nArg; i++){
-++        utf8_printf(p->out,"%*s = %s%s", w, azCol[i],
-++                azArg[i] ? azArg[i] : p->nullValue, p->rowSeparator);
-++      }
-++      break;
-++    }
-++    case MODE_Explain:
-++    case MODE_Column: {
-++      static const int aExplainWidths[] = {4, 13, 4, 4, 4, 13, 2, 13};
-++      const int *colWidth;
-++      int showHdr;
-++      char *rowSep;
-++      if( p->cMode==MODE_Column ){
-++        colWidth = p->colWidth;
-++        showHdr = p->showHeader;
-++        rowSep = p->rowSeparator;
-++      }else{
-++        colWidth = aExplainWidths;
-++        showHdr = 1;
-++        rowSep = SEP_Row;
-++      }
-++      if( p->cnt++==0 ){
-++        for(i=0; i<nArg; i++){
-++          int w, n;
-++          if( i<ArraySize(p->colWidth) ){
-++            w = colWidth[i];
-++          }else{
-++            w = 0;
-++          }
-++          if( w==0 ){
-++            w = strlenChar(azCol[i] ? azCol[i] : "");
-++            if( w<10 ) w = 10;
-++            n = strlenChar(azArg && azArg[i] ? azArg[i] : p->nullValue);
-++            if( w<n ) w = n;
-++          }
-++          if( i<ArraySize(p->actualWidth) ){
-++            p->actualWidth[i] = w;
-++          }
-++          if( showHdr ){
-++            utf8_width_print(p->out, w, azCol[i]);
-++            utf8_printf(p->out, "%s", i==nArg-1 ? rowSep : "  ");
-++          }
-++        }
-++        if( showHdr ){
-++          for(i=0; i<nArg; i++){
-++            int w;
-++            if( i<ArraySize(p->actualWidth) ){
-++               w = p->actualWidth[i];
-++               if( w<0 ) w = -w;
-++            }else{
-++               w = 10;
-++            }
-++            utf8_printf(p->out,"%-*.*s%s",w,w,
-++                   "----------------------------------------------------------"
-++                   "----------------------------------------------------------",
-++                    i==nArg-1 ? rowSep : "  ");
-++          }
-++        }
-++      }
-++      if( azArg==0 ) break;
-++      for(i=0; i<nArg; i++){
-++        int w;
-++        if( i<ArraySize(p->actualWidth) ){
-++           w = p->actualWidth[i];
-++        }else{
-++           w = 10;
-++        }
-++        if( p->cMode==MODE_Explain && azArg[i] && strlenChar(azArg[i])>w ){
-++          w = strlenChar(azArg[i]);
-++        }
-++        if( i==1 && p->aiIndent && p->pStmt ){
-++          if( p->iIndent<p->nIndent ){
-++            utf8_printf(p->out, "%*.s", p->aiIndent[p->iIndent], "");
-++          }
-++          p->iIndent++;
-++        }
-++        utf8_width_print(p->out, w, azArg[i] ? azArg[i] : p->nullValue);
-++        utf8_printf(p->out, "%s", i==nArg-1 ? rowSep : "  ");
-++      }
-++      break;
-++    }
-++    case MODE_Semi: {   /* .schema and .fullschema output */
-++      printSchemaLine(p->out, azArg[0], ";\n");
-++      break;
-++    }
-++    case MODE_Pretty: {  /* .schema and .fullschema with --indent */
-++      char *z;
-++      int j;
-++      int nParen = 0;
-++      char cEnd = 0;
-++      char c;
-++      int nLine = 0;
-++      assert( nArg==1 );
-++      if( azArg[0]==0 ) break;
-++      if( sqlite3_strlike("CREATE VIEW%", azArg[0], 0)==0
-++       || sqlite3_strlike("CREATE TRIG%", azArg[0], 0)==0
-++      ){
-++        utf8_printf(p->out, "%s;\n", azArg[0]);
-++        break;
-++      }
-++      z = sqlite3_mprintf("%s", azArg[0]);
-++      j = 0;
-++      for(i=0; IsSpace(z[i]); i++){}
-++      for(; (c = z[i])!=0; i++){
-++        if( IsSpace(c) ){
-++          if( z[j-1]=='\r' ) z[j-1] = '\n';
-++          if( IsSpace(z[j-1]) || z[j-1]=='(' ) continue;
-++        }else if( (c=='(' || c==')') && j>0 && IsSpace(z[j-1]) ){
-++          j--;
-++        }
-++        z[j++] = c;
-++      }
-++      while( j>0 && IsSpace(z[j-1]) ){ j--; }
-++      z[j] = 0;
-++      if( strlen30(z)>=79 ){
-++        for(i=j=0; (c = z[i])!=0; i++){
-++          if( c==cEnd ){
-++            cEnd = 0;
-++          }else if( c=='"' || c=='\'' || c=='`' ){
-++            cEnd = c;
-++          }else if( c=='[' ){
-++            cEnd = ']';
-++          }else if( c=='(' ){
-++            nParen++;
-++          }else if( c==')' ){
-++            nParen--;
-++            if( nLine>0 && nParen==0 && j>0 ){
-++              printSchemaLineN(p->out, z, j, "\n");
-++              j = 0;
-++            }
-++          }
-++          z[j++] = c;
-++          if( nParen==1 && (c=='(' || c==',' || c=='\n') ){
-++            if( c=='\n' ) j--;
-++            printSchemaLineN(p->out, z, j, "\n  ");
-++            j = 0;
-++            nLine++;
-++            while( IsSpace(z[i+1]) ){ i++; }
-++          }
-++        }
-++        z[j] = 0;
-++      }
-++      printSchemaLine(p->out, z, ";\n");
-++      sqlite3_free(z);
-++      break;
-++    }
-++    case MODE_List: {
-++      if( p->cnt++==0 && p->showHeader ){
-++        for(i=0; i<nArg; i++){
-++          utf8_printf(p->out,"%s%s",azCol[i],
-++                  i==nArg-1 ? p->rowSeparator : p->colSeparator);
-++        }
-++      }
-++      if( azArg==0 ) break;
-++      for(i=0; i<nArg; i++){
-++        char *z = azArg[i];
-++        if( z==0 ) z = p->nullValue;
-++        utf8_printf(p->out, "%s", z);
-++        if( i<nArg-1 ){
-++          utf8_printf(p->out, "%s", p->colSeparator);
-++        }else{
-++          utf8_printf(p->out, "%s", p->rowSeparator);
-++        }
-++      }
-++      break;
-++    }
-++    case MODE_Html: {
-++      if( p->cnt++==0 && p->showHeader ){
-++        raw_printf(p->out,"<TR>");
-++        for(i=0; i<nArg; i++){
-++          raw_printf(p->out,"<TH>");
-++          output_html_string(p->out, azCol[i]);
-++          raw_printf(p->out,"</TH>\n");
-++        }
-++        raw_printf(p->out,"</TR>\n");
-++      }
-++      if( azArg==0 ) break;
-++      raw_printf(p->out,"<TR>");
-++      for(i=0; i<nArg; i++){
-++        raw_printf(p->out,"<TD>");
-++        output_html_string(p->out, azArg[i] ? azArg[i] : p->nullValue);
-++        raw_printf(p->out,"</TD>\n");
-++      }
-++      raw_printf(p->out,"</TR>\n");
-++      break;
-++    }
-++    case MODE_Tcl: {
-++      if( p->cnt++==0 && p->showHeader ){
-++        for(i=0; i<nArg; i++){
-++          output_c_string(p->out,azCol[i] ? azCol[i] : "");
-++          if(i<nArg-1) utf8_printf(p->out, "%s", p->colSeparator);
-++        }
-++        utf8_printf(p->out, "%s", p->rowSeparator);
-++      }
-++      if( azArg==0 ) break;
-++      for(i=0; i<nArg; i++){
-++        output_c_string(p->out, azArg[i] ? azArg[i] : p->nullValue);
-++        if(i<nArg-1) utf8_printf(p->out, "%s", p->colSeparator);
-++      }
-++      utf8_printf(p->out, "%s", p->rowSeparator);
-++      break;
-++    }
-++    case MODE_Csv: {
-++      setBinaryMode(p->out, 1);
-++      if( p->cnt++==0 && p->showHeader ){
-++        for(i=0; i<nArg; i++){
-++          output_csv(p, azCol[i] ? azCol[i] : "", i<nArg-1);
-++        }
-++        utf8_printf(p->out, "%s", p->rowSeparator);
-++      }
-++      if( nArg>0 ){
-++        for(i=0; i<nArg; i++){
-++          output_csv(p, azArg[i], i<nArg-1);
-++        }
-++        utf8_printf(p->out, "%s", p->rowSeparator);
-++      }
-++      setTextMode(p->out, 1);
-++      break;
-++    }
-++    case MODE_Insert: {
-++      if( azArg==0 ) break;
-++      utf8_printf(p->out,"INSERT INTO %s",p->zDestTable);
-++      if( p->showHeader ){
-++        raw_printf(p->out,"(");
-++        for(i=0; i<nArg; i++){
-++          if( i>0 ) raw_printf(p->out, ",");
-++          if( quoteChar(azCol[i]) ){
-++            char *z = sqlite3_mprintf("\"%w\"", azCol[i]);
-++            utf8_printf(p->out, "%s", z);
-++            sqlite3_free(z);
-++          }else{
-++            raw_printf(p->out, "%s", azCol[i]);
-++          }
-++        }
-++        raw_printf(p->out,")");
-++      }
-++      p->cnt++;
-++      for(i=0; i<nArg; i++){
-++        raw_printf(p->out, i>0 ? "," : " VALUES(");
-++        if( (azArg[i]==0) || (aiType && aiType[i]==SQLITE_NULL) ){
-++          utf8_printf(p->out,"NULL");
-++        }else if( aiType && aiType[i]==SQLITE_TEXT ){
-++          if( ShellHasFlag(p, SHFLG_Newlines) ){
-++            output_quoted_string(p->out, azArg[i]);
-++          }else{
-++            output_quoted_escaped_string(p->out, azArg[i]);
-++          }
-++        }else if( aiType && aiType[i]==SQLITE_INTEGER ){
-++          utf8_printf(p->out,"%s", azArg[i]);
-++        }else if( aiType && aiType[i]==SQLITE_FLOAT ){
-++          char z[50];
-++          double r = sqlite3_column_double(p->pStmt, i);
-++          sqlite3_snprintf(50,z,"%!.20g", r);
-++          raw_printf(p->out, "%s", z);
-++        }else if( aiType && aiType[i]==SQLITE_BLOB && p->pStmt ){
-++          const void *pBlob = sqlite3_column_blob(p->pStmt, i);
-++          int nBlob = sqlite3_column_bytes(p->pStmt, i);
-++          output_hex_blob(p->out, pBlob, nBlob);
-++        }else if( isNumber(azArg[i], 0) ){
-++          utf8_printf(p->out,"%s", azArg[i]);
-++        }else if( ShellHasFlag(p, SHFLG_Newlines) ){
-++          output_quoted_string(p->out, azArg[i]);
-++        }else{
-++          output_quoted_escaped_string(p->out, azArg[i]);
-++        }
-++      }
-++      raw_printf(p->out,");\n");
-++      break;
-++    }
-++    case MODE_Quote: {
-++      if( azArg==0 ) break;
-++      if( p->cnt==0 && p->showHeader ){
-++        for(i=0; i<nArg; i++){
-++          if( i>0 ) raw_printf(p->out, ",");
-++          output_quoted_string(p->out, azCol[i]);
-++        }
-++        raw_printf(p->out,"\n");
-++      }
-++      p->cnt++;
-++      for(i=0; i<nArg; i++){
-++        if( i>0 ) raw_printf(p->out, ",");
-++        if( (azArg[i]==0) || (aiType && aiType[i]==SQLITE_NULL) ){
-++          utf8_printf(p->out,"NULL");
-++        }else if( aiType && aiType[i]==SQLITE_TEXT ){
-++          output_quoted_string(p->out, azArg[i]);
-++        }else if( aiType && aiType[i]==SQLITE_INTEGER ){
-++          utf8_printf(p->out,"%s", azArg[i]);
-++        }else if( aiType && aiType[i]==SQLITE_FLOAT ){
-++          char z[50];
-++          double r = sqlite3_column_double(p->pStmt, i);
-++          sqlite3_snprintf(50,z,"%!.20g", r);
-++          raw_printf(p->out, "%s", z);
-++        }else if( aiType && aiType[i]==SQLITE_BLOB && p->pStmt ){
-++          const void *pBlob = sqlite3_column_blob(p->pStmt, i);
-++          int nBlob = sqlite3_column_bytes(p->pStmt, i);
-++          output_hex_blob(p->out, pBlob, nBlob);
-++        }else if( isNumber(azArg[i], 0) ){
-++          utf8_printf(p->out,"%s", azArg[i]);
-++        }else{
-++          output_quoted_string(p->out, azArg[i]);
-++        }
-++      }
-++      raw_printf(p->out,"\n");
-++      break;
-++    }
-++    case MODE_Ascii: {
-++      if( p->cnt++==0 && p->showHeader ){
-++        for(i=0; i<nArg; i++){
-++          if( i>0 ) utf8_printf(p->out, "%s", p->colSeparator);
-++          utf8_printf(p->out,"%s",azCol[i] ? azCol[i] : "");
-++        }
-++        utf8_printf(p->out, "%s", p->rowSeparator);
-++      }
-++      if( azArg==0 ) break;
-++      for(i=0; i<nArg; i++){
-++        if( i>0 ) utf8_printf(p->out, "%s", p->colSeparator);
-++        utf8_printf(p->out,"%s",azArg[i] ? azArg[i] : p->nullValue);
-++      }
-++      utf8_printf(p->out, "%s", p->rowSeparator);
-++      break;
-++    }
-++  }
-++  return 0;
-++}
-++
-++/*
-++** This is the callback routine that the SQLite library
-++** invokes for each row of a query result.
-++*/
-++static int callback(void *pArg, int nArg, char **azArg, char **azCol){
-++  /* since we don't have type info, call the shell_callback with a NULL value */
-++  return shell_callback(pArg, nArg, azArg, azCol, NULL);
-++}
-++
-++/*
-++** This is the callback routine from sqlite3_exec() that appends all
-++** output onto the end of a ShellText object.
-++*/
-++static int captureOutputCallback(void *pArg, int nArg, char **azArg, char **az){
-++  ShellText *p = (ShellText*)pArg;
-++  int i;
-++  UNUSED_PARAMETER(az);
-++  if( azArg==0 ) return 0;
-++  if( p->n ) appendText(p, "|", 0);
-++  for(i=0; i<nArg; i++){
-++    if( i ) appendText(p, ",", 0);
-++    if( azArg[i] ) appendText(p, azArg[i], 0);
-++  }
-++  return 0;
-++}
-++
-++/*
-++** Generate an appropriate SELFTEST table in the main database.
-++*/
-++static void createSelftestTable(ShellState *p){
-++  char *zErrMsg = 0;
-++  sqlite3_exec(p->db,
-++    "SAVEPOINT selftest_init;\n"
-++    "CREATE TABLE IF NOT EXISTS selftest(\n"
-++    "  tno INTEGER PRIMARY KEY,\n"   /* Test number */
-++    "  op TEXT,\n"                   /* Operator:  memo run */
-++    "  cmd TEXT,\n"                  /* Command text */
-++    "  ans TEXT\n"                   /* Desired answer */
-++    ");"
-++    "CREATE TEMP TABLE [_shell$self](op,cmd,ans);\n"
-++    "INSERT INTO [_shell$self](rowid,op,cmd)\n"
-++    "  VALUES(coalesce((SELECT (max(tno)+100)/10 FROM selftest),10),\n"
-++    "         'memo','Tests generated by --init');\n"
-++    "INSERT INTO [_shell$self]\n"
-++    "  SELECT 'run',\n"
-++    "    'SELECT hex(sha3_query(''SELECT type,name,tbl_name,sql "
-++                                 "FROM sqlite_master ORDER BY 2'',224))',\n"
-++    "    hex(sha3_query('SELECT type,name,tbl_name,sql "
-++                          "FROM sqlite_master ORDER BY 2',224));\n"
-++    "INSERT INTO [_shell$self]\n"
-++    "  SELECT 'run',"
-++    "    'SELECT hex(sha3_query(''SELECT * FROM \"' ||"
-++    "        printf('%w',name) || '\" NOT INDEXED'',224))',\n"
-++    "    hex(sha3_query(printf('SELECT * FROM \"%w\" NOT INDEXED',name),224))\n"
-++    "  FROM (\n"
-++    "    SELECT name FROM sqlite_master\n"
-++    "     WHERE type='table'\n"
-++    "       AND name<>'selftest'\n"
-++    "       AND coalesce(rootpage,0)>0\n"
-++    "  )\n"
-++    " ORDER BY name;\n"
-++    "INSERT INTO [_shell$self]\n"
-++    "  VALUES('run','PRAGMA integrity_check','ok');\n"
-++    "INSERT INTO selftest(tno,op,cmd,ans)"
-++    "  SELECT rowid*10,op,cmd,ans FROM [_shell$self];\n"
-++    "DROP TABLE [_shell$self];"
-++    ,0,0,&zErrMsg);
-++  if( zErrMsg ){
-++    utf8_printf(stderr, "SELFTEST initialization failure: %s\n", zErrMsg);
-++    sqlite3_free(zErrMsg);
-++  }
-++  sqlite3_exec(p->db, "RELEASE selftest_init",0,0,0);
-++}
-++
-++
-++/*
-++** Set the destination table field of the ShellState structure to
-++** the name of the table given.  Escape any quote characters in the
-++** table name.
-++*/
-++static void set_table_name(ShellState *p, const char *zName){
-++  int i, n;
-++  char cQuote;
-++  char *z;
-++
-++  if( p->zDestTable ){
-++    free(p->zDestTable);
-++    p->zDestTable = 0;
-++  }
-++  if( zName==0 ) return;
-++  cQuote = quoteChar(zName);
-++  n = strlen30(zName);
-++  if( cQuote ) n += n+2;
-++  z = p->zDestTable = malloc( n+1 );
-++  if( z==0 ){
-++    raw_printf(stderr,"Error: out of memory\n");
-++    exit(1);
-++  }
-++  n = 0;
-++  if( cQuote ) z[n++] = cQuote;
-++  for(i=0; zName[i]; i++){
-++    z[n++] = zName[i];
-++    if( zName[i]==cQuote ) z[n++] = cQuote;
-++  }
-++  if( cQuote ) z[n++] = cQuote;
-++  z[n] = 0;
-++}
-++
-++
-++/*
-++** Execute a query statement that will generate SQL output.  Print
-++** the result columns, comma-separated, on a line and then add a
-++** semicolon terminator to the end of that line.
-++**
-++** If the number of columns is 1 and that column contains text "--"
-++** then write the semicolon on a separate line.  That way, if a
-++** "--" comment occurs at the end of the statement, the comment
-++** won't consume the semicolon terminator.
-++*/
-++static int run_table_dump_query(
-++  ShellState *p,           /* Query context */
-++  const char *zSelect,     /* SELECT statement to extract content */
-++  const char *zFirstRow    /* Print before first row, if not NULL */
-++){
-++  sqlite3_stmt *pSelect;
-++  int rc;
-++  int nResult;
-++  int i;
-++  const char *z;
-++  rc = sqlite3_prepare_v2(p->db, zSelect, -1, &pSelect, 0);
-++  if( rc!=SQLITE_OK || !pSelect ){
-++    utf8_printf(p->out, "/**** ERROR: (%d) %s *****/\n", rc,
-++                sqlite3_errmsg(p->db));
-++    if( (rc&0xff)!=SQLITE_CORRUPT ) p->nErr++;
-++    return rc;
-++  }
-++  rc = sqlite3_step(pSelect);
-++  nResult = sqlite3_column_count(pSelect);
-++  while( rc==SQLITE_ROW ){
-++    if( zFirstRow ){
-++      utf8_printf(p->out, "%s", zFirstRow);
-++      zFirstRow = 0;
-++    }
-++    z = (const char*)sqlite3_column_text(pSelect, 0);
-++    utf8_printf(p->out, "%s", z);
-++    for(i=1; i<nResult; i++){
-++      utf8_printf(p->out, ",%s", sqlite3_column_text(pSelect, i));
-++    }
-++    if( z==0 ) z = "";
-++    while( z[0] && (z[0]!='-' || z[1]!='-') ) z++;
-++    if( z[0] ){
-++      raw_printf(p->out, "\n;\n");
-++    }else{
-++      raw_printf(p->out, ";\n");
-++    }
-++    rc = sqlite3_step(pSelect);
-++  }
-++  rc = sqlite3_finalize(pSelect);
-++  if( rc!=SQLITE_OK ){
-++    utf8_printf(p->out, "/**** ERROR: (%d) %s *****/\n", rc,
-++                sqlite3_errmsg(p->db));
-++    if( (rc&0xff)!=SQLITE_CORRUPT ) p->nErr++;
-++  }
-++  return rc;
-++}
-++
-++/*
-++** Allocate space and save off current error string.
-++*/
-++static char *save_err_msg(
-++  sqlite3 *db            /* Database to query */
-++){
-++  int nErrMsg = 1+strlen30(sqlite3_errmsg(db));
-++  char *zErrMsg = sqlite3_malloc64(nErrMsg);
-++  if( zErrMsg ){
-++    memcpy(zErrMsg, sqlite3_errmsg(db), nErrMsg);
-++  }
-++  return zErrMsg;
-++}
-++
-++#ifdef __linux__
-++/*
-++** Attempt to display I/O stats on Linux using /proc/PID/io
-++*/
-++static void displayLinuxIoStats(FILE *out){
-++  FILE *in;
-++  char z[200];
-++  sqlite3_snprintf(sizeof(z), z, "/proc/%d/io", getpid());
-++  in = fopen(z, "rb");
-++  if( in==0 ) return;
-++  while( fgets(z, sizeof(z), in)!=0 ){
-++    static const struct {
-++      const char *zPattern;
-++      const char *zDesc;
-++    } aTrans[] = {
-++      { "rchar: ",                  "Bytes received by read():" },
-++      { "wchar: ",                  "Bytes sent to write():"    },
-++      { "syscr: ",                  "Read() system calls:"      },
-++      { "syscw: ",                  "Write() system calls:"     },
-++      { "read_bytes: ",             "Bytes read from storage:"  },
-++      { "write_bytes: ",            "Bytes written to storage:" },
-++      { "cancelled_write_bytes: ",  "Cancelled write bytes:"    },
-++    };
-++    int i;
-++    for(i=0; i<ArraySize(aTrans); i++){
-++      int n = (int)strlen(aTrans[i].zPattern);
-++      if( strncmp(aTrans[i].zPattern, z, n)==0 ){
-++        utf8_printf(out, "%-36s %s", aTrans[i].zDesc, &z[n]);
-++        break;
-++      }
-++    }
-++  }
-++  fclose(in);
-++}
-++#endif
-++
-++/*
-++** Display a single line of status using 64-bit values.
-++*/
-++static void displayStatLine(
-++  ShellState *p,            /* The shell context */
-++  char *zLabel,             /* Label for this one line */
-++  char *zFormat,            /* Format for the result */
-++  int iStatusCtrl,          /* Which status to display */
-++  int bReset                /* True to reset the stats */
-++){
-++  sqlite3_int64 iCur = -1;
-++  sqlite3_int64 iHiwtr = -1;
-++  int i, nPercent;
-++  char zLine[200];
-++  sqlite3_status64(iStatusCtrl, &iCur, &iHiwtr, bReset);
-++  for(i=0, nPercent=0; zFormat[i]; i++){
-++    if( zFormat[i]=='%' ) nPercent++;
-++  }
-++  if( nPercent>1 ){
-++    sqlite3_snprintf(sizeof(zLine), zLine, zFormat, iCur, iHiwtr);
-++  }else{
-++    sqlite3_snprintf(sizeof(zLine), zLine, zFormat, iHiwtr);
-++  }
-++  raw_printf(p->out, "%-36s %s\n", zLabel, zLine);
-++}
-++
-++/*
-++** Display memory stats.
-++*/
-++static int display_stats(
-++  sqlite3 *db,                /* Database to query */
-++  ShellState *pArg,           /* Pointer to ShellState */
-++  int bReset                  /* True to reset the stats */
-++){
-++  int iCur;
-++  int iHiwtr;
-++
-++  if( pArg && pArg->out ){
-++    displayStatLine(pArg, "Memory Used:",
-++       "%lld (max %lld) bytes", SQLITE_STATUS_MEMORY_USED, bReset);
-++    displayStatLine(pArg, "Number of Outstanding Allocations:",
-++       "%lld (max %lld)", SQLITE_STATUS_MALLOC_COUNT, bReset);
-++    if( pArg->shellFlgs & SHFLG_Pagecache ){
-++      displayStatLine(pArg, "Number of Pcache Pages Used:",
-++         "%lld (max %lld) pages", SQLITE_STATUS_PAGECACHE_USED, bReset);
-++    }
-++    displayStatLine(pArg, "Number of Pcache Overflow Bytes:",
-++       "%lld (max %lld) bytes", SQLITE_STATUS_PAGECACHE_OVERFLOW, bReset);
-++    displayStatLine(pArg, "Largest Allocation:",
-++       "%lld bytes", SQLITE_STATUS_MALLOC_SIZE, bReset);
-++    displayStatLine(pArg, "Largest Pcache Allocation:",
-++       "%lld bytes", SQLITE_STATUS_PAGECACHE_SIZE, bReset);
-++#ifdef YYTRACKMAXSTACKDEPTH
-++    displayStatLine(pArg, "Deepest Parser Stack:",
-++       "%lld (max %lld)", SQLITE_STATUS_PARSER_STACK, bReset);
-++#endif
-++  }
-++
-++  if( pArg && pArg->out && db ){
-++    if( pArg->shellFlgs & SHFLG_Lookaside ){
-++      iHiwtr = iCur = -1;
-++      sqlite3_db_status(db, SQLITE_DBSTATUS_LOOKASIDE_USED,
-++                        &iCur, &iHiwtr, bReset);
-++      raw_printf(pArg->out,
-++              "Lookaside Slots Used:                %d (max %d)\n",
-++              iCur, iHiwtr);
-++      sqlite3_db_status(db, SQLITE_DBSTATUS_LOOKASIDE_HIT,
-++                        &iCur, &iHiwtr, bReset);
-++      raw_printf(pArg->out, "Successful lookaside attempts:       %d\n",
-++              iHiwtr);
-++      sqlite3_db_status(db, SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE,
-++                        &iCur, &iHiwtr, bReset);
-++      raw_printf(pArg->out, "Lookaside failures due to size:      %d\n",
-++              iHiwtr);
-++      sqlite3_db_status(db, SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL,
-++                        &iCur, &iHiwtr, bReset);
-++      raw_printf(pArg->out, "Lookaside failures due to OOM:       %d\n",
-++              iHiwtr);
-++    }
-++    iHiwtr = iCur = -1;
-++    sqlite3_db_status(db, SQLITE_DBSTATUS_CACHE_USED, &iCur, &iHiwtr, bReset);
-++    raw_printf(pArg->out, "Pager Heap Usage:                    %d bytes\n",
-++            iCur);
-++    iHiwtr = iCur = -1;
-++    sqlite3_db_status(db, SQLITE_DBSTATUS_CACHE_HIT, &iCur, &iHiwtr, 1);
-++    raw_printf(pArg->out, "Page cache hits:                     %d\n", iCur);
-++    iHiwtr = iCur = -1;
-++    sqlite3_db_status(db, SQLITE_DBSTATUS_CACHE_MISS, &iCur, &iHiwtr, 1);
-++    raw_printf(pArg->out, "Page cache misses:                   %d\n", iCur);
-++    iHiwtr = iCur = -1;
-++    sqlite3_db_status(db, SQLITE_DBSTATUS_CACHE_WRITE, &iCur, &iHiwtr, 1);
-++    raw_printf(pArg->out, "Page cache writes:                   %d\n", iCur);
-++    iHiwtr = iCur = -1;
-++    sqlite3_db_status(db, SQLITE_DBSTATUS_SCHEMA_USED, &iCur, &iHiwtr, bReset);
-++    raw_printf(pArg->out, "Schema Heap Usage:                   %d bytes\n",
-++            iCur);
-++    iHiwtr = iCur = -1;
-++    sqlite3_db_status(db, SQLITE_DBSTATUS_STMT_USED, &iCur, &iHiwtr, bReset);
-++    raw_printf(pArg->out, "Statement Heap/Lookaside Usage:      %d bytes\n",
-++            iCur);
-++  }
-++
-++  if( pArg && pArg->out && db && pArg->pStmt ){
-++    iCur = sqlite3_stmt_status(pArg->pStmt, SQLITE_STMTSTATUS_FULLSCAN_STEP,
-++                               bReset);
-++    raw_printf(pArg->out, "Fullscan Steps:                      %d\n", iCur);
-++    iCur = sqlite3_stmt_status(pArg->pStmt, SQLITE_STMTSTATUS_SORT, bReset);
-++    raw_printf(pArg->out, "Sort Operations:                     %d\n", iCur);
-++    iCur = sqlite3_stmt_status(pArg->pStmt, SQLITE_STMTSTATUS_AUTOINDEX,bReset);
-++    raw_printf(pArg->out, "Autoindex Inserts:                   %d\n", iCur);
-++    iCur = sqlite3_stmt_status(pArg->pStmt, SQLITE_STMTSTATUS_VM_STEP, bReset);
-++    raw_printf(pArg->out, "Virtual Machine Steps:               %d\n", iCur);
-++  }
-++
-++#ifdef __linux__
-++  displayLinuxIoStats(pArg->out);
-++#endif
-++
-++  /* Do not remove this machine readable comment: extra-stats-output-here */
-++
-++  return 0;
-++}
-++
-++/*
-++** Display scan stats.
-++*/
-++static void display_scanstats(
-++  sqlite3 *db,                    /* Database to query */
-++  ShellState *pArg                /* Pointer to ShellState */
-++){
-++#ifndef SQLITE_ENABLE_STMT_SCANSTATUS
-++  UNUSED_PARAMETER(db);
-++  UNUSED_PARAMETER(pArg);
-++#else
-++  int i, k, n, mx;
-++  raw_printf(pArg->out, "-------- scanstats --------\n");
-++  mx = 0;
-++  for(k=0; k<=mx; k++){
-++    double rEstLoop = 1.0;
-++    for(i=n=0; 1; i++){
-++      sqlite3_stmt *p = pArg->pStmt;
-++      sqlite3_int64 nLoop, nVisit;
-++      double rEst;
-++      int iSid;
-++      const char *zExplain;
-++      if( sqlite3_stmt_scanstatus(p, i, SQLITE_SCANSTAT_NLOOP, (void*)&nLoop) ){
-++        break;
-++      }
-++      sqlite3_stmt_scanstatus(p, i, SQLITE_SCANSTAT_SELECTID, (void*)&iSid);
-++      if( iSid>mx ) mx = iSid;
-++      if( iSid!=k ) continue;
-++      if( n==0 ){
-++        rEstLoop = (double)nLoop;
-++        if( k>0 ) raw_printf(pArg->out, "-------- subquery %d -------\n", k);
-++      }
-++      n++;
-++      sqlite3_stmt_scanstatus(p, i, SQLITE_SCANSTAT_NVISIT, (void*)&nVisit);
-++      sqlite3_stmt_scanstatus(p, i, SQLITE_SCANSTAT_EST, (void*)&rEst);
-++      sqlite3_stmt_scanstatus(p, i, SQLITE_SCANSTAT_EXPLAIN, (void*)&zExplain);
-++      utf8_printf(pArg->out, "Loop %2d: %s\n", n, zExplain);
-++      rEstLoop *= rEst;
-++      raw_printf(pArg->out,
-++          "         nLoop=%-8lld nRow=%-8lld estRow=%-8lld estRow/Loop=%-8g\n",
-++          nLoop, nVisit, (sqlite3_int64)(rEstLoop+0.5), rEst
-++      );
-++    }
-++  }
-++  raw_printf(pArg->out, "---------------------------\n");
-++#endif
-++}
-++
-++/*
-++** Parameter azArray points to a zero-terminated array of strings. zStr
-++** points to a single nul-terminated string. Return non-zero if zStr
-++** is equal, according to strcmp(), to any of the strings in the array.
-++** Otherwise, return zero.
-++*/
-++static int str_in_array(const char *zStr, const char **azArray){
-++  int i;
-++  for(i=0; azArray[i]; i++){
-++    if( 0==strcmp(zStr, azArray[i]) ) return 1;
-++  }
-++  return 0;
-++}
-++
-++/*
-++** If compiled statement pSql appears to be an EXPLAIN statement, allocate
-++** and populate the ShellState.aiIndent[] array with the number of
-++** spaces each opcode should be indented before it is output.
-++**
-++** The indenting rules are:
-++**
-++**     * For each "Next", "Prev", "VNext" or "VPrev" instruction, indent
-++**       all opcodes that occur between the p2 jump destination and the opcode
-++**       itself by 2 spaces.
-++**
-++**     * For each "Goto", if the jump destination is earlier in the program
-++**       and ends on one of:
-++**          Yield  SeekGt  SeekLt  RowSetRead  Rewind
-++**       or if the P1 parameter is one instead of zero,
-++**       then indent all opcodes between the earlier instruction
-++**       and "Goto" by 2 spaces.
-++*/
-++static void explain_data_prepare(ShellState *p, sqlite3_stmt *pSql){
-++  const char *zSql;               /* The text of the SQL statement */
-++  const char *z;                  /* Used to check if this is an EXPLAIN */
-++  int *abYield = 0;               /* True if op is an OP_Yield */
-++  int nAlloc = 0;                 /* Allocated size of p->aiIndent[], abYield */
-++  int iOp;                        /* Index of operation in p->aiIndent[] */
-++
-++  const char *azNext[] = { "Next", "Prev", "VPrev", "VNext", "SorterNext",
-++                           "NextIfOpen", "PrevIfOpen", 0 };
-++  const char *azYield[] = { "Yield", "SeekLT", "SeekGT", "RowSetRead",
-++                            "Rewind", 0 };
-++  const char *azGoto[] = { "Goto", 0 };
-++
-++  /* Try to figure out if this is really an EXPLAIN statement. If this
-++  ** cannot be verified, return early.  */
-++  if( sqlite3_column_count(pSql)!=8 ){
-++    p->cMode = p->mode;
-++    return;
-++  }
-++  zSql = sqlite3_sql(pSql);
-++  if( zSql==0 ) return;
-++  for(z=zSql; *z==' ' || *z=='\t' || *z=='\n' || *z=='\f' || *z=='\r'; z++);
-++  if( sqlite3_strnicmp(z, "explain", 7) ){
-++    p->cMode = p->mode;
-++    return;
-++  }
-++
-++  for(iOp=0; SQLITE_ROW==sqlite3_step(pSql); iOp++){
-++    int i;
-++    int iAddr = sqlite3_column_int(pSql, 0);
-++    const char *zOp = (const char*)sqlite3_column_text(pSql, 1);
-++
-++    /* Set p2 to the P2 field of the current opcode. Then, assuming that
-++    ** p2 is an instruction address, set variable p2op to the index of that
-++    ** instruction in the aiIndent[] array. p2 and p2op may be different if
-++    ** the current instruction is part of a sub-program generated by an
-++    ** SQL trigger or foreign key.  */
-++    int p2 = sqlite3_column_int(pSql, 3);
-++    int p2op = (p2 + (iOp-iAddr));
-++
-++    /* Grow the p->aiIndent array as required */
-++    if( iOp>=nAlloc ){
-++      if( iOp==0 ){
-++        /* Do further verfication that this is explain output.  Abort if
-++        ** it is not */
-++        static const char *explainCols[] = {
-++           "addr", "opcode", "p1", "p2", "p3", "p4", "p5", "comment" };
-++        int jj;
-++        for(jj=0; jj<ArraySize(explainCols); jj++){
-++          if( strcmp(sqlite3_column_name(pSql,jj),explainCols[jj])!=0 ){
-++            p->cMode = p->mode;
-++            sqlite3_reset(pSql);
-++            return;
-++          }
-++        }
-++      }
-++      nAlloc += 100;
-++      p->aiIndent = (int*)sqlite3_realloc64(p->aiIndent, nAlloc*sizeof(int));
-++      abYield = (int*)sqlite3_realloc64(abYield, nAlloc*sizeof(int));
-++    }
-++    abYield[iOp] = str_in_array(zOp, azYield);
-++    p->aiIndent[iOp] = 0;
-++    p->nIndent = iOp+1;
-++
-++    if( str_in_array(zOp, azNext) ){
-++      for(i=p2op; i<iOp; i++) p->aiIndent[i] += 2;
-++    }
-++    if( str_in_array(zOp, azGoto) && p2op<p->nIndent
-++     && (abYield[p2op] || sqlite3_column_int(pSql, 2))
-++    ){
-++      for(i=p2op; i<iOp; i++) p->aiIndent[i] += 2;
-++    }
-++  }
-++
-++  p->iIndent = 0;
-++  sqlite3_free(abYield);
-++  sqlite3_reset(pSql);
-++}
-++
-++/*
-++** Free the array allocated by explain_data_prepare().
-++*/
-++static void explain_data_delete(ShellState *p){
-++  sqlite3_free(p->aiIndent);
-++  p->aiIndent = 0;
-++  p->nIndent = 0;
-++  p->iIndent = 0;
-++}
-++
-++/*
-++** Disable and restore .wheretrace and .selecttrace settings.
-++*/
-++#if defined(SQLITE_DEBUG) && defined(SQLITE_ENABLE_SELECTTRACE)
-++extern int sqlite3SelectTrace;
-++static int savedSelectTrace;
-++#endif
-++#if defined(SQLITE_DEBUG) && defined(SQLITE_ENABLE_WHERETRACE)
-++extern int sqlite3WhereTrace;
-++static int savedWhereTrace;
-++#endif
-++static void disable_debug_trace_modes(void){
-++#if defined(SQLITE_DEBUG) && defined(SQLITE_ENABLE_SELECTTRACE)
-++  savedSelectTrace = sqlite3SelectTrace;
-++  sqlite3SelectTrace = 0;
-++#endif
-++#if defined(SQLITE_DEBUG) && defined(SQLITE_ENABLE_WHERETRACE)
-++  savedWhereTrace = sqlite3WhereTrace;
-++  sqlite3WhereTrace = 0;
-++#endif
-++}
-++static void restore_debug_trace_modes(void){
-++#if defined(SQLITE_DEBUG) && defined(SQLITE_ENABLE_SELECTTRACE)
-++  sqlite3SelectTrace = savedSelectTrace;
-++#endif
-++#if defined(SQLITE_DEBUG) && defined(SQLITE_ENABLE_WHERETRACE)
-++  sqlite3WhereTrace = savedWhereTrace;
-++#endif
-++}
-++
-++/*
-++** Run a prepared statement
-++*/
-++static void exec_prepared_stmt(
-++  ShellState *pArg,                                /* Pointer to ShellState */
-++  sqlite3_stmt *pStmt,                             /* Statment to run */
-++  int (*xCallback)(void*,int,char**,char**,int*)   /* Callback function */
-++){
-++  int rc;
-++
-++  /* perform the first step.  this will tell us if we
-++  ** have a result set or not and how wide it is.
-++  */
-++  rc = sqlite3_step(pStmt);
-++  /* if we have a result set... */
-++  if( SQLITE_ROW == rc ){
-++    /* if we have a callback... */
-++    if( xCallback ){
-++      /* allocate space for col name ptr, value ptr, and type */
-++      int nCol = sqlite3_column_count(pStmt);
-++      void *pData = sqlite3_malloc64(3*nCol*sizeof(const char*) + 1);
-++      if( !pData ){
-++        rc = SQLITE_NOMEM;
-++      }else{
-++        char **azCols = (char **)pData;      /* Names of result columns */
-++        char **azVals = &azCols[nCol];       /* Results */
-++        int *aiTypes = (int *)&azVals[nCol]; /* Result types */
-++        int i, x;
-++        assert(sizeof(int) <= sizeof(char *));
-++        /* save off ptrs to column names */
-++        for(i=0; i<nCol; i++){
-++          azCols[i] = (char *)sqlite3_column_name(pStmt, i);
-++        }
-++        do{
-++          /* extract the data and data types */
-++          for(i=0; i<nCol; i++){
-++            aiTypes[i] = x = sqlite3_column_type(pStmt, i);
-++            if( x==SQLITE_BLOB && pArg && pArg->cMode==MODE_Insert ){
-++              azVals[i] = "";
-++            }else{
-++              azVals[i] = (char*)sqlite3_column_text(pStmt, i);
-++            }
-++            if( !azVals[i] && (aiTypes[i]!=SQLITE_NULL) ){
-++              rc = SQLITE_NOMEM;
-++              break; /* from for */
-++            }
-++          } /* end for */
-++
-++          /* if data and types extracted successfully... */
-++          if( SQLITE_ROW == rc ){
-++            /* call the supplied callback with the result row data */
-++            if( xCallback(pArg, nCol, azVals, azCols, aiTypes) ){
-++              rc = SQLITE_ABORT;
-++            }else{
-++              rc = sqlite3_step(pStmt);
-++            }
-++          }
-++        } while( SQLITE_ROW == rc );
-++        sqlite3_free(pData);
-++      }
-++    }else{
-++      do{
-++        rc = sqlite3_step(pStmt);
-++      } while( rc == SQLITE_ROW );
-++    }
-++  }
-++}
-++
-++/*
-++** Execute a statement or set of statements.  Print
-++** any result rows/columns depending on the current mode
-++** set via the supplied callback.
-++**
-++** This is very similar to SQLite's built-in sqlite3_exec()
-++** function except it takes a slightly different callback
-++** and callback data argument.
-++*/
-++static int shell_exec(
-++  sqlite3 *db,                              /* An open database */
-++  const char *zSql,                         /* SQL to be evaluated */
-++  int (*xCallback)(void*,int,char**,char**,int*),   /* Callback function */
-++                                            /* (not the same as sqlite3_exec) */
-++  ShellState *pArg,                         /* Pointer to ShellState */
-++  char **pzErrMsg                           /* Error msg written here */
-++){
-++  sqlite3_stmt *pStmt = NULL;     /* Statement to execute. */
-++  int rc = SQLITE_OK;             /* Return Code */
-++  int rc2;
-++  const char *zLeftover;          /* Tail of unprocessed SQL */
-++
-++  if( pzErrMsg ){
-++    *pzErrMsg = NULL;
-++  }
-++
-++  while( zSql[0] && (SQLITE_OK == rc) ){
-++    static const char *zStmtSql;
-++    rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, &zLeftover);
-++    if( SQLITE_OK != rc ){
-++      if( pzErrMsg ){
-++        *pzErrMsg = save_err_msg(db);
-++      }
-++    }else{
-++      if( !pStmt ){
-++        /* this happens for a comment or white-space */
-++        zSql = zLeftover;
-++        while( IsSpace(zSql[0]) ) zSql++;
-++        continue;
-++      }
-++      zStmtSql = sqlite3_sql(pStmt);
-++      if( zStmtSql==0 ) zStmtSql = "";
-++      while( IsSpace(zStmtSql[0]) ) zStmtSql++;
-++
-++      /* save off the prepared statment handle and reset row count */
-++      if( pArg ){
-++        pArg->pStmt = pStmt;
-++        pArg->cnt = 0;
-++      }
-++
-++      /* echo the sql statement if echo on */
-++      if( pArg && ShellHasFlag(pArg, SHFLG_Echo) ){
-++        utf8_printf(pArg->out, "%s\n", zStmtSql ? zStmtSql : zSql);
-++      }
-++
-++      /* Show the EXPLAIN QUERY PLAN if .eqp is on */
-++      if( pArg && pArg->autoEQP && sqlite3_strlike("EXPLAIN%",zStmtSql,0)!=0 ){
-++        sqlite3_stmt *pExplain;
-++        char *zEQP;
-++        disable_debug_trace_modes();
-++        zEQP = sqlite3_mprintf("EXPLAIN QUERY PLAN %s", zStmtSql);
-++        rc = sqlite3_prepare_v2(db, zEQP, -1, &pExplain, 0);
-++        if( rc==SQLITE_OK ){
-++          while( sqlite3_step(pExplain)==SQLITE_ROW ){
-++            raw_printf(pArg->out,"--EQP-- %d,",sqlite3_column_int(pExplain, 0));
-++            raw_printf(pArg->out,"%d,", sqlite3_column_int(pExplain, 1));
-++            raw_printf(pArg->out,"%d,", sqlite3_column_int(pExplain, 2));
-++            utf8_printf(pArg->out,"%s\n", sqlite3_column_text(pExplain, 3));
-++          }
-++        }
-++        sqlite3_finalize(pExplain);
-++        sqlite3_free(zEQP);
-++        if( pArg->autoEQP>=2 ){
-++          /* Also do an EXPLAIN for ".eqp full" mode */
-++          zEQP = sqlite3_mprintf("EXPLAIN %s", zStmtSql);
-++          rc = sqlite3_prepare_v2(db, zEQP, -1, &pExplain, 0);
-++          if( rc==SQLITE_OK ){
-++            pArg->cMode = MODE_Explain;
-++            explain_data_prepare(pArg, pExplain);
-++            exec_prepared_stmt(pArg, pExplain, xCallback);
-++            explain_data_delete(pArg);
-++          }
-++          sqlite3_finalize(pExplain);
-++          sqlite3_free(zEQP);
-++        }
-++        restore_debug_trace_modes();
-++      }
-++
-++      if( pArg ){
-++        pArg->cMode = pArg->mode;
-++        if( pArg->autoExplain
-++         && sqlite3_column_count(pStmt)==8
-++         && sqlite3_strlike("EXPLAIN%", zStmtSql,0)==0
-++        ){
-++          pArg->cMode = MODE_Explain;
-++        }
-++
-++        /* If the shell is currently in ".explain" mode, gather the extra
-++        ** data required to add indents to the output.*/
-++        if( pArg->cMode==MODE_Explain ){
-++          explain_data_prepare(pArg, pStmt);
-++        }
-++      }
-++
-++      exec_prepared_stmt(pArg, pStmt, xCallback);
-++      explain_data_delete(pArg);
-++
-++      /* print usage stats if stats on */
-++      if( pArg && pArg->statsOn ){
-++        display_stats(db, pArg, 0);
-++      }
-++
-++      /* print loop-counters if required */
-++      if( pArg && pArg->scanstatsOn ){
-++        display_scanstats(db, pArg);
-++      }
-++
-++      /* Finalize the statement just executed. If this fails, save a
-++      ** copy of the error message. Otherwise, set zSql to point to the
-++      ** next statement to execute. */
-++      rc2 = sqlite3_finalize(pStmt);
-++      if( rc!=SQLITE_NOMEM ) rc = rc2;
-++      if( rc==SQLITE_OK ){
-++        zSql = zLeftover;
-++        while( IsSpace(zSql[0]) ) zSql++;
-++      }else if( pzErrMsg ){
-++        *pzErrMsg = save_err_msg(db);
-++      }
-++
-++      /* clear saved stmt handle */
-++      if( pArg ){
-++        pArg->pStmt = NULL;
-++      }
-++    }
-++  } /* end while */
-++
-++  return rc;
-++}
-++
-++/*
-++** Release memory previously allocated by tableColumnList().
-++*/
-++static void freeColumnList(char **azCol){
-++  int i;
-++  for(i=1; azCol[i]; i++){
-++    sqlite3_free(azCol[i]);
-++  }
-++  /* azCol[0] is a static string */
-++  sqlite3_free(azCol);
-++}
-++
-++/*
-++** Return a list of pointers to strings which are the names of all
-++** columns in table zTab.   The memory to hold the names is dynamically
-++** allocated and must be released by the caller using a subsequent call
-++** to freeColumnList().
-++**
-++** The azCol[0] entry is usually NULL.  However, if zTab contains a rowid
-++** value that needs to be preserved, then azCol[0] is filled in with the
-++** name of the rowid column.
-++**
-++** The first regular column in the table is azCol[1].  The list is terminated
-++** by an entry with azCol[i]==0.
-++*/
-++static char **tableColumnList(ShellState *p, const char *zTab){
-++  char **azCol = 0;
-++  sqlite3_stmt *pStmt;
-++  char *zSql;
-++  int nCol = 0;
-++  int nAlloc = 0;
-++  int nPK = 0;       /* Number of PRIMARY KEY columns seen */
-++  int isIPK = 0;     /* True if one PRIMARY KEY column of type INTEGER */
-++  int preserveRowid = ShellHasFlag(p, SHFLG_PreserveRowid);
-++  int rc;
-++
-++  zSql = sqlite3_mprintf("PRAGMA table_info=%Q", zTab);
-++  rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
-++  sqlite3_free(zSql);
-++  if( rc ) return 0;
-++  while( sqlite3_step(pStmt)==SQLITE_ROW ){
-++    if( nCol>=nAlloc-2 ){
-++      nAlloc = nAlloc*2 + nCol + 10;
-++      azCol = sqlite3_realloc(azCol, nAlloc*sizeof(azCol[0]));
-++      if( azCol==0 ){
-++        raw_printf(stderr, "Error: out of memory\n");
-++        exit(1);
-++      }
-++    }
-++    azCol[++nCol] = sqlite3_mprintf("%s", sqlite3_column_text(pStmt, 1));
-++    if( sqlite3_column_int(pStmt, 5) ){
-++      nPK++;
-++      if( nPK==1
-++       && sqlite3_stricmp((const char*)sqlite3_column_text(pStmt,2),
-++                          "INTEGER")==0
-++      ){
-++        isIPK = 1;
-++      }else{
-++        isIPK = 0;
-++      }
-++    }
-++  }
-++  sqlite3_finalize(pStmt);
-++  if( azCol==0 ) return 0;
-++  azCol[0] = 0;
-++  azCol[nCol+1] = 0;
-++
-++  /* The decision of whether or not a rowid really needs to be preserved
-++  ** is tricky.  We never need to preserve a rowid for a WITHOUT ROWID table
-++  ** or a table with an INTEGER PRIMARY KEY.  We are unable to preserve
-++  ** rowids on tables where the rowid is inaccessible because there are other
-++  ** columns in the table named "rowid", "_rowid_", and "oid".
-++  */
-++  if( preserveRowid && isIPK ){
-++    /* If a single PRIMARY KEY column with type INTEGER was seen, then it
-++    ** might be an alise for the ROWID.  But it might also be a WITHOUT ROWID
-++    ** table or a INTEGER PRIMARY KEY DESC column, neither of which are
-++    ** ROWID aliases.  To distinguish these cases, check to see if
-++    ** there is a "pk" entry in "PRAGMA index_list".  There will be
-++    ** no "pk" index if the PRIMARY KEY really is an alias for the ROWID.
-++    */
-++    zSql = sqlite3_mprintf("SELECT 1 FROM pragma_index_list(%Q)"
-++                           " WHERE origin='pk'", zTab);
-++    rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
-++    sqlite3_free(zSql);
-++    if( rc ){
-++      freeColumnList(azCol);
-++      return 0;
-++    }
-++    rc = sqlite3_step(pStmt);
-++    sqlite3_finalize(pStmt);
-++    preserveRowid = rc==SQLITE_ROW;
-++  }
-++  if( preserveRowid ){
-++    /* Only preserve the rowid if we can find a name to use for the
-++    ** rowid */
-++    static char *azRowid[] = { "rowid", "_rowid_", "oid" };
-++    int i, j;
-++    for(j=0; j<3; j++){
-++      for(i=1; i<=nCol; i++){
-++        if( sqlite3_stricmp(azRowid[j],azCol[i])==0 ) break;
-++      }
-++      if( i>nCol ){
-++        /* At this point, we know that azRowid[j] is not the name of any
-++        ** ordinary column in the table.  Verify that azRowid[j] is a valid
-++        ** name for the rowid before adding it to azCol[0].  WITHOUT ROWID
-++        ** tables will fail this last check */
-++        rc = sqlite3_table_column_metadata(p->db,0,zTab,azRowid[j],0,0,0,0,0);
-++        if( rc==SQLITE_OK ) azCol[0] = azRowid[j];
-++        break;
-++      }
-++    }
-++  }
-++  return azCol;
-++}
-++
-++/*
-++** Toggle the reverse_unordered_selects setting.
-++*/
-++static void toggleSelectOrder(sqlite3 *db){
-++  sqlite3_stmt *pStmt = 0;
-++  int iSetting = 0;
-++  char zStmt[100];
-++  sqlite3_prepare_v2(db, "PRAGMA reverse_unordered_selects", -1, &pStmt, 0);
-++  if( sqlite3_step(pStmt)==SQLITE_ROW ){
-++    iSetting = sqlite3_column_int(pStmt, 0);
-++  }
-++  sqlite3_finalize(pStmt);
-++  sqlite3_snprintf(sizeof(zStmt), zStmt,
-++       "PRAGMA reverse_unordered_selects(%d)", !iSetting);
-++  sqlite3_exec(db, zStmt, 0, 0, 0);
-++}
-++
-++/*
-++** This is a different callback routine used for dumping the database.
-++** Each row received by this callback consists of a table name,
-++** the table type ("index" or "table") and SQL to create the table.
-++** This routine should print text sufficient to recreate the table.
-++*/
-++static int dump_callback(void *pArg, int nArg, char **azArg, char **azNotUsed){
-++  int rc;
-++  const char *zTable;
-++  const char *zType;
-++  const char *zSql;
-++  ShellState *p = (ShellState *)pArg;
-++
-++  UNUSED_PARAMETER(azNotUsed);
-++  if( nArg!=3 || azArg==0 ) return 0;
-++  zTable = azArg[0];
-++  zType = azArg[1];
-++  zSql = azArg[2];
-++
-++  if( strcmp(zTable, "sqlite_sequence")==0 ){
-++    raw_printf(p->out, "DELETE FROM sqlite_sequence;\n");
-++  }else if( sqlite3_strglob("sqlite_stat?", zTable)==0 ){
-++    raw_printf(p->out, "ANALYZE sqlite_master;\n");
-++  }else if( strncmp(zTable, "sqlite_", 7)==0 ){
-++    return 0;
-++  }else if( strncmp(zSql, "CREATE VIRTUAL TABLE", 20)==0 ){
-++    char *zIns;
-++    if( !p->writableSchema ){
-++      raw_printf(p->out, "PRAGMA writable_schema=ON;\n");
-++      p->writableSchema = 1;
-++    }
-++    zIns = sqlite3_mprintf(
-++       "INSERT INTO sqlite_master(type,name,tbl_name,rootpage,sql)"
-++       "VALUES('table','%q','%q',0,'%q');",
-++       zTable, zTable, zSql);
-++    utf8_printf(p->out, "%s\n", zIns);
-++    sqlite3_free(zIns);
-++    return 0;
-++  }else{
-++    printSchemaLine(p->out, zSql, ";\n");
-++  }
-++
-++  if( strcmp(zType, "table")==0 ){
-++    ShellText sSelect;
-++    ShellText sTable;
-++    char **azCol;
-++    int i;
-++    char *savedDestTable;
-++    int savedMode;
-++
-++    azCol = tableColumnList(p, zTable);
-++    if( azCol==0 ){
-++      p->nErr++;
-++      return 0;
-++    }
-++
-++    /* Always quote the table name, even if it appears to be pure ascii,
-++    ** in case it is a keyword. Ex:  INSERT INTO "table" ... */
-++    initText(&sTable);
-++    appendText(&sTable, zTable, quoteChar(zTable));
-++    /* If preserving the rowid, add a column list after the table name.
-++    ** In other words:  "INSERT INTO tab(rowid,a,b,c,...) VALUES(...)"
-++    ** instead of the usual "INSERT INTO tab VALUES(...)".
-++    */
-++    if( azCol[0] ){
-++      appendText(&sTable, "(", 0);
-++      appendText(&sTable, azCol[0], 0);
-++      for(i=1; azCol[i]; i++){
-++        appendText(&sTable, ",", 0);
-++        appendText(&sTable, azCol[i], quoteChar(azCol[i]));
-++      }
-++      appendText(&sTable, ")", 0);
-++    }
-++
-++    /* Build an appropriate SELECT statement */
-++    initText(&sSelect);
-++    appendText(&sSelect, "SELECT ", 0);
-++    if( azCol[0] ){
-++      appendText(&sSelect, azCol[0], 0);
-++      appendText(&sSelect, ",", 0);
-++    }
-++    for(i=1; azCol[i]; i++){
-++      appendText(&sSelect, azCol[i], quoteChar(azCol[i]));
-++      if( azCol[i+1] ){
-++        appendText(&sSelect, ",", 0);
-++      }
-++    }
-++    freeColumnList(azCol);
-++    appendText(&sSelect, " FROM ", 0);
-++    appendText(&sSelect, zTable, quoteChar(zTable));
-++
-++    savedDestTable = p->zDestTable;
-++    savedMode = p->mode;
-++    p->zDestTable = sTable.z;
-++    p->mode = p->cMode = MODE_Insert;
-++    rc = shell_exec(p->db, sSelect.z, shell_callback, p, 0);
-++    if( (rc&0xff)==SQLITE_CORRUPT ){
-++      raw_printf(p->out, "/****** CORRUPTION ERROR *******/\n");
-++      toggleSelectOrder(p->db);
-++      shell_exec(p->db, sSelect.z, shell_callback, p, 0);
-++      toggleSelectOrder(p->db);
-++    }
-++    p->zDestTable = savedDestTable;
-++    p->mode = savedMode;
-++    freeText(&sTable);
-++    freeText(&sSelect);
-++    if( rc ) p->nErr++;
-++  }
-++  return 0;
-++}
-++
-++/*
-++** Run zQuery.  Use dump_callback() as the callback routine so that
-++** the contents of the query are output as SQL statements.
-++**
-++** If we get a SQLITE_CORRUPT error, rerun the query after appending
-++** "ORDER BY rowid DESC" to the end.
-++*/
-++static int run_schema_dump_query(
-++  ShellState *p,
-++  const char *zQuery
-++){
-++  int rc;
-++  char *zErr = 0;
-++  rc = sqlite3_exec(p->db, zQuery, dump_callback, p, &zErr);
-++  if( rc==SQLITE_CORRUPT ){
-++    char *zQ2;
-++    int len = strlen30(zQuery);
-++    raw_printf(p->out, "/****** CORRUPTION ERROR *******/\n");
-++    if( zErr ){
-++      utf8_printf(p->out, "/****** %s ******/\n", zErr);
-++      sqlite3_free(zErr);
-++      zErr = 0;
-++    }
-++    zQ2 = malloc( len+100 );
-++    if( zQ2==0 ) return rc;
-++    sqlite3_snprintf(len+100, zQ2, "%s ORDER BY rowid DESC", zQuery);
-++    rc = sqlite3_exec(p->db, zQ2, dump_callback, p, &zErr);
-++    if( rc ){
-++      utf8_printf(p->out, "/****** ERROR: %s ******/\n", zErr);
-++    }else{
-++      rc = SQLITE_CORRUPT;
-++    }
-++    sqlite3_free(zErr);
-++    free(zQ2);
-++  }
-++  return rc;
-++}
-++
-++/*
-++** Text of a help message
-++*/
-++static char zHelp[] =
-++#ifndef SQLITE_OMIT_AUTHORIZATION
-++  ".auth ON|OFF           Show authorizer callbacks\n"
-++#endif
-++  ".backup ?DB? FILE      Backup DB (default \"main\") to FILE\n"
-++  ".bail on|off           Stop after hitting an error.  Default OFF\n"
-++  ".binary on|off         Turn binary output on or off.  Default OFF\n"
-++  ".cd DIRECTORY          Change the working directory to DIRECTORY\n"
-++  ".changes on|off        Show number of rows changed by SQL\n"
-++  ".check GLOB            Fail if output since .testcase does not match\n"
-++  ".clone NEWDB           Clone data into NEWDB from the existing database\n"
-++  ".databases             List names and files of attached databases\n"
-++  ".dbinfo ?DB?           Show status information about the database\n"
-++  ".dump ?TABLE? ...      Dump the database in an SQL text format\n"
-++  "                         If TABLE specified, only dump tables matching\n"
-++  "                         LIKE pattern TABLE.\n"
-++  ".echo on|off           Turn command echo on or off\n"
-++  ".eqp on|off|full       Enable or disable automatic EXPLAIN QUERY PLAN\n"
-++  ".exit                  Exit this program\n"
-++/* Because explain mode comes on automatically now, the ".explain" mode
-++** is removed from the help screen.  It is still supported for legacy, however */
-++/*".explain ?on|off|auto? Turn EXPLAIN output mode on or off or to automatic\n"*/
-++  ".fullschema ?--indent? Show schema and the content of sqlite_stat tables\n"
-++  ".headers on|off        Turn display of headers on or off\n"
-++  ".help                  Show this message\n"
-++  ".import FILE TABLE     Import data from FILE into TABLE\n"
-++#ifndef SQLITE_OMIT_TEST_CONTROL
-++  ".imposter INDEX TABLE  Create imposter table TABLE on index INDEX\n"
-++#endif
-++  ".indexes ?TABLE?       Show names of all indexes\n"
-++  "                         If TABLE specified, only show indexes for tables\n"
-++  "                         matching LIKE pattern TABLE.\n"
-++#ifdef SQLITE_ENABLE_IOTRACE
-++  ".iotrace FILE          Enable I/O diagnostic logging to FILE\n"
-++#endif
-++  ".limit ?LIMIT? ?VAL?   Display or change the value of an SQLITE_LIMIT\n"
-++  ".lint OPTIONS          Report potential schema issues. Options:\n"
-++  "                         fkey-indexes     Find missing foreign key indexes\n"
-++#ifndef SQLITE_OMIT_LOAD_EXTENSION
-++  ".load FILE ?ENTRY?     Load an extension library\n"
-++#endif
-++  ".log FILE|off          Turn logging on or off.  FILE can be stderr/stdout\n"
-++  ".mode MODE ?TABLE?     Set output mode where MODE is one of:\n"
-++  "                         ascii    Columns/rows delimited by 0x1F and 0x1E\n"
-++  "                         csv      Comma-separated values\n"
-++  "                         column   Left-aligned columns.  (See .width)\n"
-++  "                         html     HTML <table> code\n"
-++  "                         insert   SQL insert statements for TABLE\n"
-++  "                         line     One value per line\n"
-++  "                         list     Values delimited by \"|\"\n"
-++  "                         quote    Escape answers as for SQL\n"
-++  "                         tabs     Tab-separated values\n"
-++  "                         tcl      TCL list elements\n"
-++  ".nullvalue STRING      Use STRING in place of NULL values\n"
-++  ".once FILENAME         Output for the next SQL command only to FILENAME\n"
-++  ".open ?OPTIONS? ?FILE? Close existing database and reopen FILE\n"
-++  "                         The --new option starts with an empty file\n"
-++  ".output ?FILENAME?     Send output to FILENAME or stdout\n"
-++  ".print STRING...       Print literal STRING\n"
-++  ".prompt MAIN CONTINUE  Replace the standard prompts\n"
-++  ".quit                  Exit this program\n"
-++  ".read FILENAME         Execute SQL in FILENAME\n"
-++  ".restore ?DB? FILE     Restore content of DB (default \"main\") from FILE\n"
-++  ".save FILE             Write in-memory database into FILE\n"
-++  ".scanstats on|off      Turn sqlite3_stmt_scanstatus() metrics on or off\n"
-++  ".schema ?PATTERN?      Show the CREATE statements matching PATTERN\n"
-++  "                          Add --indent for pretty-printing\n"
-++  ".selftest ?--init?     Run tests defined in the SELFTEST table\n"
-++  ".separator COL ?ROW?   Change the column separator and optionally the row\n"
-++  "                         separator for both the output mode and .import\n"
-++#if defined(SQLITE_ENABLE_SESSION)
-++  ".session CMD ...       Create or control sessions\n"
-++#endif
-++  ".sha3sum ?OPTIONS...?  Compute a SHA3 hash of database content\n"
-++  ".shell CMD ARGS...     Run CMD ARGS... in a system shell\n"
-++  ".show                  Show the current values for various settings\n"
-++  ".stats ?on|off?        Show stats or turn stats on or off\n"
-++  ".system CMD ARGS...    Run CMD ARGS... in a system shell\n"
-++  ".tables ?TABLE?        List names of tables\n"
-++  "                         If TABLE specified, only list tables matching\n"
-++  "                         LIKE pattern TABLE.\n"
-++  ".testcase NAME         Begin redirecting output to 'testcase-out.txt'\n"
-++  ".timeout MS            Try opening locked tables for MS milliseconds\n"
-++  ".timer on|off          Turn SQL timer on or off\n"
-++  ".trace FILE|off        Output each SQL statement as it is run\n"
-++  ".vfsinfo ?AUX?         Information about the top-level VFS\n"
-++  ".vfslist               List all available VFSes\n"
-++  ".vfsname ?AUX?         Print the name of the VFS stack\n"
-++  ".width NUM1 NUM2 ...   Set column widths for \"column\" mode\n"
-++  "                         Negative values right-justify\n"
-++;
-++
-++#if defined(SQLITE_ENABLE_SESSION)
-++/*
-++** Print help information for the ".sessions" command
-++*/
-++void session_help(ShellState *p){
-++  raw_printf(p->out,
-++    ".session ?NAME? SUBCOMMAND ?ARGS...?\n"
-++    "If ?NAME? is omitted, the first defined session is used.\n"
-++    "Subcommands:\n"
-++    "   attach TABLE             Attach TABLE\n"
-++    "   changeset FILE           Write a changeset into FILE\n"
-++    "   close                    Close one session\n"
-++    "   enable ?BOOLEAN?         Set or query the enable bit\n"
-++    "   filter GLOB...           Reject tables matching GLOBs\n"
-++    "   indirect ?BOOLEAN?       Mark or query the indirect status\n"
-++    "   isempty                  Query whether the session is empty\n"
-++    "   list                     List currently open session names\n"
-++    "   open DB NAME             Open a new session on DB\n"
-++    "   patchset FILE            Write a patchset into FILE\n"
-++  );
-++}
-++#endif
-++
-++
-++/* Forward reference */
-++static int process_input(ShellState *p, FILE *in);
-++
-++/*
-++** Read the content of file zName into memory obtained from sqlite3_malloc64()
-++** and return a pointer to the buffer. The caller is responsible for freeing
-++** the memory.
-++**
-++** If parameter pnByte is not NULL, (*pnByte) is set to the number of bytes
-++** read.
-++**
-++** For convenience, a nul-terminator byte is always appended to the data read
-++** from the file before the buffer is returned. This byte is not included in
-++** the final value of (*pnByte), if applicable.
-++**
-++** NULL is returned if any error is encountered. The final value of *pnByte
-++** is undefined in this case.
-++*/
-++static char *readFile(const char *zName, int *pnByte){
-++  FILE *in = fopen(zName, "rb");
-++  long nIn;
-++  size_t nRead;
-++  char *pBuf;
-++  if( in==0 ) return 0;
-++  fseek(in, 0, SEEK_END);
-++  nIn = ftell(in);
-++  rewind(in);
-++  pBuf = sqlite3_malloc64( nIn+1 );
-++  if( pBuf==0 ) return 0;
-++  nRead = fread(pBuf, nIn, 1, in);
-++  fclose(in);
-++  if( nRead!=1 ){
-++    sqlite3_free(pBuf);
-++    return 0;
-++  }
-++  pBuf[nIn] = 0;
-++  if( pnByte ) *pnByte = nIn;
-++  return pBuf;
-++}
-++
-++#if defined(SQLITE_ENABLE_SESSION)
-++/*
-++** Close a single OpenSession object and release all of its associated
-++** resources.
-++*/
-++static void session_close(OpenSession *pSession){
-++  int i;
-++  sqlite3session_delete(pSession->p);
-++  sqlite3_free(pSession->zName);
-++  for(i=0; i<pSession->nFilter; i++){
-++    sqlite3_free(pSession->azFilter[i]);
-++  }
-++  sqlite3_free(pSession->azFilter);
-++  memset(pSession, 0, sizeof(OpenSession));
-++}
-++#endif
-++
-++/*
-++** Close all OpenSession objects and release all associated resources.
-++*/
-++#if defined(SQLITE_ENABLE_SESSION)
-++static void session_close_all(ShellState *p){
-++  int i;
-++  for(i=0; i<p->nSession; i++){
-++    session_close(&p->aSession[i]);
-++  }
-++  p->nSession = 0;
-++}
-++#else
-++# define session_close_all(X)
-++#endif
-++
-++/*
-++** Implementation of the xFilter function for an open session.  Omit
-++** any tables named by ".session filter" but let all other table through.
-++*/
-++#if defined(SQLITE_ENABLE_SESSION)
-++static int session_filter(void *pCtx, const char *zTab){
-++  OpenSession *pSession = (OpenSession*)pCtx;
-++  int i;
-++  for(i=0; i<pSession->nFilter; i++){
-++    if( sqlite3_strglob(pSession->azFilter[i], zTab)==0 ) return 0;
-++  }
-++  return 1;
-++}
-++#endif
-++
-++/*
-++** Make sure the database is open.  If it is not, then open it.  If
-++** the database fails to open, print an error message and exit.
-++*/
-++static void open_db(ShellState *p, int keepAlive){
-++  if( p->db==0 ){
-++    sqlite3_initialize();
-++    sqlite3_open(p->zDbFilename, &p->db);
-++    globalDb = p->db;
-++    if( p->db==0 || SQLITE_OK!=sqlite3_errcode(p->db) ){
-++      utf8_printf(stderr,"Error: unable to open database \"%s\": %s\n",
-++          p->zDbFilename, sqlite3_errmsg(p->db));
-++      if( keepAlive ) return;
-++      exit(1);
-++    }
-++#ifndef SQLITE_OMIT_LOAD_EXTENSION
-++    sqlite3_enable_load_extension(p->db, 1);
-++#endif
-++    sqlite3_fileio_init(p->db, 0, 0);
-++    sqlite3_shathree_init(p->db, 0, 0);
-++    sqlite3_completion_init(p->db, 0, 0);
-++    sqlite3_create_function(p->db, "shell_add_schema", 2, SQLITE_UTF8, 0,
-++                            shellAddSchemaName, 0, 0);
-++  }
-++}
-++
-++#if HAVE_READLINE || HAVE_EDITLINE
-++/*
-++** Readline completion callbacks
-++*/
-++static char *readline_completion_generator(const char *text, int state){
-++  static sqlite3_stmt *pStmt = 0;
-++  char *zRet;
-++  if( state==0 ){
-++    char *zSql;
-++    sqlite3_finalize(pStmt);
-++    zSql = sqlite3_mprintf("SELECT DISTINCT candidate COLLATE nocase"
-++                           "  FROM completion(%Q) ORDER BY 1", text);
-++    sqlite3_prepare_v2(globalDb, zSql, -1, &pStmt, 0);
-++    sqlite3_free(zSql);
-++  }
-++  if( sqlite3_step(pStmt)==SQLITE_ROW ){
-++    zRet = strdup((const char*)sqlite3_column_text(pStmt, 0));
-++  }else{
-++    sqlite3_finalize(pStmt);
-++    pStmt = 0;
-++    zRet = 0;
-++  }
-++  return zRet;
-++}
-++static char **readline_completion(const char *zText, int iStart, int iEnd){
-++  rl_attempted_completion_over = 1;
-++  return rl_completion_matches(zText, readline_completion_generator);
-++}
-++
-++#elif HAVE_LINENOISE
-++/*
-++** Linenoise completion callback
-++*/
-++static void linenoise_completion(const char *zLine, linenoiseCompletions *lc){
-++  int nLine = (int)strlen(zLine);
-++  int i, iStart;
-++  sqlite3_stmt *pStmt = 0;
-++  char *zSql;
-++  char zBuf[1000];
-++
-++  if( nLine>sizeof(zBuf)-30 ) return;
-++  if( zLine[0]=='.' ) return;
-++  for(i=nLine-1; i>=0 && (isalnum(zLine[i]) || zLine[i]=='_'); i--){}
-++  if( i==nLine-1 ) return;
-++  iStart = i+1;
-++  memcpy(zBuf, zLine, iStart);
-++  zSql = sqlite3_mprintf("SELECT DISTINCT candidate COLLATE nocase"
-++                         "  FROM completion(%Q,%Q) ORDER BY 1",
-++                         &zLine[iStart], zLine);
-++  sqlite3_prepare_v2(globalDb, zSql, -1, &pStmt, 0);
-++  sqlite3_free(zSql);
-++  sqlite3_exec(globalDb, "PRAGMA page_count", 0, 0, 0); /* Load the schema */
-++  while( sqlite3_step(pStmt)==SQLITE_ROW ){
-++    const char *zCompletion = (const char*)sqlite3_column_text(pStmt, 0);
-++    int nCompletion = sqlite3_column_bytes(pStmt, 0);
-++    if( iStart+nCompletion < sizeof(zBuf)-1 ){
-++      memcpy(zBuf+iStart, zCompletion, nCompletion+1);
-++      linenoiseAddCompletion(lc, zBuf);
-++    }
-++  }
-++  sqlite3_finalize(pStmt);
-++}
-++#endif
-++
-++/*
-++** Do C-language style dequoting.
-++**
-++**    \a    -> alarm
-++**    \b    -> backspace
-++**    \t    -> tab
-++**    \n    -> newline
-++**    \v    -> vertical tab
-++**    \f    -> form feed
-++**    \r    -> carriage return
-++**    \s    -> space
-++**    \"    -> "
-++**    \'    -> '
-++**    \\    -> backslash
-++**    \NNN  -> ascii character NNN in octal
-++*/
-++static void resolve_backslashes(char *z){
-++  int i, j;
-++  char c;
-++  while( *z && *z!='\\' ) z++;
-++  for(i=j=0; (c = z[i])!=0; i++, j++){
-++    if( c=='\\' && z[i+1]!=0 ){
-++      c = z[++i];
-++      if( c=='a' ){
-++        c = '\a';
-++      }else if( c=='b' ){
-++        c = '\b';
-++      }else if( c=='t' ){
-++        c = '\t';
-++      }else if( c=='n' ){
-++        c = '\n';
-++      }else if( c=='v' ){
-++        c = '\v';
-++      }else if( c=='f' ){
-++        c = '\f';
-++      }else if( c=='r' ){
-++        c = '\r';
-++      }else if( c=='"' ){
-++        c = '"';
-++      }else if( c=='\'' ){
-++        c = '\'';
-++      }else if( c=='\\' ){
-++        c = '\\';
-++      }else if( c>='0' && c<='7' ){
-++        c -= '0';
-++        if( z[i+1]>='0' && z[i+1]<='7' ){
-++          i++;
-++          c = (c<<3) + z[i] - '0';
-++          if( z[i+1]>='0' && z[i+1]<='7' ){
-++            i++;
-++            c = (c<<3) + z[i] - '0';
-++          }
-++        }
-++      }
-++    }
-++    z[j] = c;
-++  }
-++  if( j<i ) z[j] = 0;
-++}
-++
-++/*
-++** Return the value of a hexadecimal digit.  Return -1 if the input
-++** is not a hex digit.
-++*/
-++static int hexDigitValue(char c){
-++  if( c>='0' && c<='9' ) return c - '0';
-++  if( c>='a' && c<='f' ) return c - 'a' + 10;
-++  if( c>='A' && c<='F' ) return c - 'A' + 10;
-++  return -1;
-++}
-++
-++/*
-++** Interpret zArg as an integer value, possibly with suffixes.
-++*/
-++static sqlite3_int64 integerValue(const char *zArg){
-++  sqlite3_int64 v = 0;
-++  static const struct { char *zSuffix; int iMult; } aMult[] = {
-++    { "KiB", 1024 },
-++    { "MiB", 1024*1024 },
-++    { "GiB", 1024*1024*1024 },
-++    { "KB",  1000 },
-++    { "MB",  1000000 },
-++    { "GB",  1000000000 },
-++    { "K",   1000 },
-++    { "M",   1000000 },
-++    { "G",   1000000000 },
-++  };
-++  int i;
-++  int isNeg = 0;
-++  if( zArg[0]=='-' ){
-++    isNeg = 1;
-++    zArg++;
-++  }else if( zArg[0]=='+' ){
-++    zArg++;
-++  }
-++  if( zArg[0]=='0' && zArg[1]=='x' ){
-++    int x;
-++    zArg += 2;
-++    while( (x = hexDigitValue(zArg[0]))>=0 ){
-++      v = (v<<4) + x;
-++      zArg++;
-++    }
-++  }else{
-++    while( IsDigit(zArg[0]) ){
-++      v = v*10 + zArg[0] - '0';
-++      zArg++;
-++    }
-++  }
-++  for(i=0; i<ArraySize(aMult); i++){
-++    if( sqlite3_stricmp(aMult[i].zSuffix, zArg)==0 ){
-++      v *= aMult[i].iMult;
-++      break;
-++    }
-++  }
-++  return isNeg? -v : v;
-++}
-++
-++/*
-++** Interpret zArg as either an integer or a boolean value.  Return 1 or 0
-++** for TRUE and FALSE.  Return the integer value if appropriate.
-++*/
-++static int booleanValue(const char *zArg){
-++  int i;
-++  if( zArg[0]=='0' && zArg[1]=='x' ){
-++    for(i=2; hexDigitValue(zArg[i])>=0; i++){}
-++  }else{
-++    for(i=0; zArg[i]>='0' && zArg[i]<='9'; i++){}
-++  }
-++  if( i>0 && zArg[i]==0 ) return (int)(integerValue(zArg) & 0xffffffff);
-++  if( sqlite3_stricmp(zArg, "on")==0 || sqlite3_stricmp(zArg,"yes")==0 ){
-++    return 1;
-++  }
-++  if( sqlite3_stricmp(zArg, "off")==0 || sqlite3_stricmp(zArg,"no")==0 ){
-++    return 0;
-++  }
-++  utf8_printf(stderr, "ERROR: Not a boolean value: \"%s\". Assuming \"no\".\n",
-++          zArg);
-++  return 0;
-++}
-++
-++/*
-++** Set or clear a shell flag according to a boolean value.
-++*/
-++static void setOrClearFlag(ShellState *p, unsigned mFlag, const char *zArg){
-++  if( booleanValue(zArg) ){
-++    ShellSetFlag(p, mFlag);
-++  }else{
-++    ShellClearFlag(p, mFlag);
-++  }
-++}
-++
-++/*
-++** Close an output file, assuming it is not stderr or stdout
-++*/
-++static void output_file_close(FILE *f){
-++  if( f && f!=stdout && f!=stderr ) fclose(f);
-++}
-++
-++/*
-++** Try to open an output file.   The names "stdout" and "stderr" are
-++** recognized and do the right thing.  NULL is returned if the output
-++** filename is "off".
-++*/
-++static FILE *output_file_open(const char *zFile){
-++  FILE *f;
-++  if( strcmp(zFile,"stdout")==0 ){
-++    f = stdout;
-++  }else if( strcmp(zFile, "stderr")==0 ){
-++    f = stderr;
-++  }else if( strcmp(zFile, "off")==0 ){
-++    f = 0;
-++  }else{
-++    f = fopen(zFile, "wb");
-++    if( f==0 ){
-++      utf8_printf(stderr, "Error: cannot open \"%s\"\n", zFile);
-++    }
-++  }
-++  return f;
-++}
-++
-++#if !defined(SQLITE_UNTESTABLE)
-++#if !defined(SQLITE_OMIT_TRACE) && !defined(SQLITE_OMIT_FLOATING_POINT)
-++/*
-++** A routine for handling output from sqlite3_trace().
-++*/
-++static int sql_trace_callback(
-++  unsigned mType,
-++  void *pArg,
-++  void *pP,
-++  void *pX
-++){
-++  FILE *f = (FILE*)pArg;
-++  UNUSED_PARAMETER(mType);
-++  UNUSED_PARAMETER(pP);
-++  if( f ){
-++    const char *z = (const char*)pX;
-++    int i = (int)strlen(z);
-++    while( i>0 && z[i-1]==';' ){ i--; }
-++    utf8_printf(f, "%.*s;\n", i, z);
-++  }
-++  return 0;
-++}
-++#endif
-++#endif
-++
-++/*
-++** A no-op routine that runs with the ".breakpoint" doc-command.  This is
-++** a useful spot to set a debugger breakpoint.
-++*/
-++static void test_breakpoint(void){
-++  static int nCall = 0;
-++  nCall++;
-++}
-++
-++/*
-++** An object used to read a CSV and other files for import.
-++*/
-++typedef struct ImportCtx ImportCtx;
-++struct ImportCtx {
-++  const char *zFile;  /* Name of the input file */
-++  FILE *in;           /* Read the CSV text from this input stream */
-++  char *z;            /* Accumulated text for a field */
-++  int n;              /* Number of bytes in z */
-++  int nAlloc;         /* Space allocated for z[] */
-++  int nLine;          /* Current line number */
-++  int bNotFirst;      /* True if one or more bytes already read */
-++  int cTerm;          /* Character that terminated the most recent field */
-++  int cColSep;        /* The column separator character.  (Usually ",") */
-++  int cRowSep;        /* The row separator character.  (Usually "\n") */
-++};
-++
-++/* Append a single byte to z[] */
-++static void import_append_char(ImportCtx *p, int c){
-++  if( p->n+1>=p->nAlloc ){
-++    p->nAlloc += p->nAlloc + 100;
-++    p->z = sqlite3_realloc64(p->z, p->nAlloc);
-++    if( p->z==0 ){
-++      raw_printf(stderr, "out of memory\n");
-++      exit(1);
-++    }
-++  }
-++  p->z[p->n++] = (char)c;
-++}
-++
-++/* Read a single field of CSV text.  Compatible with rfc4180 and extended
-++** with the option of having a separator other than ",".
-++**
-++**   +  Input comes from p->in.
-++**   +  Store results in p->z of length p->n.  Space to hold p->z comes
-++**      from sqlite3_malloc64().
-++**   +  Use p->cSep as the column separator.  The default is ",".
-++**   +  Use p->rSep as the row separator.  The default is "\n".
-++**   +  Keep track of the line number in p->nLine.
-++**   +  Store the character that terminates the field in p->cTerm.  Store
-++**      EOF on end-of-file.
-++**   +  Report syntax errors on stderr
-++*/
-++static char *SQLITE_CDECL csv_read_one_field(ImportCtx *p){
-++  int c;
-++  int cSep = p->cColSep;
-++  int rSep = p->cRowSep;
-++  p->n = 0;
-++  c = fgetc(p->in);
-++  if( c==EOF || seenInterrupt ){
-++    p->cTerm = EOF;
-++    return 0;
-++  }
-++  if( c=='"' ){
-++    int pc, ppc;
-++    int startLine = p->nLine;
-++    int cQuote = c;
-++    pc = ppc = 0;
-++    while( 1 ){
-++      c = fgetc(p->in);
-++      if( c==rSep ) p->nLine++;
-++      if( c==cQuote ){
-++        if( pc==cQuote ){
-++          pc = 0;
-++          continue;
-++        }
-++      }
-++      if( (c==cSep && pc==cQuote)
-++       || (c==rSep && pc==cQuote)
-++       || (c==rSep && pc=='\r' && ppc==cQuote)
-++       || (c==EOF && pc==cQuote)
-++      ){
-++        do{ p->n--; }while( p->z[p->n]!=cQuote );
-++        p->cTerm = c;
-++        break;
-++      }
-++      if( pc==cQuote && c!='\r' ){
-++        utf8_printf(stderr, "%s:%d: unescaped %c character\n",
-++                p->zFile, p->nLine, cQuote);
-++      }
-++      if( c==EOF ){
-++        utf8_printf(stderr, "%s:%d: unterminated %c-quoted field\n",
-++                p->zFile, startLine, cQuote);
-++        p->cTerm = c;
-++        break;
-++      }
-++      import_append_char(p, c);
-++      ppc = pc;
-++      pc = c;
-++    }
-++  }else{
-++    /* If this is the first field being parsed and it begins with the
-++    ** UTF-8 BOM  (0xEF BB BF) then skip the BOM */
-++    if( (c&0xff)==0xef && p->bNotFirst==0 ){
-++      import_append_char(p, c);
-++      c = fgetc(p->in);
-++      if( (c&0xff)==0xbb ){
-++        import_append_char(p, c);
-++        c = fgetc(p->in);
-++        if( (c&0xff)==0xbf ){
-++          p->bNotFirst = 1;
-++          p->n = 0;
-++          return csv_read_one_field(p);
-++        }
-++      }
-++    }
-++    while( c!=EOF && c!=cSep && c!=rSep ){
-++      import_append_char(p, c);
-++      c = fgetc(p->in);
-++    }
-++    if( c==rSep ){
-++      p->nLine++;
-++      if( p->n>0 && p->z[p->n-1]=='\r' ) p->n--;
-++    }
-++    p->cTerm = c;
-++  }
-++  if( p->z ) p->z[p->n] = 0;
-++  p->bNotFirst = 1;
-++  return p->z;
-++}
-++
-++/* Read a single field of ASCII delimited text.
-++**
-++**   +  Input comes from p->in.
-++**   +  Store results in p->z of length p->n.  Space to hold p->z comes
-++**      from sqlite3_malloc64().
-++**   +  Use p->cSep as the column separator.  The default is "\x1F".
-++**   +  Use p->rSep as the row separator.  The default is "\x1E".
-++**   +  Keep track of the row number in p->nLine.
-++**   +  Store the character that terminates the field in p->cTerm.  Store
-++**      EOF on end-of-file.
-++**   +  Report syntax errors on stderr
-++*/
-++static char *SQLITE_CDECL ascii_read_one_field(ImportCtx *p){
-++  int c;
-++  int cSep = p->cColSep;
-++  int rSep = p->cRowSep;
-++  p->n = 0;
-++  c = fgetc(p->in);
-++  if( c==EOF || seenInterrupt ){
-++    p->cTerm = EOF;
-++    return 0;
-++  }
-++  while( c!=EOF && c!=cSep && c!=rSep ){
-++    import_append_char(p, c);
-++    c = fgetc(p->in);
-++  }
-++  if( c==rSep ){
-++    p->nLine++;
-++  }
-++  p->cTerm = c;
-++  if( p->z ) p->z[p->n] = 0;
-++  return p->z;
-++}
-++
-++/*
-++** Try to transfer data for table zTable.  If an error is seen while
-++** moving forward, try to go backwards.  The backwards movement won't
-++** work for WITHOUT ROWID tables.
-++*/
-++static void tryToCloneData(
-++  ShellState *p,
-++  sqlite3 *newDb,
-++  const char *zTable
-++){
-++  sqlite3_stmt *pQuery = 0;
-++  sqlite3_stmt *pInsert = 0;
-++  char *zQuery = 0;
-++  char *zInsert = 0;
-++  int rc;
-++  int i, j, n;
-++  int nTable = (int)strlen(zTable);
-++  int k = 0;
-++  int cnt = 0;
-++  const int spinRate = 10000;
-++
-++  zQuery = sqlite3_mprintf("SELECT * FROM \"%w\"", zTable);
-++  rc = sqlite3_prepare_v2(p->db, zQuery, -1, &pQuery, 0);
-++  if( rc ){
-++    utf8_printf(stderr, "Error %d: %s on [%s]\n",
-++            sqlite3_extended_errcode(p->db), sqlite3_errmsg(p->db),
-++            zQuery);
-++    goto end_data_xfer;
-++  }
-++  n = sqlite3_column_count(pQuery);
-++  zInsert = sqlite3_malloc64(200 + nTable + n*3);
-++  if( zInsert==0 ){
-++    raw_printf(stderr, "out of memory\n");
-++    goto end_data_xfer;
-++  }
-++  sqlite3_snprintf(200+nTable,zInsert,
-++                   "INSERT OR IGNORE INTO \"%s\" VALUES(?", zTable);
-++  i = (int)strlen(zInsert);
-++  for(j=1; j<n; j++){
-++    memcpy(zInsert+i, ",?", 2);
-++    i += 2;
-++  }
-++  memcpy(zInsert+i, ");", 3);
-++  rc = sqlite3_prepare_v2(newDb, zInsert, -1, &pInsert, 0);
-++  if( rc ){
-++    utf8_printf(stderr, "Error %d: %s on [%s]\n",
-++            sqlite3_extended_errcode(newDb), sqlite3_errmsg(newDb),
-++            zQuery);
-++    goto end_data_xfer;
-++  }
-++  for(k=0; k<2; k++){
-++    while( (rc = sqlite3_step(pQuery))==SQLITE_ROW ){
-++      for(i=0; i<n; i++){
-++        switch( sqlite3_column_type(pQuery, i) ){
-++          case SQLITE_NULL: {
-++            sqlite3_bind_null(pInsert, i+1);
-++            break;
-++          }
-++          case SQLITE_INTEGER: {
-++            sqlite3_bind_int64(pInsert, i+1, sqlite3_column_int64(pQuery,i));
-++            break;
-++          }
-++          case SQLITE_FLOAT: {
-++            sqlite3_bind_double(pInsert, i+1, sqlite3_column_double(pQuery,i));
-++            break;
-++          }
-++          case SQLITE_TEXT: {
-++            sqlite3_bind_text(pInsert, i+1,
-++                             (const char*)sqlite3_column_text(pQuery,i),
-++                             -1, SQLITE_STATIC);
-++            break;
-++          }
-++          case SQLITE_BLOB: {
-++            sqlite3_bind_blob(pInsert, i+1, sqlite3_column_blob(pQuery,i),
-++                                            sqlite3_column_bytes(pQuery,i),
-++                                            SQLITE_STATIC);
-++            break;
-++          }
-++        }
-++      } /* End for */
-++      rc = sqlite3_step(pInsert);
-++      if( rc!=SQLITE_OK && rc!=SQLITE_ROW && rc!=SQLITE_DONE ){
-++        utf8_printf(stderr, "Error %d: %s\n", sqlite3_extended_errcode(newDb),
-++                        sqlite3_errmsg(newDb));
-++      }
-++      sqlite3_reset(pInsert);
-++      cnt++;
-++      if( (cnt%spinRate)==0 ){
-++        printf("%c\b", "|/-\\"[(cnt/spinRate)%4]);
-++        fflush(stdout);
-++      }
-++    } /* End while */
-++    if( rc==SQLITE_DONE ) break;
-++    sqlite3_finalize(pQuery);
-++    sqlite3_free(zQuery);
-++    zQuery = sqlite3_mprintf("SELECT * FROM \"%w\" ORDER BY rowid DESC;",
-++                             zTable);
-++    rc = sqlite3_prepare_v2(p->db, zQuery, -1, &pQuery, 0);
-++    if( rc ){
-++      utf8_printf(stderr, "Warning: cannot step \"%s\" backwards", zTable);
-++      break;
-++    }
-++  } /* End for(k=0...) */
-++
-++end_data_xfer:
-++  sqlite3_finalize(pQuery);
-++  sqlite3_finalize(pInsert);
-++  sqlite3_free(zQuery);
-++  sqlite3_free(zInsert);
-++}
-++
-++
-++/*
-++** Try to transfer all rows of the schema that match zWhere.  For
-++** each row, invoke xForEach() on the object defined by that row.
-++** If an error is encountered while moving forward through the
-++** sqlite_master table, try again moving backwards.
-++*/
-++static void tryToCloneSchema(
-++  ShellState *p,
-++  sqlite3 *newDb,
-++  const char *zWhere,
-++  void (*xForEach)(ShellState*,sqlite3*,const char*)
-++){
-++  sqlite3_stmt *pQuery = 0;
-++  char *zQuery = 0;
-++  int rc;
-++  const unsigned char *zName;
-++  const unsigned char *zSql;
-++  char *zErrMsg = 0;
-++
-++  zQuery = sqlite3_mprintf("SELECT name, sql FROM sqlite_master"
-++                           " WHERE %s", zWhere);
-++  rc = sqlite3_prepare_v2(p->db, zQuery, -1, &pQuery, 0);
-++  if( rc ){
-++    utf8_printf(stderr, "Error: (%d) %s on [%s]\n",
-++                    sqlite3_extended_errcode(p->db), sqlite3_errmsg(p->db),
-++                    zQuery);
-++    goto end_schema_xfer;
-++  }
-++  while( (rc = sqlite3_step(pQuery))==SQLITE_ROW ){
-++    zName = sqlite3_column_text(pQuery, 0);
-++    zSql = sqlite3_column_text(pQuery, 1);
-++    printf("%s... ", zName); fflush(stdout);
-++    sqlite3_exec(newDb, (const char*)zSql, 0, 0, &zErrMsg);
-++    if( zErrMsg ){
-++      utf8_printf(stderr, "Error: %s\nSQL: [%s]\n", zErrMsg, zSql);
-++      sqlite3_free(zErrMsg);
-++      zErrMsg = 0;
-++    }
-++    if( xForEach ){
-++      xForEach(p, newDb, (const char*)zName);
-++    }
-++    printf("done\n");
-++  }
-++  if( rc!=SQLITE_DONE ){
-++    sqlite3_finalize(pQuery);
-++    sqlite3_free(zQuery);
-++    zQuery = sqlite3_mprintf("SELECT name, sql FROM sqlite_master"
-++                             " WHERE %s ORDER BY rowid DESC", zWhere);
-++    rc = sqlite3_prepare_v2(p->db, zQuery, -1, &pQuery, 0);
-++    if( rc ){
-++      utf8_printf(stderr, "Error: (%d) %s on [%s]\n",
-++                      sqlite3_extended_errcode(p->db), sqlite3_errmsg(p->db),
-++                      zQuery);
-++      goto end_schema_xfer;
-++    }
-++    while( (rc = sqlite3_step(pQuery))==SQLITE_ROW ){
-++      zName = sqlite3_column_text(pQuery, 0);
-++      zSql = sqlite3_column_text(pQuery, 1);
-++      printf("%s... ", zName); fflush(stdout);
-++      sqlite3_exec(newDb, (const char*)zSql, 0, 0, &zErrMsg);
-++      if( zErrMsg ){
-++        utf8_printf(stderr, "Error: %s\nSQL: [%s]\n", zErrMsg, zSql);
-++        sqlite3_free(zErrMsg);
-++        zErrMsg = 0;
-++      }
-++      if( xForEach ){
-++        xForEach(p, newDb, (const char*)zName);
-++      }
-++      printf("done\n");
-++    }
-++  }
-++end_schema_xfer:
-++  sqlite3_finalize(pQuery);
-++  sqlite3_free(zQuery);
-++}
-++
-++/*
-++** Open a new database file named "zNewDb".  Try to recover as much information
-++** as possible out of the main database (which might be corrupt) and write it
-++** into zNewDb.
-++*/
-++static void tryToClone(ShellState *p, const char *zNewDb){
-++  int rc;
-++  sqlite3 *newDb = 0;
-++  if( access(zNewDb,0)==0 ){
-++    utf8_printf(stderr, "File \"%s\" already exists.\n", zNewDb);
-++    return;
-++  }
-++  rc = sqlite3_open(zNewDb, &newDb);
-++  if( rc ){
-++    utf8_printf(stderr, "Cannot create output database: %s\n",
-++            sqlite3_errmsg(newDb));
-++  }else{
-++    sqlite3_exec(p->db, "PRAGMA writable_schema=ON;", 0, 0, 0);
-++    sqlite3_exec(newDb, "BEGIN EXCLUSIVE;", 0, 0, 0);
-++    tryToCloneSchema(p, newDb, "type='table'", tryToCloneData);
-++    tryToCloneSchema(p, newDb, "type!='table'", 0);
-++    sqlite3_exec(newDb, "COMMIT;", 0, 0, 0);
-++    sqlite3_exec(p->db, "PRAGMA writable_schema=OFF;", 0, 0, 0);
-++  }
-++  sqlite3_close(newDb);
-++}
-++
-++/*
-++** Change the output file back to stdout
-++*/
-++static void output_reset(ShellState *p){
-++  if( p->outfile[0]=='|' ){
-++#ifndef SQLITE_OMIT_POPEN
-++    pclose(p->out);
-++#endif
-++  }else{
-++    output_file_close(p->out);
-++  }
-++  p->outfile[0] = 0;
-++  p->out = stdout;
-++}
-++
-++/*
-++** Run an SQL command and return the single integer result.
-++*/
-++static int db_int(ShellState *p, const char *zSql){
-++  sqlite3_stmt *pStmt;
-++  int res = 0;
-++  sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
-++  if( pStmt && sqlite3_step(pStmt)==SQLITE_ROW ){
-++    res = sqlite3_column_int(pStmt,0);
-++  }
-++  sqlite3_finalize(pStmt);
-++  return res;
-++}
-++
-++/*
-++** Convert a 2-byte or 4-byte big-endian integer into a native integer
-++*/
-++static unsigned int get2byteInt(unsigned char *a){
-++  return (a[0]<<8) + a[1];
-++}
-++static unsigned int get4byteInt(unsigned char *a){
-++  return (a[0]<<24) + (a[1]<<16) + (a[2]<<8) + a[3];
-++}
-++
-++/*
-++** Implementation of the ".info" command.
-++**
-++** Return 1 on error, 2 to exit, and 0 otherwise.
-++*/
-++static int shell_dbinfo_command(ShellState *p, int nArg, char **azArg){
-++  static const struct { const char *zName; int ofst; } aField[] = {
-++     { "file change counter:",  24  },
-++     { "database page count:",  28  },
-++     { "freelist page count:",  36  },
-++     { "schema cookie:",        40  },
-++     { "schema format:",        44  },
-++     { "default cache size:",   48  },
-++     { "autovacuum top root:",  52  },
-++     { "incremental vacuum:",   64  },
-++     { "text encoding:",        56  },
-++     { "user version:",         60  },
-++     { "application id:",       68  },
-++     { "software version:",     96  },
-++  };
-++  static const struct { const char *zName; const char *zSql; } aQuery[] = {
-++     { "number of tables:",
-++       "SELECT count(*) FROM %s WHERE type='table'" },
-++     { "number of indexes:",
-++       "SELECT count(*) FROM %s WHERE type='index'" },
-++     { "number of triggers:",
-++       "SELECT count(*) FROM %s WHERE type='trigger'" },
-++     { "number of views:",
-++       "SELECT count(*) FROM %s WHERE type='view'" },
-++     { "schema size:",
-++       "SELECT total(length(sql)) FROM %s" },
-++  };
-++  int i;
-++  char *zSchemaTab;
-++  char *zDb = nArg>=2 ? azArg[1] : "main";
-++  sqlite3_stmt *pStmt = 0;
-++  unsigned char aHdr[100];
-++  open_db(p, 0);
-++  if( p->db==0 ) return 1;
-++  sqlite3_prepare_v2(p->db,"SELECT data FROM sqlite_dbpage(?1) WHERE pgno=1",
-++                     -1, &pStmt, 0);
-++  sqlite3_bind_text(pStmt, 1, zDb, -1, SQLITE_STATIC);
-++  if( sqlite3_step(pStmt)==SQLITE_ROW
-++   && sqlite3_column_bytes(pStmt,0)>100
-++  ){
-++    memcpy(aHdr, sqlite3_column_blob(pStmt,0), 100);
-++    sqlite3_finalize(pStmt);
-++  }else{
-++    raw_printf(stderr, "unable to read database header\n");
-++    sqlite3_finalize(pStmt);
-++    return 1;
-++  }
-++  i = get2byteInt(aHdr+16);
-++  if( i==1 ) i = 65536;
-++  utf8_printf(p->out, "%-20s %d\n", "database page size:", i);
-++  utf8_printf(p->out, "%-20s %d\n", "write format:", aHdr[18]);
-++  utf8_printf(p->out, "%-20s %d\n", "read format:", aHdr[19]);
-++  utf8_printf(p->out, "%-20s %d\n", "reserved bytes:", aHdr[20]);
-++  for(i=0; i<ArraySize(aField); i++){
-++    int ofst = aField[i].ofst;
-++    unsigned int val = get4byteInt(aHdr + ofst);
-++    utf8_printf(p->out, "%-20s %u", aField[i].zName, val);
-++    switch( ofst ){
-++      case 56: {
-++        if( val==1 ) raw_printf(p->out, " (utf8)");
-++        if( val==2 ) raw_printf(p->out, " (utf16le)");
-++        if( val==3 ) raw_printf(p->out, " (utf16be)");
-++      }
-++    }
-++    raw_printf(p->out, "\n");
-++  }
-++  if( zDb==0 ){
-++    zSchemaTab = sqlite3_mprintf("main.sqlite_master");
-++  }else if( strcmp(zDb,"temp")==0 ){
-++    zSchemaTab = sqlite3_mprintf("%s", "sqlite_temp_master");
-++  }else{
-++    zSchemaTab = sqlite3_mprintf("\"%w\".sqlite_master", zDb);
-++  }
-++  for(i=0; i<ArraySize(aQuery); i++){
-++    char *zSql = sqlite3_mprintf(aQuery[i].zSql, zSchemaTab);
-++    int val = db_int(p, zSql);
-++    sqlite3_free(zSql);
-++    utf8_printf(p->out, "%-20s %d\n", aQuery[i].zName, val);
-++  }
-++  sqlite3_free(zSchemaTab);
-++  return 0;
-++}
-++
-++/*
-++** Print the current sqlite3_errmsg() value to stderr and return 1.
-++*/
-++static int shellDatabaseError(sqlite3 *db){
-++  const char *zErr = sqlite3_errmsg(db);
-++  utf8_printf(stderr, "Error: %s\n", zErr);
-++  return 1;
-++}
-++
-++/*
-++** Print an out-of-memory message to stderr and return 1.
-++*/
-++static int shellNomemError(void){
-++  raw_printf(stderr, "Error: out of memory\n");
-++  return 1;
-++}
-++
-++/*
-++** Compare the pattern in zGlob[] against the text in z[].  Return TRUE
-++** if they match and FALSE (0) if they do not match.
-++**
-++** Globbing rules:
-++**
-++**      '*'       Matches any sequence of zero or more characters.
-++**
-++**      '?'       Matches exactly one character.
-++**
-++**     [...]      Matches one character from the enclosed list of
-++**                characters.
-++**
-++**     [^...]     Matches one character not in the enclosed list.
-++**
-++**      '#'       Matches any sequence of one or more digits with an
-++**                optional + or - sign in front
-++**
-++**      ' '       Any span of whitespace matches any other span of
-++**                whitespace.
-++**
-++** Extra whitespace at the end of z[] is ignored.
-++*/
-++static int testcase_glob(const char *zGlob, const char *z){
-++  int c, c2;
-++  int invert;
-++  int seen;
-++
-++  while( (c = (*(zGlob++)))!=0 ){
-++    if( IsSpace(c) ){
-++      if( !IsSpace(*z) ) return 0;
-++      while( IsSpace(*zGlob) ) zGlob++;
-++      while( IsSpace(*z) ) z++;
-++    }else if( c=='*' ){
-++      while( (c=(*(zGlob++))) == '*' || c=='?' ){
-++        if( c=='?' && (*(z++))==0 ) return 0;
-++      }
-++      if( c==0 ){
-++        return 1;
-++      }else if( c=='[' ){
-++        while( *z && testcase_glob(zGlob-1,z)==0 ){
-++          z++;
-++        }
-++        return (*z)!=0;
-++      }
-++      while( (c2 = (*(z++)))!=0 ){
-++        while( c2!=c ){
-++          c2 = *(z++);
-++          if( c2==0 ) return 0;
-++        }
-++        if( testcase_glob(zGlob,z) ) return 1;
-++      }
-++      return 0;
-++    }else if( c=='?' ){
-++      if( (*(z++))==0 ) return 0;
-++    }else if( c=='[' ){
-++      int prior_c = 0;
-++      seen = 0;
-++      invert = 0;
-++      c = *(z++);
-++      if( c==0 ) return 0;
-++      c2 = *(zGlob++);
-++      if( c2=='^' ){
-++        invert = 1;
-++        c2 = *(zGlob++);
-++      }
-++      if( c2==']' ){
-++        if( c==']' ) seen = 1;
-++        c2 = *(zGlob++);
-++      }
-++      while( c2 && c2!=']' ){
-++        if( c2=='-' && zGlob[0]!=']' && zGlob[0]!=0 && prior_c>0 ){
-++          c2 = *(zGlob++);
-++          if( c>=prior_c && c<=c2 ) seen = 1;
-++          prior_c = 0;
-++        }else{
-++          if( c==c2 ){
-++            seen = 1;
-++          }
-++          prior_c = c2;
-++        }
-++        c2 = *(zGlob++);
-++      }
-++      if( c2==0 || (seen ^ invert)==0 ) return 0;
-++    }else if( c=='#' ){
-++      if( (z[0]=='-' || z[0]=='+') && IsDigit(z[1]) ) z++;
-++      if( !IsDigit(z[0]) ) return 0;
-++      z++;
-++      while( IsDigit(z[0]) ){ z++; }
-++    }else{
-++      if( c!=(*(z++)) ) return 0;
-++    }
-++  }
-++  while( IsSpace(*z) ){ z++; }
-++  return *z==0;
-++}
-++
-++
-++/*
-++** Compare the string as a command-line option with either one or two
-++** initial "-" characters.
-++*/
-++static int optionMatch(const char *zStr, const char *zOpt){
-++  if( zStr[0]!='-' ) return 0;
-++  zStr++;
-++  if( zStr[0]=='-' ) zStr++;
-++  return strcmp(zStr, zOpt)==0;
-++}
-++
-++/*
-++** Delete a file.
-++*/
-++int shellDeleteFile(const char *zFilename){
-++  int rc;
-++#ifdef _WIN32
-++  wchar_t *z = sqlite3_win32_utf8_to_unicode(zFilename);
-++  rc = _wunlink(z);
-++  sqlite3_free(z);
-++#else
-++  rc = unlink(zFilename);
-++#endif
-++  return rc;
-++}
-++
-++
-++/*
-++** The implementation of SQL scalar function fkey_collate_clause(), used
-++** by the ".lint fkey-indexes" command. This scalar function is always
-++** called with four arguments - the parent table name, the parent column name,
-++** the child table name and the child column name.
-++**
-++**   fkey_collate_clause('parent-tab', 'parent-col', 'child-tab', 'child-col')
-++**
-++** If either of the named tables or columns do not exist, this function
-++** returns an empty string. An empty string is also returned if both tables
-++** and columns exist but have the same default collation sequence. Or,
-++** if both exist but the default collation sequences are different, this
-++** function returns the string " COLLATE <parent-collation>", where
-++** <parent-collation> is the default collation sequence of the parent column.
-++*/
-++static void shellFkeyCollateClause(
-++  sqlite3_context *pCtx,
-++  int nVal,
-++  sqlite3_value **apVal
-++){
-++  sqlite3 *db = sqlite3_context_db_handle(pCtx);
-++  const char *zParent;
-++  const char *zParentCol;
-++  const char *zParentSeq;
-++  const char *zChild;
-++  const char *zChildCol;
-++  const char *zChildSeq = 0;  /* Initialize to avoid false-positive warning */
-++  int rc;
-++
-++  assert( nVal==4 );
-++  zParent = (const char*)sqlite3_value_text(apVal[0]);
-++  zParentCol = (const char*)sqlite3_value_text(apVal[1]);
-++  zChild = (const char*)sqlite3_value_text(apVal[2]);
-++  zChildCol = (const char*)sqlite3_value_text(apVal[3]);
-++
-++  sqlite3_result_text(pCtx, "", -1, SQLITE_STATIC);
-++  rc = sqlite3_table_column_metadata(
-++      db, "main", zParent, zParentCol, 0, &zParentSeq, 0, 0, 0
-++  );
-++  if( rc==SQLITE_OK ){
-++    rc = sqlite3_table_column_metadata(
-++        db, "main", zChild, zChildCol, 0, &zChildSeq, 0, 0, 0
-++    );
-++  }
-++
-++  if( rc==SQLITE_OK && sqlite3_stricmp(zParentSeq, zChildSeq) ){
-++    char *z = sqlite3_mprintf(" COLLATE %s", zParentSeq);
-++    sqlite3_result_text(pCtx, z, -1, SQLITE_TRANSIENT);
-++    sqlite3_free(z);
-++  }
-++}
-++
-++
-++/*
-++** The implementation of dot-command ".lint fkey-indexes".
-++*/
-++static int lintFkeyIndexes(
-++  ShellState *pState,             /* Current shell tool state */
-++  char **azArg,                   /* Array of arguments passed to dot command */
-++  int nArg                        /* Number of entries in azArg[] */
-++){
-++  sqlite3 *db = pState->db;       /* Database handle to query "main" db of */
-++  FILE *out = pState->out;        /* Stream to write non-error output to */
-++  int bVerbose = 0;               /* If -verbose is present */
-++  int bGroupByParent = 0;         /* If -groupbyparent is present */
-++  int i;                          /* To iterate through azArg[] */
-++  const char *zIndent = "";       /* How much to indent CREATE INDEX by */
-++  int rc;                         /* Return code */
-++  sqlite3_stmt *pSql = 0;         /* Compiled version of SQL statement below */
-++
-++  /*
-++  ** This SELECT statement returns one row for each foreign key constraint
-++  ** in the schema of the main database. The column values are:
-++  **
-++  ** 0. The text of an SQL statement similar to:
-++  **
-++  **      "EXPLAIN QUERY PLAN SELECT rowid FROM child_table WHERE child_key=?"
-++  **
-++  **    This is the same SELECT that the foreign keys implementation needs
-++  **    to run internally on child tables. If there is an index that can
-++  **    be used to optimize this query, then it can also be used by the FK
-++  **    implementation to optimize DELETE or UPDATE statements on the parent
-++  **    table.
-++  **
-++  ** 1. A GLOB pattern suitable for sqlite3_strglob(). If the plan output by
-++  **    the EXPLAIN QUERY PLAN command matches this pattern, then the schema
-++  **    contains an index that can be used to optimize the query.
-++  **
-++  ** 2. Human readable text that describes the child table and columns. e.g.
-++  **
-++  **       "child_table(child_key1, child_key2)"
-++  **
-++  ** 3. Human readable text that describes the parent table and columns. e.g.
-++  **
-++  **       "parent_table(parent_key1, parent_key2)"
-++  **
-++  ** 4. A full CREATE INDEX statement for an index that could be used to
-++  **    optimize DELETE or UPDATE statements on the parent table. e.g.
-++  **
-++  **       "CREATE INDEX child_table_child_key ON child_table(child_key)"
-++  **
-++  ** 5. The name of the parent table.
-++  **
-++  ** These six values are used by the C logic below to generate the report.
-++  */
-++  const char *zSql =
-++  "SELECT "
-++    "     'EXPLAIN QUERY PLAN SELECT rowid FROM ' || quote(s.name) || ' WHERE '"
-++    "  || group_concat(quote(s.name) || '.' || quote(f.[from]) || '=?' "
-++    "  || fkey_collate_clause("
-++    "       f.[table], COALESCE(f.[to], p.[name]), s.name, f.[from]),' AND ')"
-++    ", "
-++    "     'SEARCH TABLE ' || s.name || ' USING COVERING INDEX*('"
-++    "  || group_concat('*=?', ' AND ') || ')'"
-++    ", "
-++    "     s.name  || '(' || group_concat(f.[from],  ', ') || ')'"
-++    ", "
-++    "     f.[table] || '(' || group_concat(COALESCE(f.[to], p.[name])) || ')'"
-++    ", "
-++    "     'CREATE INDEX ' || quote(s.name ||'_'|| group_concat(f.[from], '_'))"
-++    "  || ' ON ' || quote(s.name) || '('"
-++    "  || group_concat(quote(f.[from]) ||"
-++    "        fkey_collate_clause("
-++    "          f.[table], COALESCE(f.[to], p.[name]), s.name, f.[from]), ', ')"
-++    "  || ');'"
-++    ", "
-++    "     f.[table] "
-++    "FROM sqlite_master AS s, pragma_foreign_key_list(s.name) AS f "
-++    "LEFT JOIN pragma_table_info AS p ON (pk-1=seq AND p.arg=f.[table]) "
-++    "GROUP BY s.name, f.id "
-++    "ORDER BY (CASE WHEN ? THEN f.[table] ELSE s.name END)"
-++  ;
-++  const char *zGlobIPK = "SEARCH TABLE * USING INTEGER PRIMARY KEY (rowid=?)";
-++
-++  for(i=2; i<nArg; i++){
-++    int n = (int)strlen(azArg[i]);
-++    if( n>1 && sqlite3_strnicmp("-verbose", azArg[i], n)==0 ){
-++      bVerbose = 1;
-++    }
-++    else if( n>1 && sqlite3_strnicmp("-groupbyparent", azArg[i], n)==0 ){
-++      bGroupByParent = 1;
-++      zIndent = "    ";
-++    }
-++    else{
-++      raw_printf(stderr, "Usage: %s %s ?-verbose? ?-groupbyparent?\n",
-++          azArg[0], azArg[1]
-++      );
-++      return SQLITE_ERROR;
-++    }
-++  }
-++
-++  /* Register the fkey_collate_clause() SQL function */
-++  rc = sqlite3_create_function(db, "fkey_collate_clause", 4, SQLITE_UTF8,
-++      0, shellFkeyCollateClause, 0, 0
-++  );
-++
-++
-++  if( rc==SQLITE_OK ){
-++    rc = sqlite3_prepare_v2(db, zSql, -1, &pSql, 0);
-++  }
-++  if( rc==SQLITE_OK ){
-++    sqlite3_bind_int(pSql, 1, bGroupByParent);
-++  }
-++
-++  if( rc==SQLITE_OK ){
-++    int rc2;
-++    char *zPrev = 0;
-++    while( SQLITE_ROW==sqlite3_step(pSql) ){
-++      int res = -1;
-++      sqlite3_stmt *pExplain = 0;
-++      const char *zEQP = (const char*)sqlite3_column_text(pSql, 0);
-++      const char *zGlob = (const char*)sqlite3_column_text(pSql, 1);
-++      const char *zFrom = (const char*)sqlite3_column_text(pSql, 2);
-++      const char *zTarget = (const char*)sqlite3_column_text(pSql, 3);
-++      const char *zCI = (const char*)sqlite3_column_text(pSql, 4);
-++      const char *zParent = (const char*)sqlite3_column_text(pSql, 5);
-++
-++      rc = sqlite3_prepare_v2(db, zEQP, -1, &pExplain, 0);
-++      if( rc!=SQLITE_OK ) break;
-++      if( SQLITE_ROW==sqlite3_step(pExplain) ){
-++        const char *zPlan = (const char*)sqlite3_column_text(pExplain, 3);
-++        res = (
-++              0==sqlite3_strglob(zGlob, zPlan)
-++           || 0==sqlite3_strglob(zGlobIPK, zPlan)
-++        );
-++      }
-++      rc = sqlite3_finalize(pExplain);
-++      if( rc!=SQLITE_OK ) break;
-++
-++      if( res<0 ){
-++        raw_printf(stderr, "Error: internal error");
-++        break;
-++      }else{
-++        if( bGroupByParent
-++        && (bVerbose || res==0)
-++        && (zPrev==0 || sqlite3_stricmp(zParent, zPrev))
-++        ){
-++          raw_printf(out, "-- Parent table %s\n", zParent);
-++          sqlite3_free(zPrev);
-++          zPrev = sqlite3_mprintf("%s", zParent);
-++        }
-++
-++        if( res==0 ){
-++          raw_printf(out, "%s%s --> %s\n", zIndent, zCI, zTarget);
-++        }else if( bVerbose ){
-++          raw_printf(out, "%s/* no extra indexes required for %s -> %s */\n",
-++              zIndent, zFrom, zTarget
-++          );
-++        }
-++      }
-++    }
-++    sqlite3_free(zPrev);
-++
-++    if( rc!=SQLITE_OK ){
-++      raw_printf(stderr, "%s\n", sqlite3_errmsg(db));
-++    }
-++
-++    rc2 = sqlite3_finalize(pSql);
-++    if( rc==SQLITE_OK && rc2!=SQLITE_OK ){
-++      rc = rc2;
-++      raw_printf(stderr, "%s\n", sqlite3_errmsg(db));
-++    }
-++  }else{
-++    raw_printf(stderr, "%s\n", sqlite3_errmsg(db));
-++  }
-++
-++  return rc;
-++}
-++
-++/*
-++** Implementation of ".lint" dot command.
-++*/
-++static int lintDotCommand(
-++  ShellState *pState,             /* Current shell tool state */
-++  char **azArg,                   /* Array of arguments passed to dot command */
-++  int nArg                        /* Number of entries in azArg[] */
-++){
-++  int n;
-++  n = (nArg>=2 ? (int)strlen(azArg[1]) : 0);
-++  if( n<1 || sqlite3_strnicmp(azArg[1], "fkey-indexes", n) ) goto usage;
-++  return lintFkeyIndexes(pState, azArg, nArg);
-++
-++ usage:
-++  raw_printf(stderr, "Usage %s sub-command ?switches...?\n", azArg[0]);
-++  raw_printf(stderr, "Where sub-commands are:\n");
-++  raw_printf(stderr, "    fkey-indexes\n");
-++  return SQLITE_ERROR;
-++}
-++
-++
-++/*
-++** If an input line begins with "." then invoke this routine to
-++** process that line.
-++**
-++** Return 1 on error, 2 to exit, and 0 otherwise.
-++*/
-++static int do_meta_command(char *zLine, ShellState *p){
-++  int h = 1;
-++  int nArg = 0;
-++  int n, c;
-++  int rc = 0;
-++  char *azArg[50];
-++
-++  /* Parse the input line into tokens.
-++  */
-++  while( zLine[h] && nArg<ArraySize(azArg) ){
-++    while( IsSpace(zLine[h]) ){ h++; }
-++    if( zLine[h]==0 ) break;
-++    if( zLine[h]=='\'' || zLine[h]=='"' ){
-++      int delim = zLine[h++];
-++      azArg[nArg++] = &zLine[h];
-++      while( zLine[h] && zLine[h]!=delim ){
-++        if( zLine[h]=='\\' && delim=='"' && zLine[h+1]!=0 ) h++;
-++        h++;
-++      }
-++      if( zLine[h]==delim ){
-++        zLine[h++] = 0;
-++      }
-++      if( delim=='"' ) resolve_backslashes(azArg[nArg-1]);
-++    }else{
-++      azArg[nArg++] = &zLine[h];
-++      while( zLine[h] && !IsSpace(zLine[h]) ){ h++; }
-++      if( zLine[h] ) zLine[h++] = 0;
-++      resolve_backslashes(azArg[nArg-1]);
-++    }
-++  }
-++
-++  /* Process the input line.
-++  */
-++  if( nArg==0 ) return 0; /* no tokens, no error */
-++  n = strlen30(azArg[0]);
-++  c = azArg[0][0];
-++
-++#ifndef SQLITE_OMIT_AUTHORIZATION
-++  if( c=='a' && strncmp(azArg[0], "auth", n)==0 ){
-++    if( nArg!=2 ){
-++      raw_printf(stderr, "Usage: .auth ON|OFF\n");
-++      rc = 1;
-++      goto meta_command_exit;
-++    }
-++    open_db(p, 0);
-++    if( booleanValue(azArg[1]) ){
-++      sqlite3_set_authorizer(p->db, shellAuth, p);
-++    }else{
-++      sqlite3_set_authorizer(p->db, 0, 0);
-++    }
-++  }else
-++#endif
-++
-++  if( (c=='b' && n>=3 && strncmp(azArg[0], "backup", n)==0)
-++   || (c=='s' && n>=3 && strncmp(azArg[0], "save", n)==0)
-++  ){
-++    const char *zDestFile = 0;
-++    const char *zDb = 0;
-++    sqlite3 *pDest;
-++    sqlite3_backup *pBackup;
-++    int j;
-++    for(j=1; j<nArg; j++){
-++      const char *z = azArg[j];
-++      if( z[0]=='-' ){
-++        while( z[0]=='-' ) z++;
-++        /* No options to process at this time */
-++        {
-++          utf8_printf(stderr, "unknown option: %s\n", azArg[j]);
-++          return 1;
-++        }
-++      }else if( zDestFile==0 ){
-++        zDestFile = azArg[j];
-++      }else if( zDb==0 ){
-++        zDb = zDestFile;
-++        zDestFile = azArg[j];
-++      }else{
-++        raw_printf(stderr, "too many arguments to .backup\n");
-++        return 1;
-++      }
-++    }
-++    if( zDestFile==0 ){
-++      raw_printf(stderr, "missing FILENAME argument on .backup\n");
-++      return 1;
-++    }
-++    if( zDb==0 ) zDb = "main";
-++    rc = sqlite3_open(zDestFile, &pDest);
-++    if( rc!=SQLITE_OK ){
-++      utf8_printf(stderr, "Error: cannot open \"%s\"\n", zDestFile);
-++      sqlite3_close(pDest);
-++      return 1;
-++    }
-++    open_db(p, 0);
-++    pBackup = sqlite3_backup_init(pDest, "main", p->db, zDb);
-++    if( pBackup==0 ){
-++      utf8_printf(stderr, "Error: %s\n", sqlite3_errmsg(pDest));
-++      sqlite3_close(pDest);
-++      return 1;
-++    }
-++    while(  (rc = sqlite3_backup_step(pBackup,100))==SQLITE_OK ){}
-++    sqlite3_backup_finish(pBackup);
-++    if( rc==SQLITE_DONE ){
-++      rc = 0;
-++    }else{
-++      utf8_printf(stderr, "Error: %s\n", sqlite3_errmsg(pDest));
-++      rc = 1;
-++    }
-++    sqlite3_close(pDest);
-++  }else
-++
-++  if( c=='b' && n>=3 && strncmp(azArg[0], "bail", n)==0 ){
-++    if( nArg==2 ){
-++      bail_on_error = booleanValue(azArg[1]);
-++    }else{
-++      raw_printf(stderr, "Usage: .bail on|off\n");
-++      rc = 1;
-++    }
-++  }else
-++
-++  if( c=='b' && n>=3 && strncmp(azArg[0], "binary", n)==0 ){
-++    if( nArg==2 ){
-++      if( booleanValue(azArg[1]) ){
-++        setBinaryMode(p->out, 1);
-++      }else{
-++        setTextMode(p->out, 1);
-++      }
-++    }else{
-++      raw_printf(stderr, "Usage: .binary on|off\n");
-++      rc = 1;
-++    }
-++  }else
-++
-++  if( c=='c' && strcmp(azArg[0],"cd")==0 ){
-++    if( nArg==2 ){
-++#if defined(_WIN32) || defined(WIN32)
-++      wchar_t *z = sqlite3_win32_utf8_to_unicode(azArg[1]);
-++      rc = !SetCurrentDirectoryW(z);
-++      sqlite3_free(z);
-++#else
-++      rc = chdir(azArg[1]);
-++#endif
-++      if( rc ){
-++        utf8_printf(stderr, "Cannot change to directory \"%s\"\n", azArg[1]);
-++        rc = 1;
-++      }
-++    }else{
-++      raw_printf(stderr, "Usage: .cd DIRECTORY\n");
-++      rc = 1;
-++    }
-++  }else
-++
-++  /* The undocumented ".breakpoint" command causes a call to the no-op
-++  ** routine named test_breakpoint().
-++  */
-++  if( c=='b' && n>=3 && strncmp(azArg[0], "breakpoint", n)==0 ){
-++    test_breakpoint();
-++  }else
-++
-++  if( c=='c' && n>=3 && strncmp(azArg[0], "changes", n)==0 ){
-++    if( nArg==2 ){
-++      setOrClearFlag(p, SHFLG_CountChanges, azArg[1]);
-++    }else{
-++      raw_printf(stderr, "Usage: .changes on|off\n");
-++      rc = 1;
-++    }
-++  }else
-++
-++  /* Cancel output redirection, if it is currently set (by .testcase)
-++  ** Then read the content of the testcase-out.txt file and compare against
-++  ** azArg[1].  If there are differences, report an error and exit.
-++  */
-++  if( c=='c' && n>=3 && strncmp(azArg[0], "check", n)==0 ){
-++    char *zRes = 0;
-++    output_reset(p);
-++    if( nArg!=2 ){
-++      raw_printf(stderr, "Usage: .check GLOB-PATTERN\n");
-++      rc = 2;
-++    }else if( (zRes = readFile("testcase-out.txt", 0))==0 ){
-++      raw_printf(stderr, "Error: cannot read 'testcase-out.txt'\n");
-++      rc = 2;
-++    }else if( testcase_glob(azArg[1],zRes)==0 ){
-++      utf8_printf(stderr,
-++                 "testcase-%s FAILED\n Expected: [%s]\n      Got: [%s]\n",
-++                 p->zTestcase, azArg[1], zRes);
-++      rc = 1;
-++    }else{
-++      utf8_printf(stdout, "testcase-%s ok\n", p->zTestcase);
-++      p->nCheck++;
-++    }
-++    sqlite3_free(zRes);
-++  }else
-++
-++  if( c=='c' && strncmp(azArg[0], "clone", n)==0 ){
-++    if( nArg==2 ){
-++      tryToClone(p, azArg[1]);
-++    }else{
-++      raw_printf(stderr, "Usage: .clone FILENAME\n");
-++      rc = 1;
-++    }
-++  }else
-++
-++  if( c=='d' && n>1 && strncmp(azArg[0], "databases", n)==0 ){
-++    ShellState data;
-++    char *zErrMsg = 0;
-++    open_db(p, 0);
-++    memcpy(&data, p, sizeof(data));
-++    data.showHeader = 0;
-++    data.cMode = data.mode = MODE_List;
-++    sqlite3_snprintf(sizeof(data.colSeparator),data.colSeparator,": ");
-++    data.cnt = 0;
-++    sqlite3_exec(p->db, "SELECT name, file FROM pragma_database_list",
-++                 callback, &data, &zErrMsg);
-++    if( zErrMsg ){
-++      utf8_printf(stderr,"Error: %s\n", zErrMsg);
-++      sqlite3_free(zErrMsg);
-++      rc = 1;
-++    }
-++  }else
-++
-++  if( c=='d' && strncmp(azArg[0], "dbinfo", n)==0 ){
-++    rc = shell_dbinfo_command(p, nArg, azArg);
-++  }else
-++
-++  if( c=='d' && strncmp(azArg[0], "dump", n)==0 ){
-++    const char *zLike = 0;
-++    int i;
-++    int savedShowHeader = p->showHeader;
-++    ShellClearFlag(p, SHFLG_PreserveRowid|SHFLG_Newlines);
-++    for(i=1; i<nArg; i++){
-++      if( azArg[i][0]=='-' ){
-++        const char *z = azArg[i]+1;
-++        if( z[0]=='-' ) z++;
-++        if( strcmp(z,"preserve-rowids")==0 ){
-++#ifdef SQLITE_OMIT_VIRTUALTABLE
-++          raw_printf(stderr, "The --preserve-rowids option is not compatible"
-++                             " with SQLITE_OMIT_VIRTUALTABLE\n");
-++          rc = 1;
-++          goto meta_command_exit;
-++#else
-++          ShellSetFlag(p, SHFLG_PreserveRowid);
-++#endif
-++        }else
-++        if( strcmp(z,"newlines")==0 ){
-++          ShellSetFlag(p, SHFLG_Newlines);
-++        }else
-++        {
-++          raw_printf(stderr, "Unknown option \"%s\" on \".dump\"\n", azArg[i]);
-++          rc = 1;
-++          goto meta_command_exit;
-++        }
-++      }else if( zLike ){
-++        raw_printf(stderr, "Usage: .dump ?--preserve-rowids? "
-++                           "?--newlines? ?LIKE-PATTERN?\n");
-++        rc = 1;
-++        goto meta_command_exit;
-++      }else{
-++        zLike = azArg[i];
-++      }
-++    }
-++    open_db(p, 0);
-++    /* When playing back a "dump", the content might appear in an order
-++    ** which causes immediate foreign key constraints to be violated.
-++    ** So disable foreign-key constraint enforcement to prevent problems. */
-++    raw_printf(p->out, "PRAGMA foreign_keys=OFF;\n");
-++    raw_printf(p->out, "BEGIN TRANSACTION;\n");
-++    p->writableSchema = 0;
-++    p->showHeader = 0;
-++    /* Set writable_schema=ON since doing so forces SQLite to initialize
-++    ** as much of the schema as it can even if the sqlite_master table is
-++    ** corrupt. */
-++    sqlite3_exec(p->db, "SAVEPOINT dump; PRAGMA writable_schema=ON", 0, 0, 0);
-++    p->nErr = 0;
-++    if( zLike==0 ){
-++      run_schema_dump_query(p,
-++        "SELECT name, type, sql FROM sqlite_master "
-++        "WHERE sql NOT NULL AND type=='table' AND name!='sqlite_sequence'"
-++      );
-++      run_schema_dump_query(p,
-++        "SELECT name, type, sql FROM sqlite_master "
-++        "WHERE name=='sqlite_sequence'"
-++      );
-++      run_table_dump_query(p,
-++        "SELECT sql FROM sqlite_master "
-++        "WHERE sql NOT NULL AND type IN ('index','trigger','view')", 0
-++      );
-++    }else{
-++      char *zSql;
-++      zSql = sqlite3_mprintf(
-++        "SELECT name, type, sql FROM sqlite_master "
-++        "WHERE tbl_name LIKE %Q AND type=='table'"
-++        "  AND sql NOT NULL", zLike);
-++      run_schema_dump_query(p,zSql);
-++      sqlite3_free(zSql);
-++      zSql = sqlite3_mprintf(
-++        "SELECT sql FROM sqlite_master "
-++        "WHERE sql NOT NULL"
-++        "  AND type IN ('index','trigger','view')"
-++        "  AND tbl_name LIKE %Q", zLike);
-++      run_table_dump_query(p, zSql, 0);
-++      sqlite3_free(zSql);
-++    }
-++    if( p->writableSchema ){
-++      raw_printf(p->out, "PRAGMA writable_schema=OFF;\n");
-++      p->writableSchema = 0;
-++    }
-++    sqlite3_exec(p->db, "PRAGMA writable_schema=OFF;", 0, 0, 0);
-++    sqlite3_exec(p->db, "RELEASE dump;", 0, 0, 0);
-++    raw_printf(p->out, p->nErr ? "ROLLBACK; -- due to errors\n" : "COMMIT;\n");
-++    p->showHeader = savedShowHeader;
-++  }else
-++
-++  if( c=='e' && strncmp(azArg[0], "echo", n)==0 ){
-++    if( nArg==2 ){
-++      setOrClearFlag(p, SHFLG_Echo, azArg[1]);
-++    }else{
-++      raw_printf(stderr, "Usage: .echo on|off\n");
-++      rc = 1;
-++    }
-++  }else
-++
-++  if( c=='e' && strncmp(azArg[0], "eqp", n)==0 ){
-++    if( nArg==2 ){
-++      if( strcmp(azArg[1],"full")==0 ){
-++        p->autoEQP = 2;
-++      }else{
-++        p->autoEQP = booleanValue(azArg[1]);
-++      }
-++    }else{
-++      raw_printf(stderr, "Usage: .eqp on|off|full\n");
-++      rc = 1;
-++    }
-++  }else
-++
-++  if( c=='e' && strncmp(azArg[0], "exit", n)==0 ){
-++    if( nArg>1 && (rc = (int)integerValue(azArg[1]))!=0 ) exit(rc);
-++    rc = 2;
-++  }else
-++
-++  /* The ".explain" command is automatic now.  It is largely pointless.  It
-++  ** retained purely for backwards compatibility */
-++  if( c=='e' && strncmp(azArg[0], "explain", n)==0 ){
-++    int val = 1;
-++    if( nArg>=2 ){
-++      if( strcmp(azArg[1],"auto")==0 ){
-++        val = 99;
-++      }else{
-++        val =  booleanValue(azArg[1]);
-++      }
-++    }
-++    if( val==1 && p->mode!=MODE_Explain ){
-++      p->normalMode = p->mode;
-++      p->mode = MODE_Explain;
-++      p->autoExplain = 0;
-++    }else if( val==0 ){
-++      if( p->mode==MODE_Explain ) p->mode = p->normalMode;
-++      p->autoExplain = 0;
-++    }else if( val==99 ){
-++      if( p->mode==MODE_Explain ) p->mode = p->normalMode;
-++      p->autoExplain = 1;
-++    }
-++  }else
-++
-++  if( c=='f' && strncmp(azArg[0], "fullschema", n)==0 ){
-++    ShellState data;
-++    char *zErrMsg = 0;
-++    int doStats = 0;
-++    memcpy(&data, p, sizeof(data));
-++    data.showHeader = 0;
-++    data.cMode = data.mode = MODE_Semi;
-++    if( nArg==2 && optionMatch(azArg[1], "indent") ){
-++      data.cMode = data.mode = MODE_Pretty;
-++      nArg = 1;
-++    }
-++    if( nArg!=1 ){
-++      raw_printf(stderr, "Usage: .fullschema ?--indent?\n");
-++      rc = 1;
-++      goto meta_command_exit;
-++    }
-++    open_db(p, 0);
-++    rc = sqlite3_exec(p->db,
-++       "SELECT sql FROM"
-++       "  (SELECT sql sql, type type, tbl_name tbl_name, name name, rowid x"
-++       "     FROM sqlite_master UNION ALL"
-++       "   SELECT sql, type, tbl_name, name, rowid FROM sqlite_temp_master) "
-++       "WHERE type!='meta' AND sql NOTNULL AND name NOT LIKE 'sqlite_%' "
-++       "ORDER BY rowid",
-++       callback, &data, &zErrMsg
-++    );
-++    if( rc==SQLITE_OK ){
-++      sqlite3_stmt *pStmt;
-++      rc = sqlite3_prepare_v2(p->db,
-++               "SELECT rowid FROM sqlite_master"
-++               " WHERE name GLOB 'sqlite_stat[134]'",
-++               -1, &pStmt, 0);
-++      doStats = sqlite3_step(pStmt)==SQLITE_ROW;
-++      sqlite3_finalize(pStmt);
-++    }
-++    if( doStats==0 ){
-++      raw_printf(p->out, "/* No STAT tables available */\n");
-++    }else{
-++      raw_printf(p->out, "ANALYZE sqlite_master;\n");
-++      sqlite3_exec(p->db, "SELECT 'ANALYZE sqlite_master'",
-++                   callback, &data, &zErrMsg);
-++      data.cMode = data.mode = MODE_Insert;
-++      data.zDestTable = "sqlite_stat1";
-++      shell_exec(p->db, "SELECT * FROM sqlite_stat1",
-++                 shell_callback, &data,&zErrMsg);
-++      data.zDestTable = "sqlite_stat3";
-++      shell_exec(p->db, "SELECT * FROM sqlite_stat3",
-++                 shell_callback, &data,&zErrMsg);
-++      data.zDestTable = "sqlite_stat4";
-++      shell_exec(p->db, "SELECT * FROM sqlite_stat4",
-++                 shell_callback, &data, &zErrMsg);
-++      raw_printf(p->out, "ANALYZE sqlite_master;\n");
-++    }
-++  }else
-++
-++  if( c=='h' && strncmp(azArg[0], "headers", n)==0 ){
-++    if( nArg==2 ){
-++      p->showHeader = booleanValue(azArg[1]);
-++    }else{
-++      raw_printf(stderr, "Usage: .headers on|off\n");
-++      rc = 1;
-++    }
-++  }else
-++
-++  if( c=='h' && strncmp(azArg[0], "help", n)==0 ){
-++    utf8_printf(p->out, "%s", zHelp);
-++  }else
-++
-++  if( c=='i' && strncmp(azArg[0], "import", n)==0 ){
-++    char *zTable;               /* Insert data into this table */
-++    char *zFile;                /* Name of file to extra content from */
-++    sqlite3_stmt *pStmt = NULL; /* A statement */
-++    int nCol;                   /* Number of columns in the table */
-++    int nByte;                  /* Number of bytes in an SQL string */
-++    int i, j;                   /* Loop counters */
-++    int needCommit;             /* True to COMMIT or ROLLBACK at end */
-++    int nSep;                   /* Number of bytes in p->colSeparator[] */
-++    char *zSql;                 /* An SQL statement */
-++    ImportCtx sCtx;             /* Reader context */
-++    char *(SQLITE_CDECL *xRead)(ImportCtx*); /* Func to read one value */
-++    int (SQLITE_CDECL *xCloser)(FILE*);      /* Func to close file */
-++
-++    if( nArg!=3 ){
-++      raw_printf(stderr, "Usage: .import FILE TABLE\n");
-++      goto meta_command_exit;
-++    }
-++    zFile = azArg[1];
-++    zTable = azArg[2];
-++    seenInterrupt = 0;
-++    memset(&sCtx, 0, sizeof(sCtx));
-++    open_db(p, 0);
-++    nSep = strlen30(p->colSeparator);
-++    if( nSep==0 ){
-++      raw_printf(stderr,
-++                 "Error: non-null column separator required for import\n");
-++      return 1;
-++    }
-++    if( nSep>1 ){
-++      raw_printf(stderr, "Error: multi-character column separators not allowed"
-++                      " for import\n");
-++      return 1;
-++    }
-++    nSep = strlen30(p->rowSeparator);
-++    if( nSep==0 ){
-++      raw_printf(stderr, "Error: non-null row separator required for import\n");
-++      return 1;
-++    }
-++    if( nSep==2 && p->mode==MODE_Csv && strcmp(p->rowSeparator, SEP_CrLf)==0 ){
-++      /* When importing CSV (only), if the row separator is set to the
-++      ** default output row separator, change it to the default input
-++      ** row separator.  This avoids having to maintain different input
-++      ** and output row separators. */
-++      sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_Row);
-++      nSep = strlen30(p->rowSeparator);
-++    }
-++    if( nSep>1 ){
-++      raw_printf(stderr, "Error: multi-character row separators not allowed"
-++                      " for import\n");
-++      return 1;
-++    }
-++    sCtx.zFile = zFile;
-++    sCtx.nLine = 1;
-++    if( sCtx.zFile[0]=='|' ){
-++#ifdef SQLITE_OMIT_POPEN
-++      raw_printf(stderr, "Error: pipes are not supported in this OS\n");
-++      return 1;
-++#else
-++      sCtx.in = popen(sCtx.zFile+1, "r");
-++      sCtx.zFile = "<pipe>";
-++      xCloser = pclose;
-++#endif
-++    }else{
-++      sCtx.in = fopen(sCtx.zFile, "rb");
-++      xCloser = fclose;
-++    }
-++    if( p->mode==MODE_Ascii ){
-++      xRead = ascii_read_one_field;
-++    }else{
-++      xRead = csv_read_one_field;
-++    }
-++    if( sCtx.in==0 ){
-++      utf8_printf(stderr, "Error: cannot open \"%s\"\n", zFile);
-++      return 1;
-++    }
-++    sCtx.cColSep = p->colSeparator[0];
-++    sCtx.cRowSep = p->rowSeparator[0];
-++    zSql = sqlite3_mprintf("SELECT * FROM %s", zTable);
-++    if( zSql==0 ){
-++      raw_printf(stderr, "Error: out of memory\n");
-++      xCloser(sCtx.in);
-++      return 1;
-++    }
-++    nByte = strlen30(zSql);
-++    rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
-++    import_append_char(&sCtx, 0);    /* To ensure sCtx.z is allocated */
-++    if( rc && sqlite3_strglob("no such table: *", sqlite3_errmsg(p->db))==0 ){
-++      char *zCreate = sqlite3_mprintf("CREATE TABLE %s", zTable);
-++      char cSep = '(';
-++      while( xRead(&sCtx) ){
-++        zCreate = sqlite3_mprintf("%z%c\n  \"%w\" TEXT", zCreate, cSep, sCtx.z);
-++        cSep = ',';
-++        if( sCtx.cTerm!=sCtx.cColSep ) break;
-++      }
-++      if( cSep=='(' ){
-++        sqlite3_free(zCreate);
-++        sqlite3_free(sCtx.z);
-++        xCloser(sCtx.in);
-++        utf8_printf(stderr,"%s: empty file\n", sCtx.zFile);
-++        return 1;
-++      }
-++      zCreate = sqlite3_mprintf("%z\n)", zCreate);
-++      rc = sqlite3_exec(p->db, zCreate, 0, 0, 0);
-++      sqlite3_free(zCreate);
-++      if( rc ){
-++        utf8_printf(stderr, "CREATE TABLE %s(...) failed: %s\n", zTable,
-++                sqlite3_errmsg(p->db));
-++        sqlite3_free(sCtx.z);
-++        xCloser(sCtx.in);
-++        return 1;
-++      }
-++      rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
-++    }
-++    sqlite3_free(zSql);
-++    if( rc ){
-++      if (pStmt) sqlite3_finalize(pStmt);
-++      utf8_printf(stderr,"Error: %s\n", sqlite3_errmsg(p->db));
-++      xCloser(sCtx.in);
-++      return 1;
-++    }
-++    nCol = sqlite3_column_count(pStmt);
-++    sqlite3_finalize(pStmt);
-++    pStmt = 0;
-++    if( nCol==0 ) return 0; /* no columns, no error */
-++    zSql = sqlite3_malloc64( nByte*2 + 20 + nCol*2 );
-++    if( zSql==0 ){
-++      raw_printf(stderr, "Error: out of memory\n");
-++      xCloser(sCtx.in);
-++      return 1;
-++    }
-++    sqlite3_snprintf(nByte+20, zSql, "INSERT INTO \"%w\" VALUES(?", zTable);
-++    j = strlen30(zSql);
-++    for(i=1; i<nCol; i++){
-++      zSql[j++] = ',';
-++      zSql[j++] = '?';
-++    }
-++    zSql[j++] = ')';
-++    zSql[j] = 0;
-++    rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
-++    sqlite3_free(zSql);
-++    if( rc ){
-++      utf8_printf(stderr, "Error: %s\n", sqlite3_errmsg(p->db));
-++      if (pStmt) sqlite3_finalize(pStmt);
-++      xCloser(sCtx.in);
-++      return 1;
-++    }
-++    needCommit = sqlite3_get_autocommit(p->db);
-++    if( needCommit ) sqlite3_exec(p->db, "BEGIN", 0, 0, 0);
-++    do{
-++      int startLine = sCtx.nLine;
-++      for(i=0; i<nCol; i++){
-++        char *z = xRead(&sCtx);
-++        /*
-++        ** Did we reach end-of-file before finding any columns?
-++        ** If so, stop instead of NULL filling the remaining columns.
-++        */
-++        if( z==0 && i==0 ) break;
-++        /*
-++        ** Did we reach end-of-file OR end-of-line before finding any
-++        ** columns in ASCII mode?  If so, stop instead of NULL filling
-++        ** the remaining columns.
-++        */
-++        if( p->mode==MODE_Ascii && (z==0 || z[0]==0) && i==0 ) break;
-++        sqlite3_bind_text(pStmt, i+1, z, -1, SQLITE_TRANSIENT);
-++        if( i<nCol-1 && sCtx.cTerm!=sCtx.cColSep ){
-++          utf8_printf(stderr, "%s:%d: expected %d columns but found %d - "
-++                          "filling the rest with NULL\n",
-++                          sCtx.zFile, startLine, nCol, i+1);
-++          i += 2;
-++          while( i<=nCol ){ sqlite3_bind_null(pStmt, i); i++; }
-++        }
-++      }
-++      if( sCtx.cTerm==sCtx.cColSep ){
-++        do{
-++          xRead(&sCtx);
-++          i++;
-++        }while( sCtx.cTerm==sCtx.cColSep );
-++        utf8_printf(stderr, "%s:%d: expected %d columns but found %d - "
-++                        "extras ignored\n",
-++                        sCtx.zFile, startLine, nCol, i);
-++      }
-++      if( i>=nCol ){
-++        sqlite3_step(pStmt);
-++        rc = sqlite3_reset(pStmt);
-++        if( rc!=SQLITE_OK ){
-++          utf8_printf(stderr, "%s:%d: INSERT failed: %s\n", sCtx.zFile,
-++                      startLine, sqlite3_errmsg(p->db));
-++        }
-++      }
-++    }while( sCtx.cTerm!=EOF );
-++
-++    xCloser(sCtx.in);
-++    sqlite3_free(sCtx.z);
-++    sqlite3_finalize(pStmt);
-++    if( needCommit ) sqlite3_exec(p->db, "COMMIT", 0, 0, 0);
-++  }else
-++
-++#ifndef SQLITE_UNTESTABLE
-++  if( c=='i' && strncmp(azArg[0], "imposter", n)==0 ){
-++    char *zSql;
-++    char *zCollist = 0;
-++    sqlite3_stmt *pStmt;
-++    int tnum = 0;
-++    int i;
-++    if( nArg!=3 ){
-++      utf8_printf(stderr, "Usage: .imposter INDEX IMPOSTER\n");
-++      rc = 1;
-++      goto meta_command_exit;
-++    }
-++    open_db(p, 0);
-++    zSql = sqlite3_mprintf("SELECT rootpage FROM sqlite_master"
-++                           " WHERE name='%q' AND type='index'", azArg[1]);
-++    sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
-++    sqlite3_free(zSql);
-++    if( sqlite3_step(pStmt)==SQLITE_ROW ){
-++      tnum = sqlite3_column_int(pStmt, 0);
-++    }
-++    sqlite3_finalize(pStmt);
-++    if( tnum==0 ){
-++      utf8_printf(stderr, "no such index: \"%s\"\n", azArg[1]);
-++      rc = 1;
-++      goto meta_command_exit;
-++    }
-++    zSql = sqlite3_mprintf("PRAGMA index_xinfo='%q'", azArg[1]);
-++    rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
-++    sqlite3_free(zSql);
-++    i = 0;
-++    while( sqlite3_step(pStmt)==SQLITE_ROW ){
-++      char zLabel[20];
-++      const char *zCol = (const char*)sqlite3_column_text(pStmt,2);
-++      i++;
-++      if( zCol==0 ){
-++        if( sqlite3_column_int(pStmt,1)==-1 ){
-++          zCol = "_ROWID_";
-++        }else{
-++          sqlite3_snprintf(sizeof(zLabel),zLabel,"expr%d",i);
-++          zCol = zLabel;
-++        }
-++      }
-++      if( zCollist==0 ){
-++        zCollist = sqlite3_mprintf("\"%w\"", zCol);
-++      }else{
-++        zCollist = sqlite3_mprintf("%z,\"%w\"", zCollist, zCol);
-++      }
-++    }
-++    sqlite3_finalize(pStmt);
-++    zSql = sqlite3_mprintf(
-++          "CREATE TABLE \"%w\"(%s,PRIMARY KEY(%s))WITHOUT ROWID",
-++          azArg[2], zCollist, zCollist);
-++    sqlite3_free(zCollist);
-++    rc = sqlite3_test_control(SQLITE_TESTCTRL_IMPOSTER, p->db, "main", 1, tnum);
-++    if( rc==SQLITE_OK ){
-++      rc = sqlite3_exec(p->db, zSql, 0, 0, 0);
-++      sqlite3_test_control(SQLITE_TESTCTRL_IMPOSTER, p->db, "main", 0, 0);
-++      if( rc ){
-++        utf8_printf(stderr, "Error in [%s]: %s\n", zSql, sqlite3_errmsg(p->db));
-++      }else{
-++        utf8_printf(stdout, "%s;\n", zSql);
-++        raw_printf(stdout,
-++           "WARNING: writing to an imposter table will corrupt the index!\n"
-++        );
-++      }
-++    }else{
-++      raw_printf(stderr, "SQLITE_TESTCTRL_IMPOSTER returns %d\n", rc);
-++      rc = 1;
-++    }
-++    sqlite3_free(zSql);
-++  }else
-++#endif /* !defined(SQLITE_OMIT_TEST_CONTROL) */
-++
-++#ifdef SQLITE_ENABLE_IOTRACE
-++  if( c=='i' && strncmp(azArg[0], "iotrace", n)==0 ){
-++    SQLITE_API extern void (SQLITE_CDECL *sqlite3IoTrace)(const char*, ...);
-++    if( iotrace && iotrace!=stdout ) fclose(iotrace);
-++    iotrace = 0;
-++    if( nArg<2 ){
-++      sqlite3IoTrace = 0;
-++    }else if( strcmp(azArg[1], "-")==0 ){
-++      sqlite3IoTrace = iotracePrintf;
-++      iotrace = stdout;
-++    }else{
-++      iotrace = fopen(azArg[1], "w");
-++      if( iotrace==0 ){
-++        utf8_printf(stderr, "Error: cannot open \"%s\"\n", azArg[1]);
-++        sqlite3IoTrace = 0;
-++        rc = 1;
-++      }else{
-++        sqlite3IoTrace = iotracePrintf;
-++      }
-++    }
-++  }else
-++#endif
-++
-++  if( c=='l' && n>=5 && strncmp(azArg[0], "limits", n)==0 ){
-++    static const struct {
-++       const char *zLimitName;   /* Name of a limit */
-++       int limitCode;            /* Integer code for that limit */
-++    } aLimit[] = {
-++      { "length",                SQLITE_LIMIT_LENGTH                    },
-++      { "sql_length",            SQLITE_LIMIT_SQL_LENGTH                },
-++      { "column",                SQLITE_LIMIT_COLUMN                    },
-++      { "expr_depth",            SQLITE_LIMIT_EXPR_DEPTH                },
-++      { "compound_select",       SQLITE_LIMIT_COMPOUND_SELECT           },
-++      { "vdbe_op",               SQLITE_LIMIT_VDBE_OP                   },
-++      { "function_arg",          SQLITE_LIMIT_FUNCTION_ARG              },
-++      { "attached",              SQLITE_LIMIT_ATTACHED                  },
-++      { "like_pattern_length",   SQLITE_LIMIT_LIKE_PATTERN_LENGTH       },
-++      { "variable_number",       SQLITE_LIMIT_VARIABLE_NUMBER           },
-++      { "trigger_depth",         SQLITE_LIMIT_TRIGGER_DEPTH             },
-++      { "worker_threads",        SQLITE_LIMIT_WORKER_THREADS            },
-++    };
-++    int i, n2;
-++    open_db(p, 0);
-++    if( nArg==1 ){
-++      for(i=0; i<ArraySize(aLimit); i++){
-++        printf("%20s %d\n", aLimit[i].zLimitName,
-++               sqlite3_limit(p->db, aLimit[i].limitCode, -1));
-++      }
-++    }else if( nArg>3 ){
-++      raw_printf(stderr, "Usage: .limit NAME ?NEW-VALUE?\n");
-++      rc = 1;
-++      goto meta_command_exit;
-++    }else{
-++      int iLimit = -1;
-++      n2 = strlen30(azArg[1]);
-++      for(i=0; i<ArraySize(aLimit); i++){
-++        if( sqlite3_strnicmp(aLimit[i].zLimitName, azArg[1], n2)==0 ){
-++          if( iLimit<0 ){
-++            iLimit = i;
-++          }else{
-++            utf8_printf(stderr, "ambiguous limit: \"%s\"\n", azArg[1]);
-++            rc = 1;
-++            goto meta_command_exit;
-++          }
-++        }
-++      }
-++      if( iLimit<0 ){
-++        utf8_printf(stderr, "unknown limit: \"%s\"\n"
-++                        "enter \".limits\" with no arguments for a list.\n",
-++                         azArg[1]);
-++        rc = 1;
-++        goto meta_command_exit;
-++      }
-++      if( nArg==3 ){
-++        sqlite3_limit(p->db, aLimit[iLimit].limitCode,
-++                      (int)integerValue(azArg[2]));
-++      }
-++      printf("%20s %d\n", aLimit[iLimit].zLimitName,
-++             sqlite3_limit(p->db, aLimit[iLimit].limitCode, -1));
-++    }
-++  }else
-++
-++  if( c=='l' && n>2 && strncmp(azArg[0], "lint", n)==0 ){
-++    open_db(p, 0);
-++    lintDotCommand(p, azArg, nArg);
-++  }else
-++
-++#ifndef SQLITE_OMIT_LOAD_EXTENSION
-++  if( c=='l' && strncmp(azArg[0], "load", n)==0 ){
-++    const char *zFile, *zProc;
-++    char *zErrMsg = 0;
-++    if( nArg<2 ){
-++      raw_printf(stderr, "Usage: .load FILE ?ENTRYPOINT?\n");
-++      rc = 1;
-++      goto meta_command_exit;
-++    }
-++    zFile = azArg[1];
-++    zProc = nArg>=3 ? azArg[2] : 0;
-++    open_db(p, 0);
-++    rc = sqlite3_load_extension(p->db, zFile, zProc, &zErrMsg);
-++    if( rc!=SQLITE_OK ){
-++      utf8_printf(stderr, "Error: %s\n", zErrMsg);
-++      sqlite3_free(zErrMsg);
-++      rc = 1;
-++    }
-++  }else
-++#endif
-++
-++  if( c=='l' && strncmp(azArg[0], "log", n)==0 ){
-++    if( nArg!=2 ){
-++      raw_printf(stderr, "Usage: .log FILENAME\n");
-++      rc = 1;
-++    }else{
-++      const char *zFile = azArg[1];
-++      output_file_close(p->pLog);
-++      p->pLog = output_file_open(zFile);
-++    }
-++  }else
-++
-++  if( c=='m' && strncmp(azArg[0], "mode", n)==0 ){
-++    const char *zMode = nArg>=2 ? azArg[1] : "";
-++    int n2 = (int)strlen(zMode);
-++    int c2 = zMode[0];
-++    if( c2=='l' && n2>2 && strncmp(azArg[1],"lines",n2)==0 ){
-++      p->mode = MODE_Line;
-++      sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_Row);
-++    }else if( c2=='c' && strncmp(azArg[1],"columns",n2)==0 ){
-++      p->mode = MODE_Column;
-++      sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_Row);
-++    }else if( c2=='l' && n2>2 && strncmp(azArg[1],"list",n2)==0 ){
-++      p->mode = MODE_List;
-++      sqlite3_snprintf(sizeof(p->colSeparator), p->colSeparator, SEP_Column);
-++      sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_Row);
-++    }else if( c2=='h' && strncmp(azArg[1],"html",n2)==0 ){
-++      p->mode = MODE_Html;
-++    }else if( c2=='t' && strncmp(azArg[1],"tcl",n2)==0 ){
-++      p->mode = MODE_Tcl;
-++      sqlite3_snprintf(sizeof(p->colSeparator), p->colSeparator, SEP_Space);
-++      sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_Row);
-++    }else if( c2=='c' && strncmp(azArg[1],"csv",n2)==0 ){
-++      p->mode = MODE_Csv;
-++      sqlite3_snprintf(sizeof(p->colSeparator), p->colSeparator, SEP_Comma);
-++      sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_CrLf);
-++    }else if( c2=='t' && strncmp(azArg[1],"tabs",n2)==0 ){
-++      p->mode = MODE_List;
-++      sqlite3_snprintf(sizeof(p->colSeparator), p->colSeparator, SEP_Tab);
-++    }else if( c2=='i' && strncmp(azArg[1],"insert",n2)==0 ){
-++      p->mode = MODE_Insert;
-++      set_table_name(p, nArg>=3 ? azArg[2] : "table");
-++    }else if( c2=='q' && strncmp(azArg[1],"quote",n2)==0 ){
-++      p->mode = MODE_Quote;
-++    }else if( c2=='a' && strncmp(azArg[1],"ascii",n2)==0 ){
-++      p->mode = MODE_Ascii;
-++      sqlite3_snprintf(sizeof(p->colSeparator), p->colSeparator, SEP_Unit);
-++      sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_Record);
-++    }else if( nArg==1 ){
-++      raw_printf(p->out, "current output mode: %s\n", modeDescr[p->mode]);
-++    }else{
-++      raw_printf(stderr, "Error: mode should be one of: "
-++         "ascii column csv html insert line list quote tabs tcl\n");
-++      rc = 1;
-++    }
-++    p->cMode = p->mode;
-++  }else
-++
-++  if( c=='n' && strncmp(azArg[0], "nullvalue", n)==0 ){
-++    if( nArg==2 ){
-++      sqlite3_snprintf(sizeof(p->nullValue), p->nullValue,
-++                       "%.*s", (int)ArraySize(p->nullValue)-1, azArg[1]);
-++    }else{
-++      raw_printf(stderr, "Usage: .nullvalue STRING\n");
-++      rc = 1;
-++    }
-++  }else
-++
-++  if( c=='o' && strncmp(azArg[0], "open", n)==0 && n>=2 ){
-++    char *zNewFilename;  /* Name of the database file to open */
-++    int iName = 1;       /* Index in azArg[] of the filename */
-++    int newFlag = 0;     /* True to delete file before opening */
-++    /* Close the existing database */
-++    session_close_all(p);
-++    sqlite3_close(p->db);
-++    p->db = 0;
-++    p->zDbFilename = 0;
-++    sqlite3_free(p->zFreeOnClose);
-++    p->zFreeOnClose = 0;
-++    /* Check for command-line arguments */
-++    for(iName=1; iName<nArg && azArg[iName][0]=='-'; iName++){
-++      const char *z = azArg[iName];
-++      if( optionMatch(z,"new") ){
-++        newFlag = 1;
-++      }else if( z[0]=='-' ){
-++        utf8_printf(stderr, "unknown option: %s\n", z);
-++        rc = 1;
-++        goto meta_command_exit;
-++      }
-++    }
-++    /* If a filename is specified, try to open it first */
-++    zNewFilename = nArg>iName ? sqlite3_mprintf("%s", azArg[iName]) : 0;
-++    if( zNewFilename ){
-++      if( newFlag ) shellDeleteFile(zNewFilename);
-++      p->zDbFilename = zNewFilename;
-++      open_db(p, 1);
-++      if( p->db==0 ){
-++        utf8_printf(stderr, "Error: cannot open '%s'\n", zNewFilename);
-++        sqlite3_free(zNewFilename);
-++      }else{
-++        p->zFreeOnClose = zNewFilename;
-++      }
-++    }
-++    if( p->db==0 ){
-++      /* As a fall-back open a TEMP database */
-++      p->zDbFilename = 0;
-++      open_db(p, 0);
-++    }
-++  }else
-++
-++  if( c=='o'
-++   && (strncmp(azArg[0], "output", n)==0 || strncmp(azArg[0], "once", n)==0)
-++  ){
-++    const char *zFile = nArg>=2 ? azArg[1] : "stdout";
-++    if( nArg>2 ){
-++      utf8_printf(stderr, "Usage: .%s FILE\n", azArg[0]);
-++      rc = 1;
-++      goto meta_command_exit;
-++    }
-++    if( n>1 && strncmp(azArg[0], "once", n)==0 ){
-++      if( nArg<2 ){
-++        raw_printf(stderr, "Usage: .once FILE\n");
-++        rc = 1;
-++        goto meta_command_exit;
-++      }
-++      p->outCount = 2;
-++    }else{
-++      p->outCount = 0;
-++    }
-++    output_reset(p);
-++    if( zFile[0]=='|' ){
-++#ifdef SQLITE_OMIT_POPEN
-++      raw_printf(stderr, "Error: pipes are not supported in this OS\n");
-++      rc = 1;
-++      p->out = stdout;
-++#else
-++      p->out = popen(zFile + 1, "w");
-++      if( p->out==0 ){
-++        utf8_printf(stderr,"Error: cannot open pipe \"%s\"\n", zFile + 1);
-++        p->out = stdout;
-++        rc = 1;
-++      }else{
-++        sqlite3_snprintf(sizeof(p->outfile), p->outfile, "%s", zFile);
-++      }
-++#endif
-++    }else{
-++      p->out = output_file_open(zFile);
-++      if( p->out==0 ){
-++        if( strcmp(zFile,"off")!=0 ){
-++          utf8_printf(stderr,"Error: cannot write to \"%s\"\n", zFile);
-++        }
-++        p->out = stdout;
-++        rc = 1;
-++      } else {
-++        sqlite3_snprintf(sizeof(p->outfile), p->outfile, "%s", zFile);
-++      }
-++    }
-++  }else
-++
-++  if( c=='p' && n>=3 && strncmp(azArg[0], "print", n)==0 ){
-++    int i;
-++    for(i=1; i<nArg; i++){
-++      if( i>1 ) raw_printf(p->out, " ");
-++      utf8_printf(p->out, "%s", azArg[i]);
-++    }
-++    raw_printf(p->out, "\n");
-++  }else
-++
-++  if( c=='p' && strncmp(azArg[0], "prompt", n)==0 ){
-++    if( nArg >= 2) {
-++      strncpy(mainPrompt,azArg[1],(int)ArraySize(mainPrompt)-1);
-++    }
-++    if( nArg >= 3) {
-++      strncpy(continuePrompt,azArg[2],(int)ArraySize(continuePrompt)-1);
-++    }
-++  }else
-++
-++  if( c=='q' && strncmp(azArg[0], "quit", n)==0 ){
-++    rc = 2;
-++  }else
-++
-++  if( c=='r' && n>=3 && strncmp(azArg[0], "read", n)==0 ){
-++    FILE *alt;
-++    if( nArg!=2 ){
-++      raw_printf(stderr, "Usage: .read FILE\n");
-++      rc = 1;
-++      goto meta_command_exit;
-++    }
-++    alt = fopen(azArg[1], "rb");
-++    if( alt==0 ){
-++      utf8_printf(stderr,"Error: cannot open \"%s\"\n", azArg[1]);
-++      rc = 1;
-++    }else{
-++      rc = process_input(p, alt);
-++      fclose(alt);
-++    }
-++  }else
-++
-++  if( c=='r' && n>=3 && strncmp(azArg[0], "restore", n)==0 ){
-++    const char *zSrcFile;
-++    const char *zDb;
-++    sqlite3 *pSrc;
-++    sqlite3_backup *pBackup;
-++    int nTimeout = 0;
-++
-++    if( nArg==2 ){
-++      zSrcFile = azArg[1];
-++      zDb = "main";
-++    }else if( nArg==3 ){
-++      zSrcFile = azArg[2];
-++      zDb = azArg[1];
-++    }else{
-++      raw_printf(stderr, "Usage: .restore ?DB? FILE\n");
-++      rc = 1;
-++      goto meta_command_exit;
-++    }
-++    rc = sqlite3_open(zSrcFile, &pSrc);
-++    if( rc!=SQLITE_OK ){
-++      utf8_printf(stderr, "Error: cannot open \"%s\"\n", zSrcFile);
-++      sqlite3_close(pSrc);
-++      return 1;
-++    }
-++    open_db(p, 0);
-++    pBackup = sqlite3_backup_init(p->db, zDb, pSrc, "main");
-++    if( pBackup==0 ){
-++      utf8_printf(stderr, "Error: %s\n", sqlite3_errmsg(p->db));
-++      sqlite3_close(pSrc);
-++      return 1;
-++    }
-++    while( (rc = sqlite3_backup_step(pBackup,100))==SQLITE_OK
-++          || rc==SQLITE_BUSY  ){
-++      if( rc==SQLITE_BUSY ){
-++        if( nTimeout++ >= 3 ) break;
-++        sqlite3_sleep(100);
-++      }
-++    }
-++    sqlite3_backup_finish(pBackup);
-++    if( rc==SQLITE_DONE ){
-++      rc = 0;
-++    }else if( rc==SQLITE_BUSY || rc==SQLITE_LOCKED ){
-++      raw_printf(stderr, "Error: source database is busy\n");
-++      rc = 1;
-++    }else{
-++      utf8_printf(stderr, "Error: %s\n", sqlite3_errmsg(p->db));
-++      rc = 1;
-++    }
-++    sqlite3_close(pSrc);
-++  }else
-++
-++
-++  if( c=='s' && strncmp(azArg[0], "scanstats", n)==0 ){
-++    if( nArg==2 ){
-++      p->scanstatsOn = booleanValue(azArg[1]);
-++#ifndef SQLITE_ENABLE_STMT_SCANSTATUS
-++      raw_printf(stderr, "Warning: .scanstats not available in this build.\n");
-++#endif
-++    }else{
-++      raw_printf(stderr, "Usage: .scanstats on|off\n");
-++      rc = 1;
-++    }
-++  }else
-++
-++  if( c=='s' && strncmp(azArg[0], "schema", n)==0 ){
-++    ShellText sSelect;
-++    ShellState data;
-++    char *zErrMsg = 0;
-++    const char *zDiv = 0;
-++    int iSchema = 0;
-++
-++    open_db(p, 0);
-++    memcpy(&data, p, sizeof(data));
-++    data.showHeader = 0;
-++    data.cMode = data.mode = MODE_Semi;
-++    initText(&sSelect);
-++    if( nArg>=2 && optionMatch(azArg[1], "indent") ){
-++      data.cMode = data.mode = MODE_Pretty;
-++      nArg--;
-++      if( nArg==2 ) azArg[1] = azArg[2];
-++    }
-++    if( nArg==2 && azArg[1][0]!='-' ){
-++      int i;
-++      for(i=0; azArg[1][i]; i++) azArg[1][i] = ToLower(azArg[1][i]);
-++      if( strcmp(azArg[1],"sqlite_master")==0 ){
-++        char *new_argv[2], *new_colv[2];
-++        new_argv[0] = "CREATE TABLE sqlite_master (\n"
-++                      "  type text,\n"
-++                      "  name text,\n"
-++                      "  tbl_name text,\n"
-++                      "  rootpage integer,\n"
-++                      "  sql text\n"
-++                      ")";
-++        new_argv[1] = 0;
-++        new_colv[0] = "sql";
-++        new_colv[1] = 0;
-++        callback(&data, 1, new_argv, new_colv);
-++        rc = SQLITE_OK;
-++      }else if( strcmp(azArg[1],"sqlite_temp_master")==0 ){
-++        char *new_argv[2], *new_colv[2];
-++        new_argv[0] = "CREATE TEMP TABLE sqlite_temp_master (\n"
-++                      "  type text,\n"
-++                      "  name text,\n"
-++                      "  tbl_name text,\n"
-++                      "  rootpage integer,\n"
-++                      "  sql text\n"
-++                      ")";
-++        new_argv[1] = 0;
-++        new_colv[0] = "sql";
-++        new_colv[1] = 0;
-++        callback(&data, 1, new_argv, new_colv);
-++        rc = SQLITE_OK;
-++      }else{
-++        zDiv = "(";
-++      }
-++    }else if( nArg==1 ){
-++      zDiv = "(";
-++    }else{
-++      raw_printf(stderr, "Usage: .schema ?--indent? ?LIKE-PATTERN?\n");
-++      rc = 1;
-++      goto meta_command_exit;
-++    }
-++    if( zDiv ){
-++      sqlite3_stmt *pStmt = 0;
-++      rc = sqlite3_prepare_v2(p->db, "SELECT name FROM pragma_database_list",
-++                              -1, &pStmt, 0);
-++      if( rc ){
-++        utf8_printf(stderr, "Error: %s\n", sqlite3_errmsg(p->db));
-++        sqlite3_finalize(pStmt);
-++        rc = 1;
-++        goto meta_command_exit;
-++      }
-++      appendText(&sSelect, "SELECT sql FROM", 0);
-++      iSchema = 0;
-++      while( sqlite3_step(pStmt)==SQLITE_ROW ){
-++        const char *zDb = (const char*)sqlite3_column_text(pStmt, 0);
-++        char zScNum[30];
-++        sqlite3_snprintf(sizeof(zScNum), zScNum, "%d", ++iSchema);
-++        appendText(&sSelect, zDiv, 0);
-++        zDiv = " UNION ALL ";
-++        if( strcmp(zDb, "main")!=0 ){
-++          appendText(&sSelect, "SELECT shell_add_schema(sql,", 0);
-++          appendText(&sSelect, zDb, '"');
-++          appendText(&sSelect, ") AS sql, type, tbl_name, name, rowid,", 0);
-++          appendText(&sSelect, zScNum, 0);
-++          appendText(&sSelect, " AS snum, ", 0);
-++          appendText(&sSelect, zDb, '\'');
-++          appendText(&sSelect, " AS sname FROM ", 0);
-++          appendText(&sSelect, zDb, '"');
-++          appendText(&sSelect, ".sqlite_master", 0);
-++        }else{
-++          appendText(&sSelect, "SELECT sql, type, tbl_name, name, rowid, ", 0);
-++          appendText(&sSelect, zScNum, 0);
-++          appendText(&sSelect, " AS snum, 'main' AS sname FROM sqlite_master",0);
-++        }
-++      }
-++      sqlite3_finalize(pStmt);
-++      appendText(&sSelect, ") WHERE ", 0);
-++      if( nArg>1 ){
-++        char *zQarg = sqlite3_mprintf("%Q", azArg[1]);
-++        if( strchr(azArg[1], '.') ){
-++          appendText(&sSelect, "lower(printf('%s.%s',sname,tbl_name))", 0);
-++        }else{
-++          appendText(&sSelect, "lower(tbl_name)", 0);
-++        }
-++        appendText(&sSelect, strchr(azArg[1], '*') ? " GLOB " : " LIKE ", 0);
-++        appendText(&sSelect, zQarg, 0);
-++        appendText(&sSelect, " AND ", 0);
-++        sqlite3_free(zQarg);
-++      }
-++      appendText(&sSelect, "type!='meta' AND sql IS NOT NULL"
-++                           " ORDER BY snum, rowid", 0);
-++      rc = sqlite3_exec(p->db, sSelect.z, callback, &data, &zErrMsg);
-++      freeText(&sSelect);
-++    }
-++    if( zErrMsg ){
-++      utf8_printf(stderr,"Error: %s\n", zErrMsg);
-++      sqlite3_free(zErrMsg);
-++      rc = 1;
-++    }else if( rc != SQLITE_OK ){
-++      raw_printf(stderr,"Error: querying schema information\n");
-++      rc = 1;
-++    }else{
-++      rc = 0;
-++    }
-++  }else
-++
-++#if defined(SQLITE_DEBUG) && defined(SQLITE_ENABLE_SELECTTRACE)
-++  if( c=='s' && n==11 && strncmp(azArg[0], "selecttrace", n)==0 ){
-++    sqlite3SelectTrace = (int)integerValue(azArg[1]);
-++  }else
-++#endif
-++
-++#if defined(SQLITE_ENABLE_SESSION)
-++  if( c=='s' && strncmp(azArg[0],"session",n)==0 && n>=3 ){
-++    OpenSession *pSession = &p->aSession[0];
-++    char **azCmd = &azArg[1];
-++    int iSes = 0;
-++    int nCmd = nArg - 1;
-++    int i;
-++    if( nArg<=1 ) goto session_syntax_error;
-++    open_db(p, 0);
-++    if( nArg>=3 ){
-++      for(iSes=0; iSes<p->nSession; iSes++){
-++        if( strcmp(p->aSession[iSes].zName, azArg[1])==0 ) break;
-++      }
-++      if( iSes<p->nSession ){
-++        pSession = &p->aSession[iSes];
-++        azCmd++;
-++        nCmd--;
-++      }else{
-++        pSession = &p->aSession[0];
-++        iSes = 0;
-++      }
-++    }
-++
-++    /* .session attach TABLE
-++    ** Invoke the sqlite3session_attach() interface to attach a particular
-++    ** table so that it is never filtered.
-++    */
-++    if( strcmp(azCmd[0],"attach")==0 ){
-++      if( nCmd!=2 ) goto session_syntax_error;
-++      if( pSession->p==0 ){
-++        session_not_open:
-++        raw_printf(stderr, "ERROR: No sessions are open\n");
-++      }else{
-++        rc = sqlite3session_attach(pSession->p, azCmd[1]);
-++        if( rc ){
-++          raw_printf(stderr, "ERROR: sqlite3session_attach() returns %d\n", rc);
-++          rc = 0;
-++        }
-++      }
-++    }else
-++
-++    /* .session changeset FILE
-++    ** .session patchset FILE
-++    ** Write a changeset or patchset into a file.  The file is overwritten.
-++    */
-++    if( strcmp(azCmd[0],"changeset")==0 || strcmp(azCmd[0],"patchset")==0 ){
-++      FILE *out = 0;
-++      if( nCmd!=2 ) goto session_syntax_error;
-++      if( pSession->p==0 ) goto session_not_open;
-++      out = fopen(azCmd[1], "wb");
-++      if( out==0 ){
-++        utf8_printf(stderr, "ERROR: cannot open \"%s\" for writing\n", azCmd[1]);
-++      }else{
-++        int szChng;
-++        void *pChng;
-++        if( azCmd[0][0]=='c' ){
-++          rc = sqlite3session_changeset(pSession->p, &szChng, &pChng);
-++        }else{
-++          rc = sqlite3session_patchset(pSession->p, &szChng, &pChng);
-++        }
-++        if( rc ){
-++          printf("Error: error code %d\n", rc);
-++          rc = 0;
-++        }
-++        if( pChng
-++          && fwrite(pChng, szChng, 1, out)!=1 ){
-++          raw_printf(stderr, "ERROR: Failed to write entire %d-byte output\n",
-++                  szChng);
-++        }
-++        sqlite3_free(pChng);
-++        fclose(out);
-++      }
-++    }else
-++
-++    /* .session close
-++    ** Close the identified session
-++    */
-++    if( strcmp(azCmd[0], "close")==0 ){
-++      if( nCmd!=1 ) goto session_syntax_error;
-++      if( p->nSession ){
-++        session_close(pSession);
-++        p->aSession[iSes] = p->aSession[--p->nSession];
-++      }
-++    }else
-++
-++    /* .session enable ?BOOLEAN?
-++    ** Query or set the enable flag
-++    */
-++    if( strcmp(azCmd[0], "enable")==0 ){
-++      int ii;
-++      if( nCmd>2 ) goto session_syntax_error;
-++      ii = nCmd==1 ? -1 : booleanValue(azCmd[1]);
-++      if( p->nSession ){
-++        ii = sqlite3session_enable(pSession->p, ii);
-++        utf8_printf(p->out, "session %s enable flag = %d\n",
-++                    pSession->zName, ii);
-++      }
-++    }else
-++
-++    /* .session filter GLOB ....
-++    ** Set a list of GLOB patterns of table names to be excluded.
-++    */
-++    if( strcmp(azCmd[0], "filter")==0 ){
-++      int ii, nByte;
-++      if( nCmd<2 ) goto session_syntax_error;
-++      if( p->nSession ){
-++        for(ii=0; ii<pSession->nFilter; ii++){
-++          sqlite3_free(pSession->azFilter[ii]);
-++        }
-++        sqlite3_free(pSession->azFilter);
-++        nByte = sizeof(pSession->azFilter[0])*(nCmd-1);
-++        pSession->azFilter = sqlite3_malloc( nByte );
-++        if( pSession->azFilter==0 ){
-++          raw_printf(stderr, "Error: out or memory\n");
-++          exit(1);
-++        }
-++        for(ii=1; ii<nCmd; ii++){
-++          pSession->azFilter[ii-1] = sqlite3_mprintf("%s", azCmd[ii]);
-++        }
-++        pSession->nFilter = ii-1;
-++      }
-++    }else
-++
-++    /* .session indirect ?BOOLEAN?
-++    ** Query or set the indirect flag
-++    */
-++    if( strcmp(azCmd[0], "indirect")==0 ){
-++      int ii;
-++      if( nCmd>2 ) goto session_syntax_error;
-++      ii = nCmd==1 ? -1 : booleanValue(azCmd[1]);
-++      if( p->nSession ){
-++        ii = sqlite3session_indirect(pSession->p, ii);
-++        utf8_printf(p->out, "session %s indirect flag = %d\n",
-++                    pSession->zName, ii);
-++      }
-++    }else
-++
-++    /* .session isempty
-++    ** Determine if the session is empty
-++    */
-++    if( strcmp(azCmd[0], "isempty")==0 ){
-++      int ii;
-++      if( nCmd!=1 ) goto session_syntax_error;
-++      if( p->nSession ){
-++        ii = sqlite3session_isempty(pSession->p);
-++        utf8_printf(p->out, "session %s isempty flag = %d\n",
-++                    pSession->zName, ii);
-++      }
-++    }else
-++
-++    /* .session list
-++    ** List all currently open sessions
-++    */
-++    if( strcmp(azCmd[0],"list")==0 ){
-++      for(i=0; i<p->nSession; i++){
-++        utf8_printf(p->out, "%d %s\n", i, p->aSession[i].zName);
-++      }
-++    }else
-++
-++    /* .session open DB NAME
-++    ** Open a new session called NAME on the attached database DB.
-++    ** DB is normally "main".
-++    */
-++    if( strcmp(azCmd[0],"open")==0 ){
-++      char *zName;
-++      if( nCmd!=3 ) goto session_syntax_error;
-++      zName = azCmd[2];
-++      if( zName[0]==0 ) goto session_syntax_error;
-++      for(i=0; i<p->nSession; i++){
-++        if( strcmp(p->aSession[i].zName,zName)==0 ){
-++          utf8_printf(stderr, "Session \"%s\" already exists\n", zName);
-++          goto meta_command_exit;
-++        }
-++      }
-++      if( p->nSession>=ArraySize(p->aSession) ){
-++        raw_printf(stderr, "Maximum of %d sessions\n", ArraySize(p->aSession));
-++        goto meta_command_exit;
-++      }
-++      pSession = &p->aSession[p->nSession];
-++      rc = sqlite3session_create(p->db, azCmd[1], &pSession->p);
-++      if( rc ){
-++        raw_printf(stderr, "Cannot open session: error code=%d\n", rc);
-++        rc = 0;
-++        goto meta_command_exit;
-++      }
-++      pSession->nFilter = 0;
-++      sqlite3session_table_filter(pSession->p, session_filter, pSession);
-++      p->nSession++;
-++      pSession->zName = sqlite3_mprintf("%s", zName);
-++    }else
-++    /* If no command name matches, show a syntax error */
-++    session_syntax_error:
-++    session_help(p);
-++  }else
-++#endif
-++
-++#ifdef SQLITE_DEBUG
-++  /* Undocumented commands for internal testing.  Subject to change
-++  ** without notice. */
-++  if( c=='s' && n>=10 && strncmp(azArg[0], "selftest-", 9)==0 ){
-++    if( strncmp(azArg[0]+9, "boolean", n-9)==0 ){
-++      int i, v;
-++      for(i=1; i<nArg; i++){
-++        v = booleanValue(azArg[i]);
-++        utf8_printf(p->out, "%s: %d 0x%x\n", azArg[i], v, v);
-++      }
-++    }
-++    if( strncmp(azArg[0]+9, "integer", n-9)==0 ){
-++      int i; sqlite3_int64 v;
-++      for(i=1; i<nArg; i++){
-++        char zBuf[200];
-++        v = integerValue(azArg[i]);
-++        sqlite3_snprintf(sizeof(zBuf),zBuf,"%s: %lld 0x%llx\n", azArg[i],v,v);
-++        utf8_printf(p->out, "%s", zBuf);
-++      }
-++    }
-++  }else
-++#endif
-++
-++  if( c=='s' && n>=4 && strncmp(azArg[0],"selftest",n)==0 ){
-++    int bIsInit = 0;         /* True to initialize the SELFTEST table */
-++    int bVerbose = 0;        /* Verbose output */
-++    int bSelftestExists;     /* True if SELFTEST already exists */
-++    int i, k;                /* Loop counters */
-++    int nTest = 0;           /* Number of tests runs */
-++    int nErr = 0;            /* Number of errors seen */
-++    ShellText str;           /* Answer for a query */
-++    sqlite3_stmt *pStmt = 0; /* Query against the SELFTEST table */
-++
-++    open_db(p,0);
-++    for(i=1; i<nArg; i++){
-++      const char *z = azArg[i];
-++      if( z[0]=='-' && z[1]=='-' ) z++;
-++      if( strcmp(z,"-init")==0 ){
-++        bIsInit = 1;
-++      }else
-++      if( strcmp(z,"-v")==0 ){
-++        bVerbose++;
-++      }else
-++      {
-++        utf8_printf(stderr, "Unknown option \"%s\" on \"%s\"\n",
-++                    azArg[i], azArg[0]);
-++        raw_printf(stderr, "Should be one of: --init -v\n");
-++        rc = 1;
-++        goto meta_command_exit;
-++      }
-++    }
-++    if( sqlite3_table_column_metadata(p->db,"main","selftest",0,0,0,0,0,0)
-++           != SQLITE_OK ){
-++      bSelftestExists = 0;
-++    }else{
-++      bSelftestExists = 1;
-++    }
-++    if( bIsInit ){
-++      createSelftestTable(p);
-++      bSelftestExists = 1;
-++    }
-++    initText(&str);
-++    appendText(&str, "x", 0);
-++    for(k=bSelftestExists; k>=0; k--){
-++      if( k==1 ){
-++        rc = sqlite3_prepare_v2(p->db,
-++            "SELECT tno,op,cmd,ans FROM selftest ORDER BY tno",
-++            -1, &pStmt, 0);
-++      }else{
-++        rc = sqlite3_prepare_v2(p->db,
-++          "VALUES(0,'memo','Missing SELFTEST table - default checks only',''),"
-++          "      (1,'run','PRAGMA integrity_check','ok')",
-++          -1, &pStmt, 0);
-++      }
-++      if( rc ){
-++        raw_printf(stderr, "Error querying the selftest table\n");
-++        rc = 1;
-++        sqlite3_finalize(pStmt);
-++        goto meta_command_exit;
-++      }
-++      for(i=1; sqlite3_step(pStmt)==SQLITE_ROW; i++){
-++        int tno = sqlite3_column_int(pStmt, 0);
-++        const char *zOp = (const char*)sqlite3_column_text(pStmt, 1);
-++        const char *zSql = (const char*)sqlite3_column_text(pStmt, 2);
-++        const char *zAns = (const char*)sqlite3_column_text(pStmt, 3);
-++
-++        k = 0;
-++        if( bVerbose>0 ){
-++          char *zQuote = sqlite3_mprintf("%q", zSql);
-++          printf("%d: %s %s\n", tno, zOp, zSql);
-++          sqlite3_free(zQuote);
-++        }
-++        if( strcmp(zOp,"memo")==0 ){
-++          utf8_printf(p->out, "%s\n", zSql);
-++        }else
-++        if( strcmp(zOp,"run")==0 ){
-++          char *zErrMsg = 0;
-++          str.n = 0;
-++          str.z[0] = 0;
-++          rc = sqlite3_exec(p->db, zSql, captureOutputCallback, &str, &zErrMsg);
-++          nTest++;
-++          if( bVerbose ){
-++            utf8_printf(p->out, "Result: %s\n", str.z);
-++          }
-++          if( rc || zErrMsg ){
-++            nErr++;
-++            rc = 1;
-++            utf8_printf(p->out, "%d: error-code-%d: %s\n", tno, rc, zErrMsg);
-++            sqlite3_free(zErrMsg);
-++          }else if( strcmp(zAns,str.z)!=0 ){
-++            nErr++;
-++            rc = 1;
-++            utf8_printf(p->out, "%d: Expected: [%s]\n", tno, zAns);
-++            utf8_printf(p->out, "%d:      Got: [%s]\n", tno, str.z);
-++          }
-++        }else
-++        {
-++          utf8_printf(stderr,
-++            "Unknown operation \"%s\" on selftest line %d\n", zOp, tno);
-++          rc = 1;
-++          break;
-++        }
-++      } /* End loop over rows of content from SELFTEST */
-++      sqlite3_finalize(pStmt);
-++    } /* End loop over k */
-++    freeText(&str);
-++    utf8_printf(p->out, "%d errors out of %d tests\n", nErr, nTest);
-++  }else
-++
-++  if( c=='s' && strncmp(azArg[0], "separator", n)==0 ){
-++    if( nArg<2 || nArg>3 ){
-++      raw_printf(stderr, "Usage: .separator COL ?ROW?\n");
-++      rc = 1;
-++    }
-++    if( nArg>=2 ){
-++      sqlite3_snprintf(sizeof(p->colSeparator), p->colSeparator,
-++                       "%.*s", (int)ArraySize(p->colSeparator)-1, azArg[1]);
-++    }
-++    if( nArg>=3 ){
-++      sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator,
-++                       "%.*s", (int)ArraySize(p->rowSeparator)-1, azArg[2]);
-++    }
-++  }else
-++
-++  if( c=='s' && n>=4 && strncmp(azArg[0],"sha3sum",n)==0 ){
-++    const char *zLike = 0;   /* Which table to checksum. 0 means everything */
-++    int i;                   /* Loop counter */
-++    int bSchema = 0;         /* Also hash the schema */
-++    int bSeparate = 0;       /* Hash each table separately */
-++    int iSize = 224;         /* Hash algorithm to use */
-++    int bDebug = 0;          /* Only show the query that would have run */
-++    sqlite3_stmt *pStmt;     /* For querying tables names */
-++    char *zSql;              /* SQL to be run */
-++    char *zSep;              /* Separator */
-++    ShellText sSql;          /* Complete SQL for the query to run the hash */
-++    ShellText sQuery;        /* Set of queries used to read all content */
-++    open_db(p, 0);
-++    for(i=1; i<nArg; i++){
-++      const char *z = azArg[i];
-++      if( z[0]=='-' ){
-++        z++;
-++        if( z[0]=='-' ) z++;
-++        if( strcmp(z,"schema")==0 ){
-++          bSchema = 1;
-++        }else
-++        if( strcmp(z,"sha3-224")==0 || strcmp(z,"sha3-256")==0
-++         || strcmp(z,"sha3-384")==0 || strcmp(z,"sha3-512")==0
-++        ){
-++          iSize = atoi(&z[5]);
-++        }else
-++        if( strcmp(z,"debug")==0 ){
-++          bDebug = 1;
-++        }else
-++        {
-++          utf8_printf(stderr, "Unknown option \"%s\" on \"%s\"\n",
-++                      azArg[i], azArg[0]);
-++          raw_printf(stderr, "Should be one of: --schema"
-++                             " --sha3-224 --sha3-255 --sha3-384 --sha3-512\n");
-++          rc = 1;
-++          goto meta_command_exit;
-++        }
-++      }else if( zLike ){
-++        raw_printf(stderr, "Usage: .sha3sum ?OPTIONS? ?LIKE-PATTERN?\n");
-++        rc = 1;
-++        goto meta_command_exit;
-++      }else{
-++        zLike = z;
-++        bSeparate = 1;
-++        if( sqlite3_strlike("sqlite_%", zLike, 0)==0 ) bSchema = 1;
-++      }
-++    }
-++    if( bSchema ){
-++      zSql = "SELECT lower(name) FROM sqlite_master"
-++             " WHERE type='table' AND coalesce(rootpage,0)>1"
-++             " UNION ALL SELECT 'sqlite_master'"
-++             " ORDER BY 1 collate nocase";
-++    }else{
-++      zSql = "SELECT lower(name) FROM sqlite_master"
-++             " WHERE type='table' AND coalesce(rootpage,0)>1"
-++             " AND name NOT LIKE 'sqlite_%'"
-++             " ORDER BY 1 collate nocase";
-++    }
-++    sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
-++    initText(&sQuery);
-++    initText(&sSql);
-++    appendText(&sSql, "WITH [sha3sum$query](a,b) AS(",0);
-++    zSep = "VALUES(";
-++    while( SQLITE_ROW==sqlite3_step(pStmt) ){
-++      const char *zTab = (const char*)sqlite3_column_text(pStmt,0);
-++      if( zLike && sqlite3_strlike(zLike, zTab, 0)!=0 ) continue;
-++      if( strncmp(zTab, "sqlite_",7)!=0 ){
-++        appendText(&sQuery,"SELECT * FROM ", 0);
-++        appendText(&sQuery,zTab,'"');
-++        appendText(&sQuery," NOT INDEXED;", 0);
-++      }else if( strcmp(zTab, "sqlite_master")==0 ){
-++        appendText(&sQuery,"SELECT type,name,tbl_name,sql FROM sqlite_master"
-++                           " ORDER BY name;", 0);
-++      }else if( strcmp(zTab, "sqlite_sequence")==0 ){
-++        appendText(&sQuery,"SELECT name,seq FROM sqlite_sequence"
-++                           " ORDER BY name;", 0);
-++      }else if( strcmp(zTab, "sqlite_stat1")==0 ){
-++        appendText(&sQuery,"SELECT tbl,idx,stat FROM sqlite_stat1"
-++                           " ORDER BY tbl,idx;", 0);
-++      }else if( strcmp(zTab, "sqlite_stat3")==0
-++             || strcmp(zTab, "sqlite_stat4")==0 ){
-++        appendText(&sQuery, "SELECT * FROM ", 0);
-++        appendText(&sQuery, zTab, 0);
-++        appendText(&sQuery, " ORDER BY tbl, idx, rowid;\n", 0);
-++      }
-++      appendText(&sSql, zSep, 0);
-++      appendText(&sSql, sQuery.z, '\'');
-++      sQuery.n = 0;
-++      appendText(&sSql, ",", 0);
-++      appendText(&sSql, zTab, '\'');
-++      zSep = "),(";
-++    }
-++    sqlite3_finalize(pStmt);
-++    if( bSeparate ){
-++      zSql = sqlite3_mprintf(
-++          "%s))"
-++          " SELECT lower(hex(sha3_query(a,%d))) AS hash, b AS label"
-++          "   FROM [sha3sum$query]",
-++          sSql.z, iSize);
-++    }else{
-++      zSql = sqlite3_mprintf(
-++          "%s))"
-++          " SELECT lower(hex(sha3_query(group_concat(a,''),%d))) AS hash"
-++          "   FROM [sha3sum$query]",
-++          sSql.z, iSize);
-++    }
-++    freeText(&sQuery);
-++    freeText(&sSql);
-++    if( bDebug ){
-++      utf8_printf(p->out, "%s\n", zSql);
-++    }else{
-++      shell_exec(p->db, zSql, shell_callback, p, 0);
-++    }
-++    sqlite3_free(zSql);
-++  }else
-++
-++  if( c=='s'
-++   && (strncmp(azArg[0], "shell", n)==0 || strncmp(azArg[0],"system",n)==0)
-++  ){
-++    char *zCmd;
-++    int i, x;
-++    if( nArg<2 ){
-++      raw_printf(stderr, "Usage: .system COMMAND\n");
-++      rc = 1;
-++      goto meta_command_exit;
-++    }
-++    zCmd = sqlite3_mprintf(strchr(azArg[1],' ')==0?"%s":"\"%s\"", azArg[1]);
-++    for(i=2; i<nArg; i++){
-++      zCmd = sqlite3_mprintf(strchr(azArg[i],' ')==0?"%z %s":"%z \"%s\"",
-++                             zCmd, azArg[i]);
-++    }
-++    x = system(zCmd);
-++    sqlite3_free(zCmd);
-++    if( x ) raw_printf(stderr, "System command returns %d\n", x);
-++  }else
-++
-++  if( c=='s' && strncmp(azArg[0], "show", n)==0 ){
-++    static const char *azBool[] = { "off", "on", "full", "unk" };
-++    int i;
-++    if( nArg!=1 ){
-++      raw_printf(stderr, "Usage: .show\n");
-++      rc = 1;
-++      goto meta_command_exit;
-++    }
-++    utf8_printf(p->out, "%12.12s: %s\n","echo",
-++                                  azBool[ShellHasFlag(p, SHFLG_Echo)]);
-++    utf8_printf(p->out, "%12.12s: %s\n","eqp", azBool[p->autoEQP&3]);
-++    utf8_printf(p->out, "%12.12s: %s\n","explain",
-++         p->mode==MODE_Explain ? "on" : p->autoExplain ? "auto" : "off");
-++    utf8_printf(p->out,"%12.12s: %s\n","headers", azBool[p->showHeader!=0]);
-++    utf8_printf(p->out, "%12.12s: %s\n","mode", modeDescr[p->mode]);
-++    utf8_printf(p->out, "%12.12s: ", "nullvalue");
-++      output_c_string(p->out, p->nullValue);
-++      raw_printf(p->out, "\n");
-++    utf8_printf(p->out,"%12.12s: %s\n","output",
-++            strlen30(p->outfile) ? p->outfile : "stdout");
-++    utf8_printf(p->out,"%12.12s: ", "colseparator");
-++      output_c_string(p->out, p->colSeparator);
-++      raw_printf(p->out, "\n");
-++    utf8_printf(p->out,"%12.12s: ", "rowseparator");
-++      output_c_string(p->out, p->rowSeparator);
-++      raw_printf(p->out, "\n");
-++    utf8_printf(p->out, "%12.12s: %s\n","stats", azBool[p->statsOn!=0]);
-++    utf8_printf(p->out, "%12.12s: ", "width");
-++    for (i=0;i<(int)ArraySize(p->colWidth) && p->colWidth[i] != 0;i++) {
-++      raw_printf(p->out, "%d ", p->colWidth[i]);
-++    }
-++    raw_printf(p->out, "\n");
-++    utf8_printf(p->out, "%12.12s: %s\n", "filename",
-++                p->zDbFilename ? p->zDbFilename : "");
-++  }else
-++
-++  if( c=='s' && strncmp(azArg[0], "stats", n)==0 ){
-++    if( nArg==2 ){
-++      p->statsOn = booleanValue(azArg[1]);
-++    }else if( nArg==1 ){
-++      display_stats(p->db, p, 0);
-++    }else{
-++      raw_printf(stderr, "Usage: .stats ?on|off?\n");
-++      rc = 1;
-++    }
-++  }else
-++
-++  if( (c=='t' && n>1 && strncmp(azArg[0], "tables", n)==0)
-++   || (c=='i' && (strncmp(azArg[0], "indices", n)==0
-++                 || strncmp(azArg[0], "indexes", n)==0) )
-++  ){
-++    sqlite3_stmt *pStmt;
-++    char **azResult;
-++    int nRow, nAlloc;
-++    int ii;
-++    ShellText s;
-++    initText(&s);
-++    open_db(p, 0);
-++    rc = sqlite3_prepare_v2(p->db, "PRAGMA database_list", -1, &pStmt, 0);
-++    if( rc ) return shellDatabaseError(p->db);
-++
-++    if( nArg>2 && c=='i' ){
-++      /* It is an historical accident that the .indexes command shows an error
-++      ** when called with the wrong number of arguments whereas the .tables
-++      ** command does not. */
-++      raw_printf(stderr, "Usage: .indexes ?LIKE-PATTERN?\n");
-++      rc = 1;
-++      goto meta_command_exit;
-++    }
-++    for(ii=0; sqlite3_step(pStmt)==SQLITE_ROW; ii++){
-++      const char *zDbName = (const char*)sqlite3_column_text(pStmt, 1);
-++      if( zDbName==0 ) continue;
-++      if( s.z && s.z[0] ) appendText(&s, " UNION ALL ", 0);
-++      if( sqlite3_stricmp(zDbName, "main")==0 ){
-++        appendText(&s, "SELECT name FROM ", 0);
-++      }else{
-++        appendText(&s, "SELECT ", 0);
-++        appendText(&s, zDbName, '\'');
-++        appendText(&s, "||'.'||name FROM ", 0);
-++      }
-++      appendText(&s, zDbName, '"');
-++      appendText(&s, ".sqlite_master ", 0);
-++      if( c=='t' ){
-++        appendText(&s," WHERE type IN ('table','view')"
-++                      "   AND name NOT LIKE 'sqlite_%'"
-++                      "   AND name LIKE ?1", 0);
-++      }else{
-++        appendText(&s," WHERE type='index'"
-++                      "   AND tbl_name LIKE ?1", 0);
-++      }
-++    }
-++    rc = sqlite3_finalize(pStmt);
-++    appendText(&s, " ORDER BY 1", 0);
-++    rc = sqlite3_prepare_v2(p->db, s.z, -1, &pStmt, 0);
-++    freeText(&s);
-++    if( rc ) return shellDatabaseError(p->db);
-++
-++    /* Run the SQL statement prepared by the above block. Store the results
-++    ** as an array of nul-terminated strings in azResult[].  */
-++    nRow = nAlloc = 0;
-++    azResult = 0;
-++    if( nArg>1 ){
-++      sqlite3_bind_text(pStmt, 1, azArg[1], -1, SQLITE_TRANSIENT);
-++    }else{
-++      sqlite3_bind_text(pStmt, 1, "%", -1, SQLITE_STATIC);
-++    }
-++    while( sqlite3_step(pStmt)==SQLITE_ROW ){
-++      if( nRow>=nAlloc ){
-++        char **azNew;
-++        int n2 = nAlloc*2 + 10;
-++        azNew = sqlite3_realloc64(azResult, sizeof(azResult[0])*n2);
-++        if( azNew==0 ){
-++          rc = shellNomemError();
-++          break;
-++        }
-++        nAlloc = n2;
-++        azResult = azNew;
-++      }
-++      azResult[nRow] = sqlite3_mprintf("%s", sqlite3_column_text(pStmt, 0));
-++      if( 0==azResult[nRow] ){
-++        rc = shellNomemError();
-++        break;
-++      }
-++      nRow++;
-++    }
-++    if( sqlite3_finalize(pStmt)!=SQLITE_OK ){
-++      rc = shellDatabaseError(p->db);
-++    }
-++
-++    /* Pretty-print the contents of array azResult[] to the output */
-++    if( rc==0 && nRow>0 ){
-++      int len, maxlen = 0;
-++      int i, j;
-++      int nPrintCol, nPrintRow;
-++      for(i=0; i<nRow; i++){
-++        len = strlen30(azResult[i]);
-++        if( len>maxlen ) maxlen = len;
-++      }
-++      nPrintCol = 80/(maxlen+2);
-++      if( nPrintCol<1 ) nPrintCol = 1;
-++      nPrintRow = (nRow + nPrintCol - 1)/nPrintCol;
-++      for(i=0; i<nPrintRow; i++){
-++        for(j=i; j<nRow; j+=nPrintRow){
-++          char *zSp = j<nPrintRow ? "" : "  ";
-++          utf8_printf(p->out, "%s%-*s", zSp, maxlen,
-++                      azResult[j] ? azResult[j]:"");
-++        }
-++        raw_printf(p->out, "\n");
-++      }
-++    }
-++
-++    for(ii=0; ii<nRow; ii++) sqlite3_free(azResult[ii]);
-++    sqlite3_free(azResult);
-++  }else
-++
-++  /* Begin redirecting output to the file "testcase-out.txt" */
-++  if( c=='t' && strcmp(azArg[0],"testcase")==0 ){
-++    output_reset(p);
-++    p->out = output_file_open("testcase-out.txt");
-++    if( p->out==0 ){
-++      raw_printf(stderr, "Error: cannot open 'testcase-out.txt'\n");
-++    }
-++    if( nArg>=2 ){
-++      sqlite3_snprintf(sizeof(p->zTestcase), p->zTestcase, "%s", azArg[1]);
-++    }else{
-++      sqlite3_snprintf(sizeof(p->zTestcase), p->zTestcase, "?");
-++    }
-++  }else
-++
-++#ifndef SQLITE_UNTESTABLE
-++  if( c=='t' && n>=8 && strncmp(azArg[0], "testctrl", n)==0 && nArg>=2 ){
-++    static const struct {
-++       const char *zCtrlName;   /* Name of a test-control option */
-++       int ctrlCode;            /* Integer code for that option */
-++    } aCtrl[] = {
-++      { "prng_save",             SQLITE_TESTCTRL_PRNG_SAVE              },
-++      { "prng_restore",          SQLITE_TESTCTRL_PRNG_RESTORE           },
-++      { "prng_reset",            SQLITE_TESTCTRL_PRNG_RESET             },
-++      { "bitvec_test",           SQLITE_TESTCTRL_BITVEC_TEST            },
-++      { "fault_install",         SQLITE_TESTCTRL_FAULT_INSTALL          },
-++      { "benign_malloc_hooks",   SQLITE_TESTCTRL_BENIGN_MALLOC_HOOKS    },
-++      { "pending_byte",          SQLITE_TESTCTRL_PENDING_BYTE           },
-++      { "assert",                SQLITE_TESTCTRL_ASSERT                 },
-++      { "always",                SQLITE_TESTCTRL_ALWAYS                 },
-++      { "reserve",               SQLITE_TESTCTRL_RESERVE                },
-++      { "optimizations",         SQLITE_TESTCTRL_OPTIMIZATIONS          },
-++      { "iskeyword",             SQLITE_TESTCTRL_ISKEYWORD              },
-++      { "byteorder",             SQLITE_TESTCTRL_BYTEORDER              },
-++      { "never_corrupt",         SQLITE_TESTCTRL_NEVER_CORRUPT          },
-++      { "imposter",              SQLITE_TESTCTRL_IMPOSTER               },
-++    };
-++    int testctrl = -1;
-++    int rc2 = 0;
-++    int i, n2;
-++    open_db(p, 0);
-++
-++    /* convert testctrl text option to value. allow any unique prefix
-++    ** of the option name, or a numerical value. */
-++    n2 = strlen30(azArg[1]);
-++    for(i=0; i<ArraySize(aCtrl); i++){
-++      if( strncmp(azArg[1], aCtrl[i].zCtrlName, n2)==0 ){
-++        if( testctrl<0 ){
-++          testctrl = aCtrl[i].ctrlCode;
-++        }else{
-++          utf8_printf(stderr, "ambiguous option name: \"%s\"\n", azArg[1]);
-++          testctrl = -1;
-++          break;
-++        }
-++      }
-++    }
-++    if( testctrl<0 ) testctrl = (int)integerValue(azArg[1]);
-++    if( (testctrl<SQLITE_TESTCTRL_FIRST) || (testctrl>SQLITE_TESTCTRL_LAST) ){
-++      utf8_printf(stderr,"Error: invalid testctrl option: %s\n", azArg[1]);
-++    }else{
-++      switch(testctrl){
-++
-++        /* sqlite3_test_control(int, db, int) */
-++        case SQLITE_TESTCTRL_OPTIMIZATIONS:
-++        case SQLITE_TESTCTRL_RESERVE:
-++          if( nArg==3 ){
-++            int opt = (int)strtol(azArg[2], 0, 0);
-++            rc2 = sqlite3_test_control(testctrl, p->db, opt);
-++            raw_printf(p->out, "%d (0x%08x)\n", rc2, rc2);
-++          } else {
-++            utf8_printf(stderr,"Error: testctrl %s takes a single int option\n",
-++                    azArg[1]);
-++          }
-++          break;
-++
-++        /* sqlite3_test_control(int) */
-++        case SQLITE_TESTCTRL_PRNG_SAVE:
-++        case SQLITE_TESTCTRL_PRNG_RESTORE:
-++        case SQLITE_TESTCTRL_PRNG_RESET:
-++        case SQLITE_TESTCTRL_BYTEORDER:
-++          if( nArg==2 ){
-++            rc2 = sqlite3_test_control(testctrl);
-++            raw_printf(p->out, "%d (0x%08x)\n", rc2, rc2);
-++          } else {
-++            utf8_printf(stderr,"Error: testctrl %s takes no options\n",
-++                        azArg[1]);
-++          }
-++          break;
-++
-++        /* sqlite3_test_control(int, uint) */
-++        case SQLITE_TESTCTRL_PENDING_BYTE:
-++          if( nArg==3 ){
-++            unsigned int opt = (unsigned int)integerValue(azArg[2]);
-++            rc2 = sqlite3_test_control(testctrl, opt);
-++            raw_printf(p->out, "%d (0x%08x)\n", rc2, rc2);
-++          } else {
-++            utf8_printf(stderr,"Error: testctrl %s takes a single unsigned"
-++                           " int option\n", azArg[1]);
-++          }
-++          break;
-++
-++        /* sqlite3_test_control(int, int) */
-++        case SQLITE_TESTCTRL_ASSERT:
-++        case SQLITE_TESTCTRL_ALWAYS:
-++        case SQLITE_TESTCTRL_NEVER_CORRUPT:
-++          if( nArg==3 ){
-++            int opt = booleanValue(azArg[2]);
-++            rc2 = sqlite3_test_control(testctrl, opt);
-++            raw_printf(p->out, "%d (0x%08x)\n", rc2, rc2);
-++          } else {
-++            utf8_printf(stderr,"Error: testctrl %s takes a single int option\n",
-++                            azArg[1]);
-++          }
-++          break;
-++
-++        /* sqlite3_test_control(int, char *) */
-++#ifdef SQLITE_N_KEYWORD
-++        case SQLITE_TESTCTRL_ISKEYWORD:
-++          if( nArg==3 ){
-++            const char *opt = azArg[2];
-++            rc2 = sqlite3_test_control(testctrl, opt);
-++            raw_printf(p->out, "%d (0x%08x)\n", rc2, rc2);
-++          } else {
-++            utf8_printf(stderr,
-++                        "Error: testctrl %s takes a single char * option\n",
-++                        azArg[1]);
-++          }
-++          break;
-++#endif
-++
-++        case SQLITE_TESTCTRL_IMPOSTER:
-++          if( nArg==5 ){
-++            rc2 = sqlite3_test_control(testctrl, p->db,
-++                          azArg[2],
-++                          integerValue(azArg[3]),
-++                          integerValue(azArg[4]));
-++            raw_printf(p->out, "%d (0x%08x)\n", rc2, rc2);
-++          }else{
-++            raw_printf(stderr,"Usage: .testctrl imposter dbName onoff tnum\n");
-++          }
-++          break;
-++
-++        case SQLITE_TESTCTRL_BITVEC_TEST:
-++        case SQLITE_TESTCTRL_FAULT_INSTALL:
-++        case SQLITE_TESTCTRL_BENIGN_MALLOC_HOOKS:
-++        default:
-++          utf8_printf(stderr,
-++                      "Error: CLI support for testctrl %s not implemented\n",
-++                      azArg[1]);
-++          break;
-++      }
-++    }
-++  }else
-++#endif /* !defined(SQLITE_UNTESTABLE) */
-++
-++  if( c=='t' && n>4 && strncmp(azArg[0], "timeout", n)==0 ){
-++    open_db(p, 0);
-++    sqlite3_busy_timeout(p->db, nArg>=2 ? (int)integerValue(azArg[1]) : 0);
-++  }else
-++
-++  if( c=='t' && n>=5 && strncmp(azArg[0], "timer", n)==0 ){
-++    if( nArg==2 ){
-++      enableTimer = booleanValue(azArg[1]);
-++      if( enableTimer && !HAS_TIMER ){
-++        raw_printf(stderr, "Error: timer not available on this system.\n");
-++        enableTimer = 0;
-++      }
-++    }else{
-++      raw_printf(stderr, "Usage: .timer on|off\n");
-++      rc = 1;
-++    }
-++  }else
-++
-++  if( c=='t' && strncmp(azArg[0], "trace", n)==0 ){
-++    open_db(p, 0);
-++    if( nArg!=2 ){
-++      raw_printf(stderr, "Usage: .trace FILE|off\n");
-++      rc = 1;
-++      goto meta_command_exit;
-++    }
-++    output_file_close(p->traceOut);
-++    p->traceOut = output_file_open(azArg[1]);
-++#if !defined(SQLITE_OMIT_TRACE) && !defined(SQLITE_OMIT_FLOATING_POINT)
-++    if( p->traceOut==0 ){
-++      sqlite3_trace_v2(p->db, 0, 0, 0);
-++    }else{
-++      sqlite3_trace_v2(p->db, SQLITE_TRACE_STMT, sql_trace_callback,p->traceOut);
-++    }
-++#endif
-++  }else
-++
-++#if SQLITE_USER_AUTHENTICATION
-++  if( c=='u' && strncmp(azArg[0], "user", n)==0 ){
-++    if( nArg<2 ){
-++      raw_printf(stderr, "Usage: .user SUBCOMMAND ...\n");
-++      rc = 1;
-++      goto meta_command_exit;
-++    }
-++    open_db(p, 0);
-++    if( strcmp(azArg[1],"login")==0 ){
-++      if( nArg!=4 ){
-++        raw_printf(stderr, "Usage: .user login USER PASSWORD\n");
-++        rc = 1;
-++        goto meta_command_exit;
-++      }
-++      rc = sqlite3_user_authenticate(p->db, azArg[2], azArg[3],
-++                                    (int)strlen(azArg[3]));
-++      if( rc ){
-++        utf8_printf(stderr, "Authentication failed for user %s\n", azArg[2]);
-++        rc = 1;
-++      }
-++    }else if( strcmp(azArg[1],"add")==0 ){
-++      if( nArg!=5 ){
-++        raw_printf(stderr, "Usage: .user add USER PASSWORD ISADMIN\n");
-++        rc = 1;
-++        goto meta_command_exit;
-++      }
-++      rc = sqlite3_user_add(p->db, azArg[2],
-++                            azArg[3], (int)strlen(azArg[3]),
-++                            booleanValue(azArg[4]));
-++      if( rc ){
-++        raw_printf(stderr, "User-Add failed: %d\n", rc);
-++        rc = 1;
-++      }
-++    }else if( strcmp(azArg[1],"edit")==0 ){
-++      if( nArg!=5 ){
-++        raw_printf(stderr, "Usage: .user edit USER PASSWORD ISADMIN\n");
-++        rc = 1;
-++        goto meta_command_exit;
-++      }
-++      rc = sqlite3_user_change(p->db, azArg[2],
-++                              azArg[3], (int)strlen(azArg[3]),
-++                              booleanValue(azArg[4]));
-++      if( rc ){
-++        raw_printf(stderr, "User-Edit failed: %d\n", rc);
-++        rc = 1;
-++      }
-++    }else if( strcmp(azArg[1],"delete")==0 ){
-++      if( nArg!=3 ){
-++        raw_printf(stderr, "Usage: .user delete USER\n");
-++        rc = 1;
-++        goto meta_command_exit;
-++      }
-++      rc = sqlite3_user_delete(p->db, azArg[2]);
-++      if( rc ){
-++        raw_printf(stderr, "User-Delete failed: %d\n", rc);
-++        rc = 1;
-++      }
-++    }else{
-++      raw_printf(stderr, "Usage: .user login|add|edit|delete ...\n");
-++      rc = 1;
-++      goto meta_command_exit;
-++    }
-++  }else
-++#endif /* SQLITE_USER_AUTHENTICATION */
-++
-++  if( c=='v' && strncmp(azArg[0], "version", n)==0 ){
-++    utf8_printf(p->out, "SQLite %s %s\n" /*extra-version-info*/,
-++        sqlite3_libversion(), sqlite3_sourceid());
-++  }else
-++
-++  if( c=='v' && strncmp(azArg[0], "vfsinfo", n)==0 ){
-++    const char *zDbName = nArg==2 ? azArg[1] : "main";
-++    sqlite3_vfs *pVfs = 0;
-++    if( p->db ){
-++      sqlite3_file_control(p->db, zDbName, SQLITE_FCNTL_VFS_POINTER, &pVfs);
-++      if( pVfs ){
-++        utf8_printf(p->out, "vfs.zName      = \"%s\"\n", pVfs->zName);
-++        raw_printf(p->out, "vfs.iVersion   = %d\n", pVfs->iVersion);
-++        raw_printf(p->out, "vfs.szOsFile   = %d\n", pVfs->szOsFile);
-++        raw_printf(p->out, "vfs.mxPathname = %d\n", pVfs->mxPathname);
-++      }
-++    }
-++  }else
-++
-++  if( c=='v' && strncmp(azArg[0], "vfslist", n)==0 ){
-++    sqlite3_vfs *pVfs;
-++    sqlite3_vfs *pCurrent = 0;
-++    if( p->db ){
-++      sqlite3_file_control(p->db, "main", SQLITE_FCNTL_VFS_POINTER, &pCurrent);
-++    }
-++    for(pVfs=sqlite3_vfs_find(0); pVfs; pVfs=pVfs->pNext){
-++      utf8_printf(p->out, "vfs.zName      = \"%s\"%s\n", pVfs->zName,
-++           pVfs==pCurrent ? "  <--- CURRENT" : "");
-++      raw_printf(p->out, "vfs.iVersion   = %d\n", pVfs->iVersion);
-++      raw_printf(p->out, "vfs.szOsFile   = %d\n", pVfs->szOsFile);
-++      raw_printf(p->out, "vfs.mxPathname = %d\n", pVfs->mxPathname);
-++      if( pVfs->pNext ){
-++        raw_printf(p->out, "-----------------------------------\n");
-++      }
-++    }
-++  }else
-++
-++  if( c=='v' && strncmp(azArg[0], "vfsname", n)==0 ){
-++    const char *zDbName = nArg==2 ? azArg[1] : "main";
-++    char *zVfsName = 0;
-++    if( p->db ){
-++      sqlite3_file_control(p->db, zDbName, SQLITE_FCNTL_VFSNAME, &zVfsName);
-++      if( zVfsName ){
-++        utf8_printf(p->out, "%s\n", zVfsName);
-++        sqlite3_free(zVfsName);
-++      }
-++    }
-++  }else
-++
-++#if defined(SQLITE_DEBUG) && defined(SQLITE_ENABLE_WHERETRACE)
-++  if( c=='w' && strncmp(azArg[0], "wheretrace", n)==0 ){
-++    sqlite3WhereTrace = nArg>=2 ? booleanValue(azArg[1]) : 0xff;
-++  }else
-++#endif
-++
-++  if( c=='w' && strncmp(azArg[0], "width", n)==0 ){
-++    int j;
-++    assert( nArg<=ArraySize(azArg) );
-++    for(j=1; j<nArg && j<ArraySize(p->colWidth); j++){
-++      p->colWidth[j-1] = (int)integerValue(azArg[j]);
-++    }
-++  }else
-++
-++  {
-++    utf8_printf(stderr, "Error: unknown command or invalid arguments: "
-++      " \"%s\". Enter \".help\" for help\n", azArg[0]);
-++    rc = 1;
-++  }
-++
-++meta_command_exit:
-++  if( p->outCount ){
-++    p->outCount--;
-++    if( p->outCount==0 ) output_reset(p);
-++  }
-++  return rc;
-++}
-++
-++/*
-++** Return TRUE if a semicolon occurs anywhere in the first N characters
-++** of string z[].
-++*/
-++static int line_contains_semicolon(const char *z, int N){
-++  int i;
-++  for(i=0; i<N; i++){  if( z[i]==';' ) return 1; }
-++  return 0;
-++}
-++
-++/*
-++** Test to see if a line consists entirely of whitespace.
-++*/
-++static int _all_whitespace(const char *z){
-++  for(; *z; z++){
-++    if( IsSpace(z[0]) ) continue;
-++    if( *z=='/' && z[1]=='*' ){
-++      z += 2;
-++      while( *z && (*z!='*' || z[1]!='/') ){ z++; }
-++      if( *z==0 ) return 0;
-++      z++;
-++      continue;
-++    }
-++    if( *z=='-' && z[1]=='-' ){
-++      z += 2;
-++      while( *z && *z!='\n' ){ z++; }
-++      if( *z==0 ) return 1;
-++      continue;
-++    }
-++    return 0;
-++  }
-++  return 1;
-++}
-++
-++/*
-++** Return TRUE if the line typed in is an SQL command terminator other
-++** than a semi-colon.  The SQL Server style "go" command is understood
-++** as is the Oracle "/".
-++*/
-++static int line_is_command_terminator(const char *zLine){
-++  while( IsSpace(zLine[0]) ){ zLine++; };
-++  if( zLine[0]=='/' && _all_whitespace(&zLine[1]) ){
-++    return 1;  /* Oracle */
-++  }
-++  if( ToLower(zLine[0])=='g' && ToLower(zLine[1])=='o'
-++         && _all_whitespace(&zLine[2]) ){
-++    return 1;  /* SQL Server */
-++  }
-++  return 0;
-++}
-++
-++/*
-++** Return true if zSql is a complete SQL statement.  Return false if it
-++** ends in the middle of a string literal or C-style comment.
-++*/
-++static int line_is_complete(char *zSql, int nSql){
-++  int rc;
-++  if( zSql==0 ) return 1;
-++  zSql[nSql] = ';';
-++  zSql[nSql+1] = 0;
-++  rc = sqlite3_complete(zSql);
-++  zSql[nSql] = 0;
-++  return rc;
-++}
-++
-++/*
-++** Run a single line of SQL
-++*/
-++static int runOneSqlLine(ShellState *p, char *zSql, FILE *in, int startline){
-++  int rc;
-++  char *zErrMsg = 0;
-++
-++  open_db(p, 0);
-++  if( ShellHasFlag(p,SHFLG_Backslash) ) resolve_backslashes(zSql);
-++  BEGIN_TIMER;
-++  rc = shell_exec(p->db, zSql, shell_callback, p, &zErrMsg);
-++  END_TIMER;
-++  if( rc || zErrMsg ){
-++    char zPrefix[100];
-++    if( in!=0 || !stdin_is_interactive ){
-++      sqlite3_snprintf(sizeof(zPrefix), zPrefix,
-++                       "Error: near line %d:", startline);
-++    }else{
-++      sqlite3_snprintf(sizeof(zPrefix), zPrefix, "Error:");
-++    }
-++    if( zErrMsg!=0 ){
-++      utf8_printf(stderr, "%s %s\n", zPrefix, zErrMsg);
-++      sqlite3_free(zErrMsg);
-++      zErrMsg = 0;
-++    }else{
-++      utf8_printf(stderr, "%s %s\n", zPrefix, sqlite3_errmsg(p->db));
-++    }
-++    return 1;
-++  }else if( ShellHasFlag(p, SHFLG_CountChanges) ){
-++    raw_printf(p->out, "changes: %3d   total_changes: %d\n",
-++            sqlite3_changes(p->db), sqlite3_total_changes(p->db));
-++  }
-++  return 0;
-++}
-++
-++
-++/*
-++** Read input from *in and process it.  If *in==0 then input
-++** is interactive - the user is typing it it.  Otherwise, input
-++** is coming from a file or device.  A prompt is issued and history
-++** is saved only if input is interactive.  An interrupt signal will
-++** cause this routine to exit immediately, unless input is interactive.
-++**
-++** Return the number of errors.
-++*/
-++static int process_input(ShellState *p, FILE *in){
-++  char *zLine = 0;          /* A single input line */
-++  char *zSql = 0;           /* Accumulated SQL text */
-++  int nLine;                /* Length of current line */
-++  int nSql = 0;             /* Bytes of zSql[] used */
-++  int nAlloc = 0;           /* Allocated zSql[] space */
-++  int nSqlPrior = 0;        /* Bytes of zSql[] used by prior line */
-++  int rc;                   /* Error code */
-++  int errCnt = 0;           /* Number of errors seen */
-++  int lineno = 0;           /* Current line number */
-++  int startline = 0;        /* Line number for start of current input */
-++
-++  while( errCnt==0 || !bail_on_error || (in==0 && stdin_is_interactive) ){
-++    fflush(p->out);
-++    zLine = one_input_line(in, zLine, nSql>0);
-++    if( zLine==0 ){
-++      /* End of input */
-++      if( in==0 && stdin_is_interactive ) printf("\n");
-++      break;
-++    }
-++    if( seenInterrupt ){
-++      if( in!=0 ) break;
-++      seenInterrupt = 0;
-++    }
-++    lineno++;
-++    if( nSql==0 && _all_whitespace(zLine) ){
-++      if( ShellHasFlag(p, SHFLG_Echo) ) printf("%s\n", zLine);
-++      continue;
-++    }
-++    if( zLine && zLine[0]=='.' && nSql==0 ){
-++      if( ShellHasFlag(p, SHFLG_Echo) ) printf("%s\n", zLine);
-++      rc = do_meta_command(zLine, p);
-++      if( rc==2 ){ /* exit requested */
-++        break;
-++      }else if( rc ){
-++        errCnt++;
-++      }
-++      continue;
-++    }
-++    if( line_is_command_terminator(zLine) && line_is_complete(zSql, nSql) ){
-++      memcpy(zLine,";",2);
-++    }
-++    nLine = strlen30(zLine);
-++    if( nSql+nLine+2>=nAlloc ){
-++      nAlloc = nSql+nLine+100;
-++      zSql = realloc(zSql, nAlloc);
-++      if( zSql==0 ){
-++        raw_printf(stderr, "Error: out of memory\n");
-++        exit(1);
-++      }
-++    }
-++    nSqlPrior = nSql;
-++    if( nSql==0 ){
-++      int i;
-++      for(i=0; zLine[i] && IsSpace(zLine[i]); i++){}
-++      assert( nAlloc>0 && zSql!=0 );
-++      memcpy(zSql, zLine+i, nLine+1-i);
-++      startline = lineno;
-++      nSql = nLine-i;
-++    }else{
-++      zSql[nSql++] = '\n';
-++      memcpy(zSql+nSql, zLine, nLine+1);
-++      nSql += nLine;
-++    }
-++    if( nSql && line_contains_semicolon(&zSql[nSqlPrior], nSql-nSqlPrior)
-++                && sqlite3_complete(zSql) ){
-++      errCnt += runOneSqlLine(p, zSql, in, startline);
-++      nSql = 0;
-++      if( p->outCount ){
-++        output_reset(p);
-++        p->outCount = 0;
-++      }
-++    }else if( nSql && _all_whitespace(zSql) ){
-++      if( ShellHasFlag(p, SHFLG_Echo) ) printf("%s\n", zSql);
-++      nSql = 0;
-++    }
-++  }
-++  if( nSql && !_all_whitespace(zSql) ){
-++    runOneSqlLine(p, zSql, in, startline);
-++  }
-++  free(zSql);
-++  free(zLine);
-++  return errCnt>0;
-++}
-++
-++/*
-++** Return a pathname which is the user's home directory.  A
-++** 0 return indicates an error of some kind.
-++*/
-++static char *find_home_dir(int clearFlag){
-++  static char *home_dir = NULL;
-++  if( clearFlag ){
-++    free(home_dir);
-++    home_dir = 0;
-++    return 0;
-++  }
-++  if( home_dir ) return home_dir;
-++
-++#if !defined(_WIN32) && !defined(WIN32) && !defined(_WIN32_WCE) \
-++     && !defined(__RTP__) && !defined(_WRS_KERNEL)
-++  {
-++    struct passwd *pwent;
-++    uid_t uid = getuid();
-++    if( (pwent=getpwuid(uid)) != NULL) {
-++      home_dir = pwent->pw_dir;
-++    }
-++  }
-++#endif
-++
-++#if defined(_WIN32_WCE)
-++  /* Windows CE (arm-wince-mingw32ce-gcc) does not provide getenv()
-++   */
-++  home_dir = "/";
-++#else
-++
-++#if defined(_WIN32) || defined(WIN32)
-++  if (!home_dir) {
-++    home_dir = getenv("USERPROFILE");
-++  }
-++#endif
-++
-++  if (!home_dir) {
-++    home_dir = getenv("HOME");
-++  }
-++
-++#if defined(_WIN32) || defined(WIN32)
-++  if (!home_dir) {
-++    char *zDrive, *zPath;
-++    int n;
-++    zDrive = getenv("HOMEDRIVE");
-++    zPath = getenv("HOMEPATH");
-++    if( zDrive && zPath ){
-++      n = strlen30(zDrive) + strlen30(zPath) + 1;
-++      home_dir = malloc( n );
-++      if( home_dir==0 ) return 0;
-++      sqlite3_snprintf(n, home_dir, "%s%s", zDrive, zPath);
-++      return home_dir;
-++    }
-++    home_dir = "c:\\";
-++  }
-++#endif
-++
-++#endif /* !_WIN32_WCE */
-++
-++  if( home_dir ){
-++    int n = strlen30(home_dir) + 1;
-++    char *z = malloc( n );
-++    if( z ) memcpy(z, home_dir, n);
-++    home_dir = z;
-++  }
-++
-++  return home_dir;
-++}
-++
-++/*
-++** Read input from the file given by sqliterc_override.  Or if that
-++** parameter is NULL, take input from ~/.sqliterc
-++**
-++** Returns the number of errors.
-++*/
-++static void process_sqliterc(
-++  ShellState *p,                  /* Configuration data */
-++  const char *sqliterc_override   /* Name of config file. NULL to use default */
-++){
-++  char *home_dir = NULL;
-++  const char *sqliterc = sqliterc_override;
-++  char *zBuf = 0;
-++  FILE *in = NULL;
-++
-++  if (sqliterc == NULL) {
-++    home_dir = find_home_dir(0);
-++    if( home_dir==0 ){
-++      raw_printf(stderr, "-- warning: cannot find home directory;"
-++                      " cannot read ~/.sqliterc\n");
-++      return;
-++    }
-++    sqlite3_initialize();
-++    zBuf = sqlite3_mprintf("%s/.sqliterc",home_dir);
-++    sqliterc = zBuf;
-++  }
-++  in = fopen(sqliterc,"rb");
-++  if( in ){
-++    if( stdin_is_interactive ){
-++      utf8_printf(stderr,"-- Loading resources from %s\n",sqliterc);
-++    }
-++    process_input(p,in);
-++    fclose(in);
-++  }
-++  sqlite3_free(zBuf);
-++}
-++
-++/*
-++** Show available command line options
-++*/
-++static const char zOptions[] =
-++  "   -ascii               set output mode to 'ascii'\n"
-++  "   -bail                stop after hitting an error\n"
-++  "   -batch               force batch I/O\n"
-++  "   -column              set output mode to 'column'\n"
-++  "   -cmd COMMAND         run \"COMMAND\" before reading stdin\n"
-++  "   -csv                 set output mode to 'csv'\n"
-++  "   -echo                print commands before execution\n"
-++  "   -init FILENAME       read/process named file\n"
-++  "   -[no]header          turn headers on or off\n"
-++#if defined(SQLITE_ENABLE_MEMSYS3) || defined(SQLITE_ENABLE_MEMSYS5)
-++  "   -heap SIZE           Size of heap for memsys3 or memsys5\n"
-++#endif
-++  "   -help                show this message\n"
-++  "   -html                set output mode to HTML\n"
-++  "   -interactive         force interactive I/O\n"
-++  "   -line                set output mode to 'line'\n"
-++  "   -list                set output mode to 'list'\n"
-++  "   -lookaside SIZE N    use N entries of SZ bytes for lookaside memory\n"
-++  "   -mmap N              default mmap size set to N\n"
-++#ifdef SQLITE_ENABLE_MULTIPLEX
-++  "   -multiplex           enable the multiplexor VFS\n"
-++#endif
-++  "   -newline SEP         set output row separator. Default: '\\n'\n"
-++  "   -nullvalue TEXT      set text string for NULL values. Default ''\n"
-++  "   -pagecache SIZE N    use N slots of SZ bytes each for page cache memory\n"
-++  "   -quote               set output mode to 'quote'\n"
-++  "   -separator SEP       set output column separator. Default: '|'\n"
-++  "   -stats               print memory stats before each finalize\n"
-++  "   -version             show SQLite version\n"
-++  "   -vfs NAME            use NAME as the default VFS\n"
-++#ifdef SQLITE_ENABLE_VFSTRACE
-++  "   -vfstrace            enable tracing of all VFS calls\n"
-++#endif
-++;
-++static void usage(int showDetail){
-++  utf8_printf(stderr,
-++      "Usage: %s [OPTIONS] FILENAME [SQL]\n"
-++      "FILENAME is the name of an SQLite database. A new database is created\n"
-++      "if the file does not previously exist.\n", Argv0);
-++  if( showDetail ){
-++    utf8_printf(stderr, "OPTIONS include:\n%s", zOptions);
-++  }else{
-++    raw_printf(stderr, "Use the -help option for additional information\n");
-++  }
-++  exit(1);
-++}
-++
-++/*
-++** Initialize the state information in data
-++*/
-++static void main_init(ShellState *data) {
-++  memset(data, 0, sizeof(*data));
-++  data->normalMode = data->cMode = data->mode = MODE_List;
-++  data->autoExplain = 1;
-++  memcpy(data->colSeparator,SEP_Column, 2);
-++  memcpy(data->rowSeparator,SEP_Row, 2);
-++  data->showHeader = 0;
-++  data->shellFlgs = SHFLG_Lookaside;
-++  sqlite3_config(SQLITE_CONFIG_URI, 1);
-++  sqlite3_config(SQLITE_CONFIG_LOG, shellLog, data);
-++  sqlite3_config(SQLITE_CONFIG_MULTITHREAD);
-++  sqlite3_snprintf(sizeof(mainPrompt), mainPrompt,"sqlite> ");
-++  sqlite3_snprintf(sizeof(continuePrompt), continuePrompt,"   ...> ");
-++}
-++
-++/*
-++** Output text to the console in a font that attracts extra attention.
-++*/
-++#ifdef _WIN32
-++static void printBold(const char *zText){
-++  HANDLE out = GetStdHandle(STD_OUTPUT_HANDLE);
-++  CONSOLE_SCREEN_BUFFER_INFO defaultScreenInfo;
-++  GetConsoleScreenBufferInfo(out, &defaultScreenInfo);
-++  SetConsoleTextAttribute(out,
-++         FOREGROUND_RED|FOREGROUND_INTENSITY
-++  );
-++  printf("%s", zText);
-++  SetConsoleTextAttribute(out, defaultScreenInfo.wAttributes);
-++}
-++#else
-++static void printBold(const char *zText){
-++  printf("\033[1m%s\033[0m", zText);
-++}
-++#endif
-++
-++/*
-++** Get the argument to an --option.  Throw an error and die if no argument
-++** is available.
-++*/
-++static char *cmdline_option_value(int argc, char **argv, int i){
-++  if( i==argc ){
-++    utf8_printf(stderr, "%s: Error: missing argument to %s\n",
-++            argv[0], argv[argc-1]);
-++    exit(1);
-++  }
-++  return argv[i];
-++}
-++
-++#ifndef SQLITE_SHELL_IS_UTF8
-++#  if (defined(_WIN32) || defined(WIN32)) && defined(_MSC_VER)
-++#    define SQLITE_SHELL_IS_UTF8          (0)
-++#  else
-++#    define SQLITE_SHELL_IS_UTF8          (1)
-++#  endif
-++#endif
-++
-++#if SQLITE_SHELL_IS_UTF8
-++int SQLITE_CDECL main(int argc, char **argv){
-++#else
-++int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
-++  char **argv;
-++#endif
-++  char *zErrMsg = 0;
-++  ShellState data;
-++  const char *zInitFile = 0;
-++  int i;
-++  int rc = 0;
-++  int warnInmemoryDb = 0;
-++  int readStdin = 1;
-++  int nCmd = 0;
-++  char **azCmd = 0;
-++
-++  setBinaryMode(stdin, 0);
-++  setvbuf(stderr, 0, _IONBF, 0); /* Make sure stderr is unbuffered */
-++  stdin_is_interactive = isatty(0);
-++  stdout_is_console = isatty(1);
-++
-++#if USE_SYSTEM_SQLITE+0!=1
-++  if( strncmp(sqlite3_sourceid(),SQLITE_SOURCE_ID,60)!=0 ){
-++    utf8_printf(stderr, "SQLite header and source version mismatch\n%s\n%s\n",
-++            sqlite3_sourceid(), SQLITE_SOURCE_ID);
-++    exit(1);
-++  }
-++#endif
-++  main_init(&data);
-++#if !SQLITE_SHELL_IS_UTF8
-++  sqlite3_initialize();
-++  argv = sqlite3_malloc64(sizeof(argv[0])*argc);
-++  if( argv==0 ){
-++    raw_printf(stderr, "out of memory\n");
-++    exit(1);
-++  }
-++  for(i=0; i<argc; i++){
-++    argv[i] = sqlite3_win32_unicode_to_utf8(wargv[i]);
-++    if( argv[i]==0 ){
-++      raw_printf(stderr, "out of memory\n");
-++      exit(1);
-++    }
-++  }
-++#endif
-++  assert( argc>=1 && argv && argv[0] );
-++  Argv0 = argv[0];
-++
-++  /* Make sure we have a valid signal handler early, before anything
-++  ** else is done.
-++  */
-++#ifdef SIGINT
-++  signal(SIGINT, interrupt_handler);
-++#endif
-++
-++#ifdef SQLITE_SHELL_DBNAME_PROC
-++  {
-++    /* If the SQLITE_SHELL_DBNAME_PROC macro is defined, then it is the name
-++    ** of a C-function that will provide the name of the database file.  Use
-++    ** this compile-time option to embed this shell program in larger
-++    ** applications. */
-++    extern void SQLITE_SHELL_DBNAME_PROC(const char**);
-++    SQLITE_SHELL_DBNAME_PROC(&data.zDbFilename);
-++    warnInmemoryDb = 0;
-++  }
-++#endif
-++
-++  /* Begin evanm patch. */
-++#if !defined(__APPLE__)
-++  extern int sqlite_shell_init_icu();
-++  if( !sqlite_shell_init_icu() ){
-++    fprintf(stderr, "%s: warning: couldn't find icudt38.dll; "
-++                    "queries against ICU FTS tables will fail.\n", argv[0]);
-++  }
-++#endif /* !defined(__APPLE__) */
-++  /* End evanm patch. */
-++
-++  /* Do an initial pass through the command-line argument to locate
-++  ** the name of the database file, the name of the initialization file,
-++  ** the size of the alternative malloc heap,
-++  ** and the first command to execute.
-++  */
-++  for(i=1; i<argc; i++){
-++    char *z;
-++    z = argv[i];
-++    if( z[0]!='-' ){
-++      if( data.zDbFilename==0 ){
-++        data.zDbFilename = z;
-++      }else{
-++        /* Excesss arguments are interpreted as SQL (or dot-commands) and
-++        ** mean that nothing is read from stdin */
-++        readStdin = 0;
-++        nCmd++;
-++        azCmd = realloc(azCmd, sizeof(azCmd[0])*nCmd);
-++        if( azCmd==0 ){
-++          raw_printf(stderr, "out of memory\n");
-++          exit(1);
-++        }
-++        azCmd[nCmd-1] = z;
-++      }
-++    }
-++    if( z[1]=='-' ) z++;
-++    if( strcmp(z,"-separator")==0
-++     || strcmp(z,"-nullvalue")==0
-++     || strcmp(z,"-newline")==0
-++     || strcmp(z,"-cmd")==0
-++    ){
-++      (void)cmdline_option_value(argc, argv, ++i);
-++    }else if( strcmp(z,"-init")==0 ){
-++      zInitFile = cmdline_option_value(argc, argv, ++i);
-++    }else if( strcmp(z,"-batch")==0 ){
-++      /* Need to check for batch mode here to so we can avoid printing
-++      ** informational messages (like from process_sqliterc) before
-++      ** we do the actual processing of arguments later in a second pass.
-++      */
-++      stdin_is_interactive = 0;
-++    }else if( strcmp(z,"-heap")==0 ){
-++#if defined(SQLITE_ENABLE_MEMSYS3) || defined(SQLITE_ENABLE_MEMSYS5)
-++      const char *zSize;
-++      sqlite3_int64 szHeap;
-++
-++      zSize = cmdline_option_value(argc, argv, ++i);
-++      szHeap = integerValue(zSize);
-++      if( szHeap>0x7fff0000 ) szHeap = 0x7fff0000;
-++      sqlite3_config(SQLITE_CONFIG_HEAP, malloc((int)szHeap), (int)szHeap, 64);
-++#else
-++      (void)cmdline_option_value(argc, argv, ++i);
-++#endif
-++    }else if( strcmp(z,"-pagecache")==0 ){
-++      int n, sz;
-++      sz = (int)integerValue(cmdline_option_value(argc,argv,++i));
-++      if( sz>70000 ) sz = 70000;
-++      if( sz<0 ) sz = 0;
-++      n = (int)integerValue(cmdline_option_value(argc,argv,++i));
-++      sqlite3_config(SQLITE_CONFIG_PAGECACHE,
-++                    (n>0 && sz>0) ? malloc(n*sz) : 0, sz, n);
-++      data.shellFlgs |= SHFLG_Pagecache;
-++    }else if( strcmp(z,"-lookaside")==0 ){
-++      int n, sz;
-++      sz = (int)integerValue(cmdline_option_value(argc,argv,++i));
-++      if( sz<0 ) sz = 0;
-++      n = (int)integerValue(cmdline_option_value(argc,argv,++i));
-++      if( n<0 ) n = 0;
-++      sqlite3_config(SQLITE_CONFIG_LOOKASIDE, sz, n);
-++      if( sz*n==0 ) data.shellFlgs &= ~SHFLG_Lookaside;
-++#ifdef SQLITE_ENABLE_VFSTRACE
-++    }else if( strcmp(z,"-vfstrace")==0 ){
-++      extern int vfstrace_register(
-++         const char *zTraceName,
-++         const char *zOldVfsName,
-++         int (*xOut)(const char*,void*),
-++         void *pOutArg,
-++         int makeDefault
-++      );
-++      vfstrace_register("trace",0,(int(*)(const char*,void*))fputs,stderr,1);
-++#endif
-++#ifdef SQLITE_ENABLE_MULTIPLEX
-++    }else if( strcmp(z,"-multiplex")==0 ){
-++      extern int sqlite3_multiple_initialize(const char*,int);
-++      sqlite3_multiplex_initialize(0, 1);
-++#endif
-++    }else if( strcmp(z,"-mmap")==0 ){
-++      sqlite3_int64 sz = integerValue(cmdline_option_value(argc,argv,++i));
-++      sqlite3_config(SQLITE_CONFIG_MMAP_SIZE, sz, sz);
-++    }else if( strcmp(z,"-vfs")==0 ){
-++      sqlite3_vfs *pVfs = sqlite3_vfs_find(cmdline_option_value(argc,argv,++i));
-++      if( pVfs ){
-++        sqlite3_vfs_register(pVfs, 1);
-++      }else{
-++        utf8_printf(stderr, "no such VFS: \"%s\"\n", argv[i]);
-++        exit(1);
-++      }
-++    }
-++  }
-++  if( data.zDbFilename==0 ){
-++#ifndef SQLITE_OMIT_MEMORYDB
-++    data.zDbFilename = ":memory:";
-++    warnInmemoryDb = argc==1;
-++#else
-++    utf8_printf(stderr,"%s: Error: no database filename specified\n", Argv0);
-++    return 1;
-++#endif
-++  }
-++  data.out = stdout;
-++
-++  /* Go ahead and open the database file if it already exists.  If the
-++  ** file does not exist, delay opening it.  This prevents empty database
-++  ** files from being created if a user mistypes the database name argument
-++  ** to the sqlite command-line tool.
-++  */
-++  if( access(data.zDbFilename, 0)==0 ){
-++    open_db(&data, 0);
-++  }
-++
-++  /* Process the initialization file if there is one.  If no -init option
-++  ** is given on the command line, look for a file named ~/.sqliterc and
-++  ** try to process it.
-++  */
-++  process_sqliterc(&data,zInitFile);
-++
-++  /* Make a second pass through the command-line argument and set
-++  ** options.  This second pass is delayed until after the initialization
-++  ** file is processed so that the command-line arguments will override
-++  ** settings in the initialization file.
-++  */
-++  for(i=1; i<argc; i++){
-++    char *z = argv[i];
-++    if( z[0]!='-' ) continue;
-++    if( z[1]=='-' ){ z++; }
-++    if( strcmp(z,"-init")==0 ){
-++      i++;
-++    }else if( strcmp(z,"-html")==0 ){
-++      data.mode = MODE_Html;
-++    }else if( strcmp(z,"-list")==0 ){
-++      data.mode = MODE_List;
-++    }else if( strcmp(z,"-quote")==0 ){
-++      data.mode = MODE_Quote;
-++    }else if( strcmp(z,"-line")==0 ){
-++      data.mode = MODE_Line;
-++    }else if( strcmp(z,"-column")==0 ){
-++      data.mode = MODE_Column;
-++    }else if( strcmp(z,"-csv")==0 ){
-++      data.mode = MODE_Csv;
-++      memcpy(data.colSeparator,",",2);
-++    }else if( strcmp(z,"-ascii")==0 ){
-++      data.mode = MODE_Ascii;
-++      sqlite3_snprintf(sizeof(data.colSeparator), data.colSeparator,
-++                       SEP_Unit);
-++      sqlite3_snprintf(sizeof(data.rowSeparator), data.rowSeparator,
-++                       SEP_Record);
-++    }else if( strcmp(z,"-separator")==0 ){
-++      sqlite3_snprintf(sizeof(data.colSeparator), data.colSeparator,
-++                       "%s",cmdline_option_value(argc,argv,++i));
-++    }else if( strcmp(z,"-newline")==0 ){
-++      sqlite3_snprintf(sizeof(data.rowSeparator), data.rowSeparator,
-++                       "%s",cmdline_option_value(argc,argv,++i));
-++    }else if( strcmp(z,"-nullvalue")==0 ){
-++      sqlite3_snprintf(sizeof(data.nullValue), data.nullValue,
-++                       "%s",cmdline_option_value(argc,argv,++i));
-++    }else if( strcmp(z,"-header")==0 ){
-++      data.showHeader = 1;
-++    }else if( strcmp(z,"-noheader")==0 ){
-++      data.showHeader = 0;
-++    }else if( strcmp(z,"-echo")==0 ){
-++      ShellSetFlag(&data, SHFLG_Echo);
-++    }else if( strcmp(z,"-eqp")==0 ){
-++      data.autoEQP = 1;
-++    }else if( strcmp(z,"-eqpfull")==0 ){
-++      data.autoEQP = 2;
-++    }else if( strcmp(z,"-stats")==0 ){
-++      data.statsOn = 1;
-++    }else if( strcmp(z,"-scanstats")==0 ){
-++      data.scanstatsOn = 1;
-++    }else if( strcmp(z,"-backslash")==0 ){
-++      /* Undocumented command-line option: -backslash
-++      ** Causes C-style backslash escapes to be evaluated in SQL statements
-++      ** prior to sending the SQL into SQLite.  Useful for injecting
-++      ** crazy bytes in the middle of SQL statements for testing and debugging.
-++      */
-++      ShellSetFlag(&data, SHFLG_Backslash);
-++    }else if( strcmp(z,"-bail")==0 ){
-++      bail_on_error = 1;
-++    }else if( strcmp(z,"-version")==0 ){
-++      printf("%s %s\n", sqlite3_libversion(), sqlite3_sourceid());
-++      return 0;
-++    }else if( strcmp(z,"-interactive")==0 ){
-++      stdin_is_interactive = 1;
-++    }else if( strcmp(z,"-batch")==0 ){
-++      stdin_is_interactive = 0;
-++    }else if( strcmp(z,"-heap")==0 ){
-++      i++;
-++    }else if( strcmp(z,"-pagecache")==0 ){
-++      i+=2;
-++    }else if( strcmp(z,"-lookaside")==0 ){
-++      i+=2;
-++    }else if( strcmp(z,"-mmap")==0 ){
-++      i++;
-++    }else if( strcmp(z,"-vfs")==0 ){
-++      i++;
-++#ifdef SQLITE_ENABLE_VFSTRACE
-++    }else if( strcmp(z,"-vfstrace")==0 ){
-++      i++;
-++#endif
-++#ifdef SQLITE_ENABLE_MULTIPLEX
-++    }else if( strcmp(z,"-multiplex")==0 ){
-++      i++;
-++#endif
-++    }else if( strcmp(z,"-help")==0 ){
-++      usage(1);
-++    }else if( strcmp(z,"-cmd")==0 ){
-++      /* Run commands that follow -cmd first and separately from commands
-++      ** that simply appear on the command-line.  This seems goofy.  It would
-++      ** be better if all commands ran in the order that they appear.  But
-++      ** we retain the goofy behavior for historical compatibility. */
-++      if( i==argc-1 ) break;
-++      z = cmdline_option_value(argc,argv,++i);
-++      if( z[0]=='.' ){
-++        rc = do_meta_command(z, &data);
-++        if( rc && bail_on_error ) return rc==2 ? 0 : rc;
-++      }else{
-++        open_db(&data, 0);
-++        rc = shell_exec(data.db, z, shell_callback, &data, &zErrMsg);
-++        if( zErrMsg!=0 ){
-++          utf8_printf(stderr,"Error: %s\n", zErrMsg);
-++          if( bail_on_error ) return rc!=0 ? rc : 1;
-++        }else if( rc!=0 ){
-++          utf8_printf(stderr,"Error: unable to process SQL \"%s\"\n", z);
-++          if( bail_on_error ) return rc;
-++        }
-++      }
-++    }else{
-++      utf8_printf(stderr,"%s: Error: unknown option: %s\n", Argv0, z);
-++      raw_printf(stderr,"Use -help for a list of options.\n");
-++      return 1;
-++    }
-++    data.cMode = data.mode;
-++  }
-++
-++  if( !readStdin ){
-++    /* Run all arguments that do not begin with '-' as if they were separate
-++    ** command-line inputs, except for the argToSkip argument which contains
-++    ** the database filename.
-++    */
-++    for(i=0; i<nCmd; i++){
-++      if( azCmd[i][0]=='.' ){
-++        rc = do_meta_command(azCmd[i], &data);
-++        if( rc ) return rc==2 ? 0 : rc;
-++      }else{
-++        open_db(&data, 0);
-++        rc = shell_exec(data.db, azCmd[i], shell_callback, &data, &zErrMsg);
-++        if( zErrMsg!=0 ){
-++          utf8_printf(stderr,"Error: %s\n", zErrMsg);
-++          return rc!=0 ? rc : 1;
-++        }else if( rc!=0 ){
-++          utf8_printf(stderr,"Error: unable to process SQL: %s\n", azCmd[i]);
-++          return rc;
-++        }
-++      }
-++    }
-++    free(azCmd);
-++  }else{
-++    /* Run commands received from standard input
-++    */
-++    if( stdin_is_interactive ){
-++      char *zHome;
-++      char *zHistory = 0;
-++      int nHistory;
-++      printf(
-++        "SQLite version %s %.19s\n" /*extra-version-info*/
-++        "Enter \".help\" for usage hints.\n",
-++        sqlite3_libversion(), sqlite3_sourceid()
-++      );
-++      if( warnInmemoryDb ){
-++        printf("Connected to a ");
-++        printBold("transient in-memory database");
-++        printf(".\nUse \".open FILENAME\" to reopen on a "
-++               "persistent database.\n");
-++      }
-++      zHome = find_home_dir(0);
-++      if( zHome ){
-++        nHistory = strlen30(zHome) + 20;
-++        if( (zHistory = malloc(nHistory))!=0 ){
-++          sqlite3_snprintf(nHistory, zHistory,"%s/.sqlite_history", zHome);
-++        }
-++      }
-++      if( zHistory ){ shell_read_history(zHistory); }
-++#if HAVE_READLINE || HAVE_EDITLINE
-++      rl_attempted_completion_function = readline_completion;
-++#elif HAVE_LINENOISE
-++      linenoiseSetCompletionCallback(linenoise_completion);
-++#endif
-++      rc = process_input(&data, 0);
-++      if( zHistory ){
-++        shell_stifle_history(2000);
-++        shell_write_history(zHistory);
-++        free(zHistory);
-++      }
-++    }else{
-++      rc = process_input(&data, stdin);
-++    }
-++  }
-++  set_table_name(&data, 0);
-++  if( data.db ){
-++    session_close_all(&data);
-++    sqlite3_close(data.db);
-++  }
-++  sqlite3_free(data.zFreeOnClose);
-++  find_home_dir(1);
-++#if !SQLITE_SHELL_IS_UTF8
-++  for(i=0; i<argc; i++) sqlite3_free(argv[i]);
-++  sqlite3_free(argv);
-++#endif
-++  return rc;
-++}
-++
-+diff --git a/third_party/sqlite/amalgamation/sqlite3.c b/third_party/sqlite/amalgamation/sqlite3.c
-+index ab5a00d..7230430 100644
-+--- a/third_party/sqlite/amalgamation/sqlite3.c
-++++ b/third_party/sqlite/amalgamation/sqlite3.c
-+@@ -1,6 +1,6 @@
-+ /******************************************************************************
-+ ** This file is an amalgamation of many separate C source files from SQLite
-+-** version 3.20.0.  By combining all the individual C code files into this
-++** version 3.21.0.  By combining all the individual C code files into this
-+ ** single large file, the entire code can be compiled as a single translation
-+ ** unit.  This allows many compilers to do optimizations that would not be
-+ ** possible if the files were compiled separately.  Performance improvements
-+@@ -209,6 +209,9 @@ static const char * const sqlite3azCompileOpt[] = {
-+ #if SQLITE_ENABLE_ATOMIC_WRITE
-+   "ENABLE_ATOMIC_WRITE",
-+ #endif
-++#if SQLITE_ENABLE_BATCH_ATOMIC_WRITE
-++  "ENABLE_BATCH_ATOMIC_WRITE",
-++#endif
-+ #if SQLITE_ENABLE_CEROD
-+   "ENABLE_CEROD",
-+ #endif
-+@@ -828,17 +831,6 @@ SQLITE_PRIVATE const char **sqlite3CompileOptions(int *pnOpt){
-+ #endif
-+ 
-+ /*
-+-** Make sure that rand_s() is available on Windows systems with MSVC 2005
-+-** or higher.
-+-*/
-+-#if defined(_MSC_VER) && _MSC_VER>=1400
-+-/* TODO(shess): Already defined by build/config/win/BUILD.gn */
-+-#ifndef _CRT_RAND_S
-+-#  define _CRT_RAND_S
-+-#endif
-+-#endif
-+-
-+-/*
-+ ** Include the header file used to customize the compiler options for MSVC.
-+ ** This should be done first so that it can successfully prevent spurious
-+ ** compiler warnings due to subsequent content in this file and other files
-+@@ -1147,15 +1139,17 @@ extern "C" {
-+ ** a string which identifies a particular check-in of SQLite
-+ ** within its configuration management system.  ^The SQLITE_SOURCE_ID
-+ ** string contains the date and time of the check-in (UTC) and a SHA1
-+-** or SHA3-256 hash of the entire source tree.
-++** or SHA3-256 hash of the entire source tree.  If the source code has
-++** been edited in any way since it was last checked in, then the last
-++** four hexadecimal digits of the hash may be modified.
-+ **
-+ ** See also: [sqlite3_libversion()],
-+ ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
-+ ** [sqlite_version()] and [sqlite_source_id()].
-+ */
-+-#define SQLITE_VERSION        "3.20.0"
-+-#define SQLITE_VERSION_NUMBER 3020000
-+-#define SQLITE_SOURCE_ID      "2017-07-19 19:48:40 0a5e1c04d9d07bb7fd6546a9ddac1bf42b19ea19c2b79570aea6cd4226887a27"
-++#define SQLITE_VERSION        "3.21.0"
-++#define SQLITE_VERSION_NUMBER 3021000
-++#define SQLITE_SOURCE_ID      "2017-10-24 18:55:49 1a584e499906b5c87ec7d43d4abce641fdf017c42125b083109bc77c4de4alt1"
-+ 
-+ /*
-+ ** CAPI3REF: Run-Time Library Version Numbers
-+@@ -1171,7 +1165,7 @@ extern "C" {
-+ **
-+ ** <blockquote><pre>
-+ ** assert( sqlite3_libversion_number()==SQLITE_VERSION_NUMBER );
-+-** assert( strcmp(sqlite3_sourceid(),SQLITE_SOURCE_ID)==0 );
-++** assert( strncmp(sqlite3_sourceid(),SQLITE_SOURCE_ID,80)==0 );
-+ ** assert( strcmp(sqlite3_libversion(),SQLITE_VERSION)==0 );
-+ ** </pre></blockquote>)^
-+ **
-+@@ -1181,9 +1175,11 @@ extern "C" {
-+ ** function is provided for use in DLLs since DLL users usually do not have
-+ ** direct access to string constants within the DLL.  ^The
-+ ** sqlite3_libversion_number() function returns an integer equal to
-+-** [SQLITE_VERSION_NUMBER].  ^The sqlite3_sourceid() function returns
-++** [SQLITE_VERSION_NUMBER].  ^(The sqlite3_sourceid() function returns
-+ ** a pointer to a string constant whose value is the same as the
-+-** [SQLITE_SOURCE_ID] C preprocessor macro.
-++** [SQLITE_SOURCE_ID] C preprocessor macro.  Except if SQLite is built
-++** using an edited copy of [the amalgamation], then the last four characters
-++** of the hash might be different from [SQLITE_SOURCE_ID].)^
-+ **
-+ ** See also: [sqlite_version()] and [sqlite_source_id()].
-+ */
-+@@ -1464,7 +1460,7 @@ SQLITE_API int sqlite3_exec(
-+ #define SQLITE_FULL        13   /* Insertion failed because database is full */
-+ #define SQLITE_CANTOPEN    14   /* Unable to open the database file */
-+ #define SQLITE_PROTOCOL    15   /* Database lock protocol error */
-+-#define SQLITE_EMPTY       16   /* Not used */
-++#define SQLITE_EMPTY       16   /* Internal use only */
-+ #define SQLITE_SCHEMA      17   /* The database schema changed */
-+ #define SQLITE_TOOBIG      18   /* String or BLOB exceeds size limit */
-+ #define SQLITE_CONSTRAINT  19   /* Abort due to constraint violation */
-+@@ -1526,6 +1522,9 @@ SQLITE_API int sqlite3_exec(
-+ #define SQLITE_IOERR_CONVPATH          (SQLITE_IOERR | (26<<8))
-+ #define SQLITE_IOERR_VNODE             (SQLITE_IOERR | (27<<8))
-+ #define SQLITE_IOERR_AUTH              (SQLITE_IOERR | (28<<8))
-++#define SQLITE_IOERR_BEGIN_ATOMIC      (SQLITE_IOERR | (29<<8))
-++#define SQLITE_IOERR_COMMIT_ATOMIC     (SQLITE_IOERR | (30<<8))
-++#define SQLITE_IOERR_ROLLBACK_ATOMIC   (SQLITE_IOERR | (31<<8))
-+ #define SQLITE_LOCKED_SHAREDCACHE      (SQLITE_LOCKED |  (1<<8))
-+ #define SQLITE_BUSY_RECOVERY           (SQLITE_BUSY   |  (1<<8))
-+ #define SQLITE_BUSY_SNAPSHOT           (SQLITE_BUSY   |  (2<<8))
-+@@ -1612,6 +1611,11 @@ SQLITE_API int sqlite3_exec(
-+ ** SQLITE_IOCAP_IMMUTABLE flag indicates that the file is on
-+ ** read-only media and cannot be changed even by processes with
-+ ** elevated privileges.
-++**
-++** The SQLITE_IOCAP_BATCH_ATOMIC property means that the underlying
-++** filesystem supports doing multiple write operations atomically when those
-++** write operations are bracketed by [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE] and
-++** [SQLITE_FCNTL_COMMIT_ATOMIC_WRITE].
-+ */
-+ #define SQLITE_IOCAP_ATOMIC                 0x00000001
-+ #define SQLITE_IOCAP_ATOMIC512              0x00000002
-+@@ -1627,6 +1631,7 @@ SQLITE_API int sqlite3_exec(
-+ #define SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN  0x00000800
-+ #define SQLITE_IOCAP_POWERSAFE_OVERWRITE    0x00001000
-+ #define SQLITE_IOCAP_IMMUTABLE              0x00002000
-++#define SQLITE_IOCAP_BATCH_ATOMIC           0x00004000
-+ 
-+ /*
-+ ** CAPI3REF: File Locking Levels
-+@@ -1761,6 +1766,7 @@ struct sqlite3_file {
-+ ** <li> [SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN]
-+ ** <li> [SQLITE_IOCAP_POWERSAFE_OVERWRITE]
-+ ** <li> [SQLITE_IOCAP_IMMUTABLE]
-++** <li> [SQLITE_IOCAP_BATCH_ATOMIC]
-+ ** </ul>
-+ **
-+ ** The SQLITE_IOCAP_ATOMIC property means that all writes of
-+@@ -2044,6 +2050,40 @@ struct sqlite3_io_methods {
-+ ** The [SQLITE_FCNTL_RBU] opcode is implemented by the special VFS used by
-+ ** the RBU extension only.  All other VFS should return SQLITE_NOTFOUND for
-+ ** this opcode.
-++**
-++** <li>[[SQLITE_FCNTL_BEGIN_ATOMIC_WRITE]]
-++** If the [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE] opcode returns SQLITE_OK, then
-++** the file descriptor is placed in "batch write mode", which
-++** means all subsequent write operations will be deferred and done
-++** atomically at the next [SQLITE_FCNTL_COMMIT_ATOMIC_WRITE].  Systems
-++** that do not support batch atomic writes will return SQLITE_NOTFOUND.
-++** ^Following a successful SQLITE_FCNTL_BEGIN_ATOMIC_WRITE and prior to
-++** the closing [SQLITE_FCNTL_COMMIT_ATOMIC_WRITE] or
-++** [SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE], SQLite will make
-++** no VFS interface calls on the same [sqlite3_file] file descriptor
-++** except for calls to the xWrite method and the xFileControl method
-++** with [SQLITE_FCNTL_SIZE_HINT].
-++**
-++** <li>[[SQLITE_FCNTL_COMMIT_ATOMIC_WRITE]]
-++** The [SQLITE_FCNTL_COMMIT_ATOMIC_WRITE] opcode causes all write
-++** operations since the previous successful call to
-++** [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE] to be performed atomically.
-++** This file control returns [SQLITE_OK] if and only if the writes were
-++** all performed successfully and have been committed to persistent storage.
-++** ^Regardless of whether or not it is successful, this file control takes
-++** the file descriptor out of batch write mode so that all subsequent
-++** write operations are independent.
-++** ^SQLite will never invoke SQLITE_FCNTL_COMMIT_ATOMIC_WRITE without
-++** a prior successful call to [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE].
-++**
-++** <li>[[SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE]]
-++** The [SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE] opcode causes all write
-++** operations since the previous successful call to
-++** [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE] to be rolled back.
-++** ^This file control takes the file descriptor out of batch write mode
-++** so that all subsequent write operations are independent.
-++** ^SQLite will never invoke SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE without
-++** a prior successful call to [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE].
-+ ** </ul>
-+ */
-+ #define SQLITE_FCNTL_LOCKSTATE               1
-+@@ -2075,6 +2115,9 @@ struct sqlite3_io_methods {
-+ #define SQLITE_FCNTL_JOURNAL_POINTER        28
-+ #define SQLITE_FCNTL_WIN32_GET_HANDLE       29
-+ #define SQLITE_FCNTL_PDB                    30
-++#define SQLITE_FCNTL_BEGIN_ATOMIC_WRITE     31
-++#define SQLITE_FCNTL_COMMIT_ATOMIC_WRITE    32
-++#define SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE  33
-+ 
-+ /* deprecated names */
-+ #define SQLITE_GET_LOCKPROXYFILE      SQLITE_FCNTL_GET_LOCKPROXYFILE
-+@@ -2645,6 +2688,16 @@ struct sqlite3_mem_methods {
-+ ** routines with a wrapper that simulations memory allocation failure or
-+ ** tracks memory usage, for example. </dd>
-+ **
-++** [[SQLITE_CONFIG_SMALL_MALLOC]] <dt>SQLITE_CONFIG_SMALL_MALLOC</dt>
-++** <dd> ^The SQLITE_CONFIG_SMALL_MALLOC option takes single argument of
-++** type int, interpreted as a boolean, which if true provides a hint to
-++** SQLite that it should avoid large memory allocations if possible.
-++** SQLite will run faster if it is free to make large memory allocations,
-++** but some application might prefer to run slower in exchange for
-++** guarantees about memory fragmentation that are possible if large
-++** allocations are avoided.  This hint is normally off.
-++** </dd>
-++**
-+ ** [[SQLITE_CONFIG_MEMSTATUS]] <dt>SQLITE_CONFIG_MEMSTATUS</dt>
-+ ** <dd> ^The SQLITE_CONFIG_MEMSTATUS option takes single argument of type int,
-+ ** interpreted as a boolean, which enables or disables the collection of
-+@@ -2662,25 +2715,7 @@ struct sqlite3_mem_methods {
-+ ** </dd>
-+ **
-+ ** [[SQLITE_CONFIG_SCRATCH]] <dt>SQLITE_CONFIG_SCRATCH</dt>
-+-** <dd> ^The SQLITE_CONFIG_SCRATCH option specifies a static memory buffer
-+-** that SQLite can use for scratch memory.  ^(There are three arguments
-+-** to SQLITE_CONFIG_SCRATCH:  A pointer an 8-byte
-+-** aligned memory buffer from which the scratch allocations will be
-+-** drawn, the size of each scratch allocation (sz),
-+-** and the maximum number of scratch allocations (N).)^
-+-** The first argument must be a pointer to an 8-byte aligned buffer
-+-** of at least sz*N bytes of memory.
-+-** ^SQLite will not use more than one scratch buffers per thread.
-+-** ^SQLite will never request a scratch buffer that is more than 6
-+-** times the database page size.
-+-** ^If SQLite needs needs additional
-+-** scratch memory beyond what is provided by this configuration option, then
-+-** [sqlite3_malloc()] will be used to obtain the memory needed.<p>
-+-** ^When the application provides any amount of scratch memory using
-+-** SQLITE_CONFIG_SCRATCH, SQLite avoids unnecessary large
-+-** [sqlite3_malloc|heap allocations].
-+-** This can help [Robson proof|prevent memory allocation failures] due to heap
-+-** fragmentation in low-memory embedded systems.
-++** <dd> The SQLITE_CONFIG_SCRATCH option is no longer used.
-+ ** </dd>
-+ **
-+ ** [[SQLITE_CONFIG_PAGECACHE]] <dt>SQLITE_CONFIG_PAGECACHE</dt>
-+@@ -2716,8 +2751,7 @@ struct sqlite3_mem_methods {
-+ ** [[SQLITE_CONFIG_HEAP]] <dt>SQLITE_CONFIG_HEAP</dt>
-+ ** <dd> ^The SQLITE_CONFIG_HEAP option specifies a static memory buffer
-+ ** that SQLite will use for all of its dynamic memory allocation needs
-+-** beyond those provided for by [SQLITE_CONFIG_SCRATCH] and
-+-** [SQLITE_CONFIG_PAGECACHE].
-++** beyond those provided for by [SQLITE_CONFIG_PAGECACHE].
-+ ** ^The SQLITE_CONFIG_HEAP option is only available if SQLite is compiled
-+ ** with either [SQLITE_ENABLE_MEMSYS3] or [SQLITE_ENABLE_MEMSYS5] and returns
-+ ** [SQLITE_ERROR] if invoked otherwise.
-+@@ -2910,7 +2944,7 @@ struct sqlite3_mem_methods {
-+ #define SQLITE_CONFIG_SERIALIZED    3  /* nil */
-+ #define SQLITE_CONFIG_MALLOC        4  /* sqlite3_mem_methods* */
-+ #define SQLITE_CONFIG_GETMALLOC     5  /* sqlite3_mem_methods* */
-+-#define SQLITE_CONFIG_SCRATCH       6  /* void*, int sz, int N */
-++#define SQLITE_CONFIG_SCRATCH       6  /* No longer used */
-+ #define SQLITE_CONFIG_PAGECACHE     7  /* void*, int sz, int N */
-+ #define SQLITE_CONFIG_HEAP          8  /* void*, int nByte, int min */
-+ #define SQLITE_CONFIG_MEMSTATUS     9  /* boolean */
-+@@ -2931,6 +2965,7 @@ struct sqlite3_mem_methods {
-+ #define SQLITE_CONFIG_PCACHE_HDRSZ        24  /* int *psz */
-+ #define SQLITE_CONFIG_PMASZ               25  /* unsigned int szPma */
-+ #define SQLITE_CONFIG_STMTJRNL_SPILL      26  /* int nByte */
-++#define SQLITE_CONFIG_SMALL_MALLOC        27  /* boolean */
-+ 
-+ /*
-+ ** CAPI3REF: Database Connection Configuration Options
-+@@ -4131,10 +4166,10 @@ SQLITE_API void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);
-+ ** ^If [URI filename] interpretation is enabled, and the filename argument
-+ ** begins with "file:", then the filename is interpreted as a URI. ^URI
-+ ** filename interpretation is enabled if the [SQLITE_OPEN_URI] flag is
-+-** set in the fourth argument to sqlite3_open_v2(), or if it has
-++** set in the third argument to sqlite3_open_v2(), or if it has
-+ ** been enabled globally using the [SQLITE_CONFIG_URI] option with the
-+ ** [sqlite3_config()] method or by the [SQLITE_USE_URI] compile-time option.
-+-** As of SQLite version 3.7.7, URI filename interpretation is turned off
-++** URI filename interpretation is turned off
-+ ** by default, but future releases of SQLite might enable URI filename
-+ ** interpretation by default.  See "[URI filenames]" for additional
-+ ** information.
-+@@ -4808,8 +4843,9 @@ SQLITE_API int sqlite3_stmt_busy(sqlite3_stmt*);
-+ ** implementation of [application-defined SQL functions] are protected.
-+ ** ^The sqlite3_value object returned by
-+ ** [sqlite3_column_value()] is unprotected.
-+-** Unprotected sqlite3_value objects may only be used with
-+-** [sqlite3_result_value()] and [sqlite3_bind_value()].
-++** Unprotected sqlite3_value objects may only be used as arguments
-++** to [sqlite3_result_value()], [sqlite3_bind_value()], and
-++** [sqlite3_value_dup()].
-+ ** The [sqlite3_value_blob | sqlite3_value_type()] family of
-+ ** interfaces require protected sqlite3_value objects.
-+ */
-+@@ -7232,15 +7268,20 @@ struct sqlite3_index_info {
-+ ** an operator that is part of a constraint term in the wHERE clause of
-+ ** a query that uses a [virtual table].
-+ */
-+-#define SQLITE_INDEX_CONSTRAINT_EQ      2
-+-#define SQLITE_INDEX_CONSTRAINT_GT      4
-+-#define SQLITE_INDEX_CONSTRAINT_LE      8
-+-#define SQLITE_INDEX_CONSTRAINT_LT     16
-+-#define SQLITE_INDEX_CONSTRAINT_GE     32
-+-#define SQLITE_INDEX_CONSTRAINT_MATCH  64
-+-#define SQLITE_INDEX_CONSTRAINT_LIKE   65
-+-#define SQLITE_INDEX_CONSTRAINT_GLOB   66
-+-#define SQLITE_INDEX_CONSTRAINT_REGEXP 67
-++#define SQLITE_INDEX_CONSTRAINT_EQ         2
-++#define SQLITE_INDEX_CONSTRAINT_GT         4
-++#define SQLITE_INDEX_CONSTRAINT_LE         8
-++#define SQLITE_INDEX_CONSTRAINT_LT        16
-++#define SQLITE_INDEX_CONSTRAINT_GE        32
-++#define SQLITE_INDEX_CONSTRAINT_MATCH     64
-++#define SQLITE_INDEX_CONSTRAINT_LIKE      65
-++#define SQLITE_INDEX_CONSTRAINT_GLOB      66
-++#define SQLITE_INDEX_CONSTRAINT_REGEXP    67
-++#define SQLITE_INDEX_CONSTRAINT_NE        68
-++#define SQLITE_INDEX_CONSTRAINT_ISNOT     69
-++#define SQLITE_INDEX_CONSTRAINT_ISNOTNULL 70
-++#define SQLITE_INDEX_CONSTRAINT_ISNULL    71
-++#define SQLITE_INDEX_CONSTRAINT_IS        72
-+ 
-+ /*
-+ ** CAPI3REF: Register A Virtual Table Implementation
-+@@ -7992,7 +8033,7 @@ SQLITE_API int sqlite3_test_control(int op, ...);
-+ #define SQLITE_TESTCTRL_RESERVE                 14
-+ #define SQLITE_TESTCTRL_OPTIMIZATIONS           15
-+ #define SQLITE_TESTCTRL_ISKEYWORD               16
-+-#define SQLITE_TESTCTRL_SCRATCHMALLOC           17
-++#define SQLITE_TESTCTRL_SCRATCHMALLOC           17  /* NOT USED */
-+ #define SQLITE_TESTCTRL_LOCALTIME_FAULT         18
-+ #define SQLITE_TESTCTRL_EXPLAIN_STMT            19  /* NOT USED */
-+ #define SQLITE_TESTCTRL_ONCE_RESET_THRESHOLD    19
-+@@ -8051,8 +8092,7 @@ SQLITE_API int sqlite3_status64(
-+ ** <dd>This parameter is the current amount of memory checked out
-+ ** using [sqlite3_malloc()], either directly or indirectly.  The
-+ ** figure includes calls made to [sqlite3_malloc()] by the application
-+-** and internal memory usage by the SQLite library.  Scratch memory
-+-** controlled by [SQLITE_CONFIG_SCRATCH] and auxiliary page-cache
-++** and internal memory usage by the SQLite library.  Auxiliary page-cache
-+ ** memory controlled by [SQLITE_CONFIG_PAGECACHE] is not included in
-+ ** this parameter.  The amount returned is the sum of the allocation
-+ ** sizes as reported by the xSize method in [sqlite3_mem_methods].</dd>)^
-+@@ -8090,29 +8130,14 @@ SQLITE_API int sqlite3_status64(
-+ ** *pHighwater parameter to [sqlite3_status()] is of interest.
-+ ** The value written into the *pCurrent parameter is undefined.</dd>)^
-+ **
-+-** [[SQLITE_STATUS_SCRATCH_USED]] ^(<dt>SQLITE_STATUS_SCRATCH_USED</dt>
-+-** <dd>This parameter returns the number of allocations used out of the
-+-** [scratch memory allocator] configured using
-+-** [SQLITE_CONFIG_SCRATCH].  The value returned is in allocations, not
-+-** in bytes.  Since a single thread may only have one scratch allocation
-+-** outstanding at time, this parameter also reports the number of threads
-+-** using scratch memory at the same time.</dd>)^
-++** [[SQLITE_STATUS_SCRATCH_USED]] <dt>SQLITE_STATUS_SCRATCH_USED</dt>
-++** <dd>No longer used.</dd>
-+ **
-+ ** [[SQLITE_STATUS_SCRATCH_OVERFLOW]] ^(<dt>SQLITE_STATUS_SCRATCH_OVERFLOW</dt>
-+-** <dd>This parameter returns the number of bytes of scratch memory
-+-** allocation which could not be satisfied by the [SQLITE_CONFIG_SCRATCH]
-+-** buffer and where forced to overflow to [sqlite3_malloc()].  The values
-+-** returned include overflows because the requested allocation was too
-+-** larger (that is, because the requested allocation was larger than the
-+-** "sz" parameter to [SQLITE_CONFIG_SCRATCH]) and because no scratch buffer
-+-** slots were available.
-+-** </dd>)^
-+-**
-+-** [[SQLITE_STATUS_SCRATCH_SIZE]] ^(<dt>SQLITE_STATUS_SCRATCH_SIZE</dt>
-+-** <dd>This parameter records the largest memory allocation request
-+-** handed to [scratch memory allocator].  Only the value returned in the
-+-** *pHighwater parameter to [sqlite3_status()] is of interest.
-+-** The value written into the *pCurrent parameter is undefined.</dd>)^
-++** <dd>No longer used.</dd>
-++**
-++** [[SQLITE_STATUS_SCRATCH_SIZE]] <dt>SQLITE_STATUS_SCRATCH_SIZE</dt>
-++** <dd>No longer used.</dd>
-+ **
-+ ** [[SQLITE_STATUS_PARSER_STACK]] ^(<dt>SQLITE_STATUS_PARSER_STACK</dt>
-+ ** <dd>The *pHighwater parameter records the deepest parser stack.
-+@@ -8125,12 +8150,12 @@ SQLITE_API int sqlite3_status64(
-+ #define SQLITE_STATUS_MEMORY_USED          0
-+ #define SQLITE_STATUS_PAGECACHE_USED       1
-+ #define SQLITE_STATUS_PAGECACHE_OVERFLOW   2
-+-#define SQLITE_STATUS_SCRATCH_USED         3
-+-#define SQLITE_STATUS_SCRATCH_OVERFLOW     4
-++#define SQLITE_STATUS_SCRATCH_USED         3  /* NOT USED */
-++#define SQLITE_STATUS_SCRATCH_OVERFLOW     4  /* NOT USED */
-+ #define SQLITE_STATUS_MALLOC_SIZE          5
-+ #define SQLITE_STATUS_PARSER_STACK         6
-+ #define SQLITE_STATUS_PAGECACHE_SIZE       7
-+-#define SQLITE_STATUS_SCRATCH_SIZE         8
-++#define SQLITE_STATUS_SCRATCH_SIZE         8  /* NOT USED */
-+ #define SQLITE_STATUS_MALLOC_COUNT         9
-+ 
-+ /*
-+@@ -10250,8 +10275,8 @@ SQLITE_API int sqlite3session_diff(
-+ */
-+ SQLITE_API int sqlite3session_patchset(
-+   sqlite3_session *pSession,      /* Session object */
-+-  int *pnPatchset,                /* OUT: Size of buffer at *ppChangeset */
-+-  void **ppPatchset               /* OUT: Buffer containing changeset */
-++  int *pnPatchset,                /* OUT: Size of buffer at *ppPatchset */
-++  void **ppPatchset               /* OUT: Buffer containing patchset */
-+ );
-+ 
-+ /*
-+@@ -11018,12 +11043,12 @@ SQLITE_API int sqlite3changeset_apply(
-+ **
-+ ** <table border=1 style="margin-left:8ex;margin-right:8ex">
-+ **   <tr><th>Streaming function<th>Non-streaming equivalent</th>
-+-**   <tr><td>sqlite3changeset_apply_str<td>[sqlite3changeset_apply]
-+-**   <tr><td>sqlite3changeset_concat_str<td>[sqlite3changeset_concat]
-+-**   <tr><td>sqlite3changeset_invert_str<td>[sqlite3changeset_invert]
-+-**   <tr><td>sqlite3changeset_start_str<td>[sqlite3changeset_start]
-+-**   <tr><td>sqlite3session_changeset_str<td>[sqlite3session_changeset]
-+-**   <tr><td>sqlite3session_patchset_str<td>[sqlite3session_patchset]
-++**   <tr><td>sqlite3changeset_apply_strm<td>[sqlite3changeset_apply]
-++**   <tr><td>sqlite3changeset_concat_strm<td>[sqlite3changeset_concat]
-++**   <tr><td>sqlite3changeset_invert_strm<td>[sqlite3changeset_invert]
-++**   <tr><td>sqlite3changeset_start_strm<td>[sqlite3changeset_start]
-++**   <tr><td>sqlite3session_changeset_strm<td>[sqlite3session_changeset]
-++**   <tr><td>sqlite3session_patchset_strm<td>[sqlite3session_patchset]
-+ ** </table>
-+ **
-+ ** Non-streaming functions that accept changesets (or patchsets) as input
-+@@ -12244,6 +12269,21 @@ SQLITE_PRIVATE   void sqlite3Coverage(int);
-+ #endif
-+ 
-+ /*
-++** Some conditionals are optimizations only.  In other words, if the
-++** conditionals are replaced with a constant 1 (true) or 0 (false) then
-++** the correct answer is still obtained, though perhaps not as quickly.
-++**
-++** The following macros mark these optimizations conditionals.
-++*/
-++#if defined(SQLITE_MUTATION_TEST)
-++# define OK_IF_ALWAYS_TRUE(X)  (1)
-++# define OK_IF_ALWAYS_FALSE(X) (0)
-++#else
-++# define OK_IF_ALWAYS_TRUE(X)  (X)
-++# define OK_IF_ALWAYS_FALSE(X) (X)
-++#endif
-++
-++/*
-+ ** Some malloc failures are only possible if SQLITE_TEST_REALLOC_STRESS is
-+ ** defined.  We need to defend against those failures when testing with
-+ ** SQLITE_TEST_REALLOC_STRESS, but we don't want the unreachable branches
-+@@ -12437,63 +12477,63 @@ SQLITE_PRIVATE void sqlite3HashClear(Hash*);
-+ #define TK_AS                              24
-+ #define TK_WITHOUT                         25
-+ #define TK_COMMA                           26
-+-#define TK_ID                              27
-+-#define TK_ABORT                           28
-+-#define TK_ACTION                          29
-+-#define TK_AFTER                           30
-+-#define TK_ANALYZE                         31
-+-#define TK_ASC                             32
-+-#define TK_ATTACH                          33
-+-#define TK_BEFORE                          34
-+-#define TK_BY                              35
-+-#define TK_CASCADE                         36
-+-#define TK_CAST                            37
-+-#define TK_COLUMNKW                        38
-+-#define TK_CONFLICT                        39
-+-#define TK_DATABASE                        40
-+-#define TK_DESC                            41
-+-#define TK_DETACH                          42
-+-#define TK_EACH                            43
-+-#define TK_FAIL                            44
-+-#define TK_FOR                             45
-+-#define TK_IGNORE                          46
-+-#define TK_INITIALLY                       47
-+-#define TK_INSTEAD                         48
-+-#define TK_LIKE_KW                         49
-+-#define TK_MATCH                           50
-+-#define TK_NO                              51
-+-#define TK_KEY                             52
-+-#define TK_OF                              53
-+-#define TK_OFFSET                          54
-+-#define TK_PRAGMA                          55
-+-#define TK_RAISE                           56
-+-#define TK_RECURSIVE                       57
-+-#define TK_REPLACE                         58
-+-#define TK_RESTRICT                        59
-+-#define TK_ROW                             60
-+-#define TK_TRIGGER                         61
-+-#define TK_VACUUM                          62
-+-#define TK_VIEW                            63
-+-#define TK_VIRTUAL                         64
-+-#define TK_WITH                            65
-+-#define TK_REINDEX                         66
-+-#define TK_RENAME                          67
-+-#define TK_CTIME_KW                        68
-+-#define TK_ANY                             69
-+-#define TK_OR                              70
-+-#define TK_AND                             71
-+-#define TK_IS                              72
-+-#define TK_BETWEEN                         73
-+-#define TK_IN                              74
-+-#define TK_ISNULL                          75
-+-#define TK_NOTNULL                         76
-+-#define TK_NE                              77
-+-#define TK_EQ                              78
-+-#define TK_GT                              79
-+-#define TK_LE                              80
-+-#define TK_LT                              81
-+-#define TK_GE                              82
-+-#define TK_ESCAPE                          83
-++#define TK_ABORT                           27
-++#define TK_ACTION                          28
-++#define TK_AFTER                           29
-++#define TK_ANALYZE                         30
-++#define TK_ASC                             31
-++#define TK_ATTACH                          32
-++#define TK_BEFORE                          33
-++#define TK_BY                              34
-++#define TK_CASCADE                         35
-++#define TK_CAST                            36
-++#define TK_CONFLICT                        37
-++#define TK_DATABASE                        38
-++#define TK_DESC                            39
-++#define TK_DETACH                          40
-++#define TK_EACH                            41
-++#define TK_FAIL                            42
-++#define TK_OR                              43
-++#define TK_AND                             44
-++#define TK_IS                              45
-++#define TK_MATCH                           46
-++#define TK_LIKE_KW                         47
-++#define TK_BETWEEN                         48
-++#define TK_IN                              49
-++#define TK_ISNULL                          50
-++#define TK_NOTNULL                         51
-++#define TK_NE                              52
-++#define TK_EQ                              53
-++#define TK_GT                              54
-++#define TK_LE                              55
-++#define TK_LT                              56
-++#define TK_GE                              57
-++#define TK_ESCAPE                          58
-++#define TK_ID                              59
-++#define TK_COLUMNKW                        60
-++#define TK_FOR                             61
-++#define TK_IGNORE                          62
-++#define TK_INITIALLY                       63
-++#define TK_INSTEAD                         64
-++#define TK_NO                              65
-++#define TK_KEY                             66
-++#define TK_OF                              67
-++#define TK_OFFSET                          68
-++#define TK_PRAGMA                          69
-++#define TK_RAISE                           70
-++#define TK_RECURSIVE                       71
-++#define TK_REPLACE                         72
-++#define TK_RESTRICT                        73
-++#define TK_ROW                             74
-++#define TK_TRIGGER                         75
-++#define TK_VACUUM                          76
-++#define TK_VIEW                            77
-++#define TK_VIRTUAL                         78
-++#define TK_WITH                            79
-++#define TK_REINDEX                         80
-++#define TK_RENAME                          81
-++#define TK_CTIME_KW                        82
-++#define TK_ANY                             83
-+ #define TK_BITAND                          84
-+ #define TK_BITOR                           85
-+ #define TK_LSHIFT                          86
-+@@ -12553,28 +12593,23 @@ SQLITE_PRIVATE void sqlite3HashClear(Hash*);
-+ #define TK_INDEX                          140
-+ #define TK_ALTER                          141
-+ #define TK_ADD                            142
-+-#define TK_TO_TEXT                        143
-+-#define TK_TO_BLOB                        144
-+-#define TK_TO_NUMERIC                     145
-+-#define TK_TO_INT                         146
-+-#define TK_TO_REAL                        147
-+-#define TK_ISNOT                          148
-+-#define TK_END_OF_FILE                    149
-+-#define TK_UNCLOSED_STRING                150
-+-#define TK_FUNCTION                       151
-+-#define TK_COLUMN                         152
-+-#define TK_AGG_FUNCTION                   153
-+-#define TK_AGG_COLUMN                     154
-+-#define TK_UMINUS                         155
-+-#define TK_UPLUS                          156
-+-#define TK_REGISTER                       157
-+-#define TK_VECTOR                         158
-+-#define TK_SELECT_COLUMN                  159
-+-#define TK_IF_NULL_ROW                    160
-+-#define TK_ASTERISK                       161
-+-#define TK_SPAN                           162
-+-#define TK_SPACE                          163
-+-#define TK_ILLEGAL                        164
-++#define TK_ISNOT                          143
-++#define TK_FUNCTION                       144
-++#define TK_COLUMN                         145
-++#define TK_AGG_FUNCTION                   146
-++#define TK_AGG_COLUMN                     147
-++#define TK_UMINUS                         148
-++#define TK_UPLUS                          149
-++#define TK_REGISTER                       150
-++#define TK_VECTOR                         151
-++#define TK_SELECT_COLUMN                  152
-++#define TK_IF_NULL_ROW                    153
-++#define TK_ASTERISK                       154
-++#define TK_SPAN                           155
-++#define TK_END_OF_FILE                    156
-++#define TK_UNCLOSED_STRING                157
-++#define TK_SPACE                          158
-++#define TK_ILLEGAL                        159
-+ 
-+ /* The token codes above must all fit in 8 bits */
-+ #define TKFLG_MASK           0xff  
-+@@ -12695,6 +12730,15 @@ SQLITE_PRIVATE void sqlite3HashClear(Hash*);
-+ #endif
-+ 
-+ /*
-++** The compile-time options SQLITE_MMAP_READWRITE and
-++** SQLITE_ENABLE_BATCH_ATOMIC_WRITE are not compatible with one another.
-++** You must choose one or the other (or neither) but not both.
-++*/
-++#if defined(SQLITE_MMAP_READWRITE) && defined(SQLITE_ENABLE_BATCH_ATOMIC_WRITE)
-++#error Cannot use both SQLITE_MMAP_READWRITE and SQLITE_ENABLE_BATCH_ATOMIC_WRITE
-++#endif
-++
-++/*
-+ ** GCC does not define the offsetof() macro so we'll have to do it
-+ ** ourselves.
-+ */
-+@@ -12992,7 +13036,7 @@ typedef INT16_TYPE LogEst;
-+ ** SELECTTRACE_ENABLED will be either 1 or 0 depending on whether or not
-+ ** the Select query generator tracing logic is turned on.
-+ */
-+-#if defined(SQLITE_DEBUG) || defined(SQLITE_ENABLE_SELECTTRACE)
-++#if defined(SQLITE_ENABLE_SELECTTRACE)
-+ # define SELECTTRACE_ENABLED 1
-+ #else
-+ # define SELECTTRACE_ENABLED 0
-+@@ -13398,6 +13442,7 @@ SQLITE_PRIVATE int sqlite3BtreeCursor(
-+   struct KeyInfo*,                     /* First argument to compare function */
-+   BtCursor *pCursor                    /* Space to write cursor structure */
-+ );
-++SQLITE_PRIVATE BtCursor *sqlite3BtreeFakeValidCursor(void);
-+ SQLITE_PRIVATE int sqlite3BtreeCursorSize(void);
-+ SQLITE_PRIVATE void sqlite3BtreeCursorZero(BtCursor*);
-+ SQLITE_PRIVATE void sqlite3BtreeCursorHintFlags(BtCursor*, unsigned);
-+@@ -13716,87 +13761,87 @@ typedef struct VdbeOpList VdbeOpList;
-+ #define OP_Savepoint       0
-+ #define OP_AutoCommit      1
-+ #define OP_Transaction     2
-+-#define OP_SorterNext      3
-+-#define OP_PrevIfOpen      4
-+-#define OP_NextIfOpen      5
-+-#define OP_Prev            6
-+-#define OP_Next            7
-++#define OP_SorterNext      3 /* jump                                       */
-++#define OP_PrevIfOpen      4 /* jump                                       */
-++#define OP_NextIfOpen      5 /* jump                                       */
-++#define OP_Prev            6 /* jump                                       */
-++#define OP_Next            7 /* jump                                       */
-+ #define OP_Checkpoint      8
-+ #define OP_JournalMode     9
-+ #define OP_Vacuum         10
-+-#define OP_VFilter        11 /* synopsis: iplan=r[P3] zplan='P4'           */
-++#define OP_VFilter        11 /* jump, synopsis: iplan=r[P3] zplan='P4'     */
-+ #define OP_VUpdate        12 /* synopsis: data=r[P3@P2]                    */
-+-#define OP_Goto           13
-+-#define OP_Gosub          14
-+-#define OP_InitCoroutine  15
-+-#define OP_Yield          16
-+-#define OP_MustBeInt      17
-+-#define OP_Jump           18
-++#define OP_Goto           13 /* jump                                       */
-++#define OP_Gosub          14 /* jump                                       */
-++#define OP_InitCoroutine  15 /* jump                                       */
-++#define OP_Yield          16 /* jump                                       */
-++#define OP_MustBeInt      17 /* jump                                       */
-++#define OP_Jump           18 /* jump                                       */
-+ #define OP_Not            19 /* same as TK_NOT, synopsis: r[P2]= !r[P1]    */
-+-#define OP_Once           20
-+-#define OP_If             21
-+-#define OP_IfNot          22
-+-#define OP_IfNullRow      23 /* synopsis: if P1.nullRow then r[P3]=NULL, goto P2 */
-+-#define OP_SeekLT         24 /* synopsis: key=r[P3@P4]                     */
-+-#define OP_SeekLE         25 /* synopsis: key=r[P3@P4]                     */
-+-#define OP_SeekGE         26 /* synopsis: key=r[P3@P4]                     */
-+-#define OP_SeekGT         27 /* synopsis: key=r[P3@P4]                     */
-+-#define OP_NoConflict     28 /* synopsis: key=r[P3@P4]                     */
-+-#define OP_NotFound       29 /* synopsis: key=r[P3@P4]                     */
-+-#define OP_Found          30 /* synopsis: key=r[P3@P4]                     */
-+-#define OP_SeekRowid      31 /* synopsis: intkey=r[P3]                     */
-+-#define OP_NotExists      32 /* synopsis: intkey=r[P3]                     */
-+-#define OP_Last           33
-+-#define OP_IfSmaller      34
-+-#define OP_SorterSort     35
-+-#define OP_Sort           36
-+-#define OP_Rewind         37
-+-#define OP_IdxLE          38 /* synopsis: key=r[P3@P4]                     */
-+-#define OP_IdxGT          39 /* synopsis: key=r[P3@P4]                     */
-+-#define OP_IdxLT          40 /* synopsis: key=r[P3@P4]                     */
-+-#define OP_IdxGE          41 /* synopsis: key=r[P3@P4]                     */
-+-#define OP_RowSetRead     42 /* synopsis: r[P3]=rowset(P1)                 */
-+-#define OP_RowSetTest     43 /* synopsis: if r[P3] in rowset(P1) goto P2   */
-+-#define OP_Program        44
-+-#define OP_FkIfZero       45 /* synopsis: if fkctr[P1]==0 goto P2          */
-+-#define OP_IfPos          46 /* synopsis: if r[P1]>0 then r[P1]-=P3, goto P2 */
-+-#define OP_IfNotZero      47 /* synopsis: if r[P1]!=0 then r[P1]--, goto P2 */
-+-#define OP_DecrJumpZero   48 /* synopsis: if (--r[P1])==0 goto P2          */
-+-#define OP_IncrVacuum     49
-+-#define OP_VNext          50
-+-#define OP_Init           51 /* synopsis: Start at P2                      */
-+-#define OP_Return         52
-+-#define OP_EndCoroutine   53
-+-#define OP_HaltIfNull     54 /* synopsis: if r[P3]=null halt               */
-+-#define OP_Halt           55
-+-#define OP_Integer        56 /* synopsis: r[P2]=P1                         */
-+-#define OP_Int64          57 /* synopsis: r[P2]=P4                         */
-+-#define OP_String         58 /* synopsis: r[P2]='P4' (len=P1)              */
-+-#define OP_Null           59 /* synopsis: r[P2..P3]=NULL                   */
-+-#define OP_SoftNull       60 /* synopsis: r[P1]=NULL                       */
-+-#define OP_Blob           61 /* synopsis: r[P2]=P4 (len=P1)                */
-+-#define OP_Variable       62 /* synopsis: r[P2]=parameter(P1,P4)           */
-+-#define OP_Move           63 /* synopsis: r[P2@P3]=r[P1@P3]                */
-+-#define OP_Copy           64 /* synopsis: r[P2@P3+1]=r[P1@P3+1]            */
-+-#define OP_SCopy          65 /* synopsis: r[P2]=r[P1]                      */
-+-#define OP_IntCopy        66 /* synopsis: r[P2]=r[P1]                      */
-+-#define OP_ResultRow      67 /* synopsis: output=r[P1@P2]                  */
-+-#define OP_CollSeq        68
-+-#define OP_AddImm         69 /* synopsis: r[P1]=r[P1]+P2                   */
-+-#define OP_Or             70 /* same as TK_OR, synopsis: r[P3]=(r[P1] || r[P2]) */
-+-#define OP_And            71 /* same as TK_AND, synopsis: r[P3]=(r[P1] && r[P2]) */
-+-#define OP_RealAffinity   72
-+-#define OP_Cast           73 /* synopsis: affinity(r[P1])                  */
-+-#define OP_Permutation    74
-+-#define OP_IsNull         75 /* same as TK_ISNULL, synopsis: if r[P1]==NULL goto P2 */
-+-#define OP_NotNull        76 /* same as TK_NOTNULL, synopsis: if r[P1]!=NULL goto P2 */
-+-#define OP_Ne             77 /* same as TK_NE, synopsis: IF r[P3]!=r[P1]   */
-+-#define OP_Eq             78 /* same as TK_EQ, synopsis: IF r[P3]==r[P1]   */
-+-#define OP_Gt             79 /* same as TK_GT, synopsis: IF r[P3]>r[P1]    */
-+-#define OP_Le             80 /* same as TK_LE, synopsis: IF r[P3]<=r[P1]   */
-+-#define OP_Lt             81 /* same as TK_LT, synopsis: IF r[P3]<r[P1]    */
-+-#define OP_Ge             82 /* same as TK_GE, synopsis: IF r[P3]>=r[P1]   */
-+-#define OP_ElseNotEq      83 /* same as TK_ESCAPE                          */
-++#define OP_Once           20 /* jump                                       */
-++#define OP_If             21 /* jump                                       */
-++#define OP_IfNot          22 /* jump                                       */
-++#define OP_IfNullRow      23 /* jump, synopsis: if P1.nullRow then r[P3]=NULL, goto P2 */
-++#define OP_SeekLT         24 /* jump, synopsis: key=r[P3@P4]               */
-++#define OP_SeekLE         25 /* jump, synopsis: key=r[P3@P4]               */
-++#define OP_SeekGE         26 /* jump, synopsis: key=r[P3@P4]               */
-++#define OP_SeekGT         27 /* jump, synopsis: key=r[P3@P4]               */
-++#define OP_NoConflict     28 /* jump, synopsis: key=r[P3@P4]               */
-++#define OP_NotFound       29 /* jump, synopsis: key=r[P3@P4]               */
-++#define OP_Found          30 /* jump, synopsis: key=r[P3@P4]               */
-++#define OP_SeekRowid      31 /* jump, synopsis: intkey=r[P3]               */
-++#define OP_NotExists      32 /* jump, synopsis: intkey=r[P3]               */
-++#define OP_Last           33 /* jump                                       */
-++#define OP_IfSmaller      34 /* jump                                       */
-++#define OP_SorterSort     35 /* jump                                       */
-++#define OP_Sort           36 /* jump                                       */
-++#define OP_Rewind         37 /* jump                                       */
-++#define OP_IdxLE          38 /* jump, synopsis: key=r[P3@P4]               */
-++#define OP_IdxGT          39 /* jump, synopsis: key=r[P3@P4]               */
-++#define OP_IdxLT          40 /* jump, synopsis: key=r[P3@P4]               */
-++#define OP_IdxGE          41 /* jump, synopsis: key=r[P3@P4]               */
-++#define OP_RowSetRead     42 /* jump, synopsis: r[P3]=rowset(P1)           */
-++#define OP_Or             43 /* same as TK_OR, synopsis: r[P3]=(r[P1] || r[P2]) */
-++#define OP_And            44 /* same as TK_AND, synopsis: r[P3]=(r[P1] && r[P2]) */
-++#define OP_RowSetTest     45 /* jump, synopsis: if r[P3] in rowset(P1) goto P2 */
-++#define OP_Program        46 /* jump                                       */
-++#define OP_FkIfZero       47 /* jump, synopsis: if fkctr[P1]==0 goto P2    */
-++#define OP_IfPos          48 /* jump, synopsis: if r[P1]>0 then r[P1]-=P3, goto P2 */
-++#define OP_IfNotZero      49 /* jump, synopsis: if r[P1]!=0 then r[P1]--, goto P2 */
-++#define OP_IsNull         50 /* jump, same as TK_ISNULL, synopsis: if r[P1]==NULL goto P2 */
-++#define OP_NotNull        51 /* jump, same as TK_NOTNULL, synopsis: if r[P1]!=NULL goto P2 */
-++#define OP_Ne             52 /* jump, same as TK_NE, synopsis: IF r[P3]!=r[P1] */
-++#define OP_Eq             53 /* jump, same as TK_EQ, synopsis: IF r[P3]==r[P1] */
-++#define OP_Gt             54 /* jump, same as TK_GT, synopsis: IF r[P3]>r[P1] */
-++#define OP_Le             55 /* jump, same as TK_LE, synopsis: IF r[P3]<=r[P1] */
-++#define OP_Lt             56 /* jump, same as TK_LT, synopsis: IF r[P3]<r[P1] */
-++#define OP_Ge             57 /* jump, same as TK_GE, synopsis: IF r[P3]>=r[P1] */
-++#define OP_ElseNotEq      58 /* jump, same as TK_ESCAPE                    */
-++#define OP_DecrJumpZero   59 /* jump, synopsis: if (--r[P1])==0 goto P2    */
-++#define OP_IncrVacuum     60 /* jump                                       */
-++#define OP_VNext          61 /* jump                                       */
-++#define OP_Init           62 /* jump, synopsis: Start at P2                */
-++#define OP_Return         63
-++#define OP_EndCoroutine   64
-++#define OP_HaltIfNull     65 /* synopsis: if r[P3]=null halt               */
-++#define OP_Halt           66
-++#define OP_Integer        67 /* synopsis: r[P2]=P1                         */
-++#define OP_Int64          68 /* synopsis: r[P2]=P4                         */
-++#define OP_String         69 /* synopsis: r[P2]='P4' (len=P1)              */
-++#define OP_Null           70 /* synopsis: r[P2..P3]=NULL                   */
-++#define OP_SoftNull       71 /* synopsis: r[P1]=NULL                       */
-++#define OP_Blob           72 /* synopsis: r[P2]=P4 (len=P1)                */
-++#define OP_Variable       73 /* synopsis: r[P2]=parameter(P1,P4)           */
-++#define OP_Move           74 /* synopsis: r[P2@P3]=r[P1@P3]                */
-++#define OP_Copy           75 /* synopsis: r[P2@P3+1]=r[P1@P3+1]            */
-++#define OP_SCopy          76 /* synopsis: r[P2]=r[P1]                      */
-++#define OP_IntCopy        77 /* synopsis: r[P2]=r[P1]                      */
-++#define OP_ResultRow      78 /* synopsis: output=r[P1@P2]                  */
-++#define OP_CollSeq        79
-++#define OP_AddImm         80 /* synopsis: r[P1]=r[P1]+P2                   */
-++#define OP_RealAffinity   81
-++#define OP_Cast           82 /* synopsis: affinity(r[P1])                  */
-++#define OP_Permutation    83
-+ #define OP_BitAnd         84 /* same as TK_BITAND, synopsis: r[P3]=r[P1]&r[P2] */
-+ #define OP_BitOr          85 /* same as TK_BITOR, synopsis: r[P3]=r[P1]|r[P2] */
-+ #define OP_ShiftLeft      86 /* same as TK_LSHIFT, synopsis: r[P3]=r[P2]<<r[P1] */
-+@@ -13838,17 +13883,17 @@ typedef struct VdbeOpList VdbeOpList;
-+ #define OP_RowData       122 /* synopsis: r[P2]=data                       */
-+ #define OP_Rowid         123 /* synopsis: r[P2]=rowid                      */
-+ #define OP_NullRow       124
-+-#define OP_SorterInsert  125 /* synopsis: key=r[P2]                        */
-+-#define OP_IdxInsert     126 /* synopsis: key=r[P2]                        */
-+-#define OP_IdxDelete     127 /* synopsis: key=r[P2@P3]                     */
-+-#define OP_DeferredSeek  128 /* synopsis: Move P3 to P1.rowid if needed    */
-+-#define OP_IdxRowid      129 /* synopsis: r[P2]=rowid                      */
-+-#define OP_Destroy       130
-+-#define OP_Clear         131
-++#define OP_SeekEnd       125
-++#define OP_SorterInsert  126 /* synopsis: key=r[P2]                        */
-++#define OP_IdxInsert     127 /* synopsis: key=r[P2]                        */
-++#define OP_IdxDelete     128 /* synopsis: key=r[P2@P3]                     */
-++#define OP_DeferredSeek  129 /* synopsis: Move P3 to P1.rowid if needed    */
-++#define OP_IdxRowid      130 /* synopsis: r[P2]=rowid                      */
-++#define OP_Destroy       131
-+ #define OP_Real          132 /* same as TK_FLOAT, synopsis: r[P2]=P4       */
-+-#define OP_ResetSorter   133
-+-#define OP_CreateIndex   134 /* synopsis: r[P2]=root iDb=P1                */
-+-#define OP_CreateTable   135 /* synopsis: r[P2]=root iDb=P1                */
-++#define OP_Clear         133
-++#define OP_ResetSorter   134
-++#define OP_CreateBtree   135 /* synopsis: r[P2]=root iDb=P1 flags=P3       */
-+ #define OP_SqlExec       136
-+ #define OP_ParseSchema   137
-+ #define OP_LoadAnalysis  138
-+@@ -13898,18 +13943,18 @@ typedef struct VdbeOpList VdbeOpList;
-+ /*  16 */ 0x03, 0x03, 0x01, 0x12, 0x01, 0x03, 0x03, 0x01,\
-+ /*  24 */ 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09,\
-+ /*  32 */ 0x09, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,\
-+-/*  40 */ 0x01, 0x01, 0x23, 0x0b, 0x01, 0x01, 0x03, 0x03,\
-+-/*  48 */ 0x03, 0x01, 0x01, 0x01, 0x02, 0x02, 0x08, 0x00,\
-+-/*  56 */ 0x10, 0x10, 0x10, 0x10, 0x00, 0x10, 0x10, 0x00,\
-+-/*  64 */ 0x00, 0x10, 0x10, 0x00, 0x00, 0x02, 0x26, 0x26,\
-+-/*  72 */ 0x02, 0x02, 0x00, 0x03, 0x03, 0x0b, 0x0b, 0x0b,\
-+-/*  80 */ 0x0b, 0x0b, 0x0b, 0x01, 0x26, 0x26, 0x26, 0x26,\
-++/*  40 */ 0x01, 0x01, 0x23, 0x26, 0x26, 0x0b, 0x01, 0x01,\
-++/*  48 */ 0x03, 0x03, 0x03, 0x03, 0x0b, 0x0b, 0x0b, 0x0b,\
-++/*  56 */ 0x0b, 0x0b, 0x01, 0x03, 0x01, 0x01, 0x01, 0x02,\
-++/*  64 */ 0x02, 0x08, 0x00, 0x10, 0x10, 0x10, 0x10, 0x00,\
-++/*  72 */ 0x10, 0x10, 0x00, 0x00, 0x10, 0x10, 0x00, 0x00,\
-++/*  80 */ 0x02, 0x02, 0x02, 0x00, 0x26, 0x26, 0x26, 0x26,\
-+ /*  88 */ 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x00, 0x12,\
-+ /*  96 */ 0x00, 0x10, 0x00, 0x00, 0x10, 0x10, 0x00, 0x00,\
-+ /* 104 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\
-+ /* 112 */ 0x00, 0x00, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00,\
-+-/* 120 */ 0x00, 0x00, 0x00, 0x10, 0x00, 0x04, 0x04, 0x00,\
-+-/* 128 */ 0x00, 0x10, 0x10, 0x00, 0x10, 0x00, 0x10, 0x10,\
-++/* 120 */ 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x04, 0x04,\
-++/* 128 */ 0x00, 0x00, 0x10, 0x10, 0x10, 0x00, 0x00, 0x10,\
-+ /* 136 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06,\
-+ /* 144 */ 0x10, 0x00, 0x04, 0x1a, 0x00, 0x00, 0x00, 0x00,\
-+ /* 152 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,\
-+@@ -13922,7 +13967,7 @@ typedef struct VdbeOpList VdbeOpList;
-+ ** generated this include file strives to group all JUMP opcodes
-+ ** together near the beginning of the list.
-+ */
-+-#define SQLITE_MX_JUMP_OPCODE  83  /* Maximum JUMP opcode */
-++#define SQLITE_MX_JUMP_OPCODE  62  /* Maximum JUMP opcode */
-+ 
-+ /************** End of opcodes.h *********************************************/
-+ /************** Continuing where we left off in vdbe.h ***********************/
-+@@ -14240,6 +14285,7 @@ SQLITE_PRIVATE DbPage *sqlite3PagerLookup(Pager *pPager, Pgno pgno);
-+ SQLITE_PRIVATE void sqlite3PagerRef(DbPage*);
-+ SQLITE_PRIVATE void sqlite3PagerUnref(DbPage*);
-+ SQLITE_PRIVATE void sqlite3PagerUnrefNotNull(DbPage*);
-++SQLITE_PRIVATE void sqlite3PagerUnrefPageOne(DbPage*);
-+ 
-+ /* Operations on page references. */
-+ SQLITE_PRIVATE int sqlite3PagerWrite(DbPage*);
-+@@ -14376,6 +14422,8 @@ struct PgHdr {
-+   i16 nRef;                      /* Number of users of this page */
-+   PgHdr *pDirtyNext;             /* Next element in list of dirty pages */
-+   PgHdr *pDirtyPrev;             /* Previous element in list of dirty pages */
-++                          /* NB: pDirtyNext and pDirtyPrev are undefined if the
-++                          ** PgHdr object is not dirty */
-+ };
-+ 
-+ /* Bit values for PgHdr.flags */
-+@@ -14757,10 +14805,12 @@ SQLITE_PRIVATE void sqlite3OsFileControlHint(sqlite3_file*,int,void*);
-+ #define SQLITE_FCNTL_DB_UNCHANGED 0xca093fa0
-+ SQLITE_PRIVATE int sqlite3OsSectorSize(sqlite3_file *id);
-+ SQLITE_PRIVATE int sqlite3OsDeviceCharacteristics(sqlite3_file *id);
-++#ifndef SQLITE_OMIT_WAL
-+ SQLITE_PRIVATE int sqlite3OsShmMap(sqlite3_file *,int,int,int,void volatile **);
-+ SQLITE_PRIVATE int sqlite3OsShmLock(sqlite3_file *id, int, int, int);
-+ SQLITE_PRIVATE void sqlite3OsShmBarrier(sqlite3_file *id);
-+ SQLITE_PRIVATE int sqlite3OsShmUnmap(sqlite3_file *id, int);
-++#endif /* SQLITE_OMIT_WAL */
-+ SQLITE_PRIVATE int sqlite3OsFetch(sqlite3_file *id, i64, int, void **);
-+ SQLITE_PRIVATE int sqlite3OsUnfetch(sqlite3_file *, i64, void *);
-+ 
-+@@ -14969,6 +15019,7 @@ struct Schema {
-+ #define DB_SchemaLoaded    0x0001  /* The schema has been loaded */
-+ #define DB_UnresetViews    0x0002  /* Some views have defined column names */
-+ #define DB_Empty           0x0004  /* The file is empty (length 0 bytes) */
-++#define DB_ResetWanted     0x0008  /* Reset the schema when nSchemaLock==0 */
-+ 
-+ /*
-+ ** The number of different kinds of things that can be limited
-+@@ -15000,9 +15051,9 @@ struct Lookaside {
-+   u32 bDisable;           /* Only operate the lookaside when zero */
-+   u16 sz;                 /* Size of each buffer in bytes */
-+   u8 bMalloced;           /* True if pStart obtained from sqlite3_malloc() */
-+-  int nOut;               /* Number of buffers currently checked out */
-+-  int mxOut;              /* Highwater mark for nOut */
-+-  int anStat[3];          /* 0: hits.  1: size misses.  2: full misses */
-++  u32 nSlot;              /* Number of lookaside slots allocated */
-++  u32 anStat[3];          /* 0: hits.  1: size misses.  2: full misses */
-++  LookasideSlot *pInit;   /* List of buffers not previously used */
-+   LookasideSlot *pFree;   /* List of available buffers */
-+   void *pStart;           /* First byte of available memory space */
-+   void *pEnd;             /* First byte past end of available space */
-+@@ -15081,9 +15132,11 @@ struct sqlite3 {
-+   sqlite3_mutex *mutex;         /* Connection mutex */
-+   Db *aDb;                      /* All backends */
-+   int nDb;                      /* Number of backends currently in use */
-+-  int flags;                    /* Miscellaneous flags. See below */
-++  u32 mDbFlags;                 /* flags recording internal state */
-++  u32 flags;                    /* flags settable by pragmas. See below */
-+   i64 lastRowid;                /* ROWID of most recent insert (see above) */
-+   i64 szMmap;                   /* Default mmap_size setting */
-++  u32 nSchemaLock;              /* Do not reset the schema when non-zero */
-+   unsigned int openFlags;       /* Flags passed to sqlite3_vfs.xOpen() */
-+   int errCode;                  /* Most recent error code (SQLITE_*) */
-+   int errMask;                  /* & result codes with this before returning */
-+@@ -15235,18 +15288,13 @@ struct sqlite3 {
-+ #define SQLITE_ForeignKeys    0x00004000  /* Enforce foreign key constraints  */
-+ #define SQLITE_AutoIndex      0x00008000  /* Enable automatic indexes */
-+ #define SQLITE_LoadExtension  0x00010000  /* Enable load_extension */
-+-#define SQLITE_EnableTrigger  0x00020000  /* True to enable triggers */
-+-#define SQLITE_DeferFKs       0x00040000  /* Defer all FK constraints */
-+-#define SQLITE_QueryOnly      0x00080000  /* Disable database changes */
-+-#define SQLITE_CellSizeCk     0x00100000  /* Check btree cell sizes on load */
-+-#define SQLITE_Fts3Tokenizer  0x00200000  /* Enable fts3_tokenizer(2) */
-+-#define SQLITE_EnableQPSG     0x00400000  /* Query Planner Stability Guarantee */
-+-/* The next four values are not used by PRAGMAs or by sqlite3_dbconfig() and
-+-** could be factored out into a separate bit vector of the sqlite3 object. */
-+-#define SQLITE_InternChanges  0x00800000  /* Uncommitted Hash table changes */
-+-#define SQLITE_LoadExtFunc    0x01000000  /* Enable load_extension() SQL func */
-+-#define SQLITE_PreferBuiltin  0x02000000  /* Preference to built-in funcs */
-+-#define SQLITE_Vacuum         0x04000000  /* Currently in a VACUUM */
-++#define SQLITE_LoadExtFunc    0x00020000  /* Enable load_extension() SQL func */
-++#define SQLITE_EnableTrigger  0x00040000  /* True to enable triggers */
-++#define SQLITE_DeferFKs       0x00080000  /* Defer all FK constraints */
-++#define SQLITE_QueryOnly      0x00100000  /* Disable database changes */
-++#define SQLITE_CellSizeCk     0x00200000  /* Check btree cell sizes on load */
-++#define SQLITE_Fts3Tokenizer  0x00400000  /* Enable fts3_tokenizer(2) */
-++#define SQLITE_EnableQPSG     0x00800000  /* Query Planner Stability Guarantee */
-+ /* Flags used only if debugging */
-+ #ifdef SQLITE_DEBUG
-+ #define SQLITE_SqlTrace       0x08000000  /* Debug print SQL as it executes */
-+@@ -15256,6 +15304,12 @@ struct sqlite3 {
-+ #define SQLITE_VdbeEQP        0x80000000  /* Debug EXPLAIN QUERY PLAN */
-+ #endif
-+ 
-++/*
-++** Allowed values for sqlite3.mDbFlags
-++*/
-++#define DBFLAG_SchemaChange   0x0001  /* Uncommitted Hash table changes */
-++#define DBFLAG_PreferBuiltin  0x0002  /* Preference to built-in funcs */
-++#define DBFLAG_Vacuum         0x0004  /* Currently in a VACUUM */
-+ 
-+ /*
-+ ** Bits of the sqlite3.dbOptFlags field that are used by the
-+@@ -15266,16 +15320,15 @@ struct sqlite3 {
-+ #define SQLITE_ColumnCache    0x0002   /* Column cache */
-+ #define SQLITE_GroupByOrder   0x0004   /* GROUPBY cover of ORDERBY */
-+ #define SQLITE_FactorOutConst 0x0008   /* Constant factoring */
-+-/*                not used    0x0010   // Was: SQLITE_IdxRealAsInt */
-+-#define SQLITE_DistinctOpt    0x0020   /* DISTINCT using indexes */
-+-#define SQLITE_CoverIdxScan   0x0040   /* Covering index scans */
-+-#define SQLITE_OrderByIdxJoin 0x0080   /* ORDER BY of joins via index */
-+-#define SQLITE_SubqCoroutine  0x0100   /* Evaluate subqueries as coroutines */
-+-#define SQLITE_Transitive     0x0200   /* Transitive constraints */
-+-#define SQLITE_OmitNoopJoin   0x0400   /* Omit unused tables in joins */
-++#define SQLITE_DistinctOpt    0x0010   /* DISTINCT using indexes */
-++#define SQLITE_CoverIdxScan   0x0020   /* Covering index scans */
-++#define SQLITE_OrderByIdxJoin 0x0040   /* ORDER BY of joins via index */
-++#define SQLITE_Transitive     0x0080   /* Transitive constraints */
-++#define SQLITE_OmitNoopJoin   0x0100   /* Omit unused tables in joins */
-++#define SQLITE_CountOfView    0x0200   /* The count-of-view optimization */
-++#define SQLITE_CursorHints    0x0400   /* Add OP_CursorHint opcodes */
-+ #define SQLITE_Stat34         0x0800   /* Use STAT3 or STAT4 data */
-+-#define SQLITE_CountOfView    0x1000   /* The count-of-view optimization */
-+-#define SQLITE_CursorHints    0x2000   /* Add OP_CursorHint opcodes */
-++   /* TH3 expects the Stat34  ^^^^^^ value to be 0x0800.  Don't change it */
-+ #define SQLITE_AllOpts        0xffff   /* All optimizations */
-+ 
-+ /*
-+@@ -15806,8 +15859,8 @@ struct FKey {
-+ struct KeyInfo {
-+   u32 nRef;           /* Number of references to this KeyInfo object */
-+   u8 enc;             /* Text encoding - one of the SQLITE_UTF* values */
-+-  u16 nField;         /* Number of key columns in the index */
-+-  u16 nXField;        /* Number of columns beyond the key columns */
-++  u16 nKeyField;      /* Number of key columns in the index */
-++  u16 nAllField;      /* Total columns, including key plus others */
-+   sqlite3 *db;        /* The database connection */
-+   u8 *aSortOrder;     /* Sort order for each column. */
-+   CollSeq *aColl[1];  /* Collating sequence for each term of the key */
-+@@ -15854,8 +15907,8 @@ struct UnpackedRecord {
-+   u16 nField;         /* Number of entries in apMem[] */
-+   i8 default_rc;      /* Comparison result if keys are equal */
-+   u8 errCode;         /* Error detected by xRecordCompare (CORRUPT or NOMEM) */
-+-  i8 r1;              /* Value to return if (lhs > rhs) */
-+-  i8 r2;              /* Value to return if (rhs < lhs) */
-++  i8 r1;              /* Value to return if (lhs < rhs) */
-++  i8 r2;              /* Value to return if (lhs > rhs) */
-+   u8 eqSeen;          /* True if an equality comparison has been seen */
-+ };
-+ 
-+@@ -16139,7 +16192,8 @@ struct Expr {
-+                          ** TK_COLUMN: the value of p5 for OP_Column
-+                          ** TK_AGG_FUNCTION: nesting depth */
-+   AggInfo *pAggInfo;     /* Used by TK_AGG_COLUMN and TK_AGG_FUNCTION */
-+-  Table *pTab;           /* Table for TK_COLUMN expressions. */
-++  Table *pTab;           /* Table for TK_COLUMN expressions.  Can be NULL
-++                         ** for a column of an index on an expression */
-+ };
-+ 
-+ /*
-+@@ -16227,7 +16281,6 @@ struct Expr {
-+ */
-+ struct ExprList {
-+   int nExpr;             /* Number of expressions on the list */
-+-  int nAlloc;            /* Number of a[] slots allocated */
-+   struct ExprList_item { /* For each expression in the list */
-+     Expr *pExpr;            /* The parse tree for this expression */
-+     char *zName;            /* Token associated with this expression */
-+@@ -16752,7 +16805,7 @@ struct Parse {
-+   AutoincInfo *pAinc;  /* Information about AUTOINCREMENT counters */
-+   Parse *pToplevel;    /* Parse structure for main program (or NULL) */
-+   Table *pTriggerTab;  /* Table triggers are being coded for */
-+-  int addrCrTab;       /* Address of OP_CreateTable opcode on CREATE TABLE */
-++  int addrCrTab;       /* Address of OP_CreateBtree opcode on CREATE TABLE */
-+   u32 nQueryLoop;      /* Est number of iterations of a query (10*log2(N)) */
-+   u32 oldmask;         /* Mask of old.* columns referenced */
-+   u32 newmask;         /* Mask of new.* columns referenced */
-+@@ -16981,11 +17034,10 @@ struct DbFixer {
-+ */
-+ struct StrAccum {
-+   sqlite3 *db;         /* Optional database for lookaside.  Can be NULL */
-+-  char *zBase;         /* A base allocation.  Not from malloc. */
-+   char *zText;         /* The string collected so far */
-+-  u32  nChar;          /* Length of the string so far */
-+   u32  nAlloc;         /* Amount of space allocated in zText */
-+   u32  mxAlloc;        /* Maximum allowed allocation.  0 for no malloc usage */
-++  u32  nChar;          /* Length of the string so far */
-+   u8   accError;       /* STRACCUM_NOMEM or STRACCUM_TOOBIG */
-+   u8   printfFlags;    /* SQLITE_PRINTF flags below */
-+ };
-+@@ -17020,6 +17072,7 @@ struct Sqlite3Config {
-+   int bFullMutex;                   /* True to enable full mutexing */
-+   int bOpenUri;                     /* True to interpret filenames as URIs */
-+   int bUseCis;                      /* Use covering indices for full-scans */
-++  int bSmallMalloc;                 /* Avoid large memory allocations if true */
-+   int mxStrlen;                     /* Maximum string length */
-+   int neverCorrupt;                 /* Database is always well-formed */
-+   int szLookaside;                  /* Default lookaside buffer size */
-+@@ -17033,9 +17086,6 @@ struct Sqlite3Config {
-+   int mnReq, mxReq;                 /* Min and max heap requests sizes */
-+   sqlite3_int64 szMmap;             /* mmap() space per open file */
-+   sqlite3_int64 mxMmap;             /* Maximum value for szMmap */
-+-  void *pScratch;                   /* Scratch memory */
-+-  int szScratch;                    /* Size of each scratch buffer */
-+-  int nScratch;                     /* Number of scratch buffers */
-+   void *pPage;                      /* Page cache memory */
-+   int szPage;                       /* Size of each page in pPage[] */
-+   int nPage;                        /* Number of pages in pPage[] */
-+@@ -17122,6 +17172,7 @@ SQLITE_PRIVATE int sqlite3WalkSelectExpr(Walker*, Select*);
-+ SQLITE_PRIVATE int sqlite3WalkSelectFrom(Walker*, Select*);
-+ SQLITE_PRIVATE int sqlite3ExprWalkNoop(Walker*, Expr*);
-+ SQLITE_PRIVATE int sqlite3SelectWalkNoop(Walker*, Select*);
-++SQLITE_PRIVATE int sqlite3SelectWalkFail(Walker*, Select*);
-+ #ifdef SQLITE_DEBUG
-+ SQLITE_PRIVATE void sqlite3SelectWalkAssert2(Walker*, Select*);
-+ #endif
-+@@ -17274,8 +17325,6 @@ SQLITE_PRIVATE void sqlite3DbFree(sqlite3*, void*);
-+ SQLITE_PRIVATE void sqlite3DbFreeNN(sqlite3*, void*);
-+ SQLITE_PRIVATE int sqlite3MallocSize(void*);
-+ SQLITE_PRIVATE int sqlite3DbMallocSize(sqlite3*, void*);
-+-SQLITE_PRIVATE void *sqlite3ScratchMalloc(int);
-+-SQLITE_PRIVATE void sqlite3ScratchFree(void*);
-+ SQLITE_PRIVATE void *sqlite3PageMalloc(int);
-+ SQLITE_PRIVATE void sqlite3PageFree(void*);
-+ SQLITE_PRIVATE void sqlite3MemSetDefault(void);
-+@@ -17331,6 +17380,7 @@ SQLITE_PRIVATE sqlite3_int64 sqlite3StatusValue(int);
-+ SQLITE_PRIVATE void sqlite3StatusUp(int, int);
-+ SQLITE_PRIVATE void sqlite3StatusDown(int, int);
-+ SQLITE_PRIVATE void sqlite3StatusHighwater(int, int);
-++SQLITE_PRIVATE int sqlite3LookasideUsed(sqlite3*,int*);
-+ 
-+ /* Access to mutexes used by sqlite3_status() */
-+ SQLITE_PRIVATE sqlite3_mutex *sqlite3Pcache1Mutex(void);
-+@@ -17767,6 +17817,8 @@ SQLITE_PRIVATE int sqlite3ReadSchema(Parse *pParse);
-+ SQLITE_PRIVATE CollSeq *sqlite3FindCollSeq(sqlite3*,u8 enc, const char*,int);
-+ SQLITE_PRIVATE CollSeq *sqlite3LocateCollSeq(Parse *pParse, const char*zName);
-+ SQLITE_PRIVATE CollSeq *sqlite3ExprCollSeq(Parse *pParse, Expr *pExpr);
-++SQLITE_PRIVATE CollSeq *sqlite3ExprNNCollSeq(Parse *pParse, Expr *pExpr);
-++SQLITE_PRIVATE int sqlite3ExprCollSeqMatch(Parse*,Expr*,Expr*);
-+ SQLITE_PRIVATE Expr *sqlite3ExprAddCollateToken(Parse *pParse, Expr*, const Token*, int);
-+ SQLITE_PRIVATE Expr *sqlite3ExprAddCollateString(Parse*,Expr*,const char*);
-+ SQLITE_PRIVATE Expr *sqlite3ExprSkipCollate(Expr*);
-+@@ -18050,7 +18102,8 @@ SQLITE_PRIVATE int sqlite3FindInIndex(Parse *, Expr *, u32, int*, int*);
-+ 
-+ SQLITE_PRIVATE int sqlite3JournalOpen(sqlite3_vfs *, const char *, sqlite3_file *, int, int);
-+ SQLITE_PRIVATE int sqlite3JournalSize(sqlite3_vfs *);
-+-#ifdef SQLITE_ENABLE_ATOMIC_WRITE
-++#if defined(SQLITE_ENABLE_ATOMIC_WRITE) \
-++ || defined(SQLITE_ENABLE_BATCH_ATOMIC_WRITE)
-+ SQLITE_PRIVATE   int sqlite3JournalCreate(sqlite3_file *);
-+ #endif
-+ 
-+@@ -18136,8 +18189,7 @@ SQLITE_PRIVATE   int sqlite3MemdebugNoType(void*,u8);
-+ #endif
-+ #define MEMTYPE_HEAP       0x01  /* General heap allocations */
-+ #define MEMTYPE_LOOKASIDE  0x02  /* Heap that might have been lookaside */
-+-#define MEMTYPE_SCRATCH    0x04  /* Scratch allocations */
-+-#define MEMTYPE_PCACHE     0x08  /* Page cache allocations */
-++#define MEMTYPE_PCACHE     0x04  /* Page cache allocations */
-+ 
-+ /*
-+ ** Threading interface
-+@@ -18147,6 +18199,9 @@ SQLITE_PRIVATE int sqlite3ThreadCreate(SQLiteThread**,void*(*)(void*),void*);
-+ SQLITE_PRIVATE int sqlite3ThreadJoin(SQLiteThread*, void**);
-+ #endif
-+ 
-++#if defined(SQLITE_ENABLE_DBPAGE_VTAB) || defined(SQLITE_TEST)
-++SQLITE_PRIVATE int sqlite3DbpageRegister(sqlite3*);
-++#endif
-+ #if defined(SQLITE_ENABLE_DBSTAT_VTAB) || defined(SQLITE_TEST)
-+ SQLITE_PRIVATE int sqlite3DbstatRegister(sqlite3*);
-+ #endif
-+@@ -18366,6 +18421,7 @@ SQLITE_PRIVATE SQLITE_WSD struct Sqlite3Config sqlite3Config = {
-+    SQLITE_THREADSAFE==1,      /* bFullMutex */
-+    SQLITE_USE_URI,            /* bOpenUri */
-+    SQLITE_ALLOW_COVERING_INDEX_SCAN,   /* bUseCis */
-++   0,                         /* bSmallMalloc */
-+    0x7ffffffe,                /* mxStrlen */
-+    0,                         /* neverCorrupt */
-+    SQLITE_DEFAULT_LOOKASIDE,  /* szLookaside, nLookaside */
-+@@ -18378,9 +18434,6 @@ SQLITE_PRIVATE SQLITE_WSD struct Sqlite3Config sqlite3Config = {
-+    0, 0,                      /* mnHeap, mxHeap */
-+    SQLITE_DEFAULT_MMAP_SIZE,  /* szMmap */
-+    SQLITE_MAX_MMAP_SIZE,      /* mxMmap */
-+-   (void*)0,                  /* pScratch */
-+-   0,                         /* szScratch */
-+-   0,                         /* nScratch */
-+    (void*)0,                  /* pPage */
-+    0,                         /* szPage */
-+    SQLITE_DEFAULT_PCACHE_INITSZ, /* nPage */
-+@@ -18582,18 +18635,18 @@ struct VdbeCursor {
-+   u32 cacheStatus;        /* Cache is valid if this matches Vdbe.cacheCtr */
-+   int seekResult;         /* Result of previous sqlite3BtreeMoveto() or 0
-+                           ** if there have been no prior seeks on the cursor. */
-+-  /* NB: seekResult does not distinguish between "no seeks have ever occurred
-+-  ** on this cursor" and "the most recent seek was an exact match". */
-++  /* seekResult does not distinguish between "no seeks have ever occurred
-++  ** on this cursor" and "the most recent seek was an exact match".
-++  ** For CURTYPE_PSEUDO, seekResult is the register holding the record */
-+ 
-+   /* When a new VdbeCursor is allocated, only the fields above are zeroed.
-+   ** The fields that follow are uninitialized, and must be individually
-+   ** initialized prior to first use. */
-+   VdbeCursor *pAltCursor; /* Associated index cursor from which to read */
-+   union {
-+-    BtCursor *pCursor;          /* CURTYPE_BTREE.  Btree cursor */
-+-    sqlite3_vtab_cursor *pVCur; /* CURTYPE_VTAB.   Vtab cursor */
-+-    int pseudoTableReg;         /* CURTYPE_PSEUDO. Reg holding content. */
-+-    VdbeSorter *pSorter;        /* CURTYPE_SORTER. Sorter object */
-++    BtCursor *pCursor;          /* CURTYPE_BTREE or _PSEUDO.  Btree cursor */
-++    sqlite3_vtab_cursor *pVCur; /* CURTYPE_VTAB.              Vtab cursor */
-++    VdbeSorter *pSorter;        /* CURTYPE_SORTER.            Sorter object */
-+   } uc;
-+   KeyInfo *pKeyInfo;      /* Info about index keys needed by index cursors */
-+   u32 iHdrOffset;         /* Offset to next unparsed byte of the header */
-+@@ -19150,7 +19203,6 @@ SQLITE_PRIVATE void sqlite3StatusHighwater(int op, int X){
-+                                            : sqlite3MallocMutex()) );
-+   assert( op==SQLITE_STATUS_MALLOC_SIZE
-+           || op==SQLITE_STATUS_PAGECACHE_SIZE
-+-          || op==SQLITE_STATUS_SCRATCH_SIZE
-+           || op==SQLITE_STATUS_PARSER_STACK );
-+   if( newValue>wsdStat.mxValue[op] ){
-+     wsdStat.mxValue[op] = newValue;
-+@@ -19200,6 +19252,28 @@ SQLITE_API int sqlite3_status(int op, int *pCurrent, int *pHighwater, int resetF
-+ }
-+ 
-+ /*
-++** Return the number of LookasideSlot elements on the linked list
-++*/
-++static u32 countLookasideSlots(LookasideSlot *p){
-++  u32 cnt = 0;
-++  while( p ){
-++    p = p->pNext;
-++    cnt++;
-++  }
-++  return cnt;
-++}
-++
-++/*
-++** Count the number of slots of lookaside memory that are outstanding
-++*/
-++SQLITE_PRIVATE int sqlite3LookasideUsed(sqlite3 *db, int *pHighwater){
-++  u32 nInit = countLookasideSlots(db->lookaside.pInit);
-++  u32 nFree = countLookasideSlots(db->lookaside.pFree);
-++  if( pHighwater ) *pHighwater = db->lookaside.nSlot - nInit;
-++  return db->lookaside.nSlot - (nInit+nFree);
-++}
-++
-++/*
-+ ** Query status information for a single database connection
-+ */
-+ SQLITE_API int sqlite3_db_status(
-+@@ -19218,10 +19292,15 @@ SQLITE_API int sqlite3_db_status(
-+   sqlite3_mutex_enter(db->mutex);
-+   switch( op ){
-+     case SQLITE_DBSTATUS_LOOKASIDE_USED: {
-+-      *pCurrent = db->lookaside.nOut;
-+-      *pHighwater = db->lookaside.mxOut;
-++      *pCurrent = sqlite3LookasideUsed(db, pHighwater);
-+       if( resetFlag ){
-+-        db->lookaside.mxOut = db->lookaside.nOut;
-++        LookasideSlot *p = db->lookaside.pFree;
-++        if( p ){
-++          while( p->pNext ) p = p->pNext;
-++          p->pNext = db->lookaside.pInit;
-++          db->lookaside.pInit = db->lookaside.pFree;
-++          db->lookaside.pFree = 0;
-++        }
-+       }
-+       break;
-+     }
-+@@ -20735,7 +20814,7 @@ SQLITE_PRIVATE int sqlite3OsTruncate(sqlite3_file *id, i64 size){
-+ }
-+ SQLITE_PRIVATE int sqlite3OsSync(sqlite3_file *id, int flags){
-+   DO_OS_MALLOC_TEST(id);
-+-  return id->pMethods->xSync(id, flags);
-++  return flags ? id->pMethods->xSync(id, flags) : SQLITE_OK;
-+ }
-+ SQLITE_PRIVATE int sqlite3OsFileSize(sqlite3_file *id, i64 *pSize){
-+   DO_OS_MALLOC_TEST(id);
-+@@ -20790,6 +20869,7 @@ SQLITE_PRIVATE int sqlite3OsSectorSize(sqlite3_file *id){
-+ SQLITE_PRIVATE int sqlite3OsDeviceCharacteristics(sqlite3_file *id){
-+   return id->pMethods->xDeviceCharacteristics(id);
-+ }
-++#ifndef SQLITE_OMIT_WAL
-+ SQLITE_PRIVATE int sqlite3OsShmLock(sqlite3_file *id, int offset, int n, int flags){
-+   return id->pMethods->xShmLock(id, offset, n, flags);
-+ }
-+@@ -20809,6 +20889,7 @@ SQLITE_PRIVATE int sqlite3OsShmMap(
-+   DO_OS_MALLOC_TEST(id);
-+   return id->pMethods->xShmMap(id, iPage, pgsz, bExtend, pp);
-+ }
-++#endif /* SQLITE_OMIT_WAL */
-+ 
-+ #if SQLITE_MAX_MMAP_SIZE>0
-+ /* The real implementation of xFetch and xUnfetch */
-+@@ -24806,14 +24887,6 @@ SQLITE_API int sqlite3_release_memory(int n){
-+ }
-+ 
-+ /*
-+-** An instance of the following object records the location of
-+-** each unused scratch buffer.
-+-*/
-+-typedef struct ScratchFreeslot {
-+-  struct ScratchFreeslot *pNext;   /* Next unused scratch buffer */
-+-} ScratchFreeslot;
-+-
-+-/*
-+ ** State information local to the memory allocation subsystem.
-+ */
-+ static SQLITE_WSD struct Mem0Global {
-+@@ -24821,21 +24894,11 @@ static SQLITE_WSD struct Mem0Global {
-+   sqlite3_int64 alarmThreshold; /* The soft heap limit */
-+ 
-+   /*
-+-  ** Pointers to the end of sqlite3GlobalConfig.pScratch memory
-+-  ** (so that a range test can be used to determine if an allocation
-+-  ** being freed came from pScratch) and a pointer to the list of
-+-  ** unused scratch allocations.
-+-  */
-+-  void *pScratchEnd;
-+-  ScratchFreeslot *pScratchFree;
-+-  u32 nScratchFree;
-+-
-+-  /*
-+   ** True if heap is nearly "full" where "full" is defined by the
-+   ** sqlite3_soft_heap_limit() setting.
-+   */
-+   int nearlyFull;
-+-} mem0 = { 0, 0, 0, 0, 0, 0 };
-++} mem0 = { 0, 0, 0 };
-+ 
-+ #define mem0 GLOBAL(struct Mem0Global, mem0)
-+ 
-+@@ -24905,28 +24968,6 @@ SQLITE_PRIVATE int sqlite3MallocInit(void){
-+   }
-+   memset(&mem0, 0, sizeof(mem0));
-+   mem0.mutex = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MEM);
-+-  if( sqlite3GlobalConfig.pScratch && sqlite3GlobalConfig.szScratch>=100
-+-      && sqlite3GlobalConfig.nScratch>0 ){
-+-    int i, n, sz;
-+-    ScratchFreeslot *pSlot;
-+-    sz = ROUNDDOWN8(sqlite3GlobalConfig.szScratch);
-+-    sqlite3GlobalConfig.szScratch = sz;
-+-    pSlot = (ScratchFreeslot*)sqlite3GlobalConfig.pScratch;
-+-    n = sqlite3GlobalConfig.nScratch;
-+-    mem0.pScratchFree = pSlot;
-+-    mem0.nScratchFree = n;
-+-    for(i=0; i<n-1; i++){
-+-      pSlot->pNext = (ScratchFreeslot*)(sz+(char*)pSlot);
-+-      pSlot = pSlot->pNext;
-+-    }
-+-    pSlot->pNext = 0;
-+-    mem0.pScratchEnd = (void*)&pSlot[1];
-+-  }else{
-+-    mem0.pScratchEnd = 0;
-+-    sqlite3GlobalConfig.pScratch = 0;
-+-    sqlite3GlobalConfig.szScratch = 0;
-+-    sqlite3GlobalConfig.nScratch = 0;
-+-  }
-+   if( sqlite3GlobalConfig.pPage==0 || sqlite3GlobalConfig.szPage<512
-+       || sqlite3GlobalConfig.nPage<=0 ){
-+     sqlite3GlobalConfig.pPage = 0;
-+@@ -25078,105 +25119,6 @@ SQLITE_API void *sqlite3_malloc64(sqlite3_uint64 n){
-+ }
-+ 
-+ /*
-+-** Each thread may only have a single outstanding allocation from
-+-** xScratchMalloc().  We verify this constraint in the single-threaded
-+-** case by setting scratchAllocOut to 1 when an allocation
-+-** is outstanding clearing it when the allocation is freed.
-+-*/
-+-#if SQLITE_THREADSAFE==0 && !defined(NDEBUG)
-+-static int scratchAllocOut = 0;
-+-#endif
-+-
-+-
-+-/*
-+-** Allocate memory that is to be used and released right away.
-+-** This routine is similar to alloca() in that it is not intended
-+-** for situations where the memory might be held long-term.  This
-+-** routine is intended to get memory to old large transient data
-+-** structures that would not normally fit on the stack of an
-+-** embedded processor.
-+-*/
-+-SQLITE_PRIVATE void *sqlite3ScratchMalloc(int n){
-+-  void *p;
-+-  assert( n>0 );
-+-
-+-  sqlite3_mutex_enter(mem0.mutex);
-+-  sqlite3StatusHighwater(SQLITE_STATUS_SCRATCH_SIZE, n);
-+-  if( mem0.nScratchFree && sqlite3GlobalConfig.szScratch>=n ){
-+-    p = mem0.pScratchFree;
-+-    mem0.pScratchFree = mem0.pScratchFree->pNext;
-+-    mem0.nScratchFree--;
-+-    sqlite3StatusUp(SQLITE_STATUS_SCRATCH_USED, 1);
-+-    sqlite3_mutex_leave(mem0.mutex);
-+-  }else{
-+-    sqlite3_mutex_leave(mem0.mutex);
-+-    p = sqlite3Malloc(n);
-+-    if( sqlite3GlobalConfig.bMemstat && p ){
-+-      sqlite3_mutex_enter(mem0.mutex);
-+-      sqlite3StatusUp(SQLITE_STATUS_SCRATCH_OVERFLOW, sqlite3MallocSize(p));
-+-      sqlite3_mutex_leave(mem0.mutex);
-+-    }
-+-    sqlite3MemdebugSetType(p, MEMTYPE_SCRATCH);
-+-  }
-+-  assert( sqlite3_mutex_notheld(mem0.mutex) );
-+-
-+-
-+-#if SQLITE_THREADSAFE==0 && !defined(NDEBUG)
-+-  /* EVIDENCE-OF: R-12970-05880 SQLite will not use more than one scratch
-+-  ** buffers per thread.
-+-  **
-+-  ** This can only be checked in single-threaded mode.
-+-  */
-+-  assert( scratchAllocOut==0 );
-+-  if( p ) scratchAllocOut++;
-+-#endif
-+-
-+-  return p;
-+-}
-+-SQLITE_PRIVATE void sqlite3ScratchFree(void *p){
-+-  if( p ){
-+-
-+-#if SQLITE_THREADSAFE==0 && !defined(NDEBUG)
-+-    /* Verify that no more than two scratch allocation per thread
-+-    ** is outstanding at one time.  (This is only checked in the
-+-    ** single-threaded case since checking in the multi-threaded case
-+-    ** would be much more complicated.) */
-+-    assert( scratchAllocOut>=1 && scratchAllocOut<=2 );
-+-    scratchAllocOut--;
-+-#endif
-+-
-+-    if( SQLITE_WITHIN(p, sqlite3GlobalConfig.pScratch, mem0.pScratchEnd) ){
-+-      /* Release memory from the SQLITE_CONFIG_SCRATCH allocation */
-+-      ScratchFreeslot *pSlot;
-+-      pSlot = (ScratchFreeslot*)p;
-+-      sqlite3_mutex_enter(mem0.mutex);
-+-      pSlot->pNext = mem0.pScratchFree;
-+-      mem0.pScratchFree = pSlot;
-+-      mem0.nScratchFree++;
-+-      assert( mem0.nScratchFree <= (u32)sqlite3GlobalConfig.nScratch );
-+-      sqlite3StatusDown(SQLITE_STATUS_SCRATCH_USED, 1);
-+-      sqlite3_mutex_leave(mem0.mutex);
-+-    }else{
-+-      /* Release memory back to the heap */
-+-      assert( sqlite3MemdebugHasType(p, MEMTYPE_SCRATCH) );
-+-      assert( sqlite3MemdebugNoType(p, (u8)~MEMTYPE_SCRATCH) );
-+-      sqlite3MemdebugSetType(p, MEMTYPE_HEAP);
-+-      if( sqlite3GlobalConfig.bMemstat ){
-+-        int iSize = sqlite3MallocSize(p);
-+-        sqlite3_mutex_enter(mem0.mutex);
-+-        sqlite3StatusDown(SQLITE_STATUS_SCRATCH_OVERFLOW, iSize);
-+-        sqlite3StatusDown(SQLITE_STATUS_MEMORY_USED, iSize);
-+-        sqlite3StatusDown(SQLITE_STATUS_MALLOC_COUNT, 1);
-+-        sqlite3GlobalConfig.m.xFree(p);
-+-        sqlite3_mutex_leave(mem0.mutex);
-+-      }else{
-+-        sqlite3GlobalConfig.m.xFree(p);
-+-      }
-+-    }
-+-  }
-+-}
-+-
-+-/*
-+ ** TRUE if p is a lookaside memory allocation from db
-+ */
-+ #ifndef SQLITE_OMIT_LOOKASIDE
-+@@ -25266,7 +25208,6 @@ SQLITE_PRIVATE void sqlite3DbFreeNN(sqlite3 *db, void *p){
-+ #endif
-+       pBuf->pNext = db->lookaside.pFree;
-+       db->lookaside.pFree = pBuf;
-+-      db->lookaside.nOut--;
-+       return;
-+     }
-+   }
-+@@ -25427,16 +25368,16 @@ SQLITE_PRIVATE void *sqlite3DbMallocRawNN(sqlite3 *db, u64 n){
-+     assert( db->mallocFailed==0 );
-+     if( n>db->lookaside.sz ){
-+       db->lookaside.anStat[1]++;
-+-    }else if( (pBuf = db->lookaside.pFree)==0 ){
-+-      db->lookaside.anStat[2]++;
-+-    }else{
-++    }else if( (pBuf = db->lookaside.pFree)!=0 ){
-+       db->lookaside.pFree = pBuf->pNext;
-+-      db->lookaside.nOut++;
-+       db->lookaside.anStat[0]++;
-+-      if( db->lookaside.nOut>db->lookaside.mxOut ){
-+-        db->lookaside.mxOut = db->lookaside.nOut;
-+-      }
-+       return (void*)pBuf;
-++    }else if( (pBuf = db->lookaside.pInit)!=0 ){
-++      db->lookaside.pInit = pBuf->pNext;
-++      db->lookaside.anStat[0]++;
-++      return (void*)pBuf;
-++    }else{
-++      db->lookaside.anStat[2]++;
-+     }
-+   }else if( db->mallocFailed ){
-+     return 0;
-+@@ -26274,7 +26215,7 @@ SQLITE_PRIVATE void sqlite3VXPrintf(
-+         if( precision>=0 ){
-+           for(length=0; length<precision && bufpt[length]; length++){}
-+         }else{
-+-          length = sqlite3Strlen30(bufpt);
-++          length = 0x7fffffff & (int)strlen(bufpt);
-+         }
-+         break;
-+       case etSQLESCAPE:           /* Escape ' characters */
-+@@ -26400,7 +26341,6 @@ static int sqlite3StrAccumEnlarge(StrAccum *p, int N){
-+   }else{
-+     char *zOld = isMalloced(p) ? p->zText : 0;
-+     i64 szNew = p->nChar;
-+-    assert( (p->zText==0 || p->zText==p->zBase)==!isMalloced(p) );
-+     szNew += N + 1;
-+     if( szNew+p->nChar<=p->mxAlloc ){
-+       /* Force exponential buffer size growth as long as it does not overflow,
-+@@ -26442,7 +26382,6 @@ SQLITE_PRIVATE void sqlite3AppendChar(StrAccum *p, int N, char c){
-+   if( p->nChar+(i64)N >= p->nAlloc && (N = sqlite3StrAccumEnlarge(p, N))<=0 ){
-+     return;
-+   }
-+-  assert( (p->zText==p->zBase)==!isMalloced(p) );
-+   while( (N--)>0 ) p->zText[p->nChar++] = c;
-+ }
-+ 
-+@@ -26460,7 +26399,6 @@ static void SQLITE_NOINLINE enlargeAndAppend(StrAccum *p, const char *z, int N){
-+     memcpy(&p->zText[p->nChar], z, N);
-+     p->nChar += N;
-+   }
-+-  assert( (p->zText==0 || p->zText==p->zBase)==!isMalloced(p) );
-+ }
-+ 
-+ /*
-+@@ -26495,19 +26433,20 @@ SQLITE_PRIVATE void sqlite3StrAccumAppendAll(StrAccum *p, const char *z){
-+ ** pointer if any kind of error was encountered.
-+ */
-+ static SQLITE_NOINLINE char *strAccumFinishRealloc(StrAccum *p){
-++  char *zText;
-+   assert( p->mxAlloc>0 && !isMalloced(p) );
-+-  p->zText = sqlite3DbMallocRaw(p->db, p->nChar+1 );
-+-  if( p->zText ){
-+-    memcpy(p->zText, p->zBase, p->nChar+1);
-++  zText = sqlite3DbMallocRaw(p->db, p->nChar+1 );
-++  if( zText ){
-++    memcpy(zText, p->zText, p->nChar+1);
-+     p->printfFlags |= SQLITE_PRINTF_MALLOCED;
-+   }else{
-+     setStrAccumError(p, STRACCUM_NOMEM);
-+   }
-+-  return p->zText;
-++  p->zText = zText;
-++  return zText;
-+ }
-+ SQLITE_PRIVATE char *sqlite3StrAccumFinish(StrAccum *p){
-+   if( p->zText ){
-+-    assert( (p->zText==p->zBase)==!isMalloced(p) );
-+     p->zText[p->nChar] = 0;
-+     if( p->mxAlloc>0 && !isMalloced(p) ){
-+       return strAccumFinishRealloc(p);
-+@@ -26520,7 +26459,6 @@ SQLITE_PRIVATE char *sqlite3StrAccumFinish(StrAccum *p){
-+ ** Reset an StrAccum string.  Reclaim all malloced memory.
-+ */
-+ SQLITE_PRIVATE void sqlite3StrAccumReset(StrAccum *p){
-+-  assert( (p->zText==0 || p->zText==p->zBase)==!isMalloced(p) );
-+   if( isMalloced(p) ){
-+     sqlite3DbFree(p->db, p->zText);
-+     p->printfFlags &= ~SQLITE_PRINTF_MALLOCED;
-+@@ -26543,11 +26481,11 @@ SQLITE_PRIVATE void sqlite3StrAccumReset(StrAccum *p){
-+ **        allocations will ever occur.
-+ */
-+ SQLITE_PRIVATE void sqlite3StrAccumInit(StrAccum *p, sqlite3 *db, char *zBase, int n, int mx){
-+-  p->zText = p->zBase = zBase;
-++  p->zText = zBase;
-+   p->db = db;
-+-  p->nChar = 0;
-+   p->nAlloc = n;
-+   p->mxAlloc = mx;
-++  p->nChar = 0;
-+   p->accError = 0;
-+   p->printfFlags = 0;
-+ }
-+@@ -28708,7 +28646,11 @@ do_atof_calc:
-+           if( esign<0 ){
-+             result = 0.0*s;
-+           }else{
-++#ifdef INFINITY
-++            result = INFINITY*s;
-++#else
-+             result = 1e308*1e308*s;  /* Infinity */
-++#endif
-+           }
-+         }
-+       }else{
-+@@ -28770,16 +28712,12 @@ static int compare2pow63(const char *zNum, int incr){
-+ ** Convert zNum to a 64-bit signed integer.  zNum must be decimal. This
-+ ** routine does *not* accept hexadecimal notation.
-+ **
-+-** If the zNum value is representable as a 64-bit twos-complement
-+-** integer, then write that value into *pNum and return 0.
-+-**
-+-** If zNum is exactly 9223372036854775808, return 2.  This special
-+-** case is broken out because while 9223372036854775808 cannot be a
-+-** signed 64-bit integer, its negative -9223372036854775808 can be.
-++** Returns:
-+ **
-+-** If zNum is too big for a 64-bit integer and is not
-+-** 9223372036854775808  or if zNum contains any non-numeric text,
-+-** then return 1.
-++**     0    Successful transformation.  Fits in a 64-bit signed integer.
-++**     1    Excess text after the integer value
-++**     2    Integer too large for a 64-bit signed integer or is malformed
-++**     3    Special case of 9223372036854775808
-+ **
-+ ** length is the number of bytes in the string (bytes, not characters).
-+ ** The string is not necessarily zero-terminated.  The encoding is
-+@@ -28792,6 +28730,7 @@ SQLITE_PRIVATE int sqlite3Atoi64(const char *zNum, i64 *pNum, int length, u8 enc
-+   int i;
-+   int c = 0;
-+   int nonNum = 0;  /* True if input contains UTF16 with high byte non-zero */
-++  int rc;          /* Baseline return code */
-+   const char *zStart;
-+   const char *zEnd = zNum + length;
-+   assert( enc==SQLITE_UTF8 || enc==SQLITE_UTF16LE || enc==SQLITE_UTF16BE );
-+@@ -28831,31 +28770,35 @@ SQLITE_PRIVATE int sqlite3Atoi64(const char *zNum, i64 *pNum, int length, u8 enc
-+   testcase( i==20 );
-+   if( &zNum[i]<zEnd              /* Extra bytes at the end */
-+    || (i==0 && zStart==zNum)     /* No digits */
-+-   || i>19*incr                  /* Too many digits */
-+    || nonNum                     /* UTF16 with high-order bytes non-zero */
-+   ){
-++    rc = 1;
-++  }else{
-++    rc = 0;
-++  }
-++  if( i>19*incr ){                /* Too many digits */
-+     /* zNum is empty or contains non-numeric text or is longer
-+     ** than 19 digits (thus guaranteeing that it is too large) */
-+-    return 1;
-++    return 2;
-+   }else if( i<19*incr ){
-+     /* Less than 19 digits, so we know that it fits in 64 bits */
-+     assert( u<=LARGEST_INT64 );
-+-    return 0;
-++    return rc;
-+   }else{
-+     /* zNum is a 19-digit numbers.  Compare it against 9223372036854775808. */
-+     c = compare2pow63(zNum, incr);
-+     if( c<0 ){
-+       /* zNum is less than 9223372036854775808 so it fits */
-+       assert( u<=LARGEST_INT64 );
-+-      return 0;
-++      return rc;
-+     }else if( c>0 ){
-+       /* zNum is greater than 9223372036854775808 so it overflows */
-+-      return 1;
-++      return 2;
-+     }else{
-+       /* zNum is exactly 9223372036854775808.  Fits if negative.  The
-+       ** special case 2 overflow if positive */
-+       assert( u-1==LARGEST_INT64 );
-+-      return neg ? 0 : 2;
-++      return neg ? rc : 3;
-+     }
-+   }
-+ }
-+@@ -28868,8 +28811,9 @@ SQLITE_PRIVATE int sqlite3Atoi64(const char *zNum, i64 *pNum, int length, u8 enc
-+ ** Returns:
-+ **
-+ **     0    Successful transformation.  Fits in a 64-bit signed integer.
-+-**     1    Integer too large for a 64-bit signed integer or is malformed
-+-**     2    Special case of 9223372036854775808
-++**     1    Excess text after the integer value
-++**     2    Integer too large for a 64-bit signed integer or is malformed
-++**     3    Special case of 9223372036854775808
-+ */
-+ SQLITE_PRIVATE int sqlite3DecOrHexToI64(const char *z, i64 *pOut){
-+ #ifndef SQLITE_OMIT_HEX_INTEGER
-+@@ -28883,7 +28827,7 @@ SQLITE_PRIVATE int sqlite3DecOrHexToI64(const char *z, i64 *pOut){
-+       u = u*16 + sqlite3HexToInt(z[k]);
-+     }
-+     memcpy(pOut, &u, 8);
-+-    return (z[k]==0 && k-i<=16) ? 0 : 1;
-++    return (z[k]==0 && k-i<=16) ? 0 : 2;
-+   }else
-+ #endif /* SQLITE_OMIT_HEX_INTEGER */
-+   {
-+@@ -29493,7 +29437,7 @@ SQLITE_PRIVATE int sqlite3SafetyCheckSickOrOk(sqlite3 *db){
-+ ** overflow, leave *pA unchanged and return 1.
-+ */
-+ SQLITE_PRIVATE int sqlite3AddInt64(i64 *pA, i64 iB){
-+-#if GCC_VERSION>=5004000
-++#if GCC_VERSION>=5004000 && !defined(__INTEL_COMPILER)
-+   return __builtin_add_overflow(*pA, iB, pA);
-+ #else
-+   i64 iA = *pA;
-+@@ -29513,7 +29457,7 @@ SQLITE_PRIVATE int sqlite3AddInt64(i64 *pA, i64 iB){
-+ #endif
-+ }
-+ SQLITE_PRIVATE int sqlite3SubInt64(i64 *pA, i64 iB){
-+-#if GCC_VERSION>=5004000
-++#if GCC_VERSION>=5004000 && !defined(__INTEL_COMPILER)
-+   return __builtin_sub_overflow(*pA, iB, pA);
-+ #else
-+   testcase( iB==SMALLEST_INT64+1 );
-+@@ -29528,7 +29472,7 @@ SQLITE_PRIVATE int sqlite3SubInt64(i64 *pA, i64 iB){
-+ #endif
-+ }
-+ SQLITE_PRIVATE int sqlite3MulInt64(i64 *pA, i64 iB){
-+-#if GCC_VERSION>=5004000
-++#if GCC_VERSION>=5004000 && !defined(__INTEL_COMPILER)
-+   return __builtin_mul_overflow(*pA, iB, pA);
-+ #else
-+   i64 iA = *pA;
-+@@ -29630,8 +29574,14 @@ SQLITE_PRIVATE LogEst sqlite3LogEst(u64 x){
-+     if( x<2 ) return 0;
-+     while( x<8 ){  y -= 10; x <<= 1; }
-+   }else{
-++#if GCC_VERSION>=5004000
-++    int i = 60 - __builtin_clzll(x);
-++    y += i*10;
-++    x >>= i;
-++#else
-+     while( x>255 ){ y += 40; x >>= 4; }  /*OPTIMIZATION-IF-TRUE*/
-+     while( x>15 ){  y += 10; x >>= 1; }
-++#endif
-+   }
-+   return a[x&7] + y - 10;
-+ }
-+@@ -30112,47 +30062,47 @@ SQLITE_PRIVATE const char *sqlite3OpcodeName(int i){
-+     /*  40 */ "IdxLT"            OpHelp("key=r[P3@P4]"),
-+     /*  41 */ "IdxGE"            OpHelp("key=r[P3@P4]"),
-+     /*  42 */ "RowSetRead"       OpHelp("r[P3]=rowset(P1)"),
-+-    /*  43 */ "RowSetTest"       OpHelp("if r[P3] in rowset(P1) goto P2"),
-+-    /*  44 */ "Program"          OpHelp(""),
-+-    /*  45 */ "FkIfZero"         OpHelp("if fkctr[P1]==0 goto P2"),
-+-    /*  46 */ "IfPos"            OpHelp("if r[P1]>0 then r[P1]-=P3, goto P2"),
-+-    /*  47 */ "IfNotZero"        OpHelp("if r[P1]!=0 then r[P1]--, goto P2"),
-+-    /*  48 */ "DecrJumpZero"     OpHelp("if (--r[P1])==0 goto P2"),
-+-    /*  49 */ "IncrVacuum"       OpHelp(""),
-+-    /*  50 */ "VNext"            OpHelp(""),
-+-    /*  51 */ "Init"             OpHelp("Start at P2"),
-+-    /*  52 */ "Return"           OpHelp(""),
-+-    /*  53 */ "EndCoroutine"     OpHelp(""),
-+-    /*  54 */ "HaltIfNull"       OpHelp("if r[P3]=null halt"),
-+-    /*  55 */ "Halt"             OpHelp(""),
-+-    /*  56 */ "Integer"          OpHelp("r[P2]=P1"),
-+-    /*  57 */ "Int64"            OpHelp("r[P2]=P4"),
-+-    /*  58 */ "String"           OpHelp("r[P2]='P4' (len=P1)"),
-+-    /*  59 */ "Null"             OpHelp("r[P2..P3]=NULL"),
-+-    /*  60 */ "SoftNull"         OpHelp("r[P1]=NULL"),
-+-    /*  61 */ "Blob"             OpHelp("r[P2]=P4 (len=P1)"),
-+-    /*  62 */ "Variable"         OpHelp("r[P2]=parameter(P1,P4)"),
-+-    /*  63 */ "Move"             OpHelp("r[P2@P3]=r[P1@P3]"),
-+-    /*  64 */ "Copy"             OpHelp("r[P2@P3+1]=r[P1@P3+1]"),
-+-    /*  65 */ "SCopy"            OpHelp("r[P2]=r[P1]"),
-+-    /*  66 */ "IntCopy"          OpHelp("r[P2]=r[P1]"),
-+-    /*  67 */ "ResultRow"        OpHelp("output=r[P1@P2]"),
-+-    /*  68 */ "CollSeq"          OpHelp(""),
-+-    /*  69 */ "AddImm"           OpHelp("r[P1]=r[P1]+P2"),
-+-    /*  70 */ "Or"               OpHelp("r[P3]=(r[P1] || r[P2])"),
-+-    /*  71 */ "And"              OpHelp("r[P3]=(r[P1] && r[P2])"),
-+-    /*  72 */ "RealAffinity"     OpHelp(""),
-+-    /*  73 */ "Cast"             OpHelp("affinity(r[P1])"),
-+-    /*  74 */ "Permutation"      OpHelp(""),
-+-    /*  75 */ "IsNull"           OpHelp("if r[P1]==NULL goto P2"),
-+-    /*  76 */ "NotNull"          OpHelp("if r[P1]!=NULL goto P2"),
-+-    /*  77 */ "Ne"               OpHelp("IF r[P3]!=r[P1]"),
-+-    /*  78 */ "Eq"               OpHelp("IF r[P3]==r[P1]"),
-+-    /*  79 */ "Gt"               OpHelp("IF r[P3]>r[P1]"),
-+-    /*  80 */ "Le"               OpHelp("IF r[P3]<=r[P1]"),
-+-    /*  81 */ "Lt"               OpHelp("IF r[P3]<r[P1]"),
-+-    /*  82 */ "Ge"               OpHelp("IF r[P3]>=r[P1]"),
-+-    /*  83 */ "ElseNotEq"        OpHelp(""),
-++    /*  43 */ "Or"               OpHelp("r[P3]=(r[P1] || r[P2])"),
-++    /*  44 */ "And"              OpHelp("r[P3]=(r[P1] && r[P2])"),
-++    /*  45 */ "RowSetTest"       OpHelp("if r[P3] in rowset(P1) goto P2"),
-++    /*  46 */ "Program"          OpHelp(""),
-++    /*  47 */ "FkIfZero"         OpHelp("if fkctr[P1]==0 goto P2"),
-++    /*  48 */ "IfPos"            OpHelp("if r[P1]>0 then r[P1]-=P3, goto P2"),
-++    /*  49 */ "IfNotZero"        OpHelp("if r[P1]!=0 then r[P1]--, goto P2"),
-++    /*  50 */ "IsNull"           OpHelp("if r[P1]==NULL goto P2"),
-++    /*  51 */ "NotNull"          OpHelp("if r[P1]!=NULL goto P2"),
-++    /*  52 */ "Ne"               OpHelp("IF r[P3]!=r[P1]"),
-++    /*  53 */ "Eq"               OpHelp("IF r[P3]==r[P1]"),
-++    /*  54 */ "Gt"               OpHelp("IF r[P3]>r[P1]"),
-++    /*  55 */ "Le"               OpHelp("IF r[P3]<=r[P1]"),
-++    /*  56 */ "Lt"               OpHelp("IF r[P3]<r[P1]"),
-++    /*  57 */ "Ge"               OpHelp("IF r[P3]>=r[P1]"),
-++    /*  58 */ "ElseNotEq"        OpHelp(""),
-++    /*  59 */ "DecrJumpZero"     OpHelp("if (--r[P1])==0 goto P2"),
-++    /*  60 */ "IncrVacuum"       OpHelp(""),
-++    /*  61 */ "VNext"            OpHelp(""),
-++    /*  62 */ "Init"             OpHelp("Start at P2"),
-++    /*  63 */ "Return"           OpHelp(""),
-++    /*  64 */ "EndCoroutine"     OpHelp(""),
-++    /*  65 */ "HaltIfNull"       OpHelp("if r[P3]=null halt"),
-++    /*  66 */ "Halt"             OpHelp(""),
-++    /*  67 */ "Integer"          OpHelp("r[P2]=P1"),
-++    /*  68 */ "Int64"            OpHelp("r[P2]=P4"),
-++    /*  69 */ "String"           OpHelp("r[P2]='P4' (len=P1)"),
-++    /*  70 */ "Null"             OpHelp("r[P2..P3]=NULL"),
-++    /*  71 */ "SoftNull"         OpHelp("r[P1]=NULL"),
-++    /*  72 */ "Blob"             OpHelp("r[P2]=P4 (len=P1)"),
-++    /*  73 */ "Variable"         OpHelp("r[P2]=parameter(P1,P4)"),
-++    /*  74 */ "Move"             OpHelp("r[P2@P3]=r[P1@P3]"),
-++    /*  75 */ "Copy"             OpHelp("r[P2@P3+1]=r[P1@P3+1]"),
-++    /*  76 */ "SCopy"            OpHelp("r[P2]=r[P1]"),
-++    /*  77 */ "IntCopy"          OpHelp("r[P2]=r[P1]"),
-++    /*  78 */ "ResultRow"        OpHelp("output=r[P1@P2]"),
-++    /*  79 */ "CollSeq"          OpHelp(""),
-++    /*  80 */ "AddImm"           OpHelp("r[P1]=r[P1]+P2"),
-++    /*  81 */ "RealAffinity"     OpHelp(""),
-++    /*  82 */ "Cast"             OpHelp("affinity(r[P1])"),
-++    /*  83 */ "Permutation"      OpHelp(""),
-+     /*  84 */ "BitAnd"           OpHelp("r[P3]=r[P1]&r[P2]"),
-+     /*  85 */ "BitOr"            OpHelp("r[P3]=r[P1]|r[P2]"),
-+     /*  86 */ "ShiftLeft"        OpHelp("r[P3]=r[P2]<<r[P1]"),
-+@@ -30194,17 +30144,17 @@ SQLITE_PRIVATE const char *sqlite3OpcodeName(int i){
-+     /* 122 */ "RowData"          OpHelp("r[P2]=data"),
-+     /* 123 */ "Rowid"            OpHelp("r[P2]=rowid"),
-+     /* 124 */ "NullRow"          OpHelp(""),
-+-    /* 125 */ "SorterInsert"     OpHelp("key=r[P2]"),
-+-    /* 126 */ "IdxInsert"        OpHelp("key=r[P2]"),
-+-    /* 127 */ "IdxDelete"        OpHelp("key=r[P2@P3]"),
-+-    /* 128 */ "DeferredSeek"     OpHelp("Move P3 to P1.rowid if needed"),
-+-    /* 129 */ "IdxRowid"         OpHelp("r[P2]=rowid"),
-+-    /* 130 */ "Destroy"          OpHelp(""),
-+-    /* 131 */ "Clear"            OpHelp(""),
-++    /* 125 */ "SeekEnd"          OpHelp(""),
-++    /* 126 */ "SorterInsert"     OpHelp("key=r[P2]"),
-++    /* 127 */ "IdxInsert"        OpHelp("key=r[P2]"),
-++    /* 128 */ "IdxDelete"        OpHelp("key=r[P2@P3]"),
-++    /* 129 */ "DeferredSeek"     OpHelp("Move P3 to P1.rowid if needed"),
-++    /* 130 */ "IdxRowid"         OpHelp("r[P2]=rowid"),
-++    /* 131 */ "Destroy"          OpHelp(""),
-+     /* 132 */ "Real"             OpHelp("r[P2]=P4"),
-+-    /* 133 */ "ResetSorter"      OpHelp(""),
-+-    /* 134 */ "CreateIndex"      OpHelp("r[P2]=root iDb=P1"),
-+-    /* 135 */ "CreateTable"      OpHelp("r[P2]=root iDb=P1"),
-++    /* 133 */ "Clear"            OpHelp(""),
-++    /* 134 */ "ResetSorter"      OpHelp(""),
-++    /* 135 */ "CreateBtree"      OpHelp("r[P2]=root iDb=P1 flags=P3"),
-+     /* 136 */ "SqlExec"          OpHelp(""),
-+     /* 137 */ "ParseSchema"      OpHelp(""),
-+     /* 138 */ "LoadAnalysis"     OpHelp(""),
-+@@ -30336,6 +30286,7 @@ SQLITE_PRIVATE const char *sqlite3OpcodeName(int i){
-+ #include <sys/types.h>
-+ #include <sys/stat.h>
-+ #include <fcntl.h>
-++#include <sys/ioctl.h>
-+ #include <unistd.h>
-+ /* #include <time.h> */
-+ #include <sys/time.h>
-+@@ -30345,7 +30296,7 @@ SQLITE_PRIVATE const char *sqlite3OpcodeName(int i){
-+ #endif
-+ 
-+ #if SQLITE_ENABLE_LOCKING_STYLE
-+-# include <sys/ioctl.h>
-++/* # include <sys/ioctl.h> */
-+ # include <sys/file.h>
-+ # include <sys/param.h>
-+ #endif /* SQLITE_ENABLE_LOCKING_STYLE */
-+@@ -30455,7 +30406,7 @@ struct unixFile {
-+   unsigned short int ctrlFlags;       /* Behavioral bits.  UNIXFILE_* flags */
-+   int lastErrno;                      /* The unix errno from last I/O error */
-+   void *lockingContext;               /* Locking style specific state */
-+-  UnixUnusedFd *pUnused;              /* Pre-allocated UnixUnusedFd */
-++  UnixUnusedFd *pPreallocatedUnused;  /* Pre-allocated UnixUnusedFd */
-+   const char *zPath;                  /* Name of the file */
-+   unixShm *pShm;                      /* Shared memory segment information */
-+   int szChunk;                        /* Configured by FCNTL_CHUNK_SIZE */
-+@@ -30466,10 +30417,8 @@ struct unixFile {
-+   sqlite3_int64 mmapSizeMax;          /* Configured FCNTL_MMAP_SIZE value */
-+   void *pMapRegion;                   /* Memory mapped region */
-+ #endif
-+-#ifdef __QNXNTO__
-+   int sectorSize;                     /* Device sector size */
-+   int deviceCharacteristics;          /* Precomputed device characteristics */
-+-#endif
-+ #if SQLITE_ENABLE_LOCKING_STYLE
-+   int openFlags;                      /* The flags specified at open() */
-+ #endif
-+@@ -30772,6 +30721,20 @@ SQLITE_API extern int sqlite3_open_file_count;
-+ # define lseek lseek64
-+ #endif
-+ 
-++#ifdef __linux__
-++/*
-++** Linux-specific IOCTL magic numbers used for controlling F2FS
-++*/
-++#define F2FS_IOCTL_MAGIC        0xf5
-++#define F2FS_IOC_START_ATOMIC_WRITE     _IO(F2FS_IOCTL_MAGIC, 1)
-++#define F2FS_IOC_COMMIT_ATOMIC_WRITE    _IO(F2FS_IOCTL_MAGIC, 2)
-++#define F2FS_IOC_START_VOLATILE_WRITE   _IO(F2FS_IOCTL_MAGIC, 3)
-++#define F2FS_IOC_ABORT_VOLATILE_WRITE   _IO(F2FS_IOCTL_MAGIC, 5)
-++#define F2FS_IOC_GET_FEATURES           _IOR(F2FS_IOCTL_MAGIC, 12, u32)
-++#define F2FS_FEATURE_ATOMIC_WRITE 0x0004
-++#endif /* __linux__ */
-++
-++
-+ /*
-+ ** Different Unix systems declare open() in different ways.  Same use
-+ ** open(const char*,int,mode_t).  Others use open(const char*,int,...).
-+@@ -30944,6 +30907,9 @@ static struct unix_syscall {
-+ #endif
-+ #define osLstat      ((int(*)(const char*,struct stat*))aSyscall[27].pCurrent)
-+ 
-++  { "ioctl",         (sqlite3_syscall_ptr)ioctl,          0 },
-++#define osIoctl ((int(*)(int,int,...))aSyscall[28].pCurrent)
-++
-+ }; /* End of the overrideable system calls */
-+ 
-+ 
-+@@ -31548,7 +31514,8 @@ struct unixInodeInfo {
-+ /*
-+ ** A lists of all unixInodeInfo objects.
-+ */
-+-static unixInodeInfo *inodeList = 0;
-++static unixInodeInfo *inodeList = 0;  /* All unixInodeInfo objects */
-++static unsigned int nUnusedFd = 0;    /* Total unused file descriptors */
-+ 
-+ /*
-+ **
-+@@ -31658,6 +31625,7 @@ static void closePendingFds(unixFile *pFile){
-+     pNext = p->pNext;
-+     robust_close(pFile, p->fd, __LINE__);
-+     sqlite3_free(p);
-++    nUnusedFd--;
-+   }
-+   pInode->pUnused = 0;
-+ }
-+@@ -31690,6 +31658,7 @@ static void releaseInodeInfo(unixFile *pFile){
-+       sqlite3_free(pInode);
-+     }
-+   }
-++  assert( inodeList!=0 || nUnusedFd==0 );
-+ }
-+ 
-+ /*
-+@@ -31759,6 +31728,7 @@ static int findInodeInfo(
-+ #else
-+   fileId.ino = (u64)statbuf.st_ino;
-+ #endif
-++  assert( inodeList!=0 || nUnusedFd==0 );
-+   pInode = inodeList;
-+   while( pInode && memcmp(&fileId, &pInode->fileId, sizeof(fileId)) ){
-+     pInode = pInode->pNext;
-+@@ -32184,11 +32154,12 @@ end_lock:
-+ */
-+ static void setPendingFd(unixFile *pFile){
-+   unixInodeInfo *pInode = pFile->pInode;
-+-  UnixUnusedFd *p = pFile->pUnused;
-++  UnixUnusedFd *p = pFile->pPreallocatedUnused;
-+   p->pNext = pInode->pUnused;
-+   pInode->pUnused = p;
-+   pFile->h = -1;
-+-  pFile->pUnused = 0;
-++  pFile->pPreallocatedUnused = 0;
-++  nUnusedFd++;
-+ }
-+ 
-+ /*
-+@@ -32413,7 +32384,7 @@ static int closeUnixFile(sqlite3_file *id){
-+ #endif
-+   OSTRACE(("CLOSE   %-3d\n", pFile->h));
-+   OpenCounter(-1);
-+-  sqlite3_free(pFile->pUnused);
-++  sqlite3_free(pFile->pPreallocatedUnused);
-+   memset(pFile, 0, sizeof(unixFile));
-+   return SQLITE_OK;
-+ }
-+@@ -32750,7 +32721,7 @@ static int flockCheckReservedLock(sqlite3_file *id, int *pResOut){
-+   OSTRACE(("TEST WR-LOCK %d %d %d (flock)\n", pFile->h, rc, reserved));
-+ 
-+ #ifdef SQLITE_IGNORE_FLOCK_LOCK_ERRORS
-+-  if( (rc & SQLITE_IOERR) == SQLITE_IOERR ){
-++  if( (rc & 0xff) == SQLITE_IOERR ){
-+     rc = SQLITE_OK;
-+     reserved=1;
-+   }
-+@@ -32817,7 +32788,7 @@ static int flockLock(sqlite3_file *id, int eFileLock) {
-+   OSTRACE(("LOCK    %d %s %s (flock)\n", pFile->h, azFileLock(eFileLock),
-+            rc==SQLITE_OK ? "ok" : "failed"));
-+ #ifdef SQLITE_IGNORE_FLOCK_LOCK_ERRORS
-+-  if( (rc & SQLITE_IOERR) == SQLITE_IOERR ){
-++  if( (rc & 0xff) == SQLITE_IOERR ){
-+     rc = SQLITE_BUSY;
-+   }
-+ #endif /* SQLITE_IGNORE_FLOCK_LOCK_ERRORS */
-+@@ -33354,7 +33325,7 @@ static int afpLock(sqlite3_file *id, int eFileLock){
-+           /* Can't reestablish the shared lock.  Sqlite can't deal, this is
-+           ** a critical I/O error
-+           */
-+-          rc = ((failed & SQLITE_IOERR) == SQLITE_IOERR) ? failed2 :
-++          rc = ((failed & 0xff) == SQLITE_IOERR) ? failed2 :
-+                SQLITE_IOERR_LOCK;
-+           goto afp_end_lock;
-+         }
-+@@ -33634,7 +33605,7 @@ static int unixRead(
-+   /* If this is a database file (not a journal, master-journal or temp
-+   ** file), the bytes in the locking range should never be read or written. */
-+ #if 0
-+-  assert( pFile->pUnused==0
-++  assert( pFile->pPreallocatedUnused==0
-+        || offset>=PENDING_BYTE+512
-+        || offset+amt<=PENDING_BYTE
-+   );
-+@@ -33747,7 +33718,7 @@ static int unixWrite(
-+   /* If this is a database file (not a journal, master-journal or temp
-+   ** file), the bytes in the locking range should never be read or written. */
-+ #if 0
-+-  assert( pFile->pUnused==0
-++  assert( pFile->pPreallocatedUnused==0
-+        || offset>=PENDING_BYTE+512
-+        || offset+amt<=PENDING_BYTE
-+   );
-+@@ -34227,6 +34198,21 @@ static int unixGetTempname(int nBuf, char *zBuf);
-+ static int unixFileControl(sqlite3_file *id, int op, void *pArg){
-+   unixFile *pFile = (unixFile*)id;
-+   switch( op ){
-++#if defined(__linux__) && defined(SQLITE_ENABLE_BATCH_ATOMIC_WRITE)
-++    case SQLITE_FCNTL_BEGIN_ATOMIC_WRITE: {
-++      int rc = osIoctl(pFile->h, F2FS_IOC_START_ATOMIC_WRITE);
-++      return rc ? SQLITE_IOERR_BEGIN_ATOMIC : SQLITE_OK;
-++    }
-++    case SQLITE_FCNTL_COMMIT_ATOMIC_WRITE: {
-++      int rc = osIoctl(pFile->h, F2FS_IOC_COMMIT_ATOMIC_WRITE);
-++      return rc ? SQLITE_IOERR_COMMIT_ATOMIC : SQLITE_OK;
-++    }
-++    case SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE: {
-++      int rc = osIoctl(pFile->h, F2FS_IOC_ABORT_VOLATILE_WRITE);
-++      return rc ? SQLITE_IOERR_ROLLBACK_ATOMIC : SQLITE_OK;
-++    }
-++#endif /* __linux__ && SQLITE_ENABLE_BATCH_ATOMIC_WRITE */
-++
-+     case SQLITE_FCNTL_LOCKSTATE: {
-+       *(int*)pArg = pFile->eFileLock;
-+       return SQLITE_OK;
-+@@ -34277,6 +34263,14 @@ static int unixFileControl(sqlite3_file *id, int op, void *pArg){
-+       if( newLimit>sqlite3GlobalConfig.mxMmap ){
-+         newLimit = sqlite3GlobalConfig.mxMmap;
-+       }
-++
-++      /* The value of newLimit may be eventually cast to (size_t) and passed
-++      ** to mmap(). Restrict its value to 2GB if (size_t) is not at least a
-++      ** 64-bit type. */
-++      if( newLimit>0 && sizeof(size_t)<8 ){
-++        newLimit = (newLimit & 0x7FFFFFFF);
-++      }
-++
-+       *(i64*)pArg = pFile->mmapSizeMax;
-+       if( newLimit>=0 && newLimit!=pFile->mmapSizeMax && pFile->nFetchOut==0 ){
-+         pFile->mmapSizeMax = newLimit;
-+@@ -34310,30 +34304,41 @@ static int unixFileControl(sqlite3_file *id, int op, void *pArg){
-+ }
-+ 
-+ /*
-+-** Return the sector size in bytes of the underlying block device for
-+-** the specified file. This is almost always 512 bytes, but may be
-+-** larger for some devices.
-++** If pFd->sectorSize is non-zero when this function is called, it is a
-++** no-op. Otherwise, the values of pFd->sectorSize and
-++** pFd->deviceCharacteristics are set according to the file-system
-++** characteristics.
-+ **
-+-** SQLite code assumes this function cannot fail. It also assumes that
-+-** if two files are created in the same file-system directory (i.e.
-+-** a database and its journal file) that the sector size will be the
-+-** same for both.
-++** There are two versions of this function. One for QNX and one for all
-++** other systems.
-+ */
-+ #ifndef __QNXNTO__
-+-static int unixSectorSize(sqlite3_file *NotUsed){
-+-  UNUSED_PARAMETER(NotUsed);
-+-  return SQLITE_DEFAULT_SECTOR_SIZE;
-+-}
-+-#endif
-++static void setDeviceCharacteristics(unixFile *pFd){
-++  assert( pFd->deviceCharacteristics==0 || pFd->sectorSize!=0 );
-++  if( pFd->sectorSize==0 ){
-++#if defined(__linux__) && defined(SQLITE_ENABLE_BATCH_ATOMIC_WRITE)
-++    int res;
-++    u32 f = 0;
-+ 
-+-/*
-+-** The following version of unixSectorSize() is optimized for QNX.
-+-*/
-+-#ifdef __QNXNTO__
-++    /* Check for support for F2FS atomic batch writes. */
-++    res = osIoctl(pFd->h, F2FS_IOC_GET_FEATURES, &f);
-++    if( res==0 && (f & F2FS_FEATURE_ATOMIC_WRITE) ){
-++      pFd->deviceCharacteristics = SQLITE_IOCAP_BATCH_ATOMIC;
-++    }
-++#endif /* __linux__ && SQLITE_ENABLE_BATCH_ATOMIC_WRITE */
-++
-++    /* Set the POWERSAFE_OVERWRITE flag if requested. */
-++    if( pFd->ctrlFlags & UNIXFILE_PSOW ){
-++      pFd->deviceCharacteristics |= SQLITE_IOCAP_POWERSAFE_OVERWRITE;
-++    }
-++
-++    pFd->sectorSize = SQLITE_DEFAULT_SECTOR_SIZE;
-++  }
-++}
-++#else
-+ #include <sys/dcmd_blk.h>
-+ #include <sys/statvfs.h>
-+-static int unixSectorSize(sqlite3_file *id){
-+-  unixFile *pFile = (unixFile*)id;
-++static void setDeviceCharacteristics(unixFile *pFile){
-+   if( pFile->sectorSize == 0 ){
-+     struct statvfs fsInfo;
-+ 
-+@@ -34402,9 +34407,24 @@ static int unixSectorSize(sqlite3_file *id){
-+     pFile->deviceCharacteristics = 0;
-+     pFile->sectorSize = SQLITE_DEFAULT_SECTOR_SIZE;
-+   }
-+-  return pFile->sectorSize;
-+ }
-+-#endif /* __QNXNTO__ */
-++#endif
-++
-++/*
-++** Return the sector size in bytes of the underlying block device for
-++** the specified file. This is almost always 512 bytes, but may be
-++** larger for some devices.
-++**
-++** SQLite code assumes this function cannot fail. It also assumes that
-++** if two files are created in the same file-system directory (i.e.
-++** a database and its journal file) that the sector size will be the
-++** same for both.
-++*/
-++static int unixSectorSize(sqlite3_file *id){
-++  unixFile *pFd = (unixFile*)id;
-++  setDeviceCharacteristics(pFd);
-++  return pFd->sectorSize;
-++}
-+ 
-+ /*
-+ ** Return the device characteristics for the file.
-+@@ -34420,16 +34440,9 @@ static int unixSectorSize(sqlite3_file *id){
-+ ** available to turn it off and URI query parameter available to turn it off.
-+ */
-+ static int unixDeviceCharacteristics(sqlite3_file *id){
-+-  unixFile *p = (unixFile*)id;
-+-  int rc = 0;
-+-#ifdef __QNXNTO__
-+-  if( p->sectorSize==0 ) unixSectorSize(id);
-+-  rc = p->deviceCharacteristics;
-+-#endif
-+-  if( p->ctrlFlags & UNIXFILE_PSOW ){
-+-    rc |= SQLITE_IOCAP_POWERSAFE_OVERWRITE;
-+-  }
-+-  return rc;
-++  unixFile *pFd = (unixFile*)id;
-++  setDeviceCharacteristics(pFd);
-++  return pFd->deviceCharacteristics;
-+ }
-+ 
-+ #if !defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0
-+@@ -35687,17 +35700,6 @@ static int fillInUnixFile(
-+ 
-+   assert( pNew->pInode==NULL );
-+ 
-+-  /* Usually the path zFilename should not be a relative pathname. The
-+-  ** exception is when opening the proxy "conch" file in builds that
-+-  ** include the special Apple locking styles.
-+-  */
-+-#if defined(__APPLE__) && SQLITE_ENABLE_LOCKING_STYLE
-+-  assert( zFilename==0 || zFilename[0]=='/'
-+-    || pVfs->pAppData==(void*)&autolockIoFinder );
-+-#else
-+-  assert( zFilename==0 || zFilename[0]=='/' );
-+-#endif
-+-
-+   /* No locking occurs in temporary files */
-+   assert( zFilename!=0 || (ctrlFlags & UNIXFILE_NOLOCK)!=0 );
-+ 
-+@@ -35956,6 +35958,8 @@ static UnixUnusedFd *findReusableFd(const char *zPath, int flags){
-+ #if !OS_VXWORKS
-+   struct stat sStat;                   /* Results of stat() call */
-+ 
-++  unixEnterMutex();
-++
-+   /* A stat() call may fail for various reasons. If this happens, it is
-+   ** almost certain that an open() call on the same path will also fail.
-+   ** For this reason, if an error occurs in the stat() call here, it is
-+@@ -35964,10 +35968,9 @@ static UnixUnusedFd *findReusableFd(const char *zPath, int flags){
-+   **
-+   ** Even if a subsequent open() call does succeed, the consequences of
-+   ** not searching for a reusable file descriptor are not dire.  */
-+-  if( 0==osStat(zPath, &sStat) ){
-++  if( nUnusedFd>0 && 0==osStat(zPath, &sStat) ){
-+     unixInodeInfo *pInode;
-+ 
-+-    unixEnterMutex();
-+     pInode = inodeList;
-+     while( pInode && (pInode->fileId.dev!=sStat.st_dev
-+                      || pInode->fileId.ino!=(u64)sStat.st_ino) ){
-+@@ -35978,11 +35981,12 @@ static UnixUnusedFd *findReusableFd(const char *zPath, int flags){
-+       for(pp=&pInode->pUnused; *pp && (*pp)->flags!=flags; pp=&((*pp)->pNext));
-+       pUnused = *pp;
-+       if( pUnused ){
-++        nUnusedFd--;
-+         *pp = pUnused->pNext;
-+       }
-+     }
-+-    unixLeaveMutex();
-+   }
-++  unixLeaveMutex();
-+ #endif    /* if !OS_VXWORKS */
-+   return pUnused;
-+ }
-+@@ -36058,16 +36062,11 @@ static int findCreateFileMode(
-+     */
-+     nDb = sqlite3Strlen30(zPath) - 1;
-+     while( zPath[nDb]!='-' ){
-+-#ifndef SQLITE_ENABLE_8_3_NAMES
-+-      /* In the normal case (8+3 filenames disabled) the journal filename
-+-      ** is guaranteed to contain a '-' character. */
-+-      assert( nDb>0 );
-+-      assert( sqlite3Isalnum(zPath[nDb]) );
-+-#else
-+-      /* If 8+3 names are possible, then the journal file might not contain
-+-      ** a '-' character.  So check for that case and return early. */
-++      /* In normal operation, the journal file name will always contain
-++      ** a '-' character.  However in 8+3 filename mode, or if a corrupt
-++      ** rollback journal specifies a master journal with a goofy name, then
-++      ** the '-' might be missing. */
-+       if( nDb==0 || zPath[nDb]=='.' ) return SQLITE_OK;
-+-#endif
-+       nDb--;
-+     }
-+     memcpy(zDb, zPath, nDb);
-+@@ -36109,20 +36108,21 @@ int chromium_sqlite3_fill_in_unix_sqlite3_file(sqlite3_vfs* pVfs,
-+   memset(p, 0, sizeof(unixFile));
-+ 
-+   /* osStat() will not work in the sandbox, so findReusableFd() will always
-+-  ** fail, so directly include the failure-case setup then initialize pUnused.
-++  ** fail, so directly include the failure-case setup then initialize
-++  ** pPreallocatedUnused.
-+   */
-+   if( eType==SQLITE_OPEN_MAIN_DB ){
-+-    p->pUnused = sqlite3_malloc(sizeof(*p->pUnused));
-+-    if (!p->pUnused) {
-++    p->pPreallocatedUnused = sqlite3_malloc(sizeof(*p->pPreallocatedUnused));
-++    if (!p->pPreallocatedUnused) {
-+       return SQLITE_NOMEM_BKPT;
-+     }
-+-    p->pUnused->fd = fd;
-+-    p->pUnused->flags = flags;
-++    p->pPreallocatedUnused->fd = fd;
-++    p->pPreallocatedUnused->flags = flags;
-+   }
-+ 
-+   rc = fillInUnixFile(pVfs, fd, pFile, zPath, ctrlFlags);
-+   if( rc!=SQLITE_OK ){
-+-    sqlite3_free(p->pUnused);
-++    sqlite3_free(p->pPreallocatedUnused);
-+   }
-+   return rc;
-+ }
-+@@ -36243,7 +36243,7 @@ static int unixOpen(
-+         return SQLITE_NOMEM_BKPT;
-+       }
-+     }
-+-    p->pUnused = pUnused;
-++    p->pPreallocatedUnused = pUnused;
-+ 
-+     /* Database filenames are double-zero terminated if they are not
-+     ** URIs with parameters.  Hence, they can always be passed into
-+@@ -36280,7 +36280,7 @@ static int unixOpen(
-+     gid_t gid;                    /* Groupid for the file */
-+     rc = findCreateFileMode(zName, flags, &openMode, &uid, &gid);
-+     if( rc!=SQLITE_OK ){
-+-      assert( !p->pUnused );
-++      assert( !p->pPreallocatedUnused );
-+       assert( eType==SQLITE_OPEN_WAL || eType==SQLITE_OPEN_MAIN_JOURNAL );
-+       return rc;
-+     }
-+@@ -36314,10 +36314,10 @@ static int unixOpen(
-+     *pOutFlags = flags;
-+   }
-+ 
-+-  if( p->pUnused ){
-++  if( p->pPreallocatedUnused ){
-+     /* Duplicated in chromium_sqlite3_fill_in_unix_sqlite3_file(). */
-+-    p->pUnused->fd = fd;
-+-    p->pUnused->flags = flags;
-++    p->pPreallocatedUnused->fd = fd;
-++    p->pPreallocatedUnused->flags = flags;
-+   }
-+ 
-+   if( isDelete ){
-+@@ -36394,13 +36394,16 @@ static int unixOpen(
-+   }
-+ #endif
-+ 
-++  assert( zPath==0 || zPath[0]=='/'
-++      || eType==SQLITE_OPEN_MASTER_JOURNAL || eType==SQLITE_OPEN_MAIN_JOURNAL
-++  );
-+   /* Duplicated in chromium_sqlite3_fill_in_unix_sqlite3_file(). */
-+   rc = fillInUnixFile(pVfs, fd, pFile, zPath, ctrlFlags);
-+ 
-+ open_finished:
-+   if( rc!=SQLITE_OK ){
-+     /* Duplicated in chromium_sqlite3_fill_in_unix_sqlite3_file(). */
-+-    sqlite3_free(p->pUnused);
-++    sqlite3_free(p->pPreallocatedUnused);
-+   }
-+   return rc;
-+ }
-+@@ -37141,7 +37144,7 @@ static int proxyCreateUnixFile(
-+   dummyVfs.zName = "dummy";
-+   pUnused->fd = fd;
-+   pUnused->flags = openFlags;
-+-  pNew->pUnused = pUnused;
-++  pNew->pPreallocatedUnused = pUnused;
-+ 
-+   rc = fillInUnixFile(&dummyVfs, fd, (sqlite3_file*)pNew, path, 0);
-+   if( rc==SQLITE_OK ){
-+@@ -38091,7 +38094,7 @@ SQLITE_API int sqlite3_os_init(void){
-+ 
-+   /* Double-check that the aSyscall[] array has been constructed
-+   ** correctly.  See ticket [bb3a86e890c8e96ab] */
-+-  assert( ArraySize(aSyscall)==28 );
-++  assert( ArraySize(aSyscall)==29 );
-+ 
-+   /* Register all VFSes defined in the aVfs[] array */
-+   for(i=0; i<(sizeof(aVfs)/sizeof(sqlite3_vfs)); i++){
-+@@ -41874,6 +41877,14 @@ static int winFileControl(sqlite3_file *id, int op, void *pArg){
-+       if( newLimit>sqlite3GlobalConfig.mxMmap ){
-+         newLimit = sqlite3GlobalConfig.mxMmap;
-+       }
-++
-++      /* The value of newLimit may be eventually cast to (SIZE_T) and passed
-++      ** to MapViewOfFile(). Restrict its value to 2GB if (SIZE_T) is not at
-++      ** least a 64-bit type. */
-++      if( newLimit>0 && sizeof(SIZE_T)<8 ){
-++        newLimit = (newLimit & 0x7FFFFFFF);
-++      }
-++
-+       *(i64*)pArg = pFile->mmapSizeMax;
-+       if( newLimit>=0 && newLimit!=pFile->mmapSizeMax && pFile->nFetchOut==0 ){
-+         pFile->mmapSizeMax = newLimit;
-+@@ -43186,6 +43197,14 @@ static int winIsDir(const void *zConverted){
-+   return (attr!=INVALID_FILE_ATTRIBUTES) && (attr&FILE_ATTRIBUTE_DIRECTORY);
-+ }
-+ 
-++/* forward reference */
-++static int winAccess(
-++  sqlite3_vfs *pVfs,         /* Not used on win32 */
-++  const char *zFilename,     /* Name of file to check */
-++  int flags,                 /* Type of test to make on this file */
-++  int *pResOut               /* OUT: Result */
-++);
-++
-+ /*
-+ ** Open a file.
-+ */
-+@@ -43362,37 +43381,52 @@ static int winOpen(
-+     extendedParameters.dwSecurityQosFlags = SECURITY_ANONYMOUS;
-+     extendedParameters.lpSecurityAttributes = NULL;
-+     extendedParameters.hTemplateFile = NULL;
-+-    while( (h = osCreateFile2((LPCWSTR)zConverted,
-+-                              dwDesiredAccess,
-+-                              dwShareMode,
-+-                              dwCreationDisposition,
-+-                              &extendedParameters))==INVALID_HANDLE_VALUE &&
-+-                              winRetryIoerr(&cnt, &lastErrno) ){
-+-               /* Noop */
-+-    }
-++    do{
-++      h = osCreateFile2((LPCWSTR)zConverted,
-++                        dwDesiredAccess,
-++                        dwShareMode,
-++                        dwCreationDisposition,
-++                        &extendedParameters);
-++      if( h!=INVALID_HANDLE_VALUE ) break;
-++      if( isReadWrite ){
-++        int isRO = 0;
-++        int rc2 = winAccess(pVfs, zName, SQLITE_ACCESS_READ, &isRO);
-++        if( rc2==SQLITE_OK && isRO ) break;
-++      }
-++    }while( winRetryIoerr(&cnt, &lastErrno) );
-+ #else
-+-    while( (h = osCreateFileW((LPCWSTR)zConverted,
-+-                              dwDesiredAccess,
-+-                              dwShareMode, NULL,
-+-                              dwCreationDisposition,
-+-                              dwFlagsAndAttributes,
-+-                              NULL))==INVALID_HANDLE_VALUE &&
-+-                              winRetryIoerr(&cnt, &lastErrno) ){
-+-               /* Noop */
-+-    }
-++    do{
-++      h = osCreateFileW((LPCWSTR)zConverted,
-++                        dwDesiredAccess,
-++                        dwShareMode, NULL,
-++                        dwCreationDisposition,
-++                        dwFlagsAndAttributes,
-++                        NULL);
-++      if( h!=INVALID_HANDLE_VALUE ) break;
-++      if( isReadWrite ){
-++        int isRO = 0;
-++        int rc2 = winAccess(pVfs, zName, SQLITE_ACCESS_READ, &isRO);
-++        if( rc2==SQLITE_OK && isRO ) break;
-++      }
-++    }while( winRetryIoerr(&cnt, &lastErrno) );
-+ #endif
-+   }
-+ #ifdef SQLITE_WIN32_HAS_ANSI
-+   else{
-+-    while( (h = osCreateFileA((LPCSTR)zConverted,
-+-                              dwDesiredAccess,
-+-                              dwShareMode, NULL,
-+-                              dwCreationDisposition,
-+-                              dwFlagsAndAttributes,
-+-                              NULL))==INVALID_HANDLE_VALUE &&
-+-                              winRetryIoerr(&cnt, &lastErrno) ){
-+-               /* Noop */
-+-    }
-++    do{
-++      h = osCreateFileA((LPCSTR)zConverted,
-++                        dwDesiredAccess,
-++                        dwShareMode, NULL,
-++                        dwCreationDisposition,
-++                        dwFlagsAndAttributes,
-++                        NULL);
-++      if( h!=INVALID_HANDLE_VALUE ) break;
-++      if( isReadWrite ){
-++        int isRO = 0;
-++        int rc2 = winAccess(pVfs, zName, SQLITE_ACCESS_READ, &isRO);
-++        if( rc2==SQLITE_OK && isRO ) break;
-++      }
-++    }while( winRetryIoerr(&cnt, &lastErrno) );
-+   }
-+ #endif
-+   winLogIoerr(cnt, __LINE__);
-+@@ -43401,8 +43435,6 @@ static int winOpen(
-+            dwDesiredAccess, (h==INVALID_HANDLE_VALUE) ? "failed" : "ok"));
-+ 
-+   if( h==INVALID_HANDLE_VALUE ){
-+-    pFile->lastErrno = lastErrno;
-+-    winLogError(SQLITE_CANTOPEN, pFile->lastErrno, "winOpen", zUtf8Name);
-+     sqlite3_free(zConverted);
-+     sqlite3_free(zTmpname);
-+     if( isReadWrite && !isExclusive ){
-+@@ -43411,6 +43443,8 @@ static int winOpen(
-+                      ~(SQLITE_OPEN_CREATE|SQLITE_OPEN_READWRITE)),
-+          pOutFlags);
-+     }else{
-++      pFile->lastErrno = lastErrno;
-++      winLogError(SQLITE_CANTOPEN, pFile->lastErrno, "winOpen", zUtf8Name);
-+       return SQLITE_CANTOPEN_BKPT;
-+     }
-+   }
-+@@ -44003,9 +44037,6 @@ static int winRandomness(sqlite3_vfs *pVfs, int nBuf, char *zBuf){
-+   EntropyGatherer e;
-+   UNUSED_PARAMETER(pVfs);
-+   memset(zBuf, 0, nBuf);
-+-#if defined(_MSC_VER) && _MSC_VER>=1400 && !SQLITE_OS_WINCE
-+-  rand_s((unsigned int*)zBuf); /* rand_s() is not available with MinGW */
-+-#endif /* defined(_MSC_VER) && _MSC_VER>=1400 */
-+   e.a = (unsigned char*)zBuf;
-+   e.na = nBuf;
-+   e.nXor = 0;
-+@@ -44932,12 +44963,9 @@ static void pcacheManageDirtyList(PgHdr *pPage, u8 addRemove){
-+         p->eCreate = 2;
-+       }
-+     }
-+-    pPage->pDirtyNext = 0;
-+-    pPage->pDirtyPrev = 0;
-+   }
-+   if( addRemove & PCACHE_DIRTYLIST_ADD ){
-+-    assert( pPage->pDirtyNext==0 && pPage->pDirtyPrev==0 && p->pDirty!=pPage );
-+-
-++    pPage->pDirtyPrev = 0;
-+     pPage->pDirtyNext = p->pDirty;
-+     if( pPage->pDirtyNext ){
-+       assert( pPage->pDirtyNext->pDirtyPrev==0 );
-+@@ -45254,11 +45282,7 @@ SQLITE_PRIVATE void SQLITE_NOINLINE sqlite3PcacheRelease(PgHdr *p){
-+   if( (--p->nRef)==0 ){
-+     if( p->flags&PGHDR_CLEAN ){
-+       pcacheUnpin(p);
-+-    }else if( p->pDirtyPrev!=0 ){ /*OPTIMIZATION-IF-FALSE*/
-+-      /* Move the page to the head of the dirty list. If p->pDirtyPrev==0,
-+-      ** then page p is already at the head of the dirty list and the
-+-      ** following call would be a no-op. Hence the OPTIMIZATION-IF-FALSE
-+-      ** tag above.  */
-++    }else{
-+       pcacheManageDirtyList(p, PCACHE_DIRTYLIST_FRONT);
-+     }
-+   }
-+@@ -45719,7 +45743,6 @@ typedef struct PGroup PGroup;
-+ struct PgHdr1 {
-+   sqlite3_pcache_page page;      /* Base class. Must be first. pBuf & pExtra */
-+   unsigned int iKey;             /* Key value (page number) */
-+-  u8 isPinned;                   /* Page in use, not on the LRU list */
-+   u8 isBulkLocal;                /* This page from bulk local storage */
-+   u8 isAnchor;                   /* This is the PGroup.lru element */
-+   PgHdr1 *pNext;                 /* Next in hash table chain */
-+@@ -45728,6 +45751,12 @@ struct PgHdr1 {
-+   PgHdr1 *pLruPrev;              /* Previous in LRU list of unpinned pages */
-+ };
-+ 
-++/*
-++** A page is pinned if it is no on the LRU list
-++*/
-++#define PAGE_IS_PINNED(p)    ((p)->pLruNext==0)
-++#define PAGE_IS_UNPINNED(p)  ((p)->pLruNext!=0)
-++
-+ /* Each page cache (or PCache) belongs to a PGroup.  A PGroup is a set
-+ ** of one or more PCaches that are able to recycle each other's unpinned
-+ ** pages when they are under memory pressure.  A PGroup is an instance of
-+@@ -45755,7 +45784,7 @@ struct PGroup {
-+   unsigned int nMaxPage;         /* Sum of nMax for purgeable caches */
-+   unsigned int nMinPage;         /* Sum of nMin for purgeable caches */
-+   unsigned int mxPinned;         /* nMaxpage + 10 - nMinPage */
-+-  unsigned int nCurrentPage;     /* Number of purgeable pages allocated */
-++  unsigned int nPurgeable;       /* Number of purgeable pages allocated */
-+   PgHdr1 lru;                    /* The beginning and end of the LRU list */
-+ };
-+ 
-+@@ -45769,11 +45798,13 @@ struct PGroup {
-+ */
-+ struct PCache1 {
-+   /* Cache configuration parameters. Page size (szPage) and the purgeable
-+-  ** flag (bPurgeable) are set when the cache is created. nMax may be
-++  ** flag (bPurgeable) and the pnPurgeable pointer are all set when the
-++  ** cache is created and are never changed thereafter. nMax may be
-+   ** modified at any time by a call to the pcache1Cachesize() method.
-+   ** The PGroup mutex must be held when accessing nMax.
-+   */
-+   PGroup *pGroup;                     /* PGroup this cache belongs to */
-++  unsigned int *pnPurgeable;          /* Pointer to pGroup->nPurgeable */
-+   int szPage;                         /* Size of database content section */
-+   int szExtra;                        /* sizeof(MemPage)+sizeof(PgHdr) */
-+   int szAlloc;                        /* Total size of one pcache line */
-+@@ -45868,6 +45899,7 @@ SQLITE_PRIVATE void sqlite3PCacheBufferSetup(void *pBuf, int sz, int n){
-+   if( pcache1.isInit ){
-+     PgFreeslot *p;
-+     if( pBuf==0 ) sz = n = 0;
-++    if( n==0 ) sz = 0;
-+     sz = ROUNDDOWN8(sz);
-+     pcache1.szSlot = sz;
-+     pcache1.nSlot = pcache1.nFreeSlot = n;
-+@@ -46060,9 +46092,7 @@ static PgHdr1 *pcache1AllocPage(PCache1 *pCache, int benignMalloc){
-+     p->isBulkLocal = 0;
-+     p->isAnchor = 0;
-+   }
-+-  if( pCache->bPurgeable ){
-+-    pCache->pGroup->nCurrentPage++;
-+-  }
-++  (*pCache->pnPurgeable)++;
-+   return p;
-+ }
-+ 
-+@@ -46083,9 +46113,7 @@ static void pcache1FreePage(PgHdr1 *p){
-+     sqlite3_free(p);
-+ #endif
-+   }
-+-  if( pCache->bPurgeable ){
-+-    pCache->pGroup->nCurrentPage--;
-+-  }
-++  (*pCache->pnPurgeable)--;
-+ }
-+ 
-+ /*
-+@@ -46180,22 +46208,18 @@ static void pcache1ResizeHash(PCache1 *p){
-+ ** The PGroup mutex must be held when this function is called.
-+ */
-+ static PgHdr1 *pcache1PinPage(PgHdr1 *pPage){
-+-  PCache1 *pCache;
-+-
-+   assert( pPage!=0 );
-+-  assert( pPage->isPinned==0 );
-+-  pCache = pPage->pCache;
-++  assert( PAGE_IS_UNPINNED(pPage) );
-+   assert( pPage->pLruNext );
-+   assert( pPage->pLruPrev );
-+-  assert( sqlite3_mutex_held(pCache->pGroup->mutex) );
-++  assert( sqlite3_mutex_held(pPage->pCache->pGroup->mutex) );
-+   pPage->pLruPrev->pLruNext = pPage->pLruNext;
-+   pPage->pLruNext->pLruPrev = pPage->pLruPrev;
-+   pPage->pLruNext = 0;
-+   pPage->pLruPrev = 0;
-+-  pPage->isPinned = 1;
-+   assert( pPage->isAnchor==0 );
-+-  assert( pCache->pGroup->lru.isAnchor==1 );
-+-  pCache->nRecyclable--;
-++  assert( pPage->pCache->pGroup->lru.isAnchor==1 );
-++  pPage->pCache->nRecyclable--;
-+   return pPage;
-+ }
-+ 
-+@@ -46229,11 +46253,11 @@ static void pcache1EnforceMaxPage(PCache1 *pCache){
-+   PGroup *pGroup = pCache->pGroup;
-+   PgHdr1 *p;
-+   assert( sqlite3_mutex_held(pGroup->mutex) );
-+-  while( pGroup->nCurrentPage>pGroup->nMaxPage
-++  while( pGroup->nPurgeable>pGroup->nMaxPage
-+       && (p=pGroup->lru.pLruPrev)->isAnchor==0
-+   ){
-+     assert( p->pCache->pGroup==pGroup );
-+-    assert( p->isPinned==0 );
-++    assert( PAGE_IS_UNPINNED(p) );
-+     pcache1PinPage(p);
-+     pcache1RemoveFromHash(p, 1);
-+   }
-+@@ -46282,7 +46306,7 @@ static void pcache1TruncateUnsafe(
-+       if( pPage->iKey>=iLimit ){
-+         pCache->nPage--;
-+         *pp = pPage->pNext;
-+-        if( !pPage->isPinned ) pcache1PinPage(pPage);
-++        if( PAGE_IS_UNPINNED(pPage) ) pcache1PinPage(pPage);
-+         pcache1FreePage(pPage);
-+       }else{
-+         pp = &pPage->pNext;
-+@@ -46404,6 +46428,10 @@ static sqlite3_pcache *pcache1Create(int szPage, int szExtra, int bPurgeable){
-+       pCache->nMin = 10;
-+       pGroup->nMinPage += pCache->nMin;
-+       pGroup->mxPinned = pGroup->nMaxPage + 10 - pGroup->nMinPage;
-++      pCache->pnPurgeable = &pGroup->nPurgeable;
-++    }else{
-++      static unsigned int dummyCurrentPage;
-++      pCache->pnPurgeable = &dummyCurrentPage;
-+     }
-+     pcache1LeaveMutex(pGroup);
-+     if( pCache->nHash==0 ){
-+@@ -46505,7 +46533,7 @@ static SQLITE_NOINLINE PgHdr1 *pcache1FetchStage2(
-+   ){
-+     PCache1 *pOther;
-+     pPage = pGroup->lru.pLruPrev;
-+-    assert( pPage->isPinned==0 );
-++    assert( PAGE_IS_UNPINNED(pPage) );
-+     pcache1RemoveFromHash(pPage, 0);
-+     pcache1PinPage(pPage);
-+     pOther = pPage->pCache;
-+@@ -46513,7 +46541,7 @@ static SQLITE_NOINLINE PgHdr1 *pcache1FetchStage2(
-+       pcache1FreePage(pPage);
-+       pPage = 0;
-+     }else{
-+-      pGroup->nCurrentPage -= (pOther->bPurgeable - pCache->bPurgeable);
-++      pGroup->nPurgeable -= (pOther->bPurgeable - pCache->bPurgeable);
-+     }
-+   }
-+ 
-+@@ -46532,7 +46560,6 @@ static SQLITE_NOINLINE PgHdr1 *pcache1FetchStage2(
-+     pPage->pCache = pCache;
-+     pPage->pLruPrev = 0;
-+     pPage->pLruNext = 0;
-+-    pPage->isPinned = 1;
-+     *(void **)pPage->page.pExtra = 0;
-+     pCache->apHash[h] = pPage;
-+     if( iKey>pCache->iMaxKey ){
-+@@ -46618,7 +46645,7 @@ static PgHdr1 *pcache1FetchNoMutex(
-+   ** Otherwise (page not in hash and createFlag!=0) continue with
-+   ** subsequent steps to try to create the page. */
-+   if( pPage ){
-+-    if( !pPage->isPinned ){
-++    if( PAGE_IS_UNPINNED(pPage) ){
-+       return pcache1PinPage(pPage);
-+     }else{
-+       return pPage;
-+@@ -46693,9 +46720,9 @@ static void pcache1Unpin(
-+   ** part of the PGroup LRU list.
-+   */
-+   assert( pPage->pLruPrev==0 && pPage->pLruNext==0 );
-+-  assert( pPage->isPinned==1 );
-++  assert( PAGE_IS_PINNED(pPage) );
-+ 
-+-  if( reuseUnlikely || pGroup->nCurrentPage>pGroup->nMaxPage ){
-++  if( reuseUnlikely || pGroup->nPurgeable>pGroup->nMaxPage ){
-+     pcache1RemoveFromHash(pPage, 1);
-+   }else{
-+     /* Add the page to the PGroup LRU list. */
-+@@ -46704,7 +46731,6 @@ static void pcache1Unpin(
-+     (pPage->pLruNext = *ppFirst)->pLruPrev = pPage;
-+     *ppFirst = pPage;
-+     pCache->nRecyclable++;
-+-    pPage->isPinned = 0;
-+   }
-+ 
-+   pcache1LeaveMutex(pCache->pGroup);
-+@@ -46848,7 +46874,7 @@ SQLITE_PRIVATE int sqlite3PcacheReleaseMemory(int nReq){
-+ #ifdef SQLITE_PCACHE_SEPARATE_HEADER
-+       nFree += sqlite3MemSize(p);
-+ #endif
-+-      assert( p->isPinned==0 );
-++      assert( PAGE_IS_UNPINNED(p) );
-+       pcache1PinPage(p);
-+       pcache1RemoveFromHash(p, 1);
-+     }
-+@@ -46872,10 +46898,10 @@ SQLITE_PRIVATE void sqlite3PcacheStats(
-+   PgHdr1 *p;
-+   int nRecyclable = 0;
-+   for(p=pcache1.grp.lru.pLruNext; p && !p->isAnchor; p=p->pLruNext){
-+-    assert( p->isPinned==0 );
-++    assert( PAGE_IS_UNPINNED(p) );
-+     nRecyclable++;
-+   }
-+-  *pnCurrent = pcache1.grp.nCurrentPage;
-++  *pnCurrent = pcache1.grp.nPurgeable;
-+   *pnMax = (int)pcache1.grp.nMaxPage;
-+   *pnMin = (int)pcache1.grp.nMinPage;
-+   *pnRecyclable = nRecyclable;
-+@@ -47430,11 +47456,11 @@ SQLITE_PRIVATE int sqlite3RowSetTest(RowSet *pRowSet, int iBatch, sqlite3_int64
-+ 
-+ /* #include "sqliteInt.h" */
-+ 
-+-/* Additional values that can be added to the sync_flags argument of
-+-** sqlite3WalFrames():
-++/* Macros for extracting appropriate sync flags for either transaction
-++** commits (WAL_SYNC_FLAGS(X)) or for checkpoint ops (CKPT_SYNC_FLAGS(X)):
-+ */
-+-#define WAL_SYNC_TRANSACTIONS  0x20   /* Sync at the end of each transaction */
-+-#define SQLITE_SYNC_MASK       0x13   /* Mask off the SQLITE_SYNC_* values */
-++#define WAL_SYNC_FLAGS(X)   ((X)&0x03)
-++#define CKPT_SYNC_FLAGS(X)  (((X)>>2)&0x03)
-+ 
-+ #ifdef SQLITE_OMIT_WAL
-+ # define sqlite3WalOpen(x,y,z)                   0
-+@@ -47667,8 +47693,8 @@ int sqlite3PagerTrace=1;  /* True to enable tracing */
-+ ** associated file-descriptor is returned. FILEHANDLEID() takes an sqlite3_file
-+ ** struct as its argument.
-+ */
-+-#define PAGERID(p) ((int)(p->fd))
-+-#define FILEHANDLEID(fd) ((int)fd)
-++#define PAGERID(p) (SQLITE_PTR_TO_INT(p->fd))
-++#define FILEHANDLEID(fd) (SQLITE_PTR_TO_INT(fd))
-+ 
-+ /*
-+ ** The Pager.eState variable stores the current 'state' of a pager. A
-+@@ -48155,6 +48181,18 @@ struct PagerSavepoint {
-+ **   is set to zero in all other states. In PAGER_ERROR state, Pager.errCode
-+ **   is always set to SQLITE_FULL, SQLITE_IOERR or one of the SQLITE_IOERR_XXX
-+ **   sub-codes.
-++**
-++** syncFlags, walSyncFlags
-++**
-++**   syncFlags is either SQLITE_SYNC_NORMAL (0x02) or SQLITE_SYNC_FULL (0x03).
-++**   syncFlags is used for rollback mode.  walSyncFlags is used for WAL mode
-++**   and contains the flags used to sync the checkpoint operations in the
-++**   lower two bits, and sync flags used for transaction commits in the WAL
-++**   file in bits 0x04 and 0x08.  In other words, to get the correct sync flags
-++**   for checkpoint operations, use (walSyncFlags&0x03) and to get the correct
-++**   sync flags for transaction commit, use ((walSyncFlags>>2)&0x03).  Note
-++**   that with synchronous=NORMAL in WAL mode, transaction commit is not synced
-++**   meaning that the 0x04 and 0x08 bits are both zero.
-+ */
-+ struct Pager {
-+   sqlite3_vfs *pVfs;          /* OS functions to use for IO */
-+@@ -48164,9 +48202,8 @@ struct Pager {
-+   u8 noSync;                  /* Do not sync the journal if true */
-+   u8 fullSync;                /* Do extra syncs of the journal for robustness */
-+   u8 extraSync;               /* sync directory after journal delete */
-+-  u8 ckptSyncFlags;           /* SYNC_NORMAL or SYNC_FULL for checkpoint */
-+-  u8 walSyncFlags;            /* SYNC_NORMAL or SYNC_FULL for wal writes */
-+   u8 syncFlags;               /* SYNC_NORMAL or SYNC_FULL otherwise */
-++  u8 walSyncFlags;            /* See description above */
-+   u8 tempFile;                /* zFilename is a temporary or immutable file */
-+   u8 noLock;                  /* Do not lock (except in WAL mode) */
-+   u8 readOnly;                /* True for a read-only database */
-+@@ -48486,6 +48523,7 @@ static int assert_pager_state(Pager *p){
-+       assert( isOpen(p->jfd)
-+            || p->journalMode==PAGER_JOURNALMODE_OFF
-+            || p->journalMode==PAGER_JOURNALMODE_WAL
-++           || (sqlite3OsDeviceCharacteristics(p->fd)&SQLITE_IOCAP_BATCH_ATOMIC)
-+       );
-+       assert( pPager->dbOrigSize<=pPager->dbHintSize );
-+       break;
-+@@ -48497,6 +48535,7 @@ static int assert_pager_state(Pager *p){
-+       assert( isOpen(p->jfd)
-+            || p->journalMode==PAGER_JOURNALMODE_OFF
-+            || p->journalMode==PAGER_JOURNALMODE_WAL
-++           || (sqlite3OsDeviceCharacteristics(p->fd)&SQLITE_IOCAP_BATCH_ATOMIC)
-+       );
-+       break;
-+ 
-+@@ -48707,34 +48746,47 @@ static int pagerLockDb(Pager *pPager, int eLock){
-+ }
-+ 
-+ /*
-+-** This function determines whether or not the atomic-write optimization
-+-** can be used with this pager. The optimization can be used if:
-++** This function determines whether or not the atomic-write or
-++** atomic-batch-write optimizations can be used with this pager. The
-++** atomic-write optimization can be used if:
-+ **
-+ **  (a) the value returned by OsDeviceCharacteristics() indicates that
-+ **      a database page may be written atomically, and
-+ **  (b) the value returned by OsSectorSize() is less than or equal
-+ **      to the page size.
-+ **
-+-** The optimization is also always enabled for temporary files. It is
-+-** an error to call this function if pPager is opened on an in-memory
-+-** database.
-++** If it can be used, then the value returned is the size of the journal
-++** file when it contains rollback data for exactly one page.
-+ **
-+-** If the optimization cannot be used, 0 is returned. If it can be used,
-+-** then the value returned is the size of the journal file when it
-+-** contains rollback data for exactly one page.
-++** The atomic-batch-write optimization can be used if OsDeviceCharacteristics()
-++** returns a value with the SQLITE_IOCAP_BATCH_ATOMIC bit set. -1 is
-++** returned in this case.
-++**
-++** If neither optimization can be used, 0 is returned.
-+ */
-+-#ifdef SQLITE_ENABLE_ATOMIC_WRITE
-+ static int jrnlBufferSize(Pager *pPager){
-+   assert( !MEMDB );
-+-  if( !pPager->tempFile ){
-+-    int dc;                           /* Device characteristics */
-+-    int nSector;                      /* Sector size */
-+-    int szPage;                       /* Page size */
-+ 
-+-    assert( isOpen(pPager->fd) );
-+-    dc = sqlite3OsDeviceCharacteristics(pPager->fd);
-+-    nSector = pPager->sectorSize;
-+-    szPage = pPager->pageSize;
-++#if defined(SQLITE_ENABLE_ATOMIC_WRITE) \
-++ || defined(SQLITE_ENABLE_BATCH_ATOMIC_WRITE)
-++  int dc;                           /* Device characteristics */
-++
-++  assert( isOpen(pPager->fd) );
-++  dc = sqlite3OsDeviceCharacteristics(pPager->fd);
-++#else
-++  UNUSED_PARAMETER(pPager);
-++#endif
-++
-++#ifdef SQLITE_ENABLE_BATCH_ATOMIC_WRITE
-++  if( dc&SQLITE_IOCAP_BATCH_ATOMIC ){
-++    return -1;
-++  }
-++#endif
-++
-++#ifdef SQLITE_ENABLE_ATOMIC_WRITE
-++  {
-++    int nSector = pPager->sectorSize;
-++    int szPage = pPager->pageSize;
-+ 
-+     assert(SQLITE_IOCAP_ATOMIC512==(512>>8));
-+     assert(SQLITE_IOCAP_ATOMIC64K==(65536>>8));
-+@@ -48744,11 +48796,11 @@ static int jrnlBufferSize(Pager *pPager){
-+   }
-+ 
-+   return JOURNAL_HDR_SZ(pPager) + JOURNAL_PG_SZ(pPager);
-+-}
-+-#else
-+-# define jrnlBufferSize(x) 0
-+ #endif
-+ 
-++  return 0;
-++}
-++
-+ /*
-+ ** If SQLITE_CHECK_PAGES is defined then we do some sanity checking
-+ ** on the cache using a hash function.  This is used for testing
-+@@ -48830,6 +48882,7 @@ static int readMasterJournal(sqlite3_file *pJrnl, char *zMaster, u32 nMaster){
-+    || szJ<16
-+    || SQLITE_OK!=(rc = read32bits(pJrnl, szJ-16, &len))
-+    || len>=nMaster
-++   || len>szJ-16
-+    || len==0
-+    || SQLITE_OK!=(rc = read32bits(pJrnl, szJ-12, &cksum))
-+    || SQLITE_OK!=(rc = sqlite3OsRead(pJrnl, aMagic, 8, szJ-8))
-+@@ -49551,7 +49604,9 @@ static int pager_end_transaction(Pager *pPager, int hasMaster, int bCommit){
-+   }
-+ 
-+   releaseAllSavepoints(pPager);
-+-  assert( isOpen(pPager->jfd) || pPager->pInJournal==0 );
-++  assert( isOpen(pPager->jfd) || pPager->pInJournal==0
-++      || (sqlite3OsDeviceCharacteristics(pPager->fd)&SQLITE_IOCAP_BATCH_ATOMIC)
-++  );
-+   if( isOpen(pPager->jfd) ){
-+     assert( !pagerUseWal(pPager) );
-+ 
-+@@ -50319,6 +50374,7 @@ static int pager_playback(Pager *pPager, int isHot){
-+   char *zMaster = 0;       /* Name of master journal file if any */
-+   int needPagerReset;      /* True to reset page prior to first page rollback */
-+   int nPlayback = 0;       /* Total number of pages restored from journal */
-++  u32 savedPageSize = pPager->pageSize;
-+ 
-+   /* Figure out how many records are in the journal.  Abort early if
-+   ** the journal is empty.
-+@@ -50448,6 +50504,9 @@ static int pager_playback(Pager *pPager, int isHot){
-+   assert( 0 );
-+ 
-+ end_playback:
-++  if( rc==SQLITE_OK ){
-++    rc = sqlite3PagerSetPagesize(pPager, &savedPageSize, -1);
-++  }
-+   /* Following a rollback, the database file should be back in its original
-+   ** state prior to the start of the transaction, so invoke the
-+   ** SQLITE_FCNTL_DB_UNCHANGED file-control method to disable the
-+@@ -50506,7 +50565,8 @@ end_playback:
-+ 
-+ 
-+ /*
-+-** Read the content for page pPg out of the database file and into
-++** Read the content for page pPg out of the database file (or out of
-++** the WAL if that is where the most recent copy if found) into
-+ ** pPg->pData. A shared lock or greater must be held on the database
-+ ** file before this function is called.
-+ **
-+@@ -50516,30 +50576,33 @@ end_playback:
-+ ** If an IO error occurs, then the IO error is returned to the caller.
-+ ** Otherwise, SQLITE_OK is returned.
-+ */
-+-static int readDbPage(PgHdr *pPg, u32 iFrame){
-++static int readDbPage(PgHdr *pPg){
-+   Pager *pPager = pPg->pPager; /* Pager object associated with page pPg */
-+-  Pgno pgno = pPg->pgno;       /* Page number to read */
-+   int rc = SQLITE_OK;          /* Return code */
-+-  int pgsz = pPager->pageSize; /* Number of bytes to read */
-++
-++#ifndef SQLITE_OMIT_WAL
-++  u32 iFrame = 0;              /* Frame of WAL containing pgno */
-+ 
-+   assert( pPager->eState>=PAGER_READER && !MEMDB );
-+   assert( isOpen(pPager->fd) );
-+ 
-+-#ifndef SQLITE_OMIT_WAL
-++  if( pagerUseWal(pPager) ){
-++    rc = sqlite3WalFindFrame(pPager->pWal, pPg->pgno, &iFrame);
-++    if( rc ) return rc;
-++  }
-+   if( iFrame ){
-+-    /* Try to pull the page from the write-ahead log. */
-+-    rc = sqlite3WalReadFrame(pPager->pWal, iFrame, pgsz, pPg->pData);
-++    rc = sqlite3WalReadFrame(pPager->pWal, iFrame,pPager->pageSize,pPg->pData);
-+   }else
-+ #endif
-+   {
-+-    i64 iOffset = (pgno-1)*(i64)pPager->pageSize;
-+-    rc = sqlite3OsRead(pPager->fd, pPg->pData, pgsz, iOffset);
-++    i64 iOffset = (pPg->pgno-1)*(i64)pPager->pageSize;
-++    rc = sqlite3OsRead(pPager->fd, pPg->pData, pPager->pageSize, iOffset);
-+     if( rc==SQLITE_IOERR_SHORT_READ ){
-+       rc = SQLITE_OK;
-+     }
-+   }
-+ 
-+-  if( pgno==1 ){
-++  if( pPg->pgno==1 ){
-+     if( rc ){
-+       /* If the read is unsuccessful, set the dbFileVers[] to something
-+       ** that will never be a valid file version.  dbFileVers[] is a copy
-+@@ -50559,13 +50622,13 @@ static int readDbPage(PgHdr *pPg, u32 iFrame){
-+       memcpy(&pPager->dbFileVers, dbFileVers, sizeof(pPager->dbFileVers));
-+     }
-+   }
-+-  CODEC1(pPager, pPg->pData, pgno, 3, rc = SQLITE_NOMEM_BKPT);
-++  CODEC1(pPager, pPg->pData, pPg->pgno, 3, rc = SQLITE_NOMEM_BKPT);
-+ 
-+   PAGER_INCR(sqlite3_pager_readdb_count);
-+   PAGER_INCR(pPager->nRead);
-+-  IOTRACE(("PGIN %p %d\n", pPager, pgno));
-++  IOTRACE(("PGIN %p %d\n", pPager, pPg->pgno));
-+   PAGERTRACE(("FETCH %d page %d hash(%08x)\n",
-+-               PAGERID(pPager), pgno, pager_pagehash(pPg)));
-++               PAGERID(pPager), pPg->pgno, pager_pagehash(pPg)));
-+ 
-+   return rc;
-+ }
-+@@ -50616,11 +50679,7 @@ static int pagerUndoCallback(void *pCtx, Pgno iPg){
-+     if( sqlite3PcachePageRefcount(pPg)==1 ){
-+       sqlite3PcacheDrop(pPg);
-+     }else{
-+-      u32 iFrame = 0;
-+-      rc = sqlite3WalFindFrame(pPager->pWal, pPg->pgno, &iFrame);
-+-      if( rc==SQLITE_OK ){
-+-        rc = readDbPage(pPg, iFrame);
-+-      }
-++      rc = readDbPage(pPg);
-+       if( rc==SQLITE_OK ){
-+         pPager->xReiniter(pPg);
-+       }
-+@@ -51126,20 +51185,17 @@ SQLITE_PRIVATE void sqlite3PagerSetFlags(
-+   }
-+   if( pPager->noSync ){
-+     pPager->syncFlags = 0;
-+-    pPager->ckptSyncFlags = 0;
-+   }else if( pgFlags & PAGER_FULLFSYNC ){
-+     pPager->syncFlags = SQLITE_SYNC_FULL;
-+-    pPager->ckptSyncFlags = SQLITE_SYNC_FULL;
-+-  }else if( pgFlags & PAGER_CKPT_FULLFSYNC ){
-+-    pPager->syncFlags = SQLITE_SYNC_NORMAL;
-+-    pPager->ckptSyncFlags = SQLITE_SYNC_FULL;
-+   }else{
-+     pPager->syncFlags = SQLITE_SYNC_NORMAL;
-+-    pPager->ckptSyncFlags = SQLITE_SYNC_NORMAL;
-+   }
-+-  pPager->walSyncFlags = pPager->syncFlags;
-++  pPager->walSyncFlags = (pPager->syncFlags<<2);
-+   if( pPager->fullSync ){
-+-    pPager->walSyncFlags |= WAL_SYNC_TRANSACTIONS;
-++    pPager->walSyncFlags |= pPager->syncFlags;
-++  }
-++  if( (pgFlags & PAGER_CKPT_FULLFSYNC) && !pPager->noSync ){
-++    pPager->walSyncFlags |= (SQLITE_SYNC_FULL<<2);
-+   }
-+   if( pgFlags & PAGER_CACHESPILL ){
-+     pPager->doNotSpill &= ~SPILLFLAG_OFF;
-+@@ -51638,7 +51694,7 @@ SQLITE_PRIVATE int sqlite3PagerClose(Pager *pPager, sqlite3 *db){
-+   pPager->exclusiveMode = 0;
-+ #ifndef SQLITE_OMIT_WAL
-+   assert( db || pPager->pWal==0 );
-+-  sqlite3WalClose(pPager->pWal, db, pPager->ckptSyncFlags, pPager->pageSize,
-++  sqlite3WalClose(pPager->pWal, db, pPager->walSyncFlags, pPager->pageSize,
-+       (db && (db->flags & SQLITE_NoCkptOnClose) ? 0 : pTmp)
-+   );
-+   pPager->pWal = 0;
-+@@ -52107,6 +52163,13 @@ static int pagerStress(void *p, PgHdr *pPg){
-+     }
-+   }else{
-+ 
-++#ifdef SQLITE_ENABLE_BATCH_ATOMIC_WRITE
-++    if( pPager->tempFile==0 ){
-++      rc = sqlite3JournalCreate(pPager->jfd);
-++      if( rc!=SQLITE_OK ) return pager_error(pPager, rc);
-++    }
-++#endif
-++
-+     /* Sync the journal file if required. */
-+     if( pPg->flags&PGHDR_NEED_SYNC
-+      || pPager->eState==PAGER_WRITER_CACHEMOD
-+@@ -52439,13 +52502,11 @@ act_like_temp_file:
-+     assert( pPager->extraSync==0 );
-+     assert( pPager->syncFlags==0 );
-+     assert( pPager->walSyncFlags==0 );
-+-    assert( pPager->ckptSyncFlags==0 );
-+   }else{
-+     pPager->fullSync = 1;
-+     pPager->extraSync = 0;
-+     pPager->syncFlags = SQLITE_SYNC_NORMAL;
-+-    pPager->walSyncFlags = SQLITE_SYNC_NORMAL | WAL_SYNC_TRANSACTIONS;
-+-    pPager->ckptSyncFlags = SQLITE_SYNC_NORMAL;
-++    pPager->walSyncFlags = SQLITE_SYNC_NORMAL | (SQLITE_SYNC_NORMAL<<2);
-+   }
-+   /* pPager->pFirst = 0; */
-+   /* pPager->pFirstSynced = 0; */
-+@@ -52865,7 +52926,8 @@ SQLITE_PRIVATE int sqlite3PagerSharedLock(Pager *pPager){
-+ ** nothing to rollback, so this routine is a no-op.
-+ */
-+ static void pagerUnlockIfUnused(Pager *pPager){
-+-  if( pPager->nMmapOut==0 && (sqlite3PcacheRefCount(pPager->pPCache)==0) ){
-++  if( sqlite3PcacheRefCount(pPager->pPCache)==0 ){
-++    assert( pPager->nMmapOut==0 ); /* because page1 is never memory mapped */
-+     pagerUnlockAndRollback(pPager);
-+   }
-+ }
-+@@ -53006,14 +53068,9 @@ static int getPageNormal(
-+       memset(pPg->pData, 0, pPager->pageSize);
-+       IOTRACE(("ZERO %p %d\n", pPager, pgno));
-+     }else{
-+-      u32 iFrame = 0;                 /* Frame to read from WAL file */
-+-      if( pagerUseWal(pPager) ){
-+-        rc = sqlite3WalFindFrame(pPager->pWal, pgno, &iFrame);
-+-        if( rc!=SQLITE_OK ) goto pager_acquire_err;
-+-      }
-+       assert( pPg->pPager==pPager );
-+       pPager->aStat[PAGER_STAT_MISS]++;
-+-      rc = readDbPage(pPg, iFrame);
-++      rc = readDbPage(pPg);
-+       if( rc!=SQLITE_OK ){
-+         goto pager_acquire_err;
-+       }
-+@@ -53156,25 +53213,39 @@ SQLITE_PRIVATE DbPage *sqlite3PagerLookup(Pager *pPager, Pgno pgno){
-+ /*
-+ ** Release a page reference.
-+ **
-+-** If the number of references to the page drop to zero, then the
-+-** page is added to the LRU list.  When all references to all pages
-+-** are released, a rollback occurs and the lock on the database is
-+-** removed.
-++** The sqlite3PagerUnref() and sqlite3PagerUnrefNotNull() may only be
-++** used if we know that the page being released is not the last page.
-++** The btree layer always holds page1 open until the end, so these first
-++** to routines can be used to release any page other than BtShared.pPage1.
-++**
-++** Use sqlite3PagerUnrefPageOne() to release page1.  This latter routine
-++** checks the total number of outstanding pages and if the number of
-++** pages reaches zero it drops the database lock.
-+ */
-+ SQLITE_PRIVATE void sqlite3PagerUnrefNotNull(DbPage *pPg){
-+-  Pager *pPager;
-++  TESTONLY( Pager *pPager = pPg->pPager; )
-+   assert( pPg!=0 );
-+-  pPager = pPg->pPager;
-+   if( pPg->flags & PGHDR_MMAP ){
-++    assert( pPg->pgno!=1 );  /* Page1 is never memory mapped */
-+     pagerReleaseMapPage(pPg);
-+   }else{
-+     sqlite3PcacheRelease(pPg);
-+   }
-+-  pagerUnlockIfUnused(pPager);
-++  /* Do not use this routine to release the last reference to page1 */
-++  assert( sqlite3PcacheRefCount(pPager->pPCache)>0 );
-+ }
-+ SQLITE_PRIVATE void sqlite3PagerUnref(DbPage *pPg){
-+   if( pPg ) sqlite3PagerUnrefNotNull(pPg);
-+ }
-++SQLITE_PRIVATE void sqlite3PagerUnrefPageOne(DbPage *pPg){
-++  Pager *pPager;
-++  assert( pPg!=0 );
-++  assert( pPg->pgno==1 );
-++  assert( (pPg->flags & PGHDR_MMAP)==0 ); /* Page1 is never memory mapped */
-++  pPager = pPg->pPager;
-++  sqlite3PcacheRelease(pPg);
-++  pagerUnlockIfUnused(pPager);
-++}
-+ 
-+ /*
-+ ** This function is called at the start of every write transaction.
-+@@ -53886,6 +53957,21 @@ SQLITE_PRIVATE int sqlite3PagerCommitPhaseOne(
-+         sqlite3PcacheCleanAll(pPager->pPCache);
-+       }
-+     }else{
-++      /* The bBatch boolean is true if the batch-atomic-write commit method
-++      ** should be used.  No rollback journal is created if batch-atomic-write
-++      ** is enabled.
-++      */
-++      sqlite3_file *fd = pPager->fd;
-++#ifdef SQLITE_ENABLE_BATCH_ATOMIC_WRITE
-++      const int bBatch = zMaster==0    /* An SQLITE_IOCAP_BATCH_ATOMIC commit */
-++        && (sqlite3OsDeviceCharacteristics(fd) & SQLITE_IOCAP_BATCH_ATOMIC)
-++        && !pPager->noSync
-++        && sqlite3JournalIsInMemory(pPager->jfd);
-++#else
-++# define bBatch 0
-++#endif
-++
-++#ifdef SQLITE_ENABLE_ATOMIC_WRITE
-+       /* The following block updates the change-counter. Exactly how it
-+       ** does this depends on whether or not the atomic-update optimization
-+       ** was enabled at compile time, and if this transaction meets the
-+@@ -53909,33 +53995,40 @@ SQLITE_PRIVATE int sqlite3PagerCommitPhaseOne(
-+       ** in 'direct' mode. In this case the journal file will never be
-+       ** created for this transaction.
-+       */
-+-  #ifdef SQLITE_ENABLE_ATOMIC_WRITE
-+-      PgHdr *pPg;
-+-      assert( isOpen(pPager->jfd)
-+-           || pPager->journalMode==PAGER_JOURNALMODE_OFF
-+-           || pPager->journalMode==PAGER_JOURNALMODE_WAL
-+-      );
-+-      if( !zMaster && isOpen(pPager->jfd)
-+-       && pPager->journalOff==jrnlBufferSize(pPager)
-+-       && pPager->dbSize>=pPager->dbOrigSize
-+-       && (0==(pPg = sqlite3PcacheDirtyList(pPager->pPCache)) || 0==pPg->pDirty)
-+-      ){
-+-        /* Update the db file change counter via the direct-write method. The
-+-        ** following call will modify the in-memory representation of page 1
-+-        ** to include the updated change counter and then write page 1
-+-        ** directly to the database file. Because of the atomic-write
-+-        ** property of the host file-system, this is safe.
-+-        */
-+-        rc = pager_incr_changecounter(pPager, 1);
-+-      }else{
-+-        rc = sqlite3JournalCreate(pPager->jfd);
-+-        if( rc==SQLITE_OK ){
-+-          rc = pager_incr_changecounter(pPager, 0);
-++      if( bBatch==0 ){
-++        PgHdr *pPg;
-++        assert( isOpen(pPager->jfd)
-++            || pPager->journalMode==PAGER_JOURNALMODE_OFF
-++            || pPager->journalMode==PAGER_JOURNALMODE_WAL
-++            );
-++        if( !zMaster && isOpen(pPager->jfd)
-++         && pPager->journalOff==jrnlBufferSize(pPager)
-++         && pPager->dbSize>=pPager->dbOrigSize
-++         && (!(pPg = sqlite3PcacheDirtyList(pPager->pPCache)) || 0==pPg->pDirty)
-++        ){
-++          /* Update the db file change counter via the direct-write method. The
-++          ** following call will modify the in-memory representation of page 1
-++          ** to include the updated change counter and then write page 1
-++          ** directly to the database file. Because of the atomic-write
-++          ** property of the host file-system, this is safe.
-++          */
-++          rc = pager_incr_changecounter(pPager, 1);
-++        }else{
-++          rc = sqlite3JournalCreate(pPager->jfd);
-++          if( rc==SQLITE_OK ){
-++            rc = pager_incr_changecounter(pPager, 0);
-++          }
-+         }
-+       }
-+-  #else
-++#else
-++#ifdef SQLITE_ENABLE_BATCH_ATOMIC_WRITE
-++      if( zMaster ){
-++        rc = sqlite3JournalCreate(pPager->jfd);
-++        if( rc!=SQLITE_OK ) goto commit_phase_one_exit;
-++      }
-++#endif
-+       rc = pager_incr_changecounter(pPager, 0);
-+-  #endif
-++#endif
-+       if( rc!=SQLITE_OK ) goto commit_phase_one_exit;
-+ 
-+       /* Write the master journal name into the journal file. If a master
-+@@ -53959,7 +54052,23 @@ SQLITE_PRIVATE int sqlite3PagerCommitPhaseOne(
-+       rc = syncJournal(pPager, 0);
-+       if( rc!=SQLITE_OK ) goto commit_phase_one_exit;
-+ 
-++      if( bBatch ){
-++        /* The pager is now in DBMOD state. But regardless of what happens
-++        ** next, attempting to play the journal back into the database would
-++        ** be unsafe. Close it now to make sure that does not happen.  */
-++        sqlite3OsClose(pPager->jfd);
-++        rc = sqlite3OsFileControl(fd, SQLITE_FCNTL_BEGIN_ATOMIC_WRITE, 0);
-++        if( rc!=SQLITE_OK ) goto commit_phase_one_exit;
-++      }
-+       rc = pager_write_pagelist(pPager,sqlite3PcacheDirtyList(pPager->pPCache));
-++      if( bBatch ){
-++        if( rc==SQLITE_OK ){
-++          rc = sqlite3OsFileControl(fd, SQLITE_FCNTL_COMMIT_ATOMIC_WRITE, 0);
-++        }else{
-++          sqlite3OsFileControl(fd, SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE, 0);
-++        }
-++      }
-++
-+       if( rc!=SQLITE_OK ){
-+         assert( rc!=SQLITE_IOERR_BLOCKED );
-+         goto commit_phase_one_exit;
-+@@ -54860,7 +54969,7 @@ SQLITE_PRIVATE int sqlite3PagerCheckpoint(
-+     rc = sqlite3WalCheckpoint(pPager->pWal, db, eMode,
-+         (eMode==SQLITE_CHECKPOINT_PASSIVE ? 0 : pPager->xBusyHandler),
-+         pPager->pBusyHandlerArg,
-+-        pPager->ckptSyncFlags, pPager->pageSize, (u8 *)pPager->pTmpSpace,
-++        pPager->walSyncFlags, pPager->pageSize, (u8 *)pPager->pTmpSpace,
-+         pnLog, pnCkpt
-+     );
-+   }
-+@@ -55017,7 +55126,7 @@ SQLITE_PRIVATE int sqlite3PagerCloseWal(Pager *pPager, sqlite3 *db){
-+   if( rc==SQLITE_OK && pPager->pWal ){
-+     rc = pagerExclusiveLock(pPager);
-+     if( rc==SQLITE_OK ){
-+-      rc = sqlite3WalClose(pPager->pWal, db, pPager->ckptSyncFlags,
-++      rc = sqlite3WalClose(pPager->pWal, db, pPager->walSyncFlags,
-+                            pPager->pageSize, (u8*)pPager->pTmpSpace);
-+       pPager->pWal = 0;
-+       pagerFixMaplimit(pPager);
-+@@ -56889,9 +56998,7 @@ static int walCheckpoint(
-+       pInfo->nBackfillAttempted = mxSafeFrame;
-+ 
-+       /* Sync the WAL to disk */
-+-      if( sync_flags ){
-+-        rc = sqlite3OsSync(pWal->pWalFd, sync_flags);
-+-      }
-++      rc = sqlite3OsSync(pWal->pWalFd, CKPT_SYNC_FLAGS(sync_flags));
-+ 
-+       /* If the database may grow as a result of this checkpoint, hint
-+       ** about the eventual size of the db file to the VFS layer.
-+@@ -56932,8 +57039,8 @@ static int walCheckpoint(
-+           i64 szDb = pWal->hdr.nPage*(i64)szPage;
-+           testcase( IS_BIG_INT(szDb) );
-+           rc = sqlite3OsTruncate(pWal->pDbFd, szDb);
-+-          if( rc==SQLITE_OK && sync_flags ){
-+-            rc = sqlite3OsSync(pWal->pDbFd, sync_flags);
-++          if( rc==SQLITE_OK ){
-++            rc = sqlite3OsSync(pWal->pDbFd, CKPT_SYNC_FLAGS(sync_flags));
-+           }
-+         }
-+         if( rc==SQLITE_OK ){
-+@@ -58039,8 +58146,8 @@ static int walWriteToLog(
-+     iOffset += iFirstAmt;
-+     iAmt -= iFirstAmt;
-+     pContent = (void*)(iFirstAmt + (char*)pContent);
-+-    assert( p->syncFlags & (SQLITE_SYNC_NORMAL|SQLITE_SYNC_FULL) );
-+-    rc = sqlite3OsSync(p->pFd, p->syncFlags & SQLITE_SYNC_MASK);
-++    assert( WAL_SYNC_FLAGS(p->syncFlags)!=0 );
-++    rc = sqlite3OsSync(p->pFd, WAL_SYNC_FLAGS(p->syncFlags));
-+     if( iAmt==0 || rc ) return rc;
-+   }
-+   rc = sqlite3OsWrite(p->pFd, pContent, iAmt, iOffset);
-+@@ -58210,10 +58317,10 @@ SQLITE_PRIVATE int sqlite3WalFrames(
-+     ** an out-of-order write following a WAL restart could result in
-+     ** database corruption.  See the ticket:
-+     **
-+-    **     http://localhost:591/sqlite/info/ff5be73dee
-++    **     https://sqlite.org/src/info/ff5be73dee
-+     */
-+-    if( pWal->syncHeader && sync_flags ){
-+-      rc = sqlite3OsSync(pWal->pWalFd, sync_flags & SQLITE_SYNC_MASK);
-++    if( pWal->syncHeader ){
-++      rc = sqlite3OsSync(pWal->pWalFd, CKPT_SYNC_FLAGS(sync_flags));
-+       if( rc ) return rc;
-+     }
-+   }
-+@@ -58288,7 +58395,7 @@ SQLITE_PRIVATE int sqlite3WalFrames(
-+   ** sector boundary is synced; the part of the last frame that extends
-+   ** past the sector boundary is written after the sync.
-+   */
-+-  if( isCommit && (sync_flags & WAL_SYNC_TRANSACTIONS)!=0 ){
-++  if( isCommit && WAL_SYNC_FLAGS(sync_flags)!=0 ){
-+     int bSync = 1;
-+     if( pWal->padToSectorBoundary ){
-+       int sectorSize = sqlite3SectorSize(pWal->pWalFd);
-+@@ -58304,7 +58411,7 @@ SQLITE_PRIVATE int sqlite3WalFrames(
-+     }
-+     if( bSync ){
-+       assert( rc==SQLITE_OK );
-+-      rc = sqlite3OsSync(w.pFd, sync_flags & SQLITE_SYNC_MASK);
-++      rc = sqlite3OsSync(w.pFd, WAL_SYNC_FLAGS(sync_flags));
-+     }
-+   }
-+ 
-+@@ -59152,6 +59259,11 @@ struct CellInfo {
-+ **    eState==FAULT:                   Cursor fault with skipNext as error code.
-+ */
-+ struct BtCursor {
-++  u8 eState;                /* One of the CURSOR_XXX constants (see below) */
-++  u8 curFlags;              /* zero or more BTCF_* flags defined below */
-++  u8 curPagerFlags;         /* Flags to send to sqlite3PagerGet() */
-++  u8 hints;                 /* As configured by CursorSetHints() */
-++  int nOvflAlloc;           /* Allocated size of aOverflow[] array */
-+   Btree *pBtree;            /* The Btree to which this cursor belongs */
-+   BtShared *pBt;            /* The BtShared this cursor points to */
-+   BtCursor *pNext;          /* Forms a linked list of all cursors */
-+@@ -59160,13 +59272,8 @@ struct BtCursor {
-+   i64 nKey;                 /* Size of pKey, or last integer key */
-+   void *pKey;               /* Saved key that was cursor last known position */
-+   Pgno pgnoRoot;            /* The root page of this tree */
-+-  int nOvflAlloc;           /* Allocated size of aOverflow[] array */
-+   int skipNext;    /* Prev() is noop if negative. Next() is noop if positive.
-+                    ** Error code if eState==CURSOR_FAULT */
-+-  u8 curFlags;              /* zero or more BTCF_* flags defined below */
-+-  u8 curPagerFlags;         /* Flags to send to sqlite3PagerGet() */
-+-  u8 eState;                /* One of the CURSOR_XXX constants (see below) */
-+-  u8 hints;                 /* As configured by CursorSetHints() */
-+   /* All fields above are zeroed when the cursor is allocated.  See
-+   ** sqlite3BtreeCursorZero().  Fields that follow must be manually
-+   ** initialized. */
-+@@ -59175,7 +59282,8 @@ struct BtCursor {
-+   u16 ix;                   /* Current index for apPage[iPage] */
-+   u16 aiIdx[BTCURSOR_MAX_DEPTH-1];     /* Current index in apPage[i] */
-+   struct KeyInfo *pKeyInfo;            /* Arg passed to comparison function */
-+-  MemPage *apPage[BTCURSOR_MAX_DEPTH]; /* Pages from root to current page */
-++  MemPage *pPage;                        /* Current page */
-++  MemPage *apPage[BTCURSOR_MAX_DEPTH-1]; /* Stack of parents of current page */
-+ };
-+ 
-+ /*
-+@@ -60091,7 +60199,9 @@ static void downgradeAllSharedCacheTableLocks(Btree *p){
-+ 
-+ #endif /* SQLITE_OMIT_SHARED_CACHE */
-+ 
-+-static void releasePage(MemPage *pPage);  /* Forward reference */
-++static void releasePage(MemPage *pPage);         /* Forward reference */
-++static void releasePageOne(MemPage *pPage);      /* Forward reference */
-++static void releasePageNotNull(MemPage *pPage);  /* Forward reference */
-+ 
-+ /*
-+ ***** This routine is used inside of assert() only ****
-+@@ -60250,11 +60360,13 @@ static void btreeClearHasContent(BtShared *pBt){
-+ */
-+ static void btreeReleaseAllCursorPages(BtCursor *pCur){
-+   int i;
-+-  for(i=0; i<=pCur->iPage; i++){
-+-    releasePage(pCur->apPage[i]);
-+-    pCur->apPage[i] = 0;
-++  if( pCur->iPage>=0 ){
-++    for(i=0; i<pCur->iPage; i++){
-++      releasePageNotNull(pCur->apPage[i]);
-++    }
-++    releasePageNotNull(pCur->pPage);
-++    pCur->iPage = -1;
-+   }
-+-  pCur->iPage = -1;
-+ }
-+ 
-+ /*
-+@@ -60383,7 +60495,7 @@ static int SQLITE_NOINLINE saveCursorsOnList(
-+           return rc;
-+         }
-+       }else{
-+-        testcase( p->iPage>0 );
-++        testcase( p->iPage>=0 );
-+         btreeReleaseAllCursorPages(p);
-+       }
-+     }
-+@@ -60423,7 +60535,7 @@ static int btreeMoveto(
-+     if( pIdxKey==0 ) return SQLITE_NOMEM_BKPT;
-+     sqlite3VdbeRecordUnpack(pCur->pKeyInfo, (int)nKey, pKey, pIdxKey);
-+     if( pIdxKey->nField==0 ){
-+-      rc = SQLITE_CORRUPT_PGNO(pCur->apPage[pCur->iPage]->pgno);
-++      rc = SQLITE_CORRUPT_BKPT;
-+       goto moveto_done;
-+     }
-+   }else{
-+@@ -60488,6 +60600,17 @@ SQLITE_PRIVATE int sqlite3BtreeCursorHasMoved(BtCursor *pCur){
-+ }
-+ 
-+ /*
-++** Return a pointer to a fake BtCursor object that will always answer
-++** false to the sqlite3BtreeCursorHasMoved() routine above.  The fake
-++** cursor returned must not be used with any other Btree interface.
-++*/
-++SQLITE_PRIVATE BtCursor *sqlite3BtreeFakeValidCursor(void){
-++  static u8 fakeCursor = CURSOR_VALID;
-++  assert( offsetof(BtCursor, eState)==0 );
-++  return (BtCursor*)&fakeCursor;
-++}
-++
-++/*
-+ ** This routine restores a cursor back to its original position after it
-+ ** has been moved by some outside activity (such as a btree rebalance or
-+ ** a row having been deleted out from under the cursor).
-+@@ -61036,8 +61159,11 @@ static int defragmentPage(MemPage *pPage, int nMaxFrag){
-+         int sz2 = 0;
-+         int sz = get2byte(&data[iFree+2]);
-+         int top = get2byte(&data[hdr+5]);
-++        if( top>=iFree ){
-++          return SQLITE_CORRUPT_PGNO(pPage->pgno);
-++        }
-+         if( iFree2 ){
-+-          if( iFree+sz>iFree2 ) return SQLITE_CORRUPT_PGNO(pPage->pgno);
-++          assert( iFree+sz<=iFree2 ); /* Verified by pageFindSlot() */
-+           sz2 = get2byte(&data[iFree2+2]);
-+           assert( iFree+sz+sz2+iFree2-(iFree+sz) <= usableSize );
-+           memmove(&data[iFree+sz+sz2], &data[iFree+sz], iFree2-(iFree+sz));
-+@@ -61126,16 +61252,10 @@ static u8 *pageFindSlot(MemPage *pPg, int nByte, int *pRc){
-+   int pc = get2byte(&aData[iAddr]);
-+   int x;
-+   int usableSize = pPg->pBt->usableSize;
-++  int size;            /* Size of the free slot */
-+ 
-+   assert( pc>0 );
-+-  do{
-+-    int size;            /* Size of the free slot */
-+-    /* EVIDENCE-OF: R-06866-39125 Freeblocks are always connected in order of
-+-    ** increasing offset. */
-+-    if( pc>usableSize-4 || pc<iAddr+4 ){
-+-      *pRc = SQLITE_CORRUPT_PGNO(pPg->pgno);
-+-      return 0;
-+-    }
-++  while( pc<=usableSize-4 ){
-+     /* EVIDENCE-OF: R-22710-53328 The third and fourth bytes of each
-+     ** freeblock form a big-endian integer which is the size of the freeblock
-+     ** in bytes, including the 4-byte header. */
-+@@ -61143,7 +61263,7 @@ static u8 *pageFindSlot(MemPage *pPg, int nByte, int *pRc){
-+     if( (x = size - nByte)>=0 ){
-+       testcase( x==4 );
-+       testcase( x==3 );
-+-      if( pc < pPg->cellOffset+2*pPg->nCell || size+pc > usableSize ){
-++      if( size+pc > usableSize ){
-+         *pRc = SQLITE_CORRUPT_PGNO(pPg->pgno);
-+         return 0;
-+       }else if( x<4 ){
-+@@ -61164,7 +61284,11 @@ static u8 *pageFindSlot(MemPage *pPg, int nByte, int *pRc){
-+     }
-+     iAddr = pc;
-+     pc = get2byte(&aData[pc]);
-+-  }while( pc );
-++    if( pc<iAddr+size ) break;
-++  }
-++  if( pc ){
-++    *pRc = SQLITE_CORRUPT_PGNO(pPg->pgno);
-++  }
-+ 
-+   return 0;
-+ }
-+@@ -61278,7 +61402,7 @@ static int freeSpace(MemPage *pPage, u16 iStart, u16 iSize){
-+   u8 hdr;                               /* Page header size.  0 or 100 */
-+   u8 nFrag = 0;                         /* Reduction in fragmentation */
-+   u16 iOrigSize = iSize;                /* Original value of iSize */
-+-  u32 iLast = pPage->pBt->usableSize-4; /* Largest possible freeblock offset */
-++  u16 x;                                /* Offset to cell content area */
-+   u32 iEnd = iStart + iSize;            /* First byte past the iStart buffer */
-+   unsigned char *data = pPage->aData;   /* Page content */
-+ 
-+@@ -61288,13 +61412,7 @@ static int freeSpace(MemPage *pPage, u16 iStart, u16 iSize){
-+   assert( CORRUPT_DB || iEnd <= pPage->pBt->usableSize );
-+   assert( sqlite3_mutex_held(pPage->pBt->mutex) );
-+   assert( iSize>=4 );   /* Minimum cell size is 4 */
-+-  assert( iStart<=iLast );
-+-
-+-  /* Overwrite deleted information with zeros when the secure_delete
-+-  ** option is enabled */
-+-  if( pPage->pBt->btsFlags & BTS_FAST_SECURE ){
-+-    memset(&data[iStart], 0, iSize);
-+-  }
-++  assert( iStart<=pPage->pBt->usableSize-4 );
-+ 
-+   /* The list of freeblocks must be in ascending order.  Find the
-+   ** spot on the list where iStart should be inserted.
-+@@ -61311,7 +61429,9 @@ static int freeSpace(MemPage *pPage, u16 iStart, u16 iSize){
-+       }
-+       iPtr = iFreeBlk;
-+     }
-+-    if( iFreeBlk>iLast ) return SQLITE_CORRUPT_PGNO(pPage->pgno);
-++    if( iFreeBlk>pPage->pBt->usableSize-4 ){
-++      return SQLITE_CORRUPT_PGNO(pPage->pgno);
-++    }
-+     assert( iFreeBlk>iPtr || iFreeBlk==0 );
-+ 
-+     /* At this point:
-+@@ -61347,19 +61467,25 @@ static int freeSpace(MemPage *pPage, u16 iStart, u16 iSize){
-+     if( nFrag>data[hdr+7] ) return SQLITE_CORRUPT_PGNO(pPage->pgno);
-+     data[hdr+7] -= nFrag;
-+   }
-+-  if( iStart==get2byte(&data[hdr+5]) ){
-++  x = get2byte(&data[hdr+5]);
-++  if( iStart<=x ){
-+     /* The new freeblock is at the beginning of the cell content area,
-+     ** so just extend the cell content area rather than create another
-+     ** freelist entry */
-+-    if( iPtr!=hdr+1 ) return SQLITE_CORRUPT_PGNO(pPage->pgno);
-++    if( iStart<x || iPtr!=hdr+1 ) return SQLITE_CORRUPT_PGNO(pPage->pgno);
-+     put2byte(&data[hdr+1], iFreeBlk);
-+     put2byte(&data[hdr+5], iEnd);
-+   }else{
-+     /* Insert the new freeblock into the freelist */
-+     put2byte(&data[iPtr], iStart);
-+-    put2byte(&data[iStart], iFreeBlk);
-+-    put2byte(&data[iStart+2], iSize);
-+   }
-++  if( pPage->pBt->btsFlags & BTS_FAST_SECURE ){
-++    /* Overwrite deleted information with zeros when the secure_delete
-++    ** option is enabled */
-++    memset(&data[iStart], 0, iSize);
-++  }
-++  put2byte(&data[iStart], iFreeBlk);
-++  put2byte(&data[iStart+2], iSize);
-+   pPage->nFree += iOrigSize;
-+   return SQLITE_OK;
-+ }
-+@@ -61674,7 +61800,7 @@ static Pgno btreePagecount(BtShared *pBt){
-+ }
-+ SQLITE_PRIVATE u32 sqlite3BtreeLastPage(Btree *p){
-+   assert( sqlite3BtreeHoldsMutex(p) );
-+-  assert( ((p->pBt->nPage)&0x8000000)==0 );
-++  assert( ((p->pBt->nPage)&0x80000000)==0 );
-+   return btreePagecount(p->pBt);
-+ }
-+ 
-+@@ -61701,7 +61827,7 @@ static int getAndInitPage(
-+   int rc;
-+   DbPage *pDbPage;
-+   assert( sqlite3_mutex_held(pBt->mutex) );
-+-  assert( pCur==0 || ppPage==&pCur->apPage[pCur->iPage] );
-++  assert( pCur==0 || ppPage==&pCur->pPage );
-+   assert( pCur==0 || bReadOnly==pCur->curPagerFlags );
-+   assert( pCur==0 || pCur->iPage>0 );
-+ 
-+@@ -61735,7 +61861,10 @@ static int getAndInitPage(
-+   return SQLITE_OK;
-+ 
-+ getAndInitPage_error:
-+-  if( pCur ) pCur->iPage--;
-++  if( pCur ){
-++    pCur->iPage--;
-++    pCur->pPage = pCur->apPage[pCur->iPage];
-++  }
-+   testcase( pgno==0 );
-+   assert( pgno!=0 || rc==SQLITE_CORRUPT );
-+   return rc;
-+@@ -61744,6 +61873,8 @@ getAndInitPage_error:
-+ /*
-+ ** Release a MemPage.  This should be called once for each prior
-+ ** call to btreeGetPage.
-++**
-++** Page1 is a special case and must be released using releasePageOne().
-+ */
-+ static void releasePageNotNull(MemPage *pPage){
-+   assert( pPage->aData );
-+@@ -61757,6 +61888,16 @@ static void releasePageNotNull(MemPage *pPage){
-+ static void releasePage(MemPage *pPage){
-+   if( pPage ) releasePageNotNull(pPage);
-+ }
-++static void releasePageOne(MemPage *pPage){
-++  assert( pPage!=0 );
-++  assert( pPage->aData );
-++  assert( pPage->pBt );
-++  assert( pPage->pDbPage!=0 );
-++  assert( sqlite3PagerGetExtra(pPage->pDbPage) == (void*)pPage );
-++  assert( sqlite3PagerGetData(pPage->pDbPage)==pPage->aData );
-++  assert( sqlite3_mutex_held(pPage->pBt->mutex) );
-++  sqlite3PagerUnrefPageOne(pPage->pDbPage);
-++}
-+ 
-+ /*
-+ ** Get an unused page.
-+@@ -62541,7 +62682,8 @@ SQLITE_PRIVATE int sqlite3BtreeGetAutoVacuum(Btree *p){
-+ ** set to the value passed to this function as the second parameter,
-+ ** set it so.
-+ */
-+-#if SQLITE_DEFAULT_SYNCHRONOUS!=SQLITE_DEFAULT_WAL_SYNCHRONOUS
-++#if SQLITE_DEFAULT_SYNCHRONOUS!=SQLITE_DEFAULT_WAL_SYNCHRONOUS \
-++    && !defined(SQLITE_OMIT_WAL)
-+ static void setDefaultSyncFlag(BtShared *pBt, u8 safety_level){
-+   sqlite3 *db;
-+   Db *pDb;
-+@@ -62675,7 +62817,7 @@ static int lockBtree(BtShared *pBt){
-+       }else{
-+         setDefaultSyncFlag(pBt, SQLITE_DEFAULT_WAL_SYNCHRONOUS+1);
-+         if( isOpen==0 ){
-+-          releasePage(pPage1);
-++          releasePageOne(pPage1);
-+           return SQLITE_OK;
-+         }
-+       }
-+@@ -62722,7 +62864,7 @@ static int lockBtree(BtShared *pBt){
-+       ** zero and return SQLITE_OK. The caller will call this function
-+       ** again with the correct page-size.
-+       */
-+-      releasePage(pPage1);
-++      releasePageOne(pPage1);
-+       pBt->usableSize = usableSize;
-+       pBt->pageSize = pageSize;
-+       freeTempSpace(pBt);
-+@@ -62776,7 +62918,7 @@ static int lockBtree(BtShared *pBt){
-+   return SQLITE_OK;
-+ 
-+ page1_init_failed:
-+-  releasePage(pPage1);
-++  releasePageOne(pPage1);
-+   pBt->pPage1 = 0;
-+   return rc;
-+ }
-+@@ -62821,7 +62963,7 @@ static void unlockBtreeIfUnused(BtShared *pBt){
-+     assert( pPage1->aData );
-+     assert( sqlite3PagerRefcount(pBt->pPager)==1 );
-+     pBt->pPage1 = 0;
-+-    releasePageNotNull(pPage1);
-++    releasePageOne(pPage1);
-+   }
-+ }
-+ 
-+@@ -63687,7 +63829,6 @@ SQLITE_PRIVATE int sqlite3BtreeTripAllCursors(Btree *pBtree, int errCode, int wr
-+   if( pBtree ){
-+     sqlite3BtreeEnter(pBtree);
-+     for(p=pBtree->pBt->pCursor; p; p=p->pNext){
-+-      int i;
-+       if( writeOnly && (p->curFlags & BTCF_WriteFlag)==0 ){
-+         if( p->eState==CURSOR_VALID || p->eState==CURSOR_SKIPNEXT ){
-+           rc = saveCursorPosition(p);
-+@@ -63701,10 +63842,7 @@ SQLITE_PRIVATE int sqlite3BtreeTripAllCursors(Btree *pBtree, int errCode, int wr
-+         p->eState = CURSOR_FAULT;
-+         p->skipNext = errCode;
-+       }
-+-      for(i=0; i<=p->iPage; i++){
-+-        releasePage(p->apPage[i]);
-+-        p->apPage[i] = 0;
-+-      }
-++      btreeReleaseAllCursorPages(p);
-+     }
-+     sqlite3BtreeLeave(pBtree);
-+   }
-+@@ -63761,7 +63899,7 @@ SQLITE_PRIVATE int sqlite3BtreeRollback(Btree *p, int tripCode, int writeOnly){
-+       if( nPage==0 ) sqlite3PagerPagecount(pBt->pPager, &nPage);
-+       testcase( pBt->nPage!=nPage );
-+       pBt->nPage = nPage;
-+-      releasePage(pPage1);
-++      releasePageOne(pPage1);
-+     }
-+     assert( countValidCursors(pBt, 1)==0 );
-+     pBt->inTransaction = TRANS_READ;
-+@@ -64003,10 +64141,8 @@ SQLITE_PRIVATE void sqlite3BtreeCursorZero(BtCursor *p){
-+ SQLITE_PRIVATE int sqlite3BtreeCloseCursor(BtCursor *pCur){
-+   Btree *pBtree = pCur->pBtree;
-+   if( pBtree ){
-+-    int i;
-+     BtShared *pBt = pCur->pBt;
-+     sqlite3BtreeEnter(pBtree);
-+-    sqlite3BtreeClearCursor(pCur);
-+     assert( pBt->pCursor!=0 );
-+     if( pBt->pCursor==pCur ){
-+       pBt->pCursor = pCur->pNext;
-+@@ -64020,12 +64156,10 @@ SQLITE_PRIVATE int sqlite3BtreeCloseCursor(BtCursor *pCur){
-+         pPrev = pPrev->pNext;
-+       }while( ALWAYS(pPrev) );
-+     }
-+-    for(i=0; i<=pCur->iPage; i++){
-+-      releasePage(pCur->apPage[i]);
-+-    }
-++    btreeReleaseAllCursorPages(pCur);
-+     unlockBtreeIfUnused(pBt);
-+     sqlite3_free(pCur->aOverflow);
-+-    /* sqlite3_free(pCur); */
-++    sqlite3_free(pCur->pKey);
-+     sqlite3BtreeLeave(pBtree);
-+   }
-+   return SQLITE_OK;
-+@@ -64042,9 +64176,8 @@ SQLITE_PRIVATE int sqlite3BtreeCloseCursor(BtCursor *pCur){
-+ #ifndef NDEBUG
-+   static void assertCellInfo(BtCursor *pCur){
-+     CellInfo info;
-+-    int iPage = pCur->iPage;
-+     memset(&info, 0, sizeof(info));
-+-    btreeParseCell(pCur->apPage[iPage], pCur->ix, &info);
-++    btreeParseCell(pCur->pPage, pCur->ix, &info);
-+     assert( CORRUPT_DB || memcmp(&info, &pCur->info, sizeof(info))==0 );
-+   }
-+ #else
-+@@ -64052,9 +64185,8 @@ SQLITE_PRIVATE int sqlite3BtreeCloseCursor(BtCursor *pCur){
-+ #endif
-+ static SQLITE_NOINLINE void getCellInfo(BtCursor *pCur){
-+   if( pCur->info.nSize==0 ){
-+-    int iPage = pCur->iPage;
-+     pCur->curFlags |= BTCF_ValidNKey;
-+-    btreeParseCell(pCur->apPage[iPage],pCur->ix,&pCur->info);
-++    btreeParseCell(pCur->pPage,pCur->ix,&pCur->info);
-+   }else{
-+     assertCellInfo(pCur);
-+   }
-+@@ -64252,7 +64384,7 @@ static int accessPayload(
-+   unsigned char *aPayload;
-+   int rc = SQLITE_OK;
-+   int iIdx = 0;
-+-  MemPage *pPage = pCur->apPage[pCur->iPage]; /* Btree page of current entry */
-++  MemPage *pPage = pCur->pPage;               /* Btree page of current entry */
-+   BtShared *pBt = pCur->pBt;                  /* Btree this cursor belongs to */
-+ #ifdef SQLITE_DIRECT_OVERFLOW_READ
-+   unsigned char * const pBufStart = pBuf;     /* Start of original out buffer */
-+@@ -64448,8 +64580,8 @@ static int accessPayload(
-+ SQLITE_PRIVATE int sqlite3BtreePayload(BtCursor *pCur, u32 offset, u32 amt, void *pBuf){
-+   assert( cursorHoldsMutex(pCur) );
-+   assert( pCur->eState==CURSOR_VALID );
-+-  assert( pCur->iPage>=0 && pCur->apPage[pCur->iPage] );
-+-  assert( pCur->ix<pCur->apPage[pCur->iPage]->nCell );
-++  assert( pCur->iPage>=0 && pCur->pPage );
-++  assert( pCur->ix<pCur->pPage->nCell );
-+   return accessPayload(pCur, offset, amt, (unsigned char*)pBuf, 0);
-+ }
-+ 
-+@@ -64506,18 +64638,23 @@ static const void *fetchPayload(
-+   BtCursor *pCur,      /* Cursor pointing to entry to read from */
-+   u32 *pAmt            /* Write the number of available bytes here */
-+ ){
-+-  u32 amt;
-+-  assert( pCur!=0 && pCur->iPage>=0 && pCur->apPage[pCur->iPage]);
-++  int amt;
-++  assert( pCur!=0 && pCur->iPage>=0 && pCur->pPage);
-+   assert( pCur->eState==CURSOR_VALID );
-+   assert( sqlite3_mutex_held(pCur->pBtree->db->mutex) );
-+   assert( cursorOwnsBtShared(pCur) );
-+-  assert( pCur->ix<pCur->apPage[pCur->iPage]->nCell );
-++  assert( pCur->ix<pCur->pPage->nCell );
-+   assert( pCur->info.nSize>0 );
-+-  assert( pCur->info.pPayload>pCur->apPage[pCur->iPage]->aData || CORRUPT_DB );
-+-  assert( pCur->info.pPayload<pCur->apPage[pCur->iPage]->aDataEnd ||CORRUPT_DB);
-+-  amt = (int)(pCur->apPage[pCur->iPage]->aDataEnd - pCur->info.pPayload);
-+-  if( pCur->info.nLocal<amt ) amt = pCur->info.nLocal;
-+-  *pAmt = amt;
-++  assert( pCur->info.pPayload>pCur->pPage->aData || CORRUPT_DB );
-++  assert( pCur->info.pPayload<pCur->pPage->aDataEnd ||CORRUPT_DB);
-++  amt = pCur->info.nLocal;
-++  if( amt>(int)(pCur->pPage->aDataEnd - pCur->info.pPayload) ){
-++    /* There is too little space on the page for the expected amount
-++    ** of local content. Database must be corrupt. */
-++    assert( CORRUPT_DB );
-++    amt = MAX(0, (int)(pCur->pPage->aDataEnd - pCur->info.pPayload));
-++  }
-++  *pAmt = (u32)amt;
-+   return (void*)pCur->info.pPayload;
-+ }
-+ 
-+@@ -64562,10 +64699,11 @@ static int moveToChild(BtCursor *pCur, u32 newPgno){
-+   }
-+   pCur->info.nSize = 0;
-+   pCur->curFlags &= ~(BTCF_ValidNKey|BTCF_ValidOvfl);
-+-  pCur->aiIdx[pCur->iPage++] = pCur->ix;
-++  pCur->aiIdx[pCur->iPage] = pCur->ix;
-++  pCur->apPage[pCur->iPage] = pCur->pPage;
-+   pCur->ix = 0;
-+-  return getAndInitPage(pBt, newPgno, &pCur->apPage[pCur->iPage],
-+-                        pCur, pCur->curPagerFlags);
-++  pCur->iPage++;
-++  return getAndInitPage(pBt, newPgno, &pCur->pPage, pCur, pCur->curPagerFlags);
-+ }
-+ 
-+ #ifdef SQLITE_DEBUG
-+@@ -64599,20 +64737,23 @@ static void assertParentIndex(MemPage *pParent, int iIdx, Pgno iChild){
-+ ** the largest cell index.
-+ */
-+ static void moveToParent(BtCursor *pCur){
-++  MemPage *pLeaf;
-+   assert( cursorOwnsBtShared(pCur) );
-+   assert( pCur->eState==CURSOR_VALID );
-+   assert( pCur->iPage>0 );
-+-  assert( pCur->apPage[pCur->iPage] );
-++  assert( pCur->pPage );
-+   assertParentIndex(
-+     pCur->apPage[pCur->iPage-1],
-+     pCur->aiIdx[pCur->iPage-1],
-+-    pCur->apPage[pCur->iPage]->pgno
-++    pCur->pPage->pgno
-+   );
-+   testcase( pCur->aiIdx[pCur->iPage-1] > pCur->apPage[pCur->iPage-1]->nCell );
-+   pCur->info.nSize = 0;
-+   pCur->curFlags &= ~(BTCF_ValidNKey|BTCF_ValidOvfl);
-+   pCur->ix = pCur->aiIdx[pCur->iPage-1];
-+-  releasePageNotNull(pCur->apPage[pCur->iPage--]);
-++  pLeaf = pCur->pPage;
-++  pCur->pPage = pCur->apPage[--pCur->iPage];
-++  releasePageNotNull(pLeaf);
-+ }
-+ 
-+ /*
-+@@ -64624,9 +64765,9 @@ static void moveToParent(BtCursor *pCur){
-+ ** single child page. This can only happen with the table rooted at page 1.
-+ **
-+ ** If the b-tree structure is empty, the cursor state is set to
-+-** CURSOR_INVALID. Otherwise, the cursor is set to point to the first
-+-** cell located on the root (or virtual root) page and the cursor state
-+-** is set to CURSOR_VALID.
-++** CURSOR_INVALID and this routine returns SQLITE_EMPTY. Otherwise,
-++** the cursor is set to point to the first cell located on the root
-++** (or virtual root) page and the cursor state is set to CURSOR_VALID.
-+ **
-+ ** If this function returns successfully, it may be assumed that the
-+ ** page-header flags indicate that the [virtual] root-page is the expected
-+@@ -64644,37 +64785,40 @@ static int moveToRoot(BtCursor *pCur){
-+   assert( CURSOR_INVALID < CURSOR_REQUIRESEEK );
-+   assert( CURSOR_VALID   < CURSOR_REQUIRESEEK );
-+   assert( CURSOR_FAULT   > CURSOR_REQUIRESEEK );
-+-  if( pCur->eState>=CURSOR_REQUIRESEEK ){
-+-    if( pCur->eState==CURSOR_FAULT ){
-+-      assert( pCur->skipNext!=SQLITE_OK );
-+-      return pCur->skipNext;
-+-    }
-+-    sqlite3BtreeClearCursor(pCur);
-+-  }
-++  assert( pCur->eState < CURSOR_REQUIRESEEK || pCur->iPage<0 );
-++  assert( pCur->pgnoRoot>0 || pCur->iPage<0 );
-+ 
-+   if( pCur->iPage>=0 ){
-+     if( pCur->iPage ){
-+-      do{
-+-        assert( pCur->apPage[pCur->iPage]!=0 );
-+-        releasePageNotNull(pCur->apPage[pCur->iPage--]);
-+-      }while( pCur->iPage);
-++      releasePageNotNull(pCur->pPage);
-++      while( --pCur->iPage ){
-++        releasePageNotNull(pCur->apPage[pCur->iPage]);
-++      }
-++      pCur->pPage = pCur->apPage[0];
-+       goto skip_init;
-+     }
-+   }else if( pCur->pgnoRoot==0 ){
-+     pCur->eState = CURSOR_INVALID;
-+-    return SQLITE_OK;
-++    return SQLITE_EMPTY;
-+   }else{
-+     assert( pCur->iPage==(-1) );
-+-    rc = getAndInitPage(pCur->pBtree->pBt, pCur->pgnoRoot, &pCur->apPage[0],
-++    if( pCur->eState>=CURSOR_REQUIRESEEK ){
-++      if( pCur->eState==CURSOR_FAULT ){
-++        assert( pCur->skipNext!=SQLITE_OK );
-++        return pCur->skipNext;
-++      }
-++      sqlite3BtreeClearCursor(pCur);
-++    }
-++    rc = getAndInitPage(pCur->pBtree->pBt, pCur->pgnoRoot, &pCur->pPage,
-+                         0, pCur->curPagerFlags);
-+     if( rc!=SQLITE_OK ){
-+       pCur->eState = CURSOR_INVALID;
-+-       return rc;
-++      return rc;
-+     }
-+     pCur->iPage = 0;
-+-    pCur->curIntKey = pCur->apPage[0]->intKey;
-++    pCur->curIntKey = pCur->pPage->intKey;
-+   }
-+-  pRoot = pCur->apPage[0];
-++  pRoot = pCur->pPage;
-+   assert( pRoot->pgno==pCur->pgnoRoot );
-+ 
-+   /* If pCur->pKeyInfo is not NULL, then the caller that opened this cursor
-+@@ -64689,7 +64833,7 @@ static int moveToRoot(BtCursor *pCur){
-+   ** (or the freelist).  */
-+   assert( pRoot->intKey==1 || pRoot->intKey==0 );
-+   if( pRoot->isInit==0 || (pCur->pKeyInfo==0)!=pRoot->intKey ){
-+-    return SQLITE_CORRUPT_PGNO(pCur->apPage[pCur->iPage]->pgno);
-++    return SQLITE_CORRUPT_PGNO(pCur->pPage->pgno);
-+   }
-+ 
-+ skip_init:
-+@@ -64697,7 +64841,7 @@ skip_init:
-+   pCur->info.nSize = 0;
-+   pCur->curFlags &= ~(BTCF_AtLast|BTCF_ValidNKey|BTCF_ValidOvfl);
-+ 
-+-  pRoot = pCur->apPage[0];
-++  pRoot = pCur->pPage;
-+   if( pRoot->nCell>0 ){
-+     pCur->eState = CURSOR_VALID;
-+   }else if( !pRoot->leaf ){
-+@@ -64708,6 +64852,7 @@ skip_init:
-+     rc = moveToChild(pCur, subpage);
-+   }else{
-+     pCur->eState = CURSOR_INVALID;
-++    rc = SQLITE_EMPTY;
-+   }
-+   return rc;
-+ }
-+@@ -64726,7 +64871,7 @@ static int moveToLeftmost(BtCursor *pCur){
-+ 
-+   assert( cursorOwnsBtShared(pCur) );
-+   assert( pCur->eState==CURSOR_VALID );
-+-  while( rc==SQLITE_OK && !(pPage = pCur->apPage[pCur->iPage])->leaf ){
-++  while( rc==SQLITE_OK && !(pPage = pCur->pPage)->leaf ){
-+     assert( pCur->ix<pPage->nCell );
-+     pgno = get4byte(findCell(pPage, pCur->ix));
-+     rc = moveToChild(pCur, pgno);
-+@@ -64751,7 +64896,7 @@ static int moveToRightmost(BtCursor *pCur){
-+ 
-+   assert( cursorOwnsBtShared(pCur) );
-+   assert( pCur->eState==CURSOR_VALID );
-+-  while( !(pPage = pCur->apPage[pCur->iPage])->leaf ){
-++  while( !(pPage = pCur->pPage)->leaf ){
-+     pgno = get4byte(&pPage->aData[pPage->hdrOffset+8]);
-+     pCur->ix = pPage->nCell;
-+     rc = moveToChild(pCur, pgno);
-+@@ -64774,14 +64919,13 @@ SQLITE_PRIVATE int sqlite3BtreeFirst(BtCursor *pCur, int *pRes){
-+   assert( sqlite3_mutex_held(pCur->pBtree->db->mutex) );
-+   rc = moveToRoot(pCur);
-+   if( rc==SQLITE_OK ){
-+-    if( pCur->eState==CURSOR_INVALID ){
-+-      assert( pCur->pgnoRoot==0 || pCur->apPage[pCur->iPage]->nCell==0 );
-+-      *pRes = 1;
-+-    }else{
-+-      assert( pCur->apPage[pCur->iPage]->nCell>0 );
-+-      *pRes = 0;
-+-      rc = moveToLeftmost(pCur);
-+-    }
-++    assert( pCur->pPage->nCell>0 );
-++    *pRes = 0;
-++    rc = moveToLeftmost(pCur);
-++  }else if( rc==SQLITE_EMPTY ){
-++    assert( pCur->pgnoRoot==0 || pCur->pPage->nCell==0 );
-++    *pRes = 1;
-++    rc = SQLITE_OK;
-+   }
-+   return rc;
-+ }
-+@@ -64805,28 +64949,26 @@ SQLITE_PRIVATE int sqlite3BtreeLast(BtCursor *pCur, int *pRes){
-+     for(ii=0; ii<pCur->iPage; ii++){
-+       assert( pCur->aiIdx[ii]==pCur->apPage[ii]->nCell );
-+     }
-+-    assert( pCur->ix==pCur->apPage[pCur->iPage]->nCell-1 );
-+-    assert( pCur->apPage[pCur->iPage]->leaf );
-++    assert( pCur->ix==pCur->pPage->nCell-1 );
-++    assert( pCur->pPage->leaf );
-+ #endif
-+     return SQLITE_OK;
-+   }
-+ 
-+   rc = moveToRoot(pCur);
-+   if( rc==SQLITE_OK ){
-+-    if( CURSOR_INVALID==pCur->eState ){
-+-      assert( pCur->pgnoRoot==0 || pCur->apPage[pCur->iPage]->nCell==0 );
-+-      *pRes = 1;
-++    assert( pCur->eState==CURSOR_VALID );
-++    *pRes = 0;
-++    rc = moveToRightmost(pCur);
-++    if( rc==SQLITE_OK ){
-++      pCur->curFlags |= BTCF_AtLast;
-+     }else{
-+-      assert( pCur->eState==CURSOR_VALID );
-+-      *pRes = 0;
-+-      rc = moveToRightmost(pCur);
-+-      if( rc==SQLITE_OK ){
-+-        pCur->curFlags |= BTCF_AtLast;
-+-      }else{
-+-        pCur->curFlags &= ~BTCF_AtLast;
-+-      }
-+-
-++      pCur->curFlags &= ~BTCF_AtLast;
-+     }
-++  }else if( rc==SQLITE_EMPTY ){
-++    assert( pCur->pgnoRoot==0 || pCur->pPage->nCell==0 );
-++    *pRes = 1;
-++    rc = SQLITE_OK;
-+   }
-+   return rc;
-+ }
-+@@ -64925,22 +65067,23 @@ SQLITE_PRIVATE int sqlite3BtreeMovetoUnpacked(
-+ 
-+   rc = moveToRoot(pCur);
-+   if( rc ){
-++    if( rc==SQLITE_EMPTY ){
-++      assert( pCur->pgnoRoot==0 || pCur->pPage->nCell==0 );
-++      *pRes = -1;
-++      return SQLITE_OK;
-++    }
-+     return rc;
-+   }
-+-  assert( pCur->pgnoRoot==0 || pCur->apPage[pCur->iPage] );
-+-  assert( pCur->pgnoRoot==0 || pCur->apPage[pCur->iPage]->isInit );
-+-  assert( pCur->eState==CURSOR_INVALID || pCur->apPage[pCur->iPage]->nCell>0 );
-+-  if( pCur->eState==CURSOR_INVALID ){
-+-    *pRes = -1;
-+-    assert( pCur->pgnoRoot==0 || pCur->apPage[pCur->iPage]->nCell==0 );
-+-    return SQLITE_OK;
-+-  }
-+-  assert( pCur->apPage[0]->intKey==pCur->curIntKey );
-++  assert( pCur->pPage );
-++  assert( pCur->pPage->isInit );
-++  assert( pCur->eState==CURSOR_VALID );
-++  assert( pCur->pPage->nCell > 0 );
-++  assert( pCur->iPage==0 || pCur->apPage[0]->intKey==pCur->curIntKey );
-+   assert( pCur->curIntKey || pIdxKey );
-+   for(;;){
-+     int lwr, upr, idx, c;
-+     Pgno chldPg;
-+-    MemPage *pPage = pCur->apPage[pCur->iPage];
-++    MemPage *pPage = pCur->pPage;
-+     u8 *pCell;                          /* Pointer to current cell in pPage */
-+ 
-+     /* pPage->nCell must be greater than zero. If this is the root-page
-+@@ -65068,7 +65211,7 @@ SQLITE_PRIVATE int sqlite3BtreeMovetoUnpacked(
-+           *pRes = 0;
-+           rc = SQLITE_OK;
-+           pCur->ix = (u16)idx;
-+-          if( pIdxKey->errCode ) rc = SQLITE_CORRUPT;
-++          if( pIdxKey->errCode ) rc = SQLITE_CORRUPT_BKPT;
-+           goto moveto_finish;
-+         }
-+         if( lwr>upr ) break;
-+@@ -65079,7 +65222,7 @@ SQLITE_PRIVATE int sqlite3BtreeMovetoUnpacked(
-+     assert( lwr==upr+1 || (pPage->intKey && !pPage->leaf) );
-+     assert( pPage->isInit );
-+     if( pPage->leaf ){
-+-      assert( pCur->ix<pCur->apPage[pCur->iPage]->nCell );
-++      assert( pCur->ix<pCur->pPage->nCell );
-+       pCur->ix = (u16)idx;
-+       *pRes = c;
-+       rc = SQLITE_OK;
-+@@ -65133,9 +65276,10 @@ SQLITE_PRIVATE i64 sqlite3BtreeRowCountEst(BtCursor *pCur){
-+   ** opcode, and it that case the cursor will always be valid and
-+   ** will always point to a leaf node. */
-+   if( NEVER(pCur->eState!=CURSOR_VALID) ) return -1;
-+-  if( NEVER(pCur->apPage[pCur->iPage]->leaf==0) ) return -1;
-++  if( NEVER(pCur->pPage->leaf==0) ) return -1;
-+ 
-+-  for(n=1, i=0; i<=pCur->iPage; i++){
-++  n = pCur->pPage->nCell;
-++  for(i=0; i<pCur->iPage; i++){
-+     n *= pCur->apPage[i]->nCell;
-+   }
-+   return n;
-+@@ -65188,7 +65332,7 @@ static SQLITE_NOINLINE int btreeNext(BtCursor *pCur){
-+     }
-+   }
-+ 
-+-  pPage = pCur->apPage[pCur->iPage];
-++  pPage = pCur->pPage;
-+   idx = ++pCur->ix;
-+   assert( pPage->isInit );
-+ 
-+@@ -65211,7 +65355,7 @@ static SQLITE_NOINLINE int btreeNext(BtCursor *pCur){
-+         return SQLITE_DONE;
-+       }
-+       moveToParent(pCur);
-+-      pPage = pCur->apPage[pCur->iPage];
-++      pPage = pCur->pPage;
-+     }while( pCur->ix>=pPage->nCell );
-+     if( pPage->intKey ){
-+       return sqlite3BtreeNext(pCur, 0);
-+@@ -65234,7 +65378,7 @@ SQLITE_PRIVATE int sqlite3BtreeNext(BtCursor *pCur, int flags){
-+   pCur->info.nSize = 0;
-+   pCur->curFlags &= ~(BTCF_ValidNKey|BTCF_ValidOvfl);
-+   if( pCur->eState!=CURSOR_VALID ) return btreeNext(pCur);
-+-  pPage = pCur->apPage[pCur->iPage];
-++  pPage = pCur->pPage;
-+   if( (++pCur->ix)>=pPage->nCell ){
-+     pCur->ix--;
-+     return btreeNext(pCur);
-+@@ -65293,7 +65437,7 @@ static SQLITE_NOINLINE int btreePrevious(BtCursor *pCur){
-+     }
-+   }
-+ 
-+-  pPage = pCur->apPage[pCur->iPage];
-++  pPage = pCur->pPage;
-+   assert( pPage->isInit );
-+   if( !pPage->leaf ){
-+     int idx = pCur->ix;
-+@@ -65312,7 +65456,7 @@ static SQLITE_NOINLINE int btreePrevious(BtCursor *pCur){
-+     assert( (pCur->curFlags & (BTCF_ValidOvfl))==0 );
-+ 
-+     pCur->ix--;
-+-    pPage = pCur->apPage[pCur->iPage];
-++    pPage = pCur->pPage;
-+     if( pPage->intKey && !pPage->leaf ){
-+       rc = sqlite3BtreePrevious(pCur, 0);
-+     }else{
-+@@ -65330,7 +65474,7 @@ SQLITE_PRIVATE int sqlite3BtreePrevious(BtCursor *pCur, int flags){
-+   pCur->info.nSize = 0;
-+   if( pCur->eState!=CURSOR_VALID
-+    || pCur->ix==0
-+-   || pCur->apPage[pCur->iPage]->leaf==0
-++   || pCur->pPage->leaf==0
-+   ){
-+     return btreePrevious(pCur);
-+   }
-+@@ -65826,7 +65970,7 @@ static int clearCell(
-+   unsigned char *pCell,    /* First byte of the Cell */
-+   CellInfo *pInfo          /* Size information about the cell */
-+ ){
-+-  BtShared *pBt = pPage->pBt;
-++  BtShared *pBt;
-+   Pgno ovflPgno;
-+   int rc;
-+   int nOvfl;
-+@@ -65842,6 +65986,7 @@ static int clearCell(
-+     return SQLITE_CORRUPT_PGNO(pPage->pgno);
-+   }
-+   ovflPgno = get4byte(pCell + pInfo->nSize - 4);
-++  pBt = pPage->pBt;
-+   assert( pBt->usableSize > 4 );
-+   ovflPageSize = pBt->usableSize - 4;
-+   nOvfl = (pInfo->nPayload - pInfo->nLocal + ovflPageSize - 1)/ovflPageSize;
-+@@ -65909,21 +66054,20 @@ static int fillInCell(
-+ ){
-+   int nPayload;
-+   const u8 *pSrc;
-+-  int nSrc, n, rc;
-++  int nSrc, n, rc, mn;
-+   int spaceLeft;
-+-  MemPage *pOvfl = 0;
-+-  MemPage *pToRelease = 0;
-++  MemPage *pToRelease;
-+   unsigned char *pPrior;
-+   unsigned char *pPayload;
-+-  BtShared *pBt = pPage->pBt;
-+-  Pgno pgnoOvfl = 0;
-++  BtShared *pBt;
-++  Pgno pgnoOvfl;
-+   int nHeader;
-+ 
-+   assert( sqlite3_mutex_held(pPage->pBt->mutex) );
-+ 
-+   /* pPage is not necessarily writeable since pCell might be auxiliary
-+   ** buffer space that is separate from the pPage buffer area */
-+-  assert( pCell<pPage->aData || pCell>=&pPage->aData[pBt->pageSize]
-++  assert( pCell<pPage->aData || pCell>=&pPage->aData[pPage->pBt->pageSize]
-+             || sqlite3PagerIswriteable(pPage->pDbPage) );
-+ 
-+   /* Fill in the header. */
-+@@ -65943,25 +66087,36 @@ static int fillInCell(
-+   }
-+ 
-+   /* Fill in the payload */
-++  pPayload = &pCell[nHeader];
-+   if( nPayload<=pPage->maxLocal ){
-++    /* This is the common case where everything fits on the btree page
-++    ** and no overflow pages are required. */
-+     n = nHeader + nPayload;
-+     testcase( n==3 );
-+     testcase( n==4 );
-+     if( n<4 ) n = 4;
-+     *pnSize = n;
-+-    spaceLeft = nPayload;
-+-    pPrior = pCell;
-+-  }else{
-+-    int mn = pPage->minLocal;
-+-    n = mn + (nPayload - mn) % (pPage->pBt->usableSize - 4);
-+-    testcase( n==pPage->maxLocal );
-+-    testcase( n==pPage->maxLocal+1 );
-+-    if( n > pPage->maxLocal ) n = mn;
-+-    spaceLeft = n;
-+-    *pnSize = n + nHeader + 4;
-+-    pPrior = &pCell[nHeader+n];
-++    assert( nSrc<=nPayload );
-++    testcase( nSrc<nPayload );
-++    memcpy(pPayload, pSrc, nSrc);
-++    memset(pPayload+nSrc, 0, nPayload-nSrc);
-++    return SQLITE_OK;
-+   }
-+-  pPayload = &pCell[nHeader];
-++
-++  /* If we reach this point, it means that some of the content will need
-++  ** to spill onto overflow pages.
-++  */
-++  mn = pPage->minLocal;
-++  n = mn + (nPayload - mn) % (pPage->pBt->usableSize - 4);
-++  testcase( n==pPage->maxLocal );
-++  testcase( n==pPage->maxLocal+1 );
-++  if( n > pPage->maxLocal ) n = mn;
-++  spaceLeft = n;
-++  *pnSize = n + nHeader + 4;
-++  pPrior = &pCell[nHeader+n];
-++  pToRelease = 0;
-++  pgnoOvfl = 0;
-++  pBt = pPage->pBt;
-+ 
-+   /* At this point variables should be set as follows:
-+   **
-+@@ -65987,8 +66142,35 @@ static int fillInCell(
-+ #endif
-+ 
-+   /* Write the payload into the local Cell and any extra into overflow pages */
-+-  while( nPayload>0 ){
-++  while( 1 ){
-++    n = nPayload;
-++    if( n>spaceLeft ) n = spaceLeft;
-++
-++    /* If pToRelease is not zero than pPayload points into the data area
-++    ** of pToRelease.  Make sure pToRelease is still writeable. */
-++    assert( pToRelease==0 || sqlite3PagerIswriteable(pToRelease->pDbPage) );
-++
-++    /* If pPayload is part of the data area of pPage, then make sure pPage
-++    ** is still writeable */
-++    assert( pPayload<pPage->aData || pPayload>=&pPage->aData[pBt->pageSize]
-++            || sqlite3PagerIswriteable(pPage->pDbPage) );
-++
-++    if( nSrc>=n ){
-++      memcpy(pPayload, pSrc, n);
-++    }else if( nSrc>0 ){
-++      n = nSrc;
-++      memcpy(pPayload, pSrc, n);
-++    }else{
-++      memset(pPayload, 0, n);
-++    }
-++    nPayload -= n;
-++    if( nPayload<=0 ) break;
-++    pPayload += n;
-++    pSrc += n;
-++    nSrc -= n;
-++    spaceLeft -= n;
-+     if( spaceLeft==0 ){
-++      MemPage *pOvfl = 0;
-+ #ifndef SQLITE_OMIT_AUTOVACUUM
-+       Pgno pgnoPtrmap = pgnoOvfl; /* Overflow page pointer-map entry page */
-+       if( pBt->autoVacuum ){
-+@@ -66041,30 +66223,6 @@ static int fillInCell(
-+       pPayload = &pOvfl->aData[4];
-+       spaceLeft = pBt->usableSize - 4;
-+     }
-+-    n = nPayload;
-+-    if( n>spaceLeft ) n = spaceLeft;
-+-
-+-    /* If pToRelease is not zero than pPayload points into the data area
-+-    ** of pToRelease.  Make sure pToRelease is still writeable. */
-+-    assert( pToRelease==0 || sqlite3PagerIswriteable(pToRelease->pDbPage) );
-+-
-+-    /* If pPayload is part of the data area of pPage, then make sure pPage
-+-    ** is still writeable */
-+-    assert( pPayload<pPage->aData || pPayload>=&pPage->aData[pBt->pageSize]
-+-            || sqlite3PagerIswriteable(pPage->pDbPage) );
-+-
-+-    if( nSrc>0 ){
-+-      if( n>nSrc ) n = nSrc;
-+-      assert( pSrc );
-+-      memcpy(pPayload, pSrc, n);
-+-    }else{
-+-      memset(pPayload, 0, n);
-+-    }
-+-    nPayload -= n;
-+-    pPayload += n;
-+-    pSrc += n;
-+-    nSrc -= n;
-+-    spaceLeft -= n;
-+   }
-+   releasePage(pToRelease);
-+   return SQLITE_OK;
-+@@ -66096,7 +66254,7 @@ static void dropCell(MemPage *pPage, int idx, int sz, int *pRC){
-+   hdr = pPage->hdrOffset;
-+   testcase( pc==get2byte(&data[hdr+5]) );
-+   testcase( pc+sz==pPage->pBt->usableSize );
-+-  if( pc < (u32)get2byte(&data[hdr+5]) || pc+sz > pPage->pBt->usableSize ){
-++  if( pc+sz > pPage->pBt->usableSize ){
-+     *pRC = SQLITE_CORRUPT_BKPT;
-+     return;
-+   }
-+@@ -66963,10 +67121,8 @@ static int balance_nonroot(
-+      + nMaxCells*sizeof(u16)                       /* b.szCell */
-+      + pBt->pageSize;                              /* aSpace1 */
-+ 
-+-  /* EVIDENCE-OF: R-28375-38319 SQLite will never request a scratch buffer
-+-  ** that is more than 6 times the database page size. */
-+   assert( szScratch<=6*(int)pBt->pageSize );
-+-  b.apCell = sqlite3ScratchMalloc( szScratch );
-++  b.apCell = sqlite3StackAllocRaw(0, szScratch );
-+   if( b.apCell==0 ){
-+     rc = SQLITE_NOMEM_BKPT;
-+     goto balance_cleanup;
-+@@ -67544,7 +67700,7 @@ static int balance_nonroot(
-+   ** Cleanup before returning.
-+   */
-+ balance_cleanup:
-+-  sqlite3ScratchFree(b.apCell);
-++  sqlite3StackFree(0, b.apCell);
-+   for(i=0; i<nOld; i++){
-+     releasePage(apOld[i]);
-+   }
-+@@ -67643,7 +67799,7 @@ static int balance(BtCursor *pCur){
-+ 
-+   do {
-+     int iPage = pCur->iPage;
-+-    MemPage *pPage = pCur->apPage[iPage];
-++    MemPage *pPage = pCur->pPage;
-+ 
-+     if( iPage==0 ){
-+       if( pPage->nOverflow ){
-+@@ -67659,7 +67815,9 @@ static int balance(BtCursor *pCur){
-+           pCur->iPage = 1;
-+           pCur->ix = 0;
-+           pCur->aiIdx[0] = 0;
-+-          assert( pCur->apPage[1]->nOverflow );
-++          pCur->apPage[0] = pPage;
-++          pCur->pPage = pCur->apPage[1];
-++          assert( pCur->pPage->nOverflow );
-+         }
-+       }else{
-+         break;
-+@@ -67739,6 +67897,7 @@ static int balance(BtCursor *pCur){
-+       releasePage(pPage);
-+       pCur->iPage--;
-+       assert( pCur->iPage>=0 );
-++      pCur->pPage = pCur->apPage[pCur->iPage];
-+     }
-+   }while( rc==SQLITE_OK );
-+ 
-+@@ -67870,7 +68029,7 @@ SQLITE_PRIVATE int sqlite3BtreeInsert(
-+   }
-+   assert( pCur->eState==CURSOR_VALID || (pCur->eState==CURSOR_INVALID && loc) );
-+ 
-+-  pPage = pCur->apPage[pCur->iPage];
-++  pPage = pCur->pPage;
-+   assert( pPage->intKey || pX->nKey>=0 );
-+   assert( pPage->leaf || !pPage->intKey );
-+ 
-+@@ -67957,10 +68116,10 @@ SQLITE_PRIVATE int sqlite3BtreeInsert(
-+     ** fails. Internal data structure corruption will result otherwise.
-+     ** Also, set the cursor state to invalid. This stops saveCursorPosition()
-+     ** from trying to save the current position of the cursor.  */
-+-    pCur->apPage[pCur->iPage]->nOverflow = 0;
-++    pCur->pPage->nOverflow = 0;
-+     pCur->eState = CURSOR_INVALID;
-+     if( (flags & BTREE_SAVEPOSITION) && rc==SQLITE_OK ){
-+-      rc = moveToRoot(pCur);
-++      btreeReleaseAllCursorPages(pCur);
-+       if( pCur->pKeyInfo ){
-+         assert( pCur->pKey==0 );
-+         pCur->pKey = sqlite3Malloc( pX->nKey );
-+@@ -67974,7 +68133,7 @@ SQLITE_PRIVATE int sqlite3BtreeInsert(
-+       pCur->nKey = pX->nKey;
-+     }
-+   }
-+-  assert( pCur->apPage[pCur->iPage]->nOverflow==0 );
-++  assert( pCur->iPage<0 || pCur->pPage->nOverflow==0 );
-+ 
-+ end_insert:
-+   return rc;
-+@@ -68015,13 +68174,13 @@ SQLITE_PRIVATE int sqlite3BtreeDelete(BtCursor *pCur, u8 flags){
-+   assert( pCur->curFlags & BTCF_WriteFlag );
-+   assert( hasSharedCacheTableLock(p, pCur->pgnoRoot, pCur->pKeyInfo!=0, 2) );
-+   assert( !hasReadConflicts(p, pCur->pgnoRoot) );
-+-  assert( pCur->ix<pCur->apPage[pCur->iPage]->nCell );
-++  assert( pCur->ix<pCur->pPage->nCell );
-+   assert( pCur->eState==CURSOR_VALID );
-+   assert( (flags & ~(BTREE_SAVEPOSITION | BTREE_AUXDELETE))==0 );
-+ 
-+   iCellDepth = pCur->iPage;
-+   iCellIdx = pCur->ix;
-+-  pPage = pCur->apPage[iCellDepth];
-++  pPage = pCur->pPage;
-+   pCell = findCell(pPage, iCellIdx);
-+ 
-+   /* If the bPreserve flag is set to true, then the cursor position must
-+@@ -68087,11 +68246,16 @@ SQLITE_PRIVATE int sqlite3BtreeDelete(BtCursor *pCur, u8 flags){
-+   ** node. The cell from the leaf node needs to be moved to the internal
-+   ** node to replace the deleted cell.  */
-+   if( !pPage->leaf ){
-+-    MemPage *pLeaf = pCur->apPage[pCur->iPage];
-++    MemPage *pLeaf = pCur->pPage;
-+     int nCell;
-+-    Pgno n = pCur->apPage[iCellDepth+1]->pgno;
-++    Pgno n;
-+     unsigned char *pTmp;
-+ 
-++    if( iCellDepth<pCur->iPage-1 ){
-++      n = pCur->apPage[iCellDepth+1]->pgno;
-++    }else{
-++      n = pCur->pPage->pgno;
-++    }
-+     pCell = findCell(pLeaf, pLeaf->nCell-1);
-+     if( pCell<&pLeaf->aData[4] ) return SQLITE_CORRUPT_BKPT;
-+     nCell = pLeaf->xCellSize(pLeaf, pCell);
-+@@ -68123,16 +68287,19 @@ SQLITE_PRIVATE int sqlite3BtreeDelete(BtCursor *pCur, u8 flags){
-+   ** well.  */
-+   rc = balance(pCur);
-+   if( rc==SQLITE_OK && pCur->iPage>iCellDepth ){
-++    releasePageNotNull(pCur->pPage);
-++    pCur->iPage--;
-+     while( pCur->iPage>iCellDepth ){
-+       releasePage(pCur->apPage[pCur->iPage--]);
-+     }
-++    pCur->pPage = pCur->apPage[pCur->iPage];
-+     rc = balance(pCur);
-+   }
-+ 
-+   if( rc==SQLITE_OK ){
-+     if( bSkipnext ){
-+       assert( bPreserve && (pCur->iPage==iCellDepth || CORRUPT_DB) );
-+-      assert( pPage==pCur->apPage[pCur->iPage] || CORRUPT_DB );
-++      assert( pPage==pCur->pPage || CORRUPT_DB );
-+       assert( (pPage->nCell>0 || CORRUPT_DB) && iCellIdx<=pPage->nCell );
-+       pCur->eState = CURSOR_SKIPNEXT;
-+       if( iCellIdx>=pPage->nCell ){
-+@@ -68144,8 +68311,10 @@ SQLITE_PRIVATE int sqlite3BtreeDelete(BtCursor *pCur, u8 flags){
-+     }else{
-+       rc = moveToRoot(pCur);
-+       if( bPreserve ){
-++        btreeReleaseAllCursorPages(pCur);
-+         pCur->eState = CURSOR_REQUIRESEEK;
-+       }
-++      if( rc==SQLITE_EMPTY ) rc = SQLITE_OK;
-+     }
-+   }
-+   return rc;
-+@@ -68610,11 +68779,11 @@ SQLITE_PRIVATE int sqlite3BtreeCount(BtCursor *pCur, i64 *pnEntry){
-+   i64 nEntry = 0;                      /* Value to return in *pnEntry */
-+   int rc;                              /* Return code */
-+ 
-+-  if( pCur->pgnoRoot==0 ){
-++  rc = moveToRoot(pCur);
-++  if( rc==SQLITE_EMPTY ){
-+     *pnEntry = 0;
-+     return SQLITE_OK;
-+   }
-+-  rc = moveToRoot(pCur);
-+ 
-+   /* Unless an error occurs, the following loop runs one iteration for each
-+   ** page in the B-Tree structure (not including overflow pages).
-+@@ -68627,7 +68796,7 @@ SQLITE_PRIVATE int sqlite3BtreeCount(BtCursor *pCur, i64 *pnEntry){
-+     ** this page contains countable entries. Increment the entry counter
-+     ** accordingly.
-+     */
-+-    pPage = pCur->apPage[pCur->iPage];
-++    pPage = pCur->pPage;
-+     if( pPage->leaf || !pPage->intKey ){
-+       nEntry += pPage->nCell;
-+     }
-+@@ -68650,10 +68819,10 @@ SQLITE_PRIVATE int sqlite3BtreeCount(BtCursor *pCur, i64 *pnEntry){
-+           return moveToRoot(pCur);
-+         }
-+         moveToParent(pCur);
-+-      }while ( pCur->ix>=pCur->apPage[pCur->iPage]->nCell );
-++      }while ( pCur->ix>=pCur->pPage->nCell );
-+ 
-+       pCur->ix++;
-+-      pPage = pCur->apPage[pCur->iPage];
-++      pPage = pCur->pPage;
-+     }
-+ 
-+     /* Descend to the child node of the cell that the cursor currently
-+@@ -69494,7 +69663,7 @@ SQLITE_PRIVATE int sqlite3BtreePutData(BtCursor *pCsr, u32 offset, u32 amt, void
-+               && pCsr->pBt->inTransaction==TRANS_WRITE );
-+   assert( hasSharedCacheTableLock(pCsr->pBtree, pCsr->pgnoRoot, 0, 2) );
-+   assert( !hasReadConflicts(pCsr->pBtree, pCsr->pgnoRoot) );
-+-  assert( pCsr->apPage[pCsr->iPage]->intKey );
-++  assert( pCsr->pPage->intKey );
-+ 
-+   return accessPayload(pCsr, offset, amt, (unsigned char *)z, 1);
-+ }
-+@@ -70520,7 +70689,7 @@ SQLITE_PRIVATE SQLITE_NOINLINE int sqlite3VdbeMemGrow(Mem *pMem, int n, int bPre
-+   assert( pMem->szMalloc==0
-+        || pMem->szMalloc==sqlite3DbMallocSize(pMem->db, pMem->zMalloc) );
-+   if( n<32 ) n = 32;
-+-  if( bPreserve && pMem->szMalloc>0 && pMem->z==pMem->zMalloc ){
-++  if( pMem->szMalloc>0 && bPreserve && pMem->z==pMem->zMalloc ){
-+     pMem->z = pMem->zMalloc = sqlite3DbReallocOrFree(pMem->db, pMem->z, n);
-+     bPreserve = 0;
-+   }else{
-+@@ -70536,7 +70705,8 @@ SQLITE_PRIVATE SQLITE_NOINLINE int sqlite3VdbeMemGrow(Mem *pMem, int n, int bPre
-+     pMem->szMalloc = sqlite3DbMallocSize(pMem->db, pMem->zMalloc);
-+   }
-+ 
-+-  if( bPreserve && pMem->z && ALWAYS(pMem->z!=pMem->zMalloc) ){
-++  if( bPreserve && pMem->z ){
-++    assert( pMem->z!=pMem->zMalloc );
-+     memcpy(pMem->zMalloc, pMem->z, pMem->n);
-+   }
-+   if( (pMem->flags&MEM_Dyn)!=0 ){
-+@@ -70575,6 +70745,20 @@ SQLITE_PRIVATE int sqlite3VdbeMemClearAndResize(Mem *pMem, int szNew){
-+ }
-+ 
-+ /*
-++** It is already known that pMem contains an unterminated string.
-++** Add the zero terminator.
-++*/
-++static SQLITE_NOINLINE int vdbeMemAddTerminator(Mem *pMem){
-++  if( sqlite3VdbeMemGrow(pMem, pMem->n+2, 1) ){
-++    return SQLITE_NOMEM_BKPT;
-++  }
-++  pMem->z[pMem->n] = 0;
-++  pMem->z[pMem->n+1] = 0;
-++  pMem->flags |= MEM_Term;
-++  return SQLITE_OK;
-++}
-++
-++/*
-+ ** Change pMem so that its MEM_Str or MEM_Blob value is stored in
-+ ** MEM.zMalloc, where it can be safely written.
-+ **
-+@@ -70586,12 +70770,8 @@ SQLITE_PRIVATE int sqlite3VdbeMemMakeWriteable(Mem *pMem){
-+   if( (pMem->flags & (MEM_Str|MEM_Blob))!=0 ){
-+     if( ExpandBlob(pMem) ) return SQLITE_NOMEM;
-+     if( pMem->szMalloc==0 || pMem->z!=pMem->zMalloc ){
-+-      if( sqlite3VdbeMemGrow(pMem, pMem->n + 2, 1) ){
-+-        return SQLITE_NOMEM_BKPT;
-+-      }
-+-      pMem->z[pMem->n] = 0;
-+-      pMem->z[pMem->n+1] = 0;
-+-      pMem->flags |= MEM_Term;
-++      int rc = vdbeMemAddTerminator(pMem);
-++      if( rc ) return rc;
-+     }
-+   }
-+   pMem->flags &= ~MEM_Ephem;
-+@@ -70631,20 +70811,6 @@ SQLITE_PRIVATE int sqlite3VdbeMemExpandBlob(Mem *pMem){
-+ #endif
-+ 
-+ /*
-+-** It is already known that pMem contains an unterminated string.
-+-** Add the zero terminator.
-+-*/
-+-static SQLITE_NOINLINE int vdbeMemAddTerminator(Mem *pMem){
-+-  if( sqlite3VdbeMemGrow(pMem, pMem->n+2, 1) ){
-+-    return SQLITE_NOMEM_BKPT;
-+-  }
-+-  pMem->z[pMem->n] = 0;
-+-  pMem->z[pMem->n+1] = 0;
-+-  pMem->flags |= MEM_Term;
-+-  return SQLITE_OK;
-+-}
-+-
-+-/*
-+ ** Make sure the given Mem is \u0000 terminated.
-+ */
-+ SQLITE_PRIVATE int sqlite3VdbeMemNulTerminate(Mem *pMem){
-+@@ -70962,14 +71128,21 @@ SQLITE_PRIVATE int sqlite3VdbeMemRealify(Mem *pMem){
-+ */
-+ SQLITE_PRIVATE int sqlite3VdbeMemNumerify(Mem *pMem){
-+   if( (pMem->flags & (MEM_Int|MEM_Real|MEM_Null))==0 ){
-++    int rc;
-+     assert( (pMem->flags & (MEM_Blob|MEM_Str))!=0 );
-+     assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
-+-    if( 0==sqlite3Atoi64(pMem->z, &pMem->u.i, pMem->n, pMem->enc) ){
-++    rc = sqlite3Atoi64(pMem->z, &pMem->u.i, pMem->n, pMem->enc);
-++    if( rc==0 ){
-+       MemSetTypeFlag(pMem, MEM_Int);
-+     }else{
-+-      pMem->u.r = sqlite3VdbeRealValue(pMem);
-+-      MemSetTypeFlag(pMem, MEM_Real);
-+-      sqlite3VdbeIntegerAffinity(pMem);
-++      i64 i = pMem->u.i;
-++      sqlite3AtoF(pMem->z, &pMem->u.r, pMem->n, pMem->enc);
-++      if( rc==1 && pMem->u.r==(double)i ){
-++        pMem->u.i = i;
-++        MemSetTypeFlag(pMem, MEM_Int);
-++      }else{
-++        MemSetTypeFlag(pMem, MEM_Real);
-++      }
-+     }
-+   }
-+   assert( (pMem->flags & (MEM_Int|MEM_Real|MEM_Null))!=0 );
-+@@ -71289,7 +71462,7 @@ SQLITE_PRIVATE int sqlite3VdbeMemSetStr(
-+   if( nByte<0 ){
-+     assert( enc!=0 );
-+     if( enc==SQLITE_UTF8 ){
-+-      nByte = sqlite3Strlen30(z);
-++      nByte = 0x7fffffff & (int)strlen(z);
-+       if( nByte>iLimit ) nByte = iLimit+1;
-+     }else{
-+       for(nByte=0; nByte<=iLimit && (z[nByte] | z[nByte+1]); nByte+=2){}
-+@@ -71367,12 +71540,11 @@ static SQLITE_NOINLINE int vdbeMemFromBtreeResize(
-+ ){
-+   int rc;
-+   pMem->flags = MEM_Null;
-+-  if( SQLITE_OK==(rc = sqlite3VdbeMemClearAndResize(pMem, amt+2)) ){
-++  if( SQLITE_OK==(rc = sqlite3VdbeMemClearAndResize(pMem, amt+1)) ){
-+     rc = sqlite3BtreePayload(pCur, offset, amt, pMem->z);
-+     if( rc==SQLITE_OK ){
-+-      pMem->z[amt] = 0;
-+-      pMem->z[amt+1] = 0;
-+-      pMem->flags = MEM_Blob|MEM_Term;
-++      pMem->z[amt] = 0;   /* Overrun area used when reading malformed records */
-++      pMem->flags = MEM_Blob;
-+       pMem->n = (int)amt;
-+     }else{
-+       sqlite3VdbeMemRelease(pMem);
-+@@ -71521,7 +71693,7 @@ static sqlite3_value *valueNew(sqlite3 *db, struct ValueNewStat4Ctx *p){
-+       if( pRec ){
-+         pRec->pKeyInfo = sqlite3KeyInfoOfIndex(p->pParse, pIdx);
-+         if( pRec->pKeyInfo ){
-+-          assert( pRec->pKeyInfo->nField+pRec->pKeyInfo->nXField==nCol );
-++          assert( pRec->pKeyInfo->nAllField==nCol );
-+           assert( pRec->pKeyInfo->enc==ENC(db) );
-+           pRec->aMem = (Mem *)((u8*)pRec + ROUND8(sizeof(UnpackedRecord)));
-+           for(i=0; i<nCol; i++){
-+@@ -72057,7 +72229,7 @@ SQLITE_PRIVATE int sqlite3Stat4Column(
-+ SQLITE_PRIVATE void sqlite3Stat4ProbeFree(UnpackedRecord *pRec){
-+   if( pRec ){
-+     int i;
-+-    int nCol = pRec->pKeyInfo->nField+pRec->pKeyInfo->nXField;
-++    int nCol = pRec->pKeyInfo->nAllField;
-+     Mem *aMem = pRec->aMem;
-+     sqlite3 *db = aMem[0].db;
-+     for(i=0; i<nCol; i++){
-+@@ -72153,10 +72325,12 @@ SQLITE_PRIVATE Vdbe *sqlite3VdbeCreate(Parse *pParse){
-+   db->pVdbe = p;
-+   p->magic = VDBE_MAGIC_INIT;
-+   p->pParse = pParse;
-++  pParse->pVdbe = p;
-+   assert( pParse->aLabel==0 );
-+   assert( pParse->nLabel==0 );
-+   assert( pParse->nOpAlloc==0 );
-+   assert( pParse->szOpAlloc==0 );
-++  sqlite3VdbeAddOp2(p, OP_Init, 0, 1);
-+   return p;
-+ }
-+ 
-+@@ -72610,7 +72784,8 @@ static Op *opIterNext(VdbeOpIter *p){
-+ **   *  OP_VUpdate
-+ **   *  OP_VRename
-+ **   *  OP_FkCounter with P2==0 (immediate foreign key constraint)
-+-**   *  OP_CreateTable and OP_InitCoroutine (for CREATE TABLE AS SELECT ...)
-++**   *  OP_CreateBtree/BTREE_INTKEY and OP_InitCoroutine
-++**      (for CREATE TABLE AS SELECT ...)
-+ **
-+ ** Then check that the value of Parse.mayAbort is true if an
-+ ** ABORT may be thrown, or false otherwise. Return true if it does
-+@@ -72638,7 +72813,7 @@ SQLITE_PRIVATE int sqlite3VdbeAssertMayAbort(Vdbe *v, int mayAbort){
-+       hasAbort = 1;
-+       break;
-+     }
-+-    if( opcode==OP_CreateTable ) hasCreateTable = 1;
-++    if( opcode==OP_CreateBtree && pOp->p3==BTREE_INTKEY ) hasCreateTable = 1;
-+     if( opcode==OP_InitCoroutine ) hasInitCoroutine = 1;
-+ #ifndef SQLITE_OMIT_FOREIGN_KEY
-+     if( opcode==OP_FkCounter && pOp->p1==0 && pOp->p2==1 ){
-+@@ -72717,6 +72892,27 @@ static void resolveP2Values(Vdbe *p, int *pMaxFuncArgs){
-+           p->bIsReader = 1;
-+           break;
-+         }
-++        case OP_Next:
-++        case OP_NextIfOpen:
-++        case OP_SorterNext: {
-++          pOp->p4.xAdvance = sqlite3BtreeNext;
-++          pOp->p4type = P4_ADVANCE;
-++          /* The code generator never codes any of these opcodes as a jump
-++          ** to a label.  They are always coded as a jump backwards to a
-++          ** known address */
-++          assert( pOp->p2>=0 );
-++          break;
-++        }
-++        case OP_Prev:
-++        case OP_PrevIfOpen: {
-++          pOp->p4.xAdvance = sqlite3BtreePrevious;
-++          pOp->p4type = P4_ADVANCE;
-++          /* The code generator never codes any of these opcodes as a jump
-++          ** to a label.  They are always coded as a jump backwards to a
-++          ** known address */
-++          assert( pOp->p2>=0 );
-++          break;
-++        }
-+ #ifndef SQLITE_OMIT_VIRTUALTABLE
-+         case OP_VUpdate: {
-+           if( pOp->p2>nMaxArgs ) nMaxArgs = pOp->p2;
-+@@ -72728,27 +72924,25 @@ static void resolveP2Values(Vdbe *p, int *pMaxFuncArgs){
-+           assert( pOp[-1].opcode==OP_Integer );
-+           n = pOp[-1].p1;
-+           if( n>nMaxArgs ) nMaxArgs = n;
-+-          break;
-++          /* Fall through into the default case */
-+         }
-+ #endif
-+-        case OP_Next:
-+-        case OP_NextIfOpen:
-+-        case OP_SorterNext: {
-+-          pOp->p4.xAdvance = sqlite3BtreeNext;
-+-          pOp->p4type = P4_ADVANCE;
-+-          break;
-+-        }
-+-        case OP_Prev:
-+-        case OP_PrevIfOpen: {
-+-          pOp->p4.xAdvance = sqlite3BtreePrevious;
-+-          pOp->p4type = P4_ADVANCE;
-++        default: {
-++          if( pOp->p2<0 ){
-++            /* The mkopcodeh.tcl script has so arranged things that the only
-++            ** non-jump opcodes less than SQLITE_MX_JUMP_CODE are guaranteed to
-++            ** have non-negative values for P2. */
-++            assert( (sqlite3OpcodeProperty[pOp->opcode] & OPFLG_JUMP)!=0 );
-++            assert( ADDR(pOp->p2)<pParse->nLabel );
-++            pOp->p2 = aLabel[ADDR(pOp->p2)];
-++          }
-+           break;
-+         }
-+       }
-+-      if( (sqlite3OpcodeProperty[pOp->opcode] & OPFLG_JUMP)!=0 && pOp->p2<0 ){
-+-        assert( ADDR(pOp->p2)<pParse->nLabel );
-+-        pOp->p2 = aLabel[ADDR(pOp->p2)];
-+-      }
-++      /* The mkopcodeh.tcl script has so arranged things that the only
-++      ** non-jump opcodes less than SQLITE_MX_JUMP_CODE are guaranteed to
-++      ** have non-negative values for P2. */
-++      assert( (sqlite3OpcodeProperty[pOp->opcode]&OPFLG_JUMP)==0 || pOp->p2>=0);
-+     }
-+     if( pOp==p->aOp ) break;
-+     pOp--;
-+@@ -73421,8 +73615,8 @@ static char *displayP4(Op *pOp, char *zTemp, int nTemp){
-+       int j;
-+       KeyInfo *pKeyInfo = pOp->p4.pKeyInfo;
-+       assert( pKeyInfo->aSortOrder!=0 );
-+-      sqlite3XPrintf(&x, "k(%d", pKeyInfo->nField);
-+-      for(j=0; j<pKeyInfo->nField; j++){
-++      sqlite3XPrintf(&x, "k(%d", pKeyInfo->nKeyField);
-++      for(j=0; j<pKeyInfo->nKeyField; j++){
-+         CollSeq *pColl = pKeyInfo->aColl[j];
-+         const char *zColl = pColl ? pColl->zName : "";
-+         if( strcmp(zColl, "BINARY")==0 ) zColl = "B";
-+@@ -74259,27 +74453,6 @@ static void closeAllCursors(Vdbe *p){
-+ }
-+ 
-+ /*
-+-** Clean up the VM after a single run.
-+-*/
-+-static void Cleanup(Vdbe *p){
-+-  sqlite3 *db = p->db;
-+-
-+-#ifdef SQLITE_DEBUG
-+-  /* Execute assert() statements to ensure that the Vdbe.apCsr[] and
-+-  ** Vdbe.aMem[] arrays have already been cleaned up.  */
-+-  int i;
-+-  if( p->apCsr ) for(i=0; i<p->nCursor; i++) assert( p->apCsr[i]==0 );
-+-  if( p->aMem ){
-+-    for(i=0; i<p->nMem; i++) assert( p->aMem[i].flags==MEM_Undefined );
-+-  }
-+-#endif
-+-
-+-  sqlite3DbFree(db, p->zErrMsg);
-+-  p->zErrMsg = 0;
-+-  p->pResultSet = 0;
-+-}
-+-
-+-/*
-+ ** Set the number of result columns that will be returned by this SQL
-+ ** statement. This is now set at compile time, rather than during
-+ ** execution of the vdbe program so that sqlite3_column_count() can
-+@@ -74987,6 +75160,10 @@ static void vdbeInvokeSqllog(Vdbe *v){
-+ ** VDBE_MAGIC_INIT.
-+ */
-+ SQLITE_PRIVATE int sqlite3VdbeReset(Vdbe *p){
-++#if defined(SQLITE_DEBUG) || defined(VDBE_PROFILE)
-++  int i;
-++#endif
-++
-+   sqlite3 *db;
-+   db = p->db;
-+ 
-+@@ -75004,8 +75181,6 @@ SQLITE_PRIVATE int sqlite3VdbeReset(Vdbe *p){
-+   if( p->pc>=0 ){
-+     vdbeInvokeSqllog(p);
-+     sqlite3VdbeTransferError(p);
-+-    sqlite3DbFree(db, p->zErrMsg);
-+-    p->zErrMsg = 0;
-+     if( p->runOnlyOnce ) p->expired = 1;
-+   }else if( p->rc && p->expired ){
-+     /* The expired flag was set on the VDBE before the first call
-+@@ -75013,13 +75188,21 @@ SQLITE_PRIVATE int sqlite3VdbeReset(Vdbe *p){
-+     ** called), set the database error in this case as well.
-+     */
-+     sqlite3ErrorWithMsg(db, p->rc, p->zErrMsg ? "%s" : 0, p->zErrMsg);
-+-    sqlite3DbFree(db, p->zErrMsg);
-+-    p->zErrMsg = 0;
-+   }
-+ 
-+-  /* Reclaim all memory used by the VDBE
-++  /* Reset register contents and reclaim error message memory.
-+   */
-+-  Cleanup(p);
-++#ifdef SQLITE_DEBUG
-++  /* Execute assert() statements to ensure that the Vdbe.apCsr[] and
-++  ** Vdbe.aMem[] arrays have already been cleaned up.  */
-++  if( p->apCsr ) for(i=0; i<p->nCursor; i++) assert( p->apCsr[i]==0 );
-++  if( p->aMem ){
-++    for(i=0; i<p->nMem; i++) assert( p->aMem[i].flags==MEM_Undefined );
-++  }
-++#endif
-++  sqlite3DbFree(db, p->zErrMsg);
-++  p->zErrMsg = 0;
-++  p->pResultSet = 0;
-+ 
-+   /* Save profiling information from this VDBE run.
-+   */
-+@@ -75027,7 +75210,6 @@ SQLITE_PRIVATE int sqlite3VdbeReset(Vdbe *p){
-+   {
-+     FILE *out = fopen("vdbe_profile.out", "a");
-+     if( out ){
-+-      int i;
-+       fprintf(out, "---- ");
-+       for(i=0; i<p->nOp; i++){
-+         fprintf(out, "%02x", p->aOp[i].opcode);
-+@@ -75240,19 +75422,18 @@ SQLITE_PRIVATE int sqlite3VdbeCursorRestore(VdbeCursor *p){
-+ */
-+ SQLITE_PRIVATE int sqlite3VdbeCursorMoveto(VdbeCursor **pp, int *piCol){
-+   VdbeCursor *p = *pp;
-+-  if( p->eCurType==CURTYPE_BTREE ){
-+-    if( p->deferredMoveto ){
-+-      int iMap;
-+-      if( p->aAltMap && (iMap = p->aAltMap[1+*piCol])>0 ){
-+-        *pp = p->pAltCursor;
-+-        *piCol = iMap - 1;
-+-        return SQLITE_OK;
-+-      }
-+-      return handleDeferredMoveto(p);
-+-    }
-+-    if( sqlite3BtreeCursorHasMoved(p->uc.pCursor) ){
-+-      return handleMovedCursor(p);
-++  assert( p->eCurType==CURTYPE_BTREE || p->eCurType==CURTYPE_PSEUDO );
-++  if( p->deferredMoveto ){
-++    int iMap;
-++    if( p->aAltMap && (iMap = p->aAltMap[1+*piCol])>0 ){
-++      *pp = p->pAltCursor;
-++      *piCol = iMap - 1;
-++      return SQLITE_OK;
-+     }
-++    return handleDeferredMoveto(p);
-++  }
-++  if( sqlite3BtreeCursorHasMoved(p->uc.pCursor) ){
-++    return handleMovedCursor(p);
-+   }
-+   return SQLITE_OK;
-+ }
-+@@ -75648,13 +75829,13 @@ SQLITE_PRIVATE UnpackedRecord *sqlite3VdbeAllocUnpackedRecord(
-+ ){
-+   UnpackedRecord *p;              /* Unpacked record to return */
-+   int nByte;                      /* Number of bytes required for *p */
-+-  nByte = ROUND8(sizeof(UnpackedRecord)) + sizeof(Mem)*(pKeyInfo->nField+1);
-++  nByte = ROUND8(sizeof(UnpackedRecord)) + sizeof(Mem)*(pKeyInfo->nKeyField+1);
-+   p = (UnpackedRecord *)sqlite3DbMallocRaw(pKeyInfo->db, nByte);
-+   if( !p ) return 0;
-+   p->aMem = (Mem*)&((char*)p)[ROUND8(sizeof(UnpackedRecord))];
-+   assert( pKeyInfo->aSortOrder!=0 );
-+   p->pKeyInfo = pKeyInfo;
-+-  p->nField = pKeyInfo->nField + 1;
-++  p->nField = pKeyInfo->nKeyField + 1;
-+   return p;
-+ }
-+ 
-+@@ -75694,7 +75875,7 @@ SQLITE_PRIVATE void sqlite3VdbeRecordUnpack(
-+     pMem++;
-+     if( (++u)>=p->nField ) break;
-+   }
-+-  assert( u<=pKeyInfo->nField + 1 );
-++  assert( u<=pKeyInfo->nKeyField + 1 );
-+   p->nField = u;
-+ }
-+ 
-+@@ -75743,9 +75924,9 @@ static int vdbeRecordCompareDebug(
-+   idx1 = getVarint32(aKey1, szHdr1);
-+   if( szHdr1>98307 ) return SQLITE_CORRUPT;
-+   d1 = szHdr1;
-+-  assert( pKeyInfo->nField+pKeyInfo->nXField>=pPKey2->nField || CORRUPT_DB );
-++  assert( pKeyInfo->nAllField>=pPKey2->nField || CORRUPT_DB );
-+   assert( pKeyInfo->aSortOrder!=0 );
-+-  assert( pKeyInfo->nField>0 );
-++  assert( pKeyInfo->nKeyField>0 );
-+   assert( idx1<=szHdr1 || CORRUPT_DB );
-+   do{
-+     u32 serial_type1;
-+@@ -75807,12 +75988,12 @@ debugCompareEnd:
-+ /*
-+ ** Count the number of fields (a.k.a. columns) in the record given by
-+ ** pKey,nKey.  The verify that this count is less than or equal to the
-+-** limit given by pKeyInfo->nField + pKeyInfo->nXField.
-++** limit given by pKeyInfo->nAllField.
-+ **
-+ ** If this constraint is not satisfied, it means that the high-speed
-+ ** vdbeRecordCompareInt() and vdbeRecordCompareString() routines will
-+ ** not work correctly.  If this assert() ever fires, it probably means
-+-** that the KeyInfo.nField or KeyInfo.nXField values were computed
-++** that the KeyInfo.nKeyField or KeyInfo.nAllField values were computed
-+ ** incorrectly.
-+ */
-+ static void vdbeAssertFieldCountWithinLimits(
-+@@ -75833,7 +76014,7 @@ static void vdbeAssertFieldCountWithinLimits(
-+     idx += getVarint32(aKey+idx, notUsed);
-+     nField++;
-+   }
-+-  assert( nField <= pKeyInfo->nField+pKeyInfo->nXField );
-++  assert( nField <= pKeyInfo->nAllField );
-+ }
-+ #else
-+ # define vdbeAssertFieldCountWithinLimits(A,B,C)
-+@@ -76138,10 +76319,10 @@ SQLITE_PRIVATE int sqlite3VdbeRecordCompareWithSkip(
-+   }
-+ 
-+   VVA_ONLY( mem1.szMalloc = 0; ) /* Only needed by assert() statements */
-+-  assert( pPKey2->pKeyInfo->nField+pPKey2->pKeyInfo->nXField>=pPKey2->nField
-++  assert( pPKey2->pKeyInfo->nAllField>=pPKey2->nField
-+        || CORRUPT_DB );
-+   assert( pPKey2->pKeyInfo->aSortOrder!=0 );
-+-  assert( pPKey2->pKeyInfo->nField>0 );
-++  assert( pPKey2->pKeyInfo->nKeyField>0 );
-+   assert( idx1<=szHdr1 || CORRUPT_DB );
-+   do{
-+     u32 serial_type;
-+@@ -76474,7 +76655,7 @@ SQLITE_PRIVATE RecordCompare sqlite3VdbeFindCompare(UnpackedRecord *p){
-+   ** The easiest way to enforce this limit is to consider only records with
-+   ** 13 fields or less. If the first field is an integer, the maximum legal
-+   ** header size is (12*5 + 1 + 1) bytes.  */
-+-  if( (p->pKeyInfo->nField + p->pKeyInfo->nXField)<=13 ){
-++  if( p->pKeyInfo->nAllField<=13 ){
-+     int flags = p->aMem[0].flags;
-+     if( p->pKeyInfo->aSortOrder[0] ){
-+       p->r1 = 1;
-+@@ -76803,7 +76984,7 @@ SQLITE_PRIVATE void sqlite3VdbePreUpdateHook(
-+   preupdate.iNewReg = iReg;
-+   preupdate.keyinfo.db = db;
-+   preupdate.keyinfo.enc = ENC(db);
-+-  preupdate.keyinfo.nField = pTab->nCol;
-++  preupdate.keyinfo.nKeyField = pTab->nCol;
-+   preupdate.keyinfo.aSortOrder = (u8*)&fakeSortOrder;
-+   preupdate.iKey1 = iKey1;
-+   preupdate.iKey2 = iKey2;
-+@@ -76813,8 +76994,8 @@ SQLITE_PRIVATE void sqlite3VdbePreUpdateHook(
-+   db->xPreUpdateCallback(db->pPreUpdateArg, db, op, zDb, zTbl, iKey1, iKey2);
-+   db->pPreUpdate = 0;
-+   sqlite3DbFree(db, preupdate.aRecord);
-+-  vdbeFreeUnpacked(db, preupdate.keyinfo.nField+1, preupdate.pUnpacked);
-+-  vdbeFreeUnpacked(db, preupdate.keyinfo.nField+1, preupdate.pNewUnpacked);
-++  vdbeFreeUnpacked(db, preupdate.keyinfo.nKeyField+1, preupdate.pUnpacked);
-++  vdbeFreeUnpacked(db, preupdate.keyinfo.nKeyField+1, preupdate.pNewUnpacked);
-+   if( preupdate.aNew ){
-+     int i;
-+     for(i=0; i<pCsr->nField; i++){
-+@@ -77346,7 +77527,7 @@ static int doWalCallbacks(sqlite3 *db){
-+       sqlite3BtreeEnter(pBt);
-+       nEntry = sqlite3PagerWalCallback(sqlite3BtreePager(pBt));
-+       sqlite3BtreeLeave(pBt);
-+-      if( db->xWalCallback && nEntry>0 && rc==SQLITE_OK ){
-++      if( nEntry>0 && db->xWalCallback && rc==SQLITE_OK ){
-+         rc = db->xWalCallback(db->pWalArg, db, db->aDb[i].zDbSName, nEntry);
-+       }
-+     }
-+@@ -77456,7 +77637,7 @@ static int sqlite3Step(Vdbe *p){
-+   if( rc!=SQLITE_ROW ) checkProfileCallback(db, p);
-+ #endif
-+ 
-+-  if( rc==SQLITE_DONE ){
-++  if( rc==SQLITE_DONE && db->autoCommit ){
-+     assert( p->rc==SQLITE_OK );
-+     p->rc = doWalCallbacks(db);
-+     if( p->rc!=SQLITE_OK ){
-+@@ -77500,7 +77681,6 @@ end_of_step:
-+ */
-+ SQLITE_API int sqlite3_step(sqlite3_stmt *pStmt){
-+   int rc = SQLITE_OK;      /* Result from sqlite3Step() */
-+-  int rc2 = SQLITE_OK;     /* Result from sqlite3Reprepare() */
-+   Vdbe *v = (Vdbe*)pStmt;  /* the prepared statement */
-+   int cnt = 0;             /* Counter to prevent infinite loop of reprepares */
-+   sqlite3 *db;             /* The database connection */
-+@@ -77514,32 +77694,31 @@ SQLITE_API int sqlite3_step(sqlite3_stmt *pStmt){
-+   while( (rc = sqlite3Step(v))==SQLITE_SCHEMA
-+          && cnt++ < SQLITE_MAX_SCHEMA_RETRY ){
-+     int savedPc = v->pc;
-+-    rc2 = rc = sqlite3Reprepare(v);
-+-    if( rc!=SQLITE_OK) break;
-++    rc = sqlite3Reprepare(v);
-++    if( rc!=SQLITE_OK ){
-++      /* This case occurs after failing to recompile an sql statement.
-++      ** The error message from the SQL compiler has already been loaded
-++      ** into the database handle. This block copies the error message
-++      ** from the database handle into the statement and sets the statement
-++      ** program counter to 0 to ensure that when the statement is
-++      ** finalized or reset the parser error message is available via
-++      ** sqlite3_errmsg() and sqlite3_errcode().
-++      */
-++      const char *zErr = (const char *)sqlite3_value_text(db->pErr);
-++      sqlite3DbFree(db, v->zErrMsg);
-++      if( !db->mallocFailed ){
-++        v->zErrMsg = sqlite3DbStrDup(db, zErr);
-++        v->rc = rc = sqlite3ApiExit(db, rc);
-++      } else {
-++        v->zErrMsg = 0;
-++        v->rc = rc = SQLITE_NOMEM_BKPT;
-++      }
-++      break;
-++    }
-+     sqlite3_reset(pStmt);
-+     if( savedPc>=0 ) v->doingRerun = 1;
-+     assert( v->expired==0 );
-+   }
-+-  if( rc2!=SQLITE_OK ){
-+-    /* This case occurs after failing to recompile an sql statement.
-+-    ** The error message from the SQL compiler has already been loaded
-+-    ** into the database handle. This block copies the error message
-+-    ** from the database handle into the statement and sets the statement
-+-    ** program counter to 0 to ensure that when the statement is
-+-    ** finalized or reset the parser error message is available via
-+-    ** sqlite3_errmsg() and sqlite3_errcode().
-+-    */
-+-    const char *zErr = (const char *)sqlite3_value_text(db->pErr);
-+-    sqlite3DbFree(db, v->zErrMsg);
-+-    if( !db->mallocFailed ){
-+-      v->zErrMsg = sqlite3DbStrDup(db, zErr);
-+-      v->rc = rc2;
-+-    } else {
-+-      v->zErrMsg = 0;
-+-      v->rc = rc = SQLITE_NOMEM_BKPT;
-+-    }
-+-  }
-+-  rc = sqlite3ApiExit(db, rc);
-+   sqlite3_mutex_leave(db->mutex);
-+   return rc;
-+ }
-+@@ -78537,7 +78716,7 @@ static UnpackedRecord *vdbeUnpackRecord(
-+ 
-+   pRet = sqlite3VdbeAllocUnpackedRecord(pKeyInfo);
-+   if( pRet ){
-+-    memset(pRet->aMem, 0, sizeof(Mem)*(pKeyInfo->nField+1));
-++    memset(pRet->aMem, 0, sizeof(Mem)*(pKeyInfo->nKeyField+1));
-+     sqlite3VdbeRecordUnpack(pKeyInfo, nKey, pKey, pRet);
-+   }
-+   return pRet;
-+@@ -78610,7 +78789,7 @@ SQLITE_API int sqlite3_preupdate_old(sqlite3 *db, int iIdx, sqlite3_value **ppVa
-+ */
-+ SQLITE_API int sqlite3_preupdate_count(sqlite3 *db){
-+   PreUpdate *p = db->pPreUpdate;
-+-  return (p ? p->keyinfo.nField : 0);
-++  return (p ? p->keyinfo.nKeyField : 0);
-+ }
-+ #endif /* SQLITE_ENABLE_PREUPDATE_HOOK */
-+ 
-+@@ -78863,7 +79042,7 @@ SQLITE_PRIVATE char *sqlite3VdbeExpandSql(
-+   Mem *pVar;               /* Value of a host parameter */
-+   StrAccum out;            /* Accumulate the output here */
-+ #ifndef SQLITE_OMIT_UTF16
-+-  Mem utf8;                /* Used to convert UTF16 parameters into UTF8 for display */
-++  Mem utf8;                /* Used to convert UTF16 into UTF8 for display */
-+ #endif
-+   char zBase[100];         /* Initial working space */
-+ 
-+@@ -79332,7 +79511,7 @@ static u16 SQLITE_NOINLINE computeNumericType(Mem *pMem){
-+   if( sqlite3AtoF(pMem->z, &pMem->u.r, pMem->n, pMem->enc)==0 ){
-+     return 0;
-+   }
-+-  if( sqlite3Atoi64(pMem->z, &pMem->u.i, pMem->n, pMem->enc)==SQLITE_OK ){
-++  if( sqlite3Atoi64(pMem->z, &pMem->u.i, pMem->n, pMem->enc)==0 ){
-+     return MEM_Int;
-+   }
-+   return MEM_Real;
-+@@ -81022,13 +81201,23 @@ case OP_Ge: {             /* same as TK_GE, jump, in1, in3 */
-+     res = sqlite3MemCompare(pIn3, pIn1, pOp->p4.pColl);
-+   }
-+ compare_op:
-+-  switch( pOp->opcode ){
-+-    case OP_Eq:    res2 = res==0;     break;
-+-    case OP_Ne:    res2 = res;        break;
-+-    case OP_Lt:    res2 = res<0;      break;
-+-    case OP_Le:    res2 = res<=0;     break;
-+-    case OP_Gt:    res2 = res>0;      break;
-+-    default:       res2 = res>=0;     break;
-++  /* At this point, res is negative, zero, or positive if reg[P1] is
-++  ** less than, equal to, or greater than reg[P3], respectively.  Compute
-++  ** the answer to this operator in res2, depending on what the comparison
-++  ** operator actually is.  The next block of code depends on the fact
-++  ** that the 6 comparison operators are consecutive integers in this
-++  ** order:  NE, EQ, GT, LE, LT, GE */
-++  assert( OP_Eq==OP_Ne+1 ); assert( OP_Gt==OP_Ne+2 ); assert( OP_Le==OP_Ne+3 );
-++  assert( OP_Lt==OP_Ne+4 ); assert( OP_Ge==OP_Ne+5 );
-++  if( res<0 ){                        /* ne, eq, gt, le, lt, ge */
-++    static const unsigned char aLTb[] = { 1,  0,  0,  1,  1,  0 };
-++    res2 = aLTb[pOp->opcode - OP_Ne];
-++  }else if( res==0 ){
-++    static const unsigned char aEQb[] = { 0,  1,  0,  1,  0,  1 };
-++    res2 = aEQb[pOp->opcode - OP_Ne];
-++  }else{
-++    static const unsigned char aGTb[] = { 1,  0,  1,  0,  0,  1 };
-++    res2 = aGTb[pOp->opcode - OP_Ne];
-+   }
-+ 
-+   /* Undo any changes made by applyAffinity() to the input registers. */
-+@@ -81040,7 +81229,6 @@ compare_op:
-+   if( pOp->p5 & SQLITE_STOREP2 ){
-+     pOut = &aMem[pOp->p2];
-+     iCompare = res;
-+-    res2 = res2!=0;  /* For this path res2 must be exactly 0 or 1 */
-+     if( (pOp->p5 & SQLITE_KEEPNULL)!=0 ){
-+       /* The KEEPNULL flag prevents OP_Eq from overwriting a NULL with 1
-+       ** and prevents OP_Ne from overwriting NULL with 0.  This flag
-+@@ -81171,7 +81359,7 @@ case OP_Compare: {
-+     assert( memIsValid(&aMem[p2+idx]) );
-+     REGISTER_TRACE(p1+idx, &aMem[p1+idx]);
-+     REGISTER_TRACE(p2+idx, &aMem[p2+idx]);
-+-    assert( i<pKeyInfo->nField );
-++    assert( i<pKeyInfo->nKeyField );
-+     pColl = pKeyInfo->aColl[i];
-+     bRev = pKeyInfo->aSortOrder[i];
-+     iCompare = sqlite3MemCompare(&aMem[p1+idx], &aMem[p2+idx], pColl);
-+@@ -81444,9 +81632,7 @@ case OP_Column: {
-+   const u8 *zData;   /* Part of the record being decoded */
-+   const u8 *zHdr;    /* Next unparsed byte of the header */
-+   const u8 *zEndHdr; /* Pointer to first byte after the header */
-+-  u32 offset;        /* Offset into the data */
-+   u64 offset64;      /* 64-bit offset */
-+-  u32 avail;         /* Number of bytes of available data */
-+   u32 t;             /* A type code from the record header */
-+   Mem *pReg;         /* PseudoTable input register */
-+ 
-+@@ -81473,11 +81659,13 @@ case OP_Column: {
-+   if( pC->cacheStatus!=p->cacheCtr ){                /*OPTIMIZATION-IF-FALSE*/
-+     if( pC->nullRow ){
-+       if( pC->eCurType==CURTYPE_PSEUDO ){
-+-        assert( pC->uc.pseudoTableReg>0 );
-+-        pReg = &aMem[pC->uc.pseudoTableReg];
-++        /* For the special case of as pseudo-cursor, the seekResult field
-++        ** identifies the register that holds the record */
-++        assert( pC->seekResult>0 );
-++        pReg = &aMem[pC->seekResult];
-+         assert( pReg->flags & MEM_Blob );
-+         assert( memIsValid(pReg) );
-+-        pC->payloadSize = pC->szRow = avail = pReg->n;
-++        pC->payloadSize = pC->szRow = pReg->n;
-+         pC->aRow = (u8*)pReg->z;
-+       }else{
-+         sqlite3VdbeMemSetNull(pDest);
-+@@ -81489,23 +81677,19 @@ case OP_Column: {
-+       assert( pCrsr );
-+       assert( sqlite3BtreeCursorIsValid(pCrsr) );
-+       pC->payloadSize = sqlite3BtreePayloadSize(pCrsr);
-+-      pC->aRow = sqlite3BtreePayloadFetch(pCrsr, &avail);
-+-      assert( avail<=65536 );  /* Maximum page size is 64KiB */
-+-      if( pC->payloadSize <= (u32)avail ){
-+-        pC->szRow = pC->payloadSize;
-+-      }else if( pC->payloadSize > (u32)db->aLimit[SQLITE_LIMIT_LENGTH] ){
-++      pC->aRow = sqlite3BtreePayloadFetch(pCrsr, &pC->szRow);
-++      assert( pC->szRow<=pC->payloadSize );
-++      assert( pC->szRow<=65536 );  /* Maximum page size is 64KiB */
-++      if( pC->payloadSize > (u32)db->aLimit[SQLITE_LIMIT_LENGTH] ){
-+         goto too_big;
-+-      }else{
-+-        pC->szRow = avail;
-+       }
-+     }
-+     pC->cacheStatus = p->cacheCtr;
-+-    pC->iHdrOffset = getVarint32(pC->aRow, offset);
-++    pC->iHdrOffset = getVarint32(pC->aRow, aOffset[0]);
-+     pC->nHdrParsed = 0;
-+-    aOffset[0] = offset;
-+ 
-+ 
-+-    if( avail<offset ){      /*OPTIMIZATION-IF-FALSE*/
-++    if( pC->szRow<aOffset[0] ){      /*OPTIMIZATION-IF-FALSE*/
-+       /* pC->aRow does not have to hold the entire row, but it does at least
-+       ** need to cover the header of the record.  If pC->aRow does not contain
-+       ** the complete header, then set it to zero, forcing the header to be
-+@@ -81522,17 +81706,26 @@ case OP_Column: {
-+       ** 3-byte type for each of the maximum of 32768 columns plus three
-+       ** extra bytes for the header length itself.  32768*3 + 3 = 98307.
-+       */
-+-      if( offset > 98307 || offset > pC->payloadSize ){
-+-        rc = SQLITE_CORRUPT_BKPT;
-+-        goto abort_due_to_error;
-++      if( aOffset[0] > 98307 || aOffset[0] > pC->payloadSize ){
-++        goto op_column_corrupt;
-+       }
-+-    }else if( offset>0 ){ /*OPTIMIZATION-IF-TRUE*/
-+-      /* The following goto is an optimization.  It can be omitted and
-+-      ** everything will still work.  But OP_Column is measurably faster
-+-      ** by skipping the subsequent conditional, which is always true.
-++    }else{
-++      /* This is an optimization.  By skipping over the first few tests
-++      ** (ex: pC->nHdrParsed<=p2) in the next section, we achieve a
-++      ** measurable performance gain.
-++      **
-++      ** This branch is taken even if aOffset[0]==0.  Such a record is never
-++      ** generated by SQLite, and could be considered corruption, but we
-++      ** accept it for historical reasons.  When aOffset[0]==0, the code this
-++      ** branch jumps to reads past the end of the record, but never more
-++      ** than a few bytes.  Even if the record occurs at the end of the page
-++      ** content area, the "page header" comes after the page content and so
-++      ** this overread is harmless.  Similar overreads can occur for a corrupt
-++      ** database file.
-+       */
-+       zData = pC->aRow;
-+       assert( pC->nHdrParsed<=p2 );         /* Conditional skipped */
-++      testcase( aOffset[0]==0 );
-+       goto op_column_read_header;
-+     }
-+   }
-+@@ -81561,6 +81754,7 @@ case OP_Column: {
-+       offset64 = aOffset[i];
-+       zHdr = zData + pC->iHdrOffset;
-+       zEndHdr = zData + aOffset[0];
-++      testcase( zHdr>=zEndHdr );
-+       do{
-+         if( (t = zHdr[0])<0x80 ){
-+           zHdr++;
-+@@ -81581,9 +81775,13 @@ case OP_Column: {
-+       if( (zHdr>=zEndHdr && (zHdr>zEndHdr || offset64!=pC->payloadSize))
-+        || (offset64 > pC->payloadSize)
-+       ){
-+-        if( pC->aRow==0 ) sqlite3VdbeMemRelease(&sMem);
-+-        rc = SQLITE_CORRUPT_BKPT;
-+-        goto abort_due_to_error;
-++        if( aOffset[0]==0 ){
-++          i = 0;
-++          zHdr = zEndHdr;
-++        }else{
-++          if( pC->aRow==0 ) sqlite3VdbeMemRelease(&sMem);
-++          goto op_column_corrupt;
-++        }
-+       }
-+ 
-+       pC->nHdrParsed = i;
-+@@ -81677,6 +81875,15 @@ op_column_out:
-+   UPDATE_MAX_BLOBSIZE(pDest);
-+   REGISTER_TRACE(pOp->p3, pDest);
-+   break;
-++
-++op_column_corrupt:
-++  if( aOp[0].p3>0 ){
-++    pOp = &aOp[aOp[0].p3-1];
-++    break;
-++  }else{
-++    rc = SQLITE_CORRUPT_BKPT;
-++    goto abort_due_to_error;
-++  }
-+ }
-+ 
-+ /* Opcode: Affinity P1 P2 * P4 *
-+@@ -82017,7 +82224,7 @@ case OP_Savepoint: {
-+         int isSchemaChange;
-+         iSavepoint = db->nSavepoint - iSavepoint - 1;
-+         if( p1==SAVEPOINT_ROLLBACK ){
-+-          isSchemaChange = (db->flags & SQLITE_InternChanges)!=0;
-++          isSchemaChange = (db->mDbFlags & DBFLAG_SchemaChange)!=0;
-+           for(ii=0; ii<db->nDb; ii++){
-+             rc = sqlite3BtreeTripAllCursors(db->aDb[ii].pBt,
-+                                        SQLITE_ABORT_ROLLBACK,
-+@@ -82036,7 +82243,7 @@ case OP_Savepoint: {
-+         if( isSchemaChange ){
-+           sqlite3ExpirePreparedStatements(db);
-+           sqlite3ResetAllSchemasOfConnection(db);
-+-          db->flags = (db->flags | SQLITE_InternChanges);
-++          db->mDbFlags |= DBFLAG_SchemaChange;
-+         }
-+       }
-+ 
-+@@ -82316,7 +82523,7 @@ case OP_SetCookie: {
-+   if( pOp->p2==BTREE_SCHEMA_VERSION ){
-+     /* When the schema cookie changes, record the new cookie internally */
-+     pDb->pSchema->schema_cookie = pOp->p3;
-+-    db->flags |= SQLITE_InternChanges;
-++    db->mDbFlags |= DBFLAG_SchemaChange;
-+   }else if( pOp->p2==BTREE_FILE_FORMAT ){
-+     /* Record changes in the file format */
-+     pDb->pSchema->file_format = pOp->p3;
-+@@ -82455,7 +82662,7 @@ case OP_OpenWrite:
-+     assert( (pIn2->flags & MEM_Int)!=0 );
-+     sqlite3VdbeMemIntegerify(pIn2);
-+     p2 = (int)pIn2->u.i;
-+-    /* The p2 value always comes from a prior OP_CreateTable opcode and
-++    /* The p2 value always comes from a prior OP_CreateBtree opcode and
-+     ** that opcode will always set the p2 value to 2 or more or else fail.
-+     ** If there were a failure, the prepared statement would have halted
-+     ** before reaching this instruction. */
-+@@ -82465,7 +82672,7 @@ case OP_OpenWrite:
-+     pKeyInfo = pOp->p4.pKeyInfo;
-+     assert( pKeyInfo->enc==ENC(db) );
-+     assert( pKeyInfo->db==db );
-+-    nField = pKeyInfo->nField+pKeyInfo->nXField;
-++    nField = pKeyInfo->nAllField;
-+   }else if( pOp->p4type==P4_INT32 ){
-+     nField = pOp->p4.i;
-+   }
-+@@ -82676,8 +82883,13 @@ case OP_OpenPseudo: {
-+   pCx = allocateCursor(p, pOp->p1, pOp->p3, -1, CURTYPE_PSEUDO);
-+   if( pCx==0 ) goto no_mem;
-+   pCx->nullRow = 1;
-+-  pCx->uc.pseudoTableReg = pOp->p2;
-++  pCx->seekResult = pOp->p2;
-+   pCx->isTable = 1;
-++  /* Give this pseudo-cursor a fake BtCursor pointer so that pCx
-++  ** can be safely passed to sqlite3VdbeCursorMoveto().  This avoids a test
-++  ** for pCx->eCurType==CURTYPE_BTREE inside of sqlite3VdbeCursorMoveto()
-++  ** which is a performance optimization */
-++  pCx->uc.pCursor = sqlite3BtreeFakeValidCursor();
-+   assert( pOp->p5==0 );
-+   break;
-+ }
-+@@ -83469,14 +83681,9 @@ case OP_InsertInt: {
-+ 
-+   if( pOp->p5 & OPFLAG_NCHANGE ) p->nChange++;
-+   if( pOp->p5 & OPFLAG_LASTROWID ) db->lastRowid = x.nKey;
-+-  if( pData->flags & MEM_Null ){
-+-    x.pData = 0;
-+-    x.nData = 0;
-+-  }else{
-+-    assert( pData->flags & (MEM_Blob|MEM_Str) );
-+-    x.pData = pData->z;
-+-    x.nData = pData->n;
-+-  }
-++  assert( pData->flags & (MEM_Blob|MEM_Str) );
-++  x.pData = pData->z;
-++  x.nData = pData->n;
-+   seekResult = ((pOp->p5 & OPFLAG_USESEEKRESULT) ? pC->seekResult : 0);
-+   if( pData->flags & MEM_Zero ){
-+     x.nZero = pData->u.nZero;
-+@@ -83843,7 +84050,17 @@ case OP_NullRow: {
-+   break;
-+ }
-+ 
-+-/* Opcode: Last P1 P2 P3 * *
-++/* Opcode: SeekEnd P1 * * * *
-++**
-++** Position cursor P1 at the end of the btree for the purpose of
-++** appending a new entry onto the btree.
-++**
-++** It is assumed that the cursor is used only for appending and so
-++** if the cursor is valid, then the cursor must already be pointing
-++** at the end of the btree and so no changes are made to
-++** the cursor.
-++*/
-++/* Opcode: Last P1 P2 * * *
-+ **
-+ ** The next use of the Rowid or Column or Prev instruction for P1
-+ ** will refer to the last entry in the database table or index.
-+@@ -83854,14 +84071,8 @@ case OP_NullRow: {
-+ ** This opcode leaves the cursor configured to move in reverse order,
-+ ** from the end toward the beginning.  In other words, the cursor is
-+ ** configured to use Prev, not Next.
-+-**
-+-** If P3 is -1, then the cursor is positioned at the end of the btree
-+-** for the purpose of appending a new entry onto the btree.  In that
-+-** case P2 must be 0.  It is assumed that the cursor is used only for
-+-** appending and so if the cursor is valid, then the cursor must already
-+-** be pointing at the end of the btree and so no changes are made to
-+-** the cursor.
-+ */
-++case OP_SeekEnd:
-+ case OP_Last: {        /* jump */
-+   VdbeCursor *pC;
-+   BtCursor *pCrsr;
-+@@ -83874,22 +84085,24 @@ case OP_Last: {        /* jump */
-+   pCrsr = pC->uc.pCursor;
-+   res = 0;
-+   assert( pCrsr!=0 );
-+-  pC->seekResult = pOp->p3;
-+ #ifdef SQLITE_DEBUG
-+-  pC->seekOp = OP_Last;
-++  pC->seekOp = pOp->opcode;
-+ #endif
-+-  if( pOp->p3==0 || !sqlite3BtreeCursorIsValidNN(pCrsr) ){
-+-    rc = sqlite3BtreeLast(pCrsr, &res);
-+-    pC->nullRow = (u8)res;
-+-    pC->deferredMoveto = 0;
-+-    pC->cacheStatus = CACHE_STALE;
-+-    if( rc ) goto abort_due_to_error;
-+-    if( pOp->p2>0 ){
-+-      VdbeBranchTaken(res!=0,2);
-+-      if( res ) goto jump_to_p2;
-+-    }
-+-  }else{
-++  if( pOp->opcode==OP_SeekEnd ){
-+     assert( pOp->p2==0 );
-++    pC->seekResult = -1;
-++    if( sqlite3BtreeCursorIsValidNN(pCrsr) ){
-++      break;
-++    }
-++  }
-++  rc = sqlite3BtreeLast(pCrsr, &res);
-++  pC->nullRow = (u8)res;
-++  pC->deferredMoveto = 0;
-++  pC->cacheStatus = CACHE_STALE;
-++  if( rc ) goto abort_due_to_error;
-++  if( pOp->p2>0 ){
-++    VdbeBranchTaken(res!=0,2);
-++    if( res ) goto jump_to_p2;
-+   }
-+   break;
-+ }
-+@@ -84518,50 +84731,28 @@ case OP_ResetSorter: {
-+   break;
-+ }
-+ 
-+-/* Opcode: CreateTable P1 P2 * * *
-+-** Synopsis: r[P2]=root iDb=P1
-+-**
-+-** Allocate a new table in the main database file if P1==0 or in the
-+-** auxiliary database file if P1==1 or in an attached database if
-+-** P1>1.  Write the root page number of the new table into
-+-** register P2
-+-**
-+-** The difference between a table and an index is this:  A table must
-+-** have a 4-byte integer key and can have arbitrary data.  An index
-+-** has an arbitrary key but no data.
-+-**
-+-** See also: CreateIndex
-+-*/
-+-/* Opcode: CreateIndex P1 P2 * * *
-+-** Synopsis: r[P2]=root iDb=P1
-+-**
-+-** Allocate a new index in the main database file if P1==0 or in the
-+-** auxiliary database file if P1==1 or in an attached database if
-+-** P1>1.  Write the root page number of the new table into
-+-** register P2.
-++/* Opcode: CreateBtree P1 P2 P3 * *
-++** Synopsis: r[P2]=root iDb=P1 flags=P3
-+ **
-+-** See documentation on OP_CreateTable for additional information.
-++** Allocate a new b-tree in the main database file if P1==0 or in the
-++** TEMP database file if P1==1 or in an attached database if
-++** P1>1.  The P3 argument must be 1 (BTREE_INTKEY) for a rowid table
-++** it must be 2 (BTREE_BLOBKEY) for a index or WITHOUT ROWID table.
-++** The root page number of the new b-tree is stored in register P2.
-+ */
-+-case OP_CreateIndex:            /* out2 */
-+-case OP_CreateTable: {          /* out2 */
-++case OP_CreateBtree: {          /* out2 */
-+   int pgno;
-+-  int flags;
-+   Db *pDb;
-+ 
-+   pOut = out2Prerelease(p, pOp);
-+   pgno = 0;
-++  assert( pOp->p3==BTREE_INTKEY || pOp->p3==BTREE_BLOBKEY );
-+   assert( pOp->p1>=0 && pOp->p1<db->nDb );
-+   assert( DbMaskTest(p->btreeMask, pOp->p1) );
-+   assert( p->readOnly==0 );
-+   pDb = &db->aDb[pOp->p1];
-+   assert( pDb->pBt!=0 );
-+-  if( pOp->opcode==OP_CreateTable ){
-+-    /* flags = BTREE_INTKEY; */
-+-    flags = BTREE_INTKEY;
-+-  }else{
-+-    flags = BTREE_BLOBKEY;
-+-  }
-+-  rc = sqlite3BtreeCreateTable(pDb->pBt, &pgno, flags);
-++  rc = sqlite3BtreeCreateTable(pDb->pBt, &pgno, pOp->p3);
-+   if( rc ) goto abort_due_to_error;
-+   pOut->u.i = pgno;
-+   break;
-+@@ -86072,7 +86263,7 @@ case OP_Function: {
-+ }
-+ 
-+ 
-+-/* Opcode: Init P1 P2 * P4 *
-++/* Opcode: Init P1 P2 P3 P4 *
-+ ** Synopsis: Start at P2
-+ **
-+ ** Programs contain a single instance of this opcode as the very first
-+@@ -86086,6 +86277,9 @@ case OP_Function: {
-+ **
-+ ** Increment the value of P1 so that OP_Once opcodes will jump the
-+ ** first time they are evaluated for this run.
-++**
-++** If P3 is not zero, then it is an address to jump to if an SQLITE_CORRUPT
-++** error is encountered.
-+ */
-+ case OP_Init: {          /* jump */
-+   char *zTrace;
-+@@ -86360,11 +86554,12 @@ static int blobSeekToRow(Incrblob *p, sqlite3_int64 iRow, char **pzErr){
-+   v->aMem[1].u.i = iRow;
-+ 
-+   /* If the statement has been run before (and is paused at the OP_ResultRow)
-+-  ** then back it up to the point where it does the OP_SeekRowid.  This could
-++  ** then back it up to the point where it does the OP_NotExists.  This could
-+   ** have been down with an extra OP_Goto, but simply setting the program
-+   ** counter is faster. */
-+-  if( v->pc>3 ){
-+-    v->pc = 3;
-++  if( v->pc>4 ){
-++    v->pc = 4;
-++    assert( v->aOp[v->pc].opcode==OP_NotExists );
-+     rc = sqlite3VdbeExec(v);
-+   }else{
-+     rc = sqlite3_step(p->pStmt);
-+@@ -86426,8 +86621,8 @@ SQLITE_API int sqlite3_blob_open(
-+   int rc = SQLITE_OK;
-+   char *zErr = 0;
-+   Table *pTab;
-+-  Parse *pParse = 0;
-+   Incrblob *pBlob = 0;
-++  Parse sParse;
-+ 
-+ #ifdef SQLITE_ENABLE_API_ARMOR
-+   if( ppBlob==0 ){
-+@@ -86445,37 +86640,34 @@ SQLITE_API int sqlite3_blob_open(
-+   sqlite3_mutex_enter(db->mutex);
-+ 
-+   pBlob = (Incrblob *)sqlite3DbMallocZero(db, sizeof(Incrblob));
-+-  if( !pBlob ) goto blob_open_out;
-+-  pParse = sqlite3StackAllocRaw(db, sizeof(*pParse));
-+-  if( !pParse ) goto blob_open_out;
-+-
-+   do {
-+-    memset(pParse, 0, sizeof(Parse));
-+-    pParse->db = db;
-++    memset(&sParse, 0, sizeof(Parse));
-++    if( !pBlob ) goto blob_open_out;
-++    sParse.db = db;
-+     sqlite3DbFree(db, zErr);
-+     zErr = 0;
-+ 
-+     sqlite3BtreeEnterAll(db);
-+-    pTab = sqlite3LocateTable(pParse, 0, zTable, zDb);
-++    pTab = sqlite3LocateTable(&sParse, 0, zTable, zDb);
-+     if( pTab && IsVirtual(pTab) ){
-+       pTab = 0;
-+-      sqlite3ErrorMsg(pParse, "cannot open virtual table: %s", zTable);
-++      sqlite3ErrorMsg(&sParse, "cannot open virtual table: %s", zTable);
-+     }
-+     if( pTab && !HasRowid(pTab) ){
-+       pTab = 0;
-+-      sqlite3ErrorMsg(pParse, "cannot open table without rowid: %s", zTable);
-++      sqlite3ErrorMsg(&sParse, "cannot open table without rowid: %s", zTable);
-+     }
-+ #ifndef SQLITE_OMIT_VIEW
-+     if( pTab && pTab->pSelect ){
-+       pTab = 0;
-+-      sqlite3ErrorMsg(pParse, "cannot open view: %s", zTable);
-++      sqlite3ErrorMsg(&sParse, "cannot open view: %s", zTable);
-+     }
-+ #endif
-+     if( !pTab ){
-+-      if( pParse->zErrMsg ){
-++      if( sParse.zErrMsg ){
-+         sqlite3DbFree(db, zErr);
-+-        zErr = pParse->zErrMsg;
-+-        pParse->zErrMsg = 0;
-++        zErr = sParse.zErrMsg;
-++        sParse.zErrMsg = 0;
-+       }
-+       rc = SQLITE_ERROR;
-+       sqlite3BtreeLeaveAll(db);
-+@@ -86539,7 +86731,7 @@ SQLITE_API int sqlite3_blob_open(
-+       }
-+     }
-+ 
-+-    pBlob->pStmt = (sqlite3_stmt *)sqlite3VdbeCreate(pParse);
-++    pBlob->pStmt = (sqlite3_stmt *)sqlite3VdbeCreate(&sParse);
-+     assert( pBlob->pStmt || db->mallocFailed );
-+     if( pBlob->pStmt ){
-+ 
-+@@ -86576,6 +86768,7 @@ SQLITE_API int sqlite3_blob_open(
-+                            pTab->pSchema->schema_cookie,
-+                            pTab->pSchema->iGeneration);
-+       sqlite3VdbeChangeP5(v, 1);
-++      assert( sqlite3VdbeCurrentAddr(v)==2 || db->mallocFailed );
-+       aOp = sqlite3VdbeAddOpList(v, ArraySize(openBlob), openBlob, iLn);
-+ 
-+       /* Make sure a mutex is held on the table to be accessed */
-+@@ -86590,7 +86783,7 @@ SQLITE_API int sqlite3_blob_open(
-+         aOp[0].p1 = iDb;
-+         aOp[0].p2 = pTab->tnum;
-+         aOp[0].p3 = wrFlag;
-+-        sqlite3VdbeChangeP4(v, 1, pTab->zName, P4_TRANSIENT);
-++        sqlite3VdbeChangeP4(v, 2, pTab->zName, P4_TRANSIENT);
-+       }
-+       if( db->mallocFailed==0 ){
-+ #endif
-+@@ -86612,10 +86805,10 @@ SQLITE_API int sqlite3_blob_open(
-+         aOp[1].p4.i = pTab->nCol+1;
-+         aOp[3].p2 = pTab->nCol;
-+ 
-+-        pParse->nVar = 0;
-+-        pParse->nMem = 1;
-+-        pParse->nTab = 1;
-+-        sqlite3VdbeMakeReady(v, pParse);
-++        sParse.nVar = 0;
-++        sParse.nMem = 1;
-++        sParse.nTab = 1;
-++        sqlite3VdbeMakeReady(v, &sParse);
-+       }
-+     }
-+ 
-+@@ -86637,8 +86830,7 @@ blob_open_out:
-+   }
-+   sqlite3ErrorWithMsg(db, rc, (zErr ? "%s" : 0), zErr);
-+   sqlite3DbFree(db, zErr);
-+-  sqlite3ParserReset(pParse);
-+-  sqlite3StackFree(db, pParse);
-++  sqlite3ParserReset(&sParse);
-+   rc = sqlite3ApiExit(db, rc);
-+   sqlite3_mutex_leave(db->mutex);
-+   return rc;
-+@@ -87632,7 +87824,7 @@ static int vdbeSorterCompareText(
-+   }
-+ 
-+   if( res==0 ){
-+-    if( pTask->pSorter->pKeyInfo->nField>1 ){
-++    if( pTask->pSorter->pKeyInfo->nKeyField>1 ){
-+       res = vdbeSorterCompareTail(
-+           pTask, pbKey2Cached, pKey1, nKey1, pKey2, nKey2
-+       );
-+@@ -87701,7 +87893,7 @@ static int vdbeSorterCompareInt(
-+   }
-+ 
-+   if( res==0 ){
-+-    if( pTask->pSorter->pKeyInfo->nField>1 ){
-++    if( pTask->pSorter->pKeyInfo->nKeyField>1 ){
-+       res = vdbeSorterCompareTail(
-+           pTask, pbKey2Cached, pKey1, nKey1, pKey2, nKey2
-+       );
-+@@ -87716,7 +87908,7 @@ static int vdbeSorterCompareInt(
-+ /*
-+ ** Initialize the temporary index cursor just opened as a sorter cursor.
-+ **
-+-** Usually, the sorter module uses the value of (pCsr->pKeyInfo->nField)
-++** Usually, the sorter module uses the value of (pCsr->pKeyInfo->nKeyField)
-+ ** to determine the number of fields that should be compared from the
-+ ** records being sorted. However, if the value passed as argument nField
-+ ** is non-zero and the sorter is able to guarantee a stable sort, nField
-+@@ -87769,7 +87961,7 @@ SQLITE_PRIVATE int sqlite3VdbeSorterInit(
-+ 
-+   assert( pCsr->pKeyInfo && pCsr->pBtx==0 );
-+   assert( pCsr->eCurType==CURTYPE_SORTER );
-+-  szKeyInfo = sizeof(KeyInfo) + (pCsr->pKeyInfo->nField-1)*sizeof(CollSeq*);
-++  szKeyInfo = sizeof(KeyInfo) + (pCsr->pKeyInfo->nKeyField-1)*sizeof(CollSeq*);
-+   sz = sizeof(VdbeSorter) + nWorker * sizeof(SortSubtask);
-+ 
-+   pSorter = (VdbeSorter*)sqlite3DbMallocZero(db, sz + szKeyInfo);
-+@@ -87781,8 +87973,7 @@ SQLITE_PRIVATE int sqlite3VdbeSorterInit(
-+     memcpy(pKeyInfo, pCsr->pKeyInfo, szKeyInfo);
-+     pKeyInfo->db = 0;
-+     if( nField && nWorker==0 ){
-+-      pKeyInfo->nXField += (pKeyInfo->nField - nField);
-+-      pKeyInfo->nField = nField;
-++      pKeyInfo->nKeyField = nField;
-+     }
-+     pSorter->pgsz = pgsz = sqlite3BtreeGetPageSize(db->aDb[0].pBt);
-+     pSorter->nTask = nWorker + 1;
-+@@ -87810,11 +88001,9 @@ SQLITE_PRIVATE int sqlite3VdbeSorterInit(
-+       mxCache = MIN(mxCache, SQLITE_MAX_PMASZ);
-+       pSorter->mxPmaSize = MAX(pSorter->mnPmaSize, (int)mxCache);
-+ 
-+-      /* EVIDENCE-OF: R-26747-61719 When the application provides any amount of
-+-      ** scratch memory using SQLITE_CONFIG_SCRATCH, SQLite avoids unnecessary
-+-      ** large heap allocations.
-+-      */
-+-      if( sqlite3GlobalConfig.pScratch==0 ){
-++      /* Avoid large memory allocations if the application has requested
-++      ** SQLITE_CONFIG_SMALL_MALLOC. */
-++      if( sqlite3GlobalConfig.bSmallMalloc==0 ){
-+         assert( pSorter->iMemory==0 );
-+         pSorter->nMemory = pgsz;
-+         pSorter->list.aMemory = (u8*)sqlite3Malloc(pgsz);
-+@@ -87822,7 +88011,7 @@ SQLITE_PRIVATE int sqlite3VdbeSorterInit(
-+       }
-+     }
-+ 
-+-    if( (pKeyInfo->nField+pKeyInfo->nXField)<13
-++    if( pKeyInfo->nAllField<13
-+      && (pKeyInfo->aColl[0]==0 || pKeyInfo->aColl[0]==db->pDfltColl)
-+     ){
-+       pSorter->typeMask = SORTER_TYPE_INTEGER | SORTER_TYPE_TEXT;
-+@@ -88137,7 +88326,7 @@ static int vdbeSortAllocUnpacked(SortSubtask *pTask){
-+   if( pTask->pUnpacked==0 ){
-+     pTask->pUnpacked = sqlite3VdbeAllocUnpackedRecord(pTask->pSorter->pKeyInfo);
-+     if( pTask->pUnpacked==0 ) return SQLITE_NOMEM_BKPT;
-+-    pTask->pUnpacked->nField = pTask->pSorter->pKeyInfo->nField;
-++    pTask->pUnpacked->nField = pTask->pSorter->pKeyInfo->nKeyField;
-+     pTask->pUnpacked->errCode = 0;
-+   }
-+   return SQLITE_OK;
-+@@ -89661,7 +89850,8 @@ static int memjrnlRead(
-+   int iChunkOffset;
-+   FileChunk *pChunk;
-+ 
-+-#ifdef SQLITE_ENABLE_ATOMIC_WRITE
-++#if defined(SQLITE_ENABLE_ATOMIC_WRITE) \
-++ || defined(SQLITE_ENABLE_BATCH_ATOMIC_WRITE)
-+   if( (iAmt+iOfst)>p->endpoint.iOffset ){
-+     return SQLITE_IOERR_SHORT_READ;
-+   }
-+@@ -89780,7 +89970,8 @@ static int memjrnlWrite(
-+     ** atomic-write optimization. In this case the first 28 bytes of the
-+     ** journal file may be written as part of committing the transaction. */
-+     assert( iOfst==p->endpoint.iOffset || iOfst==0 );
-+-#ifdef SQLITE_ENABLE_ATOMIC_WRITE
-++#if defined(SQLITE_ENABLE_ATOMIC_WRITE) \
-++ || defined(SQLITE_ENABLE_BATCH_ATOMIC_WRITE)
-+     if( iOfst==0 && p->pFirst ){
-+       assert( p->nChunkSize>iAmt );
-+       memcpy((u8*)p->pFirst->zChunk, zBuf, iAmt);
-+@@ -89949,17 +90140,31 @@ SQLITE_PRIVATE void sqlite3MemJournalOpen(sqlite3_file *pJfd){
-+   sqlite3JournalOpen(0, 0, pJfd, 0, -1);
-+ }
-+ 
-+-#ifdef SQLITE_ENABLE_ATOMIC_WRITE
-++#if defined(SQLITE_ENABLE_ATOMIC_WRITE) \
-++ || defined(SQLITE_ENABLE_BATCH_ATOMIC_WRITE)
-+ /*
-+ ** If the argument p points to a MemJournal structure that is not an
-+ ** in-memory-only journal file (i.e. is one that was opened with a +ve
-+-** nSpill parameter), and the underlying file has not yet been created,
-+-** create it now.
-++** nSpill parameter or as SQLITE_OPEN_MAIN_JOURNAL), and the underlying
-++** file has not yet been created, create it now.
-+ */
-+-SQLITE_PRIVATE int sqlite3JournalCreate(sqlite3_file *p){
-++SQLITE_PRIVATE int sqlite3JournalCreate(sqlite3_file *pJfd){
-+   int rc = SQLITE_OK;
-+-  if( p->pMethods==&MemJournalMethods && ((MemJournal*)p)->nSpill>0 ){
-+-    rc = memjrnlCreateFile((MemJournal*)p);
-++  MemJournal *p = (MemJournal*)pJfd;
-++  if( p->pMethod==&MemJournalMethods && (
-++#ifdef SQLITE_ENABLE_ATOMIC_WRITE
-++     p->nSpill>0
-++#else
-++     /* While this appears to not be possible without ATOMIC_WRITE, the
-++     ** paths are complex, so it seems prudent to leave the test in as
-++     ** a NEVER(), in case our analysis is subtly flawed. */
-++     NEVER(p->nSpill>0)
-++#endif
-++#ifdef SQLITE_ENABLE_BATCH_ATOMIC_WRITE
-++     || (p->flags & SQLITE_OPEN_MAIN_JOURNAL)
-++#endif
-++  )){
-++    rc = memjrnlCreateFile(p);
-+   }
-+   return rc;
-+ }
-+@@ -90026,18 +90231,22 @@ static SQLITE_NOINLINE int walkExpr(Walker *pWalker, Expr *pExpr){
-+   int rc;
-+   testcase( ExprHasProperty(pExpr, EP_TokenOnly) );
-+   testcase( ExprHasProperty(pExpr, EP_Reduced) );
-+-  rc = pWalker->xExprCallback(pWalker, pExpr);
-+-  if( rc ) return rc & WRC_Abort;
-+-  if( !ExprHasProperty(pExpr,(EP_TokenOnly|EP_Leaf)) ){
-+-    if( pExpr->pLeft && walkExpr(pWalker, pExpr->pLeft) ) return WRC_Abort;
-+-    assert( pExpr->x.pList==0 || pExpr->pRight==0 );
-+-    if( pExpr->pRight ){
-+-      if( walkExpr(pWalker, pExpr->pRight) ) return WRC_Abort;
-+-    }else if( ExprHasProperty(pExpr, EP_xIsSelect) ){
-+-      if( sqlite3WalkSelect(pWalker, pExpr->x.pSelect) ) return WRC_Abort;
-+-    }else if( pExpr->x.pList ){
-+-      if( sqlite3WalkExprList(pWalker, pExpr->x.pList) ) return WRC_Abort;
-++  while(1){
-++    rc = pWalker->xExprCallback(pWalker, pExpr);
-++    if( rc ) return rc & WRC_Abort;
-++    if( !ExprHasProperty(pExpr,(EP_TokenOnly|EP_Leaf)) ){
-++      if( pExpr->pLeft && walkExpr(pWalker, pExpr->pLeft) ) return WRC_Abort;
-++       assert( pExpr->x.pList==0 || pExpr->pRight==0 );
-++      if( pExpr->pRight ){
-++        pExpr = pExpr->pRight;
-++        continue;
-++      }else if( ExprHasProperty(pExpr, EP_xIsSelect) ){
-++        if( sqlite3WalkSelect(pWalker, pExpr->x.pSelect) ) return WRC_Abort;
-++      }else if( pExpr->x.pList ){
-++        if( sqlite3WalkExprList(pWalker, pExpr->x.pList) ) return WRC_Abort;
-++      }
-+     }
-++    break;
-+   }
-+   return WRC_Continue;
-+ }
-+@@ -91105,12 +91314,10 @@ static int resolveCompoundOrderBy(
-+   pOrderBy = pSelect->pOrderBy;
-+   if( pOrderBy==0 ) return 0;
-+   db = pParse->db;
-+-#if SQLITE_MAX_COLUMN
-+   if( pOrderBy->nExpr>db->aLimit[SQLITE_LIMIT_COLUMN] ){
-+     sqlite3ErrorMsg(pParse, "too many terms in ORDER BY clause");
-+     return 1;
-+   }
-+-#endif
-+   for(i=0; i<pOrderBy->nExpr; i++){
-+     pOrderBy->a[i].done = 0;
-+   }
-+@@ -91202,12 +91409,10 @@ SQLITE_PRIVATE int sqlite3ResolveOrderGroupBy(
-+   struct ExprList_item *pItem;
-+ 
-+   if( pOrderBy==0 || pParse->db->mallocFailed ) return 0;
-+-#if SQLITE_MAX_COLUMN
-+   if( pOrderBy->nExpr>db->aLimit[SQLITE_LIMIT_COLUMN] ){
-+     sqlite3ErrorMsg(pParse, "too many terms in %s BY clause", zType);
-+     return 1;
-+   }
-+-#endif
-+   pEList = pSelect->pEList;
-+   assert( pEList!=0 );  /* sqlite3SelectNew() guarantees this */
-+   for(i=0, pItem=pOrderBy->a; i<pOrderBy->nExpr; i++, pItem++){
-+@@ -91808,6 +92013,11 @@ SQLITE_PRIVATE Expr *sqlite3ExprSkipCollate(Expr *pExpr){
-+ ** Return the collation sequence for the expression pExpr. If
-+ ** there is no defined collating sequence, return NULL.
-+ **
-++** See also: sqlite3ExprNNCollSeq()
-++**
-++** The sqlite3ExprNNCollSeq() works the same exact that it returns the
-++** default collation if pExpr has no defined collation.
-++**
-+ ** The collating sequence might be determined by a COLLATE operator
-+ ** or by the presence of a column with a defined collating sequence.
-+ ** COLLATE operators take first precedence.  Left operands take
-+@@ -91873,6 +92083,32 @@ SQLITE_PRIVATE CollSeq *sqlite3ExprCollSeq(Parse *pParse, Expr *pExpr){
-+ }
-+ 
-+ /*
-++** Return the collation sequence for the expression pExpr. If
-++** there is no defined collating sequence, return a pointer to the
-++** defautl collation sequence.
-++**
-++** See also: sqlite3ExprCollSeq()
-++**
-++** The sqlite3ExprCollSeq() routine works the same except that it
-++** returns NULL if there is no defined collation.
-++*/
-++SQLITE_PRIVATE CollSeq *sqlite3ExprNNCollSeq(Parse *pParse, Expr *pExpr){
-++  CollSeq *p = sqlite3ExprCollSeq(pParse, pExpr);
-++  if( p==0 ) p = pParse->db->pDfltColl;
-++  assert( p!=0 );
-++  return p;
-++}
-++
-++/*
-++** Return TRUE if the two expressions have equivalent collating sequences.
-++*/
-++SQLITE_PRIVATE int sqlite3ExprCollSeqMatch(Parse *pParse, Expr *pE1, Expr *pE2){
-++  CollSeq *pColl1 = sqlite3ExprNNCollSeq(pParse, pE1);
-++  CollSeq *pColl2 = sqlite3ExprNNCollSeq(pParse, pE2);
-++  return sqlite3StrICmp(pColl1->zName, pColl2->zName)==0;
-++}
-++
-++/*
-+ ** pExpr is an operand of a comparison operator.  aff2 is the
-+ ** type affinity of the other operand.  This routine returns the
-+ ** type affinity that should be used for the comparison operator.
-+@@ -92459,7 +92695,7 @@ SQLITE_PRIVATE Expr *sqlite3Expr(
-+ ){
-+   Token x;
-+   x.z = zToken;
-+-  x.n = zToken ? sqlite3Strlen30(zToken) : 0;
-++  x.n = sqlite3Strlen30(zToken);
-+   return sqlite3ExprAlloc(db, op, &x, 0);
-+ }
-+ 
-+@@ -92986,10 +93222,9 @@ SQLITE_PRIVATE ExprList *sqlite3ExprListDup(sqlite3 *db, ExprList *p, int flags)
-+   Expr *pPriorSelectCol = 0;
-+   assert( db!=0 );
-+   if( p==0 ) return 0;
-+-  pNew = sqlite3DbMallocRawNN(db,
-+-             sizeof(*pNew)+sizeof(pNew->a[0])*(p->nExpr-1) );
-++  pNew = sqlite3DbMallocRawNN(db, sqlite3DbMallocSize(db, p));
-+   if( pNew==0 ) return 0;
-+-  pNew->nAlloc = pNew->nExpr = p->nExpr;
-++  pNew->nExpr = p->nExpr;
-+   pItem = pNew->a;
-+   pOldItem = p->a;
-+   for(i=0; i<p->nExpr; i++, pItem++, pOldItem++){
-+@@ -93143,6 +93378,13 @@ SQLITE_PRIVATE Select *sqlite3SelectDup(sqlite3 *db, Select *p, int flags){
-+ ** Add a new element to the end of an expression list.  If pList is
-+ ** initially NULL, then create a new expression list.
-+ **
-++** The pList argument must be either NULL or a pointer to an ExprList
-++** obtained from a prior call to sqlite3ExprListAppend().  This routine
-++** may not be used with an ExprList obtained from sqlite3ExprListDup().
-++** Reason:  This routine assumes that the number of slots in pList->a[]
-++** is a power of two.  That is true for sqlite3ExprListAppend() returns
-++** but is not necessarily true from the return value of sqlite3ExprListDup().
-++**
-+ ** If a memory allocation error occurs, the entire list is freed and
-+ ** NULL is returned.  If non-NULL is returned, then it is guaranteed
-+ ** that the new entry was successfully appended.
-+@@ -93161,16 +93403,14 @@ SQLITE_PRIVATE ExprList *sqlite3ExprListAppend(
-+       goto no_mem;
-+     }
-+     pList->nExpr = 0;
-+-    pList->nAlloc = 1;
-+-  }else if( pList->nExpr==pList->nAlloc ){
-++  }else if( (pList->nExpr & (pList->nExpr-1))==0 ){
-+     ExprList *pNew;
-+     pNew = sqlite3DbRealloc(db, pList,
-+-             sizeof(*pList)+(2*pList->nAlloc - 1)*sizeof(pList->a[0]));
-++             sizeof(*pList)+(2*pList->nExpr - 1)*sizeof(pList->a[0]));
-+     if( pNew==0 ){
-+       goto no_mem;
-+     }
-+     pList = pNew;
-+-    pList->nAlloc *= 2;
-+   }
-+   pItem = &pList->a[pList->nExpr++];
-+   assert( offsetof(struct ExprList_item,zName)==sizeof(pItem->pExpr) );
-+@@ -93361,17 +93601,29 @@ SQLITE_PRIVATE void sqlite3ExprListDelete(sqlite3 *db, ExprList *pList){
-+ SQLITE_PRIVATE u32 sqlite3ExprListFlags(const ExprList *pList){
-+   int i;
-+   u32 m = 0;
-+-  if( pList ){
-+-    for(i=0; i<pList->nExpr; i++){
-+-       Expr *pExpr = pList->a[i].pExpr;
-+-       assert( pExpr!=0 );
-+-       m |= pExpr->flags;
-+-    }
-++  assert( pList!=0 );
-++  for(i=0; i<pList->nExpr; i++){
-++     Expr *pExpr = pList->a[i].pExpr;
-++     assert( pExpr!=0 );
-++     m |= pExpr->flags;
-+   }
-+   return m;
-+ }
-+ 
-+ /*
-++** This is a SELECT-node callback for the expression walker that
-++** always "fails".  By "fail" in this case, we mean set
-++** pWalker->eCode to zero and abort.
-++**
-++** This callback is used by multiple expression walkers.
-++*/
-++SQLITE_PRIVATE int sqlite3SelectWalkFail(Walker *pWalker, Select *NotUsed){
-++  UNUSED_PARAMETER(NotUsed);
-++  pWalker->eCode = 0;
-++  return WRC_Abort;
-++}
-++
-++/*
-+ ** These routines are Walker callbacks used to check expressions to
-+ ** see if they are "constant" for some definition of constant.  The
-+ ** Walker.eCode value determines the type of "constant" we are looking
-+@@ -93447,21 +93699,16 @@ static int exprNodeIsConstant(Walker *pWalker, Expr *pExpr){
-+       }
-+       /* Fall through */
-+     default:
-+-      testcase( pExpr->op==TK_SELECT ); /* selectNodeIsConstant will disallow */
-+-      testcase( pExpr->op==TK_EXISTS ); /* selectNodeIsConstant will disallow */
-++      testcase( pExpr->op==TK_SELECT ); /* sqlite3SelectWalkFail will disallow */
-++      testcase( pExpr->op==TK_EXISTS ); /* sqlite3SelectWalkFail will disallow */
-+       return WRC_Continue;
-+   }
-+ }
-+-static int selectNodeIsConstant(Walker *pWalker, Select *NotUsed){
-+-  UNUSED_PARAMETER(NotUsed);
-+-  pWalker->eCode = 0;
-+-  return WRC_Abort;
-+-}
-+ static int exprIsConst(Expr *p, int initFlag, int iCur){
-+   Walker w;
-+   w.eCode = initFlag;
-+   w.xExprCallback = exprNodeIsConstant;
-+-  w.xSelectCallback = selectNodeIsConstant;
-++  w.xSelectCallback = sqlite3SelectWalkFail;
-+ #ifdef SQLITE_DEBUG
-+   w.xSelectCallback2 = sqlite3SelectWalkAssert2;
-+ #endif
-+@@ -93515,8 +93762,8 @@ static int exprNodeIsConstantOrGroupBy(Walker *pWalker, Expr *pExpr){
-+   for(i=0; i<pGroupBy->nExpr; i++){
-+     Expr *p = pGroupBy->a[i].pExpr;
-+     if( sqlite3ExprCompare(0, pExpr, p, -1)<2 ){
-+-      CollSeq *pColl = sqlite3ExprCollSeq(pWalker->pParse, p);
-+-      if( pColl==0 || sqlite3_stricmp("BINARY", pColl->zName)==0 ){
-++      CollSeq *pColl = sqlite3ExprNNCollSeq(pWalker->pParse, p);
-++      if( sqlite3_stricmp("BINARY", pColl->zName)==0 ){
-+         return WRC_Prune;
-+       }
-+     }
-+@@ -93584,7 +93831,7 @@ SQLITE_PRIVATE int sqlite3ExprContainsSubquery(Expr *p){
-+   Walker w;
-+   w.eCode = 1;
-+   w.xExprCallback = sqlite3ExprWalkNoop;
-+-  w.xSelectCallback = selectNodeIsConstant;
-++  w.xSelectCallback = sqlite3SelectWalkFail;
-+ #ifdef SQLITE_DEBUG
-+   w.xSelectCallback2 = sqlite3SelectWalkAssert2;
-+ #endif
-+@@ -93657,8 +93904,8 @@ SQLITE_PRIVATE int sqlite3ExprCanBeNull(const Expr *p){
-+     case TK_BLOB:
-+       return 0;
-+     case TK_COLUMN:
-+-      assert( p->pTab!=0 );
-+       return ExprHasProperty(p, EP_CanBeNull) ||
-++             p->pTab==0 ||  /* Reference to column of index on expression */
-+              (p->iColumn>=0 && p->pTab->aCol[p->iColumn].notNull==0);
-+     default:
-+       return 1;
-+@@ -94320,7 +94567,7 @@ SQLITE_PRIVATE int sqlite3CodeSubselect(
-+         /* Loop through each expression in <exprlist>. */
-+         r1 = sqlite3GetTempReg(pParse);
-+         r2 = sqlite3GetTempReg(pParse);
-+-        if( isRowid ) sqlite3VdbeAddOp2(v, OP_Null, 0, r2);
-++        if( isRowid ) sqlite3VdbeAddOp4(v, OP_Blob, 0, r2, 0, "", P4_STATIC);
-+         for(i=pList->nExpr, pItem=pList->a; i>0; i--, pItem++){
-+           Expr *pE2 = pItem->pExpr;
-+           int iValToIns;
-+@@ -94748,7 +94995,7 @@ static void codeInteger(Parse *pParse, Expr *pExpr, int negFlag, int iMem){
-+     const char *z = pExpr->u.zToken;
-+     assert( z!=0 );
-+     c = sqlite3DecOrHexToI64(z, &value);
-+-    if( c==1 || (c==2 && !negFlag) || (negFlag && value==SMALLEST_INT64)){
-++    if( (c==3 && !negFlag) || (c==2) || (negFlag && value==SMALLEST_INT64)){
-+ #ifdef SQLITE_OMIT_FLOATING_POINT
-+       sqlite3ErrorMsg(pParse, "oversized integer: %s%s", negFlag ? "-" : "", z);
-+ #else
-+@@ -94762,7 +95009,7 @@ static void codeInteger(Parse *pParse, Expr *pExpr, int negFlag, int iMem){
-+       }
-+ #endif
-+     }else{
-+-      if( negFlag ){ value = c==2 ? SMALLEST_INT64 : -value; }
-++      if( negFlag ){ value = c==3 ? SMALLEST_INT64 : -value; }
-+       sqlite3VdbeAddOp4Dup8(v, OP_Int64, 0, iMem, 0, (u8*)&value, P4_INT64);
-+     }
-+   }
-+@@ -95917,7 +96164,9 @@ SQLITE_PRIVATE void sqlite3ExprCodeAndCache(Parse *pParse, Expr *pExpr, int targ
-+ ** Generate code that pushes the value of every element of the given
-+ ** expression list into a sequence of registers beginning at target.
-+ **
-+-** Return the number of elements evaluated.
-++** Return the number of elements evaluated.  The number returned will
-++** usually be pList->nExpr but might be reduced if SQLITE_ECEL_OMITREF
-++** is defined.
-+ **
-+ ** The SQLITE_ECEL_DUP flag prevents the arguments from being
-+ ** filled using OP_SCopy.  OP_Copy must be used instead.
-+@@ -95928,6 +96177,8 @@ SQLITE_PRIVATE void sqlite3ExprCodeAndCache(Parse *pParse, Expr *pExpr, int targ
-+ ** The SQLITE_ECEL_REF flag means that expressions in the list with
-+ ** ExprList.a[].u.x.iOrderByCol>0 have already been evaluated and stored
-+ ** in registers at srcReg, and so the value can be copied from there.
-++** If SQLITE_ECEL_OMITREF is also set, then the values with u.x.iOrderByCol>0
-++** are simply omitted rather than being copied from srcReg.
-+ */
-+ SQLITE_PRIVATE int sqlite3ExprCodeExprList(
-+   Parse *pParse,     /* Parsing context */
-+@@ -97361,9 +97612,9 @@ SQLITE_PRIVATE void sqlite3AlterRenameTable(
-+   char *zWhere = 0;         /* Where clause to locate temp triggers */
-+ #endif
-+   VTable *pVTab = 0;        /* Non-zero if this is a v-tab with an xRename() */
-+-  int savedDbFlags;         /* Saved value of db->flags */
-++  u32 savedDbFlags;         /* Saved value of db->mDbFlags */
-+ 
-+-  savedDbFlags = db->flags;
-++  savedDbFlags = db->mDbFlags;
-+   if( NEVER(db->mallocFailed) ) goto exit_rename_table;
-+   assert( pSrc->nSrc==1 );
-+   assert( sqlite3BtreeHoldsAllMutexes(pParse->db) );
-+@@ -97372,7 +97623,7 @@ SQLITE_PRIVATE void sqlite3AlterRenameTable(
-+   if( !pTab ) goto exit_rename_table;
-+   iDb = sqlite3SchemaToIndex(pParse->db, pTab->pSchema);
-+   zDb = db->aDb[iDb].zDbSName;
-+-  db->flags |= SQLITE_PreferBuiltin;
-++  db->mDbFlags |= DBFLAG_PreferBuiltin;
-+ 
-+   /* Get a NULL terminated version of the new table name. */
-+   zName = sqlite3NameFromToken(db, pName);
-+@@ -97537,7 +97788,7 @@ SQLITE_PRIVATE void sqlite3AlterRenameTable(
-+ exit_rename_table:
-+   sqlite3SrcListDelete(db, pSrc);
-+   sqlite3DbFree(db, zName);
-+-  db->flags = savedDbFlags;
-++  db->mDbFlags = savedDbFlags;
-+ }
-+ 
-+ /*
-+@@ -97638,11 +97889,11 @@ SQLITE_PRIVATE void sqlite3AlterFinishAddColumn(Parse *pParse, Token *pColDef){
-+   zCol = sqlite3DbStrNDup(db, (char*)pColDef->z, pColDef->n);
-+   if( zCol ){
-+     char *zEnd = &zCol[pColDef->n-1];
-+-    int savedDbFlags = db->flags;
-++    u32 savedDbFlags = db->mDbFlags;
-+     while( zEnd>zCol && (*zEnd==';' || sqlite3Isspace(*zEnd)) ){
-+       *zEnd-- = '\0';
-+     }
-+-    db->flags |= SQLITE_PreferBuiltin;
-++    db->mDbFlags |= DBFLAG_PreferBuiltin;
-+     sqlite3NestedParse(pParse,
-+         "UPDATE \"%w\".%s SET "
-+           "sql = substr(sql,1,%d) || ', ' || %Q || substr(sql,%d) "
-+@@ -97651,7 +97902,7 @@ SQLITE_PRIVATE void sqlite3AlterFinishAddColumn(Parse *pParse, Token *pColDef){
-+       zTab
-+     );
-+     sqlite3DbFree(db, zCol);
-+-    db->flags = savedDbFlags;
-++    db->mDbFlags = savedDbFlags;
-+   }
-+ 
-+   /* Make sure the schema version is at least 3.  But do not upgrade
-+@@ -99776,10 +100027,6 @@ static void attachFunc(
-+     );
-+     goto attach_error;
-+   }
-+-  if( !db->autoCommit ){
-+-    zErrDyn = sqlite3MPrintf(db, "cannot ATTACH database within transaction");
-+-    goto attach_error;
-+-  }
-+   for(i=0; i<db->nDb; i++){
-+     char *z = db->aDb[i].zDbSName;
-+     assert( z && zName );
-+@@ -99971,11 +100218,6 @@ static void detachFunc(
-+     sqlite3_snprintf(sizeof(zErr),zErr, "cannot detach database %s", zName);
-+     goto detach_error;
-+   }
-+-  if( !db->autoCommit ){
-+-    sqlite3_snprintf(sizeof(zErr), zErr,
-+-                     "cannot DETACH database within transaction");
-+-    goto detach_error;
-+-  }
-+   if( sqlite3BtreeIsInReadTrans(pDb->pBt) || sqlite3BtreeIsInBackup(pDb->pBt) ){
-+     sqlite3_snprintf(sizeof(zErr),zErr, "database %s is locked", zName);
-+     goto detach_error;
-+@@ -100388,11 +100630,9 @@ SQLITE_PRIVATE int sqlite3AuthReadCol(
-+ #endif
-+                 );
-+   if( rc==SQLITE_DENY ){
-+-    if( db->nDb>2 || iDb!=0 ){
-+-      sqlite3ErrorMsg(pParse, "access to %s.%s.%s is prohibited",zDb,zTab,zCol);
-+-    }else{
-+-      sqlite3ErrorMsg(pParse, "access to %s.%s is prohibited", zTab, zCol);
-+-    }
-++    char *z = sqlite3_mprintf("%s.%s", zTab, zCol);
-++    if( db->nDb>2 || iDb!=0 ) z = sqlite3_mprintf("%s.%z", zDb, z);
-++    sqlite3ErrorMsg(pParse, "access to %z is prohibited", z);
-+     pParse->rc = SQLITE_AUTH;
-+   }else if( rc!=SQLITE_IGNORE && rc!=SQLITE_OK ){
-+     sqliteAuthBadReturnCode(pParse);
-+@@ -101025,7 +101265,7 @@ SQLITE_PRIVATE void sqlite3UnlinkAndDeleteIndex(sqlite3 *db, int iDb, const char
-+     }
-+     freeIndex(db, pIndex);
-+   }
-+-  db->flags |= SQLITE_InternChanges;
-++  db->mDbFlags |= DBFLAG_SchemaChange;
-+ }
-+ 
-+ /*
-+@@ -101060,28 +101300,26 @@ SQLITE_PRIVATE void sqlite3CollapseDatabaseArray(sqlite3 *db){
-+ 
-+ /*
-+ ** Reset the schema for the database at index iDb.  Also reset the
-+-** TEMP schema.
-++** TEMP schema.  The reset is deferred if db->nSchemaLock is not zero.
-++** Deferred resets may be run by calling with iDb<0.
-+ */
-+ SQLITE_PRIVATE void sqlite3ResetOneSchema(sqlite3 *db, int iDb){
-+-  Db *pDb;
-++  int i;
-+   assert( iDb<db->nDb );
-+ 
-+-  /* Case 1:  Reset the single schema identified by iDb */
-+-  pDb = &db->aDb[iDb];
-+-  assert( sqlite3SchemaMutexHeld(db, iDb, 0) );
-+-  assert( pDb->pSchema!=0 );
-+-  sqlite3SchemaClear(pDb->pSchema);
-++  if( iDb>=0 ){
-++    assert( sqlite3SchemaMutexHeld(db, iDb, 0) );
-++    DbSetProperty(db, iDb, DB_ResetWanted);
-++    DbSetProperty(db, 1, DB_ResetWanted);
-++  }
-+ 
-+-  /* If any database other than TEMP is reset, then also reset TEMP
-+-  ** since TEMP might be holding triggers that reference tables in the
-+-  ** other database.
-+-  */
-+-  if( iDb!=1 ){
-+-    pDb = &db->aDb[1];
-+-    assert( pDb->pSchema!=0 );
-+-    sqlite3SchemaClear(pDb->pSchema);
-++  if( db->nSchemaLock==0 ){
-++    for(i=0; i<db->nDb; i++){
-++      if( DbHasProperty(db, i, DB_ResetWanted) ){
-++        sqlite3SchemaClear(db->aDb[i].pSchema);
-++      }
-++    }
-+   }
-+-  return;
-+ }
-+ 
-+ /*
-+@@ -101091,13 +101329,14 @@ SQLITE_PRIVATE void sqlite3ResetOneSchema(sqlite3 *db, int iDb){
-+ SQLITE_PRIVATE void sqlite3ResetAllSchemasOfConnection(sqlite3 *db){
-+   int i;
-+   sqlite3BtreeEnterAll(db);
-++  assert( db->nSchemaLock==0 );
-+   for(i=0; i<db->nDb; i++){
-+     Db *pDb = &db->aDb[i];
-+     if( pDb->pSchema ){
-+       sqlite3SchemaClear(pDb->pSchema);
-+     }
-+   }
-+-  db->flags &= ~SQLITE_InternChanges;
-++  db->mDbFlags &= ~DBFLAG_SchemaChange;
-+   sqlite3VtabUnlockList(db);
-+   sqlite3BtreeLeaveAll(db);
-+   sqlite3CollapseDatabaseArray(db);
-+@@ -101107,7 +101346,7 @@ SQLITE_PRIVATE void sqlite3ResetAllSchemasOfConnection(sqlite3 *db){
-+ ** This routine is called when a commit occurs.
-+ */
-+ SQLITE_PRIVATE void sqlite3CommitInternalChanges(sqlite3 *db){
-+-  db->flags &= ~SQLITE_InternChanges;
-++  db->mDbFlags &= ~DBFLAG_SchemaChange;
-+ }
-+ 
-+ /*
-+@@ -101145,13 +101384,16 @@ SQLITE_PRIVATE void sqlite3DeleteColumnNames(sqlite3 *db, Table *pTable){
-+ */
-+ static void SQLITE_NOINLINE deleteTable(sqlite3 *db, Table *pTable){
-+   Index *pIndex, *pNext;
-+-  TESTONLY( int nLookaside; ) /* Used to verify lookaside not used for schema */
-+ 
-++#ifdef SQLITE_DEBUG
-+   /* Record the number of outstanding lookaside allocations in schema Tables
-+   ** prior to doing any free() operations.  Since schema Tables do not use
-+   ** lookaside, this number should not change. */
-+-  TESTONLY( nLookaside = (db && (pTable->tabFlags & TF_Ephemeral)==0) ?
-+-                         db->lookaside.nOut : 0 );
-++  int nLookaside = 0;
-++  if( db && (pTable->tabFlags & TF_Ephemeral)==0 ){
-++    nLookaside = sqlite3LookasideUsed(db, 0);
-++  }
-++#endif
-+ 
-+   /* Delete all indices associated with this table. */
-+   for(pIndex = pTable->pIndex; pIndex; pIndex=pNext){
-+@@ -101185,7 +101427,7 @@ static void SQLITE_NOINLINE deleteTable(sqlite3 *db, Table *pTable){
-+   sqlite3DbFree(db, pTable);
-+ 
-+   /* Verify that no lookaside memory was used by schema tables */
-+-  assert( nLookaside==0 || nLookaside==db->lookaside.nOut );
-++  assert( nLookaside==0 || nLookaside==sqlite3LookasideUsed(db,0) );
-+ }
-+ SQLITE_PRIVATE void sqlite3DeleteTable(sqlite3 *db, Table *pTable){
-+   /* Do not delete the table until the reference count reaches zero. */
-+@@ -101211,7 +101453,7 @@ SQLITE_PRIVATE void sqlite3UnlinkAndDeleteTable(sqlite3 *db, int iDb, const char
-+   pDb = &db->aDb[iDb];
-+   p = sqlite3HashInsert(&pDb->pSchema->tblHash, zTabName, 0);
-+   sqlite3DeleteTable(db, p);
-+-  db->flags |= SQLITE_InternChanges;
-++  db->mDbFlags |= DBFLAG_SchemaChange;
-+ }
-+ 
-+ /*
-+@@ -101324,7 +101566,8 @@ SQLITE_PRIVATE int sqlite3TwoPartName(
-+       return -1;
-+     }
-+   }else{
-+-    assert( db->init.iDb==0 || db->init.busy || (db->flags & SQLITE_Vacuum)!=0);
-++    assert( db->init.iDb==0 || db->init.busy
-++             || (db->mDbFlags & DBFLAG_Vacuum)!=0);
-+     iDb = db->init.iDb;
-+     *pUnqual = pName1;
-+   }
-+@@ -101556,7 +101799,8 @@ SQLITE_PRIVATE void sqlite3StartTable(
-+     }else
-+ #endif
-+     {
-+-      pParse->addrCrTab = sqlite3VdbeAddOp2(v, OP_CreateTable, iDb, reg2);
-++      pParse->addrCrTab =
-++         sqlite3VdbeAddOp3(v, OP_CreateBtree, iDb, reg2, BTREE_INTKEY);
-+     }
-+     sqlite3OpenMasterTable(pParse, iDb);
-+     sqlite3VdbeAddOp2(v, OP_NewRowid, 0, reg1);
-+@@ -101605,12 +101849,10 @@ SQLITE_PRIVATE void sqlite3AddColumn(Parse *pParse, Token *pName, Token *pType){
-+   Column *pCol;
-+   sqlite3 *db = pParse->db;
-+   if( (p = pParse->pNewTable)==0 ) return;
-+-#if SQLITE_MAX_COLUMN
-+   if( p->nCol+1>db->aLimit[SQLITE_LIMIT_COLUMN] ){
-+     sqlite3ErrorMsg(pParse, "too many columns on %s", p->zName);
-+     return;
-+   }
-+-#endif
-+   z = sqlite3DbMallocRaw(db, pName->n + pType->n + 2);
-+   if( z==0 ) return;
-+   memcpy(z, pName->z, pName->n);
-+@@ -102216,9 +102458,8 @@ static int hasColumn(const i16 *aiCol, int nCol, int x){
-+ ** Changes include:
-+ **
-+ **     (1)  Set all columns of the PRIMARY KEY schema object to be NOT NULL.
-+-**     (2)  Convert the OP_CreateTable into an OP_CreateIndex.  There is
-+-**          no rowid btree for a WITHOUT ROWID.  Instead, the canonical
-+-**          data storage is a covering index btree.
-++**     (2)  Convert P3 parameter of the OP_CreateBtree from BTREE_INTKEY
-++**          into BTREE_BLOBKEY.
-+ **     (3)  Bypass the creation of the sqlite_master table entry
-+ **          for the PRIMARY KEY as the primary key index is now
-+ **          identified by the sqlite_master table entry of the table itself.
-+@@ -102226,7 +102467,7 @@ static int hasColumn(const i16 *aiCol, int nCol, int x){
-+ **          schema to the rootpage from the main table.
-+ **     (5)  Add all table columns to the PRIMARY KEY Index object
-+ **          so that the PRIMARY KEY is a covering index.  The surplus
-+-**          columns are part of KeyInfo.nXField and are not used for
-++**          columns are part of KeyInfo.nAllField and are not used for
-+ **          sorting or lookup or uniqueness checks.
-+ **     (6)  Replace the rowid tail on all automatically generated UNIQUE
-+ **          indices with the PRIMARY KEY columns.
-+@@ -102255,13 +102496,12 @@ static void convertToWithoutRowidTable(Parse *pParse, Table *pTab){
-+   ** virtual tables */
-+   if( IN_DECLARE_VTAB ) return;
-+ 
-+-  /* Convert the OP_CreateTable opcode that would normally create the
-+-  ** root-page for the table into an OP_CreateIndex opcode.  The index
-+-  ** created will become the PRIMARY KEY index.
-++  /* Convert the P3 operand of the OP_CreateBtree opcode from BTREE_INTKEY
-++  ** into BTREE_BLOBKEY.
-+   */
-+   if( pParse->addrCrTab ){
-+     assert( v );
-+-    sqlite3VdbeChangeOpcode(v, pParse->addrCrTab, OP_CreateIndex);
-++    sqlite3VdbeChangeP3(v, pParse->addrCrTab, BTREE_BLOBKEY);
-+   }
-+ 
-+   /* Locate the PRIMARY KEY index.  Or, if this table was originally
-+@@ -102601,7 +102841,7 @@ SQLITE_PRIVATE void sqlite3EndTable(
-+       return;
-+     }
-+     pParse->pNewTable = 0;
-+-    db->flags |= SQLITE_InternChanges;
-++    db->mDbFlags |= DBFLAG_SchemaChange;
-+ 
-+ #ifndef SQLITE_OMIT_ALTERTABLE
-+     if( !p->pSelect ){
-+@@ -102700,6 +102940,9 @@ SQLITE_PRIVATE int sqlite3ViewGetColumnNames(Parse *pParse, Table *pTable){
-+   int nErr = 0;     /* Number of errors encountered */
-+   int n;            /* Temporarily holds the number of cursors assigned */
-+   sqlite3 *db = pParse->db;  /* Database connection for malloc errors */
-++#ifndef SQLITE_OMIT_VIRTUALTABLE
-++  int rc;
-++#endif
-+ #ifndef SQLITE_OMIT_AUTHORIZATION
-+   sqlite3_xauth xAuth;       /* Saved xAuth pointer */
-+ #endif
-+@@ -102707,8 +102950,11 @@ SQLITE_PRIVATE int sqlite3ViewGetColumnNames(Parse *pParse, Table *pTable){
-+   assert( pTable );
-+ 
-+ #ifndef SQLITE_OMIT_VIRTUALTABLE
-+-  if( sqlite3VtabCallConnect(pParse, pTable) ){
-+-    return SQLITE_ERROR;
-++  db->nSchemaLock++;
-++  rc = sqlite3VtabCallConnect(pParse, pTable);
-++  db->nSchemaLock--;
-++  if( rc ){
-++    return 1;
-+   }
-+   if( IsVirtual(pTable) ) return 0;
-+ #endif
-+@@ -102904,14 +103150,6 @@ static void destroyRootPage(Parse *pParse, int iTable, int iDb){
-+ ** is also added (this can happen with an auto-vacuum database).
-+ */
-+ static void destroyTable(Parse *pParse, Table *pTab){
-+-#ifdef SQLITE_OMIT_AUTOVACUUM
-+-  Index *pIdx;
-+-  int iDb = sqlite3SchemaToIndex(pParse->db, pTab->pSchema);
-+-  destroyRootPage(pParse, pTab->tnum, iDb);
-+-  for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
-+-    destroyRootPage(pParse, pIdx->tnum, iDb);
-+-  }
-+-#else
-+   /* If the database may be auto-vacuum capable (if SQLITE_OMIT_AUTOVACUUM
-+   ** is not defined), then it is important to call OP_Destroy on the
-+   ** table and index root-pages in order, starting with the numerically
-+@@ -102954,7 +103192,6 @@ static void destroyTable(Parse *pParse, Table *pTab){
-+       iDestroyed = iLargest;
-+     }
-+   }
-+-#endif
-+ }
-+ 
-+ /*
-+@@ -103381,7 +103618,7 @@ static void sqlite3RefillIndex(Parse *pParse, Index *pIndex, int memRootPage){
-+     addr2 = sqlite3VdbeCurrentAddr(v);
-+   }
-+   sqlite3VdbeAddOp3(v, OP_SorterData, iSorter, regRecord, iIdx);
-+-  sqlite3VdbeAddOp3(v, OP_Last, iIdx, 0, -1);
-++  sqlite3VdbeAddOp1(v, OP_SeekEnd, iIdx);
-+   sqlite3VdbeAddOp2(v, OP_IdxInsert, iIdx, regRecord);
-+   sqlite3VdbeChangeP5(v, OPFLAG_USESEEKRESULT);
-+   sqlite3ReleaseTempReg(pParse, regRecord);
-+@@ -103870,7 +104107,7 @@ SQLITE_PRIVATE void sqlite3CreateIndex(
-+       sqlite3OomFault(db);
-+       goto exit_create_index;
-+     }
-+-    db->flags |= SQLITE_InternChanges;
-++    db->mDbFlags |= DBFLAG_SchemaChange;
-+     if( pTblName!=0 ){
-+       pIndex->tnum = db->init.newTnum;
-+     }
-+@@ -103906,7 +104143,7 @@ SQLITE_PRIVATE void sqlite3CreateIndex(
-+     ** that case the convertToWithoutRowidTable() routine will replace
-+     ** the Noop with a Goto to jump over the VDBE code generated below. */
-+     pIndex->tnum = sqlite3VdbeAddOp0(v, OP_Noop);
-+-    sqlite3VdbeAddOp2(v, OP_CreateIndex, iDb, iMem);
-++    sqlite3VdbeAddOp3(v, OP_CreateBtree, iDb, iMem, BTREE_BLOBKEY);
-+ 
-+     /* Gather the complete text of the CREATE INDEX statement into
-+     ** the zStmt variable
-+@@ -104428,8 +104665,10 @@ SQLITE_PRIVATE SrcList *sqlite3SrcListAppendFromTerm(
-+ */
-+ SQLITE_PRIVATE void sqlite3SrcListIndexedBy(Parse *pParse, SrcList *p, Token *pIndexedBy){
-+   assert( pIndexedBy!=0 );
-+-  if( p && ALWAYS(p->nSrc>0) ){
-+-    struct SrcList_item *pItem = &p->a[p->nSrc-1];
-++  if( p && pIndexedBy->n>0 ){
-++    struct SrcList_item *pItem;
-++    assert( p->nSrc>0 );
-++    pItem = &p->a[p->nSrc-1];
-+     assert( pItem->fg.notIndexed==0 );
-+     assert( pItem->fg.isIndexedBy==0 );
-+     assert( pItem->fg.isTabFunc==0 );
-+@@ -104439,7 +104678,7 @@ SQLITE_PRIVATE void sqlite3SrcListIndexedBy(Parse *pParse, SrcList *p, Token *pI
-+       pItem->fg.notIndexed = 1;
-+     }else{
-+       pItem->u1.zIndexedBy = sqlite3NameFromToken(pParse->db, pIndexedBy);
-+-      pItem->fg.isIndexedBy = (pItem->u1.zIndexedBy!=0);
-++      pItem->fg.isIndexedBy = 1;
-+     }
-+   }
-+ }
-+@@ -105364,7 +105603,7 @@ SQLITE_PRIVATE FuncDef *sqlite3FindFunction(
-+ 
-+   /* If no match is found, search the built-in functions.
-+   **
-+-  ** If the SQLITE_PreferBuiltin flag is set, then search the built-in
-++  ** If the DBFLAG_PreferBuiltin flag is set, then search the built-in
-+   ** functions even if a prior app-defined function was found.  And give
-+   ** priority to built-in functions.
-+   **
-+@@ -105374,7 +105613,7 @@ SQLITE_PRIVATE FuncDef *sqlite3FindFunction(
-+   ** new function.  But the FuncDefs for built-in functions are read-only.
-+   ** So we must not search for built-ins when creating a new function.
-+   */
-+-  if( !createFlag && (pBest==0 || (db->flags & SQLITE_PreferBuiltin)!=0) ){
-++  if( !createFlag && (pBest==0 || (db->mDbFlags & DBFLAG_PreferBuiltin)!=0) ){
-+     bestScore = 0;
-+     h = (sqlite3UpperToLower[(u8)zName[0]] + nName) % SQLITE_FUNC_HASH_SZ;
-+     p = functionSearch(h, zName);
-+@@ -105447,8 +105686,8 @@ SQLITE_PRIVATE void sqlite3SchemaClear(void *p){
-+   pSchema->pSeqTab = 0;
-+   if( pSchema->schemaFlags & DB_SchemaLoaded ){
-+     pSchema->iGeneration++;
-+-    pSchema->schemaFlags &= ~DB_SchemaLoaded;
-+   }
-++  pSchema->schemaFlags &= ~(DB_SchemaLoaded|DB_ResetWanted);
-+ }
-+ 
-+ /*
-+@@ -105980,7 +106219,11 @@ SQLITE_PRIVATE void sqlite3DeleteFrom(
-+       }
-+     }else if( pPk ){
-+       addrLoop = sqlite3VdbeAddOp1(v, OP_Rewind, iEphCur); VdbeCoverage(v);
-+-      sqlite3VdbeAddOp2(v, OP_RowData, iEphCur, iKey);
-++      if( IsVirtual(pTab) ){
-++        sqlite3VdbeAddOp3(v, OP_Column, iEphCur, 0, iKey);
-++      }else{
-++        sqlite3VdbeAddOp2(v, OP_RowData, iEphCur, iKey);
-++      }
-+       assert( nKey==0 );  /* OP_Found will use a composite key */
-+     }else{
-+       addrLoop = sqlite3VdbeAddOp3(v, OP_RowSetRead, iRowSet, 0, iKey);
-+@@ -107251,7 +107494,8 @@ static void likeFunc(
-+ #ifdef SQLITE_TEST
-+     sqlite3_like_count++;
-+ #endif
-+-    sqlite3_result_int(context, patternCompare(zB, zA, pInfo, escape)==SQLITE_MATCH);
-++    sqlite3_result_int(context,
-++                      patternCompare(zB, zA, pInfo, escape)==SQLITE_MATCH);
-+   }
-+ }
-+ 
-+@@ -108092,9 +108336,14 @@ SQLITE_PRIVATE void sqlite3RegisterLikeFunctions(sqlite3 *db, int caseSensitive)
-+ /*
-+ ** pExpr points to an expression which implements a function.  If
-+ ** it is appropriate to apply the LIKE optimization to that function
-+-** then set aWc[0] through aWc[2] to the wildcard characters and
-+-** return TRUE.  If the function is not a LIKE-style function then
-+-** return FALSE.
-++** then set aWc[0] through aWc[2] to the wildcard characters and the
-++** escape character and then return TRUE.  If the function is not a
-++** LIKE-style function then return FALSE.
-++**
-++** The expression "a LIKE b ESCAPE c" is only considered a valid LIKE
-++** operator if c is a string literal that is exactly one byte in length.
-++** That one byte is stored in aWc[3].  aWc[3] is set to zero if there is
-++** no ESCAPE clause.
-+ **
-+ ** *pIsNocase is set to true if uppercase and lowercase are equivalent for
-+ ** the function (default for LIKE).  If the function makes the distinction
-+@@ -108103,17 +108352,26 @@ SQLITE_PRIVATE void sqlite3RegisterLikeFunctions(sqlite3 *db, int caseSensitive)
-+ */
-+ SQLITE_PRIVATE int sqlite3IsLikeFunction(sqlite3 *db, Expr *pExpr, int *pIsNocase, char *aWc){
-+   FuncDef *pDef;
-+-  if( pExpr->op!=TK_FUNCTION
-+-   || !pExpr->x.pList
-+-   || pExpr->x.pList->nExpr!=2
-+-  ){
-++  int nExpr;
-++  if( pExpr->op!=TK_FUNCTION || !pExpr->x.pList ){
-+     return 0;
-+   }
-+   assert( !ExprHasProperty(pExpr, EP_xIsSelect) );
-+-  pDef = sqlite3FindFunction(db, pExpr->u.zToken, 2, SQLITE_UTF8, 0);
-++  nExpr = pExpr->x.pList->nExpr;
-++  pDef = sqlite3FindFunction(db, pExpr->u.zToken, nExpr, SQLITE_UTF8, 0);
-+   if( NEVER(pDef==0) || (pDef->funcFlags & SQLITE_FUNC_LIKE)==0 ){
-+     return 0;
-+   }
-++  if( nExpr<3 ){
-++    aWc[3] = 0;
-++  }else{
-++    Expr *pEscape = pExpr->x.pList->a[2].pExpr;
-++    char *zEscape;
-++    if( pEscape->op!=TK_STRING ) return 0;
-++    zEscape = pEscape->u.zToken;
-++    if( zEscape[0]==0 || zEscape[1]!=0 ) return 0;
-++    aWc[3] = zEscape[0];
-++  }
-+ 
-+   /* The memcpy() statement assumes that the wildcard characters are
-+   ** the first three statements in the compareInfo structure.  The
-+@@ -109913,7 +110171,7 @@ static int autoIncBegin(
-+ ){
-+   int memId = 0;      /* Register holding maximum rowid */
-+   if( (pTab->tabFlags & TF_Autoincrement)!=0
-+-   && (pParse->db->flags & SQLITE_Vacuum)==0
-++   && (pParse->db->mDbFlags & DBFLAG_Vacuum)==0
-+   ){
-+     Parse *pToplevel = sqlite3ParseToplevel(pParse);
-+     AutoincInfo *pInfo;
-+@@ -110171,7 +110429,6 @@ SQLITE_PRIVATE void sqlite3Insert(
-+ ){
-+   sqlite3 *db;          /* The main database structure */
-+   Table *pTab;          /* The table to insert into.  aka TABLE */
-+-  char *zTab;           /* Name of the table into which we are inserting */
-+   int i, j;             /* Loop counters */
-+   Vdbe *v;              /* Generate code into this virtual machine */
-+   Index *pIdx;          /* For looping over indices of the table */
-+@@ -110227,8 +110484,6 @@ SQLITE_PRIVATE void sqlite3Insert(
-+   /* Locate the table into which we will be inserting new information.
-+   */
-+   assert( pTabList->nSrc==1 );
-+-  zTab = pTabList->a[0].zName;
-+-  if( NEVER(zTab==0) ) goto insert_cleanup;
-+   pTab = sqlite3SrcListLookup(pParse, pTabList);
-+   if( pTab==0 ){
-+     goto insert_cleanup;
-+@@ -111745,7 +112000,7 @@ static int xferOptimization(
-+     Column *pDestCol = &pDest->aCol[i];
-+     Column *pSrcCol = &pSrc->aCol[i];
-+ #ifdef SQLITE_ENABLE_HIDDEN_COLUMNS
-+-    if( (db->flags & SQLITE_Vacuum)==0
-++    if( (db->mDbFlags & DBFLAG_Vacuum)==0
-+      && (pDestCol->colFlags | pSrcCol->colFlags) & COLFLAG_HIDDEN
-+     ){
-+       return 0;    /* Neither table may have __hidden__ columns */
-+@@ -111821,15 +112076,15 @@ static int xferOptimization(
-+   regRowid = sqlite3GetTempReg(pParse);
-+   sqlite3OpenTable(pParse, iDest, iDbDest, pDest, OP_OpenWrite);
-+   assert( HasRowid(pDest) || destHasUniqueIdx );
-+-  if( (db->flags & SQLITE_Vacuum)==0 && (
-++  if( (db->mDbFlags & DBFLAG_Vacuum)==0 && (
-+       (pDest->iPKey<0 && pDest->pIndex!=0)          /* (1) */
-+    || destHasUniqueIdx                              /* (2) */
-+    || (onError!=OE_Abort && onError!=OE_Rollback)   /* (3) */
-+   )){
-+     /* In some circumstances, we are able to run the xfer optimization
-+     ** only if the destination table is initially empty. Unless the
-+-    ** SQLITE_Vacuum flag is set, this block generates code to make
-+-    ** that determination. If SQLITE_Vacuum is set, then the destination
-++    ** DBFLAG_Vacuum flag is set, this block generates code to make
-++    ** that determination. If DBFLAG_Vacuum is set, then the destination
-+     ** table is always empty.
-+     **
-+     ** Conditions under which the destination must be empty:
-+@@ -111865,8 +112120,8 @@ static int xferOptimization(
-+       assert( (pDest->tabFlags & TF_Autoincrement)==0 );
-+     }
-+     sqlite3VdbeAddOp3(v, OP_RowData, iSrc, regData, 1);
-+-    if( db->flags & SQLITE_Vacuum ){
-+-      sqlite3VdbeAddOp3(v, OP_Last, iDest, 0, -1);
-++    if( db->mDbFlags & DBFLAG_Vacuum ){
-++      sqlite3VdbeAddOp1(v, OP_SeekEnd, iDest);
-+       insFlags = OPFLAG_NCHANGE|OPFLAG_LASTROWID|
-+                            OPFLAG_APPEND|OPFLAG_USESEEKRESULT;
-+     }else{
-+@@ -111897,13 +112152,13 @@ static int xferOptimization(
-+     VdbeComment((v, "%s", pDestIdx->zName));
-+     addr1 = sqlite3VdbeAddOp2(v, OP_Rewind, iSrc, 0); VdbeCoverage(v);
-+     sqlite3VdbeAddOp3(v, OP_RowData, iSrc, regData, 1);
-+-    if( db->flags & SQLITE_Vacuum ){
-++    if( db->mDbFlags & DBFLAG_Vacuum ){
-+       /* This INSERT command is part of a VACUUM operation, which guarantees
-+       ** that the destination table is empty. If all indexed columns use
-+       ** collation sequence BINARY, then it can also be assumed that the
-+       ** index will be populated by inserting keys in strictly sorted
-+       ** order. In this case, instead of seeking within the b-tree as part
-+-      ** of every OP_IdxInsert opcode, an OP_Last is added before the
-++      ** of every OP_IdxInsert opcode, an OP_SeekEnd is added before the
-+       ** OP_IdxInsert to seek to the point within the b-tree where each key
-+       ** should be inserted. This is faster.
-+       **
-+@@ -111918,7 +112173,7 @@ static int xferOptimization(
-+       }
-+       if( i==pSrcIdx->nColumn ){
-+         idxInsFlags = OPFLAG_USESEEKRESULT;
-+-        sqlite3VdbeAddOp3(v, OP_Last, iDest, 0, -1);
-++        sqlite3VdbeAddOp1(v, OP_SeekEnd, iDest);
-+       }
-+     }
-+     if( !HasRowid(pSrc) && pDestIdx->idxType==2 ){
-+@@ -112249,7 +112504,7 @@ struct sqlite3_api_routines {
-+   int  (*set_authorizer)(sqlite3*,int(*)(void*,int,const char*,const char*,
-+                          const char*,const char*),void*);
-+   void  (*set_auxdata)(sqlite3_context*,int,void*,void (*)(void*));
-+-  char * (*snprintf)(int,char*,const char*,...);
-++  char * (*xsnprintf)(int,char*,const char*,...);
-+   int  (*step)(sqlite3_stmt*);
-+   int  (*table_column_metadata)(sqlite3*,const char*,const char*,const char*,
-+                                 char const**,char const**,int*,int*,int*);
-+@@ -112361,7 +112616,7 @@ struct sqlite3_api_routines {
-+   int (*uri_boolean)(const char*,const char*,int);
-+   sqlite3_int64 (*uri_int64)(const char*,const char*,sqlite3_int64);
-+   const char *(*uri_parameter)(const char*,const char*);
-+-  char *(*vsnprintf)(int,char*,const char*,va_list);
-++  char *(*xvsnprintf)(int,char*,const char*,va_list);
-+   int (*wal_checkpoint_v2)(sqlite3*,const char*,int,int*,int*);
-+   /* Version 3.8.7 and later */
-+   int (*auto_extension)(void(*)(void));
-+@@ -112533,7 +112788,7 @@ typedef int (*sqlite3_loadext_entry)(
-+ #define sqlite3_rollback_hook          sqlite3_api->rollback_hook
-+ #define sqlite3_set_authorizer         sqlite3_api->set_authorizer
-+ #define sqlite3_set_auxdata            sqlite3_api->set_auxdata
-+-#define sqlite3_snprintf               sqlite3_api->snprintf
-++#define sqlite3_snprintf               sqlite3_api->xsnprintf
-+ #define sqlite3_step                   sqlite3_api->step
-+ #define sqlite3_table_column_metadata  sqlite3_api->table_column_metadata
-+ #define sqlite3_thread_cleanup         sqlite3_api->thread_cleanup
-+@@ -112557,7 +112812,7 @@ typedef int (*sqlite3_loadext_entry)(
-+ #define sqlite3_value_text16le         sqlite3_api->value_text16le
-+ #define sqlite3_value_type             sqlite3_api->value_type
-+ #define sqlite3_vmprintf               sqlite3_api->vmprintf
-+-#define sqlite3_vsnprintf              sqlite3_api->vsnprintf
-++#define sqlite3_vsnprintf              sqlite3_api->xvsnprintf
-+ #define sqlite3_overload_function      sqlite3_api->overload_function
-+ #define sqlite3_prepare_v2             sqlite3_api->prepare_v2
-+ #define sqlite3_prepare16_v2           sqlite3_api->prepare16_v2
-+@@ -112633,7 +112888,7 @@ typedef int (*sqlite3_loadext_entry)(
-+ #define sqlite3_uri_boolean            sqlite3_api->uri_boolean
-+ #define sqlite3_uri_int64              sqlite3_api->uri_int64
-+ #define sqlite3_uri_parameter          sqlite3_api->uri_parameter
-+-#define sqlite3_uri_vsnprintf          sqlite3_api->vsnprintf
-++#define sqlite3_uri_vsnprintf          sqlite3_api->xvsnprintf
-+ #define sqlite3_wal_checkpoint_v2      sqlite3_api->wal_checkpoint_v2
-+ /* Version 3.8.7 and later */
-+ #define sqlite3_auto_extension         sqlite3_api->auto_extension
-+@@ -114434,16 +114689,16 @@ static const PragmaName *pragmaLocate(const char *zName){
-+ /*
-+ ** Helper subroutine for PRAGMA integrity_check:
-+ **
-+-** Generate code to output a single-column result row with the result
-+-** held in register regResult.  Decrement the result count and halt if
-+-** the maximum number of result rows have been issued.
-++** Generate code to output a single-column result row with a value of the
-++** string held in register 3.  Decrement the result count in register 1
-++** and halt if the maximum number of result rows have been issued.
-+ */
-+-static int integrityCheckResultRow(Vdbe *v, int regResult){
-++static int integrityCheckResultRow(Vdbe *v){
-+   int addr;
-+-  sqlite3VdbeAddOp2(v, OP_ResultRow, regResult, 1);
-++  sqlite3VdbeAddOp2(v, OP_ResultRow, 3, 1);
-+   addr = sqlite3VdbeAddOp3(v, OP_IfPos, 1, sqlite3VdbeCurrentAddr(v)+2, 1);
-+   VdbeCoverage(v);
-+-  sqlite3VdbeAddOp2(v, OP_Halt, 0, 0);
-++  sqlite3VdbeAddOp0(v, OP_Halt);
-+   return addr;
-+ }
-+ 
-+@@ -115391,13 +115646,11 @@ SQLITE_PRIVATE void sqlite3Pragma(
-+     for(i=0; i<SQLITE_FUNC_HASH_SZ; i++){
-+       for(p=sqlite3BuiltinFunctions.a[i]; p; p=p->u.pHash ){
-+         sqlite3VdbeMultiLoad(v, 1, "si", p->zName, 1);
-+-        sqlite3VdbeAddOp2(v, OP_ResultRow, 1, 2);
-+       }
-+     }
-+     for(j=sqliteHashFirst(&db->aFunc); j; j=sqliteHashNext(j)){
-+       p = (FuncDef*)sqliteHashData(j);
-+       sqlite3VdbeMultiLoad(v, 1, "si", p->zName, 0);
-+-      sqlite3VdbeAddOp2(v, OP_ResultRow, 1, 2);
-+     }
-+   }
-+   break;
-+@@ -115409,7 +115662,6 @@ SQLITE_PRIVATE void sqlite3Pragma(
-+     for(j=sqliteHashFirst(&db->aModule); j; j=sqliteHashNext(j)){
-+       Module *pMod = (Module*)sqliteHashData(j);
-+       sqlite3VdbeMultiLoad(v, 1, "s", pMod->zName);
-+-      sqlite3VdbeAddOp2(v, OP_ResultRow, 1, 1);
-+     }
-+   }
-+   break;
-+@@ -115419,7 +115671,6 @@ SQLITE_PRIVATE void sqlite3Pragma(
-+     int i;
-+     for(i=0; i<ArraySize(aPragmaName); i++){
-+       sqlite3VdbeMultiLoad(v, 1, "s", aPragmaName[i].zName);
-+-      sqlite3VdbeAddOp2(v, OP_ResultRow, 1, 1);
-+     }
-+   }
-+   break;
-+@@ -115645,12 +115896,11 @@ SQLITE_PRIVATE void sqlite3Pragma(
-+ 
-+     /* Do an integrity check on each database file */
-+     for(i=0; i<db->nDb; i++){
-+-      HashElem *x;
-+-      Hash *pTbls;
-+-      int *aRoot;
-+-      int cnt = 0;
-+-      int mxIdx = 0;
-+-      int nIdx;
-++      HashElem *x;     /* For looping over tables in the schema */
-++      Hash *pTbls;     /* Set of all tables in the schema */
-++      int *aRoot;      /* Array of root page numbers of all btrees */
-++      int cnt = 0;     /* Number of entries in aRoot[] */
-++      int mxIdx = 0;   /* Maximum number of indexes for any table */
-+ 
-+       if( OMIT_TEMPDB && i==1 ) continue;
-+       if( iDb>=0 && i!=iDb ) continue;
-+@@ -115665,8 +115915,9 @@ SQLITE_PRIVATE void sqlite3Pragma(
-+       assert( sqlite3SchemaMutexHeld(db, i, 0) );
-+       pTbls = &db->aDb[i].pSchema->tblHash;
-+       for(cnt=0, x=sqliteHashFirst(pTbls); x; x=sqliteHashNext(x)){
-+-        Table *pTab = sqliteHashData(x);
-+-        Index *pIdx;
-++        Table *pTab = sqliteHashData(x);  /* Current table */
-++        Index *pIdx;                      /* An index on pTab */
-++        int nIdx;                         /* Number of indexes on pTab */
-+         if( HasRowid(pTab) ) cnt++;
-+         for(nIdx=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, nIdx++){ cnt++; }
-+         if( nIdx>mxIdx ) mxIdx = nIdx;
-+@@ -115694,9 +115945,8 @@ SQLITE_PRIVATE void sqlite3Pragma(
-+       sqlite3VdbeAddOp4(v, OP_String8, 0, 3, 0,
-+          sqlite3MPrintf(db, "*** in database %s ***\n", db->aDb[i].zDbSName),
-+          P4_DYNAMIC);
-+-      sqlite3VdbeAddOp3(v, OP_Move, 2, 4, 1);
-+-      sqlite3VdbeAddOp3(v, OP_Concat, 4, 3, 2);
-+-      integrityCheckResultRow(v, 2);
-++      sqlite3VdbeAddOp3(v, OP_Concat, 2, 3, 3);
-++      integrityCheckResultRow(v);
-+       sqlite3VdbeJumpHere(v, addr);
-+ 
-+       /* Make sure all the indices are constructed correctly.
-+@@ -115710,16 +115960,13 @@ SQLITE_PRIVATE void sqlite3Pragma(
-+         int r1 = -1;
-+ 
-+         if( pTab->tnum<1 ) continue;  /* Skip VIEWs or VIRTUAL TABLEs */
-+-        if( pTab->pCheck==0
-+-         && (pTab->tabFlags & TF_HasNotNull)==0
-+-         && (pTab->pIndex==0 || isQuick)
-+-        ){
-+-          continue;  /* No additional checks needed for this table */
-+-        }
-+         pPk = HasRowid(pTab) ? 0 : sqlite3PrimaryKeyIndex(pTab);
-+         sqlite3ExprCacheClear(pParse);
-+         sqlite3OpenTableAndIndices(pParse, pTab, OP_OpenRead, 0,
-+                                    1, 0, &iDataCur, &iIdxCur);
-++        /* reg[7] counts the number of entries in the table.
-++        ** reg[8+i] counts the number of entries in the i-th index
-++        */
-+         sqlite3VdbeAddOp2(v, OP_Integer, 0, 7);
-+         for(j=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, j++){
-+           sqlite3VdbeAddOp2(v, OP_Integer, 0, 8+j); /* index entries counter */
-+@@ -115740,7 +115987,7 @@ SQLITE_PRIVATE void sqlite3Pragma(
-+           zErr = sqlite3MPrintf(db, "NULL value in %s.%s", pTab->zName,
-+                               pTab->aCol[j].zName);
-+           sqlite3VdbeAddOp4(v, OP_String8, 0, 3, 0, zErr, P4_DYNAMIC);
-+-          integrityCheckResultRow(v, 3);
-++          integrityCheckResultRow(v);
-+           sqlite3VdbeJumpHere(v, jmp2);
-+         }
-+         /* Verify CHECK constraints */
-+@@ -115763,57 +116010,62 @@ SQLITE_PRIVATE void sqlite3Pragma(
-+             zErr = sqlite3MPrintf(db, "CHECK constraint failed in %s",
-+                 pTab->zName);
-+             sqlite3VdbeAddOp4(v, OP_String8, 0, 3, 0, zErr, P4_DYNAMIC);
-+-            integrityCheckResultRow(v, 3);
-++            integrityCheckResultRow(v);
-+             sqlite3VdbeResolveLabel(v, addrCkOk);
-+             sqlite3ExprCachePop(pParse);
-+           }
-+           sqlite3ExprListDelete(db, pCheck);
-+         }
-+-        /* Validate index entries for the current row */
-+-        for(j=0, pIdx=pTab->pIndex; pIdx && !isQuick; pIdx=pIdx->pNext, j++){
-+-          int jmp2, jmp3, jmp4, jmp5;
-+-          int ckUniq = sqlite3VdbeMakeLabel(v);
-+-          if( pPk==pIdx ) continue;
-+-          r1 = sqlite3GenerateIndexKey(pParse, pIdx, iDataCur, 0, 0, &jmp3,
-+-                                       pPrior, r1);
-+-          pPrior = pIdx;
-+-          sqlite3VdbeAddOp2(v, OP_AddImm, 8+j, 1);  /* increment entry count */
-+-          /* Verify that an index entry exists for the current table row */
-+-          jmp2 = sqlite3VdbeAddOp4Int(v, OP_Found, iIdxCur+j, ckUniq, r1,
-+-                                      pIdx->nColumn); VdbeCoverage(v);
-+-          sqlite3VdbeLoadString(v, 3, "row ");
-+-          sqlite3VdbeAddOp3(v, OP_Concat, 7, 3, 3);
-+-          sqlite3VdbeLoadString(v, 4, " missing from index ");
-+-          sqlite3VdbeAddOp3(v, OP_Concat, 4, 3, 3);
-+-          jmp5 = sqlite3VdbeLoadString(v, 4, pIdx->zName);
-+-          sqlite3VdbeAddOp3(v, OP_Concat, 4, 3, 3);
-+-          jmp4 = integrityCheckResultRow(v, 3);
-+-          sqlite3VdbeJumpHere(v, jmp2);
-+-          /* For UNIQUE indexes, verify that only one entry exists with the
-+-          ** current key.  The entry is unique if (1) any column is NULL
-+-          ** or (2) the next entry has a different key */
-+-          if( IsUniqueIndex(pIdx) ){
-+-            int uniqOk = sqlite3VdbeMakeLabel(v);
-+-            int jmp6;
-+-            int kk;
-+-            for(kk=0; kk<pIdx->nKeyCol; kk++){
-+-              int iCol = pIdx->aiColumn[kk];
-+-              assert( iCol!=XN_ROWID && iCol<pTab->nCol );
-+-              if( iCol>=0 && pTab->aCol[iCol].notNull ) continue;
-+-              sqlite3VdbeAddOp2(v, OP_IsNull, r1+kk, uniqOk);
-+-              VdbeCoverage(v);
-++        if( !isQuick ){ /* Omit the remaining tests for quick_check */
-++          /* Sanity check on record header decoding */
-++          sqlite3VdbeAddOp3(v, OP_Column, iDataCur, pTab->nCol-1, 3);
-++          sqlite3VdbeChangeP5(v, OPFLAG_TYPEOFARG);
-++          /* Validate index entries for the current row */
-++          for(j=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, j++){
-++            int jmp2, jmp3, jmp4, jmp5;
-++            int ckUniq = sqlite3VdbeMakeLabel(v);
-++            if( pPk==pIdx ) continue;
-++            r1 = sqlite3GenerateIndexKey(pParse, pIdx, iDataCur, 0, 0, &jmp3,
-++                                         pPrior, r1);
-++            pPrior = pIdx;
-++            sqlite3VdbeAddOp2(v, OP_AddImm, 8+j, 1);/* increment entry count */
-++            /* Verify that an index entry exists for the current table row */
-++            jmp2 = sqlite3VdbeAddOp4Int(v, OP_Found, iIdxCur+j, ckUniq, r1,
-++                                        pIdx->nColumn); VdbeCoverage(v);
-++            sqlite3VdbeLoadString(v, 3, "row ");
-++            sqlite3VdbeAddOp3(v, OP_Concat, 7, 3, 3);
-++            sqlite3VdbeLoadString(v, 4, " missing from index ");
-++            sqlite3VdbeAddOp3(v, OP_Concat, 4, 3, 3);
-++            jmp5 = sqlite3VdbeLoadString(v, 4, pIdx->zName);
-++            sqlite3VdbeAddOp3(v, OP_Concat, 4, 3, 3);
-++            jmp4 = integrityCheckResultRow(v);
-++            sqlite3VdbeJumpHere(v, jmp2);
-++            /* For UNIQUE indexes, verify that only one entry exists with the
-++            ** current key.  The entry is unique if (1) any column is NULL
-++            ** or (2) the next entry has a different key */
-++            if( IsUniqueIndex(pIdx) ){
-++              int uniqOk = sqlite3VdbeMakeLabel(v);
-++              int jmp6;
-++              int kk;
-++              for(kk=0; kk<pIdx->nKeyCol; kk++){
-++                int iCol = pIdx->aiColumn[kk];
-++                assert( iCol!=XN_ROWID && iCol<pTab->nCol );
-++                if( iCol>=0 && pTab->aCol[iCol].notNull ) continue;
-++                sqlite3VdbeAddOp2(v, OP_IsNull, r1+kk, uniqOk);
-++                VdbeCoverage(v);
-++              }
-++              jmp6 = sqlite3VdbeAddOp1(v, OP_Next, iIdxCur+j); VdbeCoverage(v);
-++              sqlite3VdbeGoto(v, uniqOk);
-++              sqlite3VdbeJumpHere(v, jmp6);
-++              sqlite3VdbeAddOp4Int(v, OP_IdxGT, iIdxCur+j, uniqOk, r1,
-++                                   pIdx->nKeyCol); VdbeCoverage(v);
-++              sqlite3VdbeLoadString(v, 3, "non-unique entry in index ");
-++              sqlite3VdbeGoto(v, jmp5);
-++              sqlite3VdbeResolveLabel(v, uniqOk);
-+             }
-+-            jmp6 = sqlite3VdbeAddOp1(v, OP_Next, iIdxCur+j); VdbeCoverage(v);
-+-            sqlite3VdbeGoto(v, uniqOk);
-+-            sqlite3VdbeJumpHere(v, jmp6);
-+-            sqlite3VdbeAddOp4Int(v, OP_IdxGT, iIdxCur+j, uniqOk, r1,
-+-                                 pIdx->nKeyCol); VdbeCoverage(v);
-+-            sqlite3VdbeLoadString(v, 3, "non-unique entry in index ");
-+-            sqlite3VdbeGoto(v, jmp5);
-+-            sqlite3VdbeResolveLabel(v, uniqOk);
-++            sqlite3VdbeJumpHere(v, jmp4);
-++            sqlite3ResolvePartIdxLabel(pParse, jmp3);
-+           }
-+-          sqlite3VdbeJumpHere(v, jmp4);
-+-          sqlite3ResolvePartIdxLabel(pParse, jmp3);
-+         }
-+         sqlite3VdbeAddOp2(v, OP_Next, iDataCur, loopTop); VdbeCoverage(v);
-+         sqlite3VdbeJumpHere(v, loopTop-1);
-+@@ -115825,9 +116077,9 @@ SQLITE_PRIVATE void sqlite3Pragma(
-+             sqlite3VdbeAddOp2(v, OP_Count, iIdxCur+j, 3);
-+             addr = sqlite3VdbeAddOp3(v, OP_Eq, 8+j, 0, 3); VdbeCoverage(v);
-+             sqlite3VdbeChangeP5(v, SQLITE_NOTNULL);
-+-            sqlite3VdbeLoadString(v, 3, pIdx->zName);
-+-            sqlite3VdbeAddOp3(v, OP_Concat, 3, 2, 7);
-+-            integrityCheckResultRow(v, 7);
-++            sqlite3VdbeLoadString(v, 4, pIdx->zName);
-++            sqlite3VdbeAddOp3(v, OP_Concat, 4, 2, 3);
-++            integrityCheckResultRow(v);
-+             sqlite3VdbeJumpHere(v, addr);
-+           }
-+         }
-+@@ -115841,6 +116093,9 @@ SQLITE_PRIVATE void sqlite3Pragma(
-+         { OP_IfNotZero,   1, 4,        0},    /* 1 */
-+         { OP_String8,     0, 3,        0},    /* 2 */
-+         { OP_ResultRow,   3, 1,        0},    /* 3 */
-++        { OP_Halt,        0, 0,        0},    /* 4 */
-++        { OP_String8,     0, 3,        0},    /* 5 */
-++        { OP_Goto,        0, 3,        0},    /* 6 */
-+       };
-+       VdbeOp *aOp;
-+ 
-+@@ -115849,7 +116104,10 @@ SQLITE_PRIVATE void sqlite3Pragma(
-+         aOp[0].p2 = 1-mxErr;
-+         aOp[2].p4type = P4_STATIC;
-+         aOp[2].p4.z = "ok";
-++        aOp[5].p4type = P4_STATIC;
-++        aOp[5].p4.z = (char*)sqlite3ErrStr(SQLITE_CORRUPT);
-+       }
-++      sqlite3VdbeChangeP3(v, 0, sqlite3VdbeCurrentAddr(v)-2);
-+     }
-+   }
-+   break;
-+@@ -116729,7 +116987,7 @@ SQLITE_PRIVATE int sqlite3InitCallback(void *pInit, int argc, char **argv, char
-+     rc = db->errCode;
-+     assert( (rc&0xFF)==(rcp&0xFF) );
-+     db->init.iDb = saved_iDb;
-+-    assert( saved_iDb==0 || (db->flags & SQLITE_Vacuum)!=0 );
-++    assert( saved_iDb==0 || (db->mDbFlags & DBFLAG_Vacuum)!=0 );
-+     if( SQLITE_OK!=rc ){
-+       if( db->init.orphanTrigger ){
-+         assert( iDb==1 );
-+@@ -116794,6 +117052,8 @@ static int sqlite3InitOne(sqlite3 *db, int iDb, char **pzErrMsg){
-+   assert( sqlite3_mutex_held(db->mutex) );
-+   assert( iDb==1 || sqlite3BtreeHoldsMutex(db->aDb[iDb].pBt) );
-+ 
-++  db->init.busy = 1;
-++
-+   /* Construct the in-memory representation schema tables (sqlite_master or
-+   ** sqlite_temp_master) by invoking the parser directly.  The appropriate
-+   ** table name will be inserted automatically by the parser so we can just
-+@@ -116802,7 +117062,7 @@ static int sqlite3InitOne(sqlite3 *db, int iDb, char **pzErrMsg){
-+   azArg[0] = zMasterName = SCHEMA_TABLE(iDb);
-+   azArg[1] = "1";
-+   azArg[2] = "CREATE TABLE x(type text,name text,tbl_name text,"
-+-                            "rootpage integer,sql text)";
-++                            "rootpage int,sql text)";
-+   azArg[3] = 0;
-+   initData.db = db;
-+   initData.iDb = iDb;
-+@@ -116818,10 +117078,10 @@ static int sqlite3InitOne(sqlite3 *db, int iDb, char **pzErrMsg){
-+   */
-+   pDb = &db->aDb[iDb];
-+   if( pDb->pBt==0 ){
-+-    if( !OMIT_TEMPDB && ALWAYS(iDb==1) ){
-+-      DbSetProperty(db, 1, DB_SchemaLoaded);
-+-    }
-+-    return SQLITE_OK;
-++    assert( iDb==1 );
-++    DbSetProperty(db, 1, DB_SchemaLoaded);
-++    rc = SQLITE_OK;
-++    goto error_out;
-+   }
-+ 
-+   /* If there is not already a read-only (or read-write) transaction opened
-+@@ -116980,9 +117240,13 @@ initone_error_out:
-+   sqlite3BtreeLeave(pDb->pBt);
-+ 
-+ error_out:
-+-  if( rc==SQLITE_NOMEM || rc==SQLITE_IOERR_NOMEM ){
-+-    sqlite3OomFault(db);
-++  if( rc ){
-++    if( rc==SQLITE_NOMEM || rc==SQLITE_IOERR_NOMEM ){
-++      sqlite3OomFault(db);
-++    }
-++    sqlite3ResetOneSchema(db, iDb);
-+   }
-++  db->init.busy = 0;
-+   return rc;
-+ }
-+ 
-+@@ -116998,42 +117262,29 @@ error_out:
-+ */
-+ SQLITE_PRIVATE int sqlite3Init(sqlite3 *db, char **pzErrMsg){
-+   int i, rc;
-+-  int commit_internal = !(db->flags&SQLITE_InternChanges);
-++  int commit_internal = !(db->mDbFlags&DBFLAG_SchemaChange);
-+ 
-+   assert( sqlite3_mutex_held(db->mutex) );
-+   assert( sqlite3BtreeHoldsMutex(db->aDb[0].pBt) );
-+   assert( db->init.busy==0 );
-+-  rc = SQLITE_OK;
-+-  db->init.busy = 1;
-+   ENC(db) = SCHEMA_ENC(db);
-+-  for(i=0; rc==SQLITE_OK && i<db->nDb; i++){
-+-    if( DbHasProperty(db, i, DB_SchemaLoaded) || i==1 ) continue;
-+-    rc = sqlite3InitOne(db, i, pzErrMsg);
-+-    if( rc ){
-+-      sqlite3ResetOneSchema(db, i);
-+-    }
-++  assert( db->nDb>0 );
-++  /* Do the main schema first */
-++  if( !DbHasProperty(db, 0, DB_SchemaLoaded) ){
-++    rc = sqlite3InitOne(db, 0, pzErrMsg);
-++    if( rc ) return rc;
-+   }
-+-
-+-  /* Once all the other databases have been initialized, load the schema
-+-  ** for the TEMP database. This is loaded last, as the TEMP database
-+-  ** schema may contain references to objects in other databases.
-+-  */
-+-#ifndef SQLITE_OMIT_TEMPDB
-+-  assert( db->nDb>1 );
-+-  if( rc==SQLITE_OK && !DbHasProperty(db, 1, DB_SchemaLoaded) ){
-+-    rc = sqlite3InitOne(db, 1, pzErrMsg);
-+-    if( rc ){
-+-      sqlite3ResetOneSchema(db, 1);
-++  /* All other schemas after the main schema. The "temp" schema must be last */
-++  for(i=db->nDb-1; i>0; i--){
-++    if( !DbHasProperty(db, i, DB_SchemaLoaded) ){
-++      rc = sqlite3InitOne(db, i, pzErrMsg);
-++      if( rc ) return rc;
-+     }
-+   }
-+-#endif
-+-
-+-  db->init.busy = 0;
-+-  if( rc==SQLITE_OK && commit_internal ){
-++  if( commit_internal ){
-+     sqlite3CommitInternalChanges(db);
-+   }
-+-
-+-  return rc;
-++  return SQLITE_OK;
-+ }
-+ 
-+ /*
-+@@ -117138,16 +117389,14 @@ SQLITE_PRIVATE int sqlite3SchemaToIndex(sqlite3 *db, Schema *pSchema){
-+ ** Free all memory allocations in the pParse object
-+ */
-+ SQLITE_PRIVATE void sqlite3ParserReset(Parse *pParse){
-+-  if( pParse ){
-+-    sqlite3 *db = pParse->db;
-+-    sqlite3DbFree(db, pParse->aLabel);
-+-    sqlite3ExprListDelete(db, pParse->pConstExpr);
-+-    if( db ){
-+-      assert( db->lookaside.bDisable >= pParse->disableLookaside );
-+-      db->lookaside.bDisable -= pParse->disableLookaside;
-+-    }
-+-    pParse->disableLookaside = 0;
-++  sqlite3 *db = pParse->db;
-++  sqlite3DbFree(db, pParse->aLabel);
-++  sqlite3ExprListDelete(db, pParse->pConstExpr);
-++  if( db ){
-++    assert( db->lookaside.bDisable >= pParse->disableLookaside );
-++    db->lookaside.bDisable -= pParse->disableLookaside;
-+   }
-++  pParse->disableLookaside = 0;
-+ }
-+ 
-+ /*
-+@@ -117333,6 +117582,7 @@ static int sqlite3LockAndPrepare(
-+   sqlite3BtreeEnterAll(db);
-+   rc = sqlite3Prepare(db, zSql, nBytes, prepFlags, pOld, ppStmt, pzTail);
-+   if( rc==SQLITE_SCHEMA ){
-++    sqlite3ResetOneSchema(db, -1);
-+     sqlite3_finalize(*ppStmt);
-+     rc = sqlite3Prepare(db, zSql, nBytes, prepFlags, pOld, ppStmt, pzTail);
-+   }
-+@@ -117626,7 +117876,7 @@ static void clearSelect(sqlite3 *db, Select *p, int bFree){
-+     sqlite3ExprListDelete(db, p->pOrderBy);
-+     sqlite3ExprDelete(db, p->pLimit);
-+     sqlite3ExprDelete(db, p->pOffset);
-+-    if( p->pWith ) sqlite3WithDelete(db, p->pWith);
-++    if( OK_IF_ALWAYS_TRUE(p->pWith) ) sqlite3WithDelete(db, p->pWith);
-+     if( bFree ) sqlite3DbFreeNN(db, p);
-+     p = pPrior;
-+     bFree = 1;
-+@@ -117669,7 +117919,8 @@ SQLITE_PRIVATE Select *sqlite3SelectNew(
-+     pNew = &standin;
-+   }
-+   if( pEList==0 ){
-+-    pEList = sqlite3ExprListAppend(pParse, 0, sqlite3Expr(pParse->db,TK_ASTERISK,0));
-++    pEList = sqlite3ExprListAppend(pParse, 0,
-++                                   sqlite3Expr(pParse->db,TK_ASTERISK,0));
-+   }
-+   pNew->pEList = pEList;
-+   pNew->op = TK_SELECT;
-+@@ -117693,7 +117944,8 @@ SQLITE_PRIVATE Select *sqlite3SelectNew(
-+   pNew->pLimit = pLimit;
-+   pNew->pOffset = pOffset;
-+   pNew->pWith = 0;
-+-  assert( pOffset==0 || pLimit!=0 || pParse->nErr>0 || pParse->db->mallocFailed!=0 );
-++  assert( pOffset==0 || pLimit!=0 || pParse->nErr>0
-++                     || pParse->db->mallocFailed!=0 );
-+   if( pParse->db->mallocFailed ) {
-+     clearSelect(pParse->db, pNew, pNew!=&standin);
-+     pNew = 0;
-+@@ -117720,7 +117972,7 @@ SQLITE_PRIVATE void sqlite3SelectSetName(Select *p, const char *zName){
-+ ** Delete the given Select structure and all of its substructures.
-+ */
-+ SQLITE_PRIVATE void sqlite3SelectDelete(sqlite3 *db, Select *p){
-+-  if( p ) clearSelect(db, p, 1);
-++  if( OK_IF_ALWAYS_TRUE(p) ) clearSelect(db, p, 1);
-+ }
-+ 
-+ /*
-+@@ -117961,11 +118213,10 @@ static int sqliteProcessJoin(Parse *pParse, Select *p){
-+   pLeft = &pSrc->a[0];
-+   pRight = &pLeft[1];
-+   for(i=0; i<pSrc->nSrc-1; i++, pRight++, pLeft++){
-+-    Table *pLeftTab = pLeft->pTab;
-+     Table *pRightTab = pRight->pTab;
-+     int isOuter;
-+ 
-+-    if( NEVER(pLeftTab==0 || pRightTab==0) ) continue;
-++    if( NEVER(pLeft->pTab==0 || pRightTab==0) ) continue;
-+     isOuter = (pRight->fg.jointype & JT_OUTER)!=0;
-+ 
-+     /* When the NATURAL keyword is present, add WHERE clause terms for
-+@@ -118113,11 +118364,11 @@ static void pushOntoSorter(
-+     if( pParse->db->mallocFailed ) return;
-+     pOp->p2 = nKey + nData;
-+     pKI = pOp->p4.pKeyInfo;
-+-    memset(pKI->aSortOrder, 0, pKI->nField); /* Makes OP_Jump below testable */
-++    memset(pKI->aSortOrder, 0, pKI->nKeyField); /* Makes OP_Jump testable */
-+     sqlite3VdbeChangeP4(v, -1, (char*)pKI, P4_KEYINFO);
-+-    testcase( pKI->nXField>2 );
-++    testcase( pKI->nAllField > pKI->nKeyField+2 );
-+     pOp->p4.pKeyInfo = keyInfoFromExprList(pParse, pSort->pOrderBy, nOBSat,
-+-                                           pKI->nXField-1);
-++                                           pKI->nAllField-pKI->nKeyField-1);
-+     addrJmp = sqlite3VdbeCurrentAddr(v);
-+     sqlite3VdbeAddOp3(v, OP_Jump, addrJmp+1, 0, addrJmp+1); VdbeCoverage(v);
-+     pSort->labelBkOut = sqlite3VdbeMakeLabel(v);
-+@@ -118215,16 +118466,15 @@ static void codeDistinct(
-+ ** This routine generates the code for the inside of the inner loop
-+ ** of a SELECT.
-+ **
-+-** If srcTab is negative, then the pEList expressions
-++** If srcTab is negative, then the p->pEList expressions
-+ ** are evaluated in order to get the data for this row.  If srcTab is
-+-** zero or more, then data is pulled from srcTab and pEList is used only
-++** zero or more, then data is pulled from srcTab and p->pEList is used only
-+ ** to get the number of columns and the collation sequence for each column.
-+ */
-+ static void selectInnerLoop(
-+   Parse *pParse,          /* The parser context */
-+   Select *p,              /* The complete select statement being coded */
-+-  ExprList *pEList,       /* List of values being extracted */
-+-  int srcTab,             /* Pull data from this table */
-++  int srcTab,             /* Pull data from this table if non-negative */
-+   SortCtx *pSort,         /* If not NULL, info on how to process ORDER BY */
-+   DistinctCtx *pDistinct, /* If not NULL, info on how to process DISTINCT */
-+   SelectDest *pDest,      /* How to dispose of the results */
-+@@ -118248,7 +118498,7 @@ static void selectInnerLoop(
-+   int regOrig;                /* Start of memory holding full result (or 0) */
-+ 
-+   assert( v );
-+-  assert( pEList!=0 );
-++  assert( p->pEList!=0 );
-+   hasDistinct = pDistinct ? pDistinct->eTnctType : WHERE_DISTINCT_NOOP;
-+   if( pSort && pSort->pOrderBy==0 ) pSort = 0;
-+   if( pSort==0 && !hasDistinct ){
-+@@ -118258,7 +118508,7 @@ static void selectInnerLoop(
-+ 
-+   /* Pull the requested columns.
-+   */
-+-  nResultCol = pEList->nExpr;
-++  nResultCol = p->pEList->nExpr;
-+ 
-+   if( pDest->iSdst==0 ){
-+     if( pSort ){
-+@@ -118281,7 +118531,7 @@ static void selectInnerLoop(
-+   if( srcTab>=0 ){
-+     for(i=0; i<nResultCol; i++){
-+       sqlite3VdbeAddOp3(v, OP_Column, srcTab, i, regResult+i);
-+-      VdbeComment((v, "%s", pEList->a[i].zName));
-++      VdbeComment((v, "%s", p->pEList->a[i].zName));
-+     }
-+   }else if( eDest!=SRT_Exists ){
-+     /* If the destination is an EXISTS(...) expression, the actual
-+@@ -118294,24 +118544,25 @@ static void selectInnerLoop(
-+       ecelFlags = 0;
-+     }
-+     if( pSort && hasDistinct==0 && eDest!=SRT_EphemTab && eDest!=SRT_Table ){
-+-      /* For each expression in pEList that is a copy of an expression in
-++      /* For each expression in p->pEList that is a copy of an expression in
-+       ** the ORDER BY clause (pSort->pOrderBy), set the associated
-+       ** iOrderByCol value to one more than the index of the ORDER BY
-+       ** expression within the sort-key that pushOntoSorter() will generate.
-+-      ** This allows the pEList field to be omitted from the sorted record,
-++      ** This allows the p->pEList field to be omitted from the sorted record,
-+       ** saving space and CPU cycles.  */
-+       ecelFlags |= (SQLITE_ECEL_OMITREF|SQLITE_ECEL_REF);
-+       for(i=pSort->nOBSat; i<pSort->pOrderBy->nExpr; i++){
-+         int j;
-+         if( (j = pSort->pOrderBy->a[i].u.x.iOrderByCol)>0 ){
-+-          pEList->a[j-1].u.x.iOrderByCol = i+1-pSort->nOBSat;
-++          p->pEList->a[j-1].u.x.iOrderByCol = i+1-pSort->nOBSat;
-+         }
-+       }
-+       regOrig = 0;
-+       assert( eDest==SRT_Set || eDest==SRT_Mem
-+            || eDest==SRT_Coroutine || eDest==SRT_Output );
-+     }
-+-    nResultCol = sqlite3ExprCodeExprList(pParse,pEList,regResult,0,ecelFlags);
-++    nResultCol = sqlite3ExprCodeExprList(pParse,p->pEList,regResult,
-++                                         0,ecelFlags);
-+   }
-+ 
-+   /* If the DISTINCT keyword was present on the SELECT statement
-+@@ -118343,7 +118594,7 @@ static void selectInnerLoop(
-+ 
-+         iJump = sqlite3VdbeCurrentAddr(v) + nResultCol;
-+         for(i=0; i<nResultCol; i++){
-+-          CollSeq *pColl = sqlite3ExprCollSeq(pParse, pEList->a[i].pExpr);
-++          CollSeq *pColl = sqlite3ExprCollSeq(pParse, p->pEList->a[i].pExpr);
-+           if( i<nResultCol-1 ){
-+             sqlite3VdbeAddOp3(v, OP_Ne, regResult+i, iJump, regPrev+i);
-+             VdbeCoverage(v);
-+@@ -118586,8 +118837,8 @@ SQLITE_PRIVATE KeyInfo *sqlite3KeyInfoAlloc(sqlite3 *db, int N, int X){
-+   KeyInfo *p = sqlite3DbMallocRawNN(db, sizeof(KeyInfo) + nExtra);
-+   if( p ){
-+     p->aSortOrder = (u8*)&p->aColl[N+X];
-+-    p->nField = (u16)N;
-+-    p->nXField = (u16)X;
-++    p->nKeyField = (u16)N;
-++    p->nAllField = (u16)(N+X);
-+     p->enc = ENC(db);
-+     p->db = db;
-+     p->nRef = 1;
-+@@ -118661,10 +118912,7 @@ static KeyInfo *keyInfoFromExprList(
-+   if( pInfo ){
-+     assert( sqlite3KeyInfoIsWriteable(pInfo) );
-+     for(i=iStart, pItem=pList->a+iStart; i<nExpr; i++, pItem++){
-+-      CollSeq *pColl;
-+-      pColl = sqlite3ExprCollSeq(pParse, pItem->pExpr);
-+-      if( !pColl ) pColl = db->pDfltColl;
-+-      pInfo->aColl[i-iStart] = pColl;
-++      pInfo->aColl[i-iStart] = sqlite3ExprNNCollSeq(pParse, pItem->pExpr);
-+       pInfo->aSortOrder[i-iStart] = pItem->sortOrder;
-+     }
-+   }
-+@@ -118914,23 +119162,23 @@ static void generateSortTail(
-+ ** the SQLITE_ENABLE_COLUMN_METADATA compile-time option is used.
-+ */
-+ #ifdef SQLITE_ENABLE_COLUMN_METADATA
-+-# define columnType(A,B,C,D,E,F) columnTypeImpl(A,B,C,D,E,F)
-++# define columnType(A,B,C,D,E) columnTypeImpl(A,B,C,D,E)
-+ #else /* if !defined(SQLITE_ENABLE_COLUMN_METADATA) */
-+-# define columnType(A,B,C,D,E,F) columnTypeImpl(A,B,F)
-++# define columnType(A,B,C,D,E) columnTypeImpl(A,B)
-+ #endif
-+ static const char *columnTypeImpl(
-+   NameContext *pNC,
-++#ifndef SQLITE_ENABLE_COLUMN_METADATA
-++  Expr *pExpr
-++#else
-+   Expr *pExpr,
-+-#ifdef SQLITE_ENABLE_COLUMN_METADATA
-+   const char **pzOrigDb,
-+   const char **pzOrigTab,
-+-  const char **pzOrigCol,
-++  const char **pzOrigCol
-+ #endif
-+-  u8 *pEstWidth
-+ ){
-+   char const *zType = 0;
-+   int j;
-+-  u8 estWidth = 1;
-+ #ifdef SQLITE_ENABLE_COLUMN_METADATA
-+   char const *zOrigDb = 0;
-+   char const *zOrigTab = 0;
-+@@ -119002,33 +119250,32 @@ static const char *columnTypeImpl(
-+           sNC.pSrcList = pS->pSrc;
-+           sNC.pNext = pNC;
-+           sNC.pParse = pNC->pParse;
-+-          zType = columnType(&sNC, p,&zOrigDb,&zOrigTab,&zOrigCol, &estWidth);
-++          zType = columnType(&sNC, p,&zOrigDb,&zOrigTab,&zOrigCol);
-+         }
-+-      }else if( pTab->pSchema ){
-+-        /* A real table */
-++      }else{
-++        /* A real table or a CTE table */
-+         assert( !pS );
-+-        if( iCol<0 ) iCol = pTab->iPKey;
-+-        assert( iCol==-1 || (iCol>=0 && iCol<pTab->nCol) );
-+ #ifdef SQLITE_ENABLE_COLUMN_METADATA
-++        if( iCol<0 ) iCol = pTab->iPKey;
-++        assert( iCol==XN_ROWID || (iCol>=0 && iCol<pTab->nCol) );
-+         if( iCol<0 ){
-+           zType = "INTEGER";
-+           zOrigCol = "rowid";
-+         }else{
-+           zOrigCol = pTab->aCol[iCol].zName;
-+           zType = sqlite3ColumnType(&pTab->aCol[iCol],0);
-+-          estWidth = pTab->aCol[iCol].szEst;
-+         }
-+         zOrigTab = pTab->zName;
-+-        if( pNC->pParse ){
-++        if( pNC->pParse && pTab->pSchema ){
-+           int iDb = sqlite3SchemaToIndex(pNC->pParse->db, pTab->pSchema);
-+           zOrigDb = pNC->pParse->db->aDb[iDb].zDbSName;
-+         }
-+ #else
-++        assert( iCol==XN_ROWID || (iCol>=0 && iCol<pTab->nCol) );
-+         if( iCol<0 ){
-+           zType = "INTEGER";
-+         }else{
-+           zType = sqlite3ColumnType(&pTab->aCol[iCol],0);
-+-          estWidth = pTab->aCol[iCol].szEst;
-+         }
-+ #endif
-+       }
-+@@ -119047,7 +119294,7 @@ static const char *columnTypeImpl(
-+       sNC.pSrcList = pS->pSrc;
-+       sNC.pNext = pNC;
-+       sNC.pParse = pNC->pParse;
-+-      zType = columnType(&sNC, p, &zOrigDb, &zOrigTab, &zOrigCol, &estWidth);
-++      zType = columnType(&sNC, p, &zOrigDb, &zOrigTab, &zOrigCol);
-+       break;
-+     }
-+ #endif
-+@@ -119061,7 +119308,6 @@ static const char *columnTypeImpl(
-+     *pzOrigCol = zOrigCol;
-+   }
-+ #endif
-+-  if( pEstWidth ) *pEstWidth = estWidth;
-+   return zType;
-+ }
-+ 
-+@@ -119088,7 +119334,7 @@ static void generateColumnTypes(
-+     const char *zOrigDb = 0;
-+     const char *zOrigTab = 0;
-+     const char *zOrigCol = 0;
-+-    zType = columnType(&sNC, p, &zOrigDb, &zOrigTab, &zOrigCol, 0);
-++    zType = columnType(&sNC, p, &zOrigDb, &zOrigTab, &zOrigCol);
-+ 
-+     /* The vdbe must make its own copy of the column-type and other
-+     ** column specific strings, in case the schema is reset before this
-+@@ -119098,7 +119344,7 @@ static void generateColumnTypes(
-+     sqlite3VdbeSetColName(v, i, COLNAME_TABLE, zOrigTab, SQLITE_TRANSIENT);
-+     sqlite3VdbeSetColName(v, i, COLNAME_COLUMN, zOrigCol, SQLITE_TRANSIENT);
-+ #else
-+-    zType = columnType(&sNC, p, 0, 0, 0, 0);
-++    zType = columnType(&sNC, p, 0, 0, 0);
-+ #endif
-+     sqlite3VdbeSetColName(v, i, COLNAME_DECLTYPE, zType, SQLITE_TRANSIENT);
-+   }
-+@@ -119140,9 +119386,9 @@ static Table *tableWithCursor(SrcList *pList, int iCursor){
-+ **                              other words, the zSpan of the result expression.
-+ **
-+ **    short=ON, full=OFF:       (This is the default setting).  If the result
-+-**                              refers directly to a table column, then the result
-+-**                              column name is just the table column name: COLUMN.
-+-**                              Otherwise use zSpan.
-++**                              refers directly to a table column, then the
-++**                              result column name is just the table column
-++**                              name: COLUMN.  Otherwise use zSpan.
-+ **
-+ **    full=ON, short=ANY:       If the result refers directly to a table column,
-+ **                              then the result column name with the table name
-+@@ -119178,6 +119424,8 @@ static void generateColumnNames(
-+     Expr *p = pEList->a[i].pExpr;
-+ 
-+     assert( p!=0 );
-++    assert( p->op!=TK_AGG_COLUMN );  /* Agg processing has not run yet */
-++    assert( p->op!=TK_COLUMN || p->pTab!=0 ); /* Covering idx not yet coded */
-+     if( pEList->a[i].zName ){
-+       /* An AS clause always takes first priority */
-+       char *zName = pEList->a[i].zName;
-+@@ -119253,6 +119501,7 @@ SQLITE_PRIVATE int sqlite3ColumnsFromExprList(
-+     nCol = pEList->nExpr;
-+     aCol = sqlite3DbMallocZero(db, sizeof(aCol[0])*nCol);
-+     testcase( aCol==0 );
-++    if( nCol>32767 ) nCol = 32767;
-+   }else{
-+     nCol = 0;
-+     aCol = 0;
-+@@ -119272,7 +119521,9 @@ SQLITE_PRIVATE int sqlite3ColumnsFromExprList(
-+         pColExpr = pColExpr->pRight;
-+         assert( pColExpr!=0 );
-+       }
-+-      if( pColExpr->op==TK_COLUMN && pColExpr->pTab!=0 ){
-++      if( (pColExpr->op==TK_COLUMN || pColExpr->op==TK_AGG_COLUMN)
-++       && pColExpr->pTab!=0
-++      ){
-+         /* For columns use the column name name */
-+         int iCol = pColExpr->iColumn;
-+         Table *pTab = pColExpr->pTab;
-+@@ -119347,7 +119598,6 @@ SQLITE_PRIVATE void sqlite3SelectAddColumnTypeAndCollation(
-+   int i;
-+   Expr *p;
-+   struct ExprList_item *a;
-+-  u64 szAll = 0;
-+ 
-+   assert( pSelect!=0 );
-+   assert( (pSelect->selFlags & SF_Resolved)!=0 );
-+@@ -119360,10 +119610,11 @@ SQLITE_PRIVATE void sqlite3SelectAddColumnTypeAndCollation(
-+     const char *zType;
-+     int n, m;
-+     p = a[i].pExpr;
-+-    zType = columnType(&sNC, p, 0, 0, 0, &pCol->szEst);
-+-    szAll += pCol->szEst;
-++    zType = columnType(&sNC, p, 0, 0, 0);
-++    /* pCol->szEst = ... // Column size est for SELECT tables never used */
-+     pCol->affinity = sqlite3ExprAffinity(p);
-+-    if( zType && (m = sqlite3Strlen30(zType))>0 ){
-++    if( zType ){
-++      m = sqlite3Strlen30(zType);
-+       n = sqlite3Strlen30(pCol->zName);
-+       pCol->zName = sqlite3DbReallocOrFree(db, pCol->zName, n+m+2);
-+       if( pCol->zName ){
-+@@ -119377,7 +119628,7 @@ SQLITE_PRIVATE void sqlite3SelectAddColumnTypeAndCollation(
-+       pCol->zColl = sqlite3DbStrDup(db, pColl->zName);
-+     }
-+   }
-+-  pTab->szTabRow = sqlite3LogEst(szAll*4);
-++  pTab->szTabRow = 1; /* Any non-zero value works */
-+ }
-+ 
-+ /*
-+@@ -119420,19 +119671,16 @@ SQLITE_PRIVATE Table *sqlite3ResultSetOfSelect(Parse *pParse, Select *pSelect){
-+ ** Get a VDBE for the given parser context.  Create a new one if necessary.
-+ ** If an error occurs, return NULL and leave a message in pParse.
-+ */
-+-static SQLITE_NOINLINE Vdbe *allocVdbe(Parse *pParse){
-+-  Vdbe *v = pParse->pVdbe = sqlite3VdbeCreate(pParse);
-+-  if( v ) sqlite3VdbeAddOp2(v, OP_Init, 0, 1);
-++SQLITE_PRIVATE Vdbe *sqlite3GetVdbe(Parse *pParse){
-++  if( pParse->pVdbe ){
-++    return pParse->pVdbe;
-++  }
-+   if( pParse->pToplevel==0
-+    && OptimizationEnabled(pParse->db,SQLITE_FactorOutConst)
-+   ){
-+     pParse->okConstFactor = 1;
-+   }
-+-  return v;
-+-}
-+-SQLITE_PRIVATE Vdbe *sqlite3GetVdbe(Parse *pParse){
-+-  Vdbe *v = pParse->pVdbe;
-+-  return v ? v : allocVdbe(pParse);
-++  return sqlite3VdbeCreate(pParse);
-+ }
-+ 
-+ 
-+@@ -119705,7 +119953,7 @@ static void generateWithRecursiveQuery(
-+   /* Output the single row in Current */
-+   addrCont = sqlite3VdbeMakeLabel(v);
-+   codeOffset(v, regOffset, addrCont);
-+-  selectInnerLoop(pParse, p, p->pEList, iCurrent,
-++  selectInnerLoop(pParse, p, iCurrent,
-+       0, 0, pDest, addrCont, addrBreak);
-+   if( regLimit ){
-+     sqlite3VdbeAddOp2(v, OP_DecrJumpZero, regLimit, addrBreak);
-+@@ -119843,15 +120091,9 @@ static int multiSelect(
-+   db = pParse->db;
-+   pPrior = p->pPrior;
-+   dest = *pDest;
-+-  if( pPrior->pOrderBy ){
-+-    sqlite3ErrorMsg(pParse,"ORDER BY clause should come after %s not before",
-+-      selectOpName(p->op));
-+-    rc = 1;
-+-    goto multi_select_end;
-+-  }
-+-  if( pPrior->pLimit ){
-+-    sqlite3ErrorMsg(pParse,"LIMIT clause should come after %s not before",
-+-      selectOpName(p->op));
-++  if( pPrior->pOrderBy || pPrior->pLimit ){
-++    sqlite3ErrorMsg(pParse,"%s clause should come after %s not before",
-++      pPrior->pOrderBy!=0 ? "ORDER BY" : "LIMIT", selectOpName(p->op));
-+     rc = 1;
-+     goto multi_select_end;
-+   }
-+@@ -120029,7 +120271,7 @@ static int multiSelect(
-+         computeLimitRegisters(pParse, p, iBreak);
-+         sqlite3VdbeAddOp2(v, OP_Rewind, unionTab, iBreak); VdbeCoverage(v);
-+         iStart = sqlite3VdbeCurrentAddr(v);
-+-        selectInnerLoop(pParse, p, p->pEList, unionTab,
-++        selectInnerLoop(pParse, p, unionTab,
-+                         0, 0, &dest, iCont, iBreak);
-+         sqlite3VdbeResolveLabel(v, iCont);
-+         sqlite3VdbeAddOp2(v, OP_Next, unionTab, iStart); VdbeCoverage(v);
-+@@ -120107,7 +120349,7 @@ static int multiSelect(
-+       iStart = sqlite3VdbeAddOp2(v, OP_RowData, tab1, r1);
-+       sqlite3VdbeAddOp4Int(v, OP_NotFound, tab2, iCont, r1, 0); VdbeCoverage(v);
-+       sqlite3ReleaseTempReg(pParse, r1);
-+-      selectInnerLoop(pParse, p, p->pEList, tab1,
-++      selectInnerLoop(pParse, p, tab1,
-+                       0, 0, &dest, iCont, iBreak);
-+       sqlite3VdbeResolveLabel(v, iCont);
-+       sqlite3VdbeAddOp2(v, OP_Next, tab1, iStart); VdbeCoverage(v);
-+@@ -120767,7 +121009,9 @@ static Expr *substExpr(
-+   Expr *pExpr            /* Expr in which substitution occurs */
-+ ){
-+   if( pExpr==0 ) return 0;
-+-  if( ExprHasProperty(pExpr, EP_FromJoin) && pExpr->iRightJoinTable==pSubst->iTable ){
-++  if( ExprHasProperty(pExpr, EP_FromJoin)
-++   && pExpr->iRightJoinTable==pSubst->iTable
-++  ){
-+     pExpr->iRightJoinTable = pSubst->iNewTable;
-+   }
-+   if( pExpr->op==TK_COLUMN && pExpr->iTable==pSubst->iTable ){
-+@@ -120880,68 +121124,74 @@ static void substSelect(
-+ ** exist on the table t1, a complete scan of the data might be
-+ ** avoided.
-+ **
-+-** Flattening is only attempted if all of the following are true:
-++** Flattening is subject to the following constraints:
-+ **
-+-**   (1)  The subquery and the outer query do not both use aggregates.
-++**  (**)  We no longer attempt to flatten aggregate subqueries. Was:
-++**        The subquery and the outer query cannot both be aggregates.
-+ **
-+-**   (2)  The subquery is not an aggregate or (2a) the outer query is not a join
-+-**        and (2b) the outer query does not use subqueries other than the one
-+-**        FROM-clause subquery that is a candidate for flattening.  (2b is
-+-**        due to ticket [2f7170d73bf9abf80] from 2015-02-09.)
-++**  (**)  We no longer attempt to flatten aggregate subqueries. Was:
-++**        (2) If the subquery is an aggregate then
-++**        (2a) the outer query must not be a join and
-++**        (2b) the outer query must not use subqueries
-++**             other than the one FROM-clause subquery that is a candidate
-++**             for flattening.  (This is due to ticket [2f7170d73bf9abf80]
-++**             from 2015-02-09.)
-+ **
-+-**   (3)  The subquery is not the right operand of a LEFT JOIN
-+-**        or (a) the subquery is not itself a join and (b) the FROM clause
-+-**        of the subquery does not contain a virtual table and (c) the
-+-**        outer query is not an aggregate.
-++**   (3)  If the subquery is the right operand of a LEFT JOIN then
-++**        (3a) the subquery may not be a join and
-++**        (3b) the FROM clause of the subquery may not contain a virtual
-++**             table and
-++**        (3c) the outer query may not be an aggregate.
-+ **
-+-**   (4)  The subquery is not DISTINCT.
-++**   (4)  The subquery can not be DISTINCT.
-+ **
-+ **  (**)  At one point restrictions (4) and (5) defined a subset of DISTINCT
-+ **        sub-queries that were excluded from this optimization. Restriction
-+ **        (4) has since been expanded to exclude all DISTINCT subqueries.
-+ **
-+-**   (6)  The subquery does not use aggregates or the outer query is not
-+-**        DISTINCT.
-++**  (**)  We no longer attempt to flatten aggregate subqueries.  Was:
-++**        If the subquery is aggregate, the outer query may not be DISTINCT.
-+ **
-+-**   (7)  The subquery has a FROM clause.  TODO:  For subqueries without
-++**   (7)  The subquery must have a FROM clause.  TODO:  For subqueries without
-+ **        A FROM clause, consider adding a FROM clause with the special
-+ **        table sqlite_once that consists of a single row containing a
-+ **        single NULL.
-+ **
-+-**   (8)  The subquery does not use LIMIT or the outer query is not a join.
-++**   (8)  If the subquery uses LIMIT then the outer query may not be a join.
-+ **
-+-**   (9)  The subquery does not use LIMIT or the outer query does not use
-+-**        aggregates.
-++**   (9)  If the subquery uses LIMIT then the outer query may not be aggregate.
-+ **
-+ **  (**)  Restriction (10) was removed from the code on 2005-02-05 but we
-+ **        accidently carried the comment forward until 2014-09-15.  Original
-+-**        text: "The subquery does not use aggregates or the outer query
-+-**        does not use LIMIT."
-++**        constraint: "If the subquery is aggregate then the outer query
-++**        may not use LIMIT."
-+ **
-+-**  (11)  The subquery and the outer query do not both have ORDER BY clauses.
-++**  (11)  The subquery and the outer query may not both have ORDER BY clauses.
-+ **
-+ **  (**)  Not implemented.  Subsumed into restriction (3).  Was previously
-+ **        a separate restriction deriving from ticket #350.
-+ **
-+-**  (13)  The subquery and outer query do not both use LIMIT.
-++**  (13)  The subquery and outer query may not both use LIMIT.
-+ **
-+-**  (14)  The subquery does not use OFFSET.
-++**  (14)  The subquery may not use OFFSET.
-+ **
-+-**  (15)  The outer query is not part of a compound select or the
-+-**        subquery does not have a LIMIT clause.
-++**  (15)  If the outer query is part of a compound select, then the
-++**        subquery may not use LIMIT.
-+ **        (See ticket #2339 and ticket [02a8e81d44]).
-+ **
-+-**  (16)  The outer query is not an aggregate or the subquery does
-+-**        not contain ORDER BY.  (Ticket #2942)  This used to not matter
-++**  (16)  If the outer query is aggregate, then the subquery may not
-++**        use ORDER BY.  (Ticket #2942)  This used to not matter
-+ **        until we introduced the group_concat() function.
-+ **
-+-**  (17)  The sub-query is not a compound select, or it is a UNION ALL
-+-**        compound clause made up entirely of non-aggregate queries, and
-+-**        the parent query:
-+-**
-+-**          * is not itself part of a compound select,
-+-**          * is not an aggregate or DISTINCT query, and
-+-**          * is not a join
-++**  (17)  If the subquery is a compound select, then
-++**        (17a) all compound operators must be a UNION ALL, and
-++**        (17b) no terms within the subquery compound may be aggregate
-++**              or DISTINCT, and
-++**        (17c) every term within the subquery compound must have a FROM clause
-++**        (17d) the outer query may not be
-++**              (17d1) aggregate, or
-++**              (17d2) DISTINCT, or
-++**              (17d3) a join.
-+ **
-+ **        The parent and sub-query may contain WHERE clauses. Subject to
-+ **        rules (11), (13) and (14), they may also contain ORDER BY,
-+@@ -120957,29 +121207,32 @@ static void substSelect(
-+ **        syntax error and return a detailed message.
-+ **
-+ **  (18)  If the sub-query is a compound select, then all terms of the
-+-**        ORDER by clause of the parent must be simple references to
-++**        ORDER BY clause of the parent must be simple references to
-+ **        columns of the sub-query.
-+ **
-+-**  (19)  The subquery does not use LIMIT or the outer query does not
-++**  (19)  If the subquery uses LIMIT then the outer query may not
-+ **        have a WHERE clause.
-+ **
-+-**  (20)  If the sub-query is a compound select, then it must not use
-+-**        an ORDER BY clause.  Ticket #3773.  We could relax this constraint
-+-**        somewhat by saying that the terms of the ORDER BY clause must
-+-**        appear as unmodified result columns in the outer query.  But we
-+-**        have other optimizations in mind to deal with that case.
-++**  (**)  Subsumed into (17d3).  Was: If the sub-query is a compound select,
-++**        then it must not use an ORDER BY clause - Ticket #3773.  Because
-++**        of (17d3), then only way to have a compound subquery is if it is
-++**        the only term in the FROM clause of the outer query.  But if the
-++**        only term in the FROM clause has an ORDER BY, then it will be
-++**        implemented as a co-routine and the flattener will never be called.
-+ **
-+-**  (21)  The subquery does not use LIMIT or the outer query is not
-++**  (21)  If the subquery uses LIMIT then the outer query may not be
-+ **        DISTINCT.  (See ticket [752e1646fc]).
-+ **
-+-**  (22)  The subquery is not a recursive CTE.
-++**  (22)  The subquery may not be a recursive CTE.
-+ **
-+-**  (23)  The parent is not a recursive CTE, or the sub-query is not a
-+-**        compound query. This restriction is because transforming the
-++**  (**)  Subsumed into restriction (17d3).  Was: If the outer query is
-++**        a recursive CTE, then the sub-query may not be a compound query.
-++**        This restriction is because transforming the
-+ **        parent to a compound query confuses the code that handles
-+ **        recursive queries in multiSelect().
-+ **
-+-**  (24)  The subquery is not an aggregate that uses the built-in min() or
-++**  (**)  We no longer attempt to flatten aggregate subqueries.  Was:
-++**        The subquery may not be an aggregate that uses the built-in min() or
-+ **        or max() functions.  (Without this restriction, a query like:
-+ **        "SELECT x FROM (SELECT max(y), x FROM t1)" would not necessarily
-+ **        return the value X for which Y was maximal.)
-+@@ -120987,7 +121240,7 @@ static void substSelect(
-+ **
-+ ** In this routine, the "p" parameter is a pointer to the outer query.
-+ ** The subquery is p->pSrc->a[iFrom].  isAgg is true if the outer query
-+-** uses aggregates and subqueryIsAgg is true if the subquery uses aggregates.
-++** uses aggregates.
-+ **
-+ ** If flattening is not attempted, this routine is a no-op and returns 0.
-+ ** If flattening is attempted this routine returns 1.
-+@@ -120999,8 +121252,7 @@ static int flattenSubquery(
-+   Parse *pParse,       /* Parsing context */
-+   Select *p,           /* The parent or outer SELECT statement */
-+   int iFrom,           /* Index in p->pSrc->a[] of the inner subquery */
-+-  int isAgg,           /* True if outer SELECT uses aggregate functions */
-+-  int subqueryIsAgg    /* True if the subquery uses aggregate functions */
-++  int isAgg            /* True if outer SELECT uses aggregate functions */
-+ ){
-+   const char *zSavedAuthContext = pParse->zAuthContext;
-+   Select *pParent;    /* Current UNION ALL term of the other query */
-+@@ -121020,7 +121272,7 @@ static int flattenSubquery(
-+   /* Check to see if flattening is permitted.  Return 0 if not.
-+   */
-+   assert( p!=0 );
-+-  assert( p->pPrior==0 );  /* Unable to flatten compound queries */
-++  assert( p->pPrior==0 );
-+   if( OptimizationDisabled(db, SQLITE_QueryFlattener) ) return 0;
-+   pSrc = p->pSrc;
-+   assert( pSrc && iFrom>=0 && iFrom<pSrc->nSrc );
-+@@ -121028,16 +121280,6 @@ static int flattenSubquery(
-+   iParent = pSubitem->iCursor;
-+   pSub = pSubitem->pSelect;
-+   assert( pSub!=0 );
-+-  if( subqueryIsAgg ){
-+-    if( isAgg ) return 0;                                /* Restriction (1)   */
-+-    if( pSrc->nSrc>1 ) return 0;                         /* Restriction (2a)  */
-+-    if( (p->pWhere && ExprHasProperty(p->pWhere,EP_Subquery))
-+-     || (sqlite3ExprListFlags(p->pEList) & EP_Subquery)!=0
-+-     || (sqlite3ExprListFlags(p->pOrderBy) & EP_Subquery)!=0
-+-    ){
-+-      return 0;                                          /* Restriction (2b)  */
-+-    }
-+-  }
-+ 
-+   pSubSrc = pSub->pSrc;
-+   assert( pSubSrc );
-+@@ -121052,13 +121294,10 @@ static int flattenSubquery(
-+     return 0;                                            /* Restriction (15) */
-+   }
-+   if( pSubSrc->nSrc==0 ) return 0;                       /* Restriction (7)  */
-+-  if( pSub->selFlags & SF_Distinct ) return 0;           /* Restriction (5)  */
-++  if( pSub->selFlags & SF_Distinct ) return 0;           /* Restriction (4)  */
-+   if( pSub->pLimit && (pSrc->nSrc>1 || isAgg) ){
-+      return 0;         /* Restrictions (8)(9) */
-+   }
-+-  if( (p->selFlags & SF_Distinct)!=0 && subqueryIsAgg ){
-+-     return 0;         /* Restriction (6)  */
-+-  }
-+   if( p->pOrderBy && pSub->pOrderBy ){
-+      return 0;                                           /* Restriction (11) */
-+   }
-+@@ -121067,18 +121306,14 @@ static int flattenSubquery(
-+   if( pSub->pLimit && (p->selFlags & SF_Distinct)!=0 ){
-+      return 0;         /* Restriction (21) */
-+   }
-+-  testcase( pSub->selFlags & SF_Recursive );
-+-  testcase( pSub->selFlags & SF_MinMaxAgg );
-+-  if( pSub->selFlags & (SF_Recursive|SF_MinMaxAgg) ){
-+-    return 0; /* Restrictions (22) and (24) */
-+-  }
-+-  if( (p->selFlags & SF_Recursive) && pSub->pPrior ){
-+-    return 0; /* Restriction (23) */
-++  if( pSub->selFlags & (SF_Recursive) ){
-++    return 0; /* Restrictions (22) */
-+   }
-+ 
-+   /*
-+   ** If the subquery is the right operand of a LEFT JOIN, then the
-+-  ** subquery may not be a join itself.  Example of why this is not allowed:
-++  ** subquery may not be a join itself (3a). Example of why this is not
-++  ** allowed:
-+   **
-+   **         t1 LEFT OUTER JOIN (t2 JOIN t3)
-+   **
-+@@ -121089,54 +121324,53 @@ static int flattenSubquery(
-+   ** which is not at all the same thing.
-+   **
-+   ** If the subquery is the right operand of a LEFT JOIN, then the outer
-+-  ** query cannot be an aggregate.  This is an artifact of the way aggregates
-+-  ** are processed - there is no mechanism to determine if the LEFT JOIN
-+-  ** table should be all-NULL.
-++  ** query cannot be an aggregate. (3c)  This is an artifact of the way
-++  ** aggregates are processed - there is no mechanism to determine if
-++  ** the LEFT JOIN table should be all-NULL.
-+   **
-+   ** See also tickets #306, #350, and #3300.
-+   */
-+   if( (pSubitem->fg.jointype & JT_OUTER)!=0 ){
-+     isLeftJoin = 1;
-+     if( pSubSrc->nSrc>1 || isAgg || IsVirtual(pSubSrc->a[0].pTab) ){
-+-      return 0; /* Restriction (3) */
-++      /*  (3a)             (3c)     (3b) */
-++      return 0;
-+     }
-+   }
-+ #ifdef SQLITE_EXTRA_IFNULLROW
-+   else if( iFrom>0 && !isAgg ){
-+     /* Setting isLeftJoin to -1 causes OP_IfNullRow opcodes to be generated for
-+-    ** every reference to any result column from subquery in a join, even though
-+-    ** they are not necessary.  This will stress-test the OP_IfNullRow opcode. */
-++    ** every reference to any result column from subquery in a join, even
-++    ** though they are not necessary.  This will stress-test the OP_IfNullRow
-++    ** opcode. */
-+     isLeftJoin = -1;
-+   }
-+ #endif
-+ 
-+-  /* Restriction 17: If the sub-query is a compound SELECT, then it must
-++  /* Restriction (17): If the sub-query is a compound SELECT, then it must
-+   ** use only the UNION ALL operator. And none of the simple select queries
-+   ** that make up the compound SELECT are allowed to be aggregate or distinct
-+   ** queries.
-+   */
-+   if( pSub->pPrior ){
-+-    if( pSub->pOrderBy ){
-+-      return 0;  /* Restriction 20 */
-+-    }
-+     if( isAgg || (p->selFlags & SF_Distinct)!=0 || pSrc->nSrc!=1 ){
-+-      return 0;
-++      return 0; /* (17d1), (17d2), or (17d3) */
-+     }
-+     for(pSub1=pSub; pSub1; pSub1=pSub1->pPrior){
-+       testcase( (pSub1->selFlags & (SF_Distinct|SF_Aggregate))==SF_Distinct );
-+       testcase( (pSub1->selFlags & (SF_Distinct|SF_Aggregate))==SF_Aggregate );
-+       assert( pSub->pSrc!=0 );
-+       assert( pSub->pEList->nExpr==pSub1->pEList->nExpr );
-+-      if( (pSub1->selFlags & (SF_Distinct|SF_Aggregate))!=0
-+-       || (pSub1->pPrior && pSub1->op!=TK_ALL)
-+-       || pSub1->pSrc->nSrc<1
-++      if( (pSub1->selFlags & (SF_Distinct|SF_Aggregate))!=0    /* (17b) */
-++       || (pSub1->pPrior && pSub1->op!=TK_ALL)                 /* (17a) */
-++       || pSub1->pSrc->nSrc<1                                  /* (17c) */
-+       ){
-+         return 0;
-+       }
-+       testcase( pSub1->pSrc->nSrc>1 );
-+     }
-+ 
-+-    /* Restriction 18. */
-++    /* Restriction (18). */
-+     if( p->pOrderBy ){
-+       int ii;
-+       for(ii=0; ii<p->pOrderBy->nExpr; ii++){
-+@@ -121145,6 +121379,23 @@ static int flattenSubquery(
-+     }
-+   }
-+ 
-++  /* Ex-restriction (23):
-++  ** The only way that the recursive part of a CTE can contain a compound
-++  ** subquery is for the subquery to be one term of a join.  But if the
-++  ** subquery is a join, then the flattening has already been stopped by
-++  ** restriction (17d3)
-++  */
-++  assert( (p->selFlags & SF_Recursive)==0 || pSub->pPrior==0 );
-++
-++  /* Ex-restriction (20):
-++  ** A compound subquery must be the only term in the FROM clause of the
-++  ** outer query by restriction (17d3).  But if that term also has an
-++  ** ORDER BY clause, then the subquery will be implemented by co-routine
-++  ** and so the flattener will never be invoked.  Hence, it is not possible
-++  ** for the subquery to be a compound and have an ORDER BY clause.
-++  */
-++  assert( pSub->pPrior==0 || pSub->pOrderBy==0 );
-++
-+   /***** If we reach this point, flattening is permitted. *****/
-+   SELECTTRACE(1,pParse,p,("flatten %s.%p from term %d\n",
-+                    pSub->zSelName, pSub, iFrom));
-+@@ -121365,18 +121616,7 @@ static int flattenSubquery(
-+     if( isLeftJoin>0 ){
-+       setJoinExpr(pWhere, iNewParent);
-+     }
-+-    if( subqueryIsAgg ){
-+-      assert( pParent->pHaving==0 );
-+-      pParent->pHaving = pParent->pWhere;
-+-      pParent->pWhere = pWhere;
-+-      pParent->pHaving = sqlite3ExprAnd(db,
-+-          sqlite3ExprDup(db, pSub->pHaving, 0), pParent->pHaving
-+-      );
-+-      assert( pParent->pGroupBy==0 );
-+-      pParent->pGroupBy = sqlite3ExprListDup(db, pSub->pGroupBy, 0);
-+-    }else{
-+-      pParent->pWhere = sqlite3ExprAnd(db, pWhere, pParent->pWhere);
-+-    }
-++    pParent->pWhere = sqlite3ExprAnd(db, pWhere, pParent->pWhere);
-+     if( db->mallocFailed==0 ){
-+       SubstContext x;
-+       x.pParse = pParse;
-+@@ -121439,9 +121679,13 @@ static int flattenSubquery(
-+ **
-+ ** Do not attempt this optimization if:
-+ **
-+-**   (1) The inner query is an aggregate.  (In that case, we'd really want
-+-**       to copy the outer WHERE-clause terms onto the HAVING clause of the
-+-**       inner query.  But they probably won't help there so do not bother.)
-++**   (1) (** This restriction was removed on 2017-09-29.  We used to
-++**           disallow this optimization for aggregate subqueries, but now
-++**           it is allowed by putting the extra terms on the HAVING clause.
-++**           The added HAVING clause is pointless if the subquery lacks
-++**           a GROUP BY clause.  But such a HAVING clause is also harmless
-++**           so there does not appear to be any reason to add extra logic
-++**           to suppress it. **)
-+ **
-+ **   (2) The inner query is the recursive part of a common table expression.
-+ **
-+@@ -121466,16 +121710,22 @@ static int pushDownWhereTerms(
-+ ){
-+   Expr *pNew;
-+   int nChng = 0;
-+-  Select *pX;           /* For looping over compound SELECTs in pSubq */
-+   if( pWhere==0 ) return 0;
-+-  for(pX=pSubq; pX; pX=pX->pPrior){
-+-    if( (pX->selFlags & (SF_Aggregate|SF_Recursive))!=0 ){
-+-      testcase( pX->selFlags & SF_Aggregate );
-+-      testcase( pX->selFlags & SF_Recursive );
-+-      testcase( pX!=pSubq );
-+-      return 0; /* restrictions (1) and (2) */
-++  if( pSubq->selFlags & SF_Recursive ) return 0;  /* restriction (2) */
-++
-++#ifdef SQLITE_DEBUG
-++  /* Only the first term of a compound can have a WITH clause.  But make
-++  ** sure no other terms are marked SF_Recursive in case something changes
-++  ** in the future.
-++  */
-++  {
-++    Select *pX;
-++    for(pX=pSubq; pX; pX=pX->pPrior){
-++      assert( (pX->selFlags & (SF_Recursive))==0 );
-+     }
-+   }
-++#endif
-++
-+   if( pSubq->pLimit!=0 ){
-+     return 0; /* restriction (3) */
-+   }
-+@@ -121483,7 +121733,7 @@ static int pushDownWhereTerms(
-+     nChng += pushDownWhereTerms(pParse, pSubq, pWhere->pRight, iCursor);
-+     pWhere = pWhere->pLeft;
-+   }
-+-  if( ExprHasProperty(pWhere,EP_FromJoin) ) return 0; /* restriction 5 */
-++  if( ExprHasProperty(pWhere,EP_FromJoin) ) return 0; /* restriction (5) */
-+   if( sqlite3ExprIsTableConstant(pWhere, iCursor) ){
-+     nChng++;
-+     while( pSubq ){
-+@@ -121495,7 +121745,11 @@ static int pushDownWhereTerms(
-+       x.isLeftJoin = 0;
-+       x.pEList = pSubq->pEList;
-+       pNew = substExpr(&x, pNew);
-+-      pSubq->pWhere = sqlite3ExprAnd(pParse->db, pSubq->pWhere, pNew);
-++      if( pSubq->selFlags & SF_Aggregate ){
-++        pSubq->pHaving = sqlite3ExprAnd(pParse->db, pSubq->pHaving, pNew);
-++      }else{
-++        pSubq->pWhere = sqlite3ExprAnd(pParse->db, pSubq->pWhere, pNew);
-++      }
-+       pSubq = pSubq->pPrior;
-+     }
-+   }
-+@@ -121823,7 +122077,8 @@ static int withExpand(
-+       );
-+       return SQLITE_ERROR;
-+     }
-+-    assert( pTab->nTabRef==1 || ((pSel->selFlags&SF_Recursive) && pTab->nTabRef==2 ));
-++    assert( pTab->nTabRef==1 ||
-++            ((pSel->selFlags&SF_Recursive) && pTab->nTabRef==2 ));
-+ 
-+     pCte->zCteErr = "circular reference: %s";
-+     pSavedWith = pParse->pWith;
-+@@ -121880,7 +122135,7 @@ static int withExpand(
-+ */
-+ static void selectPopWith(Walker *pWalker, Select *p){
-+   Parse *pParse = pWalker->pParse;
-+-  if( pParse->pWith && p->pPrior==0 ){
-++  if( OK_IF_ALWAYS_TRUE(pParse->pWith) && p->pPrior==0 ){
-+     With *pWith = findRightmost(p)->pWith;
-+     if( pWith!=0 ){
-+       assert( pParse->pWith==pWith );
-+@@ -121935,7 +122190,7 @@ static int selectExpander(Walker *pWalker, Select *p){
-+   }
-+   pTabList = p->pSrc;
-+   pEList = p->pEList;
-+-  if( p->pWith ){
-++  if( OK_IF_ALWAYS_TRUE(p->pWith) ){
-+     sqlite3WithPush(pParse, p->pWith, 0);
-+   }
-+ 
-+@@ -121967,7 +122222,11 @@ static int selectExpander(Walker *pWalker, Select *p){
-+       pFrom->pTab = pTab = sqlite3DbMallocZero(db, sizeof(Table));
-+       if( pTab==0 ) return WRC_Abort;
-+       pTab->nTabRef = 1;
-+-      pTab->zName = sqlite3MPrintf(db, "sqlite_sq_%p", (void*)pTab);
-++      if( pFrom->zAlias ){
-++        pTab->zName = sqlite3DbStrDup(db, pFrom->zAlias);
-++      }else{
-++        pTab->zName = sqlite3MPrintf(db, "subquery_%p", (void*)pTab);
-++      }
-+       while( pSel->pPrior ){ pSel = pSel->pPrior; }
-+       sqlite3ColumnsFromExprList(pParse, pSel->pEList,&pTab->nCol,&pTab->aCol);
-+       pTab->iPKey = -1;
-+@@ -122177,12 +122436,10 @@ static int selectExpander(Walker *pWalker, Select *p){
-+     sqlite3ExprListDelete(db, pEList);
-+     p->pEList = pNew;
-+   }
-+-#if SQLITE_MAX_COLUMN
-+   if( p->pEList && p->pEList->nExpr>db->aLimit[SQLITE_LIMIT_COLUMN] ){
-+     sqlite3ErrorMsg(pParse, "too many columns in result set");
-+     return WRC_Abort;
-+   }
-+-#endif
-+   return WRC_Continue;
-+ }
-+ 
-+@@ -122236,7 +122493,7 @@ static void sqlite3SelectExpand(Parse *pParse, Select *pSelect){
-+   Walker w;
-+   w.xExprCallback = sqlite3ExprWalkNoop;
-+   w.pParse = pParse;
-+-  if( pParse->hasCompound ){
-++  if( OK_IF_ALWAYS_TRUE(pParse->hasCompound) ){
-+     w.xSelectCallback = convertCompoundSelectToSubquery;
-+     w.xSelectCallback2 = 0;
-+     sqlite3WalkSelect(&w, pSelect);
-+@@ -122324,15 +122581,13 @@ SQLITE_PRIVATE void sqlite3SelectPrep(
-+   Select *p,             /* The SELECT statement being coded. */
-+   NameContext *pOuterNC  /* Name context for container */
-+ ){
-+-  sqlite3 *db;
-+-  if( NEVER(p==0) ) return;
-+-  db = pParse->db;
-+-  if( db->mallocFailed ) return;
-++  assert( p!=0 || pParse->db->mallocFailed );
-++  if( pParse->db->mallocFailed ) return;
-+   if( p->selFlags & SF_HasTypeInfo ) return;
-+   sqlite3SelectExpand(pParse, p);
-+-  if( pParse->nErr || db->mallocFailed ) return;
-++  if( pParse->nErr || pParse->db->mallocFailed ) return;
-+   sqlite3ResolveSelectNames(pParse, p, pOuterNC);
-+-  if( pParse->nErr || db->mallocFailed ) return;
-++  if( pParse->nErr || pParse->db->mallocFailed ) return;
-+   sqlite3SelectAddTypeInfo(pParse, p);
-+ }
-+ 
-+@@ -122627,24 +122882,24 @@ static int countOfViewOptimization(Parse *pParse, Select *p){
-+   Expr *pExpr;
-+   Expr *pCount;
-+   sqlite3 *db;
-+-  if( (p->selFlags & SF_Aggregate)==0 ) return 0;   /* This is an aggregate query */
-++  if( (p->selFlags & SF_Aggregate)==0 ) return 0;   /* This is an aggregate */
-+   if( p->pEList->nExpr!=1 ) return 0;               /* Single result column */
-+   pExpr = p->pEList->a[0].pExpr;
-+   if( pExpr->op!=TK_AGG_FUNCTION ) return 0;        /* Result is an aggregate */
-+-  if( sqlite3_stricmp(pExpr->u.zToken,"count") ) return 0;  /* Must be count() */
-++  if( sqlite3_stricmp(pExpr->u.zToken,"count") ) return 0;  /* Is count() */
-+   if( pExpr->x.pList!=0 ) return 0;                 /* Must be count(*) */
-+-  if( p->pSrc->nSrc!=1 ) return 0;                  /* One table in the FROM clause */
-++  if( p->pSrc->nSrc!=1 ) return 0;                  /* One table in FROM  */
-+   pSub = p->pSrc->a[0].pSelect;
-+   if( pSub==0 ) return 0;                           /* The FROM is a subquery */
-+-  if( pSub->pPrior==0 ) return 0;                   /* Must be a compound subquery */
-++  if( pSub->pPrior==0 ) return 0;                   /* Must be a compound ry */
-+   do{
-+     if( pSub->op!=TK_ALL && pSub->pPrior ) return 0;  /* Must be UNION ALL */
-+     if( pSub->pWhere ) return 0;                      /* No WHERE clause */
-+     if( pSub->selFlags & SF_Aggregate ) return 0;     /* Not an aggregate */
-+-    pSub = pSub->pPrior;                              /* Repeat over compound terms */
-++    pSub = pSub->pPrior;                              /* Repeat over compound */
-+   }while( pSub );
-+ 
-+-  /* If we reach this point, that means it is OK to perform the transformation */
-++  /* If we reach this point then it is OK to perform the transformation */
-+ 
-+   db = pParse->db;
-+   pCount = pExpr;
-+@@ -122776,7 +123031,6 @@ SQLITE_PRIVATE int sqlite3Select(
-+   for(i=0; !p->pPrior && i<pTabList->nSrc; i++){
-+     struct SrcList_item *pItem = &pTabList->a[i];
-+     Select *pSub = pItem->pSelect;
-+-    int isAggSub;
-+     Table *pTab = pItem->pTab;
-+     if( pSub==0 ) continue;
-+ 
-+@@ -122788,13 +123042,36 @@ SQLITE_PRIVATE int sqlite3Select(
-+       goto select_end;
-+     }
-+ 
-+-    isAggSub = (pSub->selFlags & SF_Aggregate)!=0;
-+-    if( flattenSubquery(pParse, p, i, isAgg, isAggSub) ){
-++    /* Do not try to flatten an aggregate subquery.
-++    **
-++    ** Flattening an aggregate subquery is only possible if the outer query
-++    ** is not a join.  But if the outer query is not a join, then the subquery
-++    ** will be implemented as a co-routine and there is no advantage to
-++    ** flattening in that case.
-++    */
-++    if( (pSub->selFlags & SF_Aggregate)!=0 ) continue;
-++    assert( pSub->pGroupBy==0 );
-++
-++    /* If the subquery contains an ORDER BY clause and if
-++    ** it will be implemented as a co-routine, then do not flatten.  This
-++    ** restriction allows SQL constructs like this:
-++    **
-++    **  SELECT expensive_function(x)
-++    **    FROM (SELECT x FROM tab ORDER BY y LIMIT 10);
-++    **
-++    ** The expensive_function() is only computed on the 10 rows that
-++    ** are output, rather than every row of the table.
-++    */
-++    if( pSub->pOrderBy!=0
-++     && i==0
-++     && (pTabList->nSrc==1
-++         || (pTabList->a[1].fg.jointype&(JT_LEFT|JT_CROSS))!=0)
-++    ){
-++      continue;
-++    }
-++
-++    if( flattenSubquery(pParse, p, i, isAgg) ){
-+       /* This subquery can be absorbed into its parent. */
-+-      if( isAggSub ){
-+-        isAgg = 1;
-+-        p->selFlags |= SF_Aggregate;
-+-      }
-+       i = -1;
-+     }
-+     pTabList = p->pSrc;
-+@@ -122833,10 +123110,14 @@ SQLITE_PRIVATE int sqlite3Select(
-+     struct SrcList_item *pItem = &pTabList->a[i];
-+     SelectDest dest;
-+     Select *pSub;
-++#if !defined(SQLITE_OMIT_SUBQUERY) || !defined(SQLITE_OMIT_VIEW)
-++    const char *zSavedAuthContext;
-++#endif
-+ 
-+-    /* Issue SQLITE_READ authorizations with a fake column name for any tables that
-+-    ** are referenced but from which no values are extracted. Examples of where these
-+-    ** kinds of null SQLITE_READ authorizations would occur:
-++    /* Issue SQLITE_READ authorizations with a fake column name for any
-++    ** tables that are referenced but from which no values are extracted.
-++    ** Examples of where these kinds of null SQLITE_READ authorizations
-++    ** would occur:
-+     **
-+     **     SELECT count(*) FROM t1;   -- SQLITE_READ t1.""
-+     **     SELECT t1.* FROM t1, t2;   -- SQLITE_READ t2.""
-+@@ -122844,10 +123125,10 @@ SQLITE_PRIVATE int sqlite3Select(
-+     ** The fake column name is an empty string.  It is possible for a table to
-+     ** have a column named by the empty string, in which case there is no way to
-+     ** distinguish between an unreferenced table and an actual reference to the
-+-    ** "" column.  The original design was for the fake column name to be a NULL,
-++    ** "" column. The original design was for the fake column name to be a NULL,
-+     ** which would be unambiguous.  But legacy authorization callbacks might
-+-    ** assume the column name is non-NULL and segfault.  The use of an empty string
-+-    ** for the fake column name seems safer.
-++    ** assume the column name is non-NULL and segfault.  The use of an empty
-++    ** string for the fake column name seems safer.
-+     */
-+     if( pItem->colUsed==0 ){
-+       sqlite3AuthCheck(pParse, SQLITE_READ, pItem->zName, "", pItem->zDatabase);
-+@@ -122899,16 +123180,14 @@ SQLITE_PRIVATE int sqlite3Select(
-+ #endif
-+     }
-+ 
-++    zSavedAuthContext = pParse->zAuthContext;
-++    pParse->zAuthContext = pItem->zName;
-++
-+     /* Generate code to implement the subquery
-+     **
-+-    ** The subquery is implemented as a co-routine if all of these are true:
-+-    **   (1)  The subquery is guaranteed to be the outer loop (so that it
-+-    **        does not need to be computed more than once)
-+-    **   (2)  The ALL keyword after SELECT is omitted.  (Applications are
-+-    **        allowed to say "SELECT ALL" instead of just "SELECT" to disable
-+-    **        the use of co-routines.)
-+-    **   (3)  Co-routines are not disabled using sqlite3_test_control()
-+-    **        with SQLITE_TESTCTRL_OPTIMIZATIONS.
-++    ** The subquery is implemented as a co-routine if the subquery is
-++    ** guaranteed to be the outer loop (so that it does not need to be
-++    ** computed more than once)
-+     **
-+     ** TODO: Are there other reasons beside (1) to use a co-routine
-+     ** implementation?
-+@@ -122916,13 +123195,12 @@ SQLITE_PRIVATE int sqlite3Select(
-+     if( i==0
-+      && (pTabList->nSrc==1
-+             || (pTabList->a[1].fg.jointype&(JT_LEFT|JT_CROSS))!=0)  /* (1) */
-+-     && (p->selFlags & SF_All)==0                                   /* (2) */
-+-     && OptimizationEnabled(db, SQLITE_SubqCoroutine)               /* (3) */
-+     ){
-+       /* Implement a co-routine that will return a single row of the result
-+       ** set on each invocation.
-+       */
-+       int addrTop = sqlite3VdbeCurrentAddr(v)+1;
-++
-+       pItem->regReturn = ++pParse->nMem;
-+       sqlite3VdbeAddOp3(v, OP_InitCoroutine, pItem->regReturn, 0, addrTop);
-+       VdbeComment((v, "%s", pItem->pTab->zName));
-+@@ -122980,6 +123258,7 @@ SQLITE_PRIVATE int sqlite3Select(
-+     }
-+     if( db->mallocFailed ) goto select_end;
-+     pParse->nHeight -= sqlite3SelectExprHeight(p);
-++    pParse->zAuthContext = zSavedAuthContext;
-+ #endif
-+   }
-+ 
-+@@ -123127,7 +123406,8 @@ SQLITE_PRIVATE int sqlite3Select(
-+     }
-+ 
-+     /* Use the standard inner loop. */
-+-    selectInnerLoop(pParse, p, pEList, -1, &sSort, &sDistinct, pDest,
-++    assert( p->pEList==pEList );
-++    selectInnerLoop(pParse, p, -1, &sSort, &sDistinct, pDest,
-+                     sqlite3WhereContinueLabel(pWInfo),
-+                     sqlite3WhereBreakLabel(pWInfo));
-+ 
-+@@ -123430,7 +123710,7 @@ SQLITE_PRIVATE int sqlite3Select(
-+       sqlite3VdbeAddOp1(v, OP_Return, regOutputRow);
-+       finalizeAggFunctions(pParse, &sAggInfo);
-+       sqlite3ExprIfFalse(pParse, pHaving, addrOutputRow+1, SQLITE_JUMPIFNULL);
-+-      selectInnerLoop(pParse, p, p->pEList, -1, &sSort,
-++      selectInnerLoop(pParse, p, -1, &sSort,
-+                       &sDistinct, pDest,
-+                       addrOutputRow+1, addrSetAbort);
-+       sqlite3VdbeAddOp1(v, OP_Return, regOutputRow);
-+@@ -123574,7 +123854,7 @@ SQLITE_PRIVATE int sqlite3Select(
-+ 
-+       sSort.pOrderBy = 0;
-+       sqlite3ExprIfFalse(pParse, pHaving, addrEnd, SQLITE_JUMPIFNULL);
-+-      selectInnerLoop(pParse, p, p->pEList, -1, 0, 0,
-++      selectInnerLoop(pParse, p, -1, 0, 0,
-+                       pDest, addrEnd, addrEnd);
-+       sqlite3ExprListDelete(db, pDel);
-+     }
-+@@ -124414,7 +124694,7 @@ SQLITE_PRIVATE void sqlite3UnlinkAndDeleteTrigger(sqlite3 *db, int iDb, const ch
-+       *pp = (*pp)->pNext;
-+     }
-+     sqlite3DeleteTrigger(db, pTrigger);
-+-    db->flags |= SQLITE_InternChanges;
-++    db->mDbFlags |= DBFLAG_SchemaChange;
-+   }
-+ }
-+ 
-+@@ -125735,12 +126015,6 @@ static void updateVirtualTable(
-+   if( pWInfo==0 ) return;
-+ 
-+   /* Populate the argument registers. */
-+-  sqlite3VdbeAddOp2(v, OP_Rowid, iCsr, regArg);
-+-  if( pRowid ){
-+-    sqlite3ExprCode(pParse, pRowid, regArg+1);
-+-  }else{
-+-    sqlite3VdbeAddOp2(v, OP_Rowid, iCsr, regArg+1);
-+-  }
-+   for(i=0; i<pTab->nCol; i++){
-+     if( aXRef[i]>=0 ){
-+       sqlite3ExprCode(pParse, pChanges->a[aXRef[i]].pExpr, regArg+2+i);
-+@@ -125748,6 +126022,23 @@ static void updateVirtualTable(
-+       sqlite3VdbeAddOp3(v, OP_VColumn, iCsr, i, regArg+2+i);
-+     }
-+   }
-++  if( HasRowid(pTab) ){
-++    sqlite3VdbeAddOp2(v, OP_Rowid, iCsr, regArg);
-++    if( pRowid ){
-++      sqlite3ExprCode(pParse, pRowid, regArg+1);
-++    }else{
-++      sqlite3VdbeAddOp2(v, OP_Rowid, iCsr, regArg+1);
-++    }
-++  }else{
-++    Index *pPk;   /* PRIMARY KEY index */
-++    i16 iPk;      /* PRIMARY KEY column */
-++    pPk = sqlite3PrimaryKeyIndex(pTab);
-++    assert( pPk!=0 );
-++    assert( pPk->nKeyCol==1 );
-++    iPk = pPk->aiColumn[0];
-++    sqlite3VdbeAddOp3(v, OP_VColumn, iCsr, iPk, regArg);
-++    sqlite3VdbeAddOp2(v, OP_SCopy, regArg+2+iPk, regArg+1);
-++  }
-+ 
-+   bOnePass = sqlite3WhereOkOnePass(pWInfo, aDummy);
-+ 
-+@@ -125932,7 +126223,8 @@ SQLITE_PRIVATE int sqlite3RunVacuum(char **pzErrMsg, sqlite3 *db, int iDb){
-+   int rc = SQLITE_OK;     /* Return code from service routines */
-+   Btree *pMain;           /* The database being vacuumed */
-+   Btree *pTemp;           /* The temporary database we vacuum into */
-+-  int saved_flags;        /* Saved value of the db->flags */
-++  u16 saved_mDbFlags;     /* Saved value of db->mDbFlags */
-++  u32 saved_flags;        /* Saved value of db->flags */
-+   int saved_nChange;      /* Saved value of db->nChange */
-+   int saved_nTotalChange; /* Saved value of db->nTotalChange */
-+   u8 saved_mTrace;        /* Saved trace settings */
-+@@ -125955,11 +126247,12 @@ SQLITE_PRIVATE int sqlite3RunVacuum(char **pzErrMsg, sqlite3 *db, int iDb){
-+   ** restored before returning. Then set the writable-schema flag, and
-+   ** disable CHECK and foreign key constraints.  */
-+   saved_flags = db->flags;
-++  saved_mDbFlags = db->mDbFlags;
-+   saved_nChange = db->nChange;
-+   saved_nTotalChange = db->nTotalChange;
-+   saved_mTrace = db->mTrace;
-+-  db->flags |= (SQLITE_WriteSchema | SQLITE_IgnoreChecks
-+-                 | SQLITE_PreferBuiltin | SQLITE_Vacuum);
-++  db->flags |= SQLITE_WriteSchema | SQLITE_IgnoreChecks;
-++  db->mDbFlags |= DBFLAG_PreferBuiltin | DBFLAG_Vacuum;
-+   db->flags &= ~(SQLITE_ForeignKeys | SQLITE_ReverseOrder | SQLITE_CountRows);
-+   db->mTrace = 0;
-+ 
-+@@ -126070,8 +126363,8 @@ SQLITE_PRIVATE int sqlite3RunVacuum(char **pzErrMsg, sqlite3 *db, int iDb){
-+       "WHERE type='table'AND coalesce(rootpage,1)>0",
-+       zDbMain
-+   );
-+-  assert( (db->flags & SQLITE_Vacuum)!=0 );
-+-  db->flags &= ~SQLITE_Vacuum;
-++  assert( (db->mDbFlags & DBFLAG_Vacuum)!=0 );
-++  db->mDbFlags &= ~DBFLAG_Vacuum;
-+   if( rc!=SQLITE_OK ) goto end_of_vacuum;
-+ 
-+   /* Copy the triggers, views, and virtual tables from the main database
-+@@ -126139,6 +126432,7 @@ SQLITE_PRIVATE int sqlite3RunVacuum(char **pzErrMsg, sqlite3 *db, int iDb){
-+ end_of_vacuum:
-+   /* Restore the original value of db->flags */
-+   db->init.iDb = 0;
-++  db->mDbFlags = saved_mDbFlags;
-+   db->flags = saved_flags;
-+   db->nChange = saved_nChange;
-+   db->nTotalChange = saved_nTotalChange;
-+@@ -126215,8 +126509,10 @@ SQLITE_PRIVATE Module *sqlite3VtabCreateModule(
-+ ){
-+   Module *pMod;
-+   int nName = sqlite3Strlen30(zName);
-+-  pMod = (Module *)sqlite3DbMallocRawNN(db, sizeof(Module) + nName + 1);
-+-  if( pMod ){
-++  pMod = (Module *)sqlite3Malloc(sizeof(Module) + nName + 1);
-++  if( pMod==0 ){
-++    sqlite3OomFault(db);
-++  }else{
-+     Module *pDel;
-+     char *zCopy = (char *)(&pMod[1]);
-+     memcpy(zCopy, zName, nName+1);
-+@@ -126691,13 +126987,14 @@ static int vtabCallConstructor(
-+     }
-+   }
-+ 
-+-  zModuleName = sqlite3MPrintf(db, "%s", pTab->zName);
-++  zModuleName = sqlite3DbStrDup(db, pTab->zName);
-+   if( !zModuleName ){
-+     return SQLITE_NOMEM_BKPT;
-+   }
-+ 
-+-  pVTable = sqlite3DbMallocZero(db, sizeof(VTable));
-++  pVTable = sqlite3MallocZero(sizeof(VTable));
-+   if( !pVTable ){
-++    sqlite3OomFault(db);
-+     sqlite3DbFree(db, zModuleName);
-+     return SQLITE_NOMEM_BKPT;
-+   }
-+@@ -126817,6 +127114,7 @@ SQLITE_PRIVATE int sqlite3VtabCallConnect(Parse *pParse, Table *pTab){
-+     rc = vtabCallConstructor(db, pTab, pMod, pMod->pModule->xConnect, &zErr);
-+     if( rc!=SQLITE_OK ){
-+       sqlite3ErrorMsg(pParse, "%s", zErr);
-++      pParse->rc = rc;
-+     }
-+     sqlite3DbFree(db, zErr);
-+   }
-+@@ -126906,10 +127204,10 @@ SQLITE_PRIVATE int sqlite3VtabCallCreate(sqlite3 *db, int iDb, const char *zTab,
-+ */
-+ SQLITE_API int sqlite3_declare_vtab(sqlite3 *db, const char *zCreateTable){
-+   VtabCtx *pCtx;
-+-  Parse *pParse;
-+   int rc = SQLITE_OK;
-+   Table *pTab;
-+   char *zErr = 0;
-++  Parse sParse;
-+ 
-+ #ifdef SQLITE_ENABLE_API_ARMOR
-+   if( !sqlite3SafetyCheckOk(db) || zCreateTable==0 ){
-+@@ -126926,55 +127224,55 @@ SQLITE_API int sqlite3_declare_vtab(sqlite3 *db, const char *zCreateTable){
-+   pTab = pCtx->pTab;
-+   assert( IsVirtual(pTab) );
-+ 
-+-  pParse = sqlite3StackAllocZero(db, sizeof(*pParse));
-+-  if( pParse==0 ){
-+-    rc = SQLITE_NOMEM_BKPT;
-+-  }else{
-+-    pParse->declareVtab = 1;
-+-    pParse->db = db;
-+-    pParse->nQueryLoop = 1;
-+-
-+-    if( SQLITE_OK==sqlite3RunParser(pParse, zCreateTable, &zErr)
-+-     && pParse->pNewTable
-+-     && !db->mallocFailed
-+-     && !pParse->pNewTable->pSelect
-+-     && !IsVirtual(pParse->pNewTable)
-+-    ){
-+-      if( !pTab->aCol ){
-+-        Table *pNew = pParse->pNewTable;
-+-        Index *pIdx;
-+-        pTab->aCol = pNew->aCol;
-+-        pTab->nCol = pNew->nCol;
-+-        pTab->tabFlags |= pNew->tabFlags & (TF_WithoutRowid|TF_NoVisibleRowid);
-+-        pNew->nCol = 0;
-+-        pNew->aCol = 0;
-+-        assert( pTab->pIndex==0 );
-+-        if( !HasRowid(pNew) && pCtx->pVTable->pMod->pModule->xUpdate!=0 ){
-+-          rc = SQLITE_ERROR;
-+-        }
-+-        pIdx = pNew->pIndex;
-+-        if( pIdx ){
-+-          assert( pIdx->pNext==0 );
-+-          pTab->pIndex = pIdx;
-+-          pNew->pIndex = 0;
-+-          pIdx->pTable = pTab;
-+-        }
-++  memset(&sParse, 0, sizeof(sParse));
-++  sParse.declareVtab = 1;
-++  sParse.db = db;
-++  sParse.nQueryLoop = 1;
-++  if( SQLITE_OK==sqlite3RunParser(&sParse, zCreateTable, &zErr)
-++   && sParse.pNewTable
-++   && !db->mallocFailed
-++   && !sParse.pNewTable->pSelect
-++   && !IsVirtual(sParse.pNewTable)
-++  ){
-++    if( !pTab->aCol ){
-++      Table *pNew = sParse.pNewTable;
-++      Index *pIdx;
-++      pTab->aCol = pNew->aCol;
-++      pTab->nCol = pNew->nCol;
-++      pTab->tabFlags |= pNew->tabFlags & (TF_WithoutRowid|TF_NoVisibleRowid);
-++      pNew->nCol = 0;
-++      pNew->aCol = 0;
-++      assert( pTab->pIndex==0 );
-++      assert( HasRowid(pNew) || sqlite3PrimaryKeyIndex(pNew)!=0 );
-++      if( !HasRowid(pNew)
-++       && pCtx->pVTable->pMod->pModule->xUpdate!=0
-++       && sqlite3PrimaryKeyIndex(pNew)->nKeyCol!=1
-++      ){
-++        /* WITHOUT ROWID virtual tables must either be read-only (xUpdate==0)
-++        ** or else must have a single-column PRIMARY KEY */
-++        rc = SQLITE_ERROR;
-++      }
-++      pIdx = pNew->pIndex;
-++      if( pIdx ){
-++        assert( pIdx->pNext==0 );
-++        pTab->pIndex = pIdx;
-++        pNew->pIndex = 0;
-++        pIdx->pTable = pTab;
-+       }
-+-      pCtx->bDeclared = 1;
-+-    }else{
-+-      sqlite3ErrorWithMsg(db, SQLITE_ERROR, (zErr ? "%s" : 0), zErr);
-+-      sqlite3DbFree(db, zErr);
-+-      rc = SQLITE_ERROR;
-+     }
-+-    pParse->declareVtab = 0;
-++    pCtx->bDeclared = 1;
-++  }else{
-++    sqlite3ErrorWithMsg(db, SQLITE_ERROR, (zErr ? "%s" : 0), zErr);
-++    sqlite3DbFree(db, zErr);
-++    rc = SQLITE_ERROR;
-++  }
-++  sParse.declareVtab = 0;
-+ 
-+-    if( pParse->pVdbe ){
-+-      sqlite3VdbeFinalize(pParse->pVdbe);
-+-    }
-+-    sqlite3DeleteTable(db, pParse->pNewTable);
-+-    sqlite3ParserReset(pParse);
-+-    sqlite3StackFree(db, pParse);
-++  if( sParse.pVdbe ){
-++    sqlite3VdbeFinalize(sParse.pVdbe);
-+   }
-++  sqlite3DeleteTable(db, sParse.pNewTable);
-++  sqlite3ParserReset(&sParse);
-+ 
-+   assert( (rc&0xff)==rc );
-+   rc = sqlite3ApiExit(db, rc);
-+@@ -127952,7 +128250,6 @@ SQLITE_PRIVATE void sqlite3WhereTabFuncArgs(Parse*, struct SrcList_item*, WhereC
-+ **     WO_LE    == SQLITE_INDEX_CONSTRAINT_LE
-+ **     WO_GT    == SQLITE_INDEX_CONSTRAINT_GT
-+ **     WO_GE    == SQLITE_INDEX_CONSTRAINT_GE
-+-**     WO_MATCH == SQLITE_INDEX_CONSTRAINT_MATCH
-+ */
-+ #define WO_IN     0x0001
-+ #define WO_EQ     0x0002
-+@@ -127960,7 +128257,7 @@ SQLITE_PRIVATE void sqlite3WhereTabFuncArgs(Parse*, struct SrcList_item*, WhereC
-+ #define WO_LE     (WO_EQ<<(TK_LE-TK_EQ))
-+ #define WO_GT     (WO_EQ<<(TK_GT-TK_EQ))
-+ #define WO_GE     (WO_EQ<<(TK_GE-TK_EQ))
-+-#define WO_MATCH  0x0040
-++#define WO_AUX    0x0040       /* Op useful to virtual tables only */
-+ #define WO_IS     0x0080
-+ #define WO_ISNULL 0x0100
-+ #define WO_OR     0x0200       /* Two or more OR-connected terms */
-+@@ -128773,7 +129070,7 @@ static int codeCursorHintIsOrFunction(Walker *pWalker, Expr *pExpr){
-+     pWalker->eCode = 1;
-+   }else if( pExpr->op==TK_FUNCTION ){
-+     int d1;
-+-    char d2[3];
-++    char d2[4];
-+     if( 0==sqlite3IsLikeFunction(pWalker->pParse->db, pExpr, &d1, d2) ){
-+       pWalker->eCode = 1;
-+     }
-+@@ -128996,7 +129293,7 @@ static void codeDeferredSeek(
-+ */
-+ static void codeExprOrVector(Parse *pParse, Expr *p, int iReg, int nReg){
-+   assert( nReg>0 );
-+-  if( sqlite3ExprIsVector(p) ){
-++  if( p && sqlite3ExprIsVector(p) ){
-+ #ifndef SQLITE_OMIT_SUBQUERY
-+     if( (p->flags & EP_xIsSelect) ){
-+       Vdbe *v = pParse->pVdbe;
-+@@ -129049,9 +129346,9 @@ static int whereIndexExprTransNode(Walker *p, Expr *pExpr){
-+ }
-+ 
-+ /*
-+-** For an indexes on expression X, locate every instance of expression X in pExpr
-+-** and change that subexpression into a reference to the appropriate column of
-+-** the index.
-++** For an indexes on expression X, locate every instance of expression X
-++** in pExpr and change that subexpression into a reference to the appropriate
-++** column of the index.
-+ */
-+ static void whereIndexExprTrans(
-+   Index *pIdx,      /* The Index */
-+@@ -130328,12 +130625,12 @@ static int isLikeOrGlob(
-+   int *pisComplete, /* True if the only wildcard is % in the last character */
-+   int *pnoCase      /* True if uppercase is equivalent to lowercase */
-+ ){
-+-  const char *z = 0;         /* String on RHS of LIKE operator */
-++  const u8 *z = 0;         /* String on RHS of LIKE operator */
-+   Expr *pRight, *pLeft;      /* Right and left size of LIKE operator */
-+   ExprList *pList;           /* List of operands to the LIKE operator */
-+   int c;                     /* One character in z[] */
-+   int cnt;                   /* Number of non-wildcard prefix characters */
-+-  char wc[3];                /* Wildcard characters */
-++  char wc[4];                /* Wildcard characters */
-+   sqlite3 *db = pParse->db;  /* Database connection */
-+   sqlite3_value *pVal = 0;
-+   int op;                    /* Opcode of pRight */
-+@@ -130355,12 +130652,12 @@ static int isLikeOrGlob(
-+     int iCol = pRight->iColumn;
-+     pVal = sqlite3VdbeGetBoundValue(pReprepare, iCol, SQLITE_AFF_BLOB);
-+     if( pVal && sqlite3_value_type(pVal)==SQLITE_TEXT ){
-+-      z = (char *)sqlite3_value_text(pVal);
-++      z = sqlite3_value_text(pVal);
-+     }
-+     sqlite3VdbeSetVarmask(pParse->pVdbe, iCol);
-+     assert( pRight->op==TK_VARIABLE || pRight->op==TK_REGISTER );
-+   }else if( op==TK_STRING ){
-+-    z = pRight->u.zToken;
-++    z = (u8*)pRight->u.zToken;
-+   }
-+   if( z ){
-+ 
-+@@ -130380,16 +130677,42 @@ static int isLikeOrGlob(
-+         return 0;
-+       }
-+     }
-++
-++    /* Count the number of prefix characters prior to the first wildcard */
-+     cnt = 0;
-+     while( (c=z[cnt])!=0 && c!=wc[0] && c!=wc[1] && c!=wc[2] ){
-+       cnt++;
-++      if( c==wc[3] && z[cnt]!=0 ) cnt++;
-+     }
-++
-++    /* The optimization is possible only if (1) the pattern does not begin
-++    ** with a wildcard and if (2) the non-wildcard prefix does not end with
-++    ** an (illegal 0xff) character.  The second condition is necessary so
-++    ** that we can increment the prefix key to find an upper bound for the
-++    ** range search.
-++    */
-+     if( cnt!=0 && 255!=(u8)z[cnt-1] ){
-+       Expr *pPrefix;
-++
-++      /* A "complete" match if the pattern ends with "*" or "%" */
-+       *pisComplete = c==wc[0] && z[cnt+1]==0;
-+-      pPrefix = sqlite3Expr(db, TK_STRING, z);
-+-      if( pPrefix ) pPrefix->u.zToken[cnt] = 0;
-++
-++      /* Get the pattern prefix.  Remove all escapes from the prefix. */
-++      pPrefix = sqlite3Expr(db, TK_STRING, (char*)z);
-++      if( pPrefix ){
-++        int iFrom, iTo;
-++        char *zNew = pPrefix->u.zToken;
-++        zNew[cnt] = 0;
-++        for(iFrom=iTo=0; iFrom<cnt; iFrom++){
-++          if( zNew[iFrom]==wc[3] ) iFrom++;
-++          zNew[iTo++] = zNew[iFrom];
-++        }
-++        zNew[iTo] = 0;
-++      }
-+       *ppPrefix = pPrefix;
-++
-++      /* If the RHS pattern is a bound parameter, make arrangements to
-++      ** reprepare the statement when that parameter is rebound */
-+       if( op==TK_VARIABLE ){
-+         Vdbe *v = pParse->pVdbe;
-+         sqlite3VdbeSetVarmask(v, pRight->iColumn);
-+@@ -130420,48 +130743,84 @@ static int isLikeOrGlob(
-+ 
-+ #ifndef SQLITE_OMIT_VIRTUALTABLE
-+ /*
-+-** Check to see if the given expression is of the form
-+-**
-+-**         column OP expr
-+-**
-+-** where OP is one of MATCH, GLOB, LIKE or REGEXP and "column" is a
-+-** column of a virtual table.
-+-**
-+-** If it is then return TRUE.  If not, return FALSE.
-+-*/
-+-static int isMatchOfColumn(
-++** Check to see if the pExpr expression is a form that needs to be passed
-++** to the xBestIndex method of virtual tables.  Forms of interest include:
-++**
-++**          Expression                   Virtual Table Operator
-++**          -----------------------      ---------------------------------
-++**      1.  column MATCH expr            SQLITE_INDEX_CONSTRAINT_MATCH
-++**      2.  column GLOB expr             SQLITE_INDEX_CONSTRAINT_GLOB
-++**      3.  column LIKE expr             SQLITE_INDEX_CONSTRAINT_LIKE
-++**      4.  column REGEXP expr           SQLITE_INDEX_CONSTRAINT_REGEXP
-++**      5.  column != expr               SQLITE_INDEX_CONSTRAINT_NE
-++**      6.  expr != column               SQLITE_INDEX_CONSTRAINT_NE
-++**      7.  column IS NOT expr           SQLITE_INDEX_CONSTRAINT_ISNOT
-++**      8.  expr IS NOT column           SQLITE_INDEX_CONSTRAINT_ISNOT
-++**      9.  column IS NOT NULL           SQLITE_INDEX_CONSTRAINT_ISNOTNULL
-++**
-++** In every case, "column" must be a column of a virtual table.  If there
-++** is a match, set *ppLeft to the "column" expression, set *ppRight to the
-++** "expr" expression (even though in forms (6) and (8) the column is on the
-++** right and the expression is on the left).  Also set *peOp2 to the
-++** appropriate virtual table operator.  The return value is 1 or 2 if there
-++** is a match.  The usual return is 1, but if the RHS is also a column
-++** of virtual table in forms (5) or (7) then return 2.
-++**
-++** If the expression matches none of the patterns above, return 0.
-++*/
-++static int isAuxiliaryVtabOperator(
-+   Expr *pExpr,                    /* Test this expression */
-+-  unsigned char *peOp2            /* OUT: 0 for MATCH, or else an op2 value */
-+-){
-+-  static const struct Op2 {
-+-    const char *zOp;
-+-    unsigned char eOp2;
-+-  } aOp[] = {
-+-    { "match",  SQLITE_INDEX_CONSTRAINT_MATCH },
-+-    { "glob",   SQLITE_INDEX_CONSTRAINT_GLOB },
-+-    { "like",   SQLITE_INDEX_CONSTRAINT_LIKE },
-+-    { "regexp", SQLITE_INDEX_CONSTRAINT_REGEXP }
-+-  };
-+-  ExprList *pList;
-+-  Expr *pCol;                     /* Column reference */
-+-  int i;
-++  unsigned char *peOp2,           /* OUT: 0 for MATCH, or else an op2 value */
-++  Expr **ppLeft,                  /* Column expression to left of MATCH/op2 */
-++  Expr **ppRight                  /* Expression to left of MATCH/op2 */
-++){
-++  if( pExpr->op==TK_FUNCTION ){
-++    static const struct Op2 {
-++      const char *zOp;
-++      unsigned char eOp2;
-++    } aOp[] = {
-++      { "match",  SQLITE_INDEX_CONSTRAINT_MATCH },
-++      { "glob",   SQLITE_INDEX_CONSTRAINT_GLOB },
-++      { "like",   SQLITE_INDEX_CONSTRAINT_LIKE },
-++      { "regexp", SQLITE_INDEX_CONSTRAINT_REGEXP }
-++    };
-++    ExprList *pList;
-++    Expr *pCol;                     /* Column reference */
-++    int i;
-+ 
-+-  if( pExpr->op!=TK_FUNCTION ){
-+-    return 0;
-+-  }
-+-  pList = pExpr->x.pList;
-+-  if( pList==0 || pList->nExpr!=2 ){
-+-    return 0;
-+-  }
-+-  pCol = pList->a[1].pExpr;
-+-  if( pCol->op!=TK_COLUMN || !IsVirtual(pCol->pTab) ){
-+-    return 0;
-+-  }
-+-  for(i=0; i<ArraySize(aOp); i++){
-+-    if( sqlite3StrICmp(pExpr->u.zToken, aOp[i].zOp)==0 ){
-+-      *peOp2 = aOp[i].eOp2;
-+-      return 1;
-++    pList = pExpr->x.pList;
-++    if( pList==0 || pList->nExpr!=2 ){
-++      return 0;
-++    }
-++    pCol = pList->a[1].pExpr;
-++    if( pCol->op!=TK_COLUMN || !IsVirtual(pCol->pTab) ){
-++      return 0;
-++    }
-++    for(i=0; i<ArraySize(aOp); i++){
-++      if( sqlite3StrICmp(pExpr->u.zToken, aOp[i].zOp)==0 ){
-++        *peOp2 = aOp[i].eOp2;
-++        *ppRight = pList->a[0].pExpr;
-++        *ppLeft = pCol;
-++        return 1;
-++      }
-++    }
-++  }else if( pExpr->op==TK_NE || pExpr->op==TK_ISNOT || pExpr->op==TK_NOTNULL ){
-++    int res = 0;
-++    Expr *pLeft = pExpr->pLeft;
-++    Expr *pRight = pExpr->pRight;
-++    if( pLeft->op==TK_COLUMN && IsVirtual(pLeft->pTab) ){
-++      res++;
-++    }
-++    if( pRight && pRight->op==TK_COLUMN && IsVirtual(pRight->pTab) ){
-++      res++;
-++      SWAP(Expr*, pLeft, pRight);
-+     }
-++    *ppLeft = pLeft;
-++    *ppRight = pRight;
-++    if( pExpr->op==TK_NE ) *peOp2 = SQLITE_INDEX_CONSTRAINT_NE;
-++    if( pExpr->op==TK_ISNOT ) *peOp2 = SQLITE_INDEX_CONSTRAINT_ISNOT;
-++    if( pExpr->op==TK_NOTNULL ) *peOp2 = SQLITE_INDEX_CONSTRAINT_ISNOTNULL;
-++    return res;
-+   }
-+   return 0;
-+ }
-+@@ -130712,7 +131071,7 @@ static void exprAnalyzeOrTerm(
-+           for(j=0, pAndTerm=pAndWC->a; j<pAndWC->nTerm; j++, pAndTerm++){
-+             assert( pAndTerm->pExpr );
-+             if( allowedOp(pAndTerm->pExpr->op)
-+-             || pAndTerm->eOperator==WO_MATCH
-++             || pAndTerm->eOperator==WO_AUX
-+             ){
-+               b |= sqlite3WhereGetMask(&pWInfo->sMaskSet, pAndTerm->leftCursor);
-+             }
-+@@ -130914,7 +131273,6 @@ static void exprAnalyzeOrTerm(
-+ static int termIsEquivalence(Parse *pParse, Expr *pExpr){
-+   char aff1, aff2;
-+   CollSeq *pColl;
-+-  const char *zColl1, *zColl2;
-+   if( !OptimizationEnabled(pParse->db, SQLITE_Transitive) ) return 0;
-+   if( pExpr->op!=TK_EQ && pExpr->op!=TK_IS ) return 0;
-+   if( ExprHasProperty(pExpr, EP_FromJoin) ) return 0;
-+@@ -130927,11 +131285,7 @@ static int termIsEquivalence(Parse *pParse, Expr *pExpr){
-+   }
-+   pColl = sqlite3BinaryCompareCollSeq(pParse, pExpr->pLeft, pExpr->pRight);
-+   if( pColl==0 || sqlite3StrICmp(pColl->zName, "BINARY")==0 ) return 1;
-+-  pColl = sqlite3ExprCollSeq(pParse, pExpr->pLeft);
-+-  zColl1 = pColl ? pColl->zName : 0;
-+-  pColl = sqlite3ExprCollSeq(pParse, pExpr->pRight);
-+-  zColl2 = pColl ? pColl->zName : 0;
-+-  return sqlite3_stricmp(zColl1, zColl2)==0;
-++  return sqlite3ExprCollSeqMatch(pParse, pExpr->pLeft, pExpr->pRight);
-+ }
-+ 
-+ /*
-+@@ -131294,41 +131648,46 @@ static void exprAnalyze(
-+ #endif /* SQLITE_OMIT_LIKE_OPTIMIZATION */
-+ 
-+ #ifndef SQLITE_OMIT_VIRTUALTABLE
-+-  /* Add a WO_MATCH auxiliary term to the constraint set if the
-+-  ** current expression is of the form:  column MATCH expr.
-++  /* Add a WO_AUX auxiliary term to the constraint set if the
-++  ** current expression is of the form "column OP expr" where OP
-++  ** is an operator that gets passed into virtual tables but which is
-++  ** not normally optimized for ordinary tables.  In other words, OP
-++  ** is one of MATCH, LIKE, GLOB, REGEXP, !=, IS, IS NOT, or NOT NULL.
-+   ** This information is used by the xBestIndex methods of
-+   ** virtual tables.  The native query optimizer does not attempt
-+   ** to do anything with MATCH functions.
-+   */
-+-  if( pWC->op==TK_AND && isMatchOfColumn(pExpr, &eOp2) ){
-+-    int idxNew;
-++  if( pWC->op==TK_AND ){
-+     Expr *pRight, *pLeft;
-+-    WhereTerm *pNewTerm;
-+-    Bitmask prereqColumn, prereqExpr;
-+-
-+-    pRight = pExpr->x.pList->a[0].pExpr;
-+-    pLeft = pExpr->x.pList->a[1].pExpr;
-+-    prereqExpr = sqlite3WhereExprUsage(pMaskSet, pRight);
-+-    prereqColumn = sqlite3WhereExprUsage(pMaskSet, pLeft);
-+-    if( (prereqExpr & prereqColumn)==0 ){
-+-      Expr *pNewExpr;
-+-      pNewExpr = sqlite3PExpr(pParse, TK_MATCH,
-+-                              0, sqlite3ExprDup(db, pRight, 0));
-+-      if( ExprHasProperty(pExpr, EP_FromJoin) && pNewExpr ){
-+-        ExprSetProperty(pNewExpr, EP_FromJoin);
-++    int res = isAuxiliaryVtabOperator(pExpr, &eOp2, &pLeft, &pRight);
-++    while( res-- > 0 ){
-++      int idxNew;
-++      WhereTerm *pNewTerm;
-++      Bitmask prereqColumn, prereqExpr;
-++
-++      prereqExpr = sqlite3WhereExprUsage(pMaskSet, pRight);
-++      prereqColumn = sqlite3WhereExprUsage(pMaskSet, pLeft);
-++      if( (prereqExpr & prereqColumn)==0 ){
-++        Expr *pNewExpr;
-++        pNewExpr = sqlite3PExpr(pParse, TK_MATCH,
-++            0, sqlite3ExprDup(db, pRight, 0));
-++        if( ExprHasProperty(pExpr, EP_FromJoin) && pNewExpr ){
-++          ExprSetProperty(pNewExpr, EP_FromJoin);
-++        }
-++        idxNew = whereClauseInsert(pWC, pNewExpr, TERM_VIRTUAL|TERM_DYNAMIC);
-++        testcase( idxNew==0 );
-++        pNewTerm = &pWC->a[idxNew];
-++        pNewTerm->prereqRight = prereqExpr;
-++        pNewTerm->leftCursor = pLeft->iTable;
-++        pNewTerm->u.leftColumn = pLeft->iColumn;
-++        pNewTerm->eOperator = WO_AUX;
-++        pNewTerm->eMatchOp = eOp2;
-++        markTermAsChild(pWC, idxNew, idxTerm);
-++        pTerm = &pWC->a[idxTerm];
-++        pTerm->wtFlags |= TERM_COPIED;
-++        pNewTerm->prereqAll = pTerm->prereqAll;
-+       }
-+-      idxNew = whereClauseInsert(pWC, pNewExpr, TERM_VIRTUAL|TERM_DYNAMIC);
-+-      testcase( idxNew==0 );
-+-      pNewTerm = &pWC->a[idxNew];
-+-      pNewTerm->prereqRight = prereqExpr;
-+-      pNewTerm->leftCursor = pLeft->iTable;
-+-      pNewTerm->u.leftColumn = pLeft->iColumn;
-+-      pNewTerm->eOperator = WO_MATCH;
-+-      pNewTerm->eMatchOp = eOp2;
-+-      markTermAsChild(pWC, idxNew, idxTerm);
-+-      pTerm = &pWC->a[idxTerm];
-+-      pTerm->wtFlags |= TERM_COPIED;
-+-      pNewTerm->prereqAll = pTerm->prereqAll;
-++      SWAP(Expr*, pLeft, pRight);
-+     }
-+   }
-+ #endif /* SQLITE_OMIT_VIRTUALTABLE */
-+@@ -132007,8 +132366,8 @@ static int findIndexCol(
-+      && p->iColumn==pIdx->aiColumn[iCol]
-+      && p->iTable==iBase
-+     ){
-+-      CollSeq *pColl = sqlite3ExprCollSeq(pParse, pList->a[i].pExpr);
-+-      if( pColl && 0==sqlite3StrICmp(pColl->zName, zColl) ){
-++      CollSeq *pColl = sqlite3ExprNNCollSeq(pParse, pList->a[i].pExpr);
-++      if( 0==sqlite3StrICmp(pColl->zName, zColl) ){
-+         return i;
-+       }
-+     }
-+@@ -132472,7 +132831,7 @@ static sqlite3_index_info *allocateIndexInfo(
-+     testcase( pTerm->eOperator & WO_ISNULL );
-+     testcase( pTerm->eOperator & WO_IS );
-+     testcase( pTerm->eOperator & WO_ALL );
-+-    if( (pTerm->eOperator & ~(WO_ISNULL|WO_EQUIV|WO_IS))==0 ) continue;
-++    if( (pTerm->eOperator & ~(WO_EQUIV))==0 ) continue;
-+     if( pTerm->wtFlags & TERM_VNULL ) continue;
-+     assert( pTerm->u.leftColumn>=(-1) );
-+     nTerm++;
-+@@ -132520,7 +132879,7 @@ static sqlite3_index_info *allocateIndexInfo(
-+                                                                    pUsage;
-+ 
-+   for(i=j=0, pTerm=pWC->a; i<pWC->nTerm; i++, pTerm++){
-+-    u8 op;
-++    u16 op;
-+     if( pTerm->leftCursor != pSrc->iCursor ) continue;
-+     if( pTerm->prereqRight & mUnusable ) continue;
-+     assert( IsPowerOfTwo(pTerm->eOperator & ~WO_EQUIV) );
-+@@ -132528,34 +132887,40 @@ static sqlite3_index_info *allocateIndexInfo(
-+     testcase( pTerm->eOperator & WO_IS );
-+     testcase( pTerm->eOperator & WO_ISNULL );
-+     testcase( pTerm->eOperator & WO_ALL );
-+-    if( (pTerm->eOperator & ~(WO_ISNULL|WO_EQUIV|WO_IS))==0 ) continue;
-++    if( (pTerm->eOperator & ~(WO_EQUIV))==0 ) continue;
-+     if( pTerm->wtFlags & TERM_VNULL ) continue;
-+     assert( pTerm->u.leftColumn>=(-1) );
-+     pIdxCons[j].iColumn = pTerm->u.leftColumn;
-+     pIdxCons[j].iTermOffset = i;
-+-    op = (u8)pTerm->eOperator & WO_ALL;
-++    op = pTerm->eOperator & WO_ALL;
-+     if( op==WO_IN ) op = WO_EQ;
-+-    if( op==WO_MATCH ){
-+-      op = pTerm->eMatchOp;
-+-    }
-+-    pIdxCons[j].op = op;
-+-    /* The direct assignment in the previous line is possible only because
-+-    ** the WO_ and SQLITE_INDEX_CONSTRAINT_ codes are identical.  The
-+-    ** following asserts verify this fact. */
-+-    assert( WO_EQ==SQLITE_INDEX_CONSTRAINT_EQ );
-+-    assert( WO_LT==SQLITE_INDEX_CONSTRAINT_LT );
-+-    assert( WO_LE==SQLITE_INDEX_CONSTRAINT_LE );
-+-    assert( WO_GT==SQLITE_INDEX_CONSTRAINT_GT );
-+-    assert( WO_GE==SQLITE_INDEX_CONSTRAINT_GE );
-+-    assert( WO_MATCH==SQLITE_INDEX_CONSTRAINT_MATCH );
-+-    assert( pTerm->eOperator & (WO_IN|WO_EQ|WO_LT|WO_LE|WO_GT|WO_GE|WO_MATCH) );
-+-
-+-    if( op & (WO_LT|WO_LE|WO_GT|WO_GE)
-+-     && sqlite3ExprIsVector(pTerm->pExpr->pRight)
-+-    ){
-+-      if( i<16 ) mNoOmit |= (1 << i);
-+-      if( op==WO_LT ) pIdxCons[j].op = WO_LE;
-+-      if( op==WO_GT ) pIdxCons[j].op = WO_GE;
-++    if( op==WO_AUX ){
-++      pIdxCons[j].op = pTerm->eMatchOp;
-++    }else if( op & (WO_ISNULL|WO_IS) ){
-++      if( op==WO_ISNULL ){
-++        pIdxCons[j].op = SQLITE_INDEX_CONSTRAINT_ISNULL;
-++      }else{
-++        pIdxCons[j].op = SQLITE_INDEX_CONSTRAINT_IS;
-++      }
-++    }else{
-++      pIdxCons[j].op = (u8)op;
-++      /* The direct assignment in the previous line is possible only because
-++      ** the WO_ and SQLITE_INDEX_CONSTRAINT_ codes are identical.  The
-++      ** following asserts verify this fact. */
-++      assert( WO_EQ==SQLITE_INDEX_CONSTRAINT_EQ );
-++      assert( WO_LT==SQLITE_INDEX_CONSTRAINT_LT );
-++      assert( WO_LE==SQLITE_INDEX_CONSTRAINT_LE );
-++      assert( WO_GT==SQLITE_INDEX_CONSTRAINT_GT );
-++      assert( WO_GE==SQLITE_INDEX_CONSTRAINT_GE );
-++      assert( pTerm->eOperator&(WO_IN|WO_EQ|WO_LT|WO_LE|WO_GT|WO_GE|WO_AUX) );
-++
-++      if( op & (WO_LT|WO_LE|WO_GT|WO_GE)
-++       && sqlite3ExprIsVector(pTerm->pExpr->pRight)
-++      ){
-++        if( i<16 ) mNoOmit |= (1 << i);
-++        if( op==WO_LT ) pIdxCons[j].op = WO_LE;
-++        if( op==WO_GT ) pIdxCons[j].op = WO_GE;
-++      }
-+     }
-+ 
-+     j++;
-+@@ -133483,18 +133848,19 @@ static void whereInfoFree(sqlite3 *db, WhereInfo *pWInfo){
-+ ** Return TRUE if all of the following are true:
-+ **
-+ **   (1)  X has the same or lower cost that Y
-+-**   (2)  X is a proper subset of Y
-+-**   (3)  X skips at least as many columns as Y
-+-**
-+-** By "proper subset" we mean that X uses fewer WHERE clause terms
-+-** than Y and that every WHERE clause term used by X is also used
-+-** by Y.
-++**   (2)  X uses fewer WHERE clause terms than Y
-++**   (3)  Every WHERE clause term used by X is also used by Y
-++**   (4)  X skips at least as many columns as Y
-++**   (5)  If X is a covering index, than Y is too
-+ **
-++** Conditions (2) and (3) mean that X is a "proper subset" of Y.
-+ ** If X is a proper subset of Y then Y is a better choice and ought
-+ ** to have a lower cost.  This routine returns TRUE when that cost
-+-** relationship is inverted and needs to be adjusted.  The third rule
-++** relationship is inverted and needs to be adjusted.  Constraint (4)
-+ ** was added because if X uses skip-scan less than Y it still might
-+-** deserve a lower cost even if it is a proper subset of Y.
-++** deserve a lower cost even if it is a proper subset of Y.  Constraint (5)
-++** was added because a covering index probably deserves to have a lower cost
-++** than a non-covering index even if it is a proper subset.
-+ */
-+ static int whereLoopCheaperProperSubset(
-+   const WhereLoop *pX,       /* First WhereLoop to compare */
-+@@ -133516,6 +133882,10 @@ static int whereLoopCheaperProperSubset(
-+     }
-+     if( j<0 ) return 0;  /* X not a subset of Y since term X[i] not used by Y */
-+   }
-++  if( (pX->wsFlags&WHERE_IDX_ONLY)!=0
-++   && (pY->wsFlags&WHERE_IDX_ONLY)==0 ){
-++    return 0;  /* Constraint (5) */
-++  }
-+   return 1;  /* All conditions meet */
-+ }
-+ 
-+@@ -134267,7 +134637,7 @@ static int indexMightHelpWithOrderBy(
-+     }else if( (aColExpr = pIndex->aColExpr)!=0 ){
-+       for(jj=0; jj<pIndex->nKeyCol; jj++){
-+         if( pIndex->aiColumn[jj]!=XN_EXPR ) continue;
-+-        if( sqlite3ExprCompare(0, pExpr,aColExpr->a[jj].pExpr,iCursor)==0 ){
-++        if( sqlite3ExprCompareSkip(pExpr,aColExpr->a[jj].pExpr,iCursor)==0 ){
-+           return 1;
-+         }
-+       }
-+@@ -135177,14 +135547,10 @@ static i8 wherePathSatisfiesOrderBy(
-+         if( j>=pLoop->nLTerm ) continue;
-+       }
-+       if( (pTerm->eOperator&(WO_EQ|WO_IS))!=0 && pOBExpr->iColumn>=0 ){
-+-        const char *z1, *z2;
-+-        pColl = sqlite3ExprCollSeq(pWInfo->pParse, pOrderBy->a[i].pExpr);
-+-        if( !pColl ) pColl = db->pDfltColl;
-+-        z1 = pColl->zName;
-+-        pColl = sqlite3ExprCollSeq(pWInfo->pParse, pTerm->pExpr);
-+-        if( !pColl ) pColl = db->pDfltColl;
-+-        z2 = pColl->zName;
-+-        if( sqlite3StrICmp(z1, z2)!=0 ) continue;
-++        if( sqlite3ExprCollSeqMatch(pWInfo->pParse,
-++                  pOrderBy->a[i].pExpr, pTerm->pExpr)==0 ){
-++          continue;
-++        }
-+         testcase( pTerm->pExpr->op==TK_IS );
-+       }
-+       obSat |= MASKBIT(i);
-+@@ -135256,7 +135622,7 @@ static i8 wherePathSatisfiesOrderBy(
-+         if( pIndex ){
-+           iColumn = pIndex->aiColumn[j];
-+           revIdx = pIndex->aSortOrder[j];
-+-          if( iColumn==pIndex->pTable->iPKey ) iColumn = -1;
-++          if( iColumn==pIndex->pTable->iPKey ) iColumn = XN_ROWID;
-+         }else{
-+           iColumn = XN_ROWID;
-+           revIdx = 0;
-+@@ -135283,19 +135649,18 @@ static i8 wherePathSatisfiesOrderBy(
-+           testcase( wctrlFlags & WHERE_GROUPBY );
-+           testcase( wctrlFlags & WHERE_DISTINCTBY );
-+           if( (wctrlFlags & (WHERE_GROUPBY|WHERE_DISTINCTBY))==0 ) bOnce = 0;
-+-          if( iColumn>=(-1) ){
-++          if( iColumn>=XN_ROWID ){
-+             if( pOBExpr->op!=TK_COLUMN ) continue;
-+             if( pOBExpr->iTable!=iCur ) continue;
-+             if( pOBExpr->iColumn!=iColumn ) continue;
-+           }else{
-+-            if( sqlite3ExprCompare(0,
-+-                  pOBExpr,pIndex->aColExpr->a[j].pExpr,iCur) ){
-++            Expr *pIdxExpr = pIndex->aColExpr->a[j].pExpr;
-++            if( sqlite3ExprCompareSkip(pOBExpr, pIdxExpr, iCur) ){
-+               continue;
-+             }
-+           }
-+-          if( iColumn>=0 ){
-+-            pColl = sqlite3ExprCollSeq(pWInfo->pParse, pOrderBy->a[i].pExpr);
-+-            if( !pColl ) pColl = db->pDfltColl;
-++          if( iColumn!=XN_ROWID ){
-++            pColl = sqlite3ExprNNCollSeq(pWInfo->pParse, pOrderBy->a[i].pExpr);
-+             if( sqlite3StrICmp(pColl->zName, pIndex->azColl[j])!=0 ) continue;
-+           }
-+           pLoop->u.btree.nIdxCol = j+1;
-+@@ -135932,6 +136297,7 @@ static int exprIsDeterministic(Expr *p){
-+   memset(&w, 0, sizeof(w));
-+   w.eCode = 1;
-+   w.xExprCallback = exprNodeIsDeterministic;
-++  w.xSelectCallback = sqlite3SelectWalkFail;
-+   sqlite3WalkExpr(&w, p);
-+   return w.eCode;
-+ }
-+@@ -136141,36 +136507,37 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
-+     if( wctrlFlags & WHERE_WANT_DISTINCT ){
-+       pWInfo->eDistinct = WHERE_DISTINCT_UNIQUE;
-+     }
-+-  }
-+-
-+-  /* Assign a bit from the bitmask to every term in the FROM clause.
-+-  **
-+-  ** The N-th term of the FROM clause is assigned a bitmask of 1<<N.
-+-  **
-+-  ** The rule of the previous sentence ensures thta if X is the bitmask for
-+-  ** a table T, then X-1 is the bitmask for all other tables to the left of T.
-+-  ** Knowing the bitmask for all tables to the left of a left join is
-+-  ** important.  Ticket #3015.
-+-  **
-+-  ** Note that bitmasks are created for all pTabList->nSrc tables in
-+-  ** pTabList, not just the first nTabList tables.  nTabList is normally
-+-  ** equal to pTabList->nSrc but might be shortened to 1 if the
-+-  ** WHERE_OR_SUBCLAUSE flag is set.
-+-  */
-+-  for(ii=0; ii<pTabList->nSrc; ii++){
-+-    createMask(pMaskSet, pTabList->a[ii].iCursor);
-+-    sqlite3WhereTabFuncArgs(pParse, &pTabList->a[ii], &pWInfo->sWC);
-+-  }
-+-#ifdef SQLITE_DEBUG
-+-  {
-+-    Bitmask mx = 0;
-+-    for(ii=0; ii<pTabList->nSrc; ii++){
-+-      Bitmask m = sqlite3WhereGetMask(pMaskSet, pTabList->a[ii].iCursor);
-+-      assert( m>=mx );
-+-      mx = m;
-++  }else{
-++    /* Assign a bit from the bitmask to every term in the FROM clause.
-++    **
-++    ** The N-th term of the FROM clause is assigned a bitmask of 1<<N.
-++    **
-++    ** The rule of the previous sentence ensures thta if X is the bitmask for
-++    ** a table T, then X-1 is the bitmask for all other tables to the left of T.
-++    ** Knowing the bitmask for all tables to the left of a left join is
-++    ** important.  Ticket #3015.
-++    **
-++    ** Note that bitmasks are created for all pTabList->nSrc tables in
-++    ** pTabList, not just the first nTabList tables.  nTabList is normally
-++    ** equal to pTabList->nSrc but might be shortened to 1 if the
-++    ** WHERE_OR_SUBCLAUSE flag is set.
-++    */
-++    ii = 0;
-++    do{
-++      createMask(pMaskSet, pTabList->a[ii].iCursor);
-++      sqlite3WhereTabFuncArgs(pParse, &pTabList->a[ii], &pWInfo->sWC);
-++    }while( (++ii)<pTabList->nSrc );
-++  #ifdef SQLITE_DEBUG
-++    {
-++      Bitmask mx = 0;
-++      for(ii=0; ii<pTabList->nSrc; ii++){
-++        Bitmask m = sqlite3WhereGetMask(pMaskSet, pTabList->a[ii].iCursor);
-++        assert( m>=mx );
-++        mx = m;
-++      }
-+     }
-++  #endif
-+   }
-+-#endif
-+ 
-+   /* Analyze all of the subexpressions. */
-+   sqlite3WhereExprAnalyze(pTabList, &pWInfo->sWC);
-+@@ -136394,7 +136761,7 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
-+       Index *pIx = pLoop->u.btree.pIndex;
-+       int iIndexCur;
-+       int op = OP_OpenRead;
-+-      /* iAuxArg is always set if to a positive value if ONEPASS is possible */
-++      /* iAuxArg is always set to a positive value if ONEPASS is possible */
-+       assert( iAuxArg!=0 || (pWInfo->wctrlFlags & WHERE_ONEPASS_DESIRED)==0 );
-+       if( !HasRowid(pTab) && IsPrimaryKeyIndex(pIx)
-+        && (wctrlFlags & WHERE_OR_SUBCLAUSE)!=0
-+@@ -136975,7 +137342,8 @@ static void disableLookaside(Parse *pParse){
-+ **    YY_MAX_SHIFT       Maximum value for shift actions
-+ **    YY_MIN_SHIFTREDUCE Minimum value for shift-reduce actions
-+ **    YY_MAX_SHIFTREDUCE Maximum value for shift-reduce actions
-+-**    YY_MIN_REDUCE      Maximum value for reduce actions
-++**    YY_MIN_REDUCE      Minimum value for reduce actions
-++**    YY_MAX_REDUCE      Maximum value for reduce actions
-+ **    YY_ERROR_ACTION    The yy_action[] code for syntax error
-+ **    YY_ACCEPT_ACTION   The yy_action[] code for accept
-+ **    YY_NO_ACTION       The yy_action[] code for no-op
-+@@ -136987,7 +137355,7 @@ static void disableLookaside(Parse *pParse){
-+ #define YYCODETYPE unsigned char
-+ #define YYNOCODE 252
-+ #define YYACTIONTYPE unsigned short int
-+-#define YYWILDCARD 69
-++#define YYWILDCARD 83
-+ #define sqlite3ParserTOKENTYPE Token
-+ typedef union {
-+   int yyinit;
-+@@ -137094,415 +137462,415 @@ typedef union {
-+ **  yy_default[]       Default action for each state.
-+ **
-+ *********** Begin parsing tables **********************************************/
-+-#define YY_ACTTAB_COUNT (1565)
-++#define YY_ACTTAB_COUNT (1566)
-+ static const YYACTIONTYPE yy_action[] = {
-+- /*     0 */   324,  410,  342,  747,  747,  203,  939,  353,  969,   98,
-+- /*    10 */    98,   98,   98,   91,   96,   96,   96,   96,   95,   95,
-+- /*    20 */    94,   94,   94,   93,  350, 1323,  155,  155,    2,  808,
-+- /*    30 */   971,  971,   98,   98,   98,   98,   20,   96,   96,   96,
-+- /*    40 */    96,   95,   95,   94,   94,   94,   93,  350,   92,   89,
-+- /*    50 */   178,   99,  100,   90,  847,  850,  839,  839,   97,   97,
-+- /*    60 */    98,   98,   98,   98,  350,   96,   96,   96,   96,   95,
-+- /*    70 */    95,   94,   94,   94,   93,  350,  324,  339,  969,  262,
-+- /*    80 */   364,  251,  212,  169,  287,  404,  282,  403,  199,  786,
-+- /*    90 */   242,  411,   21,  950,  378,  280,   93,  350,  787,   95,
-+- /*   100 */    95,   94,   94,   94,   93,  350,  971,  971,   96,   96,
-+- /*   110 */    96,   96,   95,   95,   94,   94,   94,   93,  350,  808,
-+- /*   120 */   328,  242,  411, 1235,  826, 1235,  132,   99,  100,   90,
-+- /*   130 */   847,  850,  839,  839,   97,   97,   98,   98,   98,   98,
-+- /*   140 */   449,   96,   96,   96,   96,   95,   95,   94,   94,   94,
-+- /*   150 */    93,  350,  324,  819,  348,  347,  120,  818,  120,   75,
-+- /*   160 */    52,   52,  950,  951,  952, 1084,  977,  146,  360,  262,
-+- /*   170 */   369,  261,  950,  975,  954,  976,   92,   89,  178,  370,
-+- /*   180 */   230,  370,  971,  971, 1141,  360,  359,  101,  818,  818,
-+- /*   190 */   820,  383,   24, 1286,  380,  427,  412,  368,  978,  379,
-+- /*   200 */   978, 1032,  324,   99,  100,   90,  847,  850,  839,  839,
-+- /*   210 */    97,   97,   98,   98,   98,   98,  372,   96,   96,   96,
-+- /*   220 */    96,   95,   95,   94,   94,   94,   93,  350,  950,  132,
-+- /*   230 */   890,  449,  971,  971,  890,   60,   94,   94,   94,   93,
-+- /*   240 */   350,  950,  951,  952,  954,  103,  360,  950,  384,  333,
-+- /*   250 */   697,   52,   52,   99,  100,   90,  847,  850,  839,  839,
-+- /*   260 */    97,   97,   98,   98,   98,   98, 1022,   96,   96,   96,
-+- /*   270 */    96,   95,   95,   94,   94,   94,   93,  350,  324,  454,
-+- /*   280 */   995,  449,  227,   61,  157,  243,  343,  114, 1025, 1211,
-+- /*   290 */   147,  826,  950,  372, 1071,  950,  319,  950,  951,  952,
-+- /*   300 */   194,   10,   10,  401,  398,  397, 1211, 1213,  971,  971,
-+- /*   310 */   757,  171,  170,  157,  396,  336,  950,  951,  952,  697,
-+- /*   320 */   819,  310,  153,  950,  818,  320,   82,   23,   80,   99,
-+- /*   330 */   100,   90,  847,  850,  839,  839,   97,   97,   98,   98,
-+- /*   340 */    98,   98,  888,   96,   96,   96,   96,   95,   95,   94,
-+- /*   350 */    94,   94,   93,  350,  324,  818,  818,  820,  277,  231,
-+- /*   360 */   300,  950,  951,  952,  950,  951,  952, 1211,  194,   25,
-+- /*   370 */   449,  401,  398,  397,  950,  354,  300,  449,  950,   74,
-+- /*   380 */   449,    1,  396,  132,  971,  971,  950,  224,  224,  808,
-+- /*   390 */    10,   10,  950,  951,  952, 1290,  132,   52,   52,  414,
-+- /*   400 */    52,   52, 1063, 1063,  338,   99,  100,   90,  847,  850,
-+- /*   410 */   839,  839,   97,   97,   98,   98,   98,   98, 1114,   96,
-+- /*   420 */    96,   96,   96,   95,   95,   94,   94,   94,   93,  350,
-+- /*   430 */   324, 1113,  427,  417,  701,  427,  426, 1260, 1260,  262,
-+- /*   440 */   369,  261,  950,  950,  951,  952,  752,  950,  951,  952,
-+- /*   450 */   449,  751,  449, 1058, 1037,  950,  951,  952,  442,  706,
-+- /*   460 */   971,  971, 1058,  393,   92,   89,  178,  446,  446,  446,
-+- /*   470 */    51,   51,   52,   52,  438,  773, 1024,   92,   89,  178,
-+- /*   480 */   172,   99,  100,   90,  847,  850,  839,  839,   97,   97,
-+- /*   490 */    98,   98,   98,   98,  198,   96,   96,   96,   96,   95,
-+- /*   500 */    95,   94,   94,   94,   93,  350,  324,  427,  407,  909,
-+- /*   510 */   694,  950,  951,  952,   92,   89,  178,  224,  224,  157,
-+- /*   520 */   241,  221,  418,  299,  771,  910,  415,  374,  449,  414,
-+- /*   530 */    58,  323, 1061, 1061, 1242,  378,  971,  971,  378,  772,
-+- /*   540 */   448,  911,  362,  735,  296,  681,    9,    9,   52,   52,
-+- /*   550 */   234,  329,  234,  256,  416,  736,  280,   99,  100,   90,
-+- /*   560 */   847,  850,  839,  839,   97,   97,   98,   98,   98,   98,
-+- /*   570 */   449,   96,   96,   96,   96,   95,   95,   94,   94,   94,
-+- /*   580 */    93,  350,  324,  422,   72,  449,  827,  120,  367,  449,
-+- /*   590 */    10,   10,    5,  301,  203,  449,  177,  969,  253,  419,
-+- /*   600 */   255,  771,  200,  175,  233,   10,   10,  836,  836,   36,
-+- /*   610 */    36, 1289,  971,  971,  724,   37,   37,  348,  347,  424,
-+- /*   620 */   203,  260,  771,  969,  232,  930, 1316,  870,  337, 1316,
-+- /*   630 */   421,  848,  851,   99,  100,   90,  847,  850,  839,  839,
-+- /*   640 */    97,   97,   98,   98,   98,   98,  268,   96,   96,   96,
-+- /*   650 */    96,   95,   95,   94,   94,   94,   93,  350,  324,  840,
-+- /*   660 */   449,  978,  813,  978, 1200,  449,  909,  969,  715,  349,
-+- /*   670 */   349,  349,  928,  177,  449,  930, 1317,  254,  198, 1317,
-+- /*   680 */    12,   12,  910,  402,  449,   27,   27,  250,  971,  971,
-+- /*   690 */   118,  716,  162,  969,   38,   38,  268,  176,  911,  771,
-+- /*   700 */   432, 1265,  939,  353,   39,   39,  316,  991,  324,   99,
-+- /*   710 */   100,   90,  847,  850,  839,  839,   97,   97,   98,   98,
-+- /*   720 */    98,   98,  928,   96,   96,   96,   96,   95,   95,   94,
-+- /*   730 */    94,   94,   93,  350,  449,  329,  449,  357,  971,  971,
-+- /*   740 */  1041,  316,  929,  340,  893,  893,  386,  669,  670,  671,
-+- /*   750 */   275, 1318,  317,  992,   40,   40,   41,   41,  268,   99,
-+- /*   760 */   100,   90,  847,  850,  839,  839,   97,   97,   98,   98,
-+- /*   770 */    98,   98,  449,   96,   96,   96,   96,   95,   95,   94,
-+- /*   780 */    94,   94,   93,  350,  324,  449,  355,  449,  992,  449,
-+- /*   790 */  1016,  330,   42,   42,  786,  270,  449,  273,  449,  228,
-+- /*   800 */   449,  298,  449,  787,  449,   28,   28,   29,   29,   31,
-+- /*   810 */    31,  449, 1141,  449,  971,  971,   43,   43,   44,   44,
-+- /*   820 */    45,   45,   11,   11,   46,   46,  887,   78,  887,  268,
-+- /*   830 */   268,  105,  105,   47,   47,   99,  100,   90,  847,  850,
-+- /*   840 */   839,  839,   97,   97,   98,   98,   98,   98,  449,   96,
-+- /*   850 */    96,   96,   96,   95,   95,   94,   94,   94,   93,  350,
-+- /*   860 */   324,  449,  117,  449, 1073,  158,  449,  691,   48,   48,
-+- /*   870 */   229, 1241,  449, 1250,  449,  414,  449,  334,  449,  245,
-+- /*   880 */   449,   33,   33,   49,   49,  449,   50,   50,  246, 1141,
-+- /*   890 */   971,  971,   34,   34,  122,  122,  123,  123,  124,  124,
-+- /*   900 */    56,   56,  268,   81,  249,   35,   35,  197,  196,  195,
-+- /*   910 */   324,   99,  100,   90,  847,  850,  839,  839,   97,   97,
-+- /*   920 */    98,   98,   98,   98,  449,   96,   96,   96,   96,   95,
-+- /*   930 */    95,   94,   94,   94,   93,  350,  449,  691,  449, 1141,
-+- /*   940 */   971,  971,  968, 1207,  106,  106,  268, 1209,  268, 1266,
-+- /*   950 */     2,  886,  268,  886,  335, 1040,   53,   53,  107,  107,
-+- /*   960 */   324,   99,  100,   90,  847,  850,  839,  839,   97,   97,
-+- /*   970 */    98,   98,   98,   98,  449,   96,   96,   96,   96,   95,
-+- /*   980 */    95,   94,   94,   94,   93,  350,  449, 1070,  449, 1066,
-+- /*   990 */   971,  971, 1039,  267,  108,  108,  445,  330,  331,  133,
-+- /*  1000 */   223,  175,  301,  225,  385, 1255,  104,  104,  121,  121,
-+- /*  1010 */   324,   99,   88,   90,  847,  850,  839,  839,   97,   97,
-+- /*  1020 */    98,   98,   98,   98, 1141,   96,   96,   96,   96,   95,
-+- /*  1030 */    95,   94,   94,   94,   93,  350,  449,  346,  449,  167,
-+- /*  1040 */   971,  971,  925,  810,  371,  318,  202,  202,  373,  263,
-+- /*  1050 */   394,  202,   74,  208,  721,  722,  119,  119,  112,  112,
-+- /*  1060 */   324,  406,  100,   90,  847,  850,  839,  839,   97,   97,
-+- /*  1070 */    98,   98,   98,   98,  449,   96,   96,   96,   96,   95,
-+- /*  1080 */    95,   94,   94,   94,   93,  350,  449,  752,  449,  344,
-+- /*  1090 */   971,  971,  751,  278,  111,  111,   74,  714,  713,  704,
-+- /*  1100 */   286,  877,  749, 1279,  257,   77,  109,  109,  110,  110,
-+- /*  1110 */  1230,  285, 1134,   90,  847,  850,  839,  839,   97,   97,
-+- /*  1120 */    98,   98,   98,   98, 1233,   96,   96,   96,   96,   95,
-+- /*  1130 */    95,   94,   94,   94,   93,  350,   86,  444,  449,    3,
-+- /*  1140 */  1193,  449, 1069,  132,  351,  120, 1013,   86,  444,  780,
-+- /*  1150 */     3, 1091,  202,  376,  447,  351, 1229,  120,   55,   55,
-+- /*  1160 */   449,   57,   57,  822,  873,  447,  449,  208,  449,  704,
-+- /*  1170 */   449,  877,  237,  433,  435,  120,  439,  428,  361,  120,
-+- /*  1180 */    54,   54,  132,  449,  433,  826,   52,   52,   26,   26,
-+- /*  1190 */    30,   30,  381,  132,  408,  443,  826,  689,  264,  389,
-+- /*  1200 */   116,  269,  272,   32,   32,   83,   84,  120,  274,  120,
-+- /*  1210 */   120,  276,   85,  351,  451,  450,   83,   84,  818, 1054,
-+- /*  1220 */  1038,  427,  429,   85,  351,  451,  450,  120,  120,  818,
-+- /*  1230 */   377,  218,  281,  822, 1107, 1140,   86,  444,  409,    3,
-+- /*  1240 */  1087, 1098,  430,  431,  351,  302,  303, 1146, 1021,  818,
-+- /*  1250 */   818,  820,  821,   19,  447, 1015, 1004, 1003, 1005, 1273,
-+- /*  1260 */   818,  818,  820,  821,   19,  289,  159,  291,  293,    7,
-+- /*  1270 */   315,  173,  259,  433, 1129,  363,  252, 1232,  375, 1037,
-+- /*  1280 */   295,  434,  168,  986,  399,  826,  284, 1204, 1203,  205,
-+- /*  1290 */  1276,  308, 1249,   86,  444,  983,    3, 1247,  332,  144,
-+- /*  1300 */   130,  351,   72,  135,   59,   83,   84,  756,  137,  365,
-+- /*  1310 */  1126,  447,   85,  351,  451,  450,  139,  226,  818,  140,
-+- /*  1320 */   156,   62,  314,  314,  313,  215,  311,  366,  392,  678,
-+- /*  1330 */   433,  185,  141, 1234,  142,  160,  148, 1136, 1198,  382,
-+- /*  1340 */   189,   67,  826,  180,  388,  248, 1218, 1099,  219,  818,
-+- /*  1350 */   818,  820,  821,   19,  247,  190,  266,  154,  390,  271,
-+- /*  1360 */   191,  192,   83,   84, 1006,  405, 1057,  182,  321,   85,
-+- /*  1370 */   351,  451,  450, 1056,  183,  818,  341,  132,  181,  706,
-+- /*  1380 */  1055,  420,   76,  444, 1029,    3,  322, 1028,  283, 1048,
-+- /*  1390 */   351, 1095, 1027, 1288, 1047,   71,  204,    6,  288,  290,
-+- /*  1400 */   447, 1096, 1094, 1093,   79,  292,  818,  818,  820,  821,
-+- /*  1410 */    19,  294,  297,  437,  345,  441,  102, 1184, 1077,  433,
-+- /*  1420 */   238,  425,   73,  305,  239,  304,  325,  240,  423,  306,
-+- /*  1430 */   307,  826,  213, 1012,   22,  945,  452,  214,  216,  217,
-+- /*  1440 */   453, 1001,  115,  996,  125,  126,  235,  127,  665,  352,
-+- /*  1450 */   326,   83,   84,  358,  166,  244,  179,  327,   85,  351,
-+- /*  1460 */   451,  450,  134,  356,  818,  113,  885,  806,  883,  136,
-+- /*  1470 */   128,  138,  738,  258,  184,  899,  143,  145,   63,   64,
-+- /*  1480 */    65,   66,  129,  902,  187,  186,  898,    8,   13,  188,
-+- /*  1490 */   265,  891,  149,  202,  980,  818,  818,  820,  821,   19,
-+- /*  1500 */   150,  387,  161,  680,  285,  391,  151,  395,  400,  193,
-+- /*  1510 */    68,   14,  236,  279,   15,   69,  717,  825,  131,  824,
-+- /*  1520 */   853,   70,  746,   16,  413,  750,    4,  174,  220,  222,
-+- /*  1530 */   152,  779,  857,  774,  201,   77,   74,  868,   17,  854,
-+- /*  1540 */   852,  908,   18,  907,  207,  206,  934,  163,  436,  210,
-+- /*  1550 */   935,  164,  209,  165,  440,  856,  823,  690,   87,  211,
-+- /*  1560 */   309,  312, 1281,  940, 1280,
-++ /*     0 */   324, 1323,  155,  155,    2,  203,   94,   94,   94,   93,
-++ /*    10 */   350,   98,   98,   98,   98,   91,   95,   95,   94,   94,
-++ /*    20 */    94,   93,  350,  268,   99,  100,   90,  971,  971,  847,
-++ /*    30 */   850,  839,  839,   97,   97,   98,   98,   98,   98,  350,
-++ /*    40 */   969,   96,   96,   96,   96,   95,   95,   94,   94,   94,
-++ /*    50 */    93,  350,  950,   96,   96,   96,   96,   95,   95,   94,
-++ /*    60 */    94,   94,   93,  350,  250,   96,   96,   96,   96,   95,
-++ /*    70 */    95,   94,   94,   94,   93,  350,  224,  224,  969,  132,
-++ /*    80 */   888,  348,  347,  415,  172,  324, 1286,  449,  414,  950,
-++ /*    90 */   951,  952,  808,  977, 1032,  950,  300,  786,  428,  132,
-++ /*   100 */   975,  362,  976,    9,    9,  787,  132,   52,   52,   99,
-++ /*   110 */   100,   90,  971,  971,  847,  850,  839,  839,   97,   97,
-++ /*   120 */    98,   98,   98,   98,  372,  978,  241,  978,  262,  369,
-++ /*   130 */   261,  120,  950,  951,  952,  194,   58,  324,  401,  398,
-++ /*   140 */   397,  808,  427,  429,   75,  808, 1260, 1260,  132,  396,
-++ /*   150 */    96,   96,   96,   96,   95,   95,   94,   94,   94,   93,
-++ /*   160 */   350,   99,  100,   90,  971,  971,  847,  850,  839,  839,
-++ /*   170 */    97,   97,   98,   98,   98,   98,  786,  262,  369,  261,
-++ /*   180 */   826,  262,  364,  251,  787, 1084,  101, 1114,   72,  324,
-++ /*   190 */   227, 1113,  242,  411,  442,  819,   92,   89,  178,  818,
-++ /*   200 */  1022,  268,   96,   96,   96,   96,   95,   95,   94,   94,
-++ /*   210 */    94,   93,  350,   99,  100,   90,  971,  971,  847,  850,
-++ /*   220 */   839,  839,   97,   97,   98,   98,   98,   98,  449,  372,
-++ /*   230 */   818,  818,  820,   92,   89,  178,   60,   92,   89,  178,
-++ /*   240 */  1025,  324,  357,  930, 1316,  300,   61, 1316,   52,   52,
-++ /*   250 */   836,  836,  848,  851,   96,   96,   96,   96,   95,   95,
-++ /*   260 */    94,   94,   94,   93,  350,   99,  100,   90,  971,  971,
-++ /*   270 */   847,  850,  839,  839,   97,   97,   98,   98,   98,   98,
-++ /*   280 */    92,   89,  178,  427,  412,  198,  930, 1317,  454,  995,
-++ /*   290 */  1317,  355, 1024,  324,  243,  231,  114,  277,  348,  347,
-++ /*   300 */  1242,  950,  416, 1071,  928,  840,   96,   96,   96,   96,
-++ /*   310 */    95,   95,   94,   94,   94,   93,  350,   99,  100,   90,
-++ /*   320 */   971,  971,  847,  850,  839,  839,   97,   97,   98,   98,
-++ /*   330 */    98,   98,  449,  328,  449,  120,   23,  256,  950,  951,
-++ /*   340 */   952,  968,  978,  438,  978,  324,  329,  928,  954,  701,
-++ /*   350 */   200,  175,   52,   52,   52,   52,  939,  353,   96,   96,
-++ /*   360 */    96,   96,   95,   95,   94,   94,   94,   93,  350,   99,
-++ /*   370 */   100,   90,  971,  971,  847,  850,  839,  839,   97,   97,
-++ /*   380 */    98,   98,   98,   98,  354,  449,  954,  427,  417,  427,
-++ /*   390 */   426, 1290,   92,   89,  178,  268,  253,  324,  255, 1058,
-++ /*   400 */  1037,  694,   93,  350,  383,   52,   52,  380, 1058,  374,
-++ /*   410 */    96,   96,   96,   96,   95,   95,   94,   94,   94,   93,
-++ /*   420 */   350,   99,  100,   90,  971,  971,  847,  850,  839,  839,
-++ /*   430 */    97,   97,   98,   98,   98,   98,  228,  449,  167,  449,
-++ /*   440 */   427,  407,  157,  446,  446,  446,  349,  349,  349,  324,
-++ /*   450 */   310,  316,  991,  827,  320,  242,  411,   51,   51,   36,
-++ /*   460 */    36,  254,   96,   96,   96,   96,   95,   95,   94,   94,
-++ /*   470 */    94,   93,  350,   99,  100,   90,  971,  971,  847,  850,
-++ /*   480 */   839,  839,   97,   97,   98,   98,   98,   98,  194,  316,
-++ /*   490 */   929,  401,  398,  397,  224,  224, 1265,  939,  353, 1318,
-++ /*   500 */   317,  324,  396, 1063, 1063,  813,  414, 1061, 1061,  950,
-++ /*   510 */   299,  448,  992,  268,   96,   96,   96,   96,   95,   95,
-++ /*   520 */    94,   94,   94,   93,  350,   99,  100,   90,  971,  971,
-++ /*   530 */   847,  850,  839,  839,   97,   97,   98,   98,   98,   98,
-++ /*   540 */   757, 1041,  449,  893,  893,  386,  950,  951,  952,  410,
-++ /*   550 */   992,  747,  747,  324,  229,  268,  221,  296,  268,  771,
-++ /*   560 */   890,  378,   52,   52,  890,  421,   96,   96,   96,   96,
-++ /*   570 */    95,   95,   94,   94,   94,   93,  350,   99,  100,   90,
-++ /*   580 */   971,  971,  847,  850,  839,  839,   97,   97,   98,   98,
-++ /*   590 */    98,   98,  103,  449,  275,  384, 1241,  343,  157, 1207,
-++ /*   600 */   909,  669,  670,  671,  176,  197,  196,  195,  324,  298,
-++ /*   610 */   319, 1266,    2,   37,   37,  910, 1134, 1040,   96,   96,
-++ /*   620 */    96,   96,   95,   95,   94,   94,   94,   93,  350,  697,
-++ /*   630 */   911,  177,   99,  100,   90,  971,  971,  847,  850,  839,
-++ /*   640 */   839,   97,   97,   98,   98,   98,   98,  230,  146,  120,
-++ /*   650 */   735, 1235,  826,  270, 1141,  273, 1141,  771,  171,  170,
-++ /*   660 */   736, 1141,   82,  324,   80,  268,  697,  819,  158,  268,
-++ /*   670 */   378,  818,   78,   96,   96,   96,   96,   95,   95,   94,
-++ /*   680 */    94,   94,   93,  350,  120,  950,  393,   99,  100,   90,
-++ /*   690 */   971,  971,  847,  850,  839,  839,   97,   97,   98,   98,
-++ /*   700 */    98,   98,  818,  818,  820, 1141, 1070,  370,  331,  133,
-++ /*   710 */  1066, 1141, 1250,  198,  268,  324, 1016,  330,  245,  333,
-++ /*   720 */    24,  334,  950,  951,  952,  368,  335,   81,   96,   96,
-++ /*   730 */    96,   96,   95,   95,   94,   94,   94,   93,  350,   99,
-++ /*   740 */   100,   90,  971,  971,  847,  850,  839,  839,   97,   97,
-++ /*   750 */    98,   98,   98,   98,  132,  267,  260,  445,  330,  223,
-++ /*   760 */   175, 1289,  925,  752,  724,  318, 1073,  324,  751,  246,
-++ /*   770 */   385,  301,  301,  378,  329,  361,  344,  414, 1233,  280,
-++ /*   780 */    96,   96,   96,   96,   95,   95,   94,   94,   94,   93,
-++ /*   790 */   350,   99,   88,   90,  971,  971,  847,  850,  839,  839,
-++ /*   800 */    97,   97,   98,   98,   98,   98,  337,  346,  721,  722,
-++ /*   810 */   449,  120,  118,  887,  162,  887,  810,  371,  324,  202,
-++ /*   820 */   202,  373,  249,  263,  202,  394,   74,  704,  208, 1069,
-++ /*   830 */    12,   12,   96,   96,   96,   96,   95,   95,   94,   94,
-++ /*   840 */    94,   93,  350,  100,   90,  971,  971,  847,  850,  839,
-++ /*   850 */   839,   97,   97,   98,   98,   98,   98,  449,  771,  232,
-++ /*   860 */   449,  278,  120,  286,   74,  704,  714,  713,  324,  342,
-++ /*   870 */   749,  877, 1209,   77,  285, 1255,  780,   52,   52,  202,
-++ /*   880 */    27,   27,  418,   96,   96,   96,   96,   95,   95,   94,
-++ /*   890 */    94,   94,   93,  350,   90,  971,  971,  847,  850,  839,
-++ /*   900 */   839,   97,   97,   98,   98,   98,   98,   86,  444,  877,
-++ /*   910 */     3, 1193,  422, 1013,  873,  435,  886,  208,  886,  689,
-++ /*   920 */  1091,  257,  116,  822,  447, 1230,  117, 1229,   86,  444,
-++ /*   930 */   177,    3,  381,   96,   96,   96,   96,   95,   95,   94,
-++ /*   940 */    94,   94,   93,  350,  339,  447,  120,  351,  120,  212,
-++ /*   950 */   169,  287,  404,  282,  403,  199,  771,  950,  433,  419,
-++ /*   960 */   439,  822,  280,  691, 1039,  264,  269,  132,  351,  153,
-++ /*   970 */   826,  376,   74,  272,  274,  276,   83,   84, 1054,  433,
-++ /*   980 */   147, 1038,  443,   85,  351,  451,  450,  281,  132,  818,
-++ /*   990 */    25,  826,  449,  120,  950,  951,  952,   83,   84,   86,
-++ /*  1000 */   444,  691,    3,  408,   85,  351,  451,  450,  449,    5,
-++ /*  1010 */   818,  203,   32,   32, 1107,  120,  447,  950,  225, 1140,
-++ /*  1020 */   818,  818,  820,  821,   19,  203,  226,  950,   38,   38,
-++ /*  1030 */  1087,  314,  314,  313,  215,  311,  120,  449,  678,  351,
-++ /*  1040 */   237,  818,  818,  820,  821,   19,  969,  409,  377,    1,
-++ /*  1050 */   433,  180,  706,  248,  950,  951,  952,   10,   10,  449,
-++ /*  1060 */   969,  247,  826, 1098,  950,  951,  952,  430,   83,   84,
-++ /*  1070 */   756,  336,  950,   20,  431,   85,  351,  451,  450,   10,
-++ /*  1080 */    10,  818,   86,  444,  969,    3,  950,  449,  302,  303,
-++ /*  1090 */   182,  950, 1146,  338, 1021, 1015, 1004,  183,  969,  447,
-++ /*  1100 */   132,  181,   76,  444,   21,    3,  449,   10,   10,  950,
-++ /*  1110 */   951,  952,  818,  818,  820,  821,   19,  715, 1279,  447,
-++ /*  1120 */   389,  233,  351,  950,  951,  952,   10,   10,  950,  951,
-++ /*  1130 */   952, 1003,  218,  433, 1005,  325, 1273,  773,  289,  291,
-++ /*  1140 */   424,  293,  351,    7,  159,  826,  363,  402,  315,  360,
-++ /*  1150 */  1129,   83,   84,  433, 1232,  716,  772,  259,   85,  351,
-++ /*  1160 */   451,  450,  358,  375,  818,  826,  360,  359,  399, 1211,
-++ /*  1170 */   157,   83,   84,  681,   98,   98,   98,   98,   85,  351,
-++ /*  1180 */   451,  450,  323,  252,  818,  295, 1211, 1213, 1235,  173,
-++ /*  1190 */  1037,  284,  434,  340, 1204,  818,  818,  820,  821,   19,
-++ /*  1200 */   308,  234,  449,  234,   96,   96,   96,   96,   95,   95,
-++ /*  1210 */    94,   94,   94,   93,  350,  818,  818,  820,  821,   19,
-++ /*  1220 */   909,  120,   39,   39, 1203,  449,  168,  360,  449, 1276,
-++ /*  1230 */   367,  449,  135,  449,  986,  910,  449, 1249,  449, 1247,
-++ /*  1240 */   449,  205,  983,  449,  370,   40,   40, 1211,   41,   41,
-++ /*  1250 */   911,   42,   42,   28,   28,  870,   29,   29,   31,   31,
-++ /*  1260 */    43,   43,  379,   44,   44,  449,   59,  449,  332,  449,
-++ /*  1270 */   432,   62,  144,  156,  449,  130,  449,   72,  449,  137,
-++ /*  1280 */   449,  365,  449,  392,  139,   45,   45,   11,   11,   46,
-++ /*  1290 */    46,  140, 1200,  449,  105,  105,   47,   47,   48,   48,
-++ /*  1300 */    33,   33,   49,   49, 1126,  449,  141,  366,  449,  185,
-++ /*  1310 */   142,  449, 1234,   50,   50,  449,  160,  449,  148,  449,
-++ /*  1320 */  1136,  382,  449,   67,  449,   34,   34,  449,  122,  122,
-++ /*  1330 */   449,  123,  123,  449, 1198,  124,  124,   56,   56,   35,
-++ /*  1340 */    35,  449,  106,  106,   53,   53,  449,  107,  107,  449,
-++ /*  1350 */   108,  108,  449,  104,  104,  449,  406,  449,  388,  449,
-++ /*  1360 */   189,  121,  121,  449,  190,  449,  119,  119,  449,  112,
-++ /*  1370 */   112,  449,  111,  111, 1218,  109,  109,  110,  110,   55,
-++ /*  1380 */    55,  266,  752,   57,   57,   54,   54,  751,   26,   26,
-++ /*  1390 */  1099,   30,   30,  219,  154,  390,  271,  191,  321, 1006,
-++ /*  1400 */   192,  405, 1057, 1056, 1055,  341, 1048,  706, 1047, 1029,
-++ /*  1410 */   322,  420, 1028,   71, 1095,  283,  288, 1027, 1288,  204,
-++ /*  1420 */     6,  297,   79, 1184,  437, 1096, 1094,  290,  345,  292,
-++ /*  1430 */   441, 1093,  294,  102,  425,   73,  423,  213, 1012,   22,
-++ /*  1440 */   452,  945,  214, 1077,  216,  217,  238,  453,  306,  304,
-++ /*  1450 */   307,  239,  240, 1001,  305,  125,  996,  126,  115,  235,
-++ /*  1460 */   127,  665,  352,  166,  244,  179,  356,  113,  885,  883,
-++ /*  1470 */   806,  136,  128,  738,  326,  138,  327,  258,  184,  899,
-++ /*  1480 */   143,  129,  145,   63,   64,   65,   66,  902,  186,  187,
-++ /*  1490 */   898,    8,   13,  188,  134,  265,  891,  202,  980,  387,
-++ /*  1500 */   150,  149,  680,  161,  391,  193,  285,  279,  395,  151,
-++ /*  1510 */    68,  717,   14,   15,  400,   69,   16,  131,  236,  825,
-++ /*  1520 */   824,  853,  746,  750,    4,   70,  174,  413,  220,  222,
-++ /*  1530 */   152,  779,  774,   77,  868,   74,  854,  201,   17,  852,
-++ /*  1540 */   908,  206,  907,  207,   18,  857,  934,  163,  436,  210,
-++ /*  1550 */   935,  164,  209,  165,  440,  856,  823,  312,  690,   87,
-++ /*  1560 */   211,  309, 1281,  940,  995, 1280,
-+ };
-+ static const YYCODETYPE yy_lookahead[] = {
-+- /*     0 */    19,  115,   19,  117,  118,   24,    1,    2,   27,   79,
-+- /*    10 */    80,   81,   82,   83,   84,   85,   86,   87,   88,   89,
-+- /*    20 */    90,   91,   92,   93,   94,  144,  145,  146,  147,   58,
-+- /*    30 */    49,   50,   79,   80,   81,   82,   22,   84,   85,   86,
-+- /*    40 */    87,   88,   89,   90,   91,   92,   93,   94,  221,  222,
-+- /*    50 */   223,   70,   71,   72,   73,   74,   75,   76,   77,   78,
-+- /*    60 */    79,   80,   81,   82,   94,   84,   85,   86,   87,   88,
-+- /*    70 */    89,   90,   91,   92,   93,   94,   19,   94,   97,  108,
-+- /*    80 */   109,  110,   99,  100,  101,  102,  103,  104,  105,   32,
-+- /*    90 */   119,  120,   78,   27,  152,  112,   93,   94,   41,   88,
-+- /*   100 */    89,   90,   91,   92,   93,   94,   49,   50,   84,   85,
-+- /*   110 */    86,   87,   88,   89,   90,   91,   92,   93,   94,   58,
-+- /*   120 */   157,  119,  120,  163,   68,  163,   65,   70,   71,   72,
-+- /*   130 */    73,   74,   75,   76,   77,   78,   79,   80,   81,   82,
-+- /*   140 */   152,   84,   85,   86,   87,   88,   89,   90,   91,   92,
-+- /*   150 */    93,   94,   19,   97,   88,   89,  196,  101,  196,   26,
-+- /*   160 */   172,  173,   96,   97,   98,  210,  100,   22,  152,  108,
-+- /*   170 */   109,  110,   27,  107,   27,  109,  221,  222,  223,  219,
-+- /*   180 */   238,  219,   49,   50,  152,  169,  170,   54,  132,  133,
-+- /*   190 */   134,  228,  232,  171,  231,  207,  208,  237,  132,  237,
-+- /*   200 */   134,  179,   19,   70,   71,   72,   73,   74,   75,   76,
-+- /*   210 */    77,   78,   79,   80,   81,   82,  152,   84,   85,   86,
-+- /*   220 */    87,   88,   89,   90,   91,   92,   93,   94,   27,   65,
-+- /*   230 */    30,  152,   49,   50,   34,   52,   90,   91,   92,   93,
-+- /*   240 */    94,   96,   97,   98,   97,   22,  230,   27,   48,  217,
-+- /*   250 */    27,  172,  173,   70,   71,   72,   73,   74,   75,   76,
-+- /*   260 */    77,   78,   79,   80,   81,   82,  172,   84,   85,   86,
-+- /*   270 */    87,   88,   89,   90,   91,   92,   93,   94,   19,  148,
-+- /*   280 */   149,  152,  218,   24,  152,  154,  207,  156,  172,  152,
-+- /*   290 */    22,   68,   27,  152,  163,   27,  164,   96,   97,   98,
-+- /*   300 */    99,  172,  173,  102,  103,  104,  169,  170,   49,   50,
-+- /*   310 */    90,   88,   89,  152,  113,  186,   96,   97,   98,   96,
-+- /*   320 */    97,  160,   57,   27,  101,  164,  137,  196,  139,   70,
-+- /*   330 */    71,   72,   73,   74,   75,   76,   77,   78,   79,   80,
-+- /*   340 */    81,   82,   11,   84,   85,   86,   87,   88,   89,   90,
-+- /*   350 */    91,   92,   93,   94,   19,  132,  133,  134,   23,  218,
-+- /*   360 */   152,   96,   97,   98,   96,   97,   98,  230,   99,   22,
-+- /*   370 */   152,  102,  103,  104,   27,  244,  152,  152,   27,   26,
-+- /*   380 */   152,   22,  113,   65,   49,   50,   27,  194,  195,   58,
-+- /*   390 */   172,  173,   96,   97,   98,  185,   65,  172,  173,  206,
-+- /*   400 */   172,  173,  190,  191,  186,   70,   71,   72,   73,   74,
-+- /*   410 */    75,   76,   77,   78,   79,   80,   81,   82,  175,   84,
-+- /*   420 */    85,   86,   87,   88,   89,   90,   91,   92,   93,   94,
-+- /*   430 */    19,  175,  207,  208,   23,  207,  208,  119,  120,  108,
-+- /*   440 */   109,  110,   27,   96,   97,   98,  116,   96,   97,   98,
-+- /*   450 */   152,  121,  152,  179,  180,   96,   97,   98,  250,  106,
-+- /*   460 */    49,   50,  188,   19,  221,  222,  223,  168,  169,  170,
-+- /*   470 */   172,  173,  172,  173,  250,  124,  172,  221,  222,  223,
-+- /*   480 */    26,   70,   71,   72,   73,   74,   75,   76,   77,   78,
-+- /*   490 */    79,   80,   81,   82,   50,   84,   85,   86,   87,   88,
-+- /*   500 */    89,   90,   91,   92,   93,   94,   19,  207,  208,   12,
-+- /*   510 */    23,   96,   97,   98,  221,  222,  223,  194,  195,  152,
-+- /*   520 */   199,   23,   19,  225,   26,   28,  152,  152,  152,  206,
-+- /*   530 */   209,  164,  190,  191,  241,  152,   49,   50,  152,  124,
-+- /*   540 */   152,   44,  219,   46,  152,   21,  172,  173,  172,  173,
-+- /*   550 */   183,  107,  185,   16,  163,   58,  112,   70,   71,   72,
-+- /*   560 */    73,   74,   75,   76,   77,   78,   79,   80,   81,   82,
-+- /*   570 */   152,   84,   85,   86,   87,   88,   89,   90,   91,   92,
-+- /*   580 */    93,   94,   19,  207,  130,  152,   23,  196,   64,  152,
-+- /*   590 */   172,  173,   22,  152,   24,  152,   98,   27,   61,   96,
-+- /*   600 */    63,   26,  211,  212,  186,  172,  173,   49,   50,  172,
-+- /*   610 */   173,   23,   49,   50,   26,  172,  173,   88,   89,  186,
-+- /*   620 */    24,  238,  124,   27,  238,   22,   23,  103,  187,   26,
-+- /*   630 */   152,   73,   74,   70,   71,   72,   73,   74,   75,   76,
-+- /*   640 */    77,   78,   79,   80,   81,   82,  152,   84,   85,   86,
-+- /*   650 */    87,   88,   89,   90,   91,   92,   93,   94,   19,  101,
-+- /*   660 */   152,  132,   23,  134,  140,  152,   12,   97,   36,  168,
-+- /*   670 */   169,  170,   69,   98,  152,   22,   23,  140,   50,   26,
-+- /*   680 */   172,  173,   28,   51,  152,  172,  173,  193,   49,   50,
-+- /*   690 */    22,   59,   24,   97,  172,  173,  152,  152,   44,  124,
-+- /*   700 */    46,    0,    1,    2,  172,  173,   22,   23,   19,   70,
-+- /*   710 */    71,   72,   73,   74,   75,   76,   77,   78,   79,   80,
-+- /*   720 */    81,   82,   69,   84,   85,   86,   87,   88,   89,   90,
-+- /*   730 */    91,   92,   93,   94,  152,  107,  152,  193,   49,   50,
-+- /*   740 */   181,   22,   23,  111,  108,  109,  110,    7,    8,    9,
-+- /*   750 */    16,  247,  248,   69,  172,  173,  172,  173,  152,   70,
-+- /*   760 */    71,   72,   73,   74,   75,   76,   77,   78,   79,   80,
-+- /*   770 */    81,   82,  152,   84,   85,   86,   87,   88,   89,   90,
-+- /*   780 */    91,   92,   93,   94,   19,  152,  242,  152,   69,  152,
-+- /*   790 */   166,  167,  172,  173,   32,   61,  152,   63,  152,  193,
-+- /*   800 */   152,  152,  152,   41,  152,  172,  173,  172,  173,  172,
-+- /*   810 */   173,  152,  152,  152,   49,   50,  172,  173,  172,  173,
-+- /*   820 */   172,  173,  172,  173,  172,  173,  132,  138,  134,  152,
-+- /*   830 */   152,  172,  173,  172,  173,   70,   71,   72,   73,   74,
-+- /*   840 */    75,   76,   77,   78,   79,   80,   81,   82,  152,   84,
-+- /*   850 */    85,   86,   87,   88,   89,   90,   91,   92,   93,   94,
-+- /*   860 */    19,  152,   22,  152,  195,   24,  152,   27,  172,  173,
-+- /*   870 */   193,  193,  152,  152,  152,  206,  152,  217,  152,  152,
-+- /*   880 */   152,  172,  173,  172,  173,  152,  172,  173,  152,  152,
-+- /*   890 */    49,   50,  172,  173,  172,  173,  172,  173,  172,  173,
-+- /*   900 */   172,  173,  152,  138,  152,  172,  173,  108,  109,  110,
-+- /*   910 */    19,   70,   71,   72,   73,   74,   75,   76,   77,   78,
-+- /*   920 */    79,   80,   81,   82,  152,   84,   85,   86,   87,   88,
-+- /*   930 */    89,   90,   91,   92,   93,   94,  152,   97,  152,  152,
-+- /*   940 */    49,   50,   26,  193,  172,  173,  152,  152,  152,  146,
-+- /*   950 */   147,  132,  152,  134,  217,  181,  172,  173,  172,  173,
-+- /*   960 */    19,   70,   71,   72,   73,   74,   75,   76,   77,   78,
-+- /*   970 */    79,   80,   81,   82,  152,   84,   85,   86,   87,   88,
-+- /*   980 */    89,   90,   91,   92,   93,   94,  152,  193,  152,  193,
-+- /*   990 */    49,   50,  181,  193,  172,  173,  166,  167,  245,  246,
-+- /*  1000 */   211,  212,  152,   22,  217,  152,  172,  173,  172,  173,
-+- /*  1010 */    19,   70,   71,   72,   73,   74,   75,   76,   77,   78,
-+- /*  1020 */    79,   80,   81,   82,  152,   84,   85,   86,   87,   88,
-+- /*  1030 */    89,   90,   91,   92,   93,   94,  152,  187,  152,  123,
-+- /*  1040 */    49,   50,   23,   23,   23,   26,   26,   26,   23,   23,
-+- /*  1050 */    23,   26,   26,   26,    7,    8,  172,  173,  172,  173,
-+- /*  1060 */    19,   90,   71,   72,   73,   74,   75,   76,   77,   78,
-+- /*  1070 */    79,   80,   81,   82,  152,   84,   85,   86,   87,   88,
-+- /*  1080 */    89,   90,   91,   92,   93,   94,  152,  116,  152,  217,
-+- /*  1090 */    49,   50,  121,   23,  172,  173,   26,  100,  101,   27,
-+- /*  1100 */   101,   27,   23,  122,  152,   26,  172,  173,  172,  173,
-+- /*  1110 */   152,  112,  163,   72,   73,   74,   75,   76,   77,   78,
-+- /*  1120 */    79,   80,   81,   82,  163,   84,   85,   86,   87,   88,
-+- /*  1130 */    89,   90,   91,   92,   93,   94,   19,   20,  152,   22,
-+- /*  1140 */    23,  152,  163,   65,   27,  196,  163,   19,   20,   23,
-+- /*  1150 */    22,  213,   26,   19,   37,   27,  152,  196,  172,  173,
-+- /*  1160 */   152,  172,  173,   27,   23,   37,  152,   26,  152,   97,
-+- /*  1170 */   152,   97,  210,   56,  163,  196,  163,  163,  100,  196,
-+- /*  1180 */   172,  173,   65,  152,   56,   68,  172,  173,  172,  173,
-+- /*  1190 */   172,  173,  152,   65,  163,  163,   68,   23,  152,  234,
-+- /*  1200 */    26,  152,  152,  172,  173,   88,   89,  196,  152,  196,
-+- /*  1210 */   196,  152,   95,   96,   97,   98,   88,   89,  101,  152,
-+- /*  1220 */   152,  207,  208,   95,   96,   97,   98,  196,  196,  101,
-+- /*  1230 */    96,  233,  152,   97,  152,  152,   19,   20,  207,   22,
-+- /*  1240 */   152,  152,  152,  191,   27,  152,  152,  152,  152,  132,
-+- /*  1250 */   133,  134,  135,  136,   37,  152,  152,  152,  152,  152,
-+- /*  1260 */   132,  133,  134,  135,  136,  210,  197,  210,  210,  198,
-+- /*  1270 */   150,  184,  239,   56,  201,  214,  214,  201,  239,  180,
-+- /*  1280 */   214,  227,  198,   38,  176,   68,  175,  175,  175,  122,
-+- /*  1290 */   155,  200,  159,   19,   20,   40,   22,  159,  159,   22,
-+- /*  1300 */    70,   27,  130,  243,  240,   88,   89,   90,  189,   18,
-+- /*  1310 */   201,   37,   95,   96,   97,   98,  192,    5,  101,  192,
-+- /*  1320 */   220,  240,   10,   11,   12,   13,   14,  159,   18,   17,
-+- /*  1330 */    56,  158,  192,  201,  192,  220,  189,  189,  201,  159,
-+- /*  1340 */   158,  137,   68,   31,   45,   33,  236,  159,  159,  132,
-+- /*  1350 */   133,  134,  135,  136,   42,  158,  235,   22,  177,  159,
-+- /*  1360 */   158,  158,   88,   89,  159,  107,  174,   55,  177,   95,
-+- /*  1370 */    96,   97,   98,  174,   62,  101,   47,   65,   66,  106,
-+- /*  1380 */   174,  125,   19,   20,  174,   22,  177,  176,  174,  182,
-+- /*  1390 */    27,  216,  174,  174,  182,  107,  159,   22,  215,  215,
-+- /*  1400 */    37,  216,  216,  216,  137,  215,  132,  133,  134,  135,
-+- /*  1410 */   136,  215,  159,  177,   94,  177,  129,  224,  205,   56,
-+- /*  1420 */   226,  126,  128,  203,  229,  204,  114,  229,  127,  202,
-+- /*  1430 */   201,   68,   25,  162,   26,   13,  161,  153,  153,    6,
-+- /*  1440 */   151,  151,  178,  151,  165,  165,  178,  165,    4,    3,
-+- /*  1450 */   249,   88,   89,  141,   22,  142,   15,  249,   95,   96,
-+- /*  1460 */    97,   98,  246,   67,  101,   16,   23,  120,   23,  131,
-+- /*  1470 */   111,  123,   20,   16,  125,    1,  123,  131,   78,   78,
-+- /*  1480 */    78,   78,  111,   96,  122,   35,    1,    5,   22,  107,
-+- /*  1490 */   140,   53,   53,   26,   60,  132,  133,  134,  135,  136,
-+- /*  1500 */   107,   43,   24,   20,  112,   19,   22,   52,   52,  105,
-+- /*  1510 */    22,   22,   52,   23,   22,   22,   29,   23,   39,   23,
-+- /*  1520 */    23,   26,  116,   22,   26,   23,   22,  122,   23,   23,
-+- /*  1530 */    22,   96,   11,  124,   35,   26,   26,   23,   35,   23,
-+- /*  1540 */    23,   23,   35,   23,   22,   26,   23,   22,   24,  122,
-+- /*  1550 */    23,   22,   26,   22,   24,   23,   23,   23,   22,  122,
-+- /*  1560 */    23,   15,  122,    1,  122,
-++ /*     0 */    19,  144,  145,  146,  147,   24,   90,   91,   92,   93,
-++ /*    10 */    94,   54,   55,   56,   57,   58,   88,   89,   90,   91,
-++ /*    20 */    92,   93,   94,  152,   43,   44,   45,   46,   47,   48,
-++ /*    30 */    49,   50,   51,   52,   53,   54,   55,   56,   57,   94,
-++ /*    40 */    59,   84,   85,   86,   87,   88,   89,   90,   91,   92,
-++ /*    50 */    93,   94,   59,   84,   85,   86,   87,   88,   89,   90,
-++ /*    60 */    91,   92,   93,   94,  193,   84,   85,   86,   87,   88,
-++ /*    70 */    89,   90,   91,   92,   93,   94,  194,  195,   97,   79,
-++ /*    80 */    11,   88,   89,  152,   26,   19,  171,  152,  206,   96,
-++ /*    90 */    97,   98,   72,  100,  179,   59,  152,   31,  163,   79,
-++ /*   100 */   107,  219,  109,  172,  173,   39,   79,  172,  173,   43,
-++ /*   110 */    44,   45,   46,   47,   48,   49,   50,   51,   52,   53,
-++ /*   120 */    54,   55,   56,   57,  152,  132,  199,  134,  108,  109,
-++ /*   130 */   110,  196,   96,   97,   98,   99,  209,   19,  102,  103,
-++ /*   140 */   104,   72,  207,  208,   26,   72,  119,  120,   79,  113,
-++ /*   150 */    84,   85,   86,   87,   88,   89,   90,   91,   92,   93,
-++ /*   160 */    94,   43,   44,   45,   46,   47,   48,   49,   50,   51,
-++ /*   170 */    52,   53,   54,   55,   56,   57,   31,  108,  109,  110,
-++ /*   180 */    82,  108,  109,  110,   39,  210,   68,  175,  130,   19,
-++ /*   190 */   218,  175,  119,  120,  250,   97,  221,  222,  223,  101,
-++ /*   200 */   172,  152,   84,   85,   86,   87,   88,   89,   90,   91,
-++ /*   210 */    92,   93,   94,   43,   44,   45,   46,   47,   48,   49,
-++ /*   220 */    50,   51,   52,   53,   54,   55,   56,   57,  152,  152,
-++ /*   230 */   132,  133,  134,  221,  222,  223,   66,  221,  222,  223,
-++ /*   240 */   172,   19,  193,   22,   23,  152,   24,   26,  172,  173,
-++ /*   250 */    46,   47,   48,   49,   84,   85,   86,   87,   88,   89,
-++ /*   260 */    90,   91,   92,   93,   94,   43,   44,   45,   46,   47,
-++ /*   270 */    48,   49,   50,   51,   52,   53,   54,   55,   56,   57,
-++ /*   280 */   221,  222,  223,  207,  208,   46,   22,   23,  148,  149,
-++ /*   290 */    26,  242,  172,   19,  154,  218,  156,   23,   88,   89,
-++ /*   300 */   241,   59,  163,  163,   83,  101,   84,   85,   86,   87,
-++ /*   310 */    88,   89,   90,   91,   92,   93,   94,   43,   44,   45,
-++ /*   320 */    46,   47,   48,   49,   50,   51,   52,   53,   54,   55,
-++ /*   330 */    56,   57,  152,  157,  152,  196,  196,   16,   96,   97,
-++ /*   340 */    98,   26,  132,  250,  134,   19,  107,   83,   59,   23,
-++ /*   350 */   211,  212,  172,  173,  172,  173,    1,    2,   84,   85,
-++ /*   360 */    86,   87,   88,   89,   90,   91,   92,   93,   94,   43,
-++ /*   370 */    44,   45,   46,   47,   48,   49,   50,   51,   52,   53,
-++ /*   380 */    54,   55,   56,   57,  244,  152,   97,  207,  208,  207,
-++ /*   390 */   208,  185,  221,  222,  223,  152,   75,   19,   77,  179,
-++ /*   400 */   180,   23,   93,   94,  228,  172,  173,  231,  188,  152,
-++ /*   410 */    84,   85,   86,   87,   88,   89,   90,   91,   92,   93,
-++ /*   420 */    94,   43,   44,   45,   46,   47,   48,   49,   50,   51,
-++ /*   430 */    52,   53,   54,   55,   56,   57,  193,  152,  123,  152,
-++ /*   440 */   207,  208,  152,  168,  169,  170,  168,  169,  170,   19,
-++ /*   450 */   160,   22,   23,   23,  164,  119,  120,  172,  173,  172,
-++ /*   460 */   173,  140,   84,   85,   86,   87,   88,   89,   90,   91,
-++ /*   470 */    92,   93,   94,   43,   44,   45,   46,   47,   48,   49,
-++ /*   480 */    50,   51,   52,   53,   54,   55,   56,   57,   99,   22,
-++ /*   490 */    23,  102,  103,  104,  194,  195,    0,    1,    2,  247,
-++ /*   500 */   248,   19,  113,  190,  191,   23,  206,  190,  191,   59,
-++ /*   510 */   225,  152,   83,  152,   84,   85,   86,   87,   88,   89,
-++ /*   520 */    90,   91,   92,   93,   94,   43,   44,   45,   46,   47,
-++ /*   530 */    48,   49,   50,   51,   52,   53,   54,   55,   56,   57,
-++ /*   540 */    90,  181,  152,  108,  109,  110,   96,   97,   98,  115,
-++ /*   550 */    83,  117,  118,   19,  193,  152,   23,  152,  152,   26,
-++ /*   560 */    29,  152,  172,  173,   33,  152,   84,   85,   86,   87,
-++ /*   570 */    88,   89,   90,   91,   92,   93,   94,   43,   44,   45,
-++ /*   580 */    46,   47,   48,   49,   50,   51,   52,   53,   54,   55,
-++ /*   590 */    56,   57,   22,  152,   16,   64,  193,  207,  152,  193,
-++ /*   600 */    12,    7,    8,    9,  152,  108,  109,  110,   19,  152,
-++ /*   610 */   164,  146,  147,  172,  173,   27,  163,  181,   84,   85,
-++ /*   620 */    86,   87,   88,   89,   90,   91,   92,   93,   94,   59,
-++ /*   630 */    42,   98,   43,   44,   45,   46,   47,   48,   49,   50,
-++ /*   640 */    51,   52,   53,   54,   55,   56,   57,  238,   22,  196,
-++ /*   650 */    62,  163,   82,   75,  152,   77,  152,  124,   88,   89,
-++ /*   660 */    72,  152,  137,   19,  139,  152,   96,   97,   24,  152,
-++ /*   670 */   152,  101,  138,   84,   85,   86,   87,   88,   89,   90,
-++ /*   680 */    91,   92,   93,   94,  196,   59,   19,   43,   44,   45,
-++ /*   690 */    46,   47,   48,   49,   50,   51,   52,   53,   54,   55,
-++ /*   700 */    56,   57,  132,  133,  134,  152,  193,  219,  245,  246,
-++ /*   710 */   193,  152,  152,   46,  152,   19,  166,  167,  152,  217,
-++ /*   720 */   232,  217,   96,   97,   98,  237,  217,  138,   84,   85,
-++ /*   730 */    86,   87,   88,   89,   90,   91,   92,   93,   94,   43,
-++ /*   740 */    44,   45,   46,   47,   48,   49,   50,   51,   52,   53,
-++ /*   750 */    54,   55,   56,   57,   79,  193,  238,  166,  167,  211,
-++ /*   760 */   212,   23,   23,  116,   26,   26,  195,   19,  121,  152,
-++ /*   770 */   217,  152,  152,  152,  107,  100,  217,  206,  163,  112,
-++ /*   780 */    84,   85,   86,   87,   88,   89,   90,   91,   92,   93,
-++ /*   790 */    94,   43,   44,   45,   46,   47,   48,   49,   50,   51,
-++ /*   800 */    52,   53,   54,   55,   56,   57,  187,  187,    7,    8,
-++ /*   810 */   152,  196,   22,  132,   24,  134,   23,   23,   19,   26,
-++ /*   820 */    26,   23,  152,   23,   26,   23,   26,   59,   26,  163,
-++ /*   830 */   172,  173,   84,   85,   86,   87,   88,   89,   90,   91,
-++ /*   840 */    92,   93,   94,   44,   45,   46,   47,   48,   49,   50,
-++ /*   850 */    51,   52,   53,   54,   55,   56,   57,  152,   26,  238,
-++ /*   860 */   152,   23,  196,  101,   26,   97,  100,  101,   19,   19,
-++ /*   870 */    23,   59,  152,   26,  112,  152,   23,  172,  173,   26,
-++ /*   880 */   172,  173,   19,   84,   85,   86,   87,   88,   89,   90,
-++ /*   890 */    91,   92,   93,   94,   45,   46,   47,   48,   49,   50,
-++ /*   900 */    51,   52,   53,   54,   55,   56,   57,   19,   20,   97,
-++ /*   910 */    22,   23,  207,  163,   23,  163,  132,   26,  134,   23,
-++ /*   920 */   213,  152,   26,   59,   36,  152,   22,  152,   19,   20,
-++ /*   930 */    98,   22,  152,   84,   85,   86,   87,   88,   89,   90,
-++ /*   940 */    91,   92,   93,   94,   94,   36,  196,   59,  196,   99,
-++ /*   950 */   100,  101,  102,  103,  104,  105,  124,   59,   70,   96,
-++ /*   960 */   163,   97,  112,   59,  181,  152,  152,   79,   59,   71,
-++ /*   970 */    82,   19,   26,  152,  152,  152,   88,   89,  152,   70,
-++ /*   980 */    22,  152,  163,   95,   96,   97,   98,  152,   79,  101,
-++ /*   990 */    22,   82,  152,  196,   96,   97,   98,   88,   89,   19,
-++ /*  1000 */    20,   97,   22,  163,   95,   96,   97,   98,  152,   22,
-++ /*  1010 */   101,   24,  172,  173,  152,  196,   36,   59,   22,  152,
-++ /*  1020 */   132,  133,  134,  135,  136,   24,    5,   59,  172,  173,
-++ /*  1030 */   152,   10,   11,   12,   13,   14,  196,  152,   17,   59,
-++ /*  1040 */   210,  132,  133,  134,  135,  136,   59,  207,   96,   22,
-++ /*  1050 */    70,   30,  106,   32,   96,   97,   98,  172,  173,  152,
-++ /*  1060 */    59,   40,   82,  152,   96,   97,   98,  152,   88,   89,
-++ /*  1070 */    90,  186,   59,   22,  191,   95,   96,   97,   98,  172,
-++ /*  1080 */   173,  101,   19,   20,   97,   22,   59,  152,  152,  152,
-++ /*  1090 */    69,   59,  152,  186,  152,  152,  152,   76,   97,   36,
-++ /*  1100 */    79,   80,   19,   20,   53,   22,  152,  172,  173,   96,
-++ /*  1110 */    97,   98,  132,  133,  134,  135,  136,   35,  122,   36,
-++ /*  1120 */   234,  186,   59,   96,   97,   98,  172,  173,   96,   97,
-++ /*  1130 */    98,  152,  233,   70,  152,  114,  152,  124,  210,  210,
-++ /*  1140 */   186,  210,   59,  198,  197,   82,  214,   65,  150,  152,
-++ /*  1150 */   201,   88,   89,   70,  201,   73,  124,  239,   95,   96,
-++ /*  1160 */    97,   98,  141,  239,  101,   82,  169,  170,  176,  152,
-++ /*  1170 */   152,   88,   89,   21,   54,   55,   56,   57,   95,   96,
-++ /*  1180 */    97,   98,  164,  214,  101,  214,  169,  170,  163,  184,
-++ /*  1190 */   180,  175,  227,  111,  175,  132,  133,  134,  135,  136,
-++ /*  1200 */   200,  183,  152,  185,   84,   85,   86,   87,   88,   89,
-++ /*  1210 */    90,   91,   92,   93,   94,  132,  133,  134,  135,  136,
-++ /*  1220 */    12,  196,  172,  173,  175,  152,  198,  230,  152,  155,
-++ /*  1230 */    78,  152,  243,  152,   60,   27,  152,  159,  152,  159,
-++ /*  1240 */   152,  122,   38,  152,  219,  172,  173,  230,  172,  173,
-++ /*  1250 */    42,  172,  173,  172,  173,  103,  172,  173,  172,  173,
-++ /*  1260 */   172,  173,  237,  172,  173,  152,  240,  152,  159,  152,
-++ /*  1270 */    62,  240,   22,  220,  152,   43,  152,  130,  152,  189,
-++ /*  1280 */   152,   18,  152,   18,  192,  172,  173,  172,  173,  172,
-++ /*  1290 */   173,  192,  140,  152,  172,  173,  172,  173,  172,  173,
-++ /*  1300 */   172,  173,  172,  173,  201,  152,  192,  159,  152,  158,
-++ /*  1310 */   192,  152,  201,  172,  173,  152,  220,  152,  189,  152,
-++ /*  1320 */   189,  159,  152,  137,  152,  172,  173,  152,  172,  173,
-++ /*  1330 */   152,  172,  173,  152,  201,  172,  173,  172,  173,  172,
-++ /*  1340 */   173,  152,  172,  173,  172,  173,  152,  172,  173,  152,
-++ /*  1350 */   172,  173,  152,  172,  173,  152,   90,  152,   61,  152,
-++ /*  1360 */   158,  172,  173,  152,  158,  152,  172,  173,  152,  172,
-++ /*  1370 */   173,  152,  172,  173,  236,  172,  173,  172,  173,  172,
-++ /*  1380 */   173,  235,  116,  172,  173,  172,  173,  121,  172,  173,
-++ /*  1390 */   159,  172,  173,  159,   22,  177,  159,  158,  177,  159,
-++ /*  1400 */   158,  107,  174,  174,  174,   63,  182,  106,  182,  174,
-++ /*  1410 */   177,  125,  176,  107,  216,  174,  215,  174,  174,  159,
-++ /*  1420 */    22,  159,  137,  224,  177,  216,  216,  215,   94,  215,
-++ /*  1430 */   177,  216,  215,  129,  126,  128,  127,   25,  162,   26,
-++ /*  1440 */   161,   13,  153,  205,  153,    6,  226,  151,  202,  204,
-++ /*  1450 */   201,  229,  229,  151,  203,  165,  151,  165,  178,  178,
-++ /*  1460 */   165,    4,    3,   22,  142,   15,   81,   16,   23,   23,
-++ /*  1470 */   120,  131,  111,   20,  249,  123,  249,   16,  125,    1,
-++ /*  1480 */   123,  111,  131,   53,   53,   53,   53,   96,   34,  122,
-++ /*  1490 */     1,    5,   22,  107,  246,  140,   67,   26,   74,   41,
-++ /*  1500 */   107,   67,   20,   24,   19,  105,  112,   23,   66,   22,
-++ /*  1510 */    22,   28,   22,   22,   66,   22,   22,   37,   66,   23,
-++ /*  1520 */    23,   23,  116,   23,   22,   26,  122,   26,   23,   23,
-++ /*  1530 */    22,   96,  124,   26,   23,   26,   23,   34,   34,   23,
-++ /*  1540 */    23,   26,   23,   22,   34,   11,   23,   22,   24,  122,
-++ /*  1550 */    23,   22,   26,   22,   24,   23,   23,   15,   23,   22,
-++ /*  1560 */   122,   23,  122,    1,  251,  122,
-+ };
-+-#define YY_SHIFT_USE_DFLT (1565)
-++#define YY_SHIFT_USE_DFLT (1566)
-+ #define YY_SHIFT_COUNT    (454)
-+-#define YY_SHIFT_MIN      (-114)
-++#define YY_SHIFT_MIN      (-84)
-+ #define YY_SHIFT_MAX      (1562)
-+ static const short yy_shift_ofst[] = {
-+- /*     0 */     5, 1117, 1312, 1128, 1274, 1274, 1274, 1274,   61,  -19,
-+- /*    10 */    57,   57,  183, 1274, 1274, 1274, 1274, 1274, 1274, 1274,
-+- /*    20 */    66,   66,  201,  -29,  331,  318,  133,  259,  335,  411,
-+- /*    30 */   487,  563,  639,  689,  765,  841,  891,  891,  891,  891,
-+- /*    40 */   891,  891,  891,  891,  891,  891,  891,  891,  891,  891,
-+- /*    50 */   891,  891,  891,  941,  891,  991, 1041, 1041, 1217, 1274,
-+- /*    60 */  1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274,
-+- /*    70 */  1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274,
-+- /*    80 */  1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274,
-+- /*    90 */  1363, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274,
-+- /*   100 */  1274, 1274, 1274, 1274,  -70,  -47,  -47,  -47,  -47,  -47,
-+- /*   110 */    24,   11,  146,  296,  524,  444,  529,  529,  296,    3,
-+- /*   120 */     2,  -30, 1565, 1565, 1565,  -17,  -17,  -17,  145,  145,
-+- /*   130 */   497,  497,  265,  603,  653,  296,  296,  296,  296,  296,
-+- /*   140 */   296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
-+- /*   150 */   296,  296,  296,  296,  296,  701, 1078,  147,  147,    2,
-+- /*   160 */   164,  164,  164,  164,  164,  164, 1565, 1565, 1565,  223,
-+- /*   170 */    56,   56,  268,  269,  220,  347,  351,  415,  359,  296,
-+- /*   180 */   296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
-+- /*   190 */   296,  296,  296,  296,  296,  632,  632,  632,  296,  296,
-+- /*   200 */   498,  296,  296,  296,  570,  296,  296,  654,  296,  296,
-+- /*   210 */   296,  296,  296,  296,  296,  296,  296,  296,  636,  200,
-+- /*   220 */   596,  596,  596,  575, -114,  971,  740,  454,  503,  503,
-+- /*   230 */  1134,  454, 1134,  353,  588,  628,  762,  503,  189,  762,
-+- /*   240 */   762,  916,  330,  668, 1245, 1167, 1167, 1255, 1255, 1167,
-+- /*   250 */  1277, 1230, 1172, 1291, 1291, 1291, 1291, 1167, 1310, 1172,
-+- /*   260 */  1277, 1230, 1230, 1172, 1167, 1310, 1204, 1299, 1167, 1167,
-+- /*   270 */  1310, 1335, 1167, 1310, 1167, 1310, 1335, 1258, 1258, 1258,
-+- /*   280 */  1329, 1335, 1258, 1273, 1258, 1329, 1258, 1258, 1256, 1288,
-+- /*   290 */  1256, 1288, 1256, 1288, 1256, 1288, 1167, 1375, 1167, 1267,
-+- /*   300 */  1335, 1320, 1320, 1335, 1287, 1295, 1294, 1301, 1172, 1407,
-+- /*   310 */  1408, 1422, 1422, 1433, 1433, 1433, 1565, 1565, 1565, 1565,
-+- /*   320 */  1565, 1565, 1565, 1565,  558,  537,  684,  719,  734,  799,
-+- /*   330 */   840, 1019,   14, 1020, 1021, 1025, 1026, 1027, 1070, 1072,
-+- /*   340 */   997, 1047,  999, 1079, 1126, 1074, 1141,  694,  819, 1174,
-+- /*   350 */  1136,  981, 1444, 1446, 1432, 1313, 1441, 1396, 1449, 1443,
-+- /*   360 */  1445, 1347, 1338, 1359, 1348, 1452, 1349, 1457, 1474, 1353,
-+- /*   370 */  1346, 1400, 1401, 1402, 1403, 1371, 1387, 1450, 1362, 1485,
-+- /*   380 */  1482, 1466, 1382, 1350, 1438, 1467, 1439, 1434, 1458, 1393,
-+- /*   390 */  1478, 1483, 1486, 1392, 1404, 1484, 1455, 1488, 1489, 1490,
-+- /*   400 */  1492, 1456, 1487, 1493, 1460, 1479, 1494, 1496, 1497, 1495,
-+- /*   410 */  1406, 1501, 1502, 1504, 1498, 1405, 1505, 1506, 1435, 1499,
-+- /*   420 */  1508, 1409, 1509, 1503, 1510, 1507, 1514, 1509, 1516, 1517,
-+- /*   430 */  1518, 1519, 1520, 1522, 1521, 1523, 1525, 1524, 1526, 1527,
-+- /*   440 */  1529, 1530, 1526, 1532, 1531, 1533, 1534, 1536, 1427, 1437,
-+- /*   450 */  1440, 1442, 1537, 1546, 1562,
-++ /*     0 */   355,  888, 1021,  909, 1063, 1063, 1063, 1063,   20,  -19,
-++ /*    10 */    66,   66,  170, 1063, 1063, 1063, 1063, 1063, 1063, 1063,
-++ /*    20 */    -7,   -7,   36,   73,   69,   27,  118,  222,  274,  326,
-++ /*    30 */   378,  430,  482,  534,  589,  644,  696,  696,  696,  696,
-++ /*    40 */   696,  696,  696,  696,  696,  696,  696,  696,  696,  696,
-++ /*    50 */   696,  696,  696,  748,  696,  799,  849,  849,  980, 1063,
-++ /*    60 */  1063, 1063, 1063, 1063, 1063, 1063, 1063, 1063, 1063, 1063,
-++ /*    70 */  1063, 1063, 1063, 1063, 1063, 1063, 1063, 1063, 1063, 1063,
-++ /*    80 */  1063, 1063, 1063, 1063, 1063, 1063, 1063, 1063, 1063, 1063,
-++ /*    90 */  1083, 1063, 1063, 1063, 1063, 1063, 1063, 1063, 1063, 1063,
-++ /*   100 */  1063, 1063, 1063, 1063,  -43, 1120, 1120, 1120, 1120, 1120,
-++ /*   110 */   -31,  -72,  -84,  242, 1152,  667,  210,  210,  242,  309,
-++ /*   120 */   336,  -55, 1566, 1566, 1566,  850,  850,  850,  626,  626,
-++ /*   130 */   588,  588,  898,  221,  264,  242,  242,  242,  242,  242,
-++ /*   140 */   242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
-++ /*   150 */   242,  242,  242,  242,  242,  496,  675,  289,  289,  336,
-++ /*   160 */     0,    0,    0,    0,    0,    0, 1566, 1566, 1566,  570,
-++ /*   170 */    98,   98,  958,  389,  450,  968, 1013, 1032, 1027,  242,
-++ /*   180 */   242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
-++ /*   190 */   242,  242,  242,  242,  242, 1082, 1082, 1082,  242,  242,
-++ /*   200 */   533,  242,  242,  242,  987,  242,  242, 1208,  242,  242,
-++ /*   210 */   242,  242,  242,  242,  242,  242,  242,  242,  435,  531,
-++ /*   220 */  1001, 1001, 1001,  832,  434, 1266,  594,   58,  863,  863,
-++ /*   230 */   952,   58,  952,  946,  738,  239,  145,  863,  525,  145,
-++ /*   240 */   145,  315,  647,  790, 1174, 1119, 1119, 1204, 1204, 1119,
-++ /*   250 */  1250, 1232, 1147, 1263, 1263, 1263, 1263, 1119, 1265, 1147,
-++ /*   260 */  1250, 1232, 1232, 1147, 1119, 1265, 1186, 1297, 1119, 1119,
-++ /*   270 */  1265, 1372, 1119, 1265, 1119, 1265, 1372, 1294, 1294, 1294,
-++ /*   280 */  1342, 1372, 1294, 1301, 1294, 1342, 1294, 1294, 1286, 1306,
-++ /*   290 */  1286, 1306, 1286, 1306, 1286, 1306, 1119, 1398, 1119, 1285,
-++ /*   300 */  1372, 1334, 1334, 1372, 1304, 1308, 1307, 1309, 1147, 1412,
-++ /*   310 */  1413, 1428, 1428, 1439, 1439, 1439, 1566, 1566, 1566, 1566,
-++ /*   320 */  1566, 1566, 1566, 1566,  204,  321,  429,  467,  578,  497,
-++ /*   330 */   904,  739, 1051,  793,  794,  798,  800,  802,  838,  768,
-++ /*   340 */   766,  801,  762,  847,  853,  812,  891,  681,  784,  896,
-++ /*   350 */   864,  996, 1457, 1459, 1441, 1322, 1450, 1385, 1451, 1445,
-++ /*   360 */  1446, 1350, 1340, 1361, 1352, 1453, 1353, 1461, 1478, 1357,
-++ /*   370 */  1351, 1430, 1431, 1432, 1433, 1370, 1391, 1454, 1367, 1489,
-++ /*   380 */  1486, 1470, 1386, 1355, 1429, 1471, 1434, 1424, 1458, 1393,
-++ /*   390 */  1479, 1482, 1485, 1394, 1400, 1487, 1442, 1488, 1490, 1484,
-++ /*   400 */  1491, 1448, 1483, 1493, 1452, 1480, 1496, 1497, 1498, 1499,
-++ /*   410 */  1406, 1494, 1500, 1502, 1501, 1404, 1505, 1506, 1435, 1503,
-++ /*   420 */  1508, 1408, 1507, 1504, 1509, 1510, 1511, 1507, 1513, 1516,
-++ /*   430 */  1517, 1515, 1519, 1521, 1534, 1523, 1525, 1524, 1526, 1527,
-++ /*   440 */  1529, 1530, 1526, 1532, 1531, 1533, 1535, 1537, 1427, 1438,
-++ /*   450 */  1440, 1443, 1538, 1542, 1562,
-+ };
-+-#define YY_REDUCE_USE_DFLT (-174)
-++#define YY_REDUCE_USE_DFLT (-144)
-+ #define YY_REDUCE_COUNT (323)
-+-#define YY_REDUCE_MIN   (-173)
-+-#define YY_REDUCE_MAX   (1292)
-++#define YY_REDUCE_MIN   (-143)
-++#define YY_REDUCE_MAX   (1305)
-+ static const short yy_reduce_ofst[] = {
-+- /*     0 */  -119, 1014,  131, 1031,  -12,  225,  228,  300,  -40,  -45,
-+- /*    10 */   243,  256,  293,  129,  218,  418,   79,  376,  433,  298,
-+- /*    20 */    16,  137,  367,  323,  -38,  391, -173, -173, -173, -173,
-+- /*    30 */  -173, -173, -173, -173, -173, -173, -173, -173, -173, -173,
-+- /*    40 */  -173, -173, -173, -173, -173, -173, -173, -173, -173, -173,
-+- /*    50 */  -173, -173, -173, -173, -173, -173, -173, -173,  374,  437,
-+- /*    60 */   443,  508,  513,  522,  532,  582,  584,  620,  633,  635,
-+- /*    70 */   637,  644,  646,  648,  650,  652,  659,  661,  696,  709,
-+- /*    80 */   711,  714,  720,  722,  724,  726,  728,  733,  772,  784,
-+- /*    90 */   786,  822,  834,  836,  884,  886,  922,  934,  936,  986,
-+- /*   100 */   989, 1008, 1016, 1018, -173, -173, -173, -173, -173, -173,
-+- /*   110 */  -173, -173, -173,  544,  -37,  274,  299,  501,  161, -173,
-+- /*   120 */   193, -173, -173, -173, -173,   22,   22,   22,   64,  141,
-+- /*   130 */   212,  342,  208,  504,  504,  132,  494,  606,  677,  678,
-+- /*   140 */   750,  794,  796,  -58,   32,  383,  660,  737,  386,  787,
-+- /*   150 */   800,  441,  872,  224,  850,  803,  949,  624,  830,  669,
-+- /*   160 */   961,  979,  983, 1011, 1013, 1032,  753,  789,  321,   94,
-+- /*   170 */   116,  304,  375,  210,  388,  392,  478,  545,  649,  721,
-+- /*   180 */   727,  736,  752,  795,  853,  952,  958, 1004, 1040, 1046,
-+- /*   190 */  1049, 1050, 1056, 1059, 1067,  559,  774,  811, 1068, 1080,
-+- /*   200 */   938, 1082, 1083, 1088,  962, 1089, 1090, 1052, 1093, 1094,
-+- /*   210 */  1095,  388, 1096, 1103, 1104, 1105, 1106, 1107,  965,  998,
-+- /*   220 */  1055, 1057, 1058,  938, 1069, 1071, 1120, 1073, 1061, 1062,
-+- /*   230 */  1033, 1076, 1039, 1108, 1087, 1099, 1111, 1066, 1054, 1112,
-+- /*   240 */  1113, 1091, 1084, 1135, 1060, 1133, 1138, 1064, 1081, 1139,
-+- /*   250 */  1100, 1119, 1109, 1124, 1127, 1140, 1142, 1168, 1173, 1132,
-+- /*   260 */  1115, 1147, 1148, 1137, 1180, 1182, 1110, 1121, 1188, 1189,
-+- /*   270 */  1197, 1181, 1200, 1202, 1205, 1203, 1191, 1192, 1199, 1206,
-+- /*   280 */  1207, 1209, 1210, 1211, 1214, 1212, 1218, 1219, 1175, 1183,
-+- /*   290 */  1185, 1184, 1186, 1190, 1187, 1196, 1237, 1193, 1253, 1194,
-+- /*   300 */  1236, 1195, 1198, 1238, 1213, 1221, 1220, 1227, 1229, 1271,
-+- /*   310 */  1275, 1284, 1285, 1289, 1290, 1292, 1201, 1208, 1216, 1279,
-+- /*   320 */  1280, 1264, 1268, 1282,
-++ /*     0 */  -143,  -65,  140,  840,   76,  180,  182,  233,  488,  -25,
-++ /*    10 */    12,   16,   59,  885,  907,  935,  390,  705,  954,  285,
-++ /*    20 */   997, 1017, 1018, -118, 1025,  139,  171,  171,  171,  171,
-++ /*    30 */   171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
-++ /*    40 */   171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
-++ /*    50 */   171,  171,  171,  171,  171,  171,  171,  171,  -69,  287,
-++ /*    60 */   441,  658,  708,  856, 1050, 1073, 1076, 1079, 1081, 1084,
-++ /*    70 */  1086, 1088, 1091, 1113, 1115, 1117, 1122, 1124, 1126, 1128,
-++ /*    80 */  1130, 1141, 1153, 1156, 1159, 1163, 1165, 1167, 1170, 1172,
-++ /*    90 */  1175, 1178, 1181, 1189, 1194, 1197, 1200, 1203, 1205, 1207,
-++ /*   100 */  1211, 1213, 1216, 1219,  171,  171,  171,  171,  171,  171,
-++ /*   110 */   171,  171,  171,   49,  176,  220,  275,  278,  290,  171,
-++ /*   120 */   300,  171,  171,  171,  171,  -85,  -85,  -85,  -28,   77,
-++ /*   130 */   313,  317,  -56,  252,  252,  446, -129,  243,  361,  403,
-++ /*   140 */   406,  513,  517,  409,  502,  518,  504,  509,  621,  553,
-++ /*   150 */   562,  619,  559,   93,  620,  465,  453,  550,  591,  571,
-++ /*   160 */   615,  666,  750,  752,  797,  819,  463,  548,  -73,   28,
-++ /*   170 */    68,  120,  257,  206,  359,  405,  413,  452,  457,  560,
-++ /*   180 */   566,  617,  670,  720,  723,  769,  773,  775,  780,  813,
-++ /*   190 */   814,  821,  822,  823,  826,  360,  436,  783,  829,  835,
-++ /*   200 */   707,  862,  867,  878,  830,  911,  915,  883,  936,  937,
-++ /*   210 */   940,  359,  942,  943,  944,  979,  982,  984,  886,  899,
-++ /*   220 */   928,  929,  931,  707,  947,  945,  998,  949,  932,  969,
-++ /*   230 */   918,  953,  924,  992, 1005, 1010, 1016,  971,  965, 1019,
-++ /*   240 */  1049, 1000, 1028, 1074,  989, 1078, 1080, 1026, 1031, 1109,
-++ /*   250 */  1053, 1090, 1103, 1092, 1099, 1114, 1118, 1148, 1151, 1111,
-++ /*   260 */  1096, 1129, 1131, 1133, 1162, 1202, 1138, 1146, 1231, 1234,
-++ /*   270 */  1206, 1218, 1237, 1239, 1240, 1242, 1221, 1228, 1229, 1230,
-++ /*   280 */  1224, 1233, 1235, 1236, 1241, 1226, 1243, 1244, 1198, 1201,
-++ /*   290 */  1209, 1212, 1210, 1214, 1215, 1217, 1260, 1199, 1262, 1220,
-++ /*   300 */  1247, 1222, 1223, 1253, 1238, 1245, 1251, 1246, 1249, 1276,
-++ /*   310 */  1279, 1289, 1291, 1296, 1302, 1305, 1225, 1227, 1248, 1290,
-++ /*   320 */  1292, 1280, 1281, 1295,
-+ };
-+ static const YYACTIONTYPE yy_default[] = {
-+  /*     0 */  1270, 1260, 1260, 1260, 1193, 1193, 1193, 1193, 1260, 1088,
-+@@ -137572,73 +137940,87 @@ static const YYACTIONTYPE yy_default[] = {
-+ static const YYCODETYPE yyFallback[] = {
-+     0,  /*          $ => nothing */
-+     0,  /*       SEMI => nothing */
-+-   27,  /*    EXPLAIN => ID */
-+-   27,  /*      QUERY => ID */
-+-   27,  /*       PLAN => ID */
-+-   27,  /*      BEGIN => ID */
-++   59,  /*    EXPLAIN => ID */
-++   59,  /*      QUERY => ID */
-++   59,  /*       PLAN => ID */
-++   59,  /*      BEGIN => ID */
-+     0,  /* TRANSACTION => nothing */
-+-   27,  /*   DEFERRED => ID */
-+-   27,  /*  IMMEDIATE => ID */
-+-   27,  /*  EXCLUSIVE => ID */
-++   59,  /*   DEFERRED => ID */
-++   59,  /*  IMMEDIATE => ID */
-++   59,  /*  EXCLUSIVE => ID */
-+     0,  /*     COMMIT => nothing */
-+-   27,  /*        END => ID */
-+-   27,  /*   ROLLBACK => ID */
-+-   27,  /*  SAVEPOINT => ID */
-+-   27,  /*    RELEASE => ID */
-++   59,  /*        END => ID */
-++   59,  /*   ROLLBACK => ID */
-++   59,  /*  SAVEPOINT => ID */
-++   59,  /*    RELEASE => ID */
-+     0,  /*         TO => nothing */
-+     0,  /*      TABLE => nothing */
-+     0,  /*     CREATE => nothing */
-+-   27,  /*         IF => ID */
-++   59,  /*         IF => ID */
-+     0,  /*        NOT => nothing */
-+     0,  /*     EXISTS => nothing */
-+-   27,  /*       TEMP => ID */
-++   59,  /*       TEMP => ID */
-+     0,  /*         LP => nothing */
-+     0,  /*         RP => nothing */
-+     0,  /*         AS => nothing */
-+-   27,  /*    WITHOUT => ID */
-++   59,  /*    WITHOUT => ID */
-+     0,  /*      COMMA => nothing */
-++   59,  /*      ABORT => ID */
-++   59,  /*     ACTION => ID */
-++   59,  /*      AFTER => ID */
-++   59,  /*    ANALYZE => ID */
-++   59,  /*        ASC => ID */
-++   59,  /*     ATTACH => ID */
-++   59,  /*     BEFORE => ID */
-++   59,  /*         BY => ID */
-++   59,  /*    CASCADE => ID */
-++   59,  /*       CAST => ID */
-++   59,  /*   CONFLICT => ID */
-++   59,  /*   DATABASE => ID */
-++   59,  /*       DESC => ID */
-++   59,  /*     DETACH => ID */
-++   59,  /*       EACH => ID */
-++   59,  /*       FAIL => ID */
-++    0,  /*         OR => nothing */
-++    0,  /*        AND => nothing */
-++    0,  /*         IS => nothing */
-++   59,  /*      MATCH => ID */
-++   59,  /*    LIKE_KW => ID */
-++    0,  /*    BETWEEN => nothing */
-++    0,  /*         IN => nothing */
-++    0,  /*     ISNULL => nothing */
-++    0,  /*    NOTNULL => nothing */
-++    0,  /*         NE => nothing */
-++    0,  /*         EQ => nothing */
-++    0,  /*         GT => nothing */
-++    0,  /*         LE => nothing */
-++    0,  /*         LT => nothing */
-++    0,  /*         GE => nothing */
-++    0,  /*     ESCAPE => nothing */
-+     0,  /*         ID => nothing */
-+-   27,  /*      ABORT => ID */
-+-   27,  /*     ACTION => ID */
-+-   27,  /*      AFTER => ID */
-+-   27,  /*    ANALYZE => ID */
-+-   27,  /*        ASC => ID */
-+-   27,  /*     ATTACH => ID */
-+-   27,  /*     BEFORE => ID */
-+-   27,  /*         BY => ID */
-+-   27,  /*    CASCADE => ID */
-+-   27,  /*       CAST => ID */
-+-   27,  /*   COLUMNKW => ID */
-+-   27,  /*   CONFLICT => ID */
-+-   27,  /*   DATABASE => ID */
-+-   27,  /*       DESC => ID */
-+-   27,  /*     DETACH => ID */
-+-   27,  /*       EACH => ID */
-+-   27,  /*       FAIL => ID */
-+-   27,  /*        FOR => ID */
-+-   27,  /*     IGNORE => ID */
-+-   27,  /*  INITIALLY => ID */
-+-   27,  /*    INSTEAD => ID */
-+-   27,  /*    LIKE_KW => ID */
-+-   27,  /*      MATCH => ID */
-+-   27,  /*         NO => ID */
-+-   27,  /*        KEY => ID */
-+-   27,  /*         OF => ID */
-+-   27,  /*     OFFSET => ID */
-+-   27,  /*     PRAGMA => ID */
-+-   27,  /*      RAISE => ID */
-+-   27,  /*  RECURSIVE => ID */
-+-   27,  /*    REPLACE => ID */
-+-   27,  /*   RESTRICT => ID */
-+-   27,  /*        ROW => ID */
-+-   27,  /*    TRIGGER => ID */
-+-   27,  /*     VACUUM => ID */
-+-   27,  /*       VIEW => ID */
-+-   27,  /*    VIRTUAL => ID */
-+-   27,  /*       WITH => ID */
-+-   27,  /*    REINDEX => ID */
-+-   27,  /*     RENAME => ID */
-+-   27,  /*   CTIME_KW => ID */
-++   59,  /*   COLUMNKW => ID */
-++   59,  /*        FOR => ID */
-++   59,  /*     IGNORE => ID */
-++   59,  /*  INITIALLY => ID */
-++   59,  /*    INSTEAD => ID */
-++   59,  /*         NO => ID */
-++   59,  /*        KEY => ID */
-++   59,  /*         OF => ID */
-++   59,  /*     OFFSET => ID */
-++   59,  /*     PRAGMA => ID */
-++   59,  /*      RAISE => ID */
-++   59,  /*  RECURSIVE => ID */
-++   59,  /*    REPLACE => ID */
-++   59,  /*   RESTRICT => ID */
-++   59,  /*        ROW => ID */
-++   59,  /*    TRIGGER => ID */
-++   59,  /*     VACUUM => ID */
-++   59,  /*       VIEW => ID */
-++   59,  /*    VIRTUAL => ID */
-++   59,  /*       WITH => ID */
-++   59,  /*    REINDEX => ID */
-++   59,  /*     RENAME => ID */
-++   59,  /*   CTIME_KW => ID */
-+ };
-+ #endif /* YYFALLBACK */
-+ 
-+@@ -137731,21 +138113,21 @@ static const char *const yyTokenName[] = {
-+   "ROLLBACK",      "SAVEPOINT",     "RELEASE",       "TO",          
-+   "TABLE",         "CREATE",        "IF",            "NOT",         
-+   "EXISTS",        "TEMP",          "LP",            "RP",          
-+-  "AS",            "WITHOUT",       "COMMA",         "ID",          
-+-  "ABORT",         "ACTION",        "AFTER",         "ANALYZE",     
-+-  "ASC",           "ATTACH",        "BEFORE",        "BY",          
-+-  "CASCADE",       "CAST",          "COLUMNKW",      "CONFLICT",    
-+-  "DATABASE",      "DESC",          "DETACH",        "EACH",        
-+-  "FAIL",          "FOR",           "IGNORE",        "INITIALLY",   
-+-  "INSTEAD",       "LIKE_KW",       "MATCH",         "NO",          
-+-  "KEY",           "OF",            "OFFSET",        "PRAGMA",      
-+-  "RAISE",         "RECURSIVE",     "REPLACE",       "RESTRICT",    
-+-  "ROW",           "TRIGGER",       "VACUUM",        "VIEW",        
-+-  "VIRTUAL",       "WITH",          "REINDEX",       "RENAME",      
-+-  "CTIME_KW",      "ANY",           "OR",            "AND",         
-+-  "IS",            "BETWEEN",       "IN",            "ISNULL",      
-+-  "NOTNULL",       "NE",            "EQ",            "GT",          
-+-  "LE",            "LT",            "GE",            "ESCAPE",      
-++  "AS",            "WITHOUT",       "COMMA",         "ABORT",       
-++  "ACTION",        "AFTER",         "ANALYZE",       "ASC",         
-++  "ATTACH",        "BEFORE",        "BY",            "CASCADE",     
-++  "CAST",          "CONFLICT",      "DATABASE",      "DESC",        
-++  "DETACH",        "EACH",          "FAIL",          "OR",          
-++  "AND",           "IS",            "MATCH",         "LIKE_KW",     
-++  "BETWEEN",       "IN",            "ISNULL",        "NOTNULL",     
-++  "NE",            "EQ",            "GT",            "LE",          
-++  "LT",            "GE",            "ESCAPE",        "ID",          
-++  "COLUMNKW",      "FOR",           "IGNORE",        "INITIALLY",   
-++  "INSTEAD",       "NO",            "KEY",           "OF",          
-++  "OFFSET",        "PRAGMA",        "RAISE",         "RECURSIVE",   
-++  "REPLACE",       "RESTRICT",      "ROW",           "TRIGGER",     
-++  "VACUUM",        "VIEW",          "VIRTUAL",       "WITH",        
-++  "REINDEX",       "RENAME",        "CTIME_KW",      "ANY",         
-+   "BITAND",        "BITOR",         "LSHIFT",        "RSHIFT",      
-+   "PLUS",          "MINUS",         "STAR",          "SLASH",       
-+   "REM",           "CONCAT",        "COLLATE",       "BITNOT",      
-+@@ -141798,11 +142180,13 @@ SQLITE_API const char sqlite3_version[] = SQLITE_VERSION;
-+ */
-+ SQLITE_API const char *sqlite3_libversion(void){ return sqlite3_version; }
-+ 
-+-/* IMPLEMENTATION-OF: R-63124-39300 The sqlite3_sourceid() function returns a
-++/* IMPLEMENTATION-OF: R-25063-23286 The sqlite3_sourceid() function returns a
-+ ** pointer to a string constant whose value is the same as the
-+-** SQLITE_SOURCE_ID C preprocessor macro.
-++** SQLITE_SOURCE_ID C preprocessor macro. Except if SQLite is built using
-++** an edited copy of the amalgamation, then the last four characters of
-++** the hash might be different from SQLITE_SOURCE_ID.
-+ */
-+-SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
-++/* SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; } */
-+ 
-+ /* IMPLEMENTATION-OF: R-35210-63508 The sqlite3_libversion_number() function
-+ ** returns an integer equal to SQLITE_VERSION_NUMBER.
-+@@ -142187,14 +142571,8 @@ SQLITE_API int sqlite3_config(int op, ...){
-+       sqlite3GlobalConfig.bMemstat = va_arg(ap, int);
-+       break;
-+     }
-+-    case SQLITE_CONFIG_SCRATCH: {
-+-      /* EVIDENCE-OF: R-08404-60887 There are three arguments to
-+-      ** SQLITE_CONFIG_SCRATCH: A pointer an 8-byte aligned memory buffer from
-+-      ** which the scratch allocations will be drawn, the size of each scratch
-+-      ** allocation (sz), and the maximum number of scratch allocations (N). */
-+-      sqlite3GlobalConfig.pScratch = va_arg(ap, void*);
-+-      sqlite3GlobalConfig.szScratch = va_arg(ap, int);
-+-      sqlite3GlobalConfig.nScratch = va_arg(ap, int);
-++    case SQLITE_CONFIG_SMALL_MALLOC: {
-++      sqlite3GlobalConfig.bSmallMalloc = va_arg(ap, int);
-+       break;
-+     }
-+     case SQLITE_CONFIG_PAGECACHE: {
-+@@ -142415,7 +142793,8 @@ SQLITE_API int sqlite3_config(int op, ...){
-+ static int setupLookaside(sqlite3 *db, void *pBuf, int sz, int cnt){
-+ #ifndef SQLITE_OMIT_LOOKASIDE
-+   void *pStart;
-+-  if( db->lookaside.nOut ){
-++
-++  if( sqlite3LookasideUsed(db,0)>0 ){
-+     return SQLITE_BUSY;
-+   }
-+   /* Free any existing lookaside buffer for this handle before
-+@@ -142443,16 +142822,18 @@ static int setupLookaside(sqlite3 *db, void *pBuf, int sz, int cnt){
-+     pStart = pBuf;
-+   }
-+   db->lookaside.pStart = pStart;
-++  db->lookaside.pInit = 0;
-+   db->lookaside.pFree = 0;
-+   db->lookaside.sz = (u16)sz;
-+   if( pStart ){
-+     int i;
-+     LookasideSlot *p;
-+     assert( sz > (int)sizeof(LookasideSlot*) );
-++    db->lookaside.nSlot = cnt;
-+     p = (LookasideSlot*)pStart;
-+     for(i=cnt-1; i>=0; i--){
-+-      p->pNext = db->lookaside.pFree;
-+-      db->lookaside.pFree = p;
-++      p->pNext = db->lookaside.pInit;
-++      db->lookaside.pInit = p;
-+       p = (LookasideSlot*)&((u8*)p)[sz];
-+     }
-+     db->lookaside.pEnd = p;
-+@@ -142463,6 +142844,7 @@ static int setupLookaside(sqlite3 *db, void *pBuf, int sz, int cnt){
-+     db->lookaside.pEnd = db;
-+     db->lookaside.bDisable = 1;
-+     db->lookaside.bMalloced = 0;
-++    db->lookaside.nSlot = 0;
-+   }
-+ #endif /* SQLITE_OMIT_LOOKASIDE */
-+   return SQLITE_OK;
-+@@ -142575,7 +142957,7 @@ SQLITE_API int sqlite3_db_config(sqlite3 *db, int op, ...){
-+         if( aFlagOp[i].op==op ){
-+           int onoff = va_arg(ap, int);
-+           int *pRes = va_arg(ap, int*);
-+-          int oldFlags = db->flags;
-++          u32 oldFlags = db->flags;
-+           if( onoff>0 ){
-+             db->flags |= aFlagOp[i].mask;
-+           }else if( onoff==0 ){
-+@@ -142982,7 +143364,7 @@ SQLITE_PRIVATE void sqlite3LeaveMutexAndCloseZombie(sqlite3 *db){
-+   sqlite3_mutex_leave(db->mutex);
-+   db->magic = SQLITE_MAGIC_CLOSED;
-+   sqlite3_mutex_free(db->mutex);
-+-  assert( db->lookaside.nOut==0 );  /* Fails on a lookaside memory leak */
-++  assert( sqlite3LookasideUsed(db,0)==0 );
-+   if( db->lookaside.bMalloced ){
-+     sqlite3_free(db->lookaside.pStart);
-+   }
-+@@ -143010,7 +143392,7 @@ SQLITE_PRIVATE void sqlite3RollbackAll(sqlite3 *db, int tripCode){
-+   ** the database rollback and schema reset, which can cause false
-+   ** corruption reports in some cases.  */
-+   sqlite3BtreeEnterAll(db);
-+-  schemaChange = (db->flags & SQLITE_InternChanges)!=0 && db->init.busy==0;
-++  schemaChange = (db->mDbFlags & DBFLAG_SchemaChange)!=0 && db->init.busy==0;
-+ 
-+   for(i=0; i<db->nDb; i++){
-+     Btree *p = db->aDb[i].pBt;
-+@@ -143024,7 +143406,7 @@ SQLITE_PRIVATE void sqlite3RollbackAll(sqlite3 *db, int tripCode){
-+   sqlite3VtabRollback(db);
-+   sqlite3EndBenignMalloc();
-+ 
-+-  if( (db->flags&SQLITE_InternChanges)!=0 && db->init.busy==0 ){
-++  if( (db->mDbFlags&DBFLAG_SchemaChange)!=0 && db->init.busy==0 ){
-+     sqlite3ExpirePreparedStatements(db);
-+     sqlite3ResetAllSchemasOfConnection(db);
-+   }
-+@@ -143926,7 +144308,8 @@ SQLITE_API int sqlite3_wal_checkpoint(sqlite3 *db, const char *zDb){
-+ ** checkpointed. If an error is encountered it is returned immediately -
-+ ** no attempt is made to checkpoint any remaining databases.
-+ **
-+-** Parameter eMode is one of SQLITE_CHECKPOINT_PASSIVE, FULL or RESTART.
-++** Parameter eMode is one of SQLITE_CHECKPOINT_PASSIVE, FULL, RESTART
-++** or TRUNCATE.
-+ */
-+ SQLITE_PRIVATE int sqlite3Checkpoint(sqlite3 *db, int iDb, int eMode, int *pnLog, int *pnCkpt){
-+   int rc = SQLITE_OK;             /* Return code */
-+@@ -144812,6 +145195,12 @@ static int openDatabase(
-+   }
-+ #endif
-+ 
-++#ifdef SQLITE_ENABLE_DBPAGE_VTAB
-++  if( !db->mallocFailed && rc==SQLITE_OK){
-++    rc = sqlite3DbpageRegister(db);
-++  }
-++#endif
-++
-+ #ifdef SQLITE_ENABLE_DBSTAT_VTAB
-+   if( !db->mallocFailed && rc==SQLITE_OK){
-+     rc = sqlite3DbstatRegister(db);
-+@@ -145471,7 +145860,7 @@ SQLITE_API int sqlite3_test_control(int op, ...){
-+     ** This action provides a run-time test to see how the ALWAYS and
-+     ** NEVER macros were defined at compile-time.
-+     **
-+-    ** The return value is ALWAYS(X).
-++    ** The return value is ALWAYS(X) if X is true, or 0 if X is false.
-+     **
-+     ** The recommended test is X==2.  If the return value is 2, that means
-+     ** ALWAYS() and NEVER() are both no-op pass-through macros, which is the
-+@@ -145494,7 +145883,7 @@ SQLITE_API int sqlite3_test_control(int op, ...){
-+     */
-+     case SQLITE_TESTCTRL_ALWAYS: {
-+       int x = va_arg(ap,int);
-+-      rc = ALWAYS(x);
-++      rc = x ? ALWAYS(x) : 0;
-+       break;
-+     }
-+ 
-+@@ -145561,22 +145950,6 @@ SQLITE_API int sqlite3_test_control(int op, ...){
-+     }
-+ #endif
-+ 
-+-    /* sqlite3_test_control(SQLITE_TESTCTRL_SCRATCHMALLOC, sz, &pNew, pFree);
-+-    **
-+-    ** Pass pFree into sqlite3ScratchFree().
-+-    ** If sz>0 then allocate a scratch buffer into pNew.
-+-    */
-+-    case SQLITE_TESTCTRL_SCRATCHMALLOC: {
-+-      void *pFree, **ppNew;
-+-      int sz;
-+-      sz = va_arg(ap, int);
-+-      ppNew = va_arg(ap, void**);
-+-      pFree = va_arg(ap, void*);
-+-      if( sz ) *ppNew = sqlite3ScratchMalloc(sz);
-+-      sqlite3ScratchFree(pFree);
-+-      break;
-+-    }
-+-
-+     /*   sqlite3_test_control(SQLITE_TESTCTRL_LOCALTIME_FAULT, int onoff);
-+     **
-+     ** If parameter onoff is non-zero, configure the wrappers so that all
-+@@ -145718,7 +146091,7 @@ SQLITE_API sqlite3_int64 sqlite3_uri_int64(
-+ ){
-+   const char *z = sqlite3_uri_parameter(zFilename, zParam);
-+   sqlite3_int64 v;
-+-  if( z && sqlite3DecOrHexToI64(z, &v)==SQLITE_OK ){
-++  if( z && sqlite3DecOrHexToI64(z, &v)==0 ){
-+     bDflt = v;
-+   }
-+   return bDflt;
-+@@ -168313,7 +168686,7 @@ static int rtreeDeleteRowid(Rtree *pRtree, sqlite3_int64 iDelete){
-+   int rc;                         /* Return code */
-+   RtreeNode *pLeaf = 0;           /* Leaf node containing record iDelete */
-+   int iCell;                      /* Index of iDelete cell in pLeaf */
-+-  RtreeNode *pRoot;               /* Root node of rtree structure */
-++  RtreeNode *pRoot = 0;           /* Root node of rtree structure */
-+ 
-+ 
-+   /* Obtain a reference to the root node to initialize Rtree.iDepth */
-+@@ -168874,7 +169247,7 @@ static int getNodeSize(
-+     if( rc!=SQLITE_OK ){
-+       *pzErr = sqlite3_mprintf("%s", sqlite3_errmsg(db));
-+     }else if( pRtree->iNodeSize<(512-64) ){
-+-      rc = SQLITE_CORRUPT;
-++      rc = SQLITE_CORRUPT_VTAB;
-+       *pzErr = sqlite3_mprintf("undersize RTree blobs in \"%q_node\"",
-+                                pRtree->zName);
-+     }
-+@@ -170497,6 +170870,28 @@ SQLITE_API sqlite3rbu *sqlite3rbu_vacuum(
-+ );
-+ 
-+ /*
-++** Configure a limit for the amount of temp space that may be used by
-++** the RBU handle passed as the first argument. The new limit is specified
-++** in bytes by the second parameter. If it is positive, the limit is updated.
-++** If the second parameter to this function is passed zero, then the limit
-++** is removed entirely. If the second parameter is negative, the limit is
-++** not modified (this is useful for querying the current limit).
-++**
-++** In all cases the returned value is the current limit in bytes (zero
-++** indicates unlimited).
-++**
-++** If the temp space limit is exceeded during operation, an SQLITE_FULL
-++** error is returned.
-++*/
-++SQLITE_API sqlite3_int64 sqlite3rbu_temp_size_limit(sqlite3rbu*, sqlite3_int64);
-++
-++/*
-++** Return the current amount of temp file space, in bytes, currently used by
-++** the RBU handle passed as the only argument.
-++*/
-++SQLITE_API sqlite3_int64 sqlite3rbu_temp_size(sqlite3rbu*);
-++
-++/*
-+ ** Internally, each RBU connection uses a separate SQLite database
-+ ** connection to access the target and rbu update databases. This
-+ ** API allows the application direct access to these database handles.
-+@@ -170622,7 +171017,7 @@ SQLITE_API sqlite3_int64 sqlite3rbu_progress(sqlite3rbu *pRbu);
-+ ** table exists but is not correctly populated, the value of the *pnOne
-+ ** output variable during stage 1 is undefined.
-+ */
-+-SQLITE_API void sqlite3rbu_bp_progress(sqlite3rbu *pRbu, int *pnOne, int *pnTwo);
-++SQLITE_API void sqlite3rbu_bp_progress(sqlite3rbu *pRbu, int *pnOne, int*pnTwo);
-+ 
-+ /*
-+ ** Obtain an indication as to the current stage of an RBU update or vacuum.
-+@@ -170732,6 +171127,13 @@ SQLITE_API void sqlite3rbu_destroy_vfs(const char *zName);
-+ /* Maximum number of prepared UPDATE statements held by this module */
-+ #define SQLITE_RBU_UPDATE_CACHESIZE 16
-+ 
-++/* Delta checksums disabled by default.  Compile with -DRBU_ENABLE_DELTA_CKSUM
-++** to enable checksum verification.
-++*/
-++#ifndef RBU_ENABLE_DELTA_CKSUM
-++# define RBU_ENABLE_DELTA_CKSUM 0
-++#endif
-++
-+ /*
-+ ** Swap two objects of type TYPE.
-+ */
-+@@ -171007,6 +171409,8 @@ struct sqlite3rbu {
-+   int pgsz;
-+   u8 *aBuf;
-+   i64 iWalCksum;
-++  i64 szTemp;                     /* Current size of all temp files in use */
-++  i64 szTempLimit;                /* Total size limit for temp files */
-+ 
-+   /* Used in RBU vacuum mode only */
-+   int nRbu;                       /* Number of RBU VFS in the stack */
-+@@ -171015,23 +171419,33 @@ struct sqlite3rbu {
-+ 
-+ /*
-+ ** An rbu VFS is implemented using an instance of this structure.
-++**
-++** Variable pRbu is only non-NULL for automatically created RBU VFS objects.
-++** It is NULL for RBU VFS objects created explicitly using
-++** sqlite3rbu_create_vfs(). It is used to track the total amount of temp
-++** space used by the RBU handle.
-+ */
-+ struct rbu_vfs {
-+   sqlite3_vfs base;               /* rbu VFS shim methods */
-+   sqlite3_vfs *pRealVfs;          /* Underlying VFS */
-+   sqlite3_mutex *mutex;           /* Mutex to protect pMain */
-++  sqlite3rbu *pRbu;               /* Owner RBU object */
-+   rbu_file *pMain;                /* Linked list of main db files */
-+ };
-+ 
-+ /*
-+ ** Each file opened by an rbu VFS is represented by an instance of
-+ ** the following structure.
-++**
-++** If this is a temporary file (pRbu!=0 && flags&DELETE_ON_CLOSE), variable
-++** "sz" is set to the current size of the database file.
-+ */
-+ struct rbu_file {
-+   sqlite3_file base;              /* sqlite3_file methods */
-+   sqlite3_file *pReal;            /* Underlying file handle */
-+   rbu_vfs *pRbuVfs;               /* Pointer to the rbu_vfs object */
-+   sqlite3rbu *pRbu;               /* Pointer to rbu object (rbu target only) */
-++  i64 sz;                         /* Size of file in bytes (temp only) */
-+ 
-+   int openFlags;                  /* Flags this file was opened with */
-+   u32 iCookie;                    /* Cookie value for main db files */
-+@@ -171094,6 +171508,7 @@ static unsigned int rbuDeltaGetInt(const char **pz, int *pLen){
-+   return v;
-+ }
-+ 
-++#if RBU_ENABLE_DELTA_CKSUM
-+ /*
-+ ** Compute a 32-bit checksum on the N-byte buffer.  Return the result.
-+ */
-+@@ -171128,6 +171543,7 @@ static unsigned int rbuDeltaChecksum(const char *zIn, size_t N){
-+   }
-+   return sum3;
-+ }
-++#endif
-+ 
-+ /*
-+ ** Apply a delta.
-+@@ -171158,7 +171574,7 @@ static int rbuDeltaApply(
-+ ){
-+   unsigned int limit;
-+   unsigned int total = 0;
-+-#ifndef FOSSIL_OMIT_DELTA_CKSUM_TEST
-++#if RBU_ENABLE_DELTA_CKSUM
-+   char *zOrigOut = zOut;
-+ #endif
-+ 
-+@@ -171213,7 +171629,7 @@ static int rbuDeltaApply(
-+       case ';': {
-+         zDelta++; lenDelta--;
-+         zOut[0] = 0;
-+-#ifndef FOSSIL_OMIT_DELTA_CKSUM_TEST
-++#if RBU_ENABLE_DELTA_CKSUM
-+         if( cnt!=rbuDeltaChecksum(zOrigOut, total) ){
-+           /* ERROR:  bad checksum */
-+           return -1;
-+@@ -174045,6 +174461,7 @@ static void rbuCreateVfs(sqlite3rbu *p){
-+     sqlite3_vfs *pVfs = sqlite3_vfs_find(zRnd);
-+     assert( pVfs );
-+     p->zVfsName = pVfs->zName;
-++    ((rbu_vfs*)pVfs)->pRbu = p;
-+   }
-+ }
-+ 
-+@@ -174417,6 +174834,7 @@ SQLITE_API int sqlite3rbu_close(sqlite3rbu *p, char **pzErrmsg){
-+     /* Close the open database handle and VFS object. */
-+     sqlite3_close(p->dbRbu);
-+     sqlite3_close(p->dbMain);
-++    assert( p->szTemp==0 );
-+     rbuDeleteVfs(p);
-+     sqlite3_free(p->aBuf);
-+     sqlite3_free(p->aFrame);
-+@@ -174604,6 +175022,7 @@ SQLITE_API int sqlite3rbu_savestate(sqlite3rbu *p){
-+ */
-+ 
-+ static void rbuUnlockShm(rbu_file *p){
-++  assert( p->openFlags & SQLITE_OPEN_MAIN_DB );
-+   if( p->pRbu ){
-+     int (*xShmLock)(sqlite3_file*,int,int,int) = p->pReal->pMethods->xShmLock;
-+     int i;
-+@@ -174617,6 +175036,18 @@ static void rbuUnlockShm(rbu_file *p){
-+ }
-+ 
-+ /*
-++*/
-++static int rbuUpdateTempSize(rbu_file *pFd, sqlite3_int64 nNew){
-++  sqlite3rbu *pRbu = pFd->pRbu;
-++  i64 nDiff = nNew - pFd->sz;
-++  pRbu->szTemp += nDiff;
-++  pFd->sz = nNew;
-++  assert( pRbu->szTemp>=0 );
-++  if( pRbu->szTempLimit && pRbu->szTemp>pRbu->szTempLimit ) return SQLITE_FULL;
-++  return SQLITE_OK;
-++}
-++
-++/*
-+ ** Close an rbu file.
-+ */
-+ static int rbuVfsClose(sqlite3_file *pFile){
-+@@ -174641,6 +175072,9 @@ static int rbuVfsClose(sqlite3_file *pFile){
-+     rbuUnlockShm(p);
-+     p->pReal->pMethods->xShmUnmap(p->pReal, 0);
-+   }
-++  else if( (p->openFlags & SQLITE_OPEN_DELETEONCLOSE) && p->pRbu ){
-++    rbuUpdateTempSize(p, 0);
-++  }
-+ 
-+   /* Close the underlying file handle */
-+   rc = p->pReal->pMethods->xClose(p->pReal);
-+@@ -174758,11 +175192,19 @@ static int rbuVfsWrite(
-+     assert( p->openFlags & SQLITE_OPEN_MAIN_DB );
-+     rc = rbuCaptureDbWrite(p->pRbu, iOfst);
-+   }else{
-+-    if( pRbu && pRbu->eStage==RBU_STAGE_OAL
-+-     && (p->openFlags & SQLITE_OPEN_WAL)
-+-     && iOfst>=pRbu->iOalSz
-+-    ){
-+-      pRbu->iOalSz = iAmt + iOfst;
-++    if( pRbu ){
-++      if( pRbu->eStage==RBU_STAGE_OAL
-++       && (p->openFlags & SQLITE_OPEN_WAL)
-++       && iOfst>=pRbu->iOalSz
-++      ){
-++        pRbu->iOalSz = iAmt + iOfst;
-++      }else if( p->openFlags & SQLITE_OPEN_DELETEONCLOSE ){
-++        i64 szNew = iAmt+iOfst;
-++        if( szNew>p->sz ){
-++          rc = rbuUpdateTempSize(p, szNew);
-++          if( rc!=SQLITE_OK ) return rc;
-++        }
-++      }
-+     }
-+     rc = p->pReal->pMethods->xWrite(p->pReal, zBuf, iAmt, iOfst);
-+     if( rc==SQLITE_OK && iOfst==0 && (p->openFlags & SQLITE_OPEN_MAIN_DB) ){
-+@@ -174781,6 +175223,10 @@ static int rbuVfsWrite(
-+ */
-+ static int rbuVfsTruncate(sqlite3_file *pFile, sqlite_int64 size){
-+   rbu_file *p = (rbu_file*)pFile;
-++  if( (p->openFlags & SQLITE_OPEN_DELETEONCLOSE) && p->pRbu ){
-++    int rc = rbuUpdateTempSize(p, size);
-++    if( rc!=SQLITE_OK ) return rc;
-++  }
-+   return p->pReal->pMethods->xTruncate(p->pReal, size);
-+ }
-+ 
-+@@ -175170,6 +175616,8 @@ static int rbuVfsOpen(
-+         pDb->pWalFd = pFd;
-+       }
-+     }
-++  }else{
-++    pFd->pRbu = pRbuVfs->pRbu;
-+   }
-+ 
-+   if( oflags & SQLITE_OPEN_MAIN_DB
-+@@ -175246,7 +175694,9 @@ static int rbuVfsAccess(
-+       if( *pResOut ){
-+         rc = SQLITE_CANTOPEN;
-+       }else{
-+-        *pResOut = 1;
-++        sqlite3_int64 sz = 0;
-++        rc = rbuVfsFileSize(&pDb->base, &sz);
-++        *pResOut = (sz>0);
-+       }
-+     }
-+   }
-+@@ -175435,6 +175885,20 @@ SQLITE_API int sqlite3rbu_create_vfs(const char *zName, const char *zParent){
-+   return rc;
-+ }
-+ 
-++/*
-++** Configure the aggregate temp file size limit for this RBU handle.
-++*/
-++SQLITE_API sqlite3_int64 sqlite3rbu_temp_size_limit(sqlite3rbu *pRbu, sqlite3_int64 n){
-++  if( n>=0 ){
-++    pRbu->szTempLimit = n;
-++  }
-++  return pRbu->szTempLimit;
-++}
-++
-++SQLITE_API sqlite3_int64 sqlite3rbu_temp_size(sqlite3rbu *pRbu){
-++  return pRbu->szTemp;
-++}
-++
-+ 
-+ /**************************************************************************/
-+ 
-+@@ -176149,6 +176613,338 @@ SQLITE_PRIVATE int sqlite3DbstatRegister(sqlite3 *db){ return SQLITE_OK; }
-+ #endif /* SQLITE_ENABLE_DBSTAT_VTAB */
-+ 
-+ /************** End of dbstat.c **********************************************/
-++/************** Begin file dbpage.c ******************************************/
-++/*
-++** 2017-10-11
-++**
-++** The author disclaims copyright to this source code.  In place of
-++** a legal notice, here is a blessing:
-++**
-++**    May you do good and not evil.
-++**    May you find forgiveness for yourself and forgive others.
-++**    May you share freely, never taking more than you give.
-++**
-++******************************************************************************
-++**
-++** This file contains an implementation of the "sqlite_dbpage" virtual table.
-++**
-++** The sqlite_dbpage virtual table is used to read or write whole raw
-++** pages of the database file.  The pager interface is used so that
-++** uncommitted changes and changes recorded in the WAL file are correctly
-++** retrieved.
-++**
-++** Usage example:
-++**
-++**    SELECT data FROM sqlite_dbpage('aux1') WHERE pgno=123;
-++**
-++** This is an eponymous virtual table so it does not need to be created before
-++** use.  The optional argument to the sqlite_dbpage() table name is the
-++** schema for the database file that is to be read.  The default schema is
-++** "main".
-++**
-++** The data field of sqlite_dbpage table can be updated.  The new
-++** value must be a BLOB which is the correct page size, otherwise the
-++** update fails.  Rows may not be deleted or inserted.
-++*/
-++
-++/* #include "sqliteInt.h"   ** Requires access to internal data structures ** */
-++#if (defined(SQLITE_ENABLE_DBPAGE_VTAB) || defined(SQLITE_TEST)) \
-++    && !defined(SQLITE_OMIT_VIRTUALTABLE)
-++
-++typedef struct DbpageTable DbpageTable;
-++typedef struct DbpageCursor DbpageCursor;
-++
-++struct DbpageCursor {
-++  sqlite3_vtab_cursor base;       /* Base class.  Must be first */
-++  int pgno;                       /* Current page number */
-++  int mxPgno;                     /* Last page to visit on this scan */
-++};
-++
-++struct DbpageTable {
-++  sqlite3_vtab base;              /* Base class.  Must be first */
-++  sqlite3 *db;                    /* The database */
-++  Pager *pPager;                  /* Pager being read/written */
-++  int iDb;                        /* Index of database to analyze */
-++  int szPage;                     /* Size of each page in bytes */
-++  int nPage;                      /* Number of pages in the file */
-++};
-++
-++/*
-++** Connect to or create a dbpagevfs virtual table.
-++*/
-++static int dbpageConnect(
-++  sqlite3 *db,
-++  void *pAux,
-++  int argc, const char *const*argv,
-++  sqlite3_vtab **ppVtab,
-++  char **pzErr
-++){
-++  DbpageTable *pTab = 0;
-++  int rc = SQLITE_OK;
-++  int iDb;
-++
-++  if( argc>=4 ){
-++    Token nm;
-++    sqlite3TokenInit(&nm, (char*)argv[3]);
-++    iDb = sqlite3FindDb(db, &nm);
-++    if( iDb<0 ){
-++      *pzErr = sqlite3_mprintf("no such schema: %s", argv[3]);
-++      return SQLITE_ERROR;
-++    }
-++  }else{
-++    iDb = 0;
-++  }
-++  rc = sqlite3_declare_vtab(db,
-++          "CREATE TABLE x(pgno INTEGER PRIMARY KEY, data BLOB, schema HIDDEN)");
-++  if( rc==SQLITE_OK ){
-++    pTab = (DbpageTable *)sqlite3_malloc64(sizeof(DbpageTable));
-++    if( pTab==0 ) rc = SQLITE_NOMEM_BKPT;
-++  }
-++
-++  assert( rc==SQLITE_OK || pTab==0 );
-++  if( rc==SQLITE_OK ){
-++    Btree *pBt = db->aDb[iDb].pBt;
-++    memset(pTab, 0, sizeof(DbpageTable));
-++    pTab->db = db;
-++    pTab->iDb = iDb;
-++    pTab->pPager = pBt ? sqlite3BtreePager(pBt) : 0;
-++  }
-++
-++  *ppVtab = (sqlite3_vtab*)pTab;
-++  return rc;
-++}
-++
-++/*
-++** Disconnect from or destroy a dbpagevfs virtual table.
-++*/
-++static int dbpageDisconnect(sqlite3_vtab *pVtab){
-++  sqlite3_free(pVtab);
-++  return SQLITE_OK;
-++}
-++
-++/*
-++** idxNum:
-++**
-++**     0     full table scan
-++**     1     pgno=?1
-++*/
-++static int dbpageBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){
-++  int i;
-++  pIdxInfo->estimatedCost = 1.0e6;  /* Initial cost estimate */
-++  for(i=0; i<pIdxInfo->nConstraint; i++){
-++    struct sqlite3_index_constraint *p = &pIdxInfo->aConstraint[i];
-++    if( p->usable && p->iColumn<=0 && p->op==SQLITE_INDEX_CONSTRAINT_EQ ){
-++      pIdxInfo->estimatedRows = 1;
-++      pIdxInfo->idxFlags = SQLITE_INDEX_SCAN_UNIQUE;
-++      pIdxInfo->estimatedCost = 1.0;
-++      pIdxInfo->idxNum = 1;
-++      pIdxInfo->aConstraintUsage[i].argvIndex = 1;
-++      pIdxInfo->aConstraintUsage[i].omit = 1;
-++      break;
-++    }
-++  }
-++  if( pIdxInfo->nOrderBy>=1
-++   && pIdxInfo->aOrderBy[0].iColumn<=0
-++   && pIdxInfo->aOrderBy[0].desc==0
-++  ){
-++    pIdxInfo->orderByConsumed = 1;
-++  }
-++  return SQLITE_OK;
-++}
-++
-++/*
-++** Open a new dbpagevfs cursor.
-++*/
-++static int dbpageOpen(sqlite3_vtab *pVTab, sqlite3_vtab_cursor **ppCursor){
-++  DbpageCursor *pCsr;
-++
-++  pCsr = (DbpageCursor *)sqlite3_malloc64(sizeof(DbpageCursor));
-++  if( pCsr==0 ){
-++    return SQLITE_NOMEM_BKPT;
-++  }else{
-++    memset(pCsr, 0, sizeof(DbpageCursor));
-++    pCsr->base.pVtab = pVTab;
-++    pCsr->pgno = -1;
-++  }
-++
-++  *ppCursor = (sqlite3_vtab_cursor *)pCsr;
-++  return SQLITE_OK;
-++}
-++
-++/*
-++** Close a dbpagevfs cursor.
-++*/
-++static int dbpageClose(sqlite3_vtab_cursor *pCursor){
-++  DbpageCursor *pCsr = (DbpageCursor *)pCursor;
-++  sqlite3_free(pCsr);
-++  return SQLITE_OK;
-++}
-++
-++/*
-++** Move a dbpagevfs cursor to the next entry in the file.
-++*/
-++static int dbpageNext(sqlite3_vtab_cursor *pCursor){
-++  int rc = SQLITE_OK;
-++  DbpageCursor *pCsr = (DbpageCursor *)pCursor;
-++  pCsr->pgno++;
-++  return rc;
-++}
-++
-++static int dbpageEof(sqlite3_vtab_cursor *pCursor){
-++  DbpageCursor *pCsr = (DbpageCursor *)pCursor;
-++  return pCsr->pgno > pCsr->mxPgno;
-++}
-++
-++static int dbpageFilter(
-++  sqlite3_vtab_cursor *pCursor,
-++  int idxNum, const char *idxStr,
-++  int argc, sqlite3_value **argv
-++){
-++  DbpageCursor *pCsr = (DbpageCursor *)pCursor;
-++  DbpageTable *pTab = (DbpageTable *)pCursor->pVtab;
-++  int rc = SQLITE_OK;
-++  Btree *pBt = pTab->db->aDb[pTab->iDb].pBt;
-++
-++  pTab->szPage = sqlite3BtreeGetPageSize(pBt);
-++  pTab->nPage = sqlite3BtreeLastPage(pBt);
-++  if( idxNum==1 ){
-++    pCsr->pgno = sqlite3_value_int(argv[0]);
-++    if( pCsr->pgno<1 || pCsr->pgno>pTab->nPage ){
-++      pCsr->pgno = 1;
-++      pCsr->mxPgno = 0;
-++    }else{
-++      pCsr->mxPgno = pCsr->pgno;
-++    }
-++  }else{
-++    pCsr->pgno = 1;
-++    pCsr->mxPgno = pTab->nPage;
-++  }
-++  return rc;
-++}
-++
-++static int dbpageColumn(
-++  sqlite3_vtab_cursor *pCursor,
-++  sqlite3_context *ctx,
-++  int i
-++){
-++  DbpageCursor *pCsr = (DbpageCursor *)pCursor;
-++  DbpageTable *pTab = (DbpageTable *)pCursor->pVtab;
-++  int rc = SQLITE_OK;
-++  switch( i ){
-++    case 0: {           /* pgno */
-++      sqlite3_result_int(ctx, pCsr->pgno);
-++      break;
-++    }
-++    case 1: {           /* data */
-++      DbPage *pDbPage = 0;
-++      rc = sqlite3PagerGet(pTab->pPager, pCsr->pgno, (DbPage**)&pDbPage, 0);
-++      if( rc==SQLITE_OK ){
-++        sqlite3_result_blob(ctx, sqlite3PagerGetData(pDbPage), pTab->szPage,
-++                            SQLITE_TRANSIENT);
-++      }
-++      sqlite3PagerUnref(pDbPage);
-++      break;
-++    }
-++    default: {          /* schema */
-++      sqlite3 *db = sqlite3_context_db_handle(ctx);
-++      sqlite3_result_text(ctx, db->aDb[pTab->iDb].zDbSName, -1, SQLITE_STATIC);
-++      break;
-++    }
-++  }
-++  return SQLITE_OK;
-++}
-++
-++static int dbpageRowid(sqlite3_vtab_cursor *pCursor, sqlite_int64 *pRowid){
-++  DbpageCursor *pCsr = (DbpageCursor *)pCursor;
-++  *pRowid = pCsr->pgno;
-++  return SQLITE_OK;
-++}
-++
-++static int dbpageUpdate(
-++  sqlite3_vtab *pVtab,
-++  int argc,
-++  sqlite3_value **argv,
-++  sqlite_int64 *pRowid
-++){
-++  DbpageTable *pTab = (DbpageTable *)pVtab;
-++  int pgno;
-++  DbPage *pDbPage = 0;
-++  int rc = SQLITE_OK;
-++  char *zErr = 0;
-++
-++  if( argc==1 ){
-++    zErr = "cannot delete";
-++    goto update_fail;
-++  }
-++  pgno = sqlite3_value_int(argv[0]);
-++  if( pgno<1 || pgno>pTab->nPage ){
-++    zErr = "bad page number";
-++    goto update_fail;
-++  }
-++  if( sqlite3_value_int(argv[1])!=pgno ){
-++    zErr = "cannot insert";
-++    goto update_fail;
-++  }
-++  if( sqlite3_value_type(argv[3])!=SQLITE_BLOB
-++   || sqlite3_value_bytes(argv[3])!=pTab->szPage
-++  ){
-++    zErr = "bad page value";
-++    goto update_fail;
-++  }
-++  rc = sqlite3PagerGet(pTab->pPager, pgno, (DbPage**)&pDbPage, 0);
-++  if( rc==SQLITE_OK ){
-++    rc = sqlite3PagerWrite(pDbPage);
-++    if( rc==SQLITE_OK ){
-++      memcpy(sqlite3PagerGetData(pDbPage),
-++             sqlite3_value_blob(argv[3]),
-++             pTab->szPage);
-++    }
-++  }
-++  sqlite3PagerUnref(pDbPage);
-++  return rc;
-++
-++update_fail:
-++  sqlite3_free(pVtab->zErrMsg);
-++  pVtab->zErrMsg = sqlite3_mprintf("%s", zErr);
-++  return SQLITE_ERROR;
-++}
-++
-++/*
-++** Invoke this routine to register the "dbpage" virtual table module
-++*/
-++SQLITE_PRIVATE int sqlite3DbpageRegister(sqlite3 *db){
-++  static sqlite3_module dbpage_module = {
-++    0,                            /* iVersion */
-++    dbpageConnect,                /* xCreate */
-++    dbpageConnect,                /* xConnect */
-++    dbpageBestIndex,              /* xBestIndex */
-++    dbpageDisconnect,             /* xDisconnect */
-++    dbpageDisconnect,             /* xDestroy */
-++    dbpageOpen,                   /* xOpen - open a cursor */
-++    dbpageClose,                  /* xClose - close a cursor */
-++    dbpageFilter,                 /* xFilter - configure scan constraints */
-++    dbpageNext,                   /* xNext - advance a cursor */
-++    dbpageEof,                    /* xEof - check for end of scan */
-++    dbpageColumn,                 /* xColumn - read data */
-++    dbpageRowid,                  /* xRowid - read data */
-++    dbpageUpdate,                 /* xUpdate */
-++    0,                            /* xBegin */
-++    0,                            /* xSync */
-++    0,                            /* xCommit */
-++    0,                            /* xRollback */
-++    0,                            /* xFindMethod */
-++    0,                            /* xRename */
-++    0,                            /* xSavepoint */
-++    0,                            /* xRelease */
-++    0,                            /* xRollbackTo */
-++  };
-++  return sqlite3_create_module(db, "sqlite_dbpage", &dbpage_module, 0);
-++}
-++#elif defined(SQLITE_ENABLE_DBPAGE_VTAB)
-++SQLITE_PRIVATE int sqlite3DbpageRegister(sqlite3 *db){ return SQLITE_OK; }
-++#endif /* SQLITE_ENABLE_DBSTAT_VTAB */
-++
-++/************** End of dbpage.c **********************************************/
-+ /************** Begin file sqlite3session.c **********************************/
-+ 
-+ #if defined(SQLITE_ENABLE_SESSION) && defined(SQLITE_ENABLE_PREUPDATE_HOOK)
-+@@ -184739,7 +185535,8 @@ static int sqlite3Fts5UnicodeFold(int c, int bRemoveDiacritic);
-+ **    fts5YY_MAX_SHIFT       Maximum value for shift actions
-+ **    fts5YY_MIN_SHIFTREDUCE Minimum value for shift-reduce actions
-+ **    fts5YY_MAX_SHIFTREDUCE Maximum value for shift-reduce actions
-+-**    fts5YY_MIN_REDUCE      Maximum value for reduce actions
-++**    fts5YY_MIN_REDUCE      Minimum value for reduce actions
-++**    fts5YY_MAX_REDUCE      Maximum value for reduce actions
-+ **    fts5YY_ERROR_ACTION    The fts5yy_action[] code for syntax error
-+ **    fts5YY_ACCEPT_ACTION   The fts5yy_action[] code for accept
-+ **    fts5YY_NO_ACTION       The fts5yy_action[] code for no-op
-+@@ -200474,7 +201271,7 @@ static void fts5SourceIdFunc(
-+ ){
-+   assert( nArg==0 );
-+   UNUSED_PARAM2(nArg, apUnused);
-+-  sqlite3_result_text(pCtx, "fts5: 2017-07-19 19:48:40 0a5e1c04d9d07bb7fd6546a9ddac1bf42b19ea19c2b79570aea6cd4226887a27", -1, SQLITE_TRANSIENT);
-++  sqlite3_result_text(pCtx, "fts5: 2017-10-24 18:55:49 1a584e499906b5c87ec7d43d4abce641fdf017c42125b083109bc77c4de48827", -1, SQLITE_TRANSIENT);
-+ }
-+ 
-+ static int fts5Init(sqlite3 *db){
-+@@ -203702,6 +204499,11 @@ static int sqlite3Fts5GetVarintLen(u32 iVal){
-+ **   the number of fts5 rows that contain at least one instance of term
-+ **   $term. Field $cnt is set to the total number of instances of term
-+ **   $term in the database.
-++**
-++** instance:
-++**     CREATE TABLE vocab(term, doc, col, offset, PRIMARY KEY(<all-fields>));
-++**
-++**   One row for each term instance in the database.
-+ */
-+ 
-+ 
-+@@ -203717,7 +204519,7 @@ struct Fts5VocabTable {
-+   char *zFts5Db;                  /* Db containing fts5 table */
-+   sqlite3 *db;                    /* Database handle */
-+   Fts5Global *pGlobal;            /* FTS5 global object for this database */
-+-  int eType;                      /* FTS5_VOCAB_COL or ROW */
-++  int eType;                      /* FTS5_VOCAB_COL, ROW or INSTANCE */
-+ };
-+ 
-+ struct Fts5VocabCursor {
-+@@ -203737,16 +204539,22 @@ struct Fts5VocabCursor {
-+   i64 *aCnt;
-+   i64 *aDoc;
-+ 
-+-  /* Output values used by 'row' and 'col' tables */
-++  /* Output values used by all tables. */
-+   i64 rowid;                      /* This table's current rowid value */
-+   Fts5Buffer term;                /* Current value of 'term' column */
-++
-++  /* Output values Used by 'instance' tables only */
-++  i64 iInstPos;
-++  int iInstOff;
-+ };
-+ 
-+-#define FTS5_VOCAB_COL    0
-+-#define FTS5_VOCAB_ROW    1
-++#define FTS5_VOCAB_COL      0
-++#define FTS5_VOCAB_ROW      1
-++#define FTS5_VOCAB_INSTANCE 2
-+ 
-+ #define FTS5_VOCAB_COL_SCHEMA  "term, col, doc, cnt"
-+ #define FTS5_VOCAB_ROW_SCHEMA  "term, doc, cnt"
-++#define FTS5_VOCAB_INST_SCHEMA "term, doc, col, offset"
-+ 
-+ /*
-+ ** Bits for the mask used as the idxNum value by xBestIndex/xFilter.
-+@@ -203774,6 +204582,9 @@ static int fts5VocabTableType(const char *zType, char **pzErr, int *peType){
-+     if( sqlite3_stricmp(zCopy, "row")==0 ){
-+       *peType = FTS5_VOCAB_ROW;
-+     }else
-++    if( sqlite3_stricmp(zCopy, "instance")==0 ){
-++      *peType = FTS5_VOCAB_INSTANCE;
-++    }else
-+     {
-+       *pzErr = sqlite3_mprintf("fts5vocab: unknown table type: %Q", zCopy);
-+       rc = SQLITE_ERROR;
-+@@ -203834,7 +204645,8 @@ static int fts5VocabInitVtab(
-+ ){
-+   const char *azSchema[] = {
-+     "CREATE TABlE vocab(" FTS5_VOCAB_COL_SCHEMA  ")",
-+-    "CREATE TABlE vocab(" FTS5_VOCAB_ROW_SCHEMA  ")"
-++    "CREATE TABlE vocab(" FTS5_VOCAB_ROW_SCHEMA  ")",
-++    "CREATE TABlE vocab(" FTS5_VOCAB_INST_SCHEMA ")"
-+   };
-+ 
-+   Fts5VocabTable *pRet = 0;
-+@@ -203908,6 +204720,15 @@ static int fts5VocabCreateMethod(
-+ 
-+ /*
-+ ** Implementation of the xBestIndex method.
-++**
-++** Only constraints of the form:
-++**
-++**     term <= ?
-++**     term == ?
-++**     term >= ?
-++**
-++** are interpreted. Less-than and less-than-or-equal are treated
-++** identically, as are greater-than and greater-than-or-equal.
-+ */
-+ static int fts5VocabBestIndexMethod(
-+   sqlite3_vtab *pUnused,
-+@@ -204051,6 +204872,54 @@ static int fts5VocabCloseMethod(sqlite3_vtab_cursor *pCursor){
-+   return SQLITE_OK;
-+ }
-+ 
-++static int fts5VocabInstanceNewTerm(Fts5VocabCursor *pCsr){
-++  int rc = SQLITE_OK;
-++
-++  if( sqlite3Fts5IterEof(pCsr->pIter) ){
-++    pCsr->bEof = 1;
-++  }else{
-++    const char *zTerm;
-++    int nTerm;
-++    zTerm = sqlite3Fts5IterTerm(pCsr->pIter, &nTerm);
-++    if( pCsr->nLeTerm>=0 ){
-++      int nCmp = MIN(nTerm, pCsr->nLeTerm);
-++      int bCmp = memcmp(pCsr->zLeTerm, zTerm, nCmp);
-++      if( bCmp<0 || (bCmp==0 && pCsr->nLeTerm<nTerm) ){
-++        pCsr->bEof = 1;
-++      }
-++    }
-++
-++    sqlite3Fts5BufferSet(&rc, &pCsr->term, nTerm, (const u8*)zTerm);
-++  }
-++  return rc;
-++}
-++
-++static int fts5VocabInstanceNext(Fts5VocabCursor *pCsr){
-++  int eDetail = pCsr->pConfig->eDetail;
-++  int rc = SQLITE_OK;
-++  Fts5IndexIter *pIter = pCsr->pIter;
-++  i64 *pp = &pCsr->iInstPos;
-++  int *po = &pCsr->iInstOff;
-++
-++  while( eDetail==FTS5_DETAIL_NONE
-++      || sqlite3Fts5PoslistNext64(pIter->pData, pIter->nData, po, pp)
-++  ){
-++    pCsr->iInstPos = 0;
-++    pCsr->iInstOff = 0;
-++
-++    rc = sqlite3Fts5IterNextScan(pCsr->pIter);
-++    if( rc==SQLITE_OK ){
-++      rc = fts5VocabInstanceNewTerm(pCsr);
-++      if( eDetail==FTS5_DETAIL_NONE ) break;
-++    }
-++    if( rc ){
-++      pCsr->bEof = 1;
-++      break;
-++    }
-++  }
-++
-++  return rc;
-++}
-+ 
-+ /*
-+ ** Advance the cursor to the next row in the table.
-+@@ -204063,13 +204932,17 @@ static int fts5VocabNextMethod(sqlite3_vtab_cursor *pCursor){
-+ 
-+   pCsr->rowid++;
-+ 
-++  if( pTab->eType==FTS5_VOCAB_INSTANCE ){
-++    return fts5VocabInstanceNext(pCsr);
-++  }
-++
-+   if( pTab->eType==FTS5_VOCAB_COL ){
-+     for(pCsr->iCol++; pCsr->iCol<nCol; pCsr->iCol++){
-+       if( pCsr->aDoc[pCsr->iCol] ) break;
-+     }
-+   }
-+ 
-+-  if( pTab->eType==FTS5_VOCAB_ROW || pCsr->iCol>=nCol ){
-++  if( pTab->eType!=FTS5_VOCAB_COL || pCsr->iCol>=nCol ){
-+     if( sqlite3Fts5IterEof(pCsr->pIter) ){
-+       pCsr->bEof = 1;
-+     }else{
-+@@ -204093,22 +204966,26 @@ static int fts5VocabNextMethod(sqlite3_vtab_cursor *pCursor){
-+ 
-+       assert( pTab->eType==FTS5_VOCAB_COL || pTab->eType==FTS5_VOCAB_ROW );
-+       while( rc==SQLITE_OK ){
-++        int eDetail = pCsr->pConfig->eDetail;
-+         const u8 *pPos; int nPos;   /* Position list */
-+         i64 iPos = 0;               /* 64-bit position read from poslist */
-+         int iOff = 0;               /* Current offset within position list */
-+ 
-+         pPos = pCsr->pIter->pData;
-+         nPos = pCsr->pIter->nData;
-+-        switch( pCsr->pConfig->eDetail ){
-+-          case FTS5_DETAIL_FULL:
-+-            pPos = pCsr->pIter->pData;
-+-            nPos = pCsr->pIter->nData;
-+-            if( pTab->eType==FTS5_VOCAB_ROW ){
-++
-++        switch( pTab->eType ){
-++          case FTS5_VOCAB_ROW:
-++            if( eDetail==FTS5_DETAIL_FULL ){
-+               while( 0==sqlite3Fts5PoslistNext64(pPos, nPos, &iOff, &iPos) ){
-+                 pCsr->aCnt[0]++;
-+               }
-+-              pCsr->aDoc[0]++;
-+-            }else{
-++            }
-++            pCsr->aDoc[0]++;
-++            break;
-++
-++          case FTS5_VOCAB_COL:
-++            if( eDetail==FTS5_DETAIL_FULL ){
-+               int iCol = -1;
-+               while( 0==sqlite3Fts5PoslistNext64(pPos, nPos, &iOff, &iPos) ){
-+                 int ii = FTS5_POS2COLUMN(iPos);
-+@@ -204122,13 +204999,7 @@ static int fts5VocabNextMethod(sqlite3_vtab_cursor *pCursor){
-+                   iCol = ii;
-+                 }
-+               }
-+-            }
-+-            break;
-+-
-+-          case FTS5_DETAIL_COLUMNS:
-+-            if( pTab->eType==FTS5_VOCAB_ROW ){
-+-              pCsr->aDoc[0]++;
-+-            }else{
-++            }else if( eDetail==FTS5_DETAIL_COLUMNS ){
-+               while( 0==sqlite3Fts5PoslistNext64(pPos, nPos, &iOff,&iPos) ){
-+                 assert_nc( iPos>=0 && iPos<nCol );
-+                 if( iPos>=nCol ){
-+@@ -204137,18 +205008,21 @@ static int fts5VocabNextMethod(sqlite3_vtab_cursor *pCursor){
-+                 }
-+                 pCsr->aDoc[iPos]++;
-+               }
-++            }else{
-++              assert( eDetail==FTS5_DETAIL_NONE );
-++              pCsr->aDoc[0]++;
-+             }
-+             break;
-+ 
-+           default:
-+-            assert( pCsr->pConfig->eDetail==FTS5_DETAIL_NONE );
-+-            pCsr->aDoc[0]++;
-++            assert( pTab->eType==FTS5_VOCAB_INSTANCE );
-+             break;
-+         }
-+ 
-+         if( rc==SQLITE_OK ){
-+           rc = sqlite3Fts5IterNextScan(pCsr->pIter);
-+         }
-++        if( pTab->eType==FTS5_VOCAB_INSTANCE ) break;
-+ 
-+         if( rc==SQLITE_OK ){
-+           zTerm = sqlite3Fts5IterTerm(pCsr->pIter, &nTerm);
-+@@ -204178,7 +205052,9 @@ static int fts5VocabFilterMethod(
-+   int nUnused,                    /* Number of elements in apVal */
-+   sqlite3_value **apVal           /* Arguments for the indexing scheme */
-+ ){
-++  Fts5VocabTable *pTab = (Fts5VocabTable*)pCursor->pVtab;
-+   Fts5VocabCursor *pCsr = (Fts5VocabCursor*)pCursor;
-++  int eType = pTab->eType;
-+   int rc = SQLITE_OK;
-+ 
-+   int iVal = 0;
-+@@ -204218,11 +205094,16 @@ static int fts5VocabFilterMethod(
-+     }
-+   }
-+ 
-+-
-+   if( rc==SQLITE_OK ){
-+     rc = sqlite3Fts5IndexQuery(pCsr->pIndex, zTerm, nTerm, f, 0, &pCsr->pIter);
-+   }
-+-  if( rc==SQLITE_OK ){
-++  if( rc==SQLITE_OK && eType==FTS5_VOCAB_INSTANCE ){
-++    rc = fts5VocabInstanceNewTerm(pCsr);
-++  }
-++  if( rc==SQLITE_OK
-++   && !pCsr->bEof
-++   && (eType!=FTS5_VOCAB_INSTANCE || pCsr->pConfig->eDetail!=FTS5_DETAIL_NONE)
-++  ){
-+     rc = fts5VocabNextMethod(pCursor);
-+   }
-+ 
-+@@ -204264,13 +205145,41 @@ static int fts5VocabColumnMethod(
-+     }else{
-+       iVal = pCsr->aCnt[pCsr->iCol];
-+     }
-+-  }else{
-++  }else if( eType==FTS5_VOCAB_ROW ){
-+     assert( iCol==1 || iCol==2 );
-+     if( iCol==1 ){
-+       iVal = pCsr->aDoc[0];
-+     }else{
-+       iVal = pCsr->aCnt[0];
-+     }
-++  }else{
-++    assert( eType==FTS5_VOCAB_INSTANCE );
-++    switch( iCol ){
-++      case 1:
-++        sqlite3_result_int64(pCtx, pCsr->pIter->iRowid);
-++        break;
-++      case 2: {
-++        int ii = -1;
-++        if( eDetail==FTS5_DETAIL_FULL ){
-++          ii = FTS5_POS2COLUMN(pCsr->iInstPos);
-++        }else if( eDetail==FTS5_DETAIL_COLUMNS ){
-++          ii = (int)pCsr->iInstPos;
-++        }
-++        if( ii>=0 && ii<pCsr->pConfig->nCol ){
-++          const char *z = pCsr->pConfig->azCol[ii];
-++          sqlite3_result_text(pCtx, z, -1, SQLITE_STATIC);
-++        }
-++        break;
-++      }
-++      default: {
-++        assert( iCol==3 );
-++        if( eDetail==FTS5_DETAIL_FULL ){
-++          int ii = FTS5_POS2OFFSET(pCsr->iInstPos);
-++          sqlite3_result_int(pCtx, ii);
-++        }
-++        break;
-++      }
-++    }
-+   }
-+ 
-+   if( iVal>0 ) sqlite3_result_int64(pCtx, iVal);
-+@@ -204630,3 +205539,10 @@ SQLITE_API int sqlite3_stmt_init(
-+ #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */
-+ 
-+ /************** End of stmt.c ************************************************/
-++#if __LINE__!=205536
-++#undef SQLITE_SOURCE_ID
-++#define SQLITE_SOURCE_ID      "2017-10-24 18:55:49 1a584e499906b5c87ec7d43d4abce641fdf017c42125b083109bc77c4de4alt2"
-++#endif
-++/* Return the source-id for this library */
-++SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
-++/************************** End of sqlite3.c ******************************/
-+diff --git a/third_party/sqlite/amalgamation/sqlite3.h b/third_party/sqlite/amalgamation/sqlite3.h
-+index 0aa60a8..199a136 100644
-+--- a/third_party/sqlite/amalgamation/sqlite3.h
-++++ b/third_party/sqlite/amalgamation/sqlite3.h
-+@@ -115,15 +115,17 @@ extern "C" {
-+ ** a string which identifies a particular check-in of SQLite
-+ ** within its configuration management system.  ^The SQLITE_SOURCE_ID
-+ ** string contains the date and time of the check-in (UTC) and a SHA1
-+-** or SHA3-256 hash of the entire source tree.
-++** or SHA3-256 hash of the entire source tree.  If the source code has
-++** been edited in any way since it was last checked in, then the last
-++** four hexadecimal digits of the hash may be modified.
-+ **
-+ ** See also: [sqlite3_libversion()],
-+ ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
-+ ** [sqlite_version()] and [sqlite_source_id()].
-+ */
-+-#define SQLITE_VERSION        "3.20.0"
-+-#define SQLITE_VERSION_NUMBER 3020000
-+-#define SQLITE_SOURCE_ID      "2017-07-19 19:48:40 0a5e1c04d9d07bb7fd6546a9ddac1bf42b19ea19c2b79570aea6cd4226887a27"
-++#define SQLITE_VERSION        "3.21.0"
-++#define SQLITE_VERSION_NUMBER 3021000
-++#define SQLITE_SOURCE_ID      "2017-10-24 18:55:49 1a584e499906b5c87ec7d43d4abce641fdf017c42125b083109bc77c4de4alt1"
-+ 
-+ /*
-+ ** CAPI3REF: Run-Time Library Version Numbers
-+@@ -139,7 +141,7 @@ extern "C" {
-+ **
-+ ** <blockquote><pre>
-+ ** assert( sqlite3_libversion_number()==SQLITE_VERSION_NUMBER );
-+-** assert( strcmp(sqlite3_sourceid(),SQLITE_SOURCE_ID)==0 );
-++** assert( strncmp(sqlite3_sourceid(),SQLITE_SOURCE_ID,80)==0 );
-+ ** assert( strcmp(sqlite3_libversion(),SQLITE_VERSION)==0 );
-+ ** </pre></blockquote>)^
-+ **
-+@@ -149,9 +151,11 @@ extern "C" {
-+ ** function is provided for use in DLLs since DLL users usually do not have
-+ ** direct access to string constants within the DLL.  ^The
-+ ** sqlite3_libversion_number() function returns an integer equal to
-+-** [SQLITE_VERSION_NUMBER].  ^The sqlite3_sourceid() function returns
-++** [SQLITE_VERSION_NUMBER].  ^(The sqlite3_sourceid() function returns
-+ ** a pointer to a string constant whose value is the same as the
-+-** [SQLITE_SOURCE_ID] C preprocessor macro.
-++** [SQLITE_SOURCE_ID] C preprocessor macro.  Except if SQLite is built
-++** using an edited copy of [the amalgamation], then the last four characters
-++** of the hash might be different from [SQLITE_SOURCE_ID].)^
-+ **
-+ ** See also: [sqlite_version()] and [sqlite_source_id()].
-+ */
-+@@ -432,7 +436,7 @@ SQLITE_API int sqlite3_exec(
-+ #define SQLITE_FULL        13   /* Insertion failed because database is full */
-+ #define SQLITE_CANTOPEN    14   /* Unable to open the database file */
-+ #define SQLITE_PROTOCOL    15   /* Database lock protocol error */
-+-#define SQLITE_EMPTY       16   /* Not used */
-++#define SQLITE_EMPTY       16   /* Internal use only */
-+ #define SQLITE_SCHEMA      17   /* The database schema changed */
-+ #define SQLITE_TOOBIG      18   /* String or BLOB exceeds size limit */
-+ #define SQLITE_CONSTRAINT  19   /* Abort due to constraint violation */
-+@@ -494,6 +498,9 @@ SQLITE_API int sqlite3_exec(
-+ #define SQLITE_IOERR_CONVPATH          (SQLITE_IOERR | (26<<8))
-+ #define SQLITE_IOERR_VNODE             (SQLITE_IOERR | (27<<8))
-+ #define SQLITE_IOERR_AUTH              (SQLITE_IOERR | (28<<8))
-++#define SQLITE_IOERR_BEGIN_ATOMIC      (SQLITE_IOERR | (29<<8))
-++#define SQLITE_IOERR_COMMIT_ATOMIC     (SQLITE_IOERR | (30<<8))
-++#define SQLITE_IOERR_ROLLBACK_ATOMIC   (SQLITE_IOERR | (31<<8))
-+ #define SQLITE_LOCKED_SHAREDCACHE      (SQLITE_LOCKED |  (1<<8))
-+ #define SQLITE_BUSY_RECOVERY           (SQLITE_BUSY   |  (1<<8))
-+ #define SQLITE_BUSY_SNAPSHOT           (SQLITE_BUSY   |  (2<<8))
-+@@ -580,6 +587,11 @@ SQLITE_API int sqlite3_exec(
-+ ** SQLITE_IOCAP_IMMUTABLE flag indicates that the file is on
-+ ** read-only media and cannot be changed even by processes with
-+ ** elevated privileges.
-++**
-++** The SQLITE_IOCAP_BATCH_ATOMIC property means that the underlying
-++** filesystem supports doing multiple write operations atomically when those
-++** write operations are bracketed by [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE] and
-++** [SQLITE_FCNTL_COMMIT_ATOMIC_WRITE].
-+ */
-+ #define SQLITE_IOCAP_ATOMIC                 0x00000001
-+ #define SQLITE_IOCAP_ATOMIC512              0x00000002
-+@@ -595,6 +607,7 @@ SQLITE_API int sqlite3_exec(
-+ #define SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN  0x00000800
-+ #define SQLITE_IOCAP_POWERSAFE_OVERWRITE    0x00001000
-+ #define SQLITE_IOCAP_IMMUTABLE              0x00002000
-++#define SQLITE_IOCAP_BATCH_ATOMIC           0x00004000
-+ 
-+ /*
-+ ** CAPI3REF: File Locking Levels
-+@@ -729,6 +742,7 @@ struct sqlite3_file {
-+ ** <li> [SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN]
-+ ** <li> [SQLITE_IOCAP_POWERSAFE_OVERWRITE]
-+ ** <li> [SQLITE_IOCAP_IMMUTABLE]
-++** <li> [SQLITE_IOCAP_BATCH_ATOMIC]
-+ ** </ul>
-+ **
-+ ** The SQLITE_IOCAP_ATOMIC property means that all writes of
-+@@ -1012,6 +1026,40 @@ struct sqlite3_io_methods {
-+ ** The [SQLITE_FCNTL_RBU] opcode is implemented by the special VFS used by
-+ ** the RBU extension only.  All other VFS should return SQLITE_NOTFOUND for
-+ ** this opcode.
-++**
-++** <li>[[SQLITE_FCNTL_BEGIN_ATOMIC_WRITE]]
-++** If the [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE] opcode returns SQLITE_OK, then
-++** the file descriptor is placed in "batch write mode", which
-++** means all subsequent write operations will be deferred and done
-++** atomically at the next [SQLITE_FCNTL_COMMIT_ATOMIC_WRITE].  Systems
-++** that do not support batch atomic writes will return SQLITE_NOTFOUND.
-++** ^Following a successful SQLITE_FCNTL_BEGIN_ATOMIC_WRITE and prior to
-++** the closing [SQLITE_FCNTL_COMMIT_ATOMIC_WRITE] or
-++** [SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE], SQLite will make
-++** no VFS interface calls on the same [sqlite3_file] file descriptor
-++** except for calls to the xWrite method and the xFileControl method
-++** with [SQLITE_FCNTL_SIZE_HINT].
-++**
-++** <li>[[SQLITE_FCNTL_COMMIT_ATOMIC_WRITE]]
-++** The [SQLITE_FCNTL_COMMIT_ATOMIC_WRITE] opcode causes all write
-++** operations since the previous successful call to
-++** [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE] to be performed atomically.
-++** This file control returns [SQLITE_OK] if and only if the writes were
-++** all performed successfully and have been committed to persistent storage.
-++** ^Regardless of whether or not it is successful, this file control takes
-++** the file descriptor out of batch write mode so that all subsequent
-++** write operations are independent.
-++** ^SQLite will never invoke SQLITE_FCNTL_COMMIT_ATOMIC_WRITE without
-++** a prior successful call to [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE].
-++**
-++** <li>[[SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE]]
-++** The [SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE] opcode causes all write
-++** operations since the previous successful call to
-++** [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE] to be rolled back.
-++** ^This file control takes the file descriptor out of batch write mode
-++** so that all subsequent write operations are independent.
-++** ^SQLite will never invoke SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE without
-++** a prior successful call to [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE].
-+ ** </ul>
-+ */
-+ #define SQLITE_FCNTL_LOCKSTATE               1
-+@@ -1043,6 +1091,9 @@ struct sqlite3_io_methods {
-+ #define SQLITE_FCNTL_JOURNAL_POINTER        28
-+ #define SQLITE_FCNTL_WIN32_GET_HANDLE       29
-+ #define SQLITE_FCNTL_PDB                    30
-++#define SQLITE_FCNTL_BEGIN_ATOMIC_WRITE     31
-++#define SQLITE_FCNTL_COMMIT_ATOMIC_WRITE    32
-++#define SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE  33
-+ 
-+ /* deprecated names */
-+ #define SQLITE_GET_LOCKPROXYFILE      SQLITE_FCNTL_GET_LOCKPROXYFILE
-+@@ -1613,6 +1664,16 @@ struct sqlite3_mem_methods {
-+ ** routines with a wrapper that simulations memory allocation failure or
-+ ** tracks memory usage, for example. </dd>
-+ **
-++** [[SQLITE_CONFIG_SMALL_MALLOC]] <dt>SQLITE_CONFIG_SMALL_MALLOC</dt>
-++** <dd> ^The SQLITE_CONFIG_SMALL_MALLOC option takes single argument of
-++** type int, interpreted as a boolean, which if true provides a hint to
-++** SQLite that it should avoid large memory allocations if possible.
-++** SQLite will run faster if it is free to make large memory allocations,
-++** but some application might prefer to run slower in exchange for
-++** guarantees about memory fragmentation that are possible if large
-++** allocations are avoided.  This hint is normally off.
-++** </dd>
-++**
-+ ** [[SQLITE_CONFIG_MEMSTATUS]] <dt>SQLITE_CONFIG_MEMSTATUS</dt>
-+ ** <dd> ^The SQLITE_CONFIG_MEMSTATUS option takes single argument of type int,
-+ ** interpreted as a boolean, which enables or disables the collection of
-+@@ -1630,25 +1691,7 @@ struct sqlite3_mem_methods {
-+ ** </dd>
-+ **
-+ ** [[SQLITE_CONFIG_SCRATCH]] <dt>SQLITE_CONFIG_SCRATCH</dt>
-+-** <dd> ^The SQLITE_CONFIG_SCRATCH option specifies a static memory buffer
-+-** that SQLite can use for scratch memory.  ^(There are three arguments
-+-** to SQLITE_CONFIG_SCRATCH:  A pointer an 8-byte
-+-** aligned memory buffer from which the scratch allocations will be
-+-** drawn, the size of each scratch allocation (sz),
-+-** and the maximum number of scratch allocations (N).)^
-+-** The first argument must be a pointer to an 8-byte aligned buffer
-+-** of at least sz*N bytes of memory.
-+-** ^SQLite will not use more than one scratch buffers per thread.
-+-** ^SQLite will never request a scratch buffer that is more than 6
-+-** times the database page size.
-+-** ^If SQLite needs needs additional
-+-** scratch memory beyond what is provided by this configuration option, then
-+-** [sqlite3_malloc()] will be used to obtain the memory needed.<p>
-+-** ^When the application provides any amount of scratch memory using
-+-** SQLITE_CONFIG_SCRATCH, SQLite avoids unnecessary large
-+-** [sqlite3_malloc|heap allocations].
-+-** This can help [Robson proof|prevent memory allocation failures] due to heap
-+-** fragmentation in low-memory embedded systems.
-++** <dd> The SQLITE_CONFIG_SCRATCH option is no longer used.
-+ ** </dd>
-+ **
-+ ** [[SQLITE_CONFIG_PAGECACHE]] <dt>SQLITE_CONFIG_PAGECACHE</dt>
-+@@ -1684,8 +1727,7 @@ struct sqlite3_mem_methods {
-+ ** [[SQLITE_CONFIG_HEAP]] <dt>SQLITE_CONFIG_HEAP</dt>
-+ ** <dd> ^The SQLITE_CONFIG_HEAP option specifies a static memory buffer
-+ ** that SQLite will use for all of its dynamic memory allocation needs
-+-** beyond those provided for by [SQLITE_CONFIG_SCRATCH] and
-+-** [SQLITE_CONFIG_PAGECACHE].
-++** beyond those provided for by [SQLITE_CONFIG_PAGECACHE].
-+ ** ^The SQLITE_CONFIG_HEAP option is only available if SQLite is compiled
-+ ** with either [SQLITE_ENABLE_MEMSYS3] or [SQLITE_ENABLE_MEMSYS5] and returns
-+ ** [SQLITE_ERROR] if invoked otherwise.
-+@@ -1878,7 +1920,7 @@ struct sqlite3_mem_methods {
-+ #define SQLITE_CONFIG_SERIALIZED    3  /* nil */
-+ #define SQLITE_CONFIG_MALLOC        4  /* sqlite3_mem_methods* */
-+ #define SQLITE_CONFIG_GETMALLOC     5  /* sqlite3_mem_methods* */
-+-#define SQLITE_CONFIG_SCRATCH       6  /* void*, int sz, int N */
-++#define SQLITE_CONFIG_SCRATCH       6  /* No longer used */
-+ #define SQLITE_CONFIG_PAGECACHE     7  /* void*, int sz, int N */
-+ #define SQLITE_CONFIG_HEAP          8  /* void*, int nByte, int min */
-+ #define SQLITE_CONFIG_MEMSTATUS     9  /* boolean */
-+@@ -1899,6 +1941,7 @@ struct sqlite3_mem_methods {
-+ #define SQLITE_CONFIG_PCACHE_HDRSZ        24  /* int *psz */
-+ #define SQLITE_CONFIG_PMASZ               25  /* unsigned int szPma */
-+ #define SQLITE_CONFIG_STMTJRNL_SPILL      26  /* int nByte */
-++#define SQLITE_CONFIG_SMALL_MALLOC        27  /* boolean */
-+ 
-+ /*
-+ ** CAPI3REF: Database Connection Configuration Options
-+@@ -3099,10 +3142,10 @@ SQLITE_API void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);
-+ ** ^If [URI filename] interpretation is enabled, and the filename argument
-+ ** begins with "file:", then the filename is interpreted as a URI. ^URI
-+ ** filename interpretation is enabled if the [SQLITE_OPEN_URI] flag is
-+-** set in the fourth argument to sqlite3_open_v2(), or if it has
-++** set in the third argument to sqlite3_open_v2(), or if it has
-+ ** been enabled globally using the [SQLITE_CONFIG_URI] option with the
-+ ** [sqlite3_config()] method or by the [SQLITE_USE_URI] compile-time option.
-+-** As of SQLite version 3.7.7, URI filename interpretation is turned off
-++** URI filename interpretation is turned off
-+ ** by default, but future releases of SQLite might enable URI filename
-+ ** interpretation by default.  See "[URI filenames]" for additional
-+ ** information.
-+@@ -3776,8 +3819,9 @@ SQLITE_API int sqlite3_stmt_busy(sqlite3_stmt*);
-+ ** implementation of [application-defined SQL functions] are protected.
-+ ** ^The sqlite3_value object returned by
-+ ** [sqlite3_column_value()] is unprotected.
-+-** Unprotected sqlite3_value objects may only be used with
-+-** [sqlite3_result_value()] and [sqlite3_bind_value()].
-++** Unprotected sqlite3_value objects may only be used as arguments
-++** to [sqlite3_result_value()], [sqlite3_bind_value()], and
-++** [sqlite3_value_dup()].
-+ ** The [sqlite3_value_blob | sqlite3_value_type()] family of
-+ ** interfaces require protected sqlite3_value objects.
-+ */
-+@@ -6200,15 +6244,20 @@ struct sqlite3_index_info {
-+ ** an operator that is part of a constraint term in the wHERE clause of
-+ ** a query that uses a [virtual table].
-+ */
-+-#define SQLITE_INDEX_CONSTRAINT_EQ      2
-+-#define SQLITE_INDEX_CONSTRAINT_GT      4
-+-#define SQLITE_INDEX_CONSTRAINT_LE      8
-+-#define SQLITE_INDEX_CONSTRAINT_LT     16
-+-#define SQLITE_INDEX_CONSTRAINT_GE     32
-+-#define SQLITE_INDEX_CONSTRAINT_MATCH  64
-+-#define SQLITE_INDEX_CONSTRAINT_LIKE   65
-+-#define SQLITE_INDEX_CONSTRAINT_GLOB   66
-+-#define SQLITE_INDEX_CONSTRAINT_REGEXP 67
-++#define SQLITE_INDEX_CONSTRAINT_EQ         2
-++#define SQLITE_INDEX_CONSTRAINT_GT         4
-++#define SQLITE_INDEX_CONSTRAINT_LE         8
-++#define SQLITE_INDEX_CONSTRAINT_LT        16
-++#define SQLITE_INDEX_CONSTRAINT_GE        32
-++#define SQLITE_INDEX_CONSTRAINT_MATCH     64
-++#define SQLITE_INDEX_CONSTRAINT_LIKE      65
-++#define SQLITE_INDEX_CONSTRAINT_GLOB      66
-++#define SQLITE_INDEX_CONSTRAINT_REGEXP    67
-++#define SQLITE_INDEX_CONSTRAINT_NE        68
-++#define SQLITE_INDEX_CONSTRAINT_ISNOT     69
-++#define SQLITE_INDEX_CONSTRAINT_ISNOTNULL 70
-++#define SQLITE_INDEX_CONSTRAINT_ISNULL    71
-++#define SQLITE_INDEX_CONSTRAINT_IS        72
-+ 
-+ /*
-+ ** CAPI3REF: Register A Virtual Table Implementation
-+@@ -6960,7 +7009,7 @@ SQLITE_API int sqlite3_test_control(int op, ...);
-+ #define SQLITE_TESTCTRL_RESERVE                 14
-+ #define SQLITE_TESTCTRL_OPTIMIZATIONS           15
-+ #define SQLITE_TESTCTRL_ISKEYWORD               16
-+-#define SQLITE_TESTCTRL_SCRATCHMALLOC           17
-++#define SQLITE_TESTCTRL_SCRATCHMALLOC           17  /* NOT USED */
-+ #define SQLITE_TESTCTRL_LOCALTIME_FAULT         18
-+ #define SQLITE_TESTCTRL_EXPLAIN_STMT            19  /* NOT USED */
-+ #define SQLITE_TESTCTRL_ONCE_RESET_THRESHOLD    19
-+@@ -7019,8 +7068,7 @@ SQLITE_API int sqlite3_status64(
-+ ** <dd>This parameter is the current amount of memory checked out
-+ ** using [sqlite3_malloc()], either directly or indirectly.  The
-+ ** figure includes calls made to [sqlite3_malloc()] by the application
-+-** and internal memory usage by the SQLite library.  Scratch memory
-+-** controlled by [SQLITE_CONFIG_SCRATCH] and auxiliary page-cache
-++** and internal memory usage by the SQLite library.  Auxiliary page-cache
-+ ** memory controlled by [SQLITE_CONFIG_PAGECACHE] is not included in
-+ ** this parameter.  The amount returned is the sum of the allocation
-+ ** sizes as reported by the xSize method in [sqlite3_mem_methods].</dd>)^
-+@@ -7058,29 +7106,14 @@ SQLITE_API int sqlite3_status64(
-+ ** *pHighwater parameter to [sqlite3_status()] is of interest.
-+ ** The value written into the *pCurrent parameter is undefined.</dd>)^
-+ **
-+-** [[SQLITE_STATUS_SCRATCH_USED]] ^(<dt>SQLITE_STATUS_SCRATCH_USED</dt>
-+-** <dd>This parameter returns the number of allocations used out of the
-+-** [scratch memory allocator] configured using
-+-** [SQLITE_CONFIG_SCRATCH].  The value returned is in allocations, not
-+-** in bytes.  Since a single thread may only have one scratch allocation
-+-** outstanding at time, this parameter also reports the number of threads
-+-** using scratch memory at the same time.</dd>)^
-++** [[SQLITE_STATUS_SCRATCH_USED]] <dt>SQLITE_STATUS_SCRATCH_USED</dt>
-++** <dd>No longer used.</dd>
-+ **
-+ ** [[SQLITE_STATUS_SCRATCH_OVERFLOW]] ^(<dt>SQLITE_STATUS_SCRATCH_OVERFLOW</dt>
-+-** <dd>This parameter returns the number of bytes of scratch memory
-+-** allocation which could not be satisfied by the [SQLITE_CONFIG_SCRATCH]
-+-** buffer and where forced to overflow to [sqlite3_malloc()].  The values
-+-** returned include overflows because the requested allocation was too
-+-** larger (that is, because the requested allocation was larger than the
-+-** "sz" parameter to [SQLITE_CONFIG_SCRATCH]) and because no scratch buffer
-+-** slots were available.
-+-** </dd>)^
-+-**
-+-** [[SQLITE_STATUS_SCRATCH_SIZE]] ^(<dt>SQLITE_STATUS_SCRATCH_SIZE</dt>
-+-** <dd>This parameter records the largest memory allocation request
-+-** handed to [scratch memory allocator].  Only the value returned in the
-+-** *pHighwater parameter to [sqlite3_status()] is of interest.
-+-** The value written into the *pCurrent parameter is undefined.</dd>)^
-++** <dd>No longer used.</dd>
-++**
-++** [[SQLITE_STATUS_SCRATCH_SIZE]] <dt>SQLITE_STATUS_SCRATCH_SIZE</dt>
-++** <dd>No longer used.</dd>
-+ **
-+ ** [[SQLITE_STATUS_PARSER_STACK]] ^(<dt>SQLITE_STATUS_PARSER_STACK</dt>
-+ ** <dd>The *pHighwater parameter records the deepest parser stack.
-+@@ -7093,12 +7126,12 @@ SQLITE_API int sqlite3_status64(
-+ #define SQLITE_STATUS_MEMORY_USED          0
-+ #define SQLITE_STATUS_PAGECACHE_USED       1
-+ #define SQLITE_STATUS_PAGECACHE_OVERFLOW   2
-+-#define SQLITE_STATUS_SCRATCH_USED         3
-+-#define SQLITE_STATUS_SCRATCH_OVERFLOW     4
-++#define SQLITE_STATUS_SCRATCH_USED         3  /* NOT USED */
-++#define SQLITE_STATUS_SCRATCH_OVERFLOW     4  /* NOT USED */
-+ #define SQLITE_STATUS_MALLOC_SIZE          5
-+ #define SQLITE_STATUS_PARSER_STACK         6
-+ #define SQLITE_STATUS_PAGECACHE_SIZE       7
-+-#define SQLITE_STATUS_SCRATCH_SIZE         8
-++#define SQLITE_STATUS_SCRATCH_SIZE         8  /* NOT USED */
-+ #define SQLITE_STATUS_MALLOC_COUNT         9
-+ 
-+ /*
-+@@ -9218,8 +9251,8 @@ SQLITE_API int sqlite3session_diff(
-+ */
-+ SQLITE_API int sqlite3session_patchset(
-+   sqlite3_session *pSession,      /* Session object */
-+-  int *pnPatchset,                /* OUT: Size of buffer at *ppChangeset */
-+-  void **ppPatchset               /* OUT: Buffer containing changeset */
-++  int *pnPatchset,                /* OUT: Size of buffer at *ppPatchset */
-++  void **ppPatchset               /* OUT: Buffer containing patchset */
-+ );
-+ 
-+ /*
-+@@ -9986,12 +10019,12 @@ SQLITE_API int sqlite3changeset_apply(
-+ **
-+ ** <table border=1 style="margin-left:8ex;margin-right:8ex">
-+ **   <tr><th>Streaming function<th>Non-streaming equivalent</th>
-+-**   <tr><td>sqlite3changeset_apply_str<td>[sqlite3changeset_apply]
-+-**   <tr><td>sqlite3changeset_concat_str<td>[sqlite3changeset_concat]
-+-**   <tr><td>sqlite3changeset_invert_str<td>[sqlite3changeset_invert]
-+-**   <tr><td>sqlite3changeset_start_str<td>[sqlite3changeset_start]
-+-**   <tr><td>sqlite3session_changeset_str<td>[sqlite3session_changeset]
-+-**   <tr><td>sqlite3session_patchset_str<td>[sqlite3session_patchset]
-++**   <tr><td>sqlite3changeset_apply_strm<td>[sqlite3changeset_apply]
-++**   <tr><td>sqlite3changeset_concat_strm<td>[sqlite3changeset_concat]
-++**   <tr><td>sqlite3changeset_invert_strm<td>[sqlite3changeset_invert]
-++**   <tr><td>sqlite3changeset_start_strm<td>[sqlite3changeset_start]
-++**   <tr><td>sqlite3session_changeset_strm<td>[sqlite3session_changeset]
-++**   <tr><td>sqlite3session_patchset_strm<td>[sqlite3session_patchset]
-+ ** </table>
-+ **
-+ ** Non-streaming functions that accept changesets (or patchsets) as input
-+diff --git a/third_party/sqlite/google_generate_amalgamation.sh b/third_party/sqlite/google_generate_amalgamation.sh
-+index cf21cd1..0a1c0fc 100755
-+--- a/third_party/sqlite/google_generate_amalgamation.sh
-++++ b/third_party/sqlite/google_generate_amalgamation.sh
-+@@ -9,7 +9,7 @@ cd src
-+ mkdir bld
-+ cd bld
-+ ../configure
-+-FILES="sqlite3.h sqlite3.c"
-++FILES="shell.c sqlite3.h sqlite3.c"
-+ OPTS=""
-+ make "OPTS=$OPTS" $FILES
-+ cp -f $FILES ../../amalgamation
-+diff --git a/third_party/sqlite/patches/0001-test-SQLite-tests-compiling-on-Linux.patch b/third_party/sqlite/patches/0001-test-SQLite-tests-compiling-on-Linux.patch
-+index b9f982b..e668ae9 100644
-+--- a/third_party/sqlite/patches/0001-test-SQLite-tests-compiling-on-Linux.patch
-++++ b/third_party/sqlite/patches/0001-test-SQLite-tests-compiling-on-Linux.patch
-+@@ -1,4 +1,4 @@
-+-From a9d3b5dc29050f562174939d7154a26ea66ac779 Mon Sep 17 00:00:00 2001
-++From e6a52a13daabf722ed5bee436af214babae113c1 Mon Sep 17 00:00:00 2001
-+ From: Scott Hess <shess@chromium.org>
-+ Date: Fri, 16 Jan 2015 10:24:30 -0800
-+ Subject: [PATCH 01/10] [test] SQLite tests compiling on Linux.
-+@@ -18,7 +18,7 @@ index b838b844a312..62d029430803 100644
-+  #
-+ -TOP = ../sqlite
-+ +TOP = ..
-+- 
-++
-+  #### C Compiler and options for use in building executables that
-+  #    will run on the platform that is doing the build.
-+ @@ -32,19 +32,19 @@ USLEEP = -DHAVE_USLEEP=1
-+@@ -29,7 +29,7 @@ index b838b844a312..62d029430803 100644
-+ -THREADSAFE = -DTHREADSAFE=0
-+ +THREADSAFE = -DTHREADSAFE=1
-+ +#THREADSAFE = -DTHREADSAFE=0
-+- 
-++
-+  #### Specify any extra linker options needed to make the library
-+  #    thread safe
-+  #
-+@@ -37,13 +37,13 @@ index b838b844a312..62d029430803 100644
-+ -THREADLIB =
-+ +THREADLIB = -lpthread
-+ +#THREADLIB =
-+- 
-++
-+  #### Specify any extra libraries needed to access required functions.
-+  #
-+  #TLIBS = -lrt    # fdatasync on Solaris 8
-+ -TLIBS =
-+ +TLIBS = -ldl
-+- 
-++
-+  #### Leave SQLITE_DEBUG undefined for maximum speed.  Use SQLITE_DEBUG=1
-+  #    to check for memory leaks.  Use SQLITE_DEBUG=2 to print a log of all
-+ @@ -58,7 +58,24 @@ TLIBS =
-+@@ -69,7 +69,7 @@ index b838b844a312..62d029430803 100644
-+ +
-+ +# TODO(shess) I can't see why I need this setting.
-+ +OPTS += -DOS_UNIX=1
-+- 
-++
-+  #### The suffix to add to executable files.  ".exe" for windows.
-+  #    Nothing for unix.
-+ @@ -70,7 +87,7 @@ EXE =
-+@@ -82,7 +82,7 @@ index b838b844a312..62d029430803 100644
-+  #TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage
-+  #TCC = /opt/mingw/bin/i386-mingw32-gcc -O6
-+ @@ -91,16 +108,16 @@ SHPREFIX = lib
-+- 
-++
-+  #### Extra compiler options needed for programs that use the TCL library.
-+  #
-+ -#TCL_FLAGS =
-+@@ -92,7 +92,7 @@ index b838b844a312..62d029430803 100644
-+ +#TCL_FLAGS = -I/home/drh/tcltk/8.5linux
-+  #TCL_FLAGS = -I/home/drh/tcltk/8.5win -DSTATIC_BUILD=1
-+  #TCL_FLAGS = -I/home/drh/tcltk/8.3hpux
-+- 
-++
-+  #### Linker options needed to link against the TCL library.
-+  #
-+ -#LIBTCL = -ltcl -lm -ldl
-+@@ -101,20 +101,19 @@ index b838b844a312..62d029430803 100644
-+ +#LIBTCL = /home/drh/tcltk/8.5linux/libtcl8.5g.a -lm -ldl
-+  #LIBTCL = /home/drh/tcltk/8.5win/libtcl85s.a -lmsvcrt
-+  #LIBTCL = /home/drh/tcltk/8.3hpux/libtcl8.3.a -ldld -lm -lc
-+- 
-++
-+ diff --git a/third_party/sqlite/src/main.mk b/third_party/sqlite/src/main.mk
-+-index 62ba293d5b9d..32c394e7812d 100644
-++index d45f8b8a4daf..be694f0d5586 100644
-+ --- a/third_party/sqlite/src/main.mk
-+ +++ b/third_party/sqlite/src/main.mk
-+-@@ -766,7 +766,7 @@ sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl
-+- 	echo "; return zMainloop; }" >> $@
-+- 
-++@@ -784,7 +784,7 @@ sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $
-++ 	tclsh $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in >sqlite3_analyzer.c
-++
-+  sqlite3_analyzer$(EXE): sqlite3_analyzer.c
-+ -	$(TCCX) $(TCL_FLAGS) sqlite3_analyzer.c -o $@ $(LIBTCL) $(THREADLIB)
-+ +	$(TCCX) $(TCL_FLAGS) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS) $(THREADLIB)
-+- 
-++
-+  dbdump$(EXE):	$(TOP)/ext/misc/dbdump.c sqlite3.o
-+  	$(TCCX) -DDBDUMP_STANDALONE -o dbdump$(EXE) \
-+--- 
-+-2.13.1.518.g3df882009-goog
-+-
-++--
-++2.14.0
-+diff --git a/third_party/sqlite/patches/0002-Use-seperate-page-cache-pools-for-each-sqlite-connec.patch b/third_party/sqlite/patches/0002-Use-seperate-page-cache-pools-for-each-sqlite-connec.patch
-+index 3a98544..d6417fd 100644
-+--- a/third_party/sqlite/patches/0002-Use-seperate-page-cache-pools-for-each-sqlite-connec.patch
-++++ b/third_party/sqlite/patches/0002-Use-seperate-page-cache-pools-for-each-sqlite-connec.patch
-+@@ -1,4 +1,4 @@
-+-From 0189f2ce45d8c2ed45e5321361cd7de21ea4432e Mon Sep 17 00:00:00 2001
-++From a5bfa4afd458372a73efed9b191a02c7b7c000c5 Mon Sep 17 00:00:00 2001
-+ From: rmcilroy <rmcilroy@chromium.org>
-+ Date: Thu, 20 Jun 2013 22:50:12 +0000
-+ Subject: [PATCH 02/10] Use seperate page-cache pools for each sqlite
-+@@ -16,7 +16,7 @@ Original review URL: https://chromiumcodereview.appspot.com/17413004
-+  1 file changed, 5 insertions(+), 1 deletion(-)
-+ 
-+ diff --git a/third_party/sqlite/src/src/pcache1.c b/third_party/sqlite/src/src/pcache1.c
-+-index 885b8b11fcf7..4b09e9805e82 100644
-++index 2692bd6ac9d3..c93294a9df71 100644
-+ --- a/third_party/sqlite/src/src/pcache1.c
-+ +++ b/third_party/sqlite/src/src/pcache1.c
-+ @@ -689,6 +689,8 @@ static int pcache1Init(void *NotUsed){
-+@@ -39,6 +39,5 @@ index 885b8b11fcf7..4b09e9805e82 100644
-+    pcache1.separateCache = 0;
-+  #elif SQLITE_THREADSAFE
-+    pcache1.separateCache = sqlite3GlobalConfig.pPage==0
-+--- 
-+-2.13.1.518.g3df882009-goog
-+-
-++--
-++2.14.0
-+diff --git a/third_party/sqlite/patches/0003-Modify-default-VFS-to-support-WebDatabase.patch b/third_party/sqlite/patches/0003-Modify-default-VFS-to-support-WebDatabase.patch
-+index 2c6ea2d..3a14846 100644
-+--- a/third_party/sqlite/patches/0003-Modify-default-VFS-to-support-WebDatabase.patch
-++++ b/third_party/sqlite/patches/0003-Modify-default-VFS-to-support-WebDatabase.patch
-+@@ -1,4 +1,4 @@
-+-From 718473c4f2c41afdd60132f3cf97d0567e8a3aa4 Mon Sep 17 00:00:00 2001
-++From 3b4029bed436558ae745630e970b0f6d8040fb54 Mon Sep 17 00:00:00 2001
-+ From: dumi <dumi@chromium.org>
-+ Date: Mon, 20 Jul 2009 23:40:51 +0000
-+ Subject: [PATCH 03/10] Modify default VFS to support WebDatabase.
-+@@ -17,16 +17,16 @@ https://codereview.chromium.org/384075
-+ https://codereview.chromium.org/377039
-+ [Possibly not a complete list.]
-+ ---
-+- third_party/sqlite/src/src/os_unix.c   | 49 ++++++++++++++++++++++++++++++++++
-++ third_party/sqlite/src/src/os_unix.c   | 50 ++++++++++++++++++++++++++++++++++
-+  third_party/sqlite/src/src/os_win.c    |  8 ++++++
-+  third_party/sqlite/src/src/sqlite.h.in | 23 ++++++++++++++++
-+- 3 files changed, 80 insertions(+)
-++ 3 files changed, 81 insertions(+)
-+ 
-+ diff --git a/third_party/sqlite/src/src/os_unix.c b/third_party/sqlite/src/src/os_unix.c
-+-index 8ab779a35288..44f6d67ee07f 100644
-++index 1b7e5f344a69..6ed6f6a8fc98 100644
-+ --- a/third_party/sqlite/src/src/os_unix.c
-+ +++ b/third_party/sqlite/src/src/os_unix.c
-+-@@ -1346,6 +1346,12 @@ static int fileHasMoved(unixFile *pFile){
-++@@ -1366,6 +1366,12 @@ static int fileHasMoved(unixFile *pFile){
-+    return pFile->pInode!=0 && pFile->pId!=pFile->pInode->fileId.pId;
-+  #else
-+    struct stat buf;
-+@@ -39,10 +39,10 @@ index 8ab779a35288..44f6d67ee07f 100644
-+    return pFile->pInode!=0 &&
-+        (osStat(pFile->zPath, &buf)!=0
-+           || (u64)buf.st_ino!=pFile->pInode->fileId.ino);
-+-@@ -5639,6 +5645,44 @@ static int findCreateFileMode(
-++@@ -5688,6 +5694,45 @@ static int findCreateFileMode(
-+    return rc;
-+  }
-+- 
-++
-+ +/*
-+ +** Initialize |unixFile| internals of |file| on behalf of chromiumOpen() in
-+ +** WebDatabase SQLiteFileSystemPosix.cpp.  Function is a subset of unixOpen(),
-+@@ -63,20 +63,21 @@ index 8ab779a35288..44f6d67ee07f 100644
-+ +  memset(p, 0, sizeof(unixFile));
-+ +
-+ +  /* osStat() will not work in the sandbox, so findReusableFd() will always
-+-+  ** fail, so directly include the failure-case setup then initialize pUnused.
-+++  ** fail, so directly include the failure-case setup then initialize
-+++  ** pPreallocatedUnused.
-+ +  */
-+ +  if( eType==SQLITE_OPEN_MAIN_DB ){
-+-+    p->pUnused = sqlite3_malloc(sizeof(*p->pUnused));
-+-+    if (!p->pUnused) {
-+++    p->pPreallocatedUnused = sqlite3_malloc(sizeof(*p->pPreallocatedUnused));
-+++    if (!p->pPreallocatedUnused) {
-+ +      return SQLITE_NOMEM_BKPT;
-+ +    }
-+-+    p->pUnused->fd = fd;
-+-+    p->pUnused->flags = flags;
-+++    p->pPreallocatedUnused->fd = fd;
-+++    p->pPreallocatedUnused->flags = flags;
-+ +  }
-+ +
-+ +  rc = fillInUnixFile(pVfs, fd, pFile, zPath, ctrlFlags);
-+ +  if( rc!=SQLITE_OK ){
-+-+    sqlite3_free(p->pUnused);
-+++    sqlite3_free(p->pPreallocatedUnused);
-+ +  }
-+ +  return rc;
-+ +}
-+@@ -84,15 +85,15 @@ index 8ab779a35288..44f6d67ee07f 100644
-+  /*
-+  ** Open the file zPath.
-+  **
-+-@@ -5740,6 +5784,7 @@ static int unixOpen(
-++@@ -5789,6 +5834,7 @@ static int unixOpen(
-+      sqlite3_randomness(0,0);
-+    }
-+- 
-++
-+ +  /* Duplicated in chromium_sqlite3_fill_in_unix_sqlite3_file(). */
-+    memset(p, 0, sizeof(unixFile));
-+- 
-++
-+    if( eType==SQLITE_OPEN_MAIN_DB ){
-+-@@ -5748,6 +5793,7 @@ static int unixOpen(
-++@@ -5797,6 +5843,7 @@ static int unixOpen(
-+      if( pUnused ){
-+        fd = pUnused->fd;
-+      }else{
-+@@ -100,35 +101,35 @@ index 8ab779a35288..44f6d67ee07f 100644
-+        pUnused = sqlite3_malloc64(sizeof(*pUnused));
-+        if( !pUnused ){
-+          return SQLITE_NOMEM_BKPT;
-+-@@ -5825,6 +5871,7 @@ static int unixOpen(
-++@@ -5874,6 +5921,7 @@ static int unixOpen(
-+    }
-+- 
-+-   if( p->pUnused ){
-++
-++   if( p->pPreallocatedUnused ){
-+ +    /* Duplicated in chromium_sqlite3_fill_in_unix_sqlite3_file(). */
-+-     p->pUnused->fd = fd;
-+-     p->pUnused->flags = flags;
-+-   }
-+-@@ -5903,10 +5950,12 @@ static int unixOpen(
-++     p->pPreallocatedUnused->fd = fd;
-++     p->pPreallocatedUnused->flags = flags;
-+    }
-+- #endif
-+- 
-++@@ -5955,10 +6003,12 @@ static int unixOpen(
-++   assert( zPath==0 || zPath[0]=='/'
-++       || eType==SQLITE_OPEN_MASTER_JOURNAL || eType==SQLITE_OPEN_MAIN_JOURNAL
-++   );
-+ +  /* Duplicated in chromium_sqlite3_fill_in_unix_sqlite3_file(). */
-+    rc = fillInUnixFile(pVfs, fd, pFile, zPath, ctrlFlags);
-+- 
-++
-+  open_finished:
-+    if( rc!=SQLITE_OK ){
-+ +    /* Duplicated in chromium_sqlite3_fill_in_unix_sqlite3_file(). */
-+-     sqlite3_free(p->pUnused);
-++     sqlite3_free(p->pPreallocatedUnused);
-+    }
-+    return rc;
-+ diff --git a/third_party/sqlite/src/src/os_win.c b/third_party/sqlite/src/src/os_win.c
-+-index a87d7d09256d..1d9abf0a8f35 100644
-++index 245a86045bae..eeb2c149800d 100644
-+ --- a/third_party/sqlite/src/src/os_win.c
-+ +++ b/third_party/sqlite/src/src/os_win.c
-+-@@ -5998,4 +5998,12 @@ int sqlite3_os_end(void){
-++@@ -6026,4 +6026,12 @@ int sqlite3_os_end(void){
-+    return SQLITE_OK;
-+  }
-+- 
-++
-+ +CHROMIUM_SQLITE_API
-+ +void chromium_sqlite3_initialize_win_sqlite3_file(sqlite3_file* file, HANDLE handle) {
-+ +  winFile* winSQLite3File = (winFile*)file;
-+@@ -139,13 +140,13 @@ index a87d7d09256d..1d9abf0a8f35 100644
-+ +
-+  #endif /* SQLITE_OS_WIN */
-+ diff --git a/third_party/sqlite/src/src/sqlite.h.in b/third_party/sqlite/src/src/sqlite.h.in
-+-index 025fa5dadc40..2503d76c8f27 100644
-++index 64685fef4569..877e79f74af2 100644
-+ --- a/third_party/sqlite/src/src/sqlite.h.in
-+ +++ b/third_party/sqlite/src/src/sqlite.h.in
-+-@@ -7918,6 +7918,29 @@ int sqlite3_strnicmp(const char *, const char *, int);
-++@@ -7954,6 +7954,29 @@ int sqlite3_strnicmp(const char *, const char *, int);
-+  */
-+  int sqlite3_strglob(const char *zGlob, const char *zStr);
-+- 
-++
-+ +/* Begin WebDatabase patch for Chromium */
-+ +/* Expose some SQLite internals for the WebDatabase vfs.
-+ +** DO NOT EXTEND THE USE OF THIS.
-+@@ -172,6 +173,5 @@ index 025fa5dadc40..2503d76c8f27 100644
-+  /*
-+  ** CAPI3REF: String LIKE Matching
-+  *
-+--- 
-+-2.13.1.518.g3df882009-goog
-+-
-++--
-++2.14.0
-+diff --git a/third_party/sqlite/patches/0004-Virtual-table-supporting-recovery-of-corrupted-datab.patch b/third_party/sqlite/patches/0004-Virtual-table-supporting-recovery-of-corrupted-datab.patch
-+index 3b60cd8..3c44adc 100644
-+--- a/third_party/sqlite/patches/0004-Virtual-table-supporting-recovery-of-corrupted-datab.patch
-++++ b/third_party/sqlite/patches/0004-Virtual-table-supporting-recovery-of-corrupted-datab.patch
-+@@ -1,4 +1,4 @@
-+-From 116d95a1309084e8ef963e8735d426e74d595b99 Mon Sep 17 00:00:00 2001
-++From 86758183a3ed8211f997c10f47582847686eaa95 Mon Sep 17 00:00:00 2001
-+ From: Scott Hess <shess@chromium.org>
-+ Date: Sat, 20 Jul 2013 11:42:21 -0700
-+ Subject: [PATCH 04/10] Virtual table supporting recovery of corrupted
-+@@ -34,19 +34,19 @@ third_party/sqlite/src/src/{recover,recover-alt}.c .
-+  create mode 100644 third_party/sqlite/src/test/recover2.test
-+ 
-+ diff --git a/third_party/sqlite/src/main.mk b/third_party/sqlite/src/main.mk
-+-index 32c394e7812d..7e39a3d92c35 100644
-++index be694f0d5586..e645794c2325 100644
-+ --- a/third_party/sqlite/src/main.mk
-+ +++ b/third_party/sqlite/src/main.mk
-+-@@ -76,6 +76,8 @@ LIBOBJ+= vdbe.o parse.o \
-++@@ -77,6 +77,8 @@ LIBOBJ+= vdbe.o parse.o \
-+  	 vdbetrace.o wal.o walker.o where.o wherecode.o whereexpr.o \
-+           utf.o vtab.o
-+- 
-++
-+ +LIBOBJ += recover.o recover_varint.o
-+ +
-+  LIBOBJ += sqlite3session.o
-+- 
-++
-+  # All of the source code files.
-+-@@ -373,6 +375,8 @@ TESTSRC2 = \
-++@@ -380,6 +382,8 @@ TESTSRC2 = \
-+    $(TOP)/src/prepare.c \
-+    $(TOP)/src/printf.c \
-+    $(TOP)/src/random.c \
-+@@ -55,22 +55,22 @@ index 32c394e7812d..7e39a3d92c35 100644
-+    $(TOP)/src/pcache.c \
-+    $(TOP)/src/pcache1.c \
-+    $(TOP)/src/select.c \
-+-@@ -779,6 +783,7 @@ TESTFIXTURE_FLAGS += -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE
-+- TESTFIXTURE_FLAGS += -DSQLITE_SERIES_CONSTRAINT_VERIFY=1
-+- TESTFIXTURE_FLAGS += -DSQLITE_DEFAULT_PAGE_SIZE=1024
-++@@ -799,6 +803,7 @@ TESTFIXTURE_FLAGS += -DSQLITE_DEFAULT_PAGE_SIZE=1024
-+  TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_STMTVTAB
-++ TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_DBPAGE_VTAB
-++ TESTFIXTURE_FLAGS += -DTCLSH_INIT_PROC=sqlite3TestInit
-+ +TESTFIXTURE_FLAGS += -DDEFAULT_ENABLE_RECOVER=1
-+- 
-++
-+  testfixture$(EXE): $(TESTSRC2) libsqlite3.a $(TESTSRC) $(TOP)/src/tclsqlite.c
-+- 	$(TCCX) $(TCL_FLAGS) -DTCLSH=1 $(TESTFIXTURE_FLAGS)                  \
-++ 	$(TCCX) $(TCL_FLAGS) $(TESTFIXTURE_FLAGS)                            \
-+ diff --git a/third_party/sqlite/src/src/main.c b/third_party/sqlite/src/src/main.c
-+-index b706a0e49cf0..0b8c18d90620 100644
-++index 8b6aac07a5a2..0709b3a34330 100644
-+ --- a/third_party/sqlite/src/src/main.c
-+ +++ b/third_party/sqlite/src/src/main.c
-+-@@ -3041,6 +3041,14 @@ static int openDatabase(
-++@@ -3042,6 +3042,14 @@ static int openDatabase(
-+    }
-+  #endif
-+- 
-++
-+ +#ifdef DEFAULT_ENABLE_RECOVER
-+ +  /* Initialize recover virtual table for testing. */
-+ +  extern int recoverVtableInit(sqlite3 *db);
-+@@ -3900,6 +3900,5 @@ index 000000000000..8aa4e049a010
-+ +} [list 4 1024 1 text [string length $substr] $substr]
-+ +
-+ +finish_test
-+--- 
-+-2.13.1.518.g3df882009-goog
-+-
-++--
-++2.14.0
-+diff --git a/third_party/sqlite/patches/0005-Custom-shell.c-helpers-to-load-Chromium-s-ICU-data.patch b/third_party/sqlite/patches/0005-Custom-shell.c-helpers-to-load-Chromium-s-ICU-data.patch
-+index d12638a..9c7f6df 100644
-+--- a/third_party/sqlite/patches/0005-Custom-shell.c-helpers-to-load-Chromium-s-ICU-data.patch
-++++ b/third_party/sqlite/patches/0005-Custom-shell.c-helpers-to-load-Chromium-s-ICU-data.patch
-+@@ -1,4 +1,4 @@
-+-From 7be8f980d0e23ee4b336fdcfc25152c650a0e65a Mon Sep 17 00:00:00 2001
-++From 964180d41d6d75cacf27c4764dca353b82ceb784 Mon Sep 17 00:00:00 2001
-+ From: "tc@google.com" <tc@google.com>
-+ Date: Tue, 6 Jan 2009 22:39:41 +0000
-+ Subject: [PATCH 05/10] Custom shell.c helpers to load Chromium's ICU data.
-+@@ -10,7 +10,7 @@ Original review URL: https://codereview.chromium.org/42250
-+ ---
-+  third_party/sqlite/src/Makefile.linux-gcc    |  7 ++++++
-+  third_party/sqlite/src/main.mk               |  2 +-
-+- third_party/sqlite/src/src/shell.c           | 10 +++++++++
-++ third_party/sqlite/src/src/shell.c.in        | 10 +++++++++
-+  third_party/sqlite/src/src/shell_icu_linux.c | 27 +++++++++++++++++++++++
-+  third_party/sqlite/src/src/shell_icu_win.c   | 32 ++++++++++++++++++++++++++++
-+  5 files changed, 77 insertions(+), 1 deletion(-)
-+@@ -24,7 +24,7 @@ index 62d029430803..a37d41a0099d 100644
-+ @@ -77,6 +77,13 @@ OPTS += -DSQLITE_MEMDEBUG=1
-+  # TODO(shess) I can't see why I need this setting.
-+  OPTS += -DOS_UNIX=1
-+- 
-++
-+ +# Support for loading Chromium ICU data in sqlite3.
-+ +ifeq ($(shell uname -s),Darwin)
-+ +SHELL_ICU =
-+@@ -36,26 +36,26 @@ index 62d029430803..a37d41a0099d 100644
-+  #    Nothing for unix.
-+  #
-+ diff --git a/third_party/sqlite/src/main.mk b/third_party/sqlite/src/main.mk
-+-index 7e39a3d92c35..908cf510c5b3 100644
-++index e645794c2325..5c34a8d9b53e 100644
-+ --- a/third_party/sqlite/src/main.mk
-+ +++ b/third_party/sqlite/src/main.mk
-+-@@ -501,7 +501,7 @@ libsqlite3.a:	$(LIBOBJ)
-+- 
-+- sqlite3$(EXE):	$(TOP)/src/shell.c libsqlite3.a sqlite3.h
-++@@ -510,7 +510,7 @@ libsqlite3.a:	$(LIBOBJ)
-++
-++ sqlite3$(EXE):	shell.c libsqlite3.a sqlite3.h
-+  	$(TCCX) $(READLINE_FLAGS) -o sqlite3$(EXE) $(SHELL_OPT) \
-+--		$(TOP)/src/shell.c libsqlite3.a $(LIBREADLINE) $(TLIBS) $(THREADLIB)
-+-+		$(TOP)/src/shell.c $(SHELL_ICU) libsqlite3.a $(LIBREADLINE) $(TLIBS) $(THREADLIB)
-+- 
-++-		shell.c libsqlite3.a $(LIBREADLINE) $(TLIBS) $(THREADLIB)
-+++		shell.c $(SHELL_ICU) libsqlite3.a $(LIBREADLINE) $(TLIBS) $(THREADLIB)
-++
-+  sqldiff$(EXE):	$(TOP)/tool/sqldiff.c sqlite3.c sqlite3.h
-+  	$(TCCX) -o sqldiff$(EXE) -DSQLITE_THREADSAFE=0 \
-+-diff --git a/third_party/sqlite/src/src/shell.c b/third_party/sqlite/src/src/shell.c
-+-index fa51056c42cc..33f41f694e41 100644
-+---- a/third_party/sqlite/src/src/shell.c
-+-+++ b/third_party/sqlite/src/src/shell.c
-+-@@ -8067,6 +8067,16 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
-++diff --git a/third_party/sqlite/src/src/shell.c.in b/third_party/sqlite/src/src/shell.c.in
-++index 8f5ed59e9304..a500a19ca7df 100644
-++--- a/third_party/sqlite/src/src/shell.c.in
-+++++ b/third_party/sqlite/src/src/shell.c.in
-++@@ -6703,6 +6703,16 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
-+    }
-+  #endif
-+- 
-++
-+ +  /* Begin evanm patch. */
-+ +#if !defined(__APPLE__)
-+ +  extern int sqlite_shell_init_icu();
-+@@ -140,6 +140,5 @@ index 000000000000..67ebbf4fbdb4
-+ +
-+ +  return 1;
-+ +}
-+--- 
-+-2.13.1.518.g3df882009-goog
-+-
-++--
-++2.14.0
-+diff --git a/third_party/sqlite/patches/0006-fts3-Disable-fts3_tokenizer-and-fts4.patch b/third_party/sqlite/patches/0006-fts3-Disable-fts3_tokenizer-and-fts4.patch
-+index 543ce02..a3a532c 100644
-+--- a/third_party/sqlite/patches/0006-fts3-Disable-fts3_tokenizer-and-fts4.patch
-++++ b/third_party/sqlite/patches/0006-fts3-Disable-fts3_tokenizer-and-fts4.patch
-+@@ -1,4 +1,4 @@
-+-From e249174e02172cdddc4b22662d092303b3814d10 Mon Sep 17 00:00:00 2001
-++From 11549819a8c9f9ebc7cea2501c6939e497014524 Mon Sep 17 00:00:00 2001
-+ From: Scott Hess <shess@chromium.org>
-+ Date: Tue, 16 Dec 2014 13:02:27 -0800
-+ Subject: [PATCH 06/10] [fts3] Disable fts3_tokenizer and fts4.
-+@@ -22,7 +22,7 @@ index 03a22f80f9ea..06c20756c85a 100644
-+  ** older data.
-+  */
-+ +#define CHROMIUM_FTS3_CHANGES 1
-+- 
-++
-+  #include "fts3Int.h"
-+  #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
-+ @@ -3972,7 +3973,11 @@ int sqlite3Fts3Init(sqlite3 *db){
-+@@ -54,7 +54,6 @@ index 03a22f80f9ea..06c20756c85a 100644
-+ +#endif
-+      return rc;
-+    }
-+- 
-+--- 
-+-2.13.1.518.g3df882009-goog
-+ 
-++--
-++2.14.0
-+diff --git a/third_party/sqlite/patches/0007-fts3-Interior-node-corruption-detection.patch b/third_party/sqlite/patches/0007-fts3-Interior-node-corruption-detection.patch
-+index 3c9ad4f..ad78991 100644
-+--- a/third_party/sqlite/patches/0007-fts3-Interior-node-corruption-detection.patch
-++++ b/third_party/sqlite/patches/0007-fts3-Interior-node-corruption-detection.patch
-+@@ -1,4 +1,4 @@
-+-From e26dff5d8ad6e582d18bdd7dbc233e0cdd4b1034 Mon Sep 17 00:00:00 2001
-++From 0eeedaeb8c90b61873e984cb005a9713bb659340 Mon Sep 17 00:00:00 2001
-+ From: Scott Hess <shess@chromium.org>
-+ Date: Thu, 26 May 2011 18:44:46 +0000
-+ Subject: [PATCH 07/10] [fts3] Interior node corruption detection.
-+@@ -27,7 +27,7 @@ index 06c20756c85a..2d21c4fd6844 100644
-+ @@ -1859,8 +1859,13 @@ static int fts3ScanInteriorNode(
-+      isFirstTerm = 0;
-+      zCsr += fts3GetVarint32(zCsr, &nSuffix);
-+- 
-++
-+ -    assert( nPrefix>=0 && nSuffix>=0 );
-+ -    if( &zCsr[nSuffix]>zEnd ){
-+ +    /* NOTE(shess): Previous code checked for negative nPrefix and
-+@@ -40,6 +40,5 @@ index 06c20756c85a..2d21c4fd6844 100644
-+        rc = FTS_CORRUPT_VTAB;
-+        goto finish_scan;
-+      }
-+--- 
-+-2.13.1.518.g3df882009-goog
-+-
-++--
-++2.14.0
-+diff --git a/third_party/sqlite/patches/0008-fts3-Fix-uninit-variable-in-fts3EvalDeferredPhrase.patch b/third_party/sqlite/patches/0008-fts3-Fix-uninit-variable-in-fts3EvalDeferredPhrase.patch
-+index f0d0674..e583fc1 100644
-+--- a/third_party/sqlite/patches/0008-fts3-Fix-uninit-variable-in-fts3EvalDeferredPhrase.patch
-++++ b/third_party/sqlite/patches/0008-fts3-Fix-uninit-variable-in-fts3EvalDeferredPhrase.patch
-+@@ -1,4 +1,4 @@
-+-From 6bf4c55498680496d6e150d22219f7a980566ce6 Mon Sep 17 00:00:00 2001
-++From a3b999263f36b0807ce4ead622e9ad8a536e641b Mon Sep 17 00:00:00 2001
-+ From: Scott Hess <shess@chromium.org>
-+ Date: Thu, 12 Feb 2015 15:01:26 -0800
-+ Subject: [PATCH 08/10] [fts3] Fix uninit variable in fts3EvalDeferredPhrase.
-+@@ -19,7 +19,7 @@ index 2d21c4fd6844..a563dc788c77 100644
-+ +++ b/third_party/sqlite/src/ext/fts3/fts3.c
-+ @@ -4187,8 +4187,8 @@ static int fts3EvalDeferredPhrase(Fts3Cursor *pCsr, Fts3Phrase *pPhrase){
-+      Fts3DeferredToken *pDeferred = pToken->pDeferred;
-+- 
-++
-+      if( pDeferred ){
-+ -      char *pList;
-+ -      int nList;
-+@@ -27,7 +27,6 @@ index 2d21c4fd6844..a563dc788c77 100644
-+ +      int nList = 0;
-+        int rc = sqlite3Fts3DeferredTokenList(pDeferred, &pList, &nList);
-+        if( rc!=SQLITE_OK ) return rc;
-+- 
-+--- 
-+-2.13.1.518.g3df882009-goog
-+ 
-++--
-++2.14.0
-+diff --git a/third_party/sqlite/patches/0009-Allow-auto-vacuum-to-work-with-chunks.patch b/third_party/sqlite/patches/0009-Allow-auto-vacuum-to-work-with-chunks.patch
-+new file mode 100644
-+index 0000000..04bf254
-+--- /dev/null
-++++ b/third_party/sqlite/patches/0009-Allow-auto-vacuum-to-work-with-chunks.patch
-+@@ -0,0 +1,301 @@
-++From e3f2de64eb622782bdad355e378b9733984c12f4 Mon Sep 17 00:00:00 2001
-++From: Scott Hess <shess@chromium.org>
-++Date: Thu, 2 Mar 2017 15:23:09 -0800
-++Subject: [PATCH 09/10] Allow auto-vacuum to work with chunks.
-++
-++SQLITE_FCNTL_CHUNK_SIZE can advise the VFS to resize files in quantum
-++amounts, to reduce fragmentation from tiny appends.  This change allows
-++a new PRAGMA auto_vacuum_slack_pages to provide auto_vacuum with a hint
-++to only rearrange pages when an entire quantum can be released.
-++
-++When rebasing this patch, first ignore the conflicts in src/pragma.h,
-++and fix all the other conflicts. Then run the commands below (in
-++third_party/sqlite) to re-generate src/pragma.h.
-++tclsh src/tool/mkpragmatab.tcl
-++find src/ -type f -iname "*.h" -exec \
-++    $GNU_SED --in-place 's/[[:space:]]\+$//' {} \+
-++
-++BUG=698010
-++---
-++ third_party/sqlite/src/src/btree.c          | 56 ++++++++++++++++-
-++ third_party/sqlite/src/src/btree.h          |  2 +
-++ third_party/sqlite/src/src/btreeInt.h       |  1 +
-++ third_party/sqlite/src/src/pragma.c         | 21 +++++++
-++ third_party/sqlite/src/src/pragma.h         | 98 +++++++++++++++--------------
-++ third_party/sqlite/src/tool/mkpragmatab.tcl |  4 ++
-++ 6 files changed, 135 insertions(+), 47 deletions(-)
-++
-++diff --git a/third_party/sqlite/src/src/btree.c b/third_party/sqlite/src/src/btree.c
-++index e62f3af10f52..e349eac4b01f 100644
-++--- a/third_party/sqlite/src/src/btree.c
-+++++ b/third_party/sqlite/src/src/btree.c
-++@@ -2943,6 +2943,46 @@ static void setDefaultSyncFlag(BtShared *pBt, u8 safety_level){
-++ # define setDefaultSyncFlag(pBt,safety_level)
-++ #endif
-++
-+++/*
-+++** Change the 'auto-vacuum-slack-pages' property of the database. If auto vacuum
-+++** is enabled, this is the number of chunks of slack to allow before
-+++** automatically running an incremental vacuum.
-+++*/
-+++int sqlite3BtreeSetAutoVacuumSlackPages(Btree *p, int autoVacuumSlack){
-+++#ifdef SQLITE_OMIT_AUTOVACUUM
-+++  return SQLITE_READONLY;
-+++#else
-+++  BtShared *pBt = p->pBt;
-+++  int rc = SQLITE_OK;
-+++  u8 avs = (u8)autoVacuumSlack;
-+++  if( autoVacuumSlack>avs ){
-+++    avs = 0xFF;
-+++  }
-+++
-+++  sqlite3BtreeEnter(p);
-+++  pBt->autoVacuumSlack = avs;
-+++  sqlite3BtreeLeave(p);
-+++  return rc;
-+++#endif
-+++}
-+++
-+++/*
-+++** Return the value of the 'auto-vacuum-slack-pages' property.
-+++*/
-+++int sqlite3BtreeGetAutoVacuumSlackPages(Btree *p){
-+++#ifdef SQLITE_OMIT_AUTOVACUUM
-+++  return 0;
-+++#else
-+++  int rc = 0;
-+++  sqlite3BtreeEnter(p);
-+++  if( p->pBt->autoVacuum!=0 ){
-+++    rc = p->pBt->autoVacuumSlack;
-+++  }
-+++  sqlite3BtreeLeave(p);
-+++  return rc;
-+++#endif
-+++}
-+++
-++ /*
-++ ** Get a reference to pPage1 of the database file.  This will
-++ ** also acquire a readlock on that file.
-++@@ -3772,13 +3812,27 @@ int sqlite3BtreeIncrVacuum(Btree *p){
-++ */
-++ static int autoVacuumCommit(BtShared *pBt){
-++   int rc = SQLITE_OK;
-+++  int bShouldVacuum = pBt->autoVacuum && !pBt->incrVacuum;
-++   Pager *pPager = pBt->pPager;
-++   VVA_ONLY( int nRef = sqlite3PagerRefcount(pPager); )
-++
-++   assert( sqlite3_mutex_held(pBt->mutex) );
-++   invalidateAllOverflowCache(pBt);
-++   assert(pBt->autoVacuum);
-++-  if( !pBt->incrVacuum ){
-+++  if( bShouldVacuum && pBt->autoVacuumSlack ){
-+++    Pgno nOrig;        /* Database size before freeing */
-+++    Pgno nFree;        /* Number of pages on the freelist initially */
-+++
-+++    nOrig = btreePagecount(pBt);
-+++    nFree = get4byte(&pBt->pPage1->aData[36]);
-+++    bShouldVacuum =
-+++        (nOrig-nFree-1)/pBt->autoVacuumSlack < (nOrig-1)/pBt->autoVacuumSlack;
-+++    /* TODO: When integrating this test with the following code, contrive to
-+++    ** trim to the integral chunk boundary, rather than trimming the entire free
-+++    ** list.
-+++    */
-+++  }
-+++  if( bShouldVacuum ){
-++     Pgno nFin;         /* Number of pages in database after autovacuuming */
-++     Pgno nFree;        /* Number of pages on the freelist initially */
-++     Pgno iFree;        /* The next page to be freed */
-++diff --git a/third_party/sqlite/src/src/btree.h b/third_party/sqlite/src/src/btree.h
-++index b348e9298461..3a0b008abadb 100644
-++--- a/third_party/sqlite/src/src/btree.h
-+++++ b/third_party/sqlite/src/src/btree.h
-++@@ -78,6 +78,8 @@ int sqlite3BtreeGetOptimalReserve(Btree*);
-++ int sqlite3BtreeGetReserveNoMutex(Btree *p);
-++ int sqlite3BtreeSetAutoVacuum(Btree *, int);
-++ int sqlite3BtreeGetAutoVacuum(Btree *);
-+++int sqlite3BtreeSetAutoVacuumSlackPages(Btree *, int);
-+++int sqlite3BtreeGetAutoVacuumSlackPages(Btree *);
-++ int sqlite3BtreeBeginTrans(Btree*,int);
-++ int sqlite3BtreeCommitPhaseOne(Btree*, const char *zMaster);
-++ int sqlite3BtreeCommitPhaseTwo(Btree*, int);
-++diff --git a/third_party/sqlite/src/src/btreeInt.h b/third_party/sqlite/src/src/btreeInt.h
-++index 8b2a9af192bf..0694b31a78cc 100644
-++--- a/third_party/sqlite/src/src/btreeInt.h
-+++++ b/third_party/sqlite/src/src/btreeInt.h
-++@@ -412,6 +412,7 @@ struct BtShared {
-++   u8 openFlags;         /* Flags to sqlite3BtreeOpen() */
-++ #ifndef SQLITE_OMIT_AUTOVACUUM
-++   u8 autoVacuum;        /* True if auto-vacuum is enabled */
-+++  u8 autoVacuumSlack;   /* Optional pages of slack for auto-vacuum */
-++   u8 incrVacuum;        /* True if incr-vacuum is enabled */
-++   u8 bDoTruncate;       /* True to truncate db on commit */
-++ #endif
-++diff --git a/third_party/sqlite/src/src/pragma.c b/third_party/sqlite/src/src/pragma.c
-++index c633429b7785..c1a2781b5549 100644
-++--- a/third_party/sqlite/src/src/pragma.c
-+++++ b/third_party/sqlite/src/src/pragma.c
-++@@ -756,6 +756,27 @@ void sqlite3Pragma(
-++   }
-++ #endif
-++
-+++  /*
-+++  **  PRAGMA [schema.]auto_vacuum_slack_pages(N)
-+++  **
-+++  ** Control chunk size of auto-vacuum.
-+++  */
-+++#ifndef SQLITE_OMIT_AUTOVACUUM
-+++  case PragTyp_AUTO_VACUUM_SLACK_PAGES: {
-+++    Btree *pBt = pDb->pBt;
-+++    assert( pBt!=0 );
-+++    if( !zRight ){
-+++      returnSingleInt(v, sqlite3BtreeGetAutoVacuumSlackPages(pBt));
-+++    }else{
-+++      int nPages = 8;
-+++      if( sqlite3GetInt32(zRight, &nPages) ){
-+++        sqlite3BtreeSetAutoVacuumSlackPages(pBt, nPages);
-+++      }
-+++    }
-+++    break;
-+++  }
-+++#endif
-+++
-++ #ifndef SQLITE_OMIT_PAGER_PRAGMAS
-++   /*
-++   **  PRAGMA [schema.]cache_size
-++diff --git a/third_party/sqlite/src/src/pragma.h b/third_party/sqlite/src/src/pragma.h
-++index 2c44bc1d0a75..aa0deec75146 100644
-++--- a/third_party/sqlite/src/src/pragma.h
-+++++ b/third_party/sqlite/src/src/pragma.h
-++@@ -7,51 +7,52 @@
-++ /* The various pragma types */
-++ #define PragTyp_HEADER_VALUE                   0
-++ #define PragTyp_AUTO_VACUUM                    1
-++-#define PragTyp_FLAG                           2
-++-#define PragTyp_BUSY_TIMEOUT                   3
-++-#define PragTyp_CACHE_SIZE                     4
-++-#define PragTyp_CACHE_SPILL                    5
-++-#define PragTyp_CASE_SENSITIVE_LIKE            6
-++-#define PragTyp_COLLATION_LIST                 7
-++-#define PragTyp_COMPILE_OPTIONS                8
-++-#define PragTyp_DATA_STORE_DIRECTORY           9
-++-#define PragTyp_DATABASE_LIST                 10
-++-#define PragTyp_DEFAULT_CACHE_SIZE            11
-++-#define PragTyp_ENCODING                      12
-++-#define PragTyp_FOREIGN_KEY_CHECK             13
-++-#define PragTyp_FOREIGN_KEY_LIST              14
-++-#define PragTyp_FUNCTION_LIST                 15
-++-#define PragTyp_INCREMENTAL_VACUUM            16
-++-#define PragTyp_INDEX_INFO                    17
-++-#define PragTyp_INDEX_LIST                    18
-++-#define PragTyp_INTEGRITY_CHECK               19
-++-#define PragTyp_JOURNAL_MODE                  20
-++-#define PragTyp_JOURNAL_SIZE_LIMIT            21
-++-#define PragTyp_LOCK_PROXY_FILE               22
-++-#define PragTyp_LOCKING_MODE                  23
-++-#define PragTyp_PAGE_COUNT                    24
-++-#define PragTyp_MMAP_SIZE                     25
-++-#define PragTyp_MODULE_LIST                   26
-++-#define PragTyp_OPTIMIZE                      27
-++-#define PragTyp_PAGE_SIZE                     28
-++-#define PragTyp_PRAGMA_LIST                   29
-++-#define PragTyp_SECURE_DELETE                 30
-++-#define PragTyp_SHRINK_MEMORY                 31
-++-#define PragTyp_SOFT_HEAP_LIMIT               32
-++-#define PragTyp_SYNCHRONOUS                   33
-++-#define PragTyp_TABLE_INFO                    34
-++-#define PragTyp_TEMP_STORE                    35
-++-#define PragTyp_TEMP_STORE_DIRECTORY          36
-++-#define PragTyp_THREADS                       37
-++-#define PragTyp_WAL_AUTOCHECKPOINT            38
-++-#define PragTyp_WAL_CHECKPOINT                39
-++-#define PragTyp_ACTIVATE_EXTENSIONS           40
-++-#define PragTyp_HEXKEY                        41
-++-#define PragTyp_KEY                           42
-++-#define PragTyp_REKEY                         43
-++-#define PragTyp_LOCK_STATUS                   44
-++-#define PragTyp_PARSER_TRACE                  45
-++-#define PragTyp_STATS                         46
-+++#define PragTyp_AUTO_VACUUM_SLACK_PAGES        2
-+++#define PragTyp_FLAG                           3
-+++#define PragTyp_BUSY_TIMEOUT                   4
-+++#define PragTyp_CACHE_SIZE                     5
-+++#define PragTyp_CACHE_SPILL                    6
-+++#define PragTyp_CASE_SENSITIVE_LIKE            7
-+++#define PragTyp_COLLATION_LIST                 8
-+++#define PragTyp_COMPILE_OPTIONS                9
-+++#define PragTyp_DATA_STORE_DIRECTORY          10
-+++#define PragTyp_DATABASE_LIST                 11
-+++#define PragTyp_DEFAULT_CACHE_SIZE            12
-+++#define PragTyp_ENCODING                      13
-+++#define PragTyp_FOREIGN_KEY_CHECK             14
-+++#define PragTyp_FOREIGN_KEY_LIST              15
-+++#define PragTyp_FUNCTION_LIST                 16
-+++#define PragTyp_INCREMENTAL_VACUUM            17
-+++#define PragTyp_INDEX_INFO                    18
-+++#define PragTyp_INDEX_LIST                    19
-+++#define PragTyp_INTEGRITY_CHECK               20
-+++#define PragTyp_JOURNAL_MODE                  21
-+++#define PragTyp_JOURNAL_SIZE_LIMIT            22
-+++#define PragTyp_LOCK_PROXY_FILE               23
-+++#define PragTyp_LOCKING_MODE                  24
-+++#define PragTyp_PAGE_COUNT                    25
-+++#define PragTyp_MMAP_SIZE                     26
-+++#define PragTyp_MODULE_LIST                   27
-+++#define PragTyp_OPTIMIZE                      28
-+++#define PragTyp_PAGE_SIZE                     29
-+++#define PragTyp_PRAGMA_LIST                   30
-+++#define PragTyp_SECURE_DELETE                 31
-+++#define PragTyp_SHRINK_MEMORY                 32
-+++#define PragTyp_SOFT_HEAP_LIMIT               33
-+++#define PragTyp_SYNCHRONOUS                   34
-+++#define PragTyp_TABLE_INFO                    35
-+++#define PragTyp_TEMP_STORE                    36
-+++#define PragTyp_TEMP_STORE_DIRECTORY          37
-+++#define PragTyp_THREADS                       38
-+++#define PragTyp_WAL_AUTOCHECKPOINT            39
-+++#define PragTyp_WAL_CHECKPOINT                40
-+++#define PragTyp_ACTIVATE_EXTENSIONS           41
-+++#define PragTyp_HEXKEY                        42
-+++#define PragTyp_KEY                           43
-+++#define PragTyp_REKEY                         44
-+++#define PragTyp_LOCK_STATUS                   45
-+++#define PragTyp_PARSER_TRACE                  46
-+++#define PragTyp_STATS                         47
-++
-++ /* Property flags associated with various pragma. */
-++ #define PragFlg_NeedSchema 0x01 /* Force schema load before running */
-++@@ -152,6 +153,11 @@ static const PragmaName aPragmaName[] = {
-++   /* ePragFlg:  */ PragFlg_NeedSchema|PragFlg_Result0|PragFlg_SchemaReq|PragFlg_NoColumns1,
-++   /* ColNames:  */ 0, 0,
-++   /* iArg:      */ 0 },
-+++ {/* zName:     */ "auto_vacuum_slack_pages",
-+++  /* ePragTyp:  */ PragTyp_AUTO_VACUUM_SLACK_PAGES,
-+++  /* ePragFlg:  */ PragFlg_NeedSchema|PragFlg_Result0|PragFlg_SchemaReq|PragFlg_NoColumns1,
-+++  /* ColNames:  */ 0, 0,
-+++  /* iArg:      */ 0 },
-++ #endif
-++ #if !defined(SQLITE_OMIT_FLAG_PRAGMAS)
-++ #if !defined(SQLITE_OMIT_AUTOMATIC_INDEX)
-++@@ -646,4 +652,4 @@ static const PragmaName aPragmaName[] = {
-++   /* iArg:      */ SQLITE_WriteSchema },
-++ #endif
-++ };
-++-/* Number of pragmas: 60 on by default, 77 total. */
-+++/* Number of pragmas: 61 on by default, 78 total. */
-++diff --git a/third_party/sqlite/src/tool/mkpragmatab.tcl b/third_party/sqlite/src/tool/mkpragmatab.tcl
-++index f788eef425fc..0565c6699c20 100644
-++--- a/third_party/sqlite/src/tool/mkpragmatab.tcl
-+++++ b/third_party/sqlite/src/tool/mkpragmatab.tcl
-++@@ -382,6 +382,10 @@ set pragma_def {
-++
-++   NAME: optimize
-++   FLAG: Result1 NeedSchema
-+++
-+++  NAME: auto_vacuum_slack_pages
-+++  FLAG: NeedSchema Result0 SchemaReq NoColumns1
-+++  IF:   !defined(SQLITE_OMIT_AUTOVACUUM)
-++ }
-++
-++ # Open the output file
-++--
-++2.14.0
-+diff --git a/third_party/sqlite/patches/0010-Allow-auto-vacuum-to-work-with-chunks.patch b/third_party/sqlite/patches/0010-Allow-auto-vacuum-to-work-with-chunks.patch
-+deleted file mode 100644
-+index f5f4f830..0000000
-+--- a/third_party/sqlite/patches/0010-Allow-auto-vacuum-to-work-with-chunks.patch
-++++ /dev/null
-+@@ -1,302 +0,0 @@
-+-From d0ecdf49d28069fa070ce3fa653a0f1e2b03b3a8 Mon Sep 17 00:00:00 2001
-+-From: Scott Hess <shess@chromium.org>
-+-Date: Thu, 2 Mar 2017 15:23:09 -0800
-+-Subject: [PATCH 10/10] Allow auto-vacuum to work with chunks.
-+-
-+-SQLITE_FCNTL_CHUNK_SIZE can advise the VFS to resize files in quantum
-+-amounts, to reduce fragmentation from tiny appends.  This change allows
-+-a new PRAGMA auto_vacuum_slack_pages to provide auto_vacuum with a hint
-+-to only rearrange pages when an entire quantum can be released.
-+-
-+-When rebasing this patch, first ignore the conflicts in src/pragma.h,
-+-and fix all the other conflicts. Then run the commands below (in
-+-third_party/sqlite) to re-generate src/pragma.h.
-+-tclsh src/tool/mkpragmatab.tcl
-+-find src/ -type f -iname "*.h" -exec \
-+-    $GNU_SED --in-place 's/[[:space:]]\+$//' {} \+
-+-
-+-BUG=698010
-+----
-+- third_party/sqlite/src/src/btree.c          | 56 ++++++++++++++++-
-+- third_party/sqlite/src/src/btree.h          |  2 +
-+- third_party/sqlite/src/src/btreeInt.h       |  1 +
-+- third_party/sqlite/src/src/pragma.c         | 21 +++++++
-+- third_party/sqlite/src/src/pragma.h         | 98 +++++++++++++++--------------
-+- third_party/sqlite/src/tool/mkpragmatab.tcl |  4 ++
-+- 6 files changed, 135 insertions(+), 47 deletions(-)
-+-
-+-diff --git a/third_party/sqlite/src/src/btree.c b/third_party/sqlite/src/src/btree.c
-+-index 53e467cf91f1..26c2d762e2e0 100644
-+---- a/third_party/sqlite/src/src/btree.c
-+-+++ b/third_party/sqlite/src/src/btree.c
-+-@@ -2909,6 +2909,46 @@ static void setDefaultSyncFlag(BtShared *pBt, u8 safety_level){
-+- # define setDefaultSyncFlag(pBt,safety_level)
-+- #endif
-+- 
-+-+/*
-+-+** Change the 'auto-vacuum-slack-pages' property of the database. If auto vacuum
-+-+** is enabled, this is the number of chunks of slack to allow before
-+-+** automatically running an incremental vacuum.
-+-+*/
-+-+int sqlite3BtreeSetAutoVacuumSlackPages(Btree *p, int autoVacuumSlack){
-+-+#ifdef SQLITE_OMIT_AUTOVACUUM
-+-+  return SQLITE_READONLY;
-+-+#else
-+-+  BtShared *pBt = p->pBt;
-+-+  int rc = SQLITE_OK;
-+-+  u8 avs = (u8)autoVacuumSlack;
-+-+  if( autoVacuumSlack>avs ){
-+-+    avs = 0xFF;
-+-+  }
-+-+
-+-+  sqlite3BtreeEnter(p);
-+-+  pBt->autoVacuumSlack = avs;
-+-+  sqlite3BtreeLeave(p);
-+-+  return rc;
-+-+#endif
-+-+}
-+-+
-+-+/*
-+-+** Return the value of the 'auto-vacuum-slack-pages' property.
-+-+*/
-+-+int sqlite3BtreeGetAutoVacuumSlackPages(Btree *p){
-+-+#ifdef SQLITE_OMIT_AUTOVACUUM
-+-+  return 0;
-+-+#else
-+-+  int rc = 0;
-+-+  sqlite3BtreeEnter(p);
-+-+  if( p->pBt->autoVacuum!=0 ){
-+-+    rc = p->pBt->autoVacuumSlack;
-+-+  }
-+-+  sqlite3BtreeLeave(p);
-+-+  return rc;
-+-+#endif
-+-+}
-+-+
-+- /*
-+- ** Get a reference to pPage1 of the database file.  This will
-+- ** also acquire a readlock on that file.
-+-@@ -3738,13 +3778,27 @@ int sqlite3BtreeIncrVacuum(Btree *p){
-+- */
-+- static int autoVacuumCommit(BtShared *pBt){
-+-   int rc = SQLITE_OK;
-+-+  int bShouldVacuum = pBt->autoVacuum && !pBt->incrVacuum;
-+-   Pager *pPager = pBt->pPager;
-+-   VVA_ONLY( int nRef = sqlite3PagerRefcount(pPager); )
-+- 
-+-   assert( sqlite3_mutex_held(pBt->mutex) );
-+-   invalidateAllOverflowCache(pBt);
-+-   assert(pBt->autoVacuum);
-+--  if( !pBt->incrVacuum ){
-+-+  if( bShouldVacuum && pBt->autoVacuumSlack ){
-+-+    Pgno nOrig;        /* Database size before freeing */
-+-+    Pgno nFree;        /* Number of pages on the freelist initially */
-+-+
-+-+    nOrig = btreePagecount(pBt);
-+-+    nFree = get4byte(&pBt->pPage1->aData[36]);
-+-+    bShouldVacuum =
-+-+        (nOrig-nFree-1)/pBt->autoVacuumSlack < (nOrig-1)/pBt->autoVacuumSlack;
-+-+    /* TODO: When integrating this test with the following code, contrive to
-+-+    ** trim to the integral chunk boundary, rather than trimming the entire free
-+-+    ** list.
-+-+    */
-+-+  }
-+-+  if( bShouldVacuum ){
-+-     Pgno nFin;         /* Number of pages in database after autovacuuming */
-+-     Pgno nFree;        /* Number of pages on the freelist initially */
-+-     Pgno iFree;        /* The next page to be freed */
-+-diff --git a/third_party/sqlite/src/src/btree.h b/third_party/sqlite/src/src/btree.h
-+-index ce607bd4d082..7ba2cab407db 100644
-+---- a/third_party/sqlite/src/src/btree.h
-+-+++ b/third_party/sqlite/src/src/btree.h
-+-@@ -78,6 +78,8 @@ int sqlite3BtreeGetOptimalReserve(Btree*);
-+- int sqlite3BtreeGetReserveNoMutex(Btree *p);
-+- int sqlite3BtreeSetAutoVacuum(Btree *, int);
-+- int sqlite3BtreeGetAutoVacuum(Btree *);
-+-+int sqlite3BtreeSetAutoVacuumSlackPages(Btree *, int);
-+-+int sqlite3BtreeGetAutoVacuumSlackPages(Btree *);
-+- int sqlite3BtreeBeginTrans(Btree*,int);
-+- int sqlite3BtreeCommitPhaseOne(Btree*, const char *zMaster);
-+- int sqlite3BtreeCommitPhaseTwo(Btree*, int);
-+-diff --git a/third_party/sqlite/src/src/btreeInt.h b/third_party/sqlite/src/src/btreeInt.h
-+-index 9281f1640bd6..139a0abb7bfb 100644
-+---- a/third_party/sqlite/src/src/btreeInt.h
-+-+++ b/third_party/sqlite/src/src/btreeInt.h
-+-@@ -412,6 +412,7 @@ struct BtShared {
-+-   u8 openFlags;         /* Flags to sqlite3BtreeOpen() */
-+- #ifndef SQLITE_OMIT_AUTOVACUUM
-+-   u8 autoVacuum;        /* True if auto-vacuum is enabled */
-+-+  u8 autoVacuumSlack;   /* Optional pages of slack for auto-vacuum */
-+-   u8 incrVacuum;        /* True if incr-vacuum is enabled */
-+-   u8 bDoTruncate;       /* True to truncate db on commit */
-+- #endif
-+-diff --git a/third_party/sqlite/src/src/pragma.c b/third_party/sqlite/src/src/pragma.c
-+-index 8ca64b2a04ec..fc73852c3930 100644
-+---- a/third_party/sqlite/src/src/pragma.c
-+-+++ b/third_party/sqlite/src/src/pragma.c
-+-@@ -756,6 +756,27 @@ void sqlite3Pragma(
-+-   }
-+- #endif
-+- 
-+-+  /*
-+-+  **  PRAGMA [schema.]auto_vacuum_slack_pages(N)
-+-+  **
-+-+  ** Control chunk size of auto-vacuum.
-+-+  */
-+-+#ifndef SQLITE_OMIT_AUTOVACUUM
-+-+  case PragTyp_AUTO_VACUUM_SLACK_PAGES: {
-+-+    Btree *pBt = pDb->pBt;
-+-+    assert( pBt!=0 );
-+-+    if( !zRight ){
-+-+      returnSingleInt(v, sqlite3BtreeGetAutoVacuumSlackPages(pBt));
-+-+    }else{
-+-+      int nPages = 8;
-+-+      if( sqlite3GetInt32(zRight, &nPages) ){
-+-+        sqlite3BtreeSetAutoVacuumSlackPages(pBt, nPages);
-+-+      }
-+-+    }
-+-+    break;
-+-+  }
-+-+#endif
-+-+
-+- #ifndef SQLITE_OMIT_PAGER_PRAGMAS
-+-   /*
-+-   **  PRAGMA [schema.]cache_size
-+-diff --git a/third_party/sqlite/src/src/pragma.h b/third_party/sqlite/src/src/pragma.h
-+-index 2c44bc1d0a75..aa0deec75146 100644
-+---- a/third_party/sqlite/src/src/pragma.h
-+-+++ b/third_party/sqlite/src/src/pragma.h
-+-@@ -7,51 +7,52 @@
-+- /* The various pragma types */
-+- #define PragTyp_HEADER_VALUE                   0
-+- #define PragTyp_AUTO_VACUUM                    1
-+--#define PragTyp_FLAG                           2
-+--#define PragTyp_BUSY_TIMEOUT                   3
-+--#define PragTyp_CACHE_SIZE                     4
-+--#define PragTyp_CACHE_SPILL                    5
-+--#define PragTyp_CASE_SENSITIVE_LIKE            6
-+--#define PragTyp_COLLATION_LIST                 7
-+--#define PragTyp_COMPILE_OPTIONS                8
-+--#define PragTyp_DATA_STORE_DIRECTORY           9
-+--#define PragTyp_DATABASE_LIST                 10
-+--#define PragTyp_DEFAULT_CACHE_SIZE            11
-+--#define PragTyp_ENCODING                      12
-+--#define PragTyp_FOREIGN_KEY_CHECK             13
-+--#define PragTyp_FOREIGN_KEY_LIST              14
-+--#define PragTyp_FUNCTION_LIST                 15
-+--#define PragTyp_INCREMENTAL_VACUUM            16
-+--#define PragTyp_INDEX_INFO                    17
-+--#define PragTyp_INDEX_LIST                    18
-+--#define PragTyp_INTEGRITY_CHECK               19
-+--#define PragTyp_JOURNAL_MODE                  20
-+--#define PragTyp_JOURNAL_SIZE_LIMIT            21
-+--#define PragTyp_LOCK_PROXY_FILE               22
-+--#define PragTyp_LOCKING_MODE                  23
-+--#define PragTyp_PAGE_COUNT                    24
-+--#define PragTyp_MMAP_SIZE                     25
-+--#define PragTyp_MODULE_LIST                   26
-+--#define PragTyp_OPTIMIZE                      27
-+--#define PragTyp_PAGE_SIZE                     28
-+--#define PragTyp_PRAGMA_LIST                   29
-+--#define PragTyp_SECURE_DELETE                 30
-+--#define PragTyp_SHRINK_MEMORY                 31
-+--#define PragTyp_SOFT_HEAP_LIMIT               32
-+--#define PragTyp_SYNCHRONOUS                   33
-+--#define PragTyp_TABLE_INFO                    34
-+--#define PragTyp_TEMP_STORE                    35
-+--#define PragTyp_TEMP_STORE_DIRECTORY          36
-+--#define PragTyp_THREADS                       37
-+--#define PragTyp_WAL_AUTOCHECKPOINT            38
-+--#define PragTyp_WAL_CHECKPOINT                39
-+--#define PragTyp_ACTIVATE_EXTENSIONS           40
-+--#define PragTyp_HEXKEY                        41
-+--#define PragTyp_KEY                           42
-+--#define PragTyp_REKEY                         43
-+--#define PragTyp_LOCK_STATUS                   44
-+--#define PragTyp_PARSER_TRACE                  45
-+--#define PragTyp_STATS                         46
-+-+#define PragTyp_AUTO_VACUUM_SLACK_PAGES        2
-+-+#define PragTyp_FLAG                           3
-+-+#define PragTyp_BUSY_TIMEOUT                   4
-+-+#define PragTyp_CACHE_SIZE                     5
-+-+#define PragTyp_CACHE_SPILL                    6
-+-+#define PragTyp_CASE_SENSITIVE_LIKE            7
-+-+#define PragTyp_COLLATION_LIST                 8
-+-+#define PragTyp_COMPILE_OPTIONS                9
-+-+#define PragTyp_DATA_STORE_DIRECTORY          10
-+-+#define PragTyp_DATABASE_LIST                 11
-+-+#define PragTyp_DEFAULT_CACHE_SIZE            12
-+-+#define PragTyp_ENCODING                      13
-+-+#define PragTyp_FOREIGN_KEY_CHECK             14
-+-+#define PragTyp_FOREIGN_KEY_LIST              15
-+-+#define PragTyp_FUNCTION_LIST                 16
-+-+#define PragTyp_INCREMENTAL_VACUUM            17
-+-+#define PragTyp_INDEX_INFO                    18
-+-+#define PragTyp_INDEX_LIST                    19
-+-+#define PragTyp_INTEGRITY_CHECK               20
-+-+#define PragTyp_JOURNAL_MODE                  21
-+-+#define PragTyp_JOURNAL_SIZE_LIMIT            22
-+-+#define PragTyp_LOCK_PROXY_FILE               23
-+-+#define PragTyp_LOCKING_MODE                  24
-+-+#define PragTyp_PAGE_COUNT                    25
-+-+#define PragTyp_MMAP_SIZE                     26
-+-+#define PragTyp_MODULE_LIST                   27
-+-+#define PragTyp_OPTIMIZE                      28
-+-+#define PragTyp_PAGE_SIZE                     29
-+-+#define PragTyp_PRAGMA_LIST                   30
-+-+#define PragTyp_SECURE_DELETE                 31
-+-+#define PragTyp_SHRINK_MEMORY                 32
-+-+#define PragTyp_SOFT_HEAP_LIMIT               33
-+-+#define PragTyp_SYNCHRONOUS                   34
-+-+#define PragTyp_TABLE_INFO                    35
-+-+#define PragTyp_TEMP_STORE                    36
-+-+#define PragTyp_TEMP_STORE_DIRECTORY          37
-+-+#define PragTyp_THREADS                       38
-+-+#define PragTyp_WAL_AUTOCHECKPOINT            39
-+-+#define PragTyp_WAL_CHECKPOINT                40
-+-+#define PragTyp_ACTIVATE_EXTENSIONS           41
-+-+#define PragTyp_HEXKEY                        42
-+-+#define PragTyp_KEY                           43
-+-+#define PragTyp_REKEY                         44
-+-+#define PragTyp_LOCK_STATUS                   45
-+-+#define PragTyp_PARSER_TRACE                  46
-+-+#define PragTyp_STATS                         47
-+- 
-+- /* Property flags associated with various pragma. */
-+- #define PragFlg_NeedSchema 0x01 /* Force schema load before running */
-+-@@ -152,6 +153,11 @@ static const PragmaName aPragmaName[] = {
-+-   /* ePragFlg:  */ PragFlg_NeedSchema|PragFlg_Result0|PragFlg_SchemaReq|PragFlg_NoColumns1,
-+-   /* ColNames:  */ 0, 0,
-+-   /* iArg:      */ 0 },
-+-+ {/* zName:     */ "auto_vacuum_slack_pages",
-+-+  /* ePragTyp:  */ PragTyp_AUTO_VACUUM_SLACK_PAGES,
-+-+  /* ePragFlg:  */ PragFlg_NeedSchema|PragFlg_Result0|PragFlg_SchemaReq|PragFlg_NoColumns1,
-+-+  /* ColNames:  */ 0, 0,
-+-+  /* iArg:      */ 0 },
-+- #endif
-+- #if !defined(SQLITE_OMIT_FLAG_PRAGMAS)
-+- #if !defined(SQLITE_OMIT_AUTOMATIC_INDEX)
-+-@@ -646,4 +652,4 @@ static const PragmaName aPragmaName[] = {
-+-   /* iArg:      */ SQLITE_WriteSchema },
-+- #endif
-+- };
-+--/* Number of pragmas: 60 on by default, 77 total. */
-+-+/* Number of pragmas: 61 on by default, 78 total. */
-+-diff --git a/third_party/sqlite/src/tool/mkpragmatab.tcl b/third_party/sqlite/src/tool/mkpragmatab.tcl
-+-index f788eef425fc..0565c6699c20 100644
-+---- a/third_party/sqlite/src/tool/mkpragmatab.tcl
-+-+++ b/third_party/sqlite/src/tool/mkpragmatab.tcl
-+-@@ -382,6 +382,10 @@ set pragma_def {
-+- 
-+-   NAME: optimize
-+-   FLAG: Result1 NeedSchema
-+-+
-+-+  NAME: auto_vacuum_slack_pages
-+-+  FLAG: NeedSchema Result0 SchemaReq NoColumns1
-+-+  IF:   !defined(SQLITE_OMIT_AUTOVACUUM)
-+- }
-+- 
-+- # Open the output file
-+--- 
-+-2.13.1.518.g3df882009-goog
-+-
-+diff --git a/third_party/sqlite/patches/0010-fuchsia-Use-dot-file-locking-for-sqlite.patch b/third_party/sqlite/patches/0010-fuchsia-Use-dot-file-locking-for-sqlite.patch
-+new file mode 100644
-+index 0000000..fc37cb15
-+--- /dev/null
-++++ b/third_party/sqlite/patches/0010-fuchsia-Use-dot-file-locking-for-sqlite.patch
-+@@ -0,0 +1,26 @@
-++From 2d48d6d294f5fdd0008b0b9e9958c87ce207b593 Mon Sep 17 00:00:00 2001
-++From: Scott Graham <scottmg@chromium.org>
-++Date: Mon, 11 Sep 2017 13:37:46 -0700
-++Subject: [PATCH 10/10] fuchsia: Use dot-file locking for sqlite
-++
-++---
-++ third_party/sqlite/src/src/os_unix.c | 4 ++++
-++ 1 file changed, 4 insertions(+)
-++
-++diff --git a/third_party/sqlite/src/src/os_unix.c b/third_party/sqlite/src/src/os_unix.c
-++index 6ed6f6a8fc98..dc3018801aae 100644
-++--- a/third_party/sqlite/src/src/os_unix.c
-+++++ b/third_party/sqlite/src/src/os_unix.c
-++@@ -7675,6 +7675,10 @@ int sqlite3_os_init(void){
-++     UNIXVFS("unix",          autolockIoFinder ),
-++ #elif OS_VXWORKS
-++     UNIXVFS("unix",          vxworksIoFinder ),
-+++#elif __Fuchsia__
-+++    /* None of the system calls for other exclusion methods are currently
-+++    ** implemented on Fuchsia, so use simple dot-file locking for now. */
-+++    UNIXVFS("unix",          dotlockIoFinder ),
-++ #else
-++     UNIXVFS("unix",          posixIoFinder ),
-++ #endif
-++--
-++2.14.0
-+diff --git a/third_party/sqlite/src/Makefile.in b/third_party/sqlite/src/Makefile.in
-+index 358e777..a0f71d7 100644
-+--- a/third_party/sqlite/src/Makefile.in
-++++ b/third_party/sqlite/src/Makefile.in
-+@@ -166,7 +166,8 @@ USE_AMALGAMATION = @USE_AMALGAMATION@
-+ #
-+ LIBOBJS0 = alter.lo analyze.lo attach.lo auth.lo \
-+          backup.lo bitvec.lo btmutex.lo btree.lo build.lo \
-+-         callback.lo complete.lo ctime.lo date.lo dbstat.lo delete.lo \
-++         callback.lo complete.lo ctime.lo \
-++         date.lo dbpage.lo dbstat.lo delete.lo \
-+          expr.lo fault.lo fkey.lo \
-+          fts3.lo fts3_aux.lo fts3_expr.lo fts3_hash.lo fts3_icu.lo \
-+          fts3_porter.lo fts3_snippet.lo fts3_tokenizer.lo fts3_tokenizer1.lo \
-+@@ -215,6 +216,7 @@ SRC = \
-+   $(TOP)/src/complete.c \
-+   $(TOP)/src/ctime.c \
-+   $(TOP)/src/date.c \
-++  $(TOP)/src/dbpage.c \
-+   $(TOP)/src/dbstat.c \
-+   $(TOP)/src/delete.c \
-+   $(TOP)/src/expr.c \
-+@@ -265,7 +267,7 @@ SRC = \
-+   $(TOP)/src/rowset.c \
-+   $(TOP)/src/select.c \
-+   $(TOP)/src/status.c \
-+-  $(TOP)/src/shell.c \
-++  $(TOP)/src/shell.c.in \
-+   $(TOP)/src/sqlite.h.in \
-+   $(TOP)/src/sqlite3ext.h \
-+   $(TOP)/src/sqliteInt.h \
-+@@ -362,6 +364,7 @@ SRC += \
-+   parse.c \
-+   parse.h \
-+   config.h \
-++  shell.c \
-+   sqlite3.h
-+ 
-+ # Source code to the test files.
-+@@ -393,6 +396,7 @@ TESTSRC = \
-+   $(TOP)/src/test_intarray.c \
-+   $(TOP)/src/test_journal.c \
-+   $(TOP)/src/test_malloc.c \
-++  $(TOP)/src/test_md5.c \
-+   $(TOP)/src/test_multiplex.c \
-+   $(TOP)/src/test_mutex.c \
-+   $(TOP)/src/test_onefile.c \
-+@@ -404,6 +408,7 @@ TESTSRC = \
-+   $(TOP)/src/test_server.c \
-+   $(TOP)/src/test_superlock.c \
-+   $(TOP)/src/test_syscall.c \
-++  $(TOP)/src/test_tclsh.c \
-+   $(TOP)/src/test_tclvar.c \
-+   $(TOP)/src/test_thread.c \
-+   $(TOP)/src/test_vfs.c \
-+@@ -428,6 +433,7 @@ TESTSRC += \
-+   $(TOP)/ext/fts5/fts5_test_mi.c \
-+   $(TOP)/ext/fts5/fts5_test_tok.c \
-+   $(TOP)/ext/misc/ieee754.c \
-++  $(TOP)/ext/misc/mmapwarm.c \
-+   $(TOP)/ext/misc/nextchar.c \
-+   $(TOP)/ext/misc/percentile.c \
-+   $(TOP)/ext/misc/regexp.c \
-+@@ -448,6 +454,7 @@ TESTSRC2 = \
-+   $(TOP)/src/build.c \
-+   $(TOP)/src/ctime.c \
-+   $(TOP)/src/date.c \
-++  $(TOP)/src/dbpage.c \
-+   $(TOP)/src/dbstat.c \
-+   $(TOP)/src/expr.c \
-+   $(TOP)/src/func.c \
-+@@ -568,6 +575,8 @@ SHELL_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS4
-+ SHELL_OPT += -DSQLITE_ENABLE_EXPLAIN_COMMENTS
-+ SHELL_OPT += -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
-+ SHELL_OPT += -DSQLITE_ENABLE_STMTVTAB
-++SHELL_OPT += -DSQLITE_ENABLE_DBPAGE_VTAB
-++SHELL_OPT += -DSQLITE_ENABLE_DBSTAT_VTAB
-+ FUZZERSHELL_OPT = -DSQLITE_ENABLE_JSON1
-+ FUZZCHECK_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MEMSYS5 -DSQLITE_OSS_FUZZ
-+ FUZZCHECK_OPT += -DSQLITE_MAX_MEMORY=50000000
-+@@ -596,9 +605,9 @@ libtclsqlite3.la:	tclsqlite.lo libsqlite3.la
-+ 		-version-info "8:6:8" \
-+ 		-avoid-version
-+ 
-+-sqlite3$(TEXE):	$(TOP)/src/shell.c sqlite3.c
-++sqlite3$(TEXE):	shell.c sqlite3.c
-+ 	$(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \
-+-		$(TOP)/src/shell.c sqlite3.c \
-++		shell.c sqlite3.c \
-+ 		$(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
-+ 
-+ sqldiff$(TEXE):	$(TOP)/tool/sqldiff.c sqlite3.lo sqlite3.h
-+@@ -693,6 +702,11 @@ lemon$(BEXE):	$(TOP)/tool/lemon.c $(TOP)/tool/lempar.c
-+ 	$(BCC) -o $@ $(TOP)/tool/lemon.c
-+ 	cp $(TOP)/tool/lempar.c .
-+ 
-++# Rules to build the program that generates the source-id
-++#
-++mksourceid$(BEXE):	$(TOP)/tool/mksourceid.c
-++	$(BCC) -o $@ $(TOP)/tool/mksourceid.c
-++
-+ # Rules to build individual *.o files from generated *.c files. This
-+ # applies to:
-+ #
-+@@ -746,6 +760,9 @@ ctime.lo:	$(TOP)/src/ctime.c $(HDR)
-+ date.lo:	$(TOP)/src/date.c $(HDR)
-+ 	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/date.c
-+ 
-++dbpage.lo:	$(TOP)/src/dbpage.c $(HDR)
-++	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/dbpage.c
-++
-+ dbstat.lo:	$(TOP)/src/dbstat.c $(HDR)
-+ 	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/dbstat.c
-+ 
-+@@ -930,7 +947,7 @@ tclsqlite.lo:	$(TOP)/src/tclsqlite.c $(HDR)
-+ 	$(LTCOMPILE) -DUSE_TCL_STUBS=1 -c $(TOP)/src/tclsqlite.c
-+ 
-+ tclsqlite-shell.lo:	$(TOP)/src/tclsqlite.c $(HDR)
-+-	$(LTCOMPILE) -DTCLSH=1 -o $@ -c $(TOP)/src/tclsqlite.c
-++	$(LTCOMPILE) -DTCLSH -o $@ -c $(TOP)/src/tclsqlite.c
-+ 
-+ tclsqlite-stubs.lo:	$(TOP)/src/tclsqlite.c $(HDR)
-+ 	$(LTCOMPILE) -DUSE_TCL_STUBS=1 -o $@ -c $(TOP)/src/tclsqlite.c
-+@@ -958,13 +975,24 @@ parse.c:	$(TOP)/src/parse.y lemon$(BEXE) $(TOP)/tool/addopcodes.tcl
-+ 	mv parse.h parse.h.temp
-+ 	$(TCLSH_CMD) $(TOP)/tool/addopcodes.tcl parse.h.temp >parse.h
-+ 
-+-sqlite3.h:	$(TOP)/src/sqlite.h.in $(TOP)/manifest.uuid $(TOP)/VERSION
-++sqlite3.h:	$(TOP)/src/sqlite.h.in $(TOP)/manifest mksourceid$(BEXE) $(TOP)/VERSION
-+ 	$(TCLSH_CMD) $(TOP)/tool/mksqlite3h.tcl $(TOP) >sqlite3.h
-+ 
-+ keywordhash.h:	$(TOP)/tool/mkkeywordhash.c
-+ 	$(BCC) -o mkkeywordhash$(BEXE) $(OPT_FEATURE_FLAGS) $(OPTS) $(TOP)/tool/mkkeywordhash.c
-+ 	./mkkeywordhash$(BEXE) >keywordhash.h
-+ 
-++# Source files that go into making shell.c
-++SHELL_SRC = \
-++	$(TOP)/src/shell.c.in \
-++	$(TOP)/ext/misc/shathree.c \
-++	$(TOP)/ext/misc/fileio.c \
-++	$(TOP)/ext/misc/completion.c
-++
-++shell.c:	$(SHELL_SRC) $(TOP)/tool/mkshellc.tcl
-++	$(TCLSH_CMD) $(TOP)/tool/mkshellc.tcl >shell.c
-++
-++
-+ 
-+ 
-+ # Rules to build the extension objects.
-+@@ -1085,12 +1113,14 @@ sqlite3rbu.lo:	$(TOP)/ext/rbu/sqlite3rbu.c $(HDR) $(EXTHDR)
-+ # necessary because the test fixture requires non-API symbols which are
-+ # hidden when the library is built via the amalgamation).
-+ #
-+-TESTFIXTURE_FLAGS  = -DTCLSH=1 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1
-++TESTFIXTURE_FLAGS  = -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1
-++TESTFIXTURE_FLAGS += -DTCLSH_INIT_PROC=sqlite3TestInit
-+ TESTFIXTURE_FLAGS += -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE
-+ TESTFIXTURE_FLAGS += -DBUILD_sqlite
-+ TESTFIXTURE_FLAGS += -DSQLITE_SERIES_CONSTRAINT_VERIFY=1
-+ TESTFIXTURE_FLAGS += -DSQLITE_DEFAULT_PAGE_SIZE=1024
-+ TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_STMTVTAB
-++TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_DBPAGE_VTAB
-+ 
-+ TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlite3.la
-+ TESTFIXTURE_SRC1 = sqlite3.c
-+@@ -1151,14 +1181,8 @@ valgrindtest:	$(TESTPROGS) valgrindfuzz
-+ smoketest:	$(TESTPROGS) fuzzcheck$(TEXE)
-+ 	./testfixture$(TEXE) $(TOP)/test/main.test $(TESTOPTS)
-+ 
-+-sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl
-+-	echo "#define TCLSH 2" > $@
-+-	echo "#define SQLITE_ENABLE_DBSTAT_VTAB 1" >> $@
-+-	cat sqlite3.c $(TOP)/src/tclsqlite.c >> $@
-+-	echo "static const char *tclsh_main_loop(void){" >> $@
-+-	echo "static const char *zMainloop = " >> $@
-+-	$(TCLSH_CMD) $(TOP)/tool/tostr.tcl $(TOP)/tool/spaceanal.tcl >> $@
-+-	echo "; return zMainloop; }" >> $@
-++sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in
-++	$(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in >sqlite3_analyzer.c
-+ 
-+ sqlite3_analyzer$(TEXE): sqlite3_analyzer.c
-+ 	$(LTLINK) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS)
-+diff --git a/third_party/sqlite/src/Makefile.msc b/third_party/sqlite/src/Makefile.msc
-+index da94288c..2804c25 100644
-+--- a/third_party/sqlite/src/Makefile.msc
-++++ b/third_party/sqlite/src/Makefile.msc
-+@@ -1091,7 +1091,8 @@ LTLIBS = $(LTLIBS) $(LIBICU)
-+ #
-+ LIBOBJS0 = vdbe.lo parse.lo alter.lo analyze.lo attach.lo auth.lo \
-+          backup.lo bitvec.lo btmutex.lo btree.lo build.lo \
-+-         callback.lo complete.lo ctime.lo date.lo dbstat.lo delete.lo \
-++         callback.lo complete.lo ctime.lo \
-++         date.lo dbpage.lo dbstat.lo delete.lo \
-+          expr.lo fault.lo fkey.lo \
-+          fts3.lo fts3_aux.lo fts3_expr.lo fts3_hash.lo fts3_icu.lo \
-+          fts3_porter.lo fts3_snippet.lo fts3_tokenizer.lo fts3_tokenizer1.lo \
-+@@ -1154,6 +1155,7 @@ SRC00 = \
-+   $(TOP)\src\complete.c \
-+   $(TOP)\src\ctime.c \
-+   $(TOP)\src\date.c \
-++  $(TOP)\src\dbpage.c \
-+   $(TOP)\src\dbstat.c \
-+   $(TOP)\src\delete.c \
-+   $(TOP)\src\expr.c \
-+@@ -1220,11 +1222,6 @@ SRC01 = \
-+   $(TOP)\src\wherecode.c \
-+   $(TOP)\src\whereexpr.c
-+ 
-+-# Shell source code files.
-+-#
-+-SRC02 = \
-+-  $(TOP)\src\shell.c
-+-
-+ # Core miscellaneous files.
-+ #
-+ SRC03 = \
-+@@ -1331,6 +1328,7 @@ SRC11 = \
-+   keywordhash.h \
-+   opcodes.h \
-+   parse.h \
-++  shell.c \
-+   $(SQLITE3H)
-+ 
-+ # Generated Tcl header files
-+@@ -1345,7 +1343,7 @@ SRC12 =
-+ 
-+ # All source code files.
-+ #
-+-SRC = $(SRC00) $(SRC01) $(SRC02) $(SRC03) $(SRC04) $(SRC05) $(SRC06) $(SRC07) $(SRC08) $(SRC09) $(SRC10) $(SRC11)
-++SRC = $(SRC00) $(SRC01) $(SRC03) $(SRC04) $(SRC05) $(SRC06) $(SRC07) $(SRC08) $(SRC09) $(SRC10) $(SRC11)
-+ 
-+ # Source code to the test files.
-+ #
-+@@ -1376,6 +1374,7 @@ TESTSRC = \
-+   $(TOP)\src\test_intarray.c \
-+   $(TOP)\src\test_journal.c \
-+   $(TOP)\src\test_malloc.c \
-++  $(TOP)\src\test_md5.c \
-+   $(TOP)\src\test_multiplex.c \
-+   $(TOP)\src\test_mutex.c \
-+   $(TOP)\src\test_onefile.c \
-+@@ -1387,6 +1386,7 @@ TESTSRC = \
-+   $(TOP)\src\test_server.c \
-+   $(TOP)\src\test_superlock.c \
-+   $(TOP)\src\test_syscall.c \
-++  $(TOP)\src\test_tclsh.c \
-+   $(TOP)\src\test_tclvar.c \
-+   $(TOP)\src\test_thread.c \
-+   $(TOP)\src\test_vfs.c \
-+@@ -1411,6 +1411,7 @@ TESTEXT = \
-+   $(TOP)\ext\fts5\fts5_test_mi.c \
-+   $(TOP)\ext\fts5\fts5_test_tok.c \
-+   $(TOP)\ext\misc\ieee754.c \
-++  $(TOP)\ext\misc\mmapwarm.c \
-+   $(TOP)\ext\misc\nextchar.c \
-+   $(TOP)\ext\misc\percentile.c \
-+   $(TOP)\ext\misc\regexp.c \
-+@@ -1507,13 +1508,14 @@ FUZZDATA = \
-+ # when the shell is not being dynamically linked.
-+ #
-+ !IF $(DYNAMIC_SHELL)==0 && $(FOR_WIN10)==0
-+-SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_SHELL_JSON1 -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_STMTVTAB
-++SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_STMTVTAB
-++SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_ENABLE_DBSTAT_VTAB
-+ !ENDIF
-+ 
-+ # <<mark>>
-+ # Extra compiler options for various test tools.
-+ #
-+-MPTESTER_COMPILE_OPTS = -DSQLITE_SHELL_JSON1 -DSQLITE_ENABLE_FTS5
-++MPTESTER_COMPILE_OPTS = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5
-+ FUZZERSHELL_COMPILE_OPTS = -DSQLITE_ENABLE_JSON1
-+ FUZZCHECK_COMPILE_OPTS = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MEMSYS5 -DSQLITE_OSS_FUZZ -DSQLITE_MAX_MEMORY=50000000
-+ FUZZCHECK_SRC = $(TOP)\test\fuzzcheck.c $(TOP)\test\ossfuzz.c
-+@@ -1568,8 +1570,8 @@ sqlite3.def:	libsqlite3.lib
-+ 		| sort >> sqlite3.def
-+ # <</block2>>
-+ 
-+-$(SQLITE3EXE):	$(TOP)\src\shell.c $(SHELL_CORE_DEP) $(LIBRESOBJS) $(SHELL_CORE_SRC) $(SQLITE3H)
-+-	$(LTLINK) $(SHELL_COMPILE_OPTS) $(READLINE_FLAGS) $(TOP)\src\shell.c $(SHELL_CORE_SRC) \
-++$(SQLITE3EXE):	shell.c $(SHELL_CORE_DEP) $(LIBRESOBJS) $(SHELL_CORE_SRC) $(SQLITE3H)
-++	$(LTLINK) $(SHELL_COMPILE_OPTS) $(READLINE_FLAGS) shell.c $(SHELL_CORE_SRC) \
-+ 		/link $(SQLITE3EXEPDB) $(LDFLAGS) $(LTLINKOPTS) $(SHELL_LINK_OPTS) $(LTLIBPATHS) $(LIBRESOBJS) $(LIBREADLINE) $(LTLIBS) $(TLIBS)
-+ 
-+ # <<mark>>
-+@@ -1628,7 +1630,6 @@ mptest:	mptester.exe
-+ 	-mkdir tsrc
-+ 	for %i in ($(SRC00)) do copy /Y %i tsrc
-+ 	for %i in ($(SRC01)) do copy /Y %i tsrc
-+-	for %i in ($(SRC02)) do copy /Y %i tsrc
-+ 	for %i in ($(SRC03)) do copy /Y %i tsrc
-+ 	for %i in ($(SRC04)) do copy /Y %i tsrc
-+ 	for %i in ($(SRC05)) do copy /Y %i tsrc
-+@@ -1670,6 +1671,12 @@ lemon.exe:	$(TOP)\tool\lemon.c lempar.c
-+ 	$(BCC) $(NO_WARN) -Daccess=_access \
-+ 		-Fe$@ $(TOP)\tool\lemon.c /link $(LDFLAGS) $(NLTLINKOPTS) $(NLTLIBPATHS)
-+ 
-++# <<mark>>
-++# Rules to build the source-id generator tool
-++#
-++mksourceid.exe:	$(TOP)\tool\mksourceid.c
-++	$(BCC) $(NO_WARN) -Fe$@ $(TOP)\tool\mksourceid.c /link $(LDFLAGS) $(NLTLINKOPTS) $(NLTLIBPATHS)
-++
-+ # Rules to build individual *.lo files from generated *.c files. This
-+ # applies to:
-+ #
-+@@ -1740,7 +1747,10 @@ ctime.lo:	$(TOP)\src\ctime.c $(HDR)
-+ date.lo:	$(TOP)\src\date.c $(HDR)
-+ 	$(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\date.c
-+ 
-+-dbstat.lo:	$(TOP)\src\date.c $(HDR)
-++dbpage.lo:	$(TOP)\src\dbpage.c $(HDR)
-++	$(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\dbpage.c
-++
-++dbstat.lo:	$(TOP)\src\dbstat.c $(HDR)
-+ 	$(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\dbstat.c
-+ 
-+ delete.lo:	$(TOP)\src\delete.c $(HDR)
-+@@ -1924,7 +1934,7 @@ tclsqlite.lo:	$(TOP)\src\tclsqlite.c $(HDR) $(SQLITE_TCL_DEP)
-+ 	$(LTCOMPILE) $(NO_WARN) -DUSE_TCL_STUBS=1 -DBUILD_sqlite -I$(TCLINCDIR) -c $(TOP)\src\tclsqlite.c
-+ 
-+ tclsqlite-shell.lo:	$(TOP)\src\tclsqlite.c $(HDR) $(SQLITE_TCL_DEP)
-+-	$(LTCOMPILE) $(NO_WARN) -DTCLSH=1 -DBUILD_sqlite -I$(TCLINCDIR) -c $(TOP)\src\tclsqlite.c
-++	$(LTCOMPILE) $(NO_WARN) -DTCLSH -DBUILD_sqlite -I$(TCLINCDIR) -c $(TOP)\src\tclsqlite.c
-+ 
-+ tclsqlite3.exe:	tclsqlite-shell.lo $(SQLITE3C) $(SQLITE3H) $(LIBRESOBJS)
-+ 	$(LTLINK) $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS) $(LTLIBPATHS) /OUT:$@ tclsqlite-shell.lo $(LIBRESOBJS) $(LTLIBS) $(TLIBS)
-+@@ -1948,7 +1958,7 @@ parse.c:	$(TOP)\src\parse.y lemon.exe $(TOP)\tool\addopcodes.tcl
-+ 	move parse.h parse.h.temp
-+ 	$(TCLSH_CMD) $(TOP)\tool\addopcodes.tcl parse.h.temp > parse.h
-+ 
-+-$(SQLITE3H):	$(TOP)\src\sqlite.h.in $(TOP)\manifest.uuid $(TOP)\VERSION
-++$(SQLITE3H):	$(TOP)\src\sqlite.h.in $(TOP)\manifest mksourceid.exe $(TOP)\VERSION
-+ 	$(TCLSH_CMD) $(TOP)\tool\mksqlite3h.tcl $(TOP:\=/) > $(SQLITE3H) $(MKSQLITE3H_ARGS)
-+ 
-+ sqlite3ext.h:	.target_source
-+@@ -1967,6 +1977,15 @@ mkkeywordhash.exe:	$(TOP)\tool\mkkeywordhash.c
-+ keywordhash.h:	$(TOP)\tool\mkkeywordhash.c mkkeywordhash.exe
-+ 	.\mkkeywordhash.exe > keywordhash.h
-+ 
-++# Source files that go into making shell.c
-++SHELL_SRC = \
-++	$(TOP)\src\shell.c.in \
-++	$(TOP)\ext\misc\shathree.c \
-++	$(TOP)\ext\misc\fileio.c \
-++	$(TOP)\ext\misc\completion.c
-++
-++shell.c:	$(SHELL_SRC) $(TOP)\tool\mkshellc.tcl
-++	$(TCLSH_CMD) $(TOP)\tool\mkshellc.tcl > shell.c
-+ 
-+ 
-+ # Rules to build the extension objects.
-+@@ -2086,12 +2105,13 @@ sqlite3rbu.lo:	$(TOP)\ext\rbu\sqlite3rbu.c $(HDR) $(EXTHDR)
-+ # necessary because the test fixture requires non-API symbols which are
-+ # hidden when the library is built via the amalgamation).
-+ #
-+-TESTFIXTURE_FLAGS = -DTCLSH=1 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1
-++TESTFIXTURE_FLAGS = -DTCLSH_INIT_PROC=sqlite3TestInit -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1
-+ TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_SERVER=1 -DSQLITE_PRIVATE=""
-+ TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_CORE $(NO_WARN)
-+ TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_SERIES_CONSTRAINT_VERIFY=1
-+ TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_DEFAULT_PAGE_SIZE=1024
-+ TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_STMTVTAB
-++TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_DBPAGE_VTAB
-+ TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) $(TEST_CCONV_OPTS)
-+ 
-+ TESTFIXTURE_SRC0 = $(TESTEXT) $(TESTSRC2)
-+@@ -2171,14 +2191,8 @@ smoketest:	$(TESTPROGS)
-+ 	@set PATH=$(LIBTCLPATH);$(PATH)
-+ 	.\testfixture.exe $(TOP)\test\main.test $(TESTOPTS)
-+ 
-+-sqlite3_analyzer.c:	$(SQLITE3C) $(SQLITE3H) $(TOP)\src\tclsqlite.c $(TOP)\tool\spaceanal.tcl $(SQLITE_TCL_DEP)
-+-	echo #define TCLSH 2 > $@
-+-	echo #define SQLITE_ENABLE_DBSTAT_VTAB 1 >> $@
-+-	copy $@ + $(SQLITE3C) + $(TOP)\src\tclsqlite.c $@
-+-	echo static const char *tclsh_main_loop(void){ >> $@
-+-	echo static const char *zMainloop = >> $@
-+-	$(TCLSH_CMD) $(TOP)\tool\tostr.tcl $(TOP)\tool\spaceanal.tcl >> $@
-+-	echo ; return zMainloop; } >> $@
-++sqlite3_analyzer.c:	$(SQLITE3C) $(SQLITE3H) $(TOP)\src\tclsqlite.c $(TOP)\tool\spaceanal.tcl $(TOP)\tool\mkccode.tcl $(TOP)\tool\sqlite3_analyzer.c.in $(SQLITE_TCL_DEP)
-++	$(TCLSH_CMD) $(TOP)\tool\mkccode.tcl $(TOP)\tool\sqlite3_analyzer.c.in > $@
-+ 
-+ sqlite3_analyzer.exe:	sqlite3_analyzer.c $(LIBRESOBJS)
-+ 	$(LTLINK) $(NO_WARN) -DBUILD_sqlite -I$(TCLINCDIR) sqlite3_analyzer.c \
-+@@ -2260,7 +2274,7 @@ clean:
-+ 	del /Q sqlite3.c sqlite3.h 2>NUL
-+ 	del /Q opcodes.c opcodes.h 2>NUL
-+ 	del /Q lemon.* lempar.c parse.* 2>NUL
-+-	del /Q mkkeywordhash.* keywordhash.h 2>NUL
-++	del /Q mksourceid.* mkkeywordhash.* keywordhash.h 2>NUL
-+ 	del /Q notasharedlib.* 2>NUL
-+ 	-rmdir /Q/S .deps 2>NUL
-+ 	-rmdir /Q/S .libs 2>NUL
-+diff --git a/third_party/sqlite/src/VERSION b/third_party/sqlite/src/VERSION
-+index eb9b76c..6075c9a 100644
-+--- a/third_party/sqlite/src/VERSION
-++++ b/third_party/sqlite/src/VERSION
-+@@ -1 +1 @@
-+-3.20.0
-++3.21.0
-+diff --git a/third_party/sqlite/src/autoconf/Makefile.am b/third_party/sqlite/src/autoconf/Makefile.am
-+index e821159..8c046f8 100644
-+--- a/third_party/sqlite/src/autoconf/Makefile.am
-++++ b/third_party/sqlite/src/autoconf/Makefile.am
-+@@ -10,7 +10,7 @@ sqlite3_SOURCES = shell.c sqlite3.h
-+ EXTRA_sqlite3_SOURCES = sqlite3.c
-+ sqlite3_LDADD = @EXTRA_SHELL_OBJ@ @READLINE_LIBS@
-+ sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@
-+-sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS
-++sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_ENABLE_STMTVTAB -DSQLITE_ENABLE_DBSTAT_VTAB
-+ 
-+ include_HEADERS = sqlite3.h sqlite3ext.h
-+ 
-+diff --git a/third_party/sqlite/src/autoconf/Makefile.msc b/third_party/sqlite/src/autoconf/Makefile.msc
-+index 9f86798..e0f7ad8 100644
-+--- a/third_party/sqlite/src/autoconf/Makefile.msc
-++++ b/third_party/sqlite/src/autoconf/Makefile.msc
-+@@ -927,7 +927,8 @@ LIBRESOBJS =
-+ # when the shell is not being dynamically linked.
-+ #
-+ !IF $(DYNAMIC_SHELL)==0 && $(FOR_WIN10)==0
-+-SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_SHELL_JSON1 -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS
-++SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_STMTVTAB
-++SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_ENABLE_DBSTAT_VTAB
-+ !ENDIF
-+ 
-+ 
-+@@ -957,8 +958,8 @@ sqlite3.def:	Replace.exe $(LIBOBJ)
-+ 		| .\Replace.exe "^\s+/EXPORT:_?(sqlite3(?:session|changeset|changegroup)?_[^@,]*)(?:@\d+|,DATA)?$$" $$1 true \
-+ 		| sort >> sqlite3.def
-+ 
-+-$(SQLITE3EXE):	$(TOP)\shell.c $(SHELL_CORE_DEP) $(LIBRESOBJS) $(SHELL_CORE_SRC) $(SQLITE3H)
-+-	$(LTLINK) $(SHELL_COMPILE_OPTS) $(READLINE_FLAGS) $(TOP)\shell.c $(SHELL_CORE_SRC) \
-++$(SQLITE3EXE):	shell.c $(SHELL_CORE_DEP) $(LIBRESOBJS) $(SHELL_CORE_SRC) $(SQLITE3H)
-++	$(LTLINK) $(SHELL_COMPILE_OPTS) $(READLINE_FLAGS) shell.c $(SHELL_CORE_SRC) \
-+ 		/link $(SQLITE3EXEPDB) $(LDFLAGS) $(LTLINKOPTS) $(SHELL_LINK_OPTS) $(LTLIBPATHS) $(LIBRESOBJS) $(LIBREADLINE) $(LTLIBS) $(TLIBS)
-+ 
-+ 
-+diff --git a/third_party/sqlite/src/configure b/third_party/sqlite/src/configure
-+index eb860d48..64b95e9 100755
-+--- a/third_party/sqlite/src/configure
-++++ b/third_party/sqlite/src/configure
-+@@ -1,6 +1,6 @@
-+ #! /bin/sh
-+ # Guess values for system-dependent variables and create Makefiles.
-+-# Generated by GNU Autoconf 2.69 for sqlite 3.20.0.
-++# Generated by GNU Autoconf 2.69 for sqlite 3.21.0.
-+ #
-+ #
-+ # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
-+@@ -726,8 +726,8 @@ MAKEFLAGS=
-+ # Identity of this package.
-+ PACKAGE_NAME='sqlite'
-+ PACKAGE_TARNAME='sqlite'
-+-PACKAGE_VERSION='3.20.0'
-+-PACKAGE_STRING='sqlite 3.20.0'
-++PACKAGE_VERSION='3.21.0'
-++PACKAGE_STRING='sqlite 3.21.0'
-+ PACKAGE_BUGREPORT=''
-+ PACKAGE_URL=''
-+ 
-+@@ -909,6 +909,7 @@ enable_fts3
-+ enable_fts4
-+ enable_fts5
-+ enable_json1
-++enable_update_limit
-+ enable_rtree
-+ enable_session
-+ enable_gcov
-+@@ -1463,7 +1464,7 @@ if test "$ac_init_help" = "long"; then
-+   # Omit some internal or obsolete options to make the list less imposing.
-+   # This message is too long to be a string in the A/UX 3.1 sh.
-+   cat <<_ACEOF
-+-\`configure' configures sqlite 3.20.0 to adapt to many kinds of systems.
-++\`configure' configures sqlite 3.21.0 to adapt to many kinds of systems.
-+ 
-+ Usage: $0 [OPTION]... [VAR=VALUE]...
-+ 
-+@@ -1528,7 +1529,7 @@ fi
-+ 
-+ if test -n "$ac_init_help"; then
-+   case $ac_init_help in
-+-     short | recursive ) echo "Configuration of sqlite 3.20.0:";;
-++     short | recursive ) echo "Configuration of sqlite 3.21.0:";;
-+    esac
-+   cat <<\_ACEOF
-+ 
-+@@ -1560,6 +1561,7 @@ Optional Features:
-+   --enable-fts4           Enable the FTS4 extension
-+   --enable-fts5           Enable the FTS5 extension
-+   --enable-json1          Enable the JSON1 extension
-++  --enable-update-limit   Enable the UPDATE/DELETE LIMIT clause
-+   --enable-rtree          Enable the RTREE extension
-+   --enable-session        Enable the SESSION extension
-+   --enable-gcov           Enable coverage testing using gcov
-+@@ -1652,7 +1654,7 @@ fi
-+ test -n "$ac_init_help" && exit $ac_status
-+ if $ac_init_version; then
-+   cat <<\_ACEOF
-+-sqlite configure 3.20.0
-++sqlite configure 3.21.0
-+ generated by GNU Autoconf 2.69
-+ 
-+ Copyright (C) 2012 Free Software Foundation, Inc.
-+@@ -2071,7 +2073,7 @@ cat >config.log <<_ACEOF
-+ This file contains any messages produced by compilers while
-+ running configure, to aid debugging if configure makes a mistake.
-+ 
-+-It was created by sqlite $as_me 3.20.0, which was
-++It was created by sqlite $as_me 3.21.0, which was
-+ generated by GNU Autoconf 2.69.  Invocation command line was
-+ 
-+   $ $0 $@
-+@@ -3929,13 +3931,13 @@ if ${lt_cv_nm_interface+:} false; then :
-+ else
-+   lt_cv_nm_interface="BSD nm"
-+   echo "int some_variable = 0;" > conftest.$ac_ext
-+-  (eval echo "\"\$as_me:3932: $ac_compile\"" >&5)
-++  (eval echo "\"\$as_me:3934: $ac_compile\"" >&5)
-+   (eval "$ac_compile" 2>conftest.err)
-+   cat conftest.err >&5
-+-  (eval echo "\"\$as_me:3935: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-++  (eval echo "\"\$as_me:3937: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-+   cat conftest.err >&5
-+-  (eval echo "\"\$as_me:3938: output\"" >&5)
-++  (eval echo "\"\$as_me:3940: output\"" >&5)
-+   cat conftest.out >&5
-+   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-+     lt_cv_nm_interface="MS dumpbin"
-+@@ -5141,7 +5143,7 @@ ia64-*-hpux*)
-+   ;;
-+ *-*-irix6*)
-+   # Find out which ABI we are using.
-+-  echo '#line 5144 "configure"' > conftest.$ac_ext
-++  echo '#line 5146 "configure"' > conftest.$ac_ext
-+   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+@@ -6666,11 +6668,11 @@ else
-+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+    -e 's:$: $lt_compiler_flag:'`
-+-   (eval echo "\"\$as_me:6669: $lt_compile\"" >&5)
-++   (eval echo "\"\$as_me:6671: $lt_compile\"" >&5)
-+    (eval "$lt_compile" 2>conftest.err)
-+    ac_status=$?
-+    cat conftest.err >&5
-+-   echo "$as_me:6673: \$? = $ac_status" >&5
-++   echo "$as_me:6675: \$? = $ac_status" >&5
-+    if (exit $ac_status) && test -s "$ac_outfile"; then
-+      # The compiler can only warn and ignore the option if not recognized
-+      # So say no if there are warnings other than the usual output.
-+@@ -7005,11 +7007,11 @@ else
-+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+    -e 's:$: $lt_compiler_flag:'`
-+-   (eval echo "\"\$as_me:7008: $lt_compile\"" >&5)
-++   (eval echo "\"\$as_me:7010: $lt_compile\"" >&5)
-+    (eval "$lt_compile" 2>conftest.err)
-+    ac_status=$?
-+    cat conftest.err >&5
-+-   echo "$as_me:7012: \$? = $ac_status" >&5
-++   echo "$as_me:7014: \$? = $ac_status" >&5
-+    if (exit $ac_status) && test -s "$ac_outfile"; then
-+      # The compiler can only warn and ignore the option if not recognized
-+      # So say no if there are warnings other than the usual output.
-+@@ -7110,11 +7112,11 @@ else
-+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+    -e 's:$: $lt_compiler_flag:'`
-+-   (eval echo "\"\$as_me:7113: $lt_compile\"" >&5)
-++   (eval echo "\"\$as_me:7115: $lt_compile\"" >&5)
-+    (eval "$lt_compile" 2>out/conftest.err)
-+    ac_status=$?
-+    cat out/conftest.err >&5
-+-   echo "$as_me:7117: \$? = $ac_status" >&5
-++   echo "$as_me:7119: \$? = $ac_status" >&5
-+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-+    then
-+      # The compiler can only warn and ignore the option if not recognized
-+@@ -7165,11 +7167,11 @@ else
-+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+    -e 's:$: $lt_compiler_flag:'`
-+-   (eval echo "\"\$as_me:7168: $lt_compile\"" >&5)
-++   (eval echo "\"\$as_me:7170: $lt_compile\"" >&5)
-+    (eval "$lt_compile" 2>out/conftest.err)
-+    ac_status=$?
-+    cat out/conftest.err >&5
-+-   echo "$as_me:7172: \$? = $ac_status" >&5
-++   echo "$as_me:7174: \$? = $ac_status" >&5
-+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-+    then
-+      # The compiler can only warn and ignore the option if not recognized
-+@@ -9545,7 +9547,7 @@ else
-+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+   lt_status=$lt_dlunknown
-+   cat > conftest.$ac_ext <<_LT_EOF
-+-#line 9548 "configure"
-++#line 9550 "configure"
-+ #include "confdefs.h"
-+ 
-+ #if HAVE_DLFCN_H
-+@@ -9641,7 +9643,7 @@ else
-+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+   lt_status=$lt_dlunknown
-+   cat > conftest.$ac_ext <<_LT_EOF
-+-#line 9644 "configure"
-++#line 9646 "configure"
-+ #include "confdefs.h"
-+ 
-+ #if HAVE_DLFCN_H
-+@@ -10302,7 +10304,7 @@ USE_AMALGAMATION=1
-+ # if not, then we fall back to plain tclsh.
-+ # TODO: try other versions before falling back?
-+ #
-+-for ac_prog in tclsh8.6 tclsh8.5 tclsh
-++for ac_prog in tclsh8.7 tclsh8.6 tclsh8.5 tclsh
-+ do
-+   # Extract the first word of "$ac_prog", so it can be a program name with args.
-+ set dummy $ac_prog; ac_word=$2
-+@@ -11540,6 +11542,20 @@ if test "${enable_json1}" = "yes" ; then
-+ fi
-+ 
-+ #########
-++# See whether we should enable the LIMIT clause on UPDATE and DELETE
-++# statements.
-++# Check whether --enable-update-limit was given.
-++if test "${enable_update_limit+set}" = set; then :
-++  enableval=$enable_update_limit; enable_udlimit=yes
-++else
-++  enable_udlimit=no
-++fi
-++
-++if test "${enable_udlimit}" = "yes" ; then
-++  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT"
-++fi
-++
-++#########
-+ # See whether we should enable RTREE
-+ # Check whether --enable-rtree was given.
-+ if test "${enable_rtree+set}" = set; then :
-+@@ -12151,7 +12167,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+ # report actual input values of CONFIG_FILES etc. instead of their
-+ # values after options handling.
-+ ac_log="
-+-This file was extended by sqlite $as_me 3.20.0, which was
-++This file was extended by sqlite $as_me 3.21.0, which was
-+ generated by GNU Autoconf 2.69.  Invocation command line was
-+ 
-+   CONFIG_FILES    = $CONFIG_FILES
-+@@ -12217,7 +12233,7 @@ _ACEOF
-+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
-+ ac_cs_version="\\
-+-sqlite config.status 3.20.0
-++sqlite config.status 3.21.0
-+ configured by $0, generated by GNU Autoconf 2.69,
-+   with options \\"\$ac_cs_config\\"
-+ 
-+diff --git a/third_party/sqlite/src/configure.ac b/third_party/sqlite/src/configure.ac
-+index 39179cc..7adb3e7 100644
-+--- a/third_party/sqlite/src/configure.ac
-++++ b/third_party/sqlite/src/configure.ac
-+@@ -120,7 +120,7 @@ USE_AMALGAMATION=1
-+ # if not, then we fall back to plain tclsh.
-+ # TODO: try other versions before falling back?
-+ #
-+-AC_CHECK_PROGS(TCLSH_CMD, [tclsh8.6 tclsh8.5 tclsh], none)
-++AC_CHECK_PROGS(TCLSH_CMD, [tclsh8.7 tclsh8.6 tclsh8.5 tclsh], none)
-+ if test "$TCLSH_CMD" = "none"; then
-+   # If we can't find a local tclsh, then building the amalgamation will fail.
-+   # We act as though --disable-amalgamation has been used.
-+@@ -645,6 +645,16 @@ if test "${enable_json1}" = "yes" ; then
-+ fi
-+ 
-+ #########
-++# See whether we should enable the LIMIT clause on UPDATE and DELETE
-++# statements.
-++AC_ARG_ENABLE(update-limit, AC_HELP_STRING([--enable-update-limit],
-++      [Enable the UPDATE/DELETE LIMIT clause]),
-++      [enable_udlimit=yes],[enable_udlimit=no])
-++if test "${enable_udlimit}" = "yes" ; then
-++  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT"
-++fi
-++
-++#########
-+ # See whether we should enable RTREE
-+ AC_ARG_ENABLE(rtree, AC_HELP_STRING([--enable-rtree],
-+       [Enable the RTREE extension]),
-+diff --git a/third_party/sqlite/src/doc/lemon.html b/third_party/sqlite/src/doc/lemon.html
-+index db82862..eb6ff12 100644
-+--- a/third_party/sqlite/src/doc/lemon.html
-++++ b/third_party/sqlite/src/doc/lemon.html
-+@@ -2,12 +2,12 @@
-+ <head>
-+ <title>The Lemon Parser Generator</title>
-+ </head>
-+-<body bgcolor=white>
-+-<h1 align=center>The Lemon Parser Generator</h1>
-++<body bgcolor='white'>
-++<h1 align='center'>The Lemon Parser Generator</h1>
-+ 
-+ <p>Lemon is an LALR(1) parser generator for C.
-+ It does the same job as "bison" and "yacc".
-+-But lemon is not a bison or yacc clone.  Lemon
-++But Lemon is not a bison or yacc clone.  Lemon
-+ uses a different grammar syntax which is designed to
-+ reduce the number of coding errors.  Lemon also uses a
-+ parsing engine that is faster than yacc and
-+@@ -16,7 +16,7 @@ bison and which is both reentrant and threadsafe.
-+ has also been updated so that it too can generate a
-+ reentrant and threadsafe parser.)
-+ Lemon also implements features that can be used
-+-to eliminate resource leaks, making is suitable for use
-++to eliminate resource leaks, making it suitable for use
-+ in long-running programs such as graphical user interfaces
-+ or embedded controllers.</p>
-+ 
-+@@ -58,8 +58,8 @@ Lemon comes with a default parser template which works fine for most
-+ applications.  But the user is free to substitute a different parser
-+ template if desired.</p>
-+ 
-+-<p>Depending on command-line options, Lemon will generate between
-+-one and three files of outputs.
-++<p>Depending on command-line options, Lemon will generate up to
-++three output files.
-+ <ul>
-+ <li>C code to implement the parser.
-+ <li>A header file defining an integer ID for each terminal symbol.
-+@@ -90,17 +90,20 @@ the states used by the parser automaton.</p>
-+ You can obtain a list of the available command-line options together
-+ with a brief explanation of what each does by typing
-+ <pre>
-+-   lemon -?
-++   lemon "-?"
-+ </pre>
-+ As of this writing, the following command-line options are supported:
-+ <ul>
-+ <li><b>-b</b>
-+ Show only the basis for each parser state in the report file.
-+ <li><b>-c</b>
-+-Do not compress the generated action tables.
-++Do not compress the generated action tables.  The parser will be a
-++little larger and slower, but it will detect syntax errors sooner.
-+ <li><b>-D<i>name</i></b>
-+-Define C preprocessor macro <i>name</i>.  This macro is useable by
-+-"%ifdef" lines in the grammar file.
-++Define C preprocessor macro <i>name</i>.  This macro is usable by
-++"<tt><a href='#pifdef'>%ifdef</a></tt>" and
-++"<tt><a href='#pifdef'>%ifndef</a></tt>" lines
-++in the grammar file.
-+ <li><b>-g</b>
-+ Do not generate a parser.  Instead write the input grammar to standard
-+ output with all comments, actions, and other extraneous text removed.
-+@@ -165,7 +168,7 @@ once for each token:
-+ </pre>
-+ The first argument to the Parse() routine is the pointer returned by
-+ ParseAlloc().
-+-The second argument is a small positive integer that tells the parse the
-++The second argument is a small positive integer that tells the parser the
-+ type of the next token in the data stream.
-+ There is one token type for each terminal symbol in the grammar.
-+ The gram.h file generated by Lemon contains #define statements that
-+@@ -173,7 +176,7 @@ map symbolic terminal symbol names into appropriate integer values.
-+ A value of 0 for the second argument is a special flag to the
-+ parser to indicate that the end of input has been reached.
-+ The third argument is the value of the given token.  By default,
-+-the type of the third argument is integer, but the grammar will
-++the type of the third argument is "void*", but the grammar will
-+ usually redefine this type to be some kind of structure.
-+ Typically the second argument will be a broad category of tokens
-+ such as "identifier" or "number" and the third argument will
-+@@ -181,7 +184,7 @@ be the name of the identifier or the value of the number.</p>
-+ 
-+ <p>The Parse() function may have either three or four arguments,
-+ depending on the grammar.  If the grammar specification file requests
-+-it (via the <a href='#extraarg'><tt>extra_argument</tt> directive</a>),
-++it (via the <tt><a href='#extraarg'>%extra_argument</a></tt> directive),
-+ the Parse() function will have a fourth parameter that can be
-+ of any type chosen by the programmer.  The parser doesn't do anything
-+ with this argument except to pass it through to action routines.
-+@@ -191,20 +194,20 @@ to the action routines without having to use global variables.</p>
-+ <p>A typical use of a Lemon parser might look something like the
-+ following:
-+ <pre>
-+-   01 ParseTree *ParseFile(const char *zFilename){
-+-   02    Tokenizer *pTokenizer;
-+-   03    void *pParser;
-+-   04    Token sToken;
-+-   05    int hTokenId;
-+-   06    ParserState sState;
-+-   07
-+-   08    pTokenizer = TokenizerCreate(zFilename);
-+-   09    pParser = ParseAlloc( malloc );
-+-   10    InitParserState(&sState);
-+-   11    while( GetNextToken(pTokenizer, &hTokenId, &sToken) ){
-+-   12       Parse(pParser, hTokenId, sToken, &sState);
-++    1 ParseTree *ParseFile(const char *zFilename){
-++    2    Tokenizer *pTokenizer;
-++    3    void *pParser;
-++    4    Token sToken;
-++    5    int hTokenId;
-++    6    ParserState sState;
-++    7
-++    8    pTokenizer = TokenizerCreate(zFilename);
-++    9    pParser = ParseAlloc( malloc );
-++   10    InitParserState(&amp;sState);
-++   11    while( GetNextToken(pTokenizer, &amp;hTokenId, &amp;sToken) ){
-++   12       Parse(pParser, hTokenId, sToken, &amp;sState);
-+    13    }
-+-   14    Parse(pParser, 0, sToken, &sState);
-++   14    Parse(pParser, 0, sToken, &amp;sState);
-+    15    ParseFree(pParser, free );
-+    16    TokenizerFree(pTokenizer);
-+    17    return sState.treeRoot;
-+@@ -220,7 +223,7 @@ on line 16.  The GetNextToken() function on line 11 retrieves the
-+ next token from the input file and puts its type in the
-+ integer variable hTokenId.  The sToken variable is assumed to be
-+ some kind of structure that contains details about each token,
-+-such as its complete text, what line it occurs on, etc. </p>
-++such as its complete text, what line it occurs on, etc.</p>
-+ 
-+ <p>This example also assumes the existence of structure of type
-+ ParserState that holds state information about a particular parse.
-+@@ -237,7 +240,7 @@ tree.</p>
-+ <pre>
-+    ParseFile(){
-+       pParser = ParseAlloc( malloc );
-+-      while( GetNextToken(pTokenizer,&hTokenId, &sToken) ){
-++      while( GetNextToken(pTokenizer,&amp;hTokenId, &amp;sToken) ){
-+          Parse(pParser, hTokenId, sToken);
-+       }
-+       Parse(pParser, 0, sToken);
-+@@ -297,23 +300,23 @@ specifies additional information Lemon requires to do its job.
-+ Most of the work in using Lemon is in writing an appropriate
-+ grammar file.</p>
-+ 
-+-<p>The grammar file for lemon is, for the most part, free format.
-++<p>The grammar file for Lemon is, for the most part, free format.
-+ It does not have sections or divisions like yacc or bison.  Any
-+ declaration can occur at any point in the file.
-+ Lemon ignores whitespace (except where it is needed to separate
-+-tokens) and it honors the same commenting conventions as C and C++.</p>
-++tokens), and it honors the same commenting conventions as C and C++.</p>
-+ 
-+ <h3>Terminals and Nonterminals</h3>
-+ 
-+ <p>A terminal symbol (token) is any string of alphanumeric
-+ and/or underscore characters
-+-that begins with an upper case letter.
-++that begins with an uppercase letter.
-+ A terminal can contain lowercase letters after the first character,
-+-but the usual convention is to make terminals all upper case.
-++but the usual convention is to make terminals all uppercase.
-+ A nonterminal, on the other hand, is any string of alphanumeric
-+-and underscore characters than begins with a lower case letter.
-+-Again, the usual convention is to make nonterminals use all lower
-+-case letters.</p>
-++and underscore characters than begins with a lowercase letter.
-++Again, the usual convention is to make nonterminals use all lowercase
-++letters.</p>
-+ 
-+ <p>In Lemon, terminal and nonterminal symbols do not need to
-+ be declared or identified in a separate section of the grammar file.
-+@@ -339,7 +342,8 @@ The list of terminals and nonterminals on the right-hand side of the
-+ rule can be empty.
-+ Rules can occur in any order, except that the left-hand side of the
-+ first rule is assumed to be the start symbol for the grammar (unless
-+-specified otherwise using the <tt>%start</tt> directive described below.)
-++specified otherwise using the <tt><a href='#start_symbol'>%start_symbol</a></tt>
-++directive described below.)
-+ A typical sequence of grammar rules might look something like this:
-+ <pre>
-+   expr ::= expr PLUS expr.
-+@@ -382,7 +386,7 @@ names to each symbol in a grammar rule and then using those symbolic
-+ names in the action.
-+ In yacc or bison, one would write this:
-+ <pre>
-+-  expr -> expr PLUS expr  { $$ = $1 + $3; };
-++  expr -&gt; expr PLUS expr  { $$ = $1 + $3; };
-+ </pre>
-+ But in Lemon, the same rule becomes the following:
-+ <pre>
-+@@ -423,13 +427,13 @@ whichever rule comes first in the grammar file.</p>
-+ 
-+ <p>Just like in
-+ yacc and bison, Lemon allows a measure of control
-+-over the resolution of paring conflicts using precedence rules.
-++over the resolution of parsing conflicts using precedence rules.
-+ A precedence value can be assigned to any terminal symbol
-+ using the
-+-<a href='#pleft'>%left</a>,
-+-<a href='#pright'>%right</a> or
-+-<a href='#pnonassoc'>%nonassoc</a> directives.  Terminal symbols
-+-mentioned in earlier directives have a lower precedence that
-++<tt><a href='#pleft'>%left</a></tt>,
-++<tt><a href='#pright'>%right</a></tt> or
-++<tt><a href='#pnonassoc'>%nonassoc</a></tt> directives.  Terminal symbols
-++mentioned in earlier directives have a lower precedence than
-+ terminal symbols mentioned in later directives.  For example:</p>
-+ 
-+ <p><pre>
-+@@ -505,29 +509,29 @@ as follows:
-+ <li> If the precedence of the token to be shifted is greater than
-+      the precedence of the rule to reduce, then resolve in favor
-+      of the shift.  No parsing conflict is reported.
-+-<li> If the precedence of the token it be shifted is less than the
-++<li> If the precedence of the token to be shifted is less than the
-+      precedence of the rule to reduce, then resolve in favor of the
-+      reduce action.  No parsing conflict is reported.
-+ <li> If the precedences are the same and the shift token is
-+      right-associative, then resolve in favor of the shift.
-+      No parsing conflict is reported.
-+-<li> If the precedences are the same the shift token is
-++<li> If the precedences are the same and the shift token is
-+      left-associative, then resolve in favor of the reduce.
-+      No parsing conflict is reported.
-+-<li> Otherwise, resolve the conflict by doing the shift and
-+-     report the parsing conflict.
-++<li> Otherwise, resolve the conflict by doing the shift, and
-++     report a parsing conflict.
-+ </ul>
-+ Reduce-reduce conflicts are resolved this way:
-+ <ul>
-+ <li> If either reduce rule
-+      lacks precedence information, then resolve in favor of the
-+-     rule that appears first in the grammar and report a parsing
-++     rule that appears first in the grammar, and report a parsing
-+      conflict.
-+-<li> If both rules have precedence and the precedence is different
-++<li> If both rules have precedence and the precedence is different,
-+      then resolve the dispute in favor of the rule with the highest
-+-     precedence and do not report a conflict.
-++     precedence, and do not report a conflict.
-+ <li> Otherwise, resolve the conflict by reducing by the rule that
-+-     appears first in the grammar and report a parsing conflict.
-++     appears first in the grammar, and report a parsing conflict.
-+ </ul>
-+ 
-+ <h3>Special Directives</h3>
-+@@ -536,40 +540,40 @@ Reduce-reduce conflicts are resolved this way:
-+ directives.  We've described all the grammar rules, so now we'll
-+ talk about the special directives.</p>
-+ 
-+-<p>Directives in lemon can occur in any order.  You can put them before
-+-the grammar rules, or after the grammar rules, or in the mist of the
-++<p>Directives in Lemon can occur in any order.  You can put them before
-++the grammar rules, or after the grammar rules, or in the midst of the
-+ grammar rules.  It doesn't matter.  The relative order of
-+ directives used to assign precedence to terminals is important, but
-+ other than that, the order of directives in Lemon is arbitrary.</p>
-+ 
-+ <p>Lemon supports the following special directives:
-+ <ul>
-+-<li><tt>%code</tt>
-+-<li><tt>%default_destructor</tt>
-+-<li><tt>%default_type</tt>
-+-<li><tt>%destructor</tt>
-+-<li><tt>%endif</tt>
-+-<li><tt>%extra_argument</tt>
-+-<li><tt>%fallback</tt>
-+-<li><tt>%ifdef</tt>
-+-<li><tt>%ifndef</tt>
-+-<li><tt>%include</tt>
-+-<li><tt>%left</tt>
-+-<li><tt>%name</tt>
-+-<li><tt>%nonassoc</tt>
-+-<li><tt>%parse_accept</tt>
-+-<li><tt>%parse_failure </tt>
-+-<li><tt>%right</tt>
-+-<li><tt>%stack_overflow</tt>
-+-<li><tt>%stack_size</tt>
-+-<li><tt>%start_symbol</tt>
-+-<li><tt>%syntax_error</tt>
-+-<li><tt>%token_class</tt>
-+-<li><tt>%token_destructor</tt>
-+-<li><tt>%token_prefix</tt>
-+-<li><tt>%token_type</tt>
-+-<li><tt>%type</tt>
-+-<li><tt>%wildcard</tt>
-++<li><tt><a href='#pcode'>%code</a></tt>
-++<li><tt><a href='#default_destructor'>%default_destructor</a></tt>
-++<li><tt><a href='#default_type'>%default_type</a></tt>
-++<li><tt><a href='#destructor'>%destructor</a></tt>
-++<li><tt><a href='#pifdef'>%endif</a></tt>
-++<li><tt><a href='#extraarg'>%extra_argument</a></tt>
-++<li><tt><a href='#pfallback'>%fallback</a></tt>
-++<li><tt><a href='#pifdef'>%ifdef</a></tt>
-++<li><tt><a href='#pifdef'>%ifndef</a></tt>
-++<li><tt><a href='#pinclude'>%include</a></tt>
-++<li><tt><a href='#pleft'>%left</a></tt>
-++<li><tt><a href='#pname'>%name</a></tt>
-++<li><tt><a href='#pnonassoc'>%nonassoc</a></tt>
-++<li><tt><a href='#parse_accept'>%parse_accept</a></tt>
-++<li><tt><a href='#parse_failure'>%parse_failure</a></tt>
-++<li><tt><a href='#pright'>%right</a></tt>
-++<li><tt><a href='#stack_overflow'>%stack_overflow</a></tt>
-++<li><tt><a href='#stack_size'>%stack_size</a></tt>
-++<li><tt><a href='#start_symbol'>%start_symbol</a></tt>
-++<li><tt><a href='#syntax_error'>%syntax_error</a></tt>
-++<li><tt><a href='#token_class'>%token_class</a></tt>
-++<li><tt><a href='#token_destructor'>%token_destructor</a></tt>
-++<li><tt><a href='#token_prefix'>%token_prefix</a></tt>
-++<li><tt><a href='#token_type'>%token_type</a></tt>
-++<li><tt><a href='#ptype'>%type</a></tt>
-++<li><tt><a href='#pwildcard'>%wildcard</a></tt>
-+ </ul>
-+ Each of these directives will be described separately in the
-+ following sections:</p>
-+@@ -577,43 +581,42 @@ following sections:</p>
-+ <a name='pcode'></a>
-+ <h4>The <tt>%code</tt> directive</h4>
-+ 
-+-<p>The %code directive is used to specify addition C code that
-++<p>The <tt>%code</tt> directive is used to specify additional C code that
-+ is added to the end of the main output file.  This is similar to
-+-the <a href='#pinclude'>%include</a> directive except that %include
-+-is inserted at the beginning of the main output file.</p>
-++the <tt><a href='#pinclude'>%include</a></tt> directive except that
-++<tt>%include</tt> is inserted at the beginning of the main output file.</p>
-+ 
-+-<p>%code is typically used to include some action routines or perhaps
-++<p><tt>%code</tt> is typically used to include some action routines or perhaps
-+ a tokenizer or even the "main()" function
-+ as part of the output file.</p>
-+ 
-+ <a name='default_destructor'></a>
-+ <h4>The <tt>%default_destructor</tt> directive</h4>
-+ 
-+-<p>The %default_destructor directive specifies a destructor to
-++<p>The <tt>%default_destructor</tt> directive specifies a destructor to
-+ use for non-terminals that do not have their own destructor
-+-specified by a separate %destructor directive.  See the documentation
-+-on the <a name='#destructor'>%destructor</a> directive below for
-++specified by a separate <tt>%destructor</tt> directive.  See the documentation
-++on the <tt><a name='#destructor'>%destructor</a></tt> directive below for
-+ additional information.</p>
-+ 
-+-<p>In some grammers, many different non-terminal symbols have the
-+-same datatype and hence the same destructor.  This directive is
-+-a convenience way to specify the same destructor for all those
-++<p>In some grammars, many different non-terminal symbols have the
-++same data type and hence the same destructor.  This directive is
-++a convenient way to specify the same destructor for all those
-+ non-terminals using a single statement.</p>
-+ 
-+ <a name='default_type'></a>
-+ <h4>The <tt>%default_type</tt> directive</h4>
-+ 
-+-<p>The %default_type directive specifies the datatype of non-terminal
-+-symbols that do no have their own datatype defined using a separate
-+-<a href='#ptype'>%type</a> directive.
-+-</p>
-++<p>The <tt>%default_type</tt> directive specifies the data type of non-terminal
-++symbols that do not have their own data type defined using a separate
-++<tt><a href='#ptype'>%type</a></tt> directive.</p>
-+ 
-+ <a name='destructor'></a>
-+ <h4>The <tt>%destructor</tt> directive</h4>
-+ 
-+-<p>The %destructor directive is used to specify a destructor for
-++<p>The <tt>%destructor</tt> directive is used to specify a destructor for
-+ a non-terminal symbol.
-+-(See also the <a href='#token_destructor'>%token_destructor</a>
-++(See also the <tt><a href='#token_destructor'>%token_destructor</a></tt>
-+ directive which is used to specify a destructor for terminal symbols.)</p>
-+ 
-+ <p>A non-terminal's destructor is called to dispose of the
-+@@ -635,7 +638,7 @@ or other resources held by that non-terminal.</p>
-+    %destructor nt { free($$); }
-+    nt(A) ::= ID NUM.   { A = malloc( 100 ); }
-+ </pre>
-+-This example is a bit contrived but it serves to illustrate how
-++This example is a bit contrived, but it serves to illustrate how
-+ destructors work.  The example shows a non-terminal named
-+ "nt" that holds values of type "void*".  When the rule for
-+ an "nt" reduces, it sets the value of the non-terminal to
-+@@ -651,17 +654,17 @@ stack, unless the non-terminal is used in a C-code action.  If
-+ the non-terminal is used by C-code, then it is assumed that the
-+ C-code will take care of destroying it.
-+ More commonly, the value is used to build some
-+-larger structure and we don't want to destroy it, which is why
-++larger structure, and we don't want to destroy it, which is why
-+ the destructor is not called in this circumstance.</p>
-+ 
-+ <p>Destructors help avoid memory leaks by automatically freeing
-+ allocated objects when they go out of scope.
-+ To do the same using yacc or bison is much more difficult.</p>
-+ 
-+-<a name="extraarg"></a>
-++<a name='extraarg'></a>
-+ <h4>The <tt>%extra_argument</tt> directive</h4>
-+ 
-+-The %extra_argument directive instructs Lemon to add a 4th parameter
-++The <tt>%extra_argument</tt> directive instructs Lemon to add a 4th parameter
-+ to the parameter list of the Parse() function it generates.  Lemon
-+ doesn't do anything itself with this extra argument, but it does
-+ make the argument available to C-code action routines, destructors,
-+@@ -679,61 +682,64 @@ in the most recent call to Parse().</p>
-+ <a name='pfallback'></a>
-+ <h4>The <tt>%fallback</tt> directive</h4>
-+ 
-+-<p>The %fallback directive specifies an alternative meaning for one
-++<p>The <tt>%fallback</tt> directive specifies an alternative meaning for one
-+ or more tokens.  The alternative meaning is tried if the original token
-+-would have generated a syntax error.
-++would have generated a syntax error.</p>
-+ 
-+-<p>The %fallback directive was added to support robust parsing of SQL
-+-syntax in <a href="https://www.sqlite.org/">SQLite</a>.
-++<p>The <tt>%fallback</tt> directive was added to support robust parsing of SQL
-++syntax in <a href='https://www.sqlite.org/'>SQLite</a>.
-+ The SQL language contains a large assortment of keywords, each of which
-+ appears as a different token to the language parser.  SQL contains so
-+-many keywords, that it can be difficult for programmers to keep up with
-++many keywords that it can be difficult for programmers to keep up with
-+ them all.  Programmers will, therefore, sometimes mistakenly use an
-+-obscure language keyword for an identifier.  The %fallback directive
-++obscure language keyword for an identifier.  The <tt>%fallback</tt> directive
-+ provides a mechanism to tell the parser:  "If you are unable to parse
-+-this keyword, try treating it as an identifier instead."
-++this keyword, try treating it as an identifier instead."</p>
-+ 
-+-<p>The syntax of %fallback is as follows:
-++<p>The syntax of <tt>%fallback</tt> is as follows:
-+ 
-+ <blockquote>
-+-<tt>%fallback</tt>  <i>ID</i> <i>TOKEN...</i> <b>.</b>
-+-</blockquote>
-++<tt>%fallback</tt> <i>ID</i> <i>TOKEN...</i> <b>.</b>
-++</blockquote></p>
-+ 
-+-<p>In words, the %fallback directive is followed by a list of token names
-+-terminated by a period.  The first token name is the fallback token - the
-++<p>In words, the <tt>%fallback</tt> directive is followed by a list of token
-++names terminated by a period.
-++The first token name is the fallback token &mdash; the
-+ token to which all the other tokens fall back to.  The second and subsequent
-+ arguments are tokens which fall back to the token identified by the first
-+-argument.
-++argument.</p>
-+ 
-+ <a name='pifdef'></a>
-+-<h4>The <tt>%ifdef</tt>, <tt>%ifndef</tt>, and <tt>%endif</tt> directives.</h4>
-++<h4>The <tt>%ifdef</tt>, <tt>%ifndef</tt>, and <tt>%endif</tt> directives</h4>
-+ 
-+-<p>The %ifdef, %ifndef, and %endif directives are similar to
-+-#ifdef, #ifndef, and #endif in the C-preprocessor, just not as general.
-++<p>The <tt>%ifdef</tt>, <tt>%ifndef</tt>, and <tt>%endif</tt> directives
-++are similar to #ifdef, #ifndef, and #endif in the C-preprocessor,
-++just not as general.
-+ Each of these directives must begin at the left margin.  No whitespace
-+-is allowed between the "%" and the directive name.
-++is allowed between the "%" and the directive name.</p>
-+ 
-+-<p>Grammar text in between "%ifdef MACRO" and the next nested "%endif" is
-++<p>Grammar text in between "<tt>%ifdef MACRO</tt>" and the next nested
-++"<tt>%endif</tt>" is
-+ ignored unless the "-DMACRO" command-line option is used.  Grammar text
-+-betwen "%ifndef MACRO" and the next nested "%endif" is included except when
-+-the "-DMACRO" command-line option is used.
-++betwen "<tt>%ifndef MACRO</tt>" and the next nested "<tt>%endif</tt>" is
-++included except when the "-DMACRO" command-line option is used.</p>
-+ 
-+-<p>Note that the argument to %ifdef and %ifndef must be a single
-+-preprocessor symbol name, not a general expression.  There is no "%else"
-+-directive.
-++<p>Note that the argument to <tt>%ifdef</tt> and <tt>%ifndef</tt> must
-++be a single preprocessor symbol name, not a general expression.
-++There is no "<tt>%else</tt>" directive.</p>
-+ 
-+ 
-+ <a name='pinclude'></a>
-+ <h4>The <tt>%include</tt> directive</h4>
-+ 
-+-<p>The %include directive specifies C code that is included at the
-+-top of the generated parser.  You can include any text you want --
-++<p>The <tt>%include</tt> directive specifies C code that is included at the
-++top of the generated parser.  You can include any text you want &mdash;
-+ the Lemon parser generator copies it blindly.  If you have multiple
-+-%include directives in your grammar file, their values are concatenated
-+-so that all %include code ultimately appears near the top of the
-+-generated parser, in the same order as it appeared in the grammer.</p>
-++<tt>%include</tt> directives in your grammar file, their values are concatenated
-++so that all <tt>%include</tt> code ultimately appears near the top of the
-++generated parser, in the same order as it appeared in the grammar.</p>
-+ 
-+-<p>The %include directive is very handy for getting some extra #include
-++<p>The <tt>%include</tt> directive is very handy for getting some extra #include
-+ preprocessor statements at the beginning of the generated parser.
-+ For example:</p>
-+ 
-+@@ -742,17 +748,19 @@ For example:</p>
-+ </pre></p>
-+ 
-+ <p>This might be needed, for example, if some of the C actions in the
-+-grammar call functions that are prototyed in unistd.h.</p>
-++grammar call functions that are prototyped in unistd.h.</p>
-+ 
-+ <a name='pleft'></a>
-+ <h4>The <tt>%left</tt> directive</h4>
-+ 
-+-The %left directive is used (along with the <a href='#pright'>%right</a> and
-+-<a href='#pnonassoc'>%nonassoc</a> directives) to declare precedences of
-+-terminal symbols.  Every terminal symbol whose name appears after
-+-a %left directive but before the next period (".") is
-++The <tt>%left</tt> directive is used (along with the
-++<tt><a href='#pright'>%right</a></tt> and
-++<tt><a href='#pnonassoc'>%nonassoc</a></tt> directives) to declare
-++precedences of terminal symbols.
-++Every terminal symbol whose name appears after
-++a <tt>%left</tt> directive but before the next period (".") is
-+ given the same left-associative precedence value.  Subsequent
-+-%left directives have higher precedence.  For example:</p>
-++<tt>%left</tt> directives have higher precedence.  For example:</p>
-+ 
-+ <p><pre>
-+    %left AND.
-+@@ -763,20 +771,21 @@ given the same left-associative precedence value.  Subsequent
-+    %right EXP NOT.
-+ </pre></p>
-+ 
-+-<p>Note the period that terminates each %left, %right or %nonassoc
-++<p>Note the period that terminates each <tt>%left</tt>,
-++<tt>%right</tt> or <tt>%nonassoc</tt>
-+ directive.</p>
-+ 
-+ <p>LALR(1) grammars can get into a situation where they require
-+ a large amount of stack space if you make heavy use or right-associative
-+-operators.  For this reason, it is recommended that you use %left
-+-rather than %right whenever possible.</p>
-++operators.  For this reason, it is recommended that you use <tt>%left</tt>
-++rather than <tt>%right</tt> whenever possible.</p>
-+ 
-+ <a name='pname'></a>
-+ <h4>The <tt>%name</tt> directive</h4>
-+ 
-+ <p>By default, the functions generated by Lemon all begin with the
-+ five-character string "Parse".  You can change this string to something
-+-different using the %name directive.  For instance:</p>
-++different using the <tt>%name</tt> directive.  For instance:</p>
-+ 
-+ <p><pre>
-+    %name Abcde
-+@@ -790,9 +799,8 @@ functions named
-+ <li> AbcdeTrace(), and
-+ <li> Abcde().
-+ </ul>
-+-The %name directive allows you to generator two or more different
-+-parsers and link them all into the same executable.
-+-</p>
-++The <tt>%name</tt> directive allows you to generate two or more different
-++parsers and link them all into the same executable.</p>
-+ 
-+ <a name='pnonassoc'></a>
-+ <h4>The <tt>%nonassoc</tt> directive</h4>
-+@@ -800,12 +808,13 @@ parsers and link them all into the same executable.
-+ <p>This directive is used to assign non-associative precedence to
-+ one or more terminal symbols.  See the section on
-+ <a href='#precrules'>precedence rules</a>
-+-or on the <a href='#pleft'>%left</a> directive for additional information.</p>
-++or on the <tt><a href='#pleft'>%left</a></tt> directive
-++for additional information.</p>
-+ 
-+ <a name='parse_accept'></a>
-+ <h4>The <tt>%parse_accept</tt> directive</h4>
-+ 
-+-<p>The %parse_accept directive specifies a block of C code that is
-++<p>The <tt>%parse_accept</tt> directive specifies a block of C code that is
-+ executed whenever the parser accepts its input string.  To "accept"
-+ an input string means that the parser was able to process all tokens
-+ without error.</p>
-+@@ -821,7 +830,7 @@ without error.</p>
-+ <a name='parse_failure'></a>
-+ <h4>The <tt>%parse_failure</tt> directive</h4>
-+ 
-+-<p>The %parse_failure directive specifies a block of C code that
-++<p>The <tt>%parse_failure</tt> directive specifies a block of C code that
-+ is executed whenever the parser fails complete.  This code is not
-+ executed until the parser has tried and failed to resolve an input
-+ error using is usual error recovery strategy.  The routine is
-+@@ -844,7 +853,7 @@ or on the <a href='#pleft'>%left</a> directive for additional information.</p>
-+ <a name='stack_overflow'></a>
-+ <h4>The <tt>%stack_overflow</tt> directive</h4>
-+ 
-+-<p>The %stack_overflow directive specifies a block of C code that
-++<p>The <tt>%stack_overflow</tt> directive specifies a block of C code that
-+ is executed if the parser's internal stack ever overflows.  Typically
-+ this just prints an error message.  After a stack overflow, the parser
-+ will be unable to continue and must be reset.</p>
-+@@ -857,7 +866,7 @@ will be unable to continue and must be reset.</p>
-+ 
-+ <p>You can help prevent parser stack overflows by avoiding the use
-+ of right recursion and right-precedence operators in your grammar.
-+-Use left recursion and and left-precedence operators instead, to
-++Use left recursion and and left-precedence operators instead to
-+ encourage rules to reduce sooner and keep the stack size down.
-+ For example, do rules like this:
-+ <pre>
-+@@ -868,7 +877,7 @@ Not like this:
-+ <pre>
-+    list ::= element list.      // right-recursion.  Bad!
-+    list ::= .
-+-</pre>
-++</pre></p>
-+ 
-+ <a name='stack_size'></a>
-+ <h4>The <tt>%stack_size</tt> directive</h4>
-+@@ -876,7 +885,7 @@ Not like this:
-+ <p>If stack overflow is a problem and you can't resolve the trouble
-+ by using left-recursion, then you might want to increase the size
-+ of the parser's stack using this directive.  Put an positive integer
-+-after the %stack_size directive and Lemon will generate a parse
-++after the <tt>%stack_size</tt> directive and Lemon will generate a parse
-+ with a stack of the requested size.  The default value is 100.</p>
-+ 
-+ <p><pre>
-+@@ -886,25 +895,40 @@ with a stack of the requested size.  The default value is 100.</p>
-+ <a name='start_symbol'></a>
-+ <h4>The <tt>%start_symbol</tt> directive</h4>
-+ 
-+-<p>By default, the start-symbol for the grammar that Lemon generates
-++<p>By default, the start symbol for the grammar that Lemon generates
-+ is the first non-terminal that appears in the grammar file.  But you
-+-can choose a different start-symbol using the %start_symbol directive.</p>
-++can choose a different start symbol using the
-++<tt>%start_symbol</tt> directive.</p>
-+ 
-+ <p><pre>
-+    %start_symbol  prog
-+ </pre></p>
-+ 
-++<a name='syntax_error'></a>
-++<h4>The <tt>%syntax_error</tt> directive</h4>
-++
-++<p>See <a href='#error_processing'>Error Processing</a>.</p>
-++
-++<a name='token_class'></a>
-++<h4>The <tt>%token_class</tt> directive</h4>
-++
-++<p>Undocumented.  Appears to be related to the MULTITERMINAL concept.
-++<a href='http://sqlite.org/src/fdiff?v1=796930d5fc2036c7&v2=624b24c5dc048e09&sbs=0'>Implementation</a>.</p>
-++
-+ <a name='token_destructor'></a>
-+ <h4>The <tt>%token_destructor</tt> directive</h4>
-+ 
-+-<p>The %destructor directive assigns a destructor to a non-terminal
-+-symbol.  (See the description of the %destructor directive above.)
-+-This directive does the same thing for all terminal symbols.</p>
-++<p>The <tt>%destructor</tt> directive assigns a destructor to a non-terminal
-++symbol.  (See the description of the
-++<tt><a href='%destructor'>%destructor</a></tt> directive above.)
-++The <tt>%token_destructor</tt> directive does the same thing
-++for all terminal symbols.</p>
-+ 
-+ <p>Unlike non-terminal symbols which may each have a different data type
-+ for their values, terminals all use the same data type (defined by
-+-the %token_type directive) and so they use a common destructor.  Other
-+-than that, the token destructor works just like the non-terminal
-++the <tt><a href='#token_type'>%token_type</a></tt> directive)
-++and so they use a common destructor.
-++Other than that, the token destructor works just like the non-terminal
-+ destructors.</p>
-+ 
-+ <a name='token_prefix'></a>
-+@@ -913,8 +937,9 @@ destructors.</p>
-+ <p>Lemon generates #defines that assign small integer constants
-+ to each terminal symbol in the grammar.  If desired, Lemon will
-+ add a prefix specified by this directive
-+-to each of the #defines it generates.
-+-So if the default output of Lemon looked like this:
-++to each of the #defines it generates.</p>
-++
-++<p>So if the default output of Lemon looked like this:
-+ <pre>
-+     #define AND              1
-+     #define MINUS            2
-+@@ -931,7 +956,7 @@ to cause Lemon to produce these symbols instead:
-+     #define TOKEN_MINUS      2
-+     #define TOKEN_OR         3
-+     #define TOKEN_PLUS       4
-+-</pre>
-++</pre></p>
-+ 
-+ <a name='token_type'></a><a name='ptype'></a>
-+ <h4>The <tt>%token_type</tt> and <tt>%type</tt> directives</h4>
-+@@ -952,7 +977,7 @@ token structure.  Like this:</p>
-+ is "void*".</p>
-+ 
-+ <p>Non-terminal symbols can each have their own data types.  Typically
-+-the data type  of a non-terminal is a pointer to the root of a parse-tree
-++the data type of a non-terminal is a pointer to the root of a parse tree
-+ structure that contains all information about that non-terminal.
-+ For example:</p>
-+ 
-+@@ -973,14 +998,15 @@ and able to pay that price, fine.  You just need to know.</p>
-+ <a name='pwildcard'></a>
-+ <h4>The <tt>%wildcard</tt> directive</h4>
-+ 
-+-<p>The %wildcard directive is followed by a single token name and a
-++<p>The <tt>%wildcard</tt> directive is followed by a single token name and a
-+ period.  This directive specifies that the identified token should
-+-match any input token.
-++match any input token.</p>
-+ 
-+ <p>When the generated parser has the choice of matching an input against
-+ the wildcard token and some other token, the other token is always used.
-+-The wildcard token is only matched if there are no other alternatives.
-++The wildcard token is only matched if there are no alternatives.</p>
-+ 
-++<a name='error_processing'></a>
-+ <h3>Error Processing</h3>
-+ 
-+ <p>After extensive experimentation over several years, it has been
-+@@ -988,16 +1014,17 @@ discovered that the error recovery strategy used by yacc is about
-+ as good as it gets.  And so that is what Lemon uses.</p>
-+ 
-+ <p>When a Lemon-generated parser encounters a syntax error, it
-+-first invokes the code specified by the %syntax_error directive, if
-++first invokes the code specified by the <tt>%syntax_error</tt> directive, if
-+ any.  It then enters its error recovery strategy.  The error recovery
-+ strategy is to begin popping the parsers stack until it enters a
-+ state where it is permitted to shift a special non-terminal symbol
-+ named "error".  It then shifts this non-terminal and continues
-+-parsing.  But the %syntax_error routine will not be called again
-++parsing.  The <tt>%syntax_error</tt> routine will not be called again
-+ until at least three new tokens have been successfully shifted.</p>
-+ 
-+ <p>If the parser pops its stack until the stack is empty, and it still
-+-is unable to shift the error symbol, then the %parse_failed routine
-++is unable to shift the error symbol, then the
-++<tt><a href='#parse_failure'>%parse_failure</a></tt> routine
-+ is invoked and the parser resets itself to its start state, ready
-+ to begin parsing a new file.  This is what will happen at the very
-+ first syntax error, of course, if there are no instances of the
-+diff --git a/third_party/sqlite/src/ext/fts5/fts5_vocab.c b/third_party/sqlite/src/ext/fts5/fts5_vocab.c
-+index 5d72c80..7ac5658 100644
-+--- a/third_party/sqlite/src/ext/fts5/fts5_vocab.c
-++++ b/third_party/sqlite/src/ext/fts5/fts5_vocab.c
-+@@ -29,6 +29,11 @@
-+ **   the number of fts5 rows that contain at least one instance of term
-+ **   $term. Field $cnt is set to the total number of instances of term
-+ **   $term in the database.
-++**
-++** instance:
-++**     CREATE TABLE vocab(term, doc, col, offset, PRIMARY KEY(<all-fields>));
-++**
-++**   One row for each term instance in the database.
-+ */
-+ 
-+ 
-+@@ -44,7 +49,7 @@ struct Fts5VocabTable {
-+   char *zFts5Db;                  /* Db containing fts5 table */
-+   sqlite3 *db;                    /* Database handle */
-+   Fts5Global *pGlobal;            /* FTS5 global object for this database */
-+-  int eType;                      /* FTS5_VOCAB_COL or ROW */
-++  int eType;                      /* FTS5_VOCAB_COL, ROW or INSTANCE */
-+ };
-+ 
-+ struct Fts5VocabCursor {
-+@@ -64,16 +69,22 @@ struct Fts5VocabCursor {
-+   i64 *aCnt;
-+   i64 *aDoc;
-+ 
-+-  /* Output values used by 'row' and 'col' tables */
-++  /* Output values used by all tables. */
-+   i64 rowid;                      /* This table's current rowid value */
-+   Fts5Buffer term;                /* Current value of 'term' column */
-++
-++  /* Output values Used by 'instance' tables only */
-++  i64 iInstPos;
-++  int iInstOff;
-+ };
-+ 
-+-#define FTS5_VOCAB_COL    0
-+-#define FTS5_VOCAB_ROW    1
-++#define FTS5_VOCAB_COL      0
-++#define FTS5_VOCAB_ROW      1
-++#define FTS5_VOCAB_INSTANCE 2
-+ 
-+ #define FTS5_VOCAB_COL_SCHEMA  "term, col, doc, cnt"
-+ #define FTS5_VOCAB_ROW_SCHEMA  "term, doc, cnt"
-++#define FTS5_VOCAB_INST_SCHEMA "term, doc, col, offset"
-+ 
-+ /*
-+ ** Bits for the mask used as the idxNum value by xBestIndex/xFilter.
-+@@ -101,6 +112,9 @@ static int fts5VocabTableType(const char *zType, char **pzErr, int *peType){
-+     if( sqlite3_stricmp(zCopy, "row")==0 ){
-+       *peType = FTS5_VOCAB_ROW;
-+     }else
-++    if( sqlite3_stricmp(zCopy, "instance")==0 ){
-++      *peType = FTS5_VOCAB_INSTANCE;
-++    }else
-+     {
-+       *pzErr = sqlite3_mprintf("fts5vocab: unknown table type: %Q", zCopy);
-+       rc = SQLITE_ERROR;
-+@@ -161,7 +175,8 @@ static int fts5VocabInitVtab(
-+ ){
-+   const char *azSchema[] = {
-+     "CREATE TABlE vocab(" FTS5_VOCAB_COL_SCHEMA  ")",
-+-    "CREATE TABlE vocab(" FTS5_VOCAB_ROW_SCHEMA  ")"
-++    "CREATE TABlE vocab(" FTS5_VOCAB_ROW_SCHEMA  ")",
-++    "CREATE TABlE vocab(" FTS5_VOCAB_INST_SCHEMA ")"
-+   };
-+ 
-+   Fts5VocabTable *pRet = 0;
-+@@ -235,6 +250,15 @@ static int fts5VocabCreateMethod(
-+ 
-+ /*
-+ ** Implementation of the xBestIndex method.
-++**
-++** Only constraints of the form:
-++**
-++**     term <= ?
-++**     term == ?
-++**     term >= ?
-++**
-++** are interpreted. Less-than and less-than-or-equal are treated
-++** identically, as are greater-than and greater-than-or-equal.
-+ */
-+ static int fts5VocabBestIndexMethod(
-+   sqlite3_vtab *pUnused,
-+@@ -378,6 +402,54 @@ static int fts5VocabCloseMethod(sqlite3_vtab_cursor *pCursor){
-+   return SQLITE_OK;
-+ }
-+ 
-++static int fts5VocabInstanceNewTerm(Fts5VocabCursor *pCsr){
-++  int rc = SQLITE_OK;
-++
-++  if( sqlite3Fts5IterEof(pCsr->pIter) ){
-++    pCsr->bEof = 1;
-++  }else{
-++    const char *zTerm;
-++    int nTerm;
-++    zTerm = sqlite3Fts5IterTerm(pCsr->pIter, &nTerm);
-++    if( pCsr->nLeTerm>=0 ){
-++      int nCmp = MIN(nTerm, pCsr->nLeTerm);
-++      int bCmp = memcmp(pCsr->zLeTerm, zTerm, nCmp);
-++      if( bCmp<0 || (bCmp==0 && pCsr->nLeTerm<nTerm) ){
-++        pCsr->bEof = 1;
-++      }
-++    }
-++
-++    sqlite3Fts5BufferSet(&rc, &pCsr->term, nTerm, (const u8*)zTerm);
-++  }
-++  return rc;
-++}
-++
-++static int fts5VocabInstanceNext(Fts5VocabCursor *pCsr){
-++  int eDetail = pCsr->pConfig->eDetail;
-++  int rc = SQLITE_OK;
-++  Fts5IndexIter *pIter = pCsr->pIter;
-++  i64 *pp = &pCsr->iInstPos;
-++  int *po = &pCsr->iInstOff;
-++
-++  while( eDetail==FTS5_DETAIL_NONE
-++      || sqlite3Fts5PoslistNext64(pIter->pData, pIter->nData, po, pp)
-++  ){
-++    pCsr->iInstPos = 0;
-++    pCsr->iInstOff = 0;
-++
-++    rc = sqlite3Fts5IterNextScan(pCsr->pIter);
-++    if( rc==SQLITE_OK ){
-++      rc = fts5VocabInstanceNewTerm(pCsr);
-++      if( eDetail==FTS5_DETAIL_NONE ) break;
-++    }
-++    if( rc ){
-++      pCsr->bEof = 1;
-++      break;
-++    }
-++  }
-++
-++  return rc;
-++}
-+ 
-+ /*
-+ ** Advance the cursor to the next row in the table.
-+@@ -390,13 +462,17 @@ static int fts5VocabNextMethod(sqlite3_vtab_cursor *pCursor){
-+ 
-+   pCsr->rowid++;
-+ 
-++  if( pTab->eType==FTS5_VOCAB_INSTANCE ){
-++    return fts5VocabInstanceNext(pCsr);
-++  }
-++
-+   if( pTab->eType==FTS5_VOCAB_COL ){
-+     for(pCsr->iCol++; pCsr->iCol<nCol; pCsr->iCol++){
-+       if( pCsr->aDoc[pCsr->iCol] ) break;
-+     }
-+   }
-+ 
-+-  if( pTab->eType==FTS5_VOCAB_ROW || pCsr->iCol>=nCol ){
-++  if( pTab->eType!=FTS5_VOCAB_COL || pCsr->iCol>=nCol ){
-+     if( sqlite3Fts5IterEof(pCsr->pIter) ){
-+       pCsr->bEof = 1;
-+     }else{
-+@@ -420,22 +496,26 @@ static int fts5VocabNextMethod(sqlite3_vtab_cursor *pCursor){
-+ 
-+       assert( pTab->eType==FTS5_VOCAB_COL || pTab->eType==FTS5_VOCAB_ROW );
-+       while( rc==SQLITE_OK ){
-++        int eDetail = pCsr->pConfig->eDetail;
-+         const u8 *pPos; int nPos;   /* Position list */
-+         i64 iPos = 0;               /* 64-bit position read from poslist */
-+         int iOff = 0;               /* Current offset within position list */
-+ 
-+         pPos = pCsr->pIter->pData;
-+         nPos = pCsr->pIter->nData;
-+-        switch( pCsr->pConfig->eDetail ){
-+-          case FTS5_DETAIL_FULL:
-+-            pPos = pCsr->pIter->pData;
-+-            nPos = pCsr->pIter->nData;
-+-            if( pTab->eType==FTS5_VOCAB_ROW ){
-++
-++        switch( pTab->eType ){
-++          case FTS5_VOCAB_ROW:
-++            if( eDetail==FTS5_DETAIL_FULL ){
-+               while( 0==sqlite3Fts5PoslistNext64(pPos, nPos, &iOff, &iPos) ){
-+                 pCsr->aCnt[0]++;
-+               }
-+-              pCsr->aDoc[0]++;
-+-            }else{
-++            }
-++            pCsr->aDoc[0]++;
-++            break;
-++
-++          case FTS5_VOCAB_COL:
-++            if( eDetail==FTS5_DETAIL_FULL ){
-+               int iCol = -1;
-+               while( 0==sqlite3Fts5PoslistNext64(pPos, nPos, &iOff, &iPos) ){
-+                 int ii = FTS5_POS2COLUMN(iPos);
-+@@ -449,13 +529,7 @@ static int fts5VocabNextMethod(sqlite3_vtab_cursor *pCursor){
-+                   iCol = ii;
-+                 }
-+               }
-+-            }
-+-            break;
-+-
-+-          case FTS5_DETAIL_COLUMNS:
-+-            if( pTab->eType==FTS5_VOCAB_ROW ){
-+-              pCsr->aDoc[0]++;
-+-            }else{
-++            }else if( eDetail==FTS5_DETAIL_COLUMNS ){
-+               while( 0==sqlite3Fts5PoslistNext64(pPos, nPos, &iOff,&iPos) ){
-+                 assert_nc( iPos>=0 && iPos<nCol );
-+                 if( iPos>=nCol ){
-+@@ -464,18 +538,21 @@ static int fts5VocabNextMethod(sqlite3_vtab_cursor *pCursor){
-+                 }
-+                 pCsr->aDoc[iPos]++;
-+               }
-++            }else{
-++              assert( eDetail==FTS5_DETAIL_NONE );
-++              pCsr->aDoc[0]++;
-+             }
-+             break;
-+ 
-+           default:
-+-            assert( pCsr->pConfig->eDetail==FTS5_DETAIL_NONE );
-+-            pCsr->aDoc[0]++;
-++            assert( pTab->eType==FTS5_VOCAB_INSTANCE );
-+             break;
-+         }
-+ 
-+         if( rc==SQLITE_OK ){
-+           rc = sqlite3Fts5IterNextScan(pCsr->pIter);
-+         }
-++        if( pTab->eType==FTS5_VOCAB_INSTANCE ) break;
-+ 
-+         if( rc==SQLITE_OK ){
-+           zTerm = sqlite3Fts5IterTerm(pCsr->pIter, &nTerm);
-+@@ -505,7 +582,9 @@ static int fts5VocabFilterMethod(
-+   int nUnused,                    /* Number of elements in apVal */
-+   sqlite3_value **apVal           /* Arguments for the indexing scheme */
-+ ){
-++  Fts5VocabTable *pTab = (Fts5VocabTable*)pCursor->pVtab;
-+   Fts5VocabCursor *pCsr = (Fts5VocabCursor*)pCursor;
-++  int eType = pTab->eType;
-+   int rc = SQLITE_OK;
-+ 
-+   int iVal = 0;
-+@@ -545,11 +624,16 @@ static int fts5VocabFilterMethod(
-+     }
-+   }
-+ 
-+-
-+   if( rc==SQLITE_OK ){
-+     rc = sqlite3Fts5IndexQuery(pCsr->pIndex, zTerm, nTerm, f, 0, &pCsr->pIter);
-+   }
-+-  if( rc==SQLITE_OK ){
-++  if( rc==SQLITE_OK && eType==FTS5_VOCAB_INSTANCE ){
-++    rc = fts5VocabInstanceNewTerm(pCsr);
-++  }
-++  if( rc==SQLITE_OK
-++   && !pCsr->bEof
-++   && (eType!=FTS5_VOCAB_INSTANCE || pCsr->pConfig->eDetail!=FTS5_DETAIL_NONE)
-++  ){
-+     rc = fts5VocabNextMethod(pCursor);
-+   }
-+ 
-+@@ -591,13 +675,41 @@ static int fts5VocabColumnMethod(
-+     }else{
-+       iVal = pCsr->aCnt[pCsr->iCol];
-+     }
-+-  }else{
-++  }else if( eType==FTS5_VOCAB_ROW ){
-+     assert( iCol==1 || iCol==2 );
-+     if( iCol==1 ){
-+       iVal = pCsr->aDoc[0];
-+     }else{
-+       iVal = pCsr->aCnt[0];
-+     }
-++  }else{
-++    assert( eType==FTS5_VOCAB_INSTANCE );
-++    switch( iCol ){
-++      case 1:
-++        sqlite3_result_int64(pCtx, pCsr->pIter->iRowid);
-++        break;
-++      case 2: {
-++        int ii = -1;
-++        if( eDetail==FTS5_DETAIL_FULL ){
-++          ii = FTS5_POS2COLUMN(pCsr->iInstPos);
-++        }else if( eDetail==FTS5_DETAIL_COLUMNS ){
-++          ii = (int)pCsr->iInstPos;
-++        }
-++        if( ii>=0 && ii<pCsr->pConfig->nCol ){
-++          const char *z = pCsr->pConfig->azCol[ii];
-++          sqlite3_result_text(pCtx, z, -1, SQLITE_STATIC);
-++        }
-++        break;
-++      }
-++      default: {
-++        assert( iCol==3 );
-++        if( eDetail==FTS5_DETAIL_FULL ){
-++          int ii = FTS5_POS2OFFSET(pCsr->iInstPos);
-++          sqlite3_result_int(pCtx, ii);
-++        }
-++        break;
-++      }
-++    }
-+   }
-+ 
-+   if( iVal>0 ) sqlite3_result_int64(pCtx, iVal);
-+diff --git a/third_party/sqlite/src/ext/fts5/test/fts5connect.test b/third_party/sqlite/src/ext/fts5/test/fts5connect.test
-+new file mode 100644
-+index 0000000..d48a428
-+--- /dev/null
-++++ b/third_party/sqlite/src/ext/fts5/test/fts5connect.test
-+@@ -0,0 +1,247 @@
-++# 2017 August 17
-++#
-++# The author disclaims copyright to this source code.  In place of
-++# a legal notice, here is a blessing:
-++#
-++#    May you do good and not evil.
-++#    May you find forgiveness for yourself and forgive others.
-++#    May you share freely, never taking more than you give.
-++#
-++#*************************************************************************
-++#
-++
-++
-++
-++source [file join [file dirname [info script]] fts5_common.tcl]
-++set testprefix fts5connect
-++
-++ifcapable !fts5 {
-++  finish_test
-++  return
-++}
-++
-++#-------------------------------------------------------------------------
-++# The tests in this file test the outcome of a schema-reset happening
-++# within the xConnect() method of an FTS5 table. At one point this
-++# was causing a problem in SQLite. Each test proceeds as follows:
-++#
-++#   1. Connection [db] opens the db and reads from some unrelated, non-FTS5
-++#      table causing SQLite to load the db schema into memory.
-++#
-++#   2. Connection [db2] opens the db and modifies the db schema.
-++#
-++#   3. Connection [db] reads or writes an existing fts5 table. That the
-++#      schema has been modified is detected inside the fts5 xConnect()
-++#      callback that is invoked by sqlite3_prepare().
-++#
-++#   4. Verify that the statement in 3 has worked. SQLite should detect
-++#      that the schema has changed and successfully prepare the
-++#      statement against the new schema.
-++#
-++# Test plan:
-++#
-++#   1.*: Trigger the xConnect()/schema-reset using statements executed
-++#        directly against an FTS5 table.
-++#
-++#   2.*: Using various statements executed by various BEFORE triggers.
-++#
-++#   3.*: Using various statements executed by various AFTER triggers.
-++#
-++#   4.*: Using various statements executed by various INSTEAD OF triggers.
-++#
-++
-++
-++
-++do_execsql_test 1.0 {
-++  CREATE VIRTUAL TABLE ft1 USING fts5(a, b);
-++  CREATE TABLE abc(x INTEGER PRIMARY KEY);
-++  CREATE TABLE t1(i INTEGER PRIMARY KEY, a, b);
-++
-++  INSERT INTO ft1 VALUES('one', 'two');
-++  INSERT INTO ft1 VALUES('three', 'four');
-++}
-++
-++foreach {tn sql res} {
-++  1 "SELECT * FROM ft1" {one two three four}
-++  2 "REPLACE INTO ft1(rowid, a, b) VALUES(1, 'five', 'six')" {}
-++  3 "SELECT * FROM ft1" {five six three four}
-++  4 "INSERT INTO ft1 VALUES('seven', 'eight')" {}
-++  5 "SELECT * FROM ft1" {five six three four seven eight}
-++  6 "DELETE FROM ft1 WHERE rowid=2" {}
-++  7 "UPDATE ft1 SET b='nine' WHERE rowid=1" {}
-++  8 "SELECT * FROM ft1" {five nine seven eight}
-++} {
-++
-++  catch { db close }
-++  catch { db2 close }
-++  sqlite3 db  test.db
-++  sqlite3 db2 test.db
-++
-++  do_test 1.$tn.1 {
-++    db eval { INSERT INTO abc DEFAULT VALUES }
-++    db2 eval { CREATE TABLE newtable(x,y); DROP TABLE newtable }
-++  } {}
-++
-++  do_execsql_test 1.$tn.2 $sql $res
-++
-++  do_execsql_test 1.$tn.3 {
-++    INSERT INTO ft1(ft1) VALUES('integrity-check');
-++  }
-++}
-++
-++do_execsql_test 2.0 {
-++  CREATE VIRTUAL TABLE ft2 USING fts5(a, b);
-++  CREATE TABLE t2(a, b);
-++  CREATE TABLE log(txt);
-++
-++  CREATE TRIGGER t2_ai AFTER INSERT ON t2 BEGIN
-++    INSERT INTO ft2(rowid, a, b) VALUES(new.rowid, new.a, new.b);
-++    INSERT INTO log VALUES('insert');
-++  END;
-++
-++  CREATE TRIGGER t2_ad AFTER DELETE ON t2 BEGIN
-++    DELETE FROM ft2 WHERE rowid = old.rowid;
-++    INSERT INTO log VALUES('delete');
-++  END;
-++
-++  CREATE TRIGGER t2_au AFTER UPDATE ON t2 BEGIN
-++    UPDATE ft2 SET a=new.a, b=new.b WHERE rowid=new.rowid;
-++    INSERT INTO log VALUES('update');
-++  END;
-++
-++  INSERT INTO t2 VALUES('one', 'two');
-++  INSERT INTO t2 VALUES('three', 'four');
-++}
-++
-++foreach {tn sql res} {
-++  1 "SELECT * FROM t2" {one two three four}
-++  2 "REPLACE INTO t2(rowid, a, b) VALUES(1, 'five', 'six')" {}
-++  3 "SELECT * FROM ft2" {five six three four}
-++  4 "INSERT INTO t2 VALUES('seven', 'eight')" {}
-++  5 "SELECT * FROM ft2" {five six three four seven eight}
-++  6 "DELETE FROM t2 WHERE rowid=2" {}
-++  7 "UPDATE t2 SET b='nine' WHERE rowid=1" {}
-++  8 "SELECT * FROM ft2" {five nine seven eight}
-++} {
-++
-++  catch { db close }
-++  catch { db2 close }
-++  sqlite3 db  test.db
-++  sqlite3 db2 test.db
-++
-++  do_test 2.$tn.1 {
-++    db eval { INSERT INTO abc DEFAULT VALUES }
-++    db2 eval { CREATE TABLE newtable(x,y); DROP TABLE newtable }
-++  } {}
-++
-++  do_execsql_test 2.$tn.2 $sql $res
-++
-++  do_execsql_test 2.$tn.3 {
-++    INSERT INTO ft2(ft2) VALUES('integrity-check');
-++  }
-++}
-++
-++do_execsql_test 3.0 {
-++  CREATE VIRTUAL TABLE ft3 USING fts5(a, b);
-++  CREATE TABLE t3(a, b);
-++
-++  CREATE TRIGGER t3_ai BEFORE INSERT ON t3 BEGIN
-++    INSERT INTO ft3(rowid, a, b) VALUES(new.rowid, new.a, new.b);
-++    INSERT INTO log VALUES('insert');
-++  END;
-++
-++  CREATE TRIGGER t3_ad BEFORE DELETE ON t3 BEGIN
-++    DELETE FROM ft3 WHERE rowid = old.rowid;
-++    INSERT INTO log VALUES('delete');
-++  END;
-++
-++  CREATE TRIGGER t3_au BEFORE UPDATE ON t3 BEGIN
-++    UPDATE ft3 SET a=new.a, b=new.b WHERE rowid=new.rowid;
-++    INSERT INTO log VALUES('update');
-++  END;
-++
-++  INSERT INTO t3(rowid, a, b) VALUES(1, 'one', 'two');
-++  INSERT INTO t3(rowid, a, b) VALUES(2, 'three', 'four');
-++}
-++
-++foreach {tn sql res} {
-++  1 "SELECT * FROM t3" {one two three four}
-++  2 "REPLACE INTO t3(rowid, a, b) VALUES(1, 'five', 'six')" {}
-++  3 "SELECT * FROM ft3" {five six three four}
-++  4 "INSERT INTO t3(rowid, a, b) VALUES(3, 'seven', 'eight')" {}
-++  5 "SELECT * FROM ft3" {five six three four seven eight}
-++  6 "DELETE FROM t3 WHERE rowid=2" {}
-++  7 "UPDATE t3 SET b='nine' WHERE rowid=1" {}
-++  8 "SELECT * FROM ft3" {five nine seven eight}
-++} {
-++
-++  catch { db close }
-++  catch { db2 close }
-++  sqlite3 db  test.db
-++  sqlite3 db2 test.db
-++
-++  do_test 3.$tn.1 {
-++    db eval { INSERT INTO abc DEFAULT VALUES }
-++    db2 eval { CREATE TABLE newtable(x,y); DROP TABLE newtable }
-++  } {}
-++
-++  do_execsql_test 3.$tn.2 $sql $res
-++
-++  do_execsql_test 3.$tn.3 {
-++    INSERT INTO ft3(ft3) VALUES('integrity-check');
-++  }
-++}
-++
-++do_execsql_test 4.0 {
-++  CREATE VIRTUAL TABLE ft4 USING fts5(a, b);
-++  CREATE VIEW v4 AS SELECT rowid, * FROM ft4;
-++
-++  CREATE TRIGGER t4_ai INSTEAD OF INSERT ON v4 BEGIN
-++    INSERT INTO ft4(rowid, a, b) VALUES(new.rowid, new.a, new.b);
-++    INSERT INTO log VALUES('insert');
-++  END;
-++
-++  CREATE TRIGGER t4_ad INSTEAD OF DELETE ON v4 BEGIN
-++    DELETE FROM ft4 WHERE rowid = old.rowid;
-++    INSERT INTO log VALUES('delete');
-++  END;
-++
-++  CREATE TRIGGER t4_au INSTEAD OF UPDATE ON v4 BEGIN
-++    UPDATE ft4 SET a=new.a, b=new.b WHERE rowid=new.rowid;
-++    INSERT INTO log VALUES('update');
-++  END;
-++
-++  INSERT INTO ft4(rowid, a, b) VALUES(1, 'one', 'two');
-++  INSERT INTO ft4(rowid, a, b) VALUES(2, 'three', 'four');
-++}
-++
-++foreach {tn sql res} {
-++  1 "SELECT * FROM ft4" {one two three four}
-++  2 "REPLACE INTO v4(rowid, a, b) VALUES(1, 'five', 'six')" {}
-++  3 "SELECT * FROM ft4" {five six three four}
-++  4 "INSERT INTO v4(rowid, a, b) VALUES(3, 'seven', 'eight')" {}
-++  5 "SELECT * FROM ft4" {five six three four seven eight}
-++  6 "DELETE FROM v4 WHERE rowid=2" {}
-++  7 "UPDATE v4 SET b='nine' WHERE rowid=1" {}
-++  8 "SELECT * FROM ft4" {five nine seven eight}
-++} {
-++
-++  catch { db close }
-++  catch { db2 close }
-++  sqlite3 db  test.db
-++  sqlite3 db2 test.db
-++
-++  do_test 4.$tn.1 {
-++    db eval { INSERT INTO abc DEFAULT VALUES }
-++    db2 eval { CREATE TABLE newtable(x,y); DROP TABLE newtable }
-++  } {}
-++
-++  do_execsql_test 4.$tn.2 $sql $res
-++
-++  do_execsql_test 4.$tn.3 {
-++    INSERT INTO ft3(ft3) VALUES('integrity-check');
-++  }
-++}
-++
-++finish_test
-++
-+diff --git a/third_party/sqlite/src/ext/fts5/test/fts5vocab2.test b/third_party/sqlite/src/ext/fts5/test/fts5vocab2.test
-+new file mode 100644
-+index 0000000..4a0a1f4
-+--- /dev/null
-++++ b/third_party/sqlite/src/ext/fts5/test/fts5vocab2.test
-+@@ -0,0 +1,209 @@
-++# 2017 August 10
-++#
-++# The author disclaims copyright to this source code.  In place of
-++# a legal notice, here is a blessing:
-++#
-++#    May you do good and not evil.
-++#    May you find forgiveness for yourself and forgive others.
-++#    May you share freely, never taking more than you give.
-++#
-++#***********************************************************************
-++#
-++# The tests in this file focus on testing the fts5vocab module.
-++#
-++
-++source [file join [file dirname [info script]] fts5_common.tcl]
-++set testprefix fts5vocab
-++
-++# If SQLITE_ENABLE_FTS5 is defined, omit this file.
-++ifcapable !fts5 {
-++  finish_test
-++  return
-++}
-++
-++do_execsql_test 1.0 {
-++  CREATE VIRTUAL TABLE t1 USING fts5(a, b);
-++  CREATE VIRTUAL TABLE v1 USING fts5vocab(t1, instance);
-++
-++  INSERT INTO t1 VALUES('one two', 'two three');
-++  INSERT INTO t1 VALUES('three four', 'four five five five');
-++}
-++
-++do_execsql_test 1.1 {
-++  SELECT * FROM v1;
-++} {
-++  five  2 b 1
-++  five  2 b 2
-++  five  2 b 3
-++  four  2 a 1
-++  four  2 b 0
-++  one   1 a 0
-++  three 1 b 1
-++  three 2 a 0
-++  two   1 a 1
-++  two   1 b 0
-++}
-++
-++do_execsql_test 1.2 {
-++  SELECT * FROM v1 WHERE term='three';
-++} {
-++  three 1 b 1
-++  three 2 a 0
-++}
-++
-++do_execsql_test 1.3 {
-++  BEGIN;
-++    DELETE FROM t1 WHERE rowid=2;
-++    SELECT * FROM v1;
-++  ROLLBACK;
-++} {
-++  one   1 a 0
-++  three 1 b 1
-++  two   1 a 1
-++  two   1 b 0
-++}
-++
-++do_execsql_test 1.4 {
-++  BEGIN;
-++    DELETE FROM t1 WHERE rowid=1;
-++    SELECT * FROM v1;
-++  ROLLBACK;
-++} {
-++  five  2 b 1
-++  five  2 b 2
-++  five  2 b 3
-++  four  2 a 1
-++  four  2 b 0
-++  three 2 a 0
-++}
-++
-++do_execsql_test 1.5 {
-++  DELETE FROM t1;
-++  SELECT * FROM v1;
-++} {
-++}
-++
-++#-------------------------------------------------------------------------
-++#
-++do_execsql_test 2.0 {
-++  DROP TABLE IF EXISTS t1;
-++  DROP TABLE IF EXISTS v1;
-++
-++  CREATE VIRTUAL TABLE t1 USING fts5(a, b, detail=column);
-++  CREATE VIRTUAL TABLE v1 USING fts5vocab(t1, instance);
-++
-++  INSERT INTO t1 VALUES('one two', 'two three');
-++  INSERT INTO t1 VALUES('three four', 'four five five five');
-++}
-++
-++do_execsql_test 2.1 {
-++  SELECT * FROM v1;
-++} {
-++  five  2 b {}
-++  four  2 a {}
-++  four  2 b {}
-++  one   1 a {}
-++  three 1 b {}
-++  three 2 a {}
-++  two   1 a {}
-++  two   1 b {}
-++}
-++
-++do_execsql_test 2.2 {
-++  SELECT * FROM v1 WHERE term='three';
-++} {
-++  three 1 b {}
-++  three 2 a {}
-++}
-++
-++do_execsql_test 2.3 {
-++  BEGIN;
-++    DELETE FROM t1 WHERE rowid=2;
-++    SELECT * FROM v1;
-++  ROLLBACK;
-++} {
-++  one   1 a {}
-++  three 1 b {}
-++  two   1 a {}
-++  two   1 b {}
-++}
-++
-++do_execsql_test 2.4 {
-++  BEGIN;
-++    DELETE FROM t1 WHERE rowid=1;
-++    SELECT * FROM v1;
-++  ROLLBACK;
-++} {
-++  five  2 b {}
-++  four  2 a {}
-++  four  2 b {}
-++  three 2 a {}
-++}
-++
-++do_execsql_test 2.5 {
-++  DELETE FROM t1;
-++  SELECT * FROM v1;
-++} {
-++}
-++
-++#-------------------------------------------------------------------------
-++#
-++do_execsql_test 3.0 {
-++  DROP TABLE IF EXISTS t1;
-++  DROP TABLE IF EXISTS v1;
-++
-++  CREATE VIRTUAL TABLE t1 USING fts5(a, b, detail=none);
-++  CREATE VIRTUAL TABLE v1 USING fts5vocab(t1, instance);
-++
-++  INSERT INTO t1 VALUES('one two', 'two three');
-++  INSERT INTO t1 VALUES('three four', 'four five five five');
-++}
-++
-++do_execsql_test 3.1 {
-++  SELECT * FROM v1;
-++} {
-++  five  2 {} {}
-++  four  2 {} {}
-++  one   1 {} {}
-++  three 1 {} {}
-++  three 2 {} {}
-++  two   1 {} {}
-++}
-++
-++do_execsql_test 3.2 {
-++  SELECT * FROM v1 WHERE term='three';
-++} {
-++  three 1 {} {}
-++  three 2 {} {}
-++}
-++
-++do_execsql_test 3.3 {
-++  BEGIN;
-++    DELETE FROM t1 WHERE rowid=2;
-++    SELECT * FROM v1;
-++  ROLLBACK;
-++} {
-++  one   1 {} {}
-++  three 1 {} {}
-++  two   1 {} {}
-++}
-++
-++do_execsql_test 3.4 {
-++  BEGIN;
-++    DELETE FROM t1 WHERE rowid=1;
-++    SELECT * FROM v1;
-++  ROLLBACK;
-++} {
-++  five  2 {} {}
-++  four  2 {} {}
-++  three 2 {} {}
-++}
-++
-++do_execsql_test 3.5 {
-++  DELETE FROM t1;
-++  SELECT * FROM v1;
-++} {
-++}
-++
-++finish_test
-++
-+diff --git a/third_party/sqlite/src/ext/lsm1/lsm_shared.c b/third_party/sqlite/src/ext/lsm1/lsm_shared.c
-+index 95a866d..f8e2adb 100644
-+--- a/third_party/sqlite/src/ext/lsm1/lsm_shared.c
-++++ b/third_party/sqlite/src/ext/lsm1/lsm_shared.c
-+@@ -340,9 +340,6 @@ static int doDbConnect(lsm_db *pDb){
-+   /* Obtain a pointer to the shared-memory header */
-+   assert( pDb->pShmhdr==0 );
-+   assert( pDb->bReadonly==0 );
-+-  rc = lsmShmCacheChunks(pDb, 1);
-+-  if( rc!=LSM_OK ) return rc;
-+-  pDb->pShmhdr = (ShmHeader *)pDb->apShm[0];
-+ 
-+   /* Block for an exclusive lock on DMS1. This lock serializes all calls
-+   ** to doDbConnect() and doDbDisconnect() across all processes.  */
-+@@ -353,10 +350,11 @@ static int doDbConnect(lsm_db *pDb){
-+     nUs = nUs * 2;
-+     if( nUs>nUsMax ) nUs = nUsMax;
-+   }
-+-  if( rc!=LSM_OK ){
-+-    pDb->pShmhdr = 0;
-+-    return rc;
-++  if( rc==LSM_OK ){
-++    rc = lsmShmCacheChunks(pDb, 1);
-+   }
-++  if( rc!=LSM_OK ) return rc;
-++  pDb->pShmhdr = (ShmHeader *)pDb->apShm[0];
-+ 
-+   /* Try an exclusive lock on DMS2/DMS3. If successful, this is the first
-+   ** and only connection to the database. In this case initialize the
-+diff --git a/third_party/sqlite/src/ext/lsm1/lsm_vtab.c b/third_party/sqlite/src/ext/lsm1/lsm_vtab.c
-+index da6ef6f..8a2cc96 100644
-+--- a/third_party/sqlite/src/ext/lsm1/lsm_vtab.c
-++++ b/third_party/sqlite/src/ext/lsm1/lsm_vtab.c
-+@@ -10,8 +10,82 @@
-+ **
-+ *************************************************************************
-+ **
-+-** This file implements a simple virtual table wrapper around the LSM
-++** This file implements a virtual table for SQLite3 around the LSM
-+ ** storage engine from SQLite4.
-++**
-++** USAGE
-++**
-++**   CREATE VIRTUAL TABLE demo USING lsm1(filename,key,keytype,value1,...);
-++**
-++** The filename parameter is the name of the LSM database file, which is
-++** separate and distinct from the SQLite3 database file.
-++**
-++** The keytype must be one of: UINT, TEXT, BLOB.  All keys must be of that
-++** one type.  "UINT" means unsigned integer.  The values may be of any
-++** SQLite datatype: BLOB, TEXT, INTEGER, FLOAT, or NULL.
-++**
-++** The virtual table contains read-only hidden columns:
-++**
-++**     lsm1_key	      A BLOB which is the raw LSM key.  If the "keytype"
-++**                    is BLOB or TEXT then this column is exactly the
-++**                    same as the key.  For the UINT keytype, this column
-++**                    will be a variable-length integer encoding of the key.
-++**
-++**     lsm1_value     A BLOB which is the raw LSM value.  All of the value
-++**                    columns are packed into this BLOB using the encoding
-++**                    described below.
-++**
-++** Attempts to write values into the lsm1_key and lsm1_value columns are
-++** silently ignored.
-++**
-++** EXAMPLE
-++**
-++** The virtual table declared this way:
-++**
-++**    CREATE VIRTUAL TABLE demo2 USING lsm1('x.lsm',id,UINT,a,b,c,d);
-++**
-++** Results in a new virtual table named "demo2" that acts as if it has
-++** the following schema:
-++**
-++**    CREATE TABLE demo2(
-++**      id UINT PRIMARY KEY ON CONFLICT REPLACE,
-++**      a ANY,
-++**      b ANY,
-++**      c ANY,
-++**      d ANY,
-++**      lsm1_key BLOB HIDDEN,
-++**      lsm1_value BLOB HIDDEN
-++**    ) WITHOUT ROWID;
-++**
-++**
-++**
-++** INTERNALS
-++**
-++** The key encoding for BLOB and TEXT is just a copy of the blob or text.
-++** UTF-8 is used for text.  The key encoding for UINT is the variable-length
-++** integer format at https://sqlite.org/src4/doc/trunk/www/varint.wiki.
-++**
-++** The values are encoded as a single blob (since that is what lsm stores as
-++** its content).  There is a "type integer" followed by "content" for each
-++** value, alternating back and forth.  The content might be empty.
-++**
-++**    TYPE1  CONTENT1  TYPE2  CONTENT2  TYPE3  CONTENT3 ....
-++**
-++** Each "type integer" is encoded as a variable-length integer in the
-++** format of the link above.  Let the type integer be T.  The actual
-++** datatype is an integer 0-5 equal to T%6.  Values 1 through 5 correspond
-++** to SQLITE_INTEGER through SQLITE_NULL.  The size of the content in bytes
-++** is T/6.  Type value 0 means that the value is an integer whose actual
-++** values is T/6 and there is no content.  The type-value-0 integer format
-++** only works for integers in the range of 0 through 40.
-++**
-++** There is no content for NULL or type-0 integers.  For BLOB and TEXT
-++** values, the content is the blob data or the UTF-8 text data.  For
-++** non-negative integers X, the content is a variable-length integer X*2.
-++** For negative integers Y, the content is varaible-length integer (1-Y)*2+1.
-++** For FLOAT values, the content is the IEEE754 floating point value in
-++** native byte-order.  This means that FLOAT values will be corrupted when
-++** database file is moved between big-endian and little-endian machines.
-+ */
-+ #include "sqlite3ext.h"
-+ SQLITE_EXTENSION_INIT1
-+@@ -22,14 +96,19 @@ SQLITE_EXTENSION_INIT1
-+ /* Forward declaration of subclasses of virtual table objects */
-+ typedef struct lsm1_vtab lsm1_vtab;
-+ typedef struct lsm1_cursor lsm1_cursor;
-++typedef struct lsm1_vblob lsm1_vblob;
-+ 
-+ /* Primitive types */
-+ typedef unsigned char u8;
-++typedef unsigned int u32;
-++typedef sqlite3_uint64 u64;
-+ 
-+ /* An open connection to an LSM table */
-+ struct lsm1_vtab {
-+   sqlite3_vtab base;          /* Base class - must be first */
-+   lsm_db *pDb;                /* Open connection to the LSM table */
-++  u8 keyType;                 /* SQLITE_BLOB, _TEXT, or _INTEGER */
-++  u32 nVal;                   /* Number of value columns */
-+ };
-+ 
-+ 
-+@@ -43,8 +122,82 @@ struct lsm1_cursor {
-+   u8 isDesc;                 /* 0: scan forward.  1: scan reverse */
-+   u8 atEof;                  /* True if the scan is complete */
-+   u8 bUnique;                /* True if no more than one row of output */
-++  u8 *zData;                 /* Content of the current row */
-++  u32 nData;                 /* Number of bytes in the current row */
-++  u8 *aeType;                /* Types for all column values */
-++  u32 *aiOfst;               /* Offsets to the various fields */
-++  u32 *aiLen;                /* Length of each field */
-++  u8 *pKey2;                 /* Loop termination key, or NULL */
-++  u32 nKey2;                 /* Length of the loop termination key */
-+ };
-+ 
-++/* An extensible buffer object.
-++**
-++** Content can be appended.  Space to hold new content is automatically
-++** allocated.
-++*/
-++struct lsm1_vblob {
-++  u8 *a;             /* Space to hold content, from sqlite3_malloc64() */
-++  u64 n;             /* Bytes of space used */
-++  u64 nAlloc;        /* Bytes of space allocated */
-++  u8 errNoMem;       /* True if a memory allocation error has been seen */
-++};
-++
-++#if defined(__GNUC__)
-++#  define LSM1_NOINLINE  __attribute__((noinline))
-++#elif defined(_MSC_VER) && _MSC_VER>=1310
-++#  define LSM1_NOINLINE  __declspec(noinline)
-++#else
-++#  define LSM1_NOINLINE
-++#endif
-++
-++
-++/* Increase the available space in the vblob object so that it can hold
-++** at least N more bytes.  Return the number of errors.
-++*/
-++static int lsm1VblobEnlarge(lsm1_vblob *p, u32 N){
-++  if( p->n+N>p->nAlloc ){
-++    if( p->errNoMem ) return 1;
-++    p->nAlloc += N + (p->nAlloc ? p->nAlloc : N);
-++    p->a = sqlite3_realloc64(p->a, p->nAlloc);
-++    if( p->a==0 ){
-++      p->n = 0;
-++      p->nAlloc = 0;
-++      p->errNoMem = 1;
-++      return 1;
-++    }
-++    p->nAlloc = sqlite3_msize(p->a);
-++  }
-++  return 0;
-++}
-++
-++/* Append N bytes to a vblob after first enlarging it */
-++static LSM1_NOINLINE void lsm1VblobEnlargeAndAppend(
-++  lsm1_vblob *p,
-++  const u8 *pData,
-++  u32 N
-++){
-++  if( p->n+N>p->nAlloc && lsm1VblobEnlarge(p, N) ) return;
-++  memcpy(p->a+p->n, pData, N);
-++  p->n += N;
-++}
-++
-++/* Append N bytes to a vblob */
-++static void lsm1VblobAppend(lsm1_vblob *p, const u8 *pData, u32 N){
-++  sqlite3_int64 n = p->n;
-++  if( n+N>p->nAlloc ){
-++    lsm1VblobEnlargeAndAppend(p, pData, N);
-++  }else{
-++    p->n += N;
-++    memcpy(p->a+n, pData, N);
-++  }
-++}
-++
-++/* append text to a vblob */
-++static void lsm1VblobAppendText(lsm1_vblob *p, const char *z){
-++  lsm1VblobAppend(p, (u8*)z, (u32)strlen(z));
-++}
-++
-+ /* Dequote the string */
-+ static void lsm1Dequote(char *z){
-+   int j;
-+@@ -76,9 +229,28 @@ static int lsm1Connect(
-+   lsm1_vtab *pNew;
-+   int rc;
-+   char *zFilename;
-++  u8 keyType = 0;
-++  int i;
-++  lsm1_vblob sql;
-++  static const char *azTypes[] = { "UINT",         "TEXT",     "BLOB" };
-++  static const u8 aeTypes[] =    { SQLITE_INTEGER, SQLITE_TEXT, SQLITE_BLOB };
-++  static const char *azArgName[] = {"filename", "key", "key type", "value1" };
-+ 
-+-  if( argc!=4 || argv[3]==0 || argv[3][0]==0 ){
-+-    *pzErr = sqlite3_mprintf("filename argument missing");
-++  for(i=0; i<sizeof(azArgName)/sizeof(azArgName[0]); i++){
-++    if( argc<i+4 || argv[i+3]==0 || argv[i+3][0]==0 ){
-++      *pzErr = sqlite3_mprintf("%s (%r) argument missing",
-++                               azArgName[i], i+1);
-++      return SQLITE_ERROR;
-++    }
-++  }
-++  for(i=0; i<sizeof(azTypes)/sizeof(azTypes[0]); i++){
-++    if( sqlite3_stricmp(azTypes[i],argv[5])==0 ){
-++      keyType = aeTypes[i];
-++      break;
-++    }
-++  }
-++  if( keyType==0 ){
-++    *pzErr = sqlite3_mprintf("key type should be INT, TEXT, or BLOB");
-+     return SQLITE_ERROR;
-+   }
-+   *ppVtab = sqlite3_malloc( sizeof(*pNew) );
-+@@ -87,6 +259,7 @@ static int lsm1Connect(
-+     return SQLITE_NOMEM;
-+   }
-+   memset(pNew, 0, sizeof(*pNew));
-++  pNew->keyType = keyType;
-+   rc = lsm_new(0, &pNew->pDb);
-+   if( rc ){
-+     *pzErr = sqlite3_mprintf("lsm_new failed with error code %d",  rc);
-+@@ -103,22 +276,29 @@ static int lsm1Connect(
-+     goto connect_failed;
-+   }
-+ 
-+-/* Column numbers */
-+-#define LSM1_COLUMN_KEY         0
-+-#define LSM1_COLUMN_BLOBKEY     1
-+-#define LSM1_COLUMN_VALUE       2
-+-#define LSM1_COLUMN_BLOBVALUE   3
-+-#define LSM1_COLUMN_COMMAND     4
-+-
-+-  rc = sqlite3_declare_vtab(db,
-+-     "CREATE TABLE x("
-+-     "  key,"              /* The primary key.  Any non-NULL */
-+-     "  blobkey,"          /* Pure BLOB primary key */
-+-     "  value,"            /* The value associated with key.  Any non-NULL */
-+-     "  blobvalue,"        /* Pure BLOB value */
-+-     "  command hidden"    /* Insert here for control operations */
-+-     ");"
-+-  );
-++  memset(&sql, 0, sizeof(sql));
-++  lsm1VblobAppendText(&sql, "CREATE TABLE x(");
-++  lsm1VblobAppendText(&sql, argv[4]);
-++  lsm1VblobAppendText(&sql, " ");
-++  lsm1VblobAppendText(&sql, argv[5]);
-++  lsm1VblobAppendText(&sql, " PRIMARY KEY");
-++  for(i=6; i<argc; i++){
-++    lsm1VblobAppendText(&sql, ", ");
-++    lsm1VblobAppendText(&sql, argv[i]);
-++    pNew->nVal++;
-++  }
-++  lsm1VblobAppendText(&sql,
-++      ", lsm1_command HIDDEN"
-++      ", lsm1_key HIDDEN"
-++      ", lsm1_value HIDDEN) WITHOUT ROWID");
-++  lsm1VblobAppend(&sql, (u8*)"", 1);
-++  if( sql.errNoMem ){
-++    rc = SQLITE_NOMEM;
-++    goto connect_failed;
-++  }
-++  rc = sqlite3_declare_vtab(db, (const char*)sql.a);
-++  sqlite3_free(sql.a);
-++
-+ connect_failed:
-+   if( rc!=SQLITE_OK ){
-+     if( pNew ){
-+@@ -147,9 +327,13 @@ static int lsm1Open(sqlite3_vtab *pVtab, sqlite3_vtab_cursor **ppCursor){
-+   lsm1_vtab *p = (lsm1_vtab*)pVtab;
-+   lsm1_cursor *pCur;
-+   int rc;
-+-  pCur = sqlite3_malloc( sizeof(*pCur) );
-++  pCur = sqlite3_malloc64( sizeof(*pCur)
-++                 + p->nVal*(sizeof(pCur->aiOfst)+sizeof(pCur->aiLen)+1) );
-+   if( pCur==0 ) return SQLITE_NOMEM;
-+   memset(pCur, 0, sizeof(*pCur));
-++  pCur->aiOfst = (u32*)&pCur[1];
-++  pCur->aiLen = &pCur->aiOfst[p->nVal];
-++  pCur->aeType = (u8*)&pCur->aiLen[p->nVal];
-+   *ppCursor = &pCur->base;
-+   rc = lsm_csr_open(p->pDb, &pCur->pLsmCur);
-+   if( rc==LSM_OK ){
-+@@ -167,6 +351,7 @@ static int lsm1Open(sqlite3_vtab *pVtab, sqlite3_vtab_cursor **ppCursor){
-+ */
-+ static int lsm1Close(sqlite3_vtab_cursor *cur){
-+   lsm1_cursor *pCur = (lsm1_cursor*)cur;
-++  sqlite3_free(pCur->pKey2);
-+   lsm_csr_close(pCur->pLsmCur);
-+   sqlite3_free(pCur);
-+   return SQLITE_OK;
-+@@ -190,6 +375,21 @@ static int lsm1Next(sqlite3_vtab_cursor *cur){
-+     if( rc==LSM_OK && lsm_csr_valid(pCur->pLsmCur)==0 ){
-+       pCur->atEof = 1;
-+     }
-++    if( pCur->pKey2 && pCur->atEof==0 ){
-++      const u8 *pVal;
-++      u32 nVal;
-++      assert( pCur->isDesc==0 );
-++      rc = lsm_csr_key(pCur->pLsmCur, (const void**)&pVal, (int*)&nVal);
-++      if( rc==LSM_OK ){
-++        u32 len = pCur->nKey2;
-++        int c;
-++        if( len>nVal ) len = nVal;
-++        c = memcmp(pVal, pCur->pKey2, len);
-++        if( c==0 ) c = nVal - pCur->nKey2;
-++        if( c>0 ) pCur->atEof = 1;
-++      }
-++    }
-++    pCur->zData = 0;
-+   }
-+   return rc==LSM_OK ? SQLITE_OK : SQLITE_ERROR;
-+ }
-+@@ -295,6 +495,14 @@ static int lsm1PutVarint64(unsigned char *z, sqlite3_uint64 x){
-+   return 9;
-+ }
-+ 
-++/* Append non-negative integer x as a variable-length integer.
-++*/
-++static void lsm1VblobAppendVarint(lsm1_vblob *p, sqlite3_uint64 x){
-++  sqlite3_int64 n = p->n;
-++  if( n+9>p->nAlloc && lsm1VblobEnlarge(p, 9) ) return;
-++  p->n += lsm1PutVarint64(p->a+p->n, x);
-++}
-++
-+ /*
-+ ** Decode the varint in the first n bytes z[].  Write the integer value
-+ ** into *pResult and return the number of bytes in the varint.
-+@@ -349,69 +557,74 @@ static int lsm1GetVarint64(
-+   return 9;
-+ }
-+ 
-+-/*
-+-** Generate a key encoding for pValue such that all keys compare in
-+-** lexicographical order.  Return an SQLite error code or SQLITE_OK.
-++/* Encoded a signed integer as a varint.  Numbers close to zero uses fewer
-++** bytes than numbers far away from zero.  However, the result is not in
-++** lexicographical order.
-+ **
-+-** The key encoding is *pnKey bytes in length written into *ppKey.
-+-** Space to hold the key is taken from pSpace if sufficient, or else
-+-** from sqlite3_malloc().  The caller is responsible for freeing malloced
-+-** space.
-++** Encoding:  Non-negative integer X is encoding as an unsigned
-++** varint X*2.  Negative integer Y is encoding as an unsigned
-++** varint (1-Y)*2 + 1.
-+ */
-+-static int lsm1EncodeKey(
-+-  sqlite3_value *pValue,     /* Value to be encoded */
-+-  unsigned char **ppKey,     /* Write the encoding here */
-+-  int *pnKey,                /* Write the size of the encoding here */
-+-  unsigned char *pSpace,     /* Use this space if it is large enough */
-+-  int nSpace                 /* Size of pSpace[] */
-++static int lsm1PutSignedVarint64(u8 *z, sqlite3_int64 v){
-++  sqlite3_uint64 u;
-++  if( v>=0 ){
-++    u = (sqlite3_uint64)v;
-++    return lsm1PutVarint64(z, u*2);
-++  }else{
-++    u = (sqlite3_uint64)(-1-v);
-++    return lsm1PutVarint64(z, u*2+1);
-++  }
-++}
-++
-++/* Decoded a signed varint. */
-++static int lsm1GetSignedVarint64(
-++  const unsigned char *z,
-++  int n,
-++  sqlite3_int64 *pResult
-+ ){
-+-  int eType = sqlite3_value_type(pValue);
-+-  *ppKey = 0;
-+-  *pnKey = 0;
-+-  assert( nSpace>=32 );
-+-  switch( eType ){
-+-    default: {
-+-      return SQLITE_ERROR;  /* We cannot handle NULL keys */
-+-    }
-+-    case SQLITE_BLOB:
-+-    case SQLITE_TEXT: {
-+-      int nVal = sqlite3_value_bytes(pValue);
-+-      const void *pVal;
-+-      if( eType==SQLITE_BLOB ){
-+-        eType = LSM1_TYPE_BLOB;
-+-        pVal = sqlite3_value_blob(pValue);
-+-      }else{
-+-        eType = LSM1_TYPE_TEXT;
-+-        pVal = (const void*)sqlite3_value_text(pValue);
-+-        if( pVal==0 ) return SQLITE_NOMEM;
-+-      }
-+-      if( nVal+1>nSpace ){
-+-        pSpace = sqlite3_malloc( nVal+1 );
-+-        if( pSpace==0 ) return SQLITE_NOMEM;
-+-      }
-+-      pSpace[0] = (unsigned char)eType;
-+-      memcpy(&pSpace[1], pVal, nVal);
-+-      *ppKey = pSpace;
-+-      *pnKey = nVal+1;
-+-      break;
-+-    }
-+-    case SQLITE_INTEGER: {
-+-      sqlite3_int64 iVal = sqlite3_value_int64(pValue);
-+-      sqlite3_uint64 uVal;
-+-      if( iVal<0 ){
-+-        if( iVal==0xffffffffffffffffLL ) return SQLITE_ERROR;
-+-        uVal = *(sqlite3_uint64*)&iVal;
-+-        eType = LSM1_TYPE_NEGATIVE;
-+-      }else{
-+-        uVal = iVal;
-+-        eType = LSM1_TYPE_POSITIVE;
-+-      }
-+-      pSpace[0] = (unsigned char)eType;
-+-      *ppKey = pSpace;
-+-      *pnKey = 1 + lsm1PutVarint64(&pSpace[1], uVal);
-++  sqlite3_uint64 u = 0;
-++  n = lsm1GetVarint64(z, n, &u);
-++  if( u&1 ){
-++    *pResult = -1 - (sqlite3_int64)(u>>1);
-++  }else{
-++    *pResult = (sqlite3_int64)(u>>1);
-++  }
-++  return n;
-++}
-++
-++
-++/*
-++** Read the value part of the key-value pair and decode it into columns.
-++*/
-++static int lsm1DecodeValues(lsm1_cursor *pCur){
-++  lsm1_vtab *pTab = (lsm1_vtab*)(pCur->base.pVtab);
-++  int i, n;
-++  int rc;
-++  u8 eType;
-++  sqlite3_uint64 v;
-++
-++  if( pCur->zData ) return 1;
-++  rc = lsm_csr_value(pCur->pLsmCur, (const void**)&pCur->zData,
-++                     (int*)&pCur->nData);
-++  if( rc ) return 0;
-++  for(i=n=0; i<pTab->nVal; i++){
-++    v = 0;
-++    n += lsm1GetVarint64(pCur->zData+n, pCur->nData-n, &v);
-++    pCur->aeType[i] = eType = (u8)(v%6);
-++    if( eType==0 ){
-++      pCur->aiOfst[i] = (u32)(v/6);
-++      pCur->aiLen[i] = 0;
-++    }else{
-++      pCur->aiOfst[i] = n;
-++      n += (pCur->aiLen[i] = (u32)(v/6));
-+     }
-++    if( n>pCur->nData ) break;
-+   }
-+-  return SQLITE_OK;
-++  if( i<pTab->nVal ){
-++    pCur->zData = 0;
-++    return 0;
-++  }
-++  return 1;
-+ }
-+ 
-+ /*
-+@@ -424,88 +637,104 @@ static int lsm1Column(
-+   int i                       /* Which column to return */
-+ ){
-+   lsm1_cursor *pCur = (lsm1_cursor*)cur;
-+-  switch( i ){
-+-    case LSM1_COLUMN_BLOBKEY: {
-+-      const void *pVal;
-+-      int nVal;
-+-      if( lsm_csr_key(pCur->pLsmCur, &pVal, &nVal)==LSM_OK ){
-++  lsm1_vtab *pTab = (lsm1_vtab*)(cur->pVtab);
-++  if( i==0 ){
-++    /* The key column */
-++    const void *pVal;
-++    int nVal;
-++    if( lsm_csr_key(pCur->pLsmCur, &pVal, &nVal)==LSM_OK ){
-++      if( pTab->keyType==SQLITE_BLOB ){
-+         sqlite3_result_blob(ctx, pVal, nVal, SQLITE_TRANSIENT);
-++      }else if( pTab->keyType==SQLITE_TEXT ){
-++        sqlite3_result_text(ctx,(const char*)pVal, nVal, SQLITE_TRANSIENT);
-++      }else{
-++        const unsigned char *z = (const unsigned char*)pVal;
-++        sqlite3_uint64 v1;
-++        lsm1GetVarint64(z, nVal, &v1);
-++        sqlite3_result_int64(ctx, (sqlite3_int64)v1);
-+       }
-+-      break;
-+     }
-+-    case LSM1_COLUMN_KEY: {
-+-      const unsigned char *pVal;
-++  }else if( i>pTab->nVal ){
-++    if( i==pTab->nVal+2 ){  /* lsm1_key */
-++      const void *pVal;
-+       int nVal;
-+-      if( lsm_csr_key(pCur->pLsmCur, (const void**)&pVal, &nVal)==LSM_OK
-+-       && nVal>=1
-+-      ){
-+-        if( pVal[0]==LSM1_TYPE_BLOB ){
-+-          sqlite3_result_blob(ctx, (const void*)&pVal[1],nVal-1,
-+-                              SQLITE_TRANSIENT);
-+-        }else if( pVal[0]==LSM1_TYPE_TEXT ){
-+-          sqlite3_result_text(ctx, (const char*)&pVal[1],nVal-1,
-+-                              SQLITE_TRANSIENT);
-+-        }else if( nVal>=2 && nVal<=10 &&
-+-           (pVal[0]==LSM1_TYPE_POSITIVE || pVal[0]==LSM1_TYPE_NEGATIVE)
-+-        ){
-+-          sqlite3_int64 iVal;
-+-          lsm1GetVarint64(pVal+1, nVal-1, (sqlite3_uint64*)&iVal);
-+-          sqlite3_result_int64(ctx, iVal);
-+-        }
-++      if( lsm_csr_key(pCur->pLsmCur, &pVal, &nVal)==LSM_OK ){
-++        sqlite3_result_blob(ctx, pVal, nVal, SQLITE_TRANSIENT);
-+       }
-+-      break;
-+-    }
-+-    case LSM1_COLUMN_BLOBVALUE: {
-++    }else if( i==pTab->nVal+3 ){  /* lsm1_value */
-+       const void *pVal;
-+       int nVal;
-+-      if( lsm_csr_value(pCur->pLsmCur, (const void**)&pVal, &nVal)==LSM_OK ){
-++      if( lsm_csr_value(pCur->pLsmCur, &pVal, &nVal)==LSM_OK ){
-+         sqlite3_result_blob(ctx, pVal, nVal, SQLITE_TRANSIENT);
-+       }
-+-      break;
-+     }
-+-    case LSM1_COLUMN_VALUE: {
-+-      const unsigned char *aVal;
-+-      int nVal;
-+-      if( lsm_csr_value(pCur->pLsmCur, (const void**)&aVal, &nVal)==LSM_OK
-+-          && nVal>=1
-+-      ){
-+-        switch( aVal[0] ){
-+-          case SQLITE_FLOAT:
-+-          case SQLITE_INTEGER: {
-+-            sqlite3_uint64 x = 0;
-+-            int j;
-+-            for(j=1; j<nVal; j++){
-+-              x = (x<<8) | aVal[j];
-+-            }
-+-            if( aVal[0]==SQLITE_INTEGER ){
-+-              sqlite3_result_int64(ctx, *(sqlite3_int64*)&x);
-+-            }else{
-+-              double r;
-+-              assert( sizeof(r)==sizeof(x) );
-+-              memcpy(&r, &x, sizeof(r));
-+-              sqlite3_result_double(ctx, r);
-+-            }
-+-            break;
-+-          }
-+-          case SQLITE_TEXT: {
-+-            sqlite3_result_text(ctx, (char*)&aVal[1], nVal-1, SQLITE_TRANSIENT);
-+-            break;
-+-          }
-+-          case SQLITE_BLOB: {
-+-            sqlite3_result_blob(ctx, &aVal[1], nVal-1, SQLITE_TRANSIENT);
-+-            break;
-+-          }
-++  }else if( lsm1DecodeValues(pCur) ){
-++    /* The i-th value column (where leftmost is 1) */
-++    const u8 *zData;
-++    u32 nData;
-++    i--;
-++    zData = pCur->zData + pCur->aiOfst[i];
-++    nData = pCur->aiLen[i];
-++    switch( pCur->aeType[i] ){
-++      case 0: {  /* in-line integer */
-++        sqlite3_result_int(ctx, pCur->aiOfst[i]);
-++        break;
-++      }
-++      case SQLITE_INTEGER: {
-++        sqlite3_int64 v;
-++        lsm1GetSignedVarint64(zData, nData, &v);
-++        sqlite3_result_int64(ctx, v);
-++        break;
-++      }
-++      case SQLITE_FLOAT: {
-++        double v;
-++        if( nData==sizeof(v) ){
-++          memcpy(&v, zData, sizeof(v));
-++          sqlite3_result_double(ctx, v);
-+         }
-++        break;
-++      }
-++      case SQLITE_TEXT: {
-++        sqlite3_result_text(ctx, (const char*)zData, nData, SQLITE_TRANSIENT);
-++        break;
-++      }
-++      case SQLITE_BLOB: {
-++        sqlite3_result_blob(ctx, zData, nData, SQLITE_TRANSIENT);
-++        break;
-++      }
-++      default: {
-++         /* A NULL.  Do nothing */
-+       }
-+-      break;
-+-    }
-+-    default: {
-+-      break;
-+     }
-+   }
-+   return SQLITE_OK;
-+ }
-+ 
-++/* Parameter "pValue" contains an SQL value that is to be used as
-++** a key in an LSM table.  The type of the key is determined by
-++** "keyType".  Extract the raw bytes used for the key in LSM1.
-++*/
-++static void lsm1KeyFromValue(
-++  int keyType,                 /* The key type */
-++  sqlite3_value *pValue,       /* The key value */
-++  u8 *pBuf,                    /* Storage space for a generated key */
-++  const u8 **ppKey,            /* OUT: the bytes of the key */
-++  int *pnKey                   /* OUT: size of the key */
-++){
-++  if( keyType==SQLITE_BLOB ){
-++    *ppKey = (const u8*)sqlite3_value_blob(pValue);
-++    *pnKey = sqlite3_value_bytes(pValue);
-++  }else if( keyType==SQLITE_TEXT ){
-++    *ppKey = (const u8*)sqlite3_value_text(pValue);
-++    *pnKey = sqlite3_value_bytes(pValue);
-++  }else{
-++    sqlite3_int64 v = sqlite3_value_int64(pValue);
-++    if( v<0 ) v = 0;
-++    *pnKey = lsm1PutVarint64(pBuf, v);
-++    *ppKey = pBuf;
-++  }
-++}
-++
-+ /* Move to the first row to return.
-+ */
-+ static int lsm1Filter(
-+@@ -514,21 +743,74 @@ static int lsm1Filter(
-+   int argc, sqlite3_value **argv
-+ ){
-+   lsm1_cursor *pCur = (lsm1_cursor *)pVtabCursor;
-++  lsm1_vtab *pTab = (lsm1_vtab*)(pCur->base.pVtab);
-+   int rc = LSM_OK;
-++  int seekType = -1;
-++  const u8 *pVal = 0;
-++  int nVal;
-++  u8 keyType = pTab->keyType;
-++  u8 aKey1[16];
-++
-+   pCur->atEof = 1;
-+-  if( idxNum==1 ){
-+-    assert( argc==1 );
-+-    pCur->isDesc = 0;
-+-    pCur->bUnique = 1;
-+-    if( sqlite3_value_type(argv[0])==SQLITE_BLOB ){
-+-      const void *pVal = sqlite3_value_blob(argv[0]);
-+-      int nVal = sqlite3_value_bytes(argv[0]);
-+-      rc = lsm_csr_seek(pCur->pLsmCur, pVal, nVal, LSM_SEEK_EQ);
-++  sqlite3_free(pCur->pKey2);
-++  pCur->pKey2 = 0;
-++  if( idxNum<99 ){
-++    lsm1KeyFromValue(keyType, argv[0], aKey1, &pVal, &nVal);
-++  }
-++  switch( idxNum ){
-++    case 0: {   /* key==argv[0] */
-++      assert( argc==1 );
-++      seekType = LSM_SEEK_EQ;
-++      pCur->isDesc = 0;
-++      pCur->bUnique = 1;
-++      break;
-+     }
-++    case 1: {  /* key>=argv[0] AND key<=argv[1] */
-++      u8 aKey[12];
-++      seekType = LSM_SEEK_GE;
-++      pCur->isDesc = 0;
-++      pCur->bUnique = 0;
-++      if( keyType==SQLITE_INTEGER ){
-++        sqlite3_int64 v = sqlite3_value_int64(argv[1]);
-++        if( v<0 ) v = 0;
-++        pCur->nKey2 = lsm1PutVarint64(aKey, (sqlite3_uint64)v);
-++        pCur->pKey2 = sqlite3_malloc( pCur->nKey2 );
-++        if( pCur->pKey2==0 ) return SQLITE_NOMEM;
-++        memcpy(pCur->pKey2, aKey, pCur->nKey2);
-++      }else{
-++        pCur->nKey2 = sqlite3_value_bytes(argv[1]);
-++        pCur->pKey2 = sqlite3_malloc( pCur->nKey2 );
-++        if( pCur->pKey2==0 ) return SQLITE_NOMEM;
-++        if( keyType==SQLITE_BLOB ){
-++          memcpy(pCur->pKey2, sqlite3_value_blob(argv[1]), pCur->nKey2);
-++        }else{
-++          memcpy(pCur->pKey2, sqlite3_value_text(argv[1]), pCur->nKey2);
-++        }
-++      }
-++      break;
-++    }
-++    case 2: {  /* key>=argv[0] */
-++      seekType = LSM_SEEK_GE;
-++      pCur->isDesc = 0;
-++      pCur->bUnique = 0;
-++      break;
-++    }
-++    case 3: {  /* key<=argv[0] */
-++      seekType = LSM_SEEK_LE;
-++      pCur->isDesc = 1;
-++      pCur->bUnique = 0;
-++      break;
-++    }
-++    default: { /* full table scan */
-++      pCur->isDesc = 0;
-++      pCur->bUnique = 0;
-++      break;
-++    }
-++  }
-++  if( pVal ){
-++    rc = lsm_csr_seek(pCur->pLsmCur, pVal, nVal, seekType);
-+   }else{
-+     rc = lsm_csr_first(pCur->pLsmCur);
-+-    pCur->isDesc = 0;
-+-    pCur->bUnique = 0;
-+   }
-+   if( rc==LSM_OK && lsm_csr_valid(pCur->pLsmCur)!=0 ){
-+     pCur->atEof = 0;
-+@@ -540,59 +822,87 @@ static int lsm1Filter(
-+ ** Only comparisons against the key are allowed.  The idxNum defines
-+ ** which comparisons are available:
-+ **
-+-**     0        Full table scan only
-+-**   bit 1      key==?1  single argument for ?1
-+-**   bit 2      key>?1
-+-**   bit 3      key>=?1
-+-**   bit 4      key<?N   (N==1 if bits 2,3 clear, or 2 if bits2,3 set)
-+-**   bit 5      key<=?N  (N==1 if bits 2,3 clear, or 2 if bits2,3 set)
-+-**   bit 6      Use blobkey instead of key
-+-**
-+-** To put it another way:
-+-**
-+-**     0        Full table scan.
-+-**     1        key==?1
-+-**     2        key>?1
-+-**     4        key>=?1
-+-**     8        key<?1
-+-**     10       key>?1 AND key<?2
-+-**     12       key>=?1 AND key<?2
-+-**     16       key<=?1
-+-**     18       key>?1 AND key<=?2
-+-**     20       key>=?1 AND key<=?2
-+-**     33..52   Use blobkey in place of key...
-++**     0        key==?1
-++**     1        key>=?1 AND key<=?2
-++**     2        key>?1 or key>=?1
-++**     3        key<?1 or key<=?1
-++**    99        Full table scan only
-+ */
-+ static int lsm1BestIndex(
-+   sqlite3_vtab *tab,
-+   sqlite3_index_info *pIdxInfo
-+ ){
-+   int i;                 /* Loop over constraints */
-+-  int idxNum = 0;        /* The query plan bitmask */
-++  int idxNum = 99;       /* The query plan */
-+   int nArg = 0;          /* Number of arguments to xFilter */
-+-  int eqIdx = -1;        /* Index of the key== constraint, or -1 if none */
-++  int argIdx = -1;       /* Index of the key== constraint, or -1 if none */
-++  int iIdx2 = -1;        /* The index of the second key */
-++  int omit1 = 0;
-++  int omit2 = 0;
-+ 
-+   const struct sqlite3_index_constraint *pConstraint;
-+   pConstraint = pIdxInfo->aConstraint;
-+   for(i=0; i<pIdxInfo->nConstraint && idxNum<16; i++, pConstraint++){
-+     if( pConstraint->usable==0 ) continue;
-+-    if( pConstraint->iColumn!=LSM1_COLUMN_KEY ) continue;
-+-    if( pConstraint->op!=SQLITE_INDEX_CONSTRAINT_EQ ) continue;
-++    if( pConstraint->iColumn!=0 ) continue;
-+     switch( pConstraint->op ){
-+       case SQLITE_INDEX_CONSTRAINT_EQ: {
-+-        eqIdx = i;
-+-        idxNum = 1;
-++        if( idxNum>0 ){
-++          argIdx = i;
-++          iIdx2 = -1;
-++          idxNum = 0;
-++          omit1 = 1;
-++        }
-++        break;
-++      }
-++      case SQLITE_INDEX_CONSTRAINT_GE:
-++      case SQLITE_INDEX_CONSTRAINT_GT: {
-++        if( idxNum==99 ){
-++          argIdx = i;
-++          idxNum = 2;
-++          omit1 = pConstraint->op==SQLITE_INDEX_CONSTRAINT_GE;
-++        }else if( idxNum==3 ){
-++          iIdx2 = idxNum;
-++          omit2 = omit1;
-++          argIdx = i;
-++          idxNum = 1;
-++          omit1 = pConstraint->op==SQLITE_INDEX_CONSTRAINT_GE;
-++        }
-++        break;
-++      }
-++      case SQLITE_INDEX_CONSTRAINT_LE:
-++      case SQLITE_INDEX_CONSTRAINT_LT: {
-++        if( idxNum==99 ){
-++          argIdx = i;
-++          idxNum = 3;
-++          omit1 = pConstraint->op==SQLITE_INDEX_CONSTRAINT_LE;
-++        }else if( idxNum==2 ){
-++          iIdx2 = i;
-++          idxNum = 1;
-++          omit1 = pConstraint->op==SQLITE_INDEX_CONSTRAINT_LE;
-++        }
-+         break;
-+       }
-+     }
-+   }
-+-  if( eqIdx>=0 ){
-+-    pIdxInfo->aConstraintUsage[eqIdx].argvIndex = ++nArg;
-+-    pIdxInfo->aConstraintUsage[eqIdx].omit = 1;
-++  if( argIdx>=0 ){
-++    pIdxInfo->aConstraintUsage[argIdx].argvIndex = ++nArg;
-++    pIdxInfo->aConstraintUsage[argIdx].omit = omit1;
-+   }
-+-  if( idxNum==1 ){
-++  if( iIdx2>=0 ){
-++    pIdxInfo->aConstraintUsage[iIdx2].argvIndex = ++nArg;
-++    pIdxInfo->aConstraintUsage[iIdx2].omit = omit2;
-++  }
-++  if( idxNum==0 ){
-+     pIdxInfo->estimatedCost = (double)1;
-+     pIdxInfo->estimatedRows = 1;
-+     pIdxInfo->orderByConsumed = 1;
-++  }else if( idxNum==1 ){
-++    pIdxInfo->estimatedCost = (double)100;
-++    pIdxInfo->estimatedRows = 100;
-++  }else if( idxNum<99 ){
-++    pIdxInfo->estimatedCost = (double)5000;
-++    pIdxInfo->estimatedRows = 5000;
-+   }else{
-+     /* Full table scan */
-+     pIdxInfo->estimatedCost = (double)2147483647;
-+@@ -615,98 +925,84 @@ int lsm1Update(
-+   sqlite_int64 *pRowid
-+ ){
-+   lsm1_vtab *p = (lsm1_vtab*)pVTab;
-+-  const void *pKey;
-+-  void *pFree = 0;
-+-  int nKey;
-+-  int eType;
-++  int nKey, nKey2;
-++  int i;
-+   int rc = LSM_OK;
-+-  sqlite3_value *pValue;
-+-  const unsigned char *pVal;
-+-  unsigned char *pData;
-+-  int nVal;
-+-  unsigned char pSpace[100];
-++  const u8 *pKey, *pKey2;
-++  unsigned char aKey[16];
-++  unsigned char pSpace[16];
-++  lsm1_vblob val;
-+ 
-+   if( argc==1 ){
-+-    pVTab->zErrMsg = sqlite3_mprintf("cannot DELETE");
-+-    return SQLITE_ERROR;
-++    /* DELETE the record whose key is argv[0] */
-++    lsm1KeyFromValue(p->keyType, argv[0], aKey, &pKey, &nKey);
-++    lsm_delete(p->pDb, pKey, nKey);
-++    return SQLITE_OK;
-+   }
-++
-+   if( sqlite3_value_type(argv[0])!=SQLITE_NULL ){
-+-    pVTab->zErrMsg = sqlite3_mprintf("cannot UPDATE");
-+-    return SQLITE_ERROR;
-++    /* An UPDATE */
-++    lsm1KeyFromValue(p->keyType, argv[0], aKey, &pKey, &nKey);
-++    lsm1KeyFromValue(p->keyType, argv[1], pSpace, &pKey2, &nKey2);
-++    if( nKey!=nKey2 || memcmp(pKey, pKey2, nKey)!=0 ){
-++      /* The UPDATE changes the PRIMARY KEY value.  DELETE the old key */
-++      lsm_delete(p->pDb, pKey, nKey);
-++    }
-++    /* Fall through into the INSERT case to complete the UPDATE */
-+   }
-+ 
-+-  /* "INSERT INTO tab(command) VALUES('....')" is used to implement
-++  /* "INSERT INTO tab(lsm1_command) VALUES('....')" is used to implement
-+   ** special commands.
-+   */
-+-  if( sqlite3_value_type(argv[2+LSM1_COLUMN_COMMAND])!=SQLITE_NULL ){
-++  if( sqlite3_value_type(argv[3+p->nVal])!=SQLITE_NULL ){
-+     return SQLITE_OK;
-+   }
-+-  if( sqlite3_value_type(argv[2+LSM1_COLUMN_BLOBKEY])==SQLITE_BLOB ){
-+-    /* Use the blob key exactly as supplied */
-+-    pKey = sqlite3_value_blob(argv[2+LSM1_COLUMN_BLOBKEY]);
-+-    nKey = sqlite3_value_bytes(argv[2+LSM1_COLUMN_BLOBKEY]);
-+-  }else{
-+-    /* Use a key encoding that sorts in lexicographical order */
-+-    rc = lsm1EncodeKey(argv[2+LSM1_COLUMN_KEY],
-+-                       (unsigned char**)&pKey,&nKey,
-+-                       pSpace,sizeof(pSpace));
-+-    if( rc ) return rc;
-+-    if( pKey!=(const void*)pSpace ) pFree = (void*)pKey;
-+-  }
-+-  if( sqlite3_value_type(argv[2+LSM1_COLUMN_BLOBVALUE])==SQLITE_BLOB ){
-+-    pVal = sqlite3_value_blob(argv[2+LSM1_COLUMN_BLOBVALUE]);
-+-    nVal = sqlite3_value_bytes(argv[2+LSM1_COLUMN_BLOBVALUE]);
-+-    rc = lsm_insert(p->pDb, pKey, nKey, pVal, nVal);
-+-  }else{
-+-    pValue = argv[2+LSM1_COLUMN_VALUE];
-+-    eType = sqlite3_value_type(pValue);
-++  lsm1KeyFromValue(p->keyType, argv[2], aKey, &pKey, &nKey);
-++  memset(&val, 0, sizeof(val));
-++  for(i=0; i<p->nVal; i++){
-++    sqlite3_value *pArg = argv[3+i];
-++    u8 eType = sqlite3_value_type(pArg);
-+     switch( eType ){
-+       case SQLITE_NULL: {
-+-        rc = lsm_delete(p->pDb, pKey, nKey);
-++        lsm1VblobAppendVarint(&val, SQLITE_NULL);
-+         break;
-+       }
-+-      case SQLITE_BLOB:
-+-      case SQLITE_TEXT: {
-+-        if( eType==SQLITE_TEXT ){
-+-          pVal = sqlite3_value_text(pValue);
-+-        }else{
-+-          pVal = (unsigned char*)sqlite3_value_blob(pValue);
-+-        }
-+-        nVal = sqlite3_value_bytes(pValue);
-+-        pData = sqlite3_malloc( nVal+1 );
-+-        if( pData==0 ){
-+-          rc = SQLITE_NOMEM;
-++      case SQLITE_INTEGER: {
-++        sqlite3_int64 v = sqlite3_value_int64(pArg);
-++        if( v>=0 && v<=240/6 ){
-++          lsm1VblobAppendVarint(&val, v*6);
-+         }else{
-+-          pData[0] = (unsigned char)eType;
-+-          memcpy(&pData[1], pVal, nVal);
-+-          rc = lsm_insert(p->pDb, pKey, nKey, pData, nVal+1);
-+-          sqlite3_free(pData);
-++          int n = lsm1PutSignedVarint64(pSpace, v);
-++          lsm1VblobAppendVarint(&val, SQLITE_INTEGER + n*6);
-++          lsm1VblobAppend(&val, pSpace, n);
-+         }
-+         break;
-+       }
-+-      case SQLITE_INTEGER:
-+       case SQLITE_FLOAT: {
-+-        sqlite3_uint64 x;
-+-        unsigned char aVal[9];
-+-        int i;
-+-        if( eType==SQLITE_INTEGER ){
-+-          *(sqlite3_int64*)&x = sqlite3_value_int64(pValue);
-+-        }else{
-+-          double r = sqlite3_value_double(pValue);
-+-          assert( sizeof(r)==sizeof(x) );
-+-          memcpy(&x, &r, sizeof(r));
-+-        }
-+-        for(i=8; x>0 && i>=1; i--){
-+-          aVal[i] = x & 0xff;
-+-          x >>= 8;
-+-        }
-+-        aVal[i] = (unsigned char)eType;
-+-        rc = lsm_insert(p->pDb, pKey, nKey, &aVal[i], 9-i);
-++        double r = sqlite3_value_double(pArg);
-++        lsm1VblobAppendVarint(&val, SQLITE_FLOAT + 8*6);
-++        lsm1VblobAppend(&val, (u8*)&r, sizeof(r));
-++        break;
-++      }
-++      case SQLITE_BLOB: {
-++        int n = sqlite3_value_bytes(pArg);
-++        lsm1VblobAppendVarint(&val, n*6 + SQLITE_BLOB);
-++        lsm1VblobAppend(&val, sqlite3_value_blob(pArg), n);
-++        break;
-++      }
-++      case SQLITE_TEXT: {
-++        int n = sqlite3_value_bytes(pArg);
-++        lsm1VblobAppendVarint(&val, n*6 + SQLITE_TEXT);
-++        lsm1VblobAppend(&val, sqlite3_value_text(pArg), n);
-+         break;
-+       }
-+     }
-+   }
-+-  sqlite3_free(pFree);
-++  if( val.errNoMem ){
-++    return SQLITE_NOMEM;
-++  }
-++  rc = lsm_insert(p->pDb, pKey, nKey, val.a, val.n);
-++  sqlite3_free(val.a);
-+   return rc==LSM_OK ? SQLITE_OK : SQLITE_ERROR;
-+ }
-+ 
-+diff --git a/third_party/sqlite/src/ext/lsm1/test/lsm1_simple.test b/third_party/sqlite/src/ext/lsm1/test/lsm1_simple.test
-+index cd071f9..8ebc641 100644
-+--- a/third_party/sqlite/src/ext/lsm1/test/lsm1_simple.test
-++++ b/third_party/sqlite/src/ext/lsm1/test/lsm1_simple.test
-+@@ -19,38 +19,75 @@ load_lsm1_vtab db
-+ 
-+ forcedelete testlsm.db
-+ 
-+-do_execsql_test 1.0 {
-+-  CREATE VIRTUAL TABLE x1 USING lsm1(testlsm.db);
-++do_execsql_test 100 {
-++  CREATE VIRTUAL TABLE x1 USING lsm1(testlsm.db,a,UINT,b,c,d);
-+   PRAGMA table_info(x1);
-+ } {
-+-  0 key       {} 0 {} 0
-+-  1 blobkey   {} 0 {} 0
-+-  2 value     {} 0 {} 0
-+-  3 blobvalue {} 0 {} 0
-++  0 a UINT 1 {} 1
-++  1 b {} 0 {} 0
-++  2 c {} 0 {} 0
-++  3 d {} 0 {} 0
-+ }
-+ 
-+-do_execsql_test 1.1 {
-+-  INSERT INTO x1(blobkey, blobvalue) VALUES(x'abcd', x'1234');
-+-  SELECT quote(blobkey), quote(blobvalue) FROM x1;
-+-} {X'ABCD' X'1234'}
-++do_execsql_test 110 {
-++  INSERT INTO x1(a,b,c,d) VALUES(15, 11, 22, 33),(8,'banjo',x'333231',NULL),
-++      (12,NULL,3.25,-559281390);
-++  SELECT a, quote(b), quote(c), quote(d) FROM x1;
-++} {8 'banjo' X'333231' NULL 12 NULL 3.25 -559281390 15 11 22 33}
-++do_execsql_test 111 {
-++  SELECT a, quote(lsm1_key), quote(lsm1_value) FROM x1;
-++} {8 X'08' X'2162616E6A6F1633323105' 12 X'0C' X'05320000000000000A401FFB42ABE9DB' 15 X'0F' X'4284C6'}
-+ 
-+-do_catchsql_test 1.2 {
-+-  UPDATE x1 SET blobvalue = x'7890' WHERE blobkey = x'abcd';
-+-} {1 {cannot UPDATE}}
-++do_execsql_test 120 {
-++  UPDATE x1 SET d = d+1.0 WHERE a=15;
-++  SELECT a, quote(b), quote(c), quote(d) FROM x1;
-++} {8 'banjo' X'333231' NULL 12 NULL 3.25 -559281390 15 11 22 34.0}
-+ 
-+-do_catchsql_test 1.3 {
-+-  DELETE FROM x1 WHERE blobkey = x'abcd'
-+-} {1 {cannot DELETE}}
-++do_execsql_test 130 {
-++  UPDATE x1 SET a=123456789 WHERE a=12;
-++  SELECT a, quote(b), quote(c), quote(d) FROM x1;
-++} {8 'banjo' X'333231' NULL 15 11 22 34.0 123456789 NULL 3.25 -559281390}
-++do_execsql_test 131 {
-++  SELECT quote(lsm1_key), printf('0x%x',a) FROM x1 WHERE a > 100000000;
-++} {X'FB075BCD15' 0x75bcd15}
-+ 
-+-do_test 1.4 {
-++do_execsql_test 140 {
-++  DELETE FROM x1 WHERE a=15;
-++  SELECT a, quote(b), quote(c), quote(d) FROM x1;
-++} {8 'banjo' X'333231' NULL 123456789 NULL 3.25 -559281390}
-++
-++do_test 150 {
-+   lsort [glob testlsm.db*]
-+ } {testlsm.db testlsm.db-log testlsm.db-shm}
-+ 
-+ db close
-+-do_test 1.5 {
-++do_test 160 {
-+   lsort [glob testlsm.db*]
-+ } {testlsm.db}
-+ 
-+-finish_test
-++forcedelete testlsm.db
-++forcedelete test.db
-++sqlite3 db test.db
-++load_lsm1_vtab db
-++
-+ 
-++do_execsql_test 200 {
-++  CREATE VIRTUAL TABLE x1 USING lsm1(testlsm.db,a,TEXT,b,c,d);
-++  PRAGMA table_info(x1);
-++} {
-++  0 a TEXT 1 {} 1
-++  1 b {} 0 {} 0
-++  2 c {} 0 {} 0
-++  3 d {} 0 {} 0
-++}
-++do_execsql_test 210 {
-++  INSERT INTO x1(a,b,c,d) VALUES(15, 11, 22, 33),(8,'banjo',x'333231',NULL),
-++      (12,NULL,3.25,-559281390);
-++  SELECT quote(a), quote(b), quote(c), quote(d), '|' FROM x1;
-++} {'12' NULL 3.25 -559281390 | '15' 11 22 33 | '8' 'banjo' X'333231' NULL |}
-++do_execsql_test 211 {
-++  SELECT quote(a), quote(lsm1_key), quote(lsm1_value), '|' FROM x1;
-++} {'12' X'3132' X'05320000000000000A401FFB42ABE9DB' | '15' X'3135' X'4284C6' | '8' X'38' X'2162616E6A6F1633323105' |}
-+ 
-++
-++finish_test
-+diff --git a/third_party/sqlite/src/ext/misc/csv.c b/third_party/sqlite/src/ext/misc/csv.c
-+index e66ba56..83d6cb3f 100644
-+--- a/third_party/sqlite/src/ext/misc/csv.c
-++++ b/third_party/sqlite/src/ext/misc/csv.c
-+@@ -78,7 +78,7 @@ struct CsvReader {
-+   int nAlloc;            /* Space allocated for z[] */
-+   int nLine;             /* Current line number */
-+   int bNotFirst;         /* True if prior text has been seen */
-+-  char cTerm;            /* Character that terminated the most recent field */
-++  int cTerm;             /* Character that terminated the most recent field */
-+   size_t iIn;            /* Next unread character in the input buffer */
-+   size_t nIn;            /* Number of characters in the input buffer */
-+   char *zIn;             /* The input buffer */
-+@@ -166,7 +166,7 @@ static int csv_getc(CsvReader *p){
-+     if( p->in!=0 ) return csv_getc_refill(p);
-+     return EOF;
-+   }
-+-  return p->zIn[p->iIn++];
-++  return ((unsigned char*)p->zIn)[p->iIn++];
-+ }
-+ 
-+ /* Increase the size of p->z and append character c to the end.
-+@@ -680,16 +680,16 @@ static int csvtabNext(sqlite3_vtab_cursor *cur){
-+       i++;
-+     }
-+   }while( pCur->rdr.cTerm==',' );
-+-  while( i<pTab->nCol ){
-+-    sqlite3_free(pCur->azVal[i]);
-+-    pCur->azVal[i] = 0;
-+-    pCur->aLen[i] = 0;
-+-    i++;
-+-  }
-+-  if( z==0 || pCur->rdr.cTerm==EOF ){
-++  if( z==0 || (pCur->rdr.cTerm==EOF && i<pTab->nCol) ){
-+     pCur->iRowid = -1;
-+   }else{
-+     pCur->iRowid++;
-++    while( i<pTab->nCol ){
-++      sqlite3_free(pCur->azVal[i]);
-++      pCur->azVal[i] = 0;
-++      pCur->aLen[i] = 0;
-++      i++;
-++    }
-+   }
-+   return SQLITE_OK;
-+ }
-+diff --git a/third_party/sqlite/src/ext/misc/mmapwarm.c b/third_party/sqlite/src/ext/misc/mmapwarm.c
-+new file mode 100644
-+index 0000000..f4d1a01
-+--- /dev/null
-++++ b/third_party/sqlite/src/ext/misc/mmapwarm.c
-+@@ -0,0 +1,108 @@
-++/*
-++** 2017-09-18
-++**
-++** The author disclaims copyright to this source code.  In place of
-++** a legal notice, here is a blessing:
-++**
-++**    May you do good and not evil.
-++**    May you find forgiveness for yourself and forgive others.
-++**    May you share freely, never taking more than you give.
-++**
-++*************************************************************************
-++**
-++*/
-++
-++#include "sqlite3.h"
-++
-++
-++/*
-++** This function is used to touch each page of a mapping of a memory
-++** mapped SQLite database. Assuming that the system has sufficient free
-++** memory and supports sufficiently large mappings, this causes the OS
-++** to cache the entire database in main memory, making subsequent
-++** database accesses faster.
-++**
-++** If the second parameter to this function is not NULL, it is the name of
-++** the specific database to operate on (i.e. "main" or the name of an
-++** attached database).
-++**
-++** SQLITE_OK is returned if successful, or an SQLite error code otherwise.
-++** It is not considered an error if the file is not memory-mapped, or if
-++** the mapping does not span the entire file. If an error does occur, a
-++** transaction may be left open on the database file.
-++**
-++** It is illegal to call this function when the database handle has an
-++** open transaction. SQLITE_MISUSE is returned in this case.
-++*/
-++int sqlite3_mmap_warm(sqlite3 *db, const char *zDb){
-++  int rc = SQLITE_OK;
-++  char *zSql = 0;
-++  int pgsz = 0;
-++  int nTotal = 0;
-++
-++  if( 0==sqlite3_get_autocommit(db) ) return SQLITE_MISUSE;
-++
-++  /* Open a read-only transaction on the file in question */
-++  zSql = sqlite3_mprintf("BEGIN; SELECT * FROM %s%q%ssqlite_master",
-++      (zDb ? "'" : ""), (zDb ? zDb : ""), (zDb ? "'." : "")
-++  );
-++  if( zSql==0 ) return SQLITE_NOMEM;
-++  rc = sqlite3_exec(db, zSql, 0, 0, 0);
-++  sqlite3_free(zSql);
-++
-++  /* Find the SQLite page size of the file */
-++  if( rc==SQLITE_OK ){
-++    zSql = sqlite3_mprintf("PRAGMA %s%q%spage_size",
-++        (zDb ? "'" : ""), (zDb ? zDb : ""), (zDb ? "'." : "")
-++    );
-++    if( zSql==0 ){
-++      rc = SQLITE_NOMEM;
-++    }else{
-++      sqlite3_stmt *pPgsz = 0;
-++      rc = sqlite3_prepare_v2(db, zSql, -1, &pPgsz, 0);
-++      sqlite3_free(zSql);
-++      if( rc==SQLITE_OK ){
-++        if( sqlite3_step(pPgsz)==SQLITE_ROW ){
-++          pgsz = sqlite3_column_int(pPgsz, 0);
-++        }
-++        rc = sqlite3_finalize(pPgsz);
-++      }
-++      if( rc==SQLITE_OK && pgsz==0 ){
-++        rc = SQLITE_ERROR;
-++      }
-++    }
-++  }
-++
-++  /* Touch each mmap'd page of the file */
-++  if( rc==SQLITE_OK ){
-++    int rc2;
-++    sqlite3_file *pFd = 0;
-++    rc = sqlite3_file_control(db, zDb, SQLITE_FCNTL_FILE_POINTER, &pFd);
-++    if( rc==SQLITE_OK && pFd->pMethods->iVersion>=3 ){
-++      sqlite3_int64 iPg = 1;
-++      sqlite3_io_methods const *p = pFd->pMethods;
-++      while( 1 ){
-++        unsigned char *pMap;
-++        rc = p->xFetch(pFd, pgsz*iPg, pgsz, (void**)&pMap);
-++        if( rc!=SQLITE_OK || pMap==0 ) break;
-++
-++        nTotal += pMap[0];
-++        nTotal += pMap[pgsz-1];
-++
-++        rc = p->xUnfetch(pFd, pgsz*iPg, (void*)pMap);
-++        if( rc!=SQLITE_OK ) break;
-++        iPg++;
-++      }
-++      sqlite3_log(SQLITE_OK,
-++          "sqlite3_mmap_warm_cache: Warmed up %d pages of %s", iPg==1?0:iPg,
-++          sqlite3_db_filename(db, zDb)
-++      );
-++    }
-++
-++    rc2 = sqlite3_exec(db, "END", 0, 0, 0);
-++    if( rc==SQLITE_OK ) rc = rc2;
-++  }
-++
-++  return rc;
-++}
-++
-+diff --git a/third_party/sqlite/src/ext/misc/series.c b/third_party/sqlite/src/ext/misc/series.c
-+index dc7dc0e..d02a690 100644
-+--- a/third_party/sqlite/src/ext/misc/series.c
-++++ b/third_party/sqlite/src/ext/misc/series.c
-+@@ -195,8 +195,9 @@ static int seriesColumn(
-+ }
-+ 
-+ /*
-+-** Return the rowid for the current row.  In this implementation, the
-+-** rowid is the same as the output value.
-++** Return the rowid for the current row. In this implementation, the
-++** first row returned is assigned rowid value 1, and each subsequent
-++** row a value 1 more than that of the previous.
-+ */
-+ static int seriesRowid(sqlite3_vtab_cursor *cur, sqlite_int64 *pRowid){
-+   series_cursor *pCur = (series_cursor*)cur;
-+diff --git a/third_party/sqlite/src/ext/misc/unionvtab.c b/third_party/sqlite/src/ext/misc/unionvtab.c
-+index 0ba783a..b382bc5 100644
-+--- a/third_party/sqlite/src/ext/misc/unionvtab.c
-++++ b/third_party/sqlite/src/ext/misc/unionvtab.c
-+@@ -10,8 +10,8 @@
-+ **
-+ *************************************************************************
-+ **
-+-** This file contains the implementation of the "unionvtab" virtual
-+-** table. This module provides read-only access to multiple tables,
-++** This file contains the implementation of the "unionvtab" and "swarmvtab"
-++** virtual tables. These modules provide read-only access to multiple tables,
-+ ** possibly in multiple database files, via a single database object.
-+ ** The source tables must have the following characteristics:
-+ **
-+@@ -25,26 +25,48 @@
-+ **
-+ **   * Each table must contain a distinct range of rowid values.
-+ **
-+-** A "unionvtab" virtual table is created as follows:
-++** The difference between the two virtual table modules is that for
-++** "unionvtab", all source tables must be located in the main database or
-++** in databases ATTACHed to the main database by the user. For "swarmvtab",
-++** the tables may be located in any database file on disk. The "swarmvtab"
-++** implementation takes care of opening and closing database files
-++** automatically.
-+ **
-+-**   CREATE VIRTUAL TABLE <name> USING unionvtab(<sql statement>);
-++** UNIONVTAB
-+ **
-+-** The implementation evalutes <sql statement> whenever a unionvtab virtual
-+-** table is created or opened. It should return one row for each source
-+-** database table. The four columns required of each row are:
-++**   A "unionvtab" virtual table is created as follows:
-+ **
-+-**   1. The name of the database containing the table ("main" or "temp" or
-+-**      the name of an attached database). Or NULL to indicate that all
-+-**      databases should be searched for the table in the usual fashion.
-++**     CREATE VIRTUAL TABLE <name> USING unionvtab(<sql-statement>);
-+ **
-+-**   2. The name of the database table.
-++**   The implementation evalutes <sql statement> whenever a unionvtab virtual
-++**   table is created or opened. It should return one row for each source
-++**   database table. The four columns required of each row are:
-+ **
-+-**   3. The smallest rowid in the range of rowids that may be stored in the
-+-**      database table (an integer).
-++**     1. The name of the database containing the table ("main" or "temp" or
-++**        the name of an attached database). Or NULL to indicate that all
-++**        databases should be searched for the table in the usual fashion.
-+ **
-+-**   4. The largest rowid in the range of rowids that may be stored in the
-+-**      database table (an integer).
-++**     2. The name of the database table.
-+ **
-++**     3. The smallest rowid in the range of rowids that may be stored in the
-++**        database table (an integer).
-++**
-++**     4. The largest rowid in the range of rowids that may be stored in the
-++**        database table (an integer).
-++**
-++** SWARMVTAB
-++**
-++**   A "swarmvtab" virtual table is created similarly to a unionvtab table:
-++**
-++**     CREATE VIRTUAL TABLE <name>
-++**      USING swarmvtab(<sql-statement>, <callback>);
-++**
-++**   The difference is that for a swarmvtab table, the first column returned
-++**   by the <sql statement> must return a path or URI that can be used to open
-++**   the database file containing the source table.  The <callback> option
-++**   is optional.  If included, it is the name of an application-defined
-++**   SQL function that is invoked with the URI of the file, if the file
-++**   does not already exist on disk.
-+ */
-+ 
-+ #include "sqlite3ext.h"
-+@@ -65,6 +87,30 @@ SQLITE_EXTENSION_INIT1
-+ # define SMALLEST_INT64 (((sqlite3_int64)-1) - LARGEST_INT64)
-+ #endif
-+ 
-++/*
-++** The following is also copied from sqliteInt.h. To facilitate coverage
-++** testing.
-++*/
-++#ifndef ALWAYS
-++# if defined(SQLITE_COVERAGE_TEST) || defined(SQLITE_MUTATION_TEST)
-++#  define ALWAYS(X)      (1)
-++#  define NEVER(X)       (0)
-++# elif !defined(NDEBUG)
-++#  define ALWAYS(X)      ((X)?1:(assert(0),0))
-++#  define NEVER(X)       ((X)?(assert(0),1):0)
-++# else
-++#  define ALWAYS(X)      (X)
-++#  define NEVER(X)       (X)
-++# endif
-++#endif
-++
-++/*
-++** The swarmvtab module attempts to keep the number of open database files
-++** at or below this limit. This may not be possible if there are too many
-++** simultaneous queries.
-++*/
-++#define SWARMVTAB_MAX_OPEN 9
-++
-+ typedef struct UnionCsr UnionCsr;
-+ typedef struct UnionTab UnionTab;
-+ typedef struct UnionSrc UnionSrc;
-+@@ -79,6 +125,12 @@ struct UnionSrc {
-+   char *zTab;                     /* Source table name */
-+   sqlite3_int64 iMin;             /* Minimum rowid */
-+   sqlite3_int64 iMax;             /* Maximum rowid */
-++
-++  /* Fields used by swarmvtab only */
-++  char *zFile;                    /* Database file containing table zTab */
-++  int nUser;                      /* Current number of users */
-++  sqlite3 *db;                    /* Database handle */
-++  UnionSrc *pNextClosable;        /* Next in list of closable sources */
-+ };
-+ 
-+ /*
-+@@ -87,9 +139,17 @@ struct UnionSrc {
-+ struct UnionTab {
-+   sqlite3_vtab base;              /* Base class - must be first */
-+   sqlite3 *db;                    /* Database handle */
-++  int bSwarm;                     /* 1 for "swarmvtab", 0 for "unionvtab" */
-+   int iPK;                        /* INTEGER PRIMARY KEY column, or -1 */
-+   int nSrc;                       /* Number of elements in the aSrc[] array */
-+   UnionSrc *aSrc;                 /* Array of source tables, sorted by rowid */
-++
-++  /* Used by swarmvtab only */
-++  char *zSourceStr;               /* Expected unionSourceToStr() value */
-++  char *zNotFoundCallback;        /* UDF to invoke if file not found on open */
-++  UnionSrc *pClosable;            /* First in list of closable sources */
-++  int nOpen;                      /* Current number of open sources */
-++  int nMaxOpen;                   /* Maximum number of open sources */
-+ };
-+ 
-+ /*
-+@@ -98,9 +158,21 @@ struct UnionTab {
-+ struct UnionCsr {
-+   sqlite3_vtab_cursor base;       /* Base class - must be first */
-+   sqlite3_stmt *pStmt;            /* SQL statement to run */
-++
-++  /* Used by swarmvtab only */
-++  sqlite3_int64 iMaxRowid;        /* Last rowid to visit */
-++  int iTab;                       /* Index of table read by pStmt */
-+ };
-+ 
-+ /*
-++** Given UnionTab table pTab and UnionSrc object pSrc, return the database
-++** handle that should be used to access the table identified by pSrc. This
-++** is the main db handle for "unionvtab" tables, or the source-specific
-++** handle for "swarmvtab".
-++*/
-++#define unionGetDb(pTab, pSrc) ((pTab)->bSwarm ? (pSrc)->db : (pTab)->db)
-++
-++/*
-+ ** If *pRc is other than SQLITE_OK when this function is called, it
-+ ** always returns NULL. Otherwise, it attempts to allocate and return
-+ ** a pointer to nByte bytes of zeroed memory. If the memory allocation
-+@@ -160,7 +232,7 @@ static void unionDequote(char *z){
-+       int iIn = 1;
-+       int iOut = 0;
-+       if( q=='[' ) q = ']';
-+-      while( z[iIn] ){
-++      while( ALWAYS(z[iIn]) ){
-+         if( z[iIn]==q ){
-+           if( z[iIn+1]!=q ){
-+             /* Character iIn was the close quote. */
-+@@ -202,6 +274,7 @@ static sqlite3_stmt *unionPrepare(
-+   char **pzErr                    /* OUT: Error message */
-+ ){
-+   sqlite3_stmt *pRet = 0;
-++  assert( pzErr );
-+   if( *pRc==SQLITE_OK ){
-+     int rc = sqlite3_prepare_v2(db, zSql, -1, &pRet, 0);
-+     if( rc!=SQLITE_OK ){
-+@@ -250,6 +323,7 @@ static sqlite3_stmt *unionPreparePrintf(
-+ ** In this case, *pzErr may be set to point to an error message
-+ ** buffer allocated by sqlite3_malloc().
-+ */
-++#if 0
-+ static void unionReset(int *pRc, sqlite3_stmt *pStmt, char **pzErr){
-+   int rc = sqlite3_reset(pStmt);
-+   if( *pRc==SQLITE_OK ){
-+@@ -259,15 +333,39 @@ static void unionReset(int *pRc, sqlite3_stmt *pStmt, char **pzErr){
-+     }
-+   }
-+ }
-++#endif
-+ 
-+ /*
-+ ** Call sqlite3_finalize() on SQL statement pStmt. If *pRc is set to
-+ ** SQLITE_OK when this function is called, then it is set to the
-+ ** value returned by sqlite3_finalize() before this function exits.
-+ */
-+-static void unionFinalize(int *pRc, sqlite3_stmt *pStmt){
-++static void unionFinalize(int *pRc, sqlite3_stmt *pStmt, char **pzErr){
-++  sqlite3 *db = sqlite3_db_handle(pStmt);
-+   int rc = sqlite3_finalize(pStmt);
-+-  if( *pRc==SQLITE_OK ) *pRc = rc;
-++  if( *pRc==SQLITE_OK ){
-++    *pRc = rc;
-++    if( rc ){
-++      *pzErr = sqlite3_mprintf("%s", sqlite3_errmsg(db));
-++    }
-++  }
-++}
-++
-++/*
-++** This function is a no-op for unionvtab. For swarmvtab, it attempts to
-++** close open database files until at most nMax are open. An SQLite error
-++** code is returned if an error occurs, or SQLITE_OK otherwise.
-++*/
-++static void unionCloseSources(UnionTab *pTab, int nMax){
-++  while( pTab->pClosable && pTab->nOpen>nMax ){
-++    UnionSrc **pp;
-++    for(pp=&pTab->pClosable; (*pp)->pNextClosable; pp=&(*pp)->pNextClosable);
-++    assert( (*pp)->db );
-++    sqlite3_close((*pp)->db);
-++    (*pp)->db = 0;
-++    *pp = 0;
-++    pTab->nOpen--;
-++  }
-+ }
-+ 
-+ /*
-+@@ -278,9 +376,14 @@ static int unionDisconnect(sqlite3_vtab *pVtab){
-+     UnionTab *pTab = (UnionTab*)pVtab;
-+     int i;
-+     for(i=0; i<pTab->nSrc; i++){
-+-      sqlite3_free(pTab->aSrc[i].zDb);
-+-      sqlite3_free(pTab->aSrc[i].zTab);
-++      UnionSrc *pSrc = &pTab->aSrc[i];
-++      sqlite3_free(pSrc->zDb);
-++      sqlite3_free(pSrc->zTab);
-++      sqlite3_free(pSrc->zFile);
-++      sqlite3_close(pSrc->db);
-+     }
-++    sqlite3_free(pTab->zSourceStr);
-++    sqlite3_free(pTab->zNotFoundCallback);
-+     sqlite3_free(pTab->aSrc);
-+     sqlite3_free(pTab);
-+   }
-+@@ -288,6 +391,38 @@ static int unionDisconnect(sqlite3_vtab *pVtab){
-+ }
-+ 
-+ /*
-++** Check that the table identified by pSrc is a rowid table. If not,
-++** return SQLITE_ERROR and set (*pzErr) to point to an English language
-++** error message. If the table is a rowid table and no error occurs,
-++** return SQLITE_OK and leave (*pzErr) unmodified.
-++*/
-++static int unionIsIntkeyTable(
-++  sqlite3 *db,                    /* Database handle */
-++  UnionSrc *pSrc,                 /* Source table to test */
-++  char **pzErr                    /* OUT: Error message */
-++){
-++  int bPk = 0;
-++  const char *zType = 0;
-++  int rc;
-++
-++  sqlite3_table_column_metadata(
-++      db, pSrc->zDb, pSrc->zTab, "_rowid_", &zType, 0, 0, &bPk, 0
-++  );
-++  rc = sqlite3_errcode(db);
-++  if( rc==SQLITE_ERROR
-++   || (rc==SQLITE_OK && (!bPk || sqlite3_stricmp("integer", zType)))
-++  ){
-++    rc = SQLITE_ERROR;
-++    *pzErr = sqlite3_mprintf("no such rowid table: %s%s%s",
-++        (pSrc->zDb ? pSrc->zDb : ""),
-++        (pSrc->zDb ? "." : ""),
-++        pSrc->zTab
-++    );
-++  }
-++  return rc;
-++}
-++
-++/*
-+ ** This function is a no-op if *pRc is other than SQLITE_OK when it is
-+ ** called. In this case it returns NULL.
-+ **
-+@@ -306,41 +441,27 @@ static int unionDisconnect(sqlite3_vtab *pVtab){
-+ */
-+ static char *unionSourceToStr(
-+   int *pRc,                       /* IN/OUT: Error code */
-+-  sqlite3 *db,                    /* Database handle */
-++  UnionTab *pTab,                 /* Virtual table object */
-+   UnionSrc *pSrc,                 /* Source table to test */
-+-  sqlite3_stmt *pStmt,
-+   char **pzErr                    /* OUT: Error message */
-+ ){
-+   char *zRet = 0;
-+   if( *pRc==SQLITE_OK ){
-+-    int bPk = 0;
-+-    const char *zType = 0;
-+-    int rc;
-+-
-+-    sqlite3_table_column_metadata(
-+-        db, pSrc->zDb, pSrc->zTab, "_rowid_", &zType, 0, 0, &bPk, 0
-++    sqlite3 *db = unionGetDb(pTab, pSrc);
-++    int rc = unionIsIntkeyTable(db, pSrc, pzErr);
-++    sqlite3_stmt *pStmt = unionPrepare(&rc, db,
-++        "SELECT group_concat(quote(name) || '.' || quote(type)) "
-++        "FROM pragma_table_info(?, ?)", pzErr
-+     );
-+-    rc = sqlite3_errcode(db);
-+-    if( rc==SQLITE_ERROR
-+-     || (rc==SQLITE_OK && (!bPk || sqlite3_stricmp("integer", zType)))
-+-    ){
-+-      rc = SQLITE_ERROR;
-+-      *pzErr = sqlite3_mprintf("no such rowid table: %s%s%s",
-+-          (pSrc->zDb ? pSrc->zDb : ""),
-+-          (pSrc->zDb ? "." : ""),
-+-          pSrc->zTab
-+-      );
-+-    }
-+-
-+     if( rc==SQLITE_OK ){
-+       sqlite3_bind_text(pStmt, 1, pSrc->zTab, -1, SQLITE_STATIC);
-+       sqlite3_bind_text(pStmt, 2, pSrc->zDb, -1, SQLITE_STATIC);
-+       if( SQLITE_ROW==sqlite3_step(pStmt) ){
-+-        zRet = unionStrdup(&rc, (const char*)sqlite3_column_text(pStmt, 0));
-++        const char *z = (const char*)sqlite3_column_text(pStmt, 0);
-++        zRet = unionStrdup(&rc, z);
-+       }
-+-      unionReset(&rc, pStmt, pzErr);
-++      unionFinalize(&rc, pStmt, pzErr);
-+     }
-+-
-+     *pRc = rc;
-+   }
-+ 
-+@@ -356,34 +477,152 @@ static char *unionSourceToStr(
-+ ** other error occurs, SQLITE_OK is returned.
-+ */
-+ static int unionSourceCheck(UnionTab *pTab, char **pzErr){
-+-  const char *zSql =
-+-      "SELECT group_concat(quote(name) || '.' || quote(type)) "
-+-      "FROM pragma_table_info(?, ?)";
-+   int rc = SQLITE_OK;
-++  char *z0 = 0;
-++  int i;
-+ 
-+-  if( pTab->nSrc==0 ){
-+-    *pzErr = sqlite3_mprintf("no source tables configured");
-+-    rc = SQLITE_ERROR;
-+-  }else{
-+-    sqlite3_stmt *pStmt = 0;
-+-    char *z0 = 0;
-+-    int i;
-++  assert( *pzErr==0 );
-++  z0 = unionSourceToStr(&rc, pTab, &pTab->aSrc[0], pzErr);
-++  for(i=1; i<pTab->nSrc; i++){
-++    char *z = unionSourceToStr(&rc, pTab, &pTab->aSrc[i], pzErr);
-++    if( rc==SQLITE_OK && sqlite3_stricmp(z, z0) ){
-++      *pzErr = sqlite3_mprintf("source table schema mismatch");
-++      rc = SQLITE_ERROR;
-++    }
-++    sqlite3_free(z);
-++  }
-++  sqlite3_free(z0);
-+ 
-+-    pStmt = unionPrepare(&rc, pTab->db, zSql, pzErr);
-+-    if( rc==SQLITE_OK ){
-+-      z0 = unionSourceToStr(&rc, pTab->db, &pTab->aSrc[0], pStmt, pzErr);
-++  return rc;
-++}
-++
-++
-++/*
-++** Try to open the swarmvtab database.  If initially unable, invoke the
-++** not-found callback UDF and then try again.
-++*/
-++static int unionOpenDatabaseInner(UnionTab *pTab, UnionSrc *pSrc, char **pzErr){
-++  int rc = SQLITE_OK;
-++  static const int openFlags =
-++       SQLITE_OPEN_READONLY | SQLITE_OPEN_URI;
-++  rc = sqlite3_open_v2(pSrc->zFile, &pSrc->db, openFlags, 0);
-++  if( rc==SQLITE_OK ) return rc;
-++  if( pTab->zNotFoundCallback ){
-++    char *zSql = sqlite3_mprintf("SELECT \"%w\"(%Q);",
-++                    pTab->zNotFoundCallback, pSrc->zFile);
-++    sqlite3_close(pSrc->db);
-++    pSrc->db = 0;
-++    if( zSql==0 ){
-++      *pzErr = sqlite3_mprintf("out of memory");
-++      return SQLITE_NOMEM;
-+     }
-+-    for(i=1; i<pTab->nSrc; i++){
-+-      char *z = unionSourceToStr(&rc, pTab->db, &pTab->aSrc[i], pStmt, pzErr);
-+-      if( rc==SQLITE_OK && sqlite3_stricmp(z, z0) ){
-+-        *pzErr = sqlite3_mprintf("source table schema mismatch");
-+-        rc = SQLITE_ERROR;
-++    rc = sqlite3_exec(pTab->db, zSql, 0, 0, pzErr);
-++    sqlite3_free(zSql);
-++    if( rc ) return rc;
-++    rc = sqlite3_open_v2(pSrc->zFile, &pSrc->db, openFlags, 0);
-++  }
-++  if( rc!=SQLITE_OK ){
-++    *pzErr = sqlite3_mprintf("%s", sqlite3_errmsg(pSrc->db));
-++  }
-++  return rc;
-++}
-++
-++/*
-++** This function may only be called for swarmvtab tables. The results of
-++** calling it on a unionvtab table are undefined.
-++**
-++** For a swarmvtab table, this function ensures that source database iSrc
-++** is open. If the database is opened successfully and the schema is as
-++** expected, or if it is already open when this function is called, SQLITE_OK
-++** is returned.
-++**
-++** Alternatively If an error occurs while opening the databases, or if the
-++** database schema is unsuitable, an SQLite error code is returned and (*pzErr)
-++** may be set to point to an English language error message. In this case it is
-++** the responsibility of the caller to eventually free the error message buffer
-++** using sqlite3_free().
-++*/
-++static int unionOpenDatabase(UnionTab *pTab, int iSrc, char **pzErr){
-++  int rc = SQLITE_OK;
-++  UnionSrc *pSrc = &pTab->aSrc[iSrc];
-++
-++  assert( pTab->bSwarm && iSrc<pTab->nSrc );
-++  if( pSrc->db==0 ){
-++    unionCloseSources(pTab, pTab->nMaxOpen-1);
-++    rc = unionOpenDatabaseInner(pTab, pSrc, pzErr);
-++    if( rc==SQLITE_OK ){
-++      char *z = unionSourceToStr(&rc, pTab, pSrc, pzErr);
-++      if( rc==SQLITE_OK ){
-++        if( pTab->zSourceStr==0 ){
-++          pTab->zSourceStr = z;
-++        }else{
-++          if( sqlite3_stricmp(z, pTab->zSourceStr) ){
-++            *pzErr = sqlite3_mprintf("source table schema mismatch");
-++            rc = SQLITE_ERROR;
-++          }
-++          sqlite3_free(z);
-++        }
-+       }
-+-      sqlite3_free(z);
-+     }
-+ 
-+-    unionFinalize(&rc, pStmt);
-+-    sqlite3_free(z0);
-++    if( rc==SQLITE_OK ){
-++      pSrc->pNextClosable = pTab->pClosable;
-++      pTab->pClosable = pSrc;
-++      pTab->nOpen++;
-++    }else{
-++      sqlite3_close(pSrc->db);
-++      pSrc->db = 0;
-++    }
-++  }
-++
-++  return rc;
-++}
-++
-++
-++/*
-++** This function is a no-op for unionvtab tables. For swarmvtab, increment
-++** the reference count for source table iTab. If the reference count was
-++** zero before it was incremented, also remove the source from the closable
-++** list.
-++*/
-++static void unionIncrRefcount(UnionTab *pTab, int iTab){
-++  if( pTab->bSwarm ){
-++    UnionSrc *pSrc = &pTab->aSrc[iTab];
-++    assert( pSrc->nUser>=0 && pSrc->db );
-++    if( pSrc->nUser==0 ){
-++      UnionSrc **pp;
-++      for(pp=&pTab->pClosable; *pp!=pSrc; pp=&(*pp)->pNextClosable);
-++      *pp = pSrc->pNextClosable;
-++      pSrc->pNextClosable = 0;
-++    }
-++    pSrc->nUser++;
-++  }
-++}
-++
-++/*
-++** Finalize the SQL statement pCsr->pStmt and return the result.
-++**
-++** If this is a swarmvtab table (not unionvtab) and pCsr->pStmt was not
-++** NULL when this function was called, also decrement the reference
-++** count on the associated source table. If this means the source tables
-++** refcount is now zero, add it to the closable list.
-++*/
-++static int unionFinalizeCsrStmt(UnionCsr *pCsr){
-++  int rc = SQLITE_OK;
-++  if( pCsr->pStmt ){
-++    UnionTab *pTab = (UnionTab*)pCsr->base.pVtab;
-++    UnionSrc *pSrc = &pTab->aSrc[pCsr->iTab];
-++    rc = sqlite3_finalize(pCsr->pStmt);
-++    pCsr->pStmt = 0;
-++    if( pTab->bSwarm ){
-++      pSrc->nUser--;
-++      assert( pSrc->nUser>=0 );
-++      if( pSrc->nUser==0 ){
-++        pSrc->pNextClosable = pTab->pClosable;
-++        pTab->pClosable = pSrc;
-++      }
-++      unionCloseSources(pTab, pTab->nMaxOpen);
-++    }
-+   }
-+   return rc;
-+ }
-+@@ -393,10 +632,11 @@ static int unionSourceCheck(UnionTab *pTab, char **pzErr){
-+ **
-+ ** The argv[] array contains the following:
-+ **
-+-**   argv[0]   -> module name  ("unionvtab")
-++**   argv[0]   -> module name  ("unionvtab" or "swarmvtab")
-+ **   argv[1]   -> database name
-+ **   argv[2]   -> table name
-+ **   argv[3]   -> SQL statement
-++**   argv[4]   -> not-found callback UDF name
-+ */
-+ static int unionConnect(
-+   sqlite3 *db,
-+@@ -407,14 +647,15 @@ static int unionConnect(
-+ ){
-+   UnionTab *pTab = 0;
-+   int rc = SQLITE_OK;
-++  int bSwarm = (pAux==0 ? 0 : 1);
-++  const char *zVtab = (bSwarm ? "swarmvtab" : "unionvtab");
-+ 
-+-  (void)pAux;   /* Suppress harmless 'unused parameter' warning */
-+   if( sqlite3_stricmp("temp", argv[1]) ){
-+     /* unionvtab tables may only be created in the temp schema */
-+-    *pzErr = sqlite3_mprintf("unionvtab tables must be created in TEMP schema");
-++    *pzErr = sqlite3_mprintf("%s tables must be created in TEMP schema", zVtab);
-+     rc = SQLITE_ERROR;
-+-  }else if( argc!=4 ){
-+-    *pzErr = sqlite3_mprintf("wrong number of arguments for unionvtab");
-++  }else if( argc!=4 && argc!=5 ){
-++    *pzErr = sqlite3_mprintf("wrong number of arguments for %s", zVtab);
-+     rc = SQLITE_ERROR;
-+   }else{
-+     int nAlloc = 0;               /* Allocated size of pTab->aSrc[] */
-+@@ -464,30 +705,60 @@ static int unionConnect(
-+         rc = SQLITE_ERROR;
-+       }
-+ 
-+-      pSrc = &pTab->aSrc[pTab->nSrc++];
-+-      pSrc->zDb = unionStrdup(&rc, zDb);
-+-      pSrc->zTab = unionStrdup(&rc, zTab);
-+-      pSrc->iMin = iMin;
-+-      pSrc->iMax = iMax;
-++      if( rc==SQLITE_OK ){
-++        pSrc = &pTab->aSrc[pTab->nSrc++];
-++        pSrc->zTab = unionStrdup(&rc, zTab);
-++        pSrc->iMin = iMin;
-++        pSrc->iMax = iMax;
-++        if( bSwarm ){
-++          pSrc->zFile = unionStrdup(&rc, zDb);
-++        }else{
-++          pSrc->zDb = unionStrdup(&rc, zDb);
-++        }
-++      }
-+     }
-+-    unionFinalize(&rc, pStmt);
-++    unionFinalize(&rc, pStmt, pzErr);
-+     pStmt = 0;
-+ 
-+-    /* Verify that all source tables exist and have compatible schemas. */
-++    /* Capture the not-found callback UDF name */
-++    if( rc==SQLITE_OK && argc>=5 ){
-++      pTab->zNotFoundCallback = unionStrdup(&rc, argv[4]);
-++      unionDequote(pTab->zNotFoundCallback);
-++    }
-++
-++    /* It is an error if the SELECT statement returned zero rows. If only
-++    ** because there is no way to determine the schema of the virtual
-++    ** table in this case.  */
-++    if( rc==SQLITE_OK && pTab->nSrc==0 ){
-++      *pzErr = sqlite3_mprintf("no source tables configured");
-++      rc = SQLITE_ERROR;
-++    }
-++
-++    /* For unionvtab, verify that all source tables exist and have
-++    ** compatible schemas. For swarmvtab, attach the first database and
-++    ** check that the first table is a rowid table only.  */
-+     if( rc==SQLITE_OK ){
-+       pTab->db = db;
-+-      rc = unionSourceCheck(pTab, pzErr);
-++      pTab->bSwarm = bSwarm;
-++      pTab->nMaxOpen = SWARMVTAB_MAX_OPEN;
-++      if( bSwarm ){
-++        rc = unionOpenDatabase(pTab, 0, pzErr);
-++      }else{
-++        rc = unionSourceCheck(pTab, pzErr);
-++      }
-+     }
-+ 
-+     /* Compose a CREATE TABLE statement and pass it to declare_vtab() */
-+     if( rc==SQLITE_OK ){
-+-      pStmt = unionPreparePrintf(&rc, pzErr, db, "SELECT "
-++      UnionSrc *pSrc = &pTab->aSrc[0];
-++      sqlite3 *tdb = unionGetDb(pTab, pSrc);
-++      pStmt = unionPreparePrintf(&rc, pzErr, tdb, "SELECT "
-+           "'CREATE TABLE xyz('"
-+           "    || group_concat(quote(name) || ' ' || type, ', ')"
-+           "    || ')',"
-+           "max((cid+1) * (type='INTEGER' COLLATE nocase AND pk=1))-1 "
-+           "FROM pragma_table_info(%Q, ?)",
-+-          pTab->aSrc[0].zTab, pTab->aSrc[0].zDb
-++          pSrc->zTab, pSrc->zDb
-+       );
-+     }
-+     if( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pStmt) ){
-+@@ -496,7 +767,7 @@ static int unionConnect(
-+       pTab->iPK = sqlite3_column_int(pStmt, 1);
-+     }
-+ 
-+-    unionFinalize(&rc, pStmt);
-++    unionFinalize(&rc, pStmt, pzErr);
-+   }
-+ 
-+   if( rc!=SQLITE_OK ){
-+@@ -508,7 +779,6 @@ static int unionConnect(
-+   return rc;
-+ }
-+ 
-+-
-+ /*
-+ ** xOpen
-+ */
-+@@ -526,25 +796,56 @@ static int unionOpen(sqlite3_vtab *p, sqlite3_vtab_cursor **ppCursor){
-+ */
-+ static int unionClose(sqlite3_vtab_cursor *cur){
-+   UnionCsr *pCsr = (UnionCsr*)cur;
-+-  sqlite3_finalize(pCsr->pStmt);
-++  unionFinalizeCsrStmt(pCsr);
-+   sqlite3_free(pCsr);
-+   return SQLITE_OK;
-+ }
-+ 
-++/*
-++** This function does the work of the xNext() method. Except that, if it
-++** returns SQLITE_ROW, it should be called again within the same xNext()
-++** method call. See unionNext() for details.
-++*/
-++static int doUnionNext(UnionCsr *pCsr){
-++  int rc = SQLITE_OK;
-++  assert( pCsr->pStmt );
-++  if( sqlite3_step(pCsr->pStmt)!=SQLITE_ROW ){
-++    UnionTab *pTab = (UnionTab*)pCsr->base.pVtab;
-++    rc = unionFinalizeCsrStmt(pCsr);
-++    if( rc==SQLITE_OK && pTab->bSwarm ){
-++      pCsr->iTab++;
-++      if( pCsr->iTab<pTab->nSrc ){
-++        UnionSrc *pSrc = &pTab->aSrc[pCsr->iTab];
-++        if( pCsr->iMaxRowid>=pSrc->iMin ){
-++          /* It is necessary to scan the next table. */
-++          rc = unionOpenDatabase(pTab, pCsr->iTab, &pTab->base.zErrMsg);
-++          pCsr->pStmt = unionPreparePrintf(&rc, &pTab->base.zErrMsg, pSrc->db,
-++              "SELECT rowid, * FROM %Q %s %lld",
-++              pSrc->zTab,
-++              (pSrc->iMax>pCsr->iMaxRowid ? "WHERE _rowid_ <=" : "-- "),
-++              pCsr->iMaxRowid
-++          );
-++          if( rc==SQLITE_OK ){
-++            assert( pCsr->pStmt );
-++            unionIncrRefcount(pTab, pCsr->iTab);
-++            rc = SQLITE_ROW;
-++          }
-++        }
-++      }
-++    }
-++  }
-++
-++  return rc;
-++}
-+ 
-+ /*
-+ ** xNext
-+ */
-+ static int unionNext(sqlite3_vtab_cursor *cur){
-+-  UnionCsr *pCsr = (UnionCsr*)cur;
-+   int rc;
-+-  assert( pCsr->pStmt );
-+-  if( sqlite3_step(pCsr->pStmt)!=SQLITE_ROW ){
-+-    rc = sqlite3_finalize(pCsr->pStmt);
-+-    pCsr->pStmt = 0;
-+-  }else{
-+-    rc = SQLITE_OK;
-+-  }
-++  do {
-++    rc = doUnionNext((UnionCsr*)cur);
-++  }while( rc==SQLITE_ROW );
-+   return rc;
-+ }
-+ 
-+@@ -637,8 +938,7 @@ static int unionFilter(
-+     }
-+   }
-+ 
-+-  sqlite3_finalize(pCsr->pStmt);
-+-  pCsr->pStmt = 0;
-++  unionFinalizeCsrStmt(pCsr);
-+   if( bZero ){
-+     return SQLITE_OK;
-+   }
-+@@ -674,12 +974,25 @@ static int unionFilter(
-+         zSql = sqlite3_mprintf("%z %s rowid<=%lld", zSql, zWhere, iMax);
-+       }
-+     }
-+-  }
-+ 
-++    if( pTab->bSwarm ){
-++      pCsr->iTab = i;
-++      pCsr->iMaxRowid = iMax;
-++      rc = unionOpenDatabase(pTab, i, &pTab->base.zErrMsg);
-++      break;
-++    }
-++  }
-+ 
-+-  if( zSql==0 ) return rc;
-+-  pCsr->pStmt = unionPrepare(&rc, pTab->db, zSql, &pTab->base.zErrMsg);
-+-  sqlite3_free(zSql);
-++  if( zSql==0 ){
-++    return rc;
-++  }else{
-++    sqlite3 *db = unionGetDb(pTab, &pTab->aSrc[pCsr->iTab]);
-++    pCsr->pStmt = unionPrepare(&rc, db, zSql, &pTab->base.zErrMsg);
-++    if( pCsr->pStmt ){
-++      unionIncrRefcount(pTab, pCsr->iTab);
-++    }
-++    sqlite3_free(zSql);
-++  }
-+   if( rc!=SQLITE_OK ) return rc;
-+   return unionNext(pVtabCursor);
-+ }
-+@@ -791,8 +1104,13 @@ static int createUnionVtab(sqlite3 *db){
-+     0,                            /* xRelease */
-+     0                             /* xRollbackTo */
-+   };
-++  int rc;
-+ 
-+-  return sqlite3_create_module(db, "unionvtab", &unionModule, 0);
-++  rc = sqlite3_create_module(db, "unionvtab", &unionModule, 0);
-++  if( rc==SQLITE_OK ){
-++    rc = sqlite3_create_module(db, "swarmvtab", &unionModule, (void*)db);
-++  }
-++  return rc;
-+ }
-+ 
-+ #endif /* SQLITE_OMIT_VIRTUALTABLE */
-+diff --git a/third_party/sqlite/src/ext/misc/vtablog.c b/third_party/sqlite/src/ext/misc/vtablog.c
-+new file mode 100644
-+index 0000000..e183906
-+--- /dev/null
-++++ b/third_party/sqlite/src/ext/misc/vtablog.c
-+@@ -0,0 +1,509 @@
-++/*
-++** 2017-08-10
-++**
-++** The author disclaims copyright to this source code.  In place of
-++** a legal notice, here is a blessing:
-++**
-++**    May you do good and not evil.
-++**    May you find forgiveness for yourself and forgive others.
-++**    May you share freely, never taking more than you give.
-++**
-++*************************************************************************
-++**
-++** This file implements a virtual table that prints diagnostic information
-++** on stdout when its key interfaces are called.  This is intended for
-++** interactive analysis and debugging of virtual table interfaces.
-++**
-++** Usage example:
-++**
-++**     .load ./vtablog
-++**     CREATE VIRTUAL TABLE temp.log USING vtablog(
-++**        schema='CREATE TABLE x(a,b,c)',
-++**        rows=25
-++**     );
-++**     SELECT * FROM log;
-++*/
-++#include "sqlite3ext.h"
-++SQLITE_EXTENSION_INIT1
-++#include <stdio.h>
-++#include <stdlib.h>
-++#include <assert.h>
-++#include <string.h>
-++#include <ctype.h>
-++
-++
-++/* vtablog_vtab is a subclass of sqlite3_vtab which will
-++** serve as the underlying representation of a vtablog virtual table
-++*/
-++typedef struct vtablog_vtab vtablog_vtab;
-++struct vtablog_vtab {
-++  sqlite3_vtab base;  /* Base class - must be first */
-++  int nRow;           /* Number of rows in the table */
-++  int iInst;          /* Instance number for this vtablog table */
-++  int nCursor;        /* Number of cursors created */
-++};
-++
-++/* vtablog_cursor is a subclass of sqlite3_vtab_cursor which will
-++** serve as the underlying representation of a cursor that scans
-++** over rows of the result
-++*/
-++typedef struct vtablog_cursor vtablog_cursor;
-++struct vtablog_cursor {
-++  sqlite3_vtab_cursor base;  /* Base class - must be first */
-++  int iCursor;               /* Cursor number */
-++  sqlite3_int64 iRowid;      /* The rowid */
-++};
-++
-++/* Skip leading whitespace.  Return a pointer to the first non-whitespace
-++** character, or to the zero terminator if the string has only whitespace */
-++static const char *vtablog_skip_whitespace(const char *z){
-++  while( isspace((unsigned char)z[0]) ) z++;
-++  return z;
-++}
-++
-++/* Remove trailing whitespace from the end of string z[] */
-++static void vtablog_trim_whitespace(char *z){
-++  size_t n = strlen(z);
-++  while( n>0 && isspace((unsigned char)z[n]) ) n--;
-++  z[n] = 0;
-++}
-++
-++/* Dequote the string */
-++static void vtablog_dequote(char *z){
-++  int j;
-++  char cQuote = z[0];
-++  size_t i, n;
-++
-++  if( cQuote!='\'' && cQuote!='"' ) return;
-++  n = strlen(z);
-++  if( n<2 || z[n-1]!=z[0] ) return;
-++  for(i=1, j=0; i<n-1; i++){
-++    if( z[i]==cQuote && z[i+1]==cQuote ) i++;
-++    z[j++] = z[i];
-++  }
-++  z[j] = 0;
-++}
-++
-++/* Check to see if the string is of the form:  "TAG = VALUE" with optional
-++** whitespace before and around tokens.  If it is, return a pointer to the
-++** first character of VALUE.  If it is not, return NULL.
-++*/
-++static const char *vtablog_parameter(const char *zTag, int nTag, const char *z){
-++  z = vtablog_skip_whitespace(z);
-++  if( strncmp(zTag, z, nTag)!=0 ) return 0;
-++  z = vtablog_skip_whitespace(z+nTag);
-++  if( z[0]!='=' ) return 0;
-++  return vtablog_skip_whitespace(z+1);
-++}
-++
-++/* Decode a parameter that requires a dequoted string.
-++**
-++** Return non-zero on an error.
-++*/
-++static int vtablog_string_parameter(
-++  char **pzErr,            /* Leave the error message here, if there is one */
-++  const char *zParam,      /* Parameter we are checking for */
-++  const char *zArg,        /* Raw text of the virtual table argment */
-++  char **pzVal             /* Write the dequoted string value here */
-++){
-++  const char *zValue;
-++  zValue = vtablog_parameter(zParam,(int)strlen(zParam),zArg);
-++  if( zValue==0 ) return 0;
-++  if( *pzVal ){
-++    *pzErr = sqlite3_mprintf("more than one '%s' parameter", zParam);
-++    return 1;
-++  }
-++  *pzVal = sqlite3_mprintf("%s", zValue);
-++  if( *pzVal==0 ){
-++    *pzErr = sqlite3_mprintf("out of memory");
-++    return 1;
-++  }
-++  vtablog_trim_whitespace(*pzVal);
-++  vtablog_dequote(*pzVal);
-++  return 0;
-++}
-++
-++#if 0 /* not used - yet */
-++/* Return 0 if the argument is false and 1 if it is true.  Return -1 if
-++** we cannot really tell.
-++*/
-++static int vtablog_boolean(const char *z){
-++  if( sqlite3_stricmp("yes",z)==0
-++   || sqlite3_stricmp("on",z)==0
-++   || sqlite3_stricmp("true",z)==0
-++   || (z[0]=='1' && z[1]==0)
-++  ){
-++    return 1;
-++  }
-++  if( sqlite3_stricmp("no",z)==0
-++   || sqlite3_stricmp("off",z)==0
-++   || sqlite3_stricmp("false",z)==0
-++   || (z[0]=='0' && z[1]==0)
-++  ){
-++    return 0;
-++  }
-++  return -1;
-++}
-++#endif
-++
-++/*
-++** The vtablogConnect() method is invoked to create a new
-++** vtablog_vtab that describes the vtablog virtual table.
-++**
-++** Think of this routine as the constructor for vtablog_vtab objects.
-++**
-++** All this routine needs to do is:
-++**
-++**    (1) Allocate the vtablog_vtab object and initialize all fields.
-++**
-++**    (2) Tell SQLite (via the sqlite3_declare_vtab() interface) what the
-++**        result set of queries against vtablog will look like.
-++*/
-++static int vtablogConnectCreate(
-++  sqlite3 *db,
-++  void *pAux,
-++  int argc, const char *const*argv,
-++  sqlite3_vtab **ppVtab,
-++  char **pzErr,
-++  int isCreate
-++){
-++  static int nInst = 0;
-++  vtablog_vtab *pNew;
-++  int i;
-++  int rc;
-++  int iInst = ++nInst;
-++  char *zSchema = 0;
-++  char *zNRow = 0;
-++
-++  printf("vtablog%s(tab=%d):\n", isCreate ? "Create" : "Connect", iInst);
-++  printf("  argc=%d\n", argc);
-++  for(i=0; i<argc; i++){
-++    printf("  argv[%d] = ", i);
-++    if( argv[i] ){
-++      printf("[%s]\n", argv[i]);
-++    }else{
-++      printf("NULL\n");
-++    }
-++  }
-++
-++  for(i=3; i<argc; i++){
-++    const char *z = argv[i];
-++    if( vtablog_string_parameter(pzErr, "schema", z, &zSchema) ){
-++      return SQLITE_ERROR;
-++    }
-++    if( vtablog_string_parameter(pzErr, "rows", z, &zNRow) ){
-++      return SQLITE_ERROR;
-++    }
-++  }
-++
-++  if( zSchema==0 ){
-++    *pzErr = sqlite3_mprintf("no schema defined");
-++    return SQLITE_ERROR;
-++  }
-++  rc = sqlite3_declare_vtab(db, zSchema);
-++  if( rc==SQLITE_OK ){
-++    pNew = sqlite3_malloc( sizeof(*pNew) );
-++    *ppVtab = (sqlite3_vtab*)pNew;
-++    if( pNew==0 ) return SQLITE_NOMEM;
-++    memset(pNew, 0, sizeof(*pNew));
-++    pNew->nRow = 10;
-++    if( zNRow ) pNew->nRow = atoi(zNRow);
-++    pNew->iInst = iInst;
-++  }
-++  return rc;
-++}
-++static int vtablogCreate(
-++  sqlite3 *db,
-++  void *pAux,
-++  int argc, const char *const*argv,
-++  sqlite3_vtab **ppVtab,
-++  char **pzErr
-++){
-++  return vtablogConnectCreate(db,pAux,argc,argv,ppVtab,pzErr,1);
-++}
-++static int vtablogConnect(
-++  sqlite3 *db,
-++  void *pAux,
-++  int argc, const char *const*argv,
-++  sqlite3_vtab **ppVtab,
-++  char **pzErr
-++){
-++  return vtablogConnectCreate(db,pAux,argc,argv,ppVtab,pzErr,0);
-++}
-++
-++
-++/*
-++** This method is the destructor for vtablog_cursor objects.
-++*/
-++static int vtablogDisconnect(sqlite3_vtab *pVtab){
-++  vtablog_vtab *pTab = (vtablog_vtab*)pVtab;
-++  printf("vtablogDisconnect(%d)\n", pTab->iInst);
-++  sqlite3_free(pVtab);
-++  return SQLITE_OK;
-++}
-++
-++/*
-++** This method is the destructor for vtablog_cursor objects.
-++*/
-++static int vtablogDestroy(sqlite3_vtab *pVtab){
-++  vtablog_vtab *pTab = (vtablog_vtab*)pVtab;
-++  printf("vtablogDestroy(%d)\n", pTab->iInst);
-++  sqlite3_free(pVtab);
-++  return SQLITE_OK;
-++}
-++
-++/*
-++** Constructor for a new vtablog_cursor object.
-++*/
-++static int vtablogOpen(sqlite3_vtab *p, sqlite3_vtab_cursor **ppCursor){
-++  vtablog_vtab *pTab = (vtablog_vtab*)p;
-++  vtablog_cursor *pCur;
-++  printf("vtablogOpen(tab=%d, cursor=%d)\n", pTab->iInst, ++pTab->nCursor);
-++  pCur = sqlite3_malloc( sizeof(*pCur) );
-++  if( pCur==0 ) return SQLITE_NOMEM;
-++  memset(pCur, 0, sizeof(*pCur));
-++  pCur->iCursor = pTab->nCursor;
-++  *ppCursor = &pCur->base;
-++  return SQLITE_OK;
-++}
-++
-++/*
-++** Destructor for a vtablog_cursor.
-++*/
-++static int vtablogClose(sqlite3_vtab_cursor *cur){
-++  vtablog_cursor *pCur = (vtablog_cursor*)cur;
-++  vtablog_vtab *pTab = (vtablog_vtab*)cur->pVtab;
-++  printf("vtablogClose(tab=%d, cursor=%d)\n", pTab->iInst, pCur->iCursor);
-++  sqlite3_free(cur);
-++  return SQLITE_OK;
-++}
-++
-++
-++/*
-++** Advance a vtablog_cursor to its next row of output.
-++*/
-++static int vtablogNext(sqlite3_vtab_cursor *cur){
-++  vtablog_cursor *pCur = (vtablog_cursor*)cur;
-++  vtablog_vtab *pTab = (vtablog_vtab*)cur->pVtab;
-++  printf("vtablogNext(tab=%d, cursor=%d)  rowid %d -> %d\n",
-++         pTab->iInst, pCur->iCursor, (int)pCur->iRowid, (int)pCur->iRowid+1);
-++  pCur->iRowid++;
-++  return SQLITE_OK;
-++}
-++
-++/*
-++** Return values of columns for the row at which the vtablog_cursor
-++** is currently pointing.
-++*/
-++static int vtablogColumn(
-++  sqlite3_vtab_cursor *cur,   /* The cursor */
-++  sqlite3_context *ctx,       /* First argument to sqlite3_result_...() */
-++  int i                       /* Which column to return */
-++){
-++  vtablog_cursor *pCur = (vtablog_cursor*)cur;
-++  vtablog_vtab *pTab = (vtablog_vtab*)cur->pVtab;
-++  char zVal[50];
-++
-++  if( i<26 ){
-++    sqlite3_snprintf(sizeof(zVal),zVal,"%c%d",
-++                     "abcdefghijklmnopqrstuvwyz"[i], pCur->iRowid);
-++  }else{
-++    sqlite3_snprintf(sizeof(zVal),zVal,"{%d}%d", i, pCur->iRowid);
-++  }
-++  printf("vtablogColumn(tab=%d, cursor=%d, i=%d): [%s]\n",
-++         pTab->iInst, pCur->iCursor, i, zVal);
-++  sqlite3_result_text(ctx, zVal, -1, SQLITE_TRANSIENT);
-++  return SQLITE_OK;
-++}
-++
-++/*
-++** Return the rowid for the current row.  In this implementation, the
-++** rowid is the same as the output value.
-++*/
-++static int vtablogRowid(sqlite3_vtab_cursor *cur, sqlite_int64 *pRowid){
-++  vtablog_cursor *pCur = (vtablog_cursor*)cur;
-++  vtablog_vtab *pTab = (vtablog_vtab*)cur->pVtab;
-++  printf("vtablogRowid(tab=%d, cursor=%d): %d\n",
-++         pTab->iInst, pCur->iCursor, (int)pCur->iRowid);
-++  *pRowid = pCur->iRowid;
-++  return SQLITE_OK;
-++}
-++
-++/*
-++** Return TRUE if the cursor has been moved off of the last
-++** row of output.
-++*/
-++static int vtablogEof(sqlite3_vtab_cursor *cur){
-++  vtablog_cursor *pCur = (vtablog_cursor*)cur;
-++  vtablog_vtab *pTab = (vtablog_vtab*)cur->pVtab;
-++  int rc = pCur->iRowid >= pTab->nRow;
-++  printf("vtablogEof(tab=%d, cursor=%d): %d\n",
-++         pTab->iInst, pCur->iCursor, rc);
-++  return rc;
-++}
-++
-++/*
-++** Output an sqlite3_value object's value as an SQL literal.
-++*/
-++static void vtablogQuote(sqlite3_value *p){
-++  char z[50];
-++  switch( sqlite3_value_type(p) ){
-++    case SQLITE_NULL: {
-++      printf("NULL");
-++      break;
-++    }
-++    case SQLITE_INTEGER: {
-++      sqlite3_snprintf(50,z,"%lld", sqlite3_value_int64(p));
-++      printf("%s", z);
-++      break;
-++    }
-++    case SQLITE_FLOAT: {
-++      sqlite3_snprintf(50,z,"%!.20g", sqlite3_value_double(p));
-++      printf("%s", z);
-++      break;
-++    }
-++    case SQLITE_BLOB: {
-++      int n = sqlite3_value_bytes(p);
-++      const unsigned char *z = (const unsigned char*)sqlite3_value_blob(p);
-++      int i;
-++      printf("x'");
-++      for(i=0; i<n; i++) printf("%02x", z[i]);
-++      printf("'");
-++      break;
-++    }
-++    case SQLITE_TEXT: {
-++      const char *z = (const char*)sqlite3_value_text(p);
-++      int i;
-++      char c;
-++      for(i=0; (c = z[i])!=0 && c!='\''; i++){}
-++      if( c==0 ){
-++        printf("'%s'",z);
-++      }else{
-++        printf("'");
-++        while( *z ){
-++          for(i=0; (c = z[i])!=0 && c!='\''; i++){}
-++          if( c=='\'' ) i++;
-++          if( i ){
-++            printf("%.*s", i, z);
-++            z += i;
-++          }
-++          if( c=='\'' ){
-++            printf("'");
-++            continue;
-++          }
-++          if( c==0 ){
-++            break;
-++          }
-++          z++;
-++        }
-++        printf("'");
-++      }
-++      break;
-++    }
-++  }
-++}
-++
-++
-++/*
-++** This method is called to "rewind" the vtablog_cursor object back
-++** to the first row of output.  This method is always called at least
-++** once prior to any call to vtablogColumn() or vtablogRowid() or
-++** vtablogEof().
-++*/
-++static int vtablogFilter(
-++  sqlite3_vtab_cursor *cur,
-++  int idxNum, const char *idxStr,
-++  int argc, sqlite3_value **argv
-++){
-++  vtablog_cursor *pCur = (vtablog_cursor *)cur;
-++  vtablog_vtab *pTab = (vtablog_vtab*)cur->pVtab;
-++  printf("vtablogFilter(tab=%d, cursor=%d):\n", pTab->iInst, pCur->iCursor);
-++  pCur->iRowid = 0;
-++  return SQLITE_OK;
-++}
-++
-++/*
-++** SQLite will invoke this method one or more times while planning a query
-++** that uses the vtablog virtual table.  This routine needs to create
-++** a query plan for each invocation and compute an estimated cost for that
-++** plan.
-++*/
-++static int vtablogBestIndex(
-++  sqlite3_vtab *tab,
-++  sqlite3_index_info *pIdxInfo
-++){
-++  vtablog_vtab *pTab = (vtablog_vtab*)tab;
-++  printf("vtablogBestIndex(tab=%d):\n", pTab->iInst);
-++  pIdxInfo->estimatedCost = (double)500;
-++  pIdxInfo->estimatedRows = 500;
-++  return SQLITE_OK;
-++}
-++
-++/*
-++** SQLite invokes this method to INSERT, UPDATE, or DELETE content from
-++** the table.
-++**
-++** This implementation does not actually make any changes to the table
-++** content.  It merely logs the fact that the method was invoked
-++*/
-++static int vtablogUpdate(
-++  sqlite3_vtab *tab,
-++  int argc,
-++  sqlite3_value **argv,
-++  sqlite_int64 *pRowid
-++){
-++  vtablog_vtab *pTab = (vtablog_vtab*)tab;
-++  int i;
-++  printf("vtablogUpdate(tab=%d):\n", pTab->iInst);
-++  printf("  argc=%d\n", argc);
-++  for(i=0; i<argc; i++){
-++    printf("  argv[%d]=", i);
-++    vtablogQuote(argv[i]);
-++    printf("\n");
-++  }
-++  return SQLITE_OK;
-++}
-++
-++/*
-++** This following structure defines all the methods for the
-++** vtablog virtual table.
-++*/
-++static sqlite3_module vtablogModule = {
-++  0,                         /* iVersion */
-++  vtablogCreate,             /* xCreate */
-++  vtablogConnect,            /* xConnect */
-++  vtablogBestIndex,          /* xBestIndex */
-++  vtablogDisconnect,         /* xDisconnect */
-++  vtablogDestroy,            /* xDestroy */
-++  vtablogOpen,               /* xOpen - open a cursor */
-++  vtablogClose,              /* xClose - close a cursor */
-++  vtablogFilter,             /* xFilter - configure scan constraints */
-++  vtablogNext,               /* xNext - advance a cursor */
-++  vtablogEof,                /* xEof - check for end of scan */
-++  vtablogColumn,             /* xColumn - read data */
-++  vtablogRowid,              /* xRowid - read data */
-++  vtablogUpdate,             /* xUpdate */
-++  0,                         /* xBegin */
-++  0,                         /* xSync */
-++  0,                         /* xCommit */
-++  0,                         /* xRollback */
-++  0,                         /* xFindMethod */
-++  0,                         /* xRename */
-++  0,                         /* xSavepoint */
-++  0,                         /* xRelease */
-++  0,                         /* xRollbackTo */
-++};
-++
-++#ifdef _WIN32
-++__declspec(dllexport)
-++#endif
-++int sqlite3_vtablog_init(
-++  sqlite3 *db,
-++  char **pzErrMsg,
-++  const sqlite3_api_routines *pApi
-++){
-++  int rc;
-++  SQLITE_EXTENSION_INIT2(pApi);
-++  rc = sqlite3_create_module(db, "vtablog", &vtablogModule, 0);
-++  return rc;
-++}
-+diff --git a/third_party/sqlite/src/ext/rbu/rbu10.test b/third_party/sqlite/src/ext/rbu/rbu10.test
-+index 852fe27..98d6076 100644
-+--- a/third_party/sqlite/src/ext/rbu/rbu10.test
-++++ b/third_party/sqlite/src/ext/rbu/rbu10.test
-+@@ -114,7 +114,7 @@ ifcapable fts3 {
-+         INSERT INTO data_xt VALUES('a', 'b', 1, 0);
-+       }
-+     } msg] $msg
-+-  } {1 {SQLITE_ERROR - SQL logic error or missing database}}
-++  } {1 {SQLITE_ERROR - SQL logic error}}
-+ }
-+ 
-+ #--------------------------------------------------------------------
-+diff --git a/third_party/sqlite/src/ext/rbu/rbufault.test b/third_party/sqlite/src/ext/rbu/rbufault.test
-+index c00f501..c7fb057 100644
-+--- a/third_party/sqlite/src/ext/rbu/rbufault.test
-++++ b/third_party/sqlite/src/ext/rbu/rbufault.test
-+@@ -125,7 +125,7 @@ foreach {tn2 setup sql expect} {
-+       {1 SQLITE_IOERR_WRITE}
-+       {1 SQLITE_IOERR_READ}
-+       {1 SQLITE_IOERR_FSYNC}
-+-      {1 {SQLITE_ERROR - SQL logic error or missing database}}
-++      {1 {SQLITE_ERROR - SQL logic error}}
-+       {1 {SQLITE_ERROR - unable to open database: rbu.db}}
-+       {1 {SQLITE_IOERR - unable to open database: rbu.db}}
-+     }
-+diff --git a/third_party/sqlite/src/ext/rbu/rbufault3.test b/third_party/sqlite/src/ext/rbu/rbufault3.test
-+index 58e0451..3e8f8cc 100644
-+--- a/third_party/sqlite/src/ext/rbu/rbufault3.test
-++++ b/third_party/sqlite/src/ext/rbu/rbufault3.test
-+@@ -31,7 +31,7 @@ foreach {fault errlist} {
-+     {1 SQLITE_IOERR_READ}
-+     {1 {SQLITE_IOERR - unable to open database: test.db2}}
-+     {1 {SQLITE_ERROR - unable to open database: test.db2}}
-+-    {1 {SQLITE_ERROR - SQL logic error or missing database}}
-++    {1 {SQLITE_ERROR - SQL logic error}}
-+   }
-+ 
-+   cantopen* {
-+diff --git a/third_party/sqlite/src/ext/rbu/rbufts.test b/third_party/sqlite/src/ext/rbu/rbufts.test
-+index d067de1..dd41482 100644
-+--- a/third_party/sqlite/src/ext/rbu/rbufts.test
-++++ b/third_party/sqlite/src/ext/rbu/rbufts.test
-+@@ -119,14 +119,14 @@ do_test 3.2 {
-+     CREATE TABLE data_ft(x, rbu_rowid, rbu_control);
-+     INSERT INTO data_ft VALUES(NULL, 2, 1);
-+   } } msg] $msg]
-+-} {1 {SQLITE_ERROR - SQL logic error or missing database]}}
-++} {1 {SQLITE_ERROR - SQL logic error]}}
-+ 
-+ do_test 3.3 {
-+   list [catch { apply_rbu_update test.db {
-+     CREATE TABLE data_ft(x, rbu_rowid, rbu_control);
-+     INSERT INTO data_ft VALUES('7 8 9', 1, 'x');
-+   } } msg] $msg]
-+-} {1 {SQLITE_ERROR - SQL logic error or missing database]}}
-++} {1 {SQLITE_ERROR - SQL logic error]}}
-+ 
-+ 
-+ 
-+diff --git a/third_party/sqlite/src/ext/rbu/rbutemplimit.test b/third_party/sqlite/src/ext/rbu/rbutemplimit.test
-+new file mode 100644
-+index 0000000..066c61e
-+--- /dev/null
-++++ b/third_party/sqlite/src/ext/rbu/rbutemplimit.test
-+@@ -0,0 +1,129 @@
-++# 2014 August 30
-++#
-++# The author disclaims copyright to this source code.  In place of
-++# a legal notice, here is a blessing:
-++#
-++#    May you do good and not evil.
-++#    May you find forgiveness for yourself and forgive others.
-++#    May you share freely, never taking more than you give.
-++#
-++#***********************************************************************
-++#
-++
-++source [file join [file dirname [info script]] rbu_common.tcl]
-++set ::testprefix rbutemplimit
-++
-++db close
-++sqlite3_shutdown
-++sqlite3_config_uri 1
-++
-++proc setup_databases {} {
-++  forcedelete test.db2
-++  forcedelete test.db
-++  sqlite3 db test.db
-++  execsql {
-++    -- Create target database schema.
-++    --
-++    CREATE TABLE t1(a INTEGER PRIMARY KEY, b BLOB(100), c BLOB(100));
-++    CREATE TABLE t2(a INTEGER PRIMARY KEY, b BLOB(100), c BLOB(100));
-++    CREATE INDEX i1b ON t1(b);
-++    CREATE INDEX i1c ON t1(c);
-++    CREATE INDEX i2b ON t2(b);
-++    CREATE INDEX i2c ON t2(c);
-++
-++    -- Create a large RBU database.
-++    --
-++    ATTACH 'test.db2' AS rbu;
-++    CREATE TABLE rbu.data_t1(a, b, c, rbu_control);
-++    WITH s(i) AS (
-++      VALUES(1) UNION ALL SELECT i+1 FROM s WHERE i<10000
-++    )
-++    INSERT INTO data_t1 SELECT i, randomblob(100), randomblob(100), 0 FROM s;
-++    CREATE TABLE rbu.data_t2(a, b, c, rbu_control);
-++    WITH s(i) AS (
-++      VALUES(1) UNION ALL SELECT i+1 FROM s WHERE i<15000
-++    )
-++    INSERT INTO data_t2 SELECT i, randomblob(100), randomblob(100), 0 FROM s;
-++  }
-++  db close
-++}
-++
-++proc run_rbu_cachesize {target rbu cachesize temp_limit} {
-++  sqlite3rbu rbu $target $rbu
-++  rbu temp_size_limit $temp_limit
-++  sqlite3_exec_nr [rbu db 1] "PRAGMA cache_size = $cachesize"
-++  while 1 {
-++    set rc [rbu step]
-++    set ::A([rbu temp_size]) 1
-++    if {$rc!="SQLITE_OK"} break
-++  }
-++  list [catch {rbu close} msg] $msg
-++}
-++
-++proc step_rbu_cachesize {target rbu stepsize cachesize temp_limit} {
-++  set res ""
-++  while 1 {
-++    sqlite3rbu rbu $target $rbu
-++    rbu temp_size_limit $temp_limit
-++    sqlite3_exec_nr [rbu db 1] "PRAGMA cache_size = $cachesize"
-++    for {set i 0} {$i < $stepsize} {incr i} {
-++      set rc [rbu step]
-++      set ::A([rbu temp_size]) 1
-++      if {$rc!="SQLITE_OK"} break
-++    }
-++    set res [list [catch {rbu close} msg] $msg]
-++    if {$res != "0 SQLITE_OK"} break
-++  }
-++  set res
-++}
-++
-++do_test 1.1.0 { setup_databases } {}
-++
-++do_test 1.1.1 {
-++  unset -nocomplain ::A
-++  run_rbu_cachesize test.db test.db2 10 0
-++} {0 SQLITE_DONE}
-++
-++do_test 1.1.2 { llength [array names ::A] } 3
-++
-++do_test 1.1.3 {
-++  foreach {a0 a1 a2} [lsort -integer [array names ::A]] {}
-++  list [expr $a0==0]                         \
-++       [expr $a1>1048576] [expr $a1<1200000] \
-++       [expr $a2>1500000] [expr $a2<1700000]
-++} {1 1 1 1 1}
-++
-++do_test 1.2.1 {
-++  setup_databases
-++  run_rbu_cachesize test.db test.db2 10 1000000
-++} {1 SQLITE_FULL}
-++do_test 1.2.2 { info commands rbu } {}
-++
-++do_test 1.3.1 {
-++  setup_databases
-++  run_rbu_cachesize test.db test.db2 10 1300000
-++} {1 SQLITE_FULL}
-++do_test 1.3.2 { info commands rbu } {}
-++
-++do_test 1.4.1 {
-++  setup_databases
-++  run_rbu_cachesize test.db test.db2 10 1800000
-++} {0 SQLITE_DONE}
-++do_test 1.4.2 { info commands rbu } {}
-++
-++do_test 1.5.1 {
-++  setup_databases
-++  unset -nocomplain ::A
-++  step_rbu_cachesize test.db test.db2 1000 10 2400000
-++} {0 SQLITE_DONE}
-++do_test 1.5.2 { info commands rbu } {}
-++
-++do_test 1.6.1 {
-++  setup_databases
-++  unset -nocomplain ::A
-++  step_rbu_cachesize test.db test.db2 1000 10 1400000
-++} {1 SQLITE_FULL}
-++do_test 1.6.2 { info commands rbu } {}
-++
-++finish_test
-++
-+diff --git a/third_party/sqlite/src/ext/rbu/sqlite3rbu.c b/third_party/sqlite/src/ext/rbu/sqlite3rbu.c
-+index ccba0f1..361d335 100644
-+--- a/third_party/sqlite/src/ext/rbu/sqlite3rbu.c
-++++ b/third_party/sqlite/src/ext/rbu/sqlite3rbu.c
-+@@ -96,6 +96,13 @@
-+ /* Maximum number of prepared UPDATE statements held by this module */
-+ #define SQLITE_RBU_UPDATE_CACHESIZE 16
-+ 
-++/* Delta checksums disabled by default.  Compile with -DRBU_ENABLE_DELTA_CKSUM
-++** to enable checksum verification.
-++*/
-++#ifndef RBU_ENABLE_DELTA_CKSUM
-++# define RBU_ENABLE_DELTA_CKSUM 0
-++#endif
-++
-+ /*
-+ ** Swap two objects of type TYPE.
-+ */
-+@@ -371,6 +378,8 @@ struct sqlite3rbu {
-+   int pgsz;
-+   u8 *aBuf;
-+   i64 iWalCksum;
-++  i64 szTemp;                     /* Current size of all temp files in use */
-++  i64 szTempLimit;                /* Total size limit for temp files */
-+ 
-+   /* Used in RBU vacuum mode only */
-+   int nRbu;                       /* Number of RBU VFS in the stack */
-+@@ -379,23 +388,33 @@ struct sqlite3rbu {
-+ 
-+ /*
-+ ** An rbu VFS is implemented using an instance of this structure.
-++**
-++** Variable pRbu is only non-NULL for automatically created RBU VFS objects.
-++** It is NULL for RBU VFS objects created explicitly using
-++** sqlite3rbu_create_vfs(). It is used to track the total amount of temp
-++** space used by the RBU handle.
-+ */
-+ struct rbu_vfs {
-+   sqlite3_vfs base;               /* rbu VFS shim methods */
-+   sqlite3_vfs *pRealVfs;          /* Underlying VFS */
-+   sqlite3_mutex *mutex;           /* Mutex to protect pMain */
-++  sqlite3rbu *pRbu;               /* Owner RBU object */
-+   rbu_file *pMain;                /* Linked list of main db files */
-+ };
-+ 
-+ /*
-+ ** Each file opened by an rbu VFS is represented by an instance of
-+ ** the following structure.
-++**
-++** If this is a temporary file (pRbu!=0 && flags&DELETE_ON_CLOSE), variable
-++** "sz" is set to the current size of the database file.
-+ */
-+ struct rbu_file {
-+   sqlite3_file base;              /* sqlite3_file methods */
-+   sqlite3_file *pReal;            /* Underlying file handle */
-+   rbu_vfs *pRbuVfs;               /* Pointer to the rbu_vfs object */
-+   sqlite3rbu *pRbu;               /* Pointer to rbu object (rbu target only) */
-++  i64 sz;                         /* Size of file in bytes (temp only) */
-+ 
-+   int openFlags;                  /* Flags this file was opened with */
-+   u32 iCookie;                    /* Cookie value for main db files */
-+@@ -458,6 +477,7 @@ static unsigned int rbuDeltaGetInt(const char **pz, int *pLen){
-+   return v;
-+ }
-+ 
-++#if RBU_ENABLE_DELTA_CKSUM
-+ /*
-+ ** Compute a 32-bit checksum on the N-byte buffer.  Return the result.
-+ */
-+@@ -492,6 +512,7 @@ static unsigned int rbuDeltaChecksum(const char *zIn, size_t N){
-+   }
-+   return sum3;
-+ }
-++#endif
-+ 
-+ /*
-+ ** Apply a delta.
-+@@ -522,7 +543,7 @@ static int rbuDeltaApply(
-+ ){
-+   unsigned int limit;
-+   unsigned int total = 0;
-+-#ifndef FOSSIL_OMIT_DELTA_CKSUM_TEST
-++#if RBU_ENABLE_DELTA_CKSUM
-+   char *zOrigOut = zOut;
-+ #endif
-+ 
-+@@ -577,7 +598,7 @@ static int rbuDeltaApply(
-+       case ';': {
-+         zDelta++; lenDelta--;
-+         zOut[0] = 0;
-+-#ifndef FOSSIL_OMIT_DELTA_CKSUM_TEST
-++#if RBU_ENABLE_DELTA_CKSUM
-+         if( cnt!=rbuDeltaChecksum(zOrigOut, total) ){
-+           /* ERROR:  bad checksum */
-+           return -1;
-+@@ -3409,6 +3430,7 @@ static void rbuCreateVfs(sqlite3rbu *p){
-+     sqlite3_vfs *pVfs = sqlite3_vfs_find(zRnd);
-+     assert( pVfs );
-+     p->zVfsName = pVfs->zName;
-++    ((rbu_vfs*)pVfs)->pRbu = p;
-+   }
-+ }
-+ 
-+@@ -3781,6 +3803,7 @@ int sqlite3rbu_close(sqlite3rbu *p, char **pzErrmsg){
-+     /* Close the open database handle and VFS object. */
-+     sqlite3_close(p->dbRbu);
-+     sqlite3_close(p->dbMain);
-++    assert( p->szTemp==0 );
-+     rbuDeleteVfs(p);
-+     sqlite3_free(p->aBuf);
-+     sqlite3_free(p->aFrame);
-+@@ -3968,6 +3991,7 @@ int sqlite3rbu_savestate(sqlite3rbu *p){
-+ */
-+ 
-+ static void rbuUnlockShm(rbu_file *p){
-++  assert( p->openFlags & SQLITE_OPEN_MAIN_DB );
-+   if( p->pRbu ){
-+     int (*xShmLock)(sqlite3_file*,int,int,int) = p->pReal->pMethods->xShmLock;
-+     int i;
-+@@ -3981,6 +4005,18 @@ static void rbuUnlockShm(rbu_file *p){
-+ }
-+ 
-+ /*
-++*/
-++static int rbuUpdateTempSize(rbu_file *pFd, sqlite3_int64 nNew){
-++  sqlite3rbu *pRbu = pFd->pRbu;
-++  i64 nDiff = nNew - pFd->sz;
-++  pRbu->szTemp += nDiff;
-++  pFd->sz = nNew;
-++  assert( pRbu->szTemp>=0 );
-++  if( pRbu->szTempLimit && pRbu->szTemp>pRbu->szTempLimit ) return SQLITE_FULL;
-++  return SQLITE_OK;
-++}
-++
-++/*
-+ ** Close an rbu file.
-+ */
-+ static int rbuVfsClose(sqlite3_file *pFile){
-+@@ -4005,6 +4041,9 @@ static int rbuVfsClose(sqlite3_file *pFile){
-+     rbuUnlockShm(p);
-+     p->pReal->pMethods->xShmUnmap(p->pReal, 0);
-+   }
-++  else if( (p->openFlags & SQLITE_OPEN_DELETEONCLOSE) && p->pRbu ){
-++    rbuUpdateTempSize(p, 0);
-++  }
-+ 
-+   /* Close the underlying file handle */
-+   rc = p->pReal->pMethods->xClose(p->pReal);
-+@@ -4122,11 +4161,19 @@ static int rbuVfsWrite(
-+     assert( p->openFlags & SQLITE_OPEN_MAIN_DB );
-+     rc = rbuCaptureDbWrite(p->pRbu, iOfst);
-+   }else{
-+-    if( pRbu && pRbu->eStage==RBU_STAGE_OAL
-+-     && (p->openFlags & SQLITE_OPEN_WAL)
-+-     && iOfst>=pRbu->iOalSz
-+-    ){
-+-      pRbu->iOalSz = iAmt + iOfst;
-++    if( pRbu ){
-++      if( pRbu->eStage==RBU_STAGE_OAL
-++       && (p->openFlags & SQLITE_OPEN_WAL)
-++       && iOfst>=pRbu->iOalSz
-++      ){
-++        pRbu->iOalSz = iAmt + iOfst;
-++      }else if( p->openFlags & SQLITE_OPEN_DELETEONCLOSE ){
-++        i64 szNew = iAmt+iOfst;
-++        if( szNew>p->sz ){
-++          rc = rbuUpdateTempSize(p, szNew);
-++          if( rc!=SQLITE_OK ) return rc;
-++        }
-++      }
-+     }
-+     rc = p->pReal->pMethods->xWrite(p->pReal, zBuf, iAmt, iOfst);
-+     if( rc==SQLITE_OK && iOfst==0 && (p->openFlags & SQLITE_OPEN_MAIN_DB) ){
-+@@ -4145,6 +4192,10 @@ static int rbuVfsWrite(
-+ */
-+ static int rbuVfsTruncate(sqlite3_file *pFile, sqlite_int64 size){
-+   rbu_file *p = (rbu_file*)pFile;
-++  if( (p->openFlags & SQLITE_OPEN_DELETEONCLOSE) && p->pRbu ){
-++    int rc = rbuUpdateTempSize(p, size);
-++    if( rc!=SQLITE_OK ) return rc;
-++  }
-+   return p->pReal->pMethods->xTruncate(p->pReal, size);
-+ }
-+ 
-+@@ -4534,6 +4585,8 @@ static int rbuVfsOpen(
-+         pDb->pWalFd = pFd;
-+       }
-+     }
-++  }else{
-++    pFd->pRbu = pRbuVfs->pRbu;
-+   }
-+ 
-+   if( oflags & SQLITE_OPEN_MAIN_DB
-+@@ -4610,7 +4663,9 @@ static int rbuVfsAccess(
-+       if( *pResOut ){
-+         rc = SQLITE_CANTOPEN;
-+       }else{
-+-        *pResOut = 1;
-++        sqlite3_int64 sz = 0;
-++        rc = rbuVfsFileSize(&pDb->base, &sz);
-++        *pResOut = (sz>0);
-+       }
-+     }
-+   }
-+@@ -4799,6 +4854,20 @@ int sqlite3rbu_create_vfs(const char *zName, const char *zParent){
-+   return rc;
-+ }
-+ 
-++/*
-++** Configure the aggregate temp file size limit for this RBU handle.
-++*/
-++sqlite3_int64 sqlite3rbu_temp_size_limit(sqlite3rbu *pRbu, sqlite3_int64 n){
-++  if( n>=0 ){
-++    pRbu->szTempLimit = n;
-++  }
-++  return pRbu->szTempLimit;
-++}
-++
-++sqlite3_int64 sqlite3rbu_temp_size(sqlite3rbu *pRbu){
-++  return pRbu->szTemp;
-++}
-++
-+ 
-+ /**************************************************************************/
-+ 
-+diff --git a/third_party/sqlite/src/ext/rbu/sqlite3rbu.h b/third_party/sqlite/src/ext/rbu/sqlite3rbu.h
-+index 29c1028..07b8685 100644
-+--- a/third_party/sqlite/src/ext/rbu/sqlite3rbu.h
-++++ b/third_party/sqlite/src/ext/rbu/sqlite3rbu.h
-+@@ -308,7 +308,7 @@ typedef struct sqlite3rbu sqlite3rbu;
-+ ** not work out of the box with zipvfs. Refer to the comment describing
-+ ** the zipvfs_create_vfs() API below for details on using RBU with zipvfs.
-+ */
-+-sqlite3rbu *sqlite3rbu_open(
-++SQLITE_API sqlite3rbu *sqlite3rbu_open(
-+   const char *zTarget,
-+   const char *zRbu,
-+   const char *zState
-+@@ -347,12 +347,34 @@ sqlite3rbu *sqlite3rbu_open(
-+ ** a description of the complications associated with using RBU with
-+ ** zipvfs databases.
-+ */
-+-sqlite3rbu *sqlite3rbu_vacuum(
-++SQLITE_API sqlite3rbu *sqlite3rbu_vacuum(
-+   const char *zTarget,
-+   const char *zState
-+ );
-+ 
-+ /*
-++** Configure a limit for the amount of temp space that may be used by
-++** the RBU handle passed as the first argument. The new limit is specified
-++** in bytes by the second parameter. If it is positive, the limit is updated.
-++** If the second parameter to this function is passed zero, then the limit
-++** is removed entirely. If the second parameter is negative, the limit is
-++** not modified (this is useful for querying the current limit).
-++**
-++** In all cases the returned value is the current limit in bytes (zero
-++** indicates unlimited).
-++**
-++** If the temp space limit is exceeded during operation, an SQLITE_FULL
-++** error is returned.
-++*/
-++SQLITE_API sqlite3_int64 sqlite3rbu_temp_size_limit(sqlite3rbu*, sqlite3_int64);
-++
-++/*
-++** Return the current amount of temp file space, in bytes, currently used by
-++** the RBU handle passed as the only argument.
-++*/
-++SQLITE_API sqlite3_int64 sqlite3rbu_temp_size(sqlite3rbu*);
-++
-++/*
-+ ** Internally, each RBU connection uses a separate SQLite database
-+ ** connection to access the target and rbu update databases. This
-+ ** API allows the application direct access to these database handles.
-+@@ -383,7 +405,7 @@ sqlite3rbu *sqlite3rbu_vacuum(
-+ ** Database handles returned by this function remain valid until the next
-+ ** call to any sqlite3rbu_xxx() function other than sqlite3rbu_db().
-+ */
-+-sqlite3 *sqlite3rbu_db(sqlite3rbu*, int bRbu);
-++SQLITE_API sqlite3 *sqlite3rbu_db(sqlite3rbu*, int bRbu);
-+ 
-+ /*
-+ ** Do some work towards applying the RBU update to the target db.
-+@@ -397,7 +419,7 @@ sqlite3 *sqlite3rbu_db(sqlite3rbu*, int bRbu);
-+ ** SQLITE_OK, all subsequent calls on the same RBU handle are no-ops
-+ ** that immediately return the same value.
-+ */
-+-int sqlite3rbu_step(sqlite3rbu *pRbu);
-++SQLITE_API int sqlite3rbu_step(sqlite3rbu *pRbu);
-+ 
-+ /*
-+ ** Force RBU to save its state to disk.
-+@@ -409,7 +431,7 @@ int sqlite3rbu_step(sqlite3rbu *pRbu);
-+ **
-+ ** SQLITE_OK is returned if successful, or an SQLite error code otherwise.
-+ */
-+-int sqlite3rbu_savestate(sqlite3rbu *pRbu);
-++SQLITE_API int sqlite3rbu_savestate(sqlite3rbu *pRbu);
-+ 
-+ /*
-+ ** Close an RBU handle.
-+@@ -429,14 +451,14 @@ int sqlite3rbu_savestate(sqlite3rbu *pRbu);
-+ ** update has been partially applied, or SQLITE_DONE if it has been
-+ ** completely applied.
-+ */
-+-int sqlite3rbu_close(sqlite3rbu *pRbu, char **pzErrmsg);
-++SQLITE_API int sqlite3rbu_close(sqlite3rbu *pRbu, char **pzErrmsg);
-+ 
-+ /*
-+ ** Return the total number of key-value operations (inserts, deletes or
-+ ** updates) that have been performed on the target database since the
-+ ** current RBU update was started.
-+ */
-+-sqlite3_int64 sqlite3rbu_progress(sqlite3rbu *pRbu);
-++SQLITE_API sqlite3_int64 sqlite3rbu_progress(sqlite3rbu *pRbu);
-+ 
-+ /*
-+ ** Obtain permyriadage (permyriadage is to 10000 as percentage is to 100)
-+@@ -478,7 +500,7 @@ sqlite3_int64 sqlite3rbu_progress(sqlite3rbu *pRbu);
-+ ** table exists but is not correctly populated, the value of the *pnOne
-+ ** output variable during stage 1 is undefined.
-+ */
-+-void sqlite3rbu_bp_progress(sqlite3rbu *pRbu, int *pnOne, int *pnTwo);
-++SQLITE_API void sqlite3rbu_bp_progress(sqlite3rbu *pRbu, int *pnOne, int*pnTwo);
-+ 
-+ /*
-+ ** Obtain an indication as to the current stage of an RBU update or vacuum.
-+@@ -516,7 +538,7 @@ void sqlite3rbu_bp_progress(sqlite3rbu *pRbu, int *pnOne, int *pnTwo);
-+ #define SQLITE_RBU_STATE_DONE       4
-+ #define SQLITE_RBU_STATE_ERROR      5
-+ 
-+-int sqlite3rbu_state(sqlite3rbu *pRbu);
-++SQLITE_API int sqlite3rbu_state(sqlite3rbu *pRbu);
-+ 
-+ /*
-+ ** Create an RBU VFS named zName that accesses the underlying file-system
-+@@ -560,7 +582,7 @@ int sqlite3rbu_state(sqlite3rbu *pRbu);
-+ ** file-system via "rbu" all the time, even if it only uses RBU functionality
-+ ** occasionally.
-+ */
-+-int sqlite3rbu_create_vfs(const char *zName, const char *zParent);
-++SQLITE_API int sqlite3rbu_create_vfs(const char *zName, const char *zParent);
-+ 
-+ /*
-+ ** Deregister and destroy an RBU vfs created by an earlier call to
-+@@ -570,7 +592,7 @@ int sqlite3rbu_create_vfs(const char *zName, const char *zParent);
-+ ** before all database handles that use it have been closed, the results
-+ ** are undefined.
-+ */
-+-void sqlite3rbu_destroy_vfs(const char *zName);
-++SQLITE_API void sqlite3rbu_destroy_vfs(const char *zName);
-+ 
-+ #ifdef __cplusplus
-+ }  /* end of the 'extern "C"' block */
-+diff --git a/third_party/sqlite/src/ext/rbu/test_rbu.c b/third_party/sqlite/src/ext/rbu/test_rbu.c
-+index 9c61535..0973fba8 100644
-+--- a/third_party/sqlite/src/ext/rbu/test_rbu.c
-++++ b/third_party/sqlite/src/ext/rbu/test_rbu.c
-+@@ -69,16 +69,18 @@ static int SQLITE_TCLAPI test_sqlite3rbu_cmd(
-+     int nArg;
-+     const char *zUsage;
-+   } aCmd[] = {
-+-    {"step", 2, ""},              /* 0 */
-+-    {"close", 2, ""},             /* 1 */
-+-    {"create_rbu_delta", 2, ""},  /* 2 */
-+-    {"savestate", 2, ""},         /* 3 */
-+-    {"dbMain_eval", 3, "SQL"},    /* 4 */
-+-    {"bp_progress", 2, ""},       /* 5 */
-+-    {"db", 3, "RBU"},             /* 6 */
-+-    {"state", 2, ""},             /* 7 */
-+-    {"progress", 2, ""},          /* 8 */
-+-    {"close_no_error", 2, ""},    /* 9 */
-++    {"step", 2, ""},                 /* 0 */
-++    {"close", 2, ""},                /* 1 */
-++    {"create_rbu_delta", 2, ""},     /* 2 */
-++    {"savestate", 2, ""},            /* 3 */
-++    {"dbMain_eval", 3, "SQL"},       /* 4 */
-++    {"bp_progress", 2, ""},          /* 5 */
-++    {"db", 3, "RBU"},                /* 6 */
-++    {"state", 2, ""},                /* 7 */
-++    {"progress", 2, ""},             /* 8 */
-++    {"close_no_error", 2, ""},       /* 9 */
-++    {"temp_size_limit", 3, "LIMIT"}, /* 10 */
-++    {"temp_size", 2, ""},            /* 11 */
-+     {0,0,0}
-+   };
-+   int iCmd;
-+@@ -194,6 +196,22 @@ static int SQLITE_TCLAPI test_sqlite3rbu_cmd(
-+       break;
-+     }
-+ 
-++    case 10: /* temp_size_limit */ {
-++      sqlite3_int64 nLimit;
-++      if( Tcl_GetWideIntFromObj(interp, objv[2], &nLimit) ){
-++        ret = TCL_ERROR;
-++      }else{
-++        nLimit = sqlite3rbu_temp_size_limit(pRbu, nLimit);
-++        Tcl_SetObjResult(interp, Tcl_NewWideIntObj(nLimit));
-++      }
-++      break;
-++    }
-++    case 11: /* temp_size */ {
-++      sqlite3_int64 sz = sqlite3rbu_temp_size(pRbu);
-++      Tcl_SetObjResult(interp, Tcl_NewWideIntObj(sz));
-++      break;
-++    }
-++
-+     default: /* seems unlikely */
-+       assert( !"cannot happen" );
-+       break;
-+diff --git a/third_party/sqlite/src/ext/repair/README.md b/third_party/sqlite/src/ext/repair/README.md
-+new file mode 100644
-+index 0000000..6430581
-+--- /dev/null
-++++ b/third_party/sqlite/src/ext/repair/README.md
-+@@ -0,0 +1,16 @@
-++This folder contains extensions and utility programs intended to analyze
-++live database files, detect problems, and possibly fix them.
-++
-++As SQLite is being used on larger and larger databases, database sizes
-++are growing into the terabyte range.  At that size, hardware malfunctions
-++and/or cosmic rays will occasionally corrupt a database file.  Detecting
-++problems and fixing errors a terabyte-sized databases can take hours or days,
-++and it is undesirable to take applications that depend on the databases
-++off-line for such a long time.
-++The utilities in the folder are intended to provide mechanisms for
-++detecting and fixing problems in large databases while those databases
-++are in active use.
-++
-++The utilities and extensions in this folder are experimental and under
-++active development at the time of this writing (2017-10-12).  If and when
-++they stabilize, this README will be updated to reflect that fact.
-+diff --git a/third_party/sqlite/src/ext/repair/checkfreelist.c b/third_party/sqlite/src/ext/repair/checkfreelist.c
-+new file mode 100644
-+index 0000000..16865e6
-+--- /dev/null
-++++ b/third_party/sqlite/src/ext/repair/checkfreelist.c
-+@@ -0,0 +1,299 @@
-++/*
-++** 2017 October 11
-++**
-++** The author disclaims copyright to this source code.  In place of
-++** a legal notice, here is a blessing:
-++**
-++**    May you do good and not evil.
-++**    May you find forgiveness for yourself and forgive others.
-++**    May you share freely, never taking more than you give.
-++**
-++*************************************************************************
-++**
-++** This module exports a single C function:
-++**
-++**   int sqlite3_check_freelist(sqlite3 *db, const char *zDb);
-++**
-++** This function checks the free-list in database zDb (one of "main",
-++** "temp", etc.) and reports any errors by invoking the sqlite3_log()
-++** function. It returns SQLITE_OK if successful, or an SQLite error
-++** code otherwise. It is not an error if the free-list is corrupted but
-++** no IO or OOM errors occur.
-++**
-++** If this file is compiled and loaded as an SQLite loadable extension,
-++** it adds an SQL function "checkfreelist" to the database handle, to
-++** be invoked as follows:
-++**
-++**   SELECT checkfreelist(<database-name>);
-++**
-++** This function performs the same checks as sqlite3_check_freelist(),
-++** except that it returns all error messages as a single text value,
-++** separated by newline characters. If the freelist is not corrupted
-++** in any way, an empty string is returned.
-++**
-++** To compile this module for use as an SQLite loadable extension:
-++**
-++**   gcc -Os -fPIC -shared checkfreelist.c -o checkfreelist.so
-++*/
-++
-++#include "sqlite3ext.h"
-++SQLITE_EXTENSION_INIT1
-++
-++#ifndef SQLITE_AMALGAMATION
-++# include <string.h>
-++# include <stdio.h>
-++# include <stdlib.h>
-++# include <assert.h>
-++# define ALWAYS(X)  1
-++# define NEVER(X)   0
-++  typedef unsigned char u8;
-++  typedef unsigned short u16;
-++  typedef unsigned int u32;
-++#define get4byte(x) (        \
-++    ((u32)((x)[0])<<24) +    \
-++    ((u32)((x)[1])<<16) +    \
-++    ((u32)((x)[2])<<8) +     \
-++    ((u32)((x)[3]))          \
-++)
-++#endif
-++
-++/*
-++** Execute a single PRAGMA statement and return the integer value returned
-++** via output parameter (*pnOut).
-++**
-++** The SQL statement passed as the third argument should be a printf-style
-++** format string containing a single "%s" which will be replace by the
-++** value passed as the second argument. e.g.
-++**
-++**   sqlGetInteger(db, "main", "PRAGMA %s.page_count", pnOut)
-++**
-++** executes "PRAGMA main.page_count" and stores the results in (*pnOut).
-++*/
-++static int sqlGetInteger(
-++  sqlite3 *db,                    /* Database handle */
-++  const char *zDb,                /* Database name ("main", "temp" etc.) */
-++  const char *zFmt,               /* SQL statement format */
-++  u32 *pnOut                      /* OUT: Integer value */
-++){
-++  int rc, rc2;
-++  char *zSql;
-++  sqlite3_stmt *pStmt = 0;
-++  int bOk = 0;
-++
-++  zSql = sqlite3_mprintf(zFmt, zDb);
-++  if( zSql==0 ){
-++    rc = SQLITE_NOMEM;
-++  }else{
-++    rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, 0);
-++    sqlite3_free(zSql);
-++  }
-++
-++  if( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pStmt) ){
-++    *pnOut = (u32)sqlite3_column_int(pStmt, 0);
-++    bOk = 1;
-++  }
-++
-++  rc2 = sqlite3_finalize(pStmt);
-++  if( rc==SQLITE_OK ) rc = rc2;
-++  if( rc==SQLITE_OK && bOk==0 ) rc = SQLITE_ERROR;
-++  return rc;
-++}
-++
-++/*
-++** Argument zFmt must be a printf-style format string and must be
-++** followed by its required arguments. If argument pzOut is NULL,
-++** then the results of printf()ing the format string are passed to
-++** sqlite3_log(). Otherwise, they are appended to the string
-++** at (*pzOut).
-++*/
-++static int checkFreelistError(char **pzOut, const char *zFmt, ...){
-++  int rc = SQLITE_OK;
-++  char *zErr = 0;
-++  va_list ap;
-++
-++  va_start(ap, zFmt);
-++  zErr = sqlite3_vmprintf(zFmt, ap);
-++  if( zErr==0 ){
-++    rc = SQLITE_NOMEM;
-++  }else{
-++    if( pzOut ){
-++      *pzOut = sqlite3_mprintf("%s%z%s", *pzOut?"\n":"", *pzOut, zErr);
-++      if( *pzOut==0 ) rc = SQLITE_NOMEM;
-++    }else{
-++      sqlite3_log(SQLITE_ERROR, "checkfreelist: %s", zErr);
-++    }
-++    sqlite3_free(zErr);
-++  }
-++  va_end(ap);
-++  return rc;
-++}
-++
-++static int checkFreelist(
-++  sqlite3 *db,
-++  const char *zDb,
-++  char **pzOut
-++){
-++  /* This query returns one row for each page on the free list. Each row has
-++  ** two columns - the page number and page content.  */
-++  const char *zTrunk =
-++    "WITH freelist_trunk(i, d, n) AS ("
-++      "SELECT 1, NULL, sqlite_readint32(data, 32) "
-++      "FROM sqlite_dbpage(:1) WHERE pgno=1 "
-++        "UNION ALL "
-++      "SELECT n, data, sqlite_readint32(data) "
-++      "FROM freelist_trunk, sqlite_dbpage(:1) WHERE pgno=n "
-++    ")"
-++    "SELECT i, d FROM freelist_trunk WHERE i!=1;";
-++
-++  int rc, rc2;                    /* Return code */
-++  sqlite3_stmt *pTrunk = 0;       /* Compilation of zTrunk */
-++  u32 nPage = 0;                  /* Number of pages in db */
-++  u32 nExpected = 0;              /* Expected number of free pages */
-++  u32 nFree = 0;                  /* Number of pages on free list */
-++
-++  if( zDb==0 ) zDb = "main";
-++
-++  if( (rc = sqlGetInteger(db, zDb, "PRAGMA %s.page_count", &nPage))
-++   || (rc = sqlGetInteger(db, zDb, "PRAGMA %s.freelist_count", &nExpected))
-++  ){
-++    return rc;
-++  }
-++
-++  rc = sqlite3_prepare_v2(db, zTrunk, -1, &pTrunk, 0);
-++  if( rc!=SQLITE_OK ) return rc;
-++  sqlite3_bind_text(pTrunk, 1, zDb, -1, SQLITE_STATIC);
-++  while( rc==SQLITE_OK && sqlite3_step(pTrunk)==SQLITE_ROW ){
-++    u32 i;
-++    u32 iTrunk = (u32)sqlite3_column_int(pTrunk, 0);
-++    const u8 *aData = (const u8*)sqlite3_column_blob(pTrunk, 1);
-++    int nData = sqlite3_column_bytes(pTrunk, 1);
-++    u32 iNext = get4byte(&aData[0]);
-++    u32 nLeaf = get4byte(&aData[4]);
-++
-++    if( nLeaf>((nData/4)-2-6) ){
-++      rc = checkFreelistError(pzOut,
-++          "leaf count out of range (%d) on trunk page %d",
-++          (int)nLeaf, (int)iTrunk
-++      );
-++      nLeaf = (nData/4) - 2 - 6;
-++    }
-++
-++    nFree += 1+nLeaf;
-++    if( iNext>nPage ){
-++      rc = checkFreelistError(pzOut,
-++          "trunk page %d is out of range", (int)iNext
-++      );
-++    }
-++
-++    for(i=0; rc==SQLITE_OK && i<nLeaf; i++){
-++      u32 iLeaf = get4byte(&aData[8 + 4*i]);
-++      if( iLeaf==0 || iLeaf>nPage ){
-++        rc = checkFreelistError(pzOut,
-++            "leaf page %d is out of range (child %d of trunk page %d)",
-++            (int)iLeaf, (int)i, (int)iTrunk
-++        );
-++      }
-++    }
-++  }
-++
-++  if( rc==SQLITE_OK && nFree!=nExpected ){
-++    rc = checkFreelistError(pzOut,
-++        "free-list count mismatch: actual=%d header=%d",
-++        (int)nFree, (int)nExpected
-++    );
-++  }
-++
-++  rc2 = sqlite3_finalize(pTrunk);
-++  if( rc==SQLITE_OK ) rc = rc2;
-++  return rc;
-++}
-++
-++int sqlite3_check_freelist(sqlite3 *db, const char *zDb){
-++  return checkFreelist(db, zDb, 0);
-++}
-++
-++static void checkfreelist_function(
-++  sqlite3_context *pCtx,
-++  int nArg,
-++  sqlite3_value **apArg
-++){
-++  const char *zDb;
-++  int rc;
-++  char *zOut = 0;
-++  sqlite3 *db = sqlite3_context_db_handle(pCtx);
-++
-++  assert( nArg==1 );
-++  zDb = (const char*)sqlite3_value_text(apArg[0]);
-++  rc = checkFreelist(db, zDb, &zOut);
-++  if( rc==SQLITE_OK ){
-++    sqlite3_result_text(pCtx, zOut?zOut:"ok", -1, SQLITE_TRANSIENT);
-++  }else{
-++    sqlite3_result_error_code(pCtx, rc);
-++  }
-++
-++  sqlite3_free(zOut);
-++}
-++
-++/*
-++** An SQL function invoked as follows:
-++**
-++**   sqlite_readint32(BLOB)           -- Decode 32-bit integer from start of blob
-++*/
-++static void readint_function(
-++  sqlite3_context *pCtx,
-++  int nArg,
-++  sqlite3_value **apArg
-++){
-++  const u8 *zBlob;
-++  int nBlob;
-++  int iOff = 0;
-++  u32 iRet = 0;
-++
-++  if( nArg!=1 && nArg!=2 ){
-++    sqlite3_result_error(
-++        pCtx, "wrong number of arguments to function sqlite_readint32()", -1
-++    );
-++    return;
-++  }
-++  if( nArg==2 ){
-++    iOff = sqlite3_value_int(apArg[1]);
-++  }
-++
-++  zBlob = sqlite3_value_blob(apArg[0]);
-++  nBlob = sqlite3_value_bytes(apArg[0]);
-++
-++  if( nBlob>=(iOff+4) ){
-++    iRet = get4byte(&zBlob[iOff]);
-++  }
-++
-++  sqlite3_result_int64(pCtx, (sqlite3_int64)iRet);
-++}
-++
-++/*
-++** Register the SQL functions.
-++*/
-++static int cflRegister(sqlite3 *db){
-++  int rc = sqlite3_create_function(
-++      db, "sqlite_readint32", -1, SQLITE_UTF8, 0, readint_function, 0, 0
-++  );
-++  if( rc!=SQLITE_OK ) return rc;
-++  rc = sqlite3_create_function(
-++      db, "checkfreelist", 1, SQLITE_UTF8, 0, checkfreelist_function, 0, 0
-++  );
-++  return rc;
-++}
-++
-++/*
-++** Extension load function.
-++*/
-++#ifdef _WIN32
-++__declspec(dllexport)
-++#endif
-++int sqlite3_checkfreelist_init(
-++  sqlite3 *db,
-++  char **pzErrMsg,
-++  const sqlite3_api_routines *pApi
-++){
-++  SQLITE_EXTENSION_INIT2(pApi);
-++  return cflRegister(db);
-++}
-+diff --git a/third_party/sqlite/src/ext/rtree/rtree.c b/third_party/sqlite/src/ext/rtree/rtree.c
-+index 4ea6575..0a8adae 100644
-+--- a/third_party/sqlite/src/ext/rtree/rtree.c
-++++ b/third_party/sqlite/src/ext/rtree/rtree.c
-+@@ -2877,7 +2877,7 @@ static int rtreeDeleteRowid(Rtree *pRtree, sqlite3_int64 iDelete){
-+   int rc;                         /* Return code */
-+   RtreeNode *pLeaf = 0;           /* Leaf node containing record iDelete */
-+   int iCell;                      /* Index of iDelete cell in pLeaf */
-+-  RtreeNode *pRoot;               /* Root node of rtree structure */
-++  RtreeNode *pRoot = 0;           /* Root node of rtree structure */
-+ 
-+ 
-+   /* Obtain a reference to the root node to initialize Rtree.iDepth */
-+@@ -3438,7 +3438,7 @@ static int getNodeSize(
-+     if( rc!=SQLITE_OK ){
-+       *pzErr = sqlite3_mprintf("%s", sqlite3_errmsg(db));
-+     }else if( pRtree->iNodeSize<(512-64) ){
-+-      rc = SQLITE_CORRUPT;
-++      rc = SQLITE_CORRUPT_VTAB;
-+       *pzErr = sqlite3_mprintf("undersize RTree blobs in \"%q_node\"",
-+                                pRtree->zName);
-+     }
-+diff --git a/third_party/sqlite/src/ext/rtree/rtreeA.test b/third_party/sqlite/src/ext/rtree/rtreeA.test
-+index 6dc9609..9318463 100644
-+--- a/third_party/sqlite/src/ext/rtree/rtreeA.test
-++++ b/third_party/sqlite/src/ext/rtree/rtreeA.test
-+@@ -228,6 +228,10 @@ do_execsql_test rtreeA-7.100 {
-+ do_catchsql_test rtreeA-7.110 {
-+   SELECT * FROM t1 WHERE x1>0 AND x1<100 AND x2>0 AND x2<100;
-+ } {1 {undersize RTree blobs in "t1_node"}}
-++do_test rtreeA-7.120 {
-++  sqlite3_extended_errcode db
-++} {SQLITE_CORRUPT_VTAB}
-++
-+ 
-+ 
-+ finish_test
-+diff --git a/third_party/sqlite/src/ext/rtree/rtreeconnect.test b/third_party/sqlite/src/ext/rtree/rtreeconnect.test
-+new file mode 100644
-+index 0000000..133efbd
-+--- /dev/null
-++++ b/third_party/sqlite/src/ext/rtree/rtreeconnect.test
-+@@ -0,0 +1,56 @@
-++# 2017 August 17
-++#
-++# The author disclaims copyright to this source code.  In place of
-++# a legal notice, here is a blessing:
-++#
-++#    May you do good and not evil.
-++#    May you find forgiveness for yourself and forgive others.
-++#    May you share freely, never taking more than you give.
-++#
-++#***********************************************************************
-++#
-++# The focus of this file is testing the r-tree extension. Specifically,
-++# the impact of an SQLITE_SCHEMA error within the rtree module xConnect
-++# callback.
-++#
-++
-++
-++if {![info exists testdir]} {
-++  set testdir [file join [file dirname [info script]] .. .. test]
-++}
-++source $testdir/tester.tcl
-++set testprefix rtreeconnect
-++
-++ifcapable !rtree {
-++  finish_test
-++  return
-++}
-++
-++do_execsql_test 1.0 {
-++  CREATE VIRTUAL TABLE r1 USING rtree(id, x1, x2, y1, y2);
-++  CREATE TABLE t1(id, x1, x2, y1, y2);
-++  CREATE TABLE log(l);
-++
-++  CREATE TRIGGER tr1 AFTER INSERT ON t1 BEGIN
-++    INSERT INTO r1 VALUES(new.id, new.x1, new.x2, new.y1, new.y2);
-++    INSERT INTO log VALUES('r1: ' || new.id);
-++  END;
-++}
-++
-++db close
-++sqlite3 db  test.db
-++sqlite3 db2 test.db
-++
-++do_test 1.1 {
-++  db eval { INSERT INTO log VALUES('startup'); }
-++  db2 eval { CREATE TABLE newtable(x,y); }
-++} {}
-++
-++do_execsql_test 1.2 {
-++  INSERT INTO t1 VALUES(1, 2, 3, 4, 5);
-++}
-++
-++db2 close
-++db close
-++
-++finish_test
-+diff --git a/third_party/sqlite/src/ext/session/sqlite3session.h b/third_party/sqlite/src/ext/session/sqlite3session.h
-+index 0bb362e..b3df6d7 100644
-+--- a/third_party/sqlite/src/ext/session/sqlite3session.h
-++++ b/third_party/sqlite/src/ext/session/sqlite3session.h
-+@@ -375,8 +375,8 @@ int sqlite3session_diff(
-+ */
-+ int sqlite3session_patchset(
-+   sqlite3_session *pSession,      /* Session object */
-+-  int *pnPatchset,                /* OUT: Size of buffer at *ppChangeset */
-+-  void **ppPatchset               /* OUT: Buffer containing changeset */
-++  int *pnPatchset,                /* OUT: Size of buffer at *ppPatchset */
-++  void **ppPatchset               /* OUT: Buffer containing patchset */
-+ );
-+ 
-+ /*
-+@@ -1143,12 +1143,12 @@ int sqlite3changeset_apply(
-+ **
-+ ** <table border=1 style="margin-left:8ex;margin-right:8ex">
-+ **   <tr><th>Streaming function<th>Non-streaming equivalent</th>
-+-**   <tr><td>sqlite3changeset_apply_str<td>[sqlite3changeset_apply]
-+-**   <tr><td>sqlite3changeset_concat_str<td>[sqlite3changeset_concat]
-+-**   <tr><td>sqlite3changeset_invert_str<td>[sqlite3changeset_invert]
-+-**   <tr><td>sqlite3changeset_start_str<td>[sqlite3changeset_start]
-+-**   <tr><td>sqlite3session_changeset_str<td>[sqlite3session_changeset]
-+-**   <tr><td>sqlite3session_patchset_str<td>[sqlite3session_patchset]
-++**   <tr><td>sqlite3changeset_apply_strm<td>[sqlite3changeset_apply]
-++**   <tr><td>sqlite3changeset_concat_strm<td>[sqlite3changeset_concat]
-++**   <tr><td>sqlite3changeset_invert_strm<td>[sqlite3changeset_invert]
-++**   <tr><td>sqlite3changeset_start_strm<td>[sqlite3changeset_start]
-++**   <tr><td>sqlite3session_changeset_strm<td>[sqlite3session_changeset]
-++**   <tr><td>sqlite3session_patchset_strm<td>[sqlite3session_patchset]
-+ ** </table>
-+ **
-+ ** Non-streaming functions that accept changesets (or patchsets) as input
-+diff --git a/third_party/sqlite/src/main.mk b/third_party/sqlite/src/main.mk
-+index 908cf51..5c34a8d 100644
-+--- a/third_party/sqlite/src/main.mk
-++++ b/third_party/sqlite/src/main.mk
-+@@ -55,7 +55,8 @@ THREADLIB += $(LIBS)
-+ LIBOBJ+= vdbe.o parse.o \
-+          alter.o analyze.o attach.o auth.o \
-+          backup.o bitvec.o btmutex.o btree.o build.o \
-+-         callback.o complete.o ctime.o date.o dbstat.o delete.o expr.o \
-++         callback.o complete.o ctime.o \
-++         date.o dbpage.o dbstat.o delete.o expr.o \
-+ 	 fault.o fkey.o \
-+          fts3.o fts3_aux.o fts3_expr.o fts3_hash.o fts3_icu.o fts3_porter.o \
-+          fts3_snippet.o fts3_tokenizer.o fts3_tokenizer1.o \
-+@@ -98,6 +99,7 @@ SRC = \
-+   $(TOP)/src/complete.c \
-+   $(TOP)/src/ctime.c \
-+   $(TOP)/src/date.c \
-++  $(TOP)/src/dbpage.c \
-+   $(TOP)/src/dbstat.c \
-+   $(TOP)/src/delete.c \
-+   $(TOP)/src/expr.c \
-+@@ -148,7 +150,7 @@ SRC = \
-+   $(TOP)/src/rowset.c \
-+   $(TOP)/src/select.c \
-+   $(TOP)/src/status.c \
-+-  $(TOP)/src/shell.c \
-++  $(TOP)/src/shell.c.in \
-+   $(TOP)/src/sqlite.h.in \
-+   $(TOP)/src/sqlite3ext.h \
-+   $(TOP)/src/sqliteInt.h \
-+@@ -272,6 +274,7 @@ SRC += \
-+   opcodes.h \
-+   parse.c \
-+   parse.h \
-++  shell.c \
-+   sqlite3.h
-+ 
-+ 
-+@@ -307,6 +310,7 @@ TESTSRC = \
-+   $(TOP)/src/test_intarray.c \
-+   $(TOP)/src/test_journal.c \
-+   $(TOP)/src/test_malloc.c \
-++  $(TOP)/src/test_md5.c \
-+   $(TOP)/src/test_multiplex.c \
-+   $(TOP)/src/test_mutex.c \
-+   $(TOP)/src/test_onefile.c \
-+@@ -319,6 +323,7 @@ TESTSRC = \
-+   $(TOP)/src/test_sqllog.c \
-+   $(TOP)/src/test_superlock.c \
-+   $(TOP)/src/test_syscall.c \
-++  $(TOP)/src/test_tclsh.c \
-+   $(TOP)/src/test_tclvar.c \
-+   $(TOP)/src/test_thread.c \
-+   $(TOP)/src/test_vfs.c \
-+@@ -336,6 +341,7 @@ TESTSRC += \
-+   $(TOP)/ext/misc/fileio.c \
-+   $(TOP)/ext/misc/fuzzer.c \
-+   $(TOP)/ext/misc/ieee754.c \
-++  $(TOP)/ext/misc/mmapwarm.c \
-+   $(TOP)/ext/misc/nextchar.c \
-+   $(TOP)/ext/misc/percentile.c \
-+   $(TOP)/ext/misc/regexp.c \
-+@@ -360,6 +366,7 @@ TESTSRC2 = \
-+   $(TOP)/src/btree.c \
-+   $(TOP)/src/build.c \
-+   $(TOP)/src/date.c \
-++  $(TOP)/src/dbpage.c \
-+   $(TOP)/src/dbstat.c \
-+   $(TOP)/src/expr.c \
-+   $(TOP)/src/func.c \
-+@@ -483,6 +490,8 @@ SHELL_OPT += -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5
-+ SHELL_OPT += -DSQLITE_ENABLE_EXPLAIN_COMMENTS
-+ SHELL_OPT += -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
-+ SHELL_OPT += -DSQLITE_ENABLE_STMTVTAB
-++SHELL_OPT += -DSQLITE_ENABLE_DBPAGE_VTAB
-++SHELL_OPT += -DSQLITE_ENABLE_DBSTAT_VTAB
-+ FUZZERSHELL_OPT = -DSQLITE_ENABLE_JSON1
-+ FUZZCHECK_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MEMSYS5
-+ FUZZCHECK_OPT += -DSQLITE_MAX_MEMORY=50000000
-+@@ -499,9 +508,9 @@ libsqlite3.a:	$(LIBOBJ)
-+ 	$(AR) libsqlite3.a $(LIBOBJ)
-+ 	$(RANLIB) libsqlite3.a
-+ 
-+-sqlite3$(EXE):	$(TOP)/src/shell.c libsqlite3.a sqlite3.h
-++sqlite3$(EXE):	shell.c libsqlite3.a sqlite3.h
-+ 	$(TCCX) $(READLINE_FLAGS) -o sqlite3$(EXE) $(SHELL_OPT) \
-+-		$(TOP)/src/shell.c $(SHELL_ICU) libsqlite3.a $(LIBREADLINE) $(TLIBS) $(THREADLIB)
-++		shell.c $(SHELL_ICU) libsqlite3.a $(LIBREADLINE) $(TLIBS) $(THREADLIB)
-+ 
-+ sqldiff$(EXE):	$(TOP)/tool/sqldiff.c sqlite3.c sqlite3.h
-+ 	$(TCCX) -o sqldiff$(EXE) -DSQLITE_THREADSAFE=0 \
-+@@ -610,6 +619,11 @@ lemon:	$(TOP)/tool/lemon.c $(TOP)/tool/lempar.c
-+ 	$(BCC) -o lemon $(TOP)/tool/lemon.c
-+ 	cp $(TOP)/tool/lempar.c .
-+ 
-++# A tool to generate the source-id
-++#
-++mksourceid:	$(TOP)/tool/mksourceid.c
-++	$(BCC) -o mksourceid $(TOP)/tool/mksourceid.c
-++
-+ # Rules to build individual *.o files from generated *.c files. This
-+ # applies to:
-+ #
-+@@ -649,13 +663,23 @@ parse.c:	$(TOP)/src/parse.y lemon $(TOP)/tool/addopcodes.tcl
-+ 	mv parse.h parse.h.temp
-+ 	tclsh $(TOP)/tool/addopcodes.tcl parse.h.temp >parse.h
-+ 
-+-sqlite3.h:	$(TOP)/src/sqlite.h.in $(TOP)/manifest.uuid $(TOP)/VERSION $(TOP)/ext/rtree/sqlite3rtree.h
-++sqlite3.h:	$(TOP)/src/sqlite.h.in $(TOP)/manifest mksourceid $(TOP)/VERSION $(TOP)/ext/rtree/sqlite3rtree.h
-+ 	tclsh $(TOP)/tool/mksqlite3h.tcl $(TOP) >sqlite3.h
-+ 
-+ keywordhash.h:	$(TOP)/tool/mkkeywordhash.c
-+ 	$(BCC) -o mkkeywordhash $(OPTS) $(TOP)/tool/mkkeywordhash.c
-+ 	./mkkeywordhash >keywordhash.h
-+ 
-++# Source files that go into making shell.c
-++SHELL_SRC = \
-++	$(TOP)/src/shell.c.in \
-++	$(TOP)/ext/misc/shathree.c \
-++	$(TOP)/ext/misc/fileio.c \
-++	$(TOP)/ext/misc/completion.c
-++
-++shell.c:	$(SHELL_SRC) $(TOP)/tool/mkshellc.tcl
-++	tclsh $(TOP)/tool/mkshellc.tcl >shell.c
-++
-+ 
-+ 
-+ # Rules to build the extension objects.
-+@@ -757,17 +781,11 @@ sqlite3rbu.o:	$(TOP)/ext/rbu/sqlite3rbu.c $(HDR) $(EXTHDR)
-+ # Rules for building test programs and for running tests
-+ #
-+ tclsqlite3:	$(TOP)/src/tclsqlite.c libsqlite3.a
-+-	$(TCCX) $(TCL_FLAGS) -DTCLSH=1 -o tclsqlite3 \
-++	$(TCCX) $(TCL_FLAGS) -DTCLSH -o tclsqlite3 \
-+ 		$(TOP)/src/tclsqlite.c libsqlite3.a $(LIBTCL) $(THREADLIB)
-+ 
-+-sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl
-+-	echo "#define TCLSH 2" > $@
-+-	echo "#define SQLITE_ENABLE_DBSTAT_VTAB 1" >> $@
-+-	cat sqlite3.c $(TOP)/src/tclsqlite.c >> $@
-+-	echo "static const char *tclsh_main_loop(void){" >> $@
-+-	echo "static const char *zMainloop = " >> $@
-+-	tclsh $(TOP)/tool/tostr.tcl $(TOP)/tool/spaceanal.tcl >> $@
-+-	echo "; return zMainloop; }" >> $@
-++sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/sqlite3_analyzer.c.in $(TOP)/tool/mkccode.tcl
-++	tclsh $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in >sqlite3_analyzer.c
-+ 
-+ sqlite3_analyzer$(EXE): sqlite3_analyzer.c
-+ 	$(TCCX) $(TCL_FLAGS) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS) $(THREADLIB)
-+@@ -783,22 +801,24 @@ TESTFIXTURE_FLAGS += -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE
-+ TESTFIXTURE_FLAGS += -DSQLITE_SERIES_CONSTRAINT_VERIFY=1
-+ TESTFIXTURE_FLAGS += -DSQLITE_DEFAULT_PAGE_SIZE=1024
-+ TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_STMTVTAB
-++TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_DBPAGE_VTAB
-++TESTFIXTURE_FLAGS += -DTCLSH_INIT_PROC=sqlite3TestInit
-+ TESTFIXTURE_FLAGS += -DDEFAULT_ENABLE_RECOVER=1
-+ 
-+ testfixture$(EXE): $(TESTSRC2) libsqlite3.a $(TESTSRC) $(TOP)/src/tclsqlite.c
-+-	$(TCCX) $(TCL_FLAGS) -DTCLSH=1 $(TESTFIXTURE_FLAGS)                  \
-++	$(TCCX) $(TCL_FLAGS) $(TESTFIXTURE_FLAGS)                            \
-+ 		$(TESTSRC) $(TESTSRC2) $(TOP)/src/tclsqlite.c                \
-+ 		-o testfixture$(EXE) $(LIBTCL) libsqlite3.a $(THREADLIB)
-+ 
-+ amalgamation-testfixture$(EXE): sqlite3.c $(TESTSRC) $(TOP)/src/tclsqlite.c  \
-+ 				$(TOP)/ext/session/test_session.c
-+-	$(TCCX) $(TCL_FLAGS) -DTCLSH=1 $(TESTFIXTURE_FLAGS)                  \
-++	$(TCCX) $(TCL_FLAGS) $(TESTFIXTURE_FLAGS)                            \
-+ 		$(TESTSRC) $(TOP)/src/tclsqlite.c sqlite3.c                  \
-+ 		$(TOP)/ext/session/test_session.c                            \
-+ 		-o testfixture$(EXE) $(LIBTCL) $(THREADLIB)
-+ 
-+ fts3-testfixture$(EXE): sqlite3.c fts3amal.c $(TESTSRC) $(TOP)/src/tclsqlite.c
-+-	$(TCCX) $(TCL_FLAGS) -DTCLSH=1 $(TESTFIXTURE_FLAGS)                  \
-++	$(TCCX) $(TCL_FLAGS) $(TESTFIXTURE_FLAGS)                            \
-+ 	-DSQLITE_ENABLE_FTS3=1                                               \
-+ 		$(TESTSRC) $(TOP)/src/tclsqlite.c sqlite3.c fts3amal.c       \
-+ 		-o testfixture$(EXE) $(LIBTCL) $(THREADLIB)
-+diff --git a/third_party/sqlite/src/manifest b/third_party/sqlite/src/manifest
-+index b2cfcf0..f490a67d 100644
-+--- a/third_party/sqlite/src/manifest
-++++ b/third_party/sqlite/src/manifest
-+@@ -1,17 +1,17 @@
-+-C Allow\sindexes\sto\sbe\screated\son\sdate/time\sfunctions\sas\slong\sas\sthe\s'now'\ndate\sand\sthe\s'localtime'\sand\s'utc'\smodifiers\sare\snot\sused.
-+-D 2017-07-19T19:48:40.351
-+-F Makefile.in d9873c9925917cca9990ee24be17eb9613a668012c85a343aef7e5536ae266e8
-++C Version\s3.21.0
-++D 2017-10-24T18:55:49.833
-++F Makefile.in e016061b23e60ac9ec27c65cb577292b6bde0307ca55abd874ab3487b3b1beb2
-+ F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
-+-F Makefile.msc 02b469e9dcd5b7ee63fc1fb05babc174260ee4cfa4e0ef2e48c3c6801567a016
-++F Makefile.msc 37740aba9c4bb359c627eadccf1cfd7be4f5f847078723777ea7763969e533b1
-+ F README.md f5c87359573c4d255425e588a56554b50fdcc2afba4e017a2e02a43701456afd
-+-F VERSION 87f1498f27e398bce3da2fa8125c9879a38ed9d87e4b5fb922b351de1e25cadb
-++F VERSION f81232df28e2d3ff049feefad5fbd5489cc33697f6bd2ecf61af7f0dde3b83d0
-+ F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
-+ F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
-+ F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
-+ F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
-+ F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
-+-F autoconf/Makefile.am 1a47d071e3d5435f8f7ebff7eb6703848bbd65d4
-+-F autoconf/Makefile.msc 1014be616b420a5f48611d21b62ca2f50ec97ee795087ecb8a4d6bf6375ba11d
-++F autoconf/Makefile.am 66c0befa511f0d95ba229e180067cf0357a9ebf8b3201b06d683c5ba6220fb39
-++F autoconf/Makefile.msc 645b8a9774281515dc4a8de65d8a914f7b418ba8bd1c48b53ccbf43d3b339715
-+ F autoconf/README.first 6c4f34fe115ff55d4e8dbfa3cecf04a0188292f7
-+ F autoconf/README.txt 4f04b0819303aabaa35fff5f7b257fb0c1ef95f1
-+ F autoconf/configure.ac 2893b823ecc86cea13739f6c8109a41392254d1db08235c5615e0af5722c8578
-+@@ -30,10 +30,10 @@ F autoconf/tea/win/rules.vc c511f222b80064096b705dbeb97060ee1d6b6d63
-+ F config.guess 226d9a188c6196f3033ffc651cbc9dcee1a42977
-+ F config.h.in 6376abec766e9a0785178b1823b5a587e9f1ccbc
-+ F config.sub 9ebe4c3b3dab6431ece34f16828b594fb420da55
-+-F configure 1bcc61cdd063171d8945551c265e5701a770deeff77e0ad634f8d22e4e91c831 x
-+-F configure.ac 13f45f02e6c51dd0e347315b5401c3f047712b7f79b7f35619115c23755afcff
-++F configure e9dbb65b61c36bb9622225de254b768d4816749ff4cb4d71307bb067095aceec x
-++F configure.ac 369ebae6c04d9d2de5064e21d300f2f42f2fbf13235cabff9d1a54f2b2c4d05d
-+ F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
-+-F doc/lemon.html 1f8b8d4c9f5cfe40e679fee279cc9eb2da8e6eb74ad406028538d7864cc4b6cb
-++F doc/lemon.html 278113807f49d12d04179a93fab92b5b917a08771152ca7949d34e928efa3941
-+ F doc/pager-invariants.txt 27fed9a70ddad2088750c4a2b493b63853da2710
-+ F doc/vfs-shm.txt e101f27ea02a8387ce46a05be2b1a902a021d37a
-+ F ext/README.md fd5f78013b0a2bc6f0067afb19e6ad040e89a10179b4f6f03eee58fac5f169bd
-+@@ -114,7 +114,7 @@ F ext/fts5/fts5_test_tok.c ffd657dd67e7fcdb31bf63fb60b6d867299a581d0f46e97086aba
-+ F ext/fts5/fts5_tokenize.c 2ce7b44183538ec46b7907726262ee43ffdd39a8
-+ F ext/fts5/fts5_unicode2.c b450b209b157d598f7b9df9f837afb75a14c24bf
-+ F ext/fts5/fts5_varint.c a5aceacda04dafcbae725413d7a16818ecd65738
-+-F ext/fts5/fts5_vocab.c e44fefa7f0c1db252998af071daf06a7147e17e7
-++F ext/fts5/fts5_vocab.c 1cd79854cb21543e66507b25b0578bc1b20aa6a1349b7feceb8e8fed0e7a77a6
-+ F ext/fts5/fts5parse.y a070b538e08ae9e2177d15c337ed2a3464408f0f886e746307098f746efd94ca
-+ F ext/fts5/mkportersteps.tcl 5acf962d2e0074f701620bb5308155fa1e4a63ba
-+ F ext/fts5/test/fts5_common.tcl b01c584144b5064f30e6c648145a2dd6bc440841
-+@@ -140,6 +140,7 @@ F ext/fts5/test/fts5colset.test a30473451321bbf0b6218af62e96b4ae5fa99931cfdb210b
-+ F ext/fts5/test/fts5columnsize.test 45459ce4dd9fd853b6044cdc9674921bff89e3d840f348ca8c1630f9edbf5482
-+ F ext/fts5/test/fts5config.test 60094712debc59286c59aef0e6cf511c37d866802776a825ce437d26afe0817f
-+ F ext/fts5/test/fts5conflict.test 655925678e630d3cdf145d18725a558971806416f453ac8410ca8c04d934238d
-++F ext/fts5/test/fts5connect.test b12a2a8b02af3c31c18abbc33aa8100d364de19a888a44457484d21dbccb18a7
-+ F ext/fts5/test/fts5content.test 688d5ac7af194ebc67495daea76a69e3cd5480122c2320e72d41241b423b4116
-+ F ext/fts5/test/fts5corrupt.test 8957f0f7e57e0f8a102c5b6e1a7326d6a1966b28e1d99c5883822af1e6038e9e
-+ F ext/fts5/test/fts5corrupt2.test 6deaf9f9606b3c957529db9881622bb3a7829b19bb3cdf8f276f074d684ede56
-+@@ -201,13 +202,14 @@ F ext/fts5/test/fts5unindexed.test 9021af86a0fb9fc616f7a69a996db0116e7936d0db638
-+ F ext/fts5/test/fts5update.test 0737876e20e97a6a6abf45de19fc99315727bcee6a83fadcada1cc080b9aa8f0
-+ F ext/fts5/test/fts5version.test 99b81372630fbf359107c96580fa761e41cdfb1dafc9966e148629ca72efee71
-+ F ext/fts5/test/fts5vocab.test 2ba98bcef0fcab3e5fead8eaabd6c0efb7e57bfe707a5cfcc18572ca9b277360
-++F ext/fts5/test/fts5vocab2.test 2beeec974a305a1d79b91426622cc922c87065874437d22b400de7438979959e
-+ F ext/fts5/tool/fts5speed.tcl b0056f91a55b2d1a3684ec05729de92b042e2f85
-+ F ext/fts5/tool/fts5txt2db.tcl 526a9979c963f1c54fd50976a05a502e533a4c59
-+ F ext/fts5/tool/loadfts5.tcl 95b03429ee6b138645703c6ca192c3ac96eaf093
-+ F ext/fts5/tool/mkfts5c.tcl d1c2a9ab8e0ec690a52316f33dd9b1d379942f45
-+ F ext/fts5/tool/showfts5.tcl d54da0e067306663e2d5d523965ca487698e722c
-+ F ext/icu/README.txt d9fbbad0c2f647c3fdf715fc9fd64af53aedfc43
-+-F ext/icu/icu.c 84900472a088a3a172c6c079f58a1d3a1952c332
-++F ext/icu/icu.c 635775226d07c743c770888a9dd5175afc6e67d3e28a4032b7fedc3bcaa92e65
-+ F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37
-+ F ext/lsm1/Makefile 2951812df1c1cbc9e023af7e070876f479b3d75ce3898b3b9d00f83fecf13608
-+ F ext/lsm1/Makefile.msc f8c878b467232226de288da320e1ac71c131f5ec91e08b21f502303347260013
-+@@ -243,16 +245,16 @@ F ext/lsm1/lsm_log.c a8bf334532109bba05b09a504ee45fc393828b0d034ca61ab45e3940709
-+ F ext/lsm1/lsm_main.c 15e73ccdafdd44ddeefc29e332079d88ba8f00c12c797b3c2b63d3171b5afce8
-+ F ext/lsm1/lsm_mem.c 4c51ea9fa285ee6e35301b33491642d071740a0a
-+ F ext/lsm1/lsm_mutex.c 378edf0a2b142b4f7640ee982df06d50b98788ea
-+-F ext/lsm1/lsm_shared.c 5bc37768e558492f60d7196735ddd54843cd239bd66c1af6eb205a6348ca5e46
-++F ext/lsm1/lsm_shared.c 1a76b7a5e89a003c24d58f1fb295c4203b48ef6acba9a194ac6003ade09fcd47
-+ F ext/lsm1/lsm_sorted.c a04518dfbfff0171fafb152a46e9fe9f45e1edbf3570e4533dd58ddb6567f0c9
-+ F ext/lsm1/lsm_str.c 65e361b488c87b10bf3e5c0070b14ffc602cf84f094880bece77bbf6678bca82
-+ F ext/lsm1/lsm_tree.c 682679d7ef2b8b6f2fe77aeb532c8d29695bca671c220b0abac77069de5fb9fb
-+ F ext/lsm1/lsm_unix.c 57361bcf5b1a1a028f5d66571ee490e9064d2cfb145a2cc9e5ddade467bb551b
-+ F ext/lsm1/lsm_varint.c 43f954af668a66c7928b81597c14d6ad4be9fedbc276bbd80f52fa28a02fdb62
-+-F ext/lsm1/lsm_vtab.c d5af32abe32601b3f2618b9488225db9ca06af803ddee1aaaf1653e08e9d112b
-++F ext/lsm1/lsm_vtab.c 529255dc704289001b225d97e57e0cfa14b29c3f281c7349cfa8fdb655de79ae
-+ F ext/lsm1/lsm_win32.c 0a4acbd7e8d136dd3a5753f0a9e7a9802263a9d96cef3278cf120bcaa724db7c
-+ F ext/lsm1/test/lsm1_common.tcl 5ed4bab07c93be2e4f300ebe46007ecf4b3e20bc5fbe1dedaf04a8774a6d8d82
-+-F ext/lsm1/test/lsm1_simple.test 3bb38951450cd1f12a6c294949334d6fbb109a3da38c48eaf0877a37c43a0fab
-++F ext/lsm1/test/lsm1_simple.test ca949efefa102f4644231dcd9291d8cda7699a4ce1006b26e0e3fcb72233f422
-+ F ext/misc/README.md 8e008c8d2b02e09096b31dfba033253ac27c6c06a18aa5826e299fa7601d90b2
-+ F ext/misc/amatch.c 6db4607cb17c54b853a2d7c7c36046d004853f65b9b733e6f019d543d5dfae87
-+ F ext/misc/anycollseq.c 5ffdfde9829eeac52219136ad6aa7cd9a4edb3b15f4f2532de52f4a22525eddb
-+@@ -260,7 +262,7 @@ F ext/misc/carray.c 880684b2796ef6ad915094093297eede40db6c07f280c7f491c8eff72ea0
-+ F ext/misc/closure.c 0d2a038df8fbae7f19de42e7c7d71f2e4dc88704
-+ F ext/misc/completion.c 52c3f01523e3e387eb321b4739a89d1fe47cbe6025aa1f2d8d3685e9e365df0f
-+ F ext/misc/compress.c 122faa92d25033d6c3f07c39231de074ab3d2e83
-+-F ext/misc/csv.c d91c0388445b08f6e373dd0e8fc024d4551b1fcaf64e876a1c3f4fac8a63adc2
-++F ext/misc/csv.c 1a009b93650732e22334edc92459c4630b9fa703397cbb3c8ca279921a36ca11
-+ F ext/misc/dbdump.c 3509fa6b8932d04e932d6b6b827b6a82ca362781b8e8f3c77336f416793e215e
-+ F ext/misc/eval.c f971962e92ebb8b0a4e6b62949463ee454d88fa2
-+ F ext/misc/fileio.c b1aa06c0f1dac277695d4529e5e976c65ab5678dcbb53a0304deaa8adc44b332
-+@@ -268,27 +270,29 @@ F ext/misc/fuzzer.c 7c64b8197bb77b7d64eff7cac7848870235d4c25
-+ F ext/misc/ieee754.c f190d0cc5182529acb15babd177781be1ac1718c
-+ F ext/misc/json1.c dbe086615b9546c156bf32b9378fc09383b58bd17513b866cfd24c1e15281984
-+ F ext/misc/memvfs.c e5225bc22e79dde6b28380f3a068ddf600683a33
-++F ext/misc/mmapwarm.c 70b618f2d0bde43fae288ad0b7498a629f2b6f61b50a27e06fae3cd23c83af29
-+ F ext/misc/nextchar.c 35c8b8baacb96d92abbb34a83a997b797075b342
-+ F ext/misc/percentile.c 92699c8cd7d517ff610e6037e56506f8904dae2e
-+ F ext/misc/regexp.c a68d25c659bd2d893cd1215667bbf75ecb9dc7d4
-+ F ext/misc/remember.c add730f0f7e7436cd15ea3fd6a90fd83c3f706ab44169f7f048438b7d6baa69c
-+ F ext/misc/rot13.c 1ac6f95f99b575907b9b09c81a349114cf9be45a
-+ F ext/misc/scrub.c 1c5bfb8b0cd18b602fcb55755e84abf0023ac2fb
-+-F ext/misc/series.c b0f5f346aca9b7ff7caaf0da2efb4ad462441abd4dcd92a460cb573b3ea2370b
-++F ext/misc/series.c f3c0dba5c5c749ce1782b53076108f87cf0b71041eb6023f727a9c50681da564
-+ F ext/misc/sha1.c 0b9e9b855354910d3ca467bf39099d570e73db56
-+ F ext/misc/shathree.c fa185d7aee0ad0aca5e091b4a2db7baff11796170e5793b5de99e511a13af448
-+ F ext/misc/showauth.c 732578f0fe4ce42d577e1c86dc89dd14a006ab52
-+ F ext/misc/spellfix.c a4723b6aff748a417b5091b68a46443265c40f0d
-+ F ext/misc/stmt.c 6f16443abb3551e3f5813bb13ba19a30e7032830015b0f92fe0c0453045c0a11
-+ F ext/misc/totype.c 4a167594e791abeed95e0a8db028822b5e8fe512
-+-F ext/misc/unionvtab.c 56fd163d2b6d2f4df0078be482fc9a874658ce51cce33f180c08834193449c78
-++F ext/misc/unionvtab.c 1e0ebc5078e1a916db191bcd88f87e94ea7ba4aa563ee30ff706261cb4b39461
-+ F ext/misc/vfslog.c fe40fab5c077a40477f7e5eba994309ecac6cc95
-+ F ext/misc/vfsstat.c bf10ef0bc51e1ad6756629e1edb142f7a8db1178
-++F ext/misc/vtablog.c 31d0d8f4406795679dcd3a67917c213d3a2a5fb3ea5de35f6e773491ed7e13c9
-+ F ext/misc/vtshim.c 1976e6dd68dd0d64508c91a6dfab8e75f8aaf6cd
-+ F ext/misc/wholenumber.c 784b12543d60702ebdd47da936e278aa03076212
-+ F ext/rbu/rbu.c ea7d1b7eb44c123a2a619332e19fe5313500705c4a58aaa1887905c0d83ffc2e
-+ F ext/rbu/rbu1.test 43836fac8c7179a358eaf38a8a1ef3d6e6285842
-+-F ext/rbu/rbu10.test 046b0980041d30700464a800bbf6733ed2df515d
-++F ext/rbu/rbu10.test 1846519a438697f45e9dcb246908af81b551c29e1078d0304fae83f1fed7e9ee
-+ F ext/rbu/rbu11.test 9bc68c2d3dbeb1720153626e3bd0466dcc017702
-+ F ext/rbu/rbu12.test bde22ed0004dd5d1888c72a84ae407e574aeae16
-+ F ext/rbu/rbu13.test 462ff799c4afedc3ef8a47ff818c0ffbf14ae4f2
-+@@ -307,21 +311,28 @@ F ext/rbu/rbucrash.test 61470d977a06a0abc2ec35b05d82a1d7d87d10f4ffabad14c1c231ed
-+ F ext/rbu/rbucrash2.test b2ecbdd7bb72c88bd217c65bd00dafa07f7f2d4d
-+ F ext/rbu/rbudiff.test 3e605cf624d00d04d0fb1316a3acec4fbe3b3ac5
-+ F ext/rbu/rbudor.test 99b05cc0df613e962c2c8085cfb05686a09cf315
-+-F ext/rbu/rbufault.test cc0be8d5d392d98b0c2d6a51be377ea989250a89
-++F ext/rbu/rbufault.test 2654aef20f8ee7de37c9c1997a44f2773dc7bf24887adea39fb19314ef32cb90
-+ F ext/rbu/rbufault2.test 9a7f19edd6ea35c4c9f807d8a3db0a03a5670c06
-+-F ext/rbu/rbufault3.test 54a399888ac4af44c68f9f58afbed23149428bca
-++F ext/rbu/rbufault3.test 0913c1aeaee266d9c36c33179341a5a504aad7d423d1979cfec43c8346a29899
-+ F ext/rbu/rbufault4.test 34e70701cbec51571ffbd9fbf9d4e0f2ec495ca7
-+-F ext/rbu/rbufts.test 828cd689da825f0a7b7c53ffc1f6f7fdb6fa5bda
-++F ext/rbu/rbufts.test a2bbd202c9321fba15fb4a62a90add7d70e07bd8404e1e598135adbfff8a0508
-+ F ext/rbu/rbuprogress.test 1849d4e0e50616edf5ce75ce7db86622e656b5cf
-+ F ext/rbu/rburesume.test 8acb77f4a422ff55acfcfc9cc15a5cb210b1de83
-+ F ext/rbu/rbusave.test 0f43b6686084f426ddd040b878426452fd2c2f48
-++F ext/rbu/rbutemplimit.test cd553a9288d515d0b5f87d277e76fd18c4aa740b761e7880fab11ce986ea18d1
-+ F ext/rbu/rbuvacuum.test ff357e9b556ca7ad4673da0ff7f244def919ff858e0f9f350d3e30fdd83a62a8
-+ F ext/rbu/rbuvacuum2.test 2074ab14fe66e1c7e7210c62562650dcd215bbaa
-+-F ext/rbu/sqlite3rbu.c d1438580a451eebda3bfd42ef69b677512f00125285e0e4e789b6131a45f6dd8
-+-F ext/rbu/sqlite3rbu.h fc25e1fcd99b5c6d32b1b5b1c73122632e873ac89bd0be9bf646db362b7ce02c
-+-F ext/rbu/test_rbu.c ec18cfc69a104309df23c359e3c80306c9a6bdd1d2c53c8b70ae158e9832dcd6
-++F ext/rbu/sqlite3rbu.c 64bd08c1011456f90564ed167abce3a9c2af421a924b21eb57231e078da04feb
-++F ext/rbu/sqlite3rbu.h b42bcd4d8357268c6c39ab2a60b29c091e89328fa8cc49c8fac5ab8d007e79b2
-++F ext/rbu/test_rbu.c 7073979b9cc80912bb03599ac8d85ab5d3bf03cfacd3463f2dcdd7822997533a
-++F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
-++F ext/repair/checkfreelist.c 0abb84b4545016d57ba1a2aa8884c72c73ed838968909858c03bc1f38fb6b054
-+ F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
-++<<<<<<< HEAD
-+ F ext/rtree/rtree.c c5886d4ba7e7c66d0f9ee0b788d5532f8537ca04db19cec7f2f64dcf46e9be37
-++=======
-++F ext/rtree/rtree.c f2fd34db37ea053798f8e66b44a473449b21301d2b92505ee576823789e909fb
-++>>>>>>> 8a87f7e... sqlite: Upgrade from 3.20.1 to 3.21.0.
-+ F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
-+ F ext/rtree/rtree1.test 4fdd60ae034e43f2fefc26492032d02e742e8b14d468b7c51d95a1e2fa47cf00
-+ F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
-+@@ -332,7 +343,7 @@ F ext/rtree/rtree6.test 773a90db2dce6a8353dd0d5b64bca69b29761196
-+ F ext/rtree/rtree7.test 1fa710b9e6bf997a0c1a537b81be7bb6fded1971
-+ F ext/rtree/rtree8.test 076d9d5b783b61b7a23a5ab45fc899551dfffd821974f36ee599ff29f4de7a61
-+ F ext/rtree/rtree9.test 8bfa84dfaba1c897468a2448c28db0a00ad12d464225b5993c7814e907f3776f
-+-F ext/rtree/rtreeA.test e25d76c1701f8591e7a0b6de8224d5dbc1418c562654c7240e6f33f37b1e36f7
-++F ext/rtree/rtreeA.test c09ad3f76c08feac00770685ff50ca12966dc0c641bf19a982b26a80643b46d1
-+ F ext/rtree/rtreeB.test c85f9ce78766c4e68b8b89fbf2979ee9cfa82b4e
-+ F ext/rtree/rtreeC.test c0a9c67f2efa98b6fae12acb8a28348d231a481d
-+ F ext/rtree/rtreeD.test fe46aa7f012e137bd58294409b16c0d43976c3bb92c8f710481e577c4a1100dc
-+@@ -341,6 +352,7 @@ F ext/rtree/rtreeF.test 66deb9fd1611c7ca2e374adba63debdc2dbb12b4
-+ F ext/rtree/rtreeG.test 3b185719630795f38594f64cd7d1de86a33f91f1
-+ F ext/rtree/rtree_perf.tcl 6c18c1f23cd48e0f948930c98dfdd37dfccb5195
-+ F ext/rtree/rtree_util.tcl 06aab2ed5b826545bf215fff90ecb9255a8647ea
-++F ext/rtree/rtreeconnect.test 225ad3fcb483d36cbee423a25052a6bbae762c9576ae9268332360c68c170d3d
-+ F ext/rtree/sqlite3rtree.h 9c5777af3d2921c7b4ae4954e8e5697502289d28
-+ F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
-+ F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
-+@@ -368,7 +380,7 @@ F ext/session/sessionfault.test da273f2712b6411e85e71465a1733b8501dbf6f7
-+ F ext/session/sessionfault2.test 04aa0bc9aa70ea43d8de82c4f648db4de1e990b0
-+ F ext/session/sessionwor.test 2f3744236dc8b170a695b7d8ddc8c743c7e79fdc
-+ F ext/session/sqlite3session.c cc127222a9ea6f4eaa31281aa9da924f5244f6099be0ee526c950684fb3513a6
-+-F ext/session/sqlite3session.h d4db650adfcc7a4360e9f12a09c2d117b1db6b53
-++F ext/session/sqlite3session.h cb4d860101ba6d3ac810f18684539b766d24d668fa2436cdde90d711af9464fb
-+ F ext/session/test_session.c eb0bd6c1ea791c1d66ee4ef94c16500dad936386
-+ F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
-+ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
-+@@ -376,7 +388,7 @@ F ext/userauth/userauth.c 3410be31283abba70255d71fd24734e017a4497f
-+ F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
-+ F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
-+ F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
-+-F main.mk 5b7d72ab03dd70aa1401f934d31e85aefd6fc542eb58094d7a95d6921390b2d0
-++F main.mk a39528d993afc1f0c0aebde2e3623ab4171d3bba484eea1e5241615c706c9ce8
-+ F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
-+ F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
-+ F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
-+@@ -388,13 +400,14 @@ F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca
-+ F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
-+ F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
-+ F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
-+-F src/alter.c 850ede4e607f12fa25ea4f3cb6ece2b2e29d1aa50e3f786ce49d615788849552
-++F src/alter.c cf7a8af45cb0ace672f47a1b29ab24092a9e8cd8d945a9974e3b5d925f548594
-+ F src/analyze.c 0d0ccf7520a201d8747ea2f02c92c26e26f801bc161f714f27b9f7630dde0421
-+-F src/attach.c 3bd555e28382603e80d430dfebb2270f86e1e375b4c4be3e1ab1aec3a0c44943
-+-F src/auth.c 79f96c6f33bf0e5da8d1c282cee5ebb1852bb8a6ccca3e485d7c459b035d9c3c
-++F src/attach.c 07b706e336fd3cedbd855e1f8266d10e82fecae07daf86717b5760cd7784c584
-++F src/auth.c 6277d63837357549fe14e723490d6dc1a38768d71c795c5eb5c0f8a99f918f73
-+ F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
-+ F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
-+ F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca
-++<<<<<<< HEAD
-+ F src/btree.c f55ea8f456d103328d61076be40fa39acbfea05eaa4eccfed275532a63c867c4
-+ F src/btree.h 3edc5329bc59534d2d15b4f069a9f54b779a7e51289e98fa481ae3c0e526a5ca
-+ F src/btreeInt.h 97700795edf8a43245720414798b7b29d8e465aef46bf301ffacd431910c0da1
-+@@ -406,25 +419,43 @@ F src/date.c 921fb5957cacfb4e512d25efa13fbdf5f3ebade2077a0809fbe24105d2f33cff
-+ F src/dbstat.c 7a4ba8518b6369ef3600c49cf9c918ad979acba610b2aebef1b656d649b96720
-+ F src/delete.c 939bd15e6b54b82b951e1c0ffc2ff2b4ab579196780a1f6d394e47bd6f799b6c
-+ F src/expr.c 17fb28516a5fbfbabdade6b3401c797b0804de25e36b7b1becff2cf07921dc4c
-++=======
-++F src/btree.c 75229a5a47985997f861b428552acd14fe42b657f755cba5e0b1a007bd77b2ea
-++F src/btree.h 32ef5d3f25dc70ef1ee9cecf84a023c21378f06a57cd701d2e866e141b150f09
-++F src/btreeInt.h 55b702efce17e5d1941865464227d3802cfc9c7c832fac81d4c94dced47a71fc
-++F src/build.c e24b61144f9c9b15c4aa05954514190361061da721e56dcd1af6e0e945ee5909
-++F src/callback.c 28a8ede982fde4129b828350f78f2c01fe7d12c74d1a0a05d7108ab36f308688
-++F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
-++F src/ctime.c ff1be3eed7bdd75aaca61ca8dc848f7c9f850ef2fb9cb56f2734e922a098f9c0
-++F src/date.c 48f743d88bbe88f848532d333cca84f26e52a4f217e86f86be7fc1b919c33d74
-++F src/dbpage.c c625a0bd605d4cea9a3258b8db49a5474a04976e95a9fe380cdaf74e8eb6736d
-++F src/dbstat.c 7a4ba8518b6369ef3600c49cf9c918ad979acba610b2aebef1b656d649b96720
-++F src/delete.c 21a5f1812fdb599e9f7afb9f650bdabab60a3afd51d7e94e539c982f647b0023
-++F src/expr.c 755caeafc43e3cd31e1d810795712641f6e19f7e7e9575faece4c77381fd8304
-++>>>>>>> 8a87f7e... sqlite: Upgrade from 3.20.1 to 3.21.0.
-+ F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
-+ F src/fkey.c 5ff2c895fe087756d8085dc1a9bc229b5670e2a65c3929dd87c71e43649af333
-+-F src/func.c e2854b19386b93ad6b498a3f3b7d6baa98ec14cfe84530fb12fce4414263d871
-+-F src/global.c 8a6ab6b4d91effb96ffa81b39f0d70c862abca157f8aaa194600a4a8b7923344
-++F src/func.c b4d259af627e3cd9510cf08db37f0bcc88b1887c735169c74490c3739d5cf5c6
-++F src/global.c ac3094f1dc59fbeb919aef7cc0cc827a8459d1fb1adb7972ef75bd9e0c10b75b
-+ F src/hash.c a12580e143f10301ed5166ea4964ae2853d3905a511d4e0c44497245c7ce1f7a
-+ F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
-+ F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
-+ F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
-++<<<<<<< HEAD
-+ F src/insert.c bb70abf32c7c926745eb550938db9132309584a667a44c2db0e5fa3207600391
-++=======
-++F src/insert.c 1f33ef4ca0553b60fff03aa171370f8709a3e945acfcc68ccafc92752d872f40
-++>>>>>>> 8a87f7e... sqlite: Upgrade from 3.20.1 to 3.21.0.
-+ F src/legacy.c 134ab3e3fae00a0f67a5187981d6935b24b337bcf0f4b3e5c9fa5763da95bf4e
-+ F src/loadext.c 20865b183bb8a3723d59cf1efffc3c50217eb452c1021d077b908c94da26b0b2
-+-F src/main.c 3a9da9e3974d8a32ef6ca15b75503d540af22d284beb75bc7f0d93254ca3f8f7
-+-F src/malloc.c e20bb2b48abec52d3faf01cce12e8b4f95973755fafec98d45162dfdab111978
-++F src/main.c 54637b9e7f91de6d281e577cd1a997762a4613f51a0509790027ca9865185d7c
-++F src/malloc.c a02c9e69bc76bee0f639416b947a946412890b606301454727feadcb313536d6
-+ F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
-+ F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
-+ F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
-+ F src/mem3.c 8768ac94694f31ffaf8b4d0ea5dc08af7010a35a
-+ F src/mem5.c 9bf955937b07f8c32541c8a9991f33ce3173d944
-+-F src/memjournal.c 95752936c11dc6995672d1dd783cd633eea0cc95
-++F src/memjournal.c 6f3d36a0a8f72f48f6c3c722f04301ac64f2515435fa42924293e46fc7994661
-+ F src/msvc.h 4942752b6a253116baaa8de75256c51a459a5e81
-+ F src/mutex.c 8e45800ee78e0cd1f1f3fe8e398853307f4a085c
-+ F src/mutex.h 779d588e3b7756ec3ecf7d78cde1d84aba414f85
-+@@ -432,13 +463,14 @@ F src/mutex_noop.c 9d4309c075ba9cc7249e19412d3d62f7f94839c4
-+ F src/mutex_unix.c 27bb6cc49485ee46711a6580ab7b3f1402211d23
-+ F src/mutex_w32.c a898fa969823b100c0f5fdc57e54c9a1e419ab4d
-+ F src/notify.c 9711a7575036f0d3040ba61bc6e217f13a9888e7
-+-F src/os.c add02933b1dce7a39a005b00a2f5364b763e9a24
-+-F src/os.h 8e976e59eb4ca1c0fca6d35ee803e38951cb0343
-++F src/os.c 22d31db3ca5a96a408fbf1ceeaaebcaf64c87024d2ff9fe1cf2ddbec3e75c104
-++F src/os.h 48388821692e87da174ea198bf96b1b2d9d83be5dfc908f673ee21fafbe0d432
-+ F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
-+ F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
-+-F src/os_unix.c 30e2c43e4955db990e5b5a81e901f8aa74cc8820
-+-F src/os_win.c 2a6c73eef01c51a048cc4ddccd57f981afbec18a
-++F src/os_unix.c 3984fc069df59e26f000e30609611cecdb4e93293e6ee52313a473a7e874af1b
-++F src/os_win.c 6892c3ff23b7886577e47f13d827ca220c0831bae3ce00eea8c258352692f8c6
-+ F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
-++<<<<<<< HEAD
-+ F src/pager.c 14f6982c470c05b8e85575c69e9c1712010602e20400f8670d8699e21283e0e4
-+ F src/pager.h f2a99646c5533ffe11afa43e9e0bea74054e4efa
-+ F src/parse.y e384cb73f99e1b074085c974b37f4d830e885359e4b60837e30f7d67c16ba65b
-+@@ -446,12 +478,22 @@ F src/pcache.c 62835bed959e2914edd26afadfecce29ece0e870
-+ F src/pcache.h 521bb9610d38ef17a3cc9b5ddafd4546c2ea67fa3d0e464823d73c2a28d50e11
-+ F src/pcache1.c 1195a21fe28e223e024f900b2011e80df53793f0356a24caace4188b098540dc
-+ F src/pragma.c 95672b7dc59930b4978d08baa8c357085767cc30e5d3ddac9b12592489d3ede2
-++=======
-++F src/pager.c 07cf850241667874fcce9d7d924c814305e499b26c804322e2261247b5921903
-++F src/pager.h 581698f2177e8bd4008fe4760898ce20b6133d1df22139b9101b5155f900df7a
-++F src/parse.y 52ef3cecd0934e9da4a45b585883a03243ad615d338ad94f44501a05891dcdfa
-++F src/pcache.c 4bada070456980c3c1f16d58ec2e64e389ad77b935e3d77e0c96e7bbd397289c
-++F src/pcache.h 072f94d29281cffd99e46c1539849f248c4b56ae7684c1f36626797fee375170
-++F src/pcache1.c 716975564c15eb6679e97f734cec1bfd6c16ac3d4010f05f1f8e509fc7d19880
-++F src/pragma.c d04725ac25387d9638919e197fb009f378e13af7bf899516979e54b3164e3602
-++>>>>>>> 8a87f7e... sqlite: Upgrade from 3.20.1 to 3.21.0.
-+ F src/pragma.h bb83728944b42f6d409c77f5838a8edbdb0fe83046c5496ffc9602b40340a324
-+-F src/prepare.c dd250f904739b1dc449c131ac527c35e3424d94082dd111321bd83f80c6bb0fe
-+-F src/printf.c 8757834f1b54dae512fb25eb1acc8e94a0d15dd2290b58f2563f65973265adb2
-++F src/prepare.c 9a141a1b02dca53beaa9771699d390aafcac01f5d1f1c0ae6e23ded8dcdb709a
-++F src/printf.c 40aee47ae9be4bd3dbdc8968bd07fddc027be8edec8daddf24d3391d36698a1c
-+ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
-+-F src/resolve.c 4324a94573b1e29286f8121e4881db59eaedc014afeb274c8d3e07ed282e0e20
-++F src/resolve.c 5a461643f294ec510ca615b67256fc3861e4c8eff5f29e5940491e70553b1955
-+ F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
-++<<<<<<< HEAD
-+ F src/select.c c6bf96a7f9d7d68f929de84738c599a30d0a725ab0b54420e70545743cd5ee7b
-+ F src/shell.c dd4494287b22ac5ab0654fdd5acb1f2172d2fe621f673a39229ddc31bd8d598f
-+ F src/shell.c.in b5725acacba95ccefa57b6d068f710e29ba8239c3aa704628a1902a1f729c175
-+@@ -459,38 +501,52 @@ F src/sqlite.h.in dad804d4e1979a2ddec33cc8da6aa50c04e6ba0dcb4058e7b3609588d010e0
-+ F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
-+ F src/sqlite3ext.h 967154985ed2ae62f90d9029bb5b5071793d847f1696a2ebe9e8cc0b042ae60b
-+ F src/sqliteInt.h 9b57e05822422268d5a20fa797afd23bf2b039c8401e87dff26700c0c39faf34
-++=======
-++F src/select.c e6a068d9ea54417d625578086d3d482284af8d5a449bb3593d40c257080806a8
-++F src/shell.c.in f13262c8778f0cd76bf8d9c01bbf5ef66842e6b14e1705cd60d86ab32a6ce69f
-++F src/sqlite.h.in ab4f8a29d1580dfaeb6891fa1b83cff8229ba0daa56994707ceaca71495d9ab7
-++F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
-++F src/sqlite3ext.h c02d628cca67f3889c689d82d25c3eb45e2c155db08e4c6089b5840d64687d34
-++F src/sqliteInt.h 6f93fd6fde862410ac26b930f70752c38ad99ea78c3fc28356bac78049c53bd9
-++>>>>>>> 8a87f7e... sqlite: Upgrade from 3.20.1 to 3.21.0.
-+ F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
-+-F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
-++F src/status.c 9737ed017279a9e0c5da748701c3c7bf1e8ae0dae459aad20dd64fcff97a7e35
-+ F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
-+-F src/tclsqlite.c 2c29b0b76e91edfd1b43bf135c32c8674710089197327682b6b7e6af88062c3d
-+-F src/test1.c cfb78b728b37ae3a2b14fe1b3a6c766e0da41370eda112594e698c94011b622e
-++F src/tclsqlite.c 1833388c01e3b77f4c712185ee7250b9423ee0981ce6ae7e401e47db0319a696
-++F src/test1.c 8ef15f7a357f85dfc41c6c748ce9c947b4f676e01bb5ae6a45bee4923dff8b51
-+ F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
-+ F src/test3.c b8434949dfb8aff8dfa082c8b592109e77844c2135ed3c492113839b6956255b
-+ F src/test4.c 18ec393bb4d0ad1de729f0b94da7267270f3d8e6
-+ F src/test5.c 328aae2c010c57a9829d255dc099d6899311672d
-+-F src/test6.c 004ad42f121f693b8cbe060d1a330678abc61620
-++F src/test6.c e8d839fbc552ce044bec8234561a2d5b8819b48e29548ad0ba400471697946a8
-+ F src/test7.c 5612e9aecf934d6df7bba6ce861fdf5ba5456010
-+-F src/test8.c 4f4904721167b32f7a4fa8c7b32a07a673d6cc86
-++F src/test8.c 3f7d0cc4e12e06832ba3db4455cb16867ccadafa602eb6ff5fcf097bffce56ed
-+ F src/test9.c 12e5ba554d2d1cbe0158f6ab3f7ffcd7a86ee4e5
-+ F src/test_async.c 195ab49da082053fdb0f949c114b806a49ca770a
-+ F src/test_autoext.c 915d245e736652a219a907909bb6710f0d587871
-+ F src/test_backup.c bf5da90c9926df0a4b941f2d92825a01bbe090a0
-++<<<<<<< HEAD
-+ F src/test_bestindex.c d23f80d334c59662af69191854c76b8d3d0c8c96
-+ F src/test_blob.c f65ac717da2618691cf9dad094e6da0219dcd208
-++=======
-++F src/test_bestindex.c 78809f11026f18a93fcfd798d9479cba37e1201c830260bf1edc674b2fa9b857
-++F src/test_blob.c ae4a0620b478548afb67963095a7417cd06a4ec0a56adb453542203bfdcb31ce
-++>>>>>>> 8a87f7e... sqlite: Upgrade from 3.20.1 to 3.21.0.
-+ F src/test_btree.c 8b2dc8b8848cf3a4db93f11578f075e82252a274
-+-F src/test_config.c abf6fc1fe9d041b699578c42e3db81f8831c4f5b804f1927958102ee8f2b773e
-++F src/test_config.c 3000f00b9b47b149d842059904c3fcab5f3871fb6aee7d7cc5756f0c64779ae3
-+ F src/test_delete.c e2fe07646dff6300b48d49b2fee2fe192ed389e834dd635e3b3bac0ce0bf9f8f
-+ F src/test_demovfs.c a0c3bdd45ed044115c2c9f7779e56eafff18741e
-+-F src/test_devsym.c 4e58dec2602d8e139ca08659f62a62450587cb58
-++F src/test_devsym.c 1960abbb234b97e9b920f07e99503fc04b443f62bbc3c6ff2c2cea2133e3b8a2
-+ F src/test_fs.c 35a2f7dd8a915900873386331386d9ba1ae1b5026d74fd20c2807bc76221f291
-+-F src/test_func.c a4fdab3363b436c1b12660e9362ce3f3782b7b5e
-++F src/test_func.c d12d805953bcb3bb19f71d29cdc93383b7b7a3369504d2b7e398a1bd77376294
-+ F src/test_hexio.c 1d4469ca61ab202a1fcec6543f584d2407205e8d
-+ F src/test_init.c 4413c211a94b62157ca4c145b3f27c497f03c664
-+ F src/test_intarray.c 988fc61cb0ff539f4172c0d95f15287c92516f64
-+ F src/test_intarray.h f3b7672f5d1056eac563c0d6ea8480a660b1475c
-+ F src/test_journal.c 619f2aa10e0d7a5f87c0f06825bc61dfce1c6b9c7f3ad990fb13de6c3b8874a3
-+ F src/test_loadext.c 337056bae59f80b9eb00ba82088b39d0f4fe6dfd
-+-F src/test_malloc.c c05f6c40bd6c8bfe5f1718212f81fd5687f91766
-++F src/test_malloc.c 4f06a805de86be5216a127b3777ca2d5a1ff99d1a9238374ce136a47411be36c
-++F src/test_md5.c 7268e1e8c399d4a5e181b64ac20e1e6f3bc4dd9fc87abac02db145a3d951fa8c
-+ F src/test_multiplex.c e054459f7633f3ff8ce1245da724f9a8be189e4e
-+ F src/test_multiplex.h 5436d03f2d0501d04f3ed50a75819e190495b635
-+ F src/test_mutex.c 7f4337ba23ee6b1d2ec81c189653608cb069926a
-+@@ -505,7 +561,8 @@ F src/test_server.c a2615049954cbb9cfb4a62e18e2f0616e4dc38fe
-+ F src/test_sqllog.c 11e6ce7575f489155c604ac4b439f2ac1d3d5aef
-+ F src/test_superlock.c 4839644b9201da822f181c5bc406c0b2385f672e
-+ F src/test_syscall.c 1073306ba2e9bfc886771871a13d3de281ed3939
-+-F src/test_tclvar.c df9fe1213c2634687a9ca0b0bec0d2119d359ae3
-++F src/test_tclsh.c 74fcfb7f3b0ff1f871e62263dd84ffba46a8e9d477439115e0fb2035e4bf69e1
-++F src/test_tclvar.c 33ff42149494a39c5fbb0df3d25d6fafb2f668888e41c0688d07273dcb268dfc
-+ F src/test_thread.c 911d15fb14e19c0c542bdc8aabf981c2f10a4858
-+ F src/test_vfs.c f0186261a24de2671d080bcd8050732f0cb64f6e
-+ F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698
-+@@ -515,9 +572,10 @@ F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
-+ F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
-+ F src/tokenize.c 1003d6d90c6783206c711f0a9397656fa5b055209f4d092caa43bb3bf5215db5
-+ F src/treeview.c 2ee4a5dada213d5ab08a742af5c876cee6f1aaae65f10a61923f3fb63846afef
-+-F src/trigger.c d1cae560bfacc8bfb3a072d73658245c1714c0389097da69b4cb23877a082d7e
-+-F src/update.c c443935c652af9365e033f756550b5032d02e1b06eb2cb890ed7511ae0c051dc
-++F src/trigger.c 48e0f7ed6749ce4d50a695e09e20ce9cf84ecabf2691852c965a51e0b620eccc
-++F src/update.c 5404be9e840717323a69209190cdbc9d0d34adaedaaf1d1a1069babf2c4171c0
-+ F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5
-++<<<<<<< HEAD
-+ F src/util.c fc081ec6f63448dcd80d3dfad35baecfa104823254a815b081a4d9fe76e1db23
-+ F src/vacuum.c 874c0f2f15ab2908748297d587d22d485ea96d55aaec91d4775dddb2e24d2ecf
-+ F src/vdbe.c 1e541ec7ff409bbabcc6b4f154957296fff5827c16c2ab0056348acae75685bf
-+@@ -530,14 +588,28 @@ F src/vdbemem.c fe8fce1cdc258320b465934039fe4b1230d63f81d6b81b1eac775b6eec00af0d
-+ F src/vdbesort.c f512c68d0bf7e0105316a5594c4329358c8ee9cae3b25138df041d97516c0372
-+ F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
-+ F src/vtab.c 35b9bdc2b41de32a417141d12097bcc4e29a77ed7cdb8f836d1d2305d946b61b
-++=======
-++F src/util.c 5168013cfd937a695d23cce8c67cb07a3dda242d4cb812530ba1148b88e0f159
-++F src/vacuum.c 90839322fd5f00df9617eb21b68beda9b6e2a2937576b0d65985e4aeb1c53739
-++F src/vdbe.c 3393b508d9ad084ffce232a7c53e375ef5ac99b50b685c5131fcdfce97a9d534
-++F src/vdbe.h d50cadf12bcf9fb99117ef392ce1ea283aa429270481426b6e8b0280c101fd97
-++F src/vdbeInt.h 1fe00770144c12c4913128f35262d11527ef3284561baaab59b947a41c08d0d9
-++F src/vdbeapi.c 9c670ca0dcc1cd86373aa353b747b26fe531ca5cd4331690c611d1f03842e2a1
-++F src/vdbeaux.c c423065d50cee24bc8cba57764f5e9869a1bb920c50907f5dd363ebd7c5aef82
-++F src/vdbeblob.c f5c70f973ea3a9e915d1693278a5f890dc78594300cf4d54e64f2b0917c94191
-++F src/vdbemem.c 5c1533bf756918b4e46b2ed2bb82c29c7c651e1e37bbd0a0d8731a68787598ff
-++F src/vdbesort.c 731a09e5cb9e96b70c394c1b7cf3860fbe84acca7682e178615eb941a3a0ef2f
-++F src/vdbetrace.c 48e11ebe040c6b41d146abed2602e3d00d621d7ebe4eb29b0a0f1617fd3c2f6c
-++F src/vtab.c 0e4885495172e1bdf54b12cce23b395ac74ef5729031f15e1bc1e3e6b360ed1a
-++>>>>>>> 8a87f7e... sqlite: Upgrade from 3.20.1 to 3.21.0.
-+ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
-+-F src/wal.c 40c543f0a2195d1b0dc88ef12142bea690009344
-+-F src/wal.h 06b2a0b599cc0f53ea97f497cf8c6b758c999f71
-+-F src/walker.c a7ca64ce08a83a20d32186fbe06bca9234e348cfcf07959ee322fdc3e8a6173a
-+-F src/where.c cbe8ddffbcec7ce86f7a800fe8fd10aee412c76c87e0dd3732a1682e68d74cd9
-+-F src/whereInt.h 93bb90b77d39901eda31b44d8e90da1351193ccfe96876f89b58a93a33b84c3d
-+-F src/wherecode.c c0c4c31573486cd14bb2cbfc63e41eda591609e5190416261999f211bf97abc1
-+-F src/whereexpr.c bf983d2d33e325cd63a36c40b8de289fd3d7b4d9f2db9052fb8f59f7161a34a0
-++F src/wal.c 839db09792fead5052bb35e533fa485e134913d547d05b5f42e537b73e63f07a
-++F src/wal.h 8de5d2d3de0956d6f6cb48c83a4012d5f227b8fe940f3a349a4b7e85ebcb492a
-++F src/walker.c 3ccfa8637f95355bff61144e01a615b8ef26f79c312880848da73f03367da1e6
-++F src/where.c d8c6d690c4b11f30211de073011fe19352364a6303ae053f45cb66f9576ba8a9
-++F src/whereInt.h 82c04c5075308abbac59180c8bad5ecb45b07453981f60a53f3c7dee21e1e971
-++F src/wherecode.c e8c2ece5843ea56e6c90277d421f2d628f3f7b7c976642369cc519f008e1d2b1
-++F src/whereexpr.c afcac9cccfc0fdaccbdda94034a398947b6dc47dbf821c1b496261722832a6a4
-+ F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
-+ F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
-+ F test/affinity3.test 6a101af2fc945ce2912f6fe54dd646018551710d
-+@@ -558,7 +630,7 @@ F test/analyze5.test 765c4e284aa69ca172772aa940946f55629bc8c4
-+ F test/analyze6.test f1c552ce39cca4ec922a7e4e0e5d0203d6b3281f
-+ F test/analyze7.test bb1409afc9e8629e414387ef048b8e0e3e0bdc4f
-+ F test/analyze8.test c05a461d0a6b05991106467d0c47480f2e709c82
-+-F test/analyze9.test b817b8e798315fc65b820a5463f73ad5f48ed8dd
-++F test/analyze9.test dac0bdc7eab965b9ad639ca83564d98717aaf13ce5a776f23d9a3680238cecd8
-+ F test/analyzeA.test 3335697f6700c7052295cfd0067fc5b2aacddf9a
-+ F test/analyzeB.test a4c1c3048f6d9e090eb76e83eecb18bcf6d31a70
-+ F test/analyzeC.test 555a6cc388b9818b6eda6df816f01ce0a75d3a93
-+@@ -572,8 +644,9 @@ F test/async3.test d73a062002376d7edc1fe3edff493edbec1fc2f7
-+ F test/async4.test 1787e3952128aa10238bf39945126de7ca23685a
-+ F test/async5.test 383ab533fdb9f7ad228cc99ee66e1acb34cc0dc0
-+ F test/atof1.test ff0b0156fd705b67c506e1f2bfe9e26102bea9bd
-++F test/atomic.test 065a453dde33c77ff586d91ccaa6ed419829d492dbb1a5694b8a09f3f9d7d061
-+ F test/attach.test f4b8918ba2f3e88e6883b8452340545f10a1388af808343c37fc5c577be8281c
-+-F test/attach2.test 0ec5defa340363de6cd50fd595046465e9aaba2d
-++F test/attach2.test 256bd240da1835fb8408dd59fb7ef71f8358c7a756c46662434d11d07ba3a0ce
-+ F test/attach3.test c59d92791070c59272e00183b7353eeb94915976
-+ F test/attach4.test 53bf502f17647c6d6c5add46dda6bac8b6f4665c
-+ F test/attachmalloc.test 3a4bfca9545bfe906a8d2e622de10fbac5b711b0
-+@@ -604,9 +677,11 @@ F test/bestindex1.test 0cf1bd2d7b97d3a3a8c10736125274f64765c4ee
-+ F test/bestindex2.test 4a06b8922ab2fd09434870da8d1cdf525aaf7060
-+ F test/bestindex3.test 578b6a52dab819e63f28e3640e04b32c85aed320
-+ F test/bestindex4.test 4cb5ff7dbaebadb87d366f51969271778423b455
-++F test/bestindex5.test 412b42f8036b28d8b2f3534d89389ad946a4b1a65a12263f51936f7424296f1b
-+ F test/between.test 34d375fb5ce1ae283ffe82b6b233e9f38e84fc6c
-+ F test/bigfile.test aa74f4e5db51c8e54a1d9de9fa65d01d1eb20b59
-+ F test/bigfile2.test 1b489a3a39ae90c7f027b79110d6b4e1dbc71bfc
-++F test/bigmmap.test abe819e6e1ac1db0c3bfe364ff58889d96e7896b2bbc8bdf1afc77cdeb7d7a9b
-+ F test/bigrow.test f0aeb7573dcb8caaafea76454be3ade29b7fc747
-+ F test/bigsort.test 8299fa9298f4f1e02fc7d2712e8b77d6cd60e5a2
-+ F test/bind.test 1e136709b306f7ed3192d349c2930d89df6ab621654ad6f1a72381d3fe76f483
-+@@ -624,7 +699,7 @@ F test/boundary4.test 89e02fa66397b8a325d5eb102b5806f961f8ec4b
-+ F test/btree01.test e08b3613540145b353f20c81cb18ead54ff12e0f
-+ F test/btree02.test fe69453d474d8154d19b904157ff1db4812fed99
-+ F test/btreefault.test c2bcb542685eea44621275cfedbd8a13f65201e3
-+-F test/busy.test 76b4887f8b9160ba903c1ac22e8ff406ad6ae2f0
-++F test/busy.test 510dc6daaad18bcbbc085bcc6217d6dc418def5e73f72ce1475eea0cb7834727
-+ F test/cache.test 13bc046b26210471ca6f2889aceb1ea52dc717de
-+ F test/cacheflush.test af25bb1509df04c1da10e38d8f322d66eceedf61
-+ F test/cachespill.test 895997f84a25b323b166aecb69baab2d6380ea98f9e0bcc688c4493c535cfab9
-+@@ -637,6 +712,7 @@ F test/capi3e.test 3d49c01ef2a1a55f41d73cba2b23b5059ec460fe
-+ F test/cast.test 4c275cbdc8202d6f9c54a3596701719868ac7dc3
-+ F test/cffault.test 9d6b20606afe712374952eec4f8fd74b1a8097ef
-+ F test/check.test 33a698e8c63613449d85d624a38ef669bf20331daabebe3891c9405dd6df463a
-++F test/checkfreelist.test 100283a3e6b8a3018c7fab7cfdaf03d1d6540fc66453114e248cf82b25784d3b
-+ F test/close.test 799ea4599d2f5704b0a30f477d17c2c760d8523fa5d0c8be4a7df2a8cad787d8
-+ F test/closure01.test b1703ba40639cfc9b295cf478d70739415eec6a4
-+ F test/coalesce.test cee0dccb9fbd2d494b77234bccf9dc6c6786eb91
-+@@ -652,7 +728,11 @@ F test/collate9.test 3adcc799229545940df2f25308dd1ad65869145a
-+ F test/collateA.test b8218ab90d1fa5c59dcf156efabb1b2599c580d6
-+ F test/collateB.test 1e68906951b846570f29f20102ed91d29e634854ee47454d725f2151ecac0b95
-+ F test/colmeta.test 2c765ea61ee37bc43bbe6d6047f89004e6508eb1
-++<<<<<<< HEAD
-+ F test/colname.test 08948a4809d22817e0e5de89c7c0a8bd90cb551b
-++=======
-++F test/colname.test c47639d26cbeba6977457e5ef2c2c55c5b6c889478dd7eb0ed858ba894e7fa93
-++>>>>>>> 8a87f7e... sqlite: Upgrade from 3.20.1 to 3.21.0.
-+ F test/conflict.test 029faa2d81a0d1cafb5f88614beb663d972c01db
-+ F test/conflict2.test bb0b94cf7196c64a3cbd815c66d3ee98c2fecd9c
-+ F test/conflict3.test a83db76a6c3503b2fa057c7bfb08c318d8a422202d8bc5b86226e078e5b49ff9
-+@@ -668,7 +748,7 @@ F test/corrupt8.test 2399dfe40d2c0c63af86706e30f3e6302a8d0516
-+ F test/corrupt9.test 730a3db08d4ab9aa43392ea30d9c2b4879cbff85
-+ F test/corruptA.test 112f4b2ae0b95ebf3ea63718642fb969a93acea557ace3a307234d19c245989b
-+ F test/corruptB.test 73a8d6c0b9833697ecf16b63e3c5c05c945b5dec
-+-F test/corruptC.test 46ec43bd90a02fd7b37ad8a7a949c55aa5717f89
-++F test/corruptC.test 138ecb02188ed1a719b533d4a139568204039f72f00e07a8d30d920bd83122db
-+ F test/corruptD.test b3c205fac7952b1de645ce44bb02335cd9e3e040
-+ F test/corruptE.test 82ccf4f8f543fdbedd4aa42c709cb077f7374c62
-+ F test/corruptF.test be9fde98e4c93648f1ba52b74e5318edc8f59fe4
-+@@ -676,7 +756,7 @@ F test/corruptG.test adf79b669cbfd19e28c8191a610d083ae53a6d51
-+ F test/corruptH.test 79801d97ec5c2f9f3c87739aa1ec2eb786f96454
-+ F test/corruptI.test 075fe1d75aa1d84e2949be56b6264376c41502e4
-+ F test/corruptJ.test 4d5ccc4bf959464229a836d60142831ef76a5aa4
-+-F test/corruptK.test 814a59ec699d8546b4e29005fba3d16e933ef2fe
-++F test/corruptK.test 91550557849244a9904f4e090052e3f2c1c3f1106840d58b00ffaa3a8c2d3fc0
-+ F test/cost.test 1eedbfd868f806f3fa08ff072b04cf270dcf61c8
-+ F test/count.test cb2e0f934c6eb33670044520748d2ecccd46259c
-+ F test/coveridxscan.test b629e896b14df2f000a99b8d170d80589c46562c
-+@@ -692,12 +772,13 @@ F test/crashM.test d95f59046fa749b0d0822edf18a717788c8f318d
-+ F test/crashtest1.c 09c1c7d728ccf4feb9e481671e29dda5669bbcc2
-+ F test/createtab.test b5de160630b209c4b8925bdcbbaf48cc90b67fe8
-+ F test/cse.test 277350a26264495e86b1785f34d2d0c8600e021c
-+-F test/csv01.test e0ba3caaa57e4c667a0b45977689fb8082f14348
-++F test/csv01.test 526fc6aefd052badd5a0283f86b4b395c3df76bfe98d96c801f494f5e2c7836c
-+ F test/ctime.test 78749e6c9a5f0010d67985be80788f841e3cd2da18114e2ed6010399a7d807f3
-+ F test/cursorhint.test 7bc346788390475e77a345da2b92270d04d35856
-+ F test/cursorhint2.test 8457e93d97f665f23f97cdbc8477d16e3480331b
-+ F test/date.test 9b73bbeb1b82d9c1f44dec5cf563bf7da58d2373
-+ F test/dbfuzz.c 73047c920d6210e5912c87cdffd9a1c281d4252e
-++F test/dbpage.test 10b9e91d07b0892444fff4578706648e955b5fb260218298f838da74f0d9d211
-+ F test/dbstatus.test 73149851b3aff14fc6db478e58f9083a66422cf5
-+ F test/dbstatus2.test e93ab03bfae6d62d4d935f20de928c19ca0ed0ab
-+ F test/default.test 0cb49b1c315a0d81c81d775e407f66906a2a604d
-+@@ -722,7 +803,7 @@ F test/e_createtable.test d4c6059d44dcd4b636de9aae322766062b471844
-+ F test/e_delete.test ab39084f26ae1f033c940b70ebdbbd523dc4962e
-+ F test/e_droptrigger.test 3cd080807622c13e5bbb61fc9a57bd7754da2412
-+ F test/e_dropview.test 21ce09c361227ddbc9819a5608ee2700c276bdd5
-+-F test/e_expr.test 146deba180273d19e3bf9f6b45f4e50094c64c7ec4756ea72f79dda25818eb17
-++F test/e_expr.test ca8896601ade1e27c6559614c7f32c63d44636fdfa720436a160f09b8bf66c89
-+ F test/e_fkey.test dcdc6ad26b1d4f07636208de4c1c22aae7c0597a685a6c10fe6da91f3191dd96
-+ F test/e_fts3.test 8cf40550bb088a6aa187c818c00fabe26ef82900a4cd5c66b427ccafe28bedaa
-+ F test/e_insert.test f02f7f17852b2163732c6611d193f84fc67bc641fb4882c77a464076e5eba80e
-+@@ -732,7 +813,7 @@ F test/e_select.test 16651bb681e83a1a2875ff4a595ed2b4b4dee375
-+ F test/e_select2.test aceb80ab927d46fba5ce7586ebabf23e2bb0604f
-+ F test/e_totalchanges.test b12ee5809d3e63aeb83238dd501a7bca7fd72c10
-+ F test/e_update.test f46c2554d915c9197548681e8d8c33a267e84528
-+-F test/e_uri.test 25385396082b67fd02ae0038b95a3b3575fe0519
-++F test/e_uri.test 47eeb2960e74613f0f8722b2f13aef08fde69daa16e5380ac93df84dac8b1f72
-+ F test/e_vacuum.test 1b8b4772d05374aa1b8958669138bbb4213ee26a
-+ F test/e_wal.test ae9a593207a77d711443ee69ffe081fda9243625
-+ F test/e_walauto.test 248af31e73c98df23476a22bdb815524c9dc3ba8
-+@@ -743,7 +824,7 @@ F test/enc.test e54531cd6bf941ee6760be041dff19a104c7acea
-+ F test/enc2.test 83437a79ba1545a55fb549309175c683fb334473
-+ F test/enc3.test 6807f7a7740a00361ca8d0ccd66bc60c8dc5f2b6
-+ F test/enc4.test c8f1ce3618508fd0909945beb8b8831feef2c020
-+-F test/eqp.test 3f9ba0b2594837c7beaa3ba824e2137cfe857308f020ec5a0c7a62b444e837b0
-++F test/eqp.test 3fe051af50921284189d1970eb653f9fcf5117d2
-+ F test/errmsg.test eae9f091eb39ce7e20305de45d8e5d115b68fa856fba4ea6757b6ca3705ff7f9
-+ F test/eval.test a64c9105d6ff163df7cf09d6ac29cdad5922078c
-+ F test/exclusive.test 9a57bd66e39144b888ca75c309914fcdefb4e3f9
-+@@ -753,7 +834,7 @@ F test/exists.test 79a75323c78f02bbe9c251ea502a092f9ef63dac
-+ F test/expr.test 66a2c9ac34f74f036faa4092f5402c7d3162fc93
-+ F test/extension01.test 00d13cec817f331a687a243e0e5a2d87b0e358c9
-+ F test/extraquick.test cb254400bd42bfb777ff675356aabf3287978f79
-+-F test/fallocate.test 3e979af17dfa7e5e9dda5eba1a696c04fa9d47f7
-++F test/fallocate.test 87b5e43c872b7e69cd80b7b8813eb102b571a75d45dda24e38b65537bcc85733
-+ F test/filectrl.test 6e871c2d35dead1d9a88e176e8d2ca094fec6bb3
-+ F test/filefmt.test f393e80c4b8d493b7a7f8f3809a8425bbf4292af1f5140f01cb1427798a2bbd4
-+ F test/fkey1.test ba64806ff9a04eecab2679caad377ae99a5e94e4
-+@@ -826,7 +907,7 @@ F test/fts3aux2.test 7ae2b2c13aefdf4169279a27a5f51780ce57f6ba
-+ F test/fts3b.test c15c4a9d04e210d0be67e54ce6a87b927168fbf9c1e3faec8c1a732c366fd491
-+ F test/fts3c.test fc723a9cf10b397fdfc2b32e73c53c8b1ec02958
-+ F test/fts3comp1.test a0f5b16a2df44dd0b15751787130af2183167c0c
-+-F test/fts3conf.test 60317efd562080e198b5bdc9fcd222ce32cf01d7
-++F test/fts3conf.test c84bbaec81281c1788aa545ac6e78a6bd6cde2bdbbce2da261690e3659f5a76b
-+ F test/fts3corrupt.test 2710b77983cc7789295ddbffea52c1d3b7506dbb
-+ F test/fts3corrupt2.test 6d96efae2f8a6af3eeaf283aba437e6d0e5447ba
-+ F test/fts3corrupt3.test 56e0ee83e90b57f5f3644cb7d1b36a067b7b8b19cdf0dedce45e5e13cf752f65
-+@@ -854,6 +935,7 @@ F test/fts3offsets.test b85fd382abdc78ebce721d8117bd552dfb75094c
-+ F test/fts3prefix.test fa794eaab0bdae466494947b0b153d7844478ab2
-+ F test/fts3prefix2.test e1f0a822ca661dced7f12ce392e14eaf65609dce
-+ F test/fts3query.test f33eb71a1fe1084ea585eeb7ee76b390729f5170
-++F test/fts3rank.test e4d2e16a28c98cae95001a75e2b4b05b19b051ffd6aaab15491c5e0595127b9b
-+ F test/fts3rnd.test 1320d8826a845e38a96e769562bf83d7a92a15d0
-+ F test/fts3shared.test 57e26a801f21027b7530da77db54286a6fe4997e
-+ F test/fts3snippet.test 01a4231816e03a0660ae53ba2404fe69012fe0db
-+@@ -901,7 +983,7 @@ F test/fuzzer2.test a85ef814ce071293bce1ad8dffa217cbbaad4c14
-+ F test/fuzzerfault.test 8792cd77fd5bce765b05d0c8e01b9edcf8af8536
-+ F test/gcfault.test dd28c228a38976d6336a3fc42d7e5f1ad060cb8c
-+ F test/genesis.tcl 1e2e2e8e5cc4058549a154ff1892fe5c9de19f98
-+-F test/having.test b3d6b17cc9601b6b373b2d0f08c075ccf30e2d307249c3c8a236e3c36907b1a5
-++F test/having.test e4098a4b8962f9596035c3b87a8928a10648acc509f1bb8d6f96413bbf79a1b3
-+ F test/hexlit.test 4a6a5f46e3c65c4bf1fa06f5dd5a9507a5627751
-+ F test/hidden.test 23c1393a79e846d68fd902d72c85d5e5dcf98711
-+ F test/hook.test dbc0b87756e1e20e7497b56889c9e9cd2f8cc2b5
-+@@ -935,8 +1017,13 @@ F test/index7.test 7feababe16f2091b229c22aff2bcc1d4d6b9d2bb
-+ F test/index8.test bc2e3db70e8e62459aaa1bd7e4a9b39664f8f9d7
-+ F test/index9.test 0aa3e509dddf81f93380396e40e9bb386904c1054924ba8fa9bcdfe85a8e7721
-+ F test/indexedby.test 9c4cd331224e57f79fbf411ae245e6272d415985
-++<<<<<<< HEAD
-+ F test/indexexpr1.test 1857373a97e4795ce4119caf05cbb148bdabe1c8738fc0b7e5e240abb6adbe4e
-+ F test/indexexpr2.test 3ddd7f23bc381b9f2b7a15f2d083b1a4078e7733dce8295602ecfa3c74a34cf9
-++=======
-++F test/indexexpr1.test 84100e880154a4b645db9f4fc7642756d9a2b6011b68f73c8efda4d244816de9
-++F test/indexexpr2.test 13247bac49143196556eb3f65e97ef301bd3e993f4511558b5db322ddc370ea6
-++>>>>>>> 8a87f7e... sqlite: Upgrade from 3.20.1 to 3.21.0.
-+ F test/indexfault.test 31d4ab9a7d2f6e9616933eb079722362a883eb1d
-+ F test/init.test 15c823093fdabbf7b531fe22cf037134d09587a7
-+ F test/insert.test 38742b5e9601c8f8d76e9b7555f7270288c2d371
-+@@ -974,10 +1061,10 @@ F test/json102.test eeb54efa221e50b74a2d6fb9259963b48d7414dca3ce2fdfdeed45cb2848
-+ F test/json103.test c5f6b85e69de05f6b3195f9f9d5ce9cd179099a0
-+ F test/json104.test 877d5845f6303899b7889ea5dd1bea99076e3100574d5c536082245c5805dcaa
-+ F test/keyword1.test 37ef6bba5d2ed5b07ecdd6810571de2956599dff
-+-F test/kvtest.c d2b8cfc91047ebf6cac4f3a04f19c3a864e4ecfd683bbb65c395df450b8dc79c
-++F test/kvtest.c fcb38ffe3db028a3138b4818fc098359c80dc51a0d1278a91c99c554cc1abb92
-+ F test/lastinsert.test 42e948fd6442f07d60acbd15d33fb86473e0ef63
-+ F test/laststmtchanges.test ae613f53819206b3222771828d024154d51db200
-+-F test/like.test 3d26ae14d7042a0e96f7b0b9e9ad2c8ca6ed122772439c6b1c691fe167e15a37
-++F test/like.test 11cfd7d4ef8625389df9efc46735ff0b0b41d5e62047ef0f3bc24c380d28a7a6
-+ F test/like2.test 3b2ee13149ba4a8a60b59756f4e5d345573852da
-+ F test/like3.test 3608a2042b6f922f900fbfd5d3ce4e7eca57f7c4
-+ F test/limit.test 0c99a27a87b14c646a9d583c7c89fd06c352663e
-+@@ -992,7 +1079,7 @@ F test/lock5.test c6c5e0ebcb21c61a572870cc86c0cb9f14cede38
-+ F test/lock6.test ad5b387a3a8096afd3c68a55b9535056431b0cf5
-+ F test/lock7.test 49f1eaff1cdc491cc5dee3669f3c671d9f172431
-+ F test/lock_common.tcl 7ffb45accf6ee91c736df9bafe0806a44358f035
-+-F test/lookaside.test 90052e87282de256d613fcf8c9cbb845e4001d2f
-++F test/lookaside.test b17c99ae3aef96a8c9fa6f6be33cc75b93d657cb791d3827302b6835b71941f7
-+ F test/main.test bb75e406c9b64931f3dc7e7f04626633365bb22f
-+ F test/make-where7.tcl 05c16b5d4f5d6512881dfec560cb793915932ef9
-+ F test/malloc.test 21c213365f2cca95ab2d7dc078dc8525f96065f8
-+@@ -1022,13 +1109,13 @@ F test/manydb.test 28385ae2087967aa05c38624cec7d96ec74feb3e
-+ F test/mem5.test c6460fba403c5703141348cd90de1c294188c68f
-+ F test/memdb.test c1f2a343ad14398d5d6debda6ea33e80d0dafcc7
-+ F test/memleak.test 10b9c6c57e19fc68c32941495e9ba1c50123f6e2
-+-F test/memsubsys1.test 6d268d0ae90f8d61a2356a1838665654d83de518
-++F test/memsubsys1.test 9e7555a22173b8f1c96c281ce289b338fcba2abe8b157f8798ca195bbf1d347e
-+ F test/memsubsys2.test 3e4a8d0c05fd3e5fa92017c64666730a520c7e08
-+ F test/minmax.test 6751e87b409fe11b02e70a306d846fa544e25a41
-+ F test/minmax2.test b44bae787fc7b227597b01b0ca5575c7cb54d3bc
-+ F test/minmax3.test cc1e8b010136db0d01a6f2a29ba5a9f321034354
-+ F test/minmax4.test 936941484ebdceb8adec7c86b6cd9b6e5e897c1f
-+-F test/misc1.test 6430dabfb4b4fa480633590118964201f94d3ccc
-++F test/misc1.test 76737c259537586355f45e2a1e121b6e91b5476c4604ad5c53d1abfcb3acf786
-+ F test/misc2.test 00d7de54eda90e237fc9a38b9e5ccc769ebf6d4d
-+ F test/misc3.test cf3dda47d5dda3e53fc5804a100d3c82be736c9d
-+ F test/misc4.test 0d8be3466adf123a7791a66ba2bc8e8d229e87f3
-+@@ -1037,18 +1124,20 @@ F test/misc6.test 953cc693924d88e6117aeba16f46f0bf5abede91
-+ F test/misc7.test edd0b63e2ee29a256900b0514f6fff27e19e9bb2
-+ F test/misc8.test ba03aaa08f02d62fbb8d3b2f5595c1b33aa9bbc5
-+ F test/misuse.test 9e7f78402005e833af71dcab32d048003869eca5abcaccc985d4f8dc1d86bcc7
-++F test/mjournal.test 68b749956f9a179e7e633a3958b48a5a905d28d30c7ec88f3f26dc6f220129db
-+ F test/mmap1.test d2cfc1635171c434dcff0ece2f1c8e0a658807ce
-+ F test/mmap2.test 9d6dd9ddb4ad2379f29cc78f38ce1e63ed418022
-+ F test/mmap3.test b3c297e78e6a8520aafcc1a8f140535594c9086e
-+ F test/mmap4.test 2e2b4e32555b58da15176e6fe750f17c9dcf7f93
-+ F test/mmapfault.test d4c9eff9cd8c2dc14bc43e71e042f175b0a26fe3
-++F test/mmapwarm.test 2272005969cd17a910077bd5082f70bc1fefad9a875afec7fc9af483898ecaf3
-+ F test/multiplex.test dc0d67b66f84b484a83cb8bbdf3f0a7f49562ccd
-+ F test/multiplex2.test 580ca5817c7edbe4cc68fa150609c9473393003a
-+ F test/multiplex3.test d228f59eac91839a977eac19f21d053f03e4d101
-+ F test/multiplex4.test e8ae4c4bd70606a5727743241f13b5701990abe4
-+ F test/mutex1.test ea2cc74d97f077b9e74c84cbd024f14d79a8126f
-+ F test/mutex2.test bfeaeac2e73095b2ac32285d2756e3a65e681660
-+-F test/nan.test dacc57f80859c06a433d30839336fe227d2038b3
-++F test/nan.test 437d40e6d0778b050d7750726c0cbd2c9936b81962926e8f8c48ca698f00f4d1
-+ F test/nockpt.test 9a436a7213ba5ef7a32304998d386d3ea3f76c9d
-+ F test/nolock.test f196cf8b8fbea4e2ca345140a2b3f3b0da45c76e
-+ F test/notify1.test 669b2b743618efdc18ca4b02f45423d5d2304abf
-+@@ -1070,7 +1159,7 @@ F test/orderby7.test 3d1383d52ade5b9eb3a173b3147fdd296f0202da
-+ F test/orderby8.test 23ef1a5d72bd3adcc2f65561c654295d1b8047bd
-+ F test/orderby9.test 87fb9548debcc2cd141c5299002dd94672fa76a3
-+ F test/oserror.test b32dc34f2363ef18532e3a0a7358e3e7e321974f
-+-F test/ossfuzz.c f5abed3177f719df3c3109901fcdd26b9fb7f581c8da50fc26f3a81ddfb2c2ae
-++F test/ossfuzz.c 7f5cc87a0280a5854c1bfa7d5c4d07d34731f08ec34dc9c916aa35ed292b1468
-+ F test/ossshell.c 296ab63067841bd1b1e97b46a0b2af48ee7f69d50d1a723008bee12dd7122622
-+ F test/ovfl.test 199c482696defceacee8c8e0e0ef36da62726b2f
-+ F test/pager1.test 8149b2a8986fee667ab6a8171ab310be19e77ae215bebad0e90c857b0df1935c
-+@@ -1086,11 +1175,12 @@ F test/parser1.test 391b9bf9a229547a129c61ac345ed1a6f5eb1854
-+ F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
-+ F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
-+ F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
-+-F test/permutations.test 5e2e5439642898e0947ced066ad09b82bd817ddfb83dc71291b4c957efc84b62
-+-F test/pragma.test f274259d6393b6681eb433beb8dd39a26ec06a4431052a4880b43b84912a3f58
-++F test/permutations.test 490e3333b9b1aefb7ebc6e9ab2ae0e382b7dd8713ccc4a2786b0f75467c2ab6b
-++F test/pragma.test 7c8cfc328a1717a95663cf8edb06c52ddfeaf97bb0aee69ae7457132e8d39e7d
-+ F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
-+ F test/pragma3.test 14c12bc5352b1e100e0b6b44f371053a81ccf8ed
-+-F test/pragma4.test 6e85b6eab8e61ffc9c7db59d842276674e8e3264
-++F test/pragma4.test 3046501bee2f652dc2a4f9c87781e2741361d6864439c8381aba6c3b774b335c
-++F test/pragma5.test fd517f42ee847e126afbbbd9fd0fb9e5a4a61a962496a350adb8a22583fbdc37
-+ F test/pragmafault.test 275edaf3161771d37de60e5c2b412627ac94cef11739236bec12ed1258b240f8
-+ F test/printf.test b3ff34e73d59124140eaf89f7672e21bc2ca5fcc
-+ F test/printf2.test 9e6db85f81c63f2367c34a9d7db384088bd374ad
-+@@ -1110,9 +1200,9 @@ F test/rdonly.test 64e2696c322e3538df0b1ed624e21f9a23ed9ff8
-+ F test/regexp1.test 497ea812f264d12b6198d6e50a76be4a1973a9d8
-+ F test/regexp2.test 40e894223b3d6672655481493f1be12012f2b33c
-+ F test/reindex.test 44edd3966b474468b823d481eafef0c305022254
-+-F test/releasetest.tcl 7bb585433ce7fb2a2c255ae4b5e24f1bc27fe177ec1120f886cc4852f48f5ee9 x
-++F test/releasetest.tcl 0b0b3d926e36822ff63b405d683544ce1014303b029f2678bbcf40c162b5f246 x
-+ F test/resolver01.test f4022acafda7f4d40eca94dbf16bc5fc4ac30ceb
-+-F test/rollback.test 458fe73eb3ffdfdf9f6ba3e9b7350a6220414dea
-++F test/rollback.test f580934279800d480a19176c6b44909df31ce7ad45267ea475a541daa522f3d3
-+ F test/rollback2.test 8435d6ff0f13f51d2a4181c232e706005fa90fc5
-+ F test/rollbackfault.test 0e646aeab8840c399cfbfa43daab46fd609cf04a
-+ F test/rowallock.test 3f88ec6819489d0b2341c7a7528ae17c053ab7cc
-+@@ -1130,22 +1220,23 @@ F test/rowvalue9.test d8dd2c6ecac432dadaa79e41dc2434f007be1b6b
-+ F test/rowvaluefault.test 7cd9ccc6c2fbdd881672984087aad0491bb75504
-+ F test/rtree.test 0c8d9dd458d6824e59683c19ab2ffa9ef946f798
-+ F test/run-wordcount.sh 891e89c4c2d16e629cd45951d4ed899ad12afc09
-+-F test/savepoint.test c671fdbd34cd3bfe1518a777526ada595180cf8d
-++F test/savepoint.test 1f8a6b1aea9a0d05837adc463d4bf47bd9d0f1c842f1c2a9caccd639baf34bf9
-+ F test/savepoint2.test 9b8543940572a2f01a18298c3135ad0c9f4f67d7
-+ F test/savepoint4.test c8f8159ade6d2acd9128be61e1230f1c1edc6cc0
-+ F test/savepoint5.test 0735db177e0ebbaedc39812c8d065075d563c4fd
-+ F test/savepoint6.test f41279c5e137139fa5c21485773332c7adb98cd7
-+ F test/savepoint7.test cde525ea3075283eb950cdcdefe23ead4f700daa
-+ F test/savepointfault.test f044eac64b59f09746c7020ee261734de82bf9b2
-+-F test/scanstatus.test 5253c219e331318a437f436268e0e82345700285
-++F test/scanstatus.test 1ba0e2ee25dcd1d55ec770803b19832cffaecbf0b15d376807759ebeed3669b0
-+ F test/schema.test 8f7999be894260f151adf15c2c7540f1c6d6a481
-+ F test/schema2.test 906408621ea881fdb496d878b1822572a34e32c5
-+ F test/schema3.test 1bc1008e1f8cb5654b248c55f27249366eb7ed38
-+ F test/schema4.test 3b26c9fa916abb6dadf894137adcf41b7796f7b9
-+ F test/schema5.test 29699b4421f183c8f0e88bd28ce7d75d13ea653e
-++F test/schema6.test e4bd1f23d368695eb9e7b51ef6e02ca0642ea2ab4a52579959826b5e7dce1f9b
-+ F test/securedel.test 5f997cb6bd38727b81e0985f53ec386c99db6441b2b9e6357240649d29017239
-+ F test/securedel2.test 2d54c28e46eb1fd6902089958b20b1b056c6f1c5
-+-F test/select1.test be62204d2bd9a5a8a149e9974cfddce893d8f686
-++F test/select1.test 460a5824df01575b18f7fa4bd8e40d09de20c542e90c1543e164bc7d3b0a0bb7
-+ F test/select2.test 352480e0e9c66eda9c3044e412abdf5be0215b56
-+ F test/select3.test 2ce595f8fb8e2ac10071d3b4e424cadd4634a054
-+ F test/select4.test 5389d9895968d1196c457d59b3ee6515d771d328
-+@@ -1192,7 +1283,7 @@ F test/skipscan3.test ec5bab3f81c7038b43450e7b3062e04a198bdbb5
-+ F test/skipscan5.test 67817a4b6857c47e0e33ba3e506da6f23ef68de2
-+ F test/skipscan6.test 5866039d03a56f5bd0b3d172a012074a1d90a15b
-+ F test/snapshot.test 85735bd997a4f6d710140c28fd860519a299649f
-+-F test/snapshot2.test 867652ed4a13282dce218723535fad1c7b44c3c4
-++F test/snapshot2.test 925e42427e923262db63c9d7155183f889e3e99feaedec4075f659e51608344f
-+ F test/snapshot_fault.test 52c5e97ebd218846a8ae2da4d147d3e77d71f963
-+ F test/soak.test 0b5b6375c9f4110c828070b826b3b4b0bb65cd5f
-+ F test/softheap1.test 843cd84db9891b2d01b9ab64cef3e9020f98d087
-+@@ -1210,7 +1301,7 @@ F test/speed3.test 694affeb9100526007436334cf7d08f3d74b85ef
-+ F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
-+ F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
-+ F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b
-+-F test/speedtest1.c 7b1ab42b097b484c18d99e1d1c71a6a0c9c87a7a
-++F test/speedtest1.c e44c5fccddcfe916c3bf7fe2f87dcc4b4fd66a0d923eb83515f311212670f267
-+ F test/spellfix.test f9c1f431e2c096c8775fec032952320c0e4700db
-+ F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3
-+ F test/spellfix3.test 0f9efaaa502a0e0a09848028518a6fb096c8ad33
-+@@ -1228,10 +1319,13 @@ F test/subselect.test 0966aa8e720224dbd6a5e769a3ec2a723e332303
-+ F test/substr.test 18f57c4ca8a598805c4d64e304c418734d843c1a
-+ F test/subtype1.test 7fe09496352f97053af1437150751be2d0a0cae8
-+ F test/superlock.test ec94f0556b6488d97f71c79f9061ae08d9ab8f12
-++F test/swarmvtab.test c2279311b44de032f86a8295a9b06818d864856f9428b4c99eee91a0d419cf25
-++F test/swarmvtab2.test 9a3a68a1e58d00f4ed6c68d12d52f2df971b9e22a80a41f6f8c1409abba8e5b4
-++F test/swarmvtabfault.test 00aec54665909490f5c383f3cae3b5d18bd97c12490b429ff8752a3027acfa42
-+ F test/symlink.test c9ebe7330d228249e447038276bfc8a7b22f4849
-+ F test/sync.test 2f84bdbc2b2df1fcb0220575b4b9f8cea94b7529
-+ F test/sync2.test 6be8ed007fa063b147773c1982b5bdba97a32badc536bdc6077eff5cf8710ece
-+-F test/syscall.test 7a60601770172a8014a4d222d5f3d95a5d2b5c47fbb0374e2698e89c99e37256
-++F test/syscall.test a39d9a36f852ae6e4800f861bc2f2e83f68bbc2112d9399931ecfadeabd2d69d
-+ F test/sysfault.test c9f2b0d8d677558f74de750c75e12a5454719d04
-+ F test/tabfunc01.test c47171c36b3d411df2bd49719dcaa5d034f8d277477fd41d253940723b969a51
-+ F test/table.test b708f3e5fa2542fa51dfab21fc07b36ea445cb2f
-+@@ -1245,7 +1339,7 @@ F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
-+ F test/temptable2.test cd396beb41117a5302fff61767c35fa4270a0d5e
-+ F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
-+ F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
-+-F test/tester.tcl 581f0185434daf7026ccede4c07e8d1479186ec5
-++F test/tester.tcl 9948bd856ce8a1c127f2f7900365387a42a917ce0dc87185bdd128fa5b11aff2
-+ F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
-+ F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
-+ F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
-+@@ -1432,8 +1526,13 @@ F test/tt3_vacuum.c 1753f45917699c9c1f66b64c717a717c9379f776
-+ F test/types.test bf816ce73c7dfcfe26b700c19f97ef4050d194ff
-+ F test/types2.test 1aeb81976841a91eef292723649b5c4fe3bc3cac
-+ F test/types3.test 99e009491a54f4dc02c06bdbc0c5eea56ae3e25a
-++<<<<<<< HEAD
-+ F test/unionvtab.test 3cb7463d8c6a34ae7c043e53103d63d19465a1488f4587a981ae05e978cc6d26
-+ F test/unionvtabfault.test ccb87c510efd0da88d90d813cfaeebe69f2be78cdfbdc3343b04fd9fc507d887
-++=======
-++F test/unionvtab.test 595fb601de00188ca5e7c6dbe266c17a0faf234cf434ce85eccec1a929ef9baf
-++F test/unionvtabfault.test 26b6854d5aef9005cd630513025690bff1b7378ae9c97b81e2a3cbe84eee0f58
-++>>>>>>> 8a87f7e... sqlite: Upgrade from 3.20.1 to 3.21.0.
-+ F test/unique.test 93f8b2ef5ea51b9495f8d6493429b1fd0f465264
-+ F test/unique2.test 3674e9f2a3f1fbbfd4772ac74b7a97090d0f77d2
-+ F test/unixexcl.test d936ba2b06794018e136418addd59a2354eeae97
-+@@ -1454,7 +1553,7 @@ F test/varint.test ab7b110089a08b9926ed7390e7e97bdefeb74102
-+ F test/veryquick.test 57ab846bacf7b90cf4e9a672721ea5c5b669b661
-+ F test/view.test 765802c7a66d37fabd5ac8e2f2dbe572b43eb9ab
-+ F test/vtab1.test 8f91b9538d1404c3932293a588c4344218a0c94792d4289bb55e41020e7b3fff
-+-F test/vtab2.test f8cd1bb9aba7143eba97812d9617880a36d247ad
-++F test/vtab2.test 14d4ab26cee13ba6cf5c5601b158e4f57552d3b055cdd9406cf7f711e9c84082
-+ F test/vtab3.test b45f47d20f225ccc9c28dc915d92740c2dee311e
-+ F test/vtab4.test 8e73ed268f3d596bc3590f45fc948fb40f28e9c3
-+ F test/vtab5.test 889f444970393c73f1e077e2bdc5d845e157a391
-+@@ -1466,15 +1565,16 @@ F test/vtabA.test 1317f06a03597eee29f40a49b6c21e1aaba4285f
-+ F test/vtabB.test 04df5dc531b9f44d9ca65b9c1b79f12b5922a796
-+ F test/vtabC.test 4528f459a13136f982e75614d120aef165f17292
-+ F test/vtabD.test 05b3f1d77117271671089e48719524b676842e96
-+-F test/vtabE.test d5024aa42754962f6bb0afd261681686488e7afe
-++F test/vtabE.test 2a143fe75a11275781d1fd1988d86b66a3f69cb98f4add62e3da8fd0f637b45f
-+ F test/vtabF.test 1918844c7c902f6a16c8dacf1ec8f84886d6e78b
-+-F test/vtabH.test 26d54e8b5407f797638b787a55f9c88323850a58dd142de02d06b9a1159bd283
-++F test/vtabH.test 3cf9aa1c1c4381b3b3ac33f933376f06fbb99d2294a83c79b7562d3ed87be450
-+ F test/vtabI.test 751b07636700dbdea328e4265b6077ccd6811a3f
-++F test/vtabJ.test d7b73675708cf63cfcb9d443bb451fc01a028347275b7311e51f9fdf3ca6757f
-+ F test/vtab_alter.test 736e66fb5ec7b4fee58229aa3ada2f27ec58bc58c00edae4836890c3784c6783
-+ F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
-+ F test/vtab_shared.test 5253bff2355a9a3f014c15337da7e177ab0ef8ad
-+ F test/wal.test 613efec03e517e1775d86b993a54877d2e29a477
-+-F test/wal2.test 56b0bc95b8693a0be294f8d210c49025dd094bd7
-++F test/wal2.test 6ac39b94a284ebac6efb6be93b0cdfe73ee6083f129555e3144d8a615e9900ef
-+ F test/wal3.test 2a93004bc0fb2b5c29888964024695bade278ab2
-+ F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
-+ F test/wal5.test 9c11da7aeccd83a46d79a556ad11a18d3cb15aa9
-+@@ -1512,12 +1612,12 @@ F test/where6.test 5da5a98cec820d488e82708301b96cb8c18a258b
-+ F test/where7.test f520bcec2c3d12dc4615623b06b2aec7c2d67e94
-+ F test/where8.test 98eedca0d375fb400b8377269c4b4686582dfb45
-+ F test/where9.test 729c3ba9b47e8f9f1aab96bae7dad2a524f1d1a2
-+-F test/whereA.test 4d253178d135ec46d1671e440cd8f2b916aa6e6b
-++F test/whereA.test 6c6a420ca7d313242f9b1bd471dc80e4d0f8323700ba9c78df0bb843d4daa3b4
-+ F test/whereB.test 0def95db3bdec220a731c7e4bec5930327c1d8c5
-+ F test/whereC.test cae295158703cb3fc23bf1a108a9ab730efff0f6
-+ F test/whereD.test 711d4df58d6d4fb9b3f5ce040b818564198be002
-+ F test/whereE.test b3a055eef928c992b0a33198a7b8dc10eea5ad2f
-+-F test/whereF.test 97a86ecdfa4c21684fdff501dbd2cb7397689be8676d0dbad1f5a0892c6b56a3
-++F test/whereF.test d44b58338fe5ddd7286023e9bedb255aa264a6c4d2168b49591b167371c675c7
-+ F test/whereG.test dde4c52a97385a55be6a7cd46be8373f0cf35501
-+ F test/whereH.test e4b07f7a3c2f5d31195cd33710054c78667573b2
-+ F test/whereI.test eab5b226bbc344ac70d7dc09b963a064860ae6d7
-+@@ -1526,7 +1626,7 @@ F test/whereK.test f8e3cf26a8513ecc7f514f54df9f0572c046c42b
-+ F test/wherefault.test 1374c3aa198388925246475f84ad4cd5f9528864
-+ F test/wherelimit.test 5e9fd41e79bb2b2d588ed999d641d9c965619b31
-+ F test/wild001.test bca33f499866f04c24510d74baf1e578d4e44b1c
-+-F test/win32heap.test ea19770974795cff26e11575e12d422dbd16893c
-++F test/win32heap.test 10fd891266bd00af68671e702317726375e5407561d859be1aa04696f2aeee74
-+ F test/win32lock.test fbf107c91d8f5512be5a5b87c4c42ab9fdd54972
-+ F test/win32longpath.test 169c75a3b2e43481f4a62122510210c67b08f26d
-+ F test/win32nolock.test ac4f08811a562e45a5755e661f45ca85892bdbbc
-+@@ -1540,13 +1640,14 @@ F test/without_rowid3.test 2724c787a51a5dce09d078453a758117b4b728f1
-+ F test/without_rowid4.test 4e08bcbaee0399f35d58b5581881e7a6243d458a
-+ F test/without_rowid5.test 89b1c587bd92a0590e440da33e7666bf4891572a
-+ F test/without_rowid6.test 1f99644e6508447fb050f73697350c7ceca3392e
-+-F test/wordcount.c 06efb84b7c48a4973c2c24ea06c93d00bce24389
-++F test/wordcount.c cb589cec469a1d90add05b1f8cee75c7210338d87a5afd65260ed5c0f4bbf8ac
-++F test/writecrash.test f1da7f7adfe8d7f09ea79b42e5ca6dcc41102f27f8e334ad71539501ddd910cc
-+ F test/zeroblob.test 3857870fe681b8185654414a9bccfde80b62a0fa
-+ F test/zerodamage.test e59a56443d6298ecf7435f618f0b27654f0c849e
-+ F tool/GetFile.cs a15e08acb5dd7539b75ba23501581d7c2b462cb5
-+ F tool/GetTclKit.bat 6afa640edc7810725aec61c3076ac617c4aaf0b7
-+ F tool/Replace.cs 02c67258801c2fb5f63231e0ac0f220b4b36ba91
-+-F tool/addopcodes.tcl edbd53806bf20e25af2373ad0c091be4385081c1aa1813b916bf093f94ed8380
-++F tool/addopcodes.tcl 7181c041d495e3f26acc36d15c86923ed722285f9015f017f41a3efdb9a0dab4
-+ F tool/build-all-msvc.bat c12328d06c45fec8baada5949e3d5af54bf8c887 x
-+ F tool/build-shell.sh 950f47c6174f1eea171319438b93ba67ff5bf367
-+ F tool/cg_anno.tcl f95b0006c52cf7f0496b506343415b6ee3cdcdd3 x
-+@@ -1560,25 +1661,27 @@ F tool/genfkey.README cf68fddd4643bbe3ff8e31b8b6d8b0a1b85e20f4
-+ F tool/genfkey.test 4196a8928b78f51d54ef58e99e99401ab2f0a7e5
-+ F tool/getlock.c f4c39b651370156cae979501a7b156bdba50e7ce
-+ F tool/kvtest-speed.sh 4761a9c4b3530907562314d7757995787f7aef8f
-+-F tool/lemon.c 5a04dff28578a67415cea5bf981b893c50cebfdd4388fb21254d1892525edfd8
-+-F tool/lempar.c 10579a61dc2290182725e7abdefe311dd8b521a8f7f0aabbfc571e9012a09eaf
-++F tool/lemon.c e6056373044d55296d21f81467dba7632bbb81dc49af072b3f0e76338771497e
-++F tool/lempar.c 105d0d9cbe5a25d24d4769241ffbfc63ac7c09e6ccee0dc43dcc8a4c4ae4e426
-+ F tool/libvers.c caafc3b689638a1d88d44bc5f526c2278760d9b9
-+ F tool/loadfts.c c3c64e4d5e90e8ba41159232c2189dba4be7b862
-+ F tool/logest.c 11346aa019e2e77a00902aa7d0cabd27bd2e8cca
-+ F tool/max-limits.c cbb635fbb37ae4d05f240bfb5b5270bb63c54439
-+-F tool/mkautoconfamal.sh e855df211ecbcc7131dee817110ff386cfb112f7
-++F tool/mkautoconfamal.sh 422fc365358a2e92876ffc62971a0ff28ed472fc8bcf9de0df921c736fdeca5e
-++F tool/mkccode.tcl 86463e68ce9c15d3041610fedd285ce32a5cf7a58fc88b3202b8b76837650dbe x
-+ F tool/mkctimec.tcl dd183b73ae1c28249669741c250525f0407e579a70482371668fd5f130d9feb3
-+ F tool/mkkeywordhash.c 2e852ac0dfdc5af18886dc1ce7e9676d11714ae3df0a282dc7d90b3a0fe2033c
-+ F tool/mkmsvcmin.tcl cbd93f1cfa3a0a9ae56fc958510aa3fc3ac65e29cb111716199e3d0e66eefaa4
-+ F tool/mkopcodec.tcl d1b6362bd3aa80d5520d4d6f3765badf01f6c43c
-+-F tool/mkopcodeh.tcl bb04ab6e5e2000c91e0c69a597e7e36e002320d123e2e1944cb2819181b72ee9
-++F tool/mkopcodeh.tcl 4ee2a30ccbd900dc4d5cdb61bdab87cd2166cd2affcc78c9cc0b8d22a65b2eee
-+ F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
-+ F tool/mkpragmatab.tcl 2144bc8550a6471a029db262a132d2df4b9e0db61b90398bf64f5b7b3f8d92cd
-+-F tool/mkshellc.tcl 69c38ecd7b74b2b0799a35ce20e1e3998e504d8c99c100ca4b98ae9d8f6279bc
-++F tool/mkshellc.tcl 574307265b49d813301fba91ccd74e6a26d33f65f74b6891c320a0ffbee07895
-++F tool/mksourceid.c d458f9004c837bee87a6382228ac20d3eae3c49ea3b0a5aace936f8b60748d3b
-+ F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
-+ F tool/mksqlite3c-noext.tcl fef88397668ae83166735c41af99d79f56afaabb
-+-F tool/mksqlite3c.tcl f6214285bec900d28441366ca31af327aade18bbc424b0480497966ec05bc43c
-+-F tool/mksqlite3h.tcl 51bd5e7e840a920388a5966c9f2ccc618f434c57bd68c1bab4085b2553e1e237
-++F tool/mksqlite3c.tcl 1fb69d39166f52d802a70ec37d99bca51d011c8ab30be27bc495be493196ae41
-++F tool/mksqlite3h.tcl f92f994d9709aeb9e2b6e6f9fc8b069d2f55202c8e23f453edc44390a25982dc
-+ F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
-+ F tool/mkvsix.tcl b9e0777a213c23156b6542842c238479e496ebf5
-+ F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
-+@@ -1596,23 +1699,23 @@ F tool/showstat4.c 0682ebea7abf4d3657f53c4a243f2e7eab48eab344ed36a94bb75dcd19a5c
-+ F tool/showwal.c ad9d768f96ca6199ad3a8c9562d679680bd032dd01204ea3e5ea6fb931d81847
-+ F tool/soak1.tcl 8d407956e1a45b485a8e072470a3e629a27037fe
-+ F tool/spaceanal.tcl f40dc82b4d5e39d040a02a3ec38268e324068815e4292a15ffa30ee93208bbfd
-+-F tool/speed-check.sh fd24151fd66465f01886c3f75faf8fa46d19f068c69d16514ca73887adcdafe4
-++F tool/speed-check.sh a97ae367e9172a706101901e7caef48f1a14fc8a49053b25e79f6a67296b3412
-+ F tool/speedtest.tcl 06c76698485ccf597b9e7dbb1ac70706eb873355
-+ F tool/speedtest16.c ecb6542862151c3e6509bbc00509b234562ae81e
-+ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
-+ F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
-+ F tool/speedtest8inst1.c 7ce07da76b5e745783e703a834417d725b7d45fd
-+-F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
-++F tool/split-sqlite3c.tcl 3efcd4240b738f6bb2b5af0aea7e1e0ef9bc1c61654f645076cec883030b710c
-+ F tool/sqldiff.c 30879bbc8de686df4624e86adce2d8981f500904c1cfb55b5d1eea2ffd9341eb
-++F tool/sqlite3_analyzer.c.in 771d15fb9c67645fd8ef932a438f98959da4b7c7da3cb87ae1850b27c969edf3
-+ F tool/srcck1.c 371de5363b70154012955544f86fdee8f6e5326f
-+ F tool/stack_usage.tcl f8e71b92cdb099a147dad572375595eae55eca43
-+ F tool/symbols-mingw.sh 4dbcea7e74768305384c9fd2ed2b41bbf9f0414d
-+ F tool/symbols.sh c5a617b8c61a0926747a56c65f5671ef8ac0e148
-+-F tool/tostr.tcl 96022f35ada2194f6f8ccf6fd95809e90ed277c4
-+ F tool/varint.c 5d94cb5003db9dbbcbcc5df08d66f16071aee003
-+ F tool/vdbe-compress.tcl 5926c71f9c12d2ab73ef35c29376e756eb68361c
-+ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
-+-F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
-++F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
-+ F tool/warnings.sh 8a4acea31e0f9c562949a2d767329533c0930d699ea19c6704c0ca0aa9154068
-+ F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-+ F vsixtest/App.xaml b76d3b48860e7454775c47ea38ffea9c4abe3e85
-+@@ -1636,6 +1739,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
-+ F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
-+ F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
-+ F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-++<<<<<<< HEAD
-+ P d14fc621e918915bbf8e04597eb238ea78dff3d9c5eb4402cb88692d00dbdfee
-+ R 71a176dbaf167be1fc010ab41b45c196
-+ T *branch * index-on-date-func
-+@@ -1643,4 +1747,13 @@ T *sym-index-on-date-func *
-+ T -sym-trunk *
-+ U drh
-+ Z 6174c3091e77280f162146b58b68a8ad
-++=======
-++P 41ef34a1f0650c50cacb203665cd9d57db53a49c979bf0d5a78937517f763a2c
-++R ba55e91a353da744095752f95418b3a4
-++T +bgcolor * #d0c0ff
-++T +sym-release *
-++T +sym-version-3.21.0 *
-++U drh
-++Z c165baaf48a254c276ef91f282f216a1
-++>>>>>>> 8a87f7e... sqlite: Upgrade from 3.20.1 to 3.21.0.
-+ # Remove this line to create a well-formed manifest.
-+diff --git a/third_party/sqlite/src/manifest.uuid b/third_party/sqlite/src/manifest.uuid
-+index 473e071..8a16768 100644
-+--- a/third_party/sqlite/src/manifest.uuid
-++++ b/third_party/sqlite/src/manifest.uuid
-+@@ -1 +1 @@
-+-0a5e1c04d9d07bb7fd6546a9ddac1bf42b19ea19c2b79570aea6cd4226887a27
-++1a584e499906b5c87ec7d43d4abce641fdf017c42125b083109bc77c4de48827
-+diff --git a/third_party/sqlite/src/src/alter.c b/third_party/sqlite/src/src/alter.c
-+index 69397e1..93ac16d 100644
-+--- a/third_party/sqlite/src/src/alter.c
-++++ b/third_party/sqlite/src/src/alter.c
-+@@ -403,9 +403,9 @@ void sqlite3AlterRenameTable(
-+   char *zWhere = 0;         /* Where clause to locate temp triggers */
-+ #endif
-+   VTable *pVTab = 0;        /* Non-zero if this is a v-tab with an xRename() */
-+-  int savedDbFlags;         /* Saved value of db->flags */
-++  u32 savedDbFlags;         /* Saved value of db->mDbFlags */
-+ 
-+-  savedDbFlags = db->flags;
-++  savedDbFlags = db->mDbFlags;
-+   if( NEVER(db->mallocFailed) ) goto exit_rename_table;
-+   assert( pSrc->nSrc==1 );
-+   assert( sqlite3BtreeHoldsAllMutexes(pParse->db) );
-+@@ -414,7 +414,7 @@ void sqlite3AlterRenameTable(
-+   if( !pTab ) goto exit_rename_table;
-+   iDb = sqlite3SchemaToIndex(pParse->db, pTab->pSchema);
-+   zDb = db->aDb[iDb].zDbSName;
-+-  db->flags |= SQLITE_PreferBuiltin;
-++  db->mDbFlags |= DBFLAG_PreferBuiltin;
-+ 
-+   /* Get a NULL terminated version of the new table name. */
-+   zName = sqlite3NameFromToken(db, pName);
-+@@ -579,7 +579,7 @@ void sqlite3AlterRenameTable(
-+ exit_rename_table:
-+   sqlite3SrcListDelete(db, pSrc);
-+   sqlite3DbFree(db, zName);
-+-  db->flags = savedDbFlags;
-++  db->mDbFlags = savedDbFlags;
-+ }
-+ 
-+ /*
-+@@ -680,11 +680,11 @@ void sqlite3AlterFinishAddColumn(Parse *pParse, Token *pColDef){
-+   zCol = sqlite3DbStrNDup(db, (char*)pColDef->z, pColDef->n);
-+   if( zCol ){
-+     char *zEnd = &zCol[pColDef->n-1];
-+-    int savedDbFlags = db->flags;
-++    u32 savedDbFlags = db->mDbFlags;
-+     while( zEnd>zCol && (*zEnd==';' || sqlite3Isspace(*zEnd)) ){
-+       *zEnd-- = '\0';
-+     }
-+-    db->flags |= SQLITE_PreferBuiltin;
-++    db->mDbFlags |= DBFLAG_PreferBuiltin;
-+     sqlite3NestedParse(pParse,
-+         "UPDATE \"%w\".%s SET "
-+           "sql = substr(sql,1,%d) || ', ' || %Q || substr(sql,%d) "
-+@@ -693,7 +693,7 @@ void sqlite3AlterFinishAddColumn(Parse *pParse, Token *pColDef){
-+       zTab
-+     );
-+     sqlite3DbFree(db, zCol);
-+-    db->flags = savedDbFlags;
-++    db->mDbFlags = savedDbFlags;
-+   }
-+ 
-+   /* Make sure the schema version is at least 3.  But do not upgrade
-+diff --git a/third_party/sqlite/src/src/attach.c b/third_party/sqlite/src/src/attach.c
-+index 2e8f8c1..fbbd37b 100644
-+--- a/third_party/sqlite/src/src/attach.c
-++++ b/third_party/sqlite/src/src/attach.c
-+@@ -93,10 +93,6 @@ static void attachFunc(
-+     );
-+     goto attach_error;
-+   }
-+-  if( !db->autoCommit ){
-+-    zErrDyn = sqlite3MPrintf(db, "cannot ATTACH database within transaction");
-+-    goto attach_error;
-+-  }
-+   for(i=0; i<db->nDb; i++){
-+     char *z = db->aDb[i].zDbSName;
-+     assert( z && zName );
-+@@ -288,11 +284,6 @@ static void detachFunc(
-+     sqlite3_snprintf(sizeof(zErr),zErr, "cannot detach database %s", zName);
-+     goto detach_error;
-+   }
-+-  if( !db->autoCommit ){
-+-    sqlite3_snprintf(sizeof(zErr), zErr,
-+-                     "cannot DETACH database within transaction");
-+-    goto detach_error;
-+-  }
-+   if( sqlite3BtreeIsInReadTrans(pDb->pBt) || sqlite3BtreeIsInBackup(pDb->pBt) ){
-+     sqlite3_snprintf(sizeof(zErr),zErr, "database %s is locked", zName);
-+     goto detach_error;
-+diff --git a/third_party/sqlite/src/src/auth.c b/third_party/sqlite/src/src/auth.c
-+index 4255440..d85352f 100644
-+--- a/third_party/sqlite/src/src/auth.c
-++++ b/third_party/sqlite/src/src/auth.c
-+@@ -118,11 +118,9 @@ int sqlite3AuthReadCol(
-+ #endif
-+                 );
-+   if( rc==SQLITE_DENY ){
-+-    if( db->nDb>2 || iDb!=0 ){
-+-      sqlite3ErrorMsg(pParse, "access to %s.%s.%s is prohibited",zDb,zTab,zCol);
-+-    }else{
-+-      sqlite3ErrorMsg(pParse, "access to %s.%s is prohibited", zTab, zCol);
-+-    }
-++    char *z = sqlite3_mprintf("%s.%s", zTab, zCol);
-++    if( db->nDb>2 || iDb!=0 ) z = sqlite3_mprintf("%s.%z", zDb, z);
-++    sqlite3ErrorMsg(pParse, "access to %z is prohibited", z);
-+     pParse->rc = SQLITE_AUTH;
-+   }else if( rc!=SQLITE_IGNORE && rc!=SQLITE_OK ){
-+     sqliteAuthBadReturnCode(pParse);
-+diff --git a/third_party/sqlite/src/src/btree.c b/third_party/sqlite/src/src/btree.c
-+index 26c2d76..e349eac 100644
-+--- a/third_party/sqlite/src/src/btree.c
-++++ b/third_party/sqlite/src/src/btree.c
-+@@ -439,7 +439,9 @@ static void downgradeAllSharedCacheTableLocks(Btree *p){
-+ 
-+ #endif /* SQLITE_OMIT_SHARED_CACHE */
-+ 
-+-static void releasePage(MemPage *pPage);  /* Forward reference */
-++static void releasePage(MemPage *pPage);         /* Forward reference */
-++static void releasePageOne(MemPage *pPage);      /* Forward reference */
-++static void releasePageNotNull(MemPage *pPage);  /* Forward reference */
-+ 
-+ /*
-+ ***** This routine is used inside of assert() only ****
-+@@ -598,11 +600,13 @@ static void btreeClearHasContent(BtShared *pBt){
-+ */
-+ static void btreeReleaseAllCursorPages(BtCursor *pCur){
-+   int i;
-+-  for(i=0; i<=pCur->iPage; i++){
-+-    releasePage(pCur->apPage[i]);
-+-    pCur->apPage[i] = 0;
-++  if( pCur->iPage>=0 ){
-++    for(i=0; i<pCur->iPage; i++){
-++      releasePageNotNull(pCur->apPage[i]);
-++    }
-++    releasePageNotNull(pCur->pPage);
-++    pCur->iPage = -1;
-+   }
-+-  pCur->iPage = -1;
-+ }
-+ 
-+ /*
-+@@ -731,7 +735,7 @@ static int SQLITE_NOINLINE saveCursorsOnList(
-+           return rc;
-+         }
-+       }else{
-+-        testcase( p->iPage>0 );
-++        testcase( p->iPage>=0 );
-+         btreeReleaseAllCursorPages(p);
-+       }
-+     }
-+@@ -771,7 +775,7 @@ static int btreeMoveto(
-+     if( pIdxKey==0 ) return SQLITE_NOMEM_BKPT;
-+     sqlite3VdbeRecordUnpack(pCur->pKeyInfo, (int)nKey, pKey, pIdxKey);
-+     if( pIdxKey->nField==0 ){
-+-      rc = SQLITE_CORRUPT_PGNO(pCur->apPage[pCur->iPage]->pgno);
-++      rc = SQLITE_CORRUPT_BKPT;
-+       goto moveto_done;
-+     }
-+   }else{
-+@@ -836,6 +840,17 @@ int sqlite3BtreeCursorHasMoved(BtCursor *pCur){
-+ }
-+ 
-+ /*
-++** Return a pointer to a fake BtCursor object that will always answer
-++** false to the sqlite3BtreeCursorHasMoved() routine above.  The fake
-++** cursor returned must not be used with any other Btree interface.
-++*/
-++BtCursor *sqlite3BtreeFakeValidCursor(void){
-++  static u8 fakeCursor = CURSOR_VALID;
-++  assert( offsetof(BtCursor, eState)==0 );
-++  return (BtCursor*)&fakeCursor;
-++}
-++
-++/*
-+ ** This routine restores a cursor back to its original position after it
-+ ** has been moved by some outside activity (such as a btree rebalance or
-+ ** a row having been deleted out from under the cursor).
-+@@ -1384,8 +1399,11 @@ static int defragmentPage(MemPage *pPage, int nMaxFrag){
-+         int sz2 = 0;
-+         int sz = get2byte(&data[iFree+2]);
-+         int top = get2byte(&data[hdr+5]);
-++        if( top>=iFree ){
-++          return SQLITE_CORRUPT_PGNO(pPage->pgno);
-++        }
-+         if( iFree2 ){
-+-          if( iFree+sz>iFree2 ) return SQLITE_CORRUPT_PGNO(pPage->pgno);
-++          assert( iFree+sz<=iFree2 ); /* Verified by pageFindSlot() */
-+           sz2 = get2byte(&data[iFree2+2]);
-+           assert( iFree+sz+sz2+iFree2-(iFree+sz) <= usableSize );
-+           memmove(&data[iFree+sz+sz2], &data[iFree+sz], iFree2-(iFree+sz));
-+@@ -1474,16 +1492,10 @@ static u8 *pageFindSlot(MemPage *pPg, int nByte, int *pRc){
-+   int pc = get2byte(&aData[iAddr]);
-+   int x;
-+   int usableSize = pPg->pBt->usableSize;
-++  int size;            /* Size of the free slot */
-+ 
-+   assert( pc>0 );
-+-  do{
-+-    int size;            /* Size of the free slot */
-+-    /* EVIDENCE-OF: R-06866-39125 Freeblocks are always connected in order of
-+-    ** increasing offset. */
-+-    if( pc>usableSize-4 || pc<iAddr+4 ){
-+-      *pRc = SQLITE_CORRUPT_PGNO(pPg->pgno);
-+-      return 0;
-+-    }
-++  while( pc<=usableSize-4 ){
-+     /* EVIDENCE-OF: R-22710-53328 The third and fourth bytes of each
-+     ** freeblock form a big-endian integer which is the size of the freeblock
-+     ** in bytes, including the 4-byte header. */
-+@@ -1491,7 +1503,7 @@ static u8 *pageFindSlot(MemPage *pPg, int nByte, int *pRc){
-+     if( (x = size - nByte)>=0 ){
-+       testcase( x==4 );
-+       testcase( x==3 );
-+-      if( pc < pPg->cellOffset+2*pPg->nCell || size+pc > usableSize ){
-++      if( size+pc > usableSize ){
-+         *pRc = SQLITE_CORRUPT_PGNO(pPg->pgno);
-+         return 0;
-+       }else if( x<4 ){
-+@@ -1512,7 +1524,11 @@ static u8 *pageFindSlot(MemPage *pPg, int nByte, int *pRc){
-+     }
-+     iAddr = pc;
-+     pc = get2byte(&aData[pc]);
-+-  }while( pc );
-++    if( pc<iAddr+size ) break;
-++  }
-++  if( pc ){
-++    *pRc = SQLITE_CORRUPT_PGNO(pPg->pgno);
-++  }
-+ 
-+   return 0;
-+ }
-+@@ -1626,7 +1642,7 @@ static int freeSpace(MemPage *pPage, u16 iStart, u16 iSize){
-+   u8 hdr;                               /* Page header size.  0 or 100 */
-+   u8 nFrag = 0;                         /* Reduction in fragmentation */
-+   u16 iOrigSize = iSize;                /* Original value of iSize */
-+-  u32 iLast = pPage->pBt->usableSize-4; /* Largest possible freeblock offset */
-++  u16 x;                                /* Offset to cell content area */
-+   u32 iEnd = iStart + iSize;            /* First byte past the iStart buffer */
-+   unsigned char *data = pPage->aData;   /* Page content */
-+ 
-+@@ -1636,13 +1652,7 @@ static int freeSpace(MemPage *pPage, u16 iStart, u16 iSize){
-+   assert( CORRUPT_DB || iEnd <= pPage->pBt->usableSize );
-+   assert( sqlite3_mutex_held(pPage->pBt->mutex) );
-+   assert( iSize>=4 );   /* Minimum cell size is 4 */
-+-  assert( iStart<=iLast );
-+-
-+-  /* Overwrite deleted information with zeros when the secure_delete
-+-  ** option is enabled */
-+-  if( pPage->pBt->btsFlags & BTS_FAST_SECURE ){
-+-    memset(&data[iStart], 0, iSize);
-+-  }
-++  assert( iStart<=pPage->pBt->usableSize-4 );
-+ 
-+   /* The list of freeblocks must be in ascending order.  Find the
-+   ** spot on the list where iStart should be inserted.
-+@@ -1659,7 +1669,9 @@ static int freeSpace(MemPage *pPage, u16 iStart, u16 iSize){
-+       }
-+       iPtr = iFreeBlk;
-+     }
-+-    if( iFreeBlk>iLast ) return SQLITE_CORRUPT_PGNO(pPage->pgno);
-++    if( iFreeBlk>pPage->pBt->usableSize-4 ){
-++      return SQLITE_CORRUPT_PGNO(pPage->pgno);
-++    }
-+     assert( iFreeBlk>iPtr || iFreeBlk==0 );
-+ 
-+     /* At this point:
-+@@ -1695,19 +1707,25 @@ static int freeSpace(MemPage *pPage, u16 iStart, u16 iSize){
-+     if( nFrag>data[hdr+7] ) return SQLITE_CORRUPT_PGNO(pPage->pgno);
-+     data[hdr+7] -= nFrag;
-+   }
-+-  if( iStart==get2byte(&data[hdr+5]) ){
-++  x = get2byte(&data[hdr+5]);
-++  if( iStart<=x ){
-+     /* The new freeblock is at the beginning of the cell content area,
-+     ** so just extend the cell content area rather than create another
-+     ** freelist entry */
-+-    if( iPtr!=hdr+1 ) return SQLITE_CORRUPT_PGNO(pPage->pgno);
-++    if( iStart<x || iPtr!=hdr+1 ) return SQLITE_CORRUPT_PGNO(pPage->pgno);
-+     put2byte(&data[hdr+1], iFreeBlk);
-+     put2byte(&data[hdr+5], iEnd);
-+   }else{
-+     /* Insert the new freeblock into the freelist */
-+     put2byte(&data[iPtr], iStart);
-+-    put2byte(&data[iStart], iFreeBlk);
-+-    put2byte(&data[iStart+2], iSize);
-+   }
-++  if( pPage->pBt->btsFlags & BTS_FAST_SECURE ){
-++    /* Overwrite deleted information with zeros when the secure_delete
-++    ** option is enabled */
-++    memset(&data[iStart], 0, iSize);
-++  }
-++  put2byte(&data[iStart], iFreeBlk);
-++  put2byte(&data[iStart+2], iSize);
-+   pPage->nFree += iOrigSize;
-+   return SQLITE_OK;
-+ }
-+@@ -2022,7 +2040,7 @@ static Pgno btreePagecount(BtShared *pBt){
-+ }
-+ u32 sqlite3BtreeLastPage(Btree *p){
-+   assert( sqlite3BtreeHoldsMutex(p) );
-+-  assert( ((p->pBt->nPage)&0x8000000)==0 );
-++  assert( ((p->pBt->nPage)&0x80000000)==0 );
-+   return btreePagecount(p->pBt);
-+ }
-+ 
-+@@ -2049,7 +2067,7 @@ static int getAndInitPage(
-+   int rc;
-+   DbPage *pDbPage;
-+   assert( sqlite3_mutex_held(pBt->mutex) );
-+-  assert( pCur==0 || ppPage==&pCur->apPage[pCur->iPage] );
-++  assert( pCur==0 || ppPage==&pCur->pPage );
-+   assert( pCur==0 || bReadOnly==pCur->curPagerFlags );
-+   assert( pCur==0 || pCur->iPage>0 );
-+ 
-+@@ -2083,7 +2101,10 @@ static int getAndInitPage(
-+   return SQLITE_OK;
-+ 
-+ getAndInitPage_error:
-+-  if( pCur ) pCur->iPage--;
-++  if( pCur ){
-++    pCur->iPage--;
-++    pCur->pPage = pCur->apPage[pCur->iPage];
-++  }
-+   testcase( pgno==0 );
-+   assert( pgno!=0 || rc==SQLITE_CORRUPT );
-+   return rc;
-+@@ -2092,6 +2113,8 @@ getAndInitPage_error:
-+ /*
-+ ** Release a MemPage.  This should be called once for each prior
-+ ** call to btreeGetPage.
-++**
-++** Page1 is a special case and must be released using releasePageOne().
-+ */
-+ static void releasePageNotNull(MemPage *pPage){
-+   assert( pPage->aData );
-+@@ -2105,6 +2128,16 @@ static void releasePageNotNull(MemPage *pPage){
-+ static void releasePage(MemPage *pPage){
-+   if( pPage ) releasePageNotNull(pPage);
-+ }
-++static void releasePageOne(MemPage *pPage){
-++  assert( pPage!=0 );
-++  assert( pPage->aData );
-++  assert( pPage->pBt );
-++  assert( pPage->pDbPage!=0 );
-++  assert( sqlite3PagerGetExtra(pPage->pDbPage) == (void*)pPage );
-++  assert( sqlite3PagerGetData(pPage->pDbPage)==pPage->aData );
-++  assert( sqlite3_mutex_held(pPage->pBt->mutex) );
-++  sqlite3PagerUnrefPageOne(pPage->pDbPage);
-++}
-+ 
-+ /*
-+ ** Get an unused page.
-+@@ -2889,7 +2922,8 @@ int sqlite3BtreeGetAutoVacuum(Btree *p){
-+ ** set to the value passed to this function as the second parameter,
-+ ** set it so.
-+ */
-+-#if SQLITE_DEFAULT_SYNCHRONOUS!=SQLITE_DEFAULT_WAL_SYNCHRONOUS
-++#if SQLITE_DEFAULT_SYNCHRONOUS!=SQLITE_DEFAULT_WAL_SYNCHRONOUS \
-++    && !defined(SQLITE_OMIT_WAL)
-+ static void setDefaultSyncFlag(BtShared *pBt, u8 safety_level){
-+   sqlite3 *db;
-+   Db *pDb;
-+@@ -3023,7 +3057,7 @@ static int lockBtree(BtShared *pBt){
-+       }else{
-+         setDefaultSyncFlag(pBt, SQLITE_DEFAULT_WAL_SYNCHRONOUS+1);
-+         if( isOpen==0 ){
-+-          releasePage(pPage1);
-++          releasePageOne(pPage1);
-+           return SQLITE_OK;
-+         }
-+       }
-+@@ -3070,7 +3104,7 @@ static int lockBtree(BtShared *pBt){
-+       ** zero and return SQLITE_OK. The caller will call this function
-+       ** again with the correct page-size.
-+       */
-+-      releasePage(pPage1);
-++      releasePageOne(pPage1);
-+       pBt->usableSize = usableSize;
-+       pBt->pageSize = pageSize;
-+       freeTempSpace(pBt);
-+@@ -3124,7 +3158,7 @@ static int lockBtree(BtShared *pBt){
-+   return SQLITE_OK;
-+ 
-+ page1_init_failed:
-+-  releasePage(pPage1);
-++  releasePageOne(pPage1);
-+   pBt->pPage1 = 0;
-+   return rc;
-+ }
-+@@ -3169,7 +3203,7 @@ static void unlockBtreeIfUnused(BtShared *pBt){
-+     assert( pPage1->aData );
-+     assert( sqlite3PagerRefcount(pBt->pPager)==1 );
-+     pBt->pPage1 = 0;
-+-    releasePageNotNull(pPage1);
-++    releasePageOne(pPage1);
-+   }
-+ }
-+ 
-+@@ -4035,7 +4069,6 @@ int sqlite3BtreeTripAllCursors(Btree *pBtree, int errCode, int writeOnly){
-+   if( pBtree ){
-+     sqlite3BtreeEnter(pBtree);
-+     for(p=pBtree->pBt->pCursor; p; p=p->pNext){
-+-      int i;
-+       if( writeOnly && (p->curFlags & BTCF_WriteFlag)==0 ){
-+         if( p->eState==CURSOR_VALID || p->eState==CURSOR_SKIPNEXT ){
-+           rc = saveCursorPosition(p);
-+@@ -4049,10 +4082,7 @@ int sqlite3BtreeTripAllCursors(Btree *pBtree, int errCode, int writeOnly){
-+         p->eState = CURSOR_FAULT;
-+         p->skipNext = errCode;
-+       }
-+-      for(i=0; i<=p->iPage; i++){
-+-        releasePage(p->apPage[i]);
-+-        p->apPage[i] = 0;
-+-      }
-++      btreeReleaseAllCursorPages(p);
-+     }
-+     sqlite3BtreeLeave(pBtree);
-+   }
-+@@ -4109,7 +4139,7 @@ int sqlite3BtreeRollback(Btree *p, int tripCode, int writeOnly){
-+       if( nPage==0 ) sqlite3PagerPagecount(pBt->pPager, &nPage);
-+       testcase( pBt->nPage!=nPage );
-+       pBt->nPage = nPage;
-+-      releasePage(pPage1);
-++      releasePageOne(pPage1);
-+     }
-+     assert( countValidCursors(pBt, 1)==0 );
-+     pBt->inTransaction = TRANS_READ;
-+@@ -4351,10 +4381,8 @@ void sqlite3BtreeCursorZero(BtCursor *p){
-+ int sqlite3BtreeCloseCursor(BtCursor *pCur){
-+   Btree *pBtree = pCur->pBtree;
-+   if( pBtree ){
-+-    int i;
-+     BtShared *pBt = pCur->pBt;
-+     sqlite3BtreeEnter(pBtree);
-+-    sqlite3BtreeClearCursor(pCur);
-+     assert( pBt->pCursor!=0 );
-+     if( pBt->pCursor==pCur ){
-+       pBt->pCursor = pCur->pNext;
-+@@ -4368,12 +4396,10 @@ int sqlite3BtreeCloseCursor(BtCursor *pCur){
-+         pPrev = pPrev->pNext;
-+       }while( ALWAYS(pPrev) );
-+     }
-+-    for(i=0; i<=pCur->iPage; i++){
-+-      releasePage(pCur->apPage[i]);
-+-    }
-++    btreeReleaseAllCursorPages(pCur);
-+     unlockBtreeIfUnused(pBt);
-+     sqlite3_free(pCur->aOverflow);
-+-    /* sqlite3_free(pCur); */
-++    sqlite3_free(pCur->pKey);
-+     sqlite3BtreeLeave(pBtree);
-+   }
-+   return SQLITE_OK;
-+@@ -4390,9 +4416,8 @@ int sqlite3BtreeCloseCursor(BtCursor *pCur){
-+ #ifndef NDEBUG
-+   static void assertCellInfo(BtCursor *pCur){
-+     CellInfo info;
-+-    int iPage = pCur->iPage;
-+     memset(&info, 0, sizeof(info));
-+-    btreeParseCell(pCur->apPage[iPage], pCur->ix, &info);
-++    btreeParseCell(pCur->pPage, pCur->ix, &info);
-+     assert( CORRUPT_DB || memcmp(&info, &pCur->info, sizeof(info))==0 );
-+   }
-+ #else
-+@@ -4400,9 +4425,8 @@ int sqlite3BtreeCloseCursor(BtCursor *pCur){
-+ #endif
-+ static SQLITE_NOINLINE void getCellInfo(BtCursor *pCur){
-+   if( pCur->info.nSize==0 ){
-+-    int iPage = pCur->iPage;
-+     pCur->curFlags |= BTCF_ValidNKey;
-+-    btreeParseCell(pCur->apPage[iPage],pCur->ix,&pCur->info);
-++    btreeParseCell(pCur->pPage,pCur->ix,&pCur->info);
-+   }else{
-+     assertCellInfo(pCur);
-+   }
-+@@ -4600,7 +4624,7 @@ static int accessPayload(
-+   unsigned char *aPayload;
-+   int rc = SQLITE_OK;
-+   int iIdx = 0;
-+-  MemPage *pPage = pCur->apPage[pCur->iPage]; /* Btree page of current entry */
-++  MemPage *pPage = pCur->pPage;               /* Btree page of current entry */
-+   BtShared *pBt = pCur->pBt;                  /* Btree this cursor belongs to */
-+ #ifdef SQLITE_DIRECT_OVERFLOW_READ
-+   unsigned char * const pBufStart = pBuf;     /* Start of original out buffer */
-+@@ -4796,8 +4820,8 @@ static int accessPayload(
-+ int sqlite3BtreePayload(BtCursor *pCur, u32 offset, u32 amt, void *pBuf){
-+   assert( cursorHoldsMutex(pCur) );
-+   assert( pCur->eState==CURSOR_VALID );
-+-  assert( pCur->iPage>=0 && pCur->apPage[pCur->iPage] );
-+-  assert( pCur->ix<pCur->apPage[pCur->iPage]->nCell );
-++  assert( pCur->iPage>=0 && pCur->pPage );
-++  assert( pCur->ix<pCur->pPage->nCell );
-+   return accessPayload(pCur, offset, amt, (unsigned char*)pBuf, 0);
-+ }
-+ 
-+@@ -4854,18 +4878,23 @@ static const void *fetchPayload(
-+   BtCursor *pCur,      /* Cursor pointing to entry to read from */
-+   u32 *pAmt            /* Write the number of available bytes here */
-+ ){
-+-  u32 amt;
-+-  assert( pCur!=0 && pCur->iPage>=0 && pCur->apPage[pCur->iPage]);
-++  int amt;
-++  assert( pCur!=0 && pCur->iPage>=0 && pCur->pPage);
-+   assert( pCur->eState==CURSOR_VALID );
-+   assert( sqlite3_mutex_held(pCur->pBtree->db->mutex) );
-+   assert( cursorOwnsBtShared(pCur) );
-+-  assert( pCur->ix<pCur->apPage[pCur->iPage]->nCell );
-++  assert( pCur->ix<pCur->pPage->nCell );
-+   assert( pCur->info.nSize>0 );
-+-  assert( pCur->info.pPayload>pCur->apPage[pCur->iPage]->aData || CORRUPT_DB );
-+-  assert( pCur->info.pPayload<pCur->apPage[pCur->iPage]->aDataEnd ||CORRUPT_DB);
-+-  amt = (int)(pCur->apPage[pCur->iPage]->aDataEnd - pCur->info.pPayload);
-+-  if( pCur->info.nLocal<amt ) amt = pCur->info.nLocal;
-+-  *pAmt = amt;
-++  assert( pCur->info.pPayload>pCur->pPage->aData || CORRUPT_DB );
-++  assert( pCur->info.pPayload<pCur->pPage->aDataEnd ||CORRUPT_DB);
-++  amt = pCur->info.nLocal;
-++  if( amt>(int)(pCur->pPage->aDataEnd - pCur->info.pPayload) ){
-++    /* There is too little space on the page for the expected amount
-++    ** of local content. Database must be corrupt. */
-++    assert( CORRUPT_DB );
-++    amt = MAX(0, (int)(pCur->pPage->aDataEnd - pCur->info.pPayload));
-++  }
-++  *pAmt = (u32)amt;
-+   return (void*)pCur->info.pPayload;
-+ }
-+ 
-+@@ -4910,10 +4939,11 @@ static int moveToChild(BtCursor *pCur, u32 newPgno){
-+   }
-+   pCur->info.nSize = 0;
-+   pCur->curFlags &= ~(BTCF_ValidNKey|BTCF_ValidOvfl);
-+-  pCur->aiIdx[pCur->iPage++] = pCur->ix;
-++  pCur->aiIdx[pCur->iPage] = pCur->ix;
-++  pCur->apPage[pCur->iPage] = pCur->pPage;
-+   pCur->ix = 0;
-+-  return getAndInitPage(pBt, newPgno, &pCur->apPage[pCur->iPage],
-+-                        pCur, pCur->curPagerFlags);
-++  pCur->iPage++;
-++  return getAndInitPage(pBt, newPgno, &pCur->pPage, pCur, pCur->curPagerFlags);
-+ }
-+ 
-+ #ifdef SQLITE_DEBUG
-+@@ -4947,20 +4977,23 @@ static void assertParentIndex(MemPage *pParent, int iIdx, Pgno iChild){
-+ ** the largest cell index.
-+ */
-+ static void moveToParent(BtCursor *pCur){
-++  MemPage *pLeaf;
-+   assert( cursorOwnsBtShared(pCur) );
-+   assert( pCur->eState==CURSOR_VALID );
-+   assert( pCur->iPage>0 );
-+-  assert( pCur->apPage[pCur->iPage] );
-++  assert( pCur->pPage );
-+   assertParentIndex(
-+     pCur->apPage[pCur->iPage-1],
-+     pCur->aiIdx[pCur->iPage-1],
-+-    pCur->apPage[pCur->iPage]->pgno
-++    pCur->pPage->pgno
-+   );
-+   testcase( pCur->aiIdx[pCur->iPage-1] > pCur->apPage[pCur->iPage-1]->nCell );
-+   pCur->info.nSize = 0;
-+   pCur->curFlags &= ~(BTCF_ValidNKey|BTCF_ValidOvfl);
-+   pCur->ix = pCur->aiIdx[pCur->iPage-1];
-+-  releasePageNotNull(pCur->apPage[pCur->iPage--]);
-++  pLeaf = pCur->pPage;
-++  pCur->pPage = pCur->apPage[--pCur->iPage];
-++  releasePageNotNull(pLeaf);
-+ }
-+ 
-+ /*
-+@@ -4972,9 +5005,9 @@ static void moveToParent(BtCursor *pCur){
-+ ** single child page. This can only happen with the table rooted at page 1.
-+ **
-+ ** If the b-tree structure is empty, the cursor state is set to
-+-** CURSOR_INVALID. Otherwise, the cursor is set to point to the first
-+-** cell located on the root (or virtual root) page and the cursor state
-+-** is set to CURSOR_VALID.
-++** CURSOR_INVALID and this routine returns SQLITE_EMPTY. Otherwise,
-++** the cursor is set to point to the first cell located on the root
-++** (or virtual root) page and the cursor state is set to CURSOR_VALID.
-+ **
-+ ** If this function returns successfully, it may be assumed that the
-+ ** page-header flags indicate that the [virtual] root-page is the expected
-+@@ -4992,37 +5025,40 @@ static int moveToRoot(BtCursor *pCur){
-+   assert( CURSOR_INVALID < CURSOR_REQUIRESEEK );
-+   assert( CURSOR_VALID   < CURSOR_REQUIRESEEK );
-+   assert( CURSOR_FAULT   > CURSOR_REQUIRESEEK );
-+-  if( pCur->eState>=CURSOR_REQUIRESEEK ){
-+-    if( pCur->eState==CURSOR_FAULT ){
-+-      assert( pCur->skipNext!=SQLITE_OK );
-+-      return pCur->skipNext;
-+-    }
-+-    sqlite3BtreeClearCursor(pCur);
-+-  }
-++  assert( pCur->eState < CURSOR_REQUIRESEEK || pCur->iPage<0 );
-++  assert( pCur->pgnoRoot>0 || pCur->iPage<0 );
-+ 
-+   if( pCur->iPage>=0 ){
-+     if( pCur->iPage ){
-+-      do{
-+-        assert( pCur->apPage[pCur->iPage]!=0 );
-+-        releasePageNotNull(pCur->apPage[pCur->iPage--]);
-+-      }while( pCur->iPage);
-++      releasePageNotNull(pCur->pPage);
-++      while( --pCur->iPage ){
-++        releasePageNotNull(pCur->apPage[pCur->iPage]);
-++      }
-++      pCur->pPage = pCur->apPage[0];
-+       goto skip_init;
-+     }
-+   }else if( pCur->pgnoRoot==0 ){
-+     pCur->eState = CURSOR_INVALID;
-+-    return SQLITE_OK;
-++    return SQLITE_EMPTY;
-+   }else{
-+     assert( pCur->iPage==(-1) );
-+-    rc = getAndInitPage(pCur->pBtree->pBt, pCur->pgnoRoot, &pCur->apPage[0],
-++    if( pCur->eState>=CURSOR_REQUIRESEEK ){
-++      if( pCur->eState==CURSOR_FAULT ){
-++        assert( pCur->skipNext!=SQLITE_OK );
-++        return pCur->skipNext;
-++      }
-++      sqlite3BtreeClearCursor(pCur);
-++    }
-++    rc = getAndInitPage(pCur->pBtree->pBt, pCur->pgnoRoot, &pCur->pPage,
-+                         0, pCur->curPagerFlags);
-+     if( rc!=SQLITE_OK ){
-+       pCur->eState = CURSOR_INVALID;
-+-       return rc;
-++      return rc;
-+     }
-+     pCur->iPage = 0;
-+-    pCur->curIntKey = pCur->apPage[0]->intKey;
-++    pCur->curIntKey = pCur->pPage->intKey;
-+   }
-+-  pRoot = pCur->apPage[0];
-++  pRoot = pCur->pPage;
-+   assert( pRoot->pgno==pCur->pgnoRoot );
-+ 
-+   /* If pCur->pKeyInfo is not NULL, then the caller that opened this cursor
-+@@ -5037,7 +5073,7 @@ static int moveToRoot(BtCursor *pCur){
-+   ** (or the freelist).  */
-+   assert( pRoot->intKey==1 || pRoot->intKey==0 );
-+   if( pRoot->isInit==0 || (pCur->pKeyInfo==0)!=pRoot->intKey ){
-+-    return SQLITE_CORRUPT_PGNO(pCur->apPage[pCur->iPage]->pgno);
-++    return SQLITE_CORRUPT_PGNO(pCur->pPage->pgno);
-+   }
-+ 
-+ skip_init:
-+@@ -5045,7 +5081,7 @@ skip_init:
-+   pCur->info.nSize = 0;
-+   pCur->curFlags &= ~(BTCF_AtLast|BTCF_ValidNKey|BTCF_ValidOvfl);
-+ 
-+-  pRoot = pCur->apPage[0];
-++  pRoot = pCur->pPage;
-+   if( pRoot->nCell>0 ){
-+     pCur->eState = CURSOR_VALID;
-+   }else if( !pRoot->leaf ){
-+@@ -5056,6 +5092,7 @@ skip_init:
-+     rc = moveToChild(pCur, subpage);
-+   }else{
-+     pCur->eState = CURSOR_INVALID;
-++    rc = SQLITE_EMPTY;
-+   }
-+   return rc;
-+ }
-+@@ -5074,7 +5111,7 @@ static int moveToLeftmost(BtCursor *pCur){
-+ 
-+   assert( cursorOwnsBtShared(pCur) );
-+   assert( pCur->eState==CURSOR_VALID );
-+-  while( rc==SQLITE_OK && !(pPage = pCur->apPage[pCur->iPage])->leaf ){
-++  while( rc==SQLITE_OK && !(pPage = pCur->pPage)->leaf ){
-+     assert( pCur->ix<pPage->nCell );
-+     pgno = get4byte(findCell(pPage, pCur->ix));
-+     rc = moveToChild(pCur, pgno);
-+@@ -5099,7 +5136,7 @@ static int moveToRightmost(BtCursor *pCur){
-+ 
-+   assert( cursorOwnsBtShared(pCur) );
-+   assert( pCur->eState==CURSOR_VALID );
-+-  while( !(pPage = pCur->apPage[pCur->iPage])->leaf ){
-++  while( !(pPage = pCur->pPage)->leaf ){
-+     pgno = get4byte(&pPage->aData[pPage->hdrOffset+8]);
-+     pCur->ix = pPage->nCell;
-+     rc = moveToChild(pCur, pgno);
-+@@ -5122,14 +5159,13 @@ int sqlite3BtreeFirst(BtCursor *pCur, int *pRes){
-+   assert( sqlite3_mutex_held(pCur->pBtree->db->mutex) );
-+   rc = moveToRoot(pCur);
-+   if( rc==SQLITE_OK ){
-+-    if( pCur->eState==CURSOR_INVALID ){
-+-      assert( pCur->pgnoRoot==0 || pCur->apPage[pCur->iPage]->nCell==0 );
-+-      *pRes = 1;
-+-    }else{
-+-      assert( pCur->apPage[pCur->iPage]->nCell>0 );
-+-      *pRes = 0;
-+-      rc = moveToLeftmost(pCur);
-+-    }
-++    assert( pCur->pPage->nCell>0 );
-++    *pRes = 0;
-++    rc = moveToLeftmost(pCur);
-++  }else if( rc==SQLITE_EMPTY ){
-++    assert( pCur->pgnoRoot==0 || pCur->pPage->nCell==0 );
-++    *pRes = 1;
-++    rc = SQLITE_OK;
-+   }
-+   return rc;
-+ }
-+@@ -5153,28 +5189,26 @@ int sqlite3BtreeLast(BtCursor *pCur, int *pRes){
-+     for(ii=0; ii<pCur->iPage; ii++){
-+       assert( pCur->aiIdx[ii]==pCur->apPage[ii]->nCell );
-+     }
-+-    assert( pCur->ix==pCur->apPage[pCur->iPage]->nCell-1 );
-+-    assert( pCur->apPage[pCur->iPage]->leaf );
-++    assert( pCur->ix==pCur->pPage->nCell-1 );
-++    assert( pCur->pPage->leaf );
-+ #endif
-+     return SQLITE_OK;
-+   }
-+ 
-+   rc = moveToRoot(pCur);
-+   if( rc==SQLITE_OK ){
-+-    if( CURSOR_INVALID==pCur->eState ){
-+-      assert( pCur->pgnoRoot==0 || pCur->apPage[pCur->iPage]->nCell==0 );
-+-      *pRes = 1;
-++    assert( pCur->eState==CURSOR_VALID );
-++    *pRes = 0;
-++    rc = moveToRightmost(pCur);
-++    if( rc==SQLITE_OK ){
-++      pCur->curFlags |= BTCF_AtLast;
-+     }else{
-+-      assert( pCur->eState==CURSOR_VALID );
-+-      *pRes = 0;
-+-      rc = moveToRightmost(pCur);
-+-      if( rc==SQLITE_OK ){
-+-        pCur->curFlags |= BTCF_AtLast;
-+-      }else{
-+-        pCur->curFlags &= ~BTCF_AtLast;
-+-      }
-+-
-++      pCur->curFlags &= ~BTCF_AtLast;
-+     }
-++  }else if( rc==SQLITE_EMPTY ){
-++    assert( pCur->pgnoRoot==0 || pCur->pPage->nCell==0 );
-++    *pRes = 1;
-++    rc = SQLITE_OK;
-+   }
-+   return rc;
-+ }
-+@@ -5273,22 +5307,23 @@ int sqlite3BtreeMovetoUnpacked(
-+ 
-+   rc = moveToRoot(pCur);
-+   if( rc ){
-++    if( rc==SQLITE_EMPTY ){
-++      assert( pCur->pgnoRoot==0 || pCur->pPage->nCell==0 );
-++      *pRes = -1;
-++      return SQLITE_OK;
-++    }
-+     return rc;
-+   }
-+-  assert( pCur->pgnoRoot==0 || pCur->apPage[pCur->iPage] );
-+-  assert( pCur->pgnoRoot==0 || pCur->apPage[pCur->iPage]->isInit );
-+-  assert( pCur->eState==CURSOR_INVALID || pCur->apPage[pCur->iPage]->nCell>0 );
-+-  if( pCur->eState==CURSOR_INVALID ){
-+-    *pRes = -1;
-+-    assert( pCur->pgnoRoot==0 || pCur->apPage[pCur->iPage]->nCell==0 );
-+-    return SQLITE_OK;
-+-  }
-+-  assert( pCur->apPage[0]->intKey==pCur->curIntKey );
-++  assert( pCur->pPage );
-++  assert( pCur->pPage->isInit );
-++  assert( pCur->eState==CURSOR_VALID );
-++  assert( pCur->pPage->nCell > 0 );
-++  assert( pCur->iPage==0 || pCur->apPage[0]->intKey==pCur->curIntKey );
-+   assert( pCur->curIntKey || pIdxKey );
-+   for(;;){
-+     int lwr, upr, idx, c;
-+     Pgno chldPg;
-+-    MemPage *pPage = pCur->apPage[pCur->iPage];
-++    MemPage *pPage = pCur->pPage;
-+     u8 *pCell;                          /* Pointer to current cell in pPage */
-+ 
-+     /* pPage->nCell must be greater than zero. If this is the root-page
-+@@ -5416,7 +5451,7 @@ int sqlite3BtreeMovetoUnpacked(
-+           *pRes = 0;
-+           rc = SQLITE_OK;
-+           pCur->ix = (u16)idx;
-+-          if( pIdxKey->errCode ) rc = SQLITE_CORRUPT;
-++          if( pIdxKey->errCode ) rc = SQLITE_CORRUPT_BKPT;
-+           goto moveto_finish;
-+         }
-+         if( lwr>upr ) break;
-+@@ -5427,7 +5462,7 @@ int sqlite3BtreeMovetoUnpacked(
-+     assert( lwr==upr+1 || (pPage->intKey && !pPage->leaf) );
-+     assert( pPage->isInit );
-+     if( pPage->leaf ){
-+-      assert( pCur->ix<pCur->apPage[pCur->iPage]->nCell );
-++      assert( pCur->ix<pCur->pPage->nCell );
-+       pCur->ix = (u16)idx;
-+       *pRes = c;
-+       rc = SQLITE_OK;
-+@@ -5481,9 +5516,10 @@ i64 sqlite3BtreeRowCountEst(BtCursor *pCur){
-+   ** opcode, and it that case the cursor will always be valid and
-+   ** will always point to a leaf node. */
-+   if( NEVER(pCur->eState!=CURSOR_VALID) ) return -1;
-+-  if( NEVER(pCur->apPage[pCur->iPage]->leaf==0) ) return -1;
-++  if( NEVER(pCur->pPage->leaf==0) ) return -1;
-+ 
-+-  for(n=1, i=0; i<=pCur->iPage; i++){
-++  n = pCur->pPage->nCell;
-++  for(i=0; i<pCur->iPage; i++){
-+     n *= pCur->apPage[i]->nCell;
-+   }
-+   return n;
-+@@ -5536,7 +5572,7 @@ static SQLITE_NOINLINE int btreeNext(BtCursor *pCur){
-+     }
-+   }
-+ 
-+-  pPage = pCur->apPage[pCur->iPage];
-++  pPage = pCur->pPage;
-+   idx = ++pCur->ix;
-+   assert( pPage->isInit );
-+ 
-+@@ -5559,7 +5595,7 @@ static SQLITE_NOINLINE int btreeNext(BtCursor *pCur){
-+         return SQLITE_DONE;
-+       }
-+       moveToParent(pCur);
-+-      pPage = pCur->apPage[pCur->iPage];
-++      pPage = pCur->pPage;
-+     }while( pCur->ix>=pPage->nCell );
-+     if( pPage->intKey ){
-+       return sqlite3BtreeNext(pCur, 0);
-+@@ -5582,7 +5618,7 @@ int sqlite3BtreeNext(BtCursor *pCur, int flags){
-+   pCur->info.nSize = 0;
-+   pCur->curFlags &= ~(BTCF_ValidNKey|BTCF_ValidOvfl);
-+   if( pCur->eState!=CURSOR_VALID ) return btreeNext(pCur);
-+-  pPage = pCur->apPage[pCur->iPage];
-++  pPage = pCur->pPage;
-+   if( (++pCur->ix)>=pPage->nCell ){
-+     pCur->ix--;
-+     return btreeNext(pCur);
-+@@ -5641,7 +5677,7 @@ static SQLITE_NOINLINE int btreePrevious(BtCursor *pCur){
-+     }
-+   }
-+ 
-+-  pPage = pCur->apPage[pCur->iPage];
-++  pPage = pCur->pPage;
-+   assert( pPage->isInit );
-+   if( !pPage->leaf ){
-+     int idx = pCur->ix;
-+@@ -5660,7 +5696,7 @@ static SQLITE_NOINLINE int btreePrevious(BtCursor *pCur){
-+     assert( (pCur->curFlags & (BTCF_ValidOvfl))==0 );
-+ 
-+     pCur->ix--;
-+-    pPage = pCur->apPage[pCur->iPage];
-++    pPage = pCur->pPage;
-+     if( pPage->intKey && !pPage->leaf ){
-+       rc = sqlite3BtreePrevious(pCur, 0);
-+     }else{
-+@@ -5678,7 +5714,7 @@ int sqlite3BtreePrevious(BtCursor *pCur, int flags){
-+   pCur->info.nSize = 0;
-+   if( pCur->eState!=CURSOR_VALID
-+    || pCur->ix==0
-+-   || pCur->apPage[pCur->iPage]->leaf==0
-++   || pCur->pPage->leaf==0
-+   ){
-+     return btreePrevious(pCur);
-+   }
-+@@ -6174,7 +6210,7 @@ static int clearCell(
-+   unsigned char *pCell,    /* First byte of the Cell */
-+   CellInfo *pInfo          /* Size information about the cell */
-+ ){
-+-  BtShared *pBt = pPage->pBt;
-++  BtShared *pBt;
-+   Pgno ovflPgno;
-+   int rc;
-+   int nOvfl;
-+@@ -6190,6 +6226,7 @@ static int clearCell(
-+     return SQLITE_CORRUPT_PGNO(pPage->pgno);
-+   }
-+   ovflPgno = get4byte(pCell + pInfo->nSize - 4);
-++  pBt = pPage->pBt;
-+   assert( pBt->usableSize > 4 );
-+   ovflPageSize = pBt->usableSize - 4;
-+   nOvfl = (pInfo->nPayload - pInfo->nLocal + ovflPageSize - 1)/ovflPageSize;
-+@@ -6257,21 +6294,20 @@ static int fillInCell(
-+ ){
-+   int nPayload;
-+   const u8 *pSrc;
-+-  int nSrc, n, rc;
-++  int nSrc, n, rc, mn;
-+   int spaceLeft;
-+-  MemPage *pOvfl = 0;
-+-  MemPage *pToRelease = 0;
-++  MemPage *pToRelease;
-+   unsigned char *pPrior;
-+   unsigned char *pPayload;
-+-  BtShared *pBt = pPage->pBt;
-+-  Pgno pgnoOvfl = 0;
-++  BtShared *pBt;
-++  Pgno pgnoOvfl;
-+   int nHeader;
-+ 
-+   assert( sqlite3_mutex_held(pPage->pBt->mutex) );
-+ 
-+   /* pPage is not necessarily writeable since pCell might be auxiliary
-+   ** buffer space that is separate from the pPage buffer area */
-+-  assert( pCell<pPage->aData || pCell>=&pPage->aData[pBt->pageSize]
-++  assert( pCell<pPage->aData || pCell>=&pPage->aData[pPage->pBt->pageSize]
-+             || sqlite3PagerIswriteable(pPage->pDbPage) );
-+ 
-+   /* Fill in the header. */
-+@@ -6291,25 +6327,36 @@ static int fillInCell(
-+   }
-+ 
-+   /* Fill in the payload */
-++  pPayload = &pCell[nHeader];
-+   if( nPayload<=pPage->maxLocal ){
-++    /* This is the common case where everything fits on the btree page
-++    ** and no overflow pages are required. */
-+     n = nHeader + nPayload;
-+     testcase( n==3 );
-+     testcase( n==4 );
-+     if( n<4 ) n = 4;
-+     *pnSize = n;
-+-    spaceLeft = nPayload;
-+-    pPrior = pCell;
-+-  }else{
-+-    int mn = pPage->minLocal;
-+-    n = mn + (nPayload - mn) % (pPage->pBt->usableSize - 4);
-+-    testcase( n==pPage->maxLocal );
-+-    testcase( n==pPage->maxLocal+1 );
-+-    if( n > pPage->maxLocal ) n = mn;
-+-    spaceLeft = n;
-+-    *pnSize = n + nHeader + 4;
-+-    pPrior = &pCell[nHeader+n];
-++    assert( nSrc<=nPayload );
-++    testcase( nSrc<nPayload );
-++    memcpy(pPayload, pSrc, nSrc);
-++    memset(pPayload+nSrc, 0, nPayload-nSrc);
-++    return SQLITE_OK;
-+   }
-+-  pPayload = &pCell[nHeader];
-++
-++  /* If we reach this point, it means that some of the content will need
-++  ** to spill onto overflow pages.
-++  */
-++  mn = pPage->minLocal;
-++  n = mn + (nPayload - mn) % (pPage->pBt->usableSize - 4);
-++  testcase( n==pPage->maxLocal );
-++  testcase( n==pPage->maxLocal+1 );
-++  if( n > pPage->maxLocal ) n = mn;
-++  spaceLeft = n;
-++  *pnSize = n + nHeader + 4;
-++  pPrior = &pCell[nHeader+n];
-++  pToRelease = 0;
-++  pgnoOvfl = 0;
-++  pBt = pPage->pBt;
-+ 
-+   /* At this point variables should be set as follows:
-+   **
-+@@ -6335,8 +6382,35 @@ static int fillInCell(
-+ #endif
-+ 
-+   /* Write the payload into the local Cell and any extra into overflow pages */
-+-  while( nPayload>0 ){
-++  while( 1 ){
-++    n = nPayload;
-++    if( n>spaceLeft ) n = spaceLeft;
-++
-++    /* If pToRelease is not zero than pPayload points into the data area
-++    ** of pToRelease.  Make sure pToRelease is still writeable. */
-++    assert( pToRelease==0 || sqlite3PagerIswriteable(pToRelease->pDbPage) );
-++
-++    /* If pPayload is part of the data area of pPage, then make sure pPage
-++    ** is still writeable */
-++    assert( pPayload<pPage->aData || pPayload>=&pPage->aData[pBt->pageSize]
-++            || sqlite3PagerIswriteable(pPage->pDbPage) );
-++
-++    if( nSrc>=n ){
-++      memcpy(pPayload, pSrc, n);
-++    }else if( nSrc>0 ){
-++      n = nSrc;
-++      memcpy(pPayload, pSrc, n);
-++    }else{
-++      memset(pPayload, 0, n);
-++    }
-++    nPayload -= n;
-++    if( nPayload<=0 ) break;
-++    pPayload += n;
-++    pSrc += n;
-++    nSrc -= n;
-++    spaceLeft -= n;
-+     if( spaceLeft==0 ){
-++      MemPage *pOvfl = 0;
-+ #ifndef SQLITE_OMIT_AUTOVACUUM
-+       Pgno pgnoPtrmap = pgnoOvfl; /* Overflow page pointer-map entry page */
-+       if( pBt->autoVacuum ){
-+@@ -6389,30 +6463,6 @@ static int fillInCell(
-+       pPayload = &pOvfl->aData[4];
-+       spaceLeft = pBt->usableSize - 4;
-+     }
-+-    n = nPayload;
-+-    if( n>spaceLeft ) n = spaceLeft;
-+-
-+-    /* If pToRelease is not zero than pPayload points into the data area
-+-    ** of pToRelease.  Make sure pToRelease is still writeable. */
-+-    assert( pToRelease==0 || sqlite3PagerIswriteable(pToRelease->pDbPage) );
-+-
-+-    /* If pPayload is part of the data area of pPage, then make sure pPage
-+-    ** is still writeable */
-+-    assert( pPayload<pPage->aData || pPayload>=&pPage->aData[pBt->pageSize]
-+-            || sqlite3PagerIswriteable(pPage->pDbPage) );
-+-
-+-    if( nSrc>0 ){
-+-      if( n>nSrc ) n = nSrc;
-+-      assert( pSrc );
-+-      memcpy(pPayload, pSrc, n);
-+-    }else{
-+-      memset(pPayload, 0, n);
-+-    }
-+-    nPayload -= n;
-+-    pPayload += n;
-+-    pSrc += n;
-+-    nSrc -= n;
-+-    spaceLeft -= n;
-+   }
-+   releasePage(pToRelease);
-+   return SQLITE_OK;
-+@@ -6444,7 +6494,7 @@ static void dropCell(MemPage *pPage, int idx, int sz, int *pRC){
-+   hdr = pPage->hdrOffset;
-+   testcase( pc==get2byte(&data[hdr+5]) );
-+   testcase( pc+sz==pPage->pBt->usableSize );
-+-  if( pc < (u32)get2byte(&data[hdr+5]) || pc+sz > pPage->pBt->usableSize ){
-++  if( pc+sz > pPage->pBt->usableSize ){
-+     *pRC = SQLITE_CORRUPT_BKPT;
-+     return;
-+   }
-+@@ -7311,10 +7361,8 @@ static int balance_nonroot(
-+      + nMaxCells*sizeof(u16)                       /* b.szCell */
-+      + pBt->pageSize;                              /* aSpace1 */
-+ 
-+-  /* EVIDENCE-OF: R-28375-38319 SQLite will never request a scratch buffer
-+-  ** that is more than 6 times the database page size. */
-+   assert( szScratch<=6*(int)pBt->pageSize );
-+-  b.apCell = sqlite3ScratchMalloc( szScratch );
-++  b.apCell = sqlite3StackAllocRaw(0, szScratch );
-+   if( b.apCell==0 ){
-+     rc = SQLITE_NOMEM_BKPT;
-+     goto balance_cleanup;
-+@@ -7892,7 +7940,7 @@ static int balance_nonroot(
-+   ** Cleanup before returning.
-+   */
-+ balance_cleanup:
-+-  sqlite3ScratchFree(b.apCell);
-++  sqlite3StackFree(0, b.apCell);
-+   for(i=0; i<nOld; i++){
-+     releasePage(apOld[i]);
-+   }
-+@@ -7991,7 +8039,7 @@ static int balance(BtCursor *pCur){
-+ 
-+   do {
-+     int iPage = pCur->iPage;
-+-    MemPage *pPage = pCur->apPage[iPage];
-++    MemPage *pPage = pCur->pPage;
-+ 
-+     if( iPage==0 ){
-+       if( pPage->nOverflow ){
-+@@ -8007,7 +8055,9 @@ static int balance(BtCursor *pCur){
-+           pCur->iPage = 1;
-+           pCur->ix = 0;
-+           pCur->aiIdx[0] = 0;
-+-          assert( pCur->apPage[1]->nOverflow );
-++          pCur->apPage[0] = pPage;
-++          pCur->pPage = pCur->apPage[1];
-++          assert( pCur->pPage->nOverflow );
-+         }
-+       }else{
-+         break;
-+@@ -8087,6 +8137,7 @@ static int balance(BtCursor *pCur){
-+       releasePage(pPage);
-+       pCur->iPage--;
-+       assert( pCur->iPage>=0 );
-++      pCur->pPage = pCur->apPage[pCur->iPage];
-+     }
-+   }while( rc==SQLITE_OK );
-+ 
-+@@ -8218,7 +8269,7 @@ int sqlite3BtreeInsert(
-+   }
-+   assert( pCur->eState==CURSOR_VALID || (pCur->eState==CURSOR_INVALID && loc) );
-+ 
-+-  pPage = pCur->apPage[pCur->iPage];
-++  pPage = pCur->pPage;
-+   assert( pPage->intKey || pX->nKey>=0 );
-+   assert( pPage->leaf || !pPage->intKey );
-+ 
-+@@ -8305,10 +8356,10 @@ int sqlite3BtreeInsert(
-+     ** fails. Internal data structure corruption will result otherwise.
-+     ** Also, set the cursor state to invalid. This stops saveCursorPosition()
-+     ** from trying to save the current position of the cursor.  */
-+-    pCur->apPage[pCur->iPage]->nOverflow = 0;
-++    pCur->pPage->nOverflow = 0;
-+     pCur->eState = CURSOR_INVALID;
-+     if( (flags & BTREE_SAVEPOSITION) && rc==SQLITE_OK ){
-+-      rc = moveToRoot(pCur);
-++      btreeReleaseAllCursorPages(pCur);
-+       if( pCur->pKeyInfo ){
-+         assert( pCur->pKey==0 );
-+         pCur->pKey = sqlite3Malloc( pX->nKey );
-+@@ -8322,7 +8373,7 @@ int sqlite3BtreeInsert(
-+       pCur->nKey = pX->nKey;
-+     }
-+   }
-+-  assert( pCur->apPage[pCur->iPage]->nOverflow==0 );
-++  assert( pCur->iPage<0 || pCur->pPage->nOverflow==0 );
-+ 
-+ end_insert:
-+   return rc;
-+@@ -8363,13 +8414,13 @@ int sqlite3BtreeDelete(BtCursor *pCur, u8 flags){
-+   assert( pCur->curFlags & BTCF_WriteFlag );
-+   assert( hasSharedCacheTableLock(p, pCur->pgnoRoot, pCur->pKeyInfo!=0, 2) );
-+   assert( !hasReadConflicts(p, pCur->pgnoRoot) );
-+-  assert( pCur->ix<pCur->apPage[pCur->iPage]->nCell );
-++  assert( pCur->ix<pCur->pPage->nCell );
-+   assert( pCur->eState==CURSOR_VALID );
-+   assert( (flags & ~(BTREE_SAVEPOSITION | BTREE_AUXDELETE))==0 );
-+ 
-+   iCellDepth = pCur->iPage;
-+   iCellIdx = pCur->ix;
-+-  pPage = pCur->apPage[iCellDepth];
-++  pPage = pCur->pPage;
-+   pCell = findCell(pPage, iCellIdx);
-+ 
-+   /* If the bPreserve flag is set to true, then the cursor position must
-+@@ -8435,11 +8486,16 @@ int sqlite3BtreeDelete(BtCursor *pCur, u8 flags){
-+   ** node. The cell from the leaf node needs to be moved to the internal
-+   ** node to replace the deleted cell.  */
-+   if( !pPage->leaf ){
-+-    MemPage *pLeaf = pCur->apPage[pCur->iPage];
-++    MemPage *pLeaf = pCur->pPage;
-+     int nCell;
-+-    Pgno n = pCur->apPage[iCellDepth+1]->pgno;
-++    Pgno n;
-+     unsigned char *pTmp;
-+ 
-++    if( iCellDepth<pCur->iPage-1 ){
-++      n = pCur->apPage[iCellDepth+1]->pgno;
-++    }else{
-++      n = pCur->pPage->pgno;
-++    }
-+     pCell = findCell(pLeaf, pLeaf->nCell-1);
-+     if( pCell<&pLeaf->aData[4] ) return SQLITE_CORRUPT_BKPT;
-+     nCell = pLeaf->xCellSize(pLeaf, pCell);
-+@@ -8471,16 +8527,19 @@ int sqlite3BtreeDelete(BtCursor *pCur, u8 flags){
-+   ** well.  */
-+   rc = balance(pCur);
-+   if( rc==SQLITE_OK && pCur->iPage>iCellDepth ){
-++    releasePageNotNull(pCur->pPage);
-++    pCur->iPage--;
-+     while( pCur->iPage>iCellDepth ){
-+       releasePage(pCur->apPage[pCur->iPage--]);
-+     }
-++    pCur->pPage = pCur->apPage[pCur->iPage];
-+     rc = balance(pCur);
-+   }
-+ 
-+   if( rc==SQLITE_OK ){
-+     if( bSkipnext ){
-+       assert( bPreserve && (pCur->iPage==iCellDepth || CORRUPT_DB) );
-+-      assert( pPage==pCur->apPage[pCur->iPage] || CORRUPT_DB );
-++      assert( pPage==pCur->pPage || CORRUPT_DB );
-+       assert( (pPage->nCell>0 || CORRUPT_DB) && iCellIdx<=pPage->nCell );
-+       pCur->eState = CURSOR_SKIPNEXT;
-+       if( iCellIdx>=pPage->nCell ){
-+@@ -8492,8 +8551,10 @@ int sqlite3BtreeDelete(BtCursor *pCur, u8 flags){
-+     }else{
-+       rc = moveToRoot(pCur);
-+       if( bPreserve ){
-++        btreeReleaseAllCursorPages(pCur);
-+         pCur->eState = CURSOR_REQUIRESEEK;
-+       }
-++      if( rc==SQLITE_EMPTY ) rc = SQLITE_OK;
-+     }
-+   }
-+   return rc;
-+@@ -8958,11 +9019,11 @@ int sqlite3BtreeCount(BtCursor *pCur, i64 *pnEntry){
-+   i64 nEntry = 0;                      /* Value to return in *pnEntry */
-+   int rc;                              /* Return code */
-+ 
-+-  if( pCur->pgnoRoot==0 ){
-++  rc = moveToRoot(pCur);
-++  if( rc==SQLITE_EMPTY ){
-+     *pnEntry = 0;
-+     return SQLITE_OK;
-+   }
-+-  rc = moveToRoot(pCur);
-+ 
-+   /* Unless an error occurs, the following loop runs one iteration for each
-+   ** page in the B-Tree structure (not including overflow pages).
-+@@ -8975,7 +9036,7 @@ int sqlite3BtreeCount(BtCursor *pCur, i64 *pnEntry){
-+     ** this page contains countable entries. Increment the entry counter
-+     ** accordingly.
-+     */
-+-    pPage = pCur->apPage[pCur->iPage];
-++    pPage = pCur->pPage;
-+     if( pPage->leaf || !pPage->intKey ){
-+       nEntry += pPage->nCell;
-+     }
-+@@ -8998,10 +9059,10 @@ int sqlite3BtreeCount(BtCursor *pCur, i64 *pnEntry){
-+           return moveToRoot(pCur);
-+         }
-+         moveToParent(pCur);
-+-      }while ( pCur->ix>=pCur->apPage[pCur->iPage]->nCell );
-++      }while ( pCur->ix>=pCur->pPage->nCell );
-+ 
-+       pCur->ix++;
-+-      pPage = pCur->apPage[pCur->iPage];
-++      pPage = pCur->pPage;
-+     }
-+ 
-+     /* Descend to the child node of the cell that the cursor currently
-+@@ -9842,7 +9903,7 @@ int sqlite3BtreePutData(BtCursor *pCsr, u32 offset, u32 amt, void *z){
-+               && pCsr->pBt->inTransaction==TRANS_WRITE );
-+   assert( hasSharedCacheTableLock(pCsr->pBtree, pCsr->pgnoRoot, 0, 2) );
-+   assert( !hasReadConflicts(pCsr->pBtree, pCsr->pgnoRoot) );
-+-  assert( pCsr->apPage[pCsr->iPage]->intKey );
-++  assert( pCsr->pPage->intKey );
-+ 
-+   return accessPayload(pCsr, offset, amt, (unsigned char *)z, 1);
-+ }
-+diff --git a/third_party/sqlite/src/src/btree.h b/third_party/sqlite/src/src/btree.h
-+index 7ba2cab..3a0b008 100644
-+--- a/third_party/sqlite/src/src/btree.h
-++++ b/third_party/sqlite/src/src/btree.h
-+@@ -232,6 +232,7 @@ int sqlite3BtreeCursor(
-+   struct KeyInfo*,                     /* First argument to compare function */
-+   BtCursor *pCursor                    /* Space to write cursor structure */
-+ );
-++BtCursor *sqlite3BtreeFakeValidCursor(void);
-+ int sqlite3BtreeCursorSize(void);
-+ void sqlite3BtreeCursorZero(BtCursor*);
-+ void sqlite3BtreeCursorHintFlags(BtCursor*, unsigned);
-+diff --git a/third_party/sqlite/src/src/btreeInt.h b/third_party/sqlite/src/src/btreeInt.h
-+index 139a0ab..0694b31a 100644
-+--- a/third_party/sqlite/src/src/btreeInt.h
-++++ b/third_party/sqlite/src/src/btreeInt.h
-+@@ -500,6 +500,11 @@ struct CellInfo {
-+ **    eState==FAULT:                   Cursor fault with skipNext as error code.
-+ */
-+ struct BtCursor {
-++  u8 eState;                /* One of the CURSOR_XXX constants (see below) */
-++  u8 curFlags;              /* zero or more BTCF_* flags defined below */
-++  u8 curPagerFlags;         /* Flags to send to sqlite3PagerGet() */
-++  u8 hints;                 /* As configured by CursorSetHints() */
-++  int nOvflAlloc;           /* Allocated size of aOverflow[] array */
-+   Btree *pBtree;            /* The Btree to which this cursor belongs */
-+   BtShared *pBt;            /* The BtShared this cursor points to */
-+   BtCursor *pNext;          /* Forms a linked list of all cursors */
-+@@ -508,13 +513,8 @@ struct BtCursor {
-+   i64 nKey;                 /* Size of pKey, or last integer key */
-+   void *pKey;               /* Saved key that was cursor last known position */
-+   Pgno pgnoRoot;            /* The root page of this tree */
-+-  int nOvflAlloc;           /* Allocated size of aOverflow[] array */
-+   int skipNext;    /* Prev() is noop if negative. Next() is noop if positive.
-+                    ** Error code if eState==CURSOR_FAULT */
-+-  u8 curFlags;              /* zero or more BTCF_* flags defined below */
-+-  u8 curPagerFlags;         /* Flags to send to sqlite3PagerGet() */
-+-  u8 eState;                /* One of the CURSOR_XXX constants (see below) */
-+-  u8 hints;                 /* As configured by CursorSetHints() */
-+   /* All fields above are zeroed when the cursor is allocated.  See
-+   ** sqlite3BtreeCursorZero().  Fields that follow must be manually
-+   ** initialized. */
-+@@ -523,7 +523,8 @@ struct BtCursor {
-+   u16 ix;                   /* Current index for apPage[iPage] */
-+   u16 aiIdx[BTCURSOR_MAX_DEPTH-1];     /* Current index in apPage[i] */
-+   struct KeyInfo *pKeyInfo;            /* Arg passed to comparison function */
-+-  MemPage *apPage[BTCURSOR_MAX_DEPTH]; /* Pages from root to current page */
-++  MemPage *pPage;                        /* Current page */
-++  MemPage *apPage[BTCURSOR_MAX_DEPTH-1]; /* Stack of parents of current page */
-+ };
-+ 
-+ /*
-+diff --git a/third_party/sqlite/src/src/build.c b/third_party/sqlite/src/src/build.c
-+index 4fb8fe9..cc4c114 100644
-+--- a/third_party/sqlite/src/src/build.c
-++++ b/third_party/sqlite/src/src/build.c
-+@@ -479,7 +479,7 @@ void sqlite3UnlinkAndDeleteIndex(sqlite3 *db, int iDb, const char *zIdxName){
-+     }
-+     freeIndex(db, pIndex);
-+   }
-+-  db->flags |= SQLITE_InternChanges;
-++  db->mDbFlags |= DBFLAG_SchemaChange;
-+ }
-+ 
-+ /*
-+@@ -514,28 +514,26 @@ void sqlite3CollapseDatabaseArray(sqlite3 *db){
-+ 
-+ /*
-+ ** Reset the schema for the database at index iDb.  Also reset the
-+-** TEMP schema.
-++** TEMP schema.  The reset is deferred if db->nSchemaLock is not zero.
-++** Deferred resets may be run by calling with iDb<0.
-+ */
-+ void sqlite3ResetOneSchema(sqlite3 *db, int iDb){
-+-  Db *pDb;
-++  int i;
-+   assert( iDb<db->nDb );
-+ 
-+-  /* Case 1:  Reset the single schema identified by iDb */
-+-  pDb = &db->aDb[iDb];
-+-  assert( sqlite3SchemaMutexHeld(db, iDb, 0) );
-+-  assert( pDb->pSchema!=0 );
-+-  sqlite3SchemaClear(pDb->pSchema);
-++  if( iDb>=0 ){
-++    assert( sqlite3SchemaMutexHeld(db, iDb, 0) );
-++    DbSetProperty(db, iDb, DB_ResetWanted);
-++    DbSetProperty(db, 1, DB_ResetWanted);
-++  }
-+ 
-+-  /* If any database other than TEMP is reset, then also reset TEMP
-+-  ** since TEMP might be holding triggers that reference tables in the
-+-  ** other database.
-+-  */
-+-  if( iDb!=1 ){
-+-    pDb = &db->aDb[1];
-+-    assert( pDb->pSchema!=0 );
-+-    sqlite3SchemaClear(pDb->pSchema);
-++  if( db->nSchemaLock==0 ){
-++    for(i=0; i<db->nDb; i++){
-++      if( DbHasProperty(db, i, DB_ResetWanted) ){
-++        sqlite3SchemaClear(db->aDb[i].pSchema);
-++      }
-++    }
-+   }
-+-  return;
-+ }
-+ 
-+ /*
-+@@ -545,13 +543,14 @@ void sqlite3ResetOneSchema(sqlite3 *db, int iDb){
-+ void sqlite3ResetAllSchemasOfConnection(sqlite3 *db){
-+   int i;
-+   sqlite3BtreeEnterAll(db);
-++  assert( db->nSchemaLock==0 );
-+   for(i=0; i<db->nDb; i++){
-+     Db *pDb = &db->aDb[i];
-+     if( pDb->pSchema ){
-+       sqlite3SchemaClear(pDb->pSchema);
-+     }
-+   }
-+-  db->flags &= ~SQLITE_InternChanges;
-++  db->mDbFlags &= ~DBFLAG_SchemaChange;
-+   sqlite3VtabUnlockList(db);
-+   sqlite3BtreeLeaveAll(db);
-+   sqlite3CollapseDatabaseArray(db);
-+@@ -561,7 +560,7 @@ void sqlite3ResetAllSchemasOfConnection(sqlite3 *db){
-+ ** This routine is called when a commit occurs.
-+ */
-+ void sqlite3CommitInternalChanges(sqlite3 *db){
-+-  db->flags &= ~SQLITE_InternChanges;
-++  db->mDbFlags &= ~DBFLAG_SchemaChange;
-+ }
-+ 
-+ /*
-+@@ -599,13 +598,16 @@ void sqlite3DeleteColumnNames(sqlite3 *db, Table *pTable){
-+ */
-+ static void SQLITE_NOINLINE deleteTable(sqlite3 *db, Table *pTable){
-+   Index *pIndex, *pNext;
-+-  TESTONLY( int nLookaside; ) /* Used to verify lookaside not used for schema */
-+ 
-++#ifdef SQLITE_DEBUG
-+   /* Record the number of outstanding lookaside allocations in schema Tables
-+   ** prior to doing any free() operations.  Since schema Tables do not use
-+   ** lookaside, this number should not change. */
-+-  TESTONLY( nLookaside = (db && (pTable->tabFlags & TF_Ephemeral)==0) ?
-+-                         db->lookaside.nOut : 0 );
-++  int nLookaside = 0;
-++  if( db && (pTable->tabFlags & TF_Ephemeral)==0 ){
-++    nLookaside = sqlite3LookasideUsed(db, 0);
-++  }
-++#endif
-+ 
-+   /* Delete all indices associated with this table. */
-+   for(pIndex = pTable->pIndex; pIndex; pIndex=pNext){
-+@@ -639,7 +641,7 @@ static void SQLITE_NOINLINE deleteTable(sqlite3 *db, Table *pTable){
-+   sqlite3DbFree(db, pTable);
-+ 
-+   /* Verify that no lookaside memory was used by schema tables */
-+-  assert( nLookaside==0 || nLookaside==db->lookaside.nOut );
-++  assert( nLookaside==0 || nLookaside==sqlite3LookasideUsed(db,0) );
-+ }
-+ void sqlite3DeleteTable(sqlite3 *db, Table *pTable){
-+   /* Do not delete the table until the reference count reaches zero. */
-+@@ -665,7 +667,7 @@ void sqlite3UnlinkAndDeleteTable(sqlite3 *db, int iDb, const char *zTabName){
-+   pDb = &db->aDb[iDb];
-+   p = sqlite3HashInsert(&pDb->pSchema->tblHash, zTabName, 0);
-+   sqlite3DeleteTable(db, p);
-+-  db->flags |= SQLITE_InternChanges;
-++  db->mDbFlags |= DBFLAG_SchemaChange;
-+ }
-+ 
-+ /*
-+@@ -778,7 +780,8 @@ int sqlite3TwoPartName(
-+       return -1;
-+     }
-+   }else{
-+-    assert( db->init.iDb==0 || db->init.busy || (db->flags & SQLITE_Vacuum)!=0);
-++    assert( db->init.iDb==0 || db->init.busy
-++             || (db->mDbFlags & DBFLAG_Vacuum)!=0);
-+     iDb = db->init.iDb;
-+     *pUnqual = pName1;
-+   }
-+@@ -1010,7 +1013,8 @@ void sqlite3StartTable(
-+     }else
-+ #endif
-+     {
-+-      pParse->addrCrTab = sqlite3VdbeAddOp2(v, OP_CreateTable, iDb, reg2);
-++      pParse->addrCrTab =
-++         sqlite3VdbeAddOp3(v, OP_CreateBtree, iDb, reg2, BTREE_INTKEY);
-+     }
-+     sqlite3OpenMasterTable(pParse, iDb);
-+     sqlite3VdbeAddOp2(v, OP_NewRowid, 0, reg1);
-+@@ -1059,12 +1063,10 @@ void sqlite3AddColumn(Parse *pParse, Token *pName, Token *pType){
-+   Column *pCol;
-+   sqlite3 *db = pParse->db;
-+   if( (p = pParse->pNewTable)==0 ) return;
-+-#if SQLITE_MAX_COLUMN
-+   if( p->nCol+1>db->aLimit[SQLITE_LIMIT_COLUMN] ){
-+     sqlite3ErrorMsg(pParse, "too many columns on %s", p->zName);
-+     return;
-+   }
-+-#endif
-+   z = sqlite3DbMallocRaw(db, pName->n + pType->n + 2);
-+   if( z==0 ) return;
-+   memcpy(z, pName->z, pName->n);
-+@@ -1670,9 +1672,8 @@ static int hasColumn(const i16 *aiCol, int nCol, int x){
-+ ** Changes include:
-+ **
-+ **     (1)  Set all columns of the PRIMARY KEY schema object to be NOT NULL.
-+-**     (2)  Convert the OP_CreateTable into an OP_CreateIndex.  There is
-+-**          no rowid btree for a WITHOUT ROWID.  Instead, the canonical
-+-**          data storage is a covering index btree.
-++**     (2)  Convert P3 parameter of the OP_CreateBtree from BTREE_INTKEY
-++**          into BTREE_BLOBKEY.
-+ **     (3)  Bypass the creation of the sqlite_master table entry
-+ **          for the PRIMARY KEY as the primary key index is now
-+ **          identified by the sqlite_master table entry of the table itself.
-+@@ -1680,7 +1681,7 @@ static int hasColumn(const i16 *aiCol, int nCol, int x){
-+ **          schema to the rootpage from the main table.
-+ **     (5)  Add all table columns to the PRIMARY KEY Index object
-+ **          so that the PRIMARY KEY is a covering index.  The surplus
-+-**          columns are part of KeyInfo.nXField and are not used for
-++**          columns are part of KeyInfo.nAllField and are not used for
-+ **          sorting or lookup or uniqueness checks.
-+ **     (6)  Replace the rowid tail on all automatically generated UNIQUE
-+ **          indices with the PRIMARY KEY columns.
-+@@ -1709,13 +1710,12 @@ static void convertToWithoutRowidTable(Parse *pParse, Table *pTab){
-+   ** virtual tables */
-+   if( IN_DECLARE_VTAB ) return;
-+ 
-+-  /* Convert the OP_CreateTable opcode that would normally create the
-+-  ** root-page for the table into an OP_CreateIndex opcode.  The index
-+-  ** created will become the PRIMARY KEY index.
-++  /* Convert the P3 operand of the OP_CreateBtree opcode from BTREE_INTKEY
-++  ** into BTREE_BLOBKEY.
-+   */
-+   if( pParse->addrCrTab ){
-+     assert( v );
-+-    sqlite3VdbeChangeOpcode(v, pParse->addrCrTab, OP_CreateIndex);
-++    sqlite3VdbeChangeP3(v, pParse->addrCrTab, BTREE_BLOBKEY);
-+   }
-+ 
-+   /* Locate the PRIMARY KEY index.  Or, if this table was originally
-+@@ -2055,7 +2055,7 @@ void sqlite3EndTable(
-+       return;
-+     }
-+     pParse->pNewTable = 0;
-+-    db->flags |= SQLITE_InternChanges;
-++    db->mDbFlags |= DBFLAG_SchemaChange;
-+ 
-+ #ifndef SQLITE_OMIT_ALTERTABLE
-+     if( !p->pSelect ){
-+@@ -2154,6 +2154,9 @@ int sqlite3ViewGetColumnNames(Parse *pParse, Table *pTable){
-+   int nErr = 0;     /* Number of errors encountered */
-+   int n;            /* Temporarily holds the number of cursors assigned */
-+   sqlite3 *db = pParse->db;  /* Database connection for malloc errors */
-++#ifndef SQLITE_OMIT_VIRTUALTABLE
-++  int rc;
-++#endif
-+ #ifndef SQLITE_OMIT_AUTHORIZATION
-+   sqlite3_xauth xAuth;       /* Saved xAuth pointer */
-+ #endif
-+@@ -2161,8 +2164,11 @@ int sqlite3ViewGetColumnNames(Parse *pParse, Table *pTable){
-+   assert( pTable );
-+ 
-+ #ifndef SQLITE_OMIT_VIRTUALTABLE
-+-  if( sqlite3VtabCallConnect(pParse, pTable) ){
-+-    return SQLITE_ERROR;
-++  db->nSchemaLock++;
-++  rc = sqlite3VtabCallConnect(pParse, pTable);
-++  db->nSchemaLock--;
-++  if( rc ){
-++    return 1;
-+   }
-+   if( IsVirtual(pTable) ) return 0;
-+ #endif
-+@@ -2358,14 +2364,6 @@ static void destroyRootPage(Parse *pParse, int iTable, int iDb){
-+ ** is also added (this can happen with an auto-vacuum database).
-+ */
-+ static void destroyTable(Parse *pParse, Table *pTab){
-+-#ifdef SQLITE_OMIT_AUTOVACUUM
-+-  Index *pIdx;
-+-  int iDb = sqlite3SchemaToIndex(pParse->db, pTab->pSchema);
-+-  destroyRootPage(pParse, pTab->tnum, iDb);
-+-  for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
-+-    destroyRootPage(pParse, pIdx->tnum, iDb);
-+-  }
-+-#else
-+   /* If the database may be auto-vacuum capable (if SQLITE_OMIT_AUTOVACUUM
-+   ** is not defined), then it is important to call OP_Destroy on the
-+   ** table and index root-pages in order, starting with the numerically
-+@@ -2408,7 +2406,6 @@ static void destroyTable(Parse *pParse, Table *pTab){
-+       iDestroyed = iLargest;
-+     }
-+   }
-+-#endif
-+ }
-+ 
-+ /*
-+@@ -2835,7 +2832,7 @@ static void sqlite3RefillIndex(Parse *pParse, Index *pIndex, int memRootPage){
-+     addr2 = sqlite3VdbeCurrentAddr(v);
-+   }
-+   sqlite3VdbeAddOp3(v, OP_SorterData, iSorter, regRecord, iIdx);
-+-  sqlite3VdbeAddOp3(v, OP_Last, iIdx, 0, -1);
-++  sqlite3VdbeAddOp1(v, OP_SeekEnd, iIdx);
-+   sqlite3VdbeAddOp2(v, OP_IdxInsert, iIdx, regRecord);
-+   sqlite3VdbeChangeP5(v, OPFLAG_USESEEKRESULT);
-+   sqlite3ReleaseTempReg(pParse, regRecord);
-+@@ -3324,7 +3321,7 @@ void sqlite3CreateIndex(
-+       sqlite3OomFault(db);
-+       goto exit_create_index;
-+     }
-+-    db->flags |= SQLITE_InternChanges;
-++    db->mDbFlags |= DBFLAG_SchemaChange;
-+     if( pTblName!=0 ){
-+       pIndex->tnum = db->init.newTnum;
-+     }
-+@@ -3360,7 +3357,7 @@ void sqlite3CreateIndex(
-+     ** that case the convertToWithoutRowidTable() routine will replace
-+     ** the Noop with a Goto to jump over the VDBE code generated below. */
-+     pIndex->tnum = sqlite3VdbeAddOp0(v, OP_Noop);
-+-    sqlite3VdbeAddOp2(v, OP_CreateIndex, iDb, iMem);
-++    sqlite3VdbeAddOp3(v, OP_CreateBtree, iDb, iMem, BTREE_BLOBKEY);
-+ 
-+     /* Gather the complete text of the CREATE INDEX statement into
-+     ** the zStmt variable
-+@@ -3882,8 +3879,10 @@ SrcList *sqlite3SrcListAppendFromTerm(
-+ */
-+ void sqlite3SrcListIndexedBy(Parse *pParse, SrcList *p, Token *pIndexedBy){
-+   assert( pIndexedBy!=0 );
-+-  if( p && ALWAYS(p->nSrc>0) ){
-+-    struct SrcList_item *pItem = &p->a[p->nSrc-1];
-++  if( p && pIndexedBy->n>0 ){
-++    struct SrcList_item *pItem;
-++    assert( p->nSrc>0 );
-++    pItem = &p->a[p->nSrc-1];
-+     assert( pItem->fg.notIndexed==0 );
-+     assert( pItem->fg.isIndexedBy==0 );
-+     assert( pItem->fg.isTabFunc==0 );
-+@@ -3893,7 +3892,7 @@ void sqlite3SrcListIndexedBy(Parse *pParse, SrcList *p, Token *pIndexedBy){
-+       pItem->fg.notIndexed = 1;
-+     }else{
-+       pItem->u1.zIndexedBy = sqlite3NameFromToken(pParse->db, pIndexedBy);
-+-      pItem->fg.isIndexedBy = (pItem->u1.zIndexedBy!=0);
-++      pItem->fg.isIndexedBy = 1;
-+     }
-+   }
-+ }
-+diff --git a/third_party/sqlite/src/src/callback.c b/third_party/sqlite/src/src/callback.c
-+index eb2e31b..38ba172 100644
-+--- a/third_party/sqlite/src/src/callback.c
-++++ b/third_party/sqlite/src/src/callback.c
-+@@ -374,7 +374,7 @@ FuncDef *sqlite3FindFunction(
-+ 
-+   /* If no match is found, search the built-in functions.
-+   **
-+-  ** If the SQLITE_PreferBuiltin flag is set, then search the built-in
-++  ** If the DBFLAG_PreferBuiltin flag is set, then search the built-in
-+   ** functions even if a prior app-defined function was found.  And give
-+   ** priority to built-in functions.
-+   **
-+@@ -384,7 +384,7 @@ FuncDef *sqlite3FindFunction(
-+   ** new function.  But the FuncDefs for built-in functions are read-only.
-+   ** So we must not search for built-ins when creating a new function.
-+   */
-+-  if( !createFlag && (pBest==0 || (db->flags & SQLITE_PreferBuiltin)!=0) ){
-++  if( !createFlag && (pBest==0 || (db->mDbFlags & DBFLAG_PreferBuiltin)!=0) ){
-+     bestScore = 0;
-+     h = (sqlite3UpperToLower[(u8)zName[0]] + nName) % SQLITE_FUNC_HASH_SZ;
-+     p = functionSearch(h, zName);
-+@@ -457,8 +457,8 @@ void sqlite3SchemaClear(void *p){
-+   pSchema->pSeqTab = 0;
-+   if( pSchema->schemaFlags & DB_SchemaLoaded ){
-+     pSchema->iGeneration++;
-+-    pSchema->schemaFlags &= ~DB_SchemaLoaded;
-+   }
-++  pSchema->schemaFlags &= ~(DB_SchemaLoaded|DB_ResetWanted);
-+ }
-+ 
-+ /*
-+diff --git a/third_party/sqlite/src/src/ctime.c b/third_party/sqlite/src/src/ctime.c
-+index 059bb84..9430924 100644
-+--- a/third_party/sqlite/src/src/ctime.c
-++++ b/third_party/sqlite/src/src/ctime.c
-+@@ -184,6 +184,9 @@ static const char * const sqlite3azCompileOpt[] = {
-+ #if SQLITE_ENABLE_ATOMIC_WRITE
-+   "ENABLE_ATOMIC_WRITE",
-+ #endif
-++#if SQLITE_ENABLE_BATCH_ATOMIC_WRITE
-++  "ENABLE_BATCH_ATOMIC_WRITE",
-++#endif
-+ #if SQLITE_ENABLE_CEROD
-+   "ENABLE_CEROD",
-+ #endif
-+diff --git a/third_party/sqlite/src/src/dbpage.c b/third_party/sqlite/src/src/dbpage.c
-+new file mode 100644
-+index 0000000..9cd112a
-+--- /dev/null
-++++ b/third_party/sqlite/src/src/dbpage.c
-+@@ -0,0 +1,329 @@
-++/*
-++** 2017-10-11
-++**
-++** The author disclaims copyright to this source code.  In place of
-++** a legal notice, here is a blessing:
-++**
-++**    May you do good and not evil.
-++**    May you find forgiveness for yourself and forgive others.
-++**    May you share freely, never taking more than you give.
-++**
-++******************************************************************************
-++**
-++** This file contains an implementation of the "sqlite_dbpage" virtual table.
-++**
-++** The sqlite_dbpage virtual table is used to read or write whole raw
-++** pages of the database file.  The pager interface is used so that
-++** uncommitted changes and changes recorded in the WAL file are correctly
-++** retrieved.
-++**
-++** Usage example:
-++**
-++**    SELECT data FROM sqlite_dbpage('aux1') WHERE pgno=123;
-++**
-++** This is an eponymous virtual table so it does not need to be created before
-++** use.  The optional argument to the sqlite_dbpage() table name is the
-++** schema for the database file that is to be read.  The default schema is
-++** "main".
-++**
-++** The data field of sqlite_dbpage table can be updated.  The new
-++** value must be a BLOB which is the correct page size, otherwise the
-++** update fails.  Rows may not be deleted or inserted.
-++*/
-++
-++#include "sqliteInt.h"   /* Requires access to internal data structures */
-++#if (defined(SQLITE_ENABLE_DBPAGE_VTAB) || defined(SQLITE_TEST)) \
-++    && !defined(SQLITE_OMIT_VIRTUALTABLE)
-++
-++typedef struct DbpageTable DbpageTable;
-++typedef struct DbpageCursor DbpageCursor;
-++
-++struct DbpageCursor {
-++  sqlite3_vtab_cursor base;       /* Base class.  Must be first */
-++  int pgno;                       /* Current page number */
-++  int mxPgno;                     /* Last page to visit on this scan */
-++};
-++
-++struct DbpageTable {
-++  sqlite3_vtab base;              /* Base class.  Must be first */
-++  sqlite3 *db;                    /* The database */
-++  Pager *pPager;                  /* Pager being read/written */
-++  int iDb;                        /* Index of database to analyze */
-++  int szPage;                     /* Size of each page in bytes */
-++  int nPage;                      /* Number of pages in the file */
-++};
-++
-++/*
-++** Connect to or create a dbpagevfs virtual table.
-++*/
-++static int dbpageConnect(
-++  sqlite3 *db,
-++  void *pAux,
-++  int argc, const char *const*argv,
-++  sqlite3_vtab **ppVtab,
-++  char **pzErr
-++){
-++  DbpageTable *pTab = 0;
-++  int rc = SQLITE_OK;
-++  int iDb;
-++
-++  if( argc>=4 ){
-++    Token nm;
-++    sqlite3TokenInit(&nm, (char*)argv[3]);
-++    iDb = sqlite3FindDb(db, &nm);
-++    if( iDb<0 ){
-++      *pzErr = sqlite3_mprintf("no such schema: %s", argv[3]);
-++      return SQLITE_ERROR;
-++    }
-++  }else{
-++    iDb = 0;
-++  }
-++  rc = sqlite3_declare_vtab(db,
-++          "CREATE TABLE x(pgno INTEGER PRIMARY KEY, data BLOB, schema HIDDEN)");
-++  if( rc==SQLITE_OK ){
-++    pTab = (DbpageTable *)sqlite3_malloc64(sizeof(DbpageTable));
-++    if( pTab==0 ) rc = SQLITE_NOMEM_BKPT;
-++  }
-++
-++  assert( rc==SQLITE_OK || pTab==0 );
-++  if( rc==SQLITE_OK ){
-++    Btree *pBt = db->aDb[iDb].pBt;
-++    memset(pTab, 0, sizeof(DbpageTable));
-++    pTab->db = db;
-++    pTab->iDb = iDb;
-++    pTab->pPager = pBt ? sqlite3BtreePager(pBt) : 0;
-++  }
-++
-++  *ppVtab = (sqlite3_vtab*)pTab;
-++  return rc;
-++}
-++
-++/*
-++** Disconnect from or destroy a dbpagevfs virtual table.
-++*/
-++static int dbpageDisconnect(sqlite3_vtab *pVtab){
-++  sqlite3_free(pVtab);
-++  return SQLITE_OK;
-++}
-++
-++/*
-++** idxNum:
-++**
-++**     0     full table scan
-++**     1     pgno=?1
-++*/
-++static int dbpageBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){
-++  int i;
-++  pIdxInfo->estimatedCost = 1.0e6;  /* Initial cost estimate */
-++  for(i=0; i<pIdxInfo->nConstraint; i++){
-++    struct sqlite3_index_constraint *p = &pIdxInfo->aConstraint[i];
-++    if( p->usable && p->iColumn<=0 && p->op==SQLITE_INDEX_CONSTRAINT_EQ ){
-++      pIdxInfo->estimatedRows = 1;
-++      pIdxInfo->idxFlags = SQLITE_INDEX_SCAN_UNIQUE;
-++      pIdxInfo->estimatedCost = 1.0;
-++      pIdxInfo->idxNum = 1;
-++      pIdxInfo->aConstraintUsage[i].argvIndex = 1;
-++      pIdxInfo->aConstraintUsage[i].omit = 1;
-++      break;
-++    }
-++  }
-++  if( pIdxInfo->nOrderBy>=1
-++   && pIdxInfo->aOrderBy[0].iColumn<=0
-++   && pIdxInfo->aOrderBy[0].desc==0
-++  ){
-++    pIdxInfo->orderByConsumed = 1;
-++  }
-++  return SQLITE_OK;
-++}
-++
-++/*
-++** Open a new dbpagevfs cursor.
-++*/
-++static int dbpageOpen(sqlite3_vtab *pVTab, sqlite3_vtab_cursor **ppCursor){
-++  DbpageCursor *pCsr;
-++
-++  pCsr = (DbpageCursor *)sqlite3_malloc64(sizeof(DbpageCursor));
-++  if( pCsr==0 ){
-++    return SQLITE_NOMEM_BKPT;
-++  }else{
-++    memset(pCsr, 0, sizeof(DbpageCursor));
-++    pCsr->base.pVtab = pVTab;
-++    pCsr->pgno = -1;
-++  }
-++
-++  *ppCursor = (sqlite3_vtab_cursor *)pCsr;
-++  return SQLITE_OK;
-++}
-++
-++/*
-++** Close a dbpagevfs cursor.
-++*/
-++static int dbpageClose(sqlite3_vtab_cursor *pCursor){
-++  DbpageCursor *pCsr = (DbpageCursor *)pCursor;
-++  sqlite3_free(pCsr);
-++  return SQLITE_OK;
-++}
-++
-++/*
-++** Move a dbpagevfs cursor to the next entry in the file.
-++*/
-++static int dbpageNext(sqlite3_vtab_cursor *pCursor){
-++  int rc = SQLITE_OK;
-++  DbpageCursor *pCsr = (DbpageCursor *)pCursor;
-++  pCsr->pgno++;
-++  return rc;
-++}
-++
-++static int dbpageEof(sqlite3_vtab_cursor *pCursor){
-++  DbpageCursor *pCsr = (DbpageCursor *)pCursor;
-++  return pCsr->pgno > pCsr->mxPgno;
-++}
-++
-++static int dbpageFilter(
-++  sqlite3_vtab_cursor *pCursor,
-++  int idxNum, const char *idxStr,
-++  int argc, sqlite3_value **argv
-++){
-++  DbpageCursor *pCsr = (DbpageCursor *)pCursor;
-++  DbpageTable *pTab = (DbpageTable *)pCursor->pVtab;
-++  int rc = SQLITE_OK;
-++  Btree *pBt = pTab->db->aDb[pTab->iDb].pBt;
-++
-++  pTab->szPage = sqlite3BtreeGetPageSize(pBt);
-++  pTab->nPage = sqlite3BtreeLastPage(pBt);
-++  if( idxNum==1 ){
-++    pCsr->pgno = sqlite3_value_int(argv[0]);
-++    if( pCsr->pgno<1 || pCsr->pgno>pTab->nPage ){
-++      pCsr->pgno = 1;
-++      pCsr->mxPgno = 0;
-++    }else{
-++      pCsr->mxPgno = pCsr->pgno;
-++    }
-++  }else{
-++    pCsr->pgno = 1;
-++    pCsr->mxPgno = pTab->nPage;
-++  }
-++  return rc;
-++}
-++
-++static int dbpageColumn(
-++  sqlite3_vtab_cursor *pCursor,
-++  sqlite3_context *ctx,
-++  int i
-++){
-++  DbpageCursor *pCsr = (DbpageCursor *)pCursor;
-++  DbpageTable *pTab = (DbpageTable *)pCursor->pVtab;
-++  int rc = SQLITE_OK;
-++  switch( i ){
-++    case 0: {           /* pgno */
-++      sqlite3_result_int(ctx, pCsr->pgno);
-++      break;
-++    }
-++    case 1: {           /* data */
-++      DbPage *pDbPage = 0;
-++      rc = sqlite3PagerGet(pTab->pPager, pCsr->pgno, (DbPage**)&pDbPage, 0);
-++      if( rc==SQLITE_OK ){
-++        sqlite3_result_blob(ctx, sqlite3PagerGetData(pDbPage), pTab->szPage,
-++                            SQLITE_TRANSIENT);
-++      }
-++      sqlite3PagerUnref(pDbPage);
-++      break;
-++    }
-++    default: {          /* schema */
-++      sqlite3 *db = sqlite3_context_db_handle(ctx);
-++      sqlite3_result_text(ctx, db->aDb[pTab->iDb].zDbSName, -1, SQLITE_STATIC);
-++      break;
-++    }
-++  }
-++  return SQLITE_OK;
-++}
-++
-++static int dbpageRowid(sqlite3_vtab_cursor *pCursor, sqlite_int64 *pRowid){
-++  DbpageCursor *pCsr = (DbpageCursor *)pCursor;
-++  *pRowid = pCsr->pgno;
-++  return SQLITE_OK;
-++}
-++
-++static int dbpageUpdate(
-++  sqlite3_vtab *pVtab,
-++  int argc,
-++  sqlite3_value **argv,
-++  sqlite_int64 *pRowid
-++){
-++  DbpageTable *pTab = (DbpageTable *)pVtab;
-++  int pgno;
-++  DbPage *pDbPage = 0;
-++  int rc = SQLITE_OK;
-++  char *zErr = 0;
-++
-++  if( argc==1 ){
-++    zErr = "cannot delete";
-++    goto update_fail;
-++  }
-++  pgno = sqlite3_value_int(argv[0]);
-++  if( pgno<1 || pgno>pTab->nPage ){
-++    zErr = "bad page number";
-++    goto update_fail;
-++  }
-++  if( sqlite3_value_int(argv[1])!=pgno ){
-++    zErr = "cannot insert";
-++    goto update_fail;
-++  }
-++  if( sqlite3_value_type(argv[3])!=SQLITE_BLOB
-++   || sqlite3_value_bytes(argv[3])!=pTab->szPage
-++  ){
-++    zErr = "bad page value";
-++    goto update_fail;
-++  }
-++  rc = sqlite3PagerGet(pTab->pPager, pgno, (DbPage**)&pDbPage, 0);
-++  if( rc==SQLITE_OK ){
-++    rc = sqlite3PagerWrite(pDbPage);
-++    if( rc==SQLITE_OK ){
-++      memcpy(sqlite3PagerGetData(pDbPage),
-++             sqlite3_value_blob(argv[3]),
-++             pTab->szPage);
-++    }
-++  }
-++  sqlite3PagerUnref(pDbPage);
-++  return rc;
-++
-++update_fail:
-++  sqlite3_free(pVtab->zErrMsg);
-++  pVtab->zErrMsg = sqlite3_mprintf("%s", zErr);
-++  return SQLITE_ERROR;
-++}
-++
-++/*
-++** Invoke this routine to register the "dbpage" virtual table module
-++*/
-++int sqlite3DbpageRegister(sqlite3 *db){
-++  static sqlite3_module dbpage_module = {
-++    0,                            /* iVersion */
-++    dbpageConnect,                /* xCreate */
-++    dbpageConnect,                /* xConnect */
-++    dbpageBestIndex,              /* xBestIndex */
-++    dbpageDisconnect,             /* xDisconnect */
-++    dbpageDisconnect,             /* xDestroy */
-++    dbpageOpen,                   /* xOpen - open a cursor */
-++    dbpageClose,                  /* xClose - close a cursor */
-++    dbpageFilter,                 /* xFilter - configure scan constraints */
-++    dbpageNext,                   /* xNext - advance a cursor */
-++    dbpageEof,                    /* xEof - check for end of scan */
-++    dbpageColumn,                 /* xColumn - read data */
-++    dbpageRowid,                  /* xRowid - read data */
-++    dbpageUpdate,                 /* xUpdate */
-++    0,                            /* xBegin */
-++    0,                            /* xSync */
-++    0,                            /* xCommit */
-++    0,                            /* xRollback */
-++    0,                            /* xFindMethod */
-++    0,                            /* xRename */
-++    0,                            /* xSavepoint */
-++    0,                            /* xRelease */
-++    0,                            /* xRollbackTo */
-++  };
-++  return sqlite3_create_module(db, "sqlite_dbpage", &dbpage_module, 0);
-++}
-++#elif defined(SQLITE_ENABLE_DBPAGE_VTAB)
-++int sqlite3DbpageRegister(sqlite3 *db){ return SQLITE_OK; }
-++#endif /* SQLITE_ENABLE_DBSTAT_VTAB */
-+diff --git a/third_party/sqlite/src/src/delete.c b/third_party/sqlite/src/src/delete.c
-+index 79e0467..2d3a9b7 100644
-+--- a/third_party/sqlite/src/src/delete.c
-++++ b/third_party/sqlite/src/src/delete.c
-+@@ -502,7 +502,11 @@ void sqlite3DeleteFrom(
-+       }
-+     }else if( pPk ){
-+       addrLoop = sqlite3VdbeAddOp1(v, OP_Rewind, iEphCur); VdbeCoverage(v);
-+-      sqlite3VdbeAddOp2(v, OP_RowData, iEphCur, iKey);
-++      if( IsVirtual(pTab) ){
-++        sqlite3VdbeAddOp3(v, OP_Column, iEphCur, 0, iKey);
-++      }else{
-++        sqlite3VdbeAddOp2(v, OP_RowData, iEphCur, iKey);
-++      }
-+       assert( nKey==0 );  /* OP_Found will use a composite key */
-+     }else{
-+       addrLoop = sqlite3VdbeAddOp3(v, OP_RowSetRead, iRowSet, 0, iKey);
-+diff --git a/third_party/sqlite/src/src/expr.c b/third_party/sqlite/src/src/expr.c
-+index 3acf3d35..325fced 100644
-+--- a/third_party/sqlite/src/src/expr.c
-++++ b/third_party/sqlite/src/src/expr.c
-+@@ -124,6 +124,11 @@ Expr *sqlite3ExprSkipCollate(Expr *pExpr){
-+ ** Return the collation sequence for the expression pExpr. If
-+ ** there is no defined collating sequence, return NULL.
-+ **
-++** See also: sqlite3ExprNNCollSeq()
-++**
-++** The sqlite3ExprNNCollSeq() works the same exact that it returns the
-++** default collation if pExpr has no defined collation.
-++**
-+ ** The collating sequence might be determined by a COLLATE operator
-+ ** or by the presence of a column with a defined collating sequence.
-+ ** COLLATE operators take first precedence.  Left operands take
-+@@ -189,6 +194,32 @@ CollSeq *sqlite3ExprCollSeq(Parse *pParse, Expr *pExpr){
-+ }
-+ 
-+ /*
-++** Return the collation sequence for the expression pExpr. If
-++** there is no defined collating sequence, return a pointer to the
-++** defautl collation sequence.
-++**
-++** See also: sqlite3ExprCollSeq()
-++**
-++** The sqlite3ExprCollSeq() routine works the same except that it
-++** returns NULL if there is no defined collation.
-++*/
-++CollSeq *sqlite3ExprNNCollSeq(Parse *pParse, Expr *pExpr){
-++  CollSeq *p = sqlite3ExprCollSeq(pParse, pExpr);
-++  if( p==0 ) p = pParse->db->pDfltColl;
-++  assert( p!=0 );
-++  return p;
-++}
-++
-++/*
-++** Return TRUE if the two expressions have equivalent collating sequences.
-++*/
-++int sqlite3ExprCollSeqMatch(Parse *pParse, Expr *pE1, Expr *pE2){
-++  CollSeq *pColl1 = sqlite3ExprNNCollSeq(pParse, pE1);
-++  CollSeq *pColl2 = sqlite3ExprNNCollSeq(pParse, pE2);
-++  return sqlite3StrICmp(pColl1->zName, pColl2->zName)==0;
-++}
-++
-++/*
-+ ** pExpr is an operand of a comparison operator.  aff2 is the
-+ ** type affinity of the other operand.  This routine returns the
-+ ** type affinity that should be used for the comparison operator.
-+@@ -775,7 +806,7 @@ Expr *sqlite3Expr(
-+ ){
-+   Token x;
-+   x.z = zToken;
-+-  x.n = zToken ? sqlite3Strlen30(zToken) : 0;
-++  x.n = sqlite3Strlen30(zToken);
-+   return sqlite3ExprAlloc(db, op, &x, 0);
-+ }
-+ 
-+@@ -1302,10 +1333,9 @@ ExprList *sqlite3ExprListDup(sqlite3 *db, ExprList *p, int flags){
-+   Expr *pPriorSelectCol = 0;
-+   assert( db!=0 );
-+   if( p==0 ) return 0;
-+-  pNew = sqlite3DbMallocRawNN(db,
-+-             sizeof(*pNew)+sizeof(pNew->a[0])*(p->nExpr-1) );
-++  pNew = sqlite3DbMallocRawNN(db, sqlite3DbMallocSize(db, p));
-+   if( pNew==0 ) return 0;
-+-  pNew->nAlloc = pNew->nExpr = p->nExpr;
-++  pNew->nExpr = p->nExpr;
-+   pItem = pNew->a;
-+   pOldItem = p->a;
-+   for(i=0; i<p->nExpr; i++, pItem++, pOldItem++){
-+@@ -1459,6 +1489,13 @@ Select *sqlite3SelectDup(sqlite3 *db, Select *p, int flags){
-+ ** Add a new element to the end of an expression list.  If pList is
-+ ** initially NULL, then create a new expression list.
-+ **
-++** The pList argument must be either NULL or a pointer to an ExprList
-++** obtained from a prior call to sqlite3ExprListAppend().  This routine
-++** may not be used with an ExprList obtained from sqlite3ExprListDup().
-++** Reason:  This routine assumes that the number of slots in pList->a[]
-++** is a power of two.  That is true for sqlite3ExprListAppend() returns
-++** but is not necessarily true from the return value of sqlite3ExprListDup().
-++**
-+ ** If a memory allocation error occurs, the entire list is freed and
-+ ** NULL is returned.  If non-NULL is returned, then it is guaranteed
-+ ** that the new entry was successfully appended.
-+@@ -1477,16 +1514,14 @@ ExprList *sqlite3ExprListAppend(
-+       goto no_mem;
-+     }
-+     pList->nExpr = 0;
-+-    pList->nAlloc = 1;
-+-  }else if( pList->nExpr==pList->nAlloc ){
-++  }else if( (pList->nExpr & (pList->nExpr-1))==0 ){
-+     ExprList *pNew;
-+     pNew = sqlite3DbRealloc(db, pList,
-+-             sizeof(*pList)+(2*pList->nAlloc - 1)*sizeof(pList->a[0]));
-++             sizeof(*pList)+(2*pList->nExpr - 1)*sizeof(pList->a[0]));
-+     if( pNew==0 ){
-+       goto no_mem;
-+     }
-+     pList = pNew;
-+-    pList->nAlloc *= 2;
-+   }
-+   pItem = &pList->a[pList->nExpr++];
-+   assert( offsetof(struct ExprList_item,zName)==sizeof(pItem->pExpr) );
-+@@ -1677,17 +1712,29 @@ void sqlite3ExprListDelete(sqlite3 *db, ExprList *pList){
-+ u32 sqlite3ExprListFlags(const ExprList *pList){
-+   int i;
-+   u32 m = 0;
-+-  if( pList ){
-+-    for(i=0; i<pList->nExpr; i++){
-+-       Expr *pExpr = pList->a[i].pExpr;
-+-       assert( pExpr!=0 );
-+-       m |= pExpr->flags;
-+-    }
-++  assert( pList!=0 );
-++  for(i=0; i<pList->nExpr; i++){
-++     Expr *pExpr = pList->a[i].pExpr;
-++     assert( pExpr!=0 );
-++     m |= pExpr->flags;
-+   }
-+   return m;
-+ }
-+ 
-+ /*
-++** This is a SELECT-node callback for the expression walker that
-++** always "fails".  By "fail" in this case, we mean set
-++** pWalker->eCode to zero and abort.
-++**
-++** This callback is used by multiple expression walkers.
-++*/
-++int sqlite3SelectWalkFail(Walker *pWalker, Select *NotUsed){
-++  UNUSED_PARAMETER(NotUsed);
-++  pWalker->eCode = 0;
-++  return WRC_Abort;
-++}
-++
-++/*
-+ ** These routines are Walker callbacks used to check expressions to
-+ ** see if they are "constant" for some definition of constant.  The
-+ ** Walker.eCode value determines the type of "constant" we are looking
-+@@ -1763,21 +1810,16 @@ static int exprNodeIsConstant(Walker *pWalker, Expr *pExpr){
-+       }
-+       /* Fall through */
-+     default:
-+-      testcase( pExpr->op==TK_SELECT ); /* selectNodeIsConstant will disallow */
-+-      testcase( pExpr->op==TK_EXISTS ); /* selectNodeIsConstant will disallow */
-++      testcase( pExpr->op==TK_SELECT ); /* sqlite3SelectWalkFail will disallow */
-++      testcase( pExpr->op==TK_EXISTS ); /* sqlite3SelectWalkFail will disallow */
-+       return WRC_Continue;
-+   }
-+ }
-+-static int selectNodeIsConstant(Walker *pWalker, Select *NotUsed){
-+-  UNUSED_PARAMETER(NotUsed);
-+-  pWalker->eCode = 0;
-+-  return WRC_Abort;
-+-}
-+ static int exprIsConst(Expr *p, int initFlag, int iCur){
-+   Walker w;
-+   w.eCode = initFlag;
-+   w.xExprCallback = exprNodeIsConstant;
-+-  w.xSelectCallback = selectNodeIsConstant;
-++  w.xSelectCallback = sqlite3SelectWalkFail;
-+ #ifdef SQLITE_DEBUG
-+   w.xSelectCallback2 = sqlite3SelectWalkAssert2;
-+ #endif
-+@@ -1831,8 +1873,8 @@ static int exprNodeIsConstantOrGroupBy(Walker *pWalker, Expr *pExpr){
-+   for(i=0; i<pGroupBy->nExpr; i++){
-+     Expr *p = pGroupBy->a[i].pExpr;
-+     if( sqlite3ExprCompare(0, pExpr, p, -1)<2 ){
-+-      CollSeq *pColl = sqlite3ExprCollSeq(pWalker->pParse, p);
-+-      if( pColl==0 || sqlite3_stricmp("BINARY", pColl->zName)==0 ){
-++      CollSeq *pColl = sqlite3ExprNNCollSeq(pWalker->pParse, p);
-++      if( sqlite3_stricmp("BINARY", pColl->zName)==0 ){
-+         return WRC_Prune;
-+       }
-+     }
-+@@ -1900,7 +1942,7 @@ int sqlite3ExprContainsSubquery(Expr *p){
-+   Walker w;
-+   w.eCode = 1;
-+   w.xExprCallback = sqlite3ExprWalkNoop;
-+-  w.xSelectCallback = selectNodeIsConstant;
-++  w.xSelectCallback = sqlite3SelectWalkFail;
-+ #ifdef SQLITE_DEBUG
-+   w.xSelectCallback2 = sqlite3SelectWalkAssert2;
-+ #endif
-+@@ -1973,8 +2015,8 @@ int sqlite3ExprCanBeNull(const Expr *p){
-+     case TK_BLOB:
-+       return 0;
-+     case TK_COLUMN:
-+-      assert( p->pTab!=0 );
-+       return ExprHasProperty(p, EP_CanBeNull) ||
-++             p->pTab==0 ||  /* Reference to column of index on expression */
-+              (p->iColumn>=0 && p->pTab->aCol[p->iColumn].notNull==0);
-+     default:
-+       return 1;
-+@@ -2636,7 +2678,7 @@ int sqlite3CodeSubselect(
-+         /* Loop through each expression in <exprlist>. */
-+         r1 = sqlite3GetTempReg(pParse);
-+         r2 = sqlite3GetTempReg(pParse);
-+-        if( isRowid ) sqlite3VdbeAddOp2(v, OP_Null, 0, r2);
-++        if( isRowid ) sqlite3VdbeAddOp4(v, OP_Blob, 0, r2, 0, "", P4_STATIC);
-+         for(i=pList->nExpr, pItem=pList->a; i>0; i--, pItem++){
-+           Expr *pE2 = pItem->pExpr;
-+           int iValToIns;
-+@@ -3064,7 +3106,7 @@ static void codeInteger(Parse *pParse, Expr *pExpr, int negFlag, int iMem){
-+     const char *z = pExpr->u.zToken;
-+     assert( z!=0 );
-+     c = sqlite3DecOrHexToI64(z, &value);
-+-    if( c==1 || (c==2 && !negFlag) || (negFlag && value==SMALLEST_INT64)){
-++    if( (c==3 && !negFlag) || (c==2) || (negFlag && value==SMALLEST_INT64)){
-+ #ifdef SQLITE_OMIT_FLOATING_POINT
-+       sqlite3ErrorMsg(pParse, "oversized integer: %s%s", negFlag ? "-" : "", z);
-+ #else
-+@@ -3078,7 +3120,7 @@ static void codeInteger(Parse *pParse, Expr *pExpr, int negFlag, int iMem){
-+       }
-+ #endif
-+     }else{
-+-      if( negFlag ){ value = c==2 ? SMALLEST_INT64 : -value; }
-++      if( negFlag ){ value = c==3 ? SMALLEST_INT64 : -value; }
-+       sqlite3VdbeAddOp4Dup8(v, OP_Int64, 0, iMem, 0, (u8*)&value, P4_INT64);
-+     }
-+   }
-+@@ -4233,7 +4275,9 @@ void sqlite3ExprCodeAndCache(Parse *pParse, Expr *pExpr, int target){
-+ ** Generate code that pushes the value of every element of the given
-+ ** expression list into a sequence of registers beginning at target.
-+ **
-+-** Return the number of elements evaluated.
-++** Return the number of elements evaluated.  The number returned will
-++** usually be pList->nExpr but might be reduced if SQLITE_ECEL_OMITREF
-++** is defined.
-+ **
-+ ** The SQLITE_ECEL_DUP flag prevents the arguments from being
-+ ** filled using OP_SCopy.  OP_Copy must be used instead.
-+@@ -4244,6 +4288,8 @@ void sqlite3ExprCodeAndCache(Parse *pParse, Expr *pExpr, int target){
-+ ** The SQLITE_ECEL_REF flag means that expressions in the list with
-+ ** ExprList.a[].u.x.iOrderByCol>0 have already been evaluated and stored
-+ ** in registers at srcReg, and so the value can be copied from there.
-++** If SQLITE_ECEL_OMITREF is also set, then the values with u.x.iOrderByCol>0
-++** are simply omitted rather than being copied from srcReg.
-+ */
-+ int sqlite3ExprCodeExprList(
-+   Parse *pParse,     /* Parsing context */
-+diff --git a/third_party/sqlite/src/src/func.c b/third_party/sqlite/src/src/func.c
-+index b85143e..6f3f02b 100644
-+--- a/third_party/sqlite/src/src/func.c
-++++ b/third_party/sqlite/src/src/func.c
-+@@ -865,7 +865,8 @@ static void likeFunc(
-+ #ifdef SQLITE_TEST
-+     sqlite3_like_count++;
-+ #endif
-+-    sqlite3_result_int(context, patternCompare(zB, zA, pInfo, escape)==SQLITE_MATCH);
-++    sqlite3_result_int(context,
-++                      patternCompare(zB, zA, pInfo, escape)==SQLITE_MATCH);
-+   }
-+ }
-+ 
-+@@ -1706,9 +1707,14 @@ void sqlite3RegisterLikeFunctions(sqlite3 *db, int caseSensitive){
-+ /*
-+ ** pExpr points to an expression which implements a function.  If
-+ ** it is appropriate to apply the LIKE optimization to that function
-+-** then set aWc[0] through aWc[2] to the wildcard characters and
-+-** return TRUE.  If the function is not a LIKE-style function then
-+-** return FALSE.
-++** then set aWc[0] through aWc[2] to the wildcard characters and the
-++** escape character and then return TRUE.  If the function is not a
-++** LIKE-style function then return FALSE.
-++**
-++** The expression "a LIKE b ESCAPE c" is only considered a valid LIKE
-++** operator if c is a string literal that is exactly one byte in length.
-++** That one byte is stored in aWc[3].  aWc[3] is set to zero if there is
-++** no ESCAPE clause.
-+ **
-+ ** *pIsNocase is set to true if uppercase and lowercase are equivalent for
-+ ** the function (default for LIKE).  If the function makes the distinction
-+@@ -1717,17 +1723,26 @@ void sqlite3RegisterLikeFunctions(sqlite3 *db, int caseSensitive){
-+ */
-+ int sqlite3IsLikeFunction(sqlite3 *db, Expr *pExpr, int *pIsNocase, char *aWc){
-+   FuncDef *pDef;
-+-  if( pExpr->op!=TK_FUNCTION
-+-   || !pExpr->x.pList
-+-   || pExpr->x.pList->nExpr!=2
-+-  ){
-++  int nExpr;
-++  if( pExpr->op!=TK_FUNCTION || !pExpr->x.pList ){
-+     return 0;
-+   }
-+   assert( !ExprHasProperty(pExpr, EP_xIsSelect) );
-+-  pDef = sqlite3FindFunction(db, pExpr->u.zToken, 2, SQLITE_UTF8, 0);
-++  nExpr = pExpr->x.pList->nExpr;
-++  pDef = sqlite3FindFunction(db, pExpr->u.zToken, nExpr, SQLITE_UTF8, 0);
-+   if( NEVER(pDef==0) || (pDef->funcFlags & SQLITE_FUNC_LIKE)==0 ){
-+     return 0;
-+   }
-++  if( nExpr<3 ){
-++    aWc[3] = 0;
-++  }else{
-++    Expr *pEscape = pExpr->x.pList->a[2].pExpr;
-++    char *zEscape;
-++    if( pEscape->op!=TK_STRING ) return 0;
-++    zEscape = pEscape->u.zToken;
-++    if( zEscape[0]==0 || zEscape[1]!=0 ) return 0;
-++    aWc[3] = zEscape[0];
-++  }
-+ 
-+   /* The memcpy() statement assumes that the wildcard characters are
-+   ** the first three statements in the compareInfo structure.  The
-+diff --git a/third_party/sqlite/src/src/global.c b/third_party/sqlite/src/src/global.c
-+index e309aa4..395ca06 100644
-+--- a/third_party/sqlite/src/src/global.c
-++++ b/third_party/sqlite/src/src/global.c
-+@@ -199,6 +199,7 @@ SQLITE_WSD struct Sqlite3Config sqlite3Config = {
-+    SQLITE_THREADSAFE==1,      /* bFullMutex */
-+    SQLITE_USE_URI,            /* bOpenUri */
-+    SQLITE_ALLOW_COVERING_INDEX_SCAN,   /* bUseCis */
-++   0,                         /* bSmallMalloc */
-+    0x7ffffffe,                /* mxStrlen */
-+    0,                         /* neverCorrupt */
-+    SQLITE_DEFAULT_LOOKASIDE,  /* szLookaside, nLookaside */
-+@@ -211,9 +212,6 @@ SQLITE_WSD struct Sqlite3Config sqlite3Config = {
-+    0, 0,                      /* mnHeap, mxHeap */
-+    SQLITE_DEFAULT_MMAP_SIZE,  /* szMmap */
-+    SQLITE_MAX_MMAP_SIZE,      /* mxMmap */
-+-   (void*)0,                  /* pScratch */
-+-   0,                         /* szScratch */
-+-   0,                         /* nScratch */
-+    (void*)0,                  /* pPage */
-+    0,                         /* szPage */
-+    SQLITE_DEFAULT_PCACHE_INITSZ, /* nPage */
-+diff --git a/third_party/sqlite/src/src/insert.c b/third_party/sqlite/src/src/insert.c
-+index 8ce1cdd..6a45497 100644
-+--- a/third_party/sqlite/src/src/insert.c
-++++ b/third_party/sqlite/src/src/insert.c
-+@@ -226,7 +226,7 @@ static int autoIncBegin(
-+ ){
-+   int memId = 0;      /* Register holding maximum rowid */
-+   if( (pTab->tabFlags & TF_Autoincrement)!=0
-+-   && (pParse->db->flags & SQLITE_Vacuum)==0
-++   && (pParse->db->mDbFlags & DBFLAG_Vacuum)==0
-+   ){
-+     Parse *pToplevel = sqlite3ParseToplevel(pParse);
-+     AutoincInfo *pInfo;
-+@@ -484,7 +484,6 @@ void sqlite3Insert(
-+ ){
-+   sqlite3 *db;          /* The main database structure */
-+   Table *pTab;          /* The table to insert into.  aka TABLE */
-+-  char *zTab;           /* Name of the table into which we are inserting */
-+   int i, j;             /* Loop counters */
-+   Vdbe *v;              /* Generate code into this virtual machine */
-+   Index *pIdx;          /* For looping over indices of the table */
-+@@ -540,8 +539,6 @@ void sqlite3Insert(
-+   /* Locate the table into which we will be inserting new information.
-+   */
-+   assert( pTabList->nSrc==1 );
-+-  zTab = pTabList->a[0].zName;
-+-  if( NEVER(zTab==0) ) goto insert_cleanup;
-+   pTab = sqlite3SrcListLookup(pParse, pTabList);
-+   if( pTab==0 ){
-+     goto insert_cleanup;
-+@@ -2058,7 +2055,7 @@ static int xferOptimization(
-+     Column *pDestCol = &pDest->aCol[i];
-+     Column *pSrcCol = &pSrc->aCol[i];
-+ #ifdef SQLITE_ENABLE_HIDDEN_COLUMNS
-+-    if( (db->flags & SQLITE_Vacuum)==0
-++    if( (db->mDbFlags & DBFLAG_Vacuum)==0
-+      && (pDestCol->colFlags | pSrcCol->colFlags) & COLFLAG_HIDDEN
-+     ){
-+       return 0;    /* Neither table may have __hidden__ columns */
-+@@ -2134,15 +2131,15 @@ static int xferOptimization(
-+   regRowid = sqlite3GetTempReg(pParse);
-+   sqlite3OpenTable(pParse, iDest, iDbDest, pDest, OP_OpenWrite);
-+   assert( HasRowid(pDest) || destHasUniqueIdx );
-+-  if( (db->flags & SQLITE_Vacuum)==0 && (
-++  if( (db->mDbFlags & DBFLAG_Vacuum)==0 && (
-+       (pDest->iPKey<0 && pDest->pIndex!=0)          /* (1) */
-+    || destHasUniqueIdx                              /* (2) */
-+    || (onError!=OE_Abort && onError!=OE_Rollback)   /* (3) */
-+   )){
-+     /* In some circumstances, we are able to run the xfer optimization
-+     ** only if the destination table is initially empty. Unless the
-+-    ** SQLITE_Vacuum flag is set, this block generates code to make
-+-    ** that determination. If SQLITE_Vacuum is set, then the destination
-++    ** DBFLAG_Vacuum flag is set, this block generates code to make
-++    ** that determination. If DBFLAG_Vacuum is set, then the destination
-+     ** table is always empty.
-+     **
-+     ** Conditions under which the destination must be empty:
-+@@ -2178,8 +2175,8 @@ static int xferOptimization(
-+       assert( (pDest->tabFlags & TF_Autoincrement)==0 );
-+     }
-+     sqlite3VdbeAddOp3(v, OP_RowData, iSrc, regData, 1);
-+-    if( db->flags & SQLITE_Vacuum ){
-+-      sqlite3VdbeAddOp3(v, OP_Last, iDest, 0, -1);
-++    if( db->mDbFlags & DBFLAG_Vacuum ){
-++      sqlite3VdbeAddOp1(v, OP_SeekEnd, iDest);
-+       insFlags = OPFLAG_NCHANGE|OPFLAG_LASTROWID|
-+                            OPFLAG_APPEND|OPFLAG_USESEEKRESULT;
-+     }else{
-+@@ -2210,13 +2207,13 @@ static int xferOptimization(
-+     VdbeComment((v, "%s", pDestIdx->zName));
-+     addr1 = sqlite3VdbeAddOp2(v, OP_Rewind, iSrc, 0); VdbeCoverage(v);
-+     sqlite3VdbeAddOp3(v, OP_RowData, iSrc, regData, 1);
-+-    if( db->flags & SQLITE_Vacuum ){
-++    if( db->mDbFlags & DBFLAG_Vacuum ){
-+       /* This INSERT command is part of a VACUUM operation, which guarantees
-+       ** that the destination table is empty. If all indexed columns use
-+       ** collation sequence BINARY, then it can also be assumed that the
-+       ** index will be populated by inserting keys in strictly sorted
-+       ** order. In this case, instead of seeking within the b-tree as part
-+-      ** of every OP_IdxInsert opcode, an OP_Last is added before the
-++      ** of every OP_IdxInsert opcode, an OP_SeekEnd is added before the
-+       ** OP_IdxInsert to seek to the point within the b-tree where each key
-+       ** should be inserted. This is faster.
-+       **
-+@@ -2231,7 +2228,7 @@ static int xferOptimization(
-+       }
-+       if( i==pSrcIdx->nColumn ){
-+         idxInsFlags = OPFLAG_USESEEKRESULT;
-+-        sqlite3VdbeAddOp3(v, OP_Last, iDest, 0, -1);
-++        sqlite3VdbeAddOp1(v, OP_SeekEnd, iDest);
-+       }
-+     }
-+     if( !HasRowid(pSrc) && pDestIdx->idxType==2 ){
-+diff --git a/third_party/sqlite/src/src/main.c b/third_party/sqlite/src/src/main.c
-+index 0b8c18d..0709b3a 100644
-+--- a/third_party/sqlite/src/src/main.c
-++++ b/third_party/sqlite/src/src/main.c
-+@@ -47,9 +47,11 @@ const char sqlite3_version[] = SQLITE_VERSION;
-+ */
-+ const char *sqlite3_libversion(void){ return sqlite3_version; }
-+ 
-+-/* IMPLEMENTATION-OF: R-63124-39300 The sqlite3_sourceid() function returns a
-++/* IMPLEMENTATION-OF: R-25063-23286 The sqlite3_sourceid() function returns a
-+ ** pointer to a string constant whose value is the same as the
-+-** SQLITE_SOURCE_ID C preprocessor macro.
-++** SQLITE_SOURCE_ID C preprocessor macro. Except if SQLite is built using
-++** an edited copy of the amalgamation, then the last four characters of
-++** the hash might be different from SQLITE_SOURCE_ID.
-+ */
-+ const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
-+ 
-+@@ -436,14 +438,8 @@ int sqlite3_config(int op, ...){
-+       sqlite3GlobalConfig.bMemstat = va_arg(ap, int);
-+       break;
-+     }
-+-    case SQLITE_CONFIG_SCRATCH: {
-+-      /* EVIDENCE-OF: R-08404-60887 There are three arguments to
-+-      ** SQLITE_CONFIG_SCRATCH: A pointer an 8-byte aligned memory buffer from
-+-      ** which the scratch allocations will be drawn, the size of each scratch
-+-      ** allocation (sz), and the maximum number of scratch allocations (N). */
-+-      sqlite3GlobalConfig.pScratch = va_arg(ap, void*);
-+-      sqlite3GlobalConfig.szScratch = va_arg(ap, int);
-+-      sqlite3GlobalConfig.nScratch = va_arg(ap, int);
-++    case SQLITE_CONFIG_SMALL_MALLOC: {
-++      sqlite3GlobalConfig.bSmallMalloc = va_arg(ap, int);
-+       break;
-+     }
-+     case SQLITE_CONFIG_PAGECACHE: {
-+@@ -664,7 +660,8 @@ int sqlite3_config(int op, ...){
-+ static int setupLookaside(sqlite3 *db, void *pBuf, int sz, int cnt){
-+ #ifndef SQLITE_OMIT_LOOKASIDE
-+   void *pStart;
-+-  if( db->lookaside.nOut ){
-++
-++  if( sqlite3LookasideUsed(db,0)>0 ){
-+     return SQLITE_BUSY;
-+   }
-+   /* Free any existing lookaside buffer for this handle before
-+@@ -692,16 +689,18 @@ static int setupLookaside(sqlite3 *db, void *pBuf, int sz, int cnt){
-+     pStart = pBuf;
-+   }
-+   db->lookaside.pStart = pStart;
-++  db->lookaside.pInit = 0;
-+   db->lookaside.pFree = 0;
-+   db->lookaside.sz = (u16)sz;
-+   if( pStart ){
-+     int i;
-+     LookasideSlot *p;
-+     assert( sz > (int)sizeof(LookasideSlot*) );
-++    db->lookaside.nSlot = cnt;
-+     p = (LookasideSlot*)pStart;
-+     for(i=cnt-1; i>=0; i--){
-+-      p->pNext = db->lookaside.pFree;
-+-      db->lookaside.pFree = p;
-++      p->pNext = db->lookaside.pInit;
-++      db->lookaside.pInit = p;
-+       p = (LookasideSlot*)&((u8*)p)[sz];
-+     }
-+     db->lookaside.pEnd = p;
-+@@ -712,6 +711,7 @@ static int setupLookaside(sqlite3 *db, void *pBuf, int sz, int cnt){
-+     db->lookaside.pEnd = db;
-+     db->lookaside.bDisable = 1;
-+     db->lookaside.bMalloced = 0;
-++    db->lookaside.nSlot = 0;
-+   }
-+ #endif /* SQLITE_OMIT_LOOKASIDE */
-+   return SQLITE_OK;
-+@@ -824,7 +824,7 @@ int sqlite3_db_config(sqlite3 *db, int op, ...){
-+         if( aFlagOp[i].op==op ){
-+           int onoff = va_arg(ap, int);
-+           int *pRes = va_arg(ap, int*);
-+-          int oldFlags = db->flags;
-++          u32 oldFlags = db->flags;
-+           if( onoff>0 ){
-+             db->flags |= aFlagOp[i].mask;
-+           }else if( onoff==0 ){
-+@@ -1231,7 +1231,7 @@ void sqlite3LeaveMutexAndCloseZombie(sqlite3 *db){
-+   sqlite3_mutex_leave(db->mutex);
-+   db->magic = SQLITE_MAGIC_CLOSED;
-+   sqlite3_mutex_free(db->mutex);
-+-  assert( db->lookaside.nOut==0 );  /* Fails on a lookaside memory leak */
-++  assert( sqlite3LookasideUsed(db,0)==0 );
-+   if( db->lookaside.bMalloced ){
-+     sqlite3_free(db->lookaside.pStart);
-+   }
-+@@ -1259,7 +1259,7 @@ void sqlite3RollbackAll(sqlite3 *db, int tripCode){
-+   ** the database rollback and schema reset, which can cause false
-+   ** corruption reports in some cases.  */
-+   sqlite3BtreeEnterAll(db);
-+-  schemaChange = (db->flags & SQLITE_InternChanges)!=0 && db->init.busy==0;
-++  schemaChange = (db->mDbFlags & DBFLAG_SchemaChange)!=0 && db->init.busy==0;
-+ 
-+   for(i=0; i<db->nDb; i++){
-+     Btree *p = db->aDb[i].pBt;
-+@@ -1273,7 +1273,7 @@ void sqlite3RollbackAll(sqlite3 *db, int tripCode){
-+   sqlite3VtabRollback(db);
-+   sqlite3EndBenignMalloc();
-+ 
-+-  if( (db->flags&SQLITE_InternChanges)!=0 && db->init.busy==0 ){
-++  if( (db->mDbFlags&DBFLAG_SchemaChange)!=0 && db->init.busy==0 ){
-+     sqlite3ExpirePreparedStatements(db);
-+     sqlite3ResetAllSchemasOfConnection(db);
-+   }
-+@@ -2175,7 +2175,8 @@ int sqlite3_wal_checkpoint(sqlite3 *db, const char *zDb){
-+ ** checkpointed. If an error is encountered it is returned immediately -
-+ ** no attempt is made to checkpoint any remaining databases.
-+ **
-+-** Parameter eMode is one of SQLITE_CHECKPOINT_PASSIVE, FULL or RESTART.
-++** Parameter eMode is one of SQLITE_CHECKPOINT_PASSIVE, FULL, RESTART
-++** or TRUNCATE.
-+ */
-+ int sqlite3Checkpoint(sqlite3 *db, int iDb, int eMode, int *pnLog, int *pnCkpt){
-+   int rc = SQLITE_OK;             /* Return code */
-+@@ -3061,6 +3062,12 @@ static int openDatabase(
-+   }
-+ #endif
-+ 
-++#ifdef SQLITE_ENABLE_DBPAGE_VTAB
-++  if( !db->mallocFailed && rc==SQLITE_OK){
-++    rc = sqlite3DbpageRegister(db);
-++  }
-++#endif
-++
-+ #ifdef SQLITE_ENABLE_DBSTAT_VTAB
-+   if( !db->mallocFailed && rc==SQLITE_OK){
-+     rc = sqlite3DbstatRegister(db);
-+@@ -3720,7 +3727,7 @@ int sqlite3_test_control(int op, ...){
-+     ** This action provides a run-time test to see how the ALWAYS and
-+     ** NEVER macros were defined at compile-time.
-+     **
-+-    ** The return value is ALWAYS(X).
-++    ** The return value is ALWAYS(X) if X is true, or 0 if X is false.
-+     **
-+     ** The recommended test is X==2.  If the return value is 2, that means
-+     ** ALWAYS() and NEVER() are both no-op pass-through macros, which is the
-+@@ -3743,7 +3750,7 @@ int sqlite3_test_control(int op, ...){
-+     */
-+     case SQLITE_TESTCTRL_ALWAYS: {
-+       int x = va_arg(ap,int);
-+-      rc = ALWAYS(x);
-++      rc = x ? ALWAYS(x) : 0;
-+       break;
-+     }
-+ 
-+@@ -3810,22 +3817,6 @@ int sqlite3_test_control(int op, ...){
-+     }
-+ #endif
-+ 
-+-    /* sqlite3_test_control(SQLITE_TESTCTRL_SCRATCHMALLOC, sz, &pNew, pFree);
-+-    **
-+-    ** Pass pFree into sqlite3ScratchFree().
-+-    ** If sz>0 then allocate a scratch buffer into pNew.
-+-    */
-+-    case SQLITE_TESTCTRL_SCRATCHMALLOC: {
-+-      void *pFree, **ppNew;
-+-      int sz;
-+-      sz = va_arg(ap, int);
-+-      ppNew = va_arg(ap, void**);
-+-      pFree = va_arg(ap, void*);
-+-      if( sz ) *ppNew = sqlite3ScratchMalloc(sz);
-+-      sqlite3ScratchFree(pFree);
-+-      break;
-+-    }
-+-
-+     /*   sqlite3_test_control(SQLITE_TESTCTRL_LOCALTIME_FAULT, int onoff);
-+     **
-+     ** If parameter onoff is non-zero, configure the wrappers so that all
-+@@ -3967,7 +3958,7 @@ sqlite3_int64 sqlite3_uri_int64(
-+ ){
-+   const char *z = sqlite3_uri_parameter(zFilename, zParam);
-+   sqlite3_int64 v;
-+-  if( z && sqlite3DecOrHexToI64(z, &v)==SQLITE_OK ){
-++  if( z && sqlite3DecOrHexToI64(z, &v)==0 ){
-+     bDflt = v;
-+   }
-+   return bDflt;
-+diff --git a/third_party/sqlite/src/src/malloc.c b/third_party/sqlite/src/src/malloc.c
-+index 42a2716..20857cf 100644
-+--- a/third_party/sqlite/src/src/malloc.c
-++++ b/third_party/sqlite/src/src/malloc.c
-+@@ -33,14 +33,6 @@ int sqlite3_release_memory(int n){
-+ }
-+ 
-+ /*
-+-** An instance of the following object records the location of
-+-** each unused scratch buffer.
-+-*/
-+-typedef struct ScratchFreeslot {
-+-  struct ScratchFreeslot *pNext;   /* Next unused scratch buffer */
-+-} ScratchFreeslot;
-+-
-+-/*
-+ ** State information local to the memory allocation subsystem.
-+ */
-+ static SQLITE_WSD struct Mem0Global {
-+@@ -48,21 +40,11 @@ static SQLITE_WSD struct Mem0Global {
-+   sqlite3_int64 alarmThreshold; /* The soft heap limit */
-+ 
-+   /*
-+-  ** Pointers to the end of sqlite3GlobalConfig.pScratch memory
-+-  ** (so that a range test can be used to determine if an allocation
-+-  ** being freed came from pScratch) and a pointer to the list of
-+-  ** unused scratch allocations.
-+-  */
-+-  void *pScratchEnd;
-+-  ScratchFreeslot *pScratchFree;
-+-  u32 nScratchFree;
-+-
-+-  /*
-+   ** True if heap is nearly "full" where "full" is defined by the
-+   ** sqlite3_soft_heap_limit() setting.
-+   */
-+   int nearlyFull;
-+-} mem0 = { 0, 0, 0, 0, 0, 0 };
-++} mem0 = { 0, 0, 0 };
-+ 
-+ #define mem0 GLOBAL(struct Mem0Global, mem0)
-+ 
-+@@ -132,28 +114,6 @@ int sqlite3MallocInit(void){
-+   }
-+   memset(&mem0, 0, sizeof(mem0));
-+   mem0.mutex = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MEM);
-+-  if( sqlite3GlobalConfig.pScratch && sqlite3GlobalConfig.szScratch>=100
-+-      && sqlite3GlobalConfig.nScratch>0 ){
-+-    int i, n, sz;
-+-    ScratchFreeslot *pSlot;
-+-    sz = ROUNDDOWN8(sqlite3GlobalConfig.szScratch);
-+-    sqlite3GlobalConfig.szScratch = sz;
-+-    pSlot = (ScratchFreeslot*)sqlite3GlobalConfig.pScratch;
-+-    n = sqlite3GlobalConfig.nScratch;
-+-    mem0.pScratchFree = pSlot;
-+-    mem0.nScratchFree = n;
-+-    for(i=0; i<n-1; i++){
-+-      pSlot->pNext = (ScratchFreeslot*)(sz+(char*)pSlot);
-+-      pSlot = pSlot->pNext;
-+-    }
-+-    pSlot->pNext = 0;
-+-    mem0.pScratchEnd = (void*)&pSlot[1];
-+-  }else{
-+-    mem0.pScratchEnd = 0;
-+-    sqlite3GlobalConfig.pScratch = 0;
-+-    sqlite3GlobalConfig.szScratch = 0;
-+-    sqlite3GlobalConfig.nScratch = 0;
-+-  }
-+   if( sqlite3GlobalConfig.pPage==0 || sqlite3GlobalConfig.szPage<512
-+       || sqlite3GlobalConfig.nPage<=0 ){
-+     sqlite3GlobalConfig.pPage = 0;
-+@@ -305,105 +265,6 @@ void *sqlite3_malloc64(sqlite3_uint64 n){
-+ }
-+ 
-+ /*
-+-** Each thread may only have a single outstanding allocation from
-+-** xScratchMalloc().  We verify this constraint in the single-threaded
-+-** case by setting scratchAllocOut to 1 when an allocation
-+-** is outstanding clearing it when the allocation is freed.
-+-*/
-+-#if SQLITE_THREADSAFE==0 && !defined(NDEBUG)
-+-static int scratchAllocOut = 0;
-+-#endif
-+-
-+-
-+-/*
-+-** Allocate memory that is to be used and released right away.
-+-** This routine is similar to alloca() in that it is not intended
-+-** for situations where the memory might be held long-term.  This
-+-** routine is intended to get memory to old large transient data
-+-** structures that would not normally fit on the stack of an
-+-** embedded processor.
-+-*/
-+-void *sqlite3ScratchMalloc(int n){
-+-  void *p;
-+-  assert( n>0 );
-+-
-+-  sqlite3_mutex_enter(mem0.mutex);
-+-  sqlite3StatusHighwater(SQLITE_STATUS_SCRATCH_SIZE, n);
-+-  if( mem0.nScratchFree && sqlite3GlobalConfig.szScratch>=n ){
-+-    p = mem0.pScratchFree;
-+-    mem0.pScratchFree = mem0.pScratchFree->pNext;
-+-    mem0.nScratchFree--;
-+-    sqlite3StatusUp(SQLITE_STATUS_SCRATCH_USED, 1);
-+-    sqlite3_mutex_leave(mem0.mutex);
-+-  }else{
-+-    sqlite3_mutex_leave(mem0.mutex);
-+-    p = sqlite3Malloc(n);
-+-    if( sqlite3GlobalConfig.bMemstat && p ){
-+-      sqlite3_mutex_enter(mem0.mutex);
-+-      sqlite3StatusUp(SQLITE_STATUS_SCRATCH_OVERFLOW, sqlite3MallocSize(p));
-+-      sqlite3_mutex_leave(mem0.mutex);
-+-    }
-+-    sqlite3MemdebugSetType(p, MEMTYPE_SCRATCH);
-+-  }
-+-  assert( sqlite3_mutex_notheld(mem0.mutex) );
-+-
-+-
-+-#if SQLITE_THREADSAFE==0 && !defined(NDEBUG)
-+-  /* EVIDENCE-OF: R-12970-05880 SQLite will not use more than one scratch
-+-  ** buffers per thread.
-+-  **
-+-  ** This can only be checked in single-threaded mode.
-+-  */
-+-  assert( scratchAllocOut==0 );
-+-  if( p ) scratchAllocOut++;
-+-#endif
-+-
-+-  return p;
-+-}
-+-void sqlite3ScratchFree(void *p){
-+-  if( p ){
-+-
-+-#if SQLITE_THREADSAFE==0 && !defined(NDEBUG)
-+-    /* Verify that no more than two scratch allocation per thread
-+-    ** is outstanding at one time.  (This is only checked in the
-+-    ** single-threaded case since checking in the multi-threaded case
-+-    ** would be much more complicated.) */
-+-    assert( scratchAllocOut>=1 && scratchAllocOut<=2 );
-+-    scratchAllocOut--;
-+-#endif
-+-
-+-    if( SQLITE_WITHIN(p, sqlite3GlobalConfig.pScratch, mem0.pScratchEnd) ){
-+-      /* Release memory from the SQLITE_CONFIG_SCRATCH allocation */
-+-      ScratchFreeslot *pSlot;
-+-      pSlot = (ScratchFreeslot*)p;
-+-      sqlite3_mutex_enter(mem0.mutex);
-+-      pSlot->pNext = mem0.pScratchFree;
-+-      mem0.pScratchFree = pSlot;
-+-      mem0.nScratchFree++;
-+-      assert( mem0.nScratchFree <= (u32)sqlite3GlobalConfig.nScratch );
-+-      sqlite3StatusDown(SQLITE_STATUS_SCRATCH_USED, 1);
-+-      sqlite3_mutex_leave(mem0.mutex);
-+-    }else{
-+-      /* Release memory back to the heap */
-+-      assert( sqlite3MemdebugHasType(p, MEMTYPE_SCRATCH) );
-+-      assert( sqlite3MemdebugNoType(p, (u8)~MEMTYPE_SCRATCH) );
-+-      sqlite3MemdebugSetType(p, MEMTYPE_HEAP);
-+-      if( sqlite3GlobalConfig.bMemstat ){
-+-        int iSize = sqlite3MallocSize(p);
-+-        sqlite3_mutex_enter(mem0.mutex);
-+-        sqlite3StatusDown(SQLITE_STATUS_SCRATCH_OVERFLOW, iSize);
-+-        sqlite3StatusDown(SQLITE_STATUS_MEMORY_USED, iSize);
-+-        sqlite3StatusDown(SQLITE_STATUS_MALLOC_COUNT, 1);
-+-        sqlite3GlobalConfig.m.xFree(p);
-+-        sqlite3_mutex_leave(mem0.mutex);
-+-      }else{
-+-        sqlite3GlobalConfig.m.xFree(p);
-+-      }
-+-    }
-+-  }
-+-}
-+-
-+-/*
-+ ** TRUE if p is a lookaside memory allocation from db
-+ */
-+ #ifndef SQLITE_OMIT_LOOKASIDE
-+@@ -493,7 +354,6 @@ void sqlite3DbFreeNN(sqlite3 *db, void *p){
-+ #endif
-+       pBuf->pNext = db->lookaside.pFree;
-+       db->lookaside.pFree = pBuf;
-+-      db->lookaside.nOut--;
-+       return;
-+     }
-+   }
-+@@ -654,16 +514,16 @@ void *sqlite3DbMallocRawNN(sqlite3 *db, u64 n){
-+     assert( db->mallocFailed==0 );
-+     if( n>db->lookaside.sz ){
-+       db->lookaside.anStat[1]++;
-+-    }else if( (pBuf = db->lookaside.pFree)==0 ){
-+-      db->lookaside.anStat[2]++;
-+-    }else{
-++    }else if( (pBuf = db->lookaside.pFree)!=0 ){
-+       db->lookaside.pFree = pBuf->pNext;
-+-      db->lookaside.nOut++;
-+       db->lookaside.anStat[0]++;
-+-      if( db->lookaside.nOut>db->lookaside.mxOut ){
-+-        db->lookaside.mxOut = db->lookaside.nOut;
-+-      }
-+       return (void*)pBuf;
-++    }else if( (pBuf = db->lookaside.pInit)!=0 ){
-++      db->lookaside.pInit = pBuf->pNext;
-++      db->lookaside.anStat[0]++;
-++      return (void*)pBuf;
-++    }else{
-++      db->lookaside.anStat[2]++;
-+     }
-+   }else if( db->mallocFailed ){
-+     return 0;
-+diff --git a/third_party/sqlite/src/src/memjournal.c b/third_party/sqlite/src/src/memjournal.c
-+index 9753199..66e5f755 100644
-+--- a/third_party/sqlite/src/src/memjournal.c
-++++ b/third_party/sqlite/src/src/memjournal.c
-+@@ -96,7 +96,8 @@ static int memjrnlRead(
-+   int iChunkOffset;
-+   FileChunk *pChunk;
-+ 
-+-#ifdef SQLITE_ENABLE_ATOMIC_WRITE
-++#if defined(SQLITE_ENABLE_ATOMIC_WRITE) \
-++ || defined(SQLITE_ENABLE_BATCH_ATOMIC_WRITE)
-+   if( (iAmt+iOfst)>p->endpoint.iOffset ){
-+     return SQLITE_IOERR_SHORT_READ;
-+   }
-+@@ -215,7 +216,8 @@ static int memjrnlWrite(
-+     ** atomic-write optimization. In this case the first 28 bytes of the
-+     ** journal file may be written as part of committing the transaction. */
-+     assert( iOfst==p->endpoint.iOffset || iOfst==0 );
-+-#ifdef SQLITE_ENABLE_ATOMIC_WRITE
-++#if defined(SQLITE_ENABLE_ATOMIC_WRITE) \
-++ || defined(SQLITE_ENABLE_BATCH_ATOMIC_WRITE)
-+     if( iOfst==0 && p->pFirst ){
-+       assert( p->nChunkSize>iAmt );
-+       memcpy((u8*)p->pFirst->zChunk, zBuf, iAmt);
-+@@ -384,17 +386,31 @@ void sqlite3MemJournalOpen(sqlite3_file *pJfd){
-+   sqlite3JournalOpen(0, 0, pJfd, 0, -1);
-+ }
-+ 
-+-#ifdef SQLITE_ENABLE_ATOMIC_WRITE
-++#if defined(SQLITE_ENABLE_ATOMIC_WRITE) \
-++ || defined(SQLITE_ENABLE_BATCH_ATOMIC_WRITE)
-+ /*
-+ ** If the argument p points to a MemJournal structure that is not an
-+ ** in-memory-only journal file (i.e. is one that was opened with a +ve
-+-** nSpill parameter), and the underlying file has not yet been created,
-+-** create it now.
-++** nSpill parameter or as SQLITE_OPEN_MAIN_JOURNAL), and the underlying
-++** file has not yet been created, create it now.
-+ */
-+-int sqlite3JournalCreate(sqlite3_file *p){
-++int sqlite3JournalCreate(sqlite3_file *pJfd){
-+   int rc = SQLITE_OK;
-+-  if( p->pMethods==&MemJournalMethods && ((MemJournal*)p)->nSpill>0 ){
-+-    rc = memjrnlCreateFile((MemJournal*)p);
-++  MemJournal *p = (MemJournal*)pJfd;
-++  if( p->pMethod==&MemJournalMethods && (
-++#ifdef SQLITE_ENABLE_ATOMIC_WRITE
-++     p->nSpill>0
-++#else
-++     /* While this appears to not be possible without ATOMIC_WRITE, the
-++     ** paths are complex, so it seems prudent to leave the test in as
-++     ** a NEVER(), in case our analysis is subtly flawed. */
-++     NEVER(p->nSpill>0)
-++#endif
-++#ifdef SQLITE_ENABLE_BATCH_ATOMIC_WRITE
-++     || (p->flags & SQLITE_OPEN_MAIN_JOURNAL)
-++#endif
-++  )){
-++    rc = memjrnlCreateFile(p);
-+   }
-+   return rc;
-+ }
-+diff --git a/third_party/sqlite/src/src/os.c b/third_party/sqlite/src/src/os.c
-+index 5cf0014..26c8065 100644
-+--- a/third_party/sqlite/src/src/os.c
-++++ b/third_party/sqlite/src/src/os.c
-+@@ -98,7 +98,7 @@ int sqlite3OsTruncate(sqlite3_file *id, i64 size){
-+ }
-+ int sqlite3OsSync(sqlite3_file *id, int flags){
-+   DO_OS_MALLOC_TEST(id);
-+-  return id->pMethods->xSync(id, flags);
-++  return flags ? id->pMethods->xSync(id, flags) : SQLITE_OK;
-+ }
-+ int sqlite3OsFileSize(sqlite3_file *id, i64 *pSize){
-+   DO_OS_MALLOC_TEST(id);
-+@@ -153,6 +153,7 @@ int sqlite3OsSectorSize(sqlite3_file *id){
-+ int sqlite3OsDeviceCharacteristics(sqlite3_file *id){
-+   return id->pMethods->xDeviceCharacteristics(id);
-+ }
-++#ifndef SQLITE_OMIT_WAL
-+ int sqlite3OsShmLock(sqlite3_file *id, int offset, int n, int flags){
-+   return id->pMethods->xShmLock(id, offset, n, flags);
-+ }
-+@@ -172,6 +173,7 @@ int sqlite3OsShmMap(
-+   DO_OS_MALLOC_TEST(id);
-+   return id->pMethods->xShmMap(id, iPage, pgsz, bExtend, pp);
-+ }
-++#endif /* SQLITE_OMIT_WAL */
-+ 
-+ #if SQLITE_MAX_MMAP_SIZE>0
-+ /* The real implementation of xFetch and xUnfetch */
-+diff --git a/third_party/sqlite/src/src/os.h b/third_party/sqlite/src/src/os.h
-+index 52d3a49..e6d9a8b 100644
-+--- a/third_party/sqlite/src/src/os.h
-++++ b/third_party/sqlite/src/src/os.h
-+@@ -174,10 +174,12 @@ void sqlite3OsFileControlHint(sqlite3_file*,int,void*);
-+ #define SQLITE_FCNTL_DB_UNCHANGED 0xca093fa0
-+ int sqlite3OsSectorSize(sqlite3_file *id);
-+ int sqlite3OsDeviceCharacteristics(sqlite3_file *id);
-++#ifndef SQLITE_OMIT_WAL
-+ int sqlite3OsShmMap(sqlite3_file *,int,int,int,void volatile **);
-+ int sqlite3OsShmLock(sqlite3_file *id, int, int, int);
-+ void sqlite3OsShmBarrier(sqlite3_file *id);
-+ int sqlite3OsShmUnmap(sqlite3_file *id, int);
-++#endif /* SQLITE_OMIT_WAL */
-+ int sqlite3OsFetch(sqlite3_file *id, i64, int, void **);
-+ int sqlite3OsUnfetch(sqlite3_file *, i64, void *);
-+ 
-+diff --git a/third_party/sqlite/src/src/os_unix.c b/third_party/sqlite/src/src/os_unix.c
-+index 44f6d67..6ed6f6a 100644
-+--- a/third_party/sqlite/src/src/os_unix.c
-++++ b/third_party/sqlite/src/src/os_unix.c
-+@@ -90,6 +90,7 @@
-+ #include <sys/types.h>
-+ #include <sys/stat.h>
-+ #include <fcntl.h>
-++#include <sys/ioctl.h>
-+ #include <unistd.h>
-+ #include <time.h>
-+ #include <sys/time.h>
-+@@ -209,7 +210,7 @@ struct unixFile {
-+   unsigned short int ctrlFlags;       /* Behavioral bits.  UNIXFILE_* flags */
-+   int lastErrno;                      /* The unix errno from last I/O error */
-+   void *lockingContext;               /* Locking style specific state */
-+-  UnixUnusedFd *pUnused;              /* Pre-allocated UnixUnusedFd */
-++  UnixUnusedFd *pPreallocatedUnused;  /* Pre-allocated UnixUnusedFd */
-+   const char *zPath;                  /* Name of the file */
-+   unixShm *pShm;                      /* Shared memory segment information */
-+   int szChunk;                        /* Configured by FCNTL_CHUNK_SIZE */
-+@@ -220,10 +221,8 @@ struct unixFile {
-+   sqlite3_int64 mmapSizeMax;          /* Configured FCNTL_MMAP_SIZE value */
-+   void *pMapRegion;                   /* Memory mapped region */
-+ #endif
-+-#ifdef __QNXNTO__
-+   int sectorSize;                     /* Device sector size */
-+   int deviceCharacteristics;          /* Precomputed device characteristics */
-+-#endif
-+ #if SQLITE_ENABLE_LOCKING_STYLE
-+   int openFlags;                      /* The flags specified at open() */
-+ #endif
-+@@ -328,6 +327,20 @@ static pid_t randomnessPid = 0;
-+ # define lseek lseek64
-+ #endif
-+ 
-++#ifdef __linux__
-++/*
-++** Linux-specific IOCTL magic numbers used for controlling F2FS
-++*/
-++#define F2FS_IOCTL_MAGIC        0xf5
-++#define F2FS_IOC_START_ATOMIC_WRITE     _IO(F2FS_IOCTL_MAGIC, 1)
-++#define F2FS_IOC_COMMIT_ATOMIC_WRITE    _IO(F2FS_IOCTL_MAGIC, 2)
-++#define F2FS_IOC_START_VOLATILE_WRITE   _IO(F2FS_IOCTL_MAGIC, 3)
-++#define F2FS_IOC_ABORT_VOLATILE_WRITE   _IO(F2FS_IOCTL_MAGIC, 5)
-++#define F2FS_IOC_GET_FEATURES           _IOR(F2FS_IOCTL_MAGIC, 12, u32)
-++#define F2FS_FEATURE_ATOMIC_WRITE 0x0004
-++#endif /* __linux__ */
-++
-++
-+ /*
-+ ** Different Unix systems declare open() in different ways.  Same use
-+ ** open(const char*,int,mode_t).  Others use open(const char*,int,...).
-+@@ -500,6 +513,9 @@ static struct unix_syscall {
-+ #endif
-+ #define osLstat      ((int(*)(const char*,struct stat*))aSyscall[27].pCurrent)
-+ 
-++  { "ioctl",         (sqlite3_syscall_ptr)ioctl,          0 },
-++#define osIoctl ((int(*)(int,int,...))aSyscall[28].pCurrent)
-++
-+ }; /* End of the overrideable system calls */
-+ 
-+ 
-+@@ -1104,7 +1120,8 @@ struct unixInodeInfo {
-+ /*
-+ ** A lists of all unixInodeInfo objects.
-+ */
-+-static unixInodeInfo *inodeList = 0;
-++static unixInodeInfo *inodeList = 0;  /* All unixInodeInfo objects */
-++static unsigned int nUnusedFd = 0;    /* Total unused file descriptors */
-+ 
-+ /*
-+ **
-+@@ -1214,6 +1231,7 @@ static void closePendingFds(unixFile *pFile){
-+     pNext = p->pNext;
-+     robust_close(pFile, p->fd, __LINE__);
-+     sqlite3_free(p);
-++    nUnusedFd--;
-+   }
-+   pInode->pUnused = 0;
-+ }
-+@@ -1246,6 +1264,7 @@ static void releaseInodeInfo(unixFile *pFile){
-+       sqlite3_free(pInode);
-+     }
-+   }
-++  assert( inodeList!=0 || nUnusedFd==0 );
-+ }
-+ 
-+ /*
-+@@ -1315,6 +1334,7 @@ static int findInodeInfo(
-+ #else
-+   fileId.ino = (u64)statbuf.st_ino;
-+ #endif
-++  assert( inodeList!=0 || nUnusedFd==0 );
-+   pInode = inodeList;
-+   while( pInode && memcmp(&fileId, &pInode->fileId, sizeof(fileId)) ){
-+     pInode = pInode->pNext;
-+@@ -1740,11 +1760,12 @@ end_lock:
-+ */
-+ static void setPendingFd(unixFile *pFile){
-+   unixInodeInfo *pInode = pFile->pInode;
-+-  UnixUnusedFd *p = pFile->pUnused;
-++  UnixUnusedFd *p = pFile->pPreallocatedUnused;
-+   p->pNext = pInode->pUnused;
-+   pInode->pUnused = p;
-+   pFile->h = -1;
-+-  pFile->pUnused = 0;
-++  pFile->pPreallocatedUnused = 0;
-++  nUnusedFd++;
-+ }
-+ 
-+ /*
-+@@ -1969,7 +1990,7 @@ static int closeUnixFile(sqlite3_file *id){
-+ #endif
-+   OSTRACE(("CLOSE   %-3d\n", pFile->h));
-+   OpenCounter(-1);
-+-  sqlite3_free(pFile->pUnused);
-++  sqlite3_free(pFile->pPreallocatedUnused);
-+   memset(pFile, 0, sizeof(unixFile));
-+   return SQLITE_OK;
-+ }
-+@@ -2306,7 +2327,7 @@ static int flockCheckReservedLock(sqlite3_file *id, int *pResOut){
-+   OSTRACE(("TEST WR-LOCK %d %d %d (flock)\n", pFile->h, rc, reserved));
-+ 
-+ #ifdef SQLITE_IGNORE_FLOCK_LOCK_ERRORS
-+-  if( (rc & SQLITE_IOERR) == SQLITE_IOERR ){
-++  if( (rc & 0xff) == SQLITE_IOERR ){
-+     rc = SQLITE_OK;
-+     reserved=1;
-+   }
-+@@ -2373,7 +2394,7 @@ static int flockLock(sqlite3_file *id, int eFileLock) {
-+   OSTRACE(("LOCK    %d %s %s (flock)\n", pFile->h, azFileLock(eFileLock),
-+            rc==SQLITE_OK ? "ok" : "failed"));
-+ #ifdef SQLITE_IGNORE_FLOCK_LOCK_ERRORS
-+-  if( (rc & SQLITE_IOERR) == SQLITE_IOERR ){
-++  if( (rc & 0xff) == SQLITE_IOERR ){
-+     rc = SQLITE_BUSY;
-+   }
-+ #endif /* SQLITE_IGNORE_FLOCK_LOCK_ERRORS */
-+@@ -2910,7 +2931,7 @@ static int afpLock(sqlite3_file *id, int eFileLock){
-+           /* Can't reestablish the shared lock.  Sqlite can't deal, this is
-+           ** a critical I/O error
-+           */
-+-          rc = ((failed & SQLITE_IOERR) == SQLITE_IOERR) ? failed2 :
-++          rc = ((failed & 0xff) == SQLITE_IOERR) ? failed2 :
-+                SQLITE_IOERR_LOCK;
-+           goto afp_end_lock;
-+         }
-+@@ -3190,7 +3211,7 @@ static int unixRead(
-+   /* If this is a database file (not a journal, master-journal or temp
-+   ** file), the bytes in the locking range should never be read or written. */
-+ #if 0
-+-  assert( pFile->pUnused==0
-++  assert( pFile->pPreallocatedUnused==0
-+        || offset>=PENDING_BYTE+512
-+        || offset+amt<=PENDING_BYTE
-+   );
-+@@ -3303,7 +3324,7 @@ static int unixWrite(
-+   /* If this is a database file (not a journal, master-journal or temp
-+   ** file), the bytes in the locking range should never be read or written. */
-+ #if 0
-+-  assert( pFile->pUnused==0
-++  assert( pFile->pPreallocatedUnused==0
-+        || offset>=PENDING_BYTE+512
-+        || offset+amt<=PENDING_BYTE
-+   );
-+@@ -3783,6 +3804,21 @@ static int unixGetTempname(int nBuf, char *zBuf);
-+ static int unixFileControl(sqlite3_file *id, int op, void *pArg){
-+   unixFile *pFile = (unixFile*)id;
-+   switch( op ){
-++#if defined(__linux__) && defined(SQLITE_ENABLE_BATCH_ATOMIC_WRITE)
-++    case SQLITE_FCNTL_BEGIN_ATOMIC_WRITE: {
-++      int rc = osIoctl(pFile->h, F2FS_IOC_START_ATOMIC_WRITE);
-++      return rc ? SQLITE_IOERR_BEGIN_ATOMIC : SQLITE_OK;
-++    }
-++    case SQLITE_FCNTL_COMMIT_ATOMIC_WRITE: {
-++      int rc = osIoctl(pFile->h, F2FS_IOC_COMMIT_ATOMIC_WRITE);
-++      return rc ? SQLITE_IOERR_COMMIT_ATOMIC : SQLITE_OK;
-++    }
-++    case SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE: {
-++      int rc = osIoctl(pFile->h, F2FS_IOC_ABORT_VOLATILE_WRITE);
-++      return rc ? SQLITE_IOERR_ROLLBACK_ATOMIC : SQLITE_OK;
-++    }
-++#endif /* __linux__ && SQLITE_ENABLE_BATCH_ATOMIC_WRITE */
-++
-+     case SQLITE_FCNTL_LOCKSTATE: {
-+       *(int*)pArg = pFile->eFileLock;
-+       return SQLITE_OK;
-+@@ -3833,6 +3869,14 @@ static int unixFileControl(sqlite3_file *id, int op, void *pArg){
-+       if( newLimit>sqlite3GlobalConfig.mxMmap ){
-+         newLimit = sqlite3GlobalConfig.mxMmap;
-+       }
-++
-++      /* The value of newLimit may be eventually cast to (size_t) and passed
-++      ** to mmap(). Restrict its value to 2GB if (size_t) is not at least a
-++      ** 64-bit type. */
-++      if( newLimit>0 && sizeof(size_t)<8 ){
-++        newLimit = (newLimit & 0x7FFFFFFF);
-++      }
-++
-+       *(i64*)pArg = pFile->mmapSizeMax;
-+       if( newLimit>=0 && newLimit!=pFile->mmapSizeMax && pFile->nFetchOut==0 ){
-+         pFile->mmapSizeMax = newLimit;
-+@@ -3866,30 +3910,41 @@ static int unixFileControl(sqlite3_file *id, int op, void *pArg){
-+ }
-+ 
-+ /*
-+-** Return the sector size in bytes of the underlying block device for
-+-** the specified file. This is almost always 512 bytes, but may be
-+-** larger for some devices.
-++** If pFd->sectorSize is non-zero when this function is called, it is a
-++** no-op. Otherwise, the values of pFd->sectorSize and
-++** pFd->deviceCharacteristics are set according to the file-system
-++** characteristics.
-+ **
-+-** SQLite code assumes this function cannot fail. It also assumes that
-+-** if two files are created in the same file-system directory (i.e.
-+-** a database and its journal file) that the sector size will be the
-+-** same for both.
-++** There are two versions of this function. One for QNX and one for all
-++** other systems.
-+ */
-+ #ifndef __QNXNTO__
-+-static int unixSectorSize(sqlite3_file *NotUsed){
-+-  UNUSED_PARAMETER(NotUsed);
-+-  return SQLITE_DEFAULT_SECTOR_SIZE;
-+-}
-+-#endif
-++static void setDeviceCharacteristics(unixFile *pFd){
-++  assert( pFd->deviceCharacteristics==0 || pFd->sectorSize!=0 );
-++  if( pFd->sectorSize==0 ){
-++#if defined(__linux__) && defined(SQLITE_ENABLE_BATCH_ATOMIC_WRITE)
-++    int res;
-++    u32 f = 0;
-+ 
-+-/*
-+-** The following version of unixSectorSize() is optimized for QNX.
-+-*/
-+-#ifdef __QNXNTO__
-++    /* Check for support for F2FS atomic batch writes. */
-++    res = osIoctl(pFd->h, F2FS_IOC_GET_FEATURES, &f);
-++    if( res==0 && (f & F2FS_FEATURE_ATOMIC_WRITE) ){
-++      pFd->deviceCharacteristics = SQLITE_IOCAP_BATCH_ATOMIC;
-++    }
-++#endif /* __linux__ && SQLITE_ENABLE_BATCH_ATOMIC_WRITE */
-++
-++    /* Set the POWERSAFE_OVERWRITE flag if requested. */
-++    if( pFd->ctrlFlags & UNIXFILE_PSOW ){
-++      pFd->deviceCharacteristics |= SQLITE_IOCAP_POWERSAFE_OVERWRITE;
-++    }
-++
-++    pFd->sectorSize = SQLITE_DEFAULT_SECTOR_SIZE;
-++  }
-++}
-++#else
-+ #include <sys/dcmd_blk.h>
-+ #include <sys/statvfs.h>
-+-static int unixSectorSize(sqlite3_file *id){
-+-  unixFile *pFile = (unixFile*)id;
-++static void setDeviceCharacteristics(unixFile *pFile){
-+   if( pFile->sectorSize == 0 ){
-+     struct statvfs fsInfo;
-+ 
-+@@ -3958,9 +4013,24 @@ static int unixSectorSize(sqlite3_file *id){
-+     pFile->deviceCharacteristics = 0;
-+     pFile->sectorSize = SQLITE_DEFAULT_SECTOR_SIZE;
-+   }
-+-  return pFile->sectorSize;
-+ }
-+-#endif /* __QNXNTO__ */
-++#endif
-++
-++/*
-++** Return the sector size in bytes of the underlying block device for
-++** the specified file. This is almost always 512 bytes, but may be
-++** larger for some devices.
-++**
-++** SQLite code assumes this function cannot fail. It also assumes that
-++** if two files are created in the same file-system directory (i.e.
-++** a database and its journal file) that the sector size will be the
-++** same for both.
-++*/
-++static int unixSectorSize(sqlite3_file *id){
-++  unixFile *pFd = (unixFile*)id;
-++  setDeviceCharacteristics(pFd);
-++  return pFd->sectorSize;
-++}
-+ 
-+ /*
-+ ** Return the device characteristics for the file.
-+@@ -3976,16 +4046,9 @@ static int unixSectorSize(sqlite3_file *id){
-+ ** available to turn it off and URI query parameter available to turn it off.
-+ */
-+ static int unixDeviceCharacteristics(sqlite3_file *id){
-+-  unixFile *p = (unixFile*)id;
-+-  int rc = 0;
-+-#ifdef __QNXNTO__
-+-  if( p->sectorSize==0 ) unixSectorSize(id);
-+-  rc = p->deviceCharacteristics;
-+-#endif
-+-  if( p->ctrlFlags & UNIXFILE_PSOW ){
-+-    rc |= SQLITE_IOCAP_POWERSAFE_OVERWRITE;
-+-  }
-+-  return rc;
-++  unixFile *pFd = (unixFile*)id;
-++  setDeviceCharacteristics(pFd);
-++  return pFd->deviceCharacteristics;
-+ }
-+ 
-+ #if !defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0
-+@@ -5243,17 +5306,6 @@ static int fillInUnixFile(
-+ 
-+   assert( pNew->pInode==NULL );
-+ 
-+-  /* Usually the path zFilename should not be a relative pathname. The
-+-  ** exception is when opening the proxy "conch" file in builds that
-+-  ** include the special Apple locking styles.
-+-  */
-+-#if defined(__APPLE__) && SQLITE_ENABLE_LOCKING_STYLE
-+-  assert( zFilename==0 || zFilename[0]=='/'
-+-    || pVfs->pAppData==(void*)&autolockIoFinder );
-+-#else
-+-  assert( zFilename==0 || zFilename[0]=='/' );
-+-#endif
-+-
-+   /* No locking occurs in temporary files */
-+   assert( zFilename!=0 || (ctrlFlags & UNIXFILE_NOLOCK)!=0 );
-+ 
-+@@ -5512,6 +5564,8 @@ static UnixUnusedFd *findReusableFd(const char *zPath, int flags){
-+ #if !OS_VXWORKS
-+   struct stat sStat;                   /* Results of stat() call */
-+ 
-++  unixEnterMutex();
-++
-+   /* A stat() call may fail for various reasons. If this happens, it is
-+   ** almost certain that an open() call on the same path will also fail.
-+   ** For this reason, if an error occurs in the stat() call here, it is
-+@@ -5520,10 +5574,9 @@ static UnixUnusedFd *findReusableFd(const char *zPath, int flags){
-+   **
-+   ** Even if a subsequent open() call does succeed, the consequences of
-+   ** not searching for a reusable file descriptor are not dire.  */
-+-  if( 0==osStat(zPath, &sStat) ){
-++  if( nUnusedFd>0 && 0==osStat(zPath, &sStat) ){
-+     unixInodeInfo *pInode;
-+ 
-+-    unixEnterMutex();
-+     pInode = inodeList;
-+     while( pInode && (pInode->fileId.dev!=sStat.st_dev
-+                      || pInode->fileId.ino!=(u64)sStat.st_ino) ){
-+@@ -5534,11 +5587,12 @@ static UnixUnusedFd *findReusableFd(const char *zPath, int flags){
-+       for(pp=&pInode->pUnused; *pp && (*pp)->flags!=flags; pp=&((*pp)->pNext));
-+       pUnused = *pp;
-+       if( pUnused ){
-++        nUnusedFd--;
-+         *pp = pUnused->pNext;
-+       }
-+     }
-+-    unixLeaveMutex();
-+   }
-++  unixLeaveMutex();
-+ #endif    /* if !OS_VXWORKS */
-+   return pUnused;
-+ }
-+@@ -5614,16 +5668,11 @@ static int findCreateFileMode(
-+     */
-+     nDb = sqlite3Strlen30(zPath) - 1;
-+     while( zPath[nDb]!='-' ){
-+-#ifndef SQLITE_ENABLE_8_3_NAMES
-+-      /* In the normal case (8+3 filenames disabled) the journal filename
-+-      ** is guaranteed to contain a '-' character. */
-+-      assert( nDb>0 );
-+-      assert( sqlite3Isalnum(zPath[nDb]) );
-+-#else
-+-      /* If 8+3 names are possible, then the journal file might not contain
-+-      ** a '-' character.  So check for that case and return early. */
-++      /* In normal operation, the journal file name will always contain
-++      ** a '-' character.  However in 8+3 filename mode, or if a corrupt
-++      ** rollback journal specifies a master journal with a goofy name, then
-++      ** the '-' might be missing. */
-+       if( nDb==0 || zPath[nDb]=='.' ) return SQLITE_OK;
-+-#endif
-+       nDb--;
-+     }
-+     memcpy(zDb, zPath, nDb);
-+@@ -5665,20 +5714,21 @@ int chromium_sqlite3_fill_in_unix_sqlite3_file(sqlite3_vfs* pVfs,
-+   memset(p, 0, sizeof(unixFile));
-+ 
-+   /* osStat() will not work in the sandbox, so findReusableFd() will always
-+-  ** fail, so directly include the failure-case setup then initialize pUnused.
-++  ** fail, so directly include the failure-case setup then initialize
-++  ** pPreallocatedUnused.
-+   */
-+   if( eType==SQLITE_OPEN_MAIN_DB ){
-+-    p->pUnused = sqlite3_malloc(sizeof(*p->pUnused));
-+-    if (!p->pUnused) {
-++    p->pPreallocatedUnused = sqlite3_malloc(sizeof(*p->pPreallocatedUnused));
-++    if (!p->pPreallocatedUnused) {
-+       return SQLITE_NOMEM_BKPT;
-+     }
-+-    p->pUnused->fd = fd;
-+-    p->pUnused->flags = flags;
-++    p->pPreallocatedUnused->fd = fd;
-++    p->pPreallocatedUnused->flags = flags;
-+   }
-+ 
-+   rc = fillInUnixFile(pVfs, fd, pFile, zPath, ctrlFlags);
-+   if( rc!=SQLITE_OK ){
-+-    sqlite3_free(p->pUnused);
-++    sqlite3_free(p->pPreallocatedUnused);
-+   }
-+   return rc;
-+ }
-+@@ -5799,7 +5849,7 @@ static int unixOpen(
-+         return SQLITE_NOMEM_BKPT;
-+       }
-+     }
-+-    p->pUnused = pUnused;
-++    p->pPreallocatedUnused = pUnused;
-+ 
-+     /* Database filenames are double-zero terminated if they are not
-+     ** URIs with parameters.  Hence, they can always be passed into
-+@@ -5836,7 +5886,7 @@ static int unixOpen(
-+     gid_t gid;                    /* Groupid for the file */
-+     rc = findCreateFileMode(zName, flags, &openMode, &uid, &gid);
-+     if( rc!=SQLITE_OK ){
-+-      assert( !p->pUnused );
-++      assert( !p->pPreallocatedUnused );
-+       assert( eType==SQLITE_OPEN_WAL || eType==SQLITE_OPEN_MAIN_JOURNAL );
-+       return rc;
-+     }
-+@@ -5870,10 +5920,10 @@ static int unixOpen(
-+     *pOutFlags = flags;
-+   }
-+ 
-+-  if( p->pUnused ){
-++  if( p->pPreallocatedUnused ){
-+     /* Duplicated in chromium_sqlite3_fill_in_unix_sqlite3_file(). */
-+-    p->pUnused->fd = fd;
-+-    p->pUnused->flags = flags;
-++    p->pPreallocatedUnused->fd = fd;
-++    p->pPreallocatedUnused->flags = flags;
-+   }
-+ 
-+   if( isDelete ){
-+@@ -5950,13 +6000,16 @@ static int unixOpen(
-+   }
-+ #endif
-+ 
-++  assert( zPath==0 || zPath[0]=='/'
-++      || eType==SQLITE_OPEN_MASTER_JOURNAL || eType==SQLITE_OPEN_MAIN_JOURNAL
-++  );
-+   /* Duplicated in chromium_sqlite3_fill_in_unix_sqlite3_file(). */
-+   rc = fillInUnixFile(pVfs, fd, pFile, zPath, ctrlFlags);
-+ 
-+ open_finished:
-+   if( rc!=SQLITE_OK ){
-+     /* Duplicated in chromium_sqlite3_fill_in_unix_sqlite3_file(). */
-+-    sqlite3_free(p->pUnused);
-++    sqlite3_free(p->pPreallocatedUnused);
-+   }
-+   return rc;
-+ }
-+@@ -6697,7 +6750,7 @@ static int proxyCreateUnixFile(
-+   dummyVfs.zName = "dummy";
-+   pUnused->fd = fd;
-+   pUnused->flags = openFlags;
-+-  pNew->pUnused = pUnused;
-++  pNew->pPreallocatedUnused = pUnused;
-+ 
-+   rc = fillInUnixFile(&dummyVfs, fd, (sqlite3_file*)pNew, path, 0);
-+   if( rc==SQLITE_OK ){
-+@@ -7647,7 +7700,7 @@ int sqlite3_os_init(void){
-+ 
-+   /* Double-check that the aSyscall[] array has been constructed
-+   ** correctly.  See ticket [bb3a86e890c8e96ab] */
-+-  assert( ArraySize(aSyscall)==28 );
-++  assert( ArraySize(aSyscall)==29 );
-+ 
-+   /* Register all VFSes defined in the aVfs[] array */
-+   for(i=0; i<(sizeof(aVfs)/sizeof(sqlite3_vfs)); i++){
-+diff --git a/third_party/sqlite/src/src/os_win.c b/third_party/sqlite/src/src/os_win.c
-+index 1d9abf0..eeb2c14 100644
-+--- a/third_party/sqlite/src/src/os_win.c
-++++ b/third_party/sqlite/src/src/os_win.c
-+@@ -3559,6 +3559,14 @@ static int winFileControl(sqlite3_file *id, int op, void *pArg){
-+       if( newLimit>sqlite3GlobalConfig.mxMmap ){
-+         newLimit = sqlite3GlobalConfig.mxMmap;
-+       }
-++
-++      /* The value of newLimit may be eventually cast to (SIZE_T) and passed
-++      ** to MapViewOfFile(). Restrict its value to 2GB if (SIZE_T) is not at
-++      ** least a 64-bit type. */
-++      if( newLimit>0 && sizeof(SIZE_T)<8 ){
-++        newLimit = (newLimit & 0x7FFFFFFF);
-++      }
-++
-+       *(i64*)pArg = pFile->mmapSizeMax;
-+       if( newLimit>=0 && newLimit!=pFile->mmapSizeMax && pFile->nFetchOut==0 ){
-+         pFile->mmapSizeMax = newLimit;
-+@@ -4871,6 +4879,14 @@ static int winIsDir(const void *zConverted){
-+   return (attr!=INVALID_FILE_ATTRIBUTES) && (attr&FILE_ATTRIBUTE_DIRECTORY);
-+ }
-+ 
-++/* forward reference */
-++static int winAccess(
-++  sqlite3_vfs *pVfs,         /* Not used on win32 */
-++  const char *zFilename,     /* Name of file to check */
-++  int flags,                 /* Type of test to make on this file */
-++  int *pResOut               /* OUT: Result */
-++);
-++
-+ /*
-+ ** Open a file.
-+ */
-+@@ -5047,37 +5063,52 @@ static int winOpen(
-+     extendedParameters.dwSecurityQosFlags = SECURITY_ANONYMOUS;
-+     extendedParameters.lpSecurityAttributes = NULL;
-+     extendedParameters.hTemplateFile = NULL;
-+-    while( (h = osCreateFile2((LPCWSTR)zConverted,
-+-                              dwDesiredAccess,
-+-                              dwShareMode,
-+-                              dwCreationDisposition,
-+-                              &extendedParameters))==INVALID_HANDLE_VALUE &&
-+-                              winRetryIoerr(&cnt, &lastErrno) ){
-+-               /* Noop */
-+-    }
-++    do{
-++      h = osCreateFile2((LPCWSTR)zConverted,
-++                        dwDesiredAccess,
-++                        dwShareMode,
-++                        dwCreationDisposition,
-++                        &extendedParameters);
-++      if( h!=INVALID_HANDLE_VALUE ) break;
-++      if( isReadWrite ){
-++        int isRO = 0;
-++        int rc2 = winAccess(pVfs, zName, SQLITE_ACCESS_READ, &isRO);
-++        if( rc2==SQLITE_OK && isRO ) break;
-++      }
-++    }while( winRetryIoerr(&cnt, &lastErrno) );
-+ #else
-+-    while( (h = osCreateFileW((LPCWSTR)zConverted,
-+-                              dwDesiredAccess,
-+-                              dwShareMode, NULL,
-+-                              dwCreationDisposition,
-+-                              dwFlagsAndAttributes,
-+-                              NULL))==INVALID_HANDLE_VALUE &&
-+-                              winRetryIoerr(&cnt, &lastErrno) ){
-+-               /* Noop */
-+-    }
-++    do{
-++      h = osCreateFileW((LPCWSTR)zConverted,
-++                        dwDesiredAccess,
-++                        dwShareMode, NULL,
-++                        dwCreationDisposition,
-++                        dwFlagsAndAttributes,
-++                        NULL);
-++      if( h!=INVALID_HANDLE_VALUE ) break;
-++      if( isReadWrite ){
-++        int isRO = 0;
-++        int rc2 = winAccess(pVfs, zName, SQLITE_ACCESS_READ, &isRO);
-++        if( rc2==SQLITE_OK && isRO ) break;
-++      }
-++    }while( winRetryIoerr(&cnt, &lastErrno) );
-+ #endif
-+   }
-+ #ifdef SQLITE_WIN32_HAS_ANSI
-+   else{
-+-    while( (h = osCreateFileA((LPCSTR)zConverted,
-+-                              dwDesiredAccess,
-+-                              dwShareMode, NULL,
-+-                              dwCreationDisposition,
-+-                              dwFlagsAndAttributes,
-+-                              NULL))==INVALID_HANDLE_VALUE &&
-+-                              winRetryIoerr(&cnt, &lastErrno) ){
-+-               /* Noop */
-+-    }
-++    do{
-++      h = osCreateFileA((LPCSTR)zConverted,
-++                        dwDesiredAccess,
-++                        dwShareMode, NULL,
-++                        dwCreationDisposition,
-++                        dwFlagsAndAttributes,
-++                        NULL);
-++      if( h!=INVALID_HANDLE_VALUE ) break;
-++      if( isReadWrite ){
-++        int isRO = 0;
-++        int rc2 = winAccess(pVfs, zName, SQLITE_ACCESS_READ, &isRO);
-++        if( rc2==SQLITE_OK && isRO ) break;
-++      }
-++    }while( winRetryIoerr(&cnt, &lastErrno) );
-+   }
-+ #endif
-+   winLogIoerr(cnt, __LINE__);
-+@@ -5086,8 +5117,6 @@ static int winOpen(
-+            dwDesiredAccess, (h==INVALID_HANDLE_VALUE) ? "failed" : "ok"));
-+ 
-+   if( h==INVALID_HANDLE_VALUE ){
-+-    pFile->lastErrno = lastErrno;
-+-    winLogError(SQLITE_CANTOPEN, pFile->lastErrno, "winOpen", zUtf8Name);
-+     sqlite3_free(zConverted);
-+     sqlite3_free(zTmpname);
-+     if( isReadWrite && !isExclusive ){
-+@@ -5096,6 +5125,8 @@ static int winOpen(
-+                      ~(SQLITE_OPEN_CREATE|SQLITE_OPEN_READWRITE)),
-+          pOutFlags);
-+     }else{
-++      pFile->lastErrno = lastErrno;
-++      winLogError(SQLITE_CANTOPEN, pFile->lastErrno, "winOpen", zUtf8Name);
-+       return SQLITE_CANTOPEN_BKPT;
-+     }
-+   }
-+@@ -5688,9 +5719,6 @@ static int winRandomness(sqlite3_vfs *pVfs, int nBuf, char *zBuf){
-+   EntropyGatherer e;
-+   UNUSED_PARAMETER(pVfs);
-+   memset(zBuf, 0, nBuf);
-+-#if defined(_MSC_VER) && _MSC_VER>=1400 && !SQLITE_OS_WINCE
-+-  rand_s((unsigned int*)zBuf); /* rand_s() is not available with MinGW */
-+-#endif /* defined(_MSC_VER) && _MSC_VER>=1400 */
-+   e.a = (unsigned char*)zBuf;
-+   e.na = nBuf;
-+   e.nXor = 0;
-+diff --git a/third_party/sqlite/src/src/pager.c b/third_party/sqlite/src/src/pager.c
-+index 8023dca..5b964f3 100644
-+--- a/third_party/sqlite/src/src/pager.c
-++++ b/third_party/sqlite/src/src/pager.c
-+@@ -128,8 +128,8 @@ int sqlite3PagerTrace=1;  /* True to enable tracing */
-+ ** associated file-descriptor is returned. FILEHANDLEID() takes an sqlite3_file
-+ ** struct as its argument.
-+ */
-+-#define PAGERID(p) ((int)(p->fd))
-+-#define FILEHANDLEID(fd) ((int)fd)
-++#define PAGERID(p) (SQLITE_PTR_TO_INT(p->fd))
-++#define FILEHANDLEID(fd) (SQLITE_PTR_TO_INT(fd))
-+ 
-+ /*
-+ ** The Pager.eState variable stores the current 'state' of a pager. A
-+@@ -616,6 +616,18 @@ struct PagerSavepoint {
-+ **   is set to zero in all other states. In PAGER_ERROR state, Pager.errCode
-+ **   is always set to SQLITE_FULL, SQLITE_IOERR or one of the SQLITE_IOERR_XXX
-+ **   sub-codes.
-++**
-++** syncFlags, walSyncFlags
-++**
-++**   syncFlags is either SQLITE_SYNC_NORMAL (0x02) or SQLITE_SYNC_FULL (0x03).
-++**   syncFlags is used for rollback mode.  walSyncFlags is used for WAL mode
-++**   and contains the flags used to sync the checkpoint operations in the
-++**   lower two bits, and sync flags used for transaction commits in the WAL
-++**   file in bits 0x04 and 0x08.  In other words, to get the correct sync flags
-++**   for checkpoint operations, use (walSyncFlags&0x03) and to get the correct
-++**   sync flags for transaction commit, use ((walSyncFlags>>2)&0x03).  Note
-++**   that with synchronous=NORMAL in WAL mode, transaction commit is not synced
-++**   meaning that the 0x04 and 0x08 bits are both zero.
-+ */
-+ struct Pager {
-+   sqlite3_vfs *pVfs;          /* OS functions to use for IO */
-+@@ -625,9 +637,8 @@ struct Pager {
-+   u8 noSync;                  /* Do not sync the journal if true */
-+   u8 fullSync;                /* Do extra syncs of the journal for robustness */
-+   u8 extraSync;               /* sync directory after journal delete */
-+-  u8 ckptSyncFlags;           /* SYNC_NORMAL or SYNC_FULL for checkpoint */
-+-  u8 walSyncFlags;            /* SYNC_NORMAL or SYNC_FULL for wal writes */
-+   u8 syncFlags;               /* SYNC_NORMAL or SYNC_FULL otherwise */
-++  u8 walSyncFlags;            /* See description above */
-+   u8 tempFile;                /* zFilename is a temporary or immutable file */
-+   u8 noLock;                  /* Do not lock (except in WAL mode) */
-+   u8 readOnly;                /* True for a read-only database */
-+@@ -947,6 +958,7 @@ static int assert_pager_state(Pager *p){
-+       assert( isOpen(p->jfd)
-+            || p->journalMode==PAGER_JOURNALMODE_OFF
-+            || p->journalMode==PAGER_JOURNALMODE_WAL
-++           || (sqlite3OsDeviceCharacteristics(p->fd)&SQLITE_IOCAP_BATCH_ATOMIC)
-+       );
-+       assert( pPager->dbOrigSize<=pPager->dbHintSize );
-+       break;
-+@@ -958,6 +970,7 @@ static int assert_pager_state(Pager *p){
-+       assert( isOpen(p->jfd)
-+            || p->journalMode==PAGER_JOURNALMODE_OFF
-+            || p->journalMode==PAGER_JOURNALMODE_WAL
-++           || (sqlite3OsDeviceCharacteristics(p->fd)&SQLITE_IOCAP_BATCH_ATOMIC)
-+       );
-+       break;
-+ 
-+@@ -1168,34 +1181,47 @@ static int pagerLockDb(Pager *pPager, int eLock){
-+ }
-+ 
-+ /*
-+-** This function determines whether or not the atomic-write optimization
-+-** can be used with this pager. The optimization can be used if:
-++** This function determines whether or not the atomic-write or
-++** atomic-batch-write optimizations can be used with this pager. The
-++** atomic-write optimization can be used if:
-+ **
-+ **  (a) the value returned by OsDeviceCharacteristics() indicates that
-+ **      a database page may be written atomically, and
-+ **  (b) the value returned by OsSectorSize() is less than or equal
-+ **      to the page size.
-+ **
-+-** The optimization is also always enabled for temporary files. It is
-+-** an error to call this function if pPager is opened on an in-memory
-+-** database.
-++** If it can be used, then the value returned is the size of the journal
-++** file when it contains rollback data for exactly one page.
-++**
-++** The atomic-batch-write optimization can be used if OsDeviceCharacteristics()
-++** returns a value with the SQLITE_IOCAP_BATCH_ATOMIC bit set. -1 is
-++** returned in this case.
-+ **
-+-** If the optimization cannot be used, 0 is returned. If it can be used,
-+-** then the value returned is the size of the journal file when it
-+-** contains rollback data for exactly one page.
-++** If neither optimization can be used, 0 is returned.
-+ */
-+-#ifdef SQLITE_ENABLE_ATOMIC_WRITE
-+ static int jrnlBufferSize(Pager *pPager){
-+   assert( !MEMDB );
-+-  if( !pPager->tempFile ){
-+-    int dc;                           /* Device characteristics */
-+-    int nSector;                      /* Sector size */
-+-    int szPage;                       /* Page size */
-+ 
-+-    assert( isOpen(pPager->fd) );
-+-    dc = sqlite3OsDeviceCharacteristics(pPager->fd);
-+-    nSector = pPager->sectorSize;
-+-    szPage = pPager->pageSize;
-++#if defined(SQLITE_ENABLE_ATOMIC_WRITE) \
-++ || defined(SQLITE_ENABLE_BATCH_ATOMIC_WRITE)
-++  int dc;                           /* Device characteristics */
-++
-++  assert( isOpen(pPager->fd) );
-++  dc = sqlite3OsDeviceCharacteristics(pPager->fd);
-++#else
-++  UNUSED_PARAMETER(pPager);
-++#endif
-++
-++#ifdef SQLITE_ENABLE_BATCH_ATOMIC_WRITE
-++  if( dc&SQLITE_IOCAP_BATCH_ATOMIC ){
-++    return -1;
-++  }
-++#endif
-++
-++#ifdef SQLITE_ENABLE_ATOMIC_WRITE
-++  {
-++    int nSector = pPager->sectorSize;
-++    int szPage = pPager->pageSize;
-+ 
-+     assert(SQLITE_IOCAP_ATOMIC512==(512>>8));
-+     assert(SQLITE_IOCAP_ATOMIC64K==(65536>>8));
-+@@ -1205,11 +1231,11 @@ static int jrnlBufferSize(Pager *pPager){
-+   }
-+ 
-+   return JOURNAL_HDR_SZ(pPager) + JOURNAL_PG_SZ(pPager);
-+-}
-+-#else
-+-# define jrnlBufferSize(x) 0
-+ #endif
-+ 
-++  return 0;
-++}
-++
-+ /*
-+ ** If SQLITE_CHECK_PAGES is defined then we do some sanity checking
-+ ** on the cache using a hash function.  This is used for testing
-+@@ -1291,6 +1317,7 @@ static int readMasterJournal(sqlite3_file *pJrnl, char *zMaster, u32 nMaster){
-+    || szJ<16
-+    || SQLITE_OK!=(rc = read32bits(pJrnl, szJ-16, &len))
-+    || len>=nMaster
-++   || len>szJ-16
-+    || len==0
-+    || SQLITE_OK!=(rc = read32bits(pJrnl, szJ-12, &cksum))
-+    || SQLITE_OK!=(rc = sqlite3OsRead(pJrnl, aMagic, 8, szJ-8))
-+@@ -2012,7 +2039,9 @@ static int pager_end_transaction(Pager *pPager, int hasMaster, int bCommit){
-+   }
-+ 
-+   releaseAllSavepoints(pPager);
-+-  assert( isOpen(pPager->jfd) || pPager->pInJournal==0 );
-++  assert( isOpen(pPager->jfd) || pPager->pInJournal==0
-++      || (sqlite3OsDeviceCharacteristics(pPager->fd)&SQLITE_IOCAP_BATCH_ATOMIC)
-++  );
-+   if( isOpen(pPager->jfd) ){
-+     assert( !pagerUseWal(pPager) );
-+ 
-+@@ -2780,6 +2809,7 @@ static int pager_playback(Pager *pPager, int isHot){
-+   char *zMaster = 0;       /* Name of master journal file if any */
-+   int needPagerReset;      /* True to reset page prior to first page rollback */
-+   int nPlayback = 0;       /* Total number of pages restored from journal */
-++  u32 savedPageSize = pPager->pageSize;
-+ 
-+   /* Figure out how many records are in the journal.  Abort early if
-+   ** the journal is empty.
-+@@ -2909,6 +2939,9 @@ static int pager_playback(Pager *pPager, int isHot){
-+   assert( 0 );
-+ 
-+ end_playback:
-++  if( rc==SQLITE_OK ){
-++    rc = sqlite3PagerSetPagesize(pPager, &savedPageSize, -1);
-++  }
-+   /* Following a rollback, the database file should be back in its original
-+   ** state prior to the start of the transaction, so invoke the
-+   ** SQLITE_FCNTL_DB_UNCHANGED file-control method to disable the
-+@@ -2967,7 +3000,8 @@ end_playback:
-+ 
-+ 
-+ /*
-+-** Read the content for page pPg out of the database file and into
-++** Read the content for page pPg out of the database file (or out of
-++** the WAL if that is where the most recent copy if found) into
-+ ** pPg->pData. A shared lock or greater must be held on the database
-+ ** file before this function is called.
-+ **
-+@@ -2977,30 +3011,33 @@ end_playback:
-+ ** If an IO error occurs, then the IO error is returned to the caller.
-+ ** Otherwise, SQLITE_OK is returned.
-+ */
-+-static int readDbPage(PgHdr *pPg, u32 iFrame){
-++static int readDbPage(PgHdr *pPg){
-+   Pager *pPager = pPg->pPager; /* Pager object associated with page pPg */
-+-  Pgno pgno = pPg->pgno;       /* Page number to read */
-+   int rc = SQLITE_OK;          /* Return code */
-+-  int pgsz = pPager->pageSize; /* Number of bytes to read */
-++
-++#ifndef SQLITE_OMIT_WAL
-++  u32 iFrame = 0;              /* Frame of WAL containing pgno */
-+ 
-+   assert( pPager->eState>=PAGER_READER && !MEMDB );
-+   assert( isOpen(pPager->fd) );
-+ 
-+-#ifndef SQLITE_OMIT_WAL
-++  if( pagerUseWal(pPager) ){
-++    rc = sqlite3WalFindFrame(pPager->pWal, pPg->pgno, &iFrame);
-++    if( rc ) return rc;
-++  }
-+   if( iFrame ){
-+-    /* Try to pull the page from the write-ahead log. */
-+-    rc = sqlite3WalReadFrame(pPager->pWal, iFrame, pgsz, pPg->pData);
-++    rc = sqlite3WalReadFrame(pPager->pWal, iFrame,pPager->pageSize,pPg->pData);
-+   }else
-+ #endif
-+   {
-+-    i64 iOffset = (pgno-1)*(i64)pPager->pageSize;
-+-    rc = sqlite3OsRead(pPager->fd, pPg->pData, pgsz, iOffset);
-++    i64 iOffset = (pPg->pgno-1)*(i64)pPager->pageSize;
-++    rc = sqlite3OsRead(pPager->fd, pPg->pData, pPager->pageSize, iOffset);
-+     if( rc==SQLITE_IOERR_SHORT_READ ){
-+       rc = SQLITE_OK;
-+     }
-+   }
-+ 
-+-  if( pgno==1 ){
-++  if( pPg->pgno==1 ){
-+     if( rc ){
-+       /* If the read is unsuccessful, set the dbFileVers[] to something
-+       ** that will never be a valid file version.  dbFileVers[] is a copy
-+@@ -3020,13 +3057,13 @@ static int readDbPage(PgHdr *pPg, u32 iFrame){
-+       memcpy(&pPager->dbFileVers, dbFileVers, sizeof(pPager->dbFileVers));
-+     }
-+   }
-+-  CODEC1(pPager, pPg->pData, pgno, 3, rc = SQLITE_NOMEM_BKPT);
-++  CODEC1(pPager, pPg->pData, pPg->pgno, 3, rc = SQLITE_NOMEM_BKPT);
-+ 
-+   PAGER_INCR(sqlite3_pager_readdb_count);
-+   PAGER_INCR(pPager->nRead);
-+-  IOTRACE(("PGIN %p %d\n", pPager, pgno));
-++  IOTRACE(("PGIN %p %d\n", pPager, pPg->pgno));
-+   PAGERTRACE(("FETCH %d page %d hash(%08x)\n",
-+-               PAGERID(pPager), pgno, pager_pagehash(pPg)));
-++               PAGERID(pPager), pPg->pgno, pager_pagehash(pPg)));
-+ 
-+   return rc;
-+ }
-+@@ -3077,11 +3114,7 @@ static int pagerUndoCallback(void *pCtx, Pgno iPg){
-+     if( sqlite3PcachePageRefcount(pPg)==1 ){
-+       sqlite3PcacheDrop(pPg);
-+     }else{
-+-      u32 iFrame = 0;
-+-      rc = sqlite3WalFindFrame(pPager->pWal, pPg->pgno, &iFrame);
-+-      if( rc==SQLITE_OK ){
-+-        rc = readDbPage(pPg, iFrame);
-+-      }
-++      rc = readDbPage(pPg);
-+       if( rc==SQLITE_OK ){
-+         pPager->xReiniter(pPg);
-+       }
-+@@ -3587,20 +3620,17 @@ void sqlite3PagerSetFlags(
-+   }
-+   if( pPager->noSync ){
-+     pPager->syncFlags = 0;
-+-    pPager->ckptSyncFlags = 0;
-+   }else if( pgFlags & PAGER_FULLFSYNC ){
-+     pPager->syncFlags = SQLITE_SYNC_FULL;
-+-    pPager->ckptSyncFlags = SQLITE_SYNC_FULL;
-+-  }else if( pgFlags & PAGER_CKPT_FULLFSYNC ){
-+-    pPager->syncFlags = SQLITE_SYNC_NORMAL;
-+-    pPager->ckptSyncFlags = SQLITE_SYNC_FULL;
-+   }else{
-+     pPager->syncFlags = SQLITE_SYNC_NORMAL;
-+-    pPager->ckptSyncFlags = SQLITE_SYNC_NORMAL;
-+   }
-+-  pPager->walSyncFlags = pPager->syncFlags;
-++  pPager->walSyncFlags = (pPager->syncFlags<<2);
-+   if( pPager->fullSync ){
-+-    pPager->walSyncFlags |= WAL_SYNC_TRANSACTIONS;
-++    pPager->walSyncFlags |= pPager->syncFlags;
-++  }
-++  if( (pgFlags & PAGER_CKPT_FULLFSYNC) && !pPager->noSync ){
-++    pPager->walSyncFlags |= (SQLITE_SYNC_FULL<<2);
-+   }
-+   if( pgFlags & PAGER_CACHESPILL ){
-+     pPager->doNotSpill &= ~SPILLFLAG_OFF;
-+@@ -4099,7 +4129,7 @@ int sqlite3PagerClose(Pager *pPager, sqlite3 *db){
-+   pPager->exclusiveMode = 0;
-+ #ifndef SQLITE_OMIT_WAL
-+   assert( db || pPager->pWal==0 );
-+-  sqlite3WalClose(pPager->pWal, db, pPager->ckptSyncFlags, pPager->pageSize,
-++  sqlite3WalClose(pPager->pWal, db, pPager->walSyncFlags, pPager->pageSize,
-+       (db && (db->flags & SQLITE_NoCkptOnClose) ? 0 : pTmp)
-+   );
-+   pPager->pWal = 0;
-+@@ -4568,6 +4598,13 @@ static int pagerStress(void *p, PgHdr *pPg){
-+     }
-+   }else{
-+ 
-++#ifdef SQLITE_ENABLE_BATCH_ATOMIC_WRITE
-++    if( pPager->tempFile==0 ){
-++      rc = sqlite3JournalCreate(pPager->jfd);
-++      if( rc!=SQLITE_OK ) return pager_error(pPager, rc);
-++    }
-++#endif
-++
-+     /* Sync the journal file if required. */
-+     if( pPg->flags&PGHDR_NEED_SYNC
-+      || pPager->eState==PAGER_WRITER_CACHEMOD
-+@@ -4900,13 +4937,11 @@ act_like_temp_file:
-+     assert( pPager->extraSync==0 );
-+     assert( pPager->syncFlags==0 );
-+     assert( pPager->walSyncFlags==0 );
-+-    assert( pPager->ckptSyncFlags==0 );
-+   }else{
-+     pPager->fullSync = 1;
-+     pPager->extraSync = 0;
-+     pPager->syncFlags = SQLITE_SYNC_NORMAL;
-+-    pPager->walSyncFlags = SQLITE_SYNC_NORMAL | WAL_SYNC_TRANSACTIONS;
-+-    pPager->ckptSyncFlags = SQLITE_SYNC_NORMAL;
-++    pPager->walSyncFlags = SQLITE_SYNC_NORMAL | (SQLITE_SYNC_NORMAL<<2);
-+   }
-+   /* pPager->pFirst = 0; */
-+   /* pPager->pFirstSynced = 0; */
-+@@ -5326,7 +5361,8 @@ int sqlite3PagerSharedLock(Pager *pPager){
-+ ** nothing to rollback, so this routine is a no-op.
-+ */
-+ static void pagerUnlockIfUnused(Pager *pPager){
-+-  if( pPager->nMmapOut==0 && (sqlite3PcacheRefCount(pPager->pPCache)==0) ){
-++  if( sqlite3PcacheRefCount(pPager->pPCache)==0 ){
-++    assert( pPager->nMmapOut==0 ); /* because page1 is never memory mapped */
-+     pagerUnlockAndRollback(pPager);
-+   }
-+ }
-+@@ -5467,14 +5503,9 @@ static int getPageNormal(
-+       memset(pPg->pData, 0, pPager->pageSize);
-+       IOTRACE(("ZERO %p %d\n", pPager, pgno));
-+     }else{
-+-      u32 iFrame = 0;                 /* Frame to read from WAL file */
-+-      if( pagerUseWal(pPager) ){
-+-        rc = sqlite3WalFindFrame(pPager->pWal, pgno, &iFrame);
-+-        if( rc!=SQLITE_OK ) goto pager_acquire_err;
-+-      }
-+       assert( pPg->pPager==pPager );
-+       pPager->aStat[PAGER_STAT_MISS]++;
-+-      rc = readDbPage(pPg, iFrame);
-++      rc = readDbPage(pPg);
-+       if( rc!=SQLITE_OK ){
-+         goto pager_acquire_err;
-+       }
-+@@ -5617,25 +5648,39 @@ DbPage *sqlite3PagerLookup(Pager *pPager, Pgno pgno){
-+ /*
-+ ** Release a page reference.
-+ **
-+-** If the number of references to the page drop to zero, then the
-+-** page is added to the LRU list.  When all references to all pages
-+-** are released, a rollback occurs and the lock on the database is
-+-** removed.
-++** The sqlite3PagerUnref() and sqlite3PagerUnrefNotNull() may only be
-++** used if we know that the page being released is not the last page.
-++** The btree layer always holds page1 open until the end, so these first
-++** to routines can be used to release any page other than BtShared.pPage1.
-++**
-++** Use sqlite3PagerUnrefPageOne() to release page1.  This latter routine
-++** checks the total number of outstanding pages and if the number of
-++** pages reaches zero it drops the database lock.
-+ */
-+ void sqlite3PagerUnrefNotNull(DbPage *pPg){
-+-  Pager *pPager;
-++  TESTONLY( Pager *pPager = pPg->pPager; )
-+   assert( pPg!=0 );
-+-  pPager = pPg->pPager;
-+   if( pPg->flags & PGHDR_MMAP ){
-++    assert( pPg->pgno!=1 );  /* Page1 is never memory mapped */
-+     pagerReleaseMapPage(pPg);
-+   }else{
-+     sqlite3PcacheRelease(pPg);
-+   }
-+-  pagerUnlockIfUnused(pPager);
-++  /* Do not use this routine to release the last reference to page1 */
-++  assert( sqlite3PcacheRefCount(pPager->pPCache)>0 );
-+ }
-+ void sqlite3PagerUnref(DbPage *pPg){
-+   if( pPg ) sqlite3PagerUnrefNotNull(pPg);
-+ }
-++void sqlite3PagerUnrefPageOne(DbPage *pPg){
-++  Pager *pPager;
-++  assert( pPg!=0 );
-++  assert( pPg->pgno==1 );
-++  assert( (pPg->flags & PGHDR_MMAP)==0 ); /* Page1 is never memory mapped */
-++  pPager = pPg->pPager;
-++  sqlite3PcacheRelease(pPg);
-++  pagerUnlockIfUnused(pPager);
-++}
-+ 
-+ /*
-+ ** This function is called at the start of every write transaction.
-+@@ -6347,6 +6392,21 @@ int sqlite3PagerCommitPhaseOne(
-+         sqlite3PcacheCleanAll(pPager->pPCache);
-+       }
-+     }else{
-++      /* The bBatch boolean is true if the batch-atomic-write commit method
-++      ** should be used.  No rollback journal is created if batch-atomic-write
-++      ** is enabled.
-++      */
-++      sqlite3_file *fd = pPager->fd;
-++#ifdef SQLITE_ENABLE_BATCH_ATOMIC_WRITE
-++      const int bBatch = zMaster==0    /* An SQLITE_IOCAP_BATCH_ATOMIC commit */
-++        && (sqlite3OsDeviceCharacteristics(fd) & SQLITE_IOCAP_BATCH_ATOMIC)
-++        && !pPager->noSync
-++        && sqlite3JournalIsInMemory(pPager->jfd);
-++#else
-++# define bBatch 0
-++#endif
-++
-++#ifdef SQLITE_ENABLE_ATOMIC_WRITE
-+       /* The following block updates the change-counter. Exactly how it
-+       ** does this depends on whether or not the atomic-update optimization
-+       ** was enabled at compile time, and if this transaction meets the
-+@@ -6370,33 +6430,40 @@ int sqlite3PagerCommitPhaseOne(
-+       ** in 'direct' mode. In this case the journal file will never be
-+       ** created for this transaction.
-+       */
-+-  #ifdef SQLITE_ENABLE_ATOMIC_WRITE
-+-      PgHdr *pPg;
-+-      assert( isOpen(pPager->jfd)
-+-           || pPager->journalMode==PAGER_JOURNALMODE_OFF
-+-           || pPager->journalMode==PAGER_JOURNALMODE_WAL
-+-      );
-+-      if( !zMaster && isOpen(pPager->jfd)
-+-       && pPager->journalOff==jrnlBufferSize(pPager)
-+-       && pPager->dbSize>=pPager->dbOrigSize
-+-       && (0==(pPg = sqlite3PcacheDirtyList(pPager->pPCache)) || 0==pPg->pDirty)
-+-      ){
-+-        /* Update the db file change counter via the direct-write method. The
-+-        ** following call will modify the in-memory representation of page 1
-+-        ** to include the updated change counter and then write page 1
-+-        ** directly to the database file. Because of the atomic-write
-+-        ** property of the host file-system, this is safe.
-+-        */
-+-        rc = pager_incr_changecounter(pPager, 1);
-+-      }else{
-+-        rc = sqlite3JournalCreate(pPager->jfd);
-+-        if( rc==SQLITE_OK ){
-+-          rc = pager_incr_changecounter(pPager, 0);
-++      if( bBatch==0 ){
-++        PgHdr *pPg;
-++        assert( isOpen(pPager->jfd)
-++            || pPager->journalMode==PAGER_JOURNALMODE_OFF
-++            || pPager->journalMode==PAGER_JOURNALMODE_WAL
-++            );
-++        if( !zMaster && isOpen(pPager->jfd)
-++         && pPager->journalOff==jrnlBufferSize(pPager)
-++         && pPager->dbSize>=pPager->dbOrigSize
-++         && (!(pPg = sqlite3PcacheDirtyList(pPager->pPCache)) || 0==pPg->pDirty)
-++        ){
-++          /* Update the db file change counter via the direct-write method. The
-++          ** following call will modify the in-memory representation of page 1
-++          ** to include the updated change counter and then write page 1
-++          ** directly to the database file. Because of the atomic-write
-++          ** property of the host file-system, this is safe.
-++          */
-++          rc = pager_incr_changecounter(pPager, 1);
-++        }else{
-++          rc = sqlite3JournalCreate(pPager->jfd);
-++          if( rc==SQLITE_OK ){
-++            rc = pager_incr_changecounter(pPager, 0);
-++          }
-+         }
-+       }
-+-  #else
-++#else
-++#ifdef SQLITE_ENABLE_BATCH_ATOMIC_WRITE
-++      if( zMaster ){
-++        rc = sqlite3JournalCreate(pPager->jfd);
-++        if( rc!=SQLITE_OK ) goto commit_phase_one_exit;
-++      }
-++#endif
-+       rc = pager_incr_changecounter(pPager, 0);
-+-  #endif
-++#endif
-+       if( rc!=SQLITE_OK ) goto commit_phase_one_exit;
-+ 
-+       /* Write the master journal name into the journal file. If a master
-+@@ -6420,7 +6487,23 @@ int sqlite3PagerCommitPhaseOne(
-+       rc = syncJournal(pPager, 0);
-+       if( rc!=SQLITE_OK ) goto commit_phase_one_exit;
-+ 
-++      if( bBatch ){
-++        /* The pager is now in DBMOD state. But regardless of what happens
-++        ** next, attempting to play the journal back into the database would
-++        ** be unsafe. Close it now to make sure that does not happen.  */
-++        sqlite3OsClose(pPager->jfd);
-++        rc = sqlite3OsFileControl(fd, SQLITE_FCNTL_BEGIN_ATOMIC_WRITE, 0);
-++        if( rc!=SQLITE_OK ) goto commit_phase_one_exit;
-++      }
-+       rc = pager_write_pagelist(pPager,sqlite3PcacheDirtyList(pPager->pPCache));
-++      if( bBatch ){
-++        if( rc==SQLITE_OK ){
-++          rc = sqlite3OsFileControl(fd, SQLITE_FCNTL_COMMIT_ATOMIC_WRITE, 0);
-++        }else{
-++          sqlite3OsFileControl(fd, SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE, 0);
-++        }
-++      }
-++
-+       if( rc!=SQLITE_OK ){
-+         assert( rc!=SQLITE_IOERR_BLOCKED );
-+         goto commit_phase_one_exit;
-+@@ -7321,7 +7404,7 @@ int sqlite3PagerCheckpoint(
-+     rc = sqlite3WalCheckpoint(pPager->pWal, db, eMode,
-+         (eMode==SQLITE_CHECKPOINT_PASSIVE ? 0 : pPager->xBusyHandler),
-+         pPager->pBusyHandlerArg,
-+-        pPager->ckptSyncFlags, pPager->pageSize, (u8 *)pPager->pTmpSpace,
-++        pPager->walSyncFlags, pPager->pageSize, (u8 *)pPager->pTmpSpace,
-+         pnLog, pnCkpt
-+     );
-+   }
-+@@ -7478,7 +7561,7 @@ int sqlite3PagerCloseWal(Pager *pPager, sqlite3 *db){
-+   if( rc==SQLITE_OK && pPager->pWal ){
-+     rc = pagerExclusiveLock(pPager);
-+     if( rc==SQLITE_OK ){
-+-      rc = sqlite3WalClose(pPager->pWal, db, pPager->ckptSyncFlags,
-++      rc = sqlite3WalClose(pPager->pWal, db, pPager->walSyncFlags,
-+                            pPager->pageSize, (u8*)pPager->pTmpSpace);
-+       pPager->pWal = 0;
-+       pagerFixMaplimit(pPager);
-+diff --git a/third_party/sqlite/src/src/pager.h b/third_party/sqlite/src/src/pager.h
-+index 3522a4e..01ea900 100644
-+--- a/third_party/sqlite/src/src/pager.h
-++++ b/third_party/sqlite/src/src/pager.h
-+@@ -151,6 +151,7 @@ DbPage *sqlite3PagerLookup(Pager *pPager, Pgno pgno);
-+ void sqlite3PagerRef(DbPage*);
-+ void sqlite3PagerUnref(DbPage*);
-+ void sqlite3PagerUnrefNotNull(DbPage*);
-++void sqlite3PagerUnrefPageOne(DbPage*);
-+ 
-+ /* Operations on page references. */
-+ int sqlite3PagerWrite(DbPage*);
-+diff --git a/third_party/sqlite/src/src/parse.y b/third_party/sqlite/src/src/parse.y
-+index 81f4116..7ad42b4 100644
-+--- a/third_party/sqlite/src/src/parse.y
-++++ b/third_party/sqlite/src/src/parse.y
-+@@ -192,6 +192,19 @@ columnlist ::= columnlist COMMA columnname carglist.
-+ columnlist ::= columnname carglist.
-+ columnname(A) ::= nm(A) typetoken(Y). {sqlite3AddColumn(pParse,&A,&Y);}
-+ 
-++// Declare some tokens early in order to influence their values, to
-++// improve performance and reduce the executable size.  The goal here is
-++// to get the "jump" operations in ISNULL through ESCAPE to have numeric
-++// values that are early enough so that all jump operations are clustered
-++// at the beginning, but also so that the comparison tokens NE through GE
-++// are as large as possible so that they are near to FUNCTION, which is a
-++// token synthesized by addopcodes.tcl.
-++//
-++%token ABORT ACTION AFTER ANALYZE ASC ATTACH BEFORE BEGIN BY CASCADE CAST.
-++%token CONFLICT DATABASE DEFERRED DESC DETACH EACH END EXCLUSIVE EXPLAIN FAIL.
-++%token OR AND NOT IS MATCH LIKE_KW BETWEEN IN ISNULL NOTNULL NE EQ.
-++%token GT LE LT GE ESCAPE.
-++
-+ // The following directive causes tokens ABORT, AFTER, ASC, etc. to
-+ // fallback to ID if they will not parse as their original value.
-+ // This obviates the need for the "id" nonterminal.
-+diff --git a/third_party/sqlite/src/src/pcache.c b/third_party/sqlite/src/src/pcache.c
-+index ee6024e..9a43a59 100644
-+--- a/third_party/sqlite/src/src/pcache.c
-++++ b/third_party/sqlite/src/src/pcache.c
-+@@ -191,12 +191,9 @@ static void pcacheManageDirtyList(PgHdr *pPage, u8 addRemove){
-+         p->eCreate = 2;
-+       }
-+     }
-+-    pPage->pDirtyNext = 0;
-+-    pPage->pDirtyPrev = 0;
-+   }
-+   if( addRemove & PCACHE_DIRTYLIST_ADD ){
-+-    assert( pPage->pDirtyNext==0 && pPage->pDirtyPrev==0 && p->pDirty!=pPage );
-+-
-++    pPage->pDirtyPrev = 0;
-+     pPage->pDirtyNext = p->pDirty;
-+     if( pPage->pDirtyNext ){
-+       assert( pPage->pDirtyNext->pDirtyPrev==0 );
-+@@ -513,11 +510,7 @@ void SQLITE_NOINLINE sqlite3PcacheRelease(PgHdr *p){
-+   if( (--p->nRef)==0 ){
-+     if( p->flags&PGHDR_CLEAN ){
-+       pcacheUnpin(p);
-+-    }else if( p->pDirtyPrev!=0 ){ /*OPTIMIZATION-IF-FALSE*/
-+-      /* Move the page to the head of the dirty list. If p->pDirtyPrev==0,
-+-      ** then page p is already at the head of the dirty list and the
-+-      ** following call would be a no-op. Hence the OPTIMIZATION-IF-FALSE
-+-      ** tag above.  */
-++    }else{
-+       pcacheManageDirtyList(p, PCACHE_DIRTYLIST_FRONT);
-+     }
-+   }
-+diff --git a/third_party/sqlite/src/src/pcache.h b/third_party/sqlite/src/src/pcache.h
-+index 570688a..8aadd02 100644
-+--- a/third_party/sqlite/src/src/pcache.h
-++++ b/third_party/sqlite/src/src/pcache.h
-+@@ -43,6 +43,8 @@ struct PgHdr {
-+   i16 nRef;                      /* Number of users of this page */
-+   PgHdr *pDirtyNext;             /* Next element in list of dirty pages */
-+   PgHdr *pDirtyPrev;             /* Previous element in list of dirty pages */
-++                          /* NB: pDirtyNext and pDirtyPrev are undefined if the
-++                          ** PgHdr object is not dirty */
-+ };
-+ 
-+ /* Bit values for PgHdr.flags */
-+diff --git a/third_party/sqlite/src/src/pcache1.c b/third_party/sqlite/src/src/pcache1.c
-+index 4b09e98..c93294a 100644
-+--- a/third_party/sqlite/src/src/pcache1.c
-++++ b/third_party/sqlite/src/src/pcache1.c
-+@@ -96,7 +96,6 @@ typedef struct PGroup PGroup;
-+ struct PgHdr1 {
-+   sqlite3_pcache_page page;      /* Base class. Must be first. pBuf & pExtra */
-+   unsigned int iKey;             /* Key value (page number) */
-+-  u8 isPinned;                   /* Page in use, not on the LRU list */
-+   u8 isBulkLocal;                /* This page from bulk local storage */
-+   u8 isAnchor;                   /* This is the PGroup.lru element */
-+   PgHdr1 *pNext;                 /* Next in hash table chain */
-+@@ -105,6 +104,12 @@ struct PgHdr1 {
-+   PgHdr1 *pLruPrev;              /* Previous in LRU list of unpinned pages */
-+ };
-+ 
-++/*
-++** A page is pinned if it is no on the LRU list
-++*/
-++#define PAGE_IS_PINNED(p)    ((p)->pLruNext==0)
-++#define PAGE_IS_UNPINNED(p)  ((p)->pLruNext!=0)
-++
-+ /* Each page cache (or PCache) belongs to a PGroup.  A PGroup is a set
-+ ** of one or more PCaches that are able to recycle each other's unpinned
-+ ** pages when they are under memory pressure.  A PGroup is an instance of
-+@@ -132,7 +137,7 @@ struct PGroup {
-+   unsigned int nMaxPage;         /* Sum of nMax for purgeable caches */
-+   unsigned int nMinPage;         /* Sum of nMin for purgeable caches */
-+   unsigned int mxPinned;         /* nMaxpage + 10 - nMinPage */
-+-  unsigned int nCurrentPage;     /* Number of purgeable pages allocated */
-++  unsigned int nPurgeable;       /* Number of purgeable pages allocated */
-+   PgHdr1 lru;                    /* The beginning and end of the LRU list */
-+ };
-+ 
-+@@ -146,11 +151,13 @@ struct PGroup {
-+ */
-+ struct PCache1 {
-+   /* Cache configuration parameters. Page size (szPage) and the purgeable
-+-  ** flag (bPurgeable) are set when the cache is created. nMax may be
-++  ** flag (bPurgeable) and the pnPurgeable pointer are all set when the
-++  ** cache is created and are never changed thereafter. nMax may be
-+   ** modified at any time by a call to the pcache1Cachesize() method.
-+   ** The PGroup mutex must be held when accessing nMax.
-+   */
-+   PGroup *pGroup;                     /* PGroup this cache belongs to */
-++  unsigned int *pnPurgeable;          /* Pointer to pGroup->nPurgeable */
-+   int szPage;                         /* Size of database content section */
-+   int szExtra;                        /* sizeof(MemPage)+sizeof(PgHdr) */
-+   int szAlloc;                        /* Total size of one pcache line */
-+@@ -245,6 +252,7 @@ void sqlite3PCacheBufferSetup(void *pBuf, int sz, int n){
-+   if( pcache1.isInit ){
-+     PgFreeslot *p;
-+     if( pBuf==0 ) sz = n = 0;
-++    if( n==0 ) sz = 0;
-+     sz = ROUNDDOWN8(sz);
-+     pcache1.szSlot = sz;
-+     pcache1.nSlot = pcache1.nFreeSlot = n;
-+@@ -437,9 +445,7 @@ static PgHdr1 *pcache1AllocPage(PCache1 *pCache, int benignMalloc){
-+     p->isBulkLocal = 0;
-+     p->isAnchor = 0;
-+   }
-+-  if( pCache->bPurgeable ){
-+-    pCache->pGroup->nCurrentPage++;
-+-  }
-++  (*pCache->pnPurgeable)++;
-+   return p;
-+ }
-+ 
-+@@ -460,9 +466,7 @@ static void pcache1FreePage(PgHdr1 *p){
-+     sqlite3_free(p);
-+ #endif
-+   }
-+-  if( pCache->bPurgeable ){
-+-    pCache->pGroup->nCurrentPage--;
-+-  }
-++  (*pCache->pnPurgeable)--;
-+ }
-+ 
-+ /*
-+@@ -557,22 +561,18 @@ static void pcache1ResizeHash(PCache1 *p){
-+ ** The PGroup mutex must be held when this function is called.
-+ */
-+ static PgHdr1 *pcache1PinPage(PgHdr1 *pPage){
-+-  PCache1 *pCache;
-+-
-+   assert( pPage!=0 );
-+-  assert( pPage->isPinned==0 );
-+-  pCache = pPage->pCache;
-++  assert( PAGE_IS_UNPINNED(pPage) );
-+   assert( pPage->pLruNext );
-+   assert( pPage->pLruPrev );
-+-  assert( sqlite3_mutex_held(pCache->pGroup->mutex) );
-++  assert( sqlite3_mutex_held(pPage->pCache->pGroup->mutex) );
-+   pPage->pLruPrev->pLruNext = pPage->pLruNext;
-+   pPage->pLruNext->pLruPrev = pPage->pLruPrev;
-+   pPage->pLruNext = 0;
-+   pPage->pLruPrev = 0;
-+-  pPage->isPinned = 1;
-+   assert( pPage->isAnchor==0 );
-+-  assert( pCache->pGroup->lru.isAnchor==1 );
-+-  pCache->nRecyclable--;
-++  assert( pPage->pCache->pGroup->lru.isAnchor==1 );
-++  pPage->pCache->nRecyclable--;
-+   return pPage;
-+ }
-+ 
-+@@ -606,11 +606,11 @@ static void pcache1EnforceMaxPage(PCache1 *pCache){
-+   PGroup *pGroup = pCache->pGroup;
-+   PgHdr1 *p;
-+   assert( sqlite3_mutex_held(pGroup->mutex) );
-+-  while( pGroup->nCurrentPage>pGroup->nMaxPage
-++  while( pGroup->nPurgeable>pGroup->nMaxPage
-+       && (p=pGroup->lru.pLruPrev)->isAnchor==0
-+   ){
-+     assert( p->pCache->pGroup==pGroup );
-+-    assert( p->isPinned==0 );
-++    assert( PAGE_IS_UNPINNED(p) );
-+     pcache1PinPage(p);
-+     pcache1RemoveFromHash(p, 1);
-+   }
-+@@ -659,7 +659,7 @@ static void pcache1TruncateUnsafe(
-+       if( pPage->iKey>=iLimit ){
-+         pCache->nPage--;
-+         *pp = pPage->pNext;
-+-        if( !pPage->isPinned ) pcache1PinPage(pPage);
-++        if( PAGE_IS_UNPINNED(pPage) ) pcache1PinPage(pPage);
-+         pcache1FreePage(pPage);
-+       }else{
-+         pp = &pPage->pNext;
-+@@ -781,6 +781,10 @@ static sqlite3_pcache *pcache1Create(int szPage, int szExtra, int bPurgeable){
-+       pCache->nMin = 10;
-+       pGroup->nMinPage += pCache->nMin;
-+       pGroup->mxPinned = pGroup->nMaxPage + 10 - pGroup->nMinPage;
-++      pCache->pnPurgeable = &pGroup->nPurgeable;
-++    }else{
-++      static unsigned int dummyCurrentPage;
-++      pCache->pnPurgeable = &dummyCurrentPage;
-+     }
-+     pcache1LeaveMutex(pGroup);
-+     if( pCache->nHash==0 ){
-+@@ -882,7 +886,7 @@ static SQLITE_NOINLINE PgHdr1 *pcache1FetchStage2(
-+   ){
-+     PCache1 *pOther;
-+     pPage = pGroup->lru.pLruPrev;
-+-    assert( pPage->isPinned==0 );
-++    assert( PAGE_IS_UNPINNED(pPage) );
-+     pcache1RemoveFromHash(pPage, 0);
-+     pcache1PinPage(pPage);
-+     pOther = pPage->pCache;
-+@@ -890,7 +894,7 @@ static SQLITE_NOINLINE PgHdr1 *pcache1FetchStage2(
-+       pcache1FreePage(pPage);
-+       pPage = 0;
-+     }else{
-+-      pGroup->nCurrentPage -= (pOther->bPurgeable - pCache->bPurgeable);
-++      pGroup->nPurgeable -= (pOther->bPurgeable - pCache->bPurgeable);
-+     }
-+   }
-+ 
-+@@ -909,7 +913,6 @@ static SQLITE_NOINLINE PgHdr1 *pcache1FetchStage2(
-+     pPage->pCache = pCache;
-+     pPage->pLruPrev = 0;
-+     pPage->pLruNext = 0;
-+-    pPage->isPinned = 1;
-+     *(void **)pPage->page.pExtra = 0;
-+     pCache->apHash[h] = pPage;
-+     if( iKey>pCache->iMaxKey ){
-+@@ -995,7 +998,7 @@ static PgHdr1 *pcache1FetchNoMutex(
-+   ** Otherwise (page not in hash and createFlag!=0) continue with
-+   ** subsequent steps to try to create the page. */
-+   if( pPage ){
-+-    if( !pPage->isPinned ){
-++    if( PAGE_IS_UNPINNED(pPage) ){
-+       return pcache1PinPage(pPage);
-+     }else{
-+       return pPage;
-+@@ -1070,9 +1073,9 @@ static void pcache1Unpin(
-+   ** part of the PGroup LRU list.
-+   */
-+   assert( pPage->pLruPrev==0 && pPage->pLruNext==0 );
-+-  assert( pPage->isPinned==1 );
-++  assert( PAGE_IS_PINNED(pPage) );
-+ 
-+-  if( reuseUnlikely || pGroup->nCurrentPage>pGroup->nMaxPage ){
-++  if( reuseUnlikely || pGroup->nPurgeable>pGroup->nMaxPage ){
-+     pcache1RemoveFromHash(pPage, 1);
-+   }else{
-+     /* Add the page to the PGroup LRU list. */
-+@@ -1081,7 +1084,6 @@ static void pcache1Unpin(
-+     (pPage->pLruNext = *ppFirst)->pLruPrev = pPage;
-+     *ppFirst = pPage;
-+     pCache->nRecyclable++;
-+-    pPage->isPinned = 0;
-+   }
-+ 
-+   pcache1LeaveMutex(pCache->pGroup);
-+@@ -1225,7 +1227,7 @@ int sqlite3PcacheReleaseMemory(int nReq){
-+ #ifdef SQLITE_PCACHE_SEPARATE_HEADER
-+       nFree += sqlite3MemSize(p);
-+ #endif
-+-      assert( p->isPinned==0 );
-++      assert( PAGE_IS_UNPINNED(p) );
-+       pcache1PinPage(p);
-+       pcache1RemoveFromHash(p, 1);
-+     }
-+@@ -1249,10 +1251,10 @@ void sqlite3PcacheStats(
-+   PgHdr1 *p;
-+   int nRecyclable = 0;
-+   for(p=pcache1.grp.lru.pLruNext; p && !p->isAnchor; p=p->pLruNext){
-+-    assert( p->isPinned==0 );
-++    assert( PAGE_IS_UNPINNED(p) );
-+     nRecyclable++;
-+   }
-+-  *pnCurrent = pcache1.grp.nCurrentPage;
-++  *pnCurrent = pcache1.grp.nPurgeable;
-+   *pnMax = (int)pcache1.grp.nMaxPage;
-+   *pnMin = (int)pcache1.grp.nMinPage;
-+   *pnRecyclable = nRecyclable;
-+diff --git a/third_party/sqlite/src/src/pragma.c b/third_party/sqlite/src/src/pragma.c
-+index fc73852..153d3f5 100644
-+--- a/third_party/sqlite/src/src/pragma.c
-++++ b/third_party/sqlite/src/src/pragma.c
-+@@ -298,16 +298,16 @@ static const PragmaName *pragmaLocate(const char *zName){
-+ /*
-+ ** Helper subroutine for PRAGMA integrity_check:
-+ **
-+-** Generate code to output a single-column result row with the result
-+-** held in register regResult.  Decrement the result count and halt if
-+-** the maximum number of result rows have been issued.
-++** Generate code to output a single-column result row with a value of the
-++** string held in register 3.  Decrement the result count in register 1
-++** and halt if the maximum number of result rows have been issued.
-+ */
-+-static int integrityCheckResultRow(Vdbe *v, int regResult){
-++static int integrityCheckResultRow(Vdbe *v){
-+   int addr;
-+-  sqlite3VdbeAddOp2(v, OP_ResultRow, regResult, 1);
-++  sqlite3VdbeAddOp2(v, OP_ResultRow, 3, 1);
-+   addr = sqlite3VdbeAddOp3(v, OP_IfPos, 1, sqlite3VdbeCurrentAddr(v)+2, 1);
-+   VdbeCoverage(v);
-+-  sqlite3VdbeAddOp2(v, OP_Halt, 0, 0);
-++  sqlite3VdbeAddOp0(v, OP_Halt);
-+   return addr;
-+ }
-+ 
-+@@ -1255,13 +1255,11 @@ void sqlite3Pragma(
-+     for(i=0; i<SQLITE_FUNC_HASH_SZ; i++){
-+       for(p=sqlite3BuiltinFunctions.a[i]; p; p=p->u.pHash ){
-+         sqlite3VdbeMultiLoad(v, 1, "si", p->zName, 1);
-+-        sqlite3VdbeAddOp2(v, OP_ResultRow, 1, 2);
-+       }
-+     }
-+     for(j=sqliteHashFirst(&db->aFunc); j; j=sqliteHashNext(j)){
-+       p = (FuncDef*)sqliteHashData(j);
-+       sqlite3VdbeMultiLoad(v, 1, "si", p->zName, 0);
-+-      sqlite3VdbeAddOp2(v, OP_ResultRow, 1, 2);
-+     }
-+   }
-+   break;
-+@@ -1273,7 +1271,6 @@ void sqlite3Pragma(
-+     for(j=sqliteHashFirst(&db->aModule); j; j=sqliteHashNext(j)){
-+       Module *pMod = (Module*)sqliteHashData(j);
-+       sqlite3VdbeMultiLoad(v, 1, "s", pMod->zName);
-+-      sqlite3VdbeAddOp2(v, OP_ResultRow, 1, 1);
-+     }
-+   }
-+   break;
-+@@ -1283,7 +1280,6 @@ void sqlite3Pragma(
-+     int i;
-+     for(i=0; i<ArraySize(aPragmaName); i++){
-+       sqlite3VdbeMultiLoad(v, 1, "s", aPragmaName[i].zName);
-+-      sqlite3VdbeAddOp2(v, OP_ResultRow, 1, 1);
-+     }
-+   }
-+   break;
-+@@ -1509,12 +1505,11 @@ void sqlite3Pragma(
-+ 
-+     /* Do an integrity check on each database file */
-+     for(i=0; i<db->nDb; i++){
-+-      HashElem *x;
-+-      Hash *pTbls;
-+-      int *aRoot;
-+-      int cnt = 0;
-+-      int mxIdx = 0;
-+-      int nIdx;
-++      HashElem *x;     /* For looping over tables in the schema */
-++      Hash *pTbls;     /* Set of all tables in the schema */
-++      int *aRoot;      /* Array of root page numbers of all btrees */
-++      int cnt = 0;     /* Number of entries in aRoot[] */
-++      int mxIdx = 0;   /* Maximum number of indexes for any table */
-+ 
-+       if( OMIT_TEMPDB && i==1 ) continue;
-+       if( iDb>=0 && i!=iDb ) continue;
-+@@ -1529,8 +1524,9 @@ void sqlite3Pragma(
-+       assert( sqlite3SchemaMutexHeld(db, i, 0) );
-+       pTbls = &db->aDb[i].pSchema->tblHash;
-+       for(cnt=0, x=sqliteHashFirst(pTbls); x; x=sqliteHashNext(x)){
-+-        Table *pTab = sqliteHashData(x);
-+-        Index *pIdx;
-++        Table *pTab = sqliteHashData(x);  /* Current table */
-++        Index *pIdx;                      /* An index on pTab */
-++        int nIdx;                         /* Number of indexes on pTab */
-+         if( HasRowid(pTab) ) cnt++;
-+         for(nIdx=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, nIdx++){ cnt++; }
-+         if( nIdx>mxIdx ) mxIdx = nIdx;
-+@@ -1558,9 +1554,8 @@ void sqlite3Pragma(
-+       sqlite3VdbeAddOp4(v, OP_String8, 0, 3, 0,
-+          sqlite3MPrintf(db, "*** in database %s ***\n", db->aDb[i].zDbSName),
-+          P4_DYNAMIC);
-+-      sqlite3VdbeAddOp3(v, OP_Move, 2, 4, 1);
-+-      sqlite3VdbeAddOp3(v, OP_Concat, 4, 3, 2);
-+-      integrityCheckResultRow(v, 2);
-++      sqlite3VdbeAddOp3(v, OP_Concat, 2, 3, 3);
-++      integrityCheckResultRow(v);
-+       sqlite3VdbeJumpHere(v, addr);
-+ 
-+       /* Make sure all the indices are constructed correctly.
-+@@ -1574,16 +1569,13 @@ void sqlite3Pragma(
-+         int r1 = -1;
-+ 
-+         if( pTab->tnum<1 ) continue;  /* Skip VIEWs or VIRTUAL TABLEs */
-+-        if( pTab->pCheck==0
-+-         && (pTab->tabFlags & TF_HasNotNull)==0
-+-         && (pTab->pIndex==0 || isQuick)
-+-        ){
-+-          continue;  /* No additional checks needed for this table */
-+-        }
-+         pPk = HasRowid(pTab) ? 0 : sqlite3PrimaryKeyIndex(pTab);
-+         sqlite3ExprCacheClear(pParse);
-+         sqlite3OpenTableAndIndices(pParse, pTab, OP_OpenRead, 0,
-+                                    1, 0, &iDataCur, &iIdxCur);
-++        /* reg[7] counts the number of entries in the table.
-++        ** reg[8+i] counts the number of entries in the i-th index
-++        */
-+         sqlite3VdbeAddOp2(v, OP_Integer, 0, 7);
-+         for(j=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, j++){
-+           sqlite3VdbeAddOp2(v, OP_Integer, 0, 8+j); /* index entries counter */
-+@@ -1604,7 +1596,7 @@ void sqlite3Pragma(
-+           zErr = sqlite3MPrintf(db, "NULL value in %s.%s", pTab->zName,
-+                               pTab->aCol[j].zName);
-+           sqlite3VdbeAddOp4(v, OP_String8, 0, 3, 0, zErr, P4_DYNAMIC);
-+-          integrityCheckResultRow(v, 3);
-++          integrityCheckResultRow(v);
-+           sqlite3VdbeJumpHere(v, jmp2);
-+         }
-+         /* Verify CHECK constraints */
-+@@ -1627,57 +1619,62 @@ void sqlite3Pragma(
-+             zErr = sqlite3MPrintf(db, "CHECK constraint failed in %s",
-+                 pTab->zName);
-+             sqlite3VdbeAddOp4(v, OP_String8, 0, 3, 0, zErr, P4_DYNAMIC);
-+-            integrityCheckResultRow(v, 3);
-++            integrityCheckResultRow(v);
-+             sqlite3VdbeResolveLabel(v, addrCkOk);
-+             sqlite3ExprCachePop(pParse);
-+           }
-+           sqlite3ExprListDelete(db, pCheck);
-+         }
-+-        /* Validate index entries for the current row */
-+-        for(j=0, pIdx=pTab->pIndex; pIdx && !isQuick; pIdx=pIdx->pNext, j++){
-+-          int jmp2, jmp3, jmp4, jmp5;
-+-          int ckUniq = sqlite3VdbeMakeLabel(v);
-+-          if( pPk==pIdx ) continue;
-+-          r1 = sqlite3GenerateIndexKey(pParse, pIdx, iDataCur, 0, 0, &jmp3,
-+-                                       pPrior, r1);
-+-          pPrior = pIdx;
-+-          sqlite3VdbeAddOp2(v, OP_AddImm, 8+j, 1);  /* increment entry count */
-+-          /* Verify that an index entry exists for the current table row */
-+-          jmp2 = sqlite3VdbeAddOp4Int(v, OP_Found, iIdxCur+j, ckUniq, r1,
-+-                                      pIdx->nColumn); VdbeCoverage(v);
-+-          sqlite3VdbeLoadString(v, 3, "row ");
-+-          sqlite3VdbeAddOp3(v, OP_Concat, 7, 3, 3);
-+-          sqlite3VdbeLoadString(v, 4, " missing from index ");
-+-          sqlite3VdbeAddOp3(v, OP_Concat, 4, 3, 3);
-+-          jmp5 = sqlite3VdbeLoadString(v, 4, pIdx->zName);
-+-          sqlite3VdbeAddOp3(v, OP_Concat, 4, 3, 3);
-+-          jmp4 = integrityCheckResultRow(v, 3);
-+-          sqlite3VdbeJumpHere(v, jmp2);
-+-          /* For UNIQUE indexes, verify that only one entry exists with the
-+-          ** current key.  The entry is unique if (1) any column is NULL
-+-          ** or (2) the next entry has a different key */
-+-          if( IsUniqueIndex(pIdx) ){
-+-            int uniqOk = sqlite3VdbeMakeLabel(v);
-+-            int jmp6;
-+-            int kk;
-+-            for(kk=0; kk<pIdx->nKeyCol; kk++){
-+-              int iCol = pIdx->aiColumn[kk];
-+-              assert( iCol!=XN_ROWID && iCol<pTab->nCol );
-+-              if( iCol>=0 && pTab->aCol[iCol].notNull ) continue;
-+-              sqlite3VdbeAddOp2(v, OP_IsNull, r1+kk, uniqOk);
-+-              VdbeCoverage(v);
-++        if( !isQuick ){ /* Omit the remaining tests for quick_check */
-++          /* Sanity check on record header decoding */
-++          sqlite3VdbeAddOp3(v, OP_Column, iDataCur, pTab->nCol-1, 3);
-++          sqlite3VdbeChangeP5(v, OPFLAG_TYPEOFARG);
-++          /* Validate index entries for the current row */
-++          for(j=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, j++){
-++            int jmp2, jmp3, jmp4, jmp5;
-++            int ckUniq = sqlite3VdbeMakeLabel(v);
-++            if( pPk==pIdx ) continue;
-++            r1 = sqlite3GenerateIndexKey(pParse, pIdx, iDataCur, 0, 0, &jmp3,
-++                                         pPrior, r1);
-++            pPrior = pIdx;
-++            sqlite3VdbeAddOp2(v, OP_AddImm, 8+j, 1);/* increment entry count */
-++            /* Verify that an index entry exists for the current table row */
-++            jmp2 = sqlite3VdbeAddOp4Int(v, OP_Found, iIdxCur+j, ckUniq, r1,
-++                                        pIdx->nColumn); VdbeCoverage(v);
-++            sqlite3VdbeLoadString(v, 3, "row ");
-++            sqlite3VdbeAddOp3(v, OP_Concat, 7, 3, 3);
-++            sqlite3VdbeLoadString(v, 4, " missing from index ");
-++            sqlite3VdbeAddOp3(v, OP_Concat, 4, 3, 3);
-++            jmp5 = sqlite3VdbeLoadString(v, 4, pIdx->zName);
-++            sqlite3VdbeAddOp3(v, OP_Concat, 4, 3, 3);
-++            jmp4 = integrityCheckResultRow(v);
-++            sqlite3VdbeJumpHere(v, jmp2);
-++            /* For UNIQUE indexes, verify that only one entry exists with the
-++            ** current key.  The entry is unique if (1) any column is NULL
-++            ** or (2) the next entry has a different key */
-++            if( IsUniqueIndex(pIdx) ){
-++              int uniqOk = sqlite3VdbeMakeLabel(v);
-++              int jmp6;
-++              int kk;
-++              for(kk=0; kk<pIdx->nKeyCol; kk++){
-++                int iCol = pIdx->aiColumn[kk];
-++                assert( iCol!=XN_ROWID && iCol<pTab->nCol );
-++                if( iCol>=0 && pTab->aCol[iCol].notNull ) continue;
-++                sqlite3VdbeAddOp2(v, OP_IsNull, r1+kk, uniqOk);
-++                VdbeCoverage(v);
-++              }
-++              jmp6 = sqlite3VdbeAddOp1(v, OP_Next, iIdxCur+j); VdbeCoverage(v);
-++              sqlite3VdbeGoto(v, uniqOk);
-++              sqlite3VdbeJumpHere(v, jmp6);
-++              sqlite3VdbeAddOp4Int(v, OP_IdxGT, iIdxCur+j, uniqOk, r1,
-++                                   pIdx->nKeyCol); VdbeCoverage(v);
-++              sqlite3VdbeLoadString(v, 3, "non-unique entry in index ");
-++              sqlite3VdbeGoto(v, jmp5);
-++              sqlite3VdbeResolveLabel(v, uniqOk);
-+             }
-+-            jmp6 = sqlite3VdbeAddOp1(v, OP_Next, iIdxCur+j); VdbeCoverage(v);
-+-            sqlite3VdbeGoto(v, uniqOk);
-+-            sqlite3VdbeJumpHere(v, jmp6);
-+-            sqlite3VdbeAddOp4Int(v, OP_IdxGT, iIdxCur+j, uniqOk, r1,
-+-                                 pIdx->nKeyCol); VdbeCoverage(v);
-+-            sqlite3VdbeLoadString(v, 3, "non-unique entry in index ");
-+-            sqlite3VdbeGoto(v, jmp5);
-+-            sqlite3VdbeResolveLabel(v, uniqOk);
-++            sqlite3VdbeJumpHere(v, jmp4);
-++            sqlite3ResolvePartIdxLabel(pParse, jmp3);
-+           }
-+-          sqlite3VdbeJumpHere(v, jmp4);
-+-          sqlite3ResolvePartIdxLabel(pParse, jmp3);
-+         }
-+         sqlite3VdbeAddOp2(v, OP_Next, iDataCur, loopTop); VdbeCoverage(v);
-+         sqlite3VdbeJumpHere(v, loopTop-1);
-+@@ -1689,9 +1686,9 @@ void sqlite3Pragma(
-+             sqlite3VdbeAddOp2(v, OP_Count, iIdxCur+j, 3);
-+             addr = sqlite3VdbeAddOp3(v, OP_Eq, 8+j, 0, 3); VdbeCoverage(v);
-+             sqlite3VdbeChangeP5(v, SQLITE_NOTNULL);
-+-            sqlite3VdbeLoadString(v, 3, pIdx->zName);
-+-            sqlite3VdbeAddOp3(v, OP_Concat, 3, 2, 7);
-+-            integrityCheckResultRow(v, 7);
-++            sqlite3VdbeLoadString(v, 4, pIdx->zName);
-++            sqlite3VdbeAddOp3(v, OP_Concat, 4, 2, 3);
-++            integrityCheckResultRow(v);
-+             sqlite3VdbeJumpHere(v, addr);
-+           }
-+         }
-+@@ -1705,6 +1702,9 @@ void sqlite3Pragma(
-+         { OP_IfNotZero,   1, 4,        0},    /* 1 */
-+         { OP_String8,     0, 3,        0},    /* 2 */
-+         { OP_ResultRow,   3, 1,        0},    /* 3 */
-++        { OP_Halt,        0, 0,        0},    /* 4 */
-++        { OP_String8,     0, 3,        0},    /* 5 */
-++        { OP_Goto,        0, 3,        0},    /* 6 */
-+       };
-+       VdbeOp *aOp;
-+ 
-+@@ -1713,7 +1713,10 @@ void sqlite3Pragma(
-+         aOp[0].p2 = 1-mxErr;
-+         aOp[2].p4type = P4_STATIC;
-+         aOp[2].p4.z = "ok";
-++        aOp[5].p4type = P4_STATIC;
-++        aOp[5].p4.z = (char*)sqlite3ErrStr(SQLITE_CORRUPT);
-+       }
-++      sqlite3VdbeChangeP3(v, 0, sqlite3VdbeCurrentAddr(v)-2);
-+     }
-+   }
-+   break;
-+diff --git a/third_party/sqlite/src/src/prepare.c b/third_party/sqlite/src/src/prepare.c
-+index b209799..330cff9d 100644
-+--- a/third_party/sqlite/src/src/prepare.c
-++++ b/third_party/sqlite/src/src/prepare.c
-+@@ -85,7 +85,7 @@ int sqlite3InitCallback(void *pInit, int argc, char **argv, char **NotUsed){
-+     rc = db->errCode;
-+     assert( (rc&0xFF)==(rcp&0xFF) );
-+     db->init.iDb = saved_iDb;
-+-    assert( saved_iDb==0 || (db->flags & SQLITE_Vacuum)!=0 );
-++    assert( saved_iDb==0 || (db->mDbFlags & DBFLAG_Vacuum)!=0 );
-+     if( SQLITE_OK!=rc ){
-+       if( db->init.orphanTrigger ){
-+         assert( iDb==1 );
-+@@ -150,6 +150,8 @@ static int sqlite3InitOne(sqlite3 *db, int iDb, char **pzErrMsg){
-+   assert( sqlite3_mutex_held(db->mutex) );
-+   assert( iDb==1 || sqlite3BtreeHoldsMutex(db->aDb[iDb].pBt) );
-+ 
-++  db->init.busy = 1;
-++
-+   /* Construct the in-memory representation schema tables (sqlite_master or
-+   ** sqlite_temp_master) by invoking the parser directly.  The appropriate
-+   ** table name will be inserted automatically by the parser so we can just
-+@@ -158,7 +160,7 @@ static int sqlite3InitOne(sqlite3 *db, int iDb, char **pzErrMsg){
-+   azArg[0] = zMasterName = SCHEMA_TABLE(iDb);
-+   azArg[1] = "1";
-+   azArg[2] = "CREATE TABLE x(type text,name text,tbl_name text,"
-+-                            "rootpage integer,sql text)";
-++                            "rootpage int,sql text)";
-+   azArg[3] = 0;
-+   initData.db = db;
-+   initData.iDb = iDb;
-+@@ -174,10 +176,10 @@ static int sqlite3InitOne(sqlite3 *db, int iDb, char **pzErrMsg){
-+   */
-+   pDb = &db->aDb[iDb];
-+   if( pDb->pBt==0 ){
-+-    if( !OMIT_TEMPDB && ALWAYS(iDb==1) ){
-+-      DbSetProperty(db, 1, DB_SchemaLoaded);
-+-    }
-+-    return SQLITE_OK;
-++    assert( iDb==1 );
-++    DbSetProperty(db, 1, DB_SchemaLoaded);
-++    rc = SQLITE_OK;
-++    goto error_out;
-+   }
-+ 
-+   /* If there is not already a read-only (or read-write) transaction opened
-+@@ -336,9 +338,13 @@ initone_error_out:
-+   sqlite3BtreeLeave(pDb->pBt);
-+ 
-+ error_out:
-+-  if( rc==SQLITE_NOMEM || rc==SQLITE_IOERR_NOMEM ){
-+-    sqlite3OomFault(db);
-++  if( rc ){
-++    if( rc==SQLITE_NOMEM || rc==SQLITE_IOERR_NOMEM ){
-++      sqlite3OomFault(db);
-++    }
-++    sqlite3ResetOneSchema(db, iDb);
-+   }
-++  db->init.busy = 0;
-+   return rc;
-+ }
-+ 
-+@@ -354,42 +360,29 @@ error_out:
-+ */
-+ int sqlite3Init(sqlite3 *db, char **pzErrMsg){
-+   int i, rc;
-+-  int commit_internal = !(db->flags&SQLITE_InternChanges);
-++  int commit_internal = !(db->mDbFlags&DBFLAG_SchemaChange);
-+ 
-+   assert( sqlite3_mutex_held(db->mutex) );
-+   assert( sqlite3BtreeHoldsMutex(db->aDb[0].pBt) );
-+   assert( db->init.busy==0 );
-+-  rc = SQLITE_OK;
-+-  db->init.busy = 1;
-+   ENC(db) = SCHEMA_ENC(db);
-+-  for(i=0; rc==SQLITE_OK && i<db->nDb; i++){
-+-    if( DbHasProperty(db, i, DB_SchemaLoaded) || i==1 ) continue;
-+-    rc = sqlite3InitOne(db, i, pzErrMsg);
-+-    if( rc ){
-+-      sqlite3ResetOneSchema(db, i);
-+-    }
-+-  }
-+-
-+-  /* Once all the other databases have been initialized, load the schema
-+-  ** for the TEMP database. This is loaded last, as the TEMP database
-+-  ** schema may contain references to objects in other databases.
-+-  */
-+-#ifndef SQLITE_OMIT_TEMPDB
-+-  assert( db->nDb>1 );
-+-  if( rc==SQLITE_OK && !DbHasProperty(db, 1, DB_SchemaLoaded) ){
-+-    rc = sqlite3InitOne(db, 1, pzErrMsg);
-+-    if( rc ){
-+-      sqlite3ResetOneSchema(db, 1);
-++  assert( db->nDb>0 );
-++  /* Do the main schema first */
-++  if( !DbHasProperty(db, 0, DB_SchemaLoaded) ){
-++    rc = sqlite3InitOne(db, 0, pzErrMsg);
-++    if( rc ) return rc;
-++  }
-++  /* All other schemas after the main schema. The "temp" schema must be last */
-++  for(i=db->nDb-1; i>0; i--){
-++    if( !DbHasProperty(db, i, DB_SchemaLoaded) ){
-++      rc = sqlite3InitOne(db, i, pzErrMsg);
-++      if( rc ) return rc;
-+     }
-+   }
-+-#endif
-+-
-+-  db->init.busy = 0;
-+-  if( rc==SQLITE_OK && commit_internal ){
-++  if( commit_internal ){
-+     sqlite3CommitInternalChanges(db);
-+   }
-+-
-+-  return rc;
-++  return SQLITE_OK;
-+ }
-+ 
-+ /*
-+@@ -494,16 +487,14 @@ int sqlite3SchemaToIndex(sqlite3 *db, Schema *pSchema){
-+ ** Free all memory allocations in the pParse object
-+ */
-+ void sqlite3ParserReset(Parse *pParse){
-+-  if( pParse ){
-+-    sqlite3 *db = pParse->db;
-+-    sqlite3DbFree(db, pParse->aLabel);
-+-    sqlite3ExprListDelete(db, pParse->pConstExpr);
-+-    if( db ){
-+-      assert( db->lookaside.bDisable >= pParse->disableLookaside );
-+-      db->lookaside.bDisable -= pParse->disableLookaside;
-+-    }
-+-    pParse->disableLookaside = 0;
-++  sqlite3 *db = pParse->db;
-++  sqlite3DbFree(db, pParse->aLabel);
-++  sqlite3ExprListDelete(db, pParse->pConstExpr);
-++  if( db ){
-++    assert( db->lookaside.bDisable >= pParse->disableLookaside );
-++    db->lookaside.bDisable -= pParse->disableLookaside;
-+   }
-++  pParse->disableLookaside = 0;
-+ }
-+ 
-+ /*
-+@@ -689,6 +680,7 @@ static int sqlite3LockAndPrepare(
-+   sqlite3BtreeEnterAll(db);
-+   rc = sqlite3Prepare(db, zSql, nBytes, prepFlags, pOld, ppStmt, pzTail);
-+   if( rc==SQLITE_SCHEMA ){
-++    sqlite3ResetOneSchema(db, -1);
-+     sqlite3_finalize(*ppStmt);
-+     rc = sqlite3Prepare(db, zSql, nBytes, prepFlags, pOld, ppStmt, pzTail);
-+   }
-+diff --git a/third_party/sqlite/src/src/printf.c b/third_party/sqlite/src/src/printf.c
-+index 6cca4d6..b43c08e 100644
-+--- a/third_party/sqlite/src/src/printf.c
-++++ b/third_party/sqlite/src/src/printf.c
-+@@ -656,7 +656,7 @@ void sqlite3VXPrintf(
-+         if( precision>=0 ){
-+           for(length=0; length<precision && bufpt[length]; length++){}
-+         }else{
-+-          length = sqlite3Strlen30(bufpt);
-++          length = 0x7fffffff & (int)strlen(bufpt);
-+         }
-+         break;
-+       case etSQLESCAPE:           /* Escape ' characters */
-+@@ -782,7 +782,6 @@ static int sqlite3StrAccumEnlarge(StrAccum *p, int N){
-+   }else{
-+     char *zOld = isMalloced(p) ? p->zText : 0;
-+     i64 szNew = p->nChar;
-+-    assert( (p->zText==0 || p->zText==p->zBase)==!isMalloced(p) );
-+     szNew += N + 1;
-+     if( szNew+p->nChar<=p->mxAlloc ){
-+       /* Force exponential buffer size growth as long as it does not overflow,
-+@@ -824,7 +823,6 @@ void sqlite3AppendChar(StrAccum *p, int N, char c){
-+   if( p->nChar+(i64)N >= p->nAlloc && (N = sqlite3StrAccumEnlarge(p, N))<=0 ){
-+     return;
-+   }
-+-  assert( (p->zText==p->zBase)==!isMalloced(p) );
-+   while( (N--)>0 ) p->zText[p->nChar++] = c;
-+ }
-+ 
-+@@ -842,7 +840,6 @@ static void SQLITE_NOINLINE enlargeAndAppend(StrAccum *p, const char *z, int N){
-+     memcpy(&p->zText[p->nChar], z, N);
-+     p->nChar += N;
-+   }
-+-  assert( (p->zText==0 || p->zText==p->zBase)==!isMalloced(p) );
-+ }
-+ 
-+ /*
-+@@ -877,19 +874,20 @@ void sqlite3StrAccumAppendAll(StrAccum *p, const char *z){
-+ ** pointer if any kind of error was encountered.
-+ */
-+ static SQLITE_NOINLINE char *strAccumFinishRealloc(StrAccum *p){
-++  char *zText;
-+   assert( p->mxAlloc>0 && !isMalloced(p) );
-+-  p->zText = sqlite3DbMallocRaw(p->db, p->nChar+1 );
-+-  if( p->zText ){
-+-    memcpy(p->zText, p->zBase, p->nChar+1);
-++  zText = sqlite3DbMallocRaw(p->db, p->nChar+1 );
-++  if( zText ){
-++    memcpy(zText, p->zText, p->nChar+1);
-+     p->printfFlags |= SQLITE_PRINTF_MALLOCED;
-+   }else{
-+     setStrAccumError(p, STRACCUM_NOMEM);
-+   }
-+-  return p->zText;
-++  p->zText = zText;
-++  return zText;
-+ }
-+ char *sqlite3StrAccumFinish(StrAccum *p){
-+   if( p->zText ){
-+-    assert( (p->zText==p->zBase)==!isMalloced(p) );
-+     p->zText[p->nChar] = 0;
-+     if( p->mxAlloc>0 && !isMalloced(p) ){
-+       return strAccumFinishRealloc(p);
-+@@ -902,7 +900,6 @@ char *sqlite3StrAccumFinish(StrAccum *p){
-+ ** Reset an StrAccum string.  Reclaim all malloced memory.
-+ */
-+ void sqlite3StrAccumReset(StrAccum *p){
-+-  assert( (p->zText==0 || p->zText==p->zBase)==!isMalloced(p) );
-+   if( isMalloced(p) ){
-+     sqlite3DbFree(p->db, p->zText);
-+     p->printfFlags &= ~SQLITE_PRINTF_MALLOCED;
-+@@ -925,11 +922,11 @@ void sqlite3StrAccumReset(StrAccum *p){
-+ **        allocations will ever occur.
-+ */
-+ void sqlite3StrAccumInit(StrAccum *p, sqlite3 *db, char *zBase, int n, int mx){
-+-  p->zText = p->zBase = zBase;
-++  p->zText = zBase;
-+   p->db = db;
-+-  p->nChar = 0;
-+   p->nAlloc = n;
-+   p->mxAlloc = mx;
-++  p->nChar = 0;
-+   p->accError = 0;
-+   p->printfFlags = 0;
-+ }
-+diff --git a/third_party/sqlite/src/src/resolve.c b/third_party/sqlite/src/src/resolve.c
-+index 3cced4b..5fa91ff 100644
-+--- a/third_party/sqlite/src/src/resolve.c
-++++ b/third_party/sqlite/src/src/resolve.c
-+@@ -959,12 +959,10 @@ static int resolveCompoundOrderBy(
-+   pOrderBy = pSelect->pOrderBy;
-+   if( pOrderBy==0 ) return 0;
-+   db = pParse->db;
-+-#if SQLITE_MAX_COLUMN
-+   if( pOrderBy->nExpr>db->aLimit[SQLITE_LIMIT_COLUMN] ){
-+     sqlite3ErrorMsg(pParse, "too many terms in ORDER BY clause");
-+     return 1;
-+   }
-+-#endif
-+   for(i=0; i<pOrderBy->nExpr; i++){
-+     pOrderBy->a[i].done = 0;
-+   }
-+@@ -1056,12 +1054,10 @@ int sqlite3ResolveOrderGroupBy(
-+   struct ExprList_item *pItem;
-+ 
-+   if( pOrderBy==0 || pParse->db->mallocFailed ) return 0;
-+-#if SQLITE_MAX_COLUMN
-+   if( pOrderBy->nExpr>db->aLimit[SQLITE_LIMIT_COLUMN] ){
-+     sqlite3ErrorMsg(pParse, "too many terms in %s BY clause", zType);
-+     return 1;
-+   }
-+-#endif
-+   pEList = pSelect->pEList;
-+   assert( pEList!=0 );  /* sqlite3SelectNew() guarantees this */
-+   for(i=0, pItem=pOrderBy->a; i<pOrderBy->nExpr; i++, pItem++){
-+diff --git a/third_party/sqlite/src/src/select.c b/third_party/sqlite/src/src/select.c
-+index 09c2b87..29b2241 100644
-+--- a/third_party/sqlite/src/src/select.c
-++++ b/third_party/sqlite/src/src/select.c
-+@@ -75,7 +75,7 @@ static void clearSelect(sqlite3 *db, Select *p, int bFree){
-+     sqlite3ExprListDelete(db, p->pOrderBy);
-+     sqlite3ExprDelete(db, p->pLimit);
-+     sqlite3ExprDelete(db, p->pOffset);
-+-    if( p->pWith ) sqlite3WithDelete(db, p->pWith);
-++    if( OK_IF_ALWAYS_TRUE(p->pWith) ) sqlite3WithDelete(db, p->pWith);
-+     if( bFree ) sqlite3DbFreeNN(db, p);
-+     p = pPrior;
-+     bFree = 1;
-+@@ -118,7 +118,8 @@ Select *sqlite3SelectNew(
-+     pNew = &standin;
-+   }
-+   if( pEList==0 ){
-+-    pEList = sqlite3ExprListAppend(pParse, 0, sqlite3Expr(pParse->db,TK_ASTERISK,0));
-++    pEList = sqlite3ExprListAppend(pParse, 0,
-++                                   sqlite3Expr(pParse->db,TK_ASTERISK,0));
-+   }
-+   pNew->pEList = pEList;
-+   pNew->op = TK_SELECT;
-+@@ -142,7 +143,8 @@ Select *sqlite3SelectNew(
-+   pNew->pLimit = pLimit;
-+   pNew->pOffset = pOffset;
-+   pNew->pWith = 0;
-+-  assert( pOffset==0 || pLimit!=0 || pParse->nErr>0 || pParse->db->mallocFailed!=0 );
-++  assert( pOffset==0 || pLimit!=0 || pParse->nErr>0
-++                     || pParse->db->mallocFailed!=0 );
-+   if( pParse->db->mallocFailed ) {
-+     clearSelect(pParse->db, pNew, pNew!=&standin);
-+     pNew = 0;
-+@@ -169,7 +171,7 @@ void sqlite3SelectSetName(Select *p, const char *zName){
-+ ** Delete the given Select structure and all of its substructures.
-+ */
-+ void sqlite3SelectDelete(sqlite3 *db, Select *p){
-+-  if( p ) clearSelect(db, p, 1);
-++  if( OK_IF_ALWAYS_TRUE(p) ) clearSelect(db, p, 1);
-+ }
-+ 
-+ /*
-+@@ -410,11 +412,10 @@ static int sqliteProcessJoin(Parse *pParse, Select *p){
-+   pLeft = &pSrc->a[0];
-+   pRight = &pLeft[1];
-+   for(i=0; i<pSrc->nSrc-1; i++, pRight++, pLeft++){
-+-    Table *pLeftTab = pLeft->pTab;
-+     Table *pRightTab = pRight->pTab;
-+     int isOuter;
-+ 
-+-    if( NEVER(pLeftTab==0 || pRightTab==0) ) continue;
-++    if( NEVER(pLeft->pTab==0 || pRightTab==0) ) continue;
-+     isOuter = (pRight->fg.jointype & JT_OUTER)!=0;
-+ 
-+     /* When the NATURAL keyword is present, add WHERE clause terms for
-+@@ -562,11 +563,11 @@ static void pushOntoSorter(
-+     if( pParse->db->mallocFailed ) return;
-+     pOp->p2 = nKey + nData;
-+     pKI = pOp->p4.pKeyInfo;
-+-    memset(pKI->aSortOrder, 0, pKI->nField); /* Makes OP_Jump below testable */
-++    memset(pKI->aSortOrder, 0, pKI->nKeyField); /* Makes OP_Jump testable */
-+     sqlite3VdbeChangeP4(v, -1, (char*)pKI, P4_KEYINFO);
-+-    testcase( pKI->nXField>2 );
-++    testcase( pKI->nAllField > pKI->nKeyField+2 );
-+     pOp->p4.pKeyInfo = keyInfoFromExprList(pParse, pSort->pOrderBy, nOBSat,
-+-                                           pKI->nXField-1);
-++                                           pKI->nAllField-pKI->nKeyField-1);
-+     addrJmp = sqlite3VdbeCurrentAddr(v);
-+     sqlite3VdbeAddOp3(v, OP_Jump, addrJmp+1, 0, addrJmp+1); VdbeCoverage(v);
-+     pSort->labelBkOut = sqlite3VdbeMakeLabel(v);
-+@@ -664,16 +665,15 @@ static void codeDistinct(
-+ ** This routine generates the code for the inside of the inner loop
-+ ** of a SELECT.
-+ **
-+-** If srcTab is negative, then the pEList expressions
-++** If srcTab is negative, then the p->pEList expressions
-+ ** are evaluated in order to get the data for this row.  If srcTab is
-+-** zero or more, then data is pulled from srcTab and pEList is used only
-++** zero or more, then data is pulled from srcTab and p->pEList is used only
-+ ** to get the number of columns and the collation sequence for each column.
-+ */
-+ static void selectInnerLoop(
-+   Parse *pParse,          /* The parser context */
-+   Select *p,              /* The complete select statement being coded */
-+-  ExprList *pEList,       /* List of values being extracted */
-+-  int srcTab,             /* Pull data from this table */
-++  int srcTab,             /* Pull data from this table if non-negative */
-+   SortCtx *pSort,         /* If not NULL, info on how to process ORDER BY */
-+   DistinctCtx *pDistinct, /* If not NULL, info on how to process DISTINCT */
-+   SelectDest *pDest,      /* How to dispose of the results */
-+@@ -697,7 +697,7 @@ static void selectInnerLoop(
-+   int regOrig;                /* Start of memory holding full result (or 0) */
-+ 
-+   assert( v );
-+-  assert( pEList!=0 );
-++  assert( p->pEList!=0 );
-+   hasDistinct = pDistinct ? pDistinct->eTnctType : WHERE_DISTINCT_NOOP;
-+   if( pSort && pSort->pOrderBy==0 ) pSort = 0;
-+   if( pSort==0 && !hasDistinct ){
-+@@ -707,7 +707,7 @@ static void selectInnerLoop(
-+ 
-+   /* Pull the requested columns.
-+   */
-+-  nResultCol = pEList->nExpr;
-++  nResultCol = p->pEList->nExpr;
-+ 
-+   if( pDest->iSdst==0 ){
-+     if( pSort ){
-+@@ -730,7 +730,7 @@ static void selectInnerLoop(
-+   if( srcTab>=0 ){
-+     for(i=0; i<nResultCol; i++){
-+       sqlite3VdbeAddOp3(v, OP_Column, srcTab, i, regResult+i);
-+-      VdbeComment((v, "%s", pEList->a[i].zName));
-++      VdbeComment((v, "%s", p->pEList->a[i].zName));
-+     }
-+   }else if( eDest!=SRT_Exists ){
-+     /* If the destination is an EXISTS(...) expression, the actual
-+@@ -743,24 +743,25 @@ static void selectInnerLoop(
-+       ecelFlags = 0;
-+     }
-+     if( pSort && hasDistinct==0 && eDest!=SRT_EphemTab && eDest!=SRT_Table ){
-+-      /* For each expression in pEList that is a copy of an expression in
-++      /* For each expression in p->pEList that is a copy of an expression in
-+       ** the ORDER BY clause (pSort->pOrderBy), set the associated
-+       ** iOrderByCol value to one more than the index of the ORDER BY
-+       ** expression within the sort-key that pushOntoSorter() will generate.
-+-      ** This allows the pEList field to be omitted from the sorted record,
-++      ** This allows the p->pEList field to be omitted from the sorted record,
-+       ** saving space and CPU cycles.  */
-+       ecelFlags |= (SQLITE_ECEL_OMITREF|SQLITE_ECEL_REF);
-+       for(i=pSort->nOBSat; i<pSort->pOrderBy->nExpr; i++){
-+         int j;
-+         if( (j = pSort->pOrderBy->a[i].u.x.iOrderByCol)>0 ){
-+-          pEList->a[j-1].u.x.iOrderByCol = i+1-pSort->nOBSat;
-++          p->pEList->a[j-1].u.x.iOrderByCol = i+1-pSort->nOBSat;
-+         }
-+       }
-+       regOrig = 0;
-+       assert( eDest==SRT_Set || eDest==SRT_Mem
-+            || eDest==SRT_Coroutine || eDest==SRT_Output );
-+     }
-+-    nResultCol = sqlite3ExprCodeExprList(pParse,pEList,regResult,0,ecelFlags);
-++    nResultCol = sqlite3ExprCodeExprList(pParse,p->pEList,regResult,
-++                                         0,ecelFlags);
-+   }
-+ 
-+   /* If the DISTINCT keyword was present on the SELECT statement
-+@@ -792,7 +793,7 @@ static void selectInnerLoop(
-+ 
-+         iJump = sqlite3VdbeCurrentAddr(v) + nResultCol;
-+         for(i=0; i<nResultCol; i++){
-+-          CollSeq *pColl = sqlite3ExprCollSeq(pParse, pEList->a[i].pExpr);
-++          CollSeq *pColl = sqlite3ExprCollSeq(pParse, p->pEList->a[i].pExpr);
-+           if( i<nResultCol-1 ){
-+             sqlite3VdbeAddOp3(v, OP_Ne, regResult+i, iJump, regPrev+i);
-+             VdbeCoverage(v);
-+@@ -1035,8 +1036,8 @@ KeyInfo *sqlite3KeyInfoAlloc(sqlite3 *db, int N, int X){
-+   KeyInfo *p = sqlite3DbMallocRawNN(db, sizeof(KeyInfo) + nExtra);
-+   if( p ){
-+     p->aSortOrder = (u8*)&p->aColl[N+X];
-+-    p->nField = (u16)N;
-+-    p->nXField = (u16)X;
-++    p->nKeyField = (u16)N;
-++    p->nAllField = (u16)(N+X);
-+     p->enc = ENC(db);
-+     p->db = db;
-+     p->nRef = 1;
-+@@ -1110,10 +1111,7 @@ static KeyInfo *keyInfoFromExprList(
-+   if( pInfo ){
-+     assert( sqlite3KeyInfoIsWriteable(pInfo) );
-+     for(i=iStart, pItem=pList->a+iStart; i<nExpr; i++, pItem++){
-+-      CollSeq *pColl;
-+-      pColl = sqlite3ExprCollSeq(pParse, pItem->pExpr);
-+-      if( !pColl ) pColl = db->pDfltColl;
-+-      pInfo->aColl[i-iStart] = pColl;
-++      pInfo->aColl[i-iStart] = sqlite3ExprNNCollSeq(pParse, pItem->pExpr);
-+       pInfo->aSortOrder[i-iStart] = pItem->sortOrder;
-+     }
-+   }
-+@@ -1363,23 +1361,23 @@ static void generateSortTail(
-+ ** the SQLITE_ENABLE_COLUMN_METADATA compile-time option is used.
-+ */
-+ #ifdef SQLITE_ENABLE_COLUMN_METADATA
-+-# define columnType(A,B,C,D,E,F) columnTypeImpl(A,B,C,D,E,F)
-++# define columnType(A,B,C,D,E) columnTypeImpl(A,B,C,D,E)
-+ #else /* if !defined(SQLITE_ENABLE_COLUMN_METADATA) */
-+-# define columnType(A,B,C,D,E,F) columnTypeImpl(A,B,F)
-++# define columnType(A,B,C,D,E) columnTypeImpl(A,B)
-+ #endif
-+ static const char *columnTypeImpl(
-+   NameContext *pNC,
-++#ifndef SQLITE_ENABLE_COLUMN_METADATA
-++  Expr *pExpr
-++#else
-+   Expr *pExpr,
-+-#ifdef SQLITE_ENABLE_COLUMN_METADATA
-+   const char **pzOrigDb,
-+   const char **pzOrigTab,
-+-  const char **pzOrigCol,
-++  const char **pzOrigCol
-+ #endif
-+-  u8 *pEstWidth
-+ ){
-+   char const *zType = 0;
-+   int j;
-+-  u8 estWidth = 1;
-+ #ifdef SQLITE_ENABLE_COLUMN_METADATA
-+   char const *zOrigDb = 0;
-+   char const *zOrigTab = 0;
-+@@ -1451,33 +1449,32 @@ static const char *columnTypeImpl(
-+           sNC.pSrcList = pS->pSrc;
-+           sNC.pNext = pNC;
-+           sNC.pParse = pNC->pParse;
-+-          zType = columnType(&sNC, p,&zOrigDb,&zOrigTab,&zOrigCol, &estWidth);
-++          zType = columnType(&sNC, p,&zOrigDb,&zOrigTab,&zOrigCol);
-+         }
-+-      }else if( pTab->pSchema ){
-+-        /* A real table */
-++      }else{
-++        /* A real table or a CTE table */
-+         assert( !pS );
-+-        if( iCol<0 ) iCol = pTab->iPKey;
-+-        assert( iCol==-1 || (iCol>=0 && iCol<pTab->nCol) );
-+ #ifdef SQLITE_ENABLE_COLUMN_METADATA
-++        if( iCol<0 ) iCol = pTab->iPKey;
-++        assert( iCol==XN_ROWID || (iCol>=0 && iCol<pTab->nCol) );
-+         if( iCol<0 ){
-+           zType = "INTEGER";
-+           zOrigCol = "rowid";
-+         }else{
-+           zOrigCol = pTab->aCol[iCol].zName;
-+           zType = sqlite3ColumnType(&pTab->aCol[iCol],0);
-+-          estWidth = pTab->aCol[iCol].szEst;
-+         }
-+         zOrigTab = pTab->zName;
-+-        if( pNC->pParse ){
-++        if( pNC->pParse && pTab->pSchema ){
-+           int iDb = sqlite3SchemaToIndex(pNC->pParse->db, pTab->pSchema);
-+           zOrigDb = pNC->pParse->db->aDb[iDb].zDbSName;
-+         }
-+ #else
-++        assert( iCol==XN_ROWID || (iCol>=0 && iCol<pTab->nCol) );
-+         if( iCol<0 ){
-+           zType = "INTEGER";
-+         }else{
-+           zType = sqlite3ColumnType(&pTab->aCol[iCol],0);
-+-          estWidth = pTab->aCol[iCol].szEst;
-+         }
-+ #endif
-+       }
-+@@ -1496,7 +1493,7 @@ static const char *columnTypeImpl(
-+       sNC.pSrcList = pS->pSrc;
-+       sNC.pNext = pNC;
-+       sNC.pParse = pNC->pParse;
-+-      zType = columnType(&sNC, p, &zOrigDb, &zOrigTab, &zOrigCol, &estWidth);
-++      zType = columnType(&sNC, p, &zOrigDb, &zOrigTab, &zOrigCol);
-+       break;
-+     }
-+ #endif
-+@@ -1510,7 +1507,6 @@ static const char *columnTypeImpl(
-+     *pzOrigCol = zOrigCol;
-+   }
-+ #endif
-+-  if( pEstWidth ) *pEstWidth = estWidth;
-+   return zType;
-+ }
-+ 
-+@@ -1537,7 +1533,7 @@ static void generateColumnTypes(
-+     const char *zOrigDb = 0;
-+     const char *zOrigTab = 0;
-+     const char *zOrigCol = 0;
-+-    zType = columnType(&sNC, p, &zOrigDb, &zOrigTab, &zOrigCol, 0);
-++    zType = columnType(&sNC, p, &zOrigDb, &zOrigTab, &zOrigCol);
-+ 
-+     /* The vdbe must make its own copy of the column-type and other
-+     ** column specific strings, in case the schema is reset before this
-+@@ -1547,7 +1543,7 @@ static void generateColumnTypes(
-+     sqlite3VdbeSetColName(v, i, COLNAME_TABLE, zOrigTab, SQLITE_TRANSIENT);
-+     sqlite3VdbeSetColName(v, i, COLNAME_COLUMN, zOrigCol, SQLITE_TRANSIENT);
-+ #else
-+-    zType = columnType(&sNC, p, 0, 0, 0, 0);
-++    zType = columnType(&sNC, p, 0, 0, 0);
-+ #endif
-+     sqlite3VdbeSetColName(v, i, COLNAME_DECLTYPE, zType, SQLITE_TRANSIENT);
-+   }
-+@@ -1589,9 +1585,9 @@ static Table *tableWithCursor(SrcList *pList, int iCursor){
-+ **                              other words, the zSpan of the result expression.
-+ **
-+ **    short=ON, full=OFF:       (This is the default setting).  If the result
-+-**                              refers directly to a table column, then the result
-+-**                              column name is just the table column name: COLUMN.
-+-**                              Otherwise use zSpan.
-++**                              refers directly to a table column, then the
-++**                              result column name is just the table column
-++**                              name: COLUMN.  Otherwise use zSpan.
-+ **
-+ **    full=ON, short=ANY:       If the result refers directly to a table column,
-+ **                              then the result column name with the table name
-+@@ -1627,6 +1623,8 @@ static void generateColumnNames(
-+     Expr *p = pEList->a[i].pExpr;
-+ 
-+     assert( p!=0 );
-++    assert( p->op!=TK_AGG_COLUMN );  /* Agg processing has not run yet */
-++    assert( p->op!=TK_COLUMN || p->pTab!=0 ); /* Covering idx not yet coded */
-+     if( pEList->a[i].zName ){
-+       /* An AS clause always takes first priority */
-+       char *zName = pEList->a[i].zName;
-+@@ -1702,6 +1700,7 @@ int sqlite3ColumnsFromExprList(
-+     nCol = pEList->nExpr;
-+     aCol = sqlite3DbMallocZero(db, sizeof(aCol[0])*nCol);
-+     testcase( aCol==0 );
-++    if( nCol>32767 ) nCol = 32767;
-+   }else{
-+     nCol = 0;
-+     aCol = 0;
-+@@ -1721,7 +1720,9 @@ int sqlite3ColumnsFromExprList(
-+         pColExpr = pColExpr->pRight;
-+         assert( pColExpr!=0 );
-+       }
-+-      if( pColExpr->op==TK_COLUMN && pColExpr->pTab!=0 ){
-++      if( (pColExpr->op==TK_COLUMN || pColExpr->op==TK_AGG_COLUMN)
-++       && pColExpr->pTab!=0
-++      ){
-+         /* For columns use the column name name */
-+         int iCol = pColExpr->iColumn;
-+         Table *pTab = pColExpr->pTab;
-+@@ -1796,7 +1797,6 @@ void sqlite3SelectAddColumnTypeAndCollation(
-+   int i;
-+   Expr *p;
-+   struct ExprList_item *a;
-+-  u64 szAll = 0;
-+ 
-+   assert( pSelect!=0 );
-+   assert( (pSelect->selFlags & SF_Resolved)!=0 );
-+@@ -1809,10 +1809,11 @@ void sqlite3SelectAddColumnTypeAndCollation(
-+     const char *zType;
-+     int n, m;
-+     p = a[i].pExpr;
-+-    zType = columnType(&sNC, p, 0, 0, 0, &pCol->szEst);
-+-    szAll += pCol->szEst;
-++    zType = columnType(&sNC, p, 0, 0, 0);
-++    /* pCol->szEst = ... // Column size est for SELECT tables never used */
-+     pCol->affinity = sqlite3ExprAffinity(p);
-+-    if( zType && (m = sqlite3Strlen30(zType))>0 ){
-++    if( zType ){
-++      m = sqlite3Strlen30(zType);
-+       n = sqlite3Strlen30(pCol->zName);
-+       pCol->zName = sqlite3DbReallocOrFree(db, pCol->zName, n+m+2);
-+       if( pCol->zName ){
-+@@ -1826,7 +1827,7 @@ void sqlite3SelectAddColumnTypeAndCollation(
-+       pCol->zColl = sqlite3DbStrDup(db, pColl->zName);
-+     }
-+   }
-+-  pTab->szTabRow = sqlite3LogEst(szAll*4);
-++  pTab->szTabRow = 1; /* Any non-zero value works */
-+ }
-+ 
-+ /*
-+@@ -1869,19 +1870,16 @@ Table *sqlite3ResultSetOfSelect(Parse *pParse, Select *pSelect){
-+ ** Get a VDBE for the given parser context.  Create a new one if necessary.
-+ ** If an error occurs, return NULL and leave a message in pParse.
-+ */
-+-static SQLITE_NOINLINE Vdbe *allocVdbe(Parse *pParse){
-+-  Vdbe *v = pParse->pVdbe = sqlite3VdbeCreate(pParse);
-+-  if( v ) sqlite3VdbeAddOp2(v, OP_Init, 0, 1);
-++Vdbe *sqlite3GetVdbe(Parse *pParse){
-++  if( pParse->pVdbe ){
-++    return pParse->pVdbe;
-++  }
-+   if( pParse->pToplevel==0
-+    && OptimizationEnabled(pParse->db,SQLITE_FactorOutConst)
-+   ){
-+     pParse->okConstFactor = 1;
-+   }
-+-  return v;
-+-}
-+-Vdbe *sqlite3GetVdbe(Parse *pParse){
-+-  Vdbe *v = pParse->pVdbe;
-+-  return v ? v : allocVdbe(pParse);
-++  return sqlite3VdbeCreate(pParse);
-+ }
-+ 
-+ 
-+@@ -2154,7 +2152,7 @@ static void generateWithRecursiveQuery(
-+   /* Output the single row in Current */
-+   addrCont = sqlite3VdbeMakeLabel(v);
-+   codeOffset(v, regOffset, addrCont);
-+-  selectInnerLoop(pParse, p, p->pEList, iCurrent,
-++  selectInnerLoop(pParse, p, iCurrent,
-+       0, 0, pDest, addrCont, addrBreak);
-+   if( regLimit ){
-+     sqlite3VdbeAddOp2(v, OP_DecrJumpZero, regLimit, addrBreak);
-+@@ -2292,15 +2290,9 @@ static int multiSelect(
-+   db = pParse->db;
-+   pPrior = p->pPrior;
-+   dest = *pDest;
-+-  if( pPrior->pOrderBy ){
-+-    sqlite3ErrorMsg(pParse,"ORDER BY clause should come after %s not before",
-+-      selectOpName(p->op));
-+-    rc = 1;
-+-    goto multi_select_end;
-+-  }
-+-  if( pPrior->pLimit ){
-+-    sqlite3ErrorMsg(pParse,"LIMIT clause should come after %s not before",
-+-      selectOpName(p->op));
-++  if( pPrior->pOrderBy || pPrior->pLimit ){
-++    sqlite3ErrorMsg(pParse,"%s clause should come after %s not before",
-++      pPrior->pOrderBy!=0 ? "ORDER BY" : "LIMIT", selectOpName(p->op));
-+     rc = 1;
-+     goto multi_select_end;
-+   }
-+@@ -2478,7 +2470,7 @@ static int multiSelect(
-+         computeLimitRegisters(pParse, p, iBreak);
-+         sqlite3VdbeAddOp2(v, OP_Rewind, unionTab, iBreak); VdbeCoverage(v);
-+         iStart = sqlite3VdbeCurrentAddr(v);
-+-        selectInnerLoop(pParse, p, p->pEList, unionTab,
-++        selectInnerLoop(pParse, p, unionTab,
-+                         0, 0, &dest, iCont, iBreak);
-+         sqlite3VdbeResolveLabel(v, iCont);
-+         sqlite3VdbeAddOp2(v, OP_Next, unionTab, iStart); VdbeCoverage(v);
-+@@ -2556,7 +2548,7 @@ static int multiSelect(
-+       iStart = sqlite3VdbeAddOp2(v, OP_RowData, tab1, r1);
-+       sqlite3VdbeAddOp4Int(v, OP_NotFound, tab2, iCont, r1, 0); VdbeCoverage(v);
-+       sqlite3ReleaseTempReg(pParse, r1);
-+-      selectInnerLoop(pParse, p, p->pEList, tab1,
-++      selectInnerLoop(pParse, p, tab1,
-+                       0, 0, &dest, iCont, iBreak);
-+       sqlite3VdbeResolveLabel(v, iCont);
-+       sqlite3VdbeAddOp2(v, OP_Next, tab1, iStart); VdbeCoverage(v);
-+@@ -3216,7 +3208,9 @@ static Expr *substExpr(
-+   Expr *pExpr            /* Expr in which substitution occurs */
-+ ){
-+   if( pExpr==0 ) return 0;
-+-  if( ExprHasProperty(pExpr, EP_FromJoin) && pExpr->iRightJoinTable==pSubst->iTable ){
-++  if( ExprHasProperty(pExpr, EP_FromJoin)
-++   && pExpr->iRightJoinTable==pSubst->iTable
-++  ){
-+     pExpr->iRightJoinTable = pSubst->iNewTable;
-+   }
-+   if( pExpr->op==TK_COLUMN && pExpr->iTable==pSubst->iTable ){
-+@@ -3329,68 +3323,74 @@ static void substSelect(
-+ ** exist on the table t1, a complete scan of the data might be
-+ ** avoided.
-+ **
-+-** Flattening is only attempted if all of the following are true:
-++** Flattening is subject to the following constraints:
-+ **
-+-**   (1)  The subquery and the outer query do not both use aggregates.
-++**  (**)  We no longer attempt to flatten aggregate subqueries. Was:
-++**        The subquery and the outer query cannot both be aggregates.
-+ **
-+-**   (2)  The subquery is not an aggregate or (2a) the outer query is not a join
-+-**        and (2b) the outer query does not use subqueries other than the one
-+-**        FROM-clause subquery that is a candidate for flattening.  (2b is
-+-**        due to ticket [2f7170d73bf9abf80] from 2015-02-09.)
-++**  (**)  We no longer attempt to flatten aggregate subqueries. Was:
-++**        (2) If the subquery is an aggregate then
-++**        (2a) the outer query must not be a join and
-++**        (2b) the outer query must not use subqueries
-++**             other than the one FROM-clause subquery that is a candidate
-++**             for flattening.  (This is due to ticket [2f7170d73bf9abf80]
-++**             from 2015-02-09.)
-+ **
-+-**   (3)  The subquery is not the right operand of a LEFT JOIN
-+-**        or (a) the subquery is not itself a join and (b) the FROM clause
-+-**        of the subquery does not contain a virtual table and (c) the
-+-**        outer query is not an aggregate.
-++**   (3)  If the subquery is the right operand of a LEFT JOIN then
-++**        (3a) the subquery may not be a join and
-++**        (3b) the FROM clause of the subquery may not contain a virtual
-++**             table and
-++**        (3c) the outer query may not be an aggregate.
-+ **
-+-**   (4)  The subquery is not DISTINCT.
-++**   (4)  The subquery can not be DISTINCT.
-+ **
-+ **  (**)  At one point restrictions (4) and (5) defined a subset of DISTINCT
-+ **        sub-queries that were excluded from this optimization. Restriction
-+ **        (4) has since been expanded to exclude all DISTINCT subqueries.
-+ **
-+-**   (6)  The subquery does not use aggregates or the outer query is not
-+-**        DISTINCT.
-++**  (**)  We no longer attempt to flatten aggregate subqueries.  Was:
-++**        If the subquery is aggregate, the outer query may not be DISTINCT.
-+ **
-+-**   (7)  The subquery has a FROM clause.  TODO:  For subqueries without
-++**   (7)  The subquery must have a FROM clause.  TODO:  For subqueries without
-+ **        A FROM clause, consider adding a FROM clause with the special
-+ **        table sqlite_once that consists of a single row containing a
-+ **        single NULL.
-+ **
-+-**   (8)  The subquery does not use LIMIT or the outer query is not a join.
-++**   (8)  If the subquery uses LIMIT then the outer query may not be a join.
-+ **
-+-**   (9)  The subquery does not use LIMIT or the outer query does not use
-+-**        aggregates.
-++**   (9)  If the subquery uses LIMIT then the outer query may not be aggregate.
-+ **
-+ **  (**)  Restriction (10) was removed from the code on 2005-02-05 but we
-+ **        accidently carried the comment forward until 2014-09-15.  Original
-+-**        text: "The subquery does not use aggregates or the outer query
-+-**        does not use LIMIT."
-++**        constraint: "If the subquery is aggregate then the outer query
-++**        may not use LIMIT."
-+ **
-+-**  (11)  The subquery and the outer query do not both have ORDER BY clauses.
-++**  (11)  The subquery and the outer query may not both have ORDER BY clauses.
-+ **
-+ **  (**)  Not implemented.  Subsumed into restriction (3).  Was previously
-+ **        a separate restriction deriving from ticket #350.
-+ **
-+-**  (13)  The subquery and outer query do not both use LIMIT.
-++**  (13)  The subquery and outer query may not both use LIMIT.
-+ **
-+-**  (14)  The subquery does not use OFFSET.
-++**  (14)  The subquery may not use OFFSET.
-+ **
-+-**  (15)  The outer query is not part of a compound select or the
-+-**        subquery does not have a LIMIT clause.
-++**  (15)  If the outer query is part of a compound select, then the
-++**        subquery may not use LIMIT.
-+ **        (See ticket #2339 and ticket [02a8e81d44]).
-+ **
-+-**  (16)  The outer query is not an aggregate or the subquery does
-+-**        not contain ORDER BY.  (Ticket #2942)  This used to not matter
-++**  (16)  If the outer query is aggregate, then the subquery may not
-++**        use ORDER BY.  (Ticket #2942)  This used to not matter
-+ **        until we introduced the group_concat() function.
-+ **
-+-**  (17)  The sub-query is not a compound select, or it is a UNION ALL
-+-**        compound clause made up entirely of non-aggregate queries, and
-+-**        the parent query:
-+-**
-+-**          * is not itself part of a compound select,
-+-**          * is not an aggregate or DISTINCT query, and
-+-**          * is not a join
-++**  (17)  If the subquery is a compound select, then
-++**        (17a) all compound operators must be a UNION ALL, and
-++**        (17b) no terms within the subquery compound may be aggregate
-++**              or DISTINCT, and
-++**        (17c) every term within the subquery compound must have a FROM clause
-++**        (17d) the outer query may not be
-++**              (17d1) aggregate, or
-++**              (17d2) DISTINCT, or
-++**              (17d3) a join.
-+ **
-+ **        The parent and sub-query may contain WHERE clauses. Subject to
-+ **        rules (11), (13) and (14), they may also contain ORDER BY,
-+@@ -3406,29 +3406,32 @@ static void substSelect(
-+ **        syntax error and return a detailed message.
-+ **
-+ **  (18)  If the sub-query is a compound select, then all terms of the
-+-**        ORDER by clause of the parent must be simple references to
-++**        ORDER BY clause of the parent must be simple references to
-+ **        columns of the sub-query.
-+ **
-+-**  (19)  The subquery does not use LIMIT or the outer query does not
-++**  (19)  If the subquery uses LIMIT then the outer query may not
-+ **        have a WHERE clause.
-+ **
-+-**  (20)  If the sub-query is a compound select, then it must not use
-+-**        an ORDER BY clause.  Ticket #3773.  We could relax this constraint
-+-**        somewhat by saying that the terms of the ORDER BY clause must
-+-**        appear as unmodified result columns in the outer query.  But we
-+-**        have other optimizations in mind to deal with that case.
-++**  (**)  Subsumed into (17d3).  Was: If the sub-query is a compound select,
-++**        then it must not use an ORDER BY clause - Ticket #3773.  Because
-++**        of (17d3), then only way to have a compound subquery is if it is
-++**        the only term in the FROM clause of the outer query.  But if the
-++**        only term in the FROM clause has an ORDER BY, then it will be
-++**        implemented as a co-routine and the flattener will never be called.
-+ **
-+-**  (21)  The subquery does not use LIMIT or the outer query is not
-++**  (21)  If the subquery uses LIMIT then the outer query may not be
-+ **        DISTINCT.  (See ticket [752e1646fc]).
-+ **
-+-**  (22)  The subquery is not a recursive CTE.
-++**  (22)  The subquery may not be a recursive CTE.
-+ **
-+-**  (23)  The parent is not a recursive CTE, or the sub-query is not a
-+-**        compound query. This restriction is because transforming the
-++**  (**)  Subsumed into restriction (17d3).  Was: If the outer query is
-++**        a recursive CTE, then the sub-query may not be a compound query.
-++**        This restriction is because transforming the
-+ **        parent to a compound query confuses the code that handles
-+ **        recursive queries in multiSelect().
-+ **
-+-**  (24)  The subquery is not an aggregate that uses the built-in min() or
-++**  (**)  We no longer attempt to flatten aggregate subqueries.  Was:
-++**        The subquery may not be an aggregate that uses the built-in min() or
-+ **        or max() functions.  (Without this restriction, a query like:
-+ **        "SELECT x FROM (SELECT max(y), x FROM t1)" would not necessarily
-+ **        return the value X for which Y was maximal.)
-+@@ -3436,7 +3439,7 @@ static void substSelect(
-+ **
-+ ** In this routine, the "p" parameter is a pointer to the outer query.
-+ ** The subquery is p->pSrc->a[iFrom].  isAgg is true if the outer query
-+-** uses aggregates and subqueryIsAgg is true if the subquery uses aggregates.
-++** uses aggregates.
-+ **
-+ ** If flattening is not attempted, this routine is a no-op and returns 0.
-+ ** If flattening is attempted this routine returns 1.
-+@@ -3448,8 +3451,7 @@ static int flattenSubquery(
-+   Parse *pParse,       /* Parsing context */
-+   Select *p,           /* The parent or outer SELECT statement */
-+   int iFrom,           /* Index in p->pSrc->a[] of the inner subquery */
-+-  int isAgg,           /* True if outer SELECT uses aggregate functions */
-+-  int subqueryIsAgg    /* True if the subquery uses aggregate functions */
-++  int isAgg            /* True if outer SELECT uses aggregate functions */
-+ ){
-+   const char *zSavedAuthContext = pParse->zAuthContext;
-+   Select *pParent;    /* Current UNION ALL term of the other query */
-+@@ -3469,7 +3471,7 @@ static int flattenSubquery(
-+   /* Check to see if flattening is permitted.  Return 0 if not.
-+   */
-+   assert( p!=0 );
-+-  assert( p->pPrior==0 );  /* Unable to flatten compound queries */
-++  assert( p->pPrior==0 );
-+   if( OptimizationDisabled(db, SQLITE_QueryFlattener) ) return 0;
-+   pSrc = p->pSrc;
-+   assert( pSrc && iFrom>=0 && iFrom<pSrc->nSrc );
-+@@ -3477,16 +3479,6 @@ static int flattenSubquery(
-+   iParent = pSubitem->iCursor;
-+   pSub = pSubitem->pSelect;
-+   assert( pSub!=0 );
-+-  if( subqueryIsAgg ){
-+-    if( isAgg ) return 0;                                /* Restriction (1)   */
-+-    if( pSrc->nSrc>1 ) return 0;                         /* Restriction (2a)  */
-+-    if( (p->pWhere && ExprHasProperty(p->pWhere,EP_Subquery))
-+-     || (sqlite3ExprListFlags(p->pEList) & EP_Subquery)!=0
-+-     || (sqlite3ExprListFlags(p->pOrderBy) & EP_Subquery)!=0
-+-    ){
-+-      return 0;                                          /* Restriction (2b)  */
-+-    }
-+-  }
-+ 
-+   pSubSrc = pSub->pSrc;
-+   assert( pSubSrc );
-+@@ -3501,13 +3493,10 @@ static int flattenSubquery(
-+     return 0;                                            /* Restriction (15) */
-+   }
-+   if( pSubSrc->nSrc==0 ) return 0;                       /* Restriction (7)  */
-+-  if( pSub->selFlags & SF_Distinct ) return 0;           /* Restriction (5)  */
-++  if( pSub->selFlags & SF_Distinct ) return 0;           /* Restriction (4)  */
-+   if( pSub->pLimit && (pSrc->nSrc>1 || isAgg) ){
-+      return 0;         /* Restrictions (8)(9) */
-+   }
-+-  if( (p->selFlags & SF_Distinct)!=0 && subqueryIsAgg ){
-+-     return 0;         /* Restriction (6)  */
-+-  }
-+   if( p->pOrderBy && pSub->pOrderBy ){
-+      return 0;                                           /* Restriction (11) */
-+   }
-+@@ -3516,18 +3505,14 @@ static int flattenSubquery(
-+   if( pSub->pLimit && (p->selFlags & SF_Distinct)!=0 ){
-+      return 0;         /* Restriction (21) */
-+   }
-+-  testcase( pSub->selFlags & SF_Recursive );
-+-  testcase( pSub->selFlags & SF_MinMaxAgg );
-+-  if( pSub->selFlags & (SF_Recursive|SF_MinMaxAgg) ){
-+-    return 0; /* Restrictions (22) and (24) */
-+-  }
-+-  if( (p->selFlags & SF_Recursive) && pSub->pPrior ){
-+-    return 0; /* Restriction (23) */
-++  if( pSub->selFlags & (SF_Recursive) ){
-++    return 0; /* Restrictions (22) */
-+   }
-+ 
-+   /*
-+   ** If the subquery is the right operand of a LEFT JOIN, then the
-+-  ** subquery may not be a join itself.  Example of why this is not allowed:
-++  ** subquery may not be a join itself (3a). Example of why this is not
-++  ** allowed:
-+   **
-+   **         t1 LEFT OUTER JOIN (t2 JOIN t3)
-+   **
-+@@ -3538,54 +3523,53 @@ static int flattenSubquery(
-+   ** which is not at all the same thing.
-+   **
-+   ** If the subquery is the right operand of a LEFT JOIN, then the outer
-+-  ** query cannot be an aggregate.  This is an artifact of the way aggregates
-+-  ** are processed - there is no mechanism to determine if the LEFT JOIN
-+-  ** table should be all-NULL.
-++  ** query cannot be an aggregate. (3c)  This is an artifact of the way
-++  ** aggregates are processed - there is no mechanism to determine if
-++  ** the LEFT JOIN table should be all-NULL.
-+   **
-+   ** See also tickets #306, #350, and #3300.
-+   */
-+   if( (pSubitem->fg.jointype & JT_OUTER)!=0 ){
-+     isLeftJoin = 1;
-+     if( pSubSrc->nSrc>1 || isAgg || IsVirtual(pSubSrc->a[0].pTab) ){
-+-      return 0; /* Restriction (3) */
-++      /*  (3a)             (3c)     (3b) */
-++      return 0;
-+     }
-+   }
-+ #ifdef SQLITE_EXTRA_IFNULLROW
-+   else if( iFrom>0 && !isAgg ){
-+     /* Setting isLeftJoin to -1 causes OP_IfNullRow opcodes to be generated for
-+-    ** every reference to any result column from subquery in a join, even though
-+-    ** they are not necessary.  This will stress-test the OP_IfNullRow opcode. */
-++    ** every reference to any result column from subquery in a join, even
-++    ** though they are not necessary.  This will stress-test the OP_IfNullRow
-++    ** opcode. */
-+     isLeftJoin = -1;
-+   }
-+ #endif
-+ 
-+-  /* Restriction 17: If the sub-query is a compound SELECT, then it must
-++  /* Restriction (17): If the sub-query is a compound SELECT, then it must
-+   ** use only the UNION ALL operator. And none of the simple select queries
-+   ** that make up the compound SELECT are allowed to be aggregate or distinct
-+   ** queries.
-+   */
-+   if( pSub->pPrior ){
-+-    if( pSub->pOrderBy ){
-+-      return 0;  /* Restriction 20 */
-+-    }
-+     if( isAgg || (p->selFlags & SF_Distinct)!=0 || pSrc->nSrc!=1 ){
-+-      return 0;
-++      return 0; /* (17d1), (17d2), or (17d3) */
-+     }
-+     for(pSub1=pSub; pSub1; pSub1=pSub1->pPrior){
-+       testcase( (pSub1->selFlags & (SF_Distinct|SF_Aggregate))==SF_Distinct );
-+       testcase( (pSub1->selFlags & (SF_Distinct|SF_Aggregate))==SF_Aggregate );
-+       assert( pSub->pSrc!=0 );
-+       assert( pSub->pEList->nExpr==pSub1->pEList->nExpr );
-+-      if( (pSub1->selFlags & (SF_Distinct|SF_Aggregate))!=0
-+-       || (pSub1->pPrior && pSub1->op!=TK_ALL)
-+-       || pSub1->pSrc->nSrc<1
-++      if( (pSub1->selFlags & (SF_Distinct|SF_Aggregate))!=0    /* (17b) */
-++       || (pSub1->pPrior && pSub1->op!=TK_ALL)                 /* (17a) */
-++       || pSub1->pSrc->nSrc<1                                  /* (17c) */
-+       ){
-+         return 0;
-+       }
-+       testcase( pSub1->pSrc->nSrc>1 );
-+     }
-+ 
-+-    /* Restriction 18. */
-++    /* Restriction (18). */
-+     if( p->pOrderBy ){
-+       int ii;
-+       for(ii=0; ii<p->pOrderBy->nExpr; ii++){
-+@@ -3594,6 +3578,23 @@ static int flattenSubquery(
-+     }
-+   }
-+ 
-++  /* Ex-restriction (23):
-++  ** The only way that the recursive part of a CTE can contain a compound
-++  ** subquery is for the subquery to be one term of a join.  But if the
-++  ** subquery is a join, then the flattening has already been stopped by
-++  ** restriction (17d3)
-++  */
-++  assert( (p->selFlags & SF_Recursive)==0 || pSub->pPrior==0 );
-++
-++  /* Ex-restriction (20):
-++  ** A compound subquery must be the only term in the FROM clause of the
-++  ** outer query by restriction (17d3).  But if that term also has an
-++  ** ORDER BY clause, then the subquery will be implemented by co-routine
-++  ** and so the flattener will never be invoked.  Hence, it is not possible
-++  ** for the subquery to be a compound and have an ORDER BY clause.
-++  */
-++  assert( pSub->pPrior==0 || pSub->pOrderBy==0 );
-++
-+   /***** If we reach this point, flattening is permitted. *****/
-+   SELECTTRACE(1,pParse,p,("flatten %s.%p from term %d\n",
-+                    pSub->zSelName, pSub, iFrom));
-+@@ -3814,18 +3815,7 @@ static int flattenSubquery(
-+     if( isLeftJoin>0 ){
-+       setJoinExpr(pWhere, iNewParent);
-+     }
-+-    if( subqueryIsAgg ){
-+-      assert( pParent->pHaving==0 );
-+-      pParent->pHaving = pParent->pWhere;
-+-      pParent->pWhere = pWhere;
-+-      pParent->pHaving = sqlite3ExprAnd(db,
-+-          sqlite3ExprDup(db, pSub->pHaving, 0), pParent->pHaving
-+-      );
-+-      assert( pParent->pGroupBy==0 );
-+-      pParent->pGroupBy = sqlite3ExprListDup(db, pSub->pGroupBy, 0);
-+-    }else{
-+-      pParent->pWhere = sqlite3ExprAnd(db, pWhere, pParent->pWhere);
-+-    }
-++    pParent->pWhere = sqlite3ExprAnd(db, pWhere, pParent->pWhere);
-+     if( db->mallocFailed==0 ){
-+       SubstContext x;
-+       x.pParse = pParse;
-+@@ -3888,9 +3878,13 @@ static int flattenSubquery(
-+ **
-+ ** Do not attempt this optimization if:
-+ **
-+-**   (1) The inner query is an aggregate.  (In that case, we'd really want
-+-**       to copy the outer WHERE-clause terms onto the HAVING clause of the
-+-**       inner query.  But they probably won't help there so do not bother.)
-++**   (1) (** This restriction was removed on 2017-09-29.  We used to
-++**           disallow this optimization for aggregate subqueries, but now
-++**           it is allowed by putting the extra terms on the HAVING clause.
-++**           The added HAVING clause is pointless if the subquery lacks
-++**           a GROUP BY clause.  But such a HAVING clause is also harmless
-++**           so there does not appear to be any reason to add extra logic
-++**           to suppress it. **)
-+ **
-+ **   (2) The inner query is the recursive part of a common table expression.
-+ **
-+@@ -3915,16 +3909,22 @@ static int pushDownWhereTerms(
-+ ){
-+   Expr *pNew;
-+   int nChng = 0;
-+-  Select *pX;           /* For looping over compound SELECTs in pSubq */
-+   if( pWhere==0 ) return 0;
-+-  for(pX=pSubq; pX; pX=pX->pPrior){
-+-    if( (pX->selFlags & (SF_Aggregate|SF_Recursive))!=0 ){
-+-      testcase( pX->selFlags & SF_Aggregate );
-+-      testcase( pX->selFlags & SF_Recursive );
-+-      testcase( pX!=pSubq );
-+-      return 0; /* restrictions (1) and (2) */
-++  if( pSubq->selFlags & SF_Recursive ) return 0;  /* restriction (2) */
-++
-++#ifdef SQLITE_DEBUG
-++  /* Only the first term of a compound can have a WITH clause.  But make
-++  ** sure no other terms are marked SF_Recursive in case something changes
-++  ** in the future.
-++  */
-++  {
-++    Select *pX;
-++    for(pX=pSubq; pX; pX=pX->pPrior){
-++      assert( (pX->selFlags & (SF_Recursive))==0 );
-+     }
-+   }
-++#endif
-++
-+   if( pSubq->pLimit!=0 ){
-+     return 0; /* restriction (3) */
-+   }
-+@@ -3932,7 +3932,7 @@ static int pushDownWhereTerms(
-+     nChng += pushDownWhereTerms(pParse, pSubq, pWhere->pRight, iCursor);
-+     pWhere = pWhere->pLeft;
-+   }
-+-  if( ExprHasProperty(pWhere,EP_FromJoin) ) return 0; /* restriction 5 */
-++  if( ExprHasProperty(pWhere,EP_FromJoin) ) return 0; /* restriction (5) */
-+   if( sqlite3ExprIsTableConstant(pWhere, iCursor) ){
-+     nChng++;
-+     while( pSubq ){
-+@@ -3944,7 +3944,11 @@ static int pushDownWhereTerms(
-+       x.isLeftJoin = 0;
-+       x.pEList = pSubq->pEList;
-+       pNew = substExpr(&x, pNew);
-+-      pSubq->pWhere = sqlite3ExprAnd(pParse->db, pSubq->pWhere, pNew);
-++      if( pSubq->selFlags & SF_Aggregate ){
-++        pSubq->pHaving = sqlite3ExprAnd(pParse->db, pSubq->pHaving, pNew);
-++      }else{
-++        pSubq->pWhere = sqlite3ExprAnd(pParse->db, pSubq->pWhere, pNew);
-++      }
-+       pSubq = pSubq->pPrior;
-+     }
-+   }
-+@@ -4272,7 +4276,8 @@ static int withExpand(
-+       );
-+       return SQLITE_ERROR;
-+     }
-+-    assert( pTab->nTabRef==1 || ((pSel->selFlags&SF_Recursive) && pTab->nTabRef==2 ));
-++    assert( pTab->nTabRef==1 ||
-++            ((pSel->selFlags&SF_Recursive) && pTab->nTabRef==2 ));
-+ 
-+     pCte->zCteErr = "circular reference: %s";
-+     pSavedWith = pParse->pWith;
-+@@ -4329,7 +4334,7 @@ static int withExpand(
-+ */
-+ static void selectPopWith(Walker *pWalker, Select *p){
-+   Parse *pParse = pWalker->pParse;
-+-  if( pParse->pWith && p->pPrior==0 ){
-++  if( OK_IF_ALWAYS_TRUE(pParse->pWith) && p->pPrior==0 ){
-+     With *pWith = findRightmost(p)->pWith;
-+     if( pWith!=0 ){
-+       assert( pParse->pWith==pWith );
-+@@ -4384,7 +4389,7 @@ static int selectExpander(Walker *pWalker, Select *p){
-+   }
-+   pTabList = p->pSrc;
-+   pEList = p->pEList;
-+-  if( p->pWith ){
-++  if( OK_IF_ALWAYS_TRUE(p->pWith) ){
-+     sqlite3WithPush(pParse, p->pWith, 0);
-+   }
-+ 
-+@@ -4416,7 +4421,11 @@ static int selectExpander(Walker *pWalker, Select *p){
-+       pFrom->pTab = pTab = sqlite3DbMallocZero(db, sizeof(Table));
-+       if( pTab==0 ) return WRC_Abort;
-+       pTab->nTabRef = 1;
-+-      pTab->zName = sqlite3MPrintf(db, "sqlite_sq_%p", (void*)pTab);
-++      if( pFrom->zAlias ){
-++        pTab->zName = sqlite3DbStrDup(db, pFrom->zAlias);
-++      }else{
-++        pTab->zName = sqlite3MPrintf(db, "subquery_%p", (void*)pTab);
-++      }
-+       while( pSel->pPrior ){ pSel = pSel->pPrior; }
-+       sqlite3ColumnsFromExprList(pParse, pSel->pEList,&pTab->nCol,&pTab->aCol);
-+       pTab->iPKey = -1;
-+@@ -4626,12 +4635,10 @@ static int selectExpander(Walker *pWalker, Select *p){
-+     sqlite3ExprListDelete(db, pEList);
-+     p->pEList = pNew;
-+   }
-+-#if SQLITE_MAX_COLUMN
-+   if( p->pEList && p->pEList->nExpr>db->aLimit[SQLITE_LIMIT_COLUMN] ){
-+     sqlite3ErrorMsg(pParse, "too many columns in result set");
-+     return WRC_Abort;
-+   }
-+-#endif
-+   return WRC_Continue;
-+ }
-+ 
-+@@ -4685,7 +4692,7 @@ static void sqlite3SelectExpand(Parse *pParse, Select *pSelect){
-+   Walker w;
-+   w.xExprCallback = sqlite3ExprWalkNoop;
-+   w.pParse = pParse;
-+-  if( pParse->hasCompound ){
-++  if( OK_IF_ALWAYS_TRUE(pParse->hasCompound) ){
-+     w.xSelectCallback = convertCompoundSelectToSubquery;
-+     w.xSelectCallback2 = 0;
-+     sqlite3WalkSelect(&w, pSelect);
-+@@ -4773,15 +4780,13 @@ void sqlite3SelectPrep(
-+   Select *p,             /* The SELECT statement being coded. */
-+   NameContext *pOuterNC  /* Name context for container */
-+ ){
-+-  sqlite3 *db;
-+-  if( NEVER(p==0) ) return;
-+-  db = pParse->db;
-+-  if( db->mallocFailed ) return;
-++  assert( p!=0 || pParse->db->mallocFailed );
-++  if( pParse->db->mallocFailed ) return;
-+   if( p->selFlags & SF_HasTypeInfo ) return;
-+   sqlite3SelectExpand(pParse, p);
-+-  if( pParse->nErr || db->mallocFailed ) return;
-++  if( pParse->nErr || pParse->db->mallocFailed ) return;
-+   sqlite3ResolveSelectNames(pParse, p, pOuterNC);
-+-  if( pParse->nErr || db->mallocFailed ) return;
-++  if( pParse->nErr || pParse->db->mallocFailed ) return;
-+   sqlite3SelectAddTypeInfo(pParse, p);
-+ }
-+ 
-+@@ -5076,24 +5081,24 @@ static int countOfViewOptimization(Parse *pParse, Select *p){
-+   Expr *pExpr;
-+   Expr *pCount;
-+   sqlite3 *db;
-+-  if( (p->selFlags & SF_Aggregate)==0 ) return 0;   /* This is an aggregate query */
-++  if( (p->selFlags & SF_Aggregate)==0 ) return 0;   /* This is an aggregate */
-+   if( p->pEList->nExpr!=1 ) return 0;               /* Single result column */
-+   pExpr = p->pEList->a[0].pExpr;
-+   if( pExpr->op!=TK_AGG_FUNCTION ) return 0;        /* Result is an aggregate */
-+-  if( sqlite3_stricmp(pExpr->u.zToken,"count") ) return 0;  /* Must be count() */
-++  if( sqlite3_stricmp(pExpr->u.zToken,"count") ) return 0;  /* Is count() */
-+   if( pExpr->x.pList!=0 ) return 0;                 /* Must be count(*) */
-+-  if( p->pSrc->nSrc!=1 ) return 0;                  /* One table in the FROM clause */
-++  if( p->pSrc->nSrc!=1 ) return 0;                  /* One table in FROM  */
-+   pSub = p->pSrc->a[0].pSelect;
-+   if( pSub==0 ) return 0;                           /* The FROM is a subquery */
-+-  if( pSub->pPrior==0 ) return 0;                   /* Must be a compound subquery */
-++  if( pSub->pPrior==0 ) return 0;                   /* Must be a compound ry */
-+   do{
-+     if( pSub->op!=TK_ALL && pSub->pPrior ) return 0;  /* Must be UNION ALL */
-+     if( pSub->pWhere ) return 0;                      /* No WHERE clause */
-+     if( pSub->selFlags & SF_Aggregate ) return 0;     /* Not an aggregate */
-+-    pSub = pSub->pPrior;                              /* Repeat over compound terms */
-++    pSub = pSub->pPrior;                              /* Repeat over compound */
-+   }while( pSub );
-+ 
-+-  /* If we reach this point, that means it is OK to perform the transformation */
-++  /* If we reach this point then it is OK to perform the transformation */
-+ 
-+   db = pParse->db;
-+   pCount = pExpr;
-+@@ -5225,7 +5230,6 @@ int sqlite3Select(
-+   for(i=0; !p->pPrior && i<pTabList->nSrc; i++){
-+     struct SrcList_item *pItem = &pTabList->a[i];
-+     Select *pSub = pItem->pSelect;
-+-    int isAggSub;
-+     Table *pTab = pItem->pTab;
-+     if( pSub==0 ) continue;
-+ 
-+@@ -5237,13 +5241,36 @@ int sqlite3Select(
-+       goto select_end;
-+     }
-+ 
-+-    isAggSub = (pSub->selFlags & SF_Aggregate)!=0;
-+-    if( flattenSubquery(pParse, p, i, isAgg, isAggSub) ){
-++    /* Do not try to flatten an aggregate subquery.
-++    **
-++    ** Flattening an aggregate subquery is only possible if the outer query
-++    ** is not a join.  But if the outer query is not a join, then the subquery
-++    ** will be implemented as a co-routine and there is no advantage to
-++    ** flattening in that case.
-++    */
-++    if( (pSub->selFlags & SF_Aggregate)!=0 ) continue;
-++    assert( pSub->pGroupBy==0 );
-++
-++    /* If the subquery contains an ORDER BY clause and if
-++    ** it will be implemented as a co-routine, then do not flatten.  This
-++    ** restriction allows SQL constructs like this:
-++    **
-++    **  SELECT expensive_function(x)
-++    **    FROM (SELECT x FROM tab ORDER BY y LIMIT 10);
-++    **
-++    ** The expensive_function() is only computed on the 10 rows that
-++    ** are output, rather than every row of the table.
-++    */
-++    if( pSub->pOrderBy!=0
-++     && i==0
-++     && (pTabList->nSrc==1
-++         || (pTabList->a[1].fg.jointype&(JT_LEFT|JT_CROSS))!=0)
-++    ){
-++      continue;
-++    }
-++
-++    if( flattenSubquery(pParse, p, i, isAgg) ){
-+       /* This subquery can be absorbed into its parent. */
-+-      if( isAggSub ){
-+-        isAgg = 1;
-+-        p->selFlags |= SF_Aggregate;
-+-      }
-+       i = -1;
-+     }
-+     pTabList = p->pSrc;
-+@@ -5282,10 +5309,14 @@ int sqlite3Select(
-+     struct SrcList_item *pItem = &pTabList->a[i];
-+     SelectDest dest;
-+     Select *pSub;
-++#if !defined(SQLITE_OMIT_SUBQUERY) || !defined(SQLITE_OMIT_VIEW)
-++    const char *zSavedAuthContext;
-++#endif
-+ 
-+-    /* Issue SQLITE_READ authorizations with a fake column name for any tables that
-+-    ** are referenced but from which no values are extracted. Examples of where these
-+-    ** kinds of null SQLITE_READ authorizations would occur:
-++    /* Issue SQLITE_READ authorizations with a fake column name for any
-++    ** tables that are referenced but from which no values are extracted.
-++    ** Examples of where these kinds of null SQLITE_READ authorizations
-++    ** would occur:
-+     **
-+     **     SELECT count(*) FROM t1;   -- SQLITE_READ t1.""
-+     **     SELECT t1.* FROM t1, t2;   -- SQLITE_READ t2.""
-+@@ -5293,10 +5324,10 @@ int sqlite3Select(
-+     ** The fake column name is an empty string.  It is possible for a table to
-+     ** have a column named by the empty string, in which case there is no way to
-+     ** distinguish between an unreferenced table and an actual reference to the
-+-    ** "" column.  The original design was for the fake column name to be a NULL,
-++    ** "" column. The original design was for the fake column name to be a NULL,
-+     ** which would be unambiguous.  But legacy authorization callbacks might
-+-    ** assume the column name is non-NULL and segfault.  The use of an empty string
-+-    ** for the fake column name seems safer.
-++    ** assume the column name is non-NULL and segfault.  The use of an empty
-++    ** string for the fake column name seems safer.
-+     */
-+     if( pItem->colUsed==0 ){
-+       sqlite3AuthCheck(pParse, SQLITE_READ, pItem->zName, "", pItem->zDatabase);
-+@@ -5348,16 +5379,14 @@ int sqlite3Select(
-+ #endif
-+     }
-+ 
-++    zSavedAuthContext = pParse->zAuthContext;
-++    pParse->zAuthContext = pItem->zName;
-++
-+     /* Generate code to implement the subquery
-+     **
-+-    ** The subquery is implemented as a co-routine if all of these are true:
-+-    **   (1)  The subquery is guaranteed to be the outer loop (so that it
-+-    **        does not need to be computed more than once)
-+-    **   (2)  The ALL keyword after SELECT is omitted.  (Applications are
-+-    **        allowed to say "SELECT ALL" instead of just "SELECT" to disable
-+-    **        the use of co-routines.)
-+-    **   (3)  Co-routines are not disabled using sqlite3_test_control()
-+-    **        with SQLITE_TESTCTRL_OPTIMIZATIONS.
-++    ** The subquery is implemented as a co-routine if the subquery is
-++    ** guaranteed to be the outer loop (so that it does not need to be
-++    ** computed more than once)
-+     **
-+     ** TODO: Are there other reasons beside (1) to use a co-routine
-+     ** implementation?
-+@@ -5365,13 +5394,12 @@ int sqlite3Select(
-+     if( i==0
-+      && (pTabList->nSrc==1
-+             || (pTabList->a[1].fg.jointype&(JT_LEFT|JT_CROSS))!=0)  /* (1) */
-+-     && (p->selFlags & SF_All)==0                                   /* (2) */
-+-     && OptimizationEnabled(db, SQLITE_SubqCoroutine)               /* (3) */
-+     ){
-+       /* Implement a co-routine that will return a single row of the result
-+       ** set on each invocation.
-+       */
-+       int addrTop = sqlite3VdbeCurrentAddr(v)+1;
-++
-+       pItem->regReturn = ++pParse->nMem;
-+       sqlite3VdbeAddOp3(v, OP_InitCoroutine, pItem->regReturn, 0, addrTop);
-+       VdbeComment((v, "%s", pItem->pTab->zName));
-+@@ -5429,6 +5457,7 @@ int sqlite3Select(
-+     }
-+     if( db->mallocFailed ) goto select_end;
-+     pParse->nHeight -= sqlite3SelectExprHeight(p);
-++    pParse->zAuthContext = zSavedAuthContext;
-+ #endif
-+   }
-+ 
-+@@ -5576,7 +5605,8 @@ int sqlite3Select(
-+     }
-+ 
-+     /* Use the standard inner loop. */
-+-    selectInnerLoop(pParse, p, pEList, -1, &sSort, &sDistinct, pDest,
-++    assert( p->pEList==pEList );
-++    selectInnerLoop(pParse, p, -1, &sSort, &sDistinct, pDest,
-+                     sqlite3WhereContinueLabel(pWInfo),
-+                     sqlite3WhereBreakLabel(pWInfo));
-+ 
-+@@ -5879,7 +5909,7 @@ int sqlite3Select(
-+       sqlite3VdbeAddOp1(v, OP_Return, regOutputRow);
-+       finalizeAggFunctions(pParse, &sAggInfo);
-+       sqlite3ExprIfFalse(pParse, pHaving, addrOutputRow+1, SQLITE_JUMPIFNULL);
-+-      selectInnerLoop(pParse, p, p->pEList, -1, &sSort,
-++      selectInnerLoop(pParse, p, -1, &sSort,
-+                       &sDistinct, pDest,
-+                       addrOutputRow+1, addrSetAbort);
-+       sqlite3VdbeAddOp1(v, OP_Return, regOutputRow);
-+@@ -6023,7 +6053,7 @@ int sqlite3Select(
-+ 
-+       sSort.pOrderBy = 0;
-+       sqlite3ExprIfFalse(pParse, pHaving, addrEnd, SQLITE_JUMPIFNULL);
-+-      selectInnerLoop(pParse, p, p->pEList, -1, 0, 0,
-++      selectInnerLoop(pParse, p, -1, 0, 0,
-+                       pDest, addrEnd, addrEnd);
-+       sqlite3ExprListDelete(db, pDel);
-+     }
-+diff --git a/third_party/sqlite/src/src/shell.c b/third_party/sqlite/src/src/shell.c
-+deleted file mode 100644
-+index 33f41f6..0000000
-+--- a/third_party/sqlite/src/src/shell.c
-++++ /dev/null
-+@@ -1,8409 +0,0 @@
-+-/* DO NOT EDIT!
-+-** This file is automatically generated by the script in the canonical
-+-** SQLite source tree at tool/mkshellc.tcl.  That script combines source
-+-** code from various constituent source files of SQLite into this single
-+-** "shell.c" file used to implement the SQLite command-line shell.
-+-**
-+-** Most of the code found below comes from the "src/shell.c.in" file in
-+-** the canonical SQLite source tree.  That main file contains "INCLUDE"
-+-** lines that specify other files in the canonical source tree that are
-+-** inserted to getnerate this complete program source file.
-+-**
-+-** The code from multiple files is combined into this single "shell.c"
-+-** source file to help make the command-line program easier to compile.
-+-**
-+-** To modify this program, get a copy of the canonical SQLite source tree,
-+-** edit the src/shell.c.in" and/or some of the other files that are included
-+-** by "src/shell.c.in", then rerun the tool/mkshellc.tcl script.
-+-*/
-+-/*
-+-** 2001 September 15
-+-**
-+-** The author disclaims copyright to this source code.  In place of
-+-** a legal notice, here is a blessing:
-+-**
-+-**    May you do good and not evil.
-+-**    May you find forgiveness for yourself and forgive others.
-+-**    May you share freely, never taking more than you give.
-+-**
-+-*************************************************************************
-+-** This file contains code to implement the "sqlite" command line
-+-** utility for accessing SQLite databases.
-+-*/
-+-#if (defined(_WIN32) || defined(WIN32)) && !defined(_CRT_SECURE_NO_WARNINGS)
-+-/* This needs to come before any includes for MSVC compiler */
-+-#define _CRT_SECURE_NO_WARNINGS
-+-#endif
-+-
-+-/*
-+-** Warning pragmas copied from msvc.h in the core.
-+-*/
-+-#if defined(_MSC_VER)
-+-#pragma warning(disable : 4054)
-+-#pragma warning(disable : 4055)
-+-#pragma warning(disable : 4100)
-+-#pragma warning(disable : 4127)
-+-#pragma warning(disable : 4130)
-+-#pragma warning(disable : 4152)
-+-#pragma warning(disable : 4189)
-+-#pragma warning(disable : 4206)
-+-#pragma warning(disable : 4210)
-+-#pragma warning(disable : 4232)
-+-#pragma warning(disable : 4244)
-+-#pragma warning(disable : 4305)
-+-#pragma warning(disable : 4306)
-+-#pragma warning(disable : 4702)
-+-#pragma warning(disable : 4706)
-+-#endif /* defined(_MSC_VER) */
-+-
-+-/*
-+-** No support for loadable extensions in VxWorks.
-+-*/
-+-#if (defined(__RTP__) || defined(_WRS_KERNEL)) && !SQLITE_OMIT_LOAD_EXTENSION
-+-# define SQLITE_OMIT_LOAD_EXTENSION 1
-+-#endif
-+-
-+-/*
-+-** Enable large-file support for fopen() and friends on unix.
-+-*/
-+-#ifndef SQLITE_DISABLE_LFS
-+-# define _LARGE_FILE       1
-+-# ifndef _FILE_OFFSET_BITS
-+-#   define _FILE_OFFSET_BITS 64
-+-# endif
-+-# define _LARGEFILE_SOURCE 1
-+-#endif
-+-
-+-#include <stdlib.h>
-+-#include <string.h>
-+-#include <stdio.h>
-+-#include <assert.h>
-+-#include "sqlite3.h"
-+-#if SQLITE_USER_AUTHENTICATION
-+-# include "sqlite3userauth.h"
-+-#endif
-+-#include <ctype.h>
-+-#include <stdarg.h>
-+-
-+-#if !defined(_WIN32) && !defined(WIN32)
-+-# include <signal.h>
-+-# if !defined(__RTP__) && !defined(_WRS_KERNEL)
-+-#  include <pwd.h>
-+-# endif
-+-# include <unistd.h>
-+-# include <sys/types.h>
-+-#endif
-+-
-+-#if HAVE_READLINE
-+-# include <readline/readline.h>
-+-# include <readline/history.h>
-+-#endif
-+-
-+-#if HAVE_EDITLINE
-+-# include <editline/readline.h>
-+-#endif
-+-
-+-#if HAVE_EDITLINE || HAVE_READLINE
-+-
-+-# define shell_add_history(X) add_history(X)
-+-# define shell_read_history(X) read_history(X)
-+-# define shell_write_history(X) write_history(X)
-+-# define shell_stifle_history(X) stifle_history(X)
-+-# define shell_readline(X) readline(X)
-+-
-+-#elif HAVE_LINENOISE
-+-
-+-# include "linenoise.h"
-+-# define shell_add_history(X) linenoiseHistoryAdd(X)
-+-# define shell_read_history(X) linenoiseHistoryLoad(X)
-+-# define shell_write_history(X) linenoiseHistorySave(X)
-+-# define shell_stifle_history(X) linenoiseHistorySetMaxLen(X)
-+-# define shell_readline(X) linenoise(X)
-+-
-+-#else
-+-
-+-# define shell_read_history(X)
-+-# define shell_write_history(X)
-+-# define shell_stifle_history(X)
-+-
-+-# define SHELL_USE_LOCAL_GETLINE 1
-+-#endif
-+-
-+-
-+-#if defined(_WIN32) || defined(WIN32)
-+-# include <io.h>
-+-# include <fcntl.h>
-+-# define isatty(h) _isatty(h)
-+-# ifndef access
-+-#  define access(f,m) _access((f),(m))
-+-# endif
-+-# undef popen
-+-# define popen _popen
-+-# undef pclose
-+-# define pclose _pclose
-+-#else
-+- /* Make sure isatty() has a prototype. */
-+- extern int isatty(int);
-+-
-+-# if !defined(__RTP__) && !defined(_WRS_KERNEL)
-+-  /* popen and pclose are not C89 functions and so are
-+-  ** sometimes omitted from the <stdio.h> header */
-+-   extern FILE *popen(const char*,const char*);
-+-   extern int pclose(FILE*);
-+-# else
-+-#  define SQLITE_OMIT_POPEN 1
-+-# endif
-+-#endif
-+-
-+-#if defined(_WIN32_WCE)
-+-/* Windows CE (arm-wince-mingw32ce-gcc) does not provide isatty()
-+- * thus we always assume that we have a console. That can be
-+- * overridden with the -batch command line option.
-+- */
-+-#define isatty(x) 1
-+-#endif
-+-
-+-/* ctype macros that work with signed characters */
-+-#define IsSpace(X)  isspace((unsigned char)X)
-+-#define IsDigit(X)  isdigit((unsigned char)X)
-+-#define ToLower(X)  (char)tolower((unsigned char)X)
-+-
-+-#if defined(_WIN32) || defined(WIN32)
-+-#include <windows.h>
-+-
-+-/* string conversion routines only needed on Win32 */
-+-extern char *sqlite3_win32_unicode_to_utf8(LPCWSTR);
-+-extern char *sqlite3_win32_mbcs_to_utf8_v2(const char *, int);
-+-extern char *sqlite3_win32_utf8_to_mbcs_v2(const char *, int);
-+-extern LPWSTR sqlite3_win32_utf8_to_unicode(const char *zText);
-+-#endif
-+-
-+-/* On Windows, we normally run with output mode of TEXT so that \n characters
-+-** are automatically translated into \r\n.  However, this behavior needs
-+-** to be disabled in some cases (ex: when generating CSV output and when
-+-** rendering quoted strings that contain \n characters).  The following
-+-** routines take care of that.
-+-*/
-+-#if defined(_WIN32) || defined(WIN32)
-+-static void setBinaryMode(FILE *file, int isOutput){
-+-  if( isOutput ) fflush(file);
-+-  _setmode(_fileno(file), _O_BINARY);
-+-}
-+-static void setTextMode(FILE *file, int isOutput){
-+-  if( isOutput ) fflush(file);
-+-  _setmode(_fileno(file), _O_TEXT);
-+-}
-+-#else
-+-# define setBinaryMode(X,Y)
-+-# define setTextMode(X,Y)
-+-#endif
-+-
-+-
-+-/* True if the timer is enabled */
-+-static int enableTimer = 0;
-+-
-+-/* Return the current wall-clock time */
-+-static sqlite3_int64 timeOfDay(void){
-+-  static sqlite3_vfs *clockVfs = 0;
-+-  sqlite3_int64 t;
-+-  if( clockVfs==0 ) clockVfs = sqlite3_vfs_find(0);
-+-  if( clockVfs->iVersion>=2 && clockVfs->xCurrentTimeInt64!=0 ){
-+-    clockVfs->xCurrentTimeInt64(clockVfs, &t);
-+-  }else{
-+-    double r;
-+-    clockVfs->xCurrentTime(clockVfs, &r);
-+-    t = (sqlite3_int64)(r*86400000.0);
-+-  }
-+-  return t;
-+-}
-+-
-+-#if !defined(_WIN32) && !defined(WIN32) && !defined(__minux)
-+-#include <sys/time.h>
-+-#include <sys/resource.h>
-+-
-+-/* VxWorks does not support getrusage() as far as we can determine */
-+-#if defined(_WRS_KERNEL) || defined(__RTP__)
-+-struct rusage {
-+-  struct timeval ru_utime; /* user CPU time used */
-+-  struct timeval ru_stime; /* system CPU time used */
-+-};
-+-#define getrusage(A,B) memset(B,0,sizeof(*B))
-+-#endif
-+-
-+-/* Saved resource information for the beginning of an operation */
-+-static struct rusage sBegin;  /* CPU time at start */
-+-static sqlite3_int64 iBegin;  /* Wall-clock time at start */
-+-
-+-/*
-+-** Begin timing an operation
-+-*/
-+-static void beginTimer(void){
-+-  if( enableTimer ){
-+-    getrusage(RUSAGE_SELF, &sBegin);
-+-    iBegin = timeOfDay();
-+-  }
-+-}
-+-
-+-/* Return the difference of two time_structs in seconds */
-+-static double timeDiff(struct timeval *pStart, struct timeval *pEnd){
-+-  return (pEnd->tv_usec - pStart->tv_usec)*0.000001 +
-+-         (double)(pEnd->tv_sec - pStart->tv_sec);
-+-}
-+-
-+-/*
-+-** Print the timing results.
-+-*/
-+-static void endTimer(void){
-+-  if( enableTimer ){
-+-    sqlite3_int64 iEnd = timeOfDay();
-+-    struct rusage sEnd;
-+-    getrusage(RUSAGE_SELF, &sEnd);
-+-    printf("Run Time: real %.3f user %f sys %f\n",
-+-       (iEnd - iBegin)*0.001,
-+-       timeDiff(&sBegin.ru_utime, &sEnd.ru_utime),
-+-       timeDiff(&sBegin.ru_stime, &sEnd.ru_stime));
-+-  }
-+-}
-+-
-+-#define BEGIN_TIMER beginTimer()
-+-#define END_TIMER endTimer()
-+-#define HAS_TIMER 1
-+-
-+-#elif (defined(_WIN32) || defined(WIN32))
-+-
-+-/* Saved resource information for the beginning of an operation */
-+-static HANDLE hProcess;
-+-static FILETIME ftKernelBegin;
-+-static FILETIME ftUserBegin;
-+-static sqlite3_int64 ftWallBegin;
-+-typedef BOOL (WINAPI *GETPROCTIMES)(HANDLE, LPFILETIME, LPFILETIME,
-+-                                    LPFILETIME, LPFILETIME);
-+-static GETPROCTIMES getProcessTimesAddr = NULL;
-+-
-+-/*
-+-** Check to see if we have timer support.  Return 1 if necessary
-+-** support found (or found previously).
-+-*/
-+-static int hasTimer(void){
-+-  if( getProcessTimesAddr ){
-+-    return 1;
-+-  } else {
-+-    /* GetProcessTimes() isn't supported in WIN95 and some other Windows
-+-    ** versions. See if the version we are running on has it, and if it
-+-    ** does, save off a pointer to it and the current process handle.
-+-    */
-+-    hProcess = GetCurrentProcess();
-+-    if( hProcess ){
-+-      HINSTANCE hinstLib = LoadLibrary(TEXT("Kernel32.dll"));
-+-      if( NULL != hinstLib ){
-+-        getProcessTimesAddr =
-+-            (GETPROCTIMES) GetProcAddress(hinstLib, "GetProcessTimes");
-+-        if( NULL != getProcessTimesAddr ){
-+-          return 1;
-+-        }
-+-        FreeLibrary(hinstLib);
-+-      }
-+-    }
-+-  }
-+-  return 0;
-+-}
-+-
-+-/*
-+-** Begin timing an operation
-+-*/
-+-static void beginTimer(void){
-+-  if( enableTimer && getProcessTimesAddr ){
-+-    FILETIME ftCreation, ftExit;
-+-    getProcessTimesAddr(hProcess,&ftCreation,&ftExit,
-+-                        &ftKernelBegin,&ftUserBegin);
-+-    ftWallBegin = timeOfDay();
-+-  }
-+-}
-+-
-+-/* Return the difference of two FILETIME structs in seconds */
-+-static double timeDiff(FILETIME *pStart, FILETIME *pEnd){
-+-  sqlite_int64 i64Start = *((sqlite_int64 *) pStart);
-+-  sqlite_int64 i64End = *((sqlite_int64 *) pEnd);
-+-  return (double) ((i64End - i64Start) / 10000000.0);
-+-}
-+-
-+-/*
-+-** Print the timing results.
-+-*/
-+-static void endTimer(void){
-+-  if( enableTimer && getProcessTimesAddr){
-+-    FILETIME ftCreation, ftExit, ftKernelEnd, ftUserEnd;
-+-    sqlite3_int64 ftWallEnd = timeOfDay();
-+-    getProcessTimesAddr(hProcess,&ftCreation,&ftExit,&ftKernelEnd,&ftUserEnd);
-+-    printf("Run Time: real %.3f user %f sys %f\n",
-+-       (ftWallEnd - ftWallBegin)*0.001,
-+-       timeDiff(&ftUserBegin, &ftUserEnd),
-+-       timeDiff(&ftKernelBegin, &ftKernelEnd));
-+-  }
-+-}
-+-
-+-#define BEGIN_TIMER beginTimer()
-+-#define END_TIMER endTimer()
-+-#define HAS_TIMER hasTimer()
-+-
-+-#else
-+-#define BEGIN_TIMER
-+-#define END_TIMER
-+-#define HAS_TIMER 0
-+-#endif
-+-
-+-/*
-+-** Used to prevent warnings about unused parameters
-+-*/
-+-#define UNUSED_PARAMETER(x) (void)(x)
-+-
-+-/*
-+-** If the following flag is set, then command execution stops
-+-** at an error if we are not interactive.
-+-*/
-+-static int bail_on_error = 0;
-+-
-+-/*
-+-** Threat stdin as an interactive input if the following variable
-+-** is true.  Otherwise, assume stdin is connected to a file or pipe.
-+-*/
-+-static int stdin_is_interactive = 1;
-+-
-+-/*
-+-** On Windows systems we have to know if standard output is a console
-+-** in order to translate UTF-8 into MBCS.  The following variable is
-+-** true if translation is required.
-+-*/
-+-static int stdout_is_console = 1;
-+-
-+-/*
-+-** The following is the open SQLite database.  We make a pointer
-+-** to this database a static variable so that it can be accessed
-+-** by the SIGINT handler to interrupt database processing.
-+-*/
-+-static sqlite3 *globalDb = 0;
-+-
-+-/*
-+-** True if an interrupt (Control-C) has been received.
-+-*/
-+-static volatile int seenInterrupt = 0;
-+-
-+-/*
-+-** This is the name of our program. It is set in main(), used
-+-** in a number of other places, mostly for error messages.
-+-*/
-+-static char *Argv0;
-+-
-+-/*
-+-** Prompt strings. Initialized in main. Settable with
-+-**   .prompt main continue
-+-*/
-+-static char mainPrompt[20];     /* First line prompt. default: "sqlite> "*/
-+-static char continuePrompt[20]; /* Continuation prompt. default: "   ...> " */
-+-
-+-/*
-+-** Render output like fprintf().  Except, if the output is going to the
-+-** console and if this is running on a Windows machine, translate the
-+-** output from UTF-8 into MBCS.
-+-*/
-+-#if defined(_WIN32) || defined(WIN32)
-+-void utf8_printf(FILE *out, const char *zFormat, ...){
-+-  va_list ap;
-+-  va_start(ap, zFormat);
-+-  if( stdout_is_console && (out==stdout || out==stderr) ){
-+-    char *z1 = sqlite3_vmprintf(zFormat, ap);
-+-    char *z2 = sqlite3_win32_utf8_to_mbcs_v2(z1, 0);
-+-    sqlite3_free(z1);
-+-    fputs(z2, out);
-+-    sqlite3_free(z2);
-+-  }else{
-+-    vfprintf(out, zFormat, ap);
-+-  }
-+-  va_end(ap);
-+-}
-+-#elif !defined(utf8_printf)
-+-# define utf8_printf fprintf
-+-#endif
-+-
-+-/*
-+-** Render output like fprintf().  This should not be used on anything that
-+-** includes string formatting (e.g. "%s").
-+-*/
-+-#if !defined(raw_printf)
-+-# define raw_printf fprintf
-+-#endif
-+-
-+-/*
-+-** Write I/O traces to the following stream.
-+-*/
-+-#ifdef SQLITE_ENABLE_IOTRACE
-+-static FILE *iotrace = 0;
-+-#endif
-+-
-+-/*
-+-** This routine works like printf in that its first argument is a
-+-** format string and subsequent arguments are values to be substituted
-+-** in place of % fields.  The result of formatting this string
-+-** is written to iotrace.
-+-*/
-+-#ifdef SQLITE_ENABLE_IOTRACE
-+-static void SQLITE_CDECL iotracePrintf(const char *zFormat, ...){
-+-  va_list ap;
-+-  char *z;
-+-  if( iotrace==0 ) return;
-+-  va_start(ap, zFormat);
-+-  z = sqlite3_vmprintf(zFormat, ap);
-+-  va_end(ap);
-+-  utf8_printf(iotrace, "%s", z);
-+-  sqlite3_free(z);
-+-}
-+-#endif
-+-
-+-/*
-+-** Output string zUtf to stream pOut as w characters.  If w is negative,
-+-** then right-justify the text.  W is the width in UTF-8 characters, not
-+-** in bytes.  This is different from the %*.*s specification in printf
-+-** since with %*.*s the width is measured in bytes, not characters.
-+-*/
-+-static void utf8_width_print(FILE *pOut, int w, const char *zUtf){
-+-  int i;
-+-  int n;
-+-  int aw = w<0 ? -w : w;
-+-  char zBuf[1000];
-+-  if( aw>(int)sizeof(zBuf)/3 ) aw = (int)sizeof(zBuf)/3;
-+-  for(i=n=0; zUtf[i]; i++){
-+-    if( (zUtf[i]&0xc0)!=0x80 ){
-+-      n++;
-+-      if( n==aw ){
-+-        do{ i++; }while( (zUtf[i]&0xc0)==0x80 );
-+-        break;
-+-      }
-+-    }
-+-  }
-+-  if( n>=aw ){
-+-    utf8_printf(pOut, "%.*s", i, zUtf);
-+-  }else if( w<0 ){
-+-    utf8_printf(pOut, "%*s%s", aw-n, "", zUtf);
-+-  }else{
-+-    utf8_printf(pOut, "%s%*s", zUtf, aw-n, "");
-+-  }
-+-}
-+-
-+-
-+-/*
-+-** Determines if a string is a number of not.
-+-*/
-+-static int isNumber(const char *z, int *realnum){
-+-  if( *z=='-' || *z=='+' ) z++;
-+-  if( !IsDigit(*z) ){
-+-    return 0;
-+-  }
-+-  z++;
-+-  if( realnum ) *realnum = 0;
-+-  while( IsDigit(*z) ){ z++; }
-+-  if( *z=='.' ){
-+-    z++;
-+-    if( !IsDigit(*z) ) return 0;
-+-    while( IsDigit(*z) ){ z++; }
-+-    if( realnum ) *realnum = 1;
-+-  }
-+-  if( *z=='e' || *z=='E' ){
-+-    z++;
-+-    if( *z=='+' || *z=='-' ) z++;
-+-    if( !IsDigit(*z) ) return 0;
-+-    while( IsDigit(*z) ){ z++; }
-+-    if( realnum ) *realnum = 1;
-+-  }
-+-  return *z==0;
-+-}
-+-
-+-/*
-+-** Compute a string length that is limited to what can be stored in
-+-** lower 30 bits of a 32-bit signed integer.
-+-*/
-+-static int strlen30(const char *z){
-+-  const char *z2 = z;
-+-  while( *z2 ){ z2++; }
-+-  return 0x3fffffff & (int)(z2 - z);
-+-}
-+-
-+-/*
-+-** Return the length of a string in characters.  Multibyte UTF8 characters
-+-** count as a single character.
-+-*/
-+-static int strlenChar(const char *z){
-+-  int n = 0;
-+-  while( *z ){
-+-    if( (0xc0&*(z++))!=0x80 ) n++;
-+-  }
-+-  return n;
-+-}
-+-
-+-/*
-+-** This routine reads a line of text from FILE in, stores
-+-** the text in memory obtained from malloc() and returns a pointer
-+-** to the text.  NULL is returned at end of file, or if malloc()
-+-** fails.
-+-**
-+-** If zLine is not NULL then it is a malloced buffer returned from
-+-** a previous call to this routine that may be reused.
-+-*/
-+-static char *local_getline(char *zLine, FILE *in){
-+-  int nLine = zLine==0 ? 0 : 100;
-+-  int n = 0;
-+-
-+-  while( 1 ){
-+-    if( n+100>nLine ){
-+-      nLine = nLine*2 + 100;
-+-      zLine = realloc(zLine, nLine);
-+-      if( zLine==0 ) return 0;
-+-    }
-+-    if( fgets(&zLine[n], nLine - n, in)==0 ){
-+-      if( n==0 ){
-+-        free(zLine);
-+-        return 0;
-+-      }
-+-      zLine[n] = 0;
-+-      break;
-+-    }
-+-    while( zLine[n] ) n++;
-+-    if( n>0 && zLine[n-1]=='\n' ){
-+-      n--;
-+-      if( n>0 && zLine[n-1]=='\r' ) n--;
-+-      zLine[n] = 0;
-+-      break;
-+-    }
-+-  }
-+-#if defined(_WIN32) || defined(WIN32)
-+-  /* For interactive input on Windows systems, translate the
-+-  ** multi-byte characterset characters into UTF-8. */
-+-  if( stdin_is_interactive && in==stdin ){
-+-    char *zTrans = sqlite3_win32_mbcs_to_utf8_v2(zLine, 0);
-+-    if( zTrans ){
-+-      int nTrans = strlen30(zTrans)+1;
-+-      if( nTrans>nLine ){
-+-        zLine = realloc(zLine, nTrans);
-+-        if( zLine==0 ){
-+-          sqlite3_free(zTrans);
-+-          return 0;
-+-        }
-+-      }
-+-      memcpy(zLine, zTrans, nTrans);
-+-      sqlite3_free(zTrans);
-+-    }
-+-  }
-+-#endif /* defined(_WIN32) || defined(WIN32) */
-+-  return zLine;
-+-}
-+-
-+-/*
-+-** Retrieve a single line of input text.
-+-**
-+-** If in==0 then read from standard input and prompt before each line.
-+-** If isContinuation is true, then a continuation prompt is appropriate.
-+-** If isContinuation is zero, then the main prompt should be used.
-+-**
-+-** If zPrior is not NULL then it is a buffer from a prior call to this
-+-** routine that can be reused.
-+-**
-+-** The result is stored in space obtained from malloc() and must either
-+-** be freed by the caller or else passed back into this routine via the
-+-** zPrior argument for reuse.
-+-*/
-+-static char *one_input_line(FILE *in, char *zPrior, int isContinuation){
-+-  char *zPrompt;
-+-  char *zResult;
-+-  if( in!=0 ){
-+-    zResult = local_getline(zPrior, in);
-+-  }else{
-+-    zPrompt = isContinuation ? continuePrompt : mainPrompt;
-+-#if SHELL_USE_LOCAL_GETLINE
-+-    printf("%s", zPrompt);
-+-    fflush(stdout);
-+-    zResult = local_getline(zPrior, stdin);
-+-#else
-+-    free(zPrior);
-+-    zResult = shell_readline(zPrompt);
-+-    if( zResult && *zResult ) shell_add_history(zResult);
-+-#endif
-+-  }
-+-  return zResult;
-+-}
-+-/*
-+-** A variable length string to which one can append text.
-+-*/
-+-typedef struct ShellText ShellText;
-+-struct ShellText {
-+-  char *z;
-+-  int n;
-+-  int nAlloc;
-+-};
-+-
-+-/*
-+-** Initialize and destroy a ShellText object
-+-*/
-+-static void initText(ShellText *p){
-+-  memset(p, 0, sizeof(*p));
-+-}
-+-static void freeText(ShellText *p){
-+-  free(p->z);
-+-  initText(p);
-+-}
-+-
-+-/* zIn is either a pointer to a NULL-terminated string in memory obtained
-+-** from malloc(), or a NULL pointer. The string pointed to by zAppend is
-+-** added to zIn, and the result returned in memory obtained from malloc().
-+-** zIn, if it was not NULL, is freed.
-+-**
-+-** If the third argument, quote, is not '\0', then it is used as a
-+-** quote character for zAppend.
-+-*/
-+-static void appendText(ShellText *p, char const *zAppend, char quote){
-+-  int len;
-+-  int i;
-+-  int nAppend = strlen30(zAppend);
-+-
-+-  len = nAppend+p->n+1;
-+-  if( quote ){
-+-    len += 2;
-+-    for(i=0; i<nAppend; i++){
-+-      if( zAppend[i]==quote ) len++;
-+-    }
-+-  }
-+-
-+-  if( p->n+len>=p->nAlloc ){
-+-    p->nAlloc = p->nAlloc*2 + len + 20;
-+-    p->z = realloc(p->z, p->nAlloc);
-+-    if( p->z==0 ){
-+-      memset(p, 0, sizeof(*p));
-+-      return;
-+-    }
-+-  }
-+-
-+-  if( quote ){
-+-    char *zCsr = p->z+p->n;
-+-    *zCsr++ = quote;
-+-    for(i=0; i<nAppend; i++){
-+-      *zCsr++ = zAppend[i];
-+-      if( zAppend[i]==quote ) *zCsr++ = quote;
-+-    }
-+-    *zCsr++ = quote;
-+-    p->n = (int)(zCsr - p->z);
-+-    *zCsr = '\0';
-+-  }else{
-+-    memcpy(p->z+p->n, zAppend, nAppend);
-+-    p->n += nAppend;
-+-    p->z[p->n] = '\0';
-+-  }
-+-}
-+-
-+-/*
-+-** Attempt to determine if identifier zName needs to be quoted, either
-+-** because it contains non-alphanumeric characters, or because it is an
-+-** SQLite keyword.  Be conservative in this estimate:  When in doubt assume
-+-** that quoting is required.
-+-**
-+-** Return '"' if quoting is required.  Return 0 if no quoting is required.
-+-*/
-+-static char quoteChar(const char *zName){
-+-  /* All SQLite keywords, in alphabetical order */
-+-  static const char *azKeywords[] = {
-+-    "ABORT", "ACTION", "ADD", "AFTER", "ALL", "ALTER", "ANALYZE", "AND", "AS",
-+-    "ASC", "ATTACH", "AUTOINCREMENT", "BEFORE", "BEGIN", "BETWEEN", "BY",
-+-    "CASCADE", "CASE", "CAST", "CHECK", "COLLATE", "COLUMN", "COMMIT",
-+-    "CONFLICT", "CONSTRAINT", "CREATE", "CROSS", "CURRENT_DATE",
-+-    "CURRENT_TIME", "CURRENT_TIMESTAMP", "DATABASE", "DEFAULT", "DEFERRABLE",
-+-    "DEFERRED", "DELETE", "DESC", "DETACH", "DISTINCT", "DROP", "EACH",
-+-    "ELSE", "END", "ESCAPE", "EXCEPT", "EXCLUSIVE", "EXISTS", "EXPLAIN",
-+-    "FAIL", "FOR", "FOREIGN", "FROM", "FULL", "GLOB", "GROUP", "HAVING", "IF",
-+-    "IGNORE", "IMMEDIATE", "IN", "INDEX", "INDEXED", "INITIALLY", "INNER",
-+-    "INSERT", "INSTEAD", "INTERSECT", "INTO", "IS", "ISNULL", "JOIN", "KEY",
-+-    "LEFT", "LIKE", "LIMIT", "MATCH", "NATURAL", "NO", "NOT", "NOTNULL",
-+-    "NULL", "OF", "OFFSET", "ON", "OR", "ORDER", "OUTER", "PLAN", "PRAGMA",
-+-    "PRIMARY", "QUERY", "RAISE", "RECURSIVE", "REFERENCES", "REGEXP",
-+-    "REINDEX", "RELEASE", "RENAME", "REPLACE", "RESTRICT", "RIGHT",
-+-    "ROLLBACK", "ROW", "SAVEPOINT", "SELECT", "SET", "TABLE", "TEMP",
-+-    "TEMPORARY", "THEN", "TO", "TRANSACTION", "TRIGGER", "UNION", "UNIQUE",
-+-    "UPDATE", "USING", "VACUUM", "VALUES", "VIEW", "VIRTUAL", "WHEN", "WHERE",
-+-    "WITH", "WITHOUT",
-+-  };
-+-  int i, lwr, upr, mid, c;
-+-  if( !isalpha((unsigned char)zName[0]) && zName[0]!='_' ) return '"';
-+-  for(i=0; zName[i]; i++){
-+-    if( !isalnum((unsigned char)zName[i]) && zName[i]!='_' ) return '"';
-+-  }
-+-  lwr = 0;
-+-  upr = sizeof(azKeywords)/sizeof(azKeywords[0]) - 1;
-+-  while( lwr<=upr ){
-+-    mid = (lwr+upr)/2;
-+-    c = sqlite3_stricmp(azKeywords[mid], zName);
-+-    if( c==0 ) return '"';
-+-    if( c<0 ){
-+-      lwr = mid+1;
-+-    }else{
-+-      upr = mid-1;
-+-    }
-+-  }
-+-  return 0;
-+-}
-+-
-+-/*
-+-** SQL function:  shell_add_schema(S,X)
-+-**
-+-** Add the schema name X to the CREATE statement in S and return the result.
-+-** Examples:
-+-**
-+-**    CREATE TABLE t1(x)   ->   CREATE TABLE xyz.t1(x);
-+-**
-+-** Also works on
-+-**
-+-**    CREATE INDEX
-+-**    CREATE UNIQUE INDEX
-+-**    CREATE VIEW
-+-**    CREATE TRIGGER
-+-**    CREATE VIRTUAL TABLE
-+-**
-+-** This UDF is used by the .schema command to insert the schema name of
-+-** attached databases into the middle of the sqlite_master.sql field.
-+-*/
-+-static void shellAddSchemaName(
-+-  sqlite3_context *pCtx,
-+-  int nVal,
-+-  sqlite3_value **apVal
-+-){
-+-  static const char *aPrefix[] = {
-+-     "TABLE",
-+-     "INDEX",
-+-     "UNIQUE INDEX",
-+-     "VIEW",
-+-     "TRIGGER",
-+-     "VIRTUAL TABLE"
-+-  };
-+-  int i = 0;
-+-  const char *zIn = (const char*)sqlite3_value_text(apVal[0]);
-+-  const char *zSchema = (const char*)sqlite3_value_text(apVal[1]);
-+-  assert( nVal==2 );
-+-  if( zIn!=0 && strncmp(zIn, "CREATE ", 7)==0 ){
-+-    for(i=0; i<(int)(sizeof(aPrefix)/sizeof(aPrefix[0])); i++){
-+-      int n = strlen30(aPrefix[i]);
-+-      if( strncmp(zIn+7, aPrefix[i], n)==0 && zIn[n+7]==' ' ){
-+-        char cQuote = quoteChar(zSchema);
-+-        char *z;
-+-        if( cQuote ){
-+-         z = sqlite3_mprintf("%.*s \"%w\".%s", n+7, zIn, zSchema, zIn+n+8);
-+-        }else{
-+-          z = sqlite3_mprintf("%.*s %s.%s", n+7, zIn, zSchema, zIn+n+8);
-+-        }
-+-        sqlite3_result_text(pCtx, z, -1, sqlite3_free);
-+-        return;
-+-      }
-+-    }
-+-  }
-+-  sqlite3_result_value(pCtx, apVal[0]);
-+-}
-+-
-+-/*
-+-** The source code for several run-time loadable extensions is inserted
-+-** below by the ../tool/mkshellc.tcl script.  Before processing that included
-+-** code, we need to override some macros to make the included program code
-+-** work here in the middle of this regular program.
-+-*/
-+-#define SQLITE_EXTENSION_INIT1
-+-#define SQLITE_EXTENSION_INIT2(X) (void)(X)
-+-
-+-/************************* Begin ../ext/misc/shathree.c ******************/
-+-/*
-+-** 2017-03-08
-+-**
-+-** The author disclaims copyright to this source code.  In place of
-+-** a legal notice, here is a blessing:
-+-**
-+-**    May you do good and not evil.
-+-**    May you find forgiveness for yourself and forgive others.
-+-**    May you share freely, never taking more than you give.
-+-**
-+-******************************************************************************
-+-**
-+-** This SQLite extension implements a functions that compute SHA1 hashes.
-+-** Two SQL functions are implemented:
-+-**
-+-**     sha3(X,SIZE)
-+-**     sha3_query(Y,SIZE)
-+-**
-+-** The sha3(X) function computes the SHA3 hash of the input X, or NULL if
-+-** X is NULL.
-+-**
-+-** The sha3_query(Y) function evalutes all queries in the SQL statements of Y
-+-** and returns a hash of their results.
-+-**
-+-** The SIZE argument is optional.  If omitted, the SHA3-256 hash algorithm
-+-** is used.  If SIZE is included it must be one of the integers 224, 256,
-+-** 384, or 512, to determine SHA3 hash variant that is computed.
-+-*/
-+-SQLITE_EXTENSION_INIT1
-+-#include <assert.h>
-+-#include <string.h>
-+-#include <stdarg.h>
-+-typedef sqlite3_uint64 u64;
-+-
-+-/******************************************************************************
-+-** The Hash Engine
-+-*/
-+-/*
-+-** Macros to determine whether the machine is big or little endian,
-+-** and whether or not that determination is run-time or compile-time.
-+-**
-+-** For best performance, an attempt is made to guess at the byte-order
-+-** using C-preprocessor macros.  If that is unsuccessful, or if
-+-** -DSHA3_BYTEORDER=0 is set, then byte-order is determined
-+-** at run-time.
-+-*/
-+-#ifndef SHA3_BYTEORDER
-+-# if defined(i386)     || defined(__i386__)   || defined(_M_IX86) ||    \
-+-     defined(__x86_64) || defined(__x86_64__) || defined(_M_X64)  ||    \
-+-     defined(_M_AMD64) || defined(_M_ARM)     || defined(__x86)   ||    \
-+-     defined(__arm__)
-+-#   define SHA3_BYTEORDER    1234
-+-# elif defined(sparc)    || defined(__ppc__)
-+-#   define SHA3_BYTEORDER    4321
-+-# else
-+-#   define SHA3_BYTEORDER 0
-+-# endif
-+-#endif
-+-
-+-
-+-/*
-+-** State structure for a SHA3 hash in progress
-+-*/
-+-typedef struct SHA3Context SHA3Context;
-+-struct SHA3Context {
-+-  union {
-+-    u64 s[25];                /* Keccak state. 5x5 lines of 64 bits each */
-+-    unsigned char x[1600];    /* ... or 1600 bytes */
-+-  } u;
-+-  unsigned nRate;        /* Bytes of input accepted per Keccak iteration */
-+-  unsigned nLoaded;      /* Input bytes loaded into u.x[] so far this cycle */
-+-  unsigned ixMask;       /* Insert next input into u.x[nLoaded^ixMask]. */
-+-};
-+-
-+-/*
-+-** A single step of the Keccak mixing function for a 1600-bit state
-+-*/
-+-static void KeccakF1600Step(SHA3Context *p){
-+-  int i;
-+-  u64 B0, B1, B2, B3, B4;
-+-  u64 C0, C1, C2, C3, C4;
-+-  u64 D0, D1, D2, D3, D4;
-+-  static const u64 RC[] = {
-+-    0x0000000000000001ULL,  0x0000000000008082ULL,
-+-    0x800000000000808aULL,  0x8000000080008000ULL,
-+-    0x000000000000808bULL,  0x0000000080000001ULL,
-+-    0x8000000080008081ULL,  0x8000000000008009ULL,
-+-    0x000000000000008aULL,  0x0000000000000088ULL,
-+-    0x0000000080008009ULL,  0x000000008000000aULL,
-+-    0x000000008000808bULL,  0x800000000000008bULL,
-+-    0x8000000000008089ULL,  0x8000000000008003ULL,
-+-    0x8000000000008002ULL,  0x8000000000000080ULL,
-+-    0x000000000000800aULL,  0x800000008000000aULL,
-+-    0x8000000080008081ULL,  0x8000000000008080ULL,
-+-    0x0000000080000001ULL,  0x8000000080008008ULL
-+-  };
-+-# define A00 (p->u.s[0])
-+-# define A01 (p->u.s[1])
-+-# define A02 (p->u.s[2])
-+-# define A03 (p->u.s[3])
-+-# define A04 (p->u.s[4])
-+-# define A10 (p->u.s[5])
-+-# define A11 (p->u.s[6])
-+-# define A12 (p->u.s[7])
-+-# define A13 (p->u.s[8])
-+-# define A14 (p->u.s[9])
-+-# define A20 (p->u.s[10])
-+-# define A21 (p->u.s[11])
-+-# define A22 (p->u.s[12])
-+-# define A23 (p->u.s[13])
-+-# define A24 (p->u.s[14])
-+-# define A30 (p->u.s[15])
-+-# define A31 (p->u.s[16])
-+-# define A32 (p->u.s[17])
-+-# define A33 (p->u.s[18])
-+-# define A34 (p->u.s[19])
-+-# define A40 (p->u.s[20])
-+-# define A41 (p->u.s[21])
-+-# define A42 (p->u.s[22])
-+-# define A43 (p->u.s[23])
-+-# define A44 (p->u.s[24])
-+-# define ROL64(a,x) ((a<<x)|(a>>(64-x)))
-+-
-+-  for(i=0; i<24; i+=4){
-+-    C0 = A00^A10^A20^A30^A40;
-+-    C1 = A01^A11^A21^A31^A41;
-+-    C2 = A02^A12^A22^A32^A42;
-+-    C3 = A03^A13^A23^A33^A43;
-+-    C4 = A04^A14^A24^A34^A44;
-+-    D0 = C4^ROL64(C1, 1);
-+-    D1 = C0^ROL64(C2, 1);
-+-    D2 = C1^ROL64(C3, 1);
-+-    D3 = C2^ROL64(C4, 1);
-+-    D4 = C3^ROL64(C0, 1);
-+-
-+-    B0 = (A00^D0);
-+-    B1 = ROL64((A11^D1), 44);
-+-    B2 = ROL64((A22^D2), 43);
-+-    B3 = ROL64((A33^D3), 21);
-+-    B4 = ROL64((A44^D4), 14);
-+-    A00 =   B0 ^((~B1)&  B2 );
-+-    A00 ^= RC[i];
-+-    A11 =   B1 ^((~B2)&  B3 );
-+-    A22 =   B2 ^((~B3)&  B4 );
-+-    A33 =   B3 ^((~B4)&  B0 );
-+-    A44 =   B4 ^((~B0)&  B1 );
-+-
-+-    B2 = ROL64((A20^D0), 3);
-+-    B3 = ROL64((A31^D1), 45);
-+-    B4 = ROL64((A42^D2), 61);
-+-    B0 = ROL64((A03^D3), 28);
-+-    B1 = ROL64((A14^D4), 20);
-+-    A20 =   B0 ^((~B1)&  B2 );
-+-    A31 =   B1 ^((~B2)&  B3 );
-+-    A42 =   B2 ^((~B3)&  B4 );
-+-    A03 =   B3 ^((~B4)&  B0 );
-+-    A14 =   B4 ^((~B0)&  B1 );
-+-
-+-    B4 = ROL64((A40^D0), 18);
-+-    B0 = ROL64((A01^D1), 1);
-+-    B1 = ROL64((A12^D2), 6);
-+-    B2 = ROL64((A23^D3), 25);
-+-    B3 = ROL64((A34^D4), 8);
-+-    A40 =   B0 ^((~B1)&  B2 );
-+-    A01 =   B1 ^((~B2)&  B3 );
-+-    A12 =   B2 ^((~B3)&  B4 );
-+-    A23 =   B3 ^((~B4)&  B0 );
-+-    A34 =   B4 ^((~B0)&  B1 );
-+-
-+-    B1 = ROL64((A10^D0), 36);
-+-    B2 = ROL64((A21^D1), 10);
-+-    B3 = ROL64((A32^D2), 15);
-+-    B4 = ROL64((A43^D3), 56);
-+-    B0 = ROL64((A04^D4), 27);
-+-    A10 =   B0 ^((~B1)&  B2 );
-+-    A21 =   B1 ^((~B2)&  B3 );
-+-    A32 =   B2 ^((~B3)&  B4 );
-+-    A43 =   B3 ^((~B4)&  B0 );
-+-    A04 =   B4 ^((~B0)&  B1 );
-+-
-+-    B3 = ROL64((A30^D0), 41);
-+-    B4 = ROL64((A41^D1), 2);
-+-    B0 = ROL64((A02^D2), 62);
-+-    B1 = ROL64((A13^D3), 55);
-+-    B2 = ROL64((A24^D4), 39);
-+-    A30 =   B0 ^((~B1)&  B2 );
-+-    A41 =   B1 ^((~B2)&  B3 );
-+-    A02 =   B2 ^((~B3)&  B4 );
-+-    A13 =   B3 ^((~B4)&  B0 );
-+-    A24 =   B4 ^((~B0)&  B1 );
-+-
-+-    C0 = A00^A20^A40^A10^A30;
-+-    C1 = A11^A31^A01^A21^A41;
-+-    C2 = A22^A42^A12^A32^A02;
-+-    C3 = A33^A03^A23^A43^A13;
-+-    C4 = A44^A14^A34^A04^A24;
-+-    D0 = C4^ROL64(C1, 1);
-+-    D1 = C0^ROL64(C2, 1);
-+-    D2 = C1^ROL64(C3, 1);
-+-    D3 = C2^ROL64(C4, 1);
-+-    D4 = C3^ROL64(C0, 1);
-+-
-+-    B0 = (A00^D0);
-+-    B1 = ROL64((A31^D1), 44);
-+-    B2 = ROL64((A12^D2), 43);
-+-    B3 = ROL64((A43^D3), 21);
-+-    B4 = ROL64((A24^D4), 14);
-+-    A00 =   B0 ^((~B1)&  B2 );
-+-    A00 ^= RC[i+1];
-+-    A31 =   B1 ^((~B2)&  B3 );
-+-    A12 =   B2 ^((~B3)&  B4 );
-+-    A43 =   B3 ^((~B4)&  B0 );
-+-    A24 =   B4 ^((~B0)&  B1 );
-+-
-+-    B2 = ROL64((A40^D0), 3);
-+-    B3 = ROL64((A21^D1), 45);
-+-    B4 = ROL64((A02^D2), 61);
-+-    B0 = ROL64((A33^D3), 28);
-+-    B1 = ROL64((A14^D4), 20);
-+-    A40 =   B0 ^((~B1)&  B2 );
-+-    A21 =   B1 ^((~B2)&  B3 );
-+-    A02 =   B2 ^((~B3)&  B4 );
-+-    A33 =   B3 ^((~B4)&  B0 );
-+-    A14 =   B4 ^((~B0)&  B1 );
-+-
-+-    B4 = ROL64((A30^D0), 18);
-+-    B0 = ROL64((A11^D1), 1);
-+-    B1 = ROL64((A42^D2), 6);
-+-    B2 = ROL64((A23^D3), 25);
-+-    B3 = ROL64((A04^D4), 8);
-+-    A30 =   B0 ^((~B1)&  B2 );
-+-    A11 =   B1 ^((~B2)&  B3 );
-+-    A42 =   B2 ^((~B3)&  B4 );
-+-    A23 =   B3 ^((~B4)&  B0 );
-+-    A04 =   B4 ^((~B0)&  B1 );
-+-
-+-    B1 = ROL64((A20^D0), 36);
-+-    B2 = ROL64((A01^D1), 10);
-+-    B3 = ROL64((A32^D2), 15);
-+-    B4 = ROL64((A13^D3), 56);
-+-    B0 = ROL64((A44^D4), 27);
-+-    A20 =   B0 ^((~B1)&  B2 );
-+-    A01 =   B1 ^((~B2)&  B3 );
-+-    A32 =   B2 ^((~B3)&  B4 );
-+-    A13 =   B3 ^((~B4)&  B0 );
-+-    A44 =   B4 ^((~B0)&  B1 );
-+-
-+-    B3 = ROL64((A10^D0), 41);
-+-    B4 = ROL64((A41^D1), 2);
-+-    B0 = ROL64((A22^D2), 62);
-+-    B1 = ROL64((A03^D3), 55);
-+-    B2 = ROL64((A34^D4), 39);
-+-    A10 =   B0 ^((~B1)&  B2 );
-+-    A41 =   B1 ^((~B2)&  B3 );
-+-    A22 =   B2 ^((~B3)&  B4 );
-+-    A03 =   B3 ^((~B4)&  B0 );
-+-    A34 =   B4 ^((~B0)&  B1 );
-+-
-+-    C0 = A00^A40^A30^A20^A10;
-+-    C1 = A31^A21^A11^A01^A41;
-+-    C2 = A12^A02^A42^A32^A22;
-+-    C3 = A43^A33^A23^A13^A03;
-+-    C4 = A24^A14^A04^A44^A34;
-+-    D0 = C4^ROL64(C1, 1);
-+-    D1 = C0^ROL64(C2, 1);
-+-    D2 = C1^ROL64(C3, 1);
-+-    D3 = C2^ROL64(C4, 1);
-+-    D4 = C3^ROL64(C0, 1);
-+-
-+-    B0 = (A00^D0);
-+-    B1 = ROL64((A21^D1), 44);
-+-    B2 = ROL64((A42^D2), 43);
-+-    B3 = ROL64((A13^D3), 21);
-+-    B4 = ROL64((A34^D4), 14);
-+-    A00 =   B0 ^((~B1)&  B2 );
-+-    A00 ^= RC[i+2];
-+-    A21 =   B1 ^((~B2)&  B3 );
-+-    A42 =   B2 ^((~B3)&  B4 );
-+-    A13 =   B3 ^((~B4)&  B0 );
-+-    A34 =   B4 ^((~B0)&  B1 );
-+-
-+-    B2 = ROL64((A30^D0), 3);
-+-    B3 = ROL64((A01^D1), 45);
-+-    B4 = ROL64((A22^D2), 61);
-+-    B0 = ROL64((A43^D3), 28);
-+-    B1 = ROL64((A14^D4), 20);
-+-    A30 =   B0 ^((~B1)&  B2 );
-+-    A01 =   B1 ^((~B2)&  B3 );
-+-    A22 =   B2 ^((~B3)&  B4 );
-+-    A43 =   B3 ^((~B4)&  B0 );
-+-    A14 =   B4 ^((~B0)&  B1 );
-+-
-+-    B4 = ROL64((A10^D0), 18);
-+-    B0 = ROL64((A31^D1), 1);
-+-    B1 = ROL64((A02^D2), 6);
-+-    B2 = ROL64((A23^D3), 25);
-+-    B3 = ROL64((A44^D4), 8);
-+-    A10 =   B0 ^((~B1)&  B2 );
-+-    A31 =   B1 ^((~B2)&  B3 );
-+-    A02 =   B2 ^((~B3)&  B4 );
-+-    A23 =   B3 ^((~B4)&  B0 );
-+-    A44 =   B4 ^((~B0)&  B1 );
-+-
-+-    B1 = ROL64((A40^D0), 36);
-+-    B2 = ROL64((A11^D1), 10);
-+-    B3 = ROL64((A32^D2), 15);
-+-    B4 = ROL64((A03^D3), 56);
-+-    B0 = ROL64((A24^D4), 27);
-+-    A40 =   B0 ^((~B1)&  B2 );
-+-    A11 =   B1 ^((~B2)&  B3 );
-+-    A32 =   B2 ^((~B3)&  B4 );
-+-    A03 =   B3 ^((~B4)&  B0 );
-+-    A24 =   B4 ^((~B0)&  B1 );
-+-
-+-    B3 = ROL64((A20^D0), 41);
-+-    B4 = ROL64((A41^D1), 2);
-+-    B0 = ROL64((A12^D2), 62);
-+-    B1 = ROL64((A33^D3), 55);
-+-    B2 = ROL64((A04^D4), 39);
-+-    A20 =   B0 ^((~B1)&  B2 );
-+-    A41 =   B1 ^((~B2)&  B3 );
-+-    A12 =   B2 ^((~B3)&  B4 );
-+-    A33 =   B3 ^((~B4)&  B0 );
-+-    A04 =   B4 ^((~B0)&  B1 );
-+-
-+-    C0 = A00^A30^A10^A40^A20;
-+-    C1 = A21^A01^A31^A11^A41;
-+-    C2 = A42^A22^A02^A32^A12;
-+-    C3 = A13^A43^A23^A03^A33;
-+-    C4 = A34^A14^A44^A24^A04;
-+-    D0 = C4^ROL64(C1, 1);
-+-    D1 = C0^ROL64(C2, 1);
-+-    D2 = C1^ROL64(C3, 1);
-+-    D3 = C2^ROL64(C4, 1);
-+-    D4 = C3^ROL64(C0, 1);
-+-
-+-    B0 = (A00^D0);
-+-    B1 = ROL64((A01^D1), 44);
-+-    B2 = ROL64((A02^D2), 43);
-+-    B3 = ROL64((A03^D3), 21);
-+-    B4 = ROL64((A04^D4), 14);
-+-    A00 =   B0 ^((~B1)&  B2 );
-+-    A00 ^= RC[i+3];
-+-    A01 =   B1 ^((~B2)&  B3 );
-+-    A02 =   B2 ^((~B3)&  B4 );
-+-    A03 =   B3 ^((~B4)&  B0 );
-+-    A04 =   B4 ^((~B0)&  B1 );
-+-
-+-    B2 = ROL64((A10^D0), 3);
-+-    B3 = ROL64((A11^D1), 45);
-+-    B4 = ROL64((A12^D2), 61);
-+-    B0 = ROL64((A13^D3), 28);
-+-    B1 = ROL64((A14^D4), 20);
-+-    A10 =   B0 ^((~B1)&  B2 );
-+-    A11 =   B1 ^((~B2)&  B3 );
-+-    A12 =   B2 ^((~B3)&  B4 );
-+-    A13 =   B3 ^((~B4)&  B0 );
-+-    A14 =   B4 ^((~B0)&  B1 );
-+-
-+-    B4 = ROL64((A20^D0), 18);
-+-    B0 = ROL64((A21^D1), 1);
-+-    B1 = ROL64((A22^D2), 6);
-+-    B2 = ROL64((A23^D3), 25);
-+-    B3 = ROL64((A24^D4), 8);
-+-    A20 =   B0 ^((~B1)&  B2 );
-+-    A21 =   B1 ^((~B2)&  B3 );
-+-    A22 =   B2 ^((~B3)&  B4 );
-+-    A23 =   B3 ^((~B4)&  B0 );
-+-    A24 =   B4 ^((~B0)&  B1 );
-+-
-+-    B1 = ROL64((A30^D0), 36);
-+-    B2 = ROL64((A31^D1), 10);
-+-    B3 = ROL64((A32^D2), 15);
-+-    B4 = ROL64((A33^D3), 56);
-+-    B0 = ROL64((A34^D4), 27);
-+-    A30 =   B0 ^((~B1)&  B2 );
-+-    A31 =   B1 ^((~B2)&  B3 );
-+-    A32 =   B2 ^((~B3)&  B4 );
-+-    A33 =   B3 ^((~B4)&  B0 );
-+-    A34 =   B4 ^((~B0)&  B1 );
-+-
-+-    B3 = ROL64((A40^D0), 41);
-+-    B4 = ROL64((A41^D1), 2);
-+-    B0 = ROL64((A42^D2), 62);
-+-    B1 = ROL64((A43^D3), 55);
-+-    B2 = ROL64((A44^D4), 39);
-+-    A40 =   B0 ^((~B1)&  B2 );
-+-    A41 =   B1 ^((~B2)&  B3 );
-+-    A42 =   B2 ^((~B3)&  B4 );
-+-    A43 =   B3 ^((~B4)&  B0 );
-+-    A44 =   B4 ^((~B0)&  B1 );
-+-  }
-+-}
-+-
-+-/*
-+-** Initialize a new hash.  iSize determines the size of the hash
-+-** in bits and should be one of 224, 256, 384, or 512.  Or iSize
-+-** can be zero to use the default hash size of 256 bits.
-+-*/
-+-static void SHA3Init(SHA3Context *p, int iSize){
-+-  memset(p, 0, sizeof(*p));
-+-  if( iSize>=128 && iSize<=512 ){
-+-    p->nRate = (1600 - ((iSize + 31)&~31)*2)/8;
-+-  }else{
-+-    p->nRate = (1600 - 2*256)/8;
-+-  }
-+-#if SHA3_BYTEORDER==1234
-+-  /* Known to be little-endian at compile-time. No-op */
-+-#elif SHA3_BYTEORDER==4321
-+-  p->ixMask = 7;  /* Big-endian */
-+-#else
-+-  {
-+-    static unsigned int one = 1;
-+-    if( 1==*(unsigned char*)&one ){
-+-      /* Little endian.  No byte swapping. */
-+-      p->ixMask = 0;
-+-    }else{
-+-      /* Big endian.  Byte swap. */
-+-      p->ixMask = 7;
-+-    }
-+-  }
-+-#endif
-+-}
-+-
-+-/*
-+-** Make consecutive calls to the SHA3Update function to add new content
-+-** to the hash
-+-*/
-+-static void SHA3Update(
-+-  SHA3Context *p,
-+-  const unsigned char *aData,
-+-  unsigned int nData
-+-){
-+-  unsigned int i = 0;
-+-#if SHA3_BYTEORDER==1234
-+-  if( (p->nLoaded % 8)==0 && ((aData - (const unsigned char*)0)&7)==0 ){
-+-    for(; i+7<nData; i+=8){
-+-      p->u.s[p->nLoaded/8] ^= *(u64*)&aData[i];
-+-      p->nLoaded += 8;
-+-      if( p->nLoaded>=p->nRate ){
-+-        KeccakF1600Step(p);
-+-        p->nLoaded = 0;
-+-      }
-+-    }
-+-  }
-+-#endif
-+-  for(; i<nData; i++){
-+-#if SHA3_BYTEORDER==1234
-+-    p->u.x[p->nLoaded] ^= aData[i];
-+-#elif SHA3_BYTEORDER==4321
-+-    p->u.x[p->nLoaded^0x07] ^= aData[i];
-+-#else
-+-    p->u.x[p->nLoaded^p->ixMask] ^= aData[i];
-+-#endif
-+-    p->nLoaded++;
-+-    if( p->nLoaded==p->nRate ){
-+-      KeccakF1600Step(p);
-+-      p->nLoaded = 0;
-+-    }
-+-  }
-+-}
-+-
-+-/*
-+-** After all content has been added, invoke SHA3Final() to compute
-+-** the final hash.  The function returns a pointer to the binary
-+-** hash value.
-+-*/
-+-static unsigned char *SHA3Final(SHA3Context *p){
-+-  unsigned int i;
-+-  if( p->nLoaded==p->nRate-1 ){
-+-    const unsigned char c1 = 0x86;
-+-    SHA3Update(p, &c1, 1);
-+-  }else{
-+-    const unsigned char c2 = 0x06;
-+-    const unsigned char c3 = 0x80;
-+-    SHA3Update(p, &c2, 1);
-+-    p->nLoaded = p->nRate - 1;
-+-    SHA3Update(p, &c3, 1);
-+-  }
-+-  for(i=0; i<p->nRate; i++){
-+-    p->u.x[i+p->nRate] = p->u.x[i^p->ixMask];
-+-  }
-+-  return &p->u.x[p->nRate];
-+-}
-+-/* End of the hashing logic
-+-*****************************************************************************/
-+-
-+-/*
-+-** Implementation of the sha3(X,SIZE) function.
-+-**
-+-** Return a BLOB which is the SIZE-bit SHA3 hash of X.  The default
-+-** size is 256.  If X is a BLOB, it is hashed as is.
-+-** For all other non-NULL types of input, X is converted into a UTF-8 string
-+-** and the string is hashed without the trailing 0x00 terminator.  The hash
-+-** of a NULL value is NULL.
-+-*/
-+-static void sha3Func(
-+-  sqlite3_context *context,
-+-  int argc,
-+-  sqlite3_value **argv
-+-){
-+-  SHA3Context cx;
-+-  int eType = sqlite3_value_type(argv[0]);
-+-  int nByte = sqlite3_value_bytes(argv[0]);
-+-  int iSize;
-+-  if( argc==1 ){
-+-    iSize = 256;
-+-  }else{
-+-    iSize = sqlite3_value_int(argv[1]);
-+-    if( iSize!=224 && iSize!=256 && iSize!=384 && iSize!=512 ){
-+-      sqlite3_result_error(context, "SHA3 size should be one of: 224 256 "
-+-                                    "384 512", -1);
-+-      return;
-+-    }
-+-  }
-+-  if( eType==SQLITE_NULL ) return;
-+-  SHA3Init(&cx, iSize);
-+-  if( eType==SQLITE_BLOB ){
-+-    SHA3Update(&cx, sqlite3_value_blob(argv[0]), nByte);
-+-  }else{
-+-    SHA3Update(&cx, sqlite3_value_text(argv[0]), nByte);
-+-  }
-+-  sqlite3_result_blob(context, SHA3Final(&cx), iSize/8, SQLITE_TRANSIENT);
-+-}
-+-
-+-/* Compute a string using sqlite3_vsnprintf() with a maximum length
-+-** of 50 bytes and add it to the hash.
-+-*/
-+-static void hash_step_vformat(
-+-  SHA3Context *p,                 /* Add content to this context */
-+-  const char *zFormat,
-+-  ...
-+-){
-+-  va_list ap;
-+-  int n;
-+-  char zBuf[50];
-+-  va_start(ap, zFormat);
-+-  sqlite3_vsnprintf(sizeof(zBuf),zBuf,zFormat,ap);
-+-  va_end(ap);
-+-  n = (int)strlen(zBuf);
-+-  SHA3Update(p, (unsigned char*)zBuf, n);
-+-}
-+-
-+-/*
-+-** Implementation of the sha3_query(SQL,SIZE) function.
-+-**
-+-** This function compiles and runs the SQL statement(s) given in the
-+-** argument. The results are hashed using a SIZE-bit SHA3.  The default
-+-** size is 256.
-+-**
-+-** The format of the byte stream that is hashed is summarized as follows:
-+-**
-+-**       S<n>:<sql>
-+-**       R
-+-**       N
-+-**       I<int>
-+-**       F<ieee-float>
-+-**       B<size>:<bytes>
-+-**       T<size>:<text>
-+-**
-+-** <sql> is the original SQL text for each statement run and <n> is
-+-** the size of that text.  The SQL text is UTF-8.  A single R character
-+-** occurs before the start of each row.  N means a NULL value.
-+-** I mean an 8-byte little-endian integer <int>.  F is a floating point
-+-** number with an 8-byte little-endian IEEE floating point value <ieee-float>.
-+-** B means blobs of <size> bytes.  T means text rendered as <size>
-+-** bytes of UTF-8.  The <n> and <size> values are expressed as an ASCII
-+-** text integers.
-+-**
-+-** For each SQL statement in the X input, there is one S segment.  Each
-+-** S segment is followed by zero or more R segments, one for each row in the
-+-** result set.  After each R, there are one or more N, I, F, B, or T segments,
-+-** one for each column in the result set.  Segments are concatentated directly
-+-** with no delimiters of any kind.
-+-*/
-+-static void sha3QueryFunc(
-+-  sqlite3_context *context,
-+-  int argc,
-+-  sqlite3_value **argv
-+-){
-+-  sqlite3 *db = sqlite3_context_db_handle(context);
-+-  const char *zSql = (const char*)sqlite3_value_text(argv[0]);
-+-  sqlite3_stmt *pStmt = 0;
-+-  int nCol;                   /* Number of columns in the result set */
-+-  int i;                      /* Loop counter */
-+-  int rc;
-+-  int n;
-+-  const char *z;
-+-  SHA3Context cx;
-+-  int iSize;
-+-
-+-  if( argc==1 ){
-+-    iSize = 256;
-+-  }else{
-+-    iSize = sqlite3_value_int(argv[1]);
-+-    if( iSize!=224 && iSize!=256 && iSize!=384 && iSize!=512 ){
-+-      sqlite3_result_error(context, "SHA3 size should be one of: 224 256 "
-+-                                    "384 512", -1);
-+-      return;
-+-    }
-+-  }
-+-  if( zSql==0 ) return;
-+-  SHA3Init(&cx, iSize);
-+-  while( zSql[0] ){
-+-    rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, &zSql);
-+-    if( rc ){
-+-      char *zMsg = sqlite3_mprintf("error SQL statement [%s]: %s",
-+-                                   zSql, sqlite3_errmsg(db));
-+-      sqlite3_finalize(pStmt);
-+-      sqlite3_result_error(context, zMsg, -1);
-+-      sqlite3_free(zMsg);
-+-      return;
-+-    }
-+-    if( !sqlite3_stmt_readonly(pStmt) ){
-+-      char *zMsg = sqlite3_mprintf("non-query: [%s]", sqlite3_sql(pStmt));
-+-      sqlite3_finalize(pStmt);
-+-      sqlite3_result_error(context, zMsg, -1);
-+-      sqlite3_free(zMsg);
-+-      return;
-+-    }
-+-    nCol = sqlite3_column_count(pStmt);
-+-    z = sqlite3_sql(pStmt);
-+-    n = (int)strlen(z);
-+-    hash_step_vformat(&cx,"S%d:",n);
-+-    SHA3Update(&cx,(unsigned char*)z,n);
-+-
-+-    /* Compute a hash over the result of the query */
-+-    while( SQLITE_ROW==sqlite3_step(pStmt) ){
-+-      SHA3Update(&cx,(const unsigned char*)"R",1);
-+-      for(i=0; i<nCol; i++){
-+-        switch( sqlite3_column_type(pStmt,i) ){
-+-          case SQLITE_NULL: {
-+-            SHA3Update(&cx, (const unsigned char*)"N",1);
-+-            break;
-+-          }
-+-          case SQLITE_INTEGER: {
-+-            sqlite3_uint64 u;
-+-            int j;
-+-            unsigned char x[9];
-+-            sqlite3_int64 v = sqlite3_column_int64(pStmt,i);
-+-            memcpy(&u, &v, 8);
-+-            for(j=8; j>=1; j--){
-+-              x[j] = u & 0xff;
-+-              u >>= 8;
-+-            }
-+-            x[0] = 'I';
-+-            SHA3Update(&cx, x, 9);
-+-            break;
-+-          }
-+-          case SQLITE_FLOAT: {
-+-            sqlite3_uint64 u;
-+-            int j;
-+-            unsigned char x[9];
-+-            double r = sqlite3_column_double(pStmt,i);
-+-            memcpy(&u, &r, 8);
-+-            for(j=8; j>=1; j--){
-+-              x[j] = u & 0xff;
-+-              u >>= 8;
-+-            }
-+-            x[0] = 'F';
-+-            SHA3Update(&cx,x,9);
-+-            break;
-+-          }
-+-          case SQLITE_TEXT: {
-+-            int n2 = sqlite3_column_bytes(pStmt, i);
-+-            const unsigned char *z2 = sqlite3_column_text(pStmt, i);
-+-            hash_step_vformat(&cx,"T%d:",n2);
-+-            SHA3Update(&cx, z2, n2);
-+-            break;
-+-          }
-+-          case SQLITE_BLOB: {
-+-            int n2 = sqlite3_column_bytes(pStmt, i);
-+-            const unsigned char *z2 = sqlite3_column_blob(pStmt, i);
-+-            hash_step_vformat(&cx,"B%d:",n2);
-+-            SHA3Update(&cx, z2, n2);
-+-            break;
-+-          }
-+-        }
-+-      }
-+-    }
-+-    sqlite3_finalize(pStmt);
-+-  }
-+-  sqlite3_result_blob(context, SHA3Final(&cx), iSize/8, SQLITE_TRANSIENT);
-+-}
-+-
-+-
-+-#ifdef _WIN32
-+-__declspec(dllexport)
-+-#endif
-+-int sqlite3_shathree_init(
-+-  sqlite3 *db,
-+-  char **pzErrMsg,
-+-  const sqlite3_api_routines *pApi
-+-){
-+-  int rc = SQLITE_OK;
-+-  SQLITE_EXTENSION_INIT2(pApi);
-+-  (void)pzErrMsg;  /* Unused parameter */
-+-  rc = sqlite3_create_function(db, "sha3", 1, SQLITE_UTF8, 0,
-+-                               sha3Func, 0, 0);
-+-  if( rc==SQLITE_OK ){
-+-    rc = sqlite3_create_function(db, "sha3", 2, SQLITE_UTF8, 0,
-+-                                 sha3Func, 0, 0);
-+-  }
-+-  if( rc==SQLITE_OK ){
-+-    rc = sqlite3_create_function(db, "sha3_query", 1, SQLITE_UTF8, 0,
-+-                                 sha3QueryFunc, 0, 0);
-+-  }
-+-  if( rc==SQLITE_OK ){
-+-    rc = sqlite3_create_function(db, "sha3_query", 2, SQLITE_UTF8, 0,
-+-                                 sha3QueryFunc, 0, 0);
-+-  }
-+-  return rc;
-+-}
-+-
-+-/************************* End ../ext/misc/shathree.c ********************/
-+-/************************* Begin ../ext/misc/fileio.c ******************/
-+-/*
-+-** 2014-06-13
-+-**
-+-** The author disclaims copyright to this source code.  In place of
-+-** a legal notice, here is a blessing:
-+-**
-+-**    May you do good and not evil.
-+-**    May you find forgiveness for yourself and forgive others.
-+-**    May you share freely, never taking more than you give.
-+-**
-+-******************************************************************************
-+-**
-+-** This SQLite extension implements SQL functions readfile() and
-+-** writefile().
-+-*/
-+-SQLITE_EXTENSION_INIT1
-+-#include <stdio.h>
-+-
-+-/*
-+-** Implementation of the "readfile(X)" SQL function.  The entire content
-+-** of the file named X is read and returned as a BLOB.  NULL is returned
-+-** if the file does not exist or is unreadable.
-+-*/
-+-static void readfileFunc(
-+-  sqlite3_context *context,
-+-  int argc,
-+-  sqlite3_value **argv
-+-){
-+-  const char *zName;
-+-  FILE *in;
-+-  long nIn;
-+-  void *pBuf;
-+-
-+-  (void)(argc);  /* Unused parameter */
-+-  zName = (const char*)sqlite3_value_text(argv[0]);
-+-  if( zName==0 ) return;
-+-  in = fopen(zName, "rb");
-+-  if( in==0 ) return;
-+-  fseek(in, 0, SEEK_END);
-+-  nIn = ftell(in);
-+-  rewind(in);
-+-  pBuf = sqlite3_malloc( nIn );
-+-  if( pBuf && 1==fread(pBuf, nIn, 1, in) ){
-+-    sqlite3_result_blob(context, pBuf, nIn, sqlite3_free);
-+-  }else{
-+-    sqlite3_free(pBuf);
-+-  }
-+-  fclose(in);
-+-}
-+-
-+-/*
-+-** Implementation of the "writefile(X,Y)" SQL function.  The argument Y
-+-** is written into file X.  The number of bytes written is returned.  Or
-+-** NULL is returned if something goes wrong, such as being unable to open
-+-** file X for writing.
-+-*/
-+-static void writefileFunc(
-+-  sqlite3_context *context,
-+-  int argc,
-+-  sqlite3_value **argv
-+-){
-+-  FILE *out;
-+-  const char *z;
-+-  sqlite3_int64 rc;
-+-  const char *zFile;
-+-
-+-  (void)(argc);  /* Unused parameter */
-+-  zFile = (const char*)sqlite3_value_text(argv[0]);
-+-  if( zFile==0 ) return;
-+-  out = fopen(zFile, "wb");
-+-  if( out==0 ) return;
-+-  z = (const char*)sqlite3_value_blob(argv[1]);
-+-  if( z==0 ){
-+-    rc = 0;
-+-  }else{
-+-    rc = fwrite(z, 1, sqlite3_value_bytes(argv[1]), out);
-+-  }
-+-  fclose(out);
-+-  sqlite3_result_int64(context, rc);
-+-}
-+-
-+-
-+-#ifdef _WIN32
-+-__declspec(dllexport)
-+-#endif
-+-int sqlite3_fileio_init(
-+-  sqlite3 *db,
-+-  char **pzErrMsg,
-+-  const sqlite3_api_routines *pApi
-+-){
-+-  int rc = SQLITE_OK;
-+-  SQLITE_EXTENSION_INIT2(pApi);
-+-  (void)pzErrMsg;  /* Unused parameter */
-+-  rc = sqlite3_create_function(db, "readfile", 1, SQLITE_UTF8, 0,
-+-                               readfileFunc, 0, 0);
-+-  if( rc==SQLITE_OK ){
-+-    rc = sqlite3_create_function(db, "writefile", 2, SQLITE_UTF8, 0,
-+-                                 writefileFunc, 0, 0);
-+-  }
-+-  return rc;
-+-}
-+-
-+-/************************* End ../ext/misc/fileio.c ********************/
-+-/************************* Begin ../ext/misc/completion.c ******************/
-+-/*
-+-** 2017-07-10
-+-**
-+-** The author disclaims copyright to this source code.  In place of
-+-** a legal notice, here is a blessing:
-+-**
-+-**    May you do good and not evil.
-+-**    May you find forgiveness for yourself and forgive others.
-+-**    May you share freely, never taking more than you give.
-+-**
-+-*************************************************************************
-+-**
-+-** This file implements an eponymous virtual table that returns suggested
-+-** completions for a partial SQL input.
-+-**
-+-** Suggested usage:
-+-**
-+-**     SELECT DISTINCT candidate COLLATE nocase
-+-**       FROM completion($prefix,$wholeline)
-+-**      ORDER BY 1;
-+-**
-+-** The two query parameters are optional.  $prefix is the text of the
-+-** current word being typed and that is to be completed.  $wholeline is
-+-** the complete input line, used for context.
-+-**
-+-** The raw completion() table might return the same candidate multiple
-+-** times, for example if the same column name is used to two or more
-+-** tables.  And the candidates are returned in an arbitrary order.  Hence,
-+-** the DISTINCT and ORDER BY are recommended.
-+-**
-+-** This virtual table operates at the speed of human typing, and so there
-+-** is no attempt to make it fast.  Even a slow implementation will be much
-+-** faster than any human can type.
-+-**
-+-*/
-+-SQLITE_EXTENSION_INIT1
-+-#include <assert.h>
-+-#include <string.h>
-+-#include <ctype.h>
-+-
-+-#ifndef SQLITE_OMIT_VIRTUALTABLE
-+-
-+-/* completion_vtab is a subclass of sqlite3_vtab which will
-+-** serve as the underlying representation of a completion virtual table
-+-*/
-+-typedef struct completion_vtab completion_vtab;
-+-struct completion_vtab {
-+-  sqlite3_vtab base;  /* Base class - must be first */
-+-  sqlite3 *db;        /* Database connection for this completion vtab */
-+-};
-+-
-+-/* completion_cursor is a subclass of sqlite3_vtab_cursor which will
-+-** serve as the underlying representation of a cursor that scans
-+-** over rows of the result
-+-*/
-+-typedef struct completion_cursor completion_cursor;
-+-struct completion_cursor {
-+-  sqlite3_vtab_cursor base;  /* Base class - must be first */
-+-  sqlite3 *db;               /* Database connection for this cursor */
-+-  int nPrefix, nLine;        /* Number of bytes in zPrefix and zLine */
-+-  char *zPrefix;             /* The prefix for the word we want to complete */
-+-  char *zLine;               /* The whole that we want to complete */
-+-  const char *zCurrentRow;   /* Current output row */
-+-  sqlite3_stmt *pStmt;       /* Current statement */
-+-  sqlite3_int64 iRowid;      /* The rowid */
-+-  int ePhase;                /* Current phase */
-+-  int j;                     /* inter-phase counter */
-+-};
-+-
-+-/* Values for ePhase:
-+-*/
-+-#define COMPLETION_FIRST_PHASE   1
-+-#define COMPLETION_KEYWORDS      1
-+-#define COMPLETION_PRAGMAS       2
-+-#define COMPLETION_FUNCTIONS     3
-+-#define COMPLETION_COLLATIONS    4
-+-#define COMPLETION_INDEXES       5
-+-#define COMPLETION_TRIGGERS      6
-+-#define COMPLETION_DATABASES     7
-+-#define COMPLETION_TABLES        8
-+-#define COMPLETION_COLUMNS       9
-+-#define COMPLETION_MODULES       10
-+-#define COMPLETION_EOF           11
-+-
-+-/*
-+-** The completionConnect() method is invoked to create a new
-+-** completion_vtab that describes the completion virtual table.
-+-**
-+-** Think of this routine as the constructor for completion_vtab objects.
-+-**
-+-** All this routine needs to do is:
-+-**
-+-**    (1) Allocate the completion_vtab object and initialize all fields.
-+-**
-+-**    (2) Tell SQLite (via the sqlite3_declare_vtab() interface) what the
-+-**        result set of queries against completion will look like.
-+-*/
-+-static int completionConnect(
-+-  sqlite3 *db,
-+-  void *pAux,
-+-  int argc, const char *const*argv,
-+-  sqlite3_vtab **ppVtab,
-+-  char **pzErr
-+-){
-+-  completion_vtab *pNew;
-+-  int rc;
-+-
-+-  (void)(pAux);    /* Unused parameter */
-+-  (void)(argc);    /* Unused parameter */
-+-  (void)(argv);    /* Unused parameter */
-+-  (void)(pzErr);   /* Unused parameter */
-+-
-+-/* Column numbers */
-+-#define COMPLETION_COLUMN_CANDIDATE 0  /* Suggested completion of the input */
-+-#define COMPLETION_COLUMN_PREFIX    1  /* Prefix of the word to be completed */
-+-#define COMPLETION_COLUMN_WHOLELINE 2  /* Entire line seen so far */
-+-#define COMPLETION_COLUMN_PHASE     3  /* ePhase - used for debugging only */
-+-
-+-  rc = sqlite3_declare_vtab(db,
-+-      "CREATE TABLE x("
-+-      "  candidate TEXT,"
-+-      "  prefix TEXT HIDDEN,"
-+-      "  wholeline TEXT HIDDEN,"
-+-      "  phase INT HIDDEN"        /* Used for debugging only */
-+-      ")");
-+-  if( rc==SQLITE_OK ){
-+-    pNew = sqlite3_malloc( sizeof(*pNew) );
-+-    *ppVtab = (sqlite3_vtab*)pNew;
-+-    if( pNew==0 ) return SQLITE_NOMEM;
-+-    memset(pNew, 0, sizeof(*pNew));
-+-    pNew->db = db;
-+-  }
-+-  return rc;
-+-}
-+-
-+-/*
-+-** This method is the destructor for completion_cursor objects.
-+-*/
-+-static int completionDisconnect(sqlite3_vtab *pVtab){
-+-  sqlite3_free(pVtab);
-+-  return SQLITE_OK;
-+-}
-+-
-+-/*
-+-** Constructor for a new completion_cursor object.
-+-*/
-+-static int completionOpen(sqlite3_vtab *p, sqlite3_vtab_cursor **ppCursor){
-+-  completion_cursor *pCur;
-+-  pCur = sqlite3_malloc( sizeof(*pCur) );
-+-  if( pCur==0 ) return SQLITE_NOMEM;
-+-  memset(pCur, 0, sizeof(*pCur));
-+-  pCur->db = ((completion_vtab*)p)->db;
-+-  *ppCursor = &pCur->base;
-+-  return SQLITE_OK;
-+-}
-+-
-+-/*
-+-** Reset the completion_cursor.
-+-*/
-+-static void completionCursorReset(completion_cursor *pCur){
-+-  sqlite3_free(pCur->zPrefix);   pCur->zPrefix = 0;  pCur->nPrefix = 0;
-+-  sqlite3_free(pCur->zLine);     pCur->zLine = 0;    pCur->nLine = 0;
-+-  sqlite3_finalize(pCur->pStmt); pCur->pStmt = 0;
-+-  pCur->j = 0;
-+-}
-+-
-+-/*
-+-** Destructor for a completion_cursor.
-+-*/
-+-static int completionClose(sqlite3_vtab_cursor *cur){
-+-  completionCursorReset((completion_cursor*)cur);
-+-  sqlite3_free(cur);
-+-  return SQLITE_OK;
-+-}
-+-
-+-/*
-+-** All SQL keywords understood by SQLite
-+-*/
-+-static const char *completionKwrds[] = {
-+-  "ABORT", "ACTION", "ADD", "AFTER", "ALL", "ALTER", "ANALYZE", "AND", "AS",
-+-  "ASC", "ATTACH", "AUTOINCREMENT", "BEFORE", "BEGIN", "BETWEEN", "BY",
-+-  "CASCADE", "CASE", "CAST", "CHECK", "COLLATE", "COLUMN", "COMMIT",
-+-  "CONFLICT", "CONSTRAINT", "CREATE", "CROSS", "CURRENT_DATE",
-+-  "CURRENT_TIME", "CURRENT_TIMESTAMP", "DATABASE", "DEFAULT", "DEFERRABLE",
-+-  "DEFERRED", "DELETE", "DESC", "DETACH", "DISTINCT", "DROP", "EACH",
-+-  "ELSE", "END", "ESCAPE", "EXCEPT", "EXCLUSIVE", "EXISTS", "EXPLAIN",
-+-  "FAIL", "FOR", "FOREIGN", "FROM", "FULL", "GLOB", "GROUP", "HAVING", "IF",
-+-  "IGNORE", "IMMEDIATE", "IN", "INDEX", "INDEXED", "INITIALLY", "INNER",
-+-  "INSERT", "INSTEAD", "INTERSECT", "INTO", "IS", "ISNULL", "JOIN", "KEY",
-+-  "LEFT", "LIKE", "LIMIT", "MATCH", "NATURAL", "NO", "NOT", "NOTNULL",
-+-  "NULL", "OF", "OFFSET", "ON", "OR", "ORDER", "OUTER", "PLAN", "PRAGMA",
-+-  "PRIMARY", "QUERY", "RAISE", "RECURSIVE", "REFERENCES", "REGEXP",
-+-  "REINDEX", "RELEASE", "RENAME", "REPLACE", "RESTRICT", "RIGHT",
-+-  "ROLLBACK", "ROW", "SAVEPOINT", "SELECT", "SET", "TABLE", "TEMP",
-+-  "TEMPORARY", "THEN", "TO", "TRANSACTION", "TRIGGER", "UNION", "UNIQUE",
-+-  "UPDATE", "USING", "VACUUM", "VALUES", "VIEW", "VIRTUAL", "WHEN", "WHERE",
-+-  "WITH", "WITHOUT",
-+-};
-+-#define completionKwCount \
-+-   (int)(sizeof(completionKwrds)/sizeof(completionKwrds[0]))
-+-
-+-/*
-+-** Advance a completion_cursor to its next row of output.
-+-**
-+-** The ->ePhase, ->j, and ->pStmt fields of the completion_cursor object
-+-** record the current state of the scan.  This routine sets ->zCurrentRow
-+-** to the current row of output and then returns.  If no more rows remain,
-+-** then ->ePhase is set to COMPLETION_EOF which will signal the virtual
-+-** table that has reached the end of its scan.
-+-**
-+-** The current implementation just lists potential identifiers and
-+-** keywords and filters them by zPrefix.  Future enhancements should
-+-** take zLine into account to try to restrict the set of identifiers and
-+-** keywords based on what would be legal at the current point of input.
-+-*/
-+-static int completionNext(sqlite3_vtab_cursor *cur){
-+-  completion_cursor *pCur = (completion_cursor*)cur;
-+-  int eNextPhase = 0;  /* Next phase to try if current phase reaches end */
-+-  int iCol = -1;       /* If >=0, step pCur->pStmt and use the i-th column */
-+-  pCur->iRowid++;
-+-  while( pCur->ePhase!=COMPLETION_EOF ){
-+-    switch( pCur->ePhase ){
-+-      case COMPLETION_KEYWORDS: {
-+-        if( pCur->j >= completionKwCount ){
-+-          pCur->zCurrentRow = 0;
-+-          pCur->ePhase = COMPLETION_DATABASES;
-+-        }else{
-+-          pCur->zCurrentRow = completionKwrds[pCur->j++];
-+-        }
-+-        iCol = -1;
-+-        break;
-+-      }
-+-      case COMPLETION_DATABASES: {
-+-        if( pCur->pStmt==0 ){
-+-          sqlite3_prepare_v2(pCur->db, "PRAGMA database_list", -1,
-+-                             &pCur->pStmt, 0);
-+-        }
-+-        iCol = 1;
-+-        eNextPhase = COMPLETION_TABLES;
-+-        break;
-+-      }
-+-      case COMPLETION_TABLES: {
-+-        if( pCur->pStmt==0 ){
-+-          sqlite3_stmt *pS2;
-+-          char *zSql = 0;
-+-          const char *zSep = "";
-+-          sqlite3_prepare_v2(pCur->db, "PRAGMA database_list", -1, &pS2, 0);
-+-          while( sqlite3_step(pS2)==SQLITE_ROW ){
-+-            const char *zDb = (const char*)sqlite3_column_text(pS2, 1);
-+-            zSql = sqlite3_mprintf(
-+-               "%z%s"
-+-               "SELECT name FROM \"%w\".sqlite_master"
-+-               " WHERE type='table'",
-+-               zSql, zSep, zDb
-+-            );
-+-            if( zSql==0 ) return SQLITE_NOMEM;
-+-            zSep = " UNION ";
-+-          }
-+-          sqlite3_finalize(pS2);
-+-          sqlite3_prepare_v2(pCur->db, zSql, -1, &pCur->pStmt, 0);
-+-          sqlite3_free(zSql);
-+-        }
-+-        iCol = 0;
-+-        eNextPhase = COMPLETION_COLUMNS;
-+-        break;
-+-      }
-+-      case COMPLETION_COLUMNS: {
-+-        if( pCur->pStmt==0 ){
-+-          sqlite3_stmt *pS2;
-+-          char *zSql = 0;
-+-          const char *zSep = "";
-+-          sqlite3_prepare_v2(pCur->db, "PRAGMA database_list", -1, &pS2, 0);
-+-          while( sqlite3_step(pS2)==SQLITE_ROW ){
-+-            const char *zDb = (const char*)sqlite3_column_text(pS2, 1);
-+-            zSql = sqlite3_mprintf(
-+-               "%z%s"
-+-               "SELECT pti.name FROM \"%w\".sqlite_master AS sm"
-+-                       " JOIN pragma_table_info(sm.name,%Q) AS pti"
-+-               " WHERE sm.type='table'",
-+-               zSql, zSep, zDb, zDb
-+-            );
-+-            if( zSql==0 ) return SQLITE_NOMEM;
-+-            zSep = " UNION ";
-+-          }
-+-          sqlite3_finalize(pS2);
-+-          sqlite3_prepare_v2(pCur->db, zSql, -1, &pCur->pStmt, 0);
-+-          sqlite3_free(zSql);
-+-        }
-+-        iCol = 0;
-+-        eNextPhase = COMPLETION_EOF;
-+-        break;
-+-      }
-+-    }
-+-    if( iCol<0 ){
-+-      /* This case is when the phase presets zCurrentRow */
-+-      if( pCur->zCurrentRow==0 ) continue;
-+-    }else{
-+-      if( sqlite3_step(pCur->pStmt)==SQLITE_ROW ){
-+-        /* Extract the next row of content */
-+-        pCur->zCurrentRow = (const char*)sqlite3_column_text(pCur->pStmt, iCol);
-+-      }else{
-+-        /* When all rows are finished, advance to the next phase */
-+-        sqlite3_finalize(pCur->pStmt);
-+-        pCur->pStmt = 0;
-+-        pCur->ePhase = eNextPhase;
-+-        continue;
-+-      }
-+-    }
-+-    if( pCur->nPrefix==0 ) break;
-+-    if( sqlite3_strnicmp(pCur->zPrefix, pCur->zCurrentRow, pCur->nPrefix)==0 ){
-+-      break;
-+-    }
-+-  }
-+-
-+-  return SQLITE_OK;
-+-}
-+-
-+-/*
-+-** Return values of columns for the row at which the completion_cursor
-+-** is currently pointing.
-+-*/
-+-static int completionColumn(
-+-  sqlite3_vtab_cursor *cur,   /* The cursor */
-+-  sqlite3_context *ctx,       /* First argument to sqlite3_result_...() */
-+-  int i                       /* Which column to return */
-+-){
-+-  completion_cursor *pCur = (completion_cursor*)cur;
-+-  switch( i ){
-+-    case COMPLETION_COLUMN_CANDIDATE: {
-+-      sqlite3_result_text(ctx, pCur->zCurrentRow, -1, SQLITE_TRANSIENT);
-+-      break;
-+-    }
-+-    case COMPLETION_COLUMN_PREFIX: {
-+-      sqlite3_result_text(ctx, pCur->zPrefix, -1, SQLITE_TRANSIENT);
-+-      break;
-+-    }
-+-    case COMPLETION_COLUMN_WHOLELINE: {
-+-      sqlite3_result_text(ctx, pCur->zLine, -1, SQLITE_TRANSIENT);
-+-      break;
-+-    }
-+-    case COMPLETION_COLUMN_PHASE: {
-+-      sqlite3_result_int(ctx, pCur->ePhase);
-+-      break;
-+-    }
-+-  }
-+-  return SQLITE_OK;
-+-}
-+-
-+-/*
-+-** Return the rowid for the current row.  In this implementation, the
-+-** rowid is the same as the output value.
-+-*/
-+-static int completionRowid(sqlite3_vtab_cursor *cur, sqlite_int64 *pRowid){
-+-  completion_cursor *pCur = (completion_cursor*)cur;
-+-  *pRowid = pCur->iRowid;
-+-  return SQLITE_OK;
-+-}
-+-
-+-/*
-+-** Return TRUE if the cursor has been moved off of the last
-+-** row of output.
-+-*/
-+-static int completionEof(sqlite3_vtab_cursor *cur){
-+-  completion_cursor *pCur = (completion_cursor*)cur;
-+-  return pCur->ePhase >= COMPLETION_EOF;
-+-}
-+-
-+-/*
-+-** This method is called to "rewind" the completion_cursor object back
-+-** to the first row of output.  This method is always called at least
-+-** once prior to any call to completionColumn() or completionRowid() or
-+-** completionEof().
-+-*/
-+-static int completionFilter(
-+-  sqlite3_vtab_cursor *pVtabCursor,
-+-  int idxNum, const char *idxStr,
-+-  int argc, sqlite3_value **argv
-+-){
-+-  completion_cursor *pCur = (completion_cursor *)pVtabCursor;
-+-  int iArg = 0;
-+-  (void)(idxStr);   /* Unused parameter */
-+-  (void)(argc);     /* Unused parameter */
-+-  completionCursorReset(pCur);
-+-  if( idxNum & 1 ){
-+-    pCur->nPrefix = sqlite3_value_bytes(argv[iArg]);
-+-    if( pCur->nPrefix>0 ){
-+-      pCur->zPrefix = sqlite3_mprintf("%s", sqlite3_value_text(argv[iArg]));
-+-      if( pCur->zPrefix==0 ) return SQLITE_NOMEM;
-+-    }
-+-    iArg++;
-+-  }
-+-  if( idxNum & 2 ){
-+-    pCur->nLine = sqlite3_value_bytes(argv[iArg]);
-+-    if( pCur->nLine>0 ){
-+-      pCur->zLine = sqlite3_mprintf("%s", sqlite3_value_text(argv[iArg]));
-+-      if( pCur->zLine==0 ) return SQLITE_NOMEM;
-+-    }
-+-    iArg++;
-+-  }
-+-  if( pCur->zLine!=0 && pCur->zPrefix==0 ){
-+-    int i = pCur->nLine;
-+-    while( i>0 && (isalnum(pCur->zLine[i-1]) || pCur->zLine[i-1]=='_') ){
-+-      i--;
-+-    }
-+-    pCur->nPrefix = pCur->nLine - i;
-+-    if( pCur->nPrefix>0 ){
-+-      pCur->zPrefix = sqlite3_mprintf("%.*s", pCur->nPrefix, pCur->zLine + i);
-+-      if( pCur->zPrefix==0 ) return SQLITE_NOMEM;
-+-    }
-+-  }
-+-  pCur->iRowid = 0;
-+-  pCur->ePhase = COMPLETION_FIRST_PHASE;
-+-  return completionNext(pVtabCursor);
-+-}
-+-
-+-/*
-+-** SQLite will invoke this method one or more times while planning a query
-+-** that uses the completion virtual table.  This routine needs to create
-+-** a query plan for each invocation and compute an estimated cost for that
-+-** plan.
-+-**
-+-** There are two hidden parameters that act as arguments to the table-valued
-+-** function:  "prefix" and "wholeline".  Bit 0 of idxNum is set if "prefix"
-+-** is available and bit 1 is set if "wholeline" is available.
-+-*/
-+-static int completionBestIndex(
-+-  sqlite3_vtab *tab,
-+-  sqlite3_index_info *pIdxInfo
-+-){
-+-  int i;                 /* Loop over constraints */
-+-  int idxNum = 0;        /* The query plan bitmask */
-+-  int prefixIdx = -1;    /* Index of the start= constraint, or -1 if none */
-+-  int wholelineIdx = -1; /* Index of the stop= constraint, or -1 if none */
-+-  int nArg = 0;          /* Number of arguments that completeFilter() expects */
-+-  const struct sqlite3_index_constraint *pConstraint;
-+-
-+-  (void)(tab);    /* Unused parameter */
-+-  pConstraint = pIdxInfo->aConstraint;
-+-  for(i=0; i<pIdxInfo->nConstraint; i++, pConstraint++){
-+-    if( pConstraint->usable==0 ) continue;
-+-    if( pConstraint->op!=SQLITE_INDEX_CONSTRAINT_EQ ) continue;
-+-    switch( pConstraint->iColumn ){
-+-      case COMPLETION_COLUMN_PREFIX:
-+-        prefixIdx = i;
-+-        idxNum |= 1;
-+-        break;
-+-      case COMPLETION_COLUMN_WHOLELINE:
-+-        wholelineIdx = i;
-+-        idxNum |= 2;
-+-        break;
-+-    }
-+-  }
-+-  if( prefixIdx>=0 ){
-+-    pIdxInfo->aConstraintUsage[prefixIdx].argvIndex = ++nArg;
-+-    pIdxInfo->aConstraintUsage[prefixIdx].omit = 1;
-+-  }
-+-  if( wholelineIdx>=0 ){
-+-    pIdxInfo->aConstraintUsage[wholelineIdx].argvIndex = ++nArg;
-+-    pIdxInfo->aConstraintUsage[wholelineIdx].omit = 1;
-+-  }
-+-  pIdxInfo->idxNum = idxNum;
-+-  pIdxInfo->estimatedCost = (double)5000 - 1000*nArg;
-+-  pIdxInfo->estimatedRows = 500 - 100*nArg;
-+-  return SQLITE_OK;
-+-}
-+-
-+-/*
-+-** This following structure defines all the methods for the
-+-** completion virtual table.
-+-*/
-+-static sqlite3_module completionModule = {
-+-  0,                         /* iVersion */
-+-  0,                         /* xCreate */
-+-  completionConnect,         /* xConnect */
-+-  completionBestIndex,       /* xBestIndex */
-+-  completionDisconnect,      /* xDisconnect */
-+-  0,                         /* xDestroy */
-+-  completionOpen,            /* xOpen - open a cursor */
-+-  completionClose,           /* xClose - close a cursor */
-+-  completionFilter,          /* xFilter - configure scan constraints */
-+-  completionNext,            /* xNext - advance a cursor */
-+-  completionEof,             /* xEof - check for end of scan */
-+-  completionColumn,          /* xColumn - read data */
-+-  completionRowid,           /* xRowid - read data */
-+-  0,                         /* xUpdate */
-+-  0,                         /* xBegin */
-+-  0,                         /* xSync */
-+-  0,                         /* xCommit */
-+-  0,                         /* xRollback */
-+-  0,                         /* xFindMethod */
-+-  0,                         /* xRename */
-+-  0,                         /* xSavepoint */
-+-  0,                         /* xRelease */
-+-  0                          /* xRollbackTo */
-+-};
-+-
-+-#endif /* SQLITE_OMIT_VIRTUALTABLE */
-+-
-+-int sqlite3CompletionVtabInit(sqlite3 *db){
-+-  int rc = SQLITE_OK;
-+-#ifndef SQLITE_OMIT_VIRTUALTABLE
-+-  rc = sqlite3_create_module(db, "completion", &completionModule, 0);
-+-#endif
-+-  return rc;
-+-}
-+-
-+-#ifdef _WIN32
-+-__declspec(dllexport)
-+-#endif
-+-int sqlite3_completion_init(
-+-  sqlite3 *db,
-+-  char **pzErrMsg,
-+-  const sqlite3_api_routines *pApi
-+-){
-+-  int rc = SQLITE_OK;
-+-  SQLITE_EXTENSION_INIT2(pApi);
-+-  (void)(pzErrMsg);  /* Unused parameter */
-+-#ifndef SQLITE_OMIT_VIRTUALTABLE
-+-  rc = sqlite3CompletionVtabInit(db);
-+-#endif
-+-  return rc;
-+-}
-+-
-+-/************************* End ../ext/misc/completion.c ********************/
-+-
-+-#if defined(SQLITE_ENABLE_SESSION)
-+-/*
-+-** State information for a single open session
-+-*/
-+-typedef struct OpenSession OpenSession;
-+-struct OpenSession {
-+-  char *zName;             /* Symbolic name for this session */
-+-  int nFilter;             /* Number of xFilter rejection GLOB patterns */
-+-  char **azFilter;         /* Array of xFilter rejection GLOB patterns */
-+-  sqlite3_session *p;      /* The open session */
-+-};
-+-#endif
-+-
-+-/*
-+-** Shell output mode information from before ".explain on",
-+-** saved so that it can be restored by ".explain off"
-+-*/
-+-typedef struct SavedModeInfo SavedModeInfo;
-+-struct SavedModeInfo {
-+-  int valid;          /* Is there legit data in here? */
-+-  int mode;           /* Mode prior to ".explain on" */
-+-  int showHeader;     /* The ".header" setting prior to ".explain on" */
-+-  int colWidth[100];  /* Column widths prior to ".explain on" */
-+-};
-+-
-+-/*
-+-** State information about the database connection is contained in an
-+-** instance of the following structure.
-+-*/
-+-typedef struct ShellState ShellState;
-+-struct ShellState {
-+-  sqlite3 *db;           /* The database */
-+-  int autoExplain;       /* Automatically turn on .explain mode */
-+-  int autoEQP;           /* Run EXPLAIN QUERY PLAN prior to seach SQL stmt */
-+-  int statsOn;           /* True to display memory stats before each finalize */
-+-  int scanstatsOn;       /* True to display scan stats before each finalize */
-+-  int outCount;          /* Revert to stdout when reaching zero */
-+-  int cnt;               /* Number of records displayed so far */
-+-  FILE *out;             /* Write results here */
-+-  FILE *traceOut;        /* Output for sqlite3_trace() */
-+-  int nErr;              /* Number of errors seen */
-+-  int mode;              /* An output mode setting */
-+-  int cMode;             /* temporary output mode for the current query */
-+-  int normalMode;        /* Output mode before ".explain on" */
-+-  int writableSchema;    /* True if PRAGMA writable_schema=ON */
-+-  int showHeader;        /* True to show column names in List or Column mode */
-+-  int nCheck;            /* Number of ".check" commands run */
-+-  unsigned shellFlgs;    /* Various flags */
-+-  char *zDestTable;      /* Name of destination table when MODE_Insert */
-+-  char zTestcase[30];    /* Name of current test case */
-+-  char colSeparator[20]; /* Column separator character for several modes */
-+-  char rowSeparator[20]; /* Row separator character for MODE_Ascii */
-+-  int colWidth[100];     /* Requested width of each column when in column mode*/
-+-  int actualWidth[100];  /* Actual width of each column */
-+-  char nullValue[20];    /* The text to print when a NULL comes back from
-+-                         ** the database */
-+-  char outfile[FILENAME_MAX]; /* Filename for *out */
-+-  const char *zDbFilename;    /* name of the database file */
-+-  char *zFreeOnClose;         /* Filename to free when closing */
-+-  const char *zVfs;           /* Name of VFS to use */
-+-  sqlite3_stmt *pStmt;   /* Current statement if any. */
-+-  FILE *pLog;            /* Write log output here */
-+-  int *aiIndent;         /* Array of indents used in MODE_Explain */
-+-  int nIndent;           /* Size of array aiIndent[] */
-+-  int iIndent;           /* Index of current op in aiIndent[] */
-+-#if defined(SQLITE_ENABLE_SESSION)
-+-  int nSession;             /* Number of active sessions */
-+-  OpenSession aSession[4];  /* Array of sessions.  [0] is in focus. */
-+-#endif
-+-};
-+-
-+-/*
-+-** These are the allowed shellFlgs values
-+-*/
-+-#define SHFLG_Scratch        0x00000001 /* The --scratch option is used */
-+-#define SHFLG_Pagecache      0x00000002 /* The --pagecache option is used */
-+-#define SHFLG_Lookaside      0x00000004 /* Lookaside memory is used */
-+-#define SHFLG_Backslash      0x00000008 /* The --backslash option is used */
-+-#define SHFLG_PreserveRowid  0x00000010 /* .dump preserves rowid values */
-+-#define SHFLG_Newlines       0x00000020 /* .dump --newline flag */
-+-#define SHFLG_CountChanges   0x00000040 /* .changes setting */
-+-#define SHFLG_Echo           0x00000080 /* .echo or --echo setting */
-+-
-+-/*
-+-** Macros for testing and setting shellFlgs
-+-*/
-+-#define ShellHasFlag(P,X)    (((P)->shellFlgs & (X))!=0)
-+-#define ShellSetFlag(P,X)    ((P)->shellFlgs|=(X))
-+-#define ShellClearFlag(P,X)  ((P)->shellFlgs&=(~(X)))
-+-
-+-/*
-+-** These are the allowed modes.
-+-*/
-+-#define MODE_Line     0  /* One column per line.  Blank line between records */
-+-#define MODE_Column   1  /* One record per line in neat columns */
-+-#define MODE_List     2  /* One record per line with a separator */
-+-#define MODE_Semi     3  /* Same as MODE_List but append ";" to each line */
-+-#define MODE_Html     4  /* Generate an XHTML table */
-+-#define MODE_Insert   5  /* Generate SQL "insert" statements */
-+-#define MODE_Quote    6  /* Quote values as for SQL */
-+-#define MODE_Tcl      7  /* Generate ANSI-C or TCL quoted elements */
-+-#define MODE_Csv      8  /* Quote strings, numbers are plain */
-+-#define MODE_Explain  9  /* Like MODE_Column, but do not truncate data */
-+-#define MODE_Ascii   10  /* Use ASCII unit and record separators (0x1F/0x1E) */
-+-#define MODE_Pretty  11  /* Pretty-print schemas */
-+-
-+-static const char *modeDescr[] = {
-+-  "line",
-+-  "column",
-+-  "list",
-+-  "semi",
-+-  "html",
-+-  "insert",
-+-  "quote",
-+-  "tcl",
-+-  "csv",
-+-  "explain",
-+-  "ascii",
-+-  "prettyprint",
-+-};
-+-
-+-/*
-+-** These are the column/row/line separators used by the various
-+-** import/export modes.
-+-*/
-+-#define SEP_Column    "|"
-+-#define SEP_Row       "\n"
-+-#define SEP_Tab       "\t"
-+-#define SEP_Space     " "
-+-#define SEP_Comma     ","
-+-#define SEP_CrLf      "\r\n"
-+-#define SEP_Unit      "\x1F"
-+-#define SEP_Record    "\x1E"
-+-
-+-/*
-+-** Number of elements in an array
-+-*/
-+-#define ArraySize(X)  (int)(sizeof(X)/sizeof(X[0]))
-+-
-+-/*
-+-** A callback for the sqlite3_log() interface.
-+-*/
-+-static void shellLog(void *pArg, int iErrCode, const char *zMsg){
-+-  ShellState *p = (ShellState*)pArg;
-+-  if( p->pLog==0 ) return;
-+-  utf8_printf(p->pLog, "(%d) %s\n", iErrCode, zMsg);
-+-  fflush(p->pLog);
-+-}
-+-
-+-/*
-+-** Output the given string as a hex-encoded blob (eg. X'1234' )
-+-*/
-+-static void output_hex_blob(FILE *out, const void *pBlob, int nBlob){
-+-  int i;
-+-  char *zBlob = (char *)pBlob;
-+-  raw_printf(out,"X'");
-+-  for(i=0; i<nBlob; i++){ raw_printf(out,"%02x",zBlob[i]&0xff); }
-+-  raw_printf(out,"'");
-+-}
-+-
-+-/*
-+-** Find a string that is not found anywhere in z[].  Return a pointer
-+-** to that string.
-+-**
-+-** Try to use zA and zB first.  If both of those are already found in z[]
-+-** then make up some string and store it in the buffer zBuf.
-+-*/
-+-static const char *unused_string(
-+-  const char *z,                    /* Result must not appear anywhere in z */
-+-  const char *zA, const char *zB,   /* Try these first */
-+-  char *zBuf                        /* Space to store a generated string */
-+-){
-+-  unsigned i = 0;
-+-  if( strstr(z, zA)==0 ) return zA;
-+-  if( strstr(z, zB)==0 ) return zB;
-+-  do{
-+-    sqlite3_snprintf(20,zBuf,"(%s%u)", zA, i++);
-+-  }while( strstr(z,zBuf)!=0 );
-+-  return zBuf;
-+-}
-+-
-+-/*
-+-** Output the given string as a quoted string using SQL quoting conventions.
-+-**
-+-** See also: output_quoted_escaped_string()
-+-*/
-+-static void output_quoted_string(FILE *out, const char *z){
-+-  int i;
-+-  char c;
-+-  setBinaryMode(out, 1);
-+-  for(i=0; (c = z[i])!=0 && c!='\''; i++){}
-+-  if( c==0 ){
-+-    utf8_printf(out,"'%s'",z);
-+-  }else{
-+-    raw_printf(out, "'");
-+-    while( *z ){
-+-      for(i=0; (c = z[i])!=0 && c!='\''; i++){}
-+-      if( c=='\'' ) i++;
-+-      if( i ){
-+-        utf8_printf(out, "%.*s", i, z);
-+-        z += i;
-+-      }
-+-      if( c=='\'' ){
-+-        raw_printf(out, "'");
-+-        continue;
-+-      }
-+-      if( c==0 ){
-+-        break;
-+-      }
-+-      z++;
-+-    }
-+-    raw_printf(out, "'");
-+-  }
-+-  setTextMode(out, 1);
-+-}
-+-
-+-/*
-+-** Output the given string as a quoted string using SQL quoting conventions.
-+-** Additionallly , escape the "\n" and "\r" characters so that they do not
-+-** get corrupted by end-of-line translation facilities in some operating
-+-** systems.
-+-**
-+-** This is like output_quoted_string() but with the addition of the \r\n
-+-** escape mechanism.
-+-*/
-+-static void output_quoted_escaped_string(FILE *out, const char *z){
-+-  int i;
-+-  char c;
-+-  setBinaryMode(out, 1);
-+-  for(i=0; (c = z[i])!=0 && c!='\'' && c!='\n' && c!='\r'; i++){}
-+-  if( c==0 ){
-+-    utf8_printf(out,"'%s'",z);
-+-  }else{
-+-    const char *zNL = 0;
-+-    const char *zCR = 0;
-+-    int nNL = 0;
-+-    int nCR = 0;
-+-    char zBuf1[20], zBuf2[20];
-+-    for(i=0; z[i]; i++){
-+-      if( z[i]=='\n' ) nNL++;
-+-      if( z[i]=='\r' ) nCR++;
-+-    }
-+-    if( nNL ){
-+-      raw_printf(out, "replace(");
-+-      zNL = unused_string(z, "\\n", "\\012", zBuf1);
-+-    }
-+-    if( nCR ){
-+-      raw_printf(out, "replace(");
-+-      zCR = unused_string(z, "\\r", "\\015", zBuf2);
-+-    }
-+-    raw_printf(out, "'");
-+-    while( *z ){
-+-      for(i=0; (c = z[i])!=0 && c!='\n' && c!='\r' && c!='\''; i++){}
-+-      if( c=='\'' ) i++;
-+-      if( i ){
-+-        utf8_printf(out, "%.*s", i, z);
-+-        z += i;
-+-      }
-+-      if( c=='\'' ){
-+-        raw_printf(out, "'");
-+-        continue;
-+-      }
-+-      if( c==0 ){
-+-        break;
-+-      }
-+-      z++;
-+-      if( c=='\n' ){
-+-        raw_printf(out, "%s", zNL);
-+-        continue;
-+-      }
-+-      raw_printf(out, "%s", zCR);
-+-    }
-+-    raw_printf(out, "'");
-+-    if( nCR ){
-+-      raw_printf(out, ",'%s',char(13))", zCR);
-+-    }
-+-    if( nNL ){
-+-      raw_printf(out, ",'%s',char(10))", zNL);
-+-    }
-+-  }
-+-  setTextMode(out, 1);
-+-}
-+-
-+-/*
-+-** Output the given string as a quoted according to C or TCL quoting rules.
-+-*/
-+-static void output_c_string(FILE *out, const char *z){
-+-  unsigned int c;
-+-  fputc('"', out);
-+-  while( (c = *(z++))!=0 ){
-+-    if( c=='\\' ){
-+-      fputc(c, out);
-+-      fputc(c, out);
-+-    }else if( c=='"' ){
-+-      fputc('\\', out);
-+-      fputc('"', out);
-+-    }else if( c=='\t' ){
-+-      fputc('\\', out);
-+-      fputc('t', out);
-+-    }else if( c=='\n' ){
-+-      fputc('\\', out);
-+-      fputc('n', out);
-+-    }else if( c=='\r' ){
-+-      fputc('\\', out);
-+-      fputc('r', out);
-+-    }else if( !isprint(c&0xff) ){
-+-      raw_printf(out, "\\%03o", c&0xff);
-+-    }else{
-+-      fputc(c, out);
-+-    }
-+-  }
-+-  fputc('"', out);
-+-}
-+-
-+-/*
-+-** Output the given string with characters that are special to
-+-** HTML escaped.
-+-*/
-+-static void output_html_string(FILE *out, const char *z){
-+-  int i;
-+-  if( z==0 ) z = "";
-+-  while( *z ){
-+-    for(i=0;   z[i]
-+-            && z[i]!='<'
-+-            && z[i]!='&'
-+-            && z[i]!='>'
-+-            && z[i]!='\"'
-+-            && z[i]!='\'';
-+-        i++){}
-+-    if( i>0 ){
-+-      utf8_printf(out,"%.*s",i,z);
-+-    }
-+-    if( z[i]=='<' ){
-+-      raw_printf(out,"&lt;");
-+-    }else if( z[i]=='&' ){
-+-      raw_printf(out,"&amp;");
-+-    }else if( z[i]=='>' ){
-+-      raw_printf(out,"&gt;");
-+-    }else if( z[i]=='\"' ){
-+-      raw_printf(out,"&quot;");
-+-    }else if( z[i]=='\'' ){
-+-      raw_printf(out,"&#39;");
-+-    }else{
-+-      break;
-+-    }
-+-    z += i + 1;
-+-  }
-+-}
-+-
-+-/*
-+-** If a field contains any character identified by a 1 in the following
-+-** array, then the string must be quoted for CSV.
-+-*/
-+-static const char needCsvQuote[] = {
-+-  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-+-  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-+-  1, 0, 1, 0, 0, 0, 0, 1,   0, 0, 0, 0, 0, 0, 0, 0,
-+-  0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
-+-  0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
-+-  0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
-+-  0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
-+-  0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 1,
-+-  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-+-  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-+-  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-+-  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-+-  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-+-  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-+-  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-+-  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-+-};
-+-
-+-/*
-+-** Output a single term of CSV.  Actually, p->colSeparator is used for
-+-** the separator, which may or may not be a comma.  p->nullValue is
-+-** the null value.  Strings are quoted if necessary.  The separator
-+-** is only issued if bSep is true.
-+-*/
-+-static void output_csv(ShellState *p, const char *z, int bSep){
-+-  FILE *out = p->out;
-+-  if( z==0 ){
-+-    utf8_printf(out,"%s",p->nullValue);
-+-  }else{
-+-    int i;
-+-    int nSep = strlen30(p->colSeparator);
-+-    for(i=0; z[i]; i++){
-+-      if( needCsvQuote[((unsigned char*)z)[i]]
-+-         || (z[i]==p->colSeparator[0] &&
-+-             (nSep==1 || memcmp(z, p->colSeparator, nSep)==0)) ){
-+-        i = 0;
-+-        break;
-+-      }
-+-    }
-+-    if( i==0 ){
-+-      putc('"', out);
-+-      for(i=0; z[i]; i++){
-+-        if( z[i]=='"' ) putc('"', out);
-+-        putc(z[i], out);
-+-      }
-+-      putc('"', out);
-+-    }else{
-+-      utf8_printf(out, "%s", z);
-+-    }
-+-  }
-+-  if( bSep ){
-+-    utf8_printf(p->out, "%s", p->colSeparator);
-+-  }
-+-}
-+-
-+-#ifdef SIGINT
-+-/*
-+-** This routine runs when the user presses Ctrl-C
-+-*/
-+-static void interrupt_handler(int NotUsed){
-+-  UNUSED_PARAMETER(NotUsed);
-+-  seenInterrupt++;
-+-  if( seenInterrupt>2 ) exit(1);
-+-  if( globalDb ) sqlite3_interrupt(globalDb);
-+-}
-+-#endif
-+-
-+-#ifndef SQLITE_OMIT_AUTHORIZATION
-+-/*
-+-** When the ".auth ON" is set, the following authorizer callback is
-+-** invoked.  It always returns SQLITE_OK.
-+-*/
-+-static int shellAuth(
-+-  void *pClientData,
-+-  int op,
-+-  const char *zA1,
-+-  const char *zA2,
-+-  const char *zA3,
-+-  const char *zA4
-+-){
-+-  ShellState *p = (ShellState*)pClientData;
-+-  static const char *azAction[] = { 0,
-+-     "CREATE_INDEX",         "CREATE_TABLE",         "CREATE_TEMP_INDEX",
-+-     "CREATE_TEMP_TABLE",    "CREATE_TEMP_TRIGGER",  "CREATE_TEMP_VIEW",
-+-     "CREATE_TRIGGER",       "CREATE_VIEW",          "DELETE",
-+-     "DROP_INDEX",           "DROP_TABLE",           "DROP_TEMP_INDEX",
-+-     "DROP_TEMP_TABLE",      "DROP_TEMP_TRIGGER",    "DROP_TEMP_VIEW",
-+-     "DROP_TRIGGER",         "DROP_VIEW",            "INSERT",
-+-     "PRAGMA",               "READ",                 "SELECT",
-+-     "TRANSACTION",          "UPDATE",               "ATTACH",
-+-     "DETACH",               "ALTER_TABLE",          "REINDEX",
-+-     "ANALYZE",              "CREATE_VTABLE",        "DROP_VTABLE",
-+-     "FUNCTION",             "SAVEPOINT",            "RECURSIVE"
-+-  };
-+-  int i;
-+-  const char *az[4];
-+-  az[0] = zA1;
-+-  az[1] = zA2;
-+-  az[2] = zA3;
-+-  az[3] = zA4;
-+-  utf8_printf(p->out, "authorizer: %s", azAction[op]);
-+-  for(i=0; i<4; i++){
-+-    raw_printf(p->out, " ");
-+-    if( az[i] ){
-+-      output_c_string(p->out, az[i]);
-+-    }else{
-+-      raw_printf(p->out, "NULL");
-+-    }
-+-  }
-+-  raw_printf(p->out, "\n");
-+-  return SQLITE_OK;
-+-}
-+-#endif
-+-
-+-/*
-+-** Print a schema statement.  Part of MODE_Semi and MODE_Pretty output.
-+-**
-+-** This routine converts some CREATE TABLE statements for shadow tables
-+-** in FTS3/4/5 into CREATE TABLE IF NOT EXISTS statements.
-+-*/
-+-static void printSchemaLine(FILE *out, const char *z, const char *zTail){
-+-  if( sqlite3_strglob("CREATE TABLE ['\"]*", z)==0 ){
-+-    utf8_printf(out, "CREATE TABLE IF NOT EXISTS %s%s", z+13, zTail);
-+-  }else{
-+-    utf8_printf(out, "%s%s", z, zTail);
-+-  }
-+-}
-+-static void printSchemaLineN(FILE *out, char *z, int n, const char *zTail){
-+-  char c = z[n];
-+-  z[n] = 0;
-+-  printSchemaLine(out, z, zTail);
-+-  z[n] = c;
-+-}
-+-
-+-/*
-+-** This is the callback routine that the shell
-+-** invokes for each row of a query result.
-+-*/
-+-static int shell_callback(
-+-  void *pArg,
-+-  int nArg,        /* Number of result columns */
-+-  char **azArg,    /* Text of each result column */
-+-  char **azCol,    /* Column names */
-+-  int *aiType      /* Column types */
-+-){
-+-  int i;
-+-  ShellState *p = (ShellState*)pArg;
-+-
-+-  switch( p->cMode ){
-+-    case MODE_Line: {
-+-      int w = 5;
-+-      if( azArg==0 ) break;
-+-      for(i=0; i<nArg; i++){
-+-        int len = strlen30(azCol[i] ? azCol[i] : "");
-+-        if( len>w ) w = len;
-+-      }
-+-      if( p->cnt++>0 ) utf8_printf(p->out, "%s", p->rowSeparator);
-+-      for(i=0; i<nArg; i++){
-+-        utf8_printf(p->out,"%*s = %s%s", w, azCol[i],
-+-                azArg[i] ? azArg[i] : p->nullValue, p->rowSeparator);
-+-      }
-+-      break;
-+-    }
-+-    case MODE_Explain:
-+-    case MODE_Column: {
-+-      static const int aExplainWidths[] = {4, 13, 4, 4, 4, 13, 2, 13};
-+-      const int *colWidth;
-+-      int showHdr;
-+-      char *rowSep;
-+-      if( p->cMode==MODE_Column ){
-+-        colWidth = p->colWidth;
-+-        showHdr = p->showHeader;
-+-        rowSep = p->rowSeparator;
-+-      }else{
-+-        colWidth = aExplainWidths;
-+-        showHdr = 1;
-+-        rowSep = SEP_Row;
-+-      }
-+-      if( p->cnt++==0 ){
-+-        for(i=0; i<nArg; i++){
-+-          int w, n;
-+-          if( i<ArraySize(p->colWidth) ){
-+-            w = colWidth[i];
-+-          }else{
-+-            w = 0;
-+-          }
-+-          if( w==0 ){
-+-            w = strlenChar(azCol[i] ? azCol[i] : "");
-+-            if( w<10 ) w = 10;
-+-            n = strlenChar(azArg && azArg[i] ? azArg[i] : p->nullValue);
-+-            if( w<n ) w = n;
-+-          }
-+-          if( i<ArraySize(p->actualWidth) ){
-+-            p->actualWidth[i] = w;
-+-          }
-+-          if( showHdr ){
-+-            utf8_width_print(p->out, w, azCol[i]);
-+-            utf8_printf(p->out, "%s", i==nArg-1 ? rowSep : "  ");
-+-          }
-+-        }
-+-        if( showHdr ){
-+-          for(i=0; i<nArg; i++){
-+-            int w;
-+-            if( i<ArraySize(p->actualWidth) ){
-+-               w = p->actualWidth[i];
-+-               if( w<0 ) w = -w;
-+-            }else{
-+-               w = 10;
-+-            }
-+-            utf8_printf(p->out,"%-*.*s%s",w,w,
-+-                   "----------------------------------------------------------"
-+-                   "----------------------------------------------------------",
-+-                    i==nArg-1 ? rowSep : "  ");
-+-          }
-+-        }
-+-      }
-+-      if( azArg==0 ) break;
-+-      for(i=0; i<nArg; i++){
-+-        int w;
-+-        if( i<ArraySize(p->actualWidth) ){
-+-           w = p->actualWidth[i];
-+-        }else{
-+-           w = 10;
-+-        }
-+-        if( p->cMode==MODE_Explain && azArg[i] && strlenChar(azArg[i])>w ){
-+-          w = strlenChar(azArg[i]);
-+-        }
-+-        if( i==1 && p->aiIndent && p->pStmt ){
-+-          if( p->iIndent<p->nIndent ){
-+-            utf8_printf(p->out, "%*.s", p->aiIndent[p->iIndent], "");
-+-          }
-+-          p->iIndent++;
-+-        }
-+-        utf8_width_print(p->out, w, azArg[i] ? azArg[i] : p->nullValue);
-+-        utf8_printf(p->out, "%s", i==nArg-1 ? rowSep : "  ");
-+-      }
-+-      break;
-+-    }
-+-    case MODE_Semi: {   /* .schema and .fullschema output */
-+-      printSchemaLine(p->out, azArg[0], ";\n");
-+-      break;
-+-    }
-+-    case MODE_Pretty: {  /* .schema and .fullschema with --indent */
-+-      char *z;
-+-      int j;
-+-      int nParen = 0;
-+-      char cEnd = 0;
-+-      char c;
-+-      int nLine = 0;
-+-      assert( nArg==1 );
-+-      if( azArg[0]==0 ) break;
-+-      if( sqlite3_strlike("CREATE VIEW%", azArg[0], 0)==0
-+-       || sqlite3_strlike("CREATE TRIG%", azArg[0], 0)==0
-+-      ){
-+-        utf8_printf(p->out, "%s;\n", azArg[0]);
-+-        break;
-+-      }
-+-      z = sqlite3_mprintf("%s", azArg[0]);
-+-      j = 0;
-+-      for(i=0; IsSpace(z[i]); i++){}
-+-      for(; (c = z[i])!=0; i++){
-+-        if( IsSpace(c) ){
-+-          if( IsSpace(z[j-1]) || z[j-1]=='(' ) continue;
-+-        }else if( (c=='(' || c==')') && j>0 && IsSpace(z[j-1]) ){
-+-          j--;
-+-        }
-+-        z[j++] = c;
-+-      }
-+-      while( j>0 && IsSpace(z[j-1]) ){ j--; }
-+-      z[j] = 0;
-+-      if( strlen30(z)>=79 ){
-+-        for(i=j=0; (c = z[i])!=0; i++){
-+-          if( c==cEnd ){
-+-            cEnd = 0;
-+-          }else if( c=='"' || c=='\'' || c=='`' ){
-+-            cEnd = c;
-+-          }else if( c=='[' ){
-+-            cEnd = ']';
-+-          }else if( c=='(' ){
-+-            nParen++;
-+-          }else if( c==')' ){
-+-            nParen--;
-+-            if( nLine>0 && nParen==0 && j>0 ){
-+-              printSchemaLineN(p->out, z, j, "\n");
-+-              j = 0;
-+-            }
-+-          }
-+-          z[j++] = c;
-+-          if( nParen==1 && (c=='(' || c==',' || c=='\n') ){
-+-            if( c=='\n' ) j--;
-+-            printSchemaLineN(p->out, z, j, "\n  ");
-+-            j = 0;
-+-            nLine++;
-+-            while( IsSpace(z[i+1]) ){ i++; }
-+-          }
-+-        }
-+-        z[j] = 0;
-+-      }
-+-      printSchemaLine(p->out, z, ";\n");
-+-      sqlite3_free(z);
-+-      break;
-+-    }
-+-    case MODE_List: {
-+-      if( p->cnt++==0 && p->showHeader ){
-+-        for(i=0; i<nArg; i++){
-+-          utf8_printf(p->out,"%s%s",azCol[i],
-+-                  i==nArg-1 ? p->rowSeparator : p->colSeparator);
-+-        }
-+-      }
-+-      if( azArg==0 ) break;
-+-      for(i=0; i<nArg; i++){
-+-        char *z = azArg[i];
-+-        if( z==0 ) z = p->nullValue;
-+-        utf8_printf(p->out, "%s", z);
-+-        if( i<nArg-1 ){
-+-          utf8_printf(p->out, "%s", p->colSeparator);
-+-        }else{
-+-          utf8_printf(p->out, "%s", p->rowSeparator);
-+-        }
-+-      }
-+-      break;
-+-    }
-+-    case MODE_Html: {
-+-      if( p->cnt++==0 && p->showHeader ){
-+-        raw_printf(p->out,"<TR>");
-+-        for(i=0; i<nArg; i++){
-+-          raw_printf(p->out,"<TH>");
-+-          output_html_string(p->out, azCol[i]);
-+-          raw_printf(p->out,"</TH>\n");
-+-        }
-+-        raw_printf(p->out,"</TR>\n");
-+-      }
-+-      if( azArg==0 ) break;
-+-      raw_printf(p->out,"<TR>");
-+-      for(i=0; i<nArg; i++){
-+-        raw_printf(p->out,"<TD>");
-+-        output_html_string(p->out, azArg[i] ? azArg[i] : p->nullValue);
-+-        raw_printf(p->out,"</TD>\n");
-+-      }
-+-      raw_printf(p->out,"</TR>\n");
-+-      break;
-+-    }
-+-    case MODE_Tcl: {
-+-      if( p->cnt++==0 && p->showHeader ){
-+-        for(i=0; i<nArg; i++){
-+-          output_c_string(p->out,azCol[i] ? azCol[i] : "");
-+-          if(i<nArg-1) utf8_printf(p->out, "%s", p->colSeparator);
-+-        }
-+-        utf8_printf(p->out, "%s", p->rowSeparator);
-+-      }
-+-      if( azArg==0 ) break;
-+-      for(i=0; i<nArg; i++){
-+-        output_c_string(p->out, azArg[i] ? azArg[i] : p->nullValue);
-+-        if(i<nArg-1) utf8_printf(p->out, "%s", p->colSeparator);
-+-      }
-+-      utf8_printf(p->out, "%s", p->rowSeparator);
-+-      break;
-+-    }
-+-    case MODE_Csv: {
-+-      setBinaryMode(p->out, 1);
-+-      if( p->cnt++==0 && p->showHeader ){
-+-        for(i=0; i<nArg; i++){
-+-          output_csv(p, azCol[i] ? azCol[i] : "", i<nArg-1);
-+-        }
-+-        utf8_printf(p->out, "%s", p->rowSeparator);
-+-      }
-+-      if( nArg>0 ){
-+-        for(i=0; i<nArg; i++){
-+-          output_csv(p, azArg[i], i<nArg-1);
-+-        }
-+-        utf8_printf(p->out, "%s", p->rowSeparator);
-+-      }
-+-      setTextMode(p->out, 1);
-+-      break;
-+-    }
-+-    case MODE_Insert: {
-+-      if( azArg==0 ) break;
-+-      utf8_printf(p->out,"INSERT INTO %s",p->zDestTable);
-+-      if( p->showHeader ){
-+-        raw_printf(p->out,"(");
-+-        for(i=0; i<nArg; i++){
-+-          if( i>0 ) raw_printf(p->out, ",");
-+-          if( quoteChar(azCol[i]) ){
-+-            char *z = sqlite3_mprintf("\"%w\"", azCol[i]);
-+-            utf8_printf(p->out, "%s", z);
-+-            sqlite3_free(z);
-+-          }else{
-+-            raw_printf(p->out, "%s", azCol[i]);
-+-          }
-+-        }
-+-        raw_printf(p->out,")");
-+-      }
-+-      p->cnt++;
-+-      for(i=0; i<nArg; i++){
-+-        raw_printf(p->out, i>0 ? "," : " VALUES(");
-+-        if( (azArg[i]==0) || (aiType && aiType[i]==SQLITE_NULL) ){
-+-          utf8_printf(p->out,"NULL");
-+-        }else if( aiType && aiType[i]==SQLITE_TEXT ){
-+-          if( ShellHasFlag(p, SHFLG_Newlines) ){
-+-            output_quoted_string(p->out, azArg[i]);
-+-          }else{
-+-            output_quoted_escaped_string(p->out, azArg[i]);
-+-          }
-+-        }else if( aiType && aiType[i]==SQLITE_INTEGER ){
-+-          utf8_printf(p->out,"%s", azArg[i]);
-+-        }else if( aiType && aiType[i]==SQLITE_FLOAT ){
-+-          char z[50];
-+-          double r = sqlite3_column_double(p->pStmt, i);
-+-          sqlite3_snprintf(50,z,"%!.20g", r);
-+-          raw_printf(p->out, "%s", z);
-+-        }else if( aiType && aiType[i]==SQLITE_BLOB && p->pStmt ){
-+-          const void *pBlob = sqlite3_column_blob(p->pStmt, i);
-+-          int nBlob = sqlite3_column_bytes(p->pStmt, i);
-+-          output_hex_blob(p->out, pBlob, nBlob);
-+-        }else if( isNumber(azArg[i], 0) ){
-+-          utf8_printf(p->out,"%s", azArg[i]);
-+-        }else if( ShellHasFlag(p, SHFLG_Newlines) ){
-+-          output_quoted_string(p->out, azArg[i]);
-+-        }else{
-+-          output_quoted_escaped_string(p->out, azArg[i]);
-+-        }
-+-      }
-+-      raw_printf(p->out,");\n");
-+-      break;
-+-    }
-+-    case MODE_Quote: {
-+-      if( azArg==0 ) break;
-+-      if( p->cnt==0 && p->showHeader ){
-+-        for(i=0; i<nArg; i++){
-+-          if( i>0 ) raw_printf(p->out, ",");
-+-          output_quoted_string(p->out, azCol[i]);
-+-        }
-+-        raw_printf(p->out,"\n");
-+-      }
-+-      p->cnt++;
-+-      for(i=0; i<nArg; i++){
-+-        if( i>0 ) raw_printf(p->out, ",");
-+-        if( (azArg[i]==0) || (aiType && aiType[i]==SQLITE_NULL) ){
-+-          utf8_printf(p->out,"NULL");
-+-        }else if( aiType && aiType[i]==SQLITE_TEXT ){
-+-          output_quoted_string(p->out, azArg[i]);
-+-        }else if( aiType && aiType[i]==SQLITE_INTEGER ){
-+-          utf8_printf(p->out,"%s", azArg[i]);
-+-        }else if( aiType && aiType[i]==SQLITE_FLOAT ){
-+-          char z[50];
-+-          double r = sqlite3_column_double(p->pStmt, i);
-+-          sqlite3_snprintf(50,z,"%!.20g", r);
-+-          raw_printf(p->out, "%s", z);
-+-        }else if( aiType && aiType[i]==SQLITE_BLOB && p->pStmt ){
-+-          const void *pBlob = sqlite3_column_blob(p->pStmt, i);
-+-          int nBlob = sqlite3_column_bytes(p->pStmt, i);
-+-          output_hex_blob(p->out, pBlob, nBlob);
-+-        }else if( isNumber(azArg[i], 0) ){
-+-          utf8_printf(p->out,"%s", azArg[i]);
-+-        }else{
-+-          output_quoted_string(p->out, azArg[i]);
-+-        }
-+-      }
-+-      raw_printf(p->out,"\n");
-+-      break;
-+-    }
-+-    case MODE_Ascii: {
-+-      if( p->cnt++==0 && p->showHeader ){
-+-        for(i=0; i<nArg; i++){
-+-          if( i>0 ) utf8_printf(p->out, "%s", p->colSeparator);
-+-          utf8_printf(p->out,"%s",azCol[i] ? azCol[i] : "");
-+-        }
-+-        utf8_printf(p->out, "%s", p->rowSeparator);
-+-      }
-+-      if( azArg==0 ) break;
-+-      for(i=0; i<nArg; i++){
-+-        if( i>0 ) utf8_printf(p->out, "%s", p->colSeparator);
-+-        utf8_printf(p->out,"%s",azArg[i] ? azArg[i] : p->nullValue);
-+-      }
-+-      utf8_printf(p->out, "%s", p->rowSeparator);
-+-      break;
-+-    }
-+-  }
-+-  return 0;
-+-}
-+-
-+-/*
-+-** This is the callback routine that the SQLite library
-+-** invokes for each row of a query result.
-+-*/
-+-static int callback(void *pArg, int nArg, char **azArg, char **azCol){
-+-  /* since we don't have type info, call the shell_callback with a NULL value */
-+-  return shell_callback(pArg, nArg, azArg, azCol, NULL);
-+-}
-+-
-+-/*
-+-** This is the callback routine from sqlite3_exec() that appends all
-+-** output onto the end of a ShellText object.
-+-*/
-+-static int captureOutputCallback(void *pArg, int nArg, char **azArg, char **az){
-+-  ShellText *p = (ShellText*)pArg;
-+-  int i;
-+-  UNUSED_PARAMETER(az);
-+-  if( p->n ) appendText(p, "|", 0);
-+-  for(i=0; i<nArg; i++){
-+-    if( i ) appendText(p, ",", 0);
-+-    if( azArg[i] ) appendText(p, azArg[i], 0);
-+-  }
-+-  return 0;
-+-}
-+-
-+-/*
-+-** Generate an appropriate SELFTEST table in the main database.
-+-*/
-+-static void createSelftestTable(ShellState *p){
-+-  char *zErrMsg = 0;
-+-  sqlite3_exec(p->db,
-+-    "SAVEPOINT selftest_init;\n"
-+-    "CREATE TABLE IF NOT EXISTS selftest(\n"
-+-    "  tno INTEGER PRIMARY KEY,\n"   /* Test number */
-+-    "  op TEXT,\n"                   /* Operator:  memo run */
-+-    "  cmd TEXT,\n"                  /* Command text */
-+-    "  ans TEXT\n"                   /* Desired answer */
-+-    ");"
-+-    "CREATE TEMP TABLE [_shell$self](op,cmd,ans);\n"
-+-    "INSERT INTO [_shell$self](rowid,op,cmd)\n"
-+-    "  VALUES(coalesce((SELECT (max(tno)+100)/10 FROM selftest),10),\n"
-+-    "         'memo','Tests generated by --init');\n"
-+-    "INSERT INTO [_shell$self]\n"
-+-    "  SELECT 'run',\n"
-+-    "    'SELECT hex(sha3_query(''SELECT type,name,tbl_name,sql "
-+-                                 "FROM sqlite_master ORDER BY 2'',224))',\n"
-+-    "    hex(sha3_query('SELECT type,name,tbl_name,sql "
-+-                          "FROM sqlite_master ORDER BY 2',224));\n"
-+-    "INSERT INTO [_shell$self]\n"
-+-    "  SELECT 'run',"
-+-    "    'SELECT hex(sha3_query(''SELECT * FROM \"' ||"
-+-    "        printf('%w',name) || '\" NOT INDEXED'',224))',\n"
-+-    "    hex(sha3_query(printf('SELECT * FROM \"%w\" NOT INDEXED',name),224))\n"
-+-    "  FROM (\n"
-+-    "    SELECT name FROM sqlite_master\n"
-+-    "     WHERE type='table'\n"
-+-    "       AND name<>'selftest'\n"
-+-    "       AND coalesce(rootpage,0)>0\n"
-+-    "  )\n"
-+-    " ORDER BY name;\n"
-+-    "INSERT INTO [_shell$self]\n"
-+-    "  VALUES('run','PRAGMA integrity_check','ok');\n"
-+-    "INSERT INTO selftest(tno,op,cmd,ans)"
-+-    "  SELECT rowid*10,op,cmd,ans FROM [_shell$self];\n"
-+-    "DROP TABLE [_shell$self];"
-+-    ,0,0,&zErrMsg);
-+-  if( zErrMsg ){
-+-    utf8_printf(stderr, "SELFTEST initialization failure: %s\n", zErrMsg);
-+-    sqlite3_free(zErrMsg);
-+-  }
-+-  sqlite3_exec(p->db, "RELEASE selftest_init",0,0,0);
-+-}
-+-
-+-
-+-/*
-+-** Set the destination table field of the ShellState structure to
-+-** the name of the table given.  Escape any quote characters in the
-+-** table name.
-+-*/
-+-static void set_table_name(ShellState *p, const char *zName){
-+-  int i, n;
-+-  int cQuote;
-+-  char *z;
-+-
-+-  if( p->zDestTable ){
-+-    free(p->zDestTable);
-+-    p->zDestTable = 0;
-+-  }
-+-  if( zName==0 ) return;
-+-  cQuote = quoteChar(zName);
-+-  n = strlen30(zName);
-+-  if( cQuote ) n += n+2;
-+-  z = p->zDestTable = malloc( n+1 );
-+-  if( z==0 ){
-+-    raw_printf(stderr,"Error: out of memory\n");
-+-    exit(1);
-+-  }
-+-  n = 0;
-+-  if( cQuote ) z[n++] = cQuote;
-+-  for(i=0; zName[i]; i++){
-+-    z[n++] = zName[i];
-+-    if( zName[i]==cQuote ) z[n++] = cQuote;
-+-  }
-+-  if( cQuote ) z[n++] = cQuote;
-+-  z[n] = 0;
-+-}
-+-
-+-
-+-/*
-+-** Execute a query statement that will generate SQL output.  Print
-+-** the result columns, comma-separated, on a line and then add a
-+-** semicolon terminator to the end of that line.
-+-**
-+-** If the number of columns is 1 and that column contains text "--"
-+-** then write the semicolon on a separate line.  That way, if a
-+-** "--" comment occurs at the end of the statement, the comment
-+-** won't consume the semicolon terminator.
-+-*/
-+-static int run_table_dump_query(
-+-  ShellState *p,           /* Query context */
-+-  const char *zSelect,     /* SELECT statement to extract content */
-+-  const char *zFirstRow    /* Print before first row, if not NULL */
-+-){
-+-  sqlite3_stmt *pSelect;
-+-  int rc;
-+-  int nResult;
-+-  int i;
-+-  const char *z;
-+-  rc = sqlite3_prepare_v2(p->db, zSelect, -1, &pSelect, 0);
-+-  if( rc!=SQLITE_OK || !pSelect ){
-+-    utf8_printf(p->out, "/**** ERROR: (%d) %s *****/\n", rc,
-+-                sqlite3_errmsg(p->db));
-+-    if( (rc&0xff)!=SQLITE_CORRUPT ) p->nErr++;
-+-    return rc;
-+-  }
-+-  rc = sqlite3_step(pSelect);
-+-  nResult = sqlite3_column_count(pSelect);
-+-  while( rc==SQLITE_ROW ){
-+-    if( zFirstRow ){
-+-      utf8_printf(p->out, "%s", zFirstRow);
-+-      zFirstRow = 0;
-+-    }
-+-    z = (const char*)sqlite3_column_text(pSelect, 0);
-+-    utf8_printf(p->out, "%s", z);
-+-    for(i=1; i<nResult; i++){
-+-      utf8_printf(p->out, ",%s", sqlite3_column_text(pSelect, i));
-+-    }
-+-    if( z==0 ) z = "";
-+-    while( z[0] && (z[0]!='-' || z[1]!='-') ) z++;
-+-    if( z[0] ){
-+-      raw_printf(p->out, "\n;\n");
-+-    }else{
-+-      raw_printf(p->out, ";\n");
-+-    }
-+-    rc = sqlite3_step(pSelect);
-+-  }
-+-  rc = sqlite3_finalize(pSelect);
-+-  if( rc!=SQLITE_OK ){
-+-    utf8_printf(p->out, "/**** ERROR: (%d) %s *****/\n", rc,
-+-                sqlite3_errmsg(p->db));
-+-    if( (rc&0xff)!=SQLITE_CORRUPT ) p->nErr++;
-+-  }
-+-  return rc;
-+-}
-+-
-+-/*
-+-** Allocate space and save off current error string.
-+-*/
-+-static char *save_err_msg(
-+-  sqlite3 *db            /* Database to query */
-+-){
-+-  int nErrMsg = 1+strlen30(sqlite3_errmsg(db));
-+-  char *zErrMsg = sqlite3_malloc64(nErrMsg);
-+-  if( zErrMsg ){
-+-    memcpy(zErrMsg, sqlite3_errmsg(db), nErrMsg);
-+-  }
-+-  return zErrMsg;
-+-}
-+-
-+-#ifdef __linux__
-+-/*
-+-** Attempt to display I/O stats on Linux using /proc/PID/io
-+-*/
-+-static void displayLinuxIoStats(FILE *out){
-+-  FILE *in;
-+-  char z[200];
-+-  sqlite3_snprintf(sizeof(z), z, "/proc/%d/io", getpid());
-+-  in = fopen(z, "rb");
-+-  if( in==0 ) return;
-+-  while( fgets(z, sizeof(z), in)!=0 ){
-+-    static const struct {
-+-      const char *zPattern;
-+-      const char *zDesc;
-+-    } aTrans[] = {
-+-      { "rchar: ",                  "Bytes received by read():" },
-+-      { "wchar: ",                  "Bytes sent to write():"    },
-+-      { "syscr: ",                  "Read() system calls:"      },
-+-      { "syscw: ",                  "Write() system calls:"     },
-+-      { "read_bytes: ",             "Bytes read from storage:"  },
-+-      { "write_bytes: ",            "Bytes written to storage:" },
-+-      { "cancelled_write_bytes: ",  "Cancelled write bytes:"    },
-+-    };
-+-    int i;
-+-    for(i=0; i<ArraySize(aTrans); i++){
-+-      int n = (int)strlen(aTrans[i].zPattern);
-+-      if( strncmp(aTrans[i].zPattern, z, n)==0 ){
-+-        utf8_printf(out, "%-36s %s", aTrans[i].zDesc, &z[n]);
-+-        break;
-+-      }
-+-    }
-+-  }
-+-  fclose(in);
-+-}
-+-#endif
-+-
-+-/*
-+-** Display a single line of status using 64-bit values.
-+-*/
-+-static void displayStatLine(
-+-  ShellState *p,            /* The shell context */
-+-  char *zLabel,             /* Label for this one line */
-+-  char *zFormat,            /* Format for the result */
-+-  int iStatusCtrl,          /* Which status to display */
-+-  int bReset                /* True to reset the stats */
-+-){
-+-  sqlite3_int64 iCur = -1;
-+-  sqlite3_int64 iHiwtr = -1;
-+-  int i, nPercent;
-+-  char zLine[200];
-+-  sqlite3_status64(iStatusCtrl, &iCur, &iHiwtr, bReset);
-+-  for(i=0, nPercent=0; zFormat[i]; i++){
-+-    if( zFormat[i]=='%' ) nPercent++;
-+-  }
-+-  if( nPercent>1 ){
-+-    sqlite3_snprintf(sizeof(zLine), zLine, zFormat, iCur, iHiwtr);
-+-  }else{
-+-    sqlite3_snprintf(sizeof(zLine), zLine, zFormat, iHiwtr);
-+-  }
-+-  raw_printf(p->out, "%-36s %s\n", zLabel, zLine);
-+-}
-+-
-+-/*
-+-** Display memory stats.
-+-*/
-+-static int display_stats(
-+-  sqlite3 *db,                /* Database to query */
-+-  ShellState *pArg,           /* Pointer to ShellState */
-+-  int bReset                  /* True to reset the stats */
-+-){
-+-  int iCur;
-+-  int iHiwtr;
-+-
-+-  if( pArg && pArg->out ){
-+-    displayStatLine(pArg, "Memory Used:",
-+-       "%lld (max %lld) bytes", SQLITE_STATUS_MEMORY_USED, bReset);
-+-    displayStatLine(pArg, "Number of Outstanding Allocations:",
-+-       "%lld (max %lld)", SQLITE_STATUS_MALLOC_COUNT, bReset);
-+-    if( pArg->shellFlgs & SHFLG_Pagecache ){
-+-      displayStatLine(pArg, "Number of Pcache Pages Used:",
-+-         "%lld (max %lld) pages", SQLITE_STATUS_PAGECACHE_USED, bReset);
-+-    }
-+-    displayStatLine(pArg, "Number of Pcache Overflow Bytes:",
-+-       "%lld (max %lld) bytes", SQLITE_STATUS_PAGECACHE_OVERFLOW, bReset);
-+-    if( pArg->shellFlgs & SHFLG_Scratch ){
-+-      displayStatLine(pArg, "Number of Scratch Allocations Used:",
-+-         "%lld (max %lld)", SQLITE_STATUS_SCRATCH_USED, bReset);
-+-    }
-+-    displayStatLine(pArg, "Number of Scratch Overflow Bytes:",
-+-       "%lld (max %lld) bytes", SQLITE_STATUS_SCRATCH_OVERFLOW, bReset);
-+-    displayStatLine(pArg, "Largest Allocation:",
-+-       "%lld bytes", SQLITE_STATUS_MALLOC_SIZE, bReset);
-+-    displayStatLine(pArg, "Largest Pcache Allocation:",
-+-       "%lld bytes", SQLITE_STATUS_PAGECACHE_SIZE, bReset);
-+-    displayStatLine(pArg, "Largest Scratch Allocation:",
-+-       "%lld bytes", SQLITE_STATUS_SCRATCH_SIZE, bReset);
-+-#ifdef YYTRACKMAXSTACKDEPTH
-+-    displayStatLine(pArg, "Deepest Parser Stack:",
-+-       "%lld (max %lld)", SQLITE_STATUS_PARSER_STACK, bReset);
-+-#endif
-+-  }
-+-
-+-  if( pArg && pArg->out && db ){
-+-    if( pArg->shellFlgs & SHFLG_Lookaside ){
-+-      iHiwtr = iCur = -1;
-+-      sqlite3_db_status(db, SQLITE_DBSTATUS_LOOKASIDE_USED,
-+-                        &iCur, &iHiwtr, bReset);
-+-      raw_printf(pArg->out,
-+-              "Lookaside Slots Used:                %d (max %d)\n",
-+-              iCur, iHiwtr);
-+-      sqlite3_db_status(db, SQLITE_DBSTATUS_LOOKASIDE_HIT,
-+-                        &iCur, &iHiwtr, bReset);
-+-      raw_printf(pArg->out, "Successful lookaside attempts:       %d\n",
-+-              iHiwtr);
-+-      sqlite3_db_status(db, SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE,
-+-                        &iCur, &iHiwtr, bReset);
-+-      raw_printf(pArg->out, "Lookaside failures due to size:      %d\n",
-+-              iHiwtr);
-+-      sqlite3_db_status(db, SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL,
-+-                        &iCur, &iHiwtr, bReset);
-+-      raw_printf(pArg->out, "Lookaside failures due to OOM:       %d\n",
-+-              iHiwtr);
-+-    }
-+-    iHiwtr = iCur = -1;
-+-    sqlite3_db_status(db, SQLITE_DBSTATUS_CACHE_USED, &iCur, &iHiwtr, bReset);
-+-    raw_printf(pArg->out, "Pager Heap Usage:                    %d bytes\n",
-+-            iCur);
-+-    iHiwtr = iCur = -1;
-+-    sqlite3_db_status(db, SQLITE_DBSTATUS_CACHE_HIT, &iCur, &iHiwtr, 1);
-+-    raw_printf(pArg->out, "Page cache hits:                     %d\n", iCur);
-+-    iHiwtr = iCur = -1;
-+-    sqlite3_db_status(db, SQLITE_DBSTATUS_CACHE_MISS, &iCur, &iHiwtr, 1);
-+-    raw_printf(pArg->out, "Page cache misses:                   %d\n", iCur);
-+-    iHiwtr = iCur = -1;
-+-    sqlite3_db_status(db, SQLITE_DBSTATUS_CACHE_WRITE, &iCur, &iHiwtr, 1);
-+-    raw_printf(pArg->out, "Page cache writes:                   %d\n", iCur);
-+-    iHiwtr = iCur = -1;
-+-    sqlite3_db_status(db, SQLITE_DBSTATUS_SCHEMA_USED, &iCur, &iHiwtr, bReset);
-+-    raw_printf(pArg->out, "Schema Heap Usage:                   %d bytes\n",
-+-            iCur);
-+-    iHiwtr = iCur = -1;
-+-    sqlite3_db_status(db, SQLITE_DBSTATUS_STMT_USED, &iCur, &iHiwtr, bReset);
-+-    raw_printf(pArg->out, "Statement Heap/Lookaside Usage:      %d bytes\n",
-+-            iCur);
-+-  }
-+-
-+-  if( pArg && pArg->out && db && pArg->pStmt ){
-+-    iCur = sqlite3_stmt_status(pArg->pStmt, SQLITE_STMTSTATUS_FULLSCAN_STEP,
-+-                               bReset);
-+-    raw_printf(pArg->out, "Fullscan Steps:                      %d\n", iCur);
-+-    iCur = sqlite3_stmt_status(pArg->pStmt, SQLITE_STMTSTATUS_SORT, bReset);
-+-    raw_printf(pArg->out, "Sort Operations:                     %d\n", iCur);
-+-    iCur = sqlite3_stmt_status(pArg->pStmt, SQLITE_STMTSTATUS_AUTOINDEX,bReset);
-+-    raw_printf(pArg->out, "Autoindex Inserts:                   %d\n", iCur);
-+-    iCur = sqlite3_stmt_status(pArg->pStmt, SQLITE_STMTSTATUS_VM_STEP, bReset);
-+-    raw_printf(pArg->out, "Virtual Machine Steps:               %d\n", iCur);
-+-  }
-+-
-+-#ifdef __linux__
-+-  displayLinuxIoStats(pArg->out);
-+-#endif
-+-
-+-  /* Do not remove this machine readable comment: extra-stats-output-here */
-+-
-+-  return 0;
-+-}
-+-
-+-/*
-+-** Display scan stats.
-+-*/
-+-static void display_scanstats(
-+-  sqlite3 *db,                    /* Database to query */
-+-  ShellState *pArg                /* Pointer to ShellState */
-+-){
-+-#ifndef SQLITE_ENABLE_STMT_SCANSTATUS
-+-  UNUSED_PARAMETER(db);
-+-  UNUSED_PARAMETER(pArg);
-+-#else
-+-  int i, k, n, mx;
-+-  raw_printf(pArg->out, "-------- scanstats --------\n");
-+-  mx = 0;
-+-  for(k=0; k<=mx; k++){
-+-    double rEstLoop = 1.0;
-+-    for(i=n=0; 1; i++){
-+-      sqlite3_stmt *p = pArg->pStmt;
-+-      sqlite3_int64 nLoop, nVisit;
-+-      double rEst;
-+-      int iSid;
-+-      const char *zExplain;
-+-      if( sqlite3_stmt_scanstatus(p, i, SQLITE_SCANSTAT_NLOOP, (void*)&nLoop) ){
-+-        break;
-+-      }
-+-      sqlite3_stmt_scanstatus(p, i, SQLITE_SCANSTAT_SELECTID, (void*)&iSid);
-+-      if( iSid>mx ) mx = iSid;
-+-      if( iSid!=k ) continue;
-+-      if( n==0 ){
-+-        rEstLoop = (double)nLoop;
-+-        if( k>0 ) raw_printf(pArg->out, "-------- subquery %d -------\n", k);
-+-      }
-+-      n++;
-+-      sqlite3_stmt_scanstatus(p, i, SQLITE_SCANSTAT_NVISIT, (void*)&nVisit);
-+-      sqlite3_stmt_scanstatus(p, i, SQLITE_SCANSTAT_EST, (void*)&rEst);
-+-      sqlite3_stmt_scanstatus(p, i, SQLITE_SCANSTAT_EXPLAIN, (void*)&zExplain);
-+-      utf8_printf(pArg->out, "Loop %2d: %s\n", n, zExplain);
-+-      rEstLoop *= rEst;
-+-      raw_printf(pArg->out,
-+-          "         nLoop=%-8lld nRow=%-8lld estRow=%-8lld estRow/Loop=%-8g\n",
-+-          nLoop, nVisit, (sqlite3_int64)(rEstLoop+0.5), rEst
-+-      );
-+-    }
-+-  }
-+-  raw_printf(pArg->out, "---------------------------\n");
-+-#endif
-+-}
-+-
-+-/*
-+-** Parameter azArray points to a zero-terminated array of strings. zStr
-+-** points to a single nul-terminated string. Return non-zero if zStr
-+-** is equal, according to strcmp(), to any of the strings in the array.
-+-** Otherwise, return zero.
-+-*/
-+-static int str_in_array(const char *zStr, const char **azArray){
-+-  int i;
-+-  for(i=0; azArray[i]; i++){
-+-    if( 0==strcmp(zStr, azArray[i]) ) return 1;
-+-  }
-+-  return 0;
-+-}
-+-
-+-/*
-+-** If compiled statement pSql appears to be an EXPLAIN statement, allocate
-+-** and populate the ShellState.aiIndent[] array with the number of
-+-** spaces each opcode should be indented before it is output.
-+-**
-+-** The indenting rules are:
-+-**
-+-**     * For each "Next", "Prev", "VNext" or "VPrev" instruction, indent
-+-**       all opcodes that occur between the p2 jump destination and the opcode
-+-**       itself by 2 spaces.
-+-**
-+-**     * For each "Goto", if the jump destination is earlier in the program
-+-**       and ends on one of:
-+-**          Yield  SeekGt  SeekLt  RowSetRead  Rewind
-+-**       or if the P1 parameter is one instead of zero,
-+-**       then indent all opcodes between the earlier instruction
-+-**       and "Goto" by 2 spaces.
-+-*/
-+-static void explain_data_prepare(ShellState *p, sqlite3_stmt *pSql){
-+-  const char *zSql;               /* The text of the SQL statement */
-+-  const char *z;                  /* Used to check if this is an EXPLAIN */
-+-  int *abYield = 0;               /* True if op is an OP_Yield */
-+-  int nAlloc = 0;                 /* Allocated size of p->aiIndent[], abYield */
-+-  int iOp;                        /* Index of operation in p->aiIndent[] */
-+-
-+-  const char *azNext[] = { "Next", "Prev", "VPrev", "VNext", "SorterNext",
-+-                           "NextIfOpen", "PrevIfOpen", 0 };
-+-  const char *azYield[] = { "Yield", "SeekLT", "SeekGT", "RowSetRead",
-+-                            "Rewind", 0 };
-+-  const char *azGoto[] = { "Goto", 0 };
-+-
-+-  /* Try to figure out if this is really an EXPLAIN statement. If this
-+-  ** cannot be verified, return early.  */
-+-  if( sqlite3_column_count(pSql)!=8 ){
-+-    p->cMode = p->mode;
-+-    return;
-+-  }
-+-  zSql = sqlite3_sql(pSql);
-+-  if( zSql==0 ) return;
-+-  for(z=zSql; *z==' ' || *z=='\t' || *z=='\n' || *z=='\f' || *z=='\r'; z++);
-+-  if( sqlite3_strnicmp(z, "explain", 7) ){
-+-    p->cMode = p->mode;
-+-    return;
-+-  }
-+-
-+-  for(iOp=0; SQLITE_ROW==sqlite3_step(pSql); iOp++){
-+-    int i;
-+-    int iAddr = sqlite3_column_int(pSql, 0);
-+-    const char *zOp = (const char*)sqlite3_column_text(pSql, 1);
-+-
-+-    /* Set p2 to the P2 field of the current opcode. Then, assuming that
-+-    ** p2 is an instruction address, set variable p2op to the index of that
-+-    ** instruction in the aiIndent[] array. p2 and p2op may be different if
-+-    ** the current instruction is part of a sub-program generated by an
-+-    ** SQL trigger or foreign key.  */
-+-    int p2 = sqlite3_column_int(pSql, 3);
-+-    int p2op = (p2 + (iOp-iAddr));
-+-
-+-    /* Grow the p->aiIndent array as required */
-+-    if( iOp>=nAlloc ){
-+-      if( iOp==0 ){
-+-        /* Do further verfication that this is explain output.  Abort if
-+-        ** it is not */
-+-        static const char *explainCols[] = {
-+-           "addr", "opcode", "p1", "p2", "p3", "p4", "p5", "comment" };
-+-        int jj;
-+-        for(jj=0; jj<ArraySize(explainCols); jj++){
-+-          if( strcmp(sqlite3_column_name(pSql,jj),explainCols[jj])!=0 ){
-+-            p->cMode = p->mode;
-+-            sqlite3_reset(pSql);
-+-            return;
-+-          }
-+-        }
-+-      }
-+-      nAlloc += 100;
-+-      p->aiIndent = (int*)sqlite3_realloc64(p->aiIndent, nAlloc*sizeof(int));
-+-      abYield = (int*)sqlite3_realloc64(abYield, nAlloc*sizeof(int));
-+-    }
-+-    abYield[iOp] = str_in_array(zOp, azYield);
-+-    p->aiIndent[iOp] = 0;
-+-    p->nIndent = iOp+1;
-+-
-+-    if( str_in_array(zOp, azNext) ){
-+-      for(i=p2op; i<iOp; i++) p->aiIndent[i] += 2;
-+-    }
-+-    if( str_in_array(zOp, azGoto) && p2op<p->nIndent
-+-     && (abYield[p2op] || sqlite3_column_int(pSql, 2))
-+-    ){
-+-      for(i=p2op; i<iOp; i++) p->aiIndent[i] += 2;
-+-    }
-+-  }
-+-
-+-  p->iIndent = 0;
-+-  sqlite3_free(abYield);
-+-  sqlite3_reset(pSql);
-+-}
-+-
-+-/*
-+-** Free the array allocated by explain_data_prepare().
-+-*/
-+-static void explain_data_delete(ShellState *p){
-+-  sqlite3_free(p->aiIndent);
-+-  p->aiIndent = 0;
-+-  p->nIndent = 0;
-+-  p->iIndent = 0;
-+-}
-+-
-+-/*
-+-** Disable and restore .wheretrace and .selecttrace settings.
-+-*/
-+-#if defined(SQLITE_DEBUG) && defined(SQLITE_ENABLE_SELECTTRACE)
-+-extern int sqlite3SelectTrace;
-+-static int savedSelectTrace;
-+-#endif
-+-#if defined(SQLITE_DEBUG) && defined(SQLITE_ENABLE_WHERETRACE)
-+-extern int sqlite3WhereTrace;
-+-static int savedWhereTrace;
-+-#endif
-+-static void disable_debug_trace_modes(void){
-+-#if defined(SQLITE_DEBUG) && defined(SQLITE_ENABLE_SELECTTRACE)
-+-  savedSelectTrace = sqlite3SelectTrace;
-+-  sqlite3SelectTrace = 0;
-+-#endif
-+-#if defined(SQLITE_DEBUG) && defined(SQLITE_ENABLE_WHERETRACE)
-+-  savedWhereTrace = sqlite3WhereTrace;
-+-  sqlite3WhereTrace = 0;
-+-#endif
-+-}
-+-static void restore_debug_trace_modes(void){
-+-#if defined(SQLITE_DEBUG) && defined(SQLITE_ENABLE_SELECTTRACE)
-+-  sqlite3SelectTrace = savedSelectTrace;
-+-#endif
-+-#if defined(SQLITE_DEBUG) && defined(SQLITE_ENABLE_WHERETRACE)
-+-  sqlite3WhereTrace = savedWhereTrace;
-+-#endif
-+-}
-+-
-+-/*
-+-** Run a prepared statement
-+-*/
-+-static void exec_prepared_stmt(
-+-  ShellState *pArg,                                /* Pointer to ShellState */
-+-  sqlite3_stmt *pStmt,                             /* Statment to run */
-+-  int (*xCallback)(void*,int,char**,char**,int*)   /* Callback function */
-+-){
-+-  int rc;
-+-
-+-  /* perform the first step.  this will tell us if we
-+-  ** have a result set or not and how wide it is.
-+-  */
-+-  rc = sqlite3_step(pStmt);
-+-  /* if we have a result set... */
-+-  if( SQLITE_ROW == rc ){
-+-    /* if we have a callback... */
-+-    if( xCallback ){
-+-      /* allocate space for col name ptr, value ptr, and type */
-+-      int nCol = sqlite3_column_count(pStmt);
-+-      void *pData = sqlite3_malloc64(3*nCol*sizeof(const char*) + 1);
-+-      if( !pData ){
-+-        rc = SQLITE_NOMEM;
-+-      }else{
-+-        char **azCols = (char **)pData;      /* Names of result columns */
-+-        char **azVals = &azCols[nCol];       /* Results */
-+-        int *aiTypes = (int *)&azVals[nCol]; /* Result types */
-+-        int i, x;
-+-        assert(sizeof(int) <= sizeof(char *));
-+-        /* save off ptrs to column names */
-+-        for(i=0; i<nCol; i++){
-+-          azCols[i] = (char *)sqlite3_column_name(pStmt, i);
-+-        }
-+-        do{
-+-          /* extract the data and data types */
-+-          for(i=0; i<nCol; i++){
-+-            aiTypes[i] = x = sqlite3_column_type(pStmt, i);
-+-            if( x==SQLITE_BLOB && pArg && pArg->cMode==MODE_Insert ){
-+-              azVals[i] = "";
-+-            }else{
-+-              azVals[i] = (char*)sqlite3_column_text(pStmt, i);
-+-            }
-+-            if( !azVals[i] && (aiTypes[i]!=SQLITE_NULL) ){
-+-              rc = SQLITE_NOMEM;
-+-              break; /* from for */
-+-            }
-+-          } /* end for */
-+-
-+-          /* if data and types extracted successfully... */
-+-          if( SQLITE_ROW == rc ){
-+-            /* call the supplied callback with the result row data */
-+-            if( xCallback(pArg, nCol, azVals, azCols, aiTypes) ){
-+-              rc = SQLITE_ABORT;
-+-            }else{
-+-              rc = sqlite3_step(pStmt);
-+-            }
-+-          }
-+-        } while( SQLITE_ROW == rc );
-+-        sqlite3_free(pData);
-+-      }
-+-    }else{
-+-      do{
-+-        rc = sqlite3_step(pStmt);
-+-      } while( rc == SQLITE_ROW );
-+-    }
-+-  }
-+-}
-+-
-+-/*
-+-** Execute a statement or set of statements.  Print
-+-** any result rows/columns depending on the current mode
-+-** set via the supplied callback.
-+-**
-+-** This is very similar to SQLite's built-in sqlite3_exec()
-+-** function except it takes a slightly different callback
-+-** and callback data argument.
-+-*/
-+-static int shell_exec(
-+-  sqlite3 *db,                              /* An open database */
-+-  const char *zSql,                         /* SQL to be evaluated */
-+-  int (*xCallback)(void*,int,char**,char**,int*),   /* Callback function */
-+-                                            /* (not the same as sqlite3_exec) */
-+-  ShellState *pArg,                         /* Pointer to ShellState */
-+-  char **pzErrMsg                           /* Error msg written here */
-+-){
-+-  sqlite3_stmt *pStmt = NULL;     /* Statement to execute. */
-+-  int rc = SQLITE_OK;             /* Return Code */
-+-  int rc2;
-+-  const char *zLeftover;          /* Tail of unprocessed SQL */
-+-
-+-  if( pzErrMsg ){
-+-    *pzErrMsg = NULL;
-+-  }
-+-
-+-  while( zSql[0] && (SQLITE_OK == rc) ){
-+-    static const char *zStmtSql;
-+-    rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, &zLeftover);
-+-    if( SQLITE_OK != rc ){
-+-      if( pzErrMsg ){
-+-        *pzErrMsg = save_err_msg(db);
-+-      }
-+-    }else{
-+-      if( !pStmt ){
-+-        /* this happens for a comment or white-space */
-+-        zSql = zLeftover;
-+-        while( IsSpace(zSql[0]) ) zSql++;
-+-        continue;
-+-      }
-+-      zStmtSql = sqlite3_sql(pStmt);
-+-      if( zStmtSql==0 ) zStmtSql = "";
-+-      while( IsSpace(zStmtSql[0]) ) zStmtSql++;
-+-
-+-      /* save off the prepared statment handle and reset row count */
-+-      if( pArg ){
-+-        pArg->pStmt = pStmt;
-+-        pArg->cnt = 0;
-+-      }
-+-
-+-      /* echo the sql statement if echo on */
-+-      if( pArg && ShellHasFlag(pArg, SHFLG_Echo) ){
-+-        utf8_printf(pArg->out, "%s\n", zStmtSql ? zStmtSql : zSql);
-+-      }
-+-
-+-      /* Show the EXPLAIN QUERY PLAN if .eqp is on */
-+-      if( pArg && pArg->autoEQP && sqlite3_strlike("EXPLAIN%",zStmtSql,0)!=0 ){
-+-        sqlite3_stmt *pExplain;
-+-        char *zEQP;
-+-        disable_debug_trace_modes();
-+-        zEQP = sqlite3_mprintf("EXPLAIN QUERY PLAN %s", zStmtSql);
-+-        rc = sqlite3_prepare_v2(db, zEQP, -1, &pExplain, 0);
-+-        if( rc==SQLITE_OK ){
-+-          while( sqlite3_step(pExplain)==SQLITE_ROW ){
-+-            raw_printf(pArg->out,"--EQP-- %d,",sqlite3_column_int(pExplain, 0));
-+-            raw_printf(pArg->out,"%d,", sqlite3_column_int(pExplain, 1));
-+-            raw_printf(pArg->out,"%d,", sqlite3_column_int(pExplain, 2));
-+-            utf8_printf(pArg->out,"%s\n", sqlite3_column_text(pExplain, 3));
-+-          }
-+-        }
-+-        sqlite3_finalize(pExplain);
-+-        sqlite3_free(zEQP);
-+-        if( pArg->autoEQP>=2 ){
-+-          /* Also do an EXPLAIN for ".eqp full" mode */
-+-          zEQP = sqlite3_mprintf("EXPLAIN %s", zStmtSql);
-+-          rc = sqlite3_prepare_v2(db, zEQP, -1, &pExplain, 0);
-+-          if( rc==SQLITE_OK ){
-+-            pArg->cMode = MODE_Explain;
-+-            explain_data_prepare(pArg, pExplain);
-+-            exec_prepared_stmt(pArg, pExplain, xCallback);
-+-            explain_data_delete(pArg);
-+-          }
-+-          sqlite3_finalize(pExplain);
-+-          sqlite3_free(zEQP);
-+-        }
-+-        restore_debug_trace_modes();
-+-      }
-+-
-+-      if( pArg ){
-+-        pArg->cMode = pArg->mode;
-+-        if( pArg->autoExplain
-+-         && sqlite3_column_count(pStmt)==8
-+-         && sqlite3_strlike("EXPLAIN%", zStmtSql,0)==0
-+-        ){
-+-          pArg->cMode = MODE_Explain;
-+-        }
-+-
-+-        /* If the shell is currently in ".explain" mode, gather the extra
-+-        ** data required to add indents to the output.*/
-+-        if( pArg->cMode==MODE_Explain ){
-+-          explain_data_prepare(pArg, pStmt);
-+-        }
-+-      }
-+-
-+-      exec_prepared_stmt(pArg, pStmt, xCallback);
-+-      explain_data_delete(pArg);
-+-
-+-      /* print usage stats if stats on */
-+-      if( pArg && pArg->statsOn ){
-+-        display_stats(db, pArg, 0);
-+-      }
-+-
-+-      /* print loop-counters if required */
-+-      if( pArg && pArg->scanstatsOn ){
-+-        display_scanstats(db, pArg);
-+-      }
-+-
-+-      /* Finalize the statement just executed. If this fails, save a
-+-      ** copy of the error message. Otherwise, set zSql to point to the
-+-      ** next statement to execute. */
-+-      rc2 = sqlite3_finalize(pStmt);
-+-      if( rc!=SQLITE_NOMEM ) rc = rc2;
-+-      if( rc==SQLITE_OK ){
-+-        zSql = zLeftover;
-+-        while( IsSpace(zSql[0]) ) zSql++;
-+-      }else if( pzErrMsg ){
-+-        *pzErrMsg = save_err_msg(db);
-+-      }
-+-
-+-      /* clear saved stmt handle */
-+-      if( pArg ){
-+-        pArg->pStmt = NULL;
-+-      }
-+-    }
-+-  } /* end while */
-+-
-+-  return rc;
-+-}
-+-
-+-/*
-+-** Release memory previously allocated by tableColumnList().
-+-*/
-+-static void freeColumnList(char **azCol){
-+-  int i;
-+-  for(i=1; azCol[i]; i++){
-+-    sqlite3_free(azCol[i]);
-+-  }
-+-  /* azCol[0] is a static string */
-+-  sqlite3_free(azCol);
-+-}
-+-
-+-/*
-+-** Return a list of pointers to strings which are the names of all
-+-** columns in table zTab.   The memory to hold the names is dynamically
-+-** allocated and must be released by the caller using a subsequent call
-+-** to freeColumnList().
-+-**
-+-** The azCol[0] entry is usually NULL.  However, if zTab contains a rowid
-+-** value that needs to be preserved, then azCol[0] is filled in with the
-+-** name of the rowid column.
-+-**
-+-** The first regular column in the table is azCol[1].  The list is terminated
-+-** by an entry with azCol[i]==0.
-+-*/
-+-static char **tableColumnList(ShellState *p, const char *zTab){
-+-  char **azCol = 0;
-+-  sqlite3_stmt *pStmt;
-+-  char *zSql;
-+-  int nCol = 0;
-+-  int nAlloc = 0;
-+-  int nPK = 0;       /* Number of PRIMARY KEY columns seen */
-+-  int isIPK = 0;     /* True if one PRIMARY KEY column of type INTEGER */
-+-  int preserveRowid = ShellHasFlag(p, SHFLG_PreserveRowid);
-+-  int rc;
-+-
-+-  zSql = sqlite3_mprintf("PRAGMA table_info=%Q", zTab);
-+-  rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
-+-  sqlite3_free(zSql);
-+-  if( rc ) return 0;
-+-  while( sqlite3_step(pStmt)==SQLITE_ROW ){
-+-    if( nCol>=nAlloc-2 ){
-+-      nAlloc = nAlloc*2 + nCol + 10;
-+-      azCol = sqlite3_realloc(azCol, nAlloc*sizeof(azCol[0]));
-+-      if( azCol==0 ){
-+-        raw_printf(stderr, "Error: out of memory\n");
-+-        exit(1);
-+-      }
-+-    }
-+-    azCol[++nCol] = sqlite3_mprintf("%s", sqlite3_column_text(pStmt, 1));
-+-    if( sqlite3_column_int(pStmt, 5) ){
-+-      nPK++;
-+-      if( nPK==1
-+-       && sqlite3_stricmp((const char*)sqlite3_column_text(pStmt,2),
-+-                          "INTEGER")==0
-+-      ){
-+-        isIPK = 1;
-+-      }else{
-+-        isIPK = 0;
-+-      }
-+-    }
-+-  }
-+-  sqlite3_finalize(pStmt);
-+-  azCol[0] = 0;
-+-  azCol[nCol+1] = 0;
-+-
-+-  /* The decision of whether or not a rowid really needs to be preserved
-+-  ** is tricky.  We never need to preserve a rowid for a WITHOUT ROWID table
-+-  ** or a table with an INTEGER PRIMARY KEY.  We are unable to preserve
-+-  ** rowids on tables where the rowid is inaccessible because there are other
-+-  ** columns in the table named "rowid", "_rowid_", and "oid".
-+-  */
-+-  if( preserveRowid && isIPK ){
-+-    /* If a single PRIMARY KEY column with type INTEGER was seen, then it
-+-    ** might be an alise for the ROWID.  But it might also be a WITHOUT ROWID
-+-    ** table or a INTEGER PRIMARY KEY DESC column, neither of which are
-+-    ** ROWID aliases.  To distinguish these cases, check to see if
-+-    ** there is a "pk" entry in "PRAGMA index_list".  There will be
-+-    ** no "pk" index if the PRIMARY KEY really is an alias for the ROWID.
-+-    */
-+-    zSql = sqlite3_mprintf("SELECT 1 FROM pragma_index_list(%Q)"
-+-                           " WHERE origin='pk'", zTab);
-+-    rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
-+-    sqlite3_free(zSql);
-+-    if( rc ){
-+-      freeColumnList(azCol);
-+-      return 0;
-+-    }
-+-    rc = sqlite3_step(pStmt);
-+-    sqlite3_finalize(pStmt);
-+-    preserveRowid = rc==SQLITE_ROW;
-+-  }
-+-  if( preserveRowid ){
-+-    /* Only preserve the rowid if we can find a name to use for the
-+-    ** rowid */
-+-    static char *azRowid[] = { "rowid", "_rowid_", "oid" };
-+-    int i, j;
-+-    for(j=0; j<3; j++){
-+-      for(i=1; i<=nCol; i++){
-+-        if( sqlite3_stricmp(azRowid[j],azCol[i])==0 ) break;
-+-      }
-+-      if( i>nCol ){
-+-        /* At this point, we know that azRowid[j] is not the name of any
-+-        ** ordinary column in the table.  Verify that azRowid[j] is a valid
-+-        ** name for the rowid before adding it to azCol[0].  WITHOUT ROWID
-+-        ** tables will fail this last check */
-+-        rc = sqlite3_table_column_metadata(p->db,0,zTab,azRowid[j],0,0,0,0,0);
-+-        if( rc==SQLITE_OK ) azCol[0] = azRowid[j];
-+-        break;
-+-      }
-+-    }
-+-  }
-+-  return azCol;
-+-}
-+-
-+-/*
-+-** Toggle the reverse_unordered_selects setting.
-+-*/
-+-static void toggleSelectOrder(sqlite3 *db){
-+-  sqlite3_stmt *pStmt = 0;
-+-  int iSetting = 0;
-+-  char zStmt[100];
-+-  sqlite3_prepare_v2(db, "PRAGMA reverse_unordered_selects", -1, &pStmt, 0);
-+-  if( sqlite3_step(pStmt)==SQLITE_ROW ){
-+-    iSetting = sqlite3_column_int(pStmt, 0);
-+-  }
-+-  sqlite3_finalize(pStmt);
-+-  sqlite3_snprintf(sizeof(zStmt), zStmt,
-+-       "PRAGMA reverse_unordered_selects(%d)", !iSetting);
-+-  sqlite3_exec(db, zStmt, 0, 0, 0);
-+-}
-+-
-+-/*
-+-** This is a different callback routine used for dumping the database.
-+-** Each row received by this callback consists of a table name,
-+-** the table type ("index" or "table") and SQL to create the table.
-+-** This routine should print text sufficient to recreate the table.
-+-*/
-+-static int dump_callback(void *pArg, int nArg, char **azArg, char **azNotUsed){
-+-  int rc;
-+-  const char *zTable;
-+-  const char *zType;
-+-  const char *zSql;
-+-  ShellState *p = (ShellState *)pArg;
-+-
-+-  UNUSED_PARAMETER(azNotUsed);
-+-  if( nArg!=3 ) return 1;
-+-  zTable = azArg[0];
-+-  zType = azArg[1];
-+-  zSql = azArg[2];
-+-
-+-  if( strcmp(zTable, "sqlite_sequence")==0 ){
-+-    raw_printf(p->out, "DELETE FROM sqlite_sequence;\n");
-+-  }else if( sqlite3_strglob("sqlite_stat?", zTable)==0 ){
-+-    raw_printf(p->out, "ANALYZE sqlite_master;\n");
-+-  }else if( strncmp(zTable, "sqlite_", 7)==0 ){
-+-    return 0;
-+-  }else if( strncmp(zSql, "CREATE VIRTUAL TABLE", 20)==0 ){
-+-    char *zIns;
-+-    if( !p->writableSchema ){
-+-      raw_printf(p->out, "PRAGMA writable_schema=ON;\n");
-+-      p->writableSchema = 1;
-+-    }
-+-    zIns = sqlite3_mprintf(
-+-       "INSERT INTO sqlite_master(type,name,tbl_name,rootpage,sql)"
-+-       "VALUES('table','%q','%q',0,'%q');",
-+-       zTable, zTable, zSql);
-+-    utf8_printf(p->out, "%s\n", zIns);
-+-    sqlite3_free(zIns);
-+-    return 0;
-+-  }else{
-+-    printSchemaLine(p->out, zSql, ";\n");
-+-  }
-+-
-+-  if( strcmp(zType, "table")==0 ){
-+-    ShellText sSelect;
-+-    ShellText sTable;
-+-    char **azCol;
-+-    int i;
-+-    char *savedDestTable;
-+-    int savedMode;
-+-
-+-    azCol = tableColumnList(p, zTable);
-+-    if( azCol==0 ){
-+-      p->nErr++;
-+-      return 0;
-+-    }
-+-
-+-    /* Always quote the table name, even if it appears to be pure ascii,
-+-    ** in case it is a keyword. Ex:  INSERT INTO "table" ... */
-+-    initText(&sTable);
-+-    appendText(&sTable, zTable, quoteChar(zTable));
-+-    /* If preserving the rowid, add a column list after the table name.
-+-    ** In other words:  "INSERT INTO tab(rowid,a,b,c,...) VALUES(...)"
-+-    ** instead of the usual "INSERT INTO tab VALUES(...)".
-+-    */
-+-    if( azCol[0] ){
-+-      appendText(&sTable, "(", 0);
-+-      appendText(&sTable, azCol[0], 0);
-+-      for(i=1; azCol[i]; i++){
-+-        appendText(&sTable, ",", 0);
-+-        appendText(&sTable, azCol[i], quoteChar(azCol[i]));
-+-      }
-+-      appendText(&sTable, ")", 0);
-+-    }
-+-
-+-    /* Build an appropriate SELECT statement */
-+-    initText(&sSelect);
-+-    appendText(&sSelect, "SELECT ", 0);
-+-    if( azCol[0] ){
-+-      appendText(&sSelect, azCol[0], 0);
-+-      appendText(&sSelect, ",", 0);
-+-    }
-+-    for(i=1; azCol[i]; i++){
-+-      appendText(&sSelect, azCol[i], quoteChar(azCol[i]));
-+-      if( azCol[i+1] ){
-+-        appendText(&sSelect, ",", 0);
-+-      }
-+-    }
-+-    freeColumnList(azCol);
-+-    appendText(&sSelect, " FROM ", 0);
-+-    appendText(&sSelect, zTable, quoteChar(zTable));
-+-
-+-    savedDestTable = p->zDestTable;
-+-    savedMode = p->mode;
-+-    p->zDestTable = sTable.z;
-+-    p->mode = p->cMode = MODE_Insert;
-+-    rc = shell_exec(p->db, sSelect.z, shell_callback, p, 0);
-+-    if( (rc&0xff)==SQLITE_CORRUPT ){
-+-      raw_printf(p->out, "/****** CORRUPTION ERROR *******/\n");
-+-      toggleSelectOrder(p->db);
-+-      shell_exec(p->db, sSelect.z, shell_callback, p, 0);
-+-      toggleSelectOrder(p->db);
-+-    }
-+-    p->zDestTable = savedDestTable;
-+-    p->mode = savedMode;
-+-    freeText(&sTable);
-+-    freeText(&sSelect);
-+-    if( rc ) p->nErr++;
-+-  }
-+-  return 0;
-+-}
-+-
-+-/*
-+-** Run zQuery.  Use dump_callback() as the callback routine so that
-+-** the contents of the query are output as SQL statements.
-+-**
-+-** If we get a SQLITE_CORRUPT error, rerun the query after appending
-+-** "ORDER BY rowid DESC" to the end.
-+-*/
-+-static int run_schema_dump_query(
-+-  ShellState *p,
-+-  const char *zQuery
-+-){
-+-  int rc;
-+-  char *zErr = 0;
-+-  rc = sqlite3_exec(p->db, zQuery, dump_callback, p, &zErr);
-+-  if( rc==SQLITE_CORRUPT ){
-+-    char *zQ2;
-+-    int len = strlen30(zQuery);
-+-    raw_printf(p->out, "/****** CORRUPTION ERROR *******/\n");
-+-    if( zErr ){
-+-      utf8_printf(p->out, "/****** %s ******/\n", zErr);
-+-      sqlite3_free(zErr);
-+-      zErr = 0;
-+-    }
-+-    zQ2 = malloc( len+100 );
-+-    if( zQ2==0 ) return rc;
-+-    sqlite3_snprintf(len+100, zQ2, "%s ORDER BY rowid DESC", zQuery);
-+-    rc = sqlite3_exec(p->db, zQ2, dump_callback, p, &zErr);
-+-    if( rc ){
-+-      utf8_printf(p->out, "/****** ERROR: %s ******/\n", zErr);
-+-    }else{
-+-      rc = SQLITE_CORRUPT;
-+-    }
-+-    sqlite3_free(zErr);
-+-    free(zQ2);
-+-  }
-+-  return rc;
-+-}
-+-
-+-/*
-+-** Text of a help message
-+-*/
-+-static char zHelp[] =
-+-#ifndef SQLITE_OMIT_AUTHORIZATION
-+-  ".auth ON|OFF           Show authorizer callbacks\n"
-+-#endif
-+-  ".backup ?DB? FILE      Backup DB (default \"main\") to FILE\n"
-+-  ".bail on|off           Stop after hitting an error.  Default OFF\n"
-+-  ".binary on|off         Turn binary output on or off.  Default OFF\n"
-+-  ".cd DIRECTORY          Change the working directory to DIRECTORY\n"
-+-  ".changes on|off        Show number of rows changed by SQL\n"
-+-  ".check GLOB            Fail if output since .testcase does not match\n"
-+-  ".clone NEWDB           Clone data into NEWDB from the existing database\n"
-+-  ".databases             List names and files of attached databases\n"
-+-  ".dbinfo ?DB?           Show status information about the database\n"
-+-  ".dump ?TABLE? ...      Dump the database in an SQL text format\n"
-+-  "                         If TABLE specified, only dump tables matching\n"
-+-  "                         LIKE pattern TABLE.\n"
-+-  ".echo on|off           Turn command echo on or off\n"
-+-  ".eqp on|off|full       Enable or disable automatic EXPLAIN QUERY PLAN\n"
-+-  ".exit                  Exit this program\n"
-+-/* Because explain mode comes on automatically now, the ".explain" mode
-+-** is removed from the help screen.  It is still supported for legacy, however */
-+-/*".explain ?on|off|auto? Turn EXPLAIN output mode on or off or to automatic\n"*/
-+-  ".fullschema ?--indent? Show schema and the content of sqlite_stat tables\n"
-+-  ".headers on|off        Turn display of headers on or off\n"
-+-  ".help                  Show this message\n"
-+-  ".import FILE TABLE     Import data from FILE into TABLE\n"
-+-#ifndef SQLITE_OMIT_TEST_CONTROL
-+-  ".imposter INDEX TABLE  Create imposter table TABLE on index INDEX\n"
-+-#endif
-+-  ".indexes ?TABLE?       Show names of all indexes\n"
-+-  "                         If TABLE specified, only show indexes for tables\n"
-+-  "                         matching LIKE pattern TABLE.\n"
-+-#ifdef SQLITE_ENABLE_IOTRACE
-+-  ".iotrace FILE          Enable I/O diagnostic logging to FILE\n"
-+-#endif
-+-  ".limit ?LIMIT? ?VAL?   Display or change the value of an SQLITE_LIMIT\n"
-+-  ".lint OPTIONS          Report potential schema issues. Options:\n"
-+-  "                         fkey-indexes     Find missing foreign key indexes\n"
-+-#ifndef SQLITE_OMIT_LOAD_EXTENSION
-+-  ".load FILE ?ENTRY?     Load an extension library\n"
-+-#endif
-+-  ".log FILE|off          Turn logging on or off.  FILE can be stderr/stdout\n"
-+-  ".mode MODE ?TABLE?     Set output mode where MODE is one of:\n"
-+-  "                         ascii    Columns/rows delimited by 0x1F and 0x1E\n"
-+-  "                         csv      Comma-separated values\n"
-+-  "                         column   Left-aligned columns.  (See .width)\n"
-+-  "                         html     HTML <table> code\n"
-+-  "                         insert   SQL insert statements for TABLE\n"
-+-  "                         line     One value per line\n"
-+-  "                         list     Values delimited by \"|\"\n"
-+-  "                         quote    Escape answers as for SQL\n"
-+-  "                         tabs     Tab-separated values\n"
-+-  "                         tcl      TCL list elements\n"
-+-  ".nullvalue STRING      Use STRING in place of NULL values\n"
-+-  ".once FILENAME         Output for the next SQL command only to FILENAME\n"
-+-  ".open ?OPTIONS? ?FILE? Close existing database and reopen FILE\n"
-+-  "                         The --new option starts with an empty file\n"
-+-  ".output ?FILENAME?     Send output to FILENAME or stdout\n"
-+-  ".print STRING...       Print literal STRING\n"
-+-  ".prompt MAIN CONTINUE  Replace the standard prompts\n"
-+-  ".quit                  Exit this program\n"
-+-  ".read FILENAME         Execute SQL in FILENAME\n"
-+-  ".restore ?DB? FILE     Restore content of DB (default \"main\") from FILE\n"
-+-  ".save FILE             Write in-memory database into FILE\n"
-+-  ".scanstats on|off      Turn sqlite3_stmt_scanstatus() metrics on or off\n"
-+-  ".schema ?PATTERN?      Show the CREATE statements matching PATTERN\n"
-+-  "                          Add --indent for pretty-printing\n"
-+-  ".selftest ?--init?     Run tests defined in the SELFTEST table\n"
-+-  ".separator COL ?ROW?   Change the column separator and optionally the row\n"
-+-  "                         separator for both the output mode and .import\n"
-+-#if defined(SQLITE_ENABLE_SESSION)
-+-  ".session CMD ...       Create or control sessions\n"
-+-#endif
-+-  ".sha3sum ?OPTIONS...?  Compute a SHA3 hash of database content\n"
-+-  ".shell CMD ARGS...     Run CMD ARGS... in a system shell\n"
-+-  ".show                  Show the current values for various settings\n"
-+-  ".stats ?on|off?        Show stats or turn stats on or off\n"
-+-  ".system CMD ARGS...    Run CMD ARGS... in a system shell\n"
-+-  ".tables ?TABLE?        List names of tables\n"
-+-  "                         If TABLE specified, only list tables matching\n"
-+-  "                         LIKE pattern TABLE.\n"
-+-  ".testcase NAME         Begin redirecting output to 'testcase-out.txt'\n"
-+-  ".timeout MS            Try opening locked tables for MS milliseconds\n"
-+-  ".timer on|off          Turn SQL timer on or off\n"
-+-  ".trace FILE|off        Output each SQL statement as it is run\n"
-+-  ".vfsinfo ?AUX?         Information about the top-level VFS\n"
-+-  ".vfslist               List all available VFSes\n"
-+-  ".vfsname ?AUX?         Print the name of the VFS stack\n"
-+-  ".width NUM1 NUM2 ...   Set column widths for \"column\" mode\n"
-+-  "                         Negative values right-justify\n"
-+-;
-+-
-+-#if defined(SQLITE_ENABLE_SESSION)
-+-/*
-+-** Print help information for the ".sessions" command
-+-*/
-+-void session_help(ShellState *p){
-+-  raw_printf(p->out,
-+-    ".session ?NAME? SUBCOMMAND ?ARGS...?\n"
-+-    "If ?NAME? is omitted, the first defined session is used.\n"
-+-    "Subcommands:\n"
-+-    "   attach TABLE             Attach TABLE\n"
-+-    "   changeset FILE           Write a changeset into FILE\n"
-+-    "   close                    Close one session\n"
-+-    "   enable ?BOOLEAN?         Set or query the enable bit\n"
-+-    "   filter GLOB...           Reject tables matching GLOBs\n"
-+-    "   indirect ?BOOLEAN?       Mark or query the indirect status\n"
-+-    "   isempty                  Query whether the session is empty\n"
-+-    "   list                     List currently open session names\n"
-+-    "   open DB NAME             Open a new session on DB\n"
-+-    "   patchset FILE            Write a patchset into FILE\n"
-+-  );
-+-}
-+-#endif
-+-
-+-
-+-/* Forward reference */
-+-static int process_input(ShellState *p, FILE *in);
-+-
-+-/*
-+-** Read the content of file zName into memory obtained from sqlite3_malloc64()
-+-** and return a pointer to the buffer. The caller is responsible for freeing
-+-** the memory.
-+-**
-+-** If parameter pnByte is not NULL, (*pnByte) is set to the number of bytes
-+-** read.
-+-**
-+-** For convenience, a nul-terminator byte is always appended to the data read
-+-** from the file before the buffer is returned. This byte is not included in
-+-** the final value of (*pnByte), if applicable.
-+-**
-+-** NULL is returned if any error is encountered. The final value of *pnByte
-+-** is undefined in this case.
-+-*/
-+-static char *readFile(const char *zName, int *pnByte){
-+-  FILE *in = fopen(zName, "rb");
-+-  long nIn;
-+-  size_t nRead;
-+-  char *pBuf;
-+-  if( in==0 ) return 0;
-+-  fseek(in, 0, SEEK_END);
-+-  nIn = ftell(in);
-+-  rewind(in);
-+-  pBuf = sqlite3_malloc64( nIn+1 );
-+-  if( pBuf==0 ) return 0;
-+-  nRead = fread(pBuf, nIn, 1, in);
-+-  fclose(in);
-+-  if( nRead!=1 ){
-+-    sqlite3_free(pBuf);
-+-    return 0;
-+-  }
-+-  pBuf[nIn] = 0;
-+-  if( pnByte ) *pnByte = nIn;
-+-  return pBuf;
-+-}
-+-
-+-#if defined(SQLITE_ENABLE_SESSION)
-+-/*
-+-** Close a single OpenSession object and release all of its associated
-+-** resources.
-+-*/
-+-static void session_close(OpenSession *pSession){
-+-  int i;
-+-  sqlite3session_delete(pSession->p);
-+-  sqlite3_free(pSession->zName);
-+-  for(i=0; i<pSession->nFilter; i++){
-+-    sqlite3_free(pSession->azFilter[i]);
-+-  }
-+-  sqlite3_free(pSession->azFilter);
-+-  memset(pSession, 0, sizeof(OpenSession));
-+-}
-+-#endif
-+-
-+-/*
-+-** Close all OpenSession objects and release all associated resources.
-+-*/
-+-#if defined(SQLITE_ENABLE_SESSION)
-+-static void session_close_all(ShellState *p){
-+-  int i;
-+-  for(i=0; i<p->nSession; i++){
-+-    session_close(&p->aSession[i]);
-+-  }
-+-  p->nSession = 0;
-+-}
-+-#else
-+-# define session_close_all(X)
-+-#endif
-+-
-+-/*
-+-** Implementation of the xFilter function for an open session.  Omit
-+-** any tables named by ".session filter" but let all other table through.
-+-*/
-+-#if defined(SQLITE_ENABLE_SESSION)
-+-static int session_filter(void *pCtx, const char *zTab){
-+-  OpenSession *pSession = (OpenSession*)pCtx;
-+-  int i;
-+-  for(i=0; i<pSession->nFilter; i++){
-+-    if( sqlite3_strglob(pSession->azFilter[i], zTab)==0 ) return 0;
-+-  }
-+-  return 1;
-+-}
-+-#endif
-+-
-+-/*
-+-** Make sure the database is open.  If it is not, then open it.  If
-+-** the database fails to open, print an error message and exit.
-+-*/
-+-static void open_db(ShellState *p, int keepAlive){
-+-  if( p->db==0 ){
-+-    sqlite3_initialize();
-+-    sqlite3_open(p->zDbFilename, &p->db);
-+-    globalDb = p->db;
-+-    if( p->db==0 || SQLITE_OK!=sqlite3_errcode(p->db) ){
-+-      utf8_printf(stderr,"Error: unable to open database \"%s\": %s\n",
-+-          p->zDbFilename, sqlite3_errmsg(p->db));
-+-      if( keepAlive ) return;
-+-      exit(1);
-+-    }
-+-#ifndef SQLITE_OMIT_LOAD_EXTENSION
-+-    sqlite3_enable_load_extension(p->db, 1);
-+-#endif
-+-    sqlite3_fileio_init(p->db, 0, 0);
-+-    sqlite3_shathree_init(p->db, 0, 0);
-+-    sqlite3_completion_init(p->db, 0, 0);
-+-    sqlite3_create_function(p->db, "shell_add_schema", 2, SQLITE_UTF8, 0,
-+-                            shellAddSchemaName, 0, 0);
-+-  }
-+-}
-+-
-+-#if HAVE_READLINE || HAVE_EDITLINE
-+-/*
-+-** Readline completion callbacks
-+-*/
-+-static char *readline_completion_generator(const char *text, int state){
-+-  static sqlite3_stmt *pStmt = 0;
-+-  char *zRet;
-+-  if( state==0 ){
-+-    char *zSql;
-+-    sqlite3_finalize(pStmt);
-+-    zSql = sqlite3_mprintf("SELECT DISTINCT candidate COLLATE nocase"
-+-                           "  FROM completion(%Q) ORDER BY 1", text);
-+-    sqlite3_prepare_v2(globalDb, zSql, -1, &pStmt, 0);
-+-    sqlite3_free(zSql);
-+-  }
-+-  if( sqlite3_step(pStmt)==SQLITE_ROW ){
-+-    zRet = strdup((const char*)sqlite3_column_text(pStmt, 0));
-+-  }else{
-+-    sqlite3_finalize(pStmt);
-+-    pStmt = 0;
-+-    zRet = 0;
-+-  }
-+-  return zRet;
-+-}
-+-static char **readline_completion(const char *zText, int iStart, int iEnd){
-+-  rl_attempted_completion_over = 1;
-+-  return rl_completion_matches(zText, readline_completion_generator);
-+-}
-+-
-+-#elif HAVE_LINENOISE
-+-/*
-+-** Linenoise completion callback
-+-*/
-+-static void linenoise_completion(const char *zLine, linenoiseCompletions *lc){
-+-  int nLine = (int)strlen(zLine);
-+-  int i, iStart;
-+-  sqlite3_stmt *pStmt = 0;
-+-  char *zSql;
-+-  char zBuf[1000];
-+-
-+-  if( nLine>sizeof(zBuf)-30 ) return;
-+-  if( zLine[0]=='.' ) return;
-+-  for(i=nLine-1; i>=0 && (isalnum(zLine[i]) || zLine[i]=='_'); i--){}
-+-  if( i==nLine-1 ) return;
-+-  iStart = i+1;
-+-  memcpy(zBuf, zLine, iStart);
-+-  zSql = sqlite3_mprintf("SELECT DISTINCT candidate COLLATE nocase"
-+-                         "  FROM completion(%Q,%Q) ORDER BY 1",
-+-                         &zLine[iStart], zLine);
-+-  sqlite3_prepare_v2(globalDb, zSql, -1, &pStmt, 0);
-+-  sqlite3_free(zSql);
-+-  sqlite3_exec(globalDb, "PRAGMA page_count", 0, 0, 0); /* Load the schema */
-+-  while( sqlite3_step(pStmt)==SQLITE_ROW ){
-+-    const char *zCompletion = (const char*)sqlite3_column_text(pStmt, 0);
-+-    int nCompletion = sqlite3_column_bytes(pStmt, 0);
-+-    if( iStart+nCompletion < sizeof(zBuf)-1 ){
-+-      memcpy(zBuf+iStart, zCompletion, nCompletion+1);
-+-      linenoiseAddCompletion(lc, zBuf);
-+-    }
-+-  }
-+-  sqlite3_finalize(pStmt);
-+-}
-+-#endif
-+-
-+-/*
-+-** Do C-language style dequoting.
-+-**
-+-**    \a    -> alarm
-+-**    \b    -> backspace
-+-**    \t    -> tab
-+-**    \n    -> newline
-+-**    \v    -> vertical tab
-+-**    \f    -> form feed
-+-**    \r    -> carriage return
-+-**    \s    -> space
-+-**    \"    -> "
-+-**    \'    -> '
-+-**    \\    -> backslash
-+-**    \NNN  -> ascii character NNN in octal
-+-*/
-+-static void resolve_backslashes(char *z){
-+-  int i, j;
-+-  char c;
-+-  while( *z && *z!='\\' ) z++;
-+-  for(i=j=0; (c = z[i])!=0; i++, j++){
-+-    if( c=='\\' && z[i+1]!=0 ){
-+-      c = z[++i];
-+-      if( c=='a' ){
-+-        c = '\a';
-+-      }else if( c=='b' ){
-+-        c = '\b';
-+-      }else if( c=='t' ){
-+-        c = '\t';
-+-      }else if( c=='n' ){
-+-        c = '\n';
-+-      }else if( c=='v' ){
-+-        c = '\v';
-+-      }else if( c=='f' ){
-+-        c = '\f';
-+-      }else if( c=='r' ){
-+-        c = '\r';
-+-      }else if( c=='"' ){
-+-        c = '"';
-+-      }else if( c=='\'' ){
-+-        c = '\'';
-+-      }else if( c=='\\' ){
-+-        c = '\\';
-+-      }else if( c>='0' && c<='7' ){
-+-        c -= '0';
-+-        if( z[i+1]>='0' && z[i+1]<='7' ){
-+-          i++;
-+-          c = (c<<3) + z[i] - '0';
-+-          if( z[i+1]>='0' && z[i+1]<='7' ){
-+-            i++;
-+-            c = (c<<3) + z[i] - '0';
-+-          }
-+-        }
-+-      }
-+-    }
-+-    z[j] = c;
-+-  }
-+-  if( j<i ) z[j] = 0;
-+-}
-+-
-+-/*
-+-** Return the value of a hexadecimal digit.  Return -1 if the input
-+-** is not a hex digit.
-+-*/
-+-static int hexDigitValue(char c){
-+-  if( c>='0' && c<='9' ) return c - '0';
-+-  if( c>='a' && c<='f' ) return c - 'a' + 10;
-+-  if( c>='A' && c<='F' ) return c - 'A' + 10;
-+-  return -1;
-+-}
-+-
-+-/*
-+-** Interpret zArg as an integer value, possibly with suffixes.
-+-*/
-+-static sqlite3_int64 integerValue(const char *zArg){
-+-  sqlite3_int64 v = 0;
-+-  static const struct { char *zSuffix; int iMult; } aMult[] = {
-+-    { "KiB", 1024 },
-+-    { "MiB", 1024*1024 },
-+-    { "GiB", 1024*1024*1024 },
-+-    { "KB",  1000 },
-+-    { "MB",  1000000 },
-+-    { "GB",  1000000000 },
-+-    { "K",   1000 },
-+-    { "M",   1000000 },
-+-    { "G",   1000000000 },
-+-  };
-+-  int i;
-+-  int isNeg = 0;
-+-  if( zArg[0]=='-' ){
-+-    isNeg = 1;
-+-    zArg++;
-+-  }else if( zArg[0]=='+' ){
-+-    zArg++;
-+-  }
-+-  if( zArg[0]=='0' && zArg[1]=='x' ){
-+-    int x;
-+-    zArg += 2;
-+-    while( (x = hexDigitValue(zArg[0]))>=0 ){
-+-      v = (v<<4) + x;
-+-      zArg++;
-+-    }
-+-  }else{
-+-    while( IsDigit(zArg[0]) ){
-+-      v = v*10 + zArg[0] - '0';
-+-      zArg++;
-+-    }
-+-  }
-+-  for(i=0; i<ArraySize(aMult); i++){
-+-    if( sqlite3_stricmp(aMult[i].zSuffix, zArg)==0 ){
-+-      v *= aMult[i].iMult;
-+-      break;
-+-    }
-+-  }
-+-  return isNeg? -v : v;
-+-}
-+-
-+-/*
-+-** Interpret zArg as either an integer or a boolean value.  Return 1 or 0
-+-** for TRUE and FALSE.  Return the integer value if appropriate.
-+-*/
-+-static int booleanValue(const char *zArg){
-+-  int i;
-+-  if( zArg[0]=='0' && zArg[1]=='x' ){
-+-    for(i=2; hexDigitValue(zArg[i])>=0; i++){}
-+-  }else{
-+-    for(i=0; zArg[i]>='0' && zArg[i]<='9'; i++){}
-+-  }
-+-  if( i>0 && zArg[i]==0 ) return (int)(integerValue(zArg) & 0xffffffff);
-+-  if( sqlite3_stricmp(zArg, "on")==0 || sqlite3_stricmp(zArg,"yes")==0 ){
-+-    return 1;
-+-  }
-+-  if( sqlite3_stricmp(zArg, "off")==0 || sqlite3_stricmp(zArg,"no")==0 ){
-+-    return 0;
-+-  }
-+-  utf8_printf(stderr, "ERROR: Not a boolean value: \"%s\". Assuming \"no\".\n",
-+-          zArg);
-+-  return 0;
-+-}
-+-
-+-/*
-+-** Set or clear a shell flag according to a boolean value.
-+-*/
-+-static void setOrClearFlag(ShellState *p, unsigned mFlag, const char *zArg){
-+-  if( booleanValue(zArg) ){
-+-    ShellSetFlag(p, mFlag);
-+-  }else{
-+-    ShellClearFlag(p, mFlag);
-+-  }
-+-}
-+-
-+-/*
-+-** Close an output file, assuming it is not stderr or stdout
-+-*/
-+-static void output_file_close(FILE *f){
-+-  if( f && f!=stdout && f!=stderr ) fclose(f);
-+-}
-+-
-+-/*
-+-** Try to open an output file.   The names "stdout" and "stderr" are
-+-** recognized and do the right thing.  NULL is returned if the output
-+-** filename is "off".
-+-*/
-+-static FILE *output_file_open(const char *zFile){
-+-  FILE *f;
-+-  if( strcmp(zFile,"stdout")==0 ){
-+-    f = stdout;
-+-  }else if( strcmp(zFile, "stderr")==0 ){
-+-    f = stderr;
-+-  }else if( strcmp(zFile, "off")==0 ){
-+-    f = 0;
-+-  }else{
-+-    f = fopen(zFile, "wb");
-+-    if( f==0 ){
-+-      utf8_printf(stderr, "Error: cannot open \"%s\"\n", zFile);
-+-    }
-+-  }
-+-  return f;
-+-}
-+-
-+-#if !defined(SQLITE_UNTESTABLE)
-+-#if !defined(SQLITE_OMIT_TRACE) && !defined(SQLITE_OMIT_FLOATING_POINT)
-+-/*
-+-** A routine for handling output from sqlite3_trace().
-+-*/
-+-static int sql_trace_callback(
-+-  unsigned mType,
-+-  void *pArg,
-+-  void *pP,
-+-  void *pX
-+-){
-+-  FILE *f = (FILE*)pArg;
-+-  UNUSED_PARAMETER(mType);
-+-  UNUSED_PARAMETER(pP);
-+-  if( f ){
-+-    const char *z = (const char*)pX;
-+-    int i = (int)strlen(z);
-+-    while( i>0 && z[i-1]==';' ){ i--; }
-+-    utf8_printf(f, "%.*s;\n", i, z);
-+-  }
-+-  return 0;
-+-}
-+-#endif
-+-#endif
-+-
-+-/*
-+-** A no-op routine that runs with the ".breakpoint" doc-command.  This is
-+-** a useful spot to set a debugger breakpoint.
-+-*/
-+-static void test_breakpoint(void){
-+-  static int nCall = 0;
-+-  nCall++;
-+-}
-+-
-+-/*
-+-** An object used to read a CSV and other files for import.
-+-*/
-+-typedef struct ImportCtx ImportCtx;
-+-struct ImportCtx {
-+-  const char *zFile;  /* Name of the input file */
-+-  FILE *in;           /* Read the CSV text from this input stream */
-+-  char *z;            /* Accumulated text for a field */
-+-  int n;              /* Number of bytes in z */
-+-  int nAlloc;         /* Space allocated for z[] */
-+-  int nLine;          /* Current line number */
-+-  int bNotFirst;      /* True if one or more bytes already read */
-+-  int cTerm;          /* Character that terminated the most recent field */
-+-  int cColSep;        /* The column separator character.  (Usually ",") */
-+-  int cRowSep;        /* The row separator character.  (Usually "\n") */
-+-};
-+-
-+-/* Append a single byte to z[] */
-+-static void import_append_char(ImportCtx *p, int c){
-+-  if( p->n+1>=p->nAlloc ){
-+-    p->nAlloc += p->nAlloc + 100;
-+-    p->z = sqlite3_realloc64(p->z, p->nAlloc);
-+-    if( p->z==0 ){
-+-      raw_printf(stderr, "out of memory\n");
-+-      exit(1);
-+-    }
-+-  }
-+-  p->z[p->n++] = (char)c;
-+-}
-+-
-+-/* Read a single field of CSV text.  Compatible with rfc4180 and extended
-+-** with the option of having a separator other than ",".
-+-**
-+-**   +  Input comes from p->in.
-+-**   +  Store results in p->z of length p->n.  Space to hold p->z comes
-+-**      from sqlite3_malloc64().
-+-**   +  Use p->cSep as the column separator.  The default is ",".
-+-**   +  Use p->rSep as the row separator.  The default is "\n".
-+-**   +  Keep track of the line number in p->nLine.
-+-**   +  Store the character that terminates the field in p->cTerm.  Store
-+-**      EOF on end-of-file.
-+-**   +  Report syntax errors on stderr
-+-*/
-+-static char *SQLITE_CDECL csv_read_one_field(ImportCtx *p){
-+-  int c;
-+-  int cSep = p->cColSep;
-+-  int rSep = p->cRowSep;
-+-  p->n = 0;
-+-  c = fgetc(p->in);
-+-  if( c==EOF || seenInterrupt ){
-+-    p->cTerm = EOF;
-+-    return 0;
-+-  }
-+-  if( c=='"' ){
-+-    int pc, ppc;
-+-    int startLine = p->nLine;
-+-    int cQuote = c;
-+-    pc = ppc = 0;
-+-    while( 1 ){
-+-      c = fgetc(p->in);
-+-      if( c==rSep ) p->nLine++;
-+-      if( c==cQuote ){
-+-        if( pc==cQuote ){
-+-          pc = 0;
-+-          continue;
-+-        }
-+-      }
-+-      if( (c==cSep && pc==cQuote)
-+-       || (c==rSep && pc==cQuote)
-+-       || (c==rSep && pc=='\r' && ppc==cQuote)
-+-       || (c==EOF && pc==cQuote)
-+-      ){
-+-        do{ p->n--; }while( p->z[p->n]!=cQuote );
-+-        p->cTerm = c;
-+-        break;
-+-      }
-+-      if( pc==cQuote && c!='\r' ){
-+-        utf8_printf(stderr, "%s:%d: unescaped %c character\n",
-+-                p->zFile, p->nLine, cQuote);
-+-      }
-+-      if( c==EOF ){
-+-        utf8_printf(stderr, "%s:%d: unterminated %c-quoted field\n",
-+-                p->zFile, startLine, cQuote);
-+-        p->cTerm = c;
-+-        break;
-+-      }
-+-      import_append_char(p, c);
-+-      ppc = pc;
-+-      pc = c;
-+-    }
-+-  }else{
-+-    /* If this is the first field being parsed and it begins with the
-+-    ** UTF-8 BOM  (0xEF BB BF) then skip the BOM */
-+-    if( (c&0xff)==0xef && p->bNotFirst==0 ){
-+-      import_append_char(p, c);
-+-      c = fgetc(p->in);
-+-      if( (c&0xff)==0xbb ){
-+-        import_append_char(p, c);
-+-        c = fgetc(p->in);
-+-        if( (c&0xff)==0xbf ){
-+-          p->bNotFirst = 1;
-+-          p->n = 0;
-+-          return csv_read_one_field(p);
-+-        }
-+-      }
-+-    }
-+-    while( c!=EOF && c!=cSep && c!=rSep ){
-+-      import_append_char(p, c);
-+-      c = fgetc(p->in);
-+-    }
-+-    if( c==rSep ){
-+-      p->nLine++;
-+-      if( p->n>0 && p->z[p->n-1]=='\r' ) p->n--;
-+-    }
-+-    p->cTerm = c;
-+-  }
-+-  if( p->z ) p->z[p->n] = 0;
-+-  p->bNotFirst = 1;
-+-  return p->z;
-+-}
-+-
-+-/* Read a single field of ASCII delimited text.
-+-**
-+-**   +  Input comes from p->in.
-+-**   +  Store results in p->z of length p->n.  Space to hold p->z comes
-+-**      from sqlite3_malloc64().
-+-**   +  Use p->cSep as the column separator.  The default is "\x1F".
-+-**   +  Use p->rSep as the row separator.  The default is "\x1E".
-+-**   +  Keep track of the row number in p->nLine.
-+-**   +  Store the character that terminates the field in p->cTerm.  Store
-+-**      EOF on end-of-file.
-+-**   +  Report syntax errors on stderr
-+-*/
-+-static char *SQLITE_CDECL ascii_read_one_field(ImportCtx *p){
-+-  int c;
-+-  int cSep = p->cColSep;
-+-  int rSep = p->cRowSep;
-+-  p->n = 0;
-+-  c = fgetc(p->in);
-+-  if( c==EOF || seenInterrupt ){
-+-    p->cTerm = EOF;
-+-    return 0;
-+-  }
-+-  while( c!=EOF && c!=cSep && c!=rSep ){
-+-    import_append_char(p, c);
-+-    c = fgetc(p->in);
-+-  }
-+-  if( c==rSep ){
-+-    p->nLine++;
-+-  }
-+-  p->cTerm = c;
-+-  if( p->z ) p->z[p->n] = 0;
-+-  return p->z;
-+-}
-+-
-+-/*
-+-** Try to transfer data for table zTable.  If an error is seen while
-+-** moving forward, try to go backwards.  The backwards movement won't
-+-** work for WITHOUT ROWID tables.
-+-*/
-+-static void tryToCloneData(
-+-  ShellState *p,
-+-  sqlite3 *newDb,
-+-  const char *zTable
-+-){
-+-  sqlite3_stmt *pQuery = 0;
-+-  sqlite3_stmt *pInsert = 0;
-+-  char *zQuery = 0;
-+-  char *zInsert = 0;
-+-  int rc;
-+-  int i, j, n;
-+-  int nTable = (int)strlen(zTable);
-+-  int k = 0;
-+-  int cnt = 0;
-+-  const int spinRate = 10000;
-+-
-+-  zQuery = sqlite3_mprintf("SELECT * FROM \"%w\"", zTable);
-+-  rc = sqlite3_prepare_v2(p->db, zQuery, -1, &pQuery, 0);
-+-  if( rc ){
-+-    utf8_printf(stderr, "Error %d: %s on [%s]\n",
-+-            sqlite3_extended_errcode(p->db), sqlite3_errmsg(p->db),
-+-            zQuery);
-+-    goto end_data_xfer;
-+-  }
-+-  n = sqlite3_column_count(pQuery);
-+-  zInsert = sqlite3_malloc64(200 + nTable + n*3);
-+-  if( zInsert==0 ){
-+-    raw_printf(stderr, "out of memory\n");
-+-    goto end_data_xfer;
-+-  }
-+-  sqlite3_snprintf(200+nTable,zInsert,
-+-                   "INSERT OR IGNORE INTO \"%s\" VALUES(?", zTable);
-+-  i = (int)strlen(zInsert);
-+-  for(j=1; j<n; j++){
-+-    memcpy(zInsert+i, ",?", 2);
-+-    i += 2;
-+-  }
-+-  memcpy(zInsert+i, ");", 3);
-+-  rc = sqlite3_prepare_v2(newDb, zInsert, -1, &pInsert, 0);
-+-  if( rc ){
-+-    utf8_printf(stderr, "Error %d: %s on [%s]\n",
-+-            sqlite3_extended_errcode(newDb), sqlite3_errmsg(newDb),
-+-            zQuery);
-+-    goto end_data_xfer;
-+-  }
-+-  for(k=0; k<2; k++){
-+-    while( (rc = sqlite3_step(pQuery))==SQLITE_ROW ){
-+-      for(i=0; i<n; i++){
-+-        switch( sqlite3_column_type(pQuery, i) ){
-+-          case SQLITE_NULL: {
-+-            sqlite3_bind_null(pInsert, i+1);
-+-            break;
-+-          }
-+-          case SQLITE_INTEGER: {
-+-            sqlite3_bind_int64(pInsert, i+1, sqlite3_column_int64(pQuery,i));
-+-            break;
-+-          }
-+-          case SQLITE_FLOAT: {
-+-            sqlite3_bind_double(pInsert, i+1, sqlite3_column_double(pQuery,i));
-+-            break;
-+-          }
-+-          case SQLITE_TEXT: {
-+-            sqlite3_bind_text(pInsert, i+1,
-+-                             (const char*)sqlite3_column_text(pQuery,i),
-+-                             -1, SQLITE_STATIC);
-+-            break;
-+-          }
-+-          case SQLITE_BLOB: {
-+-            sqlite3_bind_blob(pInsert, i+1, sqlite3_column_blob(pQuery,i),
-+-                                            sqlite3_column_bytes(pQuery,i),
-+-                                            SQLITE_STATIC);
-+-            break;
-+-          }
-+-        }
-+-      } /* End for */
-+-      rc = sqlite3_step(pInsert);
-+-      if( rc!=SQLITE_OK && rc!=SQLITE_ROW && rc!=SQLITE_DONE ){
-+-        utf8_printf(stderr, "Error %d: %s\n", sqlite3_extended_errcode(newDb),
-+-                        sqlite3_errmsg(newDb));
-+-      }
-+-      sqlite3_reset(pInsert);
-+-      cnt++;
-+-      if( (cnt%spinRate)==0 ){
-+-        printf("%c\b", "|/-\\"[(cnt/spinRate)%4]);
-+-        fflush(stdout);
-+-      }
-+-    } /* End while */
-+-    if( rc==SQLITE_DONE ) break;
-+-    sqlite3_finalize(pQuery);
-+-    sqlite3_free(zQuery);
-+-    zQuery = sqlite3_mprintf("SELECT * FROM \"%w\" ORDER BY rowid DESC;",
-+-                             zTable);
-+-    rc = sqlite3_prepare_v2(p->db, zQuery, -1, &pQuery, 0);
-+-    if( rc ){
-+-      utf8_printf(stderr, "Warning: cannot step \"%s\" backwards", zTable);
-+-      break;
-+-    }
-+-  } /* End for(k=0...) */
-+-
-+-end_data_xfer:
-+-  sqlite3_finalize(pQuery);
-+-  sqlite3_finalize(pInsert);
-+-  sqlite3_free(zQuery);
-+-  sqlite3_free(zInsert);
-+-}
-+-
-+-
-+-/*
-+-** Try to transfer all rows of the schema that match zWhere.  For
-+-** each row, invoke xForEach() on the object defined by that row.
-+-** If an error is encountered while moving forward through the
-+-** sqlite_master table, try again moving backwards.
-+-*/
-+-static void tryToCloneSchema(
-+-  ShellState *p,
-+-  sqlite3 *newDb,
-+-  const char *zWhere,
-+-  void (*xForEach)(ShellState*,sqlite3*,const char*)
-+-){
-+-  sqlite3_stmt *pQuery = 0;
-+-  char *zQuery = 0;
-+-  int rc;
-+-  const unsigned char *zName;
-+-  const unsigned char *zSql;
-+-  char *zErrMsg = 0;
-+-
-+-  zQuery = sqlite3_mprintf("SELECT name, sql FROM sqlite_master"
-+-                           " WHERE %s", zWhere);
-+-  rc = sqlite3_prepare_v2(p->db, zQuery, -1, &pQuery, 0);
-+-  if( rc ){
-+-    utf8_printf(stderr, "Error: (%d) %s on [%s]\n",
-+-                    sqlite3_extended_errcode(p->db), sqlite3_errmsg(p->db),
-+-                    zQuery);
-+-    goto end_schema_xfer;
-+-  }
-+-  while( (rc = sqlite3_step(pQuery))==SQLITE_ROW ){
-+-    zName = sqlite3_column_text(pQuery, 0);
-+-    zSql = sqlite3_column_text(pQuery, 1);
-+-    printf("%s... ", zName); fflush(stdout);
-+-    sqlite3_exec(newDb, (const char*)zSql, 0, 0, &zErrMsg);
-+-    if( zErrMsg ){
-+-      utf8_printf(stderr, "Error: %s\nSQL: [%s]\n", zErrMsg, zSql);
-+-      sqlite3_free(zErrMsg);
-+-      zErrMsg = 0;
-+-    }
-+-    if( xForEach ){
-+-      xForEach(p, newDb, (const char*)zName);
-+-    }
-+-    printf("done\n");
-+-  }
-+-  if( rc!=SQLITE_DONE ){
-+-    sqlite3_finalize(pQuery);
-+-    sqlite3_free(zQuery);
-+-    zQuery = sqlite3_mprintf("SELECT name, sql FROM sqlite_master"
-+-                             " WHERE %s ORDER BY rowid DESC", zWhere);
-+-    rc = sqlite3_prepare_v2(p->db, zQuery, -1, &pQuery, 0);
-+-    if( rc ){
-+-      utf8_printf(stderr, "Error: (%d) %s on [%s]\n",
-+-                      sqlite3_extended_errcode(p->db), sqlite3_errmsg(p->db),
-+-                      zQuery);
-+-      goto end_schema_xfer;
-+-    }
-+-    while( (rc = sqlite3_step(pQuery))==SQLITE_ROW ){
-+-      zName = sqlite3_column_text(pQuery, 0);
-+-      zSql = sqlite3_column_text(pQuery, 1);
-+-      printf("%s... ", zName); fflush(stdout);
-+-      sqlite3_exec(newDb, (const char*)zSql, 0, 0, &zErrMsg);
-+-      if( zErrMsg ){
-+-        utf8_printf(stderr, "Error: %s\nSQL: [%s]\n", zErrMsg, zSql);
-+-        sqlite3_free(zErrMsg);
-+-        zErrMsg = 0;
-+-      }
-+-      if( xForEach ){
-+-        xForEach(p, newDb, (const char*)zName);
-+-      }
-+-      printf("done\n");
-+-    }
-+-  }
-+-end_schema_xfer:
-+-  sqlite3_finalize(pQuery);
-+-  sqlite3_free(zQuery);
-+-}
-+-
-+-/*
-+-** Open a new database file named "zNewDb".  Try to recover as much information
-+-** as possible out of the main database (which might be corrupt) and write it
-+-** into zNewDb.
-+-*/
-+-static void tryToClone(ShellState *p, const char *zNewDb){
-+-  int rc;
-+-  sqlite3 *newDb = 0;
-+-  if( access(zNewDb,0)==0 ){
-+-    utf8_printf(stderr, "File \"%s\" already exists.\n", zNewDb);
-+-    return;
-+-  }
-+-  rc = sqlite3_open(zNewDb, &newDb);
-+-  if( rc ){
-+-    utf8_printf(stderr, "Cannot create output database: %s\n",
-+-            sqlite3_errmsg(newDb));
-+-  }else{
-+-    sqlite3_exec(p->db, "PRAGMA writable_schema=ON;", 0, 0, 0);
-+-    sqlite3_exec(newDb, "BEGIN EXCLUSIVE;", 0, 0, 0);
-+-    tryToCloneSchema(p, newDb, "type='table'", tryToCloneData);
-+-    tryToCloneSchema(p, newDb, "type!='table'", 0);
-+-    sqlite3_exec(newDb, "COMMIT;", 0, 0, 0);
-+-    sqlite3_exec(p->db, "PRAGMA writable_schema=OFF;", 0, 0, 0);
-+-  }
-+-  sqlite3_close(newDb);
-+-}
-+-
-+-/*
-+-** Change the output file back to stdout
-+-*/
-+-static void output_reset(ShellState *p){
-+-  if( p->outfile[0]=='|' ){
-+-#ifndef SQLITE_OMIT_POPEN
-+-    pclose(p->out);
-+-#endif
-+-  }else{
-+-    output_file_close(p->out);
-+-  }
-+-  p->outfile[0] = 0;
-+-  p->out = stdout;
-+-}
-+-
-+-/*
-+-** Run an SQL command and return the single integer result.
-+-*/
-+-static int db_int(ShellState *p, const char *zSql){
-+-  sqlite3_stmt *pStmt;
-+-  int res = 0;
-+-  sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
-+-  if( pStmt && sqlite3_step(pStmt)==SQLITE_ROW ){
-+-    res = sqlite3_column_int(pStmt,0);
-+-  }
-+-  sqlite3_finalize(pStmt);
-+-  return res;
-+-}
-+-
-+-/*
-+-** Convert a 2-byte or 4-byte big-endian integer into a native integer
-+-*/
-+-static unsigned int get2byteInt(unsigned char *a){
-+-  return (a[0]<<8) + a[1];
-+-}
-+-static unsigned int get4byteInt(unsigned char *a){
-+-  return (a[0]<<24) + (a[1]<<16) + (a[2]<<8) + a[3];
-+-}
-+-
-+-/*
-+-** Implementation of the ".info" command.
-+-**
-+-** Return 1 on error, 2 to exit, and 0 otherwise.
-+-*/
-+-static int shell_dbinfo_command(ShellState *p, int nArg, char **azArg){
-+-  static const struct { const char *zName; int ofst; } aField[] = {
-+-     { "file change counter:",  24  },
-+-     { "database page count:",  28  },
-+-     { "freelist page count:",  36  },
-+-     { "schema cookie:",        40  },
-+-     { "schema format:",        44  },
-+-     { "default cache size:",   48  },
-+-     { "autovacuum top root:",  52  },
-+-     { "incremental vacuum:",   64  },
-+-     { "text encoding:",        56  },
-+-     { "user version:",         60  },
-+-     { "application id:",       68  },
-+-     { "software version:",     96  },
-+-  };
-+-  static const struct { const char *zName; const char *zSql; } aQuery[] = {
-+-     { "number of tables:",
-+-       "SELECT count(*) FROM %s WHERE type='table'" },
-+-     { "number of indexes:",
-+-       "SELECT count(*) FROM %s WHERE type='index'" },
-+-     { "number of triggers:",
-+-       "SELECT count(*) FROM %s WHERE type='trigger'" },
-+-     { "number of views:",
-+-       "SELECT count(*) FROM %s WHERE type='view'" },
-+-     { "schema size:",
-+-       "SELECT total(length(sql)) FROM %s" },
-+-  };
-+-  sqlite3_file *pFile = 0;
-+-  int i;
-+-  char *zSchemaTab;
-+-  char *zDb = nArg>=2 ? azArg[1] : "main";
-+-  unsigned char aHdr[100];
-+-  open_db(p, 0);
-+-  if( p->db==0 ) return 1;
-+-  sqlite3_file_control(p->db, zDb, SQLITE_FCNTL_FILE_POINTER, &pFile);
-+-  if( pFile==0 || pFile->pMethods==0 || pFile->pMethods->xRead==0 ){
-+-    return 1;
-+-  }
-+-  i = pFile->pMethods->xRead(pFile, aHdr, 100, 0);
-+-  if( i!=SQLITE_OK ){
-+-    raw_printf(stderr, "unable to read database header\n");
-+-    return 1;
-+-  }
-+-  i = get2byteInt(aHdr+16);
-+-  if( i==1 ) i = 65536;
-+-  utf8_printf(p->out, "%-20s %d\n", "database page size:", i);
-+-  utf8_printf(p->out, "%-20s %d\n", "write format:", aHdr[18]);
-+-  utf8_printf(p->out, "%-20s %d\n", "read format:", aHdr[19]);
-+-  utf8_printf(p->out, "%-20s %d\n", "reserved bytes:", aHdr[20]);
-+-  for(i=0; i<ArraySize(aField); i++){
-+-    int ofst = aField[i].ofst;
-+-    unsigned int val = get4byteInt(aHdr + ofst);
-+-    utf8_printf(p->out, "%-20s %u", aField[i].zName, val);
-+-    switch( ofst ){
-+-      case 56: {
-+-        if( val==1 ) raw_printf(p->out, " (utf8)");
-+-        if( val==2 ) raw_printf(p->out, " (utf16le)");
-+-        if( val==3 ) raw_printf(p->out, " (utf16be)");
-+-      }
-+-    }
-+-    raw_printf(p->out, "\n");
-+-  }
-+-  if( zDb==0 ){
-+-    zSchemaTab = sqlite3_mprintf("main.sqlite_master");
-+-  }else if( strcmp(zDb,"temp")==0 ){
-+-    zSchemaTab = sqlite3_mprintf("%s", "sqlite_temp_master");
-+-  }else{
-+-    zSchemaTab = sqlite3_mprintf("\"%w\".sqlite_master", zDb);
-+-  }
-+-  for(i=0; i<ArraySize(aQuery); i++){
-+-    char *zSql = sqlite3_mprintf(aQuery[i].zSql, zSchemaTab);
-+-    int val = db_int(p, zSql);
-+-    sqlite3_free(zSql);
-+-    utf8_printf(p->out, "%-20s %d\n", aQuery[i].zName, val);
-+-  }
-+-  sqlite3_free(zSchemaTab);
-+-  return 0;
-+-}
-+-
-+-/*
-+-** Print the current sqlite3_errmsg() value to stderr and return 1.
-+-*/
-+-static int shellDatabaseError(sqlite3 *db){
-+-  const char *zErr = sqlite3_errmsg(db);
-+-  utf8_printf(stderr, "Error: %s\n", zErr);
-+-  return 1;
-+-}
-+-
-+-/*
-+-** Print an out-of-memory message to stderr and return 1.
-+-*/
-+-static int shellNomemError(void){
-+-  raw_printf(stderr, "Error: out of memory\n");
-+-  return 1;
-+-}
-+-
-+-/*
-+-** Compare the pattern in zGlob[] against the text in z[].  Return TRUE
-+-** if they match and FALSE (0) if they do not match.
-+-**
-+-** Globbing rules:
-+-**
-+-**      '*'       Matches any sequence of zero or more characters.
-+-**
-+-**      '?'       Matches exactly one character.
-+-**
-+-**     [...]      Matches one character from the enclosed list of
-+-**                characters.
-+-**
-+-**     [^...]     Matches one character not in the enclosed list.
-+-**
-+-**      '#'       Matches any sequence of one or more digits with an
-+-**                optional + or - sign in front
-+-**
-+-**      ' '       Any span of whitespace matches any other span of
-+-**                whitespace.
-+-**
-+-** Extra whitespace at the end of z[] is ignored.
-+-*/
-+-static int testcase_glob(const char *zGlob, const char *z){
-+-  int c, c2;
-+-  int invert;
-+-  int seen;
-+-
-+-  while( (c = (*(zGlob++)))!=0 ){
-+-    if( IsSpace(c) ){
-+-      if( !IsSpace(*z) ) return 0;
-+-      while( IsSpace(*zGlob) ) zGlob++;
-+-      while( IsSpace(*z) ) z++;
-+-    }else if( c=='*' ){
-+-      while( (c=(*(zGlob++))) == '*' || c=='?' ){
-+-        if( c=='?' && (*(z++))==0 ) return 0;
-+-      }
-+-      if( c==0 ){
-+-        return 1;
-+-      }else if( c=='[' ){
-+-        while( *z && testcase_glob(zGlob-1,z)==0 ){
-+-          z++;
-+-        }
-+-        return (*z)!=0;
-+-      }
-+-      while( (c2 = (*(z++)))!=0 ){
-+-        while( c2!=c ){
-+-          c2 = *(z++);
-+-          if( c2==0 ) return 0;
-+-        }
-+-        if( testcase_glob(zGlob,z) ) return 1;
-+-      }
-+-      return 0;
-+-    }else if( c=='?' ){
-+-      if( (*(z++))==0 ) return 0;
-+-    }else if( c=='[' ){
-+-      int prior_c = 0;
-+-      seen = 0;
-+-      invert = 0;
-+-      c = *(z++);
-+-      if( c==0 ) return 0;
-+-      c2 = *(zGlob++);
-+-      if( c2=='^' ){
-+-        invert = 1;
-+-        c2 = *(zGlob++);
-+-      }
-+-      if( c2==']' ){
-+-        if( c==']' ) seen = 1;
-+-        c2 = *(zGlob++);
-+-      }
-+-      while( c2 && c2!=']' ){
-+-        if( c2=='-' && zGlob[0]!=']' && zGlob[0]!=0 && prior_c>0 ){
-+-          c2 = *(zGlob++);
-+-          if( c>=prior_c && c<=c2 ) seen = 1;
-+-          prior_c = 0;
-+-        }else{
-+-          if( c==c2 ){
-+-            seen = 1;
-+-          }
-+-          prior_c = c2;
-+-        }
-+-        c2 = *(zGlob++);
-+-      }
-+-      if( c2==0 || (seen ^ invert)==0 ) return 0;
-+-    }else if( c=='#' ){
-+-      if( (z[0]=='-' || z[0]=='+') && IsDigit(z[1]) ) z++;
-+-      if( !IsDigit(z[0]) ) return 0;
-+-      z++;
-+-      while( IsDigit(z[0]) ){ z++; }
-+-    }else{
-+-      if( c!=(*(z++)) ) return 0;
-+-    }
-+-  }
-+-  while( IsSpace(*z) ){ z++; }
-+-  return *z==0;
-+-}
-+-
-+-
-+-/*
-+-** Compare the string as a command-line option with either one or two
-+-** initial "-" characters.
-+-*/
-+-static int optionMatch(const char *zStr, const char *zOpt){
-+-  if( zStr[0]!='-' ) return 0;
-+-  zStr++;
-+-  if( zStr[0]=='-' ) zStr++;
-+-  return strcmp(zStr, zOpt)==0;
-+-}
-+-
-+-/*
-+-** Delete a file.
-+-*/
-+-int shellDeleteFile(const char *zFilename){
-+-  int rc;
-+-#ifdef _WIN32
-+-  wchar_t *z = sqlite3_win32_utf8_to_unicode(zFilename);
-+-  rc = _wunlink(z);
-+-  sqlite3_free(z);
-+-#else
-+-  rc = unlink(zFilename);
-+-#endif
-+-  return rc;
-+-}
-+-
-+-
-+-/*
-+-** The implementation of SQL scalar function fkey_collate_clause(), used
-+-** by the ".lint fkey-indexes" command. This scalar function is always
-+-** called with four arguments - the parent table name, the parent column name,
-+-** the child table name and the child column name.
-+-**
-+-**   fkey_collate_clause('parent-tab', 'parent-col', 'child-tab', 'child-col')
-+-**
-+-** If either of the named tables or columns do not exist, this function
-+-** returns an empty string. An empty string is also returned if both tables
-+-** and columns exist but have the same default collation sequence. Or,
-+-** if both exist but the default collation sequences are different, this
-+-** function returns the string " COLLATE <parent-collation>", where
-+-** <parent-collation> is the default collation sequence of the parent column.
-+-*/
-+-static void shellFkeyCollateClause(
-+-  sqlite3_context *pCtx,
-+-  int nVal,
-+-  sqlite3_value **apVal
-+-){
-+-  sqlite3 *db = sqlite3_context_db_handle(pCtx);
-+-  const char *zParent;
-+-  const char *zParentCol;
-+-  const char *zParentSeq;
-+-  const char *zChild;
-+-  const char *zChildCol;
-+-  const char *zChildSeq = 0;  /* Initialize to avoid false-positive warning */
-+-  int rc;
-+-
-+-  assert( nVal==4 );
-+-  zParent = (const char*)sqlite3_value_text(apVal[0]);
-+-  zParentCol = (const char*)sqlite3_value_text(apVal[1]);
-+-  zChild = (const char*)sqlite3_value_text(apVal[2]);
-+-  zChildCol = (const char*)sqlite3_value_text(apVal[3]);
-+-
-+-  sqlite3_result_text(pCtx, "", -1, SQLITE_STATIC);
-+-  rc = sqlite3_table_column_metadata(
-+-      db, "main", zParent, zParentCol, 0, &zParentSeq, 0, 0, 0
-+-  );
-+-  if( rc==SQLITE_OK ){
-+-    rc = sqlite3_table_column_metadata(
-+-        db, "main", zChild, zChildCol, 0, &zChildSeq, 0, 0, 0
-+-    );
-+-  }
-+-
-+-  if( rc==SQLITE_OK && sqlite3_stricmp(zParentSeq, zChildSeq) ){
-+-    char *z = sqlite3_mprintf(" COLLATE %s", zParentSeq);
-+-    sqlite3_result_text(pCtx, z, -1, SQLITE_TRANSIENT);
-+-    sqlite3_free(z);
-+-  }
-+-}
-+-
-+-
-+-/*
-+-** The implementation of dot-command ".lint fkey-indexes".
-+-*/
-+-static int lintFkeyIndexes(
-+-  ShellState *pState,             /* Current shell tool state */
-+-  char **azArg,                   /* Array of arguments passed to dot command */
-+-  int nArg                        /* Number of entries in azArg[] */
-+-){
-+-  sqlite3 *db = pState->db;       /* Database handle to query "main" db of */
-+-  FILE *out = pState->out;        /* Stream to write non-error output to */
-+-  int bVerbose = 0;               /* If -verbose is present */
-+-  int bGroupByParent = 0;         /* If -groupbyparent is present */
-+-  int i;                          /* To iterate through azArg[] */
-+-  const char *zIndent = "";       /* How much to indent CREATE INDEX by */
-+-  int rc;                         /* Return code */
-+-  sqlite3_stmt *pSql = 0;         /* Compiled version of SQL statement below */
-+-
-+-  /*
-+-  ** This SELECT statement returns one row for each foreign key constraint
-+-  ** in the schema of the main database. The column values are:
-+-  **
-+-  ** 0. The text of an SQL statement similar to:
-+-  **
-+-  **      "EXPLAIN QUERY PLAN SELECT rowid FROM child_table WHERE child_key=?"
-+-  **
-+-  **    This is the same SELECT that the foreign keys implementation needs
-+-  **    to run internally on child tables. If there is an index that can
-+-  **    be used to optimize this query, then it can also be used by the FK
-+-  **    implementation to optimize DELETE or UPDATE statements on the parent
-+-  **    table.
-+-  **
-+-  ** 1. A GLOB pattern suitable for sqlite3_strglob(). If the plan output by
-+-  **    the EXPLAIN QUERY PLAN command matches this pattern, then the schema
-+-  **    contains an index that can be used to optimize the query.
-+-  **
-+-  ** 2. Human readable text that describes the child table and columns. e.g.
-+-  **
-+-  **       "child_table(child_key1, child_key2)"
-+-  **
-+-  ** 3. Human readable text that describes the parent table and columns. e.g.
-+-  **
-+-  **       "parent_table(parent_key1, parent_key2)"
-+-  **
-+-  ** 4. A full CREATE INDEX statement for an index that could be used to
-+-  **    optimize DELETE or UPDATE statements on the parent table. e.g.
-+-  **
-+-  **       "CREATE INDEX child_table_child_key ON child_table(child_key)"
-+-  **
-+-  ** 5. The name of the parent table.
-+-  **
-+-  ** These six values are used by the C logic below to generate the report.
-+-  */
-+-  const char *zSql =
-+-  "SELECT "
-+-    "     'EXPLAIN QUERY PLAN SELECT rowid FROM ' || quote(s.name) || ' WHERE '"
-+-    "  || group_concat(quote(s.name) || '.' || quote(f.[from]) || '=?' "
-+-    "  || fkey_collate_clause("
-+-    "       f.[table], COALESCE(f.[to], p.[name]), s.name, f.[from]),' AND ')"
-+-    ", "
-+-    "     'SEARCH TABLE ' || s.name || ' USING COVERING INDEX*('"
-+-    "  || group_concat('*=?', ' AND ') || ')'"
-+-    ", "
-+-    "     s.name  || '(' || group_concat(f.[from],  ', ') || ')'"
-+-    ", "
-+-    "     f.[table] || '(' || group_concat(COALESCE(f.[to], p.[name])) || ')'"
-+-    ", "
-+-    "     'CREATE INDEX ' || quote(s.name ||'_'|| group_concat(f.[from], '_'))"
-+-    "  || ' ON ' || quote(s.name) || '('"
-+-    "  || group_concat(quote(f.[from]) ||"
-+-    "        fkey_collate_clause("
-+-    "          f.[table], COALESCE(f.[to], p.[name]), s.name, f.[from]), ', ')"
-+-    "  || ');'"
-+-    ", "
-+-    "     f.[table] "
-+-    "FROM sqlite_master AS s, pragma_foreign_key_list(s.name) AS f "
-+-    "LEFT JOIN pragma_table_info AS p ON (pk-1=seq AND p.arg=f.[table]) "
-+-    "GROUP BY s.name, f.id "
-+-    "ORDER BY (CASE WHEN ? THEN f.[table] ELSE s.name END)"
-+-  ;
-+-  const char *zGlobIPK = "SEARCH TABLE * USING INTEGER PRIMARY KEY (rowid=?)";
-+-
-+-  for(i=2; i<nArg; i++){
-+-    int n = (int)strlen(azArg[i]);
-+-    if( n>1 && sqlite3_strnicmp("-verbose", azArg[i], n)==0 ){
-+-      bVerbose = 1;
-+-    }
-+-    else if( n>1 && sqlite3_strnicmp("-groupbyparent", azArg[i], n)==0 ){
-+-      bGroupByParent = 1;
-+-      zIndent = "    ";
-+-    }
-+-    else{
-+-      raw_printf(stderr, "Usage: %s %s ?-verbose? ?-groupbyparent?\n",
-+-          azArg[0], azArg[1]
-+-      );
-+-      return SQLITE_ERROR;
-+-    }
-+-  }
-+-
-+-  /* Register the fkey_collate_clause() SQL function */
-+-  rc = sqlite3_create_function(db, "fkey_collate_clause", 4, SQLITE_UTF8,
-+-      0, shellFkeyCollateClause, 0, 0
-+-  );
-+-
-+-
-+-  if( rc==SQLITE_OK ){
-+-    rc = sqlite3_prepare_v2(db, zSql, -1, &pSql, 0);
-+-  }
-+-  if( rc==SQLITE_OK ){
-+-    sqlite3_bind_int(pSql, 1, bGroupByParent);
-+-  }
-+-
-+-  if( rc==SQLITE_OK ){
-+-    int rc2;
-+-    char *zPrev = 0;
-+-    while( SQLITE_ROW==sqlite3_step(pSql) ){
-+-      int res = -1;
-+-      sqlite3_stmt *pExplain = 0;
-+-      const char *zEQP = (const char*)sqlite3_column_text(pSql, 0);
-+-      const char *zGlob = (const char*)sqlite3_column_text(pSql, 1);
-+-      const char *zFrom = (const char*)sqlite3_column_text(pSql, 2);
-+-      const char *zTarget = (const char*)sqlite3_column_text(pSql, 3);
-+-      const char *zCI = (const char*)sqlite3_column_text(pSql, 4);
-+-      const char *zParent = (const char*)sqlite3_column_text(pSql, 5);
-+-
-+-      rc = sqlite3_prepare_v2(db, zEQP, -1, &pExplain, 0);
-+-      if( rc!=SQLITE_OK ) break;
-+-      if( SQLITE_ROW==sqlite3_step(pExplain) ){
-+-        const char *zPlan = (const char*)sqlite3_column_text(pExplain, 3);
-+-        res = (
-+-              0==sqlite3_strglob(zGlob, zPlan)
-+-           || 0==sqlite3_strglob(zGlobIPK, zPlan)
-+-        );
-+-      }
-+-      rc = sqlite3_finalize(pExplain);
-+-      if( rc!=SQLITE_OK ) break;
-+-
-+-      if( res<0 ){
-+-        raw_printf(stderr, "Error: internal error");
-+-        break;
-+-      }else{
-+-        if( bGroupByParent
-+-        && (bVerbose || res==0)
-+-        && (zPrev==0 || sqlite3_stricmp(zParent, zPrev))
-+-        ){
-+-          raw_printf(out, "-- Parent table %s\n", zParent);
-+-          sqlite3_free(zPrev);
-+-          zPrev = sqlite3_mprintf("%s", zParent);
-+-        }
-+-
-+-        if( res==0 ){
-+-          raw_printf(out, "%s%s --> %s\n", zIndent, zCI, zTarget);
-+-        }else if( bVerbose ){
-+-          raw_printf(out, "%s/* no extra indexes required for %s -> %s */\n",
-+-              zIndent, zFrom, zTarget
-+-          );
-+-        }
-+-      }
-+-    }
-+-    sqlite3_free(zPrev);
-+-
-+-    if( rc!=SQLITE_OK ){
-+-      raw_printf(stderr, "%s\n", sqlite3_errmsg(db));
-+-    }
-+-
-+-    rc2 = sqlite3_finalize(pSql);
-+-    if( rc==SQLITE_OK && rc2!=SQLITE_OK ){
-+-      rc = rc2;
-+-      raw_printf(stderr, "%s\n", sqlite3_errmsg(db));
-+-    }
-+-  }else{
-+-    raw_printf(stderr, "%s\n", sqlite3_errmsg(db));
-+-  }
-+-
-+-  return rc;
-+-}
-+-
-+-/*
-+-** Implementation of ".lint" dot command.
-+-*/
-+-static int lintDotCommand(
-+-  ShellState *pState,             /* Current shell tool state */
-+-  char **azArg,                   /* Array of arguments passed to dot command */
-+-  int nArg                        /* Number of entries in azArg[] */
-+-){
-+-  int n;
-+-  n = (nArg>=2 ? (int)strlen(azArg[1]) : 0);
-+-  if( n<1 || sqlite3_strnicmp(azArg[1], "fkey-indexes", n) ) goto usage;
-+-  return lintFkeyIndexes(pState, azArg, nArg);
-+-
-+- usage:
-+-  raw_printf(stderr, "Usage %s sub-command ?switches...?\n", azArg[0]);
-+-  raw_printf(stderr, "Where sub-commands are:\n");
-+-  raw_printf(stderr, "    fkey-indexes\n");
-+-  return SQLITE_ERROR;
-+-}
-+-
-+-
-+-/*
-+-** If an input line begins with "." then invoke this routine to
-+-** process that line.
-+-**
-+-** Return 1 on error, 2 to exit, and 0 otherwise.
-+-*/
-+-static int do_meta_command(char *zLine, ShellState *p){
-+-  int h = 1;
-+-  int nArg = 0;
-+-  int n, c;
-+-  int rc = 0;
-+-  char *azArg[50];
-+-
-+-  /* Parse the input line into tokens.
-+-  */
-+-  while( zLine[h] && nArg<ArraySize(azArg) ){
-+-    while( IsSpace(zLine[h]) ){ h++; }
-+-    if( zLine[h]==0 ) break;
-+-    if( zLine[h]=='\'' || zLine[h]=='"' ){
-+-      int delim = zLine[h++];
-+-      azArg[nArg++] = &zLine[h];
-+-      while( zLine[h] && zLine[h]!=delim ){
-+-        if( zLine[h]=='\\' && delim=='"' && zLine[h+1]!=0 ) h++;
-+-        h++;
-+-      }
-+-      if( zLine[h]==delim ){
-+-        zLine[h++] = 0;
-+-      }
-+-      if( delim=='"' ) resolve_backslashes(azArg[nArg-1]);
-+-    }else{
-+-      azArg[nArg++] = &zLine[h];
-+-      while( zLine[h] && !IsSpace(zLine[h]) ){ h++; }
-+-      if( zLine[h] ) zLine[h++] = 0;
-+-      resolve_backslashes(azArg[nArg-1]);
-+-    }
-+-  }
-+-
-+-  /* Process the input line.
-+-  */
-+-  if( nArg==0 ) return 0; /* no tokens, no error */
-+-  n = strlen30(azArg[0]);
-+-  c = azArg[0][0];
-+-
-+-#ifndef SQLITE_OMIT_AUTHORIZATION
-+-  if( c=='a' && strncmp(azArg[0], "auth", n)==0 ){
-+-    if( nArg!=2 ){
-+-      raw_printf(stderr, "Usage: .auth ON|OFF\n");
-+-      rc = 1;
-+-      goto meta_command_exit;
-+-    }
-+-    open_db(p, 0);
-+-    if( booleanValue(azArg[1]) ){
-+-      sqlite3_set_authorizer(p->db, shellAuth, p);
-+-    }else{
-+-      sqlite3_set_authorizer(p->db, 0, 0);
-+-    }
-+-  }else
-+-#endif
-+-
-+-  if( (c=='b' && n>=3 && strncmp(azArg[0], "backup", n)==0)
-+-   || (c=='s' && n>=3 && strncmp(azArg[0], "save", n)==0)
-+-  ){
-+-    const char *zDestFile = 0;
-+-    const char *zDb = 0;
-+-    sqlite3 *pDest;
-+-    sqlite3_backup *pBackup;
-+-    int j;
-+-    for(j=1; j<nArg; j++){
-+-      const char *z = azArg[j];
-+-      if( z[0]=='-' ){
-+-        while( z[0]=='-' ) z++;
-+-        /* No options to process at this time */
-+-        {
-+-          utf8_printf(stderr, "unknown option: %s\n", azArg[j]);
-+-          return 1;
-+-        }
-+-      }else if( zDestFile==0 ){
-+-        zDestFile = azArg[j];
-+-      }else if( zDb==0 ){
-+-        zDb = zDestFile;
-+-        zDestFile = azArg[j];
-+-      }else{
-+-        raw_printf(stderr, "too many arguments to .backup\n");
-+-        return 1;
-+-      }
-+-    }
-+-    if( zDestFile==0 ){
-+-      raw_printf(stderr, "missing FILENAME argument on .backup\n");
-+-      return 1;
-+-    }
-+-    if( zDb==0 ) zDb = "main";
-+-    rc = sqlite3_open(zDestFile, &pDest);
-+-    if( rc!=SQLITE_OK ){
-+-      utf8_printf(stderr, "Error: cannot open \"%s\"\n", zDestFile);
-+-      sqlite3_close(pDest);
-+-      return 1;
-+-    }
-+-    open_db(p, 0);
-+-    pBackup = sqlite3_backup_init(pDest, "main", p->db, zDb);
-+-    if( pBackup==0 ){
-+-      utf8_printf(stderr, "Error: %s\n", sqlite3_errmsg(pDest));
-+-      sqlite3_close(pDest);
-+-      return 1;
-+-    }
-+-    while(  (rc = sqlite3_backup_step(pBackup,100))==SQLITE_OK ){}
-+-    sqlite3_backup_finish(pBackup);
-+-    if( rc==SQLITE_DONE ){
-+-      rc = 0;
-+-    }else{
-+-      utf8_printf(stderr, "Error: %s\n", sqlite3_errmsg(pDest));
-+-      rc = 1;
-+-    }
-+-    sqlite3_close(pDest);
-+-  }else
-+-
-+-  if( c=='b' && n>=3 && strncmp(azArg[0], "bail", n)==0 ){
-+-    if( nArg==2 ){
-+-      bail_on_error = booleanValue(azArg[1]);
-+-    }else{
-+-      raw_printf(stderr, "Usage: .bail on|off\n");
-+-      rc = 1;
-+-    }
-+-  }else
-+-
-+-  if( c=='b' && n>=3 && strncmp(azArg[0], "binary", n)==0 ){
-+-    if( nArg==2 ){
-+-      if( booleanValue(azArg[1]) ){
-+-        setBinaryMode(p->out, 1);
-+-      }else{
-+-        setTextMode(p->out, 1);
-+-      }
-+-    }else{
-+-      raw_printf(stderr, "Usage: .binary on|off\n");
-+-      rc = 1;
-+-    }
-+-  }else
-+-
-+-  if( c=='c' && strcmp(azArg[0],"cd")==0 ){
-+-    if( nArg==2 ){
-+-#if defined(_WIN32) || defined(WIN32)
-+-      wchar_t *z = sqlite3_win32_utf8_to_unicode(azArg[1]);
-+-      rc = !SetCurrentDirectoryW(z);
-+-      sqlite3_free(z);
-+-#else
-+-      rc = chdir(azArg[1]);
-+-#endif
-+-      if( rc ){
-+-        utf8_printf(stderr, "Cannot change to directory \"%s\"\n", azArg[1]);
-+-        rc = 1;
-+-      }
-+-    }else{
-+-      raw_printf(stderr, "Usage: .cd DIRECTORY\n");
-+-      rc = 1;
-+-    }
-+-  }else
-+-
-+-  /* The undocumented ".breakpoint" command causes a call to the no-op
-+-  ** routine named test_breakpoint().
-+-  */
-+-  if( c=='b' && n>=3 && strncmp(azArg[0], "breakpoint", n)==0 ){
-+-    test_breakpoint();
-+-  }else
-+-
-+-  if( c=='c' && n>=3 && strncmp(azArg[0], "changes", n)==0 ){
-+-    if( nArg==2 ){
-+-      setOrClearFlag(p, SHFLG_CountChanges, azArg[1]);
-+-    }else{
-+-      raw_printf(stderr, "Usage: .changes on|off\n");
-+-      rc = 1;
-+-    }
-+-  }else
-+-
-+-  /* Cancel output redirection, if it is currently set (by .testcase)
-+-  ** Then read the content of the testcase-out.txt file and compare against
-+-  ** azArg[1].  If there are differences, report an error and exit.
-+-  */
-+-  if( c=='c' && n>=3 && strncmp(azArg[0], "check", n)==0 ){
-+-    char *zRes = 0;
-+-    output_reset(p);
-+-    if( nArg!=2 ){
-+-      raw_printf(stderr, "Usage: .check GLOB-PATTERN\n");
-+-      rc = 2;
-+-    }else if( (zRes = readFile("testcase-out.txt", 0))==0 ){
-+-      raw_printf(stderr, "Error: cannot read 'testcase-out.txt'\n");
-+-      rc = 2;
-+-    }else if( testcase_glob(azArg[1],zRes)==0 ){
-+-      utf8_printf(stderr,
-+-                 "testcase-%s FAILED\n Expected: [%s]\n      Got: [%s]\n",
-+-                 p->zTestcase, azArg[1], zRes);
-+-      rc = 2;
-+-    }else{
-+-      utf8_printf(stdout, "testcase-%s ok\n", p->zTestcase);
-+-      p->nCheck++;
-+-    }
-+-    sqlite3_free(zRes);
-+-  }else
-+-
-+-  if( c=='c' && strncmp(azArg[0], "clone", n)==0 ){
-+-    if( nArg==2 ){
-+-      tryToClone(p, azArg[1]);
-+-    }else{
-+-      raw_printf(stderr, "Usage: .clone FILENAME\n");
-+-      rc = 1;
-+-    }
-+-  }else
-+-
-+-  if( c=='d' && n>1 && strncmp(azArg[0], "databases", n)==0 ){
-+-    ShellState data;
-+-    char *zErrMsg = 0;
-+-    open_db(p, 0);
-+-    memcpy(&data, p, sizeof(data));
-+-    data.showHeader = 0;
-+-    data.cMode = data.mode = MODE_List;
-+-    sqlite3_snprintf(sizeof(data.colSeparator),data.colSeparator,": ");
-+-    data.cnt = 0;
-+-    sqlite3_exec(p->db, "SELECT name, file FROM pragma_database_list",
-+-                 callback, &data, &zErrMsg);
-+-    if( zErrMsg ){
-+-      utf8_printf(stderr,"Error: %s\n", zErrMsg);
-+-      sqlite3_free(zErrMsg);
-+-      rc = 1;
-+-    }
-+-  }else
-+-
-+-  if( c=='d' && strncmp(azArg[0], "dbinfo", n)==0 ){
-+-    rc = shell_dbinfo_command(p, nArg, azArg);
-+-  }else
-+-
-+-  if( c=='d' && strncmp(azArg[0], "dump", n)==0 ){
-+-    const char *zLike = 0;
-+-    int i;
-+-    int savedShowHeader = p->showHeader;
-+-    ShellClearFlag(p, SHFLG_PreserveRowid|SHFLG_Newlines);
-+-    for(i=1; i<nArg; i++){
-+-      if( azArg[i][0]=='-' ){
-+-        const char *z = azArg[i]+1;
-+-        if( z[0]=='-' ) z++;
-+-        if( strcmp(z,"preserve-rowids")==0 ){
-+-#ifdef SQLITE_OMIT_VIRTUALTABLE
-+-          raw_printf(stderr, "The --preserve-rowids option is not compatible"
-+-                             " with SQLITE_OMIT_VIRTUALTABLE\n");
-+-          rc = 1;
-+-          goto meta_command_exit;
-+-#else
-+-          ShellSetFlag(p, SHFLG_PreserveRowid);
-+-#endif
-+-        }else
-+-        if( strcmp(z,"newlines")==0 ){
-+-          ShellSetFlag(p, SHFLG_Newlines);
-+-        }else
-+-        {
-+-          raw_printf(stderr, "Unknown option \"%s\" on \".dump\"\n", azArg[i]);
-+-          rc = 1;
-+-          goto meta_command_exit;
-+-        }
-+-      }else if( zLike ){
-+-        raw_printf(stderr, "Usage: .dump ?--preserve-rowids? "
-+-                           "?--newlines? ?LIKE-PATTERN?\n");
-+-        rc = 1;
-+-        goto meta_command_exit;
-+-      }else{
-+-        zLike = azArg[i];
-+-      }
-+-    }
-+-    open_db(p, 0);
-+-    /* When playing back a "dump", the content might appear in an order
-+-    ** which causes immediate foreign key constraints to be violated.
-+-    ** So disable foreign-key constraint enforcement to prevent problems. */
-+-    raw_printf(p->out, "PRAGMA foreign_keys=OFF;\n");
-+-    raw_printf(p->out, "BEGIN TRANSACTION;\n");
-+-    p->writableSchema = 0;
-+-    p->showHeader = 0;
-+-    /* Set writable_schema=ON since doing so forces SQLite to initialize
-+-    ** as much of the schema as it can even if the sqlite_master table is
-+-    ** corrupt. */
-+-    sqlite3_exec(p->db, "SAVEPOINT dump; PRAGMA writable_schema=ON", 0, 0, 0);
-+-    p->nErr = 0;
-+-    if( zLike==0 ){
-+-      run_schema_dump_query(p,
-+-        "SELECT name, type, sql FROM sqlite_master "
-+-        "WHERE sql NOT NULL AND type=='table' AND name!='sqlite_sequence'"
-+-      );
-+-      run_schema_dump_query(p,
-+-        "SELECT name, type, sql FROM sqlite_master "
-+-        "WHERE name=='sqlite_sequence'"
-+-      );
-+-      run_table_dump_query(p,
-+-        "SELECT sql FROM sqlite_master "
-+-        "WHERE sql NOT NULL AND type IN ('index','trigger','view')", 0
-+-      );
-+-    }else{
-+-      char *zSql;
-+-      zSql = sqlite3_mprintf(
-+-        "SELECT name, type, sql FROM sqlite_master "
-+-        "WHERE tbl_name LIKE %Q AND type=='table'"
-+-        "  AND sql NOT NULL", zLike);
-+-      run_schema_dump_query(p,zSql);
-+-      sqlite3_free(zSql);
-+-      zSql = sqlite3_mprintf(
-+-        "SELECT sql FROM sqlite_master "
-+-        "WHERE sql NOT NULL"
-+-        "  AND type IN ('index','trigger','view')"
-+-        "  AND tbl_name LIKE %Q", zLike);
-+-      run_table_dump_query(p, zSql, 0);
-+-      sqlite3_free(zSql);
-+-    }
-+-    if( p->writableSchema ){
-+-      raw_printf(p->out, "PRAGMA writable_schema=OFF;\n");
-+-      p->writableSchema = 0;
-+-    }
-+-    sqlite3_exec(p->db, "PRAGMA writable_schema=OFF;", 0, 0, 0);
-+-    sqlite3_exec(p->db, "RELEASE dump;", 0, 0, 0);
-+-    raw_printf(p->out, p->nErr ? "ROLLBACK; -- due to errors\n" : "COMMIT;\n");
-+-    p->showHeader = savedShowHeader;
-+-  }else
-+-
-+-  if( c=='e' && strncmp(azArg[0], "echo", n)==0 ){
-+-    if( nArg==2 ){
-+-      setOrClearFlag(p, SHFLG_Echo, azArg[1]);
-+-    }else{
-+-      raw_printf(stderr, "Usage: .echo on|off\n");
-+-      rc = 1;
-+-    }
-+-  }else
-+-
-+-  if( c=='e' && strncmp(azArg[0], "eqp", n)==0 ){
-+-    if( nArg==2 ){
-+-      if( strcmp(azArg[1],"full")==0 ){
-+-        p->autoEQP = 2;
-+-      }else{
-+-        p->autoEQP = booleanValue(azArg[1]);
-+-      }
-+-    }else{
-+-      raw_printf(stderr, "Usage: .eqp on|off|full\n");
-+-      rc = 1;
-+-    }
-+-  }else
-+-
-+-  if( c=='e' && strncmp(azArg[0], "exit", n)==0 ){
-+-    if( nArg>1 && (rc = (int)integerValue(azArg[1]))!=0 ) exit(rc);
-+-    rc = 2;
-+-  }else
-+-
-+-  /* The ".explain" command is automatic now.  It is largely pointless.  It
-+-  ** retained purely for backwards compatibility */
-+-  if( c=='e' && strncmp(azArg[0], "explain", n)==0 ){
-+-    int val = 1;
-+-    if( nArg>=2 ){
-+-      if( strcmp(azArg[1],"auto")==0 ){
-+-        val = 99;
-+-      }else{
-+-        val =  booleanValue(azArg[1]);
-+-      }
-+-    }
-+-    if( val==1 && p->mode!=MODE_Explain ){
-+-      p->normalMode = p->mode;
-+-      p->mode = MODE_Explain;
-+-      p->autoExplain = 0;
-+-    }else if( val==0 ){
-+-      if( p->mode==MODE_Explain ) p->mode = p->normalMode;
-+-      p->autoExplain = 0;
-+-    }else if( val==99 ){
-+-      if( p->mode==MODE_Explain ) p->mode = p->normalMode;
-+-      p->autoExplain = 1;
-+-    }
-+-  }else
-+-
-+-  if( c=='f' && strncmp(azArg[0], "fullschema", n)==0 ){
-+-    ShellState data;
-+-    char *zErrMsg = 0;
-+-    int doStats = 0;
-+-    memcpy(&data, p, sizeof(data));
-+-    data.showHeader = 0;
-+-    data.cMode = data.mode = MODE_Semi;
-+-    if( nArg==2 && optionMatch(azArg[1], "indent") ){
-+-      data.cMode = data.mode = MODE_Pretty;
-+-      nArg = 1;
-+-    }
-+-    if( nArg!=1 ){
-+-      raw_printf(stderr, "Usage: .fullschema ?--indent?\n");
-+-      rc = 1;
-+-      goto meta_command_exit;
-+-    }
-+-    open_db(p, 0);
-+-    rc = sqlite3_exec(p->db,
-+-       "SELECT sql FROM"
-+-       "  (SELECT sql sql, type type, tbl_name tbl_name, name name, rowid x"
-+-       "     FROM sqlite_master UNION ALL"
-+-       "   SELECT sql, type, tbl_name, name, rowid FROM sqlite_temp_master) "
-+-       "WHERE type!='meta' AND sql NOTNULL AND name NOT LIKE 'sqlite_%' "
-+-       "ORDER BY rowid",
-+-       callback, &data, &zErrMsg
-+-    );
-+-    if( rc==SQLITE_OK ){
-+-      sqlite3_stmt *pStmt;
-+-      rc = sqlite3_prepare_v2(p->db,
-+-               "SELECT rowid FROM sqlite_master"
-+-               " WHERE name GLOB 'sqlite_stat[134]'",
-+-               -1, &pStmt, 0);
-+-      doStats = sqlite3_step(pStmt)==SQLITE_ROW;
-+-      sqlite3_finalize(pStmt);
-+-    }
-+-    if( doStats==0 ){
-+-      raw_printf(p->out, "/* No STAT tables available */\n");
-+-    }else{
-+-      raw_printf(p->out, "ANALYZE sqlite_master;\n");
-+-      sqlite3_exec(p->db, "SELECT 'ANALYZE sqlite_master'",
-+-                   callback, &data, &zErrMsg);
-+-      data.cMode = data.mode = MODE_Insert;
-+-      data.zDestTable = "sqlite_stat1";
-+-      shell_exec(p->db, "SELECT * FROM sqlite_stat1",
-+-                 shell_callback, &data,&zErrMsg);
-+-      data.zDestTable = "sqlite_stat3";
-+-      shell_exec(p->db, "SELECT * FROM sqlite_stat3",
-+-                 shell_callback, &data,&zErrMsg);
-+-      data.zDestTable = "sqlite_stat4";
-+-      shell_exec(p->db, "SELECT * FROM sqlite_stat4",
-+-                 shell_callback, &data, &zErrMsg);
-+-      raw_printf(p->out, "ANALYZE sqlite_master;\n");
-+-    }
-+-  }else
-+-
-+-  if( c=='h' && strncmp(azArg[0], "headers", n)==0 ){
-+-    if( nArg==2 ){
-+-      p->showHeader = booleanValue(azArg[1]);
-+-    }else{
-+-      raw_printf(stderr, "Usage: .headers on|off\n");
-+-      rc = 1;
-+-    }
-+-  }else
-+-
-+-  if( c=='h' && strncmp(azArg[0], "help", n)==0 ){
-+-    utf8_printf(p->out, "%s", zHelp);
-+-  }else
-+-
-+-  if( c=='i' && strncmp(azArg[0], "import", n)==0 ){
-+-    char *zTable;               /* Insert data into this table */
-+-    char *zFile;                /* Name of file to extra content from */
-+-    sqlite3_stmt *pStmt = NULL; /* A statement */
-+-    int nCol;                   /* Number of columns in the table */
-+-    int nByte;                  /* Number of bytes in an SQL string */
-+-    int i, j;                   /* Loop counters */
-+-    int needCommit;             /* True to COMMIT or ROLLBACK at end */
-+-    int nSep;                   /* Number of bytes in p->colSeparator[] */
-+-    char *zSql;                 /* An SQL statement */
-+-    ImportCtx sCtx;             /* Reader context */
-+-    char *(SQLITE_CDECL *xRead)(ImportCtx*); /* Func to read one value */
-+-    int (SQLITE_CDECL *xCloser)(FILE*);      /* Func to close file */
-+-
-+-    if( nArg!=3 ){
-+-      raw_printf(stderr, "Usage: .import FILE TABLE\n");
-+-      goto meta_command_exit;
-+-    }
-+-    zFile = azArg[1];
-+-    zTable = azArg[2];
-+-    seenInterrupt = 0;
-+-    memset(&sCtx, 0, sizeof(sCtx));
-+-    open_db(p, 0);
-+-    nSep = strlen30(p->colSeparator);
-+-    if( nSep==0 ){
-+-      raw_printf(stderr,
-+-                 "Error: non-null column separator required for import\n");
-+-      return 1;
-+-    }
-+-    if( nSep>1 ){
-+-      raw_printf(stderr, "Error: multi-character column separators not allowed"
-+-                      " for import\n");
-+-      return 1;
-+-    }
-+-    nSep = strlen30(p->rowSeparator);
-+-    if( nSep==0 ){
-+-      raw_printf(stderr, "Error: non-null row separator required for import\n");
-+-      return 1;
-+-    }
-+-    if( nSep==2 && p->mode==MODE_Csv && strcmp(p->rowSeparator, SEP_CrLf)==0 ){
-+-      /* When importing CSV (only), if the row separator is set to the
-+-      ** default output row separator, change it to the default input
-+-      ** row separator.  This avoids having to maintain different input
-+-      ** and output row separators. */
-+-      sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_Row);
-+-      nSep = strlen30(p->rowSeparator);
-+-    }
-+-    if( nSep>1 ){
-+-      raw_printf(stderr, "Error: multi-character row separators not allowed"
-+-                      " for import\n");
-+-      return 1;
-+-    }
-+-    sCtx.zFile = zFile;
-+-    sCtx.nLine = 1;
-+-    if( sCtx.zFile[0]=='|' ){
-+-#ifdef SQLITE_OMIT_POPEN
-+-      raw_printf(stderr, "Error: pipes are not supported in this OS\n");
-+-      return 1;
-+-#else
-+-      sCtx.in = popen(sCtx.zFile+1, "r");
-+-      sCtx.zFile = "<pipe>";
-+-      xCloser = pclose;
-+-#endif
-+-    }else{
-+-      sCtx.in = fopen(sCtx.zFile, "rb");
-+-      xCloser = fclose;
-+-    }
-+-    if( p->mode==MODE_Ascii ){
-+-      xRead = ascii_read_one_field;
-+-    }else{
-+-      xRead = csv_read_one_field;
-+-    }
-+-    if( sCtx.in==0 ){
-+-      utf8_printf(stderr, "Error: cannot open \"%s\"\n", zFile);
-+-      return 1;
-+-    }
-+-    sCtx.cColSep = p->colSeparator[0];
-+-    sCtx.cRowSep = p->rowSeparator[0];
-+-    zSql = sqlite3_mprintf("SELECT * FROM %s", zTable);
-+-    if( zSql==0 ){
-+-      raw_printf(stderr, "Error: out of memory\n");
-+-      xCloser(sCtx.in);
-+-      return 1;
-+-    }
-+-    nByte = strlen30(zSql);
-+-    rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
-+-    import_append_char(&sCtx, 0);    /* To ensure sCtx.z is allocated */
-+-    if( rc && sqlite3_strglob("no such table: *", sqlite3_errmsg(p->db))==0 ){
-+-      char *zCreate = sqlite3_mprintf("CREATE TABLE %s", zTable);
-+-      char cSep = '(';
-+-      while( xRead(&sCtx) ){
-+-        zCreate = sqlite3_mprintf("%z%c\n  \"%w\" TEXT", zCreate, cSep, sCtx.z);
-+-        cSep = ',';
-+-        if( sCtx.cTerm!=sCtx.cColSep ) break;
-+-      }
-+-      if( cSep=='(' ){
-+-        sqlite3_free(zCreate);
-+-        sqlite3_free(sCtx.z);
-+-        xCloser(sCtx.in);
-+-        utf8_printf(stderr,"%s: empty file\n", sCtx.zFile);
-+-        return 1;
-+-      }
-+-      zCreate = sqlite3_mprintf("%z\n)", zCreate);
-+-      rc = sqlite3_exec(p->db, zCreate, 0, 0, 0);
-+-      sqlite3_free(zCreate);
-+-      if( rc ){
-+-        utf8_printf(stderr, "CREATE TABLE %s(...) failed: %s\n", zTable,
-+-                sqlite3_errmsg(p->db));
-+-        sqlite3_free(sCtx.z);
-+-        xCloser(sCtx.in);
-+-        return 1;
-+-      }
-+-      rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
-+-    }
-+-    sqlite3_free(zSql);
-+-    if( rc ){
-+-      if (pStmt) sqlite3_finalize(pStmt);
-+-      utf8_printf(stderr,"Error: %s\n", sqlite3_errmsg(p->db));
-+-      xCloser(sCtx.in);
-+-      return 1;
-+-    }
-+-    nCol = sqlite3_column_count(pStmt);
-+-    sqlite3_finalize(pStmt);
-+-    pStmt = 0;
-+-    if( nCol==0 ) return 0; /* no columns, no error */
-+-    zSql = sqlite3_malloc64( nByte*2 + 20 + nCol*2 );
-+-    if( zSql==0 ){
-+-      raw_printf(stderr, "Error: out of memory\n");
-+-      xCloser(sCtx.in);
-+-      return 1;
-+-    }
-+-    sqlite3_snprintf(nByte+20, zSql, "INSERT INTO \"%w\" VALUES(?", zTable);
-+-    j = strlen30(zSql);
-+-    for(i=1; i<nCol; i++){
-+-      zSql[j++] = ',';
-+-      zSql[j++] = '?';
-+-    }
-+-    zSql[j++] = ')';
-+-    zSql[j] = 0;
-+-    rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
-+-    sqlite3_free(zSql);
-+-    if( rc ){
-+-      utf8_printf(stderr, "Error: %s\n", sqlite3_errmsg(p->db));
-+-      if (pStmt) sqlite3_finalize(pStmt);
-+-      xCloser(sCtx.in);
-+-      return 1;
-+-    }
-+-    needCommit = sqlite3_get_autocommit(p->db);
-+-    if( needCommit ) sqlite3_exec(p->db, "BEGIN", 0, 0, 0);
-+-    do{
-+-      int startLine = sCtx.nLine;
-+-      for(i=0; i<nCol; i++){
-+-        char *z = xRead(&sCtx);
-+-        /*
-+-        ** Did we reach end-of-file before finding any columns?
-+-        ** If so, stop instead of NULL filling the remaining columns.
-+-        */
-+-        if( z==0 && i==0 ) break;
-+-        /*
-+-        ** Did we reach end-of-file OR end-of-line before finding any
-+-        ** columns in ASCII mode?  If so, stop instead of NULL filling
-+-        ** the remaining columns.
-+-        */
-+-        if( p->mode==MODE_Ascii && (z==0 || z[0]==0) && i==0 ) break;
-+-        sqlite3_bind_text(pStmt, i+1, z, -1, SQLITE_TRANSIENT);
-+-        if( i<nCol-1 && sCtx.cTerm!=sCtx.cColSep ){
-+-          utf8_printf(stderr, "%s:%d: expected %d columns but found %d - "
-+-                          "filling the rest with NULL\n",
-+-                          sCtx.zFile, startLine, nCol, i+1);
-+-          i += 2;
-+-          while( i<=nCol ){ sqlite3_bind_null(pStmt, i); i++; }
-+-        }
-+-      }
-+-      if( sCtx.cTerm==sCtx.cColSep ){
-+-        do{
-+-          xRead(&sCtx);
-+-          i++;
-+-        }while( sCtx.cTerm==sCtx.cColSep );
-+-        utf8_printf(stderr, "%s:%d: expected %d columns but found %d - "
-+-                        "extras ignored\n",
-+-                        sCtx.zFile, startLine, nCol, i);
-+-      }
-+-      if( i>=nCol ){
-+-        sqlite3_step(pStmt);
-+-        rc = sqlite3_reset(pStmt);
-+-        if( rc!=SQLITE_OK ){
-+-          utf8_printf(stderr, "%s:%d: INSERT failed: %s\n", sCtx.zFile,
-+-                      startLine, sqlite3_errmsg(p->db));
-+-        }
-+-      }
-+-    }while( sCtx.cTerm!=EOF );
-+-
-+-    xCloser(sCtx.in);
-+-    sqlite3_free(sCtx.z);
-+-    sqlite3_finalize(pStmt);
-+-    if( needCommit ) sqlite3_exec(p->db, "COMMIT", 0, 0, 0);
-+-  }else
-+-
-+-#ifndef SQLITE_UNTESTABLE
-+-  if( c=='i' && strncmp(azArg[0], "imposter", n)==0 ){
-+-    char *zSql;
-+-    char *zCollist = 0;
-+-    sqlite3_stmt *pStmt;
-+-    int tnum = 0;
-+-    int i;
-+-    if( nArg!=3 ){
-+-      utf8_printf(stderr, "Usage: .imposter INDEX IMPOSTER\n");
-+-      rc = 1;
-+-      goto meta_command_exit;
-+-    }
-+-    open_db(p, 0);
-+-    zSql = sqlite3_mprintf("SELECT rootpage FROM sqlite_master"
-+-                           " WHERE name='%q' AND type='index'", azArg[1]);
-+-    sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
-+-    sqlite3_free(zSql);
-+-    if( sqlite3_step(pStmt)==SQLITE_ROW ){
-+-      tnum = sqlite3_column_int(pStmt, 0);
-+-    }
-+-    sqlite3_finalize(pStmt);
-+-    if( tnum==0 ){
-+-      utf8_printf(stderr, "no such index: \"%s\"\n", azArg[1]);
-+-      rc = 1;
-+-      goto meta_command_exit;
-+-    }
-+-    zSql = sqlite3_mprintf("PRAGMA index_xinfo='%q'", azArg[1]);
-+-    rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
-+-    sqlite3_free(zSql);
-+-    i = 0;
-+-    while( sqlite3_step(pStmt)==SQLITE_ROW ){
-+-      char zLabel[20];
-+-      const char *zCol = (const char*)sqlite3_column_text(pStmt,2);
-+-      i++;
-+-      if( zCol==0 ){
-+-        if( sqlite3_column_int(pStmt,1)==-1 ){
-+-          zCol = "_ROWID_";
-+-        }else{
-+-          sqlite3_snprintf(sizeof(zLabel),zLabel,"expr%d",i);
-+-          zCol = zLabel;
-+-        }
-+-      }
-+-      if( zCollist==0 ){
-+-        zCollist = sqlite3_mprintf("\"%w\"", zCol);
-+-      }else{
-+-        zCollist = sqlite3_mprintf("%z,\"%w\"", zCollist, zCol);
-+-      }
-+-    }
-+-    sqlite3_finalize(pStmt);
-+-    zSql = sqlite3_mprintf(
-+-          "CREATE TABLE \"%w\"(%s,PRIMARY KEY(%s))WITHOUT ROWID",
-+-          azArg[2], zCollist, zCollist);
-+-    sqlite3_free(zCollist);
-+-    rc = sqlite3_test_control(SQLITE_TESTCTRL_IMPOSTER, p->db, "main", 1, tnum);
-+-    if( rc==SQLITE_OK ){
-+-      rc = sqlite3_exec(p->db, zSql, 0, 0, 0);
-+-      sqlite3_test_control(SQLITE_TESTCTRL_IMPOSTER, p->db, "main", 0, 0);
-+-      if( rc ){
-+-        utf8_printf(stderr, "Error in [%s]: %s\n", zSql, sqlite3_errmsg(p->db));
-+-      }else{
-+-        utf8_printf(stdout, "%s;\n", zSql);
-+-        raw_printf(stdout,
-+-           "WARNING: writing to an imposter table will corrupt the index!\n"
-+-        );
-+-      }
-+-    }else{
-+-      raw_printf(stderr, "SQLITE_TESTCTRL_IMPOSTER returns %d\n", rc);
-+-      rc = 1;
-+-    }
-+-    sqlite3_free(zSql);
-+-  }else
-+-#endif /* !defined(SQLITE_OMIT_TEST_CONTROL) */
-+-
-+-#ifdef SQLITE_ENABLE_IOTRACE
-+-  if( c=='i' && strncmp(azArg[0], "iotrace", n)==0 ){
-+-    SQLITE_API extern void (SQLITE_CDECL *sqlite3IoTrace)(const char*, ...);
-+-    if( iotrace && iotrace!=stdout ) fclose(iotrace);
-+-    iotrace = 0;
-+-    if( nArg<2 ){
-+-      sqlite3IoTrace = 0;
-+-    }else if( strcmp(azArg[1], "-")==0 ){
-+-      sqlite3IoTrace = iotracePrintf;
-+-      iotrace = stdout;
-+-    }else{
-+-      iotrace = fopen(azArg[1], "w");
-+-      if( iotrace==0 ){
-+-        utf8_printf(stderr, "Error: cannot open \"%s\"\n", azArg[1]);
-+-        sqlite3IoTrace = 0;
-+-        rc = 1;
-+-      }else{
-+-        sqlite3IoTrace = iotracePrintf;
-+-      }
-+-    }
-+-  }else
-+-#endif
-+-
-+-  if( c=='l' && n>=5 && strncmp(azArg[0], "limits", n)==0 ){
-+-    static const struct {
-+-       const char *zLimitName;   /* Name of a limit */
-+-       int limitCode;            /* Integer code for that limit */
-+-    } aLimit[] = {
-+-      { "length",                SQLITE_LIMIT_LENGTH                    },
-+-      { "sql_length",            SQLITE_LIMIT_SQL_LENGTH                },
-+-      { "column",                SQLITE_LIMIT_COLUMN                    },
-+-      { "expr_depth",            SQLITE_LIMIT_EXPR_DEPTH                },
-+-      { "compound_select",       SQLITE_LIMIT_COMPOUND_SELECT           },
-+-      { "vdbe_op",               SQLITE_LIMIT_VDBE_OP                   },
-+-      { "function_arg",          SQLITE_LIMIT_FUNCTION_ARG              },
-+-      { "attached",              SQLITE_LIMIT_ATTACHED                  },
-+-      { "like_pattern_length",   SQLITE_LIMIT_LIKE_PATTERN_LENGTH       },
-+-      { "variable_number",       SQLITE_LIMIT_VARIABLE_NUMBER           },
-+-      { "trigger_depth",         SQLITE_LIMIT_TRIGGER_DEPTH             },
-+-      { "worker_threads",        SQLITE_LIMIT_WORKER_THREADS            },
-+-    };
-+-    int i, n2;
-+-    open_db(p, 0);
-+-    if( nArg==1 ){
-+-      for(i=0; i<ArraySize(aLimit); i++){
-+-        printf("%20s %d\n", aLimit[i].zLimitName,
-+-               sqlite3_limit(p->db, aLimit[i].limitCode, -1));
-+-      }
-+-    }else if( nArg>3 ){
-+-      raw_printf(stderr, "Usage: .limit NAME ?NEW-VALUE?\n");
-+-      rc = 1;
-+-      goto meta_command_exit;
-+-    }else{
-+-      int iLimit = -1;
-+-      n2 = strlen30(azArg[1]);
-+-      for(i=0; i<ArraySize(aLimit); i++){
-+-        if( sqlite3_strnicmp(aLimit[i].zLimitName, azArg[1], n2)==0 ){
-+-          if( iLimit<0 ){
-+-            iLimit = i;
-+-          }else{
-+-            utf8_printf(stderr, "ambiguous limit: \"%s\"\n", azArg[1]);
-+-            rc = 1;
-+-            goto meta_command_exit;
-+-          }
-+-        }
-+-      }
-+-      if( iLimit<0 ){
-+-        utf8_printf(stderr, "unknown limit: \"%s\"\n"
-+-                        "enter \".limits\" with no arguments for a list.\n",
-+-                         azArg[1]);
-+-        rc = 1;
-+-        goto meta_command_exit;
-+-      }
-+-      if( nArg==3 ){
-+-        sqlite3_limit(p->db, aLimit[iLimit].limitCode,
-+-                      (int)integerValue(azArg[2]));
-+-      }
-+-      printf("%20s %d\n", aLimit[iLimit].zLimitName,
-+-             sqlite3_limit(p->db, aLimit[iLimit].limitCode, -1));
-+-    }
-+-  }else
-+-
-+-  if( c=='l' && n>2 && strncmp(azArg[0], "lint", n)==0 ){
-+-    open_db(p, 0);
-+-    lintDotCommand(p, azArg, nArg);
-+-  }else
-+-
-+-#ifndef SQLITE_OMIT_LOAD_EXTENSION
-+-  if( c=='l' && strncmp(azArg[0], "load", n)==0 ){
-+-    const char *zFile, *zProc;
-+-    char *zErrMsg = 0;
-+-    if( nArg<2 ){
-+-      raw_printf(stderr, "Usage: .load FILE ?ENTRYPOINT?\n");
-+-      rc = 1;
-+-      goto meta_command_exit;
-+-    }
-+-    zFile = azArg[1];
-+-    zProc = nArg>=3 ? azArg[2] : 0;
-+-    open_db(p, 0);
-+-    rc = sqlite3_load_extension(p->db, zFile, zProc, &zErrMsg);
-+-    if( rc!=SQLITE_OK ){
-+-      utf8_printf(stderr, "Error: %s\n", zErrMsg);
-+-      sqlite3_free(zErrMsg);
-+-      rc = 1;
-+-    }
-+-  }else
-+-#endif
-+-
-+-  if( c=='l' && strncmp(azArg[0], "log", n)==0 ){
-+-    if( nArg!=2 ){
-+-      raw_printf(stderr, "Usage: .log FILENAME\n");
-+-      rc = 1;
-+-    }else{
-+-      const char *zFile = azArg[1];
-+-      output_file_close(p->pLog);
-+-      p->pLog = output_file_open(zFile);
-+-    }
-+-  }else
-+-
-+-  if( c=='m' && strncmp(azArg[0], "mode", n)==0 ){
-+-    const char *zMode = nArg>=2 ? azArg[1] : "";
-+-    int n2 = (int)strlen(zMode);
-+-    int c2 = zMode[0];
-+-    if( c2=='l' && n2>2 && strncmp(azArg[1],"lines",n2)==0 ){
-+-      p->mode = MODE_Line;
-+-      sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_Row);
-+-    }else if( c2=='c' && strncmp(azArg[1],"columns",n2)==0 ){
-+-      p->mode = MODE_Column;
-+-      sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_Row);
-+-    }else if( c2=='l' && n2>2 && strncmp(azArg[1],"list",n2)==0 ){
-+-      p->mode = MODE_List;
-+-      sqlite3_snprintf(sizeof(p->colSeparator), p->colSeparator, SEP_Column);
-+-      sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_Row);
-+-    }else if( c2=='h' && strncmp(azArg[1],"html",n2)==0 ){
-+-      p->mode = MODE_Html;
-+-    }else if( c2=='t' && strncmp(azArg[1],"tcl",n2)==0 ){
-+-      p->mode = MODE_Tcl;
-+-      sqlite3_snprintf(sizeof(p->colSeparator), p->colSeparator, SEP_Space);
-+-      sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_Row);
-+-    }else if( c2=='c' && strncmp(azArg[1],"csv",n2)==0 ){
-+-      p->mode = MODE_Csv;
-+-      sqlite3_snprintf(sizeof(p->colSeparator), p->colSeparator, SEP_Comma);
-+-      sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_CrLf);
-+-    }else if( c2=='t' && strncmp(azArg[1],"tabs",n2)==0 ){
-+-      p->mode = MODE_List;
-+-      sqlite3_snprintf(sizeof(p->colSeparator), p->colSeparator, SEP_Tab);
-+-    }else if( c2=='i' && strncmp(azArg[1],"insert",n2)==0 ){
-+-      p->mode = MODE_Insert;
-+-      set_table_name(p, nArg>=3 ? azArg[2] : "table");
-+-    }else if( c2=='q' && strncmp(azArg[1],"quote",n2)==0 ){
-+-      p->mode = MODE_Quote;
-+-    }else if( c2=='a' && strncmp(azArg[1],"ascii",n2)==0 ){
-+-      p->mode = MODE_Ascii;
-+-      sqlite3_snprintf(sizeof(p->colSeparator), p->colSeparator, SEP_Unit);
-+-      sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_Record);
-+-    }else if( nArg==1 ){
-+-      raw_printf(p->out, "current output mode: %s\n", modeDescr[p->mode]);
-+-    }else{
-+-      raw_printf(stderr, "Error: mode should be one of: "
-+-         "ascii column csv html insert line list quote tabs tcl\n");
-+-      rc = 1;
-+-    }
-+-    p->cMode = p->mode;
-+-  }else
-+-
-+-  if( c=='n' && strncmp(azArg[0], "nullvalue", n)==0 ){
-+-    if( nArg==2 ){
-+-      sqlite3_snprintf(sizeof(p->nullValue), p->nullValue,
-+-                       "%.*s", (int)ArraySize(p->nullValue)-1, azArg[1]);
-+-    }else{
-+-      raw_printf(stderr, "Usage: .nullvalue STRING\n");
-+-      rc = 1;
-+-    }
-+-  }else
-+-
-+-  if( c=='o' && strncmp(azArg[0], "open", n)==0 && n>=2 ){
-+-    char *zNewFilename;  /* Name of the database file to open */
-+-    int iName = 1;       /* Index in azArg[] of the filename */
-+-    int newFlag = 0;     /* True to delete file before opening */
-+-    /* Close the existing database */
-+-    session_close_all(p);
-+-    sqlite3_close(p->db);
-+-    p->db = 0;
-+-    p->zDbFilename = 0;
-+-    sqlite3_free(p->zFreeOnClose);
-+-    p->zFreeOnClose = 0;
-+-    /* Check for command-line arguments */
-+-    for(iName=1; iName<nArg && azArg[iName][0]=='-'; iName++){
-+-      const char *z = azArg[iName];
-+-      if( optionMatch(z,"new") ){
-+-        newFlag = 1;
-+-      }else if( z[0]=='-' ){
-+-        utf8_printf(stderr, "unknown option: %s\n", z);
-+-        rc = 1;
-+-        goto meta_command_exit;
-+-      }
-+-    }
-+-    /* If a filename is specified, try to open it first */
-+-    zNewFilename = nArg>iName ? sqlite3_mprintf("%s", azArg[iName]) : 0;
-+-    if( zNewFilename ){
-+-      if( newFlag ) shellDeleteFile(zNewFilename);
-+-      p->zDbFilename = zNewFilename;
-+-      open_db(p, 1);
-+-      if( p->db==0 ){
-+-        utf8_printf(stderr, "Error: cannot open '%s'\n", zNewFilename);
-+-        sqlite3_free(zNewFilename);
-+-      }else{
-+-        p->zFreeOnClose = zNewFilename;
-+-      }
-+-    }
-+-    if( p->db==0 ){
-+-      /* As a fall-back open a TEMP database */
-+-      p->zDbFilename = 0;
-+-      open_db(p, 0);
-+-    }
-+-  }else
-+-
-+-  if( c=='o'
-+-   && (strncmp(azArg[0], "output", n)==0 || strncmp(azArg[0], "once", n)==0)
-+-  ){
-+-    const char *zFile = nArg>=2 ? azArg[1] : "stdout";
-+-    if( nArg>2 ){
-+-      utf8_printf(stderr, "Usage: .%s FILE\n", azArg[0]);
-+-      rc = 1;
-+-      goto meta_command_exit;
-+-    }
-+-    if( n>1 && strncmp(azArg[0], "once", n)==0 ){
-+-      if( nArg<2 ){
-+-        raw_printf(stderr, "Usage: .once FILE\n");
-+-        rc = 1;
-+-        goto meta_command_exit;
-+-      }
-+-      p->outCount = 2;
-+-    }else{
-+-      p->outCount = 0;
-+-    }
-+-    output_reset(p);
-+-    if( zFile[0]=='|' ){
-+-#ifdef SQLITE_OMIT_POPEN
-+-      raw_printf(stderr, "Error: pipes are not supported in this OS\n");
-+-      rc = 1;
-+-      p->out = stdout;
-+-#else
-+-      p->out = popen(zFile + 1, "w");
-+-      if( p->out==0 ){
-+-        utf8_printf(stderr,"Error: cannot open pipe \"%s\"\n", zFile + 1);
-+-        p->out = stdout;
-+-        rc = 1;
-+-      }else{
-+-        sqlite3_snprintf(sizeof(p->outfile), p->outfile, "%s", zFile);
-+-      }
-+-#endif
-+-    }else{
-+-      p->out = output_file_open(zFile);
-+-      if( p->out==0 ){
-+-        if( strcmp(zFile,"off")!=0 ){
-+-          utf8_printf(stderr,"Error: cannot write to \"%s\"\n", zFile);
-+-        }
-+-        p->out = stdout;
-+-        rc = 1;
-+-      } else {
-+-        sqlite3_snprintf(sizeof(p->outfile), p->outfile, "%s", zFile);
-+-      }
-+-    }
-+-  }else
-+-
-+-  if( c=='p' && n>=3 && strncmp(azArg[0], "print", n)==0 ){
-+-    int i;
-+-    for(i=1; i<nArg; i++){
-+-      if( i>1 ) raw_printf(p->out, " ");
-+-      utf8_printf(p->out, "%s", azArg[i]);
-+-    }
-+-    raw_printf(p->out, "\n");
-+-  }else
-+-
-+-  if( c=='p' && strncmp(azArg[0], "prompt", n)==0 ){
-+-    if( nArg >= 2) {
-+-      strncpy(mainPrompt,azArg[1],(int)ArraySize(mainPrompt)-1);
-+-    }
-+-    if( nArg >= 3) {
-+-      strncpy(continuePrompt,azArg[2],(int)ArraySize(continuePrompt)-1);
-+-    }
-+-  }else
-+-
-+-  if( c=='q' && strncmp(azArg[0], "quit", n)==0 ){
-+-    rc = 2;
-+-  }else
-+-
-+-  if( c=='r' && n>=3 && strncmp(azArg[0], "read", n)==0 ){
-+-    FILE *alt;
-+-    if( nArg!=2 ){
-+-      raw_printf(stderr, "Usage: .read FILE\n");
-+-      rc = 1;
-+-      goto meta_command_exit;
-+-    }
-+-    alt = fopen(azArg[1], "rb");
-+-    if( alt==0 ){
-+-      utf8_printf(stderr,"Error: cannot open \"%s\"\n", azArg[1]);
-+-      rc = 1;
-+-    }else{
-+-      rc = process_input(p, alt);
-+-      fclose(alt);
-+-    }
-+-  }else
-+-
-+-  if( c=='r' && n>=3 && strncmp(azArg[0], "restore", n)==0 ){
-+-    const char *zSrcFile;
-+-    const char *zDb;
-+-    sqlite3 *pSrc;
-+-    sqlite3_backup *pBackup;
-+-    int nTimeout = 0;
-+-
-+-    if( nArg==2 ){
-+-      zSrcFile = azArg[1];
-+-      zDb = "main";
-+-    }else if( nArg==3 ){
-+-      zSrcFile = azArg[2];
-+-      zDb = azArg[1];
-+-    }else{
-+-      raw_printf(stderr, "Usage: .restore ?DB? FILE\n");
-+-      rc = 1;
-+-      goto meta_command_exit;
-+-    }
-+-    rc = sqlite3_open(zSrcFile, &pSrc);
-+-    if( rc!=SQLITE_OK ){
-+-      utf8_printf(stderr, "Error: cannot open \"%s\"\n", zSrcFile);
-+-      sqlite3_close(pSrc);
-+-      return 1;
-+-    }
-+-    open_db(p, 0);
-+-    pBackup = sqlite3_backup_init(p->db, zDb, pSrc, "main");
-+-    if( pBackup==0 ){
-+-      utf8_printf(stderr, "Error: %s\n", sqlite3_errmsg(p->db));
-+-      sqlite3_close(pSrc);
-+-      return 1;
-+-    }
-+-    while( (rc = sqlite3_backup_step(pBackup,100))==SQLITE_OK
-+-          || rc==SQLITE_BUSY  ){
-+-      if( rc==SQLITE_BUSY ){
-+-        if( nTimeout++ >= 3 ) break;
-+-        sqlite3_sleep(100);
-+-      }
-+-    }
-+-    sqlite3_backup_finish(pBackup);
-+-    if( rc==SQLITE_DONE ){
-+-      rc = 0;
-+-    }else if( rc==SQLITE_BUSY || rc==SQLITE_LOCKED ){
-+-      raw_printf(stderr, "Error: source database is busy\n");
-+-      rc = 1;
-+-    }else{
-+-      utf8_printf(stderr, "Error: %s\n", sqlite3_errmsg(p->db));
-+-      rc = 1;
-+-    }
-+-    sqlite3_close(pSrc);
-+-  }else
-+-
-+-
-+-  if( c=='s' && strncmp(azArg[0], "scanstats", n)==0 ){
-+-    if( nArg==2 ){
-+-      p->scanstatsOn = booleanValue(azArg[1]);
-+-#ifndef SQLITE_ENABLE_STMT_SCANSTATUS
-+-      raw_printf(stderr, "Warning: .scanstats not available in this build.\n");
-+-#endif
-+-    }else{
-+-      raw_printf(stderr, "Usage: .scanstats on|off\n");
-+-      rc = 1;
-+-    }
-+-  }else
-+-
-+-  if( c=='s' && strncmp(azArg[0], "schema", n)==0 ){
-+-    ShellText sSelect;
-+-    ShellState data;
-+-    char *zErrMsg = 0;
-+-    const char *zDiv = 0;
-+-    int iSchema = 0;
-+-
-+-    open_db(p, 0);
-+-    memcpy(&data, p, sizeof(data));
-+-    data.showHeader = 0;
-+-    data.cMode = data.mode = MODE_Semi;
-+-    initText(&sSelect);
-+-    if( nArg>=2 && optionMatch(azArg[1], "indent") ){
-+-      data.cMode = data.mode = MODE_Pretty;
-+-      nArg--;
-+-      if( nArg==2 ) azArg[1] = azArg[2];
-+-    }
-+-    if( nArg==2 && azArg[1][0]!='-' ){
-+-      int i;
-+-      for(i=0; azArg[1][i]; i++) azArg[1][i] = ToLower(azArg[1][i]);
-+-      if( strcmp(azArg[1],"sqlite_master")==0 ){
-+-        char *new_argv[2], *new_colv[2];
-+-        new_argv[0] = "CREATE TABLE sqlite_master (\n"
-+-                      "  type text,\n"
-+-                      "  name text,\n"
-+-                      "  tbl_name text,\n"
-+-                      "  rootpage integer,\n"
-+-                      "  sql text\n"
-+-                      ")";
-+-        new_argv[1] = 0;
-+-        new_colv[0] = "sql";
-+-        new_colv[1] = 0;
-+-        callback(&data, 1, new_argv, new_colv);
-+-        rc = SQLITE_OK;
-+-      }else if( strcmp(azArg[1],"sqlite_temp_master")==0 ){
-+-        char *new_argv[2], *new_colv[2];
-+-        new_argv[0] = "CREATE TEMP TABLE sqlite_temp_master (\n"
-+-                      "  type text,\n"
-+-                      "  name text,\n"
-+-                      "  tbl_name text,\n"
-+-                      "  rootpage integer,\n"
-+-                      "  sql text\n"
-+-                      ")";
-+-        new_argv[1] = 0;
-+-        new_colv[0] = "sql";
-+-        new_colv[1] = 0;
-+-        callback(&data, 1, new_argv, new_colv);
-+-        rc = SQLITE_OK;
-+-      }else{
-+-        zDiv = "(";
-+-      }
-+-    }else if( nArg==1 ){
-+-      zDiv = "(";
-+-    }else{
-+-      raw_printf(stderr, "Usage: .schema ?--indent? ?LIKE-PATTERN?\n");
-+-      rc = 1;
-+-      goto meta_command_exit;
-+-    }
-+-    if( zDiv ){
-+-      sqlite3_stmt *pStmt = 0;
-+-      rc = sqlite3_prepare_v2(p->db, "SELECT name FROM pragma_database_list",
-+-                              -1, &pStmt, 0);
-+-      if( rc ){
-+-        utf8_printf(stderr, "Error: %s\n", sqlite3_errmsg(p->db));
-+-        sqlite3_finalize(pStmt);
-+-        rc = 1;
-+-        goto meta_command_exit;
-+-      }
-+-      appendText(&sSelect, "SELECT sql FROM", 0);
-+-      iSchema = 0;
-+-      while( sqlite3_step(pStmt)==SQLITE_ROW ){
-+-        const char *zDb = (const char*)sqlite3_column_text(pStmt, 0);
-+-        char zScNum[30];
-+-        sqlite3_snprintf(sizeof(zScNum), zScNum, "%d", ++iSchema);
-+-        appendText(&sSelect, zDiv, 0);
-+-        zDiv = " UNION ALL ";
-+-        if( strcmp(zDb, "main")!=0 ){
-+-          appendText(&sSelect, "SELECT shell_add_schema(sql,", 0);
-+-          appendText(&sSelect, zDb, '"');
-+-          appendText(&sSelect, ") AS sql, type, tbl_name, name, rowid,", 0);
-+-          appendText(&sSelect, zScNum, 0);
-+-          appendText(&sSelect, " AS snum, ", 0);
-+-          appendText(&sSelect, zDb, '\'');
-+-          appendText(&sSelect, " AS sname FROM ", 0);
-+-          appendText(&sSelect, zDb, '"');
-+-          appendText(&sSelect, ".sqlite_master", 0);
-+-        }else{
-+-          appendText(&sSelect, "SELECT sql, type, tbl_name, name, rowid, ", 0);
-+-          appendText(&sSelect, zScNum, 0);
-+-          appendText(&sSelect, " AS snum, 'main' AS sname FROM sqlite_master",0);
-+-        }
-+-      }
-+-      sqlite3_finalize(pStmt);
-+-      appendText(&sSelect, ") WHERE ", 0);
-+-      if( nArg>1 ){
-+-        char *zQarg = sqlite3_mprintf("%Q", azArg[1]);
-+-        if( strchr(azArg[1], '.') ){
-+-          appendText(&sSelect, "lower(printf('%s.%s',sname,tbl_name))", 0);
-+-        }else{
-+-          appendText(&sSelect, "lower(tbl_name)", 0);
-+-        }
-+-        appendText(&sSelect, strchr(azArg[1], '*') ? " GLOB " : " LIKE ", 0);
-+-        appendText(&sSelect, zQarg, 0);
-+-        appendText(&sSelect, " AND ", 0);
-+-        sqlite3_free(zQarg);
-+-      }
-+-      appendText(&sSelect, "type!='meta' AND sql IS NOT NULL"
-+-                           " ORDER BY snum, rowid", 0);
-+-      rc = sqlite3_exec(p->db, sSelect.z, callback, &data, &zErrMsg);
-+-      freeText(&sSelect);
-+-    }
-+-    if( zErrMsg ){
-+-      utf8_printf(stderr,"Error: %s\n", zErrMsg);
-+-      sqlite3_free(zErrMsg);
-+-      rc = 1;
-+-    }else if( rc != SQLITE_OK ){
-+-      raw_printf(stderr,"Error: querying schema information\n");
-+-      rc = 1;
-+-    }else{
-+-      rc = 0;
-+-    }
-+-  }else
-+-
-+-#if defined(SQLITE_DEBUG) && defined(SQLITE_ENABLE_SELECTTRACE)
-+-  if( c=='s' && n==11 && strncmp(azArg[0], "selecttrace", n)==0 ){
-+-    sqlite3SelectTrace = (int)integerValue(azArg[1]);
-+-  }else
-+-#endif
-+-
-+-#if defined(SQLITE_ENABLE_SESSION)
-+-  if( c=='s' && strncmp(azArg[0],"session",n)==0 && n>=3 ){
-+-    OpenSession *pSession = &p->aSession[0];
-+-    char **azCmd = &azArg[1];
-+-    int iSes = 0;
-+-    int nCmd = nArg - 1;
-+-    int i;
-+-    if( nArg<=1 ) goto session_syntax_error;
-+-    open_db(p, 0);
-+-    if( nArg>=3 ){
-+-      for(iSes=0; iSes<p->nSession; iSes++){
-+-        if( strcmp(p->aSession[iSes].zName, azArg[1])==0 ) break;
-+-      }
-+-      if( iSes<p->nSession ){
-+-        pSession = &p->aSession[iSes];
-+-        azCmd++;
-+-        nCmd--;
-+-      }else{
-+-        pSession = &p->aSession[0];
-+-        iSes = 0;
-+-      }
-+-    }
-+-
-+-    /* .session attach TABLE
-+-    ** Invoke the sqlite3session_attach() interface to attach a particular
-+-    ** table so that it is never filtered.
-+-    */
-+-    if( strcmp(azCmd[0],"attach")==0 ){
-+-      if( nCmd!=2 ) goto session_syntax_error;
-+-      if( pSession->p==0 ){
-+-        session_not_open:
-+-        raw_printf(stderr, "ERROR: No sessions are open\n");
-+-      }else{
-+-        rc = sqlite3session_attach(pSession->p, azCmd[1]);
-+-        if( rc ){
-+-          raw_printf(stderr, "ERROR: sqlite3session_attach() returns %d\n", rc);
-+-          rc = 0;
-+-        }
-+-      }
-+-    }else
-+-
-+-    /* .session changeset FILE
-+-    ** .session patchset FILE
-+-    ** Write a changeset or patchset into a file.  The file is overwritten.
-+-    */
-+-    if( strcmp(azCmd[0],"changeset")==0 || strcmp(azCmd[0],"patchset")==0 ){
-+-      FILE *out = 0;
-+-      if( nCmd!=2 ) goto session_syntax_error;
-+-      if( pSession->p==0 ) goto session_not_open;
-+-      out = fopen(azCmd[1], "wb");
-+-      if( out==0 ){
-+-        utf8_printf(stderr, "ERROR: cannot open \"%s\" for writing\n", azCmd[1]);
-+-      }else{
-+-        int szChng;
-+-        void *pChng;
-+-        if( azCmd[0][0]=='c' ){
-+-          rc = sqlite3session_changeset(pSession->p, &szChng, &pChng);
-+-        }else{
-+-          rc = sqlite3session_patchset(pSession->p, &szChng, &pChng);
-+-        }
-+-        if( rc ){
-+-          printf("Error: error code %d\n", rc);
-+-          rc = 0;
-+-        }
-+-        if( pChng
-+-          && fwrite(pChng, szChng, 1, out)!=1 ){
-+-          raw_printf(stderr, "ERROR: Failed to write entire %d-byte output\n",
-+-                  szChng);
-+-        }
-+-        sqlite3_free(pChng);
-+-        fclose(out);
-+-      }
-+-    }else
-+-
-+-    /* .session close
-+-    ** Close the identified session
-+-    */
-+-    if( strcmp(azCmd[0], "close")==0 ){
-+-      if( nCmd!=1 ) goto session_syntax_error;
-+-      if( p->nSession ){
-+-        session_close(pSession);
-+-        p->aSession[iSes] = p->aSession[--p->nSession];
-+-      }
-+-    }else
-+-
-+-    /* .session enable ?BOOLEAN?
-+-    ** Query or set the enable flag
-+-    */
-+-    if( strcmp(azCmd[0], "enable")==0 ){
-+-      int ii;
-+-      if( nCmd>2 ) goto session_syntax_error;
-+-      ii = nCmd==1 ? -1 : booleanValue(azCmd[1]);
-+-      if( p->nSession ){
-+-        ii = sqlite3session_enable(pSession->p, ii);
-+-        utf8_printf(p->out, "session %s enable flag = %d\n",
-+-                    pSession->zName, ii);
-+-      }
-+-    }else
-+-
-+-    /* .session filter GLOB ....
-+-    ** Set a list of GLOB patterns of table names to be excluded.
-+-    */
-+-    if( strcmp(azCmd[0], "filter")==0 ){
-+-      int ii, nByte;
-+-      if( nCmd<2 ) goto session_syntax_error;
-+-      if( p->nSession ){
-+-        for(ii=0; ii<pSession->nFilter; ii++){
-+-          sqlite3_free(pSession->azFilter[ii]);
-+-        }
-+-        sqlite3_free(pSession->azFilter);
-+-        nByte = sizeof(pSession->azFilter[0])*(nCmd-1);
-+-        pSession->azFilter = sqlite3_malloc( nByte );
-+-        if( pSession->azFilter==0 ){
-+-          raw_printf(stderr, "Error: out or memory\n");
-+-          exit(1);
-+-        }
-+-        for(ii=1; ii<nCmd; ii++){
-+-          pSession->azFilter[ii-1] = sqlite3_mprintf("%s", azCmd[ii]);
-+-        }
-+-        pSession->nFilter = ii-1;
-+-      }
-+-    }else
-+-
-+-    /* .session indirect ?BOOLEAN?
-+-    ** Query or set the indirect flag
-+-    */
-+-    if( strcmp(azCmd[0], "indirect")==0 ){
-+-      int ii;
-+-      if( nCmd>2 ) goto session_syntax_error;
-+-      ii = nCmd==1 ? -1 : booleanValue(azCmd[1]);
-+-      if( p->nSession ){
-+-        ii = sqlite3session_indirect(pSession->p, ii);
-+-        utf8_printf(p->out, "session %s indirect flag = %d\n",
-+-                    pSession->zName, ii);
-+-      }
-+-    }else
-+-
-+-    /* .session isempty
-+-    ** Determine if the session is empty
-+-    */
-+-    if( strcmp(azCmd[0], "isempty")==0 ){
-+-      int ii;
-+-      if( nCmd!=1 ) goto session_syntax_error;
-+-      if( p->nSession ){
-+-        ii = sqlite3session_isempty(pSession->p);
-+-        utf8_printf(p->out, "session %s isempty flag = %d\n",
-+-                    pSession->zName, ii);
-+-      }
-+-    }else
-+-
-+-    /* .session list
-+-    ** List all currently open sessions
-+-    */
-+-    if( strcmp(azCmd[0],"list")==0 ){
-+-      for(i=0; i<p->nSession; i++){
-+-        utf8_printf(p->out, "%d %s\n", i, p->aSession[i].zName);
-+-      }
-+-    }else
-+-
-+-    /* .session open DB NAME
-+-    ** Open a new session called NAME on the attached database DB.
-+-    ** DB is normally "main".
-+-    */
-+-    if( strcmp(azCmd[0],"open")==0 ){
-+-      char *zName;
-+-      if( nCmd!=3 ) goto session_syntax_error;
-+-      zName = azCmd[2];
-+-      if( zName[0]==0 ) goto session_syntax_error;
-+-      for(i=0; i<p->nSession; i++){
-+-        if( strcmp(p->aSession[i].zName,zName)==0 ){
-+-          utf8_printf(stderr, "Session \"%s\" already exists\n", zName);
-+-          goto meta_command_exit;
-+-        }
-+-      }
-+-      if( p->nSession>=ArraySize(p->aSession) ){
-+-        raw_printf(stderr, "Maximum of %d sessions\n", ArraySize(p->aSession));
-+-        goto meta_command_exit;
-+-      }
-+-      pSession = &p->aSession[p->nSession];
-+-      rc = sqlite3session_create(p->db, azCmd[1], &pSession->p);
-+-      if( rc ){
-+-        raw_printf(stderr, "Cannot open session: error code=%d\n", rc);
-+-        rc = 0;
-+-        goto meta_command_exit;
-+-      }
-+-      pSession->nFilter = 0;
-+-      sqlite3session_table_filter(pSession->p, session_filter, pSession);
-+-      p->nSession++;
-+-      pSession->zName = sqlite3_mprintf("%s", zName);
-+-    }else
-+-    /* If no command name matches, show a syntax error */
-+-    session_syntax_error:
-+-    session_help(p);
-+-  }else
-+-#endif
-+-
-+-#ifdef SQLITE_DEBUG
-+-  /* Undocumented commands for internal testing.  Subject to change
-+-  ** without notice. */
-+-  if( c=='s' && n>=10 && strncmp(azArg[0], "selftest-", 9)==0 ){
-+-    if( strncmp(azArg[0]+9, "boolean", n-9)==0 ){
-+-      int i, v;
-+-      for(i=1; i<nArg; i++){
-+-        v = booleanValue(azArg[i]);
-+-        utf8_printf(p->out, "%s: %d 0x%x\n", azArg[i], v, v);
-+-      }
-+-    }
-+-    if( strncmp(azArg[0]+9, "integer", n-9)==0 ){
-+-      int i; sqlite3_int64 v;
-+-      for(i=1; i<nArg; i++){
-+-        char zBuf[200];
-+-        v = integerValue(azArg[i]);
-+-        sqlite3_snprintf(sizeof(zBuf),zBuf,"%s: %lld 0x%llx\n", azArg[i],v,v);
-+-        utf8_printf(p->out, "%s", zBuf);
-+-      }
-+-    }
-+-  }else
-+-#endif
-+-
-+-  if( c=='s' && n>=4 && strncmp(azArg[0],"selftest",n)==0 ){
-+-    int bIsInit = 0;         /* True to initialize the SELFTEST table */
-+-    int bVerbose = 0;        /* Verbose output */
-+-    int bSelftestExists;     /* True if SELFTEST already exists */
-+-    int i, k;                /* Loop counters */
-+-    int nTest = 0;           /* Number of tests runs */
-+-    int nErr = 0;            /* Number of errors seen */
-+-    ShellText str;           /* Answer for a query */
-+-    sqlite3_stmt *pStmt = 0; /* Query against the SELFTEST table */
-+-
-+-    open_db(p,0);
-+-    for(i=1; i<nArg; i++){
-+-      const char *z = azArg[i];
-+-      if( z[0]=='-' && z[1]=='-' ) z++;
-+-      if( strcmp(z,"-init")==0 ){
-+-        bIsInit = 1;
-+-      }else
-+-      if( strcmp(z,"-v")==0 ){
-+-        bVerbose++;
-+-      }else
-+-      {
-+-        utf8_printf(stderr, "Unknown option \"%s\" on \"%s\"\n",
-+-                    azArg[i], azArg[0]);
-+-        raw_printf(stderr, "Should be one of: --init -v\n");
-+-        rc = 1;
-+-        goto meta_command_exit;
-+-      }
-+-    }
-+-    if( sqlite3_table_column_metadata(p->db,"main","selftest",0,0,0,0,0,0)
-+-           != SQLITE_OK ){
-+-      bSelftestExists = 0;
-+-    }else{
-+-      bSelftestExists = 1;
-+-    }
-+-    if( bIsInit ){
-+-      createSelftestTable(p);
-+-      bSelftestExists = 1;
-+-    }
-+-    initText(&str);
-+-    appendText(&str, "x", 0);
-+-    for(k=bSelftestExists; k>=0; k--){
-+-      if( k==1 ){
-+-        rc = sqlite3_prepare_v2(p->db,
-+-            "SELECT tno,op,cmd,ans FROM selftest ORDER BY tno",
-+-            -1, &pStmt, 0);
-+-      }else{
-+-        rc = sqlite3_prepare_v2(p->db,
-+-          "VALUES(0,'memo','Missing SELFTEST table - default checks only',''),"
-+-          "      (1,'run','PRAGMA integrity_check','ok')",
-+-          -1, &pStmt, 0);
-+-      }
-+-      if( rc ){
-+-        raw_printf(stderr, "Error querying the selftest table\n");
-+-        rc = 1;
-+-        sqlite3_finalize(pStmt);
-+-        goto meta_command_exit;
-+-      }
-+-      for(i=1; sqlite3_step(pStmt)==SQLITE_ROW; i++){
-+-        int tno = sqlite3_column_int(pStmt, 0);
-+-        const char *zOp = (const char*)sqlite3_column_text(pStmt, 1);
-+-        const char *zSql = (const char*)sqlite3_column_text(pStmt, 2);
-+-        const char *zAns = (const char*)sqlite3_column_text(pStmt, 3);
-+-
-+-        k = 0;
-+-        if( bVerbose>0 ){
-+-          char *zQuote = sqlite3_mprintf("%q", zSql);
-+-          printf("%d: %s %s\n", tno, zOp, zSql);
-+-          sqlite3_free(zQuote);
-+-        }
-+-        if( strcmp(zOp,"memo")==0 ){
-+-          utf8_printf(p->out, "%s\n", zSql);
-+-        }else
-+-        if( strcmp(zOp,"run")==0 ){
-+-          char *zErrMsg = 0;
-+-          str.n = 0;
-+-          str.z[0] = 0;
-+-          rc = sqlite3_exec(p->db, zSql, captureOutputCallback, &str, &zErrMsg);
-+-          nTest++;
-+-          if( bVerbose ){
-+-            utf8_printf(p->out, "Result: %s\n", str.z);
-+-          }
-+-          if( rc || zErrMsg ){
-+-            nErr++;
-+-            rc = 1;
-+-            utf8_printf(p->out, "%d: error-code-%d: %s\n", tno, rc, zErrMsg);
-+-            sqlite3_free(zErrMsg);
-+-          }else if( strcmp(zAns,str.z)!=0 ){
-+-            nErr++;
-+-            rc = 1;
-+-            utf8_printf(p->out, "%d: Expected: [%s]\n", tno, zAns);
-+-            utf8_printf(p->out, "%d:      Got: [%s]\n", tno, str.z);
-+-          }
-+-        }else
-+-        {
-+-          utf8_printf(stderr,
-+-            "Unknown operation \"%s\" on selftest line %d\n", zOp, tno);
-+-          rc = 1;
-+-          break;
-+-        }
-+-      } /* End loop over rows of content from SELFTEST */
-+-      sqlite3_finalize(pStmt);
-+-    } /* End loop over k */
-+-    freeText(&str);
-+-    utf8_printf(p->out, "%d errors out of %d tests\n", nErr, nTest);
-+-  }else
-+-
-+-  if( c=='s' && strncmp(azArg[0], "separator", n)==0 ){
-+-    if( nArg<2 || nArg>3 ){
-+-      raw_printf(stderr, "Usage: .separator COL ?ROW?\n");
-+-      rc = 1;
-+-    }
-+-    if( nArg>=2 ){
-+-      sqlite3_snprintf(sizeof(p->colSeparator), p->colSeparator,
-+-                       "%.*s", (int)ArraySize(p->colSeparator)-1, azArg[1]);
-+-    }
-+-    if( nArg>=3 ){
-+-      sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator,
-+-                       "%.*s", (int)ArraySize(p->rowSeparator)-1, azArg[2]);
-+-    }
-+-  }else
-+-
-+-  if( c=='s' && n>=4 && strncmp(azArg[0],"sha3sum",n)==0 ){
-+-    const char *zLike = 0;   /* Which table to checksum. 0 means everything */
-+-    int i;                   /* Loop counter */
-+-    int bSchema = 0;         /* Also hash the schema */
-+-    int bSeparate = 0;       /* Hash each table separately */
-+-    int iSize = 224;         /* Hash algorithm to use */
-+-    int bDebug = 0;          /* Only show the query that would have run */
-+-    sqlite3_stmt *pStmt;     /* For querying tables names */
-+-    char *zSql;              /* SQL to be run */
-+-    char *zSep;              /* Separator */
-+-    ShellText sSql;          /* Complete SQL for the query to run the hash */
-+-    ShellText sQuery;        /* Set of queries used to read all content */
-+-    open_db(p, 0);
-+-    for(i=1; i<nArg; i++){
-+-      const char *z = azArg[i];
-+-      if( z[0]=='-' ){
-+-        z++;
-+-        if( z[0]=='-' ) z++;
-+-        if( strcmp(z,"schema")==0 ){
-+-          bSchema = 1;
-+-        }else
-+-        if( strcmp(z,"sha3-224")==0 || strcmp(z,"sha3-256")==0
-+-         || strcmp(z,"sha3-384")==0 || strcmp(z,"sha3-512")==0
-+-        ){
-+-          iSize = atoi(&z[5]);
-+-        }else
-+-        if( strcmp(z,"debug")==0 ){
-+-          bDebug = 1;
-+-        }else
-+-        {
-+-          utf8_printf(stderr, "Unknown option \"%s\" on \"%s\"\n",
-+-                      azArg[i], azArg[0]);
-+-          raw_printf(stderr, "Should be one of: --schema"
-+-                             " --sha3-224 --sha3-255 --sha3-384 --sha3-512\n");
-+-          rc = 1;
-+-          goto meta_command_exit;
-+-        }
-+-      }else if( zLike ){
-+-        raw_printf(stderr, "Usage: .sha3sum ?OPTIONS? ?LIKE-PATTERN?\n");
-+-        rc = 1;
-+-        goto meta_command_exit;
-+-      }else{
-+-        zLike = z;
-+-        bSeparate = 1;
-+-        if( sqlite3_strlike("sqlite_%", zLike, 0)==0 ) bSchema = 1;
-+-      }
-+-    }
-+-    if( bSchema ){
-+-      zSql = "SELECT lower(name) FROM sqlite_master"
-+-             " WHERE type='table' AND coalesce(rootpage,0)>1"
-+-             " UNION ALL SELECT 'sqlite_master'"
-+-             " ORDER BY 1 collate nocase";
-+-    }else{
-+-      zSql = "SELECT lower(name) FROM sqlite_master"
-+-             " WHERE type='table' AND coalesce(rootpage,0)>1"
-+-             " AND name NOT LIKE 'sqlite_%'"
-+-             " ORDER BY 1 collate nocase";
-+-    }
-+-    sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
-+-    initText(&sQuery);
-+-    initText(&sSql);
-+-    appendText(&sSql, "WITH [sha3sum$query](a,b) AS(",0);
-+-    zSep = "VALUES(";
-+-    while( SQLITE_ROW==sqlite3_step(pStmt) ){
-+-      const char *zTab = (const char*)sqlite3_column_text(pStmt,0);
-+-      if( zLike && sqlite3_strlike(zLike, zTab, 0)!=0 ) continue;
-+-      if( strncmp(zTab, "sqlite_",7)!=0 ){
-+-        appendText(&sQuery,"SELECT * FROM ", 0);
-+-        appendText(&sQuery,zTab,'"');
-+-        appendText(&sQuery," NOT INDEXED;", 0);
-+-      }else if( strcmp(zTab, "sqlite_master")==0 ){
-+-        appendText(&sQuery,"SELECT type,name,tbl_name,sql FROM sqlite_master"
-+-                           " ORDER BY name;", 0);
-+-      }else if( strcmp(zTab, "sqlite_sequence")==0 ){
-+-        appendText(&sQuery,"SELECT name,seq FROM sqlite_sequence"
-+-                           " ORDER BY name;", 0);
-+-      }else if( strcmp(zTab, "sqlite_stat1")==0 ){
-+-        appendText(&sQuery,"SELECT tbl,idx,stat FROM sqlite_stat1"
-+-                           " ORDER BY tbl,idx;", 0);
-+-      }else if( strcmp(zTab, "sqlite_stat3")==0
-+-             || strcmp(zTab, "sqlite_stat4")==0 ){
-+-        appendText(&sQuery, "SELECT * FROM ", 0);
-+-        appendText(&sQuery, zTab, 0);
-+-        appendText(&sQuery, " ORDER BY tbl, idx, rowid;\n", 0);
-+-      }
-+-      appendText(&sSql, zSep, 0);
-+-      appendText(&sSql, sQuery.z, '\'');
-+-      sQuery.n = 0;
-+-      appendText(&sSql, ",", 0);
-+-      appendText(&sSql, zTab, '\'');
-+-      zSep = "),(";
-+-    }
-+-    sqlite3_finalize(pStmt);
-+-    if( bSeparate ){
-+-      zSql = sqlite3_mprintf(
-+-          "%s))"
-+-          " SELECT lower(hex(sha3_query(a,%d))) AS hash, b AS label"
-+-          "   FROM [sha3sum$query]",
-+-          sSql.z, iSize);
-+-    }else{
-+-      zSql = sqlite3_mprintf(
-+-          "%s))"
-+-          " SELECT lower(hex(sha3_query(group_concat(a,''),%d))) AS hash"
-+-          "   FROM [sha3sum$query]",
-+-          sSql.z, iSize);
-+-    }
-+-    freeText(&sQuery);
-+-    freeText(&sSql);
-+-    if( bDebug ){
-+-      utf8_printf(p->out, "%s\n", zSql);
-+-    }else{
-+-      shell_exec(p->db, zSql, shell_callback, p, 0);
-+-    }
-+-    sqlite3_free(zSql);
-+-  }else
-+-
-+-  if( c=='s'
-+-   && (strncmp(azArg[0], "shell", n)==0 || strncmp(azArg[0],"system",n)==0)
-+-  ){
-+-    char *zCmd;
-+-    int i, x;
-+-    if( nArg<2 ){
-+-      raw_printf(stderr, "Usage: .system COMMAND\n");
-+-      rc = 1;
-+-      goto meta_command_exit;
-+-    }
-+-    zCmd = sqlite3_mprintf(strchr(azArg[1],' ')==0?"%s":"\"%s\"", azArg[1]);
-+-    for(i=2; i<nArg; i++){
-+-      zCmd = sqlite3_mprintf(strchr(azArg[i],' ')==0?"%z %s":"%z \"%s\"",
-+-                             zCmd, azArg[i]);
-+-    }
-+-    x = system(zCmd);
-+-    sqlite3_free(zCmd);
-+-    if( x ) raw_printf(stderr, "System command returns %d\n", x);
-+-  }else
-+-
-+-  if( c=='s' && strncmp(azArg[0], "show", n)==0 ){
-+-    static const char *azBool[] = { "off", "on", "full", "unk" };
-+-    int i;
-+-    if( nArg!=1 ){
-+-      raw_printf(stderr, "Usage: .show\n");
-+-      rc = 1;
-+-      goto meta_command_exit;
-+-    }
-+-    utf8_printf(p->out, "%12.12s: %s\n","echo",
-+-                                  azBool[ShellHasFlag(p, SHFLG_Echo)]);
-+-    utf8_printf(p->out, "%12.12s: %s\n","eqp", azBool[p->autoEQP&3]);
-+-    utf8_printf(p->out, "%12.12s: %s\n","explain",
-+-         p->mode==MODE_Explain ? "on" : p->autoExplain ? "auto" : "off");
-+-    utf8_printf(p->out,"%12.12s: %s\n","headers", azBool[p->showHeader!=0]);
-+-    utf8_printf(p->out, "%12.12s: %s\n","mode", modeDescr[p->mode]);
-+-    utf8_printf(p->out, "%12.12s: ", "nullvalue");
-+-      output_c_string(p->out, p->nullValue);
-+-      raw_printf(p->out, "\n");
-+-    utf8_printf(p->out,"%12.12s: %s\n","output",
-+-            strlen30(p->outfile) ? p->outfile : "stdout");
-+-    utf8_printf(p->out,"%12.12s: ", "colseparator");
-+-      output_c_string(p->out, p->colSeparator);
-+-      raw_printf(p->out, "\n");
-+-    utf8_printf(p->out,"%12.12s: ", "rowseparator");
-+-      output_c_string(p->out, p->rowSeparator);
-+-      raw_printf(p->out, "\n");
-+-    utf8_printf(p->out, "%12.12s: %s\n","stats", azBool[p->statsOn!=0]);
-+-    utf8_printf(p->out, "%12.12s: ", "width");
-+-    for (i=0;i<(int)ArraySize(p->colWidth) && p->colWidth[i] != 0;i++) {
-+-      raw_printf(p->out, "%d ", p->colWidth[i]);
-+-    }
-+-    raw_printf(p->out, "\n");
-+-    utf8_printf(p->out, "%12.12s: %s\n", "filename",
-+-                p->zDbFilename ? p->zDbFilename : "");
-+-  }else
-+-
-+-  if( c=='s' && strncmp(azArg[0], "stats", n)==0 ){
-+-    if( nArg==2 ){
-+-      p->statsOn = booleanValue(azArg[1]);
-+-    }else if( nArg==1 ){
-+-      display_stats(p->db, p, 0);
-+-    }else{
-+-      raw_printf(stderr, "Usage: .stats ?on|off?\n");
-+-      rc = 1;
-+-    }
-+-  }else
-+-
-+-  if( (c=='t' && n>1 && strncmp(azArg[0], "tables", n)==0)
-+-   || (c=='i' && (strncmp(azArg[0], "indices", n)==0
-+-                 || strncmp(azArg[0], "indexes", n)==0) )
-+-  ){
-+-    sqlite3_stmt *pStmt;
-+-    char **azResult;
-+-    int nRow, nAlloc;
-+-    int ii;
-+-    ShellText s;
-+-    initText(&s);
-+-    open_db(p, 0);
-+-    rc = sqlite3_prepare_v2(p->db, "PRAGMA database_list", -1, &pStmt, 0);
-+-    if( rc ) return shellDatabaseError(p->db);
-+-
-+-    if( nArg>2 && c=='i' ){
-+-      /* It is an historical accident that the .indexes command shows an error
-+-      ** when called with the wrong number of arguments whereas the .tables
-+-      ** command does not. */
-+-      raw_printf(stderr, "Usage: .indexes ?LIKE-PATTERN?\n");
-+-      rc = 1;
-+-      goto meta_command_exit;
-+-    }
-+-    for(ii=0; sqlite3_step(pStmt)==SQLITE_ROW; ii++){
-+-      const char *zDbName = (const char*)sqlite3_column_text(pStmt, 1);
-+-      if( zDbName==0 ) continue;
-+-      if( s.z && s.z[0] ) appendText(&s, " UNION ALL ", 0);
-+-      if( sqlite3_stricmp(zDbName, "main")==0 ){
-+-        appendText(&s, "SELECT name FROM ", 0);
-+-      }else{
-+-        appendText(&s, "SELECT ", 0);
-+-        appendText(&s, zDbName, '\'');
-+-        appendText(&s, "||'.'||name FROM ", 0);
-+-      }
-+-      appendText(&s, zDbName, '"');
-+-      appendText(&s, ".sqlite_master ", 0);
-+-      if( c=='t' ){
-+-        appendText(&s," WHERE type IN ('table','view')"
-+-                      "   AND name NOT LIKE 'sqlite_%'"
-+-                      "   AND name LIKE ?1", 0);
-+-      }else{
-+-        appendText(&s," WHERE type='index'"
-+-                      "   AND tbl_name LIKE ?1", 0);
-+-      }
-+-    }
-+-    rc = sqlite3_finalize(pStmt);
-+-    appendText(&s, " ORDER BY 1", 0);
-+-    rc = sqlite3_prepare_v2(p->db, s.z, -1, &pStmt, 0);
-+-    freeText(&s);
-+-    if( rc ) return shellDatabaseError(p->db);
-+-
-+-    /* Run the SQL statement prepared by the above block. Store the results
-+-    ** as an array of nul-terminated strings in azResult[].  */
-+-    nRow = nAlloc = 0;
-+-    azResult = 0;
-+-    if( nArg>1 ){
-+-      sqlite3_bind_text(pStmt, 1, azArg[1], -1, SQLITE_TRANSIENT);
-+-    }else{
-+-      sqlite3_bind_text(pStmt, 1, "%", -1, SQLITE_STATIC);
-+-    }
-+-    while( sqlite3_step(pStmt)==SQLITE_ROW ){
-+-      if( nRow>=nAlloc ){
-+-        char **azNew;
-+-        int n2 = nAlloc*2 + 10;
-+-        azNew = sqlite3_realloc64(azResult, sizeof(azResult[0])*n2);
-+-        if( azNew==0 ){
-+-          rc = shellNomemError();
-+-          break;
-+-        }
-+-        nAlloc = n2;
-+-        azResult = azNew;
-+-      }
-+-      azResult[nRow] = sqlite3_mprintf("%s", sqlite3_column_text(pStmt, 0));
-+-      if( 0==azResult[nRow] ){
-+-        rc = shellNomemError();
-+-        break;
-+-      }
-+-      nRow++;
-+-    }
-+-    if( sqlite3_finalize(pStmt)!=SQLITE_OK ){
-+-      rc = shellDatabaseError(p->db);
-+-    }
-+-
-+-    /* Pretty-print the contents of array azResult[] to the output */
-+-    if( rc==0 && nRow>0 ){
-+-      int len, maxlen = 0;
-+-      int i, j;
-+-      int nPrintCol, nPrintRow;
-+-      for(i=0; i<nRow; i++){
-+-        len = strlen30(azResult[i]);
-+-        if( len>maxlen ) maxlen = len;
-+-      }
-+-      nPrintCol = 80/(maxlen+2);
-+-      if( nPrintCol<1 ) nPrintCol = 1;
-+-      nPrintRow = (nRow + nPrintCol - 1)/nPrintCol;
-+-      for(i=0; i<nPrintRow; i++){
-+-        for(j=i; j<nRow; j+=nPrintRow){
-+-          char *zSp = j<nPrintRow ? "" : "  ";
-+-          utf8_printf(p->out, "%s%-*s", zSp, maxlen,
-+-                      azResult[j] ? azResult[j]:"");
-+-        }
-+-        raw_printf(p->out, "\n");
-+-      }
-+-    }
-+-
-+-    for(ii=0; ii<nRow; ii++) sqlite3_free(azResult[ii]);
-+-    sqlite3_free(azResult);
-+-  }else
-+-
-+-  /* Begin redirecting output to the file "testcase-out.txt" */
-+-  if( c=='t' && strcmp(azArg[0],"testcase")==0 ){
-+-    output_reset(p);
-+-    p->out = output_file_open("testcase-out.txt");
-+-    if( p->out==0 ){
-+-      raw_printf(stderr, "Error: cannot open 'testcase-out.txt'\n");
-+-    }
-+-    if( nArg>=2 ){
-+-      sqlite3_snprintf(sizeof(p->zTestcase), p->zTestcase, "%s", azArg[1]);
-+-    }else{
-+-      sqlite3_snprintf(sizeof(p->zTestcase), p->zTestcase, "?");
-+-    }
-+-  }else
-+-
-+-#ifndef SQLITE_UNTESTABLE
-+-  if( c=='t' && n>=8 && strncmp(azArg[0], "testctrl", n)==0 && nArg>=2 ){
-+-    static const struct {
-+-       const char *zCtrlName;   /* Name of a test-control option */
-+-       int ctrlCode;            /* Integer code for that option */
-+-    } aCtrl[] = {
-+-      { "prng_save",             SQLITE_TESTCTRL_PRNG_SAVE              },
-+-      { "prng_restore",          SQLITE_TESTCTRL_PRNG_RESTORE           },
-+-      { "prng_reset",            SQLITE_TESTCTRL_PRNG_RESET             },
-+-      { "bitvec_test",           SQLITE_TESTCTRL_BITVEC_TEST            },
-+-      { "fault_install",         SQLITE_TESTCTRL_FAULT_INSTALL          },
-+-      { "benign_malloc_hooks",   SQLITE_TESTCTRL_BENIGN_MALLOC_HOOKS    },
-+-      { "pending_byte",          SQLITE_TESTCTRL_PENDING_BYTE           },
-+-      { "assert",                SQLITE_TESTCTRL_ASSERT                 },
-+-      { "always",                SQLITE_TESTCTRL_ALWAYS                 },
-+-      { "reserve",               SQLITE_TESTCTRL_RESERVE                },
-+-      { "optimizations",         SQLITE_TESTCTRL_OPTIMIZATIONS          },
-+-      { "iskeyword",             SQLITE_TESTCTRL_ISKEYWORD              },
-+-      { "scratchmalloc",         SQLITE_TESTCTRL_SCRATCHMALLOC          },
-+-      { "byteorder",             SQLITE_TESTCTRL_BYTEORDER              },
-+-      { "never_corrupt",         SQLITE_TESTCTRL_NEVER_CORRUPT          },
-+-      { "imposter",              SQLITE_TESTCTRL_IMPOSTER               },
-+-    };
-+-    int testctrl = -1;
-+-    int rc2 = 0;
-+-    int i, n2;
-+-    open_db(p, 0);
-+-
-+-    /* convert testctrl text option to value. allow any unique prefix
-+-    ** of the option name, or a numerical value. */
-+-    n2 = strlen30(azArg[1]);
-+-    for(i=0; i<ArraySize(aCtrl); i++){
-+-      if( strncmp(azArg[1], aCtrl[i].zCtrlName, n2)==0 ){
-+-        if( testctrl<0 ){
-+-          testctrl = aCtrl[i].ctrlCode;
-+-        }else{
-+-          utf8_printf(stderr, "ambiguous option name: \"%s\"\n", azArg[1]);
-+-          testctrl = -1;
-+-          break;
-+-        }
-+-      }
-+-    }
-+-    if( testctrl<0 ) testctrl = (int)integerValue(azArg[1]);
-+-    if( (testctrl<SQLITE_TESTCTRL_FIRST) || (testctrl>SQLITE_TESTCTRL_LAST) ){
-+-      utf8_printf(stderr,"Error: invalid testctrl option: %s\n", azArg[1]);
-+-    }else{
-+-      switch(testctrl){
-+-
-+-        /* sqlite3_test_control(int, db, int) */
-+-        case SQLITE_TESTCTRL_OPTIMIZATIONS:
-+-        case SQLITE_TESTCTRL_RESERVE:
-+-          if( nArg==3 ){
-+-            int opt = (int)strtol(azArg[2], 0, 0);
-+-            rc2 = sqlite3_test_control(testctrl, p->db, opt);
-+-            raw_printf(p->out, "%d (0x%08x)\n", rc2, rc2);
-+-          } else {
-+-            utf8_printf(stderr,"Error: testctrl %s takes a single int option\n",
-+-                    azArg[1]);
-+-          }
-+-          break;
-+-
-+-        /* sqlite3_test_control(int) */
-+-        case SQLITE_TESTCTRL_PRNG_SAVE:
-+-        case SQLITE_TESTCTRL_PRNG_RESTORE:
-+-        case SQLITE_TESTCTRL_PRNG_RESET:
-+-        case SQLITE_TESTCTRL_BYTEORDER:
-+-          if( nArg==2 ){
-+-            rc2 = sqlite3_test_control(testctrl);
-+-            raw_printf(p->out, "%d (0x%08x)\n", rc2, rc2);
-+-          } else {
-+-            utf8_printf(stderr,"Error: testctrl %s takes no options\n",
-+-                        azArg[1]);
-+-          }
-+-          break;
-+-
-+-        /* sqlite3_test_control(int, uint) */
-+-        case SQLITE_TESTCTRL_PENDING_BYTE:
-+-          if( nArg==3 ){
-+-            unsigned int opt = (unsigned int)integerValue(azArg[2]);
-+-            rc2 = sqlite3_test_control(testctrl, opt);
-+-            raw_printf(p->out, "%d (0x%08x)\n", rc2, rc2);
-+-          } else {
-+-            utf8_printf(stderr,"Error: testctrl %s takes a single unsigned"
-+-                           " int option\n", azArg[1]);
-+-          }
-+-          break;
-+-
-+-        /* sqlite3_test_control(int, int) */
-+-        case SQLITE_TESTCTRL_ASSERT:
-+-        case SQLITE_TESTCTRL_ALWAYS:
-+-        case SQLITE_TESTCTRL_NEVER_CORRUPT:
-+-          if( nArg==3 ){
-+-            int opt = booleanValue(azArg[2]);
-+-            rc2 = sqlite3_test_control(testctrl, opt);
-+-            raw_printf(p->out, "%d (0x%08x)\n", rc2, rc2);
-+-          } else {
-+-            utf8_printf(stderr,"Error: testctrl %s takes a single int option\n",
-+-                            azArg[1]);
-+-          }
-+-          break;
-+-
-+-        /* sqlite3_test_control(int, char *) */
-+-#ifdef SQLITE_N_KEYWORD
-+-        case SQLITE_TESTCTRL_ISKEYWORD:
-+-          if( nArg==3 ){
-+-            const char *opt = azArg[2];
-+-            rc2 = sqlite3_test_control(testctrl, opt);
-+-            raw_printf(p->out, "%d (0x%08x)\n", rc2, rc2);
-+-          } else {
-+-            utf8_printf(stderr,
-+-                        "Error: testctrl %s takes a single char * option\n",
-+-                        azArg[1]);
-+-          }
-+-          break;
-+-#endif
-+-
-+-        case SQLITE_TESTCTRL_IMPOSTER:
-+-          if( nArg==5 ){
-+-            rc2 = sqlite3_test_control(testctrl, p->db,
-+-                          azArg[2],
-+-                          integerValue(azArg[3]),
-+-                          integerValue(azArg[4]));
-+-            raw_printf(p->out, "%d (0x%08x)\n", rc2, rc2);
-+-          }else{
-+-            raw_printf(stderr,"Usage: .testctrl imposter dbName onoff tnum\n");
-+-          }
-+-          break;
-+-
-+-        case SQLITE_TESTCTRL_BITVEC_TEST:
-+-        case SQLITE_TESTCTRL_FAULT_INSTALL:
-+-        case SQLITE_TESTCTRL_BENIGN_MALLOC_HOOKS:
-+-        case SQLITE_TESTCTRL_SCRATCHMALLOC:
-+-        default:
-+-          utf8_printf(stderr,
-+-                      "Error: CLI support for testctrl %s not implemented\n",
-+-                      azArg[1]);
-+-          break;
-+-      }
-+-    }
-+-  }else
-+-#endif /* !defined(SQLITE_UNTESTABLE) */
-+-
-+-  if( c=='t' && n>4 && strncmp(azArg[0], "timeout", n)==0 ){
-+-    open_db(p, 0);
-+-    sqlite3_busy_timeout(p->db, nArg>=2 ? (int)integerValue(azArg[1]) : 0);
-+-  }else
-+-
-+-  if( c=='t' && n>=5 && strncmp(azArg[0], "timer", n)==0 ){
-+-    if( nArg==2 ){
-+-      enableTimer = booleanValue(azArg[1]);
-+-      if( enableTimer && !HAS_TIMER ){
-+-        raw_printf(stderr, "Error: timer not available on this system.\n");
-+-        enableTimer = 0;
-+-      }
-+-    }else{
-+-      raw_printf(stderr, "Usage: .timer on|off\n");
-+-      rc = 1;
-+-    }
-+-  }else
-+-
-+-  if( c=='t' && strncmp(azArg[0], "trace", n)==0 ){
-+-    open_db(p, 0);
-+-    if( nArg!=2 ){
-+-      raw_printf(stderr, "Usage: .trace FILE|off\n");
-+-      rc = 1;
-+-      goto meta_command_exit;
-+-    }
-+-    output_file_close(p->traceOut);
-+-    p->traceOut = output_file_open(azArg[1]);
-+-#if !defined(SQLITE_OMIT_TRACE) && !defined(SQLITE_OMIT_FLOATING_POINT)
-+-    if( p->traceOut==0 ){
-+-      sqlite3_trace_v2(p->db, 0, 0, 0);
-+-    }else{
-+-      sqlite3_trace_v2(p->db, SQLITE_TRACE_STMT, sql_trace_callback,p->traceOut);
-+-    }
-+-#endif
-+-  }else
-+-
-+-#if SQLITE_USER_AUTHENTICATION
-+-  if( c=='u' && strncmp(azArg[0], "user", n)==0 ){
-+-    if( nArg<2 ){
-+-      raw_printf(stderr, "Usage: .user SUBCOMMAND ...\n");
-+-      rc = 1;
-+-      goto meta_command_exit;
-+-    }
-+-    open_db(p, 0);
-+-    if( strcmp(azArg[1],"login")==0 ){
-+-      if( nArg!=4 ){
-+-        raw_printf(stderr, "Usage: .user login USER PASSWORD\n");
-+-        rc = 1;
-+-        goto meta_command_exit;
-+-      }
-+-      rc = sqlite3_user_authenticate(p->db, azArg[2], azArg[3],
-+-                                    (int)strlen(azArg[3]));
-+-      if( rc ){
-+-        utf8_printf(stderr, "Authentication failed for user %s\n", azArg[2]);
-+-        rc = 1;
-+-      }
-+-    }else if( strcmp(azArg[1],"add")==0 ){
-+-      if( nArg!=5 ){
-+-        raw_printf(stderr, "Usage: .user add USER PASSWORD ISADMIN\n");
-+-        rc = 1;
-+-        goto meta_command_exit;
-+-      }
-+-      rc = sqlite3_user_add(p->db, azArg[2],
-+-                            azArg[3], (int)strlen(azArg[3]),
-+-                            booleanValue(azArg[4]));
-+-      if( rc ){
-+-        raw_printf(stderr, "User-Add failed: %d\n", rc);
-+-        rc = 1;
-+-      }
-+-    }else if( strcmp(azArg[1],"edit")==0 ){
-+-      if( nArg!=5 ){
-+-        raw_printf(stderr, "Usage: .user edit USER PASSWORD ISADMIN\n");
-+-        rc = 1;
-+-        goto meta_command_exit;
-+-      }
-+-      rc = sqlite3_user_change(p->db, azArg[2],
-+-                              azArg[3], (int)strlen(azArg[3]),
-+-                              booleanValue(azArg[4]));
-+-      if( rc ){
-+-        raw_printf(stderr, "User-Edit failed: %d\n", rc);
-+-        rc = 1;
-+-      }
-+-    }else if( strcmp(azArg[1],"delete")==0 ){
-+-      if( nArg!=3 ){
-+-        raw_printf(stderr, "Usage: .user delete USER\n");
-+-        rc = 1;
-+-        goto meta_command_exit;
-+-      }
-+-      rc = sqlite3_user_delete(p->db, azArg[2]);
-+-      if( rc ){
-+-        raw_printf(stderr, "User-Delete failed: %d\n", rc);
-+-        rc = 1;
-+-      }
-+-    }else{
-+-      raw_printf(stderr, "Usage: .user login|add|edit|delete ...\n");
-+-      rc = 1;
-+-      goto meta_command_exit;
-+-    }
-+-  }else
-+-#endif /* SQLITE_USER_AUTHENTICATION */
-+-
-+-  if( c=='v' && strncmp(azArg[0], "version", n)==0 ){
-+-    utf8_printf(p->out, "SQLite %s %s\n" /*extra-version-info*/,
-+-        sqlite3_libversion(), sqlite3_sourceid());
-+-  }else
-+-
-+-  if( c=='v' && strncmp(azArg[0], "vfsinfo", n)==0 ){
-+-    const char *zDbName = nArg==2 ? azArg[1] : "main";
-+-    sqlite3_vfs *pVfs = 0;
-+-    if( p->db ){
-+-      sqlite3_file_control(p->db, zDbName, SQLITE_FCNTL_VFS_POINTER, &pVfs);
-+-      if( pVfs ){
-+-        utf8_printf(p->out, "vfs.zName      = \"%s\"\n", pVfs->zName);
-+-        raw_printf(p->out, "vfs.iVersion   = %d\n", pVfs->iVersion);
-+-        raw_printf(p->out, "vfs.szOsFile   = %d\n", pVfs->szOsFile);
-+-        raw_printf(p->out, "vfs.mxPathname = %d\n", pVfs->mxPathname);
-+-      }
-+-    }
-+-  }else
-+-
-+-  if( c=='v' && strncmp(azArg[0], "vfslist", n)==0 ){
-+-    sqlite3_vfs *pVfs;
-+-    sqlite3_vfs *pCurrent = 0;
-+-    if( p->db ){
-+-      sqlite3_file_control(p->db, "main", SQLITE_FCNTL_VFS_POINTER, &pCurrent);
-+-    }
-+-    for(pVfs=sqlite3_vfs_find(0); pVfs; pVfs=pVfs->pNext){
-+-      utf8_printf(p->out, "vfs.zName      = \"%s\"%s\n", pVfs->zName,
-+-           pVfs==pCurrent ? "  <--- CURRENT" : "");
-+-      raw_printf(p->out, "vfs.iVersion   = %d\n", pVfs->iVersion);
-+-      raw_printf(p->out, "vfs.szOsFile   = %d\n", pVfs->szOsFile);
-+-      raw_printf(p->out, "vfs.mxPathname = %d\n", pVfs->mxPathname);
-+-      if( pVfs->pNext ){
-+-        raw_printf(p->out, "-----------------------------------\n");
-+-      }
-+-    }
-+-  }else
-+-
-+-  if( c=='v' && strncmp(azArg[0], "vfsname", n)==0 ){
-+-    const char *zDbName = nArg==2 ? azArg[1] : "main";
-+-    char *zVfsName = 0;
-+-    if( p->db ){
-+-      sqlite3_file_control(p->db, zDbName, SQLITE_FCNTL_VFSNAME, &zVfsName);
-+-      if( zVfsName ){
-+-        utf8_printf(p->out, "%s\n", zVfsName);
-+-        sqlite3_free(zVfsName);
-+-      }
-+-    }
-+-  }else
-+-
-+-#if defined(SQLITE_DEBUG) && defined(SQLITE_ENABLE_WHERETRACE)
-+-  if( c=='w' && strncmp(azArg[0], "wheretrace", n)==0 ){
-+-    sqlite3WhereTrace = nArg>=2 ? booleanValue(azArg[1]) : 0xff;
-+-  }else
-+-#endif
-+-
-+-  if( c=='w' && strncmp(azArg[0], "width", n)==0 ){
-+-    int j;
-+-    assert( nArg<=ArraySize(azArg) );
-+-    for(j=1; j<nArg && j<ArraySize(p->colWidth); j++){
-+-      p->colWidth[j-1] = (int)integerValue(azArg[j]);
-+-    }
-+-  }else
-+-
-+-  {
-+-    utf8_printf(stderr, "Error: unknown command or invalid arguments: "
-+-      " \"%s\". Enter \".help\" for help\n", azArg[0]);
-+-    rc = 1;
-+-  }
-+-
-+-meta_command_exit:
-+-  if( p->outCount ){
-+-    p->outCount--;
-+-    if( p->outCount==0 ) output_reset(p);
-+-  }
-+-  return rc;
-+-}
-+-
-+-/*
-+-** Return TRUE if a semicolon occurs anywhere in the first N characters
-+-** of string z[].
-+-*/
-+-static int line_contains_semicolon(const char *z, int N){
-+-  int i;
-+-  for(i=0; i<N; i++){  if( z[i]==';' ) return 1; }
-+-  return 0;
-+-}
-+-
-+-/*
-+-** Test to see if a line consists entirely of whitespace.
-+-*/
-+-static int _all_whitespace(const char *z){
-+-  for(; *z; z++){
-+-    if( IsSpace(z[0]) ) continue;
-+-    if( *z=='/' && z[1]=='*' ){
-+-      z += 2;
-+-      while( *z && (*z!='*' || z[1]!='/') ){ z++; }
-+-      if( *z==0 ) return 0;
-+-      z++;
-+-      continue;
-+-    }
-+-    if( *z=='-' && z[1]=='-' ){
-+-      z += 2;
-+-      while( *z && *z!='\n' ){ z++; }
-+-      if( *z==0 ) return 1;
-+-      continue;
-+-    }
-+-    return 0;
-+-  }
-+-  return 1;
-+-}
-+-
-+-/*
-+-** Return TRUE if the line typed in is an SQL command terminator other
-+-** than a semi-colon.  The SQL Server style "go" command is understood
-+-** as is the Oracle "/".
-+-*/
-+-static int line_is_command_terminator(const char *zLine){
-+-  while( IsSpace(zLine[0]) ){ zLine++; };
-+-  if( zLine[0]=='/' && _all_whitespace(&zLine[1]) ){
-+-    return 1;  /* Oracle */
-+-  }
-+-  if( ToLower(zLine[0])=='g' && ToLower(zLine[1])=='o'
-+-         && _all_whitespace(&zLine[2]) ){
-+-    return 1;  /* SQL Server */
-+-  }
-+-  return 0;
-+-}
-+-
-+-/*
-+-** Return true if zSql is a complete SQL statement.  Return false if it
-+-** ends in the middle of a string literal or C-style comment.
-+-*/
-+-static int line_is_complete(char *zSql, int nSql){
-+-  int rc;
-+-  if( zSql==0 ) return 1;
-+-  zSql[nSql] = ';';
-+-  zSql[nSql+1] = 0;
-+-  rc = sqlite3_complete(zSql);
-+-  zSql[nSql] = 0;
-+-  return rc;
-+-}
-+-
-+-/*
-+-** Run a single line of SQL
-+-*/
-+-static int runOneSqlLine(ShellState *p, char *zSql, FILE *in, int startline){
-+-  int rc;
-+-  char *zErrMsg = 0;
-+-
-+-  open_db(p, 0);
-+-  if( ShellHasFlag(p,SHFLG_Backslash) ) resolve_backslashes(zSql);
-+-  BEGIN_TIMER;
-+-  rc = shell_exec(p->db, zSql, shell_callback, p, &zErrMsg);
-+-  END_TIMER;
-+-  if( rc || zErrMsg ){
-+-    char zPrefix[100];
-+-    if( in!=0 || !stdin_is_interactive ){
-+-      sqlite3_snprintf(sizeof(zPrefix), zPrefix,
-+-                       "Error: near line %d:", startline);
-+-    }else{
-+-      sqlite3_snprintf(sizeof(zPrefix), zPrefix, "Error:");
-+-    }
-+-    if( zErrMsg!=0 ){
-+-      utf8_printf(stderr, "%s %s\n", zPrefix, zErrMsg);
-+-      sqlite3_free(zErrMsg);
-+-      zErrMsg = 0;
-+-    }else{
-+-      utf8_printf(stderr, "%s %s\n", zPrefix, sqlite3_errmsg(p->db));
-+-    }
-+-    return 1;
-+-  }else if( ShellHasFlag(p, SHFLG_CountChanges) ){
-+-    raw_printf(p->out, "changes: %3d   total_changes: %d\n",
-+-            sqlite3_changes(p->db), sqlite3_total_changes(p->db));
-+-  }
-+-  return 0;
-+-}
-+-
-+-
-+-/*
-+-** Read input from *in and process it.  If *in==0 then input
-+-** is interactive - the user is typing it it.  Otherwise, input
-+-** is coming from a file or device.  A prompt is issued and history
-+-** is saved only if input is interactive.  An interrupt signal will
-+-** cause this routine to exit immediately, unless input is interactive.
-+-**
-+-** Return the number of errors.
-+-*/
-+-static int process_input(ShellState *p, FILE *in){
-+-  char *zLine = 0;          /* A single input line */
-+-  char *zSql = 0;           /* Accumulated SQL text */
-+-  int nLine;                /* Length of current line */
-+-  int nSql = 0;             /* Bytes of zSql[] used */
-+-  int nAlloc = 0;           /* Allocated zSql[] space */
-+-  int nSqlPrior = 0;        /* Bytes of zSql[] used by prior line */
-+-  int rc;                   /* Error code */
-+-  int errCnt = 0;           /* Number of errors seen */
-+-  int lineno = 0;           /* Current line number */
-+-  int startline = 0;        /* Line number for start of current input */
-+-
-+-  while( errCnt==0 || !bail_on_error || (in==0 && stdin_is_interactive) ){
-+-    fflush(p->out);
-+-    zLine = one_input_line(in, zLine, nSql>0);
-+-    if( zLine==0 ){
-+-      /* End of input */
-+-      if( in==0 && stdin_is_interactive ) printf("\n");
-+-      break;
-+-    }
-+-    if( seenInterrupt ){
-+-      if( in!=0 ) break;
-+-      seenInterrupt = 0;
-+-    }
-+-    lineno++;
-+-    if( nSql==0 && _all_whitespace(zLine) ){
-+-      if( ShellHasFlag(p, SHFLG_Echo) ) printf("%s\n", zLine);
-+-      continue;
-+-    }
-+-    if( zLine && zLine[0]=='.' && nSql==0 ){
-+-      if( ShellHasFlag(p, SHFLG_Echo) ) printf("%s\n", zLine);
-+-      rc = do_meta_command(zLine, p);
-+-      if( rc==2 ){ /* exit requested */
-+-        break;
-+-      }else if( rc ){
-+-        errCnt++;
-+-      }
-+-      continue;
-+-    }
-+-    if( line_is_command_terminator(zLine) && line_is_complete(zSql, nSql) ){
-+-      memcpy(zLine,";",2);
-+-    }
-+-    nLine = strlen30(zLine);
-+-    if( nSql+nLine+2>=nAlloc ){
-+-      nAlloc = nSql+nLine+100;
-+-      zSql = realloc(zSql, nAlloc);
-+-      if( zSql==0 ){
-+-        raw_printf(stderr, "Error: out of memory\n");
-+-        exit(1);
-+-      }
-+-    }
-+-    nSqlPrior = nSql;
-+-    if( nSql==0 ){
-+-      int i;
-+-      for(i=0; zLine[i] && IsSpace(zLine[i]); i++){}
-+-      assert( nAlloc>0 && zSql!=0 );
-+-      memcpy(zSql, zLine+i, nLine+1-i);
-+-      startline = lineno;
-+-      nSql = nLine-i;
-+-    }else{
-+-      zSql[nSql++] = '\n';
-+-      memcpy(zSql+nSql, zLine, nLine+1);
-+-      nSql += nLine;
-+-    }
-+-    if( nSql && line_contains_semicolon(&zSql[nSqlPrior], nSql-nSqlPrior)
-+-                && sqlite3_complete(zSql) ){
-+-      errCnt += runOneSqlLine(p, zSql, in, startline);
-+-      nSql = 0;
-+-      if( p->outCount ){
-+-        output_reset(p);
-+-        p->outCount = 0;
-+-      }
-+-    }else if( nSql && _all_whitespace(zSql) ){
-+-      if( ShellHasFlag(p, SHFLG_Echo) ) printf("%s\n", zSql);
-+-      nSql = 0;
-+-    }
-+-  }
-+-  if( nSql && !_all_whitespace(zSql) ){
-+-    runOneSqlLine(p, zSql, in, startline);
-+-  }
-+-  free(zSql);
-+-  free(zLine);
-+-  return errCnt>0;
-+-}
-+-
-+-/*
-+-** Return a pathname which is the user's home directory.  A
-+-** 0 return indicates an error of some kind.
-+-*/
-+-static char *find_home_dir(int clearFlag){
-+-  static char *home_dir = NULL;
-+-  if( clearFlag ){
-+-    free(home_dir);
-+-    home_dir = 0;
-+-    return 0;
-+-  }
-+-  if( home_dir ) return home_dir;
-+-
-+-#if !defined(_WIN32) && !defined(WIN32) && !defined(_WIN32_WCE) \
-+-     && !defined(__RTP__) && !defined(_WRS_KERNEL)
-+-  {
-+-    struct passwd *pwent;
-+-    uid_t uid = getuid();
-+-    if( (pwent=getpwuid(uid)) != NULL) {
-+-      home_dir = pwent->pw_dir;
-+-    }
-+-  }
-+-#endif
-+-
-+-#if defined(_WIN32_WCE)
-+-  /* Windows CE (arm-wince-mingw32ce-gcc) does not provide getenv()
-+-   */
-+-  home_dir = "/";
-+-#else
-+-
-+-#if defined(_WIN32) || defined(WIN32)
-+-  if (!home_dir) {
-+-    home_dir = getenv("USERPROFILE");
-+-  }
-+-#endif
-+-
-+-  if (!home_dir) {
-+-    home_dir = getenv("HOME");
-+-  }
-+-
-+-#if defined(_WIN32) || defined(WIN32)
-+-  if (!home_dir) {
-+-    char *zDrive, *zPath;
-+-    int n;
-+-    zDrive = getenv("HOMEDRIVE");
-+-    zPath = getenv("HOMEPATH");
-+-    if( zDrive && zPath ){
-+-      n = strlen30(zDrive) + strlen30(zPath) + 1;
-+-      home_dir = malloc( n );
-+-      if( home_dir==0 ) return 0;
-+-      sqlite3_snprintf(n, home_dir, "%s%s", zDrive, zPath);
-+-      return home_dir;
-+-    }
-+-    home_dir = "c:\\";
-+-  }
-+-#endif
-+-
-+-#endif /* !_WIN32_WCE */
-+-
-+-  if( home_dir ){
-+-    int n = strlen30(home_dir) + 1;
-+-    char *z = malloc( n );
-+-    if( z ) memcpy(z, home_dir, n);
-+-    home_dir = z;
-+-  }
-+-
-+-  return home_dir;
-+-}
-+-
-+-/*
-+-** Read input from the file given by sqliterc_override.  Or if that
-+-** parameter is NULL, take input from ~/.sqliterc
-+-**
-+-** Returns the number of errors.
-+-*/
-+-static void process_sqliterc(
-+-  ShellState *p,                  /* Configuration data */
-+-  const char *sqliterc_override   /* Name of config file. NULL to use default */
-+-){
-+-  char *home_dir = NULL;
-+-  const char *sqliterc = sqliterc_override;
-+-  char *zBuf = 0;
-+-  FILE *in = NULL;
-+-
-+-  if (sqliterc == NULL) {
-+-    home_dir = find_home_dir(0);
-+-    if( home_dir==0 ){
-+-      raw_printf(stderr, "-- warning: cannot find home directory;"
-+-                      " cannot read ~/.sqliterc\n");
-+-      return;
-+-    }
-+-    sqlite3_initialize();
-+-    zBuf = sqlite3_mprintf("%s/.sqliterc",home_dir);
-+-    sqliterc = zBuf;
-+-  }
-+-  in = fopen(sqliterc,"rb");
-+-  if( in ){
-+-    if( stdin_is_interactive ){
-+-      utf8_printf(stderr,"-- Loading resources from %s\n",sqliterc);
-+-    }
-+-    process_input(p,in);
-+-    fclose(in);
-+-  }
-+-  sqlite3_free(zBuf);
-+-}
-+-
-+-/*
-+-** Show available command line options
-+-*/
-+-static const char zOptions[] =
-+-  "   -ascii               set output mode to 'ascii'\n"
-+-  "   -bail                stop after hitting an error\n"
-+-  "   -batch               force batch I/O\n"
-+-  "   -column              set output mode to 'column'\n"
-+-  "   -cmd COMMAND         run \"COMMAND\" before reading stdin\n"
-+-  "   -csv                 set output mode to 'csv'\n"
-+-  "   -echo                print commands before execution\n"
-+-  "   -init FILENAME       read/process named file\n"
-+-  "   -[no]header          turn headers on or off\n"
-+-#if defined(SQLITE_ENABLE_MEMSYS3) || defined(SQLITE_ENABLE_MEMSYS5)
-+-  "   -heap SIZE           Size of heap for memsys3 or memsys5\n"
-+-#endif
-+-  "   -help                show this message\n"
-+-  "   -html                set output mode to HTML\n"
-+-  "   -interactive         force interactive I/O\n"
-+-  "   -line                set output mode to 'line'\n"
-+-  "   -list                set output mode to 'list'\n"
-+-  "   -lookaside SIZE N    use N entries of SZ bytes for lookaside memory\n"
-+-  "   -mmap N              default mmap size set to N\n"
-+-#ifdef SQLITE_ENABLE_MULTIPLEX
-+-  "   -multiplex           enable the multiplexor VFS\n"
-+-#endif
-+-  "   -newline SEP         set output row separator. Default: '\\n'\n"
-+-  "   -nullvalue TEXT      set text string for NULL values. Default ''\n"
-+-  "   -pagecache SIZE N    use N slots of SZ bytes each for page cache memory\n"
-+-  "   -quote               set output mode to 'quote'\n"
-+-  "   -scratch SIZE N      use N slots of SZ bytes each for scratch memory\n"
-+-  "   -separator SEP       set output column separator. Default: '|'\n"
-+-  "   -stats               print memory stats before each finalize\n"
-+-  "   -version             show SQLite version\n"
-+-  "   -vfs NAME            use NAME as the default VFS\n"
-+-#ifdef SQLITE_ENABLE_VFSTRACE
-+-  "   -vfstrace            enable tracing of all VFS calls\n"
-+-#endif
-+-;
-+-static void usage(int showDetail){
-+-  utf8_printf(stderr,
-+-      "Usage: %s [OPTIONS] FILENAME [SQL]\n"
-+-      "FILENAME is the name of an SQLite database. A new database is created\n"
-+-      "if the file does not previously exist.\n", Argv0);
-+-  if( showDetail ){
-+-    utf8_printf(stderr, "OPTIONS include:\n%s", zOptions);
-+-  }else{
-+-    raw_printf(stderr, "Use the -help option for additional information\n");
-+-  }
-+-  exit(1);
-+-}
-+-
-+-/*
-+-** Initialize the state information in data
-+-*/
-+-static void main_init(ShellState *data) {
-+-  memset(data, 0, sizeof(*data));
-+-  data->normalMode = data->cMode = data->mode = MODE_List;
-+-  data->autoExplain = 1;
-+-  memcpy(data->colSeparator,SEP_Column, 2);
-+-  memcpy(data->rowSeparator,SEP_Row, 2);
-+-  data->showHeader = 0;
-+-  data->shellFlgs = SHFLG_Lookaside;
-+-  sqlite3_config(SQLITE_CONFIG_URI, 1);
-+-  sqlite3_config(SQLITE_CONFIG_LOG, shellLog, data);
-+-  sqlite3_config(SQLITE_CONFIG_MULTITHREAD);
-+-  sqlite3_snprintf(sizeof(mainPrompt), mainPrompt,"sqlite> ");
-+-  sqlite3_snprintf(sizeof(continuePrompt), continuePrompt,"   ...> ");
-+-}
-+-
-+-/*
-+-** Output text to the console in a font that attracts extra attention.
-+-*/
-+-#ifdef _WIN32
-+-static void printBold(const char *zText){
-+-  HANDLE out = GetStdHandle(STD_OUTPUT_HANDLE);
-+-  CONSOLE_SCREEN_BUFFER_INFO defaultScreenInfo;
-+-  GetConsoleScreenBufferInfo(out, &defaultScreenInfo);
-+-  SetConsoleTextAttribute(out,
-+-         FOREGROUND_RED|FOREGROUND_INTENSITY
-+-  );
-+-  printf("%s", zText);
-+-  SetConsoleTextAttribute(out, defaultScreenInfo.wAttributes);
-+-}
-+-#else
-+-static void printBold(const char *zText){
-+-  printf("\033[1m%s\033[0m", zText);
-+-}
-+-#endif
-+-
-+-/*
-+-** Get the argument to an --option.  Throw an error and die if no argument
-+-** is available.
-+-*/
-+-static char *cmdline_option_value(int argc, char **argv, int i){
-+-  if( i==argc ){
-+-    utf8_printf(stderr, "%s: Error: missing argument to %s\n",
-+-            argv[0], argv[argc-1]);
-+-    exit(1);
-+-  }
-+-  return argv[i];
-+-}
-+-
-+-#ifndef SQLITE_SHELL_IS_UTF8
-+-#  if (defined(_WIN32) || defined(WIN32)) && defined(_MSC_VER)
-+-#    define SQLITE_SHELL_IS_UTF8          (0)
-+-#  else
-+-#    define SQLITE_SHELL_IS_UTF8          (1)
-+-#  endif
-+-#endif
-+-
-+-#if SQLITE_SHELL_IS_UTF8
-+-int SQLITE_CDECL main(int argc, char **argv){
-+-#else
-+-int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
-+-  char **argv;
-+-#endif
-+-  char *zErrMsg = 0;
-+-  ShellState data;
-+-  const char *zInitFile = 0;
-+-  int i;
-+-  int rc = 0;
-+-  int warnInmemoryDb = 0;
-+-  int readStdin = 1;
-+-  int nCmd = 0;
-+-  char **azCmd = 0;
-+-
-+-  setBinaryMode(stdin, 0);
-+-  setvbuf(stderr, 0, _IONBF, 0); /* Make sure stderr is unbuffered */
-+-  stdin_is_interactive = isatty(0);
-+-  stdout_is_console = isatty(1);
-+-
-+-#if USE_SYSTEM_SQLITE+0!=1
-+-  if( strcmp(sqlite3_sourceid(),SQLITE_SOURCE_ID)!=0 ){
-+-    utf8_printf(stderr, "SQLite header and source version mismatch\n%s\n%s\n",
-+-            sqlite3_sourceid(), SQLITE_SOURCE_ID);
-+-    exit(1);
-+-  }
-+-#endif
-+-  main_init(&data);
-+-#if !SQLITE_SHELL_IS_UTF8
-+-  sqlite3_initialize();
-+-  argv = sqlite3_malloc64(sizeof(argv[0])*argc);
-+-  if( argv==0 ){
-+-    raw_printf(stderr, "out of memory\n");
-+-    exit(1);
-+-  }
-+-  for(i=0; i<argc; i++){
-+-    argv[i] = sqlite3_win32_unicode_to_utf8(wargv[i]);
-+-    if( argv[i]==0 ){
-+-      raw_printf(stderr, "out of memory\n");
-+-      exit(1);
-+-    }
-+-  }
-+-#endif
-+-  assert( argc>=1 && argv && argv[0] );
-+-  Argv0 = argv[0];
-+-
-+-  /* Make sure we have a valid signal handler early, before anything
-+-  ** else is done.
-+-  */
-+-#ifdef SIGINT
-+-  signal(SIGINT, interrupt_handler);
-+-#endif
-+-
-+-#ifdef SQLITE_SHELL_DBNAME_PROC
-+-  {
-+-    /* If the SQLITE_SHELL_DBNAME_PROC macro is defined, then it is the name
-+-    ** of a C-function that will provide the name of the database file.  Use
-+-    ** this compile-time option to embed this shell program in larger
-+-    ** applications. */
-+-    extern void SQLITE_SHELL_DBNAME_PROC(const char**);
-+-    SQLITE_SHELL_DBNAME_PROC(&data.zDbFilename);
-+-    warnInmemoryDb = 0;
-+-  }
-+-#endif
-+-
-+-  /* Begin evanm patch. */
-+-#if !defined(__APPLE__)
-+-  extern int sqlite_shell_init_icu();
-+-  if( !sqlite_shell_init_icu() ){
-+-    fprintf(stderr, "%s: warning: couldn't find icudt38.dll; "
-+-                    "queries against ICU FTS tables will fail.\n", argv[0]);
-+-  }
-+-#endif /* !defined(__APPLE__) */
-+-  /* End evanm patch. */
-+-
-+-  /* Do an initial pass through the command-line argument to locate
-+-  ** the name of the database file, the name of the initialization file,
-+-  ** the size of the alternative malloc heap,
-+-  ** and the first command to execute.
-+-  */
-+-  for(i=1; i<argc; i++){
-+-    char *z;
-+-    z = argv[i];
-+-    if( z[0]!='-' ){
-+-      if( data.zDbFilename==0 ){
-+-        data.zDbFilename = z;
-+-      }else{
-+-        /* Excesss arguments are interpreted as SQL (or dot-commands) and
-+-        ** mean that nothing is read from stdin */
-+-        readStdin = 0;
-+-        nCmd++;
-+-        azCmd = realloc(azCmd, sizeof(azCmd[0])*nCmd);
-+-        if( azCmd==0 ){
-+-          raw_printf(stderr, "out of memory\n");
-+-          exit(1);
-+-        }
-+-        azCmd[nCmd-1] = z;
-+-      }
-+-    }
-+-    if( z[1]=='-' ) z++;
-+-    if( strcmp(z,"-separator")==0
-+-     || strcmp(z,"-nullvalue")==0
-+-     || strcmp(z,"-newline")==0
-+-     || strcmp(z,"-cmd")==0
-+-    ){
-+-      (void)cmdline_option_value(argc, argv, ++i);
-+-    }else if( strcmp(z,"-init")==0 ){
-+-      zInitFile = cmdline_option_value(argc, argv, ++i);
-+-    }else if( strcmp(z,"-batch")==0 ){
-+-      /* Need to check for batch mode here to so we can avoid printing
-+-      ** informational messages (like from process_sqliterc) before
-+-      ** we do the actual processing of arguments later in a second pass.
-+-      */
-+-      stdin_is_interactive = 0;
-+-    }else if( strcmp(z,"-heap")==0 ){
-+-#if defined(SQLITE_ENABLE_MEMSYS3) || defined(SQLITE_ENABLE_MEMSYS5)
-+-      const char *zSize;
-+-      sqlite3_int64 szHeap;
-+-
-+-      zSize = cmdline_option_value(argc, argv, ++i);
-+-      szHeap = integerValue(zSize);
-+-      if( szHeap>0x7fff0000 ) szHeap = 0x7fff0000;
-+-      sqlite3_config(SQLITE_CONFIG_HEAP, malloc((int)szHeap), (int)szHeap, 64);
-+-#else
-+-      (void)cmdline_option_value(argc, argv, ++i);
-+-#endif
-+-    }else if( strcmp(z,"-scratch")==0 ){
-+-      int n, sz;
-+-      sz = (int)integerValue(cmdline_option_value(argc,argv,++i));
-+-      if( sz>400000 ) sz = 400000;
-+-      if( sz<2500 ) sz = 2500;
-+-      n = (int)integerValue(cmdline_option_value(argc,argv,++i));
-+-      if( n>10 ) n = 10;
-+-      if( n<1 ) n = 1;
-+-      sqlite3_config(SQLITE_CONFIG_SCRATCH, malloc(n*sz+1), sz, n);
-+-      data.shellFlgs |= SHFLG_Scratch;
-+-    }else if( strcmp(z,"-pagecache")==0 ){
-+-      int n, sz;
-+-      sz = (int)integerValue(cmdline_option_value(argc,argv,++i));
-+-      if( sz>70000 ) sz = 70000;
-+-      if( sz<0 ) sz = 0;
-+-      n = (int)integerValue(cmdline_option_value(argc,argv,++i));
-+-      sqlite3_config(SQLITE_CONFIG_PAGECACHE,
-+-                    (n>0 && sz>0) ? malloc(n*sz) : 0, sz, n);
-+-      data.shellFlgs |= SHFLG_Pagecache;
-+-    }else if( strcmp(z,"-lookaside")==0 ){
-+-      int n, sz;
-+-      sz = (int)integerValue(cmdline_option_value(argc,argv,++i));
-+-      if( sz<0 ) sz = 0;
-+-      n = (int)integerValue(cmdline_option_value(argc,argv,++i));
-+-      if( n<0 ) n = 0;
-+-      sqlite3_config(SQLITE_CONFIG_LOOKASIDE, sz, n);
-+-      if( sz*n==0 ) data.shellFlgs &= ~SHFLG_Lookaside;
-+-#ifdef SQLITE_ENABLE_VFSTRACE
-+-    }else if( strcmp(z,"-vfstrace")==0 ){
-+-      extern int vfstrace_register(
-+-         const char *zTraceName,
-+-         const char *zOldVfsName,
-+-         int (*xOut)(const char*,void*),
-+-         void *pOutArg,
-+-         int makeDefault
-+-      );
-+-      vfstrace_register("trace",0,(int(*)(const char*,void*))fputs,stderr,1);
-+-#endif
-+-#ifdef SQLITE_ENABLE_MULTIPLEX
-+-    }else if( strcmp(z,"-multiplex")==0 ){
-+-      extern int sqlite3_multiple_initialize(const char*,int);
-+-      sqlite3_multiplex_initialize(0, 1);
-+-#endif
-+-    }else if( strcmp(z,"-mmap")==0 ){
-+-      sqlite3_int64 sz = integerValue(cmdline_option_value(argc,argv,++i));
-+-      sqlite3_config(SQLITE_CONFIG_MMAP_SIZE, sz, sz);
-+-    }else if( strcmp(z,"-vfs")==0 ){
-+-      sqlite3_vfs *pVfs = sqlite3_vfs_find(cmdline_option_value(argc,argv,++i));
-+-      if( pVfs ){
-+-        sqlite3_vfs_register(pVfs, 1);
-+-      }else{
-+-        utf8_printf(stderr, "no such VFS: \"%s\"\n", argv[i]);
-+-        exit(1);
-+-      }
-+-    }
-+-  }
-+-  if( data.zDbFilename==0 ){
-+-#ifndef SQLITE_OMIT_MEMORYDB
-+-    data.zDbFilename = ":memory:";
-+-    warnInmemoryDb = argc==1;
-+-#else
-+-    utf8_printf(stderr,"%s: Error: no database filename specified\n", Argv0);
-+-    return 1;
-+-#endif
-+-  }
-+-  data.out = stdout;
-+-
-+-  /* Go ahead and open the database file if it already exists.  If the
-+-  ** file does not exist, delay opening it.  This prevents empty database
-+-  ** files from being created if a user mistypes the database name argument
-+-  ** to the sqlite command-line tool.
-+-  */
-+-  if( access(data.zDbFilename, 0)==0 ){
-+-    open_db(&data, 0);
-+-  }
-+-
-+-  /* Process the initialization file if there is one.  If no -init option
-+-  ** is given on the command line, look for a file named ~/.sqliterc and
-+-  ** try to process it.
-+-  */
-+-  process_sqliterc(&data,zInitFile);
-+-
-+-  /* Make a second pass through the command-line argument and set
-+-  ** options.  This second pass is delayed until after the initialization
-+-  ** file is processed so that the command-line arguments will override
-+-  ** settings in the initialization file.
-+-  */
-+-  for(i=1; i<argc; i++){
-+-    char *z = argv[i];
-+-    if( z[0]!='-' ) continue;
-+-    if( z[1]=='-' ){ z++; }
-+-    if( strcmp(z,"-init")==0 ){
-+-      i++;
-+-    }else if( strcmp(z,"-html")==0 ){
-+-      data.mode = MODE_Html;
-+-    }else if( strcmp(z,"-list")==0 ){
-+-      data.mode = MODE_List;
-+-    }else if( strcmp(z,"-quote")==0 ){
-+-      data.mode = MODE_Quote;
-+-    }else if( strcmp(z,"-line")==0 ){
-+-      data.mode = MODE_Line;
-+-    }else if( strcmp(z,"-column")==0 ){
-+-      data.mode = MODE_Column;
-+-    }else if( strcmp(z,"-csv")==0 ){
-+-      data.mode = MODE_Csv;
-+-      memcpy(data.colSeparator,",",2);
-+-    }else if( strcmp(z,"-ascii")==0 ){
-+-      data.mode = MODE_Ascii;
-+-      sqlite3_snprintf(sizeof(data.colSeparator), data.colSeparator,
-+-                       SEP_Unit);
-+-      sqlite3_snprintf(sizeof(data.rowSeparator), data.rowSeparator,
-+-                       SEP_Record);
-+-    }else if( strcmp(z,"-separator")==0 ){
-+-      sqlite3_snprintf(sizeof(data.colSeparator), data.colSeparator,
-+-                       "%s",cmdline_option_value(argc,argv,++i));
-+-    }else if( strcmp(z,"-newline")==0 ){
-+-      sqlite3_snprintf(sizeof(data.rowSeparator), data.rowSeparator,
-+-                       "%s",cmdline_option_value(argc,argv,++i));
-+-    }else if( strcmp(z,"-nullvalue")==0 ){
-+-      sqlite3_snprintf(sizeof(data.nullValue), data.nullValue,
-+-                       "%s",cmdline_option_value(argc,argv,++i));
-+-    }else if( strcmp(z,"-header")==0 ){
-+-      data.showHeader = 1;
-+-    }else if( strcmp(z,"-noheader")==0 ){
-+-      data.showHeader = 0;
-+-    }else if( strcmp(z,"-echo")==0 ){
-+-      ShellSetFlag(&data, SHFLG_Echo);
-+-    }else if( strcmp(z,"-eqp")==0 ){
-+-      data.autoEQP = 1;
-+-    }else if( strcmp(z,"-eqpfull")==0 ){
-+-      data.autoEQP = 2;
-+-    }else if( strcmp(z,"-stats")==0 ){
-+-      data.statsOn = 1;
-+-    }else if( strcmp(z,"-scanstats")==0 ){
-+-      data.scanstatsOn = 1;
-+-    }else if( strcmp(z,"-backslash")==0 ){
-+-      /* Undocumented command-line option: -backslash
-+-      ** Causes C-style backslash escapes to be evaluated in SQL statements
-+-      ** prior to sending the SQL into SQLite.  Useful for injecting
-+-      ** crazy bytes in the middle of SQL statements for testing and debugging.
-+-      */
-+-      ShellSetFlag(&data, SHFLG_Backslash);
-+-    }else if( strcmp(z,"-bail")==0 ){
-+-      bail_on_error = 1;
-+-    }else if( strcmp(z,"-version")==0 ){
-+-      printf("%s %s\n", sqlite3_libversion(), sqlite3_sourceid());
-+-      return 0;
-+-    }else if( strcmp(z,"-interactive")==0 ){
-+-      stdin_is_interactive = 1;
-+-    }else if( strcmp(z,"-batch")==0 ){
-+-      stdin_is_interactive = 0;
-+-    }else if( strcmp(z,"-heap")==0 ){
-+-      i++;
-+-    }else if( strcmp(z,"-scratch")==0 ){
-+-      i+=2;
-+-    }else if( strcmp(z,"-pagecache")==0 ){
-+-      i+=2;
-+-    }else if( strcmp(z,"-lookaside")==0 ){
-+-      i+=2;
-+-    }else if( strcmp(z,"-mmap")==0 ){
-+-      i++;
-+-    }else if( strcmp(z,"-vfs")==0 ){
-+-      i++;
-+-#ifdef SQLITE_ENABLE_VFSTRACE
-+-    }else if( strcmp(z,"-vfstrace")==0 ){
-+-      i++;
-+-#endif
-+-#ifdef SQLITE_ENABLE_MULTIPLEX
-+-    }else if( strcmp(z,"-multiplex")==0 ){
-+-      i++;
-+-#endif
-+-    }else if( strcmp(z,"-help")==0 ){
-+-      usage(1);
-+-    }else if( strcmp(z,"-cmd")==0 ){
-+-      /* Run commands that follow -cmd first and separately from commands
-+-      ** that simply appear on the command-line.  This seems goofy.  It would
-+-      ** be better if all commands ran in the order that they appear.  But
-+-      ** we retain the goofy behavior for historical compatibility. */
-+-      if( i==argc-1 ) break;
-+-      z = cmdline_option_value(argc,argv,++i);
-+-      if( z[0]=='.' ){
-+-        rc = do_meta_command(z, &data);
-+-        if( rc && bail_on_error ) return rc==2 ? 0 : rc;
-+-      }else{
-+-        open_db(&data, 0);
-+-        rc = shell_exec(data.db, z, shell_callback, &data, &zErrMsg);
-+-        if( zErrMsg!=0 ){
-+-          utf8_printf(stderr,"Error: %s\n", zErrMsg);
-+-          if( bail_on_error ) return rc!=0 ? rc : 1;
-+-        }else if( rc!=0 ){
-+-          utf8_printf(stderr,"Error: unable to process SQL \"%s\"\n", z);
-+-          if( bail_on_error ) return rc;
-+-        }
-+-      }
-+-    }else{
-+-      utf8_printf(stderr,"%s: Error: unknown option: %s\n", Argv0, z);
-+-      raw_printf(stderr,"Use -help for a list of options.\n");
-+-      return 1;
-+-    }
-+-    data.cMode = data.mode;
-+-  }
-+-
-+-  if( !readStdin ){
-+-    /* Run all arguments that do not begin with '-' as if they were separate
-+-    ** command-line inputs, except for the argToSkip argument which contains
-+-    ** the database filename.
-+-    */
-+-    for(i=0; i<nCmd; i++){
-+-      if( azCmd[i][0]=='.' ){
-+-        rc = do_meta_command(azCmd[i], &data);
-+-        if( rc ) return rc==2 ? 0 : rc;
-+-      }else{
-+-        open_db(&data, 0);
-+-        rc = shell_exec(data.db, azCmd[i], shell_callback, &data, &zErrMsg);
-+-        if( zErrMsg!=0 ){
-+-          utf8_printf(stderr,"Error: %s\n", zErrMsg);
-+-          return rc!=0 ? rc : 1;
-+-        }else if( rc!=0 ){
-+-          utf8_printf(stderr,"Error: unable to process SQL: %s\n", azCmd[i]);
-+-          return rc;
-+-        }
-+-      }
-+-    }
-+-    free(azCmd);
-+-  }else{
-+-    /* Run commands received from standard input
-+-    */
-+-    if( stdin_is_interactive ){
-+-      char *zHome;
-+-      char *zHistory = 0;
-+-      int nHistory;
-+-      printf(
-+-        "SQLite version %s %.19s\n" /*extra-version-info*/
-+-        "Enter \".help\" for usage hints.\n",
-+-        sqlite3_libversion(), sqlite3_sourceid()
-+-      );
-+-      if( warnInmemoryDb ){
-+-        printf("Connected to a ");
-+-        printBold("transient in-memory database");
-+-        printf(".\nUse \".open FILENAME\" to reopen on a "
-+-               "persistent database.\n");
-+-      }
-+-      zHome = find_home_dir(0);
-+-      if( zHome ){
-+-        nHistory = strlen30(zHome) + 20;
-+-        if( (zHistory = malloc(nHistory))!=0 ){
-+-          sqlite3_snprintf(nHistory, zHistory,"%s/.sqlite_history", zHome);
-+-        }
-+-      }
-+-      if( zHistory ){ shell_read_history(zHistory); }
-+-#if HAVE_READLINE || HAVE_EDITLINE
-+-      rl_attempted_completion_function = readline_completion;
-+-#elif HAVE_LINENOISE
-+-      linenoiseSetCompletionCallback(linenoise_completion);
-+-#endif
-+-      rc = process_input(&data, 0);
-+-      if( zHistory ){
-+-        shell_stifle_history(2000);
-+-        shell_write_history(zHistory);
-+-        free(zHistory);
-+-      }
-+-    }else{
-+-      rc = process_input(&data, stdin);
-+-    }
-+-  }
-+-  set_table_name(&data, 0);
-+-  if( data.db ){
-+-    session_close_all(&data);
-+-    sqlite3_close(data.db);
-+-  }
-+-  sqlite3_free(data.zFreeOnClose);
-+-  find_home_dir(1);
-+-#if !SQLITE_SHELL_IS_UTF8
-+-  for(i=0; i<argc; i++) sqlite3_free(argv[i]);
-+-  sqlite3_free(argv);
-+-#endif
-+-  return rc;
-+-}
-+-
-+diff --git a/third_party/sqlite/src/src/shell.c.in b/third_party/sqlite/src/src/shell.c.in
-+index 4dac4a6..a500a19 100644
-+--- a/third_party/sqlite/src/src/shell.c.in
-++++ b/third_party/sqlite/src/src/shell.c.in
-+@@ -871,14 +871,13 @@ struct ShellState {
-+ /*
-+ ** These are the allowed shellFlgs values
-+ */
-+-#define SHFLG_Scratch        0x00000001 /* The --scratch option is used */
-+-#define SHFLG_Pagecache      0x00000002 /* The --pagecache option is used */
-+-#define SHFLG_Lookaside      0x00000004 /* Lookaside memory is used */
-+-#define SHFLG_Backslash      0x00000008 /* The --backslash option is used */
-+-#define SHFLG_PreserveRowid  0x00000010 /* .dump preserves rowid values */
-+-#define SHFLG_Newlines       0x00000020 /* .dump --newline flag */
-+-#define SHFLG_CountChanges   0x00000040 /* .changes setting */
-+-#define SHFLG_Echo           0x00000080 /* .echo or --echo setting */
-++#define SHFLG_Pagecache      0x00000001 /* The --pagecache option is used */
-++#define SHFLG_Lookaside      0x00000002 /* Lookaside memory is used */
-++#define SHFLG_Backslash      0x00000004 /* The --backslash option is used */
-++#define SHFLG_PreserveRowid  0x00000008 /* .dump preserves rowid values */
-++#define SHFLG_Newlines       0x00000010 /* .dump --newline flag */
-++#define SHFLG_CountChanges   0x00000020 /* .changes setting */
-++#define SHFLG_Echo           0x00000040 /* .echo or --echo setting */
-+ 
-+ /*
-+ ** Macros for testing and setting shellFlgs
-+@@ -1299,6 +1298,7 @@ static int shell_callback(
-+   int i;
-+   ShellState *p = (ShellState*)pArg;
-+ 
-++  if( azArg==0 ) return 0;
-+   switch( p->cMode ){
-+     case MODE_Line: {
-+       int w = 5;
-+@@ -1413,6 +1413,7 @@ static int shell_callback(
-+       for(i=0; IsSpace(z[i]); i++){}
-+       for(; (c = z[i])!=0; i++){
-+         if( IsSpace(c) ){
-++          if( z[j-1]=='\r' ) z[j-1] = '\n';
-+           if( IsSpace(z[j-1]) || z[j-1]=='(' ) continue;
-+         }else if( (c=='(' || c==')') && j>0 && IsSpace(z[j-1]) ){
-+           j--;
-+@@ -1649,6 +1650,7 @@ static int captureOutputCallback(void *pArg, int nArg, char **azArg, char **az){
-+   ShellText *p = (ShellText*)pArg;
-+   int i;
-+   UNUSED_PARAMETER(az);
-++  if( azArg==0 ) return 0;
-+   if( p->n ) appendText(p, "|", 0);
-+   for(i=0; i<nArg; i++){
-+     if( i ) appendText(p, ",", 0);
-+@@ -1713,7 +1715,7 @@ static void createSelftestTable(ShellState *p){
-+ */
-+ static void set_table_name(ShellState *p, const char *zName){
-+   int i, n;
-+-  int cQuote;
-++  char cQuote;
-+   char *z;
-+ 
-+   if( p->zDestTable ){
-+@@ -1895,18 +1897,10 @@ static int display_stats(
-+     }
-+     displayStatLine(pArg, "Number of Pcache Overflow Bytes:",
-+        "%lld (max %lld) bytes", SQLITE_STATUS_PAGECACHE_OVERFLOW, bReset);
-+-    if( pArg->shellFlgs & SHFLG_Scratch ){
-+-      displayStatLine(pArg, "Number of Scratch Allocations Used:",
-+-         "%lld (max %lld)", SQLITE_STATUS_SCRATCH_USED, bReset);
-+-    }
-+-    displayStatLine(pArg, "Number of Scratch Overflow Bytes:",
-+-       "%lld (max %lld) bytes", SQLITE_STATUS_SCRATCH_OVERFLOW, bReset);
-+     displayStatLine(pArg, "Largest Allocation:",
-+        "%lld bytes", SQLITE_STATUS_MALLOC_SIZE, bReset);
-+     displayStatLine(pArg, "Largest Pcache Allocation:",
-+        "%lld bytes", SQLITE_STATUS_PAGECACHE_SIZE, bReset);
-+-    displayStatLine(pArg, "Largest Scratch Allocation:",
-+-       "%lld bytes", SQLITE_STATUS_SCRATCH_SIZE, bReset);
-+ #ifdef YYTRACKMAXSTACKDEPTH
-+     displayStatLine(pArg, "Deepest Parser Stack:",
-+        "%lld (max %lld)", SQLITE_STATUS_PARSER_STACK, bReset);
-+@@ -2447,6 +2441,7 @@ static char **tableColumnList(ShellState *p, const char *zTab){
-+     }
-+   }
-+   sqlite3_finalize(pStmt);
-++  if( azCol==0 ) return 0;
-+   azCol[0] = 0;
-+   azCol[nCol+1] = 0;
-+ 
-+@@ -2530,7 +2525,7 @@ static int dump_callback(void *pArg, int nArg, char **azArg, char **azNotUsed){
-+   ShellState *p = (ShellState *)pArg;
-+ 
-+   UNUSED_PARAMETER(azNotUsed);
-+-  if( nArg!=3 ) return 1;
-++  if( nArg!=3 || azArg==0 ) return 0;
-+   zTable = azArg[0];
-+   zType = azArg[1];
-+   zSql = azArg[2];
-+@@ -3616,20 +3611,24 @@ static int shell_dbinfo_command(ShellState *p, int nArg, char **azArg){
-+      { "schema size:",
-+        "SELECT total(length(sql)) FROM %s" },
-+   };
-+-  sqlite3_file *pFile = 0;
-+   int i;
-+   char *zSchemaTab;
-+   char *zDb = nArg>=2 ? azArg[1] : "main";
-++  sqlite3_stmt *pStmt = 0;
-+   unsigned char aHdr[100];
-+   open_db(p, 0);
-+   if( p->db==0 ) return 1;
-+-  sqlite3_file_control(p->db, zDb, SQLITE_FCNTL_FILE_POINTER, &pFile);
-+-  if( pFile==0 || pFile->pMethods==0 || pFile->pMethods->xRead==0 ){
-+-    return 1;
-+-  }
-+-  i = pFile->pMethods->xRead(pFile, aHdr, 100, 0);
-+-  if( i!=SQLITE_OK ){
-++  sqlite3_prepare_v2(p->db,"SELECT data FROM sqlite_dbpage(?1) WHERE pgno=1",
-++                     -1, &pStmt, 0);
-++  sqlite3_bind_text(pStmt, 1, zDb, -1, SQLITE_STATIC);
-++  if( sqlite3_step(pStmt)==SQLITE_ROW
-++   && sqlite3_column_bytes(pStmt,0)>100
-++  ){
-++    memcpy(aHdr, sqlite3_column_blob(pStmt,0), 100);
-++    sqlite3_finalize(pStmt);
-++  }else{
-+     raw_printf(stderr, "unable to read database header\n");
-++    sqlite3_finalize(pStmt);
-+     return 1;
-+   }
-+   i = get2byteInt(aHdr+16);
-+@@ -4249,7 +4248,7 @@ static int do_meta_command(char *zLine, ShellState *p){
-+       utf8_printf(stderr,
-+                  "testcase-%s FAILED\n Expected: [%s]\n      Got: [%s]\n",
-+                  p->zTestcase, azArg[1], zRes);
-+-      rc = 2;
-++      rc = 1;
-+     }else{
-+       utf8_printf(stdout, "testcase-%s ok\n", p->zTestcase);
-+       p->nCheck++;
-+@@ -5927,7 +5926,6 @@ static int do_meta_command(char *zLine, ShellState *p){
-+       { "reserve",               SQLITE_TESTCTRL_RESERVE                },
-+       { "optimizations",         SQLITE_TESTCTRL_OPTIMIZATIONS          },
-+       { "iskeyword",             SQLITE_TESTCTRL_ISKEYWORD              },
-+-      { "scratchmalloc",         SQLITE_TESTCTRL_SCRATCHMALLOC          },
-+       { "byteorder",             SQLITE_TESTCTRL_BYTEORDER              },
-+       { "never_corrupt",         SQLITE_TESTCTRL_NEVER_CORRUPT          },
-+       { "imposter",              SQLITE_TESTCTRL_IMPOSTER               },
-+@@ -6040,7 +6038,6 @@ static int do_meta_command(char *zLine, ShellState *p){
-+         case SQLITE_TESTCTRL_BITVEC_TEST:
-+         case SQLITE_TESTCTRL_FAULT_INSTALL:
-+         case SQLITE_TESTCTRL_BENIGN_MALLOC_HOOKS:
-+-        case SQLITE_TESTCTRL_SCRATCHMALLOC:
-+         default:
-+           utf8_printf(stderr,
-+                       "Error: CLI support for testctrl %s not implemented\n",
-+@@ -6560,7 +6557,6 @@ static const char zOptions[] =
-+   "   -nullvalue TEXT      set text string for NULL values. Default ''\n"
-+   "   -pagecache SIZE N    use N slots of SZ bytes each for page cache memory\n"
-+   "   -quote               set output mode to 'quote'\n"
-+-  "   -scratch SIZE N      use N slots of SZ bytes each for scratch memory\n"
-+   "   -separator SEP       set output column separator. Default: '|'\n"
-+   "   -stats               print memory stats before each finalize\n"
-+   "   -version             show SQLite version\n"
-+@@ -6663,7 +6659,7 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
-+   stdout_is_console = isatty(1);
-+ 
-+ #if USE_SYSTEM_SQLITE+0!=1
-+-  if( strcmp(sqlite3_sourceid(),SQLITE_SOURCE_ID)!=0 ){
-++  if( strncmp(sqlite3_sourceid(),SQLITE_SOURCE_ID,60)!=0 ){
-+     utf8_printf(stderr, "SQLite header and source version mismatch\n%s\n%s\n",
-+             sqlite3_sourceid(), SQLITE_SOURCE_ID);
-+     exit(1);
-+@@ -6707,6 +6703,16 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
-+   }
-+ #endif
-+ 
-++  /* Begin evanm patch. */
-++#if !defined(__APPLE__)
-++  extern int sqlite_shell_init_icu();
-++  if( !sqlite_shell_init_icu() ){
-++    fprintf(stderr, "%s: warning: couldn't find icudt38.dll; "
-++                    "queries against ICU FTS tables will fail.\n", argv[0]);
-++  }
-++#endif /* !defined(__APPLE__) */
-++  /* End evanm patch. */
-++
-+   /* Do an initial pass through the command-line argument to locate
-+   ** the name of the database file, the name of the initialization file,
-+   ** the size of the alternative malloc heap,
-+@@ -6758,16 +6764,6 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
-+ #else
-+       (void)cmdline_option_value(argc, argv, ++i);
-+ #endif
-+-    }else if( strcmp(z,"-scratch")==0 ){
-+-      int n, sz;
-+-      sz = (int)integerValue(cmdline_option_value(argc,argv,++i));
-+-      if( sz>400000 ) sz = 400000;
-+-      if( sz<2500 ) sz = 2500;
-+-      n = (int)integerValue(cmdline_option_value(argc,argv,++i));
-+-      if( n>10 ) n = 10;
-+-      if( n<1 ) n = 1;
-+-      sqlite3_config(SQLITE_CONFIG_SCRATCH, malloc(n*sz+1), sz, n);
-+-      data.shellFlgs |= SHFLG_Scratch;
-+     }else if( strcmp(z,"-pagecache")==0 ){
-+       int n, sz;
-+       sz = (int)integerValue(cmdline_option_value(argc,argv,++i));
-+@@ -6911,8 +6907,6 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
-+       stdin_is_interactive = 0;
-+     }else if( strcmp(z,"-heap")==0 ){
-+       i++;
-+-    }else if( strcmp(z,"-scratch")==0 ){
-+-      i+=2;
-+     }else if( strcmp(z,"-pagecache")==0 ){
-+       i+=2;
-+     }else if( strcmp(z,"-lookaside")==0 ){
-+diff --git a/third_party/sqlite/src/src/sqlite.h.in b/third_party/sqlite/src/src/sqlite.h.in
-+index 2503d76..83b14ae7 100644
-+--- a/third_party/sqlite/src/src/sqlite.h.in
-++++ b/third_party/sqlite/src/src/sqlite.h.in
-+@@ -115,7 +115,9 @@ extern "C" {
-+ ** a string which identifies a particular check-in of SQLite
-+ ** within its configuration management system.  ^The SQLITE_SOURCE_ID
-+ ** string contains the date and time of the check-in (UTC) and a SHA1
-+-** or SHA3-256 hash of the entire source tree.
-++** or SHA3-256 hash of the entire source tree.  If the source code has
-++** been edited in any way since it was last checked in, then the last
-++** four hexadecimal digits of the hash may be modified.
-+ **
-+ ** See also: [sqlite3_libversion()],
-+ ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
-+@@ -139,7 +141,7 @@ extern "C" {
-+ **
-+ ** <blockquote><pre>
-+ ** assert( sqlite3_libversion_number()==SQLITE_VERSION_NUMBER );
-+-** assert( strcmp(sqlite3_sourceid(),SQLITE_SOURCE_ID)==0 );
-++** assert( strncmp(sqlite3_sourceid(),SQLITE_SOURCE_ID,80)==0 );
-+ ** assert( strcmp(sqlite3_libversion(),SQLITE_VERSION)==0 );
-+ ** </pre></blockquote>)^
-+ **
-+@@ -149,9 +151,11 @@ extern "C" {
-+ ** function is provided for use in DLLs since DLL users usually do not have
-+ ** direct access to string constants within the DLL.  ^The
-+ ** sqlite3_libversion_number() function returns an integer equal to
-+-** [SQLITE_VERSION_NUMBER].  ^The sqlite3_sourceid() function returns
-++** [SQLITE_VERSION_NUMBER].  ^(The sqlite3_sourceid() function returns
-+ ** a pointer to a string constant whose value is the same as the
-+-** [SQLITE_SOURCE_ID] C preprocessor macro.
-++** [SQLITE_SOURCE_ID] C preprocessor macro.  Except if SQLite is built
-++** using an edited copy of [the amalgamation], then the last four characters
-++** of the hash might be different from [SQLITE_SOURCE_ID].)^
-+ **
-+ ** See also: [sqlite_version()] and [sqlite_source_id()].
-+ */
-+@@ -432,7 +436,7 @@ int sqlite3_exec(
-+ #define SQLITE_FULL        13   /* Insertion failed because database is full */
-+ #define SQLITE_CANTOPEN    14   /* Unable to open the database file */
-+ #define SQLITE_PROTOCOL    15   /* Database lock protocol error */
-+-#define SQLITE_EMPTY       16   /* Not used */
-++#define SQLITE_EMPTY       16   /* Internal use only */
-+ #define SQLITE_SCHEMA      17   /* The database schema changed */
-+ #define SQLITE_TOOBIG      18   /* String or BLOB exceeds size limit */
-+ #define SQLITE_CONSTRAINT  19   /* Abort due to constraint violation */
-+@@ -494,6 +498,9 @@ int sqlite3_exec(
-+ #define SQLITE_IOERR_CONVPATH          (SQLITE_IOERR | (26<<8))
-+ #define SQLITE_IOERR_VNODE             (SQLITE_IOERR | (27<<8))
-+ #define SQLITE_IOERR_AUTH              (SQLITE_IOERR | (28<<8))
-++#define SQLITE_IOERR_BEGIN_ATOMIC      (SQLITE_IOERR | (29<<8))
-++#define SQLITE_IOERR_COMMIT_ATOMIC     (SQLITE_IOERR | (30<<8))
-++#define SQLITE_IOERR_ROLLBACK_ATOMIC   (SQLITE_IOERR | (31<<8))
-+ #define SQLITE_LOCKED_SHAREDCACHE      (SQLITE_LOCKED |  (1<<8))
-+ #define SQLITE_BUSY_RECOVERY           (SQLITE_BUSY   |  (1<<8))
-+ #define SQLITE_BUSY_SNAPSHOT           (SQLITE_BUSY   |  (2<<8))
-+@@ -580,6 +587,11 @@ int sqlite3_exec(
-+ ** SQLITE_IOCAP_IMMUTABLE flag indicates that the file is on
-+ ** read-only media and cannot be changed even by processes with
-+ ** elevated privileges.
-++**
-++** The SQLITE_IOCAP_BATCH_ATOMIC property means that the underlying
-++** filesystem supports doing multiple write operations atomically when those
-++** write operations are bracketed by [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE] and
-++** [SQLITE_FCNTL_COMMIT_ATOMIC_WRITE].
-+ */
-+ #define SQLITE_IOCAP_ATOMIC                 0x00000001
-+ #define SQLITE_IOCAP_ATOMIC512              0x00000002
-+@@ -595,6 +607,7 @@ int sqlite3_exec(
-+ #define SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN  0x00000800
-+ #define SQLITE_IOCAP_POWERSAFE_OVERWRITE    0x00001000
-+ #define SQLITE_IOCAP_IMMUTABLE              0x00002000
-++#define SQLITE_IOCAP_BATCH_ATOMIC           0x00004000
-+ 
-+ /*
-+ ** CAPI3REF: File Locking Levels
-+@@ -729,6 +742,7 @@ struct sqlite3_file {
-+ ** <li> [SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN]
-+ ** <li> [SQLITE_IOCAP_POWERSAFE_OVERWRITE]
-+ ** <li> [SQLITE_IOCAP_IMMUTABLE]
-++** <li> [SQLITE_IOCAP_BATCH_ATOMIC]
-+ ** </ul>
-+ **
-+ ** The SQLITE_IOCAP_ATOMIC property means that all writes of
-+@@ -1012,6 +1026,40 @@ struct sqlite3_io_methods {
-+ ** The [SQLITE_FCNTL_RBU] opcode is implemented by the special VFS used by
-+ ** the RBU extension only.  All other VFS should return SQLITE_NOTFOUND for
-+ ** this opcode.
-++**
-++** <li>[[SQLITE_FCNTL_BEGIN_ATOMIC_WRITE]]
-++** If the [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE] opcode returns SQLITE_OK, then
-++** the file descriptor is placed in "batch write mode", which
-++** means all subsequent write operations will be deferred and done
-++** atomically at the next [SQLITE_FCNTL_COMMIT_ATOMIC_WRITE].  Systems
-++** that do not support batch atomic writes will return SQLITE_NOTFOUND.
-++** ^Following a successful SQLITE_FCNTL_BEGIN_ATOMIC_WRITE and prior to
-++** the closing [SQLITE_FCNTL_COMMIT_ATOMIC_WRITE] or
-++** [SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE], SQLite will make
-++** no VFS interface calls on the same [sqlite3_file] file descriptor
-++** except for calls to the xWrite method and the xFileControl method
-++** with [SQLITE_FCNTL_SIZE_HINT].
-++**
-++** <li>[[SQLITE_FCNTL_COMMIT_ATOMIC_WRITE]]
-++** The [SQLITE_FCNTL_COMMIT_ATOMIC_WRITE] opcode causes all write
-++** operations since the previous successful call to
-++** [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE] to be performed atomically.
-++** This file control returns [SQLITE_OK] if and only if the writes were
-++** all performed successfully and have been committed to persistent storage.
-++** ^Regardless of whether or not it is successful, this file control takes
-++** the file descriptor out of batch write mode so that all subsequent
-++** write operations are independent.
-++** ^SQLite will never invoke SQLITE_FCNTL_COMMIT_ATOMIC_WRITE without
-++** a prior successful call to [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE].
-++**
-++** <li>[[SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE]]
-++** The [SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE] opcode causes all write
-++** operations since the previous successful call to
-++** [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE] to be rolled back.
-++** ^This file control takes the file descriptor out of batch write mode
-++** so that all subsequent write operations are independent.
-++** ^SQLite will never invoke SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE without
-++** a prior successful call to [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE].
-+ ** </ul>
-+ */
-+ #define SQLITE_FCNTL_LOCKSTATE               1
-+@@ -1043,6 +1091,9 @@ struct sqlite3_io_methods {
-+ #define SQLITE_FCNTL_JOURNAL_POINTER        28
-+ #define SQLITE_FCNTL_WIN32_GET_HANDLE       29
-+ #define SQLITE_FCNTL_PDB                    30
-++#define SQLITE_FCNTL_BEGIN_ATOMIC_WRITE     31
-++#define SQLITE_FCNTL_COMMIT_ATOMIC_WRITE    32
-++#define SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE  33
-+ 
-+ /* deprecated names */
-+ #define SQLITE_GET_LOCKPROXYFILE      SQLITE_FCNTL_GET_LOCKPROXYFILE
-+@@ -1613,6 +1664,16 @@ struct sqlite3_mem_methods {
-+ ** routines with a wrapper that simulations memory allocation failure or
-+ ** tracks memory usage, for example. </dd>
-+ **
-++** [[SQLITE_CONFIG_SMALL_MALLOC]] <dt>SQLITE_CONFIG_SMALL_MALLOC</dt>
-++** <dd> ^The SQLITE_CONFIG_SMALL_MALLOC option takes single argument of
-++** type int, interpreted as a boolean, which if true provides a hint to
-++** SQLite that it should avoid large memory allocations if possible.
-++** SQLite will run faster if it is free to make large memory allocations,
-++** but some application might prefer to run slower in exchange for
-++** guarantees about memory fragmentation that are possible if large
-++** allocations are avoided.  This hint is normally off.
-++** </dd>
-++**
-+ ** [[SQLITE_CONFIG_MEMSTATUS]] <dt>SQLITE_CONFIG_MEMSTATUS</dt>
-+ ** <dd> ^The SQLITE_CONFIG_MEMSTATUS option takes single argument of type int,
-+ ** interpreted as a boolean, which enables or disables the collection of
-+@@ -1630,25 +1691,7 @@ struct sqlite3_mem_methods {
-+ ** </dd>
-+ **
-+ ** [[SQLITE_CONFIG_SCRATCH]] <dt>SQLITE_CONFIG_SCRATCH</dt>
-+-** <dd> ^The SQLITE_CONFIG_SCRATCH option specifies a static memory buffer
-+-** that SQLite can use for scratch memory.  ^(There are three arguments
-+-** to SQLITE_CONFIG_SCRATCH:  A pointer an 8-byte
-+-** aligned memory buffer from which the scratch allocations will be
-+-** drawn, the size of each scratch allocation (sz),
-+-** and the maximum number of scratch allocations (N).)^
-+-** The first argument must be a pointer to an 8-byte aligned buffer
-+-** of at least sz*N bytes of memory.
-+-** ^SQLite will not use more than one scratch buffers per thread.
-+-** ^SQLite will never request a scratch buffer that is more than 6
-+-** times the database page size.
-+-** ^If SQLite needs needs additional
-+-** scratch memory beyond what is provided by this configuration option, then
-+-** [sqlite3_malloc()] will be used to obtain the memory needed.<p>
-+-** ^When the application provides any amount of scratch memory using
-+-** SQLITE_CONFIG_SCRATCH, SQLite avoids unnecessary large
-+-** [sqlite3_malloc|heap allocations].
-+-** This can help [Robson proof|prevent memory allocation failures] due to heap
-+-** fragmentation in low-memory embedded systems.
-++** <dd> The SQLITE_CONFIG_SCRATCH option is no longer used.
-+ ** </dd>
-+ **
-+ ** [[SQLITE_CONFIG_PAGECACHE]] <dt>SQLITE_CONFIG_PAGECACHE</dt>
-+@@ -1684,8 +1727,7 @@ struct sqlite3_mem_methods {
-+ ** [[SQLITE_CONFIG_HEAP]] <dt>SQLITE_CONFIG_HEAP</dt>
-+ ** <dd> ^The SQLITE_CONFIG_HEAP option specifies a static memory buffer
-+ ** that SQLite will use for all of its dynamic memory allocation needs
-+-** beyond those provided for by [SQLITE_CONFIG_SCRATCH] and
-+-** [SQLITE_CONFIG_PAGECACHE].
-++** beyond those provided for by [SQLITE_CONFIG_PAGECACHE].
-+ ** ^The SQLITE_CONFIG_HEAP option is only available if SQLite is compiled
-+ ** with either [SQLITE_ENABLE_MEMSYS3] or [SQLITE_ENABLE_MEMSYS5] and returns
-+ ** [SQLITE_ERROR] if invoked otherwise.
-+@@ -1878,7 +1920,7 @@ struct sqlite3_mem_methods {
-+ #define SQLITE_CONFIG_SERIALIZED    3  /* nil */
-+ #define SQLITE_CONFIG_MALLOC        4  /* sqlite3_mem_methods* */
-+ #define SQLITE_CONFIG_GETMALLOC     5  /* sqlite3_mem_methods* */
-+-#define SQLITE_CONFIG_SCRATCH       6  /* void*, int sz, int N */
-++#define SQLITE_CONFIG_SCRATCH       6  /* No longer used */
-+ #define SQLITE_CONFIG_PAGECACHE     7  /* void*, int sz, int N */
-+ #define SQLITE_CONFIG_HEAP          8  /* void*, int nByte, int min */
-+ #define SQLITE_CONFIG_MEMSTATUS     9  /* boolean */
-+@@ -1899,6 +1941,7 @@ struct sqlite3_mem_methods {
-+ #define SQLITE_CONFIG_PCACHE_HDRSZ        24  /* int *psz */
-+ #define SQLITE_CONFIG_PMASZ               25  /* unsigned int szPma */
-+ #define SQLITE_CONFIG_STMTJRNL_SPILL      26  /* int nByte */
-++#define SQLITE_CONFIG_SMALL_MALLOC        27  /* boolean */
-+ 
-+ /*
-+ ** CAPI3REF: Database Connection Configuration Options
-+@@ -3099,10 +3142,10 @@ void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);
-+ ** ^If [URI filename] interpretation is enabled, and the filename argument
-+ ** begins with "file:", then the filename is interpreted as a URI. ^URI
-+ ** filename interpretation is enabled if the [SQLITE_OPEN_URI] flag is
-+-** set in the fourth argument to sqlite3_open_v2(), or if it has
-++** set in the third argument to sqlite3_open_v2(), or if it has
-+ ** been enabled globally using the [SQLITE_CONFIG_URI] option with the
-+ ** [sqlite3_config()] method or by the [SQLITE_USE_URI] compile-time option.
-+-** As of SQLite version 3.7.7, URI filename interpretation is turned off
-++** URI filename interpretation is turned off
-+ ** by default, but future releases of SQLite might enable URI filename
-+ ** interpretation by default.  See "[URI filenames]" for additional
-+ ** information.
-+@@ -3776,8 +3819,9 @@ int sqlite3_stmt_busy(sqlite3_stmt*);
-+ ** implementation of [application-defined SQL functions] are protected.
-+ ** ^The sqlite3_value object returned by
-+ ** [sqlite3_column_value()] is unprotected.
-+-** Unprotected sqlite3_value objects may only be used with
-+-** [sqlite3_result_value()] and [sqlite3_bind_value()].
-++** Unprotected sqlite3_value objects may only be used as arguments
-++** to [sqlite3_result_value()], [sqlite3_bind_value()], and
-++** [sqlite3_value_dup()].
-+ ** The [sqlite3_value_blob | sqlite3_value_type()] family of
-+ ** interfaces require protected sqlite3_value objects.
-+ */
-+@@ -6200,15 +6244,20 @@ struct sqlite3_index_info {
-+ ** an operator that is part of a constraint term in the wHERE clause of
-+ ** a query that uses a [virtual table].
-+ */
-+-#define SQLITE_INDEX_CONSTRAINT_EQ      2
-+-#define SQLITE_INDEX_CONSTRAINT_GT      4
-+-#define SQLITE_INDEX_CONSTRAINT_LE      8
-+-#define SQLITE_INDEX_CONSTRAINT_LT     16
-+-#define SQLITE_INDEX_CONSTRAINT_GE     32
-+-#define SQLITE_INDEX_CONSTRAINT_MATCH  64
-+-#define SQLITE_INDEX_CONSTRAINT_LIKE   65
-+-#define SQLITE_INDEX_CONSTRAINT_GLOB   66
-+-#define SQLITE_INDEX_CONSTRAINT_REGEXP 67
-++#define SQLITE_INDEX_CONSTRAINT_EQ         2
-++#define SQLITE_INDEX_CONSTRAINT_GT         4
-++#define SQLITE_INDEX_CONSTRAINT_LE         8
-++#define SQLITE_INDEX_CONSTRAINT_LT        16
-++#define SQLITE_INDEX_CONSTRAINT_GE        32
-++#define SQLITE_INDEX_CONSTRAINT_MATCH     64
-++#define SQLITE_INDEX_CONSTRAINT_LIKE      65
-++#define SQLITE_INDEX_CONSTRAINT_GLOB      66
-++#define SQLITE_INDEX_CONSTRAINT_REGEXP    67
-++#define SQLITE_INDEX_CONSTRAINT_NE        68
-++#define SQLITE_INDEX_CONSTRAINT_ISNOT     69
-++#define SQLITE_INDEX_CONSTRAINT_ISNOTNULL 70
-++#define SQLITE_INDEX_CONSTRAINT_ISNULL    71
-++#define SQLITE_INDEX_CONSTRAINT_IS        72
-+ 
-+ /*
-+ ** CAPI3REF: Register A Virtual Table Implementation
-+@@ -6960,7 +7009,7 @@ int sqlite3_test_control(int op, ...);
-+ #define SQLITE_TESTCTRL_RESERVE                 14
-+ #define SQLITE_TESTCTRL_OPTIMIZATIONS           15
-+ #define SQLITE_TESTCTRL_ISKEYWORD               16
-+-#define SQLITE_TESTCTRL_SCRATCHMALLOC           17
-++#define SQLITE_TESTCTRL_SCRATCHMALLOC           17  /* NOT USED */
-+ #define SQLITE_TESTCTRL_LOCALTIME_FAULT         18
-+ #define SQLITE_TESTCTRL_EXPLAIN_STMT            19  /* NOT USED */
-+ #define SQLITE_TESTCTRL_ONCE_RESET_THRESHOLD    19
-+@@ -7019,8 +7068,7 @@ int sqlite3_status64(
-+ ** <dd>This parameter is the current amount of memory checked out
-+ ** using [sqlite3_malloc()], either directly or indirectly.  The
-+ ** figure includes calls made to [sqlite3_malloc()] by the application
-+-** and internal memory usage by the SQLite library.  Scratch memory
-+-** controlled by [SQLITE_CONFIG_SCRATCH] and auxiliary page-cache
-++** and internal memory usage by the SQLite library.  Auxiliary page-cache
-+ ** memory controlled by [SQLITE_CONFIG_PAGECACHE] is not included in
-+ ** this parameter.  The amount returned is the sum of the allocation
-+ ** sizes as reported by the xSize method in [sqlite3_mem_methods].</dd>)^
-+@@ -7058,29 +7106,14 @@ int sqlite3_status64(
-+ ** *pHighwater parameter to [sqlite3_status()] is of interest.
-+ ** The value written into the *pCurrent parameter is undefined.</dd>)^
-+ **
-+-** [[SQLITE_STATUS_SCRATCH_USED]] ^(<dt>SQLITE_STATUS_SCRATCH_USED</dt>
-+-** <dd>This parameter returns the number of allocations used out of the
-+-** [scratch memory allocator] configured using
-+-** [SQLITE_CONFIG_SCRATCH].  The value returned is in allocations, not
-+-** in bytes.  Since a single thread may only have one scratch allocation
-+-** outstanding at time, this parameter also reports the number of threads
-+-** using scratch memory at the same time.</dd>)^
-++** [[SQLITE_STATUS_SCRATCH_USED]] <dt>SQLITE_STATUS_SCRATCH_USED</dt>
-++** <dd>No longer used.</dd>
-+ **
-+ ** [[SQLITE_STATUS_SCRATCH_OVERFLOW]] ^(<dt>SQLITE_STATUS_SCRATCH_OVERFLOW</dt>
-+-** <dd>This parameter returns the number of bytes of scratch memory
-+-** allocation which could not be satisfied by the [SQLITE_CONFIG_SCRATCH]
-+-** buffer and where forced to overflow to [sqlite3_malloc()].  The values
-+-** returned include overflows because the requested allocation was too
-+-** larger (that is, because the requested allocation was larger than the
-+-** "sz" parameter to [SQLITE_CONFIG_SCRATCH]) and because no scratch buffer
-+-** slots were available.
-+-** </dd>)^
-+-**
-+-** [[SQLITE_STATUS_SCRATCH_SIZE]] ^(<dt>SQLITE_STATUS_SCRATCH_SIZE</dt>
-+-** <dd>This parameter records the largest memory allocation request
-+-** handed to [scratch memory allocator].  Only the value returned in the
-+-** *pHighwater parameter to [sqlite3_status()] is of interest.
-+-** The value written into the *pCurrent parameter is undefined.</dd>)^
-++** <dd>No longer used.</dd>
-++**
-++** [[SQLITE_STATUS_SCRATCH_SIZE]] <dt>SQLITE_STATUS_SCRATCH_SIZE</dt>
-++** <dd>No longer used.</dd>
-+ **
-+ ** [[SQLITE_STATUS_PARSER_STACK]] ^(<dt>SQLITE_STATUS_PARSER_STACK</dt>
-+ ** <dd>The *pHighwater parameter records the deepest parser stack.
-+@@ -7093,12 +7126,12 @@ int sqlite3_status64(
-+ #define SQLITE_STATUS_MEMORY_USED          0
-+ #define SQLITE_STATUS_PAGECACHE_USED       1
-+ #define SQLITE_STATUS_PAGECACHE_OVERFLOW   2
-+-#define SQLITE_STATUS_SCRATCH_USED         3
-+-#define SQLITE_STATUS_SCRATCH_OVERFLOW     4
-++#define SQLITE_STATUS_SCRATCH_USED         3  /* NOT USED */
-++#define SQLITE_STATUS_SCRATCH_OVERFLOW     4  /* NOT USED */
-+ #define SQLITE_STATUS_MALLOC_SIZE          5
-+ #define SQLITE_STATUS_PARSER_STACK         6
-+ #define SQLITE_STATUS_PAGECACHE_SIZE       7
-+-#define SQLITE_STATUS_SCRATCH_SIZE         8
-++#define SQLITE_STATUS_SCRATCH_SIZE         8  /* NOT USED */
-+ #define SQLITE_STATUS_MALLOC_COUNT         9
-+ 
-+ /*
-+diff --git a/third_party/sqlite/src/src/sqlite3ext.h b/third_party/sqlite/src/src/sqlite3ext.h
-+index a1abac8..bafb104 100644
-+--- a/third_party/sqlite/src/src/sqlite3ext.h
-++++ b/third_party/sqlite/src/src/sqlite3ext.h
-+@@ -134,7 +134,7 @@ struct sqlite3_api_routines {
-+   int  (*set_authorizer)(sqlite3*,int(*)(void*,int,const char*,const char*,
-+                          const char*,const char*),void*);
-+   void  (*set_auxdata)(sqlite3_context*,int,void*,void (*)(void*));
-+-  char * (*snprintf)(int,char*,const char*,...);
-++  char * (*xsnprintf)(int,char*,const char*,...);
-+   int  (*step)(sqlite3_stmt*);
-+   int  (*table_column_metadata)(sqlite3*,const char*,const char*,const char*,
-+                                 char const**,char const**,int*,int*,int*);
-+@@ -246,7 +246,7 @@ struct sqlite3_api_routines {
-+   int (*uri_boolean)(const char*,const char*,int);
-+   sqlite3_int64 (*uri_int64)(const char*,const char*,sqlite3_int64);
-+   const char *(*uri_parameter)(const char*,const char*);
-+-  char *(*vsnprintf)(int,char*,const char*,va_list);
-++  char *(*xvsnprintf)(int,char*,const char*,va_list);
-+   int (*wal_checkpoint_v2)(sqlite3*,const char*,int,int*,int*);
-+   /* Version 3.8.7 and later */
-+   int (*auto_extension)(void(*)(void));
-+@@ -418,7 +418,7 @@ typedef int (*sqlite3_loadext_entry)(
-+ #define sqlite3_rollback_hook          sqlite3_api->rollback_hook
-+ #define sqlite3_set_authorizer         sqlite3_api->set_authorizer
-+ #define sqlite3_set_auxdata            sqlite3_api->set_auxdata
-+-#define sqlite3_snprintf               sqlite3_api->snprintf
-++#define sqlite3_snprintf               sqlite3_api->xsnprintf
-+ #define sqlite3_step                   sqlite3_api->step
-+ #define sqlite3_table_column_metadata  sqlite3_api->table_column_metadata
-+ #define sqlite3_thread_cleanup         sqlite3_api->thread_cleanup
-+@@ -442,7 +442,7 @@ typedef int (*sqlite3_loadext_entry)(
-+ #define sqlite3_value_text16le         sqlite3_api->value_text16le
-+ #define sqlite3_value_type             sqlite3_api->value_type
-+ #define sqlite3_vmprintf               sqlite3_api->vmprintf
-+-#define sqlite3_vsnprintf              sqlite3_api->vsnprintf
-++#define sqlite3_vsnprintf              sqlite3_api->xvsnprintf
-+ #define sqlite3_overload_function      sqlite3_api->overload_function
-+ #define sqlite3_prepare_v2             sqlite3_api->prepare_v2
-+ #define sqlite3_prepare16_v2           sqlite3_api->prepare16_v2
-+@@ -518,7 +518,7 @@ typedef int (*sqlite3_loadext_entry)(
-+ #define sqlite3_uri_boolean            sqlite3_api->uri_boolean
-+ #define sqlite3_uri_int64              sqlite3_api->uri_int64
-+ #define sqlite3_uri_parameter          sqlite3_api->uri_parameter
-+-#define sqlite3_uri_vsnprintf          sqlite3_api->vsnprintf
-++#define sqlite3_uri_vsnprintf          sqlite3_api->xvsnprintf
-+ #define sqlite3_wal_checkpoint_v2      sqlite3_api->wal_checkpoint_v2
-+ /* Version 3.8.7 and later */
-+ #define sqlite3_auto_extension         sqlite3_api->auto_extension
-+diff --git a/third_party/sqlite/src/src/sqliteInt.h b/third_party/sqlite/src/src/sqliteInt.h
-+index fcbcf8bb..d68da5a 100644
-+--- a/third_party/sqlite/src/src/sqliteInt.h
-++++ b/third_party/sqlite/src/src/sqliteInt.h
-+@@ -51,17 +51,6 @@
-+ #endif
-+ 
-+ /*
-+-** Make sure that rand_s() is available on Windows systems with MSVC 2005
-+-** or higher.
-+-*/
-+-#if defined(_MSC_VER) && _MSC_VER>=1400
-+-/* TODO(shess): Already defined by build/config/win/BUILD.gn */
-+-#ifndef _CRT_RAND_S
-+-#  define _CRT_RAND_S
-+-#endif
-+-#endif
-+-
-+-/*
-+ ** Include the header file used to customize the compiler options for MSVC.
-+ ** This should be done first so that it can successfully prevent spurious
-+ ** compiler warnings due to subsequent content in this file and other files
-+@@ -458,6 +447,21 @@
-+ #endif
-+ 
-+ /*
-++** Some conditionals are optimizations only.  In other words, if the
-++** conditionals are replaced with a constant 1 (true) or 0 (false) then
-++** the correct answer is still obtained, though perhaps not as quickly.
-++**
-++** The following macros mark these optimizations conditionals.
-++*/
-++#if defined(SQLITE_MUTATION_TEST)
-++# define OK_IF_ALWAYS_TRUE(X)  (1)
-++# define OK_IF_ALWAYS_FALSE(X) (0)
-++#else
-++# define OK_IF_ALWAYS_TRUE(X)  (X)
-++# define OK_IF_ALWAYS_FALSE(X) (X)
-++#endif
-++
-++/*
-+ ** Some malloc failures are only possible if SQLITE_TEST_REALLOC_STRESS is
-+ ** defined.  We need to defend against those failures when testing with
-+ ** SQLITE_TEST_REALLOC_STRESS, but we don't want the unreachable branches
-+@@ -634,6 +638,15 @@
-+ #endif
-+ 
-+ /*
-++** The compile-time options SQLITE_MMAP_READWRITE and
-++** SQLITE_ENABLE_BATCH_ATOMIC_WRITE are not compatible with one another.
-++** You must choose one or the other (or neither) but not both.
-++*/
-++#if defined(SQLITE_MMAP_READWRITE) && defined(SQLITE_ENABLE_BATCH_ATOMIC_WRITE)
-++#error Cannot use both SQLITE_MMAP_READWRITE and SQLITE_ENABLE_BATCH_ATOMIC_WRITE
-++#endif
-++
-++/*
-+ ** GCC does not define the offsetof() macro so we'll have to do it
-+ ** ourselves.
-+ */
-+@@ -931,7 +944,7 @@ typedef INT16_TYPE LogEst;
-+ ** SELECTTRACE_ENABLED will be either 1 or 0 depending on whether or not
-+ ** the Select query generator tracing logic is turned on.
-+ */
-+-#if defined(SQLITE_DEBUG) || defined(SQLITE_ENABLE_SELECTTRACE)
-++#if defined(SQLITE_ENABLE_SELECTTRACE)
-+ # define SELECTTRACE_ENABLED 1
-+ #else
-+ # define SELECTTRACE_ENABLED 0
-+@@ -1207,6 +1220,7 @@ struct Schema {
-+ #define DB_SchemaLoaded    0x0001  /* The schema has been loaded */
-+ #define DB_UnresetViews    0x0002  /* Some views have defined column names */
-+ #define DB_Empty           0x0004  /* The file is empty (length 0 bytes) */
-++#define DB_ResetWanted     0x0008  /* Reset the schema when nSchemaLock==0 */
-+ 
-+ /*
-+ ** The number of different kinds of things that can be limited
-+@@ -1238,9 +1252,9 @@ struct Lookaside {
-+   u32 bDisable;           /* Only operate the lookaside when zero */
-+   u16 sz;                 /* Size of each buffer in bytes */
-+   u8 bMalloced;           /* True if pStart obtained from sqlite3_malloc() */
-+-  int nOut;               /* Number of buffers currently checked out */
-+-  int mxOut;              /* Highwater mark for nOut */
-+-  int anStat[3];          /* 0: hits.  1: size misses.  2: full misses */
-++  u32 nSlot;              /* Number of lookaside slots allocated */
-++  u32 anStat[3];          /* 0: hits.  1: size misses.  2: full misses */
-++  LookasideSlot *pInit;   /* List of buffers not previously used */
-+   LookasideSlot *pFree;   /* List of available buffers */
-+   void *pStart;           /* First byte of available memory space */
-+   void *pEnd;             /* First byte past end of available space */
-+@@ -1319,9 +1333,11 @@ struct sqlite3 {
-+   sqlite3_mutex *mutex;         /* Connection mutex */
-+   Db *aDb;                      /* All backends */
-+   int nDb;                      /* Number of backends currently in use */
-+-  int flags;                    /* Miscellaneous flags. See below */
-++  u32 mDbFlags;                 /* flags recording internal state */
-++  u32 flags;                    /* flags settable by pragmas. See below */
-+   i64 lastRowid;                /* ROWID of most recent insert (see above) */
-+   i64 szMmap;                   /* Default mmap_size setting */
-++  u32 nSchemaLock;              /* Do not reset the schema when non-zero */
-+   unsigned int openFlags;       /* Flags passed to sqlite3_vfs.xOpen() */
-+   int errCode;                  /* Most recent error code (SQLITE_*) */
-+   int errMask;                  /* & result codes with this before returning */
-+@@ -1473,18 +1489,13 @@ struct sqlite3 {
-+ #define SQLITE_ForeignKeys    0x00004000  /* Enforce foreign key constraints  */
-+ #define SQLITE_AutoIndex      0x00008000  /* Enable automatic indexes */
-+ #define SQLITE_LoadExtension  0x00010000  /* Enable load_extension */
-+-#define SQLITE_EnableTrigger  0x00020000  /* True to enable triggers */
-+-#define SQLITE_DeferFKs       0x00040000  /* Defer all FK constraints */
-+-#define SQLITE_QueryOnly      0x00080000  /* Disable database changes */
-+-#define SQLITE_CellSizeCk     0x00100000  /* Check btree cell sizes on load */
-+-#define SQLITE_Fts3Tokenizer  0x00200000  /* Enable fts3_tokenizer(2) */
-+-#define SQLITE_EnableQPSG     0x00400000  /* Query Planner Stability Guarantee */
-+-/* The next four values are not used by PRAGMAs or by sqlite3_dbconfig() and
-+-** could be factored out into a separate bit vector of the sqlite3 object. */
-+-#define SQLITE_InternChanges  0x00800000  /* Uncommitted Hash table changes */
-+-#define SQLITE_LoadExtFunc    0x01000000  /* Enable load_extension() SQL func */
-+-#define SQLITE_PreferBuiltin  0x02000000  /* Preference to built-in funcs */
-+-#define SQLITE_Vacuum         0x04000000  /* Currently in a VACUUM */
-++#define SQLITE_LoadExtFunc    0x00020000  /* Enable load_extension() SQL func */
-++#define SQLITE_EnableTrigger  0x00040000  /* True to enable triggers */
-++#define SQLITE_DeferFKs       0x00080000  /* Defer all FK constraints */
-++#define SQLITE_QueryOnly      0x00100000  /* Disable database changes */
-++#define SQLITE_CellSizeCk     0x00200000  /* Check btree cell sizes on load */
-++#define SQLITE_Fts3Tokenizer  0x00400000  /* Enable fts3_tokenizer(2) */
-++#define SQLITE_EnableQPSG     0x00800000  /* Query Planner Stability Guarantee */
-+ /* Flags used only if debugging */
-+ #ifdef SQLITE_DEBUG
-+ #define SQLITE_SqlTrace       0x08000000  /* Debug print SQL as it executes */
-+@@ -1494,6 +1505,12 @@ struct sqlite3 {
-+ #define SQLITE_VdbeEQP        0x80000000  /* Debug EXPLAIN QUERY PLAN */
-+ #endif
-+ 
-++/*
-++** Allowed values for sqlite3.mDbFlags
-++*/
-++#define DBFLAG_SchemaChange   0x0001  /* Uncommitted Hash table changes */
-++#define DBFLAG_PreferBuiltin  0x0002  /* Preference to built-in funcs */
-++#define DBFLAG_Vacuum         0x0004  /* Currently in a VACUUM */
-+ 
-+ /*
-+ ** Bits of the sqlite3.dbOptFlags field that are used by the
-+@@ -1504,16 +1521,15 @@ struct sqlite3 {
-+ #define SQLITE_ColumnCache    0x0002   /* Column cache */
-+ #define SQLITE_GroupByOrder   0x0004   /* GROUPBY cover of ORDERBY */
-+ #define SQLITE_FactorOutConst 0x0008   /* Constant factoring */
-+-/*                not used    0x0010   // Was: SQLITE_IdxRealAsInt */
-+-#define SQLITE_DistinctOpt    0x0020   /* DISTINCT using indexes */
-+-#define SQLITE_CoverIdxScan   0x0040   /* Covering index scans */
-+-#define SQLITE_OrderByIdxJoin 0x0080   /* ORDER BY of joins via index */
-+-#define SQLITE_SubqCoroutine  0x0100   /* Evaluate subqueries as coroutines */
-+-#define SQLITE_Transitive     0x0200   /* Transitive constraints */
-+-#define SQLITE_OmitNoopJoin   0x0400   /* Omit unused tables in joins */
-++#define SQLITE_DistinctOpt    0x0010   /* DISTINCT using indexes */
-++#define SQLITE_CoverIdxScan   0x0020   /* Covering index scans */
-++#define SQLITE_OrderByIdxJoin 0x0040   /* ORDER BY of joins via index */
-++#define SQLITE_Transitive     0x0080   /* Transitive constraints */
-++#define SQLITE_OmitNoopJoin   0x0100   /* Omit unused tables in joins */
-++#define SQLITE_CountOfView    0x0200   /* The count-of-view optimization */
-++#define SQLITE_CursorHints    0x0400   /* Add OP_CursorHint opcodes */
-+ #define SQLITE_Stat34         0x0800   /* Use STAT3 or STAT4 data */
-+-#define SQLITE_CountOfView    0x1000   /* The count-of-view optimization */
-+-#define SQLITE_CursorHints    0x2000   /* Add OP_CursorHint opcodes */
-++   /* TH3 expects the Stat34  ^^^^^^ value to be 0x0800.  Don't change it */
-+ #define SQLITE_AllOpts        0xffff   /* All optimizations */
-+ 
-+ /*
-+@@ -2044,8 +2060,8 @@ struct FKey {
-+ struct KeyInfo {
-+   u32 nRef;           /* Number of references to this KeyInfo object */
-+   u8 enc;             /* Text encoding - one of the SQLITE_UTF* values */
-+-  u16 nField;         /* Number of key columns in the index */
-+-  u16 nXField;        /* Number of columns beyond the key columns */
-++  u16 nKeyField;      /* Number of key columns in the index */
-++  u16 nAllField;      /* Total columns, including key plus others */
-+   sqlite3 *db;        /* The database connection */
-+   u8 *aSortOrder;     /* Sort order for each column. */
-+   CollSeq *aColl[1];  /* Collating sequence for each term of the key */
-+@@ -2092,8 +2108,8 @@ struct UnpackedRecord {
-+   u16 nField;         /* Number of entries in apMem[] */
-+   i8 default_rc;      /* Comparison result if keys are equal */
-+   u8 errCode;         /* Error detected by xRecordCompare (CORRUPT or NOMEM) */
-+-  i8 r1;              /* Value to return if (lhs > rhs) */
-+-  i8 r2;              /* Value to return if (rhs < lhs) */
-++  i8 r1;              /* Value to return if (lhs < rhs) */
-++  i8 r2;              /* Value to return if (lhs > rhs) */
-+   u8 eqSeen;          /* True if an equality comparison has been seen */
-+ };
-+ 
-+@@ -2377,7 +2393,8 @@ struct Expr {
-+                          ** TK_COLUMN: the value of p5 for OP_Column
-+                          ** TK_AGG_FUNCTION: nesting depth */
-+   AggInfo *pAggInfo;     /* Used by TK_AGG_COLUMN and TK_AGG_FUNCTION */
-+-  Table *pTab;           /* Table for TK_COLUMN expressions. */
-++  Table *pTab;           /* Table for TK_COLUMN expressions.  Can be NULL
-++                         ** for a column of an index on an expression */
-+ };
-+ 
-+ /*
-+@@ -2465,7 +2482,6 @@ struct Expr {
-+ */
-+ struct ExprList {
-+   int nExpr;             /* Number of expressions on the list */
-+-  int nAlloc;            /* Number of a[] slots allocated */
-+   struct ExprList_item { /* For each expression in the list */
-+     Expr *pExpr;            /* The parse tree for this expression */
-+     char *zName;            /* Token associated with this expression */
-+@@ -2990,7 +3006,7 @@ struct Parse {
-+   AutoincInfo *pAinc;  /* Information about AUTOINCREMENT counters */
-+   Parse *pToplevel;    /* Parse structure for main program (or NULL) */
-+   Table *pTriggerTab;  /* Table triggers are being coded for */
-+-  int addrCrTab;       /* Address of OP_CreateTable opcode on CREATE TABLE */
-++  int addrCrTab;       /* Address of OP_CreateBtree opcode on CREATE TABLE */
-+   u32 nQueryLoop;      /* Est number of iterations of a query (10*log2(N)) */
-+   u32 oldmask;         /* Mask of old.* columns referenced */
-+   u32 newmask;         /* Mask of new.* columns referenced */
-+@@ -3219,11 +3235,10 @@ struct DbFixer {
-+ */
-+ struct StrAccum {
-+   sqlite3 *db;         /* Optional database for lookaside.  Can be NULL */
-+-  char *zBase;         /* A base allocation.  Not from malloc. */
-+   char *zText;         /* The string collected so far */
-+-  u32  nChar;          /* Length of the string so far */
-+   u32  nAlloc;         /* Amount of space allocated in zText */
-+   u32  mxAlloc;        /* Maximum allowed allocation.  0 for no malloc usage */
-++  u32  nChar;          /* Length of the string so far */
-+   u8   accError;       /* STRACCUM_NOMEM or STRACCUM_TOOBIG */
-+   u8   printfFlags;    /* SQLITE_PRINTF flags below */
-+ };
-+@@ -3258,6 +3273,7 @@ struct Sqlite3Config {
-+   int bFullMutex;                   /* True to enable full mutexing */
-+   int bOpenUri;                     /* True to interpret filenames as URIs */
-+   int bUseCis;                      /* Use covering indices for full-scans */
-++  int bSmallMalloc;                 /* Avoid large memory allocations if true */
-+   int mxStrlen;                     /* Maximum string length */
-+   int neverCorrupt;                 /* Database is always well-formed */
-+   int szLookaside;                  /* Default lookaside buffer size */
-+@@ -3271,9 +3287,6 @@ struct Sqlite3Config {
-+   int mnReq, mxReq;                 /* Min and max heap requests sizes */
-+   sqlite3_int64 szMmap;             /* mmap() space per open file */
-+   sqlite3_int64 mxMmap;             /* Maximum value for szMmap */
-+-  void *pScratch;                   /* Scratch memory */
-+-  int szScratch;                    /* Size of each scratch buffer */
-+-  int nScratch;                     /* Number of scratch buffers */
-+   void *pPage;                      /* Page cache memory */
-+   int szPage;                       /* Size of each page in pPage[] */
-+   int nPage;                        /* Number of pages in pPage[] */
-+@@ -3360,6 +3373,7 @@ int sqlite3WalkSelectExpr(Walker*, Select*);
-+ int sqlite3WalkSelectFrom(Walker*, Select*);
-+ int sqlite3ExprWalkNoop(Walker*, Expr*);
-+ int sqlite3SelectWalkNoop(Walker*, Select*);
-++int sqlite3SelectWalkFail(Walker*, Select*);
-+ #ifdef SQLITE_DEBUG
-+ void sqlite3SelectWalkAssert2(Walker*, Select*);
-+ #endif
-+@@ -3512,8 +3526,6 @@ void sqlite3DbFree(sqlite3*, void*);
-+ void sqlite3DbFreeNN(sqlite3*, void*);
-+ int sqlite3MallocSize(void*);
-+ int sqlite3DbMallocSize(sqlite3*, void*);
-+-void *sqlite3ScratchMalloc(int);
-+-void sqlite3ScratchFree(void*);
-+ void *sqlite3PageMalloc(int);
-+ void sqlite3PageFree(void*);
-+ void sqlite3MemSetDefault(void);
-+@@ -3569,6 +3581,7 @@ sqlite3_int64 sqlite3StatusValue(int);
-+ void sqlite3StatusUp(int, int);
-+ void sqlite3StatusDown(int, int);
-+ void sqlite3StatusHighwater(int, int);
-++int sqlite3LookasideUsed(sqlite3*,int*);
-+ 
-+ /* Access to mutexes used by sqlite3_status() */
-+ sqlite3_mutex *sqlite3Pcache1Mutex(void);
-+@@ -4005,6 +4018,8 @@ int sqlite3ReadSchema(Parse *pParse);
-+ CollSeq *sqlite3FindCollSeq(sqlite3*,u8 enc, const char*,int);
-+ CollSeq *sqlite3LocateCollSeq(Parse *pParse, const char*zName);
-+ CollSeq *sqlite3ExprCollSeq(Parse *pParse, Expr *pExpr);
-++CollSeq *sqlite3ExprNNCollSeq(Parse *pParse, Expr *pExpr);
-++int sqlite3ExprCollSeqMatch(Parse*,Expr*,Expr*);
-+ Expr *sqlite3ExprAddCollateToken(Parse *pParse, Expr*, const Token*, int);
-+ Expr *sqlite3ExprAddCollateString(Parse*,Expr*,const char*);
-+ Expr *sqlite3ExprSkipCollate(Expr*);
-+@@ -4288,7 +4303,8 @@ int sqlite3FindInIndex(Parse *, Expr *, u32, int*, int*);
-+ 
-+ int sqlite3JournalOpen(sqlite3_vfs *, const char *, sqlite3_file *, int, int);
-+ int sqlite3JournalSize(sqlite3_vfs *);
-+-#ifdef SQLITE_ENABLE_ATOMIC_WRITE
-++#if defined(SQLITE_ENABLE_ATOMIC_WRITE) \
-++ || defined(SQLITE_ENABLE_BATCH_ATOMIC_WRITE)
-+   int sqlite3JournalCreate(sqlite3_file *);
-+ #endif
-+ 
-+@@ -4374,8 +4390,7 @@ SQLITE_API SQLITE_EXTERN void (SQLITE_CDECL *sqlite3IoTrace)(const char*,...);
-+ #endif
-+ #define MEMTYPE_HEAP       0x01  /* General heap allocations */
-+ #define MEMTYPE_LOOKASIDE  0x02  /* Heap that might have been lookaside */
-+-#define MEMTYPE_SCRATCH    0x04  /* Scratch allocations */
-+-#define MEMTYPE_PCACHE     0x08  /* Page cache allocations */
-++#define MEMTYPE_PCACHE     0x04  /* Page cache allocations */
-+ 
-+ /*
-+ ** Threading interface
-+@@ -4385,6 +4400,9 @@ int sqlite3ThreadCreate(SQLiteThread**,void*(*)(void*),void*);
-+ int sqlite3ThreadJoin(SQLiteThread*, void**);
-+ #endif
-+ 
-++#if defined(SQLITE_ENABLE_DBPAGE_VTAB) || defined(SQLITE_TEST)
-++int sqlite3DbpageRegister(sqlite3*);
-++#endif
-+ #if defined(SQLITE_ENABLE_DBSTAT_VTAB) || defined(SQLITE_TEST)
-+ int sqlite3DbstatRegister(sqlite3*);
-+ #endif
-+diff --git a/third_party/sqlite/src/src/status.c b/third_party/sqlite/src/src/status.c
-+index 74548b7..f859dd4d 100644
-+--- a/third_party/sqlite/src/src/status.c
-++++ b/third_party/sqlite/src/src/status.c
-+@@ -122,7 +122,6 @@ void sqlite3StatusHighwater(int op, int X){
-+                                            : sqlite3MallocMutex()) );
-+   assert( op==SQLITE_STATUS_MALLOC_SIZE
-+           || op==SQLITE_STATUS_PAGECACHE_SIZE
-+-          || op==SQLITE_STATUS_SCRATCH_SIZE
-+           || op==SQLITE_STATUS_PARSER_STACK );
-+   if( newValue>wsdStat.mxValue[op] ){
-+     wsdStat.mxValue[op] = newValue;
-+@@ -172,6 +171,28 @@ int sqlite3_status(int op, int *pCurrent, int *pHighwater, int resetFlag){
-+ }
-+ 
-+ /*
-++** Return the number of LookasideSlot elements on the linked list
-++*/
-++static u32 countLookasideSlots(LookasideSlot *p){
-++  u32 cnt = 0;
-++  while( p ){
-++    p = p->pNext;
-++    cnt++;
-++  }
-++  return cnt;
-++}
-++
-++/*
-++** Count the number of slots of lookaside memory that are outstanding
-++*/
-++int sqlite3LookasideUsed(sqlite3 *db, int *pHighwater){
-++  u32 nInit = countLookasideSlots(db->lookaside.pInit);
-++  u32 nFree = countLookasideSlots(db->lookaside.pFree);
-++  if( pHighwater ) *pHighwater = db->lookaside.nSlot - nInit;
-++  return db->lookaside.nSlot - (nInit+nFree);
-++}
-++
-++/*
-+ ** Query status information for a single database connection
-+ */
-+ int sqlite3_db_status(
-+@@ -190,10 +211,15 @@ int sqlite3_db_status(
-+   sqlite3_mutex_enter(db->mutex);
-+   switch( op ){
-+     case SQLITE_DBSTATUS_LOOKASIDE_USED: {
-+-      *pCurrent = db->lookaside.nOut;
-+-      *pHighwater = db->lookaside.mxOut;
-++      *pCurrent = sqlite3LookasideUsed(db, pHighwater);
-+       if( resetFlag ){
-+-        db->lookaside.mxOut = db->lookaside.nOut;
-++        LookasideSlot *p = db->lookaside.pFree;
-++        if( p ){
-++          while( p->pNext ) p = p->pNext;
-++          p->pNext = db->lookaside.pInit;
-++          db->lookaside.pInit = db->lookaside.pFree;
-++          db->lookaside.pFree = 0;
-++        }
-+       }
-+       break;
-+     }
-+diff --git a/third_party/sqlite/src/src/tclsqlite.c b/third_party/sqlite/src/src/tclsqlite.c
-+index 2507e30..99b1808 100644
-+--- a/third_party/sqlite/src/src/tclsqlite.c
-++++ b/third_party/sqlite/src/src/tclsqlite.c
-+@@ -14,17 +14,19 @@
-+ **
-+ ** Compile-time options:
-+ **
-+-**  -DTCLSH=1             Add a "main()" routine that works as a tclsh.
-++**  -DTCLSH         Add a "main()" routine that works as a tclsh.
-+ **
-+-**  -DSQLITE_TCLMD5       When used in conjuction with -DTCLSH=1, add
-+-**                        four new commands to the TCL interpreter for
-+-**                        generating MD5 checksums:  md5, md5file,
-+-**                        md5-10x8, and md5file-10x8.
-++**  -DTCLSH_INIT_PROC=name
-+ **
-+-**  -DSQLITE_TEST         When used in conjuction with -DTCLSH=1, add
-+-**                        hundreds of new commands used for testing
-+-**                        SQLite.  This option implies -DSQLITE_TCLMD5.
-+-*/
-++**                  Invoke name(interp) to initialize the Tcl interpreter.
-++**                  If name(interp) returns a non-NULL string, then run
-++**                  that string as a Tcl script to launch the application.
-++**                  If name(interp) returns NULL, then run the regular
-++**                  tclsh-emulator code.
-++*/
-++#ifdef TCLSH_INIT_PROC
-++# define TCLSH 1
-++#endif
-+ 
-+ /*
-+ ** If requested, include the SQLite compiler options file for MSVC.
-+@@ -3286,7 +3288,42 @@ static int SQLITE_TCLAPI DbObjCmd(
-+   ** Return the version string for this database.
-+   */
-+   case DB_VERSION: {
-+-    Tcl_SetResult(interp, (char *)sqlite3_libversion(), TCL_STATIC);
-++    int i;
-++    for(i=2; i<objc; i++){
-++      const char *zArg = Tcl_GetString(objv[i]);
-++      /* Optional arguments to $db version are used for testing purpose */
-++#ifdef SQLITE_TEST
-++      /* $db version -use-legacy-prepare BOOLEAN
-++      **
-++      ** Turn the use of legacy sqlite3_prepare() on or off.
-++      */
-++      if( strcmp(zArg, "-use-legacy-prepare")==0 && i+1<objc ){
-++        i++;
-++        if( Tcl_GetBooleanFromObj(interp, objv[i], &pDb->bLegacyPrepare) ){
-++          return TCL_ERROR;
-++        }
-++      }else
-++
-++      /* $db version -last-stmt-ptr
-++      **
-++      ** Return a string which is a hex encoding of the pointer to the
-++      ** most recent sqlite3_stmt in the statement cache.
-++      */
-++      if( strcmp(zArg, "-last-stmt-ptr")==0 ){
-++        char zBuf[100];
-++        sqlite3_snprintf(sizeof(zBuf), zBuf, "%p",
-++                         pDb->stmtList ? pDb->stmtList->pStmt: 0);
-++        Tcl_SetResult(interp, zBuf, TCL_VOLATILE);
-++      }else
-++#endif /* SQLITE_TEST */
-++      {
-++        Tcl_AppendResult(interp, "unknown argument: ", zArg, (char*)0);
-++        return TCL_ERROR;
-++      }
-++    }
-++    if( i==2 ){
-++      Tcl_SetResult(interp, (char *)sqlite3_libversion(), TCL_STATIC);
-++    }
-+     break;
-+   }
-+ 
-+@@ -3546,710 +3583,56 @@ int Sqlite_Unload(Tcl_Interp *interp, int flags){ return TCL_OK; }
-+ int Tclsqlite_Unload(Tcl_Interp *interp, int flags){ return TCL_OK; }
-+ #endif
-+ 
-+-#ifdef TCLSH
-+-/*****************************************************************************
-+-** All of the code that follows is used to build standalone TCL interpreters
-+-** that are statically linked with SQLite.  Enable these by compiling
-+-** with -DTCLSH=n where n can be 1 or 2.  An n of 1 generates a standard
-+-** tclsh but with SQLite built in.  An n of 2 generates the SQLite space
-+-** analysis program.
-+-*/
-+-
-+-#if defined(SQLITE_TEST) || defined(SQLITE_TCLMD5)
-+ /*
-+- * This code implements the MD5 message-digest algorithm.
-+- * The algorithm is due to Ron Rivest.  This code was
-+- * written by Colin Plumb in 1993, no copyright is claimed.
-+- * This code is in the public domain; do with it what you wish.
-+- *
-+- * Equivalent code is available from RSA Data Security, Inc.
-+- * This code has been tested against that, and is equivalent,
-+- * except that you don't need to include two pages of legalese
-+- * with every copy.
-+- *
-+- * To compute the message digest of a chunk of bytes, declare an
-+- * MD5Context structure, pass it to MD5Init, call MD5Update as
-+- * needed on buffers full of bytes, and then call MD5Final, which
-+- * will fill a supplied 16-byte array with the digest.
-+- */
-+-
-+-/*
-+- * If compiled on a machine that doesn't have a 32-bit integer,
-+- * you just set "uint32" to the appropriate datatype for an
-+- * unsigned 32-bit integer.  For example:
-+- *
-+- *       cc -Duint32='unsigned long' md5.c
-+- *
-+- */
-+-#ifndef uint32
-+-#  define uint32 unsigned int
-+-#endif
-+-
-+-struct MD5Context {
-+-  int isInit;
-+-  uint32 buf[4];
-+-  uint32 bits[2];
-+-  unsigned char in[64];
-+-};
-+-typedef struct MD5Context MD5Context;
-+-
-+-/*
-+- * Note: this code is harmless on little-endian machines.
-+- */
-+-static void byteReverse (unsigned char *buf, unsigned longs){
-+-        uint32 t;
-+-        do {
-+-                t = (uint32)((unsigned)buf[3]<<8 | buf[2]) << 16 |
-+-                            ((unsigned)buf[1]<<8 | buf[0]);
-+-                *(uint32 *)buf = t;
-+-                buf += 4;
-+-        } while (--longs);
-+-}
-+-/* The four core functions - F1 is optimized somewhat */
-+-
-+-/* #define F1(x, y, z) (x & y | ~x & z) */
-+-#define F1(x, y, z) (z ^ (x & (y ^ z)))
-+-#define F2(x, y, z) F1(z, x, y)
-+-#define F3(x, y, z) (x ^ y ^ z)
-+-#define F4(x, y, z) (y ^ (x | ~z))
-+-
-+-/* This is the central step in the MD5 algorithm. */
-+-#define MD5STEP(f, w, x, y, z, data, s) \
-+-        ( w += f(x, y, z) + data,  w = w<<s | w>>(32-s),  w += x )
-+-
-+-/*
-+- * The core of the MD5 algorithm, this alters an existing MD5 hash to
-+- * reflect the addition of 16 longwords of new data.  MD5Update blocks
-+- * the data and converts bytes into longwords for this routine.
-+- */
-+-static void MD5Transform(uint32 buf[4], const uint32 in[16]){
-+-        register uint32 a, b, c, d;
-+-
-+-        a = buf[0];
-+-        b = buf[1];
-+-        c = buf[2];
-+-        d = buf[3];
-+-
-+-        MD5STEP(F1, a, b, c, d, in[ 0]+0xd76aa478,  7);
-+-        MD5STEP(F1, d, a, b, c, in[ 1]+0xe8c7b756, 12);
-+-        MD5STEP(F1, c, d, a, b, in[ 2]+0x242070db, 17);
-+-        MD5STEP(F1, b, c, d, a, in[ 3]+0xc1bdceee, 22);
-+-        MD5STEP(F1, a, b, c, d, in[ 4]+0xf57c0faf,  7);
-+-        MD5STEP(F1, d, a, b, c, in[ 5]+0x4787c62a, 12);
-+-        MD5STEP(F1, c, d, a, b, in[ 6]+0xa8304613, 17);
-+-        MD5STEP(F1, b, c, d, a, in[ 7]+0xfd469501, 22);
-+-        MD5STEP(F1, a, b, c, d, in[ 8]+0x698098d8,  7);
-+-        MD5STEP(F1, d, a, b, c, in[ 9]+0x8b44f7af, 12);
-+-        MD5STEP(F1, c, d, a, b, in[10]+0xffff5bb1, 17);
-+-        MD5STEP(F1, b, c, d, a, in[11]+0x895cd7be, 22);
-+-        MD5STEP(F1, a, b, c, d, in[12]+0x6b901122,  7);
-+-        MD5STEP(F1, d, a, b, c, in[13]+0xfd987193, 12);
-+-        MD5STEP(F1, c, d, a, b, in[14]+0xa679438e, 17);
-+-        MD5STEP(F1, b, c, d, a, in[15]+0x49b40821, 22);
-+-
-+-        MD5STEP(F2, a, b, c, d, in[ 1]+0xf61e2562,  5);
-+-        MD5STEP(F2, d, a, b, c, in[ 6]+0xc040b340,  9);
-+-        MD5STEP(F2, c, d, a, b, in[11]+0x265e5a51, 14);
-+-        MD5STEP(F2, b, c, d, a, in[ 0]+0xe9b6c7aa, 20);
-+-        MD5STEP(F2, a, b, c, d, in[ 5]+0xd62f105d,  5);
-+-        MD5STEP(F2, d, a, b, c, in[10]+0x02441453,  9);
-+-        MD5STEP(F2, c, d, a, b, in[15]+0xd8a1e681, 14);
-+-        MD5STEP(F2, b, c, d, a, in[ 4]+0xe7d3fbc8, 20);
-+-        MD5STEP(F2, a, b, c, d, in[ 9]+0x21e1cde6,  5);
-+-        MD5STEP(F2, d, a, b, c, in[14]+0xc33707d6,  9);
-+-        MD5STEP(F2, c, d, a, b, in[ 3]+0xf4d50d87, 14);
-+-        MD5STEP(F2, b, c, d, a, in[ 8]+0x455a14ed, 20);
-+-        MD5STEP(F2, a, b, c, d, in[13]+0xa9e3e905,  5);
-+-        MD5STEP(F2, d, a, b, c, in[ 2]+0xfcefa3f8,  9);
-+-        MD5STEP(F2, c, d, a, b, in[ 7]+0x676f02d9, 14);
-+-        MD5STEP(F2, b, c, d, a, in[12]+0x8d2a4c8a, 20);
-+-
-+-        MD5STEP(F3, a, b, c, d, in[ 5]+0xfffa3942,  4);
-+-        MD5STEP(F3, d, a, b, c, in[ 8]+0x8771f681, 11);
-+-        MD5STEP(F3, c, d, a, b, in[11]+0x6d9d6122, 16);
-+-        MD5STEP(F3, b, c, d, a, in[14]+0xfde5380c, 23);
-+-        MD5STEP(F3, a, b, c, d, in[ 1]+0xa4beea44,  4);
-+-        MD5STEP(F3, d, a, b, c, in[ 4]+0x4bdecfa9, 11);
-+-        MD5STEP(F3, c, d, a, b, in[ 7]+0xf6bb4b60, 16);
-+-        MD5STEP(F3, b, c, d, a, in[10]+0xbebfbc70, 23);
-+-        MD5STEP(F3, a, b, c, d, in[13]+0x289b7ec6,  4);
-+-        MD5STEP(F3, d, a, b, c, in[ 0]+0xeaa127fa, 11);
-+-        MD5STEP(F3, c, d, a, b, in[ 3]+0xd4ef3085, 16);
-+-        MD5STEP(F3, b, c, d, a, in[ 6]+0x04881d05, 23);
-+-        MD5STEP(F3, a, b, c, d, in[ 9]+0xd9d4d039,  4);
-+-        MD5STEP(F3, d, a, b, c, in[12]+0xe6db99e5, 11);
-+-        MD5STEP(F3, c, d, a, b, in[15]+0x1fa27cf8, 16);
-+-        MD5STEP(F3, b, c, d, a, in[ 2]+0xc4ac5665, 23);
-+-
-+-        MD5STEP(F4, a, b, c, d, in[ 0]+0xf4292244,  6);
-+-        MD5STEP(F4, d, a, b, c, in[ 7]+0x432aff97, 10);
-+-        MD5STEP(F4, c, d, a, b, in[14]+0xab9423a7, 15);
-+-        MD5STEP(F4, b, c, d, a, in[ 5]+0xfc93a039, 21);
-+-        MD5STEP(F4, a, b, c, d, in[12]+0x655b59c3,  6);
-+-        MD5STEP(F4, d, a, b, c, in[ 3]+0x8f0ccc92, 10);
-+-        MD5STEP(F4, c, d, a, b, in[10]+0xffeff47d, 15);
-+-        MD5STEP(F4, b, c, d, a, in[ 1]+0x85845dd1, 21);
-+-        MD5STEP(F4, a, b, c, d, in[ 8]+0x6fa87e4f,  6);
-+-        MD5STEP(F4, d, a, b, c, in[15]+0xfe2ce6e0, 10);
-+-        MD5STEP(F4, c, d, a, b, in[ 6]+0xa3014314, 15);
-+-        MD5STEP(F4, b, c, d, a, in[13]+0x4e0811a1, 21);
-+-        MD5STEP(F4, a, b, c, d, in[ 4]+0xf7537e82,  6);
-+-        MD5STEP(F4, d, a, b, c, in[11]+0xbd3af235, 10);
-+-        MD5STEP(F4, c, d, a, b, in[ 2]+0x2ad7d2bb, 15);
-+-        MD5STEP(F4, b, c, d, a, in[ 9]+0xeb86d391, 21);
-+-
-+-        buf[0] += a;
-+-        buf[1] += b;
-+-        buf[2] += c;
-+-        buf[3] += d;
-+-}
-+-
-+-/*
-+- * Start MD5 accumulation.  Set bit count to 0 and buffer to mysterious
-+- * initialization constants.
-+- */
-+-static void MD5Init(MD5Context *ctx){
-+-        ctx->isInit = 1;
-+-        ctx->buf[0] = 0x67452301;
-+-        ctx->buf[1] = 0xefcdab89;
-+-        ctx->buf[2] = 0x98badcfe;
-+-        ctx->buf[3] = 0x10325476;
-+-        ctx->bits[0] = 0;
-+-        ctx->bits[1] = 0;
-+-}
-+-
-+-/*
-+- * Update context to reflect the concatenation of another buffer full
-+- * of bytes.
-+- */
-+-static
-+-void MD5Update(MD5Context *ctx, const unsigned char *buf, unsigned int len){
-+-        uint32 t;
-+-
-+-        /* Update bitcount */
-+-
-+-        t = ctx->bits[0];
-+-        if ((ctx->bits[0] = t + ((uint32)len << 3)) < t)
-+-                ctx->bits[1]++; /* Carry from low to high */
-+-        ctx->bits[1] += len >> 29;
-+-
-+-        t = (t >> 3) & 0x3f;    /* Bytes already in shsInfo->data */
-+-
-+-        /* Handle any leading odd-sized chunks */
-+-
-+-        if ( t ) {
-+-                unsigned char *p = (unsigned char *)ctx->in + t;
-+-
-+-                t = 64-t;
-+-                if (len < t) {
-+-                        memcpy(p, buf, len);
-+-                        return;
-+-                }
-+-                memcpy(p, buf, t);
-+-                byteReverse(ctx->in, 16);
-+-                MD5Transform(ctx->buf, (uint32 *)ctx->in);
-+-                buf += t;
-+-                len -= t;
-+-        }
-+-
-+-        /* Process data in 64-byte chunks */
-+-
-+-        while (len >= 64) {
-+-                memcpy(ctx->in, buf, 64);
-+-                byteReverse(ctx->in, 16);
-+-                MD5Transform(ctx->buf, (uint32 *)ctx->in);
-+-                buf += 64;
-+-                len -= 64;
-+-        }
-+-
-+-        /* Handle any remaining bytes of data. */
-+-
-+-        memcpy(ctx->in, buf, len);
-+-}
-+-
-+-/*
-+- * Final wrapup - pad to 64-byte boundary with the bit pattern
-+- * 1 0* (64-bit count of bits processed, MSB-first)
-+- */
-+-static void MD5Final(unsigned char digest[16], MD5Context *ctx){
-+-        unsigned count;
-+-        unsigned char *p;
-+-
-+-        /* Compute number of bytes mod 64 */
-+-        count = (ctx->bits[0] >> 3) & 0x3F;
-+-
-+-        /* Set the first char of padding to 0x80.  This is safe since there is
-+-           always at least one byte free */
-+-        p = ctx->in + count;
-+-        *p++ = 0x80;
-+-
-+-        /* Bytes of padding needed to make 64 bytes */
-+-        count = 64 - 1 - count;
-+-
-+-        /* Pad out to 56 mod 64 */
-+-        if (count < 8) {
-+-                /* Two lots of padding:  Pad the first block to 64 bytes */
-+-                memset(p, 0, count);
-+-                byteReverse(ctx->in, 16);
-+-                MD5Transform(ctx->buf, (uint32 *)ctx->in);
-+-
-+-                /* Now fill the next block with 56 bytes */
-+-                memset(ctx->in, 0, 56);
-+-        } else {
-+-                /* Pad block to 56 bytes */
-+-                memset(p, 0, count-8);
-+-        }
-+-        byteReverse(ctx->in, 14);
-+-
-+-        /* Append length in bits and transform */
-+-        memcpy(ctx->in + 14*4, ctx->bits, 8);
-+-
-+-        MD5Transform(ctx->buf, (uint32 *)ctx->in);
-+-        byteReverse((unsigned char *)ctx->buf, 4);
-+-        memcpy(digest, ctx->buf, 16);
-+-}
-+-
-+-/*
-+-** Convert a 128-bit MD5 digest into a 32-digit base-16 number.
-+-*/
-+-static void MD5DigestToBase16(unsigned char *digest, char *zBuf){
-+-  static char const zEncode[] = "0123456789abcdef";
-+-  int i, j;
-+-
-+-  for(j=i=0; i<16; i++){
-+-    int a = digest[i];
-+-    zBuf[j++] = zEncode[(a>>4)&0xf];
-+-    zBuf[j++] = zEncode[a & 0xf];
-+-  }
-+-  zBuf[j] = 0;
-+-}
-+-
-+-
-+-/*
-+-** Convert a 128-bit MD5 digest into sequency of eight 5-digit integers
-+-** each representing 16 bits of the digest and separated from each
-+-** other by a "-" character.
-+-*/
-+-static void MD5DigestToBase10x8(unsigned char digest[16], char zDigest[50]){
-+-  int i, j;
-+-  unsigned int x;
-+-  for(i=j=0; i<16; i+=2){
-+-    x = digest[i]*256 + digest[i+1];
-+-    if( i>0 ) zDigest[j++] = '-';
-+-    sqlite3_snprintf(50-j, &zDigest[j], "%05u", x);
-+-    j += 5;
-+-  }
-+-  zDigest[j] = 0;
-+-}
-+-
-+-/*
-+-** A TCL command for md5.  The argument is the text to be hashed.  The
-+-** Result is the hash in base64.
-+-*/
-+-static int SQLITE_TCLAPI md5_cmd(
-+-  void*cd,
-+-  Tcl_Interp *interp,
-+-  int argc,
-+-  const char **argv
-+-){
-+-  MD5Context ctx;
-+-  unsigned char digest[16];
-+-  char zBuf[50];
-+-  void (*converter)(unsigned char*, char*);
-+-
-+-  if( argc!=2 ){
-+-    Tcl_AppendResult(interp,"wrong # args: should be \"", argv[0],
-+-        " TEXT\"", (char*)0);
-+-    return TCL_ERROR;
-+-  }
-+-  MD5Init(&ctx);
-+-  MD5Update(&ctx, (unsigned char*)argv[1], (unsigned)strlen(argv[1]));
-+-  MD5Final(digest, &ctx);
-+-  converter = (void(*)(unsigned char*,char*))cd;
-+-  converter(digest, zBuf);
-+-  Tcl_AppendResult(interp, zBuf, (char*)0);
-+-  return TCL_OK;
-+-}
-+-
-+-/*
-+-** A TCL command to take the md5 hash of a file.  The argument is the
-+-** name of the file.
-+-*/
-+-static int SQLITE_TCLAPI md5file_cmd(
-+-  void*cd,
-+-  Tcl_Interp *interp,
-+-  int argc,
-+-  const char **argv
-+-){
-+-  FILE *in;
-+-  MD5Context ctx;
-+-  void (*converter)(unsigned char*, char*);
-+-  unsigned char digest[16];
-+-  char zBuf[10240];
-+-
-+-  if( argc!=2 ){
-+-    Tcl_AppendResult(interp,"wrong # args: should be \"", argv[0],
-+-        " FILENAME\"", (char*)0);
-+-    return TCL_ERROR;
-+-  }
-+-  in = fopen(argv[1],"rb");
-+-  if( in==0 ){
-+-    Tcl_AppendResult(interp,"unable to open file \"", argv[1],
-+-         "\" for reading", (char*)0);
-+-    return TCL_ERROR;
-+-  }
-+-  MD5Init(&ctx);
-+-  for(;;){
-+-    int n;
-+-    n = (int)fread(zBuf, 1, sizeof(zBuf), in);
-+-    if( n<=0 ) break;
-+-    MD5Update(&ctx, (unsigned char*)zBuf, (unsigned)n);
-+-  }
-+-  fclose(in);
-+-  MD5Final(digest, &ctx);
-+-  converter = (void(*)(unsigned char*,char*))cd;
-+-  converter(digest, zBuf);
-+-  Tcl_AppendResult(interp, zBuf, (char*)0);
-+-  return TCL_OK;
-+-}
-+-
-+-/*
-+-** Register the four new TCL commands for generating MD5 checksums
-+-** with the TCL interpreter.
-++** If the TCLSH macro is defined, add code to make a stand-alone program.
-+ */
-+-int Md5_Init(Tcl_Interp *interp){
-+-  Tcl_CreateCommand(interp, "md5", (Tcl_CmdProc*)md5_cmd,
-+-                    MD5DigestToBase16, 0);
-+-  Tcl_CreateCommand(interp, "md5-10x8", (Tcl_CmdProc*)md5_cmd,
-+-                    MD5DigestToBase10x8, 0);
-+-  Tcl_CreateCommand(interp, "md5file", (Tcl_CmdProc*)md5file_cmd,
-+-                    MD5DigestToBase16, 0);
-+-  Tcl_CreateCommand(interp, "md5file-10x8", (Tcl_CmdProc*)md5file_cmd,
-+-                    MD5DigestToBase10x8, 0);
-+-  return TCL_OK;
-+-}
-+-#endif /* defined(SQLITE_TEST) || defined(SQLITE_TCLMD5) */
-++#if defined(TCLSH)
-+ 
-+-#if defined(SQLITE_TEST)
-+-/*
-+-** During testing, the special md5sum() aggregate function is available.
-+-** inside SQLite.  The following routines implement that function.
-++/* This is the main routine for an ordinary TCL shell.  If there are
-++** are arguments, run the first argument as a script.  Otherwise,
-++** read TCL commands from standard input
-+ */
-+-static void md5step(sqlite3_context *context, int argc, sqlite3_value **argv){
-+-  MD5Context *p;
-+-  int i;
-+-  if( argc<1 ) return;
-+-  p = sqlite3_aggregate_context(context, sizeof(*p));
-+-  if( p==0 ) return;
-+-  if( !p->isInit ){
-+-    MD5Init(p);
-+-  }
-+-  for(i=0; i<argc; i++){
-+-    const char *zData = (char*)sqlite3_value_text(argv[i]);
-+-    if( zData ){
-+-      MD5Update(p, (unsigned char*)zData, (int)strlen(zData));
-+-    }
-+-  }
-+-}
-+-static void md5finalize(sqlite3_context *context){
-+-  MD5Context *p;
-+-  unsigned char digest[16];
-+-  char zBuf[33];
-+-  p = sqlite3_aggregate_context(context, sizeof(*p));
-+-  MD5Final(digest,p);
-+-  MD5DigestToBase16(digest, zBuf);
-+-  sqlite3_result_text(context, zBuf, -1, SQLITE_TRANSIENT);
-+-}
-+-int Md5_Register(
-+-  sqlite3 *db,
-+-  char **pzErrMsg,
-+-  const sqlite3_api_routines *pThunk
-+-){
-+-  int rc = sqlite3_create_function(db, "md5sum", -1, SQLITE_UTF8, 0, 0,
-+-                                 md5step, md5finalize);
-+-  sqlite3_overload_function(db, "md5sum", -1);  /* To exercise this API */
-+-  return rc;
-+-}
-+-#endif /* defined(SQLITE_TEST) */
-+-
-+-
-+-/*
-+-** If the macro TCLSH is one, then put in code this for the
-+-** "main" routine that will initialize Tcl and take input from
-+-** standard input, or if a file is named on the command line
-+-** the TCL interpreter reads and evaluates that file.
-+-*/
-+-#if TCLSH==1
-+ static const char *tclsh_main_loop(void){
-+   static const char zMainloop[] =
-+-    "set line {}\n"
-+-    "while {![eof stdin]} {\n"
-+-      "if {$line!=\"\"} {\n"
-+-        "puts -nonewline \"> \"\n"
-+-      "} else {\n"
-+-        "puts -nonewline \"% \"\n"
-+-      "}\n"
-+-      "flush stdout\n"
-+-      "append line [gets stdin]\n"
-+-      "if {[info complete $line]} {\n"
-+-        "if {[catch {uplevel #0 $line} result]} {\n"
-+-          "puts stderr \"Error: $result\"\n"
-+-        "} elseif {$result!=\"\"} {\n"
-+-          "puts $result\n"
-++    "if {[llength $argv]>=1} {\n"
-++      "set argv0 [lindex $argv 0]\n"
-++      "set argv [lrange $argv 1 end]\n"
-++      "source $argv0\n"
-++    "} else {\n"
-++      "set line {}\n"
-++      "while {![eof stdin]} {\n"
-++        "if {$line!=\"\"} {\n"
-++          "puts -nonewline \"> \"\n"
-++        "} else {\n"
-++          "puts -nonewline \"% \"\n"
-++        "}\n"
-++        "flush stdout\n"
-++        "append line [gets stdin]\n"
-++        "if {[info complete $line]} {\n"
-++          "if {[catch {uplevel #0 $line} result]} {\n"
-++            "puts stderr \"Error: $result\"\n"
-++          "} elseif {$result!=\"\"} {\n"
-++            "puts $result\n"
-++          "}\n"
-++          "set line {}\n"
-++        "} else {\n"
-++          "append line \\n\n"
-+         "}\n"
-+-        "set line {}\n"
-+-      "} else {\n"
-+-        "append line \\n\n"
-+       "}\n"
-+     "}\n"
-+   ;
-+   return zMainloop;
-+ }
-+-#endif
-+-#if TCLSH==2
-+-static const char *tclsh_main_loop(void);
-+-#endif
-+-
-+-#ifdef SQLITE_TEST
-+-static void init_all(Tcl_Interp *);
-+-static int SQLITE_TCLAPI init_all_cmd(
-+-  ClientData cd,
-+-  Tcl_Interp *interp,
-+-  int objc,
-+-  Tcl_Obj *CONST objv[]
-+-){
-+-
-+-  Tcl_Interp *slave;
-+-  if( objc!=2 ){
-+-    Tcl_WrongNumArgs(interp, 1, objv, "SLAVE");
-+-    return TCL_ERROR;
-+-  }
-+-
-+-  slave = Tcl_GetSlave(interp, Tcl_GetString(objv[1]));
-+-  if( !slave ){
-+-    return TCL_ERROR;
-+-  }
-+-
-+-  init_all(slave);
-+-  return TCL_OK;
-+-}
-+-
-+-/*
-+-** Tclcmd: db_use_legacy_prepare DB BOOLEAN
-+-**
-+-**   The first argument to this command must be a database command created by
-+-**   [sqlite3]. If the second argument is true, then the handle is configured
-+-**   to use the sqlite3_prepare_v2() function to prepare statements. If it
-+-**   is false, sqlite3_prepare().
-+-*/
-+-static int SQLITE_TCLAPI db_use_legacy_prepare_cmd(
-+-  ClientData cd,
-+-  Tcl_Interp *interp,
-+-  int objc,
-+-  Tcl_Obj *CONST objv[]
-+-){
-+-  Tcl_CmdInfo cmdInfo;
-+-  SqliteDb *pDb;
-+-  int bPrepare;
-+-
-+-  if( objc!=3 ){
-+-    Tcl_WrongNumArgs(interp, 1, objv, "DB BOOLEAN");
-+-    return TCL_ERROR;
-+-  }
-+-
-+-  if( !Tcl_GetCommandInfo(interp, Tcl_GetString(objv[1]), &cmdInfo) ){
-+-    Tcl_AppendResult(interp, "no such db: ", Tcl_GetString(objv[1]), (char*)0);
-+-    return TCL_ERROR;
-+-  }
-+-  pDb = (SqliteDb*)cmdInfo.objClientData;
-+-  if( Tcl_GetBooleanFromObj(interp, objv[2], &bPrepare) ){
-+-    return TCL_ERROR;
-+-  }
-+-
-+-  pDb->bLegacyPrepare = bPrepare;
-+-
-+-  Tcl_ResetResult(interp);
-+-  return TCL_OK;
-+-}
-+-
-+-/*
-+-** Tclcmd: db_last_stmt_ptr DB
-+-**
-+-**   If the statement cache associated with database DB is not empty,
-+-**   return the text representation of the most recently used statement
-+-**   handle.
-+-*/
-+-static int SQLITE_TCLAPI db_last_stmt_ptr(
-+-  ClientData cd,
-+-  Tcl_Interp *interp,
-+-  int objc,
-+-  Tcl_Obj *CONST objv[]
-+-){
-+-  extern int sqlite3TestMakePointerStr(Tcl_Interp*, char*, void*);
-+-  Tcl_CmdInfo cmdInfo;
-+-  SqliteDb *pDb;
-+-  sqlite3_stmt *pStmt = 0;
-+-  char zBuf[100];
-+-
-+-  if( objc!=2 ){
-+-    Tcl_WrongNumArgs(interp, 1, objv, "DB");
-+-    return TCL_ERROR;
-+-  }
-+-
-+-  if( !Tcl_GetCommandInfo(interp, Tcl_GetString(objv[1]), &cmdInfo) ){
-+-    Tcl_AppendResult(interp, "no such db: ", Tcl_GetString(objv[1]), (char*)0);
-+-    return TCL_ERROR;
-+-  }
-+-  pDb = (SqliteDb*)cmdInfo.objClientData;
-+-
-+-  if( pDb->stmtList ) pStmt = pDb->stmtList->pStmt;
-+-  if( sqlite3TestMakePointerStr(interp, zBuf, pStmt) ){
-+-    return TCL_ERROR;
-+-  }
-+-  Tcl_SetResult(interp, zBuf, TCL_VOLATILE);
-+-
-+-  return TCL_OK;
-+-}
-+-#endif /* SQLITE_TEST */
-+-
-+-/*
-+-** Configure the interpreter passed as the first argument to have access
-+-** to the commands and linked variables that make up:
-+-**
-+-**   * the [sqlite3] extension itself,
-+-**
-+-**   * If SQLITE_TCLMD5 or SQLITE_TEST is defined, the Md5 commands, and
-+-**
-+-**   * If SQLITE_TEST is set, the various test interfaces used by the Tcl
-+-**     test suite.
-+-*/
-+-static void init_all(Tcl_Interp *interp){
-+-  Sqlite3_Init(interp);
-+-
-+-#if defined(SQLITE_TEST) || defined(SQLITE_TCLMD5)
-+-  Md5_Init(interp);
-+-#endif
-+-
-+-#ifdef SQLITE_TEST
-+-  {
-+-    extern int Sqliteconfig_Init(Tcl_Interp*);
-+-    extern int Sqlitetest1_Init(Tcl_Interp*);
-+-    extern int Sqlitetest2_Init(Tcl_Interp*);
-+-    extern int Sqlitetest3_Init(Tcl_Interp*);
-+-    extern int Sqlitetest4_Init(Tcl_Interp*);
-+-    extern int Sqlitetest5_Init(Tcl_Interp*);
-+-    extern int Sqlitetest6_Init(Tcl_Interp*);
-+-    extern int Sqlitetest7_Init(Tcl_Interp*);
-+-    extern int Sqlitetest8_Init(Tcl_Interp*);
-+-    extern int Sqlitetest9_Init(Tcl_Interp*);
-+-    extern int Sqlitetestasync_Init(Tcl_Interp*);
-+-    extern int Sqlitetest_autoext_Init(Tcl_Interp*);
-+-    extern int Sqlitetest_blob_Init(Tcl_Interp*);
-+-    extern int Sqlitetest_demovfs_Init(Tcl_Interp *);
-+-    extern int Sqlitetest_func_Init(Tcl_Interp*);
-+-    extern int Sqlitetest_hexio_Init(Tcl_Interp*);
-+-    extern int Sqlitetest_init_Init(Tcl_Interp*);
-+-    extern int Sqlitetest_malloc_Init(Tcl_Interp*);
-+-    extern int Sqlitetest_mutex_Init(Tcl_Interp*);
-+-    extern int Sqlitetestschema_Init(Tcl_Interp*);
-+-    extern int Sqlitetestsse_Init(Tcl_Interp*);
-+-    extern int Sqlitetesttclvar_Init(Tcl_Interp*);
-+-    extern int Sqlitetestfs_Init(Tcl_Interp*);
-+-    extern int SqlitetestThread_Init(Tcl_Interp*);
-+-    extern int SqlitetestOnefile_Init();
-+-    extern int SqlitetestOsinst_Init(Tcl_Interp*);
-+-    extern int Sqlitetestbackup_Init(Tcl_Interp*);
-+-    extern int Sqlitetestintarray_Init(Tcl_Interp*);
-+-    extern int Sqlitetestvfs_Init(Tcl_Interp *);
-+-    extern int Sqlitetestrtree_Init(Tcl_Interp*);
-+-    extern int Sqlitequota_Init(Tcl_Interp*);
-+-    extern int Sqlitemultiplex_Init(Tcl_Interp*);
-+-    extern int SqliteSuperlock_Init(Tcl_Interp*);
-+-    extern int SqlitetestSyscall_Init(Tcl_Interp*);
-+-#if defined(SQLITE_ENABLE_SESSION) && defined(SQLITE_ENABLE_PREUPDATE_HOOK)
-+-    extern int TestSession_Init(Tcl_Interp*);
-+-#endif
-+-    extern int Fts5tcl_Init(Tcl_Interp *);
-+-    extern int SqliteRbu_Init(Tcl_Interp*);
-+-    extern int Sqlitetesttcl_Init(Tcl_Interp*);
-+-#if defined(SQLITE_ENABLE_FTS3) || defined(SQLITE_ENABLE_FTS4)
-+-    extern int Sqlitetestfts3_Init(Tcl_Interp *interp);
-+-#endif
-+-
-+-#ifdef SQLITE_ENABLE_ZIPVFS
-+-    extern int Zipvfs_Init(Tcl_Interp*);
-+-    Zipvfs_Init(interp);
-+-#endif
-+-
-+-    Sqliteconfig_Init(interp);
-+-    Sqlitetest1_Init(interp);
-+-    Sqlitetest2_Init(interp);
-+-    Sqlitetest3_Init(interp);
-+-    Sqlitetest4_Init(interp);
-+-    Sqlitetest5_Init(interp);
-+-    Sqlitetest6_Init(interp);
-+-    Sqlitetest7_Init(interp);
-+-    Sqlitetest8_Init(interp);
-+-    Sqlitetest9_Init(interp);
-+-    Sqlitetestasync_Init(interp);
-+-    Sqlitetest_autoext_Init(interp);
-+-    Sqlitetest_blob_Init(interp);
-+-    Sqlitetest_demovfs_Init(interp);
-+-    Sqlitetest_func_Init(interp);
-+-    Sqlitetest_hexio_Init(interp);
-+-    Sqlitetest_init_Init(interp);
-+-    Sqlitetest_malloc_Init(interp);
-+-    Sqlitetest_mutex_Init(interp);
-+-    Sqlitetestschema_Init(interp);
-+-    Sqlitetesttclvar_Init(interp);
-+-    Sqlitetestfs_Init(interp);
-+-    SqlitetestThread_Init(interp);
-+-    SqlitetestOnefile_Init();
-+-    SqlitetestOsinst_Init(interp);
-+-    Sqlitetestbackup_Init(interp);
-+-    Sqlitetestintarray_Init(interp);
-+-    Sqlitetestvfs_Init(interp);
-+-    Sqlitetestrtree_Init(interp);
-+-    Sqlitequota_Init(interp);
-+-    Sqlitemultiplex_Init(interp);
-+-    SqliteSuperlock_Init(interp);
-+-    SqlitetestSyscall_Init(interp);
-+-#if defined(SQLITE_ENABLE_SESSION) && defined(SQLITE_ENABLE_PREUPDATE_HOOK)
-+-    TestSession_Init(interp);
-+-#endif
-+-    Fts5tcl_Init(interp);
-+-    SqliteRbu_Init(interp);
-+-    Sqlitetesttcl_Init(interp);
-+-
-+-#if defined(SQLITE_ENABLE_FTS3) || defined(SQLITE_ENABLE_FTS4)
-+-    Sqlitetestfts3_Init(interp);
-+-#endif
-+-
-+-    Tcl_CreateObjCommand(
-+-        interp, "load_testfixture_extensions", init_all_cmd, 0, 0
-+-    );
-+-    Tcl_CreateObjCommand(
-+-        interp, "db_use_legacy_prepare", db_use_legacy_prepare_cmd, 0, 0
-+-    );
-+-    Tcl_CreateObjCommand(
-+-        interp, "db_last_stmt_ptr", db_last_stmt_ptr, 0, 0
-+-    );
-+-
-+-#ifdef SQLITE_SSE
-+-    Sqlitetestsse_Init(interp);
-+-#endif
-+-  }
-+-#endif
-+-}
-+-
-+-/* Needed for the setrlimit() system call on unix */
-+-#if defined(unix)
-+-#include <sys/resource.h>
-+-#endif
-+ 
-+ #define TCLSH_MAIN main   /* Needed to fake out mktclapp */
-+ int SQLITE_CDECL TCLSH_MAIN(int argc, char **argv){
-+   Tcl_Interp *interp;
-++  int i;
-++  const char *zScript = 0;
-++  char zArgc[32];
-++#if defined(TCLSH_INIT_PROC)
-++  extern const char *TCLSH_INIT_PROC(Tcl_Interp*);
-++#endif
-+ 
-+ #if !defined(_WIN32_WCE)
-+   if( getenv("BREAK") ){
-+@@ -4260,17 +3643,6 @@ int SQLITE_CDECL TCLSH_MAIN(int argc, char **argv){
-+   }
-+ #endif
-+ 
-+-  /* Since the primary use case for this binary is testing of SQLite,
-+-  ** be sure to generate core files if we crash */
-+-#if defined(SQLITE_TEST) && defined(unix)
-+-  { struct rlimit x;
-+-    getrlimit(RLIMIT_CORE, &x);
-+-    x.rlim_cur = x.rlim_max;
-+-    setrlimit(RLIMIT_CORE, &x);
-+-  }
-+-#endif /* SQLITE_TEST && unix */
-+-
-+-
-+   /* Call sqlite3_shutdown() once before doing anything else. This is to
-+   ** test that sqlite3_shutdown() can be safely called by a process before
-+   ** sqlite3_initialize() is. */
-+@@ -4279,32 +3651,27 @@ int SQLITE_CDECL TCLSH_MAIN(int argc, char **argv){
-+   Tcl_FindExecutable(argv[0]);
-+   Tcl_SetSystemEncoding(NULL, "utf-8");
-+   interp = Tcl_CreateInterp();
-++  Sqlite3_Init(interp);
-+ 
-+-#if TCLSH==2
-+-  sqlite3_config(SQLITE_CONFIG_SINGLETHREAD);
-++  sqlite3_snprintf(sizeof(zArgc), zArgc, "%d", argc-1);
-++  Tcl_SetVar(interp,"argc", zArgc, TCL_GLOBAL_ONLY);
-++  Tcl_SetVar(interp,"argv0",argv[0],TCL_GLOBAL_ONLY);
-++  Tcl_SetVar(interp,"argv", "", TCL_GLOBAL_ONLY);
-++  for(i=1; i<argc; i++){
-++    Tcl_SetVar(interp, "argv", argv[i],
-++        TCL_GLOBAL_ONLY | TCL_LIST_ELEMENT | TCL_APPEND_VALUE);
-++  }
-++#if defined(TCLSH_INIT_PROC)
-++  zScript = TCLSH_INIT_PROC(interp);
-+ #endif
-+-
-+-  init_all(interp);
-+-  if( argc>=2 ){
-+-    int i;
-+-    char zArgc[32];
-+-    sqlite3_snprintf(sizeof(zArgc), zArgc, "%d", argc-(3-TCLSH));
-+-    Tcl_SetVar(interp,"argc", zArgc, TCL_GLOBAL_ONLY);
-+-    Tcl_SetVar(interp,"argv0",argv[1],TCL_GLOBAL_ONLY);
-+-    Tcl_SetVar(interp,"argv", "", TCL_GLOBAL_ONLY);
-+-    for(i=3-TCLSH; i<argc; i++){
-+-      Tcl_SetVar(interp, "argv", argv[i],
-+-          TCL_GLOBAL_ONLY | TCL_LIST_ELEMENT | TCL_APPEND_VALUE);
-+-    }
-+-    if( TCLSH==1 && Tcl_EvalFile(interp, argv[1])!=TCL_OK ){
-+-      const char *zInfo = Tcl_GetVar(interp, "errorInfo", TCL_GLOBAL_ONLY);
-+-      if( zInfo==0 ) zInfo = Tcl_GetStringResult(interp);
-+-      fprintf(stderr,"%s: %s\n", *argv, zInfo);
-+-      return 1;
-+-    }
-++  if( zScript==0 ){
-++    zScript = tclsh_main_loop();
-+   }
-+-  if( TCLSH==2 || argc<=1 ){
-+-    Tcl_GlobalEval(interp, tclsh_main_loop());
-++  if( Tcl_GlobalEval(interp, zScript)!=TCL_OK ){
-++    const char *zInfo = Tcl_GetVar(interp, "errorInfo", TCL_GLOBAL_ONLY);
-++    if( zInfo==0 ) zInfo = Tcl_GetStringResult(interp);
-++    fprintf(stderr,"%s: %s\n", *argv, zInfo);
-++    return 1;
-+   }
-+   return 0;
-+ }
-+diff --git a/third_party/sqlite/src/src/test1.c b/third_party/sqlite/src/src/test1.c
-+index 4122651..6677826 100644
-+--- a/third_party/sqlite/src/src/test1.c
-++++ b/third_party/sqlite/src/src/test1.c
-+@@ -2554,6 +2554,46 @@ static int SQLITE_TCLAPI test_delete_database(
-+ }
-+ 
-+ /*
-++** Usage: atomic_batch_write PATH
-++*/
-++static int SQLITE_TCLAPI test_atomic_batch_write(
-++  void * clientData,
-++  Tcl_Interp *interp,
-++  int objc,
-++  Tcl_Obj *CONST objv[]
-++){
-++  char *zFile = 0;                /* Path to file to test */
-++  sqlite3 *db = 0;                /* Database handle */
-++  sqlite3_file *pFd = 0;          /* SQLite fd open on zFile */
-++  int bRes = 0;                   /* Integer result of this command */
-++  int dc = 0;                     /* Device-characteristics mask */
-++  int rc;                         /* sqlite3_open() return code */
-++
-++  if( objc!=2 ){
-++    Tcl_WrongNumArgs(interp, 1, objv, "PATH");
-++    return TCL_ERROR;
-++  }
-++  zFile = Tcl_GetString(objv[1]);
-++
-++  rc = sqlite3_open(zFile, &db);
-++  if( rc!=SQLITE_OK ){
-++    Tcl_AppendResult(interp, sqlite3_errmsg(db), 0);
-++    sqlite3_close(db);
-++    return TCL_ERROR;
-++  }
-++
-++  rc = sqlite3_file_control(db, "main", SQLITE_FCNTL_FILE_POINTER, (void*)&pFd);
-++  dc = pFd->pMethods->xDeviceCharacteristics(pFd);
-++  if( dc & SQLITE_IOCAP_BATCH_ATOMIC ){
-++    bRes = 1;
-++  }
-++
-++  Tcl_SetObjResult(interp, Tcl_NewIntObj(bRes));
-++  sqlite3_close(db);
-++  return TCL_OK;
-++}
-++
-++/*
-+ ** Usage:  sqlite3_next_stmt  DB  STMT
-+ **
-+ ** Return the next statment in sequence after STMT.
-+@@ -6861,7 +6901,6 @@ static int SQLITE_TCLAPI optimization_control(
-+     { "cover-idx-scan",      SQLITE_CoverIdxScan   },
-+     { "order-by-idx-join",   SQLITE_OrderByIdxJoin },
-+     { "transitive",          SQLITE_Transitive     },
-+-    { "subquery-coroutine",  SQLITE_SubqCoroutine  },
-+     { "omit-noop-join",      SQLITE_OmitNoopJoin   },
-+     { "stat3",               SQLITE_Stat34         },
-+     { "stat4",               SQLITE_Stat34         },
-+@@ -7376,6 +7415,35 @@ static int SQLITE_TCLAPI test_dbconfig_maindbname_icecube(
-+ }
-+ 
-+ /*
-++** Usage: sqlite3_mmap_warm DB DBNAME
-++*/
-++static int SQLITE_TCLAPI test_mmap_warm(
-++  void * clientData,
-++  Tcl_Interp *interp,
-++  int objc,
-++  Tcl_Obj *CONST objv[]
-++){
-++  extern int getDbPointer(Tcl_Interp*, const char*, sqlite3**);
-++  extern int sqlite3_mmap_warm(sqlite3 *db, const char *);
-++
-++  if( objc!=2 && objc!=3 ){
-++    Tcl_WrongNumArgs(interp, 1, objv, "DB ?DBNAME?");
-++    return TCL_ERROR;
-++  }else{
-++    int rc;
-++    sqlite3 *db;
-++    const char *zDb = 0;
-++    if( getDbPointer(interp, Tcl_GetString(objv[1]), &db) ) return TCL_ERROR;
-++    if( objc==3 ){
-++      zDb = Tcl_GetString(objv[2]);
-++    }
-++    rc = sqlite3_mmap_warm(db, zDb);
-++    Tcl_SetObjResult(interp, Tcl_NewStringObj(sqlite3ErrName(rc), -1));
-++    return TCL_OK;
-++  }
-++}
-++
-++/*
-+ ** Register commands with the TCL interpreter.
-+ */
-+ int Sqlitetest1_Init(Tcl_Interp *interp){
-+@@ -7644,7 +7712,9 @@ int Sqlitetest1_Init(Tcl_Interp *interp){
-+      { "sqlite3_snapshot_open_blob", test_snapshot_open_blob, 0 },
-+      { "sqlite3_snapshot_cmp_blob", test_snapshot_cmp_blob, 0 },
-+ #endif
-+-     { "sqlite3_delete_database", test_delete_database, 0 },
-++     { "sqlite3_delete_database", test_delete_database,    0 },
-++     { "atomic_batch_write",      test_atomic_batch_write, 0 },
-++     { "sqlite3_mmap_warm",       test_mmap_warm,          0 },
-+   };
-+   static int bitmask_size = sizeof(Bitmask)*8;
-+   static int longdouble_size = sizeof(LONGDOUBLE_TYPE);
-+diff --git a/third_party/sqlite/src/src/test6.c b/third_party/sqlite/src/src/test6.c
-+index 6821850..191fe05 100644
-+--- a/third_party/sqlite/src/src/test6.c
-++++ b/third_party/sqlite/src/src/test6.c
-+@@ -736,6 +736,7 @@ static int processDevSymArgs(
-+     { "sequential",          SQLITE_IOCAP_SEQUENTIAL            },
-+     { "safe_append",         SQLITE_IOCAP_SAFE_APPEND           },
-+     { "powersafe_overwrite", SQLITE_IOCAP_POWERSAFE_OVERWRITE   },
-++    { "batch-atomic",        SQLITE_IOCAP_BATCH_ATOMIC          },
-+     { 0, 0 }
-+   };
-+ 
-+@@ -976,7 +977,30 @@ static int SQLITE_TCLAPI devSymObjCmd(
-+   devsym_register(iDc, iSectorSize);
-+ 
-+   return TCL_OK;
-++}
-+ 
-++/*
-++** tclcmd: sqlite3_crash_on_write N
-++*/
-++static int SQLITE_TCLAPI writeCrashObjCmd(
-++  void * clientData,
-++  Tcl_Interp *interp,
-++  int objc,
-++  Tcl_Obj *CONST objv[]
-++){
-++  void devsym_crash_on_write(int);
-++  int nWrite = 0;
-++
-++  if( objc!=2 ){
-++    Tcl_WrongNumArgs(interp, 1, objv, "NWRITE");
-++    return TCL_ERROR;
-++  }
-++  if( Tcl_GetIntFromObj(interp, objv[1], &nWrite) ){
-++    return TCL_ERROR;
-++  }
-++
-++  devsym_crash_on_write(nWrite);
-++  return TCL_OK;
-+ }
-+ 
-+ /*
-+@@ -1068,6 +1092,7 @@ int Sqlitetest6_Init(Tcl_Interp *interp){
-+   Tcl_CreateObjCommand(interp, "sqlite3_crashparams", crashParamsObjCmd, 0, 0);
-+   Tcl_CreateObjCommand(interp, "sqlite3_crash_now", crashNowCmd, 0, 0);
-+   Tcl_CreateObjCommand(interp, "sqlite3_simulate_device", devSymObjCmd, 0, 0);
-++  Tcl_CreateObjCommand(interp, "sqlite3_crash_on_write", writeCrashObjCmd,0,0);
-+   Tcl_CreateObjCommand(interp, "unregister_devsim", dsUnregisterObjCmd, 0, 0);
-+   Tcl_CreateObjCommand(interp, "register_jt_vfs", jtObjCmd, 0, 0);
-+   Tcl_CreateObjCommand(interp, "unregister_jt_vfs", jtUnregisterObjCmd, 0, 0);
-+diff --git a/third_party/sqlite/src/src/test8.c b/third_party/sqlite/src/src/test8.c
-+index 1a89e47..b54759f 100644
-+--- a/third_party/sqlite/src/src/test8.c
-++++ b/third_party/sqlite/src/src/test8.c
-+@@ -897,17 +897,18 @@ static int echoBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){
-+         case SQLITE_INDEX_CONSTRAINT_REGEXP:
-+           zOp = "regexp"; break;
-+       }
-+-      if( zOp[0]=='L' ){
-+-        zNew = sqlite3_mprintf(" %s %s LIKE (SELECT '%%'||?||'%%')",
-+-                               zSep, zNewCol);
-+-      } else {
-+-        zNew = sqlite3_mprintf(" %s %s %s ?", zSep, zNewCol, zOp);
-++      if( zOp ){
-++        if( zOp[0]=='L' ){
-++          zNew = sqlite3_mprintf(" %s %s LIKE (SELECT '%%'||?||'%%')",
-++              zSep, zNewCol);
-++        } else {
-++          zNew = sqlite3_mprintf(" %s %s %s ?", zSep, zNewCol, zOp);
-++        }
-++        string_concat(&zQuery, zNew, 1, &rc);
-++        zSep = "AND";
-++        pUsage->argvIndex = ++nArg;
-++        pUsage->omit = 1;
-+       }
-+-      string_concat(&zQuery, zNew, 1, &rc);
-+-
-+-      zSep = "AND";
-+-      pUsage->argvIndex = ++nArg;
-+-      pUsage->omit = 1;
-+     }
-+   }
-+ 
-+diff --git a/third_party/sqlite/src/src/test_bestindex.c b/third_party/sqlite/src/src/test_bestindex.c
-+index f0cef49..581f5b1 100644
-+--- a/third_party/sqlite/src/src/test_bestindex.c
-++++ b/third_party/sqlite/src/src/test_bestindex.c
-+@@ -414,6 +414,16 @@ static int tclBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){
-+         zOp = "glob"; break;
-+       case SQLITE_INDEX_CONSTRAINT_REGEXP:
-+         zOp = "regexp"; break;
-++      case SQLITE_INDEX_CONSTRAINT_NE:
-++        zOp = "ne"; break;
-++      case SQLITE_INDEX_CONSTRAINT_ISNOT:
-++        zOp = "isnot"; break;
-++      case SQLITE_INDEX_CONSTRAINT_ISNOTNULL:
-++        zOp = "isnotnull"; break;
-++      case SQLITE_INDEX_CONSTRAINT_ISNULL:
-++        zOp = "isnull"; break;
-++      case SQLITE_INDEX_CONSTRAINT_IS:
-++        zOp = "is"; break;
-+     }
-+ 
-+     Tcl_ListObjAppendElement(0, pElem, Tcl_NewStringObj("op", -1));
-+diff --git a/third_party/sqlite/src/src/test_config.c b/third_party/sqlite/src/src/test_config.c
-+index b794f6c..9539292 100644
-+--- a/third_party/sqlite/src/src/test_config.c
-++++ b/third_party/sqlite/src/src/test_config.c
-+@@ -214,6 +214,12 @@ static void set_options(Tcl_Interp *interp){
-+   Tcl_SetVar2(interp, "sqlite_options", "json1", "0", TCL_GLOBAL_ONLY);
-+ #endif
-+ 
-++#ifdef SQLITE_HAS_CODEC
-++  Tcl_SetVar2(interp, "sqlite_options", "has_codec", "1", TCL_GLOBAL_ONLY);
-++#else
-++  Tcl_SetVar2(interp, "sqlite_options", "has_codec", "0", TCL_GLOBAL_ONLY);
-++#endif
-++
-+ #ifdef SQLITE_LIKE_DOESNT_MATCH_BLOBS
-+   Tcl_SetVar2(interp, "sqlite_options", "like_match_blobs", "0", TCL_GLOBAL_ONLY);
-+ #else
-+diff --git a/third_party/sqlite/src/src/test_devsym.c b/third_party/sqlite/src/src/test_devsym.c
-+index a436bb5..22542b7 100644
-+--- a/third_party/sqlite/src/src/test_devsym.c
-++++ b/third_party/sqlite/src/src/test_devsym.c
-+@@ -28,6 +28,7 @@
-+ ** Name used to identify this VFS.
-+ */
-+ #define DEVSYM_VFS_NAME "devsym"
-++#define WRITECRASH_NAME "writecrash"
-+ 
-+ typedef struct devsym_file devsym_file;
-+ struct devsym_file {
-+@@ -72,61 +73,13 @@ static int devsymRandomness(sqlite3_vfs*, int nByte, char *zOut);
-+ static int devsymSleep(sqlite3_vfs*, int microseconds);
-+ static int devsymCurrentTime(sqlite3_vfs*, double*);
-+ 
-+-static sqlite3_vfs devsym_vfs = {
-+-  2,                     /* iVersion */
-+-  sizeof(devsym_file),      /* szOsFile */
-+-  DEVSYM_MAX_PATHNAME,      /* mxPathname */
-+-  0,                     /* pNext */
-+-  DEVSYM_VFS_NAME,          /* zName */
-+-  0,                     /* pAppData */
-+-  devsymOpen,               /* xOpen */
-+-  devsymDelete,             /* xDelete */
-+-  devsymAccess,             /* xAccess */
-+-  devsymFullPathname,       /* xFullPathname */
-+-#ifndef SQLITE_OMIT_LOAD_EXTENSION
-+-  devsymDlOpen,             /* xDlOpen */
-+-  devsymDlError,            /* xDlError */
-+-  devsymDlSym,              /* xDlSym */
-+-  devsymDlClose,            /* xDlClose */
-+-#else
-+-  0,                        /* xDlOpen */
-+-  0,                        /* xDlError */
-+-  0,                        /* xDlSym */
-+-  0,                        /* xDlClose */
-+-#endif /* SQLITE_OMIT_LOAD_EXTENSION */
-+-  devsymRandomness,         /* xRandomness */
-+-  devsymSleep,              /* xSleep */
-+-  devsymCurrentTime,        /* xCurrentTime */
-+-  0,                        /* xGetLastError */
-+-  0                         /* xCurrentTimeInt64 */
-+-};
-+-
-+-static sqlite3_io_methods devsym_io_methods = {
-+-  2,                                /* iVersion */
-+-  devsymClose,                      /* xClose */
-+-  devsymRead,                       /* xRead */
-+-  devsymWrite,                      /* xWrite */
-+-  devsymTruncate,                   /* xTruncate */
-+-  devsymSync,                       /* xSync */
-+-  devsymFileSize,                   /* xFileSize */
-+-  devsymLock,                       /* xLock */
-+-  devsymUnlock,                     /* xUnlock */
-+-  devsymCheckReservedLock,          /* xCheckReservedLock */
-+-  devsymFileControl,                /* xFileControl */
-+-  devsymSectorSize,                 /* xSectorSize */
-+-  devsymDeviceCharacteristics,      /* xDeviceCharacteristics */
-+-  devsymShmMap,                     /* xShmMap */
-+-  devsymShmLock,                    /* xShmLock */
-+-  devsymShmBarrier,                 /* xShmBarrier */
-+-  devsymShmUnmap                    /* xShmUnmap */
-+-};
-+-
-+ struct DevsymGlobal {
-+   sqlite3_vfs *pVfs;
-+   int iDeviceChar;
-+   int iSectorSize;
-++  int nWriteCrash;
-+ };
-+-struct DevsymGlobal g = {0, 0, 512};
-++struct DevsymGlobal g = {0, 0, 512, 0};
-+ 
-+ /*
-+ ** Close an devsym-file.
-+@@ -271,6 +224,26 @@ static int devsymOpen(
-+   int flags,
-+   int *pOutFlags
-+ ){
-++static sqlite3_io_methods devsym_io_methods = {
-++  2,                                /* iVersion */
-++  devsymClose,                      /* xClose */
-++  devsymRead,                       /* xRead */
-++  devsymWrite,                      /* xWrite */
-++  devsymTruncate,                   /* xTruncate */
-++  devsymSync,                       /* xSync */
-++  devsymFileSize,                   /* xFileSize */
-++  devsymLock,                       /* xLock */
-++  devsymUnlock,                     /* xUnlock */
-++  devsymCheckReservedLock,          /* xCheckReservedLock */
-++  devsymFileControl,                /* xFileControl */
-++  devsymSectorSize,                 /* xSectorSize */
-++  devsymDeviceCharacteristics,      /* xDeviceCharacteristics */
-++  devsymShmMap,                     /* xShmMap */
-++  devsymShmLock,                    /* xShmLock */
-++  devsymShmBarrier,                 /* xShmBarrier */
-++  devsymShmUnmap                    /* xShmUnmap */
-++};
-++
-+   int rc;
-+   devsym_file *p = (devsym_file *)pFile;
-+   p->pReal = (sqlite3_file *)&p[1];
-+@@ -372,6 +345,137 @@ static int devsymCurrentTime(sqlite3_vfs *pVfs, double *pTimeOut){
-+   return g.pVfs->xCurrentTime(g.pVfs, pTimeOut);
-+ }
-+ 
-++/*
-++** Return the sector-size in bytes for an writecrash-file.
-++*/
-++static int writecrashSectorSize(sqlite3_file *pFile){
-++  devsym_file *p = (devsym_file *)pFile;
-++  return sqlite3OsSectorSize(p->pReal);
-++}
-++
-++/*
-++** Return the device characteristic flags supported by an writecrash-file.
-++*/
-++static int writecrashDeviceCharacteristics(sqlite3_file *pFile){
-++  devsym_file *p = (devsym_file *)pFile;
-++  return sqlite3OsDeviceCharacteristics(p->pReal);
-++}
-++
-++/*
-++** Write data to an writecrash-file.
-++*/
-++static int writecrashWrite(
-++  sqlite3_file *pFile,
-++  const void *zBuf,
-++  int iAmt,
-++  sqlite_int64 iOfst
-++){
-++  devsym_file *p = (devsym_file *)pFile;
-++  if( g.nWriteCrash>0 ){
-++    g.nWriteCrash--;
-++    if( g.nWriteCrash==0 ) abort();
-++  }
-++  return sqlite3OsWrite(p->pReal, zBuf, iAmt, iOfst);
-++}
-++
-++/*
-++** Open an writecrash file handle.
-++*/
-++static int writecrashOpen(
-++  sqlite3_vfs *pVfs,
-++  const char *zName,
-++  sqlite3_file *pFile,
-++  int flags,
-++  int *pOutFlags
-++){
-++static sqlite3_io_methods writecrash_io_methods = {
-++  2,                                /* iVersion */
-++  devsymClose,                      /* xClose */
-++  devsymRead,                       /* xRead */
-++  writecrashWrite,                  /* xWrite */
-++  devsymTruncate,                   /* xTruncate */
-++  devsymSync,                       /* xSync */
-++  devsymFileSize,                   /* xFileSize */
-++  devsymLock,                       /* xLock */
-++  devsymUnlock,                     /* xUnlock */
-++  devsymCheckReservedLock,          /* xCheckReservedLock */
-++  devsymFileControl,                /* xFileControl */
-++  writecrashSectorSize,             /* xSectorSize */
-++  writecrashDeviceCharacteristics,  /* xDeviceCharacteristics */
-++  devsymShmMap,                     /* xShmMap */
-++  devsymShmLock,                    /* xShmLock */
-++  devsymShmBarrier,                 /* xShmBarrier */
-++  devsymShmUnmap                    /* xShmUnmap */
-++};
-++
-++  int rc;
-++  devsym_file *p = (devsym_file *)pFile;
-++  p->pReal = (sqlite3_file *)&p[1];
-++  rc = sqlite3OsOpen(g.pVfs, zName, p->pReal, flags, pOutFlags);
-++  if( p->pReal->pMethods ){
-++    pFile->pMethods = &writecrash_io_methods;
-++  }
-++  return rc;
-++}
-++
-++static sqlite3_vfs devsym_vfs = {
-++  2,                     /* iVersion */
-++  sizeof(devsym_file),      /* szOsFile */
-++  DEVSYM_MAX_PATHNAME,      /* mxPathname */
-++  0,                     /* pNext */
-++  DEVSYM_VFS_NAME,          /* zName */
-++  0,                     /* pAppData */
-++  devsymOpen,               /* xOpen */
-++  devsymDelete,             /* xDelete */
-++  devsymAccess,             /* xAccess */
-++  devsymFullPathname,       /* xFullPathname */
-++#ifndef SQLITE_OMIT_LOAD_EXTENSION
-++  devsymDlOpen,             /* xDlOpen */
-++  devsymDlError,            /* xDlError */
-++  devsymDlSym,              /* xDlSym */
-++  devsymDlClose,            /* xDlClose */
-++#else
-++  0,                        /* xDlOpen */
-++  0,                        /* xDlError */
-++  0,                        /* xDlSym */
-++  0,                        /* xDlClose */
-++#endif /* SQLITE_OMIT_LOAD_EXTENSION */
-++  devsymRandomness,         /* xRandomness */
-++  devsymSleep,              /* xSleep */
-++  devsymCurrentTime,        /* xCurrentTime */
-++  0,                        /* xGetLastError */
-++  0                         /* xCurrentTimeInt64 */
-++};
-++
-++static sqlite3_vfs writecrash_vfs = {
-++  2,                     /* iVersion */
-++  sizeof(devsym_file),      /* szOsFile */
-++  DEVSYM_MAX_PATHNAME,      /* mxPathname */
-++  0,                     /* pNext */
-++  WRITECRASH_NAME,          /* zName */
-++  0,                     /* pAppData */
-++  writecrashOpen,           /* xOpen */
-++  devsymDelete,             /* xDelete */
-++  devsymAccess,             /* xAccess */
-++  devsymFullPathname,       /* xFullPathname */
-++#ifndef SQLITE_OMIT_LOAD_EXTENSION
-++  devsymDlOpen,             /* xDlOpen */
-++  devsymDlError,            /* xDlError */
-++  devsymDlSym,              /* xDlSym */
-++  devsymDlClose,            /* xDlClose */
-++#else
-++  0,                        /* xDlOpen */
-++  0,                        /* xDlError */
-++  0,                        /* xDlSym */
-++  0,                        /* xDlClose */
-++#endif /* SQLITE_OMIT_LOAD_EXTENSION */
-++  devsymRandomness,         /* xRandomness */
-++  devsymSleep,              /* xSleep */
-++  devsymCurrentTime,        /* xCurrentTime */
-++  0,                        /* xGetLastError */
-++  0                         /* xCurrentTimeInt64 */
-++};
-++
-+ 
-+ /*
-+ ** This procedure registers the devsym vfs with SQLite. If the argument is
-+@@ -379,10 +483,13 @@ static int devsymCurrentTime(sqlite3_vfs *pVfs, double *pTimeOut){
-+ ** available function in this file.
-+ */
-+ void devsym_register(int iDeviceChar, int iSectorSize){
-++
-+   if( g.pVfs==0 ){
-+     g.pVfs = sqlite3_vfs_find(0);
-+     devsym_vfs.szOsFile += g.pVfs->szOsFile;
-++    writecrash_vfs.szOsFile += g.pVfs->szOsFile;
-+     sqlite3_vfs_register(&devsym_vfs, 0);
-++    sqlite3_vfs_register(&writecrash_vfs, 0);
-+   }
-+   if( iDeviceChar>=0 ){
-+     g.iDeviceChar = iDeviceChar;
-+@@ -403,4 +510,15 @@ void devsym_unregister(){
-+   g.iSectorSize = 0;
-+ }
-+ 
-++void devsym_crash_on_write(int nWrite){
-++  if( g.pVfs==0 ){
-++    g.pVfs = sqlite3_vfs_find(0);
-++    devsym_vfs.szOsFile += g.pVfs->szOsFile;
-++    writecrash_vfs.szOsFile += g.pVfs->szOsFile;
-++    sqlite3_vfs_register(&devsym_vfs, 0);
-++    sqlite3_vfs_register(&writecrash_vfs, 0);
-++  }
-++  g.nWriteCrash = nWrite;
-++}
-++
-+ #endif
-+diff --git a/third_party/sqlite/src/src/test_func.c b/third_party/sqlite/src/src/test_func.c
-+index c8d2873..30f4a32 100644
-+--- a/third_party/sqlite/src/src/test_func.c
-++++ b/third_party/sqlite/src/src/test_func.c
-+@@ -792,6 +792,123 @@ abuse_err:
-+ 
-+ 
-+ /*
-++** SQLite user defined function to use with matchinfo() to calculate the
-++** relevancy of an FTS match. The value returned is the relevancy score
-++** (a real value greater than or equal to zero). A larger value indicates
-++** a more relevant document.
-++**
-++** The overall relevancy returned is the sum of the relevancies of each
-++** column value in the FTS table. The relevancy of a column value is the
-++** sum of the following for each reportable phrase in the FTS query:
-++**
-++**   (<hit count> / <global hit count>) * <column weight>
-++**
-++** where <hit count> is the number of instances of the phrase in the
-++** column value of the current row and <global hit count> is the number
-++** of instances of the phrase in the same column of all rows in the FTS
-++** table. The <column weight> is a weighting factor assigned to each
-++** column by the caller (see below).
-++**
-++** The first argument to this function must be the return value of the FTS
-++** matchinfo() function. Following this must be one argument for each column
-++** of the FTS table containing a numeric weight factor for the corresponding
-++** column. Example:
-++**
-++**     CREATE VIRTUAL TABLE documents USING fts3(title, content)
-++**
-++** The following query returns the docids of documents that match the full-text
-++** query <query> sorted from most to least relevant. When calculating
-++** relevance, query term instances in the 'title' column are given twice the
-++** weighting of those in the 'content' column.
-++**
-++**     SELECT docid FROM documents
-++**     WHERE documents MATCH <query>
-++**     ORDER BY rank(matchinfo(documents), 1.0, 0.5) DESC
-++*/
-++static void rankfunc(sqlite3_context *pCtx, int nVal, sqlite3_value **apVal){
-++  int *aMatchinfo;                /* Return value of matchinfo() */
-++  int nMatchinfo;                 /* Number of elements in aMatchinfo[] */
-++  int nCol = 0;                   /* Number of columns in the table */
-++  int nPhrase = 0;                /* Number of phrases in the query */
-++  int iPhrase;                    /* Current phrase */
-++  double score = 0.0;             /* Value to return */
-++
-++  assert( sizeof(int)==4 );
-++
-++  /* Check that the number of arguments passed to this function is correct.
-++  ** If not, jump to wrong_number_args. Set aMatchinfo to point to the array
-++  ** of unsigned integer values returned by FTS function matchinfo. Set
-++  ** nPhrase to contain the number of reportable phrases in the users full-text
-++  ** query, and nCol to the number of columns in the table. Then check that the
-++  ** size of the matchinfo blob is as expected. Return an error if it is not.
-++  */
-++  if( nVal<1 ) goto wrong_number_args;
-++  aMatchinfo = (int*)sqlite3_value_blob(apVal[0]);
-++  nMatchinfo = sqlite3_value_bytes(apVal[0]) / sizeof(int);
-++  if( nMatchinfo>=2 ){
-++    nPhrase = aMatchinfo[0];
-++    nCol = aMatchinfo[1];
-++  }
-++  if( nMatchinfo!=(2+3*nCol*nPhrase) ){
-++    sqlite3_result_error(pCtx,
-++        "invalid matchinfo blob passed to function rank()", -1);
-++    return;
-++  }
-++  if( nVal!=(1+nCol) ) goto wrong_number_args;
-++
-++  /* Iterate through each phrase in the users query. */
-++  for(iPhrase=0; iPhrase<nPhrase; iPhrase++){
-++    int iCol;                     /* Current column */
-++
-++    /* Now iterate through each column in the users query. For each column,
-++    ** increment the relevancy score by:
-++    **
-++    **   (<hit count> / <global hit count>) * <column weight>
-++    **
-++    ** aPhraseinfo[] points to the start of the data for phrase iPhrase. So
-++    ** the hit count and global hit counts for each column are found in
-++    ** aPhraseinfo[iCol*3] and aPhraseinfo[iCol*3+1], respectively.
-++    */
-++    int *aPhraseinfo = &aMatchinfo[2 + iPhrase*nCol*3];
-++    for(iCol=0; iCol<nCol; iCol++){
-++      int nHitCount = aPhraseinfo[3*iCol];
-++      int nGlobalHitCount = aPhraseinfo[3*iCol+1];
-++      double weight = sqlite3_value_double(apVal[iCol+1]);
-++      if( nHitCount>0 ){
-++        score += ((double)nHitCount / (double)nGlobalHitCount) * weight;
-++      }
-++    }
-++  }
-++
-++  sqlite3_result_double(pCtx, score);
-++  return;
-++
-++  /* Jump here if the wrong number of arguments are passed to this function */
-++wrong_number_args:
-++  sqlite3_result_error(pCtx, "wrong number of arguments to function rank()", -1);
-++}
-++
-++static int SQLITE_TCLAPI install_fts3_rank_function(
-++  void * clientData,
-++  Tcl_Interp *interp,
-++  int objc,
-++  Tcl_Obj *CONST objv[]
-++){
-++  extern int getDbPointer(Tcl_Interp*, const char*, sqlite3**);
-++  sqlite3 *db;
-++
-++  if( objc!=2 ){
-++    Tcl_WrongNumArgs(interp, 1, objv, "DB");
-++    return TCL_ERROR;
-++  }
-++
-++  if( getDbPointer(interp, Tcl_GetString(objv[1]), &db) ) return TCL_ERROR;
-++  sqlite3_create_function(db, "rank", -1, SQLITE_UTF8, 0, rankfunc, 0, 0);
-++  return TCL_OK;
-++}
-++
-++
-++/*
-+ ** Register commands with the TCL interpreter.
-+ */
-+ int Sqlitetest_func_Init(Tcl_Interp *interp){
-+@@ -801,6 +918,7 @@ int Sqlitetest_func_Init(Tcl_Interp *interp){
-+   } aObjCmd[] = {
-+      { "autoinstall_test_functions",    autoinstall_test_funcs },
-+      { "abuse_create_function",         abuse_create_function  },
-++     { "install_fts3_rank_function",    install_fts3_rank_function  },
-+   };
-+   int i;
-+   extern int Md5_Register(sqlite3 *, char **, const sqlite3_api_routines *);
-+diff --git a/third_party/sqlite/src/src/test_malloc.c b/third_party/sqlite/src/src/test_malloc.c
-+index 9283b9a..54a61df 100644
-+--- a/third_party/sqlite/src/src/test_malloc.c
-++++ b/third_party/sqlite/src/src/test_malloc.c
-+@@ -888,46 +888,6 @@ static int SQLITE_TCLAPI test_memdebug_log(
-+ }
-+ 
-+ /*
-+-** Usage:    sqlite3_config_scratch SIZE N
-+-**
-+-** Set the scratch memory buffer using SQLITE_CONFIG_SCRATCH.
-+-** The buffer is static and is of limited size.  N might be
-+-** adjusted downward as needed to accommodate the requested size.
-+-** The revised value of N is returned.
-+-**
-+-** A negative SIZE causes the buffer pointer to be NULL.
-+-*/
-+-static int SQLITE_TCLAPI test_config_scratch(
-+-  void * clientData,
-+-  Tcl_Interp *interp,
-+-  int objc,
-+-  Tcl_Obj *CONST objv[]
-+-){
-+-  int sz, N, rc;
-+-  Tcl_Obj *pResult;
-+-  static char *buf = 0;
-+-  if( objc!=3 ){
-+-    Tcl_WrongNumArgs(interp, 1, objv, "SIZE N");
-+-    return TCL_ERROR;
-+-  }
-+-  if( Tcl_GetIntFromObj(interp, objv[1], &sz) ) return TCL_ERROR;
-+-  if( Tcl_GetIntFromObj(interp, objv[2], &N) ) return TCL_ERROR;
-+-  free(buf);
-+-  if( sz<0 ){
-+-    buf = 0;
-+-    rc = sqlite3_config(SQLITE_CONFIG_SCRATCH, (void*)0, 0, 0);
-+-  }else{
-+-    buf = malloc( sz*N + 1 );
-+-    rc = sqlite3_config(SQLITE_CONFIG_SCRATCH, buf, sz, N);
-+-  }
-+-  pResult = Tcl_NewObj();
-+-  Tcl_ListObjAppendElement(0, pResult, Tcl_NewIntObj(rc));
-+-  Tcl_ListObjAppendElement(0, pResult, Tcl_NewIntObj(N));
-+-  Tcl_SetObjResult(interp, pResult);
-+-  return TCL_OK;
-+-}
-+-
-+-/*
-+ ** Usage:    sqlite3_config_pagecache SIZE N
-+ **
-+ ** Set the page-cache memory buffer using SQLITE_CONFIG_PAGECACHE.
-+@@ -1538,7 +1498,6 @@ int Sqlitetest_malloc_Init(Tcl_Interp *interp){
-+      { "sqlite3_memdebug_settitle",  test_memdebug_settitle        ,0 },
-+      { "sqlite3_memdebug_malloc_count", test_memdebug_malloc_count ,0 },
-+      { "sqlite3_memdebug_log",       test_memdebug_log             ,0 },
-+-     { "sqlite3_config_scratch",     test_config_scratch           ,0 },
-+      { "sqlite3_config_pagecache",   test_config_pagecache         ,0 },
-+      { "sqlite3_config_alt_pcache",  test_alt_pcache               ,0 },
-+      { "sqlite3_status",             test_status                   ,0 },
-+diff --git a/third_party/sqlite/src/src/test_md5.c b/third_party/sqlite/src/src/test_md5.c
-+new file mode 100644
-+index 0000000..b670026
-+--- /dev/null
-++++ b/third_party/sqlite/src/src/test_md5.c
-+@@ -0,0 +1,450 @@
-++/*
-++** 2017-10-13
-++**
-++** The author disclaims copyright to this source code.  In place of
-++** a legal notice, here is a blessing:
-++**
-++**    May you do good and not evil.
-++**    May you find forgiveness for yourself and forgive others.
-++**    May you share freely, never taking more than you give.
-++**
-++*************************************************************************
-++**
-++** This file contains code to implement an MD5 extension to TCL.
-++*/
-++#include "sqlite3.h"
-++#include <stdlib.h>
-++#include <string.h>
-++#include "sqlite3.h"
-++#if defined(INCLUDE_SQLITE_TCL_H)
-++# include "sqlite_tcl.h"
-++#else
-++# include "tcl.h"
-++# ifndef SQLITE_TCLAPI
-++#  define SQLITE_TCLAPI
-++# endif
-++#endif
-++
-++/*
-++ * This code implements the MD5 message-digest algorithm.
-++ * The algorithm is due to Ron Rivest.  This code was
-++ * written by Colin Plumb in 1993, no copyright is claimed.
-++ * This code is in the public domain; do with it what you wish.
-++ *
-++ * Equivalent code is available from RSA Data Security, Inc.
-++ * This code has been tested against that, and is equivalent,
-++ * except that you don't need to include two pages of legalese
-++ * with every copy.
-++ *
-++ * To compute the message digest of a chunk of bytes, declare an
-++ * MD5Context structure, pass it to MD5Init, call MD5Update as
-++ * needed on buffers full of bytes, and then call MD5Final, which
-++ * will fill a supplied 16-byte array with the digest.
-++ */
-++
-++/*
-++ * If compiled on a machine that doesn't have a 32-bit integer,
-++ * you just set "uint32" to the appropriate datatype for an
-++ * unsigned 32-bit integer.  For example:
-++ *
-++ *       cc -Duint32='unsigned long' md5.c
-++ *
-++ */
-++#ifndef uint32
-++#  define uint32 unsigned int
-++#endif
-++
-++struct MD5Context {
-++  int isInit;
-++  uint32 buf[4];
-++  uint32 bits[2];
-++  unsigned char in[64];
-++};
-++typedef struct MD5Context MD5Context;
-++
-++/*
-++ * Note: this code is harmless on little-endian machines.
-++ */
-++static void byteReverse (unsigned char *buf, unsigned longs){
-++        uint32 t;
-++        do {
-++                t = (uint32)((unsigned)buf[3]<<8 | buf[2]) << 16 |
-++                            ((unsigned)buf[1]<<8 | buf[0]);
-++                *(uint32 *)buf = t;
-++                buf += 4;
-++        } while (--longs);
-++}
-++/* The four core functions - F1 is optimized somewhat */
-++
-++/* #define F1(x, y, z) (x & y | ~x & z) */
-++#define F1(x, y, z) (z ^ (x & (y ^ z)))
-++#define F2(x, y, z) F1(z, x, y)
-++#define F3(x, y, z) (x ^ y ^ z)
-++#define F4(x, y, z) (y ^ (x | ~z))
-++
-++/* This is the central step in the MD5 algorithm. */
-++#define MD5STEP(f, w, x, y, z, data, s) \
-++        ( w += f(x, y, z) + data,  w = w<<s | w>>(32-s),  w += x )
-++
-++/*
-++ * The core of the MD5 algorithm, this alters an existing MD5 hash to
-++ * reflect the addition of 16 longwords of new data.  MD5Update blocks
-++ * the data and converts bytes into longwords for this routine.
-++ */
-++static void MD5Transform(uint32 buf[4], const uint32 in[16]){
-++        register uint32 a, b, c, d;
-++
-++        a = buf[0];
-++        b = buf[1];
-++        c = buf[2];
-++        d = buf[3];
-++
-++        MD5STEP(F1, a, b, c, d, in[ 0]+0xd76aa478,  7);
-++        MD5STEP(F1, d, a, b, c, in[ 1]+0xe8c7b756, 12);
-++        MD5STEP(F1, c, d, a, b, in[ 2]+0x242070db, 17);
-++        MD5STEP(F1, b, c, d, a, in[ 3]+0xc1bdceee, 22);
-++        MD5STEP(F1, a, b, c, d, in[ 4]+0xf57c0faf,  7);
-++        MD5STEP(F1, d, a, b, c, in[ 5]+0x4787c62a, 12);
-++        MD5STEP(F1, c, d, a, b, in[ 6]+0xa8304613, 17);
-++        MD5STEP(F1, b, c, d, a, in[ 7]+0xfd469501, 22);
-++        MD5STEP(F1, a, b, c, d, in[ 8]+0x698098d8,  7);
-++        MD5STEP(F1, d, a, b, c, in[ 9]+0x8b44f7af, 12);
-++        MD5STEP(F1, c, d, a, b, in[10]+0xffff5bb1, 17);
-++        MD5STEP(F1, b, c, d, a, in[11]+0x895cd7be, 22);
-++        MD5STEP(F1, a, b, c, d, in[12]+0x6b901122,  7);
-++        MD5STEP(F1, d, a, b, c, in[13]+0xfd987193, 12);
-++        MD5STEP(F1, c, d, a, b, in[14]+0xa679438e, 17);
-++        MD5STEP(F1, b, c, d, a, in[15]+0x49b40821, 22);
-++
-++        MD5STEP(F2, a, b, c, d, in[ 1]+0xf61e2562,  5);
-++        MD5STEP(F2, d, a, b, c, in[ 6]+0xc040b340,  9);
-++        MD5STEP(F2, c, d, a, b, in[11]+0x265e5a51, 14);
-++        MD5STEP(F2, b, c, d, a, in[ 0]+0xe9b6c7aa, 20);
-++        MD5STEP(F2, a, b, c, d, in[ 5]+0xd62f105d,  5);
-++        MD5STEP(F2, d, a, b, c, in[10]+0x02441453,  9);
-++        MD5STEP(F2, c, d, a, b, in[15]+0xd8a1e681, 14);
-++        MD5STEP(F2, b, c, d, a, in[ 4]+0xe7d3fbc8, 20);
-++        MD5STEP(F2, a, b, c, d, in[ 9]+0x21e1cde6,  5);
-++        MD5STEP(F2, d, a, b, c, in[14]+0xc33707d6,  9);
-++        MD5STEP(F2, c, d, a, b, in[ 3]+0xf4d50d87, 14);
-++        MD5STEP(F2, b, c, d, a, in[ 8]+0x455a14ed, 20);
-++        MD5STEP(F2, a, b, c, d, in[13]+0xa9e3e905,  5);
-++        MD5STEP(F2, d, a, b, c, in[ 2]+0xfcefa3f8,  9);
-++        MD5STEP(F2, c, d, a, b, in[ 7]+0x676f02d9, 14);
-++        MD5STEP(F2, b, c, d, a, in[12]+0x8d2a4c8a, 20);
-++
-++        MD5STEP(F3, a, b, c, d, in[ 5]+0xfffa3942,  4);
-++        MD5STEP(F3, d, a, b, c, in[ 8]+0x8771f681, 11);
-++        MD5STEP(F3, c, d, a, b, in[11]+0x6d9d6122, 16);
-++        MD5STEP(F3, b, c, d, a, in[14]+0xfde5380c, 23);
-++        MD5STEP(F3, a, b, c, d, in[ 1]+0xa4beea44,  4);
-++        MD5STEP(F3, d, a, b, c, in[ 4]+0x4bdecfa9, 11);
-++        MD5STEP(F3, c, d, a, b, in[ 7]+0xf6bb4b60, 16);
-++        MD5STEP(F3, b, c, d, a, in[10]+0xbebfbc70, 23);
-++        MD5STEP(F3, a, b, c, d, in[13]+0x289b7ec6,  4);
-++        MD5STEP(F3, d, a, b, c, in[ 0]+0xeaa127fa, 11);
-++        MD5STEP(F3, c, d, a, b, in[ 3]+0xd4ef3085, 16);
-++        MD5STEP(F3, b, c, d, a, in[ 6]+0x04881d05, 23);
-++        MD5STEP(F3, a, b, c, d, in[ 9]+0xd9d4d039,  4);
-++        MD5STEP(F3, d, a, b, c, in[12]+0xe6db99e5, 11);
-++        MD5STEP(F3, c, d, a, b, in[15]+0x1fa27cf8, 16);
-++        MD5STEP(F3, b, c, d, a, in[ 2]+0xc4ac5665, 23);
-++
-++        MD5STEP(F4, a, b, c, d, in[ 0]+0xf4292244,  6);
-++        MD5STEP(F4, d, a, b, c, in[ 7]+0x432aff97, 10);
-++        MD5STEP(F4, c, d, a, b, in[14]+0xab9423a7, 15);
-++        MD5STEP(F4, b, c, d, a, in[ 5]+0xfc93a039, 21);
-++        MD5STEP(F4, a, b, c, d, in[12]+0x655b59c3,  6);
-++        MD5STEP(F4, d, a, b, c, in[ 3]+0x8f0ccc92, 10);
-++        MD5STEP(F4, c, d, a, b, in[10]+0xffeff47d, 15);
-++        MD5STEP(F4, b, c, d, a, in[ 1]+0x85845dd1, 21);
-++        MD5STEP(F4, a, b, c, d, in[ 8]+0x6fa87e4f,  6);
-++        MD5STEP(F4, d, a, b, c, in[15]+0xfe2ce6e0, 10);
-++        MD5STEP(F4, c, d, a, b, in[ 6]+0xa3014314, 15);
-++        MD5STEP(F4, b, c, d, a, in[13]+0x4e0811a1, 21);
-++        MD5STEP(F4, a, b, c, d, in[ 4]+0xf7537e82,  6);
-++        MD5STEP(F4, d, a, b, c, in[11]+0xbd3af235, 10);
-++        MD5STEP(F4, c, d, a, b, in[ 2]+0x2ad7d2bb, 15);
-++        MD5STEP(F4, b, c, d, a, in[ 9]+0xeb86d391, 21);
-++
-++        buf[0] += a;
-++        buf[1] += b;
-++        buf[2] += c;
-++        buf[3] += d;
-++}
-++
-++/*
-++ * Start MD5 accumulation.  Set bit count to 0 and buffer to mysterious
-++ * initialization constants.
-++ */
-++static void MD5Init(MD5Context *ctx){
-++        ctx->isInit = 1;
-++        ctx->buf[0] = 0x67452301;
-++        ctx->buf[1] = 0xefcdab89;
-++        ctx->buf[2] = 0x98badcfe;
-++        ctx->buf[3] = 0x10325476;
-++        ctx->bits[0] = 0;
-++        ctx->bits[1] = 0;
-++}
-++
-++/*
-++ * Update context to reflect the concatenation of another buffer full
-++ * of bytes.
-++ */
-++static
-++void MD5Update(MD5Context *ctx, const unsigned char *buf, unsigned int len){
-++        uint32 t;
-++
-++        /* Update bitcount */
-++
-++        t = ctx->bits[0];
-++        if ((ctx->bits[0] = t + ((uint32)len << 3)) < t)
-++                ctx->bits[1]++; /* Carry from low to high */
-++        ctx->bits[1] += len >> 29;
-++
-++        t = (t >> 3) & 0x3f;    /* Bytes already in shsInfo->data */
-++
-++        /* Handle any leading odd-sized chunks */
-++
-++        if ( t ) {
-++                unsigned char *p = (unsigned char *)ctx->in + t;
-++
-++                t = 64-t;
-++                if (len < t) {
-++                        memcpy(p, buf, len);
-++                        return;
-++                }
-++                memcpy(p, buf, t);
-++                byteReverse(ctx->in, 16);
-++                MD5Transform(ctx->buf, (uint32 *)ctx->in);
-++                buf += t;
-++                len -= t;
-++        }
-++
-++        /* Process data in 64-byte chunks */
-++
-++        while (len >= 64) {
-++                memcpy(ctx->in, buf, 64);
-++                byteReverse(ctx->in, 16);
-++                MD5Transform(ctx->buf, (uint32 *)ctx->in);
-++                buf += 64;
-++                len -= 64;
-++        }
-++
-++        /* Handle any remaining bytes of data. */
-++
-++        memcpy(ctx->in, buf, len);
-++}
-++
-++/*
-++ * Final wrapup - pad to 64-byte boundary with the bit pattern
-++ * 1 0* (64-bit count of bits processed, MSB-first)
-++ */
-++static void MD5Final(unsigned char digest[16], MD5Context *ctx){
-++        unsigned count;
-++        unsigned char *p;
-++
-++        /* Compute number of bytes mod 64 */
-++        count = (ctx->bits[0] >> 3) & 0x3F;
-++
-++        /* Set the first char of padding to 0x80.  This is safe since there is
-++           always at least one byte free */
-++        p = ctx->in + count;
-++        *p++ = 0x80;
-++
-++        /* Bytes of padding needed to make 64 bytes */
-++        count = 64 - 1 - count;
-++
-++        /* Pad out to 56 mod 64 */
-++        if (count < 8) {
-++                /* Two lots of padding:  Pad the first block to 64 bytes */
-++                memset(p, 0, count);
-++                byteReverse(ctx->in, 16);
-++                MD5Transform(ctx->buf, (uint32 *)ctx->in);
-++
-++                /* Now fill the next block with 56 bytes */
-++                memset(ctx->in, 0, 56);
-++        } else {
-++                /* Pad block to 56 bytes */
-++                memset(p, 0, count-8);
-++        }
-++        byteReverse(ctx->in, 14);
-++
-++        /* Append length in bits and transform */
-++        memcpy(ctx->in + 14*4, ctx->bits, 8);
-++
-++        MD5Transform(ctx->buf, (uint32 *)ctx->in);
-++        byteReverse((unsigned char *)ctx->buf, 4);
-++        memcpy(digest, ctx->buf, 16);
-++}
-++
-++/*
-++** Convert a 128-bit MD5 digest into a 32-digit base-16 number.
-++*/
-++static void MD5DigestToBase16(unsigned char *digest, char *zBuf){
-++  static char const zEncode[] = "0123456789abcdef";
-++  int i, j;
-++
-++  for(j=i=0; i<16; i++){
-++    int a = digest[i];
-++    zBuf[j++] = zEncode[(a>>4)&0xf];
-++    zBuf[j++] = zEncode[a & 0xf];
-++  }
-++  zBuf[j] = 0;
-++}
-++
-++
-++/*
-++** Convert a 128-bit MD5 digest into sequency of eight 5-digit integers
-++** each representing 16 bits of the digest and separated from each
-++** other by a "-" character.
-++*/
-++static void MD5DigestToBase10x8(unsigned char digest[16], char zDigest[50]){
-++  int i, j;
-++  unsigned int x;
-++  for(i=j=0; i<16; i+=2){
-++    x = digest[i]*256 + digest[i+1];
-++    if( i>0 ) zDigest[j++] = '-';
-++    sqlite3_snprintf(50-j, &zDigest[j], "%05u", x);
-++    j += 5;
-++  }
-++  zDigest[j] = 0;
-++}
-++
-++/*
-++** A TCL command for md5.  The argument is the text to be hashed.  The
-++** Result is the hash in base64.
-++*/
-++static int SQLITE_TCLAPI md5_cmd(
-++  void*cd,
-++  Tcl_Interp *interp,
-++  int argc,
-++  const char **argv
-++){
-++  MD5Context ctx;
-++  unsigned char digest[16];
-++  char zBuf[50];
-++  void (*converter)(unsigned char*, char*);
-++
-++  if( argc!=2 ){
-++    Tcl_AppendResult(interp,"wrong # args: should be \"", argv[0],
-++        " TEXT\"", (char*)0);
-++    return TCL_ERROR;
-++  }
-++  MD5Init(&ctx);
-++  MD5Update(&ctx, (unsigned char*)argv[1], (unsigned)strlen(argv[1]));
-++  MD5Final(digest, &ctx);
-++  converter = (void(*)(unsigned char*,char*))cd;
-++  converter(digest, zBuf);
-++  Tcl_AppendResult(interp, zBuf, (char*)0);
-++  return TCL_OK;
-++}
-++
-++/*
-++** A TCL command to take the md5 hash of a file.  The argument is the
-++** name of the file.
-++*/
-++static int SQLITE_TCLAPI md5file_cmd(
-++  void*cd,
-++  Tcl_Interp *interp,
-++  int argc,
-++  const char **argv
-++){
-++  FILE *in;
-++  int ofst;
-++  int amt;
-++  MD5Context ctx;
-++  void (*converter)(unsigned char*, char*);
-++  unsigned char digest[16];
-++  char zBuf[10240];
-++
-++  if( argc!=2 && argc!=4 ){
-++    Tcl_AppendResult(interp,"wrong # args: should be \"", argv[0],
-++        " FILENAME [OFFSET AMT]\"", (char*)0);
-++    return TCL_ERROR;
-++  }
-++  if( argc==4 ){
-++    ofst = atoi(argv[2]);
-++    amt = atoi(argv[3]);
-++  }else{
-++    ofst = 0;
-++    amt = 2147483647;
-++  }
-++  in = fopen(argv[1],"rb");
-++  if( in==0 ){
-++    Tcl_AppendResult(interp,"unable to open file \"", argv[1],
-++         "\" for reading", (char*)0);
-++    return TCL_ERROR;
-++  }
-++  fseek(in, ofst, SEEK_SET);
-++  MD5Init(&ctx);
-++  while( amt>0 ){
-++    int n;
-++    n = (int)fread(zBuf, 1, sizeof(zBuf)<=amt ? sizeof(zBuf) : amt, in);
-++    if( n<=0 ) break;
-++    MD5Update(&ctx, (unsigned char*)zBuf, (unsigned)n);
-++    amt -= n;
-++  }
-++  fclose(in);
-++  MD5Final(digest, &ctx);
-++  converter = (void(*)(unsigned char*,char*))cd;
-++  converter(digest, zBuf);
-++  Tcl_AppendResult(interp, zBuf, (char*)0);
-++  return TCL_OK;
-++}
-++
-++/*
-++** Register the four new TCL commands for generating MD5 checksums
-++** with the TCL interpreter.
-++*/
-++int Md5_Init(Tcl_Interp *interp){
-++  Tcl_CreateCommand(interp, "md5", (Tcl_CmdProc*)md5_cmd,
-++                    MD5DigestToBase16, 0);
-++  Tcl_CreateCommand(interp, "md5-10x8", (Tcl_CmdProc*)md5_cmd,
-++                    MD5DigestToBase10x8, 0);
-++  Tcl_CreateCommand(interp, "md5file", (Tcl_CmdProc*)md5file_cmd,
-++                    MD5DigestToBase16, 0);
-++  Tcl_CreateCommand(interp, "md5file-10x8", (Tcl_CmdProc*)md5file_cmd,
-++                    MD5DigestToBase10x8, 0);
-++  return TCL_OK;
-++}
-++
-++/*
-++** During testing, the special md5sum() aggregate function is available.
-++** inside SQLite.  The following routines implement that function.
-++*/
-++static void md5step(sqlite3_context *context, int argc, sqlite3_value **argv){
-++  MD5Context *p;
-++  int i;
-++  if( argc<1 ) return;
-++  p = sqlite3_aggregate_context(context, sizeof(*p));
-++  if( p==0 ) return;
-++  if( !p->isInit ){
-++    MD5Init(p);
-++  }
-++  for(i=0; i<argc; i++){
-++    const char *zData = (char*)sqlite3_value_text(argv[i]);
-++    if( zData ){
-++      MD5Update(p, (unsigned char*)zData, (int)strlen(zData));
-++    }
-++  }
-++}
-++static void md5finalize(sqlite3_context *context){
-++  MD5Context *p;
-++  unsigned char digest[16];
-++  char zBuf[33];
-++  p = sqlite3_aggregate_context(context, sizeof(*p));
-++  MD5Final(digest,p);
-++  MD5DigestToBase16(digest, zBuf);
-++  sqlite3_result_text(context, zBuf, -1, SQLITE_TRANSIENT);
-++}
-++int Md5_Register(
-++  sqlite3 *db,
-++  char **pzErrMsg,
-++  const sqlite3_api_routines *pThunk
-++){
-++  int rc = sqlite3_create_function(db, "md5sum", -1, SQLITE_UTF8, 0, 0,
-++                                 md5step, md5finalize);
-++  sqlite3_overload_function(db, "md5sum", -1);  /* To exercise this API */
-++  return rc;
-++}
-+diff --git a/third_party/sqlite/src/src/test_tclsh.c b/third_party/sqlite/src/src/test_tclsh.c
-+new file mode 100644
-+index 0000000..976f7cb
-+--- /dev/null
-++++ b/third_party/sqlite/src/src/test_tclsh.c
-+@@ -0,0 +1,198 @@
-++/*
-++** 2017-10-13
-++**
-++** The author disclaims copyright to this source code.  In place of
-++** a legal notice, here is a blessing:
-++**
-++**    May you do good and not evil.
-++**    May you find forgiveness for yourself and forgive others.
-++**    May you share freely, never taking more than you give.
-++**
-++*************************************************************************
-++**
-++** This file contains extensions to the the "tclsqlite.c" module used for
-++** testing.  Basically, all of the other "test_*.c" modules are linked
-++** into the enhanced tclsh used for testing (and named "testfixture" or
-++** "testfixture.exe") using logic encoded by this file.
-++**
-++** The code in this file used to be found in tclsqlite3.c, contained within
-++** #if SQLITE_TEST ... #endif.  It is factored out into this separate module
-++** in an effort to keep the tclsqlite.c file pure.
-++*/
-++#include "sqlite3.h"
-++#if defined(INCLUDE_SQLITE_TCL_H)
-++# include "sqlite_tcl.h"
-++#else
-++# include "tcl.h"
-++# ifndef SQLITE_TCLAPI
-++#  define SQLITE_TCLAPI
-++# endif
-++#endif
-++
-++/* Needed for the setrlimit() system call on unix */
-++#if defined(unix)
-++#include <sys/resource.h>
-++#endif
-++
-++/* Forward declaration */
-++static int SQLITE_TCLAPI load_testfixture_extensions(
-++  ClientData cd,
-++  Tcl_Interp *interp,
-++  int objc,
-++  Tcl_Obj *CONST objv[]
-++);
-++
-++/*
-++** This routine is the primary export of this file.
-++**
-++** Configure the interpreter passed as the first argument to have access
-++** to the commands and linked variables that make up:
-++**
-++**   * the [sqlite3] extension itself,
-++**
-++**   * If SQLITE_TCLMD5 or SQLITE_TEST is defined, the Md5 commands, and
-++**
-++**   * If SQLITE_TEST is set, the various test interfaces used by the Tcl
-++**     test suite.
-++*/
-++const char *sqlite3TestInit(Tcl_Interp *interp){
-++  extern int Sqlite3_Init(Tcl_Interp*);
-++  extern int Sqliteconfig_Init(Tcl_Interp*);
-++  extern int Sqlitetest1_Init(Tcl_Interp*);
-++  extern int Sqlitetest2_Init(Tcl_Interp*);
-++  extern int Sqlitetest3_Init(Tcl_Interp*);
-++  extern int Sqlitetest4_Init(Tcl_Interp*);
-++  extern int Sqlitetest5_Init(Tcl_Interp*);
-++  extern int Sqlitetest6_Init(Tcl_Interp*);
-++  extern int Sqlitetest7_Init(Tcl_Interp*);
-++  extern int Sqlitetest8_Init(Tcl_Interp*);
-++  extern int Sqlitetest9_Init(Tcl_Interp*);
-++  extern int Sqlitetestasync_Init(Tcl_Interp*);
-++  extern int Sqlitetest_autoext_Init(Tcl_Interp*);
-++  extern int Sqlitetest_blob_Init(Tcl_Interp*);
-++  extern int Sqlitetest_demovfs_Init(Tcl_Interp *);
-++  extern int Sqlitetest_func_Init(Tcl_Interp*);
-++  extern int Sqlitetest_hexio_Init(Tcl_Interp*);
-++  extern int Sqlitetest_init_Init(Tcl_Interp*);
-++  extern int Sqlitetest_malloc_Init(Tcl_Interp*);
-++  extern int Sqlitetest_mutex_Init(Tcl_Interp*);
-++  extern int Sqlitetestschema_Init(Tcl_Interp*);
-++  extern int Sqlitetestsse_Init(Tcl_Interp*);
-++  extern int Sqlitetesttclvar_Init(Tcl_Interp*);
-++  extern int Sqlitetestfs_Init(Tcl_Interp*);
-++  extern int SqlitetestThread_Init(Tcl_Interp*);
-++  extern int SqlitetestOnefile_Init();
-++  extern int SqlitetestOsinst_Init(Tcl_Interp*);
-++  extern int Sqlitetestbackup_Init(Tcl_Interp*);
-++  extern int Sqlitetestintarray_Init(Tcl_Interp*);
-++  extern int Sqlitetestvfs_Init(Tcl_Interp *);
-++  extern int Sqlitetestrtree_Init(Tcl_Interp*);
-++  extern int Sqlitequota_Init(Tcl_Interp*);
-++  extern int Sqlitemultiplex_Init(Tcl_Interp*);
-++  extern int SqliteSuperlock_Init(Tcl_Interp*);
-++  extern int SqlitetestSyscall_Init(Tcl_Interp*);
-++#if defined(SQLITE_ENABLE_SESSION) && defined(SQLITE_ENABLE_PREUPDATE_HOOK)
-++  extern int TestSession_Init(Tcl_Interp*);
-++#endif
-++  extern int Md5_Init(Tcl_Interp*);
-++  extern int Fts5tcl_Init(Tcl_Interp *);
-++  extern int SqliteRbu_Init(Tcl_Interp*);
-++  extern int Sqlitetesttcl_Init(Tcl_Interp*);
-++#if defined(SQLITE_ENABLE_FTS3) || defined(SQLITE_ENABLE_FTS4)
-++  extern int Sqlitetestfts3_Init(Tcl_Interp *interp);
-++#endif
-++#ifdef SQLITE_ENABLE_ZIPVFS
-++  extern int Zipvfs_Init(Tcl_Interp*);
-++#endif
-++  Tcl_CmdInfo cmdInfo;
-++
-++  /* Since the primary use case for this binary is testing of SQLite,
-++  ** be sure to generate core files if we crash */
-++#if defined(unix)
-++  { struct rlimit x;
-++    getrlimit(RLIMIT_CORE, &x);
-++    x.rlim_cur = x.rlim_max;
-++    setrlimit(RLIMIT_CORE, &x);
-++  }
-++#endif /* unix */
-++
-++  if( Tcl_GetCommandInfo(interp, "sqlite3", &cmdInfo)==0 ){
-++    Sqlite3_Init(interp);
-++  }
-++#ifdef SQLITE_ENABLE_ZIPVFS
-++  Zipvfs_Init(interp);
-++#endif
-++  Md5_Init(interp);
-++  Sqliteconfig_Init(interp);
-++  Sqlitetest1_Init(interp);
-++  Sqlitetest2_Init(interp);
-++  Sqlitetest3_Init(interp);
-++  Sqlitetest4_Init(interp);
-++  Sqlitetest5_Init(interp);
-++  Sqlitetest6_Init(interp);
-++  Sqlitetest7_Init(interp);
-++  Sqlitetest8_Init(interp);
-++  Sqlitetest9_Init(interp);
-++  Sqlitetestasync_Init(interp);
-++  Sqlitetest_autoext_Init(interp);
-++  Sqlitetest_blob_Init(interp);
-++  Sqlitetest_demovfs_Init(interp);
-++  Sqlitetest_func_Init(interp);
-++  Sqlitetest_hexio_Init(interp);
-++  Sqlitetest_init_Init(interp);
-++  Sqlitetest_malloc_Init(interp);
-++  Sqlitetest_mutex_Init(interp);
-++  Sqlitetestschema_Init(interp);
-++  Sqlitetesttclvar_Init(interp);
-++  Sqlitetestfs_Init(interp);
-++  SqlitetestThread_Init(interp);
-++  SqlitetestOnefile_Init();
-++  SqlitetestOsinst_Init(interp);
-++  Sqlitetestbackup_Init(interp);
-++  Sqlitetestintarray_Init(interp);
-++  Sqlitetestvfs_Init(interp);
-++  Sqlitetestrtree_Init(interp);
-++  Sqlitequota_Init(interp);
-++  Sqlitemultiplex_Init(interp);
-++  SqliteSuperlock_Init(interp);
-++  SqlitetestSyscall_Init(interp);
-++#if defined(SQLITE_ENABLE_SESSION) && defined(SQLITE_ENABLE_PREUPDATE_HOOK)
-++  TestSession_Init(interp);
-++#endif
-++  Fts5tcl_Init(interp);
-++  SqliteRbu_Init(interp);
-++  Sqlitetesttcl_Init(interp);
-++
-++#if defined(SQLITE_ENABLE_FTS3) || defined(SQLITE_ENABLE_FTS4)
-++  Sqlitetestfts3_Init(interp);
-++#endif
-++
-++  Tcl_CreateObjCommand(
-++      interp, "load_testfixture_extensions", load_testfixture_extensions,0,0
-++  );
-++  return 0;
-++}
-++
-++/* tclcmd:   load_testfixture_extensions
-++*/
-++static int SQLITE_TCLAPI load_testfixture_extensions(
-++  ClientData cd,
-++  Tcl_Interp *interp,
-++  int objc,
-++  Tcl_Obj *CONST objv[]
-++){
-++
-++  Tcl_Interp *slave;
-++  if( objc!=2 ){
-++    Tcl_WrongNumArgs(interp, 1, objv, "SLAVE");
-++    return TCL_ERROR;
-++  }
-++
-++  slave = Tcl_GetSlave(interp, Tcl_GetString(objv[1]));
-++  if( !slave ){
-++    return TCL_ERROR;
-++  }
-++
-++  (void)sqlite3TestInit(slave);
-++  return TCL_OK;
-++}
-+diff --git a/third_party/sqlite/src/src/test_tclvar.c b/third_party/sqlite/src/src/test_tclvar.c
-+index bef8ca9..c656c57 100644
-+--- a/third_party/sqlite/src/src/test_tclvar.c
-++++ b/third_party/sqlite/src/src/test_tclvar.c
-+@@ -15,6 +15,25 @@
-+ **
-+ ** The emphasis of this file is a virtual table that provides
-+ ** access to TCL variables.
-++**
-++** The TCLVAR eponymous virtual table has a schema like this:
-++**
-++**    CREATE TABLE tclvar(
-++**       name TEXT,       -- base name of the variable:  "x" in "$x(y)"
-++**       arrayname TEXT,  -- array index name: "y" in "$x(y)"
-++**       value TEXT,      -- the value of the variable
-++**       fullname TEXT,   -- the full name of the variable
-++**       PRIMARY KEY(fullname)
-++**    ) WITHOUT ROWID;
-++**
-++** DELETE, INSERT, and UPDATE operations use the "fullname" field to
-++** determine the variable to be modified.  Changing "value" to NULL
-++** deletes the variable.
-++**
-++** For SELECT operations, the "name" and "arrayname" fields will always
-++** match the "fullname" field.  For DELETE, INSERT, and UPDATE, the
-++** "name" and "arrayname" fields are ignored and the variable is modified
-++** according to "fullname" and "value" only.
-+ */
-+ #include "sqliteInt.h"
-+ #if defined(INCLUDE_SQLITE_TCL_H)
-+@@ -67,7 +86,12 @@ static int tclvarConnect(
-+ ){
-+   tclvar_vtab *pVtab;
-+   static const char zSchema[] =
-+-     "CREATE TABLE whatever(name TEXT, arrayname TEXT, value TEXT)";
-++     "CREATE TABLE x("
-++     "  name TEXT,"                       /* Base name */
-++     "  arrayname TEXT,"                  /* Array index */
-++     "  value TEXT,"                      /* Value */
-++     "  fullname TEXT PRIMARY KEY"        /* base(index) name */
-++     ") WITHOUT ROWID";
-+   pVtab = sqlite3MallocZero( sizeof(*pVtab) );
-+   if( pVtab==0 ) return SQLITE_NOMEM;
-+   *ppVtab = &pVtab->base;
-+@@ -251,6 +275,16 @@ static int tclvarColumn(sqlite3_vtab_cursor *cur, sqlite3_context *ctx, int i){
-+       sqlite3_result_text(ctx, Tcl_GetString(pVal), -1, SQLITE_TRANSIENT);
-+       break;
-+     }
-++    case 3: {
-++      char *z3;
-++      if( p2 ){
-++        z3 = sqlite3_mprintf("%s(%s)", z1, z2);
-++        sqlite3_result_text(ctx, z3, -1, sqlite3_free);
-++      }else{
-++        sqlite3_result_text(ctx, z1, -1, SQLITE_TRANSIENT);
-++      }
-++      break;
-++    }
-+   }
-+   return SQLITE_OK;
-+ }
-+@@ -377,6 +411,58 @@ static int tclvarBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){
-+ }
-+ 
-+ /*
-++** Invoked for any UPDATE, INSERT, or DELETE against a tclvar table
-++*/
-++static int tclvarUpdate(
-++  sqlite3_vtab *tab,
-++  int argc,
-++  sqlite3_value **argv,
-++  sqlite_int64 *pRowid
-++){
-++  tclvar_vtab *pTab = (tclvar_vtab*)tab;
-++  if( argc==1 ){
-++    /* A DELETE operation.  The variable to be deleted is stored in argv[0] */
-++    const char *zVar = (const char*)sqlite3_value_text(argv[0]);
-++    Tcl_UnsetVar(pTab->interp, zVar, TCL_GLOBAL_ONLY);
-++    return SQLITE_OK;
-++  }
-++  if( sqlite3_value_type(argv[0])==SQLITE_NULL ){
-++    /* An INSERT operation */
-++    const char *zValue = (const char*)sqlite3_value_text(argv[4]);
-++    const char *zName;
-++    if( sqlite3_value_type(argv[5])!=SQLITE_TEXT ){
-++      tab->zErrMsg = sqlite3_mprintf("the 'fullname' column must be TEXT");
-++      return SQLITE_ERROR;
-++    }
-++    zName = (const char*)sqlite3_value_text(argv[5]);
-++    if( zValue ){
-++      Tcl_SetVar(pTab->interp, zName, zValue, TCL_GLOBAL_ONLY);
-++    }else{
-++      Tcl_UnsetVar(pTab->interp, zName, TCL_GLOBAL_ONLY);
-++    }
-++    return SQLITE_OK;
-++  }
-++  if( sqlite3_value_type(argv[0])==SQLITE_TEXT
-++   && sqlite3_value_type(argv[1])==SQLITE_TEXT
-++  ){
-++    /* An UPDATE operation */
-++    const char *zOldName = (const char*)sqlite3_value_text(argv[0]);
-++    const char *zNewName = (const char*)sqlite3_value_text(argv[1]);
-++    const char *zValue = (const char*)sqlite3_value_text(argv[4]);
-++
-++    if( strcmp(zOldName, zNewName)!=0 || zValue==0 ){
-++      Tcl_UnsetVar(pTab->interp, zOldName, TCL_GLOBAL_ONLY);
-++    }
-++    if( zValue!=0 ){
-++      Tcl_SetVar(pTab->interp, zNewName, zValue, TCL_GLOBAL_ONLY);
-++    }
-++    return SQLITE_OK;
-++  }
-++  tab->zErrMsg = sqlite3_mprintf("prohibited TCL variable change");
-++  return SQLITE_ERROR;
-++}
-++
-++/*
-+ ** A virtual table module that provides read-only access to a
-+ ** Tcl global variable namespace.
-+ */
-+@@ -394,7 +480,7 @@ static sqlite3_module tclvarModule = {
-+   tclvarEof,                   /* xEof - check for end of scan */
-+   tclvarColumn,                /* xColumn - read data */
-+   tclvarRowid,                 /* xRowid - read data */
-+-  0,                           /* xUpdate */
-++  tclvarUpdate,                /* xUpdate */
-+   0,                           /* xBegin */
-+   0,                           /* xSync */
-+   0,                           /* xCommit */
-+diff --git a/third_party/sqlite/src/src/trigger.c b/third_party/sqlite/src/src/trigger.c
-+index fed6304..57fbc8e 100644
-+--- a/third_party/sqlite/src/src/trigger.c
-++++ b/third_party/sqlite/src/src/trigger.c
-+@@ -585,7 +585,7 @@ void sqlite3UnlinkAndDeleteTrigger(sqlite3 *db, int iDb, const char *zName){
-+       *pp = (*pp)->pNext;
-+     }
-+     sqlite3DeleteTrigger(db, pTrigger);
-+-    db->flags |= SQLITE_InternChanges;
-++    db->mDbFlags |= DBFLAG_SchemaChange;
-+   }
-+ }
-+ 
-+diff --git a/third_party/sqlite/src/src/update.c b/third_party/sqlite/src/src/update.c
-+index 0d3225d..ec8cbb5 100644
-+--- a/third_party/sqlite/src/src/update.c
-++++ b/third_party/sqlite/src/src/update.c
-+@@ -803,12 +803,6 @@ static void updateVirtualTable(
-+   if( pWInfo==0 ) return;
-+ 
-+   /* Populate the argument registers. */
-+-  sqlite3VdbeAddOp2(v, OP_Rowid, iCsr, regArg);
-+-  if( pRowid ){
-+-    sqlite3ExprCode(pParse, pRowid, regArg+1);
-+-  }else{
-+-    sqlite3VdbeAddOp2(v, OP_Rowid, iCsr, regArg+1);
-+-  }
-+   for(i=0; i<pTab->nCol; i++){
-+     if( aXRef[i]>=0 ){
-+       sqlite3ExprCode(pParse, pChanges->a[aXRef[i]].pExpr, regArg+2+i);
-+@@ -816,6 +810,23 @@ static void updateVirtualTable(
-+       sqlite3VdbeAddOp3(v, OP_VColumn, iCsr, i, regArg+2+i);
-+     }
-+   }
-++  if( HasRowid(pTab) ){
-++    sqlite3VdbeAddOp2(v, OP_Rowid, iCsr, regArg);
-++    if( pRowid ){
-++      sqlite3ExprCode(pParse, pRowid, regArg+1);
-++    }else{
-++      sqlite3VdbeAddOp2(v, OP_Rowid, iCsr, regArg+1);
-++    }
-++  }else{
-++    Index *pPk;   /* PRIMARY KEY index */
-++    i16 iPk;      /* PRIMARY KEY column */
-++    pPk = sqlite3PrimaryKeyIndex(pTab);
-++    assert( pPk!=0 );
-++    assert( pPk->nKeyCol==1 );
-++    iPk = pPk->aiColumn[0];
-++    sqlite3VdbeAddOp3(v, OP_VColumn, iCsr, iPk, regArg);
-++    sqlite3VdbeAddOp2(v, OP_SCopy, regArg+2+iPk, regArg+1);
-++  }
-+ 
-+   bOnePass = sqlite3WhereOkOnePass(pWInfo, aDummy);
-+ 
-+diff --git a/third_party/sqlite/src/src/util.c b/third_party/sqlite/src/src/util.c
-+index 941d26e..da4a772 100644
-+--- a/third_party/sqlite/src/src/util.c
-++++ b/third_party/sqlite/src/src/util.c
-+@@ -491,7 +491,11 @@ do_atof_calc:
-+           if( esign<0 ){
-+             result = 0.0*s;
-+           }else{
-++#ifdef INFINITY
-++            result = INFINITY*s;
-++#else
-+             result = 1e308*1e308*s;  /* Infinity */
-++#endif
-+           }
-+         }
-+       }else{
-+@@ -553,16 +557,12 @@ static int compare2pow63(const char *zNum, int incr){
-+ ** Convert zNum to a 64-bit signed integer.  zNum must be decimal. This
-+ ** routine does *not* accept hexadecimal notation.
-+ **
-+-** If the zNum value is representable as a 64-bit twos-complement
-+-** integer, then write that value into *pNum and return 0.
-+-**
-+-** If zNum is exactly 9223372036854775808, return 2.  This special
-+-** case is broken out because while 9223372036854775808 cannot be a
-+-** signed 64-bit integer, its negative -9223372036854775808 can be.
-++** Returns:
-+ **
-+-** If zNum is too big for a 64-bit integer and is not
-+-** 9223372036854775808  or if zNum contains any non-numeric text,
-+-** then return 1.
-++**     0    Successful transformation.  Fits in a 64-bit signed integer.
-++**     1    Excess text after the integer value
-++**     2    Integer too large for a 64-bit signed integer or is malformed
-++**     3    Special case of 9223372036854775808
-+ **
-+ ** length is the number of bytes in the string (bytes, not characters).
-+ ** The string is not necessarily zero-terminated.  The encoding is
-+@@ -575,6 +575,7 @@ int sqlite3Atoi64(const char *zNum, i64 *pNum, int length, u8 enc){
-+   int i;
-+   int c = 0;
-+   int nonNum = 0;  /* True if input contains UTF16 with high byte non-zero */
-++  int rc;          /* Baseline return code */
-+   const char *zStart;
-+   const char *zEnd = zNum + length;
-+   assert( enc==SQLITE_UTF8 || enc==SQLITE_UTF16LE || enc==SQLITE_UTF16BE );
-+@@ -614,31 +615,35 @@ int sqlite3Atoi64(const char *zNum, i64 *pNum, int length, u8 enc){
-+   testcase( i==20 );
-+   if( &zNum[i]<zEnd              /* Extra bytes at the end */
-+    || (i==0 && zStart==zNum)     /* No digits */
-+-   || i>19*incr                  /* Too many digits */
-+    || nonNum                     /* UTF16 with high-order bytes non-zero */
-+   ){
-++    rc = 1;
-++  }else{
-++    rc = 0;
-++  }
-++  if( i>19*incr ){                /* Too many digits */
-+     /* zNum is empty or contains non-numeric text or is longer
-+     ** than 19 digits (thus guaranteeing that it is too large) */
-+-    return 1;
-++    return 2;
-+   }else if( i<19*incr ){
-+     /* Less than 19 digits, so we know that it fits in 64 bits */
-+     assert( u<=LARGEST_INT64 );
-+-    return 0;
-++    return rc;
-+   }else{
-+     /* zNum is a 19-digit numbers.  Compare it against 9223372036854775808. */
-+     c = compare2pow63(zNum, incr);
-+     if( c<0 ){
-+       /* zNum is less than 9223372036854775808 so it fits */
-+       assert( u<=LARGEST_INT64 );
-+-      return 0;
-++      return rc;
-+     }else if( c>0 ){
-+       /* zNum is greater than 9223372036854775808 so it overflows */
-+-      return 1;
-++      return 2;
-+     }else{
-+       /* zNum is exactly 9223372036854775808.  Fits if negative.  The
-+       ** special case 2 overflow if positive */
-+       assert( u-1==LARGEST_INT64 );
-+-      return neg ? 0 : 2;
-++      return neg ? rc : 3;
-+     }
-+   }
-+ }
-+@@ -651,8 +656,9 @@ int sqlite3Atoi64(const char *zNum, i64 *pNum, int length, u8 enc){
-+ ** Returns:
-+ **
-+ **     0    Successful transformation.  Fits in a 64-bit signed integer.
-+-**     1    Integer too large for a 64-bit signed integer or is malformed
-+-**     2    Special case of 9223372036854775808
-++**     1    Excess text after the integer value
-++**     2    Integer too large for a 64-bit signed integer or is malformed
-++**     3    Special case of 9223372036854775808
-+ */
-+ int sqlite3DecOrHexToI64(const char *z, i64 *pOut){
-+ #ifndef SQLITE_OMIT_HEX_INTEGER
-+@@ -666,7 +672,7 @@ int sqlite3DecOrHexToI64(const char *z, i64 *pOut){
-+       u = u*16 + sqlite3HexToInt(z[k]);
-+     }
-+     memcpy(pOut, &u, 8);
-+-    return (z[k]==0 && k-i<=16) ? 0 : 1;
-++    return (z[k]==0 && k-i<=16) ? 0 : 2;
-+   }else
-+ #endif /* SQLITE_OMIT_HEX_INTEGER */
-+   {
-+@@ -1276,7 +1282,7 @@ int sqlite3SafetyCheckSickOrOk(sqlite3 *db){
-+ ** overflow, leave *pA unchanged and return 1.
-+ */
-+ int sqlite3AddInt64(i64 *pA, i64 iB){
-+-#if GCC_VERSION>=5004000
-++#if GCC_VERSION>=5004000 && !defined(__INTEL_COMPILER)
-+   return __builtin_add_overflow(*pA, iB, pA);
-+ #else
-+   i64 iA = *pA;
-+@@ -1296,7 +1302,7 @@ int sqlite3AddInt64(i64 *pA, i64 iB){
-+ #endif
-+ }
-+ int sqlite3SubInt64(i64 *pA, i64 iB){
-+-#if GCC_VERSION>=5004000
-++#if GCC_VERSION>=5004000 && !defined(__INTEL_COMPILER)
-+   return __builtin_sub_overflow(*pA, iB, pA);
-+ #else
-+   testcase( iB==SMALLEST_INT64+1 );
-+@@ -1311,7 +1317,7 @@ int sqlite3SubInt64(i64 *pA, i64 iB){
-+ #endif
-+ }
-+ int sqlite3MulInt64(i64 *pA, i64 iB){
-+-#if GCC_VERSION>=5004000
-++#if GCC_VERSION>=5004000 && !defined(__INTEL_COMPILER)
-+   return __builtin_mul_overflow(*pA, iB, pA);
-+ #else
-+   i64 iA = *pA;
-+@@ -1413,8 +1419,14 @@ LogEst sqlite3LogEst(u64 x){
-+     if( x<2 ) return 0;
-+     while( x<8 ){  y -= 10; x <<= 1; }
-+   }else{
-++#if GCC_VERSION>=5004000
-++    int i = 60 - __builtin_clzll(x);
-++    y += i*10;
-++    x >>= i;
-++#else
-+     while( x>255 ){ y += 40; x >>= 4; }  /*OPTIMIZATION-IF-TRUE*/
-+     while( x>15 ){  y += 10; x >>= 1; }
-++#endif
-+   }
-+   return a[x&7] + y - 10;
-+ }
-+diff --git a/third_party/sqlite/src/src/vacuum.c b/third_party/sqlite/src/src/vacuum.c
-+index 2480a6d..42e247f 100644
-+--- a/third_party/sqlite/src/src/vacuum.c
-++++ b/third_party/sqlite/src/src/vacuum.c
-+@@ -130,7 +130,8 @@ int sqlite3RunVacuum(char **pzErrMsg, sqlite3 *db, int iDb){
-+   int rc = SQLITE_OK;     /* Return code from service routines */
-+   Btree *pMain;           /* The database being vacuumed */
-+   Btree *pTemp;           /* The temporary database we vacuum into */
-+-  int saved_flags;        /* Saved value of the db->flags */
-++  u16 saved_mDbFlags;     /* Saved value of db->mDbFlags */
-++  u32 saved_flags;        /* Saved value of db->flags */
-+   int saved_nChange;      /* Saved value of db->nChange */
-+   int saved_nTotalChange; /* Saved value of db->nTotalChange */
-+   u8 saved_mTrace;        /* Saved trace settings */
-+@@ -153,11 +154,12 @@ int sqlite3RunVacuum(char **pzErrMsg, sqlite3 *db, int iDb){
-+   ** restored before returning. Then set the writable-schema flag, and
-+   ** disable CHECK and foreign key constraints.  */
-+   saved_flags = db->flags;
-++  saved_mDbFlags = db->mDbFlags;
-+   saved_nChange = db->nChange;
-+   saved_nTotalChange = db->nTotalChange;
-+   saved_mTrace = db->mTrace;
-+-  db->flags |= (SQLITE_WriteSchema | SQLITE_IgnoreChecks
-+-                 | SQLITE_PreferBuiltin | SQLITE_Vacuum);
-++  db->flags |= SQLITE_WriteSchema | SQLITE_IgnoreChecks;
-++  db->mDbFlags |= DBFLAG_PreferBuiltin | DBFLAG_Vacuum;
-+   db->flags &= ~(SQLITE_ForeignKeys | SQLITE_ReverseOrder | SQLITE_CountRows);
-+   db->mTrace = 0;
-+ 
-+@@ -268,8 +270,8 @@ int sqlite3RunVacuum(char **pzErrMsg, sqlite3 *db, int iDb){
-+       "WHERE type='table'AND coalesce(rootpage,1)>0",
-+       zDbMain
-+   );
-+-  assert( (db->flags & SQLITE_Vacuum)!=0 );
-+-  db->flags &= ~SQLITE_Vacuum;
-++  assert( (db->mDbFlags & DBFLAG_Vacuum)!=0 );
-++  db->mDbFlags &= ~DBFLAG_Vacuum;
-+   if( rc!=SQLITE_OK ) goto end_of_vacuum;
-+ 
-+   /* Copy the triggers, views, and virtual tables from the main database
-+@@ -337,6 +339,7 @@ int sqlite3RunVacuum(char **pzErrMsg, sqlite3 *db, int iDb){
-+ end_of_vacuum:
-+   /* Restore the original value of db->flags */
-+   db->init.iDb = 0;
-++  db->mDbFlags = saved_mDbFlags;
-+   db->flags = saved_flags;
-+   db->nChange = saved_nChange;
-+   db->nTotalChange = saved_nTotalChange;
-+diff --git a/third_party/sqlite/src/src/vdbe.c b/third_party/sqlite/src/src/vdbe.c
-+index 22f8682..3524959 100644
-+--- a/third_party/sqlite/src/src/vdbe.c
-++++ b/third_party/sqlite/src/src/vdbe.c
-+@@ -354,7 +354,7 @@ static u16 SQLITE_NOINLINE computeNumericType(Mem *pMem){
-+   if( sqlite3AtoF(pMem->z, &pMem->u.r, pMem->n, pMem->enc)==0 ){
-+     return 0;
-+   }
-+-  if( sqlite3Atoi64(pMem->z, &pMem->u.i, pMem->n, pMem->enc)==SQLITE_OK ){
-++  if( sqlite3Atoi64(pMem->z, &pMem->u.i, pMem->n, pMem->enc)==0 ){
-+     return MEM_Int;
-+   }
-+   return MEM_Real;
-+@@ -1955,13 +1955,23 @@ case OP_Ge: {             /* same as TK_GE, jump, in1, in3 */
-+     res = sqlite3MemCompare(pIn3, pIn1, pOp->p4.pColl);
-+   }
-+ compare_op:
-+-  switch( pOp->opcode ){
-+-    case OP_Eq:    res2 = res==0;     break;
-+-    case OP_Ne:    res2 = res;        break;
-+-    case OP_Lt:    res2 = res<0;      break;
-+-    case OP_Le:    res2 = res<=0;     break;
-+-    case OP_Gt:    res2 = res>0;      break;
-+-    default:       res2 = res>=0;     break;
-++  /* At this point, res is negative, zero, or positive if reg[P1] is
-++  ** less than, equal to, or greater than reg[P3], respectively.  Compute
-++  ** the answer to this operator in res2, depending on what the comparison
-++  ** operator actually is.  The next block of code depends on the fact
-++  ** that the 6 comparison operators are consecutive integers in this
-++  ** order:  NE, EQ, GT, LE, LT, GE */
-++  assert( OP_Eq==OP_Ne+1 ); assert( OP_Gt==OP_Ne+2 ); assert( OP_Le==OP_Ne+3 );
-++  assert( OP_Lt==OP_Ne+4 ); assert( OP_Ge==OP_Ne+5 );
-++  if( res<0 ){                        /* ne, eq, gt, le, lt, ge */
-++    static const unsigned char aLTb[] = { 1,  0,  0,  1,  1,  0 };
-++    res2 = aLTb[pOp->opcode - OP_Ne];
-++  }else if( res==0 ){
-++    static const unsigned char aEQb[] = { 0,  1,  0,  1,  0,  1 };
-++    res2 = aEQb[pOp->opcode - OP_Ne];
-++  }else{
-++    static const unsigned char aGTb[] = { 1,  0,  1,  0,  0,  1 };
-++    res2 = aGTb[pOp->opcode - OP_Ne];
-+   }
-+ 
-+   /* Undo any changes made by applyAffinity() to the input registers. */
-+@@ -1973,7 +1983,6 @@ compare_op:
-+   if( pOp->p5 & SQLITE_STOREP2 ){
-+     pOut = &aMem[pOp->p2];
-+     iCompare = res;
-+-    res2 = res2!=0;  /* For this path res2 must be exactly 0 or 1 */
-+     if( (pOp->p5 & SQLITE_KEEPNULL)!=0 ){
-+       /* The KEEPNULL flag prevents OP_Eq from overwriting a NULL with 1
-+       ** and prevents OP_Ne from overwriting NULL with 0.  This flag
-+@@ -2104,7 +2113,7 @@ case OP_Compare: {
-+     assert( memIsValid(&aMem[p2+idx]) );
-+     REGISTER_TRACE(p1+idx, &aMem[p1+idx]);
-+     REGISTER_TRACE(p2+idx, &aMem[p2+idx]);
-+-    assert( i<pKeyInfo->nField );
-++    assert( i<pKeyInfo->nKeyField );
-+     pColl = pKeyInfo->aColl[i];
-+     bRev = pKeyInfo->aSortOrder[i];
-+     iCompare = sqlite3MemCompare(&aMem[p1+idx], &aMem[p2+idx], pColl);
-+@@ -2377,9 +2386,7 @@ case OP_Column: {
-+   const u8 *zData;   /* Part of the record being decoded */
-+   const u8 *zHdr;    /* Next unparsed byte of the header */
-+   const u8 *zEndHdr; /* Pointer to first byte after the header */
-+-  u32 offset;        /* Offset into the data */
-+   u64 offset64;      /* 64-bit offset */
-+-  u32 avail;         /* Number of bytes of available data */
-+   u32 t;             /* A type code from the record header */
-+   Mem *pReg;         /* PseudoTable input register */
-+ 
-+@@ -2406,11 +2413,13 @@ case OP_Column: {
-+   if( pC->cacheStatus!=p->cacheCtr ){                /*OPTIMIZATION-IF-FALSE*/
-+     if( pC->nullRow ){
-+       if( pC->eCurType==CURTYPE_PSEUDO ){
-+-        assert( pC->uc.pseudoTableReg>0 );
-+-        pReg = &aMem[pC->uc.pseudoTableReg];
-++        /* For the special case of as pseudo-cursor, the seekResult field
-++        ** identifies the register that holds the record */
-++        assert( pC->seekResult>0 );
-++        pReg = &aMem[pC->seekResult];
-+         assert( pReg->flags & MEM_Blob );
-+         assert( memIsValid(pReg) );
-+-        pC->payloadSize = pC->szRow = avail = pReg->n;
-++        pC->payloadSize = pC->szRow = pReg->n;
-+         pC->aRow = (u8*)pReg->z;
-+       }else{
-+         sqlite3VdbeMemSetNull(pDest);
-+@@ -2422,23 +2431,19 @@ case OP_Column: {
-+       assert( pCrsr );
-+       assert( sqlite3BtreeCursorIsValid(pCrsr) );
-+       pC->payloadSize = sqlite3BtreePayloadSize(pCrsr);
-+-      pC->aRow = sqlite3BtreePayloadFetch(pCrsr, &avail);
-+-      assert( avail<=65536 );  /* Maximum page size is 64KiB */
-+-      if( pC->payloadSize <= (u32)avail ){
-+-        pC->szRow = pC->payloadSize;
-+-      }else if( pC->payloadSize > (u32)db->aLimit[SQLITE_LIMIT_LENGTH] ){
-++      pC->aRow = sqlite3BtreePayloadFetch(pCrsr, &pC->szRow);
-++      assert( pC->szRow<=pC->payloadSize );
-++      assert( pC->szRow<=65536 );  /* Maximum page size is 64KiB */
-++      if( pC->payloadSize > (u32)db->aLimit[SQLITE_LIMIT_LENGTH] ){
-+         goto too_big;
-+-      }else{
-+-        pC->szRow = avail;
-+       }
-+     }
-+     pC->cacheStatus = p->cacheCtr;
-+-    pC->iHdrOffset = getVarint32(pC->aRow, offset);
-++    pC->iHdrOffset = getVarint32(pC->aRow, aOffset[0]);
-+     pC->nHdrParsed = 0;
-+-    aOffset[0] = offset;
-+ 
-+ 
-+-    if( avail<offset ){      /*OPTIMIZATION-IF-FALSE*/
-++    if( pC->szRow<aOffset[0] ){      /*OPTIMIZATION-IF-FALSE*/
-+       /* pC->aRow does not have to hold the entire row, but it does at least
-+       ** need to cover the header of the record.  If pC->aRow does not contain
-+       ** the complete header, then set it to zero, forcing the header to be
-+@@ -2455,17 +2460,26 @@ case OP_Column: {
-+       ** 3-byte type for each of the maximum of 32768 columns plus three
-+       ** extra bytes for the header length itself.  32768*3 + 3 = 98307.
-+       */
-+-      if( offset > 98307 || offset > pC->payloadSize ){
-+-        rc = SQLITE_CORRUPT_BKPT;
-+-        goto abort_due_to_error;
-++      if( aOffset[0] > 98307 || aOffset[0] > pC->payloadSize ){
-++        goto op_column_corrupt;
-+       }
-+-    }else if( offset>0 ){ /*OPTIMIZATION-IF-TRUE*/
-+-      /* The following goto is an optimization.  It can be omitted and
-+-      ** everything will still work.  But OP_Column is measurably faster
-+-      ** by skipping the subsequent conditional, which is always true.
-++    }else{
-++      /* This is an optimization.  By skipping over the first few tests
-++      ** (ex: pC->nHdrParsed<=p2) in the next section, we achieve a
-++      ** measurable performance gain.
-++      **
-++      ** This branch is taken even if aOffset[0]==0.  Such a record is never
-++      ** generated by SQLite, and could be considered corruption, but we
-++      ** accept it for historical reasons.  When aOffset[0]==0, the code this
-++      ** branch jumps to reads past the end of the record, but never more
-++      ** than a few bytes.  Even if the record occurs at the end of the page
-++      ** content area, the "page header" comes after the page content and so
-++      ** this overread is harmless.  Similar overreads can occur for a corrupt
-++      ** database file.
-+       */
-+       zData = pC->aRow;
-+       assert( pC->nHdrParsed<=p2 );         /* Conditional skipped */
-++      testcase( aOffset[0]==0 );
-+       goto op_column_read_header;
-+     }
-+   }
-+@@ -2494,6 +2508,7 @@ case OP_Column: {
-+       offset64 = aOffset[i];
-+       zHdr = zData + pC->iHdrOffset;
-+       zEndHdr = zData + aOffset[0];
-++      testcase( zHdr>=zEndHdr );
-+       do{
-+         if( (t = zHdr[0])<0x80 ){
-+           zHdr++;
-+@@ -2514,9 +2529,13 @@ case OP_Column: {
-+       if( (zHdr>=zEndHdr && (zHdr>zEndHdr || offset64!=pC->payloadSize))
-+        || (offset64 > pC->payloadSize)
-+       ){
-+-        if( pC->aRow==0 ) sqlite3VdbeMemRelease(&sMem);
-+-        rc = SQLITE_CORRUPT_BKPT;
-+-        goto abort_due_to_error;
-++        if( aOffset[0]==0 ){
-++          i = 0;
-++          zHdr = zEndHdr;
-++        }else{
-++          if( pC->aRow==0 ) sqlite3VdbeMemRelease(&sMem);
-++          goto op_column_corrupt;
-++        }
-+       }
-+ 
-+       pC->nHdrParsed = i;
-+@@ -2610,6 +2629,15 @@ op_column_out:
-+   UPDATE_MAX_BLOBSIZE(pDest);
-+   REGISTER_TRACE(pOp->p3, pDest);
-+   break;
-++
-++op_column_corrupt:
-++  if( aOp[0].p3>0 ){
-++    pOp = &aOp[aOp[0].p3-1];
-++    break;
-++  }else{
-++    rc = SQLITE_CORRUPT_BKPT;
-++    goto abort_due_to_error;
-++  }
-+ }
-+ 
-+ /* Opcode: Affinity P1 P2 * P4 *
-+@@ -2950,7 +2978,7 @@ case OP_Savepoint: {
-+         int isSchemaChange;
-+         iSavepoint = db->nSavepoint - iSavepoint - 1;
-+         if( p1==SAVEPOINT_ROLLBACK ){
-+-          isSchemaChange = (db->flags & SQLITE_InternChanges)!=0;
-++          isSchemaChange = (db->mDbFlags & DBFLAG_SchemaChange)!=0;
-+           for(ii=0; ii<db->nDb; ii++){
-+             rc = sqlite3BtreeTripAllCursors(db->aDb[ii].pBt,
-+                                        SQLITE_ABORT_ROLLBACK,
-+@@ -2969,7 +2997,7 @@ case OP_Savepoint: {
-+         if( isSchemaChange ){
-+           sqlite3ExpirePreparedStatements(db);
-+           sqlite3ResetAllSchemasOfConnection(db);
-+-          db->flags = (db->flags | SQLITE_InternChanges);
-++          db->mDbFlags |= DBFLAG_SchemaChange;
-+         }
-+       }
-+ 
-+@@ -3249,7 +3277,7 @@ case OP_SetCookie: {
-+   if( pOp->p2==BTREE_SCHEMA_VERSION ){
-+     /* When the schema cookie changes, record the new cookie internally */
-+     pDb->pSchema->schema_cookie = pOp->p3;
-+-    db->flags |= SQLITE_InternChanges;
-++    db->mDbFlags |= DBFLAG_SchemaChange;
-+   }else if( pOp->p2==BTREE_FILE_FORMAT ){
-+     /* Record changes in the file format */
-+     pDb->pSchema->file_format = pOp->p3;
-+@@ -3388,7 +3416,7 @@ case OP_OpenWrite:
-+     assert( (pIn2->flags & MEM_Int)!=0 );
-+     sqlite3VdbeMemIntegerify(pIn2);
-+     p2 = (int)pIn2->u.i;
-+-    /* The p2 value always comes from a prior OP_CreateTable opcode and
-++    /* The p2 value always comes from a prior OP_CreateBtree opcode and
-+     ** that opcode will always set the p2 value to 2 or more or else fail.
-+     ** If there were a failure, the prepared statement would have halted
-+     ** before reaching this instruction. */
-+@@ -3398,7 +3426,7 @@ case OP_OpenWrite:
-+     pKeyInfo = pOp->p4.pKeyInfo;
-+     assert( pKeyInfo->enc==ENC(db) );
-+     assert( pKeyInfo->db==db );
-+-    nField = pKeyInfo->nField+pKeyInfo->nXField;
-++    nField = pKeyInfo->nAllField;
-+   }else if( pOp->p4type==P4_INT32 ){
-+     nField = pOp->p4.i;
-+   }
-+@@ -3609,8 +3637,13 @@ case OP_OpenPseudo: {
-+   pCx = allocateCursor(p, pOp->p1, pOp->p3, -1, CURTYPE_PSEUDO);
-+   if( pCx==0 ) goto no_mem;
-+   pCx->nullRow = 1;
-+-  pCx->uc.pseudoTableReg = pOp->p2;
-++  pCx->seekResult = pOp->p2;
-+   pCx->isTable = 1;
-++  /* Give this pseudo-cursor a fake BtCursor pointer so that pCx
-++  ** can be safely passed to sqlite3VdbeCursorMoveto().  This avoids a test
-++  ** for pCx->eCurType==CURTYPE_BTREE inside of sqlite3VdbeCursorMoveto()
-++  ** which is a performance optimization */
-++  pCx->uc.pCursor = sqlite3BtreeFakeValidCursor();
-+   assert( pOp->p5==0 );
-+   break;
-+ }
-+@@ -4402,14 +4435,9 @@ case OP_InsertInt: {
-+ 
-+   if( pOp->p5 & OPFLAG_NCHANGE ) p->nChange++;
-+   if( pOp->p5 & OPFLAG_LASTROWID ) db->lastRowid = x.nKey;
-+-  if( pData->flags & MEM_Null ){
-+-    x.pData = 0;
-+-    x.nData = 0;
-+-  }else{
-+-    assert( pData->flags & (MEM_Blob|MEM_Str) );
-+-    x.pData = pData->z;
-+-    x.nData = pData->n;
-+-  }
-++  assert( pData->flags & (MEM_Blob|MEM_Str) );
-++  x.pData = pData->z;
-++  x.nData = pData->n;
-+   seekResult = ((pOp->p5 & OPFLAG_USESEEKRESULT) ? pC->seekResult : 0);
-+   if( pData->flags & MEM_Zero ){
-+     x.nZero = pData->u.nZero;
-+@@ -4776,7 +4804,17 @@ case OP_NullRow: {
-+   break;
-+ }
-+ 
-+-/* Opcode: Last P1 P2 P3 * *
-++/* Opcode: SeekEnd P1 * * * *
-++**
-++** Position cursor P1 at the end of the btree for the purpose of
-++** appending a new entry onto the btree.
-++**
-++** It is assumed that the cursor is used only for appending and so
-++** if the cursor is valid, then the cursor must already be pointing
-++** at the end of the btree and so no changes are made to
-++** the cursor.
-++*/
-++/* Opcode: Last P1 P2 * * *
-+ **
-+ ** The next use of the Rowid or Column or Prev instruction for P1
-+ ** will refer to the last entry in the database table or index.
-+@@ -4787,14 +4825,8 @@ case OP_NullRow: {
-+ ** This opcode leaves the cursor configured to move in reverse order,
-+ ** from the end toward the beginning.  In other words, the cursor is
-+ ** configured to use Prev, not Next.
-+-**
-+-** If P3 is -1, then the cursor is positioned at the end of the btree
-+-** for the purpose of appending a new entry onto the btree.  In that
-+-** case P2 must be 0.  It is assumed that the cursor is used only for
-+-** appending and so if the cursor is valid, then the cursor must already
-+-** be pointing at the end of the btree and so no changes are made to
-+-** the cursor.
-+ */
-++case OP_SeekEnd:
-+ case OP_Last: {        /* jump */
-+   VdbeCursor *pC;
-+   BtCursor *pCrsr;
-+@@ -4807,22 +4839,24 @@ case OP_Last: {        /* jump */
-+   pCrsr = pC->uc.pCursor;
-+   res = 0;
-+   assert( pCrsr!=0 );
-+-  pC->seekResult = pOp->p3;
-+ #ifdef SQLITE_DEBUG
-+-  pC->seekOp = OP_Last;
-++  pC->seekOp = pOp->opcode;
-+ #endif
-+-  if( pOp->p3==0 || !sqlite3BtreeCursorIsValidNN(pCrsr) ){
-+-    rc = sqlite3BtreeLast(pCrsr, &res);
-+-    pC->nullRow = (u8)res;
-+-    pC->deferredMoveto = 0;
-+-    pC->cacheStatus = CACHE_STALE;
-+-    if( rc ) goto abort_due_to_error;
-+-    if( pOp->p2>0 ){
-+-      VdbeBranchTaken(res!=0,2);
-+-      if( res ) goto jump_to_p2;
-+-    }
-+-  }else{
-++  if( pOp->opcode==OP_SeekEnd ){
-+     assert( pOp->p2==0 );
-++    pC->seekResult = -1;
-++    if( sqlite3BtreeCursorIsValidNN(pCrsr) ){
-++      break;
-++    }
-++  }
-++  rc = sqlite3BtreeLast(pCrsr, &res);
-++  pC->nullRow = (u8)res;
-++  pC->deferredMoveto = 0;
-++  pC->cacheStatus = CACHE_STALE;
-++  if( rc ) goto abort_due_to_error;
-++  if( pOp->p2>0 ){
-++    VdbeBranchTaken(res!=0,2);
-++    if( res ) goto jump_to_p2;
-+   }
-+   break;
-+ }
-+@@ -5451,50 +5485,28 @@ case OP_ResetSorter: {
-+   break;
-+ }
-+ 
-+-/* Opcode: CreateTable P1 P2 * * *
-+-** Synopsis: r[P2]=root iDb=P1
-+-**
-+-** Allocate a new table in the main database file if P1==0 or in the
-+-** auxiliary database file if P1==1 or in an attached database if
-+-** P1>1.  Write the root page number of the new table into
-+-** register P2
-+-**
-+-** The difference between a table and an index is this:  A table must
-+-** have a 4-byte integer key and can have arbitrary data.  An index
-+-** has an arbitrary key but no data.
-+-**
-+-** See also: CreateIndex
-+-*/
-+-/* Opcode: CreateIndex P1 P2 * * *
-+-** Synopsis: r[P2]=root iDb=P1
-+-**
-+-** Allocate a new index in the main database file if P1==0 or in the
-+-** auxiliary database file if P1==1 or in an attached database if
-+-** P1>1.  Write the root page number of the new table into
-+-** register P2.
-++/* Opcode: CreateBtree P1 P2 P3 * *
-++** Synopsis: r[P2]=root iDb=P1 flags=P3
-+ **
-+-** See documentation on OP_CreateTable for additional information.
-++** Allocate a new b-tree in the main database file if P1==0 or in the
-++** TEMP database file if P1==1 or in an attached database if
-++** P1>1.  The P3 argument must be 1 (BTREE_INTKEY) for a rowid table
-++** it must be 2 (BTREE_BLOBKEY) for a index or WITHOUT ROWID table.
-++** The root page number of the new b-tree is stored in register P2.
-+ */
-+-case OP_CreateIndex:            /* out2 */
-+-case OP_CreateTable: {          /* out2 */
-++case OP_CreateBtree: {          /* out2 */
-+   int pgno;
-+-  int flags;
-+   Db *pDb;
-+ 
-+   pOut = out2Prerelease(p, pOp);
-+   pgno = 0;
-++  assert( pOp->p3==BTREE_INTKEY || pOp->p3==BTREE_BLOBKEY );
-+   assert( pOp->p1>=0 && pOp->p1<db->nDb );
-+   assert( DbMaskTest(p->btreeMask, pOp->p1) );
-+   assert( p->readOnly==0 );
-+   pDb = &db->aDb[pOp->p1];
-+   assert( pDb->pBt!=0 );
-+-  if( pOp->opcode==OP_CreateTable ){
-+-    /* flags = BTREE_INTKEY; */
-+-    flags = BTREE_INTKEY;
-+-  }else{
-+-    flags = BTREE_BLOBKEY;
-+-  }
-+-  rc = sqlite3BtreeCreateTable(pDb->pBt, &pgno, flags);
-++  rc = sqlite3BtreeCreateTable(pDb->pBt, &pgno, pOp->p3);
-+   if( rc ) goto abort_due_to_error;
-+   pOut->u.i = pgno;
-+   break;
-+@@ -7005,7 +7017,7 @@ case OP_Function: {
-+ }
-+ 
-+ 
-+-/* Opcode: Init P1 P2 * P4 *
-++/* Opcode: Init P1 P2 P3 P4 *
-+ ** Synopsis: Start at P2
-+ **
-+ ** Programs contain a single instance of this opcode as the very first
-+@@ -7019,6 +7031,9 @@ case OP_Function: {
-+ **
-+ ** Increment the value of P1 so that OP_Once opcodes will jump the
-+ ** first time they are evaluated for this run.
-++**
-++** If P3 is not zero, then it is an address to jump to if an SQLITE_CORRUPT
-++** error is encountered.
-+ */
-+ case OP_Init: {          /* jump */
-+   char *zTrace;
-+diff --git a/third_party/sqlite/src/src/vdbeInt.h b/third_party/sqlite/src/src/vdbeInt.h
-+index c550e6d..63a33a2 100644
-+--- a/third_party/sqlite/src/src/vdbeInt.h
-++++ b/third_party/sqlite/src/src/vdbeInt.h
-+@@ -96,18 +96,18 @@ struct VdbeCursor {
-+   u32 cacheStatus;        /* Cache is valid if this matches Vdbe.cacheCtr */
-+   int seekResult;         /* Result of previous sqlite3BtreeMoveto() or 0
-+                           ** if there have been no prior seeks on the cursor. */
-+-  /* NB: seekResult does not distinguish between "no seeks have ever occurred
-+-  ** on this cursor" and "the most recent seek was an exact match". */
-++  /* seekResult does not distinguish between "no seeks have ever occurred
-++  ** on this cursor" and "the most recent seek was an exact match".
-++  ** For CURTYPE_PSEUDO, seekResult is the register holding the record */
-+ 
-+   /* When a new VdbeCursor is allocated, only the fields above are zeroed.
-+   ** The fields that follow are uninitialized, and must be individually
-+   ** initialized prior to first use. */
-+   VdbeCursor *pAltCursor; /* Associated index cursor from which to read */
-+   union {
-+-    BtCursor *pCursor;          /* CURTYPE_BTREE.  Btree cursor */
-+-    sqlite3_vtab_cursor *pVCur; /* CURTYPE_VTAB.   Vtab cursor */
-+-    int pseudoTableReg;         /* CURTYPE_PSEUDO. Reg holding content. */
-+-    VdbeSorter *pSorter;        /* CURTYPE_SORTER. Sorter object */
-++    BtCursor *pCursor;          /* CURTYPE_BTREE or _PSEUDO.  Btree cursor */
-++    sqlite3_vtab_cursor *pVCur; /* CURTYPE_VTAB.              Vtab cursor */
-++    VdbeSorter *pSorter;        /* CURTYPE_SORTER.            Sorter object */
-+   } uc;
-+   KeyInfo *pKeyInfo;      /* Info about index keys needed by index cursors */
-+   u32 iHdrOffset;         /* Offset to next unparsed byte of the header */
-+diff --git a/third_party/sqlite/src/src/vdbeapi.c b/third_party/sqlite/src/src/vdbeapi.c
-+index 7450ce4..4338ce7 100644
-+--- a/third_party/sqlite/src/src/vdbeapi.c
-++++ b/third_party/sqlite/src/src/vdbeapi.c
-+@@ -517,7 +517,7 @@ static int doWalCallbacks(sqlite3 *db){
-+       sqlite3BtreeEnter(pBt);
-+       nEntry = sqlite3PagerWalCallback(sqlite3BtreePager(pBt));
-+       sqlite3BtreeLeave(pBt);
-+-      if( db->xWalCallback && nEntry>0 && rc==SQLITE_OK ){
-++      if( nEntry>0 && db->xWalCallback && rc==SQLITE_OK ){
-+         rc = db->xWalCallback(db->pWalArg, db, db->aDb[i].zDbSName, nEntry);
-+       }
-+     }
-+@@ -627,7 +627,7 @@ static int sqlite3Step(Vdbe *p){
-+   if( rc!=SQLITE_ROW ) checkProfileCallback(db, p);
-+ #endif
-+ 
-+-  if( rc==SQLITE_DONE ){
-++  if( rc==SQLITE_DONE && db->autoCommit ){
-+     assert( p->rc==SQLITE_OK );
-+     p->rc = doWalCallbacks(db);
-+     if( p->rc!=SQLITE_OK ){
-+@@ -671,7 +671,6 @@ end_of_step:
-+ */
-+ int sqlite3_step(sqlite3_stmt *pStmt){
-+   int rc = SQLITE_OK;      /* Result from sqlite3Step() */
-+-  int rc2 = SQLITE_OK;     /* Result from sqlite3Reprepare() */
-+   Vdbe *v = (Vdbe*)pStmt;  /* the prepared statement */
-+   int cnt = 0;             /* Counter to prevent infinite loop of reprepares */
-+   sqlite3 *db;             /* The database connection */
-+@@ -685,32 +684,31 @@ int sqlite3_step(sqlite3_stmt *pStmt){
-+   while( (rc = sqlite3Step(v))==SQLITE_SCHEMA
-+          && cnt++ < SQLITE_MAX_SCHEMA_RETRY ){
-+     int savedPc = v->pc;
-+-    rc2 = rc = sqlite3Reprepare(v);
-+-    if( rc!=SQLITE_OK) break;
-++    rc = sqlite3Reprepare(v);
-++    if( rc!=SQLITE_OK ){
-++      /* This case occurs after failing to recompile an sql statement.
-++      ** The error message from the SQL compiler has already been loaded
-++      ** into the database handle. This block copies the error message
-++      ** from the database handle into the statement and sets the statement
-++      ** program counter to 0 to ensure that when the statement is
-++      ** finalized or reset the parser error message is available via
-++      ** sqlite3_errmsg() and sqlite3_errcode().
-++      */
-++      const char *zErr = (const char *)sqlite3_value_text(db->pErr);
-++      sqlite3DbFree(db, v->zErrMsg);
-++      if( !db->mallocFailed ){
-++        v->zErrMsg = sqlite3DbStrDup(db, zErr);
-++        v->rc = rc = sqlite3ApiExit(db, rc);
-++      } else {
-++        v->zErrMsg = 0;
-++        v->rc = rc = SQLITE_NOMEM_BKPT;
-++      }
-++      break;
-++    }
-+     sqlite3_reset(pStmt);
-+     if( savedPc>=0 ) v->doingRerun = 1;
-+     assert( v->expired==0 );
-+   }
-+-  if( rc2!=SQLITE_OK ){
-+-    /* This case occurs after failing to recompile an sql statement.
-+-    ** The error message from the SQL compiler has already been loaded
-+-    ** into the database handle. This block copies the error message
-+-    ** from the database handle into the statement and sets the statement
-+-    ** program counter to 0 to ensure that when the statement is
-+-    ** finalized or reset the parser error message is available via
-+-    ** sqlite3_errmsg() and sqlite3_errcode().
-+-    */
-+-    const char *zErr = (const char *)sqlite3_value_text(db->pErr);
-+-    sqlite3DbFree(db, v->zErrMsg);
-+-    if( !db->mallocFailed ){
-+-      v->zErrMsg = sqlite3DbStrDup(db, zErr);
-+-      v->rc = rc2;
-+-    } else {
-+-      v->zErrMsg = 0;
-+-      v->rc = rc = SQLITE_NOMEM_BKPT;
-+-    }
-+-  }
-+-  rc = sqlite3ApiExit(db, rc);
-+   sqlite3_mutex_leave(db->mutex);
-+   return rc;
-+ }
-+@@ -1708,7 +1706,7 @@ static UnpackedRecord *vdbeUnpackRecord(
-+ 
-+   pRet = sqlite3VdbeAllocUnpackedRecord(pKeyInfo);
-+   if( pRet ){
-+-    memset(pRet->aMem, 0, sizeof(Mem)*(pKeyInfo->nField+1));
-++    memset(pRet->aMem, 0, sizeof(Mem)*(pKeyInfo->nKeyField+1));
-+     sqlite3VdbeRecordUnpack(pKeyInfo, nKey, pKey, pRet);
-+   }
-+   return pRet;
-+@@ -1781,7 +1779,7 @@ int sqlite3_preupdate_old(sqlite3 *db, int iIdx, sqlite3_value **ppValue){
-+ */
-+ int sqlite3_preupdate_count(sqlite3 *db){
-+   PreUpdate *p = db->pPreUpdate;
-+-  return (p ? p->keyinfo.nField : 0);
-++  return (p ? p->keyinfo.nKeyField : 0);
-+ }
-+ #endif /* SQLITE_ENABLE_PREUPDATE_HOOK */
-+ 
-+diff --git a/third_party/sqlite/src/src/vdbeaux.c b/third_party/sqlite/src/src/vdbeaux.c
-+index 8ae546f..e9eb0a8 100644
-+--- a/third_party/sqlite/src/src/vdbeaux.c
-++++ b/third_party/sqlite/src/src/vdbeaux.c
-+@@ -33,10 +33,12 @@ Vdbe *sqlite3VdbeCreate(Parse *pParse){
-+   db->pVdbe = p;
-+   p->magic = VDBE_MAGIC_INIT;
-+   p->pParse = pParse;
-++  pParse->pVdbe = p;
-+   assert( pParse->aLabel==0 );
-+   assert( pParse->nLabel==0 );
-+   assert( pParse->nOpAlloc==0 );
-+   assert( pParse->szOpAlloc==0 );
-++  sqlite3VdbeAddOp2(p, OP_Init, 0, 1);
-+   return p;
-+ }
-+ 
-+@@ -490,7 +492,8 @@ static Op *opIterNext(VdbeOpIter *p){
-+ **   *  OP_VUpdate
-+ **   *  OP_VRename
-+ **   *  OP_FkCounter with P2==0 (immediate foreign key constraint)
-+-**   *  OP_CreateTable and OP_InitCoroutine (for CREATE TABLE AS SELECT ...)
-++**   *  OP_CreateBtree/BTREE_INTKEY and OP_InitCoroutine
-++**      (for CREATE TABLE AS SELECT ...)
-+ **
-+ ** Then check that the value of Parse.mayAbort is true if an
-+ ** ABORT may be thrown, or false otherwise. Return true if it does
-+@@ -518,7 +521,7 @@ int sqlite3VdbeAssertMayAbort(Vdbe *v, int mayAbort){
-+       hasAbort = 1;
-+       break;
-+     }
-+-    if( opcode==OP_CreateTable ) hasCreateTable = 1;
-++    if( opcode==OP_CreateBtree && pOp->p3==BTREE_INTKEY ) hasCreateTable = 1;
-+     if( opcode==OP_InitCoroutine ) hasInitCoroutine = 1;
-+ #ifndef SQLITE_OMIT_FOREIGN_KEY
-+     if( opcode==OP_FkCounter && pOp->p1==0 && pOp->p2==1 ){
-+@@ -597,6 +600,27 @@ static void resolveP2Values(Vdbe *p, int *pMaxFuncArgs){
-+           p->bIsReader = 1;
-+           break;
-+         }
-++        case OP_Next:
-++        case OP_NextIfOpen:
-++        case OP_SorterNext: {
-++          pOp->p4.xAdvance = sqlite3BtreeNext;
-++          pOp->p4type = P4_ADVANCE;
-++          /* The code generator never codes any of these opcodes as a jump
-++          ** to a label.  They are always coded as a jump backwards to a
-++          ** known address */
-++          assert( pOp->p2>=0 );
-++          break;
-++        }
-++        case OP_Prev:
-++        case OP_PrevIfOpen: {
-++          pOp->p4.xAdvance = sqlite3BtreePrevious;
-++          pOp->p4type = P4_ADVANCE;
-++          /* The code generator never codes any of these opcodes as a jump
-++          ** to a label.  They are always coded as a jump backwards to a
-++          ** known address */
-++          assert( pOp->p2>=0 );
-++          break;
-++        }
-+ #ifndef SQLITE_OMIT_VIRTUALTABLE
-+         case OP_VUpdate: {
-+           if( pOp->p2>nMaxArgs ) nMaxArgs = pOp->p2;
-+@@ -608,27 +632,25 @@ static void resolveP2Values(Vdbe *p, int *pMaxFuncArgs){
-+           assert( pOp[-1].opcode==OP_Integer );
-+           n = pOp[-1].p1;
-+           if( n>nMaxArgs ) nMaxArgs = n;
-+-          break;
-++          /* Fall through into the default case */
-+         }
-+ #endif
-+-        case OP_Next:
-+-        case OP_NextIfOpen:
-+-        case OP_SorterNext: {
-+-          pOp->p4.xAdvance = sqlite3BtreeNext;
-+-          pOp->p4type = P4_ADVANCE;
-+-          break;
-+-        }
-+-        case OP_Prev:
-+-        case OP_PrevIfOpen: {
-+-          pOp->p4.xAdvance = sqlite3BtreePrevious;
-+-          pOp->p4type = P4_ADVANCE;
-++        default: {
-++          if( pOp->p2<0 ){
-++            /* The mkopcodeh.tcl script has so arranged things that the only
-++            ** non-jump opcodes less than SQLITE_MX_JUMP_CODE are guaranteed to
-++            ** have non-negative values for P2. */
-++            assert( (sqlite3OpcodeProperty[pOp->opcode] & OPFLG_JUMP)!=0 );
-++            assert( ADDR(pOp->p2)<pParse->nLabel );
-++            pOp->p2 = aLabel[ADDR(pOp->p2)];
-++          }
-+           break;
-+         }
-+       }
-+-      if( (sqlite3OpcodeProperty[pOp->opcode] & OPFLG_JUMP)!=0 && pOp->p2<0 ){
-+-        assert( ADDR(pOp->p2)<pParse->nLabel );
-+-        pOp->p2 = aLabel[ADDR(pOp->p2)];
-+-      }
-++      /* The mkopcodeh.tcl script has so arranged things that the only
-++      ** non-jump opcodes less than SQLITE_MX_JUMP_CODE are guaranteed to
-++      ** have non-negative values for P2. */
-++      assert( (sqlite3OpcodeProperty[pOp->opcode]&OPFLG_JUMP)==0 || pOp->p2>=0);
-+     }
-+     if( pOp==p->aOp ) break;
-+     pOp--;
-+@@ -1301,8 +1323,8 @@ static char *displayP4(Op *pOp, char *zTemp, int nTemp){
-+       int j;
-+       KeyInfo *pKeyInfo = pOp->p4.pKeyInfo;
-+       assert( pKeyInfo->aSortOrder!=0 );
-+-      sqlite3XPrintf(&x, "k(%d", pKeyInfo->nField);
-+-      for(j=0; j<pKeyInfo->nField; j++){
-++      sqlite3XPrintf(&x, "k(%d", pKeyInfo->nKeyField);
-++      for(j=0; j<pKeyInfo->nKeyField; j++){
-+         CollSeq *pColl = pKeyInfo->aColl[j];
-+         const char *zColl = pColl ? pColl->zName : "";
-+         if( strcmp(zColl, "BINARY")==0 ) zColl = "B";
-+@@ -2139,27 +2161,6 @@ static void closeAllCursors(Vdbe *p){
-+ }
-+ 
-+ /*
-+-** Clean up the VM after a single run.
-+-*/
-+-static void Cleanup(Vdbe *p){
-+-  sqlite3 *db = p->db;
-+-
-+-#ifdef SQLITE_DEBUG
-+-  /* Execute assert() statements to ensure that the Vdbe.apCsr[] and
-+-  ** Vdbe.aMem[] arrays have already been cleaned up.  */
-+-  int i;
-+-  if( p->apCsr ) for(i=0; i<p->nCursor; i++) assert( p->apCsr[i]==0 );
-+-  if( p->aMem ){
-+-    for(i=0; i<p->nMem; i++) assert( p->aMem[i].flags==MEM_Undefined );
-+-  }
-+-#endif
-+-
-+-  sqlite3DbFree(db, p->zErrMsg);
-+-  p->zErrMsg = 0;
-+-  p->pResultSet = 0;
-+-}
-+-
-+-/*
-+ ** Set the number of result columns that will be returned by this SQL
-+ ** statement. This is now set at compile time, rather than during
-+ ** execution of the vdbe program so that sqlite3_column_count() can
-+@@ -2867,6 +2868,10 @@ static void vdbeInvokeSqllog(Vdbe *v){
-+ ** VDBE_MAGIC_INIT.
-+ */
-+ int sqlite3VdbeReset(Vdbe *p){
-++#if defined(SQLITE_DEBUG) || defined(VDBE_PROFILE)
-++  int i;
-++#endif
-++
-+   sqlite3 *db;
-+   db = p->db;
-+ 
-+@@ -2884,8 +2889,6 @@ int sqlite3VdbeReset(Vdbe *p){
-+   if( p->pc>=0 ){
-+     vdbeInvokeSqllog(p);
-+     sqlite3VdbeTransferError(p);
-+-    sqlite3DbFree(db, p->zErrMsg);
-+-    p->zErrMsg = 0;
-+     if( p->runOnlyOnce ) p->expired = 1;
-+   }else if( p->rc && p->expired ){
-+     /* The expired flag was set on the VDBE before the first call
-+@@ -2893,13 +2896,21 @@ int sqlite3VdbeReset(Vdbe *p){
-+     ** called), set the database error in this case as well.
-+     */
-+     sqlite3ErrorWithMsg(db, p->rc, p->zErrMsg ? "%s" : 0, p->zErrMsg);
-+-    sqlite3DbFree(db, p->zErrMsg);
-+-    p->zErrMsg = 0;
-+   }
-+ 
-+-  /* Reclaim all memory used by the VDBE
-++  /* Reset register contents and reclaim error message memory.
-+   */
-+-  Cleanup(p);
-++#ifdef SQLITE_DEBUG
-++  /* Execute assert() statements to ensure that the Vdbe.apCsr[] and
-++  ** Vdbe.aMem[] arrays have already been cleaned up.  */
-++  if( p->apCsr ) for(i=0; i<p->nCursor; i++) assert( p->apCsr[i]==0 );
-++  if( p->aMem ){
-++    for(i=0; i<p->nMem; i++) assert( p->aMem[i].flags==MEM_Undefined );
-++  }
-++#endif
-++  sqlite3DbFree(db, p->zErrMsg);
-++  p->zErrMsg = 0;
-++  p->pResultSet = 0;
-+ 
-+   /* Save profiling information from this VDBE run.
-+   */
-+@@ -2907,7 +2918,6 @@ int sqlite3VdbeReset(Vdbe *p){
-+   {
-+     FILE *out = fopen("vdbe_profile.out", "a");
-+     if( out ){
-+-      int i;
-+       fprintf(out, "---- ");
-+       for(i=0; i<p->nOp; i++){
-+         fprintf(out, "%02x", p->aOp[i].opcode);
-+@@ -3120,19 +3130,18 @@ int sqlite3VdbeCursorRestore(VdbeCursor *p){
-+ */
-+ int sqlite3VdbeCursorMoveto(VdbeCursor **pp, int *piCol){
-+   VdbeCursor *p = *pp;
-+-  if( p->eCurType==CURTYPE_BTREE ){
-+-    if( p->deferredMoveto ){
-+-      int iMap;
-+-      if( p->aAltMap && (iMap = p->aAltMap[1+*piCol])>0 ){
-+-        *pp = p->pAltCursor;
-+-        *piCol = iMap - 1;
-+-        return SQLITE_OK;
-+-      }
-+-      return handleDeferredMoveto(p);
-+-    }
-+-    if( sqlite3BtreeCursorHasMoved(p->uc.pCursor) ){
-+-      return handleMovedCursor(p);
-++  assert( p->eCurType==CURTYPE_BTREE || p->eCurType==CURTYPE_PSEUDO );
-++  if( p->deferredMoveto ){
-++    int iMap;
-++    if( p->aAltMap && (iMap = p->aAltMap[1+*piCol])>0 ){
-++      *pp = p->pAltCursor;
-++      *piCol = iMap - 1;
-++      return SQLITE_OK;
-+     }
-++    return handleDeferredMoveto(p);
-++  }
-++  if( sqlite3BtreeCursorHasMoved(p->uc.pCursor) ){
-++    return handleMovedCursor(p);
-+   }
-+   return SQLITE_OK;
-+ }
-+@@ -3528,13 +3537,13 @@ UnpackedRecord *sqlite3VdbeAllocUnpackedRecord(
-+ ){
-+   UnpackedRecord *p;              /* Unpacked record to return */
-+   int nByte;                      /* Number of bytes required for *p */
-+-  nByte = ROUND8(sizeof(UnpackedRecord)) + sizeof(Mem)*(pKeyInfo->nField+1);
-++  nByte = ROUND8(sizeof(UnpackedRecord)) + sizeof(Mem)*(pKeyInfo->nKeyField+1);
-+   p = (UnpackedRecord *)sqlite3DbMallocRaw(pKeyInfo->db, nByte);
-+   if( !p ) return 0;
-+   p->aMem = (Mem*)&((char*)p)[ROUND8(sizeof(UnpackedRecord))];
-+   assert( pKeyInfo->aSortOrder!=0 );
-+   p->pKeyInfo = pKeyInfo;
-+-  p->nField = pKeyInfo->nField + 1;
-++  p->nField = pKeyInfo->nKeyField + 1;
-+   return p;
-+ }
-+ 
-+@@ -3574,7 +3583,7 @@ void sqlite3VdbeRecordUnpack(
-+     pMem++;
-+     if( (++u)>=p->nField ) break;
-+   }
-+-  assert( u<=pKeyInfo->nField + 1 );
-++  assert( u<=pKeyInfo->nKeyField + 1 );
-+   p->nField = u;
-+ }
-+ 
-+@@ -3623,9 +3632,9 @@ static int vdbeRecordCompareDebug(
-+   idx1 = getVarint32(aKey1, szHdr1);
-+   if( szHdr1>98307 ) return SQLITE_CORRUPT;
-+   d1 = szHdr1;
-+-  assert( pKeyInfo->nField+pKeyInfo->nXField>=pPKey2->nField || CORRUPT_DB );
-++  assert( pKeyInfo->nAllField>=pPKey2->nField || CORRUPT_DB );
-+   assert( pKeyInfo->aSortOrder!=0 );
-+-  assert( pKeyInfo->nField>0 );
-++  assert( pKeyInfo->nKeyField>0 );
-+   assert( idx1<=szHdr1 || CORRUPT_DB );
-+   do{
-+     u32 serial_type1;
-+@@ -3687,12 +3696,12 @@ debugCompareEnd:
-+ /*
-+ ** Count the number of fields (a.k.a. columns) in the record given by
-+ ** pKey,nKey.  The verify that this count is less than or equal to the
-+-** limit given by pKeyInfo->nField + pKeyInfo->nXField.
-++** limit given by pKeyInfo->nAllField.
-+ **
-+ ** If this constraint is not satisfied, it means that the high-speed
-+ ** vdbeRecordCompareInt() and vdbeRecordCompareString() routines will
-+ ** not work correctly.  If this assert() ever fires, it probably means
-+-** that the KeyInfo.nField or KeyInfo.nXField values were computed
-++** that the KeyInfo.nKeyField or KeyInfo.nAllField values were computed
-+ ** incorrectly.
-+ */
-+ static void vdbeAssertFieldCountWithinLimits(
-+@@ -3713,7 +3722,7 @@ static void vdbeAssertFieldCountWithinLimits(
-+     idx += getVarint32(aKey+idx, notUsed);
-+     nField++;
-+   }
-+-  assert( nField <= pKeyInfo->nField+pKeyInfo->nXField );
-++  assert( nField <= pKeyInfo->nAllField );
-+ }
-+ #else
-+ # define vdbeAssertFieldCountWithinLimits(A,B,C)
-+@@ -4018,10 +4027,10 @@ int sqlite3VdbeRecordCompareWithSkip(
-+   }
-+ 
-+   VVA_ONLY( mem1.szMalloc = 0; ) /* Only needed by assert() statements */
-+-  assert( pPKey2->pKeyInfo->nField+pPKey2->pKeyInfo->nXField>=pPKey2->nField
-++  assert( pPKey2->pKeyInfo->nAllField>=pPKey2->nField
-+        || CORRUPT_DB );
-+   assert( pPKey2->pKeyInfo->aSortOrder!=0 );
-+-  assert( pPKey2->pKeyInfo->nField>0 );
-++  assert( pPKey2->pKeyInfo->nKeyField>0 );
-+   assert( idx1<=szHdr1 || CORRUPT_DB );
-+   do{
-+     u32 serial_type;
-+@@ -4354,7 +4363,7 @@ RecordCompare sqlite3VdbeFindCompare(UnpackedRecord *p){
-+   ** The easiest way to enforce this limit is to consider only records with
-+   ** 13 fields or less. If the first field is an integer, the maximum legal
-+   ** header size is (12*5 + 1 + 1) bytes.  */
-+-  if( (p->pKeyInfo->nField + p->pKeyInfo->nXField)<=13 ){
-++  if( p->pKeyInfo->nAllField<=13 ){
-+     int flags = p->aMem[0].flags;
-+     if( p->pKeyInfo->aSortOrder[0] ){
-+       p->r1 = 1;
-+@@ -4683,7 +4692,7 @@ void sqlite3VdbePreUpdateHook(
-+   preupdate.iNewReg = iReg;
-+   preupdate.keyinfo.db = db;
-+   preupdate.keyinfo.enc = ENC(db);
-+-  preupdate.keyinfo.nField = pTab->nCol;
-++  preupdate.keyinfo.nKeyField = pTab->nCol;
-+   preupdate.keyinfo.aSortOrder = (u8*)&fakeSortOrder;
-+   preupdate.iKey1 = iKey1;
-+   preupdate.iKey2 = iKey2;
-+@@ -4693,8 +4702,8 @@ void sqlite3VdbePreUpdateHook(
-+   db->xPreUpdateCallback(db->pPreUpdateArg, db, op, zDb, zTbl, iKey1, iKey2);
-+   db->pPreUpdate = 0;
-+   sqlite3DbFree(db, preupdate.aRecord);
-+-  vdbeFreeUnpacked(db, preupdate.keyinfo.nField+1, preupdate.pUnpacked);
-+-  vdbeFreeUnpacked(db, preupdate.keyinfo.nField+1, preupdate.pNewUnpacked);
-++  vdbeFreeUnpacked(db, preupdate.keyinfo.nKeyField+1, preupdate.pUnpacked);
-++  vdbeFreeUnpacked(db, preupdate.keyinfo.nKeyField+1, preupdate.pNewUnpacked);
-+   if( preupdate.aNew ){
-+     int i;
-+     for(i=0; i<pCsr->nField; i++){
-+diff --git a/third_party/sqlite/src/src/vdbeblob.c b/third_party/sqlite/src/src/vdbeblob.c
-+index 96a98649..785efdc 100644
-+--- a/third_party/sqlite/src/src/vdbeblob.c
-++++ b/third_party/sqlite/src/src/vdbeblob.c
-+@@ -63,11 +63,12 @@ static int blobSeekToRow(Incrblob *p, sqlite3_int64 iRow, char **pzErr){
-+   v->aMem[1].u.i = iRow;
-+ 
-+   /* If the statement has been run before (and is paused at the OP_ResultRow)
-+-  ** then back it up to the point where it does the OP_SeekRowid.  This could
-++  ** then back it up to the point where it does the OP_NotExists.  This could
-+   ** have been down with an extra OP_Goto, but simply setting the program
-+   ** counter is faster. */
-+-  if( v->pc>3 ){
-+-    v->pc = 3;
-++  if( v->pc>4 ){
-++    v->pc = 4;
-++    assert( v->aOp[v->pc].opcode==OP_NotExists );
-+     rc = sqlite3VdbeExec(v);
-+   }else{
-+     rc = sqlite3_step(p->pStmt);
-+@@ -129,8 +130,8 @@ int sqlite3_blob_open(
-+   int rc = SQLITE_OK;
-+   char *zErr = 0;
-+   Table *pTab;
-+-  Parse *pParse = 0;
-+   Incrblob *pBlob = 0;
-++  Parse sParse;
-+ 
-+ #ifdef SQLITE_ENABLE_API_ARMOR
-+   if( ppBlob==0 ){
-+@@ -148,37 +149,34 @@ int sqlite3_blob_open(
-+   sqlite3_mutex_enter(db->mutex);
-+ 
-+   pBlob = (Incrblob *)sqlite3DbMallocZero(db, sizeof(Incrblob));
-+-  if( !pBlob ) goto blob_open_out;
-+-  pParse = sqlite3StackAllocRaw(db, sizeof(*pParse));
-+-  if( !pParse ) goto blob_open_out;
-+-
-+   do {
-+-    memset(pParse, 0, sizeof(Parse));
-+-    pParse->db = db;
-++    memset(&sParse, 0, sizeof(Parse));
-++    if( !pBlob ) goto blob_open_out;
-++    sParse.db = db;
-+     sqlite3DbFree(db, zErr);
-+     zErr = 0;
-+ 
-+     sqlite3BtreeEnterAll(db);
-+-    pTab = sqlite3LocateTable(pParse, 0, zTable, zDb);
-++    pTab = sqlite3LocateTable(&sParse, 0, zTable, zDb);
-+     if( pTab && IsVirtual(pTab) ){
-+       pTab = 0;
-+-      sqlite3ErrorMsg(pParse, "cannot open virtual table: %s", zTable);
-++      sqlite3ErrorMsg(&sParse, "cannot open virtual table: %s", zTable);
-+     }
-+     if( pTab && !HasRowid(pTab) ){
-+       pTab = 0;
-+-      sqlite3ErrorMsg(pParse, "cannot open table without rowid: %s", zTable);
-++      sqlite3ErrorMsg(&sParse, "cannot open table without rowid: %s", zTable);
-+     }
-+ #ifndef SQLITE_OMIT_VIEW
-+     if( pTab && pTab->pSelect ){
-+       pTab = 0;
-+-      sqlite3ErrorMsg(pParse, "cannot open view: %s", zTable);
-++      sqlite3ErrorMsg(&sParse, "cannot open view: %s", zTable);
-+     }
-+ #endif
-+     if( !pTab ){
-+-      if( pParse->zErrMsg ){
-++      if( sParse.zErrMsg ){
-+         sqlite3DbFree(db, zErr);
-+-        zErr = pParse->zErrMsg;
-+-        pParse->zErrMsg = 0;
-++        zErr = sParse.zErrMsg;
-++        sParse.zErrMsg = 0;
-+       }
-+       rc = SQLITE_ERROR;
-+       sqlite3BtreeLeaveAll(db);
-+@@ -242,7 +240,7 @@ int sqlite3_blob_open(
-+       }
-+     }
-+ 
-+-    pBlob->pStmt = (sqlite3_stmt *)sqlite3VdbeCreate(pParse);
-++    pBlob->pStmt = (sqlite3_stmt *)sqlite3VdbeCreate(&sParse);
-+     assert( pBlob->pStmt || db->mallocFailed );
-+     if( pBlob->pStmt ){
-+ 
-+@@ -279,6 +277,7 @@ int sqlite3_blob_open(
-+                            pTab->pSchema->schema_cookie,
-+                            pTab->pSchema->iGeneration);
-+       sqlite3VdbeChangeP5(v, 1);
-++      assert( sqlite3VdbeCurrentAddr(v)==2 || db->mallocFailed );
-+       aOp = sqlite3VdbeAddOpList(v, ArraySize(openBlob), openBlob, iLn);
-+ 
-+       /* Make sure a mutex is held on the table to be accessed */
-+@@ -293,7 +292,7 @@ int sqlite3_blob_open(
-+         aOp[0].p1 = iDb;
-+         aOp[0].p2 = pTab->tnum;
-+         aOp[0].p3 = wrFlag;
-+-        sqlite3VdbeChangeP4(v, 1, pTab->zName, P4_TRANSIENT);
-++        sqlite3VdbeChangeP4(v, 2, pTab->zName, P4_TRANSIENT);
-+       }
-+       if( db->mallocFailed==0 ){
-+ #endif
-+@@ -315,10 +314,10 @@ int sqlite3_blob_open(
-+         aOp[1].p4.i = pTab->nCol+1;
-+         aOp[3].p2 = pTab->nCol;
-+ 
-+-        pParse->nVar = 0;
-+-        pParse->nMem = 1;
-+-        pParse->nTab = 1;
-+-        sqlite3VdbeMakeReady(v, pParse);
-++        sParse.nVar = 0;
-++        sParse.nMem = 1;
-++        sParse.nTab = 1;
-++        sqlite3VdbeMakeReady(v, &sParse);
-+       }
-+     }
-+ 
-+@@ -340,8 +339,7 @@ blob_open_out:
-+   }
-+   sqlite3ErrorWithMsg(db, rc, (zErr ? "%s" : 0), zErr);
-+   sqlite3DbFree(db, zErr);
-+-  sqlite3ParserReset(pParse);
-+-  sqlite3StackFree(db, pParse);
-++  sqlite3ParserReset(&sParse);
-+   rc = sqlite3ApiExit(db, rc);
-+   sqlite3_mutex_leave(db->mutex);
-+   return rc;
-+diff --git a/third_party/sqlite/src/src/vdbemem.c b/third_party/sqlite/src/src/vdbemem.c
-+index 31dc301ea..ec6c14a 100644
-+--- a/third_party/sqlite/src/src/vdbemem.c
-++++ b/third_party/sqlite/src/src/vdbemem.c
-+@@ -130,7 +130,7 @@ SQLITE_NOINLINE int sqlite3VdbeMemGrow(Mem *pMem, int n, int bPreserve){
-+   assert( pMem->szMalloc==0
-+        || pMem->szMalloc==sqlite3DbMallocSize(pMem->db, pMem->zMalloc) );
-+   if( n<32 ) n = 32;
-+-  if( bPreserve && pMem->szMalloc>0 && pMem->z==pMem->zMalloc ){
-++  if( pMem->szMalloc>0 && bPreserve && pMem->z==pMem->zMalloc ){
-+     pMem->z = pMem->zMalloc = sqlite3DbReallocOrFree(pMem->db, pMem->z, n);
-+     bPreserve = 0;
-+   }else{
-+@@ -146,7 +146,8 @@ SQLITE_NOINLINE int sqlite3VdbeMemGrow(Mem *pMem, int n, int bPreserve){
-+     pMem->szMalloc = sqlite3DbMallocSize(pMem->db, pMem->zMalloc);
-+   }
-+ 
-+-  if( bPreserve && pMem->z && ALWAYS(pMem->z!=pMem->zMalloc) ){
-++  if( bPreserve && pMem->z ){
-++    assert( pMem->z!=pMem->zMalloc );
-+     memcpy(pMem->zMalloc, pMem->z, pMem->n);
-+   }
-+   if( (pMem->flags&MEM_Dyn)!=0 ){
-+@@ -185,6 +186,20 @@ int sqlite3VdbeMemClearAndResize(Mem *pMem, int szNew){
-+ }
-+ 
-+ /*
-++** It is already known that pMem contains an unterminated string.
-++** Add the zero terminator.
-++*/
-++static SQLITE_NOINLINE int vdbeMemAddTerminator(Mem *pMem){
-++  if( sqlite3VdbeMemGrow(pMem, pMem->n+2, 1) ){
-++    return SQLITE_NOMEM_BKPT;
-++  }
-++  pMem->z[pMem->n] = 0;
-++  pMem->z[pMem->n+1] = 0;
-++  pMem->flags |= MEM_Term;
-++  return SQLITE_OK;
-++}
-++
-++/*
-+ ** Change pMem so that its MEM_Str or MEM_Blob value is stored in
-+ ** MEM.zMalloc, where it can be safely written.
-+ **
-+@@ -196,12 +211,8 @@ int sqlite3VdbeMemMakeWriteable(Mem *pMem){
-+   if( (pMem->flags & (MEM_Str|MEM_Blob))!=0 ){
-+     if( ExpandBlob(pMem) ) return SQLITE_NOMEM;
-+     if( pMem->szMalloc==0 || pMem->z!=pMem->zMalloc ){
-+-      if( sqlite3VdbeMemGrow(pMem, pMem->n + 2, 1) ){
-+-        return SQLITE_NOMEM_BKPT;
-+-      }
-+-      pMem->z[pMem->n] = 0;
-+-      pMem->z[pMem->n+1] = 0;
-+-      pMem->flags |= MEM_Term;
-++      int rc = vdbeMemAddTerminator(pMem);
-++      if( rc ) return rc;
-+     }
-+   }
-+   pMem->flags &= ~MEM_Ephem;
-+@@ -241,20 +252,6 @@ int sqlite3VdbeMemExpandBlob(Mem *pMem){
-+ #endif
-+ 
-+ /*
-+-** It is already known that pMem contains an unterminated string.
-+-** Add the zero terminator.
-+-*/
-+-static SQLITE_NOINLINE int vdbeMemAddTerminator(Mem *pMem){
-+-  if( sqlite3VdbeMemGrow(pMem, pMem->n+2, 1) ){
-+-    return SQLITE_NOMEM_BKPT;
-+-  }
-+-  pMem->z[pMem->n] = 0;
-+-  pMem->z[pMem->n+1] = 0;
-+-  pMem->flags |= MEM_Term;
-+-  return SQLITE_OK;
-+-}
-+-
-+-/*
-+ ** Make sure the given Mem is \u0000 terminated.
-+ */
-+ int sqlite3VdbeMemNulTerminate(Mem *pMem){
-+@@ -572,14 +569,21 @@ int sqlite3VdbeMemRealify(Mem *pMem){
-+ */
-+ int sqlite3VdbeMemNumerify(Mem *pMem){
-+   if( (pMem->flags & (MEM_Int|MEM_Real|MEM_Null))==0 ){
-++    int rc;
-+     assert( (pMem->flags & (MEM_Blob|MEM_Str))!=0 );
-+     assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
-+-    if( 0==sqlite3Atoi64(pMem->z, &pMem->u.i, pMem->n, pMem->enc) ){
-++    rc = sqlite3Atoi64(pMem->z, &pMem->u.i, pMem->n, pMem->enc);
-++    if( rc==0 ){
-+       MemSetTypeFlag(pMem, MEM_Int);
-+     }else{
-+-      pMem->u.r = sqlite3VdbeRealValue(pMem);
-+-      MemSetTypeFlag(pMem, MEM_Real);
-+-      sqlite3VdbeIntegerAffinity(pMem);
-++      i64 i = pMem->u.i;
-++      sqlite3AtoF(pMem->z, &pMem->u.r, pMem->n, pMem->enc);
-++      if( rc==1 && pMem->u.r==(double)i ){
-++        pMem->u.i = i;
-++        MemSetTypeFlag(pMem, MEM_Int);
-++      }else{
-++        MemSetTypeFlag(pMem, MEM_Real);
-++      }
-+     }
-+   }
-+   assert( (pMem->flags & (MEM_Int|MEM_Real|MEM_Null))!=0 );
-+@@ -899,7 +903,7 @@ int sqlite3VdbeMemSetStr(
-+   if( nByte<0 ){
-+     assert( enc!=0 );
-+     if( enc==SQLITE_UTF8 ){
-+-      nByte = sqlite3Strlen30(z);
-++      nByte = 0x7fffffff & (int)strlen(z);
-+       if( nByte>iLimit ) nByte = iLimit+1;
-+     }else{
-+       for(nByte=0; nByte<=iLimit && (z[nByte] | z[nByte+1]); nByte+=2){}
-+@@ -977,12 +981,11 @@ static SQLITE_NOINLINE int vdbeMemFromBtreeResize(
-+ ){
-+   int rc;
-+   pMem->flags = MEM_Null;
-+-  if( SQLITE_OK==(rc = sqlite3VdbeMemClearAndResize(pMem, amt+2)) ){
-++  if( SQLITE_OK==(rc = sqlite3VdbeMemClearAndResize(pMem, amt+1)) ){
-+     rc = sqlite3BtreePayload(pCur, offset, amt, pMem->z);
-+     if( rc==SQLITE_OK ){
-+-      pMem->z[amt] = 0;
-+-      pMem->z[amt+1] = 0;
-+-      pMem->flags = MEM_Blob|MEM_Term;
-++      pMem->z[amt] = 0;   /* Overrun area used when reading malformed records */
-++      pMem->flags = MEM_Blob;
-+       pMem->n = (int)amt;
-+     }else{
-+       sqlite3VdbeMemRelease(pMem);
-+@@ -1131,7 +1134,7 @@ static sqlite3_value *valueNew(sqlite3 *db, struct ValueNewStat4Ctx *p){
-+       if( pRec ){
-+         pRec->pKeyInfo = sqlite3KeyInfoOfIndex(p->pParse, pIdx);
-+         if( pRec->pKeyInfo ){
-+-          assert( pRec->pKeyInfo->nField+pRec->pKeyInfo->nXField==nCol );
-++          assert( pRec->pKeyInfo->nAllField==nCol );
-+           assert( pRec->pKeyInfo->enc==ENC(db) );
-+           pRec->aMem = (Mem *)((u8*)pRec + ROUND8(sizeof(UnpackedRecord)));
-+           for(i=0; i<nCol; i++){
-+@@ -1667,7 +1670,7 @@ int sqlite3Stat4Column(
-+ void sqlite3Stat4ProbeFree(UnpackedRecord *pRec){
-+   if( pRec ){
-+     int i;
-+-    int nCol = pRec->pKeyInfo->nField+pRec->pKeyInfo->nXField;
-++    int nCol = pRec->pKeyInfo->nAllField;
-+     Mem *aMem = pRec->aMem;
-+     sqlite3 *db = aMem[0].db;
-+     for(i=0; i<nCol; i++){
-+diff --git a/third_party/sqlite/src/src/vdbesort.c b/third_party/sqlite/src/src/vdbesort.c
-+index 30be45a..9fd4303 100644
-+--- a/third_party/sqlite/src/src/vdbesort.c
-++++ b/third_party/sqlite/src/src/vdbesort.c
-+@@ -823,7 +823,7 @@ static int vdbeSorterCompareText(
-+   }
-+ 
-+   if( res==0 ){
-+-    if( pTask->pSorter->pKeyInfo->nField>1 ){
-++    if( pTask->pSorter->pKeyInfo->nKeyField>1 ){
-+       res = vdbeSorterCompareTail(
-+           pTask, pbKey2Cached, pKey1, nKey1, pKey2, nKey2
-+       );
-+@@ -892,7 +892,7 @@ static int vdbeSorterCompareInt(
-+   }
-+ 
-+   if( res==0 ){
-+-    if( pTask->pSorter->pKeyInfo->nField>1 ){
-++    if( pTask->pSorter->pKeyInfo->nKeyField>1 ){
-+       res = vdbeSorterCompareTail(
-+           pTask, pbKey2Cached, pKey1, nKey1, pKey2, nKey2
-+       );
-+@@ -907,7 +907,7 @@ static int vdbeSorterCompareInt(
-+ /*
-+ ** Initialize the temporary index cursor just opened as a sorter cursor.
-+ **
-+-** Usually, the sorter module uses the value of (pCsr->pKeyInfo->nField)
-++** Usually, the sorter module uses the value of (pCsr->pKeyInfo->nKeyField)
-+ ** to determine the number of fields that should be compared from the
-+ ** records being sorted. However, if the value passed as argument nField
-+ ** is non-zero and the sorter is able to guarantee a stable sort, nField
-+@@ -960,7 +960,7 @@ int sqlite3VdbeSorterInit(
-+ 
-+   assert( pCsr->pKeyInfo && pCsr->pBtx==0 );
-+   assert( pCsr->eCurType==CURTYPE_SORTER );
-+-  szKeyInfo = sizeof(KeyInfo) + (pCsr->pKeyInfo->nField-1)*sizeof(CollSeq*);
-++  szKeyInfo = sizeof(KeyInfo) + (pCsr->pKeyInfo->nKeyField-1)*sizeof(CollSeq*);
-+   sz = sizeof(VdbeSorter) + nWorker * sizeof(SortSubtask);
-+ 
-+   pSorter = (VdbeSorter*)sqlite3DbMallocZero(db, sz + szKeyInfo);
-+@@ -972,8 +972,7 @@ int sqlite3VdbeSorterInit(
-+     memcpy(pKeyInfo, pCsr->pKeyInfo, szKeyInfo);
-+     pKeyInfo->db = 0;
-+     if( nField && nWorker==0 ){
-+-      pKeyInfo->nXField += (pKeyInfo->nField - nField);
-+-      pKeyInfo->nField = nField;
-++      pKeyInfo->nKeyField = nField;
-+     }
-+     pSorter->pgsz = pgsz = sqlite3BtreeGetPageSize(db->aDb[0].pBt);
-+     pSorter->nTask = nWorker + 1;
-+@@ -1001,11 +1000,9 @@ int sqlite3VdbeSorterInit(
-+       mxCache = MIN(mxCache, SQLITE_MAX_PMASZ);
-+       pSorter->mxPmaSize = MAX(pSorter->mnPmaSize, (int)mxCache);
-+ 
-+-      /* EVIDENCE-OF: R-26747-61719 When the application provides any amount of
-+-      ** scratch memory using SQLITE_CONFIG_SCRATCH, SQLite avoids unnecessary
-+-      ** large heap allocations.
-+-      */
-+-      if( sqlite3GlobalConfig.pScratch==0 ){
-++      /* Avoid large memory allocations if the application has requested
-++      ** SQLITE_CONFIG_SMALL_MALLOC. */
-++      if( sqlite3GlobalConfig.bSmallMalloc==0 ){
-+         assert( pSorter->iMemory==0 );
-+         pSorter->nMemory = pgsz;
-+         pSorter->list.aMemory = (u8*)sqlite3Malloc(pgsz);
-+@@ -1013,7 +1010,7 @@ int sqlite3VdbeSorterInit(
-+       }
-+     }
-+ 
-+-    if( (pKeyInfo->nField+pKeyInfo->nXField)<13
-++    if( pKeyInfo->nAllField<13
-+      && (pKeyInfo->aColl[0]==0 || pKeyInfo->aColl[0]==db->pDfltColl)
-+     ){
-+       pSorter->typeMask = SORTER_TYPE_INTEGER | SORTER_TYPE_TEXT;
-+@@ -1328,7 +1325,7 @@ static int vdbeSortAllocUnpacked(SortSubtask *pTask){
-+   if( pTask->pUnpacked==0 ){
-+     pTask->pUnpacked = sqlite3VdbeAllocUnpackedRecord(pTask->pSorter->pKeyInfo);
-+     if( pTask->pUnpacked==0 ) return SQLITE_NOMEM_BKPT;
-+-    pTask->pUnpacked->nField = pTask->pSorter->pKeyInfo->nField;
-++    pTask->pUnpacked->nField = pTask->pSorter->pKeyInfo->nKeyField;
-+     pTask->pUnpacked->errCode = 0;
-+   }
-+   return SQLITE_OK;
-+diff --git a/third_party/sqlite/src/src/vdbetrace.c b/third_party/sqlite/src/src/vdbetrace.c
-+index b565c5c..da3036a 100644
-+--- a/third_party/sqlite/src/src/vdbetrace.c
-++++ b/third_party/sqlite/src/src/vdbetrace.c
-+@@ -82,7 +82,7 @@ char *sqlite3VdbeExpandSql(
-+   Mem *pVar;               /* Value of a host parameter */
-+   StrAccum out;            /* Accumulate the output here */
-+ #ifndef SQLITE_OMIT_UTF16
-+-  Mem utf8;                /* Used to convert UTF16 parameters into UTF8 for display */
-++  Mem utf8;                /* Used to convert UTF16 into UTF8 for display */
-+ #endif
-+   char zBase[100];         /* Initial working space */
-+ 
-+diff --git a/third_party/sqlite/src/src/vtab.c b/third_party/sqlite/src/src/vtab.c
-+index f2dc732..bdf20f1 100644
-+--- a/third_party/sqlite/src/src/vtab.c
-++++ b/third_party/sqlite/src/src/vtab.c
-+@@ -42,8 +42,10 @@ Module *sqlite3VtabCreateModule(
-+ ){
-+   Module *pMod;
-+   int nName = sqlite3Strlen30(zName);
-+-  pMod = (Module *)sqlite3DbMallocRawNN(db, sizeof(Module) + nName + 1);
-+-  if( pMod ){
-++  pMod = (Module *)sqlite3Malloc(sizeof(Module) + nName + 1);
-++  if( pMod==0 ){
-++    sqlite3OomFault(db);
-++  }else{
-+     Module *pDel;
-+     char *zCopy = (char *)(&pMod[1]);
-+     memcpy(zCopy, zName, nName+1);
-+@@ -518,13 +520,14 @@ static int vtabCallConstructor(
-+     }
-+   }
-+ 
-+-  zModuleName = sqlite3MPrintf(db, "%s", pTab->zName);
-++  zModuleName = sqlite3DbStrDup(db, pTab->zName);
-+   if( !zModuleName ){
-+     return SQLITE_NOMEM_BKPT;
-+   }
-+ 
-+-  pVTable = sqlite3DbMallocZero(db, sizeof(VTable));
-++  pVTable = sqlite3MallocZero(sizeof(VTable));
-+   if( !pVTable ){
-++    sqlite3OomFault(db);
-+     sqlite3DbFree(db, zModuleName);
-+     return SQLITE_NOMEM_BKPT;
-+   }
-+@@ -644,6 +647,7 @@ int sqlite3VtabCallConnect(Parse *pParse, Table *pTab){
-+     rc = vtabCallConstructor(db, pTab, pMod, pMod->pModule->xConnect, &zErr);
-+     if( rc!=SQLITE_OK ){
-+       sqlite3ErrorMsg(pParse, "%s", zErr);
-++      pParse->rc = rc;
-+     }
-+     sqlite3DbFree(db, zErr);
-+   }
-+@@ -733,10 +737,10 @@ int sqlite3VtabCallCreate(sqlite3 *db, int iDb, const char *zTab, char **pzErr){
-+ */
-+ int sqlite3_declare_vtab(sqlite3 *db, const char *zCreateTable){
-+   VtabCtx *pCtx;
-+-  Parse *pParse;
-+   int rc = SQLITE_OK;
-+   Table *pTab;
-+   char *zErr = 0;
-++  Parse sParse;
-+ 
-+ #ifdef SQLITE_ENABLE_API_ARMOR
-+   if( !sqlite3SafetyCheckOk(db) || zCreateTable==0 ){
-+@@ -753,55 +757,55 @@ int sqlite3_declare_vtab(sqlite3 *db, const char *zCreateTable){
-+   pTab = pCtx->pTab;
-+   assert( IsVirtual(pTab) );
-+ 
-+-  pParse = sqlite3StackAllocZero(db, sizeof(*pParse));
-+-  if( pParse==0 ){
-+-    rc = SQLITE_NOMEM_BKPT;
-+-  }else{
-+-    pParse->declareVtab = 1;
-+-    pParse->db = db;
-+-    pParse->nQueryLoop = 1;
-+-
-+-    if( SQLITE_OK==sqlite3RunParser(pParse, zCreateTable, &zErr)
-+-     && pParse->pNewTable
-+-     && !db->mallocFailed
-+-     && !pParse->pNewTable->pSelect
-+-     && !IsVirtual(pParse->pNewTable)
-+-    ){
-+-      if( !pTab->aCol ){
-+-        Table *pNew = pParse->pNewTable;
-+-        Index *pIdx;
-+-        pTab->aCol = pNew->aCol;
-+-        pTab->nCol = pNew->nCol;
-+-        pTab->tabFlags |= pNew->tabFlags & (TF_WithoutRowid|TF_NoVisibleRowid);
-+-        pNew->nCol = 0;
-+-        pNew->aCol = 0;
-+-        assert( pTab->pIndex==0 );
-+-        if( !HasRowid(pNew) && pCtx->pVTable->pMod->pModule->xUpdate!=0 ){
-+-          rc = SQLITE_ERROR;
-+-        }
-+-        pIdx = pNew->pIndex;
-+-        if( pIdx ){
-+-          assert( pIdx->pNext==0 );
-+-          pTab->pIndex = pIdx;
-+-          pNew->pIndex = 0;
-+-          pIdx->pTable = pTab;
-+-        }
-++  memset(&sParse, 0, sizeof(sParse));
-++  sParse.declareVtab = 1;
-++  sParse.db = db;
-++  sParse.nQueryLoop = 1;
-++  if( SQLITE_OK==sqlite3RunParser(&sParse, zCreateTable, &zErr)
-++   && sParse.pNewTable
-++   && !db->mallocFailed
-++   && !sParse.pNewTable->pSelect
-++   && !IsVirtual(sParse.pNewTable)
-++  ){
-++    if( !pTab->aCol ){
-++      Table *pNew = sParse.pNewTable;
-++      Index *pIdx;
-++      pTab->aCol = pNew->aCol;
-++      pTab->nCol = pNew->nCol;
-++      pTab->tabFlags |= pNew->tabFlags & (TF_WithoutRowid|TF_NoVisibleRowid);
-++      pNew->nCol = 0;
-++      pNew->aCol = 0;
-++      assert( pTab->pIndex==0 );
-++      assert( HasRowid(pNew) || sqlite3PrimaryKeyIndex(pNew)!=0 );
-++      if( !HasRowid(pNew)
-++       && pCtx->pVTable->pMod->pModule->xUpdate!=0
-++       && sqlite3PrimaryKeyIndex(pNew)->nKeyCol!=1
-++      ){
-++        /* WITHOUT ROWID virtual tables must either be read-only (xUpdate==0)
-++        ** or else must have a single-column PRIMARY KEY */
-++        rc = SQLITE_ERROR;
-++      }
-++      pIdx = pNew->pIndex;
-++      if( pIdx ){
-++        assert( pIdx->pNext==0 );
-++        pTab->pIndex = pIdx;
-++        pNew->pIndex = 0;
-++        pIdx->pTable = pTab;
-+       }
-+-      pCtx->bDeclared = 1;
-+-    }else{
-+-      sqlite3ErrorWithMsg(db, SQLITE_ERROR, (zErr ? "%s" : 0), zErr);
-+-      sqlite3DbFree(db, zErr);
-+-      rc = SQLITE_ERROR;
-+     }
-+-    pParse->declareVtab = 0;
-++    pCtx->bDeclared = 1;
-++  }else{
-++    sqlite3ErrorWithMsg(db, SQLITE_ERROR, (zErr ? "%s" : 0), zErr);
-++    sqlite3DbFree(db, zErr);
-++    rc = SQLITE_ERROR;
-++  }
-++  sParse.declareVtab = 0;
-+ 
-+-    if( pParse->pVdbe ){
-+-      sqlite3VdbeFinalize(pParse->pVdbe);
-+-    }
-+-    sqlite3DeleteTable(db, pParse->pNewTable);
-+-    sqlite3ParserReset(pParse);
-+-    sqlite3StackFree(db, pParse);
-++  if( sParse.pVdbe ){
-++    sqlite3VdbeFinalize(sParse.pVdbe);
-+   }
-++  sqlite3DeleteTable(db, sParse.pNewTable);
-++  sqlite3ParserReset(&sParse);
-+ 
-+   assert( (rc&0xff)==rc );
-+   rc = sqlite3ApiExit(db, rc);
-+diff --git a/third_party/sqlite/src/src/wal.c b/third_party/sqlite/src/src/wal.c
-+index 0a3bc37..a88be06 100644
-+--- a/third_party/sqlite/src/src/wal.c
-++++ b/third_party/sqlite/src/src/wal.c
-+@@ -1798,9 +1798,7 @@ static int walCheckpoint(
-+       pInfo->nBackfillAttempted = mxSafeFrame;
-+ 
-+       /* Sync the WAL to disk */
-+-      if( sync_flags ){
-+-        rc = sqlite3OsSync(pWal->pWalFd, sync_flags);
-+-      }
-++      rc = sqlite3OsSync(pWal->pWalFd, CKPT_SYNC_FLAGS(sync_flags));
-+ 
-+       /* If the database may grow as a result of this checkpoint, hint
-+       ** about the eventual size of the db file to the VFS layer.
-+@@ -1841,8 +1839,8 @@ static int walCheckpoint(
-+           i64 szDb = pWal->hdr.nPage*(i64)szPage;
-+           testcase( IS_BIG_INT(szDb) );
-+           rc = sqlite3OsTruncate(pWal->pDbFd, szDb);
-+-          if( rc==SQLITE_OK && sync_flags ){
-+-            rc = sqlite3OsSync(pWal->pDbFd, sync_flags);
-++          if( rc==SQLITE_OK ){
-++            rc = sqlite3OsSync(pWal->pDbFd, CKPT_SYNC_FLAGS(sync_flags));
-+           }
-+         }
-+         if( rc==SQLITE_OK ){
-+@@ -2948,8 +2946,8 @@ static int walWriteToLog(
-+     iOffset += iFirstAmt;
-+     iAmt -= iFirstAmt;
-+     pContent = (void*)(iFirstAmt + (char*)pContent);
-+-    assert( p->syncFlags & (SQLITE_SYNC_NORMAL|SQLITE_SYNC_FULL) );
-+-    rc = sqlite3OsSync(p->pFd, p->syncFlags & SQLITE_SYNC_MASK);
-++    assert( WAL_SYNC_FLAGS(p->syncFlags)!=0 );
-++    rc = sqlite3OsSync(p->pFd, WAL_SYNC_FLAGS(p->syncFlags));
-+     if( iAmt==0 || rc ) return rc;
-+   }
-+   rc = sqlite3OsWrite(p->pFd, pContent, iAmt, iOffset);
-+@@ -3119,10 +3117,10 @@ int sqlite3WalFrames(
-+     ** an out-of-order write following a WAL restart could result in
-+     ** database corruption.  See the ticket:
-+     **
-+-    **     http://localhost:591/sqlite/info/ff5be73dee
-++    **     https://sqlite.org/src/info/ff5be73dee
-+     */
-+-    if( pWal->syncHeader && sync_flags ){
-+-      rc = sqlite3OsSync(pWal->pWalFd, sync_flags & SQLITE_SYNC_MASK);
-++    if( pWal->syncHeader ){
-++      rc = sqlite3OsSync(pWal->pWalFd, CKPT_SYNC_FLAGS(sync_flags));
-+       if( rc ) return rc;
-+     }
-+   }
-+@@ -3197,7 +3195,7 @@ int sqlite3WalFrames(
-+   ** sector boundary is synced; the part of the last frame that extends
-+   ** past the sector boundary is written after the sync.
-+   */
-+-  if( isCommit && (sync_flags & WAL_SYNC_TRANSACTIONS)!=0 ){
-++  if( isCommit && WAL_SYNC_FLAGS(sync_flags)!=0 ){
-+     int bSync = 1;
-+     if( pWal->padToSectorBoundary ){
-+       int sectorSize = sqlite3SectorSize(pWal->pWalFd);
-+@@ -3213,7 +3211,7 @@ int sqlite3WalFrames(
-+     }
-+     if( bSync ){
-+       assert( rc==SQLITE_OK );
-+-      rc = sqlite3OsSync(w.pFd, sync_flags & SQLITE_SYNC_MASK);
-++      rc = sqlite3OsSync(w.pFd, WAL_SYNC_FLAGS(sync_flags));
-+     }
-+   }
-+ 
-+diff --git a/third_party/sqlite/src/src/wal.h b/third_party/sqlite/src/src/wal.h
-+index df831b5..27b8272 100644
-+--- a/third_party/sqlite/src/src/wal.h
-++++ b/third_party/sqlite/src/src/wal.h
-+@@ -19,11 +19,11 @@
-+ 
-+ #include "sqliteInt.h"
-+ 
-+-/* Additional values that can be added to the sync_flags argument of
-+-** sqlite3WalFrames():
-++/* Macros for extracting appropriate sync flags for either transaction
-++** commits (WAL_SYNC_FLAGS(X)) or for checkpoint ops (CKPT_SYNC_FLAGS(X)):
-+ */
-+-#define WAL_SYNC_TRANSACTIONS  0x20   /* Sync at the end of each transaction */
-+-#define SQLITE_SYNC_MASK       0x13   /* Mask off the SQLITE_SYNC_* values */
-++#define WAL_SYNC_FLAGS(X)   ((X)&0x03)
-++#define CKPT_SYNC_FLAGS(X)  (((X)>>2)&0x03)
-+ 
-+ #ifdef SQLITE_OMIT_WAL
-+ # define sqlite3WalOpen(x,y,z)                   0
-+diff --git a/third_party/sqlite/src/src/walker.c b/third_party/sqlite/src/src/walker.c
-+index 99333d1..d21ac1a 100644
-+--- a/third_party/sqlite/src/src/walker.c
-++++ b/third_party/sqlite/src/src/walker.c
-+@@ -40,18 +40,22 @@ static SQLITE_NOINLINE int walkExpr(Walker *pWalker, Expr *pExpr){
-+   int rc;
-+   testcase( ExprHasProperty(pExpr, EP_TokenOnly) );
-+   testcase( ExprHasProperty(pExpr, EP_Reduced) );
-+-  rc = pWalker->xExprCallback(pWalker, pExpr);
-+-  if( rc ) return rc & WRC_Abort;
-+-  if( !ExprHasProperty(pExpr,(EP_TokenOnly|EP_Leaf)) ){
-+-    if( pExpr->pLeft && walkExpr(pWalker, pExpr->pLeft) ) return WRC_Abort;
-+-    assert( pExpr->x.pList==0 || pExpr->pRight==0 );
-+-    if( pExpr->pRight ){
-+-      if( walkExpr(pWalker, pExpr->pRight) ) return WRC_Abort;
-+-    }else if( ExprHasProperty(pExpr, EP_xIsSelect) ){
-+-      if( sqlite3WalkSelect(pWalker, pExpr->x.pSelect) ) return WRC_Abort;
-+-    }else if( pExpr->x.pList ){
-+-      if( sqlite3WalkExprList(pWalker, pExpr->x.pList) ) return WRC_Abort;
-++  while(1){
-++    rc = pWalker->xExprCallback(pWalker, pExpr);
-++    if( rc ) return rc & WRC_Abort;
-++    if( !ExprHasProperty(pExpr,(EP_TokenOnly|EP_Leaf)) ){
-++      if( pExpr->pLeft && walkExpr(pWalker, pExpr->pLeft) ) return WRC_Abort;
-++       assert( pExpr->x.pList==0 || pExpr->pRight==0 );
-++      if( pExpr->pRight ){
-++        pExpr = pExpr->pRight;
-++        continue;
-++      }else if( ExprHasProperty(pExpr, EP_xIsSelect) ){
-++        if( sqlite3WalkSelect(pWalker, pExpr->x.pSelect) ) return WRC_Abort;
-++      }else if( pExpr->x.pList ){
-++        if( sqlite3WalkExprList(pWalker, pExpr->x.pList) ) return WRC_Abort;
-++      }
-+     }
-++    break;
-+   }
-+   return WRC_Continue;
-+ }
-+diff --git a/third_party/sqlite/src/src/where.c b/third_party/sqlite/src/src/where.c
-+index 63f26b6..13f6100 100644
-+--- a/third_party/sqlite/src/src/where.c
-++++ b/third_party/sqlite/src/src/where.c
-+@@ -403,8 +403,8 @@ static int findIndexCol(
-+      && p->iColumn==pIdx->aiColumn[iCol]
-+      && p->iTable==iBase
-+     ){
-+-      CollSeq *pColl = sqlite3ExprCollSeq(pParse, pList->a[i].pExpr);
-+-      if( pColl && 0==sqlite3StrICmp(pColl->zName, zColl) ){
-++      CollSeq *pColl = sqlite3ExprNNCollSeq(pParse, pList->a[i].pExpr);
-++      if( 0==sqlite3StrICmp(pColl->zName, zColl) ){
-+         return i;
-+       }
-+     }
-+@@ -868,7 +868,7 @@ static sqlite3_index_info *allocateIndexInfo(
-+     testcase( pTerm->eOperator & WO_ISNULL );
-+     testcase( pTerm->eOperator & WO_IS );
-+     testcase( pTerm->eOperator & WO_ALL );
-+-    if( (pTerm->eOperator & ~(WO_ISNULL|WO_EQUIV|WO_IS))==0 ) continue;
-++    if( (pTerm->eOperator & ~(WO_EQUIV))==0 ) continue;
-+     if( pTerm->wtFlags & TERM_VNULL ) continue;
-+     assert( pTerm->u.leftColumn>=(-1) );
-+     nTerm++;
-+@@ -916,7 +916,7 @@ static sqlite3_index_info *allocateIndexInfo(
-+                                                                    pUsage;
-+ 
-+   for(i=j=0, pTerm=pWC->a; i<pWC->nTerm; i++, pTerm++){
-+-    u8 op;
-++    u16 op;
-+     if( pTerm->leftCursor != pSrc->iCursor ) continue;
-+     if( pTerm->prereqRight & mUnusable ) continue;
-+     assert( IsPowerOfTwo(pTerm->eOperator & ~WO_EQUIV) );
-+@@ -924,34 +924,40 @@ static sqlite3_index_info *allocateIndexInfo(
-+     testcase( pTerm->eOperator & WO_IS );
-+     testcase( pTerm->eOperator & WO_ISNULL );
-+     testcase( pTerm->eOperator & WO_ALL );
-+-    if( (pTerm->eOperator & ~(WO_ISNULL|WO_EQUIV|WO_IS))==0 ) continue;
-++    if( (pTerm->eOperator & ~(WO_EQUIV))==0 ) continue;
-+     if( pTerm->wtFlags & TERM_VNULL ) continue;
-+     assert( pTerm->u.leftColumn>=(-1) );
-+     pIdxCons[j].iColumn = pTerm->u.leftColumn;
-+     pIdxCons[j].iTermOffset = i;
-+-    op = (u8)pTerm->eOperator & WO_ALL;
-++    op = pTerm->eOperator & WO_ALL;
-+     if( op==WO_IN ) op = WO_EQ;
-+-    if( op==WO_MATCH ){
-+-      op = pTerm->eMatchOp;
-+-    }
-+-    pIdxCons[j].op = op;
-+-    /* The direct assignment in the previous line is possible only because
-+-    ** the WO_ and SQLITE_INDEX_CONSTRAINT_ codes are identical.  The
-+-    ** following asserts verify this fact. */
-+-    assert( WO_EQ==SQLITE_INDEX_CONSTRAINT_EQ );
-+-    assert( WO_LT==SQLITE_INDEX_CONSTRAINT_LT );
-+-    assert( WO_LE==SQLITE_INDEX_CONSTRAINT_LE );
-+-    assert( WO_GT==SQLITE_INDEX_CONSTRAINT_GT );
-+-    assert( WO_GE==SQLITE_INDEX_CONSTRAINT_GE );
-+-    assert( WO_MATCH==SQLITE_INDEX_CONSTRAINT_MATCH );
-+-    assert( pTerm->eOperator & (WO_IN|WO_EQ|WO_LT|WO_LE|WO_GT|WO_GE|WO_MATCH) );
-+-
-+-    if( op & (WO_LT|WO_LE|WO_GT|WO_GE)
-+-     && sqlite3ExprIsVector(pTerm->pExpr->pRight)
-+-    ){
-+-      if( i<16 ) mNoOmit |= (1 << i);
-+-      if( op==WO_LT ) pIdxCons[j].op = WO_LE;
-+-      if( op==WO_GT ) pIdxCons[j].op = WO_GE;
-++    if( op==WO_AUX ){
-++      pIdxCons[j].op = pTerm->eMatchOp;
-++    }else if( op & (WO_ISNULL|WO_IS) ){
-++      if( op==WO_ISNULL ){
-++        pIdxCons[j].op = SQLITE_INDEX_CONSTRAINT_ISNULL;
-++      }else{
-++        pIdxCons[j].op = SQLITE_INDEX_CONSTRAINT_IS;
-++      }
-++    }else{
-++      pIdxCons[j].op = (u8)op;
-++      /* The direct assignment in the previous line is possible only because
-++      ** the WO_ and SQLITE_INDEX_CONSTRAINT_ codes are identical.  The
-++      ** following asserts verify this fact. */
-++      assert( WO_EQ==SQLITE_INDEX_CONSTRAINT_EQ );
-++      assert( WO_LT==SQLITE_INDEX_CONSTRAINT_LT );
-++      assert( WO_LE==SQLITE_INDEX_CONSTRAINT_LE );
-++      assert( WO_GT==SQLITE_INDEX_CONSTRAINT_GT );
-++      assert( WO_GE==SQLITE_INDEX_CONSTRAINT_GE );
-++      assert( pTerm->eOperator&(WO_IN|WO_EQ|WO_LT|WO_LE|WO_GT|WO_GE|WO_AUX) );
-++
-++      if( op & (WO_LT|WO_LE|WO_GT|WO_GE)
-++       && sqlite3ExprIsVector(pTerm->pExpr->pRight)
-++      ){
-++        if( i<16 ) mNoOmit |= (1 << i);
-++        if( op==WO_LT ) pIdxCons[j].op = WO_LE;
-++        if( op==WO_GT ) pIdxCons[j].op = WO_GE;
-++      }
-+     }
-+ 
-+     j++;
-+@@ -1879,18 +1885,19 @@ static void whereInfoFree(sqlite3 *db, WhereInfo *pWInfo){
-+ ** Return TRUE if all of the following are true:
-+ **
-+ **   (1)  X has the same or lower cost that Y
-+-**   (2)  X is a proper subset of Y
-+-**   (3)  X skips at least as many columns as Y
-+-**
-+-** By "proper subset" we mean that X uses fewer WHERE clause terms
-+-** than Y and that every WHERE clause term used by X is also used
-+-** by Y.
-++**   (2)  X uses fewer WHERE clause terms than Y
-++**   (3)  Every WHERE clause term used by X is also used by Y
-++**   (4)  X skips at least as many columns as Y
-++**   (5)  If X is a covering index, than Y is too
-+ **
-++** Conditions (2) and (3) mean that X is a "proper subset" of Y.
-+ ** If X is a proper subset of Y then Y is a better choice and ought
-+ ** to have a lower cost.  This routine returns TRUE when that cost
-+-** relationship is inverted and needs to be adjusted.  The third rule
-++** relationship is inverted and needs to be adjusted.  Constraint (4)
-+ ** was added because if X uses skip-scan less than Y it still might
-+-** deserve a lower cost even if it is a proper subset of Y.
-++** deserve a lower cost even if it is a proper subset of Y.  Constraint (5)
-++** was added because a covering index probably deserves to have a lower cost
-++** than a non-covering index even if it is a proper subset.
-+ */
-+ static int whereLoopCheaperProperSubset(
-+   const WhereLoop *pX,       /* First WhereLoop to compare */
-+@@ -1912,6 +1919,10 @@ static int whereLoopCheaperProperSubset(
-+     }
-+     if( j<0 ) return 0;  /* X not a subset of Y since term X[i] not used by Y */
-+   }
-++  if( (pX->wsFlags&WHERE_IDX_ONLY)!=0
-++   && (pY->wsFlags&WHERE_IDX_ONLY)==0 ){
-++    return 0;  /* Constraint (5) */
-++  }
-+   return 1;  /* All conditions meet */
-+ }
-+ 
-+@@ -2663,7 +2674,7 @@ static int indexMightHelpWithOrderBy(
-+     }else if( (aColExpr = pIndex->aColExpr)!=0 ){
-+       for(jj=0; jj<pIndex->nKeyCol; jj++){
-+         if( pIndex->aiColumn[jj]!=XN_EXPR ) continue;
-+-        if( sqlite3ExprCompare(0, pExpr,aColExpr->a[jj].pExpr,iCursor)==0 ){
-++        if( sqlite3ExprCompareSkip(pExpr,aColExpr->a[jj].pExpr,iCursor)==0 ){
-+           return 1;
-+         }
-+       }
-+@@ -3573,14 +3584,10 @@ static i8 wherePathSatisfiesOrderBy(
-+         if( j>=pLoop->nLTerm ) continue;
-+       }
-+       if( (pTerm->eOperator&(WO_EQ|WO_IS))!=0 && pOBExpr->iColumn>=0 ){
-+-        const char *z1, *z2;
-+-        pColl = sqlite3ExprCollSeq(pWInfo->pParse, pOrderBy->a[i].pExpr);
-+-        if( !pColl ) pColl = db->pDfltColl;
-+-        z1 = pColl->zName;
-+-        pColl = sqlite3ExprCollSeq(pWInfo->pParse, pTerm->pExpr);
-+-        if( !pColl ) pColl = db->pDfltColl;
-+-        z2 = pColl->zName;
-+-        if( sqlite3StrICmp(z1, z2)!=0 ) continue;
-++        if( sqlite3ExprCollSeqMatch(pWInfo->pParse,
-++                  pOrderBy->a[i].pExpr, pTerm->pExpr)==0 ){
-++          continue;
-++        }
-+         testcase( pTerm->pExpr->op==TK_IS );
-+       }
-+       obSat |= MASKBIT(i);
-+@@ -3652,7 +3659,7 @@ static i8 wherePathSatisfiesOrderBy(
-+         if( pIndex ){
-+           iColumn = pIndex->aiColumn[j];
-+           revIdx = pIndex->aSortOrder[j];
-+-          if( iColumn==pIndex->pTable->iPKey ) iColumn = -1;
-++          if( iColumn==pIndex->pTable->iPKey ) iColumn = XN_ROWID;
-+         }else{
-+           iColumn = XN_ROWID;
-+           revIdx = 0;
-+@@ -3679,19 +3686,18 @@ static i8 wherePathSatisfiesOrderBy(
-+           testcase( wctrlFlags & WHERE_GROUPBY );
-+           testcase( wctrlFlags & WHERE_DISTINCTBY );
-+           if( (wctrlFlags & (WHERE_GROUPBY|WHERE_DISTINCTBY))==0 ) bOnce = 0;
-+-          if( iColumn>=(-1) ){
-++          if( iColumn>=XN_ROWID ){
-+             if( pOBExpr->op!=TK_COLUMN ) continue;
-+             if( pOBExpr->iTable!=iCur ) continue;
-+             if( pOBExpr->iColumn!=iColumn ) continue;
-+           }else{
-+-            if( sqlite3ExprCompare(0,
-+-                  pOBExpr,pIndex->aColExpr->a[j].pExpr,iCur) ){
-++            Expr *pIdxExpr = pIndex->aColExpr->a[j].pExpr;
-++            if( sqlite3ExprCompareSkip(pOBExpr, pIdxExpr, iCur) ){
-+               continue;
-+             }
-+           }
-+-          if( iColumn>=0 ){
-+-            pColl = sqlite3ExprCollSeq(pWInfo->pParse, pOrderBy->a[i].pExpr);
-+-            if( !pColl ) pColl = db->pDfltColl;
-++          if( iColumn!=XN_ROWID ){
-++            pColl = sqlite3ExprNNCollSeq(pWInfo->pParse, pOrderBy->a[i].pExpr);
-+             if( sqlite3StrICmp(pColl->zName, pIndex->azColl[j])!=0 ) continue;
-+           }
-+           pLoop->u.btree.nIdxCol = j+1;
-+@@ -4328,6 +4334,7 @@ static int exprIsDeterministic(Expr *p){
-+   memset(&w, 0, sizeof(w));
-+   w.eCode = 1;
-+   w.xExprCallback = exprNodeIsDeterministic;
-++  w.xSelectCallback = sqlite3SelectWalkFail;
-+   sqlite3WalkExpr(&w, p);
-+   return w.eCode;
-+ }
-+@@ -4537,36 +4544,37 @@ WhereInfo *sqlite3WhereBegin(
-+     if( wctrlFlags & WHERE_WANT_DISTINCT ){
-+       pWInfo->eDistinct = WHERE_DISTINCT_UNIQUE;
-+     }
-+-  }
-+-
-+-  /* Assign a bit from the bitmask to every term in the FROM clause.
-+-  **
-+-  ** The N-th term of the FROM clause is assigned a bitmask of 1<<N.
-+-  **
-+-  ** The rule of the previous sentence ensures thta if X is the bitmask for
-+-  ** a table T, then X-1 is the bitmask for all other tables to the left of T.
-+-  ** Knowing the bitmask for all tables to the left of a left join is
-+-  ** important.  Ticket #3015.
-+-  **
-+-  ** Note that bitmasks are created for all pTabList->nSrc tables in
-+-  ** pTabList, not just the first nTabList tables.  nTabList is normally
-+-  ** equal to pTabList->nSrc but might be shortened to 1 if the
-+-  ** WHERE_OR_SUBCLAUSE flag is set.
-+-  */
-+-  for(ii=0; ii<pTabList->nSrc; ii++){
-+-    createMask(pMaskSet, pTabList->a[ii].iCursor);
-+-    sqlite3WhereTabFuncArgs(pParse, &pTabList->a[ii], &pWInfo->sWC);
-+-  }
-+-#ifdef SQLITE_DEBUG
-+-  {
-+-    Bitmask mx = 0;
-+-    for(ii=0; ii<pTabList->nSrc; ii++){
-+-      Bitmask m = sqlite3WhereGetMask(pMaskSet, pTabList->a[ii].iCursor);
-+-      assert( m>=mx );
-+-      mx = m;
-++  }else{
-++    /* Assign a bit from the bitmask to every term in the FROM clause.
-++    **
-++    ** The N-th term of the FROM clause is assigned a bitmask of 1<<N.
-++    **
-++    ** The rule of the previous sentence ensures thta if X is the bitmask for
-++    ** a table T, then X-1 is the bitmask for all other tables to the left of T.
-++    ** Knowing the bitmask for all tables to the left of a left join is
-++    ** important.  Ticket #3015.
-++    **
-++    ** Note that bitmasks are created for all pTabList->nSrc tables in
-++    ** pTabList, not just the first nTabList tables.  nTabList is normally
-++    ** equal to pTabList->nSrc but might be shortened to 1 if the
-++    ** WHERE_OR_SUBCLAUSE flag is set.
-++    */
-++    ii = 0;
-++    do{
-++      createMask(pMaskSet, pTabList->a[ii].iCursor);
-++      sqlite3WhereTabFuncArgs(pParse, &pTabList->a[ii], &pWInfo->sWC);
-++    }while( (++ii)<pTabList->nSrc );
-++  #ifdef SQLITE_DEBUG
-++    {
-++      Bitmask mx = 0;
-++      for(ii=0; ii<pTabList->nSrc; ii++){
-++        Bitmask m = sqlite3WhereGetMask(pMaskSet, pTabList->a[ii].iCursor);
-++        assert( m>=mx );
-++        mx = m;
-++      }
-+     }
-++  #endif
-+   }
-+-#endif
-+ 
-+   /* Analyze all of the subexpressions. */
-+   sqlite3WhereExprAnalyze(pTabList, &pWInfo->sWC);
-+@@ -4790,7 +4798,7 @@ WhereInfo *sqlite3WhereBegin(
-+       Index *pIx = pLoop->u.btree.pIndex;
-+       int iIndexCur;
-+       int op = OP_OpenRead;
-+-      /* iAuxArg is always set if to a positive value if ONEPASS is possible */
-++      /* iAuxArg is always set to a positive value if ONEPASS is possible */
-+       assert( iAuxArg!=0 || (pWInfo->wctrlFlags & WHERE_ONEPASS_DESIRED)==0 );
-+       if( !HasRowid(pTab) && IsPrimaryKeyIndex(pIx)
-+        && (wctrlFlags & WHERE_OR_SUBCLAUSE)!=0
-+diff --git a/third_party/sqlite/src/src/whereInt.h b/third_party/sqlite/src/src/whereInt.h
-+index 909cbb0..03b74bb 100644
-+--- a/third_party/sqlite/src/src/whereInt.h
-++++ b/third_party/sqlite/src/src/whereInt.h
-+@@ -515,7 +515,6 @@ void sqlite3WhereTabFuncArgs(Parse*, struct SrcList_item*, WhereClause*);
-+ **     WO_LE    == SQLITE_INDEX_CONSTRAINT_LE
-+ **     WO_GT    == SQLITE_INDEX_CONSTRAINT_GT
-+ **     WO_GE    == SQLITE_INDEX_CONSTRAINT_GE
-+-**     WO_MATCH == SQLITE_INDEX_CONSTRAINT_MATCH
-+ */
-+ #define WO_IN     0x0001
-+ #define WO_EQ     0x0002
-+@@ -523,7 +522,7 @@ void sqlite3WhereTabFuncArgs(Parse*, struct SrcList_item*, WhereClause*);
-+ #define WO_LE     (WO_EQ<<(TK_LE-TK_EQ))
-+ #define WO_GT     (WO_EQ<<(TK_GT-TK_EQ))
-+ #define WO_GE     (WO_EQ<<(TK_GE-TK_EQ))
-+-#define WO_MATCH  0x0040
-++#define WO_AUX    0x0040       /* Op useful to virtual tables only */
-+ #define WO_IS     0x0080
-+ #define WO_ISNULL 0x0100
-+ #define WO_OR     0x0200       /* Two or more OR-connected terms */
-+diff --git a/third_party/sqlite/src/src/wherecode.c b/third_party/sqlite/src/src/wherecode.c
-+index 7c16d0d..edb0c25 100644
-+--- a/third_party/sqlite/src/src/wherecode.c
-++++ b/third_party/sqlite/src/src/wherecode.c
-+@@ -794,7 +794,7 @@ static int codeCursorHintIsOrFunction(Walker *pWalker, Expr *pExpr){
-+     pWalker->eCode = 1;
-+   }else if( pExpr->op==TK_FUNCTION ){
-+     int d1;
-+-    char d2[3];
-++    char d2[4];
-+     if( 0==sqlite3IsLikeFunction(pWalker->pParse->db, pExpr, &d1, d2) ){
-+       pWalker->eCode = 1;
-+     }
-+@@ -1017,7 +1017,7 @@ static void codeDeferredSeek(
-+ */
-+ static void codeExprOrVector(Parse *pParse, Expr *p, int iReg, int nReg){
-+   assert( nReg>0 );
-+-  if( sqlite3ExprIsVector(p) ){
-++  if( p && sqlite3ExprIsVector(p) ){
-+ #ifndef SQLITE_OMIT_SUBQUERY
-+     if( (p->flags & EP_xIsSelect) ){
-+       Vdbe *v = pParse->pVdbe;
-+@@ -1070,9 +1070,9 @@ static int whereIndexExprTransNode(Walker *p, Expr *pExpr){
-+ }
-+ 
-+ /*
-+-** For an indexes on expression X, locate every instance of expression X in pExpr
-+-** and change that subexpression into a reference to the appropriate column of
-+-** the index.
-++** For an indexes on expression X, locate every instance of expression X
-++** in pExpr and change that subexpression into a reference to the appropriate
-++** column of the index.
-+ */
-+ static void whereIndexExprTrans(
-+   Index *pIdx,      /* The Index */
-+diff --git a/third_party/sqlite/src/src/whereexpr.c b/third_party/sqlite/src/src/whereexpr.c
-+index 3d53959..fa71539 100644
-+--- a/third_party/sqlite/src/src/whereexpr.c
-++++ b/third_party/sqlite/src/src/whereexpr.c
-+@@ -194,12 +194,12 @@ static int isLikeOrGlob(
-+   int *pisComplete, /* True if the only wildcard is % in the last character */
-+   int *pnoCase      /* True if uppercase is equivalent to lowercase */
-+ ){
-+-  const char *z = 0;         /* String on RHS of LIKE operator */
-++  const u8 *z = 0;         /* String on RHS of LIKE operator */
-+   Expr *pRight, *pLeft;      /* Right and left size of LIKE operator */
-+   ExprList *pList;           /* List of operands to the LIKE operator */
-+   int c;                     /* One character in z[] */
-+   int cnt;                   /* Number of non-wildcard prefix characters */
-+-  char wc[3];                /* Wildcard characters */
-++  char wc[4];                /* Wildcard characters */
-+   sqlite3 *db = pParse->db;  /* Database connection */
-+   sqlite3_value *pVal = 0;
-+   int op;                    /* Opcode of pRight */
-+@@ -221,12 +221,12 @@ static int isLikeOrGlob(
-+     int iCol = pRight->iColumn;
-+     pVal = sqlite3VdbeGetBoundValue(pReprepare, iCol, SQLITE_AFF_BLOB);
-+     if( pVal && sqlite3_value_type(pVal)==SQLITE_TEXT ){
-+-      z = (char *)sqlite3_value_text(pVal);
-++      z = sqlite3_value_text(pVal);
-+     }
-+     sqlite3VdbeSetVarmask(pParse->pVdbe, iCol);
-+     assert( pRight->op==TK_VARIABLE || pRight->op==TK_REGISTER );
-+   }else if( op==TK_STRING ){
-+-    z = pRight->u.zToken;
-++    z = (u8*)pRight->u.zToken;
-+   }
-+   if( z ){
-+ 
-+@@ -246,16 +246,42 @@ static int isLikeOrGlob(
-+         return 0;
-+       }
-+     }
-++
-++    /* Count the number of prefix characters prior to the first wildcard */
-+     cnt = 0;
-+     while( (c=z[cnt])!=0 && c!=wc[0] && c!=wc[1] && c!=wc[2] ){
-+       cnt++;
-++      if( c==wc[3] && z[cnt]!=0 ) cnt++;
-+     }
-++
-++    /* The optimization is possible only if (1) the pattern does not begin
-++    ** with a wildcard and if (2) the non-wildcard prefix does not end with
-++    ** an (illegal 0xff) character.  The second condition is necessary so
-++    ** that we can increment the prefix key to find an upper bound for the
-++    ** range search.
-++    */
-+     if( cnt!=0 && 255!=(u8)z[cnt-1] ){
-+       Expr *pPrefix;
-++
-++      /* A "complete" match if the pattern ends with "*" or "%" */
-+       *pisComplete = c==wc[0] && z[cnt+1]==0;
-+-      pPrefix = sqlite3Expr(db, TK_STRING, z);
-+-      if( pPrefix ) pPrefix->u.zToken[cnt] = 0;
-++
-++      /* Get the pattern prefix.  Remove all escapes from the prefix. */
-++      pPrefix = sqlite3Expr(db, TK_STRING, (char*)z);
-++      if( pPrefix ){
-++        int iFrom, iTo;
-++        char *zNew = pPrefix->u.zToken;
-++        zNew[cnt] = 0;
-++        for(iFrom=iTo=0; iFrom<cnt; iFrom++){
-++          if( zNew[iFrom]==wc[3] ) iFrom++;
-++          zNew[iTo++] = zNew[iFrom];
-++        }
-++        zNew[iTo] = 0;
-++      }
-+       *ppPrefix = pPrefix;
-++
-++      /* If the RHS pattern is a bound parameter, make arrangements to
-++      ** reprepare the statement when that parameter is rebound */
-+       if( op==TK_VARIABLE ){
-+         Vdbe *v = pParse->pVdbe;
-+         sqlite3VdbeSetVarmask(v, pRight->iColumn);
-+@@ -286,48 +312,84 @@ static int isLikeOrGlob(
-+ 
-+ #ifndef SQLITE_OMIT_VIRTUALTABLE
-+ /*
-+-** Check to see if the given expression is of the form
-++** Check to see if the pExpr expression is a form that needs to be passed
-++** to the xBestIndex method of virtual tables.  Forms of interest include:
-+ **
-+-**         column OP expr
-++**          Expression                   Virtual Table Operator
-++**          -----------------------      ---------------------------------
-++**      1.  column MATCH expr            SQLITE_INDEX_CONSTRAINT_MATCH
-++**      2.  column GLOB expr             SQLITE_INDEX_CONSTRAINT_GLOB
-++**      3.  column LIKE expr             SQLITE_INDEX_CONSTRAINT_LIKE
-++**      4.  column REGEXP expr           SQLITE_INDEX_CONSTRAINT_REGEXP
-++**      5.  column != expr               SQLITE_INDEX_CONSTRAINT_NE
-++**      6.  expr != column               SQLITE_INDEX_CONSTRAINT_NE
-++**      7.  column IS NOT expr           SQLITE_INDEX_CONSTRAINT_ISNOT
-++**      8.  expr IS NOT column           SQLITE_INDEX_CONSTRAINT_ISNOT
-++**      9.  column IS NOT NULL           SQLITE_INDEX_CONSTRAINT_ISNOTNULL
-+ **
-+-** where OP is one of MATCH, GLOB, LIKE or REGEXP and "column" is a
-+-** column of a virtual table.
-++** In every case, "column" must be a column of a virtual table.  If there
-++** is a match, set *ppLeft to the "column" expression, set *ppRight to the
-++** "expr" expression (even though in forms (6) and (8) the column is on the
-++** right and the expression is on the left).  Also set *peOp2 to the
-++** appropriate virtual table operator.  The return value is 1 or 2 if there
-++** is a match.  The usual return is 1, but if the RHS is also a column
-++** of virtual table in forms (5) or (7) then return 2.
-+ **
-+-** If it is then return TRUE.  If not, return FALSE.
-++** If the expression matches none of the patterns above, return 0.
-+ */
-+-static int isMatchOfColumn(
-++static int isAuxiliaryVtabOperator(
-+   Expr *pExpr,                    /* Test this expression */
-+-  unsigned char *peOp2            /* OUT: 0 for MATCH, or else an op2 value */
-++  unsigned char *peOp2,           /* OUT: 0 for MATCH, or else an op2 value */
-++  Expr **ppLeft,                  /* Column expression to left of MATCH/op2 */
-++  Expr **ppRight                  /* Expression to left of MATCH/op2 */
-+ ){
-+-  static const struct Op2 {
-+-    const char *zOp;
-+-    unsigned char eOp2;
-+-  } aOp[] = {
-+-    { "match",  SQLITE_INDEX_CONSTRAINT_MATCH },
-+-    { "glob",   SQLITE_INDEX_CONSTRAINT_GLOB },
-+-    { "like",   SQLITE_INDEX_CONSTRAINT_LIKE },
-+-    { "regexp", SQLITE_INDEX_CONSTRAINT_REGEXP }
-+-  };
-+-  ExprList *pList;
-+-  Expr *pCol;                     /* Column reference */
-+-  int i;
-++  if( pExpr->op==TK_FUNCTION ){
-++    static const struct Op2 {
-++      const char *zOp;
-++      unsigned char eOp2;
-++    } aOp[] = {
-++      { "match",  SQLITE_INDEX_CONSTRAINT_MATCH },
-++      { "glob",   SQLITE_INDEX_CONSTRAINT_GLOB },
-++      { "like",   SQLITE_INDEX_CONSTRAINT_LIKE },
-++      { "regexp", SQLITE_INDEX_CONSTRAINT_REGEXP }
-++    };
-++    ExprList *pList;
-++    Expr *pCol;                     /* Column reference */
-++    int i;
-+ 
-+-  if( pExpr->op!=TK_FUNCTION ){
-+-    return 0;
-+-  }
-+-  pList = pExpr->x.pList;
-+-  if( pList==0 || pList->nExpr!=2 ){
-+-    return 0;
-+-  }
-+-  pCol = pList->a[1].pExpr;
-+-  if( pCol->op!=TK_COLUMN || !IsVirtual(pCol->pTab) ){
-+-    return 0;
-+-  }
-+-  for(i=0; i<ArraySize(aOp); i++){
-+-    if( sqlite3StrICmp(pExpr->u.zToken, aOp[i].zOp)==0 ){
-+-      *peOp2 = aOp[i].eOp2;
-+-      return 1;
-++    pList = pExpr->x.pList;
-++    if( pList==0 || pList->nExpr!=2 ){
-++      return 0;
-++    }
-++    pCol = pList->a[1].pExpr;
-++    if( pCol->op!=TK_COLUMN || !IsVirtual(pCol->pTab) ){
-++      return 0;
-++    }
-++    for(i=0; i<ArraySize(aOp); i++){
-++      if( sqlite3StrICmp(pExpr->u.zToken, aOp[i].zOp)==0 ){
-++        *peOp2 = aOp[i].eOp2;
-++        *ppRight = pList->a[0].pExpr;
-++        *ppLeft = pCol;
-++        return 1;
-++      }
-+     }
-++  }else if( pExpr->op==TK_NE || pExpr->op==TK_ISNOT || pExpr->op==TK_NOTNULL ){
-++    int res = 0;
-++    Expr *pLeft = pExpr->pLeft;
-++    Expr *pRight = pExpr->pRight;
-++    if( pLeft->op==TK_COLUMN && IsVirtual(pLeft->pTab) ){
-++      res++;
-++    }
-++    if( pRight && pRight->op==TK_COLUMN && IsVirtual(pRight->pTab) ){
-++      res++;
-++      SWAP(Expr*, pLeft, pRight);
-++    }
-++    *ppLeft = pLeft;
-++    *ppRight = pRight;
-++    if( pExpr->op==TK_NE ) *peOp2 = SQLITE_INDEX_CONSTRAINT_NE;
-++    if( pExpr->op==TK_ISNOT ) *peOp2 = SQLITE_INDEX_CONSTRAINT_ISNOT;
-++    if( pExpr->op==TK_NOTNULL ) *peOp2 = SQLITE_INDEX_CONSTRAINT_ISNOTNULL;
-++    return res;
-+   }
-+   return 0;
-+ }
-+@@ -578,7 +640,7 @@ static void exprAnalyzeOrTerm(
-+           for(j=0, pAndTerm=pAndWC->a; j<pAndWC->nTerm; j++, pAndTerm++){
-+             assert( pAndTerm->pExpr );
-+             if( allowedOp(pAndTerm->pExpr->op)
-+-             || pAndTerm->eOperator==WO_MATCH
-++             || pAndTerm->eOperator==WO_AUX
-+             ){
-+               b |= sqlite3WhereGetMask(&pWInfo->sMaskSet, pAndTerm->leftCursor);
-+             }
-+@@ -780,7 +842,6 @@ static void exprAnalyzeOrTerm(
-+ static int termIsEquivalence(Parse *pParse, Expr *pExpr){
-+   char aff1, aff2;
-+   CollSeq *pColl;
-+-  const char *zColl1, *zColl2;
-+   if( !OptimizationEnabled(pParse->db, SQLITE_Transitive) ) return 0;
-+   if( pExpr->op!=TK_EQ && pExpr->op!=TK_IS ) return 0;
-+   if( ExprHasProperty(pExpr, EP_FromJoin) ) return 0;
-+@@ -793,11 +854,7 @@ static int termIsEquivalence(Parse *pParse, Expr *pExpr){
-+   }
-+   pColl = sqlite3BinaryCompareCollSeq(pParse, pExpr->pLeft, pExpr->pRight);
-+   if( pColl==0 || sqlite3StrICmp(pColl->zName, "BINARY")==0 ) return 1;
-+-  pColl = sqlite3ExprCollSeq(pParse, pExpr->pLeft);
-+-  zColl1 = pColl ? pColl->zName : 0;
-+-  pColl = sqlite3ExprCollSeq(pParse, pExpr->pRight);
-+-  zColl2 = pColl ? pColl->zName : 0;
-+-  return sqlite3_stricmp(zColl1, zColl2)==0;
-++  return sqlite3ExprCollSeqMatch(pParse, pExpr->pLeft, pExpr->pRight);
-+ }
-+ 
-+ /*
-+@@ -1160,41 +1217,46 @@ static void exprAnalyze(
-+ #endif /* SQLITE_OMIT_LIKE_OPTIMIZATION */
-+ 
-+ #ifndef SQLITE_OMIT_VIRTUALTABLE
-+-  /* Add a WO_MATCH auxiliary term to the constraint set if the
-+-  ** current expression is of the form:  column MATCH expr.
-++  /* Add a WO_AUX auxiliary term to the constraint set if the
-++  ** current expression is of the form "column OP expr" where OP
-++  ** is an operator that gets passed into virtual tables but which is
-++  ** not normally optimized for ordinary tables.  In other words, OP
-++  ** is one of MATCH, LIKE, GLOB, REGEXP, !=, IS, IS NOT, or NOT NULL.
-+   ** This information is used by the xBestIndex methods of
-+   ** virtual tables.  The native query optimizer does not attempt
-+   ** to do anything with MATCH functions.
-+   */
-+-  if( pWC->op==TK_AND && isMatchOfColumn(pExpr, &eOp2) ){
-+-    int idxNew;
-++  if( pWC->op==TK_AND ){
-+     Expr *pRight, *pLeft;
-+-    WhereTerm *pNewTerm;
-+-    Bitmask prereqColumn, prereqExpr;
-+-
-+-    pRight = pExpr->x.pList->a[0].pExpr;
-+-    pLeft = pExpr->x.pList->a[1].pExpr;
-+-    prereqExpr = sqlite3WhereExprUsage(pMaskSet, pRight);
-+-    prereqColumn = sqlite3WhereExprUsage(pMaskSet, pLeft);
-+-    if( (prereqExpr & prereqColumn)==0 ){
-+-      Expr *pNewExpr;
-+-      pNewExpr = sqlite3PExpr(pParse, TK_MATCH,
-+-                              0, sqlite3ExprDup(db, pRight, 0));
-+-      if( ExprHasProperty(pExpr, EP_FromJoin) && pNewExpr ){
-+-        ExprSetProperty(pNewExpr, EP_FromJoin);
-++    int res = isAuxiliaryVtabOperator(pExpr, &eOp2, &pLeft, &pRight);
-++    while( res-- > 0 ){
-++      int idxNew;
-++      WhereTerm *pNewTerm;
-++      Bitmask prereqColumn, prereqExpr;
-++
-++      prereqExpr = sqlite3WhereExprUsage(pMaskSet, pRight);
-++      prereqColumn = sqlite3WhereExprUsage(pMaskSet, pLeft);
-++      if( (prereqExpr & prereqColumn)==0 ){
-++        Expr *pNewExpr;
-++        pNewExpr = sqlite3PExpr(pParse, TK_MATCH,
-++            0, sqlite3ExprDup(db, pRight, 0));
-++        if( ExprHasProperty(pExpr, EP_FromJoin) && pNewExpr ){
-++          ExprSetProperty(pNewExpr, EP_FromJoin);
-++        }
-++        idxNew = whereClauseInsert(pWC, pNewExpr, TERM_VIRTUAL|TERM_DYNAMIC);
-++        testcase( idxNew==0 );
-++        pNewTerm = &pWC->a[idxNew];
-++        pNewTerm->prereqRight = prereqExpr;
-++        pNewTerm->leftCursor = pLeft->iTable;
-++        pNewTerm->u.leftColumn = pLeft->iColumn;
-++        pNewTerm->eOperator = WO_AUX;
-++        pNewTerm->eMatchOp = eOp2;
-++        markTermAsChild(pWC, idxNew, idxTerm);
-++        pTerm = &pWC->a[idxTerm];
-++        pTerm->wtFlags |= TERM_COPIED;
-++        pNewTerm->prereqAll = pTerm->prereqAll;
-+       }
-+-      idxNew = whereClauseInsert(pWC, pNewExpr, TERM_VIRTUAL|TERM_DYNAMIC);
-+-      testcase( idxNew==0 );
-+-      pNewTerm = &pWC->a[idxNew];
-+-      pNewTerm->prereqRight = prereqExpr;
-+-      pNewTerm->leftCursor = pLeft->iTable;
-+-      pNewTerm->u.leftColumn = pLeft->iColumn;
-+-      pNewTerm->eOperator = WO_MATCH;
-+-      pNewTerm->eMatchOp = eOp2;
-+-      markTermAsChild(pWC, idxNew, idxTerm);
-+-      pTerm = &pWC->a[idxTerm];
-+-      pTerm->wtFlags |= TERM_COPIED;
-+-      pNewTerm->prereqAll = pTerm->prereqAll;
-++      SWAP(Expr*, pLeft, pRight);
-+     }
-+   }
-+ #endif /* SQLITE_OMIT_VIRTUALTABLE */
-+diff --git a/third_party/sqlite/src/test/analyze9.test b/third_party/sqlite/src/test/analyze9.test
-+index e3cf6d8..b0dc905 100644
-+--- a/third_party/sqlite/src/test/analyze9.test
-++++ b/third_party/sqlite/src/test/analyze9.test
-+@@ -1052,8 +1052,11 @@ do_execsql_test 23.0 {
-+ do_eqp_test 23.1 {
-+   SELECT * FROM t4 WHERE
-+     (e=1 AND b='xyz' AND c='zyx' AND a<'AEA') AND f<300
-++  -- Formerly used index i41.  But i41 is not a covering index whereas
-++  -- the PRIMARY KEY is a covering index, and so as of 2017-10-15, the
-++  -- PRIMARY KEY is preferred.
-+ } {
-+-  0 0 0 {SEARCH TABLE t4 USING INDEX i41 (e=? AND c=? AND b=? AND a<?)}
-++  0 0 0 {SEARCH TABLE t4 USING PRIMARY KEY (c=? AND b=? AND a<?)}
-+ }
-+ do_eqp_test 23.2 {
-+   SELECT * FROM t4 WHERE
-+diff --git a/third_party/sqlite/src/test/atomic.test b/third_party/sqlite/src/test/atomic.test
-+new file mode 100644
-+index 0000000..6ce6deb
-+--- /dev/null
-++++ b/third_party/sqlite/src/test/atomic.test
-+@@ -0,0 +1,41 @@
-++# 2015-11-07
-++#
-++# The author disclaims copyright to this source code.  In place of
-++# a legal notice, here is a blessing:
-++#
-++#    May you do good and not evil.
-++#    May you find forgiveness for yourself and forgive others.
-++#    May you share freely, never taking more than you give.
-++#
-++#***********************************************************************
-++# This file implements regression tests for SQLite library.  The
-++# focus of this file is testing the WITH clause.
-++#
-++
-++set testdir [file dirname $argv0]
-++source $testdir/tester.tcl
-++set ::testprefix atomic
-++
-++db close
-++if {[atomic_batch_write test.db]==0} {
-++  puts "No f2fs atomic-batch-write support. Skipping tests..."
-++  finish_test
-++  return
-++}
-++
-++reset_db
-++
-++do_execsql_test 1.0 {
-++  CREATE TABLE t1(x, y);
-++  BEGIN;
-++    INSERT INTO t1 VALUES(1, 2);
-++}
-++
-++do_test 1.1 { file exists test.db-journal } {0}
-++
-++do_execsql_test 1.2 {
-++  COMMIT;
-++}
-++
-++
-++finish_test
-+diff --git a/third_party/sqlite/src/test/attach2.test b/third_party/sqlite/src/test/attach2.test
-+index a034b9c..c65a39f 100644
-+--- a/third_party/sqlite/src/test/attach2.test
-++++ b/third_party/sqlite/src/test/attach2.test
-+@@ -374,23 +374,17 @@ do_test attach2-6.1 {
-+ do_test attach2-6.2 {
-+   catchsql {
-+     ATTACH 'test3.db' as aux2;
-++    DETACH aux2;
-+   }
-+-} {1 {cannot ATTACH database within transaction}}
-++} {0 {}}
-+ 
-+-# EVIDENCE-OF: R-59740-55581 This statement will fail if SQLite is in
-+-# the middle of a transaction.
-++# As of version 3.21.0: it is ok to DETACH from within a transaction
-+ #
-+ do_test attach2-6.3 {
-+   catchsql {
-+     DETACH aux;
-+   }
-+-} {1 {cannot DETACH database within transaction}}
-+-do_test attach2-6.4 {
-+-  execsql {
-+-    COMMIT;
-+-    DETACH aux;
-+-  }
-+-} {}
-++} {0 {}}
-+ 
-+ db close
-+ 
-+diff --git a/third_party/sqlite/src/test/bestindex5.test b/third_party/sqlite/src/test/bestindex5.test
-+new file mode 100644
-+index 0000000..0f1a669
-+--- /dev/null
-++++ b/third_party/sqlite/src/test/bestindex5.test
-+@@ -0,0 +1,250 @@
-++# 2017 September 10
-++#
-++# The author disclaims copyright to this source code.  In place of
-++# a legal notice, here is a blessing:
-++#
-++#    May you do good and not evil.
-++#    May you find forgiveness for yourself and forgive others.
-++#    May you share freely, never taking more than you give.
-++#
-++#***********************************************************************
-++# Test the virtual table interface. In particular the xBestIndex
-++# method.
-++#
-++
-++set testdir [file dirname $argv0]
-++source $testdir/tester.tcl
-++set testprefix bestindex4
-++
-++ifcapable !vtab {
-++  finish_test
-++  return
-++}
-++
-++#-------------------------------------------------------------------------
-++# Virtual table callback for a virtual table named $tbl.
-++#
-++proc vtab_cmd {method args} {
-++
-++  set binops(ne)    !=
-++  set binops(eq)    =
-++  set binops(isnot) "IS NOT"
-++  set binops(is)    "IS"
-++
-++  set unops(isnotnull) "IS NOT NULL"
-++  set unops(isnull)    "IS NULL"
-++
-++  set cols(0) a
-++  set cols(1) b
-++  set cols(2) c
-++
-++  switch -- $method {
-++    xConnect {
-++      return "CREATE TABLE t1(a, b, c)"
-++    }
-++
-++    xBestIndex {
-++      foreach {clist orderby mask} $args {}
-++
-++      set cost 1000000.0
-++      set ret [list]
-++      set str [list]
-++
-++      set v 0
-++      for {set i 0} {$i < [llength $clist]} {incr i} {
-++        array unset C
-++        array set C [lindex $clist $i]
-++        if {$C(usable)} {
-++          if {[info exists binops($C(op))]} {
-++            lappend ret omit $i
-++            lappend str "$cols($C(column)) $binops($C(op)) %$v%"
-++            incr v
-++            set cost [expr $cost / 2]
-++          }
-++          if {[info exists unops($C(op))]} {
-++            lappend ret omit $i
-++            lappend str "$cols($C(column)) $unops($C(op))"
-++            incr v
-++            set cost [expr $cost / 2]
-++          }
-++        }
-++      }
-++
-++      lappend ret idxstr [join $str " AND "]
-++      lappend ret cost $cost
-++      return $ret
-++    }
-++
-++    xFilter {
-++      set q [lindex $args 1]
-++      set a [lindex $args 2]
-++      for {set v 0} {$v < [llength $a]} {incr v} {
-++        set val [lindex $a $v]
-++        set q [string map [list %$v% '$val'] $q]
-++      }
-++      if {$q==""} { set q 1 }
-++      lappend ::xFilterQueries "WHERE $q"
-++      return [list sql "SELECT rowid, * FROM t1x WHERE $q"]
-++    }
-++  }
-++  return ""
-++}
-++
-++proc vtab_simple {method args} {
-++  switch -- $method {
-++    xConnect {
-++      return "CREATE TABLE t2(x)"
-++    }
-++    xBestIndex {
-++      return [list cost 999999.0]
-++    }
-++    xFilter {
-++      return [list sql "SELECT rowid, * FROM t2x"]
-++    }
-++  }
-++  return ""
-++}
-++
-++register_tcl_module db
-++
-++proc do_vtab_query_test {tn query result} {
-++  set ::xFilterQueries [list]
-++  uplevel [list
-++    do_test $tn [string map [list %QUERY% $query] {
-++      set r [execsql {%QUERY%}]
-++      set r [concat $::xFilterQueries $r]
-++      set r
-++    }] [list {*}$result]
-++  ]
-++}
-++
-++do_execsql_test 1.0 {
-++  CREATE VIRTUAL TABLE t1 USING tcl('vtab_cmd');
-++  CREATE TABLE t1x(a INTEGER, b TEXT, c REAL);
-++  INSERT INTO t1x VALUES(1, 2, 3);
-++  INSERT INTO t1x VALUES(4, 5, 6);
-++  INSERT INTO t1x VALUES(7, 8, 9);
-++
-++  CREATE VIRTUAL TABLE t2 USING tcl('vtab_simple');
-++  CREATE TABLE t2x(x INTEGER);
-++  INSERT INTO t2x VALUES(1);
-++}
-++
-++do_vtab_query_test 1.1 { SELECT * FROM t1 WHERE a!='hello'; } {
-++  "WHERE a != 'hello'"
-++  1 2 3.0 4 5 6.0 7 8 9.0
-++}
-++
-++do_vtab_query_test 1.2.1 { SELECT * FROM t1 WHERE b!=8 } {
-++  "WHERE b != '8'"
-++  1 2 3.0 4 5 6.0
-++}
-++do_vtab_query_test 1.2.2 { SELECT * FROM t1 WHERE 8!=b } {
-++  "WHERE b != '8'"
-++  1 2 3.0 4 5 6.0
-++}
-++
-++do_vtab_query_test 1.3 { SELECT * FROM t1 WHERE c IS NOT 3 } {
-++  "WHERE c IS NOT '3'"
-++  4 5 6.0 7 8 9.0
-++}
-++do_vtab_query_test 1.3.2 { SELECT * FROM t1 WHERE 3 IS NOT c } {
-++  "WHERE c IS NOT '3'"
-++  4 5 6.0 7 8 9.0
-++}
-++
-++do_vtab_query_test 1.4.1 { SELECT * FROM t1, t2 WHERE x != a } {
-++  "WHERE a != '1'"
-++  4 5 6.0 1   7 8 9.0 1
-++}
-++do_vtab_query_test 1.4.2 { SELECT * FROM t1, t2 WHERE a != x } {
-++  "WHERE a != '1'"
-++  4 5 6.0 1   7 8 9.0 1
-++}
-++
-++do_vtab_query_test 1.5.1 { SELECT * FROM t1 WHERE a IS NOT NULL } {
-++  "WHERE a IS NOT NULL"
-++  1 2 3.0 4 5 6.0 7 8 9.0
-++}
-++do_vtab_query_test 1.5.2 { SELECT * FROM t1 WHERE NULL IS NOT a } {
-++  "WHERE a IS NOT ''"
-++  1 2 3.0 4 5 6.0 7 8 9.0
-++}
-++
-++do_vtab_query_test 1.6.1 { SELECT * FROM t1 WHERE a IS NULL } {
-++  "WHERE a IS NULL"
-++}
-++
-++do_vtab_query_test 1.6.2 { SELECT * FROM t1 WHERE NULL IS a } {
-++  "WHERE a IS ''"
-++}
-++
-++do_vtab_query_test 1.7.1 { SELECT * FROM t1 WHERE (a, b) IS (1, 2) } {
-++  "WHERE a IS '1' AND b IS '2'"
-++  1 2 3.0
-++}
-++do_vtab_query_test 1.7.2 { SELECT * FROM t1 WHERE (5, 4) IS (b, a) } {
-++  {WHERE b IS '5' AND a IS '4'}
-++  4 5 6.0
-++}
-++
-++#---------------------------------------------------------------------
-++do_execsql_test 2.0.0 {
-++  DELETE FROM t1x;
-++  INSERT INTO t1x VALUES('a', 'b', 'c');
-++}
-++do_execsql_test 2.0.1 { SELECT * FROM t1 } {a b c}
-++do_execsql_test 2.0.2 { SELECT * FROM t1 WHERE (a, b) != ('a', 'b'); } {}
-++
-++do_execsql_test 2.1.0 {
-++  DELETE FROM t1x;
-++  INSERT INTO t1x VALUES(7, 8, 9);
-++}
-++do_execsql_test 2.1.1 { SELECT * FROM t1 } {7 8 9.0}
-++do_execsql_test 2.1.2 { SELECT * FROM t1 WHERE (a, b) != (7, '8') } {}
-++do_execsql_test 2.1.3 { SELECT * FROM t1 WHERE a!=7 OR b!='8' }
-++do_execsql_test 2.1.4 { SELECT * FROM t1 WHERE a!=7 OR b!='8' }
-++
-++
-++do_execsql_test 2.2.1 {
-++  CREATE TABLE t3(a INTEGER, b TEXT);
-++  INSERT INTO t3 VALUES(45, 46);
-++}
-++do_execsql_test 2.2.2 { SELECT * FROM t3 WHERE (a, b) != (45, 46); }
-++do_execsql_test 2.2.3 { SELECT * FROM t3 WHERE (a, b) != ('45', '46'); }
-++do_execsql_test 2.2.4 { SELECT * FROM t3 WHERE (a, b) == (45, 46); } {45 46}
-++do_execsql_test 2.2.5 { SELECT * FROM t3 WHERE (a, b) == ('45', '46'); } {45 46}
-++
-++#---------------------------------------------------------------------
-++# Test the != operator on a virtual table with column affinities.
-++#
-++proc vtab_simple_integer {method args} {
-++  switch -- $method {
-++    xConnect {
-++      return "CREATE TABLE t4(x INTEGER)"
-++    }
-++    xBestIndex {
-++      return [list cost 999999.0]
-++    }
-++    xFilter {
-++      return [list sql "SELECT rowid, * FROM t4x"]
-++    }
-++  }
-++  return ""
-++}
-++
-++do_execsql_test 3.0 {
-++  CREATE TABLE t4x(a INTEGER);
-++  INSERT INTO t4x VALUES(245);
-++  CREATE VIRTUAL TABLE t4 USING tcl('vtab_simple_integer');
-++}
-++do_execsql_test 3.1 { SELECT rowid, * FROM t4 WHERE x=245; } {1 245}
-++do_execsql_test 3.2 { SELECT rowid, * FROM t4 WHERE x='245'; } {1 245}
-++do_execsql_test 3.3 { SELECT rowid, * FROM t4 WHERE x!=245; } {}
-++do_execsql_test 3.4 { SELECT rowid, * FROM t4 WHERE x!='245'; } {}
-++
-++do_execsql_test 3.5 { SELECT rowid, * FROM t4 WHERE rowid!=1 OR x!='245'; } {}
-++
-++
-++finish_test
-++
-+diff --git a/third_party/sqlite/src/test/bigmmap.test b/third_party/sqlite/src/test/bigmmap.test
-+new file mode 100644
-+index 0000000..ce1f7b7
-+--- /dev/null
-++++ b/third_party/sqlite/src/test/bigmmap.test
-+@@ -0,0 +1,104 @@
-++# 2017 August 07
-++#
-++# The author disclaims copyright to this source code.  In place of
-++# a legal notice, here is a blessing:
-++#
-++#    May you do good and not evil.
-++#    May you find forgiveness for yourself and forgive others.
-++#    May you share freely, never taking more than you give.
-++#
-++#***********************************************************************
-++# This file implements regression tests for SQLite library.  The
-++# focus of this script testing the ability of SQLite to use mmap
-++# to access files larger than 4GiB.
-++#
-++
-++if {[file exists skip-big-file]} return
-++if {$tcl_platform(os)=="Darwin"} return
-++
-++set testdir [file dirname $argv0]
-++source $testdir/tester.tcl
-++set testprefix bigmmap
-++
-++ifcapable !mmap||!vtab {
-++  finish_test
-++  return
-++}
-++
-++set mmap_limit 0
-++db eval {
-++  SELECT compile_options AS x FROM pragma_compile_options
-++  WHERE x LIKE 'max_mmap_size=%'
-++} {
-++  regexp {MAX_MMAP_SIZE=([0-9]*)} $x -> mmap_limit
-++}
-++if {$mmap_limit < [expr 8 * 1<<30]} {
-++  puts "Skipping bigmmap.test - requires SQLITE_MAX_MMAP_SIZE >= 8G"
-++  finish_test
-++  return
-++}
-++
-++
-++#-------------------------------------------------------------------------
-++# Create the database file roughly 8GiB in size. Most pages are unused,
-++# except that there is a table and index clustered around each 1GiB
-++# boundary.
-++#
-++do_execsql_test 1.0 {
-++  PRAGMA page_size = 4096;
-++  CREATE TABLE t0(a INTEGER PRIMARY KEY, b, c, UNIQUE(b, c));
-++  WITH  s(i) AS ( SELECT 1 UNION ALL SELECT i+1 FROM s LIMIT 100 )
-++  INSERT INTO t0 SELECT i, 't0', randomblob(800) FROM s;
-++}
-++
-++for {set i 1} {$i < 8} {incr i} {
-++  fake_big_file [expr $i*1024] [get_pwd]/test.db
-++  hexio_write test.db 28 [format %.8x [expr ($i*1024*1024*1024/4096) - 5]]
-++
-++  do_execsql_test 1.$i "
-++    CREATE TABLE t$i (a INTEGER PRIMARY KEY, b, c, UNIQUE(b, c));
-++    WITH  s(i) AS ( SELECT 1 UNION ALL SELECT i+1 FROM s LIMIT 100 )
-++      INSERT INTO t$i SELECT i, 't$i', randomblob(800) FROM s;
-++  "
-++}
-++
-++#-------------------------------------------------------------------------
-++# Check that data can be retrieved from the db with a variety of
-++# configured mmap size limits.
-++#
-++for {set i 0} {$i < 9} {incr i} {
-++
-++  # Configure a memory mapping $i GB in size.
-++  #
-++  set val [expr $i*1024*1024*1024]
-++  execsql "PRAGMA main.mmap_size = $val"
-++  do_execsql_test 2.$i.0 {
-++    PRAGMA main.mmap_size
-++  } $val
-++
-++  for {set t 0} {$t < 8} {incr t} {
-++    do_execsql_test 2.$i.$t.1 "
-++      SELECT count(*) FROM t$t;
-++      SELECT count(b || c) FROM t$t GROUP BY b;
-++    " {100 100}
-++
-++    do_execsql_test 2.$i.$t.2 "
-++      SELECT * FROM t$t AS o WHERE
-++        NOT EXISTS( SELECT * FROM t$t AS i WHERE a=o.a AND +b=o.b AND +c=o.c )
-++      ORDER BY b, c;
-++    " {}
-++
-++    do_eqp_test 2.$i.$t.3 "
-++      SELECT * FROM t$t AS o WHERE
-++        NOT EXISTS( SELECT * FROM t$t AS i WHERE a=o.a AND +b=o.b AND +c=o.c )
-++      ORDER BY b, c;
-++    " "
-++      0 0 0 {SCAN TABLE t$t AS o USING COVERING INDEX sqlite_autoindex_t${t}_1}
-++      0 0 0 {EXECUTE CORRELATED SCALAR SUBQUERY 1}
-++      1 0 0 {SEARCH TABLE t$t AS i USING INTEGER PRIMARY KEY (rowid=?)}
-++    "
-++  }
-++}
-++
-++finish_test
-++
-+diff --git a/third_party/sqlite/src/test/busy.test b/third_party/sqlite/src/test/busy.test
-+index 585f764..be0515b 100644
-+--- a/third_party/sqlite/src/test/busy.test
-++++ b/third_party/sqlite/src/test/busy.test
-+@@ -10,11 +10,11 @@
-+ #***********************************************************************
-+ # This file test the busy handler
-+ #
-+-# $Id: busy.test,v 1.3 2008/03/15 02:09:22 drh Exp $
-+ 
-+ 
-+ set testdir [file dirname $argv0]
-+ source $testdir/tester.tcl
-++set testprefix busy
-+ 
-+ do_test busy-1.1 {
-+   sqlite3 db2 test.db
-+@@ -55,7 +55,85 @@ do_test busy-2.2 {
-+   set busyargs
-+ } {0 1 2 3}
-+ 
-+-
-+ db2 close
-+ 
-++#-------------------------------------------------------------------------
-++# Test that the busy-handler is invoked correctly for "PRAGMA optimize"
-++# and ANALYZE commnds.
-++ifcapable pragma&&analyze&&!stat4 {
-++
-++reset_db
-++
-++do_execsql_test 3.1 {
-++  CREATE TABLE t1(x);
-++  CREATE TABLE t2(y);
-++  CREATE TABLE t3(z);
-++
-++  CREATE INDEX i1 ON t1(x);
-++  CREATE INDEX i2 ON t2(y);
-++
-++  INSERT INTO t1 VALUES(1);
-++  INSERT INTO t2 VALUES(1);
-++  ANALYZE;
-++
-++  SELECT * FROM t1 WHERE x=1;
-++  SELECT * FROM t2 WHERE y=1;
-++} {1 1}
-++
-++do_test 3.2 {
-++  sqlite3 db2 test.db
-++  execsql { BEGIN EXCLUSIVE } db2
-++  catchsql { PRAGMA optimize }
-++} {1 {database is locked}}
-++
-++proc busy_handler {n} {
-++  if {$n>1000} { execsql { COMMIT } db2 }
-++  return 0
-++}
-++db busy busy_handler
-++
-++do_test 3.3 {
-++  catchsql { PRAGMA optimize }
-++} {0 {}}
-++
-++do_test 3.4 {
-++  execsql {
-++    BEGIN;
-++    SELECT count(*) FROM sqlite_master;
-++  } db2
-++} {6}
-++
-++proc busy_handler {n} { return 1 }
-++do_test 3.5 {
-++  catchsql { PRAGMA optimize }
-++} {0 {}}
-++
-++do_test 3.6 {
-++  execsql { COMMIT } db2
-++  execsql {
-++    WITH s(i) AS (
-++      SELECT 1 UNION ALL SELECT i+1 FROM s WHERE i<1000
-++    )
-++    INSERT INTO t1 SELECT i FROM s;
-++  }
-++  execsql {
-++    BEGIN;
-++    SELECT count(*) FROM sqlite_master;
-++  } db2
-++} {6}
-++
-++do_test 3.7 {
-++  catchsql { PRAGMA optimize }
-++} {1 {database is locked}}
-++
-++proc busy_handler {n} {
-++  if {$n>1000} { execsql { COMMIT } db2 }
-++  return 0
-++}
-++do_test 3.8 {
-++  catchsql { PRAGMA optimize }
-++} {0 {}}
-++
-++}
-++
-+ finish_test
-+diff --git a/third_party/sqlite/src/test/checkfreelist.test b/third_party/sqlite/src/test/checkfreelist.test
-+new file mode 100644
-+index 0000000..b2a45d3
-+--- /dev/null
-++++ b/third_party/sqlite/src/test/checkfreelist.test
-+@@ -0,0 +1,123 @@
-++# 2017-10-11
-++#
-++# The author disclaims copyright to this source code.  In place of
-++# a legal notice, here is a blessing:
-++#
-++#    May you do good and not evil.
-++#    May you find forgiveness for yourself and forgive others.
-++#    May you share freely, never taking more than you give.
-++#
-++#***********************************************************************
-++# This file implements regression tests for SQLite library.  The
-++# focus of this file is testing the checkfreelist extension.
-++#
-++
-++set testdir [file dirname $argv0]
-++source $testdir/tester.tcl
-++set testprefix checkfreelist
-++
-++ifcapable !vtab||!compound {
-++  finish_test
-++  return
-++}
-++
-++if {[file exists ../checkfreelist.so]==0} {
-++  finish_test
-++  return
-++}
-++
-++do_execsql_test 1.0 {
-++  CREATE TABLE t1(a, b);
-++}
-++
-++db enable_load_extension 1
-++do_execsql_test 1.1 {
-++  SELECT load_extension('../checkfreelist.so');
-++} {{}}
-++
-++do_execsql_test 1.2 { SELECT checkfreelist('main') } {ok}
-++do_execsql_test 1.3 {
-++  WITH s(i) AS (
-++    SELECT 1 UNION ALL SELECT i+1 FROM s WHERE i<10000
-++  )
-++  INSERT INTO t1 SELECT randomblob(400), randomblob(400) FROM s;
-++  DELETE FROM t1 WHERE rowid%3;
-++  PRAGMA freelist_count;
-++} {6726}
-++
-++do_execsql_test 1.4 { SELECT checkfreelist('main') } {ok}
-++do_execsql_test 1.5 {
-++  WITH freelist_trunk(i, d, n) AS (
-++    SELECT 1, NULL, sqlite_readint32(data, 32) FROM sqlite_dbpage WHERE pgno=1
-++      UNION ALL
-++    SELECT n, data, sqlite_readint32(data)
-++    FROM freelist_trunk, sqlite_dbpage WHERE pgno=n
-++  )
-++  SELECT i FROM freelist_trunk WHERE i!=1;
-++} {
-++  10010 9716 9344 8970 8596 8223 7848 7475 7103 6728 6355 5983 5609 5235
-++  4861 4488 4113 3741 3368 2993 2620 2248 1873 1500 1126 753 378 5
-++}
-++
-++do_execsql_test 1.6 { SELECT checkfreelist('main') } {ok}
-++
-++proc set_int {blob idx newval} {
-++  binary scan $blob I* ints
-++  lset ints $idx $newval
-++  binary format I* $ints
-++}
-++db func set_int set_int
-++
-++proc get_int {blob idx} {
-++  binary scan $blob I* ints
-++  lindex $ints $idx
-++}
-++db func get_int get_int
-++
-++do_execsql_test 1.7 {
-++  BEGIN;
-++    UPDATE sqlite_dbpage
-++      SET data = set_int(data, 1, get_int(data, 1)-1)
-++      WHERE pgno=4861;
-++    SELECT checkfreelist('main');
-++  ROLLBACK;
-++} {{free-list count mismatch: actual=6725 header=6726}}
-++
-++do_execsql_test 1.8 {
-++  BEGIN;
-++    UPDATE sqlite_dbpage
-++      SET data = set_int(data, 5, (SELECT * FROM pragma_page_count)+1)
-++      WHERE pgno=4861;
-++    SELECT checkfreelist('main');
-++  ROLLBACK;
-++} {{leaf page 10093 is out of range (child 3 of trunk page 4861)}}
-++
-++do_execsql_test 1.9 {
-++  BEGIN;
-++    UPDATE sqlite_dbpage
-++      SET data = set_int(data, 5, 0)
-++      WHERE pgno=4861;
-++    SELECT checkfreelist('main');
-++  ROLLBACK;
-++} {{leaf page 0 is out of range (child 3 of trunk page 4861)}}
-++
-++do_execsql_test 1.10 {
-++  BEGIN;
-++    UPDATE sqlite_dbpage
-++      SET data = set_int(data, get_int(data, 1)+1, 0)
-++      WHERE pgno=5;
-++    SELECT checkfreelist('main');
-++  ROLLBACK;
-++} {{leaf page 0 is out of range (child 247 of trunk page 5)}}
-++
-++do_execsql_test 1.11 {
-++  BEGIN;
-++    UPDATE sqlite_dbpage
-++      SET data = set_int(data, 1, 249)
-++      WHERE pgno=5;
-++    SELECT checkfreelist('main');
-++  ROLLBACK;
-++} {{leaf count out of range (249) on trunk page 5}}
-++
-++finish_test
-++
-+diff --git a/third_party/sqlite/src/test/colname.test b/third_party/sqlite/src/test/colname.test
-+index 37d152b..0f81ddf 100644
-+--- a/third_party/sqlite/src/test/colname.test
-++++ b/third_party/sqlite/src/test/colname.test
-+@@ -326,4 +326,75 @@ do_test colname-8.1 {
-+   }
-+ } {123}
-+ 
-++# 2017-07-29: Interaction between column naming and query flattening.
-++# For years now, the query flattener has inserted AS clauses on the
-++# outer query that were the original SQL text of the column.  This caused
-++# column-name shifts when the query flattener was enhanced, breaking
-++# legacy applications.  See https://sqlite.org/src/info/41c27bc0ff1d3135
-++# for details.
-++#
-++# To fix this, the column naming logic was moved ahead of the query
-++# flattener so that column names are assigned before the query flattener
-++# runs.
-++#
-++db close
-++sqlite3 db :memory:
-++do_test colname-9.100 {
-++  db eval {
-++    CREATE TABLE t1(a,b);
-++    INSERT INTO t1 VALUES(1,2);
-++    CREATE VIEW v1(x,y) AS SELECT a,b FROM t1;
-++  }
-++  execsql2 {SELECT v1.x, (Y) FROM v1}
-++  # Prior to the fix, this would return:  "v1.x 1 (Y) 2"
-++} {x 1 y 2}
-++do_test colname-9.110 {
-++  execsql2 {SELECT * FROM v1}
-++} {x 1 y 2}
-++do_test colname-9.120 {
-++  db eval {
-++    CREATE VIEW v2(x,y) AS SELECT a,b FROM t1 LIMIT 10;
-++  }
-++  execsql2 {SELECT * FROM v2 WHERE 1}
-++} {x 1 y 2}
-++do_test colname-9.130 {
-++  execsql2 {SELECT v2.x, [v2].[y] FROM v2 WHERE 1}
-++} {x 1 y 2}
-++do_test colname-9.140 {
-++  execsql2 {SELECT +x, +y FROM v2 WHERE 1}
-++} {+x 1 +y 2}
-++
-++do_test colname-9.200 {
-++  db eval {
-++    CREATE TABLE t2(c,d);
-++    INSERT INTO t2 VALUES(3,4);
-++    CREATE VIEW v3 AS SELECT c AS a, d AS b FROM t2;
-++  }
-++  execsql2 {SELECT t1.a, v3.a AS n FROM t1 LEFT JOIN v3}
-++} {a 1 n 3}
-++do_test colname-9.211 {
-++  execsql2 {SELECT t1.a AS n, v3.a FROM t1 JOIN v3}
-++} {n 1 a 3}
-++do_test colname-9.210 {
-++  execsql2 {SELECT t1.a, v3.a AS n FROM t1 JOIN v3}
-++} {a 1 n 3}
-++
-++# Make sure the quotation marks get removed from the column names
-++# when constructing a new table from an aggregate SELECT.
-++# Email from Juergen Palm on 2017-07-11.
-++#
-++do_execsql_test colname-10.100 {
-++  DROP TABLE IF EXISTS t1;
-++  CREATE TABLE t1("with space" TEXT);
-++  DROP TABLE IF EXISTS t2;
-++  CREATE TABLE t2 AS SELECT "with space" FROM t1;
-++  PRAGMA table_info(t2);
-++} {0 {with space} TEXT 0 {} 0}
-++do_execsql_test colname-10.110 {
-++  DROP TABLE IF EXISTS t3;
-++  CREATE TABLE t3 AS SELECT "with space" FROM t1 GROUP BY 1;
-++  PRAGMA table_info(t3);
-++} {0 {with space} TEXT 0 {} 0}
-++
-++
-+ finish_test
-+diff --git a/third_party/sqlite/src/test/corruptC.test b/third_party/sqlite/src/test/corruptC.test
-+index 8c7f2e6..d994354 100644
-+--- a/third_party/sqlite/src/test/corruptC.test
-++++ b/third_party/sqlite/src/test/corruptC.test
-+@@ -164,7 +164,7 @@ do_test corruptC-2.5 {
-+   catchsql {BEGIN; UPDATE t2 SET y='abcdef-uvwxyz'; ROLLBACK;}
-+   catchsql {PRAGMA integrity_check}
-+ } {0 {{*** in database main ***
-+-On tree page 4 cell 19: Extends off end of page}}}
-++On tree page 4 cell 19: Extends off end of page} {database disk image is malformed}}}
-+ 
-+ # {0 {{*** in database main ***
-+ # Corruption detected in cell 710 on page 4
-+diff --git a/third_party/sqlite/src/test/corruptK.test b/third_party/sqlite/src/test/corruptK.test
-+index 0b8a85d..9bbc470 100644
-+--- a/third_party/sqlite/src/test/corruptK.test
-++++ b/third_party/sqlite/src/test/corruptK.test
-+@@ -107,6 +107,121 @@ do_catchsql_test 2.3 {
-+   INSERT INTO t1 VALUES(randomblob(900));
-+ } {1 {database disk image is malformed}}
-+ 
-++#-------------------------------------------------------------------------
-++
-++ifcapable vtab {
-++if {[permutation]!="inmemory_journal"} {
-++
-++  proc hex2blob {hex} {
-++    # Split on newlines:
-++    set bytes [list]
-++    foreach l [split $hex "\n"] {
-++      if {[string is space $l]} continue
-++      set L [list]
-++      foreach b [split $l] {
-++        if {[string is xdigit $b] && [string length $b]==2} {
-++          lappend L [expr "0x$b"]
-++        }
-++      }
-++      if {[llength $L]!=16} {
-++        error "Badly formed hex (1)"
-++      }
-++      set bytes [concat $bytes $L]
-++    }
-++
-++    binary format c* $bytes
-++  }
-++
-++  reset_db
-++  db func hex2blob hex2blob
-++
-++  do_execsql_test 3.1 {
-++    PRAGMA page_size=1024;
-++    CREATE TABLE t1(a, b, c);
-++    CREATE TABLE t2(a, b, c);
-++    CREATE TABLE t3(a, b, c);
-++    CREATE TABLE t4(a, b, c);
-++    CREATE TABLE t5(a, b, c);
-++  }
-++
-++  do_execsql_test 3.2 {
-++    UPDATE sqlite_dbpage SET data = hex2blob('
-++   000: 53 51 4c 69 74 65 20 66 6f 72 6d 61 74 20 33 00 SQLite format 3.
-++   010: 04 00 01 01 20 40 20 20 00 00 3e d9 00 00 00 06 .... @  ..>.....
-++   020: 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00 04 ................
-++   030: 0f 00 00 00 00 00 00 00 00 00 00 01 00 00 83 00 ................
-++   040: 00 00 00 00 00 00 00 00 00 00 00 00 00 38 00 00 .............8..
-++   050: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 3e d9 ..............>.
-++   060: 00 2d e6 07 0d 00 00 00 01 03 a0 00 03 e0 00 00 .-..............
-++   070: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
-++   080: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
-++   090: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
-++   0a0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
-++   0b0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
-++   0c0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
-++   0d0: 00 00 00 00 00 c1 00 00 00 00 00 00 00 00 00 00 ................
-++   0e0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
-++   0f0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
-++   100: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
-++   110: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
-++   120: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
-++   130: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
-++   140: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
-++   150: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
-++   160: 00 83 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
-++   170: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
-++   180: 00 00 00 00 00 00 00 00 00 00 07 00 30 00 00 00 ............0...
-++   190: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
-++   1a0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
-++   1b0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
-++   1c0: 02 00 00 00 00 00 00 00 00 00 00 02 00 00 00 00 ................
-++   1d0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
-++   1e0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
-++   1f0: 00 02 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
-++   200: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
-++   210: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
-++   220: 00 00 0e 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
-++   230: 0c 00 00 00 00 00 00 60 00 00 00 06 00 00 c3 00 .......`........
-++   240: 00 06 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
-++   250: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
-++   260: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
-++   270: 00 00 00 18 00 00 00 00 00 00 00 00 00 00 00 00 ................
-++   280: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
-++   290: 04 00 0e 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
-++   2a0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
-++   2b0: 00 00 00 00 83 00 8c 00 00 00 00 00 00 00 00 00 ................
-++   2c0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
-++   2d0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
-++   2e0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
-++   2f0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
-++   300: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
-++   310: 00 78 00 00 00 00 00 00 00 00 00 00 00 00 70 00 .x............p.
-++   320: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
-++   330: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
-++   340: 00 00 00 04 00 00 00 00 00 00 00 00 00 00 00 00 ................
-++   350: 00 00 00 00 00 68 00 00 00 00 00 00 00 00 00 00 .....h..........
-++   360: 00 00 00 00 00 03 00 00 00 00 00 00 00 00 00 00 ................
-++   370: 00 00 00 00 00 00 00 00 00 00 00 00 00 08 00 00 ................
-++   380: 00 00 00 00 70 00 00 00 00 00 00 00 00 00 00 00 ....p...........
-++   390: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
-++   3a0: 5e 01 07 17 1b 1b 01 81 13 74 61 62 6c 65 73 65 ^........tablese
-++   3b0: 6e 73 6f 32 73 73 65 6e 73 6f 72 73 02 43 52 45 nso2ssensors.CRE
-++   3c0: 41 54 45 20 54 41 42 4c 45 20 73 65 6e 73 6f 72 ATE TABLE sensor
-++   3d0: 73 20 0a 20 20 24 20 20 20 20 20 20 20 20 20 20 s .  $
-++   3e0: b8 6e 61 6d 65 21 74 65 78 74 2c 20 79 61 6c 20 .name!text, yal
-++   3f0: 72 65 61 6c 2c 20 74 69 6d 65 20 74 65 78 74 29 real, time text)
-++    ') WHERE pgno=1
-++  }
-++
-++  db close
-++  sqlite3 db test.db
-++
-++  do_catchsql_test 3.3 {
-++    PRAGMA integrity_check;
-++  } {1 {database disk image is malformed}}
-++
-++} ;# [permutation]!="inmemory_journal"
-++} ;# ifcapable vtab
-+ 
-+ 
-+ 
-+diff --git a/third_party/sqlite/src/test/csv01.test b/third_party/sqlite/src/test/csv01.test
-+index f4c68e4..8b7759f 100644
-+--- a/third_party/sqlite/src/test/csv01.test
-++++ b/third_party/sqlite/src/test/csv01.test
-+@@ -93,6 +93,7 @@ do_catchsql_test 3.2 {
-+   SELECT rowid, a FROM t3;
-+ } {1 {no such column: rowid}}
-+ 
-++# Multi-column WITHOUT ROWID virtual tables may not be writable.
-+ do_catchsql_test 4.0 {
-+   DROP TABLE t3;
-+   CREATE VIRTUAL TABLE temp.t4 USING csv_wr(
-+@@ -100,13 +101,44 @@ do_catchsql_test 4.0 {
-+ '1,2,3,4
-+ 5,6,7,8
-+ 9,10,11,12
-+-13,14,15,16
-+-',
-++13,14,15,16',
-+     columns=4,
-+     schema=
-+-      'CREATE TABLE t3(a PRIMARY KEY,b TEXT,c TEXT,d TEXT) WITHOUT ROWID',
-++      'CREATE TABLE t3(a,b,c,d,PRIMARY KEY(a,b)) WITHOUT ROWID',
-+     testflags=1
-+   );
-+ } {1 {vtable constructor failed: t4}}
-+ 
-++# WITHOUT ROWID tables with a single-column PRIMARY KEY may be writable.
-++do_catchsql_test 4.1 {
-++  DROP TABLE IF EXISTS t4;
-++  CREATE VIRTUAL TABLE temp.t4 USING csv_wr(
-++    data=
-++'1,2,3,4
-++5,6,7,8
-++9,10,11,12
-++13,14,15,16',
-++    columns=4,
-++    schema=
-++      'CREATE TABLE t3(a,b,c,d,PRIMARY KEY(b)) WITHOUT ROWID',
-++    testflags=1
-++  );
-++} {0 {}}
-++
-++do_catchsql_test 4.2 {
-++  DROP TABLE IF EXISTS t5;
-++  CREATE VIRTUAL TABLE temp.t5 USING csv_wr(
-++      data=
-++      '1,2,3,4
-++      5,6,7,8
-++      9,10,11,12
-++      13,14,15,16',
-++      columns=4,
-++      schema=
-++      'CREATE TABLE t3(a,b,c,d) WITHOUT ROWID',
-++      testflags=1
-++      );
-++} {1 {vtable constructor failed: t5}}
-++
-++
-+ finish_test
-+diff --git a/third_party/sqlite/src/test/dbpage.test b/third_party/sqlite/src/test/dbpage.test
-+new file mode 100644
-+index 0000000..ff79b3e
-+--- /dev/null
-++++ b/third_party/sqlite/src/test/dbpage.test
-+@@ -0,0 +1,74 @@
-++# 2017-10-11
-++#
-++# The author disclaims copyright to this source code.  In place of
-++# a legal notice, here is a blessing:
-++#
-++#    May you do good and not evil.
-++#    May you find forgiveness for yourself and forgive others.
-++#    May you share freely, never taking more than you give.
-++#
-++#***********************************************************************
-++# This file implements regression tests for SQLite library.  The
-++# focus of this file is testing the sqlite_dbpage virtual table.
-++#
-++
-++set testdir [file dirname $argv0]
-++source $testdir/tester.tcl
-++set testprefix dbpage
-++
-++ifcapable !vtab||!compound {
-++  finish_test
-++  return
-++}
-++
-++do_test 100 {
-++  execsql {
-++    PRAGMA auto_vacuum=0;
-++    PRAGMA page_size=4096;
-++    PRAGMA journal_mode=WAL;
-++  }
-++  execsql {
-++    CREATE TABLE t1(a,b);
-++    WITH RECURSIVE c(x) AS (VALUES(1) UNION ALL SELECT x+1 FROM c WHERE x<100)
-++      INSERT INTO t1(a,b) SELECT x, printf('%d-x%.*c',x,x,'x') FROM c;
-++    PRAGMA integrity_check;
-++  }
-++} {ok}
-++do_execsql_test 110 {
-++  SELECT pgno, quote(substr(data,1,5)) FROM sqlite_dbpage('main') ORDER BY pgno;
-++} {1 X'53514C6974' 2 X'0500000001' 3 X'0D0000004E' 4 X'0D00000016'}
-++do_execsql_test 120 {
-++  SELECT pgno, quote(substr(data,1,5)) FROM sqlite_dbpage WHERE pgno=2;
-++} {2 X'0500000001'}
-++do_execsql_test 130 {
-++  SELECT pgno, quote(substr(data,1,5)) FROM sqlite_dbpage WHERE pgno=4;
-++} {4 X'0D00000016'}
-++do_execsql_test 140 {
-++  SELECT pgno, quote(substr(data,1,5)) FROM sqlite_dbpage WHERE pgno=5;
-++} {}
-++do_execsql_test 150 {
-++  SELECT pgno, quote(substr(data,1,5)) FROM sqlite_dbpage WHERE pgno=0;
-++} {}
-++
-++do_execsql_test 200 {
-++  CREATE TEMP TABLE saved_content(x);
-++  INSERT INTO saved_content(x) SELECT data FROM sqlite_dbpage WHERE pgno=4;
-++  UPDATE sqlite_dbpage SET data=zeroblob(4096) WHERE pgno=4;
-++} {}
-++do_catchsql_test 210 {
-++  PRAGMA integrity_check;
-++} {1 {database disk image is malformed}}
-++do_execsql_test 220 {
-++  SELECT pgno, quote(substr(data,1,5)) FROM sqlite_dbpage('main') ORDER BY pgno;
-++} {1 X'53514C6974' 2 X'0500000001' 3 X'0D0000004E' 4 X'0000000000'}
-++do_execsql_test 230 {
-++  UPDATE sqlite_dbpage SET data=(SELECT x FROM saved_content) WHERE pgno=4;
-++} {}
-++do_catchsql_test 230 {
-++  PRAGMA integrity_check;
-++} {0 ok}
-++
-++
-++
-++
-++finish_test
-+diff --git a/third_party/sqlite/src/test/e_expr.test b/third_party/sqlite/src/test/e_expr.test
-+index de57af6..d239df0 100644
-+--- a/third_party/sqlite/src/test/e_expr.test
-++++ b/third_party/sqlite/src/test/e_expr.test
-+@@ -1663,6 +1663,50 @@ do_expr_test e_expr-32.2.3 {
-+ do_expr_test e_expr-32.2.4 {
-+   CAST(9223372036854775807 AS NUMERIC)
-+ } integer 9223372036854775807
-++do_expr_test e_expr-32.2.5 {
-++  CAST('9223372036854775807 ' AS NUMERIC)
-++} integer 9223372036854775807
-++do_expr_test e_expr-32.2.6 {
-++  CAST('   9223372036854775807   ' AS NUMERIC)
-++} integer 9223372036854775807
-++do_expr_test e_expr-32.2.7 {
-++  CAST('  ' AS NUMERIC)
-++} integer 0
-++do_execsql_test e_expr-32.2.8 {
-++  WITH t1(x) AS (VALUES
-++     ('9000000000000000001'),
-++     ('9000000000000000001x'),
-++     ('9000000000000000001 '),
-++     (' 9000000000000000001 '),
-++     (' 9000000000000000001'),
-++     (' 9000000000000000001.'),
-++     ('9223372036854775807'),
-++     ('9223372036854775807 '),
-++     ('   9223372036854775807   '),
-++     ('9223372036854775808'),
-++     ('   9223372036854775808   '),
-++     ('9223372036854775807.0'),
-++     ('9223372036854775807e+0'),
-++     ('-5.0'),
-++     ('-5e+0'))
-++  SELECT typeof(CAST(x AS NUMERIC)), CAST(x AS NUMERIC)||'' FROM t1;
-++} [list \
-++ integer 9000000000000000001 \
-++ integer 9000000000000000001 \
-++ integer 9000000000000000001 \
-++ integer 9000000000000000001 \
-++ integer 9000000000000000001 \
-++ integer 9000000000000000001 \
-++ integer 9223372036854775807 \
-++ integer 9223372036854775807 \
-++ integer 9223372036854775807 \
-++ real 9.22337203685478e+18 \
-++ real 9.22337203685478e+18 \
-++ integer 9223372036854775807 \
-++ integer 9223372036854775807 \
-++ integer -5 \
-++ integer -5 \
-++]
-+ 
-+ # EVIDENCE-OF: R-64550-29191 Note that the result from casting any
-+ # non-BLOB value into a BLOB and the result from casting any BLOB value
-+diff --git a/third_party/sqlite/src/test/e_uri.test b/third_party/sqlite/src/test/e_uri.test
-+index 71da32e..554805b 100644
-+--- a/third_party/sqlite/src/test/e_uri.test
-++++ b/third_party/sqlite/src/test/e_uri.test
-+@@ -50,8 +50,8 @@ proc open_uri_error {uri} {
-+ # and the filename argument begins with "file:", then the filename is
-+ # interpreted as a URI.
-+ #
-+-# EVIDENCE-OF: R-24124-56960 URI filename interpretation is enabled if
-+-# the SQLITE_OPEN_URI flag is set in the fourth argument to
-++# EVIDENCE-OF: R-27632-24205 URI filename interpretation is enabled if
-++# the SQLITE_OPEN_URI flag is set in the third argument to
-+ # sqlite3_open_v2(), or if it has been enabled globally using the
-+ # SQLITE_CONFIG_URI option with the sqlite3_config() method or by the
-+ # SQLITE_USE_URI compile-time option.
-+diff --git a/third_party/sqlite/src/test/eqp.test b/third_party/sqlite/src/test/eqp.test
-+index dd2753f..12e916d 100644
-+--- a/third_party/sqlite/src/test/eqp.test
-++++ b/third_party/sqlite/src/test/eqp.test
-+@@ -188,24 +188,24 @@ do_eqp_test 3.1.1 {
-+ do_eqp_test 3.1.2 {
-+   SELECT * FROM t1 WHERE (SELECT x FROM t1 AS sub);
-+ } {
-++  0 0 0 {SCAN TABLE t1}
-+   0 0 0 {EXECUTE SCALAR SUBQUERY 1}
-+   1 0 0 {SCAN TABLE t1 AS sub}
-+-  0 0 0 {SCAN TABLE t1}
-+ }
-+ do_eqp_test 3.1.3 {
-+   SELECT * FROM t1 WHERE (SELECT x FROM t1 AS sub ORDER BY y);
-+ } {
-++  0 0 0 {SCAN TABLE t1}
-+   0 0 0 {EXECUTE SCALAR SUBQUERY 1}
-+   1 0 0 {SCAN TABLE t1 AS sub}
-+   1 0 0 {USE TEMP B-TREE FOR ORDER BY}
-+-  0 0 0 {SCAN TABLE t1}
-+ }
-+ do_eqp_test 3.1.4 {
-+   SELECT * FROM t1 WHERE (SELECT x FROM t2 ORDER BY x);
-+ } {
-++  0 0 0 {SCAN TABLE t1}
-+   0 0 0 {EXECUTE SCALAR SUBQUERY 1}
-+   1 0 0 {SCAN TABLE t2 USING COVERING INDEX t2i1}
-+-  0 0 0 {SCAN TABLE t1}
-+ }
-+ 
-+ det 3.2.1 {
-+diff --git a/third_party/sqlite/src/test/fallocate.test b/third_party/sqlite/src/test/fallocate.test
-+index 1325b74..a37ff13 100644
-+--- a/third_party/sqlite/src/test/fallocate.test
-++++ b/third_party/sqlite/src/test/fallocate.test
-+@@ -59,7 +59,9 @@ do_test fallocate-1.6 {
-+ #
-+ do_test fallocate-1.7 {
-+   execsql { BEGIN; INSERT INTO t1 VALUES(1, 2); }
-+-  if {[permutation] != "inmemory_journal"} {
-++  if {[permutation] != "inmemory_journal"
-++   && [permutation] != "atomic-batch-write"
-++  } {
-+     hexio_get_int [hexio_read test.db-journal 16 4]
-+   } else {
-+     set {} 1024
-+diff --git a/third_party/sqlite/src/test/fts3conf.test b/third_party/sqlite/src/test/fts3conf.test
-+index 2c6d821..4a2e315 100644
-+--- a/third_party/sqlite/src/test/fts3conf.test
-++++ b/third_party/sqlite/src/test/fts3conf.test
-+@@ -136,47 +136,49 @@ do_execsql_test 2.2.2 { COMMIT }
-+ do_execsql_test 2.2.3 { SELECT * FROM t1 } {{a b c} {a b c}}
-+ fts3_integrity 2.2.4 db t1
-+ 
-+-do_execsql_test 3.1 {
-+-  CREATE VIRTUAL TABLE t3 USING fts4;
-+-  REPLACE INTO t3(docid, content) VALUES (1, 'one two');
-+-  SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'one'
-+-} {X'0100000002000000'}
-+-
-+-do_execsql_test 3.2 {
-+-  REPLACE INTO t3(docid, content) VALUES (2, 'one two three four');
-+-  SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'four'
-+-} {X'0200000003000000'}
-+-
-+-do_execsql_test 3.3 {
-+-  REPLACE INTO t3(docid, content) VALUES (1, 'one two three four five six');
-+-  SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'six'
-+-} {X'0200000005000000'}
-+-
-+-do_execsql_test 3.4 {
-+-  UPDATE OR REPLACE t3 SET docid = 2 WHERE docid=1;
-+-  SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'six'
-+-} {X'0100000006000000'}
-+-
-+-do_execsql_test 3.5 {
-+-  UPDATE OR REPLACE t3 SET docid = 3 WHERE docid=2;
-+-  SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'six'
-+-} {X'0100000006000000'}
-+-
-+-do_execsql_test 3.6 {
-+-  REPLACE INTO t3(docid, content) VALUES (3, 'one two');
-+-  SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'one'
-+-} {X'0100000002000000'}
-+-
-+-do_execsql_test 3.7 {
-+-  REPLACE INTO t3(docid, content) VALUES (NULL, 'one two three four');
-+-  REPLACE INTO t3(docid, content) VALUES (NULL, 'one two three four five six');
-+-  SELECT docid FROM t3;
-+-} {3 4 5}
-+-
-+-do_execsql_test 3.8 {
-+-  UPDATE OR REPLACE t3 SET docid = 5, content='three four' WHERE docid = 4;
-+-  SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'one'
-+-} {X'0200000002000000'}
-++if {$tcl_platform(byteOrder)=="littleEndian"} {
-++  do_execsql_test 3.1 {
-++    CREATE VIRTUAL TABLE t3 USING fts4;
-++    REPLACE INTO t3(docid, content) VALUES (1, 'one two');
-++    SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'one'
-++  } {X'0100000002000000'}
-++
-++  do_execsql_test 3.2 {
-++    REPLACE INTO t3(docid, content) VALUES (2, 'one two three four');
-++    SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'four'
-++  } {X'0200000003000000'}
-++
-++  do_execsql_test 3.3 {
-++    REPLACE INTO t3(docid, content) VALUES (1, 'one two three four five six');
-++    SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'six'
-++  } {X'0200000005000000'}
-++
-++  do_execsql_test 3.4 {
-++    UPDATE OR REPLACE t3 SET docid = 2 WHERE docid=1;
-++    SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'six'
-++  } {X'0100000006000000'}
-++
-++  do_execsql_test 3.5 {
-++    UPDATE OR REPLACE t3 SET docid = 3 WHERE docid=2;
-++    SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'six'
-++  } {X'0100000006000000'}
-++
-++  do_execsql_test 3.6 {
-++    REPLACE INTO t3(docid, content) VALUES (3, 'one two');
-++    SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'one'
-++  } {X'0100000002000000'}
-++
-++  do_execsql_test 3.7 {
-++    REPLACE INTO t3(docid, content) VALUES(NULL,'one two three four');
-++    REPLACE INTO t3(docid, content) VALUES(NULL,'one two three four five six');
-++    SELECT docid FROM t3;
-++  } {3 4 5}
-++
-++  do_execsql_test 3.8 {
-++    UPDATE OR REPLACE t3 SET docid = 5, content='three four' WHERE docid = 4;
-++    SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'one'
-++  } {X'0200000002000000'}
-++}
-+ 
-+ #-------------------------------------------------------------------------
-+ # Test that the xSavepoint is invoked correctly if the first write
-+diff --git a/third_party/sqlite/src/test/fts3rank.test b/third_party/sqlite/src/test/fts3rank.test
-+new file mode 100644
-+index 0000000..93b8c45
-+--- /dev/null
-++++ b/third_party/sqlite/src/test/fts3rank.test
-+@@ -0,0 +1,64 @@
-++# 2017 October 7
-++#
-++# The author disclaims copyright to this source code.  In place of
-++# a legal notice, here is a blessing:
-++#
-++#    May you do good and not evil.
-++#    May you find forgiveness for yourself and forgive others.
-++#    May you share freely, never taking more than you give.
-++#
-++#*************************************************************************
-++# This file implements regression tests for SQLite library.  The
-++# focus of this script is testing the FTS3 module.
-++#
-++
-++set testdir [file dirname $argv0]
-++source $testdir/tester.tcl
-++set testprefix fts3expr5
-++
-++# If SQLITE_ENABLE_FTS3 is defined, omit this file.
-++ifcapable !fts3 {
-++  finish_test
-++  return
-++}
-++
-++install_fts3_rank_function db
-++do_execsql_test 1.0 {
-++  CREATE VIRTUAL TABLE t1 USING fts3(a, b);
-++  INSERT INTO t1 VALUES('one two', 'one');
-++  INSERT INTO t1 VALUES('one two', 'three');
-++  INSERT INTO t1 VALUES('one two', 'two');
-++}
-++
-++do_execsql_test 1.1 {
-++  SELECT * FROM t1 WHERE t1 MATCH 'one'
-++  ORDER BY rank(matchinfo(t1), 1.0, 1.0) DESC, rowid
-++} {
-++  {one two} one
-++  {one two} three
-++  {one two} two
-++}
-++
-++do_execsql_test 1.2 {
-++  SELECT * FROM t1 WHERE t1 MATCH 'two'
-++  ORDER BY rank(matchinfo(t1), 1.0, 1.0) DESC, rowid
-++} {
-++  {one two} two
-++  {one two} one
-++  {one two} three
-++}
-++
-++do_catchsql_test 1.3 {
-++  SELECT * FROM t1 ORDER BY rank(matchinfo(t1), 1.0, 1.0) DESC, rowid
-++} {1 {invalid matchinfo blob passed to function rank()}}
-++
-++do_catchsql_test 1.4 {
-++  SELECT * FROM t1 ORDER BY rank(x'0000000000000000') DESC, rowid
-++} {0 {{one two} one {one two} three {one two} two}}
-++
-++do_catchsql_test 1.5 {
-++  SELECT * FROM t1 ORDER BY rank(x'0100000001000000') DESC, rowid
-++} {1 {invalid matchinfo blob passed to function rank()}}
-++
-++finish_test
-++
-+diff --git a/third_party/sqlite/src/test/having.test b/third_party/sqlite/src/test/having.test
-+index b790b44..bece7d7 100644
-+--- a/third_party/sqlite/src/test/having.test
-++++ b/third_party/sqlite/src/test/having.test
-+@@ -65,19 +65,6 @@ foreach {tn sql1 sql2} {
-+   3 "SELECT a, sum(b) FROM t1 GROUP BY a COLLATE binary HAVING a=2"
-+     "SELECT a, sum(b) FROM t1 WHERE a=2 GROUP BY a COLLATE binary"
-+ 
-+-  4 {
-+-      SELECT x,y FROM (
-+-        SELECT a AS x, sum(b) AS y FROM t1
-+-        GROUP BY a
-+-      ) WHERE x BETWEEN 8888 AND 9999
-+-    } {
-+-      SELECT x,y FROM (
-+-        SELECT a AS x, sum(b) AS y FROM t1
-+-        WHERE x BETWEEN 8888 AND 9999
-+-        GROUP BY a
-+-      )
-+-    }
-+-
-+   5 "SELECT a, sum(b) FROM t1 GROUP BY a COLLATE binary HAVING 0"
-+     "SELECT a, sum(b) FROM t1 WHERE 0 GROUP BY a COLLATE binary"
-+ 
-+@@ -98,6 +85,24 @@ foreach {tn sql1 sql2} {
-+   do_compare_vdbe_test 2.$tn $sql1 $sql2 1
-+ }
-+ 
-++# The (4) test in the above set used to generate identical bytecode, but
-++# that is no longer the case.  The byte code is equivalent, though.
-++#
-++do_execsql_test 2.4a {
-++  SELECT x,y FROM (
-++    SELECT a AS x, sum(b) AS y FROM t1
-++    GROUP BY a
-++  ) WHERE x BETWEEN 2 AND 9999
-++} {2 12}
-++do_execsql_test 2.4b {
-++  SELECT x,y FROM (
-++    SELECT a AS x, sum(b) AS y FROM t1
-++    WHERE x BETWEEN 2 AND 9999
-++    GROUP BY a
-++  )
-++} {2 12}
-++
-++
-+ #-------------------------------------------------------------------------
-+ # 1: Test that the optimization is only applied if the GROUP BY term
-+ #    uses BINARY collation.
-+diff --git a/third_party/sqlite/src/test/indexexpr1.test b/third_party/sqlite/src/test/indexexpr1.test
-+index d5fdc13..0f0dafc 100644
-+--- a/third_party/sqlite/src/test/indexexpr1.test
-++++ b/third_party/sqlite/src/test/indexexpr1.test
-+@@ -380,7 +380,26 @@ do_execsql_test indexexpr1-1300.1 {
-+   SELECT a FROM t1300 WHERE substr(b,4)='ess' COLLATE nocase ORDER BY +a;
-+ } {3 4}
-+ 
-+-# Date and time functions can participate in an index as long as they
-+-# do not contain
-++# Ticket https://sqlite.org/src/tktview/aa98619a
-++# Assertion fault using an index on a constant
-++#
-++do_execsql_test indexexpr1-1400 {
-++  CREATE TABLE t1400(x TEXT);
-++  CREATE INDEX t1400x ON t1400(1);  -- Index on a constant
-++  SELECT 1 IN (SELECT 2) FROM t1400;
-++} {}
-++do_execsql_test indexexpr1-1410 {
-++  INSERT INTO t1400 VALUES('a'),('b');
-++  SELECT 1 IN (SELECT 2) FROM t1400;
-++} {0 0}
-++do_execsql_test indexexpr1-1420 {
-++  SELECT 1 IN (SELECT 2 UNION ALL SELECT 1) FROM t1400;
-++} {1 1}
-++do_execsql_test indexexpr1-1430 {
-++  DROP INDEX t1400x;
-++  CREATE INDEX t1400x ON t1400(abs(15+3));
-++  SELECT abs(15+3) IN (SELECT 17 UNION ALL SELECT 18) FROM t1;
-++} {1 1}
-++
-+ 
-+ finish_test
-+diff --git a/third_party/sqlite/src/test/indexexpr2.test b/third_party/sqlite/src/test/indexexpr2.test
-+index c72561f..a6b43cb 100644
-+--- a/third_party/sqlite/src/test/indexexpr2.test
-++++ b/third_party/sqlite/src/test/indexexpr2.test
-+@@ -40,4 +40,122 @@ do_execsql_test 2.1 {
-+   SELECT a+1, quote(a+1) FROM t1 ORDER BY 1;
-+ } {2 2 3 3 4 4}
-+ 
-++#-------------------------------------------------------------------------
-++# At one point SQLite was incorrectly using indexes on expressions to
-++# optimize ORDER BY and GROUP BY clauses even when the collation
-++# sequences of the query and index did not match (ticket [e20dd54ab0e4]).
-++# The following tests - 3.* - attempt to verify that this has been fixed.
-++#
-++
-++reset_db
-++do_execsql_test 3.1.0 {
-++  CREATE TABLE t1(a, b);
-++  CREATE INDEX i1 ON t1(a, b);
-++} {}
-++
-++do_eqp_test 3.1.1 {
-++  SELECT b FROM t1 WHERE b IS NOT NULL AND a IS NULL
-++  GROUP BY b COLLATE nocase
-++  ORDER BY b COLLATE nocase;
-++} {/USE TEMP B-TREE FOR GROUP BY/}
-++
-++do_execsql_test 3.2.0 {
-++  CREATE TABLE t2(x);
-++
-++  INSERT INTO t2 VALUES('.ABC');
-++  INSERT INTO t2 VALUES('.abcd');
-++  INSERT INTO t2 VALUES('.defg');
-++  INSERT INTO t2 VALUES('.DEF');
-++} {}
-++
-++do_execsql_test 3.2.1 {
-++  SELECT x FROM t2 ORDER BY substr(x, 2) COLLATE nocase;
-++} {
-++  .ABC .abcd .DEF .defg
-++}
-++
-++do_execsql_test 3.2.2 {
-++  CREATE INDEX i2 ON t2( substr(x, 2) );
-++  SELECT x FROM t2 ORDER BY substr(x, 2) COLLATE nocase;
-++} {
-++  .ABC .abcd .DEF .defg
-++}
-++
-++do_execsql_test 3.3.0 {
-++  CREATE TABLE t3(x);
-++}
-++
-++ifcapable json1 {
-++  do_eqp_test 3.3.1 {
-++    SELECT json_extract(x, '$.b') FROM t2
-++    WHERE json_extract(x, '$.b') IS NOT NULL AND json_extract(x, '$.a') IS NULL
-++    GROUP BY json_extract(x, '$.b') COLLATE nocase
-++    ORDER BY json_extract(x, '$.b') COLLATE nocase;
-++  } {
-++    0 0 0 {SCAN TABLE t2}
-++    0 0 0 {USE TEMP B-TREE FOR GROUP BY}
-++  }
-++
-++  do_execsql_test 3.3.2 {
-++    CREATE INDEX i3 ON t3(json_extract(x, '$.a'), json_extract(x, '$.b'));
-++  } {}
-++
-++  do_eqp_test 3.3.3 {
-++    SELECT json_extract(x, '$.b') FROM t3
-++    WHERE json_extract(x, '$.b') IS NOT NULL AND json_extract(x, '$.a') IS NULL
-++    GROUP BY json_extract(x, '$.b') COLLATE nocase
-++    ORDER BY json_extract(x, '$.b') COLLATE nocase;
-++  } {
-++    0 0 0 {SEARCH TABLE t3 USING INDEX i3 (<expr>=?)}
-++    0 0 0 {USE TEMP B-TREE FOR GROUP BY}
-++  }
-++}
-++
-++do_execsql_test 3.4.0 {
-++  CREATE TABLE t4(a, b);
-++  INSERT INTO t4 VALUES('.ABC', 1);
-++  INSERT INTO t4 VALUES('.abc', 2);
-++  INSERT INTO t4 VALUES('.ABC', 3);
-++  INSERT INTO t4 VALUES('.abc', 4);
-++}
-++
-++do_execsql_test 3.4.1 {
-++  SELECT * FROM t4
-++  WHERE substr(a, 2) = 'abc' COLLATE NOCASE
-++  ORDER BY substr(a, 2), b;
-++} {
-++  .ABC 1   .ABC 3   .abc 2   .abc 4
-++}
-++
-++do_execsql_test 3.4.2 {
-++  CREATE INDEX i4 ON t4( substr(a, 2) COLLATE NOCASE, b );
-++  SELECT * FROM t4
-++  WHERE substr(a, 2) = 'abc' COLLATE NOCASE
-++  ORDER BY substr(a, 2), b;
-++} {
-++  .ABC 1   .ABC 3   .abc 2   .abc 4
-++}
-++
-++do_execsql_test 3.4.3 {
-++  DROP INDEX i4;
-++  UPDATE t4 SET a = printf('%s%d',a,b);
-++  SELECT * FROM t4 ORDER BY Substr(a,-2) COLLATE nocase;
-++} {.ABC1 1 .abc2 2 .ABC3 3 .abc4 4}
-++do_execsql_test 3.4.4 {
-++  SELECT * FROM t4 ORDER BY Substr(a,-2) COLLATE binary;
-++} {.ABC1 1 .ABC3 3 .abc2 2 .abc4 4}
-++
-++do_execsql_test 3.4.5 {
-++  CREATE INDEX i4 ON t4( Substr(a,-2) COLLATE nocase );
-++  SELECT * FROM t4 ORDER BY Substr(a,-2) COLLATE nocase;
-++} {.ABC1 1 .abc2 2 .ABC3 3 .abc4 4}
-++do_execsql_test 3.4.5eqp {
-++  EXPLAIN QUERY PLAN
-++  SELECT * FROM t4 ORDER BY Substr(a,-2) COLLATE nocase;
-++} {/SCAN TABLE t4 USING INDEX i4/}
-++do_execsql_test 3.4.6 {
-++  SELECT * FROM t4 ORDER BY Substr(a,-2) COLLATE binary;
-++} {.ABC1 1 .ABC3 3 .abc2 2 .abc4 4}
-++
-++
-+ finish_test
-+diff --git a/third_party/sqlite/src/test/kvtest.c b/third_party/sqlite/src/test/kvtest.c
-+index 97c0d10..54150f4 100644
-+--- a/third_party/sqlite/src/test/kvtest.c
-++++ b/third_party/sqlite/src/test/kvtest.c
-+@@ -741,16 +741,6 @@ static int display_stats(
-+           "Number of Pcache Overflow Bytes:     %d (max %d) bytes\n",
-+           iCur, iHiwtr);
-+   iHiwtr = iCur = -1;
-+-  sqlite3_status(SQLITE_STATUS_SCRATCH_USED, &iCur, &iHiwtr, bReset);
-+-  fprintf(out,
-+-      "Number of Scratch Allocations Used:  %d (max %d)\n",
-+-      iCur, iHiwtr);
-+-  iHiwtr = iCur = -1;
-+-  sqlite3_status(SQLITE_STATUS_SCRATCH_OVERFLOW, &iCur, &iHiwtr, bReset);
-+-  fprintf(out,
-+-          "Number of Scratch Overflow Bytes:    %d (max %d) bytes\n",
-+-          iCur, iHiwtr);
-+-  iHiwtr = iCur = -1;
-+   sqlite3_status(SQLITE_STATUS_MALLOC_SIZE, &iCur, &iHiwtr, bReset);
-+   fprintf(out, "Largest Allocation:                  %d bytes\n",
-+           iHiwtr);
-+@@ -758,10 +748,6 @@ static int display_stats(
-+   sqlite3_status(SQLITE_STATUS_PAGECACHE_SIZE, &iCur, &iHiwtr, bReset);
-+   fprintf(out, "Largest Pcache Allocation:           %d bytes\n",
-+           iHiwtr);
-+-  iHiwtr = iCur = -1;
-+-  sqlite3_status(SQLITE_STATUS_SCRATCH_SIZE, &iCur, &iHiwtr, bReset);
-+-  fprintf(out, "Largest Scratch Allocation:          %d bytes\n",
-+-          iHiwtr);
-+ 
-+   iHiwtr = iCur = -1;
-+   sqlite3_db_status(db, SQLITE_DBSTATUS_CACHE_USED, &iCur, &iHiwtr, bReset);
-+diff --git a/third_party/sqlite/src/test/like.test b/third_party/sqlite/src/test/like.test
-+index 048486f..e50671b 100644
-+--- a/third_party/sqlite/src/test/like.test
-++++ b/third_party/sqlite/src/test/like.test
-+@@ -207,7 +207,7 @@ do_test like-3.3.100 {
-+     SELECT x FROM t1 WHERE x LIKE 'abc%' ORDER BY 1;
-+   }
-+ } {abc abcd nosort {} i1}
-+-do_test like-3.3.101 {
-++do_test like-3.3.100.cnt {
-+   set sqlite_like_count
-+ } 0
-+ 
-+@@ -1048,4 +1048,51 @@ ifcapable !icu {
-+   } {1}
-+ }
-+ 
-++ifcapable !icu {
-++# As of 2017-07-27 (3.21.0) the LIKE optimization works with ESCAPE as
-++# long as the ESCAPE is a single-byte literal.
-++#
-++db close
-++sqlite3 db :memory:
-++do_execsql_test like-15.100 {
-++  CREATE TABLE t15(x TEXT COLLATE nocase, y, PRIMARY KEY(x));
-++  INSERT INTO t15(x,y) VALUES
-++    ('abcde',1), ('ab%de',2), ('a_cde',3),
-++    ('uvwxy',11),('uvwx%',12),('uvwx_',13),
-++    ('_bcde',21),('%bcde',22),
-++    ('abcd_',31),('abcd%',32),
-++    ('ab%xy',41);
-++  SELECT y FROM t15 WHERE x LIKE 'ab/%d%' ESCAPE '/';
-++} {2}
-++do_execsql_test like-15.101 {
-++  EXPLAIN QUERY PLAN
-++  SELECT y FROM t15 WHERE x LIKE 'ab/%d%' ESCAPE '/';
-++} {/SEARCH/}
-++do_execsql_test like-15.102 {
-++  EXPLAIN QUERY PLAN
-++  SELECT y FROM t15 WHERE x LIKE 'ab/%d%' ESCAPE '//';
-++} {/SCAN/}
-++do_execsql_test like-15.103 {
-++  EXPLAIN QUERY PLAN
-++  SELECT y FROM t15 WHERE x LIKE 'ab/%d%' ESCAPE '';
-++} {/SCAN/}
-++do_execsql_test like-15.110 {
-++  SELECT y FROM t15 WHERE x LIKE 'abcdx%%' ESCAPE 'x';
-++} {32}
-++do_execsql_test like-15.111 {
-++  SELECT y FROM t15 WHERE x LIKE 'abx%%' ESCAPE 'x' ORDER BY +y
-++} {2 41}
-++do_execsql_test like-15.112 {
-++  EXPLAIN QUERY PLAN
-++  SELECT y FROM t15 WHERE x LIKE 'abx%%' ESCAPE 'x' ORDER BY +y
-++} {/SEARCH/}
-++do_execsql_test like-15.120 {
-++  SELECT y FROM t15 WHERE x LIKE '/%bc%' ESCAPE '/';
-++} {22}
-++do_execsql_test like-15.121 {
-++  EXPLAIN QUERY PLAN
-++  SELECT y FROM t15 WHERE x LIKE '/%bc%' ESCAPE '/';
-++} {/SEARCH/}
-++}
-++
-+ finish_test
-+diff --git a/third_party/sqlite/src/test/lookaside.test b/third_party/sqlite/src/test/lookaside.test
-+index 5a57b62..871e10f 100644
-+--- a/third_party/sqlite/src/test/lookaside.test
-++++ b/third_party/sqlite/src/test/lookaside.test
-+@@ -33,7 +33,6 @@ test_set_config_pagecache 0 0
-+ 
-+ catch {db close}
-+ sqlite3_shutdown
-+-sqlite3_config_scratch 0 0
-+ sqlite3_initialize
-+ autoinstall_test_functions
-+ sqlite3 db test.db
-+diff --git a/third_party/sqlite/src/test/memsubsys1.test b/third_party/sqlite/src/test/memsubsys1.test
-+index 36427f9..41bc115 100644
-+--- a/third_party/sqlite/src/test/memsubsys1.test
-++++ b/third_party/sqlite/src/test/memsubsys1.test
-+@@ -16,7 +16,7 @@ set testdir [file dirname $argv0]
-+ source $testdir/tester.tcl
-+ sqlite3_reset_auto_extension
-+ 
-+-# This test assumes that no page-cache or scratch buffers are installed
-++# This test assumes that no page-cache buffers are installed
-+ # by default when a new database connection is opened. As a result, it
-+ # will not work with the "memsubsys1" permutation.
-+ #
-+@@ -156,12 +156,11 @@ do_test memsubsys1-3.2.5 {
-+   set s_used [lindex [sqlite3_status SQLITE_STATUS_SCRATCH_USED 0] 2]
-+ } 0
-+ 
-+-# Test 4:  Activate both PAGECACHE and SCRATCH.
-++# Test 4:  Activate PAGECACHE
-+ #
-+ db close
-+ sqlite3_shutdown
-+ sqlite3_config_pagecache [expr 1024+$xtra_size] 50
-+-sqlite3_config_scratch 6000 2
-+ sqlite3_initialize
-+ reset_highwater_marks
-+ build_test_db memsubsys1-4 {PRAGMA page_size=1024}
-+@@ -177,144 +176,10 @@ do_test memsubsys1-4.5 {
-+   set maxreq [lindex [sqlite3_status SQLITE_STATUS_MALLOC_SIZE 0] 2]
-+   expr {$maxreq<7000}
-+ } 1
-+-do_test memsubsys1-4.6 {
-+-  set s_used [lindex [sqlite3_status SQLITE_STATUS_SCRATCH_USED 0] 2]
-+-} 1
-+-
-+-# Test 5:  Activate both PAGECACHE and SCRATCH.  But make the page size is
-+-# such that the SCRATCH allocations are too small.
-+-#
-+-db close
-+-sqlite3_shutdown
-+-sqlite3_config_pagecache [expr 4096+$xtra_size] 24
-+-sqlite3_config_scratch 4000 2
-+-sqlite3_initialize
-+-reset_highwater_marks
-+-build_test_db memsubsys1-5 {PRAGMA page_size=4096}
-+-#show_memstats
-+-do_test memsubsys1-5.3 {
-+-  set pg_used [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_USED 0] 2]
-+-} {/^2[34]$/}
-+-do_test memsubsys1-5.4 {
-+-  set maxreq [lindex [sqlite3_status SQLITE_STATUS_MALLOC_SIZE 0] 2]
-+-  expr {$maxreq>4096}
-+-} 1
-+-do_test memsubsys1-5.5 {
-+-  set s_used [lindex [sqlite3_status SQLITE_STATUS_SCRATCH_USED 0] 2]
-+-} 0
-+-do_test memsubsys1-5.6 {
-+-  set s_ovfl [lindex [sqlite3_status SQLITE_STATUS_SCRATCH_OVERFLOW 0] 2]
-+-  expr {$s_ovfl>6000}
-+-} 1
-+-
-+-# Test 6:  Activate both PAGECACHE and SCRATCH with a 4k page size.
-+-# Make it so that SCRATCH is large enough
-+-#
-+-db close
-+-sqlite3_shutdown
-+-sqlite3_config_pagecache [expr 4096+$xtra_size] 24
-+-sqlite3_config_scratch 25300 1
-+-sqlite3_initialize
-+-reset_highwater_marks
-+-build_test_db memsubsys1-6 {PRAGMA page_size=4096}
-+-#show_memstats
-+-do_test memsubsys1-6.3 {
-+-  set pg_used [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_USED 0] 2]
-+-} {/^2[34]$/}
-+-#do_test memsubsys1-6.4 {
-+-#  set maxreq [lindex [sqlite3_status SQLITE_STATUS_MALLOC_SIZE 0] 2]
-+-#  expr {$maxreq>4096 && $maxreq<=(4096+$xtra_size)}
-+-#} 1
-+-do_test memsubsys1-6.5 {
-+-  set s_used [lindex [sqlite3_status SQLITE_STATUS_SCRATCH_USED 0] 2]
-+-} 1
-+-do_test memsubsys1-6.6 {
-+-  set s_ovfl [lindex [sqlite3_status SQLITE_STATUS_SCRATCH_OVERFLOW 0] 2]
-+-} 0
-+-
-+-# Test 7:  Activate both PAGECACHE and SCRATCH with a 4k page size.
-+-# Set cache_size small so that no PAGECACHE overflow occurs.  Verify
-+-# that maximum allocation size is small.
-+-#
-+-db close
-+-sqlite3_shutdown
-+-sqlite3_config_pagecache [expr 4096+$xtra_size] 24
-+-sqlite3_config_scratch 25300 1
-+-sqlite3_initialize
-+-reset_highwater_marks
-+-build_test_db memsubsys1-7 {
-+-  PRAGMA page_size=4096;
-+-  PRAGMA cache_size=10;
-+-  PRAGMA temp_store=memory;
-+-}
-+-#show_memstats
-+-do_test memsubsys1-7.3 {
-+-  set pg_used [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_USED 0] 2]
-+-  expr {$pg_used<24}
-+-} 1
-+-do_test memsubsys1-7.4 {
-+-  set pg_ovfl [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_OVERFLOW 0] 2]
-+-} 0
-+-do_test memsubsys1-7.5 {
-+-  set maxreq [lindex [sqlite3_status SQLITE_STATUS_MALLOC_SIZE 0] 2]
-+-  expr {$maxreq<(4100 + 8200*[nonzero_reserved_bytes])}
-+-} 1
-+-do_test memsubsys1-7.6 {
-+-  set s_used [lindex [sqlite3_status SQLITE_STATUS_SCRATCH_USED 0] 2]
-+-} 1
-+-do_test memsubsys1-7.7 {
-+-  set s_ovfl [lindex [sqlite3_status SQLITE_STATUS_SCRATCH_OVERFLOW 0] 2]
-+-} 0
-+-
-+-# Test 8:  Disable PAGECACHE.  Make available SCRATCH zero.  Verify that
-+-# the SCRATCH overflow logic works.
-+-#
-+-db close
-+-sqlite3_shutdown
-+-sqlite3_config_pagecache 0 0
-+-sqlite3_config_scratch 25000 0
-+-sqlite3_initialize
-+-reset_highwater_marks
-+-do_test memsubsys1-8.1 {
-+-  set pg_used [lindex [sqlite3_status SQLITE_STATUS_SCRATCH_USED 0] 2]
-+-} 0
-+-do_test memsubsys1-8.2 {
-+-  set s_ovfl [lindex [sqlite3_status SQLITE_STATUS_SCRATCH_OVERFLOW 0] 2]
-+-} 0
-+-do_test memsubsys1-8.3 {
-+-  sqlite3 db :memory:
-+-  db eval {
-+-    CREATE TABLE t1(x);
-+-    INSERT INTO t1 VALUES(zeroblob(400));
-+-    INSERT INTO t1 VALUES(zeroblob(400));
-+-    INSERT INTO t1 SELECT * FROM t1;
-+-    INSERT INTO t1 SELECT * FROM t1;
-+-    INSERT INTO t1 SELECT * FROM t1;
-+-  }
-+-  expr {[lindex [sqlite3_status SQLITE_STATUS_SCRATCH_OVERFLOW 0] 2]>0}
-+-} 1
-+-db close
-+-sqlite3_shutdown
-+-sqlite3_config_memstatus 0
-+-sqlite3_initialize
-+-do_test memsubsys1-8.4 {
-+-  sqlite3 db :memory:
-+-  db eval {
-+-    CREATE TABLE t1(x);
-+-    INSERT INTO t1 VALUES(zeroblob(400));
-+-    INSERT INTO t1 VALUES(zeroblob(400));
-+-    INSERT INTO t1 SELECT * FROM t1;
-+-    INSERT INTO t1 SELECT * FROM t1;
-+-    INSERT INTO t1 SELECT * FROM t1;
-+-    SELECT rowid FROM t1;
-+-  }
-+-} {1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16}
-+-
-+ 
-+ db close
-+ sqlite3_shutdown
-+ sqlite3_config_memstatus 1
-+-sqlite3_config_scratch 0 0
-+ sqlite3_config_lookaside 100 500
-+ sqlite3_config serialized
-+ sqlite3_initialize
-+diff --git a/third_party/sqlite/src/test/misc1.test b/third_party/sqlite/src/test/misc1.test
-+index 45165f9..a29e019 100644
-+--- a/third_party/sqlite/src/test/misc1.test
-++++ b/third_party/sqlite/src/test/misc1.test
-+@@ -479,26 +479,28 @@ ifcapable curdir {
-+ # Make sure a database connection still works after changing the
-+ # working directory.
-+ #
-+-do_test misc1-14.1 {
-+-  file mkdir tempdir
-+-  cd tempdir
-+-  execsql {BEGIN}
-+-  file exists ./test.db-journal
-+-} {0}
-+-do_test misc1-14.2a {
-+-  execsql {UPDATE t1 SET a=a||'x' WHERE 0}
-+-  file exists ../test.db-journal
-+-} {0}
-+-do_test misc1-14.2b {
-+-  execsql {UPDATE t1 SET a=a||'y' WHERE 1}
-+-  file exists ../test.db-journal
-+-} {1}
-+-do_test misc1-14.3 {
-+-  cd ..
-+-  forcedelete tempdir
-+-  execsql {COMMIT}
-+-  file exists ./test.db-journal
-+-} {0}
-++if {[atomic_batch_write test.db]==0} {
-++  do_test misc1-14.1 {
-++    file mkdir tempdir
-++    cd tempdir
-++    execsql {BEGIN}
-++    file exists ./test.db-journal
-++  } {0}
-++  do_test misc1-14.2a {
-++    execsql {UPDATE t1 SET a=a||'x' WHERE 0}
-++    file exists ../test.db-journal
-++  } {0}
-++  do_test misc1-14.2b {
-++    execsql {UPDATE t1 SET a=a||'y' WHERE 1}
-++    file exists ../test.db-journal
-++  } {1}
-++  do_test misc1-14.3 {
-++    cd ..
-++    forcedelete tempdir
-++    execsql {COMMIT}
-++    file exists ./test.db-journal
-++  } {0}
-++}
-+ }
-+ 
-+ # A failed create table should not leave the table in the internal
-+@@ -709,5 +711,15 @@ SELECT-1 UNION  SELECT 5 UNION SELECT 0 UNION SElECT*from(SELECT-5) UNION SELECT
-+ $group,:conc ap0,1)fro,(select"",:PBAG,c,a,b,b,c,a,b,c,e,d,d,c,a,b,b,c,d,d,c,a,b,c,e,d,c,d,c,a,b,c,e,c,d,c,d,c,a,b,b,c,d,c,a,b,c,e,c,d,c,a,b,b,c,d,c,a,b,c,e,d,d,c,a,b,b,c,d,c,d,c,a,b,c,e,c,d,c,a,b,b,c,d,c,d,c,a,b,c,e,d,d,c,a,b,b,c,c,a,b,b,c,d,c,d,c,a,b,c,e,d,d,c,a,b,b,c,d,c,d,c,c,d,c,a,b,c,e,d,d,c,a,b,b,c,d,c,d,c,a,b,c,e,d,c,d,c,a,b,c,e,c,d,c,a,b,b,c,d,c,a,b,c,e,d,d,c,a,b,b,b,c,e,d,d,c,a,b,b,c,c,a,b,b,c,d,c,d,c,a,b,c,e,d,d,c,a,b,b,c,d,c,d,c,c,d,c,a,b,c,e,d,d,c,a,b,b,c,d,c,d,c,a,b,c,e,c,d,c,a,b,b,c,d,c,d,c,e,d,d,c,a,b,b,c,c,a,b,b,E,d,c,d,c,b,c,d,c,d,c,c,d,c,a,b,c,e,d,d,c,a,b,b,c,d,c,d,c,a,b,c,e,c,d,c,a,b,b,c,a,b,c,e,d,d,c,a,b,b,c,d,d,c,a,b,c,e,d,c,d,c,a,b,c,e,c,d,c,d,c,a,b,b,c,d,c,a,b,c,e,c,d,c,a,b,b,c,d,c,a,b,c,e,d,d,c,a,b,b,c,d,c,d,c,a,b,c,e,c,d,c,a,b,b,c,d,c,d,c,a,b,c,e,d,d,c,a,b,b,c,c,a,b,b,c,d,c,d,c,a,b,c,e,d,d,c,a,b,b,c,d,c,d,c,c,d,c,a,b,c,e,d,d,c,a,b,b,c,d,c,d,c,a,b,c,e,c,d,c,a,b,b,c,d,c,d,c,e,d,d,c,a,b,b,c,c,a,b,b,E,d,c,d,c,b,c,d,c,d,c,c,d,c,a,b,c,e,d,d,c,a,b,b,c,d,c,d,c,a,b,c,e,c,d,c,a,b,b,c,a,b,c,e,d,d,c,a,b,b,c,d,d,c,a,b,c,e,d,c,d,c,a,b,c,e,c,d,c,a,b,b,c,c,d,c,c,a,a,b,d,d,c,a,b,b,c,d,c,a,b,e,e,d,b,c,d,c,a,b,b,c,d,c,a,b,c,e,c,d,c,a,b,b,c,d,c,a,b,c,e,d,d,c,a,b,b,c,d,c,d,c,a,b,c,e,c,d,c,a,b,b,c,d,c,d,c,a,b,c,e,d,d,c,a,b,b,c,c,a,b,b,c,d,c,d,c,a,b,c,e,d,d,c,a,b,b,c,d,c,d,c,c,d,c,a,b,c,e,d,d,c,a,b,b,c,d,c,d,c,a,b,c,e,c,d,c,a,b,b,c,d, foreign_keysc,d,c,e,d,d,c,a,b,b,c,c,a,b,b,E,d,c,d,c,b,c,d,c,d,c,c,d,c,a,b,c,e,d,d,c,a,b,b,c,d,c,d,c,a,a,b,d,d,c,a,b,b,c,d,c,a,b,e,e,d,b,c,d,c,a,b,b,c,d,c,a,b,c,e,c,d,c,a,b,b,c,d,c,a,b,c,e,d,d,c,a,b,b,c,d,c,d,c,a,b,c,e,c,d,c,a,b,b,c,d,c,d,c,a,b,c,d,c,a,b,c,e,c,d,c,a,b,b,c,d,c,d,c,e,d,d,c,a,b,b,c,c,a,d,c,a,b,c,e,d,d,c,a,b,b,c,d,c,d,c,a,b,c,e,c,d,c,a,b,b,c,d,c,d,c,a,b,c,d,c,a,b,c,e,c,d,c,a,b,b,c,d,c,d,c,e,d,d,c,a,b,b,c,c,a,b,b,E,d,c,d,c,b,c,d,c,d,c,c,d,c,a,b,c,e,d,d,c,a,b,b,c,d,c,d,c,a,b,c,e,c,d,c,a,b,b,c,a,b,c,e,d,d,c,a,b,b,c,d,d,c,a,b,c,e,d,c,d,c,a,b,c,e,c,d,c,a,b,b,c,c,d,c,a,b,d,d,c,a,a,b,d,d,c,a,b,b,c,d,c,a,b,e,e,d,b,c,d,c,a,b,b,c,d,c,a,b,c,e,c,d,c,a,b,b,c,d,c,a,b,c,e,d,d,c,a,b,b,c,d,c,d,c,a,b,c,e,c,d,c,a,b,b,c,d,c,d,c,a,b,c,e,d,d,c,a,b,b,c,c,a,b,b,c,d,c,d,c,a,b,c,e,d,d,c,a,b,b,c,d,c,d,c,c,d,c,a,b,c,e,d,d,c,a,b,b,c,d,c,d,c,a,b,c,e,c,d,c,a,b,b,c,d,c,d,c,e,d,d,c,a,b,b,c,c,a,b,b,E,d,c,d,c,b,c,d,c,d,c,c,d,c,a,b,c,e,d,d,c,a,b,b,c,d,c,d,c,a,a,b,d,d,c,a,b,b,c,d,c,a,b,e,e,d,b,c,d,c,a,b,b,c,d,c,a,b,c,e,c,d,c,a,b,b,c,d,c,a,b,c,e,d,d,c,a,b,b,c,d,c,d,c,a,b,c,e,c,d,c,a,b,b,c,d,c,d,c,a,b,c,e,d,d,c,a,b,b,c,c,a,b,b,c,d,c,d,c,a,b,c,e,d,d,c,a,b,b,c,d,c,d,c,c,d,c,a,b,c,e,d,d,c,a,b,b,c,d,c,d,c,a,b,c,e,c,d,c,a,b,b,c,d,c,d,c,e,d,d,c,a,b,b,c,c,a,b,b,E,d,c,d,c,b,c,d,c,d,c,c,d,c,a,b,c,e,d,d,c,a,b,b,c,d,c,d,c,a,b,c,e,c,d,c,a,b,b,c,a,bb,b,E,d,c,d,c,b,c,d,c,d,c,c,d,c,a,b,c,e,d,d,c,a,b,b,c,d,c,d,c,a,b,c,e,c,d,c,a,b,b,c,a,b,c,e,d,d,c,a,b,b,c,d,d,c,a,b,c,e,d,c,d,c,a,b,c,e,c,d,c,a,b,b,c,c,d,c,a,b,d,d,c,a,a,b,d,d,c,a,b,b,c,d,c,a,b,e,e,d,b,c,d,c,a,b,b,c,d,c,a,b,c,e,c,d,c,a,b,b,c,d,c,a,b,c,e,d,d,c,a,b,b,c,d,c,d,c,a,b,c,e,c,d,c,a,b,b,c,d,MAato_aecSELEC,+?b," "O,"i","a",""b  ,5 ))KEY)SELECT*FROM((k()reaC,k,K) eA,k '' )t ,K  M);
-+ } {1 {'k' is not a function}}
-+ 
-++# 2017-09-17
-++#
-++# Sometimes sqlite3ExprListAppend() can be invoked on an ExprList that
-++# was obtained from sqlite3ExprListDup().
-++#
-++do_execsql_test misc1-26.0 {
-++  DROP TABLE IF EXISTS abc;
-++  CREATE TABLE abc(a, b, c);
-++  SELECT randomblob(min(max(coalesce(EXISTS (SELECT 1 FROM ( SELECT (SELECT 2147483647) NOT IN (SELECT 2147483649 UNION ALL SELECT DISTINCT -1) IN (SELECT 2147483649), 'fault', (SELECT ALL -1 INTERSECT SELECT 'experiments') IN (SELECT ALL 56.1 ORDER BY 'experiments' DESC) FROM (SELECT DISTINCT 2147483648, 'hardware' UNION ALL SELECT -2147483648, 'experiments' ORDER BY 2147483648 LIMIT 1 OFFSET 123456789.1234567899) GROUP BY (SELECT ALL 0 INTERSECT SELECT 'in') IN (SELECT DISTINCT 'experiments' ORDER BY zeroblob(1000) LIMIT 56.1 OFFSET -456) HAVING EXISTS (SELECT 'fault' EXCEPT    SELECT DISTINCT 56.1) UNION SELECT 'The', 'The', 2147483649 UNION ALL SELECT DISTINCT 'hardware', 'first', 'experiments' ORDER BY 'hardware' LIMIT 123456789.1234567899 OFFSET -2147483647)) NOT IN (SELECT (SELECT DISTINCT (SELECT 'The') FROM abc ORDER BY EXISTS (SELECT -1 INTERSECT SELECT ALL NULL) ASC) IN (SELECT DISTINCT EXISTS (SELECT ALL 123456789.1234567899 ORDER BY 1 ASC, NULL DESC) FROM sqlite_master INTERSECT SELECT 456)), (SELECT ALL 'injection' UNION ALL SELECT ALL (SELECT DISTINCT 'first' UNION     SELECT DISTINCT 'The') FROM (SELECT 456, 'in', 2147483649))),1), 500)), 'first', EXISTS (SELECT DISTINCT 456 FROM abc ORDER BY 'experiments' DESC) FROM abc;
-++} {}
-+ 
-+ finish_test
-+diff --git a/third_party/sqlite/src/test/mjournal.test b/third_party/sqlite/src/test/mjournal.test
-+new file mode 100644
-+index 0000000..7da0307
-+--- /dev/null
-++++ b/third_party/sqlite/src/test/mjournal.test
-+@@ -0,0 +1,83 @@
-++# 2017 September 15
-++#
-++# The author disclaims copyright to this source code.  In place of
-++# a legal notice, here is a blessing:
-++#
-++#    May you do good and not evil.
-++#    May you find forgiveness for yourself and forgive others.
-++#    May you share freely, never taking more than you give.
-++#
-++#***********************************************************************
-++# This file implements regression tests for SQLite library.
-++#
-++
-++set testdir [file dirname $argv0]
-++source $testdir/tester.tcl
-++set testprefix mjournal
-++
-++# Test that nothing bad happens if a journal file contains a pointer to
-++# a master journal file that does not have a "-" in the name. At one point
-++# this was causing a segfault on unix.
-++#
-++do_execsql_test 1.0 {
-++  CREATE TABLE t1(a, b);
-++}
-++
-++do_test 1.1 {
-++  forcedelete test.db2journal test.db-journal
-++
-++  close [open test.db-journal w]
-++
-++  hexio_write test.db-journal 0 746573742e6462326a6f75726e616c00
-++  hexio_write test.db-journal 16 00000010
-++  hexio_write test.db-journal 20 000005e1
-++  hexio_write test.db-journal 24 d9d505f920a163d7
-++
-++  close [open test.db2journal w]
-++  hexio_write test.db2journal 0 abcd
-++} {2}
-++
-++do_execsql_test 1.2 {
-++  SELECT * FROM t1;
-++}
-++
-++do_test 1.3 {
-++  forcedelete test0db2journal test.db-journal
-++  close [open test.db-journal w]
-++  hexio_write test.db-journal 0 74657374306462326a6f75726e616c00
-++  hexio_write test.db-journal 16 00000010
-++  hexio_write test.db-journal 20 000005e3
-++  hexio_write test.db-journal 24 d9d505f920a163d7
-++
-++  close [open test0db2journal w]
-++  hexio_write test0db2journal 0 abcd
-++} {2}
-++
-++do_execsql_test 1.4 {
-++  SELECT * FROM t1;
-++}
-++
-++# And now test that nothing bad happens if a master journal contains a
-++# pointer to a journal file that does not have a "-" in the name.
-++#
-++do_test 1.5 {
-++  forcedelete test.db2-master test.db-journal test1
-++  close [open test.db-journal w]
-++  hexio_write test.db-journal 0 746573742e6462322d6d617374657200
-++  hexio_write test.db-journal 16 00000010
-++  hexio_write test.db-journal 20 0000059f
-++  hexio_write test.db-journal 24 d9d505f920a163d7
-++
-++  close [open test.db2-master w]
-++  hexio_write test.db2-master 0 746573743100
-++
-++  close [open test1 w]
-++  hexio_write test1 0 abcd
-++} {2}
-++
-++do_execsql_test 1.6 {
-++  SELECT * FROM t1;
-++}
-++
-++
-++finish_test
-+diff --git a/third_party/sqlite/src/test/mmapwarm.test b/third_party/sqlite/src/test/mmapwarm.test
-+new file mode 100644
-+index 0000000..f3fb0a5
-+--- /dev/null
-++++ b/third_party/sqlite/src/test/mmapwarm.test
-+@@ -0,0 +1,81 @@
-++# 20 September 18
-++#
-++# The author disclaims copyright to this source code.  In place of
-++# a legal notice, here is a blessing:
-++#
-++#    May you do good and not evil.
-++#    May you find forgiveness for yourself and forgive others.
-++#    May you share freely, never taking more than you give.
-++#
-++#***********************************************************************
-++#
-++
-++set testdir [file dirname $argv0]
-++source $testdir/tester.tcl
-++
-++
-++if 0 {
-++  db close
-++  sqlite3_shutdown
-++  proc msg {args} { puts $args }
-++  test_sqlite3_log msg
-++  sqlite3 db test.db
-++}
-++
-++set testprefix mmapwarm
-++
-++
-++do_execsql_test 1.0 {
-++  PRAGMA auto_vacuum = 0;
-++  CREATE TABLE t1(x, y);
-++  WITH s(i) AS (
-++    SELECT 1 UNION ALL SELECT i+1 FROM s WHERE i<500
-++  )
-++  INSERT INTO t1 SELECT randomblob(400), randomblob(500) FROM s;
-++  PRAGMA page_count;
-++} {507}
-++db close
-++
-++do_test 1.1 {
-++  sqlite3 db test.db
-++  db eval {PRAGMA mmap_size = 1000000}
-++  sqlite3_mmap_warm db
-++} {SQLITE_OK}
-++
-++do_test 1.2 {
-++  db close
-++  sqlite3 db test.db
-++  db eval {PRAGMA mmap_size = 1000000}
-++  sqlite3_mmap_warm db "main"
-++} {SQLITE_OK}
-++
-++do_test 1.3 {
-++  sqlite3 db test.db
-++  sqlite3_mmap_warm db
-++} {SQLITE_OK}
-++
-++do_test 1.4 {
-++  db close
-++  sqlite3 db test.db
-++  sqlite3_mmap_warm db "main"
-++} {SQLITE_OK}
-++
-++do_test 2.0 {
-++  db close
-++  sqlite3 db test.db
-++  db eval BEGIN
-++  sqlite3_mmap_warm db "main"
-++} {SQLITE_MISUSE}
-++
-++do_faultsim_test 3 -faults oom* -prep {
-++  sqlite3 db test.db
-++  sqlite3_db_config_lookaside db 0 0 0
-++  db eval { PRAGMA mmap_size = 1000000 }
-++  db eval { SELECT * FROM sqlite_master }
-++} -body {
-++  sqlite3_mmap_warm db "main"
-++} -test {
-++  faultsim_test_result {0 SQLITE_OK} {0 SQLITE_NOMEM}
-++}
-++
-++finish_test
-+diff --git a/third_party/sqlite/src/test/nan.test b/third_party/sqlite/src/test/nan.test
-+index e1fe078..67bab57 100644
-+--- a/third_party/sqlite/src/test/nan.test
-++++ b/third_party/sqlite/src/test/nan.test
-+@@ -366,8 +366,10 @@ do_realnum_test nan-4.35 {
-+   }
-+ } {0.0 real}
-+ 
-+-
-+-
-+-
-++do_realnum_test nan-4.40 {
-++  db eval {
-++    SELECT cast('-1e999' AS real);
-++  }
-++} {-inf}
-+ 
-+ finish_test
-+diff --git a/third_party/sqlite/src/test/ossfuzz.c b/third_party/sqlite/src/test/ossfuzz.c
-+index 5198354..7b28cf6 100644
-+--- a/third_party/sqlite/src/test/ossfuzz.c
-++++ b/third_party/sqlite/src/test/ossfuzz.c
-+@@ -71,6 +71,28 @@ static int progress_handler(void *pClientData) {
-+ #endif
-+ 
-+ /*
-++** Disallow debugging pragmas such as "PRAGMA vdbe_debug" and
-++** "PRAGMA parser_trace" since they can dramatically increase the
-++** amount of output without actually testing anything useful.
-++*/
-++static int block_debug_pragmas(
-++  void *Notused,
-++  int eCode,
-++  const char *zArg1,
-++  const char *zArg2,
-++  const char *zArg3,
-++  const char *zArg4
-++){
-++  if( eCode==SQLITE_PRAGMA
-++   && (sqlite3_strnicmp("vdbe_", zArg1, 5)==0
-++        || sqlite3_stricmp("parser_trace", zArg1)==0)
-++  ){
-++    return SQLITE_DENY;
-++  }
-++  return SQLITE_OK;
-++}
-++
-++/*
-+ ** Callback for sqlite3_exec().
-+ */
-+ static int exec_handler(void *pCnt, int argc, char **argv, char **namev){
-+@@ -128,6 +150,9 @@ int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
-+   sqlite3_db_config(cx.db, SQLITE_DBCONFIG_ENABLE_FKEY, uSelector&1, &rc);
-+   uSelector >>= 1;
-+ 
-++  /* Do not allow debugging pragma statements that might cause excess output */
-++  sqlite3_set_authorizer(cx.db, block_debug_pragmas, 0);
-++
-+   /* Remaining bits of the selector determine a limit on the number of
-+   ** output rows */
-+   execCnt = uSelector + 1;
-+diff --git a/third_party/sqlite/src/test/permutations.test b/third_party/sqlite/src/test/permutations.test
-+index edcc8e1..4a49a9e 100644
-+--- a/third_party/sqlite/src/test/permutations.test
-++++ b/third_party/sqlite/src/test/permutations.test
-+@@ -194,7 +194,7 @@ test_suite "valgrind" -prefix "" -description {
-+ } -files [
-+   test_set $allquicktests -exclude *malloc* *ioerr* *fault* *_err* wal.test \
-+               shell*.test crash8.test atof1.test selectG.test \
-+-              tkt-fc62af4523.test numindex1.test
-++              tkt-fc62af4523.test numindex1.test corruptK.test
-+ ] -initialize {
-+   set ::G(valgrind) 1
-+ } -shutdown {
-+@@ -389,6 +389,30 @@ test_suite "vfslog" -prefix "" -description {
-+   wal* mmap*
-+ ]
-+ 
-++test_suite "atomic-batch-write" -prefix "" -description {
-++  Like veryquick.test, but must be run on a file-system that supports
-++  atomic-batch-writes. Tests that depend on the journal file being present
-++  are omitted.
-++} -files [
-++  test_set $allquicktests -exclude *malloc* *ioerr* *fault* *bigfile* *_err* \
-++      *fts5corrupt* *fts5big* *fts5aj*  \
-++      crash8.test delete_db.test        \
-++      exclusive.test journal3.test      \
-++      journal1.test                     \
-++      jrnlmode.test jrnlmode2.test      \
-++      lock4.test pager1.test            \
-++      pager3.test sharedA.test          \
-++      symlink.test stmt.test            \
-++      sync.test sync2.test              \
-++      tempdb.test tkt3457.test          \
-++      vacuum5.test wal2.test            \
-++      walmode.test zerodamage.test
-++] -initialize {
-++  if {[atomic_batch_write test.db]==0} {
-++    error "File system does NOT support atomic-batch-write"
-++  }
-++}
-++
-+ lappend ::testsuitelist xxx
-+ #-------------------------------------------------------------------------
-+ # Define the coverage related test suites:
-+@@ -431,33 +455,31 @@ lappend ::testsuitelist xxx
-+ # Define the permutation test suites:
-+ #
-+ 
-+-# Run some tests using pre-allocated page and scratch blocks.
-++# Run some tests using pre-allocated page blocks.
-+ #
-+ # mmap1.test is excluded because a good number of its tests depend on
-+ # the page-cache being larger than the database. But this permutation
-+ # causes the effective limit on the page-cache to be just 24 pages.
-+ #
-+ test_suite "memsubsys1" -description {
-+-  Tests using pre-allocated page and scratch blocks
-++  Tests using pre-allocated page blocks
-+ } -files [
-+   test_set $::allquicktests -exclude ioerr5.test malloc5.test mmap1.test
-+ ] -initialize {
-+   test_set_config_pagecache 4096 24
-+   catch {db close}
-+   sqlite3_shutdown
-+-  sqlite3_config_scratch 25000 1
-+   sqlite3_initialize
-+   autoinstall_test_functions
-+ } -shutdown {
-+   test_restore_config_pagecache
-+   catch {db close}
-+   sqlite3_shutdown
-+-  sqlite3_config_scratch 0 0
-+   sqlite3_initialize
-+   autoinstall_test_functions
-+ }
-+ 
-+-# Run some tests using pre-allocated page and scratch blocks. This time
-++# Run some tests using pre-allocated page blocks. This time
-+ # the allocations are too small to use in most cases.
-+ #
-+ # Both ioerr5.test and malloc5.test are excluded because they test the
-+@@ -465,21 +487,19 @@ test_suite "memsubsys1" -description {
-+ # This functionality is disabled if a pre-allocated page block is provided.
-+ #
-+ test_suite "memsubsys2" -description {
-+-  Tests using small pre-allocated page and scratch blocks
-++  Tests using small pre-allocated page blocks
-+ } -files [
-+   test_set $::allquicktests -exclude ioerr5.test malloc5.test
-+ ] -initialize {
-+   test_set_config_pagecache 512 5
-+   catch {db close}
-+   sqlite3_shutdown
-+-  sqlite3_config_scratch 1000 1
-+   sqlite3_initialize
-+   autoinstall_test_functions
-+ } -shutdown {
-+   test_restore_config_pagecache
-+   catch {db close}
-+   sqlite3_shutdown
-+-  sqlite3_config_scratch 0 0
-+   sqlite3_initialize
-+   autoinstall_test_functions
-+ }
-+@@ -1045,7 +1065,7 @@ test_suite "no_optimization" -description {
-+ test_suite "prepare" -description {
-+   Run tests with the db connection using sqlite3_prepare() instead of _v2().
-+ } -dbconfig {
-+-  db_use_legacy_prepare $::dbhandle 1
-++  $::dbhandle version -use-legacy-prepare 1
-+   #$::dbhandle cache size 0
-+ } -files [
-+   test_set $allquicktests -exclude *malloc* *ioerr* *fault* \
-+diff --git a/third_party/sqlite/src/test/pragma.test b/third_party/sqlite/src/test/pragma.test
-+index 2959ff7..0b9ca29 100644
-+--- a/third_party/sqlite/src/test/pragma.test
-++++ b/third_party/sqlite/src/test/pragma.test
-+@@ -1932,6 +1932,29 @@ do_test 23.5 {
-+     PRAGMA foreign_key_list(t2);
-+   }
-+ } {0 0 t1 y {} {NO ACTION} {NO ACTION} NONE}
-++db2 close
-++
-++ifcapable !has_codec {
-++  reset_db
-++  do_execsql_test 24.0 {
-++    PRAGMA page_size = 1024;
-++    CREATE TABLE t1(a, b, c);
-++    CREATE INDEX i1 ON t1(b);
-++    INSERT INTO t1 VALUES('a', 'b', 'c');
-++    PRAGMA integrity_check;
-++  } {ok}
-++
-++  set r [db one {SELECT rootpage FROM sqlite_master WHERE name = 't1'}]
-++  db close
-++  hexio_write test.db [expr $r*1024 - 16] 000000000000000701040f0f1f616263
-+ 
-++  sqlite3 db test.db
-++  do_catchsql_test 24.1 {
-++    SELECT * FROM t1;
-++  } {1 {database disk image is malformed}}
-++  do_catchsql_test 24.2 {
-++    PRAGMA integrity_check;
-++  } {0 {{database disk image is malformed}}}
-++}
-+ database_never_corrupt
-+ finish_test
-+diff --git a/third_party/sqlite/src/test/pragma5.test b/third_party/sqlite/src/test/pragma5.test
-+new file mode 100644
-+index 0000000..fd6fdf5
-+--- /dev/null
-++++ b/third_party/sqlite/src/test/pragma5.test
-+@@ -0,0 +1,64 @@
-++# 2017 August 25
-++#
-++# The author disclaims copyright to this source code.  In place of
-++# a legal notice, here is a blessing:
-++#
-++#    May you do good and not evil.
-++#    May you find forgiveness for yourself and forgive others.
-++#    May you share freely, never taking more than you give.
-++#
-++#***********************************************************************
-++# This file implements regression tests for SQLite library.
-++#
-++# This file implements tests for the PRAGMA command. Specifically,
-++# those pragmas enabled at build time by setting:
-++#
-++#   -DSQLITE_INTROSPECTION_PRAGMAS
-++#
-++
-++set testdir [file dirname $argv0]
-++source $testdir/tester.tcl
-++set testprefix pragma5
-++
-++if { [catch {db one "SELECT count(*) FROM pragma_function_list"}] } {
-++  finish_test
-++  return
-++}
-++
-++db function external external
-++
-++do_execsql_test 1.0 {
-++  PRAGMA table_info(pragma_function_list)
-++} {
-++  0 name {} 0 {} 0
-++  1 builtin {} 0 {} 0
-++}
-++do_execsql_test 1.1 {
-++  SELECT * FROM pragma_function_list WHERE name='upper'
-++} {upper 1}
-++do_execsql_test 1.2 {
-++  SELECT * FROM pragma_function_list WHERE name LIKE 'exter%';
-++} {external 0}
-++
-++ifcapable fts5 {
-++  do_execsql_test 2.0 {
-++    PRAGMA table_info(pragma_module_list)
-++  } {
-++    0 name {} 0 {} 0
-++  }
-++  do_execsql_test 2.1 {
-++    SELECT * FROM pragma_module_list WHERE name='fts5'
-++  } {fts5}
-++}
-++
-++do_execsql_test 3.0 {
-++  PRAGMA table_info(pragma_pragma_list)
-++} {
-++  0 name {} 0 {} 0
-++}
-++do_execsql_test 3.1 {
-++  SELECT * FROM pragma_pragma_list WHERE name='pragma_list'
-++} {pragma_list}
-++
-++
-++finish_test
-+diff --git a/third_party/sqlite/src/test/releasetest.tcl b/third_party/sqlite/src/test/releasetest.tcl
-+index 3689b71..2539d20 100755
-+--- a/third_party/sqlite/src/test/releasetest.tcl
-++++ b/third_party/sqlite/src/test/releasetest.tcl
-+@@ -114,7 +114,7 @@ array set ::Configs [strip_comments {
-+   }
-+   "Debug-One" {
-+     --disable-shared
-+-    -O2
-++    -O2 -funsigned-char
-+     -DSQLITE_DEBUG=1
-+     -DSQLITE_MEMDEBUG=1
-+     -DSQLITE_MUTEX_NOOP=1
-+@@ -126,6 +126,7 @@ array set ::Configs [strip_comments {
-+     -DSQLITE_ENABLE_STAT4
-+     -DSQLITE_ENABLE_HIDDEN_COLUMNS
-+     -DSQLITE_MAX_ATTACHED=125
-++    -DSQLITE_MUTATION_TEST
-+   }
-+   "Fast-One" {
-+     -O6
-+diff --git a/third_party/sqlite/src/test/rollback.test b/third_party/sqlite/src/test/rollback.test
-+index 9cf99e6..bbc80de 100644
-+--- a/third_party/sqlite/src/test/rollback.test
-++++ b/third_party/sqlite/src/test/rollback.test
-+@@ -82,6 +82,7 @@ do_test rollback-1.9 {
-+ if {$tcl_platform(platform) == "unix"
-+  && [permutation] ne "onefile"
-+  && [permutation] ne "inmemory_journal"
-++ && [permutation] ne "atomic-batch-write"
-+ } {
-+   do_test rollback-2.1 {
-+     execsql {
-+diff --git a/third_party/sqlite/src/test/savepoint.test b/third_party/sqlite/src/test/savepoint.test
-+index d05b50a..bfd2c8c 100644
-+--- a/third_party/sqlite/src/test/savepoint.test
-++++ b/third_party/sqlite/src/test/savepoint.test
-+@@ -616,12 +616,16 @@ ifcapable auth {
-+ # First make sure it is not possible to attach or detach a database while
-+ # a savepoint is open (it is not possible if any transaction is open).
-+ #
-++# UPDATE 2017-07-26:  It is not possible to ATTACH and DETACH within a
-++# a transaction.
-++#
-+ do_test savepoint-10.1.1 {
-+   catchsql {
-+     SAVEPOINT one;
-+     ATTACH 'test2.db' AS aux;
-++    DETACH aux;
-+   }
-+-} {1 {cannot ATTACH database within transaction}}
-++} {0 {}}
-+ do_test savepoint-10.1.2 {
-+   execsql {
-+     RELEASE one;
-+@@ -630,8 +634,9 @@ do_test savepoint-10.1.2 {
-+   catchsql {
-+     SAVEPOINT one;
-+     DETACH aux;
-++    ATTACH 'test2.db' AS aux;
-+   }
-+-} {1 {cannot DETACH database within transaction}}
-++} {0 {}}
-+ do_test savepoint-10.1.3 {
-+   execsql {
-+     RELEASE one;
-+diff --git a/third_party/sqlite/src/test/scanstatus.test b/third_party/sqlite/src/test/scanstatus.test
-+index 4fbb057..cbaa396 100644
-+--- a/third_party/sqlite/src/test/scanstatus.test
-++++ b/third_party/sqlite/src/test/scanstatus.test
-+@@ -30,7 +30,7 @@ do_execsql_test 1.0 {
-+ }
-+ 
-+ proc do_scanstatus_test {tn res} {
-+-  set stmt [db_last_stmt_ptr db]
-++  set stmt [db version -last-stmt-ptr]
-+   set idx 0
-+   set ret [list]
-+   while {1} {
-+@@ -79,7 +79,7 @@ do_scanstatus_test 1.9 {
-+ }
-+ 
-+ do_test 1.9 {
-+-  sqlite3_stmt_scanstatus_reset [db_last_stmt_ptr db]
-++  sqlite3_stmt_scanstatus_reset [db version -last-stmt-ptr]
-+ } {}
-+ 
-+ do_scanstatus_test 1.10 {
-+diff --git a/third_party/sqlite/src/test/schema6.test b/third_party/sqlite/src/test/schema6.test
-+new file mode 100644
-+index 0000000..2a0fbfd
-+--- /dev/null
-++++ b/third_party/sqlite/src/test/schema6.test
-+@@ -0,0 +1,164 @@
-++# 2017-07-30
-++#
-++# The author disclaims copyright to this source code.  In place of
-++# a legal notice, here is a blessing:
-++#
-++#    May you do good and not evil.
-++#    May you find forgiveness for yourself and forgive others.
-++#    May you share freely, never taking more than you give.
-++#
-++#***********************************************************************
-++#
-++# This file implements tests to show that certain CREATE TABLE statements
-++# generate identical database files.  For example, changes in identifier
-++# names, white-space, and formatting of the CREATE TABLE statement should
-++# produce identical table content.
-++#
-++
-++set testdir [file dirname $argv0]
-++source $testdir/tester.tcl
-++set ::testprefix schema6
-++do_not_use_codec
-++
-++# Command:   check_same_database_content TESTNAME SQL1 SQL2 SQL3 ...
-++#
-++# This command creates fresh databases using SQL1 and subsequent arguments
-++# and checks to make sure the content of all database files is byte-for-byte
-++# identical.  Page 1 of the database files is allowed to be different, since
-++# page 1 contains the sqlite_master table which is expected to vary.
-++#
-++proc check_same_database_content {basename args} {
-++  set i 0
-++  set hash {}
-++  foreach sql $args {
-++    catch {db close}
-++    forcedelete test.db
-++    sqlite3 db test.db
-++    db eval $sql
-++    set pgsz [db one {PRAGMA page_size}]
-++    db close
-++    set sz [file size test.db]
-++    set thishash [md5file test.db $pgsz [expr {$sz-$pgsz}]]
-++    if {$i==0} {
-++      set hash $thishash
-++    } else {
-++      do_test $basename-$i "set x $thishash" $hash
-++    }
-++    incr i
-++  }
-++}
-++
-++# Command:   check_different_database_content TESTNAME SQL1 SQL2 SQL3 ...
-++#
-++# This command creates fresh databases using SQL1 and subsequent arguments
-++# and checks to make sure the content of all database files is different
-++# in ways other than on page 1.
-++#
-++proc check_different_database_content {basename args} {
-++  set i 0
-++  set hashes {}
-++  foreach sql $args {
-++    forcedelete test.db
-++    sqlite3 db test.db
-++    db eval $sql
-++    set pgsz [db one {PRAGMA page_size}]
-++    db close
-++    set sz [file size test.db]
-++    set thishash [md5file test.db $pgsz [expr {$sz-$pgsz}]]
-++    set j [lsearch $hashes $thishash]
-++    if {$j>=0} {
-++      do_test $basename-$i "set x {$i is the same as $j}" "All are different"
-++    } else {
-++      do_test $basename-$i "set x {All are different}" "All are different"
-++    }
-++    lappend hashes $thishash
-++    incr i
-++  }
-++}
-++
-++check_same_database_content 100 {
-++  CREATE TABLE t1(a INTEGER PRIMARY KEY, b UNIQUE);
-++  INSERT INTO t1(a,b) VALUES(123,'Four score and seven years ago...');
-++} {
-++  CREATE TABLE t1(xyz INTEGER, abc, PRIMARY KEY(xyz), UNIQUE(abc));
-++  INSERT INTO t1(xyz,abc) VALUES(123,'Four score and seven years ago...');
-++} {
-++  CREATE TABLE t1(xyz INTEGER, abc, UNIQUE(abc), PRIMARY KEY(xyz));
-++  INSERT INTO t1(xyz,abc) VALUES(123,'Four score and seven years ago...');
-++} {
-++  CREATE TABLE t1(a INTEGER PRIMARY KEY ASC, b UNIQUE);
-++  INSERT INTO t1(a,b) VALUES(123,'Four score and seven years ago...');
-++} {
-++  CREATE TABLE t1(a INTEGER PRIMARY KEY, b);
-++  CREATE UNIQUE INDEX t1b ON t1(b);
-++  INSERT INTO t1(a,b) VALUES(123,'Four score and seven years ago...');
-++} {
-++  CREATE TABLE t1(a INTEGER PRIMARY KEY, b);
-++  INSERT INTO t1(a,b) VALUES(123,'Four score and seven years ago...');
-++  CREATE UNIQUE INDEX t1b ON t1(b);
-++}
-++
-++check_same_database_content 110 {
-++  CREATE TABLE t1(a INTEGER PRIMARY KEY UNIQUE, b UNIQUE);
-++  INSERT INTO t1(a,b) VALUES(123,'Four score and seven years ago...');
-++} {
-++  CREATE TABLE t1(a INTEGER UNIQUE PRIMARY KEY, b UNIQUE);
-++  INSERT INTO t1(a,b) VALUES(123,'Four score and seven years ago...');
-++} {
-++  CREATE TABLE t1(a INTEGER UNIQUE PRIMARY KEY, b UNIQUE, UNIQUE(a));
-++  INSERT INTO t1(a,b) VALUES(123,'Four score and seven years ago...');
-++} {
-++  CREATE TABLE t1(a INTEGER UNIQUE PRIMARY KEY, b);
-++  CREATE UNIQUE INDEX t1b ON t1(b);
-++  INSERT INTO t1(a,b) VALUES(123,'Four score and seven years ago...');
-++} {
-++  CREATE TABLE t1(a INTEGER UNIQUE PRIMARY KEY, b);
-++  INSERT INTO t1(a,b) VALUES(123,'Four score and seven years ago...');
-++  CREATE UNIQUE INDEX t1b ON t1(b);
-++}
-++
-++check_same_database_content 120 {
-++  CREATE TABLE t1(a INTEGER PRIMARY KEY, b UNIQUE) WITHOUT ROWID;
-++  INSERT INTO t1(a,b) VALUES(123,'Four score and seven years ago...');
-++} {
-++  CREATE TABLE t1(xyz INTEGER, abc, PRIMARY KEY(xyz), UNIQUE(abc))WITHOUT ROWID;
-++  INSERT INTO t1(xyz,abc) VALUES(123,'Four score and seven years ago...');
-++} {
-++  CREATE TABLE t1(xyz INTEGER, abc, UNIQUE(abc), PRIMARY KEY(xyz))WITHOUT ROWID;
-++  INSERT INTO t1(xyz,abc) VALUES(123,'Four score and seven years ago...');
-++} {
-++  CREATE TABLE t1(a INTEGER PRIMARY KEY ASC, b UNIQUE) WITHOUT ROWID;
-++  INSERT INTO t1(a,b) VALUES(123,'Four score and seven years ago...');
-++} {
-++  CREATE TABLE t1(a INTEGER PRIMARY KEY UNIQUE, b UNIQUE) WITHOUT ROWID;
-++  INSERT INTO t1(a,b) VALUES(123,'Four score and seven years ago...');
-++} {
-++  CREATE TABLE t1(a INTEGER UNIQUE PRIMARY KEY, b UNIQUE) WITHOUT ROWID;
-++  INSERT INTO t1(a,b) VALUES(123,'Four score and seven years ago...');
-++} {
-++  CREATE TABLE t1(a INTEGER UNIQUE PRIMARY KEY, b UNIQUE, UNIQUE(a))
-++       WITHOUT ROWID;
-++  INSERT INTO t1(a,b) VALUES(123,'Four score and seven years ago...');
-++} {
-++  CREATE TABLE t1(a INTEGER PRIMARY KEY, b) WITHOUT ROWID;
-++  CREATE UNIQUE INDEX t1b ON t1(b);
-++  INSERT INTO t1(a,b) VALUES(123,'Four score and seven years ago...');
-++} {
-++  CREATE TABLE t1(a INTEGER PRIMARY KEY, b) WITHOUT ROWID;
-++  INSERT INTO t1(a,b) VALUES(123,'Four score and seven years ago...');
-++  CREATE UNIQUE INDEX t1b ON t1(b);
-++}
-++
-++check_different_database_content 130 {
-++  CREATE TABLE t1(a INTEGER PRIMARY KEY, b UNIQUE);
-++  INSERT INTO t1(a,b) VALUES(123,'Four score and seven years ago...');
-++} {
-++  CREATE TABLE t1(a INTEGER PRIMARY KEY UNIQUE, b UNIQUE);
-++  INSERT INTO t1(a,b) VALUES(123,'Four score and seven years ago...');
-++} {
-++  CREATE TABLE t1(a INTEGER PRIMARY KEY, b UNIQUE) WITHOUT ROWID;
-++  INSERT INTO t1(a,b) VALUES(123,'Four score and seven years ago...');
-++}
-++
-++
-++finish_test
-+diff --git a/third_party/sqlite/src/test/select1.test b/third_party/sqlite/src/test/select1.test
-+index 09ed84c..f44d384 100644
-+--- a/third_party/sqlite/src/test/select1.test
-++++ b/third_party/sqlite/src/test/select1.test
-+@@ -545,9 +545,9 @@ do_test select1-6.9.7 {
-+   set x [execsql2 {
-+      SELECT * FROM test1 a, (select 5, 6) LIMIT 1
-+   }]
-+-  regsub -all {sq_[0-9a-fA-F_]+} $x {subquery} x
-++  regsub -all {subquery_[0-9a-fA-F_]+} $x {subquery} x
-+   set x
-+-} {a.f1 11 a.f2 22 sqlite_subquery.5 5 sqlite_subquery.6 6}
-++} {a.f1 11 a.f2 22 subquery.5 5 subquery.6 6}
-+ do_test select1-6.9.8 {
-+   set x [execsql2 {
-+      SELECT * FROM test1 a, (select 5 AS x, 6 AS y) AS b LIMIT 1
-+diff --git a/third_party/sqlite/src/test/snapshot2.test b/third_party/sqlite/src/test/snapshot2.test
-+index 41e5552..8403cdb 100644
-+--- a/third_party/sqlite/src/test/snapshot2.test
-++++ b/third_party/sqlite/src/test/snapshot2.test
-+@@ -197,4 +197,45 @@ do_test 4.7 {
-+   list [catch { sqlite3_snapshot_recover db aux } msg] $msg
-+ } {1 SQLITE_ERROR}
-+ 
-++#-------------------------------------------------------------------------
-++reset_db
-++sqlite3 db2 test.db
-++do_execsql_test 5.0 {
-++  CREATE TABLE t2(x);
-++  PRAGMA journal_mode = wal;
-++  INSERT INTO t2 VALUES('abc');
-++  INSERT INTO t2 VALUES('def');
-++  INSERT INTO t2 VALUES('ghi');
-++} {wal}
-++
-++do_test 5.1 {
-++  execsql {
-++    SELECT * FROM t2;
-++    BEGIN;
-++  } db2
-++  set snap [sqlite3_snapshot_get_blob db2 main]
-++  db2 eval END
-++} {}
-++
-++do_test 5.2 {
-++  execsql BEGIN db2
-++  sqlite3_snapshot_open_blob db2 main $snap
-++  db2 eval { SELECT * FROM t2 ; END }
-++} {abc def ghi}
-++
-++do_test 5.3 {
-++  execsql { PRAGMA wal_checkpoint = RESTART }
-++  execsql BEGIN db2
-++  sqlite3_snapshot_open_blob db2 main $snap
-++  db2 eval { SELECT * FROM t2 ; END }
-++} {abc def ghi}
-++
-++do_test 5.4 {
-++  execsql { INSERT INTO t2 VALUES('jkl') }
-++  execsql BEGIN db2
-++  list [catch { sqlite3_snapshot_open_blob db2 main $snap } msg] $msg
-++} {1 SQLITE_BUSY_SNAPSHOT}
-++
-++
-+ finish_test
-++
-+diff --git a/third_party/sqlite/src/test/speedtest1.c b/third_party/sqlite/src/test/speedtest1.c
-+index 1bb7219..29acacc 100644
-+--- a/third_party/sqlite/src/test/speedtest1.c
-++++ b/third_party/sqlite/src/test/speedtest1.c
-+@@ -25,7 +25,6 @@ static const char zHelp[] =
-+   "  --primarykey        Use PRIMARY KEY instead of UNIQUE where appropriate\n"
-+   "  --repeat N          Repeat each SELECT N times (default: 1)\n"
-+   "  --reprepare         Reprepare each statement upon every invocation\n"
-+-  "  --scratch N SZ      Configure scratch memory for N slots of SZ bytes each\n"
-+   "  --serialized        Set serialized threading mode\n"
-+   "  --singlethread      Set single-threaded mode - disables all mutexing\n"
-+   "  --sqlonly           No-op.  Only show the SQL that would have been run.\n"
-+@@ -1636,6 +1635,11 @@ static void displayLinuxIoStats(FILE *out){
-+ #  define sqlite3_sourceid(X) "(before 3.6.18)"
-+ #endif
-+ 
-++static int xCompileOptions(void *pCtx, int nVal, char **azVal, char **azCol){
-++  printf("-- Compile option: %s\n", azVal[0]);
-++  return SQLITE_OK;
-++}
-++
-+ int main(int argc, char **argv){
-+   int doAutovac = 0;            /* True for --autovacuum */
-+   int cacheSize = 0;            /* Desired cache size.  0 means default */
-+@@ -1649,7 +1653,6 @@ int main(int argc, char **argv){
-+   int pageSize = 0;             /* Desired page size.  0 means default */
-+   int nPCache = 0, szPCache = 0;/* --pcache configuration */
-+   int doPCache = 0;             /* True if --pcache is seen */
-+-  int nScratch = 0, szScratch=0;/* --scratch configuration */
-+   int showStats = 0;            /* True for --stats */
-+   int nThread = 0;              /* --threads value */
-+   int mmapSize = 0;             /* How big of a memory map to use */
-+@@ -1661,7 +1664,6 @@ int main(int argc, char **argv){
-+   void *pHeap = 0;              /* Allocated heap space */
-+   void *pLook = 0;              /* Allocated lookaside space */
-+   void *pPCache = 0;            /* Allocated storage for pcache */
-+-  void *pScratch = 0;           /* Allocated storage for scratch */
-+   int iCur, iHi;                /* Stats values, current and "highwater" */
-+   int i;                        /* Loop counter */
-+   int rc;                       /* API return code */
-+@@ -1741,11 +1743,6 @@ int main(int argc, char **argv){
-+         i += 1;
-+       }else if( strcmp(z,"reprepare")==0 ){
-+         g.bReprepare = 1;
-+-      }else if( strcmp(z,"scratch")==0 ){
-+-        if( i>=argc-2 ) fatal_error("missing arguments on %s\n", argv[i]);
-+-        nScratch = integerValue(argv[i+1]);
-+-        szScratch = integerValue(argv[i+2]);
-+-        i += 2;
-+ #if SQLITE_VERSION_NUMBER>=3006000
-+       }else if( strcmp(z,"serialized")==0 ){
-+         sqlite3_config(SQLITE_CONFIG_SERIALIZED);
-+@@ -1816,13 +1813,6 @@ int main(int argc, char **argv){
-+     rc = sqlite3_config(SQLITE_CONFIG_PAGECACHE, pPCache, szPCache, nPCache);
-+     if( rc ) fatal_error("pcache configuration failed: %d\n", rc);
-+   }
-+-  if( nScratch>0 && szScratch>0 ){
-+-    pScratch = malloc( nScratch*(sqlite3_int64)szScratch );
-+-    if( pScratch==0 ) fatal_error("cannot allocate %lld-byte scratch\n",
-+-                                 nScratch*(sqlite3_int64)szScratch);
-+-    rc = sqlite3_config(SQLITE_CONFIG_SCRATCH, pScratch, szScratch, nScratch);
-+-    if( rc ) fatal_error("scratch configuration failed: %d\n", rc);
-+-  }
-+   if( nLook>=0 ){
-+     sqlite3_config(SQLITE_CONFIG_LOOKASIDE, 0, 0);
-+   }
-+@@ -1896,6 +1886,10 @@ int main(int argc, char **argv){
-+   }
-+   speedtest1_final();
-+ 
-++  if( showStats ){
-++    sqlite3_exec(g.db, "PRAGMA compile_options", xCompileOptions, 0, 0);
-++  }
-++
-+   /* Database connection statistics printed after both prepared statements
-+   ** have been finalized */
-+ #if SQLITE_VERSION_NUMBER>=3007009
-+@@ -1939,14 +1933,10 @@ int main(int argc, char **argv){
-+ #endif
-+     sqlite3_status(SQLITE_STATUS_PAGECACHE_OVERFLOW, &iCur, &iHi, 0);
-+     printf("-- Pcache Overflow Bytes:       %d (max %d)\n", iCur,iHi);
-+-    sqlite3_status(SQLITE_STATUS_SCRATCH_OVERFLOW, &iCur, &iHi, 0);
-+-    printf("-- Scratch Overflow Bytes:      %d (max %d)\n", iCur,iHi);
-+     sqlite3_status(SQLITE_STATUS_MALLOC_SIZE, &iCur, &iHi, 0);
-+     printf("-- Largest Allocation:          %d bytes\n",iHi);
-+     sqlite3_status(SQLITE_STATUS_PAGECACHE_SIZE, &iCur, &iHi, 0);
-+     printf("-- Largest Pcache Allocation:   %d bytes\n",iHi);
-+-    sqlite3_status(SQLITE_STATUS_SCRATCH_SIZE, &iCur, &iHi, 0);
-+-    printf("-- Largest Scratch Allocation:  %d bytes\n", iHi);
-+   }
-+ #endif
-+ 
-+@@ -1959,7 +1949,6 @@ int main(int argc, char **argv){
-+   /* Release memory */
-+   free( pLook );
-+   free( pPCache );
-+-  free( pScratch );
-+   free( pHeap );
-+   return 0;
-+ }
-+diff --git a/third_party/sqlite/src/test/swarmvtab.test b/third_party/sqlite/src/test/swarmvtab.test
-+new file mode 100644
-+index 0000000..1dae0e0
-+--- /dev/null
-++++ b/third_party/sqlite/src/test/swarmvtab.test
-+@@ -0,0 +1,246 @@
-++# 2017-07-15
-++#
-++# The author disclaims copyright to this source code.  In place of
-++# a legal notice, here is a blessing:
-++#
-++#    May you do good and not evil.
-++#    May you find forgiveness for yourself and forgive others.
-++#    May you share freely, never taking more than you give.
-++#
-++#***********************************************************************
-++# This file implements regression tests for SQLite library.  The
-++# focus of this file is the "swarmvtab" extension
-++#
-++
-++set testdir [file dirname $argv0]
-++source $testdir/tester.tcl
-++set testprefix swarmvtab
-++do_not_use_codec
-++
-++ifcapable !vtab {
-++  finish_test
-++  return
-++}
-++
-++load_static_extension db unionvtab
-++
-++set nFile $sqlite_open_file_count
-++
-++do_execsql_test 1.0 {
-++  CREATE TABLE t0(a INTEGER PRIMARY KEY, b TEXT);
-++  WITH s(i) AS ( SELECT 1 UNION ALL SELECT i+1 FROM s WHERE i<400)
-++  INSERT INTO t0 SELECT i, hex(randomblob(50)) FROM s;
-++
-++  CREATE TABLE dir(f, t, imin, imax);
-++}
-++
-++do_test 1.1 {
-++  for {set i 0} {$i < 40} {incr i} {
-++    set iMin [expr $i*10 + 1]
-++    set iMax [expr $iMin+9]
-++
-++    forcedelete "test.db$i"
-++    execsql [subst {
-++      ATTACH 'test.db$i' AS aux;
-++      CREATE TABLE aux.t$i (a INTEGER PRIMARY KEY, b TEXT);
-++      INSERT INTO aux.t$i SELECT * FROM t0 WHERE a BETWEEN $iMin AND $iMax;
-++      DETACH aux;
-++      INSERT INTO dir VALUES('test.db$i', 't$i', $iMin, $iMax);
-++    }]
-++  }
-++
-++  execsql {
-++    CREATE VIRTUAL TABLE temp.s1 USING swarmvtab('SELECT * FROM dir');
-++  }
-++} {}
-++
-++do_execsql_test 1.2 {
-++  DROP TABLE s1;
-++} {}
-++
-++do_execsql_test 1.3 {
-++  CREATE VIRTUAL TABLE temp.s1 USING swarmvtab('SELECT * FROM dir');
-++  SELECT count(*) FROM s1 WHERE rowid<50;
-++} {49}
-++
-++proc do_compare_test {tn where} {
-++  set sql [subst {
-++    SELECT (SELECT group_concat(a || ',' || b, ',') FROM t0 WHERE $where)
-++           IS
-++           (SELECT group_concat(a || ',' || b, ',') FROM s1 WHERE $where)
-++  }]
-++
-++  uplevel [list do_execsql_test $tn $sql 1]
-++}
-++
-++do_compare_test 1.4.1 "rowid = 700"
-++do_compare_test 1.4.2 "rowid = -1"
-++do_compare_test 1.4.3 "rowid = 0"
-++do_compare_test 1.4.4 "rowid = 55"
-++do_compare_test 1.4.5 "rowid BETWEEN 20 AND 100"
-++do_compare_test 1.4.6 "rowid > 350"
-++do_compare_test 1.4.7 "rowid >= 350"
-++do_compare_test 1.4.8 "rowid >= 200"
-++do_compare_test 1.4.9 "1"
-++
-++# Multiple simultaneous cursors.
-++#
-++do_execsql_test 1.5.1.(5-seconds-or-so) {
-++  SELECT count(*) FROM s1 a, s1 b WHERE b.rowid<=200;
-++} {80000}
-++do_execsql_test 1.5.2 {
-++  SELECT count(*) FROM s1 a, s1 b, s1 c
-++  WHERE a.rowid=b.rowid AND b.rowid=c.rowid;
-++} {400}
-++
-++# Empty source tables.
-++#
-++do_test 1.6.0 {
-++  for {set i 0} {$i < 20} {incr i} {
-++    sqlite3 db2 test.db$i
-++    db2 eval " DELETE FROM t$i "
-++    db2 close
-++  }
-++  db eval { DELETE FROM t0 WHERE rowid<=200 }
-++} {}
-++
-++do_compare_test 1.6.1 "rowid = 700"
-++do_compare_test 1.6.2 "rowid = -1"
-++do_compare_test 1.6.3 "rowid = 0"
-++do_compare_test 1.6.4 "rowid = 55"
-++do_compare_test 1.6.5 "rowid BETWEEN 20 AND 100"
-++do_compare_test 1.6.6 "rowid > 350"
-++do_compare_test 1.6.7 "rowid >= 350"
-++do_compare_test 1.6.8 "rowid >= 200"
-++do_compare_test 1.6.9 "1"
-++do_compare_test 1.6.10 "rowid >= 5"
-++
-++do_test 1.x {
-++  set sqlite_open_file_count
-++} [expr $nFile+9]
-++
-++do_test 1.y { db close } {}
-++
-++# Delete all the database files created above.
-++#
-++for {set i 0} {$i < 40} {incr i} { forcedelete "test.db$i" }
-++
-++#-------------------------------------------------------------------------
-++# Test some error conditions:
-++#
-++#   2.1: Database file does not exist.
-++#   2.2: Table does not exist.
-++#   2.3: Table schema does not match.
-++#   2.4: Syntax error in SELECT statement.
-++#
-++reset_db
-++load_static_extension db unionvtab
-++do_test 2.0.1 {
-++  db eval {
-++    CREATE TABLE t0(a INTEGER PRIMARY KEY, b TEXT);
-++    WITH s(i) AS ( SELECT 1 UNION ALL SELECT i+1 FROM s WHERE i<400)
-++      INSERT INTO t0 SELECT i, hex(randomblob(50)) FROM s;
-++    CREATE TABLE dir(f, t, imin, imax);
-++  }
-++
-++  for {set i 0} {$i < 40} {incr i} {
-++    set iMin [expr $i*10 + 1]
-++    set iMax [expr $iMin+9]
-++
-++    forcedelete "test.db$i"
-++    db eval [subst {
-++      ATTACH 'test.db$i' AS aux;
-++      CREATE TABLE aux.t$i (a INTEGER PRIMARY KEY, b TEXT);
-++      INSERT INTO aux.t$i SELECT * FROM t0 WHERE a BETWEEN $iMin AND $iMax;
-++      DETACH aux;
-++      INSERT INTO dir VALUES('test.db$i', 't$i', $iMin, $iMax);
-++    }]
-++  }
-++  execsql {
-++    CREATE VIRTUAL TABLE temp.s1 USING swarmvtab('SELECT * FROM dir');
-++  }
-++} {}
-++
-++do_test 2.0.2 {
-++  forcedelete test.db5
-++
-++  sqlite3 db2 test.db15
-++  db2 eval { DROP TABLE t15 }
-++  db2 close
-++
-++  sqlite3 db2 test.db25
-++  db2 eval {
-++    DROP TABLE t25;
-++    CREATE TABLE t25(x, y, z PRIMARY KEY);
-++  }
-++  db2 close
-++} {}
-++
-++do_catchsql_test 2.1 {
-++  SELECT * FROM s1 WHERE rowid BETWEEN 1 AND 100;
-++} {1 {unable to open database file}}
-++do_catchsql_test 2.2 {
-++  SELECT * FROM s1 WHERE rowid BETWEEN 101 AND 200;
-++} {1 {no such rowid table: t15}}
-++do_catchsql_test 2.3 {
-++  SELECT * FROM s1 WHERE rowid BETWEEN 201 AND 300;
-++} {1 {source table schema mismatch}}
-++
-++do_catchsql_test 2.4 {
-++  CREATE VIRTUAL TABLE temp.x1 USING swarmvtab('SELECT * FROMdir');
-++} {1 {sql error: near "FROMdir": syntax error}}
-++do_catchsql_test 2.5 {
-++  CREATE VIRTUAL TABLE temp.x1 USING swarmvtab('SELECT * FROMdir', 'fetchdb');
-++} {1 {sql error: near "FROMdir": syntax error}}
-++
-++for {set i 0} {$i < 40} {incr i} {
-++  forcedelete "test.db$i"
-++}
-++
-++#-------------------------------------------------------------------------
-++# Test the outcome of the fetch function throwing an exception.
-++#
-++proc fetch_db {file} {
-++  error "fetch_db error!"
-++}
-++
-++db func fetch_db fetch_db
-++
-++do_catchsql_test 3.1 {
-++  CREATE VIRTUAL TABLE temp.xyz USING swarmvtab(
-++    'VALUES
-++        ("test.db1", "t1", 1, 10),
-++        ("test.db2", "t1", 11, 20)
-++    ', 'fetch_db_no_such_function'
-++  );
-++} {1 {no such function: fetch_db_no_such_function}}
-++
-++do_catchsql_test 3.2 {
-++  CREATE VIRTUAL TABLE temp.xyz USING swarmvtab(
-++    'VALUES
-++        ("test.db1", "t1", 1, 10),
-++        ("test.db2", "t1", 11, 20)
-++    ', 'fetch_db'
-++  );
-++} {1 {fetch_db error!}}
-++
-++do_execsql_test 3.3.1 {
-++  ATTACH 'test.db1' AS aux;
-++  CREATE TABLE aux.t1(a INTEGER PRIMARY KEY, b);
-++  INSERT INTO aux.t1 VALUES(1, NULL);
-++  INSERT INTO aux.t1 VALUES(2, NULL);
-++  INSERT INTO aux.t1 VALUES(9, NULL);
-++  DETACH aux;
-++  CREATE VIRTUAL TABLE temp.xyz USING swarmvtab(
-++    'VALUES
-++        ("test.db1", "t1", 1, 10),
-++        ("test.db2", "t1", 11, 20)
-++    ', 'fetch_db'
-++  );
-++} {}
-++
-++do_catchsql_test 3.3.2 { SELECT * FROM xyz } {1 {fetch_db error!}}
-++
-++
-++
-++finish_test
-+diff --git a/third_party/sqlite/src/test/swarmvtab2.test b/third_party/sqlite/src/test/swarmvtab2.test
-+new file mode 100644
-+index 0000000..cf1bdd0
-+--- /dev/null
-++++ b/third_party/sqlite/src/test/swarmvtab2.test
-+@@ -0,0 +1,75 @@
-++# 2017-07-15
-++#
-++# The author disclaims copyright to this source code.  In place of
-++# a legal notice, here is a blessing:
-++#
-++#    May you do good and not evil.
-++#    May you find forgiveness for yourself and forgive others.
-++#    May you share freely, never taking more than you give.
-++#
-++#***********************************************************************
-++# This file implements regression tests for SQLite library.  The
-++# focus of this file is the "swarmvtab" extension
-++#
-++
-++set testdir [file dirname $argv0]
-++source $testdir/tester.tcl
-++set testprefix swarmvtab
-++do_not_use_codec
-++
-++ifcapable !vtab {
-++  finish_test
-++  return
-++}
-++
-++
-++db close
-++foreach name [glob -nocomplain test*.db] {
-++  forcedelete $name
-++}
-++sqlite3 db test.db
-++load_static_extension db unionvtab
-++proc create_database {filename} {
-++  sqlite3 dbx $filename
-++  set num [regsub -all {[^0-9]+} $filename {}]
-++  set num [string trimleft $num 0]
-++  set start [expr {$num*1000}]
-++  set end [expr {$start+999}]
-++  dbx eval {
-++    CREATE TABLE t2(a INTEGER PRIMARY KEY,b);
-++    WITH RECURSIVE c(x) AS (
-++      VALUES($start) UNION ALL SELECT x+1 FROM c WHERE x<$end
-++    )
-++    INSERT INTO t2(a,b) SELECT x, printf('**%05d**',x) FROM c;
-++  }
-++  dbx close
-++}
-++db func create_database create_database
-++do_execsql_test 100 {
-++  CREATE TABLE t1(filename, tablename, istart, iend);
-++  WITH RECURSIVE c(x) AS (VALUES(1) UNION ALL SELECT x+1 FROM c WHERE x<99)
-++  INSERT INTO t1 SELECT printf('test%03d.db',x),'t2',x*1000,x*1000+999 FROM c;
-++  CREATE VIRTUAL TABLE temp.v1 USING swarmvtab(
-++    'SELECT * FROM t1', 'create_database'
-++  );
-++} {}
-++do_execsql_test 110 {
-++  SELECT b FROM v1 WHERE a=3875;
-++} {**03875**}
-++do_test 120 {
-++  lsort [glob -nocomplain test?*.db]
-++} {test001.db test003.db}
-++do_execsql_test 130 {
-++  SELECT b FROM v1 WHERE a BETWEEN 3999 AND 4000 ORDER BY a;
-++} {**03999** **04000**}
-++do_test 140 {
-++  lsort [glob -nocomplain test?*.db]
-++} {test001.db test003.db test004.db}
-++do_execsql_test 150 {
-++  SELECT b FROM v1 WHERE a>=99998;
-++} {**99998** **99999**}
-++do_test 160 {
-++  lsort -dictionary [glob -nocomplain test?*.db]
-++} {test001.db test003.db test004.db test099.db}
-++
-++finish_test
-+diff --git a/third_party/sqlite/src/test/swarmvtabfault.test b/third_party/sqlite/src/test/swarmvtabfault.test
-+new file mode 100644
-+index 0000000..083d80d
-+--- /dev/null
-++++ b/third_party/sqlite/src/test/swarmvtabfault.test
-+@@ -0,0 +1,66 @@
-++# 2017-07-15
-++#
-++# The author disclaims copyright to this source code.  In place of
-++# a legal notice, here is a blessing:
-++#
-++#    May you do good and not evil.
-++#    May you find forgiveness for yourself and forgive others.
-++#    May you share freely, never taking more than you give.
-++#
-++#***********************************************************************
-++# This file implements regression tests for SQLite library.  The
-++# focus of this file is error handling in the swarmvtab extension.
-++#
-++
-++set testdir [file dirname $argv0]
-++source $testdir/tester.tcl
-++set testprefix swarmvtabfault
-++
-++ifcapable !vtab {
-++  finish_test
-++  return
-++}
-++
-++proc fetch_db {file} {
-++  forcedelete $file
-++  sqlite3 dbX $file
-++  set rc [catch {
-++    dbX eval { CREATE TABLE t1(a INTEGER PRIMARY KEY, b) }
-++  } res]
-++  dbX close
-++  if {$rc!=0} {error $res}
-++}
-++
-++forcedelete test.db1
-++forcedelete test.db2
-++
-++do_execsql_test 1.0 {
-++  ATTACH 'test.db1' AS aux;
-++  CREATE TABLE aux.t1(a INTEGER PRIMARY KEY, b);
-++  INSERT INTO aux.t1 VALUES(1, NULL);
-++  INSERT INTO aux.t1 VALUES(2, NULL);
-++  INSERT INTO aux.t1 VALUES(9, NULL);
-++  DETACH aux;
-++} {}
-++
-++faultsim_save_and_close
-++do_faultsim_test 1.1 -faults oom* -prep {
-++  faultsim_restore_and_reopen
-++  db func fetch_db fetch_db
-++  load_static_extension db unionvtab
-++  db eval {
-++    CREATE VIRTUAL TABLE temp.xyz USING swarmvtab(
-++        'VALUES
-++        ("test.db1", "t1", 1, 10),
-++        ("test.db2", "t1", 11, 20)
-++        ', 'fetch_db'
-++    );
-++  }
-++} -body {
-++  execsql { SELECT a FROM xyz }
-++} -test {
-++  faultsim_test_result {0 {1 2 9}} {1 {sql error: out of memory}}
-++}
-++
-++finish_test
-++
-+diff --git a/third_party/sqlite/src/test/syscall.test b/third_party/sqlite/src/test/syscall.test
-+index 442f942..045631b 100644
-+--- a/third_party/sqlite/src/test/syscall.test
-++++ b/third_party/sqlite/src/test/syscall.test
-+@@ -61,7 +61,7 @@ foreach s {
-+     fcntl read pread write pwrite fchmod fallocate
-+     pread64 pwrite64 unlink openDirectory mkdir rmdir
-+     statvfs fchown geteuid umask mmap munmap mremap
-+-    getpagesize readlink lstat
-++    getpagesize readlink lstat ioctl
-+ } {
-+   if {[test_syscall exists $s]} {lappend syscall_list $s}
-+ }
-+diff --git a/third_party/sqlite/src/test/tester.tcl b/third_party/sqlite/src/test/tester.tcl
-+index 7837ad6..82401fc 100644
-+--- a/third_party/sqlite/src/test/tester.tcl
-++++ b/third_party/sqlite/src/test/tester.tcl
-+@@ -1241,14 +1241,6 @@ proc show_memstats {} {
-+   set x [sqlite3_status SQLITE_STATUS_PAGECACHE_OVERFLOW 0]
-+   set val [format {now %10d  max %10d} [lindex $x 1] [lindex $x 2]]
-+   output1 "Page-cache overflow:  $val"
-+-  set x [sqlite3_status SQLITE_STATUS_SCRATCH_USED 0]
-+-  set val [format {now %10d  max %10d} [lindex $x 1] [lindex $x 2]]
-+-  output1 "Scratch memory used:  $val"
-+-  set x [sqlite3_status SQLITE_STATUS_SCRATCH_OVERFLOW 0]
-+-  set y [sqlite3_status SQLITE_STATUS_SCRATCH_SIZE 0]
-+-  set val [format {now %10d  max %10d  max-size %10d} \
-+-               [lindex $x 1] [lindex $x 2] [lindex $y 2]]
-+-  output1 "Scratch overflow:     $val"
-+   ifcapable yytrackmaxstackdepth {
-+     set x [sqlite3_status SQLITE_STATUS_PARSER_STACK 0]
-+     set val [format {               max %10d} [lindex $x 2]]
-+@@ -1608,6 +1600,54 @@ proc crashsql {args} {
-+   lappend r $msg
-+ }
-+ 
-++#   crash_on_write ?-devchar DEVCHAR? CRASHDELAY SQL
-++#
-++proc crash_on_write {args} {
-++
-++  set nArg [llength $args]
-++  if {$nArg<2 || $nArg%2} {
-++    error "bad args: $args"
-++  }
-++  set zSql [lindex $args end]
-++  set nDelay [lindex $args end-1]
-++
-++  set devchar {}
-++  for {set ii 0} {$ii < $nArg-2} {incr ii 2} {
-++    set opt [lindex $args $ii]
-++    switch -- [lindex $args $ii] {
-++      -devchar {
-++        set devchar [lindex $args [expr $ii+1]]
-++      }
-++
-++      default { error "unrecognized option: $opt" }
-++    }
-++  }
-++
-++  set f [open crash.tcl w]
-++  puts $f "sqlite3_crash_on_write $nDelay"
-++  puts $f "sqlite3_test_control_pending_byte $::sqlite_pending_byte"
-++  puts $f "sqlite3 db test.db -vfs writecrash"
-++  puts $f "db eval {$zSql}"
-++  puts $f "set {} {}"
-++
-++  close $f
-++  set r [catch {
-++    exec [info nameofexec] crash.tcl >@stdout
-++  } msg]
-++
-++  # Windows/ActiveState TCL returns a slightly different
-++  # error message.  We map that to the expected message
-++  # so that we don't have to change all of the test
-++  # cases.
-++  if {$::tcl_platform(platform)=="windows"} {
-++    if {$msg=="child killed: unknown signal"} {
-++      set msg "child process exited abnormally"
-++    }
-++  }
-++
-++  lappend r $msg
-++}
-++
-+ proc run_ioerr_prep {} {
-+   set ::sqlite_io_error_pending 0
-+   catch {db close}
-+diff --git a/third_party/sqlite/src/test/unionvtabfault.test b/third_party/sqlite/src/test/unionvtabfault.test
-+index 33cda7b..937d1ec 100644
-+--- a/third_party/sqlite/src/test/unionvtabfault.test
-++++ b/third_party/sqlite/src/test/unionvtabfault.test
-+@@ -63,6 +63,18 @@ do_faultsim_test 1.2 -faults oom* -prep {
-+   faultsim_test_result {0 {1 one 2 two 3 three 10 ten 11 eleven 12 twelve 20 twenty 21 twenty-one 22 twenty-two}}
-+ }
-+ 
-++#-------------------------------------------------------------------------
-++# Error while registering the two vtab modules.
-++do_faultsim_test 2.0 -faults * -prep {
-++  catch { db close }
-++  sqlite3 db :memory:
-++} -body {
-++  load_static_extension db unionvtab
-++} -test {
-++  faultsim_test_result {0 {}} {1 {initialization of unionvtab failed: }}
-++}
-++
-++
-+ 
-+ finish_test
-+ 
-+diff --git a/third_party/sqlite/src/test/vtab2.test b/third_party/sqlite/src/test/vtab2.test
-+index 545a76f..7de8e5b 100644
-+--- a/third_party/sqlite/src/test/vtab2.test
-++++ b/third_party/sqlite/src/test/vtab2.test
-+@@ -60,7 +60,7 @@ do_test vtab2-2.1 {
-+   set ::abc 123
-+   execsql {
-+     CREATE VIRTUAL TABLE vars USING tclvar;
-+-    SELECT * FROM vars WHERE name='abc';
-++    SELECT name, arrayname, value FROM vars WHERE name='abc';
-+   }
-+ } [list abc "" 123]
-+ do_test vtab2-2.2 {
-+@@ -68,7 +68,7 @@ do_test vtab2-2.2 {
-+   set A(2) 4
-+   set A(3) 9
-+   execsql {
-+-    SELECT * FROM vars WHERE name='A';
-++    SELECT name, arrayname, value FROM vars WHERE name='A';
-+   }
-+ } [list A 1 1 A 2 4 A 3 9]
-+ unset -nocomplain result
-+diff --git a/third_party/sqlite/src/test/vtabE.test b/third_party/sqlite/src/test/vtabE.test
-+index aeb478e..cbb6a1e 100644
-+--- a/third_party/sqlite/src/test/vtabE.test
-++++ b/third_party/sqlite/src/test/vtabE.test
-+@@ -39,7 +39,9 @@ do_test vtabE-1 {
-+     CREATE VIRTUAL TABLE t1 USING tclvar;
-+     CREATE VIRTUAL TABLE t2 USING tclvar;
-+     CREATE TABLE t3(a INTEGER PRIMARY KEY, b);
-+-    SELECT t1.*, t2.*, abs(t3.b + abs(t2.value + abs(t1.value)))
-++    SELECT t1.name, t1.arrayname, t1.value,
-++           t2.name, t2.arrayname, t2.value,
-++           abs(t3.b + abs(t2.value + abs(t1.value)))
-+       FROM t1 LEFT JOIN t2 ON t2.name = t1.arrayname
-+            LEFT JOIN t3 ON t3.a=t2.value
-+      WHERE t1.name = 'vtabE'
-+diff --git a/third_party/sqlite/src/test/vtabH.test b/third_party/sqlite/src/test/vtabH.test
-+index 9097592..05b3cd0 100644
-+--- a/third_party/sqlite/src/test/vtabH.test
-++++ b/third_party/sqlite/src/test/vtabH.test
-+@@ -55,7 +55,7 @@ register_tclvar_module db
-+ set ::xyz 10
-+ do_execsql_test 2.0 {
-+   CREATE VIRTUAL TABLE vars USING tclvar;
-+-  SELECT * FROM vars WHERE name = 'xyz';
-++  SELECT name, arrayname, value FROM vars WHERE name = 'xyz';
-+ } {xyz {} 10}
-+ 
-+ set x1 aback
-+diff --git a/third_party/sqlite/src/test/vtabJ.test b/third_party/sqlite/src/test/vtabJ.test
-+new file mode 100644
-+index 0000000..6a8a8a1
-+--- /dev/null
-++++ b/third_party/sqlite/src/test/vtabJ.test
-+@@ -0,0 +1,126 @@
-++# 2017-08-10
-++#
-++# The author disclaims copyright to this source code.  In place of
-++# a legal notice, here is a blessing:
-++#
-++#    May you do good and not evil.
-++#    May you find forgiveness for yourself and forgive others.
-++#    May you share freely, never taking more than you give.
-++#
-++#***********************************************************************
-++# This file implements tests of writing to WITHOUT ROWID virtual tables
-++# using the tclvar eponymous virtual table.
-++#
-++
-++set testdir [file dirname $argv0]
-++source $testdir/tester.tcl
-++set testprefix vtabJ
-++
-++ifcapable !vtab {
-++  finish_test
-++  return
-++}
-++
-++register_tclvar_module db
-++
-++unset -nocomplain vtabJ
-++do_test 100 {
-++  set vtabJ(1) this
-++  set vtabJ(two) is
-++  set vtabJ(3) {a test}
-++  db eval {
-++    SELECT fullname, value FROM tclvar WHERE name='vtabJ' ORDER BY fullname;
-++  }
-++} {vtabJ(1) this vtabJ(3) {a test} vtabJ(two) is}
-++
-++do_execsql_test 110 {
-++  INSERT INTO tclvar(fullname, value)
-++    VALUES('vtabJ(4)',4),('vtabJ(five)',555);
-++  SELECT fullname, value FROM tclvar WHERE name='vtabJ' ORDER BY fullname;
-++} {vtabJ(1) this vtabJ(3) {a test} vtabJ(4) 4 vtabJ(five) 555 vtabJ(two) is}
-++do_test 111 {
-++  set res {}
-++  foreach vname [lsort [array names vtabJ]] {
-++    lappend res vtabJ($vname) $vtabJ($vname)
-++  }
-++  set res
-++} {vtabJ(1) this vtabJ(3) {a test} vtabJ(4) 4 vtabJ(five) 555 vtabJ(two) is}
-++
-++do_test 120 {
-++  db eval {
-++    INSERT INTO tclvar(fullname, value) VALUES('vtabJ(4)',444);
-++  }
-++  set vtabJ(4)
-++} {444}
-++
-++do_test 130 {
-++  db eval {
-++    INSERT INTO tclvar(fullname, value) VALUES('vtabJ(4)',NULL);
-++  }
-++  info exists vtabJ(4)
-++} {0}
-++
-++do_test 140 {
-++  db eval {
-++    UPDATE tclvar SET value=55 WHERE fullname='vtabJ(five)';
-++  }
-++  set vtabJ(five)
-++} {55}
-++
-++do_test 150 {
-++  db eval {
-++    UPDATE tclvar SET fullname='vtabJ(5)' WHERE fullname='vtabJ(five)';
-++  }
-++  set vtabJ(5)
-++} {55}
-++do_test 151 {
-++  info exists vtabJ(five)
-++} {0}
-++do_test 152 {
-++  set res {}
-++  foreach vname [lsort [array names vtabJ]] {
-++    lappend res vtabJ($vname) $vtabJ($vname)
-++  }
-++  set res
-++} {vtabJ(1) this vtabJ(3) {a test} vtabJ(5) 55 vtabJ(two) is}
-++
-++do_execsql_test 160 {
-++  SELECT fullname FROM tclvar WHERE arrayname='two'
-++} {vtabJ(two)}
-++do_execsql_test 161 {
-++  DELETE FROM tclvar WHERE arrayname='two';
-++  SELECT fullname, value FROM tclvar WHERE name='vtabJ' ORDER BY fullname;
-++} {vtabJ(1) this vtabJ(3) {a test} vtabJ(5) 55}
-++do_test 162 {
-++  set res {}
-++  foreach vname [lsort [array names vtabJ]] {
-++    lappend res vtabJ($vname) $vtabJ($vname)
-++  }
-++  set res
-++} {vtabJ(1) this vtabJ(3) {a test} vtabJ(5) 55}
-++
-++# Try to trick the module into updating the same variable twice for a
-++# single UPDATE statement.
-++#
-++do_execsql_test 171 {
-++  INSERT INTO tclvar(fullname, value) VALUES('xx', 'a');
-++  SELECT name, value FROM tclvar where name = 'xx';
-++} {xx a}
-++do_execsql_test 172 {
-++  UPDATE tclvar SET value = value || 't'
-++  WHERE name = 'xx' OR name = 'x'||'x';
-++  SELECT name, value FROM tclvar where name = 'xx';
-++} {xx at}
-++do_execsql_test 173 {
-++  UPDATE tclvar SET value = value || 't'
-++  WHERE name = 'xx' OR name BETWEEN 'xx' AND 'xx';
-++  SELECT name, value FROM tclvar where name = 'xx';
-++} {xx att}
-++
-++do_execsql_test 181 {
-++  DELETE FROM tclvar WHERE name BETWEEN 'xx' AND 'xx' OR name='xx';
-++  SELECT name, value FROM tclvar where name = 'xx';
-++} {}
-++
-++
-++finish_test
-+diff --git a/third_party/sqlite/src/test/wal2.test b/third_party/sqlite/src/test/wal2.test
-+index 3cff676..5733625 100644
-+--- a/third_party/sqlite/src/test/wal2.test
-++++ b/third_party/sqlite/src/test/wal2.test
-+@@ -1191,7 +1191,7 @@ if {$::tcl_platform(platform) == "unix"} {
-+ #
-+ foreach {tn sql reslist} {
-+   1 { }                                 {10 0 4 0 6 0}
-+-  2 { PRAGMA checkpoint_fullfsync = 1 } {10 4 4 2 6 2}
-++  2 { PRAGMA checkpoint_fullfsync = 1 } {10 6 4 3 6 3}
-+   3 { PRAGMA checkpoint_fullfsync = 0 } {10 0 4 0 6 0}
-+ } {
-+   ifcapable default_ckptfullfsync {
-+@@ -1261,8 +1261,8 @@ foreach {tn settings restart_sync commit_sync ckpt_sync} {
-+   6  {0 1 full}    {0 2}  {0 1}  {0 2}
-+ 
-+   7  {1 0 off}     {0 0}  {0 0}  {0 0}
-+-  8  {1 0 normal}  {1 0}  {0 0}  {0 2}
-+-  9  {1 0 full}    {2 0}  {1 0}  {0 2}
-++  8  {1 0 normal}  {0 1}  {0 0}  {0 2}
-++  9  {1 0 full}    {1 1}  {1 0}  {0 2}
-+ 
-+   10 {1 1 off}     {0 0}  {0 0}  {0 0}
-+   11 {1 1 normal}  {0 1}  {0 0}  {0 2}
-+diff --git a/third_party/sqlite/src/test/whereA.test b/third_party/sqlite/src/test/whereA.test
-+index 78826b1..9747e53 100644
-+--- a/third_party/sqlite/src/test/whereA.test
-++++ b/third_party/sqlite/src/test/whereA.test
-+@@ -158,5 +158,17 @@ do_test whereA-4.6 {
-+   }
-+ } {2 1 1}
-+ 
-++# Ticket https://sqlite.org/src/tktview/cb91bf4290c211  2017-08-01
-++# Assertion fault following PRAGMA reverse_unordered_selects=ON.
-++#
-++do_execsql_test whereA-5.1 {
-++  PRAGMA reverse_unordered_selects=on;
-++  DROP TABLE IF EXISTS t1;
-++  CREATE TABLE t1(a,b);
-++  INSERT INTO t1 VALUES(1,2);
-++  CREATE INDEX t1b ON t1(b);
-++  SELECT a FROM t1 WHERE b=-99 OR b>1;
-++} {1}
-++
-+ 
-+ finish_test
-+diff --git a/third_party/sqlite/src/test/whereF.test b/third_party/sqlite/src/test/whereF.test
-+index bc64945..b0a49f0 100644
-+--- a/third_party/sqlite/src/test/whereF.test
-++++ b/third_party/sqlite/src/test/whereF.test
-+@@ -176,4 +176,43 @@ do_execsql_test 5.5 {
-+ } {4}
-+ do_test 5.6 { expr [db status vmstep]<200 } 1
-+ 
-++# 2017-09-04 ticket b899b6042f97f52d
-++# Segfault on correlated subquery...
-++#
-++ifcapable json1&&vtab {
-++  do_execsql_test 6.1 {
-++    CREATE TABLE t6(x);
-++    SELECT * FROM t6 WHERE 1 IN (SELECT value FROM json_each(x));
-++  } {}
-++
-++  do_execsql_test 6.2 {
-++    DROP TABLE t6;
-++    CREATE TABLE t6(a,b,c);
-++    INSERT INTO t6 VALUES
-++     (0,null,'{"a":0,"b":[3,4,5],"c":{"x":4.5,"y":7.8}}'),
-++     (1,null,'{"a":1,"b":[3,4,5],"c":{"x":4.5,"y":7.8}}'),
-++     (2,null,'{"a":9,"b":[3,4,5],"c":{"x":4.5,"y":7.8}}');
-++    SELECT * FROM t6
-++     WHERE (EXISTS (SELECT 1 FROM json_each(t6.c) AS x WHERE x.value=1));
-++  } {1 {} {{"a":1,"b":[3,4,5],"c":{"x":4.5,"y":7.8}}}}
-++
-++  # Another test case derived from a posting by Wout Mertens on the
-++  # sqlite-users mailing list on 2017-10-04.
-++  do_execsql_test 6.3 {
-++    DROP TABLE IF EXISTS t;
-++    CREATE TABLE t(json JSON);
-++    SELECT * FROM t
-++     WHERE(EXISTS(SELECT 1 FROM json_each(t.json,"$.foo") j
-++                   WHERE j.value = 'meep'));
-++  } {}
-++  do_execsql_test 6.4 {
-++    INSERT INTO t VALUES('{"xyzzy":null}');
-++    INSERT INTO t VALUES('{"foo":"meep","other":12345}');
-++    INSERT INTO t VALUES('{"foo":"bingo","alt":5.25}');
-++    SELECT * FROM t
-++     WHERE(EXISTS(SELECT 1 FROM json_each(t.json,"$.foo") j
-++                   WHERE j.value = 'meep'));
-++  } {{{"foo":"meep","other":12345}}}
-++}
-++
-+ finish_test
-+diff --git a/third_party/sqlite/src/test/win32heap.test b/third_party/sqlite/src/test/win32heap.test
-+index b92f804..82a3f6b 100644
-+--- a/third_party/sqlite/src/test/win32heap.test
-++++ b/third_party/sqlite/src/test/win32heap.test
-+@@ -9,8 +9,7 @@
-+ #
-+ #***********************************************************************
-+ # This file implements regression tests for SQLite library.  The
-+-# focus of this script is recovery from transient manditory locks
-+-# that sometimes appear on database files due to anti-virus software.
-++# focus of this script is the Win32 heap implementation.
-+ #
-+ 
-+ if {$tcl_platform(platform)!="windows"} return
-+diff --git a/third_party/sqlite/src/test/wordcount.c b/third_party/sqlite/src/test/wordcount.c
-+index facfb57..66b4c03 100644
-+--- a/third_party/sqlite/src/test/wordcount.c
-++++ b/third_party/sqlite/src/test/wordcount.c
-+@@ -633,14 +633,10 @@ int main(int argc, char **argv){
-+     printf("%s Outstanding Allocations:     %d (max %d)\n",zTag,iCur,iHiwtr);
-+     sqlite3_status(SQLITE_STATUS_PAGECACHE_OVERFLOW, &iCur, &iHiwtr, 0);
-+     printf("%s Pcache Overflow Bytes:       %d (max %d)\n",zTag,iCur,iHiwtr);
-+-    sqlite3_status(SQLITE_STATUS_SCRATCH_OVERFLOW, &iCur, &iHiwtr, 0);
-+-    printf("%s Scratch Overflow Bytes:      %d (max %d)\n",zTag,iCur,iHiwtr);
-+     sqlite3_status(SQLITE_STATUS_MALLOC_SIZE, &iCur, &iHiwtr, 0);
-+     printf("%s Largest Allocation:          %d bytes\n",zTag,iHiwtr);
-+     sqlite3_status(SQLITE_STATUS_PAGECACHE_SIZE, &iCur, &iHiwtr, 0);
-+     printf("%s Largest Pcache Allocation:   %d bytes\n",zTag,iHiwtr);
-+-    sqlite3_status(SQLITE_STATUS_SCRATCH_SIZE, &iCur, &iHiwtr, 0);
-+-    printf("%s Largest Scratch Allocation:  %d bytes\n",zTag,iHiwtr);
-+   }
-+   return 0;
-+ }
-+diff --git a/third_party/sqlite/src/test/writecrash.test b/third_party/sqlite/src/test/writecrash.test
-+new file mode 100644
-+index 0000000..01bc4db
-+--- /dev/null
-++++ b/third_party/sqlite/src/test/writecrash.test
-+@@ -0,0 +1,68 @@
-++# 2009 January 8
-++#
-++# The author disclaims copyright to this source code.  In place of
-++# a legal notice, here is a blessing:
-++#
-++#    May you do good and not evil.
-++#    May you find forgiveness for yourself and forgive others.
-++#    May you share freely, never taking more than you give.
-++#
-++#***********************************************************************
-++#
-++# Test the outcome of a writer crashing within a call to the VFS
-++# xWrite function.
-++#
-++
-++
-++set testdir [file dirname $argv0]
-++source $testdir/tester.tcl
-++set testprefix writecrash
-++
-++do_not_use_codec
-++
-++
-++if {$tcl_platform(platform)=="windows"} {
-++  finish_test
-++  return
-++}
-++
-++do_execsql_test 1.0 {
-++  CREATE TABLE t1(a INTEGER PRIMARY KEY, b BLOB UNIQUE);
-++  WITH s(i) AS (
-++    VALUES(1) UNION ALL SELECT i+1 FROM s WHERE i<100
-++  )
-++  INSERT INTO t1 SELECT NULL, randomblob(900) FROM s;
-++} {}
-++
-++set bGo 1
-++for {set tn 1} {$bGo} {incr tn} {
-++
-++db close
-++sqlite3 db test.db
-++
-++  do_test 1.$tn.1 {
-++    set res [crash_on_write $tn {
-++      UPDATE t1 SET b = randomblob(899) WHERE (a%3)==0
-++    }]
-++    set bGo 0
-++    if {[string match {1 {child killed:*}} $res]} {
-++      set res {0 {}}
-++      set bGo 1
-++    }
-++    set res
-++  } {0 {}}
-++
-++#db close
-++#sqlite3 db test.db
-++
-++  do_execsql_test 1.$tn.2 { PRAGMA integrity_check } {ok}
-++
-++db close
-++sqlite3 db test.db
-++
-++  do_execsql_test 1.$tn.3 { PRAGMA integrity_check } {ok}
-++}
-++
-++
-++
-++finish_test
-+diff --git a/third_party/sqlite/src/tool/addopcodes.tcl b/third_party/sqlite/src/tool/addopcodes.tcl
-+index 2c204c6..80ba5c8 100644
-+--- a/third_party/sqlite/src/tool/addopcodes.tcl
-++++ b/third_party/sqlite/src/tool/addopcodes.tcl
-+@@ -22,14 +22,7 @@ close $in
-+ # ILLEGAL *must* be the last two token codes and they must be in that order.
-+ #
-+ set extras {
-+-  TO_TEXT
-+-  TO_BLOB
-+-  TO_NUMERIC
-+-  TO_INT
-+-  TO_REAL
-+   ISNOT
-+-  END_OF_FILE
-+-  UNCLOSED_STRING
-+   FUNCTION
-+   COLUMN
-+   AGG_FUNCTION
-+@@ -42,6 +35,8 @@ set extras {
-+   IF_NULL_ROW
-+   ASTERISK
-+   SPAN
-++  END_OF_FILE
-++  UNCLOSED_STRING
-+   SPACE
-+   ILLEGAL
-+ }
-+diff --git a/third_party/sqlite/src/tool/lemon.c b/third_party/sqlite/src/tool/lemon.c
-+index fe0fb4c..acc5450 100644
-+--- a/third_party/sqlite/src/tool/lemon.c
-++++ b/third_party/sqlite/src/tool/lemon.c
-+@@ -2155,7 +2155,8 @@ enum e_state {
-+   WAITING_FOR_FALLBACK_ID,
-+   WAITING_FOR_WILDCARD_ID,
-+   WAITING_FOR_CLASS_ID,
-+-  WAITING_FOR_CLASS_TOKEN
-++  WAITING_FOR_CLASS_TOKEN,
-++  WAITING_FOR_TOKEN_NAME
-+ };
-+ struct pstate {
-+   char *filename;       /* Name of the input file */
-+@@ -2470,6 +2471,8 @@ to follow the previous rule.");
-+         }else if( strcmp(x,"fallback")==0 ){
-+           psp->fallback = 0;
-+           psp->state = WAITING_FOR_FALLBACK_ID;
-++        }else if( strcmp(x,"token")==0 ){
-++          psp->state = WAITING_FOR_TOKEN_NAME;
-+         }else if( strcmp(x,"wildcard")==0 ){
-+           psp->state = WAITING_FOR_WILDCARD_ID;
-+         }else if( strcmp(x,"token_class")==0 ){
-+@@ -2624,6 +2627,26 @@ to follow the previous rule.");
-+         }
-+       }
-+       break;
-++    case WAITING_FOR_TOKEN_NAME:
-++      /* Tokens do not have to be declared before use.  But they can be
-++      ** in order to control their assigned integer number.  The number for
-++      ** each token is assigned when it is first seen.  So by including
-++      **
-++      **     %token ONE TWO THREE
-++      **
-++      ** early in the grammar file, that assigns small consecutive values
-++      ** to each of the tokens ONE TWO and THREE.
-++      */
-++      if( x[0]=='.' ){
-++        psp->state = WAITING_FOR_DECL_OR_RULE;
-++      }else if( !ISUPPER(x[0]) ){
-++        ErrorMsg(psp->filename, psp->tokenlineno,
-++          "%%token argument \"%s\" should be a token", x);
-++        psp->errorcnt++;
-++      }else{
-++        (void)Symbol_new(x);
-++      }
-++      break;
-+     case WAITING_FOR_WILDCARD_ID:
-+       if( x[0]=='.' ){
-+         psp->state = WAITING_FOR_DECL_OR_RULE;
-+diff --git a/third_party/sqlite/src/tool/lempar.c b/third_party/sqlite/src/tool/lempar.c
-+index 866d9ee..f24684f 100644
-+--- a/third_party/sqlite/src/tool/lempar.c
-++++ b/third_party/sqlite/src/tool/lempar.c
-+@@ -75,7 +75,8 @@
-+ **    YY_MAX_SHIFT       Maximum value for shift actions
-+ **    YY_MIN_SHIFTREDUCE Minimum value for shift-reduce actions
-+ **    YY_MAX_SHIFTREDUCE Maximum value for shift-reduce actions
-+-**    YY_MIN_REDUCE      Maximum value for reduce actions
-++**    YY_MIN_REDUCE      Minimum value for reduce actions
-++**    YY_MAX_REDUCE      Maximum value for reduce actions
-+ **    YY_ERROR_ACTION    The yy_action[] code for syntax error
-+ **    YY_ACCEPT_ACTION   The yy_action[] code for accept
-+ **    YY_NO_ACTION       The yy_action[] code for no-op
-+diff --git a/third_party/sqlite/src/tool/mkautoconfamal.sh b/third_party/sqlite/src/tool/mkautoconfamal.sh
-+index d7cea68..363c604 100644
-+--- a/third_party/sqlite/src/tool/mkautoconfamal.sh
-++++ b/third_party/sqlite/src/tool/mkautoconfamal.sh
-+@@ -51,7 +51,7 @@ cp sqlite3.h              $TMPSPACE
-+ cp sqlite3ext.h           $TMPSPACE
-+ cp $TOP/sqlite3.1         $TMPSPACE
-+ cp $TOP/sqlite3.pc.in     $TMPSPACE
-+-cp $TOP/src/shell.c       $TMPSPACE
-++cp shell.c                $TMPSPACE
-+ cp $TOP/src/sqlite3.rc    $TMPSPACE
-+ cp $TOP/tool/Replace.cs   $TMPSPACE
-+ 
-+diff --git a/third_party/sqlite/src/tool/mkccode.tcl b/third_party/sqlite/src/tool/mkccode.tcl
-+new file mode 100755
-+index 0000000..41b09f1
-+--- /dev/null
-++++ b/third_party/sqlite/src/tool/mkccode.tcl
-+@@ -0,0 +1,93 @@
-++#!/usr/bin/tclsh
-++#
-++# Use this script to build C-language source code for a program that uses
-++# tclsqlite.c together with custom TCL scripts and/or C extensions for
-++# either SQLite or TCL.
-++#
-++# Usage example:
-++#
-++#     tclsh mktclsqliteprog.tcl demoapp.c.in >demoapp.c
-++#
-++# The demoapp.c.in file contains a mixture of C code, TCL script, and
-++# processing directives used by mktclsqliteprog.tcl to build the final C-code
-++# output file.  Most lines of demoapp.c.in are copied straight through into
-++# the output.  The following control directives are recognized:
-++#
-++# BEGIN_STRING
-++#
-++#      This marks the beginning of large string literal - usually a TCL
-++#      script of some kind.  Subsequent lines of text through the first
-++#      line that begins with END_STRING are converted into a C-language
-++#      string literal.
-++#
-++# INCLUDE path
-++#
-++#      The path argument is the name of a file to be inserted in place of
-++#      the INCLUDE line.  The path can begin with $ROOT to signify the
-++#      root of the SQLite source tree, or $HOME to signify the directory
-++#      that contains the demoapp.c.in input script itself.  If the path does
-++#      not begin with either $ROOT or $HOME, then it is interpreted relative
-++#      to the current working directory.
-++#
-++#      If the INCLUDE occurs in the middle of BEGIN_STRING...END_STRING
-++#      then all of the text in the input file is converted into C-language
-++#      string literals.
-++#
-++# None of the control directives described above will nest.  Only the
-++# top-level input file ("demoapp.c.in" in the example) is interpreted.
-++# referenced files are copied verbatim.
-++#
-++if {[llength $argv]!=1} {
-++  puts stderr "Usage: $argv0 TEMPLATE >OUTPUT"
-++  exit 1
-++}
-++set infile [lindex $argv 0]
-++set ROOT [file normalize [file dir $argv0]/..]
-++set HOME [file normalize [file dir $infile]]
-++set in [open $infile rb]
-++puts [subst {/* DO NOT EDIT
-++**
-++** This file was generated by \"$argv0 $infile\".
-++** To make changes, edit $infile then rerun the generator
-++** command.
-++*/}]
-++set instr 0
-++while {1} {
-++  set line [gets $in]
-++  if {[eof $in]} break
-++  if {[regexp {^INCLUDE (.*)} $line all path]} {
-++    regsub {^\$ROOT\y} $path $ROOT path
-++    regsub {^\$HOME\y} $path $HOME path
-++    set in2 [open $path rb]
-++    puts "/* INCLUDE $path */"
-++    if {$instr} {
-++      while {1} {
-++        set line [gets $in2]
-++        if {[eof $in2]} break
-++        set x [string map "\\\\ \\\\\\\\ \\\" \\\\\"" $line]
-++        puts "\"$x\\n\""
-++      }
-++    } else {
-++      puts [read $in2]
-++    }
-++    puts "/* END $path */"
-++    close $in2
-++    continue
-++  }
-++  if {[regexp {^BEGIN_STRING} $line]} {
-++    set instr 1
-++    puts "/* BEGIN_STRING */"
-++    continue
-++  }
-++  if {[regexp {^END_STRING} $line]} {
-++    set instr 0
-++    puts "/* END_STRING */"
-++    continue
-++  }
-++  if {$instr} {
-++    set x [string map "\\\\ \\\\\\\\ \\\" \\\\\"" $line]
-++    puts "\"$x\\n\""
-++  } else {
-++    puts $line
-++  }
-++}
-+diff --git a/third_party/sqlite/src/tool/mkopcodeh.tcl b/third_party/sqlite/src/tool/mkopcodeh.tcl
-+index e15c5fa..969d5d5 100644
-+--- a/third_party/sqlite/src/tool/mkopcodeh.tcl
-++++ b/third_party/sqlite/src/tool/mkopcodeh.tcl
-+@@ -202,19 +202,17 @@ for {set i 0} {$i<=$max} {incr i} {
-+   set name $def($i)
-+   puts -nonewline [format {#define %-16s %3d} $name $i]
-+   set com {}
-++  if {$jump($name)} {
-++    lappend com "jump"
-++  }
-+   if {[info exists sameas($i)]} {
-+-    set com "same as $sameas($i)"
-++    lappend com "same as $sameas($i)"
-+   }
-+   if {[info exists synopsis($name)]} {
-+-    set x $synopsis($name)
-+-    if {$com==""} {
-+-      set com "synopsis: $x"
-+-    } else {
-+-      append com ", synopsis: $x"
-+-    }
-++    lappend com "synopsis: $synopsis($name)"
-+   }
-+-  if {$com!=""} {
-+-    puts -nonewline [format " /* %-42s */" $com]
-++  if {[llength $com]} {
-++    puts -nonewline [format " /* %-42s */" [join $com {, }]]
-+   }
-+   puts ""
-+ }
-+diff --git a/third_party/sqlite/src/tool/mkshellc.tcl b/third_party/sqlite/src/tool/mkshellc.tcl
-+index 66f09e8..6974ade 100644
-+--- a/third_party/sqlite/src/tool/mkshellc.tcl
-++++ b/third_party/sqlite/src/tool/mkshellc.tcl
-+@@ -1,11 +1,16 @@
-+ #!/usr/bin/tclsh
-+ #
-+-# Run this script to generate the "src/shell.c" source file from
-++# Run this script to generate the "shell.c" source file from
-+ # constituent parts.
-+ #
-++# No arguments are required.  This script determines the location
-++# of its input files relative to the location of the script itself.
-++# This script should be tool/mkshellc.tcl.  If the directory holding
-++# the script is $DIR, then the component parts are located in $DIR/../src
-++# and $DIR/../ext/misc.
-++#
-+ set topdir [file dir [file dir [file normal $argv0]]]
-+-puts "Overwriting $topdir/src/shell.c with new shell source code..."
-+-set out [open $topdir/src/shell.c wb]
-++set out stdout
-+ puts $out {/* DO NOT EDIT!
-+ ** This file is automatically generated by the script in the canonical
-+ ** SQLite source tree at tool/mkshellc.tcl.  That script combines source
-+@@ -25,8 +30,9 @@ puts $out {/* DO NOT EDIT!
-+ ** by "src/shell.c.in", then rerun the tool/mkshellc.tcl script.
-+ */}
-+ set in [open $topdir/src/shell.c.in rb]
-+-while {![eof $in]} {
-++while {1} {
-+   set lx [gets $in]
-++  if {[eof $in]} break;
-+   if {[regexp {^INCLUDE } $lx]} {
-+     set cfile [lindex $lx 1]
-+     puts $out "/************************* Begin $cfile ******************/"
-+@@ -34,6 +40,7 @@ while {![eof $in]} {
-+     while {![eof $in2]} {
-+       set lx [gets $in2]
-+       if {[regexp {^#include "sqlite} $lx]} continue
-++      set lx [string map [list __declspec(dllexport) {}] $lx]
-+       puts $out $lx
-+     }
-+     close $in2
-+diff --git a/third_party/sqlite/src/tool/mksourceid.c b/third_party/sqlite/src/tool/mksourceid.c
-+new file mode 100644
-+index 0000000..3f4c213
-+--- /dev/null
-++++ b/third_party/sqlite/src/tool/mksourceid.c
-+@@ -0,0 +1,853 @@
-++/*
-++** Run this program with a single argument which is the name of the
-++** Fossil "manifest" file for a project, and this program will emit on
-++** standard output the "source id" for for the program.
-++**
-++** (1)  The "source id" is the date of check-in together with the
-++**      SHA3 hash of the manifest file.
-++**
-++** (2)  All individual file hashes in the manifest are verified.  If any
-++**      source file has changed, the SHA3 hash ends with "modified".
-++**
-++*/
-++#include <stdlib.h>
-++#include <stdio.h>
-++#include <string.h>
-++#include <sys/types.h>
-++#include <ctype.h>
-++
-++/* Portable 64-bit unsigned integers */
-++#if defined(_MSC_VER) || defined(__BORLANDC__)
-++  typedef unsigned __int64 u64;
-++#else
-++  typedef unsigned long long int u64;
-++#endif
-++
-++
-++/*
-++** Macros to determine whether the machine is big or little endian,
-++** and whether or not that determination is run-time or compile-time.
-++**
-++** For best performance, an attempt is made to guess at the byte-order
-++** using C-preprocessor macros.  If that is unsuccessful, or if
-++** -DBYTEORDER=0 is set, then byte-order is determined
-++** at run-time.
-++*/
-++#ifndef BYTEORDER
-++# if defined(i386)     || defined(__i386__)   || defined(_M_IX86) ||    \
-++     defined(__x86_64) || defined(__x86_64__) || defined(_M_X64)  ||    \
-++     defined(_M_AMD64) || defined(_M_ARM)     || defined(__x86)   ||    \
-++     defined(__arm__)
-++#   define BYTEORDER    1234
-++# elif defined(sparc)    || defined(__ppc__)
-++#   define BYTEORDER    4321
-++# else
-++#   define BYTEORDER 0
-++# endif
-++#endif
-++
-++
-++
-++/*
-++** State structure for a SHA3 hash in progress
-++*/
-++typedef struct SHA3Context SHA3Context;
-++struct SHA3Context {
-++  union {
-++    u64 s[25];                /* Keccak state. 5x5 lines of 64 bits each */
-++    unsigned char x[1600];    /* ... or 1600 bytes */
-++  } u;
-++  unsigned nRate;        /* Bytes of input accepted per Keccak iteration */
-++  unsigned nLoaded;      /* Input bytes loaded into u.x[] so far this cycle */
-++  unsigned ixMask;       /* Insert next input into u.x[nLoaded^ixMask]. */
-++};
-++
-++/*
-++** A single step of the Keccak mixing function for a 1600-bit state
-++*/
-++static void KeccakF1600Step(SHA3Context *p){
-++  int i;
-++  u64 B0, B1, B2, B3, B4;
-++  u64 C0, C1, C2, C3, C4;
-++  u64 D0, D1, D2, D3, D4;
-++  static const u64 RC[] = {
-++    0x0000000000000001ULL,  0x0000000000008082ULL,
-++    0x800000000000808aULL,  0x8000000080008000ULL,
-++    0x000000000000808bULL,  0x0000000080000001ULL,
-++    0x8000000080008081ULL,  0x8000000000008009ULL,
-++    0x000000000000008aULL,  0x0000000000000088ULL,
-++    0x0000000080008009ULL,  0x000000008000000aULL,
-++    0x000000008000808bULL,  0x800000000000008bULL,
-++    0x8000000000008089ULL,  0x8000000000008003ULL,
-++    0x8000000000008002ULL,  0x8000000000000080ULL,
-++    0x000000000000800aULL,  0x800000008000000aULL,
-++    0x8000000080008081ULL,  0x8000000000008080ULL,
-++    0x0000000080000001ULL,  0x8000000080008008ULL
-++  };
-++# define A00 (p->u.s[0])
-++# define A01 (p->u.s[1])
-++# define A02 (p->u.s[2])
-++# define A03 (p->u.s[3])
-++# define A04 (p->u.s[4])
-++# define A10 (p->u.s[5])
-++# define A11 (p->u.s[6])
-++# define A12 (p->u.s[7])
-++# define A13 (p->u.s[8])
-++# define A14 (p->u.s[9])
-++# define A20 (p->u.s[10])
-++# define A21 (p->u.s[11])
-++# define A22 (p->u.s[12])
-++# define A23 (p->u.s[13])
-++# define A24 (p->u.s[14])
-++# define A30 (p->u.s[15])
-++# define A31 (p->u.s[16])
-++# define A32 (p->u.s[17])
-++# define A33 (p->u.s[18])
-++# define A34 (p->u.s[19])
-++# define A40 (p->u.s[20])
-++# define A41 (p->u.s[21])
-++# define A42 (p->u.s[22])
-++# define A43 (p->u.s[23])
-++# define A44 (p->u.s[24])
-++# define ROL64(a,x) ((a<<x)|(a>>(64-x)))
-++
-++  for(i=0; i<24; i+=4){
-++    C0 = A00^A10^A20^A30^A40;
-++    C1 = A01^A11^A21^A31^A41;
-++    C2 = A02^A12^A22^A32^A42;
-++    C3 = A03^A13^A23^A33^A43;
-++    C4 = A04^A14^A24^A34^A44;
-++    D0 = C4^ROL64(C1, 1);
-++    D1 = C0^ROL64(C2, 1);
-++    D2 = C1^ROL64(C3, 1);
-++    D3 = C2^ROL64(C4, 1);
-++    D4 = C3^ROL64(C0, 1);
-++
-++    B0 = (A00^D0);
-++    B1 = ROL64((A11^D1), 44);
-++    B2 = ROL64((A22^D2), 43);
-++    B3 = ROL64((A33^D3), 21);
-++    B4 = ROL64((A44^D4), 14);
-++    A00 =   B0 ^((~B1)&  B2 );
-++    A00 ^= RC[i];
-++    A11 =   B1 ^((~B2)&  B3 );
-++    A22 =   B2 ^((~B3)&  B4 );
-++    A33 =   B3 ^((~B4)&  B0 );
-++    A44 =   B4 ^((~B0)&  B1 );
-++
-++    B2 = ROL64((A20^D0), 3);
-++    B3 = ROL64((A31^D1), 45);
-++    B4 = ROL64((A42^D2), 61);
-++    B0 = ROL64((A03^D3), 28);
-++    B1 = ROL64((A14^D4), 20);
-++    A20 =   B0 ^((~B1)&  B2 );
-++    A31 =   B1 ^((~B2)&  B3 );
-++    A42 =   B2 ^((~B3)&  B4 );
-++    A03 =   B3 ^((~B4)&  B0 );
-++    A14 =   B4 ^((~B0)&  B1 );
-++
-++    B4 = ROL64((A40^D0), 18);
-++    B0 = ROL64((A01^D1), 1);
-++    B1 = ROL64((A12^D2), 6);
-++    B2 = ROL64((A23^D3), 25);
-++    B3 = ROL64((A34^D4), 8);
-++    A40 =   B0 ^((~B1)&  B2 );
-++    A01 =   B1 ^((~B2)&  B3 );
-++    A12 =   B2 ^((~B3)&  B4 );
-++    A23 =   B3 ^((~B4)&  B0 );
-++    A34 =   B4 ^((~B0)&  B1 );
-++
-++    B1 = ROL64((A10^D0), 36);
-++    B2 = ROL64((A21^D1), 10);
-++    B3 = ROL64((A32^D2), 15);
-++    B4 = ROL64((A43^D3), 56);
-++    B0 = ROL64((A04^D4), 27);
-++    A10 =   B0 ^((~B1)&  B2 );
-++    A21 =   B1 ^((~B2)&  B3 );
-++    A32 =   B2 ^((~B3)&  B4 );
-++    A43 =   B3 ^((~B4)&  B0 );
-++    A04 =   B4 ^((~B0)&  B1 );
-++
-++    B3 = ROL64((A30^D0), 41);
-++    B4 = ROL64((A41^D1), 2);
-++    B0 = ROL64((A02^D2), 62);
-++    B1 = ROL64((A13^D3), 55);
-++    B2 = ROL64((A24^D4), 39);
-++    A30 =   B0 ^((~B1)&  B2 );
-++    A41 =   B1 ^((~B2)&  B3 );
-++    A02 =   B2 ^((~B3)&  B4 );
-++    A13 =   B3 ^((~B4)&  B0 );
-++    A24 =   B4 ^((~B0)&  B1 );
-++
-++    C0 = A00^A20^A40^A10^A30;
-++    C1 = A11^A31^A01^A21^A41;
-++    C2 = A22^A42^A12^A32^A02;
-++    C3 = A33^A03^A23^A43^A13;
-++    C4 = A44^A14^A34^A04^A24;
-++    D0 = C4^ROL64(C1, 1);
-++    D1 = C0^ROL64(C2, 1);
-++    D2 = C1^ROL64(C3, 1);
-++    D3 = C2^ROL64(C4, 1);
-++    D4 = C3^ROL64(C0, 1);
-++
-++    B0 = (A00^D0);
-++    B1 = ROL64((A31^D1), 44);
-++    B2 = ROL64((A12^D2), 43);
-++    B3 = ROL64((A43^D3), 21);
-++    B4 = ROL64((A24^D4), 14);
-++    A00 =   B0 ^((~B1)&  B2 );
-++    A00 ^= RC[i+1];
-++    A31 =   B1 ^((~B2)&  B3 );
-++    A12 =   B2 ^((~B3)&  B4 );
-++    A43 =   B3 ^((~B4)&  B0 );
-++    A24 =   B4 ^((~B0)&  B1 );
-++
-++    B2 = ROL64((A40^D0), 3);
-++    B3 = ROL64((A21^D1), 45);
-++    B4 = ROL64((A02^D2), 61);
-++    B0 = ROL64((A33^D3), 28);
-++    B1 = ROL64((A14^D4), 20);
-++    A40 =   B0 ^((~B1)&  B2 );
-++    A21 =   B1 ^((~B2)&  B3 );
-++    A02 =   B2 ^((~B3)&  B4 );
-++    A33 =   B3 ^((~B4)&  B0 );
-++    A14 =   B4 ^((~B0)&  B1 );
-++
-++    B4 = ROL64((A30^D0), 18);
-++    B0 = ROL64((A11^D1), 1);
-++    B1 = ROL64((A42^D2), 6);
-++    B2 = ROL64((A23^D3), 25);
-++    B3 = ROL64((A04^D4), 8);
-++    A30 =   B0 ^((~B1)&  B2 );
-++    A11 =   B1 ^((~B2)&  B3 );
-++    A42 =   B2 ^((~B3)&  B4 );
-++    A23 =   B3 ^((~B4)&  B0 );
-++    A04 =   B4 ^((~B0)&  B1 );
-++
-++    B1 = ROL64((A20^D0), 36);
-++    B2 = ROL64((A01^D1), 10);
-++    B3 = ROL64((A32^D2), 15);
-++    B4 = ROL64((A13^D3), 56);
-++    B0 = ROL64((A44^D4), 27);
-++    A20 =   B0 ^((~B1)&  B2 );
-++    A01 =   B1 ^((~B2)&  B3 );
-++    A32 =   B2 ^((~B3)&  B4 );
-++    A13 =   B3 ^((~B4)&  B0 );
-++    A44 =   B4 ^((~B0)&  B1 );
-++
-++    B3 = ROL64((A10^D0), 41);
-++    B4 = ROL64((A41^D1), 2);
-++    B0 = ROL64((A22^D2), 62);
-++    B1 = ROL64((A03^D3), 55);
-++    B2 = ROL64((A34^D4), 39);
-++    A10 =   B0 ^((~B1)&  B2 );
-++    A41 =   B1 ^((~B2)&  B3 );
-++    A22 =   B2 ^((~B3)&  B4 );
-++    A03 =   B3 ^((~B4)&  B0 );
-++    A34 =   B4 ^((~B0)&  B1 );
-++
-++    C0 = A00^A40^A30^A20^A10;
-++    C1 = A31^A21^A11^A01^A41;
-++    C2 = A12^A02^A42^A32^A22;
-++    C3 = A43^A33^A23^A13^A03;
-++    C4 = A24^A14^A04^A44^A34;
-++    D0 = C4^ROL64(C1, 1);
-++    D1 = C0^ROL64(C2, 1);
-++    D2 = C1^ROL64(C3, 1);
-++    D3 = C2^ROL64(C4, 1);
-++    D4 = C3^ROL64(C0, 1);
-++
-++    B0 = (A00^D0);
-++    B1 = ROL64((A21^D1), 44);
-++    B2 = ROL64((A42^D2), 43);
-++    B3 = ROL64((A13^D3), 21);
-++    B4 = ROL64((A34^D4), 14);
-++    A00 =   B0 ^((~B1)&  B2 );
-++    A00 ^= RC[i+2];
-++    A21 =   B1 ^((~B2)&  B3 );
-++    A42 =   B2 ^((~B3)&  B4 );
-++    A13 =   B3 ^((~B4)&  B0 );
-++    A34 =   B4 ^((~B0)&  B1 );
-++
-++    B2 = ROL64((A30^D0), 3);
-++    B3 = ROL64((A01^D1), 45);
-++    B4 = ROL64((A22^D2), 61);
-++    B0 = ROL64((A43^D3), 28);
-++    B1 = ROL64((A14^D4), 20);
-++    A30 =   B0 ^((~B1)&  B2 );
-++    A01 =   B1 ^((~B2)&  B3 );
-++    A22 =   B2 ^((~B3)&  B4 );
-++    A43 =   B3 ^((~B4)&  B0 );
-++    A14 =   B4 ^((~B0)&  B1 );
-++
-++    B4 = ROL64((A10^D0), 18);
-++    B0 = ROL64((A31^D1), 1);
-++    B1 = ROL64((A02^D2), 6);
-++    B2 = ROL64((A23^D3), 25);
-++    B3 = ROL64((A44^D4), 8);
-++    A10 =   B0 ^((~B1)&  B2 );
-++    A31 =   B1 ^((~B2)&  B3 );
-++    A02 =   B2 ^((~B3)&  B4 );
-++    A23 =   B3 ^((~B4)&  B0 );
-++    A44 =   B4 ^((~B0)&  B1 );
-++
-++    B1 = ROL64((A40^D0), 36);
-++    B2 = ROL64((A11^D1), 10);
-++    B3 = ROL64((A32^D2), 15);
-++    B4 = ROL64((A03^D3), 56);
-++    B0 = ROL64((A24^D4), 27);
-++    A40 =   B0 ^((~B1)&  B2 );
-++    A11 =   B1 ^((~B2)&  B3 );
-++    A32 =   B2 ^((~B3)&  B4 );
-++    A03 =   B3 ^((~B4)&  B0 );
-++    A24 =   B4 ^((~B0)&  B1 );
-++
-++    B3 = ROL64((A20^D0), 41);
-++    B4 = ROL64((A41^D1), 2);
-++    B0 = ROL64((A12^D2), 62);
-++    B1 = ROL64((A33^D3), 55);
-++    B2 = ROL64((A04^D4), 39);
-++    A20 =   B0 ^((~B1)&  B2 );
-++    A41 =   B1 ^((~B2)&  B3 );
-++    A12 =   B2 ^((~B3)&  B4 );
-++    A33 =   B3 ^((~B4)&  B0 );
-++    A04 =   B4 ^((~B0)&  B1 );
-++
-++    C0 = A00^A30^A10^A40^A20;
-++    C1 = A21^A01^A31^A11^A41;
-++    C2 = A42^A22^A02^A32^A12;
-++    C3 = A13^A43^A23^A03^A33;
-++    C4 = A34^A14^A44^A24^A04;
-++    D0 = C4^ROL64(C1, 1);
-++    D1 = C0^ROL64(C2, 1);
-++    D2 = C1^ROL64(C3, 1);
-++    D3 = C2^ROL64(C4, 1);
-++    D4 = C3^ROL64(C0, 1);
-++
-++    B0 = (A00^D0);
-++    B1 = ROL64((A01^D1), 44);
-++    B2 = ROL64((A02^D2), 43);
-++    B3 = ROL64((A03^D3), 21);
-++    B4 = ROL64((A04^D4), 14);
-++    A00 =   B0 ^((~B1)&  B2 );
-++    A00 ^= RC[i+3];
-++    A01 =   B1 ^((~B2)&  B3 );
-++    A02 =   B2 ^((~B3)&  B4 );
-++    A03 =   B3 ^((~B4)&  B0 );
-++    A04 =   B4 ^((~B0)&  B1 );
-++
-++    B2 = ROL64((A10^D0), 3);
-++    B3 = ROL64((A11^D1), 45);
-++    B4 = ROL64((A12^D2), 61);
-++    B0 = ROL64((A13^D3), 28);
-++    B1 = ROL64((A14^D4), 20);
-++    A10 =   B0 ^((~B1)&  B2 );
-++    A11 =   B1 ^((~B2)&  B3 );
-++    A12 =   B2 ^((~B3)&  B4 );
-++    A13 =   B3 ^((~B4)&  B0 );
-++    A14 =   B4 ^((~B0)&  B1 );
-++
-++    B4 = ROL64((A20^D0), 18);
-++    B0 = ROL64((A21^D1), 1);
-++    B1 = ROL64((A22^D2), 6);
-++    B2 = ROL64((A23^D3), 25);
-++    B3 = ROL64((A24^D4), 8);
-++    A20 =   B0 ^((~B1)&  B2 );
-++    A21 =   B1 ^((~B2)&  B3 );
-++    A22 =   B2 ^((~B3)&  B4 );
-++    A23 =   B3 ^((~B4)&  B0 );
-++    A24 =   B4 ^((~B0)&  B1 );
-++
-++    B1 = ROL64((A30^D0), 36);
-++    B2 = ROL64((A31^D1), 10);
-++    B3 = ROL64((A32^D2), 15);
-++    B4 = ROL64((A33^D3), 56);
-++    B0 = ROL64((A34^D4), 27);
-++    A30 =   B0 ^((~B1)&  B2 );
-++    A31 =   B1 ^((~B2)&  B3 );
-++    A32 =   B2 ^((~B3)&  B4 );
-++    A33 =   B3 ^((~B4)&  B0 );
-++    A34 =   B4 ^((~B0)&  B1 );
-++
-++    B3 = ROL64((A40^D0), 41);
-++    B4 = ROL64((A41^D1), 2);
-++    B0 = ROL64((A42^D2), 62);
-++    B1 = ROL64((A43^D3), 55);
-++    B2 = ROL64((A44^D4), 39);
-++    A40 =   B0 ^((~B1)&  B2 );
-++    A41 =   B1 ^((~B2)&  B3 );
-++    A42 =   B2 ^((~B3)&  B4 );
-++    A43 =   B3 ^((~B4)&  B0 );
-++    A44 =   B4 ^((~B0)&  B1 );
-++  }
-++}
-++
-++/*
-++** Initialize a new hash.  iSize determines the size of the hash
-++** in bits and should be one of 224, 256, 384, or 512.  Or iSize
-++** can be zero to use the default hash size of 256 bits.
-++*/
-++static void SHA3Init(SHA3Context *p, int iSize){
-++  memset(p, 0, sizeof(*p));
-++  if( iSize>=128 && iSize<=512 ){
-++    p->nRate = (1600 - ((iSize + 31)&~31)*2)/8;
-++  }else{
-++    p->nRate = (1600 - 2*256)/8;
-++  }
-++#if BYTEORDER==1234
-++  /* Known to be little-endian at compile-time. No-op */
-++#elif BYTEORDER==4321
-++  p->ixMask = 7;  /* Big-endian */
-++#else
-++  {
-++    static unsigned int one = 1;
-++    if( 1==*(unsigned char*)&one ){
-++      /* Little endian.  No byte swapping. */
-++      p->ixMask = 0;
-++    }else{
-++      /* Big endian.  Byte swap. */
-++      p->ixMask = 7;
-++    }
-++  }
-++#endif
-++}
-++
-++/*
-++** Make consecutive calls to the SHA3Update function to add new content
-++** to the hash
-++*/
-++static void SHA3Update(
-++  SHA3Context *p,
-++  const unsigned char *aData,
-++  unsigned int nData
-++){
-++  unsigned int i = 0;
-++#if BYTEORDER==1234
-++  if( (p->nLoaded % 8)==0 && ((aData - (const unsigned char*)0)&7)==0 ){
-++    for(; i+7<nData; i+=8){
-++      p->u.s[p->nLoaded/8] ^= *(u64*)&aData[i];
-++      p->nLoaded += 8;
-++      if( p->nLoaded>=p->nRate ){
-++        KeccakF1600Step(p);
-++        p->nLoaded = 0;
-++      }
-++    }
-++  }
-++#endif
-++  for(; i<nData; i++){
-++#if BYTEORDER==1234
-++    p->u.x[p->nLoaded] ^= aData[i];
-++#elif BYTEORDER==4321
-++    p->u.x[p->nLoaded^0x07] ^= aData[i];
-++#else
-++    p->u.x[p->nLoaded^p->ixMask] ^= aData[i];
-++#endif
-++    p->nLoaded++;
-++    if( p->nLoaded==p->nRate ){
-++      KeccakF1600Step(p);
-++      p->nLoaded = 0;
-++    }
-++  }
-++}
-++
-++/*
-++** After all content has been added, invoke SHA3Final() to compute
-++** the final hash.  The function returns a pointer to the binary
-++** hash value.
-++*/
-++static unsigned char *SHA3Final(SHA3Context *p){
-++  unsigned int i;
-++  if( p->nLoaded==p->nRate-1 ){
-++    const unsigned char c1 = 0x86;
-++    SHA3Update(p, &c1, 1);
-++  }else{
-++    const unsigned char c2 = 0x06;
-++    const unsigned char c3 = 0x80;
-++    SHA3Update(p, &c2, 1);
-++    p->nLoaded = p->nRate - 1;
-++    SHA3Update(p, &c3, 1);
-++  }
-++  for(i=0; i<p->nRate; i++){
-++    p->u.x[i+p->nRate] = p->u.x[i^p->ixMask];
-++  }
-++  return &p->u.x[p->nRate];
-++}
-++
-++/*
-++** Convert a digest into base-16.  digest should be declared as
-++** "unsigned char digest[20]" in the calling function.  The SHA3
-++** digest is stored in the first 20 bytes.  zBuf should
-++** be "char zBuf[41]".
-++*/
-++static void DigestToBase16(unsigned char *digest, char *zBuf, int nByte){
-++  static const char zEncode[] = "0123456789abcdef";
-++  int ix;
-++
-++  for(ix=0; ix<nByte; ix++){
-++    *zBuf++ = zEncode[(*digest>>4)&0xf];
-++    *zBuf++ = zEncode[*digest++ & 0xf];
-++  }
-++  *zBuf = '\0';
-++}
-++
-++
-++/*
-++** Compute the SHA3 checksum of a file on disk.  Store the resulting
-++** checksum in the blob pCksum.  pCksum is assumed to be initialized.
-++**
-++** Return the number of errors.
-++*/
-++static int sha3sum_file(const char *zFilename, int iSize, char *pCksum){
-++  FILE *in;
-++  SHA3Context ctx;
-++  char zBuf[10240];
-++
-++  in = fopen(zFilename,"rb");
-++  if( in==0 ){
-++    return 1;
-++  }
-++  SHA3Init(&ctx, iSize);
-++  for(;;){
-++    int n = (int)fread(zBuf, 1, sizeof(zBuf), in);
-++    if( n<=0 ) break;
-++    SHA3Update(&ctx, (unsigned char*)zBuf, (unsigned)n);
-++  }
-++  fclose(in);
-++  DigestToBase16(SHA3Final(&ctx), pCksum, iSize/8);
-++  return 0;
-++}
-++
-++/*
-++** The SHA1 implementation below is adapted from:
-++**
-++**  $NetBSD: sha1.c,v 1.6 2009/11/06 20:31:18 joerg Exp $
-++**  $OpenBSD: sha1.c,v 1.9 1997/07/23 21:12:32 kstailey Exp $
-++**
-++** SHA-1 in C
-++** By Steve Reid <steve@edmweb.com>
-++** 100% Public Domain
-++*/
-++typedef struct SHA1Context SHA1Context;
-++struct SHA1Context {
-++  unsigned int state[5];
-++  unsigned int count[2];
-++  unsigned char buffer[64];
-++};
-++
-++/*
-++ * blk0() and blk() perform the initial expand.
-++ * I got the idea of expanding during the round function from SSLeay
-++ *
-++ * blk0le() for little-endian and blk0be() for big-endian.
-++ */
-++#if __GNUC__ && (defined(__i386__) || defined(__x86_64__))
-++/*
-++ * GCC by itself only generates left rotates.  Use right rotates if
-++ * possible to be kinder to dinky implementations with iterative rotate
-++ * instructions.
-++ */
-++#define SHA_ROT(op, x, k) \
-++        ({ unsigned int y; asm(op " %1,%0" : "=r" (y) : "I" (k), "0" (x)); y; })
-++#define rol(x,k) SHA_ROT("roll", x, k)
-++#define ror(x,k) SHA_ROT("rorl", x, k)
-++
-++#else
-++/* Generic C equivalent */
-++#define SHA_ROT(x,l,r) ((x) << (l) | (x) >> (r))
-++#define rol(x,k) SHA_ROT(x,k,32-(k))
-++#define ror(x,k) SHA_ROT(x,32-(k),k)
-++#endif
-++
-++
-++
-++
-++
-++#define blk0le(i) (block[i] = (ror(block[i],8)&0xFF00FF00) \
-++    |(rol(block[i],8)&0x00FF00FF))
-++#define blk0be(i) block[i]
-++#define blk(i) (block[i&15] = rol(block[(i+13)&15]^block[(i+8)&15] \
-++    ^block[(i+2)&15]^block[i&15],1))
-++
-++/*
-++ * (R0+R1), R2, R3, R4 are the different operations (rounds) used in SHA1
-++ *
-++ * Rl0() for little-endian and Rb0() for big-endian.  Endianness is
-++ * determined at run-time.
-++ */
-++#define Rl0(v,w,x,y,z,i) \
-++    z+=((w&(x^y))^y)+blk0le(i)+0x5A827999+rol(v,5);w=ror(w,2);
-++#define Rb0(v,w,x,y,z,i) \
-++    z+=((w&(x^y))^y)+blk0be(i)+0x5A827999+rol(v,5);w=ror(w,2);
-++#define R1(v,w,x,y,z,i) \
-++    z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5);w=ror(w,2);
-++#define R2(v,w,x,y,z,i) \
-++    z+=(w^x^y)+blk(i)+0x6ED9EBA1+rol(v,5);w=ror(w,2);
-++#define R3(v,w,x,y,z,i) \
-++    z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=ror(w,2);
-++#define R4(v,w,x,y,z,i) \
-++    z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=ror(w,2);
-++
-++/*
-++ * Hash a single 512-bit block. This is the core of the algorithm.
-++ */
-++#define a qq[0]
-++#define b qq[1]
-++#define c qq[2]
-++#define d qq[3]
-++#define e qq[4]
-++
-++static void SHA1Transform(
-++  unsigned int state[5],
-++  const unsigned char buffer[64]
-++){
-++  unsigned int qq[5]; /* a, b, c, d, e; */
-++  static int one = 1;
-++  unsigned int block[16];
-++  memcpy(block, buffer, 64);
-++  memcpy(qq,state,5*sizeof(unsigned int));
-++
-++  /* Copy context->state[] to working vars */
-++  /*
-++  a = state[0];
-++  b = state[1];
-++  c = state[2];
-++  d = state[3];
-++  e = state[4];
-++  */
-++
-++  /* 4 rounds of 20 operations each. Loop unrolled. */
-++  if( 1 == *(unsigned char*)&one ){
-++    Rl0(a,b,c,d,e, 0); Rl0(e,a,b,c,d, 1); Rl0(d,e,a,b,c, 2); Rl0(c,d,e,a,b, 3);
-++    Rl0(b,c,d,e,a, 4); Rl0(a,b,c,d,e, 5); Rl0(e,a,b,c,d, 6); Rl0(d,e,a,b,c, 7);
-++    Rl0(c,d,e,a,b, 8); Rl0(b,c,d,e,a, 9); Rl0(a,b,c,d,e,10); Rl0(e,a,b,c,d,11);
-++    Rl0(d,e,a,b,c,12); Rl0(c,d,e,a,b,13); Rl0(b,c,d,e,a,14); Rl0(a,b,c,d,e,15);
-++  }else{
-++    Rb0(a,b,c,d,e, 0); Rb0(e,a,b,c,d, 1); Rb0(d,e,a,b,c, 2); Rb0(c,d,e,a,b, 3);
-++    Rb0(b,c,d,e,a, 4); Rb0(a,b,c,d,e, 5); Rb0(e,a,b,c,d, 6); Rb0(d,e,a,b,c, 7);
-++    Rb0(c,d,e,a,b, 8); Rb0(b,c,d,e,a, 9); Rb0(a,b,c,d,e,10); Rb0(e,a,b,c,d,11);
-++    Rb0(d,e,a,b,c,12); Rb0(c,d,e,a,b,13); Rb0(b,c,d,e,a,14); Rb0(a,b,c,d,e,15);
-++  }
-++  R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19);
-++  R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23);
-++  R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27);
-++  R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31);
-++  R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35);
-++  R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39);
-++  R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43);
-++  R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47);
-++  R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51);
-++  R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55);
-++  R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59);
-++  R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63);
-++  R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67);
-++  R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
-++  R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
-++  R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
-++
-++  /* Add the working vars back into context.state[] */
-++  state[0] += a;
-++  state[1] += b;
-++  state[2] += c;
-++  state[3] += d;
-++  state[4] += e;
-++}
-++
-++
-++/*
-++ * SHA1Init - Initialize new context
-++ */
-++static void SHA1Init(SHA1Context *context){
-++    /* SHA1 initialization constants */
-++    context->state[0] = 0x67452301;
-++    context->state[1] = 0xEFCDAB89;
-++    context->state[2] = 0x98BADCFE;
-++    context->state[3] = 0x10325476;
-++    context->state[4] = 0xC3D2E1F0;
-++    context->count[0] = context->count[1] = 0;
-++}
-++
-++
-++/*
-++ * Run your data through this.
-++ */
-++static void SHA1Update(
-++  SHA1Context *context,
-++  const unsigned char *data,
-++  unsigned int len
-++){
-++    unsigned int i, j;
-++
-++    j = context->count[0];
-++    if ((context->count[0] += len << 3) < j)
-++        context->count[1] += (len>>29)+1;
-++    j = (j >> 3) & 63;
-++    if ((j + len) > 63) {
-++        (void)memcpy(&context->buffer[j], data, (i = 64-j));
-++        SHA1Transform(context->state, context->buffer);
-++        for ( ; i + 63 < len; i += 64)
-++            SHA1Transform(context->state, &data[i]);
-++        j = 0;
-++    } else {
-++        i = 0;
-++    }
-++    (void)memcpy(&context->buffer[j], &data[i], len - i);
-++}
-++
-++
-++/*
-++ * Add padding and return the message digest.
-++ */
-++static void SHA1Final(unsigned char *digest, SHA1Context *context){
-++    unsigned int i;
-++    unsigned char finalcount[8];
-++
-++    for (i = 0; i < 8; i++) {
-++        finalcount[i] = (unsigned char)((context->count[(i >= 4 ? 0 : 1)]
-++         >> ((3-(i & 3)) * 8) ) & 255); /* Endian independent */
-++    }
-++    SHA1Update(context, (const unsigned char *)"\200", 1);
-++    while ((context->count[0] & 504) != 448)
-++        SHA1Update(context, (const unsigned char *)"\0", 1);
-++    SHA1Update(context, finalcount, 8);  /* Should cause a SHA1Transform() */
-++
-++    if (digest) {
-++        for (i = 0; i < 20; i++)
-++            digest[i] = (unsigned char)
-++                ((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255);
-++    }
-++}
-++
-++
-++/*
-++** Compute the SHA1 checksum of a file on disk.  Store the resulting
-++** checksum in the blob pCksum.  pCksum is assumed to be initialized.
-++**
-++** Return the number of errors.
-++*/
-++static int sha1sum_file(const char *zFilename, char *pCksum){
-++  FILE *in;
-++  SHA1Context ctx;
-++  unsigned char zResult[20];
-++  char zBuf[10240];
-++
-++  in = fopen(zFilename,"rb");
-++  if( in==0 ){
-++    return 1;
-++  }
-++  SHA1Init(&ctx);
-++  for(;;){
-++    int n = (int)fread(zBuf, 1, sizeof(zBuf), in);
-++    if( n<=0 ) break;
-++    SHA1Update(&ctx, (unsigned char*)zBuf, (unsigned)n);
-++  }
-++  fclose(in);
-++  SHA1Final(zResult, &ctx);
-++  DigestToBase16(zResult, pCksum, 20);
-++  return 0;
-++}
-++
-++/*
-++** Print a usage comment and quit.
-++*/
-++static void usage(const char *argv0){
-++  fprintf(stderr,
-++     "Usage: %s manifest\n"
-++     "Options:\n"
-++     "   -v  Diagnostic output\n"
-++     , argv0);
-++  exit(1);
-++}
-++
-++/*
-++** Find the first whitespace character in a string.  Set that whitespace
-++** to a \000 terminator and return a pointer to the next character.
-++*/
-++static char *nextToken(char *z){
-++  while( *z && !isspace(*z) ) z++;
-++  if( *z==0 ) return z;
-++  *z = 0;
-++  return &z[1];
-++}
-++
-++
-++int main(int argc, char **argv){
-++  const char *zManifest = 0;
-++  int i;
-++  int bVerbose = 0;
-++  FILE *in;
-++  int allValid = 1;
-++  int rc;
-++  SHA3Context ctx;
-++  char zDate[50];
-++  char zHash[100];
-++  char zLine[20000];
-++
-++  for(i=1; i<argc; i++){
-++    const char *z = argv[i];
-++    if( z[0]=='-' ){
-++      if( z[1]=='-' ) z++;
-++      if( strcmp(z, "-v")==0 ){
-++        bVerbose = 1;
-++      }else
-++      {
-++        fprintf(stderr, "unknown option \"%s\"", argv[i]);
-++        exit(1);
-++      }
-++    }else if( zManifest!=0 ){
-++      usage(argv[0]);
-++    }else{
-++      zManifest = z;
-++    }
-++  }
-++  if( zManifest==0 ) usage(argv[0]);
-++  zDate[0] = 0;
-++  in = fopen(zManifest, "rb");
-++  if( in==0 ){
-++    fprintf(stderr, "cannot open \"%s\" for reading\n", zManifest);
-++    exit(1);
-++  }
-++  SHA3Init(&ctx, 256);
-++  while( fgets(zLine, sizeof(zLine), in) ){
-++    if( strncmp(zLine,"# Remove this line", 18)!=0 ){
-++      SHA3Update(&ctx, (unsigned char*)zLine, (unsigned)strlen(zLine));
-++    }
-++    if( strncmp(zLine, "D 20", 4)==0 ){
-++      memcpy(zDate, &zLine[2], 10);
-++      zDate[10] = ' ';
-++      memcpy(&zDate[11], &zLine[13], 8);
-++      zDate[19] = 0;
-++      continue;
-++    }
-++    if( strncmp(zLine, "F ", 2)==0 ){
-++      char *zFilename = &zLine[2];
-++      char *zMHash = nextToken(zFilename);
-++      nextToken(zMHash);
-++      if( strlen(zMHash)==40 ){
-++        rc = sha1sum_file(zFilename, zHash);
-++      }else{
-++        rc = sha3sum_file(zFilename, 256, zHash);
-++      }
-++      if( rc ){
-++        allValid = 0;
-++        if( bVerbose ){
-++          printf("hash failed: %s\n", zFilename);
-++        }
-++      }else if( strcmp(zHash, zMHash)!=0 ){
-++        allValid = 0;
-++        if( bVerbose ){
-++          printf("wrong hash: %s\n", zFilename);
-++          printf("... expected: %s\n", zMHash);
-++          printf("... got:      %s\n", zHash);
-++        }
-++      }
-++    }
-++  }
-++  fclose(in);
-++  DigestToBase16(SHA3Final(&ctx), zHash, 256/8);
-++  if( !allValid ){
-++    printf("%s %.60salt1\n", zDate, zHash);
-++  }else{
-++    printf("%s %s\n", zDate, zHash);
-++  }
-++  return 0;
-++}
-+diff --git a/third_party/sqlite/src/tool/mksqlite3c.tcl b/third_party/sqlite/src/tool/mksqlite3c.tcl
-+index 596787d4..8ea3e81 100644
-+--- a/third_party/sqlite/src/tool/mksqlite3c.tcl
-++++ b/third_party/sqlite/src/tool/mksqlite3c.tcl
-+@@ -224,6 +224,8 @@ proc copy_file {filename} {
-+       if {![info exists varonly_hdr($tail)]
-+        && [regexp $declpattern $line all rettype funcname rest]} {
-+         regsub {^SQLITE_API } $line {} line
-++        regsub {^SQLITE_API } $rettype {} rettype
-++
-+         # Add the SQLITE_PRIVATE or SQLITE_API keyword before functions.
-+         # so that linkage can be modified at compile-time.
-+         if {[regexp {^sqlite3[a-z]*_} $funcname]} {
-+@@ -240,7 +242,13 @@ proc copy_file {filename} {
-+             }
-+           }
-+           append line $funcname $rest
-+-          puts $out $line
-++          if {$funcname=="sqlite3_sourceid" && !$linemacros} {
-++            # The sqlite3_sourceid() routine is synthesized at the end of
-++            # the amalgamation
-++            puts $out "/* $line */"
-++          } else {
-++            puts $out $line
-++          }
-+         } else {
-+           puts $out "SQLITE_PRIVATE $line"
-+         }
-+@@ -386,6 +394,7 @@ foreach file {
-+    fts3_icu.c
-+    sqlite3rbu.c
-+    dbstat.c
-++   dbpage.c
-+    sqlite3session.c
-+    json1.c
-+    fts5.c
-+@@ -394,4 +403,34 @@ foreach file {
-+   copy_file tsrc/$file
-+ }
-+ 
-++# Synthesize an alternative sqlite3_sourceid() implementation that
-++# that tries to detects changes in the amalgamation source text
-++# and modify returns a modified source-id if changes are detected.
-++#
-++# The only detection mechanism we have is the __LINE__ macro.  So only
-++# edits that changes the number of lines of source code are detected.
-++#
-++if {!$linemacros} {
-++  flush $out
-++  set in2 [open sqlite3.c]
-++  set cnt 0
-++  set oldsrcid {}
-++  while {![eof $in2]} {
-++    incr cnt
-++    gets $in2 line
-++    if {[regexp {^#define SQLITE_SOURCE_ID } $line]} {set oldsrcid $line}
-++  }
-++  close $in2
-++  regsub {[0-9a-flt]{4}"} $oldsrcid {alt2"} oldsrcid
-++  puts $out \
-++"#if __LINE__!=[expr {$cnt+0}]
-++#undef SQLITE_SOURCE_ID
-++$oldsrcid
-++#endif
-++/* Return the source-id for this library */
-++SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }"
-++}
-++puts $out \
-++"/************************** End of sqlite3.c ******************************/"
-++
-+ close $out
-+diff --git a/third_party/sqlite/src/tool/mksqlite3h.tcl b/third_party/sqlite/src/tool/mksqlite3h.tcl
-+index 5106a83..5b4c48b 100644
-+--- a/third_party/sqlite/src/tool/mksqlite3h.tcl
-++++ b/third_party/sqlite/src/tool/mksqlite3h.tcl
-+@@ -51,24 +51,12 @@ set zVersion [string trim [read $in]]
-+ close $in
-+ set nVersion [eval format "%d%03d%03d" [split $zVersion .]]
-+ 
-+-# Get the fossil-scm version number from $TOP/manifest.uuid.
-++# Get the source-id
-+ #
-+-set in [open $TOP/manifest.uuid]
-+-set zUuid [string trim [read $in]]
-+-close $in
-+-
-+-# Get the fossil-scm check-in date from the "D" card of $TOP/manifest.
-+-#
-+-set in [open $TOP/manifest]
-+-set zDate {}
-+-while {![eof $in]} {
-+-  set line [gets $in]
-+-  if {[regexp {^D (2[-0-9T:]+)} $line all date]} {
-+-    set zDate [string map {T { }} $date]
-+-    break
-+-  }
-+-}
-+-close $in
-++set PWD [pwd]
-++cd $TOP
-++set zSourceId [exec $PWD/mksourceid manifest]
-++cd $PWD
-+ 
-+ # Set up patterns for recognizing API declarations.
-+ #
-+@@ -125,7 +113,7 @@ foreach file $filelist {
-+ 
-+     regsub -- --VERS--           $line $zVersion line
-+     regsub -- --VERSION-NUMBER-- $line $nVersion line
-+-    regsub -- --SOURCE-ID--      $line "$zDate $zUuid" line
-++    regsub -- --SOURCE-ID--      $line "$zSourceId" line
-+ 
-+     if {[regexp $varpattern $line] && ![regexp {^ *typedef} $line]} {
-+       set line "SQLITE_API $line"
-+diff --git a/third_party/sqlite/src/tool/speed-check.sh b/third_party/sqlite/src/tool/speed-check.sh
-+index 22adec5..be79a1a 100644
-+--- a/third_party/sqlite/src/tool/speed-check.sh
-++++ b/third_party/sqlite/src/tool/speed-check.sh
-+@@ -29,13 +29,14 @@ SIZE=5
-+ LEAN_OPTS="-DSQLITE_THREADSAFE=0"
-+ LEAN_OPTS="$LEAN_OPTS -DSQLITE_DEFAULT_MEMSTATUS=0"
-+ LEAN_OPTS="$LEAN_OPTS -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1"
-+-LEAN_OPTS="$LEAN_OPTS -DSQLITE_LIKE_DOESNT_MATCH_BLOB"
-++LEAN_OPTS="$LEAN_OPTS -DSQLITE_LIKE_DOESNT_MATCH_BLOBS"
-+ LEAN_OPTS="$LEAN_OPTS -DSQLITE_MAX_EXPR_DEPTH=0"
-+ LEAN_OPTS="$LEAN_OPTS -DSQLITE_OMIT_DECLTYPE"
-+ LEAN_OPTS="$LEAN_OPTS -DSQLITE_OMIT_DEPRECATED"
-+ LEAN_OPTS="$LEAN_OPTS -DSQLITE_OMIT_PROGRESS_CALLBACK"
-+ LEAN_OPTS="$LEAN_OPTS -DSQLITE_OMIT_SHARED_CACHE"
-+ LEAN_OPTS="$LEAN_OPTS -DSQLITE_USE_ALLOCA"
-++BASELINE="trunk"
-+ doExplain=0
-+ doCachegrind=1
-+ while test "$1" != ""; do
-+@@ -116,9 +117,12 @@ while test "$1" != ""; do
-+     --orm)
-+         SPEEDTEST_OPTS="$SPEEDTEST_OPTS --testset orm"
-+         ;;
-+-    *)
-++    -*)
-+         CC_OPTS="$CC_OPTS $1"
-+         ;;
-++    *)
-++	BASELINE=$1
-++        ;;
-+   esac
-+   shift
-+ done
-+@@ -147,10 +151,12 @@ size sqlite3.o | tee -a summary-$NAME.txt
-+ wc sqlite3.c
-+ if test $doCachegrind -eq 1; then
-+   cg_anno.tcl cachegrind.out.* >cout-$NAME.txt
-++  echo '*****************************************************' >>cout-$NAME.txt
-++  sed 's/^[0-9=-]\{9\}/==00000==/' summary-$NAME.txt >>cout-$NAME.txt
-+ fi
-+ if test $doExplain -eq 1; then
-+   ./speedtest1 --explain $SPEEDTEST_OPTS | ./sqlite3 >explain-$NAME.txt
-+ fi
-+-if test "$NAME" != "trunk"; then
-+-  fossil test-diff --tk -c 20 cout-trunk.txt cout-$NAME.txt
-++if test "$NAME" != "$BASELINE"; then
-++  fossil test-diff --tk -c 20 cout-$BASELINE.txt cout-$NAME.txt
-+ fi
-+diff --git a/third_party/sqlite/src/tool/split-sqlite3c.tcl b/third_party/sqlite/src/tool/split-sqlite3c.tcl
-+index 287b752..230e3f2 100644
-+--- a/third_party/sqlite/src/tool/split-sqlite3c.tcl
-++++ b/third_party/sqlite/src/tool/split-sqlite3c.tcl
-+@@ -15,6 +15,7 @@ set END   {^/\*+ End of %s \*+/}
-+ 
-+ set in [open sqlite3.c]
-+ set out1 [open sqlite3-all.c w]
-++fconfigure $out1 -translation lf
-+ 
-+ # Copy the header from sqlite3.c into sqlite3-all.c
-+ #
-+@@ -48,6 +49,7 @@ proc write_one_file {content} {
-+   global filecnt
-+   incr filecnt
-+   set out [open sqlite3-$filecnt.c w]
-++  fconfigure $out -translation lf
-+   puts -nonewline $out $content
-+   close $out
-+   puts $::out1 "#include \"sqlite3-$filecnt.c\""
-+diff --git a/third_party/sqlite/src/tool/sqlite3_analyzer.c.in b/third_party/sqlite/src/tool/sqlite3_analyzer.c.in
-+new file mode 100644
-+index 0000000..547b22f
-+--- /dev/null
-++++ b/third_party/sqlite/src/tool/sqlite3_analyzer.c.in
-+@@ -0,0 +1,27 @@
-++/*
-++** Read an SQLite database file and analyze its space utilization.  Generate
-++** text on standard output.
-++*/
-++#define TCLSH_INIT_PROC sqlite3_analyzer_init_proc
-++#define SQLITE_ENABLE_DBSTAT_VTAB 1
-++#undef SQLITE_THREADSAFE
-++#define SQLITE_THREADSAFE 0
-++#undef SQLITE_ENABLE_COLUMN_METADATA
-++#define SQLITE_OMIT_DECLTYPE 1
-++#define SQLITE_OMIT_DEPRECATED 1
-++#define SQLITE_OMIT_PROGRESS_CALLBACK 1
-++#define SQLITE_OMIT_SHARED_CACHE 1
-++#define SQLITE_DEFAULT_MEMSTATUS 0
-++#define SQLITE_MAX_EXPR_DEPTH 0
-++#define SQLITE_OMIT_LOAD_EXTENSION 1
-++INCLUDE sqlite3.c
-++INCLUDE $ROOT/src/tclsqlite.c
-++
-++const char *sqlite3_analyzer_init_proc(Tcl_Interp *interp){
-++  (void)interp;
-++  return
-++BEGIN_STRING
-++INCLUDE $ROOT/tool/spaceanal.tcl
-++END_STRING
-++;
-++}
-+diff --git a/third_party/sqlite/src/tool/tostr.tcl b/third_party/sqlite/src/tool/tostr.tcl
-+deleted file mode 100644
-+index cb06ee9..0000000
-+--- a/third_party/sqlite/src/tool/tostr.tcl
-++++ /dev/null
-+@@ -1,12 +0,0 @@
-+-#!/usr/bin/tcl
-+-#
-+-# Convert input text into a C string
-+-#
-+-set in [open [lindex $argv 0] rb]
-+-while {![eof $in]} {
-+-  set line [gets $in]
-+-  if {[eof $in]} break;
-+-  set x [string map "\\\\ \\\\\\\\ \\\" \\\\\"" $line]
-+-  puts "\"$x\\n\""
-+-}
-+-close $in
-+diff --git a/third_party/sqlite/src/tool/warnings-clang.sh b/third_party/sqlite/src/tool/warnings-clang.sh
-+index 8d1e194..b7458d1 100644
-+--- a/third_party/sqlite/src/tool/warnings-clang.sh
-++++ b/third_party/sqlite/src/tool/warnings-clang.sh
-+@@ -3,12 +3,12 @@
-+ # Run this script in a directory with a working makefile to check for
-+ # compiler warnings in SQLite.
-+ #
-+-rm -f sqlite3.c
-+-make sqlite3.c
-++rm -f sqlite3.c shell.c
-++make sqlite3.c shell.c
-+ echo '************* FTS4 and RTREE ****************'
-+ scan-build gcc -c -DHAVE_STDINT_H -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_RTREE \
-+       -DSQLITE_DEBUG -DSQLITE_ENABLE_STAT3 sqlite3.c 2>&1 | grep -v 'ANALYZE:'
-+ echo '********** ENABLE_STAT3. THREADSAFE=0 *******'
-+ scan-build gcc -c -I. -DSQLITE_ENABLE_STAT3 -DSQLITE_THREADSAFE=0 \
-+       -DSQLITE_DEBUG \
-+-      sqlite3.c ../sqlite/src/shell.c -ldl 2>&1 | grep -v 'ANALYZE:'
-++      sqlite3.c shell.c -ldl 2>&1 | grep -v 'ANALYZE:'
-added in remote
-  their  100644 526919b1037ac68dc752e0485345c42166e4202b patches/mips64el/chromium/backport-sqlite-9851f2e.patch
-@@ -0,0 +1,308 @@
-+commit 8715f5df5f531eb997dcc20c1427cabf5a3284ab
-+Author: Victor Costan <pwnall@chromium.org>
-+Date:   Tue Jan 30 06:22:31 2018 +0000
-+
-+    sqlite: Refactor BUILD.gn.
-+    
-+    This CL contains the following refactorings.
-+    
-+    1) The preprocessor defines ("compile-time options" in the SQLite
-+       documentation [1]) used to build the SQLite library bundled with Chromium
-+       are extracted in a "chromium_sqlite3_compile_options" configuration.
-+    
-+    2) The "chromium_sqlite3_compile_options" configuration is injected into
-+       all the targets that depend on //third_party/sqlite (when using
-+       Chromium's bundled SQLite library), so sqlite.h is parsed with the
-+       same preprocessor defines used to compile the library. This will
-+       become important when we start disabling the SQLite features we don't
-+       use.
-+    
-+    3) The SQLite shell is compiled with the same preprocessor defines and
-+       disabled warnings as the SQLite library. The shell is only built on
-+       Linux for the purpose of debugging SQLite issues, and does not ship
-+       with Chrome.
-+    
-+    4) The configuration used when we rely on the system's SQLite library
-+       (so the SQLite bundled with Chromium is not built) is renamed from
-+       "sqlite_config" to "system_sqlite_config".
-+    
-+    [1] https://www.sqlite.org/compile.html
-+    
-+    Bug: 807093
-+    Change-Id: Ibf495ef3c4635a9b40c35e9998694293899d10d9
-+    Reviewed-on: https://chromium-review.googlesource.com/892096
-+    Reviewed-by: Chris Mumford <cmumford@chromium.org>
-+    Commit-Queue: Victor Costan <pwnall@chromium.org>
-+    Cr-Commit-Position: refs/heads/master@{#532792}
-+
-+diff --git a/third_party/sqlite/BUILD.gn b/third_party/sqlite/BUILD.gn
-+index 795bd8b..c23f10a 100644
-+--- a/third_party/sqlite/BUILD.gn
-++++ b/third_party/sqlite/BUILD.gn
-+@@ -11,6 +11,98 @@ declare_args() {
-+   use_system_sqlite = is_ios
-+ }
-+ 
-++# Compile-time options passed to SQLite.
-++#
-++# These options are used when building our own SQLite library, which happens
-++# everywhere except on iOS. These compile-time options are exported via a
-++# public_config to all targets using SQLite, because they're needed by the
-++# sqlite.h header. To avoid name clashes (macro names are resolved using a
-++# global namespace), this block should only contain preprocessor macros that
-++# are unambiguously connected to SQLite.
-++#
-++# The vast majority of the macros here are documented at
-++# https://www.sqlite.org/compile.html
-++config("chromium_sqlite3_compile_options") {
-++  defines = [
-++    "SQLITE_ENABLE_FTS3",
-++
-++    # New unicode61 tokenizer with built-in tables.
-++    "SQLITE_DISABLE_FTS3_UNICODE",
-++
-++    # Chromium currently does not enable fts4, disable extra code.
-++    "SQLITE_DISABLE_FTS4_DEFERRED",
-++    "SQLITE_ENABLE_ICU",
-++    "SQLITE_ENABLE_MEMORY_MANAGEMENT",
-++    "SQLITE_SECURE_DELETE",
-++
-++    # Custom flag to tweak pcache pools.
-++    # TODO(shess): This shouldn't use faux-SQLite naming.
-++    "SQLITE_SEPARATE_CACHE_POOLS",
-++
-++    # TODO(shess): SQLite adds mutexes to protect structures which cross
-++    # threads. In theory Chromium should be able to turn this to "2" which
-++    # should give a slight speed boost. "2" is safe as long as a single
-++    # connection is not used by more than one thread at a time.
-++    "SQLITE_THREADSAFE=1",
-++
-++    # SQLite can spawn threads to sort in parallel if configured
-++    # appropriately.  Chromium doesn't configure SQLite for that, and would
-++    # prefer to control distribution to worker threads.
-++    "SQLITE_MAX_WORKER_THREADS=0",
-++
-++    # Allow 256MB mmap footprint per connection.  Should not be too open-ended
-++    # as that could cause memory fragmentation.  50MB encompasses the 99th
-++    # percentile of Chrome databases in the wild.
-++    # TODO(shess): A 64-bit-specific value could be 1G or more.
-++    # TODO(shess): Figure out if exceeding this is costly.
-++    "SQLITE_MAX_MMAP_SIZE=268435456",
-++
-++    # Use a read-only memory map when mmap'ed I/O is enabled to prevent memory
-++    # stompers from directly corrupting the database.
-++    # TODO(shess): Upstream the ability to use this define.
-++    "SQLITE_MMAP_READ_ONLY=1",
-++
-++    # By default SQLite pre-allocates 100 pages of pcache data, which will not
-++    # be released until the handle is closed.  This is contrary to Chromium's
-++    # memory-usage goals.
-++    "SQLITE_DEFAULT_PCACHE_INITSZ=0",
-++
-++    # NOTE(shess): Some defines can affect the amalgamation.  Those should be
-++    # added to google_generate_amalgamation.sh, and the amalgamation
-++    # re-generated.  Usually this involves disabling features which include
-++    # keywords or syntax, for instance SQLITE_OMIT_VIRTUALTABLE omits the
-++    # virtual table syntax entirely.  Missing an item usually results in
-++    # syntax working but execution failing.  Review:
-++    #   src/src/parse.py
-++    #   src/tool/mkkeywordhash.c
-++  ]
-++
-++  # Pull in config.h on Linux.  This allows use of preprocessor macros which
-++  # are not available to the build config.
-++  if (is_linux) {
-++    defines += [ "_HAVE_SQLITE_CONFIG_H" ]
-++  }
-++
-++  if (using_sanitizer) {
-++    # Limit max length of data blobs and queries for fuzzing builds by 128 MB.
-++    defines += [
-++      "SQLITE_MAX_LENGTH=128000000",
-++      "SQLITE_MAX_SQL_LENGTH=128000000",
-++      "SQLITE_PRINTF_PRECISION_LIMIT=1280000",
-++    ]
-++
-++    # During fuzz testing, valid SQL queries generated by fuzzing engine may
-++    # lead to large memory allocations. If that happens, fuzzer reports an
-++    # out-of-memory error. However, such errors are not valid bugs.
-++    # To avoid hitting those irrelevant OOMs, we limit max number of memory
-++    # pages, so fuzzer will not crash when reaching the limit.
-++    # Apply this for fuzzing builds only, not for all builds with sanitizers.
-++    if (use_fuzzing_engine) {
-++      defines += [ "SQLITE_MAX_PAGE_COUNT=16384" ]
-++    }
-++  }
-++}
-++
-+ if (!use_system_sqlite) {
-+   config("sqlite_warnings") {
-+     cflags = []
-+@@ -46,59 +138,8 @@ if (!use_system_sqlite) {
-+     ]
-+ 
-+     cflags = []
-+-    defines = [
-+-      "SQLITE_ENABLE_FTS3",
-+-
-+-      # New unicode61 tokenizer with built-in tables.
-+-      "SQLITE_DISABLE_FTS3_UNICODE",
-+-
-+-      # Chromium currently does not enable fts4, disable extra code.
-+-      "SQLITE_DISABLE_FTS4_DEFERRED",
-+-      "SQLITE_ENABLE_ICU",
-+-      "SQLITE_ENABLE_MEMORY_MANAGEMENT",
-+-      "SQLITE_SECURE_DELETE",
-+-
-+-      # Custom flag to tweak pcache pools.
-+-      # TODO(shess): This shouldn't use faux-SQLite naming.
-+-      "SQLITE_SEPARATE_CACHE_POOLS",
-+-
-+-      # TODO(shess): SQLite adds mutexes to protect structures which cross
-+-      # threads. In theory Chromium should be able to turn this to "2" which
-+-      # should give a slight speed boost. "2" is safe as long as a single
-+-      # connection is not used by more than one thread at a time.
-+-      "SQLITE_THREADSAFE=1",
-+-
-+-      # SQLite can spawn threads to sort in parallel if configured
-+-      # appropriately.  Chromium doesn't configure SQLite for that, and would
-+-      # prefer to control distribution to worker threads.
-+-      "SQLITE_MAX_WORKER_THREADS=0",
-+-
-+-      # Allow 256MB mmap footprint per connection.  Should not be too open-ended
-+-      # as that could cause memory fragmentation.  50MB encompasses the 99th
-+-      # percentile of Chrome databases in the wild.
-+-      # TODO(shess): A 64-bit-specific value could be 1G or more.
-+-      # TODO(shess): Figure out if exceeding this is costly.
-+-      "SQLITE_MAX_MMAP_SIZE=268435456",
-+-
-+-      # Use a read-only memory map when mmap'ed I/O is enabled to prevent memory
-+-      # stompers from directly corrupting the database.
-+-      # TODO(shess): Upstream the ability to use this define.
-+-      "SQLITE_MMAP_READ_ONLY=1",
-+-
-+-      # By default SQLite pre-allocates 100 pages of pcache data, which will not
-+-      # be released until the handle is closed.  This is contrary to Chromium's
-+-      # memory-usage goals.
-+-      "SQLITE_DEFAULT_PCACHE_INITSZ=0",
-+-
-+-      # NOTE(shess): Some defines can affect the amalgamation.  Those should be
-+-      # added to google_generate_amalgamation.sh, and the amalgamation
-+-      # re-generated.  Usually this involves disabling features which include
-+-      # keywords or syntax, for instance SQLITE_OMIT_VIRTUALTABLE omits the
-+-      # virtual table syntax entirely.  Missing an item usually results in
-+-      # syntax working but execution failing.  Review:
-+-      #   src/src/parse.py
-+-      #   src/tool/mkkeywordhash.c
-+-    ]
-++    defines = []
-++
-+     if (is_component_build) {
-+       if (is_win) {
-+         defines += [ "SQLITE_API=__declspec(dllexport)" ]
-+@@ -106,6 +147,14 @@ if (!use_system_sqlite) {
-+         defines += [ "SQLITE_API=__attribute__((visibility(\"default\")))" ]
-+       }
-+     }
-++
-++    if (is_linux || is_android) {
-++      defines += [
-++        # Linux provides fdatasync(), a faster equivalent of fsync().
-++        "fdatasync=fdatasync",
-++      ]
-++    }
-++
-+     if (is_posix) {
-+       defines += [
-+         # Allow xSleep() call on Unix to use usleep() rather than sleep(), so it
-+@@ -118,42 +167,12 @@ if (!use_system_sqlite) {
-+         "USE_PREAD=1",
-+       ]
-+     }
-+-    if (is_linux || is_android) {
-+-      defines += [
-+-        # Linux provides fdatasync(), a faster equivalent of fsync().
-+-        "fdatasync=fdatasync",
-+-      ]
-+-    }
-+-
-+-    # Pull in config.h on Linux.  This allows use of preprocessor macros which
-+-    # are not available to the build config.
-+-    if (is_linux) {
-+-      defines += [ "_HAVE_SQLITE_CONFIG_H" ]
-+-    }
-+-
-+-    if (using_sanitizer) {
-+-      # Limit max length of data blobs and queries for fuzzing builds by 128 MB.
-+-      defines += [
-+-        "SQLITE_MAX_LENGTH=128000000",
-+-        "SQLITE_MAX_SQL_LENGTH=128000000",
-+-        "SQLITE_PRINTF_PRECISION_LIMIT=1280000",
-+-      ]
-+-
-+-      # During fuzz testing, valid SQL queries generated by fuzzing engine may
-+-      # lead to large memory allocations. If that happens, fuzzer reports an
-+-      # out-of-memory error. However, such errors are not valid bugs.
-+-      # To avoid hitting those irrelevant OOMs, we limit max number of memory
-+-      # pages, so fuzzer will not crash when reaching the limit.
-+-      # Apply this for fuzzing builds only, not for all builds with sanitizers.
-+-      if (use_libfuzzer || use_afl) {
-+-        defines += [ "SQLITE_MAX_PAGE_COUNT=16384" ]
-+-      }
-+-    }
-+ 
-+     include_dirs = [ "amalgamation" ]
-+ 
-+     configs -= [ "//build/config/compiler:chromium_code" ]
-+     configs += [
-++      ":chromium_sqlite3_compile_options",
-+       "//build/config/compiler:no_chromium_code",
-+ 
-+       # Must be after no_chromium_code for warning flags to be ordered
-+@@ -195,7 +214,10 @@ if (!use_system_sqlite) {
-+     public_deps = [
-+       ":chromium_sqlite3",
-+     ]
-+-    public_configs = [ ":sqlite_export" ]
-++    public_configs = [
-++      ":chromium_sqlite3_compile_options",
-++      ":sqlite_export",
-++    ]
-+   }
-+ 
-+   if (is_linux) {
-+@@ -216,6 +238,16 @@ if (!use_system_sqlite) {
-+         "//build/config:exe_and_shlib_deps",
-+         "//third_party/icu",
-+       ]
-++
-++      configs -= [ "//build/config/compiler:chromium_code" ]
-++      configs += [
-++        ":chromium_sqlite3_compile_options",
-++        "//build/config/compiler:no_chromium_code",
-++
-++        # Must be after no_chromium_code for warning flags to be ordered
-++        # correctly.
-++        ":sqlite_warnings",
-++      ]
-+     }
-+   }
-+ }
-+@@ -225,7 +257,7 @@ if (use_system_sqlite) {
-+   # version shipped with Chromium. Export a "sqlite" target so the change
-+   # can be localized to this file.
-+ 
-+-  config("sqlite_config") {
-++  config("system_sqlite_config") {
-+     defines = [ "USE_SYSTEM_SQLITE" ]
-+     if (is_ios) {
-+       libs = [ "sqlite3" ]
-+@@ -235,7 +267,7 @@ if (use_system_sqlite) {
-+   }
-+ 
-+   source_set("sqlite") {
-+-    public_configs = [ ":sqlite_config" ]
-++    public_configs = [ ":system_sqlite_config" ]
-+     if (is_ios) {
-+       public_deps = [
-+         ":sqlite_recover",
-added in remote
-  their  100644 35cc12c53e6ebdce5eab6413d33a56199aad3168 patches/mips64el/chromium/support-old-nss.patch
-@@ -0,0 +1,46 @@
-+diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc
-+index a0e7f61fab0c..fac728a729fb 100644
-+--- a/crypto/nss_util.cc
-++++ b/crypto/nss_util.cc
-+@@ -623,13 +623,16 @@ class NSSInitSingleton {
-+ 
-+     EnsureNSPRInit();
-+ 
-+-    // We *must* have NSS >= 3.26 at compile time.
-+-    static_assert((NSS_VMAJOR == 3 && NSS_VMINOR >= 26) || (NSS_VMAJOR > 3),
-+-                  "nss version check failed");
-++    // We *must* have NSS >= 3.14.3.
-++    static_assert(
-++        (NSS_VMAJOR == 3 && NSS_VMINOR == 14 && NSS_VPATCH >= 3) ||
-++        (NSS_VMAJOR == 3 && NSS_VMINOR > 14) ||
-++        (NSS_VMAJOR > 3),
-++        "nss version check failed");
-+     // Also check the run-time NSS version.
-+     // NSS_VersionCheck is a >= check, not strict equality.
-+-    if (!NSS_VersionCheck("3.26")) {
-+-      LOG(FATAL) << "NSS_VersionCheck(\"3.26\") failed. NSS >= 3.26 is "
-++    if (!NSS_VersionCheck("3.14.3")) {
-++      LOG(FATAL) << "NSS_VersionCheck(\"3.14.3\") failed. NSS >= 3.14.3 is "
-+                     "required. Please upgrade to the latest NSS, and if you "
-+                     "still get this error, contact your distribution "
-+                     "maintainer.";
-+diff --git a/crypto/scoped_test_nss_db.cc b/crypto/scoped_test_nss_db.cc
-+index 03470c130371..b334109e0342 100644
-+--- a/crypto/scoped_test_nss_db.cc
-++++ b/crypto/scoped_test_nss_db.cc
-+@@ -44,6 +44,15 @@ ScopedTestNSSDB::~ScopedTestNSSDB() {
-+     CERT_DestroyCertList(cert_list);
-+   }
-+ 
-++  // Don't close when NSS is < 3.15.1, because it would require an additional
-++  // sleep for 1 second after closing the database, due to
-++  // http://bugzil.la/875601.
-++  if (!NSS_VersionCheck("3.15.1")) {
-++    LOG(ERROR) << "NSS version is < 3.15.1, test DB will not be closed.";
-++    temp_dir_.Take();
-++    return;
-++  }
-++
-+   // NSS is allowed to do IO on the current thread since dispatching
-+   // to a dedicated thread would still have the affect of blocking
-+   // the current thread, due to NSS's internal locking requirements
-added in remote
-  their  100644 3eb7f130f0b81a6fe76f4a886a1171ece6efedf4 patches/mips64el/ffmpeg/.patches.yaml
-@@ -0,0 +1,6 @@
-+repo: src/third_party/ffmpeg
-+patches:
-+-
-+  owners: zcbenz
-+  file: Fix-build_ffmpeg-with-cross-prefix-mips64el-redhat-l.patch
-+  description: null
-added in remote
-  their  100644 0857ce591868dbce37183b974bd25fd17c3e6ac5 patches/mips64el/ffmpeg/Fix-build_ffmpeg-with-cross-prefix-mips64el-redhat-l.patch
-@@ -0,0 +1,25 @@
-+From dcd2071f20aa79f2eb1959cd5f040a0e4a0c058b Mon Sep 17 00:00:00 2001
-+From: Wang Qing <wangqing-hf@loongson.cn>
-+Date: Sat, 30 Sep 2017 10:21:25 +0800
-+Subject: [PATCH] Fix build_ffmpeg with cross-prefix mips64el-redhat-linux-.
-+
-+---
-+ chromium/scripts/build_ffmpeg.py | 2 +-
-+ 1 file changed, 1 insertion(+), 1 deletion(-)
-+
-+diff --git a/chromium/scripts/build_ffmpeg.py b/chromium/scripts/build_ffmpeg.py
-+index 0dbd9eb..79b5af2 100755
-+--- a/chromium/scripts/build_ffmpeg.py
-++++ b/chromium/scripts/build_ffmpeg.py
-+@@ -516,7 +516,7 @@ def main(argv):
-+         else:
-+           configure_flags['Common'].extend([
-+             '--enable-cross-compile',
-+-            '--cross-prefix=mips64el-linux-gnuabi64-',
-++            '--cross-prefix=mips64el-loongson-linux-',
-+             '--target-os=linux',
-+             '--arch=mips',
-+             '--extra-cflags=-mips64r2',
-+-- 
-+2.7.4
-+
-added in remote
-  their  100644 aab9e6991f16977bfce0b0b0be1842e5c3cca08d patches/mips64el/v8/.patches.yaml
-@@ -0,0 +1,6 @@
-+repo: src/v8
-+patches:
-+-
-+  owners: zcbenz
-+  file: Fix-v8-loongson-page-size.patch
-+  description: null
-added in remote
-  their  100644 2d03cadaa96e75fbe155bb8d000a04392c4df4fe patches/mips64el/v8/Fix-v8-loongson-page-size.patch
-@@ -0,0 +1,38 @@
-+diff --git a/src/base/platform/platform-posix.cc b/src/base/platform/platform-posix.cc
-+index 31da953..14c6c55 100644
-+--- a/src/base/platform/platform-posix.cc
-++++ b/src/base/platform/platform-posix.cc
-+@@ -97,7 +97,11 @@ int OS::ActivationFrameAlignment() {
-+ 
-+ 
-+ intptr_t OS::CommitPageSize() {
-++#if V8_TARGET_ARCH_MIPS64
-++  static intptr_t page_size = 16384;
-++#else
-+   static intptr_t page_size = getpagesize();
-++#endif
-+   return page_size;
-+ }
-+ 
-+@@ -241,7 +245,7 @@ void* OS::GetRandomMmapAddr() {
-+ 
-+ 
-+ size_t OS::AllocateAlignment() {
-+-  return static_cast<size_t>(sysconf(_SC_PAGESIZE));
-++  return 16384;
-+ }
-+ 
-+ 
-+diff --git a/src/base/sys-info.cc b/src/base/sys-info.cc
-+index 1b6d393..2a93061 100644
-+--- a/src/base/sys-info.cc
-++++ b/src/base/sys-info.cc
-+@@ -90,7 +90,7 @@ int64_t SysInfo::AmountOfPhysicalMemory() {
-+   return static_cast<int64_t>(result) * 1024L;
-+ #elif V8_OS_POSIX
-+   long pages = sysconf(_SC_PHYS_PAGES);    // NOLINT(runtime/int)
-+-  long page_size = sysconf(_SC_PAGESIZE);  // NOLINT(runtime/int)
-++  long page_size = 16384; // NOLINT(runtime/int)
-+   if (pages == -1 || page_size == -1) {
-+     return 0;
-+   }
-added in remote
-  their  100755 f36309a133ad1821bbc85248700aed0e357134d8 script/apply-patches
-@@ -0,0 +1,62 @@
-+#!/usr/bin/env python
-+
-+import argparse
-+import os
-+import subprocess
-+import sys
-+
-+from lib.patches import PatchesConfig
-+
-+
-+SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
-+PATCHES_DIR = os.path.join(SOURCE_ROOT, 'patches')
-+PATCHES_COMMON_DIR = os.path.join(PATCHES_DIR, 'common')
-+PATCHES_MIPS64EL_DIR = os.path.join(PATCHES_DIR, 'mips64el')
-+SRC = 'src'
-+SRC_DIR = os.path.join(SOURCE_ROOT, SRC)
-+
-+
-+def main():
-+  args = parse_args()
-+
-+  for folder in args.folders:
-+    error = apply_patches_for_dir(folder)
-+    if error:
-+      sys.stderr.write(error + '\n')
-+      sys.stderr.flush()
-+      return 1
-+
-+  return 0
-+
-+
-+def apply_patches_for_dir(directory):
-+  for root, dirs, files in os.walk(directory):
-+    config = PatchesConfig.from_directory(root)
-+    patches_list = config.get_patches_list()
-+    if patches_list is None:
-+      continue
-+
-+    (success, failed_patches) = patches_list.apply()
-+    if not success:
-+      patch_path = failed_patches[0].get_file_path()
-+      return '{0} failed to apply'.format(os.path.basename(patch_path))
-+
-+
-+def parse_args():
-+  parser = argparse.ArgumentParser(description='Apply all required patches.')
-+
-+  parser.add_argument('-t', '--target_arch',
-+                      help='Target architecture')
-+
-+  parser.add_argument('-f', '--folder', dest='folders', help='Apply patches from this folder', nargs='*', default=[])
-+
-+  args = parser.parse_args()
-+  if not args.folders:
-+    args.folders.append(PATCHES_COMMON_DIR)
-+    if args.target_arch == 'mips64el':
-+      args.folders.append(PATCHES_MIPS64EL_DIR)
-+  return args
-+
-+
-+if __name__ == '__main__':
-+    sys.exit(main())
-added in remote
-  their  100644 19eab02ae6d8550d819953367e96c5c32b780831 script/lib/git.py
-@@ -0,0 +1,44 @@
-+"""Git helper functions.
-+
-+Everything in here should be project agnostic, shouldn't rely on project's structure,
-+and make any assumptions about the passed arguments or calls outcomes.
-+"""
-+
-+import subprocess
-+
-+from util import scoped_cwd
-+
-+
-+def apply(repo, patch_path, reverse=False):
-+  args = ['git', 'apply',
-+          '--directory', repo,
-+          '--ignore-space-change',
-+          '--ignore-whitespace',
-+          '--whitespace', 'fix'
-+          ]
-+  if reverse:
-+    args += ['--reverse']
-+  args += ['--', patch_path]
-+
-+  return_code = subprocess.call(args)
-+  applied_successfully = (return_code == 0)
-+
-+  return applied_successfully
-+
-+
-+def get_patch(repo, commit_hash):
-+  args = ['git', 'diff-tree',
-+          '-p',
-+          commit_hash,
-+          '--'  # Explicitly tell Git that `commit_hash` is a revision, not a path.
-+          ]
-+
-+  with scoped_cwd(repo):
-+    return subprocess.check_output(args)
-+
-+
-+def get_head_commit(repo):
-+  args = ['git', 'rev-parse', 'HEAD']
-+
-+  with scoped_cwd(repo):
-+    return subprocess.check_output(args).strip()
-added in remote
-  their  100644 ae76612da825dcfd6c64414406a3b67e89874919 script/lib/patches.py
-@@ -0,0 +1,98 @@
-+import os
-+import sys
-+
-+SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))
-+VENDOR_DIR = os.path.join(SOURCE_ROOT, 'vendor')
-+PYYAML_LIB_DIR = os.path.join(VENDOR_DIR, 'pyyaml', 'lib')
-+sys.path.append(PYYAML_LIB_DIR)
-+import yaml
-+
-+from git import apply as git_apply
-+
-+
-+class Patch:
-+  def __init__(self, file_path, repo_path):
-+    self.file_path = file_path
-+    self.repo_path = repo_path
-+
-+  def apply(self, reverse=False):
-+    return git_apply(self.repo_path, self.file_path, reverse=reverse)
-+
-+  def reverse(self):
-+    return self.apply(reverse=True)
-+
-+  def get_file_path(self):
-+    return self.file_path
-+
-+
-+class PatchesList:
-+  def __init__(self, patches):
-+    self.patches = patches
-+
-+  def __len__(self):
-+    return len(self.patches)
-+
-+  def apply(self, reverse=False, stop_on_error=True):
-+    all_patches_applied = True
-+    failed_patches = []
-+
-+    for patch in self.patches:
-+      applied_successfully = patch.apply(reverse=reverse)
-+
-+      if not applied_successfully:
-+        all_patches_applied = False
-+        failed_patches.append(patch)
-+
-+      should_stop_now = not applied_successfully and stop_on_error
-+      if should_stop_now:
-+        break
-+
-+    return (all_patches_applied, failed_patches)
-+
-+  def reverse(self, stop_on_error=True):
-+    return self.apply(reverse=True, stop_on_error=stop_on_error)
-+
-+
-+class PatchesConfig:
-+  @staticmethod
-+  def from_directory(dir_path, config_name='.patches.yaml'):
-+    config_path = os.path.join(dir_path, config_name)
-+    return PatchesConfig(config_path)
-+
-+  def __init__(self, config_path):
-+    self.path = config_path
-+
-+  def __parse(self):
-+    contents = None
-+
-+    if os.path.isfile(self.path):
-+      with open(self.path, 'r') as stream:
-+        try:
-+          contents = yaml.load(stream)
-+        except yaml.YAMLError as e:
-+          print(e)
-+
-+    return contents
-+
-+  def __create_patch(self, raw_data, base_directory, repo_path):
-+    relative_file_path = raw_data['file']
-+    absolute_file_path = os.path.join(base_directory, relative_file_path)
-+
-+    return Patch(absolute_file_path, repo_path)
-+
-+  def get_patches_list(self):
-+    config_contents = self.__parse()
-+    if config_contents is None:
-+      return None
-+
-+    repo_path = config_contents['repo']
-+    if sys.platform == 'win32':
-+      repo_path = repo_path.replace('/', '\\')
-+
-+    patches_data = config_contents['patches']
-+    base_directory = os.path.dirname(self.path)
-+
-+    patches = [self.__create_patch(data, base_directory, repo_path) for data in patches_data]
-+    patches_list = PatchesList(patches)
-+
-+    return patches_list
diff --git a/app/test/fixtures/merge-parser/electron/merge-miniak-disable-remote-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-miniak-disable-remote-into-master.txt
deleted file mode 100644
index 1f751731072..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-miniak-disable-remote-into-master.txt
+++ /dev/null
@@ -1,210 +0,0 @@
-changed in both
-  base   100644 1fde7dc8d1aa4deee2cbe792219a42c668a54ada atom/browser/api/atom_api_web_contents.cc
-  our    100644 20a1ac2e672f08ffea528b6e094ba530ff8083d1 atom/browser/api/atom_api_web_contents.cc
-  their  100644 1c2c3964cf0bcab0f42385db291e9e677f4fce2a atom/browser/api/atom_api_web_contents.cc
-@@ -355,6 +355,9 @@
-   // Whether to enable DevTools.
-   options.Get("devTools", &enable_devtools_);
- 
-+  // Whether to disable remote.
-+  options.Get("disableRemote", &disable_remote_);
-+
-   // Obtain the session.
-   std::string partition;
-   mate::Handle<api::Session> session;
-@@ -1879,7 +1882,15 @@
-   return mate::ConvertToV8(isolate, *web_preferences->last_preference());
- }
- 
-+<<<<<<< .our
- v8::Local<v8::Value> WebContents::GetOwnerBrowserWindow() const {
-+=======
-+bool WebContents::IsRemoteDisabled() const {
-+  return disable_remote_;
-+}
-+
-+v8::Local<v8::Value> WebContents::GetOwnerBrowserWindow() {
-+>>>>>>> .their
-   if (owner_window())
-     return BrowserWindow::From(isolate(), owner_window());
-   else
-@@ -2029,6 +2040,7 @@
-       .SetMethod("_getPreloadPath", &WebContents::GetPreloadPath)
-       .SetMethod("getWebPreferences", &WebContents::GetWebPreferences)
-       .SetMethod("getLastWebPreferences", &WebContents::GetLastWebPreferences)
-+      .SetMethod("_isRemoteDisabled", &WebContents::IsRemoteDisabled)
-       .SetMethod("getOwnerBrowserWindow", &WebContents::GetOwnerBrowserWindow)
-       .SetMethod("hasServiceWorker", &WebContents::HasServiceWorker)
-       .SetMethod("unregisterServiceWorker",
-changed in both
-  base   100644 b6d939307ea34ad61bbe5b667f9a69d6cf1fee2b atom/browser/api/atom_api_web_contents.h
-  our    100644 7939f8268aa8c3371623e0c15f3b6001d7f1efa4 atom/browser/api/atom_api_web_contents.h
-  their  100644 416bd1463e62f423e24bf30f03ac3eb108c0f958 atom/browser/api/atom_api_web_contents.h
-@@ -237,6 +237,8 @@
-   v8::Local<v8::Value> GetWebPreferences(v8::Isolate* isolate) const;
-   v8::Local<v8::Value> GetLastWebPreferences(v8::Isolate* isolate) const;
- 
-+  bool IsRemoteDisabled() const;
-+
-   // Returns the owner window.
-   v8::Local<v8::Value> GetOwnerBrowserWindow() const;
- 
-@@ -460,6 +462,9 @@
-   // Whether to enable devtools.
-   bool enable_devtools_ = true;
- 
-+  // Whether to disable remote.
-+  bool disable_remote_ = false;
-+
-   // Observers of this WebContents.
-   base::ObserverList<ExtendedWebContentsObserver> observers_;
- 
-changed in both
-  base   100644 8e327693541201b54857467873935b3e37a9c9d5 docs/api/browser-window.md
-  our    100644 dff61dd336f047cf2f6f06228b2df2b98ff2304d docs/api/browser-window.md
-  their  100644 1f435d8ce87945474ded49344be8a5ec709107ed docs/api/browser-window.md
-@@ -270,6 +270,7 @@
-       are more limited. Read more about the option [here](sandbox-option.md).
-       **Note:** This option is currently experimental and may change or be
-       removed in future Electron releases.
-+    * `disableRemote` Boolean (optional) - If set, this will disable the [`remote`](remote.md) module.
-     * `session` [Session](session.md#class-session) (optional) - Sets the session used by the
-       page. Instead of passing the Session object directly, you can also choose to
-       use the `partition` option instead, which accepts a partition string. When
-changed in both
-  base   100644 12ee9d4a1c98a7adb5d2ccd03853f1d463da04a4 lib/browser/rpc-server.js
-  our    100644 ff9f77321de3a4145946b67f3fe2a597f98e2510 lib/browser/rpc-server.js
-  their  100644 eb1fc32501c0966bff261a0f54e6bea2c65f9b14 lib/browser/rpc-server.js
-@@ -257,7 +257,18 @@
-   }
- }
- 
-+const isRemoteDisabled = (event) => {
-+  if (event.sender._isRemoteDisabled()) {
-+    event.returnValue = exceptionToMeta(event.sender, new Error('remote is disabled'))
-+    return true
-+  }
-+
-+  return false
-+}
-+
- ipcMain.on('ELECTRON_BROWSER_REQUIRE', function (event, contextId, module) {
-+  if (isRemoteDisabled(event)) return
-+
-   try {
-     event.returnValue = valueToMeta(event.sender, contextId, process.mainModule.require(module))
-   } catch (error) {
-@@ -266,6 +277,8 @@
- })
- 
- ipcMain.on('ELECTRON_BROWSER_GET_BUILTIN', function (event, contextId, module) {
-+  if (isRemoteDisabled(event)) return
-+
-   try {
-     event.returnValue = valueToMeta(event.sender, contextId, electron[module])
-   } catch (error) {
-@@ -274,6 +287,8 @@
- })
- 
- ipcMain.on('ELECTRON_BROWSER_GLOBAL', function (event, contextId, name) {
-+  if (isRemoteDisabled(event)) return
-+
-   try {
-     event.returnValue = valueToMeta(event.sender, contextId, global[name])
-   } catch (error) {
-@@ -282,6 +297,8 @@
- })
- 
- ipcMain.on('ELECTRON_BROWSER_CURRENT_WINDOW', function (event, contextId) {
-+  if (isRemoteDisabled(event)) return
-+
-   try {
-     event.returnValue = valueToMeta(event.sender, contextId, event.sender.getOwnerBrowserWindow())
-   } catch (error) {
-@@ -290,10 +307,14 @@
- })
- 
- ipcMain.on('ELECTRON_BROWSER_CURRENT_WEB_CONTENTS', function (event, contextId) {
-+  if (isRemoteDisabled(event)) return
-+
-   event.returnValue = valueToMeta(event.sender, contextId, event.sender)
- })
- 
- ipcMain.on('ELECTRON_BROWSER_CONSTRUCTOR', function (event, contextId, id, args) {
-+  if (isRemoteDisabled(event)) return
-+
-   try {
-     args = unwrapArgs(event.sender, contextId, args)
-     let constructor = objectsRegistry.get(id)
-@@ -309,6 +330,8 @@
- })
- 
- ipcMain.on('ELECTRON_BROWSER_FUNCTION_CALL', function (event, contextId, id, args) {
-+  if (isRemoteDisabled(event)) return
-+
-   try {
-     args = unwrapArgs(event.sender, contextId, args)
-     let func = objectsRegistry.get(id)
-@@ -324,6 +347,8 @@
- })
- 
- ipcMain.on('ELECTRON_BROWSER_MEMBER_CONSTRUCTOR', function (event, contextId, id, method, args) {
-+  if (isRemoteDisabled(event)) return
-+
-   try {
-     args = unwrapArgs(event.sender, contextId, args)
-     let object = objectsRegistry.get(id)
-@@ -339,6 +364,8 @@
- })
- 
- ipcMain.on('ELECTRON_BROWSER_MEMBER_CALL', function (event, contextId, id, method, args) {
-+  if (isRemoteDisabled(event)) return
-+
-   try {
-     args = unwrapArgs(event.sender, contextId, args)
-     let obj = objectsRegistry.get(id)
-@@ -354,6 +381,8 @@
- })
- 
- ipcMain.on('ELECTRON_BROWSER_MEMBER_SET', function (event, contextId, id, name, args) {
-+  if (isRemoteDisabled(event)) return
-+
-   try {
-     args = unwrapArgs(event.sender, contextId, args)
-     let obj = objectsRegistry.get(id)
-@@ -370,6 +399,8 @@
- })
- 
- ipcMain.on('ELECTRON_BROWSER_MEMBER_GET', function (event, contextId, id, name) {
-+  if (isRemoteDisabled(event)) return
-+
-   try {
-     let obj = objectsRegistry.get(id)
- 
-@@ -384,10 +415,14 @@
- })
- 
- ipcMain.on('ELECTRON_BROWSER_DEREFERENCE', function (event, contextId, id) {
-+  if (isRemoteDisabled(event)) return
-+
-   objectsRegistry.remove(event.sender, contextId, id)
- })
- 
- ipcMain.on('ELECTRON_BROWSER_CONTEXT_RELEASE', (event, contextId) => {
-+  if (isRemoteDisabled(event)) return
-+
-   objectsRegistry.clear(event.sender, contextId)
-   event.returnValue = null
- })
-merged
-  result 100644 c60e0bd80fc0cacceea223c6ccdeaafa388fb70e lib/renderer/api/remote.js
-  our    100644 59117f8f2dd977fc1817a6b1d540b616ddcb0dae lib/renderer/api/remote.js
-@@ -269,8 +269,6 @@
- // Construct an exception error from the meta.
- function metaToException (meta) {
-   const error = new Error(`${meta.message}\n${meta.stack}`)
--  const remoteProcess = exports.process
--  error.from = remoteProcess ? remoteProcess.type : null
-   error.cause = metaToValue(meta.cause)
-   return error
- }
diff --git a/app/test/fixtures/merge-parser/electron/merge-miniak-spec-load-file-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-miniak-spec-load-file-into-master.txt
deleted file mode 100644
index 755076e1cf4..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-miniak-spec-load-file-into-master.txt
+++ /dev/null
@@ -1,1551 +0,0 @@
-changed in both
-  base   100644 832661ddeaa214176b55270f93f777a26c11ba48 spec/api-app-spec.js
-  our    100644 d224eda2989332c18d655cef05a8bacc2eb6d4b8 spec/api-app-spec.js
-  their  100644 8cbe66a8c48296012c92c5927e24d899fd43272b spec/api-app-spec.js
-@@ -41,7 +41,7 @@
- 
-     it('always returns the internal electron module', (done) => {
-       ipcMain.once('answer', () => done())
--      window.loadURL(`file://${path.join(__dirname, 'fixtures', 'api', 'electron-module-app', 'index.html')}`)
-+      window.loadFile(path.join(__dirname, 'fixtures', 'api', 'electron-module-app', 'index.html'))
-     })
-   })
- })
-changed in both
-  base   100644 f4b70cb6e1363e44e3346c0b897683f4dca6b7d9 spec/api-browser-window-affinity-spec.js
-  our    100644 f90e784bed5115013032d52be3eaae0ae14c9e8b spec/api-browser-window-affinity-spec.js
-  their  100644 1b520bc918919e5e4ed34502e55afce33fff8068 spec/api-browser-window-affinity-spec.js
-@@ -21,8 +21,15 @@
-         height: 400,
-         webPreferences: webPrefs || {}
-       })
-+<<<<<<< .our
-       w.webContents.on('did-finish-load', () => { resolve(w) })
-       w.loadURL(`file://${path.join(fixtures, 'api', 'blank.html')}`)
-+=======
-+      w.webContents.on('did-finish-load', () => {
-+        resolve(w)
-+      })
-+      w.loadFile(path.join(fixtures, 'api', 'blank.html'))
-+>>>>>>> .their
-     })
-   }
- 
-changed in both
-  base   100644 ae45b330e6dfc574771602ef7a7ba6e80a4e81a1 spec/api-browser-window-spec.js
-  our    100644 f4cba12ec19d224bc46fca898db42a99baf4972e spec/api-browser-window-spec.js
-  their  100644 7318131945a6509ec5fd720fcde93de50eca0455 spec/api-browser-window-spec.js
-@@ -157,12 +157,12 @@
-         assert.equal(String(content), 'unload')
-         done()
-       })
--      w.loadURL('file://' + path.join(fixtures, 'api', 'unload.html'))
-+      w.loadFile(path.join(fixtures, 'api', 'unload.html'))
-     })
-     it('should emit beforeunload handler', (done) => {
-       w.once('onbeforeunload', () => { done() })
-       w.webContents.on('did-finish-load', () => { w.close() })
--      w.loadURL(`file://${path.join(fixtures, 'api', 'beforeunload-false.html')}`)
-+      w.loadFile(path.join(fixtures, 'api', 'beforeunload-false.html'))
-     })
-     it('should not crash when invoked synchronously inside navigation observer', (done) => {
-       const events = [
-@@ -204,11 +204,11 @@
-         assert.equal(String(content), 'close')
-         done()
-       })
--      w.loadURL(`file://${path.join(fixtures, 'api', 'close.html')}`)
-+      w.loadFile(path.join(fixtures, 'api', 'close.html'))
-     })
-     it('should emit beforeunload handler', (done) => {
-       w.once('onbeforeunload', () => { done() })
--      w.loadURL(`file://${path.join(fixtures, 'api', 'close-beforeunload-false.html')}`)
-+      w.loadFile(path.join(fixtures, 'api', 'close-beforeunload-false.html'))
-     })
-   })
- 
-@@ -231,6 +231,33 @@
-       w.on('ready-to-show', () => { done() })
-       w.loadURL('about:blank')
-     })
-+<<<<<<< .our
-+=======
-+    // TODO(nitsakh): Deprecated
-+    it('should emit did-get-response-details(deprecated) event', (done) => {
-+      // expected {fileName: resourceType} pairs
-+      const expectedResources = {
-+        'did-get-response-details.html': 'mainFrame',
-+        'logo.png': 'image'
-+      }
-+      let responses = 0
-+      w.webContents.on('-did-get-response-details', (event, status, newUrl, oldUrl, responseCode, method, referrer, headers, resourceType) => {
-+        responses += 1
-+        const fileName = newUrl.slice(newUrl.lastIndexOf('/') + 1)
-+        const expectedType = expectedResources[fileName]
-+        assert(!!expectedType, `Unexpected response details for ${newUrl}`)
-+        assert(typeof status === 'boolean', 'status should be boolean')
-+        assert.equal(responseCode, 200)
-+        assert.equal(method, 'GET')
-+        assert(typeof referrer === 'string', 'referrer should be string')
-+        assert(!!headers, 'headers should be present')
-+        assert(typeof headers === 'object', 'headers should be object')
-+        assert.equal(resourceType, expectedType, 'Incorrect resourceType')
-+        if (responses === Object.keys(expectedResources).length) done()
-+      })
-+      w.loadFile(path.join(fixtures, 'pages', 'did-get-response-details.html'))
-+    })
-+>>>>>>> .their
-     it('should emit did-fail-load event for files that do not exist', (done) => {
-       w.webContents.on('did-fail-load', (event, code, desc, url, isMainFrame) => {
-         assert.equal(code, -6)
-@@ -254,7 +281,7 @@
-         assert.equal(isMainFrame, false)
-         done()
-       })
--      w.loadURL(`file://${path.join(fixtures, 'api', 'did-fail-load-iframe.html')}`)
-+      w.loadFile(path.join(fixtures, 'api', 'did-fail-load-iframe.html'))
-     })
-     it('does not crash in did-fail-provisional-load handler', (done) => {
-       w.webContents.once('did-fail-provisional-load', () => {
-@@ -333,7 +360,7 @@
-     it('allows the window to be closed from the event listener', (done) => {
-       ipcRenderer.send('close-on-will-navigate', w.id)
-       ipcRenderer.once('closed-on-will-navigate', () => { done() })
--      w.loadURL(`file://${fixtures}/pages/will-navigate.html`)
-+      w.loadFile(path.join(fixtures, 'pages', 'will-navigate.html'))
-     })
-   })
- 
-@@ -1093,7 +1120,7 @@
-             preload: preload
-           }
-         })
--        w.loadURL(`file://${path.join(fixtures, 'api', 'preload.html')}`)
-+        w.loadFile(path.join(fixtures, 'api', 'preload.html'))
-       })
-       it('can successfully delete the Buffer global', (done) => {
-         const preload = path.join(fixtures, 'module', 'delete-buffer.js')
-@@ -1108,7 +1135,7 @@
-             preload: preload
-           }
-         })
--        w.loadURL(`file://${path.join(fixtures, 'api', 'preload.html')}`)
-+        w.loadFile(path.join(fixtures, 'api', 'preload.html'))
-       })
-     })
- 
-@@ -1145,7 +1172,7 @@
-             preload: path.join(fixtures, 'module', 'set-global-preload-3.js')
-           }
-         })
--        w.loadURL('file://' + path.join(fixtures, 'api', 'preloads.html'))
-+        w.loadFile(path.join(fixtures, 'api', 'preloads.html'))
-       })
-     })
- 
-@@ -1164,7 +1191,7 @@
-             additionalArguments: ['--my-magic-arg']
-           }
-         })
--        w.loadURL(`file://${path.join(fixtures, 'api', 'blank.html')}`)
-+        w.loadFile(path.join(fixtures, 'api', 'blank.html'))
-       })
- 
-       it('adds extra value args to process.argv in the renderer process', (done) => {
-@@ -1181,7 +1208,7 @@
-             additionalArguments: ['--my-magic-arg=foo']
-           }
-         })
--        w.loadURL(`file://${path.join(fixtures, 'api', 'blank.html')}`)
-+        w.loadFile(path.join(fixtures, 'api', 'blank.html'))
-       })
-     })
- 
-@@ -1201,7 +1228,7 @@
-             nodeIntegration: false
-           }
-         })
--        w.loadURL(`file://${path.join(fixtures, 'api', 'blank.html')}`)
-+        w.loadFile(path.join(fixtures, 'api', 'blank.html'))
-       })
-     })
- 
-@@ -1253,7 +1280,7 @@
-             preload: preload
-           }
-         })
--        w.loadURL('file://' + path.join(fixtures, 'api', 'preload.html'))
-+        w.loadFile(path.join(fixtures, 'api', 'preload.html'))
-       })
- 
-       it('exposes ipcRenderer to preload script (path has special chars)', function (done) {
-@@ -1270,7 +1297,7 @@
-             preload: preloadSpecialChars
-           }
-         })
--        w.loadURL('file://' + path.join(fixtures, 'api', 'preload.html'))
-+        w.loadFile(path.join(fixtures, 'api', 'preload.html'))
-       })
- 
-       it('exposes "exit" event to preload script', function (done) {
-@@ -1284,7 +1311,7 @@
-         })
-         let htmlPath = path.join(fixtures, 'api', 'sandbox.html?exit-event')
-         const pageUrl = 'file://' + htmlPath
--        w.loadURL(pageUrl)
-+        w.loadFile(htmlPath)
-         ipcMain.once('answer', function (event, url) {
-           let expectedUrl = pageUrl
-           if (process.platform === 'win32') {
-@@ -1307,7 +1334,7 @@
-         ipcRenderer.send('set-web-preferences-on-next-new-window', w.webContents.id, 'preload', preload)
-         let htmlPath = path.join(fixtures, 'api', 'sandbox.html?window-open')
-         const pageUrl = 'file://' + htmlPath
--        w.loadURL(pageUrl)
-+        w.loadFile(htmlPath)
-         w.webContents.once('new-window', (e, url, frameName, disposition, options) => {
-           let expectedUrl = pageUrl
-           if (process.platform === 'win32') {
-@@ -1335,9 +1362,8 @@
-         })
-         ipcRenderer.send('set-web-preferences-on-next-new-window', w.webContents.id, 'preload', preload)
-         let htmlPath = path.join(fixtures, 'api', 'sandbox.html?window-open-external')
--        const pageUrl = 'file://' + htmlPath
-         let popupWindow
--        w.loadURL(pageUrl)
-+        w.loadFile(htmlPath)
-         w.webContents.once('new-window', (e, url, frameName, disposition, options) => {
-           assert.equal(url, 'http://www.google.com/#q=electron')
-           assert.equal(options.width, 505)
-@@ -1378,7 +1404,7 @@
-           assert.equal(args.includes('--enable-sandbox'), true)
-           done()
-         })
--        w.loadURL(`file://${path.join(fixtures, 'api', 'new-window.html')}`)
-+        w.loadFile(path.join(fixtures, 'api', 'new-window.html'))
-       })
- 
-       it('should open windows with the options configured via new-window event listeners', (done) => {
-@@ -1397,7 +1423,7 @@
-           assert.equal(webPreferences.foo, 'bar')
-           done()
-         })
--        w.loadURL(`file://${path.join(fixtures, 'api', 'new-window.html')}`)
-+        w.loadFile(path.join(fixtures, 'api', 'new-window.html'))
-       })
- 
-       it('should set ipc event sender correctly', (done) => {
-@@ -1412,8 +1438,12 @@
-         ipcRenderer.send('set-web-preferences-on-next-new-window', w.webContents.id, 'preload', preload)
- 
-         let htmlPath = path.join(fixtures, 'api', 'sandbox.html?verify-ipc-sender')
-+<<<<<<< .our
-         const pageUrl = 'file://' + htmlPath
-         let childWc
-+=======
-+        w.loadFile(htmlPath)
-+>>>>>>> .their
-         w.webContents.once('new-window', (e, url, frameName, disposition, options) => {
-           childWc = options.webContents
-           assert.notEqual(w.webContents, childWc)
-@@ -1521,7 +1551,7 @@
-             done()
-           }, 100)
-         })
--        w.loadURL('file://' + path.join(fixtures, 'pages', 'window-open.html'))
-+        w.loadFile(path.join(fixtures, 'pages', 'window-open.html'))
-       })
- 
-       it('releases memory after popup is closed', (done) => {
-@@ -1638,7 +1668,7 @@
-             preload: preload
-           }
-         })
--        w.loadURL('file://' + path.join(fixtures, 'api', 'preload.html'))
-+        w.loadFile(path.join(fixtures, 'api', 'preload.html'))
-       })
- 
-       it('webview in sandbox renderer', async () => {
-@@ -1675,28 +1705,28 @@
-           assert.equal(content, 'Hello')
-           done()
-         })
--        w.loadURL(`file://${path.join(fixtures, 'api', 'native-window-open-blank.html')}`)
-+        w.loadFile(path.join(fixtures, 'api', 'native-window-open-blank.html'))
-       })
-       it('opens window of same domain with cross-scripting enabled', (done) => {
-         ipcMain.once('answer', (event, content) => {
-           assert.equal(content, 'Hello')
-           done()
-         })
--        w.loadURL(`file://${path.join(fixtures, 'api', 'native-window-open-file.html')}`)
-+        w.loadFile(path.join(fixtures, 'api', 'native-window-open-file.html'))
-       })
-       it('blocks accessing cross-origin frames', (done) => {
-         ipcMain.once('answer', (event, content) => {
-           assert.equal(content, 'Blocked a frame with origin "file://" from accessing a cross-origin frame.')
-           done()
-         })
--        w.loadURL(`file://${path.join(fixtures, 'api', 'native-window-open-cross-origin.html')}`)
-+        w.loadFile(path.join(fixtures, 'api', 'native-window-open-cross-origin.html'))
-       })
-       it('opens window from <iframe> tags', (done) => {
-         ipcMain.once('answer', (event, content) => {
-           assert.equal(content, 'Hello')
-           done()
-         })
--        w.loadURL(`file://${path.join(fixtures, 'api', 'native-window-open-iframe.html')}`)
-+        w.loadFile(path.join(fixtures, 'api', 'native-window-open-iframe.html'))
-       })
-       it('loads native addons correctly after reload', (done) => {
-         if (!nativeModulesEnabled) return done()
-@@ -1709,7 +1739,7 @@
-           })
-           w.reload()
-         })
--        w.loadURL(`file://${path.join(fixtures, 'api', 'native-window-open-native-addon.html')}`)
-+        w.loadFile(path.join(fixtures, 'api', 'native-window-open-native-addon.html'))
-       })
-       it('should inherit the nativeWindowOpen setting in opened windows', (done) => {
-         w.destroy()
-@@ -1726,7 +1756,7 @@
-           assert.equal(args.includes('--native-window-open'), true)
-           done()
-         })
--        w.loadURL(`file://${path.join(fixtures, 'api', 'new-window.html')}`)
-+        w.loadFile(path.join(fixtures, 'api', 'new-window.html'))
-       })
-       it('should open windows with the options configured via new-window event listeners', (done) => {
-         w.destroy()
-@@ -1744,7 +1774,7 @@
-           assert.equal(webPreferences.foo, 'bar')
-           done()
-         })
--        w.loadURL(`file://${path.join(fixtures, 'api', 'new-window.html')}`)
-+        w.loadFile(path.join(fixtures, 'api', 'new-window.html'))
-       })
-       it('retains the original web preferences when window.location is changed to a new origin', async () => {
-         await serveFileFromProtocol('foo', path.join(fixtures, 'api', 'window-open-location-change.html'))
-@@ -1767,7 +1797,7 @@
-             assert.equal(typeofProcess, 'undefined')
-             resolve()
-           })
--          w.loadURL(`file://${path.join(fixtures, 'api', 'window-open-location-open.html')}`)
-+          w.loadFile(path.join(fixtures, 'api', 'window-open-location-open.html'))
-         })
-       })
-     })
-@@ -1791,22 +1821,22 @@
-         assert.equal(content, 'Hello')
-         done()
-       })
--      w.loadURL(`file://${path.join(fixtures, 'api', 'native-window-open-isolated.html')}`)
-+      w.loadFile(path.join(fixtures, 'api', 'native-window-open-isolated.html'))
-     })
-   })
- 
-   describe('beforeunload handler', () => {
-     it('returning undefined would not prevent close', (done) => {
-       w.once('closed', () => { done() })
--      w.loadURL('file://' + path.join(fixtures, 'api', 'close-beforeunload-undefined.html'))
-+      w.loadFile(path.join(fixtures, 'api', 'close-beforeunload-undefined.html'))
-     })
-     it('returning false would prevent close', (done) => {
-       w.once('onbeforeunload', () => { done() })
--      w.loadURL(`file://${path.join(fixtures, 'api', 'close-beforeunload-false.html')}`)
-+      w.loadFile(path.join(fixtures, 'api', 'close-beforeunload-false.html'))
-     })
-     it('returning empty string would prevent close', (done) => {
-       w.once('onbeforeunload', () => { done() })
--      w.loadURL(`file://${path.join(fixtures, 'api', 'close-beforeunload-empty-string.html')}`)
-+      w.loadFile(path.join(fixtures, 'api', 'close-beforeunload-empty-string.html'))
-     })
-     it('emits for each close attempt', (done) => {
-       let beforeUnloadCount = 0
-@@ -1819,7 +1849,7 @@
-         }
-       })
-       w.webContents.once('did-finish-load', () => { w.close() })
--      w.loadURL(`file://${path.join(fixtures, 'api', 'beforeunload-false-prevent3.html')}`)
-+      w.loadFile(path.join(fixtures, 'api', 'beforeunload-false-prevent3.html'))
-     })
-     it('emits for each reload attempt', (done) => {
-       let beforeUnloadCount = 0
-@@ -1837,7 +1867,7 @@
-         })
-         w.reload()
-       })
--      w.loadURL(`file://${path.join(fixtures, 'api', 'beforeunload-false-prevent3.html')}`)
-+      w.loadFile(path.join(fixtures, 'api', 'beforeunload-false-prevent3.html'))
-     })
-     it('emits for each navigation attempt', (done) => {
-       let beforeUnloadCount = 0
-@@ -1855,7 +1885,7 @@
-         })
-         w.loadURL('about:blank')
-       })
--      w.loadURL(`file://${path.join(fixtures, 'api', 'beforeunload-false-prevent3.html')}`)
-+      w.loadFile(path.join(fixtures, 'api', 'beforeunload-false-prevent3.html'))
-     })
-   })
- 
-@@ -1897,7 +1927,7 @@
-         done()
-       })
- 
--      w.loadURL(`file://${path.join(fixtures, 'pages', 'visibilitychange.html')}`)
-+      w.loadFile(path.join(fixtures, 'pages', 'visibilitychange.html'))
-     })
-     it('visibilityState changes when window is hidden', (done) => {
-       w = new BrowserWindow({width: 100, height: 100})
-@@ -1915,7 +1945,7 @@
-         w.hide()
-       })
- 
--      w.loadURL(`file://${path.join(fixtures, 'pages', 'visibilitychange.html')}`)
-+      w.loadFile(path.join(fixtures, 'pages', 'visibilitychange.html'))
-     })
-     it('visibilityState changes when window is shown', (done) => {
-       w = new BrowserWindow({width: 100, height: 100})
-@@ -1932,7 +1962,7 @@
-         w.show()
-       })
- 
--      w.loadURL(`file://${path.join(fixtures, 'pages', 'visibilitychange.html')}`)
-+      w.loadFile(path.join(fixtures, 'pages', 'visibilitychange.html'))
-     })
-     it('visibilityState changes when window is shown inactive', function (done) {
-       if (isCI && process.platform === 'win32') {
-@@ -1958,7 +1988,7 @@
-         w.showInactive()
-       })
- 
--      w.loadURL(`file://${path.join(fixtures, 'pages', 'visibilitychange.html')}`)
-+      w.loadFile(path.join(fixtures, 'pages', 'visibilitychange.html'))
-     })
-     it('visibilityState changes when window is minimized', function (done) {
-       if (isCI && process.platform === 'linux') {
-@@ -1985,7 +2015,7 @@
-         w.minimize()
-       })
- 
--      w.loadURL(`file://${path.join(fixtures, 'pages', 'visibilitychange.html')}`)
-+      w.loadFile(path.join(fixtures, 'pages', 'visibilitychange.html'))
-     })
-     it('visibilityState remains visible if backgroundThrottling is disabled', (done) => {
-       w = new BrowserWindow({
-@@ -2017,7 +2047,7 @@
-       })
-       w.show()
- 
--      w.loadURL(`file://${path.join(fixtures, 'pages', 'visibilitychange.html')}`)
-+      w.loadFile(path.join(fixtures, 'pages', 'visibilitychange.html'))
-     })
-   })
- 
-@@ -2036,7 +2066,7 @@
-         assert.equal(additionalFeatures[0], 'this-is-not-a-standard-feature')
-         done()
-       })
--      w.loadURL(`file://${fixtures}/pages/window-open.html`)
-+      w.loadFile(path.join(fixtures, 'pages', 'window-open.html'))
-     })
-     it('emits when window.open is called with no webPreferences', (done) => {
-       w.destroy()
-@@ -2048,8 +2078,9 @@
-         assert.equal(additionalFeatures[0], 'this-is-not-a-standard-feature')
-         done()
-       })
--      w.loadURL(`file://${fixtures}/pages/window-open.html`)
-+      w.loadFile(path.join(fixtures, 'pages', 'window-open.html'))
-     })
-+
-     it('emits when link with target is called', (done) => {
-       w.webContents.once('new-window', (e, url, frameName) => {
-         e.preventDefault()
-@@ -2057,7 +2088,7 @@
-         assert.equal(frameName, 'target')
-         done()
-       })
--      w.loadURL(`file://${fixtures}/pages/target-name.html`)
-+      w.loadFile(path.join(fixtures, 'pages', 'target-name.html'))
-     })
-   })
- 
-@@ -2157,7 +2188,7 @@
- 
-     it('subscribes to frame updates', (done) => {
-       let called = false
--      w.loadURL(`file://${fixtures}/api/frame-subscriber.html`)
-+      w.loadFile(path.join(fixtures, 'api', 'frame-subscriber.html'))
-       w.webContents.on('dom-ready', () => {
-         w.webContents.beginFrameSubscription(function (data) {
-           // This callback might be called twice.
-@@ -2172,7 +2203,7 @@
-     })
-     it('subscribes to frame updates (only dirty rectangle)', (done) => {
-       let called = false
--      w.loadURL(`file://${fixtures}/api/frame-subscriber.html`)
-+      w.loadFile(path.join(fixtures, 'api', 'frame-subscriber.html'))
-       w.webContents.on('dom-ready', () => {
-         w.webContents.beginFrameSubscription(true, (data) => {
-           // This callback might be called twice.
-@@ -2186,7 +2217,7 @@
-       })
-     })
-     it('throws error when subscriber is not well defined', (done) => {
--      w.loadURL(`file://${fixtures}'/api/frame-subscriber.html`)
-+      w.loadFile(path.join(fixtures, 'api', 'frame-subscriber.html'))
-       try {
-         w.webContents.beginFrameSubscription(true, true)
-       } catch (e) {
-@@ -2223,7 +2254,7 @@
-           done()
-         })
-       })
--      w.loadURL('file://' + fixtures + '/pages/save_page/index.html')
-+      w.loadFile(path.join(fixtures, 'pages', 'save_page', 'index.html'))
-     })
-   })
- 
-@@ -3172,7 +3203,7 @@
-         assert.deepEqual(data, expectedContextData)
-         done()
-       })
--      w.loadURL(`file://${fixtures}/api/isolated.html`)
-+      w.loadFile(path.join(fixtures, 'api', 'isolated.html'))
-     })
-     it('recreates the contexts on reload', (done) => {
-       w.webContents.once('did-finish-load', () => {
-@@ -3182,21 +3213,21 @@
-         })
-         w.webContents.reload()
-       })
--      w.loadURL(`file://${fixtures}/api/isolated.html`)
-+      w.loadFile(path.join(fixtures, 'api', 'isolated.html'))
-     })
-     it('enables context isolation on child windows', (done) => {
-       app.once('browser-window-created', (event, window) => {
-         assert.equal(window.webContents.getLastWebPreferences().contextIsolation, true)
-         done()
-       })
--      w.loadURL(`file://${fixtures}/pages/window-open.html`)
-+      w.loadFile(path.join(fixtures, 'pages', 'window-open.html'))
-     })
-     it('separates the page context from the Electron/preload context with sandbox on', (done) => {
-       ipcMain.once('isolated-sandbox-world', (event, data) => {
-         assert.deepEqual(data, expectedContextData)
-         done()
-       })
--      w.loadURL(`file://${fixtures}/api/isolated.html`)
-+      w.loadFile(path.join(fixtures, 'api', 'isolated.html'))
-     })
-     it('recreates the contexts on reload with sandbox on', (done) => {
-       w.webContents.once('did-finish-load', () => {
-@@ -3206,7 +3237,7 @@
-         })
-         w.webContents.reload()
-       })
--      w.loadURL(`file://${fixtures}/api/isolated.html`)
-+      w.loadFile(path.join(fixtures, 'api', 'isolated.html'))
-     })
-   })
- 
-@@ -3238,12 +3269,12 @@
-         assertWithinDelta(size.height, 100, 2, 'height')
-         done()
-       })
--      w.loadURL('file://' + fixtures + '/api/offscreen-rendering.html')
-+      w.loadFile(path.join(fixtures, 'api', 'offscreen-rendering.html'))
-     })
- 
-     describe('window.webContents.isOffscreen()', () => {
-       it('is true for offscreen type', () => {
--        w.loadURL('file://' + fixtures + '/api/offscreen-rendering.html')
-+        w.loadFile(path.join(fixtures, 'api', 'offscreen-rendering.html'))
-         assert.equal(w.webContents.isOffscreen(), true)
-       })
- 
-@@ -3260,7 +3291,7 @@
-           assert.equal(w.webContents.isPainting(), true)
-           done()
-         })
--        w.loadURL('file://' + fixtures + '/api/offscreen-rendering.html')
-+        w.loadFile(path.join(fixtures, 'api', 'offscreen-rendering.html'))
-       })
-     })
- 
-@@ -3271,7 +3302,7 @@
-           assert.equal(w.webContents.isPainting(), false)
-           done()
-         })
--        w.loadURL('file://' + fixtures + '/api/offscreen-rendering.html')
-+        w.loadFile(path.join(fixtures, 'api', 'offscreen-rendering.html'))
-       })
-     })
- 
-@@ -3285,7 +3316,7 @@
-             done()
-           })
-         })
--        w.loadURL('file://' + fixtures + '/api/offscreen-rendering.html')
-+        w.loadFile(path.join(fixtures, 'api', 'offscreen-rendering.html'))
-       })
-     })
- 
-@@ -3295,7 +3326,7 @@
-           assert.equal(w.webContents.getFrameRate(), 60)
-           done()
-         })
--        w.loadURL('file://' + fixtures + '/api/offscreen-rendering.html')
-+        w.loadFile(path.join(fixtures, 'api', 'offscreen-rendering.html'))
-       })
-     })
- 
-@@ -3308,7 +3339,7 @@
-             done()
-           })
-         })
--        w.loadURL('file://' + fixtures + '/api/offscreen-rendering.html')
-+        w.loadFile(path.join(fixtures, 'api', 'offscreen-rendering.html'))
-       })
-     })
-   })
-changed in both
-  base   100644 1d98e7993946f8f855670da3b53a60677b7d029b spec/api-debugger-spec.js
-  our    100644 0f5cc614c98bfe6c679575bc1a9c76e3b145ac71 spec/api-debugger-spec.js
-  their  100644 405f1c6f08b00ae1cda982bc9f16d0f58c09c082 spec/api-debugger-spec.js
-@@ -33,7 +33,7 @@
-           done()
-         }
-       })
--      w.webContents.loadURL(`file://${path.join(fixtures, 'pages', 'a.html')}`)
-+      w.webContents.loadFile(path.join(fixtures, 'pages', 'a.html'))
-     })
- 
-     it('fails when protocol version is not supported', done => {
-@@ -107,9 +107,14 @@
-     it('fires message event', done => {
-       const url = process.platform !== 'win32'
-         ? `file://${path.join(fixtures, 'pages', 'a.html')}`
-+<<<<<<< .our
-         : `file:///${path.join(fixtures, 'pages', 'a.html').replace(/\\/g, '/')}`
-       w.webContents.loadURL(url)
- 
-+=======
-+        : 'file:///' + path.join(fixtures, 'pages', 'a.html').replace(/\\/g, '/')
-+      w.webContents.loadFile(path.join(fixtures, 'pages', 'a.html'))
-+>>>>>>> .their
-       try {
-         w.webContents.debugger.attach()
-       } catch (err) {
-changed in both
-  base   100644 63e0e24bdc3472bdfaa435ec9b8551648fee6ab7 spec/api-ipc-main-spec.js
-  our    100644 e31369faca4d4ee7ff24fdae4aa9a404ed8d28f4 spec/api-ipc-main-spec.js
-  their  100644 4aae972d5353eca03c78951c0ff8376f3dde2d12 spec/api-ipc-main-spec.js
-@@ -27,7 +27,7 @@
-         event.returnValue = null
-         done()
-       })
--      w.loadURL(`file://${path.join(fixtures, 'api', 'send-sync-message.html')}`)
-+      w.loadFile(path.join(fixtures, 'api', 'send-sync-message.html'))
-     })
- 
-     it('does not crash when reply is sent by multiple listeners', (done) => {
-@@ -39,7 +39,7 @@
-         event.returnValue = null
-         done()
-       })
--      w.loadURL(`file://${path.join(fixtures, 'api', 'send-sync-message.html')}`)
-+      w.loadFile(path.join(fixtures, 'api', 'send-sync-message.html'))
-     })
-   })
- 
-@@ -77,7 +77,7 @@
-         done()
-       })
- 
--      w.loadURL(`file://${path.join(fixtures, 'api', 'render-view-deleted.html')}`)
-+      w.loadFile(path.join(fixtures, 'api', 'render-view-deleted.html'))
-     })
-   })
- })
-changed in both
-  base   100644 679637d52e0ca745ff5dcfa81b4af6717962af63 spec/api-ipc-renderer-spec.js
-  our    100644 748851ec1c0a7e499bdfd9d0ae4cd1be1d02d705 spec/api-ipc-renderer-spec.js
-  their  100644 8f06d3b31ae1500120e0aaace57c0f4227552b3a spec/api-ipc-renderer-spec.js
-@@ -152,7 +152,7 @@
-         ipcRenderer.sendTo(contents.id, 'ping', webContentsId)
-       })
- 
--      contents.loadURL(`file://${path.join(fixtures, 'pages', 'ping-pong.html')}`)
-+      contents.loadFile(path.join(fixtures, 'pages', 'ping-pong.html'))
-     })
-   })
- 
-@@ -180,7 +180,7 @@
- 
-         w.webContents.reload()
-       })
--      w.loadURL(`file://${path.join(fixtures, 'api', 'remote-event-handler.html')}`)
-+      w.loadFile(path.join(fixtures, 'api', 'remote-event-handler.html'))
-     })
-   })
- 
-changed in both
-  base   100644 1b864440fe88bd2559ee00601fe19df8f7e743da spec/api-session-spec.js
-  our    100644 b9093d1d6335ece5ca713a668a67bf3b40f4fabe spec/api-session-spec.js
-  their  100644 da58280a31f8bac185ba69f6bdd4c68edf950a07 spec/api-session-spec.js
-@@ -221,7 +221,7 @@
-         assert.equal(count, 0)
-         done()
-       })
--      w.loadURL('file://' + path.join(fixtures, 'api', 'localstorage.html'))
-+      w.loadFile(path.join(fixtures, 'api', 'localstorage.html'))
-       w.webContents.on('did-finish-load', () => {
-         const options = {
-           origin: 'file://',
-changed in both
-  base   100644 847462e2f48eca7bd5b5fe442fac4a5765542d88 spec/api-web-contents-spec.js
-  our    100644 be02cb3f84001a541d64b11fe6eda50fc32e8afd spec/api-web-contents-spec.js
-  their  100644 aa03921c0db302a49d2c96d612307d1c1ab45feb spec/api-web-contents-spec.js
-@@ -51,7 +51,7 @@
-         done()
-       })
- 
--      w.loadURL(`file://${path.join(fixtures, 'pages', 'webview-zoom-factor.html')}`)
-+      w.loadFile(path.join(fixtures, 'pages', 'webview-zoom-factor.html'))
-       w.webContents.openDevTools()
-     })
-   })
-@@ -150,7 +150,7 @@
- 
-   describe('before-input-event event', () => {
-     it('can prevent document keyboard events', (done) => {
--      w.loadURL(`file://${path.join(__dirname, 'fixtures', 'pages', 'key-events.html')}`)
-+      w.loadFile(path.join(__dirname, 'fixtures', 'pages', 'key-events.html'))
-       w.webContents.once('did-finish-load', () => {
-         ipcMain.once('keydown', (event, key) => {
-           assert.equal(key, 'b')
-@@ -164,7 +164,7 @@
-     })
- 
-     it('has the correct properties', (done) => {
--      w.loadURL(`file://${path.join(__dirname, 'fixtures', 'pages', 'base-page.html')}`)
-+      w.loadFile(path.join(__dirname, 'fixtures', 'pages', 'base-page.html'))
-       w.webContents.once('did-finish-load', () => {
-         const testBeforeInput = (opts) => {
-           return new Promise((resolve, reject) => {
-@@ -250,7 +250,7 @@
- 
-   describe('sendInputEvent(event)', () => {
-     beforeEach((done) => {
--      w.loadURL(`file://${path.join(__dirname, 'fixtures', 'pages', 'key-events.html')}`)
-+      w.loadFile(path.join(__dirname, 'fixtures', 'pages', 'key-events.html'))
-       w.webContents.once('did-finish-load', () => done())
-     })
- 
-@@ -367,7 +367,7 @@
-           done()
-         })
-         w.show()
--        w.loadURL(`file://${path.join(__dirname, 'fixtures', 'pages', 'focus-web-contents.html')}`)
-+        w.loadFile(path.join(fixtures, 'pages', 'focus-web-contents.html'))
-       })
-     })
-   })
-@@ -556,10 +556,10 @@
-         })
-       })
-       ipcMain.once('temporary-zoom-set', (e, zoomLevel) => {
--        w2.loadURL(`file://${fixtures}/pages/c.html`)
-+        w2.loadFile(path.join(fixtures, 'pages', 'c.html'))
-         finalZoomLevel = zoomLevel
-       })
--      w.loadURL(`file://${fixtures}/pages/webframe-zoom.html`)
-+      w.loadFile(path.join(fixtures, 'pages', 'webframe-zoom.html'))
-     })
- 
-     it('cannot persist zoom level after navigation with webFrame', (done) => {
-@@ -581,10 +581,10 @@
-       })
-       ipcMain.once('zoom-level-set', (e, zoomLevel) => {
-         assert.equal(zoomLevel, 0.6)
--        w.loadURL(`file://${fixtures}/pages/d.html`)
-+        w.loadFile(path.join(fixtures, 'pages', 'd.html'))
-         initialNavigation = false
-       })
--      w.loadURL(`file://${fixtures}/pages/c.html`)
-+      w.loadFile(path.join(fixtures, 'pages', 'c.html'))
-     })
-   })
- 
-@@ -611,20 +611,20 @@
-       w.webContents.on('will-prevent-unload', (e) => {
-         assert.fail('should not have fired')
-       })
--      w.loadURL('file://' + path.join(fixtures, 'api', 'close-beforeunload-undefined.html'))
-+      w.loadFile(path.join(fixtures, 'api', 'close-beforeunload-undefined.html'))
-     })
- 
-     it('emits if beforeunload returns false', (done) => {
-       w.webContents.on('will-prevent-unload', () => {
-         done()
-       })
--      w.loadURL('file://' + path.join(fixtures, 'api', 'close-beforeunload-false.html'))
-+      w.loadFile(path.join(fixtures, 'api', 'close-beforeunload-false.html'))
-     })
- 
-     it('supports calling preventDefault on will-prevent-unload events', (done) => {
-       ipcRenderer.send('prevent-next-will-prevent-unload', w.webContents.id)
-       w.once('closed', () => done())
--      w.loadURL('file://' + path.join(fixtures, 'api', 'close-beforeunload-false.html'))
-+      w.loadFile(path.join(fixtures, 'api', 'close-beforeunload-false.html'))
-     })
-   })
- 
-@@ -708,13 +708,13 @@
-         if (count === 0) {
-           count += 1
-           assert.equal(color, '#FFEEDD')
--          w.loadURL(`file://${path.join(__dirname, 'fixtures', 'pages', 'base-page.html')}`)
-+          w.loadFile(path.join(fixtures, 'pages', 'base-page.html'))
-         } else if (count === 1) {
-           assert.equal(color, null)
-           done()
-         }
-       })
--      w.loadURL(`file://${path.join(__dirname, 'fixtures', 'pages', 'theme-color.html')}`)
-+      w.loadFile(path.join(fixtures, 'pages', 'theme-color.html'))
-     })
-   })
- 
-@@ -726,7 +726,7 @@
-           done()
-         }
-       })
--      w.loadURL(`file://${fixtures}/pages/a.html`)
-+      w.loadFile(path.join(fixtures, 'pages', 'a.html'))
-     })
-   })
- 
-changed in both
-  base   100644 f87554f32e267b46fe3501405617a289b6cccedb spec/asar-spec.js
-  our    100644 489f68c96d41e80c308560a98486a07756a03be7 spec/asar-spec.js
-  their  100644 9d70de09cb48b015115a90a5d9736c737100a434 spec/asar-spec.js
-@@ -1003,7 +1003,6 @@
-   })
- 
-   describe('asar protocol', function () {
--    var url = require('url')
-     var w = null
- 
-     afterEach(function () {
-@@ -1064,16 +1063,11 @@
-         height: 400
-       })
-       var p = path.resolve(fixtures, 'asar', 'web.asar', 'index.html')
--      var u = url.format({
--        protocol: 'file',
--        slashed: true,
--        pathname: p
--      })
-       ipcMain.once('dirname', function (event, dirname) {
-         assert.equal(dirname, path.dirname(p))
-         done()
-       })
--      w.loadURL(u)
-+      w.loadFile(p)
-     })
- 
-     it('loads script tag in html', function (done) {
-@@ -1087,12 +1081,7 @@
-         height: 400
-       })
-       var p = path.resolve(fixtures, 'asar', 'script.asar', 'index.html')
--      var u = url.format({
--        protocol: 'file',
--        slashed: true,
--        pathname: p
--      })
--      w.loadURL(u)
-+      w.loadFile(p)
-       ipcMain.once('ping', function (event, message) {
-         assert.equal(message, 'pong')
-         done()
-@@ -1112,12 +1101,7 @@
-         height: 400
-       })
-       var p = path.resolve(fixtures, 'asar', 'video.asar', 'index.html')
--      var u = url.format({
--        protocol: 'file',
--        slashed: true,
--        pathname: p
--      })
--      w.loadURL(u)
-+      w.loadFile(p)
-       ipcMain.on('asar-video', function (event, message, error) {
-         if (message === 'ended') {
-           assert(!error)
-changed in both
-  base   100644 05b833fae9a82dd08457ee8854a2a416b0f54941 spec/chromium-spec.js
-  our    100644 d90269769d269e4054d25cba4b6c4ac8a1929aa6 spec/chromium-spec.js
-  their  100644 7931e728334de04cbacada65b897881345a5c6c4 spec/chromium-spec.js
-@@ -145,7 +145,7 @@
-           })
-         }
-       })
--      w.loadURL(`file://${fixtures}/pages/media-id-reset.html`)
-+      w.loadFile(path.join(fixtures, 'pages', 'media-id-reset.html'))
-     })
-   })
- 
-@@ -184,7 +184,7 @@
-         }
-       })
-       w.webContents.on('crashed', () => done(new Error('WebContents crashed.')))
--      w.loadURL(`file://${fixtures}/pages/service-worker/index.html`)
-+      w.loadFile(path.join(fixtures, 'pages', 'service-worker', 'index.html'))
-     })
- 
-     it('should register for intercepted file scheme', (done) => {
-@@ -222,7 +222,7 @@
-         }
-       })
-       w.webContents.on('crashed', () => done(new Error('WebContents crashed.')))
--      w.loadURL(`file://${fixtures}/pages/service-worker/index.html`)
-+      w.loadFile(path.join(fixtures, 'pages', 'service-worker', 'index.html'))
-     })
-   })
- 
-@@ -275,7 +275,7 @@
-           w.close()
-           done()
-         })
--        w.loadURL(`file://${fixtures}/pages/window-open.html`)
-+        w.loadFile(path.join(fixtures, 'pages', 'window-open.html'))
-       })
-     }
- 
-@@ -396,7 +396,7 @@
- 
-     it('handles cycles when merging the parent options into the child options', (done) => {
-       w = BrowserWindow.fromId(ipcRenderer.sendSync('create-window-with-options-cycle'))
--      w.loadURL(`file://${fixtures}/pages/window-open.html`)
-+      w.loadFile(path.join(fixtures, 'pages', 'window-open.html'))
-       w.webContents.once('new-window', (event, url, frameName, disposition, options) => {
-         assert.equal(options.show, false)
-         assert.deepEqual(options.foo, {
-@@ -513,15 +513,13 @@
-   })
- 
-   describe('window.opener', () => {
--    let url = `file://${fixtures}/pages/window-opener.html`
--
-     it('is null for main window', (done) => {
-       w = new BrowserWindow({ show: false })
-       w.webContents.once('ipc-message', (event, args) => {
-         assert.deepEqual(args, ['opener', null])
-         done()
-       })
--      w.loadURL(url)
-+      w.loadFile(path.join(fixtures, 'pages', 'window-opener.html'))
-     })
- 
-     it('is not null for window opened by window.open', (done) => {
-@@ -1101,7 +1099,7 @@
-           assert.equal(parsedURL.query.src, pagePath)
-           assert.equal(w.webContents.getTitle(), 'cat.pdf')
-         })
--        w.webContents.loadURL(pagePath)
-+        w.loadFile(path.join(fixtures, 'pages', page))
-       }
-     })
- 
-merged
-  result 100644 27dfd3286919f69c119d25c0a7f0928791458f17 spec/fixtures/no-proprietary-codecs.js
-  our    100644 23a7d815a9249d4191d7d5045a83fa683b14824b spec/fixtures/no-proprietary-codecs.js
-@@ -6,7 +6,6 @@
- 
- const {app, BrowserWindow, ipcMain} = require('electron')
- const path = require('path')
--const url = require('url')
- 
- const MEDIA_ERR_SRC_NOT_SUPPORTED = 4
- const FIVE_MINUTES = 5 * 60 * 1000
-@@ -18,11 +17,7 @@
-     show: false
-   })
- 
--  window.loadURL(url.format({
--    protocol: 'file',
--    slashed: true,
--    pathname: path.resolve(__dirname, 'asar', 'video.asar', 'index.html')
--  }))
-+  window.loadFile(path.resolve(__dirname, 'asar', 'video.asar', 'index.html'))
- 
-   ipcMain.on('asar-video', (event, message, error) => {
-     if (message === 'ended') {
-changed in both
-  base   100644 072719e6ad8abdae8dd664b2fec2e1267cfe8ad2 spec/webview-spec.js
-  our    100644 db75a4e3754e24a5e6740be61be4f4098c58006e spec/webview-spec.js
-  their  100644 6accbb6d262f77253d7c75b132634699ec68a9bc spec/webview-spec.js
-@@ -64,10 +64,17 @@
-     return closeTheWindow()
-   })
- 
-+<<<<<<< .our
-   it('works without script tag in page', async () => {
-     const w = await openTheWindow({show: false})
-     w.loadURL('file://' + fixtures + '/pages/webview-no-script.html')
-     await emittedOnce(ipcMain, 'pong')
-+=======
-+  it('works without script tag in page', (done) => {
-+    w = new BrowserWindow({show: false})
-+    ipcMain.once('pong', () => done())
-+    w.loadFile(path.join(fixtures, 'pages', 'webview-no-script.html'))
-+>>>>>>> .their
-   })
- 
-   it('is disabled when nodeIntegration is disabled', async () => {
-@@ -78,11 +85,22 @@
-         preload: path.join(fixtures, 'module', 'preload-webview.js')
-       }
-     })
-+<<<<<<< .our
- 
-     w.loadURL(`file://${fixtures}/pages/webview-no-script.html`)
-     const [, type] = await emittedOnce(ipcMain, 'webview')
- 
-     expect(type).to.equal('undefined', 'WebView still exists')
-+=======
-+    ipcMain.once('webview', (event, type) => {
-+      if (type === 'undefined') {
-+        done()
-+      } else {
-+        done('WebView still exists')
-+      }
-+    })
-+    w.loadFile(path.join(fixtures, 'pages', 'webview-no-script.html'))
-+>>>>>>> .their
-   })
- 
-   it('is enabled when the webviewTag option is enabled and the nodeIntegration option is disabled', async () => {
-@@ -94,11 +112,22 @@
-         webviewTag: true
-       }
-     })
-+<<<<<<< .our
- 
-     w.loadURL(`file://${fixtures}/pages/webview-no-script.html`)
-     const [, type] = await emittedOnce(ipcMain, 'webview')
- 
-     expect(type).to.not.equal('undefined', 'WebView is not created')
-+=======
-+    ipcMain.once('webview', (event, type) => {
-+      if (type !== 'undefined') {
-+        done()
-+      } else {
-+        done('WebView is not created')
-+      }
-+    })
-+    w.loadFile(path.join(fixtures, 'pages', 'webview-no-script.html'))
-+>>>>>>> .their
-   })
- 
-   describe('src attribute', () => {
-@@ -1160,9 +1189,14 @@
-       assert.equal(visibilityState, 'visible')
-     })
- 
-+<<<<<<< .our
-     it('inherits the parent window visibility state and receives visibilitychange events', async () => {
-       const w = await openTheWindow({ show: false })
-       w.loadURL(`file://${fixtures}/pages/webview-visibilitychange.html`)
-+=======
-+      w.loadFile(path.join(fixtures, 'pages', 'webview-visibilitychange.html'))
-+    })
-+>>>>>>> .their
- 
-       let [, visibilityState, hidden] = await emittedOnce(ipcMain, 'pong')
-       assert.equal(visibilityState, 'hidden')
-@@ -1177,6 +1211,10 @@
-         assert.equal(visibilityState, 'visible')
-         assert.equal(hidden, false)
-       })
-+<<<<<<< .our
-+=======
-+      w.loadFile(path.join(fixtures, 'pages', 'webview-visibilitychange.html'))
-+>>>>>>> .their
-     })
-   })
- 
-@@ -1232,6 +1270,7 @@
-   })
- 
-   describe('did-attach-webview event', () => {
-+<<<<<<< .our
-     it('is emitted when a webview has been attached', async () => {
-       const w = await openTheWindow({ show: false })
-       w.loadURL(`file://${fixtures}/pages/webview-did-attach-event.html`)
-@@ -1239,6 +1278,17 @@
-       const [, webContents] = await emittedOnce(w.webContents, 'did-attach-webview')
-       const [, id] = await emittedOnce(ipcMain, 'webview-dom-ready')
-       expect(webContents.id).to.equal(id)
-+=======
-+    it('is emitted when a webview has been attached', (done) => {
-+      w = new BrowserWindow({ show: false })
-+      w.webContents.on('did-attach-webview', (event, webContents) => {
-+        ipcMain.once('webview-dom-ready', (event, id) => {
-+          assert.equal(webContents.id, id)
-+          done()
-+        })
-+      })
-+      w.loadFile(path.join(fixtures, 'pages', 'webview-did-attach-event.html'))
-+>>>>>>> .their
-     })
-   })
- 
-@@ -1249,11 +1299,248 @@
-     const extensionPath = path.join(__dirname, 'fixtures', 'devtools-extensions', 'foo')
-     BrowserWindow.addDevToolsExtension(extensionPath)
- 
--    w.loadURL(`file://${fixtures}/pages/webview-devtools.html`)
-+    w.loadFile(path.join(fixtures, 'pages', 'webview-devtools.html'))
- 
-+<<<<<<< .our
-     const [, {runtimeId, tabId}] = await emittedOnce(ipcMain, 'answer')
-     expect(runtimeId).to.equal('foo')
-     expect(tabId).to.be.not.equal(w.webContents.id)
-+=======
-+    ipcMain.once('answer', (event, message) => {
-+      assert.equal(message.runtimeId, 'foo')
-+      assert.notEqual(message.tabId, w.webContents.id)
-+      done()
-+    })
-+  })
-+
-+  describe('guestinstance attribute', () => {
-+    it('before loading there is no attribute', () => {
-+      loadWebView(webview)  // Don't wait for loading to finish.
-+      assert(!webview.hasAttribute('guestinstance'))
-+    })
-+
-+    it('loading a page sets the guest view', async () => {
-+      await loadWebView(webview, {
-+        src: `file://${fixtures}/api/blank.html`
-+      })
-+
-+      const instance = webview.getAttribute('guestinstance')
-+      assert.equal(instance, parseInt(instance))
-+
-+      const guest = getGuestWebContents(parseInt(instance))
-+      assert.equal(guest, webview.getWebContents())
-+    })
-+
-+    it('deleting the attribute destroys the webview', async () => {
-+      await loadWebView(webview, {
-+        src: `file://${fixtures}/api/blank.html`
-+      })
-+
-+      const instance = parseInt(webview.getAttribute('guestinstance'))
-+      const waitForDestroy = waitForEvent(webview, 'destroyed')
-+      webview.removeAttribute('guestinstance')
-+
-+      await waitForDestroy
-+      assert.equal(getGuestWebContents(instance), null)
-+    })
-+
-+    it('setting the attribute on a new webview moves the contents', (done) => {
-+      const loadListener = () => {
-+        const webContents = webview.getWebContents()
-+        const instance = webview.getAttribute('guestinstance')
-+
-+        const destroyListener = () => {
-+          assert.equal(webContents, webview2.getWebContents())
-+
-+          // Make sure that events are hooked up to the right webview now
-+          webview2.addEventListener('console-message', (e) => {
-+            assert.equal(e.message, 'a')
-+            document.body.removeChild(webview2)
-+            done()
-+          })
-+
-+          webview2.src = `file://${fixtures}/pages/a.html`
-+        }
-+        webview.addEventListener('destroyed', destroyListener, {once: true})
-+
-+        const webview2 = new WebView()
-+        loadWebView(webview2, {
-+          guestinstance: instance
-+        })
-+      }
-+      webview.addEventListener('did-finish-load', loadListener, {once: true})
-+      loadWebView(webview, {
-+        src: `file://${fixtures}/api/blank.html`
-+      })
-+    })
-+
-+    it('setting the attribute to an invalid guestinstance does nothing', async () => {
-+      await loadWebView(webview, {
-+        src: `file://${fixtures}/api/blank.html`
-+      })
-+      webview.setAttribute('guestinstance', 55)
-+
-+      // Make sure that events are still hooked up to the webview
-+      const waitForMessage = waitForEvent(webview, 'console-message')
-+      webview.src = `file://${fixtures}/pages/a.html`
-+      const {message} = await waitForMessage
-+      assert.equal(message, 'a')
-+    })
-+
-+    it('setting the attribute on an existing webview moves the contents', (done) => {
-+      const load1Listener = () => {
-+        const webContents = webview.getWebContents()
-+        const instance = webview.getAttribute('guestinstance')
-+        let destroyedInstance
-+
-+        const destroyListener = () => {
-+          assert.equal(webContents, webview2.getWebContents())
-+          assert.equal(null, getGuestWebContents(parseInt(destroyedInstance)))
-+
-+          // Make sure that events are hooked up to the right webview now
-+          webview2.addEventListener('console-message', (e) => {
-+            assert.equal(e.message, 'a')
-+            document.body.removeChild(webview2)
-+            done()
-+          })
-+
-+          webview2.src = 'file://' + fixtures + '/pages/a.html'
-+        }
-+        webview.addEventListener('destroyed', destroyListener, {once: true})
-+
-+        const webview2 = new WebView()
-+        const load2Listener = () => {
-+          destroyedInstance = webview2.getAttribute('guestinstance')
-+          assert.notEqual(instance, destroyedInstance)
-+
-+          webview2.setAttribute('guestinstance', instance)
-+        }
-+        webview2.addEventListener('did-finish-load', load2Listener, {once: true})
-+        loadWebView(webview2, {
-+          src: `file://${fixtures}/api/blank.html`
-+        })
-+      }
-+
-+      webview.addEventListener('did-finish-load', load1Listener, {once: true})
-+      loadWebView(webview, {
-+        src: `file://${fixtures}/api/blank.html`
-+      })
-+    })
-+
-+    it('moving a guest back to its original webview should work', (done) => {
-+      const loadListener = () => {
-+        const webContents = webview.getWebContents()
-+        const instance = webview.getAttribute('guestinstance')
-+
-+        const destroy1Listener = () => {
-+          assert.equal(webContents, webview2.getWebContents())
-+          assert.equal(null, webview.getWebContents())
-+
-+          const destroy2Listener = () => {
-+            assert.equal(webContents, webview.getWebContents())
-+            assert.equal(null, webview2.getWebContents())
-+
-+            // Make sure that events are hooked up to the right webview now
-+            webview.addEventListener('console-message', (e) => {
-+              document.body.removeChild(webview2)
-+              assert.equal(e.message, 'a')
-+              done()
-+            })
-+
-+            webview.src = `file://${fixtures}/pages/a.html`
-+          }
-+          webview2.addEventListener('destroyed', destroy2Listener, {once: true})
-+          webview.setAttribute('guestinstance', instance)
-+        }
-+        webview.addEventListener('destroyed', destroy1Listener, {once: true})
-+
-+        const webview2 = new WebView()
-+        webview2.setAttribute('guestinstance', instance)
-+        document.body.appendChild(webview2)
-+      }
-+
-+      webview.addEventListener('did-finish-load', loadListener, {once: true})
-+      loadWebView(webview, {
-+        src: `file://${fixtures}/api/blank.html`
-+      })
-+    })
-+
-+    it('setting the attribute on a webview in a different window moves the contents', (done) => {
-+      const loadListener = () => {
-+        const instance = webview.getAttribute('guestinstance')
-+
-+        w = new BrowserWindow({ show: false })
-+        w.webContents.once('did-finish-load', () => {
-+          ipcMain.once('pong', () => {
-+            assert(!webview.hasAttribute('guestinstance'))
-+            done()
-+          })
-+
-+          w.webContents.send('guestinstance', instance)
-+        })
-+        w.loadFile(path.join(fixtures, 'pages', 'webview-move-to-window.html'))
-+      }
-+      webview.addEventListener('did-finish-load', loadListener, {once: true})
-+      webview.src = `file://${fixtures}/api/blank.html`
-+      document.body.appendChild(webview)
-+    })
-+
-+    it('does not delete the guestinstance attribute when moving the webview to another parent node', (done) => {
-+      webview.addEventListener('dom-ready', function domReadyListener () {
-+        webview.addEventListener('did-attach', () => {
-+          assert(webview.guestinstance != null)
-+          assert(webview.getWebContents() != null)
-+          done()
-+        })
-+
-+        document.body.replaceChild(webview, div)
-+      })
-+      webview.src = `file://${fixtures}/pages/a.html`
-+
-+      const div = document.createElement('div')
-+      div.appendChild(webview)
-+      document.body.appendChild(div)
-+    })
-+
-+    it('does not destroy the webContents when hiding/showing the webview (regression)', (done) => {
-+      webview.addEventListener('dom-ready', function domReadyListener () {
-+        const instance = webview.getAttribute('guestinstance')
-+        assert(instance != null)
-+
-+        // Wait for event directly since attach happens asynchronously over IPC
-+        ipcMain.once('ELECTRON_GUEST_VIEW_MANAGER_ATTACH_GUEST', () => {
-+          assert(webview.getWebContents() != null)
-+          assert.equal(instance, webview.getAttribute('guestinstance'))
-+          done()
-+        })
-+
-+        webview.style.display = 'none'
-+        webview.offsetHeight // eslint-disable-line
-+        webview.style.display = 'block'
-+      })
-+      webview.src = `file://${fixtures}/pages/a.html`
-+      document.body.appendChild(webview)
-+    })
-+
-+    it('does not reload the webContents when hiding/showing the webview (regression)', (done) => {
-+      webview.addEventListener('dom-ready', function domReadyListener () {
-+        webview.addEventListener('did-start-loading', () => {
-+          done(new Error('webview started loading unexpectedly'))
-+        })
-+
-+        // Wait for event directly since attach happens asynchronously over IPC
-+        webview.addEventListener('did-attach', () => {
-+          done()
-+        })
-+
-+        webview.style.display = 'none'
-+        webview.offsetHeight  // eslint-disable-line
-+        webview.style.display = 'block'
-+      })
-+      webview.src = `file://${fixtures}/pages/a.html`
-+      document.body.appendChild(webview)
-+    })
-+>>>>>>> .their
-   })
- 
-   describe('DOM events', () => {
-@@ -1280,10 +1567,22 @@
-       div.appendChild(webview)
-       document.body.appendChild(div)
- 
-+<<<<<<< .our
-       const firstResizeEvent = await firstResizeSignal
-       expect(firstResizeEvent.target).to.equal(webview)
-       expect(firstResizeEvent.newWidth).to.equal(100)
-       expect(firstResizeEvent.newHeight).to.equal(10)
-+=======
-+  describe('disableguestresize attribute', () => {
-+    it('does not have attribute by default', () => {
-+      document.body.appendChild(webview)
-+      assert(!webview.hasAttribute('disableguestresize'))
-+    })
-+
-+    it('resizes guest when attribute is not present', (done) => {
-+      w = new BrowserWindow({show: false, width: 200, height: 200})
-+      w.loadFile(path.join(fixtures, 'pages', 'webview-guest-resize.html'))
-+>>>>>>> .their
- 
-       await domReadySignal
- 
-@@ -1294,10 +1593,92 @@
-       div.style.width = `${newWidth}px`
-       div.style.height = `${newHeight}px`
- 
-+<<<<<<< .our
-       const secondResizeEvent = await secondResizeSignal
-       expect(secondResizeEvent.target).to.equal(webview)
-       expect(secondResizeEvent.newWidth).to.equal(newWidth)
-       expect(secondResizeEvent.newHeight).to.equal(newHeight)
-+=======
-+        w.setContentSize(CONTENT_SIZE, CONTENT_SIZE)
-+      })
-+    })
-+
-+    it('does not resize guest when attribute is present', done => {
-+      w = new BrowserWindow({show: false, width: 200, height: 200})
-+      w.loadFile(path.join(fixtures, 'pages', 'webview-no-guest-resize.html'))
-+
-+      w.webContents.once('did-finish-load', () => {
-+        const CONTENT_SIZE = 300
-+
-+        const elementResizePromise = new Promise(resolve => {
-+          ipcMain.once('webview-element-resize', (event, width, height) => {
-+            assert.equal(width, CONTENT_SIZE)
-+            assert.equal(height, CONTENT_SIZE)
-+            resolve()
-+          })
-+        })
-+
-+        const noGuestResizePromise = new Promise(resolve => {
-+          const onGuestResize = (event, width, height) => {
-+            done(new Error('Unexpected guest resize message'))
-+          }
-+          ipcMain.once('webview-guest-resize', onGuestResize)
-+
-+          setTimeout(() => {
-+            ipcMain.removeListener('webview-guest-resize', onGuestResize)
-+            resolve()
-+          }, 500)
-+        })
-+
-+        Promise.all([elementResizePromise, noGuestResizePromise]).then(() => done())
-+
-+        w.setContentSize(CONTENT_SIZE, CONTENT_SIZE)
-+      })
-+    })
-+
-+    it('dispatches element resize event even when attribute is present', done => {
-+      w = new BrowserWindow({show: false, width: 200, height: 200})
-+      w.loadFile(path.join(fixtures, 'pages', 'webview-no-guest-resize.html'))
-+
-+      w.webContents.once('did-finish-load', () => {
-+        const CONTENT_SIZE = 300
-+
-+        ipcMain.once('webview-element-resize', (event, width, height) => {
-+          assert.equal(width, CONTENT_SIZE)
-+          done()
-+        })
-+
-+        w.setContentSize(CONTENT_SIZE, CONTENT_SIZE)
-+      })
-+    })
-+
-+    it('can be manually resized with setSize even when attribute is present', function (done) {
-+      w = new BrowserWindow({show: false, width: 200, height: 200})
-+      w.loadFile(path.join(fixtures, 'pages', 'webview-no-guest-resize.html'))
-+
-+      w.webContents.once('did-finish-load', () => {
-+        const GUEST_WIDTH = 10
-+        const GUEST_HEIGHT = 20
-+
-+        ipcMain.once('webview-guest-resize', (event, width, height) => {
-+          assert.equal(width, GUEST_WIDTH)
-+          assert.equal(height, GUEST_HEIGHT)
-+          done()
-+        })
-+
-+        for (const wc of webContents.getAllWebContents()) {
-+          if (wc.hostWebContents &&
-+              wc.hostWebContents.id === w.webContents.id) {
-+            wc.setSize({
-+              normal: {
-+                width: GUEST_WIDTH,
-+                height: GUEST_HEIGHT
-+              }
-+            })
-+          }
-+        }
-+      })
-+>>>>>>> .their
-     })
-   })
- 
-@@ -1324,11 +1705,20 @@
-           zoomFactor: 1.2
-         }
-       })
-+<<<<<<< .our
-       w.loadURL(`file://${fixtures}/pages/webview-zoom-factor.html`)
- 
-       const [, zoomFactor, zoomLevel] = await emittedOnce(ipcMain, 'webview-parent-zoom-level')
-       expect(zoomFactor).to.equal(1.2)
-       expect(zoomLevel).to.equal(1)
-+=======
-+      ipcMain.once('webview-parent-zoom-level', (event, zoomFactor, zoomLevel) => {
-+        assert.equal(zoomFactor, 1.2)
-+        assert.equal(zoomLevel, 1)
-+        done()
-+      })
-+      w.loadFile(path.join(fixtures, 'pages', 'webview-zoom-factor.html'))
-+>>>>>>> .their
-     })
- 
-     it('maintains zoom level on navigation', async () => {
-@@ -1358,6 +1748,20 @@
- 
-         return promise
-       })
-+<<<<<<< .our
-+=======
-+      ipcMain.on('webview-zoom-level', (event, zoomLevel, zoomFactor, newHost, final) => {
-+        if (!newHost) {
-+          assert.equal(zoomFactor, 1.44)
-+          assert.equal(zoomLevel, 2.0)
-+        } else {
-+          assert.equal(zoomFactor, 1.2)
-+          assert.equal(zoomLevel, 1)
-+        }
-+        if (final) done()
-+      })
-+      w.loadFile(path.join(fixtures, 'pages', 'webview-custom-zoom-level.html'))
-+>>>>>>> .their
-     })
- 
-     it('maintains zoom level when navigating within same page', async () => {
-@@ -1382,6 +1786,15 @@
- 
-         return promise
-       })
-+<<<<<<< .our
-+=======
-+      ipcMain.on('webview-zoom-in-page', (event, zoomLevel, zoomFactor, final) => {
-+        assert.equal(zoomFactor, 1.44)
-+        assert.equal(zoomLevel, 2.0)
-+        if (final) done()
-+      })
-+      w.loadFile(path.join(fixtures, 'pages', 'webview-in-page-navigate.html'))
-+>>>>>>> .their
-     })
- 
-     it('inherits zoom level for the origin when available', async () => {
-@@ -1391,10 +1804,18 @@
-           zoomFactor: 1.2
-         }
-       })
-+<<<<<<< .our
-       w.loadURL(`file://${fixtures}/pages/webview-origin-zoom-level.html`)
- 
-       const [, zoomLevel] = await emittedOnce(ipcMain, 'webview-origin-zoom-level')
-       expect(zoomLevel).to.equal(2.0)
-+=======
-+      ipcMain.once('webview-origin-zoom-level', (event, zoomLevel) => {
-+        assert.equal(zoomLevel, 2.0)
-+        done()
-+      })
-+      w.loadFile(path.join(fixtures, 'pages', 'webview-origin-zoom-level.html'))
-+>>>>>>> .their
-     })
-   })
- 
diff --git a/app/test/fixtures/merge-parser/electron/merge-miniak-web-contents-type-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-miniak-web-contents-type-into-master.txt
deleted file mode 100644
index ff6b3ba7c15..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-miniak-web-contents-type-into-master.txt
+++ /dev/null
@@ -1,82 +0,0 @@
-merged
-  result 100644 4c4b6c6d0dc41877c19240adbfb7d552e0194239 atom/browser/api/atom_api_browser_view.cc
-  our    100644 bd83208694c61c4d7c43ce4be26939c2682b2a13 atom/browser/api/atom_api_browser_view.cc
-@@ -60,7 +60,7 @@
-                        const mate::Dictionary& options) {
-   mate::Dictionary web_preferences = mate::Dictionary::CreateEmpty(isolate);
-   options.Get(options::kWebPreferences, &web_preferences);
--  web_preferences.Set("isBrowserView", true);
-+  web_preferences.Set("type", "browserView");
-   mate::Handle<class WebContents> web_contents =
-       WebContents::Create(isolate, web_preferences);
- 
-changed in both
-  base   100644 7a578e153cba0cd75c1fc1ddfc4bd1b9a7490658 atom/browser/api/atom_api_web_contents.cc
-  our    100644 20a1ac2e672f08ffea528b6e094ba530ff8083d1 atom/browser/api/atom_api_web_contents.cc
-  their  100644 26d163eb76204459f5ee32cf07b1e64d066d15b7 atom/browser/api/atom_api_web_contents.cc
-@@ -332,20 +332,16 @@
-   // Read options.
-   options.Get("backgroundThrottling", &background_throttling_);
- 
--  // FIXME(zcbenz): We should read "type" parameter for better design, but
--  // on Windows we have encountered a compiler bug that if we read "type"
--  // from |options| and then set |type_|, a memory corruption will happen
--  // and Electron will soon crash.
--  // Remvoe this after we upgraded to use VS 2015 Update 3.
-+  // Get type
-+  options.Get("type", &type_);
-+
-   bool b = false;
--  if (options.Get("isGuest", &b) && b)
--    type_ = WEB_VIEW;
--  else if (options.Get("isBackgroundPage", &b) && b)
--    type_ = BACKGROUND_PAGE;
--  else if (options.Get("isBrowserView", &b) && b)
--    type_ = BROWSER_VIEW;
- #if defined(ENABLE_OSR)
-+<<<<<<< .our
-   else if (options.Get(options::kOffscreen, &b) && b)
-+=======
-+  if (options.Get("offscreen", &b) && b)
-+>>>>>>> .their
-     type_ = OFF_SCREEN;
- #endif
- 
-merged
-  result 100644 e6952bdede4c7560332576a0e208a74c3b52ac41 lib/browser/chrome-extension.js
-  our    100644 4132aedadd759f56db7eceabd6327d1b29aa09eb lib/browser/chrome-extension.js
-@@ -85,7 +85,7 @@
- 
-   const contents = webContents.create({
-     partition: 'persist:__chrome_extension',
--    isBackgroundPage: true,
-+    type: 'backgroundPage',
-     commandLineSwitches: ['--background-page']
-   })
-   backgroundPages[manifest.extensionId] = { html: html, webContents: contents, name: name }
-changed in both
-  base   100644 e7f620a6e291fa1af83f025e862b3d3c076a36f2 lib/browser/guest-view-manager.js
-  our    100644 1e4029e39a981c85fb6ff18c5ccd52f81b3c56f2 lib/browser/guest-view-manager.js
-  their  100644 96a475c32f35fe411cfe5c3d0429959848ee7f34 lib/browser/guest-view-manager.js
-@@ -59,7 +59,7 @@
- 
-   const guestInstanceId = getNextGuestInstanceId(embedder)
-   const guest = webContents.create({
--    isGuest: true,
-+    type: 'webView',
-     partition: params.partition,
-     embedder: embedder
-   })
-changed in both
-  base   100644 8e2aa3bb988208ec4f266d3169020daca4068de3 lib/browser/guest-window-manager.js
-  our    100644 7253c1942b0956ae6b9b0c80a23470fc26669b8a lib/browser/guest-window-manager.js
-  their  100644 0c5bf15b49299dd848d1234ea7586e746f1fb30f lib/browser/guest-window-manager.js
-@@ -25,7 +25,7 @@
- 
-   visited.add(parent)
-   for (const key in parent) {
--    if (key === 'isBrowserView') continue
-+    if (key === 'type') continue
-     if (!hasProp.call(parent, key)) continue
-     if (key in child && key !== 'webPreferences') continue
- 
diff --git a/app/test/fixtures/merge-parser/electron/merge-nornagon-gn-ci-builds-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-nornagon-gn-ci-builds-into-master.txt
deleted file mode 100644
index 0a8baff6106..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-nornagon-gn-ci-builds-into-master.txt
+++ /dev/null
@@ -1,153 +0,0 @@
-changed in both
-  base   100644 e6a7f7175c58e9683bd93bdd0aa5f7cedad6acdc .circleci/config.yml
-  our    100644 6d44d618aabcce04c60344f2274dec5b0c2a1f68 .circleci/config.yml
-  their  100644 d5b016958044d1a0f9cbdee07182512d170a4d5f .circleci/config.yml
-@@ -510,6 +510,7 @@
-       xcode: "8.3.3"
-     <<: *build-steps
- 
-+<<<<<<< .our
-   electron-gn-linux-x64-debug-fyi:
-     environment:
-       DISPLAY: ':99.0'
-@@ -668,32 +669,108 @@
-       GN_EXTRA_ARGS: 'is_mas_build = true'
-     <<: *gn-mac-build-machine
-     <<: *gn-mac-build-steps
-+=======
-+  electron-linux-gn:
-+    environment:
-+      NIGHTLY_BUILD: true
-+    docker:
-+      - image: electronbuilds/electron:0.0.8
-+    resource_class: 2xlarge
-+    steps:
-+      - run:
-+          name: Setup depot tools
-+          command: |
-+            git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
-+            echo 'export PATH=$PATH:`pwd`/depot_tools' >> $BASH_ENV
-+      - checkout:
-+          path: src/electron
-+      - restore_cache:
-+          paths:
-+            - ~/.gclient-cache
-+          keys:
-+            - v1-gclient-cache-{{ checksum "src/electron/DEPS" }}
-+            - v1-gclient-cache-
-+      - run:
-+          name: Gclient sync
-+          command: |
-+            echo $PATH
-+            gclient config \
-+              --name "src/electron" \
-+              --unmanaged \
-+              --cache-dir "$HOME/.gclient-cache" \
-+              "https://github.com/electron/electron"
-+
-+            gclient sync --with_branch_heads --with_tags
-+      - save_cache:
-+          paths:
-+            - ~/.gclient-cache
-+          key: v1-gclient-cache-{{ checksum "src/electron/DEPS" }}
-+      - run:
-+          name: GN gen
-+          command: |
-+            cd src
-+            echo 'export CHROMIUM_BUILDTOOLS_PATH=`pwd`/buildtools' >> $BASH_ENV
-+            source $BASH_ENV
-+            gn gen out/Default --args='root_extra_deps=["//electron"] is_electron_build=true is_component_build=true use_jumbo_build=true v8_promise_internal_field_count=1 v8_typed_array_max_size_in_heap=0'
-+      - run:
-+          name: Ninja build
-+          command: |
-+            cd src
-+            ninja -C out/Default electron:electron_app
-+      - run:
-+          name: Setup for headless testing
-+          environment:
-+            DISPLAY: ':99.0'
-+          command: |
-+            sh -e /etc/init.d/xvfb start
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+            cd src
-+            ninja -C out/Default electron/build/node:headers
-+            export npm_config_nodedir="$PWD/out/Default/gen/node_headers"
-+            (cd electron/spec && npm install)
-+            ./out/Default/electron electron/spec --ci
-+      - store_test_results:
-+          path: src/junit
-+      - store_artifacts:
-+          path: src/junit
-+      - <<: *notify-slack-failure
-+      - <<: *notify-slack-success
-+>>>>>>> .their
- 
- workflows:
-   version: 2
--  build-arm:
--    jobs:
--      - electron-linux-arm
--      - electron-linux-arm-test:
--          requires:
--            - electron-linux-arm
--  build-arm64:
--    jobs:
--      - electron-linux-arm64
--      - electron-linux-arm64-test:
--          requires:
--            - electron-linux-arm64
--  build-ia32:
--    jobs:
--      - electron-linux-ia32
--  build-x64:
--    jobs:
--      - electron-linux-x64
--  build-osx-x64:
--    jobs:
--      - electron-osx-x64
--  build-mas-x64:
-+#  build-arm:
-+#    jobs:
-+#      - electron-linux-arm
-+#      - electron-linux-arm-test:
-+#          requires:
-+#            - electron-linux-arm
-+#  build-arm64:
-+#    jobs:
-+#      - electron-linux-arm64
-+#      - electron-linux-arm64-test:
-+#          requires:
-+#            - electron-linux-arm64
-+#  build-ia32:
-+#    jobs:
-+#      - electron-linux-ia32
-+#  build-x64:
-+#    jobs:
-+#      - electron-linux-x64
-+#  build-osx-x64:
-+#    jobs:
-+#      - electron-osx-x64
-+#  build-mas-x64:
-+#    jobs:
-+#      - electron-mas-x64
-+  build-gn-linux:
-     jobs:
-+<<<<<<< .our
-       - electron-mas-x64
-   build-gn-linux:
-     jobs:
-@@ -711,6 +788,9 @@
-       - electron-gn-mas-testing-fyi
-       - electron-gn-osx-debug-fyi
-       - electron-gn-osx-testing-fyi
-+=======
-+      - electron-linux-gn
-+>>>>>>> .their
- 
-   nightly-release-test:
-     triggers:
diff --git a/app/test/fixtures/merge-parser/electron/merge-release-1-7-x-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-release-1-7-x-into-master.txt
deleted file mode 100644
index 75f1d6a588b..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-release-1-7-x-into-master.txt
+++ /dev/null
@@ -1,17080 +0,0 @@
-added in both
-  our    100644 6d44d618aabcce04c60344f2274dec5b0c2a1f68 .circleci/config.yml
-  their  100644 160f3ae69ca901061a37f7eb2999dd2a41288be4 .circleci/config.yml
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- notify-slack-failure: &notify-slack-failure
-   run:
-     name: Send a slack notification on failure
-@@ -348,10 +349,13 @@
-   docker:
-     - image: electronbuilds/electron:0.0.8
-   <<: *build-steps
-+=======
-+>>>>>>> .their
- 
- version: 2
- jobs:
-   electron-linux-arm:
-+<<<<<<< .our
-     environment:
-       TARGET_ARCH: arm
-     <<: *build-defaults
-@@ -469,10 +473,321 @@
-       NIGHTLY_BUILD: true
-     <<: *build-defaults
-     resource_class: xlarge
-+=======
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: arm
-+    resource_class: 2xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Zip out directory
-+          command: |
-+            if [ "$ELECTRON_RELEASE" != "1" ]; then
-+              zip -r electron.zip out/D
-+            fi
-+      - persist_to_workspace:
-+          root: /home/builduser
-+          paths:
-+            - project/out
-+      - store_artifacts:
-+          path: electron.zip
-+  electron-linux-ia32:
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: ia32
-+          DISPLAY: ':99.0'
-+    resource_class: xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Setup for headless testing
-+          command: sh -e /etc/init.d/xvfb start
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                out/D/electron --version
-+                mkdir junit
-+                script/test.py --ci
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+      - store_test_results:
-+          path: junit
-+      - store_artifacts:
-+          path: junit
-+  electron-linux-mips64el:
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: mips64el
-+    resource_class: xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+
-+  electron-linux-x64:
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: x64
-+          DISPLAY: ':99.0'
-+    resource_class: xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Setup for headless testing
-+          command: sh -e /etc/init.d/xvfb start
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                mkdir junit
-+                script/test.py --ci
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+      - run:
-+          name: Generate Typescript Definitions
-+          command: npm run create-typescript-definitions
-+      - store_test_results:
-+          path: junit
-+      - store_artifacts:
-+          path: junit
-+      - store_artifacts:
-+          path: out/electron.d.ts
-+      - store_artifacts:
-+          path: out/electron-api.json
-+>>>>>>> .their
- 
-   electron-osx-x64:
-     environment:
-       TARGET_ARCH: x64
-+<<<<<<< .our
-       RUN_TESTS: true
-       INSTALL_MACOS_NODE: true
-     macos:
-@@ -488,11 +803,106 @@
-     macos:
-       xcode: "8.3.3"
-     <<: *build-steps
-+=======
-+    macos:
-+      xcode: "8.3.3"
-+    steps:
-+      - checkout
-+      - run:
-+          name: Install node
-+          command: |
-+            brew update
-+            brew install node@8
-+            brew link node@8 --force
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                mkdir junit
-+                script/test.py --ci
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+      - run:
-+          name: Generate Typescript Definitions
-+          command: npm run create-typescript-definitions
-+      - store_test_results:
-+          path: junit
-+      - store_artifacts:
-+          path: junit
-+      - store_artifacts:
-+          path: out/electron.d.ts
-+      - store_artifacts:
-+          path: out/electron-api.json
-+>>>>>>> .their
- 
-   electron-mas-x64:
-     environment:
-       TARGET_ARCH: x64
-       MAS_BUILD: 1
-+<<<<<<< .our
-       RUN_TESTS: true
-       INSTALL_MACOS_NODE: true
-     macos:
-@@ -668,12 +1078,108 @@
-       GN_EXTRA_ARGS: 'is_mas_build = true'
-     <<: *gn-mac-build-machine
-     <<: *gn-mac-build-steps
-+=======
-+    macos:
-+      xcode: "8.3.3"
-+    steps:
-+      - checkout
-+      - run:
-+          name: Install node
-+          command: |
-+            brew update
-+            brew install node@8
-+            brew link node@8 --force
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                mkdir junit
-+                script/test.py --ci
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+      - run:
-+          name: Generate Typescript Definitions
-+          command: npm run create-typescript-definitions
-+      - store_test_results:
-+          path: junit
-+      - store_artifacts:
-+          path: junit
-+      - store_artifacts:
-+          path: out/electron.d.ts
-+      - store_artifacts:
-+          path: out/electron-api.json
-+
-+>>>>>>> .their
- 
- workflows:
-   version: 2
-   build-arm:
-     jobs:
-       - electron-linux-arm
-+<<<<<<< .our
-       - electron-linux-arm-test:
-           requires:
-             - electron-linux-arm
-@@ -683,6 +1189,8 @@
-       - electron-linux-arm64-test:
-           requires:
-             - electron-linux-arm64
-+=======
-+>>>>>>> .their
-   build-ia32:
-     jobs:
-       - electron-linux-ia32
-@@ -695,6 +1203,7 @@
-   build-mas-x64:
-     jobs:
-       - electron-mas-x64
-+<<<<<<< .our
-   build-gn-linux:
-     jobs:
-       - electron-gn-linux-x64-debug-fyi
-@@ -745,3 +1254,5 @@
-       - electron-gn-linux-arm64-release-fyi
-       - electron-gn-mas-release-fyi
-       - electron-gn-osx-release-fyi
-+=======
-+>>>>>>> .their
-added in remote
-  their  100644 51ad1b492dcbbd0c79bb9986bac35f1e3a007c2a Jenkinsfile
-@@ -0,0 +1,44 @@
-+pipeline {
-+  agent none
-+  stages {
-+    stage('Build') {
-+      parallel {
-+        stage('electron-osx-x64') {
-+            agent {
-+              label 'osx'
-+            }
-+            steps {
-+              sh 'script/bootstrap.py --target_arch=x64 --dev'
-+              sh 'npm run lint'
-+              sh 'script/build.py -c D'
-+              sh 'script/test.py --ci --rebuild_native_modules'
-+            }
-+            post {
-+              always {
-+                cleanWs()
-+              }
-+            }
-+        }
-+        stage('electron-mas-x64') {
-+          agent {
-+            label 'osx'
-+          }
-+          environment {
-+            MAS_BUILD = '1'
-+          }
-+          steps {
-+            sh 'script/bootstrap.py --target_arch=x64 --dev'
-+            sh 'npm run lint'
-+            sh 'script/build.py -c D'
-+            sh 'script/test.py --ci --rebuild_native_modules'
-+          }
-+          post {
-+            always {
-+              cleanWs()
-+            }
-+          }
-+        }
-+      }
-+    }
-+  }
-+}
-changed in both
-  base   100644 ce0baaf989bdbd6897fa333d3af88d1d573a2bd2 appveyor.yml
-  our    100644 67a2b2124619d866f67d849f57f3548ba28be26a appveyor.yml
-  their  100644 5ee73c661b1079e9bf252868b31814d3aa4c2760 appveyor.yml
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- version: 1.0.{build}
- branches:
-   except:
-@@ -6,6 +7,10 @@
- image: electron-16-vs2017-15.4.5
- environment:
-   DISABLE_CRASH_REPORTER_TESTS: true
-+=======
-+build_cloud: electron-16
-+image: electron-16-vs2015
-+>>>>>>> .their
- build_script:
- - ps: >-
-     if(($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME -split "/")[0] -eq ($env:APPVEYOR_REPO_NAME -split "/")[0]) {
-@@ -61,6 +66,7 @@
- - path: test-results.xml
-   name: test-results.xml
- deploy_script:
-+<<<<<<< .our
- - ps: >-
-     if (Test-Path Env:\ELECTRON_RELEASE) {
-       if (Test-Path Env:\RUN_RELEASE_BUILD) {
-@@ -71,3 +77,6 @@
-         & python script\upload.py
-       }
-     }
-+=======
-+- ps: "if (Test-Path Env:\\ELECTRON_RELEASE) {\n  if (Test-Path Env:\\RUN_RELEASE_BUILD) {\n    Write-Output \"Uploading Electron release distribution to s3\"\n    & python script\\upload.py --upload_to_s3\n  } else {\n    Write-Output \"Uploading Electron release distribution to github releases\"\n    & python script\\upload.py\n  }\n} else {\n  Write-Output \"Skipping upload distribution because build is not for release\"\n}"
-+>>>>>>> .their
-changed in both
-  base   100644 e1603fa5942f7b000c3385648530255032e775a2 atom/app/atom_library_main.h
-  our    100644 2c7a27caa20a411558010c3c58bd78e7850c0737 atom/app/atom_library_main.h
-  their  100644 63d285bb5e4838578d23505d7738c9ac88575df1 atom/app/atom_library_main.h
-@@ -9,7 +9,12 @@
- 
- #if defined(OS_MACOSX)
- extern "C" {
-+<<<<<<< .our
- __attribute__((visibility("default"))) int AtomMain(int argc, char* argv[]);
-+=======
-+__attribute__((visibility("default")))
-+int AtomMain(int argc, char* argv[]);
-+>>>>>>> .their
- 
- #ifdef ENABLE_RUN_AS_NODE
- __attribute__((visibility("default"))) int AtomInitializeICUandStartNode(
-changed in both
-  base   100644 7ee7522934689937f7be7b0f866134bf611c7d69 atom/app/atom_library_main.mm
-  our    100644 57a519fcd0db28548ea75034cf92191161183385 atom/app/atom_library_main.mm
-  their  100644 ae096acd4a931d397e285643d36580625dde14bf atom/app/atom_library_main.mm
-@@ -14,6 +14,10 @@
- #include "brightray/common/mac/main_application_bundle.h"
- #include "content/public/app/content_main.h"
- 
-+<<<<<<< .our
-+=======
-+#if defined(OS_MACOSX)
-+>>>>>>> .their
- int AtomMain(int argc, char* argv[]) {
-   atom::AtomMainDelegate delegate;
-   content::ContentMainParams params(&delegate);
-changed in both
-  base   100644 de8e2b6068786b21f45e2a04490e46c8ffb15656 atom/app/atom_main.cc
-  our    100644 fc77100d9acb58221c35f364c4db7866a44d347d atom/app/atom_main.cc
-  their  100644 a9f39ab51547c6e86e47449b11250827e961abde atom/app/atom_main.cc
-@@ -71,7 +71,11 @@
- 
- #ifdef _DEBUG
-   // Don't display assert dialog boxes in CI test runs
-+<<<<<<< .our
-   static const char* kCI = "ELECTRON_CI";
-+=======
-+  static const auto kCI = "ELECTRON_CI";
-+>>>>>>> .their
-   bool is_ci = IsEnvSet(kCI);
-   if (!is_ci) {
-     for (int i = 0; i < arguments.argc; ++i) {
-@@ -88,6 +92,7 @@
- 
-     _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG | _CRTDBG_MODE_FILE);
-     _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);
-+<<<<<<< .our
- 
-     _set_error_mode(_OUT_TO_STDERR);
-   }
-@@ -98,6 +103,14 @@
- #else
-   bool run_as_node = false;
- #endif
-+=======
-+
-+    _set_error_mode(_OUT_TO_STDERR);
-+  }
-+#endif
-+
-+  bool run_as_node = IsEnvSet(kRunAsNode);
-+>>>>>>> .their
- 
-   // Make sure the output is printed to console.
-   if (run_as_node || !IsEnvSet("ELECTRON_NO_ATTACH_CONSOLE"))
-@@ -117,7 +130,13 @@
-   // from within the CRT's atexit facility, ensuring the heap functions are
-   // still active. The second invocation from the OS loader will be a no-op.
-   extern void NTAPI OnThreadExit(PVOID module, DWORD reason, PVOID reserved);
-+<<<<<<< .our
-   atexit([]() { OnThreadExit(nullptr, DLL_THREAD_DETACH, nullptr); });
-+=======
-+  atexit([]() {
-+    OnThreadExit(nullptr, DLL_THREAD_DETACH, nullptr);
-+  });
-+>>>>>>> .their
- #endif
- 
- #ifdef ENABLE_RUN_AS_NODE
-@@ -132,10 +151,14 @@
-     auto ret = atom::NodeMain(argv.size(), argv.data());
-     std::for_each(argv.begin(), argv.end(), free);
-     return ret;
-+<<<<<<< .our
-   }
- #endif
- 
-   if (IsEnvSet("ELECTRON_INTERNAL_CRASH_SERVICE")) {
-+=======
-+  } else if (IsEnvSet("ELECTRON_INTERNAL_CRASH_SERVICE")) {
-+>>>>>>> .their
-     return crash_service::Main(cmd);
-   }
- 
-@@ -156,7 +179,10 @@
- #elif defined(OS_LINUX)  // defined(OS_WIN)
- 
- int main(int argc, char* argv[]) {
-+<<<<<<< .our
- #ifdef ENABLE_RUN_AS_NODE
-+=======
-+>>>>>>> .their
-   if (IsEnvSet(kRunAsNode)) {
-     base::i18n::InitializeICU();
-     base::AtExitManager atexit_manager;
-@@ -175,7 +201,10 @@
- #else  // defined(OS_LINUX)
- 
- int main(int argc, char* argv[]) {
-+<<<<<<< .our
- #ifdef ENABLE_RUN_AS_NODE
-+=======
-+>>>>>>> .their
-   if (IsEnvSet(kRunAsNode)) {
-     return AtomInitializeICUandStartNode(argc, argv);
-   }
-added in both
-  our    100644 23e870cf4a32aecfc246a81edad46971b4456a55 atom/app/command_line_args.cc
-  their  100644 a5f0183991a2df7890c4d389a3fcd4b99e0574e0 atom/app/command_line_args.cc
-@@ -2,15 +2,30 @@
- // Use of this source code is governed by the MIT license that can be
- // found in the LICENSE file.
- 
-+<<<<<<< .our
- #include "atom/app/command_line_args.h"
- 
-+=======
-+#include <string>
-+
-+#include "atom/app/command_line_args.h"
-+
-+#include "base/strings/string_util.h"
-+#include "base/strings/utf_string_conversions.h"
-+#include "content/public/common/content_switches.h"
-+
-+>>>>>>> .their
- namespace {
- 
- bool IsUrlArg(const base::CommandLine::CharType* arg) {
-   // the first character must be a letter for this to be a URL
-   auto c = *arg;
-   if (('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z')) {
-+<<<<<<< .our
-     for (auto* p = arg + 1; *p; ++p) {
-+=======
-+    for (auto p = arg + 1; *p; ++p) {
-+>>>>>>> .their
-       c = *p;
- 
-       // colon indicates that the argument starts with a URI scheme
-@@ -31,12 +46,1323 @@
-   return false;
- }
- 
-+<<<<<<< .our
-+=======
-+const char* blacklist[] = {
-+  // node
-+  "inspect",
-+  "inspect-brk",
-+
-+
-+  // chromium switches:
-+  // find ./ \( -name "*switches.cc" -o -name "*switch_list.h" \) \
-+  //   | xargs grep -P --no-filename '"\S+"[);]$' \
-+  //   | perl -pe 's|^.*?"(\S+)"[);]$|  "$1",|'; \
-+  //   | LANG="C" sort | uniq
-+  "/prefetch:1",
-+  "/prefetch:2",
-+  "/prefetch:3",
-+  "/prefetch:4",
-+  "/prefetch:5",
-+  "/prefetch:6",
-+  "/prefetch:8",
-+  "0",
-+  "?",
-+  "BlacklistOnly",
-+  "ChromeOSMemoryPressureHandling",
-+  "Disabled",
-+  "NewProfileManagement",
-+  "OnlineCheckOnly",
-+  "SafeSites",
-+  "accept-resource-provider",
-+  "adaboost",
-+  "aec-refined-adaptive-filter",
-+  "agc-startup-min-volume",
-+  "aggressive",
-+  "aggressive-cache-discard",
-+  "aggressive-tab-discard",
-+  "all-toolchains",
-+  "allow-cross-origin-auth-prompt",
-+  "allow-external-pages",
-+  "allow-failed-policy-fetch-for-test",
-+  "allow-file-access-from-files",
-+  "allow-hidden-media-playback",
-+  "allow-http-background-page",
-+  "allow-http-screen-capture",
-+  "allow-insecure-localhost",
-+  "allow-legacy-extension-manifests",
-+  "allow-loopback-in-peer-connection",
-+  "allow-nacl-crxfs-api",
-+  "allow-nacl-file-handle-api",
-+  "allow-nacl-socket-api",
-+  "allow-no-sandbox-job",
-+  "allow-outdated-plugins",
-+  "allow-ra-in-dev-mode",
-+  "allow-running-insecure-content",
-+  "allow-sandbox-debugging",
-+  "allow-silent-push",
-+  "alsa-check-close-timeout",
-+  "alsa-enable-upsampling",
-+  "alsa-fixed-output-sample-rate",
-+  "alsa-input-device",
-+  "alsa-output-avail-min",
-+  "alsa-output-buffer-size",
-+  "alsa-output-device",
-+  "alsa-output-period-size",
-+  "alsa-output-start-threshold",
-+  "also-emit-success-logs",
-+  "always-authorize-plugins",
-+  "always-on",
-+  "always-use-complex-text",
-+  "alwaystrue",
-+  "android-fonts-path",
-+  "android-stderr-port",
-+  "android-stdin-port",
-+  "android-stdout-port",
-+  "angle",
-+  "app",
-+  "app-auto-launched",
-+  "app-id",
-+  "app-mode-auth-code",
-+  "app-mode-oauth-token",
-+  "app-mode-oem-manifest",
-+  "app-shell-allow-roaming",
-+  "app-shell-host-window-size",
-+  "app-shell-preferred-network",
-+  "app-shell-refresh-token",
-+  "app-shell-user",
-+  "apple",
-+  "apps-gallery-download-url",
-+  "apps-gallery-update-url",
-+  "apps-gallery-url",
-+  "apps-keep-chrome-alive-in-tests",
-+  "arc-availability",
-+  "arc-available",
-+  "args",
-+  "artifacts-dir",
-+  "ash-adjustable-large-cursor",
-+  "ash-animate-from-boot-splash-screen",
-+  "ash-constrain-pointer-to-root",
-+  "ash-copy-host-background-at-boot",
-+  "ash-debug-shortcuts",
-+  "ash-dev-shortcuts",
-+  "ash-disable-maximize-mode-window-backdrop",
-+  "ash-disable-screen-orientation-lock",
-+  "ash-disable-touch-exploration-mode",
-+  "ash-enable-docked-windows",
-+  "ash-enable-magnifier-key-scroller",
-+  "ash-enable-mirrored-screen",
-+  "ash-enable-palette-on-all-displays",
-+  "ash-enable-software-mirroring",
-+  "ash-enable-unified-desktop",
-+  "ash-force-enable-palette",
-+  "ash-hide-notifications-for-factory",
-+  "ash-host-window-bounds",
-+  "ash-shelf-color",
-+  "ash-touch-hud",
-+  "ash-webui-init",
-+  "attestation-server",
-+  "audio-buffer-size",
-+  "aura-legacy-power-button",
-+  "auth-ext-path",
-+  "auth-server-whitelist",
-+  "auth-spnego-account-type",
-+  "auto",
-+  "auto-open-devtools-for-tabs",
-+  "auto-select-desktop-capture-source",
-+  "blink-settings",
-+  "bootstrap",
-+  "browser-subprocess-path",
-+  "browser-test",
-+  "bwsi",
-+  "bypass-app-banner-engagement-checks",
-+  "canvas-msaa-sample-count",
-+  "cast-initial-screen-height",
-+  "cast-initial-screen-width",
-+  "cc-layer-tree-test-long-timeout",
-+  "cc-layer-tree-test-no-timeout",
-+  "cc-rebaseline-pixeltests",
-+  "cellular-first",
-+  "cellular-only",
-+  "check-for-update-interval",
-+  "check-layout-test-sys-deps",
-+  "child-process",
-+  "child-wallpaper-large",
-+  "child-wallpaper-small",
-+  "cipher-suite-blacklist",
-+  "class",
-+  "clear-token-service",
-+  "cloud-print-file",
-+  "cloud-print-file-type",
-+  "cloud-print-job-title",
-+  "cloud-print-print-ticket",
-+  "cloud-print-setup-proxy",
-+  "cloud-print-url",
-+  "cloud-print-xmpp-endpoint",
-+  "color",
-+  "compensate-for-unstable-pinch-zoom",
-+  "compile-shader-always-succeeds",
-+  "component-updater",
-+  "connectivity-check-url",
-+  "conservative",
-+  "content-image-texture-target",
-+  "content-shell-host-window-size",
-+  "controller",
-+  "crash-dumps-dir",
-+  "crash-on-failure",
-+  "crash-on-hang-threads",
-+  "crash-server-url",
-+  "crash-test",
-+  "crashpad-handler",
-+  "create-browser-on-startup-for-tests",
-+  "create-default-gl-context",
-+  "cros-region",
-+  "cros-regions-mode",
-+  "crosh-command",
-+  "cryptauth-http-host",
-+  "custom-devtools-frontend",
-+  "custom-launcher-page",
-+  "custom_summary",
-+  "d3d11",
-+  "d3d9",
-+  "daemon",
-+  "dark_muted",
-+  "dark_vibrant",
-+  "data-path",
-+  "data-reduction-proxy-config-url",
-+  "data-reduction-proxy-enable-quic-on-non-core-proxies",
-+  "data-reduction-proxy-experiment",
-+  "data-reduction-proxy-http-proxies",
-+  "data-reduction-proxy-lo-fi",
-+  "data-reduction-proxy-pingback-url",
-+  "data-reduction-proxy-secure-proxy-check-url",
-+  "data-reduction-proxy-server-experiments-disabled",
-+  "data-reduction-proxy-warmup-url",
-+  "dbus-stub",
-+  "debug-devtools",
-+  "debug-enable-frame-toggle",
-+  "debug-packed-apps",
-+  "debug-print",
-+  "default",
-+  "default-tile-height",
-+  "default-tile-width",
-+  "default-wallpaper-is-oem",
-+  "default-wallpaper-large",
-+  "default-wallpaper-small",
-+  "demo",
-+  "derelict-detection-timeout",
-+  "derelict-idle-timeout",
-+  "desktop",
-+  "desktop-window-1080p",
-+  "deterministic-fetch",
-+  "device-management-url",
-+  "device-scale-factor",
-+  "devtools-flags",
-+  "diagnostics",
-+  "diagnostics-format",
-+  "diagnostics-recovery",
-+  "disable",
-+  "disable-2d-canvas-clip-aa",
-+  "disable-2d-canvas-image-chromium",
-+  "disable-3d-apis",
-+  "disable-accelerated-2d-canvas",
-+  "disable-accelerated-jpeg-decoding",
-+  "disable-accelerated-mjpeg-decode",
-+  "disable-accelerated-video-decode",
-+  "disable-account-consistency",
-+  "disable-add-to-shelf",
-+  "disable-app-info-dialog-mac",
-+  "disable-app-list-dismiss-on-blur",
-+  "disable-app-window-cycling",
-+  "disable-appcontainer",
-+  "disable-arc-data-wipe",
-+  "disable-arc-opt-in-verification",
-+  "disable-audio-support-for-desktop-share",
-+  "disable-autofill-keyboard-accessory-view",
-+  "disable-avfoundation-overlays",
-+  "disable-background-networking",
-+  "disable-background-timer-throttling",
-+  "disable-backgrounding-occluded-windows",
-+  "disable-backing-store-limit",
-+  "disable-blink-features",
-+  "disable-boot-animation",
-+  "disable-breakpad",
-+  "disable-browser-task-scheduler",
-+  "disable-bundled-ppapi-flash",
-+  "disable-canvas-aa",
-+  "disable-captive-portal-bypass-proxy",
-+  "disable-cast-streaming-hw-encoding",
-+  "disable-clear-browsing-data-counters",
-+  "disable-client-side-phishing-detection",
-+  "disable-cloud-import",
-+  "disable-component-cloud-policy",
-+  "disable-component-extensions-with-background-pages",
-+  "disable-component-update",
-+  "disable-composited-antialiasing",
-+  "disable-contextual-search",
-+  "disable-d3d11",
-+  "disable-databases",
-+  "disable-datasaver-prompt",
-+  "disable-default-apps",
-+  "disable-demo-mode",
-+  "disable-device-disabling",
-+  "disable-device-discovery-notifications",
-+  "disable-dinosaur-easter-egg",
-+  "disable-direct-composition",
-+  "disable-directwrite-for-ui",
-+  "disable-display-color-calibration",
-+  "disable-display-list-2d-canvas",
-+  "disable-distance-field-text",
-+  "disable-domain-blocking-for-3d-apis",
-+  "disable-domain-reliability",
-+  "disable-download-image-renaming",
-+  "disable-drive-search-in-app-launcher",
-+  "disable-dwm-composition",
-+  "disable-eol-notification",
-+  "disable-es3-apis",
-+  "disable-es3-gl-context",
-+  "disable-extensions",
-+  "disable-extensions-except",
-+  "disable-extensions-file-access-check",
-+  "disable-extensions-http-throttling",
-+  "disable-fast-web-scroll-view-insets",
-+  "disable-features",
-+  "disable-field-trial-config",
-+  "disable-file-system",
-+  "disable-flash-3d",
-+  "disable-flash-stage3d",
-+  "disable-fullscreen-low-power-mode",
-+  "disable-fullscreen-tab-detaching",
-+  "disable-gaia-services",
-+  "disable-gesture-editing",
-+  "disable-gesture-requirement-for-media-playback",
-+  "disable-gesture-requirement-for-presentation",
-+  "disable-gesture-typing",
-+  "disable-gl-drawing-for-tests",
-+  "disable-gl-error-limit",
-+  "disable-gl-extensions",
-+  "disable-glsl-translator",
-+  "disable-gpu",
-+  "disable-gpu-async-worker-context",
-+  "disable-gpu-compositing",
-+  "disable-gpu-driver-bug-workarounds",
-+  "disable-gpu-early-init",
-+  "disable-gpu-memory-buffer-compositor-resources",
-+  "disable-gpu-memory-buffer-video-frames",
-+  "disable-gpu-process-crash-limit",
-+  "disable-gpu-program-cache",
-+  "disable-gpu-rasterization",
-+  "disable-gpu-sandbox",
-+  "disable-gpu-shader-disk-cache",
-+  "disable-gpu-vsync",
-+  "disable-gpu-watchdog",
-+  "disable-hang-monitor",
-+  "disable-hid-detection-on-oobe",
-+  "disable-hide-inactive-stacked-tab-close-buttons",
-+  "disable-histogram-customizer",
-+  "disable-hosted-app-shim-creation",
-+  "disable-hosted-apps-in-windows",
-+  "disable-http2",
-+  "disable-in-process-stack-traces",
-+  "disable-infobars",
-+  "disable-input-ime-api",
-+  "disable-input-view",
-+  "disable-ios-password-generation",
-+  "disable-ios-password-suggestions",
-+  "disable-ios-physical-web",
-+  "disable-javascript-harmony-shipping",
-+  "disable-kill-after-bad-ipc",
-+  "disable-lcd-text",
-+  "disable-legacy-window",
-+  "disable-local-storage",
-+  "disable-logging",
-+  "disable-login-animations",
-+  "disable-low-end-device-mode",
-+  "disable-low-latency-dxva",
-+  "disable-low-res-tiling",
-+  "disable-lru-snapshot-cache",
-+  "disable-mac-overlays",
-+  "disable-mac-views-native-app-windows",
-+  "disable-main-frame-before-activation",
-+  "disable-md-oobe",
-+  "disable-media-session-api",
-+  "disable-media-suspend",
-+  "disable-merge-key-char-events",
-+  "disable-minimize-on-second-launcher-item-click",
-+  "disable-mojo-renderer",
-+  "disable-mtp-write-support",
-+  "disable-multi-display-layout",
-+  "disable-namespace-sandbox",
-+  "disable-native-gpu-memory-buffers",
-+  "disable-network-portal-notification",
-+  "disable-new-bookmark-apps",
-+  "disable-new-channel-switcher-ui",
-+  "disable-new-kiosk-ui",
-+  "disable-new-korean-ime",
-+  "disable-new-profile-management",
-+  "disable-new-zip-unpacker",
-+  "disable-notifications",
-+  "disable-ntp-popular-sites",
-+  "disable-nv12-dxgi-video",
-+  "disable-offer-store-unmasked-wallet-cards",
-+  "disable-offer-upload-credit-cards",
-+  "disable-office-editing-component-extension",
-+  "disable-offline-auto-reload",
-+  "disable-offline-auto-reload-visible-only",
-+  "disable-overlay-scrollbar",
-+  "disable-overscroll-edge-effect",
-+  "disable-panel-fitting",
-+  "disable-partial-raster",
-+  "disable-password-generation",
-+  "disable-payment-request",
-+  "disable-pepper-3d",
-+  "disable-pepper-3d-image-chromium",
-+  "disable-per-monitor-dpi",
-+  "disable-permission-action-reporting",
-+  "disable-permissions-api",
-+  "disable-physical-keyboard-autocorrect",
-+  "disable-pinch",
-+  "disable-pnacl-crash-throttling",
-+  "disable-popup-blocking",
-+  "disable-prefer-compositing-to-lcd-text",
-+  "disable-presentation-api",
-+  "disable-print-preview",
-+  "disable-prompt-on-repost",
-+  "disable-pull-to-refresh-effect",
-+  "disable-push-api-background-mode",
-+  "disable-quic",
-+  "disable-reading-from-canvas",
-+  "disable-remote-core-animation",
-+  "disable-remote-fonts",
-+  "disable-remote-playback-api",
-+  "disable-renderer-accessibility",
-+  "disable-renderer-backgrounding",
-+  "disable-renderer-priority-management",
-+  "disable-resize-lock",
-+  "disable-rgba-4444-textures",
-+  "disable-rollback-option",
-+  "disable-rtc-smoothness-algorithm",
-+  "disable-screen-orientation-lock",
-+  "disable-search-geolocation-disclosure",
-+  "disable-seccomp-filter-sandbox",
-+  "disable-settings-window",
-+  "disable-setuid-sandbox",
-+  "disable-shader-name-hashing",
-+  "disable-shared-workers",
-+  "disable-signin-scoped-device-id",
-+  "disable-single-click-autofill",
-+  "disable-slimming-paint-invalidation",
-+  "disable-smart-virtual-keyboard",
-+  "disable-smooth-scrolling",
-+  "disable-software-rasterizer",
-+  "disable-speech-api",
-+  "disable-suggestions-ui",
-+  "disable-sync",
-+  "disable-sync-app-list",
-+  "disable-sync-types",
-+  "disable-system-timezone-automatic-detection",
-+  "disable-tab-for-desktop-share",
-+  "disable-tab-strip-autoscroll-new-tabs",
-+  "disable-threaded-animation",
-+  "disable-threaded-compositing",
-+  "disable-threaded-scrolling",
-+  "disable-touch-adjustment",
-+  "disable-touch-drag-drop",
-+  "disable-translate",
-+  "disable-translate-new-ux",
-+  "disable-usb-keyboard-detect",
-+  "disable-v8-idle-tasks",
-+  "disable-vaapi-accelerated-video-encode",
-+  "disable-views-rect-based-targeting",
-+  "disable-virtual-keyboard-overscroll",
-+  "disable-voice-input",
-+  "disable-volume-adjust-sound",
-+  "disable-wake-on-wifi",
-+  "disable-web-notification-custom-layouts",
-+  "disable-web-security",
-+  "disable-webgl",
-+  "disable-webgl-image-chromium",
-+  "disable-webrtc-encryption",
-+  "disable-webrtc-hw-decoding",
-+  "disable-webrtc-hw-encoding",
-+  "disable-webrtc-hw-vp8-encoding",
-+  "disable-win32k-lockdown",
-+  "disable-xss-auditor",
-+  "disable-zero-browsers-open-for-tests",
-+  "disable-zero-copy",
-+  "disable-zero-copy-dxgi-video",
-+  "disabled",
-+  "disk-cache-dir",
-+  "disk-cache-size",
-+  "display",
-+  "dmg-device",
-+  "dns-log-details",
-+  "dom-automation",
-+  "dotfile",
-+  "duck-flash",
-+  "dump-browser-histograms",
-+  "dump-dom",
-+  "eafe-path",
-+  "eafe-url",
-+  "early-tracing",
-+  "easy-unlock-app-path",
-+  "edge-touch-filtering",
-+  "egl",
-+  "elevate",
-+  "embedded-extension-options",
-+  "emphasize-titles-in-omnibox-dropdown",
-+  "emulate-shader-precision",
-+  "enable-accelerated-2d-canvas",
-+  "enable-accelerated-vpx-decode",
-+  "enable-accessibility-tab-switcher",
-+  "enable-account-consistency",
-+  "enable-ad",
-+  "enable-adaptive-selection-handle-orientation",
-+  "enable-add-to-shelf",
-+  "enable-aggressive-domstorage-flushing",
-+  "enable-android-wallpapers-app",
-+  "enable-app-info-dialog-mac",
-+  "enable-app-list",
-+  "enable-app-window-cycling",
-+  "enable-appcontainer",
-+  "enable-arc",
-+  "enable-arc-oobe-optin",
-+  "enable-audio-debug-recordings-from-extension",
-+  "enable-autofill-keyboard-accessory-view",
-+  "enable-automation",
-+  "enable-benchmarking",
-+  "enable-ble-advertising-in-apps",
-+  "enable-blink-features",
-+  "enable-bookmark-undo",
-+  "enable-browser-side-navigation",
-+  "enable-browser-task-scheduler",
-+  "enable-canvas-2d-dynamic-rendering-mode-switching",
-+  "enable-checker-imaging",
-+  "enable-chromevox-arc-support",
-+  "enable-clear-browsing-data-counters",
-+  "enable-cloud-print-proxy",
-+  "enable-cloud-print-xps",
-+  "enable-color-correct-rendering",
-+  "enable-color-correct-rendering-default-mode",
-+  "enable-consumer-kiosk",
-+  "enable-content-intent-detection",
-+  "enable-contextual-search",
-+  "enable-crash-reporter",
-+  "enable-crash-reporter-for-testing",
-+  "enable-crx-hash-check",
-+  "enable-data-reduction-proxy-bypass-warning",
-+  "enable-data-reduction-proxy-carrier-test",
-+  "enable-data-reduction-proxy-force-pingback",
-+  "enable-data-reduction-proxy-lite-page",
-+  "enable-data-reduction-proxy-savings-promo",
-+  "enable-datasaver-prompt",
-+  "enable-default-media-session",
-+  "enable-device-discovery-notifications",
-+  "enable-devtools-experiments",
-+  "enable-display-list-2d-canvas",
-+  "enable-distance-field-text",
-+  "enable-distillability-service",
-+  "enable-dom-distiller",
-+  "enable-domain-reliability",
-+  "enable-download-image-renaming",
-+  "enable-drive-search-in-app-launcher",
-+  "enable-drm-atomic",
-+  "enable-embedded-extension-options",
-+  "enable-es3-apis",
-+  "enable-exclusive-audio",
-+  "enable-experimental-accessibility-features",
-+  "enable-experimental-canvas-features",
-+  "enable-experimental-extension-apis",
-+  "enable-experimental-input-view-features",
-+  "enable-experimental-web-platform-features",
-+  "enable-extension-activity-log-testing",
-+  "enable-extension-activity-logging",
-+  "enable-extension-assets-sharing",
-+  "enable-fast-unload",
-+  "enable-fast-web-scroll-view-insets",
-+  "enable-features",
-+  "enable-first-run-ui-transitions",
-+  "enable-floating-virtual-keyboard",
-+  "enable-font-antialiasing",
-+  "enable-fullscreen-tab-detaching",
-+  "enable-fullscreen-toolbar-reveal",
-+  "enable-google-branded-context-menu",
-+  "enable-gpu-async-worker-context",
-+  "enable-gpu-benchmarking",
-+  "enable-gpu-client-logging",
-+  "enable-gpu-client-tracing",
-+  "enable-gpu-command-logging",
-+  "enable-gpu-debugging",
-+  "enable-gpu-driver-debug-logging",
-+  "enable-gpu-memory-buffer-compositor-resources",
-+  "enable-gpu-memory-buffer-video-frames",
-+  "enable-gpu-rasterization",
-+  "enable-gpu-service-logging",
-+  "enable-gpu-service-tracing",
-+  "enable-grouped-history",
-+  "enable-hardware-overlays",
-+  "enable-harfbuzz-rendertext",
-+  "enable-hdr-output",
-+  "enable-heap-profiling",
-+  "enable-hosted-app-quit-notification",
-+  "enable-hosted-apps-in-windows",
-+  "enable-hosted-mode",
-+  "enable-hotword-hardware",
-+  "enable-hung-renderer-infobar",
-+  "enable-inband-text-tracks",
-+  "enable-input-ime-api",
-+  "enable-ios-handoff-to-other-devices",
-+  "enable-ios-password-generation",
-+  "enable-ios-physical-web",
-+  "enable-kiosk-mode",
-+  "enable-layer-lists",
-+  "enable-lcd-text",
-+  "enable-leak-detection",
-+  "enable-local-file-accesses",
-+  "enable-local-sync-backend",
-+  "enable-logging",
-+  "enable-longpress-drag-selection",
-+  "enable-low-end-device-mode",
-+  "enable-low-res-tiling",
-+  "enable-lru-snapshot-cache",
-+  "enable-mac-views-native-app-windows",
-+  "enable-main-frame-before-activation",
-+  "enable-md-feedback",
-+  "enable-md-policy-page",
-+  "enable-media-suspend",
-+  "enable-merge-key-char-events",
-+  "enable-message-center-always-scroll-up-upon-notification-removal",
-+  "enable-nacl",
-+  "enable-nacl-debug",
-+  "enable-nacl-nonsfi-mode",
-+  "enable-native-cups",
-+  "enable-native-gpu-memory-buffers",
-+  "enable-natural-scroll-default",
-+  "enable-navigation-tracing",
-+  "enable-net-benchmarking",
-+  "enable-network-information",
-+  "enable-network-portal-notification",
-+  "enable-new-bookmark-apps",
-+  "enable-ntp-popular-sites",
-+  "enable-ntp-search-engine-country-detection",
-+  "enable-offer-store-unmasked-wallet-cards",
-+  "enable-offer-upload-credit-cards",
-+  "enable-offline-auto-reload",
-+  "enable-offline-auto-reload-visible-only",
-+  "enable-osk-overscroll",
-+  "enable-overlay-scrollbar",
-+  "enable-override-bookmarks-ui",
-+  "enable-partial-raster",
-+  "enable-password-generation",
-+  "enable-payment-request",
-+  "enable-pepper-testing",
-+  "enable-per-monitor-dpi",
-+  "enable-permission-action-reporting",
-+  "enable-physical-keyboard-autocorrect",
-+  "enable-pinch",
-+  "enable-pixel-output-in-tests",
-+  "enable-plugin-placeholder-testing",
-+  "enable-potentially-annoying-security-features",
-+  "enable-power-overlay",
-+  "enable-precache",
-+  "enable-precise-memory-info",
-+  "enable-prefer-compositing-to-lcd-text",
-+  "enable-print-browser",
-+  "enable-print-preview-register-promos",
-+  "enable-profile-shortcut-manager",
-+  "enable-profiling",
-+  "enable-proximity-auth-bluetooth-low-energy-discovery",
-+  "enable-proximity-auth-proximity-detection",
-+  "enable-push-api-background-mode",
-+  "enable-quic",
-+  "enable-reader-mode-toolbar-icon",
-+  "enable-refresh-token-annotation-request",
-+  "enable-request-tablet-site",
-+  "enable-rgba-4444-textures",
-+  "enable-sandbox",
-+  "enable-sandbox-logging",
-+  "enable-screenshot-testing-with-mode",
-+  "enable-scripts-require-action",
-+  "enable-scroll-prediction",
-+  "enable-service-manager-tracing",
-+  "enable-settings-window",
-+  "enable-sgi-video-sync",
-+  "enable-single-click-autofill",
-+  "enable-site-engagement-eviction-policy",
-+  "enable-site-settings",
-+  "enable-skia-benchmarking",
-+  "enable-slimming-paint-invalidation",
-+  "enable-slimming-paint-v2",
-+  "enable-smooth-scrolling",
-+  "enable-spatial-navigation",
-+  "enable-spdy-proxy-auth",
-+  "enable-speech-dispatcher",
-+  "enable-spelling-feedback-field-trial",
-+  "enable-spotlight-actions",
-+  "enable-stats-collection-bindings",
-+  "enable-stats-table",
-+  "enable-strict-mixed-content-checking",
-+  "enable-strict-powerful-feature-restrictions",
-+  "enable-suggestions-ui",
-+  "enable-suggestions-with-substring-match",
-+  "enable-supervised-user-managed-bookmarks-folder",
-+  "enable-swap-buffers-with-bounds",
-+  "enable-sync-app-list",
-+  "enable-sync-articles",
-+  "enable-tab-audio-muting",
-+  "enable-tcp-fastopen",
-+  "enable-tether",
-+  "enable-threaded-compositing",
-+  "enable-threaded-texture-mailboxes",
-+  "enable-thumbnail-retargeting",
-+  "enable-tile-compression",
-+  "enable-touch-calibration-setting",
-+  "enable-touch-drag-drop",
-+  "enable-touch-support-for-screen-magnifier",
-+  "enable-touchpad-three-finger-click",
-+  "enable-touchview",
-+  "enable-trace-app-source",
-+  "enable-tracing",
-+  "enable-tracing-output",
-+  "enable-translate-new-ux",
-+  "enable-true-color-rendering",
-+  "enable-ui-devtools",
-+  "enable-use-zoom-for-dsf",
-+  "enable-user-controlled-alternate-protocol-ports",
-+  "enable-user-metrics",
-+  "enable-usermedia-screen-capturing",
-+  "enable-video-player-chromecast-support",
-+  "enable-viewport",
-+  "enable-virtual-keyboard",
-+  "enable-vp9-in-mp4",
-+  "enable-vtune-support",
-+  "enable-vulkan",
-+  "enable-wayland-server",
-+  "enable-web-notification-custom-layouts",
-+  "enable-webfonts-intervention-trigger",
-+  "enable-webfonts-intervention-v2",
-+  "enable-webgl-draft-extensions",
-+  "enable-webgl-image-chromium",
-+  "enable-webrtc-event-logging-from-extension",
-+  "enable-webrtc-stun-origin",
-+  "enable-webvr",
-+  "enable-wifi-credential-sync",
-+  "enable-win7-webrtc-hw-h264-decoding",
-+  "enable-zero-copy",
-+  "enabled",
-+  "enabled-2g",
-+  "enabled-3g",
-+  "enabled-slow2g",
-+  "encode-binary",
-+  "enforce",
-+  "enforce-gl-minimums",
-+  "enforce-webrtc-ip-permission-check",
-+  "enforce_strict",
-+  "enterprise-disable-arc",
-+  "enterprise-enable-forced-re-enrollment",
-+  "enterprise-enable-zero-touch-enrollment",
-+  "enterprise-enrollment-initial-modulus",
-+  "enterprise-enrollment-modulus-limit",
-+  "error-console",
-+  "explicitly-allowed-ports",
-+  "expose-internals-for-testing",
-+  "extension-content-verification",
-+  "extension-process",
-+  "extensions-install-verification",
-+  "extensions-multi-account",
-+  "extensions-not-webstore",
-+  "extensions-on-chrome-urls",
-+  "extensions-update-frequency",
-+  "extra-search-query-params",
-+  "fail-on-unused-args",
-+  "fake-variations-channel",
-+  "false",
-+  "fast",
-+  "fast-start",
-+  "feedback-server",
-+  "field-trial-handle",
-+  "first-exec-after-boot",
-+  "flag-switches-begin",
-+  "flag-switches-end",
-+  "font-cache-shared-handle",
-+  "force-android-app-mode",
-+  "force-app-mode",
-+  "force-desktop-ios-promotion",
-+  "force-dev-mode-highlighting",
-+  "force-device-scale-factor",
-+  "force-display-list-2d-canvas",
-+  "force-fieldtrial-params",
-+  "force-fieldtrials",
-+  "force-first-run",
-+  "force-first-run-ui",
-+  "force-gpu-mem-available-mb",
-+  "force-gpu-rasterization",
-+  "force-happiness-tracking-system",
-+  "force-load-easy-unlock-app-in-tests",
-+  "force-local-ntp",
-+  "force-login-manager-in-tests",
-+  "force-mediafoundation",
-+  "force-overlay-fullscreen-video",
-+  "force-pnacl-subzero",
-+  "force-renderer-accessibility",
-+  "force-show-update-menu-badge",
-+  "force-show-update-menu-item",
-+  "force-system-compositor-mode",
-+  "force-ui-direction",
-+  "force-variation-ids",
-+  "force-video-overlays",
-+  "force-wave-audio",
-+  "force-webrtc-ip-handling-policy",
-+  "full-memory-crash-report",
-+  "gaia-url",
-+  "gcm-checkin-url",
-+  "gcm-mcs-endpoint",
-+  "gcm-registration-url",
-+  "generate-accessibility-test-expectations",
-+  "gl",
-+  "gl-composited-texture-quad-border",
-+  "gl-shader-interm-output",
-+  "gles",
-+  "golden-screenshots-dir",
-+  "google-apis-url",
-+  "google-base-url",
-+  "google-doodle-url",
-+  "google-profile-info",
-+  "google-url",
-+  "gpu-active-device-id",
-+  "gpu-active-vendor-id",
-+  "gpu-device-id",
-+  "gpu-driver-bug-workarounds",
-+  "gpu-driver-date",
-+  "gpu-driver-vendor",
-+  "gpu-driver-version",
-+  "gpu-launcher",
-+  "gpu-no-complete-info-collection",
-+  "gpu-no-context-lost",
-+  "gpu-process",
-+  "gpu-program-cache-size-kb",
-+  "gpu-rasterization-msaa-sample-count",
-+  "gpu-sandbox-allow-sysv-shm",
-+  "gpu-sandbox-failures-fatal",
-+  "gpu-sandbox-start-early",
-+  "gpu-secondary-device-ids",
-+  "gpu-secondary-vendor-ids",
-+  "gpu-startup-dialog",
-+  "gpu-testing-device-id",
-+  "gpu-testing-driver-date",
-+  "gpu-testing-gl-renderer",
-+  "gpu-testing-gl-vendor",
-+  "gpu-testing-gl-version",
-+  "gpu-testing-os-version",
-+  "gpu-testing-secondary-device-ids",
-+  "gpu-testing-secondary-vendor-ids",
-+  "gpu-testing-vendor-id",
-+  "gpu-vendor-id",
-+  "guest-wallpaper-large",
-+  "guest-wallpaper-small",
-+  "h",
-+  "has-chromeos-diamond-key",
-+  "headless",
-+  "help",
-+  "hide",
-+  "hide-icons",
-+  "hide-scrollbars",
-+  "history-entry-requires-user-gesture",
-+  "homedir",
-+  "homepage",
-+  "host",
-+  "host-pairing-oobe",
-+  "host-resolver-retry-attempts",
-+  "host-resolver-rules",
-+  "host-rules",
-+  "icu-data-dir",
-+  "ignore-autocomplete-off-autofill",
-+  "ignore-certificate-errors",
-+  "ignore-gpu-blacklist",
-+  "ignore-missing-cdm-host-file",
-+  "ignore-urlfetcher-cert-requests",
-+  "ignore-user-profile-mapping-for-tests",
-+  "in-process-gpu",
-+  "incognito",
-+  "inert-visual-viewport",
-+  "input",
-+  "inspect",
-+  "inspect-brk",
-+  "install-chrome-app",
-+  "install-supervised-user-whitelists",
-+  "instant-process",
-+  "interests-url",
-+  "invalidation-use-gcm-channel",
-+  "ipc-connection-timeout",
-+  "ipc-dump-directory",
-+  "ipc-fuzzer-testcase",
-+  "is-running-in-mash",
-+  "isolate-extensions",
-+  "isolate-sites-for-testing",
-+  "javascript-harmony",
-+  "js-flags",
-+  "keep-alive-for-test",
-+  "kiosk",
-+  "kiosk-printing",
-+  "lang",
-+  "last-launched-app",
-+  "light_muted",
-+  "light_vibrant",
-+  "load-and-launch-app",
-+  "load-apps",
-+  "load-extension",
-+  "load-media-router-component-extension",
-+  "local-heuristics-only-for-password-generation",
-+  "local-ntp-reload",
-+  "local-sync-backend-dir",
-+  "log-gpu-control-list-decisions",
-+  "log-level",
-+  "log-net-log",
-+  "login-manager",
-+  "login-profile",
-+  "login-user",
-+  "lso-url",
-+  "ltr",
-+  "main-frame-resizes-are-orientation-changes",
-+  "make-chrome-default",
-+  "make-default-browser",
-+  "managed-user-id",
-+  "managed-user-sync-token",
-+  "mark-non-secure-as",
-+  "markdown",
-+  "market-url-for-testing",
-+  "mash",
-+  "material",
-+  "material-design-ink-drop-animation-speed",
-+  "material-hybrid",
-+  "max-gum-fps",
-+  "max-untiled-layer-height",
-+  "max-untiled-layer-width",
-+  "media-cache-size",
-+  "mem-pressure-system-reserved-kb",
-+  "memory-metrics",
-+  "memory-pressure-off",
-+  "memory-pressure-thresholds",
-+  "memory-pressure-thresholds-mb",
-+  "message-center-changes-while-open",
-+  "metrics-client-id",
-+  "metrics-recording-only",
-+  "mhtml-generator-option",
-+  "mock",
-+  "mojo-channel-token",
-+  "mojo-local-storage",
-+  "mojo-pipe-token",
-+  "monitoring-destination-id",
-+  "mse-audio-buffer-size-limit",
-+  "mse-video-buffer-size-limit",
-+  "mute-audio",
-+  "nacl-broker",
-+  "nacl-dangerous-no-sandbox-nonsfi",
-+  "nacl-debug-mask",
-+  "nacl-gdb",
-+  "nacl-gdb-script",
-+  "nacl-loader",
-+  "nacl-loader-nonsfi",
-+  "native",
-+  "native-crx-bindings",
-+  "net-log-capture-mode",
-+  "netifs-to-ignore",
-+  "network-country-iso",
-+  "new-profile-management",
-+  "new-window",
-+  "no-default-browser-check",
-+  "no-experiments",
-+  "no-first-run",
-+  "no-managed-user-acknowledgment-check",
-+  "no-network-profile-warning",
-+  "no-pings",
-+  "no-proxy-server",
-+  "no-referrers",
-+  "no-sandbox",
-+  "no-service-autorun",
-+  "no-startup-window",
-+  "no-use-mus-in-renderer",
-+  "no-wifi",
-+  "no-zygote",
-+  "nocolor",
-+  "noerrdialogs",
-+  "non-material",
-+  "non-secure",
-+  "none",
-+  "normal_muted",
-+  "normal_vibrant",
-+  "note-taking-app-ids",
-+  "ntp-snippets-add-incomplete",
-+  "ntp-switch-to-existing-tab",
-+  "null",
-+  "num-pac-threads",
-+  "num-raster-threads",
-+  "oauth2-client-id",
-+  "oauth2-client-secret",
-+  "off",
-+  "on",
-+  "oobe-bootstrapping-master",
-+  "oobe-guest-session",
-+  "oobe-skip-postlogin",
-+  "oobe-timer-interval",
-+  "open-ash",
-+  "opengraph",
-+  "origin-to-force-quic-on",
-+  "origin-trial-disabled-features",
-+  "origin-trial-disabled-tokens",
-+  "origin-trial-public-key",
-+  "original-process-start-time",
-+  "osmesa",
-+  "output",
-+  "override",
-+  "override-metrics-upload-url",
-+  "override-plugin-power-saver-for-testing",
-+  "override-use-software-gl-for-tests",
-+  "overscroll-history-navigation",
-+  "ozone-dump-file",
-+  "ozone-platform",
-+  "pack-extension",
-+  "pack-extension-key",
-+  "parent-profile",
-+  "parent-window",
-+  "passive-listeners-default",
-+  "password-store",
-+  "permission-request-api-scope",
-+  "permission-request-api-url",
-+  "power-stub",
-+  "ppapi",
-+  "ppapi-antialiased-text-enabled",
-+  "ppapi-broker",
-+  "ppapi-flash-args",
-+  "ppapi-flash-path",
-+  "ppapi-flash-version",
-+  "ppapi-in-process",
-+  "ppapi-plugin-launcher",
-+  "ppapi-startup-dialog",
-+  "ppapi-subpixel-rendering-setting",
-+  "precache-config-settings-url",
-+  "precache-manifest-url-prefix",
-+  "prerender-from-omnibox",
-+  "previous-app",
-+  "primary",
-+  "primordial-pipe-token",
-+  "privet-ipv6-only",
-+  "process-per-site",
-+  "process-per-tab",
-+  "process-service-name",
-+  "product-version",
-+  "profile-directory",
-+  "profiler-timing",
-+  "profiling-at-start",
-+  "profiling-file",
-+  "profiling-flush",
-+  "progress-bar-animation",
-+  "progress-bar-completion",
-+  "prompt-for-external-extensions",
-+  "proxy-auto-detect",
-+  "proxy-bypass-list",
-+  "proxy-pac-url",
-+  "proxy-server",
-+  "q",
-+  "quic-connection-options",
-+  "quic-host-whitelist",
-+  "quic-max-packet-length",
-+  "quic-version",
-+  "rdp_desktop_session",
-+  "reader-mode-feedback",
-+  "reader-mode-heuristics",
-+  "rebaseline-pixel-tests",
-+  "reduce-security-for-testing",
-+  "reduced-referrer-granularity",
-+  "register-font-files",
-+  "register-pepper-plugins",
-+  "relauncher",
-+  "remote-debugging-address",
-+  "remote-debugging-port",
-+  "remote-debugging-socket-name",
-+  "remote-debugging-targets",
-+  "renderer",
-+  "renderer-client-id",
-+  "renderer-cmd-prefix",
-+  "renderer-process-limit",
-+  "renderer-startup-dialog",
-+  "renderer-wait-for-java-debugger",
-+  "repl",
-+  "report-vp9-as-an-unsupported-mime-type",
-+  "require-audio-hardware-for-testing",
-+  "reset-app-list-install-state",
-+  "reset-variation-state",
-+  "restore-last-session",
-+  "root",
-+  "root-layer-scrolls",
-+  "rtl",
-+  "run-layout-test",
-+  "runtime-deps-list-file",
-+  "safebrowsing-disable-auto-update",
-+  "safebrowsing-disable-download-protection",
-+  "safebrowsing-disable-extension-blacklist",
-+  "safebrowsing-manual-download-blacklist",
-+  "sandbox-ipc",
-+  "save-page-as-mhtml",
-+  "saveas-menu-label",
-+  "screen-config",
-+  "screenshot",
-+  "script-executable",
-+  "scripts-require-action",
-+  "scroll-end-effect",
-+  "secondary",
-+  "secondary-display-layout",
-+  "secondary-ui-md",
-+  "service",
-+  "service-overrides",
-+  "service-request-channel-token",
-+  "shared-files",
-+  "shill-stub",
-+  "show-app-list",
-+  "show-autofill-signatures",
-+  "show-autofill-type-predictions",
-+  "show-component-extension-options",
-+  "show-composited-layer-borders",
-+  "show-fps-counter",
-+  "show-icons",
-+  "show-layer-animation-bounds",
-+  "show-mac-overlay-borders",
-+  "show-overdraw-feedback",
-+  "show-paint-rects",
-+  "show-property-changed-rects",
-+  "show-saved-copy",
-+  "show-screenspace-rects",
-+  "show-surface-damage-rects",
-+  "show_summary",
-+  "silent-debugger-extension-api",
-+  "silent-launch",
-+  "simulate-critical-update",
-+  "simulate-elevated-recovery",
-+  "simulate-outdated",
-+  "simulate-outdated-no-au",
-+  "simulate-upgrade",
-+  "single-process",
-+  "site-per-process",
-+  "skip-gpu-data-loading",
-+  "skip-nostore-all",
-+  "skip-nostore-main",
-+  "skip-reencoding-on-skp-capture",
-+  "slow",
-+  "slow-connections-only",
-+  "slow-down-raster-scale-factor",
-+  "sms-test-messages",
-+  "spdy-proxy-auth-fallback",
-+  "spdy-proxy-auth-origin",
-+  "spdy-proxy-auth-value",
-+  "spelling-service-feedback-interval-seconds",
-+  "spelling-service-feedback-url",
-+  "ssl-key-log-file",
-+  "ssl-version-max",
-+  "ssl-version-min",
-+  "stable-release-mode",
-+  "start-fullscreen",
-+  "start-maximized",
-+  "start-stack-profiler",
-+  "started",
-+  "stub",
-+  "stub-cros-settings",
-+  "supports-dual-gpus",
-+  "swiftshader",
-+  "swiftshader-path",
-+  "swiftshader-webgl",
-+  "sync-allow-insecure-xmpp-connection",
-+  "sync-deferred-startup-timeout-seconds",
-+  "sync-disable-deferred-startup",
-+  "sync-enable-get-update-avoidance",
-+  "sync-notification-host-port",
-+  "sync-on-draw-hardware",
-+  "sync-short-initial-retry-override",
-+  "sync-short-nudge-delay-for-test",
-+  "sync-url",
-+  "system-developer-mode",
-+  "system-log-upload-frequency",
-+  "tab-management-experiment-type-disabled",
-+  "tab-management-experiment-type-elderberry",
-+  "task-profiler",
-+  "team-drives",
-+  "test-auto-update-ui",
-+  "test-child-process",
-+  "test-cros-gaia-id-migration",
-+  "test-do-not-initialize-icu",
-+  "test-gl-lib",
-+  "test-launcher-batch-limit",
-+  "test-launcher-bot-mode",
-+  "test-launcher-debug-launcher",
-+  "test-launcher-filter-file",
-+  "test-launcher-force-run-broken-tests",
-+  "test-launcher-jobs",
-+  "test-launcher-list-tests",
-+  "test-launcher-output",
-+  "test-launcher-print-test-stdio",
-+  "test-launcher-print-writable-path",
-+  "test-launcher-retry-limit",
-+  "test-launcher-shard-index",
-+  "test-launcher-summary-output",
-+  "test-launcher-timeout",
-+  "test-launcher-total-shards",
-+  "test-launcher-trace",
-+  "test-name",
-+  "test-tiny-timeout",
-+  "test-type",
-+  "testing-fixed-http-port",
-+  "testing-fixed-https-port",
-+  "threads",
-+  "time",
-+  "timeout",
-+  "tls1",
-+  "tls1.1",
-+  "tls1.2",
-+  "tls1.3",
-+  "top-chrome-md",
-+  "top-controls-hide-threshold",
-+  "top-controls-show-threshold",
-+  "top-document-isolation",
-+  "touch-calibration",
-+  "touch-devices",
-+  "touch-events",
-+  "touch-noise-filtering",
-+  "touch-selection-strategy",
-+  "trace-config-file",
-+  "trace-export-events-to-etw",
-+  "trace-shutdown",
-+  "trace-shutdown-file",
-+  "trace-startup",
-+  "trace-startup-duration",
-+  "trace-startup-file",
-+  "trace-to-console",
-+  "trace-to-file",
-+  "trace-to-file-name",
-+  "trace-upload-url",
-+  "tracelog",
-+  "translate-ranker-model-url",
-+  "translate-script-url",
-+  "translate-security-origin",
-+  "true",
-+  "try-chrome-again",
-+  "try-supported-channel-layouts",
-+  "type",
-+  "ui-disable-partial-swap",
-+  "ui-enable-layer-lists",
-+  "ui-enable-rgba-4444-textures",
-+  "ui-enable-zero-copy",
-+  "ui-prioritize-in-gpu-process",
-+  "ui-show-fps-counter",
-+  "ui-show-layer-animation-bounds",
-+  "ui-show-layer-borders",
-+  "ui-show-paint-rects",
-+  "ui-show-property-changed-rects",
-+  "ui-show-screenspace-rects",
-+  "ui-show-surface-damage-rects",
-+  "ui-slow-animations",
-+  "ui-test-action-max-timeout",
-+  "ui-test-action-timeout",
-+  "uninstall",
-+  "unlimited-storage",
-+  "unsafe-pac-url",
-+  "unsafely-treat-insecure-origin-as-secure",
-+  "use-angle",
-+  "use-cras",
-+  "use-fake-device-for-media-stream",
-+  "use-fake-ui-for-media-stream",
-+  "use-file-for-fake-audio-capture",
-+  "use-file-for-fake-video-capture",
-+  "use-first-display-as-internal",
-+  "use-gl",
-+  "use-gpu-in-tests",
-+  "use-mobile-user-agent",
-+  "use-mock-keychain",
-+  "use-new-virtual-keyboard-behavior",
-+  "use-passthrough-cmd-decoder",
-+  "use-simple-cache-backend",
-+  "use-test-config",
-+  "use_new_features_summary",
-+  "user-agent",
-+  "user-always-affiliated",
-+  "user-data-dir",
-+  "utility",
-+  "utility-allowed-dir",
-+  "utility-cmd-prefix",
-+  "utility-run-elevated",
-+  "v",
-+  "v8-cache-options",
-+  "v8-cache-strategies-for-cache-storage",
-+  "validate-crx",
-+  "validate-input-event-stream",
-+  "variations-server-url",
-+  "version",
-+  "video-image-texture-target",
-+  "video-threads",
-+  "video-underflow-threshold-ms",
-+  "viewer-launch-via-appid",
-+  "virtual-time-budget",
-+  "vmodule",
-+  "wait-for-debugger",
-+  "wait-for-debugger-children",
-+  "wake-on-wifi-packet",
-+  "wallet-service-use-sandbox",
-+  "watcher",
-+  "waveout-buffers",
-+  "webapk-server-url",
-+  "webrtc-stun-probe-trial",
-+  "webview-enable-safebrowsing-support",
-+  "webview-sandboxed-renderer",
-+  "whitelisted-extension-id",
-+  "win-jumplist-action",
-+  "window-position",
-+  "window-size",
-+  "window-workspace",
-+  "windows10-custom-titlebar",
-+  "windows8-search",
-+  "winhttp-proxy-resolver",
-+  "wm-window-animations-disabled",
-+  "zygote",
-+  "zygote-cmd-prefix"
-+};
-+
-+bool IsBlacklistedArg(const base::CommandLine::CharType* arg) {
-+#if defined(OS_WIN)
-+  const auto converted = base::WideToUTF8(arg);
-+  const char* a = converted.c_str();
-+#else
-+  const char* a = arg;
-+#endif
-+
-+  static const char* prefixes[] = {"--", "-", "/"};
-+
-+  int prefix_length = 0;
-+  for (auto& prefix : prefixes) {
-+    if (base::StartsWith(a, prefix, base::CompareCase::SENSITIVE)) {
-+      prefix_length = strlen(prefix);
-+      break;
-+    }
-+  }
-+
-+  if (prefix_length > 0) {
-+    a += prefix_length;
-+    std::string switch_name =
-+        base::ToLowerASCII(base::StringPiece(a, strcspn(a, "=")));
-+    for (auto& item : blacklist) {
-+      if (switch_name == item)
-+        return true;
-+    }
-+  }
-+
-+  return false;
-+}
-+
-+>>>>>>> .their
- }  // namespace
- 
- namespace atom {
- 
- bool CheckCommandLineArguments(int argc, base::CommandLine::CharType** argv) {
-   const base::CommandLine::StringType dashdash(2, '-');
-+<<<<<<< .our
-   bool block_args = false;
-   for (int i = 0; i < argc; ++i) {
-     if (argv[i] == dashdash)
-@@ -45,6 +1371,17 @@
-       return false;
-     } else if (IsUrlArg(argv[i])) {
-       block_args = true;
-+=======
-+  bool block_blacklisted_args = false;
-+  for (int i = 0; i < argc; ++i) {
-+    if (argv[i] == dashdash)
-+      break;
-+    if (block_blacklisted_args) {
-+      if (IsBlacklistedArg(argv[i]))
-+        return false;
-+    } else if (IsUrlArg(argv[i])) {
-+      block_blacklisted_args = true;
-+>>>>>>> .their
-     }
-   }
-   return true;
-added in both
-  our    100644 2c0acc1648ff3b4bc574f000643069f8ef8e94bb atom/app/command_line_args.h
-  their  100644 1f5fd756868898e7a304c754d89625059d36441f atom/app/command_line_args.h
-@@ -14,3 +14,7 @@
- }  // namespace atom
- 
- #endif  // ATOM_APP_COMMAND_LINE_ARGS_H_
-+<<<<<<< .our
-+=======
-+
-+>>>>>>> .their
-changed in both
-  base   100644 06d4dd8aaf5b1d64db4b8b6a1ed11f67ab5e9835 atom/browser/api/atom_api_app.cc
-  our    100644 089a2b63d1bae3afebea925582a3aac81ddeaa4f atom/browser/api/atom_api_app.cc
-  their  100644 620abed67081a04788d03f358f787ad0bb7502df atom/browser/api/atom_api_app.cc
-@@ -618,7 +618,10 @@
- }
- 
- void App::OnPreMainMessageLoopRun() {
-+<<<<<<< .our
-   content::BrowserChildProcessObserver::Add(this);
-+=======
-+>>>>>>> .their
-   if (process_singleton_) {
-     process_singleton_->OnBrowserReady();
-   }
-changed in both
-  base   100644 694a3e3047303a953f098610504c65ce7b4c9003 atom/browser/api/atom_api_app.h
-  our    100644 ee0ad42c05fe33be17146b79cbe3422953516621 atom/browser/api/atom_api_app.h
-  their  100644 15141391e067d1b44a45255a1b5cca265ea0b5a8 atom/browser/api/atom_api_app.h
-changed in both
-  base   100644 7496b8389aceee1db3a028b86d50a7bdc56d375b atom/browser/api/atom_api_notification.cc
-  our    100644 06d22455c7024a41799d5003a755588bb67437a9 atom/browser/api/atom_api_notification.cc
-  their  100644 ef5b9ce1296a3e6f535ae1f77614028ca4dfa6d9 atom/browser/api/atom_api_notification.cc
-@@ -72,7 +72,10 @@
-     opts.Get("hasReply", &has_reply_);
-     opts.Get("actions", &actions_);
-     opts.Get("sound", &sound_);
-+<<<<<<< .our
-     opts.Get("closeButtonText", &close_button_text_);
-+=======
-+>>>>>>> .their
-   }
- }
- 
-@@ -123,8 +126,13 @@
-   return actions_;
- }
- 
-+<<<<<<< .our
- base::string16 Notification::GetCloseButtonText() const {
-   return close_button_text_;
-+=======
-+base::string16 Notification::GetSound() const {
-+  return sound_;
-+>>>>>>> .their
- }
- 
- // Setters
-@@ -161,8 +169,13 @@
-   actions_ = actions;
- }
- 
-+<<<<<<< .our
- void Notification::SetCloseButtonText(const base::string16& text) {
-   close_button_text_ = text;
-+=======
-+void Notification::SetSound(const base::string16& new_sound) {
-+  sound_ = new_sound;
-+>>>>>>> .their
- }
- 
- void Notification::NotificationAction(int index) {
-@@ -211,7 +224,10 @@
-       options.reply_placeholder = reply_placeholder_;
-       options.actions = actions_;
-       options.sound = sound_;
-+<<<<<<< .our
-       options.close_button_text = close_button_text_;
-+=======
-+>>>>>>> .their
-       notification_->Show(options);
-     }
-   }
-@@ -241,8 +257,13 @@
-       .SetProperty("sound", &Notification::GetSound, &Notification::SetSound)
-       .SetProperty("actions", &Notification::GetActions,
-                    &Notification::SetActions)
-+<<<<<<< .our
-       .SetProperty("closeButtonText", &Notification::GetCloseButtonText,
-                    &Notification::SetCloseButtonText);
-+=======
-+      .SetProperty("sound", &Notification::GetSound,
-+                   &Notification::SetSound);
-+>>>>>>> .their
- }
- 
- }  // namespace api
-changed in both
-  base   100644 9c2dcd4b5107932ab668464d6199f7a3193100f0 atom/browser/api/atom_api_notification.h
-  our    100644 91a5b72c983c95b20315384091048e50ad08d27f atom/browser/api/atom_api_notification.h
-  their  100644 d4679e7c2c90df3b8e20cd95c8e3a96a412b2492 atom/browser/api/atom_api_notification.h
-@@ -56,7 +56,11 @@
-   base::string16 GetReplyPlaceholder() const;
-   base::string16 GetSound() const;
-   std::vector<brightray::NotificationAction> GetActions() const;
-+<<<<<<< .our
-   base::string16 GetCloseButtonText() const;
-+=======
-+  base::string16 GetSound() const;
-+>>>>>>> .their
- 
-   // Prop Setters
-   void SetTitle(const base::string16& new_title);
-@@ -67,7 +71,11 @@
-   void SetReplyPlaceholder(const base::string16& new_reply_placeholder);
-   void SetSound(const base::string16& sound);
-   void SetActions(const std::vector<brightray::NotificationAction>& actions);
-+<<<<<<< .our
-   void SetCloseButtonText(const base::string16& text);
-+=======
-+  void SetSound(const base::string16& sound);
-+>>>>>>> .their
- 
-  private:
-   base::string16 title_;
-@@ -81,7 +89,11 @@
-   base::string16 reply_placeholder_;
-   base::string16 sound_;
-   std::vector<brightray::NotificationAction> actions_;
-+<<<<<<< .our
-   base::string16 close_button_text_;
-+=======
-+  base::string16 sound_;
-+>>>>>>> .their
- 
-   brightray::NotificationPresenter* presenter_;
- 
-changed in both
-  base   100644 a23d2817b87df8c7bfb63465afbb8b0852bd8b2f atom/browser/api/atom_api_web_contents.cc
-  our    100644 20a1ac2e672f08ffea528b6e094ba530ff8083d1 atom/browser/api/atom_api_web_contents.cc
-  their  100644 95fb99a2351be4df43415302bca700042a4c9f16 atom/browser/api/atom_api_web_contents.cc
-@@ -397,8 +397,8 @@
-     options.Get("transparent", &transparent);
- 
-     content::WebContents::CreateParams params(session->browser_context());
--    auto* view = new OffScreenWebContentsView(
--        transparent, base::Bind(&WebContents::OnPaint, base::Unretained(this)));
-+    auto* view = new OffScreenWebContentsView(transparent,
-+        base::Bind(&WebContents::OnPaint, base::Unretained(this)));
-     params.view = view;
-     params.delegate_view = view;
- 
-@@ -1742,7 +1742,12 @@
-     return;
- 
- #if defined(ENABLE_OSR)
-+<<<<<<< .our
-   auto* osr_wcv = GetOffScreenWebContentsView();
-+=======
-+  const auto* wc_impl = static_cast<content::WebContentsImpl*>(web_contents());
-+  auto* osr_wcv = static_cast<OffScreenWebContentsView*>(wc_impl->GetView());
-+>>>>>>> .their
-   if (osr_wcv)
-     osr_wcv->SetPainting(true);
- #endif
-@@ -1753,7 +1758,12 @@
-     return;
- 
- #if defined(ENABLE_OSR)
-+<<<<<<< .our
-   auto* osr_wcv = GetOffScreenWebContentsView();
-+=======
-+  const auto* wc_impl = static_cast<content::WebContentsImpl*>(web_contents());
-+  auto* osr_wcv = static_cast<OffScreenWebContentsView*>(wc_impl->GetView());
-+>>>>>>> .their
-   if (osr_wcv)
-     osr_wcv->SetPainting(false);
- #endif
-@@ -1764,7 +1774,13 @@
-     return false;
- 
- #if defined(ENABLE_OSR)
-+<<<<<<< .our
-   auto* osr_wcv = GetOffScreenWebContentsView();
-+=======
-+  const auto* wc_impl = static_cast<content::WebContentsImpl*>(web_contents());
-+  auto* osr_wcv = static_cast<OffScreenWebContentsView*>(wc_impl->GetView());
-+
-+>>>>>>> .their
-   return osr_wcv && osr_wcv->IsPainting();
- #else
-   return false;
-@@ -1776,7 +1792,13 @@
-     return;
- 
- #if defined(ENABLE_OSR)
-+<<<<<<< .our
-   auto* osr_wcv = GetOffScreenWebContentsView();
-+=======
-+  const auto* wc_impl = static_cast<content::WebContentsImpl*>(web_contents());
-+  auto* osr_wcv = static_cast<OffScreenWebContentsView*>(wc_impl->GetView());
-+
-+>>>>>>> .their
-   if (osr_wcv)
-     osr_wcv->SetFrameRate(frame_rate);
- #endif
-@@ -1787,7 +1809,13 @@
-     return 0;
- 
- #if defined(ENABLE_OSR)
-+<<<<<<< .our
-   auto* osr_wcv = GetOffScreenWebContentsView();
-+=======
-+  const auto* wc_impl = static_cast<content::WebContentsImpl*>(web_contents());
-+  auto* osr_wcv = static_cast<OffScreenWebContentsView*>(wc_impl->GetView());
-+
-+>>>>>>> .their
-   return osr_wcv ? osr_wcv->GetFrameRate() : 0;
- #else
-   return 0;
-@@ -1871,6 +1899,7 @@
-   return mate::ConvertToV8(isolate, *web_preferences->preference());
- }
- 
-+<<<<<<< .our
- v8::Local<v8::Value> WebContents::GetLastWebPreferences(
-     v8::Isolate* isolate) const {
-   auto* web_preferences = WebContentsPreferences::From(web_contents());
-@@ -1880,6 +1909,17 @@
- }
- 
- v8::Local<v8::Value> WebContents::GetOwnerBrowserWindow() const {
-+=======
-+v8::Local<v8::Value> WebContents::GetLastWebPreferences(v8::Isolate* isolate) {
-+  WebContentsPreferences* web_preferences =
-+      WebContentsPreferences::FromWebContents(web_contents());
-+  if (!web_preferences)
-+    return v8::Null(isolate);
-+  return mate::ConvertToV8(isolate, *web_preferences->last_web_preferences());
-+}
-+
-+v8::Local<v8::Value> WebContents::GetOwnerBrowserWindow() {
-+>>>>>>> .their
-   if (owner_window())
-     return BrowserWindow::From(isolate(), owner_window());
-   else
-changed in both
-  base   100644 1270a0ce2c79edab0c1be08450f06eef7b8cdd49 atom/browser/api/atom_api_web_contents.h
-  our    100644 7939f8268aa8c3371623e0c15f3b6001d7f1efa4 atom/browser/api/atom_api_web_contents.h
-  their  100644 99e64f8ff8d9dc41eadc8d022d149e68679382f7 atom/browser/api/atom_api_web_contents.h
-@@ -234,8 +234,13 @@
-   v8::Local<v8::Value> GetPreloadPath(v8::Isolate* isolate) const;
- 
-   // Returns the web preferences of current WebContents.
-+<<<<<<< .our
-   v8::Local<v8::Value> GetWebPreferences(v8::Isolate* isolate) const;
-   v8::Local<v8::Value> GetLastWebPreferences(v8::Isolate* isolate) const;
-+=======
-+  v8::Local<v8::Value> GetWebPreferences(v8::Isolate* isolate);
-+  v8::Local<v8::Value> GetLastWebPreferences(v8::Isolate* isolate);
-+>>>>>>> .their
- 
-   // Returns the owner window.
-   v8::Local<v8::Value> GetOwnerBrowserWindow() const;
-changed in both
-  base   100644 61c97f2c35ce3c9e76cee59f9e4becd9649c993b atom/browser/atom_browser_client.cc
-  our    100644 57c4ee582405e6d501ec23940ccb10689ecd64a1 atom/browser/atom_browser_client.cc
-  their  100644 713b1bc6ec037aaa9f845b98d26a959d7d7688bc atom/browser/atom_browser_client.cc
-@@ -27,6 +27,7 @@
- #include "base/command_line.h"
- #include "base/environment.h"
- #include "base/files/file_util.h"
-+#include "base/path_service.h"
- #include "base/stl_util.h"
- #include "base/strings/string_number_conversions.h"
- #include "base/strings/string_util.h"
-@@ -296,6 +297,7 @@
-     base::CommandLine* command_line,
-     int process_id) {
-   // Make sure we're about to launch a known executable
-+<<<<<<< .our
-   {
-     base::FilePath child_path;
-     PathService::Get(content::CHILD_PROCESS_EXE, &child_path);
-@@ -303,6 +305,11 @@
-     base::ThreadRestrictions::ScopedAllowIO allow_io;
-     CHECK(base::MakeAbsoluteFilePath(command_line->GetProgram()) == child_path);
-   }
-+=======
-+  base::FilePath child_path;
-+  PathService::Get(content::CHILD_PROCESS_EXE, &child_path);
-+  CHECK(base::MakeAbsoluteFilePath(command_line->GetProgram()) == child_path);
-+>>>>>>> .their
- 
-   std::string process_type =
-       command_line->GetSwitchValueASCII(::switches::kProcessType);
-changed in both
-  base   100644 190898fdef9afb08c5110185136d3016bfd7edc2 atom/browser/atom_browser_main_parts.cc
-  our    100644 5229b19ca9af7845a3f2f13b7e0913f633b68b1d atom/browser/atom_browser_main_parts.cc
-  their  100644 89ab75c33cbe8bac8b50be241ae0ac82ea000ac6 atom/browser/atom_browser_main_parts.cc
-@@ -223,7 +223,10 @@
-   Browser::Get()->DidFinishLaunching(base::DictionaryValue());
- #endif
- 
-+<<<<<<< .our
-   // Notify observers that main thread message loop was initialized.
-+=======
-+>>>>>>> .their
-   Browser::Get()->PreMainMessageLoopRun();
- }
- 
-changed in both
-  base   100644 c714dc1f46ab633127a65a997e1adca4b240d2e8 atom/browser/browser.cc
-  our    100644 ce35de64d60c6767ac52596c1b32e7bde5ceefa0 atom/browser/browser.cc
-  their  100644 1e4bc5e8e72c21735530960fe617e07c3afeaa0c atom/browser/browser.cc
-changed in both
-  base   100644 2204eafdd5503ab90c67659c2d3c377dd745cc68 atom/browser/browser.h
-  our    100644 aed7d25c37da59c0dd5e09940a064c329353a0b2 atom/browser/browser.h
-  their  100644 d0f929caf1792c3e62bc7e6f52ad9cf0b9655a91 atom/browser/browser.h
-@@ -238,7 +238,13 @@
- 
-   void PreMainMessageLoopRun();
- 
-+<<<<<<< .our
-   void AddObserver(BrowserObserver* obs) { observers_.AddObserver(obs); }
-+=======
-+  void AddObserver(BrowserObserver* obs) {
-+    observers_.AddObserver(obs);
-+  }
-+>>>>>>> .their
- 
-   void RemoveObserver(BrowserObserver* obs) { observers_.RemoveObserver(obs); }
- 
-changed in both
-  base   100644 3e50fc228b9ad5699dba2e2ecb70ee6212d6e5c1 atom/browser/browser_observer.h
-  our    100644 d518e8d6a7c6e8e30c09498883719a58c8a9f5e8 atom/browser/browser_observer.h
-  their  100644 fce24d8ac792e2262b1c5097d3b82bccfb0c2ca7 atom/browser/browser_observer.h
-changed in both
-  base   100644 1ad07a90869708c653e38f0ee7924bcff761419d atom/browser/mac/atom_application_delegate.mm
-  our    100644 683f7a84bcaa2c47bb78cf299314a5afeb15639b atom/browser/mac/atom_application_delegate.mm
-  their  100644 ccf51133ce2594f2095455e2f30172ffcf7f2f72 atom/browser/mac/atom_application_delegate.mm
-@@ -8,13 +8,21 @@
- #import "atom/browser/mac/atom_application.h"
- #include "atom/browser/mac/dict_util.h"
- #include "base/allocator/allocator_shim.h"
-+<<<<<<< .our
- #include "base/allocator/buildflags.h"
-+=======
-+#include "base/allocator/features.h"
-+>>>>>>> .their
- #include "base/mac/mac_util.h"
- #include "base/mac/scoped_objc_class_swizzler.h"
- #include "base/strings/sys_string_conversions.h"
- #include "base/values.h"
- 
-+<<<<<<< .our
- #if BUILDFLAG(USE_ALLOCATOR_SHIM)
-+=======
-+#if BUILDFLAG(USE_EXPERIMENTAL_ALLOCATOR_SHIM)
-+>>>>>>> .their
- // On macOS 10.12, the IME system attempts to allocate a 2^64 size buffer,
- // which would typically cause an OOM crash. To avoid this, the problematic
- // method is swizzled out and the make-OOM-fatal bit is disabled for the
-@@ -35,7 +43,11 @@
-   base::allocator::SetCallNewHandlerOnMallocFailure(true);
- }
- @end
-+<<<<<<< .our
- #endif  // BUILDFLAG(USE_ALLOCATOR_SHIM)
-+=======
-+#endif  // BUILDFLAG(USE_EXPERIMENTAL_ALLOCATOR_SHIM)
-+>>>>>>> .their
- 
- @implementation AtomApplicationDelegate
- 
-@@ -65,7 +77,11 @@
-     atom::Browser::Get()->DidFinishLaunching(base::DictionaryValue());
-   }
- 
-+<<<<<<< .our
- #if BUILDFLAG(USE_ALLOCATOR_SHIM)
-+=======
-+#if BUILDFLAG(USE_EXPERIMENTAL_ALLOCATOR_SHIM)
-+>>>>>>> .their
-   // Disable fatal OOM to hack around an OS bug https://crbug.com/654695.
-   if (base::mac::IsOS10_12()) {
-     g_swizzle_imk_input_session = new base::mac::ScopedObjCClassSwizzler(
-changed in both
-  base   100644 949e5e9ec96d42d75e975e6e4facc249079bce9e atom/browser/native_browser_view.cc
-  our    100644 6460f2bfbd22f7809ce92325ffb36ddbe3512a9f atom/browser/native_browser_view.cc
-  their  100644 c97fe683e6c56b17a32eede8d397d2c2d47efa2b atom/browser/native_browser_view.cc
-changed in both
-  base   100644 236f615c2b0664ee0c2f2c80182a1a6070956170 atom/browser/native_browser_view.h
-  our    100644 56937e4c8c69e3605d2b6cc71a0877b74ff4e83d atom/browser/native_browser_view.h
-  their  100644 7c154b60b00e25c42847ceefb98723b50ea03dd0 atom/browser/native_browser_view.h
-@@ -48,7 +48,11 @@
- 
-   // Called when the window needs to update its draggable region.
-   virtual void UpdateDraggableRegions(
-+<<<<<<< .our
-       const std::vector<gfx::Rect>& system_drag_exclude_areas) {}
-+=======
-+    const std::vector<gfx::Rect>& system_drag_exclude_areas) {}
-+>>>>>>> .their
- 
-  protected:
-   explicit NativeBrowserView(
-changed in both
-  base   100644 4e7aa429ce27ae12e495ab579247d2d244fdd18f atom/browser/native_browser_view_mac.h
-  our    100644 726ca75433e8091a344ef8d731e51c27f8a23450 atom/browser/native_browser_view_mac.h
-  their  100644 0b04edad729faa8e2f79b4653426db1d941dafe3 atom/browser/native_browser_view_mac.h
-@@ -23,6 +23,8 @@
-   void SetAutoResizeFlags(uint8_t flags) override;
-   void SetBounds(const gfx::Rect& bounds) override;
-   void SetBackgroundColor(SkColor color) override;
-+  void UpdateDraggableRegions(
-+      const std::vector<gfx::Rect>& system_drag_exclude_areas) override;
- 
-   void UpdateDraggableRegions(
-       const std::vector<gfx::Rect>& system_drag_exclude_areas) override;
-changed in both
-  base   100644 2ce2adc1f4fe02a600c18c2c7b0852e1fcf27710 atom/browser/native_browser_view_mac.mm
-  our    100644 0416e26e89f1e0f37366ef1798b4359da0729225 atom/browser/native_browser_view_mac.mm
-  their  100644 3d77b2a84891a724336e83af2284543470a57cf1 atom/browser/native_browser_view_mac.mm
-@@ -15,16 +15,25 @@
- 
- @interface DragRegionView : NSView
- 
-+<<<<<<< .our
- @property(assign) NSPoint initialLocation;
-+=======
-+@property (assign) NSPoint initialLocation;
-+>>>>>>> .their
- 
- @end
- 
- @interface NSWindow ()
-+<<<<<<< .our
- - (void)performWindowDragWithEvent:(NSEvent*)event;
-+=======
-+- (void)performWindowDragWithEvent:(NSEvent *)event;
-+>>>>>>> .their
- @end
- 
- @implementation DragRegionView
- 
-+<<<<<<< .our
- @synthesize initialLocation;
- 
- - (BOOL)mouseDownCanMoveWindow {
-@@ -56,32 +65,67 @@
-   }
- 
-   if (self.window.styleMask & NSFullScreenWindowMask) {
-+=======
-+- (BOOL)mouseDownCanMoveWindow
-+{
-+  return NO;
-+}
-+
-+- (NSView *)hitTest:(NSPoint)aPoint
-+{
-+    // Pass-through events that don't hit one of the exclusion zones
-+    for (NSView *exlusion_zones in [self subviews]) {
-+      if ([exlusion_zones hitTest:aPoint])
-+        return nil;
-+    }
-+
-+    return self;
-+}
-+
-+- (void)mouseDown:(NSEvent *)event
-+{
-+  if ([self.window respondsToSelector:@selector(performWindowDragWithEvent)]) {
-+    [self.window performWindowDragWithEvent:event];
-+>>>>>>> .their
-     return;
-   }
- 
-   self.initialLocation = [event locationInWindow];
- }
- 
-+<<<<<<< .our
- - (void)mouseDragged:(NSEvent*)theEvent {
-+=======
-+- (void)mouseDragged:(NSEvent *)theEvent
-+{
-+>>>>>>> .their
-   if ([self.window respondsToSelector:@selector(performWindowDragWithEvent)]) {
-     return;
-   }
- 
-+<<<<<<< .our
-   if (self.window.styleMask & NSFullScreenWindowMask) {
-     return;
-   }
- 
-+=======
-+>>>>>>> .their
-   NSPoint currentLocation = [NSEvent mouseLocation];
-   NSPoint newOrigin;
- 
-   NSRect screenFrame = [[NSScreen mainScreen] frame];
-+<<<<<<< .our
-   NSSize screenSize = screenFrame.size;
-   NSRect windowFrame = [self.window frame];
-   NSSize windowSize = windowFrame.size;
-+=======
-+  NSRect windowFrame = [self.window frame];
-+>>>>>>> .their
- 
-   newOrigin.x = currentLocation.x - self.initialLocation.x;
-   newOrigin.y = currentLocation.y - self.initialLocation.y;
- 
-+<<<<<<< .our
-   BOOL inMenuBar = (newOrigin.y + windowSize.height) >
-                    (screenFrame.origin.y + screenSize.height);
-   BOOL screenAboveMainScreen = false;
-@@ -116,6 +160,11 @@
-   if (inMenuBar && !screenAboveMainScreen) {
-     newOrigin.y = screenFrame.origin.y +
-                   (screenFrame.size.height - windowFrame.size.height);
-+=======
-+  // Don't let window get dragged up under the menu bar
-+  if ((newOrigin.y + windowFrame.size.height) > (screenFrame.origin.y + screenFrame.size.height)) {
-+    newOrigin.y = screenFrame.origin.y + (screenFrame.size.height - windowFrame.size.height);
-+>>>>>>> .their
-   }
- 
-   // Move the window to the new location
-@@ -195,6 +244,7 @@
- }
- 
- void NativeBrowserViewMac::UpdateDraggableRegions(
-+<<<<<<< .our
-     const std::vector<gfx::Rect>& drag_exclude_rects) {
-   NSView* web_view = GetWebContents()->GetNativeView();
-   NSView* inspectable_view = GetInspectableWebContentsView()->GetNativeView();
-@@ -229,6 +279,58 @@
-             initWithFrame:drag_region_view_exclude_rect]);
-     [drag_region_view addSubview:exclude_drag_region_view];
-   }
-+=======
-+    const std::vector<gfx::Rect>& system_drag_exclude_areas) {
-+  NSView* webView = GetInspectableWebContentsView()->GetNativeView();
-+
-+  NSInteger superViewHeight = NSHeight([webView.superview bounds]);
-+  NSInteger webViewHeight = NSHeight([webView bounds]);
-+  NSInteger webViewWidth = NSWidth([webView bounds]);
-+  NSInteger webViewX = NSMinX([webView frame]);
-+  NSInteger webViewY = 0;
-+
-+  // Apple's NSViews have their coordinate system originate at the bottom left,
-+  // meaning that we need to be a bit smarter when it comes to calculating our
-+  // current top offset
-+  if (webViewHeight > superViewHeight) {
-+    webViewY = std::abs(webViewHeight - superViewHeight - (std::abs(NSMinY([webView frame]))));
-+  } else {
-+    webViewY = superViewHeight - NSMaxY([webView frame]);
-+  }
-+
-+  // Remove all DraggableRegionViews that are added last time.
-+  // Note that [webView subviews] returns the view's mutable internal array and
-+  // it should be copied to avoid mutating the original array while enumerating
-+  // it.
-+  base::scoped_nsobject<NSArray> subviews([[webView subviews] copy]);
-+  for (NSView* subview in subviews.get())
-+    if ([subview isKindOfClass:[DragRegionView class]])
-+      [subview removeFromSuperview];
-+
-+  // Create one giant NSView that is draggable.
-+  base::scoped_nsobject<NSView> dragRegion(
-+        [[DragRegionView alloc] initWithFrame:NSZeroRect]);
-+    [dragRegion setFrame:NSMakeRect(0,
-+                                    0,
-+                                    webViewWidth,
-+                                    webViewHeight)];
-+
-+  // Then, on top of that, add "exclusion zones"
-+  for (auto iter = system_drag_exclude_areas.begin();
-+       iter != system_drag_exclude_areas.end();
-+       ++iter) {
-+    base::scoped_nsobject<NSView> controlRegion(
-+        [[ExcludeDragRegionView alloc] initWithFrame:NSZeroRect]);
-+    [controlRegion setFrame:NSMakeRect(iter->x() - webViewX,
-+                                       webViewHeight - iter->bottom() + webViewY,
-+                                       iter->width(),
-+                                       iter->height())];
-+    [dragRegion addSubview:controlRegion];
-+  }
-+
-+  // Add the DragRegion to the WebView
-+  [webView addSubview:dragRegion];
-+>>>>>>> .their
- }
- 
- // static
-changed in both
-  base   100644 3dfb88d5398fc9c6c2985cd3df58c5a10ea56462 atom/browser/native_window_mac.h
-  our    100644 44a78198f44cdba9875e3fb27c8e2c87eaa6f33b atom/browser/native_window_mac.h
-  their  100644 45636eb7025e1c7250db17496e3553ce9422b2e4 atom/browser/native_window_mac.h
-@@ -163,7 +163,16 @@
-   void InternalSetParentWindow(NativeWindow* parent, bool attach);
-   void ShowWindowButton(NSWindowButton button);
- 
-+<<<<<<< .our
-   void SetForwardMouseMessages(bool forward);
-+=======
-+  void InstallView();
-+  void UninstallView();
-+
-+  // Install the drag view, which will cover the whole window and decides
-+  // whether we can drag.
-+  void UpdateDraggableRegionViews(const std::vector<DraggableRegion>& regions);
-+>>>>>>> .their
- 
-   AtomNSWindow* window_;  // Weak ref, managed by widget_.
- 
-changed in both
-  base   100644 2719c672954ab0eb2b8090fb25c9c9965c99e410 atom/browser/native_window_mac.mm
-  our    100644 004263ec127709067e903ffbf31003b8844226b4 atom/browser/native_window_mac.mm
-  their  100644 a0af83de3574e3a86f1e0064c8212dd6c526d40d atom/browser/native_window_mac.mm
-@@ -1387,10 +1387,45 @@
-     [parent->GetNativeWindow() addChildWindow:window_ ordered:NSWindowAbove];
- }
- 
-+<<<<<<< .our
- void NativeWindowMac::ShowWindowButton(NSWindowButton button) {
-   auto view = [window_ standardWindowButton:button];
-   [view.superview addSubview:view positioned:NSWindowAbove relativeTo:nil];
- }
-+=======
-+  // Remove all ControlRegionViews that are added last time.
-+  // Note that [webView subviews] returns the view's mutable internal array and
-+  // it should be copied to avoid mutating the original array while enumerating
-+  // it.
-+  base::scoped_nsobject<NSArray> subviews([[webView subviews] copy]);
-+  for (NSView* subview in subviews.get())
-+    if ([subview isKindOfClass:[ControlRegionView class]])
-+      [subview removeFromSuperview];
-+
-+  // Draggable regions is implemented by having the whole web view draggable
-+  // (mouseDownCanMoveWindow) and overlaying regions that are not draggable.
-+  std::vector<gfx::Rect> system_drag_exclude_areas =
-+      CalculateNonDraggableRegions(regions, webViewWidth, webViewHeight);
-+
-+  if (browser_view_) {
-+    browser_view_->UpdateDraggableRegions(system_drag_exclude_areas);
-+  }
-+
-+  // Create and add a ControlRegionView for each region that needs to be
-+  // excluded from the dragging.
-+  for (std::vector<gfx::Rect>::const_iterator iter =
-+           system_drag_exclude_areas.begin();
-+       iter != system_drag_exclude_areas.end();
-+       ++iter) {
-+    base::scoped_nsobject<NSView> controlRegion(
-+        [[ControlRegionView alloc] initWithFrame:NSZeroRect]);
-+    [controlRegion setFrame:NSMakeRect(iter->x(),
-+                                       webViewHeight - iter->bottom(),
-+                                       iter->width(),
-+                                       iter->height())];
-+    [webView addSubview:controlRegion];
-+  }
-+>>>>>>> .their
- 
- void NativeWindowMac::SetForwardMouseMessages(bool forward) {
-   [window_ setAcceptsMouseMovedEvents:forward];
-changed in both
-  base   100644 ad02ed620d6d94ba15e7f8d154063a0968178110 atom/browser/net/asar/url_request_asar_job.cc
-  our    100644 85eb2e1dd142b6d64aafb5350ae47603db989e8f atom/browser/net/asar/url_request_asar_job.cc
-  their  100644 5c4472a315911a6c2da533b35d489f8f9da5cd53 atom/browser/net/asar/url_request_asar_job.cc
-@@ -243,6 +243,24 @@
-     meta_info->mime_type_result = net::GetWellKnownMimeTypeFromExtension(
-         file_extension.substr(1), &meta_info->mime_type);
-   }
-+<<<<<<< .our
-+=======
-+
-+  // We use GetWellKnownMimeTypeFromExtension() to ensure that configurations
-+  // that may have been set by other programs on a user's machine don't affect
-+  // the mime type returned (in particular, JS should always be
-+  // (application/javascript). See https://crbug.com/797712. Using an accurate
-+  // mime type is necessary at least for modules and sw, which enforce strict
-+  // mime type requirements.
-+  // TODO(deepak1556): Revert this when sw support is removed for file scheme.
-+  base::FilePath::StringType file_extension = file_path.Extension();
-+  if (file_extension.empty()) {
-+    meta_info->mime_type_result = false;
-+  } else {
-+    meta_info->mime_type_result = net::GetWellKnownMimeTypeFromExtension(
-+        file_extension.substr(1), &meta_info->mime_type);
-+  }
-+>>>>>>> .their
- }
- 
- void URLRequestAsarJob::DidFetchMetaInfo(const FileMetaInfo* meta_info) {
-changed in both
-  base   100644 ff426dd08c8e39bcb23aeff2cdf03f2db414529e atom/browser/net/url_request_fetch_job.cc
-  our    100644 68539433f4de80a96bc672de3a2834b299d6c04b atom/browser/net/url_request_fetch_job.cc
-  their  100644 04d0ddd1e6af761c8e36d6cb93b99866a886457a atom/browser/net/url_request_fetch_job.cc
-changed in both
-  base   100644 c35e364236f68545a869ecfb34a6b9f496c0511f atom/browser/osr/osr_output_device.cc
-  our    100644 e5c1e7fd95fc6443e77f86c86645c51ca36d0d9b atom/browser/osr/osr_output_device.cc
-  their  100644 1234a17b842074ca4236066f09994cccf1a6a83b atom/browser/osr/osr_output_device.cc
-@@ -80,7 +80,11 @@
-     return;
-   active_ = active;
- 
-+<<<<<<< .our
-   if (!active_ && !pending_damage_rect_.IsEmpty() && paint)
-+=======
-+  if (active_ && paint)
-+>>>>>>> .their
-     OnPaint(gfx::Rect(viewport_pixel_size_));
- }
- 
-changed in both
-  base   100644 5710bc41b8319597ae37c0cb995e42b24562de17 atom/browser/osr/osr_output_device.h
-  our    100644 4c62414fd0c57ba650c04e23a75fe9be82999b2e atom/browser/osr/osr_output_device.h
-  their  100644 a65865316fa4398d8aa161264a30dd19762eae27 atom/browser/osr/osr_output_device.h
-changed in both
-  base   100644 11523a660b8f1d6972254117e84fd69588b1421a atom/browser/osr/osr_render_widget_host_view.cc
-  our    100644 4a2a0747fe2e6bf38c8999b80dbfea31e52a17fd atom/browser/osr/osr_render_widget_host_view.cc
-  their  100644 e2e521dbadd20313ebb92af117a21c407ffe05b5 atom/browser/osr/osr_render_widget_host_view.cc
-@@ -259,12 +259,27 @@
-       native_window_(native_window),
-       transparent_(transparent),
-       callback_(callback),
-+<<<<<<< .our
-       frame_rate_(frame_rate),
-+=======
-+      parent_callback_(nullptr),
-+      frame_rate_(frame_rate),
-+      frame_rate_threshold_us_(0),
-+      last_time_(base::Time::Now()),
-+>>>>>>> .their
-       scale_factor_(kDefaultScaleFactor),
-       size_(native_window->GetSize()),
-       painting_(painting),
-       is_showing_(!render_widget_host_->is_hidden()),
-+<<<<<<< .our
-       mouse_wheel_phase_handler_(render_widget_host_, this),
-+=======
-+      is_destroyed_(false),
-+      popup_position_(gfx::Rect()),
-+      hold_resize_(false),
-+      pending_resize_(false),
-+      paint_callback_running_(false),
-+>>>>>>> .their
-       weak_ptr_factory_(this) {
-   DCHECK(render_widget_host_);
-   bool is_guest_view_hack = parent_host_view_ != nullptr;
-@@ -292,9 +307,13 @@
-   compositor_.reset(
-       new ui::Compositor(context_factory_private->AllocateFrameSinkId(),
-                          content::GetContextFactory(), context_factory_private,
-+<<<<<<< .our
-                          base::ThreadTaskRunnerHandle::Get(),
-                          features::IsSurfaceSynchronizationEnabled(),
-                          false /* enable_pixel_canvas */));
-+=======
-+                         base::ThreadTaskRunnerHandle::Get()));
-+>>>>>>> .their
-   compositor_->SetAcceleratedWidget(gfx::kNullAcceleratedWidget);
-   compositor_->SetRootLayer(root_layer_.get());
- #endif
-@@ -713,8 +732,18 @@
-   }
- 
-   return new OffScreenRenderWidgetHostView(
-+<<<<<<< .our
-       transparent_, true, embedder_host_view->GetFrameRate(), callback_,
-       render_widget_host, embedder_host_view, native_window_);
-+=======
-+      transparent_,
-+      true,
-+      embedder_host_view->GetFrameRate(),
-+      callback_,
-+      render_widget_host,
-+      embedder_host_view,
-+      native_window_);
-+>>>>>>> .their
- }
- 
- #if !defined(OS_MACOSX)
-@@ -1204,7 +1233,11 @@
- 
-   SetupFrameRate(true);
- 
-+<<<<<<< .our
-   for (auto* guest_host_view : guest_host_views_)
-+=======
-+  for (auto guest_host_view : guest_host_views_)
-+>>>>>>> .their
-     guest_host_view->SetFrameRate(frame_rate);
- }
- 
-@@ -1233,10 +1266,15 @@
- 
-   frame_rate_threshold_us_ = 1000000 / frame_rate_;
- 
-+<<<<<<< .our
-   if (GetCompositor()) {
-     GetCompositor()->SetAuthoritativeVSyncInterval(
-         base::TimeDelta::FromMicroseconds(frame_rate_threshold_us_));
-   }
-+=======
-+  GetCompositor()->SetAuthoritativeVSyncInterval(
-+      base::TimeDelta::FromMicroseconds(frame_rate_threshold_us_));
-+>>>>>>> .their
- 
-   if (copy_frame_generator_.get()) {
-     copy_frame_generator_->set_frame_rate_threshold_us(
-changed in both
-  base   100644 dc204a311ff557a1f2b38c2933fbcec47c8751a7 atom/browser/osr/osr_render_widget_host_view.h
-  our    100644 b81f6310f864c00fea50b1aac49dc89173eaa302 atom/browser/osr/osr_render_widget_host_view.h
-  their  100644 a4b5593cf28a2b09c28c4285efa7a0cdae2b76da atom/browser/osr/osr_render_widget_host_view.h
-@@ -317,6 +317,8 @@
-   viz::LocalSurfaceId local_surface_id_;
-   viz::ParentLocalSurfaceIdAllocator local_surface_id_allocator_;
- 
-+  bool paint_callback_running_;
-+
-   std::unique_ptr<ui::Layer> root_layer_;
-   std::unique_ptr<ui::Compositor> compositor_;
-   std::unique_ptr<content::DelegatedFrameHost> delegated_frame_host_;
-changed in both
-  base   100644 0e10abf6a034ab604f51553eb905b18e18f45552 atom/browser/osr/osr_web_contents_view.cc
-  our    100644 c8223df0d8c6f3436d323059686e42684ff98462 atom/browser/osr/osr_web_contents_view.cc
-  their  100644 4cbc6a5c42f9762b81fc4d601ebb534dedcd4914 atom/browser/osr/osr_web_contents_view.cc
-@@ -13,9 +13,18 @@
- namespace atom {
- 
- OffScreenWebContentsView::OffScreenWebContentsView(
-+<<<<<<< .our
-     bool transparent,
-     const OnPaintCallback& callback)
-     : transparent_(transparent), callback_(callback) {
-+=======
-+    bool transparent, const OnPaintCallback& callback)
-+    : transparent_(transparent),
-+      painting_(true),
-+      frame_rate_(60),
-+      callback_(callback),
-+      web_contents_(nullptr) {
-+>>>>>>> .their
- #if defined(OS_MACOSX)
-   PlatformCreate();
- #endif
-@@ -104,8 +113,18 @@
- 
-   auto* relay = NativeWindowRelay::FromWebContents(web_contents_);
-   return new OffScreenRenderWidgetHostView(
-+<<<<<<< .our
-       transparent_, painting_, GetFrameRate(), callback_, render_widget_host,
-       nullptr, relay->window.get());
-+=======
-+      transparent_,
-+      painting_,
-+      GetFrameRate(),
-+      callback_,
-+      render_widget_host,
-+      nullptr,
-+      relay->window.get());
-+>>>>>>> .their
- }
- 
- content::RenderWidgetHostViewBase*
-@@ -124,8 +143,18 @@
-               : web_contents_impl->GetRenderWidgetHostView());
- 
-   return new OffScreenRenderWidgetHostView(
-+<<<<<<< .our
-       transparent_, true, view->GetFrameRate(), callback_, render_widget_host,
-       view, relay->window.get());
-+=======
-+      transparent_,
-+      true,
-+      view->GetFrameRate(),
-+      callback_,
-+      render_widget_host,
-+      view,
-+      relay->window.get());
-+>>>>>>> .their
- }
- 
- void OffScreenWebContentsView::SetPageTitle(const base::string16& title) {}
-@@ -209,6 +238,42 @@
-   }
- }
- 
-+void OffScreenWebContentsView::SetPainting(bool painting) {
-+  auto* view = GetView();
-+  if (view != nullptr) {
-+    view->SetPainting(painting);
-+  } else {
-+    painting_ = painting;
-+  }
-+}
-+
-+bool OffScreenWebContentsView::IsPainting() const {
-+  auto* view = GetView();
-+  if (view != nullptr) {
-+    return view->IsPainting();
-+  } else {
-+    return painting_;
-+  }
-+}
-+
-+void OffScreenWebContentsView::SetFrameRate(int frame_rate) {
-+  auto* view = GetView();
-+  if (view != nullptr) {
-+    view->SetFrameRate(frame_rate);
-+  } else {
-+    frame_rate_ = frame_rate;
-+  }
-+}
-+
-+int OffScreenWebContentsView::GetFrameRate() const {
-+  auto* view = GetView();
-+  if (view != nullptr) {
-+    return view->GetFrameRate();
-+  } else {
-+    return frame_rate_;
-+  }
-+}
-+
- OffScreenRenderWidgetHostView* OffScreenWebContentsView::GetView() const {
-   if (web_contents_) {
-     return static_cast<OffScreenRenderWidgetHostView*>(
-changed in both
-  base   100644 ffb3b38619c4521f9947fe29e3871ed06d97978e atom/browser/osr/osr_web_contents_view.h
-  our    100644 206ab9dd3421af522a12aba615c6f040ba176ba4 atom/browser/osr/osr_web_contents_view.h
-  their  100644 788e55bf316d8069811fc026bf610ad231371fce atom/browser/osr/osr_web_contents_view.h
-@@ -83,8 +83,13 @@
-   OffScreenRenderWidgetHostView* GetView() const;
- 
-   const bool transparent_;
-+<<<<<<< .our
-   bool painting_ = true;
-   int frame_rate_ = 60;
-+=======
-+  bool painting_;
-+  int frame_rate_;
-+>>>>>>> .their
-   OnPaintCallback callback_;
- 
-   // Weak refs.
-changed in both
-  base   100644 9610d80693b1670f696f82812442419504d61454 atom/browser/relauncher.cc
-  our    100644 35c6785e3d87d21eaea27ad5818434d870326047 atom/browser/relauncher.cc
-  their  100644 9dfb6edd06661f302ca7498a2ba34f0ce70c938b atom/browser/relauncher.cc
-changed in both
-  base   100644 e4207b2f46835a44089d4e23a5e973e5ff401f4d atom/browser/resources/mac/Info.plist
-  our    100644 9094f0f7335edf833d51f688851e6a105de60433 atom/browser/resources/mac/Info.plist
-  their  100644 cd8c6245a978327778f3f45b106347287d6a9ecb atom/browser/resources/mac/Info.plist
-@@ -17,9 +17,15 @@
-   <key>CFBundleIconFile</key>
-   <string>electron.icns</string>
-   <key>CFBundleVersion</key>
-+<<<<<<< .our
-   <string>4.0.0</string>
-   <key>CFBundleShortVersionString</key>
-   <string>4.0.0</string>
-+=======
-+  <string>1.7.16</string>
-+  <key>CFBundleShortVersionString</key>
-+  <string>1.7.16</string>
-+>>>>>>> .their
-   <key>LSApplicationCategoryType</key>
-   <string>public.app-category.developer-tools</string>
-   <key>LSMinimumSystemVersion</key>
-changed in both
-  base   100644 9035ccc9e4608312b0fef482afaafbc0f2fb8486 atom/browser/resources/win/atom.rc
-  our    100644 c0bd831e8bddf10180f75cd40694831e2e98622d atom/browser/resources/win/atom.rc
-  their  100644 bb309c131cc0946c5683a026d0561c82e54510ce atom/browser/resources/win/atom.rc
-@@ -56,8 +56,13 @@
- //
- 
- VS_VERSION_INFO VERSIONINFO
-+<<<<<<< .our
-  FILEVERSION 4,0,0,20180821
-  PRODUCTVERSION 4,0,0,20180821
-+=======
-+ FILEVERSION 1,7,16,0
-+ PRODUCTVERSION 1,7,16,0
-+>>>>>>> .their
-  FILEFLAGSMASK 0x3fL
- #ifdef _DEBUG
-  FILEFLAGS 0x1L
-@@ -74,12 +79,20 @@
-         BEGIN
-             VALUE "CompanyName", "GitHub, Inc."
-             VALUE "FileDescription", "Electron"
-+<<<<<<< .our
-             VALUE "FileVersion", "4.0.0"
-+=======
-+            VALUE "FileVersion", "1.7.16"
-+>>>>>>> .their
-             VALUE "InternalName", "electron.exe"
-             VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
-             VALUE "OriginalFilename", "electron.exe"
-             VALUE "ProductName", "Electron"
-+<<<<<<< .our
-             VALUE "ProductVersion", "4.0.0"
-+=======
-+            VALUE "ProductVersion", "1.7.16"
-+>>>>>>> .their
-             VALUE "SquirrelAwareVersion", "1"
-         END
-     END
-changed in both
-  base   100644 26662cf48502d880f6c18d9cb3236a42e2a813e4 atom/browser/ui/cocoa/atom_touch_bar.h
-  our    100644 fd6bb0cdc449d6d8f48a208f3300e857045d4686 atom/browser/ui/cocoa/atom_touch_bar.h
-  their  100644 d36e45898ea54f9e4205786f6b1fe9592c5acd67 atom/browser/ui/cocoa/atom_touch_bar.h
-@@ -17,9 +17,13 @@
- #include "native_mate/constructor.h"
- #include "native_mate/persistent_dictionary.h"
- 
-+<<<<<<< .our
- @interface AtomTouchBar : NSObject <NSScrubberDelegate,
-                                     NSScrubberDataSource,
-                                     NSScrubberFlowLayoutDelegate> {
-+=======
-+@interface AtomTouchBar : NSObject<NSScrubberDelegate, NSScrubberDataSource, NSScrubberFlowLayoutDelegate> {
-+>>>>>>> .their
-  @protected
-   std::vector<mate::PersistentDictionary> ordered_settings_;
-   std::map<std::string, mate::PersistentDictionary> settings_;
-changed in both
-  base   100644 30a3e6643fb89ca09e4310f789b20f1e22b1962c atom/browser/ui/cocoa/atom_touch_bar.mm
-  our    100644 72777c491f8a6024b61ed8cd3b849a5637f394a7 atom/browser/ui/cocoa/atom_touch_bar.mm
-  their  100644 366cb9e2d0c8adc3cee70a87d08f8ea9f2eca9d2 atom/browser/ui/cocoa/atom_touch_bar.mm
-@@ -765,15 +765,21 @@
-   return itemView;
- }
- 
-+<<<<<<< .our
- - (NSSize)scrubber:(NSScrubber*)scrubber
-                 layout:(NSScrubberFlowLayout*)layout
-     sizeForItemAtIndex:(NSInteger)itemIndex API_AVAILABLE(macosx(10.12.2)) {
-+=======
-+- (NSSize)scrubber:(NSScrubber *)scrubber layout:(NSScrubberFlowLayout *)layout sizeForItemAtIndex:(NSInteger)itemIndex
-+{
-+>>>>>>> .their
-   NSInteger width = 50;
-   NSInteger height = 30;
-   NSInteger margin = 15;
-   NSSize defaultSize = NSMakeSize(width, height);
- 
-   std::string s_id([[scrubber identifier] UTF8String]);
-+<<<<<<< .our
-   if (![self hasItemWithID:s_id])
-     return defaultSize;
- 
-@@ -784,12 +790,22 @@
- 
-   if (itemIndex >= static_cast<NSInteger>(items.size()))
-     return defaultSize;
-+=======
-+  if (![self hasItemWithID:s_id]) return defaultSize;
-+
-+  mate::PersistentDictionary settings = settings_[s_id];
-+  std::vector<mate::PersistentDictionary> items;
-+  if (!settings.Get("items", &items)) return defaultSize;
-+
-+  if (itemIndex >= static_cast<NSInteger>(items.size())) return defaultSize;
-+>>>>>>> .their
- 
-   mate::PersistentDictionary item = items[itemIndex];
-   std::string title;
- 
-   if (item.Get("label", &title)) {
-     NSSize size = NSMakeSize(CGFLOAT_MAX, CGFLOAT_MAX);
-+<<<<<<< .our
-     NSRect textRect = [base::SysUTF8ToNSString(title)
-         boundingRectWithSize:size
-                      options:NSStringDrawingUsesLineFragmentOrigin |
-@@ -797,6 +813,11 @@
-                   attributes:@{
-                     NSFontAttributeName : [NSFont systemFontOfSize:0]
-                   }];
-+=======
-+    NSRect textRect = [base::SysUTF8ToNSString(title) boundingRectWithSize:size
-+                                          options:NSStringDrawingUsesLineFragmentOrigin |   NSStringDrawingUsesFontLeading
-+                                          attributes:@{ NSFontAttributeName: [NSFont systemFontOfSize:0]}];
-+>>>>>>> .their
- 
-     width = textRect.size.width + margin;
-   } else {
-changed in both
-  base   100644 6fe7c820a1ccda7befcabbb6b9e740cab8d33afc atom/browser/ui/cocoa/touch_bar_forward_declarations.h
-  our    100644 281672c30420d3e1abb77cb96db69e375f4d5ea7 atom/browser/ui/cocoa/touch_bar_forward_declarations.h
-  their  100644 062723bca670a1bb5a5b4c34524d7eecfa52f50d atom/browser/ui/cocoa/touch_bar_forward_declarations.h
-@@ -14,11 +14,16 @@
- #pragma clang assume_nonnull begin
- 
- @class NSTouchBar, NSTouchBarItem;
-+<<<<<<< .our
- @class NSScrubber, NSScrubberItemView, NSScrubberArrangedView,
-     NSScrubberTextItemView, NSScrubberImageItemView, NSScrubberSelectionStyle;
- @protocol NSTouchBarDelegate
- , NSScrubberDelegate, NSScrubberDataSource, NSScrubberFlowLayoutDelegate,
-     NSScrubberFlowLayout;
-+=======
-+@class NSScrubber, NSScrubberItemView, NSScrubberArrangedView, NSScrubberTextItemView, NSScrubberImageItemView, NSScrubberSelectionStyle;
-+@protocol NSTouchBarDelegate, NSScrubberDelegate, NSScrubberDataSource, NSScrubberFlowLayoutDelegate, NSScrubberFlowLayout;
-+>>>>>>> .their
- 
- typedef float NSTouchBarItemPriority;
- static const NSTouchBarItemPriority NSTouchBarItemPriorityHigh = 1000;
-@@ -150,10 +155,17 @@
- 
- @end
- 
-+<<<<<<< .our
- @interface NSScrubberFlowLayout : NSObject
- @end
- 
- @interface NSScrubberSelectionStyle : NSObject <NSCoding>
-+=======
-+@interface NSScrubberFlowLayout: NSObject
-+@end
-+
-+@interface NSScrubberSelectionStyle : NSObject<NSCoding>
-+>>>>>>> .their
- 
- @property(class, strong, readonly)
-     NSScrubberSelectionStyle* outlineOverlayStyle;
-@@ -245,6 +257,12 @@
- 
- @end
- 
-+@protocol NSScrubberFlowLayoutDelegate<NSObject>
-+
-+- (NSSize)scrubber:(NSScrubber *)scrubber layout:(NSScrubberFlowLayout *)layout sizeForItemAtIndex:(NSInteger)itemIndex;
-+
-+@end
-+
- #pragma clang assume_nonnull end
- 
- #elif MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_12_1
-changed in both
-  base   100644 be9c15e7238987eeb533d6b981edea5b4125f8be atom/browser/ui/file_dialog_mac.mm
-  our    100644 18b18a8b240cda5512ae49e0afde5c749bdf75c0 atom/browser/ui/file_dialog_mac.mm
-  their  100644 cdc10d6cb430b6521e262ba5d19acaeb23859f42 atom/browser/ui/file_dialog_mac.mm
-@@ -94,6 +94,7 @@
- 
-   // Passing empty array to setAllowedFileTypes will cause exception.
-   NSArray* file_types = nil;
-+<<<<<<< .our
-   NSUInteger count = [file_types_list count];
-   if (count > 0) {
-     file_types = [[file_types_list objectAtIndex:0] allObjects];
-@@ -102,6 +103,11 @@
-     if ([file_types count] == 0 || [file_types containsObject:@"*"])
-       file_types = nil;
-   }
-+=======
-+  if ([file_type_set count])
-+    file_types = [file_type_set allObjects];
-+
-+>>>>>>> .their
-   [dialog setAllowedFileTypes:file_types];
- 
-   if (count <= 1)
-changed in both
-  base   100644 cc621625818feaeddf4fb76cd9103c822795e652 atom/browser/web_contents_preferences.cc
-  our    100644 c21c93383155091a7481cdd4e741cefad90a4a55 atom/browser/web_contents_preferences.cc
-  their  100644 701791b41d871d605367604e872f17668a7d24b5 atom/browser/web_contents_preferences.cc
-@@ -97,6 +97,7 @@
-   instances_.push_back(this);
- 
-   // Set WebPreferences defaults onto the JS object
-+<<<<<<< .our
-   SetDefaultBoolIfUndefined(options::kPlugins, false);
-   SetDefaultBoolIfUndefined(options::kExperimentalFeatures, false);
-   bool node = SetDefaultBoolIfUndefined(options::kNodeIntegration, true);
-@@ -104,11 +105,22 @@
-   SetDefaultBoolIfUndefined(options::kWebviewTag, node);
-   SetDefaultBoolIfUndefined(options::kSandbox, false);
-   SetDefaultBoolIfUndefined(options::kNativeWindowOpen, false);
-+=======
-+  SetDefaultBoolIfUndefined("plugins", false);
-+  SetDefaultBoolIfUndefined(options::kExperimentalFeatures, false);
-+  SetDefaultBoolIfUndefined(options::kExperimentalCanvasFeatures, false);
-+  bool node = SetDefaultBoolIfUndefined(options::kNodeIntegration, true);
-+  SetDefaultBoolIfUndefined(options::kNodeIntegrationInWorker, false);
-+  SetDefaultBoolIfUndefined(options::kWebviewTag, node);
-+  SetDefaultBoolIfUndefined("sandbox", false);
-+  SetDefaultBoolIfUndefined("nativeWindowOpen", false);
-+>>>>>>> .their
-   SetDefaultBoolIfUndefined(options::kContextIsolation, false);
-   SetDefaultBoolIfUndefined("javascript", true);
-   SetDefaultBoolIfUndefined("images", true);
-   SetDefaultBoolIfUndefined("textAreasAreResizable", true);
-   SetDefaultBoolIfUndefined("webgl", true);
-+<<<<<<< .our
-   bool webSecurity = true;
-   SetDefaultBoolIfUndefined(options::kWebSecurity, webSecurity);
-   // If webSecurity was explicity set to false, let's inherit that into
-@@ -125,6 +137,15 @@
-   SetDefaultBoolIfUndefined(options::kOffscreen, false);
- 
-   last_preference_ = preference_.Clone();
-+=======
-+  SetDefaultBoolIfUndefined("webSecurity", true);
-+  SetDefaultBoolIfUndefined("allowRunningInsecureContent", false);
-+  #if defined(OS_MACOSX)
-+  SetDefaultBoolIfUndefined(options::kScrollBounce, false);
-+  #endif
-+  SetDefaultBoolIfUndefined("offscreen", false);
-+  last_web_preferences_.MergeDictionary(&web_preferences_);
-+>>>>>>> .their
- }
- 
- WebContentsPreferences::~WebContentsPreferences() {
-@@ -154,6 +175,16 @@
-   return default_value;
- }
- 
-+bool WebContentsPreferences::SetDefaultBoolIfUndefined(const std::string key,
-+                                                       bool val) {
-+  bool existing;
-+  if (!web_preferences_.GetBoolean(key, &existing)) {
-+    web_preferences_.SetBoolean(key, val);
-+    return val;
-+  }
-+  return existing;
-+}
-+
- void WebContentsPreferences::Merge(const base::DictionaryValue& extend) {
-   if (preference_.is_dict())
-     static_cast<base::DictionaryValue*>(&preference_)->MergeDictionary(&extend);
-@@ -212,8 +243,18 @@
-   return FromWebContents(web_contents);
- }
- 
-+<<<<<<< .our
- void WebContentsPreferences::AppendCommandLineSwitches(
-     base::CommandLine* command_line) {
-+=======
-+  // We are appending args to a webContents so let's save the current state
-+  // of our preferences object so that during the lifetime of the WebContents
-+  // we can fetch the options used to initally configure the WebContents
-+  self->last_web_preferences_.Clear();
-+  self->last_web_preferences_.MergeDictionary(&web_preferences);
-+
-+  bool b;
-+>>>>>>> .their
-   // Check if plugins are enabled.
-   if (IsEnabled(options::kPlugins))
-     command_line->AppendSwitch(switches::kEnablePlugins);
-changed in both
-  base   100644 366aa1d9520847d6b81e673cc5a2156d53cc5ba5 atom/browser/web_contents_preferences.h
-  our    100644 d835347afcd259f473f95271a2c19e42afcc6f2b atom/browser/web_contents_preferences.h
-  their  100644 be277487d1d669b5e85676ff1a7ca4da365c0572 atom/browser/web_contents_preferences.h
-@@ -59,8 +59,15 @@
-   bool GetPreloadPath(base::FilePath::StringType* path) const;
- 
-   // Returns the web preferences.
-+<<<<<<< .our
-   base::Value* preference() { return &preference_; }
-   base::Value* last_preference() { return &last_preference_; }
-+=======
-+  base::DictionaryValue* web_preferences() { return &web_preferences_; }
-+  base::DictionaryValue* last_web_preferences() {
-+    return &last_web_preferences_;
-+  }
-+>>>>>>> .their
- 
-  private:
-   friend class content::WebContentsUserData<WebContentsPreferences>;
-@@ -75,6 +82,14 @@
-   static std::vector<WebContentsPreferences*> instances_;
- 
-   content::WebContents* web_contents_;
-+<<<<<<< .our
-+=======
-+  base::DictionaryValue web_preferences_;
-+  base::DictionaryValue last_web_preferences_;
-+
-+  // Set preference value to given bool if user did not provide value
-+  bool SetDefaultBoolIfUndefined(const std::string key, bool val);
-+>>>>>>> .their
- 
-   base::Value preference_ = base::Value(base::Value::Type::DICTIONARY);
-   base::Value last_preference_ = base::Value(base::Value::Type::DICTIONARY);
-changed in both
-  base   100644 08880ffe4a3591d9010f55ef18ce288e69101fe1 atom/common/atom_command_line.cc
-  our    100644 287e43f75fef778948ef9acdac8b9a7edfe07d0a atom/common/atom_command_line.cc
-  their  100644 54420b533a6b2600a87c95645b73bc01fbf0122f atom/common/atom_command_line.cc
-changed in both
-  base   100644 0f58ceb5123e85577732993552c326640d71de54 atom/common/atom_version.h
-  our    100644 65e7d19911559a40b1b258319df5fe0fa180354f atom/common/atom_version.h
-  their  100644 2b564da8029267a5d66e908b46da11a0a9870376 atom/common/atom_version.h
-@@ -5,10 +5,22 @@
- #ifndef ATOM_COMMON_ATOM_VERSION_H_
- #define ATOM_COMMON_ATOM_VERSION_H_
- 
-+<<<<<<< .our
- #define ATOM_MAJOR_VERSION 4
- #define ATOM_MINOR_VERSION 0
- #define ATOM_PATCH_VERSION 0
- #define ATOM_PRE_RELEASE_VERSION -nightly.20180821
-+=======
-+#define ATOM_MAJOR_VERSION 1
-+#define ATOM_MINOR_VERSION 7
-+#define ATOM_PATCH_VERSION 16
-+// #define ATOM_PRE_RELEASE_VERSION
-+#define ATOM_VERSION_IS_RELEASE 1
-+
-+#ifndef ATOM_TAG
-+# define ATOM_TAG ""
-+#endif
-+>>>>>>> .their
- 
- #ifndef ATOM_STRINGIFY
- #define ATOM_STRINGIFY(n) ATOM_STRINGIFY_HELPER(n)
-changed in both
-  base   100644 03e96ae8a4f3cb7e656143fb46dff58eb924fa12 atom/common/node_bindings.cc
-  our    100644 e6aded2e661af919c2d89c2f9bd46b4921d4aec4 atom/common/node_bindings.cc
-  their  100644 84792c58207dd85de2d2b60bd789417346c31b50 atom/common/node_bindings.cc
-@@ -228,8 +228,12 @@
- }
- 
- node::Environment* NodeBindings::CreateEnvironment(
-+<<<<<<< .our
-     v8::Handle<v8::Context> context,
-     node::MultiIsolatePlatform* platform) {
-+=======
-+    v8::Handle<v8::Context> context) {
-+>>>>>>> .their
- #if defined(OS_WIN)
-   auto& atom_args = AtomCommandLine::argv();
-   std::vector<std::string> args(atom_args.size());
-@@ -255,8 +259,13 @@
-   base::FilePath resources_path = GetResourcesPath(browser_env_ == BROWSER);
-   base::FilePath script_path =
-       resources_path.Append(FILE_PATH_LITERAL("electron.asar"))
-+<<<<<<< .our
-           .Append(process_type)
-           .Append(FILE_PATH_LITERAL("init.js"));
-+=======
-+                    .Append(process_type)
-+                    .Append(FILE_PATH_LITERAL("init.js"));
-+>>>>>>> .their
-   args.insert(args.begin() + 1, script_path.AsUTF8Unsafe());
- 
-   std::unique_ptr<const char* []> c_argv = StringVectorToArgArray(args);
-changed in both
-  base   100644 a56d2e24c0e77dcdcfd240c366daede6e3f2f709 brightray/browser/mac/cocoa_notification.mm
-  our    100644 57f53931e972adac9cbadf643c737b21d6b9b712 brightray/browser/mac/cocoa_notification.mm
-  their  100644 cd7b69ef4058ebc5ccf3396474551f2fc065d20f brightray/browser/mac/cocoa_notification.mm
-@@ -48,7 +48,13 @@
- 
-   if (options.silent) {
-     [notification_ setSoundName:nil];
-+<<<<<<< .our
-   } else if (options.sound.empty()) {
-+=======
-+  } else if (options.sound != nil) {
-+    [notification_ setSoundName:base::SysUTF16ToNSString(options.sound)];
-+  } else {
-+>>>>>>> .their
-     [notification_ setSoundName:NSUserNotificationDefaultSoundName];
-   } else {
-     [notification_ setSoundName:base::SysUTF16ToNSString(options.sound)];
-changed in both
-  base   100644 017fdd85261df0df1b885ef8a15fed74ed86c8de brightray/browser/notification.h
-  our    100644 efb8752f3595f81d8f080573924791cd1411ae84 brightray/browser/notification.h
-  their  100644 69efcff386f544f84074eb39781e3daa083ae64f brightray/browser/notification.h
-changed in both
-  base   100644 eab6c35479a3551de482e323fce00a962de423a5 chromium_src/chrome/browser/process_singleton.h
-  our    100644 b2909e8d1852c8fa69daa21b83432bb7c36f17c9 chromium_src/chrome/browser/process_singleton.h
-  their  100644 d77f5b41df88e4dba037c5946715bf690e28f95e chromium_src/chrome/browser/process_singleton.h
-changed in both
-  base   100644 e1e25cf91de0195202cae646dda4f124ee161dc2 chromium_src/chrome/browser/process_singleton_posix.cc
-  our    100644 4891743710d16673c6a72d76a303f6ac56a5ad32 chromium_src/chrome/browser/process_singleton_posix.cc
-  their  100644 1943ad51f635b19379753b67bc45d8ad316d6eb1 chromium_src/chrome/browser/process_singleton_posix.cc
-@@ -883,8 +883,15 @@
- void ProcessSingleton::StartListeningOnSocket() {
-   watcher_ = new LinuxWatcher(this);
-   BrowserThread::PostTask(
-+<<<<<<< .our
-       BrowserThread::IO, FROM_HERE,
-       base::Bind(&ProcessSingleton::LinuxWatcher::StartListening, watcher_,
-+=======
-+      BrowserThread::IO,
-+      FROM_HERE,
-+      base::Bind(&ProcessSingleton::LinuxWatcher::StartListening,
-+                 watcher_,
-+>>>>>>> .their
-                  sock_));
- }
- 
-changed in both
-  base   100644 b488ad457674287187b9b0edf24a423f774ff9c6 chromium_src/chrome/browser/process_singleton_win.cc
-  our    100644 6d0d102430ff700e703cef7e3189403c4a35218f chromium_src/chrome/browser/process_singleton_win.cc
-  their  100644 cce6054d1230c396f18a1eb358aa87faf1b29fd5 chromium_src/chrome/browser/process_singleton_win.cc
-changed in both
-  base   100644 9036102668286db7ca4d338dc8f326f1bd3653b7 docs/api/notification.md
-  our    100644 08776a9d3b8fb0969a5538981a2dd991b248fb82 docs/api/notification.md
-  their  100644 6dab356bbda50812a241fa150f39a03580d8cfae docs/api/notification.md
-@@ -30,6 +30,7 @@
- ### `new Notification([options])` _Experimental_
- 
- * `options` Object
-+<<<<<<< .our
-   * `title` String - A title for the notification, which will be shown at the top of the notification window when it is shown.
-   * `subtitle` String (optional) _macOS_ - A subtitle for the notification, which will be displayed below the title.
-   * `body` String - The body text of the notification, which will be displayed below the title or subtitle.
-@@ -40,6 +41,18 @@
-   * `sound` String (optional) _macOS_ - The name of the sound file to play when the notification is shown.
-   * `actions` [NotificationAction[]](structures/notification-action.md) (optional) _macOS_ - Actions to add to the notification. Please read the available actions and limitations in the `NotificationAction` documentation.
-   * `closeButtonText` String (optional) _macOS_ - A custom title for the close button of an alert. An empty string will cause the default localized text to be used.
-+=======
-+  * `title` String - A title for the notification, which will be shown at the top of the notification window when it is shown
-+  * `subtitle` String - (optional) A subtitle for the notification, which will be displayed below the title. _macOS_
-+  * `body` String - The body text of the notification, which will be displayed below the title or subtitle
-+  * `silent` Boolean - (optional) Whether or not to emit an OS notification noise when showing the notification
-+  * `icon` [NativeImage](native-image.md) - (optional) An icon to use in the notification
-+  * `hasReply` Boolean - (optional) Whether or not to add an inline reply option to the notification.  _macOS_
-+  * `replyPlaceholder` String - (optional) The placeholder to write in the inline reply input field. _macOS_
-+  * `sound` String - (optional) The name of the sound file to play when the notification is shown. _macOS_
-+  * `actions` [NotificationAction[]](structures/notification-action.md) - (optional) Actions to add to the notification.  Please read the available actions and limitations in the `NotificationAction` documentation _macOS_
-+
-+>>>>>>> .their
- 
- ### Instance Events
- 
-@@ -104,6 +117,7 @@
- not immediately show it to the user, you need to call this method before the OS
- will display it.
- 
-+<<<<<<< .our
- If the notification has been shown before, this method will dismiss the previously
- shown notification and create a new one with identical properties.
- 
-@@ -111,6 +125,8 @@
- 
- Dismisses the notification.
- 
-+=======
-+>>>>>>> .their
- ### Playing Sounds
- 
- On macOS, you can specify the name of the sound you'd like to play when the
-changed in both
-  base   100644 456fc207fe98260b4f971154f9260fad685fc563 docs/api/touch-bar-button.md
-  our    100644 4f3e2906ecd35c700c47edf358cd8ef2a4977050 docs/api/touch-bar-button.md
-  their  100644 461c0c5155227adf2306cb37865151aec48f7f7e docs/api/touch-bar-button.md
-changed in both
-  base   100644 17d416608b94068be43459bf2ce9ca18fc4dcedc electron.gyp
-  our    100644 944ddab2a3fd879044e31677e4bac2843fffbdee electron.gyp
-  their  100644 29a0f6ea3c58105659d1603447729d9021f1775e electron.gyp
-@@ -4,7 +4,11 @@
-     'product_name%': 'Electron',
-     'company_name%': 'GitHub, Inc',
-     'company_abbr%': 'github',
-+<<<<<<< .our
-     'version%': '4.0.0-nightly.20180821',
-+=======
-+    'version%': '1.7.16',
-+>>>>>>> .their
-     'js2c_input_dir': '<(SHARED_INTERMEDIATE_DIR)/js2c',
-   },
-   'includes': [
-@@ -255,6 +259,11 @@
-               ],
-             },
-           ],
-+          'link_settings': {
-+            'ldflags': [
-+              '-Wl,-z,noexecstack',
-+            ],
-+          },
-         }],  # OS=="linux"
-       ],
-     },  # target <(project_name)
-changed in both
-  base   100644 e90fe322ba15d1613f7fa300427bcb96c10d351f filenames.gypi
-  our    100644 f57860558f06b7e5d8a50f48cfc7e53044df0bc6 filenames.gypi
-  their  100644 22d8b072a7bbd28e0a9c67896210d54640b1628a filenames.gypi
-@@ -114,6 +114,11 @@
-       'atom/app/atom_main_delegate_mac.mm',
-       'atom/app/command_line_args.cc',
-       'atom/app/command_line_args.h',
-+<<<<<<< .our
-+=======
-+      'atom/app/node_main.cc',
-+      'atom/app/node_main.h',
-+>>>>>>> .their
-       'atom/app/uv_task_runner.cc',
-       'atom/app/uv_task_runner.h',
-       'atom/browser/api/atom_api_app.cc',
-changed in both
-  base   100644 55b8372f52cf485ea5f812baed5f48296bacb962 lib/browser/api/auto-updater/auto-updater-win.js
-  our    100644 7fead4aabb4a8768db4e4d3bc13da4927cf3c42e lib/browser/api/auto-updater/auto-updater-win.js
-  their  100644 fced1258797756160d28cd1a16e0e5515d39bf5b lib/browser/api/auto-updater/auto-updater-win.js
-changed in both
-  base   100644 4783a9dd98852f303fe50e6fd03dabdecd6d0693 lib/browser/api/auto-updater/squirrel-update-win.js
-  our    100644 fecf7958cd0afd54e978f011f5f87eea751faf6d lib/browser/api/auto-updater/squirrel-update-win.js
-  their  100644 60345f1a1abead139d280b14457e558c6467de45 lib/browser/api/auto-updater/squirrel-update-win.js
-changed in both
-  base   100644 731f82838af35a13442a2723b843cf0bcfb4717c lib/browser/guest-view-manager.js
-  our    100644 1e4029e39a981c85fb6ff18c5ccd52f81b3c56f2 lib/browser/guest-view-manager.js
-  their  100644 039753b7aef48f9ff8e9f507f7cb5d13458413b5 lib/browser/guest-view-manager.js
-changed in both
-  base   100644 bd9473dda879723625af24c0f98de2855234a2c7 lib/browser/guest-window-manager.js
-  our    100644 7253c1942b0956ae6b9b0c80a23470fc26669b8a lib/browser/guest-window-manager.js
-  their  100644 15137992b19d7a8f666dd54936200f728013e71c lib/browser/guest-window-manager.js
-@@ -65,7 +65,11 @@
-   // Inherit certain option values from parent window
-   const webPreferences = embedder.getLastWebPreferences()
-   for (const [name, value] of inheritedWebPreferences) {
-+<<<<<<< .our
-     if (webPreferences[name] === value) {
-+=======
-+    if (embedder.getLastWebPreferences()[name] === value) {
-+>>>>>>> .their
-       options.webPreferences[name] = value
-     }
-   }
-added in both
-  our    100644 b1d8824658ea05c277e82d1ac6c6febab9c55030 package-lock.json
-  their  100644 514c02bdd3fcc3df56524925fec36baab9db77f7 package-lock.json
-@@ -1,13 +1,23 @@
- {
-   "name": "electron",
-+<<<<<<< .our
-   "version": "4.0.0-nightly.20180819",
-+=======
-+  "version": "1.7.15",
-+>>>>>>> .their
-   "lockfileVersion": 1,
-   "requires": true,
-   "dependencies": {
-     "@types/node": {
-+<<<<<<< .our
-       "version": "7.0.69",
-       "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.69.tgz",
-       "integrity": "sha512-S5NC8HV6HnRipg8nC0j30TPl7ktXjRTKqgyINLNe8K/64UJUI8Lq0sRopXC0hProsV2F5ibj8IqPkl1xpGggrw==",
-+=======
-+      "version": "7.0.56",
-+      "resolved": "http://registry.npmjs.org/@types/node/-/node-7.0.56.tgz",
-+      "integrity": "sha512-NgjN3xPyqbAXSIpznNAR5Cisx5uKqJWxcS9kefzSFEX/9J7O01/FHyfnvPI7SztBf9p6c8mqOn3olZWJx3ja6g==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "JSONStream": {
-@@ -30,6 +40,7 @@
-     "abbrev": {
-       "version": "1.1.1",
-       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg=",
-       "dev": true
-     },
-@@ -43,6 +54,11 @@
-         "negotiator": "0.6.1"
-       }
-     },
-+=======
-+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-+      "dev": true
-+    },
-+>>>>>>> .their
-     "acorn": {
-       "version": "4.0.13",
-       "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
-@@ -109,12 +125,15 @@
-       "integrity": "sha1-anmQQ3ynNtXhKI25K9MmbV9csqo=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "address": {
-       "version": "1.0.3",
-       "resolved": "https://registry.npmjs.org/address/-/address-1.0.3.tgz",
-       "integrity": "sha512-z55ocwKBRLryBs394Sm3ushTtBeg6VAeuku7utSoSnsJKvKcnXFIyC6vh27n3rXyxSgkJBBCAvyOn7gSUcTYjg==",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "agent-base": {
-       "version": "2.1.1",
-       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz",
-@@ -192,7 +211,11 @@
-         "string-width": {
-           "version": "2.1.1",
-           "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
-+=======
-+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "is-fullwidth-code-point": "2.0.0",
-@@ -231,13 +254,18 @@
-     "anymatch": {
-       "version": "1.3.2",
-       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-VT3Lj5HjyImEXf26NMd3IbkLnXo=",
-+=======
-+      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "micromatch": "2.3.11",
-         "normalize-path": "2.1.1"
-       }
-     },
-+<<<<<<< .our
-     "arch": {
-       "version": "2.1.1",
-       "resolved": "https://registry.npmjs.org/arch/-/arch-2.1.1.tgz",
-@@ -250,6 +278,8 @@
-       "integrity": "sha512-XxNTUzKnz1ctK3ZIcI2XUPlD96wbHP2nGqkPKpvk/HNRlPveYrXIVSTk9m3LcqOgDPg3B1nMvdV/K8wZd7PG4w==",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "argparse": {
-       "version": "1.0.10",
-       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-@@ -259,6 +289,7 @@
-         "sprintf-js": "1.0.3"
-       }
-     },
-+<<<<<<< .our
-     "args": {
-       "version": "4.0.0",
-       "resolved": "https://registry.npmjs.org/args/-/args-4.0.0.tgz",
-@@ -314,6 +345,8 @@
-         }
-       }
-     },
-+=======
-+>>>>>>> .their
-     "arr-diff": {
-       "version": "2.0.0",
-       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-@@ -326,7 +359,11 @@
-     "arr-flatten": {
-       "version": "1.1.0",
-       "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE=",
-+=======
-+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "array-filter": {
-@@ -347,12 +384,15 @@
-       "integrity": "sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "array-iterate": {
-       "version": "1.1.2",
-       "resolved": "https://registry.npmjs.org/array-iterate/-/array-iterate-1.1.2.tgz",
-       "integrity": "sha512-1hWSHTIlG/8wtYD+PPX5AOBtKWngpDFjrsrHgZpe+JdgNGz0udYu6ZIkAa/xuenIUEqFv7DvE2Yr60jxweJSrQ==",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "array-map": {
-       "version": "0.0.0",
-       "resolved": "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz",
-@@ -393,7 +433,11 @@
-       "dev": true,
-       "requires": {
-         "define-properties": "1.1.2",
-+<<<<<<< .our
-         "es-abstract": "1.11.0"
-+=======
-+        "es-abstract": "1.10.0"
-+>>>>>>> .their
-       }
-     },
-     "arrify": {
-@@ -409,7 +453,11 @@
-       "dev": true,
-       "requires": {
-         "chromium-pickle-js": "0.1.0",
-+<<<<<<< .our
-         "commander": "2.15.1",
-+=======
-+        "commander": "2.15.0",
-+>>>>>>> .their
-         "cuint": "0.2.2",
-         "glob": "6.0.4",
-         "minimatch": "3.0.4",
-@@ -431,7 +479,11 @@
-       "requires": {
-         "bn.js": "4.11.8",
-         "inherits": "2.0.3",
-+<<<<<<< .our
-         "minimalistic-assert": "1.0.1"
-+=======
-+        "minimalistic-assert": "1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "assert": {
-@@ -464,12 +516,15 @@
-       "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "async-each": {
-       "version": "1.0.1",
-       "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz",
-       "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "asynckit": {
-       "version": "0.4.0",
-       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-@@ -483,9 +538,15 @@
-       "dev": true
-     },
-     "aws4": {
-+<<<<<<< .our
-       "version": "1.7.0",
-       "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz",
-       "integrity": "sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w==",
-+=======
-+      "version": "1.6.0",
-+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-+      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "babel-code-frame": {
-@@ -499,12 +560,15 @@
-         "js-tokens": "3.0.2"
-       }
-     },
-+<<<<<<< .our
-     "bail": {
-       "version": "1.0.3",
-       "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.3.tgz",
-       "integrity": "sha512-1X8CnjFVQ+a+KW36uBNMTU5s8+v5FzeqrP7hTG5aTb4aPreSbZJlhwPon9VKMuEVgV++JM+SQrALY3kr7eswdg==",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "balanced-match": {
-       "version": "1.0.0",
-       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-@@ -512,6 +576,7 @@
-       "dev": true
-     },
-     "base64-js": {
-+<<<<<<< .our
-       "version": "1.3.0",
-       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
-       "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==",
-@@ -534,6 +599,13 @@
-         }
-       }
-     },
-+=======
-+      "version": "1.2.3",
-+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.3.tgz",
-+      "integrity": "sha512-MsAhsUW1GxCdgYSO6tAfZrNapmUKk7mWx/k5mFY/A1gBtkaCaNapTg+FExCw1r9yeaZhqx/xPg43xgTFH6KL5w==",
-+      "dev": true
-+    },
-+>>>>>>> .their
-     "bcrypt-pbkdf": {
-       "version": "1.0.1",
-       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
-@@ -554,6 +626,7 @@
-         "chainsaw": "0.1.0"
-       }
-     },
-+<<<<<<< .our
-     "binary-extensions": {
-       "version": "1.11.0",
-       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz",
-@@ -568,6 +641,15 @@
-       "requires": {
-         "readable-stream": "2.3.6",
-         "safe-buffer": "5.1.2"
-+=======
-+    "bl": {
-+      "version": "1.2.1",
-+      "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.1.tgz",
-+      "integrity": "sha1-ysMo977kVzDUBLaSID/LWQ4XLV4=",
-+      "dev": true,
-+      "requires": {
-+        "readable-stream": "2.3.5"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -577,31 +659,52 @@
-           "dev": true
-         },
-         "readable-stream": {
-+<<<<<<< .our
-           "version": "2.3.6",
-           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-+=======
-+          "version": "2.3.5",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
-+          "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-             "process-nextick-args": "2.0.0",
-+<<<<<<< .our
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-+=======
-+            "safe-buffer": "5.1.1",
-+            "string_decoder": "1.0.3",
-+>>>>>>> .their
-             "util-deprecate": "1.0.2"
-           }
-         },
-         "string_decoder": {
-+<<<<<<< .our
-           "version": "1.1.1",
-           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-             "safe-buffer": "5.1.2"
-+=======
-+          "version": "1.0.3",
-+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-+          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-+          "dev": true,
-+          "requires": {
-+            "safe-buffer": "5.1.1"
-+>>>>>>> .their
-           }
-         }
-       }
-     },
-+<<<<<<< .our
-     "bluebird": {
-       "version": "3.5.1",
-       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
-@@ -612,6 +715,12 @@
-       "version": "4.11.8",
-       "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-       "integrity": "sha1-LN4J617jQfSEdGuwMJsyU7GxRC8=",
-+=======
-+    "bn.js": {
-+      "version": "4.11.8",
-+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-+      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "boolbase": {
-@@ -637,7 +746,11 @@
-       "requires": {
-         "ansi-align": "2.0.0",
-         "camelcase": "4.1.0",
-+<<<<<<< .our
-         "chalk": "2.4.1",
-+=======
-+        "chalk": "2.3.2",
-+>>>>>>> .their
-         "cli-boxes": "1.0.0",
-         "string-width": "2.1.1",
-         "term-size": "1.2.0",
-@@ -666,14 +779,24 @@
-           "dev": true
-         },
-         "chalk": {
-+<<<<<<< .our
-           "version": "2.4.1",
-           "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
-           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
-+=======
-+          "version": "2.3.2",
-+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
-+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "ansi-styles": "3.2.1",
-             "escape-string-regexp": "1.0.5",
-+<<<<<<< .our
-             "supports-color": "5.4.0"
-+=======
-+            "supports-color": "5.3.0"
-+>>>>>>> .their
-           }
-         },
-         "has-flag": {
-@@ -691,7 +814,11 @@
-         "string-width": {
-           "version": "2.1.1",
-           "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
-+=======
-+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "is-fullwidth-code-point": "2.0.0",
-@@ -708,9 +835,15 @@
-           }
-         },
-         "supports-color": {
-+<<<<<<< .our
-           "version": "5.4.0",
-           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
-           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-+=======
-+          "version": "5.3.0",
-+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
-+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "has-flag": "3.0.0"
-@@ -746,15 +879,25 @@
-       "dev": true
-     },
-     "browser-pack": {
-+<<<<<<< .our
-       "version": "6.1.0",
-       "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-6.1.0.tgz",
-       "integrity": "sha512-erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA==",
-+=======
-+      "version": "6.0.4",
-+      "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.4.tgz",
-+      "integrity": "sha512-Q4Rvn7P6ObyWfc4stqLWHtG1MJ8vVtjgT24Zbu+8UTzxYuZouqZsmNRRTFVMY/Ux0eIKv1d+JWzsInTX+fdHPQ==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "JSONStream": "1.3.2",
-         "combine-source-map": "0.8.0",
-         "defined": "1.0.0",
-+<<<<<<< .our
-         "safe-buffer": "5.1.2",
-+=======
-+        "safe-buffer": "5.1.1",
-+>>>>>>> .their
-         "through2": "2.0.3",
-         "umd": "3.0.3"
-       }
-@@ -784,7 +927,11 @@
-       "requires": {
-         "JSONStream": "1.3.2",
-         "assert": "1.4.1",
-+<<<<<<< .our
-         "browser-pack": "6.1.0",
-+=======
-+        "browser-pack": "6.0.4",
-+>>>>>>> .their
-         "browser-resolve": "1.11.2",
-         "browserify-zlib": "0.1.4",
-         "buffer": "4.9.1",
-@@ -803,8 +950,13 @@
-         "htmlescape": "1.1.1",
-         "https-browserify": "0.0.1",
-         "inherits": "2.0.3",
-+<<<<<<< .our
-         "insert-module-globals": "7.0.6",
-         "labeled-stream-splicer": "2.0.1",
-+=======
-+        "insert-module-globals": "7.0.2",
-+        "labeled-stream-splicer": "2.0.0",
-+>>>>>>> .their
-         "module-deps": "4.1.1",
-         "os-browserify": "0.1.2",
-         "parents": "1.0.1",
-@@ -813,12 +965,21 @@
-         "punycode": "1.4.1",
-         "querystring-es3": "0.2.1",
-         "read-only-stream": "2.0.0",
-+<<<<<<< .our
-         "readable-stream": "2.3.6",
-         "resolve": "1.7.1",
-         "shasum": "1.0.2",
-         "shell-quote": "1.6.1",
-         "stream-browserify": "2.0.1",
-         "stream-http": "2.8.2",
-+=======
-+        "readable-stream": "2.3.5",
-+        "resolve": "1.5.0",
-+        "shasum": "1.0.2",
-+        "shell-quote": "1.6.1",
-+        "stream-browserify": "2.0.1",
-+        "stream-http": "2.8.1",
-+>>>>>>> .their
-         "string_decoder": "0.10.31",
-         "subarg": "1.0.0",
-         "syntax-error": "1.4.0",
-@@ -834,7 +995,11 @@
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "fs.realpath": "1.0.0",
-@@ -852,27 +1017,47 @@
-           "dev": true
-         },
-         "readable-stream": {
-+<<<<<<< .our
-           "version": "2.3.6",
-           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-+=======
-+          "version": "2.3.5",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
-+          "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-             "process-nextick-args": "2.0.0",
-+<<<<<<< .our
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-+=======
-+            "safe-buffer": "5.1.1",
-+            "string_decoder": "1.0.3",
-+>>>>>>> .their
-             "util-deprecate": "1.0.2"
-           },
-           "dependencies": {
-             "string_decoder": {
-+<<<<<<< .our
-               "version": "1.1.1",
-               "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-               "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-               "dev": true,
-               "requires": {
-                 "safe-buffer": "5.1.2"
-+=======
-+              "version": "1.0.3",
-+              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-+              "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-+              "dev": true,
-+              "requires": {
-+                "safe-buffer": "5.1.1"
-+>>>>>>> .their
-               }
-             }
-           }
-@@ -880,13 +1065,20 @@
-       }
-     },
-     "browserify-aes": {
-+<<<<<<< .our
-       "version": "1.2.0",
-       "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-       "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
-+=======
-+      "version": "1.1.1",
-+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.1.1.tgz",
-+      "integrity": "sha512-UGnTYAnB2a3YuYKIRy1/4FB2HdM866E0qC46JXvVTYKlBlZlnvfpSfY6OKfXZAkv70eJ2a1SqzpAo5CRhZGDFg==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "buffer-xor": "1.0.3",
-         "cipher-base": "1.0.4",
-+<<<<<<< .our
-         "create-hash": "1.2.0",
-         "evp_bytestokey": "1.0.3",
-         "inherits": "2.0.3",
-@@ -901,13 +1093,35 @@
-       "requires": {
-         "browserify-aes": "1.2.0",
-         "browserify-des": "1.0.1",
-+=======
-+        "create-hash": "1.1.3",
-+        "evp_bytestokey": "1.0.3",
-+        "inherits": "2.0.3",
-+        "safe-buffer": "5.1.1"
-+      }
-+    },
-+    "browserify-cipher": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz",
-+      "integrity": "sha1-mYgkSHS/XtTijalWZtzWasj8Njo=",
-+      "dev": true,
-+      "requires": {
-+        "browserify-aes": "1.1.1",
-+        "browserify-des": "1.0.0",
-+>>>>>>> .their
-         "evp_bytestokey": "1.0.3"
-       }
-     },
-     "browserify-des": {
-+<<<<<<< .our
-       "version": "1.0.1",
-       "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.1.tgz",
-       "integrity": "sha512-zy0Cobe3hhgpiOM32Tj7KQ3Vl91m0njwsjzZQK1L+JDf11dzP9qIvjreVinsvXrgfjhStXwUWAEpB9D7Gwmayw==",
-+=======
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz",
-+      "integrity": "sha1-2qJ3cXRwki7S/hhZQRihdUOXId0=",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "cipher-base": "1.0.4",
-@@ -933,11 +1147,19 @@
-       "requires": {
-         "bn.js": "4.11.8",
-         "browserify-rsa": "4.0.1",
-+<<<<<<< .our
-         "create-hash": "1.2.0",
-         "create-hmac": "1.1.7",
-         "elliptic": "6.4.0",
-         "inherits": "2.0.3",
-         "parse-asn1": "5.1.1"
-+=======
-+        "create-hash": "1.1.3",
-+        "create-hmac": "1.1.6",
-+        "elliptic": "6.4.0",
-+        "inherits": "2.0.3",
-+        "parse-asn1": "5.1.0"
-+>>>>>>> .their
-       }
-     },
-     "browserify-zlib": {
-@@ -955,8 +1177,13 @@
-       "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "base64-js": "1.3.0",
-         "ieee754": "1.1.11",
-+=======
-+        "base64-js": "1.2.3",
-+        "ieee754": "1.1.8",
-+>>>>>>> .their
-         "isarray": "1.0.0"
-       },
-       "dependencies": {
-@@ -968,6 +1195,7 @@
-         }
-       }
-     },
-+<<<<<<< .our
-     "buffer-alloc": {
-       "version": "1.1.0",
-       "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.1.0.tgz",
-@@ -996,6 +1224,8 @@
-       "integrity": "sha512-83apNb8KK0Se60UE1+4Ukbe3HbfELJ6UlI4ldtOGs7So4KD26orJM8hIY9lxdzP+UpItH1Yh/Y8GUvNFWFFRxA==",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "buffer-xor": {
-       "version": "1.0.3",
-       "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-@@ -1020,12 +1250,15 @@
-       "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "bytes": {
-       "version": "3.0.0",
-       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-       "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "cached-path-relative": {
-       "version": "1.0.1",
-       "resolved": "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.1.tgz",
-@@ -1085,12 +1318,15 @@
-       "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "ccount": {
-       "version": "1.0.3",
-       "resolved": "https://registry.npmjs.org/ccount/-/ccount-1.0.3.tgz",
-       "integrity": "sha512-Jt9tIBkRc9POUof7QA/VwWd+58fKkEEfI+/t1/eOlxKM7ZhrczNzMFefge7Ai+39y1pR/pP6cI19guHy3FSLmw==",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "center-align": {
-       "version": "0.1.3",
-       "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
-@@ -1132,6 +1368,7 @@
-         }
-       }
-     },
-+<<<<<<< .our
-     "character-entities": {
-       "version": "1.2.2",
-       "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.2.tgz",
-@@ -1160,6 +1397,12 @@
-       "version": "1.2.0",
-       "resolved": "https://registry.npmjs.org/check-for-leaks/-/check-for-leaks-1.2.0.tgz",
-       "integrity": "sha1-6jtQFk6XV3kzLGKBMZX/jGr4Jsw=",
-+=======
-+    "check-for-leaks": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/check-for-leaks/-/check-for-leaks-1.2.0.tgz",
-+      "integrity": "sha512-bJ2Bzo6RtsYqamMnsjtVzowGvBNVrR5IPK8Bd+lx5W1TNgOKMsF+AyNHVkqFqO7cpDZNfny5SaqH6gEovpV5Gw==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "anymatch": "1.3.2",
-@@ -1201,6 +1444,7 @@
-         "lodash.some": "4.6.0"
-       }
-     },
-+<<<<<<< .our
-     "chokidar": {
-       "version": "1.7.0",
-       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
-@@ -1218,6 +1462,8 @@
-         "readdirp": "2.1.0"
-       }
-     },
-+=======
-+>>>>>>> .their
-     "chownr": {
-       "version": "1.0.1",
-       "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz",
-@@ -1239,16 +1485,25 @@
-     "cipher-base": {
-       "version": "1.0.4",
-       "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-h2Dk7MJy9MNjUy+SbYdKriwTl94=",
-       "dev": true,
-       "requires": {
-         "inherits": "2.0.3",
-         "safe-buffer": "5.1.2"
-+=======
-+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-+      "dev": true,
-+      "requires": {
-+        "inherits": "2.0.3",
-+        "safe-buffer": "5.1.1"
-+>>>>>>> .their
-       }
-     },
-     "circular-json": {
-       "version": "0.3.3",
-       "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-gVyZ6oT2gJUp0vRXkb34JxE1LWY=",
-       "dev": true
-     },
-@@ -1279,6 +1534,11 @@
-         }
-       }
-     },
-+=======
-+      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
-+      "dev": true
-+    },
-+>>>>>>> .their
-     "clean-deep": {
-       "version": "2.0.2",
-       "resolved": "https://registry.npmjs.org/clean-deep/-/clean-deep-2.0.2.tgz",
-@@ -1317,6 +1577,7 @@
-       "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "clipboardy": {
-       "version": "1.2.3",
-       "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-1.2.3.tgz",
-@@ -1344,6 +1605,8 @@
-         }
-       }
-     },
-+=======
-+>>>>>>> .their
-     "cliui": {
-       "version": "2.1.0",
-       "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-@@ -1377,12 +1640,15 @@
-       "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "collapse-white-space": {
-       "version": "1.0.4",
-       "resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.4.tgz",
-       "integrity": "sha512-YfQ1tAUZm561vpYD+5eyWN8+UsceQbSrqqlc/6zDY2gtAE+uZLSdkkovhnGpmCThsvKBFakq4EdY/FF93E8XIw==",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "color-convert": {
-       "version": "1.9.1",
-       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz",
-@@ -1399,9 +1665,15 @@
-       "dev": true
-     },
-     "colors": {
-+<<<<<<< .our
-       "version": "1.2.5",
-       "resolved": "https://registry.npmjs.org/colors/-/colors-1.2.5.tgz",
-       "integrity": "sha512-erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg==",
-+=======
-+      "version": "1.2.1",
-+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.2.1.tgz",
-+      "integrity": "sha512-s8+wktIuDSLffCywiwSxQOMqtPxML11a/dtHE17tMn4B1MSWw/C22EKf7M2KGUBcDaVFEGT+S8N02geDXeuNKg==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "combine-source-map": {
-@@ -1426,9 +1698,15 @@
-       }
-     },
-     "commander": {
-+<<<<<<< .our
-       "version": "2.15.1",
-       "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
-       "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
-+=======
-+      "version": "2.15.0",
-+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.0.tgz",
-+      "integrity": "sha512-7B1ilBwtYSbetCgTY1NJFg+gVpestg0fdA1MhC1Vs4ssyfSXnCAjFr+QcQM9/RedXC0EaUx1sG8Smgw2VfgKEg==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "compare-func": {
-@@ -1441,6 +1719,7 @@
-         "dot-prop": "3.0.0"
-       }
-     },
-+<<<<<<< .our
-     "compressible": {
-       "version": "2.0.14",
-       "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.14.tgz",
-@@ -1473,6 +1752,8 @@
-         "vary": "1.1.2"
-       }
-     },
-+=======
-+>>>>>>> .their
-     "concat-map": {
-       "version": "0.0.1",
-       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-@@ -1519,14 +1800,24 @@
-       }
-     },
-     "configstore": {
-+<<<<<<< .our
-       "version": "3.1.2",
-       "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz",
-       "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==",
-+=======
-+      "version": "3.1.1",
-+      "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz",
-+      "integrity": "sha512-5oNkD/L++l0O6xGXxb1EWS7SivtjfGQlRyxJsYgE0Z495/L81e2h4/d3r969hoPXuFItzNOKMtsXgYG4c7dYvw==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "dot-prop": "4.2.0",
-         "graceful-fs": "4.1.11",
-+<<<<<<< .our
-         "make-dir": "1.3.0",
-+=======
-+        "make-dir": "1.2.0",
-+>>>>>>> .their
-         "unique-string": "1.0.0",
-         "write-file-atomic": "2.3.0",
-         "xdg-basedir": "3.0.0"
-@@ -1535,7 +1826,11 @@
-         "dot-prop": {
-           "version": "4.2.0",
-           "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-HxngwuGqDjJ5fEl5nyg3rGr2nFc=",
-+=======
-+          "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "is-obj": "1.0.1"
-@@ -1564,6 +1859,7 @@
-       "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "content-type": {
-       "version": "1.0.4",
-       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-@@ -1587,6 +1883,25 @@
-         "conventional-changelog-jscs": "0.1.0",
-         "conventional-changelog-jshint": "0.3.8",
-         "conventional-changelog-preset-loader": "1.1.8"
-+=======
-+    "conventional-changelog": {
-+      "version": "1.1.18",
-+      "resolved": "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.18.tgz",
-+      "integrity": "sha512-swf5bqhm7PsY2cw6zxuPy6+rZiiGwEpQnrWki+L+z2oZI53QSYwU4brpljmmWss821AsiwmVL+7V6hP+ER+TBA==",
-+      "dev": true,
-+      "requires": {
-+        "conventional-changelog-angular": "1.6.6",
-+        "conventional-changelog-atom": "0.2.4",
-+        "conventional-changelog-codemirror": "0.3.4",
-+        "conventional-changelog-core": "2.0.5",
-+        "conventional-changelog-ember": "0.3.6",
-+        "conventional-changelog-eslint": "1.0.5",
-+        "conventional-changelog-express": "0.3.4",
-+        "conventional-changelog-jquery": "0.1.0",
-+        "conventional-changelog-jscs": "0.1.0",
-+        "conventional-changelog-jshint": "0.3.4",
-+        "conventional-changelog-preset-loader": "1.1.6"
-+>>>>>>> .their
-       }
-     },
-     "conventional-changelog-angular": {
-@@ -1600,15 +1915,22 @@
-       }
-     },
-     "conventional-changelog-atom": {
-+<<<<<<< .our
-       "version": "0.2.8",
-       "resolved": "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.2.8.tgz",
-       "integrity": "sha512-8pPZqhMbrnltNBizjoDCb/Sz85KyUXNDQxuAEYAU5V/eHn0okMBVjqc8aHWYpHrytyZWvMGbayOlDv7i8kEf6g==",
-+=======
-+      "version": "0.2.4",
-+      "resolved": "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.2.4.tgz",
-+      "integrity": "sha512-4+hmbBwcAwx1XzDZ4aEOxk/ONU0iay10G0u/sld16ksgnRUHN7CxmZollm3FFaptr6VADMq1qxomA+JlpblBlg==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "q": "1.5.1"
-       }
-     },
-     "conventional-changelog-cli": {
-+<<<<<<< .our
-       "version": "1.3.22",
-       "resolved": "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.22.tgz",
-       "integrity": "sha512-pnjdIJbxjkZ5VdAX/H1wndr1G10CY8MuZgnXuJhIHglOXfIrXygb7KZC836GW9uo1u8PjEIvIw/bKX0lOmOzZg==",
-@@ -1618,19 +1940,37 @@
-         "conventional-changelog": "1.1.24",
-         "lodash": "4.17.10",
-         "meow": "4.0.1",
-+=======
-+      "version": "1.3.16",
-+      "resolved": "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.16.tgz",
-+      "integrity": "sha512-zNDG/rNbh29Z+d6zzrHN63dFZ4q9k1Ri0V8lXGw1q2ia6+FaE7AqJKccObbBFRmRISXpFESrqZiXpM4QeA84YA==",
-+      "dev": true,
-+      "requires": {
-+        "add-stream": "1.0.0",
-+        "conventional-changelog": "1.1.18",
-+        "lodash": "4.17.5",
-+        "meow": "4.0.0",
-+>>>>>>> .their
-         "tempfile": "1.1.1"
-       }
-     },
-     "conventional-changelog-codemirror": {
-+<<<<<<< .our
-       "version": "0.3.8",
-       "resolved": "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.3.8.tgz",
-       "integrity": "sha512-3HFZKtBXTaUCHvz7ai6nk2+psRIkldDoNzCsom0egDtVmPsvvHZkzjynhdQyULfacRSsBTaiQ0ol6nBOL4dDiQ==",
-+=======
-+      "version": "0.3.4",
-+      "resolved": "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.3.4.tgz",
-+      "integrity": "sha512-8M7pGgQVzRU//vG3rFlLYqqBywOLxu9XM0/lc1/1Ll7RuKA79PgK9TDpuPmQDHFnqGS7D1YiZpC3Z0D9AIYExg==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "q": "1.5.1"
-       }
-     },
-     "conventional-changelog-core": {
-+<<<<<<< .our
-       "version": "2.0.11",
-       "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-2.0.11.tgz",
-       "integrity": "sha512-HvTE6RlqeEZ/NFPtQeFLsIDOLrGP3bXYr7lFLMhCVsbduF1MXIe8OODkwMFyo1i9ku9NWBwVnVn0jDmIFXjDRg==",
-@@ -1644,6 +1984,21 @@
-         "git-remote-origin-url": "2.0.0",
-         "git-semver-tags": "1.3.6",
-         "lodash": "4.17.10",
-+=======
-+      "version": "2.0.5",
-+      "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-2.0.5.tgz",
-+      "integrity": "sha512-lP1s7Z3NyEFcG78bWy7GG7nXsq9OpAJgo2xbyAlVBDweLSL5ghvyEZlkEamnAQpIUVK0CAVhs8nPvCiQuXT/VA==",
-+      "dev": true,
-+      "requires": {
-+        "conventional-changelog-writer": "3.0.4",
-+        "conventional-commits-parser": "2.1.5",
-+        "dateformat": "3.0.3",
-+        "get-pkg-repo": "1.4.0",
-+        "git-raw-commits": "1.3.4",
-+        "git-remote-origin-url": "2.0.0",
-+        "git-semver-tags": "1.3.4",
-+        "lodash": "4.17.5",
-+>>>>>>> .their
-         "normalize-package-data": "2.4.0",
-         "q": "1.5.1",
-         "read-pkg": "1.1.0",
-@@ -1652,27 +2007,45 @@
-       }
-     },
-     "conventional-changelog-ember": {
-+<<<<<<< .our
-       "version": "0.3.12",
-       "resolved": "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.3.12.tgz",
-       "integrity": "sha512-mmJzA7uzbrOqeF89dMMi6z17O07ORTXlTMArnLG9ZTX4oLaKNolUlxFUFlFm9JUoVWajVpaHQWjxH1EOQ+ARoQ==",
-+=======
-+      "version": "0.3.6",
-+      "resolved": "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.3.6.tgz",
-+      "integrity": "sha512-hBM1xb5IrjNtsjXaGryPF/Wn36cwyjkNeqX/CIDbJv/1kRFBHsWoSPYBiNVEpg8xE5fcK4DbPhGTDN2sVoPeiA==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "q": "1.5.1"
-       }
-     },
-     "conventional-changelog-eslint": {
-+<<<<<<< .our
-       "version": "1.0.9",
-       "resolved": "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-1.0.9.tgz",
-       "integrity": "sha512-h87nfVh2fdk9fJIvz26wCBsbDC/KxqCc5wSlNMZbXcARtbgNbNDIF7Y7ctokFdnxkzVdaHsbINkh548T9eBA7Q==",
-+=======
-+      "version": "1.0.5",
-+      "resolved": "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-1.0.5.tgz",
-+      "integrity": "sha512-7NUv+gMOS8Y49uPFRgF7kuLZqpnrKa2bQMZZsc62NzvaJmjUktnV03PYHuXhTDEHt5guvV9gyEFtUpgHCDkojg==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "q": "1.5.1"
-       }
-     },
-     "conventional-changelog-express": {
-+<<<<<<< .our
-       "version": "0.3.6",
-       "resolved": "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.3.6.tgz",
-       "integrity": "sha512-3iWVtBJZ9RnRnZveNDzOD8QRn6g6vUif0qVTWWyi5nUIAbuN1FfPVyKdAlJJfp5Im+dE8Kiy/d2SpaX/0X678Q==",
-+=======
-+      "version": "0.3.4",
-+      "resolved": "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.3.4.tgz",
-+      "integrity": "sha512-M+UUb715TXT6l9vyMf4HYvAepnQn0AYTcPi6KHrFsd80E0HErjQnqStBg8i3+Qm7EV9+RyATQEnIhSzHbdQ7+A==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "q": "1.5.1"
-@@ -1697,9 +2070,15 @@
-       }
-     },
-     "conventional-changelog-jshint": {
-+<<<<<<< .our
-       "version": "0.3.8",
-       "resolved": "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.3.8.tgz",
-       "integrity": "sha512-hn9QU4ZI/5V50wKPJNPGT4gEWgiBFpV6adieILW4MaUFynuDYOvQ71EMSj3EznJyKi/KzuXpc9dGmX8njZMjig==",
-+=======
-+      "version": "0.3.4",
-+      "resolved": "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.3.4.tgz",
-+      "integrity": "sha512-CdrqwDgL56b176FVxHmhuOvnO1dRDQvrMaHyuIVjcFlOXukATz2wVT17g8jQU3LvybVbyXvJRbdD5pboo7/1KQ==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "compare-func": "1.3.2",
-@@ -1707,6 +2086,7 @@
-       }
-     },
-     "conventional-changelog-preset-loader": {
-+<<<<<<< .our
-       "version": "1.1.8",
-       "resolved": "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-1.1.8.tgz",
-       "integrity": "sha512-MkksM4G4YdrMlT2MbTsV2F6LXu/hZR0Tc/yenRrDIKRwBl/SP7ER4ZDlglqJsCzLJi4UonBc52Bkm5hzrOVCcw==",
-@@ -1725,12 +2105,33 @@
-         "json-stringify-safe": "5.0.1",
-         "lodash": "4.17.10",
-         "meow": "4.0.1",
-+=======
-+      "version": "1.1.6",
-+      "resolved": "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-1.1.6.tgz",
-+      "integrity": "sha512-yWPIP9wwsCKeUSPYApnApWhKIDjWRIX/uHejGS1tYfEsQR/bwpDFET7LYiHT+ujNbrlf6h1s3NlPGheOd4yJRQ==",
-+      "dev": true
-+    },
-+    "conventional-changelog-writer": {
-+      "version": "3.0.4",
-+      "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-3.0.4.tgz",
-+      "integrity": "sha512-EUf/hWiEj3IOa5Jk8XDzM6oS0WgijlYGkUfLc+mDnLH9RwpZqhYIBwgJHWHzEB4My013wx2FhmUu45P6tQrucw==",
-+      "dev": true,
-+      "requires": {
-+        "compare-func": "1.3.2",
-+        "conventional-commits-filter": "1.1.5",
-+        "dateformat": "3.0.3",
-+        "handlebars": "4.0.11",
-+        "json-stringify-safe": "5.0.1",
-+        "lodash": "4.17.5",
-+        "meow": "4.0.0",
-+>>>>>>> .their
-         "semver": "5.5.0",
-         "split": "1.0.1",
-         "through2": "2.0.3"
-       }
-     },
-     "conventional-commits-filter": {
-+<<<<<<< .our
-       "version": "1.1.6",
-       "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-1.1.6.tgz",
-       "integrity": "sha512-KcDgtCRKJCQhyk6VLT7zR+ZOyCnerfemE/CsR3iQpzRRFbLEs0Y6rwk3mpDvtOh04X223z+1xyJ582Stfct/0Q==",
-@@ -1744,12 +2145,32 @@
-       "version": "2.1.7",
-       "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.1.7.tgz",
-       "integrity": "sha512-BoMaddIEJ6B4QVMSDu9IkVImlGOSGA1I2BQyOZHeLQ6qVOJLcLKn97+fL6dGbzWEiqDzfH4OkcveULmeq2MHFQ==",
-+=======
-+      "version": "1.1.5",
-+      "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-1.1.5.tgz",
-+      "integrity": "sha512-mj3+WLj8UZE72zO9jocZjx8+W4Bwnx/KHoIz1vb4F8XUXj0XSjp8Y3MFkpRyIpsRiCBX+DkDjxGKF/nfeu7BGw==",
-+      "dev": true,
-+      "requires": {
-+        "is-subset": "0.1.1",
-+        "modify-values": "1.0.0"
-+      }
-+    },
-+    "conventional-commits-parser": {
-+      "version": "2.1.5",
-+      "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.1.5.tgz",
-+      "integrity": "sha512-jaAP61py+ISMF3/n3yIiIuY5h6mJlucOqawu5mLB1HaQADLvg/y5UB3pT7HSucZJan34lp7+7ylQPfbKEGmxrA==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "JSONStream": "1.3.2",
-         "is-text-path": "1.0.1",
-+<<<<<<< .our
-         "lodash": "4.17.10",
-         "meow": "4.0.1",
-+=======
-+        "lodash": "4.17.5",
-+        "meow": "4.0.0",
-+>>>>>>> .their
-         "split2": "2.2.0",
-         "through2": "2.0.3",
-         "trim-off-newlines": "1.0.1"
-@@ -1768,9 +2189,15 @@
-       "dev": true
-     },
-     "create-ecdh": {
-+<<<<<<< .our
-       "version": "4.0.3",
-       "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
-       "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
-+=======
-+      "version": "4.0.0",
-+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz",
-+      "integrity": "sha1-iIxyNZbN92EvZJgjPuvXo1MBc30=",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "bn.js": "4.11.8",
-@@ -1787,13 +2214,20 @@
-       }
-     },
-     "create-hash": {
-+<<<<<<< .our
-       "version": "1.2.0",
-       "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-       "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-+=======
-+      "version": "1.1.3",
-+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz",
-+      "integrity": "sha1-YGBCrIuSYnUPSDyt2rD1gZFy2P0=",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "cipher-base": "1.0.4",
-         "inherits": "2.0.3",
-+<<<<<<< .our
-         "md5.js": "1.3.4",
-         "ripemd160": "2.0.2",
-         "sha.js": "2.4.11"
-@@ -1811,6 +2245,24 @@
-         "ripemd160": "2.0.2",
-         "safe-buffer": "5.1.2",
-         "sha.js": "2.4.11"
-+=======
-+        "ripemd160": "2.0.1",
-+        "sha.js": "2.4.10"
-+      }
-+    },
-+    "create-hmac": {
-+      "version": "1.1.6",
-+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz",
-+      "integrity": "sha1-rLniIaThe9sHbpBlfEK5PjcmzwY=",
-+      "dev": true,
-+      "requires": {
-+        "cipher-base": "1.0.4",
-+        "create-hash": "1.1.3",
-+        "inherits": "2.0.3",
-+        "ripemd160": "2.0.1",
-+        "safe-buffer": "5.1.1",
-+        "sha.js": "2.4.10"
-+>>>>>>> .their
-       }
-     },
-     "cross-spawn": {
-@@ -1819,7 +2271,11 @@
-       "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "lru-cache": "4.1.3",
-+=======
-+        "lru-cache": "4.1.2",
-+>>>>>>> .their
-         "shebang-command": "1.2.0",
-         "which": "1.3.0"
-       }
-@@ -1836,7 +2292,11 @@
-         "boom": {
-           "version": "5.2.0",
-           "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-XdnabuOl8wIHdDYpDLcX0/SlTgI=",
-+=======
-+          "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "hoek": "4.2.1"
-@@ -1850,6 +2310,7 @@
-       "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "browserify-cipher": "1.0.1",
-         "browserify-sign": "4.0.4",
-         "create-ecdh": "4.0.3",
-@@ -1859,6 +2320,17 @@
-         "inherits": "2.0.3",
-         "pbkdf2": "3.0.16",
-         "public-encrypt": "4.0.2",
-+=======
-+        "browserify-cipher": "1.0.0",
-+        "browserify-sign": "4.0.4",
-+        "create-ecdh": "4.0.0",
-+        "create-hash": "1.1.3",
-+        "create-hmac": "1.1.6",
-+        "diffie-hellman": "5.0.2",
-+        "inherits": "2.0.3",
-+        "pbkdf2": "3.0.14",
-+        "public-encrypt": "4.0.0",
-+>>>>>>> .their
-         "randombytes": "2.0.6",
-         "randomfill": "1.0.4"
-       }
-@@ -1924,7 +2396,11 @@
-       "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "es5-ext": "0.10.42"
-+=======
-+        "es5-ext": "0.10.40"
-+>>>>>>> .their
-       }
-     },
-     "dargs": {
-@@ -1960,7 +2436,11 @@
-     "debug": {
-       "version": "2.6.9",
-       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
-+=======
-+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "ms": "2.0.0"
-@@ -2018,9 +2498,15 @@
-       "dev": true
-     },
-     "deep-extend": {
-+<<<<<<< .our
-       "version": "0.5.1",
-       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz",
-       "integrity": "sha512-N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w==",
-+=======
-+      "version": "0.4.2",
-+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
-+      "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "deep-is": {
-@@ -2061,16 +2547,26 @@
-       "requires": {
-         "find-root": "1.1.0",
-         "glob": "7.1.2",
-+<<<<<<< .our
-         "ignore": "3.3.8",
-         "pkg-config": "1.1.1",
-         "run-parallel": "1.1.9",
-+=======
-+        "ignore": "3.3.7",
-+        "pkg-config": "1.1.1",
-+        "run-parallel": "1.1.7",
-+>>>>>>> .their
-         "uniq": "1.0.1"
-       },
-       "dependencies": {
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "fs.realpath": "1.0.0",
-@@ -2091,7 +2587,11 @@
-       "requires": {
-         "globby": "5.0.0",
-         "is-path-cwd": "1.0.0",
-+<<<<<<< .our
-         "is-path-in-cwd": "1.0.1",
-+=======
-+        "is-path-in-cwd": "1.0.0",
-+>>>>>>> .their
-         "object-assign": "4.1.1",
-         "pify": "2.3.0",
-         "pinkie-promise": "2.0.1",
-@@ -2104,12 +2604,15 @@
-       "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "depd": {
-       "version": "1.1.1",
-       "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
-       "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "deps-sort": {
-       "version": "2.0.0",
-       "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.0.tgz",
-@@ -2129,6 +2632,7 @@
-       "dev": true,
-       "requires": {
-         "inherits": "2.0.3",
-+<<<<<<< .our
-         "minimalistic-assert": "1.0.1"
-       }
-     },
-@@ -2146,6 +2650,9 @@
-       "requires": {
-         "address": "1.0.3",
-         "debug": "2.6.9"
-+=======
-+        "minimalistic-assert": "1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "detective": {
-@@ -2173,9 +2680,15 @@
-       "dev": true
-     },
-     "diffie-hellman": {
-+<<<<<<< .our
-       "version": "5.0.3",
-       "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-       "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
-+=======
-+      "version": "5.0.2",
-+      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz",
-+      "integrity": "sha1-tYNXOScM/ias9jIJn97SoH8gnl4=",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "bn.js": "4.11.8",
-@@ -2184,12 +2697,30 @@
-       }
-     },
-     "doctrine": {
-+<<<<<<< .our
-       "version": "2.1.0",
-       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-       "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-       "dev": true,
-       "requires": {
-         "esutils": "2.0.2"
-+=======
-+      "version": "1.5.0",
-+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
-+      "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
-+      "dev": true,
-+      "requires": {
-+        "esutils": "2.0.2",
-+        "isarray": "1.0.0"
-+      },
-+      "dependencies": {
-+        "isarray": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-+          "dev": true
-+        }
-+>>>>>>> .their
-       }
-     },
-     "dom-serializer": {
-@@ -2223,9 +2754,15 @@
-       "dev": true
-     },
-     "domhandler": {
-+<<<<<<< .our
-       "version": "2.4.2",
-       "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
-       "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
-+=======
-+      "version": "2.4.1",
-+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz",
-+      "integrity": "sha1-iS5HAAqZvlW783dP/qBWHYh5wlk=",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "domelementtype": "1.3.0"
-@@ -2266,9 +2803,15 @@
-       }
-     },
-     "dugite": {
-+<<<<<<< .our
-       "version": "1.63.0",
-       "resolved": "https://registry.npmjs.org/dugite/-/dugite-1.63.0.tgz",
-       "integrity": "sha512-CFd0sWTB2oouat0kJA4/rEQAeh6ZUvCDL9uFOaSBhLX+2CM/YL+ebKJXd8dYVIe8iVXmK5R9P31NVbRw4Ccoxw==",
-+=======
-+      "version": "1.60.0",
-+      "resolved": "https://registry.npmjs.org/dugite/-/dugite-1.60.0.tgz",
-+      "integrity": "sha512-HP5Qfx867ESOkrrEhXtxi72UQoNWaCSEcahGCmnBM/v+ldgbFu94s9CvG3tDcBtz1HJkvYEtkBd8V8Vb63nfUw==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "checksum": "0.1.1",
-@@ -2276,7 +2819,11 @@
-         "progress": "2.0.0",
-         "request": "2.85.0",
-         "rimraf": "2.6.2",
-+<<<<<<< .our
-         "tar": "4.4.2"
-+=======
-+        "tar": "4.4.0"
-+>>>>>>> .their
-       }
-     },
-     "duplexer2": {
-@@ -2285,7 +2832,11 @@
-       "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "readable-stream": "2.3.6"
-+=======
-+        "readable-stream": "2.3.5"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -2295,27 +2846,47 @@
-           "dev": true
-         },
-         "readable-stream": {
-+<<<<<<< .our
-           "version": "2.3.6",
-           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-+=======
-+          "version": "2.3.5",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
-+          "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-             "process-nextick-args": "2.0.0",
-+<<<<<<< .our
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-+=======
-+            "safe-buffer": "5.1.1",
-+            "string_decoder": "1.0.3",
-+>>>>>>> .their
-             "util-deprecate": "1.0.2"
-           }
-         },
-         "string_decoder": {
-+<<<<<<< .our
-           "version": "1.1.1",
-           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-             "safe-buffer": "5.1.2"
-+=======
-+          "version": "1.0.3",
-+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-+          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-+          "dev": true,
-+          "requires": {
-+            "safe-buffer": "5.1.1"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -2327,14 +2898,24 @@
-       "dev": true
-     },
-     "duplexify": {
-+<<<<<<< .our
-       "version": "3.6.0",
-       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz",
-       "integrity": "sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==",
-+=======
-+      "version": "3.5.4",
-+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.4.tgz",
-+      "integrity": "sha512-JzYSLYMhoVVBe8+mbHQ4KgpvHpm0DZpJuL8PY93Vyv1fW7jYJ90LoXa1di/CVbJM+TgMs91rbDapE/RNIfnJsA==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "end-of-stream": "1.4.1",
-         "inherits": "2.0.3",
-+<<<<<<< .our
-         "readable-stream": "2.3.6",
-+=======
-+        "readable-stream": "2.3.5",
-+>>>>>>> .their
-         "stream-shift": "1.0.0"
-       },
-       "dependencies": {
-@@ -2345,27 +2926,47 @@
-           "dev": true
-         },
-         "readable-stream": {
-+<<<<<<< .our
-           "version": "2.3.6",
-           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-+=======
-+          "version": "2.3.5",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
-+          "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-             "process-nextick-args": "2.0.0",
-+<<<<<<< .our
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-+=======
-+            "safe-buffer": "5.1.1",
-+            "string_decoder": "1.0.3",
-+>>>>>>> .their
-             "util-deprecate": "1.0.2"
-           }
-         },
-         "string_decoder": {
-+<<<<<<< .our
-           "version": "1.1.1",
-           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-             "safe-buffer": "5.1.2"
-+=======
-+          "version": "1.0.3",
-+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-+          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-+          "dev": true,
-+          "requires": {
-+            "safe-buffer": "5.1.1"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -2380,12 +2981,15 @@
-         "jsbn": "0.1.1"
-       }
-     },
-+<<<<<<< .our
-     "ee-first": {
-       "version": "1.1.1",
-       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "electabul": {
-       "version": "0.0.4",
-       "resolved": "https://registry.npmjs.org/electabul/-/electabul-0.0.4.tgz",
-@@ -2408,7 +3012,11 @@
-           "dev": true,
-           "requires": {
-             "chromium-pickle-js": "0.2.0",
-+<<<<<<< .our
-             "commander": "2.15.1",
-+=======
-+            "commander": "2.15.0",
-+>>>>>>> .their
-             "cuint": "0.2.2",
-             "glob": "6.0.4",
-             "minimatch": "3.0.4",
-@@ -2441,7 +3049,11 @@
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "fs.realpath": "1.0.0",
-@@ -2467,7 +3079,11 @@
-         "path-exists": "3.0.0",
-         "pify": "2.3.0",
-         "semver": "5.5.0",
-+<<<<<<< .our
-         "tar-fs": "1.16.2"
-+=======
-+        "tar-fs": "1.16.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "ora": {
-@@ -2523,6 +3139,7 @@
-       }
-     },
-     "electron-typescript-definitions": {
-+<<<<<<< .our
-       "version": "1.3.6",
-       "resolved": "https://registry.npmjs.org/electron-typescript-definitions/-/electron-typescript-definitions-1.3.6.tgz",
-       "integrity": "sha512-Wz6tPaaZ22lbfWwF9bzVSki7LMW96xilCT1M8eeNYZG6LcpA9x34jlrAZg5HZWTHXR2tfbTQhSmrY+FEVulD/A==",
-@@ -2538,6 +3155,23 @@
-         "rimraf": "2.6.2",
-         "tslint": "4.5.1",
-         "typescript": "2.9.2"
-+=======
-+      "version": "1.2.11",
-+      "resolved": "https://registry.npmjs.org/electron-typescript-definitions/-/electron-typescript-definitions-1.2.11.tgz",
-+      "integrity": "sha512-gBVmiGkw2hiut17wnSchYpFxrBmMb+jKFSjxbVFeivCn1OAAFykKtrsg26Sjcrra6AN1YiWyTC7SD9twPAO8dQ==",
-+      "dev": true,
-+      "requires": {
-+        "@types/node": "7.0.56",
-+        "colors": "1.2.1",
-+        "debug": "2.6.9",
-+        "electron-docs": "2.0.1",
-+        "electron-docs-linter": "2.3.4",
-+        "lodash": "4.17.5",
-+        "mkdirp": "0.5.1",
-+        "rimraf": "2.6.2",
-+        "tslint": "4.5.1",
-+        "typescript": "2.7.2"
-+>>>>>>> .their
-       }
-     },
-     "elliptic": {
-@@ -2551,6 +3185,7 @@
-         "hash.js": "1.1.3",
-         "hmac-drbg": "1.0.1",
-         "inherits": "2.0.3",
-+<<<<<<< .our
-         "minimalistic-assert": "1.0.1",
-         "minimalistic-crypto-utils": "1.0.1"
-       }
-@@ -2561,6 +3196,12 @@
-       "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
-       "dev": true
-     },
-+=======
-+        "minimalistic-assert": "1.0.0",
-+        "minimalistic-crypto-utils": "1.0.1"
-+      }
-+    },
-+>>>>>>> .their
-     "end-of-stream": {
-       "version": "1.4.1",
-       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
-@@ -2592,9 +3233,15 @@
-       }
-     },
-     "es-abstract": {
-+<<<<<<< .our
-       "version": "1.11.0",
-       "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.11.0.tgz",
-       "integrity": "sha512-ZnQrE/lXTTQ39ulXZ+J1DTFazV9qBy61x2bY071B+qGco8Z8q1QddsLdt/EF8Ai9hcWH72dWS0kFqXLxOxqslA==",
-+=======
-+      "version": "1.10.0",
-+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.10.0.tgz",
-+      "integrity": "sha512-/uh/DhdqIOSkAWifU+8nG78vlQxdLckUdI/sPgy0VhuXi2qJ7T8czBmqIYtLQVpCIFYafChnsRsB5pyb1JdmCQ==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "es-to-primitive": "1.1.1",
-@@ -2616,6 +3263,7 @@
-       }
-     },
-     "es5-ext": {
-+<<<<<<< .our
-       "version": "0.10.42",
-       "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.42.tgz",
-       "integrity": "sha512-AJxO1rmPe1bDEfSR6TJ/FgMFYuTBhR5R57KW58iCkYACMyFbrkqVyzXSurYoScDGvgyMpk7uRF/lPUPPTmsRSA==",
-@@ -2624,6 +3272,15 @@
-         "es6-iterator": "2.0.3",
-         "es6-symbol": "3.1.1",
-         "next-tick": "1.0.0"
-+=======
-+      "version": "0.10.40",
-+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.40.tgz",
-+      "integrity": "sha512-S9Fh3oya5OOvYSNGvPZJ+vyrs6VYpe1IXPowVe3N1OhaiwVaGlwfn3Zf5P5klYcWOA0toIwYQW8XEv/QqhdHvQ==",
-+      "dev": true,
-+      "requires": {
-+        "es6-iterator": "2.0.3",
-+        "es6-symbol": "3.1.1"
-+>>>>>>> .their
-       }
-     },
-     "es6-iterator": {
-@@ -2633,7 +3290,11 @@
-       "dev": true,
-       "requires": {
-         "d": "1.0.0",
-+<<<<<<< .our
-         "es5-ext": "0.10.42",
-+=======
-+        "es5-ext": "0.10.40",
-+>>>>>>> .their
-         "es6-symbol": "3.1.1"
-       }
-     },
-@@ -2644,7 +3305,11 @@
-       "dev": true,
-       "requires": {
-         "d": "1.0.0",
-+<<<<<<< .our
-         "es5-ext": "0.10.42",
-+=======
-+        "es5-ext": "0.10.40",
-+>>>>>>> .their
-         "es6-iterator": "2.0.3",
-         "es6-set": "0.1.5",
-         "es6-symbol": "3.1.1",
-@@ -2658,7 +3323,11 @@
-       "dev": true,
-       "requires": {
-         "d": "1.0.0",
-+<<<<<<< .our
-         "es5-ext": "0.10.42",
-+=======
-+        "es5-ext": "0.10.40",
-+>>>>>>> .their
-         "es6-iterator": "2.0.3",
-         "es6-symbol": "3.1.1",
-         "event-emitter": "0.3.5"
-@@ -2671,7 +3340,11 @@
-       "dev": true,
-       "requires": {
-         "d": "1.0.0",
-+<<<<<<< .our
-         "es5-ext": "0.10.42"
-+=======
-+        "es5-ext": "0.10.40"
-+>>>>>>> .their
-       }
-     },
-     "es6-weak-map": {
-@@ -2681,17 +3354,24 @@
-       "dev": true,
-       "requires": {
-         "d": "1.0.0",
-+<<<<<<< .our
-         "es5-ext": "0.10.42",
-+=======
-+        "es5-ext": "0.10.40",
-+>>>>>>> .their
-         "es6-iterator": "2.0.3",
-         "es6-symbol": "3.1.1"
-       }
-     },
-+<<<<<<< .our
-     "escape-html": {
-       "version": "1.0.3",
-       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-       "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "escape-string-regexp": {
-       "version": "1.0.5",
-       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-@@ -2744,25 +3424,41 @@
-       }
-     },
-     "eslint": {
-+<<<<<<< .our
-       "version": "3.19.0",
-       "resolved": "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz",
-       "integrity": "sha1-yPxiAcf0DdCJQbh8CFdnOGpnmsw=",
-+=======
-+      "version": "3.10.2",
-+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-3.10.2.tgz",
-+      "integrity": "sha1-yaEOi/bp1lZRIEd4xQM0Hx6sPOc=",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "babel-code-frame": "6.26.0",
-         "chalk": "1.1.3",
-         "concat-stream": "1.5.2",
-         "debug": "2.6.9",
-+<<<<<<< .our
-         "doctrine": "2.1.0",
-         "escope": "3.6.0",
-         "espree": "3.5.4",
-         "esquery": "1.0.1",
-+=======
-+        "doctrine": "1.5.0",
-+        "escope": "3.6.0",
-+        "espree": "3.5.4",
-+>>>>>>> .their
-         "estraverse": "4.2.0",
-         "esutils": "2.0.2",
-         "file-entry-cache": "2.0.0",
-         "glob": "7.1.2",
-         "globals": "9.18.0",
-+<<<<<<< .our
-         "ignore": "3.3.8",
-+=======
-+        "ignore": "3.3.7",
-+>>>>>>> .their
-         "imurmurhash": "0.1.4",
-         "inquirer": "0.12.0",
-         "is-my-json-valid": "2.17.2",
-@@ -2770,7 +3466,11 @@
-         "js-yaml": "3.11.0",
-         "json-stable-stringify": "1.0.1",
-         "levn": "0.3.0",
-+<<<<<<< .our
-         "lodash": "4.17.10",
-+=======
-+        "lodash": "4.17.5",
-+>>>>>>> .their
-         "mkdirp": "0.5.1",
-         "natural-compare": "1.4.0",
-         "optionator": "0.8.2",
-@@ -2780,7 +3480,11 @@
-         "require-uncached": "1.0.3",
-         "shelljs": "0.7.8",
-         "strip-bom": "3.0.0",
-+<<<<<<< .our
-         "strip-json-comments": "2.0.1",
-+=======
-+        "strip-json-comments": "1.0.4",
-+>>>>>>> .their
-         "table": "3.8.3",
-         "text-table": "0.2.0",
-         "user-home": "2.0.0"
-@@ -2795,7 +3499,11 @@
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "fs.realpath": "1.0.0",
-@@ -2826,10 +3534,20 @@
-           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-           "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-           "dev": true
-+<<<<<<< .our
-+=======
-+        },
-+        "strip-json-comments": {
-+          "version": "1.0.4",
-+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz",
-+          "integrity": "sha1-HhX7ysl9Pumb8tc7TGVrCCu6+5E=",
-+          "dev": true
-+>>>>>>> .their
-         }
-       }
-     },
-     "eslint-config-standard": {
-+<<<<<<< .our
-       "version": "10.2.1",
-       "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-10.2.1.tgz",
-       "integrity": "sha1-wGHk0GbzedwXzVYsZOgZtN1FRZE=",
-@@ -2839,6 +3557,17 @@
-       "version": "4.0.2",
-       "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-4.0.2.tgz",
-       "integrity": "sha512-F8fRh2WFnTek7dZH9ZaE0PCBwdVGkwVWZmizla/DDNOmg7Tx6B/IlK5+oYpiX29jpu73LszeJj5i1axEZv6VMw==",
-+=======
-+      "version": "6.2.1",
-+      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-6.2.1.tgz",
-+      "integrity": "sha1-06aKr8cZFjnn7kQec0hzkCY1QpI=",
-+      "dev": true
-+    },
-+    "eslint-config-standard-jsx": {
-+      "version": "3.2.0",
-+      "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-3.2.0.tgz",
-+      "integrity": "sha1-wkDibtkZoRpCqk3oBZRys4Jo1iA=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "eslint-import-resolver-node": {
-@@ -2849,6 +3578,7 @@
-       "requires": {
-         "debug": "2.6.9",
-         "object-assign": "4.1.1",
-+<<<<<<< .our
-         "resolve": "1.7.1"
-       }
-     },
-@@ -2856,6 +3586,15 @@
-       "version": "2.2.0",
-       "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.2.0.tgz",
-       "integrity": "sha1-snA2LNiLGkitMIl2zn+lTphBF0Y=",
-+=======
-+        "resolve": "1.5.0"
-+      }
-+    },
-+    "eslint-module-utils": {
-+      "version": "2.1.1",
-+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.1.1.tgz",
-+      "integrity": "sha512-jDI/X5l/6D1rRD/3T43q8Qgbls2nq5km5KSqiwlyUbGo5+04fXhMKdCPhjwbqAa6HXWaMxj8Q4hQDIh7IadJQw==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "debug": "2.6.9",
-@@ -2873,11 +3612,16 @@
-         "debug": "2.6.9",
-         "doctrine": "1.5.0",
-         "eslint-import-resolver-node": "0.2.3",
-+<<<<<<< .our
-         "eslint-module-utils": "2.2.0",
-+=======
-+        "eslint-module-utils": "2.1.1",
-+>>>>>>> .their
-         "has": "1.0.1",
-         "lodash.cond": "4.5.2",
-         "minimatch": "3.0.4",
-         "pkg-up": "1.0.0"
-+<<<<<<< .our
-       },
-       "dependencies": {
-         "doctrine": {
-@@ -2896,11 +3640,14 @@
-           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-           "dev": true
-         }
-+=======
-+>>>>>>> .their
-       }
-     },
-     "eslint-plugin-node": {
-       "version": "4.2.3",
-       "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-4.2.3.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-wEOQq428u2iHF0Aj1vOnJ2nmO5c=",
-       "dev": true,
-       "requires": {
-@@ -2908,6 +3655,15 @@
-         "minimatch": "3.0.4",
-         "object-assign": "4.1.1",
-         "resolve": "1.7.1",
-+=======
-+      "integrity": "sha512-vIUQPuwbVYdz/CYnlTLsJrRy7iXHQjdEe5wz0XhhdTym3IInM/zZLlPf9nZ2mThsH0QcsieCOWs2vOeCy/22LQ==",
-+      "dev": true,
-+      "requires": {
-+        "ignore": "3.3.7",
-+        "minimatch": "3.0.4",
-+        "object-assign": "4.1.1",
-+        "resolve": "1.5.0",
-+>>>>>>> .their
-         "semver": "5.3.0"
-       },
-       "dependencies": {
-@@ -2920,6 +3676,7 @@
-       }
-     },
-     "eslint-plugin-promise": {
-+<<<<<<< .our
-       "version": "3.5.0",
-       "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-3.5.0.tgz",
-       "integrity": "sha1-ePu2/+BHIBYnVp6FpsU3OvKmj8o=",
-@@ -2960,6 +3717,27 @@
-       "version": "3.0.1",
-       "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-3.0.1.tgz",
-       "integrity": "sha1-NNDJFbRe3G8BA5PH7vOCOwhWXPI=",
-+=======
-+      "version": "3.4.2",
-+      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-3.4.2.tgz",
-+      "integrity": "sha1-G+J5Pq/i0YtbEjuBNsJp+AT+cSI=",
-+      "dev": true
-+    },
-+    "eslint-plugin-react": {
-+      "version": "6.7.1",
-+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-6.7.1.tgz",
-+      "integrity": "sha1-Gvlq6lRYVoJRV9l8G1DVqPtkpac=",
-+      "dev": true,
-+      "requires": {
-+        "doctrine": "1.5.0",
-+        "jsx-ast-utils": "1.4.1"
-+      }
-+    },
-+    "eslint-plugin-standard": {
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-2.0.1.tgz",
-+      "integrity": "sha1-NYlpn/nJF/LCX3apFmh/ZBw2n/M=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "espree": {
-@@ -2987,9 +3765,15 @@
-       "dev": true
-     },
-     "esquery": {
-+<<<<<<< .our
-       "version": "1.0.1",
-       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
-       "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
-+=======
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.0.tgz",
-+      "integrity": "sha1-z7qLV9f7qT8XKYqKAGoEzaE9gPo=",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "estraverse": "4.2.0"
-@@ -3032,12 +3816,15 @@
-       "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "etag": {
-       "version": "1.8.1",
-       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-       "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "event-emitter": {
-       "version": "0.3.5",
-       "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
-@@ -3045,7 +3832,11 @@
-       "dev": true,
-       "requires": {
-         "d": "1.0.0",
-+<<<<<<< .our
-         "es5-ext": "0.10.42"
-+=======
-+        "es5-ext": "0.10.40"
-+>>>>>>> .their
-       }
-     },
-     "events": {
-@@ -3057,11 +3848,19 @@
-     "evp_bytestokey": {
-       "version": "1.0.3",
-       "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-f8vbGY3HGVlDLv4ThCaE4FJaywI=",
-       "dev": true,
-       "requires": {
-         "md5.js": "1.3.4",
-         "safe-buffer": "5.1.2"
-+=======
-+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-+      "dev": true,
-+      "requires": {
-+        "md5.js": "1.3.4",
-+        "safe-buffer": "5.1.1"
-+>>>>>>> .their
-       }
-     },
-     "execa": {
-@@ -3100,7 +3899,11 @@
-       "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "fill-range": "2.2.4"
-+=======
-+        "fill-range": "2.2.3"
-+>>>>>>> .their
-       }
-     },
-     "extend": {
-@@ -3142,6 +3945,7 @@
-       "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "fault": {
-       "version": "1.0.2",
-       "resolved": "https://registry.npmjs.org/fault/-/fault-1.0.2.tgz",
-@@ -3151,6 +3955,8 @@
-         "format": "0.2.2"
-       }
-     },
-+=======
-+>>>>>>> .their
-     "figures": {
-       "version": "1.7.0",
-       "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
-@@ -3177,6 +3983,7 @@
-       "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "filesize": {
-       "version": "3.6.1",
-       "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz",
-@@ -3187,11 +3994,21 @@
-       "version": "2.2.4",
-       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
-       "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
-+=======
-+    "fill-range": {
-+      "version": "2.2.3",
-+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
-+      "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "is-number": "2.1.0",
-         "isobject": "2.1.0",
-+<<<<<<< .our
-         "randomatic": "3.0.0",
-+=======
-+        "randomatic": "1.1.7",
-+>>>>>>> .their
-         "repeat-element": "1.1.2",
-         "repeat-string": "1.6.1"
-       }
-@@ -3199,7 +4016,11 @@
-     "find-root": {
-       "version": "1.1.0",
-       "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-q8/Iunb3CMQql7PWhbfpRQv7nOQ=",
-+=======
-+      "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "find-up": {
-@@ -3248,12 +4069,15 @@
-         "write": "0.2.1"
-       }
-     },
-+<<<<<<< .our
-     "fn-name": {
-       "version": "2.0.1",
-       "resolved": "https://registry.npmjs.org/fn-name/-/fn-name-2.0.1.tgz",
-       "integrity": "sha1-UhTXU3pNBqSjAcDMJi/rhBiAAuc=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "follow-redirects": {
-       "version": "0.0.7",
-       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-0.0.7.tgz",
-@@ -3302,6 +4126,7 @@
-         "mime-types": "2.1.18"
-       }
-     },
-+<<<<<<< .our
-     "format": {
-       "version": "0.2.2",
-       "resolved": "https://registry.npmjs.org/format/-/format-0.2.2.tgz",
-@@ -3320,6 +4145,8 @@
-       "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "fs-extra": {
-       "version": "0.26.7",
-       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz",
-@@ -3339,7 +4166,11 @@
-       "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "minipass": "2.3.0"
-+=======
-+        "minipass": "2.2.1"
-+>>>>>>> .their
-       }
-     },
-     "fs.realpath": {
-@@ -3348,6 +4179,7 @@
-       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "fsevents": {
-       "version": "1.2.4",
-       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz",
-@@ -5046,2140 +5878,2034 @@
-           "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-           "dev": true,
-           "requires": {
--            "inflight": "1.0.6",
--            "inherits": "2.0.3",
--            "minimatch": "3.0.4",
--            "once": "1.4.0",
--            "path-is-absolute": "1.0.1"
--          }
--        },
--        "resolve": {
--          "version": "1.1.7",
--          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
--          "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
--          "dev": true
--        },
--        "wordwrap": {
--          "version": "1.0.0",
--          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
--          "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
--          "dev": true
--        }
--      }
-+=======
-+    "function-bind": {
-+      "version": "1.1.1",
-+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-+      "dev": true
-     },
--    "js-tokens": {
--      "version": "3.0.2",
--      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
--      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
-+    "generate-function": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
-+      "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=",
-       "dev": true
-     },
--    "js-yaml": {
--      "version": "3.11.0",
--      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz",
--      "integrity": "sha512-saJstZWv7oNeOyBh3+Dx1qWzhW0+e6/8eDzo7p5rDFqxntSztloLtuKu+Ejhtq82jsilwOIZYsCz+lIjthg1Hw==",
-+    "generate-object-property": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
-+      "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
-       "dev": true,
-       "requires": {
--        "argparse": "1.0.10",
--        "esprima": "4.0.0"
--      },
--      "dependencies": {
--        "esprima": {
--          "version": "4.0.0",
--          "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
--          "integrity": "sha1-RJnt3NERDgshi6zy+n9/WfVcqAQ=",
--          "dev": true
--        }
-+        "is-property": "1.0.2"
-       }
-     },
--    "jsbn": {
--      "version": "0.1.1",
--      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
--      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
--      "dev": true,
--      "optional": true
-+    "get-caller-file": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz",
-+      "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=",
-+      "dev": true
-     },
--    "jsdom": {
--      "version": "7.2.2",
--      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-7.2.2.tgz",
--      "integrity": "sha1-QLQCdwwr2iNGkJa+6Rq2deOx/G4=",
-+    "get-pkg-repo": {
-+      "version": "1.4.0",
-+      "resolved": "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz",
-+      "integrity": "sha1-xztInAbYDMVTbCyFP54FIyBWly0=",
-       "dev": true,
--      "optional": true,
-       "requires": {
--        "abab": "1.0.4",
--        "acorn": "2.7.0",
--        "acorn-globals": "1.0.9",
--        "cssom": "0.3.2",
--        "cssstyle": "0.2.37",
--        "escodegen": "1.8.1",
--        "nwmatcher": "1.4.4",
--        "parse5": "1.5.1",
--        "request": "2.85.0",
--        "sax": "1.2.4",
--        "symbol-tree": "3.2.2",
--        "tough-cookie": "2.3.4",
--        "webidl-conversions": "2.0.1",
--        "whatwg-url-compat": "0.6.5",
--        "xml-name-validator": "2.0.1"
-+        "hosted-git-info": "2.6.0",
-+        "meow": "3.7.0",
-+        "normalize-package-data": "2.4.0",
-+        "parse-github-repo-url": "1.4.1",
-+        "through2": "2.0.3"
-       },
-       "dependencies": {
--        "acorn": {
--          "version": "2.7.0",
--          "resolved": "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz",
--          "integrity": "sha1-q259nYhqrKiwhbwzEreaGYQz8Oc=",
-+        "camelcase": {
-+          "version": "2.1.1",
-+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-+          "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
-+          "dev": true
-+        },
-+        "camelcase-keys": {
-+          "version": "2.1.0",
-+          "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
-+          "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
-           "dev": true,
--          "optional": true
-+          "requires": {
-+            "camelcase": "2.1.1",
-+            "map-obj": "1.0.1"
-+          }
-+        },
-+        "indent-string": {
-+          "version": "2.1.0",
-+          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-+          "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
-+          "dev": true,
-+          "requires": {
-+            "repeating": "2.0.1"
-+          }
-+        },
-+        "map-obj": {
-+          "version": "1.0.1",
-+          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-+          "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-+          "dev": true
-+        },
-+        "meow": {
-+          "version": "3.7.0",
-+          "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-+          "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
-+          "dev": true,
-+          "requires": {
-+            "camelcase-keys": "2.1.0",
-+            "decamelize": "1.2.0",
-+            "loud-rejection": "1.6.0",
-+            "map-obj": "1.0.1",
-+            "minimist": "1.2.0",
-+            "normalize-package-data": "2.4.0",
-+            "object-assign": "4.1.1",
-+            "read-pkg-up": "1.0.1",
-+            "redent": "1.0.0",
-+            "trim-newlines": "1.0.0"
-+          }
-+        },
-+        "redent": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-+          "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
-+          "dev": true,
-+          "requires": {
-+            "indent-string": "2.1.0",
-+            "strip-indent": "1.0.1"
-+          }
-+        },
-+        "strip-indent": {
-+          "version": "1.0.1",
-+          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
-+          "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
-+          "dev": true,
-+          "requires": {
-+            "get-stdin": "4.0.1"
-+          }
-+        },
-+        "trim-newlines": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-+          "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
-+          "dev": true
-         }
-       }
-     },
--    "json-parse-better-errors": {
--      "version": "1.0.2",
--      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
--      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
--      "dev": true
--    },
--    "json-schema": {
--      "version": "0.2.3",
--      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
--      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-+    "get-stdin": {
-+      "version": "4.0.1",
-+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-+      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-       "dev": true
-     },
--    "json-schema-traverse": {
--      "version": "0.3.1",
--      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
--      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
-+    "get-stream": {
-+      "version": "3.0.0",
-+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-+      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-       "dev": true
-     },
--    "json-stable-stringify": {
--      "version": "0.0.1",
--      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz",
--      "integrity": "sha1-YRwj6BTbN1Un34URk9tZ3Sryf0U=",
-+    "getpass": {
-+      "version": "0.1.7",
-+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-       "dev": true,
-       "requires": {
--        "jsonify": "0.0.0"
-+        "assert-plus": "1.0.0"
-       }
-     },
--    "json-stringify-safe": {
--      "version": "5.0.1",
--      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
--      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
--      "dev": true
--    },
--    "jsonfile": {
--      "version": "2.4.0",
--      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
--      "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
-+    "git-raw-commits": {
-+      "version": "1.3.4",
-+      "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-1.3.4.tgz",
-+      "integrity": "sha512-G3O+41xHbscpgL5nA0DUkbFVgaAz5rd57AMSIMew8p7C8SyFwZDyn08MoXHkTl9zcD0LmxsLFPxbqFY4YPbpPA==",
-       "dev": true,
-       "requires": {
--        "graceful-fs": "4.1.11"
-+        "dargs": "4.1.0",
-+        "lodash.template": "4.4.0",
-+        "meow": "4.0.0",
-+        "split2": "2.2.0",
-+        "through2": "2.0.3"
-       }
-     },
--    "jsonify": {
--      "version": "0.0.0",
--      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
--      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
--      "dev": true
--    },
--    "jsonparse": {
--      "version": "1.3.1",
--      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
--      "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
--      "dev": true
--    },
--    "jsonpointer": {
--      "version": "4.0.1",
--      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
--      "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",
--      "dev": true
--    },
--    "jsprim": {
--      "version": "1.4.1",
--      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
--      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-+    "git-remote-origin-url": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz",
-+      "integrity": "sha1-UoJlna4hBxRaERJhEq0yFuxfpl8=",
-       "dev": true,
-       "requires": {
--        "assert-plus": "1.0.0",
--        "extsprintf": "1.3.0",
--        "json-schema": "0.2.3",
--        "verror": "1.10.0"
-+        "gitconfiglocal": "1.0.0",
-+        "pify": "2.3.0"
-       }
-     },
--    "jsx-ast-utils": {
--      "version": "1.4.1",
--      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz",
--      "integrity": "sha1-OGchPo3Xm/Ho8jAMDPwe+xgsDfE=",
--      "dev": true
--    },
--    "keyed-array": {
--      "version": "2.1.2",
--      "resolved": "https://registry.npmjs.org/keyed-array/-/keyed-array-2.1.2.tgz",
--      "integrity": "sha1-isE3thMi7V7Rx7Qbn5zQZmMcrOA=",
--      "dev": true
--    },
--    "kind-of": {
--      "version": "3.2.2",
--      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
--      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-+    "git-semver-tags": {
-+      "version": "1.3.4",
-+      "resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.3.4.tgz",
-+      "integrity": "sha512-Xe2Z74MwXZfAezuaO6e6cA4nsgeCiARPzaBp23gma325c/OXdt//PhrknptIaynNeUp2yWtmikV7k5RIicgGIQ==",
-       "dev": true,
-       "requires": {
--        "is-buffer": "1.1.6"
-+        "meow": "4.0.0",
-+        "semver": "5.5.0"
-       }
-     },
--    "klaw": {
--      "version": "1.3.1",
--      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
--      "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
-+    "gitconfiglocal": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz",
-+      "integrity": "sha1-QdBF84UaXqiPA/JMocYXgRRGS5s=",
-       "dev": true,
-       "requires": {
--        "graceful-fs": "4.1.11"
-+        "ini": "1.3.5"
-       }
-     },
--    "labeled-stream-splicer": {
--      "version": "2.0.1",
--      "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.1.tgz",
--      "integrity": "sha512-MC94mHZRvJ3LfykJlTUipBqenZz1pacOZEMhhQ8dMGcDHs0SBE5GbsavUXV7YtP3icBW17W0Zy1I0lfASmo9Pg==",
-+    "github": {
-+      "version": "9.3.1",
-+      "resolved": "https://registry.npmjs.org/github/-/github-9.3.1.tgz",
-+      "integrity": "sha512-LvVb6iR8/7bqYgj0VeAtqys0t427jwIBkv/+or/ssypfIk5R1fnz4aeIEv4udPw6VFoH6vL4gi+foBoD5aazXg==",
-       "dev": true,
-       "requires": {
--        "inherits": "2.0.3",
--        "isarray": "2.0.4",
--        "stream-splicer": "2.0.0"
--      },
--      "dependencies": {
--        "isarray": {
--          "version": "2.0.4",
--          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.4.tgz",
--          "integrity": "sha512-GMxXOiUirWg1xTKRipM0Ek07rX+ubx4nNVElTJdNLYmNO/2YrDkgJGw9CljXn+r4EWiDQg/8lsRdHyg2PJuUaA==",
--          "dev": true
--        }
-+        "follow-redirects": "0.0.7",
-+        "https-proxy-agent": "1.0.0",
-+        "mime": "1.6.0",
-+        "netrc": "0.1.4"
-       }
-     },
--    "latest-version": {
--      "version": "3.1.0",
--      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz",
--      "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=",
-+    "glob": {
-+      "version": "6.0.4",
-+      "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
-+      "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
-       "dev": true,
-       "requires": {
--        "package-json": "4.0.1"
-+        "inflight": "1.0.6",
-+        "inherits": "2.0.3",
-+        "minimatch": "3.0.4",
-+        "once": "1.4.0",
-+        "path-is-absolute": "1.0.1"
-       }
-     },
--    "lazy-cache": {
--      "version": "1.0.4",
--      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
--      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
--      "dev": true,
--      "optional": true
--    },
--    "lcid": {
--      "version": "1.0.0",
--      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
--      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-+    "glob-base": {
-+      "version": "0.3.0",
-+      "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
-+      "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
-       "dev": true,
-       "requires": {
--        "invert-kv": "1.0.0"
-+        "glob-parent": "2.0.0",
-+        "is-glob": "2.0.1"
-       }
-     },
--    "leven": {
--      "version": "2.1.0",
--      "resolved": "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz",
--      "integrity": "sha1-wuep93IJTe6dNCAq6KzORoeHVYA=",
--      "dev": true
--    },
--    "levn": {
--      "version": "0.3.0",
--      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
--      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-+    "glob-parent": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-+      "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
-       "dev": true,
-       "requires": {
--        "prelude-ls": "1.1.2",
--        "type-check": "0.3.2"
-+        "is-glob": "2.0.1"
-       }
-     },
--    "lexical-scope": {
--      "version": "1.2.0",
--      "resolved": "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.2.0.tgz",
--      "integrity": "sha1-/Ope3HBKSzqHls3KQZw6CvryLfQ=",
-+    "global-dirs": {
-+      "version": "0.1.1",
-+      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz",
-+      "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=",
-       "dev": true,
-       "requires": {
--        "astw": "2.2.0"
-+        "ini": "1.3.5"
-       }
-     },
--    "linkify-it": {
--      "version": "1.2.4",
--      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-1.2.4.tgz",
--      "integrity": "sha1-B3NSbDF8j9E71TTuHRgP+Iq/iBo=",
-+    "globals": {
-+      "version": "9.18.0",
-+      "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-+      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-+      "dev": true
-+    },
-+    "globby": {
-+      "version": "5.0.0",
-+      "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
-+      "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
-       "dev": true,
-       "requires": {
--        "uc.micro": "1.0.5"
-+        "array-union": "1.0.2",
-+        "arrify": "1.0.1",
-+        "glob": "7.1.2",
-+        "object-assign": "4.1.1",
-+        "pify": "2.3.0",
-+        "pinkie-promise": "2.0.1"
-+      },
-+      "dependencies": {
-+        "glob": {
-+          "version": "7.1.2",
-+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+          "dev": true,
-+          "requires": {
-+            "fs.realpath": "1.0.0",
-+>>>>>>> .their
-+            "inflight": "1.0.6",
-+            "inherits": "2.0.3",
-+            "minimatch": "3.0.4",
-+            "once": "1.4.0",
-+            "path-is-absolute": "1.0.1"
-+          }
-+<<<<<<< .our
-+        },
-+        "resolve": {
-+          "version": "1.1.7",
-+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-+          "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
-+          "dev": true
-+        },
-+        "wordwrap": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-+          "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
-+          "dev": true
-+        }
-       }
-     },
--    "lint": {
--      "version": "1.1.2",
--      "resolved": "https://registry.npmjs.org/lint/-/lint-1.1.2.tgz",
--      "integrity": "sha1-Ne0GTzIlR8MxNY2JmGhmSWi6Nx8=",
-+    "js-tokens": {
-+      "version": "3.0.2",
-+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-+      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
-       "dev": true
-     },
--    "load-json-file": {
--      "version": "1.1.0",
--      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
--      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-+    "js-yaml": {
-+      "version": "3.11.0",
-+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz",
-+      "integrity": "sha512-saJstZWv7oNeOyBh3+Dx1qWzhW0+e6/8eDzo7p5rDFqxntSztloLtuKu+Ejhtq82jsilwOIZYsCz+lIjthg1Hw==",
-       "dev": true,
-       "requires": {
--        "graceful-fs": "4.1.11",
--        "parse-json": "2.2.0",
--        "pify": "2.3.0",
--        "pinkie-promise": "2.0.1",
--        "strip-bom": "2.0.0"
-+        "argparse": "1.0.10",
-+        "esprima": "4.0.0"
-+      },
-+      "dependencies": {
-+        "esprima": {
-+          "version": "4.0.0",
-+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
-+          "integrity": "sha1-RJnt3NERDgshi6zy+n9/WfVcqAQ=",
-+          "dev": true
-+        }
-       }
-     },
--    "load-plugin": {
--      "version": "2.2.2",
--      "resolved": "https://registry.npmjs.org/load-plugin/-/load-plugin-2.2.2.tgz",
--      "integrity": "sha512-FYzamtURIJefQykZGtiClYuZkJBUKzmx8Tc74y8JGAulDzbzVm/C+w/MbAljHRr+REL0cRzy3WgnHE+T8gce5g==",
-+    "jsbn": {
-+      "version": "0.1.1",
-+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-       "dev": true,
--      "requires": {
--        "npm-prefix": "1.2.0",
--        "resolve-from": "4.0.0"
--      }
-+      "optional": true
-     },
--    "locate-path": {
--      "version": "2.0.0",
--      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
--      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-+    "jsdom": {
-+      "version": "7.2.2",
-+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-7.2.2.tgz",
-+      "integrity": "sha1-QLQCdwwr2iNGkJa+6Rq2deOx/G4=",
-       "dev": true,
-+      "optional": true,
-       "requires": {
--        "p-locate": "2.0.0",
--        "path-exists": "3.0.0"
-+        "abab": "1.0.4",
-+        "acorn": "2.7.0",
-+        "acorn-globals": "1.0.9",
-+        "cssom": "0.3.2",
-+        "cssstyle": "0.2.37",
-+        "escodegen": "1.8.1",
-+        "nwmatcher": "1.4.4",
-+        "parse5": "1.5.1",
-+        "request": "2.85.0",
-+        "sax": "1.2.4",
-+        "symbol-tree": "3.2.2",
-+        "tough-cookie": "2.3.4",
-+        "webidl-conversions": "2.0.1",
-+        "whatwg-url-compat": "0.6.5",
-+        "xml-name-validator": "2.0.1"
-       },
-       "dependencies": {
--        "path-exists": {
--          "version": "3.0.0",
--          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
--          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
--          "dev": true
-+        "acorn": {
-+          "version": "2.7.0",
-+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz",
-+          "integrity": "sha1-q259nYhqrKiwhbwzEreaGYQz8Oc=",
-+          "dev": true,
-+          "optional": true
-         }
-       }
-     },
--    "lodash": {
--      "version": "4.17.10",
--      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
--      "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==",
-+    "json-parse-better-errors": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-       "dev": true
-     },
--    "lodash._reinterpolate": {
--      "version": "3.0.0",
--      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
--      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
-+    "json-schema": {
-+      "version": "0.2.3",
-+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-       "dev": true
-     },
--    "lodash.assign": {
--      "version": "4.2.0",
--      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
--      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
-+    "json-schema-traverse": {
-+      "version": "0.3.1",
-+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-+      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
-       "dev": true
-     },
--    "lodash.assignin": {
--      "version": "4.2.0",
--      "resolved": "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz",
--      "integrity": "sha1-uo31+4QesKPoBEIysOJjqNxqKKI=",
--      "dev": true
-+    "json-stable-stringify": {
-+      "version": "0.0.1",
-+      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz",
-+      "integrity": "sha1-YRwj6BTbN1Un34URk9tZ3Sryf0U=",
-+      "dev": true,
-+      "requires": {
-+        "jsonify": "0.0.0"
-+      }
-     },
--    "lodash.bind": {
--      "version": "4.2.1",
--      "resolved": "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz",
--      "integrity": "sha1-euMBfpOWIqwxt9fX3LGzTbFpDTU=",
-+    "json-stringify-safe": {
-+      "version": "5.0.1",
-+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-       "dev": true
-     },
--    "lodash.cond": {
--      "version": "4.5.2",
--      "resolved": "https://registry.npmjs.org/lodash.cond/-/lodash.cond-4.5.2.tgz",
--      "integrity": "sha1-9HGh2khr5g9quVXRcRVSPdHSVdU=",
--      "dev": true
-+    "jsonfile": {
-+      "version": "2.4.0",
-+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
-+      "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
-+      "dev": true,
-+      "requires": {
-+        "graceful-fs": "4.1.11"
-+      }
-     },
--    "lodash.defaults": {
--      "version": "4.2.0",
--      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
--      "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=",
-+    "jsonify": {
-+      "version": "0.0.0",
-+      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-+      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
-       "dev": true
-     },
--    "lodash.filter": {
--      "version": "4.6.0",
--      "resolved": "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz",
--      "integrity": "sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4=",
-+    "jsonparse": {
-+      "version": "1.3.1",
-+      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
-+      "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
-       "dev": true
-     },
--    "lodash.flatten": {
--      "version": "4.4.0",
--      "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
--      "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=",
-+    "jsonpointer": {
-+      "version": "4.0.1",
-+      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
-+      "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",
-       "dev": true
-     },
--    "lodash.foreach": {
--      "version": "4.5.0",
--      "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz",
--      "integrity": "sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=",
-+    "jsprim": {
-+      "version": "1.4.1",
-+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-+      "dev": true,
-+      "requires": {
-+        "assert-plus": "1.0.0",
-+        "extsprintf": "1.3.0",
-+        "json-schema": "0.2.3",
-+        "verror": "1.10.0"
-+      }
-+    },
-+    "jsx-ast-utils": {
-+      "version": "1.4.1",
-+      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz",
-+      "integrity": "sha1-OGchPo3Xm/Ho8jAMDPwe+xgsDfE=",
-       "dev": true
-     },
--    "lodash.isempty": {
--      "version": "4.4.0",
--      "resolved": "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz",
--      "integrity": "sha1-b4bL7di+TsmHvpqvM8loTbGzHn4=",
--      "dev": true
--    },
--    "lodash.isplainobject": {
--      "version": "4.0.6",
--      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
--      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=",
--      "dev": true
--    },
--    "lodash.map": {
--      "version": "4.6.0",
--      "resolved": "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz",
--      "integrity": "sha1-dx7Hg540c9nEzeKLGTlMNWL09tM=",
-+    "keyed-array": {
-+      "version": "2.1.2",
-+      "resolved": "https://registry.npmjs.org/keyed-array/-/keyed-array-2.1.2.tgz",
-+      "integrity": "sha1-isE3thMi7V7Rx7Qbn5zQZmMcrOA=",
-       "dev": true
-     },
--    "lodash.memoize": {
--      "version": "3.0.4",
--      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz",
--      "integrity": "sha1-LcvSwofLwKVcxCMovQxzYVDVPj8=",
--      "dev": true
-+    "kind-of": {
-+      "version": "3.2.2",
-+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-+      "dev": true,
-+      "requires": {
-+        "is-buffer": "1.1.6"
-+      }
-     },
--    "lodash.merge": {
--      "version": "4.6.1",
--      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz",
--      "integrity": "sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ==",
--      "dev": true
-+    "klaw": {
-+      "version": "1.3.1",
-+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
-+      "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
-+      "dev": true,
-+      "requires": {
-+        "graceful-fs": "4.1.11"
-+      }
-     },
--    "lodash.pick": {
--      "version": "4.4.0",
--      "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz",
--      "integrity": "sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=",
--      "dev": true
-+    "labeled-stream-splicer": {
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.1.tgz",
-+      "integrity": "sha512-MC94mHZRvJ3LfykJlTUipBqenZz1pacOZEMhhQ8dMGcDHs0SBE5GbsavUXV7YtP3icBW17W0Zy1I0lfASmo9Pg==",
-+      "dev": true,
-+      "requires": {
-+        "inherits": "2.0.3",
-+        "isarray": "2.0.4",
-+        "stream-splicer": "2.0.0"
-+      },
-+      "dependencies": {
-+        "isarray": {
-+          "version": "2.0.4",
-+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.4.tgz",
-+          "integrity": "sha512-GMxXOiUirWg1xTKRipM0Ek07rX+ubx4nNVElTJdNLYmNO/2YrDkgJGw9CljXn+r4EWiDQg/8lsRdHyg2PJuUaA==",
-+          "dev": true
-+        }
-+      }
-     },
--    "lodash.range": {
--      "version": "3.2.0",
--      "resolved": "https://registry.npmjs.org/lodash.range/-/lodash.range-3.2.0.tgz",
--      "integrity": "sha1-9GHliPZmg/fq3q3lE+OKaaVloV0=",
--      "dev": true
-+    "latest-version": {
-+      "version": "3.1.0",
-+      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz",
-+      "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=",
-+      "dev": true,
-+      "requires": {
-+        "package-json": "4.0.1"
-+      }
-     },
--    "lodash.reduce": {
--      "version": "4.6.0",
--      "resolved": "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz",
--      "integrity": "sha1-8atrg5KZrUj3hKu/R2WW8DuRTTs=",
--      "dev": true
-+    "lazy-cache": {
-+      "version": "1.0.4",
-+      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
-+      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
-+      "dev": true,
-+      "optional": true
-     },
--    "lodash.reject": {
--      "version": "4.6.0",
--      "resolved": "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz",
--      "integrity": "sha1-gNZJLcFHCGS79YNTO2UfQqn1JBU=",
--      "dev": true
-+    "lcid": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-+      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-+      "dev": true,
-+      "requires": {
-+        "invert-kv": "1.0.0"
-+      }
-     },
--    "lodash.some": {
--      "version": "4.6.0",
--      "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz",
--      "integrity": "sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=",
-+    "leven": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz",
-+      "integrity": "sha1-wuep93IJTe6dNCAq6KzORoeHVYA=",
-       "dev": true
-     },
--    "lodash.template": {
--      "version": "4.4.0",
--      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.4.0.tgz",
--      "integrity": "sha1-5zoDhcg1VZF0bgILmWecaQ5o+6A=",
-+    "levn": {
-+      "version": "0.3.0",
-+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-       "dev": true,
-       "requires": {
--        "lodash._reinterpolate": "3.0.0",
--        "lodash.templatesettings": "4.1.0"
-+        "prelude-ls": "1.1.2",
-+        "type-check": "0.3.2"
-       }
-     },
--    "lodash.templatesettings": {
--      "version": "4.1.0",
--      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz",
--      "integrity": "sha1-K01OlbpEDZFf8IvImeRVNmZxMxY=",
-+    "lexical-scope": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.2.0.tgz",
-+      "integrity": "sha1-/Ope3HBKSzqHls3KQZw6CvryLfQ=",
-       "dev": true,
-       "requires": {
--        "lodash._reinterpolate": "3.0.0"
-+        "astw": "2.2.0"
-       }
-     },
--    "lodash.transform": {
--      "version": "4.6.0",
--      "resolved": "https://registry.npmjs.org/lodash.transform/-/lodash.transform-4.6.0.tgz",
--      "integrity": "sha1-EjBkIvYzJK7YSD0/ODMrX2cFR6A=",
--      "dev": true
--    },
--    "log-symbols": {
--      "version": "1.0.2",
--      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz",
--      "integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=",
-+    "linkify-it": {
-+      "version": "1.2.4",
-+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-1.2.4.tgz",
-+      "integrity": "sha1-B3NSbDF8j9E71TTuHRgP+Iq/iBo=",
-       "dev": true,
-       "requires": {
--        "chalk": "1.1.3"
-+        "uc.micro": "1.0.5"
-       }
-     },
--    "longest": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
--      "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
--      "dev": true
--    },
--    "longest-streak": {
--      "version": "2.0.2",
--      "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.2.tgz",
--      "integrity": "sha512-TmYTeEYxiAmSVdpbnQDXGtvYOIRsCMg89CVZzwzc2o7GFL1CjoiRPjH5ec0NFAVlAx3fVof9dX/t6KKRAo2OWA==",
-+    "lint": {
-+      "version": "1.1.2",
-+      "resolved": "https://registry.npmjs.org/lint/-/lint-1.1.2.tgz",
-+      "integrity": "sha1-Ne0GTzIlR8MxNY2JmGhmSWi6Nx8=",
-       "dev": true
-     },
--    "loud-rejection": {
--      "version": "1.6.0",
--      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
--      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
-+    "load-json-file": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-+      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-       "dev": true,
-       "requires": {
--        "currently-unhandled": "0.4.1",
--        "signal-exit": "3.0.2"
-+        "graceful-fs": "4.1.11",
-+        "parse-json": "2.2.0",
-+        "pify": "2.3.0",
-+        "pinkie-promise": "2.0.1",
-+        "strip-bom": "2.0.0"
-       }
-     },
--    "lowercase-keys": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
--      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
--      "dev": true
--    },
--    "lru-cache": {
--      "version": "4.1.3",
--      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz",
--      "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
-+    "load-plugin": {
-+      "version": "2.2.2",
-+      "resolved": "https://registry.npmjs.org/load-plugin/-/load-plugin-2.2.2.tgz",
-+      "integrity": "sha512-FYzamtURIJefQykZGtiClYuZkJBUKzmx8Tc74y8JGAulDzbzVm/C+w/MbAljHRr+REL0cRzy3WgnHE+T8gce5g==",
-       "dev": true,
-       "requires": {
--        "pseudomap": "1.0.2",
--        "yallist": "2.1.2"
--      },
--      "dependencies": {
--        "yallist": {
--          "version": "2.1.2",
--          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
--          "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
--          "dev": true
--        }
-+        "npm-prefix": "1.2.0",
-+        "resolve-from": "4.0.0"
-       }
-     },
--    "make-dir": {
--      "version": "1.3.0",
--      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
--      "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
-+    "locate-path": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-+      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-       "dev": true,
-       "requires": {
--        "pify": "3.0.0"
-+        "p-locate": "2.0.0",
-+        "path-exists": "3.0.0"
-       },
-       "dependencies": {
--        "pify": {
-+        "path-exists": {
-           "version": "3.0.0",
--          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
--          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
--          "dev": true
-+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-+          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-+=======
-         }
-       }
-     },
--    "map-obj": {
--      "version": "2.0.0",
--      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz",
--      "integrity": "sha1-plzSkIepJZi4eRJXpSPgISIqwfk=",
--      "dev": true
-+    "got": {
-+      "version": "6.7.1",
-+      "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
-+      "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
-+      "dev": true,
-+      "requires": {
-+        "create-error-class": "3.0.2",
-+        "duplexer3": "0.1.4",
-+        "get-stream": "3.0.0",
-+        "is-redirect": "1.0.0",
-+        "is-retry-allowed": "1.1.0",
-+        "is-stream": "1.1.0",
-+        "lowercase-keys": "1.0.0",
-+        "safe-buffer": "5.1.1",
-+        "timed-out": "4.0.1",
-+        "unzip-response": "2.0.1",
-+        "url-parse-lax": "1.0.0"
-+      }
-     },
--    "markdown-escapes": {
--      "version": "1.0.2",
--      "resolved": "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.2.tgz",
--      "integrity": "sha512-lbRZ2mE3Q9RtLjxZBZ9+IMl68DKIXaVAhwvwn9pmjnPLS0h/6kyBMgNhqi1xFJ/2yv6cSyv0jbiZavZv93JkkA==",
-+    "graceful-fs": {
-+      "version": "4.1.11",
-+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-       "dev": true
-     },
--    "markdown-extensions": {
--      "version": "1.1.1",
--      "resolved": "https://registry.npmjs.org/markdown-extensions/-/markdown-extensions-1.1.1.tgz",
--      "integrity": "sha512-WWC0ZuMzCyDHYCasEGs4IPvLyTGftYwh6wIEOULOF0HXcqZlhwRzrK0w2VUlxWA98xnvb/jszw4ZSkJ6ADpM6Q==",
--      "dev": true
--    },
--    "markdown-it": {
--      "version": "6.1.1",
--      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-6.1.1.tgz",
--      "integrity": "sha1-ztA39Ec+6fUVOsQU933IPJG6knw=",
--      "dev": true,
--      "requires": {
--        "argparse": "1.0.10",
--        "entities": "1.1.1",
--        "linkify-it": "1.2.4",
--        "mdurl": "1.0.1",
--        "uc.micro": "1.0.5"
--      }
--    },
--    "markdown-it-named-headers": {
--      "version": "0.0.4",
--      "resolved": "https://registry.npmjs.org/markdown-it-named-headers/-/markdown-it-named-headers-0.0.4.tgz",
--      "integrity": "sha1-gu/CgyQkCmsed7mq5QF3HV81HB8=",
-+    "gunzip-maybe": {
-+      "version": "1.4.1",
-+      "resolved": "https://registry.npmjs.org/gunzip-maybe/-/gunzip-maybe-1.4.1.tgz",
-+      "integrity": "sha512-qtutIKMthNJJgeHQS7kZ9FqDq59/Wn0G2HYCRNjpup7yKfVI6/eqwpmroyZGFoCYaG+sW6psNVb4zoLADHpp2g==",
-       "dev": true,
-       "requires": {
--        "string": "3.3.3"
-+        "browserify-zlib": "0.1.4",
-+        "is-deflate": "1.0.0",
-+        "is-gzip": "1.0.0",
-+        "peek-stream": "1.1.2",
-+        "pumpify": "1.4.0",
-+        "through2": "2.0.3"
-       }
-     },
--    "markdown-table": {
--      "version": "1.1.2",
--      "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-1.1.2.tgz",
--      "integrity": "sha512-NcWuJFHDA8V3wkDgR/j4+gZx+YQwstPgfQDV8ndUeWWzta3dnDTBxpVzqS9lkmJAuV5YX35lmyojl6HO5JXAgw==",
--      "dev": true
--    },
--    "marky-markdown-lite": {
--      "version": "1.2.0",
--      "resolved": "https://registry.npmjs.org/marky-markdown-lite/-/marky-markdown-lite-1.2.0.tgz",
--      "integrity": "sha1-dO2phLgTZVfe4QZO/RXkBhdAaZc=",
-+    "handlebars": {
-+      "version": "4.0.11",
-+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz",
-+      "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=",
-       "dev": true,
-       "requires": {
--        "cheerio": "0.20.0",
--        "conventional-changelog-cli": "1.3.22",
--        "is-file": "1.0.0",
--        "markdown-it": "6.1.1",
--        "markdown-it-named-headers": "0.0.4"
-+        "async": "1.5.2",
-+        "optimist": "0.6.1",
-+        "source-map": "0.4.4",
-+        "uglify-js": "2.8.29"
-       },
-       "dependencies": {
--        "cheerio": {
--          "version": "0.20.0",
--          "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.20.0.tgz",
--          "integrity": "sha1-XHEPK6uVZTJyhCugHG6mGzVF7DU=",
--          "dev": true,
--          "requires": {
--            "css-select": "1.2.0",
--            "dom-serializer": "0.1.0",
--            "entities": "1.1.1",
--            "htmlparser2": "3.8.3",
--            "jsdom": "7.2.2",
--            "lodash": "4.17.10"
--          }
-+        "minimist": {
-+          "version": "0.0.10",
-+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
-+          "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
-+          "dev": true
-         },
--        "domhandler": {
--          "version": "2.3.0",
--          "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz",
--          "integrity": "sha1-LeWaCCLVAn+r/28DLCsloqir5zg=",
-+        "optimist": {
-+          "version": "0.6.1",
-+          "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
-+          "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
-           "dev": true,
-           "requires": {
--            "domelementtype": "1.3.0"
-+            "minimist": "0.0.10",
-+            "wordwrap": "0.0.3"
-           }
-         },
--        "htmlparser2": {
--          "version": "3.8.3",
--          "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
--          "integrity": "sha1-mWwosZFRaovoZQGn15dX5ccMEGg=",
-+        "source-map": {
-+          "version": "0.4.4",
-+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-+          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
-           "dev": true,
-           "requires": {
--            "domelementtype": "1.3.0",
--            "domhandler": "2.3.0",
--            "domutils": "1.5.1",
--            "entities": "1.0.0",
--            "readable-stream": "1.1.14"
--          },
--          "dependencies": {
--            "entities": {
--              "version": "1.0.0",
--              "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz",
--              "integrity": "sha1-sph6o4ITR/zeZCsk/fyeT7cSvyY=",
--              "dev": true
--            }
-+            "amdefine": "1.0.1"
-           }
-         }
-       }
-     },
--    "matcher-collection": {
--      "version": "1.0.5",
--      "resolved": "https://registry.npmjs.org/matcher-collection/-/matcher-collection-1.0.5.tgz",
--      "integrity": "sha1-LuCVQ4Nyy4iE8FgjQTjAXGROwzk=",
-+    "har-schema": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-+      "dev": true
-+    },
-+    "har-validator": {
-+      "version": "5.0.3",
-+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
-+      "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
-       "dev": true,
-       "requires": {
--        "minimatch": "3.0.4"
-+        "ajv": "5.5.2",
-+        "har-schema": "2.0.0"
-       }
-     },
--    "math-random": {
-+    "has": {
-       "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.1.tgz",
--      "integrity": "sha1-izqsWIuKZuSXXjzepn97sylgH6w=",
-+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
-+      "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=",
-+      "dev": true,
-+      "requires": {
-+        "function-bind": "1.1.1"
-+      }
-+    },
-+    "has-ansi": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-+      "dev": true,
-+      "requires": {
-+        "ansi-regex": "2.1.1"
-+      }
-+    },
-+    "has-flag": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-+      "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-       "dev": true
-     },
--    "md5.js": {
--      "version": "1.3.4",
--      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz",
--      "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=",
-+    "has-symbols": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
-+      "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=",
-+      "dev": true
-+    },
-+    "hash-base": {
-+      "version": "2.0.2",
-+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz",
-+      "integrity": "sha1-ZuodhW206KVHDK32/OI65SRO8uE=",
-       "dev": true,
-       "requires": {
--        "hash-base": "3.0.4",
-         "inherits": "2.0.3"
-       }
-     },
--    "mdast-comment-marker": {
--      "version": "1.0.2",
--      "resolved": "https://registry.npmjs.org/mdast-comment-marker/-/mdast-comment-marker-1.0.2.tgz",
--      "integrity": "sha1-Hd8O+BH7UkOQF8jSwLkiA18rp0o=",
--      "dev": true
-+    "hash.js": {
-+      "version": "1.1.3",
-+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz",
-+      "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==",
-+      "dev": true,
-+      "requires": {
-+        "inherits": "2.0.3",
-+        "minimalistic-assert": "1.0.0"
-+      }
-     },
--    "mdast-util-compact": {
-+    "hawk": {
-+      "version": "6.0.2",
-+      "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
-+      "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
-+      "dev": true,
-+      "requires": {
-+        "boom": "4.3.1",
-+        "cryptiles": "3.1.2",
-+        "hoek": "4.2.1",
-+        "sntp": "2.1.0"
-+      }
-+    },
-+    "heads": {
-+      "version": "1.3.0",
-+      "resolved": "https://registry.npmjs.org/heads/-/heads-1.3.0.tgz",
-+      "integrity": "sha1-/p8Q01WjqYbeuO5MzZ8rvHVLZcA=",
-+      "dev": true,
-+      "requires": {
-+        "async": "2.6.0",
-+        "got": "6.7.1",
-+        "pify": "2.3.0"
-+      },
-+      "dependencies": {
-+        "async": {
-+          "version": "2.6.0",
-+          "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz",
-+          "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==",
-+          "dev": true,
-+          "requires": {
-+            "lodash": "4.17.5"
-+          }
-+        }
-+      }
-+    },
-+    "hmac-drbg": {
-       "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-1.0.1.tgz",
--      "integrity": "sha1-zbX4TitqLTEU3zO9BdnLMuPECDo=",
-+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-+      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
-       "dev": true,
-       "requires": {
--        "unist-util-modify-children": "1.1.2",
--        "unist-util-visit": "1.3.1"
-+        "hash.js": "1.1.3",
-+        "minimalistic-assert": "1.0.0",
-+        "minimalistic-crypto-utils": "1.0.1"
-       }
-     },
--    "mdast-util-heading-style": {
--      "version": "1.0.3",
--      "resolved": "https://registry.npmjs.org/mdast-util-heading-style/-/mdast-util-heading-style-1.0.3.tgz",
--      "integrity": "sha1-77OQ28iqAWw89XegNJANsn7nJHw=",
-+    "hoek": {
-+      "version": "4.2.1",
-+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz",
-+      "integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==",
-       "dev": true
-     },
--    "mdast-util-to-string": {
--      "version": "1.0.4",
--      "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-1.0.4.tgz",
--      "integrity": "sha1-XEVch4yTVfDB5/PotxnPWDaRrPs=",
-+    "home-or-tmp": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
-+      "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
-+      "dev": true,
-+      "requires": {
-+        "os-homedir": "1.0.2",
-+        "os-tmpdir": "1.0.2"
-+      }
-+    },
-+    "hosted-git-info": {
-+      "version": "2.6.0",
-+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.0.tgz",
-+      "integrity": "sha512-lIbgIIQA3lz5XaB6vxakj6sDHADJiZadYEJB+FgA+C4nubM1NwcuvUr9EJPmnH1skZqpqUzWborWo8EIUi0Sdw==",
-       "dev": true
-     },
--    "mdurl": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
--      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=",
-+    "htmlescape": {
-+      "version": "1.1.1",
-+      "resolved": "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz",
-+      "integrity": "sha1-OgPtwiFLyjtmQko+eVk0lQnLA1E=",
-       "dev": true
-     },
--    "meow": {
--      "version": "4.0.1",
--      "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz",
--      "integrity": "sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==",
-+    "htmlparser2": {
-+      "version": "3.9.2",
-+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz",
-+      "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=",
-       "dev": true,
-       "requires": {
--        "camelcase-keys": "4.2.0",
--        "decamelize-keys": "1.1.0",
--        "loud-rejection": "1.6.0",
--        "minimist": "1.2.0",
--        "minimist-options": "3.0.2",
--        "normalize-package-data": "2.4.0",
--        "read-pkg-up": "3.0.0",
--        "redent": "2.0.0",
--        "trim-newlines": "2.0.0"
--      },
-+        "domelementtype": "1.3.0",
-+        "domhandler": "2.4.1",
-+        "domutils": "1.5.1",
-+        "entities": "1.1.1",
-+        "inherits": "2.0.3",
-+        "readable-stream": "2.3.5"
-+      },
-       "dependencies": {
--        "find-up": {
--          "version": "2.1.0",
--          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
--          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
--          "dev": true,
--          "requires": {
--            "locate-path": "2.0.0"
--          }
--        },
--        "load-json-file": {
--          "version": "4.0.0",
--          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
--          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
--          "dev": true,
--          "requires": {
--            "graceful-fs": "4.1.11",
--            "parse-json": "4.0.0",
--            "pify": "3.0.0",
--            "strip-bom": "3.0.0"
--          }
--        },
--        "parse-json": {
--          "version": "4.0.0",
--          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
--          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
--          "dev": true,
--          "requires": {
--            "error-ex": "1.3.1",
--            "json-parse-better-errors": "1.0.2"
--          }
--        },
--        "path-type": {
--          "version": "3.0.0",
--          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
--          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
--          "dev": true,
--          "requires": {
--            "pify": "3.0.0"
--          }
--        },
--        "pify": {
--          "version": "3.0.0",
--          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
--          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-+        "isarray": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-           "dev": true
-         },
--        "read-pkg": {
--          "version": "3.0.0",
--          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
--          "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
-+        "readable-stream": {
-+          "version": "2.3.5",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
-+          "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
-           "dev": true,
-           "requires": {
--            "load-json-file": "4.0.0",
--            "normalize-package-data": "2.4.0",
--            "path-type": "3.0.0"
-+            "core-util-is": "1.0.2",
-+            "inherits": "2.0.3",
-+            "isarray": "1.0.0",
-+            "process-nextick-args": "2.0.0",
-+            "safe-buffer": "5.1.1",
-+            "string_decoder": "1.0.3",
-+            "util-deprecate": "1.0.2"
-           }
-         },
--        "read-pkg-up": {
--          "version": "3.0.0",
--          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
--          "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
-+        "string_decoder": {
-+          "version": "1.0.3",
-+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-+          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-           "dev": true,
-           "requires": {
--            "find-up": "2.1.0",
--            "read-pkg": "3.0.0"
-+            "safe-buffer": "5.1.1"
-           }
--        },
--        "strip-bom": {
--          "version": "3.0.0",
--          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
--          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
--          "dev": true
-         }
-       }
-     },
--    "micro": {
--      "version": "9.3.1",
--      "resolved": "https://registry.npmjs.org/micro/-/micro-9.3.1.tgz",
--      "integrity": "sha512-83uimpPJqfwkfKvJl2WWontBlV3hmzrIgyJ+L2uhDXKNk7Ll+/ezK3zBz7TljubpKPqjM0JdT2Ker4MTPmhjgA==",
-+    "http-signature": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-       "dev": true,
-       "requires": {
--        "arg": "2.0.0",
--        "chalk": "2.4.0",
--        "content-type": "1.0.4",
--        "is-stream": "1.1.0",
--        "raw-body": "2.3.2"
--      },
--      "dependencies": {
--        "ansi-styles": {
--          "version": "3.2.1",
--          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
--          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
--          "dev": true,
--          "requires": {
--            "color-convert": "1.9.1"
--          }
--        },
--        "chalk": {
--          "version": "2.4.0",
--          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz",
--          "integrity": "sha512-Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw==",
--          "dev": true,
--          "requires": {
--            "ansi-styles": "3.2.1",
--            "escape-string-regexp": "1.0.5",
--            "supports-color": "5.4.0"
--          }
--        },
--        "has-flag": {
--          "version": "3.0.0",
--          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
--          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
--          "dev": true
--        },
--        "supports-color": {
--          "version": "5.4.0",
--          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
--          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
--          "dev": true,
--          "requires": {
--            "has-flag": "3.0.0"
--          }
--        }
-+        "assert-plus": "1.0.0",
-+        "jsprim": "1.4.1",
-+        "sshpk": "1.14.1"
-       }
-     },
--    "micro-compress": {
--      "version": "1.0.0",
--      "resolved": "https://registry.npmjs.org/micro-compress/-/micro-compress-1.0.0.tgz",
--      "integrity": "sha1-U/WoC0rQMgyhZaVZtuPfFF1PcE8=",
--      "dev": true,
--      "requires": {
--        "compression": "1.7.3"
--      }
-+    "https-browserify": {
-+      "version": "0.0.1",
-+      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz",
-+      "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=",
-+      "dev": true
-     },
--    "micromatch": {
--      "version": "2.3.11",
--      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
--      "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-+    "https-proxy-agent": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz",
-+      "integrity": "sha1-NffabEjOTdv6JkiRrFk+5f+GceY=",
-       "dev": true,
-       "requires": {
--        "arr-diff": "2.0.0",
--        "array-unique": "0.2.1",
--        "braces": "1.8.5",
--        "expand-brackets": "0.1.5",
--        "extglob": "0.3.2",
--        "filename-regex": "2.0.1",
--        "is-extglob": "1.0.0",
--        "is-glob": "2.0.1",
--        "kind-of": "3.2.2",
--        "normalize-path": "2.1.1",
--        "object.omit": "2.0.1",
--        "parse-glob": "3.0.4",
--        "regex-cache": "0.4.4"
-+        "agent-base": "2.1.1",
-+        "debug": "2.6.9",
-+        "extend": "3.0.1"
-       }
-     },
--    "miller-rabin": {
--      "version": "4.0.1",
--      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
--      "integrity": "sha1-8IA1HIZbDcViqEYpZtqlNUPHik0=",
-+    "husky": {
-+      "version": "0.14.3",
-+      "resolved": "https://registry.npmjs.org/husky/-/husky-0.14.3.tgz",
-+      "integrity": "sha512-e21wivqHpstpoiWA/Yi8eFti8E+sQDSS53cpJsPptPs295QTOQR0ZwnHo2TXy1XOpZFD9rPOd3NpmqTK6uMLJA==",
-       "dev": true,
-       "requires": {
--        "bn.js": "4.11.8",
--        "brorand": "1.1.0"
-+        "is-ci": "1.1.0",
-+        "normalize-path": "1.0.0",
-+        "strip-indent": "2.0.0"
-+      },
-+      "dependencies": {
-+        "normalize-path": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-1.0.0.tgz",
-+          "integrity": "sha1-MtDkcvkf80VwHBWoMRAY07CpA3k=",
-+>>>>>>> .their
-+          "dev": true
-+        }
-       }
-     },
--    "mime": {
--      "version": "1.6.0",
--      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
--      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-+<<<<<<< .our
-+    "lodash": {
-+      "version": "4.17.10",
-+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
-+      "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==",
-       "dev": true
-     },
--    "mime-db": {
--      "version": "1.33.0",
--      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz",
--      "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==",
-+    "lodash._reinterpolate": {
-+      "version": "3.0.0",
-+      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-+      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
-       "dev": true
-     },
--    "mime-types": {
--      "version": "2.1.18",
--      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz",
--      "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
--      "dev": true,
--      "requires": {
--        "mime-db": "1.33.0"
--      }
--    },
--    "mimic-fn": {
--      "version": "1.2.0",
--      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
--      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
-+    "lodash.assign": {
-+      "version": "4.2.0",
-+      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
-+      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
-       "dev": true
-     },
--    "minimalistic-assert": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
--      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-+    "lodash.assignin": {
-+      "version": "4.2.0",
-+      "resolved": "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz",
-+      "integrity": "sha1-uo31+4QesKPoBEIysOJjqNxqKKI=",
-       "dev": true
-     },
--    "minimalistic-crypto-utils": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
--      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
-+    "lodash.bind": {
-+      "version": "4.2.1",
-+      "resolved": "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz",
-+      "integrity": "sha1-euMBfpOWIqwxt9fX3LGzTbFpDTU=",
-       "dev": true
-     },
--    "minimatch": {
--      "version": "3.0.4",
--      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
--      "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
--      "dev": true,
--      "requires": {
--        "brace-expansion": "1.1.11"
--      }
--    },
--    "minimist": {
--      "version": "1.2.0",
--      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
--      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-+    "lodash.cond": {
-+      "version": "4.5.2",
-+      "resolved": "https://registry.npmjs.org/lodash.cond/-/lodash.cond-4.5.2.tgz",
-+      "integrity": "sha1-9HGh2khr5g9quVXRcRVSPdHSVdU=",
-       "dev": true
-     },
--    "minimist-options": {
--      "version": "3.0.2",
--      "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-3.0.2.tgz",
--      "integrity": "sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==",
--      "dev": true,
--      "requires": {
--        "arrify": "1.0.1",
--        "is-plain-obj": "1.1.0"
--      }
--    },
--    "minipass": {
--      "version": "2.3.0",
--      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.0.tgz",
--      "integrity": "sha512-jWC2Eg+Np4bxah7llu1IrUNSJQxtLz/J+pOjTM0nFpJXGAaV18XBWhUn031Q1tAA/TJtA1jgwnOe9S2PQa4Lbg==",
--      "dev": true,
--      "requires": {
--        "safe-buffer": "5.1.2",
--        "yallist": "3.0.2"
--      }
--    },
--    "minizlib": {
--      "version": "1.1.0",
--      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz",
--      "integrity": "sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==",
--      "dev": true,
--      "requires": {
--        "minipass": "2.3.0"
--      }
-+    "lodash.defaults": {
-+      "version": "4.2.0",
-+      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
-+      "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=",
-+      "dev": true
-     },
--    "mkdirp": {
--      "version": "0.5.1",
--      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
--      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
--      "dev": true,
--      "requires": {
--        "minimist": "0.0.8"
--      },
--      "dependencies": {
--        "minimist": {
--          "version": "0.0.8",
--          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
--          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
--          "dev": true
--        }
--      }
-+    "lodash.filter": {
-+      "version": "4.6.0",
-+      "resolved": "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz",
-+      "integrity": "sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4=",
-+      "dev": true
-     },
--    "mkpath": {
--      "version": "0.1.0",
--      "resolved": "https://registry.npmjs.org/mkpath/-/mkpath-0.1.0.tgz",
--      "integrity": "sha1-dVSm+Nhxg0zJe1RisSLEwSTW3pE=",
-+    "lodash.flatten": {
-+      "version": "4.4.0",
-+      "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
-+      "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=",
-       "dev": true
-     },
--    "mksnapshot": {
--      "version": "0.3.1",
--      "resolved": "https://registry.npmjs.org/mksnapshot/-/mksnapshot-0.3.1.tgz",
--      "integrity": "sha1-JQHAVldDbXQs6Vik/5LHfkDdN+Y=",
--      "dev": true,
--      "requires": {
--        "decompress-zip": "0.3.0",
--        "fs-extra": "0.26.7",
--        "request": "2.85.0"
--      }
-+    "lodash.foreach": {
-+      "version": "4.5.0",
-+      "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz",
-+      "integrity": "sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=",
-+      "dev": true
-     },
--    "modify-values": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/modify-values/-/modify-values-1.0.1.tgz",
--      "integrity": "sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==",
-+    "lodash.isempty": {
-+      "version": "4.4.0",
-+      "resolved": "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz",
-+      "integrity": "sha1-b4bL7di+TsmHvpqvM8loTbGzHn4=",
-       "dev": true
-     },
--    "module-deps": {
--      "version": "4.1.1",
--      "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-4.1.1.tgz",
--      "integrity": "sha1-IyFYM/HaE/1gbMuAh7RIUty4If0=",
--      "dev": true,
--      "requires": {
--        "JSONStream": "1.3.2",
--        "browser-resolve": "1.11.2",
--        "cached-path-relative": "1.0.1",
--        "concat-stream": "1.5.2",
--        "defined": "1.0.0",
--        "detective": "4.7.1",
--        "duplexer2": "0.1.4",
--        "inherits": "2.0.3",
--        "parents": "1.0.1",
--        "readable-stream": "2.3.6",
--        "resolve": "1.7.1",
--        "stream-combiner2": "1.1.1",
--        "subarg": "1.0.0",
--        "through2": "2.0.3",
--        "xtend": "4.0.1"
--      },
--      "dependencies": {
--        "isarray": {
--          "version": "1.0.0",
--          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
--          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
--          "dev": true
--        },
--        "readable-stream": {
--          "version": "2.3.6",
--          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
--          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
--          "dev": true,
--          "requires": {
--            "core-util-is": "1.0.2",
--            "inherits": "2.0.3",
--            "isarray": "1.0.0",
--            "process-nextick-args": "2.0.0",
--            "safe-buffer": "5.1.2",
--            "string_decoder": "1.1.1",
--            "util-deprecate": "1.0.2"
--          }
--        },
--        "string_decoder": {
--          "version": "1.1.1",
--          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
--          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
--          "dev": true,
--          "requires": {
--            "safe-buffer": "5.1.2"
--          }
--        }
--      }
-+    "lodash.isplainobject": {
-+      "version": "4.0.6",
-+      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-+      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=",
-+      "dev": true
-     },
--    "mri": {
--      "version": "1.1.0",
--      "resolved": "https://registry.npmjs.org/mri/-/mri-1.1.0.tgz",
--      "integrity": "sha1-XAo/KcjM/7ux7JQdzsCdcfoy82o=",
-+    "lodash.map": {
-+      "version": "4.6.0",
-+      "resolved": "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz",
-+      "integrity": "sha1-dx7Hg540c9nEzeKLGTlMNWL09tM=",
-       "dev": true
-     },
--    "ms": {
--      "version": "2.0.0",
--      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
--      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-+    "lodash.memoize": {
-+      "version": "3.0.4",
-+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz",
-+      "integrity": "sha1-LcvSwofLwKVcxCMovQxzYVDVPj8=",
-       "dev": true
-     },
--    "mute-stream": {
--      "version": "0.0.5",
--      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz",
--      "integrity": "sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA=",
-+    "lodash.merge": {
-+      "version": "4.6.1",
-+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz",
-+      "integrity": "sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ==",
-       "dev": true
-     },
--    "nan": {
--      "version": "2.10.0",
--      "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
--      "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==",
--      "dev": true,
--      "optional": true
-+    "lodash.pick": {
-+      "version": "4.4.0",
-+      "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz",
-+      "integrity": "sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=",
-+      "dev": true
-     },
--    "natural-compare": {
--      "version": "1.4.0",
--      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
--      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-+    "lodash.range": {
-+      "version": "3.2.0",
-+      "resolved": "https://registry.npmjs.org/lodash.range/-/lodash.range-3.2.0.tgz",
-+      "integrity": "sha1-9GHliPZmg/fq3q3lE+OKaaVloV0=",
-       "dev": true
-     },
--    "negotiator": {
--      "version": "0.6.1",
--      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
--      "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=",
-+    "lodash.reduce": {
-+      "version": "4.6.0",
-+      "resolved": "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz",
-+      "integrity": "sha1-8atrg5KZrUj3hKu/R2WW8DuRTTs=",
-       "dev": true
-     },
--    "netrc": {
--      "version": "0.1.4",
--      "resolved": "https://registry.npmjs.org/netrc/-/netrc-0.1.4.tgz",
--      "integrity": "sha1-a+lPysqNd63gqWcNxGCRTJRHJEQ=",
-+    "lodash.reject": {
-+      "version": "4.6.0",
-+      "resolved": "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz",
-+      "integrity": "sha1-gNZJLcFHCGS79YNTO2UfQqn1JBU=",
-       "dev": true
-     },
--    "next-tick": {
--      "version": "1.0.0",
--      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
--      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
-+    "lodash.some": {
-+      "version": "4.6.0",
-+      "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz",
-+      "integrity": "sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=",
-       "dev": true
-     },
--    "node-dir": {
--      "version": "0.1.17",
--      "resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz",
--      "integrity": "sha1-X1Zl2TNRM1yqvvjxxVRRbPXx5OU=",
-+    "lodash.template": {
-+      "version": "4.4.0",
-+      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.4.0.tgz",
-+      "integrity": "sha1-5zoDhcg1VZF0bgILmWecaQ5o+6A=",
-       "dev": true,
-       "requires": {
--        "minimatch": "3.0.4"
-+        "lodash._reinterpolate": "3.0.0",
-+        "lodash.templatesettings": "4.1.0"
-       }
-     },
--    "node-fetch": {
--      "version": "2.1.2",
--      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.1.2.tgz",
--      "integrity": "sha1-q4hOjn5X44qUR1POxwb3iNF2i7U=",
--      "dev": true
-+    "lodash.templatesettings": {
-+      "version": "4.1.0",
-+      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz",
-+      "integrity": "sha1-K01OlbpEDZFf8IvImeRVNmZxMxY=",
-+      "dev": true,
-+      "requires": {
-+        "lodash._reinterpolate": "3.0.0"
-+      }
-     },
--    "node-version": {
--      "version": "1.1.3",
--      "resolved": "https://registry.npmjs.org/node-version/-/node-version-1.1.3.tgz",
--      "integrity": "sha512-rEwE51JWn0yN3Wl5BXeGn5d52OGbSXzWiiXRjAQeuyvcGKyvuSILW2rb3G7Xh+nexzLwhTpek6Ehxd6IjvHePg==",
-+    "lodash.transform": {
-+      "version": "4.6.0",
-+      "resolved": "https://registry.npmjs.org/lodash.transform/-/lodash.transform-4.6.0.tgz",
-+      "integrity": "sha1-EjBkIvYzJK7YSD0/ODMrX2cFR6A=",
-       "dev": true
-     },
--    "nopt": {
--      "version": "3.0.6",
--      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
--      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-+    "log-symbols": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz",
-+      "integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=",
-       "dev": true,
-       "requires": {
--        "abbrev": "1.1.1"
-+        "chalk": "1.1.3"
-       }
-     },
--    "normalize-package-data": {
--      "version": "2.4.0",
--      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
--      "integrity": "sha1-EvlaMH1YNSB1oEkHuErIvpisAS8=",
--      "dev": true,
--      "requires": {
--        "hosted-git-info": "2.6.0",
--        "is-builtin-module": "1.0.0",
--        "semver": "5.5.0",
--        "validate-npm-package-license": "3.0.3"
--      }
--    },
--    "normalize-path": {
--      "version": "2.1.1",
--      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
--      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
--      "dev": true,
--      "requires": {
--        "remove-trailing-separator": "1.1.0"
--      }
--    },
--    "npm-prefix": {
--      "version": "1.2.0",
--      "resolved": "https://registry.npmjs.org/npm-prefix/-/npm-prefix-1.2.0.tgz",
--      "integrity": "sha1-5hlFX3B0ulTMZtbQ033Z8b5ry8A=",
--      "dev": true,
--      "requires": {
--        "rc": "1.2.7",
--        "shellsubstitute": "1.2.0",
--        "untildify": "2.1.0"
--      }
-+    "longest": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
-+      "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
-+      "dev": true
-     },
--    "npm-run-path": {
-+    "longest-streak": {
-       "version": "2.0.2",
--      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
--      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
--      "dev": true,
--      "requires": {
--        "path-key": "2.0.1"
--      }
--    },
--    "nth-check": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz",
--      "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=",
--      "dev": true,
--      "requires": {
--        "boolbase": "1.0.0"
--      }
-+      "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.2.tgz",
-+      "integrity": "sha512-TmYTeEYxiAmSVdpbnQDXGtvYOIRsCMg89CVZzwzc2o7GFL1CjoiRPjH5ec0NFAVlAx3fVof9dX/t6KKRAo2OWA==",
-+      "dev": true
-     },
--    "nugget": {
--      "version": "2.0.1",
--      "resolved": "https://registry.npmjs.org/nugget/-/nugget-2.0.1.tgz",
--      "integrity": "sha1-IBCVpIfhrTYIGzQy+jytpPjQcbA=",
-+    "loud-rejection": {
-+      "version": "1.6.0",
-+      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
-+      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
-       "dev": true,
-       "requires": {
--        "debug": "2.6.9",
--        "minimist": "1.2.0",
--        "pretty-bytes": "1.0.4",
--        "progress-stream": "1.2.0",
--        "request": "2.85.0",
--        "single-line-log": "1.1.2",
--        "throttleit": "0.0.2"
-+        "currently-unhandled": "0.4.1",
-+        "signal-exit": "3.0.2"
-       }
-     },
--    "number-is-nan": {
-+    "lowercase-keys": {
-       "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
--      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
--      "dev": true
--    },
--    "nwmatcher": {
--      "version": "1.4.4",
--      "resolved": "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.4.tgz",
--      "integrity": "sha512-3iuY4N5dhgMpCUrOVnuAdGrgxVqV2cJpM+XNccjR2DKOB1RUP0aA+wGXEiNziG/UKboFyGBIoKOaNlJxx8bciQ==",
--      "dev": true,
--      "optional": true
--    },
--    "oauth-sign": {
--      "version": "0.8.2",
--      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
--      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
--      "dev": true
--    },
--    "object-assign": {
--      "version": "4.1.1",
--      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
--      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
--      "dev": true
--    },
--    "object-keys": {
--      "version": "0.4.0",
--      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
--      "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=",
-+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
-+      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
-       "dev": true
-     },
--    "object.assign": {
--      "version": "4.1.0",
--      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
--      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
-+    "lru-cache": {
-+      "version": "4.1.3",
-+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz",
-+      "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
-       "dev": true,
-       "requires": {
--        "define-properties": "1.1.2",
--        "function-bind": "1.1.1",
--        "has-symbols": "1.0.0",
--        "object-keys": "1.0.11"
-+        "pseudomap": "1.0.2",
-+        "yallist": "2.1.2"
-       },
-       "dependencies": {
--        "object-keys": {
--          "version": "1.0.11",
--          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
--          "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=",
-+        "yallist": {
-+          "version": "2.1.2",
-+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-+          "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-           "dev": true
-         }
-       }
-     },
--    "object.omit": {
--      "version": "2.0.1",
--      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
--      "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
--      "dev": true,
--      "requires": {
--        "for-own": "0.1.5",
--        "is-extendable": "0.1.1"
--      }
--    },
--    "octicons": {
--      "version": "7.3.0",
--      "resolved": "https://registry.npmjs.org/octicons/-/octicons-7.3.0.tgz",
--      "integrity": "sha512-UVjlkmUL15Ef/7Rd72Io634Bdl61QgSMasAZpvXPoR2XNFj1RelAyhl4QJuR1hBGlPWFDR7KFj2jEzsFax2IUg==",
--      "dev": true,
--      "requires": {
--        "object-assign": "4.1.1"
--      }
--    },
--    "on-finished": {
--      "version": "2.3.0",
--      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
--      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-+    "make-dir": {
-+      "version": "1.3.0",
-+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
-+      "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
-       "dev": true,
-       "requires": {
--        "ee-first": "1.1.1"
-+        "pify": "3.0.0"
-+      },
-+      "dependencies": {
-+        "pify": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-+          "dev": true
-+        }
-       }
-     },
--    "on-headers": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz",
--      "integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=",
-+    "map-obj": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz",
-+      "integrity": "sha1-plzSkIepJZi4eRJXpSPgISIqwfk=",
-       "dev": true
-     },
--    "once": {
--      "version": "1.4.0",
--      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
--      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
--      "dev": true,
--      "requires": {
--        "wrappy": "1.0.2"
--      }
--    },
--    "onetime": {
--      "version": "1.1.0",
--      "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
--      "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
-+    "markdown-escapes": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.2.tgz",
-+      "integrity": "sha512-lbRZ2mE3Q9RtLjxZBZ9+IMl68DKIXaVAhwvwn9pmjnPLS0h/6kyBMgNhqi1xFJ/2yv6cSyv0jbiZavZv93JkkA==",
-       "dev": true
-     },
--    "openssl-self-signed-certificate": {
--      "version": "1.1.6",
--      "resolved": "https://registry.npmjs.org/openssl-self-signed-certificate/-/openssl-self-signed-certificate-1.1.6.tgz",
--      "integrity": "sha1-nTpHdrGlfphHNQOSEUrS+RWoPdQ=",
-+    "markdown-extensions": {
-+      "version": "1.1.1",
-+      "resolved": "https://registry.npmjs.org/markdown-extensions/-/markdown-extensions-1.1.1.tgz",
-+      "integrity": "sha512-WWC0ZuMzCyDHYCasEGs4IPvLyTGftYwh6wIEOULOF0HXcqZlhwRzrK0w2VUlxWA98xnvb/jszw4ZSkJ6ADpM6Q==",
-       "dev": true
-     },
--    "opn": {
--      "version": "5.3.0",
--      "resolved": "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz",
--      "integrity": "sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==",
-+    "markdown-it": {
-+      "version": "6.1.1",
-+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-6.1.1.tgz",
-+      "integrity": "sha1-ztA39Ec+6fUVOsQU933IPJG6knw=",
-       "dev": true,
-       "requires": {
--        "is-wsl": "1.1.0"
-+        "argparse": "1.0.10",
-+        "entities": "1.1.1",
-+        "linkify-it": "1.2.4",
-+        "mdurl": "1.0.1",
-+        "uc.micro": "1.0.5"
-       }
-     },
--    "optimist": {
--      "version": "0.3.7",
--      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
--      "integrity": "sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=",
-+    "markdown-it-named-headers": {
-+      "version": "0.0.4",
-+      "resolved": "https://registry.npmjs.org/markdown-it-named-headers/-/markdown-it-named-headers-0.0.4.tgz",
-+      "integrity": "sha1-gu/CgyQkCmsed7mq5QF3HV81HB8=",
-       "dev": true,
-       "requires": {
--        "wordwrap": "0.0.3"
-+        "string": "3.3.3"
-       }
-     },
--    "optionator": {
--      "version": "0.8.2",
--      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
--      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
-+    "markdown-table": {
-+      "version": "1.1.2",
-+      "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-1.1.2.tgz",
-+      "integrity": "sha512-NcWuJFHDA8V3wkDgR/j4+gZx+YQwstPgfQDV8ndUeWWzta3dnDTBxpVzqS9lkmJAuV5YX35lmyojl6HO5JXAgw==",
-+      "dev": true
-+    },
-+    "marky-markdown-lite": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/marky-markdown-lite/-/marky-markdown-lite-1.2.0.tgz",
-+      "integrity": "sha1-dO2phLgTZVfe4QZO/RXkBhdAaZc=",
-       "dev": true,
-       "requires": {
--        "deep-is": "0.1.3",
--        "fast-levenshtein": "2.0.6",
--        "levn": "0.3.0",
--        "prelude-ls": "1.1.2",
--        "type-check": "0.3.2",
--        "wordwrap": "1.0.0"
-+        "cheerio": "0.20.0",
-+        "conventional-changelog-cli": "1.3.22",
-+        "is-file": "1.0.0",
-+        "markdown-it": "6.1.1",
-+        "markdown-it-named-headers": "0.0.4"
-       },
-       "dependencies": {
--        "wordwrap": {
--          "version": "1.0.0",
--          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
--          "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
--          "dev": true
--        }
--      }
--    },
--    "ora": {
--      "version": "0.3.0",
--      "resolved": "https://registry.npmjs.org/ora/-/ora-0.3.0.tgz",
--      "integrity": "sha1-NnoHitJc+wltpQERXrW0AeB9dJU=",
--      "dev": true,
--      "requires": {
--        "chalk": "1.1.3",
--        "cli-cursor": "1.0.2",
--        "cli-spinners": "0.2.0",
--        "log-symbols": "1.0.2"
--      },
--      "dependencies": {
--        "cli-spinners": {
--          "version": "0.2.0",
--          "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-0.2.0.tgz",
--          "integrity": "sha1-hQeHN5E7iA9uyf/ntl6D7Hd2KE8=",
--          "dev": true
-+        "cheerio": {
-+          "version": "0.20.0",
-+          "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.20.0.tgz",
-+          "integrity": "sha1-XHEPK6uVZTJyhCugHG6mGzVF7DU=",
-+          "dev": true,
-+          "requires": {
-+            "css-select": "1.2.0",
-+            "dom-serializer": "0.1.0",
-+            "entities": "1.1.1",
-+            "htmlparser2": "3.8.3",
-+            "jsdom": "7.2.2",
-+            "lodash": "4.17.10"
-+          }
-+        },
-+        "domhandler": {
-+          "version": "2.3.0",
-+          "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz",
-+          "integrity": "sha1-LeWaCCLVAn+r/28DLCsloqir5zg=",
-+          "dev": true,
-+          "requires": {
-+            "domelementtype": "1.3.0"
-+          }
-+        },
-+        "htmlparser2": {
-+          "version": "3.8.3",
-+          "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
-+          "integrity": "sha1-mWwosZFRaovoZQGn15dX5ccMEGg=",
-+          "dev": true,
-+          "requires": {
-+            "domelementtype": "1.3.0",
-+            "domhandler": "2.3.0",
-+            "domutils": "1.5.1",
-+            "entities": "1.0.0",
-+            "readable-stream": "1.1.14"
-+          },
-+          "dependencies": {
-+            "entities": {
-+              "version": "1.0.0",
-+              "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz",
-+              "integrity": "sha1-sph6o4ITR/zeZCsk/fyeT7cSvyY=",
-+              "dev": true
-+            }
-+          }
-         }
-       }
-     },
--    "os-browserify": {
--      "version": "0.1.2",
--      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz",
--      "integrity": "sha1-ScoCk+CxlZCl9d4Qx/JlphfY/lQ=",
--      "dev": true
--    },
--    "os-homedir": {
--      "version": "1.0.2",
--      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
--      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
--      "dev": true
--    },
--    "os-locale": {
--      "version": "1.4.0",
--      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
--      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
--      "dev": true,
--      "requires": {
--        "lcid": "1.0.0"
--      }
--    },
--    "os-tmpdir": {
--      "version": "1.0.2",
--      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
--      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
--      "dev": true
--    },
--    "p-finally": {
--      "version": "1.0.0",
--      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
--      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
--      "dev": true
--    },
--    "p-limit": {
--      "version": "1.2.0",
--      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz",
--      "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==",
--      "dev": true,
--      "requires": {
--        "p-try": "1.0.0"
--      }
--    },
--    "p-locate": {
--      "version": "2.0.0",
--      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
--      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-+    "matcher-collection": {
-+      "version": "1.0.5",
-+      "resolved": "https://registry.npmjs.org/matcher-collection/-/matcher-collection-1.0.5.tgz",
-+      "integrity": "sha1-LuCVQ4Nyy4iE8FgjQTjAXGROwzk=",
-       "dev": true,
-       "requires": {
--        "p-limit": "1.2.0"
-+        "minimatch": "3.0.4"
-       }
-     },
--    "p-try": {
--      "version": "1.0.0",
--      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
--      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-+    "math-random": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.1.tgz",
-+      "integrity": "sha1-izqsWIuKZuSXXjzepn97sylgH6w=",
-       "dev": true
-     },
--    "package-json": {
--      "version": "4.0.1",
--      "resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz",
--      "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=",
-+    "md5.js": {
-+      "version": "1.3.4",
-+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz",
-+      "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=",
-       "dev": true,
-       "requires": {
--        "got": "6.7.1",
--        "registry-auth-token": "3.3.2",
--        "registry-url": "3.1.0",
--        "semver": "5.5.0"
-+        "hash-base": "3.0.4",
-+        "inherits": "2.0.3"
-       }
-     },
--    "pako": {
--      "version": "0.2.9",
--      "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
--      "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=",
-+    "mdast-comment-marker": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/mdast-comment-marker/-/mdast-comment-marker-1.0.2.tgz",
-+      "integrity": "sha1-Hd8O+BH7UkOQF8jSwLkiA18rp0o=",
-       "dev": true
-     },
--    "parents": {
-+    "mdast-util-compact": {
-       "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz",
--      "integrity": "sha1-/t1NK/GTp3dF/nHjcdc8MwfZx1E=",
-+      "resolved": "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-1.0.1.tgz",
-+      "integrity": "sha1-zbX4TitqLTEU3zO9BdnLMuPECDo=",
-       "dev": true,
-       "requires": {
--        "path-platform": "0.11.15"
-+        "unist-util-modify-children": "1.1.2",
-+        "unist-util-visit": "1.3.1"
-       }
-     },
--    "parse-asn1": {
--      "version": "5.1.1",
--      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz",
--      "integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==",
--      "dev": true,
--      "requires": {
--        "asn1.js": "4.10.1",
--        "browserify-aes": "1.2.0",
--        "create-hash": "1.2.0",
--        "evp_bytestokey": "1.0.3",
--        "pbkdf2": "3.0.16"
--      }
-+    "mdast-util-heading-style": {
-+      "version": "1.0.3",
-+      "resolved": "https://registry.npmjs.org/mdast-util-heading-style/-/mdast-util-heading-style-1.0.3.tgz",
-+      "integrity": "sha1-77OQ28iqAWw89XegNJANsn7nJHw=",
-+      "dev": true
-     },
--    "parse-entities": {
--      "version": "1.1.2",
--      "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-1.1.2.tgz",
--      "integrity": "sha512-5N9lmQ7tmxfXf+hO3X6KRG6w7uYO/HL9fHalSySTdyn63C3WNvTM/1R8tn1u1larNcEbo3Slcy2bsVDQqvEpUg==",
--      "dev": true,
--      "requires": {
--        "character-entities": "1.2.2",
--        "character-entities-legacy": "1.1.2",
--        "character-reference-invalid": "1.1.2",
--        "is-alphanumerical": "1.0.2",
--        "is-decimal": "1.0.2",
--        "is-hexadecimal": "1.0.2"
--      }
-+    "mdast-util-to-string": {
-+      "version": "1.0.4",
-+      "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-1.0.4.tgz",
-+      "integrity": "sha1-XEVch4yTVfDB5/PotxnPWDaRrPs=",
-+      "dev": true
-     },
--    "parse-github-repo-url": {
--      "version": "1.4.1",
--      "resolved": "https://registry.npmjs.org/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz",
--      "integrity": "sha1-nn2LslKmy2ukJZUGC3v23z28H1A=",
-+    "mdurl": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-+      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=",
-       "dev": true
-     },
--    "parse-gitignore": {
--      "version": "0.4.0",
--      "resolved": "https://registry.npmjs.org/parse-gitignore/-/parse-gitignore-0.4.0.tgz",
--      "integrity": "sha1-q/cC5LkAUk//eQK2g4YoV7Y/k/4=",
-+    "meow": {
-+      "version": "4.0.1",
-+      "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz",
-+      "integrity": "sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==",
-       "dev": true,
-       "requires": {
--        "array-unique": "0.3.2",
--        "is-glob": "3.1.0"
-+        "camelcase-keys": "4.2.0",
-+        "decamelize-keys": "1.1.0",
-+        "loud-rejection": "1.6.0",
-+        "minimist": "1.2.0",
-+        "minimist-options": "3.0.2",
-+        "normalize-package-data": "2.4.0",
-+        "read-pkg-up": "3.0.0",
-+        "redent": "2.0.0",
-+        "trim-newlines": "2.0.0"
-       },
-       "dependencies": {
--        "array-unique": {
--          "version": "0.3.2",
--          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
--          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
--          "dev": true
-+        "find-up": {
-+          "version": "2.1.0",
-+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-+          "dev": true,
-+          "requires": {
-+            "locate-path": "2.0.0"
-+          }
-         },
--        "is-extglob": {
--          "version": "2.1.1",
--          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
--          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
--          "dev": true
-+        "load-json-file": {
-+          "version": "4.0.0",
-+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
-+          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
-+          "dev": true,
-+          "requires": {
-+            "graceful-fs": "4.1.11",
-+            "parse-json": "4.0.0",
-+            "pify": "3.0.0",
-+            "strip-bom": "3.0.0"
-+          }
-         },
--        "is-glob": {
--          "version": "3.1.0",
--          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
--          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-+        "parse-json": {
-+          "version": "4.0.0",
-+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-+          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
-           "dev": true,
-           "requires": {
--            "is-extglob": "2.1.1"
-+            "error-ex": "1.3.1",
-+            "json-parse-better-errors": "1.0.2"
-           }
--        }
--      }
--    },
--    "parse-glob": {
--      "version": "3.0.4",
--      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
--      "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
--      "dev": true,
--      "requires": {
--        "glob-base": "0.3.0",
--        "is-dotfile": "1.0.3",
--        "is-extglob": "1.0.0",
--        "is-glob": "2.0.1"
-+        },
-+        "path-type": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-+          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-+          "dev": true,
-+          "requires": {
-+            "pify": "3.0.0"
-+          }
-+        },
-+        "pify": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-+          "dev": true
-+        },
-+        "read-pkg": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
-+          "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
-+          "dev": true,
-+          "requires": {
-+            "load-json-file": "4.0.0",
-+            "normalize-package-data": "2.4.0",
-+            "path-type": "3.0.0"
-+          }
-+        },
-+        "read-pkg-up": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
-+          "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
-+          "dev": true,
-+          "requires": {
-+            "find-up": "2.1.0",
-+            "read-pkg": "3.0.0"
-+          }
-+        },
-+        "strip-bom": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-+          "dev": true
-+        }
-       }
-     },
--    "parse-json": {
--      "version": "2.2.0",
--      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
--      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-+    "micro": {
-+      "version": "9.3.1",
-+      "resolved": "https://registry.npmjs.org/micro/-/micro-9.3.1.tgz",
-+      "integrity": "sha512-83uimpPJqfwkfKvJl2WWontBlV3hmzrIgyJ+L2uhDXKNk7Ll+/ezK3zBz7TljubpKPqjM0JdT2Ker4MTPmhjgA==",
-       "dev": true,
-       "requires": {
--        "error-ex": "1.3.1"
-+        "arg": "2.0.0",
-+        "chalk": "2.4.0",
-+        "content-type": "1.0.4",
-+        "is-stream": "1.1.0",
-+        "raw-body": "2.3.2"
-+      },
-+      "dependencies": {
-+        "ansi-styles": {
-+          "version": "3.2.1",
-+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-+          "dev": true,
-+          "requires": {
-+            "color-convert": "1.9.1"
-+          }
-+        },
-+        "chalk": {
-+          "version": "2.4.0",
-+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz",
-+          "integrity": "sha512-Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw==",
-+          "dev": true,
-+          "requires": {
-+            "ansi-styles": "3.2.1",
-+            "escape-string-regexp": "1.0.5",
-+            "supports-color": "5.4.0"
-+          }
-+        },
-+        "has-flag": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-+          "dev": true
-+        },
-+        "supports-color": {
-+          "version": "5.4.0",
-+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
-+          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-+          "dev": true,
-+          "requires": {
-+            "has-flag": "3.0.0"
-+          }
-+        }
-       }
-     },
--    "parse5": {
--      "version": "1.5.1",
--      "resolved": "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz",
--      "integrity": "sha1-m387DeMr543CQBsXVzzK8Pb1nZQ=",
-+    "micro-compress": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/micro-compress/-/micro-compress-1.0.0.tgz",
-+      "integrity": "sha1-U/WoC0rQMgyhZaVZtuPfFF1PcE8=",
-       "dev": true,
--      "optional": true
-+      "requires": {
-+        "compression": "1.7.3"
-+      }
-     },
--    "path-browserify": {
--      "version": "0.0.0",
--      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
--      "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
--      "dev": true
-+    "micromatch": {
-+      "version": "2.3.11",
-+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-+      "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-+      "dev": true,
-+      "requires": {
-+        "arr-diff": "2.0.0",
-+        "array-unique": "0.2.1",
-+        "braces": "1.8.5",
-+        "expand-brackets": "0.1.5",
-+        "extglob": "0.3.2",
-+        "filename-regex": "2.0.1",
-+        "is-extglob": "1.0.0",
-+        "is-glob": "2.0.1",
-+        "kind-of": "3.2.2",
-+        "normalize-path": "2.1.1",
-+        "object.omit": "2.0.1",
-+        "parse-glob": "3.0.4",
-+        "regex-cache": "0.4.4"
-+      }
-     },
--    "path-exists": {
--      "version": "2.1.0",
--      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
--      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-+    "miller-rabin": {
-+      "version": "4.0.1",
-+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-+      "integrity": "sha1-8IA1HIZbDcViqEYpZtqlNUPHik0=",
-       "dev": true,
-       "requires": {
--        "pinkie-promise": "2.0.1"
-+        "bn.js": "4.11.8",
-+        "brorand": "1.1.0"
-       }
-     },
--    "path-is-absolute": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
--      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-+    "mime": {
-+      "version": "1.6.0",
-+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-       "dev": true
-     },
--    "path-is-inside": {
--      "version": "1.0.2",
--      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
--      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
-+    "mime-db": {
-+      "version": "1.33.0",
-+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz",
-+      "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==",
-       "dev": true
-     },
--    "path-key": {
--      "version": "2.0.1",
--      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
--      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
-+    "mime-types": {
-+      "version": "2.1.18",
-+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz",
-+      "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
-+      "dev": true,
-+      "requires": {
-+        "mime-db": "1.33.0"
-+      }
-+    },
-+    "mimic-fn": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
-       "dev": true
-     },
--    "path-parse": {
--      "version": "1.0.5",
--      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
--      "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
-+    "minimalistic-assert": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-       "dev": true
-     },
--    "path-platform": {
--      "version": "0.11.15",
--      "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz",
--      "integrity": "sha1-6GQhf3TDaFDwhSt43Hv31KVyG/I=",
-+    "minimalistic-crypto-utils": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-+      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
-       "dev": true
-     },
--    "path-type": {
--      "version": "1.1.0",
--      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
--      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-+    "minimatch": {
-+      "version": "3.0.4",
-+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-+      "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
-       "dev": true,
-       "requires": {
--        "graceful-fs": "4.1.11",
--        "pify": "2.3.0",
--        "pinkie-promise": "2.0.1"
-+        "brace-expansion": "1.1.11"
-       }
-     },
--    "pbkdf2": {
--      "version": "3.0.16",
--      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.16.tgz",
--      "integrity": "sha512-y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA==",
-+    "minimist": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-+      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-+      "dev": true
-+    },
-+    "minimist-options": {
-+      "version": "3.0.2",
-+      "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-3.0.2.tgz",
-+      "integrity": "sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==",
-       "dev": true,
-       "requires": {
--        "create-hash": "1.2.0",
--        "create-hmac": "1.1.7",
--        "ripemd160": "2.0.2",
--        "safe-buffer": "5.1.2",
--        "sha.js": "2.4.11"
-+        "arrify": "1.0.1",
-+        "is-plain-obj": "1.1.0"
-       }
-     },
--    "peek-stream": {
--      "version": "1.1.3",
--      "resolved": "https://registry.npmjs.org/peek-stream/-/peek-stream-1.1.3.tgz",
--      "integrity": "sha512-FhJ+YbOSBb9/rIl2ZeE/QHEsWn7PqNYt8ARAY3kIgNGOk13g9FGyIY6JIl/xB/3TFRVoTv5as0l11weORrTekA==",
-+    "minipass": {
-+      "version": "2.3.0",
-+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.0.tgz",
-+      "integrity": "sha512-jWC2Eg+Np4bxah7llu1IrUNSJQxtLz/J+pOjTM0nFpJXGAaV18XBWhUn031Q1tAA/TJtA1jgwnOe9S2PQa4Lbg==",
-       "dev": true,
-       "requires": {
--        "buffer-from": "1.0.0",
--        "duplexify": "3.6.0",
--        "through2": "2.0.3"
-+        "safe-buffer": "5.1.2",
-+        "yallist": "3.0.2"
-       }
-     },
--    "performance-now": {
--      "version": "2.1.0",
--      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
--      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
--      "dev": true
-+    "minizlib": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz",
-+      "integrity": "sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==",
-+      "dev": true,
-+      "requires": {
-+        "minipass": "2.3.0"
-+      }
-     },
--    "pify": {
--      "version": "2.3.0",
--      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
--      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-+    "mkdirp": {
-+      "version": "0.5.1",
-+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-+      "dev": true,
-+      "requires": {
-+        "minimist": "0.0.8"
-+      },
-+      "dependencies": {
-+        "minimist": {
-+          "version": "0.0.8",
-+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-+=======
-+    "ieee754": {
-+      "version": "1.1.8",
-+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz",
-+      "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=",
-       "dev": true
-     },
--    "pinkie": {
--      "version": "2.0.4",
--      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
--      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-+    "ignore": {
-+      "version": "3.3.7",
-+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz",
-+      "integrity": "sha512-YGG3ejvBNHRqu0559EOxxNFihD0AjpvHlC/pdGKd3X3ofe+CoJkYazwNJYTNebqpPKN+VVQbh4ZFn1DivMNuHA==",
-       "dev": true
-     },
--    "pinkie-promise": {
--      "version": "2.0.1",
--      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
--      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-+    "import-lazy": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
-+      "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=",
-+      "dev": true
-+    },
-+    "imurmurhash": {
-+      "version": "0.1.4",
-+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-+      "dev": true
-+    },
-+    "indent-string": {
-+      "version": "3.2.0",
-+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
-+      "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=",
-+      "dev": true
-+    },
-+    "indexof": {
-+      "version": "0.0.1",
-+      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
-+      "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
-+      "dev": true
-+    },
-+    "inflight": {
-+      "version": "1.0.6",
-+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-       "dev": true,
-       "requires": {
--        "pinkie": "2.0.4"
-+        "once": "1.4.0",
-+        "wrappy": "1.0.2"
-       }
-     },
--    "pkg-conf": {
--      "version": "2.1.0",
--      "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-2.1.0.tgz",
--      "integrity": "sha1-ISZRTKbyq/69FoWW3xi6V4Z/AFg=",
-+    "inherits": {
-+      "version": "2.0.3",
-+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-+      "dev": true
-+    },
-+    "ini": {
-+      "version": "1.3.5",
-+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
-+      "dev": true
-+    },
-+    "inline-source-map": {
-+      "version": "0.6.2",
-+      "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.6.2.tgz",
-+      "integrity": "sha1-+Tk0ccGKedFyT4Y/o4tYY3Ct4qU=",
-       "dev": true,
-       "requires": {
--        "find-up": "2.1.0",
--        "load-json-file": "4.0.0"
-+        "source-map": "0.5.7"
-+      }
-+    },
-+    "inquirer": {
-+      "version": "0.12.0",
-+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz",
-+      "integrity": "sha1-HvK/1jUE3wvHV4X/+MLEHfEvB34=",
-+      "dev": true,
-+      "requires": {
-+        "ansi-escapes": "1.4.0",
-+        "ansi-regex": "2.1.1",
-+        "chalk": "1.1.3",
-+        "cli-cursor": "1.0.2",
-+        "cli-width": "2.2.0",
-+        "figures": "1.7.0",
-+        "lodash": "4.17.5",
-+        "readline2": "1.0.1",
-+        "run-async": "0.1.0",
-+        "rx-lite": "3.1.2",
-+        "string-width": "1.0.2",
-+        "strip-ansi": "3.0.1",
-+        "through": "2.3.8"
-+      }
-+    },
-+    "insert-module-globals": {
-+      "version": "7.0.2",
-+      "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.0.2.tgz",
-+      "integrity": "sha512-p3s7g96Nm62MbHRuj9ZXab0DuJNWD7qcmdUXCOQ/ZZn42DtDXfsLill7bq19lDCx3K3StypqUnuE3H2VmIJFUw==",
-+      "dev": true,
-+      "requires": {
-+        "JSONStream": "1.3.2",
-+        "combine-source-map": "0.7.2",
-+        "concat-stream": "1.5.2",
-+        "is-buffer": "1.1.6",
-+        "lexical-scope": "1.2.0",
-+        "process": "0.11.10",
-+        "through2": "2.0.3",
-+        "xtend": "4.0.1"
-       },
-       "dependencies": {
--        "find-up": {
--          "version": "2.1.0",
--          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
--          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
--          "dev": true,
--          "requires": {
--            "locate-path": "2.0.0"
--          }
--        },
--        "load-json-file": {
--          "version": "4.0.0",
--          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
--          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
--          "dev": true,
--          "requires": {
--            "graceful-fs": "4.1.11",
--            "parse-json": "4.0.0",
--            "pify": "3.0.0",
--            "strip-bom": "3.0.0"
--          }
--        },
--        "parse-json": {
--          "version": "4.0.0",
--          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
--          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
-+        "combine-source-map": {
-+          "version": "0.7.2",
-+          "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.7.2.tgz",
-+          "integrity": "sha1-CHAxKFazB6h8xKxIbzqaYq7MwJ4=",
-           "dev": true,
-           "requires": {
--            "error-ex": "1.3.1",
--            "json-parse-better-errors": "1.0.2"
-+            "convert-source-map": "1.1.3",
-+            "inline-source-map": "0.6.2",
-+            "lodash.memoize": "3.0.4",
-+            "source-map": "0.5.7"
-           }
--        },
--        "pify": {
--          "version": "3.0.0",
--          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
--          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
--          "dev": true
--        },
--        "strip-bom": {
--          "version": "3.0.0",
--          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
--          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
--          "dev": true
-         }
-       }
-     },
--    "pkg-config": {
--      "version": "1.1.1",
--      "resolved": "https://registry.npmjs.org/pkg-config/-/pkg-config-1.1.1.tgz",
--      "integrity": "sha1-VX7yLXPaPIg3EHdmxS6tq94pj+Q=",
--      "dev": true,
--      "requires": {
--        "debug-log": "1.0.1",
--        "find-root": "1.1.0",
--        "xtend": "4.0.1"
--      }
-+    "interpret": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz",
-+      "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=",
-+      "dev": true
-     },
--    "pkg-dir": {
-+    "invert-kv": {
-       "version": "1.0.0",
--      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz",
--      "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=",
--      "dev": true,
--      "requires": {
--        "find-up": "1.1.2"
--      }
-+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-+      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
-+      "dev": true
-     },
--    "pkg-up": {
-+    "is-arrayish": {
-+      "version": "0.2.1",
-+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-+      "dev": true
-+    },
-+    "is-buffer": {
-+      "version": "1.1.6",
-+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-+      "dev": true
-+    },
-+    "is-builtin-module": {
-       "version": "1.0.0",
--      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-1.0.0.tgz",
--      "integrity": "sha1-Pgj7RhUlxEIWJKM7n35tCvWwWiY=",
-+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
-+      "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
-       "dev": true,
-       "requires": {
--        "find-up": "1.1.2"
-+        "builtin-modules": "1.1.1"
-       }
-     },
--    "plur": {
--      "version": "2.1.2",
--      "resolved": "https://registry.npmjs.org/plur/-/plur-2.1.2.tgz",
--      "integrity": "sha1-dIJFLBoPUI4+NE6uwxLJHCncZVo=",
-+    "is-callable": {
-+      "version": "1.1.3",
-+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz",
-+      "integrity": "sha1-hut1OSgF3cM69xySoO7fdO52BLI=",
-+      "dev": true
-+    },
-+    "is-ci": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.1.0.tgz",
-+      "integrity": "sha512-c7TnwxLePuqIlxHgr7xtxzycJPegNHFuIrBkwbf8hc58//+Op1CqFkyS+xnIMkwn9UsJIwc174BIjkyBmSpjKg==",
-       "dev": true,
-       "requires": {
--        "irregular-plurals": "1.4.0"
-+        "ci-info": "1.1.3"
-       }
-     },
--    "pluralize": {
--      "version": "1.2.1",
--      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz",
--      "integrity": "sha1-0aIUg/0iu0HlihL6NCGCMUCJfEU=",
--      "dev": true
--    },
--    "prelude-ls": {
--      "version": "1.1.2",
--      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
--      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-+    "is-date-object": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
-+      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
-       "dev": true
-     },
--    "prepend-http": {
--      "version": "1.0.4",
--      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
--      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
-+    "is-deflate": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/is-deflate/-/is-deflate-1.0.0.tgz",
-+      "integrity": "sha1-yGKQHDwWH7CdrHzcfnhPgOmPLxQ=",
-       "dev": true
-     },
--    "preserve": {
--      "version": "0.2.0",
--      "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
--      "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
-+    "is-dotfile": {
-+      "version": "1.0.3",
-+      "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
-+      "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
-       "dev": true
-     },
--    "pretty-bytes": {
--      "version": "1.0.4",
--      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz",
--      "integrity": "sha1-CiLoIQYJrTVUL4yNXSFZr/B1HIQ=",
-+    "is-equal-shallow": {
-+      "version": "0.1.3",
-+      "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
-+      "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
-       "dev": true,
-       "requires": {
--        "get-stdin": "4.0.1",
--        "meow": "3.7.0"
--      },
--      "dependencies": {
--        "camelcase": {
--          "version": "2.1.1",
--          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
--          "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
--          "dev": true
--        },
--        "camelcase-keys": {
--          "version": "2.1.0",
--          "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
--          "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
--          "dev": true,
--          "requires": {
--            "camelcase": "2.1.1",
--            "map-obj": "1.0.1"
--          }
--        },
--        "indent-string": {
--          "version": "2.1.0",
--          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
--          "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
--          "dev": true,
--          "requires": {
--            "repeating": "2.0.1"
--          }
--        },
--        "map-obj": {
--          "version": "1.0.1",
--          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
--          "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
--          "dev": true
--        },
--        "meow": {
--          "version": "3.7.0",
--          "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
--          "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
--          "dev": true,
--          "requires": {
--            "camelcase-keys": "2.1.0",
--            "decamelize": "1.2.0",
--            "loud-rejection": "1.6.0",
--            "map-obj": "1.0.1",
--            "minimist": "1.2.0",
--            "normalize-package-data": "2.4.0",
--            "object-assign": "4.1.1",
--            "read-pkg-up": "1.0.1",
--            "redent": "1.0.0",
--            "trim-newlines": "1.0.0"
--          }
--        },
--        "redent": {
--          "version": "1.0.0",
--          "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
--          "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
--          "dev": true,
--          "requires": {
--            "indent-string": "2.1.0",
--            "strip-indent": "1.0.1"
--          }
--        },
--        "strip-indent": {
--          "version": "1.0.1",
--          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
--          "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
--          "dev": true,
--          "requires": {
--            "get-stdin": "4.0.1"
--          }
--        },
--        "trim-newlines": {
--          "version": "1.0.0",
--          "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
--          "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
--          "dev": true
--        }
-+        "is-primitive": "2.0.0"
-       }
-     },
--    "process": {
--      "version": "0.11.10",
--      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
--      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-+    "is-extendable": {
-+      "version": "0.1.1",
-+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-       "dev": true
-     },
--    "process-nextick-args": {
--      "version": "2.0.0",
--      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
--      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
-+    "is-extglob": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-+      "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-       "dev": true
-     },
--    "progress": {
--      "version": "2.0.0",
--      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz",
--      "integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=",
-+    "is-file": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/is-file/-/is-file-1.0.0.tgz",
-+      "integrity": "sha1-KKRM+9nT2xkwRfIrZfzo7fliBZY=",
-       "dev": true
-     },
--    "progress-stream": {
--      "version": "1.2.0",
--      "resolved": "https://registry.npmjs.org/progress-stream/-/progress-stream-1.2.0.tgz",
--      "integrity": "sha1-LNPP6jO6OonJwSHsM0er6asSX3c=",
-+    "is-finite": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
-+      "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
-       "dev": true,
-       "requires": {
--        "speedometer": "0.1.4",
--        "through2": "0.2.3"
--      },
--      "dependencies": {
--        "through2": {
--          "version": "0.2.3",
--          "resolved": "https://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
--          "integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=",
--          "dev": true,
--          "requires": {
--            "readable-stream": "1.1.14",
--            "xtend": "2.1.2"
--          }
--        },
--        "xtend": {
--          "version": "2.1.2",
--          "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
--          "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
--          "dev": true,
--          "requires": {
--            "object-keys": "0.4.0"
--          }
--        }
-+        "number-is-nan": "1.0.1"
-       }
-     },
--    "pseudomap": {
--      "version": "1.0.2",
--      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
--      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
--      "dev": true
--    },
--    "public-encrypt": {
--      "version": "4.0.2",
--      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz",
--      "integrity": "sha512-4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==",
-+    "is-fullwidth-code-point": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-+      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-       "dev": true,
-       "requires": {
--        "bn.js": "4.11.8",
--        "browserify-rsa": "4.0.1",
--        "create-hash": "1.2.0",
--        "parse-asn1": "5.1.1",
--        "randombytes": "2.0.6"
-+        "number-is-nan": "1.0.1"
-       }
-     },
--    "pump": {
-+    "is-glob": {
-       "version": "2.0.1",
--      "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
--      "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-+      "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-       "dev": true,
-       "requires": {
--        "end-of-stream": "1.4.1",
--        "once": "1.4.0"
-+        "is-extglob": "1.0.0"
-       }
-     },
--    "pumpify": {
--      "version": "1.5.0",
--      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.0.tgz",
--      "integrity": "sha512-UWi0klDoq8xtVzlMRgENV9F7iCTZExaJQSQL187UXsxpk9NnrKGqTqqUNYAKGOzucSOxs2+jUnRNI+rLviPhJg==",
-+    "is-gzip": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/is-gzip/-/is-gzip-1.0.0.tgz",
-+      "integrity": "sha1-bKiwe5nHeZgCWQDlVc7Y7YCHmoM=",
-+      "dev": true
-+    },
-+    "is-installed-globally": {
-+      "version": "0.1.0",
-+      "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz",
-+      "integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=",
-       "dev": true,
-       "requires": {
--        "duplexify": "3.6.0",
--        "inherits": "2.0.3",
--        "pump": "2.0.1"
-+        "global-dirs": "0.1.1",
-+        "is-path-inside": "1.0.1"
-       }
-     },
--    "punycode": {
--      "version": "1.4.1",
--      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
--      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-+    "is-my-ip-valid": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz",
-+      "integrity": "sha512-gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ==",
-       "dev": true
-     },
--    "q": {
--      "version": "1.5.1",
--      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
--      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
--      "dev": true
-+    "is-my-json-valid": {
-+      "version": "2.17.2",
-+      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz",
-+      "integrity": "sha512-IBhBslgngMQN8DDSppmgDv7RNrlFotuuDsKcrCP3+HbFaVivIBU7u9oiiErw8sH4ynx3+gOGQ3q2otkgiSi6kg==",
-+      "dev": true,
-+      "requires": {
-+        "generate-function": "2.0.0",
-+        "generate-object-property": "1.2.0",
-+        "is-my-ip-valid": "1.0.0",
-+        "jsonpointer": "4.0.1",
-+        "xtend": "4.0.1"
-+      }
-     },
--    "qs": {
--      "version": "6.5.2",
--      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
--      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-+    "is-npm": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz",
-+      "integrity": "sha1-8vtjpl5JBbQGyGBydloaTceTufQ=",
-       "dev": true
-     },
--    "querystring": {
--      "version": "0.2.0",
--      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
--      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
--      "dev": true
-+    "is-number": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-+      "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
-+      "dev": true,
-+      "requires": {
-+        "kind-of": "3.2.2"
-+      }
-     },
--    "querystring-es3": {
--      "version": "0.2.1",
--      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
--      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
-+    "is-obj": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-+      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
-       "dev": true
-     },
--    "quick-lru": {
--      "version": "1.1.0",
--      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz",
--      "integrity": "sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=",
-+    "is-path-cwd": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
-+      "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
-       "dev": true
-     },
--    "randomatic": {
--      "version": "3.0.0",
--      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.0.0.tgz",
--      "integrity": "sha512-VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA==",
-+    "is-path-in-cwd": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz",
-+      "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=",
-       "dev": true,
-       "requires": {
--        "is-number": "4.0.0",
--        "kind-of": "6.0.2",
--        "math-random": "1.0.1"
--      },
--      "dependencies": {
--        "is-number": {
--          "version": "4.0.0",
--          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
--          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
--          "dev": true
--        },
--        "kind-of": {
--          "version": "6.0.2",
--          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
--          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
--          "dev": true
--        }
-+        "is-path-inside": "1.0.1"
-       }
-     },
--    "randombytes": {
--      "version": "2.0.6",
--      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz",
--      "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
-+    "is-path-inside": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
-+      "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
-       "dev": true,
-       "requires": {
--        "safe-buffer": "5.1.2"
-+        "path-is-inside": "1.0.2"
-       }
-     },
--    "randomfill": {
-+    "is-plain-obj": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
-+      "dev": true
-+    },
-+    "is-posix-bracket": {
-+      "version": "0.1.1",
-+      "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
-+      "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
-+      "dev": true
-+    },
-+    "is-primitive": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
-+      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
-+      "dev": true
-+    },
-+    "is-property": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
-+      "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=",
-+      "dev": true
-+    },
-+    "is-redirect": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
-+      "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
-+      "dev": true
-+    },
-+    "is-regex": {
-       "version": "1.0.4",
--      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
--      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
-+      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
-       "dev": true,
-       "requires": {
--        "randombytes": "2.0.6",
--        "safe-buffer": "5.1.2"
-+        "has": "1.0.1"
-       }
-     },
--    "range-parser": {
--      "version": "1.2.0",
--      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
--      "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=",
-+    "is-resolvable": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-+      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
-       "dev": true
-     },
--    "raw-body": {
--      "version": "2.3.2",
--      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz",
--      "integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=",
--      "dev": true,
--      "requires": {
--        "bytes": "3.0.0",
--        "http-errors": "1.6.2",
--        "iconv-lite": "0.4.19",
--        "unpipe": "1.0.0"
--      }
-+    "is-retry-allowed": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
-+      "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=",
-+      "dev": true
-     },
--    "rc": {
--      "version": "1.2.7",
--      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.7.tgz",
--      "integrity": "sha512-LdLD8xD4zzLsAT5xyushXDNscEjB7+2ulnl8+r1pnESlYtlJtVSoCMBGr30eDRJ3+2Gq89jK9P9e4tCEH1+ywA==",
-+    "is-stream": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
-+      "dev": true
-+    },
-+    "is-subset": {
-+      "version": "0.1.1",
-+      "resolved": "https://registry.npmjs.org/is-subset/-/is-subset-0.1.1.tgz",
-+      "integrity": "sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY=",
-+      "dev": true
-+    },
-+    "is-symbol": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz",
-+      "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=",
-+      "dev": true
-+    },
-+    "is-text-path": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz",
-+      "integrity": "sha1-Thqg+1G/vLPpJogAE5cgLBd1tm4=",
-       "dev": true,
-       "requires": {
--        "deep-extend": "0.5.1",
--        "ini": "1.3.5",
--        "minimist": "1.2.0",
--        "strip-json-comments": "2.0.1"
-+        "text-extensions": "1.7.0"
-       }
-     },
--    "read-only-stream": {
-+    "is-typedarray": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-+      "dev": true
-+    },
-+    "is-utf8": {
-+      "version": "0.2.1",
-+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-+      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
-+      "dev": true
-+    },
-+    "isarray": {
-+      "version": "0.0.1",
-+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-+      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-+      "dev": true
-+    },
-+    "isexe": {
-       "version": "2.0.0",
--      "resolved": "https://registry.npmjs.org/read-only-stream/-/read-only-stream-2.0.0.tgz",
--      "integrity": "sha1-JyT9aoET1zdkrCiNQ4YnDB2/F/A=",
-+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-+      "dev": true
-+    },
-+    "isobject": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-+      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-       "dev": true,
-       "requires": {
--        "readable-stream": "2.3.6"
-+        "isarray": "1.0.0"
-       },
-       "dependencies": {
-         "isarray": {
-           "version": "1.0.0",
-           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-+>>>>>>> .their
-           "dev": true
--        },
--        "readable-stream": {
--          "version": "2.3.6",
--          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
--          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
--          "dev": true,
--          "requires": {
--            "core-util-is": "1.0.2",
--            "inherits": "2.0.3",
--            "isarray": "1.0.0",
--            "process-nextick-args": "2.0.0",
--            "safe-buffer": "5.1.2",
--            "string_decoder": "1.1.1",
--            "util-deprecate": "1.0.2"
--          }
--        },
--        "string_decoder": {
--          "version": "1.1.1",
--          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
--          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
--          "dev": true,
--          "requires": {
--            "safe-buffer": "5.1.2"
--          }
-         }
-       }
-     },
--    "read-pkg": {
--      "version": "1.1.0",
--      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
--      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-+<<<<<<< .our
-+    "mkpath": {
-+      "version": "0.1.0",
-+      "resolved": "https://registry.npmjs.org/mkpath/-/mkpath-0.1.0.tgz",
-+      "integrity": "sha1-dVSm+Nhxg0zJe1RisSLEwSTW3pE=",
-+      "dev": true
-+    },
-+    "mksnapshot": {
-+      "version": "0.3.1",
-+      "resolved": "https://registry.npmjs.org/mksnapshot/-/mksnapshot-0.3.1.tgz",
-+      "integrity": "sha1-JQHAVldDbXQs6Vik/5LHfkDdN+Y=",
-       "dev": true,
-       "requires": {
--        "load-json-file": "1.1.0",
--        "normalize-package-data": "2.4.0",
--        "path-type": "1.1.0"
-+        "decompress-zip": "0.3.0",
-+        "fs-extra": "0.26.7",
-+        "request": "2.85.0"
-       }
-     },
--    "read-pkg-up": {
-+    "modify-values": {
-       "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
--      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
--      "dev": true,
--      "requires": {
--        "find-up": "1.1.2",
--        "read-pkg": "1.1.0"
--      }
-+      "resolved": "https://registry.npmjs.org/modify-values/-/modify-values-1.0.1.tgz",
-+      "integrity": "sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==",
-+      "dev": true
-     },
--    "readable-stream": {
--      "version": "1.1.14",
--      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
--      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-+    "module-deps": {
-+      "version": "4.1.1",
-+      "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-4.1.1.tgz",
-+      "integrity": "sha1-IyFYM/HaE/1gbMuAh7RIUty4If0=",
-       "dev": true,
-       "requires": {
--        "core-util-is": "1.0.2",
-+        "JSONStream": "1.3.2",
-+        "browser-resolve": "1.11.2",
-+        "cached-path-relative": "1.0.1",
-+        "concat-stream": "1.5.2",
-+        "defined": "1.0.0",
-+        "detective": "4.7.1",
-+        "duplexer2": "0.1.4",
-         "inherits": "2.0.3",
--        "isarray": "0.0.1",
--        "string_decoder": "0.10.31"
--      }
--    },
--    "readdirp": {
--      "version": "2.1.0",
--      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz",
--      "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
--      "dev": true,
--      "requires": {
--        "graceful-fs": "4.1.11",
--        "minimatch": "3.0.4",
-+        "parents": "1.0.1",
-         "readable-stream": "2.3.6",
--        "set-immediate-shim": "1.0.1"
-+        "resolve": "1.7.1",
-+        "stream-combiner2": "1.1.1",
-+        "subarg": "1.0.0",
-+        "through2": "2.0.3",
-+        "xtend": "4.0.1"
-       },
-       "dependencies": {
-         "isarray": {
-@@ -7214,717 +7940,3764 @@
-         }
-       }
-     },
--    "readline2": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz",
--      "integrity": "sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU=",
--      "dev": true,
--      "requires": {
--        "code-point-at": "1.1.0",
--        "is-fullwidth-code-point": "1.0.0",
--        "mute-stream": "0.0.5"
--      }
-+    "mri": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/mri/-/mri-1.1.0.tgz",
-+      "integrity": "sha1-XAo/KcjM/7ux7JQdzsCdcfoy82o=",
-+      "dev": true
-     },
--    "rechoir": {
--      "version": "0.6.2",
--      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
--      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
--      "dev": true,
--      "requires": {
--        "resolve": "1.7.1"
--      }
--    },
--    "redent": {
-+    "ms": {
-       "version": "2.0.0",
--      "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz",
--      "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=",
-+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-+      "dev": true
-+    },
-+    "mute-stream": {
-+      "version": "0.0.5",
-+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz",
-+      "integrity": "sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA=",
-+      "dev": true
-+    },
-+    "nan": {
-+      "version": "2.10.0",
-+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
-+      "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==",
-       "dev": true,
--      "requires": {
--        "indent-string": "3.2.0",
--        "strip-indent": "2.0.0"
--      }
-+      "optional": true
-     },
--    "regex-cache": {
--      "version": "0.4.4",
--      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
--      "integrity": "sha1-db3FiioUls7EihKDW8VMjVYjNt0=",
-+    "natural-compare": {
-+      "version": "1.4.0",
-+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-+      "dev": true
-+    },
-+    "negotiator": {
-+      "version": "0.6.1",
-+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
-+      "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=",
-+      "dev": true
-+    },
-+    "netrc": {
-+      "version": "0.1.4",
-+      "resolved": "https://registry.npmjs.org/netrc/-/netrc-0.1.4.tgz",
-+      "integrity": "sha1-a+lPysqNd63gqWcNxGCRTJRHJEQ=",
-+      "dev": true
-+    },
-+    "next-tick": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
-+      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
-+      "dev": true
-+    },
-+    "node-dir": {
-+      "version": "0.1.17",
-+      "resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz",
-+      "integrity": "sha1-X1Zl2TNRM1yqvvjxxVRRbPXx5OU=",
-       "dev": true,
-       "requires": {
--        "is-equal-shallow": "0.1.3"
-+        "minimatch": "3.0.4"
-       }
-     },
--    "registry-auth-token": {
--      "version": "3.3.2",
--      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz",
--      "integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==",
-+    "node-fetch": {
-+      "version": "2.1.2",
-+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.1.2.tgz",
-+      "integrity": "sha1-q4hOjn5X44qUR1POxwb3iNF2i7U=",
-+      "dev": true
-+    },
-+    "node-version": {
-+      "version": "1.1.3",
-+      "resolved": "https://registry.npmjs.org/node-version/-/node-version-1.1.3.tgz",
-+      "integrity": "sha512-rEwE51JWn0yN3Wl5BXeGn5d52OGbSXzWiiXRjAQeuyvcGKyvuSILW2rb3G7Xh+nexzLwhTpek6Ehxd6IjvHePg==",
-+      "dev": true
-+    },
-+    "nopt": {
-+      "version": "3.0.6",
-+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-+      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-       "dev": true,
-       "requires": {
--        "rc": "1.2.7",
--        "safe-buffer": "5.1.2"
-+        "abbrev": "1.1.1"
-       }
-     },
--    "registry-url": {
--      "version": "3.1.0",
--      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz",
--      "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=",
-+    "normalize-package-data": {
-+      "version": "2.4.0",
-+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-+      "integrity": "sha1-EvlaMH1YNSB1oEkHuErIvpisAS8=",
-       "dev": true,
-       "requires": {
--        "rc": "1.2.7"
-+        "hosted-git-info": "2.6.0",
-+        "is-builtin-module": "1.0.0",
-+        "semver": "5.5.0",
-+        "validate-npm-package-license": "3.0.3"
-       }
-     },
--    "remark": {
--      "version": "8.0.0",
--      "resolved": "https://registry.npmjs.org/remark/-/remark-8.0.0.tgz",
--      "integrity": "sha512-K0PTsaZvJlXTl9DN6qYlvjTkqSZBFELhROZMrblm2rB+085flN84nz4g/BscKRMqDvhzlK1oQ/xnWQumdeNZYw==",
-+    "normalize-path": {
-+      "version": "2.1.1",
-+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-+      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-       "dev": true,
-       "requires": {
--        "remark-parse": "4.0.0",
--        "remark-stringify": "4.0.0",
--        "unified": "6.2.0"
-+        "remove-trailing-separator": "1.1.0"
-       }
-     },
--    "remark-cli": {
--      "version": "4.0.0",
--      "resolved": "https://registry.npmjs.org/remark-cli/-/remark-cli-4.0.0.tgz",
--      "integrity": "sha512-q5GMjGypUS4rTZb3WfMQcGpClSC38A9Ogg1h/HB2GLsqypDetmAfy0X+tuJ6JeyCPVOXXCDgsDCQq4QPqKmxBA==",
-+    "npm-prefix": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/npm-prefix/-/npm-prefix-1.2.0.tgz",
-+      "integrity": "sha1-5hlFX3B0ulTMZtbQ033Z8b5ry8A=",
-       "dev": true,
-       "requires": {
--        "markdown-extensions": "1.1.1",
--        "remark": "8.0.0",
--        "unified-args": "4.0.0"
-+        "rc": "1.2.7",
-+        "shellsubstitute": "1.2.0",
-+        "untildify": "2.1.0"
-       }
-     },
--    "remark-lint": {
--      "version": "6.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint/-/remark-lint-6.0.1.tgz",
--      "integrity": "sha512-wvTTuB5O5pF8SxqahQjjrU3dtuhygYjaGcOZTw+4ACgSE4RBINDlNqN46HjcV3X0ib5GmObJUt5a2mmhtmuTqw==",
-+    "npm-run-path": {
-+      "version": "2.0.2",
-+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-       "dev": true,
-       "requires": {
--        "remark-message-control": "4.1.0"
-+        "path-key": "2.0.1"
-       }
-     },
--    "remark-lint-blockquote-indentation": {
-+    "nth-check": {
-       "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-blockquote-indentation/-/remark-lint-blockquote-indentation-1.0.1.tgz",
--      "integrity": "sha512-YrP99MJ3+dQ5JXzq39fUOcYzwcumva/xEM1eFtD2TrQcSdlMLoqYa7gj+aEEhZCjlA5BssTiVoWWW0RjyPPGZw==",
-+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz",
-+      "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=",
-       "dev": true,
-       "requires": {
--        "mdast-util-to-string": "1.0.4",
--        "plur": "2.1.2",
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "boolbase": "1.0.0"
-       }
-     },
--    "remark-lint-code-block-style": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-code-block-style/-/remark-lint-code-block-style-1.0.1.tgz",
--      "integrity": "sha512-FRUMhhKwCruH4vkatdMhVO4WlYpysV1NmMILVoK/k+/7uFLSfgvlqo66nzhpMdWL8TQHqdo0LhiXuetGC2WjsQ==",
-+    "nugget": {
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/nugget/-/nugget-2.0.1.tgz",
-+      "integrity": "sha1-IBCVpIfhrTYIGzQy+jytpPjQcbA=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "debug": "2.6.9",
-+        "minimist": "1.2.0",
-+        "pretty-bytes": "1.0.4",
-+        "progress-stream": "1.2.0",
-+        "request": "2.85.0",
-+        "single-line-log": "1.1.2",
-+        "throttleit": "0.0.2"
-       }
-     },
--    "remark-lint-definition-case": {
-+    "number-is-nan": {
-       "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-definition-case/-/remark-lint-definition-case-1.0.1.tgz",
--      "integrity": "sha512-TxLye5KF4o/rKVTvmPRX5jS9itamFS02yy1IG8bIYcIAJvWsW3GlJaXq4ohK3hKwSQOhtCherEfD6XF9BHLNYQ==",
-+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-+      "dev": true
-+    },
-+    "nwmatcher": {
-+      "version": "1.4.4",
-+      "resolved": "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.4.tgz",
-+      "integrity": "sha512-3iuY4N5dhgMpCUrOVnuAdGrgxVqV2cJpM+XNccjR2DKOB1RUP0aA+wGXEiNziG/UKboFyGBIoKOaNlJxx8bciQ==",
-       "dev": true,
--      "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
--      }
-+      "optional": true
-     },
--    "remark-lint-definition-spacing": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-definition-spacing/-/remark-lint-definition-spacing-1.0.1.tgz",
--      "integrity": "sha512-ewzdlFfpTSP11ZuiOln0yfz6Y03aWtgJmLVQNfF1spaT1gURaShjs8Hiilbo719bz96DgvXSZLP6UnkSiZL1vg==",
-+    "oauth-sign": {
-+      "version": "0.8.2",
-+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-+      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
-+      "dev": true
-+    },
-+    "object-assign": {
-+      "version": "4.1.1",
-+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-+      "dev": true
-+    },
-+    "object-keys": {
-+      "version": "0.4.0",
-+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
-+      "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=",
-+      "dev": true
-+    },
-+    "object.assign": {
-+      "version": "4.1.0",
-+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
-+      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "define-properties": "1.1.2",
-+        "function-bind": "1.1.1",
-+        "has-symbols": "1.0.0",
-+        "object-keys": "1.0.11"
-+      },
-+      "dependencies": {
-+        "object-keys": {
-+          "version": "1.0.11",
-+          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
-+          "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=",
-+          "dev": true
-+        }
-       }
-     },
--    "remark-lint-emphasis-marker": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-emphasis-marker/-/remark-lint-emphasis-marker-1.0.1.tgz",
--      "integrity": "sha512-QyNsD6y8EZQqhechw0XFGybYMlxn6PFLSlFUO50KSQlJEOgkImN2yJfrNrET2GY4t/fc/uYmeI/q7auUIkLX2w==",
-+    "object.omit": {
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
-+      "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "for-own": "0.1.5",
-+        "is-extendable": "0.1.1"
-       }
-     },
--    "remark-lint-fenced-code-flag": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-fenced-code-flag/-/remark-lint-fenced-code-flag-1.0.1.tgz",
--      "integrity": "sha512-P24T9DRe/nnywPFRpE1UAXAVzN1CX6HmINr15UHbQZo1Cy8KYt7uV9YOR0/XzphtnO/AFenAqZyf7tchW5AUNQ==",
-+    "octicons": {
-+      "version": "7.3.0",
-+      "resolved": "https://registry.npmjs.org/octicons/-/octicons-7.3.0.tgz",
-+      "integrity": "sha512-UVjlkmUL15Ef/7Rd72Io634Bdl61QgSMasAZpvXPoR2XNFj1RelAyhl4QJuR1hBGlPWFDR7KFj2jEzsFax2IUg==",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "object-assign": "4.1.1"
-       }
-     },
--    "remark-lint-fenced-code-marker": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-fenced-code-marker/-/remark-lint-fenced-code-marker-1.0.1.tgz",
--      "integrity": "sha512-mX7xAMl5m7xGX+YtOtyXIyv+egD4IQAm6DPGdfunI734QwODwcoBydtpTD56jrY+48nVcQ/anFYT1Blg3Xk3sQ==",
-+    "on-finished": {
-+      "version": "2.3.0",
-+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-+      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "ee-first": "1.1.1"
-       }
-     },
--    "remark-lint-file-extension": {
-+    "on-headers": {
-       "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-file-extension/-/remark-lint-file-extension-1.0.1.tgz",
--      "integrity": "sha512-K1Pf5oviaFyCs0FhZqaNZ2odgd5KoV6AlA4nNAMxyylB0Y6t0mYpzECoLSS5Bgxf6f8Op9YbuM2cbjBAsv0dIA==",
-+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz",
-+      "integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=",
-+      "dev": true
-+    },
-+    "once": {
-+      "version": "1.4.0",
-+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2"
-+        "wrappy": "1.0.2"
-       }
-     },
--    "remark-lint-final-definition": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-final-definition/-/remark-lint-final-definition-1.0.1.tgz",
--      "integrity": "sha512-DK6bphJdQ0xSOQAn+8wOyLIVc3SZW2+ZzCMCLkQnVtHiQ9GHMzFiCkeE3Cq+OClsMI5Yn8wFTHZHPUn58VhNEQ==",
-+    "onetime": {
-+      "version": "1.1.0",
-+      "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
-+      "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
-+      "dev": true
-+    },
-+    "openssl-self-signed-certificate": {
-+      "version": "1.1.6",
-+      "resolved": "https://registry.npmjs.org/openssl-self-signed-certificate/-/openssl-self-signed-certificate-1.1.6.tgz",
-+      "integrity": "sha1-nTpHdrGlfphHNQOSEUrS+RWoPdQ=",
-+      "dev": true
-+    },
-+    "opn": {
-+      "version": "5.3.0",
-+      "resolved": "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz",
-+      "integrity": "sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "is-wsl": "1.1.0"
-       }
-     },
--    "remark-lint-hard-break-spaces": {
--      "version": "1.0.2",
--      "resolved": "https://registry.npmjs.org/remark-lint-hard-break-spaces/-/remark-lint-hard-break-spaces-1.0.2.tgz",
--      "integrity": "sha512-uh7LqHgRPCphiCvRzBVA4D0Ml2IqPaw89lWJdQ6HvYiV8ChB/OFLBapHi6OKW7NVVVPPJsElPMB/UPUsKFaPTg==",
-+    "optimist": {
-+      "version": "0.3.7",
-+      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
-+      "integrity": "sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "wordwrap": "0.0.3"
-       }
-     },
--    "remark-lint-heading-increment": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-heading-increment/-/remark-lint-heading-increment-1.0.1.tgz",
--      "integrity": "sha512-jBAJacXAU5drUpvmymOoFmrdCCNDiz8bzGgJIMjpT0Vyjd0+qdXu2iyFMl/4RkkUli25rpUDXkTHTcxmNbh7Zw==",
-+    "optionator": {
-+      "version": "0.8.2",
-+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
-+      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-visit": "1.3.1"
-+        "deep-is": "0.1.3",
-+        "fast-levenshtein": "2.0.6",
-+        "levn": "0.3.0",
-+        "prelude-ls": "1.1.2",
-+        "type-check": "0.3.2",
-+        "wordwrap": "1.0.0"
-+      },
-+      "dependencies": {
-+        "wordwrap": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-+          "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
-+          "dev": true
-+        }
-       }
-     },
--    "remark-lint-heading-style": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-heading-style/-/remark-lint-heading-style-1.0.1.tgz",
--      "integrity": "sha512-m9Gqr091YdxUtG69xdXYH8fSd3+nsrsMamB/qSWpVSZuWQKZ1mRotr1LO9NphJh6vhw8IfBtG07wgEDn6b40sQ==",
-+    "ora": {
-+      "version": "0.3.0",
-+      "resolved": "https://registry.npmjs.org/ora/-/ora-0.3.0.tgz",
-+      "integrity": "sha1-NnoHitJc+wltpQERXrW0AeB9dJU=",
-       "dev": true,
-       "requires": {
--        "mdast-util-heading-style": "1.0.3",
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-visit": "1.3.1"
--      }
-+        "chalk": "1.1.3",
-+        "cli-cursor": "1.0.2",
-+        "cli-spinners": "0.2.0",
-+        "log-symbols": "1.0.2"
-+      },
-+      "dependencies": {
-+        "cli-spinners": {
-+          "version": "0.2.0",
-+          "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-0.2.0.tgz",
-+          "integrity": "sha1-hQeHN5E7iA9uyf/ntl6D7Hd2KE8=",
-+=======
-+    "isstream": {
-+      "version": "0.1.2",
-+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-+      "dev": true
-     },
--    "remark-lint-link-title-style": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-link-title-style/-/remark-lint-link-title-style-1.0.1.tgz",
--      "integrity": "sha512-91MyqmZjokSzRbgvlKq5sLCJEFkM/MNKT1PDaWa3+GDLBGu7D4eMQGd2x49xX8IdJDEoWy5D8W+2Gb8XKWMUyw==",
-+    "istanbul": {
-+      "version": "0.4.5",
-+      "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz",
-+      "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1",
--        "vfile-location": "2.0.3"
-+        "abbrev": "1.0.9",
-+        "async": "1.5.2",
-+        "escodegen": "1.8.1",
-+        "esprima": "2.7.3",
-+        "glob": "5.0.15",
-+        "handlebars": "4.0.11",
-+        "js-yaml": "3.11.0",
-+        "mkdirp": "0.5.1",
-+        "nopt": "3.0.6",
-+        "once": "1.4.0",
-+        "resolve": "1.1.7",
-+        "supports-color": "3.2.3",
-+        "which": "1.3.0",
-+        "wordwrap": "1.0.0"
-+      },
-+      "dependencies": {
-+        "abbrev": {
-+          "version": "1.0.9",
-+          "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
-+          "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=",
-+          "dev": true
-+        },
-+        "glob": {
-+          "version": "5.0.15",
-+          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-+          "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-+          "dev": true,
-+          "requires": {
-+            "inflight": "1.0.6",
-+            "inherits": "2.0.3",
-+            "minimatch": "3.0.4",
-+            "once": "1.4.0",
-+            "path-is-absolute": "1.0.1"
-+          }
-+        },
-+        "resolve": {
-+          "version": "1.1.7",
-+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-+          "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
-+          "dev": true
-+        },
-+        "wordwrap": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-+          "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
-+          "dev": true
-+        }
-       }
-     },
--    "remark-lint-list-item-content-indent": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-list-item-content-indent/-/remark-lint-list-item-content-indent-1.0.1.tgz",
--      "integrity": "sha512-R5cdXFFywoBcg+2UUcF9OJ/vt9oqJv+KmTKIQV9CFHWeAfMFiZbxazsSPNaCcO1fW9622hxPCawN/AofDTbP7Q==",
-+    "js-tokens": {
-+      "version": "3.0.2",
-+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-+      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
-+      "dev": true
-+    },
-+    "js-yaml": {
-+      "version": "3.11.0",
-+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz",
-+      "integrity": "sha512-saJstZWv7oNeOyBh3+Dx1qWzhW0+e6/8eDzo7p5rDFqxntSztloLtuKu+Ejhtq82jsilwOIZYsCz+lIjthg1Hw==",
-       "dev": true,
-       "requires": {
--        "plur": "2.1.2",
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "argparse": "1.0.10",
-+        "esprima": "4.0.0"
-+      },
-+      "dependencies": {
-+        "esprima": {
-+          "version": "4.0.0",
-+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
-+          "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==",
-+          "dev": true
-+        }
-       }
-     },
--    "remark-lint-list-item-indent": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-list-item-indent/-/remark-lint-list-item-indent-1.0.1.tgz",
--      "integrity": "sha512-dSUFGQYtduuaos+5oXH89RTk0rGUe6DFf04q+rxQ7Z3YRbuXhAU2nYeY0/HENYiWJU1xFLteZkDvKMj0NfS3DQ==",
-+    "jsbn": {
-+      "version": "0.1.1",
-+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-       "dev": true,
--      "requires": {
--        "plur": "2.1.2",
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
--      }
-+      "optional": true
-     },
--    "remark-lint-list-item-spacing": {
--      "version": "1.1.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-list-item-spacing/-/remark-lint-list-item-spacing-1.1.1.tgz",
--      "integrity": "sha512-HlPEzRq4LJB6tQ72zgIZ42mOaOSX92O268BLolys/H1x6N29/JNMLfurWqLsrxZrxxHH3H7EUP4dNM2P1kDGBw==",
-+    "jsdom": {
-+      "version": "7.2.2",
-+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-7.2.2.tgz",
-+      "integrity": "sha1-QLQCdwwr2iNGkJa+6Rq2deOx/G4=",
-       "dev": true,
-+      "optional": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "abab": "1.0.4",
-+        "acorn": "2.7.0",
-+        "acorn-globals": "1.0.9",
-+        "cssom": "0.3.2",
-+        "cssstyle": "0.2.37",
-+        "escodegen": "1.8.1",
-+        "nwmatcher": "1.4.3",
-+        "parse5": "1.5.1",
-+        "request": "2.85.0",
-+        "sax": "1.2.4",
-+        "symbol-tree": "3.2.2",
-+        "tough-cookie": "2.3.4",
-+        "webidl-conversions": "2.0.1",
-+        "whatwg-url-compat": "0.6.5",
-+        "xml-name-validator": "2.0.1"
-+      },
-+      "dependencies": {
-+        "acorn": {
-+          "version": "2.7.0",
-+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz",
-+          "integrity": "sha1-q259nYhqrKiwhbwzEreaGYQz8Oc=",
-+          "dev": true,
-+          "optional": true
-+        }
-       }
-     },
--    "remark-lint-maximum-heading-length": {
-+    "json-parse-better-errors": {
-       "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-maximum-heading-length/-/remark-lint-maximum-heading-length-1.0.1.tgz",
--      "integrity": "sha512-f8ChV9U238gncyvTqmzJ+UpCMj+hFyluWBjVYr2K8CNh+MdSivIxS4zw4170sBRoqNuS3gBxRHG9f4rmdqotJA==",
-+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz",
-+      "integrity": "sha512-xyQpxeWWMKyJps9CuGJYeng6ssI5bpqS9ltQpdVQ90t4ql6NdnxFKh95JcRt2cun/DjMVNrdjniLPuMA69xmCw==",
-+      "dev": true
-+    },
-+    "json-schema": {
-+      "version": "0.2.3",
-+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-+      "dev": true
-+    },
-+    "json-schema-traverse": {
-+      "version": "0.3.1",
-+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-+      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
-+      "dev": true
-+    },
-+    "json-stable-stringify": {
-+      "version": "0.0.1",
-+      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz",
-+      "integrity": "sha1-YRwj6BTbN1Un34URk9tZ3Sryf0U=",
-       "dev": true,
-       "requires": {
--        "mdast-util-to-string": "1.0.4",
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-visit": "1.3.1"
-+        "jsonify": "0.0.0"
-       }
-     },
--    "remark-lint-maximum-line-length": {
--      "version": "1.0.2",
--      "resolved": "https://registry.npmjs.org/remark-lint-maximum-line-length/-/remark-lint-maximum-line-length-1.0.2.tgz",
--      "integrity": "sha512-M4UIXAAbtLgoQbTDVwdKOEFbTKtJSZ+pCW7ZqMFs+cbIN0Svm32LM9+xpVfVU0hLYt3Ypl++EAPfguBNe1PZEw==",
-+    "json-stringify-safe": {
-+      "version": "5.0.1",
-+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-+      "dev": true
-+    },
-+    "jsonfile": {
-+      "version": "2.4.0",
-+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
-+      "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "graceful-fs": "4.1.11"
-       }
-     },
--    "remark-lint-no-auto-link-without-protocol": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-no-auto-link-without-protocol/-/remark-lint-no-auto-link-without-protocol-1.0.1.tgz",
--      "integrity": "sha512-MHl0hNtF8Rc0lg6iuVP7/0rnp4uZadm3S07/1TiFeqzU22KFxxzcC8980Q4+I8oPZE0d1x80h9DmkNAVFwhDjQ==",
-+    "jsonify": {
-+      "version": "0.0.0",
-+      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-+      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
-+      "dev": true
-+    },
-+    "jsonparse": {
-+      "version": "1.3.1",
-+      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
-+      "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
-+      "dev": true
-+    },
-+    "jsonpointer": {
-+      "version": "4.0.1",
-+      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
-+      "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",
-+      "dev": true
-+    },
-+    "jsprim": {
-+      "version": "1.4.1",
-+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-       "dev": true,
-       "requires": {
--        "mdast-util-to-string": "1.0.4",
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "assert-plus": "1.0.0",
-+        "extsprintf": "1.3.0",
-+        "json-schema": "0.2.3",
-+        "verror": "1.10.0"
-       }
-     },
--    "remark-lint-no-blockquote-without-marker": {
--      "version": "2.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-no-blockquote-without-marker/-/remark-lint-no-blockquote-without-marker-2.0.1.tgz",
--      "integrity": "sha512-8VTQ/MP3flvG4U0tFSD+DMVT7F/4u9SnQLb/jjeRC3DzgbsIagIUqpWYAKkc+yBz9S/lgftA92lLP5PrlOa5DA==",
-+    "jsx-ast-utils": {
-+      "version": "1.4.1",
-+      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz",
-+      "integrity": "sha1-OGchPo3Xm/Ho8jAMDPwe+xgsDfE=",
-+      "dev": true
-+    },
-+    "keyed-array": {
-+      "version": "2.1.2",
-+      "resolved": "https://registry.npmjs.org/keyed-array/-/keyed-array-2.1.2.tgz",
-+      "integrity": "sha1-isE3thMi7V7Rx7Qbn5zQZmMcrOA=",
-+      "dev": true
-+    },
-+    "kind-of": {
-+      "version": "3.2.2",
-+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1",
--        "vfile-location": "2.0.3"
-+        "is-buffer": "1.1.6"
-       }
-     },
--    "remark-lint-no-consecutive-blank-lines": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-no-consecutive-blank-lines/-/remark-lint-no-consecutive-blank-lines-1.0.1.tgz",
--      "integrity": "sha512-IhyUiGTpb/hjtusIVg10q963KeL5CyNfbWOfDZ1KtY2tvdoSPRGrrCuTKo6OG8r1qavM6bU0mtRuIBqNh4lIzA==",
-+    "klaw": {
-+      "version": "1.3.1",
-+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
-+      "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
-       "dev": true,
-       "requires": {
--        "plur": "2.1.2",
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "graceful-fs": "4.1.11"
-       }
-     },
--    "remark-lint-no-duplicate-headings": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-no-duplicate-headings/-/remark-lint-no-duplicate-headings-1.0.1.tgz",
--      "integrity": "sha512-iZZxyZgwnjvDkydKZzqHBueJvIpGbxnITmgd8xN8TOLZoAg9/KGTQRAkotL1HXNRdkzwggfgB9ONxv/rWtYBmg==",
-+    "labeled-stream-splicer": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.0.tgz",
-+      "integrity": "sha1-pS4dE4AkwAuGscDJH2d5GLiuClk=",
-       "dev": true,
-       "requires": {
--        "mdast-util-to-string": "1.0.4",
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "inherits": "2.0.3",
-+        "isarray": "0.0.1",
-+        "stream-splicer": "2.0.0"
-       }
-     },
--    "remark-lint-no-emphasis-as-heading": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-no-emphasis-as-heading/-/remark-lint-no-emphasis-as-heading-1.0.1.tgz",
--      "integrity": "sha512-+x17Hrjwne4Mhk2x/Zolnuv/sOclF1oYMDBSEYhBUpn/UAwxhXEXYKkeo0KkWA7Q3+UCLELJvzsk4cGNP6Sgow==",
-+    "latest-version": {
-+      "version": "3.1.0",
-+      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz",
-+      "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-visit": "1.3.1"
-+        "package-json": "4.0.1"
-       }
-     },
--    "remark-lint-no-file-name-articles": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-no-file-name-articles/-/remark-lint-no-file-name-articles-1.0.1.tgz",
--      "integrity": "sha512-SzebnFnilrsINA6QZP1YqPa3SrfSotrLkRWl5FUCoVshBvEFNKJFWXj6Xyt4NjWQ5tJWFtOMysAuHdGT+Odhjg==",
-+    "lazy-cache": {
-+      "version": "1.0.4",
-+      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
-+      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
-+      "dev": true,
-+      "optional": true
-+    },
-+    "lcid": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-+      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2"
-+        "invert-kv": "1.0.0"
-       }
-     },
--    "remark-lint-no-file-name-consecutive-dashes": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-no-file-name-consecutive-dashes/-/remark-lint-no-file-name-consecutive-dashes-1.0.1.tgz",
--      "integrity": "sha512-YP2HBwA00yeD7phvxp4ftiqbfBPfYHPgPfcEcb8oNa1WlUh/58cs9DbSHWKsZG+XLkvEaheC6qUQG02jEKZHPA==",
-+    "levn": {
-+      "version": "0.3.0",
-+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2"
-+        "prelude-ls": "1.1.2",
-+        "type-check": "0.3.2"
-       }
-     },
--    "remark-lint-no-file-name-irregular-characters": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-no-file-name-irregular-characters/-/remark-lint-no-file-name-irregular-characters-1.0.1.tgz",
--      "integrity": "sha512-+ks/V6OVMGOPZKw+fe2E4DPvLoslGxvdgtqXq2Nyz0cEdYX8RP45kI79V4w95H7UCJAeOFM9mZzVLvmCY1sEbg==",
-+    "lexical-scope": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.2.0.tgz",
-+      "integrity": "sha1-/Ope3HBKSzqHls3KQZw6CvryLfQ=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2"
-+        "astw": "2.2.0"
-       }
-     },
--    "remark-lint-no-file-name-mixed-case": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-no-file-name-mixed-case/-/remark-lint-no-file-name-mixed-case-1.0.1.tgz",
--      "integrity": "sha512-bcqPsow1C0LrsKII1YehUO7VPOER7nze6FzsZZ8/NP+d200OL7Y7VMCqN1kscAvG+PTJgjznyXuLEpy7KQnVFg==",
-+    "linkify-it": {
-+      "version": "1.2.4",
-+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-1.2.4.tgz",
-+      "integrity": "sha1-B3NSbDF8j9E71TTuHRgP+Iq/iBo=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2"
-+        "uc.micro": "1.0.5"
-       }
-     },
--    "remark-lint-no-file-name-outer-dashes": {
--      "version": "1.0.2",
--      "resolved": "https://registry.npmjs.org/remark-lint-no-file-name-outer-dashes/-/remark-lint-no-file-name-outer-dashes-1.0.2.tgz",
--      "integrity": "sha512-BVEwLrA4kipalgKrxhncpgtmh6eUmHBH1ggC+X3csYR4X5vXv4vHQqpov4I1vMyWxMLMBnq7lTL3Iqp0CS4vwg==",
-+    "load-json-file": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-+      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2"
-+        "graceful-fs": "4.1.11",
-+        "parse-json": "2.2.0",
-+        "pify": "2.3.0",
-+        "pinkie-promise": "2.0.1",
-+        "strip-bom": "2.0.0"
-       }
-     },
--    "remark-lint-no-heading-punctuation": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-no-heading-punctuation/-/remark-lint-no-heading-punctuation-1.0.1.tgz",
--      "integrity": "sha512-/7kGRmPT+JLxEME1Z/rQn99mP8yr4qXFwcniKYsefR1jl8pCZciwCIp2Tq92Nn+FPELVrpk9sloRBb2JP3UB0A==",
-+    "locate-path": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-+      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-       "dev": true,
-       "requires": {
--        "mdast-util-to-string": "1.0.4",
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-visit": "1.3.1"
-+        "p-locate": "2.0.0",
-+        "path-exists": "3.0.0"
-+      },
-+      "dependencies": {
-+        "path-exists": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-+          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-+>>>>>>> .their
-+          "dev": true
-+        }
-       }
-     },
--    "remark-lint-no-inline-padding": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-no-inline-padding/-/remark-lint-no-inline-padding-1.0.1.tgz",
--      "integrity": "sha512-nRl6vA45ZPdMz3/rVMZw7WRRqLFuMrzhdkrbrGLjwBovdIeD/IGCEbDA5NR60g2xT9V5dAmKogvHEH1bIr8SdQ==",
-+<<<<<<< .our
-+    "os-browserify": {
-+      "version": "0.1.2",
-+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz",
-+      "integrity": "sha1-ScoCk+CxlZCl9d4Qx/JlphfY/lQ=",
-+      "dev": true
-+    },
-+    "os-homedir": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-+      "dev": true
-+    },
-+    "os-locale": {
-+      "version": "1.4.0",
-+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-+      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-       "dev": true,
-       "requires": {
--        "mdast-util-to-string": "1.0.4",
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-visit": "1.3.1"
-+        "lcid": "1.0.0"
-       }
-     },
--    "remark-lint-no-literal-urls": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-no-literal-urls/-/remark-lint-no-literal-urls-1.0.1.tgz",
--      "integrity": "sha512-YMsZFVYQDt9gvpc6THL76GzyhCR+cK79vjyEOEmX+O3tOjxQstbi0oW6Lngbl1WbpkCW5TWEzSKOorQowYI2wg==",
-+    "os-tmpdir": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-+      "dev": true
-+    },
-+    "p-finally": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
-+      "dev": true
-+    },
-+    "p-limit": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz",
-+      "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==",
-       "dev": true,
-       "requires": {
--        "mdast-util-to-string": "1.0.4",
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "p-try": "1.0.0"
-       }
-     },
--    "remark-lint-no-multiple-toplevel-headings": {
-+    "p-locate": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-+      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-+      "dev": true,
-+      "requires": {
-+        "p-limit": "1.2.0"
-+      }
-+    },
-+    "p-try": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-+      "dev": true
-+    },
-+    "package-json": {
-+      "version": "4.0.1",
-+      "resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz",
-+      "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=",
-+      "dev": true,
-+      "requires": {
-+        "got": "6.7.1",
-+        "registry-auth-token": "3.3.2",
-+        "registry-url": "3.1.0",
-+        "semver": "5.5.0"
-+      }
-+    },
-+    "pako": {
-+      "version": "0.2.9",
-+      "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
-+      "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=",
-+      "dev": true
-+    },
-+    "parents": {
-       "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-no-multiple-toplevel-headings/-/remark-lint-no-multiple-toplevel-headings-1.0.1.tgz",
--      "integrity": "sha512-LFfgjF3NKFkt0tGNnJ8Exf8+DrVcMRwek5qu5mvh2KrZnmSpm5flYWzUy2UnnIyicDL3CZYC/r3Fjz6CeBYgZA==",
-+      "resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz",
-+      "integrity": "sha1-/t1NK/GTp3dF/nHjcdc8MwfZx1E=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "path-platform": "0.11.15"
-       }
-     },
--    "remark-lint-no-shell-dollars": {
-+    "parse-asn1": {
-+      "version": "5.1.1",
-+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz",
-+      "integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==",
-+      "dev": true,
-+      "requires": {
-+        "asn1.js": "4.10.1",
-+        "browserify-aes": "1.2.0",
-+        "create-hash": "1.2.0",
-+        "evp_bytestokey": "1.0.3",
-+        "pbkdf2": "3.0.16"
-+      }
-+    },
-+    "parse-entities": {
-+      "version": "1.1.2",
-+      "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-1.1.2.tgz",
-+      "integrity": "sha512-5N9lmQ7tmxfXf+hO3X6KRG6w7uYO/HL9fHalSySTdyn63C3WNvTM/1R8tn1u1larNcEbo3Slcy2bsVDQqvEpUg==",
-+      "dev": true,
-+      "requires": {
-+        "character-entities": "1.2.2",
-+        "character-entities-legacy": "1.1.2",
-+        "character-reference-invalid": "1.1.2",
-+        "is-alphanumerical": "1.0.2",
-+        "is-decimal": "1.0.2",
-+        "is-hexadecimal": "1.0.2"
-+      }
-+    },
-+    "parse-github-repo-url": {
-+      "version": "1.4.1",
-+      "resolved": "https://registry.npmjs.org/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz",
-+      "integrity": "sha1-nn2LslKmy2ukJZUGC3v23z28H1A=",
-+      "dev": true
-+    },
-+    "parse-gitignore": {
-+      "version": "0.4.0",
-+      "resolved": "https://registry.npmjs.org/parse-gitignore/-/parse-gitignore-0.4.0.tgz",
-+      "integrity": "sha1-q/cC5LkAUk//eQK2g4YoV7Y/k/4=",
-+      "dev": true,
-+      "requires": {
-+        "array-unique": "0.3.2",
-+        "is-glob": "3.1.0"
-+      },
-+      "dependencies": {
-+        "array-unique": {
-+          "version": "0.3.2",
-+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-+          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-+          "dev": true
-+        },
-+        "is-extglob": {
-+          "version": "2.1.1",
-+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-+          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-+          "dev": true
-+        },
-+        "is-glob": {
-+          "version": "3.1.0",
-+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-+          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-+          "dev": true,
-+          "requires": {
-+            "is-extglob": "2.1.1"
-+          }
-+        }
-+      }
-+    },
-+    "parse-glob": {
-+      "version": "3.0.4",
-+      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
-+      "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
-+      "dev": true,
-+      "requires": {
-+        "glob-base": "0.3.0",
-+        "is-dotfile": "1.0.3",
-+        "is-extglob": "1.0.0",
-+        "is-glob": "2.0.1"
-+      }
-+    },
-+    "parse-json": {
-+      "version": "2.2.0",
-+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-+      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-+      "dev": true,
-+      "requires": {
-+        "error-ex": "1.3.1"
-+      }
-+    },
-+    "parse5": {
-+      "version": "1.5.1",
-+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz",
-+      "integrity": "sha1-m387DeMr543CQBsXVzzK8Pb1nZQ=",
-+      "dev": true,
-+      "optional": true
-+    },
-+    "path-browserify": {
-+      "version": "0.0.0",
-+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
-+      "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
-+      "dev": true
-+    },
-+    "path-exists": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-+      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-+      "dev": true,
-+      "requires": {
-+        "pinkie-promise": "2.0.1"
-+      }
-+    },
-+    "path-is-absolute": {
-       "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-no-shell-dollars/-/remark-lint-no-shell-dollars-1.0.1.tgz",
--      "integrity": "sha512-YryHem73PTxjCkuC4HONJWHsmrLyXmF7r+cCH36Ys3vuWsfAbwkbOwpyuPB4KXn+6fHaTUfz/B5BPp3iwzJwyA==",
-+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-+      "dev": true
-+    },
-+    "path-is-inside": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-+      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
-+      "dev": true
-+    },
-+    "path-key": {
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
-+      "dev": true
-+    },
-+    "path-parse": {
-+      "version": "1.0.5",
-+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
-+      "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
-+      "dev": true
-+    },
-+    "path-platform": {
-+      "version": "0.11.15",
-+      "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz",
-+      "integrity": "sha1-6GQhf3TDaFDwhSt43Hv31KVyG/I=",
-+      "dev": true
-+    },
-+    "path-type": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-+      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-+      "dev": true,
-+      "requires": {
-+        "graceful-fs": "4.1.11",
-+        "pify": "2.3.0",
-+        "pinkie-promise": "2.0.1"
-+      }
-+    },
-+    "pbkdf2": {
-+      "version": "3.0.16",
-+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.16.tgz",
-+      "integrity": "sha512-y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA==",
-+      "dev": true,
-+      "requires": {
-+        "create-hash": "1.2.0",
-+        "create-hmac": "1.1.7",
-+        "ripemd160": "2.0.2",
-+        "safe-buffer": "5.1.2",
-+        "sha.js": "2.4.11"
-+      }
-+    },
-+    "peek-stream": {
-+      "version": "1.1.3",
-+      "resolved": "https://registry.npmjs.org/peek-stream/-/peek-stream-1.1.3.tgz",
-+      "integrity": "sha512-FhJ+YbOSBb9/rIl2ZeE/QHEsWn7PqNYt8ARAY3kIgNGOk13g9FGyIY6JIl/xB/3TFRVoTv5as0l11weORrTekA==",
-+      "dev": true,
-+      "requires": {
-+        "buffer-from": "1.0.0",
-+        "duplexify": "3.6.0",
-+        "through2": "2.0.3"
-+      }
-+    },
-+    "performance-now": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-+      "dev": true
-+    },
-+    "pify": {
-+      "version": "2.3.0",
-+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-+      "dev": true
-+    },
-+    "pinkie": {
-+      "version": "2.0.4",
-+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-+      "dev": true
-+    },
-+    "pinkie-promise": {
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-+      "dev": true,
-+      "requires": {
-+        "pinkie": "2.0.4"
-+      }
-+    },
-+    "pkg-conf": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-2.1.0.tgz",
-+      "integrity": "sha1-ISZRTKbyq/69FoWW3xi6V4Z/AFg=",
-+      "dev": true,
-+      "requires": {
-+        "find-up": "2.1.0",
-+        "load-json-file": "4.0.0"
-+=======
-+    "lodash": {
-+      "version": "4.17.5",
-+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz",
-+      "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==",
-+      "dev": true
-+    },
-+    "lodash._reinterpolate": {
-+      "version": "3.0.0",
-+      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-+      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
-+      "dev": true
-+    },
-+    "lodash.assign": {
-+      "version": "4.2.0",
-+      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
-+      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
-+      "dev": true
-+    },
-+    "lodash.assignin": {
-+      "version": "4.2.0",
-+      "resolved": "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz",
-+      "integrity": "sha1-uo31+4QesKPoBEIysOJjqNxqKKI=",
-+      "dev": true
-+    },
-+    "lodash.bind": {
-+      "version": "4.2.1",
-+      "resolved": "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz",
-+      "integrity": "sha1-euMBfpOWIqwxt9fX3LGzTbFpDTU=",
-+      "dev": true
-+    },
-+    "lodash.cond": {
-+      "version": "4.5.2",
-+      "resolved": "https://registry.npmjs.org/lodash.cond/-/lodash.cond-4.5.2.tgz",
-+      "integrity": "sha1-9HGh2khr5g9quVXRcRVSPdHSVdU=",
-+      "dev": true
-+    },
-+    "lodash.defaults": {
-+      "version": "4.2.0",
-+      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
-+      "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=",
-+      "dev": true
-+    },
-+    "lodash.filter": {
-+      "version": "4.6.0",
-+      "resolved": "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz",
-+      "integrity": "sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4=",
-+      "dev": true
-+    },
-+    "lodash.flatten": {
-+      "version": "4.4.0",
-+      "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
-+      "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=",
-+      "dev": true
-+    },
-+    "lodash.foreach": {
-+      "version": "4.5.0",
-+      "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz",
-+      "integrity": "sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=",
-+      "dev": true
-+    },
-+    "lodash.isempty": {
-+      "version": "4.4.0",
-+      "resolved": "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz",
-+      "integrity": "sha1-b4bL7di+TsmHvpqvM8loTbGzHn4=",
-+      "dev": true
-+    },
-+    "lodash.isplainobject": {
-+      "version": "4.0.6",
-+      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-+      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=",
-+      "dev": true
-+    },
-+    "lodash.map": {
-+      "version": "4.6.0",
-+      "resolved": "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz",
-+      "integrity": "sha1-dx7Hg540c9nEzeKLGTlMNWL09tM=",
-+      "dev": true
-+    },
-+    "lodash.memoize": {
-+      "version": "3.0.4",
-+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz",
-+      "integrity": "sha1-LcvSwofLwKVcxCMovQxzYVDVPj8=",
-+      "dev": true
-+    },
-+    "lodash.merge": {
-+      "version": "4.6.1",
-+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz",
-+      "integrity": "sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ==",
-+      "dev": true
-+    },
-+    "lodash.pick": {
-+      "version": "4.4.0",
-+      "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz",
-+      "integrity": "sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=",
-+      "dev": true
-+    },
-+    "lodash.range": {
-+      "version": "3.2.0",
-+      "resolved": "https://registry.npmjs.org/lodash.range/-/lodash.range-3.2.0.tgz",
-+      "integrity": "sha1-9GHliPZmg/fq3q3lE+OKaaVloV0=",
-+      "dev": true
-+    },
-+    "lodash.reduce": {
-+      "version": "4.6.0",
-+      "resolved": "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz",
-+      "integrity": "sha1-8atrg5KZrUj3hKu/R2WW8DuRTTs=",
-+      "dev": true
-+    },
-+    "lodash.reject": {
-+      "version": "4.6.0",
-+      "resolved": "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz",
-+      "integrity": "sha1-gNZJLcFHCGS79YNTO2UfQqn1JBU=",
-+      "dev": true
-+    },
-+    "lodash.some": {
-+      "version": "4.6.0",
-+      "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz",
-+      "integrity": "sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=",
-+      "dev": true
-+    },
-+    "lodash.template": {
-+      "version": "4.4.0",
-+      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.4.0.tgz",
-+      "integrity": "sha1-5zoDhcg1VZF0bgILmWecaQ5o+6A=",
-+      "dev": true,
-+      "requires": {
-+        "lodash._reinterpolate": "3.0.0",
-+        "lodash.templatesettings": "4.1.0"
-+      }
-+    },
-+    "lodash.templatesettings": {
-+      "version": "4.1.0",
-+      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz",
-+      "integrity": "sha1-K01OlbpEDZFf8IvImeRVNmZxMxY=",
-+      "dev": true,
-+      "requires": {
-+        "lodash._reinterpolate": "3.0.0"
-+      }
-+    },
-+    "lodash.transform": {
-+      "version": "4.6.0",
-+      "resolved": "https://registry.npmjs.org/lodash.transform/-/lodash.transform-4.6.0.tgz",
-+      "integrity": "sha1-EjBkIvYzJK7YSD0/ODMrX2cFR6A=",
-+      "dev": true
-+    },
-+    "log-symbols": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz",
-+      "integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=",
-+      "dev": true,
-+      "requires": {
-+        "chalk": "1.1.3"
-+      }
-+    },
-+    "longest": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
-+      "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
-+      "dev": true
-+    },
-+    "loud-rejection": {
-+      "version": "1.6.0",
-+      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
-+      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
-+      "dev": true,
-+      "requires": {
-+        "currently-unhandled": "0.4.1",
-+        "signal-exit": "3.0.2"
-+      }
-+    },
-+    "lowercase-keys": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz",
-+      "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=",
-+      "dev": true
-+    },
-+    "lru-cache": {
-+      "version": "4.1.2",
-+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.2.tgz",
-+      "integrity": "sha512-wgeVXhrDwAWnIF/yZARsFnMBtdFXOg1b8RIrhilp+0iDYN4mdQcNZElDZ0e4B64BhaxeQ5zN7PMyvu7we1kPeQ==",
-+      "dev": true,
-+      "requires": {
-+        "pseudomap": "1.0.2",
-+        "yallist": "2.1.2"
-+      },
-+      "dependencies": {
-+        "yallist": {
-+          "version": "2.1.2",
-+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-+          "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "make-dir": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.2.0.tgz",
-+      "integrity": "sha512-aNUAa4UMg/UougV25bbrU4ZaaKNjJ/3/xnvg/twpmKROPdKZPZ9wGgI0opdZzO8q/zUFawoUuixuOv33eZ61Iw==",
-+      "dev": true,
-+      "requires": {
-+        "pify": "3.0.0"
-+      },
-+      "dependencies": {
-+        "pify": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "map-obj": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz",
-+      "integrity": "sha1-plzSkIepJZi4eRJXpSPgISIqwfk=",
-+      "dev": true
-+    },
-+    "markdown-it": {
-+      "version": "6.1.1",
-+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-6.1.1.tgz",
-+      "integrity": "sha1-ztA39Ec+6fUVOsQU933IPJG6knw=",
-+      "dev": true,
-+      "requires": {
-+        "argparse": "1.0.10",
-+        "entities": "1.1.1",
-+        "linkify-it": "1.2.4",
-+        "mdurl": "1.0.1",
-+        "uc.micro": "1.0.5"
-+      }
-+    },
-+    "markdown-it-named-headers": {
-+      "version": "0.0.4",
-+      "resolved": "https://registry.npmjs.org/markdown-it-named-headers/-/markdown-it-named-headers-0.0.4.tgz",
-+      "integrity": "sha1-gu/CgyQkCmsed7mq5QF3HV81HB8=",
-+      "dev": true,
-+      "requires": {
-+        "string": "3.3.3"
-+      }
-+    },
-+    "marky-markdown-lite": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/marky-markdown-lite/-/marky-markdown-lite-1.2.0.tgz",
-+      "integrity": "sha1-dO2phLgTZVfe4QZO/RXkBhdAaZc=",
-+      "dev": true,
-+      "requires": {
-+        "cheerio": "0.20.0",
-+        "conventional-changelog-cli": "1.3.16",
-+        "is-file": "1.0.0",
-+        "markdown-it": "6.1.1",
-+        "markdown-it-named-headers": "0.0.4"
-+      },
-+      "dependencies": {
-+        "cheerio": {
-+          "version": "0.20.0",
-+          "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.20.0.tgz",
-+          "integrity": "sha1-XHEPK6uVZTJyhCugHG6mGzVF7DU=",
-+          "dev": true,
-+          "requires": {
-+            "css-select": "1.2.0",
-+            "dom-serializer": "0.1.0",
-+            "entities": "1.1.1",
-+            "htmlparser2": "3.8.3",
-+            "jsdom": "7.2.2",
-+            "lodash": "4.17.5"
-+          }
-+        },
-+        "domhandler": {
-+          "version": "2.3.0",
-+          "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz",
-+          "integrity": "sha1-LeWaCCLVAn+r/28DLCsloqir5zg=",
-+          "dev": true,
-+          "requires": {
-+            "domelementtype": "1.3.0"
-+          }
-+        },
-+        "htmlparser2": {
-+          "version": "3.8.3",
-+          "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
-+          "integrity": "sha1-mWwosZFRaovoZQGn15dX5ccMEGg=",
-+          "dev": true,
-+          "requires": {
-+            "domelementtype": "1.3.0",
-+            "domhandler": "2.3.0",
-+            "domutils": "1.5.1",
-+            "entities": "1.0.0",
-+            "readable-stream": "1.1.14"
-+          },
-+          "dependencies": {
-+            "entities": {
-+              "version": "1.0.0",
-+              "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz",
-+              "integrity": "sha1-sph6o4ITR/zeZCsk/fyeT7cSvyY=",
-+              "dev": true
-+            }
-+          }
-+        }
-+      }
-+    },
-+    "matcher-collection": {
-+      "version": "1.0.5",
-+      "resolved": "https://registry.npmjs.org/matcher-collection/-/matcher-collection-1.0.5.tgz",
-+      "integrity": "sha512-nUCmzKipcJEwYsBVAFh5P+d7JBuhJaW1xs85Hara9xuMLqtCVUrW6DSC0JVIkluxEH2W45nPBM/wjHtBXa/tYA==",
-+      "dev": true,
-+      "requires": {
-+        "minimatch": "3.0.4"
-+      }
-+    },
-+    "md5.js": {
-+      "version": "1.3.4",
-+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz",
-+      "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=",
-+      "dev": true,
-+      "requires": {
-+        "hash-base": "3.0.4",
-+        "inherits": "2.0.3"
-+      },
-+      "dependencies": {
-+        "hash-base": {
-+          "version": "3.0.4",
-+          "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
-+          "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
-+          "dev": true,
-+          "requires": {
-+            "inherits": "2.0.3",
-+            "safe-buffer": "5.1.1"
-+          }
-+        }
-+      }
-+    },
-+    "mdurl": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-+      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=",
-+      "dev": true
-+    },
-+    "meow": {
-+      "version": "4.0.0",
-+      "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.0.tgz",
-+      "integrity": "sha512-Me/kel335m6vMKmEmA6c87Z6DUFW3JqkINRnxkbC+A/PUm0D5Fl2dEBQrPKnqCL9Te/CIa1MUt/0InMJhuC/sw==",
-+      "dev": true,
-+      "requires": {
-+        "camelcase-keys": "4.2.0",
-+        "decamelize-keys": "1.1.0",
-+        "loud-rejection": "1.6.0",
-+        "minimist": "1.2.0",
-+        "minimist-options": "3.0.2",
-+        "normalize-package-data": "2.4.0",
-+        "read-pkg-up": "3.0.0",
-+        "redent": "2.0.0",
-+        "trim-newlines": "2.0.0"
-+>>>>>>> .their
-+      },
-+      "dependencies": {
-+        "find-up": {
-+          "version": "2.1.0",
-+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-+          "dev": true,
-+          "requires": {
-+            "locate-path": "2.0.0"
-+          }
-+        },
-+        "load-json-file": {
-+          "version": "4.0.0",
-+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
-+          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
-+          "dev": true,
-+          "requires": {
-+            "graceful-fs": "4.1.11",
-+            "parse-json": "4.0.0",
-+            "pify": "3.0.0",
-+            "strip-bom": "3.0.0"
-+          }
-+        },
-+        "parse-json": {
-+          "version": "4.0.0",
-+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-+          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
-+          "dev": true,
-+          "requires": {
-+            "error-ex": "1.3.1",
-+<<<<<<< .our
-+            "json-parse-better-errors": "1.0.2"
-+=======
-+            "json-parse-better-errors": "1.0.1"
-+          }
-+        },
-+        "path-type": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-+          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-+          "dev": true,
-+          "requires": {
-+            "pify": "3.0.0"
-+>>>>>>> .their
-+          }
-+        },
-+        "pify": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-+          "dev": true
-+        },
-+<<<<<<< .our
-+=======
-+        "read-pkg": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
-+          "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
-+          "dev": true,
-+          "requires": {
-+            "load-json-file": "4.0.0",
-+            "normalize-package-data": "2.4.0",
-+            "path-type": "3.0.0"
-+          }
-+        },
-+        "read-pkg-up": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
-+          "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
-+          "dev": true,
-+          "requires": {
-+            "find-up": "2.1.0",
-+            "read-pkg": "3.0.0"
-+          }
-+        },
-+>>>>>>> .their
-+        "strip-bom": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-+          "dev": true
-+        }
-+      }
-+    },
-+<<<<<<< .our
-+    "pkg-config": {
-+      "version": "1.1.1",
-+      "resolved": "https://registry.npmjs.org/pkg-config/-/pkg-config-1.1.1.tgz",
-+      "integrity": "sha1-VX7yLXPaPIg3EHdmxS6tq94pj+Q=",
-+      "dev": true,
-+      "requires": {
-+        "debug-log": "1.0.1",
-+        "find-root": "1.1.0",
-+        "xtend": "4.0.1"
-+      }
-+    },
-+    "pkg-dir": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz",
-+      "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=",
-+      "dev": true,
-+      "requires": {
-+        "find-up": "1.1.2"
-+      }
-+    },
-+    "pkg-up": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-1.0.0.tgz",
-+      "integrity": "sha1-Pgj7RhUlxEIWJKM7n35tCvWwWiY=",
-+      "dev": true,
-+      "requires": {
-+        "find-up": "1.1.2"
-+      }
-+    },
-+    "plur": {
-+      "version": "2.1.2",
-+      "resolved": "https://registry.npmjs.org/plur/-/plur-2.1.2.tgz",
-+      "integrity": "sha1-dIJFLBoPUI4+NE6uwxLJHCncZVo=",
-+      "dev": true,
-+      "requires": {
-+        "irregular-plurals": "1.4.0"
-+      }
-+    },
-+    "pluralize": {
-+      "version": "1.2.1",
-+      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz",
-+      "integrity": "sha1-0aIUg/0iu0HlihL6NCGCMUCJfEU=",
-+      "dev": true
-+    },
-+    "prelude-ls": {
-+      "version": "1.1.2",
-+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-+      "dev": true
-+    },
-+    "prepend-http": {
-+      "version": "1.0.4",
-+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
-+      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
-+      "dev": true
-+    },
-+    "preserve": {
-+      "version": "0.2.0",
-+      "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
-+      "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
-+      "dev": true
-+    },
-+    "pretty-bytes": {
-+      "version": "1.0.4",
-+      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz",
-+      "integrity": "sha1-CiLoIQYJrTVUL4yNXSFZr/B1HIQ=",
-+      "dev": true,
-+      "requires": {
-+        "get-stdin": "4.0.1",
-+        "meow": "3.7.0"
-+      },
-+      "dependencies": {
-+        "camelcase": {
-+          "version": "2.1.1",
-+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-+          "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
-+          "dev": true
-+        },
-+        "camelcase-keys": {
-+          "version": "2.1.0",
-+          "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
-+          "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
-+          "dev": true,
-+          "requires": {
-+            "camelcase": "2.1.1",
-+            "map-obj": "1.0.1"
-+          }
-+        },
-+        "indent-string": {
-+          "version": "2.1.0",
-+          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-+          "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
-+          "dev": true,
-+          "requires": {
-+            "repeating": "2.0.1"
-+          }
-+        },
-+        "map-obj": {
-+          "version": "1.0.1",
-+          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-+          "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-+          "dev": true
-+        },
-+        "meow": {
-+          "version": "3.7.0",
-+          "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-+          "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
-+          "dev": true,
-+          "requires": {
-+            "camelcase-keys": "2.1.0",
-+            "decamelize": "1.2.0",
-+            "loud-rejection": "1.6.0",
-+            "map-obj": "1.0.1",
-+            "minimist": "1.2.0",
-+            "normalize-package-data": "2.4.0",
-+            "object-assign": "4.1.1",
-+            "read-pkg-up": "1.0.1",
-+            "redent": "1.0.0",
-+            "trim-newlines": "1.0.0"
-+          }
-+        },
-+        "redent": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-+          "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
-+          "dev": true,
-+          "requires": {
-+            "indent-string": "2.1.0",
-+            "strip-indent": "1.0.1"
-+          }
-+        },
-+        "strip-indent": {
-+          "version": "1.0.1",
-+          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
-+          "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
-+          "dev": true,
-+          "requires": {
-+            "get-stdin": "4.0.1"
-+          }
-+        },
-+        "trim-newlines": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-+          "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
-+=======
-+    "micromatch": {
-+      "version": "2.3.11",
-+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-+      "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-+      "dev": true,
-+      "requires": {
-+        "arr-diff": "2.0.0",
-+        "array-unique": "0.2.1",
-+        "braces": "1.8.5",
-+        "expand-brackets": "0.1.5",
-+        "extglob": "0.3.2",
-+        "filename-regex": "2.0.1",
-+        "is-extglob": "1.0.0",
-+        "is-glob": "2.0.1",
-+        "kind-of": "3.2.2",
-+        "normalize-path": "2.1.1",
-+        "object.omit": "2.0.1",
-+        "parse-glob": "3.0.4",
-+        "regex-cache": "0.4.4"
-+      }
-+    },
-+    "miller-rabin": {
-+      "version": "4.0.1",
-+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
-+      "dev": true,
-+      "requires": {
-+        "bn.js": "4.11.8",
-+        "brorand": "1.1.0"
-+      }
-+    },
-+    "mime": {
-+      "version": "1.6.0",
-+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-+      "dev": true
-+    },
-+    "mime-db": {
-+      "version": "1.33.0",
-+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz",
-+      "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==",
-+      "dev": true
-+    },
-+    "mime-types": {
-+      "version": "2.1.18",
-+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz",
-+      "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
-+      "dev": true,
-+      "requires": {
-+        "mime-db": "1.33.0"
-+      }
-+    },
-+    "mimic-fn": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
-+      "dev": true
-+    },
-+    "minimalistic-assert": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz",
-+      "integrity": "sha1-cCvi3aazf0g2vLP121ZkG2Sh09M=",
-+      "dev": true
-+    },
-+    "minimalistic-crypto-utils": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-+      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
-+      "dev": true
-+    },
-+    "minimatch": {
-+      "version": "3.0.4",
-+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-+      "dev": true,
-+      "requires": {
-+        "brace-expansion": "1.1.11"
-+      }
-+    },
-+    "minimist": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-+      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-+      "dev": true
-+    },
-+    "minimist-options": {
-+      "version": "3.0.2",
-+      "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-3.0.2.tgz",
-+      "integrity": "sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==",
-+      "dev": true,
-+      "requires": {
-+        "arrify": "1.0.1",
-+        "is-plain-obj": "1.1.0"
-+      }
-+    },
-+    "minipass": {
-+      "version": "2.2.1",
-+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.2.1.tgz",
-+      "integrity": "sha512-u1aUllxPJUI07cOqzR7reGmQxmCqlH88uIIsf6XZFEWgw7gXKpJdR+5R9Y3KEDmWYkdIz9wXZs3C0jOPxejk/Q==",
-+      "dev": true,
-+      "requires": {
-+        "yallist": "3.0.2"
-+      }
-+    },
-+    "minizlib": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz",
-+      "integrity": "sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==",
-+      "dev": true,
-+      "requires": {
-+        "minipass": "2.2.1"
-+      }
-+    },
-+    "mkdirp": {
-+      "version": "0.5.1",
-+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-+      "dev": true,
-+      "requires": {
-+        "minimist": "0.0.8"
-+      },
-+      "dependencies": {
-+        "minimist": {
-+          "version": "0.0.8",
-+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-+>>>>>>> .their
-+          "dev": true
-+        }
-+      }
-+    },
-+<<<<<<< .our
-+    "process": {
-+      "version": "0.11.10",
-+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-+      "dev": true
-+    },
-+    "process-nextick-args": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-+      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
-+      "dev": true
-+    },
-+    "progress": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz",
-+      "integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=",
-+      "dev": true
-+    },
-+    "progress-stream": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/progress-stream/-/progress-stream-1.2.0.tgz",
-+      "integrity": "sha1-LNPP6jO6OonJwSHsM0er6asSX3c=",
-+      "dev": true,
-+      "requires": {
-+        "speedometer": "0.1.4",
-+        "through2": "0.2.3"
-+      },
-+      "dependencies": {
-+        "through2": {
-+          "version": "0.2.3",
-+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
-+          "integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=",
-+          "dev": true,
-+          "requires": {
-+            "readable-stream": "1.1.14",
-+            "xtend": "2.1.2"
-+          }
-+        },
-+        "xtend": {
-+          "version": "2.1.2",
-+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
-+          "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
-+          "dev": true,
-+          "requires": {
-+            "object-keys": "0.4.0"
-+=======
-+    "mkpath": {
-+      "version": "0.1.0",
-+      "resolved": "https://registry.npmjs.org/mkpath/-/mkpath-0.1.0.tgz",
-+      "integrity": "sha1-dVSm+Nhxg0zJe1RisSLEwSTW3pE=",
-+      "dev": true
-+    },
-+    "mksnapshot": {
-+      "version": "0.3.1",
-+      "resolved": "https://registry.npmjs.org/mksnapshot/-/mksnapshot-0.3.1.tgz",
-+      "integrity": "sha1-JQHAVldDbXQs6Vik/5LHfkDdN+Y=",
-+      "dev": true,
-+      "requires": {
-+        "decompress-zip": "0.3.0",
-+        "fs-extra": "0.26.7",
-+        "request": "2.85.0"
-+      }
-+    },
-+    "modify-values": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/modify-values/-/modify-values-1.0.0.tgz",
-+      "integrity": "sha1-4rbN65zhn5kxelNyLz2/XfXqqrI=",
-+      "dev": true
-+    },
-+    "module-deps": {
-+      "version": "4.1.1",
-+      "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-4.1.1.tgz",
-+      "integrity": "sha1-IyFYM/HaE/1gbMuAh7RIUty4If0=",
-+      "dev": true,
-+      "requires": {
-+        "JSONStream": "1.3.2",
-+        "browser-resolve": "1.11.2",
-+        "cached-path-relative": "1.0.1",
-+        "concat-stream": "1.5.2",
-+        "defined": "1.0.0",
-+        "detective": "4.7.1",
-+        "duplexer2": "0.1.4",
-+        "inherits": "2.0.3",
-+        "parents": "1.0.1",
-+        "readable-stream": "2.3.5",
-+        "resolve": "1.5.0",
-+        "stream-combiner2": "1.1.1",
-+        "subarg": "1.0.0",
-+        "through2": "2.0.3",
-+        "xtend": "4.0.1"
-+      },
-+      "dependencies": {
-+        "isarray": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-+          "dev": true
-+        },
-+        "readable-stream": {
-+          "version": "2.3.5",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
-+          "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
-+          "dev": true,
-+          "requires": {
-+            "core-util-is": "1.0.2",
-+            "inherits": "2.0.3",
-+            "isarray": "1.0.0",
-+            "process-nextick-args": "2.0.0",
-+            "safe-buffer": "5.1.1",
-+            "string_decoder": "1.0.3",
-+            "util-deprecate": "1.0.2"
-+          }
-+        },
-+        "string_decoder": {
-+          "version": "1.0.3",
-+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-+          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-+          "dev": true,
-+          "requires": {
-+            "safe-buffer": "5.1.1"
-+>>>>>>> .their
-+          }
-+        }
-+      }
-+    },
-+<<<<<<< .our
-+    "pseudomap": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
-+      "dev": true
-+    },
-+    "public-encrypt": {
-+      "version": "4.0.2",
-+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz",
-+      "integrity": "sha512-4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==",
-+      "dev": true,
-+      "requires": {
-+        "bn.js": "4.11.8",
-+        "browserify-rsa": "4.0.1",
-+        "create-hash": "1.2.0",
-+        "parse-asn1": "5.1.1",
-+        "randombytes": "2.0.6"
-+      }
-+    },
-+    "pump": {
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
-+      "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-+      "dev": true,
-+      "requires": {
-+        "end-of-stream": "1.4.1",
-+        "once": "1.4.0"
-+      }
-+    },
-+    "pumpify": {
-+      "version": "1.5.0",
-+      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.0.tgz",
-+      "integrity": "sha512-UWi0klDoq8xtVzlMRgENV9F7iCTZExaJQSQL187UXsxpk9NnrKGqTqqUNYAKGOzucSOxs2+jUnRNI+rLviPhJg==",
-+      "dev": true,
-+      "requires": {
-+        "duplexify": "3.6.0",
-+        "inherits": "2.0.3",
-+        "pump": "2.0.1"
-+      }
-+    },
-+    "punycode": {
-+      "version": "1.4.1",
-+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-+      "dev": true
-+    },
-+    "q": {
-+      "version": "1.5.1",
-+      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-+      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
-+      "dev": true
-+    },
-+    "qs": {
-+      "version": "6.5.2",
-+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-+      "dev": true
-+    },
-+    "querystring": {
-+      "version": "0.2.0",
-+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
-+      "dev": true
-+    },
-+    "querystring-es3": {
-+      "version": "0.2.1",
-+      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-+      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
-+      "dev": true
-+    },
-+    "quick-lru": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz",
-+      "integrity": "sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=",
-+      "dev": true
-+    },
-+    "randomatic": {
-+      "version": "3.0.0",
-+      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.0.0.tgz",
-+      "integrity": "sha512-VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA==",
-+      "dev": true,
-+      "requires": {
-+        "is-number": "4.0.0",
-+        "kind-of": "6.0.2",
-+        "math-random": "1.0.1"
-+      },
-+      "dependencies": {
-+        "is-number": {
-+          "version": "4.0.0",
-+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-+          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-+          "dev": true
-+        },
-+        "kind-of": {
-+          "version": "6.0.2",
-+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-+=======
-+    "ms": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-+      "dev": true
-+    },
-+    "mute-stream": {
-+      "version": "0.0.5",
-+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz",
-+      "integrity": "sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA=",
-+      "dev": true
-+    },
-+    "natural-compare": {
-+      "version": "1.4.0",
-+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-+      "dev": true
-+    },
-+    "netrc": {
-+      "version": "0.1.4",
-+      "resolved": "https://registry.npmjs.org/netrc/-/netrc-0.1.4.tgz",
-+      "integrity": "sha1-a+lPysqNd63gqWcNxGCRTJRHJEQ=",
-+      "dev": true
-+    },
-+    "node-dir": {
-+      "version": "0.1.17",
-+      "resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz",
-+      "integrity": "sha1-X1Zl2TNRM1yqvvjxxVRRbPXx5OU=",
-+      "dev": true,
-+      "requires": {
-+        "minimatch": "3.0.4"
-+      }
-+    },
-+    "nopt": {
-+      "version": "3.0.6",
-+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-+      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-+      "dev": true,
-+      "requires": {
-+        "abbrev": "1.1.1"
-+      }
-+    },
-+    "normalize-package-data": {
-+      "version": "2.4.0",
-+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-+      "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
-+      "dev": true,
-+      "requires": {
-+        "hosted-git-info": "2.6.0",
-+        "is-builtin-module": "1.0.0",
-+        "semver": "5.5.0",
-+        "validate-npm-package-license": "3.0.3"
-+      }
-+    },
-+    "normalize-path": {
-+      "version": "2.1.1",
-+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-+      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-+      "dev": true,
-+      "requires": {
-+        "remove-trailing-separator": "1.1.0"
-+      }
-+    },
-+    "npm-run-path": {
-+      "version": "2.0.2",
-+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-+      "dev": true,
-+      "requires": {
-+        "path-key": "2.0.1"
-+      }
-+    },
-+    "nth-check": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz",
-+      "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=",
-+      "dev": true,
-+      "requires": {
-+        "boolbase": "1.0.0"
-+      }
-+    },
-+    "nugget": {
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/nugget/-/nugget-2.0.1.tgz",
-+      "integrity": "sha1-IBCVpIfhrTYIGzQy+jytpPjQcbA=",
-+      "dev": true,
-+      "requires": {
-+        "debug": "2.6.9",
-+        "minimist": "1.2.0",
-+        "pretty-bytes": "1.0.4",
-+        "progress-stream": "1.2.0",
-+        "request": "2.85.0",
-+        "single-line-log": "1.1.2",
-+        "throttleit": "0.0.2"
-+      }
-+    },
-+    "number-is-nan": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-+      "dev": true
-+    },
-+    "nwmatcher": {
-+      "version": "1.4.3",
-+      "resolved": "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.3.tgz",
-+      "integrity": "sha512-IKdSTiDWCarf2JTS5e9e2+5tPZGdkRJ79XjYV0pzK8Q9BpsFyBq1RGKxzs7Q8UBushGw7m6TzVKz6fcY99iSWw==",
-+      "dev": true,
-+      "optional": true
-+    },
-+    "oauth-sign": {
-+      "version": "0.8.2",
-+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-+      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
-+      "dev": true
-+    },
-+    "object-assign": {
-+      "version": "4.1.1",
-+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-+      "dev": true
-+    },
-+    "object-keys": {
-+      "version": "0.4.0",
-+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
-+      "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=",
-+      "dev": true
-+    },
-+    "object.assign": {
-+      "version": "4.1.0",
-+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
-+      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
-+      "dev": true,
-+      "requires": {
-+        "define-properties": "1.1.2",
-+        "function-bind": "1.1.1",
-+        "has-symbols": "1.0.0",
-+        "object-keys": "1.0.11"
-+      },
-+      "dependencies": {
-+        "object-keys": {
-+          "version": "1.0.11",
-+          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
-+          "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=",
-+>>>>>>> .their
-+          "dev": true
-+        }
-+      }
-+    },
-+<<<<<<< .our
-+    "randombytes": {
-+      "version": "2.0.6",
-+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz",
-+      "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
-+      "dev": true,
-+      "requires": {
-+        "safe-buffer": "5.1.2"
-+      }
-+    },
-+    "randomfill": {
-+      "version": "1.0.4",
-+      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-+      "dev": true,
-+      "requires": {
-+        "randombytes": "2.0.6",
-+        "safe-buffer": "5.1.2"
-+      }
-+    },
-+    "range-parser": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
-+      "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=",
-+      "dev": true
-+    },
-+    "raw-body": {
-+      "version": "2.3.2",
-+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz",
-+      "integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=",
-+      "dev": true,
-+      "requires": {
-+        "bytes": "3.0.0",
-+        "http-errors": "1.6.2",
-+        "iconv-lite": "0.4.19",
-+        "unpipe": "1.0.0"
-+      }
-+    },
-+    "rc": {
-+      "version": "1.2.7",
-+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.7.tgz",
-+      "integrity": "sha512-LdLD8xD4zzLsAT5xyushXDNscEjB7+2ulnl8+r1pnESlYtlJtVSoCMBGr30eDRJ3+2Gq89jK9P9e4tCEH1+ywA==",
-+      "dev": true,
-+      "requires": {
-+        "deep-extend": "0.5.1",
-+        "ini": "1.3.5",
-+        "minimist": "1.2.0",
-+        "strip-json-comments": "2.0.1"
-+      }
-+    },
-+    "read-only-stream": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/read-only-stream/-/read-only-stream-2.0.0.tgz",
-+      "integrity": "sha1-JyT9aoET1zdkrCiNQ4YnDB2/F/A=",
-+      "dev": true,
-+      "requires": {
-+        "readable-stream": "2.3.6"
-+      },
-+      "dependencies": {
-+        "isarray": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-+          "dev": true
-+        },
-+        "readable-stream": {
-+          "version": "2.3.6",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-+          "dev": true,
-+          "requires": {
-+            "core-util-is": "1.0.2",
-+            "inherits": "2.0.3",
-+            "isarray": "1.0.0",
-+            "process-nextick-args": "2.0.0",
-+            "safe-buffer": "5.1.2",
-+            "string_decoder": "1.1.1",
-+            "util-deprecate": "1.0.2"
-+          }
-+        },
-+        "string_decoder": {
-+          "version": "1.1.1",
-+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-+          "dev": true,
-+          "requires": {
-+            "safe-buffer": "5.1.2"
-+          }
-+        }
-+      }
-+    },
-+    "read-pkg": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-+      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-+      "dev": true,
-+      "requires": {
-+        "load-json-file": "1.1.0",
-+        "normalize-package-data": "2.4.0",
-+        "path-type": "1.1.0"
-+      }
-+    },
-+    "read-pkg-up": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-+      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-+      "dev": true,
-+      "requires": {
-+        "find-up": "1.1.2",
-+        "read-pkg": "1.1.0"
-+      }
-+    },
-+    "readable-stream": {
-+      "version": "1.1.14",
-+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-+      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-+      "dev": true,
-+      "requires": {
-+        "core-util-is": "1.0.2",
-+        "inherits": "2.0.3",
-+        "isarray": "0.0.1",
-+        "string_decoder": "0.10.31"
-+      }
-+    },
-+    "readdirp": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz",
-+      "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
-+      "dev": true,
-+      "requires": {
-+        "graceful-fs": "4.1.11",
-+        "minimatch": "3.0.4",
-+        "readable-stream": "2.3.6",
-+        "set-immediate-shim": "1.0.1"
-+      },
-+      "dependencies": {
-+        "isarray": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-+          "dev": true
-+        },
-+        "readable-stream": {
-+          "version": "2.3.6",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-+          "dev": true,
-+          "requires": {
-+            "core-util-is": "1.0.2",
-+            "inherits": "2.0.3",
-+            "isarray": "1.0.0",
-+            "process-nextick-args": "2.0.0",
-+            "safe-buffer": "5.1.2",
-+            "string_decoder": "1.1.1",
-+            "util-deprecate": "1.0.2"
-+          }
-+        },
-+        "string_decoder": {
-+          "version": "1.1.1",
-+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-+          "dev": true,
-+          "requires": {
-+            "safe-buffer": "5.1.2"
-+          }
-+        }
-+      }
-+    },
-+    "readline2": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz",
-+      "integrity": "sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU=",
-+      "dev": true,
-+      "requires": {
-+        "code-point-at": "1.1.0",
-+        "is-fullwidth-code-point": "1.0.0",
-+        "mute-stream": "0.0.5"
-+      }
-+    },
-+    "rechoir": {
-+      "version": "0.6.2",
-+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
-+      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
-+      "dev": true,
-+      "requires": {
-+        "resolve": "1.7.1"
-+      }
-+    },
-+    "redent": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz",
-+      "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=",
-+      "dev": true,
-+      "requires": {
-+        "indent-string": "3.2.0",
-+        "strip-indent": "2.0.0"
-+      }
-+    },
-+    "regex-cache": {
-+      "version": "0.4.4",
-+      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
-+      "integrity": "sha1-db3FiioUls7EihKDW8VMjVYjNt0=",
-+      "dev": true,
-+      "requires": {
-+        "is-equal-shallow": "0.1.3"
-+      }
-+    },
-+    "registry-auth-token": {
-+      "version": "3.3.2",
-+      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz",
-+      "integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==",
-+      "dev": true,
-+      "requires": {
-+        "rc": "1.2.7",
-+        "safe-buffer": "5.1.2"
-+      }
-+    },
-+    "registry-url": {
-+      "version": "3.1.0",
-+      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz",
-+      "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=",
-+      "dev": true,
-+      "requires": {
-+        "rc": "1.2.7"
-+      }
-+    },
-+    "remark": {
-+      "version": "8.0.0",
-+      "resolved": "https://registry.npmjs.org/remark/-/remark-8.0.0.tgz",
-+      "integrity": "sha512-K0PTsaZvJlXTl9DN6qYlvjTkqSZBFELhROZMrblm2rB+085flN84nz4g/BscKRMqDvhzlK1oQ/xnWQumdeNZYw==",
-+      "dev": true,
-+      "requires": {
-+        "remark-parse": "4.0.0",
-+        "remark-stringify": "4.0.0",
-+        "unified": "6.2.0"
-+      }
-+    },
-+    "remark-cli": {
-+      "version": "4.0.0",
-+      "resolved": "https://registry.npmjs.org/remark-cli/-/remark-cli-4.0.0.tgz",
-+      "integrity": "sha512-q5GMjGypUS4rTZb3WfMQcGpClSC38A9Ogg1h/HB2GLsqypDetmAfy0X+tuJ6JeyCPVOXXCDgsDCQq4QPqKmxBA==",
-+      "dev": true,
-+      "requires": {
-+        "markdown-extensions": "1.1.1",
-+        "remark": "8.0.0",
-+        "unified-args": "4.0.0"
-+      }
-+    },
-+    "remark-lint": {
-+      "version": "6.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint/-/remark-lint-6.0.1.tgz",
-+      "integrity": "sha512-wvTTuB5O5pF8SxqahQjjrU3dtuhygYjaGcOZTw+4ACgSE4RBINDlNqN46HjcV3X0ib5GmObJUt5a2mmhtmuTqw==",
-+      "dev": true,
-+      "requires": {
-+        "remark-message-control": "4.1.0"
-+      }
-+    },
-+    "remark-lint-blockquote-indentation": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-blockquote-indentation/-/remark-lint-blockquote-indentation-1.0.1.tgz",
-+      "integrity": "sha512-YrP99MJ3+dQ5JXzq39fUOcYzwcumva/xEM1eFtD2TrQcSdlMLoqYa7gj+aEEhZCjlA5BssTiVoWWW0RjyPPGZw==",
-+      "dev": true,
-+      "requires": {
-+        "mdast-util-to-string": "1.0.4",
-+        "plur": "2.1.2",
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-code-block-style": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-code-block-style/-/remark-lint-code-block-style-1.0.1.tgz",
-+      "integrity": "sha512-FRUMhhKwCruH4vkatdMhVO4WlYpysV1NmMILVoK/k+/7uFLSfgvlqo66nzhpMdWL8TQHqdo0LhiXuetGC2WjsQ==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-definition-case": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-definition-case/-/remark-lint-definition-case-1.0.1.tgz",
-+      "integrity": "sha512-TxLye5KF4o/rKVTvmPRX5jS9itamFS02yy1IG8bIYcIAJvWsW3GlJaXq4ohK3hKwSQOhtCherEfD6XF9BHLNYQ==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-definition-spacing": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-definition-spacing/-/remark-lint-definition-spacing-1.0.1.tgz",
-+      "integrity": "sha512-ewzdlFfpTSP11ZuiOln0yfz6Y03aWtgJmLVQNfF1spaT1gURaShjs8Hiilbo719bz96DgvXSZLP6UnkSiZL1vg==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-emphasis-marker": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-emphasis-marker/-/remark-lint-emphasis-marker-1.0.1.tgz",
-+      "integrity": "sha512-QyNsD6y8EZQqhechw0XFGybYMlxn6PFLSlFUO50KSQlJEOgkImN2yJfrNrET2GY4t/fc/uYmeI/q7auUIkLX2w==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-fenced-code-flag": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-fenced-code-flag/-/remark-lint-fenced-code-flag-1.0.1.tgz",
-+      "integrity": "sha512-P24T9DRe/nnywPFRpE1UAXAVzN1CX6HmINr15UHbQZo1Cy8KYt7uV9YOR0/XzphtnO/AFenAqZyf7tchW5AUNQ==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-fenced-code-marker": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-fenced-code-marker/-/remark-lint-fenced-code-marker-1.0.1.tgz",
-+      "integrity": "sha512-mX7xAMl5m7xGX+YtOtyXIyv+egD4IQAm6DPGdfunI734QwODwcoBydtpTD56jrY+48nVcQ/anFYT1Blg3Xk3sQ==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-file-extension": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-file-extension/-/remark-lint-file-extension-1.0.1.tgz",
-+      "integrity": "sha512-K1Pf5oviaFyCs0FhZqaNZ2odgd5KoV6AlA4nNAMxyylB0Y6t0mYpzECoLSS5Bgxf6f8Op9YbuM2cbjBAsv0dIA==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2"
-+      }
-+    },
-+    "remark-lint-final-definition": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-final-definition/-/remark-lint-final-definition-1.0.1.tgz",
-+      "integrity": "sha512-DK6bphJdQ0xSOQAn+8wOyLIVc3SZW2+ZzCMCLkQnVtHiQ9GHMzFiCkeE3Cq+OClsMI5Yn8wFTHZHPUn58VhNEQ==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-hard-break-spaces": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/remark-lint-hard-break-spaces/-/remark-lint-hard-break-spaces-1.0.2.tgz",
-+      "integrity": "sha512-uh7LqHgRPCphiCvRzBVA4D0Ml2IqPaw89lWJdQ6HvYiV8ChB/OFLBapHi6OKW7NVVVPPJsElPMB/UPUsKFaPTg==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-heading-increment": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-heading-increment/-/remark-lint-heading-increment-1.0.1.tgz",
-+      "integrity": "sha512-jBAJacXAU5drUpvmymOoFmrdCCNDiz8bzGgJIMjpT0Vyjd0+qdXu2iyFMl/4RkkUli25rpUDXkTHTcxmNbh7Zw==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-heading-style": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-heading-style/-/remark-lint-heading-style-1.0.1.tgz",
-+      "integrity": "sha512-m9Gqr091YdxUtG69xdXYH8fSd3+nsrsMamB/qSWpVSZuWQKZ1mRotr1LO9NphJh6vhw8IfBtG07wgEDn6b40sQ==",
-+      "dev": true,
-+      "requires": {
-+        "mdast-util-heading-style": "1.0.3",
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-link-title-style": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-link-title-style/-/remark-lint-link-title-style-1.0.1.tgz",
-+      "integrity": "sha512-91MyqmZjokSzRbgvlKq5sLCJEFkM/MNKT1PDaWa3+GDLBGu7D4eMQGd2x49xX8IdJDEoWy5D8W+2Gb8XKWMUyw==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1",
-+        "vfile-location": "2.0.3"
-+      }
-+    },
-+    "remark-lint-list-item-content-indent": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-list-item-content-indent/-/remark-lint-list-item-content-indent-1.0.1.tgz",
-+      "integrity": "sha512-R5cdXFFywoBcg+2UUcF9OJ/vt9oqJv+KmTKIQV9CFHWeAfMFiZbxazsSPNaCcO1fW9622hxPCawN/AofDTbP7Q==",
-+      "dev": true,
-+      "requires": {
-+        "plur": "2.1.2",
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-list-item-indent": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-list-item-indent/-/remark-lint-list-item-indent-1.0.1.tgz",
-+      "integrity": "sha512-dSUFGQYtduuaos+5oXH89RTk0rGUe6DFf04q+rxQ7Z3YRbuXhAU2nYeY0/HENYiWJU1xFLteZkDvKMj0NfS3DQ==",
-+      "dev": true,
-+      "requires": {
-+        "plur": "2.1.2",
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-list-item-spacing": {
-+      "version": "1.1.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-list-item-spacing/-/remark-lint-list-item-spacing-1.1.1.tgz",
-+      "integrity": "sha512-HlPEzRq4LJB6tQ72zgIZ42mOaOSX92O268BLolys/H1x6N29/JNMLfurWqLsrxZrxxHH3H7EUP4dNM2P1kDGBw==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-maximum-heading-length": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-maximum-heading-length/-/remark-lint-maximum-heading-length-1.0.1.tgz",
-+      "integrity": "sha512-f8ChV9U238gncyvTqmzJ+UpCMj+hFyluWBjVYr2K8CNh+MdSivIxS4zw4170sBRoqNuS3gBxRHG9f4rmdqotJA==",
-+      "dev": true,
-+      "requires": {
-+        "mdast-util-to-string": "1.0.4",
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-maximum-line-length": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/remark-lint-maximum-line-length/-/remark-lint-maximum-line-length-1.0.2.tgz",
-+      "integrity": "sha512-M4UIXAAbtLgoQbTDVwdKOEFbTKtJSZ+pCW7ZqMFs+cbIN0Svm32LM9+xpVfVU0hLYt3Ypl++EAPfguBNe1PZEw==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-no-auto-link-without-protocol": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-no-auto-link-without-protocol/-/remark-lint-no-auto-link-without-protocol-1.0.1.tgz",
-+      "integrity": "sha512-MHl0hNtF8Rc0lg6iuVP7/0rnp4uZadm3S07/1TiFeqzU22KFxxzcC8980Q4+I8oPZE0d1x80h9DmkNAVFwhDjQ==",
-+      "dev": true,
-+      "requires": {
-+        "mdast-util-to-string": "1.0.4",
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-no-blockquote-without-marker": {
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-no-blockquote-without-marker/-/remark-lint-no-blockquote-without-marker-2.0.1.tgz",
-+      "integrity": "sha512-8VTQ/MP3flvG4U0tFSD+DMVT7F/4u9SnQLb/jjeRC3DzgbsIagIUqpWYAKkc+yBz9S/lgftA92lLP5PrlOa5DA==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1",
-+        "vfile-location": "2.0.3"
-+      }
-+    },
-+    "remark-lint-no-consecutive-blank-lines": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-no-consecutive-blank-lines/-/remark-lint-no-consecutive-blank-lines-1.0.1.tgz",
-+      "integrity": "sha512-IhyUiGTpb/hjtusIVg10q963KeL5CyNfbWOfDZ1KtY2tvdoSPRGrrCuTKo6OG8r1qavM6bU0mtRuIBqNh4lIzA==",
-+      "dev": true,
-+      "requires": {
-+        "plur": "2.1.2",
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-no-duplicate-headings": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-no-duplicate-headings/-/remark-lint-no-duplicate-headings-1.0.1.tgz",
-+      "integrity": "sha512-iZZxyZgwnjvDkydKZzqHBueJvIpGbxnITmgd8xN8TOLZoAg9/KGTQRAkotL1HXNRdkzwggfgB9ONxv/rWtYBmg==",
-+      "dev": true,
-+      "requires": {
-+        "mdast-util-to-string": "1.0.4",
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-no-emphasis-as-heading": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-no-emphasis-as-heading/-/remark-lint-no-emphasis-as-heading-1.0.1.tgz",
-+      "integrity": "sha512-+x17Hrjwne4Mhk2x/Zolnuv/sOclF1oYMDBSEYhBUpn/UAwxhXEXYKkeo0KkWA7Q3+UCLELJvzsk4cGNP6Sgow==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-no-file-name-articles": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-no-file-name-articles/-/remark-lint-no-file-name-articles-1.0.1.tgz",
-+      "integrity": "sha512-SzebnFnilrsINA6QZP1YqPa3SrfSotrLkRWl5FUCoVshBvEFNKJFWXj6Xyt4NjWQ5tJWFtOMysAuHdGT+Odhjg==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2"
-+      }
-+    },
-+    "remark-lint-no-file-name-consecutive-dashes": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-no-file-name-consecutive-dashes/-/remark-lint-no-file-name-consecutive-dashes-1.0.1.tgz",
-+      "integrity": "sha512-YP2HBwA00yeD7phvxp4ftiqbfBPfYHPgPfcEcb8oNa1WlUh/58cs9DbSHWKsZG+XLkvEaheC6qUQG02jEKZHPA==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2"
-+      }
-+    },
-+    "remark-lint-no-file-name-irregular-characters": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-no-file-name-irregular-characters/-/remark-lint-no-file-name-irregular-characters-1.0.1.tgz",
-+      "integrity": "sha512-+ks/V6OVMGOPZKw+fe2E4DPvLoslGxvdgtqXq2Nyz0cEdYX8RP45kI79V4w95H7UCJAeOFM9mZzVLvmCY1sEbg==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2"
-+      }
-+    },
-+    "remark-lint-no-file-name-mixed-case": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-no-file-name-mixed-case/-/remark-lint-no-file-name-mixed-case-1.0.1.tgz",
-+      "integrity": "sha512-bcqPsow1C0LrsKII1YehUO7VPOER7nze6FzsZZ8/NP+d200OL7Y7VMCqN1kscAvG+PTJgjznyXuLEpy7KQnVFg==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2"
-+      }
-+    },
-+    "remark-lint-no-file-name-outer-dashes": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/remark-lint-no-file-name-outer-dashes/-/remark-lint-no-file-name-outer-dashes-1.0.2.tgz",
-+      "integrity": "sha512-BVEwLrA4kipalgKrxhncpgtmh6eUmHBH1ggC+X3csYR4X5vXv4vHQqpov4I1vMyWxMLMBnq7lTL3Iqp0CS4vwg==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2"
-+      }
-+    },
-+    "remark-lint-no-heading-punctuation": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-no-heading-punctuation/-/remark-lint-no-heading-punctuation-1.0.1.tgz",
-+      "integrity": "sha512-/7kGRmPT+JLxEME1Z/rQn99mP8yr4qXFwcniKYsefR1jl8pCZciwCIp2Tq92Nn+FPELVrpk9sloRBb2JP3UB0A==",
-+      "dev": true,
-+      "requires": {
-+        "mdast-util-to-string": "1.0.4",
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-no-inline-padding": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-no-inline-padding/-/remark-lint-no-inline-padding-1.0.1.tgz",
-+      "integrity": "sha512-nRl6vA45ZPdMz3/rVMZw7WRRqLFuMrzhdkrbrGLjwBovdIeD/IGCEbDA5NR60g2xT9V5dAmKogvHEH1bIr8SdQ==",
-+      "dev": true,
-+      "requires": {
-+        "mdast-util-to-string": "1.0.4",
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-no-literal-urls": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-no-literal-urls/-/remark-lint-no-literal-urls-1.0.1.tgz",
-+      "integrity": "sha512-YMsZFVYQDt9gvpc6THL76GzyhCR+cK79vjyEOEmX+O3tOjxQstbi0oW6Lngbl1WbpkCW5TWEzSKOorQowYI2wg==",
-+      "dev": true,
-+      "requires": {
-+        "mdast-util-to-string": "1.0.4",
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-no-multiple-toplevel-headings": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-no-multiple-toplevel-headings/-/remark-lint-no-multiple-toplevel-headings-1.0.1.tgz",
-+      "integrity": "sha512-LFfgjF3NKFkt0tGNnJ8Exf8+DrVcMRwek5qu5mvh2KrZnmSpm5flYWzUy2UnnIyicDL3CZYC/r3Fjz6CeBYgZA==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-no-shell-dollars": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-no-shell-dollars/-/remark-lint-no-shell-dollars-1.0.1.tgz",
-+      "integrity": "sha512-YryHem73PTxjCkuC4HONJWHsmrLyXmF7r+cCH36Ys3vuWsfAbwkbOwpyuPB4KXn+6fHaTUfz/B5BPp3iwzJwyA==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-no-shortcut-reference-image": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-no-shortcut-reference-image/-/remark-lint-no-shortcut-reference-image-1.0.1.tgz",
-+      "integrity": "sha512-nUQ+4xB5hKZTCl9gvg7c+W1T3ddsnjgu4zwRza2Bn+21cKmUzx+z9dvlZ4aVuNGmxuWHbKI8/ZkKuB8Eu27vJw==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-no-shortcut-reference-link": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/remark-lint-no-shortcut-reference-link/-/remark-lint-no-shortcut-reference-link-1.0.2.tgz",
-+      "integrity": "sha512-A6ZexZ6XyQ7fXebrj5WgW5FkSJ81GobjWyMFVmBxgxPd9GH2BkRsZ10aFSkQQvfKSrqbnOL2vrigGMgbiERRxA==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-no-table-indentation": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-no-table-indentation/-/remark-lint-no-table-indentation-1.0.1.tgz",
-+      "integrity": "sha512-QrtT1GvJmAoNsWh+gmHFajFlM+ubm9rd3Cbz2OYPix8ZM6g907aIfG2NusJFXL9D8/CExQWYhlBvelFBbHgqbQ==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-ordered-list-marker-style": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-ordered-list-marker-style/-/remark-lint-ordered-list-marker-style-1.0.1.tgz",
-+      "integrity": "sha512-LJICUZIxqHHi360EP90zbDP+2QQIVVgPGlz0AatuR9ifd7xqAzraQKxsQajAZpuOepZgjBMTOz9L9W0Znx7ujA==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-ordered-list-marker-value": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-ordered-list-marker-value/-/remark-lint-ordered-list-marker-value-1.0.1.tgz",
-+      "integrity": "sha512-P6fYui3MvuB21+6AYH8Lbe7SVZ2VQL+FVJUuDCBhe01bgx6SajGmQ/f4Iqt0gCHEAaKw7e2B7tdwd36ifbs1EA==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-rule-style": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-rule-style/-/remark-lint-rule-style-1.0.1.tgz",
-+      "integrity": "sha512-dzH+K6DcPIIMBq6LUQgE4dR9TiQGZrQOoULD7m0Y0lIb2EoR2FK5Zd4TgZg/LnvTs6fid37t0xFoaY4/lXV/5Q==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-strong-marker": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-strong-marker/-/remark-lint-strong-marker-1.0.1.tgz",
-+      "integrity": "sha512-+bwWKWAqDwqd21Vw+ndqVFh5V27Dp4MKhk9AUlKmcvgJYHuvQ8UfWQdpZcP218ps/4EbwTfyi33TaPyXqOTlXA==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-table-cell-padding": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-table-cell-padding/-/remark-lint-table-cell-padding-1.0.1.tgz",
-+      "integrity": "sha512-o3WwC9YysXbQKf0D5nvhhJPcLagqedLwGdifukdgyaKvuIQVbtWbNv1/UOdB3LL+D+2fUrwrCmnQ8J3E1r0lBw==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-table-pipe-alignment": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-table-pipe-alignment/-/remark-lint-table-pipe-alignment-1.0.1.tgz",
-+      "integrity": "sha512-lYfK2gWGN45hYfAOZw5gscQ4uDaO9bJLp+H64jvrTQzBV+OCvB9kRQwI0oIrJAa4XMmipAZR+2XhjNSCfQ0fRA==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-table-pipes": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-table-pipes/-/remark-lint-table-pipes-1.0.1.tgz",
-+      "integrity": "sha512-VHfDRvcovLBl/cvSjwDoA0xRizdZU33A6F2qFD9A5hu1sDWgGxMLg5m2MOvFlRkUVxSwUv47cuD0/yxB4THYXQ==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-lint-unordered-list-marker-style": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/remark-lint-unordered-list-marker-style/-/remark-lint-unordered-list-marker-style-1.0.1.tgz",
-+      "integrity": "sha512-dHYD9cHM9ZJ7BKUZ1nEPGfLAHgUmYxccXtms1GSEM/uyUtR2SU/ao1RwZZ+LvacZFCNZ1yG2yKCJhGI/5U/GrA==",
-+      "dev": true,
-+      "requires": {
-+        "unified-lint-rule": "1.0.2",
-+        "unist-util-generated": "1.1.2",
-+        "unist-util-position": "3.0.1",
-+        "unist-util-visit": "1.3.1"
-+      }
-+    },
-+    "remark-message-control": {
-+      "version": "4.1.0",
-+      "resolved": "https://registry.npmjs.org/remark-message-control/-/remark-message-control-4.1.0.tgz",
-+      "integrity": "sha512-e1dszks4YKY7hLAkhS2367jBjBpAfvi+kVgSN/tOFrdp3qxITjiNR5fOFnyYF8vvorkQ9uxlKJoZUOW8T7rKDg==",
-+      "dev": true,
-+      "requires": {
-+        "mdast-comment-marker": "1.0.2",
-+        "unified-message-control": "1.0.4",
-+        "xtend": "4.0.1"
-+      }
-+    },
-+    "remark-parse": {
-+      "version": "4.0.0",
-+      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-4.0.0.tgz",
-+      "integrity": "sha512-XZgICP2gJ1MHU7+vQaRM+VA9HEL3X253uwUM/BGgx3iv6TH2B3bF3B8q00DKcyP9YrJV+/7WOWEWBFF/u8cIsw==",
-+      "dev": true,
-+      "requires": {
-+        "collapse-white-space": "1.0.4",
-+        "is-alphabetical": "1.0.2",
-+        "is-decimal": "1.0.2",
-+        "is-whitespace-character": "1.0.2",
-+        "is-word-character": "1.0.2",
-+        "markdown-escapes": "1.0.2",
-+        "parse-entities": "1.1.2",
-+        "repeat-string": "1.6.1",
-+        "state-toggle": "1.0.1",
-+        "trim": "0.0.1",
-+        "trim-trailing-lines": "1.1.1",
-+        "unherit": "1.1.1",
-+        "unist-util-remove-position": "1.1.2",
-+        "vfile-location": "2.0.3",
-+        "xtend": "4.0.1"
-+      }
-+    },
-+    "remark-preset-lint-markdown-style-guide": {
-+      "version": "2.1.1",
-+      "resolved": "https://registry.npmjs.org/remark-preset-lint-markdown-style-guide/-/remark-preset-lint-markdown-style-guide-2.1.1.tgz",
-+      "integrity": "sha512-Ao6fB63WuGtz1fa4rjoI+u1EOu21rWVGPmJlUKZlCICPPB6I815nJ52V0sLYjaw2cs+ZiXsXhdVinN7UpVgXcQ==",
-+      "dev": true,
-+      "requires": {
-+        "remark-lint": "6.0.1",
-+        "remark-lint-blockquote-indentation": "1.0.1",
-+        "remark-lint-code-block-style": "1.0.1",
-+        "remark-lint-definition-case": "1.0.1",
-+        "remark-lint-definition-spacing": "1.0.1",
-+        "remark-lint-emphasis-marker": "1.0.1",
-+        "remark-lint-fenced-code-flag": "1.0.1",
-+        "remark-lint-fenced-code-marker": "1.0.1",
-+        "remark-lint-file-extension": "1.0.1",
-+        "remark-lint-final-definition": "1.0.1",
-+        "remark-lint-hard-break-spaces": "1.0.2",
-+        "remark-lint-heading-increment": "1.0.1",
-+        "remark-lint-heading-style": "1.0.1",
-+        "remark-lint-link-title-style": "1.0.1",
-+        "remark-lint-list-item-content-indent": "1.0.1",
-+        "remark-lint-list-item-indent": "1.0.1",
-+        "remark-lint-list-item-spacing": "1.1.1",
-+        "remark-lint-maximum-heading-length": "1.0.1",
-+        "remark-lint-maximum-line-length": "1.0.2",
-+        "remark-lint-no-auto-link-without-protocol": "1.0.1",
-+        "remark-lint-no-blockquote-without-marker": "2.0.1",
-+        "remark-lint-no-consecutive-blank-lines": "1.0.1",
-+        "remark-lint-no-duplicate-headings": "1.0.1",
-+        "remark-lint-no-emphasis-as-heading": "1.0.1",
-+        "remark-lint-no-file-name-articles": "1.0.1",
-+        "remark-lint-no-file-name-consecutive-dashes": "1.0.1",
-+        "remark-lint-no-file-name-irregular-characters": "1.0.1",
-+        "remark-lint-no-file-name-mixed-case": "1.0.1",
-+        "remark-lint-no-file-name-outer-dashes": "1.0.2",
-+        "remark-lint-no-heading-punctuation": "1.0.1",
-+        "remark-lint-no-inline-padding": "1.0.1",
-+        "remark-lint-no-literal-urls": "1.0.1",
-+        "remark-lint-no-multiple-toplevel-headings": "1.0.1",
-+        "remark-lint-no-shell-dollars": "1.0.1",
-+        "remark-lint-no-shortcut-reference-image": "1.0.1",
-+        "remark-lint-no-shortcut-reference-link": "1.0.2",
-+        "remark-lint-no-table-indentation": "1.0.1",
-+        "remark-lint-ordered-list-marker-style": "1.0.1",
-+        "remark-lint-ordered-list-marker-value": "1.0.1",
-+        "remark-lint-rule-style": "1.0.1",
-+        "remark-lint-strong-marker": "1.0.1",
-+        "remark-lint-table-cell-padding": "1.0.1",
-+        "remark-lint-table-pipe-alignment": "1.0.1",
-+        "remark-lint-table-pipes": "1.0.1",
-+        "remark-lint-unordered-list-marker-style": "1.0.1"
-+      }
-+    },
-+    "remark-stringify": {
-+      "version": "4.0.0",
-+      "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-4.0.0.tgz",
-+      "integrity": "sha512-xLuyKTnuQer3ke9hkU38SUYLiTmS078QOnoFavztmbt/pAJtNSkNtFgR0U//uCcmG0qnyxao+PDuatQav46F1w==",
-+      "dev": true,
-+      "requires": {
-+        "ccount": "1.0.3",
-+        "is-alphanumeric": "1.0.0",
-+        "is-decimal": "1.0.2",
-+        "is-whitespace-character": "1.0.2",
-+        "longest-streak": "2.0.2",
-+        "markdown-escapes": "1.0.2",
-+        "markdown-table": "1.1.2",
-+        "mdast-util-compact": "1.0.1",
-+        "parse-entities": "1.1.2",
-+        "repeat-string": "1.6.1",
-+        "state-toggle": "1.0.1",
-+        "stringify-entities": "1.3.2",
-+        "unherit": "1.1.1",
-+        "xtend": "4.0.1"
-+=======
-+    "object.omit": {
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
-+      "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
-+      "dev": true,
-+      "requires": {
-+        "for-own": "0.1.5",
-+        "is-extendable": "0.1.1"
-+      }
-+    },
-+    "once": {
-+      "version": "1.4.0",
-+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-+      "dev": true,
-+      "requires": {
-+        "wrappy": "1.0.2"
-+      }
-+    },
-+    "onetime": {
-+      "version": "1.1.0",
-+      "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
-+      "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
-+      "dev": true
-+    },
-+    "optimist": {
-+      "version": "0.3.7",
-+      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
-+      "integrity": "sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=",
-+      "dev": true,
-+      "requires": {
-+        "wordwrap": "0.0.3"
-+      }
-+    },
-+    "optionator": {
-+      "version": "0.8.2",
-+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
-+      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
-+      "dev": true,
-+      "requires": {
-+        "deep-is": "0.1.3",
-+        "fast-levenshtein": "2.0.6",
-+        "levn": "0.3.0",
-+        "prelude-ls": "1.1.2",
-+        "type-check": "0.3.2",
-+        "wordwrap": "1.0.0"
-+      },
-+      "dependencies": {
-+        "wordwrap": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-+          "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "ora": {
-+      "version": "0.3.0",
-+      "resolved": "https://registry.npmjs.org/ora/-/ora-0.3.0.tgz",
-+      "integrity": "sha1-NnoHitJc+wltpQERXrW0AeB9dJU=",
-+      "dev": true,
-+      "requires": {
-+        "chalk": "1.1.3",
-+        "cli-cursor": "1.0.2",
-+        "cli-spinners": "0.2.0",
-+        "log-symbols": "1.0.2"
-+      },
-+      "dependencies": {
-+        "cli-spinners": {
-+          "version": "0.2.0",
-+          "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-0.2.0.tgz",
-+          "integrity": "sha1-hQeHN5E7iA9uyf/ntl6D7Hd2KE8=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "os-browserify": {
-+      "version": "0.1.2",
-+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz",
-+      "integrity": "sha1-ScoCk+CxlZCl9d4Qx/JlphfY/lQ=",
-+      "dev": true
-+    },
-+    "os-homedir": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-+      "dev": true
-+    },
-+    "os-locale": {
-+      "version": "1.4.0",
-+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-+      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-+      "dev": true,
-+      "requires": {
-+        "lcid": "1.0.0"
-+      }
-+    },
-+    "os-tmpdir": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-+      "dev": true
-+    },
-+    "p-finally": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
-+      "dev": true
-+    },
-+    "p-limit": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz",
-+      "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==",
-+      "dev": true,
-+      "requires": {
-+        "p-try": "1.0.0"
-+      }
-+    },
-+    "p-locate": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-+      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-+      "dev": true,
-+      "requires": {
-+        "p-limit": "1.2.0"
-+      }
-+    },
-+    "p-try": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-+      "dev": true
-+    },
-+    "package-json": {
-+      "version": "4.0.1",
-+      "resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz",
-+      "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=",
-+      "dev": true,
-+      "requires": {
-+        "got": "6.7.1",
-+        "registry-auth-token": "3.3.2",
-+        "registry-url": "3.1.0",
-+        "semver": "5.5.0"
-+      }
-+    },
-+    "pako": {
-+      "version": "0.2.9",
-+      "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
-+      "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=",
-+      "dev": true
-+    },
-+    "parents": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz",
-+      "integrity": "sha1-/t1NK/GTp3dF/nHjcdc8MwfZx1E=",
-+      "dev": true,
-+      "requires": {
-+        "path-platform": "0.11.15"
-+      }
-+    },
-+    "parse-asn1": {
-+      "version": "5.1.0",
-+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz",
-+      "integrity": "sha1-N8T5t+06tlx0gXtfJICTf7+XxxI=",
-+      "dev": true,
-+      "requires": {
-+        "asn1.js": "4.10.1",
-+        "browserify-aes": "1.1.1",
-+        "create-hash": "1.1.3",
-+        "evp_bytestokey": "1.0.3",
-+        "pbkdf2": "3.0.14"
-+      }
-+    },
-+    "parse-github-repo-url": {
-+      "version": "1.4.1",
-+      "resolved": "https://registry.npmjs.org/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz",
-+      "integrity": "sha1-nn2LslKmy2ukJZUGC3v23z28H1A=",
-+      "dev": true
-+    },
-+    "parse-gitignore": {
-+      "version": "0.4.0",
-+      "resolved": "https://registry.npmjs.org/parse-gitignore/-/parse-gitignore-0.4.0.tgz",
-+      "integrity": "sha1-q/cC5LkAUk//eQK2g4YoV7Y/k/4=",
-+      "dev": true,
-+      "requires": {
-+        "array-unique": "0.3.2",
-+        "is-glob": "3.1.0"
-+      },
-+      "dependencies": {
-+        "array-unique": {
-+          "version": "0.3.2",
-+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-+          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-+          "dev": true
-+        },
-+        "is-extglob": {
-+          "version": "2.1.1",
-+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-+          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-+          "dev": true
-+        },
-+        "is-glob": {
-+          "version": "3.1.0",
-+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-+          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-+          "dev": true,
-+          "requires": {
-+            "is-extglob": "2.1.1"
-+          }
-+        }
-+      }
-+    },
-+    "parse-glob": {
-+      "version": "3.0.4",
-+      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
-+      "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
-+      "dev": true,
-+      "requires": {
-+        "glob-base": "0.3.0",
-+        "is-dotfile": "1.0.3",
-+        "is-extglob": "1.0.0",
-+        "is-glob": "2.0.1"
-+      }
-+    },
-+    "parse-json": {
-+      "version": "2.2.0",
-+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-+      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-+      "dev": true,
-+      "requires": {
-+        "error-ex": "1.3.1"
-+      }
-+    },
-+    "parse5": {
-+      "version": "1.5.1",
-+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz",
-+      "integrity": "sha1-m387DeMr543CQBsXVzzK8Pb1nZQ=",
-+      "dev": true,
-+      "optional": true
-+    },
-+    "path-browserify": {
-+      "version": "0.0.0",
-+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
-+      "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
-+      "dev": true
-+    },
-+    "path-exists": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-+      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-+      "dev": true,
-+      "requires": {
-+        "pinkie-promise": "2.0.1"
-+      }
-+    },
-+    "path-is-absolute": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-+      "dev": true
-+    },
-+    "path-is-inside": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-+      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
-+      "dev": true
-+    },
-+    "path-key": {
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
-+      "dev": true
-+    },
-+    "path-parse": {
-+      "version": "1.0.5",
-+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
-+      "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
-+      "dev": true
-+    },
-+    "path-platform": {
-+      "version": "0.11.15",
-+      "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz",
-+      "integrity": "sha1-6GQhf3TDaFDwhSt43Hv31KVyG/I=",
-+      "dev": true
-+    },
-+    "path-type": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-+      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-+      "dev": true,
-+      "requires": {
-+        "graceful-fs": "4.1.11",
-+        "pify": "2.3.0",
-+        "pinkie-promise": "2.0.1"
-+      }
-+    },
-+    "pbkdf2": {
-+      "version": "3.0.14",
-+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz",
-+      "integrity": "sha512-gjsZW9O34fm0R7PaLHRJmLLVfSoesxztjPjE9o6R+qtVJij90ltg1joIovN9GKrRW3t1PzhDDG3UMEMFfZ+1wA==",
-+      "dev": true,
-+      "requires": {
-+        "create-hash": "1.1.3",
-+        "create-hmac": "1.1.6",
-+        "ripemd160": "2.0.1",
-+        "safe-buffer": "5.1.1",
-+        "sha.js": "2.4.10"
-+      }
-+    },
-+    "peek-stream": {
-+      "version": "1.1.2",
-+      "resolved": "https://registry.npmjs.org/peek-stream/-/peek-stream-1.1.2.tgz",
-+      "integrity": "sha1-l+t2NlvP2MieKH9VyLadTD6bzFI=",
-+      "dev": true,
-+      "requires": {
-+        "duplexify": "3.5.4",
-+        "through2": "2.0.3"
-+      }
-+    },
-+    "performance-now": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-+      "dev": true
-+    },
-+    "pify": {
-+      "version": "2.3.0",
-+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-+      "dev": true
-+    },
-+    "pinkie": {
-+      "version": "2.0.4",
-+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-+      "dev": true
-+    },
-+    "pinkie-promise": {
-+      "version": "2.0.1",
-+      "resolved": "http://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-+      "dev": true,
-+      "requires": {
-+        "pinkie": "2.0.4"
-+      }
-+    },
-+    "pkg-conf": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-2.1.0.tgz",
-+      "integrity": "sha1-ISZRTKbyq/69FoWW3xi6V4Z/AFg=",
-+      "dev": true,
-+      "requires": {
-+        "find-up": "2.1.0",
-+        "load-json-file": "4.0.0"
-+      },
-+      "dependencies": {
-+        "find-up": {
-+          "version": "2.1.0",
-+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-+          "dev": true,
-+          "requires": {
-+            "locate-path": "2.0.0"
-+          }
-+        },
-+        "load-json-file": {
-+          "version": "4.0.0",
-+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
-+          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
-+          "dev": true,
-+          "requires": {
-+            "graceful-fs": "4.1.11",
-+            "parse-json": "4.0.0",
-+            "pify": "3.0.0",
-+            "strip-bom": "3.0.0"
-+          }
-+        },
-+        "parse-json": {
-+          "version": "4.0.0",
-+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-+          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
-+          "dev": true,
-+          "requires": {
-+            "error-ex": "1.3.1",
-+            "json-parse-better-errors": "1.0.1"
-+          }
-+        },
-+        "pify": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-+          "dev": true
-+        },
-+        "strip-bom": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "pkg-config": {
-+      "version": "1.1.1",
-+      "resolved": "https://registry.npmjs.org/pkg-config/-/pkg-config-1.1.1.tgz",
-+      "integrity": "sha1-VX7yLXPaPIg3EHdmxS6tq94pj+Q=",
-+      "dev": true,
-+      "requires": {
-+        "debug-log": "1.0.1",
-+        "find-root": "1.1.0",
-+        "xtend": "4.0.1"
-+      }
-+    },
-+    "pkg-dir": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz",
-+      "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=",
-+      "dev": true,
-+      "requires": {
-+        "find-up": "1.1.2"
-+      }
-+    },
-+    "pkg-up": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-1.0.0.tgz",
-+      "integrity": "sha1-Pgj7RhUlxEIWJKM7n35tCvWwWiY=",
-+      "dev": true,
-+      "requires": {
-+        "find-up": "1.1.2"
-+      }
-+    },
-+    "pluralize": {
-+      "version": "1.2.1",
-+      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz",
-+      "integrity": "sha1-0aIUg/0iu0HlihL6NCGCMUCJfEU=",
-+      "dev": true
-+    },
-+    "prelude-ls": {
-+      "version": "1.1.2",
-+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-+      "dev": true
-+    },
-+    "prepend-http": {
-+      "version": "1.0.4",
-+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
-+      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
-+      "dev": true
-+    },
-+    "preserve": {
-+      "version": "0.2.0",
-+      "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
-+      "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
-+      "dev": true
-+    },
-+    "pretty-bytes": {
-+      "version": "1.0.4",
-+      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz",
-+      "integrity": "sha1-CiLoIQYJrTVUL4yNXSFZr/B1HIQ=",
-+      "dev": true,
-+      "requires": {
-+        "get-stdin": "4.0.1",
-+        "meow": "3.7.0"
-+      },
-+      "dependencies": {
-+        "camelcase": {
-+          "version": "2.1.1",
-+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-+          "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
-+          "dev": true
-+        },
-+        "camelcase-keys": {
-+          "version": "2.1.0",
-+          "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
-+          "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
-+          "dev": true,
-+          "requires": {
-+            "camelcase": "2.1.1",
-+            "map-obj": "1.0.1"
-+          }
-+        },
-+        "indent-string": {
-+          "version": "2.1.0",
-+          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-+          "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
-+          "dev": true,
-+          "requires": {
-+            "repeating": "2.0.1"
-+          }
-+        },
-+        "map-obj": {
-+          "version": "1.0.1",
-+          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-+          "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-+          "dev": true
-+        },
-+        "meow": {
-+          "version": "3.7.0",
-+          "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-+          "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
-+          "dev": true,
-+          "requires": {
-+            "camelcase-keys": "2.1.0",
-+            "decamelize": "1.2.0",
-+            "loud-rejection": "1.6.0",
-+            "map-obj": "1.0.1",
-+            "minimist": "1.2.0",
-+            "normalize-package-data": "2.4.0",
-+            "object-assign": "4.1.1",
-+            "read-pkg-up": "1.0.1",
-+            "redent": "1.0.0",
-+            "trim-newlines": "1.0.0"
-+          }
-+        },
-+        "redent": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-+          "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
-+          "dev": true,
-+          "requires": {
-+            "indent-string": "2.1.0",
-+            "strip-indent": "1.0.1"
-+          }
-+        },
-+        "strip-indent": {
-+          "version": "1.0.1",
-+          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
-+          "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
-+          "dev": true,
-+          "requires": {
-+            "get-stdin": "4.0.1"
-+          }
-+        },
-+        "trim-newlines": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-+          "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "process": {
-+      "version": "0.11.10",
-+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-+      "dev": true
-+    },
-+    "process-nextick-args": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-+      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
-+      "dev": true
-+    },
-+    "progress": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz",
-+      "integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=",
-+      "dev": true
-+    },
-+    "progress-stream": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/progress-stream/-/progress-stream-1.2.0.tgz",
-+      "integrity": "sha1-LNPP6jO6OonJwSHsM0er6asSX3c=",
-+      "dev": true,
-+      "requires": {
-+        "speedometer": "0.1.4",
-+        "through2": "0.2.3"
-+      },
-+      "dependencies": {
-+        "through2": {
-+          "version": "0.2.3",
-+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
-+          "integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=",
-+          "dev": true,
-+          "requires": {
-+            "readable-stream": "1.1.14",
-+            "xtend": "2.1.2"
-+          }
-+        },
-+        "xtend": {
-+          "version": "2.1.2",
-+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
-+          "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
-+          "dev": true,
-+          "requires": {
-+            "object-keys": "0.4.0"
-+          }
-+        }
-+      }
-+    },
-+    "pseudomap": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
-+      "dev": true
-+    },
-+    "public-encrypt": {
-+      "version": "4.0.0",
-+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz",
-+      "integrity": "sha1-OfaZ86RlYN1eusvKaTyvfGXBjMY=",
-+      "dev": true,
-+      "requires": {
-+        "bn.js": "4.11.8",
-+        "browserify-rsa": "4.0.1",
-+        "create-hash": "1.1.3",
-+        "parse-asn1": "5.1.0",
-+        "randombytes": "2.0.6"
-+      }
-+    },
-+    "pump": {
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
-+      "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-visit": "1.3.1"
-+        "end-of-stream": "1.4.1",
-+        "once": "1.4.0"
-       }
-     },
--    "remark-lint-no-shortcut-reference-image": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-no-shortcut-reference-image/-/remark-lint-no-shortcut-reference-image-1.0.1.tgz",
--      "integrity": "sha512-nUQ+4xB5hKZTCl9gvg7c+W1T3ddsnjgu4zwRza2Bn+21cKmUzx+z9dvlZ4aVuNGmxuWHbKI8/ZkKuB8Eu27vJw==",
-+    "pumpify": {
-+      "version": "1.4.0",
-+      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.4.0.tgz",
-+      "integrity": "sha512-2kmNR9ry+Pf45opRVirpNuIFotsxUGLaYqxIwuR77AYrYRMuFCz9eryHBS52L360O+NcR383CL4QYlMKPq4zYA==",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-visit": "1.3.1"
-+        "duplexify": "3.5.4",
-+        "inherits": "2.0.3",
-+        "pump": "2.0.1"
-       }
-     },
--    "remark-lint-no-shortcut-reference-link": {
--      "version": "1.0.2",
--      "resolved": "https://registry.npmjs.org/remark-lint-no-shortcut-reference-link/-/remark-lint-no-shortcut-reference-link-1.0.2.tgz",
--      "integrity": "sha512-A6ZexZ6XyQ7fXebrj5WgW5FkSJ81GobjWyMFVmBxgxPd9GH2BkRsZ10aFSkQQvfKSrqbnOL2vrigGMgbiERRxA==",
-+    "punycode": {
-+      "version": "1.4.1",
-+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-+      "dev": true
-+    },
-+    "q": {
-+      "version": "1.5.1",
-+      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-+      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
-+      "dev": true
-+    },
-+    "qs": {
-+      "version": "6.5.1",
-+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
-+      "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==",
-+      "dev": true
-+    },
-+    "querystring": {
-+      "version": "0.2.0",
-+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
-+      "dev": true
-+    },
-+    "querystring-es3": {
-+      "version": "0.2.1",
-+      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-+      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
-+      "dev": true
-+    },
-+    "quick-lru": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz",
-+      "integrity": "sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=",
-+      "dev": true
-+    },
-+    "randomatic": {
-+      "version": "1.1.7",
-+      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
-+      "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-visit": "1.3.1"
-+        "is-number": "3.0.0",
-+        "kind-of": "4.0.0"
-+      },
-+      "dependencies": {
-+        "is-number": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-+          "dev": true,
-+          "requires": {
-+            "kind-of": "3.2.2"
-+          },
-+          "dependencies": {
-+            "kind-of": {
-+              "version": "3.2.2",
-+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-+              "dev": true,
-+              "requires": {
-+                "is-buffer": "1.1.6"
-+              }
-+            }
-+          }
-+        },
-+        "kind-of": {
-+          "version": "4.0.0",
-+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-+          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-+          "dev": true,
-+          "requires": {
-+            "is-buffer": "1.1.6"
-+          }
-+        }
-       }
-     },
--    "remark-lint-no-table-indentation": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-no-table-indentation/-/remark-lint-no-table-indentation-1.0.1.tgz",
--      "integrity": "sha512-QrtT1GvJmAoNsWh+gmHFajFlM+ubm9rd3Cbz2OYPix8ZM6g907aIfG2NusJFXL9D8/CExQWYhlBvelFBbHgqbQ==",
-+    "randombytes": {
-+      "version": "2.0.6",
-+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz",
-+      "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "safe-buffer": "5.1.1"
-       }
-     },
--    "remark-lint-ordered-list-marker-style": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-ordered-list-marker-style/-/remark-lint-ordered-list-marker-style-1.0.1.tgz",
--      "integrity": "sha512-LJICUZIxqHHi360EP90zbDP+2QQIVVgPGlz0AatuR9ifd7xqAzraQKxsQajAZpuOepZgjBMTOz9L9W0Znx7ujA==",
-+    "randomfill": {
-+      "version": "1.0.4",
-+      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "randombytes": "2.0.6",
-+        "safe-buffer": "5.1.1"
-       }
-     },
--    "remark-lint-ordered-list-marker-value": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-ordered-list-marker-value/-/remark-lint-ordered-list-marker-value-1.0.1.tgz",
--      "integrity": "sha512-P6fYui3MvuB21+6AYH8Lbe7SVZ2VQL+FVJUuDCBhe01bgx6SajGmQ/f4Iqt0gCHEAaKw7e2B7tdwd36ifbs1EA==",
-+    "rc": {
-+      "version": "1.2.6",
-+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.6.tgz",
-+      "integrity": "sha1-6xiYnG1PTxYsOZ953dKfODVWgJI=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "deep-extend": "0.4.2",
-+        "ini": "1.3.5",
-+        "minimist": "1.2.0",
-+        "strip-json-comments": "2.0.1"
-       }
-     },
--    "remark-lint-rule-style": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-rule-style/-/remark-lint-rule-style-1.0.1.tgz",
--      "integrity": "sha512-dzH+K6DcPIIMBq6LUQgE4dR9TiQGZrQOoULD7m0Y0lIb2EoR2FK5Zd4TgZg/LnvTs6fid37t0xFoaY4/lXV/5Q==",
-+    "read-only-stream": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/read-only-stream/-/read-only-stream-2.0.0.tgz",
-+      "integrity": "sha1-JyT9aoET1zdkrCiNQ4YnDB2/F/A=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "readable-stream": "2.3.5"
-+      },
-+      "dependencies": {
-+        "isarray": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-+          "dev": true
-+        },
-+        "readable-stream": {
-+          "version": "2.3.5",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
-+          "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
-+          "dev": true,
-+          "requires": {
-+            "core-util-is": "1.0.2",
-+            "inherits": "2.0.3",
-+            "isarray": "1.0.0",
-+            "process-nextick-args": "2.0.0",
-+            "safe-buffer": "5.1.1",
-+            "string_decoder": "1.0.3",
-+            "util-deprecate": "1.0.2"
-+          }
-+        },
-+        "string_decoder": {
-+          "version": "1.0.3",
-+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-+          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-+          "dev": true,
-+          "requires": {
-+            "safe-buffer": "5.1.1"
-+          }
-+        }
-       }
-     },
--    "remark-lint-strong-marker": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-strong-marker/-/remark-lint-strong-marker-1.0.1.tgz",
--      "integrity": "sha512-+bwWKWAqDwqd21Vw+ndqVFh5V27Dp4MKhk9AUlKmcvgJYHuvQ8UfWQdpZcP218ps/4EbwTfyi33TaPyXqOTlXA==",
-+    "read-pkg": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-+      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "load-json-file": "1.1.0",
-+        "normalize-package-data": "2.4.0",
-+        "path-type": "1.1.0"
-       }
-     },
--    "remark-lint-table-cell-padding": {
-+    "read-pkg-up": {
-       "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-table-cell-padding/-/remark-lint-table-cell-padding-1.0.1.tgz",
--      "integrity": "sha512-o3WwC9YysXbQKf0D5nvhhJPcLagqedLwGdifukdgyaKvuIQVbtWbNv1/UOdB3LL+D+2fUrwrCmnQ8J3E1r0lBw==",
-+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-+      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "find-up": "1.1.2",
-+        "read-pkg": "1.1.0"
-       }
-     },
--    "remark-lint-table-pipe-alignment": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-table-pipe-alignment/-/remark-lint-table-pipe-alignment-1.0.1.tgz",
--      "integrity": "sha512-lYfK2gWGN45hYfAOZw5gscQ4uDaO9bJLp+H64jvrTQzBV+OCvB9kRQwI0oIrJAa4XMmipAZR+2XhjNSCfQ0fRA==",
-+    "readable-stream": {
-+      "version": "1.1.14",
-+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-+      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "core-util-is": "1.0.2",
-+        "inherits": "2.0.3",
-+        "isarray": "0.0.1",
-+        "string_decoder": "0.10.31"
-       }
-     },
--    "remark-lint-table-pipes": {
-+    "readline2": {
-       "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-table-pipes/-/remark-lint-table-pipes-1.0.1.tgz",
--      "integrity": "sha512-VHfDRvcovLBl/cvSjwDoA0xRizdZU33A6F2qFD9A5hu1sDWgGxMLg5m2MOvFlRkUVxSwUv47cuD0/yxB4THYXQ==",
-+      "resolved": "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz",
-+      "integrity": "sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "code-point-at": "1.1.0",
-+        "is-fullwidth-code-point": "1.0.0",
-+        "mute-stream": "0.0.5"
-       }
-     },
--    "remark-lint-unordered-list-marker-style": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/remark-lint-unordered-list-marker-style/-/remark-lint-unordered-list-marker-style-1.0.1.tgz",
--      "integrity": "sha512-dHYD9cHM9ZJ7BKUZ1nEPGfLAHgUmYxccXtms1GSEM/uyUtR2SU/ao1RwZZ+LvacZFCNZ1yG2yKCJhGI/5U/GrA==",
-+    "rechoir": {
-+      "version": "0.6.2",
-+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
-+      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
-       "dev": true,
-       "requires": {
--        "unified-lint-rule": "1.0.2",
--        "unist-util-generated": "1.1.2",
--        "unist-util-position": "3.0.1",
--        "unist-util-visit": "1.3.1"
-+        "resolve": "1.5.0"
-       }
-     },
--    "remark-message-control": {
--      "version": "4.1.0",
--      "resolved": "https://registry.npmjs.org/remark-message-control/-/remark-message-control-4.1.0.tgz",
--      "integrity": "sha512-e1dszks4YKY7hLAkhS2367jBjBpAfvi+kVgSN/tOFrdp3qxITjiNR5fOFnyYF8vvorkQ9uxlKJoZUOW8T7rKDg==",
-+    "redent": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz",
-+      "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=",
-       "dev": true,
-       "requires": {
--        "mdast-comment-marker": "1.0.2",
--        "unified-message-control": "1.0.4",
--        "xtend": "4.0.1"
-+        "indent-string": "3.2.0",
-+        "strip-indent": "2.0.0"
-       }
-     },
--    "remark-parse": {
--      "version": "4.0.0",
--      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-4.0.0.tgz",
--      "integrity": "sha512-XZgICP2gJ1MHU7+vQaRM+VA9HEL3X253uwUM/BGgx3iv6TH2B3bF3B8q00DKcyP9YrJV+/7WOWEWBFF/u8cIsw==",
--      "dev": true,
--      "requires": {
--        "collapse-white-space": "1.0.4",
--        "is-alphabetical": "1.0.2",
--        "is-decimal": "1.0.2",
--        "is-whitespace-character": "1.0.2",
--        "is-word-character": "1.0.2",
--        "markdown-escapes": "1.0.2",
--        "parse-entities": "1.1.2",
--        "repeat-string": "1.6.1",
--        "state-toggle": "1.0.1",
--        "trim": "0.0.1",
--        "trim-trailing-lines": "1.1.1",
--        "unherit": "1.1.1",
--        "unist-util-remove-position": "1.1.2",
--        "vfile-location": "2.0.3",
--        "xtend": "4.0.1"
-+    "regex-cache": {
-+      "version": "0.4.4",
-+      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
-+      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
-+      "dev": true,
-+      "requires": {
-+        "is-equal-shallow": "0.1.3"
-       }
-     },
--    "remark-preset-lint-markdown-style-guide": {
--      "version": "2.1.1",
--      "resolved": "https://registry.npmjs.org/remark-preset-lint-markdown-style-guide/-/remark-preset-lint-markdown-style-guide-2.1.1.tgz",
--      "integrity": "sha512-Ao6fB63WuGtz1fa4rjoI+u1EOu21rWVGPmJlUKZlCICPPB6I815nJ52V0sLYjaw2cs+ZiXsXhdVinN7UpVgXcQ==",
-+    "registry-auth-token": {
-+      "version": "3.3.2",
-+      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz",
-+      "integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==",
-       "dev": true,
-       "requires": {
--        "remark-lint": "6.0.1",
--        "remark-lint-blockquote-indentation": "1.0.1",
--        "remark-lint-code-block-style": "1.0.1",
--        "remark-lint-definition-case": "1.0.1",
--        "remark-lint-definition-spacing": "1.0.1",
--        "remark-lint-emphasis-marker": "1.0.1",
--        "remark-lint-fenced-code-flag": "1.0.1",
--        "remark-lint-fenced-code-marker": "1.0.1",
--        "remark-lint-file-extension": "1.0.1",
--        "remark-lint-final-definition": "1.0.1",
--        "remark-lint-hard-break-spaces": "1.0.2",
--        "remark-lint-heading-increment": "1.0.1",
--        "remark-lint-heading-style": "1.0.1",
--        "remark-lint-link-title-style": "1.0.1",
--        "remark-lint-list-item-content-indent": "1.0.1",
--        "remark-lint-list-item-indent": "1.0.1",
--        "remark-lint-list-item-spacing": "1.1.1",
--        "remark-lint-maximum-heading-length": "1.0.1",
--        "remark-lint-maximum-line-length": "1.0.2",
--        "remark-lint-no-auto-link-without-protocol": "1.0.1",
--        "remark-lint-no-blockquote-without-marker": "2.0.1",
--        "remark-lint-no-consecutive-blank-lines": "1.0.1",
--        "remark-lint-no-duplicate-headings": "1.0.1",
--        "remark-lint-no-emphasis-as-heading": "1.0.1",
--        "remark-lint-no-file-name-articles": "1.0.1",
--        "remark-lint-no-file-name-consecutive-dashes": "1.0.1",
--        "remark-lint-no-file-name-irregular-characters": "1.0.1",
--        "remark-lint-no-file-name-mixed-case": "1.0.1",
--        "remark-lint-no-file-name-outer-dashes": "1.0.2",
--        "remark-lint-no-heading-punctuation": "1.0.1",
--        "remark-lint-no-inline-padding": "1.0.1",
--        "remark-lint-no-literal-urls": "1.0.1",
--        "remark-lint-no-multiple-toplevel-headings": "1.0.1",
--        "remark-lint-no-shell-dollars": "1.0.1",
--        "remark-lint-no-shortcut-reference-image": "1.0.1",
--        "remark-lint-no-shortcut-reference-link": "1.0.2",
--        "remark-lint-no-table-indentation": "1.0.1",
--        "remark-lint-ordered-list-marker-style": "1.0.1",
--        "remark-lint-ordered-list-marker-value": "1.0.1",
--        "remark-lint-rule-style": "1.0.1",
--        "remark-lint-strong-marker": "1.0.1",
--        "remark-lint-table-cell-padding": "1.0.1",
--        "remark-lint-table-pipe-alignment": "1.0.1",
--        "remark-lint-table-pipes": "1.0.1",
--        "remark-lint-unordered-list-marker-style": "1.0.1"
-+        "rc": "1.2.6",
-+        "safe-buffer": "5.1.1"
-       }
-     },
--    "remark-stringify": {
--      "version": "4.0.0",
--      "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-4.0.0.tgz",
--      "integrity": "sha512-xLuyKTnuQer3ke9hkU38SUYLiTmS078QOnoFavztmbt/pAJtNSkNtFgR0U//uCcmG0qnyxao+PDuatQav46F1w==",
-+    "registry-url": {
-+      "version": "3.1.0",
-+      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz",
-+      "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=",
-       "dev": true,
-       "requires": {
--        "ccount": "1.0.3",
--        "is-alphanumeric": "1.0.0",
--        "is-decimal": "1.0.2",
--        "is-whitespace-character": "1.0.2",
--        "longest-streak": "2.0.2",
--        "markdown-escapes": "1.0.2",
--        "markdown-table": "1.1.2",
--        "mdast-util-compact": "1.0.1",
--        "parse-entities": "1.1.2",
--        "repeat-string": "1.6.1",
--        "state-toggle": "1.0.1",
--        "stringify-entities": "1.3.2",
--        "unherit": "1.1.1",
--        "xtend": "4.0.1"
-+        "rc": "1.2.6"
-+>>>>>>> .their
-       }
-     },
-     "remove-trailing-separator": {
-@@ -7954,12 +11727,15 @@
-         "is-finite": "1.0.2"
-       }
-     },
-+<<<<<<< .our
-     "replace-ext": {
-       "version": "1.0.0",
-       "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
-       "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "request": {
-       "version": "2.85.0",
-       "resolved": "https://registry.npmjs.org/request/-/request-2.85.0.tgz",
-@@ -7967,7 +11743,11 @@
-       "dev": true,
-       "requires": {
-         "aws-sign2": "0.7.0",
-+<<<<<<< .our
-         "aws4": "1.7.0",
-+=======
-+        "aws4": "1.6.0",
-+>>>>>>> .their
-         "caseless": "0.12.0",
-         "combined-stream": "1.0.6",
-         "extend": "3.0.1",
-@@ -7982,9 +11762,15 @@
-         "mime-types": "2.1.18",
-         "oauth-sign": "0.8.2",
-         "performance-now": "2.1.0",
-+<<<<<<< .our
-         "qs": "6.5.2",
-         "safe-buffer": "5.1.2",
-         "stringstream": "0.0.6",
-+=======
-+        "qs": "6.5.1",
-+        "safe-buffer": "5.1.1",
-+        "stringstream": "0.0.5",
-+>>>>>>> .their
-         "tough-cookie": "2.3.4",
-         "tunnel-agent": "0.6.0",
-         "uuid": "3.2.1"
-@@ -8010,6 +11796,7 @@
-       "requires": {
-         "caller-path": "0.1.0",
-         "resolve-from": "1.0.1"
-+<<<<<<< .our
-       },
-       "dependencies": {
-         "resolve-from": {
-@@ -8024,15 +11811,29 @@
-       "version": "1.7.1",
-       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz",
-       "integrity": "sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw==",
-+=======
-+      }
-+    },
-+    "resolve": {
-+      "version": "1.5.0",
-+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz",
-+      "integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "path-parse": "1.0.5"
-       }
-     },
-     "resolve-from": {
-+<<<<<<< .our
-       "version": "4.0.0",
-       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-+=======
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
-+      "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "restore-cursor": {
-@@ -8064,7 +11865,11 @@
-     "rimraf": {
-       "version": "2.6.2",
-       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-LtgVDSShbqhlHm1u8PR8QVjOejY=",
-+=======
-+      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "glob": "7.1.2"
-@@ -8073,7 +11878,11 @@
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "fs.realpath": "1.0.0",
-@@ -8087,12 +11896,21 @@
-       }
-     },
-     "ripemd160": {
-+<<<<<<< .our
-       "version": "2.0.2",
-       "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-       "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-       "dev": true,
-       "requires": {
-         "hash-base": "3.0.4",
-+=======
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz",
-+      "integrity": "sha1-D0WEKVxTo2KK9+bXmsohzlfRxuc=",
-+      "dev": true,
-+      "requires": {
-+        "hash-base": "2.0.2",
-+>>>>>>> .their
-         "inherits": "2.0.3"
-       }
-     },
-@@ -8106,9 +11924,15 @@
-       }
-     },
-     "run-parallel": {
-+<<<<<<< .our
-       "version": "1.1.9",
-       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz",
-       "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==",
-+=======
-+      "version": "1.1.7",
-+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.7.tgz",
-+      "integrity": "sha512-nB641a6enJOh0fdsFHR9SiVCiOlAyjMplImDdjV3kWCzJZw9rwzvGwmpGuPmfX//Yxblh0pkzPcFcxA81iwmxA==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "rx-lite": {
-@@ -8118,15 +11942,25 @@
-       "dev": true
-     },
-     "safe-buffer": {
-+<<<<<<< .our
-       "version": "5.1.2",
-       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-+=======
-+      "version": "5.1.1",
-+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-+      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "sax": {
-       "version": "1.2.4",
-       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-KBYjTiN4vdxOU1T6tcqold9xANk=",
-+=======
-+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-+>>>>>>> .their
-       "dev": true,
-       "optional": true
-     },
-@@ -8145,6 +11979,7 @@
-         "semver": "5.5.0"
-       }
-     },
-+<<<<<<< .our
-     "send": {
-       "version": "0.16.2",
-       "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
-@@ -8294,12 +12129,15 @@
-         }
-       }
-     },
-+=======
-+>>>>>>> .their
-     "set-blocking": {
-       "version": "2.0.0",
-       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-       "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "set-immediate-shim": {
-       "version": "1.0.1",
-       "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
-@@ -8320,6 +12158,16 @@
-       "requires": {
-         "inherits": "2.0.3",
-         "safe-buffer": "5.1.2"
-+=======
-+    "sha.js": {
-+      "version": "2.4.10",
-+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.10.tgz",
-+      "integrity": "sha512-vnwmrFDlOExK4Nm16J2KMWHLrp14lBrjxMxBJpu++EnsuBmpiYaM/MEs46Vxxm/4FvdP5yTwuCTO9it5FSjrqA==",
-+      "dev": true,
-+      "requires": {
-+        "inherits": "2.0.3",
-+        "safe-buffer": "5.1.1"
-+>>>>>>> .their
-       }
-     },
-     "shasum": {
-@@ -8329,7 +12177,11 @@
-       "dev": true,
-       "requires": {
-         "json-stable-stringify": "0.0.1",
-+<<<<<<< .our
-         "sha.js": "2.4.11"
-+=======
-+        "sha.js": "2.4.10"
-+>>>>>>> .their
-       }
-     },
-     "shebang-command": {
-@@ -8373,7 +12225,11 @@
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "fs.realpath": "1.0.0",
-@@ -8386,12 +12242,15 @@
-         }
-       }
-     },
-+<<<<<<< .our
-     "shellsubstitute": {
-       "version": "1.2.0",
-       "resolved": "https://registry.npmjs.org/shellsubstitute/-/shellsubstitute-1.2.0.tgz",
-       "integrity": "sha1-5PcCpQxRiw9v6YRRiQ1wWvKba3A=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "signal-exit": {
-       "version": "3.0.2",
-       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-@@ -8413,12 +12272,15 @@
-       "integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "sliced": {
-       "version": "1.0.1",
-       "resolved": "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz",
-       "integrity": "sha1-CzpmK10Ewxd7GSa+qCsD+Dei70E=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "sntp": {
-       "version": "2.1.0",
-       "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",
-@@ -8475,7 +12337,11 @@
-     "split": {
-       "version": "1.0.1",
-       "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-YFvZvjA6pZ+zX5Ip++oN3snqB9k=",
-+=======
-+      "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "through": "2.3.8"
-@@ -8484,7 +12350,11 @@
-     "split2": {
-       "version": "2.2.0",
-       "resolved": "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-GGsldbz4PoW30YRldWI47k7kJJM=",
-+=======
-+      "integrity": "sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "through2": "2.0.3"
-@@ -8513,6 +12383,7 @@
-       }
-     },
-     "standard": {
-+<<<<<<< .our
-       "version": "10.0.3",
-       "resolved": "https://registry.npmjs.org/standard/-/standard-10.0.3.tgz",
-       "integrity": "sha512-JURZ+85ExKLQULckDFijdX5WHzN6RC7fgiZNSV4jFQVo+3tPoQGHyBrGekye/yf0aOfb4210EM5qPNlc2cRh4w==",
-@@ -8539,6 +12410,34 @@
-         "get-stdin": "5.0.1",
-         "minimist": "1.2.0",
-         "pkg-conf": "2.1.0"
-+=======
-+      "version": "8.6.0",
-+      "resolved": "https://registry.npmjs.org/standard/-/standard-8.6.0.tgz",
-+      "integrity": "sha1-Y1Eyvnv7VnwpIQBfMPnjUOR1Kq0=",
-+      "dev": true,
-+      "requires": {
-+        "eslint": "3.10.2",
-+        "eslint-config-standard": "6.2.1",
-+        "eslint-config-standard-jsx": "3.2.0",
-+        "eslint-plugin-promise": "3.4.2",
-+        "eslint-plugin-react": "6.7.1",
-+        "eslint-plugin-standard": "2.0.1",
-+        "standard-engine": "5.2.0"
-+      }
-+    },
-+    "standard-engine": {
-+      "version": "5.2.0",
-+      "resolved": "https://registry.npmjs.org/standard-engine/-/standard-engine-5.2.0.tgz",
-+      "integrity": "sha1-QAZgrlrM6K/U22D/IhSpGQrXkKM=",
-+      "dev": true,
-+      "requires": {
-+        "deglob": "2.1.0",
-+        "find-root": "1.1.0",
-+        "get-stdin": "5.0.1",
-+        "home-or-tmp": "2.0.0",
-+        "minimist": "1.2.0",
-+        "pkg-config": "1.1.1"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "get-stdin": {
-@@ -8552,11 +12451,19 @@
-     "standard-markdown": {
-       "version": "4.0.2",
-       "resolved": "https://registry.npmjs.org/standard-markdown/-/standard-markdown-4.0.2.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-NaC1bLtX5JzuLXQ9ocmERMNK1Lg=",
-       "dev": true,
-       "requires": {
-         "async": "2.6.0",
-         "commander": "2.15.1",
-+=======
-+      "integrity": "sha512-h+WTmoGN0qmse8I1VX8VD6V5JeVLXZOPQltvxQP9FfSpSl6RmKYMLTUQ2j/QhdmsdxQKDqulZF/Bf8oEnttIQA==",
-+      "dev": true,
-+      "requires": {
-+        "async": "2.6.0",
-+        "commander": "2.15.0",
-+>>>>>>> .their
-         "globby": "6.1.0",
-         "lodash.flatten": "4.4.0",
-         "lodash.range": "3.2.0",
-@@ -8579,6 +12486,7 @@
-           "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "lodash": "4.17.10"
-           }
-         },
-@@ -8586,11 +12494,24 @@
-           "version": "2.4.1",
-           "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
-           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
-+=======
-+            "lodash": "4.17.5"
-+          }
-+        },
-+        "chalk": {
-+          "version": "2.3.2",
-+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
-+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "ansi-styles": "3.2.1",
-             "escape-string-regexp": "1.0.5",
-+<<<<<<< .our
-             "supports-color": "5.4.0"
-+=======
-+            "supports-color": "5.3.0"
-+>>>>>>> .their
-           }
-         },
-         "cli-cursor": {
-@@ -8603,15 +12524,165 @@
-           }
-         },
-         "cli-spinners": {
-+<<<<<<< .our
-           "version": "1.3.1",
-           "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.3.1.tgz",
-           "integrity": "sha512-1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg==",
-+=======
-+          "version": "1.1.0",
-+          "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.1.0.tgz",
-+          "integrity": "sha1-8YR7FohE2RemceudFH499JfJDQY=",
-+          "dev": true
-+        },
-+        "doctrine": {
-+          "version": "2.1.0",
-+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-+          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-+          "dev": true,
-+          "requires": {
-+            "esutils": "2.0.2"
-+          }
-+        },
-+        "eslint": {
-+          "version": "3.19.0",
-+          "resolved": "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz",
-+          "integrity": "sha1-yPxiAcf0DdCJQbh8CFdnOGpnmsw=",
-+          "dev": true,
-+          "requires": {
-+            "babel-code-frame": "6.26.0",
-+            "chalk": "1.1.3",
-+            "concat-stream": "1.5.2",
-+            "debug": "2.6.9",
-+            "doctrine": "2.1.0",
-+            "escope": "3.6.0",
-+            "espree": "3.5.4",
-+            "esquery": "1.0.0",
-+            "estraverse": "4.2.0",
-+            "esutils": "2.0.2",
-+            "file-entry-cache": "2.0.0",
-+            "glob": "7.1.2",
-+            "globals": "9.18.0",
-+            "ignore": "3.3.7",
-+            "imurmurhash": "0.1.4",
-+            "inquirer": "0.12.0",
-+            "is-my-json-valid": "2.17.2",
-+            "is-resolvable": "1.1.0",
-+            "js-yaml": "3.11.0",
-+            "json-stable-stringify": "1.0.1",
-+            "levn": "0.3.0",
-+            "lodash": "4.17.5",
-+            "mkdirp": "0.5.1",
-+            "natural-compare": "1.4.0",
-+            "optionator": "0.8.2",
-+            "path-is-inside": "1.0.2",
-+            "pluralize": "1.2.1",
-+            "progress": "1.1.8",
-+            "require-uncached": "1.0.3",
-+            "shelljs": "0.7.8",
-+            "strip-bom": "3.0.0",
-+            "strip-json-comments": "2.0.1",
-+            "table": "3.8.3",
-+            "text-table": "0.2.0",
-+            "user-home": "2.0.0"
-+          },
-+          "dependencies": {
-+            "ansi-styles": {
-+              "version": "2.2.1",
-+              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-+              "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-+              "dev": true
-+            },
-+            "chalk": {
-+              "version": "1.1.3",
-+              "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-+              "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-+              "dev": true,
-+              "requires": {
-+                "ansi-styles": "2.2.1",
-+                "escape-string-regexp": "1.0.5",
-+                "has-ansi": "2.0.0",
-+                "strip-ansi": "3.0.1",
-+                "supports-color": "2.0.0"
-+              }
-+            },
-+            "supports-color": {
-+              "version": "2.0.0",
-+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-+              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-+              "dev": true
-+            }
-+          }
-+        },
-+        "eslint-config-standard": {
-+          "version": "10.2.1",
-+          "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-10.2.1.tgz",
-+          "integrity": "sha1-wGHk0GbzedwXzVYsZOgZtN1FRZE=",
-+          "dev": true
-+        },
-+        "eslint-config-standard-jsx": {
-+          "version": "4.0.2",
-+          "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-4.0.2.tgz",
-+          "integrity": "sha512-F8fRh2WFnTek7dZH9ZaE0PCBwdVGkwVWZmizla/DDNOmg7Tx6B/IlK5+oYpiX29jpu73LszeJj5i1axEZv6VMw==",
-+          "dev": true
-+        },
-+        "eslint-plugin-promise": {
-+          "version": "3.5.0",
-+          "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-3.5.0.tgz",
-+          "integrity": "sha1-ePu2/+BHIBYnVp6FpsU3OvKmj8o=",
-+          "dev": true
-+        },
-+        "eslint-plugin-react": {
-+          "version": "6.10.3",
-+          "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-6.10.3.tgz",
-+          "integrity": "sha1-xUNb6wZ3ThLH2y9qut3L+QDNP3g=",
-+          "dev": true,
-+          "requires": {
-+            "array.prototype.find": "2.0.4",
-+            "doctrine": "1.5.0",
-+            "has": "1.0.1",
-+            "jsx-ast-utils": "1.4.1",
-+            "object.assign": "4.1.0"
-+          },
-+          "dependencies": {
-+            "doctrine": {
-+              "version": "1.5.0",
-+              "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
-+              "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
-+              "dev": true,
-+              "requires": {
-+                "esutils": "2.0.2",
-+                "isarray": "1.0.0"
-+              }
-+            }
-+          }
-+        },
-+        "eslint-plugin-standard": {
-+          "version": "3.0.1",
-+          "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-3.0.1.tgz",
-+          "integrity": "sha1-NNDJFbRe3G8BA5PH7vOCOwhWXPI=",
-+          "dev": true
-+        },
-+        "estraverse": {
-+          "version": "4.2.0",
-+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-+          "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
-+          "dev": true
-+        },
-+        "get-stdin": {
-+          "version": "5.0.1",
-+          "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.1.tgz",
-+          "integrity": "sha1-Ei4WFZHiH/TFJTAwVpPyDmOTo5g=",
-+>>>>>>> .their
-           "dev": true
-         },
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "fs.realpath": "1.0.0",
-@@ -8641,13 +12712,35 @@
-           "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-           "dev": true
-         },
-+<<<<<<< .our
-+=======
-+        "isarray": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-+          "dev": true
-+        },
-+        "json-stable-stringify": {
-+          "version": "1.0.1",
-+          "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
-+          "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
-+          "dev": true,
-+          "requires": {
-+            "jsonify": "0.0.0"
-+          }
-+        },
-+>>>>>>> .their
-         "log-symbols": {
-           "version": "2.2.0",
-           "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
-           "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "chalk": "2.4.1"
-+=======
-+            "chalk": "2.3.2"
-+>>>>>>> .their
-           }
-         },
-         "onetime": {
-@@ -8665,12 +12758,27 @@
-           "integrity": "sha512-iMK1DOQxzzh2MBlVsU42G80mnrvUhqsMh74phHtDlrcTZPK0pH6o7l7DRshK+0YsxDyEuaOkziVdvM3T0QTzpw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "chalk": "2.4.1",
-             "cli-cursor": "2.1.0",
-             "cli-spinners": "1.3.1",
-             "log-symbols": "2.2.0"
-           }
-         },
-+=======
-+            "chalk": "2.3.2",
-+            "cli-cursor": "2.1.0",
-+            "cli-spinners": "1.1.0",
-+            "log-symbols": "2.2.0"
-+          }
-+        },
-+        "progress": {
-+          "version": "1.1.8",
-+          "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
-+          "integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=",
-+          "dev": true
-+        },
-+>>>>>>> .their
-         "restore-cursor": {
-           "version": "2.0.0",
-           "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
-@@ -8681,10 +12789,52 @@
-             "signal-exit": "3.0.2"
-           }
-         },
-+<<<<<<< .our
-         "supports-color": {
-           "version": "5.4.0",
-           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
-           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-+=======
-+        "standard": {
-+          "version": "10.0.3",
-+          "resolved": "https://registry.npmjs.org/standard/-/standard-10.0.3.tgz",
-+          "integrity": "sha512-JURZ+85ExKLQULckDFijdX5WHzN6RC7fgiZNSV4jFQVo+3tPoQGHyBrGekye/yf0aOfb4210EM5qPNlc2cRh4w==",
-+          "dev": true,
-+          "requires": {
-+            "eslint": "3.19.0",
-+            "eslint-config-standard": "10.2.1",
-+            "eslint-config-standard-jsx": "4.0.2",
-+            "eslint-plugin-import": "2.2.0",
-+            "eslint-plugin-node": "4.2.3",
-+            "eslint-plugin-promise": "3.5.0",
-+            "eslint-plugin-react": "6.10.3",
-+            "eslint-plugin-standard": "3.0.1",
-+            "standard-engine": "7.0.0"
-+          }
-+        },
-+        "standard-engine": {
-+          "version": "7.0.0",
-+          "resolved": "https://registry.npmjs.org/standard-engine/-/standard-engine-7.0.0.tgz",
-+          "integrity": "sha1-67d7nI/CyBZf+jU72Rug3/Qa9pA=",
-+          "dev": true,
-+          "requires": {
-+            "deglob": "2.1.0",
-+            "get-stdin": "5.0.1",
-+            "minimist": "1.2.0",
-+            "pkg-conf": "2.1.0"
-+          }
-+        },
-+        "strip-bom": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-+          "dev": true
-+        },
-+        "supports-color": {
-+          "version": "5.3.0",
-+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
-+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "has-flag": "3.0.0"
-@@ -8692,6 +12842,7 @@
-         }
-       }
-     },
-+<<<<<<< .our
-     "state-toggle": {
-       "version": "1.0.1",
-       "resolved": "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.1.tgz",
-@@ -8704,6 +12855,8 @@
-       "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "stream-browserify": {
-       "version": "2.0.1",
-       "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
-@@ -8711,7 +12864,11 @@
-       "dev": true,
-       "requires": {
-         "inherits": "2.0.3",
-+<<<<<<< .our
-         "readable-stream": "2.3.6"
-+=======
-+        "readable-stream": "2.3.5"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -8721,27 +12878,47 @@
-           "dev": true
-         },
-         "readable-stream": {
-+<<<<<<< .our
-           "version": "2.3.6",
-           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-+=======
-+          "version": "2.3.5",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
-+          "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-             "process-nextick-args": "2.0.0",
-+<<<<<<< .our
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-+=======
-+            "safe-buffer": "5.1.1",
-+            "string_decoder": "1.0.3",
-+>>>>>>> .their
-             "util-deprecate": "1.0.2"
-           }
-         },
-         "string_decoder": {
-+<<<<<<< .our
-           "version": "1.1.1",
-           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-             "safe-buffer": "5.1.2"
-+=======
-+          "version": "1.0.3",
-+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-+          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-+          "dev": true,
-+          "requires": {
-+            "safe-buffer": "5.1.1"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -8753,7 +12930,11 @@
-       "dev": true,
-       "requires": {
-         "duplexer2": "0.1.4",
-+<<<<<<< .our
-         "readable-stream": "2.3.6"
-+=======
-+        "readable-stream": "2.3.5"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -8763,27 +12944,47 @@
-           "dev": true
-         },
-         "readable-stream": {
-+<<<<<<< .our
-           "version": "2.3.6",
-           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-+=======
-+          "version": "2.3.5",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
-+          "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-             "process-nextick-args": "2.0.0",
-+<<<<<<< .our
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-+=======
-+            "safe-buffer": "5.1.1",
-+            "string_decoder": "1.0.3",
-+>>>>>>> .their
-             "util-deprecate": "1.0.2"
-           }
-         },
-         "string_decoder": {
-+<<<<<<< .our
-           "version": "1.1.1",
-           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-             "safe-buffer": "5.1.2"
-+=======
-+          "version": "1.0.3",
-+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-+          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-+          "dev": true,
-+          "requires": {
-+            "safe-buffer": "5.1.1"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -8795,14 +12996,24 @@
-       "dev": true
-     },
-     "stream-http": {
-+<<<<<<< .our
-       "version": "2.8.2",
-       "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.2.tgz",
-       "integrity": "sha512-QllfrBhqF1DPcz46WxKTs6Mz1Bpc+8Qm6vbqOpVav5odAXwbyzwnEczoWqtxrsmlO+cJqtPrp/8gWKWjaKLLlA==",
-+=======
-+      "version": "2.8.1",
-+      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.1.tgz",
-+      "integrity": "sha512-cQ0jo17BLca2r0GfRdZKYAGLU6JRoIWxqSOakUMuKOT6MOK7AAlE856L33QuDmAy/eeOrhLee3dZKX0Uadu93A==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "builtin-status-codes": "3.0.0",
-         "inherits": "2.0.3",
-+<<<<<<< .our
-         "readable-stream": "2.3.6",
-+=======
-+        "readable-stream": "2.3.5",
-+>>>>>>> .their
-         "to-arraybuffer": "1.0.1",
-         "xtend": "4.0.1"
-       },
-@@ -8814,27 +13025,47 @@
-           "dev": true
-         },
-         "readable-stream": {
-+<<<<<<< .our
-           "version": "2.3.6",
-           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-+=======
-+          "version": "2.3.5",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
-+          "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-             "process-nextick-args": "2.0.0",
-+<<<<<<< .our
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-+=======
-+            "safe-buffer": "5.1.1",
-+            "string_decoder": "1.0.3",
-+>>>>>>> .their
-             "util-deprecate": "1.0.2"
-           }
-         },
-         "string_decoder": {
-+<<<<<<< .our
-           "version": "1.1.1",
-           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-             "safe-buffer": "5.1.2"
-+=======
-+          "version": "1.0.3",
-+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-+          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-+          "dev": true,
-+          "requires": {
-+            "safe-buffer": "5.1.1"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -8852,7 +13083,11 @@
-       "dev": true,
-       "requires": {
-         "inherits": "2.0.3",
-+<<<<<<< .our
-         "readable-stream": "2.3.6"
-+=======
-+        "readable-stream": "2.3.5"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -8862,27 +13097,47 @@
-           "dev": true
-         },
-         "readable-stream": {
-+<<<<<<< .our
-           "version": "2.3.6",
-           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-+=======
-+          "version": "2.3.5",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
-+          "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-             "process-nextick-args": "2.0.0",
-+<<<<<<< .our
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-+=======
-+            "safe-buffer": "5.1.1",
-+            "string_decoder": "1.0.3",
-+>>>>>>> .their
-             "util-deprecate": "1.0.2"
-           }
-         },
-         "string_decoder": {
-+<<<<<<< .our
-           "version": "1.1.1",
-           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-             "safe-buffer": "5.1.2"
-+=======
-+          "version": "1.0.3",
-+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-+          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-+          "dev": true,
-+          "requires": {
-+            "safe-buffer": "5.1.1"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -8910,6 +13165,7 @@
-       "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "stringify-entities": {
-       "version": "1.3.2",
-       "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-1.3.2.tgz",
-@@ -8926,6 +13182,12 @@
-       "version": "0.0.6",
-       "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz",
-       "integrity": "sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==",
-+=======
-+    "stringstream": {
-+      "version": "0.0.5",
-+      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-+      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "strip-ansi": {
-@@ -9016,7 +13278,11 @@
-         "ajv": "4.11.8",
-         "ajv-keywords": "1.5.1",
-         "chalk": "1.1.3",
-+<<<<<<< .our
-         "lodash": "4.17.10",
-+=======
-+        "lodash": "4.17.5",
-+>>>>>>> .their
-         "slice-ansi": "0.0.4",
-         "string-width": "2.1.1"
-       },
-@@ -9055,7 +13321,11 @@
-         "string-width": {
-           "version": "2.1.1",
-           "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
-+=======
-+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "is-fullwidth-code-point": "2.0.0",
-@@ -9074,30 +13344,52 @@
-       }
-     },
-     "tar": {
-+<<<<<<< .our
-       "version": "4.4.2",
-       "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.2.tgz",
-       "integrity": "sha512-BfkE9CciGGgDsATqkikUHrQrraBCO+ke/1f6SFAEMnxyyfN9lxC+nW1NFWMpqH865DhHIy9vQi682gk1X7friw==",
-+=======
-+      "version": "4.4.0",
-+      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.0.tgz",
-+      "integrity": "sha512-gJlTiiErwo96K904FnoYWl+5+FBgS+FimU6GMh66XLdLa55al8+d4jeDfPoGwSNHdtWI5FJP6xurmVqhBuGJpQ==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "chownr": "1.0.1",
-         "fs-minipass": "1.2.5",
-+<<<<<<< .our
-         "minipass": "2.3.0",
-         "minizlib": "1.1.0",
-         "mkdirp": "0.5.1",
-         "safe-buffer": "5.1.2",
-+=======
-+        "minipass": "2.2.1",
-+        "minizlib": "1.1.0",
-+        "mkdirp": "0.5.1",
-+>>>>>>> .their
-         "yallist": "3.0.2"
-       }
-     },
-     "tar-fs": {
-+<<<<<<< .our
-       "version": "1.16.2",
-       "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.2.tgz",
-       "integrity": "sha512-LdknWjPEiZC1nOBwhv0JBzfJBGPJar08dZg2rwZe0ZTLQoRGEzgrl7vF3qUEkCHpI/wN9e7RyCuDhMsJUCLPPQ==",
-+=======
-+      "version": "1.16.0",
-+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.0.tgz",
-+      "integrity": "sha512-I9rb6v7mjWLtOfCau9eH5L7sLJyU2BnxtEZRQ5Mt+eRKmf1F0ohXmT/Jc3fr52kDvjJ/HV5MH3soQfPL5bQ0Yg==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "chownr": "1.0.1",
-         "mkdirp": "0.5.1",
-         "pump": "1.0.3",
-+<<<<<<< .our
-         "tar-stream": "1.6.0"
-+=======
-+        "tar-stream": "1.5.5"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "pump": {
-@@ -9113,6 +13405,7 @@
-       }
-     },
-     "tar-stream": {
-+<<<<<<< .our
-       "version": "1.6.0",
-       "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.0.tgz",
-       "integrity": "sha512-lh2iAPG/BHNmN6WB9Ybdynk9rEJ5GD/dy4zscHmVlwa1dq2tpE+BH78i5vjYwYVWEaOXGBjzxr89aVACF17Cpw==",
-@@ -9124,6 +13417,16 @@
-         "fs-constants": "1.0.0",
-         "readable-stream": "2.3.6",
-         "to-buffer": "1.1.1",
-+=======
-+      "version": "1.5.5",
-+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.5.tgz",
-+      "integrity": "sha512-mQdgLPc/Vjfr3VWqWbfxW8yQNiJCbAZ+Gf6GDu1Cy0bdb33ofyiNGBtAY96jHFhDuivCwgW1H9DgTON+INiXgg==",
-+      "dev": true,
-+      "requires": {
-+        "bl": "1.2.1",
-+        "end-of-stream": "1.4.1",
-+        "readable-stream": "2.3.5",
-+>>>>>>> .their
-         "xtend": "4.0.1"
-       },
-       "dependencies": {
-@@ -9134,27 +13437,47 @@
-           "dev": true
-         },
-         "readable-stream": {
-+<<<<<<< .our
-           "version": "2.3.6",
-           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-+=======
-+          "version": "2.3.5",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
-+          "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-             "process-nextick-args": "2.0.0",
-+<<<<<<< .our
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-+=======
-+            "safe-buffer": "5.1.1",
-+            "string_decoder": "1.0.3",
-+>>>>>>> .their
-             "util-deprecate": "1.0.2"
-           }
-         },
-         "string_decoder": {
-+<<<<<<< .our
-           "version": "1.1.1",
-           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-             "safe-buffer": "5.1.2"
-+=======
-+          "version": "1.0.3",
-+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-+          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-+          "dev": true,
-+          "requires": {
-+            "safe-buffer": "5.1.1"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -9207,7 +13530,11 @@
-     "text-extensions": {
-       "version": "1.7.0",
-       "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.7.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-+qq6JiXtdG1WiiPk0KrNm/CKizk=",
-+=======
-+      "integrity": "sha512-AKXZeDq230UaSzaO5s3qQUZOaC7iKbzq0jOFL614R7d9R593HLqAOL0cYoqLdkNrjBSOdmoQI06yigq1TSBXAg==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "text-table": {
-@@ -9234,7 +13561,11 @@
-       "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "readable-stream": "2.3.6",
-+=======
-+        "readable-stream": "2.3.5",
-+>>>>>>> .their
-         "xtend": "4.0.1"
-       },
-       "dependencies": {
-@@ -9245,27 +13576,47 @@
-           "dev": true
-         },
-         "readable-stream": {
-+<<<<<<< .our
-           "version": "2.3.6",
-           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-+=======
-+          "version": "2.3.5",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
-+          "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-             "process-nextick-args": "2.0.0",
-+<<<<<<< .our
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-+=======
-+            "safe-buffer": "5.1.1",
-+            "string_decoder": "1.0.3",
-+>>>>>>> .their
-             "util-deprecate": "1.0.2"
-           }
-         },
-         "string_decoder": {
-+<<<<<<< .our
-           "version": "1.1.1",
-           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-             "safe-buffer": "5.1.2"
-+=======
-+          "version": "1.0.3",
-+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-+          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-+          "dev": true,
-+          "requires": {
-+            "safe-buffer": "5.1.1"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -9300,6 +13651,7 @@
-       "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "to-buffer": {
-       "version": "1.1.1",
-       "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz",
-@@ -9317,6 +13669,8 @@
-         "x-is-function": "1.0.4"
-       }
-     },
-+=======
-+>>>>>>> .their
-     "touch": {
-       "version": "0.0.3",
-       "resolved": "https://registry.npmjs.org/touch/-/touch-0.0.3.tgz",
-@@ -9359,12 +13713,15 @@
-       "integrity": "sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "trim": {
-       "version": "0.0.1",
-       "resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz",
-       "integrity": "sha1-WFhUf2spB1fulczMZm+1AITEYN0=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "trim-newlines": {
-       "version": "2.0.0",
-       "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz",
-@@ -9377,6 +13734,7 @@
-       "integrity": "sha1-n5up2e+odkw4dpi8v+sshI8RrbM=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "trim-trailing-lines": {
-       "version": "1.1.1",
-       "resolved": "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.1.tgz",
-@@ -9389,6 +13747,8 @@
-       "integrity": "sha512-FHkoUZvG6Egrv9XZAyYGKEyb1JMsFphgPjoczkZC2y6W93U1jswcVURB8MUvtsahEPEVACyxD47JAL63vF4JsQ==",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "tslint": {
-       "version": "4.5.1",
-       "resolved": "https://registry.npmjs.org/tslint/-/tslint-4.5.1.tgz",
-@@ -9396,20 +13756,34 @@
-       "dev": true,
-       "requires": {
-         "babel-code-frame": "6.26.0",
-+<<<<<<< .our
-         "colors": "1.2.5",
-+=======
-+        "colors": "1.2.1",
-+>>>>>>> .their
-         "diff": "3.5.0",
-         "findup-sync": "0.3.0",
-         "glob": "7.1.2",
-         "optimist": "0.6.1",
-+<<<<<<< .our
-         "resolve": "1.7.1",
-         "tsutils": "1.9.1",
-         "update-notifier": "2.5.0"
-+=======
-+        "resolve": "1.5.0",
-+        "tsutils": "1.9.1",
-+        "update-notifier": "2.3.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "fs.realpath": "1.0.0",
-@@ -9456,7 +13830,11 @@
-       "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "safe-buffer": "5.1.2"
-+=======
-+        "safe-buffer": "5.1.1"
-+>>>>>>> .their
-       }
-     },
-     "tweetnacl": {
-@@ -9482,9 +13860,15 @@
-       "dev": true
-     },
-     "typescript": {
-+<<<<<<< .our
-       "version": "2.9.2",
-       "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
-       "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==",
-+=======
-+      "version": "2.7.2",
-+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.7.2.tgz",
-+      "integrity": "sha512-p5TCYZDAO0m4G344hD+wx/LATebLWZNkkh2asWUFqSsD2OrDNhbAHuSjobrmsUmdzjJjEeZVU9g1h3O6vpstnw==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "uc.micro": {
-@@ -9533,6 +13917,7 @@
-       "integrity": "sha512-4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow==",
-       "dev": true
-     },
-+<<<<<<< .our
-     "unherit": {
-       "version": "1.1.1",
-       "resolved": "https://registry.npmjs.org/unherit/-/unherit-1.1.1.tgz",
-@@ -9677,6 +14062,8 @@
-         "vfile-location": "2.0.3"
-       }
-     },
-+=======
-+>>>>>>> .their
-     "uniq": {
-       "version": "1.0.1",
-       "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
-@@ -9692,6 +14079,7 @@
-         "crypto-random-string": "1.0.0"
-       }
-     },
-+<<<<<<< .our
-     "unist-util-generated": {
-       "version": "1.1.2",
-       "resolved": "https://registry.npmjs.org/unist-util-generated/-/unist-util-generated-1.1.2.tgz",
-@@ -9764,12 +14152,15 @@
-         "os-homedir": "1.0.2"
-       }
-     },
-+=======
-+>>>>>>> .their
-     "unzip-response": {
-       "version": "2.0.1",
-       "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz",
-       "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=",
-       "dev": true
-     },
-+<<<<<<< .our
-     "update-check": {
-       "version": "1.5.1",
-       "resolved": "https://registry.npmjs.org/update-check/-/update-check-1.5.1.tgz",
-@@ -9791,6 +14182,18 @@
-         "configstore": "3.1.2",
-         "import-lazy": "2.1.0",
-         "is-ci": "1.1.0",
-+=======
-+    "update-notifier": {
-+      "version": "2.3.0",
-+      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.3.0.tgz",
-+      "integrity": "sha1-TognpruRUUCrCTVZ1wFOPruDdFE=",
-+      "dev": true,
-+      "requires": {
-+        "boxen": "1.3.0",
-+        "chalk": "2.3.2",
-+        "configstore": "3.1.1",
-+        "import-lazy": "2.1.0",
-+>>>>>>> .their
-         "is-installed-globally": "0.1.0",
-         "is-npm": "1.0.0",
-         "latest-version": "3.1.0",
-@@ -9808,14 +14211,24 @@
-           }
-         },
-         "chalk": {
-+<<<<<<< .our
-           "version": "2.4.1",
-           "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
-           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
-+=======
-+          "version": "2.3.2",
-+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
-+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "ansi-styles": "3.2.1",
-             "escape-string-regexp": "1.0.5",
-+<<<<<<< .our
-             "supports-color": "5.4.0"
-+=======
-+            "supports-color": "5.3.0"
-+>>>>>>> .their
-           }
-         },
-         "has-flag": {
-@@ -9825,9 +14238,15 @@
-           "dev": true
-         },
-         "supports-color": {
-+<<<<<<< .our
-           "version": "5.4.0",
-           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
-           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-+=======
-+          "version": "5.3.0",
-+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
-+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
-+>>>>>>> .their
-           "dev": true,
-           "requires": {
-             "has-flag": "3.0.0"
-@@ -9910,12 +14329,15 @@
-         "spdx-expression-parse": "3.0.0"
-       }
-     },
-+<<<<<<< .our
-     "vary": {
-       "version": "1.1.2",
-       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-       "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "verror": {
-       "version": "1.10.0",
-       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-@@ -9927,6 +14349,7 @@
-         "extsprintf": "1.3.0"
-       }
-     },
-+<<<<<<< .our
-     "vfile": {
-       "version": "2.3.0",
-       "resolved": "https://registry.npmjs.org/vfile/-/vfile-2.3.0.tgz",
-@@ -9990,6 +14413,8 @@
-       "integrity": "sha512-dxUM6IYvGChHuwMT3dseyU5BHprNRXzAV0OHx1A769lVGsTiT50kU7BbpRFV+IE6oWmU+PwHdsTKfXhnDIRIgQ==",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "vm-browserify": {
-       "version": "0.0.4",
-       "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
-@@ -10002,7 +14427,11 @@
-     "walk-sync": {
-       "version": "0.3.2",
-       "resolved": "https://registry.npmjs.org/walk-sync/-/walk-sync-0.3.2.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-SCcoCvxC0OA1NnxKTjHurA0Tb3U=",
-+=======
-+      "integrity": "sha512-FMB5VqpLqOCcqrzA9okZFc0wq0Qbmdm396qJxvQZhDpyu0W95G9JCmp74tx7iyYnyOcBtUuKJsgIKAqjozvmmQ==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "ensure-posix-path": "1.0.2",
-@@ -10029,7 +14458,11 @@
-     "which": {
-       "version": "1.3.0",
-       "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-/wS9/AEO5UfXgL7DjhrBwnd9JTo=",
-+=======
-+      "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "isexe": "2.0.0"
-@@ -10106,6 +14539,7 @@
-         "strip-ansi": "3.0.1"
-       }
-     },
-+<<<<<<< .our
-     "wrapped": {
-       "version": "1.0.1",
-       "resolved": "https://registry.npmjs.org/wrapped/-/wrapped-1.0.1.tgz",
-@@ -10124,6 +14558,8 @@
-         }
-       }
-     },
-+=======
-+>>>>>>> .their
-     "wrappy": {
-       "version": "1.0.2",
-       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-@@ -10142,7 +14578,11 @@
-     "write-file-atomic": {
-       "version": "2.3.0",
-       "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-H/YVdcLipOjlENb6TiQ8zhg5mas=",
-+=======
-+      "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "graceful-fs": "4.1.11",
-@@ -10150,6 +14590,7 @@
-         "signal-exit": "3.0.2"
-       }
-     },
-+<<<<<<< .our
-     "x-is-function": {
-       "version": "1.0.4",
-       "resolved": "https://registry.npmjs.org/x-is-function/-/x-is-function-1.0.4.tgz",
-@@ -10162,6 +14603,8 @@
-       "integrity": "sha1-R0tQhlrzpJqcRlfwWs0UVFj3fYI=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "xdg-basedir": {
-       "version": "3.0.0",
-       "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz",
-changed in both
-  base   100644 570c63f4e7915198292dae1cd9e84e7ecd725386 package.json
-  our    100644 c081cd89450cd50efba1ec280ff1349a96ea3ce0 package.json
-  their  100644 87167f4bd3a967da3e673237ba91da87f2a452f1 package.json
-@@ -1,17 +1,25 @@
- {
-   "name": "electron",
-+<<<<<<< .our
-   "version": "4.0.0-nightly.20180821",
-+=======
-+  "version": "1.7.16",
-+>>>>>>> .their
-   "repository": "https://github.com/electron/electron",
-   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
-   "devDependencies": {
-     "asar": "^0.11.0",
-     "browserify": "^13.1.0",
-     "check-for-leaks": "^1.0.2",
-+<<<<<<< .our
-     "clang-format": "^1.2.3",
-+=======
-+>>>>>>> .their
-     "colors": "^1.1.2",
-     "dotenv-safe": "^4.0.4",
-     "dugite": "^1.45.0",
-     "electabul": "~0.0.4",
-+<<<<<<< .our
-     "electron-docs-linter": "^2.3.4",
-     "electron-typescript-definitions": "^1.3.6",
-     "github": "^9.2.0",
-@@ -24,6 +32,15 @@
-     "octicons": "^7.3.0",
-     "remark-cli": "^4.0.0",
-     "remark-preset-lint-markdown-style-guide": "^2.1.1",
-+=======
-+    "electron-docs-linter": "^2.3.3",
-+    "electron-typescript-definitions": "~1.2.11",
-+    "github": "^9.2.0",
-+    "heads": "^1.3.0",
-+    "husky": "^0.14.3",
-+    "minimist": "^1.2.0",
-+    "nugget": "^2.0.1",
-+>>>>>>> .their
-     "request": "^2.68.0",
-     "semver": "^5.5.0",
-     "serve": "^6.5.8",
-@@ -69,6 +86,10 @@
-     "lint:js-in-markdown": "standard-markdown docs",
-     "create-api-json": "electron-docs-linter docs --outfile=out/electron-api.json --version=$npm_package_version",
-     "create-typescript-definitions": "npm run create-api-json && electron-typescript-definitions --in=out/electron-api.json --out=out/electron.d.ts",
-+<<<<<<< .our
-+=======
-+    "merge-release": "node ./script/merge-release.js",
-+>>>>>>> .their
-     "mock-release": "node ./script/ci-release-build.js",
-     "preinstall": "node -e 'process.exit(0)'",
-     "publish-to-npm": "node ./script/publish-to-npm.js",
-changed in both
-  base   100755 4db30b71fca9996003fe44a71fa9d81499677bd2 script/bump-version.py
-  our    100755 564adb2116312b0f6d0351096bd89cb373cd3bab script/bump-version.py
-  their  100755 28424aaa8ee614b0dfffc7468adb2266f05440cb script/bump-version.py
-@@ -12,6 +12,7 @@
- SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
- 
- def main():
-+<<<<<<< .our
- 
-   parser = argparse.ArgumentParser(
-     description='Bump version numbers. Must specify at least one of the three'
-@@ -94,6 +95,77 @@
-   if args.dry_run:
-     print 'new version number would be: {0}\n'.format(version + suffix)
-     return 0
-+=======
-+
-+  parser = argparse.ArgumentParser(
-+    description='Bump version numbers. Must specify at least one of the three'
-+               +' options:\n'
-+               +'   --bump=patch to increment patch version, or\n'
-+               +'   --stable to promote current beta to stable, or\n'
-+               +'   --version={version} to set version number directly\n'
-+               +'Note that you can use both --bump and --stable '
-+               +'simultaneously.',
-+               formatter_class=argparse.RawTextHelpFormatter
-+  )
-+  parser.add_argument(
-+    '--version',
-+    default=None,
-+    dest='new_version',
-+    help='new version number'
-+  )
-+  parser.add_argument(
-+    '--bump',
-+    action='store',
-+    default=None,
-+    dest='bump',
-+    help='increment [major | minor | patch | beta]'
-+  )
-+  parser.add_argument(
-+    '--stable',
-+    action='store_true',
-+    default= False,
-+    dest='stable',
-+    help='promote to stable (i.e. remove `-beta.x` suffix)'
-+  )
-+  parser.add_argument(
-+    '--dry-run',
-+    action='store_true',
-+    default= False,
-+    dest='dry_run',
-+    help='just to check that version number is correct'
-+  )
-+
-+  args = parser.parse_args()
-+
-+  if args.new_version == None and args.bump == None and args.stable == False:
-+    parser.print_help()
-+    return 1
-+
-+  increments = ['major', 'minor', 'patch', 'beta']
-+
-+  curr_version = get_electron_version()
-+  versions = parse_version(re.sub('-beta', '', curr_version))
-+
-+  if args.bump in increments:
-+    versions = increase_version(versions, increments.index(args.bump))
-+    if versions[3] == '0':
-+      # beta starts at 1
-+      versions = increase_version(versions, increments.index('beta'))
-+
-+  if args.stable == True:
-+    versions[3] = '0'
-+
-+  if args.new_version != None:
-+    versions = parse_version(re.sub('-beta', '', args.new_version))
-+
-+  version = '.'.join(versions[:3])
-+  suffix = '' if versions[3] == '0' else '-beta.' + versions[3]
-+
-+  if args.dry_run:
-+    print 'new version number would be: {0}\n'.format(version + suffix)
-+    return 0
-+
-+>>>>>>> .their
- 
-   with scoped_cwd(SOURCE_ROOT):
-     update_electron_gyp(version, suffix)
-@@ -104,9 +176,12 @@
-     tag_version(version, suffix)
- 
-   print 'Bumped to version: {0}'.format(version + suffix)
-+<<<<<<< .our
- 
- def not_reached():
-   raise Exception('Unreachable code was reached')
-+=======
-+>>>>>>> .their
- 
- def increase_version(versions, index):
-   for i in range(index + 1, 4):
-@@ -116,8 +191,12 @@
- 
- 
- def update_electron_gyp(version, suffix):
-+<<<<<<< .our
-   pattern = re.compile(" *'version%' *: *'[0-9.]+(-beta[0-9.]*)?(-dev)?"
-     + "(-nightly[0-9.]*)?'")
-+=======
-+  pattern = re.compile(" *'version%' *: *'[0-9.]+(-beta[0-9.]*)?'")
-+>>>>>>> .their
-   with open('electron.gyp', 'r') as f:
-     lines = f.readlines()
- 
-@@ -209,6 +288,7 @@
- 
- 
- def tag_version(version, suffix):
-+<<<<<<< .our
-   execute([
-     'git',
-     'commit',
-@@ -217,6 +297,9 @@
-     'Bump v{0}'.format(version + suffix),
-     '-n'
-   ])
-+=======
-+  execute(['git', 'commit', '-a', '-m', 'Bump v{0}'.format(version + suffix)])
-+>>>>>>> .their
- 
- 
- if __name__ == '__main__':
-added in both
-  our    100644 be9f9597387f5f8b7bfddc61c202f32ce4c6d478 script/ci-release-build.js
-  their  100644 eb37ece8a892e696dbcc1815c3b9a2ccca79437b script/ci-release-build.js
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- require('dotenv-safe').load()
- 
- const assert = require('assert')
-@@ -23,6 +24,18 @@
-   'electron-release-osx-x64'
- ]
- 
-+=======
-+const assert = require('assert')
-+const request = require('request')
-+const buildAppVeyorURL = 'https://windows-ci.electronjs.org/api/builds'
-+
-+const circleCIJobs = [
-+  'electron-linux-arm',
-+  'electron-linux-ia32',
-+  'electron-linux-x64'
-+]
-+
-+>>>>>>> .their
- async function makeRequest (requestOptions, parseResponse) {
-   return new Promise((resolve, reject) => {
-     request(requestOptions, (err, res, body) => {
-@@ -34,6 +47,7 @@
-           resolve(body)
-         }
-       } else {
-+<<<<<<< .our
-         console.error('Error occurred while requesting:', requestOptions.url)
-         if (parseResponse) {
-           try {
-@@ -41,6 +55,10 @@
-           } catch (err) {
-             console.log('Error: ', `(status ${res.statusCode})`, err || res.body, requestOptions)
-           }
-+=======
-+        if (parseResponse) {
-+          console.log('Error: ', `(status ${res.statusCode})`, err || JSON.parse(res.body), requestOptions)
-+>>>>>>> .their
-         } else {
-           console.log('Error: ', `(status ${res.statusCode})`, err || res.body, requestOptions)
-         }
-@@ -50,7 +68,12 @@
-   })
- }
- 
-+<<<<<<< .our
- async function circleCIcall (buildUrl, targetBranch, job, options) {
-+=======
-+async function circleCIcall (buildUrl, targetBranch, job, ghRelease) {
-+  assert(process.env.CIRCLE_TOKEN, 'CIRCLE_TOKEN not found in environment')
-+>>>>>>> .their
-   console.log(`Triggering CircleCI to run build job: ${job} on branch: ${targetBranch} with release flag.`)
-   let buildRequest = {
-     'build_parameters': {
-@@ -58,16 +81,23 @@
-     }
-   }
- 
-+<<<<<<< .our
-   if (options.ghRelease) {
-+=======
-+  if (ghRelease) {
-+>>>>>>> .their
-     buildRequest.build_parameters.ELECTRON_RELEASE = 1
-   } else {
-     buildRequest.build_parameters.RUN_RELEASE_BUILD = 'true'
-   }
- 
-+<<<<<<< .our
-   if (options.automaticRelease) {
-     buildRequest.build_parameters.AUTO_RELEASE = 'true'
-   }
- 
-+=======
-+>>>>>>> .their
-   let circleResponse = await makeRequest({
-     method: 'POST',
-     url: buildUrl,
-@@ -79,6 +109,7 @@
-   }, true).catch(err => {
-     console.log('Error calling CircleCI:', err)
-   })
-+<<<<<<< .our
-   console.log(`CircleCI release build request for ${job} successful.  Check ${circleResponse.build_url} for status.`)
- }
- 
-@@ -97,15 +128,29 @@
-   let environmentVariables = {}
- 
-   if (options.ghRelease) {
-+=======
-+  console.log(`Check ${circleResponse.build_url} for status. (${job})`)
-+}
-+
-+async function buildAppVeyor (targetBranch, ghRelease) {
-+  console.log(`Triggering AppVeyor to run build on branch: ${targetBranch} with release flag.`)
-+  assert(process.env.APPVEYOR_TOKEN, 'APPVEYOR_TOKEN not found in environment')
-+  let environmentVariables = {}
-+
-+  if (ghRelease) {
-+>>>>>>> .their
-     environmentVariables.ELECTRON_RELEASE = 1
-   } else {
-     environmentVariables.RUN_RELEASE_BUILD = 'true'
-   }
- 
-+<<<<<<< .our
-   if (options.automaticRelease) {
-     environmentVariables.AUTO_RELEASE = 'true'
-   }
- 
-+=======
-+>>>>>>> .their
-   const requestOpts = {
-     url: buildAppVeyorURL,
-     auth: {
-@@ -116,7 +161,11 @@
-     },
-     body: JSON.stringify({
-       accountName: 'AppVeyor',
-+<<<<<<< .our
-       projectSlug: appVeyorJobs[job],
-+=======
-+      projectSlug: 'electron',
-+>>>>>>> .their
-       branch: targetBranch,
-       environmentVariables
-     }),
-@@ -125,6 +174,7 @@
-   let appVeyorResponse = await makeRequest(requestOpts, true).catch(err => {
-     console.log('Error calling AppVeyor:', err)
-   })
-+<<<<<<< .our
-   const buildUrl = `https://windows-ci.electronjs.org/project/AppVeyor/${appVeyorJobs[job]}/build/${appVeyorResponse.version}`
-   console.log(`AppVeyor release build request for ${job} successful.  Check build status at ${buildUrl}`)
- }
-@@ -202,10 +252,27 @@
-   console.log(`VSTS release build request for ${build.name} successful. Check ${vstsResponse._links.web.href} for status.`)
- }
- 
-+=======
-+  const buildUrl = `https://windows-ci.electronjs.org/project/AppVeyor/electron/build/${appVeyorResponse.version}`
-+  console.log(`AppVeyor release build request successful.  Check build status at ${buildUrl}`)
-+}
-+
-+function buildCircleCI (targetBranch, ghRelease, job) {
-+  const circleBuildUrl = `https://circleci.com/api/v1.1/project/github/electron/electron/tree/${targetBranch}?circle-token=${process.env.CIRCLE_TOKEN}`
-+  if (job) {
-+    assert(circleCIJobs.includes(job), `Unknown CI job name: ${job}.`)
-+    circleCIcall(circleBuildUrl, targetBranch, job, ghRelease)
-+  } else {
-+    circleCIJobs.forEach((job) => circleCIcall(circleBuildUrl, targetBranch, job, ghRelease))
-+  }
-+}
-+
-+>>>>>>> .their
- function runRelease (targetBranch, options) {
-   if (options.ci) {
-     switch (options.ci) {
-       case 'CircleCI': {
-+<<<<<<< .our
-         buildCircleCI(targetBranch, options)
-         break
-       }
-@@ -226,12 +293,26 @@
-     buildCircleCI(targetBranch, options)
-     buildAppVeyor(targetBranch, options)
-     buildVSTS(targetBranch, options)
-+=======
-+        buildCircleCI(targetBranch, options.ghRelease, options.job)
-+        break
-+      }
-+      case 'AppVeyor': {
-+        buildAppVeyor(targetBranch, options.ghRelease)
-+        break
-+      }
-+    }
-+  } else {
-+    buildCircleCI(targetBranch, options.ghRelease, options.job)
-+    buildAppVeyor(targetBranch, options.ghRelease)
-+>>>>>>> .their
-   }
- }
- 
- module.exports = runRelease
- 
- if (require.main === module) {
-+<<<<<<< .our
-   const args = require('minimist')(process.argv.slice(2), {
-     boolean: ['ghRelease', 'automaticRelease']
-   })
-@@ -239,6 +320,13 @@
-   if (args._.length < 1) {
-     console.log(`Trigger CI to build release builds of electron.
-     Usage: ci-release-build.js [--job=CI_JOB_NAME] [--ci=CircleCI|AppVeyor|VSTS] [--ghRelease] [--automaticRelease] TARGET_BRANCH
-+=======
-+  const args = require('minimist')(process.argv.slice(2))
-+  const targetBranch = args._[0]
-+  if (args._.length < 1) {
-+    console.log(`Trigger CI to build release builds of electron.
-+    Usage: ci-release-build.js [--job=CI_JOB_NAME] [--ci=CircleCI|AppVeyor] [--ghRelease] TARGET_BRANCH
-+>>>>>>> .their
-     `)
-     process.exit(0)
-   }
-changed in both
-  base   100755 96e6ea2e751eea50df6e4d1014c5ce9ce9e726bb script/cibuild
-  our    100755 758dc2c794e642430ab6a0d966e7a41863be947c script/cibuild
-  their  100755 36e9e13fe98bce5d93a28e9711b36ae96d909fd6 script/cibuild
-@@ -57,6 +57,20 @@
-   if os.environ.has_key('TARGET_ARCH'):
-     target_arch = os.environ['TARGET_ARCH']
- 
-+<<<<<<< .our
-+=======
-+  is_travis = (os.getenv('TRAVIS') == 'true')
-+  if is_travis and PLATFORM == 'linux':
-+    print 'Setup travis CI'
-+    execute(['sudo', 'apt-get', 'update'])
-+    deps = LINUX_DEPS
-+    if target_arch == 'arm':
-+      deps += LINUX_DEPS_ARM
-+    else:
-+      deps += LINUX_DEPS_NO_ARM
-+    execute(['sudo', 'apt-get', 'install'] + deps)
-+
-+>>>>>>> .their
-   if PLATFORM == 'linux' and target_arch == 'x64':
-     os.environ['DISPLAY'] = ':99.0'
-     execute(['sh', '-e', '/etc/init.d/xvfb', 'start'])
-added in remote
-  their  100755 a33a208c32e4395a09cec65b121991443af1f373 script/merge-release.js
-@@ -0,0 +1,116 @@
-+#!/usr/bin/env node
-+
-+require('colors')
-+const assert = require('assert')
-+const branchToRelease = process.argv[2]
-+const fail = '\u2717'.red
-+const { GitProcess, GitError } = require('dugite')
-+const pass = '\u2713'.green
-+const path = require('path')
-+const pkg = require('../package.json')
-+
-+assert(process.env.ELECTRON_GITHUB_TOKEN, 'ELECTRON_GITHUB_TOKEN not found in environment')
-+if (!branchToRelease) {
-+  console.log(`Usage: merge-release branch`)
-+  process.exit(1)
-+}
-+const gitDir = path.resolve(__dirname, '..')
-+
-+async function callGit (args, errorMessage, successMessage) {
-+  let gitResult = await GitProcess.exec(args, gitDir)
-+  if (gitResult.exitCode === 0) {
-+    console.log(`${pass} ${successMessage}`)
-+    return true
-+  } else {
-+    console.log(`${fail} ${errorMessage} ${gitResult.stderr}`)
-+    process.exit(1)
-+  }
-+}
-+
-+async function checkoutBranch (branchName) {
-+  console.log(`Checking out ${branchName}.`)
-+  let errorMessage = `Error checking out branch ${branchName}:`
-+  let successMessage = `Successfully checked out branch ${branchName}.`
-+  return callGit(['checkout', branchName], errorMessage, successMessage)
-+}
-+
-+async function commitMerge () {
-+  console.log(`Committing the merge for v${pkg.version}`)
-+  let errorMessage = `Error committing merge:`
-+  let successMessage = `Successfully committed the merge for v${pkg.version}`
-+  let gitArgs = ['commit', '-m', `v${pkg.version}`]
-+  return callGit(gitArgs, errorMessage, successMessage)
-+}
-+
-+async function mergeReleaseIntoBranch (branchName) {
-+  console.log(`Merging release branch into ${branchName}.`)
-+  let mergeArgs = ['merge', 'release-1-7-x', '--squash']
-+  let mergeDetails = await GitProcess.exec(mergeArgs, gitDir)
-+  if (mergeDetails.exitCode === 0) {
-+    return true
-+  } else {
-+    const error = GitProcess.parseError(mergeDetails.stderr)
-+    if (error === GitError.MergeConflicts) {
-+      console.log(`${fail} Could not merge release branch into ${branchName} ` +
-+        `due to merge conflicts.`)
-+      return false
-+    } else {
-+      console.log(`${fail} Could not merge release branch into ${branchName} ` +
-+        `due to an error: ${mergeDetails.stderr}.`)
-+      process.exit(1)
-+    }
-+  }
-+}
-+
-+async function pushBranch (branchName) {
-+  console.log(`Pushing branch ${branchName}.`)
-+  let pushArgs = ['push', 'origin', branchName]
-+  let errorMessage = `Could not push branch ${branchName} due to an error:`
-+  let successMessage = `Successfully pushed branch ${branchName}.`
-+  return callGit(pushArgs, errorMessage, successMessage)
-+}
-+
-+async function pull () {
-+  console.log(`Performing a git pull`)
-+  let errorMessage = `Could not pull due to an error:`
-+  let successMessage = `Successfully performed a git pull`
-+  return callGit(['pull'], errorMessage, successMessage)
-+}
-+
-+async function rebase (targetBranch) {
-+  console.log(`Rebasing release branch from ${targetBranch}`)
-+  let errorMessage = `Could not rebase due to an error:`
-+  let successMessage = `Successfully rebased release branch from ` +
-+    `${targetBranch}`
-+  return callGit(['rebase', targetBranch], errorMessage, successMessage)
-+}
-+
-+async function mergeRelease () {
-+  await checkoutBranch(branchToRelease)
-+  let mergeSuccess = await mergeReleaseIntoBranch(branchToRelease)
-+  if (mergeSuccess) {
-+    console.log(`${pass} Successfully merged release branch into ` +
-+      `${branchToRelease}.`)
-+    await commitMerge()
-+    let pushSuccess = await pushBranch(branchToRelease)
-+    if (pushSuccess) {
-+      console.log(`${pass} Success!!! ${branchToRelease} now has the latest release!`)
-+    }
-+  } else {
-+    console.log(`Trying rebase of ${branchToRelease} into release branch.`)
-+    await pull()
-+    await checkoutBranch('release-1-7-x')
-+    let rebaseResult = await rebase(branchToRelease)
-+    if (rebaseResult) {
-+      let pushResult = pushBranch('HEAD')
-+      if (pushResult) {
-+        console.log(`Rebase of ${branchToRelease} into release branch was ` +
-+          `successful.  Let release builds run and then try this step again.`)
-+      }
-+      // Exit as failure so release doesn't continue
-+      process.exit(1)
-+    }
-+  }
-+}
-+
-+mergeRelease()
-added in both
-  our    100755 72a28b719bf1ff7770692caef86c76746c4d8edf script/prepare-release.js
-  their  100755 3e7baefd0cc37db804c6019b597200c02a281c1e script/prepare-release.js
-@@ -1,5 +1,6 @@
- #!/usr/bin/env node
- 
-+<<<<<<< .our
- if (!process.env.CI) require('dotenv-safe').load()
- require('colors')
- const args = require('minimist')(process.argv.slice(2), {
-@@ -9,20 +10,39 @@
- const { execSync } = require('child_process')
- const fail = '\u2717'.red
- const { GitProcess } = require('dugite')
-+=======
-+require('colors')
-+const args = require('minimist')(process.argv.slice(2))
-+const assert = require('assert')
-+const ciReleaseBuild = require('./ci-release-build')
-+const { execSync } = require('child_process')
-+const fail = '\u2717'.red
-+const { GitProcess, GitError } = require('dugite')
-+>>>>>>> .their
- const GitHub = require('github')
- const pass = '\u2713'.green
- const path = require('path')
- const pkg = require('../package.json')
- const readline = require('readline')
- const versionType = args._[0]
-+<<<<<<< .our
- const targetRepo = versionType === 'nightly' ? 'nightlies' : 'electron'
-+=======
-+>>>>>>> .their
- 
- // TODO (future) automatically determine version based on conventional commits
- // via conventional-recommended-bump
- 
-+<<<<<<< .our
- if (!versionType && !args.notesOnly) {
-   console.log(`Usage: prepare-release versionType [stable | beta | nightly]` +
-      ` (--stable) (--notesOnly) (--automaticRelease) (--branch)`)
-+=======
-+assert(process.env.ELECTRON_GITHUB_TOKEN, 'ELECTRON_GITHUB_TOKEN not found in environment')
-+if (!versionType && !args.notesOnly) {
-+  console.log(`Usage: prepare-release versionType [major | minor | patch | beta]` +
-+     ` (--stable) (--notesOnly)`)
-+>>>>>>> .their
-   process.exit(1)
- }
- 
-@@ -30,12 +50,37 @@
- const gitDir = path.resolve(__dirname, '..')
- github.authenticate({type: 'token', token: process.env.ELECTRON_GITHUB_TOKEN})
- 
-+<<<<<<< .our
- async function getNewVersion (dryRun) {
-   if (!dryRun) {
-     console.log(`Bumping for new "${versionType}" version.`)
-   }
-   let bumpScript = path.join(__dirname, 'bump-version.py')
-   let scriptArgs = [bumpScript, '--bump', versionType]
-+=======
-+async function createReleaseBranch () {
-+  console.log(`Creating release branch.`)
-+  let checkoutDetails = await GitProcess.exec([ 'checkout', '-b', 'release-1-7-x' ], gitDir)
-+  if (checkoutDetails.exitCode === 0) {
-+    console.log(`${pass} Successfully created the release branch.`)
-+  } else {
-+    const error = GitProcess.parseError(checkoutDetails.stderr)
-+    if (error === GitError.BranchAlreadyExists) {
-+      console.log(`${fail} Release branch already exists, aborting prepare ` +
-+        `release process.`)
-+    } else {
-+      console.log(`${fail} Error creating release branch: ` +
-+        `${checkoutDetails.stderr}`)
-+    }
-+    process.exit(1)
-+  }
-+}
-+
-+function getNewVersion (dryRun) {
-+  console.log(`Bumping for new "${versionType}" version.`)
-+  let bumpScript = path.join(__dirname, 'bump-version.py')
-+  let scriptArgs = [bumpScript, `--bump ${versionType}`]
-+>>>>>>> .their
-   if (args.stable) {
-     scriptArgs.push('--stable')
-   }
-@@ -52,7 +97,10 @@
-     return newVersion
-   } catch (err) {
-     console.log(`${fail} Could not bump version, error was:`, err)
-+<<<<<<< .our
-     throw err
-+=======
-+>>>>>>> .their
-   }
- }
- 
-@@ -74,6 +122,7 @@
- }
- 
- async function getReleaseNotes (currentBranch) {
-+<<<<<<< .our
-   if (versionType === 'nightly') {
-     return 'Nightlies do not get release notes, please compare tags for info'
-   }
-@@ -81,6 +130,12 @@
-   let githubOpts = {
-     owner: 'electron',
-     repo: targetRepo,
-+=======
-+  console.log(`Generating release notes for ${currentBranch}.`)
-+  let githubOpts = {
-+    owner: 'electron',
-+    repo: 'electron',
-+>>>>>>> .their
-     base: `v${pkg.version}`,
-     head: currentBranch
-   }
-@@ -142,11 +197,18 @@
- 
- async function createRelease (branchToTarget, isBeta) {
-   let releaseNotes = await getReleaseNotes(branchToTarget)
-+<<<<<<< .our
-   let newVersion = await getNewVersion()
-   await tagRelease(newVersion)
-   const githubOpts = {
-     owner: 'electron',
-     repo: targetRepo
-+=======
-+  let newVersion = getNewVersion()
-+  const githubOpts = {
-+    owner: 'electron',
-+    repo: 'electron'
-+>>>>>>> .their
-   }
-   console.log(`Checking for existing draft release.`)
-   let releases = await github.repos.getReleases(githubOpts)
-@@ -164,6 +226,7 @@
-   githubOpts.draft = true
-   githubOpts.name = `electron ${newVersion}`
-   if (isBeta) {
-+<<<<<<< .our
-     if (newVersion.indexOf('nightly') > 0) {
-       githubOpts.body = `Note: This is a nightly release.  Please file new issues ` +
-         `for any bugs you find in it.\n \n This release is published to npm ` +
-@@ -175,13 +238,23 @@
-         `under the beta tag and can be installed via npm install electron@beta, ` +
-         `or npm i electron@${newVersion.substr(1)}.\n \n ${releaseNotes}`
-     }
-+=======
-+    githubOpts.body = `Note: This is a beta release.  Please file new issues ` +
-+      `for any bugs you find in it.\n \n This release is published to npm ` +
-+      `under the beta tag and can be installed via npm install electron@beta, ` +
-+      `or npm i electron@${newVersion.substr(1)}.\n \n ${releaseNotes}`
-+>>>>>>> .their
-     githubOpts.name = `${githubOpts.name}`
-     githubOpts.prerelease = true
-   } else {
-     githubOpts.body = releaseNotes
-   }
-   githubOpts.tag_name = newVersion
-+<<<<<<< .our
-   githubOpts.target_commitish = newVersion.indexOf('nightly') !== -1 ? 'master' : branchToTarget
-+=======
-+  githubOpts.target_commitish = branchToTarget
-+>>>>>>> .their
-   await github.repos.createRelease(githubOpts)
-     .catch(err => {
-       console.log(`${fail} Error creating new release: `, err)
-@@ -190,6 +263,7 @@
-   console.log(`${pass} Draft release for ${newVersion} has been created.`)
- }
- 
-+<<<<<<< .our
- async function pushRelease (branch) {
-   let pushDetails = await GitProcess.exec(['push', 'origin', `HEAD:${branch}`, '--follow-tags'], gitDir)
-   if (pushDetails.exitCode === 0) {
-@@ -197,11 +271,21 @@
-       `release builds to finish before running "npm run release".`)
-   } else {
-     console.log(`${fail} Error pushing the release: ` +
-+=======
-+async function pushRelease () {
-+  let pushDetails = await GitProcess.exec(['push', 'origin', 'HEAD'], gitDir)
-+  if (pushDetails.exitCode === 0) {
-+    console.log(`${pass} Successfully pushed the release branch.  Wait for ` +
-+      `release builds to finish before running "npm run release".`)
-+  } else {
-+    console.log(`${fail} Error pushing the release branch: ` +
-+>>>>>>> .their
-         `${pushDetails.stderr}`)
-     process.exit(1)
-   }
- }
- 
-+<<<<<<< .our
- async function runReleaseBuilds (branch) {
-   await ciReleaseBuild(branch, {
-     ghRelease: true,
-@@ -229,6 +313,17 @@
-   } else {
-     response = await promptForVersion(newVersion)
-   }
-+=======
-+async function runReleaseBuilds () {
-+  await ciReleaseBuild('release-1-7-x', {
-+    ghRelease: true
-+  })
-+}
-+
-+async function verifyNewVersion () {
-+  let newVersion = await getNewVersion(true)
-+  let response = await promptForVersion(newVersion)
-+>>>>>>> .their
-   if (response.match(/^y/i)) {
-     console.log(`${pass} Starting release of ${newVersion}`)
-   } else {
-@@ -250,6 +345,7 @@
-   })
- }
- 
-+<<<<<<< .our
- // function to determine if there have been commits to master since the last release
- async function changesToRelease () {
-   let lastCommitWasRelease = new RegExp(`^Bump v[0-9.]*(-beta[0-9.]*)?(-nightly[0-9.]*)?$`, 'g')
-@@ -278,6 +374,19 @@
-         process.exit(1)
-       }
-     }
-+=======
-+async function prepareRelease (isBeta, notesOnly) {
-+  let currentBranch = await getCurrentBranch(gitDir)
-+  if (notesOnly) {
-+    let releaseNotes = await getReleaseNotes(currentBranch)
-+    console.log(`Draft release notes are: ${releaseNotes}`)
-+  } else {
-+    await verifyNewVersion()
-+    await createReleaseBranch()
-+    await createRelease(currentBranch, isBeta)
-+    await pushRelease()
-+    await runReleaseBuilds()
-+>>>>>>> .their
-   }
- }
- 
-added in remote
-  their  100755 78b63933009cf47cc50130dabaa8fe6f5f73b30f script/prerelease.js
-@@ -0,0 +1,112 @@
-+#!/usr/bin/env node
-+
-+require('colors')
-+const assert = require('assert')
-+const GitHub = require('github')
-+const heads = require('heads')
-+const pkg = require('../package.json')
-+const pass = '\u2713'.green
-+const fail = '\u2717'.red
-+let failureCount = 0
-+
-+assert(process.env.ELECTRON_GITHUB_TOKEN, 'ELECTRON_GITHUB_TOKEN not found in environment')
-+
-+const github = new GitHub()
-+github.authenticate({type: 'token', token: process.env.ELECTRON_GITHUB_TOKEN})
-+github.repos.getReleases({owner: 'electron', repo: 'electron'})
-+  .then(res => {
-+    const releases = res.data
-+    const drafts = releases
-+      .filter(release => release.draft) // comment out for testing
-+      // .filter(release => release.tag_name === 'v1.7.5') // uncomment for testing
-+
-+    check(drafts.length === 1, 'one draft exists', true)
-+    const draft = drafts[0]
-+
-+    check(draft.tag_name === `v${pkg.version}`, `draft release version matches local package.json (v${pkg.version})`)
-+    check(draft.prerelease, 'draft is a prerelease')
-+    check(draft.body.length > 50 && !draft.body.includes('(placeholder)'), 'draft has release notes')
-+
-+    const requiredAssets = assetsForVersion(draft.tag_name).sort()
-+    const extantAssets = draft.assets.map(asset => asset.name).sort()
-+
-+    requiredAssets.forEach(asset => {
-+      check(extantAssets.includes(asset), asset)
-+    })
-+
-+    const s3Urls = s3UrlsForVersion(draft.tag_name)
-+    heads(s3Urls)
-+      .then(results => {
-+        results.forEach((result, i) => {
-+          check(result === 200, s3Urls[i])
-+        })
-+
-+        process.exit(failureCount > 0 ? 1 : 0)
-+      })
-+      .catch(err => {
-+        console.error('Error making HEAD requests for S3 assets')
-+        console.error(err)
-+        process.exit(1)
-+      })
-+  })
-+
-+function check (condition, statement, exitIfFail = false) {
-+  if (condition) {
-+    console.log(`${pass} ${statement}`)
-+  } else {
-+    failureCount++
-+    console.log(`${fail} ${statement}`)
-+    if (exitIfFail) process.exit(1)
-+  }
-+}
-+
-+function assetsForVersion (version) {
-+  const patterns = [
-+    'electron-{{VERSION}}-darwin-x64-dsym.zip',
-+    'electron-{{VERSION}}-darwin-x64-symbols.zip',
-+    'electron-{{VERSION}}-darwin-x64.zip',
-+    'electron-{{VERSION}}-linux-arm-symbols.zip',
-+    'electron-{{VERSION}}-linux-arm.zip',
-+    'electron-{{VERSION}}-linux-armv7l-symbols.zip',
-+    'electron-{{VERSION}}-linux-armv7l.zip',
-+    'electron-{{VERSION}}-linux-ia32-symbols.zip',
-+    'electron-{{VERSION}}-linux-ia32.zip',
-+    'electron-{{VERSION}}-linux-x64-symbols.zip',
-+    'electron-{{VERSION}}-linux-x64.zip',
-+    'electron-{{VERSION}}-mas-x64-dsym.zip',
-+    'electron-{{VERSION}}-mas-x64-symbols.zip',
-+    'electron-{{VERSION}}-mas-x64.zip',
-+    'electron-{{VERSION}}-win32-ia32-pdb.zip',
-+    'electron-{{VERSION}}-win32-ia32-symbols.zip',
-+    'electron-{{VERSION}}-win32-ia32.zip',
-+    'electron-{{VERSION}}-win32-x64-pdb.zip',
-+    'electron-{{VERSION}}-win32-x64-symbols.zip',
-+    'electron-{{VERSION}}-win32-x64.zip',
-+    'electron-api.json',
-+    'electron.d.ts',
-+    'ffmpeg-{{VERSION}}-darwin-x64.zip',
-+    'ffmpeg-{{VERSION}}-linux-arm.zip',
-+    'ffmpeg-{{VERSION}}-linux-armv7l.zip',
-+    'ffmpeg-{{VERSION}}-linux-ia32.zip',
-+    'ffmpeg-{{VERSION}}-linux-x64.zip',
-+    'ffmpeg-{{VERSION}}-mas-x64.zip',
-+    'ffmpeg-{{VERSION}}-win32-ia32.zip',
-+    'ffmpeg-{{VERSION}}-win32-x64.zip'
-+  ]
-+  return patterns.map(pattern => pattern.replace(/{{VERSION}}/g, version))
-+}
-+
-+function s3UrlsForVersion (version) {
-+  const bucket = 'https://gh-contractor-zcbenz.s3.amazonaws.com/'
-+  const patterns = [
-+    'atom-shell/dist/{{VERSION}}/iojs-{{VERSION}}-headers.tar.gz',
-+    'atom-shell/dist/{{VERSION}}/iojs-{{VERSION}}.tar.gz',
-+    'atom-shell/dist/{{VERSION}}/node-{{VERSION}}.tar.gz',
-+    'atom-shell/dist/{{VERSION}}/node.lib',
-+    'atom-shell/dist/{{VERSION}}/win-x64/iojs.lib',
-+    'atom-shell/dist/{{VERSION}}/win-x86/iojs.lib',
-+    'atom-shell/dist/{{VERSION}}/x64/node.lib',
-+    'atom-shell/dist/index.json'
-+  ]
-+  return patterns.map(pattern => bucket + pattern.replace(/{{VERSION}}/g, version))
-+}
-added in both
-  our    100755 84e00ad4f309201f151c3f8fcbaf9ee536c9b6cb script/release.js
-  their  100755 54379f8ff9ea9fc19a0ba3349c0019f23383b94f script/release.js
-@@ -1,8 +1,14 @@
- #!/usr/bin/env node
- 
-+<<<<<<< .our
- if (!process.env.CI) require('dotenv-safe').load()
- require('colors')
- const args = require('minimist')(process.argv.slice(2))
-+=======
-+require('colors')
-+const args = require('minimist')(process.argv.slice(2))
-+const assert = require('assert')
-+>>>>>>> .their
- const fs = require('fs')
- const { execSync } = require('child_process')
- const GitHub = require('github')
-@@ -16,16 +22,30 @@
- const sumchecker = require('sumchecker')
- const temp = require('temp').track()
- const { URL } = require('url')
-+<<<<<<< .our
- const targetRepo = pkgVersion.indexOf('nightly') > 0 ? 'nightlies' : 'electron'
- let failureCount = 0
- 
-+=======
-+let failureCount = 0
-+
-+assert(process.env.ELECTRON_GITHUB_TOKEN, 'ELECTRON_GITHUB_TOKEN not found in environment')
-+
-+>>>>>>> .their
- const github = new GitHub({
-   followRedirects: false
- })
- github.authenticate({type: 'token', token: process.env.ELECTRON_GITHUB_TOKEN})
-+<<<<<<< .our
- 
- async function getDraftRelease (version, skipValidation) {
-   let releaseInfo = await github.repos.getReleases({owner: 'electron', repo: targetRepo})
-+=======
-+const gitDir = path.resolve(__dirname, '..')
-+
-+async function getDraftRelease (version, skipValidation) {
-+  let releaseInfo = await github.repos.getReleases({owner: 'electron', repo: 'electron'})
-+>>>>>>> .their
-   let drafts
-   let versionToCheck
-   if (version) {
-@@ -49,8 +69,13 @@
-   return draft
- }
- 
-+<<<<<<< .our
- async function validateReleaseAssets (release, validatingRelease) {
-   const requiredAssets = assetsForVersion(release.tag_name, validatingRelease).sort()
-+=======
-+async function validateReleaseAssets (release) {
-+  const requiredAssets = assetsForVersion(release.tag_name).sort()
-+>>>>>>> .their
-   const extantAssets = release.assets.map(asset => asset.name).sort()
-   const downloadUrls = release.assets.map(asset => asset.browser_download_url).sort()
- 
-@@ -60,6 +85,7 @@
-   })
-   check((failureCount === 0), `All required GitHub assets exist for release`, true)
- 
-+<<<<<<< .our
-   if (!validatingRelease || !release.draft) {
-     if (release.draft) {
-       await verifyAssets(release)
-@@ -72,6 +98,18 @@
-     const s3Urls = s3UrlsForVersion(release.tag_name)
-     await verifyShasums(s3Urls, true)
-   }
-+=======
-+  if (release.draft) {
-+    await verifyAssets(release)
-+  } else {
-+    await verifyShasums(downloadUrls)
-+      .catch(err => {
-+        console.log(`${fail} error verifyingShasums`, err)
-+      })
-+  }
-+  const s3Urls = s3UrlsForVersion(release.tag_name)
-+  await verifyShasums(s3Urls, true)
-+>>>>>>> .their
- }
- 
- function check (condition, statement, exitIfFail = false) {
-@@ -84,13 +122,22 @@
-   }
- }
- 
-+<<<<<<< .our
- function assetsForVersion (version, validatingRelease) {
-+=======
-+function assetsForVersion (version) {
-+>>>>>>> .their
-   const patterns = [
-     `electron-${version}-darwin-x64-dsym.zip`,
-     `electron-${version}-darwin-x64-symbols.zip`,
-     `electron-${version}-darwin-x64.zip`,
-+<<<<<<< .our
-     `electron-${version}-linux-arm64-symbols.zip`,
-     `electron-${version}-linux-arm64.zip`,
-+=======
-+    `electron-${version}-linux-arm-symbols.zip`,
-+    `electron-${version}-linux-arm.zip`,
-+>>>>>>> .their
-     `electron-${version}-linux-armv7l-symbols.zip`,
-     `electron-${version}-linux-armv7l.zip`,
-     `electron-${version}-linux-ia32-symbols.zip`,
-@@ -109,17 +156,27 @@
-     `electron-api.json`,
-     `electron.d.ts`,
-     `ffmpeg-${version}-darwin-x64.zip`,
-+<<<<<<< .our
-     `ffmpeg-${version}-linux-arm64.zip`,
-+=======
-+    `ffmpeg-${version}-linux-arm.zip`,
-+>>>>>>> .their
-     `ffmpeg-${version}-linux-armv7l.zip`,
-     `ffmpeg-${version}-linux-ia32.zip`,
-     `ffmpeg-${version}-linux-x64.zip`,
-     `ffmpeg-${version}-mas-x64.zip`,
-     `ffmpeg-${version}-win32-ia32.zip`,
-+<<<<<<< .our
-     `ffmpeg-${version}-win32-x64.zip`
-   ]
-   if (!validatingRelease) {
-     patterns.push('SHASUMS256.txt')
-   }
-+=======
-+    `ffmpeg-${version}-win32-x64.zip`,
-+    `SHASUMS256.txt`
-+  ]
-+>>>>>>> .their
-   return patterns
- }
- 
-@@ -141,6 +198,7 @@
- }
- 
- function checkVersion () {
-+<<<<<<< .our
-   if (args.skipVersionCheck) return
- 
-   console.log(`Verifying that app version matches package version ${pkgVersion}.`)
-@@ -150,6 +208,11 @@
-     scriptArgs.unshift('-R')
-   }
-   let appVersion = runScript(startScript, scriptArgs).trim()
-+=======
-+  console.log(`Verifying that app version matches package version ${pkgVersion}.`)
-+  let startScript = path.join(__dirname, 'start.py')
-+  let appVersion = runScript(startScript, ['--version']).trim()
-+>>>>>>> .their
-   check((pkgVersion.indexOf(appVersion) === 0), `App version ${appVersion} matches ` +
-     `package version ${pkgVersion}.`, true)
- }
-@@ -180,7 +243,11 @@
- function uploadIndexJson () {
-   console.log('Uploading index.json to S3.')
-   let scriptPath = path.join(__dirname, 'upload-index-json.py')
-+<<<<<<< .our
-   runScript(scriptPath, [pkgVersion])
-+=======
-+  runScript(scriptPath, [])
-+>>>>>>> .their
-   console.log(`${pass} Done uploading index.json to S3.`)
- }
- 
-@@ -191,7 +258,11 @@
-     console.log(`${fileName} already exists on GitHub; deleting before creating new file.`)
-     await github.repos.deleteAsset({
-       owner: 'electron',
-+<<<<<<< .our
-       repo: targetRepo,
-+=======
-+      repo: 'electron',
-+>>>>>>> .their
-       id: existingAssets[0].id
-     }).catch(err => {
-       console.log(`${fail} Error deleting ${fileName} on GitHub:`, err)
-@@ -210,7 +281,11 @@
- async function uploadShasumFile (filePath, fileName, release) {
-   let githubOpts = {
-     owner: 'electron',
-+<<<<<<< .our
-     repo: targetRepo,
-+=======
-+    repo: 'electron',
-+>>>>>>> .their
-     id: release.id,
-     filePath,
-     name: fileName
-@@ -245,7 +320,11 @@
- async function publishRelease (release) {
-   let githubOpts = {
-     owner: 'electron',
-+<<<<<<< .our
-     repo: targetRepo,
-+=======
-+    repo: 'electron',
-+>>>>>>> .their
-     id: release.id,
-     tag_name: release.tag_name,
-     draft: false
-@@ -259,6 +338,7 @@
- 
- async function makeRelease (releaseToValidate) {
-   if (releaseToValidate) {
-+<<<<<<< .our
-     if (releaseToValidate === true) {
-       releaseToValidate = pkgVersion
-     } else {
-@@ -267,18 +347,31 @@
-     console.log(`Validating release ${releaseToValidate}`)
-     let release = await getDraftRelease(releaseToValidate)
-     await validateReleaseAssets(release, true)
-+=======
-+    console.log(`Validating release ${args.validateRelease}`)
-+    let release = await getDraftRelease(args.validateRelease)
-+    await validateReleaseAssets(release)
-+>>>>>>> .their
-   } else {
-     checkVersion()
-     let draftRelease = await getDraftRelease()
-     uploadNodeShasums()
-     uploadIndexJson()
-+<<<<<<< .our
- 
-+=======
-+>>>>>>> .their
-     await createReleaseShasums(draftRelease)
-     // Fetch latest version of release before verifying
-     draftRelease = await getDraftRelease(pkgVersion, true)
-     await validateReleaseAssets(draftRelease)
-+<<<<<<< .our
-     await tagLibCC()
-     await publishRelease(draftRelease)
-+=======
-+    await publishRelease(draftRelease)
-+    await cleanupReleaseBranch()
-+>>>>>>> .their
-     console.log(`${pass} SUCCESS!!! Release has been published. Please run ` +
-       `"npm run publish-to-npm" to publish release to npm.`)
-   }
-@@ -300,7 +393,11 @@
-   let downloadDir = await makeTempDir()
-   let githubOpts = {
-     owner: 'electron',
-+<<<<<<< .our
-     repo: targetRepo,
-+=======
-+    repo: 'electron',
-+>>>>>>> .their
-     headers: {
-       Accept: 'application/octet-stream'
-     }
-@@ -446,6 +543,7 @@
-     `shasums defined in ${validationArgs.shaSumFile}.`)
- }
- 
-+<<<<<<< .our
- async function tagLibCC () {
-   const tag = `electron-${pkg.version}`
-   const libccDir = path.join(path.resolve(__dirname, '..'), 'vendor', 'libchromiumcontent')
-@@ -462,6 +560,26 @@
-   } else {
-     console.log(`${fail} Error tagging libchromiumcontent with ${tag}: ` +
-       `${tagDetails.stderr}`)
-+=======
-+async function cleanupReleaseBranch () {
-+  console.log(`Cleaning up release branch.`)
-+  let errorMessage = `Could not delete local release branch.`
-+  let successMessage = `Successfully deleted local release branch.`
-+  await callGit(['branch', '-D', 'release-1-7-x'], errorMessage, successMessage)
-+  errorMessage = `Could not delete remote release branch.`
-+  successMessage = `Successfully deleted remote release branch.`
-+  return callGit(['push', 'origin', ':release'], errorMessage, successMessage)
-+}
-+
-+async function callGit (args, errorMessage, successMessage) {
-+  let gitResult = await GitProcess.exec(args, gitDir)
-+  if (gitResult.exitCode === 0) {
-+    console.log(`${pass} ${successMessage}`)
-+    return true
-+  } else {
-+    console.log(`${fail} ${errorMessage} ${gitResult.stderr}`)
-+    process.exit(1)
-+>>>>>>> .their
-   }
- }
- 
-changed in both
-  base   100755 94cdb4e9ce644b87fbe0d18ea8c7ad5234486250 script/update-external-binaries.py
-  our    100755 0bc9d0f632057f4a17aa811340ba21631433f173 script/update-external-binaries.py
-  their  100755 a207ad3a1a15e5b01eb85ba382267aa2594dbd98 script/update-external-binaries.py
-@@ -8,7 +8,12 @@
- from lib.util import add_exec_bit, download, extract_zip, rm_rf, \
-                      safe_mkdir, tempdir
- 
-+<<<<<<< .our
- VERSION = 'v1.4.0'
-+=======
-+
-+VERSION = 'v1.2.2'
-+>>>>>>> .their
- SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
- FRAMEWORKS_URL = 'http://github.com/electron/electron-frameworks/releases' \
-                  '/download/' + VERSION
-added in both
-  our    100644 2facda2daa1b8a8ccb63a28198a15b7e7ecb0880 script/upload-to-github.js
-  their  100644 7c3f8d9c11ce7b75f307850663efd2e571e8644a script/upload-to-github.js
-@@ -1,16 +1,24 @@
-+<<<<<<< .our
- if (!process.env.CI) require('dotenv-safe').load()
- 
-+=======
-+>>>>>>> .their
- const GitHub = require('github')
- const github = new GitHub()
- github.authenticate({type: 'token', token: process.env.ELECTRON_GITHUB_TOKEN})
- 
-+<<<<<<< .our
- if (process.argv.length < 6) {
-+=======
-+if (process.argv.length < 5) {
-+>>>>>>> .their
-   console.log('Usage: upload-to-github filePath fileName releaseId')
-   process.exit(1)
- }
- let filePath = process.argv[2]
- let fileName = process.argv[3]
- let releaseId = process.argv[4]
-+<<<<<<< .our
- let releaseVersion = process.argv[5]
- 
- const targetRepo = releaseVersion.indexOf('nightly') > 0 ? 'nightlies' : 'electron'
-@@ -18,6 +26,12 @@
- let githubOpts = {
-   owner: 'electron',
-   repo: targetRepo,
-+=======
-+
-+let githubOpts = {
-+  owner: 'electron',
-+  repo: 'electron',
-+>>>>>>> .their
-   id: releaseId,
-   filePath: filePath,
-   name: fileName
-@@ -39,7 +53,11 @@
-           console.log(`${fileName} already exists; will delete before retrying upload.`)
-           github.repos.deleteAsset({
-             owner: 'electron',
-+<<<<<<< .our
-             repo: targetRepo,
-+=======
-+            repo: 'electron',
-+>>>>>>> .their
-             id: existingAssets[0].id
-           }).then(uploadToGitHub).catch(uploadToGitHub)
-         } else {
-changed in both
-  base   100755 455ed789e0a081bc411adb02b75995bede18c25f script/upload.py
-  our    100755 2d9eaa201265971ca01acaea6e84a440e5db0532 script/upload.py
-  their  100755 4da630433812b51ff0ebbdf89f68c71d90ab8046 script/upload.py
-@@ -51,6 +51,7 @@
-     return 1
- 
-   tag_exists = False
-+<<<<<<< .our
-   release = get_release(args.version)
-   if not release['draft']:
-     tag_exists = True
-@@ -84,6 +85,55 @@
-     # Upload the x64 binary for arm/arm64 mksnapshot
-     mksnapshot = get_zip_name('mksnapshot', ELECTRON_VERSION, 'x64')
-     upload_electron(release, os.path.join(DIST_DIR, mksnapshot), args)
-+=======
-+  for r in releases:
-+    if not r['draft'] and r['tag_name'] == args.version:
-+      release = r
-+      tag_exists = True
-+      break
-+
-+  if not args.upload_to_s3:
-+    assert tag_exists == args.overwrite, \
-+          'You have to pass --overwrite to overwrite a published release'
-+    if not args.overwrite:
-+      release = create_or_get_release_draft(github, releases, args.version,
-+                                            tag_exists)
-+
-+  # Upload Electron with GitHub Releases API.
-+  upload_electron(github, release, os.path.join(DIST_DIR, DIST_NAME),
-+                  args.upload_to_s3)
-+  if get_target_arch() != 'mips64el':
-+    upload_electron(github, release, os.path.join(DIST_DIR, SYMBOLS_NAME),
-+                    args.upload_to_s3)
-+  if PLATFORM == 'darwin':
-+    upload_electron(github, release, os.path.join(DIST_DIR,
-+                    'electron-api.json'), args.upload_to_s3)
-+    upload_electron(github, release, os.path.join(DIST_DIR, 'electron.d.ts'),
-+                    args.upload_to_s3)
-+    upload_electron(github, release, os.path.join(DIST_DIR, DSYM_NAME),
-+                    args.upload_to_s3)
-+  elif PLATFORM == 'win32':
-+    upload_electron(github, release, os.path.join(DIST_DIR, PDB_NAME),
-+                    args.upload_to_s3)
-+
-+  # Upload free version of ffmpeg.
-+  ffmpeg = get_zip_name('ffmpeg', ELECTRON_VERSION)
-+  upload_electron(github, release, os.path.join(DIST_DIR, ffmpeg),
-+                  args.upload_to_s3)
-+
-+  # Upload chromedriver and mksnapshot for minor version update.
-+  if parse_version(args.version)[2] == '0':
-+    chromedriver = get_zip_name('chromedriver', ELECTRON_VERSION)
-+    upload_electron(github, release, os.path.join(DIST_DIR, chromedriver),
-+                    args.upload_to_s3)
-+    mksnapshot = get_zip_name('mksnapshot', ELECTRON_VERSION)
-+    upload_electron(github, release, os.path.join(DIST_DIR, mksnapshot),
-+                    args.upload_to_s3)
-+
-+  if PLATFORM == 'win32' and not tag_exists and not args.upload_to_s3:
-+    # Upload PDBs to Windows symbol server.
-+    run_python_script('upload-windows-pdb.py')
-+>>>>>>> .their
- 
-   if not tag_exists and not args.upload_to_s3:
-     # Upload symbols to symbol server.
-@@ -149,7 +199,66 @@
-   return dist_time > int(head_time)
- 
- 
-+<<<<<<< .our
- def upload_electron(release, file_path, args):
-+=======
-+def get_text_with_editor(name):
-+  editor = os.environ.get('EDITOR', 'nano')
-+  initial_message = '\n# Please enter the body of your release note for %s.' \
-+                    % name
-+
-+  t = tempfile.NamedTemporaryFile(suffix='.tmp', delete=False)
-+  t.write(initial_message)
-+  t.close()
-+  subprocess.call([editor, t.name])
-+
-+  text = ''
-+  for line in open(t.name, 'r'):
-+    if len(line) == 0 or line[0] != '#':
-+      text += line
-+
-+  os.unlink(t.name)
-+  return text
-+
-+def create_or_get_release_draft(github, releases, tag, tag_exists):
-+  # Search for existing draft.
-+  for release in releases:
-+    if release['draft'] and release['tag_name'] == tag:
-+      return release
-+
-+  if tag_exists:
-+    tag = 'do-not-publish-me'
-+  return create_release_draft(github, tag)
-+
-+
-+def create_release_draft(github, tag):
-+  name = '{0} {1} beta'.format(PROJECT_NAME, tag)
-+  if os.environ.has_key('CI'):
-+    body = '(placeholder)'
-+  else:
-+    body = get_text_with_editor(name)
-+  if body == '':
-+    sys.stderr.write('Quit due to empty release note.\n')
-+    sys.exit(0)
-+
-+  data = dict(tag_name=tag, name=name, body=body, draft=True, prerelease=True)
-+  r = github.repos(ELECTRON_REPO).releases.post(data=data)
-+  return r
-+
-+
-+def upload_electron(github, release, file_path, upload_to_s3):
-+
-+  # if upload_to_s3 is set, skip github upload.
-+  if upload_to_s3:
-+    bucket, access_key, secret_key = s3_config()
-+    key_prefix = 'electron-artifacts/{0}'.format(release['tag_name'])
-+    s3put(bucket, access_key, secret_key, os.path.dirname(file_path),
-+          key_prefix, [file_path])
-+    upload_sha256_checksum(release['tag_name'], file_path, key_prefix)
-+    return
-+
-+  # Delete the original file before uploading in CI.
-+>>>>>>> .their
-   filename = os.path.basename(file_path)
- 
-   # if upload_to_s3 is set, skip github upload.
-@@ -165,6 +274,7 @@
-     return
- 
-   # Upload the file.
-+<<<<<<< .our
-   upload_io_to_github(release, filename, file_path, args.version)
- 
-   # Upload the checksum file.
-@@ -177,6 +287,27 @@
-   script_path = os.path.join(SOURCE_ROOT, 'script', 'upload-to-github.js')
-   execute(['node', script_path, filepath, filename, str(release['id']),
-           version])
-+=======
-+  upload_io_to_github(release, filename, file_path)
-+
-+  # Upload the checksum file.
-+  upload_sha256_checksum(release['tag_name'], file_path)
-+
-+  # Upload ARM assets without the v7l suffix for backwards compatibility
-+  # TODO Remove for 2.0
-+  if 'armv7l' in filename:
-+    arm_filename = filename.replace('armv7l', 'arm')
-+    arm_file_path = os.path.join(os.path.dirname(file_path), arm_filename)
-+    shutil.copy2(file_path, arm_file_path)
-+    upload_electron(github, release, arm_file_path, upload_to_s3)
-+
-+
-+def upload_io_to_github(release, filename, filepath):
-+  print 'Uploading %s to Github' % \
-+      (filename)
-+  script_path = os.path.join(SOURCE_ROOT, 'script', 'upload-to-github.js')
-+  execute(['node', script_path, filepath, filename, str(release['id'])])
-+>>>>>>> .their
- 
- 
- def upload_sha256_checksum(version, file_path, key_prefix=None):
-changed in both
-  base   100644 1df816807ddb0fb20d91f9a6536381126ff9ebb7 spec/api-app-spec.js
-  our    100644 d224eda2989332c18d655cef05a8bacc2eb6d4b8 spec/api-app-spec.js
-  their  100644 a8c288e771ecb3f1fd8807f7dc9a776769395b03 spec/api-app-spec.js
-@@ -196,6 +196,7 @@
-     })
-   })
- 
-+<<<<<<< .our
-   // TODO(MarshallOfSound) - Remove in 4.0.0
-   describe('app.makeSingleInstance', () => {
-     it('prevents the second launch of app', function (done) {
-@@ -233,11 +234,41 @@
-           expect(code).to.equal(1)
-           done()
-         })
-+=======
-+  describe('app.makeSingleInstance', function () {
-+    it('prevents the second launch of app', function (done) {
-+      this.timeout(120000)
-+      const appPath = path.join(__dirname, 'fixtures', 'api', 'singleton')
-+      // First launch should exit with 0.
-+      let secondLaunched = false
-+      const first = ChildProcess.spawn(remote.process.execPath, [appPath])
-+      let launchOnce = true
-+      first.stdout.on('data', (data) => {
-+        if (data.toString().trim() === 'launched' && launchOnce) {
-+          launchOnce = false
-+          // Second launch should exit with 1.
-+          const second = ChildProcess.spawn(remote.process.execPath, [appPath])
-+          second.once('exit', (code) => {
-+            assert.ok(!secondLaunched)
-+            assert.equal(code, 1)
-+            secondLaunched = true
-+          })
-+        }
-+      })
-+      first.once('exit', (code) => {
-+        assert.ok(secondLaunched)
-+        assert.equal(code, 0)
-+        done()
-+>>>>>>> .their
-       })
-     })
-   })
- 
-+<<<<<<< .our
-   describe('app.relaunch', () => {
-+=======
-+  describe('app.relaunch', function () {
-+>>>>>>> .their
-     let server = null
-     const socketPath = process.platform === 'win32' ? '\\\\.\\pipe\\electron-app-relaunch' : '/tmp/electron-app-relaunch'
- 
-@@ -294,8 +325,16 @@
-     })
-   })
- 
-+<<<<<<< .our
-   xdescribe('app.importCertificate', () => {
-     let w = null
-+=======
-+  xdescribe('app.importCertificate', function () {
-+    if (process.platform !== 'linux') return
-+
-+    this.timeout(120000)
-+    var w = null
-+>>>>>>> .their
- 
-     before(function () {
-       if (process.platform !== 'linux') {
-@@ -535,7 +574,11 @@
-     })
-   })
- 
-+<<<<<<< .our
-   describe('select-client-certificate event', () => {
-+=======
-+  xdescribe('select-client-certificate event', function () {
-+>>>>>>> .their
-     let w = null
- 
-     before(function () {
-@@ -688,6 +731,54 @@
-         this.skip()
-       }
-     })
-+<<<<<<< .our
-+=======
-+
-+    it('does not launch for blacklisted argument', function (done) {
-+      const appPath = path.join(__dirname, 'fixtures', 'api', 'quit-app')
-+      // App should exit with non 123 code.
-+      const first = ChildProcess.spawn(remote.process.execPath, [appPath, 'electron-test://?', '--no-sandbox', '--gpu-launcher=cmd.exe /c start calc'])
-+      first.once('exit', (code) => {
-+        assert.notEqual(code, 123)
-+        done()
-+      })
-+    })
-+
-+    it('launches successfully for multiple uris in cmd args', function (done) {
-+      const appPath = path.join(__dirname, 'fixtures', 'api', 'quit-app')
-+      // App should exit with code 123.
-+      const first = ChildProcess.spawn(remote.process.execPath, [appPath, 'http://electronjs.org', 'electron-test://testdata'])
-+      first.once('exit', (code) => {
-+        assert.equal(code, 123)
-+        done()
-+      })
-+    })
-+
-+    it('does not launch for encoded space', function (done) {
-+      const appPath = path.join(__dirname, 'fixtures', 'api', 'quit-app')
-+      // App should exit with non 123 code.
-+      const first = ChildProcess.spawn(remote.process.execPath, [appPath, 'electron-test://?', '--no-sandbox', '--gpu-launcher%20"cmd.exe /c start calc'])
-+      first.once('exit', (code) => {
-+        assert.notEqual(code, 123)
-+        done()
-+      })
-+    })
-+
-+    it('launches successfully for argnames similar to blacklisted ones', function (done) {
-+      const appPath = path.join(__dirname, 'fixtures', 'api', 'quit-app')
-+      // inspect is blacklisted, but inspector should work, and app launch should succeed
-+      const first = ChildProcess.spawn(remote.process.execPath, [appPath, 'electron-test://?', '--inspector'])
-+      first.once('exit', (code) => {
-+        assert.equal(code, 123)
-+        done()
-+      })
-+    })
-+  })
-+
-+  describe('getFileIcon() API', function () {
-+    // FIXME Get these specs running on Linux CI
-+    if (process.platform === 'linux' && isCI) return
-+>>>>>>> .their
- 
-     it('does not launch for argument following a URL', done => {
-       const appPath = path.join(__dirname, 'fixtures', 'api', 'quit-app')
-changed in both
-  base   100644 52c9b5fb47e3f559785104958b65824d511fa986 spec/api-browser-window-spec.js
-  our    100644 f4cba12ec19d224bc46fca898db42a99baf4972e spec/api-browser-window-spec.js
-  their  100644 f4222145dba6f9e773d7d657cc688ad9efb55afa spec/api-browser-window-spec.js
-changed in both
-  base   100644 2f9f2b2795adbe396b683ed9854c6675a50d6ba4 spec/chromium-spec.js
-  our    100644 d90269769d269e4054d25cba4b6c4ac8a1929aa6 spec/chromium-spec.js
-  their  100644 e18b1a141eac068348eb34d064a357929b243a5f spec/chromium-spec.js
-@@ -319,8 +319,12 @@
-       b = window.open(windowUrl, '', 'nodeIntegration=no,show=no')
-     })
- 
-+<<<<<<< .our
-     // TODO(codebytere): re-enable this test
-     xit('disables node integration when it is disabled on the parent window for chrome devtools URLs', (done) => {
-+=======
-+    it('disables node integration when it is disabled on the parent window for chrome devtools URLs', (done) => {
-+>>>>>>> .their
-       let b
-       app.once('web-contents-created', (event, contents) => {
-         contents.once('did-finish-load', () => {
-added in both
-  our    100644 3202a7a180d6d48c70706d5ef244652872b24bbc spec/fixtures/api/singleton/main.js
-  their  100644 665987c8400f1183d009e3aad3bfab0860529de1 spec/fixtures/api/singleton/main.js
-@@ -1,5 +1,6 @@
- const {app} = require('electron')
- 
-+<<<<<<< .our
- app.once('ready', () => {
-   console.log('started')  // ping parent
- })
-@@ -11,5 +12,18 @@
- })
- 
- if (!gotTheLock) {
-+=======
-+console.log('launched')
-+
-+process.on('uncaughtException', () => {
-+  app.exit(2)
-+})
-+
-+const shouldExit = app.makeSingleInstance(() => {
-+  process.nextTick(() => app.exit(0))
-+})
-+
-+if (shouldExit) {
-+>>>>>>> .their
-   app.exit(1)
- }
-changed in both
-  base   100644 1211b3ea8bb8f45b69c4479ce9c4ce42a2d84373 spec/package.json
-  our    100644 37dec32f876cbe6a0b07b78922140397947a818a spec/package.json
-  their  100644 0bedddc69f0b1c930b90ced3f38726649e82fe49 spec/package.json
-@@ -13,11 +13,19 @@
-     "dirty-chai": "^2.0.1",
-     "graceful-fs": "^4.1.11",
-     "mkdirp": "^0.5.1",
-+<<<<<<< .our
-     "mocha": "^5.2.0",
-     "mocha-junit-reporter": "^1.17.0",
-     "multiparty": "^4.1.4",
-     "q": "^1.5.1",
-     "send": "^0.16.2",
-+=======
-+    "mocha": "^3.1.0",
-+    "mocha-junit-reporter": "^1.14.0",
-+    "multiparty": "^4.1.3",
-+    "q": "^1.4.1",
-+    "send": "^0.14.1",
-+>>>>>>> .their
-     "temp": "^0.8.3",
-     "walkdir": "0.0.12",
-     "winreg": "^1.2.4",
-changed in both
-  base   100644 74a9e6d278e9e96968d8e3b75303456b4a756825 spec/static/index.html
-  our    100644 fc1e153c0af2908cf7ee4c3ea4f05522de04f0f8 spec/static/index.html
-  their  100644 39f523f7d96b322ce39323040426ef517ee3c261 spec/static/index.html
-@@ -44,12 +44,24 @@
-   const { Coverage } = require('electabul')
-   const Mocha = require('mocha')
- 
-+<<<<<<< .our
-   const mocha = new Mocha(process.env.MOCHA_REPORTER
-     ? { reporter: process.env.MOCHA_REPORTER }
-     : undefined)
- 
-   if (!process.env.MOCHA_REPORTER) {
-     mocha.ui('bdd').reporter(isCi ? 'tap' : 'html')
-+=======
-+  var Mocha = require('mocha');
-+  var mochaOpts = {};
-+  if (process.env.MOCHA_REPORTER) {
-+    mochaOpts.reporter = process.env.MOCHA_REPORTER;
-+  }
-+  var mocha = new Mocha(mochaOpts);
-+
-+  if (!process.env.MOCHA_REPORTER) {
-+    mocha.ui('bdd').reporter(isCi ? 'tap' : 'html');
-+>>>>>>> .their
-   }
-   mocha.timeout(isCi ? 30000 : 10000)
- 
-changed in both
-  base   160000 92e2d6a9657444dfbdcb89f986c8705bdda3dccf vendor/libchromiumcontent
-  our    160000 c85470a1c379b1c4bedb372c146521bc4be9b75d vendor/libchromiumcontent
-  their  160000 4a4acde5522c21fe2f0a21f5ca29f99e90b03adc vendor/libchromiumcontent
-changed in both
-  base   160000 dfa72e2c73e0442d27746e0f8716d0427f7f9b27 vendor/node
-  our    160000 ece0a06ac8147efb5b5af431c21f312f1884616e vendor/node
-  their  160000 a992f2ff412b85606ec1d4c1eb00ad832fa1e640 vendor/node
-added in both
-  our    100644 84bd69c2b2868ac23bc30061aa208ad38fbb9506 vsts.yml
-  their  100644 aaee2e6522650cd470f09e43b74b4d0a126c2128 vsts.yml
-@@ -59,7 +59,11 @@
- - bash: |
-     echo 'Verifying ffmpeg on build'
-     if [ "$ELECTRON_RELEASE" == "1" ]; then
-+<<<<<<< .our
-       script/verify-ffmpeg.py -c R
-+=======
-+      script/verify-ffmpeg.py -R
-+>>>>>>> .their
-     else
-       script/verify-ffmpeg.py
-     fi
-@@ -69,6 +73,7 @@
- - task: PublishTestResults@2
-   displayName: Publish Test Results
-   inputs:
-+<<<<<<< .our
-     testResultsFiles: '**/test-*.xml'
-   condition: and(always(), eq(variables['MOCHA_FILE'], 'test-results.xml'))
- 
-@@ -93,5 +98,18 @@
-   inputs:
-     PathtoPublish: '$(Build.SourcesDirectory)/out'
-     ArtifactName: out
-+=======
-+    testResultsFiles: 'test-results.xml'
-+    searchFolder: junit
-+  condition: and(always(), ne(variables['ELECTRON_RELEASE'], '1'))
-+
-+- task: kasunkodagoda.slack-notification.slack-notification-task.SlackNotification@3
-+  displayName: Post Slack Notification
-+  inputs:
-+    SlackApiToken: '$(slack_token)'
-+    Channel: '#bot-nightly-releases'
-+    Message: '$(Build.DefinitionName)-$(Build.BuildNumber) finished with a $(Agent.JobStatus) status.'
-+  condition: and(always(), eq(variables['Build.Reason'], 'Schedule'))
-+>>>>>>> .their
- 
- - task: mspremier.PostBuildCleanup.PostBuildCleanup-task.PostBuildCleanup@3
diff --git a/app/test/fixtures/merge-parser/electron/merge-remove-nativeimage-deprecated-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-remove-nativeimage-deprecated-into-master.txt
deleted file mode 100644
index 142e22e93f2..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-remove-nativeimage-deprecated-into-master.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-changed in both
-  base   100644 05e6e4501ffa3e5ed0e7b4a7d467c8bbb5f9b073 atom/common/api/atom_api_native_image.cc
-  our    100644 09edfdaac9107386241505d2d5763b1b24aa73a4 atom/common/api/atom_api_native_image.cc
-  their  100644 fe3ba33412bb277b80b192e26bb90ed0fe5feef1 atom/common/api/atom_api_native_image.cc
-changed in both
-  base   100644 2b61fda68c8a163f607eba83ce0fdf258216602c spec/api-native-image-spec.js
-  our    100644 0546971b716e0d29d1e76d689be0a182c3f4b52d spec/api-native-image-spec.js
-  their  100644 81ba7465d201748b8811fe724389aac59e818dd9 spec/api-native-image-spec.js
-@@ -164,6 +164,12 @@
-       const imageI = nativeImage.createFromBuffer(imageA.toBitmap(),
-         {width: 538, height: 190, scaleFactor: 2.0})
-       expect(imageI.getSize()).to.deep.equal({width: 269, height: 95})
-+<<<<<<< .our
-+=======
-+
-+      const imageJ = nativeImage.createFromBuffer(imageA.toPNG(), {scaleFactor: 2.0})
-+      expect(imageJ.getSize()).to.deep.equal({width: 269, height: 95})
-+>>>>>>> .their
-     })
-   })
- 
diff --git a/app/test/fixtures/merge-parser/electron/merge-rename-atom-to-electron-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-rename-atom-to-electron-into-master.txt
deleted file mode 100644
index 7984b51b4ab..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-rename-atom-to-electron-into-master.txt
+++ /dev/null
@@ -1,88079 +0,0 @@
-removed in remote
-  base   100644 25e9d0f1932af30296de26c5fb0013e09a99c19c atom/app/atom_content_client.cc
-  our    100644 f17ae3137032f0b0e26eb735d37cfb3daaeebcfc atom/app/atom_content_client.cc
-@@ -1,244 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/app/atom_content_client.h"
--
--#include <string>
--#include <vector>
--
--#include "atom/common/atom_version.h"
--#include "atom/common/chrome_version.h"
--#include "atom/common/options_switches.h"
--#include "base/command_line.h"
--#include "base/files/file_util.h"
--#include "base/strings/string_split.h"
--#include "base/strings/string_util.h"
--#include "base/strings/utf_string_conversions.h"
--#include "content/public/common/content_constants.h"
--#include "content/public/common/pepper_plugin_info.h"
--#include "content/public/common/user_agent.h"
--#include "media/media_features.h"
--#include "ppapi/shared_impl/ppapi_permissions.h"
--#include "ui/base/l10n/l10n_util.h"
--#include "url/url_constants.h"
--
--#if defined(WIDEVINE_CDM_AVAILABLE) && BUILDFLAG(ENABLE_LIBRARY_CDMS)
--#include "chrome/common/widevine_cdm_constants.h"
--#endif
--
--#if defined(ENABLE_PDF_VIEWER)
--#include "atom/common/atom_constants.h"
--#include "pdf/pdf.h"
--#endif  // defined(ENABLE_PDF_VIEWER)
--
--namespace atom {
--
--namespace {
--
--content::PepperPluginInfo CreatePepperFlashInfo(const base::FilePath& path,
--                                                const std::string& version) {
--  content::PepperPluginInfo plugin;
--
--  plugin.is_out_of_process = true;
--  plugin.name = content::kFlashPluginName;
--  plugin.path = path;
--  plugin.permissions = ppapi::PERMISSION_ALL_BITS;
--
--  std::vector<std::string> flash_version_numbers = base::SplitString(
--      version, ".", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
--  if (flash_version_numbers.empty())
--    flash_version_numbers.push_back("11");
--  // |SplitString()| puts in an empty string given an empty string. :(
--  else if (flash_version_numbers[0].empty())
--    flash_version_numbers[0] = "11";
--  if (flash_version_numbers.size() < 2)
--    flash_version_numbers.push_back("2");
--  if (flash_version_numbers.size() < 3)
--    flash_version_numbers.push_back("999");
--  if (flash_version_numbers.size() < 4)
--    flash_version_numbers.push_back("999");
--  // E.g., "Shockwave Flash 10.2 r154":
--  plugin.description = plugin.name + " " + flash_version_numbers[0] + "." +
--                       flash_version_numbers[1] + " r" +
--                       flash_version_numbers[2];
--  plugin.version = base::JoinString(flash_version_numbers, ".");
--  content::WebPluginMimeType swf_mime_type(content::kFlashPluginSwfMimeType,
--                                           content::kFlashPluginSwfExtension,
--                                           content::kFlashPluginSwfDescription);
--  plugin.mime_types.push_back(swf_mime_type);
--  content::WebPluginMimeType spl_mime_type(content::kFlashPluginSplMimeType,
--                                           content::kFlashPluginSplExtension,
--                                           content::kFlashPluginSplDescription);
--  plugin.mime_types.push_back(spl_mime_type);
--
--  return plugin;
--}
--
--#if defined(WIDEVINE_CDM_AVAILABLE) && BUILDFLAG(ENABLE_LIBRARY_CDMS)
--content::PepperPluginInfo CreateWidevineCdmInfo(const base::FilePath& path,
--                                                const std::string& version) {
--  content::PepperPluginInfo widevine_cdm;
--  widevine_cdm.is_out_of_process = true;
--  widevine_cdm.path = path;
--  widevine_cdm.name = kWidevineCdmDisplayName;
--  widevine_cdm.description =
--      kWidevineCdmDescription + std::string(" (version: ") + version + ")";
--  widevine_cdm.version = version;
--  content::WebPluginMimeType widevine_cdm_mime_type(
--      kWidevineCdmPluginMimeType, kWidevineCdmPluginExtension,
--      kWidevineCdmPluginMimeTypeDescription);
--
--  widevine_cdm.mime_types.push_back(widevine_cdm_mime_type);
--  widevine_cdm.permissions = kWidevineCdmPluginPermissions;
--
--  return widevine_cdm;
--}
--#endif  // defined(WIDEVINE_CDM_AVAILABLE) && BUILDFLAG(ENABLE_LIBRARY_CDMS)
--
--#if defined(ENABLE_PDF_VIEWER)
--void ComputeBuiltInPlugins(std::vector<content::PepperPluginInfo>* plugins) {
--  content::PepperPluginInfo pdf_info;
--  pdf_info.is_internal = true;
--  pdf_info.is_out_of_process = true;
--  pdf_info.name = "Chromium PDF Viewer";
--  pdf_info.description = "Portable Document Format";
--  pdf_info.path = base::FilePath::FromUTF8Unsafe(kPdfPluginPath);
--  content::WebPluginMimeType pdf_mime_type(kPdfPluginMimeType, "pdf",
--                                           "Portable Document Format");
--  pdf_info.mime_types.push_back(pdf_mime_type);
--  pdf_info.internal_entry_points.get_interface = chrome_pdf::PPP_GetInterface;
--  pdf_info.internal_entry_points.initialize_module =
--      chrome_pdf::PPP_InitializeModule;
--  pdf_info.internal_entry_points.shutdown_module =
--      chrome_pdf::PPP_ShutdownModule;
--  pdf_info.permissions = ppapi::PERMISSION_PRIVATE | ppapi::PERMISSION_DEV;
--  plugins->push_back(pdf_info);
--}
--#endif  // defined(ENABLE_PDF_VIEWER)
--
--void ConvertStringWithSeparatorToVector(std::vector<std::string>* vec,
--                                        const char* separator,
--                                        const char* cmd_switch) {
--  auto* command_line = base::CommandLine::ForCurrentProcess();
--  auto string_with_separator = command_line->GetSwitchValueASCII(cmd_switch);
--  if (!string_with_separator.empty())
--    *vec = base::SplitString(string_with_separator, separator,
--                             base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
--}
--
--}  // namespace
--
--void AddPepperFlashFromCommandLine(
--    std::vector<content::PepperPluginInfo>* plugins) {
--  auto* command_line = base::CommandLine::ForCurrentProcess();
--  base::FilePath flash_path =
--      command_line->GetSwitchValuePath(switches::kPpapiFlashPath);
--  if (flash_path.empty())
--    return;
--
--  auto flash_version =
--      command_line->GetSwitchValueASCII(switches::kPpapiFlashVersion);
--
--  plugins->push_back(CreatePepperFlashInfo(flash_path, flash_version));
--}
--
--#if defined(WIDEVINE_CDM_AVAILABLE) && BUILDFLAG(ENABLE_LIBRARY_CDMS)
--void AddWidevineCdmFromCommandLine(
--    std::vector<content::PepperPluginInfo>* plugins) {
--  auto* command_line = base::CommandLine::ForCurrentProcess();
--  base::FilePath widevine_cdm_path =
--      command_line->GetSwitchValuePath(switches::kWidevineCdmPath);
--  if (widevine_cdm_path.empty())
--    return;
--
--  if (!base::PathExists(widevine_cdm_path))
--    return;
--
--  auto widevine_cdm_version =
--      command_line->GetSwitchValueASCII(switches::kWidevineCdmVersion);
--  if (widevine_cdm_version.empty())
--    return;
--
--  plugins->push_back(
--      CreateWidevineCdmInfo(widevine_cdm_path, widevine_cdm_version));
--}
--#endif  //  defined(WIDEVINE_CDM_AVAILABLE) && BUILDFLAG(ENABLE_LIBRARY_CDMS)
--
--AtomContentClient::AtomContentClient() {}
--
--AtomContentClient::~AtomContentClient() {}
--
--std::string AtomContentClient::GetProduct() const {
--  return "Chrome/" CHROME_VERSION_STRING;
--}
--
--std::string AtomContentClient::GetUserAgent() const {
--  return content::BuildUserAgentFromProduct("Chrome/" CHROME_VERSION_STRING
--                                            " " ATOM_PRODUCT_NAME
--                                            "/" ATOM_VERSION_STRING);
--}
--
--base::string16 AtomContentClient::GetLocalizedString(int message_id) const {
--  return l10n_util::GetStringUTF16(message_id);
--}
--
--void AtomContentClient::AddAdditionalSchemes(Schemes* schemes) {
--  schemes->standard_schemes.push_back("chrome-extension");
--
--  std::vector<std::string> splited;
--  ConvertStringWithSeparatorToVector(&splited, ",",
--                                     switches::kRegisterServiceWorkerSchemes);
--  for (const std::string& scheme : splited)
--    schemes->service_worker_schemes.push_back(scheme);
--  schemes->service_worker_schemes.push_back(url::kFileScheme);
--
--  ConvertStringWithSeparatorToVector(&splited, ",", switches::kSecureSchemes);
--  for (const std::string& scheme : splited)
--    schemes->secure_schemes.push_back(scheme);
--}
--
--void AtomContentClient::AddPepperPlugins(
--    std::vector<content::PepperPluginInfo>* plugins) {
--  AddPepperFlashFromCommandLine(plugins);
--#if defined(WIDEVINE_CDM_AVAILABLE) && BUILDFLAG(ENABLE_LIBRARY_CDMS)
--  AddWidevineCdmFromCommandLine(plugins);
--#endif  // defined(WIDEVINE_CDM_AVAILABLE) && BUILDFLAG(ENABLE_LIBRARY_CDMS)
--#if defined(ENABLE_PDF_VIEWER)
--  ComputeBuiltInPlugins(plugins);
--#endif  // defined(ENABLE_PDF_VIEWER)
--}
--
--void AtomContentClient::AddContentDecryptionModules(
--    std::vector<content::CdmInfo>* cdms,
--    std::vector<media::CdmHostFilePath>* cdm_host_file_paths) {
--#if defined(WIDEVINE_CDM_AVAILABLE) && BUILDFLAG(ENABLE_LIBRARY_CDMS)
--  auto command_line = base::CommandLine::ForCurrentProcess();
--  base::FilePath widevine_cdm_path =
--      command_line->GetSwitchValuePath(switches::kWidevineCdmPath);
--  if (widevine_cdm_path.empty())
--    return;
--
--  if (!base::PathExists(widevine_cdm_path))
--    return;
--
--  auto widevine_cdm_version =
--      command_line->GetSwitchValueASCII(switches::kWidevineCdmVersion);
--  if (widevine_cdm_version.empty())
--    return;
--
--  std::vector<media::VideoCodec> supported_video_codecs;
--  supported_video_codecs.push_back(media::VideoCodec::kCodecVP8);
--  supported_video_codecs.push_back(media::VideoCodec::kCodecVP9);
--#if BUILDFLAG(USE_PROPRIETARY_CODECS)
--  supported_video_codecs.push_back(media::VideoCodec::kCodecH264);
--#endif  // BUILDFLAG(USE_PROPRIETARY_CODECS)
--  content::CdmRegistry::GetInstance()->RegisterCdm(
--      content::CdmInfo(kWidevineCdmDisplayName, kWidevineCdmGuid,
--                       base::Version(widevine_cdm_version), widevine_cdm_path,
--                       kWidevineCdmFileSystemId, supported_video_codecs, false,
--                       kWidevineKeySystem, false));
--#endif  // defined(WIDEVINE_CDM_AVAILABLE) && BUILDFLAG(ENABLE_LIBRARY_CDMS)
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 33dbe19d990e6d3030d075f136e591c303b9432f atom/app/atom_content_client.h
-  our    100644 b6ecc3407d0e967ba170be76968b4318b56f8450 atom/app/atom_content_client.h
-@@ -1,39 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_APP_ATOM_CONTENT_CLIENT_H_
--#define ATOM_APP_ATOM_CONTENT_CLIENT_H_
--
--#include <set>
--#include <string>
--#include <vector>
--
--#include "brightray/common/content_client.h"
--
--namespace atom {
--
--class AtomContentClient : public brightray::ContentClient {
-- public:
--  AtomContentClient();
--  ~AtomContentClient() override;
--
-- protected:
--  // content::ContentClient:
--  std::string GetProduct() const override;
--  std::string GetUserAgent() const override;
--  base::string16 GetLocalizedString(int message_id) const override;
--  void AddAdditionalSchemes(Schemes* schemes) override;
--  void AddPepperPlugins(
--      std::vector<content::PepperPluginInfo>* plugins) override;
--  void AddContentDecryptionModules(
--      std::vector<content::CdmInfo>* cdms,
--      std::vector<media::CdmHostFilePath>* cdm_host_file_paths) override;
--
-- private:
--  DISALLOW_COPY_AND_ASSIGN(AtomContentClient);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_APP_ATOM_CONTENT_CLIENT_H_
-removed in remote
-  base   100644 e1603fa5942f7b000c3385648530255032e775a2 atom/app/atom_library_main.h
-  our    100644 2c7a27caa20a411558010c3c58bd78e7850c0737 atom/app/atom_library_main.h
-@@ -1,22 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_APP_ATOM_LIBRARY_MAIN_H_
--#define ATOM_APP_ATOM_LIBRARY_MAIN_H_
--
--#include "build/build_config.h"
--
--#if defined(OS_MACOSX)
--extern "C" {
--__attribute__((visibility("default"))) int AtomMain(int argc, char* argv[]);
--
--#ifdef ENABLE_RUN_AS_NODE
--__attribute__((visibility("default"))) int AtomInitializeICUandStartNode(
--    int argc,
--    char* argv[]);
--#endif
--}
--#endif  // OS_MACOSX
--
--#endif  // ATOM_APP_ATOM_LIBRARY_MAIN_H_
-removed in remote
-  base   100644 7ee7522934689937f7be7b0f866134bf611c7d69 atom/app/atom_library_main.mm
-  our    100644 57a519fcd0db28548ea75034cf92191161183385 atom/app/atom_library_main.mm
-@@ -1,38 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/app/atom_library_main.h"
--
--#include "atom/app/atom_main_delegate.h"
--#include "atom/app/node_main.h"
--#include "atom/common/atom_command_line.h"
--#include "base/at_exit.h"
--#include "base/i18n/icu_util.h"
--#include "base/mac/bundle_locations.h"
--#include "base/mac/scoped_nsautorelease_pool.h"
--#include "brightray/common/mac/main_application_bundle.h"
--#include "content/public/app/content_main.h"
--
--int AtomMain(int argc, char* argv[]) {
--  atom::AtomMainDelegate delegate;
--  content::ContentMainParams params(&delegate);
--  params.argc = argc;
--  params.argv = const_cast<const char**>(argv);
--  atom::AtomCommandLine::Init(argc, argv);
--  return content::ContentMain(params);
--}
--
--#ifdef ENABLE_RUN_AS_NODE
--int AtomInitializeICUandStartNode(int argc, char* argv[]) {
--  base::AtExitManager atexit_manager;
--  base::mac::ScopedNSAutoreleasePool pool;
--  base::mac::SetOverrideFrameworkBundlePath(
--      brightray::MainApplicationBundlePath()
--          .Append("Contents")
--          .Append("Frameworks")
--          .Append(ATOM_PRODUCT_NAME " Framework.framework"));
--  base::i18n::InitializeICU();
--  return atom::NodeMain(argc, argv);
--}
--#endif
-removed in remote
-  base   100644 cbd0a85d57685e548b00a74f7133692cc92059e6 atom/app/atom_main.cc
-  our    100644 fc77100d9acb58221c35f364c4db7866a44d347d atom/app/atom_main.cc
-@@ -1,187 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/app/atom_main.h"
--
--#include <cstdlib>
--#include <vector>
--
--#if defined(OS_WIN)
--#include <windows.h>  // windows.h must be included first
--
--#include <atlbase.h>  // ensures that ATL statics like `_AtlWinModule` are initialized (it's an issue in static debug build)
--#include <shellapi.h>
--#include <shellscalingapi.h>
--#include <tchar.h>
--
--#include "atom/app/atom_main_delegate.h"
--#include "atom/app/command_line_args.h"
--#include "atom/common/crash_reporter/win/crash_service_main.h"
--#include "base/environment.h"
--#include "base/process/launch.h"
--#include "base/strings/utf_string_conversions.h"
--#include "base/win/windows_version.h"
--#include "content/public/app/sandbox_helper_win.h"
--#include "sandbox/win/src/sandbox_types.h"
--#elif defined(OS_LINUX)                   // defined(OS_WIN)
--#include "atom/app/atom_main_delegate.h"  // NOLINT
--#include "content/public/app/content_main.h"
--#else  // defined(OS_LINUX)
--#include "atom/app/atom_library_main.h"
--#endif  // defined(OS_MACOSX)
--
--#include "atom/app/node_main.h"
--#include "atom/common/atom_command_line.h"
--#include "base/at_exit.h"
--#include "base/i18n/icu_util.h"
--
--namespace {
--
--#ifdef ENABLE_RUN_AS_NODE
--const char kRunAsNode[] = "ELECTRON_RUN_AS_NODE";
--#endif
--
--#if defined(ENABLE_RUN_AS_NODE) || defined(OS_WIN)
--bool IsEnvSet(const char* name) {
--#if defined(OS_WIN)
--  size_t required_size;
--  getenv_s(&required_size, nullptr, 0, name);
--  return required_size != 0;
--#else
--  char* indicator = getenv(name);
--  return indicator && indicator[0] != '\0';
--#endif
--}
--#endif
--
--}  // namespace
--
--#if defined(OS_WIN)
--int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t* cmd, int) {
--  struct Arguments {
--    int argc = 0;
--    wchar_t** argv = ::CommandLineToArgvW(::GetCommandLineW(), &argc);
--
--    ~Arguments() { LocalFree(argv); }
--  } arguments;
--
--  if (!arguments.argv)
--    return -1;
--
--#ifdef _DEBUG
--  // Don't display assert dialog boxes in CI test runs
--  static const char* kCI = "ELECTRON_CI";
--  bool is_ci = IsEnvSet(kCI);
--  if (!is_ci) {
--    for (int i = 0; i < arguments.argc; ++i) {
--      if (!_wcsicmp(arguments.argv[i], L"--ci")) {
--        is_ci = true;
--        _putenv_s(kCI, "1");  // set flag for child processes
--        break;
--      }
--    }
--  }
--  if (is_ci) {
--    _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_DEBUG | _CRTDBG_MODE_FILE);
--    _CrtSetReportFile(_CRT_ERROR, _CRTDBG_FILE_STDERR);
--
--    _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG | _CRTDBG_MODE_FILE);
--    _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);
--
--    _set_error_mode(_OUT_TO_STDERR);
--  }
--#endif
--
--#ifdef ENABLE_RUN_AS_NODE
--  bool run_as_node = IsEnvSet(kRunAsNode);
--#else
--  bool run_as_node = false;
--#endif
--
--  // Make sure the output is printed to console.
--  if (run_as_node || !IsEnvSet("ELECTRON_NO_ATTACH_CONSOLE"))
--    base::RouteStdioToConsole(false);
--
--#ifndef DEBUG
--  // Chromium has its own TLS subsystem which supports automatic destruction
--  // of thread-local data, and also depends on memory allocation routines
--  // provided by the CRT. The problem is that the auto-destruction mechanism
--  // uses a hidden feature of the OS loader which calls a callback on thread
--  // exit, but only after all loaded DLLs have been detached. Since the CRT is
--  // also a DLL, it happens that by the time Chromium's `OnThreadExit` function
--  // is called, the heap functions, though still in memory, no longer perform
--  // their duties, and when Chromium calls `free` on its buffer, it triggers
--  // an access violation error.
--  // We work around this problem by invoking Chromium's `OnThreadExit` in time
--  // from within the CRT's atexit facility, ensuring the heap functions are
--  // still active. The second invocation from the OS loader will be a no-op.
--  extern void NTAPI OnThreadExit(PVOID module, DWORD reason, PVOID reserved);
--  atexit([]() { OnThreadExit(nullptr, DLL_THREAD_DETACH, nullptr); });
--#endif
--
--#ifdef ENABLE_RUN_AS_NODE
--  if (run_as_node) {
--    std::vector<char*> argv(arguments.argc);
--    std::transform(
--        arguments.argv, arguments.argv + arguments.argc, argv.begin(),
--        [](auto& a) { return _strdup(base::WideToUTF8(a).c_str()); });
--
--    base::AtExitManager atexit_manager;
--    base::i18n::InitializeICU();
--    auto ret = atom::NodeMain(argv.size(), argv.data());
--    std::for_each(argv.begin(), argv.end(), free);
--    return ret;
--  }
--#endif
--
--  if (IsEnvSet("ELECTRON_INTERNAL_CRASH_SERVICE")) {
--    return crash_service::Main(cmd);
--  }
--
--  if (!atom::CheckCommandLineArguments(arguments.argc, arguments.argv))
--    return -1;
--
--  sandbox::SandboxInterfaceInfo sandbox_info = {0};
--  content::InitializeSandboxInfo(&sandbox_info);
--  atom::AtomMainDelegate delegate;
--
--  content::ContentMainParams params(&delegate);
--  params.instance = instance;
--  params.sandbox_info = &sandbox_info;
--  atom::AtomCommandLine::Init(arguments.argc, arguments.argv);
--  return content::ContentMain(params);
--}
--
--#elif defined(OS_LINUX)  // defined(OS_WIN)
--
--int main(int argc, char* argv[]) {
--#ifdef ENABLE_RUN_AS_NODE
--  if (IsEnvSet(kRunAsNode)) {
--    base::i18n::InitializeICU();
--    base::AtExitManager atexit_manager;
--    return atom::NodeMain(argc, argv);
--  }
--#endif
--
--  atom::AtomMainDelegate delegate;
--  content::ContentMainParams params(&delegate);
--  params.argc = argc;
--  params.argv = const_cast<const char**>(argv);
--  atom::AtomCommandLine::Init(argc, argv);
--  return content::ContentMain(params);
--}
--
--#else  // defined(OS_LINUX)
--
--int main(int argc, char* argv[]) {
--#ifdef ENABLE_RUN_AS_NODE
--  if (IsEnvSet(kRunAsNode)) {
--    return AtomInitializeICUandStartNode(argc, argv);
--  }
--#endif
--
--  return AtomMain(argc, argv);
--}
--
--#endif  // defined(OS_MACOSX)
-removed in remote
-  base   100644 30663a429e936cd26efa35a188f293f34a783d92 atom/app/atom_main.h
-  our    100644 30663a429e936cd26efa35a188f293f34a783d92 atom/app/atom_main.h
-@@ -1,10 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_APP_ATOM_MAIN_H_
--#define ATOM_APP_ATOM_MAIN_H_
--
--#include "content/public/app/content_main.h"
--
--#endif  // ATOM_APP_ATOM_MAIN_H_
-removed in remote
-  base   100644 221d59c1619cc440671083dc74ab52fc5cc948a8 atom/app/atom_main_delegate.cc
-  our    100644 b3b5b8f2a8f24b8928f69a286c80e8a3b8464366 atom/app/atom_main_delegate.cc
-@@ -1,209 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/app/atom_main_delegate.h"
--
--#include <iostream>
--#include <string>
--
--#include "atom/app/atom_content_client.h"
--#include "atom/browser/atom_browser_client.h"
--#include "atom/browser/relauncher.h"
--#include "atom/common/google_api_key.h"
--#include "atom/common/options_switches.h"
--#include "atom/renderer/atom_renderer_client.h"
--#include "atom/renderer/atom_sandboxed_renderer_client.h"
--#include "atom/utility/atom_content_utility_client.h"
--#include "base/command_line.h"
--#include "base/debug/stack_trace.h"
--#include "base/environment.h"
--#include "base/logging.h"
--#include "chrome/common/chrome_paths.h"
--#include "content/public/common/content_switches.h"
--#include "ipc/ipc_features.h"
--#include "services/service_manager/sandbox/switches.h"
--#include "ui/base/l10n/l10n_util.h"
--#include "ui/base/resource/resource_bundle.h"
--
--#if BUILDFLAG(IPC_MESSAGE_LOG_ENABLED)
--#define IPC_MESSAGE_MACROS_LOG_ENABLED
--#include "content/public/common/content_ipc_logging.h"
--#define IPC_LOG_TABLE_ADD_ENTRY(msg_id, logger) \
--  content::RegisterIPCLogger(msg_id, logger)
--#include "atom/common/common_message_generator.h"
--#endif
--
--namespace atom {
--
--namespace {
--
--const char* kRelauncherProcess = "relauncher";
--
--bool IsBrowserProcess(base::CommandLine* cmd) {
--  std::string process_type = cmd->GetSwitchValueASCII(::switches::kProcessType);
--  return process_type.empty();
--}
--
--#if defined(OS_WIN)
--void InvalidParameterHandler(const wchar_t*,
--                             const wchar_t*,
--                             const wchar_t*,
--                             unsigned int,
--                             uintptr_t) {
--  // noop.
--}
--#endif
--
--}  // namespace
--
--AtomMainDelegate::AtomMainDelegate() {}
--
--AtomMainDelegate::~AtomMainDelegate() {}
--
--bool AtomMainDelegate::BasicStartupComplete(int* exit_code) {
--  auto* command_line = base::CommandLine::ForCurrentProcess();
--
--  logging::LoggingSettings settings;
--#if defined(OS_WIN)
--  // On Windows the terminal returns immediately, so we add a new line to
--  // prevent output in the same line as the prompt.
--  if (IsBrowserProcess(command_line))
--    std::wcout << std::endl;
--#if defined(DEBUG)
--  // Print logging to debug.log on Windows
--  settings.logging_dest = logging::LOG_TO_ALL;
--  settings.log_file = L"debug.log";
--  settings.lock_log = logging::LOCK_LOG_FILE;
--  settings.delete_old = logging::DELETE_OLD_LOG_FILE;
--#else
--  settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
--#endif  // defined(DEBUG)
--#else   // defined(OS_WIN)
--  settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
--#endif  // !defined(OS_WIN)
--
--  // Only enable logging when --enable-logging is specified.
--  auto env = base::Environment::Create();
--  if (!command_line->HasSwitch(::switches::kEnableLogging) &&
--      !env->HasVar("ELECTRON_ENABLE_LOGGING")) {
--    settings.logging_dest = logging::LOG_NONE;
--    logging::SetMinLogLevel(logging::LOG_NUM_SEVERITIES);
--  }
--
--  logging::InitLogging(settings);
--
--  // Logging with pid and timestamp.
--  logging::SetLogItems(true, false, true, false);
--
--  // Enable convient stack printing.
--#if defined(DEBUG) && defined(OS_LINUX)
--  bool enable_stack_dumping = true;
--#else
--  bool enable_stack_dumping = env->HasVar("ELECTRON_ENABLE_STACK_DUMPING");
--#endif
--#if defined(ARCH_CPU_ARM_FAMILY) && defined(ARCH_CPU_32_BITS)
--  // For 32bit ARM enabling stack printing would end up crashing.
--  // https://github.com/electron/electron/pull/11230#issuecomment-363232482
--  enable_stack_dumping = false;
--#endif
--  if (enable_stack_dumping)
--    base::debug::EnableInProcessStackDumping();
--
--  chrome::RegisterPathProvider();
--
--#if defined(OS_MACOSX)
--  SetUpBundleOverrides();
--#endif
--
--#if defined(OS_WIN)
--  // Ignore invalid parameter errors.
--  _set_invalid_parameter_handler(InvalidParameterHandler);
--  // Disable the ActiveVerifier, which is used by Chrome to track possible
--  // bugs, but no use in Electron.
--  base::win::DisableHandleVerifier();
--#endif
--
--  return brightray::MainDelegate::BasicStartupComplete(exit_code);
--}
--
--void AtomMainDelegate::PreSandboxStartup() {
--  brightray::MainDelegate::PreSandboxStartup();
--
--  auto* command_line = base::CommandLine::ForCurrentProcess();
--
--  // Only append arguments for browser process.
--  if (!IsBrowserProcess(command_line))
--    return;
--
--  if (!command_line->HasSwitch(switches::kEnableMixedSandbox)) {
--    if (command_line->HasSwitch(switches::kEnableSandbox)) {
--      // Disable setuid sandbox since it is not longer required on
--      // linux(namespace sandbox is available on most distros).
--      command_line->AppendSwitch(
--          service_manager::switches::kDisableSetuidSandbox);
--    } else {
--      // Disable renderer sandbox for most of node's functions.
--      command_line->AppendSwitch(::switches::kNoSandbox);
--    }
--  }
--
--  // Allow file:// URIs to read other file:// URIs by default.
--  command_line->AppendSwitch(::switches::kAllowFileAccessFromFiles);
--
--#if defined(OS_MACOSX)
--  // Enable AVFoundation.
--  command_line->AppendSwitch("enable-avfoundation");
--#endif
--}
--
--content::ContentBrowserClient* AtomMainDelegate::CreateContentBrowserClient() {
--  browser_client_.reset(new AtomBrowserClient);
--  return browser_client_.get();
--}
--
--content::ContentRendererClient*
--AtomMainDelegate::CreateContentRendererClient() {
--  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
--          switches::kEnableSandbox) ||
--      !base::CommandLine::ForCurrentProcess()->HasSwitch(
--          ::switches::kNoSandbox)) {
--    renderer_client_.reset(new AtomSandboxedRendererClient);
--  } else {
--    renderer_client_.reset(new AtomRendererClient);
--  }
--
--  return renderer_client_.get();
--}
--
--content::ContentUtilityClient* AtomMainDelegate::CreateContentUtilityClient() {
--  utility_client_.reset(new AtomContentUtilityClient);
--  return utility_client_.get();
--}
--
--int AtomMainDelegate::RunProcess(
--    const std::string& process_type,
--    const content::MainFunctionParams& main_function_params) {
--  if (process_type == kRelauncherProcess)
--    return relauncher::RelauncherMain(main_function_params);
--  else
--    return -1;
--}
--
--#if defined(OS_MACOSX)
--bool AtomMainDelegate::ShouldSendMachPort(const std::string& process_type) {
--  return process_type != kRelauncherProcess;
--}
--
--bool AtomMainDelegate::DelaySandboxInitialization(
--    const std::string& process_type) {
--  return process_type == kRelauncherProcess;
--}
--#endif
--
--std::unique_ptr<brightray::ContentClient>
--AtomMainDelegate::CreateContentClient() {
--  return std::make_unique<AtomContentClient>();
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 5f4369302f5f6d0b6e03f0f0fe90f3f7b222d54a atom/app/atom_main_delegate.h
-  our    100644 affdea01eec2ecb340a9d48c1fd1b6c22ed15e11 atom/app/atom_main_delegate.h
-@@ -1,56 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_APP_ATOM_MAIN_DELEGATE_H_
--#define ATOM_APP_ATOM_MAIN_DELEGATE_H_
--
--#include <string>
--
--#include "brightray/common/content_client.h"
--#include "brightray/common/main_delegate.h"
--
--namespace atom {
--
--class AtomMainDelegate : public brightray::MainDelegate {
-- public:
--  AtomMainDelegate();
--  ~AtomMainDelegate() override;
--
-- protected:
--  // content::ContentMainDelegate:
--  bool BasicStartupComplete(int* exit_code) override;
--  void PreSandboxStartup() override;
--  content::ContentBrowserClient* CreateContentBrowserClient() override;
--  content::ContentRendererClient* CreateContentRendererClient() override;
--  content::ContentUtilityClient* CreateContentUtilityClient() override;
--  int RunProcess(
--      const std::string& process_type,
--      const content::MainFunctionParams& main_function_params) override;
--#if defined(OS_MACOSX)
--  bool ShouldSendMachPort(const std::string& process_type) override;
--  bool DelaySandboxInitialization(const std::string& process_type) override;
--#endif
--
--  // brightray::MainDelegate:
--  std::unique_ptr<brightray::ContentClient> CreateContentClient() override;
--#if defined(OS_MACOSX)
--  void OverrideChildProcessPath() override;
--  void OverrideFrameworkBundlePath() override;
--#endif
--
-- private:
--#if defined(OS_MACOSX)
--  void SetUpBundleOverrides();
--#endif
--
--  std::unique_ptr<content::ContentBrowserClient> browser_client_;
--  std::unique_ptr<content::ContentRendererClient> renderer_client_;
--  std::unique_ptr<content::ContentUtilityClient> utility_client_;
--
--  DISALLOW_COPY_AND_ASSIGN(AtomMainDelegate);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_APP_ATOM_MAIN_DELEGATE_H_
-removed in remote
-  base   100644 33a8dea4aabb9733b768bf3e2610ab82f3c8fafe atom/app/atom_main_delegate_mac.mm
-  our    100644 3fcf6db68b6714b07b400c9b016055beb47174f4 atom/app/atom_main_delegate_mac.mm
-@@ -1,66 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/app/atom_main_delegate.h"
--
--#include "base/files/file_path.h"
--#include "base/files/file_util.h"
--#include "base/mac/bundle_locations.h"
--#include "base/mac/foundation_util.h"
--#include "base/mac/scoped_nsautorelease_pool.h"
--#include "base/path_service.h"
--#include "base/strings/sys_string_conversions.h"
--#include "brightray/common/application_info.h"
--#include "brightray/common/mac/main_application_bundle.h"
--#include "content/public/common/content_paths.h"
--
--namespace atom {
--
--namespace {
--
--base::FilePath GetFrameworksPath() {
--  return brightray::MainApplicationBundlePath()
--      .Append("Contents")
--      .Append("Frameworks");
--}
--
--base::FilePath GetHelperAppPath(const base::FilePath& frameworks_path,
--                                const std::string& name) {
--  return frameworks_path.Append(name + " Helper.app")
--      .Append("Contents")
--      .Append("MacOS")
--      .Append(name + " Helper");
--}
--
--}  // namespace
--
--void AtomMainDelegate::OverrideFrameworkBundlePath() {
--  base::mac::SetOverrideFrameworkBundlePath(
--      GetFrameworksPath().Append(ATOM_PRODUCT_NAME " Framework.framework"));
--}
--
--void AtomMainDelegate::OverrideChildProcessPath() {
--  base::FilePath frameworks_path = GetFrameworksPath();
--  base::FilePath helper_path =
--      GetHelperAppPath(frameworks_path, ATOM_PRODUCT_NAME);
--  if (!base::PathExists(helper_path))
--    helper_path =
--        GetHelperAppPath(frameworks_path, brightray::GetApplicationName());
--  if (!base::PathExists(helper_path))
--    LOG(FATAL) << "Unable to find helper app";
--  PathService::Override(content::CHILD_PROCESS_EXE, helper_path);
--}
--
--void AtomMainDelegate::SetUpBundleOverrides() {
--  base::mac::ScopedNSAutoreleasePool pool;
--  NSBundle* bundle = brightray::MainApplicationBundle();
--  std::string base_bundle_id =
--      base::SysNSStringToUTF8([bundle bundleIdentifier]);
--  NSString* team_id = [bundle objectForInfoDictionaryKey:@"ElectronTeamID"];
--  if (team_id)
--    base_bundle_id = base::SysNSStringToUTF8(team_id) + "." + base_bundle_id;
--  base::mac::SetBaseBundleID(base_bundle_id.c_str());
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 b946ae28ff94a08cfb9bd7bb9159170c78001ee8 atom/app/node_main.cc
-  our    100644 9a95165f77a2585b06975bb3dfd0f5e573329410 atom/app/node_main.cc
-@@ -1,120 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifdef ENABLE_RUN_AS_NODE
--
--#include "atom/app/node_main.h"
--
--#include "atom/app/uv_task_runner.h"
--#include "atom/browser/javascript_environment.h"
--#include "atom/browser/node_debugger.h"
--#include "atom/common/api/atom_bindings.h"
--#include "atom/common/crash_reporter/crash_reporter.h"
--#include "atom/common/native_mate_converters/string16_converter.h"
--#include "atom/common/node_bindings.h"
--#include "base/command_line.h"
--#include "base/feature_list.h"
--#include "base/task_scheduler/task_scheduler.h"
--#include "base/threading/thread_task_runner_handle.h"
--#include "gin/array_buffer.h"
--#include "gin/public/isolate_holder.h"
--#include "gin/v8_initializer.h"
--#include "native_mate/dictionary.h"
--
--#include "atom/common/node_includes.h"
--
--namespace atom {
--
--int NodeMain(int argc, char* argv[]) {
--  base::CommandLine::Init(argc, argv);
--
--  int exit_code = 1;
--  {
--    // Feed gin::PerIsolateData with a task runner.
--    argv = uv_setup_args(argc, argv);
--    uv_loop_t* loop = uv_default_loop();
--    scoped_refptr<UvTaskRunner> uv_task_runner(new UvTaskRunner(loop));
--    base::ThreadTaskRunnerHandle handle(uv_task_runner);
--
--    // Initialize feature list.
--    auto feature_list = std::make_unique<base::FeatureList>();
--    feature_list->InitializeFromCommandLine("", "");
--    base::FeatureList::SetInstance(std::move(feature_list));
--
--    gin::V8Initializer::LoadV8Snapshot(
--        gin::V8Initializer::V8SnapshotFileType::kWithAdditionalContext);
--    gin::V8Initializer::LoadV8Natives();
--
--    // V8 requires a task scheduler apparently
--    base::TaskScheduler::CreateAndStartWithDefaultParams("Electron");
--
--    // Initialize gin::IsolateHolder.
--    JavascriptEnvironment gin_env;
--
--    // Explicitly register electron's builtin modules.
--    NodeBindings::RegisterBuiltinModules();
--
--    int exec_argc;
--    const char** exec_argv;
--    node::Init(&argc, const_cast<const char**>(argv), &exec_argc, &exec_argv);
--
--    node::Environment* env = node::CreateEnvironment(
--        node::CreateIsolateData(gin_env.isolate(), loop, gin_env.platform()),
--        gin_env.context(), argc, argv, exec_argc, exec_argv);
--
--    // Enable support for v8 inspector.
--    NodeDebugger node_debugger(env);
--    node_debugger.Start(gin_env.platform());
--
--    mate::Dictionary process(gin_env.isolate(), env->process_object());
--#if defined(OS_WIN)
--    process.SetMethod("log", &AtomBindings::Log);
--#endif
--    process.SetMethod("crash", &AtomBindings::Crash);
--
--    // Setup process.crashReporter.start in child node processes
--    auto reporter = mate::Dictionary::CreateEmpty(gin_env.isolate());
--    reporter.SetMethod("start", &crash_reporter::CrashReporter::StartInstance);
--    process.Set("crashReporter", reporter);
--
--    node::LoadEnvironment(env);
--
--    bool more;
--    do {
--      more = uv_run(env->event_loop(), UV_RUN_ONCE);
--      gin_env.platform()->DrainBackgroundTasks(env->isolate());
--      if (more == false) {
--        node::EmitBeforeExit(env);
--
--        // Emit `beforeExit` if the loop became alive either after emitting
--        // event, or after running some callbacks.
--        more = uv_loop_alive(env->event_loop());
--        if (uv_run(env->event_loop(), UV_RUN_NOWAIT) != 0)
--          more = true;
--      }
--    } while (more == true);
--
--    exit_code = node::EmitExit(env);
--    node::RunAtExit(env);
--    gin_env.platform()->DrainBackgroundTasks(env->isolate());
--    gin_env.platform()->CancelPendingDelayedTasks(env->isolate());
--
--    node::FreeEnvironment(env);
--  }
--
--  // According to "src/gin/shell/gin_main.cc":
--  //
--  // gin::IsolateHolder waits for tasks running in TaskScheduler in its
--  // destructor and thus must be destroyed before TaskScheduler starts skipping
--  // CONTINUE_ON_SHUTDOWN tasks.
--  base::TaskScheduler::GetInstance()->Shutdown();
--
--  v8::V8::Dispose();
--
--  return exit_code;
--}
--
--}  // namespace atom
--
--#endif  // ENABLE_RUN_AS_NODE
-removed in remote
-  base   100644 a4e047de39f180b9022dc178fc58979f5b879aa3 atom/app/node_main.h
-  our    100644 68fe25f6df6acc2e59d0379454c69ca227dae020 atom/app/node_main.h
-@@ -1,18 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_APP_NODE_MAIN_H_
--#define ATOM_APP_NODE_MAIN_H_
--
--#ifdef ENABLE_RUN_AS_NODE
--
--namespace atom {
--
--int NodeMain(int argc, char* argv[]);
--
--}  // namespace atom
--
--#endif  // ENABLE_RUN_AS_NODE
--
--#endif  // ATOM_APP_NODE_MAIN_H_
-removed in remote
-  base   100644 097cc3bcda182c36ffeffa5cbb3cf3442ebaedbe atom/app/uv_task_runner.cc
-  our    100644 60befc6db8ff4773f9aecfa890271940bfa29634 atom/app/uv_task_runner.cc
-@@ -1,60 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include <utility>
--
--#include "atom/app/uv_task_runner.h"
--
--#include "base/stl_util.h"
--
--namespace atom {
--
--UvTaskRunner::UvTaskRunner(uv_loop_t* loop) : loop_(loop) {}
--
--UvTaskRunner::~UvTaskRunner() {
--  for (auto& iter : tasks_) {
--    uv_unref(reinterpret_cast<uv_handle_t*>(iter.first));
--    delete iter.first;
--  }
--}
--
--bool UvTaskRunner::PostDelayedTask(const base::Location& from_here,
--                                   base::OnceClosure task,
--                                   base::TimeDelta delay) {
--  auto* timer = new uv_timer_t;
--  timer->data = this;
--  uv_timer_init(loop_, timer);
--  uv_timer_start(timer, UvTaskRunner::OnTimeout, delay.InMilliseconds(), 0);
--  tasks_[timer] = std::move(task);
--  return true;
--}
--
--bool UvTaskRunner::RunsTasksInCurrentSequence() const {
--  return true;
--}
--
--bool UvTaskRunner::PostNonNestableDelayedTask(const base::Location& from_here,
--                                              base::OnceClosure task,
--                                              base::TimeDelta delay) {
--  return PostDelayedTask(from_here, std::move(task), delay);
--}
--
--// static
--void UvTaskRunner::OnTimeout(uv_timer_t* timer) {
--  UvTaskRunner* self = static_cast<UvTaskRunner*>(timer->data);
--  if (!ContainsKey(self->tasks_, timer))
--    return;
--
--  std::move(self->tasks_[timer]).Run();
--  self->tasks_.erase(timer);
--  uv_timer_stop(timer);
--  uv_close(reinterpret_cast<uv_handle_t*>(timer), UvTaskRunner::OnClose);
--}
--
--// static
--void UvTaskRunner::OnClose(uv_handle_t* handle) {
--  delete reinterpret_cast<uv_timer_t*>(handle);
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 c7302766c2d1786cc00d58c56ca529574f09ac8d atom/app/uv_task_runner.h
-  our    100644 578024d70486ba2f4a3cf9dc643a19bc857158db atom/app/uv_task_runner.h
-@@ -1,45 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_APP_UV_TASK_RUNNER_H_
--#define ATOM_APP_UV_TASK_RUNNER_H_
--
--#include <map>
--
--#include "base/callback.h"
--#include "base/location.h"
--#include "base/single_thread_task_runner.h"
--#include "uv.h"  // NOLINT(build/include)
--
--namespace atom {
--
--// TaskRunner implementation that posts tasks into libuv's default loop.
--class UvTaskRunner : public base::SingleThreadTaskRunner {
-- public:
--  explicit UvTaskRunner(uv_loop_t* loop);
--
--  // base::SingleThreadTaskRunner:
--  bool PostDelayedTask(const base::Location& from_here,
--                       base::OnceClosure task,
--                       base::TimeDelta delay) override;
--  bool RunsTasksInCurrentSequence() const override;
--  bool PostNonNestableDelayedTask(const base::Location& from_here,
--                                  base::OnceClosure task,
--                                  base::TimeDelta delay) override;
--
-- private:
--  ~UvTaskRunner() override;
--  static void OnTimeout(uv_timer_t* timer);
--  static void OnClose(uv_handle_t* handle);
--
--  uv_loop_t* loop_;
--
--  std::map<uv_timer_t*, base::OnceClosure> tasks_;
--
--  DISALLOW_COPY_AND_ASSIGN(UvTaskRunner);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_APP_UV_TASK_RUNNER_H_
-removed in remote
-  base   100644 ad5b7214ccd724927f25292463c2972b7391313b atom/browser/api/atom_api_app.cc
-  our    100644 089a2b63d1bae3afebea925582a3aac81ddeaa4f atom/browser/api/atom_api_app.cc
-@@ -1,1378 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/api/atom_api_app.h"
--
--#include <string>
--#include <vector>
--
--#include "atom/browser/api/atom_api_menu.h"
--#include "atom/browser/api/atom_api_session.h"
--#include "atom/browser/api/atom_api_web_contents.h"
--#include "atom/browser/atom_browser_context.h"
--#include "atom/browser/atom_browser_main_parts.h"
--#include "atom/browser/login_handler.h"
--#include "atom/browser/relauncher.h"
--#include "atom/common/atom_command_line.h"
--#include "atom/common/native_mate_converters/callback.h"
--#include "atom/common/native_mate_converters/file_path_converter.h"
--#include "atom/common/native_mate_converters/gurl_converter.h"
--#include "atom/common/native_mate_converters/image_converter.h"
--#include "atom/common/native_mate_converters/net_converter.h"
--#include "atom/common/native_mate_converters/network_converter.h"
--#include "atom/common/native_mate_converters/value_converter.h"
--#include "atom/common/node_includes.h"
--#include "atom/common/options_switches.h"
--#include "base/command_line.h"
--#include "base/environment.h"
--#include "base/files/file_path.h"
--#include "base/files/file_util.h"
--#include "base/path_service.h"
--#include "base/strings/string_util.h"
--#include "base/sys_info.h"
--#include "brightray/browser/brightray_paths.h"
--#include "chrome/browser/browser_process.h"
--#include "chrome/browser/icon_manager.h"
--#include "chrome/common/chrome_paths.h"
--#include "content/browser/gpu/compositor_util.h"
--#include "content/browser/gpu/gpu_data_manager_impl.h"
--#include "content/public/browser/browser_accessibility_state.h"
--#include "content/public/browser/browser_child_process_host.h"
--#include "content/public/browser/child_process_data.h"
--#include "content/public/browser/client_certificate_delegate.h"
--#include "content/public/browser/gpu_data_manager.h"
--#include "content/public/browser/render_frame_host.h"
--#include "content/public/common/content_switches.h"
--#include "media/audio/audio_manager.h"
--#include "native_mate/object_template_builder.h"
--#include "net/ssl/client_cert_identity.h"
--#include "net/ssl/ssl_cert_request_info.h"
--#include "services/network/public/cpp/network_switches.h"
--#include "ui/base/l10n/l10n_util.h"
--#include "ui/gfx/image/image.h"
--
--#if defined(OS_WIN)
--#include "atom/browser/ui/win/jump_list.h"
--#include "base/strings/utf_string_conversions.h"
--#endif
--
--#if defined(OS_MACOSX)
--#include "atom/browser/ui/cocoa/atom_bundle_mover.h"
--#endif
--
--using atom::Browser;
--
--namespace mate {
--
--#if defined(OS_WIN)
--template <>
--struct Converter<Browser::UserTask> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     Browser::UserTask* out) {
--    mate::Dictionary dict;
--    if (!ConvertFromV8(isolate, val, &dict))
--      return false;
--    if (!dict.Get("program", &(out->program)) ||
--        !dict.Get("title", &(out->title)))
--      return false;
--    if (dict.Get("iconPath", &(out->icon_path)) &&
--        !dict.Get("iconIndex", &(out->icon_index)))
--      return false;
--    dict.Get("arguments", &(out->arguments));
--    dict.Get("description", &(out->description));
--    return true;
--  }
--};
--
--using atom::JumpListCategory;
--using atom::JumpListItem;
--using atom::JumpListResult;
--
--template <>
--struct Converter<JumpListItem::Type> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     JumpListItem::Type* out) {
--    std::string item_type;
--    if (!ConvertFromV8(isolate, val, &item_type))
--      return false;
--
--    if (item_type == "task")
--      *out = JumpListItem::Type::TASK;
--    else if (item_type == "separator")
--      *out = JumpListItem::Type::SEPARATOR;
--    else if (item_type == "file")
--      *out = JumpListItem::Type::FILE;
--    else
--      return false;
--
--    return true;
--  }
--
--  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
--                                   JumpListItem::Type val) {
--    std::string item_type;
--    switch (val) {
--      case JumpListItem::Type::TASK:
--        item_type = "task";
--        break;
--
--      case JumpListItem::Type::SEPARATOR:
--        item_type = "separator";
--        break;
--
--      case JumpListItem::Type::FILE:
--        item_type = "file";
--        break;
--    }
--    return mate::ConvertToV8(isolate, item_type);
--  }
--};
--
--template <>
--struct Converter<JumpListItem> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     JumpListItem* out) {
--    mate::Dictionary dict;
--    if (!ConvertFromV8(isolate, val, &dict))
--      return false;
--
--    if (!dict.Get("type", &(out->type)))
--      return false;
--
--    switch (out->type) {
--      case JumpListItem::Type::TASK:
--        if (!dict.Get("program", &(out->path)) ||
--            !dict.Get("title", &(out->title)))
--          return false;
--
--        if (dict.Get("iconPath", &(out->icon_path)) &&
--            !dict.Get("iconIndex", &(out->icon_index)))
--          return false;
--
--        dict.Get("args", &(out->arguments));
--        dict.Get("description", &(out->description));
--        return true;
--
--      case JumpListItem::Type::SEPARATOR:
--        return true;
--
--      case JumpListItem::Type::FILE:
--        return dict.Get("path", &(out->path));
--    }
--
--    assert(false);
--    return false;
--  }
--
--  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
--                                   const JumpListItem& val) {
--    mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
--    dict.Set("type", val.type);
--
--    switch (val.type) {
--      case JumpListItem::Type::TASK:
--        dict.Set("program", val.path);
--        dict.Set("args", val.arguments);
--        dict.Set("title", val.title);
--        dict.Set("iconPath", val.icon_path);
--        dict.Set("iconIndex", val.icon_index);
--        dict.Set("description", val.description);
--        break;
--
--      case JumpListItem::Type::SEPARATOR:
--        break;
--
--      case JumpListItem::Type::FILE:
--        dict.Set("path", val.path);
--        break;
--    }
--    return dict.GetHandle();
--  }
--};
--
--template <>
--struct Converter<JumpListCategory::Type> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     JumpListCategory::Type* out) {
--    std::string category_type;
--    if (!ConvertFromV8(isolate, val, &category_type))
--      return false;
--
--    if (category_type == "tasks")
--      *out = JumpListCategory::Type::TASKS;
--    else if (category_type == "frequent")
--      *out = JumpListCategory::Type::FREQUENT;
--    else if (category_type == "recent")
--      *out = JumpListCategory::Type::RECENT;
--    else if (category_type == "custom")
--      *out = JumpListCategory::Type::CUSTOM;
--    else
--      return false;
--
--    return true;
--  }
--
--  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
--                                   JumpListCategory::Type val) {
--    std::string category_type;
--    switch (val) {
--      case JumpListCategory::Type::TASKS:
--        category_type = "tasks";
--        break;
--
--      case JumpListCategory::Type::FREQUENT:
--        category_type = "frequent";
--        break;
--
--      case JumpListCategory::Type::RECENT:
--        category_type = "recent";
--        break;
--
--      case JumpListCategory::Type::CUSTOM:
--        category_type = "custom";
--        break;
--    }
--    return mate::ConvertToV8(isolate, category_type);
--  }
--};
--
--template <>
--struct Converter<JumpListCategory> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     JumpListCategory* out) {
--    mate::Dictionary dict;
--    if (!ConvertFromV8(isolate, val, &dict))
--      return false;
--
--    if (dict.Get("name", &(out->name)) && out->name.empty())
--      return false;
--
--    if (!dict.Get("type", &(out->type))) {
--      if (out->name.empty())
--        out->type = JumpListCategory::Type::TASKS;
--      else
--        out->type = JumpListCategory::Type::CUSTOM;
--    }
--
--    if ((out->type == JumpListCategory::Type::TASKS) ||
--        (out->type == JumpListCategory::Type::CUSTOM)) {
--      if (!dict.Get("items", &(out->items)))
--        return false;
--    }
--
--    return true;
--  }
--};
--
--// static
--template <>
--struct Converter<JumpListResult> {
--  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate, JumpListResult val) {
--    std::string result_code;
--    switch (val) {
--      case JumpListResult::SUCCESS:
--        result_code = "ok";
--        break;
--
--      case JumpListResult::ARGUMENT_ERROR:
--        result_code = "argumentError";
--        break;
--
--      case JumpListResult::GENERIC_ERROR:
--        result_code = "error";
--        break;
--
--      case JumpListResult::CUSTOM_CATEGORY_SEPARATOR_ERROR:
--        result_code = "invalidSeparatorError";
--        break;
--
--      case JumpListResult::MISSING_FILE_TYPE_REGISTRATION_ERROR:
--        result_code = "fileTypeRegistrationError";
--        break;
--
--      case JumpListResult::CUSTOM_CATEGORY_ACCESS_DENIED_ERROR:
--        result_code = "customCategoryAccessDeniedError";
--        break;
--    }
--    return ConvertToV8(isolate, result_code);
--  }
--};
--#endif
--
--template <>
--struct Converter<Browser::LoginItemSettings> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     Browser::LoginItemSettings* out) {
--    mate::Dictionary dict;
--    if (!ConvertFromV8(isolate, val, &dict))
--      return false;
--
--    dict.Get("openAtLogin", &(out->open_at_login));
--    dict.Get("openAsHidden", &(out->open_as_hidden));
--    dict.Get("path", &(out->path));
--    dict.Get("args", &(out->args));
--    return true;
--  }
--
--  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
--                                   Browser::LoginItemSettings val) {
--    mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
--    dict.Set("openAtLogin", val.open_at_login);
--    dict.Set("openAsHidden", val.open_as_hidden);
--    dict.Set("restoreState", val.restore_state);
--    dict.Set("wasOpenedAtLogin", val.opened_at_login);
--    dict.Set("wasOpenedAsHidden", val.opened_as_hidden);
--    return dict.GetHandle();
--  }
--};
--
--template <>
--struct Converter<content::CertificateRequestResultType> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     content::CertificateRequestResultType* out) {
--    bool b;
--    if (!ConvertFromV8(isolate, val, &b))
--      return false;
--    *out = b ? content::CERTIFICATE_REQUEST_RESULT_TYPE_CONTINUE
--             : content::CERTIFICATE_REQUEST_RESULT_TYPE_CANCEL;
--    return true;
--  }
--};
--
--}  // namespace mate
--
--namespace atom {
--
--ProcessMetric::ProcessMetric(int type,
--                             base::ProcessId pid,
--                             std::unique_ptr<base::ProcessMetrics> metrics) {
--  this->type = type;
--  this->pid = pid;
--  this->metrics = std::move(metrics);
--}
--
--ProcessMetric::~ProcessMetric() = default;
--
--namespace api {
--
--namespace {
--
--class AppIdProcessIterator : public base::ProcessIterator {
-- public:
--  AppIdProcessIterator() : base::ProcessIterator(nullptr) {}
--
-- protected:
--  bool IncludeEntry() override {
--    return (entry().parent_pid() == base::GetCurrentProcId() ||
--            entry().pid() == base::GetCurrentProcId());
--  }
--};
--
--IconLoader::IconSize GetIconSizeByString(const std::string& size) {
--  if (size == "small") {
--    return IconLoader::IconSize::SMALL;
--  } else if (size == "large") {
--    return IconLoader::IconSize::LARGE;
--  }
--  return IconLoader::IconSize::NORMAL;
--}
--
--// Return the path constant from string.
--int GetPathConstant(const std::string& name) {
--  if (name == "appData")
--    return brightray::DIR_APP_DATA;
--  else if (name == "userData")
--    return brightray::DIR_USER_DATA;
--  else if (name == "cache")
--    return brightray::DIR_CACHE;
--  else if (name == "userCache")
--    return brightray::DIR_USER_CACHE;
--  else if (name == "logs")
--    return brightray::DIR_APP_LOGS;
--  else if (name == "home")
--    return base::DIR_HOME;
--  else if (name == "temp")
--    return base::DIR_TEMP;
--  else if (name == "userDesktop" || name == "desktop")
--    return base::DIR_USER_DESKTOP;
--  else if (name == "exe")
--    return base::FILE_EXE;
--  else if (name == "module")
--    return base::FILE_MODULE;
--  else if (name == "documents")
--    return chrome::DIR_USER_DOCUMENTS;
--  else if (name == "downloads")
--    return chrome::DIR_DEFAULT_DOWNLOADS;
--  else if (name == "music")
--    return chrome::DIR_USER_MUSIC;
--  else if (name == "pictures")
--    return chrome::DIR_USER_PICTURES;
--  else if (name == "videos")
--    return chrome::DIR_USER_VIDEOS;
--  else if (name == "pepperFlashSystemPlugin")
--    return chrome::FILE_PEPPER_FLASH_SYSTEM_PLUGIN;
--  else
--    return -1;
--}
--
--bool NotificationCallbackWrapper(
--    const base::Callback<
--        void(const base::CommandLine::StringVector& command_line,
--             const base::FilePath& current_directory)>& callback,
--    const base::CommandLine::StringVector& cmd,
--    const base::FilePath& cwd) {
--  // Make sure the callback is called after app gets ready.
--  if (Browser::Get()->is_ready()) {
--    callback.Run(cmd, cwd);
--  } else {
--    scoped_refptr<base::SingleThreadTaskRunner> task_runner(
--        base::ThreadTaskRunnerHandle::Get());
--    task_runner->PostTask(
--        FROM_HERE, base::BindOnce(base::IgnoreResult(callback), cmd, cwd));
--  }
--  // ProcessSingleton needs to know whether current process is quiting.
--  return !Browser::Get()->is_shutting_down();
--}
--
--void GotPrivateKey(std::shared_ptr<content::ClientCertificateDelegate> delegate,
--                   scoped_refptr<net::X509Certificate> cert,
--                   scoped_refptr<net::SSLPrivateKey> private_key) {
--  delegate->ContinueWithCertificate(cert, private_key);
--}
--
--void OnClientCertificateSelected(
--    v8::Isolate* isolate,
--    std::shared_ptr<content::ClientCertificateDelegate> delegate,
--    std::shared_ptr<net::ClientCertIdentityList> identities,
--    mate::Arguments* args) {
--  if (args->Length() == 2) {
--    delegate->ContinueWithCertificate(nullptr, nullptr);
--    return;
--  }
--
--  v8::Local<v8::Value> val;
--  args->GetNext(&val);
--  if (val->IsNull()) {
--    delegate->ContinueWithCertificate(nullptr, nullptr);
--    return;
--  }
--
--  mate::Dictionary cert_data;
--  if (!mate::ConvertFromV8(isolate, val, &cert_data)) {
--    args->ThrowError("Must pass valid certificate object.");
--    return;
--  }
--
--  std::string data;
--  if (!cert_data.Get("data", &data))
--    return;
--
--  auto certs = net::X509Certificate::CreateCertificateListFromBytes(
--      data.c_str(), data.length(), net::X509Certificate::FORMAT_AUTO);
--  if (!certs.empty()) {
--    scoped_refptr<net::X509Certificate> cert(certs[0].get());
--    for (size_t i = 0; i < identities->size(); ++i) {
--      if (cert->Equals((*identities)[i]->certificate())) {
--        net::ClientCertIdentity::SelfOwningAcquirePrivateKey(
--            std::move((*identities)[i]),
--            base::Bind(&GotPrivateKey, delegate, std::move(cert)));
--        break;
--      }
--    }
--  }
--}
--
--void PassLoginInformation(scoped_refptr<LoginHandler> login_handler,
--                          mate::Arguments* args) {
--  base::string16 username, password;
--  if (args->GetNext(&username) && args->GetNext(&password))
--    login_handler->Login(username, password);
--  else
--    login_handler->CancelAuth();
--}
--
--#if defined(USE_NSS_CERTS)
--int ImportIntoCertStore(CertificateManagerModel* model,
--                        const base::DictionaryValue& options) {
--  std::string file_data, cert_path;
--  base::string16 password;
--  net::ScopedCERTCertificateList imported_certs;
--  int rv = -1;
--  options.GetString("certificate", &cert_path);
--  options.GetString("password", &password);
--
--  if (!cert_path.empty()) {
--    if (base::ReadFileToString(base::FilePath(cert_path), &file_data)) {
--      auto module = model->cert_db()->GetPrivateSlot();
--      rv = model->ImportFromPKCS12(module.get(), file_data, password, true,
--                                   &imported_certs);
--      if (imported_certs.size() > 1) {
--        auto it = imported_certs.begin();
--        ++it;  // skip first which would  be the client certificate.
--        for (; it != imported_certs.end(); ++it)
--          rv &= model->SetCertTrust(it->get(), net::CA_CERT,
--                                    net::NSSCertDatabase::TRUSTED_SSL);
--      }
--    }
--  }
--  return rv;
--}
--#endif
--
--void OnIconDataAvailable(v8::Isolate* isolate,
--                         const App::FileIconCallback& callback,
--                         gfx::Image* icon) {
--  v8::Locker locker(isolate);
--  v8::HandleScope handle_scope(isolate);
--
--  if (icon && !icon->IsEmpty()) {
--    callback.Run(v8::Null(isolate), *icon);
--  } else {
--    v8::Local<v8::String> error_message =
--        v8::String::NewFromUtf8(isolate, "Failed to get file icon.");
--    callback.Run(v8::Exception::Error(error_message), gfx::Image());
--  }
--}
--
--}  // namespace
--
--App::App(v8::Isolate* isolate) {
--  static_cast<AtomBrowserClient*>(AtomBrowserClient::Get())->set_delegate(this);
--  Browser::Get()->AddObserver(this);
--  content::GpuDataManager::GetInstance()->AddObserver(this);
--  base::ProcessId pid = base::GetCurrentProcId();
--  auto process_metric = std::make_unique<atom::ProcessMetric>(
--      content::PROCESS_TYPE_BROWSER, pid,
--      base::ProcessMetrics::CreateCurrentProcessMetrics());
--  app_metrics_[pid] = std::move(process_metric);
--  Init(isolate);
--}
--
--App::~App() {
--  static_cast<AtomBrowserClient*>(AtomBrowserClient::Get())
--      ->set_delegate(nullptr);
--  Browser::Get()->RemoveObserver(this);
--  content::GpuDataManager::GetInstance()->RemoveObserver(this);
--  content::BrowserChildProcessObserver::Remove(this);
--}
--
--void App::OnBeforeQuit(bool* prevent_default) {
--  if (Emit("before-quit")) {
--    *prevent_default = true;
--  }
--}
--
--void App::OnWillQuit(bool* prevent_default) {
--  if (Emit("will-quit")) {
--    *prevent_default = true;
--  }
--}
--
--void App::OnWindowAllClosed() {
--  Emit("window-all-closed");
--}
--
--void App::OnQuit() {
--  int exitCode = AtomBrowserMainParts::Get()->GetExitCode();
--  Emit("quit", exitCode);
--
--  if (process_singleton_) {
--    process_singleton_->Cleanup();
--    process_singleton_.reset();
--  }
--}
--
--void App::OnOpenFile(bool* prevent_default, const std::string& file_path) {
--  if (Emit("open-file", file_path)) {
--    *prevent_default = true;
--  }
--}
--
--void App::OnOpenURL(const std::string& url) {
--  Emit("open-url", url);
--}
--
--void App::OnActivate(bool has_visible_windows) {
--  Emit("activate", has_visible_windows);
--}
--
--void App::OnWillFinishLaunching() {
--  Emit("will-finish-launching");
--}
--
--void App::OnFinishLaunching(const base::DictionaryValue& launch_info) {
--#if defined(OS_LINUX)
--  // Set the application name for audio streams shown in external
--  // applications. Only affects pulseaudio currently.
--  media::AudioManager::SetGlobalAppName(Browser::Get()->GetName());
--#endif
--  Emit("ready", launch_info);
--}
--
--void App::OnPreMainMessageLoopRun() {
--  content::BrowserChildProcessObserver::Add(this);
--  if (process_singleton_) {
--    process_singleton_->OnBrowserReady();
--  }
--}
--
--void App::OnAccessibilitySupportChanged() {
--  Emit("accessibility-support-changed", IsAccessibilitySupportEnabled());
--}
--
--#if defined(OS_MACOSX)
--void App::OnWillContinueUserActivity(bool* prevent_default,
--                                     const std::string& type) {
--  if (Emit("will-continue-activity", type)) {
--    *prevent_default = true;
--  }
--}
--
--void App::OnDidFailToContinueUserActivity(const std::string& type,
--                                          const std::string& error) {
--  Emit("continue-activity-error", type, error);
--}
--
--void App::OnContinueUserActivity(bool* prevent_default,
--                                 const std::string& type,
--                                 const base::DictionaryValue& user_info) {
--  if (Emit("continue-activity", type, user_info)) {
--    *prevent_default = true;
--  }
--}
--
--void App::OnUserActivityWasContinued(const std::string& type,
--                                     const base::DictionaryValue& user_info) {
--  Emit("activity-was-continued", type, user_info);
--}
--
--void App::OnUpdateUserActivityState(bool* prevent_default,
--                                    const std::string& type,
--                                    const base::DictionaryValue& user_info) {
--  if (Emit("update-activity-state", type, user_info)) {
--    *prevent_default = true;
--  }
--}
--
--void App::OnNewWindowForTab() {
--  Emit("new-window-for-tab");
--}
--#endif
--
--void App::OnLogin(scoped_refptr<LoginHandler> login_handler,
--                  const base::DictionaryValue& request_details) {
--  v8::Locker locker(isolate());
--  v8::HandleScope handle_scope(isolate());
--  bool prevent_default = false;
--  content::WebContents* web_contents = login_handler->GetWebContents();
--  if (web_contents) {
--    prevent_default = Emit(
--        "login", WebContents::CreateFrom(isolate(), web_contents),
--        request_details, login_handler->auth_info(),
--        base::Bind(&PassLoginInformation, base::RetainedRef(login_handler)));
--  }
--
--  // Default behavior is to always cancel the auth.
--  if (!prevent_default)
--    login_handler->CancelAuth();
--}
--
--bool App::CanCreateWindow(
--    content::RenderFrameHost* opener,
--    const GURL& opener_url,
--    const GURL& opener_top_level_frame_url,
--    const GURL& source_origin,
--    content::mojom::WindowContainerType container_type,
--    const GURL& target_url,
--    const content::Referrer& referrer,
--    const std::string& frame_name,
--    WindowOpenDisposition disposition,
--    const blink::mojom::WindowFeatures& features,
--    const std::vector<std::string>& additional_features,
--    const scoped_refptr<network::ResourceRequestBody>& body,
--    bool user_gesture,
--    bool opener_suppressed,
--    bool* no_javascript_access) {
--  v8::Locker locker(isolate());
--  v8::HandleScope handle_scope(isolate());
--  content::WebContents* web_contents =
--      content::WebContents::FromRenderFrameHost(opener);
--  if (web_contents) {
--    auto api_web_contents = WebContents::CreateFrom(isolate(), web_contents);
--    api_web_contents->OnCreateWindow(target_url, referrer, frame_name,
--                                     disposition, additional_features, body);
--  }
--
--  return false;
--}
--
--void App::AllowCertificateError(
--    content::WebContents* web_contents,
--    int cert_error,
--    const net::SSLInfo& ssl_info,
--    const GURL& request_url,
--    content::ResourceType resource_type,
--    bool strict_enforcement,
--    bool expired_previous_decision,
--    const base::Callback<void(content::CertificateRequestResultType)>&
--        callback) {
--  v8::Locker locker(isolate());
--  v8::HandleScope handle_scope(isolate());
--  bool prevent_default = Emit(
--      "certificate-error", WebContents::CreateFrom(isolate(), web_contents),
--      request_url, net::ErrorToString(cert_error), ssl_info.cert, callback);
--
--  // Deny the certificate by default.
--  if (!prevent_default)
--    callback.Run(content::CERTIFICATE_REQUEST_RESULT_TYPE_DENY);
--}
--
--void App::SelectClientCertificate(
--    content::WebContents* web_contents,
--    net::SSLCertRequestInfo* cert_request_info,
--    net::ClientCertIdentityList identities,
--    std::unique_ptr<content::ClientCertificateDelegate> delegate) {
--  std::shared_ptr<content::ClientCertificateDelegate> shared_delegate(
--      delegate.release());
--
--  // Convert the ClientCertIdentityList to a CertificateList
--  // to avoid changes in the API.
--  auto client_certs = net::CertificateList();
--  for (const std::unique_ptr<net::ClientCertIdentity>& identity : identities)
--    client_certs.push_back(identity->certificate());
--
--  auto shared_identities =
--      std::make_shared<net::ClientCertIdentityList>(std::move(identities));
--
--  bool prevent_default =
--      Emit("select-client-certificate",
--           WebContents::CreateFrom(isolate(), web_contents),
--           cert_request_info->host_and_port.ToString(), std::move(client_certs),
--           base::Bind(&OnClientCertificateSelected, isolate(), shared_delegate,
--                      shared_identities));
--
--  // Default to first certificate from the platform store.
--  if (!prevent_default) {
--    scoped_refptr<net::X509Certificate> cert =
--        (*shared_identities)[0]->certificate();
--    net::ClientCertIdentity::SelfOwningAcquirePrivateKey(
--        std::move((*shared_identities)[0]),
--        base::Bind(&GotPrivateKey, shared_delegate, std::move(cert)));
--  }
--}
--
--void App::OnGpuProcessCrashed(base::TerminationStatus status) {
--  Emit("gpu-process-crashed",
--       status == base::TERMINATION_STATUS_PROCESS_WAS_KILLED);
--}
--
--void App::BrowserChildProcessLaunchedAndConnected(
--    const content::ChildProcessData& data) {
--  ChildProcessLaunched(data.process_type, data.handle);
--}
--
--void App::BrowserChildProcessHostDisconnected(
--    const content::ChildProcessData& data) {
--  ChildProcessDisconnected(base::GetProcId(data.handle));
--}
--
--void App::BrowserChildProcessCrashed(const content::ChildProcessData& data,
--                                     int exit_code) {
--  ChildProcessDisconnected(base::GetProcId(data.handle));
--}
--
--void App::BrowserChildProcessKilled(const content::ChildProcessData& data,
--                                    int exit_code) {
--  ChildProcessDisconnected(base::GetProcId(data.handle));
--}
--
--void App::RenderProcessReady(content::RenderProcessHost* host) {
--  ChildProcessLaunched(content::PROCESS_TYPE_RENDERER, host->GetHandle());
--}
--
--void App::RenderProcessDisconnected(base::ProcessId host_pid) {
--  ChildProcessDisconnected(host_pid);
--}
--
--void App::ChildProcessLaunched(int process_type, base::ProcessHandle handle) {
--  auto pid = base::GetProcId(handle);
--
--#if defined(OS_MACOSX)
--  std::unique_ptr<base::ProcessMetrics> metrics(
--      base::ProcessMetrics::CreateProcessMetrics(
--          handle, content::BrowserChildProcessHost::GetPortProvider()));
--#else
--  std::unique_ptr<base::ProcessMetrics> metrics(
--      base::ProcessMetrics::CreateProcessMetrics(handle));
--#endif
--  app_metrics_[pid] = std::make_unique<atom::ProcessMetric>(process_type, pid,
--                                                            std::move(metrics));
--}
--
--void App::ChildProcessDisconnected(base::ProcessId pid) {
--  app_metrics_.erase(pid);
--}
--
--base::FilePath App::GetAppPath() const {
--  return app_path_;
--}
--
--void App::SetAppPath(const base::FilePath& app_path) {
--  app_path_ = app_path;
--}
--
--base::FilePath App::GetPath(mate::Arguments* args, const std::string& name) {
--  bool succeed = false;
--  base::FilePath path;
--  int key = GetPathConstant(name);
--  if (key >= 0)
--    succeed = PathService::Get(key, &path);
--  if (!succeed)
--    args->ThrowError("Failed to get '" + name + "' path");
--  return path;
--}
--
--void App::SetPath(mate::Arguments* args,
--                  const std::string& name,
--                  const base::FilePath& path) {
--  if (!path.IsAbsolute()) {
--    args->ThrowError("Path must be absolute");
--    return;
--  }
--
--  bool succeed = false;
--  int key = GetPathConstant(name);
--  if (key >= 0)
--    succeed = PathService::OverrideAndCreateIfNeeded(key, path, true, false);
--  if (!succeed)
--    args->ThrowError("Failed to set path");
--}
--
--void App::SetDesktopName(const std::string& desktop_name) {
--#if defined(OS_LINUX)
--  std::unique_ptr<base::Environment> env(base::Environment::Create());
--  env->SetVar("CHROME_DESKTOP", desktop_name);
--#endif
--}
--
--std::string App::GetLocale() {
--  return g_browser_process->GetApplicationLocale();
--}
--
--void App::OnSecondInstance(const base::CommandLine::StringVector& cmd,
--                           const base::FilePath& cwd) {
--  Emit("second-instance", cmd, cwd);
--}
--
--bool App::HasSingleInstanceLock() const {
--  if (process_singleton_)
--    return true;
--  return false;
--}
--
--bool App::RequestSingleInstanceLock() {
--  if (HasSingleInstanceLock())
--    return true;
--
--  base::FilePath user_dir;
--  PathService::Get(brightray::DIR_USER_DATA, &user_dir);
--
--  auto cb = base::Bind(&App::OnSecondInstance, base::Unretained(this));
--
--  process_singleton_.reset(new ProcessSingleton(
--      user_dir, base::Bind(NotificationCallbackWrapper, cb)));
--
--  switch (process_singleton_->NotifyOtherProcessOrCreate()) {
--    case ProcessSingleton::NotifyResult::LOCK_ERROR:
--    case ProcessSingleton::NotifyResult::PROFILE_IN_USE:
--    case ProcessSingleton::NotifyResult::PROCESS_NOTIFIED: {
--      process_singleton_.reset();
--      return false;
--    }
--    case ProcessSingleton::NotifyResult::PROCESS_NONE:
--    default:  // Shouldn't be needed, but VS warns if it is not there.
--      return true;
--  }
--}
--
--void App::ReleaseSingleInstanceLock() {
--  if (process_singleton_) {
--    process_singleton_->Cleanup();
--    process_singleton_.reset();
--  }
--}
--
--bool App::Relaunch(mate::Arguments* js_args) {
--  // Parse parameters.
--  bool override_argv = false;
--  base::FilePath exec_path;
--  relauncher::StringVector args;
--
--  mate::Dictionary options;
--  if (js_args->GetNext(&options)) {
--    if (options.Get("execPath", &exec_path) | options.Get("args", &args))
--      override_argv = true;
--  }
--
--  if (!override_argv) {
--    const relauncher::StringVector& argv = atom::AtomCommandLine::argv();
--    return relauncher::RelaunchApp(argv);
--  }
--
--  relauncher::StringVector argv;
--  argv.reserve(1 + args.size());
--
--  if (exec_path.empty()) {
--    base::FilePath current_exe_path;
--    PathService::Get(base::FILE_EXE, &current_exe_path);
--    argv.push_back(current_exe_path.value());
--  } else {
--    argv.push_back(exec_path.value());
--  }
--
--  argv.insert(argv.end(), args.begin(), args.end());
--
--  return relauncher::RelaunchApp(argv);
--}
--
--void App::DisableHardwareAcceleration(mate::Arguments* args) {
--  if (Browser::Get()->is_ready()) {
--    args->ThrowError(
--        "app.disableHardwareAcceleration() can only be called "
--        "before app is ready");
--    return;
--  }
--  content::GpuDataManager::GetInstance()->DisableHardwareAcceleration();
--}
--
--void App::DisableDomainBlockingFor3DAPIs(mate::Arguments* args) {
--  if (Browser::Get()->is_ready()) {
--    args->ThrowError(
--        "app.disableDomainBlockingFor3DAPIs() can only be called "
--        "before app is ready");
--    return;
--  }
--  content::GpuDataManagerImpl::GetInstance()
--      ->DisableDomainBlockingFor3DAPIsForTesting();
--}
--
--bool App::IsAccessibilitySupportEnabled() {
--  auto* ax_state = content::BrowserAccessibilityState::GetInstance();
--  return ax_state->IsAccessibleBrowser();
--}
--
--void App::SetAccessibilitySupportEnabled(bool enabled) {
--  auto* ax_state = content::BrowserAccessibilityState::GetInstance();
--  if (enabled) {
--    ax_state->OnScreenReaderDetected();
--  } else {
--    ax_state->DisableAccessibility();
--  }
--  Browser::Get()->OnAccessibilitySupportChanged();
--}
--
--Browser::LoginItemSettings App::GetLoginItemSettings(mate::Arguments* args) {
--  Browser::LoginItemSettings options;
--  args->GetNext(&options);
--  return Browser::Get()->GetLoginItemSettings(options);
--}
--
--#if defined(USE_NSS_CERTS)
--void App::ImportCertificate(const base::DictionaryValue& options,
--                            const net::CompletionCallback& callback) {
--  auto browser_context = AtomBrowserContext::From("", false);
--  if (!certificate_manager_model_) {
--    auto copy = base::DictionaryValue::From(
--        base::Value::ToUniquePtrValue(options.Clone()));
--    CertificateManagerModel::Create(
--        browser_context.get(),
--        base::Bind(&App::OnCertificateManagerModelCreated,
--                   base::Unretained(this), base::Passed(&copy), callback));
--    return;
--  }
--
--  int rv = ImportIntoCertStore(certificate_manager_model_.get(), options);
--  callback.Run(rv);
--}
--
--void App::OnCertificateManagerModelCreated(
--    std::unique_ptr<base::DictionaryValue> options,
--    const net::CompletionCallback& callback,
--    std::unique_ptr<CertificateManagerModel> model) {
--  certificate_manager_model_ = std::move(model);
--  int rv =
--      ImportIntoCertStore(certificate_manager_model_.get(), *(options.get()));
--  callback.Run(rv);
--}
--#endif
--
--#if defined(OS_WIN)
--v8::Local<v8::Value> App::GetJumpListSettings() {
--  JumpList jump_list(Browser::Get()->GetAppUserModelID());
--
--  int min_items = 10;
--  std::vector<JumpListItem> removed_items;
--  if (jump_list.Begin(&min_items, &removed_items)) {
--    // We don't actually want to change anything, so abort the transaction.
--    jump_list.Abort();
--  } else {
--    LOG(ERROR) << "Failed to begin Jump List transaction.";
--  }
--
--  auto dict = mate::Dictionary::CreateEmpty(isolate());
--  dict.Set("minItems", min_items);
--  dict.Set("removedItems", mate::ConvertToV8(isolate(), removed_items));
--  return dict.GetHandle();
--}
--
--JumpListResult App::SetJumpList(v8::Local<v8::Value> val,
--                                mate::Arguments* args) {
--  std::vector<JumpListCategory> categories;
--  bool delete_jump_list = val->IsNull();
--  if (!delete_jump_list &&
--      !mate::ConvertFromV8(args->isolate(), val, &categories)) {
--    args->ThrowError("Argument must be null or an array of categories");
--    return JumpListResult::ARGUMENT_ERROR;
--  }
--
--  JumpList jump_list(Browser::Get()->GetAppUserModelID());
--
--  if (delete_jump_list) {
--    return jump_list.Delete() ? JumpListResult::SUCCESS
--                              : JumpListResult::GENERIC_ERROR;
--  }
--
--  // Start a transaction that updates the JumpList of this application.
--  if (!jump_list.Begin())
--    return JumpListResult::GENERIC_ERROR;
--
--  JumpListResult result = jump_list.AppendCategories(categories);
--  // AppendCategories may have failed to add some categories, but it's better
--  // to have something than nothing so try to commit the changes anyway.
--  if (!jump_list.Commit()) {
--    LOG(ERROR) << "Failed to commit changes to custom Jump List.";
--    // It's more useful to return the earlier error code that might give
--    // some indication as to why the transaction actually failed, so don't
--    // overwrite it with a "generic error" code here.
--    if (result == JumpListResult::SUCCESS)
--      result = JumpListResult::GENERIC_ERROR;
--  }
--
--  return result;
--}
--#endif  // defined(OS_WIN)
--
--void App::GetFileIcon(const base::FilePath& path, mate::Arguments* args) {
--  mate::Dictionary options;
--  IconLoader::IconSize icon_size;
--  FileIconCallback callback;
--
--  v8::Locker locker(isolate());
--  v8::HandleScope handle_scope(isolate());
--
--  base::FilePath normalized_path = path.NormalizePathSeparators();
--
--  if (!args->GetNext(&options)) {
--    icon_size = IconLoader::IconSize::NORMAL;
--  } else {
--    std::string icon_size_string;
--    options.Get("size", &icon_size_string);
--    icon_size = GetIconSizeByString(icon_size_string);
--  }
--
--  if (!args->GetNext(&callback)) {
--    args->ThrowError("Missing required callback function");
--    return;
--  }
--
--  auto* icon_manager = g_browser_process->GetIconManager();
--  gfx::Image* icon =
--      icon_manager->LookupIconFromFilepath(normalized_path, icon_size);
--  if (icon) {
--    callback.Run(v8::Null(isolate()), *icon);
--  } else {
--    icon_manager->LoadIcon(
--        normalized_path, icon_size,
--        base::Bind(&OnIconDataAvailable, isolate(), callback),
--        &cancelable_task_tracker_);
--  }
--}
--
--std::vector<mate::Dictionary> App::GetAppMetrics(v8::Isolate* isolate) {
--  std::vector<mate::Dictionary> result;
--  int processor_count = base::SysInfo::NumberOfProcessors();
--
--  for (const auto& process_metric : app_metrics_) {
--    mate::Dictionary pid_dict = mate::Dictionary::CreateEmpty(isolate);
--    mate::Dictionary memory_dict = mate::Dictionary::CreateEmpty(isolate);
--    mate::Dictionary cpu_dict = mate::Dictionary::CreateEmpty(isolate);
--
--    pid_dict.SetHidden("simple", true);
--    memory_dict.SetHidden("simple", true);
--    cpu_dict.SetHidden("simple", true);
--
--    memory_dict.Set(
--        "workingSetSize",
--        static_cast<double>(
--            process_metric.second->metrics->GetWorkingSetSize() >> 10));
--    memory_dict.Set(
--        "peakWorkingSetSize",
--        static_cast<double>(
--            process_metric.second->metrics->GetPeakWorkingSetSize() >> 10));
--
--    size_t private_bytes, shared_bytes;
--    if (process_metric.second->metrics->GetMemoryBytes(&private_bytes,
--                                                       &shared_bytes)) {
--      memory_dict.Set("privateBytes", static_cast<double>(private_bytes >> 10));
--      memory_dict.Set("sharedBytes", static_cast<double>(shared_bytes >> 10));
--    }
--
--    pid_dict.Set("memory", memory_dict);
--    cpu_dict.Set(
--        "percentCPUUsage",
--        process_metric.second->metrics->GetPlatformIndependentCPUUsage() /
--            processor_count);
--
--#if !defined(OS_WIN)
--    cpu_dict.Set("idleWakeupsPerSecond",
--                 process_metric.second->metrics->GetIdleWakeupsPerSecond());
--#else
--    // Chrome's underlying process_metrics.cc will throw a non-fatal warning
--    // that this method isn't implemented on Windows, so set it to 0 instead
--    // of calling it
--    cpu_dict.Set("idleWakeupsPerSecond", 0);
--#endif
--
--    pid_dict.Set("cpu", cpu_dict);
--    pid_dict.Set("pid", process_metric.second->pid);
--    pid_dict.Set("type", content::GetProcessTypeNameInEnglish(
--                             process_metric.second->type));
--    result.push_back(pid_dict);
--  }
--
--  return result;
--}
--
--v8::Local<v8::Value> App::GetGPUFeatureStatus(v8::Isolate* isolate) {
--  auto status = content::GetFeatureStatus();
--  base::DictionaryValue temp;
--  return mate::ConvertToV8(isolate, status ? *status : temp);
--}
--
--void App::EnableMixedSandbox(mate::Arguments* args) {
--  if (Browser::Get()->is_ready()) {
--    args->ThrowError(
--        "app.enableMixedSandbox() can only be called "
--        "before app is ready");
--    return;
--  }
--
--  auto* command_line = base::CommandLine::ForCurrentProcess();
--  if (command_line->HasSwitch(::switches::kNoSandbox)) {
--#if defined(OS_WIN)
--    const base::CommandLine::CharType* noSandboxArg = L"--no-sandbox";
--#else
--    const base::CommandLine::CharType* noSandboxArg = "--no-sandbox";
--#endif
--
--    // Remove the --no-sandbox switch
--    base::CommandLine::StringVector modified_command_line;
--    for (auto& arg : command_line->argv()) {
--      if (arg.compare(noSandboxArg) != 0) {
--        modified_command_line.push_back(arg);
--      }
--    }
--    command_line->InitFromArgv(modified_command_line);
--  }
--  command_line->AppendSwitch(switches::kEnableMixedSandbox);
--}
--
--#if defined(OS_MACOSX)
--bool App::MoveToApplicationsFolder(mate::Arguments* args) {
--  return ui::cocoa::AtomBundleMover::Move(args);
--}
--
--bool App::IsInApplicationsFolder() {
--  return ui::cocoa::AtomBundleMover::IsCurrentAppInApplicationsFolder();
--}
--#endif
--
--// static
--mate::Handle<App> App::Create(v8::Isolate* isolate) {
--  return mate::CreateHandle(isolate, new App(isolate));
--}
--
--// static
--void App::BuildPrototype(v8::Isolate* isolate,
--                         v8::Local<v8::FunctionTemplate> prototype) {
--  prototype->SetClassName(mate::StringToV8(isolate, "App"));
--  auto browser = base::Unretained(Browser::Get());
--  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
--      .SetMethod("quit", base::Bind(&Browser::Quit, browser))
--      .SetMethod("exit", base::Bind(&Browser::Exit, browser))
--      .SetMethod("focus", base::Bind(&Browser::Focus, browser))
--      .SetMethod("getVersion", base::Bind(&Browser::GetVersion, browser))
--      .SetMethod("setVersion", base::Bind(&Browser::SetVersion, browser))
--      .SetMethod("getName", base::Bind(&Browser::GetName, browser))
--      .SetMethod("setName", base::Bind(&Browser::SetName, browser))
--      .SetMethod("isReady", base::Bind(&Browser::is_ready, browser))
--      .SetMethod("whenReady", base::Bind(&Browser::WhenReady, browser))
--      .SetMethod("addRecentDocument",
--                 base::Bind(&Browser::AddRecentDocument, browser))
--      .SetMethod("clearRecentDocuments",
--                 base::Bind(&Browser::ClearRecentDocuments, browser))
--      .SetMethod("setAppUserModelId",
--                 base::Bind(&Browser::SetAppUserModelID, browser))
--      .SetMethod("isDefaultProtocolClient",
--                 base::Bind(&Browser::IsDefaultProtocolClient, browser))
--      .SetMethod("setAsDefaultProtocolClient",
--                 base::Bind(&Browser::SetAsDefaultProtocolClient, browser))
--      .SetMethod("removeAsDefaultProtocolClient",
--                 base::Bind(&Browser::RemoveAsDefaultProtocolClient, browser))
--      .SetMethod("setBadgeCount", base::Bind(&Browser::SetBadgeCount, browser))
--      .SetMethod("getBadgeCount", base::Bind(&Browser::GetBadgeCount, browser))
--      .SetMethod("getLoginItemSettings", &App::GetLoginItemSettings)
--      .SetMethod("setLoginItemSettings",
--                 base::Bind(&Browser::SetLoginItemSettings, browser))
--#if defined(OS_MACOSX)
--      .SetMethod("hide", base::Bind(&Browser::Hide, browser))
--      .SetMethod("show", base::Bind(&Browser::Show, browser))
--      .SetMethod("setUserActivity",
--                 base::Bind(&Browser::SetUserActivity, browser))
--      .SetMethod("getCurrentActivityType",
--                 base::Bind(&Browser::GetCurrentActivityType, browser))
--      .SetMethod("invalidateCurrentActivity",
--                 base::Bind(&Browser::InvalidateCurrentActivity, browser))
--      .SetMethod("updateCurrentActivity",
--                 base::Bind(&Browser::UpdateCurrentActivity, browser))
--      .SetMethod("setAboutPanelOptions",
--                 base::Bind(&Browser::SetAboutPanelOptions, browser))
--#endif
--#if defined(OS_WIN)
--      .SetMethod("setUserTasks", base::Bind(&Browser::SetUserTasks, browser))
--      .SetMethod("getJumpListSettings", &App::GetJumpListSettings)
--      .SetMethod("setJumpList", &App::SetJumpList)
--#endif
--#if defined(OS_LINUX)
--      .SetMethod("isUnityRunning",
--                 base::Bind(&Browser::IsUnityRunning, browser))
--#endif
--      .SetMethod("setAppPath", &App::SetAppPath)
--      .SetMethod("getAppPath", &App::GetAppPath)
--      .SetMethod("setPath", &App::SetPath)
--      .SetMethod("getPath", &App::GetPath)
--      .SetMethod("setDesktopName", &App::SetDesktopName)
--      .SetMethod("getLocale", &App::GetLocale)
--#if defined(USE_NSS_CERTS)
--      .SetMethod("importCertificate", &App::ImportCertificate)
--#endif
--      .SetMethod("hasSingleInstanceLock", &App::HasSingleInstanceLock)
--      .SetMethod("requestSingleInstanceLock", &App::RequestSingleInstanceLock)
--      .SetMethod("releaseSingleInstanceLock", &App::ReleaseSingleInstanceLock)
--      .SetMethod("relaunch", &App::Relaunch)
--      .SetMethod("isAccessibilitySupportEnabled",
--                 &App::IsAccessibilitySupportEnabled)
--      .SetMethod("setAccessibilitySupportEnabled",
--                 &App::SetAccessibilitySupportEnabled)
--      .SetMethod("disableHardwareAcceleration",
--                 &App::DisableHardwareAcceleration)
--      .SetMethod("disableDomainBlockingFor3DAPIs",
--                 &App::DisableDomainBlockingFor3DAPIs)
--      .SetMethod("getFileIcon", &App::GetFileIcon)
--      .SetMethod("getAppMetrics", &App::GetAppMetrics)
--      .SetMethod("getGPUFeatureStatus", &App::GetGPUFeatureStatus)
--// TODO(juturu): Remove in 2.0, deprecate before then with warnings
--#if defined(OS_MACOSX)
--      .SetMethod("moveToApplicationsFolder", &App::MoveToApplicationsFolder)
--      .SetMethod("isInApplicationsFolder", &App::IsInApplicationsFolder)
--#endif
--#if defined(MAS_BUILD)
--      .SetMethod("startAccessingSecurityScopedResource",
--                 &App::StartAccessingSecurityScopedResource)
--#endif
--      .SetMethod("enableMixedSandbox", &App::EnableMixedSandbox);
--}
--
--}  // namespace api
--
--}  // namespace atom
--
--namespace {
--
--void AppendSwitch(const std::string& switch_string, mate::Arguments* args) {
--  auto* command_line = base::CommandLine::ForCurrentProcess();
--
--  if (base::EndsWith(switch_string, "-path",
--                     base::CompareCase::INSENSITIVE_ASCII) ||
--      switch_string == network::switches::kLogNetLog) {
--    base::FilePath path;
--    args->GetNext(&path);
--    command_line->AppendSwitchPath(switch_string, path);
--    return;
--  }
--
--  std::string value;
--  if (args->GetNext(&value))
--    command_line->AppendSwitchASCII(switch_string, value);
--  else
--    command_line->AppendSwitch(switch_string);
--}
--
--#if defined(OS_MACOSX)
--int DockBounce(const std::string& type) {
--  int request_id = -1;
--  if (type == "critical")
--    request_id = Browser::Get()->DockBounce(Browser::BOUNCE_CRITICAL);
--  else if (type == "informational")
--    request_id = Browser::Get()->DockBounce(Browser::BOUNCE_INFORMATIONAL);
--  return request_id;
--}
--
--void DockSetMenu(atom::api::Menu* menu) {
--  Browser::Get()->DockSetMenu(menu->model());
--}
--#endif
--
--void Initialize(v8::Local<v8::Object> exports,
--                v8::Local<v8::Value> unused,
--                v8::Local<v8::Context> context,
--                void* priv) {
--  v8::Isolate* isolate = context->GetIsolate();
--  auto* command_line = base::CommandLine::ForCurrentProcess();
--
--  mate::Dictionary dict(isolate, exports);
--  dict.Set("App", atom::api::App::GetConstructor(isolate)->GetFunction());
--  dict.Set("app", atom::api::App::Create(isolate));
--  dict.SetMethod("appendSwitch", &AppendSwitch);
--  dict.SetMethod("appendArgument", base::Bind(&base::CommandLine::AppendArg,
--                                              base::Unretained(command_line)));
--#if defined(OS_MACOSX)
--  auto browser = base::Unretained(Browser::Get());
--  dict.SetMethod("dockBounce", &DockBounce);
--  dict.SetMethod("dockCancelBounce",
--                 base::Bind(&Browser::DockCancelBounce, browser));
--  dict.SetMethod("dockDownloadFinished",
--                 base::Bind(&Browser::DockDownloadFinished, browser));
--  dict.SetMethod("dockSetBadgeText",
--                 base::Bind(&Browser::DockSetBadgeText, browser));
--  dict.SetMethod("dockGetBadgeText",
--                 base::Bind(&Browser::DockGetBadgeText, browser));
--  dict.SetMethod("dockHide", base::Bind(&Browser::DockHide, browser));
--  dict.SetMethod("dockShow", base::Bind(&Browser::DockShow, browser));
--  dict.SetMethod("dockIsVisible", base::Bind(&Browser::DockIsVisible, browser));
--  dict.SetMethod("dockSetMenu", &DockSetMenu);
--  dict.SetMethod("dockSetIcon", base::Bind(&Browser::DockSetIcon, browser));
--#endif
--}
--
--}  // namespace
--
--NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_app, Initialize)
-removed in remote
-  base   100644 5faf8ebb10e2cc48d6b2f7c259ed727906235d1f atom/browser/api/atom_api_app.h
-  our    100644 ee0ad42c05fe33be17146b79cbe3422953516621 atom/browser/api/atom_api_app.h
-@@ -1,242 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_API_ATOM_API_APP_H_
--#define ATOM_BROWSER_API_ATOM_API_APP_H_
--
--#include <memory>
--#include <string>
--#include <utility>
--#include <vector>
--
--#include "atom/browser/api/event_emitter.h"
--#include "atom/browser/atom_browser_client.h"
--#include "atom/browser/browser.h"
--#include "atom/browser/browser_observer.h"
--#include "atom/common/native_mate_converters/callback.h"
--#include "atom/common/promise_util.h"
--#include "base/process/process_iterator.h"
--#include "base/task/cancelable_task_tracker.h"
--#include "chrome/browser/icon_manager.h"
--#include "chrome/browser/process_singleton.h"
--#include "content/public/browser/browser_child_process_observer.h"
--#include "content/public/browser/gpu_data_manager_observer.h"
--#include "content/public/browser/render_process_host.h"
--#include "native_mate/dictionary.h"
--#include "native_mate/handle.h"
--#include "net/base/completion_callback.h"
--#include "net/ssl/client_cert_identity.h"
--
--#if defined(USE_NSS_CERTS)
--#include "chrome/browser/certificate_manager_model.h"
--#endif
--
--namespace base {
--class FilePath;
--}
--
--namespace mate {
--class Arguments;
--}  // namespace mate
--
--namespace atom {
--
--#if defined(OS_WIN)
--enum class JumpListResult : int;
--#endif
--
--struct ProcessMetric {
--  int type;
--  base::ProcessId pid;
--  std::unique_ptr<base::ProcessMetrics> metrics;
--
--  ProcessMetric(int type,
--                base::ProcessId pid,
--                std::unique_ptr<base::ProcessMetrics> metrics);
--  ~ProcessMetric();
--};
--
--namespace api {
--
--class App : public AtomBrowserClient::Delegate,
--            public mate::EventEmitter<App>,
--            public BrowserObserver,
--            public content::GpuDataManagerObserver,
--            public content::BrowserChildProcessObserver {
-- public:
--  using FileIconCallback =
--      base::Callback<void(v8::Local<v8::Value>, const gfx::Image&)>;
--
--  static mate::Handle<App> Create(v8::Isolate* isolate);
--
--  static void BuildPrototype(v8::Isolate* isolate,
--                             v8::Local<v8::FunctionTemplate> prototype);
--
--#if defined(USE_NSS_CERTS)
--  void OnCertificateManagerModelCreated(
--      std::unique_ptr<base::DictionaryValue> options,
--      const net::CompletionCallback& callback,
--      std::unique_ptr<CertificateManagerModel> model);
--#endif
--
--  base::FilePath GetAppPath() const;
--  void RenderProcessReady(content::RenderProcessHost* host);
--  void RenderProcessDisconnected(base::ProcessId host_pid);
--  void PreMainMessageLoopRun();
--
-- protected:
--  explicit App(v8::Isolate* isolate);
--  ~App() override;
--
--  // BrowserObserver:
--  void OnBeforeQuit(bool* prevent_default) override;
--  void OnWillQuit(bool* prevent_default) override;
--  void OnWindowAllClosed() override;
--  void OnQuit() override;
--  void OnOpenFile(bool* prevent_default, const std::string& file_path) override;
--  void OnOpenURL(const std::string& url) override;
--  void OnActivate(bool has_visible_windows) override;
--  void OnWillFinishLaunching() override;
--  void OnFinishLaunching(const base::DictionaryValue& launch_info) override;
--  void OnLogin(scoped_refptr<LoginHandler> login_handler,
--               const base::DictionaryValue& request_details) override;
--  void OnAccessibilitySupportChanged() override;
--  void OnPreMainMessageLoopRun() override;
--#if defined(OS_MACOSX)
--  void OnWillContinueUserActivity(bool* prevent_default,
--                                  const std::string& type) override;
--  void OnDidFailToContinueUserActivity(const std::string& type,
--                                       const std::string& error) override;
--  void OnContinueUserActivity(bool* prevent_default,
--                              const std::string& type,
--                              const base::DictionaryValue& user_info) override;
--  void OnUserActivityWasContinued(
--      const std::string& type,
--      const base::DictionaryValue& user_info) override;
--  void OnUpdateUserActivityState(
--      bool* prevent_default,
--      const std::string& type,
--      const base::DictionaryValue& user_info) override;
--  void OnNewWindowForTab() override;
--#endif
--
--  // content::ContentBrowserClient:
--  void AllowCertificateError(
--      content::WebContents* web_contents,
--      int cert_error,
--      const net::SSLInfo& ssl_info,
--      const GURL& request_url,
--      content::ResourceType resource_type,
--      bool strict_enforcement,
--      bool expired_previous_decision,
--      const base::Callback<void(content::CertificateRequestResultType)>&
--          callback) override;
--  void SelectClientCertificate(
--      content::WebContents* web_contents,
--      net::SSLCertRequestInfo* cert_request_info,
--      net::ClientCertIdentityList client_certs,
--      std::unique_ptr<content::ClientCertificateDelegate> delegate) override;
--  bool CanCreateWindow(content::RenderFrameHost* opener,
--                       const GURL& opener_url,
--                       const GURL& opener_top_level_frame_url,
--                       const GURL& source_origin,
--                       content::mojom::WindowContainerType container_type,
--                       const GURL& target_url,
--                       const content::Referrer& referrer,
--                       const std::string& frame_name,
--                       WindowOpenDisposition disposition,
--                       const blink::mojom::WindowFeatures& features,
--                       const std::vector<std::string>& additional_features,
--                       const scoped_refptr<network::ResourceRequestBody>& body,
--                       bool user_gesture,
--                       bool opener_suppressed,
--                       bool* no_javascript_access) override;
--
--  // content::GpuDataManagerObserver:
--  void OnGpuProcessCrashed(base::TerminationStatus status) override;
--
--  // content::BrowserChildProcessObserver:
--  void BrowserChildProcessLaunchedAndConnected(
--      const content::ChildProcessData& data) override;
--  void BrowserChildProcessHostDisconnected(
--      const content::ChildProcessData& data) override;
--  void BrowserChildProcessCrashed(const content::ChildProcessData& data,
--                                  int exit_code) override;
--  void BrowserChildProcessKilled(const content::ChildProcessData& data,
--                                 int exit_code) override;
--
-- private:
--  void SetAppPath(const base::FilePath& app_path);
--  void ChildProcessLaunched(int process_type, base::ProcessHandle handle);
--  void ChildProcessDisconnected(base::ProcessId pid);
--
--  // Get/Set the pre-defined path in PathService.
--  base::FilePath GetPath(mate::Arguments* args, const std::string& name);
--  void SetPath(mate::Arguments* args,
--               const std::string& name,
--               const base::FilePath& path);
--
--  void SetDesktopName(const std::string& desktop_name);
--  std::string GetLocale();
--  void OnSecondInstance(const base::CommandLine::StringVector& cmd,
--                        const base::FilePath& cwd);
--  bool HasSingleInstanceLock() const;
--  bool RequestSingleInstanceLock();
--  void ReleaseSingleInstanceLock();
--  bool Relaunch(mate::Arguments* args);
--  void DisableHardwareAcceleration(mate::Arguments* args);
--  void DisableDomainBlockingFor3DAPIs(mate::Arguments* args);
--  bool IsAccessibilitySupportEnabled();
--  void SetAccessibilitySupportEnabled(bool enabled);
--  Browser::LoginItemSettings GetLoginItemSettings(mate::Arguments* args);
--#if defined(USE_NSS_CERTS)
--  void ImportCertificate(const base::DictionaryValue& options,
--                         const net::CompletionCallback& callback);
--#endif
--  void GetFileIcon(const base::FilePath& path, mate::Arguments* args);
--
--  std::vector<mate::Dictionary> GetAppMetrics(v8::Isolate* isolate);
--  v8::Local<v8::Value> GetGPUFeatureStatus(v8::Isolate* isolate);
--  void EnableMixedSandbox(mate::Arguments* args);
--
--#if defined(OS_MACOSX)
--  bool MoveToApplicationsFolder(mate::Arguments* args);
--  bool IsInApplicationsFolder();
--#endif
--#if defined(MAS_BUILD)
--  base::Callback<void()> StartAccessingSecurityScopedResource(
--      mate::Arguments* args);
--#endif
--
--#if defined(OS_WIN)
--  // Get the current Jump List settings.
--  v8::Local<v8::Value> GetJumpListSettings();
--
--  // Set or remove a custom Jump List for the application.
--  JumpListResult SetJumpList(v8::Local<v8::Value> val, mate::Arguments* args);
--#endif  // defined(OS_WIN)
--
--  std::unique_ptr<ProcessSingleton> process_singleton_;
--
--#if defined(USE_NSS_CERTS)
--  std::unique_ptr<CertificateManagerModel> certificate_manager_model_;
--#endif
--
--  // Tracks tasks requesting file icons.
--  base::CancelableTaskTracker cancelable_task_tracker_;
--
--  base::FilePath app_path_;
--
--  using ProcessMetricMap =
--      std::unordered_map<base::ProcessId, std::unique_ptr<atom::ProcessMetric>>;
--  ProcessMetricMap app_metrics_;
--
--  DISALLOW_COPY_AND_ASSIGN(App);
--};
--
--}  // namespace api
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_API_ATOM_API_APP_H_
-removed in remote
-  base   100644 1a02a54d45337fb64aefe91db454e77a7edf8fb7 atom/browser/api/atom_api_auto_updater.cc
-  our    100644 3bee34247e9289fcf5349854c5e6cd69f4b66a0d atom/browser/api/atom_api_auto_updater.cc
-@@ -1,155 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/api/atom_api_auto_updater.h"
--
--#include "atom/browser/browser.h"
--#include "atom/browser/native_window.h"
--#include "atom/browser/window_list.h"
--#include "atom/common/api/event_emitter_caller.h"
--#include "atom/common/native_mate_converters/callback.h"
--#include "atom/common/node_includes.h"
--#include "base/time/time.h"
--#include "native_mate/dictionary.h"
--#include "native_mate/object_template_builder.h"
--
--namespace mate {
--
--template <>
--struct Converter<base::Time> {
--  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
--                                   const base::Time& val) {
--    v8::MaybeLocal<v8::Value> date =
--        v8::Date::New(isolate->GetCurrentContext(), val.ToJsTime());
--    if (date.IsEmpty())
--      return v8::Null(isolate);
--    else
--      return date.ToLocalChecked();
--  }
--};
--
--}  // namespace mate
--
--namespace atom {
--
--namespace api {
--
--AutoUpdater::AutoUpdater(v8::Isolate* isolate) {
--  auto_updater::AutoUpdater::SetDelegate(this);
--  Init(isolate);
--}
--
--AutoUpdater::~AutoUpdater() {
--  auto_updater::AutoUpdater::SetDelegate(nullptr);
--}
--
--void AutoUpdater::OnError(const std::string& message) {
--  v8::Locker locker(isolate());
--  v8::HandleScope handle_scope(isolate());
--  auto error = v8::Exception::Error(mate::StringToV8(isolate(), message));
--  mate::EmitEvent(
--      isolate(), GetWrapper(), "error",
--      error->ToObject(isolate()->GetCurrentContext()).ToLocalChecked(),
--      // Message is also emitted to keep compatibility with old code.
--      message);
--}
--
--void AutoUpdater::OnError(const std::string& message,
--                          const int code,
--                          const std::string& domain) {
--  v8::Locker locker(isolate());
--  v8::HandleScope handle_scope(isolate());
--  auto error = v8::Exception::Error(mate::StringToV8(isolate(), message));
--  auto errorObject =
--      error->ToObject(isolate()->GetCurrentContext()).ToLocalChecked();
--
--  // add two new params for better error handling
--  errorObject->Set(mate::StringToV8(isolate(), "code"),
--                   v8::Integer::New(isolate(), code));
--  errorObject->Set(mate::StringToV8(isolate(), "domain"),
--                   mate::StringToV8(isolate(), domain));
--
--  mate::EmitEvent(isolate(), GetWrapper(), "error", errorObject, message);
--}
--
--void AutoUpdater::OnCheckingForUpdate() {
--  Emit("checking-for-update");
--}
--
--void AutoUpdater::OnUpdateAvailable() {
--  Emit("update-available");
--}
--
--void AutoUpdater::OnUpdateNotAvailable() {
--  Emit("update-not-available");
--}
--
--void AutoUpdater::OnUpdateDownloaded(const std::string& release_notes,
--                                     const std::string& release_name,
--                                     const base::Time& release_date,
--                                     const std::string& url) {
--  Emit("update-downloaded", release_notes, release_name, release_date, url,
--       // Keep compatibility with old APIs.
--       base::Bind(&AutoUpdater::QuitAndInstall, base::Unretained(this)));
--}
--
--void AutoUpdater::OnWindowAllClosed() {
--  QuitAndInstall();
--}
--
--void AutoUpdater::SetFeedURL(mate::Arguments* args) {
--  auto_updater::AutoUpdater::SetFeedURL(args);
--}
--
--void AutoUpdater::QuitAndInstall() {
--  Emit("before-quit-for-update");
--
--  // If we don't have any window then quitAndInstall immediately.
--  if (WindowList::IsEmpty()) {
--    auto_updater::AutoUpdater::QuitAndInstall();
--    return;
--  }
--
--  // Otherwise do the restart after all windows have been closed.
--  WindowList::AddObserver(this);
--  WindowList::CloseAllWindows();
--}
--
--// static
--mate::Handle<AutoUpdater> AutoUpdater::Create(v8::Isolate* isolate) {
--  return mate::CreateHandle(isolate, new AutoUpdater(isolate));
--}
--
--// static
--void AutoUpdater::BuildPrototype(v8::Isolate* isolate,
--                                 v8::Local<v8::FunctionTemplate> prototype) {
--  prototype->SetClassName(mate::StringToV8(isolate, "AutoUpdater"));
--  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
--      .SetMethod("checkForUpdates", &auto_updater::AutoUpdater::CheckForUpdates)
--      .SetMethod("getFeedURL", &auto_updater::AutoUpdater::GetFeedURL)
--      .SetMethod("setFeedURL", &AutoUpdater::SetFeedURL)
--      .SetMethod("quitAndInstall", &AutoUpdater::QuitAndInstall);
--}
--
--}  // namespace api
--
--}  // namespace atom
--
--namespace {
--
--using atom::api::AutoUpdater;
--
--void Initialize(v8::Local<v8::Object> exports,
--                v8::Local<v8::Value> unused,
--                v8::Local<v8::Context> context,
--                void* priv) {
--  v8::Isolate* isolate = context->GetIsolate();
--  mate::Dictionary dict(isolate, exports);
--  dict.Set("autoUpdater", AutoUpdater::Create(isolate));
--  dict.Set("AutoUpdater", AutoUpdater::GetConstructor(isolate)->GetFunction());
--}
--
--}  // namespace
--
--NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_auto_updater, Initialize)
-removed in remote
-  base   100644 95b91041e9e36c3a1b21cbcd8f8b559eca193f8a atom/browser/api/atom_api_auto_updater.h
-  our    100644 d8875ae0e38457365e0b55d854aae9f672a025e2 atom/browser/api/atom_api_auto_updater.h
-@@ -1,61 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_API_ATOM_API_AUTO_UPDATER_H_
--#define ATOM_BROWSER_API_ATOM_API_AUTO_UPDATER_H_
--
--#include <string>
--
--#include "atom/browser/api/event_emitter.h"
--#include "atom/browser/auto_updater.h"
--#include "atom/browser/window_list_observer.h"
--#include "native_mate/arguments.h"
--#include "native_mate/handle.h"
--
--namespace atom {
--
--namespace api {
--
--class AutoUpdater : public mate::EventEmitter<AutoUpdater>,
--                    public auto_updater::Delegate,
--                    public WindowListObserver {
-- public:
--  static mate::Handle<AutoUpdater> Create(v8::Isolate* isolate);
--
--  static void BuildPrototype(v8::Isolate* isolate,
--                             v8::Local<v8::FunctionTemplate> prototype);
--
-- protected:
--  explicit AutoUpdater(v8::Isolate* isolate);
--  ~AutoUpdater() override;
--
--  // Delegate implementations.
--  void OnError(const std::string& error) override;
--  void OnError(const std::string& message,
--               const int code,
--               const std::string& domain) override;
--  void OnCheckingForUpdate() override;
--  void OnUpdateAvailable() override;
--  void OnUpdateNotAvailable() override;
--  void OnUpdateDownloaded(const std::string& release_notes,
--                          const std::string& release_name,
--                          const base::Time& release_date,
--                          const std::string& update_url) override;
--
--  // WindowListObserver:
--  void OnWindowAllClosed() override;
--
-- private:
--  std::string GetFeedURL();
--  void SetFeedURL(mate::Arguments* args);
--  void QuitAndInstall();
--
--  DISALLOW_COPY_AND_ASSIGN(AutoUpdater);
--};
--
--}  // namespace api
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_API_ATOM_API_AUTO_UPDATER_H_
-removed in remote
-  base   100644 937a87ea2131194d5edef3e9cab6ecfcff8fc34e atom/browser/api/atom_api_content_tracing.cc
-  our    100644 d340b167a5f35fa05280c1195c81542bfc74f0b6 atom/browser/api/atom_api_content_tracing.cc
-@@ -1,79 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include <set>
--#include <string>
--
--#include "atom/common/native_mate_converters/callback.h"
--#include "atom/common/native_mate_converters/file_path_converter.h"
--#include "base/bind.h"
--#include "base/files/file_util.h"
--#include "content/public/browser/tracing_controller.h"
--#include "native_mate/dictionary.h"
--
--#include "atom/common/node_includes.h"
--
--using content::TracingController;
--
--namespace mate {
--
--template <>
--struct Converter<base::trace_event::TraceConfig> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     base::trace_event::TraceConfig* out) {
--    Dictionary options;
--    if (!ConvertFromV8(isolate, val, &options))
--      return false;
--    std::string category_filter, trace_options;
--    if (!options.Get("categoryFilter", &category_filter) ||
--        !options.Get("traceOptions", &trace_options))
--      return false;
--    *out = base::trace_event::TraceConfig(category_filter, trace_options);
--    return true;
--  }
--};
--
--}  // namespace mate
--
--namespace {
--
--using CompletionCallback = base::Callback<void(const base::FilePath&)>;
--
--scoped_refptr<TracingController::TraceDataEndpoint> GetTraceDataEndpoint(
--    const base::FilePath& path,
--    const CompletionCallback& callback) {
--  base::FilePath result_file_path = path;
--  if (result_file_path.empty() && !base::CreateTemporaryFile(&result_file_path))
--    LOG(ERROR) << "Creating temporary file failed";
--
--  return TracingController::CreateFileEndpoint(
--      result_file_path, base::Bind(callback, result_file_path));
--}
--
--void StopRecording(const base::FilePath& path,
--                   const CompletionCallback& callback) {
--  TracingController::GetInstance()->StopTracing(
--      GetTraceDataEndpoint(path, callback));
--}
--
--void Initialize(v8::Local<v8::Object> exports,
--                v8::Local<v8::Value> unused,
--                v8::Local<v8::Context> context,
--                void* priv) {
--  auto controller = base::Unretained(TracingController::GetInstance());
--  mate::Dictionary dict(context->GetIsolate(), exports);
--  dict.SetMethod("getCategories",
--                 base::Bind(&TracingController::GetCategories, controller));
--  dict.SetMethod("startRecording",
--                 base::Bind(&TracingController::StartTracing, controller));
--  dict.SetMethod("stopRecording", &StopRecording);
--  dict.SetMethod(
--      "getTraceBufferUsage",
--      base::Bind(&TracingController::GetTraceBufferUsage, controller));
--}
--
--}  // namespace
--
--NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_content_tracing, Initialize)
-removed in remote
-  base   100644 e49a2ee2f6763dba123ca45aead308c1955f6bb3 atom/browser/api/atom_api_cookies.cc
-  our    100644 daccf443927abdf444845613b6e2916d167f96f3 atom/browser/api/atom_api_cookies.cc
-@@ -1,328 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/api/atom_api_cookies.h"
--
--#include "atom/browser/atom_browser_context.h"
--#include "atom/browser/request_context_delegate.h"
--#include "atom/common/native_mate_converters/callback.h"
--#include "atom/common/native_mate_converters/gurl_converter.h"
--#include "atom/common/native_mate_converters/value_converter.h"
--#include "base/time/time.h"
--#include "base/values.h"
--#include "content/public/browser/browser_context.h"
--#include "content/public/browser/browser_thread.h"
--#include "native_mate/dictionary.h"
--#include "native_mate/object_template_builder.h"
--#include "net/cookies/canonical_cookie.h"
--#include "net/cookies/cookie_store.h"
--#include "net/cookies/cookie_util.h"
--#include "net/url_request/url_request_context.h"
--#include "net/url_request/url_request_context_getter.h"
--
--using content::BrowserThread;
--
--namespace mate {
--
--template <>
--struct Converter<atom::api::Cookies::Error> {
--  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
--                                   atom::api::Cookies::Error val) {
--    if (val == atom::api::Cookies::SUCCESS)
--      return v8::Null(isolate);
--    else
--      return v8::Exception::Error(StringToV8(isolate, "Setting cookie failed"));
--  }
--};
--
--template <>
--struct Converter<net::CanonicalCookie> {
--  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
--                                   const net::CanonicalCookie& val) {
--    mate::Dictionary dict(isolate, v8::Object::New(isolate));
--    dict.Set("name", val.Name());
--    dict.Set("value", val.Value());
--    dict.Set("domain", val.Domain());
--    dict.Set("hostOnly", net::cookie_util::DomainIsHostOnly(val.Domain()));
--    dict.Set("path", val.Path());
--    dict.Set("secure", val.IsSecure());
--    dict.Set("httpOnly", val.IsHttpOnly());
--    dict.Set("session", !val.IsPersistent());
--    if (val.IsPersistent())
--      dict.Set("expirationDate", val.ExpiryDate().ToDoubleT());
--    return dict.GetHandle();
--  }
--};
--
--template <>
--struct Converter<net::CookieChangeCause> {
--  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
--                                   const net::CookieChangeCause& val) {
--    switch (val) {
--      case net::CookieChangeCause::INSERTED:
--      case net::CookieChangeCause::EXPLICIT:
--        return mate::StringToV8(isolate, "explicit");
--      case net::CookieChangeCause::OVERWRITE:
--        return mate::StringToV8(isolate, "overwrite");
--      case net::CookieChangeCause::EXPIRED:
--        return mate::StringToV8(isolate, "expired");
--      case net::CookieChangeCause::EVICTED:
--        return mate::StringToV8(isolate, "evicted");
--      case net::CookieChangeCause::EXPIRED_OVERWRITE:
--        return mate::StringToV8(isolate, "expired-overwrite");
--      default:
--        return mate::StringToV8(isolate, "unknown");
--    }
--  }
--};
--
--}  // namespace mate
--
--namespace atom {
--
--namespace api {
--
--namespace {
--
--// Returns whether |domain| matches |filter|.
--bool MatchesDomain(std::string filter, const std::string& domain) {
--  // Add a leading '.' character to the filter domain if it doesn't exist.
--  if (net::cookie_util::DomainIsHostOnly(filter))
--    filter.insert(0, ".");
--
--  std::string sub_domain(domain);
--  // Strip any leading '.' character from the input cookie domain.
--  if (!net::cookie_util::DomainIsHostOnly(sub_domain))
--    sub_domain = sub_domain.substr(1);
--
--  // Now check whether the domain argument is a subdomain of the filter domain.
--  for (sub_domain.insert(0, "."); sub_domain.length() >= filter.length();) {
--    if (sub_domain == filter)
--      return true;
--    const size_t next_dot = sub_domain.find('.', 1);  // Skip over leading dot.
--    sub_domain.erase(0, next_dot);
--  }
--  return false;
--}
--
--// Returns whether |cookie| matches |filter|.
--bool MatchesCookie(const base::DictionaryValue* filter,
--                   const net::CanonicalCookie& cookie) {
--  std::string str;
--  bool b;
--  if (filter->GetString("name", &str) && str != cookie.Name())
--    return false;
--  if (filter->GetString("path", &str) && str != cookie.Path())
--    return false;
--  if (filter->GetString("domain", &str) && !MatchesDomain(str, cookie.Domain()))
--    return false;
--  if (filter->GetBoolean("secure", &b) && b != cookie.IsSecure())
--    return false;
--  if (filter->GetBoolean("session", &b) && b != !cookie.IsPersistent())
--    return false;
--  return true;
--}
--
--// Helper to returns the CookieStore.
--inline net::CookieStore* GetCookieStore(
--    scoped_refptr<net::URLRequestContextGetter> getter) {
--  return getter->GetURLRequestContext()->cookie_store();
--}
--
--// Run |callback| on UI thread.
--void RunCallbackInUI(const base::Closure& callback) {
--  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, callback);
--}
--
--// Remove cookies from |list| not matching |filter|, and pass it to |callback|.
--void FilterCookies(std::unique_ptr<base::DictionaryValue> filter,
--                   const Cookies::GetCallback& callback,
--                   const net::CookieList& list) {
--  net::CookieList result;
--  for (const auto& cookie : list) {
--    if (MatchesCookie(filter.get(), cookie))
--      result.push_back(cookie);
--  }
--  RunCallbackInUI(base::Bind(callback, Cookies::SUCCESS, result));
--}
--
--// Receives cookies matching |filter| in IO thread.
--void GetCookiesOnIO(scoped_refptr<net::URLRequestContextGetter> getter,
--                    std::unique_ptr<base::DictionaryValue> filter,
--                    const Cookies::GetCallback& callback) {
--  std::string url;
--  filter->GetString("url", &url);
--
--  auto filtered_callback =
--      base::Bind(FilterCookies, base::Passed(&filter), callback);
--
--  // Empty url will match all url cookies.
--  if (url.empty())
--    GetCookieStore(getter)->GetAllCookiesAsync(filtered_callback);
--  else
--    GetCookieStore(getter)->GetAllCookiesForURLAsync(GURL(url),
--                                                     filtered_callback);
--}
--
--// Removes cookie with |url| and |name| in IO thread.
--void RemoveCookieOnIOThread(scoped_refptr<net::URLRequestContextGetter> getter,
--                            const GURL& url,
--                            const std::string& name,
--                            const base::Closure& callback) {
--  GetCookieStore(getter)->DeleteCookieAsync(
--      url, name, base::BindOnce(RunCallbackInUI, callback));
--}
--
--// Callback of SetCookie.
--void OnSetCookie(const Cookies::SetCallback& callback, bool success) {
--  RunCallbackInUI(
--      base::Bind(callback, success ? Cookies::SUCCESS : Cookies::FAILED));
--}
--
--// Flushes cookie store in IO thread.
--void FlushCookieStoreOnIOThread(
--    scoped_refptr<net::URLRequestContextGetter> getter,
--    const base::Closure& callback) {
--  GetCookieStore(getter)->FlushStore(base::BindOnce(RunCallbackInUI, callback));
--}
--
--// Sets cookie with |details| in IO thread.
--void SetCookieOnIO(scoped_refptr<net::URLRequestContextGetter> getter,
--                   std::unique_ptr<base::DictionaryValue> details,
--                   const Cookies::SetCallback& callback) {
--  std::string url, name, value, domain, path;
--  bool secure = false;
--  bool http_only = false;
--  double creation_date;
--  double expiration_date;
--  double last_access_date;
--  details->GetString("url", &url);
--  details->GetString("name", &name);
--  details->GetString("value", &value);
--  details->GetString("domain", &domain);
--  details->GetString("path", &path);
--  details->GetBoolean("secure", &secure);
--  details->GetBoolean("httpOnly", &http_only);
--
--  base::Time creation_time;
--  if (details->GetDouble("creationDate", &creation_date)) {
--    creation_time = (creation_date == 0)
--                        ? base::Time::UnixEpoch()
--                        : base::Time::FromDoubleT(creation_date);
--  }
--
--  base::Time expiration_time;
--  if (details->GetDouble("expirationDate", &expiration_date)) {
--    expiration_time = (expiration_date == 0)
--                          ? base::Time::UnixEpoch()
--                          : base::Time::FromDoubleT(expiration_date);
--  }
--
--  base::Time last_access_time;
--  if (details->GetDouble("lastAccessDate", &last_access_date)) {
--    last_access_time = (last_access_date == 0)
--                           ? base::Time::UnixEpoch()
--                           : base::Time::FromDoubleT(last_access_date);
--  }
--
--  std::unique_ptr<net::CanonicalCookie> canonical_cookie(
--      net::CanonicalCookie::CreateSanitizedCookie(
--          GURL(url), name, value, domain, path, creation_time, expiration_time,
--          last_access_time, secure, http_only,
--          net::CookieSameSite::DEFAULT_MODE, net::COOKIE_PRIORITY_DEFAULT));
--  auto completion_callback = base::BindOnce(OnSetCookie, callback);
--  if (!canonical_cookie || !canonical_cookie->IsCanonical()) {
--    std::move(completion_callback).Run(false);
--    return;
--  }
--  if (url.empty()) {
--    std::move(completion_callback).Run(false);
--    return;
--  }
--  if (name.empty()) {
--    std::move(completion_callback).Run(false);
--    return;
--  }
--  GetCookieStore(getter)->SetCanonicalCookieAsync(
--      std::move(canonical_cookie), secure, http_only,
--      std::move(completion_callback));
--}
--
--}  // namespace
--
--Cookies::Cookies(v8::Isolate* isolate, AtomBrowserContext* browser_context)
--    : browser_context_(browser_context) {
--  Init(isolate);
--  cookie_change_subscription_ =
--      browser_context->GetRequestContextDelegate()
--          ->RegisterCookieChangeCallback(
--              base::Bind(&Cookies::OnCookieChanged, base::Unretained(this)));
--}
--
--Cookies::~Cookies() {}
--
--void Cookies::Get(const base::DictionaryValue& filter,
--                  const GetCallback& callback) {
--  auto copy = base::DictionaryValue::From(
--      base::Value::ToUniquePtrValue(filter.Clone()));
--  auto* getter = browser_context_->GetRequestContext();
--  content::BrowserThread::PostTask(
--      BrowserThread::IO, FROM_HERE,
--      base::BindOnce(GetCookiesOnIO, base::RetainedRef(getter), std::move(copy),
--                     callback));
--}
--
--void Cookies::Remove(const GURL& url,
--                     const std::string& name,
--                     const base::Closure& callback) {
--  auto* getter = browser_context_->GetRequestContext();
--  content::BrowserThread::PostTask(
--      BrowserThread::IO, FROM_HERE,
--      base::BindOnce(RemoveCookieOnIOThread, base::RetainedRef(getter), url,
--                     name, callback));
--}
--
--void Cookies::Set(const base::DictionaryValue& details,
--                  const SetCallback& callback) {
--  auto copy = base::DictionaryValue::From(
--      base::Value::ToUniquePtrValue(details.Clone()));
--  auto* getter = browser_context_->GetRequestContext();
--  content::BrowserThread::PostTask(
--      BrowserThread::IO, FROM_HERE,
--      base::BindOnce(SetCookieOnIO, base::RetainedRef(getter), std::move(copy),
--                     callback));
--}
--
--void Cookies::FlushStore(const base::Closure& callback) {
--  auto* getter = browser_context_->GetRequestContext();
--  content::BrowserThread::PostTask(
--      BrowserThread::IO, FROM_HERE,
--      base::BindOnce(FlushCookieStoreOnIOThread, base::RetainedRef(getter),
--                     callback));
--}
--
--void Cookies::OnCookieChanged(const CookieDetails* details) {
--  Emit("changed", *(details->cookie), details->cause, details->removed);
--}
--
--// static
--mate::Handle<Cookies> Cookies::Create(v8::Isolate* isolate,
--                                      AtomBrowserContext* browser_context) {
--  return mate::CreateHandle(isolate, new Cookies(isolate, browser_context));
--}
--
--// static
--void Cookies::BuildPrototype(v8::Isolate* isolate,
--                             v8::Local<v8::FunctionTemplate> prototype) {
--  prototype->SetClassName(mate::StringToV8(isolate, "Cookies"));
--  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
--      .SetMethod("get", &Cookies::Get)
--      .SetMethod("remove", &Cookies::Remove)
--      .SetMethod("set", &Cookies::Set)
--      .SetMethod("flushStore", &Cookies::FlushStore);
--}
--
--}  // namespace api
--
--}  // namespace atom
-removed in remote
-  base   100644 302fd1b25110ceec6a1124c02c35d8475ed623b6 atom/browser/api/atom_api_cookies.h
-  our    100644 8a83a64ca1012e11cb9629ea172f578eca545abe atom/browser/api/atom_api_cookies.h
-@@ -1,73 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_API_ATOM_API_COOKIES_H_
--#define ATOM_BROWSER_API_ATOM_API_COOKIES_H_
--
--#include <string>
--
--#include "atom/browser/api/trackable_object.h"
--#include "atom/browser/net/cookie_details.h"
--#include "base/callback_list.h"
--#include "native_mate/handle.h"
--#include "net/cookies/canonical_cookie.h"
--
--namespace base {
--class DictionaryValue;
--}
--
--namespace net {
--class URLRequestContextGetter;
--}
--
--namespace atom {
--
--class AtomBrowserContext;
--
--namespace api {
--
--class Cookies : public mate::TrackableObject<Cookies> {
-- public:
--  enum Error {
--    SUCCESS,
--    FAILED,
--  };
--
--  using GetCallback = base::Callback<void(Error, const net::CookieList&)>;
--  using SetCallback = base::Callback<void(Error)>;
--
--  static mate::Handle<Cookies> Create(v8::Isolate* isolate,
--                                      AtomBrowserContext* browser_context);
--
--  // mate::TrackableObject:
--  static void BuildPrototype(v8::Isolate* isolate,
--                             v8::Local<v8::FunctionTemplate> prototype);
--
-- protected:
--  Cookies(v8::Isolate* isolate, AtomBrowserContext* browser_context);
--  ~Cookies() override;
--
--  void Get(const base::DictionaryValue& filter, const GetCallback& callback);
--  void Remove(const GURL& url,
--              const std::string& name,
--              const base::Closure& callback);
--  void Set(const base::DictionaryValue& details, const SetCallback& callback);
--  void FlushStore(const base::Closure& callback);
--
--  // AtomBrowserContext::RegisterCookieChangeCallback subscription:
--  void OnCookieChanged(const CookieDetails*);
--
-- private:
--  std::unique_ptr<base::CallbackList<void(const CookieDetails*)>::Subscription>
--      cookie_change_subscription_;
--  scoped_refptr<AtomBrowserContext> browser_context_;
--
--  DISALLOW_COPY_AND_ASSIGN(Cookies);
--};
--
--}  // namespace api
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_API_ATOM_API_COOKIES_H_
-removed in remote
-  base   100644 eab60311f3dd16070428a4fbd3bc4ba942f23c51 atom/browser/api/atom_api_debugger.cc
-  our    100644 603382d8a7ac5de596cfdc4ca419f5243287166e atom/browser/api/atom_api_debugger.cc
-@@ -1,177 +0,0 @@
--// Copyright (c) 2016 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/api/atom_api_debugger.h"
--
--#include <string>
--
--#include "atom/browser/atom_browser_main_parts.h"
--#include "atom/common/native_mate_converters/callback.h"
--#include "atom/common/native_mate_converters/value_converter.h"
--#include "base/json/json_reader.h"
--#include "base/json/json_writer.h"
--#include "base/memory/ptr_util.h"
--#include "content/public/browser/devtools_agent_host.h"
--#include "content/public/browser/web_contents.h"
--#include "native_mate/dictionary.h"
--#include "native_mate/object_template_builder.h"
--
--#include "atom/common/node_includes.h"
--
--using content::DevToolsAgentHost;
--
--namespace atom {
--
--namespace api {
--
--Debugger::Debugger(v8::Isolate* isolate, content::WebContents* web_contents)
--    : web_contents_(web_contents) {
--  Init(isolate);
--}
--
--Debugger::~Debugger() {}
--
--void Debugger::AgentHostClosed(DevToolsAgentHost* agent_host) {
--  std::string detach_reason = "target closed";
--  Emit("detach", detach_reason);
--}
--
--void Debugger::DispatchProtocolMessage(DevToolsAgentHost* agent_host,
--                                       const std::string& message) {
--  DCHECK(agent_host == agent_host_.get());
--
--  v8::Locker locker(isolate());
--  v8::HandleScope handle_scope(isolate());
--
--  std::unique_ptr<base::Value> parsed_message = base::JSONReader::Read(message);
--  if (!parsed_message || !parsed_message->is_dict())
--    return;
--  base::DictionaryValue* dict =
--      static_cast<base::DictionaryValue*>(parsed_message.get());
--  int id;
--  if (!dict->GetInteger("id", &id)) {
--    std::string method;
--    if (!dict->GetString("method", &method))
--      return;
--    base::DictionaryValue* params_value = nullptr;
--    base::DictionaryValue params;
--    if (dict->GetDictionary("params", &params_value))
--      params.Swap(params_value);
--    Emit("message", method, params);
--  } else {
--    auto send_command_callback = pending_requests_[id];
--    pending_requests_.erase(id);
--    if (send_command_callback.is_null())
--      return;
--    base::DictionaryValue* error_body = nullptr;
--    base::DictionaryValue error;
--    if (dict->GetDictionary("error", &error_body))
--      error.Swap(error_body);
--
--    base::DictionaryValue* result_body = nullptr;
--    base::DictionaryValue result;
--    if (dict->GetDictionary("result", &result_body))
--      result.Swap(result_body);
--    send_command_callback.Run(error, result);
--  }
--}
--
--void Debugger::Attach(mate::Arguments* args) {
--  std::string protocol_version;
--  args->GetNext(&protocol_version);
--
--  if (!protocol_version.empty() &&
--      !DevToolsAgentHost::IsSupportedProtocolVersion(protocol_version)) {
--    args->ThrowError("Requested protocol version is not supported");
--    return;
--  }
--  agent_host_ = DevToolsAgentHost::GetOrCreateFor(web_contents_);
--  if (!agent_host_.get()) {
--    args->ThrowError("No target available");
--    return;
--  }
--  if (agent_host_->IsAttached()) {
--    args->ThrowError("Another debugger is already attached to this target");
--    return;
--  }
--
--  agent_host_->AttachClient(this);
--}
--
--bool Debugger::IsAttached() {
--  return agent_host_.get() ? agent_host_->IsAttached() : false;
--}
--
--void Debugger::Detach() {
--  if (!agent_host_.get())
--    return;
--  agent_host_->DetachClient(this);
--  AgentHostClosed(agent_host_.get());
--  agent_host_ = nullptr;
--}
--
--void Debugger::SendCommand(mate::Arguments* args) {
--  if (!agent_host_.get())
--    return;
--
--  std::string method;
--  if (!args->GetNext(&method)) {
--    args->ThrowError();
--    return;
--  }
--  base::DictionaryValue command_params;
--  args->GetNext(&command_params);
--  SendCommandCallback callback;
--  args->GetNext(&callback);
--
--  base::DictionaryValue request;
--  int request_id = ++previous_request_id_;
--  pending_requests_[request_id] = callback;
--  request.SetInteger("id", request_id);
--  request.SetString("method", method);
--  if (!command_params.empty())
--    request.Set("params", base::WrapUnique(command_params.DeepCopy()));
--
--  std::string json_args;
--  base::JSONWriter::Write(request, &json_args);
--  agent_host_->DispatchProtocolMessage(this, json_args);
--}
--
--// static
--mate::Handle<Debugger> Debugger::Create(v8::Isolate* isolate,
--                                        content::WebContents* web_contents) {
--  return mate::CreateHandle(isolate, new Debugger(isolate, web_contents));
--}
--
--// static
--void Debugger::BuildPrototype(v8::Isolate* isolate,
--                              v8::Local<v8::FunctionTemplate> prototype) {
--  prototype->SetClassName(mate::StringToV8(isolate, "Debugger"));
--  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
--      .SetMethod("attach", &Debugger::Attach)
--      .SetMethod("isAttached", &Debugger::IsAttached)
--      .SetMethod("detach", &Debugger::Detach)
--      .SetMethod("sendCommand", &Debugger::SendCommand);
--}
--
--}  // namespace api
--
--}  // namespace atom
--
--namespace {
--
--using atom::api::Debugger;
--
--void Initialize(v8::Local<v8::Object> exports,
--                v8::Local<v8::Value> unused,
--                v8::Local<v8::Context> context,
--                void* priv) {
--  v8::Isolate* isolate = context->GetIsolate();
--  mate::Dictionary(isolate, exports)
--      .Set("Debugger", Debugger::GetConstructor(isolate)->GetFunction());
--}
--
--}  // namespace
--
--NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_debugger, Initialize);
-removed in remote
-  base   100644 5454108e8b0907056f69f95ac40bfd0ffd59e4a6 atom/browser/api/atom_api_debugger.h
-  our    100644 d3774dae9dc58ed005274bd756b1b40cb7ca7b0e atom/browser/api/atom_api_debugger.h
-@@ -1,74 +0,0 @@
--// Copyright (c) 2016 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_API_ATOM_API_DEBUGGER_H_
--#define ATOM_BROWSER_API_ATOM_API_DEBUGGER_H_
--
--#include <map>
--#include <string>
--
--#include "atom/browser/api/trackable_object.h"
--#include "base/callback.h"
--#include "base/values.h"
--#include "content/public/browser/devtools_agent_host_client.h"
--#include "native_mate/handle.h"
--
--namespace content {
--class DevToolsAgentHost;
--class WebContents;
--}  // namespace content
--
--namespace mate {
--class Arguments;
--}
--
--namespace atom {
--
--namespace api {
--
--class Debugger : public mate::TrackableObject<Debugger>,
--                 public content::DevToolsAgentHostClient {
-- public:
--  using SendCommandCallback =
--      base::Callback<void(const base::DictionaryValue&,
--                          const base::DictionaryValue&)>;
--
--  static mate::Handle<Debugger> Create(v8::Isolate* isolate,
--                                       content::WebContents* web_contents);
--
--  // mate::TrackableObject:
--  static void BuildPrototype(v8::Isolate* isolate,
--                             v8::Local<v8::FunctionTemplate> prototype);
--
-- protected:
--  Debugger(v8::Isolate* isolate, content::WebContents* web_contents);
--  ~Debugger() override;
--
--  // content::DevToolsAgentHostClient:
--  void AgentHostClosed(content::DevToolsAgentHost* agent_host) override;
--  void DispatchProtocolMessage(content::DevToolsAgentHost* agent_host,
--                               const std::string& message) override;
--
-- private:
--  using PendingRequestMap = std::map<int, SendCommandCallback>;
--
--  void Attach(mate::Arguments* args);
--  bool IsAttached();
--  void Detach();
--  void SendCommand(mate::Arguments* args);
--
--  content::WebContents* web_contents_;  // Weak Reference.
--  scoped_refptr<content::DevToolsAgentHost> agent_host_;
--
--  PendingRequestMap pending_requests_;
--  int previous_request_id_ = 0;
--
--  DISALLOW_COPY_AND_ASSIGN(Debugger);
--};
--
--}  // namespace api
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_API_ATOM_API_DEBUGGER_H_
-removed in remote
-  base   100644 cdae6f0c44cd962f0a512df70bfe2bd79f603a5f atom/browser/api/atom_api_desktop_capturer.cc
-  our    100644 135b4edd11048a4635f9017f569f4b4ae644a09c atom/browser/api/atom_api_desktop_capturer.cc
-@@ -1,207 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/api/atom_api_desktop_capturer.h"
--
--#include <vector>
--
--using base::PlatformThreadRef;
--
--#include "atom/common/api/atom_api_native_image.h"
--#include "atom/common/native_mate_converters/gfx_converter.h"
--#include "base/strings/string_number_conversions.h"
--#include "base/strings/utf_string_conversions.h"
--#include "base/task_scheduler/post_task.h"
--#include "base/threading/thread_task_runner_handle.h"
--#include "chrome/browser/media/desktop_media_list.h"
--#include "content/public/browser/browser_thread.h"
--#include "content/public/browser/desktop_capture.h"
--#include "native_mate/dictionary.h"
--#include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h"
--#include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h"
--#if defined(OS_WIN)
--#include "third_party/webrtc/modules/desktop_capture/win/dxgi_duplicator_controller.h"
--#include "third_party/webrtc/modules/desktop_capture/win/screen_capturer_win_directx.h"
--#include "ui/display/win/display_info.h"
--#endif  // defined(OS_WIN)
--
--#include "atom/common/node_includes.h"
--
--namespace mate {
--
--template <>
--struct Converter<atom::api::DesktopCapturer::Source> {
--  static v8::Local<v8::Value> ToV8(
--      v8::Isolate* isolate,
--      const atom::api::DesktopCapturer::Source& source) {
--    mate::Dictionary dict(isolate, v8::Object::New(isolate));
--    content::DesktopMediaID id = source.media_list_source.id;
--    dict.Set("name", base::UTF16ToUTF8(source.media_list_source.name));
--    dict.Set("id", id.ToString());
--    dict.Set("thumbnail",
--             atom::api::NativeImage::Create(
--                 isolate, gfx::Image(source.media_list_source.thumbnail)));
--    dict.Set("display_id", source.display_id);
--    return ConvertToV8(isolate, dict);
--  }
--};
--
--}  // namespace mate
--
--namespace {
--
--void EmitFinished(
--    const std::vector<atom::api::DesktopCapturer::Source>& sources,
--    atom::api::DesktopCapturer* cap) {
--  cap->Emit("finished", sources);
--}
--
--void StartHandlingTask(bool capture_window,
--                       bool capture_screen,
--                       const gfx::Size& thumbnail_size,
--                       atom::api::DesktopCapturer* cap) {
--#if defined(OS_WIN)
--  if (content::desktop_capture::CreateDesktopCaptureOptions()
--      .allow_directx_capturer()) {
--    // DxgiDuplicatorController should be alive in this scope according to
--    // screen_capturer_win.cc.
--    auto duplicator = webrtc::DxgiDuplicatorController::Instance();
--    cap->using_directx_capturer_ =
--        webrtc::ScreenCapturerWinDirectx::IsSupported();
--  }
--#endif  // defined(OS_WIN)
--  std::unique_ptr<webrtc::DesktopCapturer> screen_capturer(
--      capture_screen ? content::desktop_capture::CreateScreenCapturer()
--                     : nullptr);
--  std::unique_ptr<webrtc::DesktopCapturer> window_capturer(
--      capture_window ? content::desktop_capture::CreateWindowCapturer()
--                     : nullptr);
--  cap->media_list_.reset(new NativeDesktopMediaList(
--      std::move(screen_capturer), std::move(window_capturer)));
--
--  cap->media_list_->SetThumbnailSize(thumbnail_size);
--  cap->media_list_->StartUpdating(cap);
--}
--
--void OnRefreshFinishedTask(atom::api::DesktopCapturer* cap) {
--  const auto media_list_sources = cap->media_list_->GetSources();
--  std::vector<atom::api::DesktopCapturer::Source> sources;
--  for (const auto& media_list_source : media_list_sources) {
--    sources.emplace_back(
--        atom::api::DesktopCapturer::Source{media_list_source, std::string()});
--  }
--
--#if defined(OS_WIN)
--  // Gather the same unique screen IDs used by the electron.screen API in order
--  // to provide an association between it and desktopCapturer/getUserMedia.
--  // This is only required when using the DirectX capturer, otherwise the IDs
--  // across the APIs already match.
--  if (cap->using_directx_capturer_) {
--    std::vector<std::string> device_names;
--    // Crucially, this list of device names will be in the same order as
--    // |media_list_sources|.
--    webrtc::DxgiDuplicatorController::Instance()->GetDeviceNames(&device_names);
--    int device_name_index = 0;
--    for (auto& source : sources) {
--      if (source.media_list_source.id.type ==
--          content::DesktopMediaID::TYPE_SCREEN) {
--        const auto& device_name = device_names[device_name_index++];
--        std::wstring wide_device_name;
--        base::UTF8ToWide(device_name.c_str(), device_name.size(),
--                         &wide_device_name);
--        const int64_t device_id =
--            display::win::DisplayInfo::DeviceIdFromDeviceName(
--                wide_device_name.c_str());
--        source.display_id = base::Int64ToString(device_id);
--      }
--    }
--  }
--#elif defined(OS_MACOSX)
--  // On Mac, the IDs across the APIs match.
--  for (auto& source : sources) {
--    if (source.media_list_source.id.type ==
--        content::DesktopMediaID::TYPE_SCREEN) {
--      source.display_id = base::Int64ToString(source.media_list_source.id.id);
--    }
--  }
--#endif  // defined(OS_WIN)
--  // TODO(ajmacd): Add Linux support. The IDs across APIs differ but Chrome only
--  // supports capturing the entire desktop on Linux. Revisit this if individual
--  // screen support is added.
--
--  content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE,
--                                   base::Bind(EmitFinished, sources, cap));
--}
--
--}  // namespace
--
--namespace atom {
--
--namespace api {
--
--DesktopCapturer::DesktopCapturer(v8::Isolate* isolate) {
--  Init(isolate);
--  capture_thread_ = base::CreateSequencedTaskRunnerWithTraits(
--      {base::WithBaseSyncPrimitives(), base::MayBlock(),
--       base::TaskPriority::USER_VISIBLE});
--}
--
--DesktopCapturer::~DesktopCapturer() {}
--
--void DesktopCapturer::StartHandling(bool capture_window,
--                                    bool capture_screen,
--                                    const gfx::Size& thumbnail_size) {
--  capture_thread_->PostTask(
--      FROM_HERE, base::BindOnce(StartHandlingTask, capture_window,
--                                capture_screen, thumbnail_size, this));
--}
--
--void DesktopCapturer::OnSourceAdded(int index) {}
--
--void DesktopCapturer::OnSourceRemoved(int index) {}
--
--void DesktopCapturer::OnSourceMoved(int old_index, int new_index) {}
--
--void DesktopCapturer::OnSourceNameChanged(int index) {}
--
--void DesktopCapturer::OnSourceThumbnailChanged(int index) {}
--
--bool DesktopCapturer::OnRefreshFinished() {
--  capture_thread_->PostTask(FROM_HERE,
--                            base::BindOnce(OnRefreshFinishedTask, this));
--  return false;
--}
--
--// static
--mate::Handle<DesktopCapturer> DesktopCapturer::Create(v8::Isolate* isolate) {
--  return mate::CreateHandle(isolate, new DesktopCapturer(isolate));
--}
--
--// static
--void DesktopCapturer::BuildPrototype(
--    v8::Isolate* isolate,
--    v8::Local<v8::FunctionTemplate> prototype) {
--  prototype->SetClassName(mate::StringToV8(isolate, "DesktopCapturer"));
--  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
--      .SetMethod("startHandling", &DesktopCapturer::StartHandling);
--}
--
--}  // namespace api
--
--}  // namespace atom
--
--namespace {
--
--void Initialize(v8::Local<v8::Object> exports,
--                v8::Local<v8::Value> unused,
--                v8::Local<v8::Context> context,
--                void* priv) {
--  v8::Isolate* isolate = context->GetIsolate();
--  mate::Dictionary dict(isolate, exports);
--  dict.Set("desktopCapturer", atom::api::DesktopCapturer::Create(isolate));
--}
--
--}  // namespace
--
--NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_desktop_capturer, Initialize);
-removed in remote
-  base   100644 c22c8a44835f66cb44a711ff5775b7274809ebe3 atom/browser/api/atom_api_desktop_capturer.h
-  our    100644 88960e46d49dd0b68c51647be18066a2d097ce79 atom/browser/api/atom_api_desktop_capturer.h
-@@ -1,64 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_API_ATOM_API_DESKTOP_CAPTURER_H_
--#define ATOM_BROWSER_API_ATOM_API_DESKTOP_CAPTURER_H_
--
--#include <string>
--
--#include "atom/browser/api/event_emitter.h"
--#include "chrome/browser/media/desktop_media_list_observer.h"
--#include "chrome/browser/media/native_desktop_media_list.h"
--#include "native_mate/handle.h"
--
--namespace atom {
--
--namespace api {
--
--class DesktopCapturer : public mate::EventEmitter<DesktopCapturer>,
--                        public DesktopMediaListObserver {
-- public:
--  struct Source {
--    DesktopMediaList::Source media_list_source;
--    // Will be an empty string if not available.
--    std::string display_id;
--  };
--
--  static mate::Handle<DesktopCapturer> Create(v8::Isolate* isolate);
--
--  static void BuildPrototype(v8::Isolate* isolate,
--                             v8::Local<v8::FunctionTemplate> prototype);
--
--  void StartHandling(bool capture_window,
--                     bool capture_screen,
--                     const gfx::Size& thumbnail_size);
--
--  std::unique_ptr<DesktopMediaList> media_list_;
--#if defined(OS_WIN)
--  bool using_directx_capturer_ = false;
--#endif  // defined(OS_WIN)
--
-- protected:
--  explicit DesktopCapturer(v8::Isolate* isolate);
--  ~DesktopCapturer() override;
--
--  // DesktopMediaListObserver overrides.
--  void OnSourceAdded(int index) override;
--  void OnSourceRemoved(int index) override;
--  void OnSourceMoved(int old_index, int new_index) override;
--  void OnSourceNameChanged(int index) override;
--  void OnSourceThumbnailChanged(int index) override;
--  bool OnRefreshFinished() override;
--
-- private:
--  scoped_refptr<base::SequencedTaskRunner> capture_thread_;
--
--  DISALLOW_COPY_AND_ASSIGN(DesktopCapturer);
--};
--
--}  // namespace api
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_API_ATOM_API_DESKTOP_CAPTURER_H_
-removed in remote
-  base   100644 0a544c56468cb67dce5793a15535a772bc2b17de atom/browser/api/atom_api_dialog.cc
-  our    100644 bdbaffbb5bd3889082a985189a3688ca1f91e66d atom/browser/api/atom_api_dialog.cc
-@@ -1,142 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include <string>
--#include <utility>
--#include <vector>
--
--#include "atom/browser/api/atom_api_browser_window.h"
--#include "atom/browser/native_window.h"
--#include "atom/browser/ui/certificate_trust.h"
--#include "atom/browser/ui/file_dialog.h"
--#include "atom/browser/ui/message_box.h"
--#include "atom/common/native_mate_converters/callback.h"
--#include "atom/common/native_mate_converters/file_path_converter.h"
--#include "atom/common/native_mate_converters/image_converter.h"
--#include "atom/common/native_mate_converters/net_converter.h"
--#include "native_mate/dictionary.h"
--
--#include "atom/common/node_includes.h"
--
--namespace mate {
--
--template <>
--struct Converter<file_dialog::Filter> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     file_dialog::Filter* out) {
--    mate::Dictionary dict;
--    if (!ConvertFromV8(isolate, val, &dict))
--      return false;
--    if (!dict.Get("name", &(out->first)))
--      return false;
--    if (!dict.Get("extensions", &(out->second)))
--      return false;
--    return true;
--  }
--};
--
--template <>
--struct Converter<file_dialog::DialogSettings> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     file_dialog::DialogSettings* out) {
--    mate::Dictionary dict;
--    if (!ConvertFromV8(isolate, val, &dict))
--      return false;
--    dict.Get("window", &(out->parent_window));
--    dict.Get("title", &(out->title));
--    dict.Get("message", &(out->message));
--    dict.Get("buttonLabel", &(out->button_label));
--    dict.Get("nameFieldLabel", &(out->name_field_label));
--    dict.Get("defaultPath", &(out->default_path));
--    dict.Get("filters", &(out->filters));
--    dict.Get("properties", &(out->properties));
--    dict.Get("showsTagField", &(out->shows_tag_field));
--#if defined(MAS_BUILD)
--    dict.Get("securityScopedBookmarks", &(out->security_scoped_bookmarks));
--#endif
--    return true;
--  }
--};
--
--}  // namespace mate
--
--namespace {
--
--void ShowMessageBox(int type,
--                    const std::vector<std::string>& buttons,
--                    int default_id,
--                    int cancel_id,
--                    int options,
--                    const std::string& title,
--                    const std::string& message,
--                    const std::string& detail,
--                    const std::string& checkbox_label,
--                    bool checkbox_checked,
--                    const gfx::ImageSkia& icon,
--                    atom::NativeWindow* window,
--                    mate::Arguments* args) {
--  v8::Local<v8::Value> peek = args->PeekNext();
--  atom::MessageBoxCallback callback;
--  if (mate::Converter<atom::MessageBoxCallback>::FromV8(args->isolate(), peek,
--                                                        &callback)) {
--    atom::ShowMessageBox(window, static_cast<atom::MessageBoxType>(type),
--                         buttons, default_id, cancel_id, options, title,
--                         message, detail, checkbox_label, checkbox_checked,
--                         icon, callback);
--  } else {
--    int chosen = atom::ShowMessageBox(
--        window, static_cast<atom::MessageBoxType>(type), buttons, default_id,
--        cancel_id, options, title, message, detail, icon);
--    args->Return(chosen);
--  }
--}
--
--void ShowOpenDialog(const file_dialog::DialogSettings& settings,
--                    mate::Arguments* args) {
--  v8::Local<v8::Value> peek = args->PeekNext();
--  file_dialog::OpenDialogCallback callback;
--  if (mate::Converter<file_dialog::OpenDialogCallback>::FromV8(
--          args->isolate(), peek, &callback)) {
--    file_dialog::ShowOpenDialog(settings, callback);
--  } else {
--    std::vector<base::FilePath> paths;
--    if (file_dialog::ShowOpenDialog(settings, &paths))
--      args->Return(paths);
--  }
--}
--
--void ShowSaveDialog(const file_dialog::DialogSettings& settings,
--                    mate::Arguments* args) {
--  v8::Local<v8::Value> peek = args->PeekNext();
--  file_dialog::SaveDialogCallback callback;
--  if (mate::Converter<file_dialog::SaveDialogCallback>::FromV8(
--          args->isolate(), peek, &callback)) {
--    file_dialog::ShowSaveDialog(settings, callback);
--  } else {
--    base::FilePath path;
--    if (file_dialog::ShowSaveDialog(settings, &path))
--      args->Return(path);
--  }
--}
--
--void Initialize(v8::Local<v8::Object> exports,
--                v8::Local<v8::Value> unused,
--                v8::Local<v8::Context> context,
--                void* priv) {
--  mate::Dictionary dict(context->GetIsolate(), exports);
--  dict.SetMethod("showMessageBox", &ShowMessageBox);
--  dict.SetMethod("showErrorBox", &atom::ShowErrorBox);
--  dict.SetMethod("showOpenDialog", &ShowOpenDialog);
--  dict.SetMethod("showSaveDialog", &ShowSaveDialog);
--#if defined(OS_MACOSX) || defined(OS_WIN)
--  dict.SetMethod("showCertificateTrustDialog",
--                 &certificate_trust::ShowCertificateTrust);
--#endif
--}
--
--}  // namespace
--
--NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_dialog, Initialize)
-removed in remote
-  base   100644 3edd5f9c25492f490dbda270295b17040d4c4e38 atom/browser/api/atom_api_download_item.cc
-  our    100644 4fa4d5517b4adbf5ee7e3f68489f53d3de9d5e12 atom/browser/api/atom_api_download_item.cc
-@@ -1,241 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/api/atom_api_download_item.h"
--
--#include <map>
--
--#include "atom/browser/atom_browser_main_parts.h"
--#include "atom/common/native_mate_converters/callback.h"
--#include "atom/common/native_mate_converters/file_path_converter.h"
--#include "atom/common/native_mate_converters/gurl_converter.h"
--#include "base/strings/utf_string_conversions.h"
--#include "base/threading/thread_task_runner_handle.h"
--#include "native_mate/dictionary.h"
--#include "net/base/filename_util.h"
--
--#include "atom/common/node_includes.h"
--
--namespace mate {
--
--template <>
--struct Converter<download::DownloadItem::DownloadState> {
--  static v8::Local<v8::Value> ToV8(
--      v8::Isolate* isolate,
--      download::DownloadItem::DownloadState state) {
--    std::string download_state;
--    switch (state) {
--      case download::DownloadItem::IN_PROGRESS:
--        download_state = "progressing";
--        break;
--      case download::DownloadItem::COMPLETE:
--        download_state = "completed";
--        break;
--      case download::DownloadItem::CANCELLED:
--        download_state = "cancelled";
--        break;
--      case download::DownloadItem::INTERRUPTED:
--        download_state = "interrupted";
--        break;
--      default:
--        break;
--    }
--    return ConvertToV8(isolate, download_state);
--  }
--};
--
--}  // namespace mate
--
--namespace atom {
--
--namespace api {
--
--namespace {
--
--std::map<uint32_t, v8::Global<v8::Object>> g_download_item_objects;
--
--}  // namespace
--
--DownloadItem::DownloadItem(v8::Isolate* isolate,
--                           download::DownloadItem* download_item)
--    : download_item_(download_item) {
--  download_item_->AddObserver(this);
--  Init(isolate);
--  AttachAsUserData(download_item);
--}
--
--DownloadItem::~DownloadItem() {
--  if (download_item_) {
--    // Destroyed by either garbage collection or destroy().
--    download_item_->RemoveObserver(this);
--    download_item_->Remove();
--  }
--
--  // Remove from the global map.
--  g_download_item_objects.erase(weak_map_id());
--}
--
--void DownloadItem::OnDownloadUpdated(download::DownloadItem* item) {
--  if (download_item_->IsDone()) {
--    Emit("done", item->GetState());
--    // Destroy the item once item is downloaded.
--    base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
--                                                  GetDestroyClosure());
--  } else {
--    Emit("updated", item->GetState());
--  }
--}
--
--void DownloadItem::OnDownloadDestroyed(download::DownloadItem* download_item) {
--  download_item_ = nullptr;
--  // Destroy the native class immediately when downloadItem is destroyed.
--  delete this;
--}
--
--void DownloadItem::Pause() {
--  download_item_->Pause();
--}
--
--bool DownloadItem::IsPaused() const {
--  return download_item_->IsPaused();
--}
--
--void DownloadItem::Resume() {
--  download_item_->Resume();
--}
--
--bool DownloadItem::CanResume() const {
--  return download_item_->CanResume();
--}
--
--void DownloadItem::Cancel() {
--  download_item_->Cancel(true);
--}
--
--int64_t DownloadItem::GetReceivedBytes() const {
--  return download_item_->GetReceivedBytes();
--}
--
--int64_t DownloadItem::GetTotalBytes() const {
--  return download_item_->GetTotalBytes();
--}
--
--std::string DownloadItem::GetMimeType() const {
--  return download_item_->GetMimeType();
--}
--
--bool DownloadItem::HasUserGesture() const {
--  return download_item_->HasUserGesture();
--}
--
--std::string DownloadItem::GetFilename() const {
--  return base::UTF16ToUTF8(
--      net::GenerateFileName(GetURL(), GetContentDisposition(), std::string(),
--                            download_item_->GetSuggestedFilename(),
--                            GetMimeType(), "download")
--          .LossyDisplayName());
--}
--
--std::string DownloadItem::GetContentDisposition() const {
--  return download_item_->GetContentDisposition();
--}
--
--const GURL& DownloadItem::GetURL() const {
--  return download_item_->GetURL();
--}
--
--const std::vector<GURL>& DownloadItem::GetURLChain() const {
--  return download_item_->GetUrlChain();
--}
--
--download::DownloadItem::DownloadState DownloadItem::GetState() const {
--  return download_item_->GetState();
--}
--
--bool DownloadItem::IsDone() const {
--  return download_item_->IsDone();
--}
--
--void DownloadItem::SetSavePath(const base::FilePath& path) {
--  save_path_ = path;
--}
--
--base::FilePath DownloadItem::GetSavePath() const {
--  return save_path_;
--}
--
--std::string DownloadItem::GetLastModifiedTime() const {
--  return download_item_->GetLastModifiedTime();
--}
--
--std::string DownloadItem::GetETag() const {
--  return download_item_->GetETag();
--}
--
--double DownloadItem::GetStartTime() const {
--  return download_item_->GetStartTime().ToDoubleT();
--}
--
--// static
--void DownloadItem::BuildPrototype(v8::Isolate* isolate,
--                                  v8::Local<v8::FunctionTemplate> prototype) {
--  prototype->SetClassName(mate::StringToV8(isolate, "DownloadItem"));
--  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
--      .MakeDestroyable()
--      .SetMethod("pause", &DownloadItem::Pause)
--      .SetMethod("isPaused", &DownloadItem::IsPaused)
--      .SetMethod("resume", &DownloadItem::Resume)
--      .SetMethod("canResume", &DownloadItem::CanResume)
--      .SetMethod("cancel", &DownloadItem::Cancel)
--      .SetMethod("getReceivedBytes", &DownloadItem::GetReceivedBytes)
--      .SetMethod("getTotalBytes", &DownloadItem::GetTotalBytes)
--      .SetMethod("getMimeType", &DownloadItem::GetMimeType)
--      .SetMethod("hasUserGesture", &DownloadItem::HasUserGesture)
--      .SetMethod("getFilename", &DownloadItem::GetFilename)
--      .SetMethod("getContentDisposition", &DownloadItem::GetContentDisposition)
--      .SetMethod("getURL", &DownloadItem::GetURL)
--      .SetMethod("getURLChain", &DownloadItem::GetURLChain)
--      .SetMethod("getState", &DownloadItem::GetState)
--      .SetMethod("isDone", &DownloadItem::IsDone)
--      .SetMethod("setSavePath", &DownloadItem::SetSavePath)
--      .SetMethod("getSavePath", &DownloadItem::GetSavePath)
--      .SetMethod("getLastModifiedTime", &DownloadItem::GetLastModifiedTime)
--      .SetMethod("getETag", &DownloadItem::GetETag)
--      .SetMethod("getStartTime", &DownloadItem::GetStartTime);
--}
--
--// static
--mate::Handle<DownloadItem> DownloadItem::Create(v8::Isolate* isolate,
--                                                download::DownloadItem* item) {
--  auto* existing = TrackableObject::FromWrappedClass(isolate, item);
--  if (existing)
--    return mate::CreateHandle(isolate, static_cast<DownloadItem*>(existing));
--
--  auto handle = mate::CreateHandle(isolate, new DownloadItem(isolate, item));
--
--  // Reference this object in case it got garbage collected.
--  g_download_item_objects[handle->weak_map_id()] =
--      v8::Global<v8::Object>(isolate, handle.ToV8());
--  return handle;
--}
--
--}  // namespace api
--
--}  // namespace atom
--
--namespace {
--
--void Initialize(v8::Local<v8::Object> exports,
--                v8::Local<v8::Value> unused,
--                v8::Local<v8::Context> context,
--                void* priv) {
--  v8::Isolate* isolate = context->GetIsolate();
--  mate::Dictionary(isolate, exports)
--      .Set("DownloadItem",
--           atom::api::DownloadItem::GetConstructor(isolate)->GetFunction());
--}
--
--}  // namespace
--
--NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_download_item, Initialize);
-removed in remote
-  base   100644 64469b9b34d1bd413ee7a4af3873da6a6f3e0132 atom/browser/api/atom_api_download_item.h
-  our    100644 45ed54faf1918f877b953db86b1dd250cbd80879 atom/browser/api/atom_api_download_item.h
-@@ -1,70 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_API_ATOM_API_DOWNLOAD_ITEM_H_
--#define ATOM_BROWSER_API_ATOM_API_DOWNLOAD_ITEM_H_
--
--#include <string>
--#include <vector>
--
--#include "atom/browser/api/trackable_object.h"
--#include "base/files/file_path.h"
--#include "components/download/public/common/download_item.h"
--#include "native_mate/handle.h"
--#include "url/gurl.h"
--
--namespace atom {
--
--namespace api {
--
--class DownloadItem : public mate::TrackableObject<DownloadItem>,
--                     public download::DownloadItem::Observer {
-- public:
--  static mate::Handle<DownloadItem> Create(v8::Isolate* isolate,
--                                           download::DownloadItem* item);
--
--  static void BuildPrototype(v8::Isolate* isolate,
--                             v8::Local<v8::FunctionTemplate> prototype);
--
--  void Pause();
--  bool IsPaused() const;
--  void Resume();
--  bool CanResume() const;
--  void Cancel();
--  int64_t GetReceivedBytes() const;
--  int64_t GetTotalBytes() const;
--  std::string GetMimeType() const;
--  bool HasUserGesture() const;
--  std::string GetFilename() const;
--  std::string GetContentDisposition() const;
--  const GURL& GetURL() const;
--  const std::vector<GURL>& GetURLChain() const;
--  download::DownloadItem::DownloadState GetState() const;
--  bool IsDone() const;
--  void SetSavePath(const base::FilePath& path);
--  base::FilePath GetSavePath() const;
--  std::string GetLastModifiedTime() const;
--  std::string GetETag() const;
--  double GetStartTime() const;
--
-- protected:
--  DownloadItem(v8::Isolate* isolate, download::DownloadItem* download_item);
--  ~DownloadItem() override;
--
--  // Override download::DownloadItem::Observer methods
--  void OnDownloadUpdated(download::DownloadItem* download) override;
--  void OnDownloadDestroyed(download::DownloadItem* download) override;
--
-- private:
--  base::FilePath save_path_;
--  download::DownloadItem* download_item_;
--
--  DISALLOW_COPY_AND_ASSIGN(DownloadItem);
--};
--
--}  // namespace api
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_API_ATOM_API_DOWNLOAD_ITEM_H_
-removed in remote
-  base   100644 f5a03e4abf9010c3bd371e0778ab684d2dd2418e atom/browser/api/atom_api_global_shortcut.cc
-  our    100644 4fc7532d9e346ee9d2c02cfac450042073897b99 atom/browser/api/atom_api_global_shortcut.cc
-@@ -1,103 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/api/atom_api_global_shortcut.h"
--
--#include <string>
--
--#include "atom/common/native_mate_converters/accelerator_converter.h"
--#include "atom/common/native_mate_converters/callback.h"
--#include "base/stl_util.h"
--#include "native_mate/dictionary.h"
--
--#include "atom/common/node_includes.h"
--
--using extensions::GlobalShortcutListener;
--
--namespace atom {
--
--namespace api {
--
--GlobalShortcut::GlobalShortcut(v8::Isolate* isolate) {
--  Init(isolate);
--}
--
--GlobalShortcut::~GlobalShortcut() {
--  UnregisterAll();
--}
--
--void GlobalShortcut::OnKeyPressed(const ui::Accelerator& accelerator) {
--  if (accelerator_callback_map_.find(accelerator) ==
--      accelerator_callback_map_.end()) {
--    // This should never occur, because if it does, GlobalGlobalShortcutListener
--    // notifes us with wrong accelerator.
--    NOTREACHED();
--    return;
--  }
--  accelerator_callback_map_[accelerator].Run();
--}
--
--bool GlobalShortcut::Register(const ui::Accelerator& accelerator,
--                              const base::Closure& callback) {
--  if (!GlobalShortcutListener::GetInstance()->RegisterAccelerator(accelerator,
--                                                                  this)) {
--    return false;
--  }
--
--  accelerator_callback_map_[accelerator] = callback;
--  return true;
--}
--
--void GlobalShortcut::Unregister(const ui::Accelerator& accelerator) {
--  if (!ContainsKey(accelerator_callback_map_, accelerator))
--    return;
--
--  accelerator_callback_map_.erase(accelerator);
--  GlobalShortcutListener::GetInstance()->UnregisterAccelerator(accelerator,
--                                                               this);
--}
--
--bool GlobalShortcut::IsRegistered(const ui::Accelerator& accelerator) {
--  return ContainsKey(accelerator_callback_map_, accelerator);
--}
--
--void GlobalShortcut::UnregisterAll() {
--  accelerator_callback_map_.clear();
--  GlobalShortcutListener::GetInstance()->UnregisterAccelerators(this);
--}
--
--// static
--mate::Handle<GlobalShortcut> GlobalShortcut::Create(v8::Isolate* isolate) {
--  return mate::CreateHandle(isolate, new GlobalShortcut(isolate));
--}
--
--// static
--void GlobalShortcut::BuildPrototype(v8::Isolate* isolate,
--                                    v8::Local<v8::FunctionTemplate> prototype) {
--  prototype->SetClassName(mate::StringToV8(isolate, "GlobalShortcut"));
--  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
--      .SetMethod("register", &GlobalShortcut::Register)
--      .SetMethod("isRegistered", &GlobalShortcut::IsRegistered)
--      .SetMethod("unregister", &GlobalShortcut::Unregister)
--      .SetMethod("unregisterAll", &GlobalShortcut::UnregisterAll);
--}
--
--}  // namespace api
--
--}  // namespace atom
--
--namespace {
--
--void Initialize(v8::Local<v8::Object> exports,
--                v8::Local<v8::Value> unused,
--                v8::Local<v8::Context> context,
--                void* priv) {
--  v8::Isolate* isolate = context->GetIsolate();
--  mate::Dictionary dict(isolate, exports);
--  dict.Set("globalShortcut", atom::api::GlobalShortcut::Create(isolate));
--}
--
--}  // namespace
--
--NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_global_shortcut, Initialize)
-removed in remote
-  base   100644 d7057b0003208a1915d4912827dc7595722e258e atom/browser/api/atom_api_global_shortcut.h
-  our    100644 b023aec4a8436b83152c812c9ec1d3af478cda80 atom/browser/api/atom_api_global_shortcut.h
-@@ -1,54 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_API_ATOM_API_GLOBAL_SHORTCUT_H_
--#define ATOM_BROWSER_API_ATOM_API_GLOBAL_SHORTCUT_H_
--
--#include <map>
--#include <string>
--
--#include "atom/browser/api/trackable_object.h"
--#include "base/callback.h"
--#include "chrome/browser/extensions/global_shortcut_listener.h"
--#include "native_mate/handle.h"
--#include "ui/base/accelerators/accelerator.h"
--
--namespace atom {
--
--namespace api {
--
--class GlobalShortcut : public extensions::GlobalShortcutListener::Observer,
--                       public mate::TrackableObject<GlobalShortcut> {
-- public:
--  static mate::Handle<GlobalShortcut> Create(v8::Isolate* isolate);
--
--  static void BuildPrototype(v8::Isolate* isolate,
--                             v8::Local<v8::FunctionTemplate> prototype);
--
-- protected:
--  explicit GlobalShortcut(v8::Isolate* isolate);
--  ~GlobalShortcut() override;
--
-- private:
--  typedef std::map<ui::Accelerator, base::Closure> AcceleratorCallbackMap;
--
--  bool Register(const ui::Accelerator& accelerator,
--                const base::Closure& callback);
--  bool IsRegistered(const ui::Accelerator& accelerator);
--  void Unregister(const ui::Accelerator& accelerator);
--  void UnregisterAll();
--
--  // GlobalShortcutListener::Observer implementation.
--  void OnKeyPressed(const ui::Accelerator& accelerator) override;
--
--  AcceleratorCallbackMap accelerator_callback_map_;
--
--  DISALLOW_COPY_AND_ASSIGN(GlobalShortcut);
--};
--
--}  // namespace api
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_API_ATOM_API_GLOBAL_SHORTCUT_H_
-removed in remote
-  base   100644 e40ba17f464fe562f644d0cf2222c63281b5d48e atom/browser/api/atom_api_menu.cc
-  our    100644 1c4f4fcf41e55be7d355d8940d14f3e9cb1c2b28 atom/browser/api/atom_api_menu.cc
-@@ -1,231 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/api/atom_api_menu.h"
--
--#include "atom/browser/native_window.h"
--#include "atom/common/native_mate_converters/accelerator_converter.h"
--#include "atom/common/native_mate_converters/callback.h"
--#include "atom/common/native_mate_converters/image_converter.h"
--#include "atom/common/native_mate_converters/string16_converter.h"
--#include "native_mate/constructor.h"
--#include "native_mate/dictionary.h"
--#include "native_mate/object_template_builder.h"
--
--#include "atom/common/node_includes.h"
--
--namespace atom {
--
--namespace api {
--
--Menu::Menu(v8::Isolate* isolate, v8::Local<v8::Object> wrapper)
--    : model_(new AtomMenuModel(this)) {
--  InitWith(isolate, wrapper);
--  model_->AddObserver(this);
--}
--
--Menu::~Menu() {
--  if (model_) {
--    model_->RemoveObserver(this);
--  }
--}
--
--void Menu::AfterInit(v8::Isolate* isolate) {
--  mate::Dictionary wrappable(isolate, GetWrapper());
--  mate::Dictionary delegate;
--  if (!wrappable.Get("delegate", &delegate))
--    return;
--
--  delegate.Get("isCommandIdChecked", &is_checked_);
--  delegate.Get("isCommandIdEnabled", &is_enabled_);
--  delegate.Get("isCommandIdVisible", &is_visible_);
--  delegate.Get("getAcceleratorForCommandId", &get_accelerator_);
--  delegate.Get("executeCommand", &execute_command_);
--  delegate.Get("menuWillShow", &menu_will_show_);
--}
--
--bool Menu::IsCommandIdChecked(int command_id) const {
--  v8::Locker locker(isolate());
--  v8::HandleScope handle_scope(isolate());
--  return is_checked_.Run(GetWrapper(), command_id);
--}
--
--bool Menu::IsCommandIdEnabled(int command_id) const {
--  v8::Locker locker(isolate());
--  v8::HandleScope handle_scope(isolate());
--  return is_enabled_.Run(GetWrapper(), command_id);
--}
--
--bool Menu::IsCommandIdVisible(int command_id) const {
--  v8::Locker locker(isolate());
--  v8::HandleScope handle_scope(isolate());
--  return is_visible_.Run(GetWrapper(), command_id);
--}
--
--bool Menu::GetAcceleratorForCommandIdWithParams(
--    int command_id,
--    bool use_default_accelerator,
--    ui::Accelerator* accelerator) const {
--  v8::Locker locker(isolate());
--  v8::HandleScope handle_scope(isolate());
--  v8::Local<v8::Value> val =
--      get_accelerator_.Run(GetWrapper(), command_id, use_default_accelerator);
--  return mate::ConvertFromV8(isolate(), val, accelerator);
--}
--
--void Menu::ExecuteCommand(int command_id, int flags) {
--  v8::Locker locker(isolate());
--  v8::HandleScope handle_scope(isolate());
--  execute_command_.Run(GetWrapper(),
--                       mate::internal::CreateEventFromFlags(isolate(), flags),
--                       command_id);
--}
--
--void Menu::MenuWillShow(ui::SimpleMenuModel* source) {
--  v8::Locker locker(isolate());
--  v8::HandleScope handle_scope(isolate());
--  menu_will_show_.Run(GetWrapper());
--}
--
--void Menu::InsertItemAt(int index,
--                        int command_id,
--                        const base::string16& label) {
--  model_->InsertItemAt(index, command_id, label);
--}
--
--void Menu::InsertSeparatorAt(int index) {
--  model_->InsertSeparatorAt(index, ui::NORMAL_SEPARATOR);
--}
--
--void Menu::InsertCheckItemAt(int index,
--                             int command_id,
--                             const base::string16& label) {
--  model_->InsertCheckItemAt(index, command_id, label);
--}
--
--void Menu::InsertRadioItemAt(int index,
--                             int command_id,
--                             const base::string16& label,
--                             int group_id) {
--  model_->InsertRadioItemAt(index, command_id, label, group_id);
--}
--
--void Menu::InsertSubMenuAt(int index,
--                           int command_id,
--                           const base::string16& label,
--                           Menu* menu) {
--  menu->parent_ = this;
--  model_->InsertSubMenuAt(index, command_id, label, menu->model_.get());
--}
--
--void Menu::SetIcon(int index, const gfx::Image& image) {
--  model_->SetIcon(index, image);
--}
--
--void Menu::SetSublabel(int index, const base::string16& sublabel) {
--  model_->SetSublabel(index, sublabel);
--}
--
--void Menu::SetRole(int index, const base::string16& role) {
--  model_->SetRole(index, role);
--}
--
--void Menu::Clear() {
--  model_->Clear();
--}
--
--int Menu::GetIndexOfCommandId(int command_id) {
--  return model_->GetIndexOfCommandId(command_id);
--}
--
--int Menu::GetItemCount() const {
--  return model_->GetItemCount();
--}
--
--int Menu::GetCommandIdAt(int index) const {
--  return model_->GetCommandIdAt(index);
--}
--
--base::string16 Menu::GetLabelAt(int index) const {
--  return model_->GetLabelAt(index);
--}
--
--base::string16 Menu::GetSublabelAt(int index) const {
--  return model_->GetSublabelAt(index);
--}
--
--bool Menu::IsItemCheckedAt(int index) const {
--  return model_->IsItemCheckedAt(index);
--}
--
--bool Menu::IsEnabledAt(int index) const {
--  return model_->IsEnabledAt(index);
--}
--
--bool Menu::IsVisibleAt(int index) const {
--  return model_->IsVisibleAt(index);
--}
--
--void Menu::OnMenuWillClose() {
--  Emit("menu-will-close");
--}
--
--void Menu::OnMenuWillShow() {
--  Emit("menu-will-show");
--}
--
--// static
--void Menu::BuildPrototype(v8::Isolate* isolate,
--                          v8::Local<v8::FunctionTemplate> prototype) {
--  prototype->SetClassName(mate::StringToV8(isolate, "Menu"));
--  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
--      .MakeDestroyable()
--      .SetMethod("insertItem", &Menu::InsertItemAt)
--      .SetMethod("insertCheckItem", &Menu::InsertCheckItemAt)
--      .SetMethod("insertRadioItem", &Menu::InsertRadioItemAt)
--      .SetMethod("insertSeparator", &Menu::InsertSeparatorAt)
--      .SetMethod("insertSubMenu", &Menu::InsertSubMenuAt)
--      .SetMethod("setIcon", &Menu::SetIcon)
--      .SetMethod("setSublabel", &Menu::SetSublabel)
--      .SetMethod("setRole", &Menu::SetRole)
--      .SetMethod("clear", &Menu::Clear)
--      .SetMethod("getIndexOfCommandId", &Menu::GetIndexOfCommandId)
--      .SetMethod("getItemCount", &Menu::GetItemCount)
--      .SetMethod("getCommandIdAt", &Menu::GetCommandIdAt)
--      .SetMethod("getLabelAt", &Menu::GetLabelAt)
--      .SetMethod("getSublabelAt", &Menu::GetSublabelAt)
--      .SetMethod("isItemCheckedAt", &Menu::IsItemCheckedAt)
--      .SetMethod("isEnabledAt", &Menu::IsEnabledAt)
--      .SetMethod("isVisibleAt", &Menu::IsVisibleAt)
--      .SetMethod("popupAt", &Menu::PopupAt)
--      .SetMethod("closePopupAt", &Menu::ClosePopupAt);
--}
--
--}  // namespace api
--
--}  // namespace atom
--
--namespace {
--
--using atom::api::Menu;
--
--void Initialize(v8::Local<v8::Object> exports,
--                v8::Local<v8::Value> unused,
--                v8::Local<v8::Context> context,
--                void* priv) {
--  v8::Isolate* isolate = context->GetIsolate();
--  Menu::SetConstructor(isolate, base::Bind(&Menu::New));
--
--  mate::Dictionary dict(isolate, exports);
--  dict.Set("Menu", Menu::GetConstructor(isolate)->GetFunction());
--#if defined(OS_MACOSX)
--  dict.SetMethod("setApplicationMenu", &Menu::SetApplicationMenu);
--  dict.SetMethod("sendActionToFirstResponder",
--                 &Menu::SendActionToFirstResponder);
--#endif
--}
--
--}  // namespace
--
--NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_menu, Initialize)
-removed in remote
-  base   100644 1ae708863a732c55d9a6fc56c70bcd691350a921 atom/browser/api/atom_api_menu.h
-  our    100644 26f2b679b6b7fc561e7f6e454afb2c40f475ee94 atom/browser/api/atom_api_menu.h
-@@ -1,138 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_API_ATOM_API_MENU_H_
--#define ATOM_BROWSER_API_ATOM_API_MENU_H_
--
--#include <memory>
--#include <string>
--
--#include "atom/browser/api/atom_api_top_level_window.h"
--#include "atom/browser/api/trackable_object.h"
--#include "atom/browser/ui/atom_menu_model.h"
--#include "base/callback.h"
--
--namespace atom {
--
--namespace api {
--
--class Menu : public mate::TrackableObject<Menu>,
--             public AtomMenuModel::Delegate,
--             public AtomMenuModel::Observer {
-- public:
--  static mate::WrappableBase* New(mate::Arguments* args);
--
--  static void BuildPrototype(v8::Isolate* isolate,
--                             v8::Local<v8::FunctionTemplate> prototype);
--
--#if defined(OS_MACOSX)
--  // Set the global menubar.
--  static void SetApplicationMenu(Menu* menu);
--
--  // Fake sending an action from the application menu.
--  static void SendActionToFirstResponder(const std::string& action);
--#endif
--
--  AtomMenuModel* model() const { return model_.get(); }
--
-- protected:
--  Menu(v8::Isolate* isolate, v8::Local<v8::Object> wrapper);
--  ~Menu() override;
--
--  // mate::Wrappable:
--  void AfterInit(v8::Isolate* isolate) override;
--
--  // ui::SimpleMenuModel::Delegate:
--  bool IsCommandIdChecked(int command_id) const override;
--  bool IsCommandIdEnabled(int command_id) const override;
--  bool IsCommandIdVisible(int command_id) const override;
--  bool GetAcceleratorForCommandIdWithParams(
--      int command_id,
--      bool use_default_accelerator,
--      ui::Accelerator* accelerator) const override;
--  void ExecuteCommand(int command_id, int event_flags) override;
--  void MenuWillShow(ui::SimpleMenuModel* source) override;
--
--  virtual void PopupAt(TopLevelWindow* window,
--                       int x,
--                       int y,
--                       int positioning_item,
--                       const base::Closure& callback) = 0;
--  virtual void ClosePopupAt(int32_t window_id) = 0;
--
--  std::unique_ptr<AtomMenuModel> model_;
--  Menu* parent_ = nullptr;
--
--  // Observable:
--  void OnMenuWillClose() override;
--  void OnMenuWillShow() override;
--
-- private:
--  void InsertItemAt(int index, int command_id, const base::string16& label);
--  void InsertSeparatorAt(int index);
--  void InsertCheckItemAt(int index,
--                         int command_id,
--                         const base::string16& label);
--  void InsertRadioItemAt(int index,
--                         int command_id,
--                         const base::string16& label,
--                         int group_id);
--  void InsertSubMenuAt(int index,
--                       int command_id,
--                       const base::string16& label,
--                       Menu* menu);
--  void SetIcon(int index, const gfx::Image& image);
--  void SetSublabel(int index, const base::string16& sublabel);
--  void SetRole(int index, const base::string16& role);
--  void Clear();
--  int GetIndexOfCommandId(int command_id);
--  int GetItemCount() const;
--  int GetCommandIdAt(int index) const;
--  base::string16 GetLabelAt(int index) const;
--  base::string16 GetSublabelAt(int index) const;
--  bool IsItemCheckedAt(int index) const;
--  bool IsEnabledAt(int index) const;
--  bool IsVisibleAt(int index) const;
--
--  // Stored delegate methods.
--  base::Callback<bool(v8::Local<v8::Value>, int)> is_checked_;
--  base::Callback<bool(v8::Local<v8::Value>, int)> is_enabled_;
--  base::Callback<bool(v8::Local<v8::Value>, int)> is_visible_;
--  base::Callback<v8::Local<v8::Value>(v8::Local<v8::Value>, int, bool)>
--      get_accelerator_;
--  base::Callback<void(v8::Local<v8::Value>, v8::Local<v8::Value>, int)>
--      execute_command_;
--  base::Callback<void(v8::Local<v8::Value>)> menu_will_show_;
--
--  DISALLOW_COPY_AND_ASSIGN(Menu);
--};
--
--}  // namespace api
--
--}  // namespace atom
--
--namespace mate {
--
--template <>
--struct Converter<atom::AtomMenuModel*> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     atom::AtomMenuModel** out) {
--    // null would be tranfered to NULL.
--    if (val->IsNull()) {
--      *out = nullptr;
--      return true;
--    }
--
--    atom::api::Menu* menu;
--    if (!Converter<atom::api::Menu*>::FromV8(isolate, val, &menu))
--      return false;
--    *out = menu->model();
--    return true;
--  }
--};
--
--}  // namespace mate
--
--#endif  // ATOM_BROWSER_API_ATOM_API_MENU_H_
-removed in remote
-  base   100644 85227fa2a9d9fe74c2b8f0cc0255e95fbbc47bf8 atom/browser/api/atom_api_menu_mac.h
-  our    100644 6ba895676c54d6f05f819ddd084a1d2400e054ea atom/browser/api/atom_api_menu_mac.h
-@@ -1,58 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_API_ATOM_API_MENU_MAC_H_
--#define ATOM_BROWSER_API_ATOM_API_MENU_MAC_H_
--
--#include "atom/browser/api/atom_api_menu.h"
--
--#include <map>
--#include <string>
--
--#import "atom/browser/ui/cocoa/atom_menu_controller.h"
--
--using base::scoped_nsobject;
--
--namespace atom {
--
--namespace api {
--
--class MenuMac : public Menu {
-- protected:
--  MenuMac(v8::Isolate* isolate, v8::Local<v8::Object> wrapper);
--  ~MenuMac() override;
--
--  void PopupAt(TopLevelWindow* window,
--               int x,
--               int y,
--               int positioning_item,
--               const base::Closure& callback) override;
--  void PopupOnUI(const base::WeakPtr<NativeWindow>& native_window,
--                 int32_t window_id,
--                 int x,
--                 int y,
--                 int positioning_item,
--                 base::Closure callback);
--  void ClosePopupAt(int32_t window_id) override;
--
-- private:
--  friend class Menu;
--
--  void OnClosed(int32_t window_id, base::Closure callback);
--
--  scoped_nsobject<AtomMenuController> menu_controller_;
--
--  // window ID -> open context menu
--  std::map<int32_t, scoped_nsobject<AtomMenuController>> popup_controllers_;
--
--  base::WeakPtrFactory<MenuMac> weak_factory_;
--
--  DISALLOW_COPY_AND_ASSIGN(MenuMac);
--};
--
--}  // namespace api
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_API_ATOM_API_MENU_MAC_H_
-removed in remote
-  base   100644 71c677b0476e642eeb98122304318fd0e553d83b atom/browser/api/atom_api_menu_mac.mm
-  our    100644 2b63b8a6cefe6265d96399dc6b70ab3ffdc352c3 atom/browser/api/atom_api_menu_mac.mm
-@@ -1,171 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#import "atom/browser/api/atom_api_menu_mac.h"
--
--#include "atom/browser/native_window.h"
--#include "atom/browser/unresponsive_suppressor.h"
--#include "base/mac/scoped_sending_event.h"
--#include "base/message_loop/message_loop.h"
--#include "base/strings/sys_string_conversions.h"
--#include "content/public/browser/browser_thread.h"
--#include "content/public/browser/web_contents.h"
--
--#include "atom/common/node_includes.h"
--
--using content::BrowserThread;
--
--namespace {
--
--static scoped_nsobject<NSMenu> applicationMenu_;
--
--}  // namespace
--
--namespace atom {
--
--namespace api {
--
--MenuMac::MenuMac(v8::Isolate* isolate, v8::Local<v8::Object> wrapper)
--    : Menu(isolate, wrapper), weak_factory_(this) {}
--
--MenuMac::~MenuMac() = default;
--
--void MenuMac::PopupAt(TopLevelWindow* window,
--                      int x,
--                      int y,
--                      int positioning_item,
--                      const base::Closure& callback) {
--  NativeWindow* native_window = window->window();
--  if (!native_window)
--    return;
--
--  auto popup = base::Bind(&MenuMac::PopupOnUI, weak_factory_.GetWeakPtr(),
--                          native_window->GetWeakPtr(), window->weak_map_id(), x,
--                          y, positioning_item, callback);
--  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, popup);
--}
--
--void MenuMac::PopupOnUI(const base::WeakPtr<NativeWindow>& native_window,
--                        int32_t window_id,
--                        int x,
--                        int y,
--                        int positioning_item,
--                        base::Closure callback) {
--  if (!native_window)
--    return;
--  NSWindow* nswindow = native_window->GetNativeWindow();
--
--  auto close_callback = base::Bind(
--      &MenuMac::OnClosed, weak_factory_.GetWeakPtr(), window_id, callback);
--  popup_controllers_[window_id] = base::scoped_nsobject<AtomMenuController>([
--      [AtomMenuController alloc] initWithModel:model()
--                         useDefaultAccelerator:NO]);
--  NSMenu* menu = [popup_controllers_[window_id] menu];
--  NSView* view = [nswindow contentView];
--
--  // Which menu item to show.
--  NSMenuItem* item = nil;
--  if (positioning_item < [menu numberOfItems] && positioning_item >= 0)
--    item = [menu itemAtIndex:positioning_item];
--
--  // (-1, -1) means showing on mouse location.
--  NSPoint position;
--  if (x == -1 || y == -1) {
--    position = [view convertPoint:[nswindow mouseLocationOutsideOfEventStream]
--                         fromView:nil];
--  } else {
--    position = NSMakePoint(x, [view frame].size.height - y);
--  }
--
--  // If no preferred item is specified, try to show all of the menu items.
--  if (!positioning_item) {
--    CGFloat windowBottom = CGRectGetMinY([view window].frame);
--    CGFloat lowestMenuPoint = windowBottom + position.y - [menu size].height;
--    CGFloat screenBottom = CGRectGetMinY([view window].screen.frame);
--    CGFloat distanceFromBottom = lowestMenuPoint - screenBottom;
--    if (distanceFromBottom < 0)
--      position.y = position.y - distanceFromBottom + 4;
--  }
--
--  // Place the menu left of cursor if it is overflowing off right of screen.
--  CGFloat windowLeft = CGRectGetMinX([view window].frame);
--  CGFloat rightmostMenuPoint = windowLeft + position.x + [menu size].width;
--  CGFloat screenRight = CGRectGetMaxX([view window].screen.frame);
--  if (rightmostMenuPoint > screenRight)
--    position.x = position.x - [menu size].width;
--
--  [popup_controllers_[window_id] setCloseCallback:close_callback];
--  // Make sure events can be pumped while the menu is up.
--  base::MessageLoop::ScopedNestableTaskAllower allow(
--      base::MessageLoop::current());
--
--  // One of the events that could be pumped is |window.close()|.
--  // User-initiated event-tracking loops protect against this by
--  // setting flags in -[CrApplication sendEvent:], but since
--  // web-content menus are initiated by IPC message the setup has to
--  // be done manually.
--  base::mac::ScopedSendingEvent sendingEventScoper;
--
--  // Don't emit unresponsive event when showing menu.
--  atom::UnresponsiveSuppressor suppressor;
--  [menu popUpMenuPositioningItem:item atLocation:position inView:view];
--}
--
--void MenuMac::ClosePopupAt(int32_t window_id) {
--  auto controller = popup_controllers_.find(window_id);
--  if (controller != popup_controllers_.end()) {
--    // Close the controller for the window.
--    [controller->second cancel];
--  } else if (window_id == -1) {
--    // Or just close all opened controllers.
--    for (auto it = popup_controllers_.begin();
--         it != popup_controllers_.end();) {
--      // The iterator is invalidated after the call.
--      [(it++)->second cancel];
--    }
--  }
--}
--
--void MenuMac::OnClosed(int32_t window_id, base::Closure callback) {
--  popup_controllers_.erase(window_id);
--  callback.Run();
--}
--
--// static
--void Menu::SetApplicationMenu(Menu* base_menu) {
--  MenuMac* menu = static_cast<MenuMac*>(base_menu);
--  base::scoped_nsobject<AtomMenuController> menu_controller([
--      [AtomMenuController alloc] initWithModel:menu->model_.get()
--                         useDefaultAccelerator:YES]);
--
--  NSRunLoop* currentRunLoop = [NSRunLoop currentRunLoop];
--  [currentRunLoop cancelPerformSelector:@selector(setMainMenu:)
--                                 target:NSApp
--                               argument:applicationMenu_];
--  applicationMenu_.reset([[menu_controller menu] retain]);
--  [[NSRunLoop currentRunLoop]
--      performSelector:@selector(setMainMenu:)
--               target:NSApp
--             argument:applicationMenu_
--                order:0
--                modes:[NSArray arrayWithObject:NSDefaultRunLoopMode]];
--
--  // Ensure the menu_controller_ is destroyed after main menu is set.
--  menu_controller.swap(menu->menu_controller_);
--}
--
--// static
--void Menu::SendActionToFirstResponder(const std::string& action) {
--  SEL selector = NSSelectorFromString(base::SysUTF8ToNSString(action));
--  [NSApp sendAction:selector to:nil from:[NSApp mainMenu]];
--}
--
--// static
--mate::WrappableBase* Menu::New(mate::Arguments* args) {
--  return new MenuMac(args->isolate(), args->GetThis());
--}
--
--}  // namespace api
--
--}  // namespace atom
-removed in remote
-  base   100644 4a3a97dd906e6f2fb1ad27df2cdc7d79d53e2e46 atom/browser/api/atom_api_menu_views.cc
-  our    100644 3da7dc2842fa4561e037aa67f290d0cc6ca71014 atom/browser/api/atom_api_menu_views.cc
-@@ -1,82 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/api/atom_api_menu_views.h"
--
--#include "atom/browser/native_window_views.h"
--#include "atom/browser/unresponsive_suppressor.h"
--#include "ui/display/screen.h"
--
--using views::MenuRunner;
--
--namespace atom {
--
--namespace api {
--
--MenuViews::MenuViews(v8::Isolate* isolate, v8::Local<v8::Object> wrapper)
--    : Menu(isolate, wrapper), weak_factory_(this) {}
--
--MenuViews::~MenuViews() = default;
--
--void MenuViews::PopupAt(TopLevelWindow* window,
--                        int x,
--                        int y,
--                        int positioning_item,
--                        const base::Closure& callback) {
--  auto* native_window = static_cast<NativeWindowViews*>(window->window());
--  if (!native_window)
--    return;
--
--  // (-1, -1) means showing on mouse location.
--  gfx::Point location;
--  if (x == -1 || y == -1) {
--    location = display::Screen::GetScreen()->GetCursorScreenPoint();
--  } else {
--    gfx::Point origin = native_window->GetContentBounds().origin();
--    location = gfx::Point(origin.x() + x, origin.y() + y);
--  }
--
--  int flags = MenuRunner::CONTEXT_MENU | MenuRunner::HAS_MNEMONICS;
--
--  // Don't emit unresponsive event when showing menu.
--  atom::UnresponsiveSuppressor suppressor;
--
--  // Show the menu.
--  int32_t window_id = window->weak_map_id();
--  auto close_callback = base::Bind(
--      &MenuViews::OnClosed, weak_factory_.GetWeakPtr(), window_id, callback);
--  menu_runners_[window_id] =
--      std::make_unique<MenuRunner>(model(), flags, close_callback);
--  menu_runners_[window_id]->RunMenuAt(
--      native_window->widget(), NULL, gfx::Rect(location, gfx::Size()),
--      views::MENU_ANCHOR_TOPLEFT, ui::MENU_SOURCE_MOUSE);
--}
--
--void MenuViews::ClosePopupAt(int32_t window_id) {
--  auto runner = menu_runners_.find(window_id);
--  if (runner != menu_runners_.end()) {
--    // Close the runner for the window.
--    runner->second->Cancel();
--  } else if (window_id == -1) {
--    // Or just close all opened runners.
--    for (auto it = menu_runners_.begin(); it != menu_runners_.end();) {
--      // The iterator is invalidated after the call.
--      (it++)->second->Cancel();
--    }
--  }
--}
--
--void MenuViews::OnClosed(int32_t window_id, base::Closure callback) {
--  menu_runners_.erase(window_id);
--  callback.Run();
--}
--
--// static
--mate::WrappableBase* Menu::New(mate::Arguments* args) {
--  return new MenuViews(args->isolate(), args->GetThis());
--}
--
--}  // namespace api
--
--}  // namespace atom
-removed in remote
-  base   100644 e4d17c77ca6555dd9e1cd34763e53999485e432f atom/browser/api/atom_api_menu_views.h
-  our    100644 0a34c19cef31db7fb0d6e05a3ff0cb8d31fc31da atom/browser/api/atom_api_menu_views.h
-@@ -1,47 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_API_ATOM_API_MENU_VIEWS_H_
--#define ATOM_BROWSER_API_ATOM_API_MENU_VIEWS_H_
--
--#include <map>
--
--#include "atom/browser/api/atom_api_menu.h"
--#include "base/memory/weak_ptr.h"
--#include "ui/display/screen.h"
--#include "ui/views/controls/menu/menu_runner.h"
--
--namespace atom {
--
--namespace api {
--
--class MenuViews : public Menu {
-- public:
--  MenuViews(v8::Isolate* isolate, v8::Local<v8::Object> wrapper);
--  ~MenuViews() override;
--
-- protected:
--  void PopupAt(TopLevelWindow* window,
--               int x,
--               int y,
--               int positioning_item,
--               const base::Closure& callback) override;
--  void ClosePopupAt(int32_t window_id) override;
--
-- private:
--  void OnClosed(int32_t window_id, base::Closure callback);
--
--  // window ID -> open context menu
--  std::map<int32_t, std::unique_ptr<views::MenuRunner>> menu_runners_;
--
--  base::WeakPtrFactory<MenuViews> weak_factory_;
--
--  DISALLOW_COPY_AND_ASSIGN(MenuViews);
--};
--
--}  // namespace api
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_API_ATOM_API_MENU_VIEWS_H_
-removed in remote
-  base   100644 31b35e10cea8ae631406aa28e98937694b9739f7 atom/browser/api/atom_api_power_monitor.cc
-  our    100644 8145a09501fc5ac24b7fe66985c1b892d5806772 atom/browser/api/atom_api_power_monitor.cc
-@@ -1,150 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/api/atom_api_power_monitor.h"
--
--#include "atom/browser/browser.h"
--#include "atom/common/native_mate_converters/callback.h"
--#include "base/power_monitor/power_monitor.h"
--#include "base/power_monitor/power_monitor_device_source.h"
--#include "native_mate/dictionary.h"
--
--#include "atom/common/node_includes.h"
--
--namespace mate {
--template <>
--struct Converter<ui::IdleState> {
--  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
--                                   const ui::IdleState& in) {
--    switch (in) {
--      case ui::IDLE_STATE_ACTIVE:
--        return mate::StringToV8(isolate, "active");
--      case ui::IDLE_STATE_IDLE:
--        return mate::StringToV8(isolate, "idle");
--      case ui::IDLE_STATE_LOCKED:
--        return mate::StringToV8(isolate, "locked");
--      case ui::IDLE_STATE_UNKNOWN:
--      default:
--        return mate::StringToV8(isolate, "unknown");
--    }
--  }
--};
--}  // namespace mate
--
--namespace atom {
--
--namespace api {
--
--PowerMonitor::PowerMonitor(v8::Isolate* isolate) {
--#if defined(OS_LINUX)
--  SetShutdownHandler(
--      base::Bind(&PowerMonitor::ShouldShutdown, base::Unretained(this)));
--#elif defined(OS_MACOSX)
--  Browser::Get()->SetShutdownHandler(
--      base::Bind(&PowerMonitor::ShouldShutdown, base::Unretained(this)));
--#endif
--  base::PowerMonitor::Get()->AddObserver(this);
--  Init(isolate);
--#if defined(OS_MACOSX) || defined(OS_WIN)
--  InitPlatformSpecificMonitors();
--#endif
--}
--
--PowerMonitor::~PowerMonitor() {
--  base::PowerMonitor::Get()->RemoveObserver(this);
--}
--
--bool PowerMonitor::ShouldShutdown() {
--  return !Emit("shutdown");
--}
--
--#if defined(OS_LINUX)
--void PowerMonitor::BlockShutdown() {
--  PowerObserverLinux::BlockShutdown();
--}
--
--void PowerMonitor::UnblockShutdown() {
--  PowerObserverLinux::UnblockShutdown();
--}
--#endif
--
--void PowerMonitor::OnPowerStateChange(bool on_battery_power) {
--  if (on_battery_power)
--    Emit("on-battery");
--  else
--    Emit("on-ac");
--}
--
--void PowerMonitor::OnSuspend() {
--  Emit("suspend");
--}
--
--void PowerMonitor::OnResume() {
--  Emit("resume");
--}
--
--void PowerMonitor::QuerySystemIdleState(v8::Isolate* isolate,
--                                        int idle_threshold,
--                                        const ui::IdleCallback& callback) {
--  if (idle_threshold > 0) {
--    ui::CalculateIdleState(idle_threshold, callback);
--  } else {
--    isolate->ThrowException(v8::Exception::TypeError(mate::StringToV8(
--        isolate, "Invalid idle threshold, must be greater than 0")));
--  }
--}
--
--void PowerMonitor::QuerySystemIdleTime(const ui::IdleTimeCallback& callback) {
--  ui::CalculateIdleTime(callback);
--}
--
--// static
--v8::Local<v8::Value> PowerMonitor::Create(v8::Isolate* isolate) {
--  if (!Browser::Get()->is_ready()) {
--    isolate->ThrowException(v8::Exception::Error(mate::StringToV8(
--        isolate,
--        "Cannot require \"powerMonitor\" module before app is ready")));
--    return v8::Null(isolate);
--  }
--
--  return mate::CreateHandle(isolate, new PowerMonitor(isolate)).ToV8();
--}
--
--// static
--void PowerMonitor::BuildPrototype(v8::Isolate* isolate,
--                                  v8::Local<v8::FunctionTemplate> prototype) {
--  prototype->SetClassName(mate::StringToV8(isolate, "PowerMonitor"));
--
--  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
--      .MakeDestroyable()
--#if defined(OS_LINUX)
--      .SetMethod("blockShutdown", &PowerMonitor::BlockShutdown)
--      .SetMethod("unblockShutdown", &PowerMonitor::UnblockShutdown)
--#endif
--      .SetMethod("querySystemIdleState", &PowerMonitor::QuerySystemIdleState)
--      .SetMethod("querySystemIdleTime", &PowerMonitor::QuerySystemIdleTime);
--}
--
--}  // namespace api
--
--}  // namespace atom
--
--namespace {
--
--using atom::api::PowerMonitor;
--
--void Initialize(v8::Local<v8::Object> exports,
--                v8::Local<v8::Value> unused,
--                v8::Local<v8::Context> context,
--                void* priv) {
--  v8::Isolate* isolate = context->GetIsolate();
--  mate::Dictionary dict(isolate, exports);
--  dict.Set("powerMonitor", PowerMonitor::Create(isolate));
--  dict.Set("PowerMonitor",
--           PowerMonitor::GetConstructor(isolate)->GetFunction());
--}
--
--}  // namespace
--
--NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_power_monitor, Initialize)
-removed in remote
-  base   100644 8fb52eeec95eecb193130e3692d535f539420e81 atom/browser/api/atom_api_power_monitor.h
-  our    100644 c7a6169d88b712cbcb9600c4458959ea38fb15fb atom/browser/api/atom_api_power_monitor.h
-@@ -1,83 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_API_ATOM_API_POWER_MONITOR_H_
--#define ATOM_BROWSER_API_ATOM_API_POWER_MONITOR_H_
--
--#include "atom/browser/api/trackable_object.h"
--#include "atom/browser/lib/power_observer.h"
--#include "base/compiler_specific.h"
--#include "native_mate/handle.h"
--#include "ui/base/idle/idle.h"
--
--namespace atom {
--
--namespace api {
--
--class PowerMonitor : public mate::TrackableObject<PowerMonitor>,
--                     public PowerObserver {
-- public:
--  static v8::Local<v8::Value> Create(v8::Isolate* isolate);
--
--  static void BuildPrototype(v8::Isolate* isolate,
--                             v8::Local<v8::FunctionTemplate> prototype);
--
-- protected:
--  explicit PowerMonitor(v8::Isolate* isolate);
--  ~PowerMonitor() override;
--
--  // Called by native calles.
--  bool ShouldShutdown();
--
--#if defined(OS_LINUX)
--  // Private JS APIs.
--  void BlockShutdown();
--  void UnblockShutdown();
--#endif
--
--#if defined(OS_MACOSX) || defined(OS_WIN)
--  void InitPlatformSpecificMonitors();
--#endif
--
--  // base::PowerObserver implementations:
--  void OnPowerStateChange(bool on_battery_power) override;
--  void OnSuspend() override;
--  void OnResume() override;
--
-- private:
--  void QuerySystemIdleState(v8::Isolate* isolate,
--                            int idle_threshold,
--                            const ui::IdleCallback& callback);
--  void QuerySystemIdleTime(const ui::IdleTimeCallback& callback);
--
--#if defined(OS_WIN)
--  // Static callback invoked when a message comes in to our messaging window.
--  static LRESULT CALLBACK WndProcStatic(HWND hwnd,
--                                        UINT message,
--                                        WPARAM wparam,
--                                        LPARAM lparam);
--
--  LRESULT CALLBACK WndProc(HWND hwnd,
--                           UINT message,
--                           WPARAM wparam,
--                           LPARAM lparam);
--
--  // The window class of |window_|.
--  ATOM atom_;
--
--  // The handle of the module that contains the window procedure of |window_|.
--  HMODULE instance_;
--
--  // The window used for processing events.
--  HWND window_;
--#endif
--
--  DISALLOW_COPY_AND_ASSIGN(PowerMonitor);
--};
--
--}  // namespace api
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_API_ATOM_API_POWER_MONITOR_H_
-removed in remote
-  base   100644 58983e6c846a8b161b4f74b271ba978846bfa2dc atom/browser/api/atom_api_power_save_blocker.cc
-  our    100644 0b06a9f583782b55296498159059e35b8f27f186 atom/browser/api/atom_api_power_save_blocker.cc
-@@ -1,137 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/api/atom_api_power_save_blocker.h"
--
--#include <string>
--
--#include "base/task_scheduler/post_task.h"
--#include "base/threading/thread_task_runner_handle.h"
--#include "native_mate/dictionary.h"
--
--#include "atom/common/node_includes.h"
--
--namespace mate {
--
--template <>
--struct Converter<device::mojom::WakeLockType> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     device::mojom::WakeLockType* out) {
--    std::string type;
--    if (!ConvertFromV8(isolate, val, &type))
--      return false;
--    if (type == "prevent-app-suspension")
--      *out = device::mojom::WakeLockType::kPreventAppSuspension;
--    else if (type == "prevent-display-sleep")
--      *out = device::mojom::WakeLockType::kPreventDisplaySleep;
--    else
--      return false;
--    return true;
--  }
--};
--
--}  // namespace mate
--
--namespace atom {
--
--namespace api {
--
--PowerSaveBlocker::PowerSaveBlocker(v8::Isolate* isolate)
--    : current_blocker_type_(
--          device::mojom::WakeLockType::kPreventAppSuspension) {
--  Init(isolate);
--}
--
--PowerSaveBlocker::~PowerSaveBlocker() {}
--
--void PowerSaveBlocker::UpdatePowerSaveBlocker() {
--  if (power_save_blocker_types_.empty()) {
--    power_save_blocker_.reset();
--    return;
--  }
--
--  // |WakeLockType::kPreventAppSuspension| keeps system active, but allows
--  // screen to be turned off.
--  // |WakeLockType::kPreventDisplaySleep| keeps system and screen active, has a
--  // higher precedence level than |WakeLockType::kPreventAppSuspension|.
--  //
--  // Only the highest-precedence blocker type takes effect.
--  device::mojom::WakeLockType new_blocker_type =
--      device::mojom::WakeLockType::kPreventAppSuspension;
--  for (const auto& element : power_save_blocker_types_) {
--    if (element.second ==
--        device::mojom::WakeLockType::kPreventDisplaySleep) {
--      new_blocker_type =
--          device::mojom::WakeLockType::kPreventDisplaySleep;
--      break;
--    }
--  }
--
--  if (!power_save_blocker_ || new_blocker_type != current_blocker_type_) {
--    auto new_blocker = std::make_unique<device::PowerSaveBlocker>(
--        new_blocker_type, device::mojom::WakeLockReason::kOther,
--        ATOM_PRODUCT_NAME, base::ThreadTaskRunnerHandle::Get(),
--        // This task runner may be used by some device service
--        // implementation bits to interface with dbus client code, which in
--        // turn imposes some subtle thread affinity on the clients. We
--        // therefore require a single-thread runner.
--        base::CreateSingleThreadTaskRunnerWithTraits(
--            {base::MayBlock(), base::TaskPriority::BACKGROUND}));
--    power_save_blocker_.swap(new_blocker);
--    current_blocker_type_ = new_blocker_type;
--  }
--}
--
--int PowerSaveBlocker::Start(device::mojom::WakeLockType type) {
--  static int count = 0;
--  power_save_blocker_types_[count] = type;
--  UpdatePowerSaveBlocker();
--  return count++;
--}
--
--bool PowerSaveBlocker::Stop(int id) {
--  bool success = power_save_blocker_types_.erase(id) > 0;
--  UpdatePowerSaveBlocker();
--  return success;
--}
--
--bool PowerSaveBlocker::IsStarted(int id) {
--  return power_save_blocker_types_.find(id) != power_save_blocker_types_.end();
--}
--
--// static
--mate::Handle<PowerSaveBlocker> PowerSaveBlocker::Create(v8::Isolate* isolate) {
--  return mate::CreateHandle(isolate, new PowerSaveBlocker(isolate));
--}
--
--// static
--void PowerSaveBlocker::BuildPrototype(
--    v8::Isolate* isolate,
--    v8::Local<v8::FunctionTemplate> prototype) {
--  prototype->SetClassName(mate::StringToV8(isolate, "PowerSaveBlocker"));
--  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
--      .SetMethod("start", &PowerSaveBlocker::Start)
--      .SetMethod("stop", &PowerSaveBlocker::Stop)
--      .SetMethod("isStarted", &PowerSaveBlocker::IsStarted);
--}
--
--}  // namespace api
--
--}  // namespace atom
--
--namespace {
--
--void Initialize(v8::Local<v8::Object> exports,
--                v8::Local<v8::Value> unused,
--                v8::Local<v8::Context> context,
--                void* priv) {
--  v8::Isolate* isolate = context->GetIsolate();
--  mate::Dictionary dict(isolate, exports);
--  dict.Set("powerSaveBlocker", atom::api::PowerSaveBlocker::Create(isolate));
--}
--
--}  // namespace
--
--NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_power_save_blocker, Initialize);
-removed in remote
-  base   100644 a698d746ceb0a64ed4a29aa87f512cc64f5a6b86 atom/browser/api/atom_api_power_save_blocker.h
-  our    100644 d56222db95dedca78f3274bf509c6384c3ff833e atom/browser/api/atom_api_power_save_blocker.h
-@@ -1,56 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_API_ATOM_API_POWER_SAVE_BLOCKER_H_
--#define ATOM_BROWSER_API_ATOM_API_POWER_SAVE_BLOCKER_H_
--
--#include <map>
--#include <memory>
--
--#include "atom/browser/api/trackable_object.h"
--#include "native_mate/handle.h"
--#include "services/device/wake_lock/power_save_blocker/power_save_blocker.h"
--
--namespace mate {
--class Dictionary;
--}
--
--namespace atom {
--
--namespace api {
--
--class PowerSaveBlocker : public mate::TrackableObject<PowerSaveBlocker> {
-- public:
--  static mate::Handle<PowerSaveBlocker> Create(v8::Isolate* isolate);
--
--  static void BuildPrototype(v8::Isolate* isolate,
--                             v8::Local<v8::FunctionTemplate> prototype);
--
-- protected:
--  explicit PowerSaveBlocker(v8::Isolate* isolate);
--  ~PowerSaveBlocker() override;
--
-- private:
--  void UpdatePowerSaveBlocker();
--  int Start(device::mojom::WakeLockType type);
--  bool Stop(int id);
--  bool IsStarted(int id);
--
--  std::unique_ptr<device::PowerSaveBlocker> power_save_blocker_;
--
--  // Current blocker type used by |power_save_blocker_|
--  device::mojom::WakeLockType current_blocker_type_;
--
--  // Map from id to the corresponding blocker type for each request.
--  using WakeLockTypeMap = std::map<int, device::mojom::WakeLockType>;
--  WakeLockTypeMap power_save_blocker_types_;
--
--  DISALLOW_COPY_AND_ASSIGN(PowerSaveBlocker);
--};
--
--}  // namespace api
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_API_ATOM_API_POWER_SAVE_BLOCKER_H_
-removed in remote
-  base   100644 09da9c71cadbc204787cf20a4fec584d45696476 atom/browser/api/atom_api_protocol.cc
-  our    100644 5e1f991ad8dcd611467b691fff48656e3cc299ff atom/browser/api/atom_api_protocol.cc
-@@ -1,248 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/api/atom_api_protocol.h"
--
--#include "atom/browser/atom_browser_client.h"
--#include "atom/browser/atom_browser_main_parts.h"
--#include "atom/browser/browser.h"
--#include "atom/browser/net/url_request_async_asar_job.h"
--#include "atom/browser/net/url_request_buffer_job.h"
--#include "atom/browser/net/url_request_fetch_job.h"
--#include "atom/browser/net/url_request_stream_job.h"
--#include "atom/browser/net/url_request_string_job.h"
--#include "atom/common/native_mate_converters/callback.h"
--#include "atom/common/native_mate_converters/value_converter.h"
--#include "atom/common/node_includes.h"
--#include "atom/common/options_switches.h"
--#include "base/command_line.h"
--#include "base/strings/string_util.h"
--#include "content/public/browser/child_process_security_policy.h"
--#include "native_mate/dictionary.h"
--#include "url/url_util.h"
--
--using content::BrowserThread;
--
--namespace atom {
--
--namespace api {
--
--namespace {
--
--// List of registered custom standard schemes.
--std::vector<std::string> g_standard_schemes;
--
--}  // namespace
--
--std::vector<std::string> GetStandardSchemes() {
--  return g_standard_schemes;
--}
--
--void RegisterStandardSchemes(const std::vector<std::string>& schemes,
--                             mate::Arguments* args) {
--  g_standard_schemes = schemes;
--
--  mate::Dictionary opts;
--  bool secure = false;
--  args->GetNext(&opts) && opts.Get("secure", &secure);
--
--  // Dynamically register the schemes.
--  auto* policy = content::ChildProcessSecurityPolicy::GetInstance();
--  for (const std::string& scheme : schemes) {
--    url::AddStandardScheme(scheme.c_str(), url::SCHEME_WITHOUT_PORT);
--    if (secure) {
--      url::AddSecureScheme(scheme.c_str());
--    }
--    policy->RegisterWebSafeScheme(scheme);
--  }
--
--  // Add the schemes to command line switches, so child processes can also
--  // register them.
--  base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
--      atom::switches::kStandardSchemes, base::JoinString(schemes, ","));
--  if (secure) {
--    base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
--        atom::switches::kSecureSchemes, base::JoinString(schemes, ","));
--  }
--}
--
--Protocol::Protocol(v8::Isolate* isolate, AtomBrowserContext* browser_context)
--    : browser_context_(browser_context), weak_factory_(this) {
--  Init(isolate);
--}
--
--Protocol::~Protocol() {}
--
--void Protocol::RegisterServiceWorkerSchemes(
--    const std::vector<std::string>& schemes) {
--  atom::AtomBrowserClient::SetCustomServiceWorkerSchemes(schemes);
--}
--
--void Protocol::UnregisterProtocol(const std::string& scheme,
--                                  mate::Arguments* args) {
--  CompletionCallback callback;
--  args->GetNext(&callback);
--  auto* getter = browser_context_->GetRequestContext();
--  content::BrowserThread::PostTaskAndReplyWithResult(
--      content::BrowserThread::IO, FROM_HERE,
--      base::BindOnce(&Protocol::UnregisterProtocolInIO,
--                     base::RetainedRef(getter), scheme),
--      base::BindOnce(&Protocol::OnIOCompleted, GetWeakPtr(), callback));
--}
--
--// static
--Protocol::ProtocolError Protocol::UnregisterProtocolInIO(
--    scoped_refptr<brightray::URLRequestContextGetter> request_context_getter,
--    const std::string& scheme) {
--  auto* job_factory = static_cast<AtomURLRequestJobFactory*>(
--      request_context_getter->job_factory());
--  if (!job_factory->HasProtocolHandler(scheme))
--    return PROTOCOL_NOT_REGISTERED;
--  job_factory->SetProtocolHandler(scheme, nullptr);
--  return PROTOCOL_OK;
--}
--
--void Protocol::IsProtocolHandled(const std::string& scheme,
--                                 const BooleanCallback& callback) {
--  auto* getter = browser_context_->GetRequestContext();
--  content::BrowserThread::PostTaskAndReplyWithResult(
--      content::BrowserThread::IO, FROM_HERE,
--      base::Bind(&Protocol::IsProtocolHandledInIO, base::RetainedRef(getter),
--                 scheme),
--      callback);
--}
--
--// static
--bool Protocol::IsProtocolHandledInIO(
--    scoped_refptr<brightray::URLRequestContextGetter> request_context_getter,
--    const std::string& scheme) {
--  return request_context_getter->job_factory()->IsHandledProtocol(scheme);
--}
--
--void Protocol::UninterceptProtocol(const std::string& scheme,
--                                   mate::Arguments* args) {
--  CompletionCallback callback;
--  args->GetNext(&callback);
--  auto* getter = browser_context_->GetRequestContext();
--  content::BrowserThread::PostTaskAndReplyWithResult(
--      content::BrowserThread::IO, FROM_HERE,
--      base::BindOnce(&Protocol::UninterceptProtocolInIO,
--                     base::RetainedRef(getter), scheme),
--      base::BindOnce(&Protocol::OnIOCompleted, GetWeakPtr(), callback));
--}
--
--// static
--Protocol::ProtocolError Protocol::UninterceptProtocolInIO(
--    scoped_refptr<brightray::URLRequestContextGetter> request_context_getter,
--    const std::string& scheme) {
--  return static_cast<AtomURLRequestJobFactory*>(
--             request_context_getter->job_factory())
--                 ->UninterceptProtocol(scheme)
--             ? PROTOCOL_OK
--             : PROTOCOL_NOT_INTERCEPTED;
--}
--
--void Protocol::OnIOCompleted(const CompletionCallback& callback,
--                             ProtocolError error) {
--  // The completion callback is optional.
--  if (callback.is_null())
--    return;
--
--  v8::Locker locker(isolate());
--  v8::HandleScope handle_scope(isolate());
--
--  if (error == PROTOCOL_OK) {
--    callback.Run(v8::Null(isolate()));
--  } else {
--    std::string str = ErrorCodeToString(error);
--    callback.Run(v8::Exception::Error(mate::StringToV8(isolate(), str)));
--  }
--}
--
--std::string Protocol::ErrorCodeToString(ProtocolError error) {
--  switch (error) {
--    case PROTOCOL_FAIL:
--      return "Failed to manipulate protocol factory";
--    case PROTOCOL_REGISTERED:
--      return "The scheme has been registered";
--    case PROTOCOL_NOT_REGISTERED:
--      return "The scheme has not been registered";
--    case PROTOCOL_INTERCEPTED:
--      return "The scheme has been intercepted";
--    case PROTOCOL_NOT_INTERCEPTED:
--      return "The scheme has not been intercepted";
--    default:
--      return "Unexpected error";
--  }
--}
--
--// static
--mate::Handle<Protocol> Protocol::Create(v8::Isolate* isolate,
--                                        AtomBrowserContext* browser_context) {
--  return mate::CreateHandle(isolate, new Protocol(isolate, browser_context));
--}
--
--// static
--void Protocol::BuildPrototype(v8::Isolate* isolate,
--                              v8::Local<v8::FunctionTemplate> prototype) {
--  prototype->SetClassName(mate::StringToV8(isolate, "Protocol"));
--  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
--      .SetMethod("registerServiceWorkerSchemes",
--                 &Protocol::RegisterServiceWorkerSchemes)
--      .SetMethod("registerStringProtocol",
--                 &Protocol::RegisterProtocol<URLRequestStringJob>)
--      .SetMethod("registerBufferProtocol",
--                 &Protocol::RegisterProtocol<URLRequestBufferJob>)
--      .SetMethod("registerFileProtocol",
--                 &Protocol::RegisterProtocol<URLRequestAsyncAsarJob>)
--      .SetMethod("registerHttpProtocol",
--                 &Protocol::RegisterProtocol<URLRequestFetchJob>)
--      .SetMethod("registerStreamProtocol",
--                 &Protocol::RegisterProtocol<URLRequestStreamJob>)
--      .SetMethod("unregisterProtocol", &Protocol::UnregisterProtocol)
--      .SetMethod("isProtocolHandled", &Protocol::IsProtocolHandled)
--      .SetMethod("interceptStringProtocol",
--                 &Protocol::InterceptProtocol<URLRequestStringJob>)
--      .SetMethod("interceptBufferProtocol",
--                 &Protocol::InterceptProtocol<URLRequestBufferJob>)
--      .SetMethod("interceptFileProtocol",
--                 &Protocol::InterceptProtocol<URLRequestAsyncAsarJob>)
--      .SetMethod("interceptHttpProtocol",
--                 &Protocol::InterceptProtocol<URLRequestFetchJob>)
--      .SetMethod("interceptStreamProtocol",
--                 &Protocol::InterceptProtocol<URLRequestStreamJob>)
--      .SetMethod("uninterceptProtocol", &Protocol::UninterceptProtocol);
--}
--
--}  // namespace api
--
--}  // namespace atom
--
--namespace {
--
--void RegisterStandardSchemes(const std::vector<std::string>& schemes,
--                             mate::Arguments* args) {
--  if (atom::Browser::Get()->is_ready()) {
--    args->ThrowError(
--        "protocol.registerStandardSchemes should be called before "
--        "app is ready");
--    return;
--  }
--
--  atom::api::RegisterStandardSchemes(schemes, args);
--}
--
--void Initialize(v8::Local<v8::Object> exports,
--                v8::Local<v8::Value> unused,
--                v8::Local<v8::Context> context,
--                void* priv) {
--  v8::Isolate* isolate = context->GetIsolate();
--  mate::Dictionary dict(isolate, exports);
--  dict.SetMethod("registerStandardSchemes", &RegisterStandardSchemes);
--  dict.SetMethod("getStandardSchemes", &atom::api::GetStandardSchemes);
--}
--
--}  // namespace
--
--NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_protocol, Initialize)
-removed in remote
-  base   100644 107fbf1ce7125ab3426edc893acb358ec8edfeee atom/browser/api/atom_api_protocol.h
-  our    100644 deaf680c996ce0dd74af45e7c7c95f711884bb07 atom/browser/api/atom_api_protocol.h
-@@ -1,199 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_API_ATOM_API_PROTOCOL_H_
--#define ATOM_BROWSER_API_ATOM_API_PROTOCOL_H_
--
--#include <map>
--#include <string>
--#include <vector>
--
--#include "atom/browser/api/trackable_object.h"
--#include "atom/browser/atom_browser_context.h"
--#include "atom/browser/net/atom_url_request_job_factory.h"
--#include "base/callback.h"
--#include "base/memory/weak_ptr.h"
--#include "content/public/browser/browser_thread.h"
--#include "native_mate/arguments.h"
--#include "native_mate/dictionary.h"
--#include "native_mate/handle.h"
--#include "net/url_request/url_request_context.h"
--
--namespace base {
--class DictionaryValue;
--}
--
--namespace atom {
--
--namespace api {
--
--std::vector<std::string> GetStandardSchemes();
--void RegisterStandardSchemes(const std::vector<std::string>& schemes,
--                             mate::Arguments* args);
--
--class Protocol : public mate::TrackableObject<Protocol> {
-- public:
--  using Handler =
--      base::Callback<void(const base::DictionaryValue&, v8::Local<v8::Value>)>;
--  using CompletionCallback = base::Callback<void(v8::Local<v8::Value>)>;
--  using BooleanCallback = base::Callback<void(bool)>;
--
--  static mate::Handle<Protocol> Create(v8::Isolate* isolate,
--                                       AtomBrowserContext* browser_context);
--
--  static void BuildPrototype(v8::Isolate* isolate,
--                             v8::Local<v8::FunctionTemplate> prototype);
--
-- protected:
--  Protocol(v8::Isolate* isolate, AtomBrowserContext* browser_context);
--  ~Protocol() override;
--
-- private:
--  // Possible errors.
--  enum ProtocolError {
--    PROTOCOL_OK,    // no error
--    PROTOCOL_FAIL,  // operation failed, should never occur
--    PROTOCOL_REGISTERED,
--    PROTOCOL_NOT_REGISTERED,
--    PROTOCOL_INTERCEPTED,
--    PROTOCOL_NOT_INTERCEPTED,
--  };
--
--  // The protocol handler that will create a protocol handler for certain
--  // request job.
--  template <typename RequestJob>
--  class CustomProtocolHandler
--      : public net::URLRequestJobFactory::ProtocolHandler {
--   public:
--    CustomProtocolHandler(v8::Isolate* isolate,
--                          net::URLRequestContextGetter* request_context,
--                          const Handler& handler)
--        : isolate_(isolate),
--          request_context_(request_context),
--          handler_(handler) {}
--    ~CustomProtocolHandler() override {}
--
--    net::URLRequestJob* MaybeCreateJob(
--        net::URLRequest* request,
--        net::NetworkDelegate* network_delegate) const override {
--      RequestJob* request_job = new RequestJob(request, network_delegate);
--      request_job->SetHandlerInfo(isolate_, request_context_, handler_);
--      return request_job;
--    }
--
--   private:
--    v8::Isolate* isolate_;
--    net::URLRequestContextGetter* request_context_;
--    Protocol::Handler handler_;
--
--    DISALLOW_COPY_AND_ASSIGN(CustomProtocolHandler);
--  };
--
--  // Register schemes that can handle service worker.
--  void RegisterServiceWorkerSchemes(const std::vector<std::string>& schemes);
--
--  // Register the protocol with certain request job.
--  template <typename RequestJob>
--  void RegisterProtocol(const std::string& scheme,
--                        const Handler& handler,
--                        mate::Arguments* args) {
--    CompletionCallback callback;
--    args->GetNext(&callback);
--    auto* getter = browser_context_->GetRequestContext();
--    content::BrowserThread::PostTaskAndReplyWithResult(
--        content::BrowserThread::IO, FROM_HERE,
--        base::BindOnce(&Protocol::RegisterProtocolInIO<RequestJob>,
--                       base::RetainedRef(getter), isolate(), scheme, handler),
--        base::BindOnce(&Protocol::OnIOCompleted, GetWeakPtr(), callback));
--  }
--  template <typename RequestJob>
--  static ProtocolError RegisterProtocolInIO(
--      scoped_refptr<brightray::URLRequestContextGetter> request_context_getter,
--      v8::Isolate* isolate,
--      const std::string& scheme,
--      const Handler& handler) {
--    auto* job_factory = static_cast<AtomURLRequestJobFactory*>(
--        request_context_getter->job_factory());
--    if (job_factory->IsHandledProtocol(scheme))
--      return PROTOCOL_REGISTERED;
--    auto protocol_handler = std::make_unique<CustomProtocolHandler<RequestJob>>(
--        isolate, request_context_getter.get(), handler);
--    if (job_factory->SetProtocolHandler(scheme, std::move(protocol_handler)))
--      return PROTOCOL_OK;
--    else
--      return PROTOCOL_FAIL;
--  }
--
--  // Unregister the protocol handler that handles |scheme|.
--  void UnregisterProtocol(const std::string& scheme, mate::Arguments* args);
--  static ProtocolError UnregisterProtocolInIO(
--      scoped_refptr<brightray::URLRequestContextGetter> request_context_getter,
--      const std::string& scheme);
--
--  // Whether the protocol has handler registered.
--  void IsProtocolHandled(const std::string& scheme,
--                         const BooleanCallback& callback);
--  static bool IsProtocolHandledInIO(
--      scoped_refptr<brightray::URLRequestContextGetter> request_context_getter,
--      const std::string& scheme);
--
--  // Replace the protocol handler with a new one.
--  template <typename RequestJob>
--  void InterceptProtocol(const std::string& scheme,
--                         const Handler& handler,
--                         mate::Arguments* args) {
--    CompletionCallback callback;
--    args->GetNext(&callback);
--    auto* getter = browser_context_->GetRequestContext();
--    content::BrowserThread::PostTaskAndReplyWithResult(
--        content::BrowserThread::IO, FROM_HERE,
--        base::BindOnce(&Protocol::InterceptProtocolInIO<RequestJob>,
--                       base::RetainedRef(getter), isolate(), scheme, handler),
--        base::BindOnce(&Protocol::OnIOCompleted, GetWeakPtr(), callback));
--  }
--  template <typename RequestJob>
--  static ProtocolError InterceptProtocolInIO(
--      scoped_refptr<brightray::URLRequestContextGetter> request_context_getter,
--      v8::Isolate* isolate,
--      const std::string& scheme,
--      const Handler& handler) {
--    auto* job_factory = static_cast<AtomURLRequestJobFactory*>(
--        request_context_getter->job_factory());
--    if (!job_factory->IsHandledProtocol(scheme))
--      return PROTOCOL_NOT_REGISTERED;
--    // It is possible a protocol is handled but can not be intercepted.
--    if (!job_factory->HasProtocolHandler(scheme))
--      return PROTOCOL_FAIL;
--    auto protocol_handler = std::make_unique<CustomProtocolHandler<RequestJob>>(
--        isolate, request_context_getter.get(), handler);
--    if (!job_factory->InterceptProtocol(scheme, std::move(protocol_handler)))
--      return PROTOCOL_INTERCEPTED;
--    return PROTOCOL_OK;
--  }
--
--  // Restore the |scheme| to its original protocol handler.
--  void UninterceptProtocol(const std::string& scheme, mate::Arguments* args);
--  static ProtocolError UninterceptProtocolInIO(
--      scoped_refptr<brightray::URLRequestContextGetter> request_context_getter,
--      const std::string& scheme);
--
--  // Convert error code to JS exception and call the callback.
--  void OnIOCompleted(const CompletionCallback& callback, ProtocolError error);
--
--  // Convert error code to string.
--  std::string ErrorCodeToString(ProtocolError error);
--
--  base::WeakPtr<Protocol> GetWeakPtr() { return weak_factory_.GetWeakPtr(); }
--
--  scoped_refptr<AtomBrowserContext> browser_context_;
--  base::WeakPtrFactory<Protocol> weak_factory_;
--
--  DISALLOW_COPY_AND_ASSIGN(Protocol);
--};
--
--}  // namespace api
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_API_ATOM_API_PROTOCOL_H_
-removed in remote
-  base   100644 407a71f0cc4134a0eeaabfd69e3240e0cee83367 atom/browser/api/atom_api_screen.cc
-  our    100644 65a11eed0cce32cc08b188155a97f6a51f2c03f1 atom/browser/api/atom_api_screen.cc
-@@ -1,172 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/api/atom_api_screen.h"
--
--#include <algorithm>
--#include <string>
--
--#include "atom/browser/api/atom_api_browser_window.h"
--#include "atom/browser/browser.h"
--#include "atom/common/native_mate_converters/gfx_converter.h"
--#include "base/bind.h"
--#include "native_mate/dictionary.h"
--#include "native_mate/object_template_builder.h"
--#include "ui/display/display.h"
--#include "ui/display/screen.h"
--#include "ui/gfx/geometry/point.h"
--
--#if defined(OS_WIN)
--#include "ui/display/win/screen_win.h"
--#endif
--
--#include "atom/common/node_includes.h"
--
--namespace atom {
--
--namespace api {
--
--namespace {
--
--// Find an item in container according to its ID.
--template <class T>
--typename T::iterator FindById(T* container, int id) {
--  auto predicate = [id](const typename T::value_type& item) -> bool {
--    return item.id() == id;
--  };
--  return std::find_if(container->begin(), container->end(), predicate);
--}
--
--// Convert the changed_metrics bitmask to string array.
--std::vector<std::string> MetricsToArray(uint32_t metrics) {
--  std::vector<std::string> array;
--  if (metrics & display::DisplayObserver::DISPLAY_METRIC_BOUNDS)
--    array.push_back("bounds");
--  if (metrics & display::DisplayObserver::DISPLAY_METRIC_WORK_AREA)
--    array.push_back("workArea");
--  if (metrics & display::DisplayObserver::DISPLAY_METRIC_DEVICE_SCALE_FACTOR)
--    array.push_back("scaleFactor");
--  if (metrics & display::DisplayObserver::DISPLAY_METRIC_ROTATION)
--    array.push_back("rotation");
--  return array;
--}
--
--}  // namespace
--
--Screen::Screen(v8::Isolate* isolate, display::Screen* screen)
--    : screen_(screen) {
--  screen_->AddObserver(this);
--  Init(isolate);
--}
--
--Screen::~Screen() {
--  screen_->RemoveObserver(this);
--}
--
--gfx::Point Screen::GetCursorScreenPoint() {
--  return screen_->GetCursorScreenPoint();
--}
--
--display::Display Screen::GetPrimaryDisplay() {
--  return screen_->GetPrimaryDisplay();
--}
--
--std::vector<display::Display> Screen::GetAllDisplays() {
--  return screen_->GetAllDisplays();
--}
--
--display::Display Screen::GetDisplayNearestPoint(const gfx::Point& point) {
--  return screen_->GetDisplayNearestPoint(point);
--}
--
--display::Display Screen::GetDisplayMatching(const gfx::Rect& match_rect) {
--  return screen_->GetDisplayMatching(match_rect);
--}
--
--#if defined(OS_WIN)
--
--static gfx::Rect ScreenToDIPRect(atom::NativeWindow* window,
--                                 const gfx::Rect& rect) {
--  HWND hwnd = window ? window->GetAcceleratedWidget() : nullptr;
--  return display::win::ScreenWin::ScreenToDIPRect(hwnd, rect);
--}
--
--static gfx::Rect DIPToScreenRect(atom::NativeWindow* window,
--                                 const gfx::Rect& rect) {
--  HWND hwnd = window ? window->GetAcceleratedWidget() : nullptr;
--  return display::win::ScreenWin::DIPToScreenRect(hwnd, rect);
--}
--
--#endif
--
--void Screen::OnDisplayAdded(const display::Display& new_display) {
--  Emit("display-added", new_display);
--}
--
--void Screen::OnDisplayRemoved(const display::Display& old_display) {
--  Emit("display-removed", old_display);
--}
--
--void Screen::OnDisplayMetricsChanged(const display::Display& display,
--                                     uint32_t changed_metrics) {
--  Emit("display-metrics-changed", display, MetricsToArray(changed_metrics));
--}
--
--// static
--v8::Local<v8::Value> Screen::Create(v8::Isolate* isolate) {
--  if (!Browser::Get()->is_ready()) {
--    isolate->ThrowException(v8::Exception::Error(mate::StringToV8(
--        isolate, "Cannot require \"screen\" module before app is ready")));
--    return v8::Null(isolate);
--  }
--
--  display::Screen* screen = display::Screen::GetScreen();
--  if (!screen) {
--    isolate->ThrowException(v8::Exception::Error(
--        mate::StringToV8(isolate, "Failed to get screen information")));
--    return v8::Null(isolate);
--  }
--
--  return mate::CreateHandle(isolate, new Screen(isolate, screen)).ToV8();
--}
--
--// static
--void Screen::BuildPrototype(v8::Isolate* isolate,
--                            v8::Local<v8::FunctionTemplate> prototype) {
--  prototype->SetClassName(mate::StringToV8(isolate, "Screen"));
--  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
--      .SetMethod("getCursorScreenPoint", &Screen::GetCursorScreenPoint)
--      .SetMethod("getPrimaryDisplay", &Screen::GetPrimaryDisplay)
--      .SetMethod("getAllDisplays", &Screen::GetAllDisplays)
--      .SetMethod("getDisplayNearestPoint", &Screen::GetDisplayNearestPoint)
--#if defined(OS_WIN)
--      .SetMethod("screenToDipPoint", &display::win::ScreenWin::ScreenToDIPPoint)
--      .SetMethod("dipToScreenPoint", &display::win::ScreenWin::DIPToScreenPoint)
--      .SetMethod("screenToDipRect", &ScreenToDIPRect)
--      .SetMethod("dipToScreenRect", &DIPToScreenRect)
--#endif
--      .SetMethod("getDisplayMatching", &Screen::GetDisplayMatching);
--}
--
--}  // namespace api
--
--}  // namespace atom
--
--namespace {
--
--using atom::api::Screen;
--
--void Initialize(v8::Local<v8::Object> exports,
--                v8::Local<v8::Value> unused,
--                v8::Local<v8::Context> context,
--                void* priv) {
--  v8::Isolate* isolate = context->GetIsolate();
--  mate::Dictionary dict(isolate, exports);
--  dict.Set("screen", Screen::Create(isolate));
--  dict.Set("Screen", Screen::GetConstructor(isolate)->GetFunction());
--}
--
--}  // namespace
--
--NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_common_screen, Initialize)
-removed in remote
-  base   100644 f724130fa7fca10cd2d088d05eadd15d0e9016c7 atom/browser/api/atom_api_screen.h
-  our    100644 33c322abf4dc072f187004e28dd5f5a2583b45ce atom/browser/api/atom_api_screen.h
-@@ -1,59 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_API_ATOM_API_SCREEN_H_
--#define ATOM_BROWSER_API_ATOM_API_SCREEN_H_
--
--#include <vector>
--
--#include "atom/browser/api/event_emitter.h"
--#include "native_mate/handle.h"
--#include "ui/display/display_observer.h"
--#include "ui/display/screen.h"
--
--namespace gfx {
--class Point;
--class Rect;
--class Screen;
--}  // namespace gfx
--
--namespace atom {
--
--namespace api {
--
--class Screen : public mate::EventEmitter<Screen>,
--               public display::DisplayObserver {
-- public:
--  static v8::Local<v8::Value> Create(v8::Isolate* isolate);
--
--  static void BuildPrototype(v8::Isolate* isolate,
--                             v8::Local<v8::FunctionTemplate> prototype);
--
-- protected:
--  Screen(v8::Isolate* isolate, display::Screen* screen);
--  ~Screen() override;
--
--  gfx::Point GetCursorScreenPoint();
--  display::Display GetPrimaryDisplay();
--  std::vector<display::Display> GetAllDisplays();
--  display::Display GetDisplayNearestPoint(const gfx::Point& point);
--  display::Display GetDisplayMatching(const gfx::Rect& match_rect);
--
--  // display::DisplayObserver:
--  void OnDisplayAdded(const display::Display& new_display) override;
--  void OnDisplayRemoved(const display::Display& old_display) override;
--  void OnDisplayMetricsChanged(const display::Display& display,
--                               uint32_t changed_metrics) override;
--
-- private:
--  display::Screen* screen_;
--
--  DISALLOW_COPY_AND_ASSIGN(Screen);
--};
--
--}  // namespace api
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_API_ATOM_API_SCREEN_H_
-removed in remote
-  base   100644 0f104c760724cb83d421f9ed0225eaa8568898fe atom/browser/api/atom_api_session.cc
-  our    100644 658f913bb60b66ae1bf3aae97d7d9158e56f7ee0 atom/browser/api/atom_api_session.cc
-@@ -1,865 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/api/atom_api_session.h"
--
--#include <map>
--#include <string>
--#include <vector>
--
--#include "atom/browser/api/atom_api_cookies.h"
--#include "atom/browser/api/atom_api_download_item.h"
--#include "atom/browser/api/atom_api_protocol.h"
--#include "atom/browser/api/atom_api_web_request.h"
--#include "atom/browser/atom_browser_context.h"
--#include "atom/browser/atom_browser_main_parts.h"
--#include "atom/browser/atom_permission_manager.h"
--#include "atom/browser/browser.h"
--#include "atom/browser/net/atom_cert_verifier.h"
--#include "atom/browser/session_preferences.h"
--#include "atom/common/native_mate_converters/callback.h"
--#include "atom/common/native_mate_converters/content_converter.h"
--#include "atom/common/native_mate_converters/file_path_converter.h"
--#include "atom/common/native_mate_converters/gurl_converter.h"
--#include "atom/common/native_mate_converters/net_converter.h"
--#include "atom/common/native_mate_converters/value_converter.h"
--#include "atom/common/node_includes.h"
--#include "base/files/file_path.h"
--#include "base/guid.h"
--#include "base/strings/string_number_conversions.h"
--#include "base/strings/string_util.h"
--#include "base/threading/thread_task_runner_handle.h"
--#include "brightray/browser/media/media_device_id_salt.h"
--#include "chrome/browser/browser_process.h"
--#include "chrome/common/pref_names.h"
--#include "components/download/public/common/download_danger_type.h"
--#include "components/prefs/pref_service.h"
--#include "content/public/browser/browser_thread.h"
--#include "content/public/browser/download_item_utils.h"
--#include "content/public/browser/download_manager_delegate.h"
--#include "content/public/browser/storage_partition.h"
--#include "native_mate/dictionary.h"
--#include "native_mate/object_template_builder.h"
--#include "net/base/load_flags.h"
--#include "net/disk_cache/disk_cache.h"
--#include "net/dns/host_cache.h"
--#include "net/http/http_auth_handler_factory.h"
--#include "net/http/http_auth_preferences.h"
--#include "net/proxy_resolution/proxy_config_service_fixed.h"
--#include "net/proxy_resolution/proxy_service.h"
--#include "net/url_request/static_http_user_agent_settings.h"
--#include "net/url_request/url_request_context.h"
--#include "net/url_request/url_request_context_getter.h"
--#include "services/network/throttling/network_conditions.h"
--#include "services/network/throttling/throttling_controller.h"
--#include "ui/base/l10n/l10n_util.h"
--
--using atom::api::Cookies;
--using content::BrowserThread;
--using content::StoragePartition;
--
--namespace {
--
--struct ClearStorageDataOptions {
--  GURL origin;
--  uint32_t storage_types = StoragePartition::REMOVE_DATA_MASK_ALL;
--  uint32_t quota_types = StoragePartition::QUOTA_MANAGED_STORAGE_MASK_ALL;
--};
--
--struct ClearAuthCacheOptions {
--  std::string type;
--  GURL origin;
--  std::string realm;
--  base::string16 username;
--  base::string16 password;
--  net::HttpAuth::Scheme auth_scheme;
--};
--
--uint32_t GetStorageMask(const std::vector<std::string>& storage_types) {
--  uint32_t storage_mask = 0;
--  for (const auto& it : storage_types) {
--    auto type = base::ToLowerASCII(it);
--    if (type == "appcache")
--      storage_mask |= StoragePartition::REMOVE_DATA_MASK_APPCACHE;
--    else if (type == "cookies")
--      storage_mask |= StoragePartition::REMOVE_DATA_MASK_COOKIES;
--    else if (type == "filesystem")
--      storage_mask |= StoragePartition::REMOVE_DATA_MASK_FILE_SYSTEMS;
--    else if (type == "indexdb")
--      storage_mask |= StoragePartition::REMOVE_DATA_MASK_INDEXEDDB;
--    else if (type == "localstorage")
--      storage_mask |= StoragePartition::REMOVE_DATA_MASK_LOCAL_STORAGE;
--    else if (type == "shadercache")
--      storage_mask |= StoragePartition::REMOVE_DATA_MASK_SHADER_CACHE;
--    else if (type == "websql")
--      storage_mask |= StoragePartition::REMOVE_DATA_MASK_WEBSQL;
--    else if (type == "serviceworkers")
--      storage_mask |= StoragePartition::REMOVE_DATA_MASK_SERVICE_WORKERS;
--    else if (type == "cachestorage")
--      storage_mask |= StoragePartition::REMOVE_DATA_MASK_CACHE_STORAGE;
--  }
--  return storage_mask;
--}
--
--uint32_t GetQuotaMask(const std::vector<std::string>& quota_types) {
--  uint32_t quota_mask = 0;
--  for (const auto& it : quota_types) {
--    auto type = base::ToLowerASCII(it);
--    if (type == "temporary")
--      quota_mask |= StoragePartition::QUOTA_MANAGED_STORAGE_MASK_TEMPORARY;
--    else if (type == "persistent")
--      quota_mask |= StoragePartition::QUOTA_MANAGED_STORAGE_MASK_PERSISTENT;
--    else if (type == "syncable")
--      quota_mask |= StoragePartition::QUOTA_MANAGED_STORAGE_MASK_SYNCABLE;
--  }
--  return quota_mask;
--}
--
--net::HttpAuth::Scheme GetAuthSchemeFromString(const std::string& scheme) {
--  if (scheme == "basic")
--    return net::HttpAuth::AUTH_SCHEME_BASIC;
--  if (scheme == "digest")
--    return net::HttpAuth::AUTH_SCHEME_DIGEST;
--  if (scheme == "ntlm")
--    return net::HttpAuth::AUTH_SCHEME_NTLM;
--  if (scheme == "negotiate")
--    return net::HttpAuth::AUTH_SCHEME_NEGOTIATE;
--  return net::HttpAuth::AUTH_SCHEME_MAX;
--}
--
--void SetUserAgentInIO(scoped_refptr<net::URLRequestContextGetter> getter,
--                      const std::string& accept_lang,
--                      const std::string& user_agent) {
--  getter->GetURLRequestContext()->set_http_user_agent_settings(
--      new net::StaticHttpUserAgentSettings(
--          net::HttpUtil::GenerateAcceptLanguageHeader(accept_lang),
--          user_agent));
--}
--
--}  // namespace
--
--namespace mate {
--
--template <>
--struct Converter<ClearStorageDataOptions> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     ClearStorageDataOptions* out) {
--    mate::Dictionary options;
--    if (!ConvertFromV8(isolate, val, &options))
--      return false;
--    options.Get("origin", &out->origin);
--    std::vector<std::string> types;
--    if (options.Get("storages", &types))
--      out->storage_types = GetStorageMask(types);
--    if (options.Get("quotas", &types))
--      out->quota_types = GetQuotaMask(types);
--    return true;
--  }
--};
--
--template <>
--struct Converter<ClearAuthCacheOptions> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     ClearAuthCacheOptions* out) {
--    mate::Dictionary options;
--    if (!ConvertFromV8(isolate, val, &options))
--      return false;
--    options.Get("type", &out->type);
--    options.Get("origin", &out->origin);
--    options.Get("realm", &out->realm);
--    options.Get("username", &out->username);
--    options.Get("password", &out->password);
--    std::string scheme;
--    if (options.Get("scheme", &scheme))
--      out->auth_scheme = GetAuthSchemeFromString(scheme);
--    return true;
--  }
--};
--
--template <>
--struct Converter<net::ProxyConfig> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     net::ProxyConfig* out) {
--    std::string proxy_rules, proxy_bypass_rules;
--    GURL pac_url;
--    mate::Dictionary options;
--    // Fallback to previous API when passed String.
--    // https://git.io/vuhjj
--    if (ConvertFromV8(isolate, val, &proxy_rules)) {
--      pac_url = GURL(proxy_rules);  // Assume it is PAC script if it is URL.
--    } else if (ConvertFromV8(isolate, val, &options)) {
--      options.Get("pacScript", &pac_url);
--      options.Get("proxyRules", &proxy_rules);
--      options.Get("proxyBypassRules", &proxy_bypass_rules);
--    } else {
--      return false;
--    }
--
--    // pacScript takes precedence over proxyRules.
--    if (!pac_url.is_empty() && pac_url.is_valid()) {
--      out->set_pac_url(pac_url);
--    } else {
--      out->proxy_rules().ParseFromString(proxy_rules);
--      out->proxy_rules().bypass_rules.ParseFromString(proxy_bypass_rules);
--    }
--    return true;
--  }
--};
--
--template <>
--struct Converter<atom::VerifyRequestParams> {
--  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
--                                   atom::VerifyRequestParams val) {
--    mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
--    dict.Set("hostname", val.hostname);
--    dict.Set("certificate", val.certificate);
--    dict.Set("verificationResult", val.default_result);
--    dict.Set("errorCode", val.error_code);
--    return dict.GetHandle();
--  }
--};
--
--}  // namespace mate
--
--namespace atom {
--
--namespace api {
--
--namespace {
--
--const char kPersistPrefix[] = "persist:";
--
--// Referenced session objects.
--std::map<uint32_t, v8::Global<v8::Object>> g_sessions;
--
--class ResolveProxyHelper {
-- public:
--  ResolveProxyHelper(AtomBrowserContext* browser_context,
--                     const GURL& url,
--                     const Session::ResolveProxyCallback& callback)
--      : callback_(callback),
--        original_thread_(base::ThreadTaskRunnerHandle::Get()) {
--    scoped_refptr<net::URLRequestContextGetter> context_getter =
--        browser_context->GetRequestContext();
--    context_getter->GetNetworkTaskRunner()->PostTask(
--        FROM_HERE, base::BindOnce(&ResolveProxyHelper::ResolveProxy,
--                                  base::Unretained(this), context_getter, url));
--  }
--
--  void OnResolveProxyCompleted(int result) {
--    std::string proxy;
--    if (result == net::OK)
--      proxy = proxy_info_.ToPacString();
--    original_thread_->PostTask(FROM_HERE, base::BindOnce(callback_, proxy));
--    delete this;
--  }
--
-- private:
--  void ResolveProxy(scoped_refptr<net::URLRequestContextGetter> context_getter,
--                    const GURL& url) {
--    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
--
--    net::ProxyResolutionService* proxy_service =
--        context_getter->GetURLRequestContext()->proxy_resolution_service();
--    net::CompletionCallback completion_callback = base::Bind(
--        &ResolveProxyHelper::OnResolveProxyCompleted, base::Unretained(this));
--
--    // Start the request.
--    int result = proxy_service->ResolveProxy(url, "GET", &proxy_info_,
--                                             completion_callback, &pac_req_,
--                                             nullptr, net::NetLogWithSource());
--
--    // Completed synchronously.
--    if (result != net::ERR_IO_PENDING)
--      completion_callback.Run(result);
--  }
--
--  Session::ResolveProxyCallback callback_;
--  net::ProxyInfo proxy_info_;
--  net::ProxyResolutionService::Request* pac_req_;
--  scoped_refptr<base::SingleThreadTaskRunner> original_thread_;
--
--  DISALLOW_COPY_AND_ASSIGN(ResolveProxyHelper);
--};
--
--// Runs the callback in UI thread.
--void RunCallbackInUI(const base::Callback<void()>& callback) {
--  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, callback);
--}
--template <typename... T>
--void RunCallbackInUI(const base::Callback<void(T...)>& callback, T... result) {
--  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
--                          base::BindOnce(callback, result...));
--}
--
--// Callback of HttpCache::GetBackend.
--void OnGetBackend(disk_cache::Backend** backend_ptr,
--                  Session::CacheAction action,
--                  const net::CompletionCallback& callback,
--                  int result) {
--  if (result != net::OK) {
--    RunCallbackInUI(callback, result);
--  } else if (backend_ptr && *backend_ptr) {
--    if (action == Session::CacheAction::CLEAR) {
--      (*backend_ptr)
--          ->DoomAllEntries(base::Bind(&RunCallbackInUI<int>, callback));
--    } else if (action == Session::CacheAction::STATS) {
--      base::StringPairs stats;
--      (*backend_ptr)->GetStats(&stats);
--      for (const auto& stat : stats) {
--        if (stat.first == "Current size") {
--          int current_size;
--          base::StringToInt(stat.second, &current_size);
--          RunCallbackInUI(callback, current_size);
--          break;
--        }
--      }
--    }
--  } else {
--    RunCallbackInUI<int>(callback, net::ERR_FAILED);
--  }
--}
--
--void DoCacheActionInIO(
--    const scoped_refptr<net::URLRequestContextGetter>& context_getter,
--    Session::CacheAction action,
--    const net::CompletionCallback& callback) {
--  auto* request_context = context_getter->GetURLRequestContext();
--  auto* http_cache = request_context->http_transaction_factory()->GetCache();
--  if (!http_cache)
--    RunCallbackInUI<int>(callback, net::ERR_FAILED);
--
--  // Call GetBackend and make the backend's ptr accessable in OnGetBackend.
--  using BackendPtr = disk_cache::Backend*;
--  auto** backend_ptr = new BackendPtr(nullptr);
--  net::CompletionCallback on_get_backend =
--      base::Bind(&OnGetBackend, base::Owned(backend_ptr), action, callback);
--  int rv = http_cache->GetBackend(backend_ptr, on_get_backend);
--  if (rv != net::ERR_IO_PENDING)
--    on_get_backend.Run(net::OK);
--}
--
--void SetProxyInIO(scoped_refptr<net::URLRequestContextGetter> getter,
--                  const net::ProxyConfig& config,
--                  const base::Closure& callback) {
--  auto* proxy_service =
--      getter->GetURLRequestContext()->proxy_resolution_service();
--  proxy_service->ResetConfigService(
--      base::WrapUnique(new net::ProxyConfigServiceFixed(config)));
--  // Refetches and applies the new pac script if provided.
--  proxy_service->ForceReloadProxyConfig();
--  RunCallbackInUI(callback);
--}
--
--void SetCertVerifyProcInIO(
--    const scoped_refptr<net::URLRequestContextGetter>& context_getter,
--    const AtomCertVerifier::VerifyProc& proc) {
--  auto* request_context = context_getter->GetURLRequestContext();
--  static_cast<AtomCertVerifier*>(request_context->cert_verifier())
--      ->SetVerifyProc(proc);
--}
--
--void ClearHostResolverCacheInIO(
--    const scoped_refptr<net::URLRequestContextGetter>& context_getter,
--    const base::Closure& callback) {
--  auto* request_context = context_getter->GetURLRequestContext();
--  auto* cache = request_context->host_resolver()->GetHostCache();
--  if (cache) {
--    cache->clear();
--    DCHECK_EQ(0u, cache->size());
--    if (!callback.is_null())
--      RunCallbackInUI(callback);
--  }
--}
--
--void ClearAuthCacheInIO(
--    const scoped_refptr<net::URLRequestContextGetter>& context_getter,
--    const ClearAuthCacheOptions& options,
--    const base::Closure& callback) {
--  auto* request_context = context_getter->GetURLRequestContext();
--  auto* network_session =
--      request_context->http_transaction_factory()->GetSession();
--  if (network_session) {
--    if (options.type == "password") {
--      auto* auth_cache = network_session->http_auth_cache();
--      if (!options.origin.is_empty()) {
--        auth_cache->Remove(
--            options.origin, options.realm, options.auth_scheme,
--            net::AuthCredentials(options.username, options.password));
--      } else {
--        auth_cache->ClearEntriesAddedWithin(base::TimeDelta::Max());
--      }
--    } else if (options.type == "clientCertificate") {
--      auto* client_auth_cache = network_session->ssl_client_auth_cache();
--      client_auth_cache->Remove(net::HostPortPair::FromURL(options.origin));
--    }
--    network_session->CloseAllConnections();
--  }
--  if (!callback.is_null())
--    RunCallbackInUI(callback);
--}
--
--void AllowNTLMCredentialsForDomainsInIO(
--    const scoped_refptr<net::URLRequestContextGetter>& context_getter,
--    const std::string& domains) {
--  auto* request_context = context_getter->GetURLRequestContext();
--  auto* auth_handler = request_context->http_auth_handler_factory();
--  if (auth_handler) {
--    auto* auth_preferences = const_cast<net::HttpAuthPreferences*>(
--        auth_handler->http_auth_preferences());
--    if (auth_preferences)
--      auth_preferences->SetServerWhitelist(domains);
--  }
--}
--
--void OnClearStorageDataDone(const base::Closure& callback) {
--  if (!callback.is_null())
--    callback.Run();
--}
--
--void DownloadIdCallback(content::DownloadManager* download_manager,
--                        const base::FilePath& path,
--                        const std::vector<GURL>& url_chain,
--                        const std::string& mime_type,
--                        int64_t offset,
--                        int64_t length,
--                        const std::string& last_modified,
--                        const std::string& etag,
--                        const base::Time& start_time,
--                        uint32_t id) {
--  download_manager->CreateDownloadItem(
--      base::GenerateGUID(), id, path, path, url_chain, GURL(), GURL(), GURL(),
--      GURL(), mime_type, mime_type, start_time, base::Time(), etag,
--      last_modified, offset, length, std::string(),
--      download::DownloadItem::INTERRUPTED,
--      download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
--      download::DOWNLOAD_INTERRUPT_REASON_NETWORK_TIMEOUT, false, base::Time(),
--      false, std::vector<download::DownloadItem::ReceivedSlice>());
--}
--
--void SetDevToolsNetworkEmulationClientIdInIO(
--    brightray::URLRequestContextGetter* url_request_context_getter,
--    const std::string& client_id) {
--  if (!url_request_context_getter)
--    return;
--  net::URLRequestContext* context =
--      url_request_context_getter->GetURLRequestContext();
--  AtomNetworkDelegate* network_delegate =
--      static_cast<AtomNetworkDelegate*>(context->network_delegate());
--  network_delegate->SetDevToolsNetworkEmulationClientId(client_id);
--}
--
--void DestroyGlobalHandle(v8::Isolate* isolate,
--                         const v8::Global<v8::Value>& global_handle) {
--  v8::Locker locker(isolate);
--  v8::HandleScope handle_scope(isolate);
--  if (!global_handle.IsEmpty()) {
--    v8::Local<v8::Value> local_handle = global_handle.Get(isolate);
--    if (local_handle->IsObject()) {
--      v8::Local<v8::Object> object = local_handle->ToObject();
--      void* ptr = object->GetAlignedPointerFromInternalField(0);
--      if (!ptr)
--        return;
--      delete static_cast<mate::WrappableBase*>(ptr);
--      object->SetAlignedPointerInInternalField(0, nullptr);
--    }
--  }
--}
--
--}  // namespace
--
--Session::Session(v8::Isolate* isolate, AtomBrowserContext* browser_context)
--    : devtools_network_emulation_client_id_(base::GenerateGUID()),
--      browser_context_(browser_context) {
--  // Observe DownloadManager to get download notifications.
--  content::BrowserContext::GetDownloadManager(browser_context)
--      ->AddObserver(this);
--
--  new SessionPreferences(browser_context);
--
--  Init(isolate);
--  AttachAsUserData(browser_context);
--}
--
--Session::~Session() {
--  content::BrowserContext::GetDownloadManager(browser_context())
--      ->RemoveObserver(this);
--  DestroyGlobalHandle(isolate(), cookies_);
--  DestroyGlobalHandle(isolate(), web_request_);
--  DestroyGlobalHandle(isolate(), protocol_);
--  g_sessions.erase(weak_map_id());
--}
--
--void Session::OnDownloadCreated(content::DownloadManager* manager,
--                                download::DownloadItem* item) {
--  if (item->IsSavePackageDownload())
--    return;
--
--  v8::Locker locker(isolate());
--  v8::HandleScope handle_scope(isolate());
--  auto handle = DownloadItem::Create(isolate(), item);
--  if (item->GetState() == download::DownloadItem::INTERRUPTED)
--    handle->SetSavePath(item->GetTargetFilePath());
--  content::WebContents* web_contents =
--      content::DownloadItemUtils::GetWebContents(item);
--  bool prevent_default = Emit("will-download", handle, web_contents);
--  if (prevent_default) {
--    item->Cancel(true);
--    item->Remove();
--  }
--}
--
--void Session::ResolveProxy(const GURL& url, ResolveProxyCallback callback) {
--  new ResolveProxyHelper(browser_context(), url, callback);
--}
--
--template <Session::CacheAction action>
--void Session::DoCacheAction(const net::CompletionCallback& callback) {
--  BrowserThread::PostTask(
--      BrowserThread::IO, FROM_HERE,
--      base::BindOnce(&DoCacheActionInIO,
--                     WrapRefCounted(browser_context_->GetRequestContext()),
--                     action, callback));
--}
--
--void Session::ClearStorageData(mate::Arguments* args) {
--  // clearStorageData([options, callback])
--  ClearStorageDataOptions options;
--  base::Closure callback;
--  args->GetNext(&options);
--  args->GetNext(&callback);
--
--  auto* storage_partition =
--      content::BrowserContext::GetStoragePartition(browser_context(), nullptr);
--  if (options.storage_types & StoragePartition::REMOVE_DATA_MASK_COOKIES) {
--    // Reset media device id salt when cookies are cleared.
--    // https://w3c.github.io/mediacapture-main/#dom-mediadeviceinfo-deviceid
--    brightray::MediaDeviceIDSalt::Reset(browser_context()->prefs());
--  }
--  storage_partition->ClearData(
--      options.storage_types, options.quota_types, options.origin,
--      content::StoragePartition::OriginMatcherFunction(), base::Time(),
--      base::Time::Max(), base::Bind(&OnClearStorageDataDone, callback));
--}
--
--void Session::FlushStorageData() {
--  auto* storage_partition =
--      content::BrowserContext::GetStoragePartition(browser_context(), nullptr);
--  storage_partition->Flush();
--}
--
--void Session::SetProxy(const net::ProxyConfig& config,
--                       const base::Closure& callback) {
--  auto* getter = browser_context_->GetRequestContext();
--  BrowserThread::PostTask(
--      BrowserThread::IO, FROM_HERE,
--      base::BindOnce(&SetProxyInIO, base::RetainedRef(getter), config,
--                     callback));
--}
--
--void Session::SetDownloadPath(const base::FilePath& path) {
--  browser_context_->prefs()->SetFilePath(prefs::kDownloadDefaultDirectory,
--                                         path);
--}
--
--void Session::EnableNetworkEmulation(const mate::Dictionary& options) {
--  std::unique_ptr<network::NetworkConditions> conditions;
--  bool offline = false;
--  double latency = 0.0, download_throughput = 0.0, upload_throughput = 0.0;
--  if (options.Get("offline", &offline) && offline) {
--    conditions.reset(new network::NetworkConditions(offline));
--  } else {
--    options.Get("latency", &latency);
--    options.Get("downloadThroughput", &download_throughput);
--    options.Get("uploadThroughput", &upload_throughput);
--    conditions.reset(new network::NetworkConditions(
--        false, latency, download_throughput, upload_throughput));
--  }
--
--  network::ThrottlingController::SetConditions(
--      devtools_network_emulation_client_id_, std::move(conditions));
--  BrowserThread::PostTask(
--      BrowserThread::IO, FROM_HERE,
--      base::BindOnce(&SetDevToolsNetworkEmulationClientIdInIO,
--                     base::RetainedRef(browser_context_->GetRequestContext()),
--                     devtools_network_emulation_client_id_));
--}
--
--void Session::DisableNetworkEmulation() {
--  auto conditions = std::make_unique<network::NetworkConditions>();
--  network::ThrottlingController::SetConditions(
--      devtools_network_emulation_client_id_, std::move(conditions));
--  BrowserThread::PostTask(
--      BrowserThread::IO, FROM_HERE,
--      base::BindOnce(&SetDevToolsNetworkEmulationClientIdInIO,
--                     base::RetainedRef(browser_context_->GetRequestContext()),
--                     std::string()));
--}
--
--void Session::SetCertVerifyProc(v8::Local<v8::Value> val,
--                                mate::Arguments* args) {
--  AtomCertVerifier::VerifyProc proc;
--  if (!(val->IsNull() || mate::ConvertFromV8(args->isolate(), val, &proc))) {
--    args->ThrowError("Must pass null or function");
--    return;
--  }
--
--  BrowserThread::PostTask(
--      BrowserThread::IO, FROM_HERE,
--      base::BindOnce(&SetCertVerifyProcInIO,
--                     WrapRefCounted(browser_context_->GetRequestContext()),
--                     proc));
--}
--
--void Session::SetPermissionRequestHandler(v8::Local<v8::Value> val,
--                                          mate::Arguments* args) {
--  AtomPermissionManager::RequestHandler handler;
--  if (!(val->IsNull() || mate::ConvertFromV8(args->isolate(), val, &handler))) {
--    args->ThrowError("Must pass null or function");
--    return;
--  }
--  auto* permission_manager = static_cast<AtomPermissionManager*>(
--      browser_context()->GetPermissionManager());
--  permission_manager->SetPermissionRequestHandler(handler);
--}
--
--void Session::ClearHostResolverCache(mate::Arguments* args) {
--  base::Closure callback;
--  args->GetNext(&callback);
--
--  BrowserThread::PostTask(
--      BrowserThread::IO, FROM_HERE,
--      base::BindOnce(&ClearHostResolverCacheInIO,
--                     WrapRefCounted(browser_context_->GetRequestContext()),
--                     callback));
--}
--
--void Session::ClearAuthCache(mate::Arguments* args) {
--  ClearAuthCacheOptions options;
--  if (!args->GetNext(&options)) {
--    args->ThrowError("Must specify options object");
--    return;
--  }
--  base::Closure callback;
--  args->GetNext(&callback);
--
--  BrowserThread::PostTask(
--      BrowserThread::IO, FROM_HERE,
--      base::BindOnce(&ClearAuthCacheInIO,
--                     WrapRefCounted(browser_context_->GetRequestContext()),
--                     options, callback));
--}
--
--void Session::AllowNTLMCredentialsForDomains(const std::string& domains) {
--  BrowserThread::PostTask(
--      BrowserThread::IO, FROM_HERE,
--      base::BindOnce(&AllowNTLMCredentialsForDomainsInIO,
--                     WrapRefCounted(browser_context_->GetRequestContext()),
--                     domains));
--}
--
--void Session::SetUserAgent(const std::string& user_agent,
--                           mate::Arguments* args) {
--  browser_context_->SetUserAgent(user_agent);
--
--  std::string accept_lang = g_browser_process->GetApplicationLocale();
--  args->GetNext(&accept_lang);
--
--  scoped_refptr<brightray::URLRequestContextGetter> getter(
--      browser_context_->GetRequestContext());
--  getter->GetNetworkTaskRunner()->PostTask(
--      FROM_HERE,
--      base::BindOnce(&SetUserAgentInIO, getter, accept_lang, user_agent));
--}
--
--std::string Session::GetUserAgent() {
--  return browser_context_->GetUserAgent();
--}
--
--void Session::GetBlobData(const std::string& uuid,
--                          const AtomBlobReader::CompletionCallback& callback) {
--  if (callback.is_null())
--    return;
--
--  AtomBlobReader* blob_reader = browser_context()->GetBlobReader();
--  BrowserThread::PostTask(
--      BrowserThread::IO, FROM_HERE,
--      base::BindOnce(&AtomBlobReader::StartReading,
--                     base::Unretained(blob_reader), uuid, callback));
--}
--
--void Session::CreateInterruptedDownload(const mate::Dictionary& options) {
--  int64_t offset = 0, length = 0;
--  double start_time = 0.0;
--  std::string mime_type, last_modified, etag;
--  base::FilePath path;
--  std::vector<GURL> url_chain;
--  options.Get("path", &path);
--  options.Get("urlChain", &url_chain);
--  options.Get("mimeType", &mime_type);
--  options.Get("offset", &offset);
--  options.Get("length", &length);
--  options.Get("lastModified", &last_modified);
--  options.Get("eTag", &etag);
--  options.Get("startTime", &start_time);
--  if (path.empty() || url_chain.empty() || length == 0) {
--    isolate()->ThrowException(v8::Exception::Error(mate::StringToV8(
--        isolate(), "Must pass non-empty path, urlChain and length.")));
--    return;
--  }
--  if (offset >= length) {
--    isolate()->ThrowException(v8::Exception::Error(mate::StringToV8(
--        isolate(), "Must pass an offset value less than length.")));
--    return;
--  }
--  auto* download_manager =
--      content::BrowserContext::GetDownloadManager(browser_context());
--  download_manager->GetDelegate()->GetNextId(base::Bind(
--      &DownloadIdCallback, download_manager, path, url_chain, mime_type, offset,
--      length, last_modified, etag, base::Time::FromDoubleT(start_time)));
--}
--
--void Session::SetPreloads(
--    const std::vector<base::FilePath::StringType>& preloads) {
--  auto* prefs = SessionPreferences::FromBrowserContext(browser_context());
--  DCHECK(prefs);
--  prefs->set_preloads(preloads);
--}
--
--std::vector<base::FilePath::StringType> Session::GetPreloads() const {
--  auto* prefs = SessionPreferences::FromBrowserContext(browser_context());
--  DCHECK(prefs);
--  return prefs->preloads();
--}
--
--v8::Local<v8::Value> Session::Cookies(v8::Isolate* isolate) {
--  if (cookies_.IsEmpty()) {
--    auto handle = Cookies::Create(isolate, browser_context());
--    cookies_.Reset(isolate, handle.ToV8());
--  }
--  return v8::Local<v8::Value>::New(isolate, cookies_);
--}
--
--v8::Local<v8::Value> Session::Protocol(v8::Isolate* isolate) {
--  if (protocol_.IsEmpty()) {
--    auto handle = atom::api::Protocol::Create(isolate, browser_context());
--    protocol_.Reset(isolate, handle.ToV8());
--  }
--  return v8::Local<v8::Value>::New(isolate, protocol_);
--}
--
--v8::Local<v8::Value> Session::WebRequest(v8::Isolate* isolate) {
--  if (web_request_.IsEmpty()) {
--    auto handle = atom::api::WebRequest::Create(isolate, browser_context());
--    web_request_.Reset(isolate, handle.ToV8());
--  }
--  return v8::Local<v8::Value>::New(isolate, web_request_);
--}
--
--// static
--mate::Handle<Session> Session::CreateFrom(v8::Isolate* isolate,
--                                          AtomBrowserContext* browser_context) {
--  auto* existing = TrackableObject::FromWrappedClass(isolate, browser_context);
--  if (existing)
--    return mate::CreateHandle(isolate, static_cast<Session*>(existing));
--
--  auto handle =
--      mate::CreateHandle(isolate, new Session(isolate, browser_context));
--
--  // The Sessions should never be garbage collected, since the common pattern is
--  // to use partition strings, instead of using the Session object directly.
--  g_sessions[handle->weak_map_id()] =
--      v8::Global<v8::Object>(isolate, handle.ToV8());
--
--  return handle;
--}
--
--// static
--mate::Handle<Session> Session::FromPartition(
--    v8::Isolate* isolate,
--    const std::string& partition,
--    const base::DictionaryValue& options) {
--  scoped_refptr<AtomBrowserContext> browser_context;
--  if (partition.empty()) {
--    browser_context = AtomBrowserContext::From("", false, options);
--  } else if (base::StartsWith(partition, kPersistPrefix,
--                              base::CompareCase::SENSITIVE)) {
--    std::string name = partition.substr(8);
--    browser_context = AtomBrowserContext::From(name, false, options);
--  } else {
--    browser_context = AtomBrowserContext::From(partition, true, options);
--  }
--  return CreateFrom(isolate, browser_context.get());
--}
--
--// static
--void Session::BuildPrototype(v8::Isolate* isolate,
--                             v8::Local<v8::FunctionTemplate> prototype) {
--  prototype->SetClassName(mate::StringToV8(isolate, "Session"));
--  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
--      .MakeDestroyable()
--      .SetMethod("resolveProxy", &Session::ResolveProxy)
--      .SetMethod("getCacheSize", &Session::DoCacheAction<CacheAction::STATS>)
--      .SetMethod("clearCache", &Session::DoCacheAction<CacheAction::CLEAR>)
--      .SetMethod("clearStorageData", &Session::ClearStorageData)
--      .SetMethod("flushStorageData", &Session::FlushStorageData)
--      .SetMethod("setProxy", &Session::SetProxy)
--      .SetMethod("setDownloadPath", &Session::SetDownloadPath)
--      .SetMethod("enableNetworkEmulation", &Session::EnableNetworkEmulation)
--      .SetMethod("disableNetworkEmulation", &Session::DisableNetworkEmulation)
--      .SetMethod("setCertificateVerifyProc", &Session::SetCertVerifyProc)
--      .SetMethod("setPermissionRequestHandler",
--                 &Session::SetPermissionRequestHandler)
--      .SetMethod("clearHostResolverCache", &Session::ClearHostResolverCache)
--      .SetMethod("clearAuthCache", &Session::ClearAuthCache)
--      .SetMethod("allowNTLMCredentialsForDomains",
--                 &Session::AllowNTLMCredentialsForDomains)
--      .SetMethod("setUserAgent", &Session::SetUserAgent)
--      .SetMethod("getUserAgent", &Session::GetUserAgent)
--      .SetMethod("getBlobData", &Session::GetBlobData)
--      .SetMethod("createInterruptedDownload",
--                 &Session::CreateInterruptedDownload)
--      .SetMethod("setPreloads", &Session::SetPreloads)
--      .SetMethod("getPreloads", &Session::GetPreloads)
--      .SetProperty("cookies", &Session::Cookies)
--      .SetProperty("protocol", &Session::Protocol)
--      .SetProperty("webRequest", &Session::WebRequest);
--}
--
--}  // namespace api
--
--}  // namespace atom
--
--namespace {
--
--using atom::api::Session;
--
--v8::Local<v8::Value> FromPartition(const std::string& partition,
--                                   mate::Arguments* args) {
--  if (!atom::Browser::Get()->is_ready()) {
--    args->ThrowError("Session can only be received when app is ready");
--    return v8::Null(args->isolate());
--  }
--  base::DictionaryValue options;
--  args->GetNext(&options);
--  return Session::FromPartition(args->isolate(), partition, options).ToV8();
--}
--
--void Initialize(v8::Local<v8::Object> exports,
--                v8::Local<v8::Value> unused,
--                v8::Local<v8::Context> context,
--                void* priv) {
--  v8::Isolate* isolate = context->GetIsolate();
--  mate::Dictionary dict(isolate, exports);
--  dict.Set("Session", Session::GetConstructor(isolate)->GetFunction());
--  dict.Set("Cookies", Cookies::GetConstructor(isolate)->GetFunction());
--  dict.SetMethod("fromPartition", &FromPartition);
--}
--
--}  // namespace
--
--NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_session, Initialize)
-removed in remote
-  base   100644 02d8ba5cdec0dca3a0c11cf128ab12d61684b61d atom/browser/api/atom_api_session.h
-  our    100644 6c8247c5c4a90e643712dd47d000d37d181a147b atom/browser/api/atom_api_session.h
-@@ -1,118 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_API_ATOM_API_SESSION_H_
--#define ATOM_BROWSER_API_ATOM_API_SESSION_H_
--
--#include <string>
--#include <vector>
--
--#include "atom/browser/api/trackable_object.h"
--#include "atom/browser/atom_blob_reader.h"
--#include "base/values.h"
--#include "content/public/browser/download_manager.h"
--#include "native_mate/handle.h"
--#include "net/base/completion_callback.h"
--
--class GURL;
--
--namespace base {
--class FilePath;
--}
--
--namespace mate {
--class Arguments;
--class Dictionary;
--}  // namespace mate
--
--namespace net {
--class ProxyConfig;
--}
--
--namespace atom {
--
--class AtomBrowserContext;
--
--namespace api {
--
--class Session : public mate::TrackableObject<Session>,
--                public content::DownloadManager::Observer {
-- public:
--  using ResolveProxyCallback = base::Callback<void(std::string)>;
--
--  enum class CacheAction {
--    CLEAR,
--    STATS,
--  };
--
--  // Gets or creates Session from the |browser_context|.
--  static mate::Handle<Session> CreateFrom(v8::Isolate* isolate,
--                                          AtomBrowserContext* browser_context);
--
--  // Gets the Session of |partition|.
--  static mate::Handle<Session> FromPartition(
--      v8::Isolate* isolate,
--      const std::string& partition,
--      const base::DictionaryValue& options = base::DictionaryValue());
--
--  AtomBrowserContext* browser_context() const { return browser_context_.get(); }
--
--  // mate::TrackableObject:
--  static void BuildPrototype(v8::Isolate* isolate,
--                             v8::Local<v8::FunctionTemplate> prototype);
--
--  // Methods.
--  void ResolveProxy(const GURL& url, ResolveProxyCallback callback);
--  template <CacheAction action>
--  void DoCacheAction(const net::CompletionCallback& callback);
--  void ClearStorageData(mate::Arguments* args);
--  void FlushStorageData();
--  void SetProxy(const net::ProxyConfig& config, const base::Closure& callback);
--  void SetDownloadPath(const base::FilePath& path);
--  void EnableNetworkEmulation(const mate::Dictionary& options);
--  void DisableNetworkEmulation();
--  void SetCertVerifyProc(v8::Local<v8::Value> proc, mate::Arguments* args);
--  void SetPermissionRequestHandler(v8::Local<v8::Value> val,
--                                   mate::Arguments* args);
--  void ClearHostResolverCache(mate::Arguments* args);
--  void ClearAuthCache(mate::Arguments* args);
--  void AllowNTLMCredentialsForDomains(const std::string& domains);
--  void SetUserAgent(const std::string& user_agent, mate::Arguments* args);
--  std::string GetUserAgent();
--  void GetBlobData(const std::string& uuid,
--                   const AtomBlobReader::CompletionCallback& callback);
--  void CreateInterruptedDownload(const mate::Dictionary& options);
--  void SetPreloads(const std::vector<base::FilePath::StringType>& preloads);
--  std::vector<base::FilePath::StringType> GetPreloads() const;
--  v8::Local<v8::Value> Cookies(v8::Isolate* isolate);
--  v8::Local<v8::Value> Protocol(v8::Isolate* isolate);
--  v8::Local<v8::Value> WebRequest(v8::Isolate* isolate);
--
-- protected:
--  Session(v8::Isolate* isolate, AtomBrowserContext* browser_context);
--  ~Session() override;
--
--  // content::DownloadManager::Observer:
--  void OnDownloadCreated(content::DownloadManager* manager,
--                         download::DownloadItem* item) override;
--
-- private:
--  // Cached object.
--  v8::Global<v8::Value> cookies_;
--  v8::Global<v8::Value> protocol_;
--  v8::Global<v8::Value> web_request_;
--
--  // The X-DevTools-Emulate-Network-Conditions-Client-Id.
--  std::string devtools_network_emulation_client_id_;
--
--  scoped_refptr<AtomBrowserContext> browser_context_;
--
--  DISALLOW_COPY_AND_ASSIGN(Session);
--};
--
--}  // namespace api
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_API_ATOM_API_SESSION_H_
-removed in remote
-  base   100644 5f351f4850499922ca36ae3643561cdb0d08b8d0 atom/browser/api/atom_api_tray.cc
-  our    100644 552563bacfcda3120cbb6aa63822fff8b4a9beaa atom/browser/api/atom_api_tray.cc
-@@ -1,262 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/api/atom_api_tray.h"
--
--#include <string>
--
--#include "atom/browser/api/atom_api_menu.h"
--#include "atom/browser/browser.h"
--#include "atom/common/api/atom_api_native_image.h"
--#include "atom/common/native_mate_converters/gfx_converter.h"
--#include "atom/common/native_mate_converters/image_converter.h"
--#include "atom/common/native_mate_converters/string16_converter.h"
--#include "atom/common/node_includes.h"
--#include "base/threading/thread_task_runner_handle.h"
--#include "native_mate/constructor.h"
--#include "native_mate/dictionary.h"
--#include "ui/gfx/image/image.h"
--
--namespace mate {
--
--template <>
--struct Converter<atom::TrayIcon::HighlightMode> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     atom::TrayIcon::HighlightMode* out) {
--    std::string mode;
--    if (ConvertFromV8(isolate, val, &mode)) {
--      if (mode == "always") {
--        *out = atom::TrayIcon::HighlightMode::ALWAYS;
--        return true;
--      }
--      if (mode == "selection") {
--        *out = atom::TrayIcon::HighlightMode::SELECTION;
--        return true;
--      }
--      if (mode == "never") {
--        *out = atom::TrayIcon::HighlightMode::NEVER;
--        return true;
--      }
--    }
--    return false;
--  }
--};
--}  // namespace mate
--
--namespace atom {
--
--namespace api {
--
--Tray::Tray(v8::Isolate* isolate,
--           v8::Local<v8::Object> wrapper,
--           mate::Handle<NativeImage> image)
--    : tray_icon_(TrayIcon::Create()) {
--  SetImage(isolate, image);
--  tray_icon_->AddObserver(this);
--
--  InitWith(isolate, wrapper);
--}
--
--Tray::~Tray() {
--  // Destroy the native tray in next tick.
--  base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE,
--                                                  tray_icon_.release());
--}
--
--// static
--mate::WrappableBase* Tray::New(mate::Handle<NativeImage> image,
--                               mate::Arguments* args) {
--  if (!Browser::Get()->is_ready()) {
--    args->ThrowError("Cannot create Tray before app is ready");
--    return nullptr;
--  }
--  return new Tray(args->isolate(), args->GetThis(), image);
--}
--
--void Tray::OnClicked(const gfx::Rect& bounds,
--                     const gfx::Point& location,
--                     int modifiers) {
--  EmitWithFlags("click", modifiers, bounds, location);
--}
--
--void Tray::OnDoubleClicked(const gfx::Rect& bounds, int modifiers) {
--  EmitWithFlags("double-click", modifiers, bounds);
--}
--
--void Tray::OnRightClicked(const gfx::Rect& bounds, int modifiers) {
--  EmitWithFlags("right-click", modifiers, bounds);
--}
--
--void Tray::OnBalloonShow() {
--  Emit("balloon-show");
--}
--
--void Tray::OnBalloonClicked() {
--  Emit("balloon-click");
--}
--
--void Tray::OnBalloonClosed() {
--  Emit("balloon-closed");
--}
--
--void Tray::OnDrop() {
--  Emit("drop");
--}
--
--void Tray::OnDropFiles(const std::vector<std::string>& files) {
--  Emit("drop-files", files);
--}
--
--void Tray::OnDropText(const std::string& text) {
--  Emit("drop-text", text);
--}
--
--void Tray::OnMouseEntered(const gfx::Point& location, int modifiers) {
--  EmitWithFlags("mouse-enter", modifiers, location);
--}
--
--void Tray::OnMouseExited(const gfx::Point& location, int modifiers) {
--  EmitWithFlags("mouse-leave", modifiers, location);
--}
--
--void Tray::OnMouseMoved(const gfx::Point& location, int modifiers) {
--  EmitWithFlags("mouse-move", modifiers, location);
--}
--
--void Tray::OnDragEntered() {
--  Emit("drag-enter");
--}
--
--void Tray::OnDragExited() {
--  Emit("drag-leave");
--}
--
--void Tray::OnDragEnded() {
--  Emit("drag-end");
--}
--
--void Tray::SetImage(v8::Isolate* isolate, mate::Handle<NativeImage> image) {
--#if defined(OS_WIN)
--  tray_icon_->SetImage(image->GetHICON(GetSystemMetrics(SM_CXSMICON)));
--#else
--  tray_icon_->SetImage(image->image());
--#endif
--}
--
--void Tray::SetPressedImage(v8::Isolate* isolate,
--                           mate::Handle<NativeImage> image) {
--#if defined(OS_WIN)
--  tray_icon_->SetPressedImage(image->GetHICON(GetSystemMetrics(SM_CXSMICON)));
--#else
--  tray_icon_->SetPressedImage(image->image());
--#endif
--}
--
--void Tray::SetToolTip(const std::string& tool_tip) {
--  tray_icon_->SetToolTip(tool_tip);
--}
--
--void Tray::SetTitle(const std::string& title) {
--  tray_icon_->SetTitle(title);
--}
--
--void Tray::SetHighlightMode(TrayIcon::HighlightMode mode) {
--  tray_icon_->SetHighlightMode(mode);
--}
--
--void Tray::SetIgnoreDoubleClickEvents(bool ignore) {
--#if defined(OS_MACOSX)
--  tray_icon_->SetIgnoreDoubleClickEvents(ignore);
--#endif
--}
--
--bool Tray::GetIgnoreDoubleClickEvents() {
--#if defined(OS_MACOSX)
--  return tray_icon_->GetIgnoreDoubleClickEvents();
--#else
--  return false;
--#endif
--}
--
--void Tray::DisplayBalloon(mate::Arguments* args,
--                          const mate::Dictionary& options) {
--  mate::Handle<NativeImage> icon;
--  options.Get("icon", &icon);
--  base::string16 title, content;
--  if (!options.Get("title", &title) || !options.Get("content", &content)) {
--    args->ThrowError("'title' and 'content' must be defined");
--    return;
--  }
--
--#if defined(OS_WIN)
--  tray_icon_->DisplayBalloon(
--      icon.IsEmpty() ? NULL : icon->GetHICON(GetSystemMetrics(SM_CXSMICON)),
--      title, content);
--#else
--  tray_icon_->DisplayBalloon(icon.IsEmpty() ? gfx::Image() : icon->image(),
--                             title, content);
--#endif
--}
--
--void Tray::PopUpContextMenu(mate::Arguments* args) {
--  mate::Handle<Menu> menu;
--  args->GetNext(&menu);
--  gfx::Point pos;
--  args->GetNext(&pos);
--  tray_icon_->PopUpContextMenu(pos, menu.IsEmpty() ? nullptr : menu->model());
--}
--
--void Tray::SetContextMenu(v8::Isolate* isolate, mate::Handle<Menu> menu) {
--  menu_.Reset(isolate, menu.ToV8());
--  tray_icon_->SetContextMenu(menu->model());
--}
--
--gfx::Rect Tray::GetBounds() {
--  return tray_icon_->GetBounds();
--}
--
--// static
--void Tray::BuildPrototype(v8::Isolate* isolate,
--                          v8::Local<v8::FunctionTemplate> prototype) {
--  prototype->SetClassName(mate::StringToV8(isolate, "Tray"));
--  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
--      .MakeDestroyable()
--      .SetMethod("setImage", &Tray::SetImage)
--      .SetMethod("setPressedImage", &Tray::SetPressedImage)
--      .SetMethod("setToolTip", &Tray::SetToolTip)
--      .SetMethod("setTitle", &Tray::SetTitle)
--      .SetMethod("setHighlightMode", &Tray::SetHighlightMode)
--      .SetMethod("setIgnoreDoubleClickEvents",
--                 &Tray::SetIgnoreDoubleClickEvents)
--      .SetMethod("getIgnoreDoubleClickEvents",
--                 &Tray::GetIgnoreDoubleClickEvents)
--      .SetMethod("displayBalloon", &Tray::DisplayBalloon)
--      .SetMethod("popUpContextMenu", &Tray::PopUpContextMenu)
--      .SetMethod("setContextMenu", &Tray::SetContextMenu)
--      .SetMethod("getBounds", &Tray::GetBounds);
--}
--
--}  // namespace api
--
--}  // namespace atom
--
--namespace {
--
--using atom::api::Tray;
--
--void Initialize(v8::Local<v8::Object> exports,
--                v8::Local<v8::Value> unused,
--                v8::Local<v8::Context> context,
--                void* priv) {
--  v8::Isolate* isolate = context->GetIsolate();
--  Tray::SetConstructor(isolate, base::Bind(&Tray::New));
--
--  mate::Dictionary dict(isolate, exports);
--  dict.Set("Tray", Tray::GetConstructor(isolate)->GetFunction());
--}
--
--}  // namespace
--
--NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_tray, Initialize)
-removed in remote
-  base   100644 0e0d153ad0d3adf3944961d2482f554cc8e01650 atom/browser/api/atom_api_tray.h
-  our    100644 2ccb836d6299ef4b88c652f3c14c47d4f50a689c atom/browser/api/atom_api_tray.h
-@@ -1,91 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_API_ATOM_API_TRAY_H_
--#define ATOM_BROWSER_API_ATOM_API_TRAY_H_
--
--#include <memory>
--#include <string>
--#include <vector>
--
--#include "atom/browser/api/trackable_object.h"
--#include "atom/browser/ui/tray_icon.h"
--#include "atom/browser/ui/tray_icon_observer.h"
--#include "native_mate/handle.h"
--
--namespace gfx {
--class Image;
--}
--
--namespace mate {
--class Arguments;
--class Dictionary;
--}  // namespace mate
--
--namespace atom {
--
--class TrayIcon;
--
--namespace api {
--
--class Menu;
--class NativeImage;
--
--class Tray : public mate::TrackableObject<Tray>, public TrayIconObserver {
-- public:
--  static mate::WrappableBase* New(mate::Handle<NativeImage> image,
--                                  mate::Arguments* args);
--
--  static void BuildPrototype(v8::Isolate* isolate,
--                             v8::Local<v8::FunctionTemplate> prototype);
--
-- protected:
--  Tray(v8::Isolate* isolate,
--       v8::Local<v8::Object> wrapper,
--       mate::Handle<NativeImage> image);
--  ~Tray() override;
--
--  // TrayIconObserver:
--  void OnClicked(const gfx::Rect& bounds,
--                 const gfx::Point& location,
--                 int modifiers) override;
--  void OnDoubleClicked(const gfx::Rect& bounds, int modifiers) override;
--  void OnRightClicked(const gfx::Rect& bounds, int modifiers) override;
--  void OnBalloonShow() override;
--  void OnBalloonClicked() override;
--  void OnBalloonClosed() override;
--  void OnDrop() override;
--  void OnDropFiles(const std::vector<std::string>& files) override;
--  void OnDropText(const std::string& text) override;
--  void OnDragEntered() override;
--  void OnDragExited() override;
--  void OnDragEnded() override;
--  void OnMouseEntered(const gfx::Point& location, int modifiers) override;
--  void OnMouseExited(const gfx::Point& location, int modifiers) override;
--  void OnMouseMoved(const gfx::Point& location, int modifiers) override;
--
--  void SetImage(v8::Isolate* isolate, mate::Handle<NativeImage> image);
--  void SetPressedImage(v8::Isolate* isolate, mate::Handle<NativeImage> image);
--  void SetToolTip(const std::string& tool_tip);
--  void SetTitle(const std::string& title);
--  void SetHighlightMode(TrayIcon::HighlightMode mode);
--  void SetIgnoreDoubleClickEvents(bool ignore);
--  bool GetIgnoreDoubleClickEvents();
--  void DisplayBalloon(mate::Arguments* args, const mate::Dictionary& options);
--  void PopUpContextMenu(mate::Arguments* args);
--  void SetContextMenu(v8::Isolate* isolate, mate::Handle<Menu> menu);
--  gfx::Rect GetBounds();
--
-- private:
--  v8::Global<v8::Object> menu_;
--  std::unique_ptr<TrayIcon> tray_icon_;
--
--  DISALLOW_COPY_AND_ASSIGN(Tray);
--};
--
--}  // namespace api
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_API_ATOM_API_TRAY_H_
-removed in remote
-  base   100644 db561708086ec253d80ba6d961556eaf892ff106 atom/browser/api/atom_api_web_contents.cc
-  our    100644 20a1ac2e672f08ffea528b6e094ba530ff8083d1 atom/browser/api/atom_api_web_contents.cc
-@@ -1,2132 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/api/atom_api_web_contents.h"
--
--#include <set>
--#include <string>
--
--// We have problems with redefinition of ssize_t between node.h and
--// port_chromium.h, and the latter was introduced by leveldb.mojom.h.
--// The best solution is to not include content/browser/frame_host/ headers
--// and node.h in the same file, but for now I'm just working around the
--// problem.
--#if defined(OS_WIN)
--#define COMPONENTS_SERVICES_LEVELDB_PUBLIC_INTERFACES_LEVELDB_MOJOM_H_
--#define COMPONENTS_LEVELDB_PUBLIC_INTERFACES_LEVELDB_MOJOM_H_
--#endif
--
--#include "atom/browser/api/atom_api_browser_window.h"
--#include "atom/browser/api/atom_api_debugger.h"
--#include "atom/browser/api/atom_api_session.h"
--#include "atom/browser/atom_browser_client.h"
--#include "atom/browser/atom_browser_context.h"
--#include "atom/browser/atom_browser_main_parts.h"
--#include "atom/browser/atom_javascript_dialog_manager.h"
--#include "atom/browser/child_web_contents_tracker.h"
--#include "atom/browser/lib/bluetooth_chooser.h"
--#include "atom/browser/native_window.h"
--#include "atom/browser/net/atom_network_delegate.h"
--#if defined(ENABLE_OSR)
--#include "atom/browser/osr/osr_output_device.h"
--#include "atom/browser/osr/osr_render_widget_host_view.h"
--#include "atom/browser/osr/osr_web_contents_view.h"
--#endif
--#include "atom/browser/ui/drag_util.h"
--#include "atom/browser/web_contents_permission_helper.h"
--#include "atom/browser/web_contents_preferences.h"
--#include "atom/browser/web_contents_zoom_controller.h"
--#include "atom/browser/web_view_guest_delegate.h"
--#include "atom/common/api/api_messages.h"
--#include "atom/common/api/atom_api_native_image.h"
--#include "atom/common/api/event_emitter_caller.h"
--#include "atom/common/color_util.h"
--#include "atom/common/mouse_util.h"
--#include "atom/common/native_mate_converters/blink_converter.h"
--#include "atom/common/native_mate_converters/callback.h"
--#include "atom/common/native_mate_converters/content_converter.h"
--#include "atom/common/native_mate_converters/file_path_converter.h"
--#include "atom/common/native_mate_converters/gfx_converter.h"
--#include "atom/common/native_mate_converters/gurl_converter.h"
--#include "atom/common/native_mate_converters/image_converter.h"
--#include "atom/common/native_mate_converters/net_converter.h"
--#include "atom/common/native_mate_converters/network_converter.h"
--#include "atom/common/native_mate_converters/string16_converter.h"
--#include "atom/common/native_mate_converters/value_converter.h"
--#include "atom/common/options_switches.h"
--#include "base/message_loop/message_loop.h"
--#include "base/process/process_handle.h"
--#include "base/strings/utf_string_conversions.h"
--#include "base/threading/thread_task_runner_handle.h"
--#include "base/values.h"
--#include "brightray/browser/inspectable_web_contents.h"
--#include "brightray/browser/inspectable_web_contents_view.h"
--#include "chrome/browser/browser_process.h"
--#include "chrome/browser/printing/print_preview_message_handler.h"
--#include "chrome/browser/printing/print_view_manager_basic.h"
--#include "chrome/browser/ssl/security_state_tab_helper.h"
--#include "content/browser/frame_host/frame_tree_node.h"
--#include "content/browser/frame_host/render_frame_host_manager.h"
--#include "content/browser/renderer_host/render_widget_host_impl.h"
--#include "content/browser/renderer_host/render_widget_host_view_base.h"
--#include "content/common/view_messages.h"
--#include "content/public/browser/child_process_security_policy.h"
--#include "content/public/browser/download_request_utils.h"
--#include "content/public/browser/favicon_status.h"
--#include "content/public/browser/native_web_keyboard_event.h"
--#include "content/public/browser/navigation_details.h"
--#include "content/public/browser/navigation_entry.h"
--#include "content/public/browser/navigation_handle.h"
--#include "content/public/browser/plugin_service.h"
--#include "content/public/browser/render_frame_host.h"
--#include "content/public/browser/render_process_host.h"
--#include "content/public/browser/render_view_host.h"
--#include "content/public/browser/render_widget_host.h"
--#include "content/public/browser/render_widget_host_view.h"
--#include "content/public/browser/service_worker_context.h"
--#include "content/public/browser/site_instance.h"
--#include "content/public/browser/storage_partition.h"
--#include "content/public/browser/web_contents.h"
--#include "content/public/common/context_menu_params.h"
--#include "native_mate/converter.h"
--#include "native_mate/dictionary.h"
--#include "native_mate/object_template_builder.h"
--#include "net/url_request/url_request_context.h"
--#include "third_party/WebKit/public/platform/WebInputEvent.h"
--#include "third_party/WebKit/public/web/WebFindOptions.h"
--#include "ui/display/screen.h"
--#include "ui/events/base_event_utils.h"
--
--#if !defined(OS_MACOSX)
--#include "ui/aura/window.h"
--#endif
--
--#if defined(OS_LINUX) || defined(OS_WIN)
--#include "content/public/common/renderer_preferences.h"
--#include "ui/gfx/font_render_params.h"
--#endif
--
--#include "atom/common/node_includes.h"
--
--namespace {
--
--struct PrintSettings {
--  bool silent;
--  bool print_background;
--  base::string16 device_name;
--};
--}  // namespace
--
--namespace mate {
--
--template <>
--struct Converter<PrintSettings> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     PrintSettings* out) {
--    mate::Dictionary dict;
--    if (!ConvertFromV8(isolate, val, &dict))
--      return false;
--    dict.Get("silent", &(out->silent));
--    dict.Get("printBackground", &(out->print_background));
--    dict.Get("deviceName", &(out->device_name));
--    return true;
--  }
--};
--
--template <>
--struct Converter<printing::PrinterBasicInfo> {
--  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
--                                   const printing::PrinterBasicInfo& val) {
--    mate::Dictionary dict(isolate, v8::Object::New(isolate));
--    dict.Set("name", val.printer_name);
--    dict.Set("description", val.printer_description);
--    dict.Set("status", val.printer_status);
--    dict.Set("isDefault", val.is_default ? true : false);
--    dict.Set("options", val.options);
--    return dict.GetHandle();
--  }
--};
--
--template <>
--struct Converter<WindowOpenDisposition> {
--  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
--                                   WindowOpenDisposition val) {
--    std::string disposition = "other";
--    switch (val) {
--      case WindowOpenDisposition::CURRENT_TAB:
--        disposition = "default";
--        break;
--      case WindowOpenDisposition::NEW_FOREGROUND_TAB:
--        disposition = "foreground-tab";
--        break;
--      case WindowOpenDisposition::NEW_BACKGROUND_TAB:
--        disposition = "background-tab";
--        break;
--      case WindowOpenDisposition::NEW_POPUP:
--      case WindowOpenDisposition::NEW_WINDOW:
--        disposition = "new-window";
--        break;
--      case WindowOpenDisposition::SAVE_TO_DISK:
--        disposition = "save-to-disk";
--        break;
--      default:
--        break;
--    }
--    return mate::ConvertToV8(isolate, disposition);
--  }
--};
--
--template <>
--struct Converter<content::SavePageType> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     content::SavePageType* out) {
--    std::string save_type;
--    if (!ConvertFromV8(isolate, val, &save_type))
--      return false;
--    save_type = base::ToLowerASCII(save_type);
--    if (save_type == "htmlonly") {
--      *out = content::SAVE_PAGE_TYPE_AS_ONLY_HTML;
--    } else if (save_type == "htmlcomplete") {
--      *out = content::SAVE_PAGE_TYPE_AS_COMPLETE_HTML;
--    } else if (save_type == "mhtml") {
--      *out = content::SAVE_PAGE_TYPE_AS_MHTML;
--    } else {
--      return false;
--    }
--    return true;
--  }
--};
--
--template <>
--struct Converter<atom::api::WebContents::Type> {
--  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
--                                   atom::api::WebContents::Type val) {
--    using Type = atom::api::WebContents::Type;
--    std::string type = "";
--    switch (val) {
--      case Type::BACKGROUND_PAGE:
--        type = "backgroundPage";
--        break;
--      case Type::BROWSER_WINDOW:
--        type = "window";
--        break;
--      case Type::BROWSER_VIEW:
--        type = "browserView";
--        break;
--      case Type::REMOTE:
--        type = "remote";
--        break;
--      case Type::WEB_VIEW:
--        type = "webview";
--        break;
--      case Type::OFF_SCREEN:
--        type = "offscreen";
--        break;
--      default:
--        break;
--    }
--    return mate::ConvertToV8(isolate, type);
--  }
--
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     atom::api::WebContents::Type* out) {
--    using Type = atom::api::WebContents::Type;
--    std::string type;
--    if (!ConvertFromV8(isolate, val, &type))
--      return false;
--    if (type == "backgroundPage") {
--      *out = Type::BACKGROUND_PAGE;
--    } else if (type == "browserView") {
--      *out = Type::BROWSER_VIEW;
--    } else if (type == "webview") {
--      *out = Type::WEB_VIEW;
--#if defined(ENABLE_OSR)
--    } else if (type == "offscreen") {
--      *out = Type::OFF_SCREEN;
--#endif
--    } else {
--      return false;
--    }
--    return true;
--  }
--};
--
--}  // namespace mate
--
--namespace atom {
--
--namespace api {
--
--namespace {
--
--content::ServiceWorkerContext* GetServiceWorkerContext(
--    const content::WebContents* web_contents) {
--  auto* context = web_contents->GetBrowserContext();
--  auto* site_instance = web_contents->GetSiteInstance();
--  if (!context || !site_instance)
--    return nullptr;
--
--  auto* storage_partition =
--      content::BrowserContext::GetStoragePartition(context, site_instance);
--  if (!storage_partition)
--    return nullptr;
--
--  return storage_partition->GetServiceWorkerContext();
--}
--
--// Called when CapturePage is done.
--void OnCapturePageDone(const base::Callback<void(const gfx::Image&)>& callback,
--                       const SkBitmap& bitmap) {
--  // Hack to enable transparency in captured image
--  // TODO(nitsakh) Remove hack once fixed in chromium
--  const_cast<SkBitmap&>(bitmap).setAlphaType(kPremul_SkAlphaType);
--  callback.Run(gfx::Image::CreateFrom1xBitmap(bitmap));
--}
--
--}  // namespace
--
--struct WebContents::FrameDispatchHelper {
--  WebContents* api_web_contents;
--  content::RenderFrameHost* rfh;
--
--  bool Send(IPC::Message* msg) { return rfh->Send(msg); }
--
--  void OnSetTemporaryZoomLevel(double level, IPC::Message* reply_msg) {
--    api_web_contents->OnSetTemporaryZoomLevel(rfh, level, reply_msg);
--  }
--
--  void OnGetZoomLevel(IPC::Message* reply_msg) {
--    api_web_contents->OnGetZoomLevel(rfh, reply_msg);
--  }
--
--  void OnRendererMessageSync(const base::string16& channel,
--                             const base::ListValue& args,
--                             IPC::Message* message) {
--    api_web_contents->OnRendererMessageSync(rfh, channel, args, message);
--  }
--};
--
--WebContents::WebContents(v8::Isolate* isolate,
--                         content::WebContents* web_contents,
--                         Type type)
--    : content::WebContentsObserver(web_contents), type_(type) {
--  const mate::Dictionary options = mate::Dictionary::CreateEmpty(isolate);
--  if (type == REMOTE) {
--    web_contents->SetUserAgentOverride(GetBrowserContext()->GetUserAgent());
--    Init(isolate);
--    AttachAsUserData(web_contents);
--    InitZoomController(web_contents, options);
--  } else {
--    auto session = Session::CreateFrom(isolate, GetBrowserContext());
--    session_.Reset(isolate, session.ToV8());
--    InitWithSessionAndOptions(isolate, web_contents, session, options);
--  }
--}
--
--WebContents::WebContents(v8::Isolate* isolate,
--                         const mate::Dictionary& options) {
--  // Read options.
--  options.Get("backgroundThrottling", &background_throttling_);
--
--  // FIXME(zcbenz): We should read "type" parameter for better design, but
--  // on Windows we have encountered a compiler bug that if we read "type"
--  // from |options| and then set |type_|, a memory corruption will happen
--  // and Electron will soon crash.
--  // Remvoe this after we upgraded to use VS 2015 Update 3.
--  bool b = false;
--  if (options.Get("isGuest", &b) && b)
--    type_ = WEB_VIEW;
--  else if (options.Get("isBackgroundPage", &b) && b)
--    type_ = BACKGROUND_PAGE;
--  else if (options.Get("isBrowserView", &b) && b)
--    type_ = BROWSER_VIEW;
--#if defined(ENABLE_OSR)
--  else if (options.Get(options::kOffscreen, &b) && b)
--    type_ = OFF_SCREEN;
--#endif
--
--  // Init embedder earlier
--  options.Get("embedder", &embedder_);
--
--  // Whether to enable DevTools.
--  options.Get("devTools", &enable_devtools_);
--
--  // Obtain the session.
--  std::string partition;
--  mate::Handle<api::Session> session;
--  if (options.Get("session", &session) && !session.IsEmpty()) {
--  } else if (options.Get("partition", &partition)) {
--    session = Session::FromPartition(isolate, partition);
--  } else {
--    // Use the default session if not specified.
--    session = Session::FromPartition(isolate, "");
--  }
--  session_.Reset(isolate, session.ToV8());
--
--  content::WebContents* web_contents;
--  if (IsGuest()) {
--    scoped_refptr<content::SiteInstance> site_instance =
--        content::SiteInstance::CreateForURL(session->browser_context(),
--                                            GURL("chrome-guest://fake-host"));
--    content::WebContents::CreateParams params(session->browser_context(),
--                                              site_instance);
--    guest_delegate_.reset(
--        new WebViewGuestDelegate(embedder_->web_contents(), this));
--    params.guest_delegate = guest_delegate_.get();
--
--#if defined(ENABLE_OSR)
--    if (embedder_ && embedder_->IsOffScreen()) {
--      auto* view = new OffScreenWebContentsView(
--          false, base::Bind(&WebContents::OnPaint, base::Unretained(this)));
--      params.view = view;
--      params.delegate_view = view;
--
--      web_contents = content::WebContents::Create(params);
--      view->SetWebContents(web_contents);
--    } else {
--#endif
--      web_contents = content::WebContents::Create(params);
--#if defined(ENABLE_OSR)
--    }
--  } else if (IsOffScreen()) {
--    bool transparent = false;
--    options.Get("transparent", &transparent);
--
--    content::WebContents::CreateParams params(session->browser_context());
--    auto* view = new OffScreenWebContentsView(
--        transparent, base::Bind(&WebContents::OnPaint, base::Unretained(this)));
--    params.view = view;
--    params.delegate_view = view;
--
--    web_contents = content::WebContents::Create(params);
--    view->SetWebContents(web_contents);
--#endif
--  } else {
--    content::WebContents::CreateParams params(session->browser_context());
--    web_contents = content::WebContents::Create(params);
--  }
--
--  InitWithSessionAndOptions(isolate, web_contents, session, options);
--}
--
--void WebContents::InitZoomController(content::WebContents* web_contents,
--                                     const mate::Dictionary& options) {
--  WebContentsZoomController::CreateForWebContents(web_contents);
--  zoom_controller_ = WebContentsZoomController::FromWebContents(web_contents);
--  double zoom_factor;
--  if (options.Get(options::kZoomFactor, &zoom_factor))
--    zoom_controller_->SetDefaultZoomFactor(zoom_factor);
--}
--
--void WebContents::InitWithSessionAndOptions(v8::Isolate* isolate,
--                                            content::WebContents* web_contents,
--                                            mate::Handle<api::Session> session,
--                                            const mate::Dictionary& options) {
--  Observe(web_contents);
--  InitWithWebContents(web_contents, session->browser_context(), IsGuest());
--
--  managed_web_contents()->GetView()->SetDelegate(this);
--
--  auto* prefs = web_contents->GetMutableRendererPrefs();
--  prefs->accept_languages = g_browser_process->GetApplicationLocale();
--
--#if defined(OS_LINUX) || defined(OS_WIN)
--  // Update font settings.
--  CR_DEFINE_STATIC_LOCAL(
--      const gfx::FontRenderParams, params,
--      (gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr)));
--  prefs->should_antialias_text = params.antialiasing;
--  prefs->use_subpixel_positioning = params.subpixel_positioning;
--  prefs->hinting = params.hinting;
--  prefs->use_autohinter = params.autohinter;
--  prefs->use_bitmaps = params.use_bitmaps;
--  prefs->subpixel_rendering = params.subpixel_rendering;
--#endif
--
--  // Save the preferences in C++.
--  new WebContentsPreferences(web_contents, options);
--
--  // Initialize permission helper.
--  WebContentsPermissionHelper::CreateForWebContents(web_contents);
--  // Initialize security state client.
--  SecurityStateTabHelper::CreateForWebContents(web_contents);
--  // Initialize zoom controller.
--  InitZoomController(web_contents, options);
--
--  web_contents->SetUserAgentOverride(GetBrowserContext()->GetUserAgent());
--
--  if (IsGuest()) {
--    NativeWindow* owner_window = nullptr;
--    if (embedder_) {
--      // New WebContents's owner_window is the embedder's owner_window.
--      auto* relay =
--          NativeWindowRelay::FromWebContents(embedder_->web_contents());
--      if (relay)
--        owner_window = relay->window.get();
--    }
--    if (owner_window)
--      SetOwnerWindow(owner_window);
--  }
--
--  Init(isolate);
--  AttachAsUserData(web_contents);
--}
--
--WebContents::~WebContents() {
--  // The destroy() is called.
--  if (managed_web_contents()) {
--    managed_web_contents()->GetView()->SetDelegate(nullptr);
--
--    RenderViewDeleted(web_contents()->GetRenderViewHost());
--
--    if (type_ == BROWSER_WINDOW && owner_window()) {
--      for (ExtendedWebContentsObserver& observer : observers_)
--        observer.OnCloseContents();
--    } else {
--      DestroyWebContents(!IsGuest() /* async */);
--    }
--    // The WebContentsDestroyed will not be called automatically because we
--    // destroy the webContents in the next tick. So we have to manually
--    // call it here to make sure "destroyed" event is emitted.
--    WebContentsDestroyed();
--  }
--}
--
--void WebContents::DestroyWebContents(bool async) {
--  // This event is only for internal use, which is emitted when WebContents is
--  // being destroyed.
--  Emit("will-destroy");
--  ResetManagedWebContents(async);
--}
--
--bool WebContents::DidAddMessageToConsole(content::WebContents* source,
--                                         int32_t level,
--                                         const base::string16& message,
--                                         int32_t line_no,
--                                         const base::string16& source_id) {
--  return Emit("console-message", level, message, line_no, source_id);
--}
--
--void WebContents::OnCreateWindow(
--    const GURL& target_url,
--    const content::Referrer& referrer,
--    const std::string& frame_name,
--    WindowOpenDisposition disposition,
--    const std::vector<std::string>& features,
--    const scoped_refptr<network::ResourceRequestBody>& body) {
--  if (type_ == BROWSER_WINDOW || type_ == OFF_SCREEN)
--    Emit("-new-window", target_url, frame_name, disposition, features, body,
--         referrer);
--  else
--    Emit("new-window", target_url, frame_name, disposition, features);
--}
--
--void WebContents::WebContentsCreated(content::WebContents* source_contents,
--                                     int opener_render_process_id,
--                                     int opener_render_frame_id,
--                                     const std::string& frame_name,
--                                     const GURL& target_url,
--                                     content::WebContents* new_contents) {
--  v8::Locker locker(isolate());
--  v8::HandleScope handle_scope(isolate());
--  auto api_web_contents = CreateFrom(isolate(), new_contents, BROWSER_WINDOW);
--  Emit("-web-contents-created", api_web_contents, target_url, frame_name);
--}
--
--void WebContents::AddNewContents(content::WebContents* source,
--                                 content::WebContents* new_contents,
--                                 WindowOpenDisposition disposition,
--                                 const gfx::Rect& initial_rect,
--                                 bool user_gesture,
--                                 bool* was_blocked) {
--  new ChildWebContentsTracker(new_contents);
--  v8::Locker locker(isolate());
--  v8::HandleScope handle_scope(isolate());
--  auto api_web_contents = CreateFrom(isolate(), new_contents);
--  if (Emit("-add-new-contents", api_web_contents, disposition, user_gesture,
--           initial_rect.x(), initial_rect.y(), initial_rect.width(),
--           initial_rect.height())) {
--    api_web_contents->DestroyWebContents(true /* async */);
--  }
--}
--
--content::WebContents* WebContents::OpenURLFromTab(
--    content::WebContents* source,
--    const content::OpenURLParams& params) {
--  if (params.disposition != WindowOpenDisposition::CURRENT_TAB) {
--    if (type_ == BROWSER_WINDOW || type_ == OFF_SCREEN)
--      Emit("-new-window", params.url, "", params.disposition);
--    else
--      Emit("new-window", params.url, "", params.disposition);
--    return nullptr;
--  }
--
--  // Give user a chance to cancel navigation.
--  if (Emit("will-navigate", params.url))
--    return nullptr;
--
--  // Don't load the URL if the web contents was marked as destroyed from a
--  // will-navigate event listener
--  if (IsDestroyed())
--    return nullptr;
--
--  return CommonWebContentsDelegate::OpenURLFromTab(source, params);
--}
--
--void WebContents::BeforeUnloadFired(content::WebContents* tab,
--                                    bool proceed,
--                                    bool* proceed_to_fire_unload) {
--  if (type_ == BROWSER_WINDOW || type_ == OFF_SCREEN)
--    *proceed_to_fire_unload = proceed;
--  else
--    *proceed_to_fire_unload = true;
--}
--
--void WebContents::MoveContents(content::WebContents* source,
--                               const gfx::Rect& pos) {
--  Emit("move", pos);
--}
--
--void WebContents::CloseContents(content::WebContents* source) {
--  Emit("close");
--#if defined(TOOLKIT_VIEWS) && !defined(OS_MACOSX)
--  HideAutofillPopup();
--#endif
--  if (managed_web_contents())
--    managed_web_contents()->GetView()->SetDelegate(nullptr);
--  for (ExtendedWebContentsObserver& observer : observers_)
--    observer.OnCloseContents();
--}
--
--void WebContents::ActivateContents(content::WebContents* source) {
--  Emit("activate");
--}
--
--void WebContents::UpdateTargetURL(content::WebContents* source,
--                                  const GURL& url) {
--  Emit("update-target-url", url);
--}
--
--bool WebContents::IsPopupOrPanel(const content::WebContents* source) const {
--  return type_ == BROWSER_WINDOW;
--}
--
--void WebContents::HandleKeyboardEvent(
--    content::WebContents* source,
--    const content::NativeWebKeyboardEvent& event) {
--  if (type_ == WEB_VIEW && embedder_) {
--    // Send the unhandled keyboard events back to the embedder.
--    embedder_->HandleKeyboardEvent(source, event);
--  } else {
--    // Go to the default keyboard handling.
--    CommonWebContentsDelegate::HandleKeyboardEvent(source, event);
--  }
--}
--
--content::KeyboardEventProcessingResult WebContents::PreHandleKeyboardEvent(
--    content::WebContents* source,
--    const content::NativeWebKeyboardEvent& event) {
--  if (event.GetType() == blink::WebInputEvent::Type::kRawKeyDown ||
--      event.GetType() == blink::WebInputEvent::Type::kKeyUp) {
--    bool prevent_default = Emit("before-input-event", event);
--    if (prevent_default) {
--      return content::KeyboardEventProcessingResult::HANDLED;
--    }
--  }
--
--  return content::KeyboardEventProcessingResult::NOT_HANDLED;
--}
--
--void WebContents::EnterFullscreenModeForTab(content::WebContents* source,
--                                            const GURL& origin) {
--  auto* permission_helper =
--      WebContentsPermissionHelper::FromWebContents(source);
--  auto callback = base::Bind(&WebContents::OnEnterFullscreenModeForTab,
--                             base::Unretained(this), source, origin);
--  permission_helper->RequestFullscreenPermission(callback);
--}
--
--void WebContents::OnEnterFullscreenModeForTab(content::WebContents* source,
--                                              const GURL& origin,
--                                              bool allowed) {
--  if (!allowed)
--    return;
--  CommonWebContentsDelegate::EnterFullscreenModeForTab(source, origin);
--  Emit("enter-html-full-screen");
--}
--
--void WebContents::ExitFullscreenModeForTab(content::WebContents* source) {
--  CommonWebContentsDelegate::ExitFullscreenModeForTab(source);
--  Emit("leave-html-full-screen");
--}
--
--void WebContents::RendererUnresponsive(
--    content::WebContents* source,
--    content::RenderWidgetHost* render_widget_host) {
--  Emit("unresponsive");
--}
--
--void WebContents::RendererResponsive(
--    content::WebContents* source,
--    content::RenderWidgetHost* render_widget_host) {
--  Emit("responsive");
--  for (ExtendedWebContentsObserver& observer : observers_)
--    observer.OnRendererResponsive();
--}
--
--bool WebContents::HandleContextMenu(const content::ContextMenuParams& params) {
--  if (params.custom_context.is_pepper_menu) {
--    Emit("pepper-context-menu", std::make_pair(params, web_contents()),
--         base::Bind(&content::WebContents::NotifyContextMenuClosed,
--                    base::Unretained(web_contents()), params.custom_context));
--  } else {
--    Emit("context-menu", std::make_pair(params, web_contents()));
--  }
--
--  return true;
--}
--
--bool WebContents::OnGoToEntryOffset(int offset) {
--  GoToOffset(offset);
--  return false;
--}
--
--void WebContents::FindReply(content::WebContents* web_contents,
--                            int request_id,
--                            int number_of_matches,
--                            const gfx::Rect& selection_rect,
--                            int active_match_ordinal,
--                            bool final_update) {
--  if (!final_update)
--    return;
--
--  v8::Locker locker(isolate());
--  v8::HandleScope handle_scope(isolate());
--  mate::Dictionary result = mate::Dictionary::CreateEmpty(isolate());
--  result.Set("requestId", request_id);
--  result.Set("matches", number_of_matches);
--  result.Set("selectionArea", selection_rect);
--  result.Set("activeMatchOrdinal", active_match_ordinal);
--  result.Set("finalUpdate", final_update);  // Deprecate after 2.0
--  Emit("found-in-page", result);
--}
--
--bool WebContents::CheckMediaAccessPermission(content::WebContents* web_contents,
--                                             const GURL& security_origin,
--                                             content::MediaStreamType type) {
--  return true;
--}
--
--void WebContents::RequestMediaAccessPermission(
--    content::WebContents* web_contents,
--    const content::MediaStreamRequest& request,
--    const content::MediaResponseCallback& callback) {
--  auto* permission_helper =
--      WebContentsPermissionHelper::FromWebContents(web_contents);
--  permission_helper->RequestMediaAccessPermission(request, callback);
--}
--
--void WebContents::RequestToLockMouse(content::WebContents* web_contents,
--                                     bool user_gesture,
--                                     bool last_unlocked_by_target) {
--  auto* permission_helper =
--      WebContentsPermissionHelper::FromWebContents(web_contents);
--  permission_helper->RequestPointerLockPermission(user_gesture);
--}
--
--std::unique_ptr<content::BluetoothChooser> WebContents::RunBluetoothChooser(
--    content::RenderFrameHost* frame,
--    const content::BluetoothChooser::EventHandler& event_handler) {
--  return std::make_unique<BluetoothChooser>(this, event_handler);
--}
--
--content::JavaScriptDialogManager* WebContents::GetJavaScriptDialogManager(
--    content::WebContents* source) {
--  if (!dialog_manager_)
--    dialog_manager_.reset(new AtomJavaScriptDialogManager(this));
--
--  return dialog_manager_.get();
--}
--
--void WebContents::BeforeUnloadFired(const base::TimeTicks& proceed_time) {
--  // Do nothing, we override this method just to avoid compilation error since
--  // there are two virtual functions named BeforeUnloadFired.
--}
--
--void WebContents::RenderViewCreated(content::RenderViewHost* render_view_host) {
--  auto* const impl = content::RenderWidgetHostImpl::FromID(
--      render_view_host->GetProcess()->GetID(),
--      render_view_host->GetRoutingID());
--  if (impl)
--    impl->disable_hidden_ = !background_throttling_;
--}
--
--void WebContents::RenderViewDeleted(content::RenderViewHost* render_view_host) {
--  Emit("render-view-deleted", render_view_host->GetProcess()->GetID());
--}
--
--void WebContents::RenderProcessGone(base::TerminationStatus status) {
--  Emit("crashed", status == base::TERMINATION_STATUS_PROCESS_WAS_KILLED);
--}
--
--void WebContents::PluginCrashed(const base::FilePath& plugin_path,
--                                base::ProcessId plugin_pid) {
--  content::WebPluginInfo info;
--  auto* plugin_service = content::PluginService::GetInstance();
--  plugin_service->GetPluginInfoByPath(plugin_path, &info);
--  Emit("plugin-crashed", info.name, info.version);
--}
--
--void WebContents::MediaStartedPlaying(const MediaPlayerInfo& video_type,
--                                      const MediaPlayerId& id) {
--  Emit("media-started-playing");
--}
--
--void WebContents::MediaStoppedPlaying(
--    const MediaPlayerInfo& video_type,
--    const MediaPlayerId& id,
--    content::WebContentsObserver::MediaStoppedReason reason) {
--  Emit("media-paused");
--}
--
--void WebContents::DidChangeThemeColor(SkColor theme_color) {
--  if (theme_color != SK_ColorTRANSPARENT) {
--    Emit("did-change-theme-color", atom::ToRGBHex(theme_color));
--  } else {
--    Emit("did-change-theme-color", nullptr);
--  }
--}
--
--void WebContents::DocumentLoadedInFrame(
--    content::RenderFrameHost* render_frame_host) {
--  if (!render_frame_host->GetParent())
--    Emit("dom-ready");
--}
--
--void WebContents::DidFinishLoad(content::RenderFrameHost* render_frame_host,
--                                const GURL& validated_url) {
--  bool is_main_frame = !render_frame_host->GetParent();
--  int frame_process_id = render_frame_host->GetProcess()->GetID();
--  int frame_routing_id = render_frame_host->GetRoutingID();
--  Emit("did-frame-finish-load", is_main_frame, frame_process_id,
--       frame_routing_id);
--
--  if (is_main_frame)
--    Emit("did-finish-load");
--}
--
--void WebContents::DidFailLoad(content::RenderFrameHost* render_frame_host,
--                              const GURL& url,
--                              int error_code,
--                              const base::string16& error_description) {
--  bool is_main_frame = !render_frame_host->GetParent();
--  int frame_process_id = render_frame_host->GetProcess()->GetID();
--  int frame_routing_id = render_frame_host->GetRoutingID();
--  Emit("did-fail-load", error_code, error_description, url, is_main_frame,
--       frame_process_id, frame_routing_id);
--}
--
--void WebContents::DidStartLoading() {
--  Emit("did-start-loading");
--}
--
--void WebContents::DidStopLoading() {
--  Emit("did-stop-loading");
--}
--
--void WebContents::DidStartNavigation(
--    content::NavigationHandle* navigation_handle) {
--  bool is_main_frame = navigation_handle->IsInMainFrame();
--  int frame_tree_node_id = navigation_handle->GetFrameTreeNodeId();
--  content::FrameTreeNode* frame_tree_node =
--      content::FrameTreeNode::GloballyFindByID(frame_tree_node_id);
--  content::RenderFrameHostManager* render_manager =
--      frame_tree_node->render_manager();
--  content::RenderFrameHost* frame_host = nullptr;
--  if (render_manager) {
--    frame_host = render_manager->speculative_frame_host();
--    if (!frame_host)
--      frame_host = render_manager->current_frame_host();
--  }
--  int frame_process_id = -1, frame_routing_id = -1;
--  if (frame_host) {
--    frame_process_id = frame_host->GetProcess()->GetID();
--    frame_routing_id = frame_host->GetRoutingID();
--  }
--  bool is_same_document = navigation_handle->IsSameDocument();
--  auto url = navigation_handle->GetURL();
--  Emit("did-start-navigation", url, is_same_document, is_main_frame,
--       frame_process_id, frame_routing_id);
--}
--
--void WebContents::DidFinishNavigation(
--    content::NavigationHandle* navigation_handle) {
--  if (!navigation_handle->HasCommitted())
--    return;
--  bool is_main_frame = navigation_handle->IsInMainFrame();
--  content::RenderFrameHost* frame_host =
--      navigation_handle->GetRenderFrameHost();
--  int frame_process_id = -1, frame_routing_id = -1;
--  if (frame_host) {
--    frame_process_id = frame_host->GetProcess()->GetID();
--    frame_routing_id = frame_host->GetRoutingID();
--  }
--  if (!navigation_handle->IsErrorPage()) {
--    auto url = navigation_handle->GetURL();
--    bool is_same_document = navigation_handle->IsSameDocument();
--    if (is_same_document) {
--      Emit("did-navigate-in-page", url, is_main_frame, frame_process_id,
--           frame_routing_id);
--    } else {
--      const net::HttpResponseHeaders* http_response =
--          navigation_handle->GetResponseHeaders();
--      std::string http_status_text;
--      int http_response_code = -1;
--      if (http_response) {
--        http_status_text = http_response->GetStatusText();
--        http_response_code = http_response->response_code();
--      }
--      Emit("did-frame-navigate", url, http_response_code, http_status_text,
--           is_main_frame, frame_process_id, frame_routing_id);
--      if (is_main_frame) {
--        Emit("did-navigate", url, http_response_code, http_status_text);
--      }
--    }
--    if (IsGuest())
--      Emit("load-commit", url, is_main_frame);
--  } else {
--    auto url = navigation_handle->GetURL();
--    int code = navigation_handle->GetNetErrorCode();
--    auto description = net::ErrorToShortString(code);
--    Emit("did-fail-provisional-load", code, description, url, is_main_frame,
--         frame_process_id, frame_routing_id);
--
--    // Do not emit "did-fail-load" for canceled requests.
--    if (code != net::ERR_ABORTED)
--      Emit("did-fail-load", code, description, url, is_main_frame,
--           frame_process_id, frame_routing_id);
--  }
--}
--
--void WebContents::TitleWasSet(content::NavigationEntry* entry) {
--  base::string16 final_title;
--  bool explicit_set = true;
--  if (entry) {
--    auto title = entry->GetTitle();
--    auto url = entry->GetURL();
--    if (url.SchemeIsFile() && title.empty()) {
--      final_title = base::UTF8ToUTF16(url.ExtractFileName());
--      explicit_set = false;
--    } else {
--      final_title = title;
--    }
--  }
--  Emit("page-title-updated", final_title, explicit_set);
--}
--
--void WebContents::DidUpdateFaviconURL(
--    const std::vector<content::FaviconURL>& urls) {
--  std::set<GURL> unique_urls;
--  for (const auto& iter : urls) {
--    if (iter.icon_type != content::FaviconURL::IconType::kFavicon)
--      continue;
--    const GURL& url = iter.icon_url;
--    if (url.is_valid())
--      unique_urls.insert(url);
--  }
--  Emit("page-favicon-updated", unique_urls);
--}
--
--void WebContents::DevToolsReloadPage() {
--  Emit("devtools-reload-page");
--}
--
--void WebContents::DevToolsFocused() {
--  Emit("devtools-focused");
--}
--
--void WebContents::DevToolsOpened() {
--  v8::Locker locker(isolate());
--  v8::HandleScope handle_scope(isolate());
--  auto handle = WebContents::CreateFrom(
--      isolate(), managed_web_contents()->GetDevToolsWebContents());
--  devtools_web_contents_.Reset(isolate(), handle.ToV8());
--
--  // Set inspected tabID.
--  base::Value tab_id(ID());
--  managed_web_contents()->CallClientFunction("DevToolsAPI.setInspectedTabId",
--                                             &tab_id, nullptr, nullptr);
--
--  // Inherit owner window in devtools when it doesn't have one.
--  auto* devtools = managed_web_contents()->GetDevToolsWebContents();
--  bool has_window = devtools->GetUserData(NativeWindowRelay::UserDataKey());
--  if (owner_window() && !has_window)
--    handle->SetOwnerWindow(devtools, owner_window());
--
--  Emit("devtools-opened");
--}
--
--void WebContents::DevToolsClosed() {
--  v8::Locker locker(isolate());
--  v8::HandleScope handle_scope(isolate());
--  devtools_web_contents_.Reset();
--
--  Emit("devtools-closed");
--}
--
--#if defined(TOOLKIT_VIEWS) && !defined(OS_MACOSX)
--void WebContents::ShowAutofillPopup(content::RenderFrameHost* frame_host,
--                                    const gfx::RectF& bounds,
--                                    const std::vector<base::string16>& values,
--                                    const std::vector<base::string16>& labels) {
--  bool offscreen = IsOffScreen() || (embedder_ && embedder_->IsOffScreen());
--  gfx::RectF popup_bounds(bounds);
--  content::RenderFrameHost* embedder_frame_host = nullptr;
--  if (embedder_) {
--    auto* embedder_view = embedder_->web_contents()->GetMainFrame()->GetView();
--    auto* view = web_contents()->GetMainFrame()->GetView();
--    auto offset = view->GetViewBounds().origin() -
--                  embedder_view->GetViewBounds().origin();
--    popup_bounds.Offset(offset.x(), offset.y());
--    embedder_frame_host = embedder_->web_contents()->GetMainFrame();
--  }
--
--  CommonWebContentsDelegate::ShowAutofillPopup(
--      frame_host, embedder_frame_host, offscreen, popup_bounds, values, labels);
--}
--#endif
--
--bool WebContents::OnMessageReceived(const IPC::Message& message) {
--  bool handled = true;
--  IPC_BEGIN_MESSAGE_MAP(WebContents, message)
--    IPC_MESSAGE_HANDLER_CODE(ViewHostMsg_SetCursor, OnCursorChange,
--                             handled = false)
--    IPC_MESSAGE_UNHANDLED(handled = false)
--  IPC_END_MESSAGE_MAP()
--
--  return handled;
--}
--
--bool WebContents::OnMessageReceived(const IPC::Message& message,
--                                    content::RenderFrameHost* frame_host) {
--  bool handled = true;
--  FrameDispatchHelper helper = {this, frame_host};
--  IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(WebContents, message, frame_host)
--    IPC_MESSAGE_HANDLER(AtomFrameHostMsg_Message, OnRendererMessage)
--    IPC_MESSAGE_FORWARD_DELAY_REPLY(AtomFrameHostMsg_Message_Sync, &helper,
--                                    FrameDispatchHelper::OnRendererMessageSync)
--    IPC_MESSAGE_FORWARD_DELAY_REPLY(
--        AtomFrameHostMsg_SetTemporaryZoomLevel, &helper,
--        FrameDispatchHelper::OnSetTemporaryZoomLevel)
--    IPC_MESSAGE_FORWARD_DELAY_REPLY(AtomFrameHostMsg_GetZoomLevel, &helper,
--                                    FrameDispatchHelper::OnGetZoomLevel)
--#if defined(TOOLKIT_VIEWS) && !defined(OS_MACOSX)
--    IPC_MESSAGE_HANDLER(AtomAutofillFrameHostMsg_ShowPopup, ShowAutofillPopup)
--    IPC_MESSAGE_HANDLER(AtomAutofillFrameHostMsg_HidePopup, HideAutofillPopup)
--#endif
--    IPC_MESSAGE_UNHANDLED(handled = false)
--  IPC_END_MESSAGE_MAP()
--
--  return handled;
--}
--
--// There are three ways of destroying a webContents:
--// 1. call webContents.destroy();
--// 2. garbage collection;
--// 3. user closes the window of webContents;
--// 4. the embedder detaches the frame.
--// For webview only #4 will happen, for BrowserWindow both #1 and #3 may
--// happen. The #2 should never happen for webContents, because webview is
--// managed by GuestViewManager, and BrowserWindow's webContents is managed
--// by api::BrowserWindow.
--// For #1, the destructor will do the cleanup work and we only need to make
--// sure "destroyed" event is emitted. For #3, the content::WebContents will
--// be destroyed on close, and WebContentsDestroyed would be called for it, so
--// we need to make sure the api::WebContents is also deleted.
--// For #4, the WebContents will be destroyed by embedder.
--void WebContents::WebContentsDestroyed() {
--  // Cleanup relationships with other parts.
--  RemoveFromWeakMap();
--
--  // We can not call Destroy here because we need to call Emit first, but we
--  // also do not want any method to be used, so just mark as destroyed here.
--  MarkDestroyed();
--
--  Emit("destroyed");
--
--  // For guest view based on OOPIF, the WebContents is released by the embedder
--  // frame, and we need to clear the reference to the memory.
--  if (IsGuest() && managed_web_contents()) {
--    managed_web_contents()->ReleaseWebContents();
--    ResetManagedWebContents(false);
--  }
--
--  // Destroy the native class in next tick.
--  base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, GetDestroyClosure());
--}
--
--void WebContents::NavigationEntryCommitted(
--    const content::LoadCommittedDetails& details) {
--  Emit("navigation-entry-commited", details.entry->GetURL(),
--       details.is_same_document, details.did_replace_entry);
--}
--
--int WebContents::GetProcessID() const {
--  return web_contents()->GetMainFrame()->GetProcess()->GetID();
--}
--
--base::ProcessId WebContents::GetOSProcessID() const {
--  base::ProcessHandle process_handle =
--      web_contents()->GetMainFrame()->GetProcess()->GetHandle();
--  return base::GetProcId(process_handle);
--}
--
--WebContents::Type WebContents::GetType() const {
--  return type_;
--}
--
--bool WebContents::Equal(const WebContents* web_contents) const {
--  return ID() == web_contents->ID();
--}
--
--void WebContents::LoadURL(const GURL& url, const mate::Dictionary& options) {
--  if (!url.is_valid() || url.spec().size() > url::kMaxURLChars) {
--    Emit("did-fail-load", static_cast<int>(net::ERR_INVALID_URL),
--         net::ErrorToShortString(net::ERR_INVALID_URL),
--         url.possibly_invalid_spec(), true);
--    return;
--  }
--
--  content::NavigationController::LoadURLParams params(url);
--
--  if (!options.Get("httpReferrer", &params.referrer)) {
--    GURL http_referrer;
--    if (options.Get("httpReferrer", &http_referrer))
--      params.referrer = content::Referrer(http_referrer.GetAsReferrer(),
--                                          blink::kWebReferrerPolicyDefault);
--  }
--
--  std::string user_agent;
--  if (options.Get("userAgent", &user_agent))
--    web_contents()->SetUserAgentOverride(user_agent);
--
--  std::string extra_headers;
--  if (options.Get("extraHeaders", &extra_headers))
--    params.extra_headers = extra_headers;
--
--  scoped_refptr<network::ResourceRequestBody> body;
--  if (options.Get("postData", &body)) {
--    params.post_data = body;
--    params.load_type = content::NavigationController::LOAD_TYPE_HTTP_POST;
--  }
--
--  GURL base_url_for_data_url;
--  if (options.Get("baseURLForDataURL", &base_url_for_data_url)) {
--    params.base_url_for_data_url = base_url_for_data_url;
--    params.load_type = content::NavigationController::LOAD_TYPE_DATA;
--  }
--
--  params.transition_type = ui::PAGE_TRANSITION_TYPED;
--  params.should_clear_history_list = true;
--  params.override_user_agent = content::NavigationController::UA_OVERRIDE_TRUE;
--  web_contents()->GetController().LoadURLWithParams(params);
--
--  // Set the background color of RenderWidgetHostView.
--  // We have to call it right after LoadURL because the RenderViewHost is only
--  // created after loading a page.
--  auto* const view = web_contents()->GetRenderWidgetHostView();
--  if (view) {
--    auto* web_preferences = WebContentsPreferences::From(web_contents());
--    std::string color_name;
--    if (web_preferences->GetPreference(options::kBackgroundColor,
--                                       &color_name)) {
--      view->SetBackgroundColor(ParseHexColor(color_name));
--    } else {
--      view->SetBackgroundColor(SK_ColorTRANSPARENT);
--    }
--  }
--}
--
--void WebContents::DownloadURL(const GURL& url) {
--  auto* browser_context = web_contents()->GetBrowserContext();
--  auto* download_manager =
--      content::BrowserContext::GetDownloadManager(browser_context);
--  std::unique_ptr<download::DownloadUrlParameters> download_params(
--      content::DownloadRequestUtils::CreateDownloadForWebContentsMainFrame(
--          web_contents(), url, NO_TRAFFIC_ANNOTATION_YET));
--  download_manager->DownloadUrl(std::move(download_params));
--}
--
--GURL WebContents::GetURL() const {
--  return web_contents()->GetURL();
--}
--
--base::string16 WebContents::GetTitle() const {
--  return web_contents()->GetTitle();
--}
--
--bool WebContents::IsLoading() const {
--  return web_contents()->IsLoading();
--}
--
--bool WebContents::IsLoadingMainFrame() const {
--  return web_contents()->IsLoadingToDifferentDocument();
--}
--
--bool WebContents::IsWaitingForResponse() const {
--  return web_contents()->IsWaitingForResponse();
--}
--
--void WebContents::Stop() {
--  web_contents()->Stop();
--}
--
--void WebContents::GoBack() {
--  atom::AtomBrowserClient::SuppressRendererProcessRestartForOnce();
--  web_contents()->GetController().GoBack();
--}
--
--void WebContents::GoForward() {
--  atom::AtomBrowserClient::SuppressRendererProcessRestartForOnce();
--  web_contents()->GetController().GoForward();
--}
--
--void WebContents::GoToOffset(int offset) {
--  atom::AtomBrowserClient::SuppressRendererProcessRestartForOnce();
--  web_contents()->GetController().GoToOffset(offset);
--}
--
--const std::string WebContents::GetWebRTCIPHandlingPolicy() const {
--  return web_contents()->GetMutableRendererPrefs()->webrtc_ip_handling_policy;
--}
--
--void WebContents::SetWebRTCIPHandlingPolicy(
--    const std::string& webrtc_ip_handling_policy) {
--  if (GetWebRTCIPHandlingPolicy() == webrtc_ip_handling_policy)
--    return;
--  web_contents()->GetMutableRendererPrefs()->webrtc_ip_handling_policy =
--      webrtc_ip_handling_policy;
--
--  content::RenderViewHost* host = web_contents()->GetRenderViewHost();
--  if (host)
--    host->SyncRendererPrefs();
--}
--
--bool WebContents::IsCrashed() const {
--  return web_contents()->IsCrashed();
--}
--
--void WebContents::SetUserAgent(const std::string& user_agent,
--                               mate::Arguments* args) {
--  web_contents()->SetUserAgentOverride(user_agent);
--}
--
--std::string WebContents::GetUserAgent() {
--  return web_contents()->GetUserAgentOverride();
--}
--
--bool WebContents::SavePage(const base::FilePath& full_file_path,
--                           const content::SavePageType& save_type,
--                           const SavePageHandler::SavePageCallback& callback) {
--  auto* handler = new SavePageHandler(web_contents(), callback);
--  return handler->Handle(full_file_path, save_type);
--}
--
--void WebContents::OpenDevTools(mate::Arguments* args) {
--  if (type_ == REMOTE)
--    return;
--
--  if (!enable_devtools_)
--    return;
--
--  std::string state;
--  if (type_ == WEB_VIEW || !owner_window()) {
--    state = "detach";
--  }
--  if (args && args->Length() == 1) {
--    mate::Dictionary options;
--    if (args->GetNext(&options)) {
--      options.Get("mode", &state);
--    }
--  }
--  managed_web_contents()->SetDockState(state);
--  managed_web_contents()->ShowDevTools();
--}
--
--void WebContents::CloseDevTools() {
--  if (type_ == REMOTE)
--    return;
--
--  managed_web_contents()->CloseDevTools();
--}
--
--bool WebContents::IsDevToolsOpened() {
--  if (type_ == REMOTE)
--    return false;
--
--  return managed_web_contents()->IsDevToolsViewShowing();
--}
--
--bool WebContents::IsDevToolsFocused() {
--  if (type_ == REMOTE)
--    return false;
--
--  return managed_web_contents()->GetView()->IsDevToolsViewFocused();
--}
--
--void WebContents::EnableDeviceEmulation(
--    const blink::WebDeviceEmulationParams& params) {
--  if (type_ == REMOTE)
--    return;
--
--  auto* frame_host = web_contents()->GetMainFrame();
--  if (frame_host) {
--    auto* widget_host =
--        frame_host ? frame_host->GetView()->GetRenderWidgetHost() : nullptr;
--    if (!widget_host)
--      return;
--    widget_host->Send(
--        new ViewMsg_EnableDeviceEmulation(widget_host->GetRoutingID(), params));
--  }
--}
--
--void WebContents::DisableDeviceEmulation() {
--  if (type_ == REMOTE)
--    return;
--
--  auto* frame_host = web_contents()->GetMainFrame();
--  if (frame_host) {
--    auto* widget_host =
--        frame_host ? frame_host->GetView()->GetRenderWidgetHost() : nullptr;
--    if (!widget_host)
--      return;
--    widget_host->Send(
--        new ViewMsg_DisableDeviceEmulation(widget_host->GetRoutingID()));
--  }
--}
--
--void WebContents::ToggleDevTools() {
--  if (IsDevToolsOpened())
--    CloseDevTools();
--  else
--    OpenDevTools(nullptr);
--}
--
--void WebContents::InspectElement(int x, int y) {
--  if (type_ == REMOTE)
--    return;
--
--  if (!enable_devtools_)
--    return;
--
--  if (!managed_web_contents()->GetDevToolsWebContents())
--    OpenDevTools(nullptr);
--  managed_web_contents()->InspectElement(x, y);
--}
--
--void WebContents::InspectServiceWorker() {
--  if (type_ == REMOTE)
--    return;
--
--  if (!enable_devtools_)
--    return;
--
--  for (const auto& agent_host : content::DevToolsAgentHost::GetOrCreateAll()) {
--    if (agent_host->GetType() ==
--        content::DevToolsAgentHost::kTypeServiceWorker) {
--      OpenDevTools(nullptr);
--      managed_web_contents()->AttachTo(agent_host);
--      break;
--    }
--  }
--}
--
--void WebContents::HasServiceWorker(const base::Callback<void(bool)>& callback) {
--  auto* context = GetServiceWorkerContext(web_contents());
--  if (!context)
--    return;
--
--  struct WrappedCallback {
--    base::Callback<void(bool)> callback_;
--    explicit WrappedCallback(const base::Callback<void(bool)>& callback)
--        : callback_(callback) {}
--    void Run(content::ServiceWorkerCapability capability) {
--      callback_.Run(capability !=
--                    content::ServiceWorkerCapability::NO_SERVICE_WORKER);
--      delete this;
--    }
--  };
--
--  auto* wrapped_callback = new WrappedCallback(callback);
--
--  context->CheckHasServiceWorker(
--      web_contents()->GetLastCommittedURL(), GURL::EmptyGURL(),
--      base::BindOnce(&WrappedCallback::Run,
--                     base::Unretained(wrapped_callback)));
--}
--
--void WebContents::UnregisterServiceWorker(
--    const base::Callback<void(bool)>& callback) {
--  auto* context = GetServiceWorkerContext(web_contents());
--  if (!context)
--    return;
--
--  context->UnregisterServiceWorker(web_contents()->GetLastCommittedURL(),
--                                   callback);
--}
--
--void WebContents::SetIgnoreMenuShortcuts(bool ignore) {
--  set_ignore_menu_shortcuts(ignore);
--}
--
--void WebContents::SetAudioMuted(bool muted) {
--  web_contents()->SetAudioMuted(muted);
--}
--
--bool WebContents::IsAudioMuted() {
--  return web_contents()->IsAudioMuted();
--}
--
--bool WebContents::IsCurrentlyAudible() {
--  return web_contents()->IsCurrentlyAudible();
--}
--
--void WebContents::Print(mate::Arguments* args) {
--  PrintSettings settings = {false, false, base::string16()};
--  if (args->Length() >= 1 && !args->GetNext(&settings)) {
--    args->ThrowError();
--    return;
--  }
--  auto* print_view_manager_basic_ptr =
--      printing::PrintViewManagerBasic::FromWebContents(web_contents());
--  if (args->Length() == 2) {
--    base::Callback<void(bool)> callback;
--    if (!args->GetNext(&callback)) {
--      args->ThrowError();
--      return;
--    }
--    print_view_manager_basic_ptr->SetCallback(callback);
--  }
--  print_view_manager_basic_ptr->PrintNow(
--      web_contents()->GetMainFrame(), settings.silent,
--      settings.print_background, settings.device_name);
--}
--
--std::vector<printing::PrinterBasicInfo> WebContents::GetPrinterList() {
--  std::vector<printing::PrinterBasicInfo> printers;
--  auto print_backend = printing::PrintBackend::CreateInstance(nullptr);
--  base::ThreadRestrictions::ScopedAllowIO allow_io;
--  print_backend->EnumeratePrinters(&printers);
--  return printers;
--}
--
--void WebContents::PrintToPDF(const base::DictionaryValue& setting,
--                             const PrintToPDFCallback& callback) {
--  printing::PrintPreviewMessageHandler::FromWebContents(web_contents())
--      ->PrintToPDF(setting, callback);
--}
--
--void WebContents::AddWorkSpace(mate::Arguments* args,
--                               const base::FilePath& path) {
--  if (path.empty()) {
--    args->ThrowError("path cannot be empty");
--    return;
--  }
--  DevToolsAddFileSystem(path);
--}
--
--void WebContents::RemoveWorkSpace(mate::Arguments* args,
--                                  const base::FilePath& path) {
--  if (path.empty()) {
--    args->ThrowError("path cannot be empty");
--    return;
--  }
--  DevToolsRemoveFileSystem(path);
--}
--
--void WebContents::Undo() {
--  web_contents()->Undo();
--}
--
--void WebContents::Redo() {
--  web_contents()->Redo();
--}
--
--void WebContents::Cut() {
--  web_contents()->Cut();
--}
--
--void WebContents::Copy() {
--  web_contents()->Copy();
--}
--
--void WebContents::Paste() {
--  web_contents()->Paste();
--}
--
--void WebContents::PasteAndMatchStyle() {
--  web_contents()->PasteAndMatchStyle();
--}
--
--void WebContents::Delete() {
--  web_contents()->Delete();
--}
--
--void WebContents::SelectAll() {
--  web_contents()->SelectAll();
--}
--
--void WebContents::Unselect() {
--  web_contents()->CollapseSelection();
--}
--
--void WebContents::Replace(const base::string16& word) {
--  web_contents()->Replace(word);
--}
--
--void WebContents::ReplaceMisspelling(const base::string16& word) {
--  web_contents()->ReplaceMisspelling(word);
--}
--
--uint32_t WebContents::FindInPage(mate::Arguments* args) {
--  uint32_t request_id = GetNextRequestId();
--  base::string16 search_text;
--  blink::WebFindOptions options;
--  if (!args->GetNext(&search_text) || search_text.empty()) {
--    args->ThrowError("Must provide a non-empty search content");
--    return 0;
--  }
--
--  args->GetNext(&options);
--
--  web_contents()->Find(request_id, search_text, options);
--  return request_id;
--}
--
--void WebContents::StopFindInPage(content::StopFindAction action) {
--  web_contents()->StopFinding(action);
--}
--
--void WebContents::ShowDefinitionForSelection() {
--#if defined(OS_MACOSX)
--  auto* const view = web_contents()->GetRenderWidgetHostView();
--  if (view)
--    view->ShowDefinitionForSelection();
--#endif
--}
--
--void WebContents::CopyImageAt(int x, int y) {
--  auto* const host = web_contents()->GetMainFrame();
--  if (host)
--    host->CopyImageAt(x, y);
--}
--
--void WebContents::Focus() {
--  web_contents()->Focus();
--}
--
--#if !defined(OS_MACOSX)
--bool WebContents::IsFocused() const {
--  auto* view = web_contents()->GetRenderWidgetHostView();
--  if (!view)
--    return false;
--
--  if (GetType() != BACKGROUND_PAGE) {
--    auto* window = web_contents()->GetNativeView()->GetToplevelWindow();
--    if (window && !window->IsVisible())
--      return false;
--  }
--
--  return view->HasFocus();
--}
--#endif
--
--void WebContents::TabTraverse(bool reverse) {
--  web_contents()->FocusThroughTabTraversal(reverse);
--}
--
--bool WebContents::SendIPCMessage(bool all_frames,
--                                 const base::string16& channel,
--                                 const base::ListValue& args) {
--  auto* frame_host = web_contents()->GetMainFrame();
--  if (frame_host) {
--    return frame_host->Send(new AtomFrameMsg_Message(
--        frame_host->GetRoutingID(), all_frames, channel, args));
--  }
--  return false;
--}
--
--void WebContents::SendInputEvent(v8::Isolate* isolate,
--                                 v8::Local<v8::Value> input_event) {
--  content::RenderWidgetHostView* view =
--      web_contents()->GetRenderWidgetHostView();
--  if (!view)
--    return;
--
--  content::RenderWidgetHost* rwh = view->GetRenderWidgetHost();
--  blink::WebInputEvent::Type type =
--      mate::GetWebInputEventType(isolate, input_event);
--  if (blink::WebInputEvent::IsMouseEventType(type)) {
--    blink::WebMouseEvent mouse_event;
--    if (mate::ConvertFromV8(isolate, input_event, &mouse_event)) {
--      if (IsOffScreen()) {
--#if defined(ENABLE_OSR)
--        GetOffScreenRenderWidgetHostView()->SendMouseEvent(mouse_event);
--#endif
--      } else {
--        rwh->ForwardMouseEvent(mouse_event);
--      }
--      return;
--    }
--  } else if (blink::WebInputEvent::IsKeyboardEventType(type)) {
--    content::NativeWebKeyboardEvent keyboard_event(
--        blink::WebKeyboardEvent::kRawKeyDown,
--        blink::WebInputEvent::kNoModifiers, ui::EventTimeForNow());
--    if (mate::ConvertFromV8(isolate, input_event, &keyboard_event)) {
--      rwh->ForwardKeyboardEvent(keyboard_event);
--      return;
--    }
--  } else if (type == blink::WebInputEvent::kMouseWheel) {
--    blink::WebMouseWheelEvent mouse_wheel_event;
--    if (mate::ConvertFromV8(isolate, input_event, &mouse_wheel_event)) {
--      if (IsOffScreen()) {
--#if defined(ENABLE_OSR)
--        GetOffScreenRenderWidgetHostView()->SendMouseWheelEvent(
--            mouse_wheel_event);
--#endif
--      } else {
--        rwh->ForwardWheelEvent(mouse_wheel_event);
--      }
--      return;
--    }
--  }
--
--  isolate->ThrowException(
--      v8::Exception::Error(mate::StringToV8(isolate, "Invalid event object")));
--}
--
--void WebContents::BeginFrameSubscription(mate::Arguments* args) {
--  bool only_dirty = false;
--  FrameSubscriber::FrameCaptureCallback callback;
--
--  args->GetNext(&only_dirty);
--  if (!args->GetNext(&callback)) {
--    args->ThrowError();
--    return;
--  }
--
--  frame_subscriber_.reset(
--      new FrameSubscriber(isolate(), web_contents(), callback, only_dirty));
--}
--
--void WebContents::EndFrameSubscription() {
--  frame_subscriber_.reset();
--}
--
--void WebContents::StartDrag(const mate::Dictionary& item,
--                            mate::Arguments* args) {
--  base::FilePath file;
--  std::vector<base::FilePath> files;
--  if (!item.Get("files", &files) && item.Get("file", &file)) {
--    files.push_back(file);
--  }
--
--  mate::Handle<NativeImage> icon;
--  if (!item.Get("icon", &icon) && !file.empty()) {
--    // TODO(zcbenz): Set default icon from file.
--  }
--
--  // Error checking.
--  if (icon.IsEmpty()) {
--    args->ThrowError("Must specify 'icon' option");
--    return;
--  }
--
--#if defined(OS_MACOSX)
--  // NSWindow.dragImage requires a non-empty NSImage
--  if (icon->image().IsEmpty()) {
--    args->ThrowError("Must specify non-empty 'icon' option");
--    return;
--  }
--#endif
--
--  // Start dragging.
--  if (!files.empty()) {
--    base::MessageLoop::ScopedNestableTaskAllower allow(
--        base::MessageLoop::current());
--    DragFileItems(files, icon->image(), web_contents()->GetNativeView());
--  } else {
--    args->ThrowError("Must specify either 'file' or 'files' option");
--  }
--}
--
--void WebContents::CapturePage(mate::Arguments* args) {
--  gfx::Rect rect;
--  base::Callback<void(const gfx::Image&)> callback;
--
--  if (!(args->Length() == 1 && args->GetNext(&callback)) &&
--      !(args->Length() == 2 && args->GetNext(&rect) &&
--        args->GetNext(&callback))) {
--    args->ThrowError();
--    return;
--  }
--
--  auto* const view = web_contents()->GetRenderWidgetHostView();
--  if (!view) {
--    callback.Run(gfx::Image());
--    return;
--  }
--
--  // Capture full page if user doesn't specify a |rect|.
--  const gfx::Size view_size =
--      rect.IsEmpty() ? view->GetViewBounds().size() : rect.size();
--
--  // By default, the requested bitmap size is the view size in screen
--  // coordinates.  However, if there's more pixel detail available on the
--  // current system, increase the requested bitmap size to capture it all.
--  gfx::Size bitmap_size = view_size;
--  const gfx::NativeView native_view = view->GetNativeView();
--  const float scale = display::Screen::GetScreen()
--                          ->GetDisplayNearestView(native_view)
--                          .device_scale_factor();
--  if (scale > 1.0f)
--    bitmap_size = gfx::ScaleToCeiledSize(view_size, scale);
--
--  view->CopyFromSurface(gfx::Rect(rect.origin(), view_size), bitmap_size,
--                        base::BindOnce(&OnCapturePageDone, callback));
--}
--
--void WebContents::OnCursorChange(const content::WebCursor& cursor) {
--  content::CursorInfo info;
--  cursor.GetCursorInfo(&info);
--
--  if (cursor.IsCustom()) {
--    Emit("cursor-changed", CursorTypeToString(info),
--         gfx::Image::CreateFrom1xBitmap(info.custom_image),
--         info.image_scale_factor,
--         gfx::Size(info.custom_image.width(), info.custom_image.height()),
--         info.hotspot);
--  } else {
--    Emit("cursor-changed", CursorTypeToString(info));
--  }
--}
--
--bool WebContents::IsGuest() const {
--  return type_ == WEB_VIEW;
--}
--
--void WebContents::AttachToIframe(content::WebContents* embedder_web_contents,
--                                 int embedder_frame_id) {
--  if (guest_delegate_)
--    guest_delegate_->AttachToIframe(embedder_web_contents, embedder_frame_id);
--}
--
--bool WebContents::IsOffScreen() const {
--#if defined(ENABLE_OSR)
--  return type_ == OFF_SCREEN;
--#else
--  return false;
--#endif
--}
--
--void WebContents::OnPaint(const gfx::Rect& dirty_rect, const SkBitmap& bitmap) {
--  Emit("paint", dirty_rect, gfx::Image::CreateFrom1xBitmap(bitmap));
--}
--
--void WebContents::StartPainting() {
--  if (!IsOffScreen())
--    return;
--
--#if defined(ENABLE_OSR)
--  auto* osr_wcv = GetOffScreenWebContentsView();
--  if (osr_wcv)
--    osr_wcv->SetPainting(true);
--#endif
--}
--
--void WebContents::StopPainting() {
--  if (!IsOffScreen())
--    return;
--
--#if defined(ENABLE_OSR)
--  auto* osr_wcv = GetOffScreenWebContentsView();
--  if (osr_wcv)
--    osr_wcv->SetPainting(false);
--#endif
--}
--
--bool WebContents::IsPainting() const {
--  if (!IsOffScreen())
--    return false;
--
--#if defined(ENABLE_OSR)
--  auto* osr_wcv = GetOffScreenWebContentsView();
--  return osr_wcv && osr_wcv->IsPainting();
--#else
--  return false;
--#endif
--}
--
--void WebContents::SetFrameRate(int frame_rate) {
--  if (!IsOffScreen())
--    return;
--
--#if defined(ENABLE_OSR)
--  auto* osr_wcv = GetOffScreenWebContentsView();
--  if (osr_wcv)
--    osr_wcv->SetFrameRate(frame_rate);
--#endif
--}
--
--int WebContents::GetFrameRate() const {
--  if (!IsOffScreen())
--    return 0;
--
--#if defined(ENABLE_OSR)
--  auto* osr_wcv = GetOffScreenWebContentsView();
--  return osr_wcv ? osr_wcv->GetFrameRate() : 0;
--#else
--  return 0;
--#endif
--}
--
--void WebContents::Invalidate() {
--  if (IsOffScreen()) {
--#if defined(ENABLE_OSR)
--    auto* osr_rwhv = GetOffScreenRenderWidgetHostView();
--    if (osr_rwhv)
--      osr_rwhv->Invalidate();
--#endif
--  } else {
--    auto* const window = owner_window();
--    if (window)
--      window->Invalidate();
--  }
--}
--
--gfx::Size WebContents::GetSizeForNewRenderView(content::WebContents* wc) const {
--  if (IsOffScreen() && wc == web_contents()) {
--    auto* relay = NativeWindowRelay::FromWebContents(web_contents());
--    if (relay) {
--      return relay->window->GetSize();
--    }
--  }
--
--  return gfx::Size();
--}
--
--void WebContents::SetZoomLevel(double level) {
--  zoom_controller_->SetZoomLevel(level);
--}
--
--double WebContents::GetZoomLevel() const {
--  return zoom_controller_->GetZoomLevel();
--}
--
--void WebContents::SetZoomFactor(double factor) {
--  auto level = content::ZoomFactorToZoomLevel(factor);
--  SetZoomLevel(level);
--}
--
--double WebContents::GetZoomFactor() const {
--  auto level = GetZoomLevel();
--  return content::ZoomLevelToZoomFactor(level);
--}
--
--void WebContents::OnSetTemporaryZoomLevel(content::RenderFrameHost* rfh,
--                                          double level,
--                                          IPC::Message* reply_msg) {
--  zoom_controller_->SetTemporaryZoomLevel(level);
--  double new_level = zoom_controller_->GetZoomLevel();
--  AtomFrameHostMsg_SetTemporaryZoomLevel::WriteReplyParams(reply_msg,
--                                                           new_level);
--  rfh->Send(reply_msg);
--}
--
--void WebContents::OnGetZoomLevel(content::RenderFrameHost* rfh,
--                                 IPC::Message* reply_msg) {
--  AtomFrameHostMsg_GetZoomLevel::WriteReplyParams(reply_msg, GetZoomLevel());
--  rfh->Send(reply_msg);
--}
--
--v8::Local<v8::Value> WebContents::GetPreloadPath(v8::Isolate* isolate) const {
--  if (auto* web_preferences = WebContentsPreferences::From(web_contents())) {
--    base::FilePath::StringType preload;
--    if (web_preferences->GetPreloadPath(&preload)) {
--      return mate::ConvertToV8(isolate, preload);
--    }
--  }
--  return v8::Null(isolate);
--}
--
--v8::Local<v8::Value> WebContents::GetWebPreferences(
--    v8::Isolate* isolate) const {
--  auto* web_preferences = WebContentsPreferences::From(web_contents());
--  if (!web_preferences)
--    return v8::Null(isolate);
--  return mate::ConvertToV8(isolate, *web_preferences->preference());
--}
--
--v8::Local<v8::Value> WebContents::GetLastWebPreferences(
--    v8::Isolate* isolate) const {
--  auto* web_preferences = WebContentsPreferences::From(web_contents());
--  if (!web_preferences)
--    return v8::Null(isolate);
--  return mate::ConvertToV8(isolate, *web_preferences->last_preference());
--}
--
--v8::Local<v8::Value> WebContents::GetOwnerBrowserWindow() const {
--  if (owner_window())
--    return BrowserWindow::From(isolate(), owner_window());
--  else
--    return v8::Null(isolate());
--}
--
--int32_t WebContents::ID() const {
--  return weak_map_id();
--}
--
--v8::Local<v8::Value> WebContents::Session(v8::Isolate* isolate) {
--  return v8::Local<v8::Value>::New(isolate, session_);
--}
--
--content::WebContents* WebContents::HostWebContents() {
--  if (!embedder_)
--    return nullptr;
--  return embedder_->web_contents();
--}
--
--void WebContents::SetEmbedder(const WebContents* embedder) {
--  if (embedder) {
--    NativeWindow* owner_window = nullptr;
--    auto* relay = NativeWindowRelay::FromWebContents(embedder->web_contents());
--    if (relay) {
--      owner_window = relay->window.get();
--    }
--    if (owner_window)
--      SetOwnerWindow(owner_window);
--
--    content::RenderWidgetHostView* rwhv =
--        web_contents()->GetRenderWidgetHostView();
--    if (rwhv) {
--      rwhv->Hide();
--      rwhv->Show();
--    }
--  }
--}
--
--void WebContents::SetDevToolsWebContents(const WebContents* devtools) {
--  if (managed_web_contents())
--    managed_web_contents()->SetDevToolsWebContents(devtools->web_contents());
--}
--
--v8::Local<v8::Value> WebContents::GetNativeView() const {
--  gfx::NativeView ptr = web_contents()->GetNativeView();
--  auto buffer = node::Buffer::Copy(isolate(), reinterpret_cast<char*>(&ptr),
--                                   sizeof(gfx::NativeView));
--  if (buffer.IsEmpty())
--    return v8::Null(isolate());
--  else
--    return buffer.ToLocalChecked();
--}
--
--v8::Local<v8::Value> WebContents::DevToolsWebContents(v8::Isolate* isolate) {
--  if (devtools_web_contents_.IsEmpty())
--    return v8::Null(isolate);
--  else
--    return v8::Local<v8::Value>::New(isolate, devtools_web_contents_);
--}
--
--v8::Local<v8::Value> WebContents::Debugger(v8::Isolate* isolate) {
--  if (debugger_.IsEmpty()) {
--    auto handle = atom::api::Debugger::Create(isolate, web_contents());
--    debugger_.Reset(isolate, handle.ToV8());
--  }
--  return v8::Local<v8::Value>::New(isolate, debugger_);
--}
--
--void WebContents::GrantOriginAccess(const GURL& url) {
--  content::ChildProcessSecurityPolicy::GetInstance()->GrantOrigin(
--      web_contents()->GetMainFrame()->GetProcess()->GetID(),
--      url::Origin::Create(url));
--}
--
--// static
--void WebContents::BuildPrototype(v8::Isolate* isolate,
--                                 v8::Local<v8::FunctionTemplate> prototype) {
--  prototype->SetClassName(mate::StringToV8(isolate, "WebContents"));
--  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
--      .MakeDestroyable()
--      .SetMethod("getProcessId", &WebContents::GetProcessID)
--      .SetMethod("getOSProcessId", &WebContents::GetOSProcessID)
--      .SetMethod("equal", &WebContents::Equal)
--      .SetMethod("_loadURL", &WebContents::LoadURL)
--      .SetMethod("downloadURL", &WebContents::DownloadURL)
--      .SetMethod("_getURL", &WebContents::GetURL)
--      .SetMethod("getTitle", &WebContents::GetTitle)
--      .SetMethod("isLoading", &WebContents::IsLoading)
--      .SetMethod("isLoadingMainFrame", &WebContents::IsLoadingMainFrame)
--      .SetMethod("isWaitingForResponse", &WebContents::IsWaitingForResponse)
--      .SetMethod("_stop", &WebContents::Stop)
--      .SetMethod("_goBack", &WebContents::GoBack)
--      .SetMethod("_goForward", &WebContents::GoForward)
--      .SetMethod("_goToOffset", &WebContents::GoToOffset)
--      .SetMethod("isCrashed", &WebContents::IsCrashed)
--      .SetMethod("setUserAgent", &WebContents::SetUserAgent)
--      .SetMethod("getUserAgent", &WebContents::GetUserAgent)
--      .SetMethod("savePage", &WebContents::SavePage)
--      .SetMethod("openDevTools", &WebContents::OpenDevTools)
--      .SetMethod("closeDevTools", &WebContents::CloseDevTools)
--      .SetMethod("isDevToolsOpened", &WebContents::IsDevToolsOpened)
--      .SetMethod("isDevToolsFocused", &WebContents::IsDevToolsFocused)
--      .SetMethod("enableDeviceEmulation", &WebContents::EnableDeviceEmulation)
--      .SetMethod("disableDeviceEmulation", &WebContents::DisableDeviceEmulation)
--      .SetMethod("toggleDevTools", &WebContents::ToggleDevTools)
--      .SetMethod("inspectElement", &WebContents::InspectElement)
--      .SetMethod("setIgnoreMenuShortcuts", &WebContents::SetIgnoreMenuShortcuts)
--      .SetMethod("setAudioMuted", &WebContents::SetAudioMuted)
--      .SetMethod("isAudioMuted", &WebContents::IsAudioMuted)
--      .SetMethod("isCurrentlyAudible", &WebContents::IsCurrentlyAudible)
--      .SetMethod("undo", &WebContents::Undo)
--      .SetMethod("redo", &WebContents::Redo)
--      .SetMethod("cut", &WebContents::Cut)
--      .SetMethod("copy", &WebContents::Copy)
--      .SetMethod("paste", &WebContents::Paste)
--      .SetMethod("pasteAndMatchStyle", &WebContents::PasteAndMatchStyle)
--      .SetMethod("delete", &WebContents::Delete)
--      .SetMethod("selectAll", &WebContents::SelectAll)
--      .SetMethod("unselect", &WebContents::Unselect)
--      .SetMethod("replace", &WebContents::Replace)
--      .SetMethod("replaceMisspelling", &WebContents::ReplaceMisspelling)
--      .SetMethod("findInPage", &WebContents::FindInPage)
--      .SetMethod("stopFindInPage", &WebContents::StopFindInPage)
--      .SetMethod("focus", &WebContents::Focus)
--      .SetMethod("isFocused", &WebContents::IsFocused)
--      .SetMethod("tabTraverse", &WebContents::TabTraverse)
--      .SetMethod("_send", &WebContents::SendIPCMessage)
--      .SetMethod("sendInputEvent", &WebContents::SendInputEvent)
--      .SetMethod("beginFrameSubscription", &WebContents::BeginFrameSubscription)
--      .SetMethod("endFrameSubscription", &WebContents::EndFrameSubscription)
--      .SetMethod("startDrag", &WebContents::StartDrag)
--      .SetMethod("isGuest", &WebContents::IsGuest)
--      .SetMethod("attachToIframe", &WebContents::AttachToIframe)
--      .SetMethod("isOffscreen", &WebContents::IsOffScreen)
--      .SetMethod("startPainting", &WebContents::StartPainting)
--      .SetMethod("stopPainting", &WebContents::StopPainting)
--      .SetMethod("isPainting", &WebContents::IsPainting)
--      .SetMethod("setFrameRate", &WebContents::SetFrameRate)
--      .SetMethod("getFrameRate", &WebContents::GetFrameRate)
--      .SetMethod("invalidate", &WebContents::Invalidate)
--      .SetMethod("setZoomLevel", &WebContents::SetZoomLevel)
--      .SetMethod("_getZoomLevel", &WebContents::GetZoomLevel)
--      .SetMethod("setZoomFactor", &WebContents::SetZoomFactor)
--      .SetMethod("_getZoomFactor", &WebContents::GetZoomFactor)
--      .SetMethod("getType", &WebContents::GetType)
--      .SetMethod("_getPreloadPath", &WebContents::GetPreloadPath)
--      .SetMethod("getWebPreferences", &WebContents::GetWebPreferences)
--      .SetMethod("getLastWebPreferences", &WebContents::GetLastWebPreferences)
--      .SetMethod("getOwnerBrowserWindow", &WebContents::GetOwnerBrowserWindow)
--      .SetMethod("hasServiceWorker", &WebContents::HasServiceWorker)
--      .SetMethod("unregisterServiceWorker",
--                 &WebContents::UnregisterServiceWorker)
--      .SetMethod("inspectServiceWorker", &WebContents::InspectServiceWorker)
--      .SetMethod("print", &WebContents::Print)
--      .SetMethod("getPrinters", &WebContents::GetPrinterList)
--      .SetMethod("_printToPDF", &WebContents::PrintToPDF)
--      .SetMethod("addWorkSpace", &WebContents::AddWorkSpace)
--      .SetMethod("removeWorkSpace", &WebContents::RemoveWorkSpace)
--      .SetMethod("showDefinitionForSelection",
--                 &WebContents::ShowDefinitionForSelection)
--      .SetMethod("copyImageAt", &WebContents::CopyImageAt)
--      .SetMethod("capturePage", &WebContents::CapturePage)
--      .SetMethod("setEmbedder", &WebContents::SetEmbedder)
--      .SetMethod("setDevToolsWebContents", &WebContents::SetDevToolsWebContents)
--      .SetMethod("getNativeView", &WebContents::GetNativeView)
--      .SetMethod("setWebRTCIPHandlingPolicy",
--                 &WebContents::SetWebRTCIPHandlingPolicy)
--      .SetMethod("getWebRTCIPHandlingPolicy",
--                 &WebContents::GetWebRTCIPHandlingPolicy)
--      .SetMethod("_grantOriginAccess", &WebContents::GrantOriginAccess)
--      .SetProperty("id", &WebContents::ID)
--      .SetProperty("session", &WebContents::Session)
--      .SetProperty("hostWebContents", &WebContents::HostWebContents)
--      .SetProperty("devToolsWebContents", &WebContents::DevToolsWebContents)
--      .SetProperty("debugger", &WebContents::Debugger);
--}
--
--AtomBrowserContext* WebContents::GetBrowserContext() const {
--  return static_cast<AtomBrowserContext*>(web_contents()->GetBrowserContext());
--}
--
--void WebContents::OnRendererMessage(content::RenderFrameHost* frame_host,
--                                    const base::string16& channel,
--                                    const base::ListValue& args) {
--  // webContents.emit(channel, new Event(), args...);
--  Emit(base::UTF16ToUTF8(channel), args);
--}
--
--void WebContents::OnRendererMessageSync(content::RenderFrameHost* frame_host,
--                                        const base::string16& channel,
--                                        const base::ListValue& args,
--                                        IPC::Message* message) {
--  // webContents.emit(channel, new Event(sender, message), args...);
--  EmitWithSender(base::UTF16ToUTF8(channel), frame_host, message, args);
--}
--
--// static
--mate::Handle<WebContents> WebContents::CreateFrom(
--    v8::Isolate* isolate,
--    content::WebContents* web_contents) {
--  // We have an existing WebContents object in JS.
--  auto* existing = TrackableObject::FromWrappedClass(isolate, web_contents);
--  if (existing)
--    return mate::CreateHandle(isolate, static_cast<WebContents*>(existing));
--
--  // Otherwise create a new WebContents wrapper object.
--  return mate::CreateHandle(isolate,
--                            new WebContents(isolate, web_contents, REMOTE));
--}
--
--mate::Handle<WebContents> WebContents::CreateFrom(
--    v8::Isolate* isolate,
--    content::WebContents* web_contents,
--    Type type) {
--  // Otherwise create a new WebContents wrapper object.
--  return mate::CreateHandle(isolate,
--                            new WebContents(isolate, web_contents, type));
--}
--
--// static
--mate::Handle<WebContents> WebContents::Create(v8::Isolate* isolate,
--                                              const mate::Dictionary& options) {
--  return mate::CreateHandle(isolate, new WebContents(isolate, options));
--}
--
--}  // namespace api
--
--}  // namespace atom
--
--namespace {
--
--using atom::api::WebContents;
--
--void Initialize(v8::Local<v8::Object> exports,
--                v8::Local<v8::Value> unused,
--                v8::Local<v8::Context> context,
--                void* priv) {
--  v8::Isolate* isolate = context->GetIsolate();
--  mate::Dictionary dict(isolate, exports);
--  dict.Set("WebContents", WebContents::GetConstructor(isolate)->GetFunction());
--  dict.SetMethod("create", &WebContents::Create);
--  dict.SetMethod("fromId", &mate::TrackableObject<WebContents>::FromWeakMapID);
--  dict.SetMethod("getAllWebContents",
--                 &mate::TrackableObject<WebContents>::GetAll);
--}
--
--}  // namespace
--
--NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_web_contents, Initialize)
-removed in remote
-  base   100644 b734dc304dffc731456fcdf519ad0448eca6695a atom/browser/api/atom_api_web_contents.h
-  our    100644 7939f8268aa8c3371623e0c15f3b6001d7f1efa4 atom/browser/api/atom_api_web_contents.h
-@@ -1,473 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_API_ATOM_API_WEB_CONTENTS_H_
--#define ATOM_BROWSER_API_ATOM_API_WEB_CONTENTS_H_
--
--#include <string>
--#include <vector>
--
--#include "atom/browser/api/frame_subscriber.h"
--#include "atom/browser/api/save_page_handler.h"
--#include "atom/browser/api/trackable_object.h"
--#include "atom/browser/common_web_contents_delegate.h"
--#include "atom/browser/ui/autofill_popup.h"
--#include "base/observer_list.h"
--#include "content/common/cursors/webcursor.h"
--#include "content/public/browser/keyboard_event_processing_result.h"
--#include "content/public/browser/web_contents.h"
--#include "content/public/browser/web_contents_observer.h"
--#include "content/public/common/favicon_url.h"
--#include "native_mate/handle.h"
--#include "printing/backend/print_backend.h"
--#include "ui/gfx/image/image.h"
--
--namespace blink {
--struct WebDeviceEmulationParams;
--}
--
--namespace brightray {
--class InspectableWebContents;
--}
--
--namespace mate {
--class Arguments;
--class Dictionary;
--}  // namespace mate
--
--namespace network {
--class ResourceRequestBody;
--}
--
--namespace atom {
--
--class AtomBrowserContext;
--class AtomJavaScriptDialogManager;
--class WebContentsZoomController;
--class WebViewGuestDelegate;
--class FrameSubscriber;
--
--#if defined(ENABLE_OSR)
--class OffScreenWebContentsView;
--class OffScreenRenderWidgetHostView;
--#endif
--
--namespace api {
--
--// Certain events are only in WebContentsDelegate, provide our own Observer to
--// dispatch those events.
--class ExtendedWebContentsObserver {
-- public:
--  virtual void OnCloseContents() {}
--  virtual void OnRendererResponsive() {}
--};
--
--// Wrapper around the content::WebContents.
--class WebContents : public mate::TrackableObject<WebContents>,
--                    public CommonWebContentsDelegate,
--                    public content::WebContentsObserver {
-- public:
--  enum Type {
--    BACKGROUND_PAGE,  // A DevTools extension background page.
--    BROWSER_WINDOW,   // Used by BrowserWindow.
--    BROWSER_VIEW,     // Used by BrowserView.
--    REMOTE,           // Thin wrap around an existing WebContents.
--    WEB_VIEW,         // Used by <webview>.
--    OFF_SCREEN,       // Used for offscreen rendering
--  };
--
--  // For node.js callback function type: function(error, buffer)
--  using PrintToPDFCallback =
--      base::Callback<void(v8::Local<v8::Value>, v8::Local<v8::Value>)>;
--
--  // Create from an existing WebContents.
--  static mate::Handle<WebContents> CreateFrom(
--      v8::Isolate* isolate,
--      content::WebContents* web_contents);
--  static mate::Handle<WebContents> CreateFrom(
--      v8::Isolate* isolate,
--      content::WebContents* web_contents,
--      Type type);
--
--  // Create a new WebContents.
--  static mate::Handle<WebContents> Create(v8::Isolate* isolate,
--                                          const mate::Dictionary& options);
--
--  static void BuildPrototype(v8::Isolate* isolate,
--                             v8::Local<v8::FunctionTemplate> prototype);
--
--  // Notifies to destroy any guest web contents before destroying self.
--  void DestroyWebContents(bool async);
--
--  int GetProcessID() const;
--  base::ProcessId GetOSProcessID() const;
--  Type GetType() const;
--  bool Equal(const WebContents* web_contents) const;
--  void LoadURL(const GURL& url, const mate::Dictionary& options);
--  void DownloadURL(const GURL& url);
--  GURL GetURL() const;
--  base::string16 GetTitle() const;
--  bool IsLoading() const;
--  bool IsLoadingMainFrame() const;
--  bool IsWaitingForResponse() const;
--  void Stop();
--  void ReloadIgnoringCache();
--  void GoBack();
--  void GoForward();
--  void GoToOffset(int offset);
--  const std::string GetWebRTCIPHandlingPolicy() const;
--  void SetWebRTCIPHandlingPolicy(const std::string& webrtc_ip_handling_policy);
--  bool IsCrashed() const;
--  void SetUserAgent(const std::string& user_agent, mate::Arguments* args);
--  std::string GetUserAgent();
--  void InsertCSS(const std::string& css);
--  bool SavePage(const base::FilePath& full_file_path,
--                const content::SavePageType& save_type,
--                const SavePageHandler::SavePageCallback& callback);
--  void OpenDevTools(mate::Arguments* args);
--  void CloseDevTools();
--  bool IsDevToolsOpened();
--  bool IsDevToolsFocused();
--  void ToggleDevTools();
--  void EnableDeviceEmulation(const blink::WebDeviceEmulationParams& params);
--  void DisableDeviceEmulation();
--  void InspectElement(int x, int y);
--  void InspectServiceWorker();
--  void HasServiceWorker(const base::Callback<void(bool)>&);
--  void UnregisterServiceWorker(const base::Callback<void(bool)>&);
--  void SetIgnoreMenuShortcuts(bool ignore);
--  void SetAudioMuted(bool muted);
--  bool IsAudioMuted();
--  bool IsCurrentlyAudible();
--  void Print(mate::Arguments* args);
--  std::vector<printing::PrinterBasicInfo> GetPrinterList();
--  void SetEmbedder(const WebContents* embedder);
--  void SetDevToolsWebContents(const WebContents* devtools);
--  v8::Local<v8::Value> GetNativeView() const;
--
--  // Print current page as PDF.
--  void PrintToPDF(const base::DictionaryValue& setting,
--                  const PrintToPDFCallback& callback);
--
--  // DevTools workspace api.
--  void AddWorkSpace(mate::Arguments* args, const base::FilePath& path);
--  void RemoveWorkSpace(mate::Arguments* args, const base::FilePath& path);
--
--  // Editing commands.
--  void Undo();
--  void Redo();
--  void Cut();
--  void Copy();
--  void Paste();
--  void PasteAndMatchStyle();
--  void Delete();
--  void SelectAll();
--  void Unselect();
--  void Replace(const base::string16& word);
--  void ReplaceMisspelling(const base::string16& word);
--  uint32_t FindInPage(mate::Arguments* args);
--  void StopFindInPage(content::StopFindAction action);
--  void ShowDefinitionForSelection();
--  void CopyImageAt(int x, int y);
--
--  // Focus.
--  void Focus();
--  bool IsFocused() const;
--  void TabTraverse(bool reverse);
--
--  // Send messages to browser.
--  bool SendIPCMessage(bool all_frames,
--                      const base::string16& channel,
--                      const base::ListValue& args);
--
--  // Send WebInputEvent to the page.
--  void SendInputEvent(v8::Isolate* isolate, v8::Local<v8::Value> input_event);
--
--  // Subscribe to the frame updates.
--  void BeginFrameSubscription(mate::Arguments* args);
--  void EndFrameSubscription();
--
--  // Dragging native items.
--  void StartDrag(const mate::Dictionary& item, mate::Arguments* args);
--
--  // Captures the page with |rect|, |callback| would be called when capturing is
--  // done.
--  void CapturePage(mate::Arguments* args);
--
--  // Methods for creating <webview>.
--  bool IsGuest() const;
--  void AttachToIframe(content::WebContents* embedder_web_contents,
--                      int embedder_frame_id);
--
--  // Methods for offscreen rendering
--  bool IsOffScreen() const;
--  void OnPaint(const gfx::Rect& dirty_rect, const SkBitmap& bitmap);
--  void StartPainting();
--  void StopPainting();
--  bool IsPainting() const;
--  void SetFrameRate(int frame_rate);
--  int GetFrameRate() const;
--  void Invalidate();
--  gfx::Size GetSizeForNewRenderView(content::WebContents*) const override;
--
--  // Methods for zoom handling.
--  void SetZoomLevel(double level);
--  double GetZoomLevel() const;
--  void SetZoomFactor(double factor);
--  double GetZoomFactor() const;
--
--  // Callback triggered on permission response.
--  void OnEnterFullscreenModeForTab(content::WebContents* source,
--                                   const GURL& origin,
--                                   bool allowed);
--
--  // Create window with the given disposition.
--  void OnCreateWindow(const GURL& target_url,
--                      const content::Referrer& referrer,
--                      const std::string& frame_name,
--                      WindowOpenDisposition disposition,
--                      const std::vector<std::string>& features,
--                      const scoped_refptr<network::ResourceRequestBody>& body);
--
--  // Returns the preload script path of current WebContents.
--  v8::Local<v8::Value> GetPreloadPath(v8::Isolate* isolate) const;
--
--  // Returns the web preferences of current WebContents.
--  v8::Local<v8::Value> GetWebPreferences(v8::Isolate* isolate) const;
--  v8::Local<v8::Value> GetLastWebPreferences(v8::Isolate* isolate) const;
--
--  // Returns the owner window.
--  v8::Local<v8::Value> GetOwnerBrowserWindow() const;
--
--  // Grants the child process the capability to access URLs with the origin of
--  // the specified URL.
--  void GrantOriginAccess(const GURL& url);
--
--  // Properties.
--  int32_t ID() const;
--  v8::Local<v8::Value> Session(v8::Isolate* isolate);
--  content::WebContents* HostWebContents();
--  v8::Local<v8::Value> DevToolsWebContents(v8::Isolate* isolate);
--  v8::Local<v8::Value> Debugger(v8::Isolate* isolate);
--
--  WebContentsZoomController* GetZoomController() { return zoom_controller_; }
--
--  void AddObserver(ExtendedWebContentsObserver* obs) {
--    observers_.AddObserver(obs);
--  }
--  void RemoveObserver(ExtendedWebContentsObserver* obs) {
--    observers_.RemoveObserver(obs);
--  }
--
-- protected:
--  WebContents(v8::Isolate* isolate,
--              content::WebContents* web_contents,
--              Type type);
--  WebContents(v8::Isolate* isolate, const mate::Dictionary& options);
--  ~WebContents() override;
--
--  void InitWithSessionAndOptions(v8::Isolate* isolate,
--                                 content::WebContents* web_contents,
--                                 mate::Handle<class Session> session,
--                                 const mate::Dictionary& options);
--
--  // content::WebContentsDelegate:
--  bool DidAddMessageToConsole(content::WebContents* source,
--                              int32_t level,
--                              const base::string16& message,
--                              int32_t line_no,
--                              const base::string16& source_id) override;
--  void WebContentsCreated(content::WebContents* source_contents,
--                          int opener_render_process_id,
--                          int opener_render_frame_id,
--                          const std::string& frame_name,
--                          const GURL& target_url,
--                          content::WebContents* new_contents) override;
--  void AddNewContents(content::WebContents* source,
--                      content::WebContents* new_contents,
--                      WindowOpenDisposition disposition,
--                      const gfx::Rect& initial_rect,
--                      bool user_gesture,
--                      bool* was_blocked) override;
--  content::WebContents* OpenURLFromTab(
--      content::WebContents* source,
--      const content::OpenURLParams& params) override;
--  void BeforeUnloadFired(content::WebContents* tab,
--                         bool proceed,
--                         bool* proceed_to_fire_unload) override;
--  void MoveContents(content::WebContents* source,
--                    const gfx::Rect& pos) override;
--  void CloseContents(content::WebContents* source) override;
--  void ActivateContents(content::WebContents* contents) override;
--  void UpdateTargetURL(content::WebContents* source, const GURL& url) override;
--  bool IsPopupOrPanel(const content::WebContents* source) const override;
--  void HandleKeyboardEvent(
--      content::WebContents* source,
--      const content::NativeWebKeyboardEvent& event) override;
--  content::KeyboardEventProcessingResult PreHandleKeyboardEvent(
--      content::WebContents* source,
--      const content::NativeWebKeyboardEvent& event) override;
--  void EnterFullscreenModeForTab(content::WebContents* source,
--                                 const GURL& origin) override;
--  void ExitFullscreenModeForTab(content::WebContents* source) override;
--  void RendererUnresponsive(
--      content::WebContents* source,
--      content::RenderWidgetHost* render_widget_host) override;
--  void RendererResponsive(
--      content::WebContents* source,
--      content::RenderWidgetHost* render_widget_host) override;
--  bool HandleContextMenu(const content::ContextMenuParams& params) override;
--  bool OnGoToEntryOffset(int offset) override;
--  void FindReply(content::WebContents* web_contents,
--                 int request_id,
--                 int number_of_matches,
--                 const gfx::Rect& selection_rect,
--                 int active_match_ordinal,
--                 bool final_update) override;
--  bool CheckMediaAccessPermission(content::WebContents* web_contents,
--                                  const GURL& security_origin,
--                                  content::MediaStreamType type) override;
--  void RequestMediaAccessPermission(
--      content::WebContents* web_contents,
--      const content::MediaStreamRequest& request,
--      const content::MediaResponseCallback& callback) override;
--  void RequestToLockMouse(content::WebContents* web_contents,
--                          bool user_gesture,
--                          bool last_unlocked_by_target) override;
--  std::unique_ptr<content::BluetoothChooser> RunBluetoothChooser(
--      content::RenderFrameHost* frame,
--      const content::BluetoothChooser::EventHandler& handler) override;
--  content::JavaScriptDialogManager* GetJavaScriptDialogManager(
--      content::WebContents* source) override;
--
--  // content::WebContentsObserver:
--  void BeforeUnloadFired(const base::TimeTicks& proceed_time) override;
--  void RenderViewCreated(content::RenderViewHost*) override;
--  void RenderViewDeleted(content::RenderViewHost*) override;
--  void RenderProcessGone(base::TerminationStatus status) override;
--  void DocumentLoadedInFrame(
--      content::RenderFrameHost* render_frame_host) override;
--  void DidFinishLoad(content::RenderFrameHost* render_frame_host,
--                     const GURL& validated_url) override;
--  void DidFailLoad(content::RenderFrameHost* render_frame_host,
--                   const GURL& validated_url,
--                   int error_code,
--                   const base::string16& error_description) override;
--  void DidStartLoading() override;
--  void DidStopLoading() override;
--  void DidStartNavigation(
--      content::NavigationHandle* navigation_handle) override;
--  void DidFinishNavigation(
--      content::NavigationHandle* navigation_handle) override;
--  bool OnMessageReceived(const IPC::Message& message) override;
--  bool OnMessageReceived(const IPC::Message& message,
--                         content::RenderFrameHost* frame_host) override;
--  void WebContentsDestroyed() override;
--  void NavigationEntryCommitted(
--      const content::LoadCommittedDetails& load_details) override;
--  void TitleWasSet(content::NavigationEntry* entry) override;
--  void DidUpdateFaviconURL(
--      const std::vector<content::FaviconURL>& urls) override;
--  void PluginCrashed(const base::FilePath& plugin_path,
--                     base::ProcessId plugin_pid) override;
--  void MediaStartedPlaying(const MediaPlayerInfo& video_type,
--                           const MediaPlayerId& id) override;
--  void MediaStoppedPlaying(
--      const MediaPlayerInfo& video_type,
--      const MediaPlayerId& id,
--      content::WebContentsObserver::MediaStoppedReason reason) override;
--  void DidChangeThemeColor(SkColor theme_color) override;
--
--  // brightray::InspectableWebContentsDelegate:
--  void DevToolsReloadPage() override;
--
--  // brightray::InspectableWebContentsViewDelegate:
--  void DevToolsFocused() override;
--  void DevToolsOpened() override;
--  void DevToolsClosed() override;
--
--#if defined(TOOLKIT_VIEWS)
--  void ShowAutofillPopup(content::RenderFrameHost* frame_host,
--                         const gfx::RectF& bounds,
--                         const std::vector<base::string16>& values,
--                         const std::vector<base::string16>& labels);
--#endif
--
-- private:
--  struct FrameDispatchHelper;
--  AtomBrowserContext* GetBrowserContext() const;
--
--  uint32_t GetNextRequestId() { return ++request_id_; }
--
--#if defined(ENABLE_OSR)
--  OffScreenWebContentsView* GetOffScreenWebContentsView() const;
--  OffScreenRenderWidgetHostView* GetOffScreenRenderWidgetHostView() const;
--#endif
--
--  // Called when we receive a CursorChange message from chromium.
--  void OnCursorChange(const content::WebCursor& cursor);
--
--  // Called when received a message from renderer.
--  void OnRendererMessage(content::RenderFrameHost* frame_host,
--                         const base::string16& channel,
--                         const base::ListValue& args);
--
--  // Called when received a synchronous message from renderer.
--  void OnRendererMessageSync(content::RenderFrameHost* frame_host,
--                             const base::string16& channel,
--                             const base::ListValue& args,
--                             IPC::Message* message);
--
--  // Called when received a synchronous message from renderer to
--  // set temporary zoom level.
--  void OnSetTemporaryZoomLevel(content::RenderFrameHost* frame_host,
--                               double level,
--                               IPC::Message* reply_msg);
--
--  // Called when received a synchronous message from renderer to
--  // get the zoom level.
--  void OnGetZoomLevel(content::RenderFrameHost* frame_host,
--                      IPC::Message* reply_msg);
--
--  void InitZoomController(content::WebContents* web_contents,
--                          const mate::Dictionary& options);
--
--  v8::Global<v8::Value> session_;
--  v8::Global<v8::Value> devtools_web_contents_;
--  v8::Global<v8::Value> debugger_;
--
--  std::unique_ptr<AtomJavaScriptDialogManager> dialog_manager_;
--  std::unique_ptr<WebViewGuestDelegate> guest_delegate_;
--
--  std::unique_ptr<FrameSubscriber> frame_subscriber_;
--
--  // The host webcontents that may contain this webcontents.
--  WebContents* embedder_ = nullptr;
--
--  // The zoom controller for this webContents.
--  WebContentsZoomController* zoom_controller_ = nullptr;
--
--  // The type of current WebContents.
--  Type type_ = BROWSER_WINDOW;
--
--  // Request id used for findInPage request.
--  uint32_t request_id_ = 0;
--
--  // Whether background throttling is disabled.
--  bool background_throttling_ = true;
--
--  // Whether to enable devtools.
--  bool enable_devtools_ = true;
--
--  // Observers of this WebContents.
--  base::ObserverList<ExtendedWebContentsObserver> observers_;
--
--  DISALLOW_COPY_AND_ASSIGN(WebContents);
--};
--
--}  // namespace api
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_API_ATOM_API_WEB_CONTENTS_H_
-removed in remote
-  base   100644 a987369ed82de17033e6dde512ddec31aa4e3dd9 atom/browser/api/atom_api_web_request.cc
-  our    100644 c088196f833160ac964e67030fa083302dd090b0 atom/browser/api/atom_api_web_request.cc
-@@ -1,146 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/api/atom_api_web_request.h"
--
--#include <string>
--
--#include "atom/browser/atom_browser_context.h"
--#include "atom/browser/net/atom_network_delegate.h"
--#include "atom/common/native_mate_converters/callback.h"
--#include "atom/common/native_mate_converters/net_converter.h"
--#include "atom/common/native_mate_converters/value_converter.h"
--#include "content/public/browser/browser_thread.h"
--#include "native_mate/dictionary.h"
--#include "native_mate/object_template_builder.h"
--
--using content::BrowserThread;
--
--namespace mate {
--
--template <>
--struct Converter<URLPattern> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     URLPattern* out) {
--    std::string pattern;
--    if (!ConvertFromV8(isolate, val, &pattern))
--      return false;
--    *out = URLPattern(URLPattern::SCHEME_ALL);
--    return out->Parse(pattern) == URLPattern::PARSE_SUCCESS;
--  }
--};
--
--}  // namespace mate
--
--namespace atom {
--
--namespace api {
--
--namespace {
--
--template <typename Method, typename Event, typename Listener>
--void CallNetworkDelegateMethod(
--    brightray::URLRequestContextGetter* url_request_context_getter,
--    Method method,
--    Event type,
--    URLPatterns patterns,
--    Listener listener) {
--  // Force creating network delegate.
--  net::URLRequestContext* context =
--      url_request_context_getter->GetURLRequestContext();
--  // Then call the method.
--  AtomNetworkDelegate* network_delegate =
--      static_cast<AtomNetworkDelegate*>(context->network_delegate());
--  (network_delegate->*method)(type, std::move(patterns), std::move(listener));
--}
--
--}  // namespace
--
--WebRequest::WebRequest(v8::Isolate* isolate,
--                       AtomBrowserContext* browser_context)
--    : browser_context_(browser_context) {
--  Init(isolate);
--}
--
--WebRequest::~WebRequest() {}
--
--template <AtomNetworkDelegate::SimpleEvent type>
--void WebRequest::SetSimpleListener(mate::Arguments* args) {
--  SetListener<AtomNetworkDelegate::SimpleListener>(
--      &AtomNetworkDelegate::SetSimpleListenerInIO, type, args);
--}
--
--template <AtomNetworkDelegate::ResponseEvent type>
--void WebRequest::SetResponseListener(mate::Arguments* args) {
--  SetListener<AtomNetworkDelegate::ResponseListener>(
--      &AtomNetworkDelegate::SetResponseListenerInIO, type, args);
--}
--
--template <typename Listener, typename Method, typename Event>
--void WebRequest::SetListener(Method method, Event type, mate::Arguments* args) {
--  // { urls }.
--  URLPatterns patterns;
--  mate::Dictionary dict;
--  args->GetNext(&dict) && dict.Get("urls", &patterns);
--
--  // Function or null.
--  v8::Local<v8::Value> value;
--  Listener listener;
--  if (!args->GetNext(&listener) &&
--      !(args->GetNext(&value) && value->IsNull())) {
--    args->ThrowError("Must pass null or a Function");
--    return;
--  }
--
--  brightray::URLRequestContextGetter* url_request_context_getter =
--      browser_context_->GetRequestContext();
--  if (!url_request_context_getter)
--    return;
--  BrowserThread::PostTask(
--      BrowserThread::IO, FROM_HERE,
--      base::BindOnce(&CallNetworkDelegateMethod<Method, Event, Listener>,
--                     base::RetainedRef(url_request_context_getter), method,
--                     type, std::move(patterns), std::move(listener)));
--}
--
--// static
--mate::Handle<WebRequest> WebRequest::Create(
--    v8::Isolate* isolate,
--    AtomBrowserContext* browser_context) {
--  return mate::CreateHandle(isolate, new WebRequest(isolate, browser_context));
--}
--
--// static
--void WebRequest::BuildPrototype(v8::Isolate* isolate,
--                                v8::Local<v8::FunctionTemplate> prototype) {
--  prototype->SetClassName(mate::StringToV8(isolate, "WebRequest"));
--  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
--      .SetMethod("onBeforeRequest", &WebRequest::SetResponseListener<
--                                        AtomNetworkDelegate::kOnBeforeRequest>)
--      .SetMethod("onBeforeSendHeaders",
--                 &WebRequest::SetResponseListener<
--                     AtomNetworkDelegate::kOnBeforeSendHeaders>)
--      .SetMethod("onHeadersReceived",
--                 &WebRequest::SetResponseListener<
--                     AtomNetworkDelegate::kOnHeadersReceived>)
--      .SetMethod(
--          "onSendHeaders",
--          &WebRequest::SetSimpleListener<AtomNetworkDelegate::kOnSendHeaders>)
--      .SetMethod("onBeforeRedirect",
--                 &WebRequest::SetSimpleListener<
--                     AtomNetworkDelegate::kOnBeforeRedirect>)
--      .SetMethod("onResponseStarted",
--                 &WebRequest::SetSimpleListener<
--                     AtomNetworkDelegate::kOnResponseStarted>)
--      .SetMethod(
--          "onCompleted",
--          &WebRequest::SetSimpleListener<AtomNetworkDelegate::kOnCompleted>)
--      .SetMethod("onErrorOccurred", &WebRequest::SetSimpleListener<
--                                        AtomNetworkDelegate::kOnErrorOccurred>);
--}
--
--}  // namespace api
--
--}  // namespace atom
-removed in remote
-  base   100644 9a6e17a0460585693465ae4a8f6f75c2871a738a atom/browser/api/atom_api_web_request.h
-  our    100644 87fa08815877c80330e3155804295638b2da1094 atom/browser/api/atom_api_web_request.h
-@@ -1,49 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_API_ATOM_API_WEB_REQUEST_H_
--#define ATOM_BROWSER_API_ATOM_API_WEB_REQUEST_H_
--
--#include "atom/browser/api/trackable_object.h"
--#include "atom/browser/net/atom_network_delegate.h"
--#include "native_mate/arguments.h"
--#include "native_mate/handle.h"
--
--namespace atom {
--
--class AtomBrowserContext;
--
--namespace api {
--
--class WebRequest : public mate::TrackableObject<WebRequest> {
-- public:
--  static mate::Handle<WebRequest> Create(v8::Isolate* isolate,
--                                         AtomBrowserContext* browser_context);
--
--  static void BuildPrototype(v8::Isolate* isolate,
--                             v8::Local<v8::FunctionTemplate> prototype);
--
-- protected:
--  WebRequest(v8::Isolate* isolate, AtomBrowserContext* browser_context);
--  ~WebRequest() override;
--
--  // C++ can not distinguish overloaded member function.
--  template <AtomNetworkDelegate::SimpleEvent type>
--  void SetSimpleListener(mate::Arguments* args);
--  template <AtomNetworkDelegate::ResponseEvent type>
--  void SetResponseListener(mate::Arguments* args);
--  template <typename Listener, typename Method, typename Event>
--  void SetListener(Method method, Event type, mate::Arguments* args);
--
-- private:
--  scoped_refptr<AtomBrowserContext> browser_context_;
--
--  DISALLOW_COPY_AND_ASSIGN(WebRequest);
--};
--
--}  // namespace api
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_API_ATOM_API_WEB_REQUEST_H_
-removed in remote
-  base   100644 e57c5ffb6bb4aea16b72f29e53ec48a269d2d08e atom/browser/api/atom_api_web_view_manager.cc
-  our    100644 e24d6306f62a63331304617c969db410db0ae0c4 atom/browser/api/atom_api_web_view_manager.cc
-@@ -1,58 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/web_contents_preferences.h"
--#include "atom/browser/web_contents_zoom_controller.h"
--#include "atom/browser/web_view_manager.h"
--#include "atom/common/native_mate_converters/content_converter.h"
--#include "atom/common/native_mate_converters/value_converter.h"
--#include "atom/common/options_switches.h"
--#include "content/public/browser/browser_context.h"
--#include "native_mate/dictionary.h"
--
--// Must be the last in the includes list.
--// See https://github.com/electron/electron/issues/10363
--#include "atom/common/node_includes.h"
--
--using atom::WebContentsPreferences;
--
--namespace {
--
--void AddGuest(int guest_instance_id,
--              int element_instance_id,
--              content::WebContents* embedder,
--              content::WebContents* guest_web_contents,
--              const base::DictionaryValue& options) {
--  auto* manager = atom::WebViewManager::GetWebViewManager(embedder);
--  if (manager)
--    manager->AddGuest(guest_instance_id, element_instance_id, embedder,
--                      guest_web_contents);
--
--  double zoom_factor;
--  if (options.GetDouble(atom::options::kZoomFactor, &zoom_factor)) {
--    atom::WebContentsZoomController::FromWebContents(guest_web_contents)
--        ->SetDefaultZoomFactor(zoom_factor);
--  }
--
--  WebContentsPreferences::From(guest_web_contents)->Merge(options);
--}
--
--void RemoveGuest(content::WebContents* embedder, int guest_instance_id) {
--  auto* manager = atom::WebViewManager::GetWebViewManager(embedder);
--  if (manager)
--    manager->RemoveGuest(guest_instance_id);
--}
--
--void Initialize(v8::Local<v8::Object> exports,
--                v8::Local<v8::Value> unused,
--                v8::Local<v8::Context> context,
--                void* priv) {
--  mate::Dictionary dict(context->GetIsolate(), exports);
--  dict.SetMethod("addGuest", &AddGuest);
--  dict.SetMethod("removeGuest", &RemoveGuest);
--}
--
--}  // namespace
--
--NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_web_view_manager, Initialize)
-removed in remote
-  base   100644 5c87292ea52ed33340846ab255d48ab2edfeebb6 atom/browser/api/event.cc
-  our    100644 7b617034eca5a229fc9323bfd6d531ebded752d6 atom/browser/api/event.cc
-@@ -1,81 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/api/event.h"
--
--#include "atom/common/api/api_messages.h"
--#include "atom/common/native_mate_converters/string16_converter.h"
--#include "atom/common/native_mate_converters/value_converter.h"
--#include "content/public/browser/render_frame_host.h"
--#include "content/public/browser/web_contents.h"
--#include "native_mate/object_template_builder.h"
--
--namespace mate {
--
--Event::Event(v8::Isolate* isolate) {
--  Init(isolate);
--}
--
--Event::~Event() {}
--
--void Event::SetSenderAndMessage(content::RenderFrameHost* sender,
--                                IPC::Message* message) {
--  DCHECK(!sender_);
--  DCHECK(!message_);
--  sender_ = sender;
--  message_ = message;
--
--  Observe(content::WebContents::FromRenderFrameHost(sender));
--}
--
--void Event::RenderFrameDeleted(content::RenderFrameHost* rfh) {
--  if (sender_ != rfh)
--    return;
--  sender_ = nullptr;
--  message_ = nullptr;
--}
--
--void Event::RenderFrameHostChanged(content::RenderFrameHost* old_rfh,
--                                   content::RenderFrameHost* new_rfh) {
--  if (sender_ && sender_ == old_rfh)
--    sender_ = new_rfh;
--}
--
--void Event::FrameDeleted(content::RenderFrameHost* rfh) {
--  if (sender_ != rfh)
--    return;
--  sender_ = nullptr;
--  message_ = nullptr;
--}
--
--void Event::PreventDefault(v8::Isolate* isolate) {
--  GetWrapper()->Set(StringToV8(isolate, "defaultPrevented"), v8::True(isolate));
--}
--
--bool Event::SendReply(const base::ListValue& result) {
--  if (message_ == nullptr || sender_ == nullptr)
--    return false;
--
--  AtomFrameHostMsg_Message_Sync::WriteReplyParams(message_, result);
--  bool success = sender_->Send(message_);
--  message_ = nullptr;
--  sender_ = nullptr;
--  return success;
--}
--
--// static
--Handle<Event> Event::Create(v8::Isolate* isolate) {
--  return mate::CreateHandle(isolate, new Event(isolate));
--}
--
--// static
--void Event::BuildPrototype(v8::Isolate* isolate,
--                           v8::Local<v8::FunctionTemplate> prototype) {
--  prototype->SetClassName(mate::StringToV8(isolate, "Event"));
--  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
--      .SetMethod("preventDefault", &Event::PreventDefault)
--      .SetMethod("sendReply", &Event::SendReply);
--}
--
--}  // namespace mate
-removed in remote
-  base   100644 5cdc08324b72e4f20d5fb4e02af97624c2599c9d atom/browser/api/event.h
-  our    100644 fbec8f27574691005d203adbafb50709f5c2d010 atom/browser/api/event.h
-@@ -1,55 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_API_EVENT_H_
--#define ATOM_BROWSER_API_EVENT_H_
--
--#include "content/public/browser/web_contents_observer.h"
--#include "native_mate/handle.h"
--#include "native_mate/wrappable.h"
--
--namespace IPC {
--class Message;
--}
--
--namespace mate {
--
--class Event : public Wrappable<Event>, public content::WebContentsObserver {
-- public:
--  static Handle<Event> Create(v8::Isolate* isolate);
--
--  static void BuildPrototype(v8::Isolate* isolate,
--                             v8::Local<v8::FunctionTemplate> prototype);
--
--  // Pass the sender and message to be replied.
--  void SetSenderAndMessage(content::RenderFrameHost* sender,
--                           IPC::Message* message);
--
--  // event.PreventDefault().
--  void PreventDefault(v8::Isolate* isolate);
--
--  // event.sendReply(array), used for replying synchronous message.
--  bool SendReply(const base::ListValue& result);
--
-- protected:
--  explicit Event(v8::Isolate* isolate);
--  ~Event() override;
--
--  // content::WebContentsObserver implementations:
--  void RenderFrameDeleted(content::RenderFrameHost* rfh) override;
--  void RenderFrameHostChanged(content::RenderFrameHost* old_rfh,
--                              content::RenderFrameHost* new_rfh) override;
--  void FrameDeleted(content::RenderFrameHost* rfh) override;
--
-- private:
--  // Replyer for the synchronous messages.
--  content::RenderFrameHost* sender_ = nullptr;
--  IPC::Message* message_ = nullptr;
--
--  DISALLOW_COPY_AND_ASSIGN(Event);
--};
--
--}  // namespace mate
--
--#endif  // ATOM_BROWSER_API_EVENT_H_
-removed in remote
-  base   100644 be7018dafa44af1d7e30b4722126e8ca0faea443 atom/browser/api/event_emitter.cc
-  our    100644 c6e810b51225c8f89eaf53ac3e46381b52ba63b5 atom/browser/api/event_emitter.cc
-@@ -1,82 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/api/event_emitter.h"
--
--#include "atom/browser/api/event.h"
--#include "native_mate/arguments.h"
--#include "native_mate/dictionary.h"
--#include "native_mate/object_template_builder.h"
--#include "ui/events/event_constants.h"
--
--#include "atom/common/node_includes.h"
--
--namespace mate {
--
--namespace {
--
--v8::Persistent<v8::ObjectTemplate> event_template;
--
--void PreventDefault(mate::Arguments* args) {
--  mate::Dictionary self(args->isolate(), args->GetThis());
--  self.Set("defaultPrevented", true);
--}
--
--// Create a pure JavaScript Event object.
--v8::Local<v8::Object> CreateEventObject(v8::Isolate* isolate) {
--  if (event_template.IsEmpty()) {
--    event_template.Reset(
--        isolate,
--        ObjectTemplateBuilder(isolate, v8::ObjectTemplate::New(isolate))
--            .SetMethod("preventDefault", &PreventDefault)
--            .Build());
--  }
--
--  return v8::Local<v8::ObjectTemplate>::New(isolate, event_template)
--      ->NewInstance();
--}
--
--}  // namespace
--
--namespace internal {
--
--v8::Local<v8::Object> CreateJSEvent(v8::Isolate* isolate,
--                                    v8::Local<v8::Object> object,
--                                    content::RenderFrameHost* sender,
--                                    IPC::Message* message) {
--  v8::Local<v8::Object> event;
--  bool use_native_event = sender && message;
--
--  if (use_native_event) {
--    mate::Handle<mate::Event> native_event = mate::Event::Create(isolate);
--    native_event->SetSenderAndMessage(sender, message);
--    event = v8::Local<v8::Object>::Cast(native_event.ToV8());
--  } else {
--    event = CreateEventObject(isolate);
--  }
--  mate::Dictionary(isolate, event).Set("sender", object);
--  return event;
--}
--
--v8::Local<v8::Object> CreateCustomEvent(v8::Isolate* isolate,
--                                        v8::Local<v8::Object> object,
--                                        v8::Local<v8::Object> custom_event) {
--  v8::Local<v8::Object> event = CreateEventObject(isolate);
--  (void)event->SetPrototype(custom_event->CreationContext(), custom_event);
--  mate::Dictionary(isolate, event).Set("sender", object);
--  return event;
--}
--
--v8::Local<v8::Object> CreateEventFromFlags(v8::Isolate* isolate, int flags) {
--  mate::Dictionary obj = mate::Dictionary::CreateEmpty(isolate);
--  obj.Set("shiftKey", static_cast<bool>(flags & ui::EF_SHIFT_DOWN));
--  obj.Set("ctrlKey", static_cast<bool>(flags & ui::EF_CONTROL_DOWN));
--  obj.Set("altKey", static_cast<bool>(flags & ui::EF_ALT_DOWN));
--  obj.Set("metaKey", static_cast<bool>(flags & ui::EF_COMMAND_DOWN));
--  return obj.GetHandle();
--}
--
--}  // namespace internal
--
--}  // namespace mate
-removed in remote
-  base   100644 42816d42a45bd378be558f93f9e63c5bc28070ad atom/browser/api/event_emitter.h
-  our    100644 5e4ca3b4ffcb184583ef386100eabda7a9e00da0 atom/browser/api/event_emitter.h
-@@ -1,112 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_API_EVENT_EMITTER_H_
--#define ATOM_BROWSER_API_EVENT_EMITTER_H_
--
--#include <vector>
--
--#include "atom/common/api/event_emitter_caller.h"
--#include "native_mate/wrappable.h"
--
--namespace content {
--class RenderFrameHost;
--}
--
--namespace IPC {
--class Message;
--}
--
--namespace mate {
--
--namespace internal {
--
--v8::Local<v8::Object> CreateJSEvent(v8::Isolate* isolate,
--                                    v8::Local<v8::Object> object,
--                                    content::RenderFrameHost* sender,
--                                    IPC::Message* message);
--v8::Local<v8::Object> CreateCustomEvent(v8::Isolate* isolate,
--                                        v8::Local<v8::Object> object,
--                                        v8::Local<v8::Object> event);
--v8::Local<v8::Object> CreateEventFromFlags(v8::Isolate* isolate, int flags);
--
--}  // namespace internal
--
--// Provide helperers to emit event in JavaScript.
--template <typename T>
--class EventEmitter : public Wrappable<T> {
-- public:
--  typedef std::vector<v8::Local<v8::Value>> ValueArray;
--
--  // Make the convinient methods visible:
--  // https://isocpp.org/wiki/faq/templates#nondependent-name-lookup-members
--  v8::Isolate* isolate() const { return Wrappable<T>::isolate(); }
--  v8::Local<v8::Object> GetWrapper() const {
--    return Wrappable<T>::GetWrapper();
--  }
--
--  // this.emit(name, event, args...);
--  template <typename... Args>
--  bool EmitCustomEvent(const base::StringPiece& name,
--                       v8::Local<v8::Object> event,
--                       const Args&... args) {
--    return EmitWithEvent(
--        name, internal::CreateCustomEvent(isolate(), GetWrapper(), event),
--        args...);
--  }
--
--  // this.emit(name, new Event(flags), args...);
--  template <typename... Args>
--  bool EmitWithFlags(const base::StringPiece& name,
--                     int flags,
--                     const Args&... args) {
--    return EmitCustomEvent(
--        name, internal::CreateEventFromFlags(isolate(), flags), args...);
--  }
--
--  // this.emit(name, new Event(), args...);
--  template <typename... Args>
--  bool Emit(const base::StringPiece& name, const Args&... args) {
--    return EmitWithSender(name, nullptr, nullptr, args...);
--  }
--
--  // this.emit(name, new Event(sender, message), args...);
--  template <typename... Args>
--  bool EmitWithSender(const base::StringPiece& name,
--                      content::RenderFrameHost* sender,
--                      IPC::Message* message,
--                      const Args&... args) {
--    v8::Locker locker(isolate());
--    v8::HandleScope handle_scope(isolate());
--    v8::Local<v8::Object> wrapper = GetWrapper();
--    if (wrapper.IsEmpty()) {
--      return false;
--    }
--    v8::Local<v8::Object> event =
--        internal::CreateJSEvent(isolate(), wrapper, sender, message);
--    return EmitWithEvent(name, event, args...);
--  }
--
-- protected:
--  EventEmitter() {}
--
-- private:
--  // this.emit(name, event, args...);
--  template <typename... Args>
--  bool EmitWithEvent(const base::StringPiece& name,
--                     v8::Local<v8::Object> event,
--                     const Args&... args) {
--    v8::Locker locker(isolate());
--    v8::HandleScope handle_scope(isolate());
--    EmitEvent(isolate(), GetWrapper(), name, event, args...);
--    return event->Get(StringToV8(isolate(), "defaultPrevented"))
--        ->BooleanValue();
--  }
--
--  DISALLOW_COPY_AND_ASSIGN(EventEmitter);
--};
--
--}  // namespace mate
--
--#endif  // ATOM_BROWSER_API_EVENT_EMITTER_H_
-removed in remote
-  base   100644 f81a8bea8b1a4f38f1dd842fb3bb588ed43c2ce9 atom/browser/api/frame_subscriber.cc
-  our    100644 7bcb7ab9370a8b3fe245c9569c93dbbdac0a0697 atom/browser/api/frame_subscriber.cc
-@@ -1,100 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/api/frame_subscriber.h"
--
--#include "atom/common/native_mate_converters/gfx_converter.h"
--#include "components/viz/common/frame_sinks/copy_output_request.h"
--#include "components/viz/service/frame_sinks/frame_sink_manager_impl.h"
--#include "components/viz/service/surfaces/surface_manager.h"
--#include "content/browser/compositor/surface_utils.h"
--#include "content/browser/renderer_host/render_widget_host_view_base.h"
--#include "ui/gfx/geometry/rect_conversions.h"
--#include "ui/gfx/skbitmap_operations.h"
--
--#include "atom/common/node_includes.h"
--
--namespace atom {
--
--namespace api {
--
--FrameSubscriber::FrameSubscriber(v8::Isolate* isolate,
--                                 content::WebContents* web_contents,
--                                 const FrameCaptureCallback& callback,
--                                 bool only_dirty)
--    : content::WebContentsObserver(web_contents),
--      isolate_(isolate),
--      callback_(callback),
--      only_dirty_(only_dirty),
--      weak_ptr_factory_(this) {}
--
--FrameSubscriber::~FrameSubscriber() = default;
--
--gfx::Rect FrameSubscriber::GetDamageRect() {
--  auto* view = web_contents()->GetRenderWidgetHostView();
--  if (view == nullptr)
--    return gfx::Rect();
--
--  auto* view_base = static_cast<content::RenderWidgetHostViewBase*>(view);
--  viz::SurfaceManager* surface_manager =
--      content::GetFrameSinkManager()->surface_manager();
--  viz::Surface* surface =
--      surface_manager->GetSurfaceForId(view_base->GetCurrentSurfaceId());
--  if (surface == nullptr)
--    return gfx::Rect();
--
--  if (surface->HasActiveFrame()) {
--    const viz::CompositorFrame& frame = surface->GetActiveFrame();
--    viz::RenderPass* root_pass = frame.render_pass_list.back().get();
--    gfx::Size frame_size = root_pass->output_rect.size();
--    gfx::Rect damage_rect =
--        gfx::ToEnclosingRect(gfx::RectF(root_pass->damage_rect));
--    damage_rect.Intersect(gfx::Rect(frame_size));
--    return gfx::ScaleToEnclosedRect(damage_rect,
--                                    1.0f / frame.device_scale_factor());
--  } else {
--    return gfx::Rect();
--  }
--}
--
--void FrameSubscriber::DidReceiveCompositorFrame() {
--  auto* view = web_contents()->GetRenderWidgetHostView();
--  if (view == nullptr)
--    return;
--
--  view->CopyFromSurface(
--      gfx::Rect(), view->GetViewBounds().size(),
--      base::BindOnce(&FrameSubscriber::Done, weak_ptr_factory_.GetWeakPtr(),
--                     GetDamageRect()));
--}
--
--void FrameSubscriber::Done(const gfx::Rect& damage, const SkBitmap& frame) {
--  if (frame.drawsNothing())
--    return;
--
--  v8::Locker locker(isolate_);
--  v8::HandleScope handle_scope(isolate_);
--
--  const_cast<SkBitmap&>(frame).setAlphaType(kPremul_SkAlphaType);
--  const SkBitmap& bitmap = only_dirty_ ? SkBitmapOperations::CreateTiledBitmap(
--                                             frame, damage.x(), damage.y(),
--                                             damage.width(), damage.height())
--                                       : frame;
--
--  size_t rgb_row_size = bitmap.width() * bitmap.bytesPerPixel();
--  auto* source = static_cast<const char*>(bitmap.getPixels());
--
--  v8::MaybeLocal<v8::Object> buffer =
--      node::Buffer::Copy(isolate_, source, rgb_row_size * bitmap.height());
--  auto local_buffer = buffer.ToLocalChecked();
--
--  v8::Local<v8::Value> damage_rect =
--      mate::Converter<gfx::Rect>::ToV8(isolate_, damage);
--
--  callback_.Run(local_buffer, damage_rect);
--}
--
--}  // namespace api
--
--}  // namespace atom
-removed in remote
-  base   100644 a803d75dff20f211df6708e2e27a58495ed9821f atom/browser/api/frame_subscriber.h
-  our    100644 d3e82855417cb59c0449f1c1b685970ffaea2af6 atom/browser/api/frame_subscriber.h
-@@ -1,52 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_API_FRAME_SUBSCRIBER_H_
--#define ATOM_BROWSER_API_FRAME_SUBSCRIBER_H_
--
--#include "content/public/browser/web_contents.h"
--
--#include "base/callback.h"
--#include "base/memory/weak_ptr.h"
--#include "components/viz/common/frame_sinks/copy_output_result.h"
--#include "content/public/browser/web_contents_observer.h"
--#include "ui/gfx/image/image.h"
--#include "v8/include/v8.h"
--
--namespace atom {
--
--namespace api {
--
--class WebContents;
--
--class FrameSubscriber : public content::WebContentsObserver {
-- public:
--  using FrameCaptureCallback =
--      base::Callback<void(v8::Local<v8::Value>, v8::Local<v8::Value>)>;
--
--  FrameSubscriber(v8::Isolate* isolate,
--                  content::WebContents* web_contents,
--                  const FrameCaptureCallback& callback,
--                  bool only_dirty);
--  ~FrameSubscriber() override;
--
-- private:
--  gfx::Rect GetDamageRect();
--  void DidReceiveCompositorFrame() override;
--  void Done(const gfx::Rect& damage, const SkBitmap& frame);
--
--  v8::Isolate* isolate_;
--  FrameCaptureCallback callback_;
--  bool only_dirty_;
--
--  base::WeakPtrFactory<FrameSubscriber> weak_ptr_factory_;
--
--  DISALLOW_COPY_AND_ASSIGN(FrameSubscriber);
--};
--
--}  // namespace api
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_API_FRAME_SUBSCRIBER_H_
-removed in remote
-  base   100644 1e5bc094cf63f04bc98602a8ad29b1c34024b595 atom/browser/api/save_page_handler.cc
-  our    100644 a0d8e283961d7ff79f78918907ab436d1e426b49 atom/browser/api/save_page_handler.cc
-@@ -1,74 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/api/save_page_handler.h"
--
--#include <string>
--
--#include "atom/browser/atom_browser_context.h"
--#include "base/callback.h"
--#include "base/files/file_path.h"
--#include "content/public/browser/web_contents.h"
--
--namespace atom {
--
--namespace api {
--
--SavePageHandler::SavePageHandler(content::WebContents* web_contents,
--                                 const SavePageCallback& callback)
--    : web_contents_(web_contents), callback_(callback) {}
--
--SavePageHandler::~SavePageHandler() {}
--
--void SavePageHandler::OnDownloadCreated(content::DownloadManager* manager,
--                                        download::DownloadItem* item) {
--  // OnDownloadCreated is invoked during WebContents::SavePage, so the |item|
--  // here is the one stated by WebContents::SavePage.
--  item->AddObserver(this);
--}
--
--bool SavePageHandler::Handle(const base::FilePath& full_path,
--                             const content::SavePageType& save_type) {
--  auto* download_manager = content::BrowserContext::GetDownloadManager(
--      web_contents_->GetBrowserContext());
--  download_manager->AddObserver(this);
--  // Chromium will create a 'foo_files' directory under the directory of saving
--  // page 'foo.html' for holding other resource files of 'foo.html'.
--  base::FilePath saved_main_directory_path = full_path.DirName().Append(
--      full_path.RemoveExtension().BaseName().value() +
--      FILE_PATH_LITERAL("_files"));
--  bool result =
--      web_contents_->SavePage(full_path, saved_main_directory_path, save_type);
--  download_manager->RemoveObserver(this);
--  // If initialization fails which means fail to create |DownloadItem|, we need
--  // to delete the |SavePageHandler| instance to avoid memory-leak.
--  if (!result)
--    delete this;
--  return result;
--}
--
--void SavePageHandler::OnDownloadUpdated(download::DownloadItem* item) {
--  if (item->IsDone()) {
--    v8::Isolate* isolate = v8::Isolate::GetCurrent();
--    v8::Locker locker(isolate);
--    v8::HandleScope handle_scope(isolate);
--    if (item->GetState() == download::DownloadItem::COMPLETE) {
--      callback_.Run(v8::Null(isolate));
--    } else {
--      v8::Local<v8::String> error_message =
--          v8::String::NewFromUtf8(isolate, "Fail to save page");
--      callback_.Run(v8::Exception::Error(error_message));
--    }
--    Destroy(item);
--  }
--}
--
--void SavePageHandler::Destroy(download::DownloadItem* item) {
--  item->RemoveObserver(this);
--  delete this;
--}
--
--}  // namespace api
--
--}  // namespace atom
-removed in remote
-  base   100644 dd1692a8badc4091578e8edb7d37e3618a4cf0fe atom/browser/api/save_page_handler.h
-  our    100644 204d65bd6b1865686cd6600caa3423a75b5295fb atom/browser/api/save_page_handler.h
-@@ -1,58 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_API_SAVE_PAGE_HANDLER_H_
--#define ATOM_BROWSER_API_SAVE_PAGE_HANDLER_H_
--
--#include <string>
--
--#include "components/download/public/common/download_item.h"
--#include "content/public/browser/download_manager.h"
--#include "content/public/browser/save_page_type.h"
--#include "v8/include/v8.h"
--
--namespace base {
--class FilePath;
--}
--
--namespace content {
--class WebContents;
--}
--
--namespace atom {
--
--namespace api {
--
--// A self-destroyed class for handling save page request.
--class SavePageHandler : public content::DownloadManager::Observer,
--                        public download::DownloadItem::Observer {
-- public:
--  using SavePageCallback = base::Callback<void(v8::Local<v8::Value>)>;
--
--  SavePageHandler(content::WebContents* web_contents,
--                  const SavePageCallback& callback);
--  ~SavePageHandler() override;
--
--  bool Handle(const base::FilePath& full_path,
--              const content::SavePageType& save_type);
--
-- private:
--  void Destroy(download::DownloadItem* item);
--
--  // content::DownloadManager::Observer:
--  void OnDownloadCreated(content::DownloadManager* manager,
--                         download::DownloadItem* item) override;
--
--  // download::DownloadItem::Observer:
--  void OnDownloadUpdated(download::DownloadItem* item) override;
--
--  content::WebContents* web_contents_;  // weak
--  SavePageCallback callback_;
--};
--
--}  // namespace api
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_API_SAVE_PAGE_HANDLER_H_
-removed in remote
-  base   100644 77a936cde02cdbe5d845f9ab5b91abf9afaf359a atom/browser/api/trackable_object.cc
-  our    100644 7955ddefcabe1a106d7dc7fd4d821d75a5f72300 atom/browser/api/trackable_object.cc
-@@ -1,64 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/api/trackable_object.h"
--
--#include "atom/browser/atom_browser_main_parts.h"
--#include "base/bind.h"
--#include "base/supports_user_data.h"
--
--namespace mate {
--
--namespace {
--
--const char* kTrackedObjectKey = "TrackedObjectKey";
--
--class IDUserData : public base::SupportsUserData::Data {
-- public:
--  explicit IDUserData(int32_t id) : id_(id) {}
--
--  operator int32_t() const { return id_; }
--
-- private:
--  int32_t id_;
--
--  DISALLOW_COPY_AND_ASSIGN(IDUserData);
--};
--
--}  // namespace
--
--TrackableObjectBase::TrackableObjectBase() : weak_factory_(this) {
--  atom::AtomBrowserMainParts::Get()->RegisterDestructionCallback(
--      GetDestroyClosure());
--}
--
--TrackableObjectBase::~TrackableObjectBase() {}
--
--base::OnceClosure TrackableObjectBase::GetDestroyClosure() {
--  return base::BindOnce(&TrackableObjectBase::Destroy,
--                        weak_factory_.GetWeakPtr());
--}
--
--void TrackableObjectBase::Destroy() {
--  delete this;
--}
--
--void TrackableObjectBase::AttachAsUserData(base::SupportsUserData* wrapped) {
--  wrapped->SetUserData(kTrackedObjectKey,
--                       std::make_unique<IDUserData>(weak_map_id_));
--}
--
--// static
--int32_t TrackableObjectBase::GetIDFromWrappedClass(
--    base::SupportsUserData* wrapped) {
--  if (wrapped) {
--    auto* id =
--        static_cast<IDUserData*>(wrapped->GetUserData(kTrackedObjectKey));
--    if (id)
--      return *id;
--  }
--  return 0;
--}
--
--}  // namespace mate
-removed in remote
-  base   100644 7c4ed03fe052ee3299ed96742577ad68153a135e atom/browser/api/trackable_object.h
-  our    100644 f0fd86d344cf34b9cece734cc9f0b25284cfd8d8 atom/browser/api/trackable_object.h
-@@ -1,137 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_API_TRACKABLE_OBJECT_H_
--#define ATOM_BROWSER_API_TRACKABLE_OBJECT_H_
--
--#include <vector>
--
--#include "atom/browser/api/event_emitter.h"
--#include "atom/common/key_weak_map.h"
--#include "base/bind.h"
--#include "base/memory/weak_ptr.h"
--#include "native_mate/object_template_builder.h"
--
--namespace base {
--class SupportsUserData;
--}
--
--namespace mate {
--
--// Users should use TrackableObject instead.
--class TrackableObjectBase {
-- public:
--  TrackableObjectBase();
--
--  // The ID in weak map.
--  int32_t weak_map_id() const { return weak_map_id_; }
--
--  // Wrap TrackableObject into a class that SupportsUserData.
--  void AttachAsUserData(base::SupportsUserData* wrapped);
--
--  // Get the weak_map_id from SupportsUserData.
--  static int32_t GetIDFromWrappedClass(base::SupportsUserData* wrapped);
--
-- protected:
--  virtual ~TrackableObjectBase();
--
--  // Returns a closure that can destroy the native class.
--  base::OnceClosure GetDestroyClosure();
--
--  int32_t weak_map_id_ = 0;
--
-- private:
--  void Destroy();
--
--  base::WeakPtrFactory<TrackableObjectBase> weak_factory_;
--
--  DISALLOW_COPY_AND_ASSIGN(TrackableObjectBase);
--};
--
--// All instances of TrackableObject will be kept in a weak map and can be got
--// from its ID.
--template <typename T>
--class TrackableObject : public TrackableObjectBase,
--                        public mate::EventEmitter<T> {
-- public:
--  // Mark the JS object as destroyed.
--  void MarkDestroyed() {
--    v8::Local<v8::Object> wrapper = Wrappable<T>::GetWrapper();
--    if (!wrapper.IsEmpty()) {
--      wrapper->SetAlignedPointerInInternalField(0, nullptr);
--    }
--  }
--
--  bool IsDestroyed() {
--    v8::Local<v8::Object> wrapper = Wrappable<T>::GetWrapper();
--    return wrapper->InternalFieldCount() == 0 ||
--           wrapper->GetAlignedPointerFromInternalField(0) == nullptr;
--  }
--
--  // Finds out the TrackableObject from its ID in weak map.
--  static T* FromWeakMapID(v8::Isolate* isolate, int32_t id) {
--    if (!weak_map_)
--      return nullptr;
--
--    v8::MaybeLocal<v8::Object> object = weak_map_->Get(isolate, id);
--    if (object.IsEmpty())
--      return nullptr;
--
--    T* self = nullptr;
--    mate::ConvertFromV8(isolate, object.ToLocalChecked(), &self);
--    return self;
--  }
--
--  // Finds out the TrackableObject from the class it wraps.
--  static T* FromWrappedClass(v8::Isolate* isolate,
--                             base::SupportsUserData* wrapped) {
--    int32_t id = GetIDFromWrappedClass(wrapped);
--    if (!id)
--      return nullptr;
--    return FromWeakMapID(isolate, id);
--  }
--
--  // Returns all objects in this class's weak map.
--  static std::vector<v8::Local<v8::Object>> GetAll(v8::Isolate* isolate) {
--    if (weak_map_)
--      return weak_map_->Values(isolate);
--    else
--      return std::vector<v8::Local<v8::Object>>();
--  }
--
--  // Removes this instance from the weak map.
--  void RemoveFromWeakMap() {
--    if (weak_map_ && weak_map_->Has(weak_map_id()))
--      weak_map_->Remove(weak_map_id());
--  }
--
-- protected:
--  TrackableObject() { weak_map_id_ = ++next_id_; }
--
--  ~TrackableObject() override { RemoveFromWeakMap(); }
--
--  void InitWith(v8::Isolate* isolate, v8::Local<v8::Object> wrapper) override {
--    WrappableBase::InitWith(isolate, wrapper);
--    if (!weak_map_) {
--      weak_map_ = new atom::KeyWeakMap<int32_t>;
--    }
--    weak_map_->Set(isolate, weak_map_id_, wrapper);
--  }
--
-- private:
--  static int32_t next_id_;
--  static atom::KeyWeakMap<int32_t>* weak_map_;  // leaked on purpose
--
--  DISALLOW_COPY_AND_ASSIGN(TrackableObject);
--};
--
--template <typename T>
--int32_t TrackableObject<T>::next_id_ = 0;
--
--template <typename T>
--atom::KeyWeakMap<int32_t>* TrackableObject<T>::weak_map_ = nullptr;
--
--}  // namespace mate
--
--#endif  // ATOM_BROWSER_API_TRACKABLE_OBJECT_H_
-removed in remote
-  base   100644 63a1ea46b163725ef2fa4797c6f4170f6ec23a99 atom/browser/atom_browser_client.cc
-  our    100644 57c4ee582405e6d501ec23940ccb10689ecd64a1 atom/browser/atom_browser_client.cc
-@@ -1,550 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/atom_browser_client.h"
--
--#if defined(OS_WIN)
--#include <shlobj.h>
--#endif
--
--#include "atom/browser/api/atom_api_app.h"
--#include "atom/browser/api/atom_api_protocol.h"
--#include "atom/browser/api/atom_api_web_contents.h"
--#include "atom/browser/atom_browser_context.h"
--#include "atom/browser/atom_browser_main_parts.h"
--#include "atom/browser/atom_quota_permission_context.h"
--#include "atom/browser/atom_resource_dispatcher_host_delegate.h"
--#include "atom/browser/atom_speech_recognition_manager_delegate.h"
--#include "atom/browser/child_web_contents_tracker.h"
--#include "atom/browser/native_window.h"
--#include "atom/browser/session_preferences.h"
--#include "atom/browser/web_contents_permission_helper.h"
--#include "atom/browser/web_contents_preferences.h"
--#include "atom/browser/window_list.h"
--#include "atom/common/google_api_key.h"
--#include "atom/common/options_switches.h"
--#include "base/command_line.h"
--#include "base/environment.h"
--#include "base/files/file_util.h"
--#include "base/stl_util.h"
--#include "base/strings/string_number_conversions.h"
--#include "base/strings/string_util.h"
--#include "chrome/browser/printing/printing_message_filter.h"
--#include "chrome/browser/speech/tts_message_filter.h"
--#include "content/public/browser/browser_ppapi_host.h"
--#include "content/public/browser/client_certificate_delegate.h"
--#include "content/public/browser/render_frame_host.h"
--#include "content/public/browser/render_process_host.h"
--#include "content/public/browser/render_view_host.h"
--#include "content/public/browser/resource_dispatcher_host.h"
--#include "content/public/browser/site_instance.h"
--#include "content/public/browser/web_contents.h"
--#include "content/public/common/content_paths.h"
--#include "content/public/common/content_switches.h"
--#include "content/public/common/url_constants.h"
--#include "content/public/common/web_preferences.h"
--#include "net/ssl/ssl_cert_request_info.h"
--#include "ppapi/host/ppapi_host.h"
--#include "services/network/public/cpp/resource_request_body.h"
--#include "ui/base/l10n/l10n_util.h"
--#include "v8/include/v8.h"
--
--#if defined(USE_NSS_CERTS)
--#include "net/ssl/client_cert_store_nss.h"
--#elif defined(OS_WIN)
--#include "net/ssl/client_cert_store_win.h"
--#elif defined(OS_MACOSX)
--#include "net/ssl/client_cert_store_mac.h"
--#elif defined(USE_OPENSSL)
--#include "net/ssl/client_cert_store.h"
--#endif
--
--#if defined(ENABLE_PEPPER_FLASH)
--#include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h"
--#endif  // defined(ENABLE_PEPPER_FLASH)
--
--using content::BrowserThread;
--
--namespace atom {
--
--namespace {
--
--// Next navigation should not restart renderer process.
--bool g_suppress_renderer_process_restart = false;
--
--// Custom schemes to be registered to handle service worker.
--std::string g_custom_service_worker_schemes = "";
--
--bool IsSameWebSite(content::BrowserContext* browser_context,
--                   const GURL& src_url,
--                   const GURL& dest_url) {
--  return content::SiteInstance::IsSameWebSite(browser_context, src_url,
--                                              dest_url) ||
--         // `IsSameWebSite` doesn't seem to work for some URIs such as `file:`,
--         // handle these scenarios by comparing only the site as defined by
--         // `GetSiteForURL`.
--         content::SiteInstance::GetSiteForURL(browser_context, dest_url) ==
--             src_url;
--}
--
--}  // namespace
--
--// static
--void AtomBrowserClient::SuppressRendererProcessRestartForOnce() {
--  g_suppress_renderer_process_restart = true;
--}
--
--void AtomBrowserClient::SetCustomServiceWorkerSchemes(
--    const std::vector<std::string>& schemes) {
--  g_custom_service_worker_schemes = base::JoinString(schemes, ",");
--}
--
--AtomBrowserClient::AtomBrowserClient() {}
--
--AtomBrowserClient::~AtomBrowserClient() {}
--
--content::WebContents* AtomBrowserClient::GetWebContentsFromProcessID(
--    int process_id) {
--  // If the process is a pending process, we should use the web contents
--  // for the frame host passed into OverrideSiteInstanceForNavigation.
--  if (base::ContainsKey(pending_processes_, process_id))
--    return pending_processes_[process_id];
--
--  // Certain render process will be created with no associated render view,
--  // for example: ServiceWorker.
--  return WebContentsPreferences::GetWebContentsFromProcessID(process_id);
--}
--
--bool AtomBrowserClient::ShouldCreateNewSiteInstance(
--    content::RenderFrameHost* render_frame_host,
--    content::BrowserContext* browser_context,
--    content::SiteInstance* current_instance,
--    const GURL& url) {
--  if (url.SchemeIs(url::kJavaScriptScheme))
--    // "javacript:" scheme should always use same SiteInstance
--    return false;
--
--  int process_id = current_instance->GetProcess()->GetID();
--  if (!IsRendererSandboxed(process_id)) {
--    if (!RendererUsesNativeWindowOpen(process_id)) {
--      // non-sandboxed renderers without native window.open should always create
--      // a new SiteInstance
--      return true;
--    }
--    auto* web_contents =
--        content::WebContents::FromRenderFrameHost(render_frame_host);
--    if (!ChildWebContentsTracker::IsChildWebContents(web_contents)) {
--      // Root WebContents should always create new process to make sure
--      // native addons are loaded correctly after reload / navigation.
--      // (Non-root WebContents opened by window.open() should try to
--      //  reuse process to allow synchronous cross-window scripting.)
--      return true;
--    }
--  }
--
--  // Create new a SiteInstance if navigating to a different site.
--  auto src_url = current_instance->GetSiteURL();
--  return !IsSameWebSite(browser_context, src_url, url);
--}
--
--void AtomBrowserClient::AddProcessPreferences(
--    int process_id,
--    AtomBrowserClient::ProcessPreferences prefs) {
--  process_preferences_[process_id] = prefs;
--}
--
--void AtomBrowserClient::RemoveProcessPreferences(int process_id) {
--  process_preferences_.erase(process_id);
--}
--
--bool AtomBrowserClient::IsProcessObserved(int process_id) {
--  return process_preferences_.find(process_id) != process_preferences_.end();
--}
--
--bool AtomBrowserClient::IsRendererSandboxed(int process_id) {
--  auto it = process_preferences_.find(process_id);
--  return it != process_preferences_.end() && it->second.sandbox;
--}
--
--bool AtomBrowserClient::RendererUsesNativeWindowOpen(int process_id) {
--  auto it = process_preferences_.find(process_id);
--  return it != process_preferences_.end() && it->second.native_window_open;
--}
--
--bool AtomBrowserClient::RendererDisablesPopups(int process_id) {
--  auto it = process_preferences_.find(process_id);
--  return it != process_preferences_.end() && it->second.disable_popups;
--}
--
--void AtomBrowserClient::RenderProcessWillLaunch(
--    content::RenderProcessHost* host,
--    service_manager::mojom::ServiceRequest* service_request) {
--  // When a render process is crashed, it might be reused.
--  int process_id = host->GetID();
--  if (IsProcessObserved(process_id))
--    return;
--
--  host->AddFilter(new printing::PrintingMessageFilter(process_id));
--  host->AddFilter(new TtsMessageFilter(process_id, host->GetBrowserContext()));
--
--  ProcessPreferences prefs;
--  auto* web_preferences =
--      WebContentsPreferences::From(GetWebContentsFromProcessID(process_id));
--  if (web_preferences) {
--    prefs.sandbox = web_preferences->IsEnabled(options::kSandbox);
--    prefs.native_window_open =
--        web_preferences->IsEnabled(options::kNativeWindowOpen);
--    prefs.disable_popups = web_preferences->IsEnabled("disablePopups");
--  }
--  AddProcessPreferences(host->GetID(), prefs);
--  // ensure the ProcessPreferences is removed later
--  host->AddObserver(this);
--}
--
--content::SpeechRecognitionManagerDelegate*
--AtomBrowserClient::CreateSpeechRecognitionManagerDelegate() {
--  return new AtomSpeechRecognitionManagerDelegate;
--}
--
--void AtomBrowserClient::OverrideWebkitPrefs(content::RenderViewHost* host,
--                                            content::WebPreferences* prefs) {
--  prefs->javascript_enabled = true;
--  prefs->web_security_enabled = true;
--  prefs->plugins_enabled = true;
--  prefs->dom_paste_enabled = true;
--  prefs->allow_scripts_to_close_windows = true;
--  prefs->javascript_can_access_clipboard = true;
--  prefs->local_storage_enabled = true;
--  prefs->databases_enabled = true;
--  prefs->application_cache_enabled = true;
--  prefs->allow_universal_access_from_file_urls = true;
--  prefs->allow_file_access_from_file_urls = true;
--  prefs->webgl1_enabled = true;
--  prefs->webgl2_enabled = true;
--  prefs->allow_running_insecure_content = false;
--  prefs->default_minimum_page_scale_factor = 1.f;
--  prefs->default_maximum_page_scale_factor = 1.f;
--  prefs->navigate_on_drag_drop = false;
--
--  // Custom preferences of guest page.
--  auto* web_contents = content::WebContents::FromRenderViewHost(host);
--  auto* web_preferences = WebContentsPreferences::From(web_contents);
--  if (web_preferences)
--    web_preferences->OverrideWebkitPrefs(prefs);
--}
--
--void AtomBrowserClient::OverrideSiteInstanceForNavigation(
--    content::RenderFrameHost* rfh,
--    content::BrowserContext* browser_context,
--    const GURL& url,
--    bool has_request_started,
--    content::SiteInstance* candidate_instance,
--    content::SiteInstance** new_instance) {
--  if (g_suppress_renderer_process_restart) {
--    g_suppress_renderer_process_restart = false;
--    return;
--  }
--
--  content::SiteInstance* current_instance = rfh->GetSiteInstance();
--  if (!ShouldCreateNewSiteInstance(rfh, browser_context, current_instance, url))
--    return;
--
--  // Do we have an affinity site to manage ?
--  auto* web_contents = content::WebContents::FromRenderFrameHost(rfh);
--  auto* web_preferences = WebContentsPreferences::From(web_contents);
--  std::string affinity;
--  if (web_preferences &&
--      web_preferences->GetPreference("affinity", &affinity) &&
--      !affinity.empty()) {
--    affinity = base::ToLowerASCII(affinity);
--    auto iter = site_per_affinities.find(affinity);
--    GURL dest_site = content::SiteInstance::GetSiteForURL(browser_context, url);
--    if (iter != site_per_affinities.end() &&
--        IsSameWebSite(browser_context, iter->second->GetSiteURL(), dest_site)) {
--      *new_instance = iter->second;
--    } else {
--      site_per_affinities[affinity] = candidate_instance;
--      *new_instance = candidate_instance;
--      // Remember the original web contents for the pending renderer process.
--      auto* pending_process = candidate_instance->GetProcess();
--      pending_processes_[pending_process->GetID()] = web_contents;
--    }
--  } else {
--    // OverrideSiteInstanceForNavigation will be called more than once during a
--    // navigation (currently twice, on request and when it's about to commit in
--    // the renderer), look at RenderFrameHostManager::GetFrameHostForNavigation.
--    // In the default mode we should resuse the same site instance until the
--    // request commits otherwise it will get destroyed. Currently there is no
--    // unique lifetime tracker for a navigation request during site instance
--    // creation. We check for the state of the request, which should be one of
--    // (WAITING_FOR_RENDERER_RESPONSE, STARTED, RESPONSE_STARTED, FAILED) along
--    // with the availability of a speculative render frame host.
--    if (has_request_started) {
--      *new_instance = current_instance;
--      return;
--    }
--
--    *new_instance = candidate_instance;
--    // Remember the original web contents for the pending renderer process.
--    auto* pending_process = candidate_instance->GetProcess();
--    pending_processes_[pending_process->GetID()] = web_contents;
--  }
--}
--
--void AtomBrowserClient::AppendExtraCommandLineSwitches(
--    base::CommandLine* command_line,
--    int process_id) {
--  // Make sure we're about to launch a known executable
--  {
--    base::FilePath child_path;
--    PathService::Get(content::CHILD_PROCESS_EXE, &child_path);
--
--    base::ThreadRestrictions::ScopedAllowIO allow_io;
--    CHECK(base::MakeAbsoluteFilePath(command_line->GetProgram()) == child_path);
--  }
--
--  std::string process_type =
--      command_line->GetSwitchValueASCII(::switches::kProcessType);
--  if (process_type != ::switches::kRendererProcess)
--    return;
--
--  // Copy following switches to child process.
--  static const char* const kCommonSwitchNames[] = {switches::kStandardSchemes,
--                                                   switches::kEnableSandbox,
--                                                   switches::kSecureSchemes};
--  command_line->CopySwitchesFrom(*base::CommandLine::ForCurrentProcess(),
--                                 kCommonSwitchNames,
--                                 arraysize(kCommonSwitchNames));
--
--  // The registered service worker schemes.
--  if (!g_custom_service_worker_schemes.empty())
--    command_line->AppendSwitchASCII(switches::kRegisterServiceWorkerSchemes,
--                                    g_custom_service_worker_schemes);
--
--#if defined(OS_WIN)
--  // Append --app-user-model-id.
--  PWSTR current_app_id;
--  if (SUCCEEDED(GetCurrentProcessExplicitAppUserModelID(&current_app_id))) {
--    command_line->AppendSwitchNative(switches::kAppUserModelId, current_app_id);
--    CoTaskMemFree(current_app_id);
--  }
--#endif
--
--  if (delegate_) {
--    auto app_path = static_cast<api::App*>(delegate_)->GetAppPath();
--    command_line->AppendSwitchPath(switches::kAppPath, app_path);
--  }
--
--  content::WebContents* web_contents = GetWebContentsFromProcessID(process_id);
--  if (web_contents) {
--    auto* web_preferences = WebContentsPreferences::From(web_contents);
--    if (web_preferences)
--      web_preferences->AppendCommandLineSwitches(command_line);
--    SessionPreferences::AppendExtraCommandLineSwitches(
--        web_contents->GetBrowserContext(), command_line);
--  }
--}
--
--void AtomBrowserClient::DidCreatePpapiPlugin(content::BrowserPpapiHost* host) {
--#if defined(ENABLE_PEPPER_FLASH)
--  host->GetPpapiHost()->AddHostFactoryFilter(
--      base::WrapUnique(new ChromeBrowserPepperHostFactory(host)));
--#endif
--}
--
--void AtomBrowserClient::GetGeolocationRequestContext(
--    base::OnceCallback<void(scoped_refptr<net::URLRequestContextGetter>)>
--        callback) {
--  auto* io_thread = AtomBrowserMainParts::Get()->io_thread();
--  auto* context = io_thread->GetRequestContext();
--  base::ThreadTaskRunnerHandle::Get()->PostTask(
--      FROM_HERE,
--      base::BindOnce(std::move(callback), base::RetainedRef(context)));
--}
--
--std::string AtomBrowserClient::GetGeolocationApiKey() {
--  std::unique_ptr<base::Environment> env(base::Environment::Create());
--  std::string api_key;
--  if (!env->GetVar("GOOGLE_API_KEY", &api_key))
--    api_key = GOOGLEAPIS_API_KEY;
--  return api_key;
--}
--
--content::QuotaPermissionContext*
--AtomBrowserClient::CreateQuotaPermissionContext() {
--  return new AtomQuotaPermissionContext;
--}
--
--void AtomBrowserClient::AllowCertificateError(
--    content::WebContents* web_contents,
--    int cert_error,
--    const net::SSLInfo& ssl_info,
--    const GURL& request_url,
--    content::ResourceType resource_type,
--    bool strict_enforcement,
--    bool expired_previous_decision,
--    const base::Callback<void(content::CertificateRequestResultType)>&
--        callback) {
--  if (delegate_) {
--    delegate_->AllowCertificateError(
--        web_contents, cert_error, ssl_info, request_url, resource_type,
--        strict_enforcement, expired_previous_decision, callback);
--  }
--}
--
--void AtomBrowserClient::SelectClientCertificate(
--    content::WebContents* web_contents,
--    net::SSLCertRequestInfo* cert_request_info,
--    net::ClientCertIdentityList client_certs,
--    std::unique_ptr<content::ClientCertificateDelegate> delegate) {
--  if (!client_certs.empty() && delegate_) {
--    delegate_->SelectClientCertificate(web_contents, cert_request_info,
--                                       std::move(client_certs),
--                                       std::move(delegate));
--  }
--}
--
--void AtomBrowserClient::ResourceDispatcherHostCreated() {
--  resource_dispatcher_host_delegate_.reset(
--      new AtomResourceDispatcherHostDelegate);
--  content::ResourceDispatcherHost::Get()->SetDelegate(
--      resource_dispatcher_host_delegate_.get());
--}
--
--bool AtomBrowserClient::CanCreateWindow(
--    content::RenderFrameHost* opener,
--    const GURL& opener_url,
--    const GURL& opener_top_level_frame_url,
--    const GURL& source_origin,
--    content::mojom::WindowContainerType container_type,
--    const GURL& target_url,
--    const content::Referrer& referrer,
--    const std::string& frame_name,
--    WindowOpenDisposition disposition,
--    const blink::mojom::WindowFeatures& features,
--    const std::vector<std::string>& additional_features,
--    const scoped_refptr<network::ResourceRequestBody>& body,
--    bool user_gesture,
--    bool opener_suppressed,
--    bool* no_javascript_access) {
--  DCHECK_CURRENTLY_ON(BrowserThread::UI);
--
--  int opener_render_process_id = opener->GetProcess()->GetID();
--
--  if (IsRendererSandboxed(opener_render_process_id)) {
--    *no_javascript_access = false;
--    return true;
--  }
--
--  if (RendererUsesNativeWindowOpen(opener_render_process_id)) {
--    if (RendererDisablesPopups(opener_render_process_id)) {
--      // <webview> without allowpopups attribute should return
--      // null from window.open calls
--      return false;
--    } else {
--      *no_javascript_access = false;
--      return true;
--    }
--  }
--
--  if (delegate_) {
--    return delegate_->CanCreateWindow(
--        opener, opener_url, opener_top_level_frame_url, source_origin,
--        container_type, target_url, referrer, frame_name, disposition, features,
--        additional_features, body, user_gesture, opener_suppressed,
--        no_javascript_access);
--  }
--
--  return false;
--}
--
--void AtomBrowserClient::GetAdditionalAllowedSchemesForFileSystem(
--    std::vector<std::string>* additional_schemes) {
--  auto schemes_list = api::GetStandardSchemes();
--  if (!schemes_list.empty())
--    additional_schemes->insert(additional_schemes->end(), schemes_list.begin(),
--                               schemes_list.end());
--  additional_schemes->push_back(content::kChromeDevToolsScheme);
--}
--
--void AtomBrowserClient::SiteInstanceDeleting(
--    content::SiteInstance* site_instance) {
--  // We are storing weak_ptr, is it fundamental to maintain the map up-to-date
--  // when an instance is destroyed.
--  for (auto iter = site_per_affinities.begin();
--       iter != site_per_affinities.end(); ++iter) {
--    if (iter->second == site_instance) {
--      site_per_affinities.erase(iter);
--      break;
--    }
--  }
--}
--
--std::unique_ptr<net::ClientCertStore> AtomBrowserClient::CreateClientCertStore(
--    content::ResourceContext* resource_context) {
--#if defined(USE_NSS_CERTS)
--  return std::make_unique<net::ClientCertStoreNSS>(
--      net::ClientCertStoreNSS::PasswordDelegateFactory());
--#elif defined(OS_WIN)
--  return std::make_unique<net::ClientCertStoreWin>();
--#elif defined(OS_MACOSX)
--  return std::make_unique<net::ClientCertStoreMac>();
--#elif defined(USE_OPENSSL)
--  return std::unique_ptr<net::ClientCertStore>();
--#endif
--}
--
--brightray::BrowserMainParts* AtomBrowserClient::OverrideCreateBrowserMainParts(
--    const content::MainFunctionParams&) {
--  v8::V8::Initialize();  // Init V8 before creating main parts.
--  return new AtomBrowserMainParts;
--}
--
--void AtomBrowserClient::WebNotificationAllowed(
--    int render_process_id,
--    const base::Callback<void(bool, bool)>& callback) {
--  content::WebContents* web_contents =
--      WebContentsPreferences::GetWebContentsFromProcessID(render_process_id);
--  if (!web_contents) {
--    callback.Run(false, false);
--    return;
--  }
--  auto* permission_helper =
--      WebContentsPermissionHelper::FromWebContents(web_contents);
--  if (!permission_helper) {
--    callback.Run(false, false);
--    return;
--  }
--  permission_helper->RequestWebNotificationPermission(
--      base::Bind(callback, web_contents->IsAudioMuted()));
--}
--
--void AtomBrowserClient::RenderProcessHostDestroyed(
--    content::RenderProcessHost* host) {
--  int process_id = host->GetID();
--  pending_processes_.erase(process_id);
--  RemoveProcessPreferences(process_id);
--}
--
--void AtomBrowserClient::RenderProcessReady(content::RenderProcessHost* host) {
--  render_process_host_pids_[host->GetID()] = base::GetProcId(host->GetHandle());
--  if (delegate_) {
--    static_cast<api::App*>(delegate_)->RenderProcessReady(host);
--  }
--}
--
--void AtomBrowserClient::RenderProcessExited(content::RenderProcessHost* host,
--                                            base::TerminationStatus status,
--                                            int exit_code) {
--  auto host_pid = render_process_host_pids_.find(host->GetID());
--  if (host_pid != render_process_host_pids_.end()) {
--    if (delegate_) {
--      static_cast<api::App*>(delegate_)->RenderProcessDisconnected(
--          host_pid->second);
--    }
--    render_process_host_pids_.erase(host_pid);
--  }
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 8f62887ff6807f18226842d7042dbcef76d8a835 atom/browser/atom_browser_client.h
-  our    100644 a0284cf3f72e9cd4292b636948f92bb09b97f0ae atom/browser/atom_browser_client.h
-@@ -1,161 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_ATOM_BROWSER_CLIENT_H_
--#define ATOM_BROWSER_ATOM_BROWSER_CLIENT_H_
--
--#include <map>
--#include <set>
--#include <string>
--#include <vector>
--
--#include "brightray/browser/browser_client.h"
--#include "content/public/browser/render_process_host_observer.h"
--#include "net/ssl/client_cert_identity.h"
--
--namespace content {
--class QuotaPermissionContext;
--class ClientCertificateDelegate;
--}  // namespace content
--
--namespace net {
--class SSLCertRequestInfo;
--}
--
--namespace atom {
--
--class AtomResourceDispatcherHostDelegate;
--
--class AtomBrowserClient : public brightray::BrowserClient,
--                          public content::RenderProcessHostObserver {
-- public:
--  AtomBrowserClient();
--  ~AtomBrowserClient() override;
--
--  using Delegate = content::ContentBrowserClient;
--  void set_delegate(Delegate* delegate) { delegate_ = delegate; }
--
--  // Returns the WebContents for pending render processes.
--  content::WebContents* GetWebContentsFromProcessID(int process_id);
--
--  // Don't force renderer process to restart for once.
--  static void SuppressRendererProcessRestartForOnce();
--
--  // Custom schemes to be registered to handle service worker.
--  static void SetCustomServiceWorkerSchemes(
--      const std::vector<std::string>& schemes);
--
-- protected:
--  // content::ContentBrowserClient:
--  void RenderProcessWillLaunch(
--      content::RenderProcessHost* host,
--      service_manager::mojom::ServiceRequest* service_request) override;
--  content::SpeechRecognitionManagerDelegate*
--  CreateSpeechRecognitionManagerDelegate() override;
--  void OverrideWebkitPrefs(content::RenderViewHost* render_view_host,
--                           content::WebPreferences* prefs) override;
--  void OverrideSiteInstanceForNavigation(
--      content::RenderFrameHost* render_frame_host,
--      content::BrowserContext* browser_context,
--      const GURL& dest_url,
--      bool has_request_started,
--      content::SiteInstance* candidate_instance,
--      content::SiteInstance** new_instance) override;
--  void AppendExtraCommandLineSwitches(base::CommandLine* command_line,
--                                      int child_process_id) override;
--  void DidCreatePpapiPlugin(content::BrowserPpapiHost* browser_host) override;
--  void GetGeolocationRequestContext(
--      base::OnceCallback<void(scoped_refptr<net::URLRequestContextGetter>)>
--          callback) override;
--  std::string GetGeolocationApiKey() override;
--  content::QuotaPermissionContext* CreateQuotaPermissionContext() override;
--  void AllowCertificateError(
--      content::WebContents* web_contents,
--      int cert_error,
--      const net::SSLInfo& ssl_info,
--      const GURL& request_url,
--      content::ResourceType resource_type,
--      bool strict_enforcement,
--      bool expired_previous_decision,
--      const base::Callback<void(content::CertificateRequestResultType)>&
--          callback) override;
--  void SelectClientCertificate(
--      content::WebContents* web_contents,
--      net::SSLCertRequestInfo* cert_request_info,
--      net::ClientCertIdentityList client_certs,
--      std::unique_ptr<content::ClientCertificateDelegate> delegate) override;
--  void ResourceDispatcherHostCreated() override;
--  bool CanCreateWindow(content::RenderFrameHost* opener,
--                       const GURL& opener_url,
--                       const GURL& opener_top_level_frame_url,
--                       const GURL& source_origin,
--                       content::mojom::WindowContainerType container_type,
--                       const GURL& target_url,
--                       const content::Referrer& referrer,
--                       const std::string& frame_name,
--                       WindowOpenDisposition disposition,
--                       const blink::mojom::WindowFeatures& features,
--                       const std::vector<std::string>& additional_features,
--                       const scoped_refptr<network::ResourceRequestBody>& body,
--                       bool user_gesture,
--                       bool opener_suppressed,
--                       bool* no_javascript_access) override;
--  void GetAdditionalAllowedSchemesForFileSystem(
--      std::vector<std::string>* schemes) override;
--  void SiteInstanceDeleting(content::SiteInstance* site_instance) override;
--  std::unique_ptr<net::ClientCertStore> CreateClientCertStore(
--      content::ResourceContext* resource_context) override;
--
--  // brightray::BrowserClient:
--  brightray::BrowserMainParts* OverrideCreateBrowserMainParts(
--      const content::MainFunctionParams&) override;
--  void WebNotificationAllowed(
--      int render_process_id,
--      const base::Callback<void(bool, bool)>& callback) override;
--
--  // content::RenderProcessHostObserver:
--  void RenderProcessHostDestroyed(content::RenderProcessHost* host) override;
--  void RenderProcessReady(content::RenderProcessHost* host) override;
--  void RenderProcessExited(content::RenderProcessHost* host,
--                           base::TerminationStatus status,
--                           int exit_code) override;
--
-- private:
--  struct ProcessPreferences {
--    bool sandbox = false;
--    bool native_window_open = false;
--    bool disable_popups = false;
--  };
--
--  bool ShouldCreateNewSiteInstance(content::RenderFrameHost* render_frame_host,
--                                   content::BrowserContext* browser_context,
--                                   content::SiteInstance* current_instance,
--                                   const GURL& dest_url);
--  void AddProcessPreferences(int process_id, ProcessPreferences prefs);
--  void RemoveProcessPreferences(int process_id);
--  bool IsProcessObserved(int process_id);
--  bool IsRendererSandboxed(int process_id);
--  bool RendererUsesNativeWindowOpen(int process_id);
--  bool RendererDisablesPopups(int process_id);
--
--  // pending_render_process => web contents.
--  std::map<int, content::WebContents*> pending_processes_;
--
--  std::map<int, ProcessPreferences> process_preferences_;
--  std::map<int, base::ProcessId> render_process_host_pids_;
--
--  // list of site per affinity. weak_ptr to prevent instance locking
--  std::map<std::string, content::SiteInstance*> site_per_affinities;
--
--  std::unique_ptr<AtomResourceDispatcherHostDelegate>
--      resource_dispatcher_host_delegate_;
--
--  Delegate* delegate_ = nullptr;
--
--  DISALLOW_COPY_AND_ASSIGN(AtomBrowserClient);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_ATOM_BROWSER_CLIENT_H_
-removed in remote
-  base   100644 d6724ff533841932f792488f19a3118dba5f379e atom/browser/atom_browser_context.cc
-  our    100644 e036cbc8103f19a034ce386940462f8a23ea6807 atom/browser/atom_browser_context.cc
-@@ -1,148 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/atom_browser_context.h"
--
--#include "atom/browser/atom_blob_reader.h"
--#include "atom/browser/atom_browser_main_parts.h"
--#include "atom/browser/atom_download_manager_delegate.h"
--#include "atom/browser/atom_permission_manager.h"
--#include "atom/browser/browser.h"
--#include "atom/browser/request_context_delegate.h"
--#include "atom/browser/special_storage_policy.h"
--#include "atom/browser/web_view_manager.h"
--#include "atom/common/atom_version.h"
--#include "atom/common/chrome_version.h"
--#include "atom/common/options_switches.h"
--#include "base/command_line.h"
--#include "base/files/file_path.h"
--#include "base/path_service.h"
--#include "base/strings/stringprintf.h"
--#include "chrome/common/chrome_paths.h"
--#include "chrome/common/pref_names.h"
--#include "components/prefs/pref_registry_simple.h"
--#include "content/browser/blob_storage/chrome_blob_storage_context.h"
--#include "content/public/common/user_agent.h"
--
--namespace atom {
--
--namespace {
--
--std::string RemoveWhitespace(const std::string& str) {
--  std::string trimmed;
--  if (base::RemoveChars(str, " ", &trimmed))
--    return trimmed;
--  else
--    return str;
--}
--
--}  // namespace
--
--AtomBrowserContext::AtomBrowserContext(const std::string& partition,
--                                       bool in_memory,
--                                       const base::DictionaryValue& options)
--    : brightray::BrowserContext(partition, in_memory),
--      url_request_context_getter_(nullptr),
--      storage_policy_(new SpecialStoragePolicy) {
--  // Construct user agent string.
--  Browser* browser = Browser::Get();
--  std::string name = RemoveWhitespace(browser->GetName());
--  std::string user_agent;
--  if (name == ATOM_PRODUCT_NAME) {
--    user_agent = "Chrome/" CHROME_VERSION_STRING " " ATOM_PRODUCT_NAME
--                 "/" ATOM_VERSION_STRING;
--  } else {
--    user_agent = base::StringPrintf(
--        "%s/%s Chrome/%s " ATOM_PRODUCT_NAME "/" ATOM_VERSION_STRING,
--        name.c_str(), browser->GetVersion().c_str(), CHROME_VERSION_STRING);
--  }
--  user_agent_ = content::BuildUserAgentFromProduct(user_agent);
--
--  // Read options.
--  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
--  bool use_cache = !command_line->HasSwitch(switches::kDisableHttpCache);
--  options.GetBoolean("cache", &use_cache);
--
--  request_context_delegate_.reset(new RequestContextDelegate(use_cache));
--
--  // Initialize Pref Registry in brightray.
--  InitPrefs();
--}
--
--AtomBrowserContext::~AtomBrowserContext() {
--  url_request_context_getter_->set_delegate(nullptr);
--}
--
--void AtomBrowserContext::SetUserAgent(const std::string& user_agent) {
--  user_agent_ = user_agent;
--}
--
--content::DownloadManagerDelegate*
--AtomBrowserContext::GetDownloadManagerDelegate() {
--  if (!download_manager_delegate_.get()) {
--    auto* download_manager = content::BrowserContext::GetDownloadManager(this);
--    download_manager_delegate_.reset(
--        new AtomDownloadManagerDelegate(download_manager));
--  }
--  return download_manager_delegate_.get();
--}
--
--content::BrowserPluginGuestManager* AtomBrowserContext::GetGuestManager() {
--  if (!guest_manager_)
--    guest_manager_.reset(new WebViewManager);
--  return guest_manager_.get();
--}
--
--content::PermissionManager* AtomBrowserContext::GetPermissionManager() {
--  if (!permission_manager_.get())
--    permission_manager_.reset(new AtomPermissionManager);
--  return permission_manager_.get();
--}
--
--storage::SpecialStoragePolicy* AtomBrowserContext::GetSpecialStoragePolicy() {
--  return storage_policy_.get();
--}
--
--void AtomBrowserContext::RegisterPrefs(PrefRegistrySimple* pref_registry) {
--  pref_registry->RegisterFilePathPref(prefs::kSelectFileLastDirectory,
--                                      base::FilePath());
--  base::FilePath download_dir;
--  PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &download_dir);
--  pref_registry->RegisterFilePathPref(prefs::kDownloadDefaultDirectory,
--                                      download_dir);
--  pref_registry->RegisterDictionaryPref(prefs::kDevToolsFileSystemPaths);
--}
--
--std::string AtomBrowserContext::GetUserAgent() const {
--  return user_agent_;
--}
--
--void AtomBrowserContext::OnMainRequestContextCreated(
--    brightray::URLRequestContextGetter* getter) {
--  getter->set_delegate(request_context_delegate_.get());
--  url_request_context_getter_ = getter;
--}
--
--AtomBlobReader* AtomBrowserContext::GetBlobReader() {
--  if (!blob_reader_.get()) {
--    content::ChromeBlobStorageContext* blob_context =
--        content::ChromeBlobStorageContext::GetFor(this);
--    blob_reader_.reset(new AtomBlobReader(blob_context));
--  }
--  return blob_reader_.get();
--}
--
--// static
--scoped_refptr<AtomBrowserContext> AtomBrowserContext::From(
--    const std::string& partition,
--    bool in_memory,
--    const base::DictionaryValue& options) {
--  auto browser_context = brightray::BrowserContext::Get(partition, in_memory);
--  if (browser_context)
--    return static_cast<AtomBrowserContext*>(browser_context.get());
--
--  return new AtomBrowserContext(partition, in_memory, options);
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 d959adbc753a6e4c4302f9013ede952c41439c1a atom/browser/atom_browser_context.h
-  our    100644 9e6a841ceb8d11069a1a094bf7dbbd3a788918b3 atom/browser/atom_browser_context.h
-@@ -1,78 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_ATOM_BROWSER_CONTEXT_H_
--#define ATOM_BROWSER_ATOM_BROWSER_CONTEXT_H_
--
--#include <string>
--#include <vector>
--
--#include "base/memory/scoped_refptr.h"
--#include "brightray/browser/browser_context.h"
--
--namespace storage {
--class SpecialStoragePolicy;
--}
--
--namespace atom {
--
--class AtomBlobReader;
--class AtomDownloadManagerDelegate;
--class AtomPermissionManager;
--class RequestContextDelegate;
--class SpecialStoragePolicy;
--class WebViewManager;
--
--class AtomBrowserContext : public brightray::BrowserContext {
-- public:
--  // Get or create the BrowserContext according to its |partition| and
--  // |in_memory|. The |options| will be passed to constructor when there is no
--  // existing BrowserContext.
--  static scoped_refptr<AtomBrowserContext> From(
--      const std::string& partition,
--      bool in_memory,
--      const base::DictionaryValue& options = base::DictionaryValue());
--
--  void SetUserAgent(const std::string& user_agent);
--  AtomBlobReader* GetBlobReader();
--
--  // content::BrowserContext:
--  content::DownloadManagerDelegate* GetDownloadManagerDelegate() override;
--  content::BrowserPluginGuestManager* GetGuestManager() override;
--  content::PermissionManager* GetPermissionManager() override;
--  storage::SpecialStoragePolicy* GetSpecialStoragePolicy() override;
--
--  // brightray::BrowserContext:
--  void RegisterPrefs(PrefRegistrySimple* pref_registry) override;
--  std::string GetUserAgent() const override;
--  void OnMainRequestContextCreated(
--      brightray::URLRequestContextGetter* getter) override;
--
--  RequestContextDelegate* GetRequestContextDelegate() const {
--    return request_context_delegate_.get();
--  }
--
-- protected:
--  AtomBrowserContext(const std::string& partition,
--                     bool in_memory,
--                     const base::DictionaryValue& options);
--  ~AtomBrowserContext() override;
--
-- private:
--  brightray::URLRequestContextGetter* url_request_context_getter_;
--
--  std::unique_ptr<AtomDownloadManagerDelegate> download_manager_delegate_;
--  std::unique_ptr<WebViewManager> guest_manager_;
--  std::unique_ptr<AtomPermissionManager> permission_manager_;
--  scoped_refptr<storage::SpecialStoragePolicy> storage_policy_;
--  std::unique_ptr<AtomBlobReader> blob_reader_;
--  std::unique_ptr<RequestContextDelegate> request_context_delegate_;
--  std::string user_agent_;
--
--  DISALLOW_COPY_AND_ASSIGN(AtomBrowserContext);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_ATOM_BROWSER_CONTEXT_H_
-removed in remote
-  base   100644 f45f6492a849486fd009b60f3e07918b76bda34e atom/browser/atom_browser_main_parts.cc
-  our    100644 5229b19ca9af7845a3f2f13b7e0913f633b68b1d atom/browser/atom_browser_main_parts.cc
-@@ -1,282 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/atom_browser_main_parts.h"
--
--#include "atom/browser/api/atom_api_app.h"
--#include "atom/browser/api/trackable_object.h"
--#include "atom/browser/atom_browser_client.h"
--#include "atom/browser/atom_browser_context.h"
--#include "atom/browser/bridge_task_runner.h"
--#include "atom/browser/browser.h"
--#include "atom/browser/javascript_environment.h"
--#include "atom/browser/node_debugger.h"
--#include "atom/common/api/atom_bindings.h"
--#include "atom/common/asar/asar_util.h"
--#include "atom/common/node_bindings.h"
--#include "base/command_line.h"
--#include "base/threading/thread_task_runner_handle.h"
--#include "chrome/browser/browser_process.h"
--#include "content/public/browser/child_process_security_policy.h"
--#include "content/public/common/result_codes.h"
--#include "content/public/common/service_manager_connection.h"
--#include "services/device/public/mojom/constants.mojom.h"
--#include "services/service_manager/public/cpp/connector.h"
--#include "ui/base/idle/idle.h"
--#include "ui/base/l10n/l10n_util.h"
--
--#if defined(USE_X11)
--#include "chrome/browser/ui/libgtkui/gtk_util.h"
--#include "ui/events/devices/x11/touch_factory_x11.h"
--#endif
--
--#if defined(ENABLE_PDF_VIEWER)
--#include "atom/browser/atom_web_ui_controller_factory.h"
--#endif  // defined(ENABLE_PDF_VIEWER)
--
--#if defined(OS_MACOSX)
--#include "atom/browser/ui/cocoa/views_delegate_mac.h"
--#else
--#include "brightray/browser/views/views_delegate.h"
--#endif
--
--// Must be included after all other headers.
--#include "atom/common/node_includes.h"
--
--namespace atom {
--
--namespace {
--
--template <typename T>
--void Erase(T* container, typename T::iterator iter) {
--  container->erase(iter);
--}
--
--}  // namespace
--
--// static
--AtomBrowserMainParts* AtomBrowserMainParts::self_ = nullptr;
--
--AtomBrowserMainParts::AtomBrowserMainParts()
--    : fake_browser_process_(new BrowserProcess),
--      browser_(new Browser),
--      node_bindings_(NodeBindings::Create(NodeBindings::BROWSER)),
--      atom_bindings_(new AtomBindings(uv_default_loop())),
--      gc_timer_(true, true) {
--  DCHECK(!self_) << "Cannot have two AtomBrowserMainParts";
--  self_ = this;
--  // Register extension scheme as web safe scheme.
--  content::ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme(
--      "chrome-extension");
--}
--
--AtomBrowserMainParts::~AtomBrowserMainParts() {
--  asar::ClearArchives();
--  // Leak the JavascriptEnvironment on exit.
--  // This is to work around the bug that V8 would be waiting for background
--  // tasks to finish on exit, while somehow it waits forever in Electron, more
--  // about this can be found at
--  // https://github.com/electron/electron/issues/4767. On the other handle there
--  // is actually no need to gracefully shutdown V8 on exit in the main process,
--  // we already ensured all necessary resources get cleaned up, and it would
--  // make quitting faster.
--  ignore_result(js_env_.release());
--}
--
--// static
--AtomBrowserMainParts* AtomBrowserMainParts::Get() {
--  DCHECK(self_);
--  return self_;
--}
--
--bool AtomBrowserMainParts::SetExitCode(int code) {
--  if (!exit_code_)
--    return false;
--
--  *exit_code_ = code;
--  return true;
--}
--
--int AtomBrowserMainParts::GetExitCode() {
--  return exit_code_ != nullptr ? *exit_code_ : 0;
--}
--
--void AtomBrowserMainParts::RegisterDestructionCallback(
--    base::OnceClosure callback) {
--  // The destructors should be called in reversed order, so dependencies between
--  // JavaScript objects can be correctly resolved.
--  // For example WebContentsView => WebContents => Session.
--  destructors_.insert(destructors_.begin(), std::move(callback));
--}
--
--int AtomBrowserMainParts::PreEarlyInitialization() {
--  const int result = brightray::BrowserMainParts::PreEarlyInitialization();
--  if (result != content::RESULT_CODE_NORMAL_EXIT)
--    return result;
--
--#if defined(OS_POSIX)
--  HandleSIGCHLD();
--#endif
--
--  return content::RESULT_CODE_NORMAL_EXIT;
--}
--
--void AtomBrowserMainParts::PostEarlyInitialization() {
--  brightray::BrowserMainParts::PostEarlyInitialization();
--
--  // Temporary set the bridge_task_runner_ as current thread's task runner,
--  // so we can fool gin::PerIsolateData to use it as its task runner, instead
--  // of getting current message loop's task runner, which is null for now.
--  bridge_task_runner_ = new BridgeTaskRunner;
--  base::ThreadTaskRunnerHandle handle(bridge_task_runner_);
--
--  // The ProxyResolverV8 has setup a complete V8 environment, in order to
--  // avoid conflicts we only initialize our V8 environment after that.
--  js_env_.reset(new JavascriptEnvironment);
--
--  node_bindings_->Initialize();
--
--  // Create the global environment.
--  node::Environment* env = node_bindings_->CreateEnvironment(
--      js_env_->context(), js_env_->platform());
--  node_env_.reset(new NodeEnvironment(env));
--
--  // Enable support for v8 inspector
--  node_debugger_.reset(new NodeDebugger(env));
--  node_debugger_->Start(js_env_->platform());
--
--  // Add Electron extended APIs.
--  atom_bindings_->BindTo(js_env_->isolate(), env->process_object());
--
--  // Load everything.
--  node_bindings_->LoadEnvironment(env);
--
--  // Wrap the uv loop with global env.
--  node_bindings_->set_uv_env(env);
--
--  // We already initialized the feature list in
--  // brightray::BrowserMainParts::PreEarlyInitialization(), but
--  // the user JS script would not have had a chance to alter the command-line
--  // switches at that point. Lets reinitialize it here to pick up the
--  // command-line changes.
--  base::FeatureList::ClearInstanceForTesting();
--  brightray::BrowserMainParts::InitializeFeatureList();
--}
--
--int AtomBrowserMainParts::PreCreateThreads() {
--  const int result = brightray::BrowserMainParts::PreCreateThreads();
--  if (!result) {
--    fake_browser_process_->SetApplicationLocale(
--        brightray::BrowserClient::Get()->GetApplicationLocale());
--  }
--
--#if defined(OS_MACOSX)
--  ui::InitIdleMonitor();
--#endif
--
--  return result;
--}
--
--void AtomBrowserMainParts::ToolkitInitialized() {
--  brightray::BrowserMainParts::ToolkitInitialized();
--#if defined(OS_MACOSX)
--  views_delegate_.reset(new ViewsDelegateMac);
--#else
--  views_delegate_.reset(new brightray::ViewsDelegate);
--#endif
--}
--
--void AtomBrowserMainParts::PreMainMessageLoopRun() {
--  js_env_->OnMessageLoopCreated();
--
--  // Run user's main script before most things get initialized, so we can have
--  // a chance to setup everything.
--  node_bindings_->PrepareMessageLoop();
--  node_bindings_->RunMessageLoop();
--
--#if defined(USE_X11)
--  ui::TouchFactory::SetTouchDeviceListFromCommandLine();
--#endif
--
--  // Start idle gc.
--  gc_timer_.Start(FROM_HERE, base::TimeDelta::FromMinutes(1),
--                  base::Bind(&v8::Isolate::LowMemoryNotification,
--                             base::Unretained(js_env_->isolate())));
--
--#if defined(ENABLE_PDF_VIEWER)
--  content::WebUIControllerFactory::RegisterFactory(
--      AtomWebUIControllerFactory::GetInstance());
--#endif  // defined(ENABLE_PDF_VIEWER)
--
--  brightray::BrowserMainParts::PreMainMessageLoopRun();
--  bridge_task_runner_->MessageLoopIsReady();
--  bridge_task_runner_ = nullptr;
--
--#if defined(USE_X11)
--  libgtkui::GtkInitFromCommandLine(*base::CommandLine::ForCurrentProcess());
--#endif
--
--#if !defined(OS_MACOSX)
--  // The corresponding call in macOS is in AtomApplicationDelegate.
--  Browser::Get()->WillFinishLaunching();
--  Browser::Get()->DidFinishLaunching(base::DictionaryValue());
--#endif
--
--  // Notify observers that main thread message loop was initialized.
--  Browser::Get()->PreMainMessageLoopRun();
--}
--
--bool AtomBrowserMainParts::MainMessageLoopRun(int* result_code) {
--  exit_code_ = result_code;
--  return brightray::BrowserMainParts::MainMessageLoopRun(result_code);
--}
--
--void AtomBrowserMainParts::PostMainMessageLoopStart() {
--  brightray::BrowserMainParts::PostMainMessageLoopStart();
--#if defined(OS_POSIX)
--  HandleShutdownSignals();
--#endif
--  // TODO(deepak1556): Enable this optionally based on response
--  // from AtomPermissionManager.
--  GetGeolocationControl()->UserDidOptIntoLocationServices();
--}
--
--void AtomBrowserMainParts::PostMainMessageLoopRun() {
--  brightray::BrowserMainParts::PostMainMessageLoopRun();
--
--  js_env_->OnMessageLoopDestroying();
--
--#if defined(OS_MACOSX)
--  FreeAppDelegate();
--#endif
--
--  // Make sure destruction callbacks are called before message loop is
--  // destroyed, otherwise some objects that need to be deleted on IO thread
--  // won't be freed.
--  // We don't use ranged for loop because iterators are getting invalided when
--  // the callback runs.
--  for (auto iter = destructors_.begin(); iter != destructors_.end();) {
--    base::OnceClosure callback = std::move(*iter);
--    if (!callback.is_null())
--      std::move(callback).Run();
--    ++iter;
--  }
--}
--
--device::mojom::GeolocationControl*
--AtomBrowserMainParts::GetGeolocationControl() {
--  if (geolocation_control_)
--    return geolocation_control_.get();
--
--  auto request = mojo::MakeRequest(&geolocation_control_);
--  if (!content::ServiceManagerConnection::GetForProcess())
--    return geolocation_control_.get();
--
--  service_manager::Connector* connector =
--      content::ServiceManagerConnection::GetForProcess()->GetConnector();
--  connector->BindInterface(device::mojom::kServiceName, std::move(request));
--  return geolocation_control_.get();
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 e1053a257b9130b6ff16560297a4dc1826ae9ea2 atom/browser/atom_browser_main_parts.h
-  our    100644 e73f4581202e6853ffc6a51dbd9116c0ab2097d6 atom/browser/atom_browser_main_parts.h
-@@ -1,123 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_ATOM_BROWSER_MAIN_PARTS_H_
--#define ATOM_BROWSER_ATOM_BROWSER_MAIN_PARTS_H_
--
--#include <list>
--#include <string>
--
--#include "base/callback.h"
--#include "base/timer/timer.h"
--#include "brightray/browser/browser_main_parts.h"
--#include "content/public/browser/browser_context.h"
--#include "services/device/public/mojom/geolocation_control.mojom.h"
--
--class BrowserProcess;
--
--#if defined(TOOLKIT_VIEWS)
--namespace brightray {
--class ViewsDelegate;
--}
--#endif
--
--namespace atom {
--
--class AtomBindings;
--class Browser;
--class JavascriptEnvironment;
--class NodeBindings;
--class NodeDebugger;
--class NodeEnvironment;
--class BridgeTaskRunner;
--
--#if defined(OS_MACOSX)
--class ViewsDelegateMac;
--#endif
--
--class AtomBrowserMainParts : public brightray::BrowserMainParts {
-- public:
--  AtomBrowserMainParts();
--  ~AtomBrowserMainParts() override;
--
--  static AtomBrowserMainParts* Get();
--
--  // Sets the exit code, will fail if the message loop is not ready.
--  bool SetExitCode(int code);
--
--  // Gets the exit code
--  int GetExitCode();
--
--  // Register a callback that should be destroyed before JavaScript environment
--  // gets destroyed.
--  // Returns a closure that can be used to remove |callback| from the list.
--  void RegisterDestructionCallback(base::OnceClosure callback);
--
--  Browser* browser() { return browser_.get(); }
--
-- protected:
--  // content::BrowserMainParts:
--  int PreEarlyInitialization() override;
--  void PostEarlyInitialization() override;
--  int PreCreateThreads() override;
--  void ToolkitInitialized() override;
--  void PreMainMessageLoopRun() override;
--  bool MainMessageLoopRun(int* result_code) override;
--  void PostMainMessageLoopStart() override;
--  void PostMainMessageLoopRun() override;
--#if defined(OS_MACOSX)
--  void PreMainMessageLoopStart() override;
--#endif
--
-- private:
--#if defined(OS_POSIX)
--  // Set signal handlers.
--  void HandleSIGCHLD();
--  void HandleShutdownSignals();
--#endif
--
--#if defined(OS_MACOSX)
--  void FreeAppDelegate();
--#endif
--
--#if defined(OS_MACOSX)
--  std::unique_ptr<ViewsDelegateMac> views_delegate_;
--#else
--  std::unique_ptr<brightray::ViewsDelegate> views_delegate_;
--#endif
--
--  device::mojom::GeolocationControl* GetGeolocationControl();
--
--  // A fake BrowserProcess object that used to feed the source code from chrome.
--  std::unique_ptr<BrowserProcess> fake_browser_process_;
--
--  // The gin::PerIsolateData requires a task runner to create, so we feed it
--  // with a task runner that will post all work to main loop.
--  scoped_refptr<BridgeTaskRunner> bridge_task_runner_;
--
--  // Pointer to exit code.
--  int* exit_code_ = nullptr;
--
--  std::unique_ptr<Browser> browser_;
--  std::unique_ptr<JavascriptEnvironment> js_env_;
--  std::unique_ptr<NodeBindings> node_bindings_;
--  std::unique_ptr<AtomBindings> atom_bindings_;
--  std::unique_ptr<NodeEnvironment> node_env_;
--  std::unique_ptr<NodeDebugger> node_debugger_;
--
--  base::Timer gc_timer_;
--
--  // List of callbacks should be executed before destroying JS env.
--  std::list<base::OnceClosure> destructors_;
--
--  device::mojom::GeolocationControlPtr geolocation_control_;
--
--  static AtomBrowserMainParts* self_;
--
--  DISALLOW_COPY_AND_ASSIGN(AtomBrowserMainParts);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_ATOM_BROWSER_MAIN_PARTS_H_
-removed in remote
-  base   100644 d6e83fd968b0de926d54ab4a795bdb3e1adcfb2f atom/browser/atom_browser_main_parts_mac.mm
-  our    100644 17a5681a16a987a3a0d490f15a021bfbfdc88861 atom/browser/atom_browser_main_parts_mac.mm
-@@ -1,37 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/atom_browser_main_parts.h"
--
--#include "atom/browser/mac/atom_application.h"
--#include "atom/browser/mac/atom_application_delegate.h"
--#include "base/mac/bundle_locations.h"
--#include "base/mac/foundation_util.h"
--#include "ui/base/l10n/l10n_util_mac.h"
--
--namespace atom {
--
--void AtomBrowserMainParts::PreMainMessageLoopStart() {
--  // Force the NSApplication subclass to be used.
--  [AtomApplication sharedApplication];
--
--  // Set our own application delegate.
--  AtomApplicationDelegate* delegate = [[AtomApplicationDelegate alloc] init];
--  [NSApp setDelegate:delegate];
--
--  brightray::BrowserMainParts::PreMainMessageLoopStart();
--
--  // Prevent Cocoa from turning command-line arguments into
--  // |-application:openFiles:|, since we already handle them directly.
--  [[NSUserDefaults standardUserDefaults]
--      setObject:@"NO"
--         forKey:@"NSTreatUnknownArgumentsAsOpen"];
--}
--
--void AtomBrowserMainParts::FreeAppDelegate() {
--  [[NSApp delegate] release];
--  [NSApp setDelegate:nil];
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 2a0dddc474837972c702399da259a8b44bb01369 atom/browser/atom_browser_main_parts_posix.cc
-  our    100644 d79e60049f4db41b7b992c412cf271d461227115 atom/browser/atom_browser_main_parts_posix.cc
-@@ -1,222 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--// Most code came from: chrome/browser/chrome_browser_main_posix.cc.
--
--#include "atom/browser/atom_browser_main_parts.h"
--
--#include <errno.h>
--#include <limits.h>
--#include <pthread.h>
--#include <signal.h>
--#include <sys/resource.h>
--#include <unistd.h>
--
--#include "atom/browser/browser.h"
--#include "base/posix/eintr_wrapper.h"
--#include "content/public/browser/browser_thread.h"
--
--using content::BrowserThread;
--
--namespace atom {
--
--namespace {
--
--// See comment in |PreEarlyInitialization()|, where sigaction is called.
--void SIGCHLDHandler(int signal) {}
--
--// The OSX fork() implementation can crash in the child process before
--// fork() returns.  In that case, the shutdown pipe will still be
--// shared with the parent process.  To prevent child crashes from
--// causing parent shutdowns, |g_pipe_pid| is the pid for the process
--// which registered |g_shutdown_pipe_write_fd|.
--// See <http://crbug.com/175341>.
--pid_t g_pipe_pid = -1;
--int g_shutdown_pipe_write_fd = -1;
--int g_shutdown_pipe_read_fd = -1;
--
--// Common code between SIG{HUP, INT, TERM}Handler.
--void GracefulShutdownHandler(int signal) {
--  // Reinstall the default handler.  We had one shot at graceful shutdown.
--  struct sigaction action;
--  memset(&action, 0, sizeof(action));
--  action.sa_handler = SIG_DFL;
--  RAW_CHECK(sigaction(signal, &action, nullptr) == 0);
--
--  RAW_CHECK(g_pipe_pid == getpid());
--  RAW_CHECK(g_shutdown_pipe_write_fd != -1);
--  RAW_CHECK(g_shutdown_pipe_read_fd != -1);
--  size_t bytes_written = 0;
--  do {
--    int rv = HANDLE_EINTR(
--        write(g_shutdown_pipe_write_fd,
--              reinterpret_cast<const char*>(&signal) + bytes_written,
--              sizeof(signal) - bytes_written));
--    RAW_CHECK(rv >= 0);
--    bytes_written += rv;
--  } while (bytes_written < sizeof(signal));
--}
--
--// See comment in |PostMainMessageLoopStart()|, where sigaction is called.
--void SIGHUPHandler(int signal) {
--  RAW_CHECK(signal == SIGHUP);
--  GracefulShutdownHandler(signal);
--}
--
--// See comment in |PostMainMessageLoopStart()|, where sigaction is called.
--void SIGINTHandler(int signal) {
--  RAW_CHECK(signal == SIGINT);
--  GracefulShutdownHandler(signal);
--}
--
--// See comment in |PostMainMessageLoopStart()|, where sigaction is called.
--void SIGTERMHandler(int signal) {
--  RAW_CHECK(signal == SIGTERM);
--  GracefulShutdownHandler(signal);
--}
--
--class ShutdownDetector : public base::PlatformThread::Delegate {
-- public:
--  explicit ShutdownDetector(int shutdown_fd);
--
--  void ThreadMain() override;
--
-- private:
--  const int shutdown_fd_;
--
--  DISALLOW_COPY_AND_ASSIGN(ShutdownDetector);
--};
--
--ShutdownDetector::ShutdownDetector(int shutdown_fd)
--    : shutdown_fd_(shutdown_fd) {
--  CHECK_NE(shutdown_fd_, -1);
--}
--
--// These functions are used to help us diagnose crash dumps that happen
--// during the shutdown process.
--NOINLINE void ShutdownFDReadError() {
--  // Ensure function isn't optimized away.
--  asm("");
--  sleep(UINT_MAX);
--}
--
--NOINLINE void ShutdownFDClosedError() {
--  // Ensure function isn't optimized away.
--  asm("");
--  sleep(UINT_MAX);
--}
--
--NOINLINE void ExitPosted() {
--  // Ensure function isn't optimized away.
--  asm("");
--  sleep(UINT_MAX);
--}
--
--void ShutdownDetector::ThreadMain() {
--  base::PlatformThread::SetName("CrShutdownDetector");
--
--  int signal;
--  size_t bytes_read = 0;
--  do {
--    ssize_t ret = HANDLE_EINTR(
--        read(shutdown_fd_, reinterpret_cast<char*>(&signal) + bytes_read,
--             sizeof(signal) - bytes_read));
--    if (ret < 0) {
--      NOTREACHED() << "Unexpected error: " << strerror(errno);
--      ShutdownFDReadError();
--      break;
--    } else if (ret == 0) {
--      NOTREACHED() << "Unexpected closure of shutdown pipe.";
--      ShutdownFDClosedError();
--      break;
--    }
--    bytes_read += ret;
--  } while (bytes_read < sizeof(signal));
--  VLOG(1) << "Handling shutdown for signal " << signal << ".";
--  base::Closure task =
--      base::Bind(&Browser::Quit, base::Unretained(Browser::Get()));
--
--  if (!BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, task)) {
--    // Without a UI thread to post the exit task to, there aren't many
--    // options.  Raise the signal again.  The default handler will pick it up
--    // and cause an ungraceful exit.
--    RAW_LOG(WARNING, "No UI thread, exiting ungracefully.");
--    kill(getpid(), signal);
--
--    // The signal may be handled on another thread.  Give that a chance to
--    // happen.
--    sleep(3);
--
--    // We really should be dead by now.  For whatever reason, we're not. Exit
--    // immediately, with the exit status set to the signal number with bit 8
--    // set.  On the systems that we care about, this exit status is what is
--    // normally used to indicate an exit by this signal's default handler.
--    // This mechanism isn't a de jure standard, but even in the worst case, it
--    // should at least result in an immediate exit.
--    RAW_LOG(WARNING, "Still here, exiting really ungracefully.");
--    _exit(signal | (1 << 7));
--  }
--  ExitPosted();
--}
--
--}  // namespace
--
--void AtomBrowserMainParts::HandleSIGCHLD() {
--  // We need to accept SIGCHLD, even though our handler is a no-op because
--  // otherwise we cannot wait on children. (According to POSIX 2001.)
--  struct sigaction action;
--  memset(&action, 0, sizeof(action));
--  action.sa_handler = SIGCHLDHandler;
--  CHECK_EQ(sigaction(SIGCHLD, &action, nullptr), 0);
--}
--
--void AtomBrowserMainParts::HandleShutdownSignals() {
--  int pipefd[2];
--  int ret = pipe(pipefd);
--  if (ret < 0) {
--    PLOG(DFATAL) << "Failed to create pipe";
--  } else {
--    g_pipe_pid = getpid();
--    g_shutdown_pipe_read_fd = pipefd[0];
--    g_shutdown_pipe_write_fd = pipefd[1];
--#if !defined(ADDRESS_SANITIZER) && !defined(KEEP_SHADOW_STACKS)
--    const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2;
--#else
--    // ASan instrumentation and -finstrument-functions (used for keeping the
--    // shadow stacks) bloat the stack frames, so we need to increase the stack
--    // size to avoid hitting the guard page.
--    const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4;
--#endif
--    // TODO(viettrungluu,willchan): crbug.com/29675 - This currently leaks, so
--    // if you change this, you'll probably need to change the suppression.
--    if (!base::PlatformThread::CreateNonJoinable(
--            kShutdownDetectorThreadStackSize,
--            new ShutdownDetector(g_shutdown_pipe_read_fd))) {
--      LOG(DFATAL) << "Failed to create shutdown detector task.";
--    }
--  }
--  // Setup signal handlers for shutdown AFTER shutdown pipe is setup because
--  // it may be called right away after handler is set.
--
--  // If adding to this list of signal handlers, note the new signal probably
--  // needs to be reset in child processes. See
--  // base/process_util_posix.cc:LaunchProcess.
--
--  // We need to handle SIGTERM, because that is how many POSIX-based distros ask
--  // processes to quit gracefully at shutdown time.
--  struct sigaction action;
--  memset(&action, 0, sizeof(action));
--  action.sa_handler = SIGTERMHandler;
--  CHECK_EQ(sigaction(SIGTERM, &action, nullptr), 0);
--  // Also handle SIGINT - when the user terminates the browser via Ctrl+C. If
--  // the browser process is being debugged, GDB will catch the SIGINT first.
--  action.sa_handler = SIGINTHandler;
--  CHECK_EQ(sigaction(SIGINT, &action, nullptr), 0);
--  // And SIGHUP, for when the terminal disappears. On shutdown, many Linux
--  // distros send SIGHUP, SIGTERM, and then SIGKILL.
--  action.sa_handler = SIGHUPHandler;
--  CHECK_EQ(sigaction(SIGHUP, &action, nullptr), 0);
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 16c0cf708b856286ed177b976141b8c87ad9a403 atom/browser/atom_download_manager_delegate.cc
-  our    100644 83276affb18df31ebe64fad6c53960baad498582 atom/browser/atom_download_manager_delegate.cc
-@@ -1,189 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/atom_download_manager_delegate.h"
--
--#include <string>
--
--#include "atom/browser/api/atom_api_download_item.h"
--#include "atom/browser/atom_browser_context.h"
--#include "atom/browser/native_window.h"
--#include "atom/browser/ui/file_dialog.h"
--#include "atom/browser/web_contents_preferences.h"
--#include "atom/common/options_switches.h"
--#include "base/bind.h"
--#include "base/files/file_util.h"
--#include "base/task_scheduler/post_task.h"
--#include "chrome/common/pref_names.h"
--#include "components/download/public/common/download_danger_type.h"
--#include "components/prefs/pref_service.h"
--#include "content/public/browser/browser_context.h"
--#include "content/public/browser/browser_thread.h"
--#include "content/public/browser/download_item_utils.h"
--#include "content/public/browser/download_manager.h"
--#include "net/base/filename_util.h"
--
--namespace atom {
--
--namespace {
--
--// Generate default file path to save the download.
--base::FilePath CreateDownloadPath(const GURL& url,
--                                  const std::string& content_disposition,
--                                  const std::string& suggested_filename,
--                                  const std::string& mime_type,
--                                  const base::FilePath& default_download_path) {
--  auto generated_name =
--      net::GenerateFileName(url, content_disposition, std::string(),
--                            suggested_filename, mime_type, "download");
--
--  if (!base::PathExists(default_download_path))
--    base::CreateDirectory(default_download_path);
--
--  return default_download_path.Append(generated_name);
--}
--
--}  // namespace
--
--AtomDownloadManagerDelegate::AtomDownloadManagerDelegate(
--    content::DownloadManager* manager)
--    : download_manager_(manager), weak_ptr_factory_(this) {}
--
--AtomDownloadManagerDelegate::~AtomDownloadManagerDelegate() {
--  if (download_manager_) {
--    DCHECK_EQ(static_cast<content::DownloadManagerDelegate*>(this),
--              download_manager_->GetDelegate());
--    download_manager_->SetDelegate(nullptr);
--    download_manager_ = nullptr;
--  }
--}
--
--void AtomDownloadManagerDelegate::GetItemSavePath(download::DownloadItem* item,
--                                                  base::FilePath* path) {
--  v8::Isolate* isolate = v8::Isolate::GetCurrent();
--  v8::Locker locker(isolate);
--  v8::HandleScope handle_scope(isolate);
--  api::DownloadItem* download =
--      api::DownloadItem::FromWrappedClass(isolate, item);
--  if (download)
--    *path = download->GetSavePath();
--}
--
--void AtomDownloadManagerDelegate::OnDownloadPathGenerated(
--    uint32_t download_id,
--    const content::DownloadTargetCallback& callback,
--    const base::FilePath& default_path) {
--  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
--
--  auto* item = download_manager_->GetDownload(download_id);
--  if (!item)
--    return;
--
--  NativeWindow* window = nullptr;
--  content::WebContents* web_contents =
--      content::DownloadItemUtils::GetWebContents(item);
--  auto* relay =
--      web_contents ? NativeWindowRelay::FromWebContents(web_contents) : nullptr;
--  if (relay)
--    window = relay->window.get();
--
--  auto* web_preferences = WebContentsPreferences::From(web_contents);
--  bool offscreen =
--      !web_preferences || web_preferences->IsEnabled(options::kOffscreen);
--
--  base::FilePath path;
--  GetItemSavePath(item, &path);
--  // Show save dialog if save path was not set already on item
--  file_dialog::DialogSettings settings;
--  settings.parent_window = window;
--  settings.force_detached = offscreen;
--  settings.title = item->GetURL().spec();
--  settings.default_path = default_path;
--  if (path.empty() && file_dialog::ShowSaveDialog(settings, &path)) {
--    // Remember the last selected download directory.
--    AtomBrowserContext* browser_context = static_cast<AtomBrowserContext*>(
--        download_manager_->GetBrowserContext());
--    browser_context->prefs()->SetFilePath(prefs::kDownloadDefaultDirectory,
--                                          path.DirName());
--
--    v8::Isolate* isolate = v8::Isolate::GetCurrent();
--    v8::Locker locker(isolate);
--    v8::HandleScope handle_scope(isolate);
--    api::DownloadItem* download_item =
--        api::DownloadItem::FromWrappedClass(isolate, item);
--    if (download_item)
--      download_item->SetSavePath(path);
--  }
--
--  // Running the DownloadTargetCallback with an empty FilePath signals that the
--  // download should be cancelled.
--  // If user cancels the file save dialog, run the callback with empty FilePath.
--  callback.Run(path, download::DownloadItem::TARGET_DISPOSITION_PROMPT,
--               download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, path,
--               path.empty() ? download::DOWNLOAD_INTERRUPT_REASON_USER_CANCELED
--                            : download::DOWNLOAD_INTERRUPT_REASON_NONE);
--}
--
--void AtomDownloadManagerDelegate::Shutdown() {
--  weak_ptr_factory_.InvalidateWeakPtrs();
--  download_manager_ = nullptr;
--}
--
--bool AtomDownloadManagerDelegate::DetermineDownloadTarget(
--    download::DownloadItem* download,
--    const content::DownloadTargetCallback& callback) {
--  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
--
--  if (!download->GetForcedFilePath().empty()) {
--    callback.Run(download->GetForcedFilePath(),
--                 download::DownloadItem::TARGET_DISPOSITION_OVERWRITE,
--                 download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
--                 download->GetForcedFilePath(),
--                 download::DOWNLOAD_INTERRUPT_REASON_NONE);
--    return true;
--  }
--
--  // Try to get the save path from JS wrapper.
--  base::FilePath save_path;
--  GetItemSavePath(download, &save_path);
--  if (!save_path.empty()) {
--    callback.Run(save_path,
--                 download::DownloadItem::TARGET_DISPOSITION_OVERWRITE,
--                 download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
--                 save_path, download::DOWNLOAD_INTERRUPT_REASON_NONE);
--    return true;
--  }
--
--  AtomBrowserContext* browser_context =
--      static_cast<AtomBrowserContext*>(download_manager_->GetBrowserContext());
--  base::FilePath default_download_path =
--      browser_context->prefs()->GetFilePath(prefs::kDownloadDefaultDirectory);
--
--  base::PostTaskWithTraitsAndReplyWithResult(
--      FROM_HERE,
--      {base::MayBlock(), base::TaskPriority::BACKGROUND,
--       base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN},
--      base::BindOnce(&CreateDownloadPath, download->GetURL(),
--                     download->GetContentDisposition(),
--                     download->GetSuggestedFilename(), download->GetMimeType(),
--                     default_download_path),
--      base::BindOnce(&AtomDownloadManagerDelegate::OnDownloadPathGenerated,
--                     weak_ptr_factory_.GetWeakPtr(), download->GetId(),
--                     callback));
--  return true;
--}
--
--bool AtomDownloadManagerDelegate::ShouldOpenDownload(
--    download::DownloadItem* download,
--    const content::DownloadOpenDelayedCallback& callback) {
--  return true;
--}
--
--void AtomDownloadManagerDelegate::GetNextId(
--    const content::DownloadIdCallback& callback) {
--  static uint32_t next_id = download::DownloadItem::kInvalidId + 1;
--  callback.Run(next_id++);
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 5ea3d50d5aee391e9eb8b975055e81e7b9a757b6 atom/browser/atom_download_manager_delegate.h
-  our    100644 f1cc1190d4bfe26a1a906b1552c9ab46d71e5e50 atom/browser/atom_download_manager_delegate.h
-@@ -1,53 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_ATOM_DOWNLOAD_MANAGER_DELEGATE_H_
--#define ATOM_BROWSER_ATOM_DOWNLOAD_MANAGER_DELEGATE_H_
--
--#include <string>
--
--#include "base/memory/weak_ptr.h"
--#include "content/public/browser/download_manager_delegate.h"
--
--namespace content {
--class DownloadManager;
--}
--
--namespace atom {
--
--class AtomDownloadManagerDelegate : public content::DownloadManagerDelegate {
-- public:
--  using CreateDownloadPathCallback =
--      base::Callback<void(const base::FilePath&)>;
--
--  explicit AtomDownloadManagerDelegate(content::DownloadManager* manager);
--  ~AtomDownloadManagerDelegate() override;
--
--  void OnDownloadPathGenerated(uint32_t download_id,
--                               const content::DownloadTargetCallback& callback,
--                               const base::FilePath& default_path);
--
--  // content::DownloadManagerDelegate:
--  void Shutdown() override;
--  bool DetermineDownloadTarget(
--      download::DownloadItem* download,
--      const content::DownloadTargetCallback& callback) override;
--  bool ShouldOpenDownload(
--      download::DownloadItem* download,
--      const content::DownloadOpenDelayedCallback& callback) override;
--  void GetNextId(const content::DownloadIdCallback& callback) override;
--
-- private:
--  // Get the save path set on the associated api::DownloadItem object
--  void GetItemSavePath(download::DownloadItem* item, base::FilePath* path);
--
--  content::DownloadManager* download_manager_;
--  base::WeakPtrFactory<AtomDownloadManagerDelegate> weak_ptr_factory_;
--
--  DISALLOW_COPY_AND_ASSIGN(AtomDownloadManagerDelegate);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_ATOM_DOWNLOAD_MANAGER_DELEGATE_H_
-removed in remote
-  base   100644 c21d1fb1181622c999e0072ef990465a35072aea atom/browser/atom_javascript_dialog_manager.cc
-  our    100644 25fc326ebac3f2a5beb9199194067dae12c8229b atom/browser/atom_javascript_dialog_manager.cc
-@@ -1,110 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/atom_javascript_dialog_manager.h"
--
--#include <string>
--#include <vector>
--
--#include "atom/browser/api/atom_api_web_contents.h"
--#include "atom/browser/native_window.h"
--#include "atom/browser/ui/message_box.h"
--#include "atom/browser/web_contents_preferences.h"
--#include "atom/common/options_switches.h"
--#include "base/bind.h"
--#include "base/strings/utf_string_conversions.h"
--#include "ui/gfx/image/image_skia.h"
--
--using content::JavaScriptDialogType;
--
--namespace atom {
--
--namespace {
--
--constexpr int kUserWantsNoMoreDialogs = -1;
--
--}  // namespace
--
--AtomJavaScriptDialogManager::AtomJavaScriptDialogManager(
--    api::WebContents* api_web_contents)
--    : api_web_contents_(api_web_contents) {}
--AtomJavaScriptDialogManager::~AtomJavaScriptDialogManager() = default;
--
--void AtomJavaScriptDialogManager::RunJavaScriptDialog(
--    content::WebContents* web_contents,
--    content::RenderFrameHost* rfh,
--    JavaScriptDialogType dialog_type,
--    const base::string16& message_text,
--    const base::string16& default_prompt_text,
--    DialogClosedCallback callback,
--    bool* did_suppress_message) {
--  auto origin_url = rfh->GetLastCommittedURL();
--  const std::string& origin = origin_url.GetOrigin().spec();
--  if (origin_counts_[origin] == kUserWantsNoMoreDialogs) {
--    return std::move(callback).Run(false, base::string16());
--  }
--
--  if (dialog_type != JavaScriptDialogType::JAVASCRIPT_DIALOG_TYPE_ALERT &&
--      dialog_type != JavaScriptDialogType::JAVASCRIPT_DIALOG_TYPE_CONFIRM) {
--    std::move(callback).Run(false, base::string16());
--    return;
--  }
--
--  std::vector<std::string> buttons = {"OK"};
--  if (dialog_type == JavaScriptDialogType::JAVASCRIPT_DIALOG_TYPE_CONFIRM) {
--    buttons.push_back("Cancel");
--  }
--
--  origin_counts_[origin]++;
--
--  auto* web_preferences = WebContentsPreferences::From(web_contents);
--  std::string checkbox;
--  if (origin_counts_[origin] > 1 && web_preferences &&
--      web_preferences->IsEnabled("safeDialogs") &&
--      !web_preferences->GetPreference("safeDialogsMessage", &checkbox)) {
--    checkbox = "Prevent this app from creating additional dialogs";
--  }
--
--  // Don't set parent for offscreen window.
--  NativeWindow* window = nullptr;
--  if (web_preferences && !web_preferences->IsEnabled(options::kOffscreen)) {
--    auto* relay = NativeWindowRelay::FromWebContents(web_contents);
--    if (relay)
--      window = relay->window.get();
--  }
--
--  atom::ShowMessageBox(
--      window, atom::MessageBoxType::MESSAGE_BOX_TYPE_NONE, buttons, -1, 0,
--      atom::MessageBoxOptions::MESSAGE_BOX_NONE, "",
--      base::UTF16ToUTF8(message_text), "", checkbox, false, gfx::ImageSkia(),
--      base::Bind(&AtomJavaScriptDialogManager::OnMessageBoxCallback,
--                 base::Unretained(this), base::Passed(std::move(callback)),
--                 origin));
--}
--
--void AtomJavaScriptDialogManager::RunBeforeUnloadDialog(
--    content::WebContents* web_contents,
--    content::RenderFrameHost* rfh,
--    bool is_reload,
--    DialogClosedCallback callback) {
--  bool default_prevented = api_web_contents_->Emit("will-prevent-unload");
--  std::move(callback).Run(default_prevented, base::string16());
--  return;
--}
--
--void AtomJavaScriptDialogManager::CancelDialogs(
--    content::WebContents* web_contents,
--    bool reset_state) {}
--
--void AtomJavaScriptDialogManager::OnMessageBoxCallback(
--    DialogClosedCallback callback,
--    const std::string& origin,
--    int code,
--    bool checkbox_checked) {
--  if (checkbox_checked)
--    origin_counts_[origin] = kUserWantsNoMoreDialogs;
--  std::move(callback).Run(code == 0, base::string16());
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 c0a0dccf0fa9a3fa1a7e7504f81a9f9eef6b0fb9 atom/browser/atom_javascript_dialog_manager.h
-  our    100644 2996b5d206ede6b19769ca0be224a59a6082a7bb atom/browser/atom_javascript_dialog_manager.h
-@@ -1,51 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_ATOM_JAVASCRIPT_DIALOG_MANAGER_H_
--#define ATOM_BROWSER_ATOM_JAVASCRIPT_DIALOG_MANAGER_H_
--
--#include <map>
--#include <string>
--
--#include "content/public/browser/javascript_dialog_manager.h"
--
--namespace atom {
--
--namespace api {
--class WebContents;
--}
--
--class AtomJavaScriptDialogManager : public content::JavaScriptDialogManager {
-- public:
--  explicit AtomJavaScriptDialogManager(api::WebContents* api_web_contents);
--  ~AtomJavaScriptDialogManager() override;
--
--  // content::JavaScriptDialogManager implementations.
--  void RunJavaScriptDialog(content::WebContents* web_contents,
--                           content::RenderFrameHost* rfh,
--                           content::JavaScriptDialogType dialog_type,
--                           const base::string16& message_text,
--                           const base::string16& default_prompt_text,
--                           DialogClosedCallback callback,
--                           bool* did_suppress_message) override;
--  void RunBeforeUnloadDialog(content::WebContents* web_contents,
--                             content::RenderFrameHost* rfh,
--                             bool is_reload,
--                             DialogClosedCallback callback) override;
--  void CancelDialogs(content::WebContents* web_contents,
--                     bool reset_state) override;
--
-- private:
--  void OnMessageBoxCallback(DialogClosedCallback callback,
--                            const std::string& origin,
--                            int code,
--                            bool checkbox_checked);
--
--  api::WebContents* api_web_contents_;
--  std::map<std::string, int> origin_counts_;
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_ATOM_JAVASCRIPT_DIALOG_MANAGER_H_
-removed in remote
-  base   100644 f7523c07ff8333e2582c6a492f154dd93982b489 atom/browser/atom_permission_manager.cc
-  our    100644 218404434142cf1b0ab29610e873782712e3a876 atom/browser/atom_permission_manager.cc
-@@ -1,212 +0,0 @@
--// Copyright (c) 2016 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/atom_permission_manager.h"
--
--#include <vector>
--
--#include "atom/browser/atom_browser_client.h"
--#include "atom/browser/web_contents_preferences.h"
--#include "content/public/browser/child_process_security_policy.h"
--#include "content/public/browser/permission_type.h"
--#include "content/public/browser/render_frame_host.h"
--#include "content/public/browser/render_process_host.h"
--#include "content/public/browser/render_view_host.h"
--#include "content/public/browser/web_contents.h"
--
--namespace atom {
--
--namespace {
--
--bool WebContentsDestroyed(int process_id) {
--  content::WebContents* web_contents =
--      static_cast<AtomBrowserClient*>(AtomBrowserClient::Get())
--          ->GetWebContentsFromProcessID(process_id);
--  if (!web_contents)
--    return true;
--  return web_contents->IsBeingDestroyed();
--}
--
--void PermissionRequestResponseCallbackWrapper(
--    const AtomPermissionManager::StatusCallback& callback,
--    const std::vector<blink::mojom::PermissionStatus>& vector) {
--  callback.Run(vector[0]);
--}
--
--}  // namespace
--
--class AtomPermissionManager::PendingRequest {
-- public:
--  PendingRequest(content::RenderFrameHost* render_frame_host,
--                 const std::vector<content::PermissionType>& permissions,
--                 const StatusesCallback& callback)
--      : render_process_id_(render_frame_host->GetProcess()->GetID()),
--        callback_(callback),
--        results_(permissions.size(), blink::mojom::PermissionStatus::DENIED),
--        remaining_results_(permissions.size()) {}
--
--  void SetPermissionStatus(int permission_id,
--                           blink::mojom::PermissionStatus status) {
--    DCHECK(!IsComplete());
--
--    results_[permission_id] = status;
--    --remaining_results_;
--  }
--
--  int render_process_id() const { return render_process_id_; }
--
--  bool IsComplete() const { return remaining_results_ == 0; }
--
--  void RunCallback() const { callback_.Run(results_); }
--
-- private:
--  int render_process_id_;
--  const StatusesCallback callback_;
--  std::vector<blink::mojom::PermissionStatus> results_;
--  size_t remaining_results_;
--};
--
--AtomPermissionManager::AtomPermissionManager() {}
--
--AtomPermissionManager::~AtomPermissionManager() {}
--
--void AtomPermissionManager::SetPermissionRequestHandler(
--    const RequestHandler& handler) {
--  if (handler.is_null() && !pending_requests_.IsEmpty()) {
--    for (PendingRequestsMap::const_iterator iter(&pending_requests_);
--         !iter.IsAtEnd(); iter.Advance()) {
--      auto* request = iter.GetCurrentValue();
--      if (!WebContentsDestroyed(request->render_process_id()))
--        request->RunCallback();
--    }
--    pending_requests_.Clear();
--  }
--  request_handler_ = handler;
--}
--
--int AtomPermissionManager::RequestPermission(
--    content::PermissionType permission,
--    content::RenderFrameHost* render_frame_host,
--    const GURL& requesting_origin,
--    bool user_gesture,
--    const StatusCallback& response_callback) {
--  return RequestPermissionWithDetails(permission, render_frame_host,
--                                      requesting_origin, user_gesture, nullptr,
--                                      response_callback);
--}
--
--int AtomPermissionManager::RequestPermissionWithDetails(
--    content::PermissionType permission,
--    content::RenderFrameHost* render_frame_host,
--    const GURL& requesting_origin,
--    bool user_gesture,
--    const base::DictionaryValue* details,
--    const StatusCallback& response_callback) {
--  return RequestPermissionsWithDetails(
--      std::vector<content::PermissionType>(1, permission), render_frame_host,
--      requesting_origin, user_gesture, details,
--      base::Bind(&PermissionRequestResponseCallbackWrapper, response_callback));
--}
--
--int AtomPermissionManager::RequestPermissions(
--    const std::vector<content::PermissionType>& permissions,
--    content::RenderFrameHost* render_frame_host,
--    const GURL& requesting_origin,
--    bool user_gesture,
--    const StatusesCallback& response_callback) {
--  return RequestPermissionsWithDetails(permissions, render_frame_host,
--                                       requesting_origin, user_gesture, nullptr,
--                                       response_callback);
--}
--
--int AtomPermissionManager::RequestPermissionsWithDetails(
--    const std::vector<content::PermissionType>& permissions,
--    content::RenderFrameHost* render_frame_host,
--    const GURL& requesting_origin,
--    bool user_gesture,
--    const base::DictionaryValue* details,
--    const StatusesCallback& response_callback) {
--  if (permissions.empty()) {
--    response_callback.Run(std::vector<blink::mojom::PermissionStatus>());
--    return kNoPendingOperation;
--  }
--
--  if (request_handler_.is_null()) {
--    std::vector<blink::mojom::PermissionStatus> statuses;
--    for (auto permission : permissions) {
--      if (permission == content::PermissionType::MIDI_SYSEX) {
--        content::ChildProcessSecurityPolicy::GetInstance()
--            ->GrantSendMidiSysExMessage(
--                render_frame_host->GetProcess()->GetID());
--      }
--      statuses.push_back(blink::mojom::PermissionStatus::GRANTED);
--    }
--    response_callback.Run(statuses);
--    return kNoPendingOperation;
--  }
--
--  auto* web_contents =
--      content::WebContents::FromRenderFrameHost(render_frame_host);
--  int request_id = pending_requests_.Add(std::make_unique<PendingRequest>(
--      render_frame_host, permissions, response_callback));
--
--  for (size_t i = 0; i < permissions.size(); ++i) {
--    auto permission = permissions[i];
--    if (permission == content::PermissionType::MIDI_SYSEX) {
--      content::ChildProcessSecurityPolicy::GetInstance()
--          ->GrantSendMidiSysExMessage(render_frame_host->GetProcess()->GetID());
--    }
--    const auto callback =
--        base::Bind(&AtomPermissionManager::OnPermissionResponse,
--                   base::Unretained(this), request_id, i);
--    if (details == nullptr) {
--      request_handler_.Run(web_contents, permission, callback,
--                           base::DictionaryValue());
--    } else {
--      request_handler_.Run(web_contents, permission, callback, *details);
--    }
--  }
--
--  return request_id;
--}
--
--void AtomPermissionManager::OnPermissionResponse(
--    int request_id,
--    int permission_id,
--    blink::mojom::PermissionStatus status) {
--  auto* pending_request = pending_requests_.Lookup(request_id);
--  if (!pending_request)
--    return;
--
--  pending_request->SetPermissionStatus(permission_id, status);
--  if (pending_request->IsComplete()) {
--    pending_request->RunCallback();
--    pending_requests_.Remove(request_id);
--  }
--}
--
--
--void AtomPermissionManager::ResetPermission(content::PermissionType permission,
--                                            const GURL& requesting_origin,
--                                            const GURL& embedding_origin) {}
--
--blink::mojom::PermissionStatus AtomPermissionManager::GetPermissionStatus(
--    content::PermissionType permission,
--    const GURL& requesting_origin,
--    const GURL& embedding_origin) {
--  return blink::mojom::PermissionStatus::GRANTED;
--}
--
--int AtomPermissionManager::SubscribePermissionStatusChange(
--    content::PermissionType permission,
--    const GURL& requesting_origin,
--    const GURL& embedding_origin,
--    const StatusCallback& callback) {
--  return -1;
--}
--
--void AtomPermissionManager::UnsubscribePermissionStatusChange(
--    int subscription_id) {}
--
--}  // namespace atom
-removed in remote
-  base   100644 e16893fd8bb5d9357f2648626f29d2d212db4048 atom/browser/atom_permission_manager.h
-  our    100644 de23837330535539c2ab93a2bba4796be3f36e1e atom/browser/atom_permission_manager.h
-@@ -1,104 +0,0 @@
--// Copyright (c) 2016 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_ATOM_PERMISSION_MANAGER_H_
--#define ATOM_BROWSER_ATOM_PERMISSION_MANAGER_H_
--
--#include <map>
--#include <vector>
--
--#include "base/callback.h"
--#include "base/containers/id_map.h"
--#include "base/values.h"
--#include "content/public/browser/permission_manager.h"
--
--namespace content {
--class WebContents;
--}
--
--namespace atom {
--
--class AtomPermissionManager : public content::PermissionManager {
-- public:
--  AtomPermissionManager();
--  ~AtomPermissionManager() override;
--
--  using StatusCallback = base::Callback<void(blink::mojom::PermissionStatus)>;
--  using StatusesCallback =
--      base::Callback<void(const std::vector<blink::mojom::PermissionStatus>&)>;
--  using RequestHandler = base::Callback<void(content::WebContents*,
--                                             content::PermissionType,
--                                             const StatusCallback&,
--                                             const base::DictionaryValue&)>;
--
--  // Handler to dispatch permission requests in JS.
--  void SetPermissionRequestHandler(const RequestHandler& handler);
--
--  // content::PermissionManager:
--  int RequestPermission(
--      content::PermissionType permission,
--      content::RenderFrameHost* render_frame_host,
--      const GURL& requesting_origin,
--      bool user_gesture,
--      const base::Callback<void(blink::mojom::PermissionStatus)>& callback)
--      override;
--  int RequestPermissionWithDetails(
--      content::PermissionType permission,
--      content::RenderFrameHost* render_frame_host,
--      const GURL& requesting_origin,
--      bool user_gesture,
--      const base::DictionaryValue* details,
--      const base::Callback<void(blink::mojom::PermissionStatus)>& callback);
--  int RequestPermissions(
--      const std::vector<content::PermissionType>& permissions,
--      content::RenderFrameHost* render_frame_host,
--      const GURL& requesting_origin,
--      bool user_gesture,
--      const base::Callback<
--          void(const std::vector<blink::mojom::PermissionStatus>&)>& callback)
--      override;
--  int RequestPermissionsWithDetails(
--      const std::vector<content::PermissionType>& permissions,
--      content::RenderFrameHost* render_frame_host,
--      const GURL& requesting_origin,
--      bool user_gesture,
--      const base::DictionaryValue* details,
--      const base::Callback<
--          void(const std::vector<blink::mojom::PermissionStatus>&)>& callback);
--
-- protected:
--  void OnPermissionResponse(int request_id,
--                            int permission_id,
--                            blink::mojom::PermissionStatus status);
--
--  // content::PermissionManager:
--  void ResetPermission(content::PermissionType permission,
--                       const GURL& requesting_origin,
--                       const GURL& embedding_origin) override;
--  blink::mojom::PermissionStatus GetPermissionStatus(
--      content::PermissionType permission,
--      const GURL& requesting_origin,
--      const GURL& embedding_origin) override;
--  int SubscribePermissionStatusChange(
--      content::PermissionType permission,
--      const GURL& requesting_origin,
--      const GURL& embedding_origin,
--      const base::Callback<void(blink::mojom::PermissionStatus)>& callback)
--      override;
--  void UnsubscribePermissionStatusChange(int subscription_id) override;
--
-- private:
--  class PendingRequest;
--  using PendingRequestsMap = base::IDMap<std::unique_ptr<PendingRequest>>;
--
--  RequestHandler request_handler_;
--
--  PendingRequestsMap pending_requests_;
--
--  DISALLOW_COPY_AND_ASSIGN(AtomPermissionManager);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_ATOM_PERMISSION_MANAGER_H_
-removed in remote
-  base   100644 8775f950ca9a0a1b00976d86b8045e1b49366ddc atom/browser/atom_quota_permission_context.cc
-  our    100644 b8bf9d53f5653c68a4b867ed37c06330d7c9a0fb atom/browser/atom_quota_permission_context.cc
-@@ -1,20 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/atom_quota_permission_context.h"
--
--namespace atom {
--
--AtomQuotaPermissionContext::AtomQuotaPermissionContext() {}
--
--AtomQuotaPermissionContext::~AtomQuotaPermissionContext() {}
--
--void AtomQuotaPermissionContext::RequestQuotaPermission(
--    const content::StorageQuotaParams& params,
--    int render_process_id,
--    const PermissionCallback& callback) {
--  callback.Run(response::QUOTA_PERMISSION_RESPONSE_ALLOW);
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 1246ea7bad589bbc1d7c76fa535fc4d449ee4a2c atom/browser/atom_quota_permission_context.h
-  our    100644 1b04f8e05b16306be7dda4d646b2fed13a22ae5e atom/browser/atom_quota_permission_context.h
-@@ -1,32 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_ATOM_QUOTA_PERMISSION_CONTEXT_H_
--#define ATOM_BROWSER_ATOM_QUOTA_PERMISSION_CONTEXT_H_
--
--#include "content/public/browser/quota_permission_context.h"
--#include "content/public/common/storage_quota_params.h"
--
--namespace atom {
--
--class AtomQuotaPermissionContext : public content::QuotaPermissionContext {
-- public:
--  typedef content::QuotaPermissionContext::QuotaPermissionResponse response;
--
--  AtomQuotaPermissionContext();
--
--  // content::QuotaPermissionContext:
--  void RequestQuotaPermission(const content::StorageQuotaParams& params,
--                              int render_process_id,
--                              const PermissionCallback& callback) override;
--
-- private:
--  ~AtomQuotaPermissionContext() override;
--
--  DISALLOW_COPY_AND_ASSIGN(AtomQuotaPermissionContext);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_ATOM_QUOTA_PERMISSION_CONTEXT_H_
-removed in remote
-  base   100644 68576a52f248f69a1af66ebb901589d89a144ee9 atom/browser/atom_resource_dispatcher_host_delegate.cc
-  our    100644 934b0ebaa49b711490c58fc73b91985633cba439 atom/browser/atom_resource_dispatcher_host_delegate.cc
-@@ -1,145 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/atom_resource_dispatcher_host_delegate.h"
--
--#include "atom/browser/atom_browser_context.h"
--#include "atom/browser/web_contents_permission_helper.h"
--#include "atom/browser/web_contents_preferences.h"
--#include "atom/common/platform_util.h"
--#include "base/strings/utf_string_conversions.h"
--#include "content/public/browser/browser_thread.h"
--#include "content/public/browser/download_manager.h"
--#include "content/public/browser/render_frame_host.h"
--#include "net/base/escape.h"
--#include "url/gurl.h"
--
--#if defined(ENABLE_PDF_VIEWER)
--#include "atom/common/atom_constants.h"
--#include "base/strings/stringprintf.h"
--#include "content/public/browser/stream_info.h"
--#include "net/url_request/url_request.h"
--#endif  // defined(ENABLE_PDF_VIEWER)
--
--using content::BrowserThread;
--
--namespace atom {
--
--namespace {
--
--void OnOpenExternal(const GURL& escaped_url, bool allowed) {
--  if (allowed)
--    platform_util::OpenExternal(
--#if defined(OS_WIN)
--        base::UTF8ToUTF16(escaped_url.spec()),
--#else
--        escaped_url,
--#endif
--        true);
--}
--
--void HandleExternalProtocolInUI(
--    const GURL& url,
--    const content::ResourceRequestInfo::WebContentsGetter& web_contents_getter,
--    bool has_user_gesture) {
--  content::WebContents* web_contents = web_contents_getter.Run();
--  if (!web_contents)
--    return;
--
--  auto* permission_helper =
--      WebContentsPermissionHelper::FromWebContents(web_contents);
--  if (!permission_helper)
--    return;
--
--  GURL escaped_url(net::EscapeExternalHandlerValue(url.spec()));
--  auto callback = base::Bind(&OnOpenExternal, escaped_url);
--  permission_helper->RequestOpenExternalPermission(callback, has_user_gesture,
--                                                   url);
--}
--
--#if defined(ENABLE_PDF_VIEWER)
--void OnPdfResourceIntercepted(
--    const GURL& original_url,
--    int render_process_host_id,
--    int render_frame_id,
--    const content::ResourceRequestInfo::WebContentsGetter&
--        web_contents_getter) {
--  content::WebContents* web_contents = web_contents_getter.Run();
--  if (!web_contents)
--    return;
--
--  auto* web_preferences = WebContentsPreferences::From(web_contents);
--  if (!web_preferences || !web_preferences->IsEnabled(options::kPlugins)) {
--    auto* browser_context = web_contents->GetBrowserContext();
--    auto* download_manager =
--        content::BrowserContext::GetDownloadManager(browser_context);
--
--    download_manager->DownloadUrl(
--        content::DownloadUrlParameters::CreateForWebContentsMainFrame(
--            web_contents, original_url, NO_TRAFFIC_ANNOTATION_YET));
--    return;
--  }
--
--  // The URL passes the original pdf resource url, that will be requested
--  // by the webui page.
--  // chrome://pdf-viewer/index.html?src=https://somepage/123.pdf
--  content::NavigationController::LoadURLParams params(GURL(base::StringPrintf(
--      "%sindex.html?%s=%s", kPdfViewerUIOrigin, kPdfPluginSrc,
--      net::EscapeUrlEncodedData(original_url.spec(), false).c_str())));
--
--  content::RenderFrameHost* frame_host =
--      content::RenderFrameHost::FromID(render_process_host_id, render_frame_id);
--  if (!frame_host) {
--    return;
--  }
--
--  params.frame_tree_node_id = frame_host->GetFrameTreeNodeId();
--  web_contents->GetController().LoadURLWithParams(params);
--}
--#endif  // defined(ENABLE_PDF_VIEWER)
--
--}  // namespace
--
--AtomResourceDispatcherHostDelegate::AtomResourceDispatcherHostDelegate() {}
--
--bool AtomResourceDispatcherHostDelegate::HandleExternalProtocol(
--    const GURL& url,
--    content::ResourceRequestInfo* info) {
--  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
--                          base::BindOnce(&HandleExternalProtocolInUI, url,
--                                         info->GetWebContentsGetterForRequest(),
--                                         info->HasUserGesture()));
--  return true;
--}
--
--bool AtomResourceDispatcherHostDelegate::ShouldInterceptResourceAsStream(
--    net::URLRequest* request,
--    const std::string& mime_type,
--    GURL* origin,
--    std::string* payload) {
--#if defined(ENABLE_PDF_VIEWER)
--  const content::ResourceRequestInfo* info =
--      content::ResourceRequestInfo::ForRequest(request);
--
--  int render_process_host_id;
--  int render_frame_id;
--  if (!info->GetAssociatedRenderFrame(&render_process_host_id,
--                                      &render_frame_id)) {
--    return false;
--  }
--
--  if (mime_type == "application/pdf") {
--    *origin = GURL(kPdfViewerUIOrigin);
--    content::BrowserThread::PostTask(
--        BrowserThread::UI, FROM_HERE,
--        base::Bind(&OnPdfResourceIntercepted, request->url(),
--                   render_process_host_id, render_frame_id,
--                   info->GetWebContentsGetterForRequest()));
--    return true;
--  }
--#endif  // defined(ENABLE_PDF_VIEWER)
--  return false;
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 408b83c92d90565c1278192d0d9f85ac9d287849 atom/browser/atom_resource_dispatcher_host_delegate.h
-  our    100644 eb91b27921e2bcc9761a6f20c949abfa49fcfd77 atom/browser/atom_resource_dispatcher_host_delegate.h
-@@ -1,33 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_ATOM_RESOURCE_DISPATCHER_HOST_DELEGATE_H_
--#define ATOM_BROWSER_ATOM_RESOURCE_DISPATCHER_HOST_DELEGATE_H_
--
--#include <string>
--
--#include "content/public/browser/resource_dispatcher_host_delegate.h"
--
--namespace atom {
--
--class AtomResourceDispatcherHostDelegate
--    : public content::ResourceDispatcherHostDelegate {
-- public:
--  AtomResourceDispatcherHostDelegate();
--
--  // content::ResourceDispatcherHostDelegate:
--  bool HandleExternalProtocol(const GURL& url,
--                              content::ResourceRequestInfo* info) override;
--  bool ShouldInterceptResourceAsStream(net::URLRequest* request,
--                                       const std::string& mime_type,
--                                       GURL* origin,
--                                       std::string* payload) override;
--
-- private:
--  DISALLOW_COPY_AND_ASSIGN(AtomResourceDispatcherHostDelegate);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_ATOM_RESOURCE_DISPATCHER_HOST_DELEGATE_H_
-removed in remote
-  base   100644 06727332f061a56811fc96ebfd61d8e1d2a14d52 atom/browser/atom_speech_recognition_manager_delegate.cc
-  our    100644 8333211d9ed8295d5bf4b565962a0488044cad53 atom/browser/atom_speech_recognition_manager_delegate.cc
-@@ -1,61 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/atom_speech_recognition_manager_delegate.h"
--
--#include <string>
--
--#include "base/callback.h"
--
--namespace atom {
--
--AtomSpeechRecognitionManagerDelegate::AtomSpeechRecognitionManagerDelegate() {}
--
--AtomSpeechRecognitionManagerDelegate::~AtomSpeechRecognitionManagerDelegate() {}
--
--void AtomSpeechRecognitionManagerDelegate::OnRecognitionStart(int session_id) {}
--
--void AtomSpeechRecognitionManagerDelegate::OnAudioStart(int session_id) {}
--
--void AtomSpeechRecognitionManagerDelegate::OnEnvironmentEstimationComplete(
--    int session_id) {}
--
--void AtomSpeechRecognitionManagerDelegate::OnSoundStart(int session_id) {}
--
--void AtomSpeechRecognitionManagerDelegate::OnSoundEnd(int session_id) {}
--
--void AtomSpeechRecognitionManagerDelegate::OnAudioEnd(int session_id) {}
--
--void AtomSpeechRecognitionManagerDelegate::OnRecognitionEnd(int session_id) {}
--
--void AtomSpeechRecognitionManagerDelegate::OnRecognitionResults(
--    int session_id,
--    const content::SpeechRecognitionResults& result) {}
--
--void AtomSpeechRecognitionManagerDelegate::OnRecognitionError(
--    int session_id,
--    const content::SpeechRecognitionError& error) {}
--
--void AtomSpeechRecognitionManagerDelegate::OnAudioLevelsChange(
--    int session_id,
--    float volume,
--    float noise_volume) {}
--
--void AtomSpeechRecognitionManagerDelegate::CheckRecognitionIsAllowed(
--    int session_id,
--    base::OnceCallback<void(bool ask_user, bool is_allowed)> callback) {
--  std::move(callback).Run(true, true);
--}
--
--content::SpeechRecognitionEventListener*
--AtomSpeechRecognitionManagerDelegate::GetEventListener() {
--  return this;
--}
--
--bool AtomSpeechRecognitionManagerDelegate::FilterProfanities(
--    int render_process_id) {
--  return false;
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 4c78e0eead107e1679184d855d032f10d5791f6d atom/browser/atom_speech_recognition_manager_delegate.h
-  our    100644 10f812a99b8e0d420a99b89b137a460e68d00618 atom/browser/atom_speech_recognition_manager_delegate.h
-@@ -1,55 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_ATOM_SPEECH_RECOGNITION_MANAGER_DELEGATE_H_
--#define ATOM_BROWSER_ATOM_SPEECH_RECOGNITION_MANAGER_DELEGATE_H_
--
--#include <string>
--
--#include "base/macros.h"
--#include "content/public/browser/speech_recognition_event_listener.h"
--#include "content/public/browser/speech_recognition_manager_delegate.h"
--
--namespace atom {
--
--class AtomSpeechRecognitionManagerDelegate
--    : public content::SpeechRecognitionManagerDelegate,
--      public content::SpeechRecognitionEventListener {
-- public:
--  AtomSpeechRecognitionManagerDelegate();
--  ~AtomSpeechRecognitionManagerDelegate() override;
--
--  // content::SpeechRecognitionEventListener:
--  void OnRecognitionStart(int session_id) override;
--  void OnAudioStart(int session_id) override;
--  void OnEnvironmentEstimationComplete(int session_id) override;
--  void OnSoundStart(int session_id) override;
--  void OnSoundEnd(int session_id) override;
--  void OnAudioEnd(int session_id) override;
--  void OnRecognitionEnd(int session_id) override;
--  void OnRecognitionResults(
--      int session_id,
--      const content::SpeechRecognitionResults& result) override;
--  void OnRecognitionError(
--      int session_id,
--      const content::SpeechRecognitionError& error) override;
--  void OnAudioLevelsChange(int session_id,
--                           float volume,
--                           float noise_volume) override;
--
--  // content::SpeechRecognitionManagerDelegate:
--  void CheckRecognitionIsAllowed(
--      int session_id,
--      base::OnceCallback<void(bool ask_user, bool is_allowed)> callback)
--      override;
--  content::SpeechRecognitionEventListener* GetEventListener() override;
--  bool FilterProfanities(int render_process_id) override;
--
-- private:
--  DISALLOW_COPY_AND_ASSIGN(AtomSpeechRecognitionManagerDelegate);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_ATOM_SPEECH_RECOGNITION_MANAGER_DELEGATE_H_
-removed in remote
-  base   100644 7dbfc5a6feba1b3ff343c10fda82e22ed3df596d atom/browser/auto_updater.cc
-  our    100644 90ff157477890b572c917b26ce8d76f29feedef6 atom/browser/auto_updater.cc
-@@ -1,31 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/auto_updater.h"
--
--namespace auto_updater {
--
--Delegate* AutoUpdater::delegate_ = nullptr;
--
--Delegate* AutoUpdater::GetDelegate() {
--  return delegate_;
--}
--
--void AutoUpdater::SetDelegate(Delegate* delegate) {
--  delegate_ = delegate;
--}
--
--#if !defined(OS_MACOSX) || defined(MAS_BUILD)
--std::string AutoUpdater::GetFeedURL() {
--  return "";
--}
--
--void AutoUpdater::SetFeedURL(mate::Arguments* args) {}
--
--void AutoUpdater::CheckForUpdates() {}
--
--void AutoUpdater::QuitAndInstall() {}
--#endif
--
--}  // namespace auto_updater
-removed in remote
-  base   100644 d13c6f0c3305ca7d165708616a233a7004b13aa0 atom/browser/auto_updater.h
-  our    100644 7be3e56db3e948e980c0647dc5c562416de4db16 atom/browser/auto_updater.h
-@@ -1,70 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_AUTO_UPDATER_H_
--#define ATOM_BROWSER_AUTO_UPDATER_H_
--
--#include <map>
--#include <string>
--
--#include "base/macros.h"
--#include "build/build_config.h"
--#include "native_mate/arguments.h"
--
--namespace base {
--class Time;
--}
--
--namespace auto_updater {
--
--class Delegate {
-- public:
--  // An error happened.
--  virtual void OnError(const std::string& error) {}
--
--  virtual void OnError(const std::string& error,
--                       const int code,
--                       const std::string& domain) {}
--
--  // Checking to see if there is an update
--  virtual void OnCheckingForUpdate() {}
--
--  // There is an update available and it is being downloaded
--  virtual void OnUpdateAvailable() {}
--
--  // There is no available update.
--  virtual void OnUpdateNotAvailable() {}
--
--  // There is a new update which has been downloaded.
--  virtual void OnUpdateDownloaded(const std::string& release_notes,
--                                  const std::string& release_name,
--                                  const base::Time& release_date,
--                                  const std::string& update_url) {}
--
-- protected:
--  virtual ~Delegate() {}
--};
--
--class AutoUpdater {
-- public:
--  typedef std::map<std::string, std::string> HeaderMap;
--
--  // Gets/Sets the delegate.
--  static Delegate* GetDelegate();
--  static void SetDelegate(Delegate* delegate);
--
--  static std::string GetFeedURL();
--  static void SetFeedURL(mate::Arguments* args);
--  static void CheckForUpdates();
--  static void QuitAndInstall();
--
-- private:
--  static Delegate* delegate_;
--
--  DISALLOW_IMPLICIT_CONSTRUCTORS(AutoUpdater);
--};
--
--}  // namespace auto_updater
--
--#endif  // ATOM_BROWSER_AUTO_UPDATER_H_
-removed in remote
-  base   100644 a55cdd281265d2c5b1bad20e72dbdd135f886995 atom/browser/auto_updater_mac.mm
-  our    100644 ff8ffb86373f44b8c1b7276a2459444de3aaff5b atom/browser/auto_updater_mac.mm
-@@ -1,174 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/auto_updater.h"
--
--#import <ReactiveCocoa/NSObject+RACPropertySubscribing.h>
--#import <ReactiveCocoa/RACCommand.h>
--#import <ReactiveCocoa/RACSignal.h>
--#import <Squirrel/Squirrel.h>
--
--#include "atom/browser/browser.h"
--#include "atom/common/native_mate_converters/value_converter.h"
--#include "base/bind.h"
--#include "base/strings/sys_string_conversions.h"
--#include "base/time/time.h"
--#include "native_mate/converter.h"
--#include "native_mate/dictionary.h"
--
--namespace auto_updater {
--
--namespace {
--
--// The gloal SQRLUpdater object.
--SQRLUpdater* g_updater = nil;
--
--}  // namespace
--
--namespace {
--
--bool g_update_available = false;
--std::string update_url_ = "";
--
--}  // namespace
--
--std::string AutoUpdater::GetFeedURL() {
--  return update_url_;
--}
--
--// static
--void AutoUpdater::SetFeedURL(mate::Arguments* args) {
--  mate::Dictionary opts;
--  std::string feed;
--  HeaderMap requestHeaders;
--  std::string serverType = "default";
--  if (args->GetNext(&opts)) {
--    if (!opts.Get("url", &feed)) {
--      args->ThrowError(
--          "Expected options object to contain a 'url' string property in "
--          "setFeedUrl call");
--      return;
--    }
--    opts.Get("headers", &requestHeaders);
--    opts.Get("serverType", &serverType);
--    if (serverType != "default" && serverType != "json") {
--      args->ThrowError("Expected serverType to be 'default' or 'json'");
--      return;
--    }
--  } else if (args->GetNext(&feed)) {
--    args->GetNext(&requestHeaders);
--  } else {
--    args->ThrowError(
--        "Expected an options object with a 'url' property to be provided");
--    return;
--  }
--
--  Delegate* delegate = GetDelegate();
--  if (!delegate)
--    return;
--
--  update_url_ = feed;
--
--  NSURL* url = [NSURL URLWithString:base::SysUTF8ToNSString(feed)];
--  NSMutableURLRequest* urlRequest = [NSMutableURLRequest requestWithURL:url];
--
--  for (const auto& it : requestHeaders) {
--    [urlRequest setValue:base::SysUTF8ToNSString(it.second)
--        forHTTPHeaderField:base::SysUTF8ToNSString(it.first)];
--  }
--
--  if (g_updater)
--    [g_updater release];
--
--  // Initialize the SQRLUpdater.
--  @try {
--    if (serverType == "json") {
--      NSString* nsAppVersion =
--          base::SysUTF8ToNSString(atom::Browser::Get()->GetVersion());
--      g_updater = [[SQRLUpdater alloc] initWithUpdateRequest:urlRequest
--                                                  forVersion:nsAppVersion];
--    } else {
--      // default
--      g_updater = [[SQRLUpdater alloc] initWithUpdateRequest:urlRequest];
--    }
--  } @catch (NSException* error) {
--    delegate->OnError(base::SysNSStringToUTF8(error.reason));
--    return;
--  }
--
--  [[g_updater rac_valuesForKeyPath:@"state" observer:g_updater]
--      subscribeNext:^(NSNumber* stateNumber) {
--        int state = [stateNumber integerValue];
--        // Dispatching the event on main thread.
--        dispatch_async(dispatch_get_main_queue(), ^{
--          if (state == SQRLUpdaterStateCheckingForUpdate)
--            delegate->OnCheckingForUpdate();
--          else if (state == SQRLUpdaterStateDownloadingUpdate)
--            delegate->OnUpdateAvailable();
--        });
--      }];
--}
--
--// static
--void AutoUpdater::CheckForUpdates() {
--  Delegate* delegate = GetDelegate();
--  if (!delegate)
--    return;
--
--  [[[[g_updater.checkForUpdatesCommand execute:nil]
--      // Send a `nil` after everything...
--      concat:[RACSignal return:nil]]
--      // But only take the first value. If an update is sent, we'll get that.
--      // Otherwise, we'll get our inserted `nil` value.
--      take:1]
--      subscribeNext:^(SQRLDownloadedUpdate* downloadedUpdate) {
--        if (downloadedUpdate) {
--          g_update_available = true;
--          SQRLUpdate* update = downloadedUpdate.update;
--          // There is a new update that has been downloaded.
--          delegate->OnUpdateDownloaded(
--              base::SysNSStringToUTF8(update.releaseNotes),
--              base::SysNSStringToUTF8(update.releaseName),
--              base::Time::FromDoubleT(update.releaseDate.timeIntervalSince1970),
--              base::SysNSStringToUTF8(update.updateURL.absoluteString));
--        } else {
--          g_update_available = false;
--          // When the completed event is sent with no update, then we know there
--          // is no update available.
--          delegate->OnUpdateNotAvailable();
--        }
--      }
--      error:^(NSError* error) {
--        NSMutableString* failureString =
--            [NSMutableString stringWithString:error.localizedDescription];
--        if (error.localizedFailureReason) {
--          [failureString appendString:@": "];
--          [failureString appendString:error.localizedFailureReason];
--        }
--        if (error.localizedRecoverySuggestion) {
--          if (![failureString hasSuffix:@"."])
--            [failureString appendString:@"."];
--          [failureString appendString:@" "];
--          [failureString appendString:error.localizedRecoverySuggestion];
--        }
--        delegate->OnError(base::SysNSStringToUTF8(failureString), error.code,
--                          base::SysNSStringToUTF8(error.domain));
--      }];
--}
--
--void AutoUpdater::QuitAndInstall() {
--  Delegate* delegate = AutoUpdater::GetDelegate();
--  if (g_update_available) {
--    [[g_updater relaunchToInstallUpdate] subscribeError:^(NSError* error) {
--      if (delegate)
--        delegate->OnError(base::SysNSStringToUTF8(error.localizedDescription),
--                          error.code, base::SysNSStringToUTF8(error.domain));
--    }];
--  } else {
--    if (delegate)
--      delegate->OnError("No update available, can't quit and install");
--  }
--}
--
--}  // namespace auto_updater
-removed in remote
-  base   100644 36c8d17359e8eef3a52a682dcba692b51ce82378 atom/browser/bridge_task_runner.cc
-  our    100644 c0b3cd750d9da13d2957865fd98b094ffbe7bcaf atom/browser/bridge_task_runner.cc
-@@ -1,63 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/bridge_task_runner.h"
--
--#include "base/message_loop/message_loop.h"
--
--namespace atom {
--
--BridgeTaskRunner::BridgeTaskRunner() = default;
--BridgeTaskRunner::~BridgeTaskRunner() = default;
--
--void BridgeTaskRunner::MessageLoopIsReady() {
--  auto* message_loop = base::MessageLoop::current();
--  CHECK(message_loop);
--  for (TaskPair& task : tasks_) {
--    message_loop->task_runner()->PostDelayedTask(
--        std::get<0>(task), std::move(std::get<1>(task)), std::get<2>(task));
--  }
--  for (TaskPair& task : non_nestable_tasks_) {
--    message_loop->task_runner()->PostNonNestableDelayedTask(
--        std::get<0>(task), std::move(std::get<1>(task)), std::get<2>(task));
--  }
--}
--
--bool BridgeTaskRunner::PostDelayedTask(const base::Location& from_here,
--                                       base::OnceClosure task,
--                                       base::TimeDelta delay) {
--  auto* message_loop = base::MessageLoop::current();
--  if (!message_loop) {
--    tasks_.push_back(std::make_tuple(from_here, std::move(task), delay));
--    return true;
--  }
--
--  return message_loop->task_runner()->PostDelayedTask(from_here,
--                                                      std::move(task), delay);
--}
--
--bool BridgeTaskRunner::RunsTasksInCurrentSequence() const {
--  auto* message_loop = base::MessageLoop::current();
--  if (!message_loop)
--    return true;
--
--  return message_loop->task_runner()->RunsTasksInCurrentSequence();
--}
--
--bool BridgeTaskRunner::PostNonNestableDelayedTask(
--    const base::Location& from_here,
--    base::OnceClosure task,
--    base::TimeDelta delay) {
--  auto* message_loop = base::MessageLoop::current();
--  if (!message_loop) {
--    non_nestable_tasks_.push_back(
--        std::make_tuple(from_here, std::move(task), delay));
--    return true;
--  }
--
--  return message_loop->task_runner()->PostNonNestableDelayedTask(
--      from_here, std::move(task), delay);
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 b69b33b29516a7bb866b7cca9e09d7a3d1726b3a atom/browser/bridge_task_runner.h
-  our    100644 7c3049b3f8c2d22fa4803b409f2f62f840e8ea72 atom/browser/bridge_task_runner.h
-@@ -1,48 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_BRIDGE_TASK_RUNNER_H_
--#define ATOM_BROWSER_BRIDGE_TASK_RUNNER_H_
--
--#include <tuple>
--#include <vector>
--
--#include "base/location.h"
--#include "base/single_thread_task_runner.h"
--#include "base/tuple.h"
--
--namespace atom {
--
--// Post all tasks to the current message loop's task runner if available,
--// otherwise delay the work until message loop is ready.
--class BridgeTaskRunner : public base::SingleThreadTaskRunner {
-- public:
--  BridgeTaskRunner();
--
--  // Called when message loop is ready.
--  void MessageLoopIsReady();
--
--  // base::SingleThreadTaskRunner:
--  bool PostDelayedTask(const base::Location& from_here,
--                       base::OnceClosure task,
--                       base::TimeDelta delay) override;
--  bool RunsTasksInCurrentSequence() const override;
--  bool PostNonNestableDelayedTask(const base::Location& from_here,
--                                  base::OnceClosure task,
--                                  base::TimeDelta delay) override;
--
-- private:
--  using TaskPair =
--      std::tuple<base::Location, base::OnceClosure, base::TimeDelta>;
--  ~BridgeTaskRunner() override;
--
--  std::vector<TaskPair> tasks_;
--  std::vector<TaskPair> non_nestable_tasks_;
--
--  DISALLOW_COPY_AND_ASSIGN(BridgeTaskRunner);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_BRIDGE_TASK_RUNNER_H_
-removed in remote
-  base   100644 e89f52283b3c8168ecc1e2d5340c81b75957630a atom/browser/browser.cc
-  our    100644 ce35de64d60c6767ac52596c1b32e7bde5ceefa0 atom/browser/browser.cc
-@@ -1,242 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/browser.h"
--
--#include <string>
--
--#include "atom/browser/atom_browser_main_parts.h"
--#include "atom/browser/browser_observer.h"
--#include "atom/browser/login_handler.h"
--#include "atom/browser/native_window.h"
--#include "atom/browser/window_list.h"
--#include "base/files/file_util.h"
--#include "base/message_loop/message_loop.h"
--#include "base/path_service.h"
--#include "base/run_loop.h"
--#include "base/threading/thread_restrictions.h"
--#include "base/threading/thread_task_runner_handle.h"
--#include "brightray/browser/brightray_paths.h"
--#include "brightray/common/application_info.h"
--
--namespace atom {
--
--Browser::LoginItemSettings::LoginItemSettings() = default;
--Browser::LoginItemSettings::~LoginItemSettings() = default;
--Browser::LoginItemSettings::LoginItemSettings(const LoginItemSettings& other) =
--    default;
--
--Browser::Browser() {
--  WindowList::AddObserver(this);
--}
--
--Browser::~Browser() {
--  WindowList::RemoveObserver(this);
--}
--
--// static
--Browser* Browser::Get() {
--  return AtomBrowserMainParts::Get()->browser();
--}
--
--void Browser::Quit() {
--  if (is_quiting_)
--    return;
--
--  is_quiting_ = HandleBeforeQuit();
--  if (!is_quiting_)
--    return;
--
--  if (atom::WindowList::IsEmpty())
--    NotifyAndShutdown();
--  else
--    atom::WindowList::CloseAllWindows();
--}
--
--void Browser::Exit(mate::Arguments* args) {
--  int code = 0;
--  args->GetNext(&code);
--
--  if (!AtomBrowserMainParts::Get()->SetExitCode(code)) {
--    // Message loop is not ready, quit directly.
--    exit(code);
--  } else {
--    // Prepare to quit when all windows have been closed.
--    is_quiting_ = true;
--
--    // Remember this caller so that we don't emit unrelated events.
--    is_exiting_ = true;
--
--    // Must destroy windows before quitting, otherwise bad things can happen.
--    if (atom::WindowList::IsEmpty()) {
--      Shutdown();
--    } else {
--      // Unlike Quit(), we do not ask to close window, but destroy the window
--      // without asking.
--      atom::WindowList::DestroyAllWindows();
--    }
--  }
--}
--
--void Browser::Shutdown() {
--  if (is_shutdown_)
--    return;
--
--  is_shutdown_ = true;
--  is_quiting_ = true;
--
--  for (BrowserObserver& observer : observers_)
--    observer.OnQuit();
--
--  if (base::ThreadTaskRunnerHandle::IsSet()) {
--    base::ThreadTaskRunnerHandle::Get()->PostTask(
--        FROM_HERE, base::MessageLoop::QuitWhenIdleClosure());
--  } else {
--    // There is no message loop available so we are in early stage.
--    exit(0);
--  }
--}
--
--std::string Browser::GetVersion() const {
--  std::string ret = brightray::GetOverriddenApplicationVersion();
--  if (ret.empty())
--    ret = GetExecutableFileVersion();
--  return ret;
--}
--
--void Browser::SetVersion(const std::string& version) {
--  brightray::OverrideApplicationVersion(version);
--}
--
--std::string Browser::GetName() const {
--  std::string ret = brightray::GetOverriddenApplicationName();
--  if (ret.empty())
--    ret = GetExecutableFileProductName();
--  return ret;
--}
--
--void Browser::SetName(const std::string& name) {
--  brightray::OverrideApplicationName(name);
--}
--
--int Browser::GetBadgeCount() {
--  return badge_count_;
--}
--
--bool Browser::OpenFile(const std::string& file_path) {
--  bool prevent_default = false;
--  for (BrowserObserver& observer : observers_)
--    observer.OnOpenFile(&prevent_default, file_path);
--
--  return prevent_default;
--}
--
--void Browser::OpenURL(const std::string& url) {
--  for (BrowserObserver& observer : observers_)
--    observer.OnOpenURL(url);
--}
--
--void Browser::Activate(bool has_visible_windows) {
--  for (BrowserObserver& observer : observers_)
--    observer.OnActivate(has_visible_windows);
--}
--
--void Browser::WillFinishLaunching() {
--  for (BrowserObserver& observer : observers_)
--    observer.OnWillFinishLaunching();
--}
--
--void Browser::DidFinishLaunching(const base::DictionaryValue& launch_info) {
--  // Make sure the userData directory is created.
--  base::ThreadRestrictions::ScopedAllowIO allow_io;
--  base::FilePath user_data;
--  if (PathService::Get(brightray::DIR_USER_DATA, &user_data))
--    base::CreateDirectoryAndGetError(user_data, nullptr);
--
--  is_ready_ = true;
--  if (ready_promise_) {
--    ready_promise_->Resolve();
--  }
--  for (BrowserObserver& observer : observers_)
--    observer.OnFinishLaunching(launch_info);
--}
--
--util::Promise* Browser::WhenReady(v8::Isolate* isolate) {
--  if (!ready_promise_) {
--    ready_promise_ = new util::Promise(isolate);
--    if (is_ready()) {
--      ready_promise_->Resolve();
--    }
--  }
--  return ready_promise_;
--}
--
--void Browser::OnAccessibilitySupportChanged() {
--  for (BrowserObserver& observer : observers_)
--    observer.OnAccessibilitySupportChanged();
--}
--
--void Browser::RequestLogin(
--    scoped_refptr<LoginHandler> login_handler,
--    std::unique_ptr<base::DictionaryValue> request_details) {
--  for (BrowserObserver& observer : observers_)
--    observer.OnLogin(login_handler, *(request_details.get()));
--}
--
--void Browser::PreMainMessageLoopRun() {
--  for (BrowserObserver& observer : observers_) {
--    observer.OnPreMainMessageLoopRun();
--  }
--}
--
--void Browser::NotifyAndShutdown() {
--  if (is_shutdown_)
--    return;
--
--  bool prevent_default = false;
--  for (BrowserObserver& observer : observers_)
--    observer.OnWillQuit(&prevent_default);
--
--  if (prevent_default) {
--    is_quiting_ = false;
--    return;
--  }
--
--  Shutdown();
--}
--
--bool Browser::HandleBeforeQuit() {
--  bool prevent_default = false;
--  for (BrowserObserver& observer : observers_)
--    observer.OnBeforeQuit(&prevent_default);
--
--  return !prevent_default;
--}
--
--void Browser::OnWindowCloseCancelled(NativeWindow* window) {
--  if (is_quiting_)
--    // Once a beforeunload handler has prevented the closing, we think the quit
--    // is cancelled too.
--    is_quiting_ = false;
--}
--
--void Browser::OnWindowAllClosed() {
--  if (is_exiting_) {
--    Shutdown();
--  } else if (is_quiting_) {
--    NotifyAndShutdown();
--  } else {
--    for (BrowserObserver& observer : observers_)
--      observer.OnWindowAllClosed();
--  }
--}
--
--#if defined(OS_MACOSX)
--void Browser::NewWindowForTab() {
--  for (BrowserObserver& observer : observers_)
--    observer.OnNewWindowForTab();
--}
--#endif
--
--}  // namespace atom
-removed in remote
-  base   100644 634e14e60262a3531bc99acf5ba74e2cf22d9b54 atom/browser/browser.h
-  our    100644 aed7d25c37da59c0dd5e09940a064c329353a0b2 atom/browser/browser.h
-@@ -1,295 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_BROWSER_H_
--#define ATOM_BROWSER_BROWSER_H_
--
--#include <string>
--#include <vector>
--
--#include "atom/browser/browser_observer.h"
--#include "atom/browser/window_list_observer.h"
--#include "atom/common/promise_util.h"
--#include "base/compiler_specific.h"
--#include "base/macros.h"
--#include "base/observer_list.h"
--#include "base/strings/string16.h"
--#include "base/values.h"
--#include "native_mate/arguments.h"
--
--#if defined(OS_WIN)
--#include <windows.h>
--#include "base/files/file_path.h"
--#endif
--
--namespace base {
--class FilePath;
--}
--
--namespace gfx {
--class Image;
--}
--
--namespace atom {
--
--class AtomMenuModel;
--
--// This class is used for control application-wide operations.
--class Browser : public WindowListObserver {
-- public:
--  Browser();
--  ~Browser() override;
--
--  static Browser* Get();
--
--  // Try to close all windows and quit the application.
--  void Quit();
--
--  // Exit the application immediately and set exit code.
--  void Exit(mate::Arguments* args);
--
--  // Cleanup everything and shutdown the application gracefully.
--  void Shutdown();
--
--  // Focus the application.
--  void Focus();
--
--  // Returns the version of the executable (or bundle).
--  std::string GetVersion() const;
--
--  // Overrides the application version.
--  void SetVersion(const std::string& version);
--
--  // Returns the application's name, default is just Electron.
--  std::string GetName() const;
--
--  // Overrides the application name.
--  void SetName(const std::string& name);
--
--  // Add the |path| to recent documents list.
--  void AddRecentDocument(const base::FilePath& path);
--
--  // Clear the recent documents list.
--  void ClearRecentDocuments();
--
--  // Set the application user model ID.
--  void SetAppUserModelID(const base::string16& name);
--
--  // Remove the default protocol handler registry key
--  bool RemoveAsDefaultProtocolClient(const std::string& protocol,
--                                     mate::Arguments* args);
--
--  // Set as default handler for a protocol.
--  bool SetAsDefaultProtocolClient(const std::string& protocol,
--                                  mate::Arguments* args);
--
--  // Query the current state of default handler for a protocol.
--  bool IsDefaultProtocolClient(const std::string& protocol,
--                               mate::Arguments* args);
--
--  // Set/Get the badge count.
--  bool SetBadgeCount(int count);
--  int GetBadgeCount();
--
--  // Set/Get the login item settings of the app
--  struct LoginItemSettings {
--    bool open_at_login = false;
--    bool open_as_hidden = false;
--    bool restore_state = false;
--    bool opened_at_login = false;
--    bool opened_as_hidden = false;
--    base::string16 path;
--    std::vector<base::string16> args;
--
--    LoginItemSettings();
--    ~LoginItemSettings();
--    LoginItemSettings(const LoginItemSettings&);
--  };
--  void SetLoginItemSettings(LoginItemSettings settings);
--  LoginItemSettings GetLoginItemSettings(const LoginItemSettings& options);
--
--#if defined(OS_MACOSX)
--  // Set the handler which decides whether to shutdown.
--  void SetShutdownHandler(base::Callback<bool()> handler);
--
--  // Hide the application.
--  void Hide();
--
--  // Show the application.
--  void Show();
--
--  // Creates an activity and sets it as the one currently in use.
--  void SetUserActivity(const std::string& type,
--                       const base::DictionaryValue& user_info,
--                       mate::Arguments* args);
--
--  // Returns the type name of the current user activity.
--  std::string GetCurrentActivityType();
--
--  // Invalidates the current user activity.
--  void InvalidateCurrentActivity();
--
--  // Updates the current user activity
--  void UpdateCurrentActivity(const std::string& type,
--                             const base::DictionaryValue& user_info);
--
--  // Indicates that an user activity is about to be resumed.
--  bool WillContinueUserActivity(const std::string& type);
--
--  // Indicates a failure to resume a Handoff activity.
--  void DidFailToContinueUserActivity(const std::string& type,
--                                     const std::string& error);
--
--  // Resumes an activity via hand-off.
--  bool ContinueUserActivity(const std::string& type,
--                            const base::DictionaryValue& user_info);
--
--  // Indicates that an activity was continued on another device.
--  void UserActivityWasContinued(const std::string& type,
--                                const base::DictionaryValue& user_info);
--
--  // Gives an oportunity to update the Handoff payload.
--  bool UpdateUserActivityState(const std::string& type,
--                               const base::DictionaryValue& user_info);
--
--  // Bounce the dock icon.
--  enum BounceType {
--    BOUNCE_CRITICAL = 0,
--    BOUNCE_INFORMATIONAL = 10,
--  };
--  int DockBounce(BounceType type);
--  void DockCancelBounce(int request_id);
--
--  // Bounce the Downloads stack.
--  void DockDownloadFinished(const std::string& filePath);
--
--  // Set/Get dock's badge text.
--  void DockSetBadgeText(const std::string& label);
--  std::string DockGetBadgeText();
--
--  // Hide/Show dock.
--  void DockHide();
--  void DockShow();
--  bool DockIsVisible();
--
--  // Set docks' menu.
--  void DockSetMenu(AtomMenuModel* model);
--
--  // Set docks' icon.
--  void DockSetIcon(const gfx::Image& image);
--
--  void ShowAboutPanel();
--  void SetAboutPanelOptions(const base::DictionaryValue& options);
--#endif  // defined(OS_MACOSX)
--
--#if defined(OS_WIN)
--  struct UserTask {
--    base::FilePath program;
--    base::string16 arguments;
--    base::string16 title;
--    base::string16 description;
--    base::FilePath icon_path;
--    int icon_index;
--
--    UserTask();
--    UserTask(const UserTask&);
--    ~UserTask();
--  };
--
--  // Add a custom task to jump list.
--  bool SetUserTasks(const std::vector<UserTask>& tasks);
--
--  // Returns the application user model ID, if there isn't one, then create
--  // one from app's name.
--  // The returned string managed by Browser, and should not be modified.
--  PCWSTR GetAppUserModelID();
--#endif  // defined(OS_WIN)
--
--#if defined(OS_LINUX)
--  // Whether Unity launcher is running.
--  bool IsUnityRunning();
--#endif  // defined(OS_LINUX)
--
--  // Tell the application to open a file.
--  bool OpenFile(const std::string& file_path);
--
--  // Tell the application to open a url.
--  void OpenURL(const std::string& url);
--
--#if defined(OS_MACOSX)
--  // Tell the application to create a new window for a tab.
--  void NewWindowForTab();
--#endif  // defined(OS_MACOSX)
--
--  // Tell the application that application is activated with visible/invisible
--  // windows.
--  void Activate(bool has_visible_windows);
--
--  // Tell the application the loading has been done.
--  void WillFinishLaunching();
--  void DidFinishLaunching(const base::DictionaryValue& launch_info);
--
--  void OnAccessibilitySupportChanged();
--
--  // Request basic auth login.
--  void RequestLogin(scoped_refptr<LoginHandler> login_handler,
--                    std::unique_ptr<base::DictionaryValue> request_details);
--
--  void PreMainMessageLoopRun();
--
--  void AddObserver(BrowserObserver* obs) { observers_.AddObserver(obs); }
--
--  void RemoveObserver(BrowserObserver* obs) { observers_.RemoveObserver(obs); }
--
--  bool is_shutting_down() const { return is_shutdown_; }
--  bool is_quiting() const { return is_quiting_; }
--  bool is_ready() const { return is_ready_; }
--  util::Promise* WhenReady(v8::Isolate* isolate);
--
-- protected:
--  // Returns the version of application bundle or executable file.
--  std::string GetExecutableFileVersion() const;
--
--  // Returns the name of application bundle or executable file.
--  std::string GetExecutableFileProductName() const;
--
--  // Send the will-quit message and then shutdown the application.
--  void NotifyAndShutdown();
--
--  // Send the before-quit message and start closing windows.
--  bool HandleBeforeQuit();
--
--  bool is_quiting_ = false;
--
-- private:
--  // WindowListObserver implementations:
--  void OnWindowCloseCancelled(NativeWindow* window) override;
--  void OnWindowAllClosed() override;
--
--  // Observers of the browser.
--  base::ObserverList<BrowserObserver> observers_;
--
--  // Whether `app.exit()` has been called
--  bool is_exiting_ = false;
--
--  // Whether "ready" event has been emitted.
--  bool is_ready_ = false;
--
--  // The browser is being shutdown.
--  bool is_shutdown_ = false;
--
--  int badge_count_ = 0;
--
--  util::Promise* ready_promise_ = nullptr;
--
--#if defined(OS_MACOSX)
--  base::DictionaryValue about_panel_options_;
--#endif
--
--  DISALLOW_COPY_AND_ASSIGN(Browser);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_BROWSER_H_
-removed in remote
-  base   100644 6c7d4abaf6456d96a25a68b153bcb4a40b63fff6 atom/browser/browser_linux.cc
-  our    100644 0b4868f711ec24e6db3bf37f751c505c0ccc4115 atom/browser/browser_linux.cc
-@@ -1,145 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/browser.h"
--
--#include <fcntl.h>
--#include <stdlib.h>
--
--#include "atom/browser/native_window.h"
--#include "atom/browser/window_list.h"
--#include "atom/common/atom_version.h"
--#include "base/command_line.h"
--#include "base/environment.h"
--#include "base/process/launch.h"
--#include "brightray/common/application_info.h"
--
--#if defined(USE_X11)
--#include "chrome/browser/ui/libgtkui/gtk_util.h"
--#include "chrome/browser/ui/libgtkui/unity_service.h"
--#endif
--
--namespace atom {
--
--const char kXdgSettings[] = "xdg-settings";
--const char kXdgSettingsDefaultSchemeHandler[] = "default-url-scheme-handler";
--
--bool LaunchXdgUtility(const std::vector<std::string>& argv, int* exit_code) {
--  *exit_code = EXIT_FAILURE;
--  int devnull = open("/dev/null", O_RDONLY);
--  if (devnull < 0)
--    return false;
--
--  base::LaunchOptions options;
--  options.fds_to_remap.push_back(std::make_pair(devnull, STDIN_FILENO));
--
--  base::Process process = base::LaunchProcess(argv, options);
--  close(devnull);
--
--  if (!process.IsValid())
--    return false;
--  return process.WaitForExit(exit_code);
--}
--
--bool SetDefaultWebClient(const std::string& protocol) {
--  std::unique_ptr<base::Environment> env(base::Environment::Create());
--
--  std::vector<std::string> argv;
--  argv.push_back(kXdgSettings);
--  argv.push_back("set");
--  if (!protocol.empty()) {
--    argv.push_back(kXdgSettingsDefaultSchemeHandler);
--    argv.push_back(protocol);
--  }
--  argv.push_back(libgtkui::GetDesktopName(env.get()));
--
--  int exit_code;
--  bool ran_ok = LaunchXdgUtility(argv, &exit_code);
--  return ran_ok && exit_code == EXIT_SUCCESS;
--}
--
--void Browser::Focus() {
--  // Focus on the first visible window.
--  for (auto* const window : WindowList::GetWindows()) {
--    if (window->IsVisible()) {
--      window->Focus(true);
--      break;
--    }
--  }
--}
--
--void Browser::AddRecentDocument(const base::FilePath& path) {}
--
--void Browser::ClearRecentDocuments() {}
--
--void Browser::SetAppUserModelID(const base::string16& name) {}
--
--bool Browser::SetAsDefaultProtocolClient(const std::string& protocol,
--                                         mate::Arguments* args) {
--  return SetDefaultWebClient(protocol);
--}
--
--bool Browser::IsDefaultProtocolClient(const std::string& protocol,
--                                      mate::Arguments* args) {
--  std::unique_ptr<base::Environment> env(base::Environment::Create());
--
--  if (protocol.empty())
--    return false;
--
--  std::vector<std::string> argv;
--  argv.push_back(kXdgSettings);
--  argv.push_back("check");
--  argv.push_back(kXdgSettingsDefaultSchemeHandler);
--  argv.push_back(protocol);
--  argv.push_back(libgtkui::GetDesktopName(env.get()));
--
--  std::string reply;
--  int success_code;
--  bool ran_ok = base::GetAppOutputWithExitCode(base::CommandLine(argv), &reply,
--                                               &success_code);
--
--  if (!ran_ok || success_code != EXIT_SUCCESS)
--    return false;
--
--  // Allow any reply that starts with "yes".
--  return base::StartsWith(reply, "yes", base::CompareCase::SENSITIVE) ? true
--                                                                      : false;
--}
--
--// Todo implement
--bool Browser::RemoveAsDefaultProtocolClient(const std::string& protocol,
--                                            mate::Arguments* args) {
--  return false;
--}
--
--bool Browser::SetBadgeCount(int count) {
--  if (IsUnityRunning()) {
--    unity::SetDownloadCount(count);
--    badge_count_ = count;
--    return true;
--  } else {
--    return false;
--  }
--}
--
--void Browser::SetLoginItemSettings(LoginItemSettings settings) {}
--
--Browser::LoginItemSettings Browser::GetLoginItemSettings(
--    const LoginItemSettings& options) {
--  return LoginItemSettings();
--}
--
--std::string Browser::GetExecutableFileVersion() const {
--  return brightray::GetApplicationVersion();
--}
--
--std::string Browser::GetExecutableFileProductName() const {
--  return brightray::GetApplicationName();
--}
--
--bool Browser::IsUnityRunning() {
--  return unity::IsRunning();
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 0294894fcd61a7255cd28ad6797ef4e32a279490 atom/browser/browser_mac.mm
-  our    100644 27e347eccebf006336d5d110c81717ecc45af9c3 atom/browser/browser_mac.mm
-@@ -1,346 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/browser.h"
--
--#include "atom/browser/mac/atom_application.h"
--#include "atom/browser/mac/atom_application_delegate.h"
--#include "atom/browser/mac/dict_util.h"
--#include "atom/browser/native_window.h"
--#include "atom/browser/window_list.h"
--#include "atom/common/platform_util.h"
--#include "base/mac/bundle_locations.h"
--#include "base/mac/foundation_util.h"
--#include "base/mac/mac_util.h"
--#include "base/strings/string_number_conversions.h"
--#include "base/strings/sys_string_conversions.h"
--#include "brightray/common/application_info.h"
--#include "net/base/mac/url_conversions.h"
--#include "ui/gfx/image/image.h"
--#include "url/gurl.h"
--
--namespace atom {
--
--void Browser::SetShutdownHandler(base::Callback<bool()> handler) {
--  [[AtomApplication sharedApplication] setShutdownHandler:std::move(handler)];
--}
--
--void Browser::Focus() {
--  [[AtomApplication sharedApplication] activateIgnoringOtherApps:YES];
--}
--
--void Browser::Hide() {
--  [[AtomApplication sharedApplication] hide:nil];
--}
--
--void Browser::Show() {
--  [[AtomApplication sharedApplication] unhide:nil];
--}
--
--void Browser::AddRecentDocument(const base::FilePath& path) {
--  NSString* path_string = base::mac::FilePathToNSString(path);
--  if (!path_string)
--    return;
--  NSURL* u = [NSURL fileURLWithPath:path_string];
--  if (!u)
--    return;
--  [[NSDocumentController sharedDocumentController] noteNewRecentDocumentURL:u];
--}
--
--void Browser::ClearRecentDocuments() {
--  [[NSDocumentController sharedDocumentController] clearRecentDocuments:nil];
--}
--
--bool Browser::RemoveAsDefaultProtocolClient(const std::string& protocol,
--                                            mate::Arguments* args) {
--  NSString* identifier = [base::mac::MainBundle() bundleIdentifier];
--  if (!identifier)
--    return false;
--
--  if (!Browser::IsDefaultProtocolClient(protocol, args))
--    return false;
--
--  NSString* protocol_ns = [NSString stringWithUTF8String:protocol.c_str()];
--  CFStringRef protocol_cf = base::mac::NSToCFCast(protocol_ns);
--  CFArrayRef bundleList = LSCopyAllHandlersForURLScheme(protocol_cf);
--  if (!bundleList) {
--    return false;
--  }
--  // On macOS, we can't query the default, but the handlers list seems to put
--  // Apple's defaults first, so we'll use the first option that isn't our bundle
--  CFStringRef other = nil;
--  for (CFIndex i = 0; i < CFArrayGetCount(bundleList); ++i) {
--    other =
--        base::mac::CFCast<CFStringRef>(CFArrayGetValueAtIndex(bundleList, i));
--    if (![identifier isEqualToString:(__bridge NSString*)other]) {
--      break;
--    }
--  }
--
--  // No other app was found set it to none instead of setting it back to itself.
--  if ([identifier isEqualToString:(__bridge NSString*)other]) {
--    other = base::mac::NSToCFCast(@"None");
--  }
--
--  OSStatus return_code = LSSetDefaultHandlerForURLScheme(protocol_cf, other);
--  return return_code == noErr;
--}
--
--bool Browser::SetAsDefaultProtocolClient(const std::string& protocol,
--                                         mate::Arguments* args) {
--  if (protocol.empty())
--    return false;
--
--  NSString* identifier = [base::mac::MainBundle() bundleIdentifier];
--  if (!identifier)
--    return false;
--
--  NSString* protocol_ns = [NSString stringWithUTF8String:protocol.c_str()];
--  OSStatus return_code = LSSetDefaultHandlerForURLScheme(
--      base::mac::NSToCFCast(protocol_ns), base::mac::NSToCFCast(identifier));
--  return return_code == noErr;
--}
--
--bool Browser::IsDefaultProtocolClient(const std::string& protocol,
--                                      mate::Arguments* args) {
--  if (protocol.empty())
--    return false;
--
--  NSString* identifier = [base::mac::MainBundle() bundleIdentifier];
--  if (!identifier)
--    return false;
--
--  NSString* protocol_ns = [NSString stringWithUTF8String:protocol.c_str()];
--
--  CFStringRef bundle =
--      LSCopyDefaultHandlerForURLScheme(base::mac::NSToCFCast(protocol_ns));
--  NSString* bundleId =
--      static_cast<NSString*>(base::mac::CFTypeRefToNSObjectAutorelease(bundle));
--  if (!bundleId)
--    return false;
--
--  // Ensure the comparison is case-insensitive
--  // as LS does not persist the case of the bundle id.
--  NSComparisonResult result = [bundleId caseInsensitiveCompare:identifier];
--  return result == NSOrderedSame;
--}
--
--void Browser::SetAppUserModelID(const base::string16& name) {}
--
--bool Browser::SetBadgeCount(int count) {
--  DockSetBadgeText(count != 0 ? base::IntToString(count) : "");
--  badge_count_ = count;
--  return true;
--}
--
--void Browser::SetUserActivity(const std::string& type,
--                              const base::DictionaryValue& user_info,
--                              mate::Arguments* args) {
--  std::string url_string;
--  args->GetNext(&url_string);
--
--  [[AtomApplication sharedApplication]
--      setCurrentActivity:base::SysUTF8ToNSString(type)
--            withUserInfo:DictionaryValueToNSDictionary(user_info)
--          withWebpageURL:net::NSURLWithGURL(GURL(url_string))];
--}
--
--std::string Browser::GetCurrentActivityType() {
--  if (@available(macOS 10.10, *)) {
--    NSUserActivity* userActivity =
--        [[AtomApplication sharedApplication] getCurrentActivity];
--    return base::SysNSStringToUTF8(userActivity.activityType);
--  } else {
--    return std::string();
--  }
--}
--
--void Browser::InvalidateCurrentActivity() {
--  [[AtomApplication sharedApplication] invalidateCurrentActivity];
--}
--
--void Browser::UpdateCurrentActivity(const std::string& type,
--                                    const base::DictionaryValue& user_info) {
--  [[AtomApplication sharedApplication]
--      updateCurrentActivity:base::SysUTF8ToNSString(type)
--               withUserInfo:DictionaryValueToNSDictionary(user_info)];
--}
--
--bool Browser::WillContinueUserActivity(const std::string& type) {
--  bool prevent_default = false;
--  for (BrowserObserver& observer : observers_)
--    observer.OnWillContinueUserActivity(&prevent_default, type);
--  return prevent_default;
--}
--
--void Browser::DidFailToContinueUserActivity(const std::string& type,
--                                            const std::string& error) {
--  for (BrowserObserver& observer : observers_)
--    observer.OnDidFailToContinueUserActivity(type, error);
--}
--
--bool Browser::ContinueUserActivity(const std::string& type,
--                                   const base::DictionaryValue& user_info) {
--  bool prevent_default = false;
--  for (BrowserObserver& observer : observers_)
--    observer.OnContinueUserActivity(&prevent_default, type, user_info);
--  return prevent_default;
--}
--
--void Browser::UserActivityWasContinued(const std::string& type,
--                                       const base::DictionaryValue& user_info) {
--  for (BrowserObserver& observer : observers_)
--    observer.OnUserActivityWasContinued(type, user_info);
--}
--
--bool Browser::UpdateUserActivityState(const std::string& type,
--                                      const base::DictionaryValue& user_info) {
--  bool prevent_default = false;
--  for (BrowserObserver& observer : observers_)
--    observer.OnUpdateUserActivityState(&prevent_default, type, user_info);
--  return prevent_default;
--}
--
--Browser::LoginItemSettings Browser::GetLoginItemSettings(
--    const LoginItemSettings& options) {
--  LoginItemSettings settings;
--#if defined(MAS_BUILD)
--  settings.open_at_login = platform_util::GetLoginItemEnabled();
--#else
--  settings.open_at_login =
--      base::mac::CheckLoginItemStatus(&settings.open_as_hidden);
--  settings.restore_state = base::mac::WasLaunchedAsLoginItemRestoreState();
--  settings.opened_at_login = base::mac::WasLaunchedAsLoginOrResumeItem();
--  settings.opened_as_hidden = base::mac::WasLaunchedAsHiddenLoginItem();
--#endif
--  return settings;
--}
--
--void Browser::SetLoginItemSettings(LoginItemSettings settings) {
--#if defined(MAS_BUILD)
--  platform_util::SetLoginItemEnabled(settings.open_at_login);
--#else
--  if (settings.open_at_login)
--    base::mac::AddToLoginItems(settings.open_as_hidden);
--  else
--    base::mac::RemoveFromLoginItems();
--#endif
--}
--
--std::string Browser::GetExecutableFileVersion() const {
--  return brightray::GetApplicationVersion();
--}
--
--std::string Browser::GetExecutableFileProductName() const {
--  return brightray::GetApplicationName();
--}
--
--int Browser::DockBounce(BounceType type) {
--  return [[AtomApplication sharedApplication]
--      requestUserAttention:static_cast<NSRequestUserAttentionType>(type)];
--}
--
--void Browser::DockCancelBounce(int request_id) {
--  [[AtomApplication sharedApplication] cancelUserAttentionRequest:request_id];
--}
--
--void Browser::DockSetBadgeText(const std::string& label) {
--  NSDockTile* tile = [[AtomApplication sharedApplication] dockTile];
--  [tile setBadgeLabel:base::SysUTF8ToNSString(label)];
--}
--
--void Browser::DockDownloadFinished(const std::string& filePath) {
--  [[NSDistributedNotificationCenter defaultCenter]
--      postNotificationName:@"com.apple.DownloadFileFinished"
--                    object:base::SysUTF8ToNSString(filePath)];
--}
--
--std::string Browser::DockGetBadgeText() {
--  NSDockTile* tile = [[AtomApplication sharedApplication] dockTile];
--  return base::SysNSStringToUTF8([tile badgeLabel]);
--}
--
--void Browser::DockHide() {
--  for (auto* const& window : WindowList::GetWindows())
--    [window->GetNativeWindow() setCanHide:NO];
--
--  ProcessSerialNumber psn = {0, kCurrentProcess};
--  TransformProcessType(&psn, kProcessTransformToUIElementApplication);
--}
--
--bool Browser::DockIsVisible() {
--  // Because DockShow has a slight delay this may not be true immediately
--  // after that call.
--  return ([[NSRunningApplication currentApplication] activationPolicy] ==
--          NSApplicationActivationPolicyRegular);
--}
--
--void Browser::DockShow() {
--  BOOL active = [[NSRunningApplication currentApplication] isActive];
--  ProcessSerialNumber psn = {0, kCurrentProcess};
--  if (active) {
--    // Workaround buggy behavior of TransformProcessType.
--    // http://stackoverflow.com/questions/7596643/
--    NSArray* runningApps = [NSRunningApplication
--        runningApplicationsWithBundleIdentifier:@"com.apple.dock"];
--    for (NSRunningApplication* app in runningApps) {
--      [app activateWithOptions:NSApplicationActivateIgnoringOtherApps];
--      break;
--    }
--    dispatch_time_t one_ms = dispatch_time(DISPATCH_TIME_NOW, USEC_PER_SEC);
--    dispatch_after(one_ms, dispatch_get_main_queue(), ^{
--      TransformProcessType(&psn, kProcessTransformToForegroundApplication);
--      dispatch_time_t one_ms = dispatch_time(DISPATCH_TIME_NOW, USEC_PER_SEC);
--      dispatch_after(one_ms, dispatch_get_main_queue(), ^{
--        [[NSRunningApplication currentApplication]
--            activateWithOptions:NSApplicationActivateIgnoringOtherApps];
--      });
--    });
--  } else {
--    TransformProcessType(&psn, kProcessTransformToForegroundApplication);
--  }
--}
--
--void Browser::DockSetMenu(AtomMenuModel* model) {
--  AtomApplicationDelegate* delegate =
--      (AtomApplicationDelegate*)[NSApp delegate];
--  [delegate setApplicationDockMenu:model];
--}
--
--void Browser::DockSetIcon(const gfx::Image& image) {
--  [[AtomApplication sharedApplication]
--      setApplicationIconImage:image.AsNSImage()];
--}
--
--void Browser::ShowAboutPanel() {
--  NSDictionary* options = DictionaryValueToNSDictionary(about_panel_options_);
--
--  // Credits must be a NSAttributedString instead of NSString
--  id credits = options[@"Credits"];
--  if (credits != nil) {
--    NSMutableDictionary* mutable_options = [options mutableCopy];
--    mutable_options[@"Credits"] = [[[NSAttributedString alloc]
--        initWithString:(NSString*)credits] autorelease];
--    options = [NSDictionary dictionaryWithDictionary:mutable_options];
--  }
--
--  [[AtomApplication sharedApplication]
--      orderFrontStandardAboutPanelWithOptions:options];
--}
--
--void Browser::SetAboutPanelOptions(const base::DictionaryValue& options) {
--  about_panel_options_.Clear();
--
--  // Upper case option keys for orderFrontStandardAboutPanelWithOptions format
--  for (base::DictionaryValue::Iterator iter(options); !iter.IsAtEnd();
--       iter.Advance()) {
--    std::string key = iter.key();
--    if (!key.empty() && iter.value().is_string()) {
--      key[0] = base::ToUpperASCII(key[0]);
--      about_panel_options_.SetString(key, iter.value().GetString());
--    }
--  }
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 da327eb90a02ef65b1df28bff1c5169585417aa0 atom/browser/browser_observer.h
-  our    100644 d518e8d6a7c6e8e30c09498883719a58c8a9f5e8 atom/browser/browser_observer.h
-@@ -1,91 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_BROWSER_OBSERVER_H_
--#define ATOM_BROWSER_BROWSER_OBSERVER_H_
--
--#include <string>
--
--#include "atom/browser/login_handler.h"
--#include "base/memory/scoped_refptr.h"
--#include "build/build_config.h"
--
--namespace base {
--class DictionaryValue;
--}
--
--namespace atom {
--
--class BrowserObserver {
-- public:
--  // The browser is about to close all windows.
--  virtual void OnBeforeQuit(bool* prevent_default) {}
--
--  // The browser has closed all windows and will quit.
--  virtual void OnWillQuit(bool* prevent_default) {}
--
--  // The browser has closed all windows. If the browser is quiting, then this
--  // method will not be called, instead it will call OnWillQuit.
--  virtual void OnWindowAllClosed() {}
--
--  // The browser is quitting.
--  virtual void OnQuit() {}
--
--  // The browser has opened a file by double clicking in Finder or dragging the
--  // file to the Dock icon. (macOS only)
--  virtual void OnOpenFile(bool* prevent_default, const std::string& file_path) {
--  }
--
--  // Browser is used to open a url.
--  virtual void OnOpenURL(const std::string& url) {}
--
--  // The browser is activated with visible/invisible windows (usually by
--  // clicking on the dock icon).
--  virtual void OnActivate(bool has_visible_windows) {}
--
--  // The browser has finished loading.
--  virtual void OnWillFinishLaunching() {}
--  virtual void OnFinishLaunching(const base::DictionaryValue& launch_info) {}
--
--  // The browser requests HTTP login.
--  virtual void OnLogin(scoped_refptr<LoginHandler> login_handler,
--                       const base::DictionaryValue& request_details) {}
--
--  // The browser's accessibility suppport has changed.
--  virtual void OnAccessibilitySupportChanged() {}
--
--  // The app message loop is ready
--  virtual void OnPreMainMessageLoopRun() {}
--
--#if defined(OS_MACOSX)
--  // The browser wants to report that an user activity will resume. (macOS only)
--  virtual void OnWillContinueUserActivity(bool* prevent_default,
--                                          const std::string& type) {}
--  // The browser wants to report an user activity resuming error. (macOS only)
--  virtual void OnDidFailToContinueUserActivity(const std::string& type,
--                                               const std::string& error) {}
--  // The browser wants to resume a user activity via handoff. (macOS only)
--  virtual void OnContinueUserActivity(bool* prevent_default,
--                                      const std::string& type,
--                                      const base::DictionaryValue& user_info) {}
--  // The browser wants to notify that an user activity was resumed. (macOS only)
--  virtual void OnUserActivityWasContinued(
--      const std::string& type,
--      const base::DictionaryValue& user_info) {}
--  // The browser wants to update an user activity payload. (macOS only)
--  virtual void OnUpdateUserActivityState(
--      bool* prevent_default,
--      const std::string& type,
--      const base::DictionaryValue& user_info) {}
--  // User clicked the native macOS new tab button. (macOS only)
--  virtual void OnNewWindowForTab() {}
--#endif
--
-- protected:
--  virtual ~BrowserObserver() {}
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_BROWSER_OBSERVER_H_
-removed in remote
-  base   100644 9531406f8cd46494099b7e432ac6e96d610f9eee atom/browser/browser_win.cc
-  our    100644 fc3b9f330a4958b0b1e30d41c2bebe091b135856 atom/browser/browser_win.cc
-@@ -1,346 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/browser.h"
--
--#include <windows.h>  // windows.h must be included first
--
--#include <atlbase.h>
--#include <shlobj.h>
--#include <shobjidl.h>
--
--#include "atom/browser/ui/win/jump_list.h"
--#include "atom/common/atom_version.h"
--#include "atom/common/native_mate_converters/string16_converter.h"
--#include "base/base_paths.h"
--#include "base/file_version_info.h"
--#include "base/files/file_path.h"
--#include "base/path_service.h"
--#include "base/strings/string_util.h"
--#include "base/strings/stringprintf.h"
--#include "base/strings/utf_string_conversions.h"
--#include "base/threading/thread_restrictions.h"
--#include "base/win/registry.h"
--#include "base/win/win_util.h"
--#include "base/win/windows_version.h"
--#include "brightray/common/application_info.h"
--
--namespace atom {
--
--namespace {
--
--BOOL CALLBACK WindowsEnumerationHandler(HWND hwnd, LPARAM param) {
--  DWORD target_process_id = *reinterpret_cast<DWORD*>(param);
--  DWORD process_id = 0;
--
--  GetWindowThreadProcessId(hwnd, &process_id);
--  if (process_id == target_process_id) {
--    SetFocus(hwnd);
--    return FALSE;
--  }
--
--  return TRUE;
--}
--
--bool GetProcessExecPath(base::string16* exe) {
--  base::FilePath path;
--  if (!PathService::Get(base::FILE_EXE, &path)) {
--    LOG(ERROR) << "Error getting app exe path";
--    return false;
--  }
--  *exe = path.value();
--  return true;
--}
--
--bool GetProtocolLaunchPath(mate::Arguments* args, base::string16* exe) {
--  if (!args->GetNext(exe) && !GetProcessExecPath(exe)) {
--    return false;
--  }
--
--  // Read in optional args arg
--  std::vector<base::string16> launch_args;
--  if (args->GetNext(&launch_args) && !launch_args.empty())
--    *exe = base::StringPrintf(L"\"%ls\" %ls \"%%1\"", exe->c_str(),
--                              base::JoinString(launch_args, L" ").c_str());
--  else
--    *exe = base::StringPrintf(L"\"%ls\" \"%%1\"", exe->c_str());
--  return true;
--}
--
--bool FormatCommandLineString(base::string16* exe,
--                             const std::vector<base::string16>& launch_args) {
--  if (exe->empty() && !GetProcessExecPath(exe)) {
--    return false;
--  }
--
--  if (!launch_args.empty()) {
--    *exe = base::StringPrintf(L"%ls %ls", exe->c_str(),
--                              base::JoinString(launch_args, L" ").c_str());
--  }
--
--  return true;
--}
--
--}  // namespace
--
--Browser::UserTask::UserTask() = default;
--Browser::UserTask::UserTask(const UserTask&) = default;
--Browser::UserTask::~UserTask() = default;
--
--void Browser::Focus() {
--  // On Windows we just focus on the first window found for this process.
--  DWORD pid = GetCurrentProcessId();
--  EnumWindows(&WindowsEnumerationHandler, reinterpret_cast<LPARAM>(&pid));
--}
--
--void Browser::AddRecentDocument(const base::FilePath& path) {
--  if (base::win::GetVersion() < base::win::VERSION_WIN7)
--    return;
--
--  CComPtr<IShellItem> item;
--  HRESULT hr = SHCreateItemFromParsingName(path.value().c_str(), NULL,
--                                           IID_PPV_ARGS(&item));
--  if (SUCCEEDED(hr)) {
--    SHARDAPPIDINFO info;
--    info.psi = item;
--    info.pszAppID = GetAppUserModelID();
--    SHAddToRecentDocs(SHARD_APPIDINFO, &info);
--  }
--}
--
--void Browser::ClearRecentDocuments() {
--  CComPtr<IApplicationDestinations> destinations;
--  if (FAILED(destinations.CoCreateInstance(CLSID_ApplicationDestinations, NULL,
--                                           CLSCTX_INPROC_SERVER)))
--    return;
--  if (FAILED(destinations->SetAppID(GetAppUserModelID())))
--    return;
--  destinations->RemoveAllDestinations();
--}
--
--void Browser::SetAppUserModelID(const base::string16& name) {
--  brightray::SetAppUserModelID(name);
--}
--
--bool Browser::SetUserTasks(const std::vector<UserTask>& tasks) {
--  JumpList jump_list(GetAppUserModelID());
--  if (!jump_list.Begin())
--    return false;
--
--  JumpListCategory category;
--  category.type = JumpListCategory::Type::TASKS;
--  category.items.reserve(tasks.size());
--  JumpListItem item;
--  item.type = JumpListItem::Type::TASK;
--  for (const auto& task : tasks) {
--    item.title = task.title;
--    item.path = task.program;
--    item.arguments = task.arguments;
--    item.icon_path = task.icon_path;
--    item.icon_index = task.icon_index;
--    item.description = task.description;
--    category.items.push_back(item);
--  }
--
--  jump_list.AppendCategory(category);
--  return jump_list.Commit();
--}
--
--bool Browser::RemoveAsDefaultProtocolClient(const std::string& protocol,
--                                            mate::Arguments* args) {
--  if (protocol.empty())
--    return false;
--
--  // Main Registry Key
--  HKEY root = HKEY_CURRENT_USER;
--  base::string16 keyPath = L"Software\\Classes\\";
--
--  // Command Key
--  base::string16 wprotocol = base::UTF8ToUTF16(protocol);
--  base::string16 shellPath = wprotocol + L"\\shell";
--  base::string16 cmdPath = keyPath + shellPath + L"\\open\\command";
--
--  base::win::RegKey classesKey;
--  base::win::RegKey commandKey;
--
--  if (FAILED(classesKey.Open(root, keyPath.c_str(), KEY_ALL_ACCESS)))
--    // Classes key doesn't exist, that's concerning, but I guess
--    // we're not the default handler
--    return true;
--
--  if (FAILED(commandKey.Open(root, cmdPath.c_str(), KEY_ALL_ACCESS)))
--    // Key doesn't even exist, we can confirm that it is not set
--    return true;
--
--  base::string16 keyVal;
--  if (FAILED(commandKey.ReadValue(L"", &keyVal)))
--    // Default value not set, we can confirm that it is not set
--    return true;
--
--  base::string16 exe;
--  if (!GetProtocolLaunchPath(args, &exe))
--    return false;
--
--  if (keyVal == exe) {
--    // Let's kill the key
--    if (FAILED(classesKey.DeleteKey(shellPath.c_str())))
--      return false;
--
--    // Let's clean up after ourselves
--    base::win::RegKey protocolKey;
--    base::string16 protocolPath = keyPath + wprotocol;
--
--    if (SUCCEEDED(
--            protocolKey.Open(root, protocolPath.c_str(), KEY_ALL_ACCESS))) {
--      protocolKey.DeleteValue(L"URL Protocol");
--
--      // Overwrite the default value to be empty, we can't delete it right away
--      protocolKey.WriteValue(L"", L"");
--      protocolKey.DeleteValue(L"");
--    }
--
--    // If now empty, delete the whole key
--    classesKey.DeleteEmptyKey(wprotocol.c_str());
--
--    return true;
--  } else {
--    return true;
--  }
--}
--
--bool Browser::SetAsDefaultProtocolClient(const std::string& protocol,
--                                         mate::Arguments* args) {
--  // HKEY_CLASSES_ROOT
--  //    $PROTOCOL
--  //       (Default) = "URL:$NAME"
--  //       URL Protocol = ""
--  //       shell
--  //          open
--  //             command
--  //                (Default) = "$COMMAND" "%1"
--  //
--  // However, the "HKEY_CLASSES_ROOT" key can only be written by the
--  // Administrator user. So, we instead write to "HKEY_CURRENT_USER\
--  // Software\Classes", which is inherited by "HKEY_CLASSES_ROOT"
--  // anyway, and can be written by unprivileged users.
--
--  if (protocol.empty())
--    return false;
--
--  base::string16 exe;
--  if (!GetProtocolLaunchPath(args, &exe))
--    return false;
--
--  // Main Registry Key
--  HKEY root = HKEY_CURRENT_USER;
--  base::string16 keyPath = base::UTF8ToUTF16("Software\\Classes\\" + protocol);
--  base::string16 urlDecl = base::UTF8ToUTF16("URL:" + protocol);
--
--  // Command Key
--  base::string16 cmdPath = keyPath + L"\\shell\\open\\command";
--
--  // Write information to registry
--  base::win::RegKey key(root, keyPath.c_str(), KEY_ALL_ACCESS);
--  if (FAILED(key.WriteValue(L"URL Protocol", L"")) ||
--      FAILED(key.WriteValue(L"", urlDecl.c_str())))
--    return false;
--
--  base::win::RegKey commandKey(root, cmdPath.c_str(), KEY_ALL_ACCESS);
--  if (FAILED(commandKey.WriteValue(L"", exe.c_str())))
--    return false;
--
--  return true;
--}
--
--bool Browser::IsDefaultProtocolClient(const std::string& protocol,
--                                      mate::Arguments* args) {
--  if (protocol.empty())
--    return false;
--
--  base::string16 exe;
--  if (!GetProtocolLaunchPath(args, &exe))
--    return false;
--
--  // Main Registry Key
--  HKEY root = HKEY_CURRENT_USER;
--  base::string16 keyPath = base::UTF8ToUTF16("Software\\Classes\\" + protocol);
--
--  // Command Key
--  base::string16 cmdPath = keyPath + L"\\shell\\open\\command";
--
--  base::win::RegKey key;
--  base::win::RegKey commandKey;
--  if (FAILED(key.Open(root, keyPath.c_str(), KEY_ALL_ACCESS)))
--    // Key doesn't exist, we can confirm that it is not set
--    return false;
--
--  if (FAILED(commandKey.Open(root, cmdPath.c_str(), KEY_ALL_ACCESS)))
--    // Key doesn't exist, we can confirm that it is not set
--    return false;
--
--  base::string16 keyVal;
--  if (FAILED(commandKey.ReadValue(L"", &keyVal)))
--    // Default value not set, we can confirm that it is not set
--    return false;
--
--  // Default value is the same as current file path
--  return keyVal == exe;
--}
--
--bool Browser::SetBadgeCount(int count) {
--  return false;
--}
--
--void Browser::SetLoginItemSettings(LoginItemSettings settings) {
--  base::string16 keyPath = L"Software\\Microsoft\\Windows\\CurrentVersion\\Run";
--  base::win::RegKey key(HKEY_CURRENT_USER, keyPath.c_str(), KEY_ALL_ACCESS);
--
--  if (settings.open_at_login) {
--    base::string16 exe = settings.path;
--    if (FormatCommandLineString(&exe, settings.args)) {
--      key.WriteValue(GetAppUserModelID(), exe.c_str());
--    }
--  } else {
--    key.DeleteValue(GetAppUserModelID());
--  }
--}
--
--Browser::LoginItemSettings Browser::GetLoginItemSettings(
--    const LoginItemSettings& options) {
--  LoginItemSettings settings;
--  base::string16 keyPath = L"Software\\Microsoft\\Windows\\CurrentVersion\\Run";
--  base::win::RegKey key(HKEY_CURRENT_USER, keyPath.c_str(), KEY_ALL_ACCESS);
--  base::string16 keyVal;
--
--  if (!FAILED(key.ReadValue(GetAppUserModelID(), &keyVal))) {
--    base::string16 exe = options.path;
--    if (FormatCommandLineString(&exe, options.args)) {
--      settings.open_at_login = keyVal == exe;
--    }
--  }
--
--  return settings;
--}
--
--PCWSTR Browser::GetAppUserModelID() {
--  return brightray::GetRawAppUserModelID();
--}
--
--std::string Browser::GetExecutableFileVersion() const {
--  base::FilePath path;
--  if (PathService::Get(base::FILE_EXE, &path)) {
--    base::ThreadRestrictions::ScopedAllowIO allow_io;
--    std::unique_ptr<FileVersionInfo> version_info(
--        FileVersionInfo::CreateFileVersionInfo(path));
--    return base::UTF16ToUTF8(version_info->product_version());
--  }
--
--  return ATOM_VERSION_STRING;
--}
--
--std::string Browser::GetExecutableFileProductName() const {
--  return brightray::GetApplicationName();
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 62e854ac5655fb96bc5e3191425528e0ca222d96 atom/browser/common_web_contents_delegate.cc
-  our    100644 b3b1195e044cd2c74b246aa13e9e85953d694477 atom/browser/common_web_contents_delegate.cc
-@@ -1,536 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/common_web_contents_delegate.h"
--
--#include <set>
--#include <string>
--#include <vector>
--
--#include "atom/browser/atom_browser_context.h"
--#include "atom/browser/native_window.h"
--#include "atom/browser/ui/file_dialog.h"
--#include "atom/browser/web_contents_preferences.h"
--#include "atom/browser/web_dialog_helper.h"
--#include "atom/common/atom_constants.h"
--#include "atom/common/options_switches.h"
--#include "base/files/file_util.h"
--#include "base/task_scheduler/post_task.h"
--#include "base/threading/sequenced_task_runner_handle.h"
--#include "chrome/browser/printing/print_preview_message_handler.h"
--#include "chrome/browser/printing/print_view_manager_basic.h"
--#include "chrome/browser/ssl/security_state_tab_helper.h"
--#include "chrome/browser/ui/browser_dialogs.h"
--#include "chrome/common/pref_names.h"
--#include "components/prefs/pref_service.h"
--#include "components/prefs/scoped_user_pref_update.h"
--#include "components/security_state/content/content_utils.h"
--#include "components/security_state/core/security_state.h"
--#include "content/public/browser/browser_thread.h"
--#include "content/public/browser/child_process_security_policy.h"
--#include "content/public/browser/render_process_host.h"
--#include "content/public/browser/render_view_host.h"
--#include "content/public/browser/render_widget_host.h"
--#include "content/public/browser/security_style_explanation.h"
--#include "content/public/browser/security_style_explanations.h"
--#include "storage/browser/fileapi/isolated_context.h"
--
--using content::BrowserThread;
--
--namespace atom {
--
--namespace {
--
--const char kRootName[] = "<root>";
--
--struct FileSystem {
--  FileSystem() {}
--  FileSystem(const std::string& file_system_name,
--             const std::string& root_url,
--             const std::string& file_system_path)
--      : file_system_name(file_system_name),
--        root_url(root_url),
--        file_system_path(file_system_path) {}
--
--  std::string file_system_name;
--  std::string root_url;
--  std::string file_system_path;
--};
--
--std::string RegisterFileSystem(content::WebContents* web_contents,
--                               const base::FilePath& path) {
--  auto* isolated_context = storage::IsolatedContext::GetInstance();
--  std::string root_name(kRootName);
--  std::string file_system_id = isolated_context->RegisterFileSystemForPath(
--      storage::kFileSystemTypeNativeLocal, std::string(), path, &root_name);
--
--  content::ChildProcessSecurityPolicy* policy =
--      content::ChildProcessSecurityPolicy::GetInstance();
--  content::RenderViewHost* render_view_host = web_contents->GetRenderViewHost();
--  int renderer_id = render_view_host->GetProcess()->GetID();
--  policy->GrantReadFileSystem(renderer_id, file_system_id);
--  policy->GrantWriteFileSystem(renderer_id, file_system_id);
--  policy->GrantCreateFileForFileSystem(renderer_id, file_system_id);
--  policy->GrantDeleteFromFileSystem(renderer_id, file_system_id);
--
--  if (!policy->CanReadFile(renderer_id, path))
--    policy->GrantReadFile(renderer_id, path);
--
--  return file_system_id;
--}
--
--FileSystem CreateFileSystemStruct(content::WebContents* web_contents,
--                                  const std::string& file_system_id,
--                                  const std::string& file_system_path) {
--  const GURL origin = web_contents->GetURL().GetOrigin();
--  std::string file_system_name =
--      storage::GetIsolatedFileSystemName(origin, file_system_id);
--  std::string root_url = storage::GetIsolatedFileSystemRootURIString(
--      origin, file_system_id, kRootName);
--  return FileSystem(file_system_name, root_url, file_system_path);
--}
--
--std::unique_ptr<base::DictionaryValue> CreateFileSystemValue(
--    const FileSystem& file_system) {
--  std::unique_ptr<base::DictionaryValue> file_system_value(
--      new base::DictionaryValue());
--  file_system_value->SetString("fileSystemName", file_system.file_system_name);
--  file_system_value->SetString("rootURL", file_system.root_url);
--  file_system_value->SetString("fileSystemPath", file_system.file_system_path);
--  return file_system_value;
--}
--
--void WriteToFile(const base::FilePath& path, const std::string& content) {
--  base::AssertBlockingAllowed();
--  DCHECK(!path.empty());
--
--  base::WriteFile(path, content.data(), content.size());
--}
--
--void AppendToFile(const base::FilePath& path, const std::string& content) {
--  base::AssertBlockingAllowed();
--  DCHECK(!path.empty());
--
--  base::AppendToFile(path, content.data(), content.size());
--}
--
--PrefService* GetPrefService(content::WebContents* web_contents) {
--  auto* context = web_contents->GetBrowserContext();
--  return static_cast<atom::AtomBrowserContext*>(context)->prefs();
--}
--
--std::set<std::string> GetAddedFileSystemPaths(
--    content::WebContents* web_contents) {
--  auto* pref_service = GetPrefService(web_contents);
--  const base::DictionaryValue* file_system_paths_value =
--      pref_service->GetDictionary(prefs::kDevToolsFileSystemPaths);
--  std::set<std::string> result;
--  if (file_system_paths_value) {
--    base::DictionaryValue::Iterator it(*file_system_paths_value);
--    for (; !it.IsAtEnd(); it.Advance()) {
--      result.insert(it.key());
--    }
--  }
--  return result;
--}
--
--bool IsDevToolsFileSystemAdded(content::WebContents* web_contents,
--                               const std::string& file_system_path) {
--  auto file_system_paths = GetAddedFileSystemPaths(web_contents);
--  return file_system_paths.find(file_system_path) != file_system_paths.end();
--}
--
--}  // namespace
--
--CommonWebContentsDelegate::CommonWebContentsDelegate()
--    : devtools_file_system_indexer_(new DevToolsFileSystemIndexer),
--      file_task_runner_(
--          base::CreateSequencedTaskRunnerWithTraits({base::MayBlock()})) {}
--
--CommonWebContentsDelegate::~CommonWebContentsDelegate() {}
--
--void CommonWebContentsDelegate::InitWithWebContents(
--    content::WebContents* web_contents,
--    AtomBrowserContext* browser_context,
--    bool is_guest) {
--  browser_context_ = browser_context;
--  web_contents->SetDelegate(this);
--
--  printing::PrintViewManagerBasic::CreateForWebContents(web_contents);
--  printing::PrintPreviewMessageHandler::CreateForWebContents(web_contents);
--
--  // Determien whether the WebContents is offscreen.
--  auto* web_preferences = WebContentsPreferences::From(web_contents);
--  offscreen_ =
--      !web_preferences || web_preferences->IsEnabled(options::kOffscreen);
--
--  // Create InspectableWebContents.
--  web_contents_.reset(
--      brightray::InspectableWebContents::Create(web_contents, is_guest));
--  web_contents_->SetDelegate(this);
--}
--
--void CommonWebContentsDelegate::SetOwnerWindow(NativeWindow* owner_window) {
--  SetOwnerWindow(GetWebContents(), owner_window);
--}
--
--void CommonWebContentsDelegate::SetOwnerWindow(
--    content::WebContents* web_contents,
--    NativeWindow* owner_window) {
--  owner_window_ = owner_window ? owner_window->GetWeakPtr() : nullptr;
--  auto relay = std::make_unique<NativeWindowRelay>(owner_window_);
--  auto* relay_key = relay->key;
--  if (owner_window) {
--#if defined(TOOLKIT_VIEWS) && !defined(OS_MACOSX)
--    autofill_popup_.reset(new AutofillPopup());
--#endif
--    web_contents->SetUserData(relay_key, std::move(relay));
--  } else {
--    web_contents->RemoveUserData(relay_key);
--    relay.reset();
--  }
--}
--
--void CommonWebContentsDelegate::ResetManagedWebContents(bool async) {
--  if (async) {
--    base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE,
--                                                    web_contents_.release());
--  } else {
--    web_contents_.reset();
--  }
--}
--
--content::WebContents* CommonWebContentsDelegate::GetWebContents() const {
--  if (!web_contents_)
--    return nullptr;
--  return web_contents_->GetWebContents();
--}
--
--content::WebContents* CommonWebContentsDelegate::GetDevToolsWebContents()
--    const {
--  if (!web_contents_)
--    return nullptr;
--  return web_contents_->GetDevToolsWebContents();
--}
--
--content::WebContents* CommonWebContentsDelegate::OpenURLFromTab(
--    content::WebContents* source,
--    const content::OpenURLParams& params) {
--  content::NavigationController::LoadURLParams load_url_params(params.url);
--  load_url_params.referrer = params.referrer;
--  load_url_params.transition_type = params.transition;
--  load_url_params.extra_headers = params.extra_headers;
--  load_url_params.should_replace_current_entry =
--      params.should_replace_current_entry;
--  load_url_params.is_renderer_initiated = params.is_renderer_initiated;
--  load_url_params.should_clear_history_list = true;
--
--  source->GetController().LoadURLWithParams(load_url_params);
--  return source;
--}
--
--bool CommonWebContentsDelegate::CanOverscrollContent() const {
--  return false;
--}
--
--content::ColorChooser* CommonWebContentsDelegate::OpenColorChooser(
--    content::WebContents* web_contents,
--    SkColor color,
--    const std::vector<blink::mojom::ColorSuggestionPtr>& suggestions) {
--  return chrome::ShowColorChooser(web_contents, color);
--}
--
--void CommonWebContentsDelegate::RunFileChooser(
--    content::RenderFrameHost* render_frame_host,
--    const content::FileChooserParams& params) {
--  if (!web_dialog_helper_)
--    web_dialog_helper_.reset(new WebDialogHelper(owner_window(), offscreen_));
--  web_dialog_helper_->RunFileChooser(render_frame_host, params);
--}
--
--void CommonWebContentsDelegate::EnumerateDirectory(content::WebContents* guest,
--                                                   int request_id,
--                                                   const base::FilePath& path) {
--  if (!web_dialog_helper_)
--    web_dialog_helper_.reset(new WebDialogHelper(owner_window(), offscreen_));
--  web_dialog_helper_->EnumerateDirectory(guest, request_id, path);
--}
--
--void CommonWebContentsDelegate::EnterFullscreenModeForTab(
--    content::WebContents* source,
--    const GURL& origin) {
--  if (!owner_window_)
--    return;
--  SetHtmlApiFullscreen(true);
--  owner_window_->NotifyWindowEnterHtmlFullScreen();
--  source->GetRenderViewHost()->GetWidget()->WasResized();
--}
--
--void CommonWebContentsDelegate::ExitFullscreenModeForTab(
--    content::WebContents* source) {
--  if (!owner_window_)
--    return;
--  SetHtmlApiFullscreen(false);
--  owner_window_->NotifyWindowLeaveHtmlFullScreen();
--  source->GetRenderViewHost()->GetWidget()->WasResized();
--}
--
--bool CommonWebContentsDelegate::IsFullscreenForTabOrPending(
--    const content::WebContents* source) const {
--  return html_fullscreen_;
--}
--
--blink::WebSecurityStyle CommonWebContentsDelegate::GetSecurityStyle(
--    content::WebContents* web_contents,
--    content::SecurityStyleExplanations* security_style_explanations) {
--  SecurityStateTabHelper* helper =
--      SecurityStateTabHelper::FromWebContents(web_contents);
--  DCHECK(helper);
--  security_state::SecurityInfo security_info;
--  helper->GetSecurityInfo(&security_info);
--  return security_state::GetSecurityStyle(security_info,
--                                          security_style_explanations);
--}
--
--void CommonWebContentsDelegate::DevToolsSaveToFile(const std::string& url,
--                                                   const std::string& content,
--                                                   bool save_as) {
--  base::FilePath path;
--  auto it = saved_files_.find(url);
--  if (it != saved_files_.end() && !save_as) {
--    path = it->second;
--  } else {
--    file_dialog::DialogSettings settings;
--    settings.parent_window = owner_window();
--    settings.force_detached = offscreen_;
--    settings.title = url;
--    settings.default_path = base::FilePath::FromUTF8Unsafe(url);
--    if (!file_dialog::ShowSaveDialog(settings, &path)) {
--      base::Value url_value(url);
--      web_contents_->CallClientFunction("DevToolsAPI.canceledSaveURL",
--                                        &url_value, nullptr, nullptr);
--      return;
--    }
--  }
--
--  saved_files_[url] = path;
--  // Notify DevTools.
--  base::Value url_value(url);
--  base::Value file_system_path_value(path.AsUTF8Unsafe());
--  web_contents_->CallClientFunction("DevToolsAPI.savedURL", &url_value,
--                                    &file_system_path_value, nullptr);
--  file_task_runner_->PostTask(FROM_HERE,
--                              base::BindOnce(&WriteToFile, path, content));
--}
--
--void CommonWebContentsDelegate::DevToolsAppendToFile(
--    const std::string& url,
--    const std::string& content) {
--  auto it = saved_files_.find(url);
--  if (it == saved_files_.end())
--    return;
--
--  // Notify DevTools.
--  base::Value url_value(url);
--  web_contents_->CallClientFunction("DevToolsAPI.appendedToURL", &url_value,
--                                    nullptr, nullptr);
--  file_task_runner_->PostTask(
--      FROM_HERE, base::BindOnce(&AppendToFile, it->second, content));
--}
--
--void CommonWebContentsDelegate::DevToolsRequestFileSystems() {
--  auto file_system_paths = GetAddedFileSystemPaths(GetDevToolsWebContents());
--  if (file_system_paths.empty()) {
--    base::ListValue empty_file_system_value;
--    web_contents_->CallClientFunction("DevToolsAPI.fileSystemsLoaded",
--                                      &empty_file_system_value, nullptr,
--                                      nullptr);
--    return;
--  }
--
--  std::vector<FileSystem> file_systems;
--  for (const auto& file_system_path : file_system_paths) {
--    base::FilePath path = base::FilePath::FromUTF8Unsafe(file_system_path);
--    std::string file_system_id =
--        RegisterFileSystem(GetDevToolsWebContents(), path);
--    FileSystem file_system = CreateFileSystemStruct(
--        GetDevToolsWebContents(), file_system_id, file_system_path);
--    file_systems.push_back(file_system);
--  }
--
--  base::ListValue file_system_value;
--  for (const auto& file_system : file_systems)
--    file_system_value.Append(CreateFileSystemValue(file_system));
--  web_contents_->CallClientFunction("DevToolsAPI.fileSystemsLoaded",
--                                    &file_system_value, nullptr, nullptr);
--}
--
--void CommonWebContentsDelegate::DevToolsAddFileSystem(
--    const base::FilePath& file_system_path) {
--  base::FilePath path = file_system_path;
--  if (path.empty()) {
--    std::vector<base::FilePath> paths;
--    file_dialog::DialogSettings settings;
--    settings.parent_window = owner_window();
--    settings.force_detached = offscreen_;
--    settings.properties = file_dialog::FILE_DIALOG_OPEN_DIRECTORY;
--    if (!file_dialog::ShowOpenDialog(settings, &paths))
--      return;
--
--    path = paths[0];
--  }
--
--  std::string file_system_id =
--      RegisterFileSystem(GetDevToolsWebContents(), path);
--  if (IsDevToolsFileSystemAdded(GetDevToolsWebContents(), path.AsUTF8Unsafe()))
--    return;
--
--  FileSystem file_system = CreateFileSystemStruct(
--      GetDevToolsWebContents(), file_system_id, path.AsUTF8Unsafe());
--  std::unique_ptr<base::DictionaryValue> file_system_value(
--      CreateFileSystemValue(file_system));
--
--  auto* pref_service = GetPrefService(GetDevToolsWebContents());
--  DictionaryPrefUpdate update(pref_service, prefs::kDevToolsFileSystemPaths);
--  update.Get()->SetWithoutPathExpansion(path.AsUTF8Unsafe(),
--                                        std::make_unique<base::Value>());
--
--  web_contents_->CallClientFunction("DevToolsAPI.fileSystemAdded",
--                                    file_system_value.get(), nullptr, nullptr);
--}
--
--void CommonWebContentsDelegate::DevToolsRemoveFileSystem(
--    const base::FilePath& file_system_path) {
--  if (!web_contents_)
--    return;
--
--  std::string path = file_system_path.AsUTF8Unsafe();
--  storage::IsolatedContext::GetInstance()->RevokeFileSystemByPath(
--      file_system_path);
--
--  auto* pref_service = GetPrefService(GetDevToolsWebContents());
--  DictionaryPrefUpdate update(pref_service, prefs::kDevToolsFileSystemPaths);
--  update.Get()->RemoveWithoutPathExpansion(path, nullptr);
--
--  base::Value file_system_path_value(path);
--  web_contents_->CallClientFunction("DevToolsAPI.fileSystemRemoved",
--                                    &file_system_path_value, nullptr, nullptr);
--}
--
--void CommonWebContentsDelegate::DevToolsIndexPath(
--    int request_id,
--    const std::string& file_system_path) {
--  if (!IsDevToolsFileSystemAdded(GetDevToolsWebContents(), file_system_path)) {
--    OnDevToolsIndexingDone(request_id, file_system_path);
--    return;
--  }
--  if (devtools_indexing_jobs_.count(request_id) != 0)
--    return;
--  devtools_indexing_jobs_[request_id] =
--      scoped_refptr<DevToolsFileSystemIndexer::FileSystemIndexingJob>(
--          devtools_file_system_indexer_->IndexPath(
--              file_system_path,
--              base::Bind(
--                  &CommonWebContentsDelegate::OnDevToolsIndexingWorkCalculated,
--                  base::Unretained(this), request_id, file_system_path),
--              base::Bind(&CommonWebContentsDelegate::OnDevToolsIndexingWorked,
--                         base::Unretained(this), request_id, file_system_path),
--              base::Bind(&CommonWebContentsDelegate::OnDevToolsIndexingDone,
--                         base::Unretained(this), request_id,
--                         file_system_path)));
--}
--
--void CommonWebContentsDelegate::DevToolsStopIndexing(int request_id) {
--  auto it = devtools_indexing_jobs_.find(request_id);
--  if (it == devtools_indexing_jobs_.end())
--    return;
--  it->second->Stop();
--  devtools_indexing_jobs_.erase(it);
--}
--
--void CommonWebContentsDelegate::DevToolsSearchInPath(
--    int request_id,
--    const std::string& file_system_path,
--    const std::string& query) {
--  if (!IsDevToolsFileSystemAdded(GetDevToolsWebContents(), file_system_path)) {
--    OnDevToolsSearchCompleted(request_id, file_system_path,
--                              std::vector<std::string>());
--    return;
--  }
--  devtools_file_system_indexer_->SearchInPath(
--      file_system_path, query,
--      base::Bind(&CommonWebContentsDelegate::OnDevToolsSearchCompleted,
--                 base::Unretained(this), request_id, file_system_path));
--}
--
--void CommonWebContentsDelegate::OnDevToolsIndexingWorkCalculated(
--    int request_id,
--    const std::string& file_system_path,
--    int total_work) {
--  base::Value request_id_value(request_id);
--  base::Value file_system_path_value(file_system_path);
--  base::Value total_work_value(total_work);
--  web_contents_->CallClientFunction("DevToolsAPI.indexingTotalWorkCalculated",
--                                    &request_id_value, &file_system_path_value,
--                                    &total_work_value);
--}
--
--void CommonWebContentsDelegate::OnDevToolsIndexingWorked(
--    int request_id,
--    const std::string& file_system_path,
--    int worked) {
--  base::Value request_id_value(request_id);
--  base::Value file_system_path_value(file_system_path);
--  base::Value worked_value(worked);
--  web_contents_->CallClientFunction("DevToolsAPI.indexingWorked",
--                                    &request_id_value, &file_system_path_value,
--                                    &worked_value);
--}
--
--void CommonWebContentsDelegate::OnDevToolsIndexingDone(
--    int request_id,
--    const std::string& file_system_path) {
--  devtools_indexing_jobs_.erase(request_id);
--  base::Value request_id_value(request_id);
--  base::Value file_system_path_value(file_system_path);
--  web_contents_->CallClientFunction("DevToolsAPI.indexingDone",
--                                    &request_id_value, &file_system_path_value,
--                                    nullptr);
--}
--
--void CommonWebContentsDelegate::OnDevToolsSearchCompleted(
--    int request_id,
--    const std::string& file_system_path,
--    const std::vector<std::string>& file_paths) {
--  base::ListValue file_paths_value;
--  for (const auto& file_path : file_paths) {
--    file_paths_value.AppendString(file_path);
--  }
--  base::Value request_id_value(request_id);
--  base::Value file_system_path_value(file_system_path);
--  web_contents_->CallClientFunction("DevToolsAPI.searchCompleted",
--                                    &request_id_value, &file_system_path_value,
--                                    &file_paths_value);
--}
--
--void CommonWebContentsDelegate::SetHtmlApiFullscreen(bool enter_fullscreen) {
--  // Window is already in fullscreen mode, save the state.
--  if (enter_fullscreen && owner_window_->IsFullscreen()) {
--    native_fullscreen_ = true;
--    html_fullscreen_ = true;
--    return;
--  }
--
--  // Exit html fullscreen state but not window's fullscreen mode.
--  if (!enter_fullscreen && native_fullscreen_) {
--    html_fullscreen_ = false;
--    return;
--  }
--
--  owner_window_->SetFullScreen(enter_fullscreen);
--  html_fullscreen_ = enter_fullscreen;
--  native_fullscreen_ = false;
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 61ff63793df5f1b83155aa56d64a7da6b34fa7da atom/browser/common_web_contents_delegate.h
-  our    100644 5da5d20975b8e795e34c9d8c7649f6f0eb3d0a50 atom/browser/common_web_contents_delegate.h
-@@ -1,202 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_COMMON_WEB_CONTENTS_DELEGATE_H_
--#define ATOM_BROWSER_COMMON_WEB_CONTENTS_DELEGATE_H_
--
--#include <map>
--#include <string>
--#include <vector>
--
--#include "brightray/browser/devtools_file_system_indexer.h"
--#include "brightray/browser/inspectable_web_contents_delegate.h"
--#include "brightray/browser/inspectable_web_contents_impl.h"
--#include "brightray/browser/inspectable_web_contents_view_delegate.h"
--#include "content/public/browser/web_contents_delegate.h"
--
--#if defined(TOOLKIT_VIEWS) && !defined(OS_MACOSX)
--#include "atom/browser/ui/autofill_popup.h"
--#endif
--
--using brightray::DevToolsFileSystemIndexer;
--
--namespace base {
--class SequencedTaskRunner;
--}
--
--namespace atom {
--
--class AtomBrowserContext;
--class NativeWindow;
--class WebDialogHelper;
--
--class CommonWebContentsDelegate
--    : public content::WebContentsDelegate,
--      public brightray::InspectableWebContentsDelegate,
--      public brightray::InspectableWebContentsViewDelegate {
-- public:
--  CommonWebContentsDelegate();
--  ~CommonWebContentsDelegate() override;
--
--  // Creates a InspectableWebContents object and takes onwership of
--  // |web_contents|.
--  void InitWithWebContents(content::WebContents* web_contents,
--                           AtomBrowserContext* browser_context,
--                           bool is_guest);
--
--  // Set the window as owner window.
--  void SetOwnerWindow(NativeWindow* owner_window);
--  void SetOwnerWindow(content::WebContents* web_contents,
--                      NativeWindow* owner_window);
--
--  // Returns the WebContents managed by this delegate.
--  content::WebContents* GetWebContents() const;
--
--  // Returns the WebContents of devtools.
--  content::WebContents* GetDevToolsWebContents() const;
--
--  brightray::InspectableWebContents* managed_web_contents() const {
--    return web_contents_.get();
--  }
--
--  NativeWindow* owner_window() const { return owner_window_.get(); }
--
--  void set_ignore_menu_shortcuts(bool ignore) {
--    ignore_menu_shortcuts_ = ignore;
--  }
--
--  bool is_html_fullscreen() const { return html_fullscreen_; }
--
-- protected:
--  // content::WebContentsDelegate:
--  content::WebContents* OpenURLFromTab(
--      content::WebContents* source,
--      const content::OpenURLParams& params) override;
--  bool CanOverscrollContent() const override;
--  content::ColorChooser* OpenColorChooser(
--      content::WebContents* web_contents,
--      SkColor color,
--      const std::vector<blink::mojom::ColorSuggestionPtr>& suggestions)
--      override;
--  void RunFileChooser(content::RenderFrameHost* render_frame_host,
--                      const content::FileChooserParams& params) override;
--  void EnumerateDirectory(content::WebContents* web_contents,
--                          int request_id,
--                          const base::FilePath& path) override;
--  void EnterFullscreenModeForTab(content::WebContents* source,
--                                 const GURL& origin) override;
--  void ExitFullscreenModeForTab(content::WebContents* source) override;
--  bool IsFullscreenForTabOrPending(
--      const content::WebContents* source) const override;
--  blink::WebSecurityStyle GetSecurityStyle(
--      content::WebContents* web_contents,
--      content::SecurityStyleExplanations* explanations) override;
--  void HandleKeyboardEvent(
--      content::WebContents* source,
--      const content::NativeWebKeyboardEvent& event) override;
--
--  // Autofill related events.
--#if defined(TOOLKIT_VIEWS) && !defined(OS_MACOSX)
--  void ShowAutofillPopup(content::RenderFrameHost* frame_host,
--                         content::RenderFrameHost* embedder_frame_host,
--                         bool offscreen,
--                         const gfx::RectF& bounds,
--                         const std::vector<base::string16>& values,
--                         const std::vector<base::string16>& labels);
--  void HideAutofillPopup();
--#endif
--
--  // brightray::InspectableWebContentsDelegate:
--  void DevToolsSaveToFile(const std::string& url,
--                          const std::string& content,
--                          bool save_as) override;
--  void DevToolsAppendToFile(const std::string& url,
--                            const std::string& content) override;
--  void DevToolsRequestFileSystems() override;
--  void DevToolsAddFileSystem(const base::FilePath& path) override;
--  void DevToolsRemoveFileSystem(
--      const base::FilePath& file_system_path) override;
--  void DevToolsIndexPath(int request_id,
--                         const std::string& file_system_path) override;
--  void DevToolsStopIndexing(int request_id) override;
--  void DevToolsSearchInPath(int request_id,
--                            const std::string& file_system_path,
--                            const std::string& query) override;
--
--  // brightray::InspectableWebContentsViewDelegate:
--#if defined(TOOLKIT_VIEWS) && !defined(OS_MACOSX)
--  gfx::ImageSkia GetDevToolsWindowIcon() override;
--#endif
--#if defined(USE_X11)
--  void GetDevToolsWindowWMClass(std::string* name,
--                                std::string* class_name) override;
--#endif
--
--  // Destroy the managed InspectableWebContents object.
--  void ResetManagedWebContents(bool async);
--
-- private:
--  // DevTools index event callbacks.
--  void OnDevToolsIndexingWorkCalculated(int request_id,
--                                        const std::string& file_system_path,
--                                        int total_work);
--  void OnDevToolsIndexingWorked(int request_id,
--                                const std::string& file_system_path,
--                                int worked);
--  void OnDevToolsIndexingDone(int request_id,
--                              const std::string& file_system_path);
--  void OnDevToolsSearchCompleted(int request_id,
--                                 const std::string& file_system_path,
--                                 const std::vector<std::string>& file_paths);
--
--  // Set fullscreen mode triggered by html api.
--  void SetHtmlApiFullscreen(bool enter_fullscreen);
--
--  // The window that this WebContents belongs to.
--  base::WeakPtr<NativeWindow> owner_window_;
--
--  bool offscreen_ = false;
--  bool ignore_menu_shortcuts_ = false;
--
--  // Whether window is fullscreened by HTML5 api.
--  bool html_fullscreen_ = false;
--
--  // Whether window is fullscreened by window api.
--  bool native_fullscreen_ = false;
--
--  // UI related helper classes.
--#if defined(TOOLKIT_VIEWS) && !defined(OS_MACOSX)
--  std::unique_ptr<AutofillPopup> autofill_popup_;
--#endif
--  std::unique_ptr<WebDialogHelper> web_dialog_helper_;
--
--  scoped_refptr<DevToolsFileSystemIndexer> devtools_file_system_indexer_;
--
--  // Make sure BrowserContext is alwasys destroyed after WebContents.
--  scoped_refptr<AtomBrowserContext> browser_context_;
--
--  // The stored InspectableWebContents object.
--  // Notice that web_contents_ must be placed after dialog_manager_, so we can
--  // make sure web_contents_ is destroyed before dialog_manager_, otherwise a
--  // crash would happen.
--  std::unique_ptr<brightray::InspectableWebContents> web_contents_;
--
--  // Maps url to file path, used by the file requests sent from devtools.
--  typedef std::map<std::string, base::FilePath> PathsMap;
--  PathsMap saved_files_;
--
--  // Map id to index job, used for file system indexing requests from devtools.
--  typedef std::
--      map<int, scoped_refptr<DevToolsFileSystemIndexer::FileSystemIndexingJob>>
--          DevToolsIndexingJobsMap;
--  DevToolsIndexingJobsMap devtools_indexing_jobs_;
--
--  scoped_refptr<base::SequencedTaskRunner> file_task_runner_;
--
--  DISALLOW_COPY_AND_ASSIGN(CommonWebContentsDelegate);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_COMMON_WEB_CONTENTS_DELEGATE_H_
-removed in remote
-  base   100644 970132b47c1513883141989d38743284bbbe597a atom/browser/javascript_environment.cc
-  our    100644 ddb689236bdfd958b05f28e5f5cb8c35ad47902a atom/browser/javascript_environment.cc
-@@ -1,70 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/javascript_environment.h"
--
--#include <string>
--
--#include "base/command_line.h"
--#include "base/message_loop/message_loop.h"
--#include "base/task_scheduler/initialization_util.h"
--#include "base/threading/thread_task_runner_handle.h"
--#include "content/public/common/content_switches.h"
--#include "gin/array_buffer.h"
--#include "gin/v8_initializer.h"
--
--#include "atom/common/node_includes.h"
--#include "tracing/trace_event.h"
--
--namespace atom {
--
--JavascriptEnvironment::JavascriptEnvironment()
--    : initialized_(Initialize()),
--      isolate_holder_(base::ThreadTaskRunnerHandle::Get()),
--      isolate_(isolate_holder_.isolate()),
--      isolate_scope_(isolate_),
--      locker_(isolate_),
--      handle_scope_(isolate_),
--      context_(isolate_, v8::Context::New(isolate_)),
--      context_scope_(v8::Local<v8::Context>::New(isolate_, context_)) {}
--
--JavascriptEnvironment::~JavascriptEnvironment() = default;
--
--void JavascriptEnvironment::OnMessageLoopCreated() {
--  isolate_holder_.AddRunMicrotasksObserver();
--}
--
--void JavascriptEnvironment::OnMessageLoopDestroying() {
--  isolate_holder_.RemoveRunMicrotasksObserver();
--}
--
--bool JavascriptEnvironment::Initialize() {
--  auto* cmd = base::CommandLine::ForCurrentProcess();
--
--  // --js-flags.
--  std::string js_flags = cmd->GetSwitchValueASCII(switches::kJavaScriptFlags);
--  if (!js_flags.empty())
--    v8::V8::SetFlagsFromString(js_flags.c_str(), js_flags.size());
--
--  // The V8Platform of gin relies on Chromium's task schedule, which has not
--  // been started at this point, so we have to rely on Node's V8Platform.
--  platform_ = node::CreatePlatform(
--      base::RecommendedMaxNumberOfThreadsInPool(3, 8, 0.1, 0), nullptr);
--  v8::V8::InitializePlatform(platform_);
--  node::tracing::TraceEventHelper::SetTracingController(
--      new v8::TracingController());
--  gin::IsolateHolder::Initialize(
--      gin::IsolateHolder::kNonStrictMode, gin::IsolateHolder::kStableV8Extras,
--      gin::ArrayBufferAllocator::SharedInstance(),
--      nullptr /* external_reference_table */, false /* create_v8_platform */);
--  return true;
--}
--
--NodeEnvironment::NodeEnvironment(node::Environment* env) : env_(env) {}
--
--NodeEnvironment::~NodeEnvironment() {
--  node::FreeEnvironment(env_);
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 07cd602cf00dfd35aa03c3ffe821ebd267ff115e atom/browser/javascript_environment.h
-  our    100644 bf05b687f8b338f25d37efcef39becd4346cb9e9 atom/browser/javascript_environment.h
-@@ -1,65 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_JAVASCRIPT_ENVIRONMENT_H_
--#define ATOM_BROWSER_JAVASCRIPT_ENVIRONMENT_H_
--
--#include "base/macros.h"
--#include "gin/public/isolate_holder.h"
--
--namespace node {
--class Environment;
--class MultiIsolatePlatform;
--}  // namespace node
--
--namespace atom {
--
--// Manage the V8 isolate and context automatically.
--class JavascriptEnvironment {
-- public:
--  JavascriptEnvironment();
--  ~JavascriptEnvironment();
--
--  void OnMessageLoopCreated();
--  void OnMessageLoopDestroying();
--
--  node::MultiIsolatePlatform* platform() const { return platform_; }
--  v8::Isolate* isolate() const { return isolate_; }
--  v8::Local<v8::Context> context() const {
--    return v8::Local<v8::Context>::New(isolate_, context_);
--  }
--
-- private:
--  bool Initialize();
--
--  // Leaked on exit.
--  node::MultiIsolatePlatform* platform_;
--
--  bool initialized_;
--  gin::IsolateHolder isolate_holder_;
--  v8::Isolate* isolate_;
--  v8::Isolate::Scope isolate_scope_;
--  v8::Locker locker_;
--  v8::HandleScope handle_scope_;
--  v8::UniquePersistent<v8::Context> context_;
--  v8::Context::Scope context_scope_;
--
--  DISALLOW_COPY_AND_ASSIGN(JavascriptEnvironment);
--};
--
--// Manage the Node Environment automatically.
--class NodeEnvironment {
-- public:
--  explicit NodeEnvironment(node::Environment* env);
--  ~NodeEnvironment();
--
-- private:
--  node::Environment* env_;
--
--  DISALLOW_COPY_AND_ASSIGN(NodeEnvironment);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_JAVASCRIPT_ENVIRONMENT_H_
-removed in remote
-  base   100644 7a1a77cc2b1333ccfd56c77b98f8cfa7c5d8631d atom/browser/login_handler.cc
-  our    100644 2063c6197fce449d1692f1b067c17e043b1d37e4 atom/browser/login_handler.cc
-@@ -1,91 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/login_handler.h"
--
--#include "atom/browser/browser.h"
--#include "atom/common/native_mate_converters/net_converter.h"
--#include "base/values.h"
--#include "content/public/browser/browser_thread.h"
--#include "content/public/browser/web_contents.h"
--#include "net/base/auth.h"
--
--using content::BrowserThread;
--
--namespace atom {
--
--LoginHandler::LoginHandler(
--    net::URLRequest* request,
--    const net::AuthChallengeInfo& auth_info,
--    const net::NetworkDelegate::AuthCallback& callback,
--    net::AuthCredentials* credentials,
--    const content::ResourceRequestInfo* resource_request_info)
--    : credentials_(credentials),
--      auth_info_(auth_info),
--      auth_callback_(std::move(callback)),
--      weak_factory_(this) {
--  DCHECK_CURRENTLY_ON(BrowserThread::IO);
--
--  std::unique_ptr<base::DictionaryValue> request_details(
--      new base::DictionaryValue);
--  FillRequestDetails(request_details.get(), request);
--
--  web_contents_getter_ =
--      resource_request_info->GetWebContentsGetterForRequest();
--
--  BrowserThread::PostTask(
--      BrowserThread::UI, FROM_HERE,
--      base::BindOnce(&Browser::RequestLogin, base::Unretained(Browser::Get()),
--                     base::RetainedRef(this), std::move(request_details)));
--}
--
--LoginHandler::~LoginHandler() {}
--
--void LoginHandler::Login(const base::string16& username,
--                         const base::string16& password) {
--  DCHECK_CURRENTLY_ON(BrowserThread::UI);
--
--  BrowserThread::PostTask(
--      BrowserThread::IO, FROM_HERE,
--      base::BindOnce(&LoginHandler::DoLogin, weak_factory_.GetWeakPtr(),
--                     username, password));
--}
--
--void LoginHandler::CancelAuth() {
--  DCHECK_CURRENTLY_ON(BrowserThread::UI);
--
--  BrowserThread::PostTask(
--      BrowserThread::IO, FROM_HERE,
--      base::BindOnce(&LoginHandler::DoCancelAuth, weak_factory_.GetWeakPtr()));
--}
--
--void LoginHandler::NotifyRequestDestroyed() {
--  auth_callback_.Reset();
--  credentials_ = nullptr;
--  weak_factory_.InvalidateWeakPtrs();
--}
--
--content::WebContents* LoginHandler::GetWebContents() const {
--  DCHECK_CURRENTLY_ON(BrowserThread::UI);
--  return web_contents_getter_.Run();
--}
--
--void LoginHandler::DoCancelAuth() {
--  DCHECK_CURRENTLY_ON(BrowserThread::IO);
--  if (!auth_callback_.is_null())
--    std::move(auth_callback_)
--        .Run(net::NetworkDelegate::AUTH_REQUIRED_RESPONSE_CANCEL_AUTH);
--}
--
--void LoginHandler::DoLogin(const base::string16& username,
--                           const base::string16& password) {
--  DCHECK_CURRENTLY_ON(BrowserThread::IO);
--  if (!auth_callback_.is_null()) {
--    credentials_->Set(username, password);
--    std::move(auth_callback_)
--        .Run(net::NetworkDelegate::AUTH_REQUIRED_RESPONSE_SET_AUTH);
--  }
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 52ec1abf5b1a8e5353dd294b946275dc229ef6ab atom/browser/login_handler.h
-  our    100644 e7f1c5be0094506e01d2cccc0073fa864dfefb56 atom/browser/login_handler.h
-@@ -1,74 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_LOGIN_HANDLER_H_
--#define ATOM_BROWSER_LOGIN_HANDLER_H_
--
--#include "base/callback.h"
--#include "base/memory/ref_counted.h"
--#include "base/memory/weak_ptr.h"
--#include "base/strings/string16.h"
--#include "content/public/browser/resource_request_info.h"
--#include "net/base/network_delegate.h"
--
--namespace content {
--class WebContents;
--}
--
--namespace atom {
--
--// Handles the HTTP basic auth, must be created on IO thread.
--class LoginHandler : public base::RefCountedThreadSafe<LoginHandler> {
-- public:
--  LoginHandler(net::URLRequest* request,
--               const net::AuthChallengeInfo& auth_info,
--               const net::NetworkDelegate::AuthCallback& callback,
--               net::AuthCredentials* credentials,
--               const content::ResourceRequestInfo* resource_request_info);
--
--  // The auth is cancelled, must be called on UI thread.
--  void CancelAuth();
--
--  // The URLRequest associated with the auth is destroyed.
--  void NotifyRequestDestroyed();
--
--  // Login with |username| and |password|, must be called on UI thread.
--  void Login(const base::string16& username, const base::string16& password);
--
--  // Returns the WebContents associated with the request, must be called on UI
--  // thread.
--  content::WebContents* GetWebContents() const;
--
--  const net::AuthChallengeInfo* auth_info() const { return &auth_info_; }
--
-- private:
--  friend class base::RefCountedThreadSafe<LoginHandler>;
--  friend class base::DeleteHelper<LoginHandler>;
--
--  ~LoginHandler();
--
--  // Must be called on IO thread.
--  void DoCancelAuth();
--  void DoLogin(const base::string16& username, const base::string16& password);
--
--  // Credentials to be used for the auth.
--  net::AuthCredentials* credentials_;
--
--  // Who/where/what asked for the authentication.
--  const net::AuthChallengeInfo& auth_info_;
--
--  // WebContents associated with the login request.
--  content::ResourceRequestInfo::WebContentsGetter web_contents_getter_;
--
--  // Called with preferred value of net::NetworkDelegate::AuthRequiredResponse.
--  net::NetworkDelegate::AuthCallback auth_callback_;
--
--  base::WeakPtrFactory<LoginHandler> weak_factory_;
--
--  DISALLOW_COPY_AND_ASSIGN(LoginHandler);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_LOGIN_HANDLER_H_
-removed in remote
-  base   100644 9fafb054b09abce8b3ef6a4af1f778c80d919f3d atom/browser/mac/atom_application.h
-  our    100644 b0a8742ee98bc4990bf38a25218e87e386f115e0 atom/browser/mac/atom_application.h
-@@ -1,38 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "base/callback.h"
--#include "base/mac/scoped_nsobject.h"
--#include "base/mac/scoped_sending_event.h"
--
--@interface AtomApplication : NSApplication <CrAppProtocol,
--                                            CrAppControlProtocol,
--                                            NSUserActivityDelegate> {
-- @private
--  BOOL handlingSendEvent_;
--  base::scoped_nsobject<NSUserActivity> currentActivity_ API_AVAILABLE(macosx(10.10));
--  NSCondition* handoffLock_;
--  BOOL updateReceived_;
--  base::Callback<bool()> shouldShutdown_;
--}
--
--+ (AtomApplication*)sharedApplication;
--
--- (void)setShutdownHandler:(base::Callback<bool()>)handler;
--
--// CrAppProtocol:
--- (BOOL)isHandlingSendEvent;
--
--// CrAppControlProtocol:
--- (void)setHandlingSendEvent:(BOOL)handlingSendEvent;
--
--- (NSUserActivity*)getCurrentActivity API_AVAILABLE(macosx(10.10));
--- (void)setCurrentActivity:(NSString*)type
--              withUserInfo:(NSDictionary*)userInfo
--            withWebpageURL:(NSURL*)webpageURL;
--- (void)invalidateCurrentActivity;
--- (void)updateCurrentActivity:(NSString*)type
--                 withUserInfo:(NSDictionary*)userInfo;
--
--@end
-removed in remote
-  base   100644 cc9c6accc83dcb7260413fcc9a1184368724a3fa atom/browser/mac/atom_application.mm
-  our    100644 eb00a415bf243853a78b3c4e4eafa66905a2ccf3 atom/browser/mac/atom_application.mm
-@@ -1,191 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#import "atom/browser/mac/atom_application.h"
--
--#include "atom/browser/browser.h"
--#import "atom/browser/mac/atom_application_delegate.h"
--#include "atom/browser/mac/dict_util.h"
--#include "base/auto_reset.h"
--#include "base/strings/sys_string_conversions.h"
--#include "content/public/browser/browser_accessibility_state.h"
--
--namespace {
--
--inline void dispatch_sync_main(dispatch_block_t block) {
--  if ([NSThread isMainThread])
--    block();
--  else
--    dispatch_sync(dispatch_get_main_queue(), block);
--}
--
--}  // namespace
--
--@implementation AtomApplication
--
--+ (AtomApplication*)sharedApplication {
--  return (AtomApplication*)[super sharedApplication];
--}
--
--- (void)terminate:(id)sender {
--  if (shouldShutdown_ && !shouldShutdown_.Run())
--    return;  // User will call Quit later.
--
--  // We simply try to close the browser, which in turn will try to close the
--  // windows. Termination can proceed if all windows are closed or window close
--  // can be cancelled which will abort termination.
--  atom::Browser::Get()->Quit();
--}
--
--- (void)setShutdownHandler:(base::Callback<bool()>)handler {
--  shouldShutdown_ = std::move(handler);
--}
--
--- (BOOL)isHandlingSendEvent {
--  return handlingSendEvent_;
--}
--
--- (void)sendEvent:(NSEvent*)event {
--  base::AutoReset<BOOL> scoper(&handlingSendEvent_, YES);
--  [super sendEvent:event];
--}
--
--- (void)setHandlingSendEvent:(BOOL)handlingSendEvent {
--  handlingSendEvent_ = handlingSendEvent;
--}
--
--- (void)setCurrentActivity:(NSString*)type
--              withUserInfo:(NSDictionary*)userInfo
--            withWebpageURL:(NSURL*)webpageURL {
--  if (@available(macOS 10.10, *)) {
--    currentActivity_ = base::scoped_nsobject<NSUserActivity>(
--        [[NSUserActivity alloc] initWithActivityType:type]);
--    [currentActivity_ setUserInfo:userInfo];
--    [currentActivity_ setWebpageURL:webpageURL];
--    [currentActivity_ setDelegate:self];
--    [currentActivity_ becomeCurrent];
--    [currentActivity_ setNeedsSave:YES];
--  }
--}
--
--- (NSUserActivity*)getCurrentActivity {
--  return currentActivity_.get();
--}
--
--- (void)invalidateCurrentActivity {
--  if (currentActivity_) {
--    [currentActivity_ invalidate];
--    currentActivity_.reset();
--  }
--}
--
--- (void)updateCurrentActivity:(NSString*)type
--                 withUserInfo:(NSDictionary*)userInfo {
--  if (currentActivity_) {
--    [currentActivity_ addUserInfoEntriesFromDictionary:userInfo];
--  }
--
--  [handoffLock_ lock];
--  updateReceived_ = YES;
--  [handoffLock_ signal];
--  [handoffLock_ unlock];
--}
--
--- (void)userActivityWillSave:(NSUserActivity*)userActivity
--    API_AVAILABLE(macosx(10.10)) {
--  __block BOOL shouldWait = NO;
--  dispatch_sync_main(^{
--    std::string activity_type(
--        base::SysNSStringToUTF8(userActivity.activityType));
--    std::unique_ptr<base::DictionaryValue> user_info =
--        atom::NSDictionaryToDictionaryValue(userActivity.userInfo);
--
--    atom::Browser* browser = atom::Browser::Get();
--    shouldWait =
--        browser->UpdateUserActivityState(activity_type, *user_info) ? YES : NO;
--  });
--
--  if (shouldWait) {
--    [handoffLock_ lock];
--    updateReceived_ = NO;
--    while (!updateReceived_) {
--      BOOL isSignaled =
--          [handoffLock_ waitUntilDate:[NSDate dateWithTimeIntervalSinceNow:1]];
--      if (!isSignaled)
--        break;
--    }
--    [handoffLock_ unlock];
--  }
--
--  [userActivity setNeedsSave:YES];
--}
--
--- (void)userActivityWasContinued:(NSUserActivity*)userActivity
--    API_AVAILABLE(macosx(10.10)) {
--  dispatch_async(dispatch_get_main_queue(), ^{
--    std::string activity_type(
--        base::SysNSStringToUTF8(userActivity.activityType));
--    std::unique_ptr<base::DictionaryValue> user_info =
--        atom::NSDictionaryToDictionaryValue(userActivity.userInfo);
--
--    atom::Browser* browser = atom::Browser::Get();
--    browser->UserActivityWasContinued(activity_type, *user_info);
--  });
--  [userActivity setNeedsSave:YES];
--}
--
--- (void)awakeFromNib {
--  [[NSAppleEventManager sharedAppleEventManager]
--      setEventHandler:self
--          andSelector:@selector(handleURLEvent:withReplyEvent:)
--        forEventClass:kInternetEventClass
--           andEventID:kAEGetURL];
--
--  handoffLock_ = [NSCondition new];
--}
--
--- (void)handleURLEvent:(NSAppleEventDescriptor*)event
--        withReplyEvent:(NSAppleEventDescriptor*)replyEvent {
--  NSString* url =
--      [[event paramDescriptorForKeyword:keyDirectObject] stringValue];
--  atom::Browser::Get()->OpenURL(base::SysNSStringToUTF8(url));
--}
--
--- (bool)voiceOverEnabled {
--  NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
--  [defaults addSuiteNamed:@"com.apple.universalaccess"];
--  [defaults synchronize];
--
--  return [defaults boolForKey:@"voiceOverOnOffKey"];
--}
--
--- (void)accessibilitySetValue:(id)value forAttribute:(NSString*)attribute {
--  // Undocumented attribute that VoiceOver happens to set while running.
--  // Chromium uses this too, even though it's not exactly right.
--  if ([attribute isEqualToString:@"AXEnhancedUserInterface"]) {
--    bool enableAccessibility = ([self voiceOverEnabled] && [value boolValue]);
--    [self updateAccessibilityEnabled:enableAccessibility];
--  } else if ([attribute isEqualToString:@"AXManualAccessibility"]) {
--    [self updateAccessibilityEnabled:[value boolValue]];
--  }
--  return [super accessibilitySetValue:value forAttribute:attribute];
--}
--
--- (void)updateAccessibilityEnabled:(BOOL)enabled {
--  auto* ax_state = content::BrowserAccessibilityState::GetInstance();
--
--  if (enabled) {
--    ax_state->OnScreenReaderDetected();
--  } else {
--    ax_state->DisableAccessibility();
--  }
--
--  atom::Browser::Get()->OnAccessibilitySupportChanged();
--}
--
--- (void)orderFrontStandardAboutPanel:(id)sender {
--  atom::Browser::Get()->ShowAboutPanel();
--}
--
--@end
-removed in remote
-  base   100644 3e5c59c3ff3dd287f94837de14391d7d6fb56b79 atom/browser/mac/atom_application_delegate.h
-  our    100644 835b63f8308e93353ee39a4c249824dfda9cb62c atom/browser/mac/atom_application_delegate.h
-@@ -1,17 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#import <Cocoa/Cocoa.h>
--
--#import "atom/browser/ui/cocoa/atom_menu_controller.h"
--
--@interface AtomApplicationDelegate : NSObject <NSApplicationDelegate> {
-- @private
--  base::scoped_nsobject<AtomMenuController> menu_controller_;
--}
--
--// Sets the menu that will be returned in "applicationDockMenu:".
--- (void)setApplicationDockMenu:(atom::AtomMenuModel*)model;
--
--@end
-removed in remote
-  base   100644 f4db929bf575e88575e38d08d9961e1b02ef05dc atom/browser/mac/atom_application_delegate.mm
-  our    100644 683f7a84bcaa2c47bb78cf299314a5afeb15639b atom/browser/mac/atom_application_delegate.mm
-@@ -1,136 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#import "atom/browser/mac/atom_application_delegate.h"
--
--#include "atom/browser/browser.h"
--#import "atom/browser/mac/atom_application.h"
--#include "atom/browser/mac/dict_util.h"
--#include "base/allocator/allocator_shim.h"
--#include "base/allocator/buildflags.h"
--#include "base/mac/mac_util.h"
--#include "base/mac/scoped_objc_class_swizzler.h"
--#include "base/strings/sys_string_conversions.h"
--#include "base/values.h"
--
--#if BUILDFLAG(USE_ALLOCATOR_SHIM)
--// On macOS 10.12, the IME system attempts to allocate a 2^64 size buffer,
--// which would typically cause an OOM crash. To avoid this, the problematic
--// method is swizzled out and the make-OOM-fatal bit is disabled for the
--// duration of the original call. https://crbug.com/654695
--static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
--@interface OOMDisabledIMKInputSession : NSObject
--@end
--@implementation OOMDisabledIMKInputSession
--- (void)_coreAttributesFromRange:(NSRange)range
--                 whichAttributes:(long long)attributes
--               completionHandler:(void (^)(void))block {
--  // The allocator flag is per-process, so other threads may temporarily
--  // not have fatal OOM occur while this method executes, but it is better
--  // than crashing when using IME.
--  base::allocator::SetCallNewHandlerOnMallocFailure(false);
--  g_swizzle_imk_input_session->GetOriginalImplementation()(self, _cmd, range,
--                                                           attributes, block);
--  base::allocator::SetCallNewHandlerOnMallocFailure(true);
--}
--@end
--#endif  // BUILDFLAG(USE_ALLOCATOR_SHIM)
--
--@implementation AtomApplicationDelegate
--
--- (void)setApplicationDockMenu:(atom::AtomMenuModel*)model {
--  menu_controller_.reset([[AtomMenuController alloc] initWithModel:model
--                                             useDefaultAccelerator:NO]);
--}
--
--- (void)applicationWillFinishLaunching:(NSNotification*)notify {
--  // Don't add the "Enter Full Screen" menu item automatically.
--  [[NSUserDefaults standardUserDefaults]
--      setBool:NO
--       forKey:@"NSFullScreenMenuItemEverywhere"];
--
--  atom::Browser::Get()->WillFinishLaunching();
--}
--
--- (void)applicationDidFinishLaunching:(NSNotification*)notify {
--  NSUserNotification* user_notification =
--      [notify userInfo][(id) @"NSApplicationLaunchUserNotificationKey"];
--
--  if (user_notification.userInfo != nil) {
--    std::unique_ptr<base::DictionaryValue> launch_info =
--        atom::NSDictionaryToDictionaryValue(user_notification.userInfo);
--    atom::Browser::Get()->DidFinishLaunching(*launch_info);
--  } else {
--    atom::Browser::Get()->DidFinishLaunching(base::DictionaryValue());
--  }
--
--#if BUILDFLAG(USE_ALLOCATOR_SHIM)
--  // Disable fatal OOM to hack around an OS bug https://crbug.com/654695.
--  if (base::mac::IsOS10_12()) {
--    g_swizzle_imk_input_session = new base::mac::ScopedObjCClassSwizzler(
--        NSClassFromString(@"IMKInputSession"),
--        [OOMDisabledIMKInputSession class],
--        @selector(_coreAttributesFromRange:whichAttributes:completionHandler:));
--  }
--#endif
--}
--
--- (NSMenu*)applicationDockMenu:(NSApplication*)sender {
--  if (menu_controller_)
--    return [menu_controller_ menu];
--  else
--    return nil;
--}
--
--- (BOOL)application:(NSApplication*)sender openFile:(NSString*)filename {
--  std::string filename_str(base::SysNSStringToUTF8(filename));
--  return atom::Browser::Get()->OpenFile(filename_str) ? YES : NO;
--}
--
--- (BOOL)applicationShouldHandleReopen:(NSApplication*)theApplication
--                    hasVisibleWindows:(BOOL)flag {
--  atom::Browser* browser = atom::Browser::Get();
--  browser->Activate(static_cast<bool>(flag));
--  return flag;
--}
--
--- (BOOL)application:(NSApplication*)sender
--    continueUserActivity:(NSUserActivity*)userActivity
--      restorationHandler:
--          (void (^)(NSArray* restorableObjects))restorationHandler
--    API_AVAILABLE(macosx(10.10)) {
--  std::string activity_type(base::SysNSStringToUTF8(userActivity.activityType));
--  std::unique_ptr<base::DictionaryValue> user_info =
--      atom::NSDictionaryToDictionaryValue(userActivity.userInfo);
--  if (!user_info)
--    return NO;
--
--  atom::Browser* browser = atom::Browser::Get();
--  return browser->ContinueUserActivity(activity_type, *user_info) ? YES : NO;
--}
--
--- (BOOL)application:(NSApplication*)application
--    willContinueUserActivityWithType:(NSString*)userActivityType {
--  std::string activity_type(base::SysNSStringToUTF8(userActivityType));
--
--  atom::Browser* browser = atom::Browser::Get();
--  return browser->WillContinueUserActivity(activity_type) ? YES : NO;
--}
--
--- (void)application:(NSApplication*)application
--    didFailToContinueUserActivityWithType:(NSString*)userActivityType
--                                    error:(NSError*)error {
--  std::string activity_type(base::SysNSStringToUTF8(userActivityType));
--  std::string error_message(
--      base::SysNSStringToUTF8([error localizedDescription]));
--
--  atom::Browser* browser = atom::Browser::Get();
--  browser->DidFailToContinueUserActivity(activity_type, error_message);
--}
--
--- (IBAction)newWindowForTab:(id)sender {
--  atom::Browser::Get()->NewWindowForTab();
--}
--
--@end
-removed in remote
-  base   100644 2627c704d21fef9df262d4062deaef12650f21f6 atom/browser/native_window.cc
-  our    100644 4ff2bcfcabfd34d8563f9ed213c03655a99dd9c6 atom/browser/native_window.cc
-@@ -1,567 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/native_window.h"
--
--#include <algorithm>
--#include <string>
--#include <utility>
--#include <vector>
--
--#include "atom/browser/browser.h"
--#include "atom/browser/window_list.h"
--#include "atom/common/color_util.h"
--#include "atom/common/options_switches.h"
--#include "native_mate/dictionary.h"
--#include "ui/views/widget/widget.h"
--
--#if defined(OS_WIN)
--#include "ui/base/win/shell.h"
--#include "ui/display/win/screen_win.h"
--#endif
--
--DEFINE_WEB_CONTENTS_USER_DATA_KEY(atom::NativeWindowRelay);
--
--namespace atom {
--
--namespace {
--
--#if defined(OS_WIN)
--gfx::Size GetExpandedWindowSize(const NativeWindow* window, gfx::Size size) {
--  if (!window->transparent() || !ui::win::IsAeroGlassEnabled())
--    return size;
--
--  gfx::Size min_size = display::win::ScreenWin::ScreenToDIPSize(
--      window->GetAcceleratedWidget(), gfx::Size(64, 64));
--
--  // Some AMD drivers can't display windows that are less than 64x64 pixels,
--  // so expand them to be at least that size. http://crbug.com/286609
--  gfx::Size expanded(std::max(size.width(), min_size.width()),
--                     std::max(size.height(), min_size.height()));
--  return expanded;
--}
--#endif
--
--}  // namespace
--
--NativeWindow::NativeWindow(const mate::Dictionary& options,
--                           NativeWindow* parent)
--    : widget_(new views::Widget), parent_(parent), weak_factory_(this) {
--  options.Get(options::kFrame, &has_frame_);
--  options.Get(options::kTransparent, &transparent_);
--  options.Get(options::kEnableLargerThanScreen, &enable_larger_than_screen_);
--
--  if (parent)
--    options.Get("modal", &is_modal_);
--
--  WindowList::AddWindow(this);
--}
--
--NativeWindow::~NativeWindow() {
--  // It's possible that the windows gets destroyed before it's closed, in that
--  // case we need to ensure the OnWindowClosed message is still notified.
--  NotifyWindowClosed();
--}
--
--void NativeWindow::InitFromOptions(const mate::Dictionary& options) {
--  // Setup window from options.
--  int x = -1, y = -1;
--  bool center;
--  if (options.Get(options::kX, &x) && options.Get(options::kY, &y)) {
--    SetPosition(gfx::Point(x, y));
--
--#if defined(OS_WIN)
--    // FIXME(felixrieseberg): Dirty, dirty workaround for
--    // https://github.com/electron/electron/issues/10862
--    // Somehow, we need to call `SetBounds` twice to get
--    // usable results. The root cause is still unknown.
--    SetPosition(gfx::Point(x, y));
--#endif
--  } else if (options.Get(options::kCenter, &center) && center) {
--    Center();
--  }
--  // On Linux and Window we may already have maximum size defined.
--  extensions::SizeConstraints size_constraints(GetContentSizeConstraints());
--  int min_height = 0, min_width = 0;
--  if (options.Get(options::kMinHeight, &min_height) |
--      options.Get(options::kMinWidth, &min_width)) {
--    size_constraints.set_minimum_size(gfx::Size(min_width, min_height));
--  }
--  int max_height = INT_MAX, max_width = INT_MAX;
--  if (options.Get(options::kMaxHeight, &max_height) |
--      options.Get(options::kMaxWidth, &max_width)) {
--    size_constraints.set_maximum_size(gfx::Size(max_width, max_height));
--  }
--  bool use_content_size = false;
--  options.Get(options::kUseContentSize, &use_content_size);
--  if (use_content_size) {
--    SetContentSizeConstraints(size_constraints);
--  } else {
--    SetSizeConstraints(size_constraints);
--  }
--#if defined(OS_WIN) || defined(USE_X11)
--  bool resizable;
--  if (options.Get(options::kResizable, &resizable)) {
--    SetResizable(resizable);
--  }
--  bool closable;
--  if (options.Get(options::kClosable, &closable)) {
--    SetClosable(closable);
--  }
--#endif
--  bool movable;
--  if (options.Get(options::kMovable, &movable)) {
--    SetMovable(movable);
--  }
--  bool has_shadow;
--  if (options.Get(options::kHasShadow, &has_shadow)) {
--    SetHasShadow(has_shadow);
--  }
--  double opacity;
--  if (options.Get(options::kOpacity, &opacity)) {
--    SetOpacity(opacity);
--  }
--  bool top;
--  if (options.Get(options::kAlwaysOnTop, &top) && top) {
--    SetAlwaysOnTop(true);
--  }
--  bool fullscreenable = true;
--  bool fullscreen = false;
--  if (options.Get(options::kFullscreen, &fullscreen) && !fullscreen) {
--    // Disable fullscreen button if 'fullscreen' is specified to false.
--#if defined(OS_MACOSX)
--    fullscreenable = false;
--#endif
--  }
--  // Overriden by 'fullscreenable'.
--  options.Get(options::kFullScreenable, &fullscreenable);
--  SetFullScreenable(fullscreenable);
--  if (fullscreen) {
--    SetFullScreen(true);
--  }
--  bool skip;
--  if (options.Get(options::kSkipTaskbar, &skip)) {
--    SetSkipTaskbar(skip);
--  }
--  bool kiosk;
--  if (options.Get(options::kKiosk, &kiosk) && kiosk) {
--    SetKiosk(kiosk);
--  }
--#if defined(OS_MACOSX)
--  std::string type;
--  if (options.Get(options::kVibrancyType, &type)) {
--    SetVibrancy(type);
--  }
--#endif
--  std::string color;
--  if (options.Get(options::kBackgroundColor, &color)) {
--    SetBackgroundColor(ParseHexColor(color));
--  } else if (!transparent()) {
--    // For normal window, use white as default background.
--    SetBackgroundColor(SK_ColorWHITE);
--  }
--  std::string title(Browser::Get()->GetName());
--  options.Get(options::kTitle, &title);
--  SetTitle(title);
--
--  // Then show it.
--  bool show = true;
--  options.Get(options::kShow, &show);
--  if (show)
--    Show();
--}
--
--bool NativeWindow::IsClosed() const {
--  return is_closed_;
--}
--
--void NativeWindow::SetSize(const gfx::Size& size, bool animate) {
--  SetBounds(gfx::Rect(GetPosition(), size), animate);
--}
--
--gfx::Size NativeWindow::GetSize() {
--  return GetBounds().size();
--}
--
--void NativeWindow::SetPosition(const gfx::Point& position, bool animate) {
--  SetBounds(gfx::Rect(position, GetSize()), animate);
--}
--
--gfx::Point NativeWindow::GetPosition() {
--  return GetBounds().origin();
--}
--
--void NativeWindow::SetContentSize(const gfx::Size& size, bool animate) {
--  SetSize(ContentBoundsToWindowBounds(gfx::Rect(size)).size(), animate);
--}
--
--gfx::Size NativeWindow::GetContentSize() {
--  return GetContentBounds().size();
--}
--
--void NativeWindow::SetContentBounds(const gfx::Rect& bounds, bool animate) {
--  SetBounds(ContentBoundsToWindowBounds(bounds), animate);
--}
--
--gfx::Rect NativeWindow::GetContentBounds() {
--  return WindowBoundsToContentBounds(GetBounds());
--}
--
--void NativeWindow::SetSizeConstraints(
--    const extensions::SizeConstraints& window_constraints) {
--  extensions::SizeConstraints content_constraints(GetContentSizeConstraints());
--  if (window_constraints.HasMaximumSize()) {
--    gfx::Rect max_bounds = WindowBoundsToContentBounds(
--        gfx::Rect(window_constraints.GetMaximumSize()));
--    content_constraints.set_maximum_size(max_bounds.size());
--  }
--  if (window_constraints.HasMinimumSize()) {
--    gfx::Rect min_bounds = WindowBoundsToContentBounds(
--        gfx::Rect(window_constraints.GetMinimumSize()));
--    content_constraints.set_minimum_size(min_bounds.size());
--  }
--  SetContentSizeConstraints(content_constraints);
--}
--
--extensions::SizeConstraints NativeWindow::GetSizeConstraints() const {
--  extensions::SizeConstraints content_constraints = GetContentSizeConstraints();
--  extensions::SizeConstraints window_constraints;
--  if (content_constraints.HasMaximumSize()) {
--    gfx::Rect max_bounds = ContentBoundsToWindowBounds(
--        gfx::Rect(content_constraints.GetMaximumSize()));
--    window_constraints.set_maximum_size(max_bounds.size());
--  }
--  if (content_constraints.HasMinimumSize()) {
--    gfx::Rect min_bounds = ContentBoundsToWindowBounds(
--        gfx::Rect(content_constraints.GetMinimumSize()));
--    window_constraints.set_minimum_size(min_bounds.size());
--  }
--  return window_constraints;
--}
--
--void NativeWindow::SetContentSizeConstraints(
--    const extensions::SizeConstraints& size_constraints) {
--  size_constraints_ = size_constraints;
--}
--
--extensions::SizeConstraints NativeWindow::GetContentSizeConstraints() const {
--  return size_constraints_;
--}
--
--void NativeWindow::SetMinimumSize(const gfx::Size& size) {
--  extensions::SizeConstraints size_constraints;
--  size_constraints.set_minimum_size(size);
--  SetSizeConstraints(size_constraints);
--}
--
--gfx::Size NativeWindow::GetMinimumSize() const {
--  return GetSizeConstraints().GetMinimumSize();
--}
--
--void NativeWindow::SetMaximumSize(const gfx::Size& size) {
--  extensions::SizeConstraints size_constraints;
--  size_constraints.set_maximum_size(size);
--  SetSizeConstraints(size_constraints);
--}
--
--gfx::Size NativeWindow::GetMaximumSize() const {
--  return GetSizeConstraints().GetMaximumSize();
--}
--
--gfx::Size NativeWindow::GetContentMinimumSize() const {
--  return GetContentSizeConstraints().GetMinimumSize();
--}
--
--gfx::Size NativeWindow::GetContentMaximumSize() const {
--  gfx::Size maximum_size = GetContentSizeConstraints().GetMaximumSize();
--#if defined(OS_WIN)
--  return GetContentSizeConstraints().HasMaximumSize()
--             ? GetExpandedWindowSize(this, maximum_size)
--             : maximum_size;
--#else
--  return maximum_size;
--#endif
--}
--
--void NativeWindow::SetSheetOffset(const double offsetX, const double offsetY) {
--  sheet_offset_x_ = offsetX;
--  sheet_offset_y_ = offsetY;
--}
--
--double NativeWindow::GetSheetOffsetX() {
--  return sheet_offset_x_;
--}
--
--double NativeWindow::GetSheetOffsetY() {
--  return sheet_offset_y_;
--}
--
--void NativeWindow::SetRepresentedFilename(const std::string& filename) {}
--
--std::string NativeWindow::GetRepresentedFilename() {
--  return "";
--}
--
--void NativeWindow::SetDocumentEdited(bool edited) {}
--
--bool NativeWindow::IsDocumentEdited() {
--  return false;
--}
--
--void NativeWindow::SetFocusable(bool focusable) {}
--
--void NativeWindow::SetMenu(AtomMenuModel* menu) {}
--
--void NativeWindow::SetParentWindow(NativeWindow* parent) {
--  parent_ = parent;
--}
--
--void NativeWindow::SetAutoHideCursor(bool auto_hide) {}
--
--void NativeWindow::SelectPreviousTab() {}
--
--void NativeWindow::SelectNextTab() {}
--
--void NativeWindow::MergeAllWindows() {}
--
--void NativeWindow::MoveTabToNewWindow() {}
--
--void NativeWindow::ToggleTabBar() {}
--
--bool NativeWindow::AddTabbedWindow(NativeWindow* window) {
--  return true;  // for non-Mac platforms
--}
--
--void NativeWindow::SetVibrancy(const std::string& filename) {}
--
--void NativeWindow::SetTouchBar(
--    const std::vector<mate::PersistentDictionary>& items) {}
--
--void NativeWindow::RefreshTouchBarItem(const std::string& item_id) {}
--
--void NativeWindow::SetEscapeTouchBarItem(
--    const mate::PersistentDictionary& item) {}
--
--void NativeWindow::SetAutoHideMenuBar(bool auto_hide) {}
--
--bool NativeWindow::IsMenuBarAutoHide() {
--  return false;
--}
--
--void NativeWindow::SetMenuBarVisibility(bool visible) {}
--
--bool NativeWindow::IsMenuBarVisible() {
--  return true;
--}
--
--bool NativeWindow::SetWindowButtonVisibility(bool visible) {
--  return false;
--}
--
--double NativeWindow::GetAspectRatio() {
--  return aspect_ratio_;
--}
--
--gfx::Size NativeWindow::GetAspectRatioExtraSize() {
--  return aspect_ratio_extraSize_;
--}
--
--void NativeWindow::SetAspectRatio(double aspect_ratio,
--                                  const gfx::Size& extra_size) {
--  aspect_ratio_ = aspect_ratio;
--  aspect_ratio_extraSize_ = extra_size;
--}
--
--void NativeWindow::PreviewFile(const std::string& path,
--                               const std::string& display_name) {}
--
--void NativeWindow::CloseFilePreview() {}
--
--void NativeWindow::NotifyWindowRequestPreferredWith(int* width) {
--  for (NativeWindowObserver& observer : observers_)
--    observer.RequestPreferredWidth(width);
--}
--
--void NativeWindow::NotifyWindowCloseButtonClicked() {
--  // First ask the observers whether we want to close.
--  bool prevent_default = false;
--  for (NativeWindowObserver& observer : observers_)
--    observer.WillCloseWindow(&prevent_default);
--  if (prevent_default) {
--    WindowList::WindowCloseCancelled(this);
--    return;
--  }
--
--  // Then ask the observers how should we close the window.
--  for (NativeWindowObserver& observer : observers_)
--    observer.OnCloseButtonClicked(&prevent_default);
--  if (prevent_default)
--    return;
--
--  CloseImmediately();
--}
--
--void NativeWindow::NotifyWindowClosed() {
--  if (is_closed_)
--    return;
--
--  WindowList::RemoveWindow(this);
--
--  is_closed_ = true;
--  for (NativeWindowObserver& observer : observers_)
--    observer.OnWindowClosed();
--}
--
--void NativeWindow::NotifyWindowEndSession() {
--  for (NativeWindowObserver& observer : observers_)
--    observer.OnWindowEndSession();
--}
--
--void NativeWindow::NotifyWindowBlur() {
--  for (NativeWindowObserver& observer : observers_)
--    observer.OnWindowBlur();
--}
--
--void NativeWindow::NotifyWindowFocus() {
--  for (NativeWindowObserver& observer : observers_)
--    observer.OnWindowFocus();
--}
--
--void NativeWindow::NotifyWindowShow() {
--  for (NativeWindowObserver& observer : observers_)
--    observer.OnWindowShow();
--}
--
--void NativeWindow::NotifyWindowHide() {
--  for (NativeWindowObserver& observer : observers_)
--    observer.OnWindowHide();
--}
--
--void NativeWindow::NotifyWindowMaximize() {
--  for (NativeWindowObserver& observer : observers_)
--    observer.OnWindowMaximize();
--}
--
--void NativeWindow::NotifyWindowUnmaximize() {
--  for (NativeWindowObserver& observer : observers_)
--    observer.OnWindowUnmaximize();
--}
--
--void NativeWindow::NotifyWindowMinimize() {
--  for (NativeWindowObserver& observer : observers_)
--    observer.OnWindowMinimize();
--}
--
--void NativeWindow::NotifyWindowRestore() {
--  for (NativeWindowObserver& observer : observers_)
--    observer.OnWindowRestore();
--}
--
--void NativeWindow::NotifyWindowWillResize(const gfx::Rect& new_bounds,
--                                          bool* prevent_default) {
--  for (NativeWindowObserver& observer : observers_)
--    observer.OnWindowWillResize(new_bounds, prevent_default);
--}
--
--void NativeWindow::NotifyWindowResize() {
--  for (NativeWindowObserver& observer : observers_)
--    observer.OnWindowResize();
--}
--
--void NativeWindow::NotifyWindowMove() {
--  for (NativeWindowObserver& observer : observers_)
--    observer.OnWindowMove();
--}
--
--void NativeWindow::NotifyWindowMoved() {
--  for (NativeWindowObserver& observer : observers_)
--    observer.OnWindowMoved();
--}
--
--void NativeWindow::NotifyWindowEnterFullScreen() {
--  for (NativeWindowObserver& observer : observers_)
--    observer.OnWindowEnterFullScreen();
--}
--
--void NativeWindow::NotifyWindowScrollTouchBegin() {
--  for (NativeWindowObserver& observer : observers_)
--    observer.OnWindowScrollTouchBegin();
--}
--
--void NativeWindow::NotifyWindowScrollTouchEnd() {
--  for (NativeWindowObserver& observer : observers_)
--    observer.OnWindowScrollTouchEnd();
--}
--
--void NativeWindow::NotifyWindowSwipe(const std::string& direction) {
--  for (NativeWindowObserver& observer : observers_)
--    observer.OnWindowSwipe(direction);
--}
--
--void NativeWindow::NotifyWindowSheetBegin() {
--  for (NativeWindowObserver& observer : observers_)
--    observer.OnWindowSheetBegin();
--}
--
--void NativeWindow::NotifyWindowSheetEnd() {
--  for (NativeWindowObserver& observer : observers_)
--    observer.OnWindowSheetEnd();
--}
--
--void NativeWindow::NotifyWindowLeaveFullScreen() {
--  for (NativeWindowObserver& observer : observers_)
--    observer.OnWindowLeaveFullScreen();
--}
--
--void NativeWindow::NotifyWindowEnterHtmlFullScreen() {
--  for (NativeWindowObserver& observer : observers_)
--    observer.OnWindowEnterHtmlFullScreen();
--}
--
--void NativeWindow::NotifyWindowLeaveHtmlFullScreen() {
--  for (NativeWindowObserver& observer : observers_)
--    observer.OnWindowLeaveHtmlFullScreen();
--}
--
--void NativeWindow::NotifyWindowExecuteWindowsCommand(
--    const std::string& command) {
--  for (NativeWindowObserver& observer : observers_)
--    observer.OnExecuteWindowsCommand(command);
--}
--
--void NativeWindow::NotifyTouchBarItemInteraction(
--    const std::string& item_id,
--    const base::DictionaryValue& details) {
--  for (NativeWindowObserver& observer : observers_)
--    observer.OnTouchBarItemResult(item_id, details);
--}
--
--void NativeWindow::NotifyNewWindowForTab() {
--  for (NativeWindowObserver& observer : observers_)
--    observer.OnNewWindowForTab();
--}
--
--#if defined(OS_WIN)
--void NativeWindow::NotifyWindowMessage(UINT message,
--                                       WPARAM w_param,
--                                       LPARAM l_param) {
--  for (NativeWindowObserver& observer : observers_)
--    observer.OnWindowMessage(message, w_param, l_param);
--}
--#endif
--
--views::Widget* NativeWindow::GetWidget() {
--  return widget();
--}
--
--const views::Widget* NativeWindow::GetWidget() const {
--  return widget();
--}
--
--NativeWindowRelay::NativeWindowRelay(base::WeakPtr<NativeWindow> window)
--    : key(UserDataKey()), window(window) {}
--
--NativeWindowRelay::~NativeWindowRelay() = default;
--
--}  // namespace atom
-removed in remote
-  base   100644 49e1e71d5df685a2ccafba51dcc395534d2f34bd atom/browser/native_window.h
-  our    100644 35b67e2dd230692c415a32aae5f0a5e99ab74ac0 atom/browser/native_window.h
-@@ -1,359 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_NATIVE_WINDOW_H_
--#define ATOM_BROWSER_NATIVE_WINDOW_H_
--
--#include <map>
--#include <memory>
--#include <string>
--#include <vector>
--
--#include "atom/browser/native_window_observer.h"
--#include "base/memory/weak_ptr.h"
--#include "base/observer_list.h"
--#include "base/supports_user_data.h"
--#include "content/public/browser/web_contents_user_data.h"
--#include "extensions/browser/app_window/size_constraints.h"
--#include "ui/views/widget/widget_delegate.h"
--
--class SkRegion;
--
--namespace content {
--struct NativeWebKeyboardEvent;
--}
--
--namespace gfx {
--class Image;
--class Point;
--class Rect;
--class RectF;
--class Size;
--}  // namespace gfx
--
--namespace mate {
--class Dictionary;
--class PersistentDictionary;
--}  // namespace mate
--
--namespace atom {
--
--class AtomMenuModel;
--class NativeBrowserView;
--
--struct DraggableRegion;
--
--class NativeWindow : public base::SupportsUserData,
--                     public views::WidgetDelegate {
-- public:
--  ~NativeWindow() override;
--
--  // Create window with existing WebContents, the caller is responsible for
--  // managing the window's live.
--  static NativeWindow* Create(const mate::Dictionary& options,
--                              NativeWindow* parent = nullptr);
--
--  void InitFromOptions(const mate::Dictionary& options);
--
--  virtual void SetContentView(views::View* view) = 0;
--
--  virtual void Close() = 0;
--  virtual void CloseImmediately() = 0;
--  virtual bool IsClosed() const;
--  virtual void Focus(bool focus) = 0;
--  virtual bool IsFocused() = 0;
--  virtual void Show() = 0;
--  virtual void ShowInactive() = 0;
--  virtual void Hide() = 0;
--  virtual bool IsVisible() = 0;
--  virtual bool IsEnabled() = 0;
--  virtual void SetEnabled(bool enable) = 0;
--  virtual void Maximize() = 0;
--  virtual void Unmaximize() = 0;
--  virtual bool IsMaximized() = 0;
--  virtual void Minimize() = 0;
--  virtual void Restore() = 0;
--  virtual bool IsMinimized() = 0;
--  virtual void SetFullScreen(bool fullscreen) = 0;
--  virtual bool IsFullscreen() const = 0;
--  virtual void SetBounds(const gfx::Rect& bounds, bool animate = false) = 0;
--  virtual gfx::Rect GetBounds() = 0;
--  virtual void SetSize(const gfx::Size& size, bool animate = false);
--  virtual gfx::Size GetSize();
--  virtual void SetPosition(const gfx::Point& position, bool animate = false);
--  virtual gfx::Point GetPosition();
--  virtual void SetContentSize(const gfx::Size& size, bool animate = false);
--  virtual gfx::Size GetContentSize();
--  virtual void SetContentBounds(const gfx::Rect& bounds, bool animate = false);
--  virtual gfx::Rect GetContentBounds();
--  virtual void SetSizeConstraints(
--      const extensions::SizeConstraints& size_constraints);
--  virtual extensions::SizeConstraints GetSizeConstraints() const;
--  virtual void SetContentSizeConstraints(
--      const extensions::SizeConstraints& size_constraints);
--  virtual extensions::SizeConstraints GetContentSizeConstraints() const;
--  virtual void SetMinimumSize(const gfx::Size& size);
--  virtual gfx::Size GetMinimumSize() const;
--  virtual void SetMaximumSize(const gfx::Size& size);
--  virtual gfx::Size GetMaximumSize() const;
--  virtual gfx::Size GetContentMinimumSize() const;
--  virtual gfx::Size GetContentMaximumSize() const;
--  virtual void SetSheetOffset(const double offsetX, const double offsetY);
--  virtual double GetSheetOffsetX();
--  virtual double GetSheetOffsetY();
--  virtual void SetResizable(bool resizable) = 0;
--#if defined(OS_WIN) || defined(OS_MACOSX)
--  virtual void MoveTop() = 0;
--#endif
--  virtual bool IsResizable() = 0;
--  virtual void SetMovable(bool movable) = 0;
--  virtual bool IsMovable() = 0;
--  virtual void SetMinimizable(bool minimizable) = 0;
--  virtual bool IsMinimizable() = 0;
--  virtual void SetMaximizable(bool maximizable) = 0;
--  virtual bool IsMaximizable() = 0;
--  virtual void SetFullScreenable(bool fullscreenable) = 0;
--  virtual bool IsFullScreenable() = 0;
--  virtual void SetClosable(bool closable) = 0;
--  virtual bool IsClosable() = 0;
--  virtual void SetAlwaysOnTop(bool top,
--                              const std::string& level = "floating",
--                              int relativeLevel = 0,
--                              std::string* error = nullptr) = 0;
--  virtual bool IsAlwaysOnTop() = 0;
--  virtual void Center() = 0;
--  virtual void Invalidate() = 0;
--  virtual void SetTitle(const std::string& title) = 0;
--  virtual std::string GetTitle() = 0;
--  virtual void FlashFrame(bool flash) = 0;
--  virtual void SetSkipTaskbar(bool skip) = 0;
--  virtual void SetSimpleFullScreen(bool simple_fullscreen) = 0;
--  virtual bool IsSimpleFullScreen() = 0;
--  virtual void SetKiosk(bool kiosk) = 0;
--  virtual bool IsKiosk() = 0;
--  virtual void SetBackgroundColor(SkColor color) = 0;
--  virtual void SetHasShadow(bool has_shadow) = 0;
--  virtual bool HasShadow() = 0;
--  virtual void SetOpacity(const double opacity) = 0;
--  virtual double GetOpacity() = 0;
--  virtual void SetRepresentedFilename(const std::string& filename);
--  virtual std::string GetRepresentedFilename();
--  virtual void SetDocumentEdited(bool edited);
--  virtual bool IsDocumentEdited();
--  virtual void SetIgnoreMouseEvents(bool ignore, bool forward) = 0;
--  virtual void SetContentProtection(bool enable) = 0;
--  virtual void SetFocusable(bool focusable);
--  virtual void SetMenu(AtomMenuModel* menu);
--  virtual void SetParentWindow(NativeWindow* parent);
--  virtual void SetBrowserView(NativeBrowserView* browser_view) = 0;
--  virtual gfx::NativeView GetNativeView() const = 0;
--  virtual gfx::NativeWindow GetNativeWindow() const = 0;
--  virtual gfx::AcceleratedWidget GetAcceleratedWidget() const = 0;
--
--  // Taskbar/Dock APIs.
--  enum ProgressState {
--    PROGRESS_NONE,           // no progress, no marking
--    PROGRESS_INDETERMINATE,  // progress, indeterminate
--    PROGRESS_ERROR,          // progress, errored (red)
--    PROGRESS_PAUSED,         // progress, paused (yellow)
--    PROGRESS_NORMAL,         // progress, not marked (green)
--  };
--
--  virtual void SetProgressBar(double progress, const ProgressState state) = 0;
--  virtual void SetOverlayIcon(const gfx::Image& overlay,
--                              const std::string& description) = 0;
--
--  // Workspace APIs.
--  virtual void SetVisibleOnAllWorkspaces(bool visible) = 0;
--  virtual bool IsVisibleOnAllWorkspaces() = 0;
--
--  virtual void SetAutoHideCursor(bool auto_hide);
--
--  // Vibrancy API
--  virtual void SetVibrancy(const std::string& type);
--
--  // Touchbar API
--  virtual void SetTouchBar(
--      const std::vector<mate::PersistentDictionary>& items);
--  virtual void RefreshTouchBarItem(const std::string& item_id);
--  virtual void SetEscapeTouchBarItem(const mate::PersistentDictionary& item);
--
--  // Native Tab API
--  virtual void SelectPreviousTab();
--  virtual void SelectNextTab();
--  virtual void MergeAllWindows();
--  virtual void MoveTabToNewWindow();
--  virtual void ToggleTabBar();
--  virtual bool AddTabbedWindow(NativeWindow* window);
--
--  // Returns false if unsupported.
--  virtual bool SetWindowButtonVisibility(bool visible);
--
--  // Toggle the menu bar.
--  virtual void SetAutoHideMenuBar(bool auto_hide);
--  virtual bool IsMenuBarAutoHide();
--  virtual void SetMenuBarVisibility(bool visible);
--  virtual bool IsMenuBarVisible();
--
--  // Set the aspect ratio when resizing window.
--  double GetAspectRatio();
--  gfx::Size GetAspectRatioExtraSize();
--  virtual void SetAspectRatio(double aspect_ratio, const gfx::Size& extra_size);
--
--  // File preview APIs.
--  virtual void PreviewFile(const std::string& path,
--                           const std::string& display_name);
--  virtual void CloseFilePreview();
--
--  // Converts between content bounds and window bounds.
--  virtual gfx::Rect ContentBoundsToWindowBounds(
--      const gfx::Rect& bounds) const = 0;
--  virtual gfx::Rect WindowBoundsToContentBounds(
--      const gfx::Rect& bounds) const = 0;
--
--  base::WeakPtr<NativeWindow> GetWeakPtr() {
--    return weak_factory_.GetWeakPtr();
--  }
--
--  // Methods called by the WebContents.
--  virtual void HandleKeyboardEvent(
--      content::WebContents*,
--      const content::NativeWebKeyboardEvent& event) {}
--
--  // Public API used by platform-dependent delegates and observers to send UI
--  // related notifications.
--  void NotifyWindowRequestPreferredWith(int* width);
--  void NotifyWindowCloseButtonClicked();
--  void NotifyWindowClosed();
--  void NotifyWindowEndSession();
--  void NotifyWindowBlur();
--  void NotifyWindowFocus();
--  void NotifyWindowShow();
--  void NotifyWindowHide();
--  void NotifyWindowMaximize();
--  void NotifyWindowUnmaximize();
--  void NotifyWindowMinimize();
--  void NotifyWindowRestore();
--  void NotifyWindowMove();
--  void NotifyWindowWillResize(const gfx::Rect& new_bounds,
--                              bool* prevent_default);
--  void NotifyWindowResize();
--  void NotifyWindowMoved();
--  void NotifyWindowScrollTouchBegin();
--  void NotifyWindowScrollTouchEnd();
--  void NotifyWindowSwipe(const std::string& direction);
--  void NotifyWindowSheetBegin();
--  void NotifyWindowSheetEnd();
--  void NotifyWindowEnterFullScreen();
--  void NotifyWindowLeaveFullScreen();
--  void NotifyWindowEnterHtmlFullScreen();
--  void NotifyWindowLeaveHtmlFullScreen();
--  void NotifyWindowExecuteWindowsCommand(const std::string& command);
--  void NotifyTouchBarItemInteraction(const std::string& item_id,
--                                     const base::DictionaryValue& details);
--  void NotifyNewWindowForTab();
--
--#if defined(OS_WIN)
--  void NotifyWindowMessage(UINT message, WPARAM w_param, LPARAM l_param);
--#endif
--
--  void AddObserver(NativeWindowObserver* obs) { observers_.AddObserver(obs); }
--  void RemoveObserver(NativeWindowObserver* obs) {
--    observers_.RemoveObserver(obs);
--  }
--
--  views::Widget* widget() const { return widget_.get(); }
--  views::View* content_view() const { return content_view_; }
--
--  bool has_frame() const { return has_frame_; }
--  void set_has_frame(bool has_frame) { has_frame_ = has_frame; }
--
--  bool transparent() const { return transparent_; }
--  bool enable_larger_than_screen() const { return enable_larger_than_screen_; }
--
--  NativeBrowserView* browser_view() const { return browser_view_; }
--  NativeWindow* parent() const { return parent_; }
--  bool is_modal() const { return is_modal_; }
--
-- protected:
--  NativeWindow(const mate::Dictionary& options, NativeWindow* parent);
--
--  // views::WidgetDelegate:
--  views::Widget* GetWidget() override;
--  const views::Widget* GetWidget() const override;
--
--  void set_content_view(views::View* view) { content_view_ = view; }
--  void set_browser_view(NativeBrowserView* browser_view) {
--    browser_view_ = browser_view;
--  }
--
-- private:
--  std::unique_ptr<views::Widget> widget_;
--
--  // The content view, weak ref.
--  views::View* content_view_ = nullptr;
--
--  // Whether window has standard frame.
--  bool has_frame_ = true;
--
--  // Whether window is transparent.
--  bool transparent_ = false;
--
--  // Minimum and maximum size, stored as content size.
--  extensions::SizeConstraints size_constraints_;
--
--  // Whether window can be resized larger than screen.
--  bool enable_larger_than_screen_ = false;
--
--  // The windows has been closed.
--  bool is_closed_ = false;
--
--  // Used to display sheets at the appropriate horizontal and vertical offsets
--  // on macOS.
--  double sheet_offset_x_ = 0.0;
--  double sheet_offset_y_ = 0.0;
--
--  // Used to maintain the aspect ratio of a view which is inside of the
--  // content view.
--  double aspect_ratio_ = 0.0;
--  gfx::Size aspect_ratio_extraSize_;
--
--  // The parent window, it is guaranteed to be valid during this window's life.
--  NativeWindow* parent_ = nullptr;
--
--  // Is this a modal window.
--  bool is_modal_ = false;
--
--  // The browser view layer.
--  NativeBrowserView* browser_view_ = nullptr;
--
--  // Observers of this window.
--  base::ObserverList<NativeWindowObserver> observers_;
--
--  base::WeakPtrFactory<NativeWindow> weak_factory_;
--
--  DISALLOW_COPY_AND_ASSIGN(NativeWindow);
--};
--
--// This class provides a hook to get a NativeWindow from a WebContents.
--class NativeWindowRelay
--    : public content::WebContentsUserData<NativeWindowRelay> {
-- public:
--  explicit NativeWindowRelay(base::WeakPtr<NativeWindow> window);
--  ~NativeWindowRelay() override;
--
--  static void* UserDataKey() {
--    return content::WebContentsUserData<NativeWindowRelay>::UserDataKey();
--  }
--
--  void* key;
--  base::WeakPtr<NativeWindow> window;
--
-- private:
--  friend class content::WebContentsUserData<NativeWindow>;
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_NATIVE_WINDOW_H_
-removed in remote
-  base   100644 93d03e4c157cace08ef1792246a875e6e94eea6e atom/browser/native_window_mac.h
-  our    100644 44a78198f44cdba9875e3fb27c8e2c87eaa6f33b atom/browser/native_window_mac.h
-@@ -1,221 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_NATIVE_WINDOW_MAC_H_
--#define ATOM_BROWSER_NATIVE_WINDOW_MAC_H_
--
--#import <Cocoa/Cocoa.h>
--
--#include <string>
--#include <vector>
--
--#include "atom/browser/native_window.h"
--#include "base/mac/scoped_nsobject.h"
--#include "ui/views/controls/native/native_view_host.h"
--
--@class AtomNSWindow;
--@class AtomNSWindowDelegate;
--@class AtomPreviewItem;
--@class AtomTouchBar;
--@class CustomWindowButtonView;
--@class FullSizeContentView;
--
--namespace atom {
--
--class RootViewMac;
--
--class NativeWindowMac : public NativeWindow {
-- public:
--  NativeWindowMac(const mate::Dictionary& options, NativeWindow* parent);
--  ~NativeWindowMac() override;
--
--  // NativeWindow:
--  void SetContentView(views::View* view) override;
--  void Close() override;
--  void CloseImmediately() override;
--  void Focus(bool focus) override;
--  bool IsFocused() override;
--  void Show() override;
--  void ShowInactive() override;
--  void Hide() override;
--  bool IsVisible() override;
--  bool IsEnabled() override;
--  void SetEnabled(bool enable) override;
--  void Maximize() override;
--  void Unmaximize() override;
--  bool IsMaximized() override;
--  void Minimize() override;
--  void Restore() override;
--  bool IsMinimized() override;
--  void SetFullScreen(bool fullscreen) override;
--  bool IsFullscreen() const override;
--  void SetBounds(const gfx::Rect& bounds, bool animate = false) override;
--  gfx::Rect GetBounds() override;
--  void SetContentSizeConstraints(
--      const extensions::SizeConstraints& size_constraints) override;
--  void SetResizable(bool resizable) override;
--  void MoveTop() override;
--  bool IsResizable() override;
--  void SetMovable(bool movable) override;
--  void SetAspectRatio(double aspect_ratio,
--                      const gfx::Size& extra_size) override;
--  void PreviewFile(const std::string& path,
--                   const std::string& display_name) override;
--  void CloseFilePreview() override;
--  bool IsMovable() override;
--  void SetMinimizable(bool minimizable) override;
--  bool IsMinimizable() override;
--  void SetMaximizable(bool maximizable) override;
--  bool IsMaximizable() override;
--  void SetFullScreenable(bool fullscreenable) override;
--  bool IsFullScreenable() override;
--  void SetClosable(bool closable) override;
--  bool IsClosable() override;
--  void SetAlwaysOnTop(bool top,
--                      const std::string& level,
--                      int relativeLevel,
--                      std::string* error) override;
--  bool IsAlwaysOnTop() override;
--  void Center() override;
--  void Invalidate() override;
--  void SetTitle(const std::string& title) override;
--  std::string GetTitle() override;
--  void FlashFrame(bool flash) override;
--  void SetSkipTaskbar(bool skip) override;
--  void SetSimpleFullScreen(bool simple_fullscreen) override;
--  bool IsSimpleFullScreen() override;
--  void SetKiosk(bool kiosk) override;
--  bool IsKiosk() override;
--  void SetBackgroundColor(SkColor color) override;
--  void SetHasShadow(bool has_shadow) override;
--  bool HasShadow() override;
--  void SetOpacity(const double opacity) override;
--  double GetOpacity() override;
--  void SetRepresentedFilename(const std::string& filename) override;
--  std::string GetRepresentedFilename() override;
--  void SetDocumentEdited(bool edited) override;
--  bool IsDocumentEdited() override;
--  void SetIgnoreMouseEvents(bool ignore, bool forward) override;
--  void SetContentProtection(bool enable) override;
--  void SetBrowserView(NativeBrowserView* browser_view) override;
--  void SetParentWindow(NativeWindow* parent) override;
--  gfx::NativeView GetNativeView() const override;
--  gfx::NativeWindow GetNativeWindow() const override;
--  gfx::AcceleratedWidget GetAcceleratedWidget() const override;
--  void SetProgressBar(double progress, const ProgressState state) override;
--  void SetOverlayIcon(const gfx::Image& overlay,
--                      const std::string& description) override;
--
--  void SetVisibleOnAllWorkspaces(bool visible) override;
--  bool IsVisibleOnAllWorkspaces() override;
--
--  void SetAutoHideCursor(bool auto_hide) override;
--
--  void SelectPreviousTab() override;
--  void SelectNextTab() override;
--  void MergeAllWindows() override;
--  void MoveTabToNewWindow() override;
--  void ToggleTabBar() override;
--  bool AddTabbedWindow(NativeWindow* window) override;
--
--  bool SetWindowButtonVisibility(bool visible) override;
--
--  void SetVibrancy(const std::string& type) override;
--  void SetTouchBar(
--      const std::vector<mate::PersistentDictionary>& items) override;
--  void RefreshTouchBarItem(const std::string& item_id) override;
--  void SetEscapeTouchBarItem(const mate::PersistentDictionary& item) override;
--
--  gfx::Rect ContentBoundsToWindowBounds(const gfx::Rect& bounds) const override;
--  gfx::Rect WindowBoundsToContentBounds(const gfx::Rect& bounds) const override;
--
--  // Use a custom content view instead of Chromium's BridgedContentView.
--  void OverrideNSWindowContentView();
--
--  // Set the attribute of NSWindow while work around a bug of zoom button.
--  void SetStyleMask(bool on, NSUInteger flag);
--  void SetCollectionBehavior(bool on, NSUInteger flag);
--
--  enum TitleBarStyle {
--    NORMAL,
--    HIDDEN,
--    HIDDEN_INSET,
--    CUSTOM_BUTTONS_ON_HOVER,
--  };
--  TitleBarStyle title_bar_style() const { return title_bar_style_; }
--
--  AtomPreviewItem* preview_item() const { return preview_item_.get(); }
--  AtomTouchBar* touch_bar() const { return touch_bar_.get(); }
--  bool zoom_to_page_width() const { return zoom_to_page_width_; }
--  bool fullscreen_window_title() const { return fullscreen_window_title_; }
--  bool simple_fullscreen() const { return always_simple_fullscreen_; }
--
-- protected:
--  // views::WidgetDelegate:
--  bool CanResize() const override;
--  views::View* GetContentsView() override;
--
-- private:
--  // Add custom layers to the content view.
--  void AddContentViewLayers();
--
--  void InternalSetParentWindow(NativeWindow* parent, bool attach);
--  void ShowWindowButton(NSWindowButton button);
--
--  void SetForwardMouseMessages(bool forward);
--
--  AtomNSWindow* window_;  // Weak ref, managed by widget_.
--
--  base::scoped_nsobject<AtomNSWindowDelegate> window_delegate_;
--  base::scoped_nsobject<AtomPreviewItem> preview_item_;
--  base::scoped_nsobject<AtomTouchBar> touch_bar_;
--  base::scoped_nsobject<CustomWindowButtonView> buttons_view_;
--
--  // Event monitor for scroll wheel event.
--  id wheel_event_monitor_;
--
--  // The view that will fill the whole frameless window.
--  base::scoped_nsobject<FullSizeContentView> container_view_;
--
--  // The view that fills the client area.
--  std::unique_ptr<RootViewMac> root_view_;
--
--  bool is_kiosk_ = false;
--  bool was_fullscreen_ = false;
--  bool zoom_to_page_width_ = false;
--  bool fullscreen_window_title_ = false;
--  bool resizable_ = true;
--
--  NSInteger attention_request_id_ = 0;  // identifier from requestUserAttention
--
--  // The presentation options before entering kiosk mode.
--  NSApplicationPresentationOptions kiosk_options_;
--
--  // The "titleBarStyle" option.
--  TitleBarStyle title_bar_style_ = NORMAL;
--
--  // The visibility mode of window button controls when explicitly set through
--  // setWindowButtonVisibility().
--  base::Optional<bool> window_button_visibility_;
--
--  // Simple (pre-Lion) Fullscreen Settings
--  bool always_simple_fullscreen_ = false;
--  bool is_simple_fullscreen_ = false;
--  bool was_maximizable_ = false;
--  bool was_movable_ = false;
--  NSRect original_frame_;
--  NSUInteger simple_fullscreen_mask_;
--
--  base::scoped_nsobject<NSColor> background_color_before_vibrancy_;
--  bool transparency_before_vibrancy_ = false;
--
--  // The presentation options before entering simple fullscreen mode.
--  NSApplicationPresentationOptions simple_fullscreen_options_;
--
--  DISALLOW_COPY_AND_ASSIGN(NativeWindowMac);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_NATIVE_WINDOW_MAC_H_
-removed in remote
-  base   100644 2044ee7d7189076a93975231ef9c54662cf3ee3e atom/browser/native_window_mac.mm
-  our    100644 004263ec127709067e903ffbf31003b8844226b4 atom/browser/native_window_mac.mm
-@@ -1,1444 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/native_window_mac.h"
--
--#include <AvailabilityMacros.h>
--#include <objc/objc-runtime.h>
--
--#include <string>
--
--#include "atom/browser/native_browser_view_mac.h"
--#include "atom/browser/ui/cocoa/atom_native_widget_mac.h"
--#include "atom/browser/ui/cocoa/atom_ns_window.h"
--#include "atom/browser/ui/cocoa/atom_ns_window_delegate.h"
--#include "atom/browser/ui/cocoa/atom_preview_item.h"
--#include "atom/browser/ui/cocoa/atom_touch_bar.h"
--#include "atom/browser/ui/cocoa/root_view_mac.h"
--#include "atom/browser/window_list.h"
--#include "atom/common/options_switches.h"
--#include "base/mac/mac_util.h"
--#include "base/mac/scoped_cftyperef.h"
--#include "base/strings/sys_string_conversions.h"
--#include "brightray/browser/inspectable_web_contents.h"
--#include "brightray/browser/inspectable_web_contents_view.h"
--#include "content/public/browser/browser_accessibility_state.h"
--#include "native_mate/dictionary.h"
--#include "skia/ext/skia_utils_mac.h"
--#include "ui/gfx/skia_util.h"
--#include "ui/gl/gpu_switching_manager.h"
--#include "ui/views/background.h"
--#include "ui/views/cocoa/bridged_native_widget.h"
--#include "ui/views/widget/widget.h"
--
--// This view always takes the size of its superview. It is intended to be used
--// as a NSWindow's contentView.  It is needed because NSWindow's implementation
--// explicitly resizes the contentView at inopportune times.
--@interface FullSizeContentView : NSView
--@end
--
--@implementation FullSizeContentView
--
--// This method is directly called by NSWindow during a window resize on OSX
--// 10.10.0, beta 2. We must override it to prevent the content view from
--// shrinking.
--- (void)setFrameSize:(NSSize)size {
--  if ([self superview])
--    size = [[self superview] bounds].size;
--  [super setFrameSize:size];
--}
--
--// The contentView gets moved around during certain full-screen operations.
--// This is less than ideal, and should eventually be removed.
--- (void)viewDidMoveToSuperview {
--  [self setFrame:[[self superview] bounds]];
--}
--
--@end
--
--// Custom Quit, Minimize and Full Screen button container for frameless
--// windows.
--@interface CustomWindowButtonView : NSView {
-- @private
--  BOOL mouse_inside_;
--}
--@end
--
--@implementation CustomWindowButtonView
--
--- (id)initWithFrame:(NSRect)frame {
--  self = [super initWithFrame:frame];
--
--  NSButton* close_button = [NSWindow standardWindowButton:NSWindowCloseButton
--                                             forStyleMask:NSTitledWindowMask];
--  NSButton* miniaturize_button =
--      [NSWindow standardWindowButton:NSWindowMiniaturizeButton
--                        forStyleMask:NSTitledWindowMask];
--  NSButton* zoom_button = [NSWindow standardWindowButton:NSWindowZoomButton
--                                            forStyleMask:NSTitledWindowMask];
--
--  CGFloat x = 0;
--  const CGFloat space_between = 20;
--
--  [close_button setFrameOrigin:NSMakePoint(x, 0)];
--  x += space_between;
--  [self addSubview:close_button];
--
--  [miniaturize_button setFrameOrigin:NSMakePoint(x, 0)];
--  x += space_between;
--  [self addSubview:miniaturize_button];
--
--  [zoom_button setFrameOrigin:NSMakePoint(x, 0)];
--  x += space_between;
--  [self addSubview:zoom_button];
--
--  const auto last_button_frame = zoom_button.frame;
--  [self setFrameSize:NSMakeSize(last_button_frame.origin.x +
--                                    last_button_frame.size.width,
--                                last_button_frame.size.height)];
--
--  mouse_inside_ = NO;
--  [self setNeedsDisplayForButtons];
--
--  return self;
--}
--
--- (void)viewDidMoveToWindow {
--  if (!self.window) {
--    return;
--  }
--
--  // Stay in upper left corner.
--  const CGFloat top_margin = 3;
--  const CGFloat left_margin = 7;
--  [self setAutoresizingMask:NSViewMaxXMargin | NSViewMinYMargin];
--  [self setFrameOrigin:NSMakePoint(left_margin, self.window.frame.size.height -
--                                                    self.frame.size.height -
--                                                    top_margin)];
--}
--
--- (BOOL)_mouseInGroup:(NSButton*)button {
--  return mouse_inside_;
--}
--
--- (void)updateTrackingAreas {
--  auto tracking_area = [[[NSTrackingArea alloc]
--      initWithRect:NSZeroRect
--           options:NSTrackingMouseEnteredAndExited | NSTrackingActiveAlways |
--                   NSTrackingInVisibleRect
--             owner:self
--          userInfo:nil] autorelease];
--  [self addTrackingArea:tracking_area];
--}
--
--- (void)mouseEntered:(NSEvent*)event {
--  [super mouseEntered:event];
--  mouse_inside_ = YES;
--  [self setNeedsDisplayForButtons];
--}
--
--- (void)mouseExited:(NSEvent*)event {
--  [super mouseExited:event];
--  mouse_inside_ = NO;
--  [self setNeedsDisplayForButtons];
--}
--
--- (void)setNeedsDisplayForButtons {
--  for (NSView* subview in self.subviews) {
--    [subview setHidden:!mouse_inside_];
--    [subview setNeedsDisplay:YES];
--  }
--}
--
--@end
--
--#if !defined(AVAILABLE_MAC_OS_X_VERSION_10_12_AND_LATER)
--
--enum { NSWindowTabbingModeDisallowed = 2 };
--
--@interface NSWindow (SierraSDK)
--- (void)setTabbingMode:(NSInteger)mode;
--- (void)setTabbingIdentifier:(NSString*)identifier;
--- (void)addTabbedWindow:(NSWindow*)window ordered:(NSWindowOrderingMode)ordered;
--- (IBAction)selectPreviousTab:(id)sender;
--- (IBAction)selectNextTab:(id)sender;
--- (IBAction)mergeAllWindows:(id)sender;
--- (IBAction)moveTabToNewWindow:(id)sender;
--- (IBAction)toggleTabBar:(id)sender;
--@end
--
--#endif
--
--@interface AtomProgressBar : NSProgressIndicator
--@end
--
--@implementation AtomProgressBar
--
--- (void)drawRect:(NSRect)dirtyRect {
--  if (self.style != NSProgressIndicatorBarStyle)
--    return;
--  // Draw edges of rounded rect.
--  NSRect rect = NSInsetRect([self bounds], 1.0, 1.0);
--  CGFloat radius = rect.size.height / 2;
--  NSBezierPath* bezier_path = [NSBezierPath bezierPathWithRoundedRect:rect
--                                                              xRadius:radius
--                                                              yRadius:radius];
--  [bezier_path setLineWidth:2.0];
--  [[NSColor grayColor] set];
--  [bezier_path stroke];
--
--  // Fill the rounded rect.
--  rect = NSInsetRect(rect, 2.0, 2.0);
--  radius = rect.size.height / 2;
--  bezier_path = [NSBezierPath bezierPathWithRoundedRect:rect
--                                                xRadius:radius
--                                                yRadius:radius];
--  [bezier_path setLineWidth:1.0];
--  [bezier_path addClip];
--
--  // Calculate the progress width.
--  rect.size.width =
--      floor(rect.size.width * ([self doubleValue] / [self maxValue]));
--
--  // Fill the progress bar with color blue.
--  [[NSColor colorWithSRGBRed:0.2 green:0.6 blue:1 alpha:1] set];
--  NSRectFill(rect);
--}
--
--@end
--
--namespace mate {
--
--template <>
--struct Converter<atom::NativeWindowMac::TitleBarStyle> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Handle<v8::Value> val,
--                     atom::NativeWindowMac::TitleBarStyle* out) {
--    std::string title_bar_style;
--    if (!ConvertFromV8(isolate, val, &title_bar_style))
--      return false;
--    if (title_bar_style == "hidden") {
--      *out = atom::NativeWindowMac::HIDDEN;
--    } else if (title_bar_style == "hiddenInset") {
--      *out = atom::NativeWindowMac::HIDDEN_INSET;
--    } else if (title_bar_style == "customButtonsOnHover") {
--      *out = atom::NativeWindowMac::CUSTOM_BUTTONS_ON_HOVER;
--    } else {
--      return false;
--    }
--    return true;
--  }
--};
--
--}  // namespace mate
--
--namespace atom {
--
--namespace {
--
--bool IsFramelessWindow(NSView* view) {
--  NativeWindow* window = [static_cast<AtomNSWindow*>([view window]) shell];
--  return window && !window->has_frame();
--}
--
--IMP original_set_frame_size = nullptr;
--IMP original_view_did_move_to_superview = nullptr;
--
--// This method is directly called by NSWindow during a window resize on OSX
--// 10.10.0, beta 2. We must override it to prevent the content view from
--// shrinking.
--void SetFrameSize(NSView* self, SEL _cmd, NSSize size) {
--  if (!IsFramelessWindow(self)) {
--    auto original =
--        reinterpret_cast<decltype(&SetFrameSize)>(original_set_frame_size);
--    return original(self, _cmd, size);
--  }
--  // For frameless window, resize the view to cover full window.
--  if ([self superview])
--    size = [[self superview] bounds].size;
--  auto super_impl = reinterpret_cast<decltype(&SetFrameSize)>(
--      [[self superclass] instanceMethodForSelector:_cmd]);
--  super_impl(self, _cmd, size);
--}
--
--// The contentView gets moved around during certain full-screen operations.
--// This is less than ideal, and should eventually be removed.
--void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
--  if (!IsFramelessWindow(self)) {
--    // [BridgedContentView viewDidMoveToSuperview];
--    auto original = reinterpret_cast<decltype(&ViewDidMoveToSuperview)>(
--        original_view_did_move_to_superview);
--    if (original)
--      original(self, _cmd);
--    return;
--  }
--  [self setFrame:[[self superview] bounds]];
--}
--
--}  // namespace
--
--NativeWindowMac::NativeWindowMac(const mate::Dictionary& options,
--                                 NativeWindow* parent)
--    : NativeWindow(options, parent), root_view_(new RootViewMac(this)) {
--  int width = 800, height = 600;
--  options.Get(options::kWidth, &width);
--  options.Get(options::kHeight, &height);
--
--  NSRect main_screen_rect = [[[NSScreen screens] firstObject] frame];
--  gfx::Rect bounds(round((NSWidth(main_screen_rect) - width) / 2),
--                   round((NSHeight(main_screen_rect) - height) / 2), width,
--                   height);
--
--  options.Get(options::kResizable, &resizable_);
--  options.Get(options::kTitleBarStyle, &title_bar_style_);
--  options.Get(options::kZoomToPageWidth, &zoom_to_page_width_);
--  options.Get(options::kFullscreenWindowTitle, &fullscreen_window_title_);
--  options.Get(options::kSimpleFullScreen, &always_simple_fullscreen_);
--
--  bool minimizable = true;
--  options.Get(options::kMinimizable, &minimizable);
--
--  bool maximizable = true;
--  options.Get(options::kMaximizable, &maximizable);
--
--  bool closable = true;
--  options.Get(options::kClosable, &closable);
--
--  std::string tabbingIdentifier;
--  options.Get(options::kTabbingIdentifier, &tabbingIdentifier);
--
--  std::string windowType;
--  options.Get(options::kType, &windowType);
--
--  bool useStandardWindow = true;
--  // eventually deprecate separate "standardWindow" option in favor of
--  // standard / textured window types
--  options.Get(options::kStandardWindow, &useStandardWindow);
--  if (windowType == "textured") {
--    useStandardWindow = false;
--  }
--
--  NSUInteger styleMask = NSTitledWindowMask;
--  if (@available(macOS 10.10, *)) {
--    if (title_bar_style_ == CUSTOM_BUTTONS_ON_HOVER &&
--        (!useStandardWindow || transparent() || !has_frame())) {
--      styleMask = NSFullSizeContentViewWindowMask;
--    }
--  }
--  if (minimizable) {
--    styleMask |= NSMiniaturizableWindowMask;
--  }
--  if (closable) {
--    styleMask |= NSClosableWindowMask;
--  }
--  if (title_bar_style_ != NORMAL) {
--    // The window without titlebar is treated the same with frameless window.
--    set_has_frame(false);
--  }
--  if (!useStandardWindow || transparent() || !has_frame()) {
--    styleMask |= NSTexturedBackgroundWindowMask;
--  }
--
--  // Create views::Widget and assign window_ with it.
--  // TODO(zcbenz): Get rid of the window_ in future.
--  views::Widget::InitParams params;
--  params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
--  params.bounds = bounds;
--  params.delegate = this;
--  params.type = views::Widget::InitParams::TYPE_WINDOW;
--  params.native_widget = new AtomNativeWidgetMac(this, styleMask, widget());
--  widget()->Init(params);
--  window_ = static_cast<AtomNSWindow*>(widget()->GetNativeWindow());
--
--  [window_ setEnableLargerThanScreen:enable_larger_than_screen()];
--
--  window_delegate_.reset([[AtomNSWindowDelegate alloc] initWithShell:this]);
--  [window_ setDelegate:window_delegate_];
--
--  // Only use native parent window for non-modal windows.
--  if (parent && !is_modal()) {
--    SetParentWindow(parent);
--  }
--
--  if (transparent()) {
--    // Setting the background color to clear will also hide the shadow.
--    [window_ setBackgroundColor:[NSColor clearColor]];
--  }
--
--  if (windowType == "desktop") {
--    [window_ setLevel:kCGDesktopWindowLevel - 1];
--    [window_ setDisableKeyOrMainWindow:YES];
--    [window_ setCollectionBehavior:(NSWindowCollectionBehaviorCanJoinAllSpaces |
--                                    NSWindowCollectionBehaviorStationary |
--                                    NSWindowCollectionBehaviorIgnoresCycle)];
--  }
--
--  bool focusable;
--  if (options.Get(options::kFocusable, &focusable) && !focusable)
--    [window_ setDisableKeyOrMainWindow:YES];
--
--  if (transparent() || !has_frame()) {
--    if (@available(macOS 10.10, *)) {
--      // Don't show title bar.
--      [window_ setTitlebarAppearsTransparent:YES];
--      [window_ setTitleVisibility:NSWindowTitleHidden];
--    }
--    // Remove non-transparent corners, see http://git.io/vfonD.
--    [window_ setOpaque:NO];
--  }
--
--  // Create a tab only if tabbing identifier is specified and window has
--  // a native title bar.
--  if (tabbingIdentifier.empty() || transparent() || !has_frame()) {
--    if (@available(macOS 10.12, *)) {
--      [window_ setTabbingMode:NSWindowTabbingModeDisallowed];
--    }
--  } else {
--    if (@available(macOS 10.12, *)) {
--      [window_ setTabbingIdentifier:base::SysUTF8ToNSString(tabbingIdentifier)];
--    }
--  }
--
--  // Hide the title bar background
--  if (title_bar_style_ != NORMAL) {
--    if (@available(macOS 10.10, *)) {
--      [window_ setTitlebarAppearsTransparent:YES];
--    }
--  }
--
--  // Hide the title bar.
--  if (title_bar_style_ == HIDDEN_INSET) {
--    if (@available(macOS 10.10, *)) {
--      base::scoped_nsobject<NSToolbar> toolbar(
--          [[NSToolbar alloc] initWithIdentifier:@"titlebarStylingToolbar"]);
--      [toolbar setShowsBaselineSeparator:NO];
--      [window_ setToolbar:toolbar];
--    } else {
--      [window_ enableWindowButtonsOffset];
--      [window_ setWindowButtonsOffset:NSMakePoint(12, 10)];
--    }
--  }
--
--  // Resize to content bounds.
--  bool use_content_size = false;
--  options.Get(options::kUseContentSize, &use_content_size);
--  if (!has_frame() || use_content_size)
--    SetContentSize(gfx::Size(width, height));
--
--  // Enable the NSView to accept first mouse event.
--  bool acceptsFirstMouse = false;
--  options.Get(options::kAcceptFirstMouse, &acceptsFirstMouse);
--  [window_ setAcceptsFirstMouse:acceptsFirstMouse];
--
--  // Disable auto-hiding cursor.
--  bool disableAutoHideCursor = false;
--  options.Get(options::kDisableAutoHideCursor, &disableAutoHideCursor);
--  [window_ setDisableAutoHideCursor:disableAutoHideCursor];
--
--  // Use an NSEvent monitor to listen for the wheel event.
--  BOOL __block began = NO;
--  wheel_event_monitor_ = [NSEvent
--      addLocalMonitorForEventsMatchingMask:NSScrollWheelMask
--                                   handler:^(NSEvent* event) {
--                                     if ([[event window] windowNumber] !=
--                                         [window_ windowNumber])
--                                       return event;
--
--                                     if (!began && (([event phase] ==
--                                                     NSEventPhaseMayBegin) ||
--                                                    ([event phase] ==
--                                                     NSEventPhaseBegan))) {
--                                       this->NotifyWindowScrollTouchBegin();
--                                       began = YES;
--                                     } else if (began &&
--                                                (([event phase] ==
--                                                  NSEventPhaseEnded) ||
--                                                 ([event phase] ==
--                                                  NSEventPhaseCancelled))) {
--                                       this->NotifyWindowScrollTouchEnd();
--                                       began = NO;
--                                     }
--                                     return event;
--                                   }];
--
--  // Set maximizable state last to ensure zoom button does not get reset
--  // by calls to other APIs.
--  SetMaximizable(maximizable);
--
--  // Default content view.
--  SetContentView(new views::View());
--  AddContentViewLayers();
--}
--
--NativeWindowMac::~NativeWindowMac() {
--  [NSEvent removeMonitor:wheel_event_monitor_];
--}
--
--void NativeWindowMac::SetContentView(views::View* view) {
--  views::View* root_view = GetContentsView();
--  if (content_view())
--    root_view->RemoveChildView(content_view());
--
--  set_content_view(view);
--  root_view->AddChildView(content_view());
--
--  if (buttons_view_) {
--    // Ensure the buttons view are always floated on the top.
--    [buttons_view_ removeFromSuperview];
--    [[window_ contentView] addSubview:buttons_view_];
--  }
--
--  root_view->Layout();
--}
--
--void NativeWindowMac::Close() {
--  // When this is a sheet showing, performClose won't work.
--  if (is_modal() && parent() && IsVisible()) {
--    [parent()->GetNativeWindow() endSheet:window_];
--    CloseImmediately();
--    return;
--  }
--
--  if (!IsClosable()) {
--    WindowList::WindowCloseCancelled(this);
--    return;
--  }
--
--  [window_ performClose:nil];
--}
--
--void NativeWindowMac::CloseImmediately() {
--  [window_ close];
--}
--
--void NativeWindowMac::Focus(bool focus) {
--  if (!IsVisible())
--    return;
--
--  if (focus) {
--    [[NSApplication sharedApplication] activateIgnoringOtherApps:YES];
--    [window_ makeKeyAndOrderFront:nil];
--  } else {
--    [window_ orderBack:nil];
--  }
--}
--
--bool NativeWindowMac::IsFocused() {
--  return [window_ isKeyWindow];
--}
--
--void NativeWindowMac::Show() {
--  if (is_modal() && parent()) {
--    if ([window_ sheetParent] == nil)
--      [parent()->GetNativeWindow() beginSheet:window_
--                            completionHandler:^(NSModalResponse){
--                            }];
--    return;
--  }
--
--  // Reattach the window to the parent to actually show it.
--  if (parent())
--    InternalSetParentWindow(parent(), true);
--
--  // This method is supposed to put focus on window, however if the app does not
--  // have focus then "makeKeyAndOrderFront" will only show the window.
--  [NSApp activateIgnoringOtherApps:YES];
--
--  [window_ makeKeyAndOrderFront:nil];
--}
--
--void NativeWindowMac::ShowInactive() {
--  // Reattach the window to the parent to actually show it.
--  if (parent())
--    InternalSetParentWindow(parent(), true);
--
--  [window_ orderFrontRegardless];
--}
--
--void NativeWindowMac::Hide() {
--  if (is_modal() && parent()) {
--    [window_ orderOut:nil];
--    [parent()->GetNativeWindow() endSheet:window_];
--    return;
--  }
--
--  // Deattach the window from the parent before.
--  if (parent())
--    InternalSetParentWindow(parent(), false);
--
--  [window_ orderOut:nil];
--}
--
--bool NativeWindowMac::IsVisible() {
--  return [window_ isVisible];
--}
--
--bool NativeWindowMac::IsEnabled() {
--  return [window_ attachedSheet] == nil;
--}
--
--void NativeWindowMac::SetEnabled(bool enable) {
--  if (enable) {
--    [window_ beginSheet:window_
--        completionHandler:^(NSModalResponse returnCode) {
--          NSLog(@"modal enabled");
--          return;
--        }];
--  } else {
--    [window_ endSheet:[window_ attachedSheet]];
--  }
--}
--
--void NativeWindowMac::Maximize() {
--  if (IsMaximized())
--    return;
--
--  [window_ zoom:nil];
--}
--
--void NativeWindowMac::Unmaximize() {
--  if (!IsMaximized())
--    return;
--
--  [window_ zoom:nil];
--}
--
--bool NativeWindowMac::IsMaximized() {
--  if (([window_ styleMask] & NSResizableWindowMask) != 0) {
--    return [window_ isZoomed];
--  } else {
--    NSRect rectScreen = [[NSScreen mainScreen] visibleFrame];
--    NSRect rectWindow = [window_ frame];
--    return (rectScreen.origin.x == rectWindow.origin.x &&
--            rectScreen.origin.y == rectWindow.origin.y &&
--            rectScreen.size.width == rectWindow.size.width &&
--            rectScreen.size.height == rectWindow.size.height);
--  }
--}
--
--void NativeWindowMac::Minimize() {
--  [window_ miniaturize:nil];
--}
--
--void NativeWindowMac::Restore() {
--  [window_ deminiaturize:nil];
--}
--
--bool NativeWindowMac::IsMinimized() {
--  return [window_ isMiniaturized];
--}
--
--void NativeWindowMac::SetFullScreen(bool fullscreen) {
--  if (fullscreen == IsFullscreen())
--    return;
--
--  [window_ toggleFullScreenMode:nil];
--}
--
--bool NativeWindowMac::IsFullscreen() const {
--  return [window_ styleMask] & NSFullScreenWindowMask;
--}
--
--void NativeWindowMac::SetBounds(const gfx::Rect& bounds, bool animate) {
--  // Do nothing if in fullscreen mode.
--  if (IsFullscreen())
--    return;
--
--  // Check size constraints since setFrame does not check it.
--  gfx::Size size = bounds.size();
--  size.SetToMax(GetMinimumSize());
--  gfx::Size max_size = GetMaximumSize();
--  if (!max_size.IsEmpty())
--    size.SetToMin(max_size);
--
--  NSRect cocoa_bounds = NSMakeRect(bounds.x(), 0, size.width(), size.height());
--  // Flip coordinates based on the primary screen.
--  NSScreen* screen = [[NSScreen screens] firstObject];
--  cocoa_bounds.origin.y = NSHeight([screen frame]) - size.height() - bounds.y();
--
--  [window_ setFrame:cocoa_bounds display:YES animate:animate];
--}
--
--gfx::Rect NativeWindowMac::GetBounds() {
--  NSRect frame = [window_ frame];
--  gfx::Rect bounds(frame.origin.x, 0, NSWidth(frame), NSHeight(frame));
--  NSScreen* screen = [[NSScreen screens] firstObject];
--  bounds.set_y(NSHeight([screen frame]) - NSMaxY(frame));
--  return bounds;
--}
--
--void NativeWindowMac::SetContentSizeConstraints(
--    const extensions::SizeConstraints& size_constraints) {
--  auto convertSize = [this](const gfx::Size& size) {
--    // Our frameless window still has titlebar attached, so setting contentSize
--    // will result in actual content size being larger.
--    if (!has_frame()) {
--      NSRect frame = NSMakeRect(0, 0, size.width(), size.height());
--      NSRect content = [window_ originalContentRectForFrameRect:frame];
--      return content.size;
--    } else {
--      return NSMakeSize(size.width(), size.height());
--    }
--  };
--
--  NSView* content = [window_ contentView];
--  if (size_constraints.HasMinimumSize()) {
--    NSSize min_size = convertSize(size_constraints.GetMinimumSize());
--    [window_ setContentMinSize:[content convertSize:min_size toView:nil]];
--  }
--  if (size_constraints.HasMaximumSize()) {
--    NSSize max_size = convertSize(size_constraints.GetMaximumSize());
--    [window_ setContentMaxSize:[content convertSize:max_size toView:nil]];
--  }
--  NativeWindow::SetContentSizeConstraints(size_constraints);
--}
--
--void NativeWindowMac::MoveTop() {
--  [window_ orderWindow:NSWindowAbove relativeTo:0];
--}
--
--void NativeWindowMac::SetResizable(bool resizable) {
--  SetStyleMask(resizable, NSResizableWindowMask);
--}
--
--bool NativeWindowMac::IsResizable() {
--  return [window_ styleMask] & NSResizableWindowMask;
--}
--
--void NativeWindowMac::SetAspectRatio(double aspect_ratio,
--                                     const gfx::Size& extra_size) {
--  NativeWindow::SetAspectRatio(aspect_ratio, extra_size);
--
--  // Reset the behaviour to default if aspect_ratio is set to 0 or less.
--  if (aspect_ratio > 0.0)
--    [window_ setAspectRatio:NSMakeSize(aspect_ratio, 1.0)];
--  else
--    [window_ setResizeIncrements:NSMakeSize(1.0, 1.0)];
--}
--
--void NativeWindowMac::PreviewFile(const std::string& path,
--                                  const std::string& display_name) {
--  preview_item_.reset([[AtomPreviewItem alloc]
--      initWithURL:[NSURL fileURLWithPath:base::SysUTF8ToNSString(path)]
--            title:base::SysUTF8ToNSString(display_name)]);
--  [[QLPreviewPanel sharedPreviewPanel] makeKeyAndOrderFront:nil];
--}
--
--void NativeWindowMac::CloseFilePreview() {
--  if ([QLPreviewPanel sharedPreviewPanelExists]) {
--    [[QLPreviewPanel sharedPreviewPanel] close];
--  }
--}
--
--void NativeWindowMac::SetMovable(bool movable) {
--  [window_ setMovable:movable];
--}
--
--bool NativeWindowMac::IsMovable() {
--  return [window_ isMovable];
--}
--
--void NativeWindowMac::SetMinimizable(bool minimizable) {
--  SetStyleMask(minimizable, NSMiniaturizableWindowMask);
--}
--
--bool NativeWindowMac::IsMinimizable() {
--  return [window_ styleMask] & NSMiniaturizableWindowMask;
--}
--
--void NativeWindowMac::SetMaximizable(bool maximizable) {
--  [[window_ standardWindowButton:NSWindowZoomButton] setEnabled:maximizable];
--}
--
--bool NativeWindowMac::IsMaximizable() {
--  return [[window_ standardWindowButton:NSWindowZoomButton] isEnabled];
--}
--
--void NativeWindowMac::SetFullScreenable(bool fullscreenable) {
--  SetCollectionBehavior(fullscreenable,
--                        NSWindowCollectionBehaviorFullScreenPrimary);
--  // On EL Capitan this flag is required to hide fullscreen button.
--  SetCollectionBehavior(!fullscreenable,
--                        NSWindowCollectionBehaviorFullScreenAuxiliary);
--}
--
--bool NativeWindowMac::IsFullScreenable() {
--  NSUInteger collectionBehavior = [window_ collectionBehavior];
--  return collectionBehavior & NSWindowCollectionBehaviorFullScreenPrimary;
--}
--
--void NativeWindowMac::SetClosable(bool closable) {
--  SetStyleMask(closable, NSClosableWindowMask);
--}
--
--bool NativeWindowMac::IsClosable() {
--  return [window_ styleMask] & NSClosableWindowMask;
--}
--
--void NativeWindowMac::SetAlwaysOnTop(bool top,
--                                     const std::string& level,
--                                     int relativeLevel,
--                                     std::string* error) {
--  int windowLevel = NSNormalWindowLevel;
--  CGWindowLevel maxWindowLevel = CGWindowLevelForKey(kCGMaximumWindowLevelKey);
--  CGWindowLevel minWindowLevel = CGWindowLevelForKey(kCGMinimumWindowLevelKey);
--
--  if (top) {
--    if (level == "floating") {
--      windowLevel = NSFloatingWindowLevel;
--    } else if (level == "torn-off-menu") {
--      windowLevel = NSTornOffMenuWindowLevel;
--    } else if (level == "modal-panel") {
--      windowLevel = NSModalPanelWindowLevel;
--    } else if (level == "main-menu") {
--      windowLevel = NSMainMenuWindowLevel;
--    } else if (level == "status") {
--      windowLevel = NSStatusWindowLevel;
--    } else if (level == "pop-up-menu") {
--      windowLevel = NSPopUpMenuWindowLevel;
--    } else if (level == "screen-saver") {
--      windowLevel = NSScreenSaverWindowLevel;
--    } else if (level == "dock") {
--      // Deprecated by macOS, but kept for backwards compatibility
--      windowLevel = NSDockWindowLevel;
--    }
--  }
--
--  NSInteger newLevel = windowLevel + relativeLevel;
--  if (newLevel >= minWindowLevel && newLevel <= maxWindowLevel) {
--    [window_ setLevel:newLevel];
--  } else {
--    *error = std::string([
--        [NSString stringWithFormat:@"relativeLevel must be between %d and %d",
--                                   minWindowLevel, maxWindowLevel] UTF8String]);
--  }
--}
--
--bool NativeWindowMac::IsAlwaysOnTop() {
--  return [window_ level] != NSNormalWindowLevel;
--}
--
--void NativeWindowMac::Center() {
--  [window_ center];
--}
--
--void NativeWindowMac::Invalidate() {
--  [window_ flushWindow];
--  [[window_ contentView] setNeedsDisplay:YES];
--}
--
--void NativeWindowMac::SetTitle(const std::string& title) {
--  // For macOS <= 10.9, the setTitleVisibility API is not available, we have
--  // to avoid calling setTitle for frameless window.
--  if (!base::mac::IsAtLeastOS10_10() && (transparent() || !has_frame()))
--    return;
--
--  [window_ setTitle:base::SysUTF8ToNSString(title)];
--}
--
--std::string NativeWindowMac::GetTitle() {
--  return base::SysNSStringToUTF8([window_ title]);
--  ;
--}
--
--void NativeWindowMac::FlashFrame(bool flash) {
--  if (flash) {
--    attention_request_id_ = [NSApp requestUserAttention:NSInformationalRequest];
--  } else {
--    [NSApp cancelUserAttentionRequest:attention_request_id_];
--    attention_request_id_ = 0;
--  }
--}
--
--void NativeWindowMac::SetSkipTaskbar(bool skip) {}
--
--void NativeWindowMac::SetSimpleFullScreen(bool simple_fullscreen) {
--  NSWindow* window = GetNativeWindow();
--
--  if (simple_fullscreen && !is_simple_fullscreen_) {
--    is_simple_fullscreen_ = true;
--
--    // Take note of the current window size
--    original_frame_ = [window frame];
--
--    simple_fullscreen_options_ = [NSApp currentSystemPresentationOptions];
--    simple_fullscreen_mask_ = [window styleMask];
--
--    // We can simulate the pre-Lion fullscreen by auto-hiding the dock and menu
--    // bar
--    NSApplicationPresentationOptions options =
--        NSApplicationPresentationAutoHideDock +
--        NSApplicationPresentationAutoHideMenuBar;
--    [NSApp setPresentationOptions:options];
--
--    was_maximizable_ = IsMaximizable();
--    was_movable_ = IsMovable();
--
--    NSRect fullscreenFrame = [window.screen frame];
--
--    if (!fullscreen_window_title()) {
--      // Hide the titlebar
--      SetStyleMask(false, NSTitledWindowMask);
--
--      // Resize the window to accomodate the _entire_ screen size
--      fullscreenFrame.size.height -=
--          [[[NSApplication sharedApplication] mainMenu] menuBarHeight];
--    } else if (!window_button_visibility_.has_value()) {
--      // Lets keep previous behaviour - hide window controls in titled
--      // fullscreen mode when not specified otherwise.
--      [[window standardWindowButton:NSWindowZoomButton] setHidden:YES];
--      [[window standardWindowButton:NSWindowMiniaturizeButton] setHidden:YES];
--      [[window standardWindowButton:NSWindowCloseButton] setHidden:YES];
--    }
--
--    [window setFrame:fullscreenFrame display:YES animate:YES];
--
--    // Fullscreen windows can't be resized, minimized, maximized, or moved
--    SetMinimizable(false);
--    SetResizable(false);
--    SetMaximizable(false);
--    SetMovable(false);
--  } else if (!simple_fullscreen && is_simple_fullscreen_) {
--    is_simple_fullscreen_ = false;
--
--    if (!fullscreen_window_title()) {
--      // Restore the titlebar
--      SetStyleMask(true, NSTitledWindowMask);
--    }
--
--    // Restore window controls visibility state
--    const bool window_button_hidden = !window_button_visibility_.value_or(true);
--    [[window standardWindowButton:NSWindowZoomButton]
--        setHidden:window_button_hidden];
--    [[window standardWindowButton:NSWindowMiniaturizeButton]
--        setHidden:window_button_hidden];
--    [[window standardWindowButton:NSWindowCloseButton]
--        setHidden:window_button_hidden];
--
--    [window setFrame:original_frame_ display:YES animate:YES];
--
--    [NSApp setPresentationOptions:simple_fullscreen_options_];
--
--    // Restore original style mask
--    ScopedDisableResize disable_resize;
--    [window_ setStyleMask:simple_fullscreen_mask_];
--
--    // Restore window manipulation abilities
--    SetMaximizable(was_maximizable_);
--    SetMovable(was_movable_);
--  }
--}
--
--bool NativeWindowMac::IsSimpleFullScreen() {
--  return is_simple_fullscreen_;
--}
--
--void NativeWindowMac::SetKiosk(bool kiosk) {
--  if (kiosk && !is_kiosk_) {
--    kiosk_options_ = [NSApp currentSystemPresentationOptions];
--    NSApplicationPresentationOptions options =
--        NSApplicationPresentationHideDock +
--        NSApplicationPresentationHideMenuBar +
--        NSApplicationPresentationDisableAppleMenu +
--        NSApplicationPresentationDisableProcessSwitching +
--        NSApplicationPresentationDisableForceQuit +
--        NSApplicationPresentationDisableSessionTermination +
--        NSApplicationPresentationDisableHideApplication;
--    [NSApp setPresentationOptions:options];
--    is_kiosk_ = true;
--    was_fullscreen_ = IsFullscreen();
--    if (!was_fullscreen_)
--      SetFullScreen(true);
--  } else if (!kiosk && is_kiosk_) {
--    is_kiosk_ = false;
--    if (!was_fullscreen_)
--      SetFullScreen(false);
--    [NSApp setPresentationOptions:kiosk_options_];
--  }
--}
--
--bool NativeWindowMac::IsKiosk() {
--  return is_kiosk_;
--}
--
--void NativeWindowMac::SetBackgroundColor(SkColor color) {
--  base::ScopedCFTypeRef<CGColorRef> cgcolor(
--      skia::CGColorCreateFromSkColor(color));
--  // views::Widget adds a layer for the content view.
--  auto* bridge = views::NativeWidgetMac::GetBridgeForNativeWindow(window_);
--  NSView* compositor_superview =
--      static_cast<ui::AcceleratedWidgetMacNSView*>(bridge)
--          ->AcceleratedWidgetGetNSView();
--  [[compositor_superview layer] setBackgroundColor:cgcolor];
--  // When using WebContents as content view, the contentView also has layer.
--  if ([[window_ contentView] wantsLayer])
--    [[[window_ contentView] layer] setBackgroundColor:cgcolor];
--}
--
--void NativeWindowMac::SetHasShadow(bool has_shadow) {
--  [window_ setHasShadow:has_shadow];
--}
--
--bool NativeWindowMac::HasShadow() {
--  return [window_ hasShadow];
--}
--
--void NativeWindowMac::SetOpacity(const double opacity) {
--  [window_ setAlphaValue:opacity];
--}
--
--double NativeWindowMac::GetOpacity() {
--  return [window_ alphaValue];
--}
--
--void NativeWindowMac::SetRepresentedFilename(const std::string& filename) {
--  [window_ setRepresentedFilename:base::SysUTF8ToNSString(filename)];
--}
--
--std::string NativeWindowMac::GetRepresentedFilename() {
--  return base::SysNSStringToUTF8([window_ representedFilename]);
--}
--
--void NativeWindowMac::SetDocumentEdited(bool edited) {
--  [window_ setDocumentEdited:edited];
--}
--
--bool NativeWindowMac::IsDocumentEdited() {
--  return [window_ isDocumentEdited];
--}
--
--void NativeWindowMac::SetIgnoreMouseEvents(bool ignore, bool forward) {
--  [window_ setIgnoresMouseEvents:ignore];
--
--  if (!ignore) {
--    SetForwardMouseMessages(NO);
--  } else {
--    SetForwardMouseMessages(forward);
--  }
--}
--
--void NativeWindowMac::SetContentProtection(bool enable) {
--  [window_
--      setSharingType:enable ? NSWindowSharingNone : NSWindowSharingReadOnly];
--}
--
--void NativeWindowMac::SetBrowserView(NativeBrowserView* view) {
--  if (browser_view()) {
--    [browser_view()->GetInspectableWebContentsView()->GetNativeView()
--            removeFromSuperview];
--    set_browser_view(nullptr);
--  }
--
--  if (!view) {
--    return;
--  }
--
--  set_browser_view(view);
--  auto* native_view = view->GetInspectableWebContentsView()->GetNativeView();
--  [[window_ contentView] addSubview:native_view
--                         positioned:NSWindowAbove
--                         relativeTo:nil];
--  native_view.hidden = NO;
--}
--
--void NativeWindowMac::SetParentWindow(NativeWindow* parent) {
--  InternalSetParentWindow(parent, IsVisible());
--}
--
--gfx::NativeView NativeWindowMac::GetNativeView() const {
--  return [window_ contentView];
--}
--
--gfx::NativeWindow NativeWindowMac::GetNativeWindow() const {
--  return window_;
--}
--
--gfx::AcceleratedWidget NativeWindowMac::GetAcceleratedWidget() const {
--  return gfx::kNullAcceleratedWidget;
--}
--
--void NativeWindowMac::SetProgressBar(double progress,
--                                     const NativeWindow::ProgressState state) {
--  NSDockTile* dock_tile = [NSApp dockTile];
--
--  // For the first time API invoked, we need to create a ContentView in
--  // DockTile.
--  if (dock_tile.contentView == nullptr) {
--    NSImageView* image_view = [[NSImageView alloc] init];
--    [image_view setImage:[NSApp applicationIconImage]];
--    [dock_tile setContentView:image_view];
--  }
--
--  if ([[dock_tile.contentView subviews] count] == 0) {
--    NSProgressIndicator* progress_indicator = [[AtomProgressBar alloc]
--        initWithFrame:NSMakeRect(0.0f, 0.0f, dock_tile.size.width, 15.0)];
--    [progress_indicator setStyle:NSProgressIndicatorBarStyle];
--    [progress_indicator setIndeterminate:NO];
--    [progress_indicator setBezeled:YES];
--    [progress_indicator setMinValue:0];
--    [progress_indicator setMaxValue:1];
--    [progress_indicator setHidden:NO];
--    [dock_tile.contentView addSubview:progress_indicator];
--  }
--
--  NSProgressIndicator* progress_indicator = static_cast<NSProgressIndicator*>(
--      [[[dock_tile contentView] subviews] objectAtIndex:0]);
--  if (progress < 0) {
--    [progress_indicator setHidden:YES];
--  } else if (progress > 1) {
--    [progress_indicator setHidden:NO];
--    [progress_indicator setIndeterminate:YES];
--    [progress_indicator setDoubleValue:1];
--  } else {
--    [progress_indicator setHidden:NO];
--    [progress_indicator setDoubleValue:progress];
--  }
--  [dock_tile display];
--}
--
--void NativeWindowMac::SetOverlayIcon(const gfx::Image& overlay,
--                                     const std::string& description) {}
--
--void NativeWindowMac::SetVisibleOnAllWorkspaces(bool visible) {
--  SetCollectionBehavior(visible, NSWindowCollectionBehaviorCanJoinAllSpaces);
--}
--
--bool NativeWindowMac::IsVisibleOnAllWorkspaces() {
--  NSUInteger collectionBehavior = [window_ collectionBehavior];
--  return collectionBehavior & NSWindowCollectionBehaviorCanJoinAllSpaces;
--}
--
--void NativeWindowMac::SetAutoHideCursor(bool auto_hide) {
--  [window_ setDisableAutoHideCursor:!auto_hide];
--}
--
--void NativeWindowMac::SelectPreviousTab() {
--  if (@available(macOS 10.12, *)) {
--    [window_ selectPreviousTab:nil];
--  }
--}
--
--void NativeWindowMac::SelectNextTab() {
--  if (@available(macOS 10.12, *)) {
--    [window_ selectNextTab:nil];
--  }
--}
--
--void NativeWindowMac::MergeAllWindows() {
--  if (@available(macOS 10.12, *)) {
--    [window_ mergeAllWindows:nil];
--  }
--}
--
--void NativeWindowMac::MoveTabToNewWindow() {
--  if (@available(macOS 10.12, *)) {
--    [window_ moveTabToNewWindow:nil];
--  }
--}
--
--void NativeWindowMac::ToggleTabBar() {
--  if (@available(macOS 10.12, *)) {
--    [window_ toggleTabBar:nil];
--  }
--}
--
--bool NativeWindowMac::AddTabbedWindow(NativeWindow* window) {
--  if (window_ == window->GetNativeWindow()) {
--    return false;
--  } else {
--    if (@available(macOS 10.12, *))
--      [window_ addTabbedWindow:window->GetNativeWindow() ordered:NSWindowAbove];
--  }
--  return true;
--}
--
--bool NativeWindowMac::SetWindowButtonVisibility(bool visible) {
--  if (title_bar_style_ == CUSTOM_BUTTONS_ON_HOVER) {
--    return false;
--  }
--
--  window_button_visibility_ = visible;
--
--  [[window_ standardWindowButton:NSWindowCloseButton] setHidden:!visible];
--  [[window_ standardWindowButton:NSWindowMiniaturizeButton] setHidden:!visible];
--  [[window_ standardWindowButton:NSWindowZoomButton] setHidden:!visible];
--  return true;
--}
--
--void NativeWindowMac::SetVibrancy(const std::string& type) {
--  if (@available(macOS 10.10, *)) {
--    NSView* vibrant_view = [window_ vibrantView];
--
--    if (type.empty()) {
--      if (background_color_before_vibrancy_) {
--        [window_ setBackgroundColor:background_color_before_vibrancy_];
--        [window_ setTitlebarAppearsTransparent:transparency_before_vibrancy_];
--      }
--      if (vibrant_view == nil)
--        return;
--
--      [vibrant_view removeFromSuperview];
--      [window_ setVibrantView:nil];
--      ui::GpuSwitchingManager::SetTransparent(transparent());
--
--      return;
--    }
--
--    background_color_before_vibrancy_.reset([[window_ backgroundColor] retain]);
--    transparency_before_vibrancy_ = [window_ titlebarAppearsTransparent];
--    ui::GpuSwitchingManager::SetTransparent(true);
--
--    if (title_bar_style_ != NORMAL) {
--      [window_ setTitlebarAppearsTransparent:YES];
--      [window_ setBackgroundColor:[NSColor clearColor]];
--    }
--
--    NSVisualEffectView* effect_view = (NSVisualEffectView*)vibrant_view;
--    if (effect_view == nil) {
--      effect_view = [[[NSVisualEffectView alloc]
--          initWithFrame:[[window_ contentView] bounds]] autorelease];
--      [window_ setVibrantView:(NSView*)effect_view];
--
--      [effect_view
--          setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
--      [effect_view setBlendingMode:NSVisualEffectBlendingModeBehindWindow];
--      [effect_view setState:NSVisualEffectStateActive];
--      [[window_ contentView] addSubview:effect_view
--                             positioned:NSWindowBelow
--                             relativeTo:nil];
--    }
--
--    NSVisualEffectMaterial vibrancyType = NSVisualEffectMaterialLight;
--
--    if (type == "appearance-based") {
--      vibrancyType = NSVisualEffectMaterialAppearanceBased;
--    } else if (type == "light") {
--      vibrancyType = NSVisualEffectMaterialLight;
--    } else if (type == "dark") {
--      vibrancyType = NSVisualEffectMaterialDark;
--    } else if (type == "titlebar") {
--      vibrancyType = NSVisualEffectMaterialTitlebar;
--    }
--
--    if (@available(macOS 10.11, *)) {
--      // TODO(kevinsawicki): Use NSVisualEffectMaterial* constants directly once
--      // they are available in the minimum SDK version
--      if (type == "selection") {
--        // NSVisualEffectMaterialSelection
--        vibrancyType = static_cast<NSVisualEffectMaterial>(4);
--      } else if (type == "menu") {
--        // NSVisualEffectMaterialMenu
--        vibrancyType = static_cast<NSVisualEffectMaterial>(5);
--      } else if (type == "popover") {
--        // NSVisualEffectMaterialPopover
--        vibrancyType = static_cast<NSVisualEffectMaterial>(6);
--      } else if (type == "sidebar") {
--        // NSVisualEffectMaterialSidebar
--        vibrancyType = static_cast<NSVisualEffectMaterial>(7);
--      } else if (type == "medium-light") {
--        // NSVisualEffectMaterialMediumLight
--        vibrancyType = static_cast<NSVisualEffectMaterial>(8);
--      } else if (type == "ultra-dark") {
--        // NSVisualEffectMaterialUltraDark
--        vibrancyType = static_cast<NSVisualEffectMaterial>(9);
--      }
--    }
--
--    [effect_view setMaterial:vibrancyType];
--  }
--}
--
--void NativeWindowMac::SetTouchBar(
--    const std::vector<mate::PersistentDictionary>& items) {
--  if (@available(macOS 10.12.2, *)) {
--    touch_bar_.reset([[AtomTouchBar alloc]
--        initWithDelegate:window_delegate_.get()
--                  window:this
--                settings:items]);
--    [window_ setTouchBar:nil];
--  }
--}
--
--void NativeWindowMac::RefreshTouchBarItem(const std::string& item_id) {
--  if (@available(macOS 10.12.2, *)) {
--    if (touch_bar_ && [window_ touchBar])
--      [touch_bar_ refreshTouchBarItem:[window_ touchBar] id:item_id];
--  }
--}
--
--void NativeWindowMac::SetEscapeTouchBarItem(
--    const mate::PersistentDictionary& item) {
--  if (@available(macOS 10.12.2, *)) {
--    if (touch_bar_ && [window_ touchBar])
--      [touch_bar_ setEscapeTouchBarItem:item forTouchBar:[window_ touchBar]];
--  }
--}
--
--gfx::Rect NativeWindowMac::ContentBoundsToWindowBounds(
--    const gfx::Rect& bounds) const {
--  if (has_frame()) {
--    gfx::Rect window_bounds(
--        [window_ frameRectForContentRect:bounds.ToCGRect()]);
--    int frame_height = window_bounds.height() - bounds.height();
--    window_bounds.set_y(window_bounds.y() - frame_height);
--    return window_bounds;
--  } else {
--    return bounds;
--  }
--}
--
--gfx::Rect NativeWindowMac::WindowBoundsToContentBounds(
--    const gfx::Rect& bounds) const {
--  if (has_frame()) {
--    gfx::Rect content_bounds(
--        [window_ contentRectForFrameRect:bounds.ToCGRect()]);
--    int frame_height = bounds.height() - content_bounds.height();
--    content_bounds.set_y(content_bounds.y() + frame_height);
--    return content_bounds;
--  } else {
--    return bounds;
--  }
--}
--
--bool NativeWindowMac::CanResize() const {
--  return resizable_;
--}
--
--views::View* NativeWindowMac::GetContentsView() {
--  return root_view_.get();
--}
--
--void NativeWindowMac::AddContentViewLayers() {
--  // Make sure the bottom corner is rounded for non-modal windows:
--  // http://crbug.com/396264. But do not enable it on OS X 10.9 for transparent
--  // window, otherwise a semi-transparent frame would show.
--  if (!(transparent() && base::mac::IsOS10_9()) && !is_modal()) {
--    base::scoped_nsobject<CALayer> background_layer([[CALayer alloc] init]);
--    [background_layer
--        setAutoresizingMask:kCALayerWidthSizable | kCALayerHeightSizable];
--    [[window_ contentView] setLayer:background_layer];
--    [[window_ contentView] setWantsLayer:YES];
--  }
--
--  if (!has_frame()) {
--    // In OSX 10.10, adding subviews to the root view for the NSView hierarchy
--    // produces warnings. To eliminate the warnings, we resize the contentView
--    // to fill the window, and add subviews to that.
--    // http://crbug.com/380412
--    if (!original_set_frame_size) {
--      Class cl = [[window_ contentView] class];
--      original_set_frame_size = class_replaceMethod(
--          cl, @selector(setFrameSize:), (IMP)SetFrameSize, "v@:{_NSSize=ff}");
--      original_view_did_move_to_superview =
--          class_replaceMethod(cl, @selector(viewDidMoveToSuperview),
--                              (IMP)ViewDidMoveToSuperview, "v@:");
--      [[window_ contentView] viewDidMoveToWindow];
--    }
--
--    // The fullscreen button should always be hidden for frameless window.
--    [[window_ standardWindowButton:NSWindowFullScreenButton] setHidden:YES];
--
--    if (title_bar_style_ == CUSTOM_BUTTONS_ON_HOVER) {
--      buttons_view_.reset(
--          [[CustomWindowButtonView alloc] initWithFrame:NSZeroRect]);
--      [[window_ contentView] addSubview:buttons_view_];
--    } else {
--      if (title_bar_style_ != NORMAL) {
--        if (base::mac::IsOS10_9()) {
--          ShowWindowButton(NSWindowZoomButton);
--          ShowWindowButton(NSWindowMiniaturizeButton);
--          ShowWindowButton(NSWindowCloseButton);
--        }
--        return;
--      }
--
--      // Hide the window buttons.
--      [[window_ standardWindowButton:NSWindowZoomButton] setHidden:YES];
--      [[window_ standardWindowButton:NSWindowMiniaturizeButton] setHidden:YES];
--      [[window_ standardWindowButton:NSWindowCloseButton] setHidden:YES];
--    }
--
--    // Some third-party macOS utilities check the zoom button's enabled state to
--    // determine whether to show custom UI on hover, so we disable it here to
--    // prevent them from doing so in a frameless app window.
--    [[window_ standardWindowButton:NSWindowZoomButton] setEnabled:NO];
--  }
--}
--
--void NativeWindowMac::InternalSetParentWindow(NativeWindow* parent,
--                                              bool attach) {
--  if (is_modal())
--    return;
--
--  NativeWindow::SetParentWindow(parent);
--
--  // Do not remove/add if we are already properly attached.
--  if (attach && parent && [window_ parentWindow] == parent->GetNativeWindow())
--    return;
--
--  // Remove current parent window.
--  if ([window_ parentWindow])
--    [[window_ parentWindow] removeChildWindow:window_];
--
--  // Set new parent window.
--  // Note that this method will force the window to become visible.
--  if (parent && attach)
--    [parent->GetNativeWindow() addChildWindow:window_ ordered:NSWindowAbove];
--}
--
--void NativeWindowMac::ShowWindowButton(NSWindowButton button) {
--  auto view = [window_ standardWindowButton:button];
--  [view.superview addSubview:view positioned:NSWindowAbove relativeTo:nil];
--}
--
--void NativeWindowMac::SetForwardMouseMessages(bool forward) {
--  [window_ setAcceptsMouseMovedEvents:forward];
--}
--
--void NativeWindowMac::OverrideNSWindowContentView() {
--  // When using `views::Widget` to hold WebContents, Chromium would use
--  // `BridgedContentView` as content view, which does not support draggable
--  // regions. In order to make draggable regions work, we have to replace the
--  // content view with a simple NSView.
--  container_view_.reset([[FullSizeContentView alloc] init]);
--  [container_view_
--      setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
--  [container_view_ setFrame:[[[window_ contentView] superview] bounds]];
--  [window_ setContentView:container_view_];
--  AddContentViewLayers();
--}
--
--void NativeWindowMac::SetStyleMask(bool on, NSUInteger flag) {
--  // Changing the styleMask of a frameless windows causes it to change size so
--  // we explicitly disable resizing while setting it.
--  ScopedDisableResize disable_resize;
--
--  bool was_maximizable = IsMaximizable();
--  if (on)
--    [window_ setStyleMask:[window_ styleMask] | flag];
--  else
--    [window_ setStyleMask:[window_ styleMask] & (~flag)];
--  // Change style mask will make the zoom button revert to default, probably
--  // a bug of Cocoa or macOS.
--  SetMaximizable(was_maximizable);
--}
--
--void NativeWindowMac::SetCollectionBehavior(bool on, NSUInteger flag) {
--  bool was_maximizable = IsMaximizable();
--  if (on)
--    [window_ setCollectionBehavior:[window_ collectionBehavior] | flag];
--  else
--    [window_ setCollectionBehavior:[window_ collectionBehavior] & (~flag)];
--  // Change collectionBehavior will make the zoom button revert to default,
--  // probably a bug of Cocoa or macOS.
--  SetMaximizable(was_maximizable);
--}
--
--// static
--NativeWindow* NativeWindow::Create(const mate::Dictionary& options,
--                                   NativeWindow* parent) {
--  return new NativeWindowMac(options, parent);
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 cfbae95bda16a262457339e093943d371128199d atom/browser/native_window_observer.h
-  our    100644 c2a86ea6b65cd6091fa7e8018bed0b11c7390f23 atom/browser/native_window_observer.h
-@@ -1,99 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_NATIVE_WINDOW_OBSERVER_H_
--#define ATOM_BROWSER_NATIVE_WINDOW_OBSERVER_H_
--
--#include <string>
--
--#include "base/strings/string16.h"
--#include "base/values.h"
--#include "ui/base/window_open_disposition.h"
--#include "url/gurl.h"
--
--#if defined(OS_WIN)
--#include <windows.h>
--#endif
--
--namespace gfx {
--class Rect;
--}
--
--namespace atom {
--
--class NativeWindowObserver {
-- public:
--  virtual ~NativeWindowObserver() {}
--
--  // Called when the web page in window wants to create a popup window.
--  virtual void WillCreatePopupWindow(const base::string16& frame_name,
--                                     const GURL& target_url,
--                                     const std::string& partition_id,
--                                     WindowOpenDisposition disposition) {}
--
--  // Called when user is starting an navigation in web page.
--  virtual void WillNavigate(bool* prevent_default, const GURL& url) {}
--
--  // Called when the window is gonna closed.
--  virtual void WillCloseWindow(bool* prevent_default) {}
--
--  // Called when the window wants to know the preferred width.
--  virtual void RequestPreferredWidth(int* width) {}
--
--  // Called when closed button is clicked.
--  virtual void OnCloseButtonClicked(bool* prevent_default) {}
--
--  // Called when the window is closed.
--  virtual void OnWindowClosed() {}
--
--  // Called when Windows sends WM_ENDSESSION message
--  virtual void OnWindowEndSession() {}
--
--  // Called when window loses focus.
--  virtual void OnWindowBlur() {}
--
--  // Called when window gains focus.
--  virtual void OnWindowFocus() {}
--
--  // Called when window is shown.
--  virtual void OnWindowShow() {}
--
--  // Called when window is hidden.
--  virtual void OnWindowHide() {}
--
--  // Called when window state changed.
--  virtual void OnWindowMaximize() {}
--  virtual void OnWindowUnmaximize() {}
--  virtual void OnWindowMinimize() {}
--  virtual void OnWindowRestore() {}
--  virtual void OnWindowWillResize(const gfx::Rect& new_bounds,
--                                  bool* prevent_default) {}
--  virtual void OnWindowResize() {}
--  virtual void OnWindowMove() {}
--  virtual void OnWindowMoved() {}
--  virtual void OnWindowScrollTouchBegin() {}
--  virtual void OnWindowScrollTouchEnd() {}
--  virtual void OnWindowSwipe(const std::string& direction) {}
--  virtual void OnWindowSheetBegin() {}
--  virtual void OnWindowSheetEnd() {}
--  virtual void OnWindowEnterFullScreen() {}
--  virtual void OnWindowLeaveFullScreen() {}
--  virtual void OnWindowEnterHtmlFullScreen() {}
--  virtual void OnWindowLeaveHtmlFullScreen() {}
--  virtual void OnTouchBarItemResult(const std::string& item_id,
--                                    const base::DictionaryValue& details) {}
--  virtual void OnNewWindowForTab() {}
--
--// Called when window message received
--#if defined(OS_WIN)
--  virtual void OnWindowMessage(UINT message, WPARAM w_param, LPARAM l_param) {}
--#endif
--
--  // Called on Windows when App Commands arrive (WM_APPCOMMAND)
--  virtual void OnExecuteWindowsCommand(const std::string& command_name) {}
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_NATIVE_WINDOW_OBSERVER_H_
-removed in remote
-  base   100644 15f2046364bbff669e4a1f90ae755191ee72939e atom/browser/native_window_views.cc
-  our    100644 0dba39942f92d54ba34db7709b73012055680d94 atom/browser/native_window_views.cc
-@@ -1,1260 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/native_window_views.h"
--
--#if defined(OS_WIN)
--#include <objbase.h>
--#include <wrl/client.h>
--#endif
--
--#include <vector>
--
--#include "atom/browser/api/atom_api_web_contents.h"
--#include "atom/browser/native_browser_view_views.h"
--#include "atom/browser/ui/views/root_view.h"
--#include "atom/browser/web_contents_preferences.h"
--#include "atom/browser/web_view_manager.h"
--#include "atom/browser/window_list.h"
--#include "atom/common/draggable_region.h"
--#include "atom/common/native_mate_converters/image_converter.h"
--#include "atom/common/options_switches.h"
--#include "base/strings/utf_string_conversions.h"
--#include "brightray/browser/inspectable_web_contents.h"
--#include "brightray/browser/inspectable_web_contents_view.h"
--#include "content/public/browser/browser_thread.h"
--#include "native_mate/dictionary.h"
--#include "ui/aura/window_tree_host.h"
--#include "ui/base/hit_test.h"
--#include "ui/gfx/image/image.h"
--#include "ui/views/background.h"
--#include "ui/views/controls/webview/unhandled_keyboard_event_handler.h"
--#include "ui/views/controls/webview/webview.h"
--#include "ui/views/widget/native_widget_private.h"
--#include "ui/views/widget/widget.h"
--#include "ui/views/window/client_view.h"
--#include "ui/wm/core/shadow_types.h"
--#include "ui/wm/core/window_util.h"
--
--#if defined(USE_X11)
--#include "atom/browser/browser.h"
--#include "atom/browser/ui/views/frameless_view.h"
--#include "atom/browser/ui/views/global_menu_bar_x11.h"
--#include "atom/browser/ui/views/native_frame_view.h"
--#include "atom/browser/ui/x/event_disabler.h"
--#include "atom/browser/ui/x/window_state_watcher.h"
--#include "atom/browser/ui/x/x_window_utils.h"
--#include "base/strings/string_util.h"
--#include "chrome/browser/ui/libgtkui/unity_service.h"
--#include "ui/base/x/x11_util.h"
--#include "ui/gfx/x/x11_types.h"
--#include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"
--#include "ui/views/window/native_frame_view.h"
--#elif defined(OS_WIN)
--#include "atom/browser/ui/views/win_frame_view.h"
--#include "atom/browser/ui/win/atom_desktop_native_widget_aura.h"
--#include "atom/browser/ui/win/atom_desktop_window_tree_host_win.h"
--#include "skia/ext/skia_utils_win.h"
--#include "ui/base/win/shell.h"
--#include "ui/display/display.h"
--#include "ui/display/screen.h"
--#include "ui/display/win/screen_win.h"
--#include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
--#endif
--
--namespace atom {
--
--namespace {
--
--#if defined(OS_WIN)
--void FlipWindowStyle(HWND handle, bool on, DWORD flag) {
--  DWORD style = ::GetWindowLong(handle, GWL_STYLE);
--  if (on)
--    style |= flag;
--  else
--    style &= ~flag;
--  ::SetWindowLong(handle, GWL_STYLE, style);
--}
--#endif
--
--class NativeWindowClientView : public views::ClientView {
-- public:
--  NativeWindowClientView(views::Widget* widget,
--                         views::View* root_view,
--                         NativeWindowViews* window)
--      : views::ClientView(widget, root_view), window_(window) {}
--  ~NativeWindowClientView() override = default;
--
--  bool CanClose() override {
--    window_->NotifyWindowCloseButtonClicked();
--    return false;
--  }
--
-- private:
--  NativeWindowViews* window_;
--
--  DISALLOW_COPY_AND_ASSIGN(NativeWindowClientView);
--};
--
--}  // namespace
--
--NativeWindowViews::NativeWindowViews(const mate::Dictionary& options,
--                                     NativeWindow* parent)
--    : NativeWindow(options, parent),
--      root_view_(new RootView(this)),
--      keyboard_event_handler_(new views::UnhandledKeyboardEventHandler) {
--  options.Get(options::kTitle, &title_);
--
--  bool menu_bar_autohide;
--  if (options.Get(options::kAutoHideMenuBar, &menu_bar_autohide))
--    root_view_->SetAutoHideMenuBar(menu_bar_autohide);
--
--#if defined(OS_WIN)
--  // On Windows we rely on the CanResize() to indicate whether window can be
--  // resized, and it should be set before window is created.
--  options.Get(options::kResizable, &resizable_);
--  options.Get(options::kMinimizable, &minimizable_);
--  options.Get(options::kMaximizable, &maximizable_);
--
--  // Transparent window must not have thick frame.
--  options.Get("thickFrame", &thick_frame_);
--  if (transparent())
--    thick_frame_ = false;
--#endif
--
--  if (enable_larger_than_screen())
--    // We need to set a default maximum window size here otherwise Windows
--    // will not allow us to resize the window larger than scree.
--    // Setting directly to INT_MAX somehow doesn't work, so we just devide
--    // by 10, which should still be large enough.
--    SetContentSizeConstraints(extensions::SizeConstraints(
--        gfx::Size(), gfx::Size(INT_MAX / 10, INT_MAX / 10)));
--
--  int width = 800, height = 600;
--  options.Get(options::kWidth, &width);
--  options.Get(options::kHeight, &height);
--  gfx::Rect bounds(0, 0, width, height);
--  widget_size_ = bounds.size();
--
--  widget()->AddObserver(this);
--
--  views::Widget::InitParams params;
--  params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
--  params.bounds = bounds;
--  params.delegate = this;
--  params.type = views::Widget::InitParams::TYPE_WINDOW;
--  params.remove_standard_frame = !has_frame();
--
--  if (transparent())
--    params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
--
--  // The given window is most likely not rectangular since it uses
--  // transparency and has no standard frame, don't show a shadow for it.
--  if (transparent() && !has_frame())
--    params.shadow_type = views::Widget::InitParams::SHADOW_TYPE_NONE;
--
--  bool focusable;
--  if (options.Get(options::kFocusable, &focusable) && !focusable)
--    params.activatable = views::Widget::InitParams::ACTIVATABLE_NO;
--
--#if defined(OS_WIN)
--  if (parent)
--    params.parent = parent->GetNativeWindow();
--
--  params.native_widget = new AtomDesktopNativeWidgetAura(widget());
--  atom_desktop_window_tree_host_win_ = new AtomDesktopWindowTreeHostWin(
--      this, widget(),
--      static_cast<views::DesktopNativeWidgetAura*>(params.native_widget));
--  params.desktop_window_tree_host = atom_desktop_window_tree_host_win_;
--#elif defined(USE_X11)
--  std::string name = Browser::Get()->GetName();
--  // Set WM_WINDOW_ROLE.
--  params.wm_role_name = "browser-window";
--  // Set WM_CLASS.
--  params.wm_class_name = base::ToLowerASCII(name);
--  params.wm_class_class = name;
--#endif
--
--  widget()->Init(params);
--
--  bool fullscreen = false;
--  options.Get(options::kFullscreen, &fullscreen);
--
--  std::string window_type;
--  options.Get(options::kType, &window_type);
--
--#if defined(USE_X11)
--  // Start monitoring window states.
--  window_state_watcher_.reset(new WindowStateWatcher(this));
--
--  // Set _GTK_THEME_VARIANT to dark if we have "dark-theme" option set.
--  bool use_dark_theme = false;
--  if (options.Get(options::kDarkTheme, &use_dark_theme) && use_dark_theme) {
--    XDisplay* xdisplay = gfx::GetXDisplay();
--    XChangeProperty(xdisplay, GetAcceleratedWidget(),
--                    XInternAtom(xdisplay, "_GTK_THEME_VARIANT", x11::False),
--                    XInternAtom(xdisplay, "UTF8_STRING", x11::False), 8,
--                    PropModeReplace,
--                    reinterpret_cast<const unsigned char*>("dark"), 4);
--  }
--
--  // Before the window is mapped the SetWMSpecState can not work, so we have
--  // to manually set the _NET_WM_STATE.
--  std::vector<::Atom> state_atom_list;
--  bool skip_taskbar = false;
--  if (options.Get(options::kSkipTaskbar, &skip_taskbar) && skip_taskbar) {
--    state_atom_list.push_back(GetAtom("_NET_WM_STATE_SKIP_TASKBAR"));
--  }
--
--  // Before the window is mapped, there is no SHOW_FULLSCREEN_STATE.
--  if (fullscreen) {
--    state_atom_list.push_back(GetAtom("_NET_WM_STATE_FULLSCREEN"));
--  }
--
--  if (parent) {
--    SetParentWindow(parent);
--    // Force using dialog type for child window.
--    window_type = "dialog";
--    // Modal window needs the _NET_WM_STATE_MODAL hint.
--    if (is_modal())
--      state_atom_list.push_back(GetAtom("_NET_WM_STATE_MODAL"));
--  }
--
--  if (!state_atom_list.empty())
--    ui::SetAtomArrayProperty(GetAcceleratedWidget(), "_NET_WM_STATE", "ATOM",
--                             state_atom_list);
--
--  // Set the _NET_WM_WINDOW_TYPE.
--  if (!window_type.empty())
--    SetWindowType(GetAcceleratedWidget(), window_type);
--#endif
--
--#if defined(OS_WIN)
--  if (!has_frame()) {
--    // Set Window style so that we get a minimize and maximize animation when
--    // frameless.
--    DWORD frame_style = WS_CAPTION;
--    if (resizable_)
--      frame_style |= WS_THICKFRAME;
--    if (minimizable_)
--      frame_style |= WS_MINIMIZEBOX;
--    if (maximizable_)
--      frame_style |= WS_MAXIMIZEBOX;
--    // We should not show a frame for transparent window.
--    if (!thick_frame_)
--      frame_style &= ~(WS_THICKFRAME | WS_CAPTION);
--    ::SetWindowLong(GetAcceleratedWidget(), GWL_STYLE, frame_style);
--  }
--
--  LONG ex_style = ::GetWindowLong(GetAcceleratedWidget(), GWL_EXSTYLE);
--  if (window_type == "toolbar")
--    ex_style |= WS_EX_TOOLWINDOW;
--  ::SetWindowLong(GetAcceleratedWidget(), GWL_EXSTYLE, ex_style);
--#endif
--
--  if (has_frame()) {
--    // TODO(zcbenz): This was used to force using native frame on Windows 2003,
--    // we should check whether setting it in InitParams can work.
--    widget()->set_frame_type(views::Widget::FrameType::FRAME_TYPE_FORCE_NATIVE);
--    widget()->FrameTypeChanged();
--#if defined(OS_WIN)
--    // thickFrame also works for normal window.
--    if (!thick_frame_)
--      FlipWindowStyle(GetAcceleratedWidget(), false, WS_THICKFRAME);
--#endif
--  }
--
--  // Default content view.
--  SetContentView(new views::View());
--
--  gfx::Size size = bounds.size();
--  if (has_frame() &&
--      options.Get(options::kUseContentSize, &use_content_size_) &&
--      use_content_size_)
--    size = ContentBoundsToWindowBounds(gfx::Rect(size)).size();
--
--  widget()->CenterWindow(size);
--
--#if defined(OS_WIN)
--  // Save initial window state.
--  if (fullscreen)
--    last_window_state_ = ui::SHOW_STATE_FULLSCREEN;
--  else
--    last_window_state_ = ui::SHOW_STATE_NORMAL;
--  last_normal_bounds_ = GetBounds();
--#endif
--}
--
--NativeWindowViews::~NativeWindowViews() {
--  widget()->RemoveObserver(this);
--
--#if defined(OS_WIN)
--  // Disable mouse forwarding to relinquish resources, should any be held.
--  SetForwardMouseMessages(false);
--#endif
--}
--
--void NativeWindowViews::SetContentView(views::View* view) {
--  if (content_view()) {
--    root_view_->RemoveChildView(content_view());
--    if (browser_view()) {
--      content_view()->RemoveChildView(
--          browser_view()->GetInspectableWebContentsView()->GetView());
--      set_browser_view(nullptr);
--    }
--  }
--  set_content_view(view);
--  focused_view_ = view;
--  root_view_->AddChildView(content_view());
--  root_view_->Layout();
--}
--
--void NativeWindowViews::Close() {
--  if (!IsClosable()) {
--    WindowList::WindowCloseCancelled(this);
--    return;
--  }
--
--  widget()->Close();
--}
--
--void NativeWindowViews::CloseImmediately() {
--  widget()->CloseNow();
--}
--
--void NativeWindowViews::Focus(bool focus) {
--  // For hidden window focus() should do nothing.
--  if (!IsVisible())
--    return;
--
--  if (focus) {
--    widget()->Activate();
--  } else {
--    widget()->Deactivate();
--  }
--}
--
--bool NativeWindowViews::IsFocused() {
--  return widget()->IsActive();
--}
--
--void NativeWindowViews::Show() {
--  if (is_modal() && NativeWindow::parent() &&
--      !widget()->native_widget_private()->IsVisible())
--    NativeWindow::parent()->SetEnabled(false);
--
--  widget()->native_widget_private()->ShowWithWindowState(GetRestoredState());
--
--  NotifyWindowShow();
--
--#if defined(USE_X11)
--  if (global_menu_bar_)
--    global_menu_bar_->OnWindowMapped();
--#endif
--}
--
--void NativeWindowViews::ShowInactive() {
--  widget()->ShowInactive();
--
--  NotifyWindowShow();
--
--#if defined(USE_X11)
--  if (global_menu_bar_)
--    global_menu_bar_->OnWindowMapped();
--#endif
--}
--
--void NativeWindowViews::Hide() {
--  if (is_modal() && NativeWindow::parent())
--    NativeWindow::parent()->SetEnabled(true);
--
--  widget()->Hide();
--
--  NotifyWindowHide();
--
--#if defined(USE_X11)
--  if (global_menu_bar_)
--    global_menu_bar_->OnWindowUnmapped();
--#endif
--}
--
--bool NativeWindowViews::IsVisible() {
--  return widget()->IsVisible();
--}
--
--bool NativeWindowViews::IsEnabled() {
--#if defined(OS_WIN)
--  return ::IsWindowEnabled(GetAcceleratedWidget());
--#elif defined(USE_X11)
--  return !event_disabler_.get();
--#endif
--}
--
--void NativeWindowViews::SetEnabled(bool enable) {
--  // Handle multiple calls of SetEnabled correctly.
--  if (enable) {
--    --disable_count_;
--    if (disable_count_ != 0)
--      return;
--  } else {
--    ++disable_count_;
--    if (disable_count_ != 1)
--      return;
--  }
--
--#if defined(OS_WIN)
--  ::EnableWindow(GetAcceleratedWidget(), enable);
--#elif defined(USE_X11)
--  views::DesktopWindowTreeHostX11* tree_host =
--      views::DesktopWindowTreeHostX11::GetHostForXID(GetAcceleratedWidget());
--  if (enable) {
--    tree_host->RemoveEventRewriter(event_disabler_.get());
--    event_disabler_.reset();
--  } else {
--    event_disabler_.reset(new EventDisabler);
--    tree_host->AddEventRewriter(event_disabler_.get());
--  }
--#endif
--}
--
--void NativeWindowViews::Maximize() {
--#if defined(OS_WIN)
--  // For window without WS_THICKFRAME style, we can not call Maximize().
--  if (!(::GetWindowLong(GetAcceleratedWidget(), GWL_STYLE) & WS_THICKFRAME)) {
--    restore_bounds_ = GetBounds();
--    auto display =
--        display::Screen::GetScreen()->GetDisplayNearestPoint(GetPosition());
--    SetBounds(display.work_area(), false);
--    return;
--  }
--#endif
--
--  if (IsVisible())
--    widget()->Maximize();
--  else
--    widget()->native_widget_private()->ShowWithWindowState(
--        ui::SHOW_STATE_MAXIMIZED);
--}
--
--void NativeWindowViews::Unmaximize() {
--#if defined(OS_WIN)
--  if (!(::GetWindowLong(GetAcceleratedWidget(), GWL_STYLE) & WS_THICKFRAME)) {
--    SetBounds(restore_bounds_, false);
--    return;
--  }
--#endif
--
--  widget()->Restore();
--}
--
--bool NativeWindowViews::IsMaximized() {
--  return widget()->IsMaximized();
--}
--
--void NativeWindowViews::Minimize() {
--  if (IsVisible())
--    widget()->Minimize();
--  else
--    widget()->native_widget_private()->ShowWithWindowState(
--        ui::SHOW_STATE_MINIMIZED);
--}
--
--void NativeWindowViews::Restore() {
--  widget()->Restore();
--}
--
--bool NativeWindowViews::IsMinimized() {
--  return widget()->IsMinimized();
--}
--
--void NativeWindowViews::SetFullScreen(bool fullscreen) {
--  if (!IsFullScreenable())
--    return;
--
--#if defined(OS_WIN)
--  // There is no native fullscreen state on Windows.
--  bool leaving_fullscreen = IsFullscreen() && !fullscreen;
--
--  if (fullscreen) {
--    last_window_state_ = ui::SHOW_STATE_FULLSCREEN;
--    NotifyWindowEnterFullScreen();
--  } else {
--    last_window_state_ = ui::SHOW_STATE_NORMAL;
--    NotifyWindowLeaveFullScreen();
--  }
--
--  // For window without WS_THICKFRAME style, we can not call SetFullscreen().
--  // This path will be used for transparent windows as well.
--  if (!thick_frame_) {
--    if (fullscreen) {
--      restore_bounds_ = GetBounds();
--      auto display =
--          display::Screen::GetScreen()->GetDisplayNearestPoint(GetPosition());
--      SetBounds(display.bounds(), false);
--    } else {
--      SetBounds(restore_bounds_, false);
--    }
--    return;
--  }
--
--  // We set the new value after notifying, so we can handle the size event
--  // correctly.
--  widget()->SetFullscreen(fullscreen);
--
--  // If restoring from fullscreen and the window isn't visible, force visible,
--  // else a non-responsive window shell could be rendered.
--  // (this situation may arise when app starts with fullscreen: true)
--  // Note: the following must be after "widget()->SetFullscreen(fullscreen);"
--  if (leaving_fullscreen && !IsVisible())
--    FlipWindowStyle(GetAcceleratedWidget(), true, WS_VISIBLE);
--#else
--  if (IsVisible())
--    widget()->SetFullscreen(fullscreen);
--  else if (fullscreen)
--    widget()->native_widget_private()->ShowWithWindowState(
--        ui::SHOW_STATE_FULLSCREEN);
--
--  // Auto-hide menubar when in fullscreen.
--  if (fullscreen)
--    SetMenuBarVisibility(false);
--  else
--    SetMenuBarVisibility(!IsMenuBarAutoHide());
--#endif
--}
--
--bool NativeWindowViews::IsFullscreen() const {
--  return widget()->IsFullscreen();
--}
--
--void NativeWindowViews::SetBounds(const gfx::Rect& bounds, bool animate) {
--#if defined(OS_WIN) || defined(USE_X11)
--  // On Linux and Windows the minimum and maximum size should be updated with
--  // window size when window is not resizable.
--  if (!resizable_) {
--    SetMaximumSize(bounds.size());
--    SetMinimumSize(bounds.size());
--  }
--#endif
--
--  widget()->SetBounds(bounds);
--}
--
--gfx::Rect NativeWindowViews::GetBounds() {
--#if defined(OS_WIN)
--  if (IsMinimized())
--    return widget()->GetRestoredBounds();
--#endif
--
--  return widget()->GetWindowBoundsInScreen();
--}
--
--gfx::Rect NativeWindowViews::GetContentBounds() {
--  return content_view() ? content_view()->GetBoundsInScreen() : gfx::Rect();
--}
--
--gfx::Size NativeWindowViews::GetContentSize() {
--#if defined(OS_WIN)
--  if (IsMinimized())
--    return NativeWindow::GetContentSize();
--#endif
--
--  return content_view() ? content_view()->size() : gfx::Size();
--}
--
--void NativeWindowViews::SetContentSizeConstraints(
--    const extensions::SizeConstraints& size_constraints) {
--  NativeWindow::SetContentSizeConstraints(size_constraints);
--#if defined(OS_WIN)
--  // Changing size constraints would force adding the WS_THICKFRAME style, so
--  // do nothing if thickFrame is false.
--  if (!thick_frame_)
--    return;
--#endif
--  // widget_delegate() is only available after Init() is called, we make use of
--  // this to determine whether native widget has initialized.
--  if (widget() && widget()->widget_delegate())
--    widget()->OnSizeConstraintsChanged();
--  if (resizable_)
--    old_size_constraints_ = size_constraints;
--}
--
--void NativeWindowViews::SetResizable(bool resizable) {
--  if (resizable != resizable_) {
--    // On Linux there is no "resizable" property of a window, we have to set
--    // both the minimum and maximum size to the window size to achieve it.
--    if (resizable) {
--      SetContentSizeConstraints(old_size_constraints_);
--    } else {
--      old_size_constraints_ = GetContentSizeConstraints();
--      resizable_ = false;
--      gfx::Size content_size = GetContentSize();
--      SetContentSizeConstraints(
--          extensions::SizeConstraints(content_size, content_size));
--    }
--  }
--#if defined(OS_WIN)
--  if (has_frame() && thick_frame_)
--    FlipWindowStyle(GetAcceleratedWidget(), resizable, WS_THICKFRAME);
--#endif
--
--  resizable_ = resizable;
--}
--
--#if defined(OS_WIN)
--void NativeWindowViews::MoveTop() {
--  gfx::Point pos = GetPosition();
--  gfx::Size size = GetSize();
--  ::SetWindowPos(GetAcceleratedWidget(), HWND_TOP, pos.x(), pos.y(),
--                 size.width(), size.height(),
--                 SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW);
--}
--#endif
--
--bool NativeWindowViews::IsResizable() {
--#if defined(OS_WIN)
--  if (has_frame())
--    return ::GetWindowLong(GetAcceleratedWidget(), GWL_STYLE) & WS_THICKFRAME;
--#endif
--  return CanResize();
--}
--
--void NativeWindowViews::SetMovable(bool movable) {
--  movable_ = movable;
--}
--
--bool NativeWindowViews::IsMovable() {
--#if defined(OS_WIN)
--  return movable_;
--#else
--  return true;  // Not implemented on Linux.
--#endif
--}
--
--void NativeWindowViews::SetMinimizable(bool minimizable) {
--#if defined(OS_WIN)
--  FlipWindowStyle(GetAcceleratedWidget(), minimizable, WS_MINIMIZEBOX);
--#endif
--  minimizable_ = minimizable;
--}
--
--bool NativeWindowViews::IsMinimizable() {
--#if defined(OS_WIN)
--  return ::GetWindowLong(GetAcceleratedWidget(), GWL_STYLE) & WS_MINIMIZEBOX;
--#else
--  return true;  // Not implemented on Linux.
--#endif
--}
--
--void NativeWindowViews::SetMaximizable(bool maximizable) {
--#if defined(OS_WIN)
--  FlipWindowStyle(GetAcceleratedWidget(), maximizable, WS_MAXIMIZEBOX);
--#endif
--  maximizable_ = maximizable;
--}
--
--bool NativeWindowViews::IsMaximizable() {
--#if defined(OS_WIN)
--  return ::GetWindowLong(GetAcceleratedWidget(), GWL_STYLE) & WS_MAXIMIZEBOX;
--#else
--  return true;  // Not implemented on Linux.
--#endif
--}
--
--void NativeWindowViews::SetFullScreenable(bool fullscreenable) {
--  fullscreenable_ = fullscreenable;
--}
--
--bool NativeWindowViews::IsFullScreenable() {
--  return fullscreenable_;
--}
--
--void NativeWindowViews::SetClosable(bool closable) {
--#if defined(OS_WIN)
--  HMENU menu = GetSystemMenu(GetAcceleratedWidget(), false);
--  if (closable) {
--    EnableMenuItem(menu, SC_CLOSE, MF_BYCOMMAND | MF_ENABLED);
--  } else {
--    EnableMenuItem(menu, SC_CLOSE, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
--  }
--#endif
--}
--
--bool NativeWindowViews::IsClosable() {
--#if defined(OS_WIN)
--  HMENU menu = GetSystemMenu(GetAcceleratedWidget(), false);
--  MENUITEMINFO info;
--  memset(&info, 0, sizeof(info));
--  info.cbSize = sizeof(info);
--  info.fMask = MIIM_STATE;
--  if (!GetMenuItemInfo(menu, SC_CLOSE, false, &info)) {
--    return false;
--  }
--  return !(info.fState & MFS_DISABLED);
--#elif defined(USE_X11)
--  return true;
--#endif
--}
--
--void NativeWindowViews::SetAlwaysOnTop(bool top,
--                                       const std::string& level,
--                                       int relativeLevel,
--                                       std::string* error) {
--  widget()->SetAlwaysOnTop(top);
--}
--
--bool NativeWindowViews::IsAlwaysOnTop() {
--  return widget()->IsAlwaysOnTop();
--}
--
--void NativeWindowViews::Center() {
--  widget()->CenterWindow(GetSize());
--}
--
--void NativeWindowViews::Invalidate() {
--  widget()->SchedulePaintInRect(gfx::Rect(GetBounds().size()));
--}
--
--void NativeWindowViews::SetTitle(const std::string& title) {
--  title_ = title;
--  widget()->UpdateWindowTitle();
--}
--
--std::string NativeWindowViews::GetTitle() {
--  return title_;
--}
--
--void NativeWindowViews::FlashFrame(bool flash) {
--#if defined(OS_WIN)
--  // The Chromium's implementation has a bug stopping flash.
--  if (!flash) {
--    FLASHWINFO fwi;
--    fwi.cbSize = sizeof(fwi);
--    fwi.hwnd = GetAcceleratedWidget();
--    fwi.dwFlags = FLASHW_STOP;
--    fwi.uCount = 0;
--    FlashWindowEx(&fwi);
--    return;
--  }
--#endif
--  widget()->FlashFrame(flash);
--}
--
--void NativeWindowViews::SetSkipTaskbar(bool skip) {
--#if defined(OS_WIN)
--  Microsoft::WRL::ComPtr<ITaskbarList> taskbar;
--  if (FAILED(::CoCreateInstance(CLSID_TaskbarList, nullptr,
--                                CLSCTX_INPROC_SERVER,
--                                IID_PPV_ARGS(&taskbar))) ||
--      FAILED(taskbar->HrInit()))
--    return;
--  if (skip) {
--    taskbar->DeleteTab(GetAcceleratedWidget());
--  } else {
--    taskbar->AddTab(GetAcceleratedWidget());
--    taskbar_host_.RestoreThumbarButtons(GetAcceleratedWidget());
--  }
--#elif defined(USE_X11)
--  SetWMSpecState(GetAcceleratedWidget(), skip,
--                 GetAtom("_NET_WM_STATE_SKIP_TASKBAR"));
--#endif
--}
--
--void NativeWindowViews::SetSimpleFullScreen(bool simple_fullscreen) {
--  SetFullScreen(simple_fullscreen);
--}
--
--bool NativeWindowViews::IsSimpleFullScreen() {
--  return IsFullscreen();
--}
--
--void NativeWindowViews::SetKiosk(bool kiosk) {
--  SetFullScreen(kiosk);
--}
--
--bool NativeWindowViews::IsKiosk() {
--  return IsFullscreen();
--}
--
--void NativeWindowViews::SetBackgroundColor(SkColor background_color) {
--  // web views' background color.
--  root_view_->SetBackground(views::CreateSolidBackground(background_color));
--
--#if defined(OS_WIN)
--  // Set the background color of native window.
--  HBRUSH brush = CreateSolidBrush(skia::SkColorToCOLORREF(background_color));
--  ULONG_PTR previous_brush =
--      SetClassLongPtr(GetAcceleratedWidget(), GCLP_HBRBACKGROUND,
--                      reinterpret_cast<LONG_PTR>(brush));
--  if (previous_brush)
--    DeleteObject((HBRUSH)previous_brush);
--#endif
--}
--
--void NativeWindowViews::SetHasShadow(bool has_shadow) {
--  wm::SetShadowElevation(GetNativeWindow(),
--                         has_shadow ? wm::kShadowElevationInactiveWindow
--                                    : wm::kShadowElevationNone);
--}
--
--bool NativeWindowViews::HasShadow() {
--  return GetNativeWindow()->GetProperty(wm::kShadowElevationKey) !=
--         wm::kShadowElevationNone;
--}
--
--void NativeWindowViews::SetOpacity(const double opacity) {
--#if defined(OS_WIN)
--  HWND hwnd = GetAcceleratedWidget();
--  if (!layered_) {
--    LONG ex_style = ::GetWindowLong(hwnd, GWL_EXSTYLE);
--    ex_style |= WS_EX_LAYERED;
--    ::SetWindowLong(hwnd, GWL_EXSTYLE, ex_style);
--    layered_ = true;
--  }
--  ::SetLayeredWindowAttributes(hwnd, 0, opacity * 255, LWA_ALPHA);
--#endif
--  opacity_ = opacity;
--}
--
--double NativeWindowViews::GetOpacity() {
--  return opacity_;
--}
--
--void NativeWindowViews::SetIgnoreMouseEvents(bool ignore, bool forward) {
--#if defined(OS_WIN)
--  LONG ex_style = ::GetWindowLong(GetAcceleratedWidget(), GWL_EXSTYLE);
--  if (ignore)
--    ex_style |= (WS_EX_TRANSPARENT | WS_EX_LAYERED);
--  else
--    ex_style &= ~(WS_EX_TRANSPARENT | WS_EX_LAYERED);
--  if (layered_)
--    ex_style |= WS_EX_LAYERED;
--  ::SetWindowLong(GetAcceleratedWidget(), GWL_EXSTYLE, ex_style);
--
--  // Forwarding is always disabled when not ignoring mouse messages.
--  if (!ignore) {
--    SetForwardMouseMessages(false);
--  } else {
--    SetForwardMouseMessages(forward);
--  }
--#elif defined(USE_X11)
--  if (ignore) {
--    XRectangle r = {0, 0, 1, 1};
--    XShapeCombineRectangles(gfx::GetXDisplay(), GetAcceleratedWidget(),
--                            ShapeInput, 0, 0, &r, 1, ShapeSet, YXBanded);
--  } else {
--    XShapeCombineMask(gfx::GetXDisplay(), GetAcceleratedWidget(), ShapeInput, 0,
--                      0, x11::None, ShapeSet);
--  }
--#endif
--}
--
--void NativeWindowViews::SetContentProtection(bool enable) {
--#if defined(OS_WIN)
--  DWORD affinity = enable ? WDA_MONITOR : WDA_NONE;
--  ::SetWindowDisplayAffinity(GetAcceleratedWidget(), affinity);
--#endif
--}
--
--void NativeWindowViews::SetFocusable(bool focusable) {
--#if defined(OS_WIN)
--  LONG ex_style = ::GetWindowLong(GetAcceleratedWidget(), GWL_EXSTYLE);
--  if (focusable)
--    ex_style &= ~WS_EX_NOACTIVATE;
--  else
--    ex_style |= WS_EX_NOACTIVATE;
--  ::SetWindowLong(GetAcceleratedWidget(), GWL_EXSTYLE, ex_style);
--  SetSkipTaskbar(!focusable);
--  Focus(false);
--#endif
--}
--
--void NativeWindowViews::SetMenu(AtomMenuModel* menu_model) {
--#if defined(USE_X11)
--  if (menu_model == nullptr)
--    global_menu_bar_.reset();
--
--  if (!global_menu_bar_ && ShouldUseGlobalMenuBar())
--    global_menu_bar_.reset(new GlobalMenuBarX11(this));
--
--  // Use global application menu bar when possible.
--  if (global_menu_bar_ && global_menu_bar_->IsServerStarted()) {
--    global_menu_bar_->SetMenu(menu_model);
--    return;
--  }
--#endif
--
--  // Should reset content size when setting menu.
--  gfx::Size content_size = GetContentSize();
--  bool should_reset_size = use_content_size_ && has_frame() &&
--                           !IsMenuBarAutoHide() &&
--                           ((!!menu_model) != root_view_->HasMenu());
--
--  root_view_->SetMenu(menu_model);
--
--  if (should_reset_size) {
--    // Enlarge the size constraints for the menu.
--    int menu_bar_height = root_view_->GetMenuBarHeight();
--    extensions::SizeConstraints constraints = GetContentSizeConstraints();
--    if (constraints.HasMinimumSize()) {
--      gfx::Size min_size = constraints.GetMinimumSize();
--      min_size.set_height(min_size.height() + menu_bar_height);
--      constraints.set_minimum_size(min_size);
--    }
--    if (constraints.HasMaximumSize()) {
--      gfx::Size max_size = constraints.GetMaximumSize();
--      max_size.set_height(max_size.height() + menu_bar_height);
--      constraints.set_maximum_size(max_size);
--    }
--    SetContentSizeConstraints(constraints);
--
--    // Resize the window to make sure content size is not changed.
--    SetContentSize(content_size);
--  }
--}
--
--void NativeWindowViews::SetBrowserView(NativeBrowserView* view) {
--  if (!content_view())
--    return;
--
--  if (browser_view()) {
--    content_view()->RemoveChildView(
--        browser_view()->GetInspectableWebContentsView()->GetView());
--    set_browser_view(nullptr);
--  }
--
--  if (!view) {
--    return;
--  }
--
--  // Add as child of the main web view to avoid (0, 0) origin from overlapping
--  // with menu bar.
--  set_browser_view(view);
--  content_view()->AddChildView(
--      view->GetInspectableWebContentsView()->GetView());
--}
--
--void NativeWindowViews::SetParentWindow(NativeWindow* parent) {
--  NativeWindow::SetParentWindow(parent);
--
--#if defined(USE_X11)
--  XDisplay* xdisplay = gfx::GetXDisplay();
--  XSetTransientForHint(
--      xdisplay, GetAcceleratedWidget(),
--      parent ? parent->GetAcceleratedWidget() : DefaultRootWindow(xdisplay));
--#elif defined(OS_WIN) && defined(DEBUG)
--  // Should work, but does not, it seems that the views toolkit doesn't support
--  // reparenting on desktop.
--  if (parent) {
--    ::SetParent(GetAcceleratedWidget(), parent->GetAcceleratedWidget());
--    views::Widget::ReparentNativeView(GetNativeWindow(),
--                                      parent->GetNativeWindow());
--    wm::AddTransientChild(parent->GetNativeWindow(), GetNativeWindow());
--  } else {
--    if (!GetNativeWindow()->parent())
--      return;
--    ::SetParent(GetAcceleratedWidget(), NULL);
--    views::Widget::ReparentNativeView(GetNativeWindow(), nullptr);
--    wm::RemoveTransientChild(GetNativeWindow()->parent(), GetNativeWindow());
--  }
--#endif
--}
--
--gfx::NativeView NativeWindowViews::GetNativeView() const {
--  return widget()->GetNativeView();
--}
--
--gfx::NativeWindow NativeWindowViews::GetNativeWindow() const {
--  return widget()->GetNativeWindow();
--}
--
--void NativeWindowViews::SetProgressBar(double progress,
--                                       NativeWindow::ProgressState state) {
--#if defined(OS_WIN)
--  taskbar_host_.SetProgressBar(GetAcceleratedWidget(), progress, state);
--#elif defined(USE_X11)
--  if (unity::IsRunning()) {
--    unity::SetProgressFraction(progress);
--  }
--#endif
--}
--
--void NativeWindowViews::SetOverlayIcon(const gfx::Image& overlay,
--                                       const std::string& description) {
--#if defined(OS_WIN)
--  taskbar_host_.SetOverlayIcon(GetAcceleratedWidget(), overlay, description);
--#endif
--}
--
--void NativeWindowViews::SetAutoHideMenuBar(bool auto_hide) {
--  root_view_->SetAutoHideMenuBar(auto_hide);
--}
--
--bool NativeWindowViews::IsMenuBarAutoHide() {
--  return root_view_->IsMenuBarAutoHide();
--}
--
--void NativeWindowViews::SetMenuBarVisibility(bool visible) {
--  root_view_->SetMenuBarVisibility(visible);
--}
--
--bool NativeWindowViews::IsMenuBarVisible() {
--  return root_view_->IsMenuBarVisible();
--}
--
--void NativeWindowViews::SetVisibleOnAllWorkspaces(bool visible) {
--  widget()->SetVisibleOnAllWorkspaces(visible);
--}
--
--bool NativeWindowViews::IsVisibleOnAllWorkspaces() {
--#if defined(USE_X11)
--  // Use the presence/absence of _NET_WM_STATE_STICKY in _NET_WM_STATE to
--  // determine whether the current window is visible on all workspaces.
--  XAtom sticky_atom = GetAtom("_NET_WM_STATE_STICKY");
--  std::vector<XAtom> wm_states;
--  ui::GetAtomArrayProperty(GetAcceleratedWidget(), "_NET_WM_STATE", &wm_states);
--  return std::find(wm_states.begin(), wm_states.end(), sticky_atom) !=
--         wm_states.end();
--#endif
--  return false;
--}
--
--gfx::AcceleratedWidget NativeWindowViews::GetAcceleratedWidget() const {
--  return GetNativeWindow()->GetHost()->GetAcceleratedWidget();
--}
--
--gfx::Rect NativeWindowViews::ContentBoundsToWindowBounds(
--    const gfx::Rect& bounds) const {
--  if (!has_frame())
--    return bounds;
--
--  gfx::Rect window_bounds(bounds);
--#if defined(OS_WIN)
--  HWND hwnd = GetAcceleratedWidget();
--  gfx::Rect dpi_bounds = display::win::ScreenWin::DIPToScreenRect(hwnd, bounds);
--  window_bounds = display::win::ScreenWin::ScreenToDIPRect(
--      hwnd,
--      widget()->non_client_view()->GetWindowBoundsForClientBounds(dpi_bounds));
--#endif
--
--  if (root_view_->HasMenu() && root_view_->IsMenuBarVisible()) {
--    int menu_bar_height = root_view_->GetMenuBarHeight();
--    window_bounds.set_y(window_bounds.y() - menu_bar_height);
--    window_bounds.set_height(window_bounds.height() + menu_bar_height);
--  }
--  return window_bounds;
--}
--
--gfx::Rect NativeWindowViews::WindowBoundsToContentBounds(
--    const gfx::Rect& bounds) const {
--  if (!has_frame())
--    return bounds;
--
--  gfx::Rect content_bounds(bounds);
--#if defined(OS_WIN)
--  HWND hwnd = GetAcceleratedWidget();
--  content_bounds.set_size(
--      display::win::ScreenWin::DIPToScreenSize(hwnd, content_bounds.size()));
--  RECT rect;
--  SetRectEmpty(&rect);
--  DWORD style = ::GetWindowLong(hwnd, GWL_STYLE);
--  DWORD ex_style = ::GetWindowLong(hwnd, GWL_EXSTYLE);
--  AdjustWindowRectEx(&rect, style, FALSE, ex_style);
--  content_bounds.set_width(content_bounds.width() - (rect.right - rect.left));
--  content_bounds.set_height(content_bounds.height() - (rect.bottom - rect.top));
--  content_bounds.set_size(
--      display::win::ScreenWin::ScreenToDIPSize(hwnd, content_bounds.size()));
--#endif
--
--  if (root_view_->HasMenu() && root_view_->IsMenuBarVisible()) {
--    int menu_bar_height = root_view_->GetMenuBarHeight();
--    content_bounds.set_y(content_bounds.y() + menu_bar_height);
--    content_bounds.set_height(content_bounds.height() - menu_bar_height);
--  }
--  return content_bounds;
--}
--
--void NativeWindowViews::UpdateDraggableRegions(
--    std::unique_ptr<SkRegion> region) {
--  draggable_region_ = std::move(region);
--}
--
--#if defined(OS_WIN)
--void NativeWindowViews::SetIcon(HICON window_icon, HICON app_icon) {
--  // We are responsible for storing the images.
--  window_icon_ = base::win::ScopedHICON(CopyIcon(window_icon));
--  app_icon_ = base::win::ScopedHICON(CopyIcon(app_icon));
--
--  HWND hwnd = GetAcceleratedWidget();
--  SendMessage(hwnd, WM_SETICON, ICON_SMALL,
--              reinterpret_cast<LPARAM>(window_icon_.get()));
--  SendMessage(hwnd, WM_SETICON, ICON_BIG,
--              reinterpret_cast<LPARAM>(app_icon_.get()));
--}
--#elif defined(USE_X11)
--void NativeWindowViews::SetIcon(const gfx::ImageSkia& icon) {
--  auto* tree_host = static_cast<views::DesktopWindowTreeHost*>(
--      views::DesktopWindowTreeHostX11::GetHostForXID(GetAcceleratedWidget()));
--  tree_host->SetWindowIcons(icon, icon);
--}
--#endif
--
--void NativeWindowViews::OnWidgetActivationChanged(views::Widget* changed_widget,
--                                                  bool active) {
--  if (changed_widget != widget())
--    return;
--
--  // Post the notification to next tick.
--  content::BrowserThread::PostTask(
--      content::BrowserThread::UI, FROM_HERE,
--      base::Bind(active ? &NativeWindow::NotifyWindowFocus
--                        : &NativeWindow::NotifyWindowBlur,
--                 GetWeakPtr()));
--
--  // Hide menu bar when window is blured.
--  if (!active && IsMenuBarAutoHide() && IsMenuBarVisible())
--    SetMenuBarVisibility(false);
--
--  root_view_->ResetAltState();
--}
--
--void NativeWindowViews::OnWidgetBoundsChanged(views::Widget* changed_widget,
--                                              const gfx::Rect& bounds) {
--  if (changed_widget != widget())
--    return;
--
--  // Note: We intentionally use `GetBounds()` instead of `bounds` to properly
--  // handle minimized windows on Windows.
--  const auto new_bounds = GetBounds();
--  if (widget_size_ != new_bounds.size()) {
--    if (browser_view()) {
--      const auto flags = static_cast<NativeBrowserViewViews*>(browser_view())
--                             ->GetAutoResizeFlags();
--      int width_delta = 0;
--      int height_delta = 0;
--      if (flags & kAutoResizeWidth) {
--        width_delta = new_bounds.width() - widget_size_.width();
--      }
--      if (flags & kAutoResizeHeight) {
--        height_delta = new_bounds.height() - widget_size_.height();
--      }
--
--      auto* view = browser_view()->GetInspectableWebContentsView()->GetView();
--      auto new_view_size = view->size();
--      new_view_size.set_width(new_view_size.width() + width_delta);
--      new_view_size.set_height(new_view_size.height() + height_delta);
--      view->SetSize(new_view_size);
--    }
--
--    NotifyWindowResize();
--    widget_size_ = new_bounds.size();
--  }
--}
--
--void NativeWindowViews::DeleteDelegate() {
--  if (is_modal() && NativeWindow::parent()) {
--    auto* parent = NativeWindow::parent();
--    // Enable parent window after current window gets closed.
--    parent->SetEnabled(true);
--    // Focus on parent window.
--    parent->Focus(true);
--  }
--
--  NotifyWindowClosed();
--}
--
--views::View* NativeWindowViews::GetInitiallyFocusedView() {
--  return focused_view_;
--}
--
--bool NativeWindowViews::CanResize() const {
--  return resizable_;
--}
--
--bool NativeWindowViews::CanMaximize() const {
--  return resizable_ && maximizable_;
--}
--
--bool NativeWindowViews::CanMinimize() const {
--#if defined(OS_WIN)
--  return minimizable_;
--#elif defined(USE_X11)
--  return true;
--#endif
--}
--
--base::string16 NativeWindowViews::GetWindowTitle() const {
--  return base::UTF8ToUTF16(title_);
--}
--
--views::View* NativeWindowViews::GetContentsView() {
--  return root_view_.get();
--}
--
--bool NativeWindowViews::ShouldDescendIntoChildForEventHandling(
--    gfx::NativeView child,
--    const gfx::Point& location) {
--  // App window should claim mouse events that fall within the draggable region.
--  if (draggable_region() &&
--      draggable_region()->contains(location.x(), location.y()))
--    return false;
--
--  // And the events on border for dragging resizable frameless window.
--  if (!has_frame() && CanResize()) {
--    FramelessView* frame =
--        static_cast<FramelessView*>(widget()->non_client_view()->frame_view());
--    return frame->ResizingBorderHitTest(location) == HTNOWHERE;
--  }
--
--  return true;
--}
--
--views::ClientView* NativeWindowViews::CreateClientView(views::Widget* widget) {
--  return new NativeWindowClientView(widget, root_view_.get(), this);
--}
--
--views::NonClientFrameView* NativeWindowViews::CreateNonClientFrameView(
--    views::Widget* widget) {
--#if defined(OS_WIN)
--  WinFrameView* frame_view = new WinFrameView;
--  frame_view->Init(this, widget);
--  return frame_view;
--#else
--  if (has_frame()) {
--    return new NativeFrameView(this, widget);
--  } else {
--    FramelessView* frame_view = new FramelessView;
--    frame_view->Init(this, widget);
--    return frame_view;
--  }
--#endif
--}
--
--void NativeWindowViews::OnWidgetMove() {
--  NotifyWindowMove();
--}
--
--void NativeWindowViews::HandleKeyboardEvent(
--    content::WebContents*,
--    const content::NativeWebKeyboardEvent& event) {
--  keyboard_event_handler_->HandleKeyboardEvent(event,
--                                               root_view_->GetFocusManager());
--  root_view_->HandleKeyEvent(event);
--}
--
--ui::WindowShowState NativeWindowViews::GetRestoredState() {
--  if (IsMaximized())
--    return ui::SHOW_STATE_MAXIMIZED;
--  if (IsFullscreen())
--    return ui::SHOW_STATE_FULLSCREEN;
--
--  return ui::SHOW_STATE_NORMAL;
--}
--
--// static
--NativeWindow* NativeWindow::Create(const mate::Dictionary& options,
--                                   NativeWindow* parent) {
--  return new NativeWindowViews(options, parent);
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 862cd5458bb67bd8089dcf48e590691fb3e1e9e6 atom/browser/native_window_views.h
-  our    100644 ef1e4413ca879980e46f301bccd6c8fe2b1a4611 atom/browser/native_window_views.h
-@@ -1,289 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_NATIVE_WINDOW_VIEWS_H_
--#define ATOM_BROWSER_NATIVE_WINDOW_VIEWS_H_
--
--#include "atom/browser/native_window.h"
--
--#include <set>
--#include <string>
--
--#include "ui/views/widget/widget_observer.h"
--
--#if defined(OS_WIN)
--#include "atom/browser/ui/win/message_handler_delegate.h"
--#include "atom/browser/ui/win/taskbar_host.h"
--#include "base/win/scoped_gdi_object.h"
--#endif
--
--namespace views {
--class UnhandledKeyboardEventHandler;
--}
--
--namespace atom {
--
--class GlobalMenuBarX11;
--class RootView;
--class WindowStateWatcher;
--
--#if defined(OS_WIN)
--class AtomDesktopWindowTreeHostWin;
--#elif defined(USE_X11)
--class EventDisabler;
--#endif
--
--class NativeWindowViews : public NativeWindow,
--#if defined(OS_WIN)
--                          public MessageHandlerDelegate,
--#endif
--                          public views::WidgetObserver {
-- public:
--  NativeWindowViews(const mate::Dictionary& options, NativeWindow* parent);
--  ~NativeWindowViews() override;
--
--  // NativeWindow:
--  void SetContentView(views::View* view) override;
--  void Close() override;
--  void CloseImmediately() override;
--  void Focus(bool focus) override;
--  bool IsFocused() override;
--  void Show() override;
--  void ShowInactive() override;
--  void Hide() override;
--  bool IsVisible() override;
--  bool IsEnabled() override;
--  void SetEnabled(bool enable) override;
--  void Maximize() override;
--  void Unmaximize() override;
--  bool IsMaximized() override;
--  void Minimize() override;
--  void Restore() override;
--  bool IsMinimized() override;
--  void SetFullScreen(bool fullscreen) override;
--  bool IsFullscreen() const override;
--  void SetBounds(const gfx::Rect& bounds, bool animate) override;
--  gfx::Rect GetBounds() override;
--  gfx::Rect GetContentBounds() override;
--  gfx::Size GetContentSize() override;
--  void SetContentSizeConstraints(
--      const extensions::SizeConstraints& size_constraints) override;
--  void SetResizable(bool resizable) override;
--#if defined(OS_WIN)
--  void MoveTop() override;
--#endif
--  bool IsResizable() override;
--  void SetMovable(bool movable) override;
--  bool IsMovable() override;
--  void SetMinimizable(bool minimizable) override;
--  bool IsMinimizable() override;
--  void SetMaximizable(bool maximizable) override;
--  bool IsMaximizable() override;
--  void SetFullScreenable(bool fullscreenable) override;
--  bool IsFullScreenable() override;
--  void SetClosable(bool closable) override;
--  bool IsClosable() override;
--  void SetAlwaysOnTop(bool top,
--                      const std::string& level,
--                      int relativeLevel,
--                      std::string* error) override;
--  bool IsAlwaysOnTop() override;
--  void Center() override;
--  void Invalidate() override;
--  void SetTitle(const std::string& title) override;
--  std::string GetTitle() override;
--  void FlashFrame(bool flash) override;
--  void SetSkipTaskbar(bool skip) override;
--  void SetSimpleFullScreen(bool simple_fullscreen) override;
--  bool IsSimpleFullScreen() override;
--  void SetKiosk(bool kiosk) override;
--  bool IsKiosk() override;
--  void SetBackgroundColor(SkColor color) override;
--  void SetHasShadow(bool has_shadow) override;
--  bool HasShadow() override;
--  void SetOpacity(const double opacity) override;
--  double GetOpacity() override;
--  void SetIgnoreMouseEvents(bool ignore, bool forward) override;
--  void SetContentProtection(bool enable) override;
--  void SetFocusable(bool focusable) override;
--  void SetMenu(AtomMenuModel* menu_model) override;
--  void SetBrowserView(NativeBrowserView* browser_view) override;
--  void SetParentWindow(NativeWindow* parent) override;
--  gfx::NativeView GetNativeView() const override;
--  gfx::NativeWindow GetNativeWindow() const override;
--  void SetOverlayIcon(const gfx::Image& overlay,
--                      const std::string& description) override;
--  void SetProgressBar(double progress, const ProgressState state) override;
--  void SetAutoHideMenuBar(bool auto_hide) override;
--  bool IsMenuBarAutoHide() override;
--  void SetMenuBarVisibility(bool visible) override;
--  bool IsMenuBarVisible() override;
--  void SetVisibleOnAllWorkspaces(bool visible) override;
--  bool IsVisibleOnAllWorkspaces() override;
--
--  gfx::AcceleratedWidget GetAcceleratedWidget() const override;
--
--  gfx::Rect ContentBoundsToWindowBounds(const gfx::Rect& bounds) const override;
--  gfx::Rect WindowBoundsToContentBounds(const gfx::Rect& bounds) const override;
--
--  void UpdateDraggableRegions(std::unique_ptr<SkRegion> region);
--
--#if defined(OS_WIN)
--  void SetIcon(HICON small_icon, HICON app_icon);
--#elif defined(USE_X11)
--  void SetIcon(const gfx::ImageSkia& icon);
--#endif
--
--  SkRegion* draggable_region() const { return draggable_region_.get(); }
--
--#if defined(OS_WIN)
--  TaskbarHost& taskbar_host() { return taskbar_host_; }
--#endif
--
-- private:
--  // views::WidgetObserver:
--  void OnWidgetActivationChanged(views::Widget* widget, bool active) override;
--  void OnWidgetBoundsChanged(views::Widget* widget,
--                             const gfx::Rect& bounds) override;
--
--  // views::WidgetDelegate:
--  void DeleteDelegate() override;
--  views::View* GetInitiallyFocusedView() override;
--  bool CanResize() const override;
--  bool CanMaximize() const override;
--  bool CanMinimize() const override;
--  base::string16 GetWindowTitle() const override;
--  views::View* GetContentsView() override;
--  bool ShouldDescendIntoChildForEventHandling(
--      gfx::NativeView child,
--      const gfx::Point& location) override;
--  views::ClientView* CreateClientView(views::Widget* widget) override;
--  views::NonClientFrameView* CreateNonClientFrameView(
--      views::Widget* widget) override;
--  void OnWidgetMove() override;
--#if defined(OS_WIN)
--  bool ExecuteWindowsCommand(int command_id) override;
--#endif
--
--#if defined(OS_WIN)
--  // MessageHandlerDelegate:
--  bool PreHandleMSG(UINT message,
--                    WPARAM w_param,
--                    LPARAM l_param,
--                    LRESULT* result) override;
--  void HandleSizeEvent(WPARAM w_param, LPARAM l_param);
--  void SetForwardMouseMessages(bool forward);
--  static LRESULT CALLBACK SubclassProc(HWND hwnd,
--                                       UINT msg,
--                                       WPARAM w_param,
--                                       LPARAM l_param,
--                                       UINT_PTR subclass_id,
--                                       DWORD_PTR ref_data);
--  static LRESULT CALLBACK MouseHookProc(int n_code,
--                                        WPARAM w_param,
--                                        LPARAM l_param);
--#endif
--
--  // NativeWindow:
--  void HandleKeyboardEvent(
--      content::WebContents*,
--      const content::NativeWebKeyboardEvent& event) override;
--
--  // Returns the restore state for the window.
--  ui::WindowShowState GetRestoredState();
--
--  std::unique_ptr<RootView> root_view_;
--
--  // The view should be focused by default.
--  views::View* focused_view_ = nullptr;
--
--  // The "resizable" flag on Linux is implemented by setting size constraints,
--  // we need to make sure size constraints are restored when window becomes
--  // resizable again. This is also used on Windows, to keep taskbar resize
--  // events from resizing the window.
--  extensions::SizeConstraints old_size_constraints_;
--
--#if defined(USE_X11)
--  std::unique_ptr<GlobalMenuBarX11> global_menu_bar_;
--
--  // Handles window state events.
--  std::unique_ptr<WindowStateWatcher> window_state_watcher_;
--
--  // To disable the mouse events.
--  std::unique_ptr<EventDisabler> event_disabler_;
--#endif
--
--#if defined(OS_WIN)
--  // Weak ref.
--  AtomDesktopWindowTreeHostWin* atom_desktop_window_tree_host_win_;
--
--  ui::WindowShowState last_window_state_;
--
--  // There's an issue with restore on Windows, that sometimes causes the Window
--  // to receive the wrong size (#2498). To circumvent that, we keep tabs on the
--  // size of the window while in the normal state (not maximized, minimized or
--  // fullscreen), so we restore it correctly.
--  gfx::Rect last_normal_bounds_;
--  gfx::Rect last_normal_bounds_before_move_;
--
--  // last_normal_bounds_ may or may not require update on WM_MOVE. When a
--  // window is maximized, it is moved (WM_MOVE) to maximum size first and then
--  // sized (WM_SIZE). In this case, last_normal_bounds_ should not update. We
--  // keep last_normal_bounds_candidate_ as a candidate which will become valid
--  // last_normal_bounds_ if the moves are consecutive with no WM_SIZE event in
--  // between.
--  gfx::Rect last_normal_bounds_candidate_;
--
--  bool consecutive_moves_;
--
--  // In charge of running taskbar related APIs.
--  TaskbarHost taskbar_host_;
--
--  // Memoized version of a11y check
--  bool checked_for_a11y_support_ = false;
--
--  // Whether to show the WS_THICKFRAME style.
--  bool thick_frame_ = true;
--
--  // The bounds of window before maximize/fullscreen.
--  gfx::Rect restore_bounds_;
--
--  // The icons of window and taskbar.
--  base::win::ScopedHICON window_icon_;
--  base::win::ScopedHICON app_icon_;
--
--  // The set of windows currently forwarding mouse messages.
--  static std::set<NativeWindowViews*> forwarding_windows_;
--  static HHOOK mouse_hook_;
--  bool forwarding_mouse_messages_ = false;
--  HWND legacy_window_ = NULL;
--  bool layered_ = false;
--#endif
--
--  // Handles unhandled keyboard messages coming back from the renderer process.
--  std::unique_ptr<views::UnhandledKeyboardEventHandler> keyboard_event_handler_;
--
--  // For custom drag, the whole window is non-draggable and the draggable region
--  // has to been explicitly provided.
--  std::unique_ptr<SkRegion> draggable_region_;  // used in custom drag.
--
--  // How many times the Disable has been called.
--  int disable_count_ = 0;
--
--  bool use_content_size_ = false;
--  bool movable_ = true;
--  bool resizable_ = true;
--  bool maximizable_ = true;
--  bool minimizable_ = true;
--  bool fullscreenable_ = true;
--  std::string title_;
--  gfx::Size widget_size_;
--  double opacity_ = 1.0;
--
--  DISALLOW_COPY_AND_ASSIGN(NativeWindowViews);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_NATIVE_WINDOW_VIEWS_H_
-removed in remote
-  base   100644 e5ed1975f80f918eb37257f8b244f4cdf3eafc88 atom/browser/native_window_views_win.cc
-  our    100644 0e61d18b915924eb3d3d14e40d1cbbd199631bed atom/browser/native_window_views_win.cc
-@@ -1,386 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/browser.h"
--#include "atom/browser/native_window_views.h"
--#include "content/public/browser/browser_accessibility_state.h"
--#include "ui/base/win/accessibility_misc_utils.h"
--
--// Must be included after other Windows headers.
--#include <UIAutomationCoreApi.h>
--
--namespace atom {
--
--namespace {
--
--// Convert Win32 WM_APPCOMMANDS to strings.
--const char* AppCommandToString(int command_id) {
--  switch (command_id) {
--    case APPCOMMAND_BROWSER_BACKWARD:
--      return "browser-backward";
--    case APPCOMMAND_BROWSER_FORWARD:
--      return "browser-forward";
--    case APPCOMMAND_BROWSER_REFRESH:
--      return "browser-refresh";
--    case APPCOMMAND_BROWSER_STOP:
--      return "browser-stop";
--    case APPCOMMAND_BROWSER_SEARCH:
--      return "browser-search";
--    case APPCOMMAND_BROWSER_FAVORITES:
--      return "browser-favorites";
--    case APPCOMMAND_BROWSER_HOME:
--      return "browser-home";
--    case APPCOMMAND_VOLUME_MUTE:
--      return "volume-mute";
--    case APPCOMMAND_VOLUME_DOWN:
--      return "volume-down";
--    case APPCOMMAND_VOLUME_UP:
--      return "volume-up";
--    case APPCOMMAND_MEDIA_NEXTTRACK:
--      return "media-nexttrack";
--    case APPCOMMAND_MEDIA_PREVIOUSTRACK:
--      return "media-previoustrack";
--    case APPCOMMAND_MEDIA_STOP:
--      return "media-stop";
--    case APPCOMMAND_MEDIA_PLAY_PAUSE:
--      return "media-play-pause";
--    case APPCOMMAND_LAUNCH_MAIL:
--      return "launch-mail";
--    case APPCOMMAND_LAUNCH_MEDIA_SELECT:
--      return "launch-media-select";
--    case APPCOMMAND_LAUNCH_APP1:
--      return "launch-app1";
--    case APPCOMMAND_LAUNCH_APP2:
--      return "launch-app2";
--    case APPCOMMAND_BASS_DOWN:
--      return "bass-down";
--    case APPCOMMAND_BASS_BOOST:
--      return "bass-boost";
--    case APPCOMMAND_BASS_UP:
--      return "bass-up";
--    case APPCOMMAND_TREBLE_DOWN:
--      return "treble-down";
--    case APPCOMMAND_TREBLE_UP:
--      return "treble-up";
--    case APPCOMMAND_MICROPHONE_VOLUME_MUTE:
--      return "microphone-volume-mute";
--    case APPCOMMAND_MICROPHONE_VOLUME_DOWN:
--      return "microphone-volume-down";
--    case APPCOMMAND_MICROPHONE_VOLUME_UP:
--      return "microphone-volume-up";
--    case APPCOMMAND_HELP:
--      return "help";
--    case APPCOMMAND_FIND:
--      return "find";
--    case APPCOMMAND_NEW:
--      return "new";
--    case APPCOMMAND_OPEN:
--      return "open";
--    case APPCOMMAND_CLOSE:
--      return "close";
--    case APPCOMMAND_SAVE:
--      return "save";
--    case APPCOMMAND_PRINT:
--      return "print";
--    case APPCOMMAND_UNDO:
--      return "undo";
--    case APPCOMMAND_REDO:
--      return "redo";
--    case APPCOMMAND_COPY:
--      return "copy";
--    case APPCOMMAND_CUT:
--      return "cut";
--    case APPCOMMAND_PASTE:
--      return "paste";
--    case APPCOMMAND_REPLY_TO_MAIL:
--      return "reply-to-mail";
--    case APPCOMMAND_FORWARD_MAIL:
--      return "forward-mail";
--    case APPCOMMAND_SEND_MAIL:
--      return "send-mail";
--    case APPCOMMAND_SPELL_CHECK:
--      return "spell-check";
--    case APPCOMMAND_MIC_ON_OFF_TOGGLE:
--      return "mic-on-off-toggle";
--    case APPCOMMAND_CORRECTION_LIST:
--      return "correction-list";
--    case APPCOMMAND_MEDIA_PLAY:
--      return "media-play";
--    case APPCOMMAND_MEDIA_PAUSE:
--      return "media-pause";
--    case APPCOMMAND_MEDIA_RECORD:
--      return "media-record";
--    case APPCOMMAND_MEDIA_FAST_FORWARD:
--      return "media-fast-forward";
--    case APPCOMMAND_MEDIA_REWIND:
--      return "media-rewind";
--    case APPCOMMAND_MEDIA_CHANNEL_UP:
--      return "media-channel-up";
--    case APPCOMMAND_MEDIA_CHANNEL_DOWN:
--      return "media-channel-down";
--    case APPCOMMAND_DELETE:
--      return "delete";
--    case APPCOMMAND_DICTATE_OR_COMMAND_CONTROL_TOGGLE:
--      return "dictate-or-command-control-toggle";
--    default:
--      return "unknown";
--  }
--}
--
--bool IsScreenReaderActive() {
--  UINT screenReader = 0;
--  SystemParametersInfo(SPI_GETSCREENREADER, 0, &screenReader, 0);
--  return screenReader && UiaClientsAreListening();
--}
--
--}  // namespace
--
--std::set<NativeWindowViews*> NativeWindowViews::forwarding_windows_;
--HHOOK NativeWindowViews::mouse_hook_ = NULL;
--
--bool NativeWindowViews::ExecuteWindowsCommand(int command_id) {
--  std::string command = AppCommandToString(command_id);
--  NotifyWindowExecuteWindowsCommand(command);
--
--  return false;
--}
--
--bool NativeWindowViews::PreHandleMSG(UINT message,
--                                     WPARAM w_param,
--                                     LPARAM l_param,
--                                     LRESULT* result) {
--  NotifyWindowMessage(message, w_param, l_param);
--
--  switch (message) {
--    // Screen readers send WM_GETOBJECT in order to get the accessibility
--    // object, so take this opportunity to push Chromium into accessible
--    // mode if it isn't already, always say we didn't handle the message
--    // because we still want Chromium to handle returning the actual
--    // accessibility object.
--    case WM_GETOBJECT: {
--      if (checked_for_a11y_support_)
--        return false;
--
--      const DWORD obj_id = static_cast<DWORD>(l_param);
--
--      if (obj_id != static_cast<DWORD>(OBJID_CLIENT)) {
--        return false;
--      }
--
--      if (!IsScreenReaderActive()) {
--        return false;
--      }
--
--      checked_for_a11y_support_ = true;
--
--      auto* const axState = content::BrowserAccessibilityState::GetInstance();
--      if (axState && !axState->IsAccessibleBrowser()) {
--        axState->OnScreenReaderDetected();
--        Browser::Get()->OnAccessibilitySupportChanged();
--      }
--
--      return false;
--    }
--    case WM_COMMAND:
--      // Handle thumbar button click message.
--      if (HIWORD(w_param) == THBN_CLICKED)
--        return taskbar_host_.HandleThumbarButtonEvent(LOWORD(w_param));
--      return false;
--    case WM_SIZING: {
--      bool prevent_default = false;
--      NotifyWindowWillResize(gfx::Rect(*reinterpret_cast<RECT*>(l_param)),
--                             &prevent_default);
--      if (prevent_default) {
--        ::GetWindowRect(GetAcceleratedWidget(),
--                        reinterpret_cast<RECT*>(l_param));
--      }
--      return false;
--    }
--    case WM_SIZE: {
--      // Handle window state change.
--      HandleSizeEvent(w_param, l_param);
--
--      consecutive_moves_ = false;
--      last_normal_bounds_before_move_ = last_normal_bounds_;
--
--      return false;
--    }
--    case WM_MOVING: {
--      if (!movable_)
--        ::GetWindowRect(GetAcceleratedWidget(),
--                        reinterpret_cast<RECT*>(l_param));
--      return false;
--    }
--    case WM_MOVE: {
--      if (last_window_state_ == ui::SHOW_STATE_NORMAL) {
--        if (consecutive_moves_)
--          last_normal_bounds_ = last_normal_bounds_candidate_;
--        last_normal_bounds_candidate_ = GetBounds();
--        consecutive_moves_ = true;
--      }
--      return false;
--    }
--    case WM_ENDSESSION: {
--      if (w_param) {
--        NotifyWindowEndSession();
--      }
--      return false;
--    }
--    case WM_PARENTNOTIFY: {
--      if (LOWORD(w_param) == WM_CREATE) {
--        // Because of reasons regarding legacy drivers and stuff, a window that
--        // matches the client area is created and used internally by Chromium.
--        // This is used when forwarding mouse messages. We only cache the first
--        // occurrence (the webview window) because dev tools also cause this
--        // message to be sent.
--        if (!legacy_window_) {
--          legacy_window_ = reinterpret_cast<HWND>(l_param);
--        }
--      }
--      return false;
--    }
--    default:
--      return false;
--  }
--}
--
--void NativeWindowViews::HandleSizeEvent(WPARAM w_param, LPARAM l_param) {
--  // Here we handle the WM_SIZE event in order to figure out what is the current
--  // window state and notify the user accordingly.
--  switch (w_param) {
--    case SIZE_MAXIMIZED:
--      last_window_state_ = ui::SHOW_STATE_MAXIMIZED;
--      if (consecutive_moves_) {
--        last_normal_bounds_ = last_normal_bounds_before_move_;
--      }
--      NotifyWindowMaximize();
--      break;
--    case SIZE_MINIMIZED:
--      last_window_state_ = ui::SHOW_STATE_MINIMIZED;
--      NotifyWindowMinimize();
--      break;
--    case SIZE_RESTORED:
--      if (last_window_state_ == ui::SHOW_STATE_NORMAL) {
--        // Window was resized so we save it's new size.
--        last_normal_bounds_ = GetBounds();
--        last_normal_bounds_before_move_ = last_normal_bounds_;
--      } else {
--        switch (last_window_state_) {
--          case ui::SHOW_STATE_MAXIMIZED:
--            last_window_state_ = ui::SHOW_STATE_NORMAL;
--
--            // Don't force out last known bounds onto the window as Windows
--            // actually gets these correct
--
--            NotifyWindowUnmaximize();
--            break;
--          case ui::SHOW_STATE_MINIMIZED:
--            if (IsFullscreen()) {
--              last_window_state_ = ui::SHOW_STATE_FULLSCREEN;
--              NotifyWindowEnterFullScreen();
--            } else {
--              last_window_state_ = ui::SHOW_STATE_NORMAL;
--
--              // When the window is restored we resize it to the previous known
--              // normal size.
--              SetBounds(last_normal_bounds_, false);
--
--              NotifyWindowRestore();
--            }
--            break;
--          default:
--            break;
--        }
--      }
--      break;
--  }
--}
--
--void NativeWindowViews::SetForwardMouseMessages(bool forward) {
--  if (forward && !forwarding_mouse_messages_) {
--    forwarding_mouse_messages_ = true;
--    forwarding_windows_.insert(this);
--
--    // Subclassing is used to fix some issues when forwarding mouse messages;
--    // see comments in |SubclassProc|.
--    SetWindowSubclass(legacy_window_, SubclassProc, 1,
--                      reinterpret_cast<DWORD_PTR>(this));
--
--    if (!mouse_hook_) {
--      mouse_hook_ = SetWindowsHookEx(WH_MOUSE_LL, MouseHookProc, NULL, 0);
--    }
--  } else if (!forward && forwarding_mouse_messages_) {
--    forwarding_mouse_messages_ = false;
--    forwarding_windows_.erase(this);
--
--    RemoveWindowSubclass(legacy_window_, SubclassProc, 1);
--
--    if (forwarding_windows_.size() == 0) {
--      UnhookWindowsHookEx(mouse_hook_);
--      mouse_hook_ = NULL;
--    }
--  }
--}
--
--LRESULT CALLBACK NativeWindowViews::SubclassProc(HWND hwnd,
--                                                 UINT msg,
--                                                 WPARAM w_param,
--                                                 LPARAM l_param,
--                                                 UINT_PTR subclass_id,
--                                                 DWORD_PTR ref_data) {
--  NativeWindowViews* window = reinterpret_cast<NativeWindowViews*>(ref_data);
--  switch (msg) {
--    case WM_MOUSELEAVE: {
--      // When input is forwarded to underlying windows, this message is posted.
--      // If not handled, it interferes with Chromium logic, causing for example
--      // mouseleave events to fire. If those events are used to exit forward
--      // mode, excessive flickering on for example hover items in underlying
--      // windows can occur due to rapidly entering and leaving forwarding mode.
--      // By consuming and ignoring the message, we're essentially telling
--      // Chromium that we have not left the window despite somebody else getting
--      // the messages. As to why this is catched for the legacy window and not
--      // the actual browser window is simply that the legacy window somehow
--      // makes use of these events; posting to the main window didn't work.
--      if (window->forwarding_mouse_messages_) {
--        return 0;
--      }
--      break;
--    }
--  }
--
--  return DefSubclassProc(hwnd, msg, w_param, l_param);
--}
--
--LRESULT CALLBACK NativeWindowViews::MouseHookProc(int n_code,
--                                                  WPARAM w_param,
--                                                  LPARAM l_param) {
--  if (n_code < 0) {
--    return CallNextHookEx(NULL, n_code, w_param, l_param);
--  }
--
--  // Post a WM_MOUSEMOVE message for those windows whose client area contains
--  // the cursor since they are in a state where they would otherwise ignore all
--  // mouse input.
--  if (w_param == WM_MOUSEMOVE) {
--    for (auto* window : forwarding_windows_) {
--      // At first I considered enumerating windows to check whether the cursor
--      // was directly above the window, but since nothing bad seems to happen
--      // if we post the message even if some other window occludes it I have
--      // just left it as is.
--      RECT client_rect;
--      GetClientRect(window->legacy_window_, &client_rect);
--      POINT p = reinterpret_cast<MSLLHOOKSTRUCT*>(l_param)->pt;
--      ScreenToClient(window->legacy_window_, &p);
--      if (PtInRect(&client_rect, p)) {
--        WPARAM w = 0;  // No virtual keys pressed for our purposes
--        LPARAM l = MAKELPARAM(p.x, p.y);
--        PostMessage(window->legacy_window_, WM_MOUSEMOVE, w, l);
--      }
--    }
--  }
--
--  return CallNextHookEx(NULL, n_code, w_param, l_param);
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 324f8339c8c9d8431480e185e1b24f468f1c7421 atom/browser/net/asar/asar_protocol_handler.cc
-  our    100644 c2f53fa9d10881b0c5d68eff2b9ce628603bd8e1 atom/browser/net/asar/asar_protocol_handler.cc
-@@ -1,33 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/net/asar/asar_protocol_handler.h"
--
--#include "atom/browser/net/asar/url_request_asar_job.h"
--#include "net/base/filename_util.h"
--#include "net/base/net_errors.h"
--
--namespace asar {
--
--AsarProtocolHandler::AsarProtocolHandler(
--    const scoped_refptr<base::TaskRunner>& file_task_runner)
--    : file_task_runner_(file_task_runner) {}
--
--AsarProtocolHandler::~AsarProtocolHandler() {}
--
--net::URLRequestJob* AsarProtocolHandler::MaybeCreateJob(
--    net::URLRequest* request,
--    net::NetworkDelegate* network_delegate) const {
--  base::FilePath full_path;
--  net::FileURLToFilePath(request->url(), &full_path);
--  auto* job = new URLRequestAsarJob(request, network_delegate);
--  job->Initialize(file_task_runner_, full_path);
--  return job;
--}
--
--bool AsarProtocolHandler::IsSafeRedirectTarget(const GURL& location) const {
--  return false;
--}
--
--}  // namespace asar
-removed in remote
-  base   100644 e0cb74d5d1bf46ace38e6c0e5e62e90f5b6d4ba0 atom/browser/net/asar/asar_protocol_handler.h
-  our    100644 f431b55b71709c2f2932375fc992bf526a2d44d2 atom/browser/net/asar/asar_protocol_handler.h
-@@ -1,37 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_NET_ASAR_ASAR_PROTOCOL_HANDLER_H_
--#define ATOM_BROWSER_NET_ASAR_ASAR_PROTOCOL_HANDLER_H_
--
--#include "base/memory/ref_counted.h"
--#include "net/url_request/url_request_job_factory.h"
--
--namespace base {
--class TaskRunner;
--}
--
--namespace asar {
--
--class AsarProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler {
-- public:
--  explicit AsarProtocolHandler(
--      const scoped_refptr<base::TaskRunner>& file_task_runner);
--  ~AsarProtocolHandler() override;
--
--  // net::URLRequestJobFactory::ProtocolHandler:
--  net::URLRequestJob* MaybeCreateJob(
--      net::URLRequest* request,
--      net::NetworkDelegate* network_delegate) const override;
--  bool IsSafeRedirectTarget(const GURL& location) const override;
--
-- private:
--  const scoped_refptr<base::TaskRunner> file_task_runner_;
--
--  DISALLOW_COPY_AND_ASSIGN(AsarProtocolHandler);
--};
--
--}  // namespace asar
--
--#endif  // ATOM_BROWSER_NET_ASAR_ASAR_PROTOCOL_HANDLER_H_
-removed in remote
-  base   100644 39e55a35cbcec0504510f0b34153382677d33e7f atom/browser/net/asar/url_request_asar_job.cc
-  our    100644 85eb2e1dd142b6d64aafb5350ae47603db989e8f atom/browser/net/asar/url_request_asar_job.cc
-@@ -1,334 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/net/asar/url_request_asar_job.h"
--
--#include <string>
--#include <vector>
--
--#include "atom/common/asar/archive.h"
--#include "atom/common/asar/asar_util.h"
--#include "atom/common/atom_constants.h"
--#include "base/bind.h"
--#include "base/files/file_util.h"
--#include "base/strings/string_util.h"
--#include "base/synchronization/lock.h"
--#include "base/task_runner.h"
--#include "base/threading/thread_task_runner_handle.h"
--#include "net/base/file_stream.h"
--#include "net/base/filename_util.h"
--#include "net/base/io_buffer.h"
--#include "net/base/load_flags.h"
--#include "net/base/mime_util.h"
--#include "net/base/net_errors.h"
--#include "net/filter/gzip_source_stream.h"
--#include "net/http/http_util.h"
--#include "net/url_request/url_request_status.h"
--
--#if defined(OS_WIN)
--#include "base/win/shortcut.h"
--#endif
--
--namespace asar {
--
--URLRequestAsarJob::FileMetaInfo::FileMetaInfo() = default;
--
--URLRequestAsarJob::URLRequestAsarJob(net::URLRequest* request,
--                                     net::NetworkDelegate* network_delegate)
--    : net::URLRequestJob(request, network_delegate), weak_ptr_factory_(this) {}
--
--URLRequestAsarJob::~URLRequestAsarJob() {}
--
--void URLRequestAsarJob::Initialize(
--    const scoped_refptr<base::TaskRunner> file_task_runner,
--    const base::FilePath& file_path) {
--  // Determine whether it is an asar file.
--  base::FilePath asar_path, relative_path;
--  if (!GetAsarArchivePath(file_path, &asar_path, &relative_path)) {
--    InitializeFileJob(file_task_runner, file_path);
--    return;
--  }
--
--  std::shared_ptr<Archive> archive = GetOrCreateAsarArchive(asar_path);
--  Archive::FileInfo file_info;
--  if (!archive || !archive->GetFileInfo(relative_path, &file_info)) {
--    type_ = TYPE_ERROR;
--    return;
--  }
--
--  if (file_info.unpacked) {
--    base::FilePath real_path;
--    archive->CopyFileOut(relative_path, &real_path);
--    InitializeFileJob(file_task_runner, real_path);
--    return;
--  }
--
--  InitializeAsarJob(file_task_runner, archive, relative_path, file_info);
--}
--
--void URLRequestAsarJob::InitializeAsarJob(
--    const scoped_refptr<base::TaskRunner> file_task_runner,
--    std::shared_ptr<Archive> archive,
--    const base::FilePath& file_path,
--    const Archive::FileInfo& file_info) {
--  type_ = TYPE_ASAR;
--  file_task_runner_ = file_task_runner;
--  stream_.reset(new net::FileStream(file_task_runner_));
--  archive_ = archive;
--  file_path_ = file_path;
--  file_info_ = file_info;
--}
--
--void URLRequestAsarJob::InitializeFileJob(
--    const scoped_refptr<base::TaskRunner> file_task_runner,
--    const base::FilePath& file_path) {
--  type_ = TYPE_FILE;
--  file_task_runner_ = file_task_runner;
--  stream_.reset(new net::FileStream(file_task_runner_));
--  file_path_ = file_path;
--}
--
--void URLRequestAsarJob::Start() {
--  if (type_ == TYPE_ASAR || type_ == TYPE_FILE) {
--    auto* meta_info = new FileMetaInfo();
--    if (type_ == TYPE_ASAR) {
--      meta_info->file_path = archive_->path();
--      meta_info->file_exists = true;
--      meta_info->is_directory = false;
--      meta_info->file_size = file_info_.size;
--    }
--    file_task_runner_->PostTaskAndReply(
--        FROM_HERE,
--        base::BindOnce(&URLRequestAsarJob::FetchMetaInfo, file_path_, type_,
--                       base::Unretained(meta_info)),
--        base::BindOnce(&URLRequestAsarJob::DidFetchMetaInfo,
--                       weak_ptr_factory_.GetWeakPtr(), base::Owned(meta_info)));
--  } else {
--    base::ThreadTaskRunnerHandle::Get()->PostTask(
--        FROM_HERE, base::BindOnce(&URLRequestAsarJob::DidOpen,
--                                  weak_ptr_factory_.GetWeakPtr(),
--                                  net::ERR_FILE_NOT_FOUND));
--  }
--}
--
--void URLRequestAsarJob::Kill() {
--  stream_.reset();
--  weak_ptr_factory_.InvalidateWeakPtrs();
--
--  URLRequestJob::Kill();
--}
--
--int URLRequestAsarJob::ReadRawData(net::IOBuffer* dest, int dest_size) {
--  if (remaining_bytes_ < dest_size)
--    dest_size = static_cast<int>(remaining_bytes_);
--
--  // If we should copy zero bytes because |remaining_bytes_| is zero, short
--  // circuit here.
--  if (!dest_size)
--    return 0;
--
--  int rv = stream_->Read(
--      dest, dest_size,
--      base::Bind(&URLRequestAsarJob::DidRead, weak_ptr_factory_.GetWeakPtr(),
--                 WrapRefCounted(dest)));
--  if (rv >= 0) {
--    remaining_bytes_ -= rv;
--    DCHECK_GE(remaining_bytes_, 0);
--  }
--
--  return rv;
--}
--
--bool URLRequestAsarJob::IsRedirectResponse(GURL* location,
--                                           int* http_status_code) {
--  if (type_ != TYPE_FILE)
--    return false;
--#if defined(OS_WIN)
--  // Follow a Windows shortcut.
--  // We just resolve .lnk file, ignore others.
--  if (!base::LowerCaseEqualsASCII(file_path_.Extension(), ".lnk"))
--    return false;
--
--  base::FilePath new_path = file_path_;
--  bool resolved;
--  resolved = base::win::ResolveShortcut(new_path, &new_path, NULL);
--
--  // If shortcut is not resolved succesfully, do not redirect.
--  if (!resolved)
--    return false;
--
--  *location = net::FilePathToFileURL(new_path);
--  *http_status_code = 301;
--  return true;
--#else
--  return false;
--#endif
--}
--
--std::unique_ptr<net::SourceStream> URLRequestAsarJob::SetUpSourceStream() {
--  std::unique_ptr<net::SourceStream> source =
--      net::URLRequestJob::SetUpSourceStream();
--  // Bug 9936 - .svgz files needs to be decompressed.
--  return base::LowerCaseEqualsASCII(file_path_.Extension(), ".svgz")
--             ? net::GzipSourceStream::Create(std::move(source),
--                                             net::SourceStream::TYPE_GZIP)
--             : std::move(source);
--}
--
--bool URLRequestAsarJob::GetMimeType(std::string* mime_type) const {
--  if (meta_info_.mime_type_result) {
--    *mime_type = meta_info_.mime_type;
--    return true;
--  }
--  return false;
--}
--
--void URLRequestAsarJob::SetExtraRequestHeaders(
--    const net::HttpRequestHeaders& headers) {
--  std::string range_header;
--  if (headers.GetHeader(net::HttpRequestHeaders::kRange, &range_header)) {
--    // This job only cares about the Range header. This method stashes the value
--    // for later use in DidOpen(), which is responsible for some of the range
--    // validation as well. NotifyStartError is not legal to call here since
--    // the job has not started.
--    std::vector<net::HttpByteRange> ranges;
--    if (net::HttpUtil::ParseRangeHeader(range_header, &ranges)) {
--      if (ranges.size() == 1) {
--        byte_range_ = ranges[0];
--      } else {
--        range_parse_result_ = net::ERR_REQUEST_RANGE_NOT_SATISFIABLE;
--      }
--    }
--  }
--}
--
--int URLRequestAsarJob::GetResponseCode() const {
--  // Request Job gets created only if path exists.
--  return 200;
--}
--
--void URLRequestAsarJob::GetResponseInfo(net::HttpResponseInfo* info) {
--  std::string status("HTTP/1.1 200 OK");
--  auto* headers = new net::HttpResponseHeaders(status);
--
--  headers->AddHeader(atom::kCORSHeader);
--  info->headers = headers;
--}
--
--void URLRequestAsarJob::FetchMetaInfo(const base::FilePath& file_path,
--                                      JobType type,
--                                      FileMetaInfo* meta_info) {
--  if (type == TYPE_FILE) {
--    base::File::Info file_info;
--    meta_info->file_exists = base::GetFileInfo(file_path, &file_info);
--    if (meta_info->file_exists) {
--      meta_info->file_path = file_path;
--      meta_info->file_size = file_info.size;
--      meta_info->is_directory = file_info.is_directory;
--    }
--  }
--
--  // We use GetWellKnownMimeTypeFromExtension() to ensure that configurations
--  // that may have been set by other programs on a user's machine don't affect
--  // the mime type returned (in particular, JS should always be
--  // (application/javascript). See https://crbug.com/797712. Using an accurate
--  // mime type is necessary at least for modules and sw, which enforce strict
--  // mime type requirements.
--  // TODO(deepak1556): Revert this when sw support is removed for file scheme.
--  base::FilePath::StringType file_extension = file_path.Extension();
--  if (file_extension.empty()) {
--    meta_info->mime_type_result = false;
--  } else {
--    meta_info->mime_type_result = net::GetWellKnownMimeTypeFromExtension(
--        file_extension.substr(1), &meta_info->mime_type);
--  }
--}
--
--void URLRequestAsarJob::DidFetchMetaInfo(const FileMetaInfo* meta_info) {
--  meta_info_ = *meta_info;
--  if (!meta_info_.file_exists || meta_info_.is_directory) {
--    DidOpen(net::ERR_FILE_NOT_FOUND);
--    return;
--  }
--
--  int flags =
--      base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_ASYNC;
--  int rv = stream_->Open(
--      meta_info_.file_path, flags,
--      base::Bind(&URLRequestAsarJob::DidOpen, weak_ptr_factory_.GetWeakPtr()));
--  if (rv != net::ERR_IO_PENDING)
--    DidOpen(rv);
--}
--
--void URLRequestAsarJob::DidOpen(int result) {
--  if (result != net::OK) {
--    NotifyStartError(
--        net::URLRequestStatus(net::URLRequestStatus::FAILED, result));
--    return;
--  }
--
--  if (range_parse_result_ != net::OK) {
--    NotifyStartError(net::URLRequestStatus(net::URLRequestStatus::FAILED,
--                                           range_parse_result_));
--    return;
--  }
--
--  int64_t file_size, read_offset;
--  if (type_ == TYPE_ASAR) {
--    file_size = file_info_.size;
--    read_offset = file_info_.offset;
--  } else {
--    file_size = meta_info_.file_size;
--    read_offset = 0;
--  }
--
--  if (!byte_range_.ComputeBounds(file_size)) {
--    NotifyStartError(net::URLRequestStatus(
--        net::URLRequestStatus::FAILED, net::ERR_REQUEST_RANGE_NOT_SATISFIABLE));
--    return;
--  }
--
--  remaining_bytes_ =
--      byte_range_.last_byte_position() - byte_range_.first_byte_position() + 1;
--  seek_offset_ = byte_range_.first_byte_position() + read_offset;
--
--  if (remaining_bytes_ > 0 && seek_offset_ != 0) {
--    int rv =
--        stream_->Seek(seek_offset_, base::Bind(&URLRequestAsarJob::DidSeek,
--                                               weak_ptr_factory_.GetWeakPtr()));
--    if (rv != net::ERR_IO_PENDING) {
--      // stream_->Seek() failed, so pass an intentionally erroneous value
--      // into DidSeek().
--      DidSeek(-1);
--    }
--  } else {
--    // We didn't need to call stream_->Seek() at all, so we pass to DidSeek()
--    // the value that would mean seek success. This way we skip the code
--    // handling seek failure.
--    DidSeek(seek_offset_);
--  }
--}
--
--void URLRequestAsarJob::DidSeek(int64_t result) {
--  if (result != seek_offset_) {
--    NotifyStartError(net::URLRequestStatus(
--        net::URLRequestStatus::FAILED, net::ERR_REQUEST_RANGE_NOT_SATISFIABLE));
--    return;
--  }
--  set_expected_content_size(remaining_bytes_);
--  NotifyHeadersComplete();
--}
--
--void URLRequestAsarJob::DidRead(scoped_refptr<net::IOBuffer> buf, int result) {
--  if (result >= 0) {
--    remaining_bytes_ -= result;
--    DCHECK_GE(remaining_bytes_, 0);
--  }
--
--  buf = nullptr;
--
--  ReadRawDataComplete(result);
--}
--
--}  // namespace asar
-removed in remote
-  base   100644 7103abc4139adc7329101f38646fd02afac9ab97 atom/browser/net/asar/url_request_asar_job.h
-  our    100644 fde6302e031d4978bc6aa9419ef1d2d458f95c4a atom/browser/net/asar/url_request_asar_job.h
-@@ -1,135 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_NET_ASAR_URL_REQUEST_ASAR_JOB_H_
--#define ATOM_BROWSER_NET_ASAR_URL_REQUEST_ASAR_JOB_H_
--
--#include <memory>
--#include <string>
--
--#include "atom/browser/net/js_asker.h"
--#include "atom/common/asar/archive.h"
--#include "base/files/file_path.h"
--#include "base/memory/ref_counted.h"
--#include "base/memory/weak_ptr.h"
--#include "net/http/http_byte_range.h"
--#include "net/url_request/url_request_job.h"
--
--namespace base {
--class TaskRunner;
--}
--
--namespace net {
--class FileStream;
--}
--
--namespace asar {
--
--// Createa a request job according to the file path.
--net::URLRequestJob* CreateJobFromPath(
--    const base::FilePath& full_path,
--    net::URLRequest* request,
--    net::NetworkDelegate* network_delegate,
--    const scoped_refptr<base::TaskRunner> file_task_runner);
--
--class URLRequestAsarJob : public net::URLRequestJob {
-- public:
--  URLRequestAsarJob(net::URLRequest* request,
--                    net::NetworkDelegate* network_delegate);
--
--  void Initialize(const scoped_refptr<base::TaskRunner> file_task_runner,
--                  const base::FilePath& file_path);
--
-- protected:
--  ~URLRequestAsarJob() override;
--
--  void InitializeAsarJob(const scoped_refptr<base::TaskRunner> file_task_runner,
--                         std::shared_ptr<Archive> archive,
--                         const base::FilePath& file_path,
--                         const Archive::FileInfo& file_info);
--  void InitializeFileJob(const scoped_refptr<base::TaskRunner> file_task_runner,
--                         const base::FilePath& file_path);
--
--  // net::URLRequestJob:
--  void Start() override;
--  void Kill() override;
--  int ReadRawData(net::IOBuffer* buf, int buf_size) override;
--  bool IsRedirectResponse(GURL* location, int* http_status_code) override;
--  std::unique_ptr<net::SourceStream> SetUpSourceStream() override;
--  bool GetMimeType(std::string* mime_type) const override;
--  void SetExtraRequestHeaders(const net::HttpRequestHeaders& headers) override;
--  int GetResponseCode() const override;
--  void GetResponseInfo(net::HttpResponseInfo* info) override;
--
-- private:
--  // The type of this job.
--  enum JobType {
--    TYPE_ERROR,
--    TYPE_ASAR,
--    TYPE_FILE,
--  };
--
--  // Meta information about the file. It's used as a member in the
--  // URLRequestFileJob and also passed between threads because disk access is
--  // necessary to obtain it.
--  struct FileMetaInfo {
--    // Size of the file.
--    int64_t file_size = 0;
--    // Mime type associated with the file.
--    std::string mime_type;
--    // Result returned from GetMimeTypeFromFile(), i.e. flag showing whether
--    // obtaining of the mime type was successful.
--    bool mime_type_result = false;
--    // Flag showing whether the file exists.
--    bool file_exists = false;
--    // Flag showing whether the file name actually refers to a directory.
--    bool is_directory = false;
--    // Path to the file.
--    base::FilePath file_path;
--
--    FileMetaInfo();
--  };
--
--  // Fetches file info on a background thread.
--  static void FetchMetaInfo(const base::FilePath& file_path,
--                            JobType type,
--                            FileMetaInfo* meta_info);
--
--  // Callback after fetching file info on a background thread.
--  void DidFetchMetaInfo(const FileMetaInfo* meta_info);
--
--  // Callback after opening file on a background thread.
--  void DidOpen(int result);
--
--  // Callback after seeking to the beginning of |byte_range_| in the file
--  // on a background thread.
--  void DidSeek(int64_t result);
--
--  // Callback after data is asynchronously read from the file into |buf|.
--  void DidRead(scoped_refptr<net::IOBuffer> buf, int result);
--
--  JobType type_ = TYPE_ERROR;
--
--  std::shared_ptr<Archive> archive_;
--  base::FilePath file_path_;
--  Archive::FileInfo file_info_;
--
--  std::unique_ptr<net::FileStream> stream_;
--  FileMetaInfo meta_info_;
--  scoped_refptr<base::TaskRunner> file_task_runner_;
--
--  net::HttpByteRange byte_range_;
--  int64_t remaining_bytes_ = 0;
--  int64_t seek_offset_ = 0;
--
--  net::Error range_parse_result_ = net::OK;
--
--  base::WeakPtrFactory<URLRequestAsarJob> weak_ptr_factory_;
--
--  DISALLOW_COPY_AND_ASSIGN(URLRequestAsarJob);
--};
--
--}  // namespace asar
--
--#endif  // ATOM_BROWSER_NET_ASAR_URL_REQUEST_ASAR_JOB_H_
-removed in remote
-  base   100644 3633d805fb5b89707c1924d40ab3d10e2bb6e14e atom/browser/net/atom_cert_verifier.cc
-  our    100644 75437f605c83ad050fc706abbce534f9383ba3a6 atom/browser/net/atom_cert_verifier.cc
-@@ -1,209 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/net/atom_cert_verifier.h"
--
--#include "atom/browser/browser.h"
--#include "atom/common/native_mate_converters/net_converter.h"
--#include "base/containers/linked_list.h"
--#include "base/memory/weak_ptr.h"
--#include "brightray/browser/net/require_ct_delegate.h"
--#include "content/public/browser/browser_thread.h"
--#include "net/base/net_errors.h"
--#include "net/cert/cert_verify_result.h"
--#include "net/cert/crl_set.h"
--#include "net/cert/x509_certificate.h"
--
--using content::BrowserThread;
--
--namespace atom {
--
--VerifyRequestParams::VerifyRequestParams() = default;
--VerifyRequestParams::~VerifyRequestParams() = default;
--VerifyRequestParams::VerifyRequestParams(const VerifyRequestParams&) = default;
--
--namespace {
--
--class Response : public base::LinkNode<Response> {
-- public:
--  Response(net::CertVerifyResult* verify_result,
--           const net::CompletionCallback& callback)
--      : verify_result_(verify_result), callback_(callback) {}
--  net::CertVerifyResult* verify_result() { return verify_result_; }
--  net::CompletionCallback callback() { return callback_; }
--
-- private:
--  net::CertVerifyResult* verify_result_;
--  net::CompletionCallback callback_;
--
--  DISALLOW_COPY_AND_ASSIGN(Response);
--};
--
--}  // namespace
--
--class CertVerifierRequest : public AtomCertVerifier::Request {
-- public:
--  CertVerifierRequest(const AtomCertVerifier::RequestParams& params,
--                      AtomCertVerifier* cert_verifier)
--      : params_(params),
--        cert_verifier_(cert_verifier),
--        weak_ptr_factory_(this) {}
--
--  ~CertVerifierRequest() override {
--    cert_verifier_->RemoveRequest(params_);
--    default_verifier_request_.reset();
--    while (!response_list_.empty() && !first_response_) {
--      base::LinkNode<Response>* response_node = response_list_.head();
--      response_node->RemoveFromList();
--      Response* response = response_node->value();
--      RunResponse(response);
--    }
--    cert_verifier_ = nullptr;
--    weak_ptr_factory_.InvalidateWeakPtrs();
--  }
--
--  void RunResponse(Response* response) {
--    if (custom_response_ == net::ERR_ABORTED) {
--      *(response->verify_result()) = result_;
--      response->callback().Run(error_);
--    } else {
--      response->verify_result()->Reset();
--      response->verify_result()->verified_cert = params_.certificate();
--      cert_verifier_->ct_delegate()->AddCTExcludedHost(params_.hostname());
--      response->callback().Run(custom_response_);
--    }
--    delete response;
--  }
--
--  void Start(net::CRLSet* crl_set, const net::NetLogWithSource& net_log) {
--    int error = cert_verifier_->default_verifier()->Verify(
--        params_, crl_set, &result_,
--        base::Bind(&CertVerifierRequest::OnDefaultVerificationDone,
--                   weak_ptr_factory_.GetWeakPtr()),
--        &default_verifier_request_, net_log);
--    if (error != net::ERR_IO_PENDING)
--      OnDefaultVerificationDone(error);
--  }
--
--  void OnDefaultVerificationDone(int error) {
--    error_ = error;
--    auto request = std::make_unique<VerifyRequestParams>();
--    request->hostname = params_.hostname();
--    request->default_result = net::ErrorToString(error);
--    request->error_code = error;
--    request->certificate = params_.certificate();
--    auto response_callback = base::Bind(&CertVerifierRequest::OnResponseInUI,
--                                        weak_ptr_factory_.GetWeakPtr());
--    BrowserThread::PostTask(
--        BrowserThread::UI, FROM_HERE,
--        base::BindOnce(&CertVerifierRequest::OnVerifyRequestInUI,
--                       cert_verifier_->verify_proc(), std::move(request),
--                       response_callback));
--  }
--
--  static void OnVerifyRequestInUI(
--      const AtomCertVerifier::VerifyProc& verify_proc,
--      std::unique_ptr<VerifyRequestParams> request,
--      const base::Callback<void(int)>& response_callback) {
--    verify_proc.Run(*(request.get()), response_callback);
--  }
--
--  static void OnResponseInUI(base::WeakPtr<CertVerifierRequest> self,
--                             int result) {
--    BrowserThread::PostTask(
--        BrowserThread::IO, FROM_HERE,
--        base::BindOnce(&CertVerifierRequest::NotifyResponseInIO, self, result));
--  }
--
--  void NotifyResponseInIO(int result) {
--    custom_response_ = result;
--    first_response_ = false;
--    // Responding to first request in the list will initiate destruction of
--    // the class, respond to others in the list inside destructor.
--    base::LinkNode<Response>* response_node = response_list_.head();
--    response_node->RemoveFromList();
--    Response* response = response_node->value();
--    RunResponse(response);
--  }
--
--  void AddResponseListener(net::CertVerifyResult* verify_result,
--                           const net::CompletionCallback& callback) {
--    response_list_.Append(new Response(verify_result, callback));
--  }
--
--  const AtomCertVerifier::RequestParams& params() const { return params_; }
--
-- private:
--  using ResponseList = base::LinkedList<Response>;
--
--  const AtomCertVerifier::RequestParams params_;
--  AtomCertVerifier* cert_verifier_;
--  int error_ = net::ERR_IO_PENDING;
--  int custom_response_ = net::ERR_IO_PENDING;
--  bool first_response_ = true;
--  ResponseList response_list_;
--  net::CertVerifyResult result_;
--  std::unique_ptr<AtomCertVerifier::Request> default_verifier_request_;
--  base::WeakPtrFactory<CertVerifierRequest> weak_ptr_factory_;
--};
--
--AtomCertVerifier::AtomCertVerifier(brightray::RequireCTDelegate* ct_delegate)
--    : default_cert_verifier_(net::CertVerifier::CreateDefault()),
--      ct_delegate_(ct_delegate) {}
--
--AtomCertVerifier::~AtomCertVerifier() {}
--
--void AtomCertVerifier::SetVerifyProc(const VerifyProc& proc) {
--  verify_proc_ = proc;
--}
--
--int AtomCertVerifier::Verify(const RequestParams& params,
--                             net::CRLSet* crl_set,
--                             net::CertVerifyResult* verify_result,
--                             const net::CompletionCallback& callback,
--                             std::unique_ptr<Request>* out_req,
--                             const net::NetLogWithSource& net_log) {
--  DCHECK_CURRENTLY_ON(BrowserThread::IO);
--
--  if (verify_proc_.is_null()) {
--    ct_delegate_->ClearCTExcludedHostsList();
--    return default_cert_verifier_->Verify(params, crl_set, verify_result,
--                                          callback, out_req, net_log);
--  } else {
--    CertVerifierRequest* request = FindRequest(params);
--    if (!request) {
--      out_req->reset();
--      auto new_request = std::make_unique<CertVerifierRequest>(params, this);
--      new_request->Start(crl_set, net_log);
--      request = new_request.get();
--      *out_req = std::move(new_request);
--      inflight_requests_[params] = request;
--    }
--    request->AddResponseListener(verify_result, callback);
--
--    return net::ERR_IO_PENDING;
--  }
--}
--
--bool AtomCertVerifier::SupportsOCSPStapling() {
--  if (verify_proc_.is_null())
--    return default_cert_verifier_->SupportsOCSPStapling();
--  return false;
--}
--
--void AtomCertVerifier::RemoveRequest(const RequestParams& params) {
--  auto it = inflight_requests_.find(params);
--  if (it != inflight_requests_.end())
--    inflight_requests_.erase(it);
--}
--
--CertVerifierRequest* AtomCertVerifier::FindRequest(
--    const RequestParams& params) {
--  auto it = inflight_requests_.find(params);
--  if (it != inflight_requests_.end())
--    return it->second;
--  return nullptr;
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 796ae2849bda44743699e9bf03ca830608d16189 atom/browser/net/atom_cert_verifier.h
-  our    100644 458615f3ed43fa8ddb6fb68138a3a1e7d845677e atom/browser/net/atom_cert_verifier.h
-@@ -1,77 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_NET_ATOM_CERT_VERIFIER_H_
--#define ATOM_BROWSER_NET_ATOM_CERT_VERIFIER_H_
--
--#include <map>
--#include <memory>
--#include <string>
--
--#include "net/cert/cert_verifier.h"
--
--namespace brightray {
--
--class RequireCTDelegate;
--
--}  // namespace brightray
--
--namespace atom {
--
--class CertVerifierRequest;
--
--struct VerifyRequestParams {
--  std::string hostname;
--  std::string default_result;
--  int error_code;
--  scoped_refptr<net::X509Certificate> certificate;
--
--  VerifyRequestParams();
--  VerifyRequestParams(const VerifyRequestParams&);
--  ~VerifyRequestParams();
--};
--
--class AtomCertVerifier : public net::CertVerifier {
-- public:
--  explicit AtomCertVerifier(brightray::RequireCTDelegate* ct_delegate);
--  ~AtomCertVerifier() override;
--
--  using VerifyProc = base::Callback<void(const VerifyRequestParams& request,
--                                         const net::CompletionCallback&)>;
--
--  void SetVerifyProc(const VerifyProc& proc);
--
--  const VerifyProc verify_proc() const { return verify_proc_; }
--  brightray::RequireCTDelegate* ct_delegate() const { return ct_delegate_; }
--  net::CertVerifier* default_verifier() const {
--    return default_cert_verifier_.get();
--  }
--
-- protected:
--  // net::CertVerifier:
--  int Verify(const RequestParams& params,
--             net::CRLSet* crl_set,
--             net::CertVerifyResult* verify_result,
--             const net::CompletionCallback& callback,
--             std::unique_ptr<Request>* out_req,
--             const net::NetLogWithSource& net_log) override;
--  bool SupportsOCSPStapling() override;
--
-- private:
--  friend class CertVerifierRequest;
--
--  void RemoveRequest(const RequestParams& params);
--  CertVerifierRequest* FindRequest(const RequestParams& params);
--
--  std::map<RequestParams, CertVerifierRequest*> inflight_requests_;
--  VerifyProc verify_proc_;
--  std::unique_ptr<net::CertVerifier> default_cert_verifier_;
--  brightray::RequireCTDelegate* ct_delegate_;
--
--  DISALLOW_COPY_AND_ASSIGN(AtomCertVerifier);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_NET_ATOM_CERT_VERIFIER_H_
-removed in remote
-  base   100644 91b63fada3598da41a34522561234fcc6ecd23ef atom/browser/net/atom_network_delegate.cc
-  our    100644 e71ea74317b69f31a5aac8e723902748972fed8f atom/browser/net/atom_network_delegate.cc
-@@ -1,553 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/net/atom_network_delegate.h"
--
--#include <utility>
--
--#include "atom/browser/api/atom_api_web_contents.h"
--#include "atom/browser/login_handler.h"
--#include "atom/common/native_mate_converters/net_converter.h"
--#include "atom/common/options_switches.h"
--#include "base/command_line.h"
--#include "base/stl_util.h"
--#include "base/strings/string_util.h"
--#include "content/public/browser/browser_thread.h"
--#include "content/public/browser/render_frame_host.h"
--#include "content/public/browser/resource_request_info.h"
--#include "net/base/load_flags.h"
--#include "net/base/net_errors.h"
--#include "net/url_request/url_request.h"
--#include "services/network/throttling/throttling_network_transaction.h"
--
--using content::BrowserThread;
--using network::ThrottlingNetworkTransaction;
--
--namespace atom {
--
--const char* ResourceTypeToString(content::ResourceType type) {
--  switch (type) {
--    case content::RESOURCE_TYPE_MAIN_FRAME:
--      return "mainFrame";
--    case content::RESOURCE_TYPE_SUB_FRAME:
--      return "subFrame";
--    case content::RESOURCE_TYPE_STYLESHEET:
--      return "stylesheet";
--    case content::RESOURCE_TYPE_SCRIPT:
--      return "script";
--    case content::RESOURCE_TYPE_IMAGE:
--      return "image";
--    case content::RESOURCE_TYPE_OBJECT:
--      return "object";
--    case content::RESOURCE_TYPE_XHR:
--      return "xhr";
--    default:
--      return "other";
--  }
--}
--
--int32_t GetWebContentsID(int process_id, int frame_id) {
--  auto* webContents = content::WebContents::FromRenderFrameHost(
--      content::RenderFrameHost::FromID(process_id, frame_id));
--  return atom::api::WebContents::GetIDFromWrappedClass(webContents);
--}
--
--namespace {
--
--using ResponseHeadersContainer =
--    std::pair<scoped_refptr<net::HttpResponseHeaders>*, const std::string&>;
--
--void RunSimpleListener(const AtomNetworkDelegate::SimpleListener& listener,
--                       std::unique_ptr<base::DictionaryValue> details,
--                       int render_process_id,
--                       int render_frame_id) {
--  int32_t id = GetWebContentsID(render_process_id, render_frame_id);
--  // id must be greater than zero
--  if (id)
--    details->SetInteger("webContentsId", id);
--  return listener.Run(*(details.get()));
--}
--
--void RunResponseListener(
--    const AtomNetworkDelegate::ResponseListener& listener,
--    std::unique_ptr<base::DictionaryValue> details,
--    int render_process_id,
--    int render_frame_id,
--    const AtomNetworkDelegate::ResponseCallback& callback) {
--  int32_t id = GetWebContentsID(render_process_id, render_frame_id);
--  // id must be greater than zero
--  if (id)
--    details->SetInteger("webContentsId", id);
--  return listener.Run(*(details.get()), callback);
--}
--
--// Test whether the URL of |request| matches |patterns|.
--bool MatchesFilterCondition(net::URLRequest* request,
--                            const URLPatterns& patterns) {
--  if (patterns.empty())
--    return true;
--
--  for (const auto& pattern : patterns) {
--    if (pattern.MatchesURL(request->url()))
--      return true;
--  }
--  return false;
--}
--
--// Overloaded by multiple types to fill the |details| object.
--void ToDictionary(base::DictionaryValue* details, net::URLRequest* request) {
--  FillRequestDetails(details, request);
--  details->SetInteger("id", request->identifier());
--  details->SetDouble("timestamp", base::Time::Now().ToDoubleT() * 1000);
--  const auto* info = content::ResourceRequestInfo::ForRequest(request);
--  if (info) {
--    details->SetString("resourceType",
--                       ResourceTypeToString(info->GetResourceType()));
--  } else {
--    details->SetString("resourceType", "other");
--  }
--}
--
--void ToDictionary(base::DictionaryValue* details,
--                  const net::HttpRequestHeaders& headers) {
--  auto dict = std::make_unique<base::DictionaryValue>();
--  net::HttpRequestHeaders::Iterator it(headers);
--  while (it.GetNext())
--    dict->SetKey(it.name(), base::Value(it.value()));
--  details->Set("requestHeaders", std::move(dict));
--}
--
--void ToDictionary(base::DictionaryValue* details,
--                  const net::HttpResponseHeaders* headers) {
--  if (!headers)
--    return;
--
--  auto dict = std::make_unique<base::DictionaryValue>();
--  size_t iter = 0;
--  std::string key;
--  std::string value;
--  while (headers->EnumerateHeaderLines(&iter, &key, &value)) {
--    if (dict->FindKey(key)) {
--      base::ListValue* values = nullptr;
--      if (dict->GetList(key, &values))
--        values->AppendString(value);
--    } else {
--      auto values = std::make_unique<base::ListValue>();
--      values->AppendString(value);
--      dict->Set(key, std::move(values));
--    }
--  }
--  details->Set("responseHeaders", std::move(dict));
--  details->SetString("statusLine", headers->GetStatusLine());
--  details->SetInteger("statusCode", headers->response_code());
--}
--
--void ToDictionary(base::DictionaryValue* details, const GURL& location) {
--  details->SetString("redirectURL", location.spec());
--}
--
--void ToDictionary(base::DictionaryValue* details,
--                  const net::HostPortPair& host_port) {
--  if (host_port.host().empty())
--    details->SetString("ip", host_port.host());
--}
--
--void ToDictionary(base::DictionaryValue* details, bool from_cache) {
--  details->SetBoolean("fromCache", from_cache);
--}
--
--void ToDictionary(base::DictionaryValue* details,
--                  const net::URLRequestStatus& status) {
--  details->SetString("error", net::ErrorToString(status.error()));
--}
--
--// Helper function to fill |details| with arbitrary |args|.
--template <typename Arg>
--void FillDetailsObject(base::DictionaryValue* details, Arg arg) {
--  ToDictionary(details, arg);
--}
--
--template <typename Arg, typename... Args>
--void FillDetailsObject(base::DictionaryValue* details, Arg arg, Args... args) {
--  ToDictionary(details, arg);
--  FillDetailsObject(details, args...);
--}
--
--// Fill the native types with the result from the response object.
--void ReadFromResponseObject(const base::DictionaryValue& response,
--                            GURL* new_location) {
--  std::string url;
--  if (response.GetString("redirectURL", &url))
--    *new_location = GURL(url);
--}
--
--void ReadFromResponseObject(const base::DictionaryValue& response,
--                            net::HttpRequestHeaders* headers) {
--  const base::DictionaryValue* dict;
--  if (response.GetDictionary("requestHeaders", &dict)) {
--    headers->Clear();
--    for (base::DictionaryValue::Iterator it(*dict); !it.IsAtEnd();
--         it.Advance()) {
--      if (it.value().is_string()) {
--        std::string value = it.value().GetString();
--        headers->SetHeader(it.key(), value);
--      }
--    }
--  }
--}
--
--void ReadFromResponseObject(const base::DictionaryValue& response,
--                            const ResponseHeadersContainer& container) {
--  const base::DictionaryValue* dict;
--  std::string status_line;
--  if (!response.GetString("statusLine", &status_line))
--    status_line = container.second;
--  if (response.GetDictionary("responseHeaders", &dict)) {
--    auto* headers = container.first;
--    *headers = new net::HttpResponseHeaders("");
--    (*headers)->ReplaceStatusLine(status_line);
--    for (base::DictionaryValue::Iterator it(*dict); !it.IsAtEnd();
--         it.Advance()) {
--      const base::ListValue* list;
--      if (it.value().GetAsList(&list)) {
--        (*headers)->RemoveHeader(it.key());
--        for (size_t i = 0; i < list->GetSize(); ++i) {
--          std::string value;
--          if (list->GetString(i, &value))
--            (*headers)->AddHeader(it.key() + " : " + value);
--        }
--      }
--    }
--  }
--}
--
--}  // namespace
--
--AtomNetworkDelegate::SimpleListenerInfo::SimpleListenerInfo(
--    URLPatterns patterns_,
--    SimpleListener listener_)
--    : url_patterns(patterns_), listener(listener_) {}
--AtomNetworkDelegate::SimpleListenerInfo::SimpleListenerInfo() = default;
--AtomNetworkDelegate::SimpleListenerInfo::~SimpleListenerInfo() = default;
--
--AtomNetworkDelegate::ResponseListenerInfo::ResponseListenerInfo(
--    URLPatterns patterns_,
--    ResponseListener listener_)
--    : url_patterns(patterns_), listener(listener_) {}
--AtomNetworkDelegate::ResponseListenerInfo::ResponseListenerInfo() = default;
--AtomNetworkDelegate::ResponseListenerInfo::~ResponseListenerInfo() = default;
--
--AtomNetworkDelegate::AtomNetworkDelegate() {
--  auto* command_line = base::CommandLine::ForCurrentProcess();
--  if (command_line->HasSwitch(switches::kIgnoreConnectionsLimit)) {
--    std::string value =
--        command_line->GetSwitchValueASCII(switches::kIgnoreConnectionsLimit);
--    ignore_connections_limit_domains_ = base::SplitString(
--        value, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
--  }
--}
--
--AtomNetworkDelegate::~AtomNetworkDelegate() {}
--
--void AtomNetworkDelegate::SetSimpleListenerInIO(SimpleEvent type,
--                                                URLPatterns patterns,
--                                                SimpleListener callback) {
--  if (callback.is_null())
--    simple_listeners_.erase(type);
--  else
--    simple_listeners_[type] = {std::move(patterns), std::move(callback)};
--}
--
--void AtomNetworkDelegate::SetResponseListenerInIO(ResponseEvent type,
--                                                  URLPatterns patterns,
--                                                  ResponseListener callback) {
--  if (callback.is_null())
--    response_listeners_.erase(type);
--  else
--    response_listeners_[type] = {std::move(patterns), std::move(callback)};
--}
--
--void AtomNetworkDelegate::SetDevToolsNetworkEmulationClientId(
--    const std::string& client_id) {
--  client_id_ = client_id;
--}
--
--int AtomNetworkDelegate::OnBeforeURLRequest(
--    net::URLRequest* request,
--    const net::CompletionCallback& callback,
--    GURL* new_url) {
--  if (!base::ContainsKey(response_listeners_, kOnBeforeRequest)) {
--    for (const auto& domain : ignore_connections_limit_domains_) {
--      if (request->url().DomainIs(domain)) {
--        // Allow unlimited concurrent connections.
--        request->SetPriority(net::MAXIMUM_PRIORITY);
--        request->SetLoadFlags(request->load_flags() | net::LOAD_IGNORE_LIMITS);
--        break;
--      }
--    }
--    return net::OK;
--  }
--
--  return HandleResponseEvent(kOnBeforeRequest, request, callback, new_url);
--}
--
--int AtomNetworkDelegate::OnBeforeStartTransaction(
--    net::URLRequest* request,
--    const net::CompletionCallback& callback,
--    net::HttpRequestHeaders* headers) {
--  if (!client_id_.empty())
--    headers->SetHeader(network::ThrottlingNetworkTransaction::
--                           kDevToolsEmulateNetworkConditionsClientId,
--                       client_id_);
--  if (!base::ContainsKey(response_listeners_, kOnBeforeSendHeaders))
--    return net::OK;
--
--  return HandleResponseEvent(kOnBeforeSendHeaders, request, callback, headers,
--                             *headers);
--}
--
--void AtomNetworkDelegate::OnStartTransaction(
--    net::URLRequest* request,
--    const net::HttpRequestHeaders& headers) {
--  if (!base::ContainsKey(simple_listeners_, kOnSendHeaders))
--    return;
--
--  HandleSimpleEvent(kOnSendHeaders, request, headers);
--}
--
--int AtomNetworkDelegate::OnHeadersReceived(
--    net::URLRequest* request,
--    const net::CompletionCallback& callback,
--    const net::HttpResponseHeaders* original,
--    scoped_refptr<net::HttpResponseHeaders>* override,
--    GURL* allowed) {
--  if (!base::ContainsKey(response_listeners_, kOnHeadersReceived))
--    return net::OK;
--
--  return HandleResponseEvent(
--      kOnHeadersReceived, request, callback,
--      std::make_pair(override, original->GetStatusLine()), original);
--}
--
--void AtomNetworkDelegate::OnBeforeRedirect(net::URLRequest* request,
--                                           const GURL& new_location) {
--  if (!base::ContainsKey(simple_listeners_, kOnBeforeRedirect))
--    return;
--
--  HandleSimpleEvent(kOnBeforeRedirect, request, new_location,
--                    request->response_headers(), request->GetSocketAddress(),
--                    request->was_cached());
--}
--
--void AtomNetworkDelegate::OnResponseStarted(net::URLRequest* request,
--                                            int net_error) {
--  if (!base::ContainsKey(simple_listeners_, kOnResponseStarted))
--    return;
--
--  if (request->status().status() != net::URLRequestStatus::SUCCESS)
--    return;
--
--  HandleSimpleEvent(kOnResponseStarted, request, request->response_headers(),
--                    request->was_cached());
--}
--
--void AtomNetworkDelegate::OnCompleted(net::URLRequest* request, bool started) {
--  // OnCompleted may happen before other events.
--  callbacks_.erase(request->identifier());
--
--  if (request->status().status() == net::URLRequestStatus::FAILED ||
--      request->status().status() == net::URLRequestStatus::CANCELED) {
--    // Error event.
--    OnErrorOccurred(request, started);
--    return;
--  }
--
--  if (request->response_headers() &&
--      net::HttpResponseHeaders::IsRedirectResponseCode(
--          request->response_headers()->response_code())) {
--    // Redirect event.
--    return;
--  }
--
--  if (!base::ContainsKey(simple_listeners_, kOnCompleted))
--    return;
--
--  HandleSimpleEvent(kOnCompleted, request, request->response_headers(),
--                    request->was_cached());
--}
--
--void AtomNetworkDelegate::OnURLRequestDestroyed(net::URLRequest* request) {
--  const auto& it = login_handler_map_.find(request->identifier());
--  if (it != login_handler_map_.end()) {
--    it->second->NotifyRequestDestroyed();
--    it->second = nullptr;
--    login_handler_map_.erase(it);
--  }
--  callbacks_.erase(request->identifier());
--}
--
--net::NetworkDelegate::AuthRequiredResponse AtomNetworkDelegate::OnAuthRequired(
--    net::URLRequest* request,
--    const net::AuthChallengeInfo& auth_info,
--    const AuthCallback& callback,
--    net::AuthCredentials* credentials) {
--  auto* resource_request_info =
--      content::ResourceRequestInfo::ForRequest(request);
--  if (!resource_request_info)
--    return AUTH_REQUIRED_RESPONSE_NO_ACTION;
--  login_handler_map_.emplace(
--      request->identifier(),
--      new LoginHandler(request, auth_info, std::move(callback), credentials,
--                       resource_request_info));
--  return AUTH_REQUIRED_RESPONSE_IO_PENDING;
--}
--
--bool AtomNetworkDelegate::OnCanGetCookies(const net::URLRequest& request,
--                                          const net::CookieList& cookie_list) {
--  return true;
--}
--
--bool AtomNetworkDelegate::OnCanSetCookie(
--    const net::URLRequest& request,
--    const net::CanonicalCookie& cookie_line,
--    net::CookieOptions* options) {
--  return true;
--}
--
--bool AtomNetworkDelegate::OnCanAccessFile(
--    const net::URLRequest& request,
--    const base::FilePath& original_path,
--    const base::FilePath& absolute_path) const {
--  return true;
--}
--
--bool AtomNetworkDelegate::OnCanEnablePrivacyMode(
--    const GURL& url,
--    const GURL& first_party_for_cookies) const {
--  return false;
--}
--
--bool AtomNetworkDelegate::OnAreExperimentalCookieFeaturesEnabled() const {
--  return true;
--}
--
--bool AtomNetworkDelegate::OnCancelURLRequestWithPolicyViolatingReferrerHeader(
--    const net::URLRequest& request,
--    const GURL& target_url,
--    const GURL& referrer_url) const {
--  return false;
--}
--
--// TODO(deepak1556) : Enable after hooking into the reporting service
--// https://crbug.com/704259
--bool AtomNetworkDelegate::OnCanQueueReportingReport(
--    const url::Origin& origin) const {
--  return false;
--}
--
--void AtomNetworkDelegate::OnCanSendReportingReports(
--    std::set<url::Origin> origins,
--    base::OnceCallback<void(std::set<url::Origin>)> result_callback) const {}
--
--bool AtomNetworkDelegate::OnCanSetReportingClient(const url::Origin& origin,
--                                                  const GURL& endpoint) const {
--  return false;
--}
--
--bool AtomNetworkDelegate::OnCanUseReportingClient(const url::Origin& origin,
--                                                  const GURL& endpoint) const {
--  return false;
--}
--
--void AtomNetworkDelegate::OnErrorOccurred(net::URLRequest* request,
--                                          bool started) {
--  if (!base::ContainsKey(simple_listeners_, kOnErrorOccurred))
--    return;
--
--  HandleSimpleEvent(kOnErrorOccurred, request, request->was_cached(),
--                    request->status());
--}
--
--template <typename Out, typename... Args>
--int AtomNetworkDelegate::HandleResponseEvent(
--    ResponseEvent type,
--    net::URLRequest* request,
--    const net::CompletionCallback& callback,
--    Out out,
--    Args... args) {
--  const auto& info = response_listeners_[type];
--  if (!MatchesFilterCondition(request, info.url_patterns))
--    return net::OK;
--
--  auto details = std::make_unique<base::DictionaryValue>();
--  FillDetailsObject(details.get(), request, args...);
--
--  int render_process_id, render_frame_id;
--  content::ResourceRequestInfo::GetRenderFrameForRequest(
--      request, &render_process_id, &render_frame_id);
--
--  // The |request| could be destroyed before the |callback| is called.
--  callbacks_[request->identifier()] = callback;
--
--  ResponseCallback response =
--      base::Bind(&AtomNetworkDelegate::OnListenerResultInUI<Out>,
--                 base::Unretained(this), request->identifier(), out);
--  BrowserThread::PostTask(
--      BrowserThread::UI, FROM_HERE,
--      base::BindOnce(RunResponseListener, info.listener, std::move(details),
--                     render_process_id, render_frame_id, response));
--  return net::ERR_IO_PENDING;
--}
--
--template <typename... Args>
--void AtomNetworkDelegate::HandleSimpleEvent(SimpleEvent type,
--                                            net::URLRequest* request,
--                                            Args... args) {
--  const auto& info = simple_listeners_[type];
--  if (!MatchesFilterCondition(request, info.url_patterns))
--    return;
--
--  auto details = std::make_unique<base::DictionaryValue>();
--  FillDetailsObject(details.get(), request, args...);
--
--  int render_process_id, render_frame_id;
--  content::ResourceRequestInfo::GetRenderFrameForRequest(
--      request, &render_process_id, &render_frame_id);
--
--  BrowserThread::PostTask(
--      BrowserThread::UI, FROM_HERE,
--      base::BindOnce(RunSimpleListener, info.listener, std::move(details),
--                     render_process_id, render_frame_id));
--}
--
--template <typename T>
--void AtomNetworkDelegate::OnListenerResultInIO(
--    uint64_t id,
--    T out,
--    std::unique_ptr<base::DictionaryValue> response) {
--  // The request has been destroyed.
--  if (!base::ContainsKey(callbacks_, id))
--    return;
--
--  ReadFromResponseObject(*response, out);
--
--  bool cancel = false;
--  response->GetBoolean("cancel", &cancel);
--  callbacks_[id].Run(cancel ? net::ERR_BLOCKED_BY_CLIENT : net::OK);
--}
--
--template <typename T>
--void AtomNetworkDelegate::OnListenerResultInUI(
--    uint64_t id,
--    T out,
--    const base::DictionaryValue& response) {
--  auto copy = base::DictionaryValue::From(
--      base::Value::ToUniquePtrValue(response.Clone()));
--  BrowserThread::PostTask(
--      BrowserThread::IO, FROM_HERE,
--      base::BindOnce(&AtomNetworkDelegate::OnListenerResultInIO<T>,
--                     base::Unretained(this), id, out, std::move(copy)));
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 4f55f7c098633215be274003612b4e7ec89d5095 atom/browser/net/atom_network_delegate.h
-  our    100644 39a7a8ddfcda17fd7d022331132b54485d07a279 atom/browser/net/atom_network_delegate.h
-@@ -1,182 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_NET_ATOM_NETWORK_DELEGATE_H_
--#define ATOM_BROWSER_NET_ATOM_NETWORK_DELEGATE_H_
--
--#include <map>
--#include <set>
--#include <string>
--#include <vector>
--
--#include "base/callback.h"
--#include "base/synchronization/lock.h"
--#include "base/values.h"
--#include "content/public/browser/resource_request_info.h"
--#include "extensions/common/url_pattern.h"
--#include "net/base/network_delegate.h"
--#include "net/http/http_request_headers.h"
--#include "net/http/http_response_headers.h"
--
--class URLPattern;
--
--namespace atom {
--
--using URLPatterns = std::set<URLPattern>;
--
--const char* ResourceTypeToString(content::ResourceType type);
--
--class LoginHandler;
--
--class AtomNetworkDelegate : public net::NetworkDelegate {
-- public:
--  using ResponseCallback = base::Callback<void(const base::DictionaryValue&)>;
--  using SimpleListener = base::Callback<void(const base::DictionaryValue&)>;
--  using ResponseListener = base::Callback<void(const base::DictionaryValue&,
--                                               const ResponseCallback&)>;
--
--  enum SimpleEvent {
--    kOnSendHeaders,
--    kOnBeforeRedirect,
--    kOnResponseStarted,
--    kOnCompleted,
--    kOnErrorOccurred,
--  };
--
--  enum ResponseEvent {
--    kOnBeforeRequest,
--    kOnBeforeSendHeaders,
--    kOnHeadersReceived,
--  };
--
--  struct SimpleListenerInfo {
--    URLPatterns url_patterns;
--    SimpleListener listener;
--
--    SimpleListenerInfo(URLPatterns, SimpleListener);
--    SimpleListenerInfo();
--    ~SimpleListenerInfo();
--  };
--
--  struct ResponseListenerInfo {
--    URLPatterns url_patterns;
--    ResponseListener listener;
--
--    ResponseListenerInfo(URLPatterns, ResponseListener);
--    ResponseListenerInfo();
--    ~ResponseListenerInfo();
--  };
--
--  AtomNetworkDelegate();
--  ~AtomNetworkDelegate() override;
--
--  void SetSimpleListenerInIO(SimpleEvent type,
--                             URLPatterns patterns,
--                             SimpleListener callback);
--  void SetResponseListenerInIO(ResponseEvent type,
--                               URLPatterns patterns,
--                               ResponseListener callback);
--
--  void SetDevToolsNetworkEmulationClientId(const std::string& client_id);
--
-- protected:
--  // net::NetworkDelegate:
--  int OnBeforeURLRequest(net::URLRequest* request,
--                         const net::CompletionCallback& callback,
--                         GURL* new_url) override;
--  int OnBeforeStartTransaction(net::URLRequest* request,
--                               const net::CompletionCallback& callback,
--                               net::HttpRequestHeaders* headers) override;
--  void OnBeforeSendHeaders(net::URLRequest* request,
--                           const net::ProxyInfo& proxy_info,
--                           const net::ProxyRetryInfoMap& proxy_retry_info,
--                           net::HttpRequestHeaders* headers) override {}
--  void OnStartTransaction(net::URLRequest* request,
--                          const net::HttpRequestHeaders& headers) override;
--  int OnHeadersReceived(
--      net::URLRequest* request,
--      const net::CompletionCallback& callback,
--      const net::HttpResponseHeaders* original_response_headers,
--      scoped_refptr<net::HttpResponseHeaders>* override_response_headers,
--      GURL* allowed_unsafe_redirect_url) override;
--  void OnBeforeRedirect(net::URLRequest* request,
--                        const GURL& new_location) override;
--  void OnResponseStarted(net::URLRequest* request, int net_error) override;
--  void OnNetworkBytesReceived(net::URLRequest* request,
--                              int64_t bytes_read) override {}
--  void OnNetworkBytesSent(net::URLRequest* request,
--                          int64_t bytes_sent) override {}
--  void OnCompleted(net::URLRequest* request, bool started) override;
--  void OnURLRequestDestroyed(net::URLRequest* request) override;
--  void OnPACScriptError(int line_number, const base::string16& error) override {
--  }
--  AuthRequiredResponse OnAuthRequired(
--      net::URLRequest* request,
--      const net::AuthChallengeInfo& auth_info,
--      const AuthCallback& callback,
--      net::AuthCredentials* credentials) override;
--  bool OnCanGetCookies(const net::URLRequest& request,
--                       const net::CookieList& cookie_list) override;
--  bool OnCanSetCookie(const net::URLRequest& request,
--                      const net::CanonicalCookie& cookie_line,
--                      net::CookieOptions* options) override;
--  bool OnCanAccessFile(const net::URLRequest& request,
--                       const base::FilePath& original_path,
--                       const base::FilePath& absolute_path) const override;
--  bool OnCanEnablePrivacyMode(
--      const GURL& url,
--      const GURL& first_party_for_cookies) const override;
--  bool OnAreExperimentalCookieFeaturesEnabled() const override;
--  bool OnCancelURLRequestWithPolicyViolatingReferrerHeader(
--      const net::URLRequest& request,
--      const GURL& target_url,
--      const GURL& referrer_url) const override;
--  bool OnCanQueueReportingReport(const url::Origin& origin) const override;
--  void OnCanSendReportingReports(std::set<url::Origin> origins,
--                                 base::OnceCallback<void(std::set<url::Origin>)>
--                                     result_callback) const override;
--  bool OnCanSetReportingClient(const url::Origin& origin,
--                               const GURL& endpoint) const override;
--  bool OnCanUseReportingClient(const url::Origin& origin,
--                               const GURL& endpoint) const override;
--
-- private:
--  void OnErrorOccurred(net::URLRequest* request, bool started);
--
--  template <typename... Args>
--  void HandleSimpleEvent(SimpleEvent type,
--                         net::URLRequest* request,
--                         Args... args);
--  template <typename Out, typename... Args>
--  int HandleResponseEvent(ResponseEvent type,
--                          net::URLRequest* request,
--                          const net::CompletionCallback& callback,
--                          Out out,
--                          Args... args);
--
--  // Deal with the results of Listener.
--  template <typename T>
--  void OnListenerResultInIO(uint64_t id,
--                            T out,
--                            std::unique_ptr<base::DictionaryValue> response);
--  template <typename T>
--  void OnListenerResultInUI(uint64_t id,
--                            T out,
--                            const base::DictionaryValue& response);
--
--  std::map<uint64_t, scoped_refptr<LoginHandler>> login_handler_map_;
--  std::map<SimpleEvent, SimpleListenerInfo> simple_listeners_;
--  std::map<ResponseEvent, ResponseListenerInfo> response_listeners_;
--  std::map<uint64_t, net::CompletionCallback> callbacks_;
--  std::vector<std::string> ignore_connections_limit_domains_;
--
--  // Client id for devtools network emulation.
--  std::string client_id_;
--
--  DISALLOW_COPY_AND_ASSIGN(AtomNetworkDelegate);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_NET_ATOM_NETWORK_DELEGATE_H_
-removed in remote
-  base   100644 dbd8b4160cfdde45847cbae66a17641012a2bc21 atom/browser/net/atom_url_request_job_factory.cc
-  our    100644 7047f7a6f7f83e782121f2a849a621fb836ad534 atom/browser/net/atom_url_request_job_factory.cc
-@@ -1,142 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Copyright (c) 2011 The Chromium Authors. All rights reserved.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/net/atom_url_request_job_factory.h"
--
--#include "base/memory/ptr_util.h"
--#include "base/stl_util.h"
--#include "content/public/browser/browser_thread.h"
--#include "net/base/load_flags.h"
--#include "net/url_request/url_request.h"
--
--using content::BrowserThread;
--
--namespace atom {
--
--namespace {
--
--int disable_protocol_intercept_flag_key = 0;
--
--}  // namespace
--
--typedef net::URLRequestJobFactory::ProtocolHandler ProtocolHandler;
--
--const void* DisableProtocolInterceptFlagKey() {
--  return &disable_protocol_intercept_flag_key;
--}
--
--AtomURLRequestJobFactory::AtomURLRequestJobFactory() {}
--
--AtomURLRequestJobFactory::~AtomURLRequestJobFactory() {
--  Clear();
--}
--
--bool AtomURLRequestJobFactory::SetProtocolHandler(
--    const std::string& scheme,
--    std::unique_ptr<ProtocolHandler> protocol_handler) {
--  if (!protocol_handler) {
--    auto it = protocol_handler_map_.find(scheme);
--    if (it == protocol_handler_map_.end())
--      return false;
--
--    delete it->second;
--    protocol_handler_map_.erase(it);
--    return true;
--  }
--
--  if (base::ContainsKey(protocol_handler_map_, scheme))
--    return false;
--  protocol_handler_map_[scheme] = protocol_handler.release();
--  return true;
--}
--
--bool AtomURLRequestJobFactory::InterceptProtocol(
--    const std::string& scheme,
--    std::unique_ptr<ProtocolHandler> protocol_handler) {
--  if (!base::ContainsKey(protocol_handler_map_, scheme) ||
--      base::ContainsKey(original_protocols_, scheme))
--    return false;
--  ProtocolHandler* original_protocol_handler = protocol_handler_map_[scheme];
--  protocol_handler_map_[scheme] = protocol_handler.release();
--  original_protocols_[scheme].reset(original_protocol_handler);
--  return true;
--}
--
--bool AtomURLRequestJobFactory::UninterceptProtocol(const std::string& scheme) {
--  auto it = original_protocols_.find(scheme);
--  if (it == original_protocols_.end())
--    return false;
--  protocol_handler_map_[scheme] = it->second.release();
--  original_protocols_.erase(it);
--  return true;
--}
--
--ProtocolHandler* AtomURLRequestJobFactory::GetProtocolHandler(
--    const std::string& scheme) const {
--  DCHECK_CURRENTLY_ON(BrowserThread::IO);
--
--  auto it = protocol_handler_map_.find(scheme);
--  if (it == protocol_handler_map_.end())
--    return nullptr;
--  return it->second;
--}
--
--bool AtomURLRequestJobFactory::HasProtocolHandler(
--    const std::string& scheme) const {
--  return base::ContainsKey(protocol_handler_map_, scheme);
--}
--
--void AtomURLRequestJobFactory::Clear() {
--  for (auto& it : protocol_handler_map_)
--    delete it.second;
--  protocol_handler_map_.clear();
--  original_protocols_.clear();
--}
--
--net::URLRequestJob* AtomURLRequestJobFactory::MaybeCreateJobWithProtocolHandler(
--    const std::string& scheme,
--    net::URLRequest* request,
--    net::NetworkDelegate* network_delegate) const {
--  DCHECK_CURRENTLY_ON(BrowserThread::IO);
--
--  auto it = protocol_handler_map_.find(scheme);
--  if (it == protocol_handler_map_.end())
--    return nullptr;
--  if (request->GetUserData(DisableProtocolInterceptFlagKey()))
--    return nullptr;
--  return it->second->MaybeCreateJob(request, network_delegate);
--}
--
--net::URLRequestJob* AtomURLRequestJobFactory::MaybeInterceptRedirect(
--    net::URLRequest* request,
--    net::NetworkDelegate* network_delegate,
--    const GURL& location) const {
--  return nullptr;
--}
--
--net::URLRequestJob* AtomURLRequestJobFactory::MaybeInterceptResponse(
--    net::URLRequest* request,
--    net::NetworkDelegate* network_delegate) const {
--  return nullptr;
--}
--
--bool AtomURLRequestJobFactory::IsHandledProtocol(
--    const std::string& scheme) const {
--  DCHECK_CURRENTLY_ON(BrowserThread::IO);
--
--  return HasProtocolHandler(scheme) ||
--         net::URLRequest::IsHandledProtocol(scheme);
--}
--
--bool AtomURLRequestJobFactory::IsSafeRedirectTarget(
--    const GURL& location) const {
--  if (!location.is_valid()) {
--    // We handle error cases.
--    return true;
--  }
--  return IsHandledProtocol(location.scheme());
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 dde36225b7af1a605fd6d135de177479e2da5650 atom/browser/net/atom_url_request_job_factory.h
-  our    100644 c0e26568fdea57dd473f917d597624ab10efe129 atom/browser/net/atom_url_request_job_factory.h
-@@ -1,77 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Copyright (c) 2011 The Chromium Authors. All rights reserved.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_NET_ATOM_URL_REQUEST_JOB_FACTORY_H_
--#define ATOM_BROWSER_NET_ATOM_URL_REQUEST_JOB_FACTORY_H_
--
--#include <map>
--#include <memory>
--#include <string>
--#include <unordered_map>
--#include <vector>
--
--#include "net/url_request/url_request_job_factory.h"
--
--namespace atom {
--
--const void* DisableProtocolInterceptFlagKey();
--
--class AtomURLRequestJobFactory : public net::URLRequestJobFactory {
-- public:
--  AtomURLRequestJobFactory();
--  ~AtomURLRequestJobFactory() override;
--
--  // Sets the ProtocolHandler for a scheme. Returns true on success, false on
--  // failure (a ProtocolHandler already exists for |scheme|). On success,
--  // URLRequestJobFactory takes ownership of |protocol_handler|.
--  bool SetProtocolHandler(const std::string& scheme,
--                          std::unique_ptr<ProtocolHandler> protocol_handler);
--
--  // Intercepts the ProtocolHandler for a scheme.
--  bool InterceptProtocol(const std::string& scheme,
--                         std::unique_ptr<ProtocolHandler> protocol_handler);
--  bool UninterceptProtocol(const std::string& scheme);
--
--  // Returns the protocol handler registered with scheme.
--  ProtocolHandler* GetProtocolHandler(const std::string& scheme) const;
--
--  // Whether the protocol handler is registered by the job factory.
--  bool HasProtocolHandler(const std::string& scheme) const;
--
--  // Clear all protocol handlers.
--  void Clear();
--
--  // URLRequestJobFactory implementation
--  net::URLRequestJob* MaybeCreateJobWithProtocolHandler(
--      const std::string& scheme,
--      net::URLRequest* request,
--      net::NetworkDelegate* network_delegate) const override;
--  net::URLRequestJob* MaybeInterceptRedirect(
--      net::URLRequest* request,
--      net::NetworkDelegate* network_delegate,
--      const GURL& location) const override;
--  net::URLRequestJob* MaybeInterceptResponse(
--      net::URLRequest* request,
--      net::NetworkDelegate* network_delegate) const override;
--  bool IsHandledProtocol(const std::string& scheme) const override;
--  bool IsSafeRedirectTarget(const GURL& location) const override;
--
-- private:
--  using ProtocolHandlerMap = std::map<std::string, ProtocolHandler*>;
--
--  ProtocolHandlerMap protocol_handler_map_;
--
--  // Map that stores the original protocols of schemes.
--  using OriginalProtocolsMap =
--      std::unordered_map<std::string, std::unique_ptr<ProtocolHandler>>;
--  // Can only be accessed in IO thread.
--  OriginalProtocolsMap original_protocols_;
--
--  DISALLOW_COPY_AND_ASSIGN(AtomURLRequestJobFactory);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_NET_ATOM_URL_REQUEST_JOB_FACTORY_H_
-removed in remote
-  base   100644 cf5fc01c0884989b0078113436bcb972ba40b3f3 atom/browser/net/http_protocol_handler.cc
-  our    100644 7c5cc365b74ba31e85fd8aa81a594507a65e2d7a atom/browser/net/http_protocol_handler.cc
-@@ -1,22 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/net/http_protocol_handler.h"
--
--#include "net/url_request/url_request_http_job.h"
--
--namespace atom {
--
--HttpProtocolHandler::HttpProtocolHandler(const std::string& scheme)
--    : scheme_(scheme) {}
--
--HttpProtocolHandler::~HttpProtocolHandler() {}
--
--net::URLRequestJob* HttpProtocolHandler::MaybeCreateJob(
--    net::URLRequest* request,
--    net::NetworkDelegate* network_delegate) const {
--  return net::URLRequestHttpJob::Factory(request, network_delegate, scheme_);
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 98085374175b191fc75278e0bf116a46c6110fdd atom/browser/net/http_protocol_handler.h
-  our    100644 39e1ff2ad29b81ce53191c3dbe629a6cf277b525 atom/browser/net/http_protocol_handler.h
-@@ -1,30 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_NET_HTTP_PROTOCOL_HANDLER_H_
--#define ATOM_BROWSER_NET_HTTP_PROTOCOL_HANDLER_H_
--
--#include <string>
--
--#include "net/url_request/url_request_job_factory.h"
--
--namespace atom {
--
--class HttpProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler {
-- public:
--  explicit HttpProtocolHandler(const std::string&);
--  ~HttpProtocolHandler() override;
--
--  // net::URLRequestJobFactory::ProtocolHandler:
--  net::URLRequestJob* MaybeCreateJob(
--      net::URLRequest* request,
--      net::NetworkDelegate* network_delegate) const override;
--
-- private:
--  std::string scheme_;
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_NET_HTTP_PROTOCOL_HANDLER_H_
-removed in remote
-  base   100644 b11a69c9c13bde5facde0b26db39ff42a1fc1f5c atom/browser/net/js_asker.cc
-  our    100644 59e3ab881c2355c2ed29b806de59ef372c170b62 atom/browser/net/js_asker.cc
-@@ -1,73 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/net/js_asker.h"
--
--#include <vector>
--
--#include "atom/common/native_mate_converters/callback.h"
--#include "atom/common/native_mate_converters/v8_value_converter.h"
--
--namespace atom {
--
--namespace internal {
--
--namespace {
--
--// The callback which is passed to |handler|.
--void HandlerCallback(const BeforeStartCallback& before_start,
--                     const ResponseCallback& callback,
--                     mate::Arguments* args) {
--  // If there is no argument passed then we failed.
--  v8::Local<v8::Value> value;
--  if (!args->GetNext(&value)) {
--    content::BrowserThread::PostTask(content::BrowserThread::IO, FROM_HERE,
--                                     base::BindOnce(callback, false, nullptr));
--    return;
--  }
--
--  // Give the job a chance to parse V8 value.
--  before_start.Run(args->isolate(), value);
--
--  // Pass whatever user passed to the actaul request job.
--  V8ValueConverter converter;
--  v8::Local<v8::Context> context = args->isolate()->GetCurrentContext();
--  std::unique_ptr<base::Value> options(converter.FromV8Value(value, context));
--  content::BrowserThread::PostTask(
--      content::BrowserThread::IO, FROM_HERE,
--      base::BindOnce(callback, true, std::move(options)));
--}
--
--}  // namespace
--
--void AskForOptions(v8::Isolate* isolate,
--                   const JavaScriptHandler& handler,
--                   std::unique_ptr<base::DictionaryValue> request_details,
--                   const BeforeStartCallback& before_start,
--                   const ResponseCallback& callback) {
--  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
--  v8::Locker locker(isolate);
--  v8::HandleScope handle_scope(isolate);
--  v8::Local<v8::Context> context = isolate->GetCurrentContext();
--  v8::Context::Scope context_scope(context);
--  handler.Run(*(request_details.get()),
--              mate::ConvertToV8(isolate, base::Bind(&HandlerCallback,
--                                                    before_start, callback)));
--}
--
--bool IsErrorOptions(base::Value* value, int* error) {
--  if (value->is_dict()) {
--    base::DictionaryValue* dict = static_cast<base::DictionaryValue*>(value);
--    if (dict->GetInteger("error", error))
--      return true;
--  } else if (value->is_int()) {
--    *error = value->GetInt();
--    return true;
--  }
--  return false;
--}
--
--}  // namespace internal
--
--}  // namespace atom
-removed in remote
-  base   100644 8a70794fa946ea11ab783004f7dd3a0df7329df0 atom/browser/net/js_asker.h
-  our    100644 45e2da9b82207215d054ccf0adba0ca935d5f8c0 atom/browser/net/js_asker.h
-@@ -1,124 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_NET_JS_ASKER_H_
--#define ATOM_BROWSER_NET_JS_ASKER_H_
--
--#include "atom/common/native_mate_converters/net_converter.h"
--#include "base/callback.h"
--#include "base/memory/ref_counted.h"
--#include "base/memory/weak_ptr.h"
--#include "base/values.h"
--#include "content/public/browser/browser_thread.h"
--#include "net/base/net_errors.h"
--#include "net/http/http_response_headers.h"
--#include "net/http/http_status_code.h"
--#include "net/url_request/url_request_context_getter.h"
--#include "net/url_request/url_request_job.h"
--#include "v8/include/v8.h"
--
--namespace atom {
--
--using JavaScriptHandler =
--    base::Callback<void(const base::DictionaryValue&, v8::Local<v8::Value>)>;
--
--namespace internal {
--
--using BeforeStartCallback =
--    base::Callback<void(v8::Isolate*, v8::Local<v8::Value>)>;
--using ResponseCallback =
--    base::Callback<void(bool, std::unique_ptr<base::Value> options)>;
--
--// Ask handler for options in UI thread.
--void AskForOptions(v8::Isolate* isolate,
--                   const JavaScriptHandler& handler,
--                   std::unique_ptr<base::DictionaryValue> request_details,
--                   const BeforeStartCallback& before_start,
--                   const ResponseCallback& callback);
--
--// Test whether the |options| means an error.
--bool IsErrorOptions(base::Value* value, int* error);
--
--}  // namespace internal
--
--template <typename RequestJob>
--class JsAsker : public RequestJob {
-- public:
--  JsAsker(net::URLRequest* request, net::NetworkDelegate* network_delegate)
--      : RequestJob(request, network_delegate), weak_factory_(this) {}
--
--  // Called by |CustomProtocolHandler| to store handler related information.
--  void SetHandlerInfo(v8::Isolate* isolate,
--                      net::URLRequestContextGetter* request_context_getter,
--                      const JavaScriptHandler& handler) {
--    isolate_ = isolate;
--    request_context_getter_ = request_context_getter;
--    handler_ = handler;
--  }
--
--  // Subclass should do initailze work here.
--  virtual void BeforeStartInUI(v8::Isolate*, v8::Local<v8::Value>) {}
--  virtual void StartAsync(std::unique_ptr<base::Value> options) = 0;
--
--  net::URLRequestContextGetter* request_context_getter() const {
--    return request_context_getter_;
--  }
--
-- private:
--  // RequestJob:
--  void Start() override {
--    auto request_details = std::make_unique<base::DictionaryValue>();
--    request_start_time_ = base::TimeTicks::Now();
--    FillRequestDetails(request_details.get(), RequestJob::request());
--    content::BrowserThread::PostTask(
--        content::BrowserThread::UI, FROM_HERE,
--        base::BindOnce(
--            &internal::AskForOptions, isolate_, handler_,
--            std::move(request_details),
--            base::Bind(&JsAsker::BeforeStartInUI, weak_factory_.GetWeakPtr()),
--            base::Bind(&JsAsker::OnResponse, weak_factory_.GetWeakPtr())));
--  }
--
--  int GetResponseCode() const override { return net::HTTP_OK; }
--
--  // NOTE: We have to implement this method or risk a crash in blink for
--  // redirects!
--  void GetLoadTimingInfo(net::LoadTimingInfo* load_timing_info) const override {
--    load_timing_info->send_start = request_start_time_;
--    load_timing_info->send_end = request_start_time_;
--    load_timing_info->request_start = request_start_time_;
--    load_timing_info->receive_headers_end = response_start_time_;
--  }
--
--  void GetResponseInfo(net::HttpResponseInfo* info) override {
--    info->headers = new net::HttpResponseHeaders("");
--  }
--
--  // Called when the JS handler has sent the response, we need to decide whether
--  // to start, or fail the job.
--  void OnResponse(bool success, std::unique_ptr<base::Value> value) {
--    response_start_time_ = base::TimeTicks::Now();
--    int error = net::ERR_NOT_IMPLEMENTED;
--    if (success && value && !internal::IsErrorOptions(value.get(), &error)) {
--      StartAsync(std::move(value));
--    } else {
--      RequestJob::NotifyStartError(
--          net::URLRequestStatus(net::URLRequestStatus::FAILED, error));
--    }
--  }
--
--  v8::Isolate* isolate_;
--  net::URLRequestContextGetter* request_context_getter_;
--  JavaScriptHandler handler_;
--  base::TimeTicks request_start_time_;
--  base::TimeTicks response_start_time_;
--
--  base::WeakPtrFactory<JsAsker> weak_factory_;
--
--  DISALLOW_COPY_AND_ASSIGN(JsAsker);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_NET_JS_ASKER_H_
-removed in remote
-  base   100644 3578f3b7971cf157cac6841b8118e1e9cf2a2edd atom/browser/net/url_request_async_asar_job.cc
-  our    100644 1c15fd39b9d479b441b0931564f9e2c3f9de37c7 atom/browser/net/url_request_async_asar_job.cc
-@@ -1,56 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/net/url_request_async_asar_job.h"
--
--#include <string>
--
--#include "atom/common/atom_constants.h"
--#include "base/strings/utf_string_conversions.h"
--#include "base/task_scheduler/post_task.h"
--
--namespace atom {
--
--URLRequestAsyncAsarJob::URLRequestAsyncAsarJob(
--    net::URLRequest* request,
--    net::NetworkDelegate* network_delegate)
--    : JsAsker<asar::URLRequestAsarJob>(request, network_delegate) {}
--
--void URLRequestAsyncAsarJob::StartAsync(std::unique_ptr<base::Value> options) {
--  std::string file_path;
--  if (options->is_dict()) {
--    auto* path_value =
--        options->FindKeyOfType("path", base::Value::Type::STRING);
--    if (path_value)
--      file_path = path_value->GetString();
--  } else if (options->is_string()) {
--    file_path = options->GetString();
--  }
--
--  if (file_path.empty()) {
--    NotifyStartError(net::URLRequestStatus(net::URLRequestStatus::FAILED,
--                                           net::ERR_NOT_IMPLEMENTED));
--  } else {
--    asar::URLRequestAsarJob::Initialize(
--        base::CreateSequencedTaskRunnerWithTraits(
--            {base::MayBlock(), base::TaskPriority::USER_VISIBLE,
--             base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN}),
--#if defined(OS_WIN)
--        base::FilePath(base::UTF8ToWide(file_path)));
--#else
--        base::FilePath(file_path));
--#endif
--    asar::URLRequestAsarJob::Start();
--  }
--}
--
--void URLRequestAsyncAsarJob::GetResponseInfo(net::HttpResponseInfo* info) {
--  std::string status("HTTP/1.1 200 OK");
--  auto* headers = new net::HttpResponseHeaders(status);
--
--  headers->AddHeader(kCORSHeader);
--  info->headers = headers;
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 d65142f0bdbbd690ce52619e15e1a6cac903c2bb atom/browser/net/url_request_async_asar_job.h
-  our    100644 032f3d9924132607edfaeea86fa32d44cb2a7381 atom/browser/net/url_request_async_asar_job.h
-@@ -1,30 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_NET_URL_REQUEST_ASYNC_ASAR_JOB_H_
--#define ATOM_BROWSER_NET_URL_REQUEST_ASYNC_ASAR_JOB_H_
--
--#include "atom/browser/net/asar/url_request_asar_job.h"
--#include "atom/browser/net/js_asker.h"
--
--namespace atom {
--
--// Like URLRequestAsarJob, but asks the JavaScript handler for file path.
--class URLRequestAsyncAsarJob : public JsAsker<asar::URLRequestAsarJob> {
-- public:
--  URLRequestAsyncAsarJob(net::URLRequest*, net::NetworkDelegate*);
--
--  // JsAsker:
--  void StartAsync(std::unique_ptr<base::Value> options) override;
--
--  // URLRequestJob:
--  void GetResponseInfo(net::HttpResponseInfo* info) override;
--
-- private:
--  DISALLOW_COPY_AND_ASSIGN(URLRequestAsyncAsarJob);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_NET_URL_REQUEST_ASYNC_ASAR_JOB_H_
-removed in remote
-  base   100644 aa273bf81693fc597e3e20737359dbb43c27c408 atom/browser/net/url_request_buffer_job.cc
-  our    100644 750099c99a766baaa371de70be9ef772467bd89a atom/browser/net/url_request_buffer_job.cc
-@@ -1,101 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/net/url_request_buffer_job.h"
--
--#include <string>
--
--#include "atom/common/atom_constants.h"
--#include "base/strings/string_number_conversions.h"
--#include "base/strings/utf_string_conversions.h"
--#include "net/base/mime_util.h"
--#include "net/base/net_errors.h"
--
--namespace atom {
--
--namespace {
--
--std::string GetExtFromURL(const GURL& url) {
--  std::string spec = url.spec();
--  size_t index = spec.find_last_of('.');
--  if (index == std::string::npos || index == spec.size())
--    return std::string();
--  return spec.substr(index + 1, spec.size() - index - 1);
--}
--
--}  // namespace
--
--URLRequestBufferJob::URLRequestBufferJob(net::URLRequest* request,
--                                         net::NetworkDelegate* network_delegate)
--    : JsAsker<net::URLRequestSimpleJob>(request, network_delegate),
--      status_code_(net::HTTP_NOT_IMPLEMENTED) {}
--
--URLRequestBufferJob::~URLRequestBufferJob() = default;
--
--void URLRequestBufferJob::StartAsync(std::unique_ptr<base::Value> options) {
--  const base::Value* binary = nullptr;
--  if (options->is_dict()) {
--    base::DictionaryValue* dict =
--        static_cast<base::DictionaryValue*>(options.get());
--    dict->GetString("mimeType", &mime_type_);
--    dict->GetString("charset", &charset_);
--    dict->GetBinary("data", &binary);
--  } else if (options->is_blob()) {
--    binary = options.get();
--  }
--
--  if (mime_type_.empty()) {
--    std::string ext = GetExtFromURL(request()->url());
--#if defined(OS_WIN)
--    net::GetWellKnownMimeTypeFromExtension(base::UTF8ToUTF16(ext), &mime_type_);
--#else
--    net::GetWellKnownMimeTypeFromExtension(ext, &mime_type_);
--#endif
--  }
--
--  if (!binary) {
--    NotifyStartError(net::URLRequestStatus(net::URLRequestStatus::FAILED,
--                                           net::ERR_NOT_IMPLEMENTED));
--    return;
--  }
--
--  data_ = new base::RefCountedBytes(
--      reinterpret_cast<const unsigned char*>(binary->GetBlob().data()),
--      binary->GetBlob().size());
--  status_code_ = net::HTTP_OK;
--  net::URLRequestSimpleJob::Start();
--}
--
--void URLRequestBufferJob::GetResponseInfo(net::HttpResponseInfo* info) {
--  std::string status("HTTP/1.1 200 OK");
--  status.append(base::IntToString(status_code_));
--  status.append(" ");
--  status.append(net::GetHttpReasonPhrase(status_code_));
--  status.append("\0\0", 2);
--  auto* headers = new net::HttpResponseHeaders(status);
--
--  headers->AddHeader(kCORSHeader);
--
--  if (!mime_type_.empty()) {
--    std::string content_type_header(net::HttpRequestHeaders::kContentType);
--    content_type_header.append(": ");
--    content_type_header.append(mime_type_);
--    headers->AddHeader(content_type_header);
--  }
--
--  info->headers = headers;
--}
--
--int URLRequestBufferJob::GetRefCountedData(
--    std::string* mime_type,
--    std::string* charset,
--    scoped_refptr<base::RefCountedMemory>* data,
--    const net::CompletionCallback& callback) const {
--  *mime_type = mime_type_;
--  *charset = charset_;
--  *data = data_;
--  return net::OK;
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 ab8de7e8f030603c4816e2f1882c068b71e1f2c7 atom/browser/net/url_request_buffer_job.h
-  our    100644 a9f72e0b2b28a6a2c98ec5dda1c1e27b2ad02b70 atom/browser/net/url_request_buffer_job.h
-@@ -1,45 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_NET_URL_REQUEST_BUFFER_JOB_H_
--#define ATOM_BROWSER_NET_URL_REQUEST_BUFFER_JOB_H_
--
--#include <string>
--
--#include "atom/browser/net/js_asker.h"
--#include "base/memory/ref_counted_memory.h"
--#include "net/http/http_status_code.h"
--#include "net/url_request/url_request_simple_job.h"
--
--namespace atom {
--
--class URLRequestBufferJob : public JsAsker<net::URLRequestSimpleJob> {
-- public:
--  URLRequestBufferJob(net::URLRequest*, net::NetworkDelegate*);
--  ~URLRequestBufferJob() override;
--
--  // JsAsker:
--  void StartAsync(std::unique_ptr<base::Value> options) override;
--
--  // URLRequestJob:
--  void GetResponseInfo(net::HttpResponseInfo* info) override;
--
--  // URLRequestSimpleJob:
--  int GetRefCountedData(std::string* mime_type,
--                        std::string* charset,
--                        scoped_refptr<base::RefCountedMemory>* data,
--                        const net::CompletionCallback& callback) const override;
--
-- private:
--  std::string mime_type_;
--  std::string charset_;
--  scoped_refptr<base::RefCountedBytes> data_;
--  net::HttpStatusCode status_code_;
--
--  DISALLOW_COPY_AND_ASSIGN(URLRequestBufferJob);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_NET_URL_REQUEST_BUFFER_JOB_H_
-removed in remote
-  base   100644 2f907314cad4248e70075f11bf714efd68790244 atom/browser/net/url_request_fetch_job.cc
-  our    100644 68539433f4de80a96bc672de3a2834b299d6c04b atom/browser/net/url_request_fetch_job.cc
-@@ -1,286 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/net/url_request_fetch_job.h"
--
--#include <algorithm>
--#include <string>
--
--#include "atom/browser/api/atom_api_session.h"
--#include "atom/browser/atom_browser_context.h"
--#include "base/guid.h"
--#include "base/memory/ptr_util.h"
--#include "base/strings/string_util.h"
--#include "native_mate/dictionary.h"
--#include "net/base/io_buffer.h"
--#include "net/base/net_errors.h"
--#include "net/http/http_response_headers.h"
--#include "net/url_request/url_fetcher.h"
--#include "net/url_request/url_fetcher_response_writer.h"
--
--using content::BrowserThread;
--
--namespace atom {
--
--namespace {
--
--// Convert string to RequestType.
--net::URLFetcher::RequestType GetRequestType(const std::string& raw) {
--  std::string method = base::ToUpperASCII(raw);
--  if (method.empty() || method == "GET")
--    return net::URLFetcher::GET;
--  else if (method == "POST")
--    return net::URLFetcher::POST;
--  else if (method == "HEAD")
--    return net::URLFetcher::HEAD;
--  else if (method == "DELETE")
--    return net::URLFetcher::DELETE_REQUEST;
--  else if (method == "PUT")
--    return net::URLFetcher::PUT;
--  else if (method == "PATCH")
--    return net::URLFetcher::PATCH;
--  else  // Use "GET" as fallback.
--    return net::URLFetcher::GET;
--}
--
--// Pipe the response writer back to URLRequestFetchJob.
--class ResponsePiper : public net::URLFetcherResponseWriter {
-- public:
--  explicit ResponsePiper(URLRequestFetchJob* job) : job_(job) {}
--
--  // net::URLFetcherResponseWriter:
--  int Initialize(const net::CompletionCallback& callback) override {
--    return net::OK;
--  }
--  int Write(net::IOBuffer* buffer,
--            int num_bytes,
--            const net::CompletionCallback& callback) override {
--    if (first_write_) {
--      // The URLFetcherResponseWriter doesn't have an event when headers have
--      // been read, so we have to emulate by hooking to first write event.
--      job_->HeadersCompleted();
--      first_write_ = false;
--    }
--    return job_->DataAvailable(buffer, num_bytes, callback);
--  }
--  int Finish(int net_error, const net::CompletionCallback& callback) override {
--    return net::OK;
--  }
--
-- private:
--  bool first_write_ = true;
--  URLRequestFetchJob* job_;
--
--  DISALLOW_COPY_AND_ASSIGN(ResponsePiper);
--};
--
--}  // namespace
--
--URLRequestFetchJob::URLRequestFetchJob(net::URLRequest* request,
--                                       net::NetworkDelegate* network_delegate)
--    : JsAsker<net::URLRequestJob>(request, network_delegate) {}
--
--URLRequestFetchJob::~URLRequestFetchJob() = default;
--
--void URLRequestFetchJob::BeforeStartInUI(v8::Isolate* isolate,
--                                         v8::Local<v8::Value> value) {
--  mate::Dictionary options;
--  if (!mate::ConvertFromV8(isolate, value, &options))
--    return;
--
--  // When |session| is set to |null| we use a new request context for fetch job.
--  v8::Local<v8::Value> val;
--  if (options.Get("session", &val)) {
--    if (val->IsNull()) {
--      // We have to create the URLRequestContextGetter on UI thread.
--      custom_browser_context_ =
--          AtomBrowserContext::From(base::GenerateGUID(), true);
--      url_request_context_getter_ =
--          custom_browser_context_->GetRequestContext();
--    } else {
--      mate::Handle<api::Session> session;
--      if (mate::ConvertFromV8(isolate, val, &session) && !session.IsEmpty()) {
--        AtomBrowserContext* browser_context = session->browser_context();
--        url_request_context_getter_ = browser_context->GetRequestContext();
--      }
--    }
--  }
--}
--
--void URLRequestFetchJob::StartAsync(std::unique_ptr<base::Value> options) {
--  if (!options->is_dict()) {
--    NotifyStartError(net::URLRequestStatus(net::URLRequestStatus::FAILED,
--                                           net::ERR_NOT_IMPLEMENTED));
--    return;
--  }
--
--  std::string url, method, referrer;
--  base::DictionaryValue* upload_data = nullptr;
--  base::DictionaryValue* dict =
--      static_cast<base::DictionaryValue*>(options.get());
--  dict->GetString("url", &url);
--  dict->GetString("method", &method);
--  dict->GetString("referrer", &referrer);
--  dict->GetDictionary("uploadData", &upload_data);
--
--  // Check if URL is valid.
--  GURL formated_url(url);
--  if (!formated_url.is_valid()) {
--    NotifyStartError(net::URLRequestStatus(net::URLRequestStatus::FAILED,
--                                           net::ERR_INVALID_URL));
--    return;
--  }
--
--  // Use |request|'s method if |method| is not specified.
--  net::URLFetcher::RequestType request_type;
--  if (method.empty())
--    request_type = GetRequestType(request()->method());
--  else
--    request_type = GetRequestType(method);
--
--  fetcher_ = net::URLFetcher::Create(formated_url, request_type, this);
--  fetcher_->SaveResponseWithWriter(base::WrapUnique(new ResponsePiper(this)));
--
--  // A request context getter is passed by the user.
--  if (url_request_context_getter_)
--    fetcher_->SetRequestContext(url_request_context_getter_.get());
--  else
--    fetcher_->SetRequestContext(request_context_getter());
--
--  // Use |request|'s referrer if |referrer| is not specified.
--  if (referrer.empty())
--    fetcher_->SetReferrer(request()->referrer());
--  else
--    fetcher_->SetReferrer(referrer);
--
--  // Set the data needed for POSTs.
--  if (upload_data && request_type == net::URLFetcher::POST) {
--    std::string content_type, data;
--    upload_data->GetString("contentType", &content_type);
--    upload_data->GetString("data", &data);
--    fetcher_->SetUploadData(content_type, data);
--  }
--
--  // Use |request|'s headers.
--  fetcher_->SetExtraRequestHeaders(
--      request()->extra_request_headers().ToString());
--
--  fetcher_->Start();
--}
--
--void URLRequestFetchJob::HeadersCompleted() {
--  response_info_.reset(new net::HttpResponseInfo);
--  response_info_->headers = fetcher_->GetResponseHeaders();
--  NotifyHeadersComplete();
--}
--
--int URLRequestFetchJob::DataAvailable(net::IOBuffer* buffer,
--                                      int num_bytes,
--                                      const net::CompletionCallback& callback) {
--  // When pending_buffer_ is empty, there's no ReadRawData() operation waiting
--  // for IO completion, we have to save the parameters until the request is
--  // ready to read data.
--  if (!pending_buffer_.get()) {
--    write_buffer_ = buffer;
--    write_num_bytes_ = num_bytes;
--    write_callback_ = callback;
--    return net::ERR_IO_PENDING;
--  }
--
--  // Write data to the pending buffer and clear them after the writing.
--  int bytes_read = BufferCopy(buffer, num_bytes, pending_buffer_.get(),
--                              pending_buffer_size_);
--  ClearPendingBuffer();
--  ReadRawDataComplete(bytes_read);
--  return bytes_read;
--}
--
--void URLRequestFetchJob::Kill() {
--  JsAsker<URLRequestJob>::Kill();
--  fetcher_.reset();
--}
--
--int URLRequestFetchJob::ReadRawData(net::IOBuffer* dest, int dest_size) {
--  if (GetResponseCode() == 204) {
--    request()->set_received_response_content_length(prefilter_bytes_read());
--    return net::OK;
--  }
--
--  // When write_buffer_ is empty, there is no data valable yet, we have to save
--  // the dest buffer util DataAvailable.
--  if (!write_buffer_.get()) {
--    pending_buffer_ = dest;
--    pending_buffer_size_ = dest_size;
--    return net::ERR_IO_PENDING;
--  }
--
--  // Read from the write buffer and clear them after reading.
--  int bytes_read =
--      BufferCopy(write_buffer_.get(), write_num_bytes_, dest, dest_size);
--  net::CompletionCallback write_callback = write_callback_;
--  ClearWriteBuffer();
--  write_callback.Run(bytes_read);
--  return bytes_read;
--}
--
--bool URLRequestFetchJob::GetMimeType(std::string* mime_type) const {
--  if (!response_info_ || !response_info_->headers)
--    return false;
--
--  return response_info_->headers->GetMimeType(mime_type);
--}
--
--void URLRequestFetchJob::GetResponseInfo(net::HttpResponseInfo* info) {
--  if (response_info_)
--    *info = *response_info_;
--}
--
--int URLRequestFetchJob::GetResponseCode() const {
--  if (!response_info_ || !response_info_->headers)
--    return -1;
--
--  return response_info_->headers->response_code();
--}
--
--void URLRequestFetchJob::OnURLFetchComplete(const net::URLFetcher* source) {
--  ClearPendingBuffer();
--  ClearWriteBuffer();
--
--  if (fetcher_->GetStatus().is_success()) {
--    if (!response_info_) {
--      // Since we notify header completion only after first write there will be
--      // no response object constructed for http respones with no content 204.
--      // We notify header completion here.
--      HeadersCompleted();
--      return;
--    }
--    if (request_->status().is_io_pending()) {
--      ReadRawDataComplete(0);
--    }
--  } else {
--    NotifyStartError(fetcher_->GetStatus());
--  }
--}
--
--int URLRequestFetchJob::BufferCopy(net::IOBuffer* source,
--                                   int num_bytes,
--                                   net::IOBuffer* target,
--                                   int target_size) {
--  int bytes_written = std::min(num_bytes, target_size);
--  memcpy(target->data(), source->data(), bytes_written);
--  return bytes_written;
--}
--
--void URLRequestFetchJob::ClearPendingBuffer() {
--  pending_buffer_ = nullptr;
--  pending_buffer_size_ = 0;
--}
--
--void URLRequestFetchJob::ClearWriteBuffer() {
--  write_buffer_ = nullptr;
--  write_num_bytes_ = 0;
--  write_callback_.Reset();
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 69067fdc7fd317f0673a39252ee4743ba01d0d33 atom/browser/net/url_request_fetch_job.h
-  our    100644 c38be1cbf86c72ac427b136cd5ebcb7fc0256d21 atom/browser/net/url_request_fetch_job.h
-@@ -1,74 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_NET_URL_REQUEST_FETCH_JOB_H_
--#define ATOM_BROWSER_NET_URL_REQUEST_FETCH_JOB_H_
--
--#include <string>
--
--#include "atom/browser/net/js_asker.h"
--#include "content/browser/streams/stream.h"
--#include "content/browser/streams/stream_read_observer.h"
--#include "net/url_request/url_fetcher_delegate.h"
--#include "net/url_request/url_request_context_getter.h"
--
--namespace atom {
--
--class AtomBrowserContext;
--
--class URLRequestFetchJob : public JsAsker<net::URLRequestJob>,
--                           public net::URLFetcherDelegate {
-- public:
--  URLRequestFetchJob(net::URLRequest*, net::NetworkDelegate*);
--  ~URLRequestFetchJob() override;
--
--  // Called by response writer.
--  void HeadersCompleted();
--  int DataAvailable(net::IOBuffer* buffer,
--                    int num_bytes,
--                    const net::CompletionCallback& callback);
--
-- protected:
--  // JsAsker:
--  void BeforeStartInUI(v8::Isolate*, v8::Local<v8::Value>) override;
--  void StartAsync(std::unique_ptr<base::Value> options) override;
--
--  // net::URLRequestJob:
--  void Kill() override;
--  int ReadRawData(net::IOBuffer* buf, int buf_size) override;
--  bool GetMimeType(std::string* mime_type) const override;
--  void GetResponseInfo(net::HttpResponseInfo* info) override;
--  int GetResponseCode() const override;
--
--  // net::URLFetcherDelegate:
--  void OnURLFetchComplete(const net::URLFetcher* source) override;
--
-- private:
--  int BufferCopy(net::IOBuffer* source,
--                 int num_bytes,
--                 net::IOBuffer* target,
--                 int target_size);
--  void ClearPendingBuffer();
--  void ClearWriteBuffer();
--
--  scoped_refptr<AtomBrowserContext> custom_browser_context_;
--  scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_;
--  std::unique_ptr<net::URLFetcher> fetcher_;
--  std::unique_ptr<net::HttpResponseInfo> response_info_;
--
--  // Saved arguments passed to ReadRawData.
--  scoped_refptr<net::IOBuffer> pending_buffer_;
--  int pending_buffer_size_ = 0;
--
--  // Saved arguments passed to DataAvailable.
--  scoped_refptr<net::IOBuffer> write_buffer_;
--  int write_num_bytes_ = 0;
--  net::CompletionCallback write_callback_;
--
--  DISALLOW_COPY_AND_ASSIGN(URLRequestFetchJob);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_NET_URL_REQUEST_FETCH_JOB_H_
-removed in remote
-  base   100644 606781142da054d751767861b1c2ed0f932bcbc8 atom/browser/net/url_request_string_job.cc
-  our    100644 31381ff118665f10a53e13fbe0044046738ca230 atom/browser/net/url_request_string_job.cc
-@@ -1,60 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/net/url_request_string_job.h"
--
--#include <string>
--
--#include "atom/common/atom_constants.h"
--#include "net/base/net_errors.h"
--
--namespace atom {
--
--URLRequestStringJob::URLRequestStringJob(net::URLRequest* request,
--                                         net::NetworkDelegate* network_delegate)
--    : JsAsker<net::URLRequestSimpleJob>(request, network_delegate) {}
--
--URLRequestStringJob::~URLRequestStringJob() = default;
--
--void URLRequestStringJob::StartAsync(std::unique_ptr<base::Value> options) {
--  if (options->is_dict()) {
--    base::DictionaryValue* dict =
--        static_cast<base::DictionaryValue*>(options.get());
--    dict->GetString("mimeType", &mime_type_);
--    dict->GetString("charset", &charset_);
--    dict->GetString("data", &data_);
--  } else if (options->is_string()) {
--    data_ = options->GetString();
--  }
--  net::URLRequestSimpleJob::Start();
--}
--
--void URLRequestStringJob::GetResponseInfo(net::HttpResponseInfo* info) {
--  std::string status("HTTP/1.1 200 OK");
--  auto* headers = new net::HttpResponseHeaders(status);
--
--  headers->AddHeader(kCORSHeader);
--
--  if (!mime_type_.empty()) {
--    std::string content_type_header(net::HttpRequestHeaders::kContentType);
--    content_type_header.append(": ");
--    content_type_header.append(mime_type_);
--    headers->AddHeader(content_type_header);
--  }
--
--  info->headers = headers;
--}
--
--int URLRequestStringJob::GetData(
--    std::string* mime_type,
--    std::string* charset,
--    std::string* data,
--    const net::CompletionCallback& callback) const {
--  *mime_type = mime_type_;
--  *charset = charset_;
--  *data = data_;
--  return net::OK;
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 e40f0d93dab7900b592f62e62689ce394eda9894 atom/browser/net/url_request_string_job.h
-  our    100644 841deb254d8feead5a0e61b92042d6e3d0629f1d atom/browser/net/url_request_string_job.h
-@@ -1,42 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_NET_URL_REQUEST_STRING_JOB_H_
--#define ATOM_BROWSER_NET_URL_REQUEST_STRING_JOB_H_
--
--#include <string>
--
--#include "atom/browser/net/js_asker.h"
--#include "net/url_request/url_request_simple_job.h"
--
--namespace atom {
--
--class URLRequestStringJob : public JsAsker<net::URLRequestSimpleJob> {
-- public:
--  URLRequestStringJob(net::URLRequest*, net::NetworkDelegate*);
--  ~URLRequestStringJob() override;
--
--  // JsAsker:
--  void StartAsync(std::unique_ptr<base::Value> options) override;
--
--  // URLRequestJob:
--  void GetResponseInfo(net::HttpResponseInfo* info) override;
--
--  // URLRequestSimpleJob:
--  int GetData(std::string* mime_type,
--              std::string* charset,
--              std::string* data,
--              const net::CompletionCallback& callback) const override;
--
-- private:
--  std::string mime_type_;
--  std::string charset_;
--  std::string data_;
--
--  DISALLOW_COPY_AND_ASSIGN(URLRequestStringJob);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_NET_URL_REQUEST_STRING_JOB_H_
-removed in remote
-  base   100644 50aa454fe75768c8357c4c4cbc89f240fb73fd01 atom/browser/node_debugger.cc
-  our    100644 56e68e2b8b817aae2786775e3977977474420cc2 atom/browser/node_debugger.cc
-@@ -1,46 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/node_debugger.h"
--
--#include "base/command_line.h"
--#include "base/strings/utf_string_conversions.h"
--#include "libplatform/libplatform.h"
--#include "native_mate/dictionary.h"
--
--#include "atom/common/node_includes.h"
--
--namespace atom {
--
--NodeDebugger::NodeDebugger(node::Environment* env) : env_(env) {}
--
--NodeDebugger::~NodeDebugger() {}
--
--void NodeDebugger::Start(node::MultiIsolatePlatform* platform) {
--  auto* inspector = env_->inspector_agent();
--  if (inspector == nullptr)
--    return;
--
--  node::DebugOptions options;
--  for (auto& arg : base::CommandLine::ForCurrentProcess()->argv()) {
--#if defined(OS_WIN)
--    options.ParseOption("Electron", base::UTF16ToUTF8(arg));
--#else
--    options.ParseOption("Electron", arg);
--#endif
--  }
--
--  // Set process._debugWaitConnect if --inspect-brk was specified to stop
--  // the debugger on the first line
--  if (options.wait_for_connect()) {
--    mate::Dictionary process(env_->isolate(), env_->process_object());
--    process.Set("_breakFirstLine", true);
--  }
--
--  inspector->Start(static_cast<node::NodePlatform*>(platform), nullptr,
--                   options);
--  DCHECK(env_->inspector_agent()->IsStarted());
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 aedf7b2c031060baedb688cbc9e59099e67f1ca7 atom/browser/node_debugger.h
-  our    100644 06b64584e9a056e7033ca21d4b87b4e9cc980bc5 atom/browser/node_debugger.h
-@@ -1,33 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_NODE_DEBUGGER_H_
--#define ATOM_BROWSER_NODE_DEBUGGER_H_
--
--#include "base/macros.h"
--
--namespace node {
--class Environment;
--class MultiIsolatePlatform;
--}  // namespace node
--
--namespace atom {
--
--// Add support for node's "--inspect" switch.
--class NodeDebugger {
-- public:
--  explicit NodeDebugger(node::Environment* env);
--  ~NodeDebugger();
--
--  void Start(node::MultiIsolatePlatform* platform);
--
-- private:
--  node::Environment* env_;
--
--  DISALLOW_COPY_AND_ASSIGN(NodeDebugger);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_NODE_DEBUGGER_H_
-removed in remote
-  base   100644 f7bd068e8f415fea18d66360dc1796fd74770956 atom/browser/resources/mac/Info.plist
-  our    100644 9094f0f7335edf833d51f688851e6a105de60433 atom/browser/resources/mac/Info.plist
-@@ -1,36 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
--<plist version="1.0">
--<dict>
--  <key>CFBundleDisplayName</key>
--  <string>${PRODUCT_NAME}</string>
--  <key>CFBundleExecutable</key>
--  <string>${PRODUCT_NAME}</string>
--  <key>CFBundleIdentifier</key>
--  <string>${ATOM_BUNDLE_ID}</string>
--  <key>CFBundleInfoDictionaryVersion</key>
--  <string>6.0</string>
--  <key>CFBundleName</key>
--  <string>${PRODUCT_NAME}</string>
--  <key>CFBundlePackageType</key>
--  <string>APPL</string>
--  <key>CFBundleIconFile</key>
--  <string>electron.icns</string>
--  <key>CFBundleVersion</key>
--  <string>4.0.0</string>
--  <key>CFBundleShortVersionString</key>
--  <string>4.0.0</string>
--  <key>LSApplicationCategoryType</key>
--  <string>public.app-category.developer-tools</string>
--  <key>LSMinimumSystemVersion</key>
--  <string>10.9.0</string>
--  <key>NSMainNibFile</key>
--  <string>MainMenu</string>
--  <key>NSPrincipalClass</key>
--  <string>AtomApplication</string>
--  <key>NSSupportsAutomaticGraphicsSwitching</key>
--  <true/>
--  <key>NSHighResolutionCapable</key>
--  <true/>
--</dict>
--</plist>
-removed in remote
-  base   100644 aa09177554651fb38078881c4dd73f7d1d17ae7f atom/browser/resources/win/atom.ico
-  our    100644 c080e4b377a6ce8aa090c8d60728f65e765718f6 atom/browser/resources/win/atom.ico
-@@ -1,77 +0,0 @@
---</-|;.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�;.,�</-|M33
---;/,�:.,�:.,�:.,�:.,�:.,�UJC�pfY�F;6�:.,�:.,�:.,�:.,�:.,�ż�����>2/�:.,�:.,�:.,�:.,�:.,�=1/�i_T���z������ұ�������������å�����THB�XMF�laU�?30�:.,�:.,�:.,�:.,�:.,�;/,�M33
---;/,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,���~�����rg[�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�;/,�M33
---</-|;.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�:.,�;.,�</-|M33
---
---
--*�W,,(D�y
--�$���#=�J�z�z���AQE}�bC#�J��ٕ��3�S�+UJ�72��dd���H�W�����ic�U �f �
�0�4�k[�ܔԾ�im�RR�2R��2�L��R+2=�g���e���M���M���u����}C+��gN~�g��l���;,9-���;\�R�G�%$�H�}_/9:�"'3]+]Ն��YWuL�p�hacy������gMR���(�c�j��yGÜ��i���"#k��DWR�A�d�r��g�\-Ԣr��N�7���D?����dR���;q�v����qi�	�&��5�����Q\�F�,��5|-��;���1iR��^E����t8A��7n4�L��L���PG,Sz���%�SC�7�ժ�ajS�{Ӵi�|�I���-�^nj�b����}�M���:�{��jY�J^M�f��\�z����Ju��-j6kvʺv݉[�~��r
�
	�
��fxow�	������ޙ))zjA�
S+�š͛]r��<��sRGŖ�b(P�U���Z3*4bO�O:�#<��@V8J�բ�M'�>�S�i�J���2-*�B�PTn;��׮:
�>����^3P�Z��@���qn-[���9���㛦r�-<u�2M���-�‰���Lسh���
--1]��6���;w:7#�N���U�U����W#'�2r�N~��m�i
JOI-�@��027/j֯�@1n��
�Q��3����~�~(a�䄖�ف̭Գk�����2R��ʦ��Ӂ&������� ����:�Kw>ҝ����˯��2�UC�W�@+������=�$�M裼W�a�y� �~��T�G��?p�H�T��¬xP�:�~�f����C? -�6�5*�3�ܜ\��%Z�9�B��eik��n��J�&�-�H���#����S�K���N�}z�u���p-�S-7|9e"����0� 篸�fg+T#��u���k��
--룉p������M�xM{-�\�"�����oc1�!�񍛌e���l�uȵic�<4�
��C����+A����<��#S���{5����P�^=���(���n�l����^��R���m[�Y�|��70@ ��{�JK�{��������o�|�*ʧ�4�7��Z������߿�C*�^r�-�r .:��څ�T�-1g�����dCi]� -*�6V�s�*�ՐsmT��+�k;l`�����2���F����"TX��M�0[*OUNV��]��6�K�^��D8('3K.
Ċ�� �ldhd�%��r�aiQ����]�W���������|���
9O�c����O�U���UP��uQu�:~��EvU�Uf�z���iv��"��o��:6
--�FD��D�X�*��tcS�}�2������Q�ҡ)6a6i�"dfi)-�.��æ�bPl8`�އG�ȷoћW�� u1������9�|��Q��9*����(�-�4�+VBM;�Gm{�@n-�᯸|g��(��
���2RSѵ��������	V�q�S�`�a���Vf�/�?���qc�Z�	�<�m�G�
<��|	2��I
�p��
��W~��/�M�>��D0f`����(
�k^g-���5��
OoM4Y}��@c��]����
L�]7B
Z�@����[��3�޳�"`-��Y����[B:�1o���H�y��`����.���(��i�-�.
bCލ�nދ�W_����7��ԗ&�z��o+��4�V~�_��ڤ�ǬFݿT�I@�S�ZX[���E��C._��/�� ��
--�a����ɭ[����:X����?������70�k[�{��p�ʵ��,Fϟ��j�v��(6*ec�\99�v�s��/���
ldb��ML�!�(3��`<�~KMI\;y��I�xܚ{`C�$*�&j:�Hx��#=�.���x	%or�۠�%-�1�ķ�V�ͱg���hƚU�*N1�?�_�P�3��B�Jv��9҃兽SU䀏
--��
82��cC|�-��u��S}1�B7��Q2�I�yʴ)9>^b���c��O�KP汏y�ծ�~;t��}���}6�H,�b���������`kDL!+#�,����f�"��Z-Z�ٳ�
�Dq�-�;����D�+�H�𜦣GΙE�
o�4�<��j(�C�C+�!VBWaa
z��}ܿ�4���nNI�������h����I16D�AZR�]�^R�lY-�v���~����D��Z)�6��D�ؔ�߳ �\���x-�V�z�^'�L�f���ś/&�C^'����0�*�ڍ����s$�|���58%�/�l-���;��t�B{,)�fc�+:9c-����p��!�б-�J�U_��Xz�4�-1Q�� ������+;c�ګ�b��2R����#�/�Xy}y�Č,#�b��4��k�}J�~t�[�KG�˱�H���)8�drƶ�H!@`"���3�9X��#�\�8�X;�uޅ�qK��-G.�'K�	+7������/l���_����׾_o"����/ъ�SѺ��i�����C�(�j�s��%�1�$�-
#i��r���F#�s�V�	HOL���M<�$�q����Š+�eZA%��{b�N��Mm�̶n��N0X����Ez�}D)Z�@x�1'�7%��X$�ovF�V(��1�f��}��Y�h/��L�:�Y��2���'R3-�j�$Es��X�Ǯ2?+5�>�
��ׯ�W�^��e�=�7 �	K�MO'˵��-����ɝ�ъ)?`<��$<���g`�U�;+[����6"��`ǣb	\�=�K��T�t�-���g-����<%E:�B!�1Ȋ
��e�o��c�}��#�$�$�"�g~E��ƒ�ѢQc���%��(&��VX3��-��R�,����D�
�$��ϐ�E��-Ἔ<1�D�1
a����H�I'��h���Ƞ�!)�K�v��Go,�*�Y�D�9Rӆ���M��{�b�X"َAV��0�Y�]�+(��
�e�l��hj�s6x��(�(���G��B��0c15m�_�,�P\�n�b-o�� �i�(2$�TB����Cݱ�C���#Y��aa�,v%{#�L3-�޲e�dv<��۾��2�r������=���oG$��?Wг���ib�d�N�v����5�$�����CS�0�a	����[�߈o�4E&��X^�Ń���+�Ѽ]�x6)��u����}*�Bfz���CJ*�q��-
uh00d7Y-
*UR~gI����L�/��+oְ-��(]��f���'�,9�Շ�X��E�ZZ��=������&�.�U�I~��-z���&��+����F���l
2�
.ɗ��
�~
--b�������!���O#%��W���*���oXfRd���
.+aQ��?��c�zr%<���11�X`�GS�h 0t�D��H�J��U�c�7{׬����k�#l�ц��Q��}L0H.������u��䈬ll�&g6JN�G!~�������d�\=�ƹ#f\�
e�2	&K��s���
t���=8�$����=w��N$�mފ�0K�}|���<��V�¤%����J�s|�X���
�&�=��L�!�����}N`�-�1�����Z�u�b#"͗��`�f�?��X��\�WN�@�!�7���1�\0�{����}�_Zv�-C �Yx645+r��|ȓ�g�)�H5�S-}HCgfi)�(]{�Z�e#jקvp�/�#���
���&M�k�# e����S��c ��������'�1-ua?�q�V������;x��R��#��]�:0�����T�b��S�נ�!r�������w�hI�x��_A��*�$�]�egd�<��w���P��=?�KA�>��ϓ��}̨��h���?�qEbsdvXRP�
-C##T�~}	3-p���0�_%�'�e���K2he㹸Ǩ�
B�zt�fu����Xm���J��eq�(���3�� ��PҒ�QXp�D�ǩVM��a��U��**��4S��vGZx���ή�T��-MŻ�?;��9�l� �Ce,
��l4��&�f��P�AY���
����`
--�����\5N/`��ѡ����'���r�4�Ũ��[�.ߴ�K�V�!�0�)��~r�@|Vj*�KR�A��'씓��O�/W���VN�Q2��Mc{�P�	�;
�i�a�����j"��h���U���E�EE�5�wa(3���w2���:X�)L�L�RNelɧ�ıK
WW�4��l	��ʖYV>���x�x���ZVV��M,-��Qy��o史8�M��q\AIqC��{.���~%���uǛ�?�X&���J��iiQ��W������Ų�ۖ.�Zb����`�E�N*�E,�!k�����Ayٹ�=�|�g������>��-ך`�p��r�&�Ƣ�X�W���C��)9�S�y4A�=<$�@�H��ͫW�����kϤXz�x/
�vV��-S�YX��i�=�]\R��:�NZMMX�6
wvo4
--i~�MM�4�؉;%�7�u�V����V��=�ׂ�l�ut�KO
0ȩ��jL@�)�o]	l=���QQN�i���yA�
��dC����+*I�ɖ��{��-�K*]�}�$\k��ҍ�1tT���`;��|
J��D��%
�O�7�FAm�戗.+�z�u�Y���%
�!Pŵn•��)o��'�:(i��{����:��p�}-}����[1&�ʛ�v�D����g�.��Z˸�t�(z��
--��

���	A�
H��������Mbxx���|���]�+
--�l���Vݻb/�������\���f�d��K*���m��iE������m����e3�F� �
eA�:�z
��cYڴuo�耖���h���y�.�����v}���#J�l,=�V�3⣍\��X�5��?�4�/i���-n	P��ӫ��};21��۾x.)șJ	���M�O��ð
�n�JyH��1x�
#���9�!-��k����$0�<+[;T��;jԦro��[Y�	18��=E`OF4|B��~���<jl�6M�\D�-&�T	��i�`�\}�@F-��E��D-�~��߹� 1n����-�᳖�{���3S����饎 `je]�Ҳ���0�4֑�*��-�i���~*=
�J�#Rf%��R�%~�����~cS�q����z]5��Rg�Pf�-+����
--�6����PE�J��*"==��
--�\��a�|c�J���FF�IzF����L^��V47��ǂi�h��"@�P(
�
-\ No newline at end of file
-removed in remote
-  base   100644 84970c7172887f460750705de8fc06ca7eea4a5b atom/browser/resources/win/atom.manifest
-  our    100644 7608ffb20f6c614383b6a5261cb76210366b9cc8 atom/browser/resources/win/atom.manifest
-@@ -1,40 +0,0 @@
--<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
--<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
--
--  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
--    <application>
--      <!-- Windows 10 -->
--      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
--      <!-- Windows 8.1 -->
--      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
--      <!-- Windows 8 -->
--      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
--      <!-- Windows 7 -->
--      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
--      <!-- Windows Vista -->
--      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
--    </application>
--  </compatibility>
--
--  <dependency>
--    <dependentAssembly>
--      <assemblyIdentity type="Win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"></assemblyIdentity>
--    </dependentAssembly>
--  </dependency>
--
--  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
--    <security>
--      <requestedPrivileges>
--        <requestedExecutionLevel level="asInvoker" />
--      </requestedPrivileges>
--    </security>
--  </trustInfo>
--
--  <asmv3:application xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
--    <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
--      <dpiAware>true/pm</dpiAware>
--      <disableWindowFiltering xmlns="http://schemas.microsoft.com/SMI/2011/WindowsSettings">true</disableWindowFiltering>
--    </asmv3:windowsSettings>
--  </asmv3:application>
--
--</assembly>
-removed in remote
-  base   100644 15252346669461924df5952feca70adb45bc1ac7 atom/browser/resources/win/atom.rc
-  our    100644 c0bd831e8bddf10180f75cd40694831e2e98622d atom/browser/resources/win/atom.rc
-@@ -1,139 +0,0 @@
--// Microsoft Visual C++ generated resource script.
--//
--#include "ui\\resources\\grit\\ui_unscaled_resources.h"
--#include "resource.h"
--#include <winresrc.h>
--#ifdef IDC_STATIC
--#undef IDC_STATIC
--#endif
--#define IDC_STATIC (-1)
--
--#define APSTUDIO_READONLY_SYMBOLS
--/////////////////////////////////////////////////////////////////////////////
--//
--// Generated from the TEXTINCLUDE 2 resource.
--//
--#include "windows.h"
--
--/////////////////////////////////////////////////////////////////////////////
--#undef APSTUDIO_READONLY_SYMBOLS
--
--/////////////////////////////////////////////////////////////////////////////
--// English (United States) resources
--
--#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
--LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
--
--#ifdef APSTUDIO_INVOKED
--/////////////////////////////////////////////////////////////////////////////
--//
--// TEXTINCLUDE
--//
--
--1 TEXTINCLUDE
--BEGIN
--    "resource.h\0"
--END
--
--2 TEXTINCLUDE
--BEGIN
--    "#include ""windows.h""\r\n"
--    "\0"
--END
--
--3 TEXTINCLUDE
--BEGIN
--    "\r\n"
--    "\0"
--END
--
--#endif    // APSTUDIO_INVOKED
--
--
--/////////////////////////////////////////////////////////////////////////////
--//
--// Version
--//
--
--VS_VERSION_INFO VERSIONINFO
-- FILEVERSION 4,0,0,20180821
-- PRODUCTVERSION 4,0,0,20180821
-- FILEFLAGSMASK 0x3fL
--#ifdef _DEBUG
-- FILEFLAGS 0x1L
--#else
-- FILEFLAGS 0x0L
--#endif
-- FILEOS 0x40004L
-- FILETYPE 0x1L
-- FILESUBTYPE 0x0L
--BEGIN
--    BLOCK "StringFileInfo"
--    BEGIN
--        BLOCK "040904b0"
--        BEGIN
--            VALUE "CompanyName", "GitHub, Inc."
--            VALUE "FileDescription", "Electron"
--            VALUE "FileVersion", "4.0.0"
--            VALUE "InternalName", "electron.exe"
--            VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
--            VALUE "OriginalFilename", "electron.exe"
--            VALUE "ProductName", "Electron"
--            VALUE "ProductVersion", "4.0.0"
--            VALUE "SquirrelAwareVersion", "1"
--        END
--    END
--    BLOCK "VarFileInfo"
--    BEGIN
--        VALUE "Translation", 0x409, 1200
--    END
--END
--
--#endif    // English (United States) resources
--/////////////////////////////////////////////////////////////////////////////
--
--
--
--#ifndef APSTUDIO_INVOKED
--/////////////////////////////////////////////////////////////////////////////
--//
--// Generated from the TEXTINCLUDE 3 resource.
--//
--
--
--/////////////////////////////////////////////////////////////////////////////
--#endif    // not APSTUDIO_INVOKED
--
--/////////////////////////////////////////////////////////////////////////////
--//
--// Icon
--//
--
--IDR_MAINFRAME           ICON                    "atom.ico"
--/////////////////////////////////////////////////////////////////////////////
--
--/////////////////////////////////////////////////////////////////////////////
--//
--// Cursors
--//
--IDC_ALIAS          CURSOR             "ui\\resources\\cursors\\aliasb.cur"
--IDC_CELL           CURSOR             "ui\\resources\\cursors\\cell.cur"
--IDC_COLRESIZE      CURSOR             "ui\\resources\\cursors\\col_resize.cur"
--IDC_COPYCUR        CURSOR             "ui\\resources\\cursors\\copy.cur"
--IDC_CURSOR_NONE    CURSOR             "ui\\resources\\cursors\\none.cur"
--IDC_HAND_GRAB      CURSOR             "ui\\resources\\cursors\\hand_grab.cur"
--IDC_HAND_GRABBING  CURSOR             "ui\\resources\\cursors\\hand_grabbing.cur"
--IDC_PAN_EAST       CURSOR             "ui\\resources\\cursors\\pan_east.cur"
--IDC_PAN_MIDDLE     CURSOR             "ui\\resources\\cursors\\pan_middle.cur"
--IDC_PAN_NORTH      CURSOR             "ui\\resources\\cursors\\pan_north.cur"
--IDC_PAN_NORTH_EAST CURSOR             "ui\\resources\\cursors\\pan_north_east.cur"
--IDC_PAN_NORTH_WEST CURSOR             "ui\\resources\\cursors\\pan_north_west.cur"
--IDC_PAN_SOUTH      CURSOR             "ui\\resources\\cursors\\pan_south.cur"
--IDC_PAN_SOUTH_EAST CURSOR             "ui\\resources\\cursors\\pan_south_east.cur"
--IDC_PAN_SOUTH_WEST CURSOR             "ui\\resources\\cursors\\pan_south_west.cur"
--IDC_PAN_WEST       CURSOR             "ui\\resources\\cursors\\pan_west.cur"
--IDC_ROWRESIZE      CURSOR             "ui\\resources\\cursors\\row_resize.cur"
--IDC_VERTICALTEXT   CURSOR             "ui\\resources\\cursors\\vertical_text.cur"
--IDC_ZOOMIN         CURSOR             "ui\\resources\\cursors\\zoom_in.cur"
--IDC_ZOOMOUT        CURSOR             "ui\\resources\\cursors\\zoom_out.cur"
--/////////////////////////////////////////////////////////////////////////////
-removed in remote
-  base   100644 d35e16d082e6dcaf15a9b58126f2770d5274bd70 atom/browser/resources/win/resource.h
-  our    100644 275374d36194c609678082bdf7be3b93560ce37c atom/browser/resources/win/resource.h
-@@ -1,15 +0,0 @@
--//{{NO_DEPENDENCIES}}
--// Microsoft Visual C++ generated include file.
--
--#define IDR_MAINFRAME 1
--
--// Next default values for new objects
--//
--#ifdef APSTUDIO_INVOKED
--#ifndef APSTUDIO_READONLY_SYMBOLS
--#define _APS_NEXT_RESOURCE_VALUE 101
--#define _APS_NEXT_COMMAND_VALUE 40001
--#define _APS_NEXT_CONTROL_VALUE 1001
--#define _APS_NEXT_SYMED_VALUE 101
--#endif
--#endif
-removed in remote
-  base   100644 f683c99c637ff2de6ea1ba86cc63365a5fec93b3 atom/browser/ui/accelerator_util.cc
-  our    100644 63ea1489467c881b9f8e1686e3a73db74ea7c157 atom/browser/ui/accelerator_util.cc
-@@ -1,101 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/ui/accelerator_util.h"
--
--#include <stdio.h>
--
--#include <string>
--#include <vector>
--
--#include "atom/common/keyboard_util.h"
--#include "base/stl_util.h"
--#include "base/strings/string_number_conversions.h"
--#include "base/strings/string_split.h"
--#include "base/strings/string_util.h"
--
--namespace accelerator_util {
--
--bool StringToAccelerator(const std::string& shortcut,
--                         ui::Accelerator* accelerator) {
--  if (!base::IsStringASCII(shortcut)) {
--    LOG(ERROR) << "The accelerator string can only contain ASCII characters";
--    return false;
--  }
--
--  std::vector<std::string> tokens = base::SplitString(
--      shortcut, "+", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
--
--  // Now, parse it into an accelerator.
--  int modifiers = ui::EF_NONE;
--  ui::KeyboardCode key = ui::VKEY_UNKNOWN;
--  for (const auto& token : tokens) {
--    bool shifted = false;
--    ui::KeyboardCode code = atom::KeyboardCodeFromStr(token, &shifted);
--    if (shifted)
--      modifiers |= ui::EF_SHIFT_DOWN;
--    switch (code) {
--      // The token can be a modifier.
--      case ui::VKEY_SHIFT:
--        modifiers |= ui::EF_SHIFT_DOWN;
--        break;
--      case ui::VKEY_CONTROL:
--        modifiers |= ui::EF_CONTROL_DOWN;
--        break;
--      case ui::VKEY_MENU:
--        modifiers |= ui::EF_ALT_DOWN;
--        break;
--      case ui::VKEY_COMMAND:
--        modifiers |= ui::EF_COMMAND_DOWN;
--        break;
--      case ui::VKEY_ALTGR:
--        modifiers |= ui::EF_ALTGR_DOWN;
--        break;
--      // Or it is a normal key.
--      default:
--        key = code;
--    }
--  }
--
--  if (key == ui::VKEY_UNKNOWN) {
--    LOG(WARNING) << shortcut << " doesn't contain a valid key";
--    return false;
--  }
--
--  *accelerator = ui::Accelerator(key, modifiers);
--  SetPlatformAccelerator(accelerator);
--  return true;
--}
--
--void GenerateAcceleratorTable(AcceleratorTable* table,
--                              atom::AtomMenuModel* model) {
--  int count = model->GetItemCount();
--  for (int i = 0; i < count; ++i) {
--    atom::AtomMenuModel::ItemType type = model->GetTypeAt(i);
--    if (type == atom::AtomMenuModel::TYPE_SUBMENU) {
--      auto* submodel = model->GetSubmenuModelAt(i);
--      GenerateAcceleratorTable(table, submodel);
--    } else {
--      ui::Accelerator accelerator;
--      if (model->GetAcceleratorAtWithParams(i, true, &accelerator)) {
--        MenuItem item = {i, model};
--        (*table)[accelerator] = item;
--      }
--    }
--  }
--}
--
--bool TriggerAcceleratorTableCommand(AcceleratorTable* table,
--                                    const ui::Accelerator& accelerator) {
--  if (base::ContainsKey(*table, accelerator)) {
--    const accelerator_util::MenuItem& item = (*table)[accelerator];
--    if (item.model->IsEnabledAt(item.position)) {
--      item.model->ActivatedAt(item.position);
--      return true;
--    }
--  }
--  return false;
--}
--
--}  // namespace accelerator_util
-removed in remote
-  base   100644 584041980b4c61a504df37f651ef13938056848b atom/browser/ui/accelerator_util.h
-  our    100644 c965e5da0b05a75c834e6b8df672e4220e196e18 atom/browser/ui/accelerator_util.h
-@@ -1,39 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_UI_ACCELERATOR_UTIL_H_
--#define ATOM_BROWSER_UI_ACCELERATOR_UTIL_H_
--
--#include <map>
--#include <string>
--
--#include "atom/browser/ui/atom_menu_model.h"
--#include "ui/base/accelerators/accelerator.h"
--
--namespace accelerator_util {
--
--typedef struct {
--  int position;
--  atom::AtomMenuModel* model;
--} MenuItem;
--typedef std::map<ui::Accelerator, MenuItem> AcceleratorTable;
--
--// Parse a string as an accelerator.
--bool StringToAccelerator(const std::string& description,
--                         ui::Accelerator* accelerator);
--
--// Set platform accelerator for the Accelerator.
--void SetPlatformAccelerator(ui::Accelerator* accelerator);
--
--// Generate a table that contains memu model's accelerators and command ids.
--void GenerateAcceleratorTable(AcceleratorTable* table,
--                              atom::AtomMenuModel* model);
--
--// Trigger command from the accelerators table.
--bool TriggerAcceleratorTableCommand(AcceleratorTable* table,
--                                    const ui::Accelerator& accelerator);
--
--}  // namespace accelerator_util
--
--#endif  // ATOM_BROWSER_UI_ACCELERATOR_UTIL_H_
-removed in remote
-  base   100644 be631b021249c6874d8192673dc0c269625b3989 atom/browser/ui/accelerator_util_mac.mm
-  our    100644 51ac1c4db864ad85bb46624c222f15289f7bc0ac atom/browser/ui/accelerator_util_mac.mm
-@@ -1,46 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/ui/accelerator_util.h"
--
--#include "ui/base/accelerators/accelerator.h"
--#import "ui/base/accelerators/platform_accelerator_cocoa.h"
--#import "ui/events/keycodes/keyboard_code_conversion_mac.h"
--
--namespace accelerator_util {
--
--void SetPlatformAccelerator(ui::Accelerator* accelerator) {
--  unichar character;
--  unichar characterIgnoringModifiers;
--
--  NSUInteger modifiers = (accelerator->IsCtrlDown() ? NSControlKeyMask : 0) |
--                         (accelerator->IsCmdDown() ? NSCommandKeyMask : 0) |
--                         (accelerator->IsAltDown() ? NSAlternateKeyMask : 0) |
--                         (accelerator->IsShiftDown() ? NSShiftKeyMask : 0);
--
--  ui::MacKeyCodeForWindowsKeyCode(accelerator->key_code(), modifiers,
--                                  &character, &characterIgnoringModifiers);
--
--  if (character != characterIgnoringModifiers) {
--    if (isdigit(characterIgnoringModifiers)) {
--      // The character is a number so lets not mutate it with the modifiers
--      character = characterIgnoringModifiers;
--    } else {
--      modifiers ^= NSShiftKeyMask;
--    }
--  }
--
--  if (character == NSDeleteFunctionKey) {
--    character = NSDeleteCharacter;
--  }
--
--  NSString* characters =
--      [[[NSString alloc] initWithCharacters:&character length:1] autorelease];
--
--  std::unique_ptr<ui::PlatformAccelerator> platform_accelerator(
--      new ui::PlatformAcceleratorCocoa(characters, modifiers));
--  accelerator->set_platform_accelerator(std::move(platform_accelerator));
--}
--
--}  // namespace accelerator_util
-removed in remote
-  base   100644 f8d994f82ada2810b4a60ddc028694f404d02d65 atom/browser/ui/accelerator_util_views.cc
-  our    100644 086e7084c48e2d29a1370f66b8599b1b9f148143 atom/browser/ui/accelerator_util_views.cc
-@@ -1,13 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/ui/accelerator_util.h"
--
--#include "ui/base/accelerators/accelerator.h"
--
--namespace accelerator_util {
--
--void SetPlatformAccelerator(ui::Accelerator* accelerator) {}
--
--}  // namespace accelerator_util
-removed in remote
-  base   100644 9add7a22715e9de81fa0dab952f5b89257dae9af atom/browser/ui/atom_menu_model.cc
-  our    100644 83e23c42ed8984abaa6abc6f18fa76ace5a3f157 atom/browser/ui/atom_menu_model.cc
-@@ -1,65 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/ui/atom_menu_model.h"
--
--#include "base/stl_util.h"
--
--namespace atom {
--
--bool AtomMenuModel::Delegate::GetAcceleratorForCommandId(int command_id,
--    ui::Accelerator* accelerator) const {
--  return GetAcceleratorForCommandIdWithParams(
--      command_id, false, accelerator);
--}
--
--AtomMenuModel::AtomMenuModel(Delegate* delegate)
--    : ui::SimpleMenuModel(delegate), delegate_(delegate) {}
--
--AtomMenuModel::~AtomMenuModel() {}
--
--void AtomMenuModel::SetRole(int index, const base::string16& role) {
--  int command_id = GetCommandIdAt(index);
--  roles_[command_id] = role;
--}
--
--base::string16 AtomMenuModel::GetRoleAt(int index) {
--  int command_id = GetCommandIdAt(index);
--  if (base::ContainsKey(roles_, command_id))
--    return roles_[command_id];
--  else
--    return base::string16();
--}
--
--bool AtomMenuModel::GetAcceleratorAtWithParams(
--    int index,
--    bool use_default_accelerator,
--    ui::Accelerator* accelerator) const {
--  if (delegate_) {
--    return delegate_->GetAcceleratorForCommandIdWithParams(
--        GetCommandIdAt(index), use_default_accelerator, accelerator);
--  }
--  return false;
--}
--
--void AtomMenuModel::MenuWillClose() {
--  ui::SimpleMenuModel::MenuWillClose();
--  for (Observer& observer : observers_) {
--    observer.OnMenuWillClose();
--  }
--}
--
--void AtomMenuModel::MenuWillShow() {
--  ui::SimpleMenuModel::MenuWillShow();
--  for (Observer& observer : observers_) {
--    observer.OnMenuWillShow();
--  }
--}
--
--AtomMenuModel* AtomMenuModel::GetSubmenuModelAt(int index) {
--  return static_cast<AtomMenuModel*>(
--      ui::SimpleMenuModel::GetSubmenuModelAt(index));
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 d091df9fb570fe5fbf3e95ea1232a6f4645ade08 atom/browser/ui/atom_menu_model.h
-  our    100644 efdd8ec9d8834fea5d79e16899445abd80df05ca atom/browser/ui/atom_menu_model.h
-@@ -1,74 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_UI_ATOM_MENU_MODEL_H_
--#define ATOM_BROWSER_UI_ATOM_MENU_MODEL_H_
--
--#include <map>
--
--#include "base/observer_list.h"
--#include "ui/base/models/simple_menu_model.h"
--
--namespace atom {
--
--class AtomMenuModel : public ui::SimpleMenuModel {
-- public:
--  class Delegate : public ui::SimpleMenuModel::Delegate {
--   public:
--    ~Delegate() override {}
--
--    virtual bool GetAcceleratorForCommandIdWithParams(
--        int command_id,
--        bool use_default_accelerator,
--        ui::Accelerator* accelerator) const = 0;
--
--   private:
--    // ui::SimpleMenuModel::Delegate:
--    bool GetAcceleratorForCommandId(
--        int command_id,
--        ui::Accelerator* accelerator) const override;
--  };
--
--  class Observer {
--   public:
--    virtual ~Observer() {}
--
--    // Notifies the menu will open.
--    virtual void OnMenuWillShow() {}
--
--    // Notifies the menu has been closed.
--    virtual void OnMenuWillClose() {}
--  };
--
--  explicit AtomMenuModel(Delegate* delegate);
--  ~AtomMenuModel() override;
--
--  void AddObserver(Observer* obs) { observers_.AddObserver(obs); }
--  void RemoveObserver(Observer* obs) { observers_.RemoveObserver(obs); }
--
--  void SetRole(int index, const base::string16& role);
--  base::string16 GetRoleAt(int index);
--  bool GetAcceleratorAtWithParams(int index,
--                                  bool use_default_accelerator,
--                                  ui::Accelerator* accelerator) const;
--
--  // ui::SimpleMenuModel:
--  void MenuWillClose() override;
--  void MenuWillShow() override;
--
--  using SimpleMenuModel::GetSubmenuModelAt;
--  AtomMenuModel* GetSubmenuModelAt(int index);
--
-- private:
--  Delegate* delegate_;  // weak ref.
--
--  std::map<int, base::string16> roles_;  // command id -> role
--  base::ObserverList<Observer> observers_;
--
--  DISALLOW_COPY_AND_ASSIGN(AtomMenuModel);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_UI_ATOM_MENU_MODEL_H_
-removed in remote
-  base   100644 f8c48aa5dcb5b9d0013f1de464ef163e48ccffe6 atom/browser/ui/cocoa/atom_menu_controller.h
-  our    100644 83e9010f0daadc1d4097db3b702197f0f178967c atom/browser/ui/cocoa/atom_menu_controller.h
-@@ -1,62 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Copyright (c) 2012 The Chromium Authors. All rights reserved.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_UI_COCOA_ATOM_MENU_CONTROLLER_H_
--#define ATOM_BROWSER_UI_COCOA_ATOM_MENU_CONTROLLER_H_
--
--#import <Cocoa/Cocoa.h>
--
--#include "base/callback.h"
--#include "base/mac/scoped_nsobject.h"
--#include "base/strings/string16.h"
--
--namespace atom {
--class AtomMenuModel;
--}
--
--// A controller for the cross-platform menu model. The menu that's created
--// has the tag and represented object set for each menu item. The object is a
--// NSValue holding a pointer to the model for that level of the menu (to
--// allow for hierarchical menus). The tag is the index into that model for
--// that particular item. It is important that the model outlives this object
--// as it only maintains weak references.
--@interface AtomMenuController : NSObject <NSMenuDelegate> {
-- @protected
--  atom::AtomMenuModel* model_;  // weak
--  base::scoped_nsobject<NSMenu> menu_;
--  BOOL isMenuOpen_;
--  BOOL useDefaultAccelerator_;
--  base::Callback<void()> closeCallback;
--}
--
--@property(nonatomic, assign) atom::AtomMenuModel* model;
--
--// Builds a NSMenu from the pre-built model (must not be nil). Changes made
--// to the contents of the model after calling this will not be noticed.
--- (id)initWithModel:(atom::AtomMenuModel*)model useDefaultAccelerator:(BOOL)use;
--
--- (void)setCloseCallback:(const base::Callback<void()>&)callback;
--
--// Populate current NSMenu with |model|.
--- (void)populateWithModel:(atom::AtomMenuModel*)model;
--
--// Programmatically close the constructed menu.
--- (void)cancel;
--
--// Access to the constructed menu if the complex initializer was used. If the
--// default initializer was used, then this will create the menu on first call.
--- (NSMenu*)menu;
--
--// Whether the menu is currently open.
--- (BOOL)isMenuOpen;
--
--// NSMenuDelegate methods this class implements. Subclasses should call super
--// if extending the behavior.
--- (void)menuWillOpen:(NSMenu*)menu;
--- (void)menuDidClose:(NSMenu*)menu;
--
--@end
--
--#endif  // ATOM_BROWSER_UI_COCOA_ATOM_MENU_CONTROLLER_H_
-removed in remote
-  base   100644 24098914b7cbbb375f8d5c0657061bc99e4a5821 atom/browser/ui/cocoa/atom_menu_controller.mm
-  our    100644 cecf30ce1c88e007957a65427648941765a6067e atom/browser/ui/cocoa/atom_menu_controller.mm
-@@ -1,345 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Copyright (c) 2012 The Chromium Authors. All rights reserved.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#import "atom/browser/ui/cocoa/atom_menu_controller.h"
--
--#include "atom/browser/ui/atom_menu_model.h"
--#include "base/logging.h"
--#include "base/strings/sys_string_conversions.h"
--#include "base/strings/utf_string_conversions.h"
--#include "content/public/browser/browser_thread.h"
--#include "ui/base/accelerators/accelerator.h"
--#include "ui/base/accelerators/platform_accelerator_cocoa.h"
--#include "ui/base/l10n/l10n_util_mac.h"
--#include "ui/events/cocoa/cocoa_event_utils.h"
--#include "ui/gfx/image/image.h"
--
--using content::BrowserThread;
--
--namespace {
--
--struct Role {
--  SEL selector;
--  const char* role;
--};
--Role kRolesMap[] = {
--    {@selector(orderFrontStandardAboutPanel:), "about"},
--    {@selector(hide:), "hide"},
--    {@selector(hideOtherApplications:), "hideothers"},
--    {@selector(unhideAllApplications:), "unhide"},
--    {@selector(arrangeInFront:), "front"},
--    {@selector(undo:), "undo"},
--    {@selector(redo:), "redo"},
--    {@selector(cut:), "cut"},
--    {@selector(copy:), "copy"},
--    {@selector(paste:), "paste"},
--    {@selector(delete:), "delete"},
--    {@selector(pasteAndMatchStyle:), "pasteandmatchstyle"},
--    {@selector(selectAll:), "selectall"},
--    {@selector(startSpeaking:), "startspeaking"},
--    {@selector(stopSpeaking:), "stopspeaking"},
--    {@selector(performMiniaturize:), "minimize"},
--    {@selector(performClose:), "close"},
--    {@selector(performZoom:), "zoom"},
--    {@selector(terminate:), "quit"},
--    // ↓ is intentionally not `toggleFullScreen`. The macOS full screen menu
--    // item behaves weird. If we use `toggleFullScreen`, then the menu item will
--    // use the default label, and not take the one provided.
--    {@selector(toggleFullScreenMode:), "togglefullscreen"},
--    {@selector(toggleTabBar:), "toggletabbar"},
--    {@selector(selectNextTab:), "selectnexttab"},
--    {@selector(selectPreviousTab:), "selectprevioustab"},
--    {@selector(mergeAllWindows:), "mergeallwindows"},
--    {@selector(moveTabToNewWindow:), "movetabtonewwindow"},
--    {@selector(clearRecentDocuments:), "clearrecentdocuments"},
--};
--
--}  // namespace
--
--// Menu item is located for ease of removing it from the parent owner
--static base::scoped_nsobject<NSMenuItem> recentDocumentsMenuItem_;
--
--// Submenu retained to be swapped back to |recentDocumentsMenuItem_|
--static base::scoped_nsobject<NSMenu> recentDocumentsMenuSwap_;
--
--@implementation AtomMenuController
--
--@synthesize model = model_;
--
--- (id)initWithModel:(atom::AtomMenuModel*)model
--    useDefaultAccelerator:(BOOL)use {
--  if ((self = [super init])) {
--    model_ = model;
--    isMenuOpen_ = NO;
--    useDefaultAccelerator_ = use;
--    [self menu];
--  }
--  return self;
--}
--
--- (void)dealloc {
--  [menu_ setDelegate:nil];
--
--  // Close the menu if it is still open. This could happen if a tab gets closed
--  // while its context menu is still open.
--  [self cancel];
--
--  model_ = nil;
--
--  [super dealloc];
--}
--
--- (void)setCloseCallback:(const base::Callback<void()>&)callback {
--  closeCallback = callback;
--}
--
--- (void)populateWithModel:(atom::AtomMenuModel*)model {
--  if (!menu_)
--    return;
--
--  if (!recentDocumentsMenuItem_) {
--    // Locate & retain the recent documents menu item
--    recentDocumentsMenuItem_.reset(
--        [[[[[NSApp mainMenu] itemWithTitle:@"Electron"] submenu]
--            itemWithTitle:@"Open Recent"] retain]);
--  }
--
--  model_ = model;
--  [menu_ removeAllItems];
--
--  const int count = model->GetItemCount();
--  for (int index = 0; index < count; index++) {
--    if (model->GetTypeAt(index) == atom::AtomMenuModel::TYPE_SEPARATOR)
--      [self addSeparatorToMenu:menu_ atIndex:index];
--    else
--      [self addItemToMenu:menu_ atIndex:index fromModel:model];
--  }
--}
--
--- (void)cancel {
--  if (isMenuOpen_) {
--    [menu_ cancelTracking];
--    isMenuOpen_ = NO;
--    model_->MenuWillClose();
--    if (!closeCallback.is_null()) {
--      BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, closeCallback);
--    }
--  }
--}
--
--// Creates a NSMenu from the given model. If the model has submenus, this can
--// be invoked recursively.
--- (NSMenu*)menuFromModel:(atom::AtomMenuModel*)model {
--  NSMenu* menu = [[[NSMenu alloc] initWithTitle:@""] autorelease];
--
--  const int count = model->GetItemCount();
--  for (int index = 0; index < count; index++) {
--    if (model->GetTypeAt(index) == atom::AtomMenuModel::TYPE_SEPARATOR)
--      [self addSeparatorToMenu:menu atIndex:index];
--    else
--      [self addItemToMenu:menu atIndex:index fromModel:model];
--  }
--
--  return menu;
--}
--
--// Adds a separator item at the given index. As the separator doesn't need
--// anything from the model, this method doesn't need the model index as the
--// other method below does.
--- (void)addSeparatorToMenu:(NSMenu*)menu atIndex:(int)index {
--  NSMenuItem* separator = [NSMenuItem separatorItem];
--  [menu insertItem:separator atIndex:index];
--}
--
--// Empties the source menu items to the destination.
--- (void)moveMenuItems:(NSMenu*)source to:(NSMenu*)destination {
--  const long count = [source numberOfItems];
--  for (long index = 0; index < count; index++) {
--    NSMenuItem* removedItem = [[[source itemAtIndex:0] retain] autorelease];
--    [source removeItemAtIndex:0];
--    [destination addItem:removedItem];
--  }
--}
--
--// Replaces the item's submenu instance with the singleton recent documents
--// menu. Previously replaced menu items will be recovered.
--- (void)replaceSubmenuShowingRecentDocuments:(NSMenuItem*)item {
--  NSMenu* recentDocumentsMenu =
--      [[[recentDocumentsMenuItem_ submenu] retain] autorelease];
--
--  // Remove menu items in recent documents back to swap menu
--  [self moveMenuItems:recentDocumentsMenu to:recentDocumentsMenuSwap_];
--  // Swap back the submenu
--  [recentDocumentsMenuItem_ setSubmenu:recentDocumentsMenuSwap_];
--
--  // Retain the item's submenu for a future recovery
--  recentDocumentsMenuSwap_.reset([[item submenu] retain]);
--
--  // Repopulate with items from the submenu to be replaced
--  [self moveMenuItems:recentDocumentsMenuSwap_ to:recentDocumentsMenu];
--  // Update the submenu's title
--  [recentDocumentsMenu setTitle:[recentDocumentsMenuSwap_ title]];
--  // Replace submenu
--  [item setSubmenu:recentDocumentsMenu];
--
--  // Remember the new menu item that carries the recent documents menu
--  recentDocumentsMenuItem_.reset([item retain]);
--}
--
--// Adds an item or a hierarchical menu to the item at the |index|,
--// associated with the entry in the model identified by |modelIndex|.
--- (void)addItemToMenu:(NSMenu*)menu
--              atIndex:(NSInteger)index
--            fromModel:(atom::AtomMenuModel*)model {
--  base::string16 label16 = model->GetLabelAt(index);
--  NSString* label = l10n_util::FixUpWindowsStyleLabel(label16);
--
--  base::scoped_nsobject<NSMenuItem> item([[NSMenuItem alloc]
--      initWithTitle:label
--             action:@selector(itemSelected:)
--      keyEquivalent:@""]);
--
--  // If the menu item has an icon, set it.
--  gfx::Image icon;
--  if (model->GetIconAt(index, &icon) && !icon.IsEmpty())
--    [item setImage:icon.ToNSImage()];
--
--  base::string16 role = model->GetRoleAt(index);
--  atom::AtomMenuModel::ItemType type = model->GetTypeAt(index);
--  if (type == atom::AtomMenuModel::TYPE_SUBMENU) {
--    // Recursively build a submenu from the sub-model at this index.
--    [item setTarget:nil];
--    [item setAction:nil];
--    atom::AtomMenuModel* submenuModel =
--        static_cast<atom::AtomMenuModel*>(model->GetSubmenuModelAt(index));
--    NSMenu* submenu = [self menuFromModel:submenuModel];
--    [submenu setTitle:[item title]];
--    [item setSubmenu:submenu];
--
--    // Set submenu's role.
--    if (role == base::ASCIIToUTF16("window") && [submenu numberOfItems])
--      [NSApp setWindowsMenu:submenu];
--    else if (role == base::ASCIIToUTF16("help"))
--      [NSApp setHelpMenu:submenu];
--    else if (role == base::ASCIIToUTF16("services"))
--      [NSApp setServicesMenu:submenu];
--    else if (role == base::ASCIIToUTF16("recentdocuments"))
--      [self replaceSubmenuShowingRecentDocuments:item];
--  } else {
--    // The MenuModel works on indexes so we can't just set the command id as the
--    // tag like we do in other menus. Also set the represented object to be
--    // the model so hierarchical menus check the correct index in the correct
--    // model. Setting the target to |self| allows this class to participate
--    // in validation of the menu items.
--    [item setTag:index];
--    NSValue* modelObject = [NSValue valueWithPointer:model];
--    [item setRepresentedObject:modelObject];  // Retains |modelObject|.
--    ui::Accelerator accelerator;
--    if (model->GetAcceleratorAtWithParams(index, useDefaultAccelerator_,
--                                          &accelerator)) {
--      const ui::PlatformAcceleratorCocoa* platformAccelerator =
--          static_cast<const ui::PlatformAcceleratorCocoa*>(
--              accelerator.platform_accelerator());
--      if (platformAccelerator) {
--        [item setKeyEquivalent:platformAccelerator->characters()];
--        [item
--            setKeyEquivalentModifierMask:platformAccelerator->modifier_mask()];
--      }
--    }
--
--    // Set menu item's role.
--    [item setTarget:self];
--    if (!role.empty()) {
--      for (const Role& pair : kRolesMap) {
--        if (role == base::ASCIIToUTF16(pair.role)) {
--          [item setTarget:nil];
--          [item setAction:pair.selector];
--          break;
--        }
--      }
--    }
--  }
--  [menu insertItem:item atIndex:index];
--}
--
--// Called before the menu is to be displayed to update the state (enabled,
--// radio, etc) of each item in the menu. Also will update the title if
--// the item is marked as "dynamic".
--- (BOOL)validateUserInterfaceItem:(id<NSValidatedUserInterfaceItem>)item {
--  SEL action = [item action];
--  if (action != @selector(itemSelected:))
--    return NO;
--
--  NSInteger modelIndex = [item tag];
--  atom::AtomMenuModel* model = static_cast<atom::AtomMenuModel*>(
--      [[(id)item representedObject] pointerValue]);
--  DCHECK(model);
--  if (model) {
--    BOOL checked = model->IsItemCheckedAt(modelIndex);
--    DCHECK([(id)item isKindOfClass:[NSMenuItem class]]);
--    [(id)item setState:(checked ? NSOnState : NSOffState)];
--    [(id)item setHidden:(!model->IsVisibleAt(modelIndex))];
--    if (model->IsItemDynamicAt(modelIndex)) {
--      // Update the label and the icon.
--      NSString* label =
--          l10n_util::FixUpWindowsStyleLabel(model->GetLabelAt(modelIndex));
--      [(id)item setTitle:label];
--
--      gfx::Image icon;
--      model->GetIconAt(modelIndex, &icon);
--      [(id)item setImage:icon.IsEmpty() ? nil : icon.ToNSImage()];
--    }
--    return model->IsEnabledAt(modelIndex);
--  }
--  return NO;
--}
--
--// Called when the user chooses a particular menu item. |sender| is the menu
--// item chosen.
--- (void)itemSelected:(id)sender {
--  NSInteger modelIndex = [sender tag];
--  atom::AtomMenuModel* model = static_cast<atom::AtomMenuModel*>(
--      [[sender representedObject] pointerValue]);
--  DCHECK(model);
--  if (model) {
--    NSEvent* event = [NSApp currentEvent];
--    model->ActivatedAt(modelIndex,
--                       ui::EventFlagsFromModifiers([event modifierFlags]));
--  }
--}
--
--- (NSMenu*)menu {
--  if (menu_)
--    return menu_.get();
--
--  menu_.reset([[NSMenu alloc] initWithTitle:@""]);
--  [menu_ setDelegate:self];
--  if (model_)
--    [self populateWithModel:model_];
--  return menu_.get();
--}
--
--- (BOOL)isMenuOpen {
--  return isMenuOpen_;
--}
--
--- (void)menuWillOpen:(NSMenu*)menu {
--  isMenuOpen_ = YES;
--  model_->MenuWillShow();
--}
--
--- (void)menuDidClose:(NSMenu*)menu {
--  if (isMenuOpen_) {
--    isMenuOpen_ = NO;
--    model_->MenuWillClose();
--    // Post async task so that itemSelected runs before the close callback
--    // deletes the controller from the map which deallocates it
--    if (!closeCallback.is_null()) {
--      BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, closeCallback);
--    }
--  }
--}
--
--@end
-removed in remote
-  base   100644 51d7f5ee9d32120229dd869013f240d15e82e180 atom/browser/ui/file_dialog.h
-  our    100644 becc1806610ae54c005b3e8aef17a9ef19d730bf atom/browser/ui/file_dialog.h
-@@ -1,86 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_UI_FILE_DIALOG_H_
--#define ATOM_BROWSER_UI_FILE_DIALOG_H_
--
--#include <string>
--#include <utility>
--#include <vector>
--
--#include "base/callback_forward.h"
--#include "base/files/file_path.h"
--
--namespace atom {
--class NativeWindow;
--}
--
--namespace file_dialog {
--
--// <description, extensions>
--typedef std::pair<std::string, std::vector<std::string>> Filter;
--typedef std::vector<Filter> Filters;
--
--enum FileDialogProperty {
--  FILE_DIALOG_OPEN_FILE = 1 << 0,
--  FILE_DIALOG_OPEN_DIRECTORY = 1 << 1,
--  FILE_DIALOG_MULTI_SELECTIONS = 1 << 2,
--  FILE_DIALOG_CREATE_DIRECTORY = 1 << 3,
--  FILE_DIALOG_SHOW_HIDDEN_FILES = 1 << 4,
--  FILE_DIALOG_PROMPT_TO_CREATE = 1 << 5,
--  FILE_DIALOG_NO_RESOLVE_ALIASES = 1 << 6,
--  FILE_DIALOG_TREAT_PACKAGE_APP_AS_DIRECTORY = 1 << 7,
--};
--
--#if defined(MAS_BUILD)
--typedef base::Callback<void(bool result,
--                            const std::vector<base::FilePath>& paths,
--                            const std::vector<std::string>& bookmarkData)>
--    OpenDialogCallback;
--
--typedef base::Callback<void(bool result,
--                            const base::FilePath& path,
--                            const std::string& bookmarkData)>
--    SaveDialogCallback;
--#else
--typedef base::Callback<void(bool result,
--                            const std::vector<base::FilePath>& paths)>
--    OpenDialogCallback;
--
--typedef base::Callback<void(bool result, const base::FilePath& path)>
--    SaveDialogCallback;
--#endif
--
--struct DialogSettings {
--  atom::NativeWindow* parent_window = nullptr;
--  std::string title;
--  std::string message;
--  std::string button_label;
--  std::string name_field_label;
--  base::FilePath default_path;
--  Filters filters;
--  int properties = 0;
--  bool shows_tag_field = true;
--  bool force_detached = false;
--  bool security_scoped_bookmarks = false;
--
--  DialogSettings();
--  DialogSettings(const DialogSettings&);
--  ~DialogSettings();
--};
--
--bool ShowOpenDialog(const DialogSettings& settings,
--                    std::vector<base::FilePath>* paths);
--
--void ShowOpenDialog(const DialogSettings& settings,
--                    const OpenDialogCallback& callback);
--
--bool ShowSaveDialog(const DialogSettings& settings, base::FilePath* path);
--
--void ShowSaveDialog(const DialogSettings& settings,
--                    const SaveDialogCallback& callback);
--
--}  // namespace file_dialog
--
--#endif  // ATOM_BROWSER_UI_FILE_DIALOG_H_
-removed in remote
-  base   100644 6d19a2eda464ffd14ecf38b685ef3d30e778c737 atom/browser/ui/file_dialog_gtk.cc
-  our    100644 dad4fabde9f709e65a04bc4299233bac891f38ff atom/browser/ui/file_dialog_gtk.cc
-@@ -1,278 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/ui/file_dialog.h"
--
--#include <glib/gi18n.h>  // _() macro
--
--#include "atom/browser/native_window_views.h"
--#include "atom/browser/unresponsive_suppressor.h"
--#include "base/callback.h"
--#include "base/files/file_util.h"
--#include "base/strings/string_util.h"
--#include "chrome/browser/ui/libgtkui/gtk_signal.h"
--#include "chrome/browser/ui/libgtkui/gtk_util.h"
--#include "ui/views/widget/desktop_aura/x11_desktop_handler.h"
--
--namespace file_dialog {
--
--DialogSettings::DialogSettings() = default;
--DialogSettings::~DialogSettings() = default;
--
--namespace {
--
--// Makes sure that .jpg also shows .JPG.
--gboolean FileFilterCaseInsensitive(const GtkFileFilterInfo* file_info,
--                                   std::string* file_extension) {
--  // Makes .* file extension matches all file types.
--  if (*file_extension == ".*")
--    return true;
--  return base::EndsWith(file_info->filename, *file_extension,
--                        base::CompareCase::INSENSITIVE_ASCII);
--}
--
--// Deletes |data| when gtk_file_filter_add_custom() is done with it.
--void OnFileFilterDataDestroyed(std::string* file_extension) {
--  delete file_extension;
--}
--
--class FileChooserDialog {
-- public:
--  FileChooserDialog(GtkFileChooserAction action, const DialogSettings& settings)
--      : parent_(static_cast<atom::NativeWindowViews*>(settings.parent_window)),
--        filters_(settings.filters) {
--    const char* confirm_text = _("_OK");
--
--    if (!settings.button_label.empty())
--      confirm_text = settings.button_label.c_str();
--    else if (action == GTK_FILE_CHOOSER_ACTION_SAVE)
--      confirm_text = _("_Save");
--    else if (action == GTK_FILE_CHOOSER_ACTION_OPEN)
--      confirm_text = _("_Open");
--
--    dialog_ = gtk_file_chooser_dialog_new(
--        settings.title.c_str(), NULL, action, _("_Cancel"), GTK_RESPONSE_CANCEL,
--        confirm_text, GTK_RESPONSE_ACCEPT, NULL);
--    if (parent_) {
--      parent_->SetEnabled(false);
--      libgtkui::SetGtkTransientForAura(dialog_, parent_->GetNativeWindow());
--      gtk_window_set_modal(GTK_WINDOW(dialog_), TRUE);
--    }
--
--    if (action == GTK_FILE_CHOOSER_ACTION_SAVE)
--      gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dialog_),
--                                                     TRUE);
--    if (action != GTK_FILE_CHOOSER_ACTION_OPEN)
--      gtk_file_chooser_set_create_folders(GTK_FILE_CHOOSER(dialog_), TRUE);
--
--    if (!settings.default_path.empty()) {
--      if (base::DirectoryExists(settings.default_path)) {
--        gtk_file_chooser_set_current_folder(
--            GTK_FILE_CHOOSER(dialog_), settings.default_path.value().c_str());
--      } else {
--        if (settings.default_path.IsAbsolute()) {
--          gtk_file_chooser_set_current_folder(
--              GTK_FILE_CHOOSER(dialog_),
--              settings.default_path.DirName().value().c_str());
--        }
--
--        gtk_file_chooser_set_current_name(
--            GTK_FILE_CHOOSER(dialog_),
--            settings.default_path.BaseName().value().c_str());
--      }
--    }
--
--    if (!settings.filters.empty())
--      AddFilters(settings.filters);
--  }
--
--  ~FileChooserDialog() {
--    gtk_widget_destroy(dialog_);
--    if (parent_)
--      parent_->SetEnabled(true);
--  }
--
--  void SetupProperties(int properties) {
--    if (properties & FILE_DIALOG_MULTI_SELECTIONS)
--      gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog()), TRUE);
--    if (properties & FILE_DIALOG_SHOW_HIDDEN_FILES)
--      g_object_set(dialog(), "show-hidden", TRUE, NULL);
--  }
--
--  void RunAsynchronous() {
--    g_signal_connect(dialog_, "delete-event",
--                     G_CALLBACK(gtk_widget_hide_on_delete), NULL);
--    g_signal_connect(dialog_, "response", G_CALLBACK(OnFileDialogResponseThunk),
--                     this);
--    gtk_widget_show_all(dialog_);
--
--    // We need to call gtk_window_present after making the widgets visible to
--    // make sure window gets correctly raised and gets focus.
--    int time = ui::X11EventSource::GetInstance()->GetTimestamp();
--    gtk_window_present_with_time(GTK_WINDOW(dialog_), time);
--  }
--
--  void RunSaveAsynchronous(const SaveDialogCallback& callback) {
--    save_callback_ = callback;
--    RunAsynchronous();
--  }
--
--  void RunOpenAsynchronous(const OpenDialogCallback& callback) {
--    open_callback_ = callback;
--    RunAsynchronous();
--  }
--
--  base::FilePath GetFileName() const {
--    gchar* filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog_));
--    base::FilePath path = AddExtensionForFilename(filename);
--    g_free(filename);
--    return path;
--  }
--
--  std::vector<base::FilePath> GetFileNames() const {
--    std::vector<base::FilePath> paths;
--    GSList* filenames =
--        gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(dialog_));
--    for (GSList* iter = filenames; iter != NULL; iter = g_slist_next(iter)) {
--      base::FilePath path =
--          AddExtensionForFilename(static_cast<char*>(iter->data));
--      g_free(iter->data);
--      paths.push_back(path);
--    }
--    g_slist_free(filenames);
--    return paths;
--  }
--
--  CHROMEGTK_CALLBACK_1(FileChooserDialog, void, OnFileDialogResponse, int);
--
--  GtkWidget* dialog() const { return dialog_; }
--
-- private:
--  void AddFilters(const Filters& filters);
--  base::FilePath AddExtensionForFilename(const gchar* filename) const;
--
--  atom::NativeWindowViews* parent_;
--  atom::UnresponsiveSuppressor unresponsive_suppressor_;
--
--  GtkWidget* dialog_;
--
--  Filters filters_;
--  SaveDialogCallback save_callback_;
--  OpenDialogCallback open_callback_;
--
--  DISALLOW_COPY_AND_ASSIGN(FileChooserDialog);
--};
--
--void FileChooserDialog::OnFileDialogResponse(GtkWidget* widget, int response) {
--  gtk_widget_hide(dialog_);
--
--  if (!save_callback_.is_null()) {
--    if (response == GTK_RESPONSE_ACCEPT)
--      save_callback_.Run(true, GetFileName());
--    else
--      save_callback_.Run(false, base::FilePath());
--  } else if (!open_callback_.is_null()) {
--    if (response == GTK_RESPONSE_ACCEPT)
--      open_callback_.Run(true, GetFileNames());
--    else
--      open_callback_.Run(false, std::vector<base::FilePath>());
--  }
--  delete this;
--}
--
--void FileChooserDialog::AddFilters(const Filters& filters) {
--  for (size_t i = 0; i < filters.size(); ++i) {
--    const Filter& filter = filters[i];
--    GtkFileFilter* gtk_filter = gtk_file_filter_new();
--
--    for (size_t j = 0; j < filter.second.size(); ++j) {
--      auto file_extension =
--          std::make_unique<std::string>("." + filter.second[j]);
--      gtk_file_filter_add_custom(
--          gtk_filter, GTK_FILE_FILTER_FILENAME,
--          reinterpret_cast<GtkFileFilterFunc>(FileFilterCaseInsensitive),
--          file_extension.release(),
--          reinterpret_cast<GDestroyNotify>(OnFileFilterDataDestroyed));
--    }
--
--    gtk_file_filter_set_name(gtk_filter, filter.first.c_str());
--    gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog_), gtk_filter);
--  }
--}
--
--base::FilePath FileChooserDialog::AddExtensionForFilename(
--    const gchar* filename) const {
--  base::FilePath path(filename);
--  GtkFileFilter* selected_filter =
--      gtk_file_chooser_get_filter(GTK_FILE_CHOOSER(dialog_));
--  if (!selected_filter)
--    return path;
--
--  GSList* filters = gtk_file_chooser_list_filters(GTK_FILE_CHOOSER(dialog_));
--  size_t i = g_slist_index(filters, selected_filter);
--  g_slist_free(filters);
--  if (i >= filters_.size())
--    return path;
--
--  const auto& extensions = filters_[i].second;
--  for (const auto& extension : extensions) {
--    if (extension == "*" ||
--        base::EndsWith(path.value(), "." + extension,
--                       base::CompareCase::INSENSITIVE_ASCII))
--      return path;
--  }
--
--  return path.ReplaceExtension(extensions[0]);
--}
--
--}  // namespace
--
--bool ShowOpenDialog(const DialogSettings& settings,
--                    std::vector<base::FilePath>* paths) {
--  GtkFileChooserAction action = GTK_FILE_CHOOSER_ACTION_OPEN;
--  if (settings.properties & FILE_DIALOG_OPEN_DIRECTORY)
--    action = GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER;
--  FileChooserDialog open_dialog(action, settings);
--  open_dialog.SetupProperties(settings.properties);
--
--  gtk_widget_show_all(open_dialog.dialog());
--  int response = gtk_dialog_run(GTK_DIALOG(open_dialog.dialog()));
--  if (response == GTK_RESPONSE_ACCEPT) {
--    *paths = open_dialog.GetFileNames();
--    return true;
--  } else {
--    return false;
--  }
--}
--
--void ShowOpenDialog(const DialogSettings& settings,
--                    const OpenDialogCallback& callback) {
--  GtkFileChooserAction action = GTK_FILE_CHOOSER_ACTION_OPEN;
--  if (settings.properties & FILE_DIALOG_OPEN_DIRECTORY)
--    action = GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER;
--  FileChooserDialog* open_dialog = new FileChooserDialog(action, settings);
--  open_dialog->SetupProperties(settings.properties);
--  open_dialog->RunOpenAsynchronous(callback);
--}
--
--bool ShowSaveDialog(const DialogSettings& settings, base::FilePath* path) {
--  FileChooserDialog save_dialog(GTK_FILE_CHOOSER_ACTION_SAVE, settings);
--  gtk_widget_show_all(save_dialog.dialog());
--  int response = gtk_dialog_run(GTK_DIALOG(save_dialog.dialog()));
--  if (response == GTK_RESPONSE_ACCEPT) {
--    *path = save_dialog.GetFileName();
--    return true;
--  } else {
--    return false;
--  }
--}
--
--void ShowSaveDialog(const DialogSettings& settings,
--                    const SaveDialogCallback& callback) {
--  FileChooserDialog* save_dialog =
--      new FileChooserDialog(GTK_FILE_CHOOSER_ACTION_SAVE, settings);
--  save_dialog->RunSaveAsynchronous(callback);
--}
--
--}  // namespace file_dialog
-removed in remote
-  base   100644 49662c69b3b81af166ca96808eb675fbb6025201 atom/browser/ui/file_dialog_mac.mm
-  our    100644 18b18a8b240cda5512ae49e0afde5c749bdf75c0 atom/browser/ui/file_dialog_mac.mm
-@@ -1,399 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/ui/file_dialog.h"
--
--#import <Cocoa/Cocoa.h>
--#import <CoreServices/CoreServices.h>
--
--#include "atom/browser/native_window.h"
--#include "base/files/file_util.h"
--#include "base/mac/foundation_util.h"
--#include "base/mac/mac_util.h"
--#include "base/mac/scoped_cftyperef.h"
--#include "base/strings/sys_string_conversions.h"
--
--@interface PopUpButtonHandler : NSObject
--
--@property(nonatomic, assign) NSSavePanel* savePanel;
--@property(nonatomic, strong) NSArray* fileTypesList;
--
--- (instancetype)initWithPanel:(NSSavePanel*)panel
--                 andTypesList:(NSArray*)typesList;
--- (void)selectFormat:(id)sender;
--
--@end
--
--@implementation PopUpButtonHandler
--
--@synthesize savePanel;
--@synthesize fileTypesList;
--
--- (instancetype)initWithPanel:(NSSavePanel*)panel
--                 andTypesList:(NSArray*)typesList {
--  self = [super init];
--  if (self) {
--    [self setSavePanel:panel];
--    [self setFileTypesList:typesList];
--  }
--  return self;
--}
--
--- (void)selectFormat:(id)sender {
--  NSPopUpButton* button = (NSPopUpButton*)sender;
--  NSInteger selectedItemIndex = [button indexOfSelectedItem];
--  NSArray* list = [self fileTypesList];
--  NSArray* fileTypes = [list objectAtIndex:selectedItemIndex];
--
--  // If we meet a '*' file extension, we allow all the file types and no
--  // need to set the specified file types.
--  if ([fileTypes count] == 0 || [fileTypes containsObject:@"*"])
--    [[self savePanel] setAllowedFileTypes:nil];
--  else
--    [[self savePanel] setAllowedFileTypes:fileTypes];
--}
--
--@end
--
--// Manages the PopUpButtonHandler.
--@interface AtomAccessoryView : NSView
--@end
--
--@implementation AtomAccessoryView
--
--- (void)dealloc {
--  auto* popupButton =
--      static_cast<NSPopUpButton*>([[self subviews] objectAtIndex:1]);
--  [[popupButton target] release];
--  [super dealloc];
--}
--
--@end
--
--namespace file_dialog {
--
--DialogSettings::DialogSettings() = default;
--DialogSettings::~DialogSettings() = default;
--
--namespace {
--
--void SetAllowedFileTypes(NSSavePanel* dialog, const Filters& filters) {
--  NSMutableArray* file_types_list = [NSMutableArray array];
--  NSMutableArray* filter_names = [NSMutableArray array];
--
--  // Create array to keep file types and their name.
--  for (const Filter& filter : filters) {
--    NSMutableSet* file_type_set = [NSMutableSet set];
--    [filter_names addObject:@(filter.first.c_str())];
--    for (const std::string& ext : filter.second) {
--      [file_type_set addObject:@(ext.c_str())];
--    }
--    [file_types_list addObject:[file_type_set allObjects]];
--  }
--
--  // Passing empty array to setAllowedFileTypes will cause exception.
--  NSArray* file_types = nil;
--  NSUInteger count = [file_types_list count];
--  if (count > 0) {
--    file_types = [[file_types_list objectAtIndex:0] allObjects];
--    // If we meet a '*' file extension, we allow all the file types and no
--    // need to set the specified file types.
--    if ([file_types count] == 0 || [file_types containsObject:@"*"])
--      file_types = nil;
--  }
--  [dialog setAllowedFileTypes:file_types];
--
--  if (count <= 1)
--    return;  // don't add file format picker
--
--  // Add file format picker.
--  AtomAccessoryView* accessoryView =
--      [[AtomAccessoryView alloc] initWithFrame:NSMakeRect(0.0, 0.0, 200, 32.0)];
--  NSTextField* label =
--      [[NSTextField alloc] initWithFrame:NSMakeRect(0, 0, 60, 22)];
--
--  [label setEditable:NO];
--  [label setStringValue:@"Format:"];
--  [label setBordered:NO];
--  [label setBezeled:NO];
--  [label setDrawsBackground:NO];
--
--  NSPopUpButton* popupButton =
--      [[NSPopUpButton alloc] initWithFrame:NSMakeRect(50.0, 2, 140, 22.0)
--                                 pullsDown:NO];
--  PopUpButtonHandler* popUpButtonHandler =
--      [[PopUpButtonHandler alloc] initWithPanel:dialog
--                                   andTypesList:file_types_list];
--  [popupButton addItemsWithTitles:filter_names];
--  [popupButton setTarget:popUpButtonHandler];
--  [popupButton setAction:@selector(selectFormat:)];
--
--  [accessoryView addSubview:[label autorelease]];
--  [accessoryView addSubview:[popupButton autorelease]];
--
--  [dialog setAccessoryView:[accessoryView autorelease]];
--}
--
--void SetupDialog(NSSavePanel* dialog, const DialogSettings& settings) {
--  if (!settings.title.empty())
--    [dialog setTitle:base::SysUTF8ToNSString(settings.title)];
--
--  if (!settings.button_label.empty())
--    [dialog setPrompt:base::SysUTF8ToNSString(settings.button_label)];
--
--  if (!settings.message.empty())
--    [dialog setMessage:base::SysUTF8ToNSString(settings.message)];
--
--  if (!settings.name_field_label.empty())
--    [dialog
--        setNameFieldLabel:base::SysUTF8ToNSString(settings.name_field_label)];
--
--  [dialog setShowsTagField:settings.shows_tag_field];
--
--  NSString* default_dir = nil;
--  NSString* default_filename = nil;
--  if (!settings.default_path.empty()) {
--    base::ThreadRestrictions::ScopedAllowIO allow_io;
--    if (base::DirectoryExists(settings.default_path)) {
--      default_dir = base::SysUTF8ToNSString(settings.default_path.value());
--    } else {
--      if (settings.default_path.IsAbsolute()) {
--        default_dir =
--            base::SysUTF8ToNSString(settings.default_path.DirName().value());
--      }
--
--      default_filename =
--          base::SysUTF8ToNSString(settings.default_path.BaseName().value());
--    }
--  }
--
--  if (settings.filters.empty()) {
--    [dialog setAllowsOtherFileTypes:YES];
--  } else {
--    // Set setAllowedFileTypes before setNameFieldStringValue as it might
--    // override the extension set using setNameFieldStringValue
--    SetAllowedFileTypes(dialog, settings.filters);
--  }
--
--  // Make sure the extension is always visible. Without this, the extension in
--  // the default filename will not be used in the saved file.
--  [dialog setExtensionHidden:NO];
--
--  if (default_dir)
--    [dialog setDirectoryURL:[NSURL fileURLWithPath:default_dir]];
--  if (default_filename)
--    [dialog setNameFieldStringValue:default_filename];
--}
--
--void SetupDialogForProperties(NSOpenPanel* dialog, int properties) {
--  [dialog setCanChooseFiles:(properties & FILE_DIALOG_OPEN_FILE)];
--  if (properties & FILE_DIALOG_OPEN_DIRECTORY)
--    [dialog setCanChooseDirectories:YES];
--  if (properties & FILE_DIALOG_CREATE_DIRECTORY)
--    [dialog setCanCreateDirectories:YES];
--  if (properties & FILE_DIALOG_MULTI_SELECTIONS)
--    [dialog setAllowsMultipleSelection:YES];
--  if (properties & FILE_DIALOG_SHOW_HIDDEN_FILES)
--    [dialog setShowsHiddenFiles:YES];
--  if (properties & FILE_DIALOG_NO_RESOLVE_ALIASES)
--    [dialog setResolvesAliases:NO];
--  if (properties & FILE_DIALOG_TREAT_PACKAGE_APP_AS_DIRECTORY)
--    [dialog setTreatsFilePackagesAsDirectories:YES];
--}
--
--// Run modal dialog with parent window and return user's choice.
--int RunModalDialog(NSSavePanel* dialog, const DialogSettings& settings) {
--  __block int chosen = NSFileHandlingPanelCancelButton;
--  if (!settings.parent_window || !settings.parent_window->GetNativeWindow() ||
--      settings.force_detached) {
--    chosen = [dialog runModal];
--  } else {
--    NSWindow* window = settings.parent_window->GetNativeWindow();
--
--    [dialog beginSheetModalForWindow:window
--                   completionHandler:^(NSInteger c) {
--                     chosen = c;
--                     [NSApp stopModal];
--                   }];
--    [NSApp runModalForWindow:window];
--  }
--
--  return chosen;
--}
--
--// Create bookmark data and serialise it into a base64 string.
--std::string GetBookmarkDataFromNSURL(NSURL* url) {
--  // Create the file if it doesn't exist (necessary for NSSavePanel options).
--  NSFileManager* defaultManager = [NSFileManager defaultManager];
--  if (![defaultManager fileExistsAtPath:[url path]]) {
--    [defaultManager createFileAtPath:[url path] contents:nil attributes:nil];
--  }
--
--  NSError* error = nil;
--  NSData* bookmarkData =
--      [url bookmarkDataWithOptions:NSURLBookmarkCreationWithSecurityScope
--          includingResourceValuesForKeys:nil
--                           relativeToURL:nil
--                                   error:&error];
--  if (error != nil) {
--    // Send back an empty string if there was an error.
--    return "";
--  } else {
--    // Encode NSData in base64 then convert to NSString.
--    NSString* base64data = [[NSString alloc]
--        initWithData:[bookmarkData base64EncodedDataWithOptions:0]
--            encoding:NSUTF8StringEncoding];
--    return base::SysNSStringToUTF8(base64data);
--  }
--}
--
--void ReadDialogPathsWithBookmarks(NSOpenPanel* dialog,
--                                  std::vector<base::FilePath>* paths,
--                                  std::vector<std::string>* bookmarks) {
--  NSArray* urls = [dialog URLs];
--  for (NSURL* url in urls)
--    if ([url isFileURL]) {
--      paths->push_back(base::FilePath(base::SysNSStringToUTF8([url path])));
--      bookmarks->push_back(GetBookmarkDataFromNSURL(url));
--    }
--}
--
--void ReadDialogPaths(NSOpenPanel* dialog, std::vector<base::FilePath>* paths) {
--  std::vector<std::string> ignored_bookmarks;
--  ReadDialogPathsWithBookmarks(dialog, paths, &ignored_bookmarks);
--}
--
--}  // namespace
--
--bool ShowOpenDialog(const DialogSettings& settings,
--                    std::vector<base::FilePath>* paths) {
--  DCHECK(paths);
--  NSOpenPanel* dialog = [NSOpenPanel openPanel];
--
--  SetupDialog(dialog, settings);
--  SetupDialogForProperties(dialog, settings.properties);
--
--  int chosen = RunModalDialog(dialog, settings);
--  if (chosen == NSFileHandlingPanelCancelButton)
--    return false;
--
--  ReadDialogPaths(dialog, paths);
--  return true;
--}
--
--void OpenDialogCompletion(int chosen,
--                          NSOpenPanel* dialog,
--                          const DialogSettings& settings,
--                          const OpenDialogCallback& callback) {
--  if (chosen == NSFileHandlingPanelCancelButton) {
--#if defined(MAS_BUILD)
--    callback.Run(false, std::vector<base::FilePath>(),
--                 std::vector<std::string>());
--#else
--    callback.Run(false, std::vector<base::FilePath>());
--#endif
--  } else {
--    std::vector<base::FilePath> paths;
--#if defined(MAS_BUILD)
--    std::vector<std::string> bookmarks;
--    if (settings.security_scoped_bookmarks) {
--      ReadDialogPathsWithBookmarks(dialog, &paths, &bookmarks);
--    } else {
--      ReadDialogPaths(dialog, &paths);
--    }
--    callback.Run(true, paths, bookmarks);
--#else
--    ReadDialogPaths(dialog, &paths);
--    callback.Run(true, paths);
--#endif
--  }
--}
--
--void ShowOpenDialog(const DialogSettings& settings,
--                    const OpenDialogCallback& c) {
--  NSOpenPanel* dialog = [NSOpenPanel openPanel];
--
--  SetupDialog(dialog, settings);
--  SetupDialogForProperties(dialog, settings.properties);
--
--  // Duplicate the callback object here since c is a reference and gcd would
--  // only store the pointer, by duplication we can force gcd to store a copy.
--  __block OpenDialogCallback callback = c;
--
--  if (!settings.parent_window || !settings.parent_window->GetNativeWindow() ||
--      settings.force_detached) {
--    [dialog beginWithCompletionHandler:^(NSInteger chosen) {
--      OpenDialogCompletion(chosen, dialog, settings, callback);
--    }];
--  } else {
--    NSWindow* window = settings.parent_window->GetNativeWindow();
--    [dialog beginSheetModalForWindow:window
--                   completionHandler:^(NSInteger chosen) {
--                     OpenDialogCompletion(chosen, dialog, settings, callback);
--                   }];
--  }
--}
--
--bool ShowSaveDialog(const DialogSettings& settings, base::FilePath* path) {
--  DCHECK(path);
--  NSSavePanel* dialog = [NSSavePanel savePanel];
--
--  SetupDialog(dialog, settings);
--
--  int chosen = RunModalDialog(dialog, settings);
--  if (chosen == NSFileHandlingPanelCancelButton || ![[dialog URL] isFileURL])
--    return false;
--
--  *path = base::FilePath(base::SysNSStringToUTF8([[dialog URL] path]));
--  return true;
--}
--
--void SaveDialogCompletion(int chosen,
--                          NSSavePanel* dialog,
--                          const DialogSettings& settings,
--                          const SaveDialogCallback& callback) {
--  if (chosen == NSFileHandlingPanelCancelButton) {
--#if defined(MAS_BUILD)
--    callback.Run(false, base::FilePath(), "");
--#else
--    callback.Run(false, base::FilePath());
--#endif
--  } else {
--    std::string path = base::SysNSStringToUTF8([[dialog URL] path]);
--#if defined(MAS_BUILD)
--    std::string bookmark;
--    if (settings.security_scoped_bookmarks) {
--      bookmark = GetBookmarkDataFromNSURL([dialog URL]);
--    }
--    callback.Run(true, base::FilePath(path), bookmark);
--#else
--    callback.Run(true, base::FilePath(path));
--#endif
--  }
--}
--
--void ShowSaveDialog(const DialogSettings& settings,
--                    const SaveDialogCallback& c) {
--  NSSavePanel* dialog = [NSSavePanel savePanel];
--
--  SetupDialog(dialog, settings);
--  [dialog setCanSelectHiddenExtension:YES];
--
--  __block SaveDialogCallback callback = c;
--
--  if (!settings.parent_window || !settings.parent_window->GetNativeWindow() ||
--      settings.force_detached) {
--    [dialog beginWithCompletionHandler:^(NSInteger chosen) {
--      SaveDialogCompletion(chosen, dialog, settings, callback);
--    }];
--  } else {
--    NSWindow* window = settings.parent_window->GetNativeWindow();
--    [dialog beginSheetModalForWindow:window
--                   completionHandler:^(NSInteger chosen) {
--                     SaveDialogCompletion(chosen, dialog, settings, callback);
--                   }];
--  }
--}
--
--}  // namespace file_dialog
-removed in remote
-  base   100644 6577e4c08404becdc01ef319649efefc0f7dc671 atom/browser/ui/file_dialog_win.cc
-  our    100644 dab125ec881bc75ff608dbbfddff972169049e54 atom/browser/ui/file_dialog_win.cc
-@@ -1,310 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/ui/file_dialog.h"
--
--#include <windows.h>  // windows.h must be included first
--
--#include <atlbase.h>  // atlbase.h for CComPtr
--
--#include <shlobj.h>
--#include <shobjidl.h>
--
--#include "atom/browser/native_window_views.h"
--#include "atom/browser/unresponsive_suppressor.h"
--#include "base/files/file_util.h"
--#include "base/i18n/case_conversion.h"
--#include "base/strings/string_split.h"
--#include "base/strings/string_util.h"
--#include "base/strings/utf_string_conversions.h"
--#include "base/threading/thread.h"
--#include "base/threading/thread_task_runner_handle.h"
--#include "base/win/registry.h"
--
--namespace file_dialog {
--
--DialogSettings::DialogSettings() = default;
--DialogSettings::DialogSettings(const DialogSettings&) = default;
--DialogSettings::~DialogSettings() = default;
--
--namespace {
--
--// Distinguish directories from regular files.
--bool IsDirectory(const base::FilePath& path) {
--  base::File::Info file_info;
--  return base::GetFileInfo(path, &file_info) ? file_info.is_directory
--                                             : path.EndsWithSeparator();
--}
--
--void ConvertFilters(const Filters& filters,
--                    std::vector<std::wstring>* buffer,
--                    std::vector<COMDLG_FILTERSPEC>* filterspec) {
--  if (filters.empty()) {
--    COMDLG_FILTERSPEC spec = {L"All Files (*.*)", L"*.*"};
--    filterspec->push_back(spec);
--    return;
--  }
--
--  buffer->reserve(filters.size() * 2);
--  for (size_t i = 0; i < filters.size(); ++i) {
--    const Filter& filter = filters[i];
--
--    COMDLG_FILTERSPEC spec;
--    buffer->push_back(base::UTF8ToWide(filter.first));
--    spec.pszName = buffer->back().c_str();
--
--    std::vector<std::string> extensions(filter.second);
--    for (size_t j = 0; j < extensions.size(); ++j)
--      extensions[j].insert(0, "*.");
--    buffer->push_back(base::UTF8ToWide(base::JoinString(extensions, ";")));
--    spec.pszSpec = buffer->back().c_str();
--
--    filterspec->push_back(spec);
--  }
--}
--
--struct RunState {
--  base::Thread* dialog_thread;
--  scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner;
--};
--
--bool CreateDialogThread(RunState* run_state) {
--  auto thread =
--      std::make_unique<base::Thread>(ATOM_PRODUCT_NAME "FileDialogThread");
--  thread->init_com_with_mta(false);
--  if (!thread->Start())
--    return false;
--
--  run_state->dialog_thread = thread.release();
--  run_state->ui_task_runner = base::ThreadTaskRunnerHandle::Get();
--  return true;
--}
--
--void RunOpenDialogInNewThread(const RunState& run_state,
--                              const DialogSettings& settings,
--                              const OpenDialogCallback& callback) {
--  std::vector<base::FilePath> paths;
--  bool result = ShowOpenDialog(settings, &paths);
--  run_state.ui_task_runner->PostTask(FROM_HERE,
--                                     base::Bind(callback, result, paths));
--  run_state.ui_task_runner->DeleteSoon(FROM_HERE, run_state.dialog_thread);
--}
--
--void RunSaveDialogInNewThread(const RunState& run_state,
--                              const DialogSettings& settings,
--                              const SaveDialogCallback& callback) {
--  base::FilePath path;
--  bool result = ShowSaveDialog(settings, &path);
--  run_state.ui_task_runner->PostTask(FROM_HERE,
--                                     base::Bind(callback, result, path));
--  run_state.ui_task_runner->DeleteSoon(FROM_HERE, run_state.dialog_thread);
--}
--
--}  // namespace
--
--static HRESULT GetFileNameFromShellItem(IShellItem* pShellItem,
--                                        SIGDN type,
--                                        LPWSTR lpstr,
--                                        size_t cchLength) {
--  assert(pShellItem != NULL);
--
--  LPWSTR lpstrName = NULL;
--  HRESULT hRet = pShellItem->GetDisplayName(type, &lpstrName);
--
--  if (SUCCEEDED(hRet)) {
--    if (wcslen(lpstrName) < cchLength) {
--      wcscpy_s(lpstr, cchLength, lpstrName);
--    } else {
--      NOTREACHED();
--      hRet = DISP_E_BUFFERTOOSMALL;
--    }
--
--    ::CoTaskMemFree(lpstrName);
--  }
--
--  return hRet;
--}
--
--static void SetDefaultFolder(IFileDialog* dialog,
--                             const base::FilePath file_path) {
--  std::wstring directory =
--      IsDirectory(file_path) ? file_path.value() : file_path.DirName().value();
--
--  ATL::CComPtr<IShellItem> folder_item;
--  HRESULT hr = SHCreateItemFromParsingName(directory.c_str(), NULL,
--                                           IID_PPV_ARGS(&folder_item));
--  if (SUCCEEDED(hr))
--    dialog->SetFolder(folder_item);
--}
--
--static HRESULT ShowFileDialog(IFileDialog* dialog,
--                              const DialogSettings& settings) {
--  atom::UnresponsiveSuppressor suppressor;
--  HWND parent_window =
--      settings.parent_window
--          ? static_cast<atom::NativeWindowViews*>(settings.parent_window)
--                ->GetAcceleratedWidget()
--          : NULL;
--
--  return dialog->Show(parent_window);
--}
--
--static void ApplySettings(IFileDialog* dialog,
--                          const DialogSettings& settings) {
--  std::wstring file_part;
--
--  if (!IsDirectory(settings.default_path))
--    file_part = settings.default_path.BaseName().value();
--
--  dialog->SetFileName(file_part.c_str());
--
--  if (!settings.title.empty())
--    dialog->SetTitle(base::UTF8ToUTF16(settings.title).c_str());
--
--  if (!settings.button_label.empty())
--    dialog->SetOkButtonLabel(base::UTF8ToUTF16(settings.button_label).c_str());
--
--  std::vector<std::wstring> buffer;
--  std::vector<COMDLG_FILTERSPEC> filterspec;
--  ConvertFilters(settings.filters, &buffer, &filterspec);
--
--  if (!filterspec.empty()) {
--    dialog->SetFileTypes(filterspec.size(), filterspec.data());
--  }
--
--  // By default, *.* will be added to the file name if file type is "*.*". In
--  // Electron, we disable it to make a better experience.
--  //
--  // From MSDN: https://msdn.microsoft.com/en-us/library/windows/desktop/
--  // bb775970(v=vs.85).aspx
--  //
--  // If SetDefaultExtension is not called, the dialog will not update
--  // automatically when user choose a new file type in the file dialog.
--  //
--  // We set file extension to the first none-wildcard extension to make
--  // sure the dialog will update file extension automatically.
--  for (size_t i = 0; i < filterspec.size(); ++i) {
--    if (std::wstring(filterspec[i].pszSpec) != L"*.*") {
--      // SetFileTypeIndex is regarded as one-based index.
--      dialog->SetFileTypeIndex(i + 1);
--      dialog->SetDefaultExtension(filterspec[i].pszSpec);
--      break;
--    }
--  }
--
--  if (settings.default_path.IsAbsolute()) {
--    SetDefaultFolder(dialog, settings.default_path);
--  }
--}
--
--bool ShowOpenDialog(const DialogSettings& settings,
--                    std::vector<base::FilePath>* paths) {
--  ATL::CComPtr<IFileOpenDialog> file_open_dialog;
--  HRESULT hr = file_open_dialog.CoCreateInstance(CLSID_FileOpenDialog);
--
--  if (FAILED(hr))
--    return false;
--
--  DWORD options = FOS_FORCEFILESYSTEM | FOS_FILEMUSTEXIST;
--  if (settings.properties & FILE_DIALOG_OPEN_DIRECTORY)
--    options |= FOS_PICKFOLDERS;
--  if (settings.properties & FILE_DIALOG_MULTI_SELECTIONS)
--    options |= FOS_ALLOWMULTISELECT;
--  if (settings.properties & FILE_DIALOG_SHOW_HIDDEN_FILES)
--    options |= FOS_FORCESHOWHIDDEN;
--  if (settings.properties & FILE_DIALOG_PROMPT_TO_CREATE)
--    options |= FOS_CREATEPROMPT;
--  file_open_dialog->SetOptions(options);
--
--  ApplySettings(file_open_dialog, settings);
--  hr = ShowFileDialog(file_open_dialog, settings);
--  if (FAILED(hr))
--    return false;
--
--  ATL::CComPtr<IShellItemArray> items;
--  hr = file_open_dialog->GetResults(&items);
--  if (FAILED(hr))
--    return false;
--
--  ATL::CComPtr<IShellItem> item;
--  DWORD count = 0;
--  hr = items->GetCount(&count);
--  if (FAILED(hr))
--    return false;
--
--  paths->reserve(count);
--  for (DWORD i = 0; i < count; ++i) {
--    hr = items->GetItemAt(i, &item);
--    if (FAILED(hr))
--      return false;
--
--    wchar_t file_name[MAX_PATH];
--    hr = GetFileNameFromShellItem(item, SIGDN_FILESYSPATH, file_name, MAX_PATH);
--
--    if (FAILED(hr))
--      return false;
--
--    paths->push_back(base::FilePath(file_name));
--  }
--
--  return true;
--}
--
--void ShowOpenDialog(const DialogSettings& settings,
--                    const OpenDialogCallback& callback) {
--  RunState run_state;
--  if (!CreateDialogThread(&run_state)) {
--    callback.Run(false, std::vector<base::FilePath>());
--    return;
--  }
--
--  run_state.dialog_thread->task_runner()->PostTask(
--      FROM_HERE,
--      base::Bind(&RunOpenDialogInNewThread, run_state, settings, callback));
--}
--
--bool ShowSaveDialog(const DialogSettings& settings, base::FilePath* path) {
--  ATL::CComPtr<IFileSaveDialog> file_save_dialog;
--  HRESULT hr = file_save_dialog.CoCreateInstance(CLSID_FileSaveDialog);
--  if (FAILED(hr))
--    return false;
--
--  file_save_dialog->SetOptions(FOS_FORCEFILESYSTEM | FOS_PATHMUSTEXIST |
--                        FOS_OVERWRITEPROMPT);
--  ApplySettings(file_save_dialog, settings);
--  hr = ShowFileDialog(file_save_dialog, settings);
--
--  if (FAILED(hr))
--    return false;
--
--  CComPtr<IShellItem> pItem;
--  hr = file_save_dialog->GetResult(&pItem);
--  if (FAILED(hr))
--    return false;
--
--  PWSTR result_path = nullptr;
--  hr = pItem->GetDisplayName(SIGDN_FILESYSPATH, &result_path);
--  if (!SUCCEEDED(hr))
--    return false;
--
--  *path = base::FilePath(result_path);
--  CoTaskMemFree(result_path);
--
--  return true;
--}
--
--void ShowSaveDialog(const DialogSettings& settings,
--                    const SaveDialogCallback& callback) {
--  RunState run_state;
--  if (!CreateDialogThread(&run_state)) {
--    callback.Run(false, base::FilePath());
--    return;
--  }
--
--  run_state.dialog_thread->task_runner()->PostTask(
--      FROM_HERE,
--      base::Bind(&RunSaveDialogInNewThread, run_state, settings, callback));
--}
--
--}  // namespace file_dialog
-removed in remote
-  base   100644 d2eb70bcd938904d6ab6cfd63755d166c8c2b1ff atom/browser/ui/message_box.h
-  our    100644 a00f1e1978fd2bb5b3d47bcfbbb1c37bbf15f997 atom/browser/ui/message_box.h
-@@ -1,69 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_UI_MESSAGE_BOX_H_
--#define ATOM_BROWSER_UI_MESSAGE_BOX_H_
--
--#include <string>
--#include <vector>
--
--#include "base/callback_forward.h"
--#include "base/strings/string16.h"
--
--namespace gfx {
--class ImageSkia;
--}
--
--namespace atom {
--
--class NativeWindow;
--
--enum MessageBoxType {
--  MESSAGE_BOX_TYPE_NONE = 0,
--  MESSAGE_BOX_TYPE_INFORMATION,
--  MESSAGE_BOX_TYPE_WARNING,
--  MESSAGE_BOX_TYPE_ERROR,
--  MESSAGE_BOX_TYPE_QUESTION,
--};
--
--enum MessageBoxOptions {
--  MESSAGE_BOX_NONE = 0,
--  MESSAGE_BOX_NO_LINK = 1 << 0,
--};
--
--typedef base::Callback<void(int code, bool checkbox_checked)>
--    MessageBoxCallback;
--
--int ShowMessageBox(NativeWindow* parent_window,
--                   MessageBoxType type,
--                   const std::vector<std::string>& buttons,
--                   int default_id,
--                   int cancel_id,
--                   int options,
--                   const std::string& title,
--                   const std::string& message,
--                   const std::string& detail,
--                   const gfx::ImageSkia& icon);
--
--void ShowMessageBox(NativeWindow* parent_window,
--                    MessageBoxType type,
--                    const std::vector<std::string>& buttons,
--                    int default_id,
--                    int cancel_id,
--                    int options,
--                    const std::string& title,
--                    const std::string& message,
--                    const std::string& detail,
--                    const std::string& checkbox_label,
--                    bool checkbox_checked,
--                    const gfx::ImageSkia& icon,
--                    const MessageBoxCallback& callback);
--
--// Like ShowMessageBox with simplest settings, but safe to call at very early
--// stage of application.
--void ShowErrorBox(const base::string16& title, const base::string16& content);
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_UI_MESSAGE_BOX_H_
-removed in remote
-  base   100644 9615e958b27574e5f8858752525848079860ba19 atom/browser/ui/message_box_gtk.cc
-  our    100644 1a5e4587de92f1e681318f773fc2e6f13de5249d atom/browser/ui/message_box_gtk.cc
-@@ -1,237 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/ui/message_box.h"
--
--#include <glib/gi18n.h>
--
--#include "atom/browser/browser.h"
--#include "atom/browser/native_window_observer.h"
--#include "atom/browser/native_window_views.h"
--#include "atom/browser/unresponsive_suppressor.h"
--#include "base/callback.h"
--#include "base/strings/string_util.h"
--#include "base/strings/utf_string_conversions.h"
--#include "chrome/browser/ui/libgtkui/gtk_signal.h"
--#include "chrome/browser/ui/libgtkui/gtk_util.h"
--#include "chrome/browser/ui/libgtkui/skia_utils_gtk.h"
--#include "ui/gfx/image/image_skia.h"
--#include "ui/views/widget/desktop_aura/x11_desktop_handler.h"
--
--#define ANSI_FOREGROUND_RED "\x1b[31m"
--#define ANSI_FOREGROUND_BLACK "\x1b[30m"
--#define ANSI_TEXT_BOLD "\x1b[1m"
--#define ANSI_BACKGROUND_GRAY "\x1b[47m"
--#define ANSI_RESET "\x1b[0m"
--
--namespace atom {
--
--namespace {
--
--class GtkMessageBox : public NativeWindowObserver {
-- public:
--  GtkMessageBox(NativeWindow* parent_window,
--                MessageBoxType type,
--                const std::vector<std::string>& buttons,
--                int default_id,
--                int cancel_id,
--                const std::string& title,
--                const std::string& message,
--                const std::string& detail,
--                const std::string& checkbox_label,
--                bool checkbox_checked)
--      : cancel_id_(cancel_id),
--        parent_(static_cast<NativeWindow*>(parent_window)) {
--    // Create dialog.
--    dialog_ =
--        gtk_message_dialog_new(nullptr,                         // parent
--                               static_cast<GtkDialogFlags>(0),  // no flags
--                               GetMessageType(type),            // type
--                               GTK_BUTTONS_NONE,                // no buttons
--                               "%s", message.c_str());
--    if (!detail.empty())
--      gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog_),
--                                               "%s", detail.c_str());
--    if (!title.empty())
--      gtk_window_set_title(GTK_WINDOW(dialog_), title.c_str());
--
--    if (!checkbox_label.empty()) {
--      GtkWidget* message_area =
--          gtk_message_dialog_get_message_area(GTK_MESSAGE_DIALOG(dialog_));
--      GtkWidget* check_button =
--          gtk_check_button_new_with_label(checkbox_label.c_str());
--      g_signal_connect(check_button, "toggled",
--                       G_CALLBACK(OnCheckboxToggledThunk), this);
--      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_button),
--                                   checkbox_checked);
--      gtk_container_add(GTK_CONTAINER(message_area), check_button);
--    }
--
--    // Add buttons.
--    for (size_t i = 0; i < buttons.size(); ++i) {
--      GtkWidget* button = gtk_dialog_add_button(
--          GTK_DIALOG(dialog_), TranslateToStock(i, buttons[i]), i);
--      if (static_cast<int>(i) == default_id)
--        gtk_widget_grab_focus(button);
--    }
--
--    // Parent window.
--    if (parent_) {
--      parent_->AddObserver(this);
--      static_cast<NativeWindowViews*>(parent_)->SetEnabled(false);
--      libgtkui::SetGtkTransientForAura(dialog_, parent_->GetNativeWindow());
--      gtk_window_set_modal(GTK_WINDOW(dialog_), TRUE);
--    }
--  }
--
--  ~GtkMessageBox() override {
--    gtk_widget_destroy(dialog_);
--    if (parent_) {
--      parent_->RemoveObserver(this);
--      static_cast<NativeWindowViews*>(parent_)->SetEnabled(true);
--    }
--  }
--
--  GtkMessageType GetMessageType(MessageBoxType type) {
--    switch (type) {
--      case MESSAGE_BOX_TYPE_INFORMATION:
--        return GTK_MESSAGE_INFO;
--      case MESSAGE_BOX_TYPE_WARNING:
--        return GTK_MESSAGE_WARNING;
--      case MESSAGE_BOX_TYPE_QUESTION:
--        return GTK_MESSAGE_QUESTION;
--      case MESSAGE_BOX_TYPE_ERROR:
--        return GTK_MESSAGE_ERROR;
--      default:
--        return GTK_MESSAGE_OTHER;
--    }
--  }
--
--  const char* TranslateToStock(int id, const std::string& text) {
--    const std::string lower = base::ToLowerASCII(text);
--    if (lower == "cancel")
--      return _("_Cancel");
--    if (lower == "no")
--      return _("_No");
--    if (lower == "ok")
--      return _("_OK");
--    if (lower == "yes")
--      return _("_Yes");
--    return text.c_str();
--  }
--
--  void Show() {
--    gtk_widget_show_all(dialog_);
--    // We need to call gtk_window_present after making the widgets visible to
--    // make sure window gets correctly raised and gets focus.
--    int time = ui::X11EventSource::GetInstance()->GetTimestamp();
--    gtk_window_present_with_time(GTK_WINDOW(dialog_), time);
--  }
--
--  int RunSynchronous() {
--    Show();
--    int response = gtk_dialog_run(GTK_DIALOG(dialog_));
--    if (response < 0)
--      return cancel_id_;
--    else
--      return response;
--  }
--
--  void RunAsynchronous(const MessageBoxCallback& callback) {
--    callback_ = callback;
--    g_signal_connect(dialog_, "delete-event",
--                     G_CALLBACK(gtk_widget_hide_on_delete), nullptr);
--    g_signal_connect(dialog_, "response", G_CALLBACK(OnResponseDialogThunk),
--                     this);
--    Show();
--  }
--
--  void OnWindowClosed() override {
--    parent_->RemoveObserver(this);
--    parent_ = nullptr;
--  }
--
--  CHROMEGTK_CALLBACK_1(GtkMessageBox, void, OnResponseDialog, int);
--  CHROMEGTK_CALLBACK_0(GtkMessageBox, void, OnCheckboxToggled);
--
-- private:
--  atom::UnresponsiveSuppressor unresponsive_suppressor_;
--
--  // The id to return when the dialog is closed without pressing buttons.
--  int cancel_id_ = 0;
--
--  bool checkbox_checked_ = false;
--
--  NativeWindow* parent_;
--  GtkWidget* dialog_;
--  MessageBoxCallback callback_;
--
--  DISALLOW_COPY_AND_ASSIGN(GtkMessageBox);
--};
--
--void GtkMessageBox::OnResponseDialog(GtkWidget* widget, int response) {
--  gtk_widget_hide(dialog_);
--
--  if (response < 0)
--    callback_.Run(cancel_id_, checkbox_checked_);
--  else
--    callback_.Run(response, checkbox_checked_);
--  delete this;
--}
--
--void GtkMessageBox::OnCheckboxToggled(GtkWidget* widget) {
--  checkbox_checked_ = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
--}
--
--}  // namespace
--
--int ShowMessageBox(NativeWindow* parent,
--                   MessageBoxType type,
--                   const std::vector<std::string>& buttons,
--                   int default_id,
--                   int cancel_id,
--                   int options,
--                   const std::string& title,
--                   const std::string& message,
--                   const std::string& detail,
--                   const gfx::ImageSkia& /*icon*/) {
--  return GtkMessageBox(parent, type, buttons, default_id, cancel_id, title,
--                       message, detail, "", false)
--      .RunSynchronous();
--}
--
--void ShowMessageBox(NativeWindow* parent,
--                    MessageBoxType type,
--                    const std::vector<std::string>& buttons,
--                    int default_id,
--                    int cancel_id,
--                    int options,
--                    const std::string& title,
--                    const std::string& message,
--                    const std::string& detail,
--                    const std::string& checkbox_label,
--                    bool checkbox_checked,
--                    const gfx::ImageSkia& /*icon*/,
--                    const MessageBoxCallback& callback) {
--  (new GtkMessageBox(parent, type, buttons, default_id, cancel_id, title,
--                     message, detail, checkbox_label, checkbox_checked))
--      ->RunAsynchronous(callback);
--}
--
--void ShowErrorBox(const base::string16& title, const base::string16& content) {
--  if (Browser::Get()->is_ready()) {
--    GtkMessageBox(nullptr, MESSAGE_BOX_TYPE_ERROR, {"OK"}, -1, 0, "Error",
--                  base::UTF16ToUTF8(title).c_str(),
--                  base::UTF16ToUTF8(content).c_str(), "", false)
--        .RunSynchronous();
--  } else {
--    fprintf(stderr,
--            ANSI_TEXT_BOLD ANSI_BACKGROUND_GRAY ANSI_FOREGROUND_RED
--            "%s\n" ANSI_FOREGROUND_BLACK "%s" ANSI_RESET "\n",
--            base::UTF16ToUTF8(title).c_str(),
--            base::UTF16ToUTF8(content).c_str());
--  }
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 d553a6a7dfbf79a9bdafcb1d83e2d058e6983118 atom/browser/ui/message_box_mac.mm
-  our    100644 ee2f59dc8c84ba0bf5fe049a133f403d550a9473 atom/browser/ui/message_box_mac.mm
-@@ -1,214 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/ui/message_box.h"
--
--#import <Cocoa/Cocoa.h>
--
--#include "atom/browser/native_window.h"
--#include "base/callback.h"
--#include "base/mac/mac_util.h"
--#include "base/strings/sys_string_conversions.h"
--#include "skia/ext/skia_utils_mac.h"
--#include "ui/gfx/image/image_skia.h"
--
--@interface ModalDelegate : NSObject {
-- @private
--  atom::MessageBoxCallback callback_;
--  NSAlert* alert_;
--  bool callEndModal_;
--}
--- (id)initWithCallback:(const atom::MessageBoxCallback&)callback
--              andAlert:(NSAlert*)alert
--          callEndModal:(bool)flag;
--@end
--
--@implementation ModalDelegate
--
--- (id)initWithCallback:(const atom::MessageBoxCallback&)callback
--              andAlert:(NSAlert*)alert
--          callEndModal:(bool)flag {
--  if ((self = [super init])) {
--    callback_ = callback;
--    alert_ = alert;
--    callEndModal_ = flag;
--  }
--  return self;
--}
--
--- (void)alertDidEnd:(NSAlert*)alert
--         returnCode:(NSInteger)returnCode
--        contextInfo:(void*)contextInfo {
--  callback_.Run(returnCode, alert.suppressionButton.state == NSOnState);
--  [alert_ release];
--  [self release];
--
--  if (callEndModal_)
--    [NSApp stopModal];
--}
--
--@end
--
--namespace atom {
--
--namespace {
--
--NSAlert* CreateNSAlert(NativeWindow* parent_window,
--                       MessageBoxType type,
--                       const std::vector<std::string>& buttons,
--                       int default_id,
--                       int cancel_id,
--                       const std::string& title,
--                       const std::string& message,
--                       const std::string& detail,
--                       const std::string& checkbox_label,
--                       bool checkbox_checked,
--                       const gfx::ImageSkia& icon) {
--  // Ignore the title; it's the window title on other platforms and ignorable.
--  NSAlert* alert = [[NSAlert alloc] init];
--  [alert setMessageText:base::SysUTF8ToNSString(message)];
--  [alert setInformativeText:base::SysUTF8ToNSString(detail)];
--
--  switch (type) {
--    case MESSAGE_BOX_TYPE_INFORMATION:
--      alert.alertStyle = NSInformationalAlertStyle;
--      break;
--    case MESSAGE_BOX_TYPE_WARNING:
--    case MESSAGE_BOX_TYPE_ERROR:
--      // NSWarningAlertStyle shows the app icon while NSCriticalAlertStyle
--      // shows a warning icon with an app icon badge. Since there is no
--      // error variant, lets just use NSCriticalAlertStyle.
--      alert.alertStyle = NSCriticalAlertStyle;
--      break;
--    default:
--      break;
--  }
--
--  for (size_t i = 0; i < buttons.size(); ++i) {
--    NSString* title = base::SysUTF8ToNSString(buttons[i]);
--    // An empty title causes crash on macOS.
--    if (buttons[i].empty())
--      title = @"(empty)";
--    NSButton* button = [alert addButtonWithTitle:title];
--    [button setTag:i];
--  }
--
--  NSArray* ns_buttons = [alert buttons];
--  int button_count = static_cast<int>([ns_buttons count]);
--
--  if (default_id >= 0 && default_id < button_count) {
--    // Focus the button at default_id if the user opted to do so.
--    // The first button added gets set as the default selected.
--    // So remove that default, and make the requested button the default.
--    [[ns_buttons objectAtIndex:0] setKeyEquivalent:@""];
--    [[ns_buttons objectAtIndex:default_id] setKeyEquivalent:@"\r"];
--  }
--
--  // Bind cancel id button to escape key if there is more than one button
--  if (button_count > 1 && cancel_id >= 0 && cancel_id < button_count) {
--    [[ns_buttons objectAtIndex:cancel_id] setKeyEquivalent:@"\e"];
--  }
--
--  if (!checkbox_label.empty()) {
--    alert.showsSuppressionButton = YES;
--    alert.suppressionButton.title = base::SysUTF8ToNSString(checkbox_label);
--    alert.suppressionButton.state = checkbox_checked ? NSOnState : NSOffState;
--  }
--
--  if (!icon.isNull()) {
--    NSImage* image = skia::SkBitmapToNSImageWithColorSpace(
--        *icon.bitmap(), base::mac::GetGenericRGBColorSpace());
--    [alert setIcon:image];
--  }
--
--  return alert;
--}
--
--void SetReturnCode(int* ret_code, int result, bool checkbox_checked) {
--  *ret_code = result;
--}
--
--}  // namespace
--
--int ShowMessageBox(NativeWindow* parent_window,
--                   MessageBoxType type,
--                   const std::vector<std::string>& buttons,
--                   int default_id,
--                   int cancel_id,
--                   int options,
--                   const std::string& title,
--                   const std::string& message,
--                   const std::string& detail,
--                   const gfx::ImageSkia& icon) {
--  NSAlert* alert =
--      CreateNSAlert(parent_window, type, buttons, default_id, cancel_id, title,
--                    message, detail, "", false, icon);
--
--  // Use runModal for synchronous alert without parent, since we don't have a
--  // window to wait for.
--  if (!parent_window)
--    return [[alert autorelease] runModal];
--
--  int ret_code = -1;
--  ModalDelegate* delegate = [[ModalDelegate alloc]
--      initWithCallback:base::Bind(&SetReturnCode, &ret_code)
--              andAlert:alert
--          callEndModal:true];
--
--  NSWindow* window = parent_window->GetNativeWindow();
--  [alert beginSheetModalForWindow:window
--                    modalDelegate:delegate
--                   didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:)
--                      contextInfo:nil];
--
--  [NSApp runModalForWindow:window];
--  return ret_code;
--}
--
--void ShowMessageBox(NativeWindow* parent_window,
--                    MessageBoxType type,
--                    const std::vector<std::string>& buttons,
--                    int default_id,
--                    int cancel_id,
--                    int options,
--                    const std::string& title,
--                    const std::string& message,
--                    const std::string& detail,
--                    const std::string& checkbox_label,
--                    bool checkbox_checked,
--                    const gfx::ImageSkia& icon,
--                    const MessageBoxCallback& callback) {
--  NSAlert* alert =
--      CreateNSAlert(parent_window, type, buttons, default_id, cancel_id, title,
--                    message, detail, checkbox_label, checkbox_checked, icon);
--
--  // Use runModal for synchronous alert without parent, since we don't have a
--  // window to wait for.
--  if (!parent_window) {
--    int ret = [[alert autorelease] runModal];
--    callback.Run(ret, alert.suppressionButton.state == NSOnState);
--  } else {
--    ModalDelegate* delegate = [[ModalDelegate alloc] initWithCallback:callback
--                                                             andAlert:alert
--                                                         callEndModal:false];
--
--    NSWindow* window = parent_window ? parent_window->GetNativeWindow() : nil;
--    [alert
--        beginSheetModalForWindow:window
--                   modalDelegate:delegate
--                  didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:)
--                     contextInfo:nil];
--  }
--}
--
--void ShowErrorBox(const base::string16& title, const base::string16& content) {
--  NSAlert* alert = [[NSAlert alloc] init];
--  [alert setMessageText:base::SysUTF16ToNSString(title)];
--  [alert setInformativeText:base::SysUTF16ToNSString(content)];
--  [alert setAlertStyle:NSCriticalAlertStyle];
--  [alert runModal];
--  [alert release];
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 5f49151c30ff01c153da174506ba411fa7f383cc atom/browser/ui/message_box_win.cc
-  our    100644 b0e73f550e1d3a91f15e8d2d0604518027f75298 atom/browser/ui/message_box_win.cc
-@@ -1,285 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/ui/message_box.h"
--
--#include <windows.h>  // windows.h must be included first
--
--#include <commctrl.h>
--
--#include <map>
--#include <vector>
--
--#include "atom/browser/browser.h"
--#include "atom/browser/native_window_views.h"
--#include "atom/browser/unresponsive_suppressor.h"
--#include "base/callback.h"
--#include "base/strings/string_util.h"
--#include "base/strings/utf_string_conversions.h"
--#include "base/threading/thread.h"
--#include "base/win/scoped_gdi_object.h"
--#include "content/public/browser/browser_thread.h"
--#include "ui/gfx/icon_util.h"
--#include "ui/gfx/image/image_skia.h"
--
--namespace atom {
--
--namespace {
--
--// Small command ID values are already taken by Windows, we have to start from
--// a large number to avoid conflicts with Windows.
--const int kIDStart = 100;
--
--// Get the common ID from button's name.
--struct CommonButtonID {
--  int button;
--  int id;
--};
--CommonButtonID GetCommonID(const base::string16& button) {
--  base::string16 lower = base::ToLowerASCII(button);
--  if (lower == L"ok")
--    return {TDCBF_OK_BUTTON, IDOK};
--  else if (lower == L"yes")
--    return {TDCBF_YES_BUTTON, IDYES};
--  else if (lower == L"no")
--    return {TDCBF_NO_BUTTON, IDNO};
--  else if (lower == L"cancel")
--    return {TDCBF_CANCEL_BUTTON, IDCANCEL};
--  else if (lower == L"retry")
--    return {TDCBF_RETRY_BUTTON, IDRETRY};
--  else if (lower == L"close")
--    return {TDCBF_CLOSE_BUTTON, IDCLOSE};
--  return {-1, -1};
--}
--
--// Determine whether the buttons are common buttons, if so map common ID
--// to button ID.
--void MapToCommonID(const std::vector<base::string16>& buttons,
--                   std::map<int, int>* id_map,
--                   TASKDIALOG_COMMON_BUTTON_FLAGS* button_flags,
--                   std::vector<TASKDIALOG_BUTTON>* dialog_buttons) {
--  for (size_t i = 0; i < buttons.size(); ++i) {
--    auto common = GetCommonID(buttons[i]);
--    if (common.button != -1) {
--      // It is a common button.
--      (*id_map)[common.id] = i;
--      (*button_flags) |= common.button;
--    } else {
--      // It is a custom button.
--      dialog_buttons->push_back(
--          {static_cast<int>(i + kIDStart), buttons[i].c_str()});
--    }
--  }
--}
--
--int ShowTaskDialogUTF16(NativeWindow* parent,
--                        MessageBoxType type,
--                        const std::vector<base::string16>& buttons,
--                        int default_id,
--                        int cancel_id,
--                        int options,
--                        const base::string16& title,
--                        const base::string16& message,
--                        const base::string16& detail,
--                        const base::string16& checkbox_label,
--                        bool* checkbox_checked,
--                        const gfx::ImageSkia& icon) {
--  TASKDIALOG_FLAGS flags =
--      TDF_SIZE_TO_CONTENT |           // Show all content.
--      TDF_ALLOW_DIALOG_CANCELLATION;  // Allow canceling the dialog.
--
--  TASKDIALOGCONFIG config = {0};
--  config.cbSize = sizeof(config);
--  config.hInstance = GetModuleHandle(NULL);
--  config.dwFlags = flags;
--
--  if (parent) {
--    config.hwndParent =
--        static_cast<atom::NativeWindowViews*>(parent)->GetAcceleratedWidget();
--  }
--
--  if (default_id > 0)
--    config.nDefaultButton = kIDStart + default_id;
--
--  // TaskDialogIndirect doesn't allow empty name, if we set empty title it
--  // will show "electron.exe" in title.
--  base::string16 app_name = base::UTF8ToUTF16(Browser::Get()->GetName());
--  if (title.empty())
--    config.pszWindowTitle = app_name.c_str();
--  else
--    config.pszWindowTitle = title.c_str();
--
--  base::win::ScopedHICON hicon;
--  if (!icon.isNull()) {
--    hicon = IconUtil::CreateHICONFromSkBitmap(*icon.bitmap());
--    config.dwFlags |= TDF_USE_HICON_MAIN;
--    config.hMainIcon = hicon.get();
--  } else {
--    // Show icon according to dialog's type.
--    switch (type) {
--      case MESSAGE_BOX_TYPE_INFORMATION:
--      case MESSAGE_BOX_TYPE_QUESTION:
--        config.pszMainIcon = TD_INFORMATION_ICON;
--        break;
--      case MESSAGE_BOX_TYPE_WARNING:
--        config.pszMainIcon = TD_WARNING_ICON;
--        break;
--      case MESSAGE_BOX_TYPE_ERROR:
--        config.pszMainIcon = TD_ERROR_ICON;
--        break;
--      case MESSAGE_BOX_TYPE_NONE:
--        break;
--    }
--  }
--
--  // If "detail" is empty then don't make message hilighted.
--  if (detail.empty()) {
--    config.pszContent = message.c_str();
--  } else {
--    config.pszMainInstruction = message.c_str();
--    config.pszContent = detail.c_str();
--  }
--
--  if (!checkbox_label.empty()) {
--    config.pszVerificationText = checkbox_label.c_str();
--
--    if (checkbox_checked && *checkbox_checked) {
--      config.dwFlags |= TDF_VERIFICATION_FLAG_CHECKED;
--    }
--  }
--
--  // Iterate through the buttons, put common buttons in dwCommonButtons
--  // and custom buttons in pButtons.
--  std::map<int, int> id_map;
--  std::vector<TASKDIALOG_BUTTON> dialog_buttons;
--  if (options & MESSAGE_BOX_NO_LINK) {
--    for (size_t i = 0; i < buttons.size(); ++i)
--      dialog_buttons.push_back(
--          {static_cast<int>(i + kIDStart), buttons[i].c_str()});
--  } else {
--    MapToCommonID(buttons, &id_map, &config.dwCommonButtons, &dialog_buttons);
--  }
--  if (dialog_buttons.size() > 0) {
--    config.pButtons = &dialog_buttons.front();
--    config.cButtons = dialog_buttons.size();
--    if (!(options & MESSAGE_BOX_NO_LINK))
--      config.dwFlags |= TDF_USE_COMMAND_LINKS;  // custom buttons as links.
--  }
--
--  int id = 0;
--  BOOL verificationFlagChecked = FALSE;
--  TaskDialogIndirect(&config, &id, nullptr, &verificationFlagChecked);
--  if (checkbox_checked) {
--    *checkbox_checked = verificationFlagChecked;
--  }
--
--  if (id_map.find(id) != id_map.end())  // common button.
--    return id_map[id];
--  else if (id >= kIDStart)  // custom button.
--    return id - kIDStart;
--  else
--    return cancel_id;
--}
--
--int ShowTaskDialogUTF8(NativeWindow* parent,
--                       MessageBoxType type,
--                       const std::vector<std::string>& buttons,
--                       int default_id,
--                       int cancel_id,
--                       int options,
--                       const std::string& title,
--                       const std::string& message,
--                       const std::string& detail,
--                       const std::string& checkbox_label,
--                       bool* checkbox_checked,
--                       const gfx::ImageSkia& icon) {
--  std::vector<base::string16> utf16_buttons;
--  for (const auto& button : buttons)
--    utf16_buttons.push_back(base::UTF8ToUTF16(button));
--
--  return ShowTaskDialogUTF16(
--      parent, type, utf16_buttons, default_id, cancel_id, options,
--      base::UTF8ToUTF16(title), base::UTF8ToUTF16(message),
--      base::UTF8ToUTF16(detail), base::UTF8ToUTF16(checkbox_label),
--      checkbox_checked, icon);
--}
--
--void RunMessageBoxInNewThread(base::Thread* thread,
--                              NativeWindow* parent,
--                              MessageBoxType type,
--                              const std::vector<std::string>& buttons,
--                              int default_id,
--                              int cancel_id,
--                              int options,
--                              const std::string& title,
--                              const std::string& message,
--                              const std::string& detail,
--                              const std::string& checkbox_label,
--                              bool checkbox_checked,
--                              const gfx::ImageSkia& icon,
--                              const MessageBoxCallback& callback) {
--  int result = ShowTaskDialogUTF8(parent, type, buttons, default_id, cancel_id,
--                                  options, title, message, detail,
--                                  checkbox_label, &checkbox_checked, icon);
--  content::BrowserThread::PostTask(
--      content::BrowserThread::UI, FROM_HERE,
--      base::Bind(callback, result, checkbox_checked));
--  content::BrowserThread::DeleteSoon(content::BrowserThread::UI, FROM_HERE,
--                                     thread);
--}
--
--}  // namespace
--
--int ShowMessageBox(NativeWindow* parent,
--                   MessageBoxType type,
--                   const std::vector<std::string>& buttons,
--                   int default_id,
--                   int cancel_id,
--                   int options,
--                   const std::string& title,
--                   const std::string& message,
--                   const std::string& detail,
--                   const gfx::ImageSkia& icon) {
--  atom::UnresponsiveSuppressor suppressor;
--  return ShowTaskDialogUTF8(parent, type, buttons, default_id, cancel_id,
--                            options, title, message, detail, "", nullptr, icon);
--}
--
--void ShowMessageBox(NativeWindow* parent,
--                    MessageBoxType type,
--                    const std::vector<std::string>& buttons,
--                    int default_id,
--                    int cancel_id,
--                    int options,
--                    const std::string& title,
--                    const std::string& message,
--                    const std::string& detail,
--                    const std::string& checkbox_label,
--                    bool checkbox_checked,
--                    const gfx::ImageSkia& icon,
--                    const MessageBoxCallback& callback) {
--  auto thread =
--      std::make_unique<base::Thread>(ATOM_PRODUCT_NAME "MessageBoxThread");
--  thread->init_com_with_mta(false);
--  if (!thread->Start()) {
--    callback.Run(cancel_id, checkbox_checked);
--    return;
--  }
--
--  base::Thread* unretained = thread.release();
--  unretained->task_runner()->PostTask(
--      FROM_HERE,
--      base::Bind(&RunMessageBoxInNewThread, base::Unretained(unretained),
--                 parent, type, buttons, default_id, cancel_id, options, title,
--                 message, detail, checkbox_label, checkbox_checked, icon,
--                 callback));
--}
--
--void ShowErrorBox(const base::string16& title, const base::string16& content) {
--  atom::UnresponsiveSuppressor suppressor;
--  ShowTaskDialogUTF16(nullptr, MESSAGE_BOX_TYPE_ERROR, {}, -1, 0, 0, L"Error",
--                      title, content, L"", nullptr, gfx::ImageSkia());
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 60923c2ad0a6489774247a6e9b0b5c376920f5e1 atom/browser/ui/tray_icon.cc
-  our    100644 b5332ac97b27ac87b0b48caf7e5f21e12407a0e6 atom/browser/ui/tray_icon.cc
-@@ -1,107 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/ui/tray_icon.h"
--
--namespace atom {
--
--TrayIcon::TrayIcon() {}
--
--TrayIcon::~TrayIcon() {}
--
--void TrayIcon::SetPressedImage(ImageType image) {}
--
--void TrayIcon::SetTitle(const std::string& title) {}
--
--void TrayIcon::SetHighlightMode(TrayIcon::HighlightMode mode) {}
--
--void TrayIcon::DisplayBalloon(ImageType icon,
--                              const base::string16& title,
--                              const base::string16& contents) {}
--
--void TrayIcon::PopUpContextMenu(const gfx::Point& pos,
--                                AtomMenuModel* menu_model) {}
--
--gfx::Rect TrayIcon::GetBounds() {
--  return gfx::Rect();
--}
--
--void TrayIcon::NotifyClicked(const gfx::Rect& bounds,
--                             const gfx::Point& location,
--                             int modifiers) {
--  for (TrayIconObserver& observer : observers_)
--    observer.OnClicked(bounds, location, modifiers);
--}
--
--void TrayIcon::NotifyDoubleClicked(const gfx::Rect& bounds, int modifiers) {
--  for (TrayIconObserver& observer : observers_)
--    observer.OnDoubleClicked(bounds, modifiers);
--}
--
--void TrayIcon::NotifyBalloonShow() {
--  for (TrayIconObserver& observer : observers_)
--    observer.OnBalloonShow();
--}
--
--void TrayIcon::NotifyBalloonClicked() {
--  for (TrayIconObserver& observer : observers_)
--    observer.OnBalloonClicked();
--}
--
--void TrayIcon::NotifyBalloonClosed() {
--  for (TrayIconObserver& observer : observers_)
--    observer.OnBalloonClosed();
--}
--
--void TrayIcon::NotifyRightClicked(const gfx::Rect& bounds, int modifiers) {
--  for (TrayIconObserver& observer : observers_)
--    observer.OnRightClicked(bounds, modifiers);
--}
--
--void TrayIcon::NotifyDrop() {
--  for (TrayIconObserver& observer : observers_)
--    observer.OnDrop();
--}
--
--void TrayIcon::NotifyDropFiles(const std::vector<std::string>& files) {
--  for (TrayIconObserver& observer : observers_)
--    observer.OnDropFiles(files);
--}
--
--void TrayIcon::NotifyDropText(const std::string& text) {
--  for (TrayIconObserver& observer : observers_)
--    observer.OnDropText(text);
--}
--
--void TrayIcon::NotifyMouseEntered(const gfx::Point& location, int modifiers) {
--  for (TrayIconObserver& observer : observers_)
--    observer.OnMouseEntered(location, modifiers);
--}
--
--void TrayIcon::NotifyMouseExited(const gfx::Point& location, int modifiers) {
--  for (TrayIconObserver& observer : observers_)
--    observer.OnMouseExited(location, modifiers);
--}
--
--void TrayIcon::NotifyMouseMoved(const gfx::Point& location, int modifiers) {
--  for (TrayIconObserver& observer : observers_)
--    observer.OnMouseMoved(location, modifiers);
--}
--
--void TrayIcon::NotifyDragEntered() {
--  for (TrayIconObserver& observer : observers_)
--    observer.OnDragEntered();
--}
--
--void TrayIcon::NotifyDragExited() {
--  for (TrayIconObserver& observer : observers_)
--    observer.OnDragExited();
--}
--
--void TrayIcon::NotifyDragEnded() {
--  for (TrayIconObserver& observer : observers_)
--    observer.OnDragEnded();
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 c80ff08d6a52daa84252c0a0369bc474d07245df atom/browser/ui/tray_icon.h
-  our    100644 76155000e88745f1c0cda423e5af47dddec38e4a atom/browser/ui/tray_icon.h
-@@ -1,113 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_UI_TRAY_ICON_H_
--#define ATOM_BROWSER_UI_TRAY_ICON_H_
--
--#include <string>
--#include <vector>
--
--#include "atom/browser/ui/atom_menu_model.h"
--#include "atom/browser/ui/tray_icon_observer.h"
--#include "base/observer_list.h"
--#include "ui/gfx/geometry/rect.h"
--
--namespace atom {
--
--class TrayIcon {
-- public:
--  static TrayIcon* Create();
--
--#if defined(OS_WIN)
--  using ImageType = HICON;
--#else
--  using ImageType = const gfx::Image&;
--#endif
--
--  virtual ~TrayIcon();
--
--  // Sets the image associated with this status icon.
--  virtual void SetImage(ImageType image) = 0;
--
--  // Sets the image associated with this status icon when pressed.
--  virtual void SetPressedImage(ImageType image);
--
--  // Sets the hover text for this status icon. This is also used as the label
--  // for the menu item which is created as a replacement for the status icon
--  // click action on platforms that do not support custom click actions for the
--  // status icon (e.g. Ubuntu Unity).
--  virtual void SetToolTip(const std::string& tool_tip) = 0;
--
--  // Sets the title displayed aside of the status icon in the status bar. This
--  // only works on macOS.
--  virtual void SetTitle(const std::string& title);
--
--  // Sets the status icon highlight mode. This only works on macOS.
--  enum HighlightMode {
--    ALWAYS,    // Always highlight the tray icon
--    NEVER,     // Never highlight the tray icon
--    SELECTION  // Highlight the tray icon when clicked or the menu is opened
--  };
--  virtual void SetHighlightMode(HighlightMode mode);
--
--  // Setter and getter for the flag which determines whether to ignore double
--  // click events. These only work on macOS.
--#if defined(OS_MACOSX)
--  virtual void SetIgnoreDoubleClickEvents(bool ignore) = 0;
--  virtual bool GetIgnoreDoubleClickEvents() = 0;
--#endif
--
--  // Displays a notification balloon with the specified contents.
--  // Depending on the platform it might not appear by the icon tray.
--  virtual void DisplayBalloon(ImageType icon,
--                              const base::string16& title,
--                              const base::string16& contents);
--
--  // Popups the menu.
--  virtual void PopUpContextMenu(const gfx::Point& pos,
--                                AtomMenuModel* menu_model);
--
--  // Set the context menu for this icon.
--  virtual void SetContextMenu(AtomMenuModel* menu_model) = 0;
--
--  // Returns the bounds of tray icon.
--  virtual gfx::Rect GetBounds();
--
--  void AddObserver(TrayIconObserver* obs) { observers_.AddObserver(obs); }
--  void RemoveObserver(TrayIconObserver* obs) { observers_.RemoveObserver(obs); }
--
--  void NotifyClicked(const gfx::Rect& = gfx::Rect(),
--                     const gfx::Point& location = gfx::Point(),
--                     int modifiers = 0);
--  void NotifyDoubleClicked(const gfx::Rect& = gfx::Rect(), int modifiers = 0);
--  void NotifyBalloonShow();
--  void NotifyBalloonClicked();
--  void NotifyBalloonClosed();
--  void NotifyRightClicked(const gfx::Rect& bounds = gfx::Rect(),
--                          int modifiers = 0);
--  void NotifyDrop();
--  void NotifyDropFiles(const std::vector<std::string>& files);
--  void NotifyDropText(const std::string& text);
--  void NotifyDragEntered();
--  void NotifyDragExited();
--  void NotifyDragEnded();
--  void NotifyMouseEntered(const gfx::Point& location = gfx::Point(),
--                          int modifiers = 0);
--  void NotifyMouseExited(const gfx::Point& location = gfx::Point(),
--                         int modifiers = 0);
--  void NotifyMouseMoved(const gfx::Point& location = gfx::Point(),
--                        int modifiers = 0);
--
-- protected:
--  TrayIcon();
--
-- private:
--  base::ObserverList<TrayIconObserver> observers_;
--
--  DISALLOW_COPY_AND_ASSIGN(TrayIcon);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_UI_TRAY_ICON_H_
-removed in remote
-  base   100644 59e2241aa480470e99d1be3f7b4cdcf4cf31c5aa atom/browser/ui/tray_icon_cocoa.h
-  our    100644 34ace850a79e7ff480a96e0c066946e451a4e849 atom/browser/ui/tray_icon_cocoa.h
-@@ -1,56 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_UI_TRAY_ICON_COCOA_H_
--#define ATOM_BROWSER_UI_TRAY_ICON_COCOA_H_
--
--#import <Cocoa/Cocoa.h>
--
--#include <string>
--
--#include "atom/browser/ui/tray_icon.h"
--#include "base/mac/scoped_nsobject.h"
--
--@class AtomMenuController;
--@class StatusItemView;
--
--namespace atom {
--
--class TrayIconCocoa : public TrayIcon, public AtomMenuModel::Observer {
-- public:
--  TrayIconCocoa();
--  ~TrayIconCocoa() override;
--
--  void SetImage(const gfx::Image& image) override;
--  void SetPressedImage(const gfx::Image& image) override;
--  void SetToolTip(const std::string& tool_tip) override;
--  void SetTitle(const std::string& title) override;
--  void SetHighlightMode(TrayIcon::HighlightMode mode) override;
--  void SetIgnoreDoubleClickEvents(bool ignore) override;
--  bool GetIgnoreDoubleClickEvents() override;
--  void PopUpContextMenu(const gfx::Point& pos,
--                        AtomMenuModel* menu_model) override;
--  void SetContextMenu(AtomMenuModel* menu_model) override;
--  gfx::Rect GetBounds() override;
--
-- protected:
--  // AtomMenuModel::Observer:
--  void OnMenuWillClose() override;
--
-- private:
--  // Atom custom view for NSStatusItem.
--  base::scoped_nsobject<StatusItemView> status_item_view_;
--
--  // Status menu shown when right-clicking the system icon.
--  base::scoped_nsobject<AtomMenuController> menu_;
--
--  // Used for unregistering observer.
--  AtomMenuModel* menu_model_ = nullptr;  // weak ref.
--
--  DISALLOW_COPY_AND_ASSIGN(TrayIconCocoa);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_UI_TRAY_ICON_COCOA_H_
-removed in remote
-  base   100644 d2a2fe83460e08f97982cce119f0fdb766d0e6fb atom/browser/ui/tray_icon_cocoa.mm
-  our    100644 2c434d7a9e312adfb3802628a3d092a95d4ac49f atom/browser/ui/tray_icon_cocoa.mm
-@@ -1,499 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/ui/tray_icon_cocoa.h"
--
--#include "atom/browser/ui/cocoa/NSString+ANSI.h"
--#include "atom/browser/ui/cocoa/atom_menu_controller.h"
--#include "base/strings/sys_string_conversions.h"
--#include "ui/display/screen.h"
--#include "ui/events/cocoa/cocoa_event_utils.h"
--#include "ui/gfx/image/image.h"
--#include "ui/gfx/mac/coordinate_conversion.h"
--
--namespace {
--
--// By default, macOS sets 4px to tray image as left and right padding margin.
--const CGFloat kHorizontalMargin = 4;
--// macOS tends to make the title 2px lower.
--const CGFloat kVerticalTitleMargin = 2;
--
--}  //  namespace
--
--@interface StatusItemView : NSView {
--  atom::TrayIconCocoa* trayIcon_;       // weak
--  AtomMenuController* menuController_;  // weak
--  atom::TrayIcon::HighlightMode highlight_mode_;
--  BOOL ignoreDoubleClickEvents_;
--  BOOL forceHighlight_;
--  BOOL inMouseEventSequence_;
--  BOOL ANSI_;
--  base::scoped_nsobject<NSImage> image_;
--  base::scoped_nsobject<NSImage> alternateImage_;
--  base::scoped_nsobject<NSString> title_;
--  base::scoped_nsobject<NSMutableAttributedString> attributedTitle_;
--  base::scoped_nsobject<NSStatusItem> statusItem_;
--  base::scoped_nsobject<NSTrackingArea> trackingArea_;
--}
--
--@end  // @interface StatusItemView
--
--@implementation StatusItemView
--
--- (id)initWithImage:(NSImage*)image icon:(atom::TrayIconCocoa*)icon {
--  image_.reset([image copy]);
--  trayIcon_ = icon;
--  highlight_mode_ = atom::TrayIcon::HighlightMode::SELECTION;
--  ignoreDoubleClickEvents_ = NO;
--  forceHighlight_ = NO;
--  inMouseEventSequence_ = NO;
--
--  if ((self = [super initWithFrame:CGRectZero])) {
--    [self registerForDraggedTypes:@[
--      NSFilenamesPboardType,
--      NSStringPboardType,
--    ]];
--
--    // Create the status item.
--    NSStatusItem* item = [[NSStatusBar systemStatusBar]
--        statusItemWithLength:NSVariableStatusItemLength];
--    statusItem_.reset([item retain]);
--    [statusItem_ setView:self];
--    // Finalize setup by sizing our views
--    [self updateDimensions];
--
--    // Add NSTrackingArea for listening to mouseEnter, mouseExit, and mouseMove
--    // events
--    trackingArea_.reset([[NSTrackingArea alloc]
--        initWithRect:[self bounds]
--             options:NSTrackingMouseEnteredAndExited | NSTrackingMouseMoved |
--                     NSTrackingActiveAlways
--               owner:self
--            userInfo:nil]);
--    [self addTrackingArea:trackingArea_];
--  }
--  return self;
--}
--
--- (void)updateDimensions {
--  NSStatusBar* bar = [NSStatusBar systemStatusBar];
--  [self setFrame:NSMakeRect(0, 0, [self fullWidth], [bar thickness])];
--  [self setNeedsDisplay:YES];
--}
--
--- (void)removeItem {
--  // Turn off tracking events to prevent crash
--  if (trackingArea_) {
--    [self removeTrackingArea:trackingArea_];
--    trackingArea_.reset();
--  }
--  [[NSStatusBar systemStatusBar] removeStatusItem:statusItem_];
--  statusItem_.reset();
--}
--
--- (void)drawRect:(NSRect)dirtyRect {
--  // Draw the tray icon and title that align with NSStatusItem, layout:
--  //   ----------------
--  //   | icon | title |
--  ///  ----------------
--
--  CGFloat thickness = [[statusItem_ statusBar] thickness];
--
--  // Draw the system bar background.
--  [statusItem_ drawStatusBarBackgroundInRect:self.bounds
--                               withHighlight:[self shouldHighlight]];
--
--  // Determine which image to use.
--  NSImage* image = image_.get();
--  if (inMouseEventSequence_ && alternateImage_) {
--    image = alternateImage_.get();
--  }
--  // Apply the higlight color if the image is a template image. When this moves
--  // to using the new [NSStatusItem button] API, this should work automagically.
--  if ([image isTemplate] == YES) {
--    NSImage* imageWithColor = [[image copy] autorelease];
--    [imageWithColor lockFocus];
--    [[self colorWithHighlight:[self isHighlighted]] set];
--    CGRect imageBounds = CGRectMake(0, 0, image.size.width, image.size.height);
--    NSRectFillUsingOperation(imageBounds, NSCompositeSourceAtop);
--    [imageWithColor unlockFocus];
--    image = imageWithColor;
--  }
--
--  // Draw the image
--  [image
--      drawInRect:CGRectMake(roundf(([self iconWidth] - image.size.width) / 2),
--                            roundf((thickness - image.size.height) / 2),
--                            image.size.width, image.size.height)];
--
--  if (title_) {
--    // Draw title.
--    NSRect titleDrawRect = NSMakeRect([self iconWidth], -kVerticalTitleMargin,
--                                      [self titleWidth], thickness);
--    [attributedTitle_ drawInRect:titleDrawRect];
--  }
--}
--
--- (BOOL)isDarkMode {
--  NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
--  NSString* mode = [defaults stringForKey:@"AppleInterfaceStyle"];
--  return mode && [mode isEqualToString:@"Dark"];
--}
--
--- (BOOL)isHighlighted {
--  BOOL highlight = [self shouldHighlight];
--  return highlight | [self isDarkMode];
--}
--
--// The width of the full status item.
--- (CGFloat)fullWidth {
--  if (title_)
--    return [self iconWidth] + [self titleWidth] + kHorizontalMargin;
--  else
--    return [self iconWidth];
--}
--
--// The width of the icon.
--- (CGFloat)iconWidth {
--  CGFloat thickness = [[NSStatusBar systemStatusBar] thickness];
--  CGFloat imageHeight = [image_ size].height;
--  CGFloat imageWidth = [image_ size].width;
--  CGFloat iconWidth = imageWidth;
--  if (imageWidth < thickness) {
--    // Image's width must be larger than menu bar's height.
--    iconWidth = thickness;
--  } else {
--    CGFloat verticalMargin = thickness - imageHeight;
--    // Image must have same horizontal vertical margin.
--    if (verticalMargin > 0 && imageWidth != imageHeight)
--      iconWidth = imageWidth + verticalMargin;
--    CGFloat horizontalMargin = thickness - imageWidth;
--    // Image must have at least kHorizontalMargin horizontal margin on each
--    // side.
--    if (horizontalMargin < 2 * kHorizontalMargin)
--      iconWidth = imageWidth + 2 * kHorizontalMargin;
--  }
--  return iconWidth;
--}
--
--// The width of the title.
--- (CGFloat)titleWidth {
--  if (!title_)
--    return 0;
--  return [attributedTitle_ size].width;
--}
--
--- (NSColor*)colorWithHighlight:(BOOL)highlight {
--  return highlight ? [NSColor whiteColor]
--                   : [NSColor colorWithRed:0.265625
--                                     green:0.25390625
--                                      blue:0.234375
--                                     alpha:1.0];
--}
--
--- (void)setImage:(NSImage*)image {
--  image_.reset([image copy]);
--  [self updateDimensions];
--}
--
--- (void)setAlternateImage:(NSImage*)image {
--  alternateImage_.reset([image copy]);
--}
--
--- (void)setHighlight:(atom::TrayIcon::HighlightMode)mode {
--  highlight_mode_ = mode;
--  [self setNeedsDisplay:YES];
--}
--
--- (void)setIgnoreDoubleClickEvents:(BOOL)ignore {
--  ignoreDoubleClickEvents_ = ignore;
--}
--
--- (BOOL)getIgnoreDoubleClickEvents {
--  return ignoreDoubleClickEvents_;
--}
--
--- (void)setTitle:(NSString*)title {
--  if (title.length > 0) {
--    title_.reset([title copy]);
--    ANSI_ = [title containsANSICodes];
--  } else {
--    title_.reset();
--    ANSI_ = NO;
--  }
--  [self updateAttributedTitle];
--  [self updateDimensions];
--}
--
--- (void)updateAttributedTitle {
--  NSDictionary* attributes =
--      @{NSFontAttributeName : [NSFont menuBarFontOfSize:0]};
--
--  if (ANSI_) {
--    NSCharacterSet* whites = [NSCharacterSet whitespaceCharacterSet];
--    NSString* title = [title_ stringByTrimmingCharactersInSet:whites];
--    attributedTitle_.reset([title attributedStringParsingANSICodes]);
--    [attributedTitle_ addAttributes:attributes
--                              range:NSMakeRange(0, [attributedTitle_ length])];
--    return;
--  }
--
--  // check title_ being nil
--  NSString* title = @"";
--  if (title_)
--    title = title_;
--
--  attributedTitle_.reset([[NSMutableAttributedString alloc]
--      initWithString:title
--          attributes:attributes]);
--
--  // NSFontAttributeName:[NSFont menuBarFontOfSize:0],
--  // NSForegroundColorAttributeName:[self colorWithHighlight: highlight]
--  [attributedTitle_ addAttributes:attributes
--                            range:NSMakeRange(0, [attributedTitle_ length])];
--  [attributedTitle_ addAttribute:NSForegroundColorAttributeName
--                           value:[self colorWithHighlight:[self isHighlighted]]
--                           range:NSMakeRange(0, [attributedTitle_ length])];
--}
--
--- (void)setMenuController:(AtomMenuController*)menu {
--  menuController_ = menu;
--}
--
--- (void)mouseDown:(NSEvent*)event {
--  inMouseEventSequence_ = YES;
--  [self setNeedsDisplay:YES];
--}
--
--- (void)mouseUp:(NSEvent*)event {
--  if (!inMouseEventSequence_) {
--    // If the menu is showing, when user clicked the tray icon, the `mouseDown`
--    // event will be dissmissed, we need to close the menu at this time.
--    [self setNeedsDisplay:YES];
--    return;
--  }
--  inMouseEventSequence_ = NO;
--
--  // Show menu when there is a context menu.
--  // NB(hokein): Make tray's behavior more like official one's.
--  // When the tray icon gets clicked quickly multiple times, the
--  // event.clickCount doesn't always return 1. Instead, it returns a value that
--  // counts the clicked times.
--  // So we don't check the clickCount here, just pop up the menu for each click
--  // event.
--  if (menuController_)
--    [statusItem_ popUpStatusItemMenu:[menuController_ menu]];
--
--  // Don't emit click events when menu is showing.
--  if (menuController_)
--    return;
--
--  // If we are ignoring double click events, we should ignore the `clickCount`
--  // value and immediately emit a click event.
--  BOOL shouldBeHandledAsASingleClick =
--      (event.clickCount == 1) || ignoreDoubleClickEvents_;
--  if (shouldBeHandledAsASingleClick)
--    trayIcon_->NotifyClicked(
--        gfx::ScreenRectFromNSRect(event.window.frame),
--        gfx::ScreenPointFromNSPoint([event locationInWindow]),
--        ui::EventFlagsFromModifiers([event modifierFlags]));
--
--  // Double click event.
--  BOOL shouldBeHandledAsADoubleClick =
--      (event.clickCount == 2) && !ignoreDoubleClickEvents_;
--  if (shouldBeHandledAsADoubleClick)
--    trayIcon_->NotifyDoubleClicked(
--        gfx::ScreenRectFromNSRect(event.window.frame),
--        ui::EventFlagsFromModifiers([event modifierFlags]));
--
--  [self setNeedsDisplay:YES];
--}
--
--- (void)popUpContextMenu:(atom::AtomMenuModel*)menu_model {
--  // Show a custom menu.
--  if (menu_model) {
--    base::scoped_nsobject<AtomMenuController> menuController([
--        [AtomMenuController alloc] initWithModel:menu_model
--                           useDefaultAccelerator:NO]);
--    forceHighlight_ = YES;  // Should highlight when showing menu.
--    [self setNeedsDisplay:YES];
--    [statusItem_ popUpStatusItemMenu:[menuController menu]];
--    forceHighlight_ = NO;
--    [self setNeedsDisplay:YES];
--    return;
--  }
--
--  if (menuController_ && ![menuController_ isMenuOpen]) {
--    // Redraw the tray icon to show highlight if it is enabled.
--    [self setNeedsDisplay:YES];
--    [statusItem_ popUpStatusItemMenu:[menuController_ menu]];
--    // The popUpStatusItemMenu returns only after the showing menu is closed.
--    // When it returns, we need to redraw the tray icon to not show highlight.
--    [self setNeedsDisplay:YES];
--  }
--}
--
--- (void)rightMouseUp:(NSEvent*)event {
--  trayIcon_->NotifyRightClicked(
--      gfx::ScreenRectFromNSRect(event.window.frame),
--      ui::EventFlagsFromModifiers([event modifierFlags]));
--}
--
--- (NSDragOperation)draggingEntered:(id<NSDraggingInfo>)sender {
--  trayIcon_->NotifyDragEntered();
--  return NSDragOperationCopy;
--}
--
--- (void)mouseExited:(NSEvent*)event {
--  trayIcon_->NotifyMouseExited(
--      gfx::ScreenPointFromNSPoint([event locationInWindow]),
--      ui::EventFlagsFromModifiers([event modifierFlags]));
--}
--
--- (void)mouseEntered:(NSEvent*)event {
--  trayIcon_->NotifyMouseEntered(
--      gfx::ScreenPointFromNSPoint([event locationInWindow]),
--      ui::EventFlagsFromModifiers([event modifierFlags]));
--}
--
--- (void)mouseMoved:(NSEvent*)event {
--  trayIcon_->NotifyMouseMoved(
--      gfx::ScreenPointFromNSPoint([event locationInWindow]),
--      ui::EventFlagsFromModifiers([event modifierFlags]));
--}
--
--- (void)draggingExited:(id<NSDraggingInfo>)sender {
--  trayIcon_->NotifyDragExited();
--}
--
--- (void)draggingEnded:(id<NSDraggingInfo>)sender {
--  trayIcon_->NotifyDragEnded();
--
--  if (NSPointInRect([sender draggingLocation], self.frame)) {
--    trayIcon_->NotifyDrop();
--  }
--}
--
--- (BOOL)handleDrop:(id<NSDraggingInfo>)sender {
--  NSPasteboard* pboard = [sender draggingPasteboard];
--
--  if ([[pboard types] containsObject:NSFilenamesPboardType]) {
--    std::vector<std::string> dropFiles;
--    NSArray* files = [pboard propertyListForType:NSFilenamesPboardType];
--    for (NSString* file in files)
--      dropFiles.push_back(base::SysNSStringToUTF8(file));
--    trayIcon_->NotifyDropFiles(dropFiles);
--    return YES;
--  } else if ([[pboard types] containsObject:NSStringPboardType]) {
--    NSString* dropText = [pboard stringForType:NSStringPboardType];
--    trayIcon_->NotifyDropText(base::SysNSStringToUTF8(dropText));
--    return YES;
--  }
--
--  return NO;
--}
--
--- (BOOL)prepareForDragOperation:(id<NSDraggingInfo>)sender {
--  return YES;
--}
--
--- (BOOL)performDragOperation:(id<NSDraggingInfo>)sender {
--  [self handleDrop:sender];
--  return YES;
--}
--
--- (void)setNeedsDisplay:(BOOL)display {
--  [self updateAttributedTitle];
--  [super setNeedsDisplay:display];
--}
--
--- (BOOL)shouldHighlight {
--  switch (highlight_mode_) {
--    case atom::TrayIcon::HighlightMode::ALWAYS:
--      return true;
--    case atom::TrayIcon::HighlightMode::NEVER:
--      return false;
--    case atom::TrayIcon::HighlightMode::SELECTION:
--      BOOL isMenuOpen = menuController_ && [menuController_ isMenuOpen];
--      return forceHighlight_ || inMouseEventSequence_ || isMenuOpen;
--  }
--}
--
--@end
--
--namespace atom {
--
--TrayIconCocoa::TrayIconCocoa() {}
--
--TrayIconCocoa::~TrayIconCocoa() {
--  [status_item_view_ removeItem];
--  if (menu_model_)
--    menu_model_->RemoveObserver(this);
--}
--
--void TrayIconCocoa::SetImage(const gfx::Image& image) {
--  if (status_item_view_) {
--    [status_item_view_ setImage:image.AsNSImage()];
--  } else {
--    status_item_view_.reset(
--        [[StatusItemView alloc] initWithImage:image.AsNSImage() icon:this]);
--  }
--}
--
--void TrayIconCocoa::SetPressedImage(const gfx::Image& image) {
--  [status_item_view_ setAlternateImage:image.AsNSImage()];
--}
--
--void TrayIconCocoa::SetToolTip(const std::string& tool_tip) {
--  [status_item_view_ setToolTip:base::SysUTF8ToNSString(tool_tip)];
--}
--
--void TrayIconCocoa::SetTitle(const std::string& title) {
--  [status_item_view_ setTitle:base::SysUTF8ToNSString(title)];
--}
--
--void TrayIconCocoa::SetHighlightMode(TrayIcon::HighlightMode mode) {
--  [status_item_view_ setHighlight:mode];
--}
--
--void TrayIconCocoa::SetIgnoreDoubleClickEvents(bool ignore) {
--  [status_item_view_ setIgnoreDoubleClickEvents:ignore];
--}
--
--bool TrayIconCocoa::GetIgnoreDoubleClickEvents() {
--  return [status_item_view_ getIgnoreDoubleClickEvents];
--}
--
--void TrayIconCocoa::PopUpContextMenu(const gfx::Point& pos,
--                                     AtomMenuModel* menu_model) {
--  [status_item_view_ popUpContextMenu:menu_model];
--}
--
--void TrayIconCocoa::SetContextMenu(AtomMenuModel* menu_model) {
--  // Substribe to MenuClosed event.
--  if (menu_model_)
--    menu_model_->RemoveObserver(this);
--  menu_model->AddObserver(this);
--
--  // Create native menu.
--  menu_.reset([[AtomMenuController alloc] initWithModel:menu_model
--                                  useDefaultAccelerator:NO]);
--  [status_item_view_ setMenuController:menu_.get()];
--}
--
--gfx::Rect TrayIconCocoa::GetBounds() {
--  auto bounds = gfx::ScreenRectFromNSRect([status_item_view_ window].frame);
--  return bounds;
--}
--
--void TrayIconCocoa::OnMenuWillClose() {
--  [status_item_view_ setNeedsDisplay:YES];
--}
--
--// static
--TrayIcon* TrayIcon::Create() {
--  return new TrayIconCocoa;
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 666e64101e886bcb1e14b59296ac4b9e743c1aa0 atom/browser/ui/tray_icon_gtk.cc
-  our    100644 4c780285c80a157afca74b0927175ba3b045def9 atom/browser/ui/tray_icon_gtk.cc
-@@ -1,69 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/ui/tray_icon_gtk.h"
--
--#include "atom/browser/browser.h"
--#include "base/strings/stringprintf.h"
--#include "base/strings/utf_string_conversions.h"
--#include "brightray/common/application_info.h"
--#include "chrome/browser/ui/libgtkui/app_indicator_icon.h"
--#include "chrome/browser/ui/libgtkui/gtk_status_icon.h"
--#include "ui/gfx/image/image.h"
--
--namespace atom {
--
--namespace {
--
--// Number of app indicators used (used as part of app-indicator id).
--int indicators_count;
--
--}  // namespace
--
--TrayIconGtk::TrayIconGtk() {}
--
--TrayIconGtk::~TrayIconGtk() {}
--
--void TrayIconGtk::SetImage(const gfx::Image& image) {
--  if (icon_) {
--    icon_->SetImage(image.AsImageSkia());
--    return;
--  }
--
--  const auto toolTip = base::UTF8ToUTF16(brightray::GetApplicationName());
--
--  if (libgtkui::AppIndicatorIcon::CouldOpen()) {
--    ++indicators_count;
--    icon_.reset(new libgtkui::AppIndicatorIcon(
--        base::StringPrintf("%s%d", Browser::Get()->GetName().c_str(),
--                           indicators_count),
--        image.AsImageSkia(), toolTip));
--  } else {
--    icon_.reset(new libgtkui::Gtk2StatusIcon(image.AsImageSkia(), toolTip));
--  }
--  icon_->set_delegate(this);
--}
--
--void TrayIconGtk::SetToolTip(const std::string& tool_tip) {
--  icon_->SetToolTip(base::UTF8ToUTF16(tool_tip));
--}
--
--void TrayIconGtk::SetContextMenu(AtomMenuModel* menu_model) {
--  icon_->UpdatePlatformContextMenu(menu_model);
--}
--
--void TrayIconGtk::OnClick() {
--  NotifyClicked();
--}
--
--bool TrayIconGtk::HasClickAction() {
--  return false;
--}
--
--// static
--TrayIcon* TrayIcon::Create() {
--  return new TrayIconGtk;
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 2be3259f218de502eb8b4d17ddea45fcfdc6af57 atom/browser/ui/tray_icon_gtk.h
-  our    100644 cddd0c4b8927d02bf7501a87251b65403cc3a756 atom/browser/ui/tray_icon_gtk.h
-@@ -1,41 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_UI_TRAY_ICON_GTK_H_
--#define ATOM_BROWSER_UI_TRAY_ICON_GTK_H_
--
--#include <string>
--
--#include "atom/browser/ui/tray_icon.h"
--#include "ui/views/linux_ui/status_icon_linux.h"
--
--namespace views {
--class StatusIconLinux;
--}
--
--namespace atom {
--
--class TrayIconGtk : public TrayIcon, public views::StatusIconLinux::Delegate {
-- public:
--  TrayIconGtk();
--  ~TrayIconGtk() override;
--
--  // TrayIcon:
--  void SetImage(const gfx::Image& image) override;
--  void SetToolTip(const std::string& tool_tip) override;
--  void SetContextMenu(AtomMenuModel* menu_model) override;
--
-- private:
--  // views::StatusIconLinux::Delegate:
--  void OnClick() override;
--  bool HasClickAction() override;
--
--  std::unique_ptr<views::StatusIconLinux> icon_;
--
--  DISALLOW_COPY_AND_ASSIGN(TrayIconGtk);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_UI_TRAY_ICON_GTK_H_
-removed in remote
-  base   100644 ed421ed854529dea76d57bef8b1b01b1962a109f atom/browser/ui/tray_icon_observer.h
-  our    100644 feb5fb8cfc7477c0cc399eba65ed4e80571f8248 atom/browser/ui/tray_icon_observer.h
-@@ -1,44 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_UI_TRAY_ICON_OBSERVER_H_
--#define ATOM_BROWSER_UI_TRAY_ICON_OBSERVER_H_
--
--#include <string>
--#include <vector>
--
--namespace gfx {
--class Rect;
--class Point;
--}  // namespace gfx
--
--namespace atom {
--
--class TrayIconObserver {
-- public:
--  virtual void OnClicked(const gfx::Rect& bounds,
--                         const gfx::Point& location,
--                         int modifiers) {}
--  virtual void OnDoubleClicked(const gfx::Rect& bounds, int modifiers) {}
--  virtual void OnBalloonShow() {}
--  virtual void OnBalloonClicked() {}
--  virtual void OnBalloonClosed() {}
--  virtual void OnRightClicked(const gfx::Rect& bounds, int modifiers) {}
--  virtual void OnDrop() {}
--  virtual void OnDropFiles(const std::vector<std::string>& files) {}
--  virtual void OnDropText(const std::string& text) {}
--  virtual void OnDragEntered() {}
--  virtual void OnDragExited() {}
--  virtual void OnDragEnded() {}
--  virtual void OnMouseEntered(const gfx::Point& location, int modifiers) {}
--  virtual void OnMouseExited(const gfx::Point& location, int modifiers) {}
--  virtual void OnMouseMoved(const gfx::Point& location, int modifiers) {}
--
-- protected:
--  virtual ~TrayIconObserver() {}
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_UI_TRAY_ICON_OBSERVER_H_
-removed in remote
-  base   100644 82550013ef7a28b19483c189595866ad04411467 atom/browser/ui/tray_icon_win.cc
-  our    100644 82550013ef7a28b19483c189595866ad04411467 atom/browser/ui/tray_icon_win.cc
-@@ -1,16 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/ui/win/notify_icon.h"
--#include "atom/browser/ui/win/notify_icon_host.h"
--
--namespace atom {
--
--// static
--TrayIcon* TrayIcon::Create() {
--  static NotifyIconHost host;
--  return host.CreateNotifyIcon();
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 2ec4459f6b45b71f084af67d4ac0353016f5eca9 atom/browser/ui/views/frameless_view.cc
-  our    100644 8959ee13612979d2819621acc14ebf641fb7f116 atom/browser/ui/views/frameless_view.cc
-@@ -1,115 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/ui/views/frameless_view.h"
--
--#include "atom/browser/native_window_views.h"
--#include "ui/aura/window.h"
--#include "ui/base/hit_test.h"
--#include "ui/views/widget/widget.h"
--#include "ui/views/widget/widget_delegate.h"
--
--namespace atom {
--
--namespace {
--
--const int kResizeInsideBoundsSize = 5;
--const int kResizeAreaCornerSize = 16;
--
--}  // namespace
--
--// static
--const char FramelessView::kViewClassName[] = "FramelessView";
--
--FramelessView::FramelessView() {}
--
--FramelessView::~FramelessView() {}
--
--void FramelessView::Init(NativeWindowViews* window, views::Widget* frame) {
--  window_ = window;
--  frame_ = frame;
--}
--
--int FramelessView::ResizingBorderHitTest(const gfx::Point& point) {
--  // Check the frame first, as we allow a small area overlapping the contents
--  // to be used for resize handles.
--  bool can_ever_resize = frame_->widget_delegate()
--                             ? frame_->widget_delegate()->CanResize()
--                             : false;
--  // Don't allow overlapping resize handles when the window is maximized or
--  // fullscreen, as it can't be resized in those states.
--  int resize_border = frame_->IsMaximized() || frame_->IsFullscreen()
--                          ? 0
--                          : kResizeInsideBoundsSize;
--  return GetHTComponentForFrame(point, resize_border, resize_border,
--                                kResizeAreaCornerSize, kResizeAreaCornerSize,
--                                can_ever_resize);
--}
--
--gfx::Rect FramelessView::GetBoundsForClientView() const {
--  return bounds();
--}
--
--gfx::Rect FramelessView::GetWindowBoundsForClientBounds(
--    const gfx::Rect& client_bounds) const {
--  gfx::Rect window_bounds = client_bounds;
--  // Enforce minimum size (1, 1) in case that client_bounds is passed with
--  // empty size. This could occur when the frameless window is being
--  // initialized.
--  if (window_bounds.IsEmpty()) {
--    window_bounds.set_width(1);
--    window_bounds.set_height(1);
--  }
--  return window_bounds;
--}
--
--int FramelessView::NonClientHitTest(const gfx::Point& cursor) {
--  if (frame_->IsFullscreen())
--    return HTCLIENT;
--
--  // Check for possible draggable region in the client area for the frameless
--  // window.
--  SkRegion* draggable_region = window_->draggable_region();
--  if (draggable_region && draggable_region->contains(cursor.x(), cursor.y()))
--    return HTCAPTION;
--
--  // Support resizing frameless window by dragging the border.
--  int frame_component = ResizingBorderHitTest(cursor);
--  if (frame_component != HTNOWHERE)
--    return frame_component;
--
--  return HTCLIENT;
--}
--
--void FramelessView::GetWindowMask(const gfx::Size& size,
--                                  gfx::Path* window_mask) {}
--
--void FramelessView::ResetWindowControls() {}
--
--void FramelessView::UpdateWindowIcon() {}
--
--void FramelessView::UpdateWindowTitle() {}
--
--void FramelessView::SizeConstraintsChanged() {}
--
--gfx::Size FramelessView::CalculatePreferredSize() const {
--  return frame_->non_client_view()
--      ->GetWindowBoundsForClientBounds(
--          gfx::Rect(frame_->client_view()->GetPreferredSize()))
--      .size();
--}
--
--gfx::Size FramelessView::GetMinimumSize() const {
--  return window_->GetContentMinimumSize();
--}
--
--gfx::Size FramelessView::GetMaximumSize() const {
--  return window_->GetContentMaximumSize();
--}
--
--const char* FramelessView::GetClassName() const {
--  return kViewClassName;
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 54dc3285fabc089691ce4d42f38ec6a77b2ab3e5 atom/browser/ui/views/frameless_view.h
-  our    100644 a9d1e4b54906eaadc11764fccfb57877893e2a95 atom/browser/ui/views/frameless_view.h
-@@ -1,57 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_UI_VIEWS_FRAMELESS_VIEW_H_
--#define ATOM_BROWSER_UI_VIEWS_FRAMELESS_VIEW_H_
--
--#include "ui/views/window/non_client_view.h"
--
--namespace views {
--class Widget;
--}
--
--namespace atom {
--
--class NativeWindowViews;
--
--class FramelessView : public views::NonClientFrameView {
-- public:
--  static const char kViewClassName[];
--  FramelessView();
--  ~FramelessView() override;
--
--  virtual void Init(NativeWindowViews* window, views::Widget* frame);
--
--  // Returns whether the |point| is on frameless window's resizing border.
--  int ResizingBorderHitTest(const gfx::Point& point);
--
-- protected:
--  // views::NonClientFrameView:
--  gfx::Rect GetBoundsForClientView() const override;
--  gfx::Rect GetWindowBoundsForClientBounds(
--      const gfx::Rect& client_bounds) const override;
--  int NonClientHitTest(const gfx::Point& point) override;
--  void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask) override;
--  void ResetWindowControls() override;
--  void UpdateWindowIcon() override;
--  void UpdateWindowTitle() override;
--  void SizeConstraintsChanged() override;
--
--  // Overridden from View:
--  gfx::Size CalculatePreferredSize() const override;
--  gfx::Size GetMinimumSize() const override;
--  gfx::Size GetMaximumSize() const override;
--  const char* GetClassName() const override;
--
--  // Not owned.
--  NativeWindowViews* window_ = nullptr;
--  views::Widget* frame_ = nullptr;
--
-- private:
--  DISALLOW_COPY_AND_ASSIGN(FramelessView);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_UI_VIEWS_FRAMELESS_VIEW_H_
-removed in remote
-  base   100644 b393e3f4657da24d4ca6b53c70c37029c1bfe327 atom/browser/ui/views/global_menu_bar_x11.cc
-  our    100644 656bd8f991f87c06a240cdc09a3bfcd500d1c1c8 atom/browser/ui/views/global_menu_bar_x11.cc
-@@ -1,336 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/ui/views/global_menu_bar_x11.h"
--
--#include <dlfcn.h>
--#include <glib-object.h>
--
--#include "atom/browser/native_window_views.h"
--#include "atom/browser/ui/atom_menu_model.h"
--#include "base/logging.h"
--#include "base/strings/stringprintf.h"
--#include "base/strings/utf_string_conversions.h"
--#include "chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h"
--#include "ui/aura/window.h"
--#include "ui/aura/window_tree_host.h"
--#include "ui/base/accelerators/menu_label_accelerator_util_linux.h"
--#include "ui/events/keycodes/keyboard_code_conversion_x.h"
--#include "ui/gfx/x/x11.h"
--
--// libdbusmenu-glib types
--typedef struct _DbusmenuMenuitem DbusmenuMenuitem;
--typedef DbusmenuMenuitem* (*dbusmenu_menuitem_new_func)();
--typedef DbusmenuMenuitem* (*dbusmenu_menuitem_new_with_id_func)(int id);
--
--typedef int (*dbusmenu_menuitem_get_id_func)(DbusmenuMenuitem* item);
--typedef GList* (*dbusmenu_menuitem_get_children_func)(DbusmenuMenuitem* item);
--typedef DbusmenuMenuitem* (*dbusmenu_menuitem_child_append_func)(
--    DbusmenuMenuitem* parent,
--    DbusmenuMenuitem* child);
--typedef DbusmenuMenuitem* (*dbusmenu_menuitem_property_set_func)(
--    DbusmenuMenuitem* item,
--    const char* property,
--    const char* value);
--typedef DbusmenuMenuitem* (*dbusmenu_menuitem_property_set_variant_func)(
--    DbusmenuMenuitem* item,
--    const char* property,
--    GVariant* value);
--typedef DbusmenuMenuitem* (*dbusmenu_menuitem_property_set_bool_func)(
--    DbusmenuMenuitem* item,
--    const char* property,
--    bool value);
--typedef DbusmenuMenuitem* (*dbusmenu_menuitem_property_set_int_func)(
--    DbusmenuMenuitem* item,
--    const char* property,
--    int value);
--
--typedef struct _DbusmenuServer DbusmenuServer;
--typedef DbusmenuServer* (*dbusmenu_server_new_func)(const char* object);
--typedef void (*dbusmenu_server_set_root_func)(DbusmenuServer* self,
--                                              DbusmenuMenuitem* root);
--
--namespace atom {
--
--namespace {
--
--// Retrieved functions from libdbusmenu-glib.
--
--// DbusmenuMenuItem methods:
--dbusmenu_menuitem_new_func menuitem_new = NULL;
--dbusmenu_menuitem_new_with_id_func menuitem_new_with_id = NULL;
--dbusmenu_menuitem_get_id_func menuitem_get_id = NULL;
--dbusmenu_menuitem_get_children_func menuitem_get_children = NULL;
--dbusmenu_menuitem_get_children_func menuitem_take_children = NULL;
--dbusmenu_menuitem_child_append_func menuitem_child_append = NULL;
--dbusmenu_menuitem_property_set_func menuitem_property_set = NULL;
--dbusmenu_menuitem_property_set_variant_func menuitem_property_set_variant =
--    NULL;
--dbusmenu_menuitem_property_set_bool_func menuitem_property_set_bool = NULL;
--dbusmenu_menuitem_property_set_int_func menuitem_property_set_int = NULL;
--
--// DbusmenuServer methods:
--dbusmenu_server_new_func server_new = NULL;
--dbusmenu_server_set_root_func server_set_root = NULL;
--
--// Properties that we set on menu items:
--const char kPropertyEnabled[] = "enabled";
--const char kPropertyLabel[] = "label";
--const char kPropertyShortcut[] = "shortcut";
--const char kPropertyType[] = "type";
--const char kPropertyToggleType[] = "toggle-type";
--const char kPropertyToggleState[] = "toggle-state";
--const char kPropertyVisible[] = "visible";
--const char kPropertyChildrenDisplay[] = "children-display";
--
--const char kToggleCheck[] = "checkmark";
--const char kToggleRadio[] = "radio";
--const char kTypeSeparator[] = "separator";
--const char kDisplaySubmenu[] = "submenu";
--
--void EnsureMethodsLoaded() {
--  static bool attempted_load = false;
--  if (attempted_load)
--    return;
--  attempted_load = true;
--
--  void* dbusmenu_lib = dlopen("libdbusmenu-glib.so", RTLD_LAZY);
--  if (!dbusmenu_lib)
--    dbusmenu_lib = dlopen("libdbusmenu-glib.so.4", RTLD_LAZY);
--  if (!dbusmenu_lib)
--    return;
--
--  // DbusmenuMenuItem methods.
--  menuitem_new = reinterpret_cast<dbusmenu_menuitem_new_func>(
--      dlsym(dbusmenu_lib, "dbusmenu_menuitem_new"));
--  menuitem_new_with_id = reinterpret_cast<dbusmenu_menuitem_new_with_id_func>(
--      dlsym(dbusmenu_lib, "dbusmenu_menuitem_new_with_id"));
--  menuitem_get_id = reinterpret_cast<dbusmenu_menuitem_get_id_func>(
--      dlsym(dbusmenu_lib, "dbusmenu_menuitem_get_id"));
--  menuitem_get_children = reinterpret_cast<dbusmenu_menuitem_get_children_func>(
--      dlsym(dbusmenu_lib, "dbusmenu_menuitem_get_children"));
--  menuitem_take_children =
--      reinterpret_cast<dbusmenu_menuitem_get_children_func>(
--          dlsym(dbusmenu_lib, "dbusmenu_menuitem_take_children"));
--  menuitem_child_append = reinterpret_cast<dbusmenu_menuitem_child_append_func>(
--      dlsym(dbusmenu_lib, "dbusmenu_menuitem_child_append"));
--  menuitem_property_set = reinterpret_cast<dbusmenu_menuitem_property_set_func>(
--      dlsym(dbusmenu_lib, "dbusmenu_menuitem_property_set"));
--  menuitem_property_set_variant =
--      reinterpret_cast<dbusmenu_menuitem_property_set_variant_func>(
--          dlsym(dbusmenu_lib, "dbusmenu_menuitem_property_set_variant"));
--  menuitem_property_set_bool =
--      reinterpret_cast<dbusmenu_menuitem_property_set_bool_func>(
--          dlsym(dbusmenu_lib, "dbusmenu_menuitem_property_set_bool"));
--  menuitem_property_set_int =
--      reinterpret_cast<dbusmenu_menuitem_property_set_int_func>(
--          dlsym(dbusmenu_lib, "dbusmenu_menuitem_property_set_int"));
--
--  // DbusmenuServer methods.
--  server_new = reinterpret_cast<dbusmenu_server_new_func>(
--      dlsym(dbusmenu_lib, "dbusmenu_server_new"));
--  server_set_root = reinterpret_cast<dbusmenu_server_set_root_func>(
--      dlsym(dbusmenu_lib, "dbusmenu_server_set_root"));
--}
--
--AtomMenuModel* ModelForMenuItem(DbusmenuMenuitem* item) {
--  return reinterpret_cast<AtomMenuModel*>(
--      g_object_get_data(G_OBJECT(item), "model"));
--}
--
--bool GetMenuItemID(DbusmenuMenuitem* item, int* id) {
--  gpointer id_ptr = g_object_get_data(G_OBJECT(item), "menu-id");
--  if (id_ptr != NULL) {
--    *id = GPOINTER_TO_INT(id_ptr) - 1;
--    return true;
--  }
--
--  return false;
--}
--
--void SetMenuItemID(DbusmenuMenuitem* item, int id) {
--  DCHECK_GE(id, 0);
--
--  // Add 1 to the menu_id to avoid setting zero (null) to "menu-id".
--  g_object_set_data(G_OBJECT(item), "menu-id", GINT_TO_POINTER(id + 1));
--}
--
--std::string GetMenuModelStatus(AtomMenuModel* model) {
--  std::string ret;
--  for (int i = 0; i < model->GetItemCount(); ++i) {
--    int status = model->GetTypeAt(i) | (model->IsVisibleAt(i) << 3) |
--                 (model->IsEnabledAt(i) << 4) |
--                 (model->IsItemCheckedAt(i) << 5);
--    ret += base::StringPrintf(
--        "%s-%X\n", base::UTF16ToUTF8(model->GetLabelAt(i)).c_str(), status);
--  }
--  return ret;
--}
--
--}  // namespace
--
--GlobalMenuBarX11::GlobalMenuBarX11(NativeWindowViews* window)
--    : window_(window),
--      xid_(window_->GetNativeWindow()->GetHost()->GetAcceleratedWidget()) {
--  EnsureMethodsLoaded();
--  if (server_new)
--    InitServer(xid_);
--
--  GlobalMenuBarRegistrarX11::GetInstance()->OnWindowMapped(xid_);
--}
--
--GlobalMenuBarX11::~GlobalMenuBarX11() {
--  if (IsServerStarted())
--    g_object_unref(server_);
--
--  GlobalMenuBarRegistrarX11::GetInstance()->OnWindowUnmapped(xid_);
--}
--
--// static
--std::string GlobalMenuBarX11::GetPathForWindow(gfx::AcceleratedWidget xid) {
--  return base::StringPrintf("/com/canonical/menu/%lX", xid);
--}
--
--void GlobalMenuBarX11::SetMenu(AtomMenuModel* menu_model) {
--  if (!IsServerStarted())
--    return;
--
--  DbusmenuMenuitem* root_item = menuitem_new();
--  menuitem_property_set(root_item, kPropertyLabel, "Root");
--  menuitem_property_set_bool(root_item, kPropertyVisible, true);
--  if (menu_model != nullptr) {
--    BuildMenuFromModel(menu_model, root_item);
--  }
--
--  server_set_root(server_, root_item);
--  g_object_unref(root_item);
--}
--
--bool GlobalMenuBarX11::IsServerStarted() const {
--  return server_;
--}
--
--void GlobalMenuBarX11::InitServer(gfx::AcceleratedWidget xid) {
--  std::string path = GetPathForWindow(xid);
--  server_ = server_new(path.c_str());
--}
--
--void GlobalMenuBarX11::OnWindowMapped() {
--  GlobalMenuBarRegistrarX11::GetInstance()->OnWindowMapped(xid_);
--}
--
--void GlobalMenuBarX11::OnWindowUnmapped() {
--  GlobalMenuBarRegistrarX11::GetInstance()->OnWindowUnmapped(xid_);
--}
--
--void GlobalMenuBarX11::BuildMenuFromModel(AtomMenuModel* model,
--                                          DbusmenuMenuitem* parent) {
--  for (int i = 0; i < model->GetItemCount(); ++i) {
--    DbusmenuMenuitem* item = menuitem_new();
--    menuitem_property_set_bool(item, kPropertyVisible, model->IsVisibleAt(i));
--
--    AtomMenuModel::ItemType type = model->GetTypeAt(i);
--    if (type == AtomMenuModel::TYPE_SEPARATOR) {
--      menuitem_property_set(item, kPropertyType, kTypeSeparator);
--    } else {
--      std::string label = ui::ConvertAcceleratorsFromWindowsStyle(
--          base::UTF16ToUTF8(model->GetLabelAt(i)));
--      menuitem_property_set(item, kPropertyLabel, label.c_str());
--      menuitem_property_set_bool(item, kPropertyEnabled, model->IsEnabledAt(i));
--
--      g_object_set_data(G_OBJECT(item), "model", model);
--      SetMenuItemID(item, i);
--
--      if (type == AtomMenuModel::TYPE_SUBMENU) {
--        menuitem_property_set(item, kPropertyChildrenDisplay, kDisplaySubmenu);
--        g_signal_connect(item, "about-to-show", G_CALLBACK(OnSubMenuShowThunk),
--                         this);
--      } else {
--        ui::Accelerator accelerator;
--        if (model->GetAcceleratorAtWithParams(i, true, &accelerator))
--          RegisterAccelerator(item, accelerator);
--
--        g_signal_connect(item, "item-activated",
--                         G_CALLBACK(OnItemActivatedThunk), this);
--
--        if (type == AtomMenuModel::TYPE_CHECK ||
--            type == AtomMenuModel::TYPE_RADIO) {
--          menuitem_property_set(
--              item, kPropertyToggleType,
--              type == AtomMenuModel::TYPE_CHECK ? kToggleCheck : kToggleRadio);
--          menuitem_property_set_int(item, kPropertyToggleState,
--                                    model->IsItemCheckedAt(i));
--        }
--      }
--    }
--
--    menuitem_child_append(parent, item);
--    g_object_unref(item);
--  }
--}
--
--void GlobalMenuBarX11::RegisterAccelerator(DbusmenuMenuitem* item,
--                                           const ui::Accelerator& accelerator) {
--  // A translation of libdbusmenu-gtk's menuitem_property_set_shortcut()
--  // translated from GDK types to ui::Accelerator types.
--  GVariantBuilder builder;
--  g_variant_builder_init(&builder, G_VARIANT_TYPE_ARRAY);
--
--  if (accelerator.IsCtrlDown())
--    g_variant_builder_add(&builder, "s", "Control");
--  if (accelerator.IsAltDown())
--    g_variant_builder_add(&builder, "s", "Alt");
--  if (accelerator.IsShiftDown())
--    g_variant_builder_add(&builder, "s", "Shift");
--
--  char* name =
--      XKeysymToString(XKeysymForWindowsKeyCode(accelerator.key_code(), false));
--  if (!name) {
--    NOTIMPLEMENTED();
--    return;
--  }
--  g_variant_builder_add(&builder, "s", name);
--
--  GVariant* inside_array = g_variant_builder_end(&builder);
--  g_variant_builder_init(&builder, G_VARIANT_TYPE_ARRAY);
--  g_variant_builder_add_value(&builder, inside_array);
--  GVariant* outside_array = g_variant_builder_end(&builder);
--
--  menuitem_property_set_variant(item, kPropertyShortcut, outside_array);
--}
--
--void GlobalMenuBarX11::OnItemActivated(DbusmenuMenuitem* item,
--                                       unsigned int timestamp) {
--  int id;
--  AtomMenuModel* model = ModelForMenuItem(item);
--  if (model && GetMenuItemID(item, &id))
--    model->ActivatedAt(id, 0);
--}
--
--void GlobalMenuBarX11::OnSubMenuShow(DbusmenuMenuitem* item) {
--  int id;
--  AtomMenuModel* model = ModelForMenuItem(item);
--  if (!model || !GetMenuItemID(item, &id))
--    return;
--
--  // Do not update menu if the submenu has not been changed.
--  std::string status = GetMenuModelStatus(model);
--  char* old = static_cast<char*>(g_object_get_data(G_OBJECT(item), "status"));
--  if (old && status == old)
--    return;
--
--  // Save the new status.
--  g_object_set_data_full(G_OBJECT(item), "status", g_strdup(status.c_str()),
--                         g_free);
--
--  // Clear children.
--  GList* children = menuitem_take_children(item);
--  g_list_foreach(children, reinterpret_cast<GFunc>(g_object_unref), NULL);
--  g_list_free(children);
--
--  // Build children.
--  BuildMenuFromModel(model->GetSubmenuModelAt(id), item);
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 89b2680cabebf967a45a5bfaea56151d8cc0a1e9 atom/browser/ui/views/global_menu_bar_x11.h
-  our    100644 dde466c94e8297e8c629152658c844fe4d3600b4 atom/browser/ui/views/global_menu_bar_x11.h
-@@ -1,81 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_UI_VIEWS_GLOBAL_MENU_BAR_X11_H_
--#define ATOM_BROWSER_UI_VIEWS_GLOBAL_MENU_BAR_X11_H_
--
--#include <string>
--
--#include "atom/browser/ui/atom_menu_model.h"
--#include "base/compiler_specific.h"
--#include "base/macros.h"
--#include "ui/base/glib/glib_signal.h"
--#include "ui/gfx/native_widget_types.h"
--
--typedef struct _DbusmenuMenuitem DbusmenuMenuitem;
--typedef struct _DbusmenuServer DbusmenuServer;
--
--namespace ui {
--class Accelerator;
--}
--
--namespace atom {
--
--class NativeWindowViews;
--
--// Controls the Mac style menu bar on Unity.
--//
--// Unity has an Apple-like menu bar at the top of the screen that changes
--// depending on the active window. In the GTK port, we had a hidden GtkMenuBar
--// object in each GtkWindow which existed only to be scrapped by the
--// libdbusmenu-gtk code. Since we don't have GtkWindows anymore, we need to
--// interface directly with the lower level libdbusmenu-glib, which we
--// opportunistically dlopen() since not everyone is running Ubuntu.
--//
--// This class is like the chrome's corresponding one, but it generates the menu
--// from menu models instead, and it is also per-window specific.
--class GlobalMenuBarX11 {
-- public:
--  explicit GlobalMenuBarX11(NativeWindowViews* window);
--  virtual ~GlobalMenuBarX11();
--
--  // Creates the object path for DbusmenuServer which is attached to |xid|.
--  static std::string GetPathForWindow(gfx::AcceleratedWidget xid);
--
--  void SetMenu(AtomMenuModel* menu_model);
--  bool IsServerStarted() const;
--
--  // Called by NativeWindow when it show/hides.
--  void OnWindowMapped();
--  void OnWindowUnmapped();
--
-- private:
--  // Creates a DbusmenuServer.
--  void InitServer(gfx::AcceleratedWidget xid);
--
--  // Create a menu from menu model.
--  void BuildMenuFromModel(AtomMenuModel* model, DbusmenuMenuitem* parent);
--
--  // Sets the accelerator for |item|.
--  void RegisterAccelerator(DbusmenuMenuitem* item,
--                           const ui::Accelerator& accelerator);
--
--  CHROMEG_CALLBACK_1(GlobalMenuBarX11,
--                     void,
--                     OnItemActivated,
--                     DbusmenuMenuitem*,
--                     unsigned int);
--  CHROMEG_CALLBACK_0(GlobalMenuBarX11, void, OnSubMenuShow, DbusmenuMenuitem*);
--
--  NativeWindowViews* window_;
--  gfx::AcceleratedWidget xid_;
--
--  DbusmenuServer* server_ = nullptr;
--
--  DISALLOW_COPY_AND_ASSIGN(GlobalMenuBarX11);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_UI_VIEWS_GLOBAL_MENU_BAR_X11_H_
-removed in remote
-  base   100644 ba0a542c1e8df91a5be321b6ca2967f500421000 atom/browser/ui/views/menu_bar.cc
-  our    100644 e838d3cc217b5ffdb77226beff0d7217539f23f9 atom/browser/ui/views/menu_bar.cc
-@@ -1,187 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/ui/views/menu_bar.h"
--
--#include "atom/browser/ui/views/menu_delegate.h"
--#include "atom/browser/ui/views/submenu_button.h"
--#include "ui/base/models/menu_model.h"
--#include "ui/views/background.h"
--#include "ui/views/layout/box_layout.h"
--
--#if defined(OS_WIN)
--#include "ui/gfx/color_utils.h"
--#endif
--
--namespace atom {
--
--namespace {
--
--// Default color of the menu bar.
--const SkColor kDefaultColor = SkColorSetARGB(255, 233, 233, 233);
--
--}  // namespace
--
--const char MenuBar::kViewClassName[] = "ElectronMenuBar";
--
--MenuBar::MenuBar(views::View* window)
--    : background_color_(kDefaultColor), window_(window) {
--  RefreshColorCache();
--  UpdateViewColors();
--  SetLayoutManager(
--      std::make_unique<views::BoxLayout>(views::BoxLayout::kHorizontal));
--  window_->GetFocusManager()->AddFocusChangeListener(this);
--}
--
--MenuBar::~MenuBar() {
--  window_->GetFocusManager()->RemoveFocusChangeListener(this);
--}
--
--void MenuBar::SetMenu(AtomMenuModel* model) {
--  menu_model_ = model;
--  RebuildChildren();
--}
--
--void MenuBar::SetAcceleratorVisibility(bool visible) {
--  for (auto* child : GetChildrenInZOrder())
--    static_cast<SubmenuButton*>(child)->SetAcceleratorVisibility(visible);
--}
--
--MenuBar::View* MenuBar::FindAccelChild(base::char16 key) {
--  for (auto* child : GetChildrenInZOrder()) {
--    if (static_cast<SubmenuButton*>(child)->accelerator() == key)
--      return child;
--  }
--  return nullptr;
--}
--
--bool MenuBar::HasAccelerator(base::char16 key) {
--  return FindAccelChild(key) != nullptr;
--}
--
--void MenuBar::ActivateAccelerator(base::char16 key) {
--  auto* child = FindAccelChild(key);
--  if (child)
--    static_cast<SubmenuButton*>(child)->Activate(nullptr);
--}
--
--int MenuBar::GetItemCount() const {
--  return menu_model_ ? menu_model_->GetItemCount() : 0;
--}
--
--bool MenuBar::GetMenuButtonFromScreenPoint(const gfx::Point& screenPoint,
--                                           AtomMenuModel** menu_model,
--                                           views::MenuButton** button) {
--  if (!GetBoundsInScreen().Contains(screenPoint))
--    return false;
--
--  auto children = GetChildrenInZOrder();
--  for (int i = 0, n = children.size(); i < n; ++i) {
--    if (children[i]->GetBoundsInScreen().Contains(screenPoint) &&
--        (menu_model_->GetTypeAt(i) == AtomMenuModel::TYPE_SUBMENU)) {
--      *menu_model = menu_model_->GetSubmenuModelAt(i);
--      *button = static_cast<views::MenuButton*>(children[i]);
--      return true;
--    }
--  }
--
--  return false;
--}
--
--const char* MenuBar::GetClassName() const {
--  return kViewClassName;
--}
--
--void MenuBar::OnMenuButtonClicked(views::MenuButton* source,
--                                  const gfx::Point& point,
--                                  const ui::Event* event) {
--  // Hide the accelerator when a submenu is activated.
--  SetAcceleratorVisibility(false);
--
--  if (!menu_model_)
--    return;
--
--  if (!window_->HasFocus())
--    window_->RequestFocus();
--
--  int id = source->tag();
--  AtomMenuModel::ItemType type = menu_model_->GetTypeAt(id);
--  if (type != AtomMenuModel::TYPE_SUBMENU) {
--    menu_model_->ActivatedAt(id, 0);
--    return;
--  }
--
--  // Deleted in MenuDelegate::OnMenuClosed
--  MenuDelegate* menu_delegate = new MenuDelegate(this);
--  menu_delegate->RunMenu(menu_model_->GetSubmenuModelAt(id), source);
--}
--
--void MenuBar::RefreshColorCache(const ui::NativeTheme* theme) {
--  if (!theme)
--    theme = ui::NativeTheme::GetInstanceForNativeUi();
--  if (theme) {
--    background_color_ =
--        theme->GetSystemColor(ui::NativeTheme::kColorId_MenuBackgroundColor);
--#if defined(USE_X11)
--    enabled_color_ = theme->GetSystemColor(
--        ui::NativeTheme::kColorId_EnabledMenuItemForegroundColor);
--    disabled_color_ = theme->GetSystemColor(
--        ui::NativeTheme::kColorId_DisabledMenuItemForegroundColor);
--#endif
--  }
--#if defined(OS_WIN)
--  background_color_ = color_utils::GetSysSkColor(COLOR_MENUBAR);
--#endif
--}
--
--void MenuBar::OnNativeThemeChanged(const ui::NativeTheme* theme) {
--  RefreshColorCache(theme);
--  UpdateViewColors();
--}
--
--void MenuBar::OnDidChangeFocus(View* focused_before, View* focused_now) {
--  // if we've changed focus, update our view
--  const auto had_focus = has_focus_;
--  has_focus_ = focused_now != nullptr;
--  if (has_focus_ != had_focus)
--    UpdateViewColors();
--}
--
--void MenuBar::RebuildChildren() {
--  RemoveAllChildViews(true);
--  for (int i = 0, n = GetItemCount(); i < n; ++i) {
--    auto* button =
--        new SubmenuButton(menu_model_->GetLabelAt(i), this, background_color_);
--    button->set_tag(i);
--    AddChildView(button);
--  }
--  UpdateViewColors();
--}
--
--void MenuBar::UpdateViewColors() {
--  // set menubar background color
--  SetBackground(views::CreateSolidBackground(background_color_));
--
--  // set child colors
--  if (menu_model_ == nullptr)
--    return;
--#if defined(USE_X11)
--  const auto& textColor = has_focus_ ? enabled_color_ : disabled_color_;
--  for (auto* child : GetChildrenInZOrder()) {
--    auto* button = static_cast<SubmenuButton*>(child);
--    button->SetTextColor(views::Button::STATE_NORMAL, textColor);
--    button->SetTextColor(views::Button::STATE_DISABLED, disabled_color_);
--    button->SetTextColor(views::Button::STATE_PRESSED, enabled_color_);
--    button->SetTextColor(views::Button::STATE_HOVERED, textColor);
--    button->SetUnderlineColor(textColor);
--  }
--#elif defined(OS_WIN)
--  for (auto* child : GetChildrenInZOrder()) {
--    auto* button = static_cast<SubmenuButton*>(child);
--    button->SetUnderlineColor(color_utils::GetSysSkColor(COLOR_MENUTEXT));
--  }
--#endif
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 9d77cfdf2a22c7927132e91eaa06fc030731a26e atom/browser/ui/views/menu_bar.h
-  our    100644 2b10ba3e3bf2ccfc0453fdb59ad022ef7da8ed5b atom/browser/ui/views/menu_bar.h
-@@ -1,87 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_UI_VIEWS_MENU_BAR_H_
--#define ATOM_BROWSER_UI_VIEWS_MENU_BAR_H_
--
--#include "atom/browser/ui/atom_menu_model.h"
--#include "ui/views/controls/button/menu_button_listener.h"
--#include "ui/views/focus/focus_manager.h"
--#include "ui/views/view.h"
--
--namespace views {
--class MenuButton;
--}
--
--namespace atom {
--
--class MenuDelegate;
--
--class MenuBar : public views::View,
--                public views::MenuButtonListener,
--                public views::FocusChangeListener {
-- public:
--  static const char kViewClassName[];
--
--  explicit MenuBar(views::View* window);
--  ~MenuBar() override;
--
--  // Replaces current menu with a new one.
--  void SetMenu(AtomMenuModel* menu_model);
--
--  // Shows underline under accelerators.
--  void SetAcceleratorVisibility(bool visible);
--
--  // Returns true if the submenu has accelerator |key|
--  bool HasAccelerator(base::char16 key);
--
--  // Shows the submenu whose accelerator is |key|.
--  void ActivateAccelerator(base::char16 key);
--
--  // Returns there are how many items in the root menu.
--  int GetItemCount() const;
--
--  // Get the menu under specified screen point.
--  bool GetMenuButtonFromScreenPoint(const gfx::Point& point,
--                                    AtomMenuModel** menu_model,
--                                    views::MenuButton** button);
--
-- protected:
--  // views::View:
--  const char* GetClassName() const override;
--
--  // views::MenuButtonListener:
--  void OnMenuButtonClicked(views::MenuButton* source,
--                           const gfx::Point& point,
--                           const ui::Event* event) override;
--  void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
--
--  // views::FocusChangeListener:
--  void OnDidChangeFocus(View* focused_before, View* focused_now) override;
--  void OnWillChangeFocus(View* focused_before, View* focused_now) override {}
--
-- private:
--  void RebuildChildren();
--  void UpdateViewColors();
--
--  void RefreshColorCache(const ui::NativeTheme* theme = nullptr);
--  SkColor background_color_;
--#if defined(USE_X11)
--  SkColor enabled_color_;
--  SkColor disabled_color_;
--#endif
--
--  views::View* window_ = nullptr;
--  AtomMenuModel* menu_model_ = nullptr;
--
--  View* FindAccelChild(base::char16 key);
--
--  bool has_focus_ = true;
--
--  DISALLOW_COPY_AND_ASSIGN(MenuBar);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_UI_VIEWS_MENU_BAR_H_
-removed in remote
-  base   100644 f0ecf13b36b65aa96bee3e55ee459a9d3dad2aaf atom/browser/ui/views/menu_delegate.cc
-  our    100644 d8cb592293a765d96f1c9c743535224835d8476a atom/browser/ui/views/menu_delegate.cc
-@@ -1,125 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/ui/views/menu_delegate.h"
--
--#include "atom/browser/ui/views/menu_bar.h"
--#include "atom/browser/ui/views/menu_model_adapter.h"
--#include "content/public/browser/browser_thread.h"
--#include "ui/views/controls/button/menu_button.h"
--#include "ui/views/controls/menu/menu_item_view.h"
--#include "ui/views/controls/menu/menu_runner.h"
--#include "ui/views/widget/widget.h"
--
--namespace atom {
--
--MenuDelegate::MenuDelegate(MenuBar* menu_bar) : menu_bar_(menu_bar), id_(-1) {}
--
--MenuDelegate::~MenuDelegate() {}
--
--void MenuDelegate::RunMenu(AtomMenuModel* model, views::MenuButton* button) {
--  gfx::Point screen_loc;
--  views::View::ConvertPointToScreen(button, &screen_loc);
--  // Subtract 1 from the height to make the popup flush with the button border.
--  gfx::Rect bounds(screen_loc.x(), screen_loc.y(), button->width(),
--                   button->height() - 1);
--
--  id_ = button->tag();
--  adapter_.reset(new MenuModelAdapter(model));
--
--  views::MenuItemView* item = new views::MenuItemView(this);
--  static_cast<MenuModelAdapter*>(adapter_.get())->BuildMenu(item);
--
--  menu_runner_.reset(new views::MenuRunner(
--      item,
--      views::MenuRunner::CONTEXT_MENU | views::MenuRunner::HAS_MNEMONICS));
--  menu_runner_->RunMenuAt(button->GetWidget()->GetTopLevelWidget(), button,
--                          bounds, views::MENU_ANCHOR_TOPRIGHT,
--                          ui::MENU_SOURCE_MOUSE);
--}
--
--void MenuDelegate::ExecuteCommand(int id) {
--  adapter_->ExecuteCommand(id);
--}
--
--void MenuDelegate::ExecuteCommand(int id, int mouse_event_flags) {
--  adapter_->ExecuteCommand(id, mouse_event_flags);
--}
--
--bool MenuDelegate::IsTriggerableEvent(views::MenuItemView* source,
--                                      const ui::Event& e) {
--  return adapter_->IsTriggerableEvent(source, e);
--}
--
--bool MenuDelegate::GetAccelerator(int id, ui::Accelerator* accelerator) const {
--  return adapter_->GetAccelerator(id, accelerator);
--}
--
--base::string16 MenuDelegate::GetLabel(int id) const {
--  return adapter_->GetLabel(id);
--}
--
--const gfx::FontList* MenuDelegate::GetLabelFontList(int id) const {
--  return adapter_->GetLabelFontList(id);
--}
--
--bool MenuDelegate::IsCommandEnabled(int id) const {
--  return adapter_->IsCommandEnabled(id);
--}
--
--bool MenuDelegate::IsCommandVisible(int id) const {
--  return adapter_->IsCommandVisible(id);
--}
--
--bool MenuDelegate::IsItemChecked(int id) const {
--  return adapter_->IsItemChecked(id);
--}
--
--void MenuDelegate::SelectionChanged(views::MenuItemView* menu) {
--  adapter_->SelectionChanged(menu);
--}
--
--void MenuDelegate::WillShowMenu(views::MenuItemView* menu) {
--  adapter_->WillShowMenu(menu);
--}
--
--void MenuDelegate::WillHideMenu(views::MenuItemView* menu) {
--  adapter_->WillHideMenu(menu);
--}
--
--void MenuDelegate::OnMenuClosed(views::MenuItemView* menu) {
--  // Only switch to new menu when current menu is closed.
--  if (button_to_open_)
--    button_to_open_->Activate(nullptr);
--  delete this;
--}
--
--views::MenuItemView* MenuDelegate::GetSiblingMenu(
--    views::MenuItemView* menu,
--    const gfx::Point& screen_point,
--    views::MenuAnchorPosition* anchor,
--    bool* has_mnemonics,
--    views::MenuButton**) {
--  // TODO(zcbenz): We should follow Chromium's logics on implementing the
--  // sibling menu switches, this code is almost a hack.
--  views::MenuButton* button;
--  AtomMenuModel* model;
--  if (menu_bar_->GetMenuButtonFromScreenPoint(screen_point, &model, &button) &&
--      button->tag() != id_) {
--    bool switch_in_progress = !!button_to_open_;
--    // Always update target to open.
--    button_to_open_ = button;
--    // Switching menu asyncnously to avoid crash.
--    if (!switch_in_progress) {
--      content::BrowserThread::PostTask(
--          content::BrowserThread::UI, FROM_HERE,
--          base::Bind(&views::MenuRunner::Cancel,
--                     base::Unretained(menu_runner_.get())));
--    }
--  }
--
--  return nullptr;
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 211ddb57bc39086d183aeb96cce683cc901a99c7 atom/browser/ui/views/menu_delegate.h
-  our    100644 e23262a3aa7f6a5ff5ea0ba30b3b3f17c7c51735 atom/browser/ui/views/menu_delegate.h
-@@ -1,64 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_UI_VIEWS_MENU_DELEGATE_H_
--#define ATOM_BROWSER_UI_VIEWS_MENU_DELEGATE_H_
--
--#include <memory>
--
--#include "atom/browser/ui/atom_menu_model.h"
--#include "ui/views/controls/menu/menu_delegate.h"
--
--namespace views {
--class MenuRunner;
--}
--
--namespace atom {
--
--class MenuBar;
--
--class MenuDelegate : public views::MenuDelegate {
-- public:
--  explicit MenuDelegate(MenuBar* menu_bar);
--  ~MenuDelegate() override;
--
--  void RunMenu(AtomMenuModel* model, views::MenuButton* button);
--
-- protected:
--  // views::MenuDelegate:
--  void ExecuteCommand(int id) override;
--  void ExecuteCommand(int id, int mouse_event_flags) override;
--  bool IsTriggerableEvent(views::MenuItemView* source,
--                          const ui::Event& e) override;
--  bool GetAccelerator(int id, ui::Accelerator* accelerator) const override;
--  base::string16 GetLabel(int id) const override;
--  const gfx::FontList* GetLabelFontList(int id) const override;
--  bool IsCommandEnabled(int id) const override;
--  bool IsCommandVisible(int id) const override;
--  bool IsItemChecked(int id) const override;
--  void SelectionChanged(views::MenuItemView* menu) override;
--  void WillShowMenu(views::MenuItemView* menu) override;
--  void WillHideMenu(views::MenuItemView* menu) override;
--  void OnMenuClosed(views::MenuItemView* menu) override;
--  views::MenuItemView* GetSiblingMenu(views::MenuItemView* menu,
--                                      const gfx::Point& screen_point,
--                                      views::MenuAnchorPosition* anchor,
--                                      bool* has_mnemonics,
--                                      views::MenuButton** button) override;
--
-- private:
--  MenuBar* menu_bar_;
--  int id_;
--  std::unique_ptr<views::MenuDelegate> adapter_;
--  std::unique_ptr<views::MenuRunner> menu_runner_;
--
--  // The menu button to switch to.
--  views::MenuButton* button_to_open_ = nullptr;
--
--  DISALLOW_COPY_AND_ASSIGN(MenuDelegate);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_UI_VIEWS_MENU_DELEGATE_H_
-removed in remote
-  base   100644 134255f48458c86a7993e5924c26c64eeaf3aada atom/browser/ui/views/native_frame_view.cc
-  our    100644 2501373851a6ee76d568ffb113bc728cf147a452 atom/browser/ui/views/native_frame_view.cc
-@@ -1,28 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/ui/views/native_frame_view.h"
--
--#include "atom/browser/native_window.h"
--
--namespace atom {
--
--const char NativeFrameView::kViewClassName[] = "AtomNativeFrameView";
--
--NativeFrameView::NativeFrameView(NativeWindow* window, views::Widget* widget)
--    : views::NativeFrameView(widget), window_(window) {}
--
--gfx::Size NativeFrameView::GetMinimumSize() const {
--  return window_->GetMinimumSize();
--}
--
--gfx::Size NativeFrameView::GetMaximumSize() const {
--  return window_->GetMaximumSize();
--}
--
--const char* NativeFrameView::GetClassName() const {
--  return kViewClassName;
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 670459f1cbd0a42fef1f6ec31ad8705092fc73a6 atom/browser/ui/views/native_frame_view.h
-  our    100644 22aa0ff94e82d76be109ffcdc708611e12b1c7ea atom/browser/ui/views/native_frame_view.h
-@@ -1,35 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_UI_VIEWS_NATIVE_FRAME_VIEW_H_
--#define ATOM_BROWSER_UI_VIEWS_NATIVE_FRAME_VIEW_H_
--
--#include "ui/views/window/native_frame_view.h"
--
--namespace atom {
--
--class NativeWindow;
--
--// Like the views::NativeFrameView, but returns the min/max size from the
--// NativeWindowViews.
--class NativeFrameView : public views::NativeFrameView {
-- public:
--  static const char kViewClassName[];
--  NativeFrameView(NativeWindow* window, views::Widget* widget);
--
-- protected:
--  // views::View:
--  gfx::Size GetMinimumSize() const override;
--  gfx::Size GetMaximumSize() const override;
--  const char* GetClassName() const override;
--
-- private:
--  NativeWindow* window_;  // weak ref.
--
--  DISALLOW_COPY_AND_ASSIGN(NativeFrameView);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_UI_VIEWS_NATIVE_FRAME_VIEW_H_
-removed in remote
-  base   100644 72cab258cbecc9219b0fc508cb5d7e65ab642ab2 atom/browser/ui/views/submenu_button.cc
-  our    100644 1124d3d01471876fefa2757570ba3cff796a991c atom/browser/ui/views/submenu_button.cc
-@@ -1,107 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/ui/views/submenu_button.h"
--
--#include "base/strings/string_util.h"
--#include "base/strings/utf_string_conversions.h"
--#include "ui/gfx/canvas.h"
--#include "ui/gfx/color_utils.h"
--#include "ui/gfx/text_utils.h"
--#include "ui/views/animation/flood_fill_ink_drop_ripple.h"
--#include "ui/views/animation/ink_drop_host_view.h"
--#include "ui/views/animation/ink_drop_impl.h"
--#include "ui/views/controls/button/label_button_border.h"
--
--namespace atom {
--
--SubmenuButton::SubmenuButton(const base::string16& title,
--                             views::MenuButtonListener* menu_button_listener,
--                             const SkColor& background_color)
--    : views::MenuButton(gfx::RemoveAcceleratorChar(title, '&', NULL, NULL),
--                        menu_button_listener,
--                        false),
--      background_color_(background_color) {
--#if defined(OS_LINUX)
--  // Dont' use native style border.
--  SetBorder(CreateDefaultBorder());
--#endif
--
--  if (GetUnderlinePosition(title, &accelerator_, &underline_start_,
--                           &underline_end_))
--    gfx::Canvas::SizeStringInt(GetText(), gfx::FontList(), &text_width_,
--                               &text_height_, 0, 0);
--
--  SetInkDropMode(InkDropMode::ON);
--  set_ink_drop_base_color(
--      color_utils::BlendTowardOppositeLuma(background_color_, 0x61));
--}
--
--SubmenuButton::~SubmenuButton() {}
--
--std::unique_ptr<views::InkDropRipple> SubmenuButton::CreateInkDropRipple()
--    const {
--  std::unique_ptr<views::InkDropRipple> ripple(
--      new views::FloodFillInkDropRipple(
--          size(), GetInkDropCenterBasedOnLastEvent(), GetInkDropBaseColor(),
--          ink_drop_visible_opacity()));
--  return ripple;
--}
--
--std::unique_ptr<views::InkDrop> SubmenuButton::CreateInkDrop() {
--  std::unique_ptr<views::InkDropImpl> ink_drop =
--      views::Button::CreateDefaultInkDropImpl();
--  ink_drop->SetShowHighlightOnHover(false);
--  return std::move(ink_drop);
--}
--
--void SubmenuButton::SetAcceleratorVisibility(bool visible) {
--  if (visible == show_underline_)
--    return;
--
--  show_underline_ = visible;
--  SchedulePaint();
--}
--
--void SubmenuButton::SetUnderlineColor(SkColor color) {
--  underline_color_ = color;
--}
--
--void SubmenuButton::PaintButtonContents(gfx::Canvas* canvas) {
--  views::MenuButton::PaintButtonContents(canvas);
--
--  if (show_underline_ && (underline_start_ != underline_end_)) {
--    int padding = (width() - text_width_) / 2;
--    int underline_height = (height() + text_height_) / 2 - 2;
--    canvas->DrawLine(gfx::Point(underline_start_ + padding, underline_height),
--                     gfx::Point(underline_end_ + padding, underline_height),
--                     underline_color_);
--  }
--}
--
--bool SubmenuButton::GetUnderlinePosition(const base::string16& text,
--                                         base::char16* accelerator,
--                                         int* start,
--                                         int* end) const {
--  int pos, span;
--  base::string16 trimmed = gfx::RemoveAcceleratorChar(text, '&', &pos, &span);
--  if (pos > -1 && span != 0) {
--    *accelerator = base::ToUpperASCII(trimmed[pos]);
--    GetCharacterPosition(trimmed, pos, start);
--    GetCharacterPosition(trimmed, pos + span, end);
--    return true;
--  }
--
--  return false;
--}
--
--void SubmenuButton::GetCharacterPosition(const base::string16& text,
--                                         int index,
--                                         int* pos) const {
--  int height = 0;
--  gfx::Canvas::SizeStringInt(text.substr(0, index), gfx::FontList(), pos,
--                             &height, 0, 0);
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 3f72a60c10b499e42c9a2b63218397911f17910e atom/browser/ui/views/submenu_button.h
-  our    100644 d8b7785da131271e88533879d090badfd6e49dd5 atom/browser/ui/views/submenu_button.h
-@@ -1,58 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_UI_VIEWS_SUBMENU_BUTTON_H_
--#define ATOM_BROWSER_UI_VIEWS_SUBMENU_BUTTON_H_
--
--#include "ui/views/animation/ink_drop_highlight.h"
--#include "ui/views/controls/button/menu_button.h"
--
--namespace atom {
--
--// Special button that used by menu bar to show submenus.
--class SubmenuButton : public views::MenuButton {
-- public:
--  SubmenuButton(const base::string16& title,
--                views::MenuButtonListener* menu_button_listener,
--                const SkColor& background_color);
--  ~SubmenuButton() override;
--
--  void SetAcceleratorVisibility(bool visible);
--  void SetUnderlineColor(SkColor color);
--
--  base::char16 accelerator() const { return accelerator_; }
--
--  // views::MenuButton:
--  void PaintButtonContents(gfx::Canvas* canvas) override;
--
--  // views::InkDropHostView:
--  std::unique_ptr<views::InkDropRipple> CreateInkDropRipple() const override;
--  std::unique_ptr<views::InkDrop> CreateInkDrop() override;
--
-- private:
--  bool GetUnderlinePosition(const base::string16& text,
--                            base::char16* accelerator,
--                            int* start,
--                            int* end) const;
--  void GetCharacterPosition(const base::string16& text,
--                            int index,
--                            int* pos) const;
--
--  base::char16 accelerator_ = 0;
--
--  bool show_underline_ = false;
--
--  int underline_start_ = 0;
--  int underline_end_ = 0;
--  int text_width_ = 0;
--  int text_height_ = 0;
--  SkColor underline_color_ = SK_ColorBLACK;
--  SkColor background_color_;
--
--  DISALLOW_COPY_AND_ASSIGN(SubmenuButton);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_UI_VIEWS_SUBMENU_BUTTON_H_
-removed in remote
-  base   100644 fca7cb23347c6d2fbc056384fcec9de5bcdb2501 atom/browser/ui/views/win_frame_view.cc
-  our    100644 8f2139cb90fab876a1db1b17cac016997a3904ba atom/browser/ui/views/win_frame_view.cc
-@@ -1,37 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/ui/views/win_frame_view.h"
--
--#include "atom/browser/native_window_views.h"
--#include "ui/views/widget/widget.h"
--#include "ui/views/win/hwnd_util.h"
--
--namespace atom {
--
--const char WinFrameView::kViewClassName[] = "WinFrameView";
--
--WinFrameView::WinFrameView() {}
--
--WinFrameView::~WinFrameView() {}
--
--gfx::Rect WinFrameView::GetWindowBoundsForClientBounds(
--    const gfx::Rect& client_bounds) const {
--  return views::GetWindowBoundsForClientBounds(
--      static_cast<views::View*>(const_cast<WinFrameView*>(this)),
--      client_bounds);
--}
--
--int WinFrameView::NonClientHitTest(const gfx::Point& point) {
--  if (window_->has_frame())
--    return frame_->client_view()->NonClientHitTest(point);
--  else
--    return FramelessView::NonClientHitTest(point);
--}
--
--const char* WinFrameView::GetClassName() const {
--  return kViewClassName;
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 b2c1ef3a15de9a222233a27193ed811a8add09f6 atom/browser/ui/views/win_frame_view.h
-  our    100644 a6ffd7f363304913bb124908f138258bb804e56f atom/browser/ui/views/win_frame_view.h
-@@ -1,32 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_UI_VIEWS_WIN_FRAME_VIEW_H_
--#define ATOM_BROWSER_UI_VIEWS_WIN_FRAME_VIEW_H_
--
--#include "atom/browser/ui/views/frameless_view.h"
--
--namespace atom {
--
--class WinFrameView : public FramelessView {
-- public:
--  static const char kViewClassName[];
--  WinFrameView();
--  ~WinFrameView() override;
--
--  // views::NonClientFrameView:
--  gfx::Rect GetWindowBoundsForClientBounds(
--      const gfx::Rect& client_bounds) const override;
--  int NonClientHitTest(const gfx::Point& point) override;
--
--  // views::View:
--  const char* GetClassName() const override;
--
-- private:
--  DISALLOW_COPY_AND_ASSIGN(WinFrameView);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_UI_VIEWS_WIN_FRAME_VIEW_H_
-removed in remote
-  base   100644 84a6d9aa3e50ced33616fb4b78e124f39461cd0e atom/browser/ui/win/atom_desktop_window_tree_host_win.cc
-  our    100644 97857d6515aa5617cf8c1972690a1dcdfd645ac1 atom/browser/ui/win/atom_desktop_window_tree_host_win.cc
-@@ -1,35 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/ui/win/atom_desktop_window_tree_host_win.h"
--
--#include "atom/browser/ui/win/message_handler_delegate.h"
--
--namespace atom {
--
--AtomDesktopWindowTreeHostWin::AtomDesktopWindowTreeHostWin(
--    MessageHandlerDelegate* delegate,
--    views::internal::NativeWidgetDelegate* native_widget_delegate,
--    views::DesktopNativeWidgetAura* desktop_native_widget_aura)
--    : views::DesktopWindowTreeHostWin(native_widget_delegate,
--                                      desktop_native_widget_aura),
--      delegate_(delegate) {}
--
--AtomDesktopWindowTreeHostWin::~AtomDesktopWindowTreeHostWin() {}
--
--bool AtomDesktopWindowTreeHostWin::PreHandleMSG(UINT message,
--                                                WPARAM w_param,
--                                                LPARAM l_param,
--                                                LRESULT* result) {
--  return delegate_->PreHandleMSG(message, w_param, l_param, result);
--}
--
--bool AtomDesktopWindowTreeHostWin::HasNativeFrame() const {
--  // Since we never use chromium's titlebar implementation, we can just say
--  // that we use a native titlebar. This will disable the repaint locking when
--  // DWM composition is disabled.
--  return true;
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 47e4cb6aed2a962bfdd2a92edaca74b452d15c4d atom/browser/ui/win/atom_desktop_window_tree_host_win.h
-  our    100644 30af3cc162b4429cb3335c6864b801eac1d5f963 atom/browser/ui/win/atom_desktop_window_tree_host_win.h
-@@ -1,42 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_UI_WIN_ATOM_DESKTOP_WINDOW_TREE_HOST_WIN_H_
--#define ATOM_BROWSER_UI_WIN_ATOM_DESKTOP_WINDOW_TREE_HOST_WIN_H_
--
--#include <windows.h>
--
--#include <vector>
--
--#include "atom/browser/native_window.h"
--#include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h"
--
--namespace atom {
--
--class MessageHandlerDelegate;
--
--class AtomDesktopWindowTreeHostWin : public views::DesktopWindowTreeHostWin {
-- public:
--  AtomDesktopWindowTreeHostWin(
--      MessageHandlerDelegate* delegate,
--      views::internal::NativeWidgetDelegate* native_widget_delegate,
--      views::DesktopNativeWidgetAura* desktop_native_widget_aura);
--  ~AtomDesktopWindowTreeHostWin() override;
--
-- protected:
--  bool PreHandleMSG(UINT message,
--                    WPARAM w_param,
--                    LPARAM l_param,
--                    LRESULT* result) override;
--  bool HasNativeFrame() const override;
--
-- private:
--  MessageHandlerDelegate* delegate_;  // weak ref
--
--  DISALLOW_COPY_AND_ASSIGN(AtomDesktopWindowTreeHostWin);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_UI_WIN_ATOM_DESKTOP_WINDOW_TREE_HOST_WIN_H_
-removed in remote
-  base   100644 791d1fd816d9ea2459c930e536c125c7851ccbc8 atom/browser/ui/win/message_handler_delegate.cc
-  our    100644 d8b4a42ffacbfd70bf9c8049f7966de450627064 atom/browser/ui/win/message_handler_delegate.cc
-@@ -1,16 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/ui/win/message_handler_delegate.h"
--
--namespace atom {
--
--bool MessageHandlerDelegate::PreHandleMSG(UINT message,
--                                          WPARAM w_param,
--                                          LPARAM l_param,
--                                          LRESULT* result) {
--  return false;
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 d8cfcf7fc43b9089c01055aafa337ca0ee2d1038 atom/browser/ui/win/message_handler_delegate.h
-  our    100644 1eb490a28d7bfa4b77c80a691c4f1ab8c56403ca atom/browser/ui/win/message_handler_delegate.h
-@@ -1,28 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_UI_WIN_MESSAGE_HANDLER_DELEGATE_H_
--#define ATOM_BROWSER_UI_WIN_MESSAGE_HANDLER_DELEGATE_H_
--
--#include <windows.h>
--
--namespace atom {
--
--class MessageHandlerDelegate {
-- public:
--  // Catch-all message handling and filtering. Called before
--  // HWNDMessageHandler's built-in handling, which may pre-empt some
--  // expectations in Views/Aura if messages are consumed. Returns true if the
--  // message was consumed by the delegate and should not be processed further
--  // by the HWNDMessageHandler. In this case, |result| is returned. |result| is
--  // not modified otherwise.
--  virtual bool PreHandleMSG(UINT message,
--                            WPARAM w_param,
--                            LPARAM l_param,
--                            LRESULT* result);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_UI_WIN_MESSAGE_HANDLER_DELEGATE_H_
-removed in remote
-  base   100644 112473013808250a317da6422c6143829ac69677 atom/browser/ui/win/notify_icon.cc
-  our    100644 9b01de8a49f6ca3daa61b5c8e7d863e87b5e573d atom/browser/ui/win/notify_icon.cc
-@@ -1,175 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/ui/win/notify_icon.h"
--
--#include "atom/browser/ui/win/notify_icon_host.h"
--#include "base/strings/string_number_conversions.h"
--#include "base/strings/utf_string_conversions.h"
--#include "base/win/windows_version.h"
--#include "third_party/skia/include/core/SkBitmap.h"
--#include "ui/display/screen.h"
--#include "ui/display/win/screen_win.h"
--#include "ui/gfx/geometry/point.h"
--#include "ui/gfx/geometry/rect.h"
--#include "ui/gfx/image/image.h"
--#include "ui/views/controls/menu/menu_runner.h"
--
--namespace atom {
--
--NotifyIcon::NotifyIcon(NotifyIconHost* host, UINT id, HWND window, UINT message)
--    : host_(host), icon_id_(id), window_(window), message_id_(message) {
--  NOTIFYICONDATA icon_data;
--  InitIconData(&icon_data);
--  icon_data.uFlags |= NIF_MESSAGE;
--  icon_data.uCallbackMessage = message_id_;
--  BOOL result = Shell_NotifyIcon(NIM_ADD, &icon_data);
--  // This can happen if the explorer process isn't running when we try to
--  // create the icon for some reason (for example, at startup).
--  if (!result)
--    LOG(WARNING) << "Unable to create status tray icon.";
--}
--
--NotifyIcon::~NotifyIcon() {
--  // Remove our icon.
--  host_->Remove(this);
--  NOTIFYICONDATA icon_data;
--  InitIconData(&icon_data);
--  Shell_NotifyIcon(NIM_DELETE, &icon_data);
--}
--
--void NotifyIcon::HandleClickEvent(int modifiers,
--                                  bool left_mouse_click,
--                                  bool double_button_click) {
--  gfx::Rect bounds = GetBounds();
--
--  if (left_mouse_click) {
--    if (double_button_click)  // double left click
--      NotifyDoubleClicked(bounds, modifiers);
--    else  // single left click
--      NotifyClicked(bounds,
--                    display::Screen::GetScreen()->GetCursorScreenPoint(),
--                    modifiers);
--    return;
--  } else if (!double_button_click) {  // single right click
--    if (menu_model_)
--      PopUpContextMenu(gfx::Point(), menu_model_);
--    else
--      NotifyRightClicked(bounds, modifiers);
--  }
--}
--
--void NotifyIcon::ResetIcon() {
--  NOTIFYICONDATA icon_data;
--  InitIconData(&icon_data);
--  // Delete any previously existing icon.
--  Shell_NotifyIcon(NIM_DELETE, &icon_data);
--  InitIconData(&icon_data);
--  icon_data.uFlags |= NIF_MESSAGE;
--  icon_data.uCallbackMessage = message_id_;
--  icon_data.hIcon = icon_.get();
--  // If we have an image, then set the NIF_ICON flag, which tells
--  // Shell_NotifyIcon() to set the image for the status icon it creates.
--  if (icon_data.hIcon)
--    icon_data.uFlags |= NIF_ICON;
--  // Re-add our icon.
--  BOOL result = Shell_NotifyIcon(NIM_ADD, &icon_data);
--  if (!result)
--    LOG(WARNING) << "Unable to re-create status tray icon.";
--}
--
--void NotifyIcon::SetImage(HICON image) {
--  icon_ = base::win::ScopedHICON(CopyIcon(image));
--
--  // Create the icon.
--  NOTIFYICONDATA icon_data;
--  InitIconData(&icon_data);
--  icon_data.uFlags |= NIF_ICON;
--  icon_data.hIcon = image;
--  BOOL result = Shell_NotifyIcon(NIM_MODIFY, &icon_data);
--  if (!result)
--    LOG(WARNING) << "Error setting status tray icon image";
--}
--
--void NotifyIcon::SetPressedImage(HICON image) {
--  // Ignore pressed images, since the standard on Windows is to not highlight
--  // pressed status icons.
--}
--
--void NotifyIcon::SetToolTip(const std::string& tool_tip) {
--  // Create the icon.
--  NOTIFYICONDATA icon_data;
--  InitIconData(&icon_data);
--  icon_data.uFlags |= NIF_TIP;
--  wcsncpy_s(icon_data.szTip, base::UTF8ToUTF16(tool_tip).c_str(), _TRUNCATE);
--  BOOL result = Shell_NotifyIcon(NIM_MODIFY, &icon_data);
--  if (!result)
--    LOG(WARNING) << "Unable to set tooltip for status tray icon";
--}
--
--void NotifyIcon::DisplayBalloon(HICON icon,
--                                const base::string16& title,
--                                const base::string16& contents) {
--  NOTIFYICONDATA icon_data;
--  InitIconData(&icon_data);
--  icon_data.uFlags |= NIF_INFO;
--  icon_data.dwInfoFlags = NIIF_INFO;
--  wcsncpy_s(icon_data.szInfoTitle, title.c_str(), _TRUNCATE);
--  wcsncpy_s(icon_data.szInfo, contents.c_str(), _TRUNCATE);
--  icon_data.uTimeout = 0;
--  icon_data.hBalloonIcon = icon;
--  icon_data.dwInfoFlags = NIIF_USER | NIIF_LARGE_ICON;
--
--  BOOL result = Shell_NotifyIcon(NIM_MODIFY, &icon_data);
--  if (!result)
--    LOG(WARNING) << "Unable to create status tray balloon.";
--}
--
--void NotifyIcon::PopUpContextMenu(const gfx::Point& pos,
--                                  AtomMenuModel* menu_model) {
--  // Returns if context menu isn't set.
--  if (menu_model == nullptr && menu_model_ == nullptr)
--    return;
--
--  // Set our window as the foreground window, so the context menu closes when
--  // we click away from it.
--  if (!SetForegroundWindow(window_))
--    return;
--
--  // Show menu at mouse's position by default.
--  gfx::Rect rect(pos, gfx::Size());
--  if (pos.IsOrigin())
--    rect.set_origin(display::Screen::GetScreen()->GetCursorScreenPoint());
--
--  menu_runner_.reset(new views::MenuRunner(
--      menu_model != nullptr ? menu_model : menu_model_,
--      views::MenuRunner::CONTEXT_MENU | views::MenuRunner::HAS_MNEMONICS));
--  menu_runner_->RunMenuAt(NULL, NULL, rect, views::MENU_ANCHOR_TOPLEFT,
--                          ui::MENU_SOURCE_MOUSE);
--}
--
--void NotifyIcon::SetContextMenu(AtomMenuModel* menu_model) {
--  menu_model_ = menu_model;
--}
--
--gfx::Rect NotifyIcon::GetBounds() {
--  NOTIFYICONIDENTIFIER icon_id;
--  memset(&icon_id, 0, sizeof(NOTIFYICONIDENTIFIER));
--  icon_id.uID = icon_id_;
--  icon_id.hWnd = window_;
--  icon_id.cbSize = sizeof(NOTIFYICONIDENTIFIER);
--
--  RECT rect = {0};
--  Shell_NotifyIconGetRect(&icon_id, &rect);
--  return display::win::ScreenWin::ScreenToDIPRect(window_, gfx::Rect(rect));
--}
--
--void NotifyIcon::InitIconData(NOTIFYICONDATA* icon_data) {
--  memset(icon_data, 0, sizeof(NOTIFYICONDATA));
--  icon_data->cbSize = sizeof(NOTIFYICONDATA);
--  icon_data->hWnd = window_;
--  icon_data->uID = icon_id_;
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 53ed49b937c162e9406c176e84a69689c7ecfef4 atom/browser/ui/win/notify_icon.h
-  our    100644 bd4c17d2fcee53c7c106b0912252848cd6de0dc7 atom/browser/ui/win/notify_icon.h
-@@ -1,92 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_UI_WIN_NOTIFY_ICON_H_
--#define ATOM_BROWSER_UI_WIN_NOTIFY_ICON_H_
--
--#include <windows.h>  // windows.h must be included first
--
--#include <shellapi.h>
--
--#include <string>
--
--#include "atom/browser/ui/tray_icon.h"
--#include "base/compiler_specific.h"
--#include "base/macros.h"
--#include "base/win/scoped_gdi_object.h"
--
--namespace gfx {
--class Point;
--}
--
--namespace views {
--class MenuRunner;
--}
--
--namespace atom {
--
--class NotifyIconHost;
--
--class NotifyIcon : public TrayIcon {
-- public:
--  // Constructor which provides this icon's unique ID and messaging window.
--  NotifyIcon(NotifyIconHost* host, UINT id, HWND window, UINT message);
--  ~NotifyIcon() override;
--
--  // Handles a click event from the user - if |left_button_click| is true and
--  // there is a registered observer, passes the click event to the observer,
--  // otherwise displays the context menu if there is one.
--  void HandleClickEvent(int modifiers,
--                        bool left_button_click,
--                        bool double_button_click);
--
--  // Re-creates the status tray icon now after the taskbar has been created.
--  void ResetIcon();
--
--  UINT icon_id() const { return icon_id_; }
--  HWND window() const { return window_; }
--  UINT message_id() const { return message_id_; }
--
--  // Overridden from TrayIcon:
--  void SetImage(HICON image) override;
--  void SetPressedImage(HICON image) override;
--  void SetToolTip(const std::string& tool_tip) override;
--  void DisplayBalloon(HICON icon,
--                      const base::string16& title,
--                      const base::string16& contents) override;
--  void PopUpContextMenu(const gfx::Point& pos,
--                        AtomMenuModel* menu_model) override;
--  void SetContextMenu(AtomMenuModel* menu_model) override;
--  gfx::Rect GetBounds() override;
--
-- private:
--  void InitIconData(NOTIFYICONDATA* icon_data);
--
--  // The tray that owns us.  Weak.
--  NotifyIconHost* host_;
--
--  // The unique ID corresponding to this icon.
--  UINT icon_id_;
--
--  // Window used for processing messages from this icon.
--  HWND window_;
--
--  // The message identifier used for status icon messages.
--  UINT message_id_;
--
--  // The currently-displayed icon for the window.
--  base::win::ScopedHICON icon_;
--
--  // The context menu.
--  AtomMenuModel* menu_model_ = nullptr;
--
--  // Context menu associated with this icon (if any).
--  std::unique_ptr<views::MenuRunner> menu_runner_;
--
--  DISALLOW_COPY_AND_ASSIGN(NotifyIcon);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_UI_WIN_NOTIFY_ICON_H_
-removed in remote
-  base   100644 1f0b35b09fd24c625cf6ebc0704691ebb1dcf0df atom/browser/ui/win/notify_icon_host.cc
-  our    100644 435ec050be4315d42cac4985f122fbb7e62702e5 atom/browser/ui/win/notify_icon_host.cc
-@@ -1,183 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/ui/win/notify_icon_host.h"
--
--#include <commctrl.h>
--#include <winuser.h>
--
--#include "atom/browser/ui/win/notify_icon.h"
--#include "base/bind.h"
--#include "base/stl_util.h"
--#include "base/win/win_util.h"
--#include "base/win/wrapped_window_proc.h"
--#include "ui/events/event_constants.h"
--#include "ui/events/win/system_event_state_lookup.h"
--#include "ui/gfx/win/hwnd_util.h"
--
--namespace atom {
--
--namespace {
--
--const UINT kNotifyIconMessage = WM_APP + 1;
--
--// |kBaseIconId| is 2 to avoid conflicts with plugins that hard-code id 1.
--const UINT kBaseIconId = 2;
--
--const wchar_t kNotifyIconHostWindowClass[] = L"Electron_NotifyIconHostWindow";
--
--bool IsWinPressed() {
--  return ((::GetKeyState(VK_LWIN) & 0x8000) == 0x8000) ||
--         ((::GetKeyState(VK_RWIN) & 0x8000) == 0x8000);
--}
--
--int GetKeyboardModifers() {
--  int modifiers = ui::EF_NONE;
--  if (ui::win::IsShiftPressed())
--    modifiers |= ui::EF_SHIFT_DOWN;
--  if (ui::win::IsCtrlPressed())
--    modifiers |= ui::EF_CONTROL_DOWN;
--  if (ui::win::IsAltPressed())
--    modifiers |= ui::EF_ALT_DOWN;
--  if (IsWinPressed())
--    modifiers |= ui::EF_COMMAND_DOWN;
--  return modifiers;
--}
--
--}  // namespace
--
--NotifyIconHost::NotifyIconHost() {
--  // Register our window class
--  WNDCLASSEX window_class;
--  base::win::InitializeWindowClass(
--      kNotifyIconHostWindowClass,
--      &base::win::WrappedWindowProc<NotifyIconHost::WndProcStatic>, 0, 0, 0,
--      NULL, NULL, NULL, NULL, NULL, &window_class);
--  instance_ = window_class.hInstance;
--  atom_ = RegisterClassEx(&window_class);
--  CHECK(atom_);
--
--  // If the taskbar is re-created after we start up, we have to rebuild all of
--  // our icons.
--  taskbar_created_message_ = RegisterWindowMessage(TEXT("TaskbarCreated"));
--
--  // Create an offscreen window for handling messages for the status icons. We
--  // create a hidden WS_POPUP window instead of an HWND_MESSAGE window, because
--  // only top-level windows such as popups can receive broadcast messages like
--  // "TaskbarCreated".
--  window_ = CreateWindow(MAKEINTATOM(atom_), 0, WS_POPUP, 0, 0, 0, 0, 0, 0,
--                         instance_, 0);
--  gfx::CheckWindowCreated(window_);
--  gfx::SetWindowUserData(window_, this);
--}
--
--NotifyIconHost::~NotifyIconHost() {
--  if (window_)
--    DestroyWindow(window_);
--
--  if (atom_)
--    UnregisterClass(MAKEINTATOM(atom_), instance_);
--
--  for (NotifyIcon* ptr : notify_icons_)
--    delete ptr;
--}
--
--NotifyIcon* NotifyIconHost::CreateNotifyIcon() {
--  NotifyIcon* notify_icon =
--      new NotifyIcon(this, NextIconId(), window_, kNotifyIconMessage);
--  notify_icons_.push_back(notify_icon);
--  return notify_icon;
--}
--
--void NotifyIconHost::Remove(NotifyIcon* icon) {
--  NotifyIcons::iterator i(
--      std::find(notify_icons_.begin(), notify_icons_.end(), icon));
--
--  if (i == notify_icons_.end()) {
--    NOTREACHED();
--    return;
--  }
--
--  notify_icons_.erase(i);
--}
--
--LRESULT CALLBACK NotifyIconHost::WndProcStatic(HWND hwnd,
--                                               UINT message,
--                                               WPARAM wparam,
--                                               LPARAM lparam) {
--  NotifyIconHost* msg_wnd =
--      reinterpret_cast<NotifyIconHost*>(GetWindowLongPtr(hwnd, GWLP_USERDATA));
--  if (msg_wnd)
--    return msg_wnd->WndProc(hwnd, message, wparam, lparam);
--  else
--    return ::DefWindowProc(hwnd, message, wparam, lparam);
--}
--
--LRESULT CALLBACK NotifyIconHost::WndProc(HWND hwnd,
--                                         UINT message,
--                                         WPARAM wparam,
--                                         LPARAM lparam) {
--  if (message == taskbar_created_message_) {
--    // We need to reset all of our icons because the taskbar went away.
--    for (NotifyIcons::const_iterator i(notify_icons_.begin());
--         i != notify_icons_.end(); ++i) {
--      NotifyIcon* win_icon = static_cast<NotifyIcon*>(*i);
--      win_icon->ResetIcon();
--    }
--    return TRUE;
--  } else if (message == kNotifyIconMessage) {
--    NotifyIcon* win_icon = NULL;
--
--    // Find the selected status icon.
--    for (NotifyIcons::const_iterator i(notify_icons_.begin());
--         i != notify_icons_.end(); ++i) {
--      NotifyIcon* current_win_icon = static_cast<NotifyIcon*>(*i);
--      if (current_win_icon->icon_id() == wparam) {
--        win_icon = current_win_icon;
--        break;
--      }
--    }
--
--    // It is possible for this procedure to be called with an obsolete icon
--    // id.  In that case we should just return early before handling any
--    // actions.
--    if (!win_icon)
--      return TRUE;
--
--    switch (lparam) {
--      case TB_CHECKBUTTON:
--        win_icon->NotifyBalloonShow();
--        return TRUE;
--
--      case TB_INDETERMINATE:
--        win_icon->NotifyBalloonClicked();
--        return TRUE;
--
--      case TB_HIDEBUTTON:
--        win_icon->NotifyBalloonClosed();
--        return TRUE;
--
--      case WM_LBUTTONDOWN:
--      case WM_RBUTTONDOWN:
--      case WM_LBUTTONDBLCLK:
--      case WM_RBUTTONDBLCLK:
--      case WM_CONTEXTMENU:
--        // Walk our icons, find which one was clicked on, and invoke its
--        // HandleClickEvent() method.
--        win_icon->HandleClickEvent(
--            GetKeyboardModifers(),
--            (lparam == WM_LBUTTONDOWN || lparam == WM_LBUTTONDBLCLK),
--            (lparam == WM_LBUTTONDBLCLK || lparam == WM_RBUTTONDBLCLK));
--        return TRUE;
--    }
--  }
--  return ::DefWindowProc(hwnd, message, wparam, lparam);
--}
--
--UINT NotifyIconHost::NextIconId() {
--  UINT icon_id = next_icon_id_++;
--  return kBaseIconId + icon_id;
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 6797d4f6a54c9530be2f71d16b9681432ab65452 atom/browser/ui/win/notify_icon_host.h
-  our    100644 6e4dd4e552233e09be8c034198c4d43fde07dbbc atom/browser/ui/win/notify_icon_host.h
-@@ -1,66 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_UI_WIN_NOTIFY_ICON_HOST_H_
--#define ATOM_BROWSER_UI_WIN_NOTIFY_ICON_HOST_H_
--
--#include <windows.h>
--
--#include <vector>
--
--#include "base/macros.h"
--
--namespace atom {
--
--class NotifyIcon;
--
--class NotifyIconHost {
-- public:
--  NotifyIconHost();
--  ~NotifyIconHost();
--
--  NotifyIcon* CreateNotifyIcon();
--  void Remove(NotifyIcon* notify_icon);
--
-- private:
--  typedef std::vector<NotifyIcon*> NotifyIcons;
--
--  // Static callback invoked when a message comes in to our messaging window.
--  static LRESULT CALLBACK WndProcStatic(HWND hwnd,
--                                        UINT message,
--                                        WPARAM wparam,
--                                        LPARAM lparam);
--
--  LRESULT CALLBACK WndProc(HWND hwnd,
--                           UINT message,
--                           WPARAM wparam,
--                           LPARAM lparam);
--
--  UINT NextIconId();
--
--  // The unique icon ID we will assign to the next icon.
--  UINT next_icon_id_ = 1;
--
--  // List containing all active NotifyIcons.
--  NotifyIcons notify_icons_;
--
--  // The window class of |window_|.
--  ATOM atom_ = 0;
--
--  // The handle of the module that contains the window procedure of |window_|.
--  HMODULE instance_ = nullptr;
--
--  // The window used for processing events.
--  HWND window_ = nullptr;
--
--  // The message ID of the "TaskbarCreated" message, sent to us when we need to
--  // reset our status icons.
--  UINT taskbar_created_message_ = 0;
--
--  DISALLOW_COPY_AND_ASSIGN(NotifyIconHost);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_UI_WIN_NOTIFY_ICON_HOST_H_
-removed in remote
-  base   100644 f7841cfa856c7c9d6a5ac362ccf39bfce972438a atom/browser/ui/win/taskbar_host.cc
-  our    100644 c4b92a24aefb3afa3ff2929eea59940d439e8709 atom/browser/ui/win/taskbar_host.cc
-@@ -1,226 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/ui/win/taskbar_host.h"
--
--#include <objbase.h>
--#include <string>
--
--#include "atom/browser/native_window.h"
--#include "base/stl_util.h"
--#include "base/strings/utf_string_conversions.h"
--#include "base/win/scoped_gdi_object.h"
--#include "third_party/skia/include/core/SkBitmap.h"
--#include "ui/display/win/screen_win.h"
--#include "ui/gfx/icon_util.h"
--
--namespace atom {
--
--namespace {
--
--// From MSDN:
--// https://msdn.microsoft.com/en-us/library/windows/desktop/dd378460(v=vs.85).aspx#thumbbars
--// The thumbnail toolbar has a maximum of seven buttons due to the limited room.
--const size_t kMaxButtonsCount = 7;
--
--// The base id of Thumbar button.
--const int kButtonIdBase = 40001;
--
--bool GetThumbarButtonFlags(const std::vector<std::string>& flags,
--                           THUMBBUTTONFLAGS* out) {
--  THUMBBUTTONFLAGS result = THBF_ENABLED;  // THBF_ENABLED == 0
--  for (const auto& flag : flags) {
--    if (flag == "disabled")
--      result |= THBF_DISABLED;
--    else if (flag == "dismissonclick")
--      result |= THBF_DISMISSONCLICK;
--    else if (flag == "nobackground")
--      result |= THBF_NOBACKGROUND;
--    else if (flag == "hidden")
--      result |= THBF_HIDDEN;
--    else if (flag == "noninteractive")
--      result |= THBF_NONINTERACTIVE;
--    else
--      return false;
--  }
--  *out = result;
--  return true;
--}
--
--}  // namespace
--
--TaskbarHost::ThumbarButton::ThumbarButton() = default;
--TaskbarHost::ThumbarButton::ThumbarButton(const TaskbarHost::ThumbarButton&) =
--    default;
--TaskbarHost::ThumbarButton::~ThumbarButton() = default;
--
--TaskbarHost::TaskbarHost() {}
--
--TaskbarHost::~TaskbarHost() {}
--
--bool TaskbarHost::SetThumbarButtons(HWND window,
--                                    const std::vector<ThumbarButton>& buttons) {
--  if (buttons.size() > kMaxButtonsCount || !InitializeTaskbar())
--    return false;
--
--  callback_map_.clear();
--
--  // The number of buttons in thumbar can not be changed once it is created,
--  // so we have to claim kMaxButtonsCount buttons initialy in case users add
--  // more buttons later.
--  base::win::ScopedHICON icons[kMaxButtonsCount] = {};
--  THUMBBUTTON thumb_buttons[kMaxButtonsCount] = {};
--
--  for (size_t i = 0; i < kMaxButtonsCount; ++i) {
--    THUMBBUTTON& thumb_button = thumb_buttons[i];
--
--    // Set ID.
--    thumb_button.iId = kButtonIdBase + i;
--    thumb_button.dwMask = THB_FLAGS;
--
--    if (i >= buttons.size()) {
--      // This button is used to occupy the place in toolbar, and it does not
--      // show.
--      thumb_button.dwFlags = THBF_HIDDEN;
--      continue;
--    }
--
--    // This button is user's button.
--    const ThumbarButton& button = buttons[i];
--
--    // Generate flags.
--    thumb_button.dwFlags = THBF_ENABLED;
--    if (!GetThumbarButtonFlags(button.flags, &thumb_button.dwFlags))
--      return false;
--
--    // Set icon.
--    if (!button.icon.IsEmpty()) {
--      thumb_button.dwMask |= THB_ICON;
--      icons[i] = IconUtil::CreateHICONFromSkBitmap(button.icon.AsBitmap());
--      thumb_button.hIcon = icons[i].get();
--    }
--
--    // Set tooltip.
--    if (!button.tooltip.empty()) {
--      thumb_button.dwMask |= THB_TOOLTIP;
--      wcsncpy_s(thumb_button.szTip, base::UTF8ToUTF16(button.tooltip).c_str(),
--                _TRUNCATE);
--    }
--
--    // Save callback.
--    callback_map_[thumb_button.iId] = button.clicked_callback;
--  }
--
--  // Finally add them to taskbar.
--  HRESULT r;
--  if (thumbar_buttons_added_)
--    r = taskbar_->ThumbBarUpdateButtons(window, kMaxButtonsCount,
--                                        thumb_buttons);
--  else
--    r = taskbar_->ThumbBarAddButtons(window, kMaxButtonsCount, thumb_buttons);
--
--  thumbar_buttons_added_ = true;
--  last_buttons_ = buttons;
--  return SUCCEEDED(r);
--}
--
--void TaskbarHost::RestoreThumbarButtons(HWND window) {
--  if (thumbar_buttons_added_) {
--    thumbar_buttons_added_ = false;
--    SetThumbarButtons(window, last_buttons_);
--  }
--}
--
--bool TaskbarHost::SetProgressBar(HWND window,
--                                 double value,
--                                 const NativeWindow::ProgressState state) {
--  if (!InitializeTaskbar())
--    return false;
--
--  bool success;
--  if (value > 1.0 || state == NativeWindow::PROGRESS_INDETERMINATE) {
--    success = SUCCEEDED(taskbar_->SetProgressState(window, TBPF_INDETERMINATE));
--  } else if (value < 0 || state == NativeWindow::PROGRESS_NONE) {
--    success = SUCCEEDED(taskbar_->SetProgressState(window, TBPF_NOPROGRESS));
--  } else {
--    // Unless SetProgressState set a blocking state (TBPF_ERROR, TBPF_PAUSED)
--    // for the window, a call to SetProgressValue assumes the TBPF_NORMAL
--    // state even if it is not explicitly set.
--    // SetProgressValue overrides and clears the TBPF_INDETERMINATE state.
--    if (state == NativeWindow::PROGRESS_ERROR) {
--      success = SUCCEEDED(taskbar_->SetProgressState(window, TBPF_ERROR));
--    } else if (state == NativeWindow::PROGRESS_PAUSED) {
--      success = SUCCEEDED(taskbar_->SetProgressState(window, TBPF_PAUSED));
--    } else {
--      success = SUCCEEDED(taskbar_->SetProgressState(window, TBPF_NORMAL));
--    }
--
--    if (success) {
--      int val = static_cast<int>(value * 100);
--      success = SUCCEEDED(taskbar_->SetProgressValue(window, val, 100));
--    }
--  }
--
--  return success;
--}
--
--bool TaskbarHost::SetOverlayIcon(HWND window,
--                                 const gfx::Image& overlay,
--                                 const std::string& text) {
--  if (!InitializeTaskbar())
--    return false;
--
--  base::win::ScopedHICON icon(
--      IconUtil::CreateHICONFromSkBitmap(overlay.AsBitmap()));
--  return SUCCEEDED(taskbar_->SetOverlayIcon(window, icon.get(),
--                                            base::UTF8ToUTF16(text).c_str()));
--}
--
--bool TaskbarHost::SetThumbnailClip(HWND window, const gfx::Rect& region) {
--  if (!InitializeTaskbar())
--    return false;
--
--  if (region.IsEmpty()) {
--    return SUCCEEDED(taskbar_->SetThumbnailClip(window, NULL));
--  } else {
--    RECT rect =
--        display::win::ScreenWin::DIPToScreenRect(window, region).ToRECT();
--    return SUCCEEDED(taskbar_->SetThumbnailClip(window, &rect));
--  }
--}
--
--bool TaskbarHost::SetThumbnailToolTip(HWND window, const std::string& tooltip) {
--  if (!InitializeTaskbar())
--    return false;
--
--  return SUCCEEDED(taskbar_->SetThumbnailTooltip(
--      window, base::UTF8ToUTF16(tooltip).c_str()));
--}
--
--bool TaskbarHost::HandleThumbarButtonEvent(int button_id) {
--  if (ContainsKey(callback_map_, button_id)) {
--    auto callback = callback_map_[button_id];
--    if (!callback.is_null())
--      callback.Run();
--    return true;
--  }
--  return false;
--}
--
--bool TaskbarHost::InitializeTaskbar() {
--  if (taskbar_)
--    return true;
--
--  if (FAILED(::CoCreateInstance(CLSID_TaskbarList, nullptr,
--                                CLSCTX_INPROC_SERVER,
--                                IID_PPV_ARGS(&taskbar_))) ||
--      FAILED(taskbar_->HrInit())) {
--    taskbar_.Reset();
--    return false;
--  } else {
--    return true;
--  }
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 185b88a6b5b6f0570ce55c82d8db6b9c2a608073 atom/browser/ui/win/taskbar_host.h
-  our    100644 2182d377a7736f5e135d2f518c2a0a838cd0d1a0 atom/browser/ui/win/taskbar_host.h
-@@ -1,83 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_UI_WIN_TASKBAR_HOST_H_
--#define ATOM_BROWSER_UI_WIN_TASKBAR_HOST_H_
--
--#include <shobjidl.h>
--#include <wrl/client.h>
--
--#include <map>
--#include <string>
--#include <vector>
--
--#include "atom/browser/native_window.h"
--#include "base/callback.h"
--#include "ui/gfx/geometry/rect.h"
--#include "ui/gfx/image/image.h"
--
--namespace atom {
--
--class TaskbarHost {
-- public:
--  struct ThumbarButton {
--    std::string tooltip;
--    gfx::Image icon;
--    std::vector<std::string> flags;
--    base::Closure clicked_callback;
--
--    ThumbarButton();
--    ThumbarButton(const ThumbarButton&);
--    ~ThumbarButton();
--  };
--
--  TaskbarHost();
--  virtual ~TaskbarHost();
--
--  // Add or update the buttons in thumbar.
--  bool SetThumbarButtons(HWND window,
--                         const std::vector<ThumbarButton>& buttons);
--
--  void RestoreThumbarButtons(HWND window);
--
--  // Set the progress state in taskbar.
--  bool SetProgressBar(HWND window,
--                      double value,
--                      const NativeWindow::ProgressState state);
--
--  // Set the overlay icon in taskbar.
--  bool SetOverlayIcon(HWND window,
--                      const gfx::Image& overlay,
--                      const std::string& text);
--
--  // Set the region of the window to show as a thumbnail in taskbar.
--  bool SetThumbnailClip(HWND window, const gfx::Rect& region);
--
--  // Set the tooltip for the thumbnail in taskbar.
--  bool SetThumbnailToolTip(HWND window, const std::string& tooltip);
--
--  // Called by the window that there is a button in thumbar clicked.
--  bool HandleThumbarButtonEvent(int button_id);
--
-- private:
--  // Initialize the taskbar object.
--  bool InitializeTaskbar();
--
--  using CallbackMap = std::map<int, base::Closure>;
--  CallbackMap callback_map_;
--
--  std::vector<ThumbarButton> last_buttons_;
--
--  // The COM object of taskbar.
--  Microsoft::WRL::ComPtr<ITaskbarList3> taskbar_;
--
--  // Whether we have already added the buttons to thumbar.
--  bool thumbar_buttons_added_ = false;
--
--  DISALLOW_COPY_AND_ASSIGN(TaskbarHost);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_UI_WIN_TASKBAR_HOST_H_
-removed in remote
-  base   100644 e1b2716b868f2c441ea43b7b9cf2b31ac1c1f300 atom/browser/ui/x/window_state_watcher.cc
-  our    100644 9eebc361d7d0c5915345e73f0a6eba8f5336b003 atom/browser/ui/x/window_state_watcher.cc
-@@ -1,64 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/ui/x/window_state_watcher.h"
--
--#include "ui/events/platform/platform_event_source.h"
--#include "ui/gfx/x/x11.h"
--#include "ui/gfx/x/x11_atom_cache.h"
--
--namespace atom {
--
--WindowStateWatcher::WindowStateWatcher(NativeWindowViews* window)
--    : window_(window), widget_(window->GetAcceleratedWidget()) {
--  ui::PlatformEventSource::GetInstance()->AddPlatformEventObserver(this);
--}
--
--WindowStateWatcher::~WindowStateWatcher() {
--  ui::PlatformEventSource::GetInstance()->RemovePlatformEventObserver(this);
--}
--
--void WindowStateWatcher::WillProcessEvent(const ui::PlatformEvent& event) {
--  if (IsWindowStateEvent(event)) {
--    was_minimized_ = window_->IsMinimized();
--    was_maximized_ = window_->IsMaximized();
--  }
--}
--
--void WindowStateWatcher::DidProcessEvent(const ui::PlatformEvent& event) {
--  if (IsWindowStateEvent(event)) {
--    bool is_minimized = window_->IsMinimized();
--    bool is_maximized = window_->IsMaximized();
--    bool is_fullscreen = window_->IsFullscreen();
--    if (is_minimized != was_minimized_) {
--      if (is_minimized)
--        window_->NotifyWindowMinimize();
--      else
--        window_->NotifyWindowRestore();
--    } else if (is_maximized != was_maximized_) {
--      if (is_maximized)
--        window_->NotifyWindowMaximize();
--      else
--        window_->NotifyWindowUnmaximize();
--    } else {
--      // If this is neither a "maximize" or "minimize" event, then we think it
--      // is a "fullscreen" event.
--      // The "IsFullscreen()" becomes true immediately before "WillProcessEvent"
--      // is called, so we can not handle this like "maximize" and "minimize" by
--      // watching whether they have changed.
--      if (is_fullscreen)
--        window_->NotifyWindowEnterFullScreen();
--      else
--        window_->NotifyWindowLeaveFullScreen();
--    }
--  }
--}
--
--bool WindowStateWatcher::IsWindowStateEvent(const ui::PlatformEvent& event) {
--  ::Atom changed_atom = event->xproperty.atom;
--  return (changed_atom == gfx::GetAtom("_NET_WM_STATE") &&
--          event->type == PropertyNotify && event->xproperty.window == widget_);
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 2888c9fc6fec1e68c33479c06c1c017608fa43c1 atom/browser/ui/x/window_state_watcher.h
-  our    100644 7d65b08d8bb32316c509f7aaaa14d5b4e337b7f5 atom/browser/ui/x/window_state_watcher.h
-@@ -1,38 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_UI_X_WINDOW_STATE_WATCHER_H_
--#define ATOM_BROWSER_UI_X_WINDOW_STATE_WATCHER_H_
--
--#include "ui/events/platform/platform_event_observer.h"
--
--#include "atom/browser/native_window_views.h"
--
--namespace atom {
--
--class WindowStateWatcher : public ui::PlatformEventObserver {
-- public:
--  explicit WindowStateWatcher(NativeWindowViews* window);
--  ~WindowStateWatcher() override;
--
-- protected:
--  // ui::PlatformEventObserver:
--  void WillProcessEvent(const ui::PlatformEvent& event) override;
--  void DidProcessEvent(const ui::PlatformEvent& event) override;
--
-- private:
--  bool IsWindowStateEvent(const ui::PlatformEvent& event);
--
--  NativeWindowViews* window_;
--  gfx::AcceleratedWidget widget_;
--
--  bool was_minimized_ = false;
--  bool was_maximized_ = false;
--
--  DISALLOW_COPY_AND_ASSIGN(WindowStateWatcher);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_UI_X_WINDOW_STATE_WATCHER_H_
-removed in remote
-  base   100644 db83753bb3765a585cd2ff1989aecfac87457cdb atom/browser/ui/x/x_window_utils.cc
-  our    100644 ecc2f906e5849595010ffe549b3bbe999b173a0a atom/browser/ui/x/x_window_utils.cc
-@@ -1,90 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/ui/x/x_window_utils.h"
--
--#include <X11/Xatom.h>
--
--#include "base/environment.h"
--#include "base/strings/string_util.h"
--#include "base/threading/thread_restrictions.h"
--#include "dbus/bus.h"
--#include "dbus/message.h"
--#include "dbus/object_proxy.h"
--#include "ui/base/x/x11_util.h"
--
--namespace atom {
--
--::Atom GetAtom(const char* name) {
--  return XInternAtom(gfx::GetXDisplay(), name, false);
--}
--
--void SetWMSpecState(::Window xwindow, bool enabled, ::Atom state) {
--  XEvent xclient;
--  memset(&xclient, 0, sizeof(xclient));
--  xclient.type = ClientMessage;
--  xclient.xclient.window = xwindow;
--  xclient.xclient.message_type = GetAtom("_NET_WM_STATE");
--  xclient.xclient.format = 32;
--  xclient.xclient.data.l[0] = enabled ? 1 : 0;
--  xclient.xclient.data.l[1] = state;
--  xclient.xclient.data.l[2] = x11::None;
--  xclient.xclient.data.l[3] = 1;
--  xclient.xclient.data.l[4] = 0;
--
--  XDisplay* xdisplay = gfx::GetXDisplay();
--  XSendEvent(xdisplay, DefaultRootWindow(xdisplay), x11::False,
--             SubstructureRedirectMask | SubstructureNotifyMask, &xclient);
--}
--
--void SetWindowType(::Window xwindow, const std::string& type) {
--  XDisplay* xdisplay = gfx::GetXDisplay();
--  std::string type_prefix = "_NET_WM_WINDOW_TYPE_";
--  ::Atom window_type = XInternAtom(
--      xdisplay, (type_prefix + base::ToUpperASCII(type)).c_str(), x11::False);
--  XChangeProperty(xdisplay, xwindow,
--                  XInternAtom(xdisplay, "_NET_WM_WINDOW_TYPE", x11::False),
--                  XA_ATOM, 32, PropModeReplace,
--                  reinterpret_cast<unsigned char*>(&window_type), 1);
--}
--
--bool ShouldUseGlobalMenuBar() {
--  base::ThreadRestrictions::ScopedAllowIO allow_io;
--  std::unique_ptr<base::Environment> env(base::Environment::Create());
--  if (env->HasVar("ELECTRON_FORCE_WINDOW_MENU_BAR"))
--    return false;
--
--  dbus::Bus::Options options;
--  scoped_refptr<dbus::Bus> bus(new dbus::Bus(options));
--
--  dbus::ObjectProxy* object_proxy =
--      bus->GetObjectProxy(DBUS_SERVICE_DBUS, dbus::ObjectPath(DBUS_PATH_DBUS));
--  dbus::MethodCall method_call(DBUS_INTERFACE_DBUS, "ListNames");
--  std::unique_ptr<dbus::Response> response(object_proxy->CallMethodAndBlock(
--      &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT));
--  if (!response) {
--    bus->ShutdownAndBlock();
--    return false;
--  }
--
--  dbus::MessageReader reader(response.get());
--  dbus::MessageReader array_reader(NULL);
--  if (!reader.PopArray(&array_reader)) {
--    bus->ShutdownAndBlock();
--    return false;
--  }
--  while (array_reader.HasMoreData()) {
--    std::string name;
--    if (array_reader.PopString(&name) &&
--        name == "com.canonical.AppMenu.Registrar") {
--      bus->ShutdownAndBlock();
--      return true;
--    }
--  }
--
--  bus->ShutdownAndBlock();
--  return false;
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 16f3ddac6ccd860a3f2400d1d6272d79c79f2cd8 atom/browser/ui/x/x_window_utils.h
-  our    100644 5888a2b25663aef10e1700688807e24c693f298a atom/browser/ui/x/x_window_utils.h
-@@ -1,28 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_UI_X_X_WINDOW_UTILS_H_
--#define ATOM_BROWSER_UI_X_X_WINDOW_UTILS_H_
--
--#include <string>
--
--#include "ui/gfx/x/x11.h"
--
--namespace atom {
--
--::Atom GetAtom(const char* name);
--
--// Sends a message to the x11 window manager, enabling or disabling the |state|
--// for _NET_WM_STATE.
--void SetWMSpecState(::Window xwindow, bool enabled, ::Atom state);
--
--// Sets the _NET_WM_WINDOW_TYPE of window.
--void SetWindowType(::Window xwindow, const std::string& type);
--
--// Returns true if the bus name "com.canonical.AppMenu.Registrar" is available.
--bool ShouldUseGlobalMenuBar();
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_UI_X_X_WINDOW_UTILS_H_
-removed in remote
-  base   100644 d018e1d09dbcd220f4007368e19c553c696c1f10 atom/browser/web_contents_permission_helper.cc
-  our    100644 1b3d809b1e724da4f5d1105ab61c4ddb6f8f4274 atom/browser/web_contents_permission_helper.cc
-@@ -1,105 +0,0 @@
--// Copyright (c) 2016 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/web_contents_permission_helper.h"
--
--#include <string>
--
--#include "atom/browser/atom_permission_manager.h"
--#include "atom/common/native_mate_converters/gurl_converter.h"
--#include "brightray/browser/media/media_stream_devices_controller.h"
--#include "content/public/browser/browser_context.h"
--#include "content/public/browser/render_process_host.h"
--
--DEFINE_WEB_CONTENTS_USER_DATA_KEY(atom::WebContentsPermissionHelper);
--
--namespace atom {
--
--namespace {
--
--void MediaAccessAllowed(const content::MediaStreamRequest& request,
--                        const content::MediaResponseCallback& callback,
--                        bool allowed) {
--  brightray::MediaStreamDevicesController controller(request, callback);
--  if (allowed)
--    controller.TakeAction();
--  else
--    controller.Deny(content::MEDIA_DEVICE_PERMISSION_DENIED);
--}
--
--void OnPointerLockResponse(content::WebContents* web_contents, bool allowed) {
--  if (web_contents)
--    web_contents->GotResponseToLockMouseRequest(allowed);
--}
--
--void OnPermissionResponse(const base::Callback<void(bool)>& callback,
--                          blink::mojom::PermissionStatus status) {
--  if (status == blink::mojom::PermissionStatus::GRANTED)
--    callback.Run(true);
--  else
--    callback.Run(false);
--}
--
--}  // namespace
--
--WebContentsPermissionHelper::WebContentsPermissionHelper(
--    content::WebContents* web_contents)
--    : web_contents_(web_contents) {}
--
--WebContentsPermissionHelper::~WebContentsPermissionHelper() {}
--
--void WebContentsPermissionHelper::RequestPermission(
--    content::PermissionType permission,
--    const base::Callback<void(bool)>& callback,
--    bool user_gesture,
--    const base::DictionaryValue* details) {
--  auto* rfh = web_contents_->GetMainFrame();
--  auto* permission_manager = static_cast<AtomPermissionManager*>(
--      web_contents_->GetBrowserContext()->GetPermissionManager());
--  auto origin = web_contents_->GetLastCommittedURL();
--  permission_manager->RequestPermissionWithDetails(
--      permission, rfh, origin, false, details,
--      base::Bind(&OnPermissionResponse, callback));
--}
--
--void WebContentsPermissionHelper::RequestFullscreenPermission(
--    const base::Callback<void(bool)>& callback) {
--  RequestPermission(
--      static_cast<content::PermissionType>(PermissionType::FULLSCREEN),
--      callback);
--}
--
--void WebContentsPermissionHelper::RequestMediaAccessPermission(
--    const content::MediaStreamRequest& request,
--    const content::MediaResponseCallback& response_callback) {
--  auto callback = base::Bind(&MediaAccessAllowed, request, response_callback);
--  // The permission type doesn't matter here, AUDIO_CAPTURE/VIDEO_CAPTURE
--  // are presented as same type in content_converter.h.
--  RequestPermission(content::PermissionType::AUDIO_CAPTURE, callback);
--}
--
--void WebContentsPermissionHelper::RequestWebNotificationPermission(
--    const base::Callback<void(bool)>& callback) {
--  RequestPermission(content::PermissionType::NOTIFICATIONS, callback);
--}
--
--void WebContentsPermissionHelper::RequestPointerLockPermission(
--    bool user_gesture) {
--  RequestPermission(
--      static_cast<content::PermissionType>(PermissionType::POINTER_LOCK),
--      base::Bind(&OnPointerLockResponse, web_contents_), user_gesture);
--}
--
--void WebContentsPermissionHelper::RequestOpenExternalPermission(
--    const base::Callback<void(bool)>& callback,
--    bool user_gesture,
--    const GURL& url) {
--  base::DictionaryValue details;
--  details.SetString("externalURL", url.spec());
--  RequestPermission(
--      static_cast<content::PermissionType>(PermissionType::OPEN_EXTERNAL),
--      callback, user_gesture, &details);
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 90ae6dff56f5249aeb880e52b6839f26017d474f atom/browser/web_contents_permission_helper.h
-  our    100644 322e0972fdec97ec445abc591711b0bab33f54f2 atom/browser/web_contents_permission_helper.h
-@@ -1,53 +0,0 @@
--// Copyright (c) 2016 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_WEB_CONTENTS_PERMISSION_HELPER_H_
--#define ATOM_BROWSER_WEB_CONTENTS_PERMISSION_HELPER_H_
--
--#include "content/public/browser/permission_type.h"
--#include "content/public/browser/web_contents_user_data.h"
--#include "content/public/common/media_stream_request.h"
--
--namespace atom {
--
--// Applies the permission requested for WebContents.
--class WebContentsPermissionHelper
--    : public content::WebContentsUserData<WebContentsPermissionHelper> {
-- public:
--  ~WebContentsPermissionHelper() override;
--
--  enum class PermissionType {
--    POINTER_LOCK = static_cast<int>(content::PermissionType::NUM) + 1,
--    FULLSCREEN,
--    OPEN_EXTERNAL,
--  };
--
--  void RequestFullscreenPermission(const base::Callback<void(bool)>& callback);
--  void RequestMediaAccessPermission(
--      const content::MediaStreamRequest& request,
--      const content::MediaResponseCallback& callback);
--  void RequestWebNotificationPermission(
--      const base::Callback<void(bool)>& callback);
--  void RequestPointerLockPermission(bool user_gesture);
--  void RequestOpenExternalPermission(const base::Callback<void(bool)>& callback,
--                                     bool user_gesture,
--                                     const GURL& url);
--
-- private:
--  explicit WebContentsPermissionHelper(content::WebContents* web_contents);
--  friend class content::WebContentsUserData<WebContentsPermissionHelper>;
--
--  void RequestPermission(content::PermissionType permission,
--                         const base::Callback<void(bool)>& callback,
--                         bool user_gesture = false,
--                         const base::DictionaryValue* details = nullptr);
--
--  content::WebContents* web_contents_;
--
--  DISALLOW_COPY_AND_ASSIGN(WebContentsPermissionHelper);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_WEB_CONTENTS_PERMISSION_HELPER_H_
-removed in remote
-  base   100644 3939c59b8cd5ede3e64b93e4e6ea6555f1b2d947 atom/browser/web_contents_preferences.cc
-  our    100644 c21c93383155091a7481cdd4e741cefad90a4a55 atom/browser/web_contents_preferences.cc
-@@ -1,395 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/web_contents_preferences.h"
--
--#include <algorithm>
--#include <string>
--#include <vector>
--
--#include "atom/browser/native_window.h"
--#include "atom/browser/web_view_manager.h"
--#include "atom/common/native_mate_converters/value_converter.h"
--#include "atom/common/options_switches.h"
--#include "base/command_line.h"
--#include "base/memory/ptr_util.h"
--#include "base/strings/string_number_conversions.h"
--#include "base/strings/utf_string_conversions.h"
--#include "cc/base/switches.h"
--#include "content/public/browser/render_frame_host.h"
--#include "content/public/browser/render_process_host.h"
--#include "content/public/common/content_switches.h"
--#include "content/public/common/web_preferences.h"
--#include "native_mate/dictionary.h"
--#include "net/base/filename_util.h"
--
--#if defined(OS_WIN)
--#include "ui/gfx/switches.h"
--#endif
--
--DEFINE_WEB_CONTENTS_USER_DATA_KEY(atom::WebContentsPreferences);
--
--namespace {
--
--bool GetAsString(const base::Value* val,
--                 const base::StringPiece& path,
--                 std::string* out) {
--  if (val) {
--    auto* found = val->FindKeyOfType(path, base::Value::Type::STRING);
--    if (found) {
--      *out = found->GetString();
--      return true;
--    }
--  }
--  return false;
--}
--
--bool GetAsString(const base::Value* val,
--                 const base::StringPiece& path,
--                 base::string16* out) {
--  if (val) {
--    auto* found = val->FindKeyOfType(path, base::Value::Type::STRING);
--    if (found) {
--      *out = base::UTF8ToUTF16(found->GetString());
--      return true;
--    }
--  }
--  return false;
--}
--
--bool GetAsInteger(const base::Value* val,
--                  const base::StringPiece& path,
--                  int* out) {
--  if (val) {
--    auto* found = val->FindKey(path);
--    if (found && found->is_int()) {
--      *out = found->GetInt();
--      return true;
--    } else if (found && found->is_string()) {
--      return base::StringToInt(found->GetString(), out);
--    }
--  }
--  return false;
--}
--
--}  // namespace
--
--namespace atom {
--
--// static
--std::vector<WebContentsPreferences*> WebContentsPreferences::instances_;
--
--WebContentsPreferences::WebContentsPreferences(
--    content::WebContents* web_contents,
--    const mate::Dictionary& web_preferences)
--    : web_contents_(web_contents) {
--  v8::Isolate* isolate = web_preferences.isolate();
--  mate::Dictionary copied(isolate, web_preferences.GetHandle()->Clone());
--  // Following fields should not be stored.
--  copied.Delete("embedder");
--  copied.Delete("isGuest");
--  copied.Delete("session");
--
--  mate::ConvertFromV8(isolate, copied.GetHandle(), &preference_);
--  web_contents->SetUserData(UserDataKey(), base::WrapUnique(this));
--
--  instances_.push_back(this);
--
--  // Set WebPreferences defaults onto the JS object
--  SetDefaultBoolIfUndefined(options::kPlugins, false);
--  SetDefaultBoolIfUndefined(options::kExperimentalFeatures, false);
--  bool node = SetDefaultBoolIfUndefined(options::kNodeIntegration, true);
--  SetDefaultBoolIfUndefined(options::kNodeIntegrationInWorker, false);
--  SetDefaultBoolIfUndefined(options::kWebviewTag, node);
--  SetDefaultBoolIfUndefined(options::kSandbox, false);
--  SetDefaultBoolIfUndefined(options::kNativeWindowOpen, false);
--  SetDefaultBoolIfUndefined(options::kContextIsolation, false);
--  SetDefaultBoolIfUndefined("javascript", true);
--  SetDefaultBoolIfUndefined("images", true);
--  SetDefaultBoolIfUndefined("textAreasAreResizable", true);
--  SetDefaultBoolIfUndefined("webgl", true);
--  bool webSecurity = true;
--  SetDefaultBoolIfUndefined(options::kWebSecurity, webSecurity);
--  // If webSecurity was explicity set to false, let's inherit that into
--  // insecureContent
--  if (web_preferences.Get(options::kWebSecurity, &webSecurity) &&
--      !webSecurity) {
--    SetDefaultBoolIfUndefined(options::kAllowRunningInsecureContent, true);
--  } else {
--    SetDefaultBoolIfUndefined(options::kAllowRunningInsecureContent, false);
--  }
--#if defined(OS_MACOSX)
--  SetDefaultBoolIfUndefined(options::kScrollBounce, false);
--#endif
--  SetDefaultBoolIfUndefined(options::kOffscreen, false);
--
--  last_preference_ = preference_.Clone();
--}
--
--WebContentsPreferences::~WebContentsPreferences() {
--  instances_.erase(std::remove(instances_.begin(), instances_.end(), this),
--                   instances_.end());
--}
--
--bool WebContentsPreferences::SetDefaultBoolIfUndefined(
--    const base::StringPiece& key,
--    bool val) {
--  auto* current_value =
--      preference_.FindKeyOfType(key, base::Value::Type::BOOLEAN);
--  if (current_value) {
--    return current_value->GetBool();
--  } else {
--    preference_.SetKey(key, base::Value(val));
--    return val;
--  }
--}
--
--bool WebContentsPreferences::IsEnabled(const base::StringPiece& name,
--                                       bool default_value) const {
--  auto* current_value =
--      preference_.FindKeyOfType(name, base::Value::Type::BOOLEAN);
--  if (current_value)
--    return current_value->GetBool();
--  return default_value;
--}
--
--void WebContentsPreferences::Merge(const base::DictionaryValue& extend) {
--  if (preference_.is_dict())
--    static_cast<base::DictionaryValue*>(&preference_)->MergeDictionary(&extend);
--}
--
--void WebContentsPreferences::Clear() {
--  if (preference_.is_dict())
--    static_cast<base::DictionaryValue*>(&preference_)->Clear();
--}
--
--bool WebContentsPreferences::GetPreference(const base::StringPiece& name,
--                                           std::string* value) const {
--  return GetAsString(&preference_, name, value);
--}
--
--bool WebContentsPreferences::GetPreloadPath(
--    base::FilePath::StringType* path) const {
--  DCHECK(path);
--  base::FilePath::StringType preload;
--  if (GetAsString(&preference_, options::kPreloadScript, &preload)) {
--    if (base::FilePath(preload).IsAbsolute()) {
--      *path = std::move(preload);
--      return true;
--    } else {
--      LOG(ERROR) << "preload script must have absolute path.";
--    }
--  } else if (GetAsString(&preference_, options::kPreloadURL, &preload)) {
--    // Translate to file path if there is "preload-url" option.
--    base::FilePath preload_path;
--    if (net::FileURLToFilePath(GURL(preload), &preload_path)) {
--      *path = std::move(preload_path.value());
--      return true;
--    } else {
--      LOG(ERROR) << "preload url must be file:// protocol.";
--    }
--  }
--  return false;
--}
--
--// static
--content::WebContents* WebContentsPreferences::GetWebContentsFromProcessID(
--    int process_id) {
--  for (WebContentsPreferences* preferences : instances_) {
--    content::WebContents* web_contents = preferences->web_contents_;
--    if (web_contents->GetMainFrame()->GetProcess()->GetID() == process_id)
--      return web_contents;
--  }
--  return nullptr;
--}
--
--// static
--WebContentsPreferences* WebContentsPreferences::From(
--    content::WebContents* web_contents) {
--  if (!web_contents)
--    return nullptr;
--  return FromWebContents(web_contents);
--}
--
--void WebContentsPreferences::AppendCommandLineSwitches(
--    base::CommandLine* command_line) {
--  // Check if plugins are enabled.
--  if (IsEnabled(options::kPlugins))
--    command_line->AppendSwitch(switches::kEnablePlugins);
--
--  // Experimental flags.
--  if (IsEnabled(options::kExperimentalFeatures))
--    command_line->AppendSwitch(
--        ::switches::kEnableExperimentalWebPlatformFeatures);
--
--  // Check if we have node integration specified.
--  bool enable_node_integration = IsEnabled(options::kNodeIntegration, true);
--  command_line->AppendSwitchASCII(switches::kNodeIntegration,
--                                  enable_node_integration ? "true" : "false");
--
--  // Whether to enable node integration in Worker.
--  if (IsEnabled(options::kNodeIntegrationInWorker))
--    command_line->AppendSwitch(switches::kNodeIntegrationInWorker);
--
--  // Check if webview tag creation is enabled, default to nodeIntegration value.
--  // TODO(kevinsawicki): Default to false in 2.0
--  bool webview_tag = IsEnabled(options::kWebviewTag, enable_node_integration);
--  command_line->AppendSwitchASCII(switches::kWebviewTag,
--                                  webview_tag ? "true" : "false");
--
--  // If the `sandbox` option was passed to the BrowserWindow's webPreferences,
--  // pass `--enable-sandbox` to the renderer so it won't have any node.js
--  // integration.
--  if (IsEnabled(options::kSandbox))
--    command_line->AppendSwitch(switches::kEnableSandbox);
--  else if (!command_line->HasSwitch(switches::kEnableSandbox))
--    command_line->AppendSwitch(::switches::kNoSandbox);
--
--  // Check if nativeWindowOpen is enabled.
--  if (IsEnabled(options::kNativeWindowOpen))
--    command_line->AppendSwitch(switches::kNativeWindowOpen);
--
--  // The preload script.
--  base::FilePath::StringType preload;
--  if (GetPreloadPath(&preload))
--    command_line->AppendSwitchNative(switches::kPreloadScript, preload);
--
--  // Custom args for renderer process
--  auto* customArgs =
--      preference_.FindKeyOfType(options::kCustomArgs, base::Value::Type::LIST);
--  if (customArgs) {
--    for (const auto& customArg : customArgs->GetList()) {
--      if (customArg.is_string())
--        command_line->AppendArg(customArg.GetString());
--    }
--  }
--
--  // Run Electron APIs and preload script in isolated world
--  if (IsEnabled(options::kContextIsolation))
--    command_line->AppendSwitch(switches::kContextIsolation);
--
--  // --background-color.
--  std::string s;
--  if (GetAsString(&preference_, options::kBackgroundColor, &s))
--    command_line->AppendSwitchASCII(switches::kBackgroundColor, s);
--
--  // --guest-instance-id, which is used to identify guest WebContents.
--  int guest_instance_id = 0;
--  if (GetAsInteger(&preference_, options::kGuestInstanceID, &guest_instance_id))
--    command_line->AppendSwitchASCII(switches::kGuestInstanceID,
--                                    base::IntToString(guest_instance_id));
--
--  // Pass the opener's window id.
--  int opener_id;
--  if (GetAsInteger(&preference_, options::kOpenerID, &opener_id))
--    command_line->AppendSwitchASCII(switches::kOpenerID,
--                                    base::IntToString(opener_id));
--
--#if defined(OS_MACOSX)
--  // Enable scroll bounce.
--  if (IsEnabled(options::kScrollBounce))
--    command_line->AppendSwitch(switches::kScrollBounce);
--#endif
--
--  // Custom command line switches.
--  auto* args =
--      preference_.FindKeyOfType("commandLineSwitches", base::Value::Type::LIST);
--  if (args) {
--    for (const auto& arg : args->GetList()) {
--      if (arg.is_string()) {
--        const auto& arg_val = arg.GetString();
--        if (!arg_val.empty())
--          command_line->AppendSwitch(arg_val);
--      }
--    }
--  }
--
--  // Enable blink features.
--  if (GetAsString(&preference_, options::kEnableBlinkFeatures, &s))
--    command_line->AppendSwitchASCII(::switches::kEnableBlinkFeatures, s);
--
--  // Disable blink features.
--  if (GetAsString(&preference_, options::kDisableBlinkFeatures, &s))
--    command_line->AppendSwitchASCII(::switches::kDisableBlinkFeatures, s);
--
--  if (guest_instance_id) {
--    // Webview `document.visibilityState` tracks window visibility so we need
--    // to let it know if the window happens to be hidden right now.
--    auto* manager = WebViewManager::GetWebViewManager(web_contents_);
--    if (manager) {
--      auto* embedder = manager->GetEmbedder(guest_instance_id);
--      if (embedder) {
--        auto* relay = NativeWindowRelay::FromWebContents(embedder);
--        if (relay) {
--          auto* window = relay->window.get();
--          if (window) {
--            const bool visible = window->IsVisible() && !window->IsMinimized();
--            if (!visible) {
--              command_line->AppendSwitch(switches::kHiddenPage);
--            }
--          }
--        }
--      }
--    }
--  }
--
--  // We are appending args to a webContents so let's save the current state
--  // of our preferences object so that during the lifetime of the WebContents
--  // we can fetch the options used to initally configure the WebContents
--  last_preference_ = preference_.Clone();
--}
--
--void WebContentsPreferences::OverrideWebkitPrefs(
--    content::WebPreferences* prefs) {
--  prefs->javascript_enabled = IsEnabled("javascript", true /* default_value */);
--  prefs->images_enabled = IsEnabled("images", true /* default_value */);
--  prefs->text_areas_are_resizable =
--      IsEnabled("textAreasAreResizable", true /* default_value */);
--  prefs->navigate_on_drag_drop =
--      IsEnabled("navigateOnDragDrop", false /* default_value */);
--
--  // Check if webgl should be enabled.
--  bool is_webgl_enabled = IsEnabled("webgl", true /* default_value */);
--  prefs->webgl1_enabled = is_webgl_enabled;
--  prefs->webgl2_enabled = is_webgl_enabled;
--
--  // Check if web security should be enabled.
--  bool is_web_security_enabled =
--      IsEnabled(options::kWebSecurity, true /* default_value */);
--  prefs->web_security_enabled = is_web_security_enabled;
--  prefs->allow_running_insecure_content =
--      IsEnabled(options::kAllowRunningInsecureContent,
--                !is_web_security_enabled /* default_value */);
--
--  auto* fonts_dict = preference_.FindKeyOfType("defaultFontFamily",
--                                               base::Value::Type::DICTIONARY);
--  if (fonts_dict) {
--    base::string16 font;
--    if (GetAsString(fonts_dict, "standard", &font))
--      prefs->standard_font_family_map[content::kCommonScript] = font;
--    if (GetAsString(fonts_dict, "serif", &font))
--      prefs->serif_font_family_map[content::kCommonScript] = font;
--    if (GetAsString(fonts_dict, "sansSerif", &font))
--      prefs->sans_serif_font_family_map[content::kCommonScript] = font;
--    if (GetAsString(fonts_dict, "monospace", &font))
--      prefs->fixed_font_family_map[content::kCommonScript] = font;
--    if (GetAsString(fonts_dict, "cursive", &font))
--      prefs->cursive_font_family_map[content::kCommonScript] = font;
--    if (GetAsString(fonts_dict, "fantasy", &font))
--      prefs->fantasy_font_family_map[content::kCommonScript] = font;
--  }
--
--  int size;
--  if (GetAsInteger(&preference_, "defaultFontSize", &size))
--    prefs->default_font_size = size;
--  if (GetAsInteger(&preference_, "defaultMonospaceFontSize", &size))
--    prefs->default_fixed_font_size = size;
--  if (GetAsInteger(&preference_, "minimumFontSize", &size))
--    prefs->minimum_font_size = size;
--  std::string encoding;
--  if (GetAsString(&preference_, "defaultEncoding", &encoding))
--    prefs->default_encoding = encoding;
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 dd98a9658acfce4154da3bd64e6faa4698a9cd33 atom/browser/web_contents_preferences.h
-  our    100644 d835347afcd259f473f95271a2c19e42afcc6f2b atom/browser/web_contents_preferences.h
-@@ -1,87 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_WEB_CONTENTS_PREFERENCES_H_
--#define ATOM_BROWSER_WEB_CONTENTS_PREFERENCES_H_
--
--#include <string>
--#include <vector>
--
--#include "base/values.h"
--#include "content/public/browser/web_contents_user_data.h"
--
--namespace base {
--class CommandLine;
--}
--
--namespace content {
--struct WebPreferences;
--}
--
--namespace mate {
--class Dictionary;
--}
--
--namespace atom {
--
--// Stores and applies the preferences of WebContents.
--class WebContentsPreferences
--    : public content::WebContentsUserData<WebContentsPreferences> {
-- public:
--  // Get self from WebContents.
--  static WebContentsPreferences* From(content::WebContents* web_contents);
--
--  WebContentsPreferences(content::WebContents* web_contents,
--                         const mate::Dictionary& web_preferences);
--  ~WebContentsPreferences() override;
--
--  // A simple way to know whether a Boolean property is enabled.
--  bool IsEnabled(const base::StringPiece& name,
--                 bool default_value = false) const;
--
--  // $.extend(|web_preferences|, |new_web_preferences|).
--  void Merge(const base::DictionaryValue& new_web_preferences);
--
--  // Append command paramters according to preferences.
--  void AppendCommandLineSwitches(base::CommandLine* command_line);
--
--  // Modify the WebPreferences according to preferences.
--  void OverrideWebkitPrefs(content::WebPreferences* prefs);
--
--  // Clear the current WebPreferences.
--  void Clear();
--
--  // Return true if the particular preference value exists.
--  bool GetPreference(const base::StringPiece& name, std::string* value) const;
--
--  // Returns the preload script path.
--  bool GetPreloadPath(base::FilePath::StringType* path) const;
--
--  // Returns the web preferences.
--  base::Value* preference() { return &preference_; }
--  base::Value* last_preference() { return &last_preference_; }
--
-- private:
--  friend class content::WebContentsUserData<WebContentsPreferences>;
--  friend class AtomBrowserClient;
--
--  // Get WebContents according to process ID.
--  static content::WebContents* GetWebContentsFromProcessID(int process_id);
--
--  // Set preference value to given bool if user did not provide value
--  bool SetDefaultBoolIfUndefined(const base::StringPiece& key, bool val);
--
--  static std::vector<WebContentsPreferences*> instances_;
--
--  content::WebContents* web_contents_;
--
--  base::Value preference_ = base::Value(base::Value::Type::DICTIONARY);
--  base::Value last_preference_ = base::Value(base::Value::Type::DICTIONARY);
--
--  DISALLOW_COPY_AND_ASSIGN(WebContentsPreferences);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_WEB_CONTENTS_PREFERENCES_H_
-removed in remote
-  base   100644 c3d2a1d0f23fb5bdb77a377f8ad1e5697e76ed42 atom/browser/web_dialog_helper.cc
-  our    100644 74c8573d13f15bcaa189abdc40fa0cd8e48f89be atom/browser/web_dialog_helper.cc
-@@ -1,261 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc. All rights reserved.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/web_dialog_helper.h"
--
--#include <string>
--#include <vector>
--
--#include "atom/browser/atom_browser_context.h"
--#include "atom/browser/native_window.h"
--#include "atom/browser/ui/file_dialog.h"
--#include "base/bind.h"
--#include "base/files/file_enumerator.h"
--#include "base/files/file_path.h"
--#include "base/strings/utf_string_conversions.h"
--#include "chrome/common/pref_names.h"
--#include "components/prefs/pref_service.h"
--#include "content/public/browser/render_frame_host.h"
--#include "content/public/browser/render_process_host.h"
--#include "content/public/browser/render_view_host.h"
--#include "content/public/browser/web_contents.h"
--#include "content/public/common/file_chooser_file_info.h"
--#include "content/public/common/file_chooser_params.h"
--#include "net/base/mime_util.h"
--#include "ui/shell_dialogs/selected_file_info.h"
--
--namespace {
--
--class FileSelectHelper : public base::RefCounted<FileSelectHelper>,
--                         public content::WebContentsObserver {
-- public:
--  FileSelectHelper(content::RenderFrameHost* render_frame_host,
--                   const content::FileChooserParams::Mode& mode)
--      : render_frame_host_(render_frame_host), mode_(mode) {
--    auto* web_contents =
--        content::WebContents::FromRenderFrameHost(render_frame_host);
--    content::WebContentsObserver::Observe(web_contents);
--  }
--
--  void ShowOpenDialog(const file_dialog::DialogSettings& settings) {
--    auto callback = base::Bind(&FileSelectHelper::OnOpenDialogDone, this);
--    file_dialog::ShowOpenDialog(settings, callback);
--  }
--
--  void ShowSaveDialog(const file_dialog::DialogSettings& settings) {
--    auto callback = base::Bind(&FileSelectHelper::OnSaveDialogDone, this);
--    file_dialog::ShowSaveDialog(settings, callback);
--  }
--
-- private:
--  friend class base::RefCounted<FileSelectHelper>;
--
--  ~FileSelectHelper() override {}
--
--#if defined(MAS_BUILD)
--  void OnOpenDialogDone(bool result,
--                        const std::vector<base::FilePath>& paths,
--                        const std::vector<std::string>& bookmarks)
--#else
--  void OnOpenDialogDone(bool result, const std::vector<base::FilePath>& paths)
--#endif
--  {
--    std::vector<content::FileChooserFileInfo> file_info;
--    if (result) {
--      for (auto& path : paths) {
--        content::FileChooserFileInfo info;
--        info.file_path = path;
--        info.display_name = path.BaseName().value();
--        file_info.push_back(info);
--      }
--
--      if (render_frame_host_ && !paths.empty()) {
--        auto* browser_context = static_cast<atom::AtomBrowserContext*>(
--            render_frame_host_->GetProcess()->GetBrowserContext());
--        browser_context->prefs()->SetFilePath(prefs::kSelectFileLastDirectory,
--                                              paths[0].DirName());
--      }
--    }
--    OnFilesSelected(file_info);
--  }
--
--#if defined(MAS_BUILD)
--  void OnSaveDialogDone(bool result,
--                        const base::FilePath& path,
--                        const std::string& bookmark)
--#else
--  void OnSaveDialogDone(bool result, const base::FilePath& path)
--#endif
--  {
--    std::vector<content::FileChooserFileInfo> file_info;
--    if (result) {
--      content::FileChooserFileInfo info;
--      info.file_path = path;
--      info.display_name = path.BaseName().value();
--      file_info.push_back(info);
--    }
--    OnFilesSelected(file_info);
--  }
--
--  void OnFilesSelected(
--      const std::vector<content::FileChooserFileInfo>& file_info) {
--    if (render_frame_host_)
--      render_frame_host_->FilesSelectedInChooser(file_info, mode_);
--  }
--
--  // content::WebContentsObserver:
--  void RenderFrameHostChanged(content::RenderFrameHost* old_host,
--                              content::RenderFrameHost* new_host) override {
--    if (old_host == render_frame_host_)
--      render_frame_host_ = nullptr;
--  }
--
--  // content::WebContentsObserver:
--  void RenderFrameDeleted(content::RenderFrameHost* deleted_host) override {
--    if (deleted_host == render_frame_host_)
--      render_frame_host_ = nullptr;
--  }
--
--  // content::WebContentsObserver:
--  void WebContentsDestroyed() override { render_frame_host_ = nullptr; }
--
--  content::RenderFrameHost* render_frame_host_;
--  content::FileChooserParams::Mode mode_;
--};
--
--file_dialog::Filters GetFileTypesFromAcceptType(
--    const std::vector<base::string16>& accept_types) {
--  file_dialog::Filters filters;
--  if (accept_types.empty())
--    return filters;
--
--  std::vector<base::FilePath::StringType> extensions;
--
--  int valid_type_count = 0;
--  std::string description;
--
--  for (const auto& accept_type : accept_types) {
--    std::string ascii_type = base::UTF16ToASCII(accept_type);
--    auto old_extension_size = extensions.size();
--
--    if (ascii_type[0] == '.') {
--      // If the type starts with a period it is assumed to be a file extension,
--      // like `.txt`, // so we just have to add it to the list.
--      base::FilePath::StringType extension(ascii_type.begin(),
--                                           ascii_type.end());
--      // Skip the first character.
--      extensions.push_back(extension.substr(1));
--    } else {
--      if (ascii_type == "image/*")
--        description = "Image Files";
--      else if (ascii_type == "audio/*")
--        description = "Audio Files";
--      else if (ascii_type == "video/*")
--        description = "Video Files";
--
--      // For MIME Type, `audio/*, video/*, image/*
--      net::GetExtensionsForMimeType(ascii_type, &extensions);
--    }
--
--    if (extensions.size() > old_extension_size)
--      valid_type_count++;
--  }
--
--  // If no valid exntesion is added, return empty filters.
--  if (extensions.empty())
--    return filters;
--
--  filters.push_back(file_dialog::Filter());
--
--  if (valid_type_count > 1 || (valid_type_count == 1 && description.empty()))
--    description = "Custom Files";
--
--  DCHECK(!description.empty());
--  filters[0].first = description;
--
--  for (const auto& extension : extensions) {
--#if defined(OS_WIN)
--    filters[0].second.push_back(base::UTF16ToASCII(extension));
--#else
--    filters[0].second.push_back(extension);
--#endif
--  }
--
--  // Allow all files when extension is specified.
--  filters.push_back(file_dialog::Filter());
--  filters.back().first = "All Files";
--  filters.back().second.push_back("*");
--
--  return filters;
--}
--
--}  // namespace
--
--namespace atom {
--
--WebDialogHelper::WebDialogHelper(NativeWindow* window, bool offscreen)
--    : window_(window), offscreen_(offscreen), weak_factory_(this) {}
--
--WebDialogHelper::~WebDialogHelper() {}
--
--void WebDialogHelper::RunFileChooser(
--    content::RenderFrameHost* render_frame_host,
--    const content::FileChooserParams& params) {
--  std::vector<content::FileChooserFileInfo> result;
--
--  file_dialog::DialogSettings settings;
--  settings.force_detached = offscreen_;
--  settings.filters = GetFileTypesFromAcceptType(params.accept_types);
--  settings.parent_window = window_;
--  settings.title = base::UTF16ToUTF8(params.title);
--
--  scoped_refptr<FileSelectHelper> file_select_helper(
--      new FileSelectHelper(render_frame_host, params.mode));
--  if (params.mode == content::FileChooserParams::Save) {
--    settings.default_path = params.default_file_name;
--    file_select_helper->ShowSaveDialog(settings);
--  } else {
--    int flags = file_dialog::FILE_DIALOG_CREATE_DIRECTORY;
--    switch (params.mode) {
--      case content::FileChooserParams::OpenMultiple:
--        flags |= file_dialog::FILE_DIALOG_MULTI_SELECTIONS;
--        FALLTHROUGH;
--      case content::FileChooserParams::Open:
--        flags |= file_dialog::FILE_DIALOG_OPEN_FILE;
--        flags |= file_dialog::FILE_DIALOG_TREAT_PACKAGE_APP_AS_DIRECTORY;
--        break;
--      case content::FileChooserParams::UploadFolder:
--        flags |= file_dialog::FILE_DIALOG_OPEN_DIRECTORY;
--        break;
--      default:
--        NOTREACHED();
--    }
--
--    auto* browser_context = static_cast<atom::AtomBrowserContext*>(
--        render_frame_host->GetProcess()->GetBrowserContext());
--    settings.default_path = browser_context->prefs()
--                                ->GetFilePath(prefs::kSelectFileLastDirectory)
--                                .Append(params.default_file_name);
--    settings.properties = flags;
--    file_select_helper->ShowOpenDialog(settings);
--  }
--}
--
--void WebDialogHelper::EnumerateDirectory(content::WebContents* web_contents,
--                                         int request_id,
--                                         const base::FilePath& dir) {
--  int types = base::FileEnumerator::FILES | base::FileEnumerator::DIRECTORIES |
--              base::FileEnumerator::INCLUDE_DOT_DOT;
--  base::FileEnumerator file_enum(dir, false, types);
--
--  base::FilePath path;
--  std::vector<base::FilePath> paths;
--  while (!(path = file_enum.Next()).empty())
--    paths.push_back(path);
--
--  web_contents->GetRenderViewHost()->DirectoryEnumerationFinished(request_id,
--                                                                  paths);
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 a3472da4acbb936659f05670214fad62a98f5aa5 atom/browser/web_dialog_helper.h
-  our    100644 e08a1a915bc29c049e9258a4f213e3dc4428208e atom/browser/web_dialog_helper.h
-@@ -1,46 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc. All rights reserved.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_WEB_DIALOG_HELPER_H_
--#define ATOM_BROWSER_WEB_DIALOG_HELPER_H_
--
--#include "base/memory/weak_ptr.h"
--
--namespace base {
--class FilePath;
--}
--
--namespace content {
--struct FileChooserParams;
--class RenderFrameHost;
--class WebContents;
--}  // namespace content
--
--namespace atom {
--
--class NativeWindow;
--
--class WebDialogHelper {
-- public:
--  WebDialogHelper(NativeWindow* window, bool offscreen);
--  ~WebDialogHelper();
--
--  void RunFileChooser(content::RenderFrameHost* render_frame_host,
--                      const content::FileChooserParams& params);
--  void EnumerateDirectory(content::WebContents* web_contents,
--                          int request_id,
--                          const base::FilePath& path);
--
-- private:
--  NativeWindow* window_;
--  bool offscreen_;
--
--  base::WeakPtrFactory<WebDialogHelper> weak_factory_;
--
--  DISALLOW_COPY_AND_ASSIGN(WebDialogHelper);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_WEB_DIALOG_HELPER_H_
-removed in remote
-  base   100644 6abb9713bfac2ee22a0c0cd5a8f601887a3d5503 atom/browser/web_view_guest_delegate.cc
-  our    100644 27fbff7e9e3633bd17c54b4c67ba4a1d5993e449 atom/browser/web_view_guest_delegate.cc
-@@ -1,116 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/web_view_guest_delegate.h"
--
--#include "atom/browser/api/atom_api_web_contents.h"
--#include "atom/common/native_mate_converters/gurl_converter.h"
--#include "content/browser/web_contents/web_contents_impl.h"
--#include "content/public/browser/navigation_handle.h"
--#include "content/public/browser/render_frame_host.h"
--#include "content/public/browser/render_process_host.h"
--#include "content/public/browser/render_view_host.h"
--#include "content/public/browser/render_widget_host.h"
--#include "content/public/browser/render_widget_host_view.h"
--
--namespace atom {
--
--WebViewGuestDelegate::WebViewGuestDelegate(content::WebContents* embedder,
--                                           api::WebContents* api_web_contents)
--    : embedder_web_contents_(embedder), api_web_contents_(api_web_contents) {}
--
--WebViewGuestDelegate::~WebViewGuestDelegate() {
--  ResetZoomController();
--}
--
--void WebViewGuestDelegate::AttachToIframe(
--    content::WebContents* embedder_web_contents,
--    int embedder_frame_id) {
--  embedder_web_contents_ = embedder_web_contents;
--
--  int embedder_process_id =
--      embedder_web_contents_->GetMainFrame()->GetProcess()->GetID();
--  auto* embedder_frame =
--      content::RenderFrameHost::FromID(embedder_process_id, embedder_frame_id);
--  DCHECK_EQ(embedder_web_contents_,
--            content::WebContents::FromRenderFrameHost(embedder_frame));
--
--  // Attach this inner WebContents |guest_web_contents| to the outer
--  // WebContents |embedder_web_contents|. The outer WebContents's
--  // frame |embedder_frame| hosts the inner WebContents.
--  api_web_contents_->web_contents()->AttachToOuterWebContentsFrame(
--      embedder_web_contents_, embedder_frame);
--
--  ResetZoomController();
--
--  embedder_zoom_controller_ =
--      WebContentsZoomController::FromWebContents(embedder_web_contents_);
--  embedder_zoom_controller_->AddObserver(this);
--  auto* zoom_controller = api_web_contents_->GetZoomController();
--  zoom_controller->SetEmbedderZoomController(embedder_zoom_controller_);
--
--  api_web_contents_->Emit("did-attach");
--}
--
--void WebViewGuestDelegate::DidDetach() {
--  ResetZoomController();
--}
--
--content::WebContents* WebViewGuestDelegate::GetOwnerWebContents() const {
--  return embedder_web_contents_;
--}
--
--void WebViewGuestDelegate::OnZoomLevelChanged(
--    content::WebContents* web_contents,
--    double level,
--    bool is_temporary) {
--  if (web_contents == GetOwnerWebContents()) {
--    if (is_temporary) {
--      api_web_contents_->GetZoomController()->SetTemporaryZoomLevel(level);
--    } else {
--      api_web_contents_->GetZoomController()->SetZoomLevel(level);
--    }
--    // Change the default zoom factor to match the embedders' new zoom level.
--    double zoom_factor = content::ZoomLevelToZoomFactor(level);
--    api_web_contents_->GetZoomController()->SetDefaultZoomFactor(zoom_factor);
--  }
--}
--
--void WebViewGuestDelegate::OnZoomControllerWebContentsDestroyed() {
--  ResetZoomController();
--}
--
--void WebViewGuestDelegate::ResetZoomController() {
--  if (embedder_zoom_controller_) {
--    embedder_zoom_controller_->RemoveObserver(this);
--    embedder_zoom_controller_ = nullptr;
--  }
--}
--
--content::RenderWidgetHost* WebViewGuestDelegate::GetOwnerRenderWidgetHost() {
--  return embedder_web_contents_->GetRenderViewHost()->GetWidget();
--}
--
--content::SiteInstance* WebViewGuestDelegate::GetOwnerSiteInstance() {
--  return embedder_web_contents_->GetSiteInstance();
--}
--
--content::WebContents* WebViewGuestDelegate::CreateNewGuestWindow(
--    const content::WebContents::CreateParams& create_params) {
--  // Code below mirrors what content::WebContentsImpl::CreateNewWindow
--  // does for non-guest sources
--  content::WebContents::CreateParams guest_params(create_params);
--  guest_params.initial_size =
--      embedder_web_contents_->GetContainerBounds().size();
--  guest_params.context = embedder_web_contents_->GetNativeView();
--  auto* guest_contents = content::WebContents::Create(guest_params);
--  auto* guest_contents_impl =
--      static_cast<content::WebContentsImpl*>(guest_contents);
--  guest_contents_impl->GetView()->CreateViewForWidget(
--      guest_contents->GetRenderViewHost()->GetWidget(), false);
--
--  return guest_contents;
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 95888ff749fda896a7355d7af743918a670a1bc6 atom/browser/web_view_guest_delegate.h
-  our    100644 6d9f440588d1d38a869ca6b6a33fd31031091efa atom/browser/web_view_guest_delegate.h
-@@ -1,60 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_WEB_VIEW_GUEST_DELEGATE_H_
--#define ATOM_BROWSER_WEB_VIEW_GUEST_DELEGATE_H_
--
--#include "atom/browser/web_contents_zoom_controller.h"
--#include "content/public/browser/browser_plugin_guest_delegate.h"
--
--namespace atom {
--
--namespace api {
--class WebContents;
--}
--
--class WebViewGuestDelegate : public content::BrowserPluginGuestDelegate,
--                             public WebContentsZoomController::Observer {
-- public:
--  WebViewGuestDelegate(content::WebContents* embedder,
--                       api::WebContents* api_web_contents);
--  ~WebViewGuestDelegate() override;
--
--  // Attach to the iframe.
--  void AttachToIframe(content::WebContents* embedder_web_contents,
--                      int embedder_frame_id);
--
-- protected:
--  // content::BrowserPluginGuestDelegate:
--  void DidDetach() final;
--  content::WebContents* GetOwnerWebContents() const final;
--  content::RenderWidgetHost* GetOwnerRenderWidgetHost() final;
--  content::SiteInstance* GetOwnerSiteInstance() final;
--  content::WebContents* CreateNewGuestWindow(
--      const content::WebContents::CreateParams& create_params) final;
--
--  // WebContentsZoomController::Observer:
--  void OnZoomLevelChanged(content::WebContents* web_contents,
--                          double level,
--                          bool is_temporary) override;
--  void OnZoomControllerWebContentsDestroyed() override;
--
-- private:
--  void ResetZoomController();
--
--  // The WebContents that attaches this guest view.
--  content::WebContents* embedder_web_contents_ = nullptr;
--
--  // The zoom controller of the embedder that is used
--  // to subscribe for zoom changes.
--  WebContentsZoomController* embedder_zoom_controller_ = nullptr;
--
--  api::WebContents* api_web_contents_ = nullptr;
--
--  DISALLOW_COPY_AND_ASSIGN(WebViewGuestDelegate);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_WEB_VIEW_GUEST_DELEGATE_H_
-removed in remote
-  base   100644 d404c1a4368011301c2f133fac5e4934ada03c04 atom/browser/web_view_manager.cc
-  our    100644 9448f58d51388c31f4b1ed97e36ea20f1d7dc26c atom/browser/web_view_manager.cc
-@@ -1,86 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/web_view_manager.h"
--
--#include "atom/browser/atom_browser_context.h"
--#include "content/public/browser/render_frame_host.h"
--#include "content/public/browser/render_process_host.h"
--#include "content/public/browser/web_contents.h"
--
--namespace atom {
--
--WebViewManager::WebViewManager() {}
--
--WebViewManager::~WebViewManager() {}
--
--void WebViewManager::AddGuest(int guest_instance_id,
--                              int element_instance_id,
--                              content::WebContents* embedder,
--                              content::WebContents* web_contents) {
--  web_contents_embedder_map_[guest_instance_id] = {web_contents, embedder};
--
--  // Map the element in embedder to guest.
--  int owner_process_id = embedder->GetMainFrame()->GetProcess()->GetID();
--  ElementInstanceKey key(owner_process_id, element_instance_id);
--  element_instance_id_to_guest_map_[key] = guest_instance_id;
--}
--
--void WebViewManager::RemoveGuest(int guest_instance_id) {
--  if (!base::ContainsKey(web_contents_embedder_map_, guest_instance_id))
--    return;
--
--  web_contents_embedder_map_.erase(guest_instance_id);
--
--  // Remove the record of element in embedder too.
--  for (const auto& element : element_instance_id_to_guest_map_)
--    if (element.second == guest_instance_id) {
--      element_instance_id_to_guest_map_.erase(element.first);
--      break;
--    }
--}
--
--content::WebContents* WebViewManager::GetEmbedder(int guest_instance_id) {
--  if (base::ContainsKey(web_contents_embedder_map_, guest_instance_id))
--    return web_contents_embedder_map_[guest_instance_id].embedder;
--  else
--    return nullptr;
--}
--
--content::WebContents* WebViewManager::GetGuestByInstanceID(
--    int owner_process_id,
--    int element_instance_id) {
--  ElementInstanceKey key(owner_process_id, element_instance_id);
--  if (!base::ContainsKey(element_instance_id_to_guest_map_, key))
--    return nullptr;
--
--  int guest_instance_id = element_instance_id_to_guest_map_[key];
--  if (base::ContainsKey(web_contents_embedder_map_, guest_instance_id))
--    return web_contents_embedder_map_[guest_instance_id].web_contents;
--  else
--    return nullptr;
--}
--
--bool WebViewManager::ForEachGuest(content::WebContents* embedder_web_contents,
--                                  const GuestCallback& callback) {
--  for (auto& item : web_contents_embedder_map_)
--    if (item.second.embedder == embedder_web_contents &&
--        callback.Run(item.second.web_contents))
--      return true;
--  return false;
--}
--
--// static
--WebViewManager* WebViewManager::GetWebViewManager(
--    content::WebContents* web_contents) {
--  auto* context = web_contents->GetBrowserContext();
--  if (context) {
--    auto* manager = context->GetGuestManager();
--    return static_cast<WebViewManager*>(manager);
--  } else {
--    return nullptr;
--  }
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 ff9a8ecba2abca5e8b3c5513694ec01c95190e93 atom/browser/web_view_manager.h
-  our    100644 1adc27678da96b72889c246674afedda30dc37f0 atom/browser/web_view_manager.h
-@@ -1,70 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_WEB_VIEW_MANAGER_H_
--#define ATOM_BROWSER_WEB_VIEW_MANAGER_H_
--
--#include <map>
--
--#include "content/public/browser/browser_plugin_guest_manager.h"
--
--namespace atom {
--
--class WebViewManager : public content::BrowserPluginGuestManager {
-- public:
--  WebViewManager();
--  ~WebViewManager() override;
--
--  void AddGuest(int guest_instance_id,
--                int element_instance_id,
--                content::WebContents* embedder,
--                content::WebContents* web_contents);
--  void RemoveGuest(int guest_instance_id);
--  content::WebContents* GetEmbedder(int guest_instance_id);
--
--  static WebViewManager* GetWebViewManager(content::WebContents* web_contents);
--
-- protected:
--  // content::BrowserPluginGuestManager:
--  content::WebContents* GetGuestByInstanceID(int owner_process_id,
--                                             int element_instance_id) override;
--  bool ForEachGuest(content::WebContents* embedder,
--                    const GuestCallback& callback) override;
--
-- private:
--  struct WebContentsWithEmbedder {
--    content::WebContents* web_contents;
--    content::WebContents* embedder;
--  };
--  // guest_instance_id => (web_contents, embedder)
--  std::map<int, WebContentsWithEmbedder> web_contents_embedder_map_;
--
--  struct ElementInstanceKey {
--    int embedder_process_id;
--    int element_instance_id;
--
--    ElementInstanceKey(int embedder_process_id, int element_instance_id)
--        : embedder_process_id(embedder_process_id),
--          element_instance_id(element_instance_id) {}
--
--    bool operator<(const ElementInstanceKey& other) const {
--      if (embedder_process_id != other.embedder_process_id)
--        return embedder_process_id < other.embedder_process_id;
--      return element_instance_id < other.element_instance_id;
--    }
--
--    bool operator==(const ElementInstanceKey& other) const {
--      return (embedder_process_id == other.embedder_process_id) &&
--             (element_instance_id == other.element_instance_id);
--    }
--  };
--  // (embedder_process_id, element_instance_id) => guest_instance_id
--  std::map<ElementInstanceKey, int> element_instance_id_to_guest_map_;
--
--  DISALLOW_COPY_AND_ASSIGN(WebViewManager);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_WEB_VIEW_MANAGER_H_
-removed in remote
-  base   100644 b3bec5d08c1c017105cde2b9e034a3e7c49d15c5 atom/browser/window_list.cc
-  our    100644 97561d16f38d29429550a611d58fc08ae06edd38 atom/browser/window_list.cc
-@@ -1,103 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/browser/window_list.h"
--
--#include <algorithm>
--
--#include "atom/browser/native_window.h"
--#include "atom/browser/window_list_observer.h"
--#include "base/logging.h"
--
--namespace atom {
--
--// static
--base::LazyInstance<base::ObserverList<WindowListObserver>>::Leaky
--    WindowList::observers_ = LAZY_INSTANCE_INITIALIZER;
--
--// static
--WindowList* WindowList::instance_ = nullptr;
--
--// static
--WindowList* WindowList::GetInstance() {
--  if (!instance_)
--    instance_ = new WindowList;
--  return instance_;
--}
--
--// static
--WindowList::WindowVector WindowList::GetWindows() {
--  return GetInstance()->windows_;
--}
--
--// static
--bool WindowList::IsEmpty() {
--  return GetInstance()->windows_.empty();
--}
--
--// static
--void WindowList::AddWindow(NativeWindow* window) {
--  DCHECK(window);
--  // Push |window| on the appropriate list instance.
--  WindowVector& windows = GetInstance()->windows_;
--  windows.push_back(window);
--
--  for (WindowListObserver& observer : observers_.Get())
--    observer.OnWindowAdded(window);
--}
--
--// static
--void WindowList::RemoveWindow(NativeWindow* window) {
--  WindowVector& windows = GetInstance()->windows_;
--  windows.erase(std::remove(windows.begin(), windows.end(), window),
--                windows.end());
--
--  for (WindowListObserver& observer : observers_.Get())
--    observer.OnWindowRemoved(window);
--
--  if (windows.empty()) {
--    for (WindowListObserver& observer : observers_.Get())
--      observer.OnWindowAllClosed();
--  }
--}
--
--// static
--void WindowList::WindowCloseCancelled(NativeWindow* window) {
--  for (WindowListObserver& observer : observers_.Get())
--    observer.OnWindowCloseCancelled(window);
--}
--
--// static
--void WindowList::AddObserver(WindowListObserver* observer) {
--  observers_.Get().AddObserver(observer);
--}
--
--// static
--void WindowList::RemoveObserver(WindowListObserver* observer) {
--  observers_.Get().RemoveObserver(observer);
--}
--
--// static
--void WindowList::CloseAllWindows() {
--  WindowVector windows = GetInstance()->windows_;
--#if defined(OS_MACOSX)
--  std::reverse(windows.begin(), windows.end());
--#endif
--  for (auto* const& window : windows)
--    if (!window->IsClosed())
--      window->Close();
--}
--
--// static
--void WindowList::DestroyAllWindows() {
--  WindowVector windows = GetInstance()->windows_;
--  for (auto* const& window : windows)
--    window->CloseImmediately();  // e.g. Destroy()
--}
--
--WindowList::WindowList() {}
--
--WindowList::~WindowList() {}
--
--}  // namespace atom
-removed in remote
-  base   100644 3dd87b2c34c296ef2e25c6ad21be318987fc3680 atom/browser/window_list.h
-  our    100644 e336c8073dc86e2a3124457afe009b703b667658 atom/browser/window_list.h
-@@ -1,64 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_WINDOW_LIST_H_
--#define ATOM_BROWSER_WINDOW_LIST_H_
--
--#include <vector>
--
--#include "base/lazy_instance.h"
--#include "base/macros.h"
--#include "base/observer_list.h"
--
--namespace atom {
--
--class NativeWindow;
--class WindowListObserver;
--
--class WindowList {
-- public:
--  typedef std::vector<NativeWindow*> WindowVector;
--
--  static WindowVector GetWindows();
--  static bool IsEmpty();
--
--  // Adds or removes |window| from the list it is associated with.
--  static void AddWindow(NativeWindow* window);
--  static void RemoveWindow(NativeWindow* window);
--
--  // Called by window when a close is cancelled by beforeunload handler.
--  static void WindowCloseCancelled(NativeWindow* window);
--
--  // Adds and removes |observer| from the observer list.
--  static void AddObserver(WindowListObserver* observer);
--  static void RemoveObserver(WindowListObserver* observer);
--
--  // Closes all windows.
--  static void CloseAllWindows();
--
--  // Destroy all windows.
--  static void DestroyAllWindows();
--
-- private:
--  static WindowList* GetInstance();
--
--  WindowList();
--  ~WindowList();
--
--  // A vector of the windows in this list, in the order they were added.
--  WindowVector windows_;
--
--  // A list of observers which will be notified of every window addition and
--  // removal across all WindowLists.
--  static base::LazyInstance<base::ObserverList<WindowListObserver>>::Leaky
--      observers_;
--
--  static WindowList* instance_;
--
--  DISALLOW_COPY_AND_ASSIGN(WindowList);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_WINDOW_LIST_H_
-removed in remote
-  base   100644 424efa25a2b01aba5f640f672b7015d547c861ba atom/browser/window_list_observer.h
-  our    100644 424efa25a2b01aba5f640f672b7015d547c861ba atom/browser/window_list_observer.h
-@@ -1,32 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_BROWSER_WINDOW_LIST_OBSERVER_H_
--#define ATOM_BROWSER_WINDOW_LIST_OBSERVER_H_
--
--namespace atom {
--
--class NativeWindow;
--
--class WindowListObserver {
-- public:
--  // Called immediately after a window is added to the list.
--  virtual void OnWindowAdded(NativeWindow* window) {}
--
--  // Called immediately after a window is removed from the list.
--  virtual void OnWindowRemoved(NativeWindow* window) {}
--
--  // Called when a window close is cancelled by beforeunload handler.
--  virtual void OnWindowCloseCancelled(NativeWindow* window) {}
--
--  // Called immediately after all windows are closed.
--  virtual void OnWindowAllClosed() {}
--
-- protected:
--  virtual ~WindowListObserver() {}
--};
--
--}  // namespace atom
--
--#endif  // ATOM_BROWSER_WINDOW_LIST_OBSERVER_H_
-removed in remote
-  base   100644 eeb26614847b0bbe33b006909103f6e23ceb1bac atom/common/api/api_messages.h
-  our    100644 6131a7a473c68e31790fcd8697c8f380c65ad275 atom/common/api/api_messages.h
-@@ -1,71 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--// Multiply-included file, no traditional include guard.
--
--#include "atom/common/draggable_region.h"
--#include "base/strings/string16.h"
--#include "base/values.h"
--#include "content/public/common/common_param_traits.h"
--#include "content/public/common/referrer.h"
--#include "ipc/ipc_message_macros.h"
--#include "ui/gfx/geometry/rect_f.h"
--#include "ui/gfx/ipc/gfx_param_traits.h"
--#include "url/gurl.h"
--
--// The message starter should be declared in ipc/ipc_message_start.h. Since
--// we don't want to patch Chromium, we just pretend to be Content Shell.
--
--#define IPC_MESSAGE_START ShellMsgStart
--
--IPC_STRUCT_TRAITS_BEGIN(atom::DraggableRegion)
--  IPC_STRUCT_TRAITS_MEMBER(draggable)
--  IPC_STRUCT_TRAITS_MEMBER(bounds)
--IPC_STRUCT_TRAITS_END()
--
--IPC_MESSAGE_ROUTED2(AtomFrameHostMsg_Message,
--                    base::string16 /* channel */,
--                    base::ListValue /* arguments */)
--
--IPC_SYNC_MESSAGE_ROUTED2_1(AtomFrameHostMsg_Message_Sync,
--                           base::string16 /* channel */,
--                           base::ListValue /* arguments */,
--                           base::ListValue /* result */)
--
--IPC_MESSAGE_ROUTED3(AtomFrameMsg_Message,
--                    bool /* send_to_all */,
--                    base::string16 /* channel */,
--                    base::ListValue /* arguments */)
--
--IPC_MESSAGE_ROUTED0(AtomViewMsg_Offscreen)
--
--IPC_MESSAGE_ROUTED3(AtomAutofillFrameHostMsg_ShowPopup,
--                    gfx::RectF /* bounds */,
--                    std::vector<base::string16> /* values */,
--                    std::vector<base::string16> /* labels */)
--
--IPC_MESSAGE_ROUTED0(AtomAutofillFrameHostMsg_HidePopup)
--
--IPC_MESSAGE_ROUTED1(AtomAutofillFrameMsg_AcceptSuggestion,
--                    base::string16 /* suggestion */)
--
--// Sent by the renderer when the draggable regions are updated.
--IPC_MESSAGE_ROUTED1(AtomFrameHostMsg_UpdateDraggableRegions,
--                    std::vector<atom::DraggableRegion> /* regions */)
--
--// Update renderer process preferences.
--IPC_MESSAGE_CONTROL1(AtomMsg_UpdatePreferences, base::ListValue)
--
--// Sent by renderer to set the temporary zoom level.
--IPC_SYNC_MESSAGE_ROUTED1_1(AtomFrameHostMsg_SetTemporaryZoomLevel,
--                           double /* zoom level */,
--                           double /* result */)
--
--// Sent by renderer to get the zoom level.
--IPC_SYNC_MESSAGE_ROUTED0_1(AtomFrameHostMsg_GetZoomLevel, double /* result */)
--
--// Brings up SaveAs... dialog to save specified URL.
--IPC_MESSAGE_ROUTED2(AtomFrameHostMsg_PDFSaveURLAs,
--                    GURL /* url */,
--                    content::Referrer /* referrer */)
-removed in remote
-  base   100644 4bfb0ed4c1beed178c3a9cc5270a480deb511f52 atom/common/api/atom_api_asar.cc
-  our    100644 240b5504c248b8199a4abb5b213a14ab5c072971 atom/common/api/atom_api_asar.cc
-@@ -1,155 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include <stddef.h>
--
--#include <vector>
--
--#include "atom/common/asar/archive.h"
--#include "atom/common/native_mate_converters/callback.h"
--#include "atom/common/native_mate_converters/file_path_converter.h"
--#include "native_mate/arguments.h"
--#include "native_mate/dictionary.h"
--#include "native_mate/object_template_builder.h"
--#include "native_mate/wrappable.h"
--
--#include "atom/common/node_includes.h"
--#include "atom_natives.h"  // NOLINT: This file is generated with js2c.
--
--namespace {
--
--class Archive : public mate::Wrappable<Archive> {
-- public:
--  static v8::Local<v8::Value> Create(v8::Isolate* isolate,
--                                     const base::FilePath& path) {
--    auto archive = std::make_unique<asar::Archive>(path);
--    if (!archive->Init())
--      return v8::False(isolate);
--    return (new Archive(isolate, std::move(archive)))->GetWrapper();
--  }
--
--  static void BuildPrototype(v8::Isolate* isolate,
--                             v8::Local<v8::FunctionTemplate> prototype) {
--    prototype->SetClassName(mate::StringToV8(isolate, "Archive"));
--    mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
--        .SetProperty("path", &Archive::GetPath)
--        .SetMethod("getFileInfo", &Archive::GetFileInfo)
--        .SetMethod("stat", &Archive::Stat)
--        .SetMethod("readdir", &Archive::Readdir)
--        .SetMethod("realpath", &Archive::Realpath)
--        .SetMethod("copyFileOut", &Archive::CopyFileOut)
--        .SetMethod("getFd", &Archive::GetFD)
--        .SetMethod("destroy", &Archive::Destroy);
--  }
--
-- protected:
--  Archive(v8::Isolate* isolate, std::unique_ptr<asar::Archive> archive)
--      : archive_(std::move(archive)) {
--    Init(isolate);
--  }
--
--  // Returns the path of the file.
--  base::FilePath GetPath() { return archive_->path(); }
--
--  // Reads the offset and size of file.
--  v8::Local<v8::Value> GetFileInfo(v8::Isolate* isolate,
--                                   const base::FilePath& path) {
--    asar::Archive::FileInfo info;
--    if (!archive_ || !archive_->GetFileInfo(path, &info))
--      return v8::False(isolate);
--    mate::Dictionary dict(isolate, v8::Object::New(isolate));
--    dict.Set("size", info.size);
--    dict.Set("unpacked", info.unpacked);
--    dict.Set("offset", info.offset);
--    return dict.GetHandle();
--  }
--
--  // Returns a fake result of fs.stat(path).
--  v8::Local<v8::Value> Stat(v8::Isolate* isolate, const base::FilePath& path) {
--    asar::Archive::Stats stats;
--    if (!archive_ || !archive_->Stat(path, &stats))
--      return v8::False(isolate);
--    mate::Dictionary dict(isolate, v8::Object::New(isolate));
--    dict.Set("size", stats.size);
--    dict.Set("offset", stats.offset);
--    dict.Set("isFile", stats.is_file);
--    dict.Set("isDirectory", stats.is_directory);
--    dict.Set("isLink", stats.is_link);
--    return dict.GetHandle();
--  }
--
--  // Returns all files under a directory.
--  v8::Local<v8::Value> Readdir(v8::Isolate* isolate,
--                               const base::FilePath& path) {
--    std::vector<base::FilePath> files;
--    if (!archive_ || !archive_->Readdir(path, &files))
--      return v8::False(isolate);
--    return mate::ConvertToV8(isolate, files);
--  }
--
--  // Returns the path of file with symbol link resolved.
--  v8::Local<v8::Value> Realpath(v8::Isolate* isolate,
--                                const base::FilePath& path) {
--    base::FilePath realpath;
--    if (!archive_ || !archive_->Realpath(path, &realpath))
--      return v8::False(isolate);
--    return mate::ConvertToV8(isolate, realpath);
--  }
--
--  // Copy the file out into a temporary file and returns the new path.
--  v8::Local<v8::Value> CopyFileOut(v8::Isolate* isolate,
--                                   const base::FilePath& path) {
--    base::FilePath new_path;
--    if (!archive_ || !archive_->CopyFileOut(path, &new_path))
--      return v8::False(isolate);
--    return mate::ConvertToV8(isolate, new_path);
--  }
--
--  // Return the file descriptor.
--  int GetFD() const {
--    if (!archive_)
--      return -1;
--    return archive_->GetFD();
--  }
--
--  // Free the resources used by archive.
--  void Destroy() { archive_.reset(); }
--
-- private:
--  std::unique_ptr<asar::Archive> archive_;
--
--  DISALLOW_COPY_AND_ASSIGN(Archive);
--};
--
--void InitAsarSupport(v8::Isolate* isolate,
--                     v8::Local<v8::Value> process,
--                     v8::Local<v8::Value> require) {
--  // Evaluate asar_init.js.
--  v8::Local<v8::Script> asar_init =
--      v8::Script::Compile(node::asar_init_value.ToStringChecked(isolate));
--  v8::Local<v8::Value> result = asar_init->Run();
--
--  // Initialize asar support.
--  if (result->IsFunction()) {
--    v8::Local<v8::Value> args[] = {
--        process,
--        require,
--        node::asar_value.ToStringChecked(isolate),
--    };
--    result.As<v8::Function>()->Call(result, 3, args);
--  }
--}
--
--void Initialize(v8::Local<v8::Object> exports,
--                v8::Local<v8::Value> unused,
--                v8::Local<v8::Context> context,
--                void* priv) {
--  mate::Dictionary dict(context->GetIsolate(), exports);
--  dict.SetMethod("createArchive", &Archive::Create);
--  dict.SetMethod("initAsarSupport", &InitAsarSupport);
--}
--
--}  // namespace
--
--NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_common_asar, Initialize)
-removed in remote
-  base   100644 1f75f2cd3fe77ba3dd4c43ae0ef20d3d9ef04ad5 atom/common/api/atom_api_clipboard.cc
-  our    100644 7502b1cb3627582e15de5cad27189cd68a8d7596 atom/common/api/atom_api_clipboard.cc
-@@ -1,226 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/common/api/atom_api_clipboard.h"
--
--#include "atom/common/native_mate_converters/image_converter.h"
--#include "atom/common/native_mate_converters/string16_converter.h"
--#include "base/strings/utf_string_conversions.h"
--#include "third_party/skia/include/core/SkBitmap.h"
--#include "third_party/skia/include/core/SkImageInfo.h"
--#include "third_party/skia/include/core/SkPixmap.h"
--#include "ui/base/clipboard/scoped_clipboard_writer.h"
--
--#include "atom/common/node_includes.h"
--
--namespace atom {
--
--namespace api {
--
--ui::ClipboardType Clipboard::GetClipboardType(mate::Arguments* args) {
--  std::string type;
--  if (args->GetNext(&type) && type == "selection")
--    return ui::CLIPBOARD_TYPE_SELECTION;
--  else
--    return ui::CLIPBOARD_TYPE_COPY_PASTE;
--}
--
--std::vector<base::string16> Clipboard::AvailableFormats(mate::Arguments* args) {
--  std::vector<base::string16> format_types;
--  bool ignore;
--  ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
--  clipboard->ReadAvailableTypes(GetClipboardType(args), &format_types, &ignore);
--  return format_types;
--}
--
--bool Clipboard::Has(const std::string& format_string, mate::Arguments* args) {
--  ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
--  ui::Clipboard::FormatType format(ui::Clipboard::GetFormatType(format_string));
--  return clipboard->IsFormatAvailable(format, GetClipboardType(args));
--}
--
--std::string Clipboard::Read(const std::string& format_string) {
--  ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
--  ui::Clipboard::FormatType format(ui::Clipboard::GetFormatType(format_string));
--
--  std::string data;
--  clipboard->ReadData(format, &data);
--  return data;
--}
--
--v8::Local<v8::Value> Clipboard::ReadBuffer(const std::string& format_string,
--                                           mate::Arguments* args) {
--  std::string data = Read(format_string);
--  return node::Buffer::Copy(args->isolate(), data.data(), data.length())
--      .ToLocalChecked();
--}
--
--void Clipboard::WriteBuffer(const std::string& format,
--                            const v8::Local<v8::Value> buffer,
--                            mate::Arguments* args) {
--  if (!node::Buffer::HasInstance(buffer)) {
--    args->ThrowError("buffer must be a node Buffer");
--    return;
--  }
--
--  ui::ScopedClipboardWriter writer(GetClipboardType(args));
--  writer.WriteData(node::Buffer::Data(buffer), node::Buffer::Length(buffer),
--                   ui::Clipboard::GetFormatType(format));
--}
--
--void Clipboard::Write(const mate::Dictionary& data, mate::Arguments* args) {
--  ui::ScopedClipboardWriter writer(GetClipboardType(args));
--  base::string16 text, html, bookmark;
--  gfx::Image image;
--
--  if (data.Get("text", &text)) {
--    writer.WriteText(text);
--
--    if (data.Get("bookmark", &bookmark))
--      writer.WriteBookmark(bookmark, base::UTF16ToUTF8(text));
--  }
--
--  if (data.Get("rtf", &text)) {
--    std::string rtf = base::UTF16ToUTF8(text);
--    writer.WriteRTF(rtf);
--  }
--
--  if (data.Get("html", &html))
--    writer.WriteHTML(html, std::string());
--
--  if (data.Get("image", &image))
--    writer.WriteImage(image.AsBitmap());
--}
--
--base::string16 Clipboard::ReadText(mate::Arguments* args) {
--  base::string16 data;
--  ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
--  auto type = GetClipboardType(args);
--  if (clipboard->IsFormatAvailable(ui::Clipboard::GetPlainTextWFormatType(),
--                                   type)) {
--    clipboard->ReadText(type, &data);
--  } else if (clipboard->IsFormatAvailable(
--                 ui::Clipboard::GetPlainTextFormatType(), type)) {
--    std::string result;
--    clipboard->ReadAsciiText(type, &result);
--    data = base::ASCIIToUTF16(result);
--  }
--  return data;
--}
--
--void Clipboard::WriteText(const base::string16& text, mate::Arguments* args) {
--  ui::ScopedClipboardWriter writer(GetClipboardType(args));
--  writer.WriteText(text);
--}
--
--base::string16 Clipboard::ReadRTF(mate::Arguments* args) {
--  std::string data;
--  ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
--  clipboard->ReadRTF(GetClipboardType(args), &data);
--  return base::UTF8ToUTF16(data);
--}
--
--void Clipboard::WriteRTF(const std::string& text, mate::Arguments* args) {
--  ui::ScopedClipboardWriter writer(GetClipboardType(args));
--  writer.WriteRTF(text);
--}
--
--base::string16 Clipboard::ReadHTML(mate::Arguments* args) {
--  base::string16 data;
--  base::string16 html;
--  std::string url;
--  uint32_t start;
--  uint32_t end;
--  ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
--  clipboard->ReadHTML(GetClipboardType(args), &html, &url, &start, &end);
--  data = html.substr(start, end - start);
--  return data;
--}
--
--void Clipboard::WriteHTML(const base::string16& html, mate::Arguments* args) {
--  ui::ScopedClipboardWriter writer(GetClipboardType(args));
--  writer.WriteHTML(html, std::string());
--}
--
--v8::Local<v8::Value> Clipboard::ReadBookmark(mate::Arguments* args) {
--  base::string16 title;
--  std::string url;
--  mate::Dictionary dict = mate::Dictionary::CreateEmpty(args->isolate());
--  ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
--  clipboard->ReadBookmark(&title, &url);
--  dict.Set("title", title);
--  dict.Set("url", url);
--  return dict.GetHandle();
--}
--
--void Clipboard::WriteBookmark(const base::string16& title,
--                              const std::string& url,
--                              mate::Arguments* args) {
--  ui::ScopedClipboardWriter writer(GetClipboardType(args));
--  writer.WriteBookmark(title, url);
--}
--
--gfx::Image Clipboard::ReadImage(mate::Arguments* args) {
--  ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
--  SkBitmap bitmap = clipboard->ReadImage(GetClipboardType(args));
--  return gfx::Image::CreateFrom1xBitmap(bitmap);
--}
--
--void Clipboard::WriteImage(const gfx::Image& image, mate::Arguments* args) {
--  ui::ScopedClipboardWriter writer(GetClipboardType(args));
--  SkBitmap orig = image.AsBitmap();
--  SkBitmap bmp;
--
--  if (bmp.tryAllocPixels(orig.info()) &&
--      orig.readPixels(bmp.info(), bmp.getPixels(), bmp.rowBytes(), 0, 0)) {
--    writer.WriteImage(bmp);
--  }
--}
--
--#if !defined(OS_MACOSX)
--void Clipboard::WriteFindText(const base::string16& text) {}
--base::string16 Clipboard::ReadFindText() {
--  return base::string16();
--}
--#endif
--
--void Clipboard::Clear(mate::Arguments* args) {
--  ui::Clipboard::GetForCurrentThread()->Clear(GetClipboardType(args));
--}
--
--}  // namespace api
--
--}  // namespace atom
--
--namespace {
--
--void Initialize(v8::Local<v8::Object> exports,
--                v8::Local<v8::Value> unused,
--                v8::Local<v8::Context> context,
--                void* priv) {
--  mate::Dictionary dict(context->GetIsolate(), exports);
--  dict.SetMethod("availableFormats", &atom::api::Clipboard::AvailableFormats);
--  dict.SetMethod("has", &atom::api::Clipboard::Has);
--  dict.SetMethod("read", &atom::api::Clipboard::Read);
--  dict.SetMethod("write", &atom::api::Clipboard::Write);
--  dict.SetMethod("readText", &atom::api::Clipboard::ReadText);
--  dict.SetMethod("writeText", &atom::api::Clipboard::WriteText);
--  dict.SetMethod("readRTF", &atom::api::Clipboard::ReadRTF);
--  dict.SetMethod("writeRTF", &atom::api::Clipboard::WriteRTF);
--  dict.SetMethod("readHTML", &atom::api::Clipboard::ReadHTML);
--  dict.SetMethod("writeHTML", &atom::api::Clipboard::WriteHTML);
--  dict.SetMethod("readBookmark", &atom::api::Clipboard::ReadBookmark);
--  dict.SetMethod("writeBookmark", &atom::api::Clipboard::WriteBookmark);
--  dict.SetMethod("readImage", &atom::api::Clipboard::ReadImage);
--  dict.SetMethod("writeImage", &atom::api::Clipboard::WriteImage);
--  dict.SetMethod("readFindText", &atom::api::Clipboard::ReadFindText);
--  dict.SetMethod("writeFindText", &atom::api::Clipboard::WriteFindText);
--  dict.SetMethod("readBuffer", &atom::api::Clipboard::ReadBuffer);
--  dict.SetMethod("writeBuffer", &atom::api::Clipboard::WriteBuffer);
--  dict.SetMethod("clear", &atom::api::Clipboard::Clear);
--}
--
--}  // namespace
--
--NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_common_clipboard, Initialize)
-removed in remote
-  base   100644 e1932ad7f5f03aea890c5aa7949d79cf630e58d2 atom/common/api/atom_api_crash_reporter.cc
-  our    100644 4aa48085d4d390c7b33994dacdf292f257c31157 atom/common/api/atom_api_crash_reporter.cc
-@@ -1,67 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include <map>
--#include <string>
--
--#include "atom/common/crash_reporter/crash_reporter.h"
--#include "atom/common/native_mate_converters/file_path_converter.h"
--#include "base/bind.h"
--#include "native_mate/dictionary.h"
--
--#include "atom/common/node_includes.h"
--
--using crash_reporter::CrashReporter;
--
--namespace mate {
--
--template <>
--struct Converter<CrashReporter::UploadReportResult> {
--  static v8::Local<v8::Value> ToV8(
--      v8::Isolate* isolate,
--      const CrashReporter::UploadReportResult& reports) {
--    mate::Dictionary dict(isolate, v8::Object::New(isolate));
--    dict.Set("date", v8::Date::New(isolate, reports.first * 1000.0));
--    dict.Set("id", reports.second);
--    return dict.GetHandle();
--  }
--};
--
--}  // namespace mate
--
--namespace {
--
--void AddExtraParameter(const std::string& key, const std::string& value) {
--  CrashReporter::GetInstance()->AddExtraParameter(key, value);
--}
--
--void RemoveExtraParameter(const std::string& key) {
--  CrashReporter::GetInstance()->RemoveExtraParameter(key);
--}
--
--std::map<std::string, std::string> GetParameters() {
--  return CrashReporter::GetInstance()->GetParameters();
--}
--
--void Initialize(v8::Local<v8::Object> exports,
--                v8::Local<v8::Value> unused,
--                v8::Local<v8::Context> context,
--                void* priv) {
--  mate::Dictionary dict(context->GetIsolate(), exports);
--  auto reporter = base::Unretained(CrashReporter::GetInstance());
--  dict.SetMethod("start", base::Bind(&CrashReporter::Start, reporter));
--  dict.SetMethod("addExtraParameter", &AddExtraParameter);
--  dict.SetMethod("removeExtraParameter", &RemoveExtraParameter);
--  dict.SetMethod("getParameters", &GetParameters);
--  dict.SetMethod("getUploadedReports",
--                 base::Bind(&CrashReporter::GetUploadedReports, reporter));
--  dict.SetMethod("setUploadToServer",
--                 base::Bind(&CrashReporter::SetUploadToServer, reporter));
--  dict.SetMethod("getUploadToServer",
--                 base::Bind(&CrashReporter::GetUploadToServer, reporter));
--}
--
--}  // namespace
--
--NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_common_crash_reporter, Initialize)
-removed in remote
-  base   100644 3dda326f59fda31ca29b5bccf7e0335babcc1b3e atom/common/api/atom_api_native_image.cc
-  our    100644 09edfdaac9107386241505d2d5763b1b24aa73a4 atom/common/api/atom_api_native_image.cc
-@@ -1,624 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/common/api/atom_api_native_image.h"
--
--#include <string>
--#include <vector>
--
--#include "atom/common/asar/asar_util.h"
--#include "atom/common/native_mate_converters/file_path_converter.h"
--#include "atom/common/native_mate_converters/gfx_converter.h"
--#include "atom/common/native_mate_converters/gurl_converter.h"
--#include "atom/common/native_mate_converters/value_converter.h"
--#include "base/files/file_util.h"
--#include "base/strings/pattern.h"
--#include "base/strings/string_util.h"
--#include "base/threading/thread_restrictions.h"
--#include "native_mate/object_template_builder.h"
--#include "net/base/data_url.h"
--#include "third_party/skia/include/core/SkBitmap.h"
--#include "third_party/skia/include/core/SkImageInfo.h"
--#include "third_party/skia/include/core/SkPixelRef.h"
--#include "ui/base/layout.h"
--#include "ui/base/webui/web_ui_util.h"
--#include "ui/gfx/codec/jpeg_codec.h"
--#include "ui/gfx/codec/png_codec.h"
--#include "ui/gfx/geometry/size.h"
--#include "ui/gfx/image/image_skia.h"
--#include "ui/gfx/image/image_skia_operations.h"
--#include "ui/gfx/image/image_util.h"
--
--#if defined(OS_WIN)
--#include "atom/common/asar/archive.h"
--#include "base/win/scoped_gdi_object.h"
--#include "ui/gfx/icon_util.h"
--#endif
--
--#include "atom/common/node_includes.h"
--
--namespace atom {
--
--namespace api {
--
--namespace {
--
--struct ScaleFactorPair {
--  const char* name;
--  float scale;
--};
--
--ScaleFactorPair kScaleFactorPairs[] = {
--    // The "@2x" is put as first one to make scale matching faster.
--    {"@2x", 2.0f},   {"@3x", 3.0f},     {"@1x", 1.0f},     {"@4x", 4.0f},
--    {"@5x", 5.0f},   {"@1.25x", 1.25f}, {"@1.33x", 1.33f}, {"@1.4x", 1.4f},
--    {"@1.5x", 1.5f}, {"@1.8x", 1.8f},   {"@2.5x", 2.5f},
--};
--
--float GetScaleFactorFromPath(const base::FilePath& path) {
--  std::string filename(path.BaseName().RemoveExtension().AsUTF8Unsafe());
--
--  // We don't try to convert string to float here because it is very very
--  // expensive.
--  for (const auto& kScaleFactorPair : kScaleFactorPairs) {
--    if (base::EndsWith(filename, kScaleFactorPair.name,
--                       base::CompareCase::INSENSITIVE_ASCII))
--      return kScaleFactorPair.scale;
--  }
--
--  return 1.0f;
--}
--
--// Get the scale factor from options object at the first argument
--float GetScaleFactorFromOptions(mate::Arguments* args) {
--  float scale_factor = 1.0f;
--  mate::Dictionary options;
--  if (args->GetNext(&options))
--    options.Get("scaleFactor", &scale_factor);
--  return scale_factor;
--}
--
--bool AddImageSkiaRep(gfx::ImageSkia* image,
--                     const unsigned char* data,
--                     size_t size,
--                     int width,
--                     int height,
--                     double scale_factor) {
--  auto decoded = std::make_unique<SkBitmap>();
--
--  // Try PNG first.
--  if (!gfx::PNGCodec::Decode(data, size, decoded.get())) {
--    // Try JPEG.
--    decoded = gfx::JPEGCodec::Decode(data, size);
--    if (decoded) {
--      // `JPEGCodec::Decode()` doesn't tell `SkBitmap` instance it creates
--      // that all of its pixels are opaque, that's why the bitmap gets
--      // an alpha type `kPremul_SkAlphaType` instead of `kOpaque_SkAlphaType`.
--      // Let's fix it here.
--      // TODO(alexeykuzmin): This workaround should be removed
--      // when the `JPEGCodec::Decode()` code is fixed.
--      // See https://github.com/electron/electron/issues/11294.
--      decoded->setAlphaType(SkAlphaType::kOpaque_SkAlphaType);
--    }
--  }
--
--  if (!decoded) {
--    // Try Bitmap
--    if (width > 0 && height > 0) {
--      decoded.reset(new SkBitmap);
--      decoded->allocN32Pixels(width, height, false);
--      decoded->setPixels(
--          const_cast<void*>(reinterpret_cast<const void*>(data)));
--    } else {
--      return false;
--    }
--  }
--
--  image->AddRepresentation(gfx::ImageSkiaRep(*decoded, scale_factor));
--  return true;
--}
--
--bool AddImageSkiaRep(gfx::ImageSkia* image,
--                     const base::FilePath& path,
--                     double scale_factor) {
--  std::string file_contents;
--  {
--    base::ThreadRestrictions::ScopedAllowIO allow_io;
--    if (!asar::ReadFileToString(path, &file_contents))
--      return false;
--  }
--
--  const unsigned char* data =
--      reinterpret_cast<const unsigned char*>(file_contents.data());
--  size_t size = file_contents.size();
--  return AddImageSkiaRep(image, data, size, 0, 0, scale_factor);
--}
--
--bool PopulateImageSkiaRepsFromPath(gfx::ImageSkia* image,
--                                   const base::FilePath& path) {
--  bool succeed = false;
--  std::string filename(path.BaseName().RemoveExtension().AsUTF8Unsafe());
--  if (base::MatchPattern(filename, "*@*x"))
--    // Don't search for other representations if the DPI has been specified.
--    return AddImageSkiaRep(image, path, GetScaleFactorFromPath(path));
--  else
--    succeed |= AddImageSkiaRep(image, path, 1.0f);
--
--  for (const ScaleFactorPair& pair : kScaleFactorPairs)
--    succeed |= AddImageSkiaRep(
--        image, path.InsertBeforeExtensionASCII(pair.name), pair.scale);
--  return succeed;
--}
--
--base::FilePath NormalizePath(const base::FilePath& path) {
--  if (!path.ReferencesParent()) {
--    return path;
--  }
--
--  base::FilePath absolute_path = MakeAbsoluteFilePath(path);
--  // MakeAbsoluteFilePath returns an empty path on failures so use original path
--  if (absolute_path.empty()) {
--    return path;
--  } else {
--    return absolute_path;
--  }
--}
--
--#if defined(OS_MACOSX)
--bool IsTemplateFilename(const base::FilePath& path) {
--  return (base::MatchPattern(path.value(), "*Template.*") ||
--          base::MatchPattern(path.value(), "*Template@*x.*"));
--}
--#endif
--
--#if defined(OS_WIN)
--base::win::ScopedHICON ReadICOFromPath(int size, const base::FilePath& path) {
--  // If file is in asar archive, we extract it to a temp file so LoadImage can
--  // load it.
--  base::FilePath asar_path, relative_path;
--  base::FilePath image_path(path);
--  if (asar::GetAsarArchivePath(image_path, &asar_path, &relative_path)) {
--    std::shared_ptr<asar::Archive> archive =
--        asar::GetOrCreateAsarArchive(asar_path);
--    if (archive)
--      archive->CopyFileOut(relative_path, &image_path);
--  }
--
--  // Load the icon from file.
--  return base::win::ScopedHICON(
--      static_cast<HICON>(LoadImage(NULL, image_path.value().c_str(), IMAGE_ICON,
--                                   size, size, LR_LOADFROMFILE)));
--}
--
--bool ReadImageSkiaFromICO(gfx::ImageSkia* image, HICON icon) {
--  // Convert the icon from the Windows specific HICON to gfx::ImageSkia.
--  std::unique_ptr<SkBitmap> bitmap(IconUtil::CreateSkBitmapFromHICON(icon));
--  if (!bitmap)
--    return false;
--
--  image->AddRepresentation(gfx::ImageSkiaRep(*bitmap, 1.0f));
--  return true;
--}
--#endif
--
--void Noop(char*, void*) {}
--
--}  // namespace
--
--NativeImage::NativeImage(v8::Isolate* isolate, const gfx::Image& image)
--    : image_(image) {
--  Init(isolate);
--  if (image_.HasRepresentation(gfx::Image::kImageRepSkia)) {
--    isolate->AdjustAmountOfExternalAllocatedMemory(
--        image_.ToImageSkia()->bitmap()->computeByteSize());
--  }
--}
--
--#if defined(OS_WIN)
--NativeImage::NativeImage(v8::Isolate* isolate, const base::FilePath& hicon_path)
--    : hicon_path_(hicon_path) {
--  // Use the 256x256 icon as fallback icon.
--  gfx::ImageSkia image_skia;
--  ReadImageSkiaFromICO(&image_skia, GetHICON(256));
--  image_ = gfx::Image(image_skia);
--  Init(isolate);
--  if (image_.HasRepresentation(gfx::Image::kImageRepSkia)) {
--    isolate->AdjustAmountOfExternalAllocatedMemory(
--        image_.ToImageSkia()->bitmap()->computeByteSize());
--  }
--}
--#endif
--
--NativeImage::~NativeImage() {
--  if (image_.HasRepresentation(gfx::Image::kImageRepSkia)) {
--    isolate()->AdjustAmountOfExternalAllocatedMemory(-static_cast<int64_t>(
--        image_.ToImageSkia()->bitmap()->computeByteSize()));
--  }
--}
--
--#if defined(OS_WIN)
--HICON NativeImage::GetHICON(int size) {
--  auto iter = hicons_.find(size);
--  if (iter != hicons_.end())
--    return iter->second.get();
--
--  // First try loading the icon with specified size.
--  if (!hicon_path_.empty()) {
--    hicons_[size] = ReadICOFromPath(size, hicon_path_);
--    return hicons_[size].get();
--  }
--
--  // Then convert the image to ICO.
--  if (image_.IsEmpty())
--    return NULL;
--  hicons_[size] = IconUtil::CreateHICONFromSkBitmap(image_.AsBitmap());
--  return hicons_[size].get();
--}
--#endif
--
--v8::Local<v8::Value> NativeImage::ToPNG(mate::Arguments* args) {
--  float scale_factor = GetScaleFactorFromOptions(args);
--
--  if (scale_factor == 1.0f) {
--    // Use raw 1x PNG bytes when available
--    scoped_refptr<base::RefCountedMemory> png = image_.As1xPNGBytes();
--    if (png->size() > 0) {
--      const char* data = reinterpret_cast<const char*>(png->front());
--      size_t size = png->size();
--      return node::Buffer::Copy(args->isolate(), data, size).ToLocalChecked();
--    }
--  }
--
--  const SkBitmap bitmap =
--      image_.AsImageSkia().GetRepresentation(scale_factor).sk_bitmap();
--  std::vector<unsigned char> encoded;
--  gfx::PNGCodec::EncodeBGRASkBitmap(bitmap, false, &encoded);
--  const char* data = reinterpret_cast<char*>(encoded.data());
--  size_t size = encoded.size();
--  return node::Buffer::Copy(args->isolate(), data, size).ToLocalChecked();
--}
--
--v8::Local<v8::Value> NativeImage::ToBitmap(mate::Arguments* args) {
--  float scale_factor = GetScaleFactorFromOptions(args);
--
--  const SkBitmap bitmap =
--      image_.AsImageSkia().GetRepresentation(scale_factor).sk_bitmap();
--  SkPixelRef* ref = bitmap.pixelRef();
--  if (!ref)
--    return node::Buffer::New(args->isolate(), 0).ToLocalChecked();
--  return node::Buffer::Copy(args->isolate(),
--                            reinterpret_cast<const char*>(ref->pixels()),
--                            bitmap.computeByteSize())
--      .ToLocalChecked();
--}
--
--v8::Local<v8::Value> NativeImage::ToJPEG(v8::Isolate* isolate, int quality) {
--  std::vector<unsigned char> output;
--  gfx::JPEG1xEncodedDataFromImage(image_, quality, &output);
--  if (output.empty())
--    return node::Buffer::New(isolate, 0).ToLocalChecked();
--  return node::Buffer::Copy(isolate,
--                            reinterpret_cast<const char*>(&output.front()),
--                            output.size())
--      .ToLocalChecked();
--}
--
--std::string NativeImage::ToDataURL(mate::Arguments* args) {
--  float scale_factor = GetScaleFactorFromOptions(args);
--
--  if (scale_factor == 1.0f) {
--    // Use raw 1x PNG bytes when available
--    scoped_refptr<base::RefCountedMemory> png = image_.As1xPNGBytes();
--    if (png->size() > 0)
--      return webui::GetPngDataUrl(png->front(), png->size());
--  }
--
--  return webui::GetBitmapDataUrl(
--      image_.AsImageSkia().GetRepresentation(scale_factor).sk_bitmap());
--}
--
--v8::Local<v8::Value> NativeImage::GetBitmap(mate::Arguments* args) {
--  float scale_factor = GetScaleFactorFromOptions(args);
--
--  const SkBitmap bitmap =
--      image_.AsImageSkia().GetRepresentation(scale_factor).sk_bitmap();
--  SkPixelRef* ref = bitmap.pixelRef();
--  if (!ref)
--    return node::Buffer::New(args->isolate(), 0).ToLocalChecked();
--  return node::Buffer::New(args->isolate(),
--                           reinterpret_cast<char*>(ref->pixels()),
--                           bitmap.computeByteSize(), &Noop, nullptr)
--      .ToLocalChecked();
--}
--
--v8::Local<v8::Value> NativeImage::GetNativeHandle(v8::Isolate* isolate,
--                                                  mate::Arguments* args) {
--#if defined(OS_MACOSX)
--  if (IsEmpty())
--    return node::Buffer::New(isolate, 0).ToLocalChecked();
--
--  NSImage* ptr = image_.AsNSImage();
--  return node::Buffer::Copy(isolate, reinterpret_cast<char*>(ptr),
--                            sizeof(void*))
--      .ToLocalChecked();
--#else
--  args->ThrowError("Not implemented");
--  return v8::Undefined(isolate);
--#endif
--}
--
--bool NativeImage::IsEmpty() {
--  return image_.IsEmpty();
--}
--
--gfx::Size NativeImage::GetSize() {
--  return image_.Size();
--}
--
--float NativeImage::GetAspectRatio() {
--  gfx::Size size = GetSize();
--  if (size.IsEmpty())
--    return 1.f;
--  else
--    return static_cast<float>(size.width()) / static_cast<float>(size.height());
--}
--
--mate::Handle<NativeImage> NativeImage::Resize(
--    v8::Isolate* isolate,
--    const base::DictionaryValue& options) {
--  gfx::Size size = GetSize();
--  int width = size.width();
--  int height = size.height();
--  bool width_set = options.GetInteger("width", &width);
--  bool height_set = options.GetInteger("height", &height);
--  size.SetSize(width, height);
--
--  if (width_set && !height_set) {
--    // Scale height to preserve original aspect ratio
--    size.set_height(width);
--    size = gfx::ScaleToRoundedSize(size, 1.f, 1.f / GetAspectRatio());
--  } else if (height_set && !width_set) {
--    // Scale width to preserve original aspect ratio
--    size.set_width(height);
--    size = gfx::ScaleToRoundedSize(size, GetAspectRatio(), 1.f);
--  }
--
--  skia::ImageOperations::ResizeMethod method =
--      skia::ImageOperations::ResizeMethod::RESIZE_BEST;
--  std::string quality;
--  options.GetString("quality", &quality);
--  if (quality == "good")
--    method = skia::ImageOperations::ResizeMethod::RESIZE_GOOD;
--  else if (quality == "better")
--    method = skia::ImageOperations::ResizeMethod::RESIZE_BETTER;
--
--  gfx::ImageSkia resized = gfx::ImageSkiaOperations::CreateResizedImage(
--      image_.AsImageSkia(), method, size);
--  return mate::CreateHandle(isolate,
--                            new NativeImage(isolate, gfx::Image(resized)));
--}
--
--mate::Handle<NativeImage> NativeImage::Crop(v8::Isolate* isolate,
--                                            const gfx::Rect& rect) {
--  gfx::ImageSkia cropped =
--      gfx::ImageSkiaOperations::ExtractSubset(image_.AsImageSkia(), rect);
--  return mate::CreateHandle(isolate,
--                            new NativeImage(isolate, gfx::Image(cropped)));
--}
--
--void NativeImage::AddRepresentation(const mate::Dictionary& options) {
--  int width = 0;
--  int height = 0;
--  float scale_factor = 1.0f;
--  options.Get("width", &width);
--  options.Get("height", &height);
--  options.Get("scaleFactor", &scale_factor);
--
--  bool skia_rep_added = false;
--  gfx::ImageSkia image_skia = image_.AsImageSkia();
--
--  v8::Local<v8::Value> buffer;
--  GURL url;
--  if (options.Get("buffer", &buffer) && node::Buffer::HasInstance(buffer)) {
--    AddImageSkiaRep(
--        &image_skia,
--        reinterpret_cast<unsigned char*>(node::Buffer::Data(buffer)),
--        node::Buffer::Length(buffer), width, height, scale_factor);
--    skia_rep_added = true;
--  } else if (options.Get("dataURL", &url)) {
--    std::string mime_type, charset, data;
--    if (net::DataURL::Parse(url, &mime_type, &charset, &data)) {
--      if (mime_type == "image/png" || mime_type == "image/jpeg") {
--        AddImageSkiaRep(&image_skia,
--                        reinterpret_cast<const unsigned char*>(data.c_str()),
--                        data.size(), width, height, scale_factor);
--        skia_rep_added = true;
--      }
--    }
--  }
--
--  // Re-initialize image when first representation is added to an empty image
--  if (skia_rep_added && IsEmpty()) {
--    gfx::Image image(image_skia);
--    image_ = std::move(image);
--  }
--}
--
--#if !defined(OS_MACOSX)
--void NativeImage::SetTemplateImage(bool setAsTemplate) {}
--
--bool NativeImage::IsTemplateImage() {
--  return false;
--}
--#endif
--
--// static
--mate::Handle<NativeImage> NativeImage::CreateEmpty(v8::Isolate* isolate) {
--  return mate::CreateHandle(isolate, new NativeImage(isolate, gfx::Image()));
--}
--
--// static
--mate::Handle<NativeImage> NativeImage::Create(v8::Isolate* isolate,
--                                              const gfx::Image& image) {
--  return mate::CreateHandle(isolate, new NativeImage(isolate, image));
--}
--
--// static
--mate::Handle<NativeImage> NativeImage::CreateFromPNG(v8::Isolate* isolate,
--                                                     const char* buffer,
--                                                     size_t length) {
--  gfx::Image image = gfx::Image::CreateFrom1xPNGBytes(
--      reinterpret_cast<const unsigned char*>(buffer), length);
--  return Create(isolate, image);
--}
--
--// static
--mate::Handle<NativeImage> NativeImage::CreateFromJPEG(v8::Isolate* isolate,
--                                                      const char* buffer,
--                                                      size_t length) {
--  gfx::Image image = gfx::ImageFrom1xJPEGEncodedData(
--      reinterpret_cast<const unsigned char*>(buffer), length);
--  return Create(isolate, image);
--}
--
--// static
--mate::Handle<NativeImage> NativeImage::CreateFromPath(
--    v8::Isolate* isolate,
--    const base::FilePath& path) {
--  base::FilePath image_path = NormalizePath(path);
--#if defined(OS_WIN)
--  if (image_path.MatchesExtension(FILE_PATH_LITERAL(".ico"))) {
--    return mate::CreateHandle(isolate, new NativeImage(isolate, image_path));
--  }
--#endif
--  gfx::ImageSkia image_skia;
--  PopulateImageSkiaRepsFromPath(&image_skia, image_path);
--  gfx::Image image(image_skia);
--  mate::Handle<NativeImage> handle = Create(isolate, image);
--#if defined(OS_MACOSX)
--  if (IsTemplateFilename(image_path))
--    handle->SetTemplateImage(true);
--#endif
--  return handle;
--}
--
--// static
--mate::Handle<NativeImage> NativeImage::CreateFromBuffer(
--    mate::Arguments* args,
--    v8::Local<v8::Value> buffer) {
--  int width = 0;
--  int height = 0;
--  double scale_factor = 1.;
--
--  mate::Dictionary options;
--  if (args->GetNext(&options)) {
--    options.Get("width", &width);
--    options.Get("height", &height);
--    options.Get("scaleFactor", &scale_factor);
--  }
--
--  gfx::ImageSkia image_skia;
--  AddImageSkiaRep(&image_skia,
--                  reinterpret_cast<unsigned char*>(node::Buffer::Data(buffer)),
--                  node::Buffer::Length(buffer), width, height, scale_factor);
--  return Create(args->isolate(), gfx::Image(image_skia));
--}
--
--// static
--mate::Handle<NativeImage> NativeImage::CreateFromDataURL(v8::Isolate* isolate,
--                                                         const GURL& url) {
--  std::string mime_type, charset, data;
--  if (net::DataURL::Parse(url, &mime_type, &charset, &data)) {
--    if (mime_type == "image/png")
--      return CreateFromPNG(isolate, data.c_str(), data.size());
--    else if (mime_type == "image/jpeg")
--      return CreateFromJPEG(isolate, data.c_str(), data.size());
--  }
--
--  return CreateEmpty(isolate);
--}
--
--#if !defined(OS_MACOSX)
--mate::Handle<NativeImage> NativeImage::CreateFromNamedImage(
--    mate::Arguments* args,
--    const std::string& name) {
--  return CreateEmpty(args->isolate());
--}
--#endif
--
--// static
--void NativeImage::BuildPrototype(v8::Isolate* isolate,
--                                 v8::Local<v8::FunctionTemplate> prototype) {
--  prototype->SetClassName(mate::StringToV8(isolate, "NativeImage"));
--  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
--      .SetMethod("toPNG", &NativeImage::ToPNG)
--      .SetMethod("toJPEG", &NativeImage::ToJPEG)
--      .SetMethod("toBitmap", &NativeImage::ToBitmap)
--      .SetMethod("getBitmap", &NativeImage::GetBitmap)
--      .SetMethod("getNativeHandle", &NativeImage::GetNativeHandle)
--      .SetMethod("toDataURL", &NativeImage::ToDataURL)
--      .SetMethod("isEmpty", &NativeImage::IsEmpty)
--      .SetMethod("getSize", &NativeImage::GetSize)
--      .SetMethod("setTemplateImage", &NativeImage::SetTemplateImage)
--      .SetMethod("isTemplateImage", &NativeImage::IsTemplateImage)
--      .SetMethod("resize", &NativeImage::Resize)
--      .SetMethod("crop", &NativeImage::Crop)
--      .SetMethod("getAspectRatio", &NativeImage::GetAspectRatio)
--      .SetMethod("addRepresentation", &NativeImage::AddRepresentation);
--}
--
--}  // namespace api
--
--}  // namespace atom
--
--namespace mate {
--
--v8::Local<v8::Value> Converter<mate::Handle<atom::api::NativeImage>>::ToV8(
--    v8::Isolate* isolate,
--    const mate::Handle<atom::api::NativeImage>& val) {
--  return val.ToV8();
--}
--
--bool Converter<mate::Handle<atom::api::NativeImage>>::FromV8(
--    v8::Isolate* isolate,
--    v8::Local<v8::Value> val,
--    mate::Handle<atom::api::NativeImage>* out) {
--  // Try converting from file path.
--  base::FilePath path;
--  if (ConvertFromV8(isolate, val, &path)) {
--    *out = atom::api::NativeImage::CreateFromPath(isolate, path);
--    // Should throw when failed to initialize from path.
--    return !(*out)->image().IsEmpty();
--  }
--
--  WrappableBase* wrapper =
--      static_cast<WrappableBase*>(internal::FromV8Impl(isolate, val));
--  if (!wrapper)
--    return false;
--
--  *out = CreateHandle(isolate, static_cast<atom::api::NativeImage*>(wrapper));
--  return true;
--}
--
--}  // namespace mate
--
--namespace {
--
--void Initialize(v8::Local<v8::Object> exports,
--                v8::Local<v8::Value> unused,
--                v8::Local<v8::Context> context,
--                void* priv) {
--  mate::Dictionary dict(context->GetIsolate(), exports);
--  dict.SetMethod("createEmpty", &atom::api::NativeImage::CreateEmpty);
--  dict.SetMethod("createFromPath", &atom::api::NativeImage::CreateFromPath);
--  dict.SetMethod("createFromBuffer", &atom::api::NativeImage::CreateFromBuffer);
--  dict.SetMethod("createFromDataURL",
--                 &atom::api::NativeImage::CreateFromDataURL);
--  dict.SetMethod("createFromNamedImage",
--                 &atom::api::NativeImage::CreateFromNamedImage);
--}
--
--}  // namespace
--
--NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_common_native_image, Initialize)
-removed in remote
-  base   100644 145f5ff1dcdceed2e63e5ff0171cac00283f4a9e atom/common/api/atom_api_native_image.h
-  our    100644 f945e3d4df39a83d667c5c3eb290293ed2788f4a atom/common/api/atom_api_native_image.h
-@@ -1,129 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_COMMON_API_ATOM_API_NATIVE_IMAGE_H_
--#define ATOM_COMMON_API_ATOM_API_NATIVE_IMAGE_H_
--
--#include <map>
--#include <string>
--
--#include "base/values.h"
--#include "native_mate/dictionary.h"
--#include "native_mate/handle.h"
--#include "native_mate/wrappable.h"
--#include "ui/gfx/geometry/rect.h"
--#include "ui/gfx/image/image.h"
--
--#if defined(OS_WIN)
--#include "base/files/file_path.h"
--#include "base/win/scoped_gdi_object.h"
--#endif
--
--class GURL;
--
--namespace base {
--class FilePath;
--}
--
--namespace gfx {
--class Size;
--}
--
--namespace mate {
--class Arguments;
--}
--
--namespace atom {
--
--namespace api {
--
--class NativeImage : public mate::Wrappable<NativeImage> {
-- public:
--  static mate::Handle<NativeImage> CreateEmpty(v8::Isolate* isolate);
--  static mate::Handle<NativeImage> Create(v8::Isolate* isolate,
--                                          const gfx::Image& image);
--  static mate::Handle<NativeImage> CreateFromPNG(v8::Isolate* isolate,
--                                                 const char* buffer,
--                                                 size_t length);
--  static mate::Handle<NativeImage> CreateFromJPEG(v8::Isolate* isolate,
--                                                  const char* buffer,
--                                                  size_t length);
--  static mate::Handle<NativeImage> CreateFromPath(v8::Isolate* isolate,
--                                                  const base::FilePath& path);
--  static mate::Handle<NativeImage> CreateFromBuffer(
--      mate::Arguments* args,
--      v8::Local<v8::Value> buffer);
--  static mate::Handle<NativeImage> CreateFromDataURL(v8::Isolate* isolate,
--                                                     const GURL& url);
--  static mate::Handle<NativeImage> CreateFromNamedImage(
--      mate::Arguments* args,
--      const std::string& name);
--
--  static void BuildPrototype(v8::Isolate* isolate,
--                             v8::Local<v8::FunctionTemplate> prototype);
--
--#if defined(OS_WIN)
--  HICON GetHICON(int size);
--#endif
--
--  const gfx::Image& image() const { return image_; }
--
-- protected:
--  NativeImage(v8::Isolate* isolate, const gfx::Image& image);
--#if defined(OS_WIN)
--  NativeImage(v8::Isolate* isolate, const base::FilePath& hicon_path);
--#endif
--  ~NativeImage() override;
--
-- private:
--  v8::Local<v8::Value> ToPNG(mate::Arguments* args);
--  v8::Local<v8::Value> ToJPEG(v8::Isolate* isolate, int quality);
--  v8::Local<v8::Value> ToBitmap(mate::Arguments* args);
--  v8::Local<v8::Value> GetBitmap(mate::Arguments* args);
--  v8::Local<v8::Value> GetNativeHandle(v8::Isolate* isolate,
--                                       mate::Arguments* args);
--  mate::Handle<NativeImage> Resize(v8::Isolate* isolate,
--                                   const base::DictionaryValue& options);
--  mate::Handle<NativeImage> Crop(v8::Isolate* isolate, const gfx::Rect& rect);
--  std::string ToDataURL(mate::Arguments* args);
--  bool IsEmpty();
--  gfx::Size GetSize();
--  float GetAspectRatio();
--  void AddRepresentation(const mate::Dictionary& options);
--
--  // Mark the image as template image.
--  void SetTemplateImage(bool setAsTemplate);
--  // Determine if the image is a template image.
--  bool IsTemplateImage();
--
--#if defined(OS_WIN)
--  base::FilePath hicon_path_;
--  std::map<int, base::win::ScopedHICON> hicons_;
--#endif
--
--  gfx::Image image_;
--
--  DISALLOW_COPY_AND_ASSIGN(NativeImage);
--};
--
--}  // namespace api
--
--}  // namespace atom
--
--namespace mate {
--
--// A custom converter that allows converting path to NativeImage.
--template <>
--struct Converter<mate::Handle<atom::api::NativeImage>> {
--  static v8::Local<v8::Value> ToV8(
--      v8::Isolate* isolate,
--      const mate::Handle<atom::api::NativeImage>& val);
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     mate::Handle<atom::api::NativeImage>* out);
--};
--
--}  // namespace mate
--
--#endif  // ATOM_COMMON_API_ATOM_API_NATIVE_IMAGE_H_
-removed in remote
-  base   100644 ad72d4b149246ef77a06369359b33fe26c1db3ff atom/common/api/atom_api_native_image_mac.mm
-  our    100644 df1cec129f310bbd51448444a256a7be6d3b1a5c atom/common/api/atom_api_native_image_mac.mm
-@@ -1,73 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/common/api/atom_api_native_image.h"
--
--#import <Cocoa/Cocoa.h>
--
--#include "base/strings/sys_string_conversions.h"
--#include "ui/gfx/color_utils.h"
--#include "ui/gfx/image/image.h"
--#include "ui/gfx/image/image_skia.h"
--#include "ui/gfx/image/image_skia_operations.h"
--
--namespace atom {
--
--namespace api {
--
--NSData* bufferFromNSImage(NSImage* image) {
--  CGImageRef ref = [image CGImageForProposedRect:nil context:nil hints:nil];
--  NSBitmapImageRep* rep = [[NSBitmapImageRep alloc] initWithCGImage:ref];
--  [rep setSize:[image size]];
--  return [rep representationUsingType:NSPNGFileType
--                           properties:[[NSDictionary alloc] init]];
--}
--
--double safeShift(double in, double def) {
--  if (in >= 0 || in <= 1 || in == def)
--    return in;
--  return def;
--}
--
--mate::Handle<NativeImage> NativeImage::CreateFromNamedImage(
--    mate::Arguments* args,
--    const std::string& name) {
--  @autoreleasepool {
--    std::vector<double> hsl_shift;
--    NSImage* image = [NSImage imageNamed:base::SysUTF8ToNSString(name)];
--    if (!image.valid) {
--      return CreateEmpty(args->isolate());
--    }
--
--    NSData* png_data = bufferFromNSImage(image);
--
--    if (args->GetNext(&hsl_shift) && hsl_shift.size() == 3) {
--      gfx::Image gfx_image = gfx::Image::CreateFrom1xPNGBytes(
--          reinterpret_cast<const unsigned char*>((char*)[png_data bytes]),
--          [png_data length]);
--      color_utils::HSL shift = {safeShift(hsl_shift[0], -1),
--                                safeShift(hsl_shift[1], 0.5),
--                                safeShift(hsl_shift[2], 0.5)};
--      png_data = bufferFromNSImage(
--          gfx::Image(gfx::ImageSkiaOperations::CreateHSLShiftedImage(
--                         gfx_image.AsImageSkia(), shift))
--              .CopyNSImage());
--    }
--
--    return CreateFromPNG(args->isolate(), (char*)[png_data bytes],
--                         [png_data length]);
--  }
--}
--
--void NativeImage::SetTemplateImage(bool setAsTemplate) {
--  [image_.AsNSImage() setTemplate:setAsTemplate];
--}
--
--bool NativeImage::IsTemplateImage() {
--  return [image_.AsNSImage() isTemplate];
--}
--
--}  // namespace api
--
--}  // namespace atom
-removed in remote
-  base   100644 f99e2ba1854e0bdeb35d9adb327f04c8a84d7392 atom/common/api/atom_api_shell.cc
-  our    100644 1323cd6402d295ccc804da6c3d42c5d7472a564e atom/common/api/atom_api_shell.cc
-@@ -1,157 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include <string>
--
--#include "atom/common/native_mate_converters/callback.h"
--#include "atom/common/native_mate_converters/file_path_converter.h"
--#include "atom/common/native_mate_converters/gurl_converter.h"
--#include "atom/common/native_mate_converters/string16_converter.h"
--#include "atom/common/node_includes.h"
--#include "atom/common/platform_util.h"
--#include "native_mate/dictionary.h"
--
--#if defined(OS_WIN)
--#include "base/win/scoped_com_initializer.h"
--#include "base/win/shortcut.h"
--
--namespace mate {
--
--template <>
--struct Converter<base::win::ShortcutOperation> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Handle<v8::Value> val,
--                     base::win::ShortcutOperation* out) {
--    std::string operation;
--    if (!ConvertFromV8(isolate, val, &operation))
--      return false;
--    if (operation.empty() || operation == "create")
--      *out = base::win::SHORTCUT_CREATE_ALWAYS;
--    else if (operation == "update")
--      *out = base::win::SHORTCUT_UPDATE_EXISTING;
--    else if (operation == "replace")
--      *out = base::win::SHORTCUT_REPLACE_EXISTING;
--    else
--      return false;
--    return true;
--  }
--};
--
--}  // namespace mate
--#endif
--
--namespace {
--
--void OnOpenExternalFinished(
--    v8::Isolate* isolate,
--    const base::Callback<void(v8::Local<v8::Value>)>& callback,
--    const std::string& error) {
--  if (error.empty())
--    callback.Run(v8::Null(isolate));
--  else
--    callback.Run(v8::String::NewFromUtf8(isolate, error.c_str()));
--}
--
--bool OpenExternal(
--#if defined(OS_WIN)
--    const base::string16& url,
--#else
--    const GURL& url,
--#endif
--    mate::Arguments* args) {
--  bool activate = true;
--  if (args->Length() >= 2) {
--    mate::Dictionary options;
--    if (args->GetNext(&options)) {
--      options.Get("activate", &activate);
--    }
--  }
--
--  if (args->Length() >= 3) {
--    base::Callback<void(v8::Local<v8::Value>)> callback;
--    if (args->GetNext(&callback)) {
--      platform_util::OpenExternal(
--          url, activate,
--          base::Bind(&OnOpenExternalFinished, args->isolate(), callback));
--      return true;
--    }
--  }
--
--  return platform_util::OpenExternal(url, activate);
--}
--
--#if defined(OS_WIN)
--bool WriteShortcutLink(const base::FilePath& shortcut_path,
--                       mate::Arguments* args) {
--  base::win::ShortcutOperation operation = base::win::SHORTCUT_CREATE_ALWAYS;
--  args->GetNext(&operation);
--  mate::Dictionary options = mate::Dictionary::CreateEmpty(args->isolate());
--  if (!args->GetNext(&options)) {
--    args->ThrowError();
--    return false;
--  }
--
--  base::win::ShortcutProperties properties;
--  base::FilePath path;
--  base::string16 str;
--  int index;
--  if (options.Get("target", &path))
--    properties.set_target(path);
--  if (options.Get("cwd", &path))
--    properties.set_working_dir(path);
--  if (options.Get("args", &str))
--    properties.set_arguments(str);
--  if (options.Get("description", &str))
--    properties.set_description(str);
--  if (options.Get("icon", &path) && options.Get("iconIndex", &index))
--    properties.set_icon(path, index);
--  if (options.Get("appUserModelId", &str))
--    properties.set_app_id(str);
--
--  base::win::ScopedCOMInitializer com_initializer;
--  return base::win::CreateOrUpdateShortcutLink(shortcut_path, properties,
--                                               operation);
--}
--
--v8::Local<v8::Value> ReadShortcutLink(mate::Arguments* args,
--                                      const base::FilePath& path) {
--  using base::win::ShortcutProperties;
--  mate::Dictionary options = mate::Dictionary::CreateEmpty(args->isolate());
--  base::win::ScopedCOMInitializer com_initializer;
--  base::win::ShortcutProperties properties;
--  if (!base::win::ResolveShortcutProperties(
--          path, ShortcutProperties::PROPERTIES_ALL, &properties)) {
--    args->ThrowError("Failed to read shortcut link");
--    return v8::Null(args->isolate());
--  }
--  options.Set("target", properties.target);
--  options.Set("cwd", properties.working_dir);
--  options.Set("args", properties.arguments);
--  options.Set("description", properties.description);
--  options.Set("icon", properties.icon);
--  options.Set("iconIndex", properties.icon_index);
--  options.Set("appUserModelId", properties.app_id);
--  return options.GetHandle();
--}
--#endif
--
--void Initialize(v8::Local<v8::Object> exports,
--                v8::Local<v8::Value> unused,
--                v8::Local<v8::Context> context,
--                void* priv) {
--  mate::Dictionary dict(context->GetIsolate(), exports);
--  dict.SetMethod("showItemInFolder", &platform_util::ShowItemInFolder);
--  dict.SetMethod("openItem", &platform_util::OpenItem);
--  dict.SetMethod("openExternal", &OpenExternal);
--  dict.SetMethod("moveItemToTrash", &platform_util::MoveItemToTrash);
--  dict.SetMethod("beep", &platform_util::Beep);
--#if defined(OS_WIN)
--  dict.SetMethod("writeShortcutLink", &WriteShortcutLink);
--  dict.SetMethod("readShortcutLink", &ReadShortcutLink);
--#endif
--}
--
--}  // namespace
--
--NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_common_shell, Initialize)
-removed in remote
-  base   100644 0ebd939398f1f6987f179a97664d1c12878c58b9 atom/common/api/atom_api_v8_util.cc
-  our    100644 3d80db0c0a4cdbb4c7a78fa7e4266fc6fc87193f atom/common/api/atom_api_v8_util.cc
-@@ -1,129 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include <string>
--#include <utility>
--
--#include "atom/common/api/atom_api_key_weak_map.h"
--#include "atom/common/api/remote_callback_freer.h"
--#include "atom/common/api/remote_object_freer.h"
--#include "atom/common/native_mate_converters/content_converter.h"
--#include "atom/common/native_mate_converters/gurl_converter.h"
--#include "atom/common/node_includes.h"
--#include "base/hash.h"
--#include "native_mate/dictionary.h"
--#include "url/origin.h"
--#include "v8/include/v8-profiler.h"
--
--namespace std {
--
--// The hash function used by DoubleIDWeakMap.
--template <typename Type1, typename Type2>
--struct hash<std::pair<Type1, Type2>> {
--  std::size_t operator()(std::pair<Type1, Type2> value) const {
--    return base::HashInts(base::Hash(value.first), value.second);
--  }
--};
--
--}  // namespace std
--
--namespace mate {
--
--template <typename Type1, typename Type2>
--struct Converter<std::pair<Type1, Type2>> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     std::pair<Type1, Type2>* out) {
--    if (!val->IsArray())
--      return false;
--
--    v8::Local<v8::Array> array(v8::Local<v8::Array>::Cast(val));
--    if (array->Length() != 2)
--      return false;
--    return Converter<Type1>::FromV8(isolate, array->Get(0), &out->first) &&
--           Converter<Type2>::FromV8(isolate, array->Get(1), &out->second);
--  }
--};
--
--}  // namespace mate
--
--namespace {
--
--v8::Local<v8::Value> GetHiddenValue(v8::Isolate* isolate,
--                                    v8::Local<v8::Object> object,
--                                    v8::Local<v8::String> key) {
--  v8::Local<v8::Context> context = isolate->GetCurrentContext();
--  v8::Local<v8::Private> privateKey = v8::Private::ForApi(isolate, key);
--  v8::Local<v8::Value> value;
--  v8::Maybe<bool> result = object->HasPrivate(context, privateKey);
--  if (!(result.IsJust() && result.FromJust()))
--    return v8::Local<v8::Value>();
--  if (object->GetPrivate(context, privateKey).ToLocal(&value))
--    return value;
--  return v8::Local<v8::Value>();
--}
--
--void SetHiddenValue(v8::Isolate* isolate,
--                    v8::Local<v8::Object> object,
--                    v8::Local<v8::String> key,
--                    v8::Local<v8::Value> value) {
--  if (value.IsEmpty())
--    return;
--  v8::Local<v8::Context> context = isolate->GetCurrentContext();
--  v8::Local<v8::Private> privateKey = v8::Private::ForApi(isolate, key);
--  object->SetPrivate(context, privateKey, value);
--}
--
--void DeleteHiddenValue(v8::Isolate* isolate,
--                       v8::Local<v8::Object> object,
--                       v8::Local<v8::String> key) {
--  v8::Local<v8::Context> context = isolate->GetCurrentContext();
--  v8::Local<v8::Private> privateKey = v8::Private::ForApi(isolate, key);
--  // Actually deleting the value would make force the object into
--  // dictionary mode which is unnecessarily slow. Instead, we replace
--  // the hidden value with "undefined".
--  object->SetPrivate(context, privateKey, v8::Undefined(isolate));
--}
--
--int32_t GetObjectHash(v8::Local<v8::Object> object) {
--  return object->GetIdentityHash();
--}
--
--void TakeHeapSnapshot(v8::Isolate* isolate) {
--  isolate->GetHeapProfiler()->TakeHeapSnapshot();
--}
--
--void RequestGarbageCollectionForTesting(v8::Isolate* isolate) {
--  isolate->RequestGarbageCollectionForTesting(
--      v8::Isolate::GarbageCollectionType::kFullGarbageCollection);
--}
--
--bool IsSameOrigin(const GURL& l, const GURL& r) {
--  return url::Origin::Create(l).IsSameOriginWith(url::Origin::Create(r));
--}
--
--void Initialize(v8::Local<v8::Object> exports,
--                v8::Local<v8::Value> unused,
--                v8::Local<v8::Context> context,
--                void* priv) {
--  mate::Dictionary dict(context->GetIsolate(), exports);
--  dict.SetMethod("getHiddenValue", &GetHiddenValue);
--  dict.SetMethod("setHiddenValue", &SetHiddenValue);
--  dict.SetMethod("deleteHiddenValue", &DeleteHiddenValue);
--  dict.SetMethod("getObjectHash", &GetObjectHash);
--  dict.SetMethod("takeHeapSnapshot", &TakeHeapSnapshot);
--  dict.SetMethod("setRemoteCallbackFreer", &atom::RemoteCallbackFreer::BindTo);
--  dict.SetMethod("setRemoteObjectFreer", &atom::RemoteObjectFreer::BindTo);
--  dict.SetMethod("createIDWeakMap", &atom::api::KeyWeakMap<int32_t>::Create);
--  dict.SetMethod(
--      "createDoubleIDWeakMap",
--      &atom::api::KeyWeakMap<std::pair<std::string, int32_t>>::Create);
--  dict.SetMethod("requestGarbageCollectionForTesting",
--                 &RequestGarbageCollectionForTesting);
--  dict.SetMethod("isSameOrigin", &IsSameOrigin);
--}
--
--}  // namespace
--
--NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_common_v8_util, Initialize)
-removed in remote
-  base   100644 fe53d8793f2a765d050ea088add855d19f2cbd8f atom/common/api/atom_bindings.cc
-  our    100644 3dba3d63673ca8eb02044bd1335a3095f0194971 atom/common/api/atom_bindings.cc
-@@ -1,262 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/common/api/atom_bindings.h"
--
--#include <algorithm>
--#include <iostream>
--#include <string>
--
--#include "atom/common/api/locker.h"
--#include "atom/common/atom_version.h"
--#include "atom/common/chrome_version.h"
--#include "atom/common/native_mate_converters/string16_converter.h"
--#include "atom/common/node_includes.h"
--#include "base/logging.h"
--#include "base/process/process_info.h"
--#include "base/process/process_metrics_iocounters.h"
--#include "base/sys_info.h"
--#include "native_mate/dictionary.h"
--
--namespace atom {
--
--namespace {
--
--// Dummy class type that used for crashing the program.
--struct DummyClass {
--  bool crash;
--};
--
--// Called when there is a fatal error in V8, we just crash the process here so
--// we can get the stack trace.
--void FatalErrorCallback(const char* location, const char* message) {
--  LOG(ERROR) << "Fatal error in V8: " << location << " " << message;
--  AtomBindings::Crash();
--}
--
--}  // namespace
--
--AtomBindings::AtomBindings(uv_loop_t* loop) {
--  uv_async_init(loop, &call_next_tick_async_, OnCallNextTick);
--  call_next_tick_async_.data = this;
--  metrics_ = base::ProcessMetrics::CreateCurrentProcessMetrics();
--}
--
--AtomBindings::~AtomBindings() {
--  uv_close(reinterpret_cast<uv_handle_t*>(&call_next_tick_async_), nullptr);
--}
--
--void AtomBindings::BindTo(v8::Isolate* isolate, v8::Local<v8::Object> process) {
--  isolate->SetFatalErrorHandler(FatalErrorCallback);
--
--  mate::Dictionary dict(isolate, process);
--  dict.SetMethod("crash", &AtomBindings::Crash);
--  dict.SetMethod("hang", &Hang);
--  dict.SetMethod("log", &Log);
--  dict.SetMethod("getHeapStatistics", &GetHeapStatistics);
--  dict.SetMethod("getProcessMemoryInfo", &GetProcessMemoryInfo);
--  dict.SetMethod("getCreationTime", &GetCreationTime);
--  dict.SetMethod("getSystemMemoryInfo", &GetSystemMemoryInfo);
--  dict.SetMethod("getCPUUsage", base::Bind(&AtomBindings::GetCPUUsage,
--                                           base::Unretained(metrics_.get())));
--  dict.SetMethod("getIOCounters", &GetIOCounters);
--#if defined(OS_POSIX)
--  dict.SetMethod("setFdLimit", &base::SetFdLimit);
--#endif
--  dict.SetMethod("activateUvLoop", base::Bind(&AtomBindings::ActivateUVLoop,
--                                              base::Unretained(this)));
--
--#if defined(MAS_BUILD)
--  dict.Set("mas", true);
--#endif
--
--  mate::Dictionary versions;
--  if (dict.Get("versions", &versions)) {
--    // TODO(kevinsawicki): Make read-only in 2.0 to match node
--    versions.Set(ATOM_PROJECT_NAME, ATOM_VERSION_STRING);
--    versions.Set("chrome", CHROME_VERSION_STRING);
--  }
--}
--
--void AtomBindings::EnvironmentDestroyed(node::Environment* env) {
--  auto it =
--      std::find(pending_next_ticks_.begin(), pending_next_ticks_.end(), env);
--  if (it != pending_next_ticks_.end())
--    pending_next_ticks_.erase(it);
--}
--
--void AtomBindings::ActivateUVLoop(v8::Isolate* isolate) {
--  node::Environment* env = node::Environment::GetCurrent(isolate);
--  if (std::find(pending_next_ticks_.begin(), pending_next_ticks_.end(), env) !=
--      pending_next_ticks_.end())
--    return;
--
--  pending_next_ticks_.push_back(env);
--  uv_async_send(&call_next_tick_async_);
--}
--
--// static
--void AtomBindings::OnCallNextTick(uv_async_t* handle) {
--  AtomBindings* self = static_cast<AtomBindings*>(handle->data);
--  for (std::list<node::Environment*>::const_iterator it =
--           self->pending_next_ticks_.begin();
--       it != self->pending_next_ticks_.end(); ++it) {
--    node::Environment* env = *it;
--    mate::Locker locker(env->isolate());
--    v8::Context::Scope context_scope(env->context());
--    node::InternalCallbackScope scope(
--        env, v8::Local<v8::Object>(), {0, 0},
--        node::InternalCallbackScope::kAllowEmptyResource);
--  }
--
--  self->pending_next_ticks_.clear();
--}
--
--// static
--void AtomBindings::Log(const base::string16& message) {
--  std::cout << message << std::flush;
--}
--
--// static
--void AtomBindings::Crash() {
--  static_cast<DummyClass*>(nullptr)->crash = true;
--}
--
--// static
--void AtomBindings::Hang() {
--  for (;;)
--    base::PlatformThread::Sleep(base::TimeDelta::FromSeconds(1));
--}
--
--// static
--v8::Local<v8::Value> AtomBindings::GetHeapStatistics(v8::Isolate* isolate) {
--  v8::HeapStatistics v8_heap_stats;
--  isolate->GetHeapStatistics(&v8_heap_stats);
--
--  mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
--  dict.SetHidden("simple", true);
--  dict.Set("totalHeapSize",
--           static_cast<double>(v8_heap_stats.total_heap_size() >> 10));
--  dict.Set(
--      "totalHeapSizeExecutable",
--      static_cast<double>(v8_heap_stats.total_heap_size_executable() >> 10));
--  dict.Set("totalPhysicalSize",
--           static_cast<double>(v8_heap_stats.total_physical_size() >> 10));
--  dict.Set("totalAvailableSize",
--           static_cast<double>(v8_heap_stats.total_available_size() >> 10));
--  dict.Set("usedHeapSize",
--           static_cast<double>(v8_heap_stats.used_heap_size() >> 10));
--  dict.Set("heapSizeLimit",
--           static_cast<double>(v8_heap_stats.heap_size_limit() >> 10));
--  dict.Set("mallocedMemory",
--           static_cast<double>(v8_heap_stats.malloced_memory() >> 10));
--  dict.Set("peakMallocedMemory",
--           static_cast<double>(v8_heap_stats.peak_malloced_memory() >> 10));
--  dict.Set("doesZapGarbage",
--           static_cast<bool>(v8_heap_stats.does_zap_garbage()));
--
--  return dict.GetHandle();
--}
--
--// static
--v8::Local<v8::Value> AtomBindings::GetProcessMemoryInfo(v8::Isolate* isolate) {
--  auto metrics = base::ProcessMetrics::CreateCurrentProcessMetrics();
--
--  mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
--  dict.SetHidden("simple", true);
--  dict.Set("workingSetSize",
--           static_cast<double>(metrics->GetWorkingSetSize() >> 10));
--  dict.Set("peakWorkingSetSize",
--           static_cast<double>(metrics->GetPeakWorkingSetSize() >> 10));
--
--  size_t private_bytes, shared_bytes;
--  if (metrics->GetMemoryBytes(&private_bytes, &shared_bytes)) {
--    dict.Set("privateBytes", static_cast<double>(private_bytes >> 10));
--    dict.Set("sharedBytes", static_cast<double>(shared_bytes >> 10));
--  }
--
--  return dict.GetHandle();
--}
--
--// static
--v8::Local<v8::Value> AtomBindings::GetCreationTime(v8::Isolate* isolate) {
--  auto timeValue = base::CurrentProcessInfo::CreationTime();
--  if (timeValue.is_null()) {
--    return v8::Null(isolate);
--  }
--  double jsTime = timeValue.ToJsTime();
--  return v8::Number::New(isolate, jsTime);
--}
--
--// static
--v8::Local<v8::Value> AtomBindings::GetSystemMemoryInfo(v8::Isolate* isolate,
--                                                       mate::Arguments* args) {
--  base::SystemMemoryInfoKB mem_info;
--  if (!base::GetSystemMemoryInfo(&mem_info)) {
--    args->ThrowError("Unable to retrieve system memory information");
--    return v8::Undefined(isolate);
--  }
--
--  mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
--  dict.SetHidden("simple", true);
--  dict.Set("total", mem_info.total);
--
--  // See Chromium's "base/process/process_metrics.h" for an explanation.
--  int free =
--#if defined(OS_WIN)
--      mem_info.avail_phys;
--#else
--      mem_info.free;
--#endif
--  dict.Set("free", free);
--
--  // NB: These return bogus values on macOS
--#if !defined(OS_MACOSX)
--  dict.Set("swapTotal", mem_info.swap_total);
--  dict.Set("swapFree", mem_info.swap_free);
--#endif
--
--  return dict.GetHandle();
--}
--
--// static
--v8::Local<v8::Value> AtomBindings::GetCPUUsage(base::ProcessMetrics* metrics,
--                                               v8::Isolate* isolate) {
--  mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
--  dict.SetHidden("simple", true);
--  int processor_count = base::SysInfo::NumberOfProcessors();
--  dict.Set("percentCPUUsage",
--           metrics->GetPlatformIndependentCPUUsage() / processor_count);
--
--  // NB: This will throw NOTIMPLEMENTED() on Windows
--  // For backwards compatibility, we'll return 0
--#if !defined(OS_WIN)
--  dict.Set("idleWakeupsPerSecond", metrics->GetIdleWakeupsPerSecond());
--#else
--  dict.Set("idleWakeupsPerSecond", 0);
--#endif
--
--  return dict.GetHandle();
--}
--
--// static
--v8::Local<v8::Value> AtomBindings::GetIOCounters(v8::Isolate* isolate) {
--  auto metrics = base::ProcessMetrics::CreateCurrentProcessMetrics();
--  base::IoCounters io_counters;
--  mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
--  dict.SetHidden("simple", true);
--
--  if (metrics->GetIOCounters(&io_counters)) {
--    dict.Set("readOperationCount", io_counters.ReadOperationCount);
--    dict.Set("writeOperationCount", io_counters.WriteOperationCount);
--    dict.Set("otherOperationCount", io_counters.OtherOperationCount);
--    dict.Set("readTransferCount", io_counters.ReadTransferCount);
--    dict.Set("writeTransferCount", io_counters.WriteTransferCount);
--    dict.Set("otherTransferCount", io_counters.OtherTransferCount);
--  }
--
--  return dict.GetHandle();
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 9460145d2391a10fe0e18f2be29a9765862639ac atom/common/api/atom_bindings.h
-  our    100644 ba8385c979b15286fd7647582e7d0aee93e1974e atom/common/api/atom_bindings.h
-@@ -1,61 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_COMMON_API_ATOM_BINDINGS_H_
--#define ATOM_COMMON_API_ATOM_BINDINGS_H_
--
--#include <list>
--
--#include "base/macros.h"
--#include "base/process/process_metrics.h"
--#include "base/strings/string16.h"
--#include "native_mate/arguments.h"
--#include "uv.h"  // NOLINT(build/include)
--#include "v8/include/v8.h"
--
--namespace node {
--class Environment;
--}
--
--namespace atom {
--
--class AtomBindings {
-- public:
--  explicit AtomBindings(uv_loop_t* loop);
--  virtual ~AtomBindings();
--
--  // Add process.atomBinding function, which behaves like process.binding but
--  // load native code from Electron instead.
--  void BindTo(v8::Isolate* isolate, v8::Local<v8::Object> process);
--
--  // Should be called when a node::Environment has been destroyed.
--  void EnvironmentDestroyed(node::Environment* env);
--
--  static void Log(const base::string16& message);
--  static void Crash();
--  static void Hang();
--  static v8::Local<v8::Value> GetHeapStatistics(v8::Isolate* isolate);
--  static v8::Local<v8::Value> GetProcessMemoryInfo(v8::Isolate* isolate);
--  static v8::Local<v8::Value> GetCreationTime(v8::Isolate* isolate);
--  static v8::Local<v8::Value> GetSystemMemoryInfo(v8::Isolate* isolate,
--                                                  mate::Arguments* args);
--  static v8::Local<v8::Value> GetCPUUsage(base::ProcessMetrics* metrics,
--                                          v8::Isolate* isolate);
--  static v8::Local<v8::Value> GetIOCounters(v8::Isolate* isolate);
--
-- private:
--  void ActivateUVLoop(v8::Isolate* isolate);
--
--  static void OnCallNextTick(uv_async_t* handle);
--
--  uv_async_t call_next_tick_async_;
--  std::list<node::Environment*> pending_next_ticks_;
--  std::unique_ptr<base::ProcessMetrics> metrics_;
--
--  DISALLOW_COPY_AND_ASSIGN(AtomBindings);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_COMMON_API_ATOM_BINDINGS_H_
-removed in remote
-  base   100644 4b44553d37401947f2c47e55949d8a4f51cbe6b2 atom/common/api/event_emitter_caller.cc
-  our    100644 a3b9187d68e32038df191a93305c39d7dd104a97 atom/common/api/event_emitter_caller.cc
-@@ -1,38 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/common/api/event_emitter_caller.h"
--
--#include "atom/common/api/locker.h"
--#include "atom/common/node_includes.h"
--
--namespace mate {
--
--namespace internal {
--
--v8::Local<v8::Value> CallMethodWithArgs(v8::Isolate* isolate,
--                                        v8::Local<v8::Object> obj,
--                                        const char* method,
--                                        ValueVector* args) {
--  // Perform microtask checkpoint after running JavaScript.
--  v8::MicrotasksScope script_scope(isolate,
--                                   v8::MicrotasksScope::kRunMicrotasks);
--  // Use node::MakeCallback to call the callback, and it will also run pending
--  // tasks in Node.js.
--  v8::MaybeLocal<v8::Value> ret = node::MakeCallback(
--      isolate, obj, method, args->size(), &args->front(), {0, 0});
--  // If the JS function throws an exception (doesn't return a value) the result
--  // of MakeCallback will be empty and therefore ToLocal will be false, in this
--  // case we need to return "false" as that indicates that the event emitter did
--  // not handle the event
--  v8::Local<v8::Value> localRet;
--  if (ret.ToLocal(&localRet)) {
--    return localRet;
--  }
--  return v8::Boolean::New(isolate, false);
--}
--
--}  // namespace internal
--
--}  // namespace mate
-removed in remote
-  base   100644 a2567da9d109131c87d4a20bdcea64d739119c6c atom/common/api/event_emitter_caller.h
-  our    100644 023fb0a1d72f4b08e1ca8fae3ea6b74edb4bfcad atom/common/api/event_emitter_caller.h
-@@ -1,68 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_COMMON_API_EVENT_EMITTER_CALLER_H_
--#define ATOM_COMMON_API_EVENT_EMITTER_CALLER_H_
--
--#include <vector>
--
--#include "atom/common/native_mate_converters/string16_converter.h"
--#include "native_mate/converter.h"
--
--namespace mate {
--
--namespace internal {
--
--using ValueVector = std::vector<v8::Local<v8::Value>>;
--
--v8::Local<v8::Value> CallMethodWithArgs(v8::Isolate* isolate,
--                                        v8::Local<v8::Object> obj,
--                                        const char* method,
--                                        ValueVector* args);
--
--}  // namespace internal
--
--// obj.emit.apply(obj, name, args...);
--// The caller is responsible of allocating a HandleScope.
--template <typename StringType>
--v8::Local<v8::Value> EmitEvent(v8::Isolate* isolate,
--                               v8::Local<v8::Object> obj,
--                               const StringType& name,
--                               const internal::ValueVector& args) {
--  internal::ValueVector concatenated_args = {StringToV8(isolate, name)};
--  concatenated_args.reserve(1 + args.size());
--  concatenated_args.insert(concatenated_args.end(), args.begin(), args.end());
--  return internal::CallMethodWithArgs(isolate, obj, "emit", &concatenated_args);
--}
--
--// obj.emit(name, args...);
--// The caller is responsible of allocating a HandleScope.
--template <typename StringType, typename... Args>
--v8::Local<v8::Value> EmitEvent(v8::Isolate* isolate,
--                               v8::Local<v8::Object> obj,
--                               const StringType& name,
--                               const Args&... args) {
--  internal::ValueVector converted_args = {
--      StringToV8(isolate, name),
--      ConvertToV8(isolate, args)...,
--  };
--  return internal::CallMethodWithArgs(isolate, obj, "emit", &converted_args);
--}
--
--// obj.custom_emit(args...)
--template <typename... Args>
--v8::Local<v8::Value> CustomEmit(v8::Isolate* isolate,
--                                v8::Local<v8::Object> object,
--                                const char* custom_emit,
--                                const Args&... args) {
--  internal::ValueVector converted_args = {
--      ConvertToV8(isolate, args)...,
--  };
--  return internal::CallMethodWithArgs(isolate, object, custom_emit,
--                                      &converted_args);
--}
--
--}  // namespace mate
--
--#endif  // ATOM_COMMON_API_EVENT_EMITTER_CALLER_H_
-removed in remote
-  base   100644 fe0b23479a46a90aa32ebf3ba93aae0c9302accc atom/common/api/locker.cc
-  our    100644 0ae695a1f056722c24e6281ecbddad54032534ad atom/common/api/locker.cc
-@@ -1,16 +0,0 @@
--// Copyright 2014 The Chromium Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style license that can be
--// found in the LICENSE.chromium file.
--
--#include "atom/common/api/locker.h"
--
--namespace mate {
--
--Locker::Locker(v8::Isolate* isolate) {
--  if (IsBrowserProcess())
--    locker_.reset(new v8::Locker(isolate));
--}
--
--Locker::~Locker() {}
--
--}  // namespace mate
-removed in remote
-  base   100644 201217ff625af48a4f0985272757cd058e9d5271 atom/common/api/locker.h
-  our    100644 e64ef1853ec5df933a78873cb7c23a975c122894 atom/common/api/locker.h
-@@ -1,36 +0,0 @@
--// Copyright 2014 The Chromium Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style license that can be
--// found in the LICENSE.chromium file.
--
--#ifndef ATOM_COMMON_API_LOCKER_H_
--#define ATOM_COMMON_API_LOCKER_H_
--
--#include <memory>
--
--#include "base/macros.h"
--#include "v8/include/v8.h"
--
--namespace mate {
--
--// Only lock when lockers are used in current thread.
--class Locker {
-- public:
--  explicit Locker(v8::Isolate* isolate);
--  ~Locker();
--
--  // Returns whether current process is browser process, currently we detect it
--  // by checking whether current has used V8 Lock, but it might be a bad idea.
--  static inline bool IsBrowserProcess() { return v8::Locker::IsActive(); }
--
-- private:
--  void* operator new(size_t size);
--  void operator delete(void*, size_t);
--
--  std::unique_ptr<v8::Locker> locker_;
--
--  DISALLOW_COPY_AND_ASSIGN(Locker);
--};
--
--}  // namespace mate
--
--#endif  // ATOM_COMMON_API_LOCKER_H_
-removed in remote
-  base   100644 916ad8a5177ae5e359aeff96a8ec91fce99c6030 atom/common/api/object_life_monitor.cc
-  our    100644 4f83a76cf682f3071e2f948fb897069dbdbb0844 atom/common/api/object_life_monitor.cc
-@@ -1,41 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Copyright (c) 2012 Intel Corp. All rights reserved.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/common/api/object_life_monitor.h"
--
--#include "base/bind.h"
--#include "base/message_loop/message_loop.h"
--
--namespace atom {
--
--ObjectLifeMonitor::ObjectLifeMonitor(v8::Isolate* isolate,
--                                     v8::Local<v8::Object> target)
--    : target_(isolate, target), weak_ptr_factory_(this) {
--  target_.SetWeak(this, OnObjectGC, v8::WeakCallbackType::kParameter);
--}
--
--ObjectLifeMonitor::~ObjectLifeMonitor() {
--  if (target_.IsEmpty())
--    return;
--  target_.ClearWeak();
--  target_.Reset();
--}
--
--// static
--void ObjectLifeMonitor::OnObjectGC(
--    const v8::WeakCallbackInfo<ObjectLifeMonitor>& data) {
--  ObjectLifeMonitor* self = data.GetParameter();
--  self->target_.Reset();
--  self->RunDestructor();
--  data.SetSecondPassCallback(Free);
--}
--
--// static
--void ObjectLifeMonitor::Free(
--    const v8::WeakCallbackInfo<ObjectLifeMonitor>& data) {
--  delete data.GetParameter();
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 82d923fcedb7db9d26472e7ee8750cfbfe3c69c6 atom/common/api/object_life_monitor.h
-  our    100644 e047960e8130771fb1f240d84b53b181e868670e atom/common/api/object_life_monitor.h
-@@ -1,34 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_COMMON_API_OBJECT_LIFE_MONITOR_H_
--#define ATOM_COMMON_API_OBJECT_LIFE_MONITOR_H_
--
--#include "base/macros.h"
--#include "base/memory/weak_ptr.h"
--#include "v8/include/v8.h"
--
--namespace atom {
--
--class ObjectLifeMonitor {
-- protected:
--  ObjectLifeMonitor(v8::Isolate* isolate, v8::Local<v8::Object> target);
--  virtual ~ObjectLifeMonitor();
--
--  virtual void RunDestructor() = 0;
--
-- private:
--  static void OnObjectGC(const v8::WeakCallbackInfo<ObjectLifeMonitor>& data);
--  static void Free(const v8::WeakCallbackInfo<ObjectLifeMonitor>& data);
--
--  v8::Global<v8::Object> target_;
--
--  base::WeakPtrFactory<ObjectLifeMonitor> weak_ptr_factory_;
--
--  DISALLOW_COPY_AND_ASSIGN(ObjectLifeMonitor);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_COMMON_API_OBJECT_LIFE_MONITOR_H_
-removed in remote
-  base   100644 01fe23a889225b1002b1f75b7787ef4f12e78cb7 atom/common/asar/archive.cc
-  our    100644 9b37f94a4dc462c0cc84e0182654ff2571952df9 atom/common/asar/archive.cc
-@@ -1,315 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/common/asar/archive.h"
--
--#include <string>
--#include <vector>
--
--#include "atom/common/asar/scoped_temporary_file.h"
--#include "base/files/file.h"
--#include "base/files/file_util.h"
--#include "base/json/json_reader.h"
--#include "base/logging.h"
--#include "base/pickle.h"
--#include "base/strings/string_number_conversions.h"
--#include "base/task_scheduler/post_task.h"
--#include "base/threading/thread_restrictions.h"
--#include "base/values.h"
--
--#if defined(OS_WIN)
--#include <io.h>
--#endif
--
--namespace asar {
--
--namespace {
--
--#if defined(OS_WIN)
--const char kSeparators[] = "\\/";
--#else
--const char kSeparators[] = "/";
--#endif
--
--bool GetNodeFromPath(std::string path,
--                     const base::DictionaryValue* root,
--                     const base::DictionaryValue** out);
--
--// Gets the "files" from "dir".
--bool GetFilesNode(const base::DictionaryValue* root,
--                  const base::DictionaryValue* dir,
--                  const base::DictionaryValue** out) {
--  // Test for symbol linked directory.
--  std::string link;
--  if (dir->GetStringWithoutPathExpansion("link", &link)) {
--    const base::DictionaryValue* linked_node = nullptr;
--    if (!GetNodeFromPath(link, root, &linked_node))
--      return false;
--    dir = linked_node;
--  }
--
--  return dir->GetDictionaryWithoutPathExpansion("files", out);
--}
--
--// Gets sub-file "name" from "dir".
--bool GetChildNode(const base::DictionaryValue* root,
--                  const std::string& name,
--                  const base::DictionaryValue* dir,
--                  const base::DictionaryValue** out) {
--  if (name == "") {
--    *out = root;
--    return true;
--  }
--
--  const base::DictionaryValue* files = nullptr;
--  return GetFilesNode(root, dir, &files) &&
--         files->GetDictionaryWithoutPathExpansion(name, out);
--}
--
--// Gets the node of "path" from "root".
--bool GetNodeFromPath(std::string path,
--                     const base::DictionaryValue* root,
--                     const base::DictionaryValue** out) {
--  if (path == "") {
--    *out = root;
--    return true;
--  }
--
--  const base::DictionaryValue* dir = root;
--  for (size_t delimiter_position = path.find_first_of(kSeparators);
--       delimiter_position != std::string::npos;
--       delimiter_position = path.find_first_of(kSeparators)) {
--    const base::DictionaryValue* child = nullptr;
--    if (!GetChildNode(root, path.substr(0, delimiter_position), dir, &child))
--      return false;
--
--    dir = child;
--    path.erase(0, delimiter_position + 1);
--  }
--
--  return GetChildNode(root, path, dir, out);
--}
--
--bool FillFileInfoWithNode(Archive::FileInfo* info,
--                          uint32_t header_size,
--                          const base::DictionaryValue* node) {
--  int size;
--  if (!node->GetInteger("size", &size))
--    return false;
--  info->size = static_cast<uint32_t>(size);
--
--  if (node->GetBoolean("unpacked", &info->unpacked) && info->unpacked)
--    return true;
--
--  std::string offset;
--  if (!node->GetString("offset", &offset))
--    return false;
--  if (!base::StringToUint64(offset, &info->offset))
--    return false;
--  info->offset += header_size;
--
--  node->GetBoolean("executable", &info->executable);
--
--  return true;
--}
--
--}  // namespace
--
--Archive::Archive(const base::FilePath& path)
--    : path_(path), file_(base::File::FILE_OK) {
--  base::ThreadRestrictions::ScopedAllowIO allow_io;
--  file_.Initialize(path_, base::File::FLAG_OPEN | base::File::FLAG_READ);
--#if defined(OS_WIN)
--  fd_ = _open_osfhandle(reinterpret_cast<intptr_t>(file_.GetPlatformFile()), 0);
--#elif defined(OS_POSIX)
--  fd_ = file_.GetPlatformFile();
--#endif
--}
--
--Archive::~Archive() {
--#if defined(OS_WIN)
--  if (fd_ != -1) {
--    _close(fd_);
--    // Don't close the handle since we already closed the fd.
--    file_.TakePlatformFile();
--  }
--#endif
--  base::ThreadRestrictions::ScopedAllowIO allow_io;
--  file_.Close();
--}
--
--bool Archive::Init() {
--  if (!file_.IsValid()) {
--    if (file_.error_details() != base::File::FILE_ERROR_NOT_FOUND) {
--      LOG(WARNING) << "Opening " << path_.value() << ": "
--                   << base::File::ErrorToString(file_.error_details());
--    }
--    return false;
--  }
--
--  std::vector<char> buf;
--  int len;
--
--  buf.resize(8);
--  {
--    base::ThreadRestrictions::ScopedAllowIO allow_io;
--    len = file_.ReadAtCurrentPos(buf.data(), buf.size());
--  }
--  if (len != static_cast<int>(buf.size())) {
--    PLOG(ERROR) << "Failed to read header size from " << path_.value();
--    return false;
--  }
--
--  uint32_t size;
--  if (!base::PickleIterator(base::Pickle(buf.data(), buf.size()))
--           .ReadUInt32(&size)) {
--    LOG(ERROR) << "Failed to parse header size from " << path_.value();
--    return false;
--  }
--
--  buf.resize(size);
--  {
--    base::ThreadRestrictions::ScopedAllowIO allow_io;
--    len = file_.ReadAtCurrentPos(buf.data(), buf.size());
--  }
--  if (len != static_cast<int>(buf.size())) {
--    PLOG(ERROR) << "Failed to read header from " << path_.value();
--    return false;
--  }
--
--  std::string header;
--  if (!base::PickleIterator(base::Pickle(buf.data(), buf.size()))
--           .ReadString(&header)) {
--    LOG(ERROR) << "Failed to parse header from " << path_.value();
--    return false;
--  }
--
--  std::string error;
--  base::JSONReader reader;
--  std::unique_ptr<base::Value> value(reader.ReadToValue(header));
--  if (!value || !value->is_dict()) {
--    LOG(ERROR) << "Failed to parse header: " << error;
--    return false;
--  }
--
--  header_size_ = 8 + size;
--  header_.reset(static_cast<base::DictionaryValue*>(value.release()));
--  return true;
--}
--
--bool Archive::GetFileInfo(const base::FilePath& path, FileInfo* info) {
--  if (!header_)
--    return false;
--
--  const base::DictionaryValue* node;
--  if (!GetNodeFromPath(path.AsUTF8Unsafe(), header_.get(), &node))
--    return false;
--
--  std::string link;
--  if (node->GetString("link", &link))
--    return GetFileInfo(base::FilePath::FromUTF8Unsafe(link), info);
--
--  return FillFileInfoWithNode(info, header_size_, node);
--}
--
--bool Archive::Stat(const base::FilePath& path, Stats* stats) {
--  if (!header_)
--    return false;
--
--  const base::DictionaryValue* node;
--  if (!GetNodeFromPath(path.AsUTF8Unsafe(), header_.get(), &node))
--    return false;
--
--  if (node->FindKey("link")) {
--    stats->is_file = false;
--    stats->is_link = true;
--    return true;
--  }
--
--  if (node->FindKey("files")) {
--    stats->is_file = false;
--    stats->is_directory = true;
--    return true;
--  }
--
--  return FillFileInfoWithNode(stats, header_size_, node);
--}
--
--bool Archive::Readdir(const base::FilePath& path,
--                      std::vector<base::FilePath>* list) {
--  if (!header_)
--    return false;
--
--  const base::DictionaryValue* node;
--  if (!GetNodeFromPath(path.AsUTF8Unsafe(), header_.get(), &node))
--    return false;
--
--  const base::DictionaryValue* files;
--  if (!GetFilesNode(header_.get(), node, &files))
--    return false;
--
--  base::DictionaryValue::Iterator iter(*files);
--  while (!iter.IsAtEnd()) {
--    list->push_back(base::FilePath::FromUTF8Unsafe(iter.key()));
--    iter.Advance();
--  }
--  return true;
--}
--
--bool Archive::Realpath(const base::FilePath& path, base::FilePath* realpath) {
--  if (!header_)
--    return false;
--
--  const base::DictionaryValue* node;
--  if (!GetNodeFromPath(path.AsUTF8Unsafe(), header_.get(), &node))
--    return false;
--
--  std::string link;
--  if (node->GetString("link", &link)) {
--    *realpath = base::FilePath::FromUTF8Unsafe(link);
--    return true;
--  }
--
--  *realpath = path;
--  return true;
--}
--
--bool Archive::CopyFileOut(const base::FilePath& path, base::FilePath* out) {
--  auto it = external_files_.find(path.value());
--  if (it != external_files_.end()) {
--    *out = it->second->path();
--    return true;
--  }
--
--  FileInfo info;
--  if (!GetFileInfo(path, &info))
--    return false;
--
--  if (info.unpacked) {
--    *out = path_.AddExtension(FILE_PATH_LITERAL("unpacked")).Append(path);
--    return true;
--  }
--
--  auto temp_file = std::make_unique<ScopedTemporaryFile>();
--  base::FilePath::StringType ext = path.Extension();
--  if (!temp_file->InitFromFile(&file_, ext, info.offset, info.size))
--    return false;
--
--#if defined(OS_POSIX)
--  if (info.executable) {
--    // chmod a+x temp_file;
--    base::SetPosixFilePermissions(temp_file->path(), 0755);
--  }
--#endif
--
--  *out = temp_file->path();
--  external_files_[path.value()] = std::move(temp_file);
--  return true;
--}
--
--int Archive::GetFD() const {
--  return fd_;
--}
--
--}  // namespace asar
-removed in remote
-  base   100644 79b848623c99ec2260283ad3ca2d9ded729a397c atom/common/asar/archive.h
-  our    100644 5715578ca16aae2c948f914a1352efbdcae1de3e atom/common/asar/archive.h
-@@ -1,87 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_COMMON_ASAR_ARCHIVE_H_
--#define ATOM_COMMON_ASAR_ARCHIVE_H_
--
--#include <memory>
--#include <unordered_map>
--#include <vector>
--
--#include "base/files/file.h"
--#include "base/files/file_path.h"
--
--namespace base {
--class DictionaryValue;
--}
--
--namespace asar {
--
--class ScopedTemporaryFile;
--
--// This class represents an asar package, and provides methods to read
--// information from it.
--class Archive {
-- public:
--  struct FileInfo {
--    FileInfo() : unpacked(false), executable(false), size(0), offset(0) {}
--    bool unpacked;
--    bool executable;
--    uint32_t size;
--    uint64_t offset;
--  };
--
--  struct Stats : public FileInfo {
--    Stats() : is_file(true), is_directory(false), is_link(false) {}
--    bool is_file;
--    bool is_directory;
--    bool is_link;
--  };
--
--  explicit Archive(const base::FilePath& path);
--  virtual ~Archive();
--
--  // Read and parse the header.
--  bool Init();
--
--  // Get the info of a file.
--  bool GetFileInfo(const base::FilePath& path, FileInfo* info);
--
--  // Fs.stat(path).
--  bool Stat(const base::FilePath& path, Stats* stats);
--
--  // Fs.readdir(path).
--  bool Readdir(const base::FilePath& path, std::vector<base::FilePath>* files);
--
--  // Fs.realpath(path).
--  bool Realpath(const base::FilePath& path, base::FilePath* realpath);
--
--  // Copy the file into a temporary file, and return the new path.
--  // For unpacked file, this method will return its real path.
--  bool CopyFileOut(const base::FilePath& path, base::FilePath* out);
--
--  // Returns the file's fd.
--  int GetFD() const;
--
--  base::FilePath path() const { return path_; }
--  base::DictionaryValue* header() const { return header_.get(); }
--
-- private:
--  base::FilePath path_;
--  base::File file_;
--  int fd_ = -1;
--  uint32_t header_size_ = 0;
--  std::unique_ptr<base::DictionaryValue> header_;
--
--  // Cached external temporary files.
--  std::unordered_map<base::FilePath::StringType,
--                     std::unique_ptr<ScopedTemporaryFile>>
--      external_files_;
--
--  DISALLOW_COPY_AND_ASSIGN(Archive);
--};
--
--}  // namespace asar
--
--#endif  // ATOM_COMMON_ASAR_ARCHIVE_H_
-removed in remote
-  base   100644 1eee09949aff3b4079b2687ad1be2071e7021f01 atom/common/asar/asar_util.cc
-  our    100644 b564a75dc7223b118c03441d5cbfa63337a89efc atom/common/asar/asar_util.cc
-@@ -1,100 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/common/asar/asar_util.h"
--
--#include <map>
--#include <string>
--
--#include "atom/common/asar/archive.h"
--#include "base/files/file_path.h"
--#include "base/files/file_util.h"
--#include "base/lazy_instance.h"
--#include "base/stl_util.h"
--#include "base/threading/thread_local.h"
--
--namespace asar {
--
--namespace {
--
--// The global instance of ArchiveMap, will be destroyed on exit.
--typedef std::map<base::FilePath, std::shared_ptr<Archive>> ArchiveMap;
--base::LazyInstance<base::ThreadLocalPointer<ArchiveMap>>::Leaky
--    g_archive_map_tls = LAZY_INSTANCE_INITIALIZER;
--
--const base::FilePath::CharType kAsarExtension[] = FILE_PATH_LITERAL(".asar");
--
--}  // namespace
--
--std::shared_ptr<Archive> GetOrCreateAsarArchive(const base::FilePath& path) {
--  if (!g_archive_map_tls.Pointer()->Get())
--    g_archive_map_tls.Pointer()->Set(new ArchiveMap);
--  ArchiveMap& archive_map = *g_archive_map_tls.Pointer()->Get();
--  if (!ContainsKey(archive_map, path)) {
--    std::shared_ptr<Archive> archive(new Archive(path));
--    if (!archive->Init())
--      return nullptr;
--    archive_map[path] = archive;
--  }
--  return archive_map[path];
--}
--
--void ClearArchives() {
--  if (g_archive_map_tls.Pointer()->Get())
--    delete g_archive_map_tls.Pointer()->Get();
--}
--
--bool GetAsarArchivePath(const base::FilePath& full_path,
--                        base::FilePath* asar_path,
--                        base::FilePath* relative_path) {
--  base::FilePath iter = full_path;
--  while (true) {
--    base::FilePath dirname = iter.DirName();
--    if (iter.MatchesExtension(kAsarExtension))
--      break;
--    else if (iter == dirname)
--      return false;
--    iter = dirname;
--  }
--
--  base::FilePath tail;
--  if (!iter.AppendRelativePath(full_path, &tail))
--    return false;
--
--  *asar_path = iter;
--  *relative_path = tail;
--  return true;
--}
--
--bool ReadFileToString(const base::FilePath& path, std::string* contents) {
--  base::FilePath asar_path, relative_path;
--  if (!GetAsarArchivePath(path, &asar_path, &relative_path))
--    return base::ReadFileToString(path, contents);
--
--  std::shared_ptr<Archive> archive = GetOrCreateAsarArchive(asar_path);
--  if (!archive)
--    return false;
--
--  Archive::FileInfo info;
--  if (!archive->GetFileInfo(relative_path, &info))
--    return false;
--
--  if (info.unpacked) {
--    base::FilePath real_path;
--    // For unpacked file it will return the real path instead of doing the copy.
--    archive->CopyFileOut(relative_path, &real_path);
--    return base::ReadFileToString(real_path, contents);
--  }
--
--  base::File src(asar_path, base::File::FLAG_OPEN | base::File::FLAG_READ);
--  if (!src.IsValid())
--    return false;
--
--  contents->resize(info.size);
--  return static_cast<int>(info.size) ==
--         src.Read(info.offset, const_cast<char*>(contents->data()),
--                  contents->size());
--}
--
--}  // namespace asar
-removed in remote
-  base   100644 4cb5b88e04838199024c28ace4679fdcc424c674 atom/common/asar/asar_util.h
-  our    100644 90ffb9b46a3008cbcdd9e94ffe69594349dd4d25 atom/common/asar/asar_util.h
-@@ -1,35 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_COMMON_ASAR_ASAR_UTIL_H_
--#define ATOM_COMMON_ASAR_ASAR_UTIL_H_
--
--#include <memory>
--#include <string>
--
--namespace base {
--class FilePath;
--}
--
--namespace asar {
--
--class Archive;
--
--// Gets or creates a new Archive from the path.
--std::shared_ptr<Archive> GetOrCreateAsarArchive(const base::FilePath& path);
--
--// Destroy cached Archive objects.
--void ClearArchives();
--
--// Separates the path to Archive out.
--bool GetAsarArchivePath(const base::FilePath& full_path,
--                        base::FilePath* asar_path,
--                        base::FilePath* relative_path);
--
--// Same with base::ReadFileToString but supports asar Archive.
--bool ReadFileToString(const base::FilePath& path, std::string* contents);
--
--}  // namespace asar
--
--#endif  // ATOM_COMMON_ASAR_ASAR_UTIL_H_
-removed in remote
-  base   100644 8578d90d9074f2124cf746260c5bad394f7d5b31 atom/common/asar/scoped_temporary_file.cc
-  our    100644 f96eabc7a60dd73a556ef8e083fca51e72abdf7b atom/common/asar/scoped_temporary_file.cc
-@@ -1,74 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/common/asar/scoped_temporary_file.h"
--
--#include <vector>
--
--#include "base/files/file_util.h"
--#include "base/threading/thread_restrictions.h"
--
--namespace asar {
--
--ScopedTemporaryFile::ScopedTemporaryFile() {}
--
--ScopedTemporaryFile::~ScopedTemporaryFile() {
--  if (!path_.empty()) {
--    base::ThreadRestrictions::ScopedAllowIO allow_io;
--    // On Windows it is very likely the file is already in use (because it is
--    // mostly used for Node native modules), so deleting it now will halt the
--    // program.
--#if defined(OS_WIN)
--    base::DeleteFileAfterReboot(path_);
--#else
--    base::DeleteFile(path_, false);
--#endif
--  }
--}
--
--bool ScopedTemporaryFile::Init(const base::FilePath::StringType& ext) {
--  if (!path_.empty())
--    return true;
--
--  base::ThreadRestrictions::ScopedAllowIO allow_io;
--  if (!base::CreateTemporaryFile(&path_))
--    return false;
--
--#if defined(OS_WIN)
--  // Keep the original extension.
--  if (!ext.empty()) {
--    base::FilePath new_path = path_.AddExtension(ext);
--    if (!base::Move(path_, new_path))
--      return false;
--    path_ = new_path;
--  }
--#endif
--
--  return true;
--}
--
--bool ScopedTemporaryFile::InitFromFile(base::File* src,
--                                       const base::FilePath::StringType& ext,
--                                       uint64_t offset,
--                                       uint64_t size) {
--  if (!src->IsValid())
--    return false;
--
--  if (!Init(ext))
--    return false;
--
--  std::vector<char> buf(size);
--  int len = src->Read(offset, buf.data(), buf.size());
--  if (len != static_cast<int>(size))
--    return false;
--
--  base::File dest(path_, base::File::FLAG_OPEN | base::File::FLAG_WRITE);
--  if (!dest.IsValid())
--    return false;
--
--  return dest.WriteAtCurrentPos(buf.data(), buf.size()) ==
--         static_cast<int>(size);
--}
--
--}  // namespace asar
-removed in remote
-  base   100644 5931d9b87af7853cfbc18f6153ac17a5ff5a09a2 atom/common/asar/scoped_temporary_file.h
-  our    100644 4a55958b80842224916973e8df410784a8f5e1b6 atom/common/asar/scoped_temporary_file.h
-@@ -1,44 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_COMMON_ASAR_SCOPED_TEMPORARY_FILE_H_
--#define ATOM_COMMON_ASAR_SCOPED_TEMPORARY_FILE_H_
--
--#include "base/files/file_path.h"
--
--namespace base {
--class File;
--}
--
--namespace asar {
--
--// An object representing a temporary file that should be cleaned up when this
--// object goes out of scope.  Note that since deletion occurs during the
--// destructor, no further error handling is possible if the directory fails to
--// be deleted.  As a result, deletion is not guaranteed by this class.
--class ScopedTemporaryFile {
-- public:
--  ScopedTemporaryFile();
--  virtual ~ScopedTemporaryFile();
--
--  // Init an empty temporary file with a certain extension.
--  bool Init(const base::FilePath::StringType& ext);
--
--  // Init an temporary file and fill it with content of |path|.
--  bool InitFromFile(base::File* src,
--                    const base::FilePath::StringType& ext,
--                    uint64_t offset,
--                    uint64_t size);
--
--  base::FilePath path() const { return path_; }
--
-- private:
--  base::FilePath path_;
--
--  DISALLOW_COPY_AND_ASSIGN(ScopedTemporaryFile);
--};
--
--}  // namespace asar
--
--#endif  // ATOM_COMMON_ASAR_SCOPED_TEMPORARY_FILE_H_
-removed in remote
-  base   100644 2ac62385aeaccc7cd7cce840b098f55cd091b2c0 atom/common/atom_command_line.cc
-  our    100644 287e43f75fef778948ef9acdac8b9a7edfe07d0a atom/common/atom_command_line.cc
-@@ -1,36 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/common/atom_command_line.h"
--
--#include "base/command_line.h"
--#include "uv.h"  // NOLINT(build/include)
--
--namespace atom {
--
--// static
--base::CommandLine::StringVector AtomCommandLine::argv_;
--
--// static
--void AtomCommandLine::Init(int argc, base::CommandLine::CharType** argv) {
--  DCHECK(argv_.empty());
--
--  // NOTE: uv_setup_args does nothing on Windows, so we don't need to call it.
--  // Otherwise we'd have to convert the arguments from UTF16.
--#if !defined(OS_WIN)
--  // Hack around with the argv pointer. Used for process.title = "blah"
--  argv = uv_setup_args(argc, argv);
--#endif
--
--  argv_.assign(argv, argv + argc);
--}
--
--#if defined(OS_LINUX)
--// static
--void AtomCommandLine::InitializeFromCommandLine() {
--  argv_ = base::CommandLine::ForCurrentProcess()->argv();
--}
--#endif
--
--}  // namespace atom
-removed in remote
-  base   100644 b5915533a41bd12ef17a3a748e6a503f7c04ea26 atom/common/atom_command_line.h
-  our    100644 57dab57e78c4785bc847cb36dc11c893cc055b32 atom/common/atom_command_line.h
-@@ -1,38 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_COMMON_ATOM_COMMAND_LINE_H_
--#define ATOM_COMMON_ATOM_COMMAND_LINE_H_
--
--#include <string>
--#include <vector>
--
--#include "base/command_line.h"
--#include "base/macros.h"
--#include "build/build_config.h"
--
--namespace atom {
--
--// Singleton to remember the original "argc" and "argv".
--class AtomCommandLine {
-- public:
--  static const base::CommandLine::StringVector& argv() { return argv_; }
--
--  static void Init(int argc, base::CommandLine::CharType** argv);
--
--#if defined(OS_LINUX)
--  // On Linux the command line has to be read from base::CommandLine since
--  // it is using zygote.
--  static void InitializeFromCommandLine();
--#endif
--
-- private:
--  static base::CommandLine::StringVector argv_;
--
--  DISALLOW_IMPLICIT_CONSTRUCTORS(AtomCommandLine);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_COMMON_ATOM_COMMAND_LINE_H_
-removed in remote
-  base   100644 dacda3c816c80611ff88b50813e899173c025886 atom/common/atom_constants.cc
-  our    100644 f5188983cc04b6873f71a0d35211a73b9b583771 atom/common/atom_constants.cc
-@@ -1,36 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/common/atom_constants.h"
--
--namespace atom {
--
--const char kCORSHeader[] = "Access-Control-Allow-Origin: *";
--
--const char kSHA1Certificate[] = "SHA-1 Certificate";
--const char kSHA1MajorDescription[] =
--    "The certificate for this site expires in 2017 or later, "
--    "and the certificate chain contains a certificate signed using SHA-1.";
--const char kSHA1MinorDescription[] =
--    "The certificate for this site expires in 2016, "
--    "and the certificate chain contains a certificate signed using SHA-1.";
--const char kCertificateError[] = "Certificate Error";
--const char kValidCertificate[] = "Valid Certificate";
--const char kValidCertificateDescription[] =
--    "The connection to this site is using a valid, trusted server certificate.";
--const char kSecureProtocol[] = "Secure TLS connection";
--const char kSecureProtocolDescription[] =
--    "The connection to this site is using a strong protocol version "
--    "and cipher suite.";
--
--#if defined(ENABLE_PDF_VIEWER)
--const char kPdfPluginMimeType[] = "application/x-google-chrome-pdf";
--const char kPdfPluginPath[] = "chrome://pdf-viewer/";
--const char kPdfPluginSrc[] = "src";
--
--const char kPdfViewerUIOrigin[] = "chrome://pdf-viewer/";
--const char kPdfViewerUIHost[] = "pdf-viewer";
--#endif  // defined(ENABLE_PDF_VIEWER)
--
--}  // namespace atom
-removed in remote
-  base   100644 e0d42e83eef95790260f80ff026d3baaa74dd311 atom/common/atom_constants.h
-  our    100644 7ad948f43f96edf174d23e16525ecd6cdd86a48f atom/common/atom_constants.h
-@@ -1,36 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_COMMON_ATOM_CONSTANTS_H_
--#define ATOM_COMMON_ATOM_CONSTANTS_H_
--
--namespace atom {
--
--// Header to ignore CORS.
--extern const char kCORSHeader[];
--
--// Strings describing Chrome security policy for DevTools security panel.
--extern const char kSHA1Certificate[];
--extern const char kSHA1MajorDescription[];
--extern const char kSHA1MinorDescription[];
--extern const char kCertificateError[];
--extern const char kValidCertificate[];
--extern const char kValidCertificateDescription[];
--extern const char kSecureProtocol[];
--extern const char kSecureProtocolDescription[];
--
--#if defined(ENABLE_PDF_VIEWER)
--// The MIME type used for the PDF plugin.
--extern const char kPdfPluginMimeType[];
--extern const char kPdfPluginPath[];
--extern const char kPdfPluginSrc[];
--
--// Constants for PDF viewer webui.
--extern const char kPdfViewerUIOrigin[];
--extern const char kPdfViewerUIHost[];
--#endif  // defined(ENABLE_PDF_VIEWER)
--
--}  // namespace atom
--
--#endif  // ATOM_COMMON_ATOM_CONSTANTS_H_
-removed in remote
-  base   100644 cb470529340495fe91e08f0f9ab5f20ba250d0a2 atom/common/atom_version.h
-  our    100644 65e7d19911559a40b1b258319df5fe0fa180354f atom/common/atom_version.h
-@@ -1,31 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_COMMON_ATOM_VERSION_H_
--#define ATOM_COMMON_ATOM_VERSION_H_
--
--#define ATOM_MAJOR_VERSION 4
--#define ATOM_MINOR_VERSION 0
--#define ATOM_PATCH_VERSION 0
--#define ATOM_PRE_RELEASE_VERSION -nightly.20180821
--
--#ifndef ATOM_STRINGIFY
--#define ATOM_STRINGIFY(n) ATOM_STRINGIFY_HELPER(n)
--#define ATOM_STRINGIFY_HELPER(n) #n
--#endif
--
--#ifndef ATOM_PRE_RELEASE_VERSION
--#define ATOM_VERSION_STRING          \
--  ATOM_STRINGIFY(ATOM_MAJOR_VERSION) \
--  "." ATOM_STRINGIFY(ATOM_MINOR_VERSION) "." ATOM_STRINGIFY(ATOM_PATCH_VERSION)
--#else
--#define ATOM_VERSION_STRING                                  \
--  ATOM_STRINGIFY(ATOM_MAJOR_VERSION)                         \
--  "." ATOM_STRINGIFY(ATOM_MINOR_VERSION) "." ATOM_STRINGIFY( \
--      ATOM_PATCH_VERSION) ATOM_STRINGIFY(ATOM_PRE_RELEASE_VERSION)
--#endif
--
--#define ATOM_VERSION "v" ATOM_VERSION_STRING
--
--#endif  // ATOM_COMMON_ATOM_VERSION_H_
-removed in remote
-  base   100644 8b9b7ef0c826c84b9a2bbe31f6204c620d3e0c5d atom/common/chrome_version.h
-  our    100644 35666ab599410942900abd2a7d9ad4b3e5c138af atom/common/chrome_version.h
-@@ -1,14 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--// This file is generated by script/bootstrap.py, you should never modify it
--// by hand.
--
--#ifndef ATOM_COMMON_CHROME_VERSION_H_
--#define ATOM_COMMON_CHROME_VERSION_H_
--
--#define CHROME_VERSION_STRING "66.0.3359.181"
--#define CHROME_VERSION "v" CHROME_VERSION_STRING
--
--#endif  // ATOM_COMMON_CHROME_VERSION_H_
-removed in remote
-  base   100644 854fc8778e9c02875db341c8cb809232f53af602 atom/common/common_message_generator.cc
-  our    100644 09f5bdcfb02987607ad97fbecb3fbff0ca5404b1 atom/common/common_message_generator.cc
-@@ -1,37 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--// Get basic type definitions.
--#define IPC_MESSAGE_IMPL
--#include "atom/common/common_message_generator.h"
--
--// Generate constructors.
--#include "ipc/struct_constructor_macros.h"
--
--// must go after struct_contructor_macros
--#include "atom/common/common_message_generator.h"
--
--// Generate destructors.
--#include "ipc/struct_destructor_macros.h"
--
--// must go after struct_destructor_macros
--#include "atom/common/common_message_generator.h"
--
--// Generate param traits write methods.
--#include "ipc/param_traits_write_macros.h"
--namespace IPC {
--#include "atom/common/common_message_generator.h"
--}  // namespace IPC
--
--// Generate param traits read methods.
--#include "ipc/param_traits_read_macros.h"
--namespace IPC {
--#include "atom/common/common_message_generator.h"
--}  // namespace IPC
--
--// Generate param traits log methods.
--#include "ipc/param_traits_log_macros.h"
--namespace IPC {
--#include "atom/common/common_message_generator.h"
--}  // namespace IPC
-\ No newline at end of file
-removed in remote
-  base   100644 832de1abf739f9e70019d35e8dd44e2f54efdc37 atom/common/common_message_generator.h
-  our    100644 7e9cba51d9f7b1b915adc82df5fbadbf314261e8 atom/common/common_message_generator.h
-@@ -1,10 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--// Multiply-included file, no traditional include guard.
--
--#include "atom/common/api/api_messages.h"
--#include "chrome/common/chrome_utility_printing_messages.h"
--#include "chrome/common/print_messages.h"
--#include "chrome/common/tts_messages.h"
-removed in remote
-  base   100644 f4f0ff9b7b1631b940218944f47377369e1afb29 atom/common/crash_reporter/crash_reporter.cc
-  our    100644 f804f983e59aa49e32e94d901b585c68a4204c9d atom/common/crash_reporter/crash_reporter.cc
-@@ -1,127 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/common/crash_reporter/crash_reporter.h"
--
--#include "atom/browser/browser.h"
--#include "atom/common/atom_version.h"
--#include "atom/common/native_mate_converters/file_path_converter.h"
--#include "base/command_line.h"
--#include "base/files/file_util.h"
--#include "base/strings/string_number_conversions.h"
--#include "base/strings/string_split.h"
--#include "base/threading/thread_restrictions.h"
--#include "content/public/common/content_switches.h"
--
--namespace crash_reporter {
--
--CrashReporter::CrashReporter() {
--  auto* cmd = base::CommandLine::ForCurrentProcess();
--  is_browser_ = cmd->GetSwitchValueASCII(switches::kProcessType).empty();
--}
--
--CrashReporter::~CrashReporter() {}
--
--void CrashReporter::Start(const std::string& product_name,
--                          const std::string& company_name,
--                          const std::string& submit_url,
--                          const base::FilePath& crashes_dir,
--                          bool upload_to_server,
--                          bool skip_system_crash_handler,
--                          const StringMap& extra_parameters) {
--  SetUploadParameters(extra_parameters);
--
--  InitBreakpad(product_name, ATOM_VERSION_STRING, company_name, submit_url,
--               crashes_dir, upload_to_server, skip_system_crash_handler);
--}
--
--void CrashReporter::SetUploadParameters(const StringMap& parameters) {
--  upload_parameters_ = parameters;
--  upload_parameters_["process_type"] = is_browser_ ? "browser" : "renderer";
--
--  // Setting platform dependent parameters.
--  SetUploadParameters();
--}
--
--void CrashReporter::SetUploadToServer(const bool upload_to_server) {}
--
--bool CrashReporter::GetUploadToServer() {
--  return true;
--}
--
--std::vector<CrashReporter::UploadReportResult>
--CrashReporter::GetUploadedReports(const base::FilePath& crashes_dir) {
--  base::ThreadRestrictions::ScopedAllowIO allow_io;
--  std::string file_content;
--  std::vector<CrashReporter::UploadReportResult> result;
--  base::FilePath uploads_path =
--      crashes_dir.Append(FILE_PATH_LITERAL("uploads.log"));
--  if (base::ReadFileToString(uploads_path, &file_content)) {
--    std::vector<std::string> reports = base::SplitString(
--        file_content, "\n", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
--    for (const std::string& report : reports) {
--      std::vector<std::string> report_item = base::SplitString(
--          report, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
--      int report_time = 0;
--      if (report_item.size() >= 2 &&
--          base::StringToInt(report_item[0], &report_time)) {
--        result.push_back(
--            CrashReporter::UploadReportResult(report_time, report_item[1]));
--      }
--    }
--  }
--  return result;
--}
--
--void CrashReporter::InitBreakpad(const std::string& product_name,
--                                 const std::string& version,
--                                 const std::string& company_name,
--                                 const std::string& submit_url,
--                                 const base::FilePath& crashes_dir,
--                                 bool auto_submit,
--                                 bool skip_system_crash_handler) {}
--
--void CrashReporter::SetUploadParameters() {}
--
--void CrashReporter::AddExtraParameter(const std::string& key,
--                                      const std::string& value) {}
--
--void CrashReporter::RemoveExtraParameter(const std::string& key) {}
--
--std::map<std::string, std::string> CrashReporter::GetParameters() const {
--  return upload_parameters_;
--}
--
--#if defined(OS_MACOSX) && defined(MAS_BUILD)
--// static
--CrashReporter* CrashReporter::GetInstance() {
--  static CrashReporter crash_reporter;
--  return &crash_reporter;
--}
--#endif
--
--void CrashReporter::StartInstance(const mate::Dictionary& options) {
--  auto* reporter = GetInstance();
--  if (!reporter)
--    return;
--
--  std::string product_name;
--  options.Get("productName", &product_name);
--  std::string company_name;
--  options.Get("companyName", &company_name);
--  std::string submit_url;
--  options.Get("submitURL", &submit_url);
--  base::FilePath crashes_dir;
--  options.Get("crashesDirectory", &crashes_dir);
--  StringMap extra_parameters;
--  options.Get("extra", &extra_parameters);
--
--  extra_parameters["_productName"] = product_name;
--  extra_parameters["_companyName"] = company_name;
--
--  reporter->Start(product_name, company_name, submit_url, crashes_dir, true,
--                  false, extra_parameters);
--}
--
--}  // namespace crash_reporter
-removed in remote
-  base   100644 eebbe16dca82210c861c5472802f4c56632d1773 atom/common/crash_reporter/crash_reporter.h
-  our    100644 99c4c9818d8c41a9e15690bd17379b864953a723 atom/common/crash_reporter/crash_reporter.h
-@@ -1,69 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_COMMON_CRASH_REPORTER_CRASH_REPORTER_H_
--#define ATOM_COMMON_CRASH_REPORTER_CRASH_REPORTER_H_
--
--#include <map>
--#include <string>
--#include <utility>
--#include <vector>
--
--#include "base/files/file_path.h"
--#include "base/macros.h"
--#include "native_mate/dictionary.h"
--
--namespace crash_reporter {
--
--class CrashReporter {
-- public:
--  typedef std::map<std::string, std::string> StringMap;
--  typedef std::pair<int, std::string> UploadReportResult;  // upload-date, id
--
--  static CrashReporter* GetInstance();
--  static void StartInstance(const mate::Dictionary& options);
--
--  void Start(const std::string& product_name,
--             const std::string& company_name,
--             const std::string& submit_url,
--             const base::FilePath& crashes_dir,
--             bool upload_to_server,
--             bool skip_system_crash_handler,
--             const StringMap& extra_parameters);
--
--  virtual std::vector<CrashReporter::UploadReportResult> GetUploadedReports(
--      const base::FilePath& crashes_dir);
--
--  virtual void SetUploadToServer(bool upload_to_server);
--  virtual bool GetUploadToServer();
--  virtual void AddExtraParameter(const std::string& key,
--                                 const std::string& value);
--  virtual void RemoveExtraParameter(const std::string& key);
--  virtual std::map<std::string, std::string> GetParameters() const;
--
-- protected:
--  CrashReporter();
--  virtual ~CrashReporter();
--
--  virtual void InitBreakpad(const std::string& product_name,
--                            const std::string& version,
--                            const std::string& company_name,
--                            const std::string& submit_url,
--                            const base::FilePath& crashes_dir,
--                            bool upload_to_server,
--                            bool skip_system_crash_handler);
--  virtual void SetUploadParameters();
--
--  StringMap upload_parameters_;
--  bool is_browser_;
--
-- private:
--  void SetUploadParameters(const StringMap& parameters);
--
--  DISALLOW_COPY_AND_ASSIGN(CrashReporter);
--};
--
--}  // namespace crash_reporter
--
--#endif  // ATOM_COMMON_CRASH_REPORTER_CRASH_REPORTER_H_
-removed in remote
-  base   100644 6fe69f486956c129b3c598d9fde96393498f193d atom/common/crash_reporter/crash_reporter_linux.cc
-  our    100644 7928c64fb8daccc781ae70ab1acb54f68752a0fe atom/common/crash_reporter/crash_reporter_linux.cc
-@@ -1,144 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Copyright (c) 2013 The Chromium Authors. All rights reserved.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/common/crash_reporter/crash_reporter_linux.h"
--
--#include <sys/time.h>
--#include <unistd.h>
--
--#include <string>
--
--#include "base/debug/crash_logging.h"
--#include "base/files/file_path.h"
--#include "base/files/file_util.h"
--#include "base/linux_util.h"
--#include "base/logging.h"
--#include "base/memory/singleton.h"
--#include "base/process/memory.h"
--#include "base/threading/thread_restrictions.h"
--#include "breakpad/src/client/linux/handler/exception_handler.h"
--#include "breakpad/src/common/linux/linux_libc_support.h"
--
--using google_breakpad::ExceptionHandler;
--using google_breakpad::MinidumpDescriptor;
--
--namespace crash_reporter {
--
--namespace {
--
--// Define a preferred limit on minidump sizes, because Crash Server currently
--// throws away any larger than 1.2MB (1.2 * 1024 * 1024).  A value of -1 means
--// no limit.
--static const off_t kMaxMinidumpFileSize = 1258291;
--
--}  // namespace
--
--CrashReporterLinux::CrashReporterLinux() : pid_(getpid()) {
--  // Set the base process start time value.
--  struct timeval tv;
--  if (!gettimeofday(&tv, NULL)) {
--    uint64_t ret = tv.tv_sec;
--    ret *= 1000;
--    ret += tv.tv_usec / 1000;
--    process_start_time_ = ret;
--  }
--
--  // Make base::g_linux_distro work.
--  base::SetLinuxDistro(base::GetLinuxDistro());
--}
--
--CrashReporterLinux::~CrashReporterLinux() {}
--
--void CrashReporterLinux::InitBreakpad(const std::string& product_name,
--                                      const std::string& version,
--                                      const std::string& company_name,
--                                      const std::string& submit_url,
--                                      const base::FilePath& crashes_dir,
--                                      bool upload_to_server,
--                                      bool skip_system_crash_handler) {
--  EnableCrashDumping(crashes_dir);
--
--  crash_keys_.reset(new CrashKeyStorage());
--
--  crash_keys_->SetKeyValue("prod", ATOM_PRODUCT_NAME);
--  crash_keys_->SetKeyValue("ver", version.c_str());
--  upload_url_ = submit_url;
--  upload_to_server_ = upload_to_server;
--
--  for (StringMap::const_iterator iter = upload_parameters_.begin();
--       iter != upload_parameters_.end(); ++iter)
--    crash_keys_->SetKeyValue(iter->first.c_str(), iter->second.c_str());
--}
--
--void CrashReporterLinux::SetUploadParameters() {
--  upload_parameters_["platform"] = "linux";
--}
--
--void CrashReporterLinux::SetUploadToServer(const bool upload_to_server) {
--  upload_to_server_ = upload_to_server;
--}
--
--bool CrashReporterLinux::GetUploadToServer() {
--  return upload_to_server_;
--}
--
--void CrashReporterLinux::EnableCrashDumping(const base::FilePath& crashes_dir) {
--  {
--    base::ThreadRestrictions::ScopedAllowIO allow_io;
--    base::CreateDirectory(crashes_dir);
--  }
--  std::string log_file = crashes_dir.Append("uploads.log").value();
--  strncpy(g_crash_log_path, log_file.c_str(), sizeof(g_crash_log_path));
--
--  MinidumpDescriptor minidump_descriptor(crashes_dir.value());
--  minidump_descriptor.set_size_limit(kMaxMinidumpFileSize);
--
--  breakpad_.reset(new ExceptionHandler(minidump_descriptor, NULL, CrashDone,
--                                       this,
--                                       true,  // Install handlers.
--                                       -1));
--}
--
--bool CrashReporterLinux::CrashDone(const MinidumpDescriptor& minidump,
--                                   void* context,
--                                   const bool succeeded) {
--  CrashReporterLinux* self = static_cast<CrashReporterLinux*>(context);
--
--  // WARNING: this code runs in a compromised context. It may not call into
--  // libc nor allocate memory normally.
--  if (!succeeded) {
--    const char msg[] = "Failed to generate minidump.";
--    WriteLog(msg, sizeof(msg) - 1);
--    return false;
--  }
--
--  DCHECK(!minidump.IsFD());
--
--  BreakpadInfo info = {0};
--  info.filename = minidump.path();
--  info.fd = minidump.fd();
--  info.distro = base::g_linux_distro;
--  info.distro_length = my_strlen(base::g_linux_distro);
--  info.upload = self->upload_to_server_;
--  info.process_start_time = self->process_start_time_;
--  info.oom_size = base::g_oom_size;
--  info.pid = self->pid_;
--  info.upload_url = self->upload_url_.c_str();
--  info.crash_keys = self->crash_keys_.get();
--  HandleCrashDump(info);
--  return true;
--}
--
--// static
--CrashReporterLinux* CrashReporterLinux::GetInstance() {
--  return base::Singleton<CrashReporterLinux>::get();
--}
--
--// static
--CrashReporter* CrashReporter::GetInstance() {
--  return CrashReporterLinux::GetInstance();
--}
--
--}  // namespace crash_reporter
-removed in remote
-  base   100644 165c288ab2b1caeb065e59a6164b50ba701a1d5c atom/common/crash_reporter/crash_reporter_linux.h
-  our    100644 ce9d85fa4b8c744ac4be5b14ea89272b1c5ca6c8 atom/common/crash_reporter/crash_reporter_linux.h
-@@ -1,66 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_COMMON_CRASH_REPORTER_CRASH_REPORTER_LINUX_H_
--#define ATOM_COMMON_CRASH_REPORTER_CRASH_REPORTER_LINUX_H_
--
--#include <memory>
--#include <string>
--
--#include "atom/common/crash_reporter/crash_reporter.h"
--#include "atom/common/crash_reporter/linux/crash_dump_handler.h"
--#include "base/compiler_specific.h"
--
--namespace base {
--template <typename T>
--struct DefaultSingletonTraits;
--}
--
--namespace google_breakpad {
--class ExceptionHandler;
--class MinidumpDescriptor;
--}  // namespace google_breakpad
--
--namespace crash_reporter {
--
--class CrashReporterLinux : public CrashReporter {
-- public:
--  static CrashReporterLinux* GetInstance();
--
--  void InitBreakpad(const std::string& product_name,
--                    const std::string& version,
--                    const std::string& company_name,
--                    const std::string& submit_url,
--                    const base::FilePath& crashes_dir,
--                    bool upload_to_server,
--                    bool skip_system_crash_handler) override;
--  void SetUploadToServer(bool upload_to_server) override;
--  void SetUploadParameters() override;
--  bool GetUploadToServer() override;
--
-- private:
--  friend struct base::DefaultSingletonTraits<CrashReporterLinux>;
--
--  CrashReporterLinux();
--  ~CrashReporterLinux() override;
--
--  void EnableCrashDumping(const base::FilePath& crashes_dir);
--
--  static bool CrashDone(const google_breakpad::MinidumpDescriptor& minidump,
--                        void* context,
--                        const bool succeeded);
--
--  std::unique_ptr<google_breakpad::ExceptionHandler> breakpad_;
--  std::unique_ptr<CrashKeyStorage> crash_keys_;
--
--  uint64_t process_start_time_ = 0;
--  pid_t pid_ = 0;
--  std::string upload_url_;
--  bool upload_to_server_ = true;
--
--  DISALLOW_COPY_AND_ASSIGN(CrashReporterLinux);
--};
--}  // namespace crash_reporter
--
--#endif  // ATOM_COMMON_CRASH_REPORTER_CRASH_REPORTER_LINUX_H_
-removed in remote
-  base   100644 f031543591559307420aa08001c5bbf73f53b2cb atom/common/crash_reporter/crash_reporter_mac.h
-  our    100644 359875319d6eea5436c805d300eeb4f2dc7533f4 atom/common/crash_reporter/crash_reporter_mac.h
-@@ -1,65 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_COMMON_CRASH_REPORTER_CRASH_REPORTER_MAC_H_
--#define ATOM_COMMON_CRASH_REPORTER_CRASH_REPORTER_MAC_H_
--
--#include <map>
--#include <string>
--#include <vector>
--
--#include "atom/common/crash_reporter/crash_reporter.h"
--#include "base/compiler_specific.h"
--#include "base/strings/string_piece.h"
--#include "crashpad/client/crash_report_database.h"
--#include "crashpad/client/simple_string_dictionary.h"
--
--namespace base {
--template <typename T>
--struct DefaultSingletonTraits;
--}
--
--namespace crash_reporter {
--
--class CrashReporterMac : public CrashReporter {
-- public:
--  static CrashReporterMac* GetInstance();
--
--  void InitBreakpad(const std::string& product_name,
--                    const std::string& version,
--                    const std::string& company_name,
--                    const std::string& submit_url,
--                    const base::FilePath& crashes_dir,
--                    bool upload_to_server,
--                    bool skip_system_crash_handler) override;
--  void SetUploadParameters() override;
--  void SetUploadToServer(bool upload_to_server) override;
--  bool GetUploadToServer() override;
--  void AddExtraParameter(const std::string& key,
--                         const std::string& value) override;
--  void RemoveExtraParameter(const std::string& key) override;
--  std::map<std::string, std::string> GetParameters() const override;
--
-- private:
--  friend struct base::DefaultSingletonTraits<CrashReporterMac>;
--
--  CrashReporterMac();
--  ~CrashReporterMac() override;
--
--  void SetUploadsEnabled(bool enable_uploads);
--  void SetCrashKeyValue(const base::StringPiece& key,
--                        const base::StringPiece& value);
--
--  std::vector<UploadReportResult> GetUploadedReports(
--      const base::FilePath& crashes_dir) override;
--
--  std::unique_ptr<crashpad::SimpleStringDictionary> simple_string_dictionary_;
--  std::unique_ptr<crashpad::CrashReportDatabase> database_;
--
--  DISALLOW_COPY_AND_ASSIGN(CrashReporterMac);
--};
--
--}  // namespace crash_reporter
--
--#endif  // ATOM_COMMON_CRASH_REPORTER_CRASH_REPORTER_MAC_H_
-removed in remote
-  base   100644 130a421665f76b625e71b30374e30ff2d62a3235 atom/common/crash_reporter/crash_reporter_mac.mm
-  our    100644 636ce4b065fdbccd50470193e627c8f0ea1e2364 atom/common/crash_reporter/crash_reporter_mac.mm
-@@ -1,182 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/common/crash_reporter/crash_reporter_mac.h"
--
--#include <memory>
--
--#include "base/files/file_util.h"
--#include "base/mac/bundle_locations.h"
--#include "base/mac/mac_util.h"
--#include "base/memory/singleton.h"
--#include "base/strings/string_piece.h"
--#include "base/strings/stringprintf.h"
--#include "base/strings/sys_string_conversions.h"
--#include "base/threading/thread_restrictions.h"
--#include "crashpad/client/crashpad_client.h"
--#include "crashpad/client/crashpad_info.h"
--#include "crashpad/client/settings.h"
--
--namespace crash_reporter {
--
--CrashReporterMac::CrashReporterMac() {}
--
--CrashReporterMac::~CrashReporterMac() {}
--
--void CrashReporterMac::InitBreakpad(const std::string& product_name,
--                                    const std::string& version,
--                                    const std::string& company_name,
--                                    const std::string& submit_url,
--                                    const base::FilePath& crashes_dir,
--                                    bool upload_to_server,
--                                    bool skip_system_crash_handler) {
--  // check whether crashpad has been initialized.
--  // Only need to initialize once.
--  if (simple_string_dictionary_)
--    return;
--
--  if (is_browser_) {
--    @autoreleasepool {
--      base::FilePath framework_bundle_path = base::mac::FrameworkBundlePath();
--      base::FilePath handler_path =
--          framework_bundle_path.Append("Resources").Append("crashpad_handler");
--
--      std::vector<std::string> args = {
--          "--no-rate-limit",
--          "--no-upload-gzip",  // not all servers accept gzip
--      };
--
--      crashpad::CrashpadClient crashpad_client;
--      crashpad_client.StartHandler(handler_path, crashes_dir, crashes_dir,
--                                   submit_url, StringMap(), args, true, false);
--    }  // @autoreleasepool
--  }
--
--  crashpad::CrashpadInfo* crashpad_info =
--      crashpad::CrashpadInfo::GetCrashpadInfo();
--  if (skip_system_crash_handler) {
--    crashpad_info->set_system_crash_reporter_forwarding(
--        crashpad::TriState::kDisabled);
--  }
--
--  simple_string_dictionary_.reset(new crashpad::SimpleStringDictionary());
--  crashpad_info->set_simple_annotations(simple_string_dictionary_.get());
--
--  SetCrashKeyValue("prod", ATOM_PRODUCT_NAME);
--  SetCrashKeyValue("process_type", is_browser_ ? "browser" : "renderer");
--  SetCrashKeyValue("ver", version);
--
--  for (const auto& upload_parameter : upload_parameters_) {
--    SetCrashKeyValue(upload_parameter.first, upload_parameter.second);
--  }
--  if (is_browser_) {
--    database_ = crashpad::CrashReportDatabase::Initialize(crashes_dir);
--    SetUploadToServer(upload_to_server);
--  }
--}
--
--bool CrashReporterMac::GetUploadToServer() {
--  bool enabled = true;
--  if (database_) {
--    database_->GetSettings()->GetUploadsEnabled(&enabled);
--  }
--  return enabled;
--}
--
--void CrashReporterMac::SetUploadToServer(const bool upload_to_server) {
--  if (database_) {
--    database_->GetSettings()->SetUploadsEnabled(upload_to_server);
--  }
--}
--
--void CrashReporterMac::SetUploadParameters() {
--  upload_parameters_["platform"] = "darwin";
--}
--
--void CrashReporterMac::SetCrashKeyValue(const base::StringPiece& key,
--                                        const base::StringPiece& value) {
--  simple_string_dictionary_->SetKeyValue(key.data(), value.data());
--}
--
--void CrashReporterMac::AddExtraParameter(const std::string& key,
--                                         const std::string& value) {
--  if (simple_string_dictionary_) {
--    SetCrashKeyValue(key, value);
--  } else {
--    upload_parameters_[key] = value;
--  }
--}
--
--void CrashReporterMac::RemoveExtraParameter(const std::string& key) {
--  if (simple_string_dictionary_)
--    simple_string_dictionary_->RemoveKey(key.data());
--  else
--    upload_parameters_.erase(key);
--}
--
--std::map<std::string, std::string> CrashReporterMac::GetParameters() const {
--  if (simple_string_dictionary_) {
--    std::map<std::string, std::string> ret;
--    crashpad::SimpleStringDictionary::Iterator iter(*simple_string_dictionary_);
--    for (;;) {
--      auto* const entry = iter.Next();
--      if (!entry)
--        break;
--      ret[entry->key] = entry->value;
--    }
--    return ret;
--  }
--  return upload_parameters_;
--}
--
--std::vector<CrashReporter::UploadReportResult>
--CrashReporterMac::GetUploadedReports(const base::FilePath& crashes_dir) {
--  std::vector<CrashReporter::UploadReportResult> uploaded_reports;
--
--  {
--    base::ThreadRestrictions::ScopedAllowIO allow_io;
--    if (!base::PathExists(crashes_dir)) {
--      return uploaded_reports;
--    }
--  }
--  // Load crashpad database.
--  std::unique_ptr<crashpad::CrashReportDatabase> database =
--      crashpad::CrashReportDatabase::Initialize(crashes_dir);
--  DCHECK(database);
--
--  std::vector<crashpad::CrashReportDatabase::Report> completed_reports;
--  crashpad::CrashReportDatabase::OperationStatus status =
--      database->GetCompletedReports(&completed_reports);
--  if (status != crashpad::CrashReportDatabase::kNoError) {
--    return uploaded_reports;
--  }
--
--  for (const crashpad::CrashReportDatabase::Report& completed_report :
--       completed_reports) {
--    if (completed_report.uploaded) {
--      uploaded_reports.push_back(
--          UploadReportResult(static_cast<int>(completed_report.creation_time),
--                             completed_report.id));
--    }
--  }
--
--  auto sort_by_time = [](const UploadReportResult& a,
--                         const UploadReportResult& b) {
--    return a.first >= b.first;
--  };
--  std::sort(uploaded_reports.begin(), uploaded_reports.end(), sort_by_time);
--  return uploaded_reports;
--}
--
--// static
--CrashReporterMac* CrashReporterMac::GetInstance() {
--  return base::Singleton<CrashReporterMac>::get();
--}
--
--// static
--CrashReporter* CrashReporter::GetInstance() {
--  return CrashReporterMac::GetInstance();
--}
--
--}  // namespace crash_reporter
-removed in remote
-  base   100644 939a02f090c55aed3eb3db1d54e9b16d2ced2814 atom/common/crash_reporter/crash_reporter_win.cc
-  our    100644 c574da71c9de9bd8c7b7cad57d3a0f84708fb97c atom/common/crash_reporter/crash_reporter_win.cc
-@@ -1,281 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/common/crash_reporter/crash_reporter_win.h"
--
--#include <string>
--
--#include "base/files/file_util.h"
--#include "base/logging.h"
--#include "base/memory/singleton.h"
--#include "base/strings/string_util.h"
--#include "base/strings/utf_string_conversions.h"
--#include "content/public/common/result_codes.h"
--#include "gin/public/debug.h"
--#include "sandbox/win/src/nt_internals.h"
--
--#pragma intrinsic(_AddressOfReturnAddress)
--#pragma intrinsic(_ReturnAddress)
--
--#ifdef _WIN64
--// See http://msdn.microsoft.com/en-us/library/ddssxxy8.aspx
--typedef struct _UNWIND_INFO {
--  unsigned char Version : 3;
--  unsigned char Flags : 5;
--  unsigned char SizeOfProlog;
--  unsigned char CountOfCodes;
--  unsigned char FrameRegister : 4;
--  unsigned char FrameOffset : 4;
--  ULONG ExceptionHandler;
--} UNWIND_INFO, *PUNWIND_INFO;
--#endif
--
--namespace crash_reporter {
--
--namespace {
--
--// Minidump with stacks, PEB, TEB, and unloaded module list.
--const MINIDUMP_TYPE kSmallDumpType = static_cast<MINIDUMP_TYPE>(
--    MiniDumpWithProcessThreadData |  // Get PEB and TEB.
--    MiniDumpWithUnloadedModules);    // Get unloaded modules when available.
--
--const wchar_t kWaitEventFormat[] = L"$1CrashServiceWaitEvent";
--const wchar_t kPipeNameFormat[] = L"\\\\.\\pipe\\$1 Crash Service";
--
--// Matches breakpad/src/client/windows/common/ipc_protocol.h.
--const int kNameMaxLength = 64;
--const int kValueMaxLength = 64;
--
--typedef NTSTATUS(WINAPI* NtTerminateProcessPtr)(HANDLE ProcessHandle,
--                                                NTSTATUS ExitStatus);
--char* g_real_terminate_process_stub = NULL;
--
--void TerminateProcessWithoutDump() {
--  // Patched stub exists based on conditions (See InitCrashReporter).
--  // As a side note this function also gets called from
--  // WindowProcExceptionFilter.
--  if (g_real_terminate_process_stub == NULL) {
--    ::TerminateProcess(::GetCurrentProcess(), content::RESULT_CODE_KILLED);
--  } else {
--    NtTerminateProcessPtr real_terminate_proc =
--        reinterpret_cast<NtTerminateProcessPtr>(
--            static_cast<char*>(g_real_terminate_process_stub));
--    real_terminate_proc(::GetCurrentProcess(), content::RESULT_CODE_KILLED);
--  }
--}
--
--#ifdef _WIN64
--int CrashForExceptionInNonABICompliantCodeRange(
--    PEXCEPTION_RECORD ExceptionRecord,
--    ULONG64 EstablisherFrame,
--    PCONTEXT ContextRecord,
--    PDISPATCHER_CONTEXT DispatcherContext) {
--  EXCEPTION_POINTERS info = {ExceptionRecord, ContextRecord};
--  if (!CrashReporter::GetInstance())
--    return EXCEPTION_CONTINUE_SEARCH;
--  return static_cast<CrashReporterWin*>(CrashReporter::GetInstance())
--      ->CrashForException(&info);
--}
--
--struct ExceptionHandlerRecord {
--  RUNTIME_FUNCTION runtime_function;
--  UNWIND_INFO unwind_info;
--  unsigned char thunk[12];
--};
--
--bool RegisterNonABICompliantCodeRange(void* start, size_t size_in_bytes) {
--  ExceptionHandlerRecord* record =
--      reinterpret_cast<ExceptionHandlerRecord*>(start);
--
--  // We assume that the first page of the code range is executable and
--  // committed and reserved for breakpad. What could possibly go wrong?
--
--  // All addresses are 32bit relative offsets to start.
--  record->runtime_function.BeginAddress = 0;
--  record->runtime_function.EndAddress =
--      base::checked_cast<DWORD>(size_in_bytes);
--  record->runtime_function.UnwindData =
--      offsetof(ExceptionHandlerRecord, unwind_info);
--
--  // Create unwind info that only specifies an exception handler.
--  record->unwind_info.Version = 1;
--  record->unwind_info.Flags = UNW_FLAG_EHANDLER;
--  record->unwind_info.SizeOfProlog = 0;
--  record->unwind_info.CountOfCodes = 0;
--  record->unwind_info.FrameRegister = 0;
--  record->unwind_info.FrameOffset = 0;
--  record->unwind_info.ExceptionHandler =
--      offsetof(ExceptionHandlerRecord, thunk);
--
--  // Hardcoded thunk.
--  // mov imm64, rax
--  record->thunk[0] = 0x48;
--  record->thunk[1] = 0xb8;
--  void* handler = &CrashForExceptionInNonABICompliantCodeRange;
--  memcpy(&record->thunk[2], &handler, 8);
--
--  // jmp rax
--  record->thunk[10] = 0xff;
--  record->thunk[11] = 0xe0;
--
--  // Protect reserved page against modifications.
--  DWORD old_protect;
--  return VirtualProtect(start, sizeof(ExceptionHandlerRecord),
--                        PAGE_EXECUTE_READ, &old_protect) &&
--         RtlAddFunctionTable(&record->runtime_function, 1,
--                             reinterpret_cast<DWORD64>(start));
--}
--
--void UnregisterNonABICompliantCodeRange(void* start) {
--  ExceptionHandlerRecord* record =
--      reinterpret_cast<ExceptionHandlerRecord*>(start);
--
--  RtlDeleteFunctionTable(&record->runtime_function);
--}
--#endif  // _WIN64
--
--}  // namespace
--
--CrashReporterWin::CrashReporterWin() {}
--
--CrashReporterWin::~CrashReporterWin() {}
--
--void CrashReporterWin::InitBreakpad(const std::string& product_name,
--                                    const std::string& version,
--                                    const std::string& company_name,
--                                    const std::string& submit_url,
--                                    const base::FilePath& crashes_dir,
--                                    bool upload_to_server,
--                                    bool skip_system_crash_handler) {
--  skip_system_crash_handler_ = skip_system_crash_handler;
--
--  base::string16 pipe_name = base::ReplaceStringPlaceholders(
--      kPipeNameFormat, base::UTF8ToUTF16(product_name), NULL);
--  base::string16 wait_name = base::ReplaceStringPlaceholders(
--      kWaitEventFormat, base::UTF8ToUTF16(product_name), NULL);
--
--  // Wait until the crash service is started.
--  HANDLE wait_event = ::CreateEventW(NULL, TRUE, FALSE, wait_name.c_str());
--  if (wait_event != NULL) {
--    WaitForSingleObject(wait_event, 1000);
--    CloseHandle(wait_event);
--  }
--
--  // ExceptionHandler() attaches our handler and ~ExceptionHandler() detaches
--  // it, so we must explicitly reset *before* we instantiate our new handler
--  // to allow any previous handler to detach in the correct order.
--  breakpad_.reset();
--
--  breakpad_.reset(new google_breakpad::ExceptionHandler(
--      crashes_dir.DirName().value(), FilterCallback, MinidumpCallback, this,
--      google_breakpad::ExceptionHandler::HANDLER_ALL, kSmallDumpType,
--      pipe_name.c_str(),
--      GetCustomInfo(product_name, version, company_name, upload_to_server)));
--
--  if (!breakpad_->IsOutOfProcess())
--    LOG(ERROR) << "Cannot initialize out-of-process crash handler";
--
--#ifdef _WIN64
--  // Hook up V8 to breakpad.
--  if (!code_range_registered_) {
--    code_range_registered_ = true;
--    // gin::Debug::SetCodeRangeCreatedCallback only runs the callback when
--    // Isolate is just created, so we have to manually run following code here.
--    void* code_range = nullptr;
--    size_t size = 0;
--    v8::Isolate::GetCurrent()->GetCodeRange(&code_range, &size);
--    if (code_range && size &&
--        RegisterNonABICompliantCodeRange(code_range, size)) {
--      gin::Debug::SetCodeRangeDeletedCallback(
--          UnregisterNonABICompliantCodeRange);
--    }
--  }
--#endif
--}
--
--void CrashReporterWin::SetUploadParameters() {
--  upload_parameters_["platform"] = "win32";
--}
--
--int CrashReporterWin::CrashForException(EXCEPTION_POINTERS* info) {
--  if (breakpad_) {
--    breakpad_->WriteMinidumpForException(info);
--    if (skip_system_crash_handler_)
--      TerminateProcessWithoutDump();
--    else
--      RaiseFailFastException(info->ExceptionRecord, info->ContextRecord, 0);
--  }
--  return EXCEPTION_CONTINUE_SEARCH;
--}
--
--// static
--bool CrashReporterWin::FilterCallback(void* context,
--                                      EXCEPTION_POINTERS* exinfo,
--                                      MDRawAssertionInfo* assertion) {
--  return true;
--}
--
--// static
--bool CrashReporterWin::MinidumpCallback(const wchar_t* dump_path,
--                                        const wchar_t* minidump_id,
--                                        void* context,
--                                        EXCEPTION_POINTERS* exinfo,
--                                        MDRawAssertionInfo* assertion,
--                                        bool succeeded) {
--  CrashReporterWin* self = static_cast<CrashReporterWin*>(context);
--  if (succeeded && self->skip_system_crash_handler_)
--    return true;
--  else
--    return false;
--}
--
--google_breakpad::CustomClientInfo* CrashReporterWin::GetCustomInfo(
--    const std::string& product_name,
--    const std::string& version,
--    const std::string& company_name,
--    bool upload_to_server) {
--  custom_info_entries_.clear();
--  custom_info_entries_.reserve(3 + upload_parameters_.size());
--
--  custom_info_entries_.push_back(
--      google_breakpad::CustomInfoEntry(L"prod", L"Electron"));
--  custom_info_entries_.push_back(google_breakpad::CustomInfoEntry(
--      L"ver", base::UTF8ToWide(version).c_str()));
--  if (!upload_to_server) {
--    custom_info_entries_.push_back(
--        google_breakpad::CustomInfoEntry(L"skip_upload", L"1"));
--  }
--
--  for (StringMap::const_iterator iter = upload_parameters_.begin();
--       iter != upload_parameters_.end(); ++iter) {
--    // breakpad has hardcoded the length of name/value, and doesn't truncate
--    // the values itself, so we have to truncate them here otherwise weird
--    // things may happen.
--    std::wstring name = base::UTF8ToWide(iter->first);
--    std::wstring value = base::UTF8ToWide(iter->second);
--    if (name.length() > kNameMaxLength - 1)
--      name.resize(kNameMaxLength - 1);
--    if (value.length() > kValueMaxLength - 1)
--      value.resize(kValueMaxLength - 1);
--
--    custom_info_entries_.push_back(
--        google_breakpad::CustomInfoEntry(name.c_str(), value.c_str()));
--  }
--
--  custom_info_.entries = &custom_info_entries_.front();
--  custom_info_.count = custom_info_entries_.size();
--  return &custom_info_;
--}
--
--// static
--CrashReporterWin* CrashReporterWin::GetInstance() {
--  return base::Singleton<CrashReporterWin>::get();
--}
--
--// static
--CrashReporter* CrashReporter::GetInstance() {
--  return CrashReporterWin::GetInstance();
--}
--
--}  // namespace crash_reporter
-removed in remote
-  base   100644 181c9eabd23cf61719beb20484977f9ac5daaa21 atom/common/crash_reporter/crash_reporter_win.h
-  our    100644 89a2a5966d6caf3c13643065ef084e98b69efcaf atom/common/crash_reporter/crash_reporter_win.h
-@@ -1,78 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_COMMON_CRASH_REPORTER_CRASH_REPORTER_WIN_H_
--#define ATOM_COMMON_CRASH_REPORTER_CRASH_REPORTER_WIN_H_
--
--#include <memory>
--#include <string>
--#include <vector>
--
--#include "atom/common/crash_reporter/crash_reporter.h"
--#include "base/compiler_specific.h"
--#include "breakpad/src/client/windows/handler/exception_handler.h"
--
--namespace base {
--template <typename T>
--struct DefaultSingletonTraits;
--}
--
--namespace crash_reporter {
--
--class CrashReporterWin : public CrashReporter {
-- public:
--  static CrashReporterWin* GetInstance();
--
--  void InitBreakpad(const std::string& product_name,
--                    const std::string& version,
--                    const std::string& company_name,
--                    const std::string& submit_url,
--                    const base::FilePath& crashes_dir,
--                    bool upload_to_server,
--                    bool skip_system_crash_handler) override;
--  void SetUploadParameters() override;
--
--  // Crashes the process after generating a dump for the provided exception.
--  int CrashForException(EXCEPTION_POINTERS* info);
--
-- private:
--  friend struct base::DefaultSingletonTraits<CrashReporterWin>;
--
--  CrashReporterWin();
--  ~CrashReporterWin() override;
--
--  static bool FilterCallback(void* context,
--                             EXCEPTION_POINTERS* exinfo,
--                             MDRawAssertionInfo* assertion);
--
--  static bool MinidumpCallback(const wchar_t* dump_path,
--                               const wchar_t* minidump_id,
--                               void* context,
--                               EXCEPTION_POINTERS* exinfo,
--                               MDRawAssertionInfo* assertion,
--                               bool succeeded);
--
--  // Returns the custom info structure based on parameters.
--  google_breakpad::CustomClientInfo* GetCustomInfo(
--      const std::string& product_name,
--      const std::string& version,
--      const std::string& company_name,
--      bool upload_to_server);
--
--  // Custom information to be passed to crash handler.
--  std::vector<google_breakpad::CustomInfoEntry> custom_info_entries_;
--  google_breakpad::CustomClientInfo custom_info_;
--
--  bool skip_system_crash_handler_ = false;
--#ifdef _WIN64
--  bool code_range_registered_ = false;
--#endif
--  std::unique_ptr<google_breakpad::ExceptionHandler> breakpad_;
--
--  DISALLOW_COPY_AND_ASSIGN(CrashReporterWin);
--};
--
--}  // namespace crash_reporter
--
--#endif  // ATOM_COMMON_CRASH_REPORTER_CRASH_REPORTER_WIN_H_
-removed in remote
-  base   100644 56a5e094d446315fbc5565b115e84b775f433c88 atom/common/crash_reporter/linux/crash_dump_handler.cc
-  our    100644 8b0e3de5cecdda5c97237ebd5d6e0bbbd99a280b atom/common/crash_reporter/linux/crash_dump_handler.cc
-@@ -1,753 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Copyright (c) 2013 The Chromium Authors. All rights reserved.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--// For linux_syscall_support.h. This makes it safe to call embedded system
--// calls when in seccomp mode.
--
--#include "atom/common/crash_reporter/linux/crash_dump_handler.h"
--
--#include <poll.h>
--
--#include <algorithm>
--
--#include "base/posix/eintr_wrapper.h"
--#include "breakpad/src/client/linux/minidump_writer/directory_reader.h"
--#include "breakpad/src/common/linux/linux_libc_support.h"
--#include "breakpad/src/common/memory_allocator.h"
--
--#include "third_party/lss/linux_syscall_support.h"
--
--// Some versions of gcc are prone to warn about unused return values. In cases
--// where we either a) know the call cannot fail, or b) there is nothing we
--// can do when a call fails, we mark the return code as ignored. This avoids
--// spurious compiler warnings.
--#define IGNORE_RET(x) \
--  do {                \
--    if (x)            \
--      ;               \
--  } while (0)
--
--namespace crash_reporter {
--
--namespace {
--
--// String buffer size to use to convert a uint64_t to string.
--const size_t kUint64StringSize = 21;
--
--// Writes the value |v| as 16 hex characters to the memory pointed at by
--// |output|.
--void write_uint64_hex(char* output, uint64_t v) {
--  static const char hextable[] = "0123456789abcdef";
--
--  for (int i = 15; i >= 0; --i) {
--    output[i] = hextable[v & 15];
--    v >>= 4;
--  }
--}
--
--// uint64_t version of my_int_len() from
--// breakpad/src/common/linux/linux_libc_support.h. Return the length of the
--// given, non-negative integer when expressed in base 10.
--unsigned my_uint64_len(uint64_t i) {
--  if (!i)
--    return 1;
--
--  unsigned len = 0;
--  while (i) {
--    len++;
--    i /= 10;
--  }
--
--  return len;
--}
--
--// uint64_t version of my_uitos() from
--// breakpad/src/common/linux/linux_libc_support.h. Convert a non-negative
--// integer to a string (not null-terminated).
--void my_uint64tos(char* output, uint64_t i, unsigned i_len) {
--  for (unsigned index = i_len; index; --index, i /= 10)
--    output[index - 1] = '0' + (i % 10);
--}
--
--// Converts a struct timeval to milliseconds.
--uint64_t kernel_timeval_to_ms(struct kernel_timeval* tv) {
--  uint64_t ret = tv->tv_sec;  // Avoid overflow by explicitly using a uint64_t.
--  ret *= 1000;
--  ret += tv->tv_usec / 1000;
--  return ret;
--}
--
--bool my_isxdigit(char c) {
--  return (c >= '0' && c <= '9') || ((c | 0x20) >= 'a' && (c | 0x20) <= 'f');
--}
--
--size_t LengthWithoutTrailingSpaces(const char* str, size_t len) {
--  while (len > 0 && str[len - 1] == ' ') {
--    len--;
--  }
--  return len;
--}
--
--// MIME substrings.
--const char g_rn[] = "\r\n";
--const char g_form_data_msg[] = "Content-Disposition: form-data; name=\"";
--const char g_quote_msg[] = "\"";
--const char g_dashdash_msg[] = "--";
--const char g_dump_msg[] = "upload_file_minidump\"; filename=\"dump\"";
--const char g_content_type_msg[] = "Content-Type: application/octet-stream";
--
--// MimeWriter manages an iovec for writing MIMEs to a file.
--class MimeWriter {
-- public:
--  static const int kIovCapacity = 30;
--  static const size_t kMaxCrashChunkSize = 64;
--
--  MimeWriter(int fd, const char* const mime_boundary);
--  ~MimeWriter();
--
--  // Append boundary.
--  virtual void AddBoundary();
--
--  // Append end of file boundary.
--  virtual void AddEnd();
--
--  // Append key/value pair with specified sizes.
--  virtual void AddPairData(const char* msg_type,
--                           size_t msg_type_size,
--                           const char* msg_data,
--                           size_t msg_data_size);
--
--  // Append key/value pair.
--  void AddPairString(const char* msg_type, const char* msg_data) {
--    AddPairData(msg_type, my_strlen(msg_type), msg_data, my_strlen(msg_data));
--  }
--
--  // Append key/value pair, splitting value into chunks no larger than
--  // |chunk_size|. |chunk_size| cannot be greater than |kMaxCrashChunkSize|.
--  // The msg_type string will have a counter suffix to distinguish each chunk.
--  virtual void AddPairDataInChunks(const char* msg_type,
--                                   size_t msg_type_size,
--                                   const char* msg_data,
--                                   size_t msg_data_size,
--                                   size_t chunk_size,
--                                   bool strip_trailing_spaces);
--
--  // Add binary file contents to be uploaded with the specified filename.
--  virtual void AddFileContents(const char* filename_msg,
--                               uint8_t* file_data,
--                               size_t file_size);
--
--  // Flush any pending iovecs to the output file.
--  void Flush() {
--    IGNORE_RET(sys_writev(fd_, iov_, iov_index_));
--    iov_index_ = 0;
--  }
--
-- protected:
--  void AddItem(const void* base, size_t size);
--  // Minor performance trade-off for easier-to-maintain code.
--  void AddString(const char* str) { AddItem(str, my_strlen(str)); }
--  void AddItemWithoutTrailingSpaces(const void* base, size_t size);
--
--  struct kernel_iovec iov_[kIovCapacity];
--  int iov_index_ = 0;
--
--  // Output file descriptor.
--  int fd_ = -1;
--
--  const char* const mime_boundary_;
--
-- private:
--  DISALLOW_COPY_AND_ASSIGN(MimeWriter);
--};
--
--MimeWriter::MimeWriter(int fd, const char* const mime_boundary)
--    : fd_(fd), mime_boundary_(mime_boundary) {}
--
--MimeWriter::~MimeWriter() {}
--
--void MimeWriter::AddBoundary() {
--  AddString(mime_boundary_);
--  AddString(g_rn);
--}
--
--void MimeWriter::AddEnd() {
--  AddString(mime_boundary_);
--  AddString(g_dashdash_msg);
--  AddString(g_rn);
--}
--
--void MimeWriter::AddPairData(const char* msg_type,
--                             size_t msg_type_size,
--                             const char* msg_data,
--                             size_t msg_data_size) {
--  AddString(g_form_data_msg);
--  AddItem(msg_type, msg_type_size);
--  AddString(g_quote_msg);
--  AddString(g_rn);
--  AddString(g_rn);
--  AddItem(msg_data, msg_data_size);
--  AddString(g_rn);
--}
--
--void MimeWriter::AddPairDataInChunks(const char* msg_type,
--                                     size_t msg_type_size,
--                                     const char* msg_data,
--                                     size_t msg_data_size,
--                                     size_t chunk_size,
--                                     bool strip_trailing_spaces) {
--  if (chunk_size > kMaxCrashChunkSize)
--    return;
--
--  unsigned i = 0;
--  size_t done = 0, msg_length = msg_data_size;
--
--  while (msg_length) {
--    char num[kUint64StringSize];
--    const unsigned num_len = my_uint_len(++i);
--    my_uitos(num, i, num_len);
--
--    size_t chunk_len = std::min(chunk_size, msg_length);
--
--    AddString(g_form_data_msg);
--    AddItem(msg_type, msg_type_size);
--    AddItem(num, num_len);
--    AddString(g_quote_msg);
--    AddString(g_rn);
--    AddString(g_rn);
--    if (strip_trailing_spaces) {
--      AddItemWithoutTrailingSpaces(msg_data + done, chunk_len);
--    } else {
--      AddItem(msg_data + done, chunk_len);
--    }
--    AddString(g_rn);
--    AddBoundary();
--    Flush();
--
--    done += chunk_len;
--    msg_length -= chunk_len;
--  }
--}
--
--void MimeWriter::AddFileContents(const char* filename_msg,
--                                 uint8_t* file_data,
--                                 size_t file_size) {
--  AddString(g_form_data_msg);
--  AddString(filename_msg);
--  AddString(g_rn);
--  AddString(g_content_type_msg);
--  AddString(g_rn);
--  AddString(g_rn);
--  AddItem(file_data, file_size);
--  AddString(g_rn);
--}
--
--void MimeWriter::AddItem(const void* base, size_t size) {
--  // Check if the iovec is full and needs to be flushed to output file.
--  if (iov_index_ == kIovCapacity) {
--    Flush();
--  }
--  iov_[iov_index_].iov_base = const_cast<void*>(base);
--  iov_[iov_index_].iov_len = size;
--  ++iov_index_;
--}
--
--void MimeWriter::AddItemWithoutTrailingSpaces(const void* base, size_t size) {
--  AddItem(base,
--          LengthWithoutTrailingSpaces(static_cast<const char*>(base), size));
--}
--
--void LoadDataFromFD(google_breakpad::PageAllocator* allocator,
--                    int fd,
--                    bool close_fd,
--                    uint8_t** file_data,
--                    size_t* size) {
--  struct kernel_stat st;
--  if (sys_fstat(fd, &st) != 0) {
--    static const char msg[] = "Cannot upload crash dump: stat failed\n";
--    WriteLog(msg, sizeof(msg) - 1);
--    if (close_fd)
--      IGNORE_RET(sys_close(fd));
--    return;
--  }
--
--  *file_data = reinterpret_cast<uint8_t*>(allocator->Alloc(st.st_size));
--  if (!(*file_data)) {
--    static const char msg[] = "Cannot upload crash dump: cannot alloc\n";
--    WriteLog(msg, sizeof(msg) - 1);
--    if (close_fd)
--      IGNORE_RET(sys_close(fd));
--    return;
--  }
--  my_memset(*file_data, 0xf, st.st_size);
--
--  *size = st.st_size;
--  int byte_read = sys_read(fd, *file_data, *size);
--  if (byte_read == -1) {
--    static const char msg[] = "Cannot upload crash dump: read failed\n";
--    WriteLog(msg, sizeof(msg) - 1);
--    if (close_fd)
--      IGNORE_RET(sys_close(fd));
--    return;
--  }
--
--  if (close_fd)
--    IGNORE_RET(sys_close(fd));
--}
--
--void LoadDataFromFile(google_breakpad::PageAllocator* allocator,
--                      const char* filename,
--                      int* fd,
--                      uint8_t** file_data,
--                      size_t* size) {
--  // WARNING: this code runs in a compromised context. It may not call into
--  // libc nor allocate memory normally.
--  *fd = sys_open(filename, O_RDONLY, 0);
--  *size = 0;
--
--  if (*fd < 0) {
--    static const char msg[] = "Cannot upload crash dump: failed to open\n";
--    WriteLog(msg, sizeof(msg) - 1);
--    return;
--  }
--
--  LoadDataFromFD(allocator, *fd, true, file_data, size);
--}
--
--// Spawn the appropriate upload process for the current OS:
--// - generic Linux invokes wget.
--// - ChromeOS invokes crash_reporter.
--// |dumpfile| is the path to the dump data file.
--// |mime_boundary| is only used on Linux.
--// |exe_buf| is only used on CrOS and is the crashing process' name.
--void ExecUploadProcessOrTerminate(const BreakpadInfo& info,
--                                  const char* dumpfile,
--                                  const char* mime_boundary,
--                                  const char* exe_buf,
--                                  google_breakpad::PageAllocator* allocator) {
--  // The --header argument to wget looks like:
--  //   --header=Content-Type: multipart/form-data; boundary=XYZ
--  // where the boundary has two fewer leading '-' chars
--  static const char header_msg[] =
--      "--header=Content-Type: multipart/form-data; boundary=";
--  char* const header = reinterpret_cast<char*>(
--      allocator->Alloc(sizeof(header_msg) - 1 + strlen(mime_boundary) - 2 + 1));
--  memcpy(header, header_msg, sizeof(header_msg) - 1);
--  memcpy(header + sizeof(header_msg) - 1, mime_boundary + 2,
--         strlen(mime_boundary) - 2);
--  // We grab the NUL byte from the end of |mime_boundary|.
--
--  // The --post-file argument to wget looks like:
--  //   --post-file=/tmp/...
--  static const char post_file_msg[] = "--post-file=";
--  char* const post_file = reinterpret_cast<char*>(
--      allocator->Alloc(sizeof(post_file_msg) - 1 + strlen(dumpfile) + 1));
--  memcpy(post_file, post_file_msg, sizeof(post_file_msg) - 1);
--  memcpy(post_file + sizeof(post_file_msg) - 1, dumpfile, strlen(dumpfile));
--
--  static const char kWgetBinary[] = "/usr/bin/wget";
--  const char* args[] = {
--      kWgetBinary,    header, post_file, info.upload_url,
--      "--timeout=60",  // Set a timeout so we don't hang forever.
--      "--tries=1",     // Don't retry if the upload fails.
--      "--quiet",       // Be silent.
--      "-O",            // output reply to /dev/null.
--      "/dev/fd/3",    NULL,
--  };
--  static const char msg[] =
--      "Cannot upload crash dump: cannot exec "
--      "/usr/bin/wget\n";
--  execve(args[0], const_cast<char**>(args), environ);
--  WriteLog(msg, sizeof(msg) - 1);
--  sys__exit(1);
--}
--
--// Runs in the helper process to wait for the upload process running
--// ExecUploadProcessOrTerminate() to finish. Returns the number of bytes written
--// to |fd| and save the written contents to |buf|.
--// |buf| needs to be big enough to hold |bytes_to_read| + 1 characters.
--size_t WaitForCrashReportUploadProcess(int fd,
--                                       size_t bytes_to_read,
--                                       char* buf) {
--  size_t bytes_read = 0;
--
--  // Upload should finish in about 10 seconds. Add a few more 500 ms
--  // internals to account for process startup time.
--  for (size_t wait_count = 0; wait_count < 24; ++wait_count) {
--    struct kernel_pollfd poll_fd;
--    poll_fd.fd = fd;
--    poll_fd.events = POLLIN | POLLPRI | POLLERR;
--    int ret = sys_poll(&poll_fd, 1, 500);
--    if (ret < 0) {
--      // Error
--      break;
--    } else if (ret > 0) {
--      // There is data to read.
--      ssize_t len = HANDLE_EINTR(
--          sys_read(fd, buf + bytes_read, bytes_to_read - bytes_read));
--      if (len < 0)
--        break;
--      bytes_read += len;
--      if (bytes_read == bytes_to_read)
--        break;
--    }
--    // |ret| == 0 -> timed out, continue waiting.
--    // or |bytes_read| < |bytes_to_read| still, keep reading.
--  }
--  buf[bytes_to_read] = 0;  // Always NUL terminate the buffer.
--  return bytes_read;
--}
--
--// |buf| should be |expected_len| + 1 characters in size and NULL terminated.
--bool IsValidCrashReportId(const char* buf,
--                          size_t bytes_read,
--                          size_t expected_len) {
--  if (bytes_read != expected_len)
--    return false;
--  for (size_t i = 0; i < bytes_read; ++i) {
--    if (!my_isxdigit(buf[i]) && buf[i] != '-')
--      return false;
--  }
--  return true;
--}
--
--// |buf| should be |expected_len| + 1 characters in size and NULL terminated.
--void HandleCrashReportId(const char* buf,
--                         size_t bytes_read,
--                         size_t expected_len) {
--  if (!IsValidCrashReportId(buf, bytes_read, expected_len)) {
--    static const char msg[] = "Failed to get crash dump id.";
--    WriteLog(msg, sizeof(msg) - 1);
--    WriteNewline();
--
--    static const char id_msg[] = "Report Id: ";
--    WriteLog(id_msg, sizeof(id_msg) - 1);
--    WriteLog(buf, bytes_read);
--    WriteNewline();
--    return;
--  }
--
--  // Write crash dump id to stderr.
--  static const char msg[] = "Crash dump id: ";
--  WriteLog(msg, sizeof(msg) - 1);
--  WriteLog(buf, my_strlen(buf));
--  WriteNewline();
--
--  // Write crash dump id to crash log as: seconds_since_epoch,crash_id
--  struct kernel_timeval tv;
--  if (!sys_gettimeofday(&tv, NULL)) {
--    uint64_t time = kernel_timeval_to_ms(&tv) / 1000;
--    char time_str[kUint64StringSize];
--    const unsigned time_len = my_uint64_len(time);
--    my_uint64tos(time_str, time, time_len);
--
--    const int kLogOpenFlags = O_CREAT | O_WRONLY | O_APPEND | O_CLOEXEC;
--    int log_fd = sys_open(g_crash_log_path, kLogOpenFlags, 0600);
--    if (log_fd > 0) {
--      sys_write(log_fd, time_str, time_len);
--      sys_write(log_fd, ",", 1);
--      sys_write(log_fd, buf, my_strlen(buf));
--      sys_write(log_fd, "\n", 1);
--      IGNORE_RET(sys_close(log_fd));
--    }
--  }
--}
--
--}  // namespace
--
--char g_crash_log_path[256];
--
--void HandleCrashDump(const BreakpadInfo& info) {
--  int dumpfd;
--  bool keep_fd = false;
--  size_t dump_size;
--  uint8_t* dump_data;
--  google_breakpad::PageAllocator allocator;
--  const char* exe_buf = NULL;
--
--  if (info.fd != -1) {
--    // Dump is provided with an open FD.
--    keep_fd = true;
--    dumpfd = info.fd;
--
--    // The FD is pointing to the end of the file.
--    // Rewind, we'll read the data next.
--    if (lseek(dumpfd, 0, SEEK_SET) == -1) {
--      static const char msg[] =
--          "Cannot upload crash dump: failed to "
--          "reposition minidump FD\n";
--      WriteLog(msg, sizeof(msg) - 1);
--      IGNORE_RET(sys_close(dumpfd));
--      return;
--    }
--    LoadDataFromFD(&allocator, info.fd, false, &dump_data, &dump_size);
--  } else {
--    // Dump is provided with a path.
--    keep_fd = false;
--    LoadDataFromFile(&allocator, info.filename, &dumpfd, &dump_data,
--                     &dump_size);
--  }
--
--  // We need to build a MIME block for uploading to the server. Since we are
--  // going to fork and run wget, it needs to be written to a temp file.
--  const int ufd = sys_open("/dev/urandom", O_RDONLY, 0);
--  if (ufd < 0) {
--    static const char msg[] =
--        "Cannot upload crash dump because /dev/urandom"
--        " is missing\n";
--    WriteLog(msg, sizeof(msg) - 1);
--    return;
--  }
--
--  static const char temp_file_template[] =
--      "/tmp/chromium-upload-XXXXXXXXXXXXXXXX";
--  char temp_file[sizeof(temp_file_template)];
--  int temp_file_fd = -1;
--  if (keep_fd) {
--    temp_file_fd = dumpfd;
--    // Rewind the destination, we are going to overwrite it.
--    if (lseek(dumpfd, 0, SEEK_SET) == -1) {
--      static const char msg[] =
--          "Cannot upload crash dump: failed to "
--          "reposition minidump FD (2)\n";
--      WriteLog(msg, sizeof(msg) - 1);
--      IGNORE_RET(sys_close(dumpfd));
--      return;
--    }
--  } else {
--    if (info.upload) {
--      memcpy(temp_file, temp_file_template, sizeof(temp_file_template));
--
--      for (unsigned i = 0; i < 10; ++i) {
--        uint64_t t;
--        sys_read(ufd, &t, sizeof(t));
--        write_uint64_hex(temp_file + sizeof(temp_file) - (16 + 1), t);
--
--        temp_file_fd = sys_open(temp_file, O_WRONLY | O_CREAT | O_EXCL, 0600);
--        if (temp_file_fd >= 0)
--          break;
--      }
--
--      if (temp_file_fd < 0) {
--        static const char msg[] =
--            "Failed to create temporary file in /tmp: "
--            "cannot upload crash dump\n";
--        WriteLog(msg, sizeof(msg) - 1);
--        IGNORE_RET(sys_close(ufd));
--        return;
--      }
--    } else {
--      temp_file_fd = sys_open(info.filename, O_WRONLY, 0600);
--      if (temp_file_fd < 0) {
--        static const char msg[] = "Failed to save crash dump: failed to open\n";
--        WriteLog(msg, sizeof(msg) - 1);
--        IGNORE_RET(sys_close(ufd));
--        return;
--      }
--    }
--  }
--
--  // The MIME boundary is 28 hyphens, followed by a 64-bit nonce and a NUL.
--  char mime_boundary[28 + 16 + 1];
--  my_memset(mime_boundary, '-', 28);
--  uint64_t boundary_rand;
--  sys_read(ufd, &boundary_rand, sizeof(boundary_rand));
--  write_uint64_hex(mime_boundary + 28, boundary_rand);
--  mime_boundary[28 + 16] = 0;
--  IGNORE_RET(sys_close(ufd));
--
--  // The MIME block looks like this:
--  //   BOUNDARY \r\n
--  //   Content-Disposition: form-data; name="prod" \r\n \r\n
--  //   Chrome_Linux \r\n
--  //   BOUNDARY \r\n
--  //   Content-Disposition: form-data; name="ver" \r\n \r\n
--  //   1.2.3.4 \r\n
--  //   BOUNDARY \r\n
--  //
--  //   zero or one:
--  //   Content-Disposition: form-data; name="ptime" \r\n \r\n
--  //   abcdef \r\n
--  //   BOUNDARY \r\n
--  //
--  //   zero or one:
--  //   Content-Disposition: form-data; name="ptype" \r\n \r\n
--  //   abcdef \r\n
--  //   BOUNDARY \r\n
--  //
--  //   zero or one:
--  //   Content-Disposition: form-data; name="lsb-release" \r\n \r\n
--  //   abcdef \r\n
--  //   BOUNDARY \r\n
--  //
--  //   zero or one:
--  //   Content-Disposition: form-data; name="oom-size" \r\n \r\n
--  //   1234567890 \r\n
--  //   BOUNDARY \r\n
--  //
--  //   zero or more (up to CrashKeyStorage::num_entries = 64):
--  //   Content-Disposition: form-data; name=crash-key-name \r\n
--  //   crash-key-value \r\n
--  //   BOUNDARY \r\n
--  //
--  //   Content-Disposition: form-data; name="dump"; filename="dump" \r\n
--  //   Content-Type: application/octet-stream \r\n \r\n
--  //   <dump contents>
--  //   \r\n BOUNDARY -- \r\n
--
--  MimeWriter writer(temp_file_fd, mime_boundary);
--  {
--    writer.AddBoundary();
--    if (info.pid > 0) {
--      char pid_value_buf[kUint64StringSize];
--      uint64_t pid_value_len = my_uint64_len(info.pid);
--      my_uint64tos(pid_value_buf, info.pid, pid_value_len);
--      static const char pid_key_name[] = "pid";
--      writer.AddPairData(pid_key_name, sizeof(pid_key_name) - 1, pid_value_buf,
--                         pid_value_len);
--      writer.AddBoundary();
--    }
--    writer.Flush();
--  }
--
--  if (info.process_start_time > 0) {
--    struct kernel_timeval tv;
--    if (!sys_gettimeofday(&tv, NULL)) {
--      uint64_t time = kernel_timeval_to_ms(&tv);
--      if (time > info.process_start_time) {
--        time -= info.process_start_time;
--        char time_str[kUint64StringSize];
--        const unsigned time_len = my_uint64_len(time);
--        my_uint64tos(time_str, time, time_len);
--
--        static const char process_time_msg[] = "ptime";
--        writer.AddPairData(process_time_msg, sizeof(process_time_msg) - 1,
--                           time_str, time_len);
--        writer.AddBoundary();
--        writer.Flush();
--      }
--    }
--  }
--
--  if (info.distro_length) {
--    static const char distro_msg[] = "lsb-release";
--    writer.AddPairString(distro_msg, info.distro);
--    writer.AddBoundary();
--    writer.Flush();
--  }
--
--  if (info.oom_size) {
--    char oom_size_str[kUint64StringSize];
--    const unsigned oom_size_len = my_uint64_len(info.oom_size);
--    my_uint64tos(oom_size_str, info.oom_size, oom_size_len);
--    static const char oom_size_msg[] = "oom-size";
--    writer.AddPairData(oom_size_msg, sizeof(oom_size_msg) - 1, oom_size_str,
--                       oom_size_len);
--    writer.AddBoundary();
--    writer.Flush();
--  }
--
--  if (info.crash_keys) {
--    CrashKeyStorage::Iterator crash_key_iterator(*info.crash_keys);
--    const CrashKeyStorage::Entry* entry;
--    while ((entry = crash_key_iterator.Next())) {
--      writer.AddPairString(entry->key, entry->value);
--      writer.AddBoundary();
--      writer.Flush();
--    }
--  }
--
--  writer.AddFileContents(g_dump_msg, dump_data, dump_size);
--  writer.AddEnd();
--  writer.Flush();
--
--  IGNORE_RET(sys_close(temp_file_fd));
--
--  if (!info.upload)
--    return;
--
--  const pid_t child = sys_fork();
--  if (!child) {
--    // Spawned helper process.
--    //
--    // This code is called both when a browser is crashing (in which case,
--    // nothing really matters any more) and when a renderer/plugin crashes, in
--    // which case we need to continue.
--    //
--    // Since we are a multithreaded app, if we were just to fork(), we might
--    // grab file descriptors which have just been created in another thread and
--    // hold them open for too long.
--    //
--    // Thus, we have to loop and try and close everything.
--    const int fd = sys_open("/proc/self/fd", O_DIRECTORY | O_RDONLY, 0);
--    if (fd < 0) {
--      for (unsigned i = 3; i < 8192; ++i)
--        IGNORE_RET(sys_close(i));
--    } else {
--      google_breakpad::DirectoryReader reader(fd);
--      const char* name;
--      while (reader.GetNextEntry(&name)) {
--        int i;
--        if (my_strtoui(&i, name) && i > 2 && i != fd)
--          IGNORE_RET(sys_close(i));
--        reader.PopEntry();
--      }
--
--      IGNORE_RET(sys_close(fd));
--    }
--
--    IGNORE_RET(sys_setsid());
--
--    // Leave one end of a pipe in the upload process and watch for it getting
--    // closed by the upload process exiting.
--    int fds[2];
--    if (sys_pipe(fds) >= 0) {
--      const pid_t upload_child = sys_fork();
--      if (!upload_child) {
--        // Upload process.
--        IGNORE_RET(sys_close(fds[0]));
--        IGNORE_RET(sys_dup2(fds[1], 3));
--        ExecUploadProcessOrTerminate(info, temp_file, mime_boundary, exe_buf,
--                                     &allocator);
--      }
--
--      // Helper process.
--      if (upload_child > 0) {
--        IGNORE_RET(sys_close(fds[1]));
--
--        const size_t kCrashIdLength = 36;
--        char id_buf[kCrashIdLength + 1];
--        size_t bytes_read =
--            WaitForCrashReportUploadProcess(fds[0], kCrashIdLength, id_buf);
--        HandleCrashReportId(id_buf, bytes_read, kCrashIdLength);
--
--        if (sys_waitpid(upload_child, NULL, WNOHANG) == 0) {
--          // Upload process is still around, kill it.
--          sys_kill(upload_child, SIGKILL);
--        }
--      }
--    }
--
--    // Helper process.
--    IGNORE_RET(sys_unlink(info.filename));
--    IGNORE_RET(sys_unlink(temp_file));
--    sys__exit(0);
--  }
--
--  // Main browser process.
--  if (child <= 0)
--    return;
--  (void)HANDLE_EINTR(sys_waitpid(child, NULL, 0));
--}
--
--size_t WriteLog(const char* buf, size_t nbytes) {
--  return sys_write(2, buf, nbytes);
--}
--
--size_t WriteNewline() {
--  return WriteLog("\n", 1);
--}
--
--}  // namespace crash_reporter
-removed in remote
-  base   100644 f10c5212254ea0bcc4cd9deb9764f42fe9e4ceea atom/common/crash_reporter/linux/crash_dump_handler.h
-  our    100644 99843c39fdfd011804b9b50a11232cfa8567228e atom/common/crash_reporter/linux/crash_dump_handler.h
-@@ -1,46 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Copyright (c) 2013 The Chromium Authors. All rights reserved.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_COMMON_CRASH_REPORTER_LINUX_CRASH_DUMP_HANDLER_H_
--#define ATOM_COMMON_CRASH_REPORTER_LINUX_CRASH_DUMP_HANDLER_H_
--
--#include <stddef.h>
--#include <stdint.h>
--#include <sys/types.h>
--
--#include "base/macros.h"
--#include "breakpad/src/common/simple_string_dictionary.h"
--
--namespace crash_reporter {
--
--typedef google_breakpad::NonAllocatingMap<256, 256, 64> CrashKeyStorage;
--
--// BreakpadInfo describes a crash report.
--// The minidump information can either be contained in a file descriptor (fd) or
--// in a file (whose path is in filename).
--struct BreakpadInfo {
--  int fd;                       // File descriptor to the Breakpad dump data.
--  const char* filename;         // Path to the Breakpad dump data.
--  const char* distro;           // Linux distro string.
--  unsigned distro_length;       // Length of |distro|.
--  bool upload;                  // Whether to upload or save crash dump.
--  uint64_t process_start_time;  // Uptime of the crashing process.
--  size_t oom_size;              // Amount of memory requested if OOM.
--  uint64_t pid;                 // PID where applicable.
--  const char* upload_url;       // URL to upload the minidump.
--  CrashKeyStorage* crash_keys;
--};
--
--void HandleCrashDump(const BreakpadInfo& info);
--
--size_t WriteLog(const char* buf, size_t nbytes);
--size_t WriteNewline();
--
--// Global variable storing the path of upload log.
--extern char g_crash_log_path[256];
--
--}  // namespace crash_reporter
--
--#endif  // ATOM_COMMON_CRASH_REPORTER_LINUX_CRASH_DUMP_HANDLER_H_
-removed in remote
-  base   100644 58c7c38632ed1bbe2a868a460c3b90af9fa5694b atom/common/crash_reporter/win/crash_service.cc
-  our    100644 d13111f495be844df10deebacd572560021bbb4e atom/common/crash_reporter/win/crash_service.cc
-@@ -1,507 +0,0 @@
--// Copyright (c) 2012 The Chromium Authors. All rights reserved.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/common/crash_reporter/win/crash_service.h"
--
--#include <windows.h>
--
--#include <sddl.h>
--#include <fstream>  // NOLINT
--#include <map>
--
--#include "base/command_line.h"
--#include "base/files/file_util.h"
--#include "base/logging.h"
--#include "base/strings/string_number_conversions.h"
--#include "base/strings/string_util.h"
--#include "base/time/time.h"
--#include "base/win/windows_version.h"
--#include "breakpad/src/client/windows/crash_generation/client_info.h"
--#include "breakpad/src/client/windows/crash_generation/crash_generation_server.h"
--#include "breakpad/src/client/windows/sender/crash_report_sender.h"
--
--namespace breakpad {
--
--namespace {
--
--const wchar_t kWaitEventFormat[] = L"$1CrashServiceWaitEvent";
--const wchar_t kClassNameFormat[] = L"$1CrashServiceWindow";
--
--const wchar_t kTestPipeName[] = L"\\\\.\\pipe\\ChromeCrashServices";
--
--const wchar_t kGoogleReportURL[] = L"https://clients2.google.com/cr/report";
--const wchar_t kCheckPointFile[] = L"crash_checkpoint.txt";
--
--typedef std::map<std::wstring, std::wstring> CrashMap;
--
--bool CustomInfoToMap(const google_breakpad::ClientInfo* client_info,
--                     const std::wstring& reporter_tag,
--                     CrashMap* map) {
--  google_breakpad::CustomClientInfo info = client_info->GetCustomInfo();
--
--  for (uintptr_t i = 0; i < info.count; ++i) {
--    (*map)[info.entries[i].name] = info.entries[i].value;
--  }
--
--  (*map)[L"rept"] = reporter_tag;
--
--  return !map->empty();
--}
--
--bool WriteCustomInfoToFile(const std::wstring& dump_path, const CrashMap& map) {
--  std::wstring file_path(dump_path);
--  size_t last_dot = file_path.rfind(L'.');
--  if (last_dot == std::wstring::npos)
--    return false;
--  file_path.resize(last_dot);
--  file_path += L".txt";
--
--  std::wofstream file(file_path.c_str(), std::ios_base::out |
--                                             std::ios_base::app |
--                                             std::ios::binary);
--  if (!file.is_open())
--    return false;
--
--  CrashMap::const_iterator pos;
--  for (pos = map.begin(); pos != map.end(); ++pos) {
--    std::wstring line = pos->first;
--    line += L':';
--    line += pos->second;
--    line += L'\n';
--    file.write(line.c_str(), static_cast<std::streamsize>(line.length()));
--  }
--  return true;
--}
--
--bool WriteReportIDToFile(const std::wstring& dump_path,
--                         const std::wstring& report_id) {
--  std::wstring file_path(dump_path);
--  size_t last_slash = file_path.rfind(L'\\');
--  if (last_slash == std::wstring::npos)
--    return false;
--  file_path.resize(last_slash);
--  file_path += L"\\uploads.log";
--
--  std::wofstream file(file_path.c_str(), std::ios_base::out |
--                                             std::ios_base::app |
--                                             std::ios::binary);
--  if (!file.is_open())
--    return false;
--
--  int64_t seconds_since_epoch =
--      (base::Time::Now() - base::Time::UnixEpoch()).InSeconds();
--  std::wstring line = base::Int64ToString16(seconds_since_epoch);
--  line += L',';
--  line += report_id;
--  line += L'\n';
--  file.write(line.c_str(), static_cast<std::streamsize>(line.length()));
--  return true;
--}
--
--// The window procedure task is to handle when a) the user logs off.
--// b) the system shuts down or c) when the user closes the window.
--LRESULT __stdcall CrashSvcWndProc(HWND hwnd,
--                                  UINT message,
--                                  WPARAM wparam,
--                                  LPARAM lparam) {
--  switch (message) {
--    case WM_CLOSE:
--    case WM_ENDSESSION:
--    case WM_DESTROY:
--      PostQuitMessage(0);
--      break;
--    default:
--      return DefWindowProc(hwnd, message, wparam, lparam);
--  }
--  return 0;
--}
--
--// This is the main and only application window.
--HWND g_top_window = NULL;
--
--bool CreateTopWindow(HINSTANCE instance,
--                     const base::string16& application_name,
--                     bool visible) {
--  base::string16 class_name =
--      base::ReplaceStringPlaceholders(kClassNameFormat, application_name, NULL);
--
--  WNDCLASSEXW wcx = {0};
--  wcx.cbSize = sizeof(wcx);
--  wcx.style = CS_HREDRAW | CS_VREDRAW;
--  wcx.lpfnWndProc = CrashSvcWndProc;
--  wcx.hInstance = instance;
--  wcx.lpszClassName = class_name.c_str();
--  ::RegisterClassExW(&wcx);
--  DWORD style = visible ? WS_POPUPWINDOW | WS_VISIBLE : WS_OVERLAPPED;
--
--  // The window size is zero but being a popup window still shows in the
--  // task bar and can be closed using the system menu or using task manager.
--  HWND window = CreateWindowExW(0, wcx.lpszClassName, L"crash service", style,
--                                CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, NULL, NULL,
--                                instance, NULL);
--  if (!window)
--    return false;
--
--  ::UpdateWindow(window);
--  VLOG(1) << "window handle is " << window;
--  g_top_window = window;
--  return true;
--}
--
--// Simple helper class to keep the process alive until the current request
--// finishes.
--class ProcessingLock {
-- public:
--  ProcessingLock() { ::InterlockedIncrement(&op_count_); }
--  ~ProcessingLock() { ::InterlockedDecrement(&op_count_); }
--  static bool IsWorking() { return (op_count_ != 0); }
--
-- private:
--  static volatile LONG op_count_;
--};
--
--volatile LONG ProcessingLock::op_count_ = 0;
--
--// This structure contains the information that the worker thread needs to
--// send a crash dump to the server.
--struct DumpJobInfo {
--  DWORD pid;
--  CrashService* self;
--  CrashMap map;
--  std::wstring dump_path;
--
--  DumpJobInfo(DWORD process_id,
--              CrashService* service,
--              const CrashMap& crash_map,
--              const std::wstring& path)
--      : pid(process_id), self(service), map(crash_map), dump_path(path) {}
--};
--
--}  // namespace
--
--// Command line switches:
--const char CrashService::kMaxReports[] = "max-reports";
--const char CrashService::kNoWindow[] = "no-window";
--const char CrashService::kReporterTag[] = "reporter";
--const char CrashService::kDumpsDir[] = "dumps-dir";
--const char CrashService::kPipeName[] = "pipe-name";
--const char CrashService::kReporterURL[] = "reporter-url";
--
--CrashService::CrashService() {}
--
--CrashService::~CrashService() {
--  base::AutoLock lock(sending_);
--  delete dumper_;
--  delete sender_;
--}
--
--bool CrashService::Initialize(const base::string16& application_name,
--                              const base::FilePath& operating_dir,
--                              const base::FilePath& dumps_path) {
--  using google_breakpad::CrashGenerationServer;
--  using google_breakpad::CrashReportSender;
--
--  std::wstring pipe_name = kTestPipeName;
--  int max_reports = -1;
--
--  // The checkpoint file allows CrashReportSender to enforce the maximum
--  // reports per day quota. Does not seem to serve any other purpose.
--  base::FilePath checkpoint_path = operating_dir.Append(kCheckPointFile);
--
--  base::CommandLine& cmd_line = *base::CommandLine::ForCurrentProcess();
--
--  base::FilePath dumps_path_to_use = dumps_path;
--
--  if (cmd_line.HasSwitch(kDumpsDir)) {
--    dumps_path_to_use =
--        base::FilePath(cmd_line.GetSwitchValueNative(kDumpsDir));
--  }
--
--  // We can override the send reports quota with a command line switch.
--  if (cmd_line.HasSwitch(kMaxReports))
--    max_reports = _wtoi(cmd_line.GetSwitchValueNative(kMaxReports).c_str());
--
--  // Allow the global pipe name to be overridden for better testability.
--  if (cmd_line.HasSwitch(kPipeName))
--    pipe_name = cmd_line.GetSwitchValueNative(kPipeName);
--
--  if (max_reports > 0) {
--    // Create the http sender object.
--    sender_ = new CrashReportSender(checkpoint_path.value());
--    sender_->set_max_reports_per_day(max_reports);
--  }
--
--  SECURITY_ATTRIBUTES security_attributes = {0};
--  SECURITY_DESCRIPTOR* security_descriptor =
--      reinterpret_cast<SECURITY_DESCRIPTOR*>(
--          GetSecurityDescriptorForLowIntegrity());
--  DCHECK(security_descriptor != NULL);
--
--  security_attributes.nLength = sizeof(security_attributes);
--  security_attributes.lpSecurityDescriptor = security_descriptor;
--  security_attributes.bInheritHandle = FALSE;
--
--  // Create the OOP crash generator object.
--  dumper_ = new CrashGenerationServer(
--      pipe_name, &security_attributes, &CrashService::OnClientConnected, this,
--      &CrashService::OnClientDumpRequest, this, &CrashService::OnClientExited,
--      this, NULL, NULL, true, &dumps_path_to_use.value());
--
--  if (!dumper_) {
--    LOG(ERROR) << "could not create dumper";
--    if (security_attributes.lpSecurityDescriptor)
--      LocalFree(security_attributes.lpSecurityDescriptor);
--    return false;
--  }
--
--  if (!CreateTopWindow(::GetModuleHandleW(NULL), application_name,
--                       !cmd_line.HasSwitch(kNoWindow))) {
--    LOG(ERROR) << "could not create window";
--    if (security_attributes.lpSecurityDescriptor)
--      LocalFree(security_attributes.lpSecurityDescriptor);
--    return false;
--  }
--
--  reporter_tag_ = L"crash svc";
--  if (cmd_line.HasSwitch(kReporterTag))
--    reporter_tag_ = cmd_line.GetSwitchValueNative(kReporterTag);
--
--  reporter_url_ = kGoogleReportURL;
--  if (cmd_line.HasSwitch(kReporterURL))
--    reporter_url_ = cmd_line.GetSwitchValueNative(kReporterURL);
--
--  // Log basic information.
--  VLOG(1) << "pipe name is " << pipe_name << "\ndumps at "
--          << dumps_path_to_use.value();
--
--  if (sender_) {
--    VLOG(1) << "checkpoint is " << checkpoint_path.value() << "\nserver is "
--            << reporter_url_ << "\nmaximum " << sender_->max_reports_per_day()
--            << " reports/day"
--            << "\nreporter is " << reporter_tag_;
--  }
--  // Start servicing clients.
--  if (!dumper_->Start()) {
--    LOG(ERROR) << "could not start dumper";
--    if (security_attributes.lpSecurityDescriptor)
--      LocalFree(security_attributes.lpSecurityDescriptor);
--    return false;
--  }
--
--  if (security_attributes.lpSecurityDescriptor)
--    LocalFree(security_attributes.lpSecurityDescriptor);
--
--  // Create or open an event to signal the browser process that the crash
--  // service is initialized.
--  base::string16 wait_name =
--      base::ReplaceStringPlaceholders(kWaitEventFormat, application_name, NULL);
--  HANDLE wait_event = ::CreateEventW(NULL, TRUE, TRUE, wait_name.c_str());
--  ::SetEvent(wait_event);
--
--  return true;
--}
--
--void CrashService::OnClientConnected(
--    void* context,
--    const google_breakpad::ClientInfo* client_info) {
--  ProcessingLock lock;
--  VLOG(1) << "client start. pid = " << client_info->pid();
--  CrashService* self = static_cast<CrashService*>(context);
--  ::InterlockedIncrement(&self->clients_connected_);
--}
--
--void CrashService::OnClientExited(
--    void* context,
--    const google_breakpad::ClientInfo* client_info) {
--  ProcessingLock processing_lock;
--  VLOG(1) << "client end. pid = " << client_info->pid();
--  CrashService* self = static_cast<CrashService*>(context);
--  ::InterlockedIncrement(&self->clients_terminated_);
--
--  if (!self->sender_)
--    return;
--
--  // When we are instructed to send reports we need to exit if there are
--  // no more clients to service. The next client that runs will start us.
--  // Only chrome.exe starts crash_service with a non-zero max_reports.
--  if (self->clients_connected_ > self->clients_terminated_)
--    return;
--  if (self->sender_->max_reports_per_day() > 0) {
--    // Wait for the other thread to send crashes, if applicable. The sender
--    // thread takes the sending_ lock, so the sleep is just to give it a
--    // chance to start.
--    ::Sleep(1000);
--    base::AutoLock lock(self->sending_);
--    // Some people can restart chrome very fast, check again if we have
--    // a new client before exiting for real.
--    if (self->clients_connected_ == self->clients_terminated_) {
--      VLOG(1) << "zero clients. exiting";
--      ::PostMessage(g_top_window, WM_CLOSE, 0, 0);
--    }
--  }
--}
--
--void CrashService::OnClientDumpRequest(
--    void* context,
--    const google_breakpad::ClientInfo* client_info,
--    const std::wstring* file_path) {
--  ProcessingLock lock;
--
--  if (!file_path) {
--    LOG(ERROR) << "dump with no file path";
--    return;
--  }
--  if (!client_info) {
--    LOG(ERROR) << "dump with no client info";
--    return;
--  }
--
--  CrashService* self = static_cast<CrashService*>(context);
--  if (!self) {
--    LOG(ERROR) << "dump with no context";
--    return;
--  }
--
--  CrashMap map;
--  CustomInfoToMap(client_info, self->reporter_tag_, &map);
--
--  // Move dump file to the directory under client breakpad dump location.
--  base::FilePath dump_location = base::FilePath(*file_path);
--  CrashMap::const_iterator it = map.find(L"breakpad-dump-location");
--  if (it != map.end()) {
--    base::FilePath alternate_dump_location = base::FilePath(it->second);
--    base::CreateDirectoryW(alternate_dump_location);
--    alternate_dump_location =
--        alternate_dump_location.Append(dump_location.BaseName());
--    base::Move(dump_location, alternate_dump_location);
--    dump_location = alternate_dump_location;
--  }
--
--  DWORD pid = client_info->pid();
--  VLOG(1) << "dump for pid = " << pid << " is " << dump_location.value();
--
--  if (!WriteCustomInfoToFile(dump_location.value(), map)) {
--    LOG(ERROR) << "could not write custom info file";
--  }
--
--  if (!self->sender_ || map.find(L"skip_upload") != map.end())
--    return;
--
--  // Send the crash dump using a worker thread. This operation has retry
--  // logic in case there is no internet connection at the time.
--  DumpJobInfo* dump_job =
--      new DumpJobInfo(pid, self, map, dump_location.value());
--  if (!::QueueUserWorkItem(&CrashService::AsyncSendDump, dump_job,
--                           WT_EXECUTELONGFUNCTION)) {
--    LOG(ERROR) << "could not queue job";
--  }
--}
--
--// We are going to try sending the report several times. If we can't send,
--// we sleep from one minute to several hours depending on the retry round.
--DWORD CrashService::AsyncSendDump(void* context) {
--  if (!context)
--    return 0;
--
--  DumpJobInfo* info = static_cast<DumpJobInfo*>(context);
--
--  std::wstring report_id = L"<unsent>";
--
--  const DWORD kOneMinute = 60 * 1000;
--  const DWORD kOneHour = 60 * kOneMinute;
--
--  const DWORD kSleepSchedule[] = {24 * kOneHour, 8 * kOneHour,    4 * kOneHour,
--                                  kOneHour,      15 * kOneMinute, 0};
--
--  int retry_round = arraysize(kSleepSchedule) - 1;
--
--  do {
--    ::Sleep(kSleepSchedule[retry_round]);
--    {
--      // Take the server lock while sending. This also prevent early
--      // termination of the service object.
--      base::AutoLock lock(info->self->sending_);
--      VLOG(1) << "trying to send report for pid = " << info->pid;
--      std::map<std::wstring, std::wstring> file_map;
--      file_map[L"upload_file_minidump"] = info->dump_path;
--      google_breakpad::ReportResult send_result =
--          info->self->sender_->SendCrashReport(info->self->reporter_url_,
--                                               info->map, file_map, &report_id);
--      switch (send_result) {
--        case google_breakpad::RESULT_FAILED:
--          report_id = L"<network issue>";
--          break;
--        case google_breakpad::RESULT_REJECTED:
--          report_id = L"<rejected>";
--          ++info->self->requests_handled_;
--          retry_round = 0;
--          break;
--        case google_breakpad::RESULT_SUCCEEDED:
--          ++info->self->requests_sent_;
--          ++info->self->requests_handled_;
--          retry_round = 0;
--          WriteReportIDToFile(info->dump_path, report_id);
--          break;
--        case google_breakpad::RESULT_THROTTLED:
--          report_id = L"<throttled>";
--          break;
--        default:
--          report_id = L"<unknown>";
--          break;
--      }
--    }
--
--    VLOG(1) << "dump for pid =" << info->pid << " crash2 id =" << report_id;
--    --retry_round;
--  } while (retry_round >= 0);
--
--  if (!::DeleteFileW(info->dump_path.c_str()))
--    LOG(WARNING) << "could not delete " << info->dump_path;
--
--  delete info;
--  return 0;
--}
--
--int CrashService::ProcessingLoop() {
--  MSG msg;
--  while (GetMessage(&msg, NULL, 0, 0)) {
--    TranslateMessage(&msg);
--    DispatchMessage(&msg);
--  }
--
--  VLOG(1) << "session ending..";
--  while (ProcessingLock::IsWorking()) {
--    ::Sleep(50);
--  }
--
--  VLOG(1) << "clients connected :" << clients_connected_
--          << "\nclients terminated :" << clients_terminated_
--          << "\ndumps serviced :" << requests_handled_
--          << "\ndumps reported :" << requests_sent_;
--
--  return static_cast<int>(msg.wParam);
--}
--
--PSECURITY_DESCRIPTOR CrashService::GetSecurityDescriptorForLowIntegrity() {
--  // Build the SDDL string for the label.
--  std::wstring sddl = L"S:(ML;;NW;;;S-1-16-4096)";
--
--  PSECURITY_DESCRIPTOR sec_desc = NULL;
--
--  PACL sacl = NULL;
--  BOOL sacl_present = FALSE;
--  BOOL sacl_defaulted = FALSE;
--
--  if (::ConvertStringSecurityDescriptorToSecurityDescriptorW(
--          sddl.c_str(), SDDL_REVISION, &sec_desc, NULL)) {
--    if (::GetSecurityDescriptorSacl(sec_desc, &sacl_present, &sacl,
--                                    &sacl_defaulted)) {
--      return sec_desc;
--    }
--  }
--
--  return NULL;
--}
--
--}  // namespace breakpad
-removed in remote
-  base   100644 c05e0d5bf6e453950f584bc44a911ecaea55fe84 atom/common/crash_reporter/win/crash_service.h
-  our    100644 93bbb7c36de3d256acae5ff8dfaa447f8a438b14 atom/common/crash_reporter/win/crash_service.h
-@@ -1,130 +0,0 @@
--// Copyright (c) 2011 The Chromium Authors. All rights reserved.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_COMMON_CRASH_REPORTER_WIN_CRASH_SERVICE_H_
--#define ATOM_COMMON_CRASH_REPORTER_WIN_CRASH_SERVICE_H_
--
--#include <string>
--
--#include "base/files/file_path.h"
--#include "base/macros.h"
--#include "base/synchronization/lock.h"
--
--#if defined(OS_WIN)
--#include <windows.h>
--#endif  // defined(OS_WIN)
--
--namespace google_breakpad {
--
--class CrashReportSender;
--class CrashGenerationServer;
--class ClientInfo;
--
--}  // namespace google_breakpad
--
--namespace breakpad {
--
--// This class implements an out-of-process crash server. It uses breakpad's
--// CrashGenerationServer and CrashReportSender to generate and then send the
--// crash dumps. Internally, it uses OS specific pipe to allow applications to
--// register for crash dumps and later on when a registered application crashes
--// it will signal an event that causes this code to wake up and perform a
--// crash dump on the signaling process. The dump is then stored on disk and
--// possibly sent to the crash2 servers.
--class CrashService {
-- public:
--  CrashService();
--  ~CrashService();
--
--  // Starts servicing crash dumps. Returns false if it failed. Do not use
--  // other members in that case. |operating_dir| is where the CrashService
--  // should store breakpad's checkpoint file. |dumps_path| is the directory
--  // where the crash dumps should be stored.
--  bool Initialize(const base::string16& application_name,
--                  const base::FilePath& operating_dir,
--                  const base::FilePath& dumps_path);
--
--  // Command line switches:
--  //
--  // --max-reports=<number>
--  // Allows to override the maximum number for reports per day. Normally
--  // the crash dumps are never sent so if you want to send any you must
--  // specify a positive number here.
--  static const char kMaxReports[];
--  // --no-window
--  // Does not create a visible window on the desktop. The window does not have
--  // any other functionality other than allowing the crash service to be
--  // gracefully closed.
--  static const char kNoWindow[];
--  // --reporter=<string>
--  // Allows to specify a custom string that appears on the detail crash report
--  // page in the crash server. This should be a 25 chars or less string.
--  // The default tag if not specified is 'crash svc'.
--  static const char kReporterTag[];
--  // --dumps-dir=<directory-path>
--  // Override the directory to which crash dump files will be written.
--  static const char kDumpsDir[];
--  // --pipe-name=<string>
--  // Override the name of the Windows named pipe on which we will
--  // listen for crash dump request messages.
--  static const char kPipeName[];
--  // --reporter-url=<string>
--  // Override the URL to which crash reports will be sent to.
--  static const char kReporterURL[];
--
--  // Returns number of crash dumps handled.
--  int requests_handled() const { return requests_handled_; }
--  // Returns number of crash clients registered.
--  int clients_connected() const { return clients_connected_; }
--  // Returns number of crash clients terminated.
--  int clients_terminated() const { return clients_terminated_; }
--
--  // Starts the processing loop. This function does not return unless the
--  // user is logging off or the user closes the crash service window. The
--  // return value is a good number to pass in ExitProcess().
--  int ProcessingLoop();
--
-- private:
--  static void OnClientConnected(void* context,
--                                const google_breakpad::ClientInfo* client_info);
--
--  static void OnClientDumpRequest(
--      void* context,
--      const google_breakpad::ClientInfo* client_info,
--      const std::wstring* file_path);
--
--  static void OnClientExited(void* context,
--                             const google_breakpad::ClientInfo* client_info);
--
--  // This routine sends the crash dump to the server. It takes the sending_
--  // lock when it is performing the send.
--  static DWORD __stdcall AsyncSendDump(void* context);
--
--  // Returns the security descriptor which access to low integrity processes
--  // The caller is supposed to free the security descriptor by calling
--  // LocalFree.
--  PSECURITY_DESCRIPTOR GetSecurityDescriptorForLowIntegrity();
--
--  google_breakpad::CrashGenerationServer* dumper_ = nullptr;
--  google_breakpad::CrashReportSender* sender_ = nullptr;
--
--  // the extra tag sent to the server with each dump.
--  std::wstring reporter_tag_;
--
--  // receiver URL of crash reports.
--  std::wstring reporter_url_;
--
--  // clients serviced statistics:
--  int requests_handled_ = 0;
--  int requests_sent_ = 0;
--  volatile LONG clients_connected_ = 0;
--  volatile LONG clients_terminated_ = 0;
--  base::Lock sending_;
--
--  DISALLOW_COPY_AND_ASSIGN(CrashService);
--};
--
--}  // namespace breakpad
--
--#endif  // ATOM_COMMON_CRASH_REPORTER_WIN_CRASH_SERVICE_H_
-removed in remote
-  base   100644 56d46970b67f7843328e291f15ab07ddead8aced atom/common/crash_reporter/win/crash_service_main.cc
-  our    100644 c25ee858de0b5fd87229f3cfd658f7dd3e4f90c6 atom/common/crash_reporter/win/crash_service_main.cc
-@@ -1,104 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/common/crash_reporter/win/crash_service_main.h"
--
--#include "atom/common/crash_reporter/win/crash_service.h"
--#include "base/at_exit.h"
--#include "base/command_line.h"
--#include "base/files/file_util.h"
--#include "base/logging.h"
--#include "base/strings/string_util.h"
--
--namespace crash_service {
--
--namespace {
--
--const char kApplicationName[] = "application-name";
--const char kCrashesDirectory[] = "crashes-directory";
--
--const wchar_t kPipeNameFormat[] = L"\\\\.\\pipe\\$1 Crash Service";
--const wchar_t kStandardLogFile[] = L"operation_log.txt";
--
--void InvalidParameterHandler(const wchar_t*,
--                             const wchar_t*,
--                             const wchar_t*,
--                             unsigned int,
--                             uintptr_t) {
--  // noop.
--}
--
--bool CreateCrashServiceDirectory(const base::FilePath& temp_dir) {
--  if (!base::PathExists(temp_dir)) {
--    if (!base::CreateDirectory(temp_dir))
--      return false;
--  }
--  return true;
--}
--
--}  // namespace.
--
--int Main(const wchar_t* cmd) {
--  // Ignore invalid parameter errors.
--  _set_invalid_parameter_handler(InvalidParameterHandler);
--
--  // Initialize all Chromium things.
--  base::AtExitManager exit_manager;
--  base::CommandLine::Init(0, NULL);
--  base::CommandLine& cmd_line = *base::CommandLine::ForCurrentProcess();
--
--  // Use the application's name as pipe name and output directory.
--  if (!cmd_line.HasSwitch(kApplicationName)) {
--    LOG(ERROR) << "Application's name must be specified with --"
--               << kApplicationName;
--    return 1;
--  }
--  std::wstring application_name =
--      cmd_line.GetSwitchValueNative(kApplicationName);
--
--  if (!cmd_line.HasSwitch(kCrashesDirectory)) {
--    LOG(ERROR) << "Crashes directory path must be specified with --"
--               << kCrashesDirectory;
--    return 1;
--  }
--
--  // We use/create a directory under the user's temp folder, for logging.
--  base::FilePath operating_dir(
--      cmd_line.GetSwitchValueNative(kCrashesDirectory));
--  CreateCrashServiceDirectory(operating_dir);
--  base::FilePath log_file = operating_dir.Append(kStandardLogFile);
--
--  // Logging to stderr (to help with debugging failures on the
--  // buildbots) and to a file.
--  logging::LoggingSettings settings;
--  settings.logging_dest = logging::LOG_TO_ALL;
--  settings.log_file = log_file.value().c_str();
--  logging::InitLogging(settings);
--  // Logging with pid, tid and timestamp.
--  logging::SetLogItems(true, true, true, false);
--
--  VLOG(1) << "Session start. cmdline is [" << cmd << "]";
--
--  // Setting the crash reporter.
--  base::string16 pipe_name =
--      base::ReplaceStringPlaceholders(kPipeNameFormat, application_name, NULL);
--  cmd_line.AppendSwitch("no-window");
--  cmd_line.AppendSwitchASCII("max-reports", "128");
--  cmd_line.AppendSwitchASCII("reporter", ATOM_PROJECT_NAME "-crash-service");
--  cmd_line.AppendSwitchNative("pipe-name", pipe_name);
--
--  breakpad::CrashService crash_service;
--  if (!crash_service.Initialize(application_name, operating_dir, operating_dir))
--    return 2;
--
--  VLOG(1) << "Ready to process crash requests";
--
--  // Enter the message loop.
--  int retv = crash_service.ProcessingLoop();
--  // Time to exit.
--  VLOG(1) << "Session end. return code is " << retv;
--  return retv;
--}
--
--}  // namespace crash_service
-removed in remote
-  base   100644 b536313dbc3213ab3c2666db50c80c1984ebace7 atom/common/crash_reporter/win/crash_service_main.h
-  our    100644 b536313dbc3213ab3c2666db50c80c1984ebace7 atom/common/crash_reporter/win/crash_service_main.h
-@@ -1,15 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_COMMON_CRASH_REPORTER_WIN_CRASH_SERVICE_MAIN_H_
--#define ATOM_COMMON_CRASH_REPORTER_WIN_CRASH_SERVICE_MAIN_H_
--
--namespace crash_service {
--
--// Program entry, should be called by main();
--int Main(const wchar_t* cmd_line);
--
--}  // namespace crash_service
--
--#endif  // ATOM_COMMON_CRASH_REPORTER_WIN_CRASH_SERVICE_MAIN_H_
-removed in remote
-  base   100644 f57719448a088e11cf173d69fb5b1dc17288e8e1 atom/common/draggable_region.cc
-  our    100644 a571b2edf2b2937f8a4ddf30fc42fc927792a749 atom/common/draggable_region.cc
-@@ -1,11 +0,0 @@
--// Copyright (c) 2012 The Chromium Authors. All rights reserved.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/common/draggable_region.h"
--
--namespace atom {
--
--DraggableRegion::DraggableRegion() : draggable(false) {}
--
--}  // namespace atom
-removed in remote
-  base   100644 a007c8cb9fe54c9ae25438437ea95dc790d4bc33 atom/common/draggable_region.h
-  our    100644 a007c8cb9fe54c9ae25438437ea95dc790d4bc33 atom/common/draggable_region.h
-@@ -1,21 +0,0 @@
--// Copyright (c) 2012 The Chromium Authors. All rights reserved.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_COMMON_DRAGGABLE_REGION_H_
--#define ATOM_COMMON_DRAGGABLE_REGION_H_
--
--#include "ui/gfx/geometry/rect.h"
--
--namespace atom {
--
--struct DraggableRegion {
--  bool draggable;
--  gfx::Rect bounds;
--
--  DraggableRegion();
--};
--
--}  // namespace atom
--
--#endif  // ATOM_COMMON_DRAGGABLE_REGION_H_
-removed in remote
-  base   100644 dc38272ec611ff47127cb7b4cc4e006a4eb9ac15 atom/common/google_api_key.h
-  our    100644 d27934595eac9e442564ab4b6e04c092ca92a605 atom/common/google_api_key.h
-@@ -1,17 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_COMMON_GOOGLE_API_KEY_H_
--#define ATOM_COMMON_GOOGLE_API_KEY_H_
--
--#ifndef GOOGLEAPIS_ENDPOINT
--#define GOOGLEAPIS_ENDPOINT \
--  "https://www.googleapis.com/geolocation/v1/geolocate?key="
--#endif
--
--#ifndef GOOGLEAPIS_API_KEY
--#define GOOGLEAPIS_API_KEY "AIzaSyAQfxPJiounkhOjODEO5ZieffeBv6yft2Q"
--#endif
--
--#endif  // ATOM_COMMON_GOOGLE_API_KEY_H_
-removed in remote
-  base   100644 d860bc0c46c767f57b3c57632ea055d105042b1f atom/common/keyboard_util.cc
-  our    100644 d0a12cb6d91b9688c1bed496e64d6bbaccaf244a atom/common/keyboard_util.cc
-@@ -1,325 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include <string>
--
--#include "atom/common/keyboard_util.h"
--#include "base/strings/string_number_conversions.h"
--#include "base/strings/string_util.h"
--#include "third_party/WebKit/public/platform/WebInputEvent.h"
--#include "ui/events/event_constants.h"
--
--namespace atom {
--
--namespace {
--
--// Return key code of the char, and also determine whether the SHIFT key is
--// pressed.
--ui::KeyboardCode KeyboardCodeFromCharCode(base::char16 c, bool* shifted) {
--  c = base::ToLowerASCII(c);
--  *shifted = false;
--  switch (c) {
--    case 0x08:
--      return ui::VKEY_BACK;
--    case 0x7F:
--      return ui::VKEY_DELETE;
--    case 0x09:
--      return ui::VKEY_TAB;
--    case 0x0D:
--      return ui::VKEY_RETURN;
--    case 0x1B:
--      return ui::VKEY_ESCAPE;
--    case ' ':
--      return ui::VKEY_SPACE;
--
--    case 'a':
--      return ui::VKEY_A;
--    case 'b':
--      return ui::VKEY_B;
--    case 'c':
--      return ui::VKEY_C;
--    case 'd':
--      return ui::VKEY_D;
--    case 'e':
--      return ui::VKEY_E;
--    case 'f':
--      return ui::VKEY_F;
--    case 'g':
--      return ui::VKEY_G;
--    case 'h':
--      return ui::VKEY_H;
--    case 'i':
--      return ui::VKEY_I;
--    case 'j':
--      return ui::VKEY_J;
--    case 'k':
--      return ui::VKEY_K;
--    case 'l':
--      return ui::VKEY_L;
--    case 'm':
--      return ui::VKEY_M;
--    case 'n':
--      return ui::VKEY_N;
--    case 'o':
--      return ui::VKEY_O;
--    case 'p':
--      return ui::VKEY_P;
--    case 'q':
--      return ui::VKEY_Q;
--    case 'r':
--      return ui::VKEY_R;
--    case 's':
--      return ui::VKEY_S;
--    case 't':
--      return ui::VKEY_T;
--    case 'u':
--      return ui::VKEY_U;
--    case 'v':
--      return ui::VKEY_V;
--    case 'w':
--      return ui::VKEY_W;
--    case 'x':
--      return ui::VKEY_X;
--    case 'y':
--      return ui::VKEY_Y;
--    case 'z':
--      return ui::VKEY_Z;
--
--    case ')':
--      *shifted = true;
--      FALLTHROUGH;
--    case '0':
--      return ui::VKEY_0;
--    case '!':
--      *shifted = true;
--      FALLTHROUGH;
--    case '1':
--      return ui::VKEY_1;
--    case '@':
--      *shifted = true;
--      FALLTHROUGH;
--    case '2':
--      return ui::VKEY_2;
--    case '#':
--      *shifted = true;
--      FALLTHROUGH;
--    case '3':
--      return ui::VKEY_3;
--    case '$':
--      *shifted = true;
--      FALLTHROUGH;
--    case '4':
--      return ui::VKEY_4;
--    case '%':
--      *shifted = true;
--      FALLTHROUGH;
--    case '5':
--      return ui::VKEY_5;
--    case '^':
--      *shifted = true;
--      FALLTHROUGH;
--    case '6':
--      return ui::VKEY_6;
--    case '&':
--      *shifted = true;
--      FALLTHROUGH;
--    case '7':
--      return ui::VKEY_7;
--    case '*':
--      *shifted = true;
--      FALLTHROUGH;
--    case '8':
--      return ui::VKEY_8;
--    case '(':
--      *shifted = true;
--      FALLTHROUGH;
--    case '9':
--      return ui::VKEY_9;
--
--    case ':':
--      *shifted = true;
--      FALLTHROUGH;
--    case ';':
--      return ui::VKEY_OEM_1;
--    case '+':
--      *shifted = true;
--      FALLTHROUGH;
--    case '=':
--      return ui::VKEY_OEM_PLUS;
--    case '<':
--      *shifted = true;
--      FALLTHROUGH;
--    case ',':
--      return ui::VKEY_OEM_COMMA;
--    case '_':
--      *shifted = true;
--      FALLTHROUGH;
--    case '-':
--      return ui::VKEY_OEM_MINUS;
--    case '>':
--      *shifted = true;
--      FALLTHROUGH;
--    case '.':
--      return ui::VKEY_OEM_PERIOD;
--    case '?':
--      *shifted = true;
--      FALLTHROUGH;
--    case '/':
--      return ui::VKEY_OEM_2;
--    case '~':
--      *shifted = true;
--      FALLTHROUGH;
--    case '`':
--      return ui::VKEY_OEM_3;
--    case '{':
--      *shifted = true;
--      FALLTHROUGH;
--    case '[':
--      return ui::VKEY_OEM_4;
--    case '|':
--      *shifted = true;
--      FALLTHROUGH;
--    case '\\':
--      return ui::VKEY_OEM_5;
--    case '}':
--      *shifted = true;
--      FALLTHROUGH;
--    case ']':
--      return ui::VKEY_OEM_6;
--    case '"':
--      *shifted = true;
--      FALLTHROUGH;
--    case '\'':
--      return ui::VKEY_OEM_7;
--
--    default:
--      return ui::VKEY_UNKNOWN;
--  }
--}
--
--// Return key code represented by |str|.
--ui::KeyboardCode KeyboardCodeFromKeyIdentifier(const std::string& s,
--                                               bool* shifted) {
--  std::string str = base::ToLowerASCII(s);
--  if (str == "ctrl" || str == "control") {
--    return ui::VKEY_CONTROL;
--  } else if (str == "super" || str == "cmd" || str == "command" ||
--             str == "meta") {
--    return ui::VKEY_COMMAND;
--  } else if (str == "commandorcontrol" || str == "cmdorctrl") {
--#if defined(OS_MACOSX)
--    return ui::VKEY_COMMAND;
--#else
--    return ui::VKEY_CONTROL;
--#endif
--  } else if (str == "alt" || str == "option") {
--    return ui::VKEY_MENU;
--  } else if (str == "shift") {
--    return ui::VKEY_SHIFT;
--  } else if (str == "altgr") {
--    return ui::VKEY_ALTGR;
--  } else if (str == "plus") {
--    *shifted = true;
--    return ui::VKEY_OEM_PLUS;
--  } else if (str == "tab") {
--    return ui::VKEY_TAB;
--  } else if (str == "space") {
--    return ui::VKEY_SPACE;
--  } else if (str == "backspace") {
--    return ui::VKEY_BACK;
--  } else if (str == "delete") {
--    return ui::VKEY_DELETE;
--  } else if (str == "insert") {
--    return ui::VKEY_INSERT;
--  } else if (str == "enter" || str == "return") {
--    return ui::VKEY_RETURN;
--  } else if (str == "up") {
--    return ui::VKEY_UP;
--  } else if (str == "down") {
--    return ui::VKEY_DOWN;
--  } else if (str == "left") {
--    return ui::VKEY_LEFT;
--  } else if (str == "right") {
--    return ui::VKEY_RIGHT;
--  } else if (str == "home") {
--    return ui::VKEY_HOME;
--  } else if (str == "end") {
--    return ui::VKEY_END;
--  } else if (str == "pageup") {
--    return ui::VKEY_PRIOR;
--  } else if (str == "pagedown") {
--    return ui::VKEY_NEXT;
--  } else if (str == "esc" || str == "escape") {
--    return ui::VKEY_ESCAPE;
--  } else if (str == "volumemute") {
--    return ui::VKEY_VOLUME_MUTE;
--  } else if (str == "volumeup") {
--    return ui::VKEY_VOLUME_UP;
--  } else if (str == "volumedown") {
--    return ui::VKEY_VOLUME_DOWN;
--  } else if (str == "medianexttrack") {
--    return ui::VKEY_MEDIA_NEXT_TRACK;
--  } else if (str == "mediaprevioustrack") {
--    return ui::VKEY_MEDIA_PREV_TRACK;
--  } else if (str == "mediastop") {
--    return ui::VKEY_MEDIA_STOP;
--  } else if (str == "mediaplaypause") {
--    return ui::VKEY_MEDIA_PLAY_PAUSE;
--  } else if (str == "printscreen") {
--    return ui::VKEY_SNAPSHOT;
--  } else if (str.size() > 1 && str[0] == 'f') {
--    // F1 - F24.
--    int n;
--    if (base::StringToInt(str.c_str() + 1, &n) && n > 0 && n < 25) {
--      return static_cast<ui::KeyboardCode>(ui::VKEY_F1 + n - 1);
--    } else {
--      LOG(WARNING) << str << "is not available on keyboard";
--      return ui::VKEY_UNKNOWN;
--    }
--  } else {
--    if (str.size() > 2)
--      LOG(WARNING) << "Invalid accelerator token: " << str;
--    return ui::VKEY_UNKNOWN;
--  }
--}
--
--}  // namespace
--
--ui::KeyboardCode KeyboardCodeFromStr(const std::string& str, bool* shifted) {
--  if (str.size() == 1)
--    return KeyboardCodeFromCharCode(str[0], shifted);
--  else
--    return KeyboardCodeFromKeyIdentifier(str, shifted);
--}
--
--int WebEventModifiersToEventFlags(int modifiers) {
--  int flags = 0;
--
--  if (modifiers & blink::WebInputEvent::kShiftKey)
--    flags |= ui::EF_SHIFT_DOWN;
--  if (modifiers & blink::WebInputEvent::kControlKey)
--    flags |= ui::EF_CONTROL_DOWN;
--  if (modifiers & blink::WebInputEvent::kAltKey)
--    flags |= ui::EF_ALT_DOWN;
--  if (modifiers & blink::WebInputEvent::kMetaKey)
--    flags |= ui::EF_COMMAND_DOWN;
--  if (modifiers & blink::WebInputEvent::kCapsLockOn)
--    flags |= ui::EF_CAPS_LOCK_ON;
--  if (modifiers & blink::WebInputEvent::kNumLockOn)
--    flags |= ui::EF_NUM_LOCK_ON;
--  if (modifiers & blink::WebInputEvent::kScrollLockOn)
--    flags |= ui::EF_SCROLL_LOCK_ON;
--  if (modifiers & blink::WebInputEvent::kLeftButtonDown)
--    flags |= ui::EF_LEFT_MOUSE_BUTTON;
--  if (modifiers & blink::WebInputEvent::kMiddleButtonDown)
--    flags |= ui::EF_MIDDLE_MOUSE_BUTTON;
--  if (modifiers & blink::WebInputEvent::kRightButtonDown)
--    flags |= ui::EF_RIGHT_MOUSE_BUTTON;
--  if (modifiers & blink::WebInputEvent::kIsAutoRepeat)
--    flags |= ui::EF_IS_REPEAT;
--
--  return flags;
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 c9d1b809e8f7cebf3b0fea0cded6d09364ee20e1 atom/common/keyboard_util.h
-  our    100644 651cf6a92024cc06d7d0e044efda744e70848479 atom/common/keyboard_util.h
-@@ -1,23 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_COMMON_KEYBOARD_UTIL_H_
--#define ATOM_COMMON_KEYBOARD_UTIL_H_
--
--#include <string>
--
--#include "ui/events/keycodes/keyboard_codes.h"
--
--namespace atom {
--
--// Return key code of the |str|, and also determine whether the SHIFT key is
--// pressed.
--ui::KeyboardCode KeyboardCodeFromStr(const std::string& str, bool* shifted);
--
--// Ported from ui/events/blink/blink_event_util.h
--int WebEventModifiersToEventFlags(int modifiers);
--
--}  // namespace atom
--
--#endif  // ATOM_COMMON_KEYBOARD_UTIL_H_
-removed in remote
-  base   100644 053bd4bb8634ccdc9903ec18cffa8ecdce410eaa atom/common/linux/application_info.cc
-  our    100644 3354c73b8b60f77cf054f975ea713d96b7e7683e atom/common/linux/application_info.cc
-@@ -1,79 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "brightray/common/application_info.h"
--
--#include <gio/gdesktopappinfo.h>
--#include <gio/gio.h>
--
--#include <memory>
--#include <string>
--
--#include "atom/common/atom_version.h"
--#include "base/environment.h"
--#include "base/logging.h"
--#include "brightray/common/platform_util.h"
--#include "chrome/browser/ui/libgtkui/gtk_util.h"
--
--namespace {
--
--GDesktopAppInfo* get_desktop_app_info() {
--  GDesktopAppInfo* ret = nullptr;
--
--  std::string desktop_id;
--  if (brightray::platform_util::GetDesktopName(&desktop_id))
--    ret = g_desktop_app_info_new(desktop_id.c_str());
--
--  return ret;
--}
--
--}  // namespace
--
--namespace brightray {
--
--std::string GetApplicationName() {
--  // attempt #1: the string set in app.setName()
--  std::string ret = GetOverriddenApplicationName();
--
--  // attempt #2: the 'Name' entry from .desktop file's [Desktop] section
--  if (ret.empty()) {
--    GDesktopAppInfo* info = get_desktop_app_info();
--    if (info != nullptr) {
--      char* str = g_desktop_app_info_get_string(info, "Name");
--      g_clear_object(&info);
--      if (str != nullptr)
--        ret = str;
--      g_clear_pointer(&str, g_free);
--    }
--  }
--
--  // attempt #3: Electron's name
--  if (ret.empty()) {
--    ret = ATOM_PRODUCT_NAME;
--  }
--
--  return ret;
--}
--
--std::string GetApplicationVersion() {
--  std::string ret;
--
--  // ensure ATOM_PRODUCT_NAME and ATOM_PRODUCT_STRING match up
--  if (GetApplicationName() == ATOM_PRODUCT_NAME)
--    ret = ATOM_VERSION_STRING;
--
--  // try to use the string set in app.setVersion()
--  if (ret.empty())
--    ret = GetOverriddenApplicationVersion();
--
--  // no known version number; return some safe fallback
--  if (ret.empty()) {
--    LOG(WARNING) << "No version found. Was app.setVersion() called?";
--    ret = "0.0";
--  }
--
--  return ret;
--}
--
--}  // namespace brightray
-removed in remote
-  base   100644 69aadaa7a0464fc43e72d6826aad7ac513b39c24 atom/common/mouse_util.cc
-  our    100644 d87be5b504e153e06dfd38965e262c6d630853a9 atom/common/mouse_util.cc
-@@ -1,107 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/common/mouse_util.h"
--#include <string>
--
--using Cursor = blink::WebCursorInfo::Type;
--
--namespace atom {
--
--std::string CursorTypeToString(const content::CursorInfo& info) {
--  switch (info.type) {
--    case Cursor::kTypePointer:
--      return "default";
--    case Cursor::kTypeCross:
--      return "crosshair";
--    case Cursor::kTypeHand:
--      return "pointer";
--    case Cursor::kTypeIBeam:
--      return "text";
--    case Cursor::kTypeWait:
--      return "wait";
--    case Cursor::kTypeHelp:
--      return "help";
--    case Cursor::kTypeEastResize:
--      return "e-resize";
--    case Cursor::kTypeNorthResize:
--      return "n-resize";
--    case Cursor::kTypeNorthEastResize:
--      return "ne-resize";
--    case Cursor::kTypeNorthWestResize:
--      return "nw-resize";
--    case Cursor::kTypeSouthResize:
--      return "s-resize";
--    case Cursor::kTypeSouthEastResize:
--      return "se-resize";
--    case Cursor::kTypeSouthWestResize:
--      return "sw-resize";
--    case Cursor::kTypeWestResize:
--      return "w-resize";
--    case Cursor::kTypeNorthSouthResize:
--      return "ns-resize";
--    case Cursor::kTypeEastWestResize:
--      return "ew-resize";
--    case Cursor::kTypeNorthEastSouthWestResize:
--      return "nesw-resize";
--    case Cursor::kTypeNorthWestSouthEastResize:
--      return "nwse-resize";
--    case Cursor::kTypeColumnResize:
--      return "col-resize";
--    case Cursor::kTypeRowResize:
--      return "row-resize";
--    case Cursor::kTypeMiddlePanning:
--      return "m-panning";
--    case Cursor::kTypeEastPanning:
--      return "e-panning";
--    case Cursor::kTypeNorthPanning:
--      return "n-panning";
--    case Cursor::kTypeNorthEastPanning:
--      return "ne-panning";
--    case Cursor::kTypeNorthWestPanning:
--      return "nw-panning";
--    case Cursor::kTypeSouthPanning:
--      return "s-panning";
--    case Cursor::kTypeSouthEastPanning:
--      return "se-panning";
--    case Cursor::kTypeSouthWestPanning:
--      return "sw-panning";
--    case Cursor::kTypeWestPanning:
--      return "w-panning";
--    case Cursor::kTypeMove:
--      return "move";
--    case Cursor::kTypeVerticalText:
--      return "vertical-text";
--    case Cursor::kTypeCell:
--      return "cell";
--    case Cursor::kTypeContextMenu:
--      return "context-menu";
--    case Cursor::kTypeAlias:
--      return "alias";
--    case Cursor::kTypeProgress:
--      return "progress";
--    case Cursor::kTypeNoDrop:
--      return "nodrop";
--    case Cursor::kTypeCopy:
--      return "copy";
--    case Cursor::kTypeNone:
--      return "none";
--    case Cursor::kTypeNotAllowed:
--      return "not-allowed";
--    case Cursor::kTypeZoomIn:
--      return "zoom-in";
--    case Cursor::kTypeZoomOut:
--      return "zoom-out";
--    case Cursor::kTypeGrab:
--      return "grab";
--    case Cursor::kTypeGrabbing:
--      return "grabbing";
--    case Cursor::kTypeCustom:
--      return "custom";
--    default:
--      return "default";
--  }
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 2fd937422dacbe184712e341fdb0c22d4fd1d7e0 atom/common/mouse_util.h
-  our    100644 efc70eeb7bdfce0d8f4668c57f642b90e08769d4 atom/common/mouse_util.h
-@@ -1,34 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_COMMON_MOUSE_UTIL_H_
--#define ATOM_COMMON_MOUSE_UTIL_H_
--
--#include <string>
--#include "content/common/cursors/webcursor.h"
--#include "ipc/ipc_message_macros.h"
--
--// IPC macros similar to the already existing ones in the chromium source.
--// We need these to listen to the cursor change IPC message while still
--// letting chromium handle the actual cursor change by setting handled = false.
--#define IPC_MESSAGE_HANDLER_CODE(msg_class, member_func, code) \
--  IPC_MESSAGE_FORWARD_CODE(msg_class, this,                    \
--                           _IpcMessageHandlerClass::member_func, code)
--
--#define IPC_MESSAGE_FORWARD_CODE(msg_class, obj, member_func, code) \
--  case msg_class::ID: {                                             \
--    if (!msg_class::Dispatch(&ipc_message__, obj, this, param__,    \
--                             &member_func))                         \
--      ipc_message__.set_dispatch_error();                           \
--    code;                                                           \
--  } break;
--
--namespace atom {
--
--// Returns the cursor's type as a string.
--std::string CursorTypeToString(const content::CursorInfo& info);
--
--}  // namespace atom
--
--#endif  // ATOM_COMMON_MOUSE_UTIL_H_
-removed in remote
-  base   100644 15eaafda2e3d51815f1398f6e510c0787d2bdf25 atom/common/native_mate_converters/accelerator_converter.cc
-  our    100644 0958308871175b0afaa9f3ed450d77b437a0d317 atom/common/native_mate_converters/accelerator_converter.cc
-@@ -1,23 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/common/native_mate_converters/accelerator_converter.h"
--
--#include <string>
--
--#include "atom/browser/ui/accelerator_util.h"
--
--namespace mate {
--
--// static
--bool Converter<ui::Accelerator>::FromV8(v8::Isolate* isolate,
--                                        v8::Local<v8::Value> val,
--                                        ui::Accelerator* out) {
--  std::string keycode;
--  if (!ConvertFromV8(isolate, val, &keycode))
--    return false;
--  return accelerator_util::StringToAccelerator(keycode, out);
--}
--
--}  // namespace mate
-removed in remote
-  base   100644 499077c08e287e6084356f0f216a54264d628f57 atom/common/native_mate_converters/accelerator_converter.h
-  our    100644 f2f6b56e9851883fa45f0e0566de7318cc288f67 atom/common/native_mate_converters/accelerator_converter.h
-@@ -1,25 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_COMMON_NATIVE_MATE_CONVERTERS_ACCELERATOR_CONVERTER_H_
--#define ATOM_COMMON_NATIVE_MATE_CONVERTERS_ACCELERATOR_CONVERTER_H_
--
--#include "native_mate/converter.h"
--
--namespace ui {
--class Accelerator;
--}
--
--namespace mate {
--
--template <>
--struct Converter<ui::Accelerator> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     ui::Accelerator* out);
--};
--
--}  // namespace mate
--
--#endif  // ATOM_COMMON_NATIVE_MATE_CONVERTERS_ACCELERATOR_CONVERTER_H_
-removed in remote
-  base   100644 c58f830eb02e68eb2d06889cd026dbd3768673f2 atom/common/native_mate_converters/blink_converter.cc
-  our    100644 f52ec9af2e405f3969453ac22cb402436610c317 atom/common/native_mate_converters/blink_converter.cc
-@@ -1,544 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/common/native_mate_converters/blink_converter.h"
--
--#include <algorithm>
--#include <string>
--#include <vector>
--
--#include "atom/common/keyboard_util.h"
--#include "base/strings/string_util.h"
--#include "base/strings/utf_string_conversions.h"
--#include "content/public/browser/native_web_keyboard_event.h"
--#include "native_mate/dictionary.h"
--#include "third_party/WebKit/public/platform/WebInputEvent.h"
--#include "third_party/WebKit/public/platform/WebMouseEvent.h"
--#include "third_party/WebKit/public/platform/WebMouseWheelEvent.h"
--#include "third_party/WebKit/public/web/WebDeviceEmulationParams.h"
--#include "third_party/WebKit/public/web/WebFindOptions.h"
--#include "ui/base/clipboard/clipboard.h"
--#include "ui/events/keycodes/dom/keycode_converter.h"
--#include "ui/events/keycodes/keyboard_code_conversion.h"
--
--namespace {
--
--template <typename T>
--int VectorToBitArray(const std::vector<T>& vec) {
--  int bits = 0;
--  for (const T& item : vec)
--    bits |= item;
--  return bits;
--}
--
--}  // namespace
--
--namespace mate {
--
--template <>
--struct Converter<base::char16> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Handle<v8::Value> val,
--                     base::char16* out) {
--    base::string16 code = base::UTF8ToUTF16(V8ToString(val));
--    if (code.length() != 1)
--      return false;
--    *out = code[0];
--    return true;
--  }
--};
--
--template <>
--struct Converter<blink::WebInputEvent::Type> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Handle<v8::Value> val,
--                     blink::WebInputEvent::Type* out) {
--    std::string type = base::ToLowerASCII(V8ToString(val));
--    if (type == "mousedown")
--      *out = blink::WebInputEvent::kMouseDown;
--    else if (type == "mouseup")
--      *out = blink::WebInputEvent::kMouseUp;
--    else if (type == "mousemove")
--      *out = blink::WebInputEvent::kMouseMove;
--    else if (type == "mouseenter")
--      *out = blink::WebInputEvent::kMouseEnter;
--    else if (type == "mouseleave")
--      *out = blink::WebInputEvent::kMouseLeave;
--    else if (type == "contextmenu")
--      *out = blink::WebInputEvent::kContextMenu;
--    else if (type == "mousewheel")
--      *out = blink::WebInputEvent::kMouseWheel;
--    else if (type == "keydown")
--      *out = blink::WebInputEvent::kRawKeyDown;
--    else if (type == "keyup")
--      *out = blink::WebInputEvent::kKeyUp;
--    else if (type == "char")
--      *out = blink::WebInputEvent::kChar;
--    else if (type == "touchstart")
--      *out = blink::WebInputEvent::kTouchStart;
--    else if (type == "touchmove")
--      *out = blink::WebInputEvent::kTouchMove;
--    else if (type == "touchend")
--      *out = blink::WebInputEvent::kTouchEnd;
--    else if (type == "touchcancel")
--      *out = blink::WebInputEvent::kTouchCancel;
--    return true;
--  }
--};
--
--template <>
--struct Converter<blink::WebMouseEvent::Button> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Handle<v8::Value> val,
--                     blink::WebMouseEvent::Button* out) {
--    std::string button = base::ToLowerASCII(V8ToString(val));
--    if (button == "left")
--      *out = blink::WebMouseEvent::Button::kLeft;
--    else if (button == "middle")
--      *out = blink::WebMouseEvent::Button::kMiddle;
--    else if (button == "right")
--      *out = blink::WebMouseEvent::Button::kRight;
--    else
--      return false;
--    return true;
--  }
--};
--
--template <>
--struct Converter<blink::WebInputEvent::Modifiers> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Handle<v8::Value> val,
--                     blink::WebInputEvent::Modifiers* out) {
--    std::string modifier = base::ToLowerASCII(V8ToString(val));
--    if (modifier == "shift")
--      *out = blink::WebInputEvent::kShiftKey;
--    else if (modifier == "control" || modifier == "ctrl")
--      *out = blink::WebInputEvent::kControlKey;
--    else if (modifier == "alt")
--      *out = blink::WebInputEvent::kAltKey;
--    else if (modifier == "meta" || modifier == "command" || modifier == "cmd")
--      *out = blink::WebInputEvent::kMetaKey;
--    else if (modifier == "iskeypad")
--      *out = blink::WebInputEvent::kIsKeyPad;
--    else if (modifier == "isautorepeat")
--      *out = blink::WebInputEvent::kIsAutoRepeat;
--    else if (modifier == "leftbuttondown")
--      *out = blink::WebInputEvent::kLeftButtonDown;
--    else if (modifier == "middlebuttondown")
--      *out = blink::WebInputEvent::kMiddleButtonDown;
--    else if (modifier == "rightbuttondown")
--      *out = blink::WebInputEvent::kRightButtonDown;
--    else if (modifier == "capslock")
--      *out = blink::WebInputEvent::kCapsLockOn;
--    else if (modifier == "numlock")
--      *out = blink::WebInputEvent::kNumLockOn;
--    else if (modifier == "left")
--      *out = blink::WebInputEvent::kIsLeft;
--    else if (modifier == "right")
--      *out = blink::WebInputEvent::kIsRight;
--    return true;
--  }
--};
--
--blink::WebInputEvent::Type GetWebInputEventType(v8::Isolate* isolate,
--                                                v8::Local<v8::Value> val) {
--  blink::WebInputEvent::Type type = blink::WebInputEvent::kUndefined;
--  mate::Dictionary dict;
--  ConvertFromV8(isolate, val, &dict) && dict.Get("type", &type);
--  return type;
--}
--
--bool Converter<blink::WebInputEvent>::FromV8(v8::Isolate* isolate,
--                                             v8::Local<v8::Value> val,
--                                             blink::WebInputEvent* out) {
--  mate::Dictionary dict;
--  if (!ConvertFromV8(isolate, val, &dict))
--    return false;
--  blink::WebInputEvent::Type type;
--  if (!dict.Get("type", &type))
--    return false;
--  out->SetType(type);
--  std::vector<blink::WebInputEvent::Modifiers> modifiers;
--  if (dict.Get("modifiers", &modifiers))
--    out->SetModifiers(VectorToBitArray(modifiers));
--  out->SetTimeStampSeconds(base::Time::Now().ToDoubleT());
--  return true;
--}
--
--bool Converter<blink::WebKeyboardEvent>::FromV8(v8::Isolate* isolate,
--                                                v8::Local<v8::Value> val,
--                                                blink::WebKeyboardEvent* out) {
--  mate::Dictionary dict;
--  if (!ConvertFromV8(isolate, val, &dict))
--    return false;
--  if (!ConvertFromV8(isolate, val, static_cast<blink::WebInputEvent*>(out)))
--    return false;
--
--  std::string str;
--  if (!dict.Get("keyCode", &str))
--    return false;
--
--  bool shifted = false;
--  ui::KeyboardCode keyCode = atom::KeyboardCodeFromStr(str, &shifted);
--  out->windows_key_code = keyCode;
--  if (shifted)
--    out->SetModifiers(out->GetModifiers() | blink::WebInputEvent::kShiftKey);
--
--  ui::DomCode domCode = ui::UsLayoutKeyboardCodeToDomCode(keyCode);
--  out->dom_code = static_cast<int>(domCode);
--
--  ui::DomKey domKey;
--  ui::KeyboardCode dummy_code;
--  int flags = atom::WebEventModifiersToEventFlags(out->GetModifiers());
--  if (ui::DomCodeToUsLayoutDomKey(domCode, flags, &domKey, &dummy_code))
--    out->dom_key = static_cast<int>(domKey);
--
--  if ((out->GetType() == blink::WebInputEvent::kChar ||
--       out->GetType() == blink::WebInputEvent::kRawKeyDown)) {
--    // Make sure to not read beyond the buffer in case some bad code doesn't
--    // NULL-terminate it (this is called from plugins).
--    size_t text_length_cap = blink::WebKeyboardEvent::kTextLengthCap;
--    base::string16 text16 = base::UTF8ToUTF16(str);
--
--    memset(out->text, 0, text_length_cap);
--    memset(out->unmodified_text, 0, text_length_cap);
--    for (size_t i = 0; i < std::min(text_length_cap, text16.size()); ++i) {
--      out->text[i] = text16[i];
--      out->unmodified_text[i] = text16[i];
--    }
--  }
--  return true;
--}
--
--bool Converter<content::NativeWebKeyboardEvent>::FromV8(
--    v8::Isolate* isolate,
--    v8::Local<v8::Value> val,
--    content::NativeWebKeyboardEvent* out) {
--  mate::Dictionary dict;
--  if (!ConvertFromV8(isolate, val, &dict))
--    return false;
--  if (!ConvertFromV8(isolate, val, static_cast<blink::WebKeyboardEvent*>(out)))
--    return false;
--  dict.Get("skipInBrowser", &out->skip_in_browser);
--  return true;
--}
--
--v8::Local<v8::Value> Converter<content::NativeWebKeyboardEvent>::ToV8(
--    v8::Isolate* isolate,
--    const content::NativeWebKeyboardEvent& in) {
--  mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
--
--  if (in.GetType() == blink::WebInputEvent::Type::kRawKeyDown)
--    dict.Set("type", "keyDown");
--  else if (in.GetType() == blink::WebInputEvent::Type::kKeyUp)
--    dict.Set("type", "keyUp");
--  dict.Set("key", ui::KeycodeConverter::DomKeyToKeyString(in.dom_key));
--  dict.Set("code", ui::KeycodeConverter::DomCodeToCodeString(
--                       static_cast<ui::DomCode>(in.dom_code)));
--
--  using Modifiers = blink::WebInputEvent::Modifiers;
--  dict.Set("isAutoRepeat", (in.GetModifiers() & Modifiers::kIsAutoRepeat) != 0);
--  dict.Set("shift", (in.GetModifiers() & Modifiers::kShiftKey) != 0);
--  dict.Set("control", (in.GetModifiers() & Modifiers::kControlKey) != 0);
--  dict.Set("alt", (in.GetModifiers() & Modifiers::kAltKey) != 0);
--  dict.Set("meta", (in.GetModifiers() & Modifiers::kMetaKey) != 0);
--
--  return dict.GetHandle();
--}
--
--bool Converter<blink::WebMouseEvent>::FromV8(v8::Isolate* isolate,
--                                             v8::Local<v8::Value> val,
--                                             blink::WebMouseEvent* out) {
--  mate::Dictionary dict;
--  if (!ConvertFromV8(isolate, val, &dict))
--    return false;
--  if (!ConvertFromV8(isolate, val, static_cast<blink::WebInputEvent*>(out)))
--    return false;
--
--  float x = 0.f;
--  float y = 0.f;
--  if (!dict.Get("x", &x) || !dict.Get("y", &y))
--    return false;
--  out->SetPositionInWidget(x, y);
--
--  if (!dict.Get("button", &out->button))
--    out->button = blink::WebMouseEvent::Button::kLeft;
--
--  float global_x = 0.f;
--  float global_y = 0.f;
--  dict.Get("globalX", &global_x);
--  dict.Get("globalY", &global_y);
--  out->SetPositionInScreen(global_x, global_y);
--
--  dict.Get("movementX", &out->movement_x);
--  dict.Get("movementY", &out->movement_y);
--  dict.Get("clickCount", &out->click_count);
--  return true;
--}
--
--bool Converter<blink::WebMouseWheelEvent>::FromV8(
--    v8::Isolate* isolate,
--    v8::Local<v8::Value> val,
--    blink::WebMouseWheelEvent* out) {
--  mate::Dictionary dict;
--  if (!ConvertFromV8(isolate, val, &dict))
--    return false;
--  if (!ConvertFromV8(isolate, val, static_cast<blink::WebMouseEvent*>(out)))
--    return false;
--  dict.Get("deltaX", &out->delta_x);
--  dict.Get("deltaY", &out->delta_y);
--  dict.Get("wheelTicksX", &out->wheel_ticks_x);
--  dict.Get("wheelTicksY", &out->wheel_ticks_y);
--  dict.Get("accelerationRatioX", &out->acceleration_ratio_x);
--  dict.Get("accelerationRatioY", &out->acceleration_ratio_y);
--  dict.Get("hasPreciseScrollingDeltas", &out->has_precise_scrolling_deltas);
--
--#if defined(USE_AURA)
--  // Matches the behavior of ui/events/blink/web_input_event_traits.cc:
--  bool can_scroll = true;
--  if (dict.Get("canScroll", &can_scroll) && !can_scroll) {
--    out->has_precise_scrolling_deltas = false;
--    out->SetModifiers(out->GetModifiers() & ~blink::WebInputEvent::kControlKey);
--  }
--#endif
--  return true;
--}
--
--bool Converter<blink::WebFloatPoint>::FromV8(v8::Isolate* isolate,
--                                             v8::Local<v8::Value> val,
--                                             blink::WebFloatPoint* out) {
--  mate::Dictionary dict;
--  if (!ConvertFromV8(isolate, val, &dict))
--    return false;
--  return dict.Get("x", &out->x) && dict.Get("y", &out->y);
--}
--
--template <>
--struct Converter<base::Optional<blink::WebPoint>> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     base::Optional<blink::WebPoint>* out) {
--    mate::Dictionary dict;
--    if (!ConvertFromV8(isolate, val, &dict))
--      return false;
--    blink::WebPoint point;
--    bool success = dict.Get("x", &point.x) && dict.Get("y", &point.y);
--    if (!success)
--      return false;
--    out->emplace(point);
--    return true;
--  }
--};
--
--bool Converter<blink::WebSize>::FromV8(v8::Isolate* isolate,
--                                       v8::Local<v8::Value> val,
--                                       blink::WebSize* out) {
--  mate::Dictionary dict;
--  if (!ConvertFromV8(isolate, val, &dict))
--    return false;
--  return dict.Get("width", &out->width) && dict.Get("height", &out->height);
--}
--
--bool Converter<blink::WebDeviceEmulationParams>::FromV8(
--    v8::Isolate* isolate,
--    v8::Local<v8::Value> val,
--    blink::WebDeviceEmulationParams* out) {
--  mate::Dictionary dict;
--  if (!ConvertFromV8(isolate, val, &dict))
--    return false;
--
--  std::string screen_position;
--  if (dict.Get("screenPosition", &screen_position)) {
--    screen_position = base::ToLowerASCII(screen_position);
--    if (screen_position == "mobile")
--      out->screen_position = blink::WebDeviceEmulationParams::kMobile;
--    else if (screen_position == "desktop")
--      out->screen_position = blink::WebDeviceEmulationParams::kDesktop;
--    else
--      return false;
--  }
--
--  dict.Get("screenSize", &out->screen_size);
--  dict.Get("viewPosition", &out->view_position);
--  dict.Get("deviceScaleFactor", &out->device_scale_factor);
--  dict.Get("viewSize", &out->view_size);
--  dict.Get("scale", &out->scale);
--  return true;
--}
--
--bool Converter<blink::WebFindOptions>::FromV8(v8::Isolate* isolate,
--                                              v8::Local<v8::Value> val,
--                                              blink::WebFindOptions* out) {
--  mate::Dictionary dict;
--  if (!ConvertFromV8(isolate, val, &dict))
--    return false;
--
--  dict.Get("forward", &out->forward);
--  dict.Get("matchCase", &out->match_case);
--  dict.Get("findNext", &out->find_next);
--  dict.Get("wordStart", &out->word_start);
--  dict.Get("medialCapitalAsWordStart", &out->medial_capital_as_word_start);
--  return true;
--}
--
--// static
--v8::Local<v8::Value> Converter<blink::WebContextMenuData::MediaType>::ToV8(
--    v8::Isolate* isolate,
--    const blink::WebContextMenuData::MediaType& in) {
--  switch (in) {
--    case blink::WebContextMenuData::kMediaTypeImage:
--      return mate::StringToV8(isolate, "image");
--    case blink::WebContextMenuData::kMediaTypeVideo:
--      return mate::StringToV8(isolate, "video");
--    case blink::WebContextMenuData::kMediaTypeAudio:
--      return mate::StringToV8(isolate, "audio");
--    case blink::WebContextMenuData::kMediaTypeCanvas:
--      return mate::StringToV8(isolate, "canvas");
--    case blink::WebContextMenuData::kMediaTypeFile:
--      return mate::StringToV8(isolate, "file");
--    case blink::WebContextMenuData::kMediaTypePlugin:
--      return mate::StringToV8(isolate, "plugin");
--    default:
--      return mate::StringToV8(isolate, "none");
--  }
--}
--
--// static
--v8::Local<v8::Value> Converter<blink::WebContextMenuData::InputFieldType>::ToV8(
--    v8::Isolate* isolate,
--    const blink::WebContextMenuData::InputFieldType& in) {
--  switch (in) {
--    case blink::WebContextMenuData::kInputFieldTypePlainText:
--      return mate::StringToV8(isolate, "plainText");
--    case blink::WebContextMenuData::kInputFieldTypePassword:
--      return mate::StringToV8(isolate, "password");
--    case blink::WebContextMenuData::kInputFieldTypeOther:
--      return mate::StringToV8(isolate, "other");
--    default:
--      return mate::StringToV8(isolate, "none");
--  }
--}
--
--v8::Local<v8::Value> EditFlagsToV8(v8::Isolate* isolate, int editFlags) {
--  mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
--  dict.Set("canUndo", !!(editFlags & blink::WebContextMenuData::kCanUndo));
--  dict.Set("canRedo", !!(editFlags & blink::WebContextMenuData::kCanRedo));
--  dict.Set("canCut", !!(editFlags & blink::WebContextMenuData::kCanCut));
--  dict.Set("canCopy", !!(editFlags & blink::WebContextMenuData::kCanCopy));
--
--  bool pasteFlag = false;
--  if (editFlags & blink::WebContextMenuData::kCanPaste) {
--    std::vector<base::string16> types;
--    bool ignore;
--    ui::Clipboard::GetForCurrentThread()->ReadAvailableTypes(
--        ui::CLIPBOARD_TYPE_COPY_PASTE, &types, &ignore);
--    pasteFlag = !types.empty();
--  }
--  dict.Set("canPaste", pasteFlag);
--
--  dict.Set("canDelete", !!(editFlags & blink::WebContextMenuData::kCanDelete));
--  dict.Set("canSelectAll",
--           !!(editFlags & blink::WebContextMenuData::kCanSelectAll));
--
--  return mate::ConvertToV8(isolate, dict);
--}
--
--v8::Local<v8::Value> MediaFlagsToV8(v8::Isolate* isolate, int mediaFlags) {
--  mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
--  dict.Set("inError",
--           !!(mediaFlags & blink::WebContextMenuData::kMediaInError));
--  dict.Set("isPaused",
--           !!(mediaFlags & blink::WebContextMenuData::kMediaPaused));
--  dict.Set("isMuted", !!(mediaFlags & blink::WebContextMenuData::kMediaMuted));
--  dict.Set("hasAudio",
--           !!(mediaFlags & blink::WebContextMenuData::kMediaHasAudio));
--  dict.Set("isLooping",
--           (mediaFlags & blink::WebContextMenuData::kMediaLoop) != 0);
--  dict.Set("isControlsVisible",
--           (mediaFlags & blink::WebContextMenuData::kMediaControls) != 0);
--  dict.Set("canToggleControls",
--           !!(mediaFlags & blink::WebContextMenuData::kMediaCanToggleControls));
--  dict.Set("canRotate",
--           !!(mediaFlags & blink::WebContextMenuData::kMediaCanRotate));
--  return mate::ConvertToV8(isolate, dict);
--}
--
--v8::Local<v8::Value> Converter<blink::WebCache::ResourceTypeStat>::ToV8(
--    v8::Isolate* isolate,
--    const blink::WebCache::ResourceTypeStat& stat) {
--  mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
--  dict.Set("count", static_cast<uint32_t>(stat.count));
--  dict.Set("size", static_cast<double>(stat.size));
--  dict.Set("liveSize", static_cast<double>(stat.decoded_size));
--  return dict.GetHandle();
--}
--
--v8::Local<v8::Value> Converter<blink::WebCache::ResourceTypeStats>::ToV8(
--    v8::Isolate* isolate,
--    const blink::WebCache::ResourceTypeStats& stats) {
--  mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
--  dict.Set("images", stats.images);
--  dict.Set("scripts", stats.scripts);
--  dict.Set("cssStyleSheets", stats.css_style_sheets);
--  dict.Set("xslStyleSheets", stats.xsl_style_sheets);
--  dict.Set("fonts", stats.fonts);
--  dict.Set("other", stats.other);
--  return dict.GetHandle();
--}
--
--// static
--v8::Local<v8::Value> Converter<blink::WebReferrerPolicy>::ToV8(
--    v8::Isolate* isolate,
--    const blink::WebReferrerPolicy& in) {
--  switch (in) {
--    case blink::kWebReferrerPolicyDefault:
--      return mate::StringToV8(isolate, "default");
--    case blink::kWebReferrerPolicyAlways:
--      return mate::StringToV8(isolate, "unsafe-url");
--    case blink::kWebReferrerPolicyNoReferrerWhenDowngrade:
--      return mate::StringToV8(isolate, "no-referrer-when-downgrade");
--    case blink::kWebReferrerPolicyNever:
--      return mate::StringToV8(isolate, "no-referrer");
--    case blink::kWebReferrerPolicyOrigin:
--      return mate::StringToV8(isolate, "origin");
--    case blink::kWebReferrerPolicyNoReferrerWhenDowngradeOriginWhenCrossOrigin:
--      return mate::StringToV8(isolate, "strict-origin-when-cross-origin");
--    case blink::kWebReferrerPolicySameOrigin:
--      return mate::StringToV8(isolate, "same-origin");
--    case blink::kWebReferrerPolicyStrictOrigin:
--      return mate::StringToV8(isolate, "strict-origin");
--    default:
--      return mate::StringToV8(isolate, "no-referrer");
--  }
--}
--
--// static
--bool Converter<blink::WebReferrerPolicy>::FromV8(
--    v8::Isolate* isolate,
--    v8::Handle<v8::Value> val,
--    blink::WebReferrerPolicy* out) {
--  std::string policy = base::ToLowerASCII(V8ToString(val));
--  if (policy == "default")
--    *out = blink::kWebReferrerPolicyDefault;
--  else if (policy == "unsafe-url")
--    *out = blink::kWebReferrerPolicyAlways;
--  else if (policy == "no-referrer-when-downgrade")
--    *out = blink::kWebReferrerPolicyNoReferrerWhenDowngrade;
--  else if (policy == "no-referrer")
--    *out = blink::kWebReferrerPolicyNever;
--  else if (policy == "origin")
--    *out = blink::kWebReferrerPolicyOrigin;
--  else if (policy == "strict-origin-when-cross-origin")
--    *out =
--        blink::kWebReferrerPolicyNoReferrerWhenDowngradeOriginWhenCrossOrigin;
--  else if (policy == "same-origin")
--    *out = blink::kWebReferrerPolicySameOrigin;
--  else if (policy == "strict-origin")
--    *out = blink::kWebReferrerPolicyStrictOrigin;
--  else
--    return false;
--  return true;
--}
--
--}  // namespace mate
-removed in remote
-  base   100644 6a3601929214f42ddef1597dfb230ab6269fc4fb atom/common/native_mate_converters/blink_converter.h
-  our    100644 5e6315d9b2499fd1e0853b8bd4258b887d222b21 atom/common/native_mate_converters/blink_converter.h
-@@ -1,147 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_COMMON_NATIVE_MATE_CONVERTERS_BLINK_CONVERTER_H_
--#define ATOM_COMMON_NATIVE_MATE_CONVERTERS_BLINK_CONVERTER_H_
--
--#include "native_mate/converter.h"
--#include "third_party/WebKit/public/platform/WebCache.h"
--#include "third_party/WebKit/public/platform/WebInputEvent.h"
--#include "third_party/WebKit/public/web/WebContextMenuData.h"
--
--namespace blink {
--class WebMouseEvent;
--class WebMouseWheelEvent;
--class WebKeyboardEvent;
--struct WebDeviceEmulationParams;
--struct WebFindOptions;
--struct WebFloatPoint;
--struct WebPoint;
--struct WebSize;
--}  // namespace blink
--
--namespace content {
--struct NativeWebKeyboardEvent;
--}
--
--namespace mate {
--
--blink::WebInputEvent::Type GetWebInputEventType(v8::Isolate* isolate,
--                                                v8::Local<v8::Value> val);
--
--template <>
--struct Converter<blink::WebInputEvent> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     blink::WebInputEvent* out);
--};
--
--template <>
--struct Converter<blink::WebKeyboardEvent> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     blink::WebKeyboardEvent* out);
--};
--
--template <>
--struct Converter<content::NativeWebKeyboardEvent> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     content::NativeWebKeyboardEvent* out);
--  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
--                                   const content::NativeWebKeyboardEvent& in);
--};
--
--template <>
--struct Converter<blink::WebMouseEvent> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     blink::WebMouseEvent* out);
--};
--
--template <>
--struct Converter<blink::WebMouseWheelEvent> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     blink::WebMouseWheelEvent* out);
--};
--
--template <>
--struct Converter<blink::WebFloatPoint> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     blink::WebFloatPoint* out);
--};
--
--template <>
--struct Converter<blink::WebPoint> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     blink::WebPoint* out);
--};
--
--template <>
--struct Converter<blink::WebSize> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     blink::WebSize* out);
--};
--
--template <>
--struct Converter<blink::WebDeviceEmulationParams> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     blink::WebDeviceEmulationParams* out);
--};
--
--template <>
--struct Converter<blink::WebFindOptions> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     blink::WebFindOptions* out);
--};
--
--template <>
--struct Converter<blink::WebContextMenuData::MediaType> {
--  static v8::Local<v8::Value> ToV8(
--      v8::Isolate* isolate,
--      const blink::WebContextMenuData::MediaType& in);
--};
--
--template <>
--struct Converter<blink::WebContextMenuData::InputFieldType> {
--  static v8::Local<v8::Value> ToV8(
--      v8::Isolate* isolate,
--      const blink::WebContextMenuData::InputFieldType& in);
--};
--
--template <>
--struct Converter<blink::WebCache::ResourceTypeStat> {
--  static v8::Local<v8::Value> ToV8(
--      v8::Isolate* isolate,
--      const blink::WebCache::ResourceTypeStat& stat);
--};
--
--template <>
--struct Converter<blink::WebCache::ResourceTypeStats> {
--  static v8::Local<v8::Value> ToV8(
--      v8::Isolate* isolate,
--      const blink::WebCache::ResourceTypeStats& stats);
--};
--
--template <>
--struct Converter<blink::WebReferrerPolicy> {
--  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
--                                   const blink::WebReferrerPolicy& in);
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     blink::WebReferrerPolicy* out);
--};
--
--v8::Local<v8::Value> EditFlagsToV8(v8::Isolate* isolate, int editFlags);
--v8::Local<v8::Value> MediaFlagsToV8(v8::Isolate* isolate, int mediaFlags);
--
--}  // namespace mate
--
--#endif  // ATOM_COMMON_NATIVE_MATE_CONVERTERS_BLINK_CONVERTER_H_
-removed in remote
-  base   100644 8bf5c459b0a2902638d09edd1b40355fa3ad9188 atom/common/native_mate_converters/callback.cc
-  our    100644 f33cec720ea5df1c17c8d02d4aa2b70d2979e13b atom/common/native_mate_converters/callback.cc
-@@ -1,127 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc. All rights reserved.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/common/native_mate_converters/callback.h"
--
--using content::BrowserThread;
--
--namespace mate {
--
--namespace internal {
--
--namespace {
--
--struct TranslaterHolder {
--  Translater translater;
--};
--
--// Cached JavaScript version of |CallTranslater|.
--v8::Persistent<v8::FunctionTemplate> g_call_translater;
--
--void CallTranslater(v8::Local<v8::External> external,
--                    v8::Local<v8::Object> state,
--                    mate::Arguments* args) {
--  v8::Isolate* isolate = args->isolate();
--
--  // Check if the callback has already been called.
--  v8::Local<v8::String> called_symbol = mate::StringToSymbol(isolate, "called");
--  if (state->Has(called_symbol)) {
--    args->ThrowError("callback can only be called for once");
--    return;
--  } else {
--    state->Set(called_symbol, v8::Boolean::New(isolate, true));
--  }
--
--  TranslaterHolder* holder = static_cast<TranslaterHolder*>(external->Value());
--  holder->translater.Run(args);
--  delete holder;
--}
--
--}  // namespace
--
--// Destroy the class on UI thread when possible.
--struct DeleteOnUIThread {
--  template <typename T>
--  static void Destruct(const T* x) {
--    if (Locker::IsBrowserProcess() &&
--        !BrowserThread::CurrentlyOn(BrowserThread::UI)) {
--      BrowserThread::DeleteSoon(BrowserThread::UI, FROM_HERE, x);
--    } else {
--      delete x;
--    }
--  }
--};
--
--// Like v8::Global, but ref-counted.
--template <typename T>
--class RefCountedGlobal
--    : public base::RefCountedThreadSafe<RefCountedGlobal<T>, DeleteOnUIThread> {
-- public:
--  RefCountedGlobal(v8::Isolate* isolate, v8::Local<v8::Value> value)
--      : handle_(isolate, v8::Local<T>::Cast(value)) {}
--
--  bool IsAlive() const { return !handle_.IsEmpty(); }
--
--  v8::Local<T> NewHandle(v8::Isolate* isolate) const {
--    return v8::Local<T>::New(isolate, handle_);
--  }
--
-- private:
--  v8::Global<T> handle_;
--
--  DISALLOW_COPY_AND_ASSIGN(RefCountedGlobal);
--};
--
--SafeV8Function::SafeV8Function(v8::Isolate* isolate, v8::Local<v8::Value> value)
--    : v8_function_(new RefCountedGlobal<v8::Function>(isolate, value)) {}
--
--SafeV8Function::SafeV8Function(const SafeV8Function& other)
--    : v8_function_(other.v8_function_) {}
--
--SafeV8Function::~SafeV8Function() {}
--
--bool SafeV8Function::IsAlive() const {
--  return v8_function_.get() && v8_function_->IsAlive();
--}
--
--v8::Local<v8::Function> SafeV8Function::NewHandle(v8::Isolate* isolate) const {
--  return v8_function_->NewHandle(isolate);
--}
--
--v8::Local<v8::Value> CreateFunctionFromTranslater(
--    v8::Isolate* isolate,
--    const Translater& translater) {
--  // The FunctionTemplate is cached.
--  if (g_call_translater.IsEmpty())
--    g_call_translater.Reset(isolate, mate::CreateFunctionTemplate(
--                                         isolate, base::Bind(&CallTranslater)));
--
--  v8::Local<v8::FunctionTemplate> call_translater =
--      v8::Local<v8::FunctionTemplate>::New(isolate, g_call_translater);
--  auto* holder = new TranslaterHolder;
--  holder->translater = translater;
--  return BindFunctionWith(
--      isolate, isolate->GetCurrentContext(), call_translater->GetFunction(),
--      v8::External::New(isolate, holder), v8::Object::New(isolate));
--}
--
--// func.bind(func, arg1).
--// NB(zcbenz): Using C++11 version crashes VS.
--v8::Local<v8::Value> BindFunctionWith(v8::Isolate* isolate,
--                                      v8::Local<v8::Context> context,
--                                      v8::Local<v8::Function> func,
--                                      v8::Local<v8::Value> arg1,
--                                      v8::Local<v8::Value> arg2) {
--  v8::MaybeLocal<v8::Value> bind = func->Get(mate::StringToV8(isolate, "bind"));
--  CHECK(!bind.IsEmpty());
--  v8::Local<v8::Function> bind_func =
--      v8::Local<v8::Function>::Cast(bind.ToLocalChecked());
--  v8::Local<v8::Value> converted[] = {func, arg1, arg2};
--  return bind_func->Call(context, func, arraysize(converted), converted)
--      .ToLocalChecked();
--}
--
--}  // namespace internal
--
--}  // namespace mate
-removed in remote
-  base   100644 6ef8e74c735a9ae3cef88dff0b1075faa4407c64 atom/common/native_mate_converters/callback.h
-  our    100644 06140a3a7a7a928143e44e22113288b514409929 atom/common/native_mate_converters/callback.h
-@@ -1,173 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc. All rights reserved.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_COMMON_NATIVE_MATE_CONVERTERS_CALLBACK_H_
--#define ATOM_COMMON_NATIVE_MATE_CONVERTERS_CALLBACK_H_
--
--#include <vector>
--
--#include "atom/common/api/locker.h"
--#include "base/bind.h"
--#include "base/callback.h"
--#include "base/memory/weak_ptr.h"
--#include "base/message_loop/message_loop.h"
--#include "content/public/browser/browser_thread.h"
--#include "native_mate/function_template.h"
--#include "native_mate/scoped_persistent.h"
--
--namespace mate {
--
--namespace internal {
--
--template <typename T>
--class RefCountedGlobal;
--
--// Manages the V8 function with RAII.
--class SafeV8Function {
-- public:
--  SafeV8Function(v8::Isolate* isolate, v8::Local<v8::Value> value);
--  SafeV8Function(const SafeV8Function& other);
--  ~SafeV8Function();
--
--  bool IsAlive() const;
--  v8::Local<v8::Function> NewHandle(v8::Isolate* isolate) const;
--
-- private:
--  scoped_refptr<RefCountedGlobal<v8::Function>> v8_function_;
--};
--
--// Helper to invoke a V8 function with C++ parameters.
--template <typename Sig>
--struct V8FunctionInvoker {};
--
--template <typename... ArgTypes>
--struct V8FunctionInvoker<v8::Local<v8::Value>(ArgTypes...)> {
--  static v8::Local<v8::Value> Go(v8::Isolate* isolate,
--                                 const SafeV8Function& function,
--                                 ArgTypes... raw) {
--    Locker locker(isolate);
--    v8::EscapableHandleScope handle_scope(isolate);
--    if (!function.IsAlive())
--      return v8::Null(isolate);
--    v8::MicrotasksScope script_scope(isolate,
--                                     v8::MicrotasksScope::kRunMicrotasks);
--    v8::Local<v8::Function> holder = function.NewHandle(isolate);
--    v8::Local<v8::Context> context = holder->CreationContext();
--    v8::Context::Scope context_scope(context);
--    std::vector<v8::Local<v8::Value>> args{ConvertToV8(isolate, raw)...};
--    v8::Local<v8::Value> ret(holder->Call(
--        holder, args.size(), args.empty() ? nullptr : &args.front()));
--    return handle_scope.Escape(ret);
--  }
--};
--
--template <typename... ArgTypes>
--struct V8FunctionInvoker<void(ArgTypes...)> {
--  static void Go(v8::Isolate* isolate,
--                 const SafeV8Function& function,
--                 ArgTypes... raw) {
--    Locker locker(isolate);
--    v8::HandleScope handle_scope(isolate);
--    if (!function.IsAlive())
--      return;
--    v8::MicrotasksScope script_scope(isolate,
--                                     v8::MicrotasksScope::kRunMicrotasks);
--    v8::Local<v8::Function> holder = function.NewHandle(isolate);
--    v8::Local<v8::Context> context = holder->CreationContext();
--    v8::Context::Scope context_scope(context);
--    std::vector<v8::Local<v8::Value>> args{ConvertToV8(isolate, raw)...};
--    holder->Call(holder, args.size(), args.empty() ? nullptr : &args.front());
--  }
--};
--
--template <typename ReturnType, typename... ArgTypes>
--struct V8FunctionInvoker<ReturnType(ArgTypes...)> {
--  static ReturnType Go(v8::Isolate* isolate,
--                       const SafeV8Function& function,
--                       ArgTypes... raw) {
--    Locker locker(isolate);
--    v8::HandleScope handle_scope(isolate);
--    ReturnType ret = ReturnType();
--    if (!function.IsAlive())
--      return ret;
--    v8::MicrotasksScope script_scope(isolate,
--                                     v8::MicrotasksScope::kRunMicrotasks);
--    v8::Local<v8::Function> holder = function.NewHandle(isolate);
--    v8::Local<v8::Context> context = holder->CreationContext();
--    v8::Context::Scope context_scope(context);
--    std::vector<v8::Local<v8::Value>> args{ConvertToV8(isolate, raw)...};
--    v8::Local<v8::Value> result;
--    auto maybe_result = holder->Call(context, holder, args.size(),
--                                     args.empty() ? nullptr : &args.front());
--    if (maybe_result.ToLocal(&result))
--      Converter<ReturnType>::FromV8(isolate, result, &ret);
--    return ret;
--  }
--};
--
--// Helper to pass a C++ funtion to JavaScript.
--using Translater = base::Callback<void(Arguments* args)>;
--v8::Local<v8::Value> CreateFunctionFromTranslater(v8::Isolate* isolate,
--                                                  const Translater& translater);
--v8::Local<v8::Value> BindFunctionWith(v8::Isolate* isolate,
--                                      v8::Local<v8::Context> context,
--                                      v8::Local<v8::Function> func,
--                                      v8::Local<v8::Value> arg1,
--                                      v8::Local<v8::Value> arg2);
--
--// Calls callback with Arguments.
--template <typename Sig>
--struct NativeFunctionInvoker {};
--
--template <typename ReturnType, typename... ArgTypes>
--struct NativeFunctionInvoker<ReturnType(ArgTypes...)> {
--  static void Go(base::Callback<ReturnType(ArgTypes...)> val, Arguments* args) {
--    using Indices = typename IndicesGenerator<sizeof...(ArgTypes)>::type;
--    Invoker<Indices, ArgTypes...> invoker(args, 0);
--    if (invoker.IsOK())
--      invoker.DispatchToCallback(val);
--  }
--};
--
--}  // namespace internal
--
--template <typename Sig>
--struct Converter<base::OnceCallback<Sig>> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     base::OnceCallback<Sig>* out) {
--    if (!val->IsFunction())
--      return false;
--
--    *out = base::BindOnce(&internal::V8FunctionInvoker<Sig>::Go, isolate,
--                          internal::SafeV8Function(isolate, val));
--    return true;
--  }
--};
--
--template <typename Sig>
--struct Converter<base::RepeatingCallback<Sig>> {
--  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
--                                   const base::RepeatingCallback<Sig>& val) {
--    // We don't use CreateFunctionTemplate here because it creates a new
--    // FunctionTemplate everytime, which is cached by V8 and causes leaks.
--    internal::Translater translater =
--        base::BindRepeating(&internal::NativeFunctionInvoker<Sig>::Go, val);
--    return internal::CreateFunctionFromTranslater(isolate, translater);
--  }
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     base::RepeatingCallback<Sig>* out) {
--    if (!val->IsFunction())
--      return false;
--
--    *out = base::BindRepeating(&internal::V8FunctionInvoker<Sig>::Go, isolate,
--                               internal::SafeV8Function(isolate, val));
--    return true;
--  }
--};
--
--}  // namespace mate
--
--#endif  // ATOM_COMMON_NATIVE_MATE_CONVERTERS_CALLBACK_H_
-removed in remote
-  base   100644 f5d81d085bc1a1ca7f9efa3c48d0ef3d05d88af9 atom/common/native_mate_converters/content_converter.cc
-  our    100644 2684aa7dda07ac79e47823c3cf9bf00d3f5cf3f5 atom/common/native_mate_converters/content_converter.cc
-@@ -1,251 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/common/native_mate_converters/content_converter.h"
--
--#include <string>
--#include <vector>
--
--#include "atom/browser/api/atom_api_web_contents.h"
--#include "atom/browser/web_contents_permission_helper.h"
--#include "atom/common/native_mate_converters/blink_converter.h"
--#include "atom/common/native_mate_converters/callback.h"
--#include "atom/common/native_mate_converters/gurl_converter.h"
--#include "atom/common/native_mate_converters/string16_converter.h"
--#include "atom/common/native_mate_converters/ui_base_types_converter.h"
--#include "atom/common/native_mate_converters/value_converter.h"
--#include "content/public/browser/web_contents.h"
--#include "content/public/common/context_menu_params.h"
--#include "native_mate/dictionary.h"
--
--namespace {
--
--void ExecuteCommand(content::WebContents* web_contents,
--                    int action,
--                    const content::CustomContextMenuContext& context) {
--  web_contents->ExecuteCustomContextMenuCommand(action, context);
--}
--
--// Forward declaration for nested recursive call.
--v8::Local<v8::Value> MenuToV8(v8::Isolate* isolate,
--                              content::WebContents* web_contents,
--                              const content::CustomContextMenuContext& context,
--                              const std::vector<content::MenuItem>& menu);
--
--v8::Local<v8::Value> MenuItemToV8(
--    v8::Isolate* isolate,
--    content::WebContents* web_contents,
--    const content::CustomContextMenuContext& context,
--    const content::MenuItem& item) {
--  mate::Dictionary v8_item = mate::Dictionary::CreateEmpty(isolate);
--  switch (item.type) {
--    case content::MenuItem::CHECKABLE_OPTION:
--    case content::MenuItem::GROUP:
--      v8_item.Set("checked", item.checked);
--      FALLTHROUGH;
--    case content::MenuItem::OPTION:
--    case content::MenuItem::SUBMENU:
--      v8_item.Set("label", item.label);
--      v8_item.Set("enabled", item.enabled);
--      FALLTHROUGH;
--    default:
--      v8_item.Set("type", item.type);
--  }
--  if (item.type == content::MenuItem::SUBMENU)
--    v8_item.Set("submenu",
--                MenuToV8(isolate, web_contents, context, item.submenu));
--  else if (item.action > 0)
--    v8_item.Set("click",
--                base::Bind(ExecuteCommand, web_contents, item.action, context));
--  return v8_item.GetHandle();
--}
--
--v8::Local<v8::Value> MenuToV8(v8::Isolate* isolate,
--                              content::WebContents* web_contents,
--                              const content::CustomContextMenuContext& context,
--                              const std::vector<content::MenuItem>& menu) {
--  std::vector<v8::Local<v8::Value>> v8_menu;
--  for (const auto& menu_item : menu)
--    v8_menu.push_back(MenuItemToV8(isolate, web_contents, context, menu_item));
--  return mate::ConvertToV8(isolate, v8_menu);
--}
--
--}  // namespace
--
--namespace mate {
--
--// static
--v8::Local<v8::Value> Converter<content::MenuItem::Type>::ToV8(
--    v8::Isolate* isolate,
--    const content::MenuItem::Type& val) {
--  switch (val) {
--    case content::MenuItem::CHECKABLE_OPTION:
--      return StringToV8(isolate, "checkbox");
--    case content::MenuItem::GROUP:
--      return StringToV8(isolate, "radio");
--    case content::MenuItem::SEPARATOR:
--      return StringToV8(isolate, "separator");
--    case content::MenuItem::SUBMENU:
--      return StringToV8(isolate, "submenu");
--    case content::MenuItem::OPTION:
--    default:
--      return StringToV8(isolate, "normal");
--  }
--}
--
--// static
--v8::Local<v8::Value> Converter<ContextMenuParamsWithWebContents>::ToV8(
--    v8::Isolate* isolate,
--    const ContextMenuParamsWithWebContents& val) {
--  const auto& params = val.first;
--  mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
--  dict.Set("x", params.x);
--  dict.Set("y", params.y);
--  dict.Set("linkURL", params.link_url);
--  dict.Set("linkText", params.link_text);
--  dict.Set("pageURL", params.page_url);
--  dict.Set("frameURL", params.frame_url);
--  dict.Set("srcURL", params.src_url);
--  dict.Set("mediaType", params.media_type);
--  dict.Set("mediaFlags", MediaFlagsToV8(isolate, params.media_flags));
--  bool has_image_contents =
--      (params.media_type == blink::WebContextMenuData::kMediaTypeImage) &&
--      params.has_image_contents;
--  dict.Set("hasImageContents", has_image_contents);
--  dict.Set("isEditable", params.is_editable);
--  dict.Set("editFlags", EditFlagsToV8(isolate, params.edit_flags));
--  dict.Set("selectionText", params.selection_text);
--  dict.Set("titleText", params.title_text);
--  dict.Set("misspelledWord", params.misspelled_word);
--  dict.Set("frameCharset", params.frame_charset);
--  dict.Set("inputFieldType", params.input_field_type);
--  dict.Set("menuSourceType", params.source_type);
--
--  if (params.custom_context.is_pepper_menu)
--    dict.Set("menu", MenuToV8(isolate, val.second, params.custom_context,
--                              params.custom_items));
--  return mate::ConvertToV8(isolate, dict);
--}
--
--// static
--bool Converter<blink::mojom::PermissionStatus>::FromV8(
--    v8::Isolate* isolate,
--    v8::Local<v8::Value> val,
--    blink::mojom::PermissionStatus* out) {
--  bool result;
--  if (!ConvertFromV8(isolate, val, &result))
--    return false;
--
--  if (result)
--    *out = blink::mojom::PermissionStatus::GRANTED;
--  else
--    *out = blink::mojom::PermissionStatus::DENIED;
--
--  return true;
--}
--
--// static
--v8::Local<v8::Value> Converter<content::PermissionType>::ToV8(
--    v8::Isolate* isolate,
--    const content::PermissionType& val) {
--  using PermissionType = atom::WebContentsPermissionHelper::PermissionType;
--  switch (val) {
--    case content::PermissionType::MIDI_SYSEX:
--      return StringToV8(isolate, "midiSysex");
--    case content::PermissionType::NOTIFICATIONS:
--      return StringToV8(isolate, "notifications");
--    case content::PermissionType::GEOLOCATION:
--      return StringToV8(isolate, "geolocation");
--    case content::PermissionType::AUDIO_CAPTURE:
--    case content::PermissionType::VIDEO_CAPTURE:
--      return StringToV8(isolate, "media");
--    case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER:
--      return StringToV8(isolate, "mediaKeySystem");
--    case content::PermissionType::MIDI:
--      return StringToV8(isolate, "midi");
--    default:
--      break;
--  }
--
--  if (val == static_cast<content::PermissionType>(PermissionType::POINTER_LOCK))
--    return StringToV8(isolate, "pointerLock");
--  else if (val ==
--           static_cast<content::PermissionType>(PermissionType::FULLSCREEN))
--    return StringToV8(isolate, "fullscreen");
--  else if (val ==
--           static_cast<content::PermissionType>(PermissionType::OPEN_EXTERNAL))
--    return StringToV8(isolate, "openExternal");
--
--  return StringToV8(isolate, "unknown");
--}
--
--// static
--bool Converter<content::StopFindAction>::FromV8(v8::Isolate* isolate,
--                                                v8::Local<v8::Value> val,
--                                                content::StopFindAction* out) {
--  std::string action;
--  if (!ConvertFromV8(isolate, val, &action))
--    return false;
--
--  if (action == "clearSelection")
--    *out = content::STOP_FIND_ACTION_CLEAR_SELECTION;
--  else if (action == "keepSelection")
--    *out = content::STOP_FIND_ACTION_KEEP_SELECTION;
--  else if (action == "activateSelection")
--    *out = content::STOP_FIND_ACTION_ACTIVATE_SELECTION;
--  else
--    return false;
--
--  return true;
--}
--
--// static
--v8::Local<v8::Value> Converter<content::WebContents*>::ToV8(
--    v8::Isolate* isolate,
--    content::WebContents* val) {
--  if (!val)
--    return v8::Null(isolate);
--  return atom::api::WebContents::CreateFrom(isolate, val).ToV8();
--}
--
--// static
--bool Converter<content::WebContents*>::FromV8(v8::Isolate* isolate,
--                                              v8::Local<v8::Value> val,
--                                              content::WebContents** out) {
--  atom::api::WebContents* web_contents = nullptr;
--  if (!ConvertFromV8(isolate, val, &web_contents) || !web_contents)
--    return false;
--
--  *out = web_contents->web_contents();
--  return true;
--}
--
--// static
--v8::Local<v8::Value> Converter<content::Referrer>::ToV8(
--    v8::Isolate* isolate,
--    const content::Referrer& val) {
--  mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
--  dict.Set("url", ConvertToV8(isolate, val.url));
--  dict.Set("policy", ConvertToV8(isolate, val.policy));
--  return mate::ConvertToV8(isolate, dict);
--}
--
--// static
--bool Converter<content::Referrer>::FromV8(v8::Isolate* isolate,
--                                          v8::Local<v8::Value> val,
--                                          content::Referrer* out) {
--  mate::Dictionary dict;
--  if (!ConvertFromV8(isolate, val, &dict))
--    return false;
--
--  if (!dict.Get("url", &out->url))
--    return false;
--
--  if (!dict.Get("policy", &out->policy))
--    return false;
--
--  return true;
--}
--
--}  // namespace mate
-removed in remote
-  base   100644 b1a42b6897ca23ce6ab2442dd2ac1d569e7adc2d atom/common/native_mate_converters/content_converter.h
-  our    100644 18a2d5f1a7c8d0f33cb35e575bae7a4b2740d7cd atom/common/native_mate_converters/content_converter.h
-@@ -1,79 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_COMMON_NATIVE_MATE_CONVERTERS_CONTENT_CONVERTER_H_
--#define ATOM_COMMON_NATIVE_MATE_CONVERTERS_CONTENT_CONVERTER_H_
--
--#include <utility>
--
--#include "content/public/browser/permission_type.h"
--#include "content/public/common/menu_item.h"
--#include "content/public/common/referrer.h"
--#include "content/public/common/stop_find_action.h"
--#include "native_mate/converter.h"
--#include "third_party/WebKit/public/platform/modules/permissions/permission_status.mojom.h"
--
--namespace content {
--struct ContextMenuParams;
--class WebContents;
--}  // namespace content
--
--using ContextMenuParamsWithWebContents =
--    std::pair<content::ContextMenuParams, content::WebContents*>;
--
--namespace mate {
--
--template <>
--struct Converter<content::MenuItem::Type> {
--  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
--                                   const content::MenuItem::Type& val);
--};
--
--template <>
--struct Converter<ContextMenuParamsWithWebContents> {
--  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
--                                   const ContextMenuParamsWithWebContents& val);
--};
--
--template <>
--struct Converter<blink::mojom::PermissionStatus> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     blink::mojom::PermissionStatus* out);
--};
--
--template <>
--struct Converter<content::PermissionType> {
--  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
--                                   const content::PermissionType& val);
--};
--
--template <>
--struct Converter<content::StopFindAction> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     content::StopFindAction* out);
--};
--
--template <>
--struct Converter<content::WebContents*> {
--  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
--                                   content::WebContents* val);
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     content::WebContents** out);
--};
--
--template <>
--struct Converter<content::Referrer> {
--  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
--                                   const content::Referrer& val);
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     content::Referrer* out);
--};
--
--}  // namespace mate
--
--#endif  // ATOM_COMMON_NATIVE_MATE_CONVERTERS_CONTENT_CONVERTER_H_
-removed in remote
-  base   100644 7df1289e243be0f5f8dc9a114b3c98a1ba55ab37 atom/common/native_mate_converters/file_path_converter.h
-  our    100644 c283d3370a61dc29724f7e5f5761ee6125eab516 atom/common/native_mate_converters/file_path_converter.h
-@@ -1,39 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_COMMON_NATIVE_MATE_CONVERTERS_FILE_PATH_CONVERTER_H_
--#define ATOM_COMMON_NATIVE_MATE_CONVERTERS_FILE_PATH_CONVERTER_H_
--
--#include <string>
--
--#include "atom/common/native_mate_converters/string16_converter.h"
--#include "base/files/file_path.h"
--
--namespace mate {
--
--template <>
--struct Converter<base::FilePath> {
--  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
--                                   const base::FilePath& val) {
--    return Converter<base::FilePath::StringType>::ToV8(isolate, val.value());
--  }
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     base::FilePath* out) {
--    if (val->IsNull())
--      return true;
--
--    base::FilePath::StringType path;
--    if (Converter<base::FilePath::StringType>::FromV8(isolate, val, &path)) {
--      *out = base::FilePath(path);
--      return true;
--    } else {
--      return false;
--    }
--  }
--};
--
--}  // namespace mate
--
--#endif  // ATOM_COMMON_NATIVE_MATE_CONVERTERS_FILE_PATH_CONVERTER_H_
-removed in remote
-  base   100644 37e7aeb3a48becbecd7f5fd61934ac4d178539ca atom/common/native_mate_converters/gfx_converter.cc
-  our    100644 7a7cfd39e061837f7772be91b43f5851d8278c00 atom/common/native_mate_converters/gfx_converter.cc
-@@ -1,138 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/common/native_mate_converters/gfx_converter.h"
--
--#include "native_mate/dictionary.h"
--#include "ui/display/display.h"
--#include "ui/display/screen.h"
--#include "ui/gfx/geometry/point.h"
--#include "ui/gfx/geometry/rect.h"
--#include "ui/gfx/geometry/size.h"
--
--namespace mate {
--
--v8::Local<v8::Value> Converter<gfx::Point>::ToV8(v8::Isolate* isolate,
--                                                 const gfx::Point& val) {
--  mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
--  dict.SetHidden("simple", true);
--  dict.Set("x", val.x());
--  dict.Set("y", val.y());
--  return dict.GetHandle();
--}
--
--bool Converter<gfx::Point>::FromV8(v8::Isolate* isolate,
--                                   v8::Local<v8::Value> val,
--                                   gfx::Point* out) {
--  mate::Dictionary dict;
--  if (!ConvertFromV8(isolate, val, &dict))
--    return false;
--  int x, y;
--  if (!dict.Get("x", &x) || !dict.Get("y", &y))
--    return false;
--  *out = gfx::Point(x, y);
--  return true;
--}
--
--v8::Local<v8::Value> Converter<gfx::PointF>::ToV8(v8::Isolate* isolate,
--                                                  const gfx::PointF& val) {
--  mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
--  dict.SetHidden("simple", true);
--  dict.Set("x", val.x());
--  dict.Set("y", val.y());
--  return dict.GetHandle();
--}
--
--bool Converter<gfx::PointF>::FromV8(v8::Isolate* isolate,
--                                    v8::Local<v8::Value> val,
--                                    gfx::PointF* out) {
--  mate::Dictionary dict;
--  if (!ConvertFromV8(isolate, val, &dict))
--    return false;
--  float x, y;
--  if (!dict.Get("x", &x) || !dict.Get("y", &y))
--    return false;
--  *out = gfx::PointF(x, y);
--  return true;
--}
--
--v8::Local<v8::Value> Converter<gfx::Size>::ToV8(v8::Isolate* isolate,
--                                                const gfx::Size& val) {
--  mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
--  dict.SetHidden("simple", true);
--  dict.Set("width", val.width());
--  dict.Set("height", val.height());
--  return dict.GetHandle();
--}
--
--bool Converter<gfx::Size>::FromV8(v8::Isolate* isolate,
--                                  v8::Local<v8::Value> val,
--                                  gfx::Size* out) {
--  mate::Dictionary dict;
--  if (!ConvertFromV8(isolate, val, &dict))
--    return false;
--  int width, height;
--  if (!dict.Get("width", &width) || !dict.Get("height", &height))
--    return false;
--  *out = gfx::Size(width, height);
--  return true;
--}
--
--v8::Local<v8::Value> Converter<gfx::Rect>::ToV8(v8::Isolate* isolate,
--                                                const gfx::Rect& val) {
--  mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
--  dict.SetHidden("simple", true);
--  dict.Set("x", val.x());
--  dict.Set("y", val.y());
--  dict.Set("width", val.width());
--  dict.Set("height", val.height());
--  return dict.GetHandle();
--}
--
--bool Converter<gfx::Rect>::FromV8(v8::Isolate* isolate,
--                                  v8::Local<v8::Value> val,
--                                  gfx::Rect* out) {
--  mate::Dictionary dict;
--  if (!ConvertFromV8(isolate, val, &dict))
--    return false;
--  int x, y, width, height;
--  if (!dict.Get("x", &x) || !dict.Get("y", &y) || !dict.Get("width", &width) ||
--      !dict.Get("height", &height))
--    return false;
--  *out = gfx::Rect(x, y, width, height);
--  return true;
--}
--
--template <>
--struct Converter<display::Display::TouchSupport> {
--  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
--                                   const display::Display::TouchSupport& val) {
--    switch (val) {
--      case display::Display::TouchSupport::AVAILABLE:
--        return StringToV8(isolate, "available");
--      case display::Display::TouchSupport::UNAVAILABLE:
--        return StringToV8(isolate, "unavailable");
--      default:
--        return StringToV8(isolate, "unknown");
--    }
--  }
--};
--
--v8::Local<v8::Value> Converter<display::Display>::ToV8(
--    v8::Isolate* isolate,
--    const display::Display& val) {
--  mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
--  dict.SetHidden("simple", true);
--  dict.Set("id", val.id());
--  dict.Set("bounds", val.bounds());
--  dict.Set("workArea", val.work_area());
--  dict.Set("size", val.size());
--  dict.Set("workAreaSize", val.work_area_size());
--  dict.Set("scaleFactor", val.device_scale_factor());
--  dict.Set("rotation", val.RotationAsDegree());
--  dict.Set("touchSupport", val.touch_support());
--  return dict.GetHandle();
--}
--
--}  // namespace mate
-removed in remote
-  base   100644 c6da76a2d0e72404c01e24cd3ac01c3bd0b42a38 atom/common/native_mate_converters/gfx_converter.h
-  our    100644 745e6528093f084d36959c624e05d8aabb994c4a atom/common/native_mate_converters/gfx_converter.h
-@@ -1,67 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_COMMON_NATIVE_MATE_CONVERTERS_GFX_CONVERTER_H_
--#define ATOM_COMMON_NATIVE_MATE_CONVERTERS_GFX_CONVERTER_H_
--
--#include "native_mate/converter.h"
--#include "ui/gfx/geometry/point_f.h"
--
--namespace display {
--class Display;
--}
--
--namespace gfx {
--class Point;
--class Size;
--class Rect;
--}  // namespace gfx
--
--namespace mate {
--
--template <>
--struct Converter<gfx::Point> {
--  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate, const gfx::Point& val);
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     gfx::Point* out);
--};
--
--template <>
--struct Converter<gfx::PointF> {
--  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
--                                   const gfx::PointF& val);
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     gfx::PointF* out);
--};
--
--template <>
--struct Converter<gfx::Size> {
--  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate, const gfx::Size& val);
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     gfx::Size* out);
--};
--
--template <>
--struct Converter<gfx::Rect> {
--  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate, const gfx::Rect& val);
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     gfx::Rect* out);
--};
--
--template <>
--struct Converter<display::Display> {
--  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
--                                   const display::Display& val);
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     display::Display* out);
--};
--
--}  // namespace mate
--
--#endif  // ATOM_COMMON_NATIVE_MATE_CONVERTERS_GFX_CONVERTER_H_
-removed in remote
-  base   100644 34408913b789a9303cacc57a56fdb1d0254c112e atom/common/native_mate_converters/gurl_converter.h
-  our    100644 110b97d5ef290de2b39dd5435a20d1685178a781 atom/common/native_mate_converters/gurl_converter.h
-@@ -1,35 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_COMMON_NATIVE_MATE_CONVERTERS_GURL_CONVERTER_H_
--#define ATOM_COMMON_NATIVE_MATE_CONVERTERS_GURL_CONVERTER_H_
--
--#include <string>
--
--#include "native_mate/converter.h"
--#include "url/gurl.h"
--
--namespace mate {
--
--template <>
--struct Converter<GURL> {
--  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate, const GURL& val) {
--    return ConvertToV8(isolate, val.spec());
--  }
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     GURL* out) {
--    std::string url;
--    if (Converter<std::string>::FromV8(isolate, val, &url)) {
--      *out = GURL(url);
--      return true;
--    } else {
--      return false;
--    }
--  }
--};
--
--}  // namespace mate
--
--#endif  // ATOM_COMMON_NATIVE_MATE_CONVERTERS_GURL_CONVERTER_H_
-removed in remote
-  base   100644 550bb7b904a74b54883b11f879ee772bb4bcb3a1 atom/common/native_mate_converters/image_converter.cc
-  our    100644 1198479926068c1aed59fc7f8d6f384e246b678d atom/common/native_mate_converters/image_converter.cc
-@@ -1,43 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/common/native_mate_converters/image_converter.h"
--
--#include "atom/common/api/atom_api_native_image.h"
--#include "atom/common/native_mate_converters/file_path_converter.h"
--#include "ui/gfx/image/image_skia.h"
--
--namespace mate {
--
--bool Converter<gfx::ImageSkia>::FromV8(v8::Isolate* isolate,
--                                       v8::Local<v8::Value> val,
--                                       gfx::ImageSkia* out) {
--  gfx::Image image;
--  if (!ConvertFromV8(isolate, val, &image))
--    return false;
--
--  *out = image.AsImageSkia();
--  return true;
--}
--
--bool Converter<gfx::Image>::FromV8(v8::Isolate* isolate,
--                                   v8::Local<v8::Value> val,
--                                   gfx::Image* out) {
--  if (val->IsNull())
--    return true;
--
--  Handle<atom::api::NativeImage> native_image;
--  if (!ConvertFromV8(isolate, val, &native_image))
--    return false;
--
--  *out = native_image->image();
--  return true;
--}
--
--v8::Local<v8::Value> Converter<gfx::Image>::ToV8(v8::Isolate* isolate,
--                                                 const gfx::Image& val) {
--  return ConvertToV8(isolate, atom::api::NativeImage::Create(isolate, val));
--}
--
--}  // namespace mate
-removed in remote
-  base   100644 be52288eb0491d9d5284ba20927e3496b714e481 atom/common/native_mate_converters/image_converter.h
-  our    100644 d8673145a7637e8e0d479492a85b1126ab822127 atom/common/native_mate_converters/image_converter.h
-@@ -1,34 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_COMMON_NATIVE_MATE_CONVERTERS_IMAGE_CONVERTER_H_
--#define ATOM_COMMON_NATIVE_MATE_CONVERTERS_IMAGE_CONVERTER_H_
--
--#include "native_mate/converter.h"
--
--namespace gfx {
--class Image;
--class ImageSkia;
--}  // namespace gfx
--
--namespace mate {
--
--template <>
--struct Converter<gfx::ImageSkia> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     gfx::ImageSkia* out);
--};
--
--template <>
--struct Converter<gfx::Image> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     gfx::Image* out);
--  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate, const gfx::Image& val);
--};
--
--}  // namespace mate
--
--#endif  // ATOM_COMMON_NATIVE_MATE_CONVERTERS_IMAGE_CONVERTER_H_
-removed in remote
-  base   100644 5223709ae585f128ab9933e1d2c80c7b5aaa3eb5 atom/common/native_mate_converters/net_converter.cc
-  our    100644 db54210e7c095da593c6f5b9f4ed1eafb91b945d atom/common/native_mate_converters/net_converter.cc
-@@ -1,259 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/common/native_mate_converters/net_converter.h"
--
--#include <string>
--#include <vector>
--
--#include "atom/common/native_mate_converters/gurl_converter.h"
--#include "atom/common/native_mate_converters/value_converter.h"
--#include "base/strings/string_number_conversions.h"
--#include "base/strings/string_util.h"
--#include "base/values.h"
--#include "native_mate/dictionary.h"
--#include "net/base/upload_bytes_element_reader.h"
--#include "net/base/upload_data_stream.h"
--#include "net/base/upload_element_reader.h"
--#include "net/base/upload_file_element_reader.h"
--#include "net/cert/x509_certificate.h"
--#include "net/cert/x509_util.h"
--#include "net/http/http_response_headers.h"
--#include "net/url_request/url_request.h"
--#include "storage/browser/blob/upload_blob_element_reader.h"
--
--#include "atom/common/node_includes.h"
--
--namespace mate {
--
--namespace {
--
--bool CertFromData(const std::string& data,
--                  scoped_refptr<net::X509Certificate>* out) {
--  auto cert_list = net::X509Certificate::CreateCertificateListFromBytes(
--      data.c_str(), data.length(),
--      net::X509Certificate::FORMAT_SINGLE_CERTIFICATE);
--  if (cert_list.empty())
--    return false;
--
--  auto leaf_cert = cert_list.front();
--  if (!leaf_cert)
--    return false;
--
--  *out = leaf_cert;
--
--  return true;
--}
--
--}  // namespace
--
--// static
--v8::Local<v8::Value> Converter<const net::AuthChallengeInfo*>::ToV8(
--    v8::Isolate* isolate,
--    const net::AuthChallengeInfo* val) {
--  mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
--  dict.Set("isProxy", val->is_proxy);
--  dict.Set("scheme", val->scheme);
--  dict.Set("host", val->challenger.host());
--  dict.Set("port", static_cast<uint32_t>(val->challenger.port()));
--  dict.Set("realm", val->realm);
--  return mate::ConvertToV8(isolate, dict);
--}
--
--// static
--v8::Local<v8::Value> Converter<scoped_refptr<net::X509Certificate>>::ToV8(
--    v8::Isolate* isolate,
--    const scoped_refptr<net::X509Certificate>& val) {
--  mate::Dictionary dict(isolate, v8::Object::New(isolate));
--  std::string encoded_data;
--  net::X509Certificate::GetPEMEncoded(val->cert_buffer(), &encoded_data);
--
--  dict.Set("data", encoded_data);
--  dict.Set("issuer", val->issuer());
--  dict.Set("issuerName", val->issuer().GetDisplayName());
--  dict.Set("subject", val->subject());
--  dict.Set("subjectName", val->subject().GetDisplayName());
--  dict.Set("serialNumber", base::HexEncode(val->serial_number().data(),
--                                           val->serial_number().size()));
--  dict.Set("validStart", val->valid_start().ToDoubleT());
--  dict.Set("validExpiry", val->valid_expiry().ToDoubleT());
--  dict.Set("fingerprint",
--           net::HashValue(val->CalculateFingerprint256(val->cert_buffer()))
--               .ToString());
--
--  const auto& intermediate_buffers = val->intermediate_buffers();
--  if (!intermediate_buffers.empty()) {
--    std::vector<bssl::UniquePtr<CRYPTO_BUFFER>> issuer_intermediates;
--    issuer_intermediates.reserve(intermediate_buffers.size() - 1);
--    for (size_t i = 1; i < intermediate_buffers.size(); ++i) {
--      issuer_intermediates.push_back(
--          net::x509_util::DupCryptoBuffer(intermediate_buffers[i].get()));
--    }
--    const scoped_refptr<net::X509Certificate>& issuer_cert =
--        net::X509Certificate::CreateFromBuffer(
--            net::x509_util::DupCryptoBuffer(intermediate_buffers[0].get()),
--            std::move(issuer_intermediates));
--    dict.Set("issuerCert", issuer_cert);
--  }
--
--  return dict.GetHandle();
--}
--
--bool Converter<scoped_refptr<net::X509Certificate>>::FromV8(
--    v8::Isolate* isolate,
--    v8::Local<v8::Value> val,
--    scoped_refptr<net::X509Certificate>* out) {
--  mate::Dictionary dict;
--  if (!ConvertFromV8(isolate, val, &dict))
--    return false;
--
--  std::string data;
--  dict.Get("data", &data);
--  scoped_refptr<net::X509Certificate> leaf_cert;
--  if (!CertFromData(data, &leaf_cert))
--    return false;
--
--  scoped_refptr<net::X509Certificate> issuer_cert;
--  if (dict.Get("issuerCert", &issuer_cert)) {
--    std::vector<bssl::UniquePtr<CRYPTO_BUFFER>> intermediates;
--    intermediates.push_back(
--        net::x509_util::DupCryptoBuffer(issuer_cert->cert_buffer()));
--    auto cert = net::X509Certificate::CreateFromBuffer(
--        net::x509_util::DupCryptoBuffer(leaf_cert->cert_buffer()),
--        std::move(intermediates));
--    if (!cert)
--      return false;
--
--    *out = cert;
--  } else {
--    *out = leaf_cert;
--  }
--
--  return true;
--}
--
--// static
--v8::Local<v8::Value> Converter<net::CertPrincipal>::ToV8(
--    v8::Isolate* isolate,
--    const net::CertPrincipal& val) {
--  mate::Dictionary dict(isolate, v8::Object::New(isolate));
--
--  dict.Set("commonName", val.common_name);
--  dict.Set("organizations", val.organization_names);
--  dict.Set("organizationUnits", val.organization_unit_names);
--  dict.Set("locality", val.locality_name);
--  dict.Set("state", val.state_or_province_name);
--  dict.Set("country", val.country_name);
--
--  return dict.GetHandle();
--}
--
--// static
--v8::Local<v8::Value> Converter<net::HttpResponseHeaders*>::ToV8(
--    v8::Isolate* isolate,
--    net::HttpResponseHeaders* headers) {
--  base::DictionaryValue response_headers;
--  if (headers) {
--    size_t iter = 0;
--    std::string key;
--    std::string value;
--    while (headers->EnumerateHeaderLines(&iter, &key, &value)) {
--      key = base::ToLowerASCII(key);
--      if (response_headers.FindKey(key)) {
--        base::ListValue* values = nullptr;
--        if (response_headers.GetList(key, &values))
--          values->AppendString(value);
--      } else {
--        auto values = std::make_unique<base::ListValue>();
--        values->AppendString(value);
--        response_headers.Set(key, std::move(values));
--      }
--    }
--  }
--  return ConvertToV8(isolate, response_headers);
--}
--
--bool Converter<net::HttpResponseHeaders*>::FromV8(
--    v8::Isolate* isolate,
--    v8::Local<v8::Value> val,
--    net::HttpResponseHeaders* out) {
--  if (!val->IsObject()) {
--    return false;
--  }
--  auto context = isolate->GetCurrentContext();
--  auto headers = v8::Local<v8::Object>::Cast(val);
--  auto keys = headers->GetOwnPropertyNames();
--  for (uint32_t i = 0; i < keys->Length(); i++) {
--    v8::Local<v8::String> key, value;
--    if (!keys->Get(i)->ToString(context).ToLocal(&key)) {
--      return false;
--    }
--    if (!headers->Get(key)->ToString(context).ToLocal(&value)) {
--      return false;
--    }
--    v8::String::Utf8Value key_utf8(key);
--    v8::String::Utf8Value value_utf8(value);
--    std::string k(*key_utf8, key_utf8.length());
--    std::string v(*value_utf8, value_utf8.length());
--    std::ostringstream tmp;
--    tmp << k << ": " << v;
--    out->AddHeader(tmp.str());
--  }
--  return true;
--}
--
--}  // namespace mate
--
--namespace atom {
--
--void FillRequestDetails(base::DictionaryValue* details,
--                        const net::URLRequest* request) {
--  details->SetString("method", request->method());
--  std::string url;
--  if (!request->url_chain().empty())
--    url = request->url().spec();
--  details->SetKey("url", base::Value(url));
--  details->SetString("referrer", request->referrer());
--  auto list = std::make_unique<base::ListValue>();
--  GetUploadData(list.get(), request);
--  if (!list->empty())
--    details->Set("uploadData", std::move(list));
--  auto headers_value = std::make_unique<base::DictionaryValue>();
--  for (net::HttpRequestHeaders::Iterator it(request->extra_request_headers());
--       it.GetNext();) {
--    headers_value->SetString(it.name(), it.value());
--  }
--  details->Set("headers", std::move(headers_value));
--}
--
--void GetUploadData(base::ListValue* upload_data_list,
--                   const net::URLRequest* request) {
--  const net::UploadDataStream* upload_data = request->get_upload();
--  if (!upload_data)
--    return;
--  const std::vector<std::unique_ptr<net::UploadElementReader>>* readers =
--      upload_data->GetElementReaders();
--  for (const auto& reader : *readers) {
--    auto upload_data_dict = std::make_unique<base::DictionaryValue>();
--    if (reader->AsBytesReader()) {
--      const net::UploadBytesElementReader* bytes_reader =
--          reader->AsBytesReader();
--      auto bytes = std::make_unique<base::Value>(
--          std::vector<char>(bytes_reader->bytes(),
--                            bytes_reader->bytes() + bytes_reader->length()));
--      upload_data_dict->Set("bytes", std::move(bytes));
--    } else if (reader->AsFileReader()) {
--      const net::UploadFileElementReader* file_reader = reader->AsFileReader();
--      auto file_path = file_reader->path().AsUTF8Unsafe();
--      upload_data_dict->SetKey("file", base::Value(file_path));
--    } else {
--      const storage::UploadBlobElementReader* blob_reader =
--          static_cast<storage::UploadBlobElementReader*>(reader.get());
--      upload_data_dict->SetString("blobUUID", blob_reader->uuid());
--    }
--    upload_data_list->Append(std::move(upload_data_dict));
--  }
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 b7fd9481a2070480d8cf26b40b7f8a70f4c1692e atom/common/native_mate_converters/net_converter.h
-  our    100644 7182102cebaaf4debae09d26f6bd5654b3dcc627 atom/common/native_mate_converters/net_converter.h
-@@ -1,70 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_COMMON_NATIVE_MATE_CONVERTERS_NET_CONVERTER_H_
--#define ATOM_COMMON_NATIVE_MATE_CONVERTERS_NET_CONVERTER_H_
--
--#include "base/memory/ref_counted.h"
--#include "native_mate/converter.h"
--
--namespace base {
--class DictionaryValue;
--class ListValue;
--}  // namespace base
--
--namespace net {
--class AuthChallengeInfo;
--class URLRequest;
--class X509Certificate;
--class HttpResponseHeaders;
--struct CertPrincipal;
--}  // namespace net
--
--namespace mate {
--
--template <>
--struct Converter<const net::AuthChallengeInfo*> {
--  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
--                                   const net::AuthChallengeInfo* val);
--};
--
--template <>
--struct Converter<scoped_refptr<net::X509Certificate>> {
--  static v8::Local<v8::Value> ToV8(
--      v8::Isolate* isolate,
--      const scoped_refptr<net::X509Certificate>& val);
--
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     scoped_refptr<net::X509Certificate>* out);
--};
--
--template <>
--struct Converter<net::CertPrincipal> {
--  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
--                                   const net::CertPrincipal& val);
--};
--
--template <>
--struct Converter<net::HttpResponseHeaders*> {
--  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
--                                   net::HttpResponseHeaders* headers);
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     net::HttpResponseHeaders* out);
--};
--
--}  // namespace mate
--
--namespace atom {
--
--void FillRequestDetails(base::DictionaryValue* details,
--                        const net::URLRequest* request);
--
--void GetUploadData(base::ListValue* upload_data_list,
--                   const net::URLRequest* request);
--
--}  // namespace atom
--
--#endif  // ATOM_COMMON_NATIVE_MATE_CONVERTERS_NET_CONVERTER_H_
-removed in remote
-  base   100644 e2a5b8ca489eb40daf1830a98a034370f929316e atom/common/native_mate_converters/string16_converter.h
-  our    100644 38dd7001fa23338a4be066f66c18960cb4962057 atom/common/native_mate_converters/string16_converter.h
-@@ -1,40 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_COMMON_NATIVE_MATE_CONVERTERS_STRING16_CONVERTER_H_
--#define ATOM_COMMON_NATIVE_MATE_CONVERTERS_STRING16_CONVERTER_H_
--
--#include "base/strings/string16.h"
--#include "native_mate/converter.h"
--
--namespace mate {
--
--template <>
--struct Converter<base::string16> {
--  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
--                                   const base::string16& val) {
--    return v8::String::NewFromTwoByte(
--        isolate, reinterpret_cast<const uint16_t*>(val.data()),
--        v8::String::kNormalString, val.size());
--  }
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     base::string16* out) {
--    if (!val->IsString())
--      return false;
--
--    v8::String::Value s(val);
--    out->assign(reinterpret_cast<const base::char16*>(*s), s.length());
--    return true;
--  }
--};
--
--inline v8::Local<v8::String> StringToV8(v8::Isolate* isolate,
--                                        const base::string16& input) {
--  return ConvertToV8(isolate, input).As<v8::String>();
--}
--
--}  // namespace mate
--
--#endif  // ATOM_COMMON_NATIVE_MATE_CONVERTERS_STRING16_CONVERTER_H_
-removed in remote
-  base   100644 99873cd1c4f08e497d30d9ebef5a9534152f00d4 atom/common/native_mate_converters/v8_value_converter.cc
-  our    100644 3fa070771d6843e9428e560c746965b095961e2a atom/common/native_mate_converters/v8_value_converter.cc
-@@ -1,500 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/common/native_mate_converters/v8_value_converter.h"
--
--#include <map>
--#include <memory>
--#include <string>
--#include <utility>
--#include <vector>
--
--#include "base/logging.h"
--#include "base/values.h"
--#include "native_mate/dictionary.h"
--
--#include "atom/common/node_bindings.h"
--#include "atom/common/node_includes.h"
--
--namespace atom {
--
--namespace {
--
--const int kMaxRecursionDepth = 100;
--
--}  // namespace
--
--// The state of a call to FromV8Value.
--class V8ValueConverter::FromV8ValueState {
-- public:
--  // Level scope which updates the current depth of some FromV8ValueState.
--  class Level {
--   public:
--    explicit Level(FromV8ValueState* state) : state_(state) {
--      state_->max_recursion_depth_--;
--    }
--    ~Level() { state_->max_recursion_depth_++; }
--
--   private:
--    FromV8ValueState* state_;
--  };
--
--  FromV8ValueState() : max_recursion_depth_(kMaxRecursionDepth) {}
--
--  // If |handle| is not in |unique_map_|, then add it to |unique_map_| and
--  // return true.
--  //
--  // Otherwise do nothing and return false. Here "A is unique" means that no
--  // other handle B in the map points to the same object as A. Note that A can
--  // be unique even if there already is another handle with the same identity
--  // hash (key) in the map, because two objects can have the same hash.
--  bool AddToUniquenessCheck(v8::Local<v8::Object> handle) {
--    int hash;
--    auto iter = GetIteratorInMap(handle, &hash);
--    if (iter != unique_map_.end())
--      return false;
--
--    unique_map_.insert(std::make_pair(hash, handle));
--    return true;
--  }
--
--  bool RemoveFromUniquenessCheck(v8::Local<v8::Object> handle) {
--    int unused_hash;
--    auto iter = GetIteratorInMap(handle, &unused_hash);
--    if (iter == unique_map_.end())
--      return false;
--    unique_map_.erase(iter);
--    return true;
--  }
--
--  bool HasReachedMaxRecursionDepth() { return max_recursion_depth_ < 0; }
--
-- private:
--  using HashToHandleMap = std::multimap<int, v8::Local<v8::Object>>;
--  using Iterator = HashToHandleMap::const_iterator;
--
--  Iterator GetIteratorInMap(v8::Local<v8::Object> handle, int* hash) {
--    *hash = handle->GetIdentityHash();
--    // We only compare using == with handles to objects with the same identity
--    // hash. Different hash obviously means different objects, but two objects
--    // in a couple of thousands could have the same identity hash.
--    std::pair<Iterator, Iterator> range = unique_map_.equal_range(*hash);
--    for (auto it = range.first; it != range.second; ++it) {
--      // Operator == for handles actually compares the underlying objects.
--      if (it->second == handle)
--        return it;
--    }
--    // Not found.
--    return unique_map_.end();
--  }
--
--  HashToHandleMap unique_map_;
--
--  int max_recursion_depth_;
--};
--
--// A class to ensure that objects/arrays that are being converted by
--// this V8ValueConverterImpl do not have cycles.
--//
--// An example of cycle: var v = {}; v = {key: v};
--// Not an example of cycle: var v = {}; a = [v, v]; or w = {a: v, b: v};
--class V8ValueConverter::ScopedUniquenessGuard {
-- public:
--  ScopedUniquenessGuard(V8ValueConverter::FromV8ValueState* state,
--                        v8::Local<v8::Object> value)
--      : state_(state),
--        value_(value),
--        is_valid_(state_->AddToUniquenessCheck(value_)) {}
--  ~ScopedUniquenessGuard() {
--    if (is_valid_) {
--      bool removed = state_->RemoveFromUniquenessCheck(value_);
--      DCHECK(removed);
--    }
--  }
--
--  bool is_valid() const { return is_valid_; }
--
-- private:
--  typedef std::multimap<int, v8::Local<v8::Object>> HashToHandleMap;
--  V8ValueConverter::FromV8ValueState* state_;
--  v8::Local<v8::Object> value_;
--  bool is_valid_;
--
--  DISALLOW_COPY_AND_ASSIGN(ScopedUniquenessGuard);
--};
--
--V8ValueConverter::V8ValueConverter() {}
--
--void V8ValueConverter::SetRegExpAllowed(bool val) {
--  reg_exp_allowed_ = val;
--}
--
--void V8ValueConverter::SetFunctionAllowed(bool val) {
--  function_allowed_ = val;
--}
--
--void V8ValueConverter::SetStripNullFromObjects(bool val) {
--  strip_null_from_objects_ = val;
--}
--
--v8::Local<v8::Value> V8ValueConverter::ToV8Value(
--    const base::Value* value,
--    v8::Local<v8::Context> context) const {
--  v8::Context::Scope context_scope(context);
--  v8::EscapableHandleScope handle_scope(context->GetIsolate());
--  return handle_scope.Escape(ToV8ValueImpl(context->GetIsolate(), value));
--}
--
--base::Value* V8ValueConverter::FromV8Value(
--    v8::Local<v8::Value> val,
--    v8::Local<v8::Context> context) const {
--  v8::Context::Scope context_scope(context);
--  v8::HandleScope handle_scope(context->GetIsolate());
--  FromV8ValueState state;
--  return FromV8ValueImpl(&state, val, context->GetIsolate());
--}
--
--v8::Local<v8::Value> V8ValueConverter::ToV8ValueImpl(
--    v8::Isolate* isolate,
--    const base::Value* value) const {
--  switch (value->type()) {
--    case base::Value::Type::NONE:
--      return v8::Null(isolate);
--
--    case base::Value::Type::BOOLEAN: {
--      bool val = value->GetBool();
--      return v8::Boolean::New(isolate, val);
--    }
--
--    case base::Value::Type::INTEGER: {
--      int val = value->GetInt();
--      return v8::Integer::New(isolate, val);
--    }
--
--    case base::Value::Type::DOUBLE: {
--      double val = value->GetDouble();
--      return v8::Number::New(isolate, val);
--    }
--
--    case base::Value::Type::STRING: {
--      std::string val = value->GetString();
--      return v8::String::NewFromUtf8(isolate, val.c_str(),
--                                     v8::String::kNormalString, val.length());
--    }
--
--    case base::Value::Type::LIST:
--      return ToV8Array(isolate, static_cast<const base::ListValue*>(value));
--
--    case base::Value::Type::DICTIONARY:
--      return ToV8Object(isolate,
--                        static_cast<const base::DictionaryValue*>(value));
--
--    case base::Value::Type::BINARY:
--      return ToArrayBuffer(isolate, static_cast<const base::Value*>(value));
--
--    default:
--      LOG(ERROR) << "Unexpected value type: " << value->type();
--      return v8::Null(isolate);
--  }
--}
--
--v8::Local<v8::Value> V8ValueConverter::ToV8Array(
--    v8::Isolate* isolate,
--    const base::ListValue* val) const {
--  v8::Local<v8::Array> result(v8::Array::New(isolate, val->GetSize()));
--
--  for (size_t i = 0; i < val->GetSize(); ++i) {
--    const base::Value* child = nullptr;
--    val->Get(i, &child);
--
--    v8::Local<v8::Value> child_v8 = ToV8ValueImpl(isolate, child);
--
--    v8::TryCatch try_catch(isolate);
--    result->Set(static_cast<uint32_t>(i), child_v8);
--    if (try_catch.HasCaught())
--      LOG(ERROR) << "Setter for index " << i << " threw an exception.";
--  }
--
--  return result;
--}
--
--v8::Local<v8::Value> V8ValueConverter::ToV8Object(
--    v8::Isolate* isolate,
--    const base::DictionaryValue* val) const {
--  mate::Dictionary result = mate::Dictionary::CreateEmpty(isolate);
--  result.SetHidden("simple", true);
--
--  for (base::DictionaryValue::Iterator iter(*val); !iter.IsAtEnd();
--       iter.Advance()) {
--    const std::string& key = iter.key();
--    v8::Local<v8::Value> child_v8 = ToV8ValueImpl(isolate, &iter.value());
--
--    v8::TryCatch try_catch(isolate);
--    result.Set(key, child_v8);
--    if (try_catch.HasCaught()) {
--      LOG(ERROR) << "Setter for property " << key.c_str() << " threw an "
--                 << "exception.";
--    }
--  }
--
--  return result.GetHandle();
--}
--
--v8::Local<v8::Value> V8ValueConverter::ToArrayBuffer(
--    v8::Isolate* isolate,
--    const base::Value* value) const {
--  const char* data = value->GetBlob().data();
--  size_t length = value->GetBlob().size();
--
--  if (NodeBindings::IsInitialized()) {
--    return node::Buffer::Copy(isolate, data, length).ToLocalChecked();
--  }
--
--  if (length > node::Buffer::kMaxLength) {
--    return v8::Local<v8::Object>();
--  }
--  auto context = isolate->GetCurrentContext();
--  auto array_buffer = v8::ArrayBuffer::New(isolate, length);
--  memcpy(array_buffer->GetContents().Data(), data, length);
--  // From this point, if something goes wrong(can't find Buffer class for
--  // example) we'll simply return a Uint8Array based on the created ArrayBuffer.
--  // This can happen if no preload script was specified to the renderer.
--  mate::Dictionary global(isolate, context->Global());
--  v8::Local<v8::Value> buffer_value;
--
--  // Get the Buffer class stored as a hidden value in the global object. We'll
--  // use it return a browserified Buffer.
--  if (!global.GetHidden("Buffer", &buffer_value) ||
--      !buffer_value->IsFunction()) {
--    return v8::Uint8Array::New(array_buffer, 0, length);
--  }
--
--  mate::Dictionary buffer_class(
--      isolate,
--      buffer_value->ToObject(isolate->GetCurrentContext()).ToLocalChecked());
--  v8::Local<v8::Value> from_value;
--  if (!buffer_class.Get("from", &from_value) || !from_value->IsFunction()) {
--    return v8::Uint8Array::New(array_buffer, 0, length);
--  }
--
--  v8::Local<v8::Value> args[] = {array_buffer};
--  auto func = v8::Local<v8::Function>::Cast(from_value);
--  auto result = func->Call(context, v8::Null(isolate), 1, args);
--  if (!result.IsEmpty()) {
--    return result.ToLocalChecked();
--  }
--
--  return v8::Uint8Array::New(array_buffer, 0, length);
--}
--
--base::Value* V8ValueConverter::FromV8ValueImpl(FromV8ValueState* state,
--                                               v8::Local<v8::Value> val,
--                                               v8::Isolate* isolate) const {
--  FromV8ValueState::Level state_level(state);
--  if (state->HasReachedMaxRecursionDepth())
--    return nullptr;
--
--  if (val->IsExternal())
--    return std::make_unique<base::Value>().release();
--
--  if (val->IsNull())
--    return std::make_unique<base::Value>().release();
--
--  auto context = isolate->GetCurrentContext();
--
--  if (val->IsBoolean())
--    return new base::Value(val->ToBoolean(context).ToLocalChecked()->Value());
--
--  if (val->IsInt32())
--    return new base::Value(val->ToInt32(context).ToLocalChecked()->Value());
--
--  if (val->IsNumber()) {
--    double val_as_double = val->ToNumber(context).ToLocalChecked()->Value();
--    if (!std::isfinite(val_as_double))
--      return nullptr;
--    return new base::Value(val_as_double);
--  }
--
--  if (val->IsString()) {
--    v8::String::Utf8Value utf8(val->ToString(context).ToLocalChecked());
--    return new base::Value(std::string(*utf8, utf8.length()));
--  }
--
--  if (val->IsUndefined())
--    // JSON.stringify ignores undefined.
--    return nullptr;
--
--  if (val->IsDate()) {
--    v8::Date* date = v8::Date::Cast(*val);
--    v8::Local<v8::Value> toISOString =
--        date->Get(v8::String::NewFromUtf8(isolate, "toISOString"));
--    if (toISOString->IsFunction()) {
--      v8::Local<v8::Value> result =
--          toISOString.As<v8::Function>()->Call(val, 0, nullptr);
--      if (!result.IsEmpty()) {
--        v8::String::Utf8Value utf8(result->ToString(context).ToLocalChecked());
--        return new base::Value(std::string(*utf8, utf8.length()));
--      }
--    }
--  }
--
--  if (val->IsRegExp()) {
--    if (!reg_exp_allowed_)
--      // JSON.stringify converts to an object.
--      return FromV8Object(val->ToObject(context).ToLocalChecked(), state,
--                          isolate);
--    return new base::Value(
--        *v8::String::Utf8Value(val->ToString(context).ToLocalChecked()));
--  }
--
--  // v8::Value doesn't have a ToArray() method for some reason.
--  if (val->IsArray())
--    return FromV8Array(val.As<v8::Array>(), state, isolate);
--
--  if (val->IsFunction()) {
--    if (!function_allowed_)
--      // JSON.stringify refuses to convert function(){}.
--      return nullptr;
--    return FromV8Object(val->ToObject(context).ToLocalChecked(), state,
--                        isolate);
--  }
--
--  if (node::Buffer::HasInstance(val)) {
--    return FromNodeBuffer(val, state, isolate);
--  }
--
--  if (val->IsObject()) {
--    return FromV8Object(val->ToObject(context).ToLocalChecked(), state,
--                        isolate);
--  }
--
--  LOG(ERROR) << "Unexpected v8 value type encountered.";
--  return nullptr;
--}
--
--base::Value* V8ValueConverter::FromV8Array(v8::Local<v8::Array> val,
--                                           FromV8ValueState* state,
--                                           v8::Isolate* isolate) const {
--  ScopedUniquenessGuard uniqueness_guard(state, val);
--  if (!uniqueness_guard.is_valid())
--    return std::make_unique<base::Value>().release();
--
--  std::unique_ptr<v8::Context::Scope> scope;
--  // If val was created in a different context than our current one, change to
--  // that context, but change back after val is converted.
--  if (!val->CreationContext().IsEmpty() &&
--      val->CreationContext() != isolate->GetCurrentContext())
--    scope.reset(new v8::Context::Scope(val->CreationContext()));
--
--  auto* result = new base::ListValue();
--
--  // Only fields with integer keys are carried over to the ListValue.
--  for (uint32_t i = 0; i < val->Length(); ++i) {
--    v8::TryCatch try_catch(isolate);
--    v8::Local<v8::Value> child_v8 = val->Get(i);
--    if (try_catch.HasCaught()) {
--      LOG(ERROR) << "Getter for index " << i << " threw an exception.";
--      child_v8 = v8::Null(isolate);
--    }
--
--    if (!val->HasRealIndexedProperty(i))
--      continue;
--
--    base::Value* child = FromV8ValueImpl(state, child_v8, isolate);
--    if (child)
--      result->Append(std::unique_ptr<base::Value>(child));
--    else
--      // JSON.stringify puts null in places where values don't serialize, for
--      // example undefined and functions. Emulate that behavior.
--      result->Append(std::make_unique<base::Value>());
--  }
--  return result;
--}
--
--base::Value* V8ValueConverter::FromNodeBuffer(v8::Local<v8::Value> value,
--                                              FromV8ValueState* state,
--                                              v8::Isolate* isolate) const {
--  return new base::Value(std::vector<char>(
--      node::Buffer::Data(value),
--      node::Buffer::Data(value) + node::Buffer::Length(value)));
--}
--
--base::Value* V8ValueConverter::FromV8Object(v8::Local<v8::Object> val,
--                                            FromV8ValueState* state,
--                                            v8::Isolate* isolate) const {
--  ScopedUniquenessGuard uniqueness_guard(state, val);
--  if (!uniqueness_guard.is_valid())
--    return std::make_unique<base::Value>().release();
--
--  std::unique_ptr<v8::Context::Scope> scope;
--  // If val was created in a different context than our current one, change to
--  // that context, but change back after val is converted.
--  if (!val->CreationContext().IsEmpty() &&
--      val->CreationContext() != isolate->GetCurrentContext())
--    scope.reset(new v8::Context::Scope(val->CreationContext()));
--
--  auto result = std::make_unique<base::DictionaryValue>();
--  v8::Local<v8::Array> property_names(val->GetOwnPropertyNames());
--
--  for (uint32_t i = 0; i < property_names->Length(); ++i) {
--    v8::Local<v8::Value> key(property_names->Get(i));
--
--    // Extend this test to cover more types as necessary and if sensible.
--    if (!key->IsString() && !key->IsNumber()) {
--      NOTREACHED() << "Key \"" << *v8::String::Utf8Value(key)
--                   << "\" "
--                      "is neither a string nor a number";
--      continue;
--    }
--
--    v8::String::Utf8Value name_utf8(
--        key->ToString(isolate->GetCurrentContext()).ToLocalChecked());
--
--    v8::TryCatch try_catch(isolate);
--    v8::Local<v8::Value> child_v8 = val->Get(key);
--
--    if (try_catch.HasCaught()) {
--      LOG(ERROR) << "Getter for property " << *name_utf8
--                 << " threw an exception.";
--      child_v8 = v8::Null(isolate);
--    }
--
--    std::unique_ptr<base::Value> child(
--        FromV8ValueImpl(state, child_v8, isolate));
--    if (!child.get())
--      // JSON.stringify skips properties whose values don't serialize, for
--      // example undefined and functions. Emulate that behavior.
--      continue;
--
--    // Strip null if asked (and since undefined is turned into null, undefined
--    // too). The use case for supporting this is JSON-schema support,
--    // specifically for extensions, where "optional" JSON properties may be
--    // represented as null, yet due to buggy legacy code elsewhere isn't
--    // treated as such (potentially causing crashes). For example, the
--    // "tabs.create" function takes an object as its first argument with an
--    // optional "windowId" property.
--    //
--    // Given just
--    //
--    //   tabs.create({})
--    //
--    // this will work as expected on code that only checks for the existence of
--    // a "windowId" property (such as that legacy code). However given
--    //
--    //   tabs.create({windowId: null})
--    //
--    // there *is* a "windowId" property, but since it should be an int, code
--    // on the browser which doesn't additionally check for null will fail.
--    // We can avoid all bugs related to this by stripping null.
--    if (strip_null_from_objects_ && child->is_none())
--      continue;
--
--    result->SetWithoutPathExpansion(std::string(*name_utf8, name_utf8.length()),
--                                    std::move(child));
--  }
--
--  return result.release();
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 632587022d14424fac08b0afde870f0ece298284 atom/common/native_mate_converters/v8_value_converter.h
-  our    100644 353f5d13597fa0cefee8d99a0b8bcfa007498aa1 atom/common/native_mate_converters/v8_value_converter.h
-@@ -1,74 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_COMMON_NATIVE_MATE_CONVERTERS_V8_VALUE_CONVERTER_H_
--#define ATOM_COMMON_NATIVE_MATE_CONVERTERS_V8_VALUE_CONVERTER_H_
--
--#include "base/compiler_specific.h"
--#include "base/macros.h"
--#include "v8/include/v8.h"
--
--namespace base {
--class DictionaryValue;
--class ListValue;
--class Value;
--}  // namespace base
--
--namespace atom {
--
--class V8ValueConverter {
-- public:
--  V8ValueConverter();
--
--  void SetRegExpAllowed(bool val);
--  void SetFunctionAllowed(bool val);
--  void SetStripNullFromObjects(bool val);
--  v8::Local<v8::Value> ToV8Value(const base::Value* value,
--                                 v8::Local<v8::Context> context) const;
--  base::Value* FromV8Value(v8::Local<v8::Value> value,
--                           v8::Local<v8::Context> context) const;
--
-- private:
--  class FromV8ValueState;
--  class ScopedUniquenessGuard;
--
--  v8::Local<v8::Value> ToV8ValueImpl(v8::Isolate* isolate,
--                                     const base::Value* value) const;
--  v8::Local<v8::Value> ToV8Array(v8::Isolate* isolate,
--                                 const base::ListValue* list) const;
--  v8::Local<v8::Value> ToV8Object(
--      v8::Isolate* isolate,
--      const base::DictionaryValue* dictionary) const;
--  v8::Local<v8::Value> ToArrayBuffer(v8::Isolate* isolate,
--                                     const base::Value* value) const;
--
--  base::Value* FromV8ValueImpl(FromV8ValueState* state,
--                               v8::Local<v8::Value> value,
--                               v8::Isolate* isolate) const;
--  base::Value* FromV8Array(v8::Local<v8::Array> array,
--                           FromV8ValueState* state,
--                           v8::Isolate* isolate) const;
--  base::Value* FromNodeBuffer(v8::Local<v8::Value> value,
--                              FromV8ValueState* state,
--                              v8::Isolate* isolate) const;
--  base::Value* FromV8Object(v8::Local<v8::Object> object,
--                            FromV8ValueState* state,
--                            v8::Isolate* isolate) const;
--
--  // If true, we will convert RegExp JavaScript objects to string.
--  bool reg_exp_allowed_ = false;
--
--  // If true, we will convert Function JavaScript objects to dictionaries.
--  bool function_allowed_ = false;
--
--  // If true, undefined and null values are ignored when converting v8 objects
--  // into Values.
--  bool strip_null_from_objects_ = false;
--
--  DISALLOW_COPY_AND_ASSIGN(V8ValueConverter);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_COMMON_NATIVE_MATE_CONVERTERS_V8_VALUE_CONVERTER_H_
-removed in remote
-  base   100644 c9c1a861ba26d9cfdc68292427ca2f86fba7685e atom/common/native_mate_converters/value_converter.cc
-  our    100644 a71cc70f83d2526596a75d8daf036f905ca099be atom/common/native_mate_converters/value_converter.cc
-@@ -1,74 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/common/native_mate_converters/value_converter.h"
--
--#include "atom/common/native_mate_converters/v8_value_converter.h"
--#include "base/values.h"
--
--namespace mate {
--
--bool Converter<base::DictionaryValue>::FromV8(v8::Isolate* isolate,
--                                              v8::Local<v8::Value> val,
--                                              base::DictionaryValue* out) {
--  atom::V8ValueConverter converter;
--  std::unique_ptr<base::Value> value(
--      converter.FromV8Value(val, isolate->GetCurrentContext()));
--  if (value && value->is_dict()) {
--    out->Swap(static_cast<base::DictionaryValue*>(value.get()));
--    return true;
--  } else {
--    return false;
--  }
--}
--
--v8::Local<v8::Value> Converter<base::DictionaryValue>::ToV8(
--    v8::Isolate* isolate,
--    const base::DictionaryValue& val) {
--  atom::V8ValueConverter converter;
--  return converter.ToV8Value(&val, isolate->GetCurrentContext());
--}
--
--bool Converter<base::Value>::FromV8(v8::Isolate* isolate,
--                                    v8::Local<v8::Value> val,
--                                    base::Value* out) {
--  atom::V8ValueConverter converter;
--  std::unique_ptr<base::Value> value(
--      converter.FromV8Value(val, isolate->GetCurrentContext()));
--  if (value) {
--    *out = value->Clone();
--    return true;
--  } else {
--    return false;
--  }
--}
--
--v8::Local<v8::Value> Converter<base::Value>::ToV8(v8::Isolate* isolate,
--                                                  const base::Value& val) {
--  atom::V8ValueConverter converter;
--  return converter.ToV8Value(&val, isolate->GetCurrentContext());
--}
--
--bool Converter<base::ListValue>::FromV8(v8::Isolate* isolate,
--                                        v8::Local<v8::Value> val,
--                                        base::ListValue* out) {
--  atom::V8ValueConverter converter;
--  std::unique_ptr<base::Value> value(
--      converter.FromV8Value(val, isolate->GetCurrentContext()));
--  if (value->is_list()) {
--    out->Swap(static_cast<base::ListValue*>(value.get()));
--    return true;
--  } else {
--    return false;
--  }
--}
--
--v8::Local<v8::Value> Converter<base::ListValue>::ToV8(
--    v8::Isolate* isolate,
--    const base::ListValue& val) {
--  atom::V8ValueConverter converter;
--  return converter.ToV8Value(&val, isolate->GetCurrentContext());
--}
--
--}  // namespace mate
-removed in remote
-  base   100644 013dd99cc7980a2636b04c6b700dc55fa53385cb atom/common/native_mate_converters/value_converter.h
-  our    100644 b2ea5def0aa9646791c635c15e0ed504dc0af465 atom/common/native_mate_converters/value_converter.h
-@@ -1,47 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_COMMON_NATIVE_MATE_CONVERTERS_VALUE_CONVERTER_H_
--#define ATOM_COMMON_NATIVE_MATE_CONVERTERS_VALUE_CONVERTER_H_
--
--#include "native_mate/converter.h"
--
--namespace base {
--class DictionaryValue;
--class ListValue;
--class Value;
--}  // namespace base
--
--namespace mate {
--
--template <>
--struct Converter<base::DictionaryValue> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     base::DictionaryValue* out);
--  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
--                                   const base::DictionaryValue& val);
--};
--
--template <>
--struct Converter<base::Value> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     base::Value* out);
--  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
--                                   const base::Value& val);
--};
--
--template <>
--struct Converter<base::ListValue> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     base::ListValue* out);
--  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
--                                   const base::ListValue& val);
--};
--
--}  // namespace mate
--
--#endif  // ATOM_COMMON_NATIVE_MATE_CONVERTERS_VALUE_CONVERTER_H_
-removed in remote
-  base   100644 b0b4148c7baf2f4970d7211bb368591a695ca727 atom/common/node_bindings.cc
-  our    100644 e6aded2e661af919c2d89c2f9bd46b4921d4aec4 atom/common/node_bindings.cc
-@@ -1,384 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/common/node_bindings.h"
--
--#include <algorithm>
--#include <string>
--#include <vector>
--
--#include "atom/common/api/event_emitter_caller.h"
--#include "atom/common/api/locker.h"
--#include "atom/common/atom_command_line.h"
--#include "atom/common/native_mate_converters/file_path_converter.h"
--#include "base/base_paths.h"
--#include "base/command_line.h"
--#include "base/environment.h"
--#include "base/path_service.h"
--#include "base/run_loop.h"
--#include "base/strings/utf_string_conversions.h"
--#include "base/threading/thread_task_runner_handle.h"
--#include "base/trace_event/trace_event.h"
--#include "content/public/browser/browser_thread.h"
--#include "content/public/common/content_paths.h"
--#include "native_mate/dictionary.h"
--
--#include "atom/common/node_includes.h"
--
--#define ELECTRON_BUILTIN_MODULES(V)          \
--  V(atom_browser_app)                        \
--  V(atom_browser_auto_updater)               \
--  V(atom_browser_browser_view)               \
--  V(atom_browser_content_tracing)            \
--  V(atom_browser_debugger)                   \
--  V(atom_browser_dialog)                     \
--  V(atom_browser_download_item)              \
--  V(atom_browser_global_shortcut)            \
--  V(atom_browser_in_app_purchase)            \
--  V(atom_browser_menu)                       \
--  V(atom_browser_net)                        \
--  V(atom_browser_net_log)                    \
--  V(atom_browser_power_monitor)              \
--  V(atom_browser_power_save_blocker)         \
--  V(atom_browser_protocol)                   \
--  V(atom_browser_render_process_preferences) \
--  V(atom_browser_session)                    \
--  V(atom_browser_system_preferences)         \
--  V(atom_browser_top_level_window)           \
--  V(atom_browser_tray)                       \
--  V(atom_browser_web_contents)               \
--  V(atom_browser_web_contents_view)          \
--  V(atom_browser_view)                       \
--  V(atom_browser_web_view_manager)           \
--  V(atom_browser_window)                     \
--  V(atom_common_asar)                        \
--  V(atom_common_clipboard)                   \
--  V(atom_common_crash_reporter)              \
--  V(atom_common_features)                    \
--  V(atom_common_native_image)                \
--  V(atom_common_notification)                \
--  V(atom_common_screen)                      \
--  V(atom_common_shell)                       \
--  V(atom_common_v8_util)                     \
--  V(atom_renderer_ipc)                       \
--  V(atom_renderer_web_frame)
--
--#define ELECTRON_VIEW_MODULES(V) \
--  V(atom_browser_box_layout)     \
--  V(atom_browser_button)         \
--  V(atom_browser_label_button)   \
--  V(atom_browser_layout_manager) \
--  V(atom_browser_text_field)
--
--#define ELECTRON_DESKTOP_CAPTURER_MODULE(V) V(atom_browser_desktop_capturer)
--
--// This is used to load built-in modules. Instead of using
--// __attribute__((constructor)), we call the _register_<modname>
--// function for each built-in modules explicitly. This is only
--// forward declaration. The definitions are in each module's
--// implementation when calling the NODE_BUILTIN_MODULE_CONTEXT_AWARE.
--#define V(modname) void _register_##modname();
--ELECTRON_BUILTIN_MODULES(V)
--#if defined(ENABLE_VIEW_API)
--ELECTRON_VIEW_MODULES(V)
--#endif
--#if defined(ENABLE_DESKTOP_CAPTURER)
--ELECTRON_DESKTOP_CAPTURER_MODULE(V)
--#endif
--#undef V
--
--namespace {
--
--void stop_and_close_uv_loop(uv_loop_t* loop) {
--  // Close any active handles
--  uv_stop(loop);
--  uv_walk(loop,
--          [](uv_handle_t* handle, void*) {
--            if (!uv_is_closing(handle)) {
--              uv_close(handle, nullptr);
--            }
--          },
--          nullptr);
--
--  // Run the loop to let it finish all the closing handles
--  // NB: after uv_stop(), uv_run(UV_RUN_DEFAULT) returns 0 when that's done
--  for (;;)
--    if (!uv_run(loop, UV_RUN_DEFAULT))
--      break;
--
--  DCHECK(!uv_loop_alive(loop));
--  uv_loop_close(loop);
--}
--
--bool g_is_initialized = false;
--
--}  // namespace
--
--namespace atom {
--
--namespace {
--
--// Convert the given vector to an array of C-strings. The strings in the
--// returned vector are only guaranteed valid so long as the vector of strings
--// is not modified.
--std::unique_ptr<const char* []> StringVectorToArgArray(
--    const std::vector<std::string>& vector) {
--  std::unique_ptr<const char* []> array(new const char*[vector.size()]);
--  for (size_t i = 0; i < vector.size(); ++i) {
--    array[i] = vector[i].c_str();
--  }
--  return array;
--}
--
--base::FilePath GetResourcesPath(bool is_browser) {
--  auto* command_line = base::CommandLine::ForCurrentProcess();
--  base::FilePath exec_path(command_line->GetProgram());
--  PathService::Get(base::FILE_EXE, &exec_path);
--
--  base::FilePath resources_path =
--#if defined(OS_MACOSX)
--      is_browser
--          ? exec_path.DirName().DirName().Append("Resources")
--          : exec_path.DirName().DirName().DirName().DirName().DirName().Append(
--                "Resources");
--#else
--      exec_path.DirName().Append(FILE_PATH_LITERAL("resources"));
--#endif
--  return resources_path;
--}
--
--}  // namespace
--
--NodeBindings::NodeBindings(BrowserEnvironment browser_env)
--    : browser_env_(browser_env), weak_factory_(this) {
--  if (browser_env == WORKER) {
--    uv_loop_init(&worker_loop_);
--    uv_loop_ = &worker_loop_;
--  } else {
--    uv_loop_ = uv_default_loop();
--  }
--}
--
--NodeBindings::~NodeBindings() {
--  // Quit the embed thread.
--  embed_closed_ = true;
--  uv_sem_post(&embed_sem_);
--  WakeupEmbedThread();
--
--  // Wait for everything to be done.
--  uv_thread_join(&embed_thread_);
--
--  // Clear uv.
--  uv_sem_destroy(&embed_sem_);
--  uv_close(reinterpret_cast<uv_handle_t*>(&dummy_uv_handle_), nullptr);
--
--  // Clean up worker loop
--  if (uv_loop_ == &worker_loop_)
--    stop_and_close_uv_loop(uv_loop_);
--}
--
--void NodeBindings::RegisterBuiltinModules() {
--#define V(modname) _register_##modname();
--  ELECTRON_BUILTIN_MODULES(V)
--#if defined(ENABLE_VIEW_API)
--  ELECTRON_VIEW_MODULES(V)
--#endif
--#if defined(ENABLE_DESKTOP_CAPTURER)
--  ELECTRON_DESKTOP_CAPTURER_MODULE(V)
--#endif
--#undef V
--}
--
--bool NodeBindings::IsInitialized() {
--  return g_is_initialized;
--}
--
--base::FilePath::StringType NodeBindings::GetHelperResourcesPath() {
--  return GetResourcesPath(false).value();
--}
--
--void NodeBindings::Initialize() {
--  // Open node's error reporting system for browser process.
--  node::g_standalone_mode = browser_env_ == BROWSER;
--  node::g_upstream_node_mode = false;
--
--#if defined(OS_LINUX)
--  // Get real command line in renderer process forked by zygote.
--  if (browser_env_ != BROWSER)
--    AtomCommandLine::InitializeFromCommandLine();
--#endif
--
--  // Explicitly register electron's builtin modules.
--  RegisterBuiltinModules();
--
--  // Init node.
--  // (we assume node::Init would not modify the parameters under embedded mode).
--  node::Init(nullptr, nullptr, nullptr, nullptr);
--
--#if defined(OS_WIN)
--  // uv_init overrides error mode to suppress the default crash dialog, bring
--  // it back if user wants to show it.
--  std::unique_ptr<base::Environment> env(base::Environment::Create());
--  if (browser_env_ == BROWSER || env->HasVar("ELECTRON_DEFAULT_ERROR_MODE"))
--    SetErrorMode(GetErrorMode() & ~SEM_NOGPFAULTERRORBOX);
--#endif
--
--  g_is_initialized = true;
--}
--
--node::Environment* NodeBindings::CreateEnvironment(
--    v8::Handle<v8::Context> context,
--    node::MultiIsolatePlatform* platform) {
--#if defined(OS_WIN)
--  auto& atom_args = AtomCommandLine::argv();
--  std::vector<std::string> args(atom_args.size());
--  std::transform(atom_args.cbegin(), atom_args.cend(), args.begin(),
--                 [](auto& a) { return base::WideToUTF8(a); });
--#else
--  auto args = AtomCommandLine::argv();
--#endif
--
--  // Feed node the path to initialization script.
--  base::FilePath::StringType process_type;
--  switch (browser_env_) {
--    case BROWSER:
--      process_type = FILE_PATH_LITERAL("browser");
--      break;
--    case RENDERER:
--      process_type = FILE_PATH_LITERAL("renderer");
--      break;
--    case WORKER:
--      process_type = FILE_PATH_LITERAL("worker");
--      break;
--  }
--  base::FilePath resources_path = GetResourcesPath(browser_env_ == BROWSER);
--  base::FilePath script_path =
--      resources_path.Append(FILE_PATH_LITERAL("electron.asar"))
--          .Append(process_type)
--          .Append(FILE_PATH_LITERAL("init.js"));
--  args.insert(args.begin() + 1, script_path.AsUTF8Unsafe());
--
--  std::unique_ptr<const char* []> c_argv = StringVectorToArgArray(args);
--  node::Environment* env = node::CreateEnvironment(
--      node::CreateIsolateData(context->GetIsolate(), uv_loop_, platform),
--      context, args.size(), c_argv.get(), 0, nullptr);
--
--  if (browser_env_ == BROWSER) {
--    // SetAutorunMicrotasks is no longer called in node::CreateEnvironment
--    // so instead call it here to match expected node behavior
--    context->GetIsolate()->SetMicrotasksPolicy(v8::MicrotasksPolicy::kExplicit);
--  } else {
--    // Node uses the deprecated SetAutorunMicrotasks(false) mode, we should
--    // switch to use the scoped policy to match blink's behavior.
--    context->GetIsolate()->SetMicrotasksPolicy(v8::MicrotasksPolicy::kScoped);
--  }
--
--  mate::Dictionary process(context->GetIsolate(), env->process_object());
--  process.Set("type", process_type);
--  process.Set("resourcesPath", resources_path);
--  // Do not set DOM globals for renderer process.
--  if (browser_env_ != BROWSER)
--    process.Set("_noBrowserGlobals", resources_path);
--  // The path to helper app.
--  base::FilePath helper_exec_path;
--  PathService::Get(content::CHILD_PROCESS_EXE, &helper_exec_path);
--  process.Set("helperExecPath", helper_exec_path);
--
--  return env;
--}
--
--void NodeBindings::LoadEnvironment(node::Environment* env) {
--  node::LoadEnvironment(env);
--  mate::EmitEvent(env->isolate(), env->process_object(), "loaded");
--}
--
--void NodeBindings::PrepareMessageLoop() {
--  // Add dummy handle for libuv, otherwise libuv would quit when there is
--  // nothing to do.
--  uv_async_init(uv_loop_, &dummy_uv_handle_, nullptr);
--
--  // Start worker that will interrupt main loop when having uv events.
--  uv_sem_init(&embed_sem_, 0);
--  uv_thread_create(&embed_thread_, EmbedThreadRunner, this);
--}
--
--void NodeBindings::RunMessageLoop() {
--  // The MessageLoop should have been created, remember the one in main thread.
--  task_runner_ = base::ThreadTaskRunnerHandle::Get();
--
--  // Run uv loop for once to give the uv__io_poll a chance to add all events.
--  UvRunOnce();
--}
--
--void NodeBindings::UvRunOnce() {
--  node::Environment* env = uv_env();
--
--  // When doing navigation without restarting renderer process, it may happen
--  // that the node environment is destroyed but the message loop is still there.
--  // In this case we should not run uv loop.
--  if (!env)
--    return;
--
--  // Use Locker in browser process.
--  mate::Locker locker(env->isolate());
--  v8::HandleScope handle_scope(env->isolate());
--
--  // Enter node context while dealing with uv events.
--  v8::Context::Scope context_scope(env->context());
--
--  // Perform microtask checkpoint after running JavaScript.
--  v8::MicrotasksScope script_scope(env->isolate(),
--                                   v8::MicrotasksScope::kRunMicrotasks);
--
--  if (browser_env_ != BROWSER)
--    TRACE_EVENT_BEGIN0("devtools.timeline", "FunctionCall");
--
--  // Deal with uv events.
--  int r = uv_run(uv_loop_, UV_RUN_NOWAIT);
--
--  if (browser_env_ != BROWSER)
--    TRACE_EVENT_END0("devtools.timeline", "FunctionCall");
--
--  if (r == 0)
--    base::RunLoop().QuitWhenIdle();  // Quit from uv.
--
--  // Tell the worker thread to continue polling.
--  uv_sem_post(&embed_sem_);
--}
--
--void NodeBindings::WakeupMainThread() {
--  DCHECK(task_runner_);
--  task_runner_->PostTask(FROM_HERE, base::BindOnce(&NodeBindings::UvRunOnce,
--                                                   weak_factory_.GetWeakPtr()));
--}
--
--void NodeBindings::WakeupEmbedThread() {
--  uv_async_send(&dummy_uv_handle_);
--}
--
--// static
--void NodeBindings::EmbedThreadRunner(void* arg) {
--  NodeBindings* self = static_cast<NodeBindings*>(arg);
--
--  while (true) {
--    // Wait for the main loop to deal with events.
--    uv_sem_wait(&self->embed_sem_);
--    if (self->embed_closed_)
--      break;
--
--    // Wait for something to happen in uv loop.
--    // Note that the PollEvents() is implemented by derived classes, so when
--    // this class is being destructed the PollEvents() would not be available
--    // anymore. Because of it we must make sure we only invoke PollEvents()
--    // when this class is alive.
--    self->PollEvents();
--    if (self->embed_closed_)
--      break;
--
--    // Deal with event in main thread.
--    self->WakeupMainThread();
--  }
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 16d512d3bed038c08d9d3c25da727ea9640f4f49 atom/common/node_bindings.h
-  our    100644 5e5ec8e5300ba2c1917e3e9d7e2e8ea1ee341e3b atom/common/node_bindings.h
-@@ -1,117 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_COMMON_NODE_BINDINGS_H_
--#define ATOM_COMMON_NODE_BINDINGS_H_
--
--#include "base/files/file_path.h"
--#include "base/macros.h"
--#include "base/memory/weak_ptr.h"
--#include "base/single_thread_task_runner.h"
--#include "uv.h"  // NOLINT(build/include)
--#include "v8/include/v8.h"
--
--namespace base {
--class MessageLoop;
--}
--
--namespace node {
--class Environment;
--class MultiIsolatePlatform;
--}  // namespace node
--
--namespace atom {
--
--class NodeBindings {
-- public:
--  enum BrowserEnvironment {
--    BROWSER,
--    RENDERER,
--    WORKER,
--  };
--
--  static NodeBindings* Create(BrowserEnvironment browser_env);
--  static void RegisterBuiltinModules();
--  static bool IsInitialized();
--  static base::FilePath::StringType GetHelperResourcesPath();
--
--  virtual ~NodeBindings();
--
--  // Setup V8, libuv.
--  void Initialize();
--
--  // Create the environment and load node.js.
--  node::Environment* CreateEnvironment(
--      v8::Handle<v8::Context> context,
--      node::MultiIsolatePlatform* platform = nullptr);
--
--  // Load node.js in the environment.
--  void LoadEnvironment(node::Environment* env);
--
--  // Prepare for message loop integration.
--  void PrepareMessageLoop();
--
--  // Do message loop integration.
--  virtual void RunMessageLoop();
--
--  // Gets/sets the environment to wrap uv loop.
--  void set_uv_env(node::Environment* env) { uv_env_ = env; }
--  node::Environment* uv_env() const { return uv_env_; }
--
--  uv_loop_t* uv_loop() const { return uv_loop_; }
--
-- protected:
--  explicit NodeBindings(BrowserEnvironment browser_env);
--
--  // Called to poll events in new thread.
--  virtual void PollEvents() = 0;
--
--  // Run the libuv loop for once.
--  void UvRunOnce();
--
--  // Make the main thread run libuv loop.
--  void WakeupMainThread();
--
--  // Interrupt the PollEvents.
--  void WakeupEmbedThread();
--
--  // Which environment we are running.
--  BrowserEnvironment browser_env_;
--
--  // Current thread's MessageLoop.
--  scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
--
--  // Current thread's libuv loop.
--  uv_loop_t* uv_loop_;
--
-- private:
--  // Thread to poll uv events.
--  static void EmbedThreadRunner(void* arg);
--
--  // Whether the libuv loop has ended.
--  bool embed_closed_ = false;
--
--  // Loop used when constructed in WORKER mode
--  uv_loop_t worker_loop_;
--
--  // Dummy handle to make uv's loop not quit.
--  uv_async_t dummy_uv_handle_;
--
--  // Thread for polling events.
--  uv_thread_t embed_thread_;
--
--  // Semaphore to wait for main loop in the embed thread.
--  uv_sem_t embed_sem_;
--
--  // Environment that to wrap the uv loop.
--  node::Environment* uv_env_ = nullptr;
--
--  base::WeakPtrFactory<NodeBindings> weak_factory_;
--
--  DISALLOW_COPY_AND_ASSIGN(NodeBindings);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_COMMON_NODE_BINDINGS_H_
-removed in remote
-  base   100644 34b9ea952365eb5875ac9e9faea1641f3f5a225e atom/common/node_bindings_linux.cc
-  our    100644 3c58cb67a072387c4b203697ece022c19d45f7ed atom/common/node_bindings_linux.cc
-@@ -1,55 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/common/node_bindings_linux.h"
--
--#include <sys/epoll.h>
--
--namespace atom {
--
--NodeBindingsLinux::NodeBindingsLinux(BrowserEnvironment browser_env)
--    : NodeBindings(browser_env), epoll_(epoll_create(1)) {
--  int backend_fd = uv_backend_fd(uv_loop_);
--  struct epoll_event ev = {0};
--  ev.events = EPOLLIN;
--  ev.data.fd = backend_fd;
--  epoll_ctl(epoll_, EPOLL_CTL_ADD, backend_fd, &ev);
--}
--
--NodeBindingsLinux::~NodeBindingsLinux() {}
--
--void NodeBindingsLinux::RunMessageLoop() {
--  // Get notified when libuv's watcher queue changes.
--  uv_loop_->data = this;
--  uv_loop_->on_watcher_queue_updated = OnWatcherQueueChanged;
--
--  NodeBindings::RunMessageLoop();
--}
--
--// static
--void NodeBindingsLinux::OnWatcherQueueChanged(uv_loop_t* loop) {
--  NodeBindingsLinux* self = static_cast<NodeBindingsLinux*>(loop->data);
--
--  // We need to break the io polling in the epoll thread when loop's watcher
--  // queue changes, otherwise new events cannot be notified.
--  self->WakeupEmbedThread();
--}
--
--void NodeBindingsLinux::PollEvents() {
--  int timeout = uv_backend_timeout(uv_loop_);
--
--  // Wait for new libuv events.
--  int r;
--  do {
--    struct epoll_event ev;
--    r = epoll_wait(epoll_, &ev, 1, timeout);
--  } while (r == -1 && errno == EINTR);
--}
--
--// static
--NodeBindings* NodeBindings::Create(BrowserEnvironment browser_env) {
--  return new NodeBindingsLinux(browser_env);
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 3bbea9f9dd0a315a32880f87da5e3d5c7c5a1cbc atom/common/node_bindings_linux.h
-  our    100644 15d9b33eb047bfd9fc92bb1458989c4238e0d9d2 atom/common/node_bindings_linux.h
-@@ -1,34 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_COMMON_NODE_BINDINGS_LINUX_H_
--#define ATOM_COMMON_NODE_BINDINGS_LINUX_H_
--
--#include "atom/common/node_bindings.h"
--#include "base/compiler_specific.h"
--
--namespace atom {
--
--class NodeBindingsLinux : public NodeBindings {
-- public:
--  explicit NodeBindingsLinux(BrowserEnvironment browser_env);
--  ~NodeBindingsLinux() override;
--
--  void RunMessageLoop() override;
--
-- private:
--  // Called when uv's watcher queue changes.
--  static void OnWatcherQueueChanged(uv_loop_t* loop);
--
--  void PollEvents() override;
--
--  // Epoll to poll for uv's backend fd.
--  int epoll_;
--
--  DISALLOW_COPY_AND_ASSIGN(NodeBindingsLinux);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_COMMON_NODE_BINDINGS_LINUX_H_
-removed in remote
-  base   100644 877497d5a1e2b0748072fc539596a5d7b3b1f417 atom/common/node_bindings_mac.cc
-  our    100644 856b9cc868a51e1ca754da2a24682780ed9100b4 atom/common/node_bindings_mac.cc
-@@ -1,65 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/common/node_bindings_mac.h"
--
--#include <errno.h>
--#include <sys/select.h>
--#include <sys/sysctl.h>
--#include <sys/time.h>
--#include <sys/types.h>
--
--#include "atom/common/node_includes.h"
--
--namespace atom {
--
--NodeBindingsMac::NodeBindingsMac(BrowserEnvironment browser_env)
--    : NodeBindings(browser_env) {}
--
--NodeBindingsMac::~NodeBindingsMac() {}
--
--void NodeBindingsMac::RunMessageLoop() {
--  // Get notified when libuv's watcher queue changes.
--  uv_loop_->data = this;
--  uv_loop_->on_watcher_queue_updated = OnWatcherQueueChanged;
--
--  NodeBindings::RunMessageLoop();
--}
--
--// static
--void NodeBindingsMac::OnWatcherQueueChanged(uv_loop_t* loop) {
--  NodeBindingsMac* self = static_cast<NodeBindingsMac*>(loop->data);
--
--  // We need to break the io polling in the kqueue thread when loop's watcher
--  // queue changes, otherwise new events cannot be notified.
--  self->WakeupEmbedThread();
--}
--
--void NodeBindingsMac::PollEvents() {
--  struct timeval tv;
--  int timeout = uv_backend_timeout(uv_loop_);
--  if (timeout != -1) {
--    tv.tv_sec = timeout / 1000;
--    tv.tv_usec = (timeout % 1000) * 1000;
--  }
--
--  fd_set readset;
--  int fd = uv_backend_fd(uv_loop_);
--  FD_ZERO(&readset);
--  FD_SET(fd, &readset);
--
--  // Wait for new libuv events.
--  int r;
--  do {
--    r = select(fd + 1, &readset, nullptr, nullptr,
--               timeout == -1 ? nullptr : &tv);
--  } while (r == -1 && errno == EINTR);
--}
--
--// static
--NodeBindings* NodeBindings::Create(BrowserEnvironment browser_env) {
--  return new NodeBindingsMac(browser_env);
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 03152ada3ea698af3c9d6297f219cdd9127ecbe9 atom/common/node_bindings_mac.h
-  our    100644 a0f93d8755eda701d12833e425bf1bb580790c5b atom/common/node_bindings_mac.h
-@@ -1,31 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_COMMON_NODE_BINDINGS_MAC_H_
--#define ATOM_COMMON_NODE_BINDINGS_MAC_H_
--
--#include "atom/common/node_bindings.h"
--#include "base/compiler_specific.h"
--
--namespace atom {
--
--class NodeBindingsMac : public NodeBindings {
-- public:
--  explicit NodeBindingsMac(BrowserEnvironment browser_env);
--  ~NodeBindingsMac() override;
--
--  void RunMessageLoop() override;
--
-- private:
--  // Called when uv's watcher queue changes.
--  static void OnWatcherQueueChanged(uv_loop_t* loop);
--
--  void PollEvents() override;
--
--  DISALLOW_COPY_AND_ASSIGN(NodeBindingsMac);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_COMMON_NODE_BINDINGS_MAC_H_
-removed in remote
-  base   100644 b8de4f59da3b79d62e880dee7ee35707533c3536 atom/common/node_bindings_win.cc
-  our    100644 e41fb585f57114de00376f52e0d97277e6eca94b atom/common/node_bindings_win.cc
-@@ -1,39 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/common/node_bindings_win.h"
--
--#include <windows.h>
--
--#include "base/logging.h"
--
--namespace atom {
--
--NodeBindingsWin::NodeBindingsWin(BrowserEnvironment browser_env)
--    : NodeBindings(browser_env) {}
--
--NodeBindingsWin::~NodeBindingsWin() {}
--
--void NodeBindingsWin::PollEvents() {
--  // If there are other kinds of events pending, uv_backend_timeout will
--  // instruct us not to wait.
--  DWORD bytes, timeout;
--  ULONG_PTR key;
--  OVERLAPPED* overlapped;
--
--  timeout = uv_backend_timeout(uv_loop_);
--
--  GetQueuedCompletionStatus(uv_loop_->iocp, &bytes, &key, &overlapped, timeout);
--
--  // Give the event back so libuv can deal with it.
--  if (overlapped != NULL)
--    PostQueuedCompletionStatus(uv_loop_->iocp, bytes, key, overlapped);
--}
--
--// static
--NodeBindings* NodeBindings::Create(BrowserEnvironment browser_env) {
--  return new NodeBindingsWin(browser_env);
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 3950098e5ebfba8c2a19618f366a24ef37455a86 atom/common/node_bindings_win.h
-  our    100644 77fe5f43b54c8d53bfc5a4a29c9c0a6f62bea423 atom/common/node_bindings_win.h
-@@ -1,26 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_COMMON_NODE_BINDINGS_WIN_H_
--#define ATOM_COMMON_NODE_BINDINGS_WIN_H_
--
--#include "atom/common/node_bindings.h"
--#include "base/compiler_specific.h"
--
--namespace atom {
--
--class NodeBindingsWin : public NodeBindings {
-- public:
--  explicit NodeBindingsWin(BrowserEnvironment browser_env);
--  ~NodeBindingsWin() override;
--
-- private:
--  void PollEvents() override;
--
--  DISALLOW_COPY_AND_ASSIGN(NodeBindingsWin);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_COMMON_NODE_BINDINGS_WIN_H_
-removed in remote
-  base   100644 bb76afb54db9e806a68cfe797f7af79c6b3ef199 atom/common/node_includes.h
-  our    100644 fa1a7499a8b082fe9007f04041b46e58502b3ad9 atom/common/node_includes.h
-@@ -1,54 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_COMMON_NODE_INCLUDES_H_
--#define ATOM_COMMON_NODE_INCLUDES_H_
--
--#include "base/logging.h"
--
--// Include common headers for using node APIs.
--
--#ifdef NODE_SHARED_MODE
--#define BUILDING_NODE_EXTENSION
--#endif
--
--// The following define makes sure that we do not include the macros
--// again. But we still need the tracing functions, so declaring them.
--#define SRC_TRACING_TRACE_EVENT_H_
--
--#undef ASSERT
--#undef CHECK
--#undef CHECK_EQ
--#undef CHECK_NE
--#undef CHECK_GE
--#undef CHECK_GT
--#undef CHECK_LE
--#undef CHECK_LT
--#undef UNLIKELY
--#undef DISALLOW_COPY_AND_ASSIGN
--#undef NO_RETURN
--#undef LIKELY
--#undef arraysize
--#undef debug_string  // This is defined in macOS 10.9 SDK in AssertMacros.h.
--#include "env-inl.h"
--#include "env.h"
--#include "node.h"
--#include "node_buffer.h"
--#include "node_debug_options.h"
--#include "node_internals.h"
--#include "node_platform.h"
--
--namespace node {
--namespace tracing {
--
--class TraceEventHelper {
-- public:
--  static v8::TracingController* GetTracingController();
--  static void SetTracingController(v8::TracingController* controller);
--};
--
--}  // namespace tracing
--}  // namespace node
--
--#endif  // ATOM_COMMON_NODE_INCLUDES_H_
-removed in remote
-  base   100644 ac63ea1b7276fc93f5d47ffaa624e080d95d6939 atom/common/options_switches.cc
-  our    100644 8b1836f80c583e4db68971ff1b00ca4f86356b45 atom/common/options_switches.cc
-@@ -1,221 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/common/options_switches.h"
--
--namespace atom {
--
--namespace options {
--
--const char kTitle[] = "title";
--const char kIcon[] = "icon";
--const char kFrame[] = "frame";
--const char kShow[] = "show";
--const char kCenter[] = "center";
--const char kX[] = "x";
--const char kY[] = "y";
--const char kWidth[] = "width";
--const char kHeight[] = "height";
--const char kMinWidth[] = "minWidth";
--const char kMinHeight[] = "minHeight";
--const char kMaxWidth[] = "maxWidth";
--const char kMaxHeight[] = "maxHeight";
--const char kResizable[] = "resizable";
--const char kMovable[] = "movable";
--const char kMinimizable[] = "minimizable";
--const char kMaximizable[] = "maximizable";
--const char kFullScreenable[] = "fullscreenable";
--const char kClosable[] = "closable";
--const char kFullscreen[] = "fullscreen";
--
--// Whether the window should show in taskbar.
--const char kSkipTaskbar[] = "skipTaskbar";
--
--// Start with the kiosk mode, see Opera's page for description:
--// http://www.opera.com/support/mastering/kiosk/
--const char kKiosk[] = "kiosk";
--
--const char kSimpleFullScreen[] = "simpleFullscreen";
--
--// Make windows stays on the top of all other windows.
--const char kAlwaysOnTop[] = "alwaysOnTop";
--
--// Enable the NSView to accept first mouse event.
--const char kAcceptFirstMouse[] = "acceptFirstMouse";
--
--// Whether window size should include window frame.
--const char kUseContentSize[] = "useContentSize";
--
--// Whether window zoom should be to page width.
--const char kZoomToPageWidth[] = "zoomToPageWidth";
--
--// Whether always show title text in full screen is enabled.
--const char kFullscreenWindowTitle[] = "fullscreenWindowTitle";
--
--// The requested title bar style for the window
--const char kTitleBarStyle[] = "titleBarStyle";
--
--// Tabbing identifier for the window if native tabs are enabled on macOS.
--const char kTabbingIdentifier[] = "tabbingIdentifier";
--
--// The menu bar is hidden unless "Alt" is pressed.
--const char kAutoHideMenuBar[] = "autoHideMenuBar";
--
--// Enable window to be resized larger than screen.
--const char kEnableLargerThanScreen[] = "enableLargerThanScreen";
--
--// Forces to use dark theme on Linux.
--const char kDarkTheme[] = "darkTheme";
--
--// Whether the window should be transparent.
--const char kTransparent[] = "transparent";
--
--// Window type hint.
--const char kType[] = "type";
--
--// Disable auto-hiding cursor.
--const char kDisableAutoHideCursor[] = "disableAutoHideCursor";
--
--// Use the macOS' standard window instead of the textured window.
--const char kStandardWindow[] = "standardWindow";
--
--// Default browser window background color.
--const char kBackgroundColor[] = "backgroundColor";
--
--// Whether the window should have a shadow.
--const char kHasShadow[] = "hasShadow";
--
--// Browser window opacity
--const char kOpacity[] = "opacity";
--
--// Whether the window can be activated.
--const char kFocusable[] = "focusable";
--
--// The WebPreferences.
--const char kWebPreferences[] = "webPreferences";
--
--// Add a vibrancy effect to the browser window
--const char kVibrancyType[] = "vibrancy";
--
--// The factor of which page should be zoomed.
--const char kZoomFactor[] = "zoomFactor";
--
--// Script that will be loaded by guest WebContents before other scripts.
--const char kPreloadScript[] = "preload";
--
--// Like --preload, but the passed argument is an URL.
--const char kPreloadURL[] = "preloadURL";
--
--// Enable the node integration.
--const char kNodeIntegration[] = "nodeIntegration";
--
--// Enable context isolation of Electron APIs and preload script
--const char kContextIsolation[] = "contextIsolation";
--
--// Instance ID of guest WebContents.
--const char kGuestInstanceID[] = "guestInstanceId";
--
--// Web runtime features.
--const char kExperimentalFeatures[] = "experimentalFeatures";
--
--// Opener window's ID.
--const char kOpenerID[] = "openerId";
--
--// Enable the rubber banding effect.
--const char kScrollBounce[] = "scrollBounce";
--
--// Enable blink features.
--const char kEnableBlinkFeatures[] = "enableBlinkFeatures";
--
--// Disable blink features.
--const char kDisableBlinkFeatures[] = "disableBlinkFeatures";
--
--// Enable the node integration in WebWorker.
--const char kNodeIntegrationInWorker[] = "nodeIntegrationInWorker";
--
--// Enable the web view tag.
--const char kWebviewTag[] = "webviewTag";
--
--const char kNativeWindowOpen[] = "nativeWindowOpen";
--
--const char kCustomArgs[] = "additionalArguments";
--
--const char kPlugins[] = "plugins";
--
--const char kSandbox[] = "sandbox";
--
--const char kWebSecurity[] = "webSecurity";
--
--const char kAllowRunningInsecureContent[] = "allowRunningInsecureContent";
--
--const char kOffscreen[] = "offscreen";
--
--}  // namespace options
--
--namespace switches {
--
--// Enable chromium sandbox.
--const char kEnableSandbox[] = "enable-sandbox";
--
--// Enable sandbox in only remote content windows.
--const char kEnableMixedSandbox[] = "enable-mixed-sandbox";
--
--// Enable plugins.
--const char kEnablePlugins[] = "enable-plugins";
--
--// Ppapi Flash path.
--const char kPpapiFlashPath[] = "ppapi-flash-path";
--
--// Ppapi Flash version.
--const char kPpapiFlashVersion[] = "ppapi-flash-version";
--
--// Disable HTTP cache.
--const char kDisableHttpCache[] = "disable-http-cache";
--
--// The list of standard schemes.
--const char kStandardSchemes[] = "standard-schemes";
--
--// Register schemes to handle service worker.
--const char kRegisterServiceWorkerSchemes[] = "register-service-worker-schemes";
--
--// Register schemes as secure.
--const char kSecureSchemes[] = "secure-schemes";
--
--// The browser process app model ID
--const char kAppUserModelId[] = "app-user-model-id";
--
--// The application path
--const char kAppPath[] = "app-path";
--
--// The command line switch versions of the options.
--const char kBackgroundColor[] = "background-color";
--const char kPreloadScript[] = "preload";
--const char kPreloadScripts[] = "preload-scripts";
--const char kNodeIntegration[] = "node-integration";
--const char kContextIsolation[] = "context-isolation";
--const char kGuestInstanceID[] = "guest-instance-id";
--const char kOpenerID[] = "opener-id";
--const char kScrollBounce[] = "scroll-bounce";
--const char kHiddenPage[] = "hidden-page";
--const char kNativeWindowOpen[] = "native-window-open";
--const char kWebviewTag[] = "webview-tag";
--
--// Command switch passed to renderer process to control nodeIntegration.
--const char kNodeIntegrationInWorker[] = "node-integration-in-worker";
--
--// Widevine options
--// Path to Widevine CDM binaries.
--const char kWidevineCdmPath[] = "widevine-cdm-path";
--// Widevine CDM version.
--const char kWidevineCdmVersion[] = "widevine-cdm-version";
--
--// Forces the maximum disk space to be used by the disk cache, in bytes.
--const char kDiskCacheSize[] = "disk-cache-size";
--
--// Ignore the limit of 6 connections per host.
--const char kIgnoreConnectionsLimit[] = "ignore-connections-limit";
--
--}  // namespace switches
--
--}  // namespace atom
-removed in remote
-  base   100644 3c198555a5c380e81dbdfcd4f26b5c03a2a5c6a5 atom/common/options_switches.h
-  our    100644 5f6d7e9d38120668ed06922ced2f8d6a6e27a52b atom/common/options_switches.h
-@@ -1,119 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_COMMON_OPTIONS_SWITCHES_H_
--#define ATOM_COMMON_OPTIONS_SWITCHES_H_
--
--namespace atom {
--
--namespace options {
--
--extern const char kTitle[];
--extern const char kIcon[];
--extern const char kFrame[];
--extern const char kShow[];
--extern const char kCenter[];
--extern const char kX[];
--extern const char kY[];
--extern const char kWidth[];
--extern const char kHeight[];
--extern const char kMinWidth[];
--extern const char kMinHeight[];
--extern const char kMaxWidth[];
--extern const char kMaxHeight[];
--extern const char kResizable[];
--extern const char kMovable[];
--extern const char kMinimizable[];
--extern const char kMaximizable[];
--extern const char kFullScreenable[];
--extern const char kClosable[];
--extern const char kFullscreen[];
--extern const char kSkipTaskbar[];
--extern const char kKiosk[];
--extern const char kSimpleFullScreen[];
--extern const char kAlwaysOnTop[];
--extern const char kAcceptFirstMouse[];
--extern const char kUseContentSize[];
--extern const char kZoomToPageWidth[];
--extern const char kFullscreenWindowTitle[];
--extern const char kTitleBarStyle[];
--extern const char kTabbingIdentifier[];
--extern const char kAutoHideMenuBar[];
--extern const char kEnableLargerThanScreen[];
--extern const char kDarkTheme[];
--extern const char kTransparent[];
--extern const char kType[];
--extern const char kDisableAutoHideCursor[];
--extern const char kStandardWindow[];
--extern const char kBackgroundColor[];
--extern const char kHasShadow[];
--extern const char kOpacity[];
--extern const char kFocusable[];
--extern const char kWebPreferences[];
--extern const char kVibrancyType[];
--
--// WebPreferences.
--extern const char kZoomFactor[];
--extern const char kPreloadScript[];
--extern const char kPreloadURL[];
--extern const char kNodeIntegration[];
--extern const char kContextIsolation[];
--extern const char kGuestInstanceID[];
--extern const char kExperimentalFeatures[];
--extern const char kOpenerID[];
--extern const char kScrollBounce[];
--extern const char kEnableBlinkFeatures[];
--extern const char kDisableBlinkFeatures[];
--extern const char kNodeIntegrationInWorker[];
--extern const char kWebviewTag[];
--extern const char kNativeWindowOpen[];
--extern const char kCustomArgs[];
--extern const char kPlugins[];
--extern const char kSandbox[];
--extern const char kWebSecurity[];
--extern const char kAllowRunningInsecureContent[];
--extern const char kOffscreen[];
--
--}  // namespace options
--
--// Following are actually command line switches, should be moved to other files.
--
--namespace switches {
--
--extern const char kEnableSandbox[];
--extern const char kEnableMixedSandbox[];
--extern const char kEnablePlugins[];
--extern const char kPpapiFlashPath[];
--extern const char kPpapiFlashVersion[];
--extern const char kDisableHttpCache[];
--extern const char kStandardSchemes[];
--extern const char kRegisterServiceWorkerSchemes[];
--extern const char kSecureSchemes[];
--extern const char kAppUserModelId[];
--extern const char kAppPath[];
--
--extern const char kBackgroundColor[];
--extern const char kPreloadScript[];
--extern const char kPreloadScripts[];
--extern const char kNodeIntegration[];
--extern const char kContextIsolation[];
--extern const char kGuestInstanceID[];
--extern const char kOpenerID[];
--extern const char kScrollBounce[];
--extern const char kHiddenPage[];
--extern const char kNativeWindowOpen[];
--extern const char kNodeIntegrationInWorker[];
--extern const char kWebviewTag[];
--
--extern const char kWidevineCdmPath[];
--extern const char kWidevineCdmVersion[];
--
--extern const char kDiskCacheSize[];
--extern const char kIgnoreConnectionsLimit[];
--
--}  // namespace switches
--
--}  // namespace atom
--
--#endif  // ATOM_COMMON_OPTIONS_SWITCHES_H_
-removed in remote
-  base   100644 4565221e9d8455b42edceb04e3c4ae17d1680755 atom/common/platform_util.h
-  our    100644 6fd84056a06a3163547b254777d78161538b7069 atom/common/platform_util.h
-@@ -1,67 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_COMMON_PLATFORM_UTIL_H_
--#define ATOM_COMMON_PLATFORM_UTIL_H_
--
--#include <string>
--
--#include "base/callback_forward.h"
--#include "build/build_config.h"
--
--#if defined(OS_WIN)
--#include "base/strings/string16.h"
--#endif
--
--class GURL;
--
--namespace base {
--class FilePath;
--}
--
--namespace platform_util {
--
--typedef base::Callback<void(const std::string&)> OpenExternalCallback;
--
--// Show the given file in a file manager. If possible, select the file.
--// Must be called from the UI thread.
--bool ShowItemInFolder(const base::FilePath& full_path);
--
--// Open the given file in the desktop's default manner.
--// Must be called from the UI thread.
--bool OpenItem(const base::FilePath& full_path);
--
--// Open the given external protocol URL in the desktop's default manner.
--// (For example, mailto: URLs in the default mail user agent.)
--bool OpenExternal(
--#if defined(OS_WIN)
--    const base::string16& url,
--#else
--    const GURL& url,
--#endif
--    bool activate);
--
--// The asynchronous version of OpenExternal.
--void OpenExternal(
--#if defined(OS_WIN)
--    const base::string16& url,
--#else
--    const GURL& url,
--#endif
--    bool activate,
--    const OpenExternalCallback& callback);
--
--// Move a file to trash.
--bool MoveItemToTrash(const base::FilePath& full_path);
--
--void Beep();
--
--#if defined(OS_MACOSX)
--bool GetLoginItemEnabled();
--void SetLoginItemEnabled(bool enabled);
--#endif
--
--}  // namespace platform_util
--
--#endif  // ATOM_COMMON_PLATFORM_UTIL_H_
-removed in remote
-  base   100644 1e437b866cc019078915ef0f9edbb62a20a483cc atom/common/platform_util_linux.cc
-  our    100644 8fad8609342a81f46ea2608b3923f85af2d4308b atom/common/platform_util_linux.cc
-@@ -1,149 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/common/platform_util.h"
--
--#include <stdio.h>
--
--#include "base/cancelable_callback.h"
--#include "base/environment.h"
--#include "base/files/file_util.h"
--#include "base/nix/xdg_util.h"
--#include "base/process/kill.h"
--#include "base/process/launch.h"
--#include "url/gurl.h"
--
--#define ELECTRON_TRASH "ELECTRON_TRASH"
--#define ELECTRON_DEFAULT_TRASH "gvfs-trash"
--
--namespace {
--
--bool XDGUtilV(const std::vector<std::string>& argv, const bool wait_for_exit) {
--  base::LaunchOptions options;
--  options.allow_new_privs = true;
--  // xdg-open can fall back on mailcap which eventually might plumb through
--  // to a command that needs a terminal.  Set the environment variable telling
--  // it that we definitely don't have a terminal available and that it should
--  // bring up a new terminal if necessary.  See "man mailcap".
--  options.environ["MM_NOTTTY"] = "1";
--
--  base::Process process = base::LaunchProcess(argv, options);
--  if (!process.IsValid())
--    return false;
--
--  if (!wait_for_exit) {
--    base::EnsureProcessGetsReaped(process.Pid());
--    return true;
--  }
--
--  int exit_code = -1;
--  if (!process.WaitForExit(&exit_code))
--    return false;
--
--  return (exit_code == 0);
--}
--
--bool XDGUtil(const std::string& util,
--             const std::string& arg,
--             const bool wait_for_exit) {
--  std::vector<std::string> argv;
--  argv.push_back(util);
--  argv.push_back(arg);
--
--  return XDGUtilV(argv, wait_for_exit);
--}
--
--bool XDGOpen(const std::string& path, const bool wait_for_exit) {
--  return XDGUtil("xdg-open", path, wait_for_exit);
--}
--
--bool XDGEmail(const std::string& email, const bool wait_for_exit) {
--  return XDGUtil("xdg-email", email, wait_for_exit);
--}
--
--}  // namespace
--
--namespace platform_util {
--
--// TODO(estade): It would be nice to be able to select the file in the file
--// manager, but that probably requires extending xdg-open. For now just
--// show the folder.
--bool ShowItemInFolder(const base::FilePath& full_path) {
--  base::FilePath dir = full_path.DirName();
--  if (!base::DirectoryExists(dir))
--    return false;
--
--  return XDGOpen(dir.value(), false);
--}
--
--bool OpenItem(const base::FilePath& full_path) {
--  return XDGOpen(full_path.value(), false);
--}
--
--bool OpenExternal(const GURL& url, bool activate) {
--  // Don't wait for exit, since we don't want to wait for the browser/email
--  // client window to close before returning
--  if (url.SchemeIs("mailto"))
--    return XDGEmail(url.spec(), false);
--  else
--    return XDGOpen(url.spec(), false);
--}
--
--void OpenExternal(const GURL& url,
--                  bool activate,
--                  const OpenExternalCallback& callback) {
--  // TODO(gabriel): Implement async open if callback is specified
--  callback.Run(OpenExternal(url, activate) ? "" : "Failed to open");
--}
--
--bool MoveItemToTrash(const base::FilePath& full_path) {
--  std::string trash;
--  if (getenv(ELECTRON_TRASH) != NULL) {
--    trash = getenv(ELECTRON_TRASH);
--  } else {
--    // Determine desktop environment and set accordingly.
--    std::unique_ptr<base::Environment> env(base::Environment::Create());
--    base::nix::DesktopEnvironment desktop_env(
--        base::nix::GetDesktopEnvironment(env.get()));
--    if (desktop_env == base::nix::DESKTOP_ENVIRONMENT_KDE4 ||
--        desktop_env == base::nix::DESKTOP_ENVIRONMENT_KDE5) {
--      trash = "kioclient5";
--    } else if (desktop_env == base::nix::DESKTOP_ENVIRONMENT_KDE3) {
--      trash = "kioclient";
--    } else {
--      trash = ELECTRON_DEFAULT_TRASH;
--    }
--  }
--
--  std::vector<std::string> argv;
--
--  if (trash.compare("kioclient5") == 0 || trash.compare("kioclient") == 0) {
--    argv.push_back(trash);
--    argv.push_back("move");
--    argv.push_back(full_path.value());
--    argv.push_back("trash:/");
--  } else if (trash.compare("trash-cli") == 0) {
--    argv.push_back("trash-put");
--    argv.push_back(full_path.value());
--  } else if (trash.compare("gio") == 0) {
--    argv.push_back("gio");
--    argv.push_back("trash");
--    argv.push_back(full_path.value());
--  } else {
--    argv.push_back(ELECTRON_DEFAULT_TRASH);
--    argv.push_back(full_path.value());
--  }
--  return XDGUtilV(argv, true);
--}
--
--void Beep() {
--  // echo '\a' > /dev/console
--  FILE* console = fopen("/dev/console", "r");
--  if (console == NULL)
--    return;
--  fprintf(console, "\a");
--  fclose(console);
--}
--
--}  // namespace platform_util
-removed in remote
-  base   100644 98bc4e537d89162236689586e930e818098d758d atom/common/platform_util_mac.mm
-  our    100644 b83b1e11d891ed8a70e488460fcdc7402dc6281e atom/common/platform_util_mac.mm
-@@ -1,207 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/common/platform_util.h"
--
--#import <Carbon/Carbon.h>
--#import <Cocoa/Cocoa.h>
--#import <ServiceManagement/ServiceManagement.h>
--
--#include "base/callback.h"
--#include "base/files/file_path.h"
--#include "base/files/file_util.h"
--#include "base/logging.h"
--#include "base/mac/foundation_util.h"
--#include "base/mac/mac_logging.h"
--#include "base/mac/scoped_aedesc.h"
--#include "base/strings/stringprintf.h"
--#include "base/strings/sys_string_conversions.h"
--#include "net/base/mac/url_conversions.h"
--#include "url/gurl.h"
--
--namespace {
--
--std::string MessageForOSStatus(OSStatus status, const char* default_message) {
--  switch (status) {
--    case kLSAppInTrashErr:
--      return "The application cannot be run because it is inside a Trash "
--             "folder.";
--    case kLSUnknownErr:
--      return "An unknown error has occurred.";
--    case kLSNotAnApplicationErr:
--      return "The item to be registered is not an application.";
--    case kLSNotInitializedErr:
--      return "Formerly returned by LSInit on initialization failure; "
--             "no longer used.";
--    case kLSDataUnavailableErr:
--      return "Data of the desired type is not available (for example, there is "
--             "no kind string).";
--    case kLSApplicationNotFoundErr:
--      return "No application in the Launch Services database matches the input "
--             "criteria.";
--    case kLSDataErr:
--      return "Data is structured improperly (for example, an item’s "
--             "information property list is malformed). Not used in macOS 10.4.";
--    case kLSLaunchInProgressErr:
--      return "A launch of the application is already in progress.";
--    case kLSServerCommunicationErr:
--      return "There is a problem communicating with the server process that "
--             "maintains the Launch Services database.";
--    case kLSCannotSetInfoErr:
--      return "The filename extension to be hidden cannot be hidden.";
--    case kLSIncompatibleSystemVersionErr:
--      return "The application to be launched cannot run on the current Mac OS "
--             "version.";
--    case kLSNoLaunchPermissionErr:
--      return "The user does not have permission to launch the application (on a"
--             "managed network).";
--    case kLSNoExecutableErr:
--      return "The executable file is missing or has an unusable format.";
--    case kLSNoClassicEnvironmentErr:
--      return "The Classic emulation environment was required but is not "
--             "available.";
--    case kLSMultipleSessionsNotSupportedErr:
--      return "The application to be launched cannot run simultaneously in two "
--             "different user sessions.";
--    default:
--      return base::StringPrintf("%s (%d)", default_message, status);
--  }
--}
--
--// This may be called from a global dispatch queue, the methods used here are
--// thread safe, including LSGetApplicationForURL (> 10.2) and
--// NSWorkspace#openURLs.
--std::string OpenURL(NSURL* ns_url, bool activate) {
--  CFURLRef openingApp = nullptr;
--  OSStatus status = LSGetApplicationForURL(base::mac::NSToCFCast(ns_url),
--                                           kLSRolesAll, nullptr, &openingApp);
--  if (status != noErr)
--    return MessageForOSStatus(status, "Failed to open");
--
--  CFRelease(openingApp);  // NOT A BUG; LSGetApplicationForURL retains for us
--
--  NSUInteger launchOptions = NSWorkspaceLaunchDefault;
--  if (!activate)
--    launchOptions |= NSWorkspaceLaunchWithoutActivation;
--
--  bool opened = [[NSWorkspace sharedWorkspace] openURLs:@[ ns_url ]
--                                withAppBundleIdentifier:nil
--                                                options:launchOptions
--                         additionalEventParamDescriptor:nil
--                                      launchIdentifiers:nil];
--  if (!opened)
--    return "Failed to open URL";
--
--  return "";
--}
--
--NSString* GetLoginHelperBundleIdentifier() {
--  return [[[NSBundle mainBundle] bundleIdentifier]
--      stringByAppendingString:@".loginhelper"];
--}
--
--}  // namespace
--
--namespace platform_util {
--
--bool ShowItemInFolder(const base::FilePath& path) {
--  // The API only takes absolute path.
--  base::FilePath full_path =
--      path.IsAbsolute() ? path : base::MakeAbsoluteFilePath(path);
--
--  DCHECK([NSThread isMainThread]);
--  NSString* path_string = base::SysUTF8ToNSString(full_path.value());
--  if (!path_string || ![[NSWorkspace sharedWorkspace] selectFile:path_string
--                                        inFileViewerRootedAtPath:@""]) {
--    LOG(WARNING) << "NSWorkspace failed to select file " << full_path.value();
--    return false;
--  }
--  return true;
--}
--
--bool OpenItem(const base::FilePath& full_path) {
--  DCHECK([NSThread isMainThread]);
--  NSString* path_string = base::SysUTF8ToNSString(full_path.value());
--  if (!path_string)
--    return false;
--
--  NSURL* url = [NSURL fileURLWithPath:path_string];
--  if (!url)
--    return false;
--
--  const NSWorkspaceLaunchOptions launch_options =
--      NSWorkspaceLaunchAsync | NSWorkspaceLaunchWithErrorPresentation;
--  return [[NSWorkspace sharedWorkspace] openURLs:@[ url ]
--                         withAppBundleIdentifier:nil
--                                         options:launch_options
--                  additionalEventParamDescriptor:nil
--                               launchIdentifiers:NULL];
--}
--
--bool OpenExternal(const GURL& url, bool activate) {
--  DCHECK([NSThread isMainThread]);
--  NSURL* ns_url = net::NSURLWithGURL(url);
--  if (ns_url)
--    return OpenURL(ns_url, activate).empty();
--  return false;
--}
--
--void OpenExternal(const GURL& url,
--                  bool activate,
--                  const OpenExternalCallback& callback) {
--  NSURL* ns_url = net::NSURLWithGURL(url);
--  if (!ns_url) {
--    callback.Run("Invalid URL");
--    return;
--  }
--
--  __block OpenExternalCallback c = callback;
--  dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0),
--                 ^{
--                   __block std::string error = OpenURL(ns_url, activate);
--                   dispatch_async(dispatch_get_main_queue(), ^{
--                     c.Run(error);
--                   });
--                 });
--}
--
--bool MoveItemToTrash(const base::FilePath& full_path) {
--  NSString* path_string = base::SysUTF8ToNSString(full_path.value());
--  BOOL status = [[NSFileManager defaultManager]
--        trashItemAtURL:[NSURL fileURLWithPath:path_string]
--      resultingItemURL:nil
--                 error:nil];
--  if (!path_string || !status)
--    LOG(WARNING) << "NSWorkspace failed to move file " << full_path.value()
--                 << " to trash";
--  return status;
--}
--
--void Beep() {
--  NSBeep();
--}
--
--bool GetLoginItemEnabled() {
--  BOOL enabled = NO;
--  // SMJobCopyDictionary does not work in sandbox (see rdar://13626319)
--  CFArrayRef jobs = SMCopyAllJobDictionaries(kSMDomainUserLaunchd);
--  NSArray* jobs_ = CFBridgingRelease(jobs);
--  NSString* identifier = GetLoginHelperBundleIdentifier();
--  if (jobs_ && [jobs_ count] > 0) {
--    for (NSDictionary* job in jobs_) {
--      if ([identifier isEqualToString:[job objectForKey:@"Label"]]) {
--        enabled = [[job objectForKey:@"OnDemand"] boolValue];
--        break;
--      }
--    }
--  }
--  return enabled;
--}
--
--void SetLoginItemEnabled(bool enabled) {
--  NSString* identifier = GetLoginHelperBundleIdentifier();
--  SMLoginItemSetEnabled((__bridge CFStringRef)identifier, enabled);
--}
--
--}  // namespace platform_util
-removed in remote
-  base   100644 12591a94d5691c8944ff96596af755779941261c atom/common/platform_util_win.cc
-  our    100644 34576be95f2552aaa985dacb3f36406dfc29d54c atom/common/platform_util_win.cc
-@@ -1,371 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/common/platform_util.h"
--
--#include <windows.h>  // windows.h must be included first
--
--#include <atlbase.h>
--#include <comdef.h>
--#include <commdlg.h>
--#include <dwmapi.h>
--#include <objbase.h>
--#include <shellapi.h>
--#include <shlobj.h>
--#include <wrl/client.h>
--
--#include "base/bind.h"
--#include "base/bind_helpers.h"
--#include "base/files/file_path.h"
--#include "base/files/file_util.h"
--#include "base/logging.h"
--#include "base/strings/string_util.h"
--#include "base/strings/utf_string_conversions.h"
--#include "base/win/registry.h"
--#include "base/win/scoped_co_mem.h"
--#include "base/win/scoped_com_initializer.h"
--#include "base/win/windows_version.h"
--#include "ui/base/win/shell.h"
--#include "url/gurl.h"
--
--namespace {
--
--// Required COM implementation of IFileOperationProgressSink so we can
--// precheck files before deletion to make sure they can be move to the
--// Recycle Bin.
--class DeleteFileProgressSink : public IFileOperationProgressSink {
-- public:
--  DeleteFileProgressSink();
--  virtual ~DeleteFileProgressSink() = default;
--
-- private:
--  ULONG STDMETHODCALLTYPE AddRef(void) override;
--  ULONG STDMETHODCALLTYPE Release(void) override;
--  HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid,
--                                           LPVOID* ppvObj) override;
--  HRESULT STDMETHODCALLTYPE StartOperations(void) override;
--  HRESULT STDMETHODCALLTYPE FinishOperations(HRESULT) override;
--  HRESULT STDMETHODCALLTYPE PreRenameItem(DWORD, IShellItem*, LPCWSTR) override;
--  HRESULT STDMETHODCALLTYPE
--  PostRenameItem(DWORD, IShellItem*, LPCWSTR, HRESULT, IShellItem*) override;
--  HRESULT STDMETHODCALLTYPE PreMoveItem(DWORD,
--                                        IShellItem*,
--                                        IShellItem*,
--                                        LPCWSTR) override;
--  HRESULT STDMETHODCALLTYPE PostMoveItem(DWORD,
--                                         IShellItem*,
--                                         IShellItem*,
--                                         LPCWSTR,
--                                         HRESULT,
--                                         IShellItem*) override;
--  HRESULT STDMETHODCALLTYPE PreCopyItem(DWORD,
--                                        IShellItem*,
--                                        IShellItem*,
--                                        LPCWSTR) override;
--  HRESULT STDMETHODCALLTYPE PostCopyItem(DWORD,
--                                         IShellItem*,
--                                         IShellItem*,
--                                         LPCWSTR,
--                                         HRESULT,
--                                         IShellItem*) override;
--  HRESULT STDMETHODCALLTYPE PreDeleteItem(DWORD, IShellItem*) override;
--  HRESULT STDMETHODCALLTYPE PostDeleteItem(DWORD,
--                                           IShellItem*,
--                                           HRESULT,
--                                           IShellItem*) override;
--  HRESULT STDMETHODCALLTYPE PreNewItem(DWORD, IShellItem*, LPCWSTR) override;
--  HRESULT STDMETHODCALLTYPE PostNewItem(DWORD,
--                                        IShellItem*,
--                                        LPCWSTR,
--                                        LPCWSTR,
--                                        DWORD,
--                                        HRESULT,
--                                        IShellItem*) override;
--  HRESULT STDMETHODCALLTYPE UpdateProgress(UINT, UINT) override;
--  HRESULT STDMETHODCALLTYPE ResetTimer(void) override;
--  HRESULT STDMETHODCALLTYPE PauseTimer(void) override;
--  HRESULT STDMETHODCALLTYPE ResumeTimer(void) override;
--
--  ULONG m_cRef;
--};
--
--DeleteFileProgressSink::DeleteFileProgressSink() {
--  m_cRef = 0;
--}
--
--HRESULT DeleteFileProgressSink::PreDeleteItem(DWORD dwFlags, IShellItem*) {
--  if (!(dwFlags & TSF_DELETE_RECYCLE_IF_POSSIBLE)) {
--    // TSF_DELETE_RECYCLE_IF_POSSIBLE will not be set for items that cannot be
--    // recycled.  In this case, we abort the delete operation.  This bubbles
--    // up and stops the Delete in IFileOperation.
--    return E_ABORT;
--  }
--  // Returns S_OK if successful, or an error value otherwise. In the case of an
--  // error value, the delete operation and all subsequent operations pending
--  // from the call to IFileOperation are canceled.
--  return S_OK;
--}
--
--HRESULT DeleteFileProgressSink::QueryInterface(REFIID riid, LPVOID* ppvObj) {
--  // Always set out parameter to NULL, validating it first.
--  if (!ppvObj)
--    return E_INVALIDARG;
--  *ppvObj = nullptr;
--  if (riid == IID_IUnknown || riid == IID_IFileOperationProgressSink) {
--    // Increment the reference count and return the pointer.
--    *ppvObj = reinterpret_cast<IUnknown*>(this);
--    AddRef();
--    return NOERROR;
--  }
--  return E_NOINTERFACE;
--}
--
--ULONG DeleteFileProgressSink::AddRef() {
--  InterlockedIncrement(&m_cRef);
--  return m_cRef;
--}
--
--ULONG DeleteFileProgressSink::Release() {
--  // Decrement the object's internal counter.
--  ULONG ulRefCount = InterlockedDecrement(&m_cRef);
--  if (0 == m_cRef) {
--    delete this;
--  }
--  return ulRefCount;
--}
--
--HRESULT DeleteFileProgressSink::StartOperations() {
--  return S_OK;
--}
--
--HRESULT DeleteFileProgressSink::FinishOperations(HRESULT) {
--  return S_OK;
--}
--
--HRESULT DeleteFileProgressSink::PreRenameItem(DWORD, IShellItem*, LPCWSTR) {
--  return S_OK;
--}
--
--HRESULT DeleteFileProgressSink::PostRenameItem(DWORD,
--                                               IShellItem*,
--                                               __RPC__in_string LPCWSTR,
--                                               HRESULT,
--                                               IShellItem*) {
--  return E_NOTIMPL;
--}
--
--HRESULT DeleteFileProgressSink::PreMoveItem(DWORD,
--                                            IShellItem*,
--                                            IShellItem*,
--                                            LPCWSTR) {
--  return E_NOTIMPL;
--}
--
--HRESULT DeleteFileProgressSink::PostMoveItem(DWORD,
--                                             IShellItem*,
--                                             IShellItem*,
--                                             LPCWSTR,
--                                             HRESULT,
--                                             IShellItem*) {
--  return E_NOTIMPL;
--}
--
--HRESULT DeleteFileProgressSink::PreCopyItem(DWORD,
--                                            IShellItem*,
--                                            IShellItem*,
--                                            LPCWSTR) {
--  return E_NOTIMPL;
--}
--
--HRESULT DeleteFileProgressSink::PostCopyItem(DWORD,
--                                             IShellItem*,
--                                             IShellItem*,
--                                             LPCWSTR,
--                                             HRESULT,
--                                             IShellItem*) {
--  return E_NOTIMPL;
--}
--
--HRESULT DeleteFileProgressSink::PostDeleteItem(DWORD,
--                                               IShellItem*,
--                                               HRESULT,
--                                               IShellItem*) {
--  return S_OK;
--}
--
--HRESULT DeleteFileProgressSink::PreNewItem(DWORD dwFlags,
--                                           IShellItem*,
--                                           LPCWSTR) {
--  return E_NOTIMPL;
--}
--
--HRESULT DeleteFileProgressSink::PostNewItem(DWORD,
--                                            IShellItem*,
--                                            LPCWSTR,
--                                            LPCWSTR,
--                                            DWORD,
--                                            HRESULT,
--                                            IShellItem*) {
--  return E_NOTIMPL;
--}
--
--HRESULT DeleteFileProgressSink::UpdateProgress(UINT, UINT) {
--  return S_OK;
--}
--
--HRESULT DeleteFileProgressSink::ResetTimer() {
--  return S_OK;
--}
--
--HRESULT DeleteFileProgressSink::PauseTimer() {
--  return S_OK;
--}
--
--HRESULT DeleteFileProgressSink::ResumeTimer() {
--  return S_OK;
--}
--
--}  // namespace
--
--namespace platform_util {
--
--bool ShowItemInFolder(const base::FilePath& full_path) {
--  base::win::ScopedCOMInitializer com_initializer;
--  if (!com_initializer.Succeeded())
--    return false;
--
--  base::FilePath dir = full_path.DirName().AsEndingWithSeparator();
--  // ParseDisplayName will fail if the directory is "C:", it must be "C:\\".
--  if (dir.empty())
--    return false;
--
--  Microsoft::WRL::ComPtr<IShellFolder> desktop;
--  HRESULT hr = SHGetDesktopFolder(desktop.GetAddressOf());
--  if (FAILED(hr))
--    return false;
--
--  base::win::ScopedCoMem<ITEMIDLIST> dir_item;
--  hr = desktop->ParseDisplayName(NULL, NULL,
--                                 const_cast<wchar_t*>(dir.value().c_str()),
--                                 NULL, &dir_item, NULL);
--  if (FAILED(hr)) {
--    return ui::win::OpenFolderViaShell(dir);
--  }
--
--  base::win::ScopedCoMem<ITEMIDLIST> file_item;
--  hr = desktop->ParseDisplayName(
--      NULL, NULL, const_cast<wchar_t*>(full_path.value().c_str()), NULL,
--      &file_item, NULL);
--  if (FAILED(hr)) {
--    return ui::win::OpenFolderViaShell(dir);
--  }
--
--  const ITEMIDLIST* highlight[] = {file_item};
--
--  hr = SHOpenFolderAndSelectItems(dir_item, arraysize(highlight), highlight,
--                                  NULL);
--  if (!FAILED(hr))
--    return true;
--
--  // On some systems, the above call mysteriously fails with "file not
--  // found" even though the file is there.  In these cases, ShellExecute()
--  // seems to work as a fallback (although it won't select the file).
--  if (hr == ERROR_FILE_NOT_FOUND) {
--    return ui::win::OpenFolderViaShell(dir);
--  } else {
--    LPTSTR message = NULL;
--    FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
--                  0, hr, 0, reinterpret_cast<LPTSTR>(&message), 0, NULL);
--    LOG(WARNING) << " " << __FUNCTION__ << "(): Can't open full_path = \""
--                 << full_path.value() << "\""
--                 << " hr = " << hr << " " << reinterpret_cast<LPTSTR>(&message);
--    if (message)
--      LocalFree(message);
--
--    return ui::win::OpenFolderViaShell(dir);
--  }
--}
--
--bool OpenItem(const base::FilePath& full_path) {
--  if (base::DirectoryExists(full_path))
--    return ui::win::OpenFolderViaShell(full_path);
--  else
--    return ui::win::OpenFileViaShell(full_path);
--}
--
--bool OpenExternal(const base::string16& url, bool activate) {
--  // Quote the input scheme to be sure that the command does not have
--  // parameters unexpected by the external program. This url should already
--  // have been escaped.
--  base::string16 escaped_url = L"\"" + url + L"\"";
--
--  if (reinterpret_cast<ULONG_PTR>(ShellExecuteW(
--          NULL, L"open", escaped_url.c_str(), NULL, NULL, SW_SHOWNORMAL)) <=
--      32) {
--    // We fail to execute the call. We could display a message to the user.
--    // TODO(nsylvain): we should also add a dialog to warn on errors. See
--    // bug 1136923.
--    return false;
--  }
--  return true;
--}
--
--void OpenExternal(const base::string16& url,
--                  bool activate,
--                  const OpenExternalCallback& callback) {
--  // TODO(gabriel): Implement async open if callback is specified
--  callback.Run(OpenExternal(url, activate) ? "" : "Failed to open");
--}
--
--bool MoveItemToTrash(const base::FilePath& path) {
--  base::win::ScopedCOMInitializer com_initializer;
--  if (!com_initializer.Succeeded())
--    return false;
--
--  Microsoft::WRL::ComPtr<IFileOperation> pfo;
--  if (FAILED(::CoCreateInstance(CLSID_FileOperation, nullptr, CLSCTX_ALL,
--                                IID_PPV_ARGS(&pfo))))
--    return false;
--
--  // Elevation prompt enabled for UAC protected files.  This overrides the
--  // SILENT, NO_UI and NOERRORUI flags.
--
--  if (base::win::GetVersion() >= base::win::VERSION_WIN8) {
--    // Windows 8 introduces the flag RECYCLEONDELETE and deprecates the
--    // ALLOWUNDO in favor of ADDUNDORECORD.
--    if (FAILED(pfo->SetOperationFlags(
--            FOF_NO_UI | FOFX_ADDUNDORECORD | FOF_NOERRORUI | FOF_SILENT |
--            FOFX_SHOWELEVATIONPROMPT | FOFX_RECYCLEONDELETE)))
--      return false;
--  } else {
--    // For Windows 7 and Vista, RecycleOnDelete is the default behavior.
--    if (FAILED(pfo->SetOperationFlags(FOF_NO_UI | FOF_ALLOWUNDO |
--                                      FOF_NOERRORUI | FOF_SILENT |
--                                      FOFX_SHOWELEVATIONPROMPT)))
--      return false;
--  }
--
--  // Create an IShellItem from the supplied source path.
--  Microsoft::WRL::ComPtr<IShellItem> delete_item;
--  if (FAILED(SHCreateItemFromParsingName(
--          path.value().c_str(), NULL,
--          IID_PPV_ARGS(delete_item.GetAddressOf()))))
--    return false;
--
--  Microsoft::WRL::ComPtr<IFileOperationProgressSink> delete_sink(
--      new DeleteFileProgressSink);
--  if (!delete_sink)
--    return false;
--
--  // Processes the queued command DeleteItem. This will trigger
--  // the DeleteFileProgressSink to check for Recycle Bin.
--  return SUCCEEDED(pfo->DeleteItem(delete_item.Get(), delete_sink.Get())) &&
--         SUCCEEDED(pfo->PerformOperations());
--}
--
--void Beep() {
--  MessageBeep(MB_OK);
--}
--
--}  // namespace platform_util
-removed in remote
-  base   100644 7b56a46470ea071c861f28c879cb20b8ced1d34d atom/common/resources/mac/Info.plist
-  our    100644 7b56a46470ea071c861f28c879cb20b8ced1d34d atom/common/resources/mac/Info.plist
-@@ -1,16 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
--<plist version="1.0">
--<dict>
--	<key>CFBundleIdentifier</key>
--	<string>${ATOM_BUNDLE_ID}</string>
--	<key>CFBundleName</key>
--	<string>${PRODUCT_NAME}</string>
--	<key>CFBundleExecutable</key>
--	<string>${PRODUCT_NAME}</string>
--	<key>CFBundlePackageType</key>
--	<string>FMWK</string>
--	<key>NSSupportsAutomaticGraphicsSwitching</key>
--	<true/>
--</dict>
--</plist>
-removed in remote
-  base   100644 fb4656cac6184e1c0eaafccc45eee95eb539df92 atom/common/resources/mac/MainMenu.xib
-  our    100644 5427dde7f9290006bfed808788c2cc8374a05598 atom/common/resources/mac/MainMenu.xib
-@@ -1,219 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
--	<data>
--		<int key="IBDocument.SystemTarget">101000</int>
--		<string key="IBDocument.SystemVersion">14D136</string>
--		<string key="IBDocument.InterfaceBuilderVersion">7531</string>
--		<string key="IBDocument.AppKitVersion">1347.57</string>
--		<string key="IBDocument.HIToolboxVersion">758.70</string>
--		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
--			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
--			<string key="NS.object.0">7531</string>
--		</object>
--		<array key="IBDocument.IntegratedClassDependencies">
--			<string>NSCustomObject</string>
--			<string>NSMenu</string>
--			<string>NSMenuItem</string>
--		</array>
--		<array key="IBDocument.PluginDependencies">
--			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
--		</array>
--		<object class="NSMutableDictionary" key="IBDocument.Metadata">
--			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
--			<integer value="1" key="NS.object.0"/>
--		</object>
--		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1048">
--			<object class="NSCustomObject" id="1021">
--				<string key="NSClassName">AtomApplication</string>
--			</object>
--			<object class="NSCustomObject" id="1014">
--				<string key="NSClassName">FirstResponder</string>
--			</object>
--			<object class="NSCustomObject" id="1050">
--				<string key="NSClassName">NSApplication</string>
--			</object>
--			<object class="NSCustomObject" id="903638069">
--				<string key="NSClassName">NSFontManager</string>
--			</object>
--			<object class="NSMenu" id="649796088">
--				<string key="NSTitle">Main Menu</string>
--				<array class="NSMutableArray" key="NSMenuItems">
--					<object class="NSMenuItem" id="694149608">
--						<reference key="NSMenu" ref="649796088"/>
--						<string key="NSTitle">Electron</string>
--						<string key="NSKeyEquiv"/>
--						<int key="NSMnemonicLoc">2147483647</int>
--						<object class="NSCustomResource" key="NSOnImage" id="229763992">
--							<string key="NSClassName">NSImage</string>
--							<string key="NSResourceName">NSMenuCheckmark</string>
--						</object>
--						<object class="NSCustomResource" key="NSMixedImage" id="909111550">
--							<string key="NSClassName">NSImage</string>
--							<string key="NSResourceName">NSMenuMixedState</string>
--						</object>
--						<string key="NSAction">submenuAction:</string>
--						<reference key="NSTarget" ref="110575045"/>
--						<object class="NSMenu" key="NSSubmenu" id="110575045">
--							<string key="NSTitle">Electron</string>
--							<array class="NSMutableArray" key="NSMenuItems">
--								<object class="NSMenuItem" id="632727374">
--									<reference key="NSMenu" ref="110575045"/>
--									<string key="NSTitle">Quit</string>
--									<string key="NSKeyEquiv">q</string>
--									<int key="NSKeyEquivModMask">1048576</int>
--									<int key="NSMnemonicLoc">2147483647</int>
--									<reference key="NSOnImage" ref="229763992"/>
--									<reference key="NSMixedImage" ref="909111550"/>
--								</object>
--								<object class="NSMenuItem" id="1025936716">
--									<reference key="NSMenu" ref="110575045"/>
--									<string key="NSTitle">Open Recent</string>
--									<string key="NSKeyEquiv"/>
--									<int key="NSKeyEquivModMask">1048576</int>
--									<int key="NSMnemonicLoc">2147483647</int>
--									<bool key="NSIsHidden">YES</bool>
--									<reference key="NSOnImage" ref="229763992"/>
--									<reference key="NSMixedImage" ref="909111550"/>
--									<string key="NSAction">submenuAction:</string>
--									<object class="NSMenu" key="NSSubmenu" id="1065607017">
--										<string key="NSTitle">Open Recent</string>
--										<array class="NSMutableArray" key="NSMenuItems"></array>
--										<string key="NSName">_NSRecentDocumentsMenu</string>
--									</object>
--								</object>
--							</array>
--							<string key="NSName">_NSAppleMenu</string>
--						</object>
--					</object>
--				</array>
--				<string key="NSName">_NSMainMenu</string>
--			</object>
--		</array>
--		<object class="IBObjectContainer" key="IBDocument.Objects">
--			<array key="connectionRecords">
--				<object class="IBConnectionRecord">
--					<object class="IBActionConnection" key="connection">
--						<string key="label">terminate:</string>
--						<reference key="source" ref="1014"/>
--						<reference key="destination" ref="632727374"/>
--					</object>
--					<int key="connectionID">807</int>
--				</object>
--			</array>
--			<object class="IBMutableOrderedSet" key="objectRecords">
--				<array key="orderedObjects">
--					<object class="IBObjectRecord">
--						<int key="objectID">0</int>
--						<array key="object" id="0"/>
--						<reference key="children" ref="1048"/>
--						<nil key="parent"/>
--					</object>
--					<object class="IBObjectRecord">
--						<int key="objectID">-2</int>
--						<reference key="object" ref="1021"/>
--						<reference key="parent" ref="0"/>
--						<string key="objectName">File's Owner</string>
--					</object>
--					<object class="IBObjectRecord">
--						<int key="objectID">-1</int>
--						<reference key="object" ref="1014"/>
--						<reference key="parent" ref="0"/>
--						<string key="objectName">First Responder</string>
--					</object>
--					<object class="IBObjectRecord">
--						<int key="objectID">-3</int>
--						<reference key="object" ref="1050"/>
--						<reference key="parent" ref="0"/>
--						<string key="objectName">Application</string>
--					</object>
--					<object class="IBObjectRecord">
--						<int key="objectID">371</int>
--						<reference key="object" ref="903638069"/>
--						<reference key="parent" ref="0"/>
--					</object>
--					<!-- NSMenu Main Menu -->
--					<object class="IBObjectRecord">
--						<int key="objectID">29</int>
--						<reference key="object" ref="649796088"/>
--						<array class="NSMutableArray" key="children">
--							<reference ref="694149608"/>
--						</array>
--						<reference key="parent" ref="0"/>
--					</object>
--					<!-- NSMenuItem Electron -->
--					<object class="IBObjectRecord">
--						<int key="objectID">56</int>
--						<reference key="object" ref="694149608"/>
--						<array class="NSMutableArray" key="children">
--							<reference ref="110575045"/>
--						</array>
--						<reference key="parent" ref="649796088"/>
--					</object>
--					<!-- NSMenu Electron -->
--					<object class="IBObjectRecord">
--						<int key="objectID">57</int>
--						<reference key="object" ref="110575045"/>
--						<array class="NSMutableArray" key="children">
--							<reference ref="632727374"/>
--							<reference ref="1025936716"/>
--						</array>
--						<reference key="parent" ref="694149608"/>
--					</object>
--					<!-- NSMenuItem Quit -->
--					<object class="IBObjectRecord">
--						<int key="objectID">136</int>
--						<reference key="object" ref="632727374"/>
--						<reference key="parent" ref="110575045"/>
--					</object>
--					<!-- NSMenuItem Open Recent -->
--					<object class="IBObjectRecord">
--						<int key="objectID">124</int>
--						<reference key="object" ref="1025936716"/>
--						<array class="NSMutableArray" key="children">
--							<reference ref="1065607017"/>
--						</array>
--						<reference key="parent" ref="110575045"/>
--					</object>
--					<!-- NSMenu Open Recent -->
--					<object class="IBObjectRecord">
--						<int key="objectID">125</int>
--						<reference key="object" ref="1065607017"/>
--						<array class="NSMutableArray" key="children"></array>
--						<reference key="parent" ref="1025936716"/>
--					</object>
--				</array>
--			</object>
--			<dictionary class="NSMutableDictionary" key="flattenedProperties">
--				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
--				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
--				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
--				<string key="29.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
--				<string key="371.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
--				<string key="56.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
--				<string key="57.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
--				<string key="136.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
--				<string key="124.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
--				<string key="125.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
--			</dictionary>
--			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
--			<nil key="activeLocalization"/>
--			<dictionary class="NSMutableDictionary" key="localizations"/>
--			<nil key="sourceID"/>
--			<int key="maxID">807</int>
--		</object>
--		<int key="IBDocument.localizationMode">0</int>
--		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
--		<bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">NO</bool>
--		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
--			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
--			<integer value="4600" key="NS.object.0"/>
--		</object>
--		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
--		<int key="IBDocument.defaultPropertyAccessControl">3</int>
--		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--			<string key="NSMenuCheckmark">{12, 12}</string>
--			<string key="NSMenuMixedState">{10, 2}</string>
--		</dictionary>
--		<bool key="IBDocument.UseAutolayout">YES</bool>
--	</data>
--</archive>
-removed in remote
-  base   100644 a82562f93614194343442d52921cc757fb400824 atom/renderer/api/atom_api_renderer_ipc.cc
-  our    100644 3e48a4f7d0c11f40e6360b0acc2c83c38e671319 atom/renderer/api/atom_api_renderer_ipc.cc
-@@ -1,76 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/renderer/api/atom_api_renderer_ipc.h"
--#include "atom/common/api/api_messages.h"
--#include "atom/common/native_mate_converters/string16_converter.h"
--#include "atom/common/native_mate_converters/value_converter.h"
--#include "atom/common/node_bindings.h"
--#include "atom/common/node_includes.h"
--#include "content/public/renderer/render_frame.h"
--#include "native_mate/dictionary.h"
--#include "third_party/WebKit/public/web/WebLocalFrame.h"
--
--using blink::WebLocalFrame;
--using content::RenderFrame;
--
--namespace atom {
--
--namespace api {
--
--RenderFrame* GetCurrentRenderFrame() {
--  WebLocalFrame* frame = WebLocalFrame::FrameForCurrentContext();
--  if (!frame)
--    return nullptr;
--
--  return RenderFrame::FromWebFrame(frame);
--}
--
--void Send(mate::Arguments* args,
--          const base::string16& channel,
--          const base::ListValue& arguments) {
--  RenderFrame* render_frame = GetCurrentRenderFrame();
--  if (render_frame == nullptr)
--    return;
--
--  bool success = render_frame->Send(new AtomFrameHostMsg_Message(
--      render_frame->GetRoutingID(), channel, arguments));
--
--  if (!success)
--    args->ThrowError("Unable to send AtomFrameHostMsg_Message");
--}
--
--base::ListValue SendSync(mate::Arguments* args,
--                         const base::string16& channel,
--                         const base::ListValue& arguments) {
--  base::ListValue result;
--
--  RenderFrame* render_frame = GetCurrentRenderFrame();
--  if (render_frame == nullptr)
--    return result;
--
--  IPC::SyncMessage* message = new AtomFrameHostMsg_Message_Sync(
--      render_frame->GetRoutingID(), channel, arguments, &result);
--  bool success = render_frame->Send(message);
--
--  if (!success)
--    args->ThrowError("Unable to send AtomFrameHostMsg_Message_Sync");
--
--  return result;
--}
--
--void Initialize(v8::Local<v8::Object> exports,
--                v8::Local<v8::Value> unused,
--                v8::Local<v8::Context> context,
--                void* priv) {
--  mate::Dictionary dict(context->GetIsolate(), exports);
--  dict.SetMethod("send", &Send);
--  dict.SetMethod("sendSync", &SendSync);
--}
--
--}  // namespace api
--
--}  // namespace atom
--
--NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_renderer_ipc, atom::api::Initialize)
-removed in remote
-  base   100644 08f36efce5819903e97a9895afc5a08976ad8c7c atom/renderer/api/atom_api_spell_check_client.cc
-  our    100644 5f7985be2f820fdb0a9b7a26032e7fc83ed34952 atom/renderer/api/atom_api_spell_check_client.cc
-@@ -1,248 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/renderer/api/atom_api_spell_check_client.h"
--
--#include <algorithm>
--#include <vector>
--
--#include "atom/common/native_mate_converters/string16_converter.h"
--#include "base/logging.h"
--#include "base/threading/thread_task_runner_handle.h"
--#include "chrome/renderer/spellchecker/spellcheck_worditerator.h"
--#include "native_mate/converter.h"
--#include "native_mate/dictionary.h"
--#include "third_party/WebKit/public/web/WebTextCheckingCompletion.h"
--#include "third_party/WebKit/public/web/WebTextCheckingResult.h"
--#include "third_party/icu/source/common/unicode/uscript.h"
--
--namespace atom {
--
--namespace api {
--
--namespace {
--
--bool HasWordCharacters(const base::string16& text, int index) {
--  const base::char16* data = text.data();
--  int length = text.length();
--  while (index < length) {
--    uint32_t code = 0;
--    U16_NEXT(data, index, length, code);
--    UErrorCode error = U_ZERO_ERROR;
--    if (uscript_getScript(code, &error) != USCRIPT_COMMON)
--      return true;
--  }
--  return false;
--}
--
--}  // namespace
--
--class SpellCheckClient::SpellcheckRequest {
-- public:
--  SpellcheckRequest(const base::string16& text,
--                    blink::WebTextCheckingCompletion* completion)
--      : text_(text), completion_(completion) {
--    DCHECK(completion);
--  }
--  ~SpellcheckRequest() {}
--
--  base::string16 text() { return text_; }
--  blink::WebTextCheckingCompletion* completion() { return completion_; }
--
-- private:
--  base::string16 text_;  // Text to be checked in this task.
--
--  // The interface to send the misspelled ranges to WebKit.
--  blink::WebTextCheckingCompletion* completion_;
--
--  DISALLOW_COPY_AND_ASSIGN(SpellcheckRequest);
--};
--
--SpellCheckClient::SpellCheckClient(const std::string& language,
--                                   bool auto_spell_correct_turned_on,
--                                   v8::Isolate* isolate,
--                                   v8::Local<v8::Object> provider)
--    : isolate_(isolate),
--      context_(isolate, isolate->GetCurrentContext()),
--      provider_(isolate, provider) {
--  DCHECK(!context_.IsEmpty());
--
--  character_attributes_.SetDefaultLanguage(language);
--
--  // Persistent the method.
--  mate::Dictionary dict(isolate, provider);
--  dict.Get("spellCheck", &spell_check_);
--}
--
--SpellCheckClient::~SpellCheckClient() {
--  context_.Reset();
--}
--
--void SpellCheckClient::CheckSpelling(
--    const blink::WebString& text,
--    int& misspelling_start,
--    int& misspelling_len,
--    blink::WebVector<blink::WebString>* optional_suggestions) {
--  std::vector<blink::WebTextCheckingResult> results;
--  SpellCheckText(text.Utf16(), true, &results);
--  if (results.size() == 1) {
--    misspelling_start = results[0].location;
--    misspelling_len = results[0].length;
--  }
--}
--
--void SpellCheckClient::RequestCheckingOfText(
--    const blink::WebString& textToCheck,
--    blink::WebTextCheckingCompletion* completionCallback) {
--  base::string16 text(textToCheck.Utf16());
--  // Ignore invalid requests.
--  if (text.empty() || !HasWordCharacters(text, 0)) {
--    completionCallback->DidCancelCheckingText();
--    return;
--  }
--
--  // Clean up the previous request before starting a new request.
--  if (pending_request_param_.get()) {
--    pending_request_param_->completion()->DidCancelCheckingText();
--  }
--
--  pending_request_param_.reset(new SpellcheckRequest(text, completionCallback));
--
--  base::ThreadTaskRunnerHandle::Get()->PostTask(
--      FROM_HERE,
--      base::BindOnce(&SpellCheckClient::PerformSpellCheck, AsWeakPtr(),
--                     base::Owned(pending_request_param_.release())));
--}
--
--bool SpellCheckClient::IsSpellCheckingEnabled() const {
--  return true;
--}
--
--void SpellCheckClient::ShowSpellingUI(bool show) {}
--
--bool SpellCheckClient::IsShowingSpellingUI() {
--  return false;
--}
--
--void SpellCheckClient::UpdateSpellingUIWithMisspelledWord(
--    const blink::WebString& word) {}
--
--void SpellCheckClient::SpellCheckText(
--    const base::string16& text,
--    bool stop_at_first_result,
--    std::vector<blink::WebTextCheckingResult>* results) {
--  if (text.empty() || spell_check_.IsEmpty())
--    return;
--
--  if (!text_iterator_.IsInitialized() &&
--      !text_iterator_.Initialize(&character_attributes_, true)) {
--    // We failed to initialize text_iterator_, return as spelled correctly.
--    VLOG(1) << "Failed to initialize SpellcheckWordIterator";
--    return;
--  }
--
--  if (!contraction_iterator_.IsInitialized() &&
--      !contraction_iterator_.Initialize(&character_attributes_, false)) {
--    // We failed to initialize the word iterator, return as spelled correctly.
--    VLOG(1) << "Failed to initialize contraction_iterator_";
--    return;
--  }
--
--  text_iterator_.SetText(text.c_str(), text.size());
--
--  SpellCheckScope scope(*this);
--  base::string16 word;
--  int word_start;
--  int word_length;
--  for (auto status =
--           text_iterator_.GetNextWord(&word, &word_start, &word_length);
--       status != SpellcheckWordIterator::IS_END_OF_TEXT;
--       status = text_iterator_.GetNextWord(&word, &word_start, &word_length)) {
--    if (status == SpellcheckWordIterator::IS_SKIPPABLE)
--      continue;
--
--    // Found a word (or a contraction) that the spellchecker can check the
--    // spelling of.
--    if (SpellCheckWord(scope, word))
--      continue;
--
--    // If the given word is a concatenated word of two or more valid words
--    // (e.g. "hello:hello"), we should treat it as a valid word.
--    if (IsValidContraction(scope, word))
--      continue;
--
--    blink::WebTextCheckingResult result;
--    result.location = word_start;
--    result.length = word_length;
--    results->push_back(result);
--
--    if (stop_at_first_result)
--      return;
--  }
--}
--
--bool SpellCheckClient::SpellCheckWord(
--    const SpellCheckScope& scope,
--    const base::string16& word_to_check) const {
--  DCHECK(!scope.spell_check_.IsEmpty());
--
--  v8::Local<v8::Value> word = mate::ConvertToV8(isolate_, word_to_check);
--  v8::Local<v8::Value> result =
--      scope.spell_check_->Call(scope.provider_, 1, &word);
--
--  if (!result.IsEmpty() && result->IsBoolean())
--    return result->BooleanValue();
--  else
--    return true;
--}
--
--// Returns whether or not the given string is a valid contraction.
--// This function is a fall-back when the SpellcheckWordIterator class
--// returns a concatenated word which is not in the selected dictionary
--// (e.g. "in'n'out") but each word is valid.
--bool SpellCheckClient::IsValidContraction(const SpellCheckScope& scope,
--                                          const base::string16& contraction) {
--  DCHECK(contraction_iterator_.IsInitialized());
--
--  contraction_iterator_.SetText(contraction.c_str(), contraction.length());
--
--  base::string16 word;
--  int word_start;
--  int word_length;
--
--  for (auto status =
--           contraction_iterator_.GetNextWord(&word, &word_start, &word_length);
--       status != SpellcheckWordIterator::IS_END_OF_TEXT;
--       status = contraction_iterator_.GetNextWord(&word, &word_start,
--                                                  &word_length)) {
--    if (status == SpellcheckWordIterator::IS_SKIPPABLE)
--      continue;
--
--    if (!SpellCheckWord(scope, word))
--      return false;
--  }
--  return true;
--}
--
--void SpellCheckClient::PerformSpellCheck(SpellcheckRequest* param) {
--  DCHECK(param);
--
--  std::vector<blink::WebTextCheckingResult> results;
--  SpellCheckText(param->text(), false, &results);
--  param->completion()->DidFinishCheckingText(results);
--}
--
--SpellCheckClient::SpellCheckScope::SpellCheckScope(
--    const SpellCheckClient& client)
--    : handle_scope_(client.isolate_),
--      context_scope_(
--          v8::Local<v8::Context>::New(client.isolate_, client.context_)),
--      provider_(client.provider_.NewHandle()),
--      spell_check_(client.spell_check_.NewHandle()) {}
--
--SpellCheckClient::SpellCheckScope::~SpellCheckScope() = default;
--
--}  // namespace api
--
--}  // namespace atom
-removed in remote
-  base   100644 af72756e2ec13911ae5159944cbcca51d8365e77 atom/renderer/api/atom_api_spell_check_client.h
-  our    100644 c8b5f7f4ab164307f735cc0bc0651435a42c3034 atom/renderer/api/atom_api_spell_check_client.h
-@@ -1,113 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_RENDERER_API_ATOM_API_SPELL_CHECK_CLIENT_H_
--#define ATOM_RENDERER_API_ATOM_API_SPELL_CHECK_CLIENT_H_
--
--#include <string>
--#include <vector>
--
--#include "base/callback.h"
--#include "base/memory/weak_ptr.h"
--#include "chrome/renderer/spellchecker/spellcheck_worditerator.h"
--#include "native_mate/scoped_persistent.h"
--#include "third_party/WebKit/public/platform/WebSpellCheckPanelHostClient.h"
--#include "third_party/WebKit/public/platform/WebVector.h"
--#include "third_party/WebKit/public/web/WebTextCheckClient.h"
--
--namespace blink {
--struct WebTextCheckingResult;
--class WebTextCheckingCompletion;
--}  // namespace blink
--
--namespace atom {
--
--namespace api {
--
--class SpellCheckClient : public blink::WebSpellCheckPanelHostClient,
--                         public blink::WebTextCheckClient,
--                         public base::SupportsWeakPtr<SpellCheckClient> {
-- public:
--  SpellCheckClient(const std::string& language,
--                   bool auto_spell_correct_turned_on,
--                   v8::Isolate* isolate,
--                   v8::Local<v8::Object> provider);
--  ~SpellCheckClient() override;
--
-- private:
--  class SpellcheckRequest;
--  // blink::WebTextCheckClient:
--  void CheckSpelling(
--      const blink::WebString& text,
--      int& misspelledOffset,
--      int& misspelledLength,
--      blink::WebVector<blink::WebString>* optionalSuggestions) override;
--  void RequestCheckingOfText(
--      const blink::WebString& textToCheck,
--      blink::WebTextCheckingCompletion* completionCallback) override;
--  bool IsSpellCheckingEnabled() const override;
--
--  // blink::WebSpellCheckPanelHostClient:
--  void ShowSpellingUI(bool show) override;
--  bool IsShowingSpellingUI() override;
--  void UpdateSpellingUIWithMisspelledWord(
--      const blink::WebString& word) override;
--
--  struct SpellCheckScope {
--    v8::HandleScope handle_scope_;
--    v8::Context::Scope context_scope_;
--    v8::Local<v8::Object> provider_;
--    v8::Local<v8::Function> spell_check_;
--
--    explicit SpellCheckScope(const SpellCheckClient& client);
--    ~SpellCheckScope();
--  };
--
--  // Check the spelling of text.
--  void SpellCheckText(const base::string16& text,
--                      bool stop_at_first_result,
--                      std::vector<blink::WebTextCheckingResult>* results);
--
--  // Call JavaScript to check spelling a word.
--  bool SpellCheckWord(const SpellCheckScope& scope,
--                      const base::string16& word_to_check) const;
--
--  // Returns whether or not the given word is a contraction of valid words
--  // (e.g. "word:word").
--  bool IsValidContraction(const SpellCheckScope& scope,
--                          const base::string16& word);
--
--  // Performs spell checking from the request queue.
--  void PerformSpellCheck(SpellcheckRequest* param);
--
--  // Represents character attributes used for filtering out characters which
--  // are not supported by this SpellCheck object.
--  SpellcheckCharAttribute character_attributes_;
--
--  // Represents word iterators used in this spellchecker. The |text_iterator_|
--  // splits text provided by WebKit into words, contractions, or concatenated
--  // words. The |contraction_iterator_| splits a concatenated word extracted by
--  // |text_iterator_| into word components so we can treat a concatenated word
--  // consisting only of correct words as a correct word.
--  SpellcheckWordIterator text_iterator_;
--  SpellcheckWordIterator contraction_iterator_;
--
--  // The parameters of a pending background-spellchecking request.
--  // (When WebKit sends two or more requests, we cancel the previous
--  // requests so we do not have to use vectors.)
--  std::unique_ptr<SpellcheckRequest> pending_request_param_;
--
--  v8::Isolate* isolate_;
--  v8::Persistent<v8::Context> context_;
--  mate::ScopedPersistent<v8::Object> provider_;
--  mate::ScopedPersistent<v8::Function> spell_check_;
--
--  DISALLOW_COPY_AND_ASSIGN(SpellCheckClient);
--};
--
--}  // namespace api
--
--}  // namespace atom
--
--#endif  // ATOM_RENDERER_API_ATOM_API_SPELL_CHECK_CLIENT_H_
-removed in remote
-  base   100644 e00b901bfff60e8223fd11194bfd209efee72fea atom/renderer/api/atom_api_web_frame.cc
-  our    100644 f0f7ef249d73876f7107d3d3865e8fc71ee33945 atom/renderer/api/atom_api_web_frame.cc
-@@ -1,544 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/renderer/api/atom_api_web_frame.h"
--
--#include "atom/common/api/api_messages.h"
--#include "atom/common/api/event_emitter_caller.h"
--#include "atom/common/native_mate_converters/blink_converter.h"
--#include "atom/common/native_mate_converters/callback.h"
--#include "atom/common/native_mate_converters/gfx_converter.h"
--#include "atom/common/native_mate_converters/string16_converter.h"
--#include "atom/renderer/api/atom_api_spell_check_client.h"
--#include "base/memory/memory_pressure_listener.h"
--#include "content/public/renderer/render_frame.h"
--#include "content/public/renderer/render_frame_observer.h"
--#include "content/public/renderer/render_frame_visitor.h"
--#include "content/public/renderer/render_view.h"
--#include "native_mate/dictionary.h"
--#include "native_mate/object_template_builder.h"
--#include "third_party/WebKit/Source/platform/weborigin/SchemeRegistry.h"
--#include "third_party/WebKit/public/platform/WebCache.h"
--#include "third_party/WebKit/public/web/WebDocument.h"
--#include "third_party/WebKit/public/web/WebElement.h"
--#include "third_party/WebKit/public/web/WebFrameWidget.h"
--#include "third_party/WebKit/public/web/WebImeTextSpan.h"
--#include "third_party/WebKit/public/web/WebInputMethodController.h"
--#include "third_party/WebKit/public/web/WebLocalFrame.h"
--#include "third_party/WebKit/public/web/WebScriptExecutionCallback.h"
--#include "third_party/WebKit/public/web/WebScriptSource.h"
--#include "third_party/WebKit/public/web/WebView.h"
--
--#include "atom/common/node_includes.h"
--
--namespace mate {
--
--template <>
--struct Converter<blink::WebLocalFrame::ScriptExecutionType> {
--  static bool FromV8(v8::Isolate* isolate,
--                     v8::Local<v8::Value> val,
--                     blink::WebLocalFrame::ScriptExecutionType* out) {
--    std::string execution_type;
--    if (!ConvertFromV8(isolate, val, &execution_type))
--      return false;
--    if (execution_type == "asynchronous") {
--      *out = blink::WebLocalFrame::kAsynchronous;
--    } else if (execution_type == "asynchronousBlockingOnload") {
--      *out = blink::WebLocalFrame::kAsynchronousBlockingOnload;
--    } else if (execution_type == "synchronous") {
--      *out = blink::WebLocalFrame::kSynchronous;
--    } else {
--      return false;
--    }
--    return true;
--  }
--};
--
--}  // namespace mate
--
--namespace atom {
--
--namespace api {
--
--namespace {
--
--content::RenderFrame* GetRenderFrame(v8::Local<v8::Value> value) {
--  v8::Local<v8::Context> context =
--      v8::Local<v8::Object>::Cast(value)->CreationContext();
--  if (context.IsEmpty())
--    return nullptr;
--  blink::WebLocalFrame* frame = blink::WebLocalFrame::FrameForContext(context);
--  if (!frame)
--    return nullptr;
--  return content::RenderFrame::FromWebFrame(frame);
--}
--
--class RenderFrameStatus : public content::RenderFrameObserver {
-- public:
--  explicit RenderFrameStatus(content::RenderFrame* render_frame)
--      : content::RenderFrameObserver(render_frame) {}
--  ~RenderFrameStatus() final {}
--
--  bool is_ok() { return render_frame() != nullptr; }
--
--  // RenderFrameObserver implementation.
--  void OnDestruct() final {}
--};
--
--class ScriptExecutionCallback : public blink::WebScriptExecutionCallback {
-- public:
--  using CompletionCallback =
--      base::Callback<void(const v8::Local<v8::Value>& result)>;
--
--  explicit ScriptExecutionCallback(const CompletionCallback& callback)
--      : callback_(callback) {}
--  ~ScriptExecutionCallback() override {}
--
--  void Completed(
--      const blink::WebVector<v8::Local<v8::Value>>& result) override {
--    if (!callback_.is_null() && !result.IsEmpty() && !result[0].IsEmpty())
--      // Right now only single results per frame is supported.
--      callback_.Run(result[0]);
--    delete this;
--  }
--
-- private:
--  CompletionCallback callback_;
--
--  DISALLOW_COPY_AND_ASSIGN(ScriptExecutionCallback);
--};
--
--class FrameSpellChecker : public content::RenderFrameVisitor {
-- public:
--  explicit FrameSpellChecker(SpellCheckClient* spell_check_client,
--                             content::RenderFrame* main_frame)
--      : spell_check_client_(spell_check_client), main_frame_(main_frame) {}
--  ~FrameSpellChecker() override {
--    spell_check_client_ = nullptr;
--    main_frame_ = nullptr;
--  }
--  bool Visit(content::RenderFrame* render_frame) override {
--    auto* view = render_frame->GetRenderView();
--    if (view->GetMainRenderFrame() == main_frame_ ||
--        (render_frame->IsMainFrame() && render_frame == main_frame_)) {
--      render_frame->GetWebFrame()->SetTextCheckClient(spell_check_client_);
--    }
--    return true;
--  }
--
-- private:
--  SpellCheckClient* spell_check_client_;
--  content::RenderFrame* main_frame_;
--  DISALLOW_COPY_AND_ASSIGN(FrameSpellChecker);
--};
--
--}  // namespace
--
--WebFrame::WebFrame(v8::Isolate* isolate)
--    : web_frame_(blink::WebLocalFrame::FrameForCurrentContext()) {
--  Init(isolate);
--}
--
--WebFrame::WebFrame(v8::Isolate* isolate, blink::WebLocalFrame* blink_frame)
--    : web_frame_(blink_frame) {
--  Init(isolate);
--}
--
--WebFrame::~WebFrame() {}
--
--void WebFrame::SetName(const std::string& name) {
--  web_frame_->SetName(blink::WebString::FromUTF8(name));
--}
--
--double WebFrame::SetZoomLevel(double level) {
--  double result = 0.0;
--  content::RenderFrame* render_frame =
--      content::RenderFrame::FromWebFrame(web_frame_);
--  render_frame->Send(new AtomFrameHostMsg_SetTemporaryZoomLevel(
--      render_frame->GetRoutingID(), level, &result));
--  return result;
--}
--
--double WebFrame::GetZoomLevel() const {
--  double result = 0.0;
--  content::RenderFrame* render_frame =
--      content::RenderFrame::FromWebFrame(web_frame_);
--  render_frame->Send(
--      new AtomFrameHostMsg_GetZoomLevel(render_frame->GetRoutingID(), &result));
--  return result;
--}
--
--double WebFrame::SetZoomFactor(double factor) {
--  return blink::WebView::ZoomLevelToZoomFactor(
--      SetZoomLevel(blink::WebView::ZoomFactorToZoomLevel(factor)));
--}
--
--double WebFrame::GetZoomFactor() const {
--  return blink::WebView::ZoomLevelToZoomFactor(GetZoomLevel());
--}
--
--void WebFrame::SetVisualZoomLevelLimits(double min_level, double max_level) {
--  web_frame_->View()->SetDefaultPageScaleLimits(min_level, max_level);
--  web_frame_->View()->SetIgnoreViewportTagScaleLimits(true);
--}
--
--void WebFrame::SetLayoutZoomLevelLimits(double min_level, double max_level) {
--  web_frame_->View()->ZoomLimitsChanged(min_level, max_level);
--}
--
--v8::Local<v8::Value> WebFrame::RegisterEmbedderCustomElement(
--    const base::string16& name,
--    v8::Local<v8::Object> options) {
--  return web_frame_->GetDocument().RegisterEmbedderCustomElement(
--      blink::WebString::FromUTF16(name), options);
--}
--
--int WebFrame::GetWebFrameId(v8::Local<v8::Value> content_window) {
--  // Get the WebLocalFrame before (possibly) executing any user-space JS while
--  // getting the |params|. We track the status of the RenderFrame via an
--  // observer in case it is deleted during user code execution.
--  content::RenderFrame* render_frame = GetRenderFrame(content_window);
--  RenderFrameStatus render_frame_status(render_frame);
--
--  if (!render_frame_status.is_ok())
--    return -1;
--
--  blink::WebLocalFrame* frame = render_frame->GetWebFrame();
--  // Parent must exist.
--  blink::WebFrame* parent_frame = frame->Parent();
--  DCHECK(parent_frame);
--  DCHECK(parent_frame->IsWebLocalFrame());
--
--  return render_frame->GetRoutingID();
--}
--
--void WebFrame::SetSpellCheckProvider(mate::Arguments* args,
--                                     const std::string& language,
--                                     bool auto_spell_correct_turned_on,
--                                     v8::Local<v8::Object> provider) {
--  if (!provider->Has(mate::StringToV8(args->isolate(), "spellCheck"))) {
--    args->ThrowError("\"spellCheck\" has to be defined");
--    return;
--  }
--
--  auto client = std::make_unique<SpellCheckClient>(
--      language, auto_spell_correct_turned_on, args->isolate(), provider);
--  // Set spellchecker for all live frames in the same process or
--  // in the sandbox mode for all live sub frames to this WebFrame.
--  FrameSpellChecker spell_checker(
--      client.get(), content::RenderFrame::FromWebFrame(web_frame_));
--  content::RenderFrame::ForEach(&spell_checker);
--  spell_check_client_.swap(client);
--  web_frame_->SetSpellCheckPanelHostClient(spell_check_client_.get());
--}
--
--void WebFrame::RegisterURLSchemeAsBypassingCSP(const std::string& scheme) {
--  // Register scheme to bypass pages's Content Security Policy.
--  blink::SchemeRegistry::RegisterURLSchemeAsBypassingContentSecurityPolicy(
--      WTF::String::FromUTF8(scheme.data(), scheme.length()));
--}
--
--void WebFrame::RegisterURLSchemeAsPrivileged(const std::string& scheme,
--                                             mate::Arguments* args) {
--  // TODO(deepak1556): blink::SchemeRegistry methods should be called
--  // before any renderer threads are created. Fixing this would break
--  // current api. Change it with 2.0.
--
--  // Read optional flags
--  bool secure = true;
--  bool bypassCSP = true;
--  bool allowServiceWorkers = true;
--  bool supportFetchAPI = true;
--  bool corsEnabled = true;
--  if (args->Length() == 2) {
--    mate::Dictionary options;
--    if (args->GetNext(&options)) {
--      options.Get("secure", &secure);
--      options.Get("bypassCSP", &bypassCSP);
--      options.Get("allowServiceWorkers", &allowServiceWorkers);
--      options.Get("supportFetchAPI", &supportFetchAPI);
--      options.Get("corsEnabled", &corsEnabled);
--    }
--  }
--  // Register scheme to privileged list (https, wss, data, chrome-extension)
--  WTF::String privileged_scheme(
--      WTF::String::FromUTF8(scheme.data(), scheme.length()));
--  if (bypassCSP) {
--    blink::SchemeRegistry::RegisterURLSchemeAsBypassingContentSecurityPolicy(
--        privileged_scheme);
--  }
--  if (allowServiceWorkers) {
--    blink::SchemeRegistry::RegisterURLSchemeAsAllowingServiceWorkers(
--        privileged_scheme);
--  }
--  if (supportFetchAPI) {
--    blink::SchemeRegistry::RegisterURLSchemeAsSupportingFetchAPI(
--        privileged_scheme);
--  }
--  if (corsEnabled) {
--    blink::SchemeRegistry::RegisterURLSchemeAsCORSEnabled(privileged_scheme);
--  }
--}
--
--void WebFrame::InsertText(const std::string& text) {
--  web_frame_->FrameWidget()->GetActiveWebInputMethodController()->CommitText(
--      blink::WebString::FromUTF8(text),
--      blink::WebVector<blink::WebImeTextSpan>(), blink::WebRange(), 0);
--}
--
--void WebFrame::InsertCSS(const std::string& css) {
--  web_frame_->GetDocument().InsertStyleSheet(blink::WebString::FromUTF8(css));
--}
--
--void WebFrame::ExecuteJavaScript(const base::string16& code,
--                                 mate::Arguments* args) {
--  bool has_user_gesture = false;
--  args->GetNext(&has_user_gesture);
--  ScriptExecutionCallback::CompletionCallback completion_callback;
--  args->GetNext(&completion_callback);
--  std::unique_ptr<blink::WebScriptExecutionCallback> callback(
--      new ScriptExecutionCallback(completion_callback));
--  web_frame_->RequestExecuteScriptAndReturnValue(
--      blink::WebScriptSource(blink::WebString::FromUTF16(code)),
--      has_user_gesture, callback.release());
--}
--
--void WebFrame::ExecuteJavaScriptInIsolatedWorld(
--    int world_id,
--    const std::vector<mate::Dictionary>& scripts,
--    mate::Arguments* args) {
--  std::vector<blink::WebScriptSource> sources;
--
--  for (const auto& script : scripts) {
--    base::string16 code;
--    base::string16 url;
--    int start_line = 1;
--    script.Get("url", &url);
--    script.Get("startLine", &start_line);
--
--    if (!script.Get("code", &code)) {
--      args->ThrowError("Invalid 'code'");
--      return;
--    }
--
--    sources.emplace_back(
--        blink::WebScriptSource(blink::WebString::FromUTF16(code),
--                               blink::WebURL(GURL(url)), start_line));
--  }
--
--  bool has_user_gesture = false;
--  args->GetNext(&has_user_gesture);
--
--  blink::WebLocalFrame::ScriptExecutionType scriptExecutionType =
--      blink::WebLocalFrame::kSynchronous;
--  args->GetNext(&scriptExecutionType);
--
--  ScriptExecutionCallback::CompletionCallback completion_callback;
--  args->GetNext(&completion_callback);
--  std::unique_ptr<blink::WebScriptExecutionCallback> callback(
--      new ScriptExecutionCallback(completion_callback));
--
--  web_frame_->RequestExecuteScriptInIsolatedWorld(
--      world_id, &sources.front(), sources.size(), has_user_gesture,
--      scriptExecutionType, callback.release());
--}
--
--void WebFrame::SetIsolatedWorldSecurityOrigin(int world_id,
--                                              const std::string& origin_url) {
--  web_frame_->SetIsolatedWorldSecurityOrigin(
--      world_id, blink::WebSecurityOrigin::CreateFromString(
--                    blink::WebString::FromUTF8(origin_url)));
--}
--
--void WebFrame::SetIsolatedWorldContentSecurityPolicy(
--    int world_id,
--    const std::string& security_policy) {
--  web_frame_->SetIsolatedWorldContentSecurityPolicy(
--      world_id, blink::WebString::FromUTF8(security_policy));
--}
--
--void WebFrame::SetIsolatedWorldHumanReadableName(int world_id,
--                                                 const std::string& name) {
--  web_frame_->SetIsolatedWorldHumanReadableName(
--      world_id, blink::WebString::FromUTF8(name));
--}
--
--// static
--mate::Handle<WebFrame> WebFrame::Create(v8::Isolate* isolate) {
--  return mate::CreateHandle(isolate, new WebFrame(isolate));
--}
--
--blink::WebCache::ResourceTypeStats WebFrame::GetResourceUsage(
--    v8::Isolate* isolate) {
--  blink::WebCache::ResourceTypeStats stats;
--  blink::WebCache::GetResourceTypeStats(&stats);
--  return stats;
--}
--
--void WebFrame::ClearCache(v8::Isolate* isolate) {
--  isolate->IdleNotificationDeadline(0.5);
--  blink::WebCache::Clear();
--  base::MemoryPressureListener::NotifyMemoryPressure(
--      base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_CRITICAL);
--}
--
--v8::Local<v8::Value> WebFrame::Opener() const {
--  blink::WebFrame* frame = web_frame_->Opener();
--  if (frame && frame->IsWebLocalFrame())
--    return mate::CreateHandle(isolate(),
--                              new WebFrame(isolate(), frame->ToWebLocalFrame()))
--        .ToV8();
--  else
--    return v8::Null(isolate());
--}
--
--v8::Local<v8::Value> WebFrame::Parent() const {
--  blink::WebFrame* frame = web_frame_->Parent();
--  if (frame && frame->IsWebLocalFrame())
--    return mate::CreateHandle(isolate(),
--                              new WebFrame(isolate(), frame->ToWebLocalFrame()))
--        .ToV8();
--  else
--    return v8::Null(isolate());
--}
--
--v8::Local<v8::Value> WebFrame::Top() const {
--  blink::WebFrame* frame = web_frame_->Top();
--  if (frame && frame->IsWebLocalFrame())
--    return mate::CreateHandle(isolate(),
--                              new WebFrame(isolate(), frame->ToWebLocalFrame()))
--        .ToV8();
--  else
--    return v8::Null(isolate());
--}
--
--v8::Local<v8::Value> WebFrame::FirstChild() const {
--  blink::WebFrame* frame = web_frame_->FirstChild();
--  if (frame && frame->IsWebLocalFrame())
--    return mate::CreateHandle(isolate(),
--                              new WebFrame(isolate(), frame->ToWebLocalFrame()))
--        .ToV8();
--  else
--    return v8::Null(isolate());
--}
--
--v8::Local<v8::Value> WebFrame::NextSibling() const {
--  blink::WebFrame* frame = web_frame_->NextSibling();
--  if (frame && frame->IsWebLocalFrame())
--    return mate::CreateHandle(isolate(),
--                              new WebFrame(isolate(), frame->ToWebLocalFrame()))
--        .ToV8();
--  else
--    return v8::Null(isolate());
--}
--
--v8::Local<v8::Value> WebFrame::GetFrameForSelector(
--    const std::string& selector) const {
--  blink::WebElement element = web_frame_->GetDocument().QuerySelector(
--      blink::WebString::FromUTF8(selector));
--  blink::WebLocalFrame* element_frame =
--      blink::WebLocalFrame::FromFrameOwnerElement(element);
--  if (element_frame)
--    return mate::CreateHandle(isolate(), new WebFrame(isolate(), element_frame))
--        .ToV8();
--  else
--    return v8::Null(isolate());
--}
--
--v8::Local<v8::Value> WebFrame::FindFrameByName(const std::string& name) const {
--  blink::WebLocalFrame* local_frame =
--      web_frame_->FindFrameByName(blink::WebString::FromUTF8(name))
--          ->ToWebLocalFrame();
--  if (local_frame)
--    return mate::CreateHandle(isolate(), new WebFrame(isolate(), local_frame))
--        .ToV8();
--  else
--    return v8::Null(isolate());
--}
--
--v8::Local<v8::Value> WebFrame::FindFrameByRoutingId(int routing_id) const {
--  content::RenderFrame* render_frame =
--      content::RenderFrame::FromRoutingID(routing_id);
--  blink::WebLocalFrame* local_frame = nullptr;
--  if (render_frame)
--    local_frame = render_frame->GetWebFrame();
--  if (local_frame)
--    return mate::CreateHandle(isolate(), new WebFrame(isolate(), local_frame))
--        .ToV8();
--  else
--    return v8::Null(isolate());
--}
--
--v8::Local<v8::Value> WebFrame::RoutingId() const {
--  int routing_id = content::RenderFrame::GetRoutingIdForWebFrame(web_frame_);
--  return v8::Number::New(isolate(), routing_id);
--}
--
--// static
--void WebFrame::BuildPrototype(v8::Isolate* isolate,
--                              v8::Local<v8::FunctionTemplate> prototype) {
--  prototype->SetClassName(mate::StringToV8(isolate, "WebFrame"));
--  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
--      .SetMethod("setName", &WebFrame::SetName)
--      .SetMethod("setZoomLevel", &WebFrame::SetZoomLevel)
--      .SetMethod("getZoomLevel", &WebFrame::GetZoomLevel)
--      .SetMethod("setZoomFactor", &WebFrame::SetZoomFactor)
--      .SetMethod("getZoomFactor", &WebFrame::GetZoomFactor)
--      .SetMethod("setVisualZoomLevelLimits",
--                 &WebFrame::SetVisualZoomLevelLimits)
--      .SetMethod("setLayoutZoomLevelLimits",
--                 &WebFrame::SetLayoutZoomLevelLimits)
--      .SetMethod("registerEmbedderCustomElement",
--                 &WebFrame::RegisterEmbedderCustomElement)
--      .SetMethod("getWebFrameId", &WebFrame::GetWebFrameId)
--      .SetMethod("setSpellCheckProvider", &WebFrame::SetSpellCheckProvider)
--      .SetMethod("registerURLSchemeAsBypassingCSP",
--                 &WebFrame::RegisterURLSchemeAsBypassingCSP)
--      .SetMethod("registerURLSchemeAsPrivileged",
--                 &WebFrame::RegisterURLSchemeAsPrivileged)
--      .SetMethod("insertText", &WebFrame::InsertText)
--      .SetMethod("insertCSS", &WebFrame::InsertCSS)
--      .SetMethod("executeJavaScript", &WebFrame::ExecuteJavaScript)
--      .SetMethod("executeJavaScriptInIsolatedWorld",
--                 &WebFrame::ExecuteJavaScriptInIsolatedWorld)
--      .SetMethod("setIsolatedWorldSecurityOrigin",
--                 &WebFrame::SetIsolatedWorldSecurityOrigin)
--      .SetMethod("setIsolatedWorldContentSecurityPolicy",
--                 &WebFrame::SetIsolatedWorldContentSecurityPolicy)
--      .SetMethod("setIsolatedWorldHumanReadableName",
--                 &WebFrame::SetIsolatedWorldHumanReadableName)
--      .SetMethod("getResourceUsage", &WebFrame::GetResourceUsage)
--      .SetMethod("clearCache", &WebFrame::ClearCache)
--      .SetMethod("getFrameForSelector", &WebFrame::GetFrameForSelector)
--      .SetMethod("findFrameByName", &WebFrame::FindFrameByName)
--      .SetProperty("opener", &WebFrame::Opener)
--      .SetProperty("parent", &WebFrame::Parent)
--      .SetProperty("top", &WebFrame::Top)
--      .SetProperty("firstChild", &WebFrame::FirstChild)
--      .SetProperty("nextSibling", &WebFrame::NextSibling)
--      .SetProperty("routingId", &WebFrame::RoutingId)
--      .SetMethod("findFrameByRoutingId", &WebFrame::FindFrameByRoutingId);
--}
--
--}  // namespace api
--
--}  // namespace atom
--
--namespace {
--
--using atom::api::WebFrame;
--
--void Initialize(v8::Local<v8::Object> exports,
--                v8::Local<v8::Value> unused,
--                v8::Local<v8::Context> context,
--                void* priv) {
--  v8::Isolate* isolate = context->GetIsolate();
--  mate::Dictionary dict(isolate, exports);
--  dict.Set("webFrame", WebFrame::Create(isolate));
--  dict.Set("WebFrame", WebFrame::GetConstructor(isolate)->GetFunction());
--}
--
--}  // namespace
--
--NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_renderer_web_frame, Initialize)
-removed in remote
-  base   100644 d55b24fd25ea474104ccf32f48103c39a79c8f56 atom/renderer/api/atom_api_web_frame.h
-  our    100644 4cc6386abcb41cfa29fdc002f6fb267329bb112d atom/renderer/api/atom_api_web_frame.h
-@@ -1,113 +0,0 @@
--// Copyright (c) 2014 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_RENDERER_API_ATOM_API_WEB_FRAME_H_
--#define ATOM_RENDERER_API_ATOM_API_WEB_FRAME_H_
--
--#include <memory>
--#include <string>
--#include <vector>
--
--#include "native_mate/handle.h"
--#include "native_mate/wrappable.h"
--#include "third_party/WebKit/public/platform/WebCache.h"
--
--namespace blink {
--class WebLocalFrame;
--}
--
--namespace mate {
--class Dictionary;
--class Arguments;
--}  // namespace mate
--
--namespace atom {
--
--namespace api {
--
--class SpellCheckClient;
--
--class WebFrame : public mate::Wrappable<WebFrame> {
-- public:
--  static mate::Handle<WebFrame> Create(v8::Isolate* isolate);
--
--  static void BuildPrototype(v8::Isolate* isolate,
--                             v8::Local<v8::FunctionTemplate> prototype);
--
-- private:
--  explicit WebFrame(v8::Isolate* isolate);
--  explicit WebFrame(v8::Isolate* isolate, blink::WebLocalFrame* blink_frame);
--  ~WebFrame() override;
--
--  void SetName(const std::string& name);
--
--  double SetZoomLevel(double level);
--  double GetZoomLevel() const;
--  double SetZoomFactor(double factor);
--  double GetZoomFactor() const;
--
--  void SetVisualZoomLevelLimits(double min_level, double max_level);
--  void SetLayoutZoomLevelLimits(double min_level, double max_level);
--
--  v8::Local<v8::Value> RegisterEmbedderCustomElement(
--      const base::string16& name,
--      v8::Local<v8::Object> options);
--  int GetWebFrameId(v8::Local<v8::Value> content_window);
--
--  // Set the provider that will be used by SpellCheckClient for spell check.
--  void SetSpellCheckProvider(mate::Arguments* args,
--                             const std::string& language,
--                             bool auto_spell_correct_turned_on,
--                             v8::Local<v8::Object> provider);
--
--  void RegisterURLSchemeAsBypassingCSP(const std::string& scheme);
--  void RegisterURLSchemeAsPrivileged(const std::string& scheme,
--                                     mate::Arguments* args);
--
--  // Editing.
--  void InsertText(const std::string& text);
--  void InsertCSS(const std::string& css);
--
--  // Executing scripts.
--  void ExecuteJavaScript(const base::string16& code, mate::Arguments* args);
--  void ExecuteJavaScriptInIsolatedWorld(
--      int world_id,
--      const std::vector<mate::Dictionary>& scripts,
--      mate::Arguments* args);
--
--  // Isolated world related methods
--  void SetIsolatedWorldSecurityOrigin(int world_id,
--                                      const std::string& origin_url);
--  void SetIsolatedWorldContentSecurityPolicy(
--      int world_id,
--      const std::string& security_policy);
--  void SetIsolatedWorldHumanReadableName(int world_id, const std::string& name);
--
--  // Resource related methods
--  blink::WebCache::ResourceTypeStats GetResourceUsage(v8::Isolate* isolate);
--  void ClearCache(v8::Isolate* isolate);
--
--  // Frame navigation
--  v8::Local<v8::Value> Opener() const;
--  v8::Local<v8::Value> Parent() const;
--  v8::Local<v8::Value> Top() const;
--  v8::Local<v8::Value> FirstChild() const;
--  v8::Local<v8::Value> NextSibling() const;
--  v8::Local<v8::Value> GetFrameForSelector(const std::string& selector) const;
--  v8::Local<v8::Value> FindFrameByName(const std::string& name) const;
--  v8::Local<v8::Value> FindFrameByRoutingId(int routing_id) const;
--  v8::Local<v8::Value> RoutingId() const;
--
--  std::unique_ptr<SpellCheckClient> spell_check_client_;
--
--  blink::WebLocalFrame* web_frame_;
--
--  DISALLOW_COPY_AND_ASSIGN(WebFrame);
--};
--
--}  // namespace api
--
--}  // namespace atom
--
--#endif  // ATOM_RENDERER_API_ATOM_API_WEB_FRAME_H_
-removed in remote
-  base   100644 bbaea351378bf2c9115b87b762a8b2af7e15b844 atom/renderer/atom_render_view_observer.cc
-  our    100644 1a425dfa1d40953efb192c3405baff61e96cb734 atom/renderer/atom_render_view_observer.cc
-@@ -1,37 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/renderer/atom_render_view_observer.h"
--
--#include "atom/common/api/api_messages.h"
--#include "content/public/renderer/render_view.h"
--#include "ipc/ipc_message_macros.h"
--#include "third_party/WebKit/public/web/WebView.h"
--
--namespace atom {
--
--AtomRenderViewObserver::AtomRenderViewObserver(content::RenderView* render_view)
--    : content::RenderViewObserver(render_view) {}
--
--AtomRenderViewObserver::~AtomRenderViewObserver() {}
--
--bool AtomRenderViewObserver::OnMessageReceived(const IPC::Message& message) {
--  bool handled = true;
--  IPC_BEGIN_MESSAGE_MAP(AtomRenderViewObserver, message)
--    IPC_MESSAGE_HANDLER(AtomViewMsg_Offscreen, OnOffscreen)
--    IPC_MESSAGE_UNHANDLED(handled = false)
--  IPC_END_MESSAGE_MAP()
--
--  return handled;
--}
--
--void AtomRenderViewObserver::OnDestruct() {
--  delete this;
--}
--
--void AtomRenderViewObserver::OnOffscreen() {
--  blink::WebView::SetUseExternalPopupMenus(false);
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 4b9d59f3fa08720ab25170a4c0cc785ba1c170de atom/renderer/atom_render_view_observer.h
-  our    100644 097616e12369662473c12645a93e27cffcb55e3b atom/renderer/atom_render_view_observer.h
-@@ -1,31 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_RENDERER_ATOM_RENDER_VIEW_OBSERVER_H_
--#define ATOM_RENDERER_ATOM_RENDER_VIEW_OBSERVER_H_
--
--#include "content/public/renderer/render_view_observer.h"
--
--namespace atom {
--
--class AtomRenderViewObserver : public content::RenderViewObserver {
-- public:
--  explicit AtomRenderViewObserver(content::RenderView* render_view);
--
-- protected:
--  ~AtomRenderViewObserver() override;
--
-- private:
--  // content::RenderViewObserver implementation.
--  bool OnMessageReceived(const IPC::Message& message) override;
--  void OnDestruct() override;
--
--  void OnOffscreen();
--
--  DISALLOW_COPY_AND_ASSIGN(AtomRenderViewObserver);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_RENDERER_ATOM_RENDER_VIEW_OBSERVER_H_
-removed in remote
-  base   100644 7746ce123e4ffdec46196aae5b69295672ccdcc8 atom/renderer/atom_renderer_client.cc
-  our    100644 204f17c2cf0d2d4ec4a71bdbecfcd1cbdc5fc8be atom/renderer/atom_renderer_client.cc
-@@ -1,230 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/renderer/atom_renderer_client.h"
--
--#include <string>
--#include <vector>
--
--#include "atom/common/api/atom_bindings.h"
--#include "atom/common/api/event_emitter_caller.h"
--#include "atom/common/asar/asar_util.h"
--#include "atom/common/node_bindings.h"
--#include "atom/common/options_switches.h"
--#include "atom/renderer/api/atom_api_renderer_ipc.h"
--#include "atom/renderer/atom_render_frame_observer.h"
--#include "atom/renderer/web_worker_observer.h"
--#include "base/command_line.h"
--#include "content/public/renderer/render_frame.h"
--#include "native_mate/dictionary.h"
--#include "third_party/WebKit/public/web/WebDocument.h"
--#include "third_party/WebKit/public/web/WebLocalFrame.h"
--
--#include "atom/common/node_includes.h"
--#include "atom_natives.h"  // NOLINT: This file is generated with js2c
--#include "tracing/trace_event.h"
--
--namespace atom {
--
--namespace {
--
--bool IsDevToolsExtension(content::RenderFrame* render_frame) {
--  return static_cast<GURL>(render_frame->GetWebFrame()->GetDocument().Url())
--      .SchemeIs("chrome-extension");
--}
--
--}  // namespace
--
--AtomRendererClient::AtomRendererClient()
--    : node_bindings_(NodeBindings::Create(NodeBindings::RENDERER)),
--      atom_bindings_(new AtomBindings(uv_default_loop())) {}
--
--AtomRendererClient::~AtomRendererClient() {
--  asar::ClearArchives();
--}
--
--void AtomRendererClient::RenderThreadStarted() {
--  RendererClientBase::RenderThreadStarted();
--}
--
--void AtomRendererClient::RenderFrameCreated(
--    content::RenderFrame* render_frame) {
--  new AtomRenderFrameObserver(render_frame, this);
--  RendererClientBase::RenderFrameCreated(render_frame);
--}
--
--void AtomRendererClient::RenderViewCreated(content::RenderView* render_view) {
--  RendererClientBase::RenderViewCreated(render_view);
--}
--
--void AtomRendererClient::RunScriptsAtDocumentStart(
--    content::RenderFrame* render_frame) {
--  // Inform the document start pharse.
--  v8::HandleScope handle_scope(v8::Isolate::GetCurrent());
--  node::Environment* env = GetEnvironment(render_frame);
--  if (env)
--    mate::EmitEvent(env->isolate(), env->process_object(), "document-start");
--}
--
--void AtomRendererClient::RunScriptsAtDocumentEnd(
--    content::RenderFrame* render_frame) {
--  // Inform the document end pharse.
--  v8::HandleScope handle_scope(v8::Isolate::GetCurrent());
--  node::Environment* env = GetEnvironment(render_frame);
--  if (env)
--    mate::EmitEvent(env->isolate(), env->process_object(), "document-end");
--}
--
--void AtomRendererClient::DidCreateScriptContext(
--    v8::Handle<v8::Context> context,
--    content::RenderFrame* render_frame) {
--  RendererClientBase::DidCreateScriptContext(context, render_frame);
--
--  // Only allow node integration for the main frame, unless it is a devtools
--  // extension page.
--  if (!render_frame->IsMainFrame() && !IsDevToolsExtension(render_frame))
--    return;
--
--  injected_frames_.insert(render_frame);
--
--  // Prepare the node bindings.
--  if (!node_integration_initialized_) {
--    node_integration_initialized_ = true;
--    node_bindings_->Initialize();
--    node_bindings_->PrepareMessageLoop();
--  }
--
--  // Setup node tracing controller.
--  if (!node::tracing::TraceEventHelper::GetTracingController())
--    node::tracing::TraceEventHelper::SetTracingController(
--        new v8::TracingController());
--
--  // Setup node environment for each window.
--  node::Environment* env = node_bindings_->CreateEnvironment(context);
--  environments_.insert(env);
--
--  // Add Electron extended APIs.
--  atom_bindings_->BindTo(env->isolate(), env->process_object());
--  AddRenderBindings(env->isolate(), env->process_object());
--
--  // Load everything.
--  node_bindings_->LoadEnvironment(env);
--
--  if (node_bindings_->uv_env() == nullptr) {
--    // Make uv loop being wrapped by window context.
--    node_bindings_->set_uv_env(env);
--
--    // Give the node loop a run to make sure everything is ready.
--    node_bindings_->RunMessageLoop();
--  }
--}
--
--void AtomRendererClient::WillReleaseScriptContext(
--    v8::Handle<v8::Context> context,
--    content::RenderFrame* render_frame) {
--  if (injected_frames_.find(render_frame) == injected_frames_.end())
--    return;
--  injected_frames_.erase(render_frame);
--
--  node::Environment* env = node::Environment::GetCurrent(context);
--  if (environments_.find(env) == environments_.end())
--    return;
--  environments_.erase(env);
--
--  mate::EmitEvent(env->isolate(), env->process_object(), "exit");
--
--  // The main frame may be replaced.
--  if (env == node_bindings_->uv_env())
--    node_bindings_->set_uv_env(nullptr);
--
--  // Destroy the node environment.
--  // This is disabled because pending async tasks may still use the environment
--  // and would cause crashes later. Node does not seem to clear all async tasks
--  // when the environment is destroyed.
--  // node::FreeEnvironment(env);
--
--  // AtomBindings is tracking node environments.
--  atom_bindings_->EnvironmentDestroyed(env);
--}
--
--bool AtomRendererClient::ShouldFork(blink::WebLocalFrame* frame,
--                                    const GURL& url,
--                                    const std::string& http_method,
--                                    bool is_initial_navigation,
--                                    bool is_server_redirect,
--                                    bool* send_referrer) {
--  // Handle all the navigations and reloads in browser.
--  // FIXME We only support GET here because http method will be ignored when
--  // the OpenURLFromTab is triggered, which means form posting would not work,
--  // we should solve this by patching Chromium in future.
--  *send_referrer = true;
--  return http_method == "GET";
--}
--
--void AtomRendererClient::DidInitializeWorkerContextOnWorkerThread(
--    v8::Local<v8::Context> context) {
--  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
--          switches::kNodeIntegrationInWorker)) {
--    WebWorkerObserver::GetCurrent()->ContextCreated(context);
--  }
--}
--
--void AtomRendererClient::WillDestroyWorkerContextOnWorkerThread(
--    v8::Local<v8::Context> context) {
--  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
--          switches::kNodeIntegrationInWorker)) {
--    WebWorkerObserver::GetCurrent()->ContextWillDestroy(context);
--  }
--}
--
--void AtomRendererClient::SetupMainWorldOverrides(
--    v8::Handle<v8::Context> context) {
--  // Setup window overrides in the main world context
--  v8::Isolate* isolate = context->GetIsolate();
--
--  // Wrap the bundle into a function that receives the binding object as
--  // an argument.
--  std::string left = "(function (binding, require) {\n";
--  std::string right = "\n})";
--  auto script = v8::Script::Compile(v8::String::Concat(
--      mate::ConvertToV8(isolate, left)->ToString(),
--      v8::String::Concat(node::isolated_bundle_value.ToStringChecked(isolate),
--                         mate::ConvertToV8(isolate, right)->ToString())));
--  auto func =
--      v8::Handle<v8::Function>::Cast(script->Run(context).ToLocalChecked());
--
--  auto binding = v8::Object::New(isolate);
--  api::Initialize(binding, v8::Null(isolate), context, nullptr);
--
--  // Pass in CLI flags needed to setup window
--  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
--  mate::Dictionary dict(isolate, binding);
--  if (command_line->HasSwitch(switches::kGuestInstanceID))
--    dict.Set(options::kGuestInstanceID,
--             command_line->GetSwitchValueASCII(switches::kGuestInstanceID));
--  if (command_line->HasSwitch(switches::kOpenerID))
--    dict.Set(options::kOpenerID,
--             command_line->GetSwitchValueASCII(switches::kOpenerID));
--  dict.Set("hiddenPage", command_line->HasSwitch(switches::kHiddenPage));
--  dict.Set(options::kNativeWindowOpen,
--           command_line->HasSwitch(switches::kNativeWindowOpen));
--
--  v8::Local<v8::Value> args[] = {binding};
--  ignore_result(func->Call(context, v8::Null(isolate), 1, args));
--}
--
--node::Environment* AtomRendererClient::GetEnvironment(
--    content::RenderFrame* render_frame) const {
--  if (injected_frames_.find(render_frame) == injected_frames_.end())
--    return nullptr;
--  v8::HandleScope handle_scope(v8::Isolate::GetCurrent());
--  auto context =
--      GetContext(render_frame->GetWebFrame(), v8::Isolate::GetCurrent());
--  node::Environment* env = node::Environment::GetCurrent(context);
--  if (environments_.find(env) == environments_.end())
--    return nullptr;
--  return env;
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 59b407ba1efb230a001043f7fb25b1c4cb1d0b53 atom/renderer/atom_renderer_client.h
-  our    100644 3e81cd4c647b8fddc01da868d0e8a53bcb59b5b4 atom/renderer/atom_renderer_client.h
-@@ -1,83 +0,0 @@
--// Copyright (c) 2013 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_RENDERER_ATOM_RENDERER_CLIENT_H_
--#define ATOM_RENDERER_ATOM_RENDERER_CLIENT_H_
--
--#include <set>
--#include <string>
--#include <vector>
--
--#include "atom/renderer/renderer_client_base.h"
--
--namespace node {
--class Environment;
--}
--
--namespace atom {
--
--class AtomBindings;
--class NodeBindings;
--
--class AtomRendererClient : public RendererClientBase {
-- public:
--  AtomRendererClient();
--  ~AtomRendererClient() override;
--
--  // atom::RendererClientBase:
--  void DidCreateScriptContext(v8::Handle<v8::Context> context,
--                              content::RenderFrame* render_frame) override;
--  void WillReleaseScriptContext(v8::Handle<v8::Context> context,
--                                content::RenderFrame* render_frame) override;
--  void SetupMainWorldOverrides(v8::Handle<v8::Context> context) override;
--
-- private:
--  enum NodeIntegration {
--    ALL,
--    EXCEPT_IFRAME,
--    MANUAL_ENABLE_IFRAME,
--    DISABLE,
--  };
--
--  // content::ContentRendererClient:
--  void RenderThreadStarted() override;
--  void RenderFrameCreated(content::RenderFrame*) override;
--  void RenderViewCreated(content::RenderView*) override;
--  void RunScriptsAtDocumentStart(content::RenderFrame* render_frame) override;
--  void RunScriptsAtDocumentEnd(content::RenderFrame* render_frame) override;
--  bool ShouldFork(blink::WebLocalFrame* frame,
--                  const GURL& url,
--                  const std::string& http_method,
--                  bool is_initial_navigation,
--                  bool is_server_redirect,
--                  bool* send_referrer) override;
--  void DidInitializeWorkerContextOnWorkerThread(
--      v8::Local<v8::Context> context) override;
--  void WillDestroyWorkerContextOnWorkerThread(
--      v8::Local<v8::Context> context) override;
--
--  node::Environment* GetEnvironment(content::RenderFrame* frame) const;
--
--  // Whether the node integration has been initialized.
--  bool node_integration_initialized_ = false;
--
--  std::unique_ptr<NodeBindings> node_bindings_;
--  std::unique_ptr<AtomBindings> atom_bindings_;
--
--  // The node::Environment::GetCurrent API does not return nullptr when it
--  // is called for a context without node::Environment, so we have to keep
--  // a book of the environments created.
--  std::set<node::Environment*> environments_;
--
--  // Getting main script context from web frame would lazily initializes
--  // its script context. Doing so in a web page without scripts would trigger
--  // assertion, so we have to keep a book of injected web frames.
--  std::set<content::RenderFrame*> injected_frames_;
--
--  DISALLOW_COPY_AND_ASSIGN(AtomRendererClient);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_RENDERER_ATOM_RENDERER_CLIENT_H_
-removed in remote
-  base   100644 f50c3f78685c0886b44f82cad7e48e2ed90ae385 atom/renderer/guest_view_container.cc
-  our    100644 6ad5cd0703f50481749b467d7fe99575dc0731c7 atom/renderer/guest_view_container.cc
-@@ -1,63 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/renderer/guest_view_container.h"
--
--#include <map>
--
--#include "base/bind.h"
--#include "base/lazy_instance.h"
--#include "base/threading/thread_task_runner_handle.h"
--#include "ui/gfx/geometry/size.h"
--
--namespace atom {
--
--namespace {
--
--using GuestViewContainerMap = std::map<int, GuestViewContainer*>;
--static base::LazyInstance<GuestViewContainerMap>::DestructorAtExit
--    g_guest_view_container_map = LAZY_INSTANCE_INITIALIZER;
--
--}  // namespace
--
--GuestViewContainer::GuestViewContainer(content::RenderFrame* render_frame)
--    : weak_ptr_factory_(this) {}
--
--GuestViewContainer::~GuestViewContainer() {
--  if (element_instance_id_ > 0)
--    g_guest_view_container_map.Get().erase(element_instance_id_);
--}
--
--// static
--GuestViewContainer* GuestViewContainer::FromID(int element_instance_id) {
--  GuestViewContainerMap* guest_view_containers =
--      g_guest_view_container_map.Pointer();
--  auto it = guest_view_containers->find(element_instance_id);
--  return it == guest_view_containers->end() ? nullptr : it->second;
--}
--
--void GuestViewContainer::RegisterElementResizeCallback(
--    const ResizeCallback& callback) {
--  element_resize_callback_ = callback;
--}
--
--void GuestViewContainer::SetElementInstanceID(int element_instance_id) {
--  element_instance_id_ = element_instance_id;
--  g_guest_view_container_map.Get().insert(
--      std::make_pair(element_instance_id, this));
--}
--
--void GuestViewContainer::DidResizeElement(const gfx::Size& new_size) {
--  if (element_resize_callback_.is_null())
--    return;
--
--  base::ThreadTaskRunnerHandle::Get()->PostTask(
--      FROM_HERE, base::BindOnce(element_resize_callback_, new_size));
--}
--
--base::WeakPtr<content::BrowserPluginDelegate> GuestViewContainer::GetWeakPtr() {
--  return weak_ptr_factory_.GetWeakPtr();
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 3771c7adc4e6c1dc31cdb0be4a5cf5025053733c atom/renderer/guest_view_container.h
-  our    100644 81e6313358a9a64728a94f52a31a4f40e5547d7a atom/renderer/guest_view_container.h
-@@ -1,46 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_RENDERER_GUEST_VIEW_CONTAINER_H_
--#define ATOM_RENDERER_GUEST_VIEW_CONTAINER_H_
--
--#include "base/callback.h"
--#include "content/public/renderer/browser_plugin_delegate.h"
--#include "content/public/renderer/render_frame.h"
--
--namespace gfx {
--class Size;
--}
--
--namespace atom {
--
--class GuestViewContainer : public content::BrowserPluginDelegate {
-- public:
--  typedef base::Callback<void(const gfx::Size&)> ResizeCallback;
--
--  explicit GuestViewContainer(content::RenderFrame* render_frame);
--  ~GuestViewContainer() override;
--
--  static GuestViewContainer* FromID(int element_instance_id);
--
--  void RegisterElementResizeCallback(const ResizeCallback& callback);
--
--  // content::BrowserPluginDelegate:
--  void SetElementInstanceID(int element_instance_id) final;
--  void DidResizeElement(const gfx::Size& new_size) final;
--  base::WeakPtr<BrowserPluginDelegate> GetWeakPtr() final;
--
-- private:
--  int element_instance_id_;
--
--  ResizeCallback element_resize_callback_;
--
--  base::WeakPtrFactory<GuestViewContainer> weak_ptr_factory_;
--
--  DISALLOW_COPY_AND_ASSIGN(GuestViewContainer);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_RENDERER_GUEST_VIEW_CONTAINER_H_
-removed in remote
-  base   100644 1da2c29fd9ca2138134e5cf2db2da57aba31f35c atom/renderer/resources/mac/Info.plist
-  our    100644 1da2c29fd9ca2138134e5cf2db2da57aba31f35c atom/renderer/resources/mac/Info.plist
-@@ -1,16 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
--<plist version="1.0">
--<dict>
--  <key>CFBundleIdentifier</key>
--  <string>${ATOM_BUNDLE_ID}</string>
--  <key>CFBundleName</key>
--  <string>${PRODUCT_NAME}</string>
--  <key>CFBundlePackageType</key>
--  <string>APPL</string>
--  <key>LSUIElement</key>
--  <true/>
--  <key>NSSupportsAutomaticGraphicsSwitching</key>
--  <true/>
--</dict>
--</plist>
-removed in remote
-  base   100644 2e591f2c6a8dadb3bb624aa395276377e0d43a6b atom/utility/atom_content_utility_client.cc
-  our    100644 e2a856d53ae243de988c43b0a3335b9391e54b4e atom/utility/atom_content_utility_client.cc
-@@ -1,32 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#include "atom/utility/atom_content_utility_client.h"
--
--#if defined(OS_WIN)
--#include "chrome/utility/printing_handler_win.h"
--#endif
--
--namespace atom {
--
--AtomContentUtilityClient::AtomContentUtilityClient() {
--#if defined(OS_WIN)
--  handlers_.push_back(std::make_unique<printing::PrintingHandlerWin>());
--#endif
--}
--
--AtomContentUtilityClient::~AtomContentUtilityClient() {}
--
--bool AtomContentUtilityClient::OnMessageReceived(const IPC::Message& message) {
--#if defined(OS_WIN)
--  for (const auto& handler : handlers_) {
--    if (handler->OnMessageReceived(message))
--      return true;
--  }
--#endif
--
--  return false;
--}
--
--}  // namespace atom
-removed in remote
-  base   100644 229ae3f91765d36041f1360a635840524eb9febd atom/utility/atom_content_utility_client.h
-  our    100644 7694970457b745a84ecab24a2f0ec8eaefa8a1ad atom/utility/atom_content_utility_client.h
-@@ -1,36 +0,0 @@
--// Copyright (c) 2015 GitHub, Inc.
--// Use of this source code is governed by the MIT license that can be
--// found in the LICENSE file.
--
--#ifndef ATOM_UTILITY_ATOM_CONTENT_UTILITY_CLIENT_H_
--#define ATOM_UTILITY_ATOM_CONTENT_UTILITY_CLIENT_H_
--
--#include <memory>
--#include <vector>
--
--#include "base/compiler_specific.h"
--#include "content/public/utility/content_utility_client.h"
--
--class UtilityMessageHandler;
--
--namespace atom {
--
--class AtomContentUtilityClient : public content::ContentUtilityClient {
-- public:
--  AtomContentUtilityClient();
--  ~AtomContentUtilityClient() override;
--
--  bool OnMessageReceived(const IPC::Message& message) override;
--
-- private:
--#if defined(OS_WIN)
--  typedef std::vector<std::unique_ptr<UtilityMessageHandler>> Handlers;
--  Handlers handlers_;
--#endif
--
--  DISALLOW_COPY_AND_ASSIGN(AtomContentUtilityClient);
--};
--
--}  // namespace atom
--
--#endif  // ATOM_UTILITY_ATOM_CONTENT_UTILITY_CLIENT_H_
-changed in both
-  base   100644 a195ad4c6adfc9726faaf297e037fa7c863a67a9 chromium_src/chrome/browser/printing/print_preview_message_handler.cc
-  our    100644 a346478c49fb355db5bfb163deafbb6f7a98ab20 chromium_src/chrome/browser/printing/print_preview_message_handler.cc
-  their  100644 d47c855f6b90654a08b7b32275fd46ec6e17eaf1 chromium_src/chrome/browser/printing/print_preview_message_handler.cc
-@@ -18,7 +18,7 @@
- #include "printing/pdf_metafile_skia.h"
- #include "printing/print_job_constants.h"
- 
--#include "atom/common/node_includes.h"
-+#include "electron/common/node_includes.h"
- 
- using content::BrowserThread;
- using content::WebContents;
-@@ -107,7 +107,7 @@
- 
- void PrintPreviewMessageHandler::PrintToPDF(
-     const base::DictionaryValue& options,
--    const atom::api::WebContents::PrintToPDFCallback& callback) {
-+    const electron::api::WebContents::PrintToPDFCallback& callback) {
-   int request_id;
-   options.GetInteger(printing::kPreviewRequestID, &request_id);
-   print_to_pdf_callback_map_[request_id] = callback;
-changed in both
-  base   100644 1aac74baa229923460ac3d8d230159f90f23fe5f chromium_src/chrome/browser/printing/print_preview_message_handler.h
-  our    100644 465bbf598319551525ef629b46943c4d905577ce chromium_src/chrome/browser/printing/print_preview_message_handler.h
-  their  100644 9ade37bb732798e65ff18e1c540624c6a6a297fe chromium_src/chrome/browser/printing/print_preview_message_handler.h
-@@ -7,7 +7,7 @@
- 
- #include <map>
- 
--#include "atom/browser/api/atom_api_web_contents.h"
-+#include "electron/browser/api/electron_api_web_contents.h"
- #include "base/compiler_specific.h"
- #include "content/public/browser/web_contents_observer.h"
- #include "content/public/browser/web_contents_user_data.h"
-@@ -34,10 +34,10 @@
-                          content::RenderFrameHost* render_frame_host) override;
- 
-   void PrintToPDF(const base::DictionaryValue& options,
--                  const atom::api::WebContents::PrintToPDFCallback& callback);
-+                  const electron::api::WebContents::PrintToPDFCallback& callback);
- 
-  private:
--  typedef std::map<int, atom::api::WebContents::PrintToPDFCallback>
-+  typedef std::map<int, electron::api::WebContents::PrintToPDFCallback>
-       PrintToPDFCallbackMap;
- 
-   explicit PrintPreviewMessageHandler(content::WebContents* web_contents);
-changed in both
-  base   100644 7e54d9b5d37039ebc9adf3656c984e029328433d chromium_src/chrome/browser/process_singleton_posix.cc
-  our    100644 4891743710d16673c6a72d76a303f6ac56a5ad32 chromium_src/chrome/browser/process_singleton_posix.cc
-  their  100644 1d157cf625218de7b32ac2e29ffe581843ad1215 chromium_src/chrome/browser/process_singleton_posix.cc
-@@ -53,11 +53,15 @@
- #include <set>
- #include <string>
- 
-+<<<<<<< .our
- #include <stddef.h>
- 
- #include "atom/browser/browser.h"
- #include "atom/common/atom_command_line.h"
- 
-+=======
-+#include "electron/common/electron_command_line.h"
-+>>>>>>> .their
- #include "base/base_paths.h"
- #include "base/bind.h"
- #include "base/command_line.h"
-@@ -824,7 +828,7 @@
-     return PROCESS_NONE;
-   to_send.append(current_dir.value());
- 
--  const std::vector<std::string>& argv = atom::AtomCommandLine::argv();
-+  const std::vector<std::string>& argv = electron::ElectronCommandLine::argv();
-   for (std::vector<std::string>::const_iterator it = argv.begin();
-        it != argv.end(); ++it) {
-     to_send.push_back(kTokenDelimiter);
-changed in both
-  base   100644 fd4c22e7405c4c6185c37e86d9a9ed0f4cfbe176 chromium_src/chrome/browser/process_singleton_win.cc
-  our    100644 6d0d102430ff700e703cef7e3189403c4a35218f chromium_src/chrome/browser/process_singleton_win.cc
-  their  100644 88c6185f3bb51ac553b471c901e1bb0de0153205 chromium_src/chrome/browser/process_singleton_win.cc
-@@ -263,7 +263,7 @@
- // isn't one, create a message window with its title set to the profile
- // directory path.
- bool ProcessSingleton::Create() {
--  static const wchar_t kMutexName[] = L"Local\\AtomProcessSingletonStartup!";
-+  static const wchar_t kMutexName[] = L"Local\\ElectronProcessSingletonStartup!";
- 
-   remote_window_ = chrome::FindRunningChromeWindow(user_data_dir_);
-   if (!remote_window_) {
-changed in both
-  base   100644 cead675a74d33ac990b1a77fe5f9c2c6416ac249 chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc
-  our    100644 54bf67e50330255c9b1e29d812fced8d2a73e52e chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc
-  their  100644 26c5b703aa76e1a991e6d7b7ac181c96726d4e96 chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc
-@@ -4,7 +4,7 @@
- 
- #include "chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h"
- 
--#include "atom/browser/ui/views/global_menu_bar_x11.h"
-+#include "electron/browser/ui/views/global_menu_bar_x11.h"
- #include "base/bind.h"
- #include "base/debug/leak_annotations.h"
- #include "base/logging.h"
-@@ -65,7 +65,7 @@
- 
- void GlobalMenuBarRegistrarX11::RegisterXID(unsigned long xid) {
-   DCHECK(registrar_proxy_);
--  std::string path = atom::GlobalMenuBarX11::GetPathForWindow(xid);
-+  std::string path = electron::GlobalMenuBarX11::GetPathForWindow(xid);
- 
-   ANNOTATE_SCOPED_MEMORY_LEAK;  // http://crbug.com/314087
-   // TODO(erg): The mozilla implementation goes to a lot of callback trouble
-@@ -82,7 +82,7 @@
- 
- void GlobalMenuBarRegistrarX11::UnregisterXID(unsigned long xid) {
-   DCHECK(registrar_proxy_);
--  std::string path = atom::GlobalMenuBarX11::GetPathForWindow(xid);
-+  std::string path = electron::GlobalMenuBarX11::GetPathForWindow(xid);
- 
-   ANNOTATE_SCOPED_MEMORY_LEAK;  // http://crbug.com/314087
-   // TODO(erg): The mozilla implementation goes to a lot of callback trouble
-merged
-  result 100644 1fd4364a5fc24a34f23c578783ff9e4baab4b155 chromium_src/chrome/common/chrome_constants.cc
-  our    100644 43a6ccdc7cb4a29fc1f53846e35a4b490d5899ff chromium_src/chrome/common/chrome_constants.cc
-@@ -10,7 +10,7 @@
- 
- #if defined(OS_MACOSX)
- const base::FilePath::CharType kFrameworkName[] =
--    FPL(ATOM_PRODUCT_NAME " Framework.framework");
-+    FPL(ELECTRON_PRODUCT_NAME " Framework.framework");
- #endif  // OS_MACOSX
- 
- // filenames
-added in both
-  our    100644 944ddab2a3fd879044e31677e4bac2843fffbdee electron.gyp
-  their  100644 ff95786a4ec0a57f25cc494ee5965e88c1139b50 electron.gyp
-@@ -4,6 +4,7 @@
-     'product_name%': 'Electron',
-     'company_name%': 'GitHub, Inc',
-     'company_abbr%': 'github',
-+<<<<<<< .our
-     'version%': '4.0.0-nightly.20180821',
-     'js2c_input_dir': '<(SHARED_INTERMEDIATE_DIR)/js2c',
-   },
-@@ -16,6 +17,18 @@
-     'defines': [
-       'ATOM_PRODUCT_NAME="<(product_name)"',
-       'ATOM_PROJECT_NAME="<(project_name)"',
-+=======
-+    'version%': '0.37.3',
-+  },
-+  'includes': [
-+    'filenames.gypi',
-+    'vendor/native_mate/native_mate_files.gypi',
-+  ],
-+  'target_defaults': {
-+    'defines': [
-+      'ELECTRON_PRODUCT_NAME="<(product_name)"',
-+      'ELECTRON_PROJECT_NAME="<(project_name)"',
-+>>>>>>> .their
-     ],
-     'conditions': [
-       ['OS=="mac"', {
-@@ -23,6 +36,7 @@
-           '<(source_root)/external_binaries',
-         ],
-       }],
-+<<<<<<< .our
-       ['enable_desktop_capturer==1', {
-         'defines': [
-           'ENABLE_DESKTOP_CAPTURER',
-@@ -53,6 +67,8 @@
-           'ENABLE_PEPPER_FLASH',
-         ],
-       }],  # enable_pepper_flash
-+=======
-+>>>>>>> .their
-     ],
-   },
-   'targets': [
-@@ -61,7 +77,10 @@
-       'type': 'executable',
-       'dependencies': [
-         'js2asar',
-+<<<<<<< .our
-         'app2asar',
-+=======
-+>>>>>>> .their
-         '<(project_name)_lib',
-       ],
-       'sources': [
-@@ -82,8 +101,13 @@
-             '<(project_name)_helper',
-           ],
-           'xcode_settings': {
-+<<<<<<< .our
-             'ATOM_BUNDLE_ID': 'com.<(company_abbr).<(project_name)',
-             'INFOPLIST_FILE': 'atom/browser/resources/mac/Info.plist',
-+=======
-+            'ELECTRON_BUNDLE_ID': 'com.<(company_abbr).<(project_name)',
-+            'INFOPLIST_FILE': 'electron/browser/resources/mac/Info.plist',
-+>>>>>>> .their
-             'LD_RUNPATH_SEARCH_PATHS': [
-               '@executable_path/../Frameworks',
-             ],
-@@ -99,6 +123,15 @@
-                 '<(PRODUCT_DIR)/<(product_name) Framework.framework',
-               ],
-             },
-+<<<<<<< .our
-+=======
-+            {
-+              'destination': '<(PRODUCT_DIR)/<(product_name).app/Contents/Resources',
-+              'files': [
-+                'default_app',
-+              ],
-+            },
-+>>>>>>> .their
-           ],
-           'postbuilds': [
-             {
-@@ -112,7 +145,11 @@
-               # is marked for no PIE (ASLR).
-               'postbuild_name': 'Make More Helpers',
-               'action': [
-+<<<<<<< .our
-                 'tools/mac/make_more_helpers.sh',
-+=======
-+                'vendor/brightray/tools/mac/make_more_helpers.sh',
-+>>>>>>> .their
-                 'Frameworks',
-                 '<(product_name)',
-               ],
-@@ -147,6 +184,7 @@
-                 },
-               ],
-             }],
-+<<<<<<< .our
-             ['mas_build==1', {
-               'dependencies': [
-                 '<(project_name)_login_helper',
-@@ -181,6 +219,19 @@
-                 'wtsapi32.lib',
-               ],
-             },
-+=======
-+          ],
-+        }],  # OS!="mac"
-+        ['OS=="win"', {
-+          'include_dirs': [
-+            '<(libchromiumcontent_dir)/gen/ui/resources',
-+          ],
-+          'msvs_settings': {
-+            'VCManifestTool': {
-+              'EmbedManifest': 'true',
-+              'AdditionalManifestFiles': 'electron/browser/resources/win/electron.manifest',
-+            }
-+>>>>>>> .their
-           },
-           'copies': [
-             {
-@@ -205,6 +256,7 @@
-                 '<(libchromiumcontent_dir)/libEGL.dll',
-                 '<(libchromiumcontent_dir)/libGLESv2.dll',
-                 '<(libchromiumcontent_dir)/icudtl.dat',
-+<<<<<<< .our
-                 '<(libchromiumcontent_dir)/blink_image_resources_200_percent.pak',
-                 '<(libchromiumcontent_dir)/content_resources_200_percent.pak',
-                 '<(libchromiumcontent_dir)/content_shell.pak',
-@@ -215,6 +267,26 @@
-                 'external_binaries/d3dcompiler_47.dll',
-               ],
-             },
-+=======
-+                '<(libchromiumcontent_dir)/content_resources_200_percent.pak',
-+                '<(libchromiumcontent_dir)/content_shell.pak',
-+                '<(libchromiumcontent_dir)/ui_resources_200_percent.pak',
-+                '<(libchromiumcontent_dir)/natives_blob.bin',
-+                '<(libchromiumcontent_dir)/snapshot_blob.bin',
-+                'external_binaries/d3dcompiler_47.dll',
-+                'external_binaries/xinput1_3.dll',
-+                'external_binaries/msvcp120.dll',
-+                'external_binaries/msvcr120.dll',
-+                'external_binaries/vccorlib120.dll',
-+              ],
-+            },
-+            {
-+              'destination': '<(PRODUCT_DIR)/resources',
-+              'files': [
-+                'default_app',
-+              ]
-+            },
-+>>>>>>> .their
-           ],
-         }, {
-           'dependencies': [
-@@ -245,6 +317,7 @@
-                 '<@(copied_libraries)',
-                 '<(libchromiumcontent_dir)/locales',
-                 '<(libchromiumcontent_dir)/icudtl.dat',
-+<<<<<<< .our
-                 '<(libchromiumcontent_dir)/blink_image_resources_200_percent.pak',
-                 '<(libchromiumcontent_dir)/content_resources_200_percent.pak',
-                 '<(libchromiumcontent_dir)/content_shell.pak',
-@@ -254,6 +327,19 @@
-                 '<(libchromiumcontent_dir)/v8_context_snapshot.bin',
-               ],
-             },
-+=======
-+                '<(libchromiumcontent_dir)/content_shell.pak',
-+                '<(libchromiumcontent_dir)/natives_blob.bin',
-+                '<(libchromiumcontent_dir)/snapshot_blob.bin',
-+              ],
-+            },
-+            {
-+              'destination': '<(PRODUCT_DIR)/resources',
-+              'files': [
-+                'default_app',
-+              ]
-+            },
-+>>>>>>> .their
-           ],
-         }],  # OS=="linux"
-       ],
-@@ -262,6 +348,7 @@
-       'target_name': '<(project_name)_lib',
-       'type': 'static_library',
-       'dependencies': [
-+<<<<<<< .our
-         'atom_js2c',
-         'brightray/brightray.gyp:brightray',
-         'vendor/node/node.gyp:node_lib',
-@@ -272,10 +359,20 @@
-         'NODE_SHARED_MODE',
-         'HAVE_OPENSSL=1',
-         'HAVE_INSPECTOR=1',
-+=======
-+        'electron_js2c',
-+        'vendor/brightray/brightray.gyp:brightray',
-+        'vendor/node/node.gyp:node',
-+      ],
-+      'defines': [
-+        # This is defined in skia/skia_common.gypi.
-+        'SK_SUPPORT_LEGACY_GETTOPDEVICE',
-+>>>>>>> .their
-         # Disable warnings for g_settings_list_schemas.
-         'GLIB_DISABLE_DEPRECATION_WARNINGS',
-         # Defined in Chromium but not exposed in its gyp file.
-         'V8_USE_EXTERNAL_STARTUP_DATA',
-+<<<<<<< .our
- 
-         # Import V8 symbols from shared library (node.dll / libnode.so)
-         'USING_V8_SHARED',
-@@ -285,6 +382,11 @@
-         # See Chromium src/third_party/protobuf/BUILD.gn
-         'GOOGLE_PROTOBUF_NO_RTTI',
-         'GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER',
-+=======
-+        'ENABLE_PLUGINS',
-+        'ENABLE_PEPPER_CDMS',
-+        'USE_PROPRIETARY_CODECS',
-+>>>>>>> .their
-       ],
-       'sources': [
-         '<@(lib_sources)',
-@@ -292,8 +394,14 @@
-       'include_dirs': [
-         '.',
-         'chromium_src',
-+<<<<<<< .our
-         'native_mate',
-         # Include atom_natives.h.
-+=======
-+        'vendor/brightray',
-+        'vendor/native_mate',
-+        # Include electron_natives.h.
-+>>>>>>> .their
-         '<(SHARED_INTERMEDIATE_DIR)',
-         # Include directories for uv and node.
-         'vendor/node/src',
-@@ -311,6 +419,7 @@
-         '<(libchromiumcontent_src_dir)/third_party/',
-         '<(libchromiumcontent_src_dir)/components/cdm',
-         '<(libchromiumcontent_src_dir)/third_party/widevine',
-+<<<<<<< .our
-         '<(libchromiumcontent_src_dir)/third_party/widevine/cdm/stub',
-         '<(libchromiumcontent_src_dir)/third_party/protobuf/src',
-         # The 'third_party/webrtc/modules/desktop_capture/desktop_capture_options.h' is using 'rtc_base/constructormagic.h'.
-@@ -318,6 +427,8 @@
-         # leveldb includes are required
-         '<(libchromiumcontent_src_dir)/third_party/leveldatabase/src',
-         '<(libchromiumcontent_src_dir)/third_party/leveldatabase/src/include',
-+=======
-+>>>>>>> .their
-       ],
-       'direct_dependent_settings': {
-         'include_dirs': [
-@@ -325,6 +436,7 @@
-         ],
-       },
-       'export_dependent_settings': [
-+<<<<<<< .our
-         'brightray/brightray.gyp:brightray',
-       ],
-       'conditions': [
-@@ -352,6 +464,11 @@
-             ],
-           },
-         }],  # enable_pepper_flash
-+=======
-+        'vendor/brightray/brightray.gyp:brightray',
-+      ],
-+      'conditions': [
-+>>>>>>> .their
-         ['libchromiumcontent_component', {
-           'link_settings': {
-             'libraries': [ '<@(libchromiumcontent_v8_libraries)' ],
-@@ -363,17 +480,24 @@
-           ],
-           'link_settings': {
-             'libraries': [
-+<<<<<<< .our
-               '-ldwmapi.lib',
-               '-limm32.lib',
-               '-lgdi32.lib',
-+=======
-+              '-limm32.lib',
-+>>>>>>> .their
-               '-loleacc.lib',
-               '-lcomctl32.lib',
-               '-lcomdlg32.lib',
-               '-lwininet.lib',
-               '-lwinmm.lib',
-+<<<<<<< .our
-               '-lcrypt32.lib',
-               '-luiautomationcore.lib',
-               '-lPropsys.lib'
-+=======
-+>>>>>>> .their
-             ],
-           },
-           'dependencies': [
-@@ -399,6 +523,7 @@
-               '$(SDKROOT)/System/Library/Frameworks/QTKit.framework',
-             ],
-           },
-+<<<<<<< .our
-           'xcode_settings': {
-             # ReactiveCocoa which is used by Squirrel requires using __weak.
-             'CLANG_ENABLE_OBJC_WEAK': 'YES',
-@@ -407,12 +532,15 @@
-               '-Wobjc-missing-property-synthesis',
-             ],
-           },
-+=======
-+>>>>>>> .their
-         }],  # OS=="mac" and mas_build==0
-         ['OS=="mac" and mas_build==1', {
-           'defines': [
-             'MAS_BUILD',
-           ],
-           'sources!': [
-+<<<<<<< .our
-             'atom/browser/auto_updater_mac.mm',
-             'atom/common/crash_reporter/crash_reporter_mac.h',
-             'atom/common/crash_reporter/crash_reporter_mac.mm',
-@@ -430,12 +558,24 @@
-             '<@(lib_sources_linux)',
-             '<@(lib_sources_nss)',
-           ],
-+=======
-+            'electron/browser/auto_updater_mac.mm',
-+            'electron/common/crash_reporter/crash_reporter_mac.h',
-+            'electron/common/crash_reporter/crash_reporter_mac.mm',
-+          ],
-+        }],  # OS=="mac" and mas_build==1
-+        ['OS=="linux"', {
-+>>>>>>> .their
-           'link_settings': {
-             'ldflags': [
-               # Make binary search for libraries under current directory, so we
-               # don't have to manually set $LD_LIBRARY_PATH:
-               # http://serverfault.com/questions/279068/cant-find-so-in-the-same-directory-as-the-executable
-+<<<<<<< .our
-               '-Wl,-rpath=\$$ORIGIN',
-+=======
-+              '-rpath \$$ORIGIN',
-+>>>>>>> .their
-               # Make native module dynamic loading work.
-               '-rdynamic',
-             ],
-@@ -443,6 +583,10 @@
-           # Required settings of using breakpad.
-           'cflags_cc': [
-             '-Wno-empty-body',
-+<<<<<<< .our
-+=======
-+            '-Wno-reserved-user-defined-literal',
-+>>>>>>> .their
-           ],
-           'include_dirs': [
-             'vendor/breakpad/src',
-@@ -451,12 +595,15 @@
-             'vendor/breakpad/breakpad.gyp:breakpad_client',
-           ],
-         }],  # OS=="linux"
-+<<<<<<< .our
-         ['OS=="linux" and clang==1', {
-           # Required settings of using breakpad.
-           'cflags_cc': [
-             '-Wno-reserved-user-defined-literal',
-           ],
-         }],  # OS=="linux" and clang==1
-+=======
-+>>>>>>> .their
-       ],
-     },  # target <(product_name)_lib
-     {
-@@ -484,13 +631,17 @@
-             'python',
-             'tools/js2asar.py',
-             '<@(_outputs)',
-+<<<<<<< .our
-             'lib',
-+=======
-+>>>>>>> .their
-             '<@(_inputs)',
-           ],
-         }
-       ],
-     },  # target js2asar
-     {
-+<<<<<<< .our
-       'target_name': 'app2asar',
-       'type': 'none',
-       'actions': [
-@@ -617,10 +768,23 @@
-           ],
-           'outputs': [
-             '<(SHARED_INTERMEDIATE_DIR)/atom_natives.h',
-+=======
-+      'target_name': 'electron_js2c',
-+      'type': 'none',
-+      'actions': [
-+        {
-+          'action_name': 'electron_js2c',
-+          'inputs': [
-+            '<@(js2c_sources)',
-+          ],
-+          'outputs': [
-+            '<(SHARED_INTERMEDIATE_DIR)/electron_natives.h',
-+>>>>>>> .their
-           ],
-           'action': [
-             'python',
-             'tools/js2c.py',
-+<<<<<<< .our
-             'vendor/node',
-             '<@(_outputs)',
-             '<(js2c_input_dir)',
-@@ -628,6 +792,14 @@
-         }
-       ],
-     },  # target atom_js2c
-+=======
-+            '<@(_outputs)',
-+            '<@(_inputs)',
-+          ],
-+        }
-+      ],
-+    },  # target electron_js2c
-+>>>>>>> .their
-   ],
-   'conditions': [
-     ['OS=="mac"', {
-@@ -654,15 +826,19 @@
-             'libraries': [
-               '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
-               '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
-+<<<<<<< .our
-               '$(SDKROOT)/System/Library/Frameworks/Quartz.framework',
-               '$(SDKROOT)/System/Library/Frameworks/Security.framework',
-               '$(SDKROOT)/System/Library/Frameworks/SecurityInterface.framework',
-               '$(SDKROOT)/System/Library/Frameworks/ServiceManagement.framework',
-               '$(SDKROOT)/System/Library/Frameworks/StoreKit.framework',
-+=======
-+>>>>>>> .their
-             ],
-           },
-           'mac_bundle': 1,
-           'mac_bundle_resources': [
-+<<<<<<< .our
-             'atom/common/resources/mac/MainMenu.xib',
-             '<(libchromiumcontent_dir)/icudtl.dat',
-             '<(libchromiumcontent_dir)/blink_image_resources_200_percent.pak',
-@@ -676,6 +852,17 @@
-           'xcode_settings': {
-             'ATOM_BUNDLE_ID': 'com.<(company_abbr).<(project_name).framework',
-             'INFOPLIST_FILE': 'atom/common/resources/mac/Info.plist',
-+=======
-+            'electron/common/resources/mac/MainMenu.xib',
-+            '<(libchromiumcontent_dir)/content_shell.pak',
-+            '<(libchromiumcontent_dir)/icudtl.dat',
-+            '<(libchromiumcontent_dir)/natives_blob.bin',
-+            '<(libchromiumcontent_dir)/snapshot_blob.bin',
-+          ],
-+          'xcode_settings': {
-+            'ELECTRON_BUNDLE_ID': 'com.<(company_abbr).<(project_name).framework',
-+            'INFOPLIST_FILE': 'electron/common/resources/mac/Info.plist',
-+>>>>>>> .their
-             'LD_DYLIB_INSTALL_NAME': '@rpath/<(product_name) Framework.framework/<(product_name) Framework',
-             'LD_RUNPATH_SEARCH_PATHS': [
-               '@loader_path/Libraries',
-@@ -720,6 +907,19 @@
-               ],
-             },
-             {
-+<<<<<<< .our
-+=======
-+              'postbuild_name': 'Fix path of ffmpeg',
-+              'action': [
-+                'install_name_tool',
-+                '-change',
-+                '/usr/local/lib/libffmpeg.dylib',
-+                '@rpath/libffmpeg.dylib',
-+                '${BUILT_PRODUCTS_DIR}/<(product_name) Framework.framework/Versions/A/<(product_name) Framework',
-+              ],
-+            },
-+            {
-+>>>>>>> .their
-               'postbuild_name': 'Add symlinks for framework subdirectories',
-               'action': [
-                 'tools/mac/create-framework-subdir-symlinks.sh',
-@@ -739,11 +939,14 @@
-             },
-           ],
-           'conditions': [
-+<<<<<<< .our
-             ['enable_pdf_viewer==1', {
-               'mac_bundle_resources': [
-                 '<(PRODUCT_DIR)/pdf_viewer_resources.pak',
-               ],
-             }],  # enable_pdf_viewer
-+=======
-+>>>>>>> .their
-             ['mas_build==0', {
-               'link_settings': {
-                 'libraries': [
-@@ -778,13 +981,19 @@
-           ],
-           'mac_bundle': 1,
-           'xcode_settings': {
-+<<<<<<< .our
-             'ATOM_BUNDLE_ID': 'com.<(company_abbr).<(project_name).helper',
-             'INFOPLIST_FILE': 'atom/renderer/resources/mac/Info.plist',
-+=======
-+            'ELECTRON_BUNDLE_ID': 'com.<(company_abbr).<(project_name).helper',
-+            'INFOPLIST_FILE': 'electron/renderer/resources/mac/Info.plist',
-+>>>>>>> .their
-             'LD_RUNPATH_SEARCH_PATHS': [
-               '@executable_path/../../..',
-             ],
-           },
-         },  # target helper
-+<<<<<<< .our
-         {
-           'target_name': '<(project_name)_login_helper',
-           'product_name': '<(product_name) Login Helper',
-@@ -811,6 +1020,8 @@
-             ],
-           },
-         },  # target login_helper
-+=======
-+>>>>>>> .their
-       ],
-     }],  # OS!="mac"
-   ],
-added in remote
-  their  100644 5e5eae74e7f694982bfffe709b5f6fd44251840f electron/app/electron_content_client.cc
-@@ -0,0 +1,216 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/app/electron_content_client.h"
-+
-+#include <string>
-+#include <vector>
-+
-+#include "electron/common/electron_version.h"
-+#include "electron/common/chrome_version.h"
-+#include "electron/common/options_switches.h"
-+#include "base/command_line.h"
-+#include "base/files/file_util.h"
-+#include "base/strings/string_split.h"
-+#include "base/strings/string_util.h"
-+#include "base/strings/utf_string_conversions.h"
-+#include "content/public/common/content_constants.h"
-+#include "content/public/common/pepper_plugin_info.h"
-+#include "content/public/common/user_agent.h"
-+#include "ppapi/shared_impl/ppapi_permissions.h"
-+#include "third_party/widevine/cdm/stub/widevine_cdm_version.h"
-+#include "ui/base/l10n/l10n_util.h"
-+#include "url/url_constants.h"
-+
-+#if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)
-+#include "chrome/common/widevine_cdm_constants.h"
-+#endif
-+
-+namespace electron {
-+
-+namespace {
-+
-+content::PepperPluginInfo CreatePepperFlashInfo(const base::FilePath& path,
-+                                                const std::string& version) {
-+  content::PepperPluginInfo plugin;
-+
-+  plugin.is_out_of_process = true;
-+  plugin.name = content::kFlashPluginName;
-+  plugin.path = path;
-+  plugin.permissions = ppapi::PERMISSION_ALL_BITS;
-+
-+  std::vector<std::string> flash_version_numbers = base::SplitString(
-+      version, ".", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
-+  if (flash_version_numbers.size() < 1)
-+    flash_version_numbers.push_back("11");
-+  // |SplitString()| puts in an empty string given an empty string. :(
-+  else if (flash_version_numbers[0].empty())
-+    flash_version_numbers[0] = "11";
-+  if (flash_version_numbers.size() < 2)
-+    flash_version_numbers.push_back("2");
-+  if (flash_version_numbers.size() < 3)
-+    flash_version_numbers.push_back("999");
-+  if (flash_version_numbers.size() < 4)
-+    flash_version_numbers.push_back("999");
-+  // E.g., "Shockwave Flash 10.2 r154":
-+  plugin.description = plugin.name + " " + flash_version_numbers[0] + "." +
-+      flash_version_numbers[1] + " r" + flash_version_numbers[2];
-+  plugin.version = base::JoinString(flash_version_numbers, ".");
-+  content::WebPluginMimeType swf_mime_type(
-+      content::kFlashPluginSwfMimeType,
-+      content::kFlashPluginSwfExtension,
-+      content::kFlashPluginSwfDescription);
-+  plugin.mime_types.push_back(swf_mime_type);
-+  content::WebPluginMimeType spl_mime_type(
-+      content::kFlashPluginSplMimeType,
-+      content::kFlashPluginSplExtension,
-+      content::kFlashPluginSplDescription);
-+  plugin.mime_types.push_back(spl_mime_type);
-+
-+  return plugin;
-+}
-+
-+#if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)
-+content::PepperPluginInfo CreateWidevineCdmInfo(const base::FilePath& path,
-+                                                const std::string& version) {
-+  content::PepperPluginInfo widevine_cdm;
-+  widevine_cdm.is_out_of_process = true;
-+  widevine_cdm.path = path;
-+  widevine_cdm.name = kWidevineCdmDisplayName;
-+  widevine_cdm.description = kWidevineCdmDescription +
-+                             std::string(" (version: ") +
-+                             version + ")";
-+  widevine_cdm.version = version;
-+  content::WebPluginMimeType widevine_cdm_mime_type(
-+      kWidevineCdmPluginMimeType,
-+      kWidevineCdmPluginExtension,
-+      kWidevineCdmPluginMimeTypeDescription);
-+
-+  // Add the supported codecs as if they came from the component manifest.
-+  std::vector<std::string> codecs;
-+  codecs.push_back(kCdmSupportedCodecVorbis);
-+  codecs.push_back(kCdmSupportedCodecVp8);
-+  codecs.push_back(kCdmSupportedCodecVp9);
-+#if defined(USE_PROPRIETARY_CODECS)
-+  codecs.push_back(kCdmSupportedCodecAac);
-+  codecs.push_back(kCdmSupportedCodecAvc1);
-+#endif  // defined(USE_PROPRIETARY_CODECS)
-+  std::string codec_string = base::JoinString(
-+      codecs, std::string(1, kCdmSupportedCodecsValueDelimiter));
-+  widevine_cdm_mime_type.additional_param_names.push_back(
-+      base::ASCIIToUTF16(kCdmSupportedCodecsParamName));
-+  widevine_cdm_mime_type.additional_param_values.push_back(
-+      base::ASCIIToUTF16(codec_string));
-+
-+  widevine_cdm.mime_types.push_back(widevine_cdm_mime_type);
-+  widevine_cdm.permissions = kWidevineCdmPluginPermissions;
-+
-+  return widevine_cdm;
-+}
-+#endif
-+
-+void ConvertStringWithSeparatorToVector(std::vector<std::string>* vec,
-+                                        const char* separator,
-+                                        const char* cmd_switch) {
-+  auto command_line = base::CommandLine::ForCurrentProcess();
-+  auto string_with_separator = command_line->GetSwitchValueASCII(cmd_switch);
-+  if (!string_with_separator.empty())
-+    *vec = base::SplitString(string_with_separator, separator,
-+                             base::TRIM_WHITESPACE,
-+                             base::SPLIT_WANT_NONEMPTY);
-+}
-+
-+}  // namespace
-+
-+void AddPepperFlashFromCommandLine(
-+    std::vector<content::PepperPluginInfo>* plugins) {
-+  auto command_line = base::CommandLine::ForCurrentProcess();
-+  auto flash_path = command_line->GetSwitchValueNative(
-+      switches::kPpapiFlashPath);
-+  if (flash_path.empty())
-+    return;
-+
-+  auto flash_version = command_line->GetSwitchValueASCII(
-+      switches::kPpapiFlashVersion);
-+
-+  plugins->push_back(
-+      CreatePepperFlashInfo(base::FilePath(flash_path), flash_version));
-+}
-+
-+#if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)
-+void AddWidevineCdmFromCommandLine(
-+    std::vector<content::PepperPluginInfo>* plugins) {
-+  auto command_line = base::CommandLine::ForCurrentProcess();
-+  auto widevine_cdm_path = command_line->GetSwitchValueNative(
-+      switches::kWidevineCdmPath);
-+  if (widevine_cdm_path.empty())
-+    return;
-+
-+  if (!base::PathExists(base::FilePath(widevine_cdm_path)))
-+    return;
-+
-+  auto widevine_cdm_version = command_line->GetSwitchValueASCII(
-+      switches::kWidevineCdmVersion);
-+  if (widevine_cdm_version.empty())
-+    return;
-+
-+  plugins->push_back(CreateWidevineCdmInfo(base::FilePath(widevine_cdm_path),
-+                                           widevine_cdm_version));
-+}
-+#endif
-+
-+ElectronContentClient::ElectronContentClient() {
-+}
-+
-+ElectronContentClient::~ElectronContentClient() {
-+}
-+
-+std::string ElectronContentClient::GetProduct() const {
-+  return "Chrome/" CHROME_VERSION_STRING;
-+}
-+
-+std::string ElectronContentClient::GetUserAgent() const {
-+  return content::BuildUserAgentFromProduct(
-+      "Chrome/" CHROME_VERSION_STRING " "
-+      ELECTRON_PRODUCT_NAME "/" ELECTRON_VERSION_STRING);
-+}
-+
-+base::string16 ElectronContentClient::GetLocalizedString(int message_id) const {
-+  return l10n_util::GetStringUTF16(message_id);
-+}
-+
-+void ElectronContentClient::AddAdditionalSchemes(
-+    std::vector<url::SchemeWithType>* standard_schemes,
-+    std::vector<std::string>* savable_schemes) {
-+  std::vector<std::string> schemes;
-+  ConvertStringWithSeparatorToVector(&schemes, ",",
-+                                     switches::kRegisterStandardSchemes);
-+  if (!schemes.empty()) {
-+    for (const std::string& scheme : schemes)
-+      standard_schemes->push_back({scheme.c_str(), url::SCHEME_WITHOUT_PORT});
-+  }
-+  standard_schemes->push_back({"chrome-extension", url::SCHEME_WITHOUT_PORT});
-+}
-+
-+void ElectronContentClient::AddPepperPlugins(
-+    std::vector<content::PepperPluginInfo>* plugins) {
-+  AddPepperFlashFromCommandLine(plugins);
-+#if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)
-+  AddWidevineCdmFromCommandLine(plugins);
-+#endif
-+}
-+
-+void ElectronContentClient::AddServiceWorkerSchemes(
-+    std::set<std::string>* service_worker_schemes) {
-+  std::vector<std::string> schemes;
-+  ConvertStringWithSeparatorToVector(&schemes, ",",
-+                                     switches::kRegisterServiceWorkerSchemes);
-+  if (!schemes.empty()) {
-+    for (const std::string& scheme : schemes)
-+      service_worker_schemes->insert(scheme);
-+  }
-+  service_worker_schemes->insert(url::kFileScheme);
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 99d14289797ec4383023d85dfbd76b45560a3292 electron/app/electron_content_client.h
-@@ -0,0 +1,40 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_APP_ELECTRON_CONTENT_CLIENT_H_
-+#define ELECTRON_APP_ELECTRON_CONTENT_CLIENT_H_
-+
-+#include <set>
-+#include <string>
-+#include <vector>
-+
-+#include "brightray/common/content_client.h"
-+
-+namespace electron {
-+
-+class ElectronContentClient : public brightray::ContentClient {
-+ public:
-+  ElectronContentClient();
-+  virtual ~ElectronContentClient();
-+
-+ protected:
-+  // content::ContentClient:
-+  std::string GetProduct() const override;
-+  std::string GetUserAgent() const override;
-+  base::string16 GetLocalizedString(int message_id) const override;
-+  void AddAdditionalSchemes(
-+      std::vector<url::SchemeWithType>* standard_schemes,
-+      std::vector<std::string>* savable_schemes) override;
-+  void AddPepperPlugins(
-+      std::vector<content::PepperPluginInfo>* plugins) override;
-+  void AddServiceWorkerSchemes(
-+      std::set<std::string>* service_worker_schemes) override;
-+
-+ private:
-+  DISALLOW_COPY_AND_ASSIGN(ElectronContentClient);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_APP_ELECTRON_CONTENT_CLIENT_H_
-added in remote
-  their  100644 11f76e61e5f79ecc809c5e4dbaaa2905bcdda41f electron/app/electron_library_main.h
-@@ -0,0 +1,20 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_APP_ELECTRON_LIBRARY_MAIN_H_
-+#define ELECTRON_APP_ELECTRON_LIBRARY_MAIN_H_
-+
-+#include "build/build_config.h"
-+
-+#if defined(OS_MACOSX)
-+extern "C" {
-+__attribute__((visibility("default")))
-+int ElectronMain(int argc, const char* argv[]);
-+
-+__attribute__((visibility("default")))
-+int ElectronInitializeICUandStartNode(int argc, char *argv[]);
-+}
-+#endif  // OS_MACOSX
-+
-+#endif  // ELECTRON_APP_ELECTRON_LIBRARY_MAIN_H_
-added in remote
-  their  100644 98a72397e5fd3500c91085aefeb34f5d46b560e1 electron/app/electron_library_main.mm
-@@ -0,0 +1,38 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/app/electron_library_main.h"
-+
-+#include "electron/app/electron_main_delegate.h"
-+#include "electron/app/node_main.h"
-+#include "electron/common/electron_command_line.h"
-+#include "base/at_exit.h"
-+#include "base/i18n/icu_util.h"
-+#include "base/mac/bundle_locations.h"
-+#include "base/mac/scoped_nsautorelease_pool.h"
-+#include "brightray/common/mac/main_application_bundle.h"
-+#include "content/public/app/content_main.h"
-+
-+#if defined(OS_MACOSX)
-+int ElectronMain(int argc, const char* argv[]) {
-+  electron::ElectronMainDelegate delegate;
-+  content::ContentMainParams params(&delegate);
-+  params.argc = argc;
-+  params.argv = argv;
-+  electron::ElectronCommandLine::Init(argc, argv);
-+  return content::ContentMain(params);
-+}
-+
-+int ElectronInitializeICUandStartNode(int argc, char *argv[]) {
-+  base::AtExitManager atexit_manager;
-+  base::mac::ScopedNSAutoreleasePool pool;
-+  base::mac::SetOverrideFrameworkBundlePath(
-+      brightray::MainApplicationBundlePath()
-+          .Append("Contents")
-+          .Append("Frameworks")
-+          .Append(ELECTRON_PRODUCT_NAME " Framework.framework"));
-+  base::i18n::InitializeICU();
-+  return electron::NodeMain(argc, argv);
-+}
-+#endif  // OS_MACOSX
-added in remote
-  their  100644 4d80e607c406e565986f2db25cf3d4952e613008 electron/app/electron_main.cc
-@@ -0,0 +1,197 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/app/electron_main.h"
-+
-+#include <stdlib.h>
-+
-+#if defined(OS_WIN)
-+#include <windows.h>
-+#include <shellscalingapi.h>
-+#include <tchar.h>
-+#include <shellapi.h>
-+
-+#include "electron/app/electron_main_delegate.h"
-+#include "electron/common/crash_reporter/win/crash_service_main.h"
-+#include "base/environment.h"
-+#include "base/win/windows_version.h"
-+#include "content/public/app/sandbox_helper_win.h"
-+#include "sandbox/win/src/sandbox_types.h"
-+#include "ui/gfx/win/dpi.h"
-+#elif defined(OS_LINUX)  // defined(OS_WIN)
-+#include "electron/app/electron_main_delegate.h"  // NOLINT
-+#include "content/public/app/content_main.h"
-+#else  // defined(OS_LINUX)
-+#include "electron/app/electron_library_main.h"
-+#endif  // defined(OS_MACOSX)
-+
-+#include "electron/app/node_main.h"
-+#include "electron/common/electron_command_line.h"
-+#include "base/at_exit.h"
-+#include "base/i18n/icu_util.h"
-+
-+namespace {
-+
-+const char* kRunAsNode = "ELECTRON_RUN_AS_NODE";
-+const char* kOldRunAsNode = "ATOM_SHELL_INTERNAL_RUN_AS_NODE";
-+
-+bool IsEnvSet(const char* name) {
-+#if defined(OS_WIN)
-+  size_t required_size;
-+  getenv_s(&required_size, nullptr, 0, name);
-+  return required_size != 0;
-+#else
-+  char* indicator = getenv(name);
-+  return indicator && indicator[0] != '\0';
-+#endif
-+}
-+
-+bool IsRunAsNode() {
-+  return IsEnvSet(kRunAsNode) || IsEnvSet(kOldRunAsNode);
-+}
-+
-+#if defined(OS_WIN)
-+// Win8.1 supports monitor-specific DPI scaling.
-+bool SetProcessDpiAwarenessWrapper(PROCESS_DPI_AWARENESS value) {
-+  typedef HRESULT(WINAPI *SetProcessDpiAwarenessPtr)(PROCESS_DPI_AWARENESS);
-+  SetProcessDpiAwarenessPtr set_process_dpi_awareness_func =
-+      reinterpret_cast<SetProcessDpiAwarenessPtr>(
-+          GetProcAddress(GetModuleHandleA("user32.dll"),
-+                         "SetProcessDpiAwarenessInternal"));
-+  if (set_process_dpi_awareness_func) {
-+    HRESULT hr = set_process_dpi_awareness_func(value);
-+    if (SUCCEEDED(hr)) {
-+      VLOG(1) << "SetProcessDpiAwareness succeeded.";
-+      return true;
-+    } else if (hr == E_ACCESSDENIED) {
-+      LOG(ERROR) << "Access denied error from SetProcessDpiAwareness. "
-+          "Function called twice, or manifest was used.";
-+    }
-+  }
-+  return false;
-+}
-+
-+// This function works for Windows Vista through Win8. Win8.1 must use
-+// SetProcessDpiAwareness[Wrapper].
-+BOOL SetProcessDPIAwareWrapper() {
-+  typedef BOOL(WINAPI *SetProcessDPIAwarePtr)(VOID);
-+  SetProcessDPIAwarePtr set_process_dpi_aware_func =
-+      reinterpret_cast<SetProcessDPIAwarePtr>(
-+      GetProcAddress(GetModuleHandleA("user32.dll"),
-+                      "SetProcessDPIAware"));
-+  return set_process_dpi_aware_func &&
-+    set_process_dpi_aware_func();
-+}
-+
-+void EnableHighDPISupport() {
-+  if (!SetProcessDpiAwarenessWrapper(PROCESS_SYSTEM_DPI_AWARE)) {
-+    SetProcessDPIAwareWrapper();
-+  }
-+}
-+#endif
-+
-+}  // namespace
-+
-+#if defined(OS_WIN)
-+int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t* cmd, int) {
-+  int argc = 0;
-+  wchar_t** wargv = ::CommandLineToArgvW(::GetCommandLineW(), &argc);
-+
-+  // Make output work in console if we are not in cygiwn.
-+  if (!IsEnvSet("TERM") && !IsEnvSet("ELECTRON_NO_ATTACH_CONSOLE")) {
-+    AttachConsole(ATTACH_PARENT_PROCESS);
-+
-+    FILE* dontcare;
-+    freopen_s(&dontcare, "CON", "w", stdout);
-+    freopen_s(&dontcare, "CON", "w", stderr);
-+  }
-+
-+  // Convert argv to to UTF8
-+  char** argv = new char*[argc];
-+  for (int i = 0; i < argc; i++) {
-+    // Compute the size of the required buffer
-+    DWORD size = WideCharToMultiByte(CP_UTF8,
-+                                     0,
-+                                     wargv[i],
-+                                     -1,
-+                                     NULL,
-+                                     0,
-+                                     NULL,
-+                                     NULL);
-+    if (size == 0) {
-+      // This should never happen.
-+      fprintf(stderr, "Could not convert arguments to utf8.");
-+      exit(1);
-+    }
-+    // Do the actual conversion
-+    argv[i] = new char[size];
-+    DWORD result = WideCharToMultiByte(CP_UTF8,
-+                                       0,
-+                                       wargv[i],
-+                                       -1,
-+                                       argv[i],
-+                                       size,
-+                                       NULL,
-+                                       NULL);
-+    if (result == 0) {
-+      // This should never happen.
-+      fprintf(stderr, "Could not convert arguments to utf8.");
-+      exit(1);
-+    }
-+  }
-+
-+  if (IsRunAsNode()) {
-+    // Now that argv conversion is done, we can finally start.
-+    base::AtExitManager atexit_manager;
-+    base::i18n::InitializeICU();
-+    return electron::NodeMain(argc, argv);
-+  } else if (IsEnvSet("ELECTRON_INTERNAL_CRASH_SERVICE")) {
-+    return crash_service::Main(cmd);
-+  }
-+
-+  sandbox::SandboxInterfaceInfo sandbox_info = {0};
-+  content::InitializeSandboxInfo(&sandbox_info);
-+  electron::ElectronMainDelegate delegate;
-+
-+  // We don't want to set DPI awareness on pre-Win7 because we don't support
-+  // DirectWrite there. GDI fonts are kerned very badly, so better to leave
-+  // DPI-unaware and at effective 1.0. See also ShouldUseDirectWrite().
-+  if (base::win::GetVersion() >= base::win::VERSION_WIN7)
-+    EnableHighDPISupport();
-+
-+  content::ContentMainParams params(&delegate);
-+  params.instance = instance;
-+  params.sandbox_info = &sandbox_info;
-+  electron::ElectronCommandLine::Init(argc, argv);
-+  return content::ContentMain(params);
-+}
-+
-+#elif defined(OS_LINUX)  // defined(OS_WIN)
-+
-+int main(int argc, const char* argv[]) {
-+  if (IsRunAsNode()) {
-+    base::i18n::InitializeICU();
-+    base::AtExitManager atexit_manager;
-+    return electron::NodeMain(argc, const_cast<char**>(argv));
-+  }
-+
-+  electron::ElectronMainDelegate delegate;
-+  content::ContentMainParams params(&delegate);
-+  params.argc = argc;
-+  params.argv = argv;
-+  electron::ElectronCommandLine::Init(argc, argv);
-+  return content::ContentMain(params);
-+}
-+
-+#else  // defined(OS_LINUX)
-+
-+int main(int argc, const char* argv[]) {
-+  if (IsRunAsNode()) {
-+    return ElectronInitializeICUandStartNode(argc, const_cast<char**>(argv));
-+  }
-+
-+  return ElectronMain(argc, argv);
-+}
-+
-+#endif  // defined(OS_MACOSX)
-added in remote
-  their  100644 bd507a25b1658c5fce00b9371f205164c53a0aa5 electron/app/electron_main.h
-@@ -0,0 +1,10 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_APP_ELECTRON_MAIN_H_
-+#define ELECTRON_APP_ELECTRON_MAIN_H_
-+
-+#include "content/public/app/content_main.h"
-+
-+#endif  // ELECTRON_APP_ELECTRON_MAIN_H_
-added in remote
-  their  100644 32c3348a7e7a1adc1875185ec514cb42f5313aa9 electron/app/electron_main_delegate.cc
-@@ -0,0 +1,141 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/app/electron_main_delegate.h"
-+
-+#include <string>
-+#include <iostream>
-+
-+#include "electron/app/electron_content_client.h"
-+#include "electron/browser/electron_browser_client.h"
-+#include "electron/common/google_api_key.h"
-+#include "electron/renderer/electron_renderer_client.h"
-+#include "electron/utility/electron_content_utility_client.h"
-+#include "base/command_line.h"
-+#include "base/debug/stack_trace.h"
-+#include "base/environment.h"
-+#include "base/logging.h"
-+#include "chrome/common/chrome_paths.h"
-+#include "content/public/common/content_switches.h"
-+#include "ui/base/l10n/l10n_util.h"
-+#include "ui/base/resource/resource_bundle.h"
-+
-+namespace electron {
-+
-+namespace {
-+
-+bool IsBrowserProcess(base::CommandLine* cmd) {
-+  std::string process_type = cmd->GetSwitchValueASCII(switches::kProcessType);
-+  return process_type.empty();
-+}
-+
-+}  // namespace
-+
-+ElectronMainDelegate::ElectronMainDelegate() {
-+}
-+
-+ElectronMainDelegate::~ElectronMainDelegate() {
-+}
-+
-+bool ElectronMainDelegate::BasicStartupComplete(int* exit_code) {
-+  auto command_line = base::CommandLine::ForCurrentProcess();
-+
-+  logging::LoggingSettings settings;
-+#if defined(OS_WIN)
-+  // On Windows the terminal returns immediately, so we add a new line to
-+  // prevent output in the same line as the prompt.
-+  if (IsBrowserProcess(command_line))
-+    std::wcout << std::endl;
-+#if defined(DEBUG)
-+  // Print logging to debug.log on Windows
-+  settings.logging_dest = logging::LOG_TO_ALL;
-+  settings.log_file = L"debug.log";
-+  settings.lock_log = logging::LOCK_LOG_FILE;
-+  settings.delete_old = logging::DELETE_OLD_LOG_FILE;
-+#else
-+  settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
-+#endif  // defined(DEBUG)
-+#else  // defined(OS_WIN)
-+  settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
-+#endif  // !defined(OS_WIN)
-+
-+  // Only enable logging when --enable-logging is specified.
-+  scoped_ptr<base::Environment> env(base::Environment::Create());
-+  if (!command_line->HasSwitch(switches::kEnableLogging) &&
-+      !env->HasVar("ELECTRON_ENABLE_LOGGING")) {
-+    settings.logging_dest = logging::LOG_NONE;
-+    logging::SetMinLogLevel(logging::LOG_NUM_SEVERITIES);
-+  }
-+
-+  logging::InitLogging(settings);
-+
-+  // Logging with pid and timestamp.
-+  logging::SetLogItems(true, false, true, false);
-+
-+  // Enable convient stack printing.
-+  bool enable_stack_dumping = env->HasVar("ELECTRON_ENABLE_STACK_DUMPING");
-+#if defined(DEBUG) && defined(OS_LINUX)
-+  enable_stack_dumping = true;
-+#endif
-+  if (enable_stack_dumping)
-+    base::debug::EnableInProcessStackDumping();
-+
-+  chrome::RegisterPathProvider();
-+
-+  return brightray::MainDelegate::BasicStartupComplete(exit_code);
-+}
-+
-+void ElectronMainDelegate::PreSandboxStartup() {
-+  brightray::MainDelegate::PreSandboxStartup();
-+
-+  // Set google API key.
-+  scoped_ptr<base::Environment> env(base::Environment::Create());
-+  if (!env->HasVar("GOOGLE_API_KEY"))
-+    env->SetVar("GOOGLE_API_KEY", GOOGLEAPIS_API_KEY);
-+
-+  auto command_line = base::CommandLine::ForCurrentProcess();
-+  std::string process_type = command_line->GetSwitchValueASCII(
-+      switches::kProcessType);
-+
-+  if (process_type == switches::kUtilityProcess) {
-+    ElectronContentUtilityClient::PreSandboxStartup();
-+  }
-+
-+  // Only append arguments for browser process.
-+  if (!IsBrowserProcess(command_line))
-+    return;
-+
-+  // Disable renderer sandbox for most of node's functions.
-+  command_line->AppendSwitch(switches::kNoSandbox);
-+
-+  // Allow file:// URIs to read other file:// URIs by default.
-+  command_line->AppendSwitch(switches::kAllowFileAccessFromFiles);
-+
-+#if defined(OS_MACOSX)
-+  // Enable AVFoundation.
-+  command_line->AppendSwitch("enable-avfoundation");
-+#endif
-+}
-+
-+content::ContentBrowserClient* ElectronMainDelegate::CreateContentBrowserClient() {
-+  browser_client_.reset(new ElectronBrowserClient);
-+  return browser_client_.get();
-+}
-+
-+content::ContentRendererClient*
-+    ElectronMainDelegate::CreateContentRendererClient() {
-+  renderer_client_.reset(new ElectronRendererClient);
-+  return renderer_client_.get();
-+}
-+
-+content::ContentUtilityClient* ElectronMainDelegate::CreateContentUtilityClient() {
-+  utility_client_.reset(new ElectronContentUtilityClient);
-+  return utility_client_.get();
-+}
-+
-+scoped_ptr<brightray::ContentClient> ElectronMainDelegate::CreateContentClient() {
-+  return scoped_ptr<brightray::ContentClient>(new ElectronContentClient);
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 1068c65e3cc41e6a63f9b95133ef138e5c479709 electron/app/electron_main_delegate.h
-@@ -0,0 +1,44 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_APP_ELECTRON_MAIN_DELEGATE_H_
-+#define ELECTRON_APP_ELECTRON_MAIN_DELEGATE_H_
-+
-+#include "brightray/common/main_delegate.h"
-+#include "brightray/common/content_client.h"
-+
-+namespace electron {
-+
-+class ElectronMainDelegate : public brightray::MainDelegate {
-+ public:
-+  ElectronMainDelegate();
-+  ~ElectronMainDelegate();
-+
-+ protected:
-+  // content::ContentMainDelegate:
-+  bool BasicStartupComplete(int* exit_code) override;
-+  void PreSandboxStartup() override;
-+  content::ContentBrowserClient* CreateContentBrowserClient() override;
-+  content::ContentRendererClient* CreateContentRendererClient() override;
-+  content::ContentUtilityClient* CreateContentUtilityClient() override;
-+
-+  // brightray::MainDelegate:
-+  scoped_ptr<brightray::ContentClient> CreateContentClient() override;
-+#if defined(OS_MACOSX)
-+  void OverrideChildProcessPath() override;
-+  void OverrideFrameworkBundlePath() override;
-+#endif
-+
-+ private:
-+  brightray::ContentClient content_client_;
-+  scoped_ptr<content::ContentBrowserClient> browser_client_;
-+  scoped_ptr<content::ContentRendererClient> renderer_client_;
-+  scoped_ptr<content::ContentUtilityClient> utility_client_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(ElectronMainDelegate);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_APP_ELECTRON_MAIN_DELEGATE_H_
-added in remote
-  their  100644 aa6f2abae3e60da0e132fa07c9b529be49255d60 electron/app/electron_main_delegate_mac.mm
-@@ -0,0 +1,51 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/app/electron_main_delegate.h"
-+
-+#include "base/mac/bundle_locations.h"
-+#include "base/files/file_path.h"
-+#include "base/files/file_util.h"
-+#include "base/path_service.h"
-+#include "brightray/common/application_info.h"
-+#include "brightray/common/mac/main_application_bundle.h"
-+#include "content/public/common/content_paths.h"
-+
-+namespace electron {
-+
-+namespace {
-+
-+base::FilePath GetFrameworksPath() {
-+  return brightray::MainApplicationBundlePath().Append("Contents")
-+                                               .Append("Frameworks");
-+}
-+
-+base::FilePath GetHelperAppPath(const base::FilePath& frameworks_path,
-+                                const std::string& name) {
-+  return frameworks_path.Append(name + " Helper.app")
-+                        .Append("Contents")
-+                        .Append("MacOS")
-+                        .Append(name + " Helper");
-+}
-+
-+}  // namespace
-+
-+void ElectronMainDelegate::OverrideFrameworkBundlePath() {
-+  base::mac::SetOverrideFrameworkBundlePath(
-+      GetFrameworksPath().Append(ELECTRON_PRODUCT_NAME " Framework.framework"));
-+}
-+
-+void ElectronMainDelegate::OverrideChildProcessPath() {
-+  base::FilePath frameworks_path = GetFrameworksPath();
-+  base::FilePath helper_path = GetHelperAppPath(frameworks_path,
-+                                                ELECTRON_PRODUCT_NAME);
-+  if (!base::PathExists(helper_path))
-+    helper_path = GetHelperAppPath(frameworks_path,
-+                                   brightray::GetApplicationName());
-+  if (!base::PathExists(helper_path))
-+    LOG(FATAL) << "Unable to find helper app";
-+  PathService::Override(content::CHILD_PROCESS_EXE, helper_path);
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 10bab4e16a7f69d175b62550044261dc255230b9 electron/app/node_main.cc
-@@ -0,0 +1,74 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/app/node_main.h"
-+
-+#include "electron/app/uv_task_runner.h"
-+#include "electron/browser/javascript_environment.h"
-+#include "electron/browser/node_debugger.h"
-+#include "base/command_line.h"
-+#include "electron/common/node_includes.h"
-+#include "base/thread_task_runner_handle.h"
-+#include "gin/array_buffer.h"
-+#include "gin/public/isolate_holder.h"
-+#include "gin/v8_initializer.h"
-+
-+namespace electron {
-+
-+int NodeMain(int argc, char *argv[]) {
-+  base::CommandLine::Init(argc, argv);
-+
-+  int exit_code = 1;
-+  {
-+    // Feed gin::PerIsolateData with a task runner.
-+    argv = uv_setup_args(argc, argv);
-+    uv_loop_t* loop = uv_default_loop();
-+    scoped_refptr<UvTaskRunner> uv_task_runner(new UvTaskRunner(loop));
-+    base::ThreadTaskRunnerHandle handle(uv_task_runner);
-+
-+    gin::V8Initializer::LoadV8Snapshot();
-+    gin::V8Initializer::LoadV8Natives();
-+    JavascriptEnvironment gin_env;
-+
-+    int exec_argc;
-+    const char** exec_argv;
-+    node::Init(&argc, const_cast<const char**>(argv), &exec_argc, &exec_argv);
-+
-+    node::Environment* env = node::CreateEnvironment(
-+        gin_env.isolate(), loop, gin_env.context(), argc, argv,
-+        exec_argc, exec_argv);
-+
-+    // Start our custom debugger implementation.
-+    NodeDebugger node_debugger(gin_env.isolate());
-+    if (node_debugger.IsRunning())
-+      env->AssignToContext(v8::Debug::GetDebugContext());
-+
-+    node::LoadEnvironment(env);
-+
-+    bool more;
-+    do {
-+      more = uv_run(env->event_loop(), UV_RUN_ONCE);
-+      if (more == false) {
-+        node::EmitBeforeExit(env);
-+
-+        // Emit `beforeExit` if the loop became alive either after emitting
-+        // event, or after running some callbacks.
-+        more = uv_loop_alive(env->event_loop());
-+        if (uv_run(env->event_loop(), UV_RUN_NOWAIT) != 0)
-+          more = true;
-+      }
-+    } while (more == true);
-+
-+    exit_code = node::EmitExit(env);
-+    node::RunAtExit(env);
-+
-+    env->Dispose();
-+  }
-+
-+  v8::V8::Dispose();
-+
-+  return exit_code;
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 98a39687267f0b30cc54f96049c9954a42b69d0b electron/app/node_main.h
-@@ -0,0 +1,14 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_APP_NODE_MAIN_H_
-+#define ELECTRON_APP_NODE_MAIN_H_
-+
-+namespace electron {
-+
-+int NodeMain(int argc, char *argv[]);
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_APP_NODE_MAIN_H_
-added in remote
-  their  100644 4d7bb75e3f31a716bf61cbd7ed4ff42ea0ba7edc electron/app/uv_task_runner.cc
-@@ -0,0 +1,60 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/app/uv_task_runner.h"
-+
-+#include "base/stl_util.h"
-+
-+namespace electron {
-+
-+UvTaskRunner::UvTaskRunner(uv_loop_t* loop) : loop_(loop) {
-+}
-+
-+UvTaskRunner::~UvTaskRunner() {
-+  for (auto& iter : tasks_) {
-+    uv_unref(reinterpret_cast<uv_handle_t*>(iter.first));
-+    delete iter.first;
-+  }
-+}
-+
-+bool UvTaskRunner::PostDelayedTask(const tracked_objects::Location& from_here,
-+                                   const base::Closure& task,
-+                                   base::TimeDelta delay) {
-+  uv_timer_t* timer = new uv_timer_t;
-+  timer->data = this;
-+  uv_timer_init(loop_, timer);
-+  uv_timer_start(timer, UvTaskRunner::OnTimeout, delay.InMilliseconds(), 0);
-+  tasks_[timer] = task;
-+  return true;
-+}
-+
-+bool UvTaskRunner::RunsTasksOnCurrentThread() const {
-+  return true;
-+}
-+
-+bool UvTaskRunner::PostNonNestableDelayedTask(
-+    const tracked_objects::Location& from_here,
-+    const base::Closure& task,
-+    base::TimeDelta delay) {
-+  return PostDelayedTask(from_here, task, delay);
-+}
-+
-+// static
-+void UvTaskRunner::OnTimeout(uv_timer_t* timer) {
-+  UvTaskRunner* self = static_cast<UvTaskRunner*>(timer->data);
-+  if (!ContainsKey(self->tasks_, timer))
-+    return;
-+
-+  self->tasks_[timer].Run();
-+  self->tasks_.erase(timer);
-+  uv_timer_stop(timer);
-+  uv_close(reinterpret_cast<uv_handle_t*>(timer), UvTaskRunner::OnClose);
-+}
-+
-+// static
-+void UvTaskRunner::OnClose(uv_handle_t* handle) {
-+  delete reinterpret_cast<uv_timer_t*>(handle);
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 668836682f0378a05dffe16bf49da255a1c2ea19 electron/app/uv_task_runner.h
-@@ -0,0 +1,45 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_APP_UV_TASK_RUNNER_H_
-+#define ELECTRON_APP_UV_TASK_RUNNER_H_
-+
-+#include <map>
-+
-+#include "base/callback.h"
-+#include "base/single_thread_task_runner.h"
-+#include "vendor/node/deps/uv/include/uv.h"
-+
-+namespace electron {
-+
-+// TaskRunner implementation that posts tasks into libuv's default loop.
-+class UvTaskRunner : public base::SingleThreadTaskRunner {
-+ public:
-+  explicit UvTaskRunner(uv_loop_t* loop);
-+  ~UvTaskRunner() override;
-+
-+  // base::SingleThreadTaskRunner:
-+  bool PostDelayedTask(const tracked_objects::Location& from_here,
-+                       const base::Closure& task,
-+                       base::TimeDelta delay) override;
-+  bool RunsTasksOnCurrentThread() const override;
-+  bool PostNonNestableDelayedTask(
-+      const tracked_objects::Location& from_here,
-+      const base::Closure& task,
-+      base::TimeDelta delay) override;
-+
-+ private:
-+  static void OnTimeout(uv_timer_t* timer);
-+  static void OnClose(uv_handle_t* handle);
-+
-+  uv_loop_t* loop_;
-+
-+  std::map<uv_timer_t*, base::Closure> tasks_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(UvTaskRunner);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_APP_UV_TASK_RUNNER_H_
-added in remote
-  their  100644 4ac19bcf4ce6d96a815d2825bccead9d3b2cabb7 electron/browser/api/electron_api_app.cc
-@@ -0,0 +1,472 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/api/electron_api_app.h"
-+
-+#include <string>
-+#include <vector>
-+
-+#include "electron/browser/api/electron_api_menu.h"
-+#include "electron/browser/api/electron_api_session.h"
-+#include "electron/browser/api/electron_api_web_contents.h"
-+#include "electron/browser/electron_browser_context.h"
-+#include "electron/browser/electron_browser_main_parts.h"
-+#include "electron/browser/browser.h"
-+#include "electron/browser/login_handler.h"
-+#include "electron/common/native_mate_converters/callback.h"
-+#include "electron/common/native_mate_converters/net_converter.h"
-+#include "electron/common/native_mate_converters/file_path_converter.h"
-+#include "electron/common/native_mate_converters/gurl_converter.h"
-+#include "electron/common/native_mate_converters/image_converter.h"
-+#include "electron/common/node_includes.h"
-+#include "electron/common/options_switches.h"
-+#include "base/command_line.h"
-+#include "base/environment.h"
-+#include "base/files/file_path.h"
-+#include "base/path_service.h"
-+#include "brightray/browser/brightray_paths.h"
-+#include "chrome/common/chrome_paths.h"
-+#include "content/public/browser/client_certificate_delegate.h"
-+#include "content/public/browser/gpu_data_manager.h"
-+#include "content/public/browser/render_frame_host.h"
-+#include "content/public/common/content_switches.h"
-+#include "native_mate/dictionary.h"
-+#include "native_mate/object_template_builder.h"
-+#include "net/ssl/ssl_cert_request_info.h"
-+#include "ui/base/l10n/l10n_util.h"
-+#include "ui/gfx/image/image.h"
-+
-+#if defined(OS_WIN)
-+#include "base/strings/utf_string_conversions.h"
-+#include "ui/base/win/shell.h"
-+#endif
-+
-+using electron::Browser;
-+
-+namespace mate {
-+
-+#if defined(OS_WIN)
-+template<>
-+struct Converter<Browser::UserTask> {
-+  static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
-+                     Browser::UserTask* out) {
-+    mate::Dictionary dict;
-+    if (!ConvertFromV8(isolate, val, &dict))
-+      return false;
-+    if (!dict.Get("program", &(out->program)) ||
-+        !dict.Get("title", &(out->title)))
-+      return false;
-+    if (dict.Get("iconPath", &(out->icon_path)) &&
-+        !dict.Get("iconIndex", &(out->icon_index)))
-+      return false;
-+    dict.Get("arguments", &(out->arguments));
-+    dict.Get("description", &(out->description));
-+    return true;
-+  }
-+};
-+#endif
-+
-+}  // namespace mate
-+
-+
-+namespace electron {
-+
-+namespace api {
-+
-+namespace {
-+
-+// Return the path constant from string.
-+int GetPathConstant(const std::string& name) {
-+  if (name == "appData")
-+    return brightray::DIR_APP_DATA;
-+  else if (name == "userData")
-+    return brightray::DIR_USER_DATA;
-+  else if (name == "cache")
-+    return brightray::DIR_CACHE;
-+  else if (name == "userCache")
-+    return brightray::DIR_USER_CACHE;
-+  else if (name == "home")
-+    return base::DIR_HOME;
-+  else if (name == "temp")
-+    return base::DIR_TEMP;
-+  else if (name == "userDesktop" || name == "desktop")
-+    return base::DIR_USER_DESKTOP;
-+  else if (name == "exe")
-+    return base::FILE_EXE;
-+  else if (name == "module")
-+    return base::FILE_MODULE;
-+  else if (name == "documents")
-+    return chrome::DIR_USER_DOCUMENTS;
-+  else if (name == "downloads")
-+    return chrome::DIR_DEFAULT_DOWNLOADS;
-+  else if (name == "music")
-+    return chrome::DIR_USER_MUSIC;
-+  else if (name == "pictures")
-+    return chrome::DIR_USER_PICTURES;
-+  else if (name == "videos")
-+    return chrome::DIR_USER_VIDEOS;
-+  else
-+    return -1;
-+}
-+
-+bool NotificationCallbackWrapper(
-+    const ProcessSingleton::NotificationCallback& callback,
-+    const base::CommandLine::StringVector& cmd,
-+    const base::FilePath& cwd) {
-+  // Make sure the callback is called after app gets ready.
-+  if (Browser::Get()->is_ready()) {
-+    callback.Run(cmd, cwd);
-+  } else {
-+    scoped_refptr<base::SingleThreadTaskRunner> task_runner(
-+        base::ThreadTaskRunnerHandle::Get());
-+    task_runner->PostTask(
-+        FROM_HERE, base::Bind(base::IgnoreResult(callback), cmd, cwd));
-+  }
-+  // ProcessSingleton needs to know whether current process is quiting.
-+  return !Browser::Get()->is_shutting_down();
-+}
-+
-+void OnClientCertificateSelected(
-+    v8::Isolate* isolate,
-+    std::shared_ptr<content::ClientCertificateDelegate> delegate,
-+    mate::Arguments* args) {
-+  mate::Dictionary cert_data;
-+  if (!args->GetNext(&cert_data)) {
-+    args->ThrowError();
-+    return;
-+  }
-+
-+  v8::Local<v8::Object> data;
-+  if (!cert_data.Get("data", &data))
-+    return;
-+
-+  auto certs = net::X509Certificate::CreateCertificateListFromBytes(
-+      node::Buffer::Data(data), node::Buffer::Length(data),
-+      net::X509Certificate::FORMAT_AUTO);
-+  if (certs.size() > 0)
-+    delegate->ContinueWithCertificate(certs[0].get());
-+}
-+
-+void PassLoginInformation(scoped_refptr<LoginHandler> login_handler,
-+                          mate::Arguments* args) {
-+  base::string16 username, password;
-+  if (args->GetNext(&username) && args->GetNext(&password))
-+    login_handler->Login(username, password);
-+  else
-+    login_handler->CancelAuth();
-+}
-+
-+}  // namespace
-+
-+App::App() {
-+  static_cast<ElectronBrowserClient*>(ElectronBrowserClient::Get())->set_delegate(this);
-+  Browser::Get()->AddObserver(this);
-+  content::GpuDataManager::GetInstance()->AddObserver(this);
-+}
-+
-+App::~App() {
-+  static_cast<ElectronBrowserClient*>(ElectronBrowserClient::Get())->set_delegate(
-+      nullptr);
-+  Browser::Get()->RemoveObserver(this);
-+  content::GpuDataManager::GetInstance()->RemoveObserver(this);
-+}
-+
-+void App::OnBeforeQuit(bool* prevent_default) {
-+  *prevent_default = Emit("before-quit");
-+}
-+
-+void App::OnWillQuit(bool* prevent_default) {
-+  *prevent_default = Emit("will-quit");
-+}
-+
-+void App::OnWindowAllClosed() {
-+  Emit("window-all-closed");
-+}
-+
-+void App::OnQuit() {
-+  int exitCode = ElectronBrowserMainParts::Get()->GetExitCode();
-+  Emit("quit", exitCode);
-+
-+  if (process_singleton_.get()) {
-+    process_singleton_->Cleanup();
-+    process_singleton_.reset();
-+  }
-+}
-+
-+void App::OnOpenFile(bool* prevent_default, const std::string& file_path) {
-+  *prevent_default = Emit("open-file", file_path);
-+}
-+
-+void App::OnOpenURL(const std::string& url) {
-+  Emit("open-url", url);
-+}
-+
-+void App::OnActivate(bool has_visible_windows) {
-+  Emit("activate", has_visible_windows);
-+}
-+
-+void App::OnWillFinishLaunching() {
-+  Emit("will-finish-launching");
-+}
-+
-+void App::OnFinishLaunching() {
-+  Emit("ready");
-+}
-+
-+void App::OnLogin(LoginHandler* login_handler) {
-+  v8::Locker locker(isolate());
-+  v8::HandleScope handle_scope(isolate());
-+  bool prevent_default = Emit(
-+      "login",
-+      WebContents::CreateFrom(isolate(), login_handler->GetWebContents()),
-+      login_handler->request(),
-+      login_handler->auth_info(),
-+      base::Bind(&PassLoginInformation, make_scoped_refptr(login_handler)));
-+
-+  // Default behavior is to always cancel the auth.
-+  if (!prevent_default)
-+    login_handler->CancelAuth();
-+}
-+
-+void App::AllowCertificateError(
-+    content::WebContents* web_contents,
-+    int cert_error,
-+    const net::SSLInfo& ssl_info,
-+    const GURL& request_url,
-+    content::ResourceType resource_type,
-+    bool overridable,
-+    bool strict_enforcement,
-+    bool expired_previous_decision,
-+    const base::Callback<void(bool)>& callback,
-+    content::CertificateRequestResultType* request) {
-+  v8::Locker locker(isolate());
-+  v8::HandleScope handle_scope(isolate());
-+  bool prevent_default = Emit("certificate-error",
-+                              WebContents::CreateFrom(isolate(), web_contents),
-+                              request_url,
-+                              net::ErrorToString(cert_error),
-+                              ssl_info.cert,
-+                              callback);
-+
-+  // Deny the certificate by default.
-+  if (!prevent_default)
-+    *request = content::CERTIFICATE_REQUEST_RESULT_TYPE_DENY;
-+}
-+
-+void App::SelectClientCertificate(
-+    content::WebContents* web_contents,
-+    net::SSLCertRequestInfo* cert_request_info,
-+    scoped_ptr<content::ClientCertificateDelegate> delegate) {
-+  std::shared_ptr<content::ClientCertificateDelegate>
-+      shared_delegate(delegate.release());
-+  bool prevent_default =
-+      Emit("select-client-certificate",
-+           WebContents::CreateFrom(isolate(), web_contents),
-+           cert_request_info->host_and_port.ToString(),
-+           cert_request_info->client_certs,
-+           base::Bind(&OnClientCertificateSelected,
-+                      isolate(),
-+                      shared_delegate));
-+
-+  // Default to first certificate from the platform store.
-+  if (!prevent_default)
-+    shared_delegate->ContinueWithCertificate(
-+        cert_request_info->client_certs[0].get());
-+}
-+
-+void App::OnGpuProcessCrashed(base::TerminationStatus exit_code) {
-+  Emit("gpu-process-crashed");
-+}
-+
-+#if defined(OS_MACOSX)
-+void App::OnPlatformThemeChanged() {
-+  Emit("platform-theme-changed");
-+}
-+#endif
-+
-+base::FilePath App::GetPath(mate::Arguments* args, const std::string& name) {
-+  bool succeed = false;
-+  base::FilePath path;
-+  int key = GetPathConstant(name);
-+  if (key >= 0)
-+    succeed = PathService::Get(key, &path);
-+  if (!succeed)
-+    args->ThrowError("Failed to get path");
-+  return path;
-+}
-+
-+void App::SetPath(mate::Arguments* args,
-+                  const std::string& name,
-+                  const base::FilePath& path) {
-+  bool succeed = false;
-+  int key = GetPathConstant(name);
-+  if (key >= 0)
-+    succeed = PathService::Override(key, path);
-+  if (!succeed)
-+    args->ThrowError("Failed to set path");
-+}
-+
-+void App::SetDesktopName(const std::string& desktop_name) {
-+#if defined(OS_LINUX)
-+  scoped_ptr<base::Environment> env(base::Environment::Create());
-+  env->SetVar("CHROME_DESKTOP", desktop_name);
-+#endif
-+}
-+
-+void App::AllowNTLMCredentialsForAllDomains(bool should_allow) {
-+  auto browser_context = static_cast<ElectronBrowserContext*>(
-+        ElectronBrowserMainParts::Get()->browser_context());
-+  browser_context->AllowNTLMCredentialsForAllDomains(should_allow);
-+}
-+
-+std::string App::GetLocale() {
-+  return l10n_util::GetApplicationLocale("");
-+}
-+
-+#if defined(OS_WIN)
-+bool App::IsAeroGlassEnabled() {
-+  return ui::win::IsAeroGlassEnabled();
-+}
-+#endif
-+
-+bool App::MakeSingleInstance(
-+    const ProcessSingleton::NotificationCallback& callback) {
-+  if (process_singleton_.get())
-+    return false;
-+
-+  base::FilePath user_dir;
-+  PathService::Get(brightray::DIR_USER_DATA, &user_dir);
-+  process_singleton_.reset(new ProcessSingleton(
-+      user_dir, base::Bind(NotificationCallbackWrapper, callback)));
-+
-+  switch (process_singleton_->NotifyOtherProcessOrCreate()) {
-+    case ProcessSingleton::NotifyResult::LOCK_ERROR:
-+    case ProcessSingleton::NotifyResult::PROFILE_IN_USE:
-+    case ProcessSingleton::NotifyResult::PROCESS_NOTIFIED:
-+      process_singleton_.reset();
-+      return true;
-+    case ProcessSingleton::NotifyResult::PROCESS_NONE:
-+    default:  // Shouldn't be needed, but VS warns if it is not there.
-+      return false;
-+  }
-+}
-+
-+mate::ObjectTemplateBuilder App::GetObjectTemplateBuilder(
-+    v8::Isolate* isolate) {
-+  auto browser = base::Unretained(Browser::Get());
-+  return mate::ObjectTemplateBuilder(isolate)
-+      .SetMethod("quit", base::Bind(&Browser::Quit, browser))
-+      .SetMethod("exit", base::Bind(&Browser::Exit, browser))
-+      .SetMethod("focus", base::Bind(&Browser::Focus, browser))
-+      .SetMethod("getVersion", base::Bind(&Browser::GetVersion, browser))
-+      .SetMethod("setVersion", base::Bind(&Browser::SetVersion, browser))
-+      .SetMethod("getName", base::Bind(&Browser::GetName, browser))
-+      .SetMethod("setName", base::Bind(&Browser::SetName, browser))
-+      .SetMethod("isReady", base::Bind(&Browser::is_ready, browser))
-+      .SetMethod("addRecentDocument",
-+                 base::Bind(&Browser::AddRecentDocument, browser))
-+      .SetMethod("clearRecentDocuments",
-+                 base::Bind(&Browser::ClearRecentDocuments, browser))
-+      .SetMethod("setAppUserModelId",
-+                 base::Bind(&Browser::SetAppUserModelID, browser))
-+      .SetMethod("setAsDefaultProtocolClient",
-+                 base::Bind(&Browser::SetAsDefaultProtocolClient, browser))
-+      .SetMethod("removeAsDefaultProtocolClient",
-+                 base::Bind(&Browser::RemoveAsDefaultProtocolClient, browser))
-+#if defined(OS_MACOSX)
-+      .SetMethod("hide", base::Bind(&Browser::Hide, browser))
-+      .SetMethod("show", base::Bind(&Browser::Show, browser))
-+      .SetMethod("isDarkMode",
-+                 base::Bind(&Browser::IsDarkMode, browser))
-+#endif
-+#if defined(OS_WIN)
-+      .SetMethod("setUserTasks",
-+                 base::Bind(&Browser::SetUserTasks, browser))
-+      .SetMethod("isAeroGlassEnabled", &App::IsAeroGlassEnabled)
-+#endif
-+      .SetMethod("setPath", &App::SetPath)
-+      .SetMethod("getPath", &App::GetPath)
-+      .SetMethod("setDesktopName", &App::SetDesktopName)
-+      .SetMethod("allowNTLMCredentialsForAllDomains",
-+                 &App::AllowNTLMCredentialsForAllDomains)
-+      .SetMethod("getLocale", &App::GetLocale)
-+      .SetMethod("makeSingleInstance", &App::MakeSingleInstance);
-+}
-+
-+// static
-+mate::Handle<App> App::Create(v8::Isolate* isolate) {
-+  return CreateHandle(isolate, new App);
-+}
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+
-+namespace {
-+
-+void AppendSwitch(const std::string& switch_string, mate::Arguments* args) {
-+  auto command_line = base::CommandLine::ForCurrentProcess();
-+
-+  if (switch_string == electron::switches::kPpapiFlashPath ||
-+      switch_string == electron::switches::kClientCertificate ||
-+      switch_string == switches::kLogNetLog) {
-+    base::FilePath path;
-+    args->GetNext(&path);
-+    command_line->AppendSwitchPath(switch_string, path);
-+    return;
-+  }
-+
-+  std::string value;
-+  if (args->GetNext(&value))
-+    command_line->AppendSwitchASCII(switch_string, value);
-+  else
-+    command_line->AppendSwitch(switch_string);
-+}
-+
-+#if defined(OS_MACOSX)
-+int DockBounce(const std::string& type) {
-+  int request_id = -1;
-+  if (type == "critical")
-+    request_id = Browser::Get()->DockBounce(Browser::BOUNCE_CRITICAL);
-+  else if (type == "informational")
-+    request_id = Browser::Get()->DockBounce(Browser::BOUNCE_INFORMATIONAL);
-+  return request_id;
-+}
-+
-+void DockSetMenu(electron::api::Menu* menu) {
-+  Browser::Get()->DockSetMenu(menu->model());
-+}
-+#endif
-+
-+void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
-+                v8::Local<v8::Context> context, void* priv) {
-+  v8::Isolate* isolate = context->GetIsolate();
-+  auto command_line = base::CommandLine::ForCurrentProcess();
-+
-+  mate::Dictionary dict(isolate, exports);
-+  dict.Set("app", electron::api::App::Create(isolate));
-+  dict.SetMethod("appendSwitch", &AppendSwitch);
-+  dict.SetMethod("appendArgument",
-+                 base::Bind(&base::CommandLine::AppendArg,
-+                            base::Unretained(command_line)));
-+#if defined(OS_MACOSX)
-+  auto browser = base::Unretained(Browser::Get());
-+  dict.SetMethod("dockBounce", &DockBounce);
-+  dict.SetMethod("dockCancelBounce",
-+                 base::Bind(&Browser::DockCancelBounce, browser));
-+  dict.SetMethod("dockSetBadgeText",
-+                 base::Bind(&Browser::DockSetBadgeText, browser));
-+  dict.SetMethod("dockGetBadgeText",
-+                 base::Bind(&Browser::DockGetBadgeText, browser));
-+  dict.SetMethod("dockHide", base::Bind(&Browser::DockHide, browser));
-+  dict.SetMethod("dockShow", base::Bind(&Browser::DockShow, browser));
-+  dict.SetMethod("dockSetMenu", &DockSetMenu);
-+  dict.SetMethod("dockSetIcon", base::Bind(&Browser::DockSetIcon, browser));
-+#endif
-+}
-+
-+}  // namespace
-+
-+NODE_MODULE_CONTEXT_AWARE_BUILTIN(electron_browser_app, Initialize)
-added in remote
-  their  100644 a824d4b4ecea505eb572bdb97a3577b37e82d119 electron/browser/api/electron_api_app.h
-@@ -0,0 +1,107 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_API_ELECTRON_API_APP_H_
-+#define ELECTRON_BROWSER_API_ELECTRON_API_APP_H_
-+
-+#include <string>
-+
-+#include "electron/browser/api/event_emitter.h"
-+#include "electron/browser/electron_browser_client.h"
-+#include "electron/browser/browser_observer.h"
-+#include "electron/common/native_mate_converters/callback.h"
-+#include "chrome/browser/process_singleton.h"
-+#include "content/public/browser/gpu_data_manager_observer.h"
-+#include "native_mate/handle.h"
-+
-+namespace base {
-+class FilePath;
-+}
-+
-+namespace mate {
-+class Arguments;
-+}
-+
-+namespace electron {
-+
-+namespace api {
-+
-+class App : public ElectronBrowserClient::Delegate,
-+            public mate::EventEmitter,
-+            public BrowserObserver,
-+            public content::GpuDataManagerObserver {
-+ public:
-+  static mate::Handle<App> Create(v8::Isolate* isolate);
-+
-+ protected:
-+  App();
-+  virtual ~App();
-+
-+  // BrowserObserver:
-+  void OnBeforeQuit(bool* prevent_default) override;
-+  void OnWillQuit(bool* prevent_default) override;
-+  void OnWindowAllClosed() override;
-+  void OnQuit() override;
-+  void OnOpenFile(bool* prevent_default, const std::string& file_path) override;
-+  void OnOpenURL(const std::string& url) override;
-+  void OnActivate(bool has_visible_windows) override;
-+  void OnWillFinishLaunching() override;
-+  void OnFinishLaunching() override;
-+  void OnLogin(LoginHandler* login_handler) override;
-+
-+  // content::ContentBrowserClient:
-+  void AllowCertificateError(
-+      content::WebContents* web_contents,
-+      int cert_error,
-+      const net::SSLInfo& ssl_info,
-+      const GURL& request_url,
-+      content::ResourceType resource_type,
-+      bool overridable,
-+      bool strict_enforcement,
-+      bool expired_previous_decision,
-+      const base::Callback<void(bool)>& callback,
-+      content::CertificateRequestResultType* request) override;
-+  void SelectClientCertificate(
-+      content::WebContents* web_contents,
-+      net::SSLCertRequestInfo* cert_request_info,
-+      scoped_ptr<content::ClientCertificateDelegate> delegate) override;
-+
-+  // content::GpuDataManagerObserver:
-+  void OnGpuProcessCrashed(base::TerminationStatus exit_code) override;
-+
-+#if defined(OS_MACOSX)
-+  void OnPlatformThemeChanged() override;
-+#endif
-+
-+  // mate::Wrappable:
-+  mate::ObjectTemplateBuilder GetObjectTemplateBuilder(
-+      v8::Isolate* isolate) override;
-+
-+ private:
-+  // Get/Set the pre-defined path in PathService.
-+  base::FilePath GetPath(mate::Arguments* args, const std::string& name);
-+  void SetPath(mate::Arguments* args,
-+               const std::string& name,
-+               const base::FilePath& path);
-+
-+  void SetDesktopName(const std::string& desktop_name);
-+  void AllowNTLMCredentialsForAllDomains(bool should_allow);
-+  bool MakeSingleInstance(
-+      const ProcessSingleton::NotificationCallback& callback);
-+  std::string GetLocale();
-+
-+#if defined(OS_WIN)
-+  bool IsAeroGlassEnabled();
-+#endif
-+
-+  scoped_ptr<ProcessSingleton> process_singleton_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(App);
-+};
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_API_ELECTRON_API_APP_H_
-added in remote
-  their  100644 2de74a2077d1ba9104dab6200d1b9d06e00cd2df electron/browser/api/electron_api_auto_updater.cc
-@@ -0,0 +1,124 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/api/electron_api_auto_updater.h"
-+
-+#include "base/time/time.h"
-+#include "electron/browser/browser.h"
-+#include "electron/browser/native_window.h"
-+#include "electron/browser/window_list.h"
-+#include "electron/common/native_mate_converters/callback.h"
-+#include "electron/common/node_includes.h"
-+#include "native_mate/dictionary.h"
-+#include "native_mate/object_template_builder.h"
-+
-+namespace mate {
-+
-+template<>
-+struct Converter<base::Time> {
-+  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-+                                   const base::Time& val) {
-+    v8::MaybeLocal<v8::Value> date = v8::Date::New(
-+        isolate->GetCurrentContext(), val.ToJsTime());
-+    if (date.IsEmpty())
-+      return v8::Null(isolate);
-+    else
-+      return date.ToLocalChecked();
-+  }
-+};
-+
-+}  // namespace mate
-+
-+namespace electron {
-+
-+namespace api {
-+
-+AutoUpdater::AutoUpdater() {
-+  auto_updater::AutoUpdater::SetDelegate(this);
-+}
-+
-+AutoUpdater::~AutoUpdater() {
-+  auto_updater::AutoUpdater::SetDelegate(nullptr);
-+}
-+
-+void AutoUpdater::OnError(const std::string& message) {
-+  v8::Locker locker(isolate());
-+  v8::HandleScope handle_scope(isolate());
-+  auto error = v8::Exception::Error(mate::StringToV8(isolate(), message));
-+  EmitCustomEvent(
-+      "error",
-+      error->ToObject(isolate()->GetCurrentContext()).ToLocalChecked(),
-+      // Message is also emitted to keep compatibility with old code.
-+      message);
-+}
-+
-+void AutoUpdater::OnCheckingForUpdate() {
-+  Emit("checking-for-update");
-+}
-+
-+void AutoUpdater::OnUpdateAvailable() {
-+  Emit("update-available");
-+}
-+
-+void AutoUpdater::OnUpdateNotAvailable() {
-+  Emit("update-not-available");
-+}
-+
-+void AutoUpdater::OnUpdateDownloaded(const std::string& release_notes,
-+                                     const std::string& release_name,
-+                                     const base::Time& release_date,
-+                                     const std::string& url) {
-+  Emit("update-downloaded", release_notes, release_name, release_date, url,
-+       // Keep compatibility with old APIs.
-+       base::Bind(&AutoUpdater::QuitAndInstall, base::Unretained(this)));
-+}
-+
-+void AutoUpdater::OnWindowAllClosed() {
-+  QuitAndInstall();
-+}
-+
-+mate::ObjectTemplateBuilder AutoUpdater::GetObjectTemplateBuilder(
-+    v8::Isolate* isolate) {
-+  return mate::ObjectTemplateBuilder(isolate)
-+      .SetMethod("setFeedURL", &auto_updater::AutoUpdater::SetFeedURL)
-+      .SetMethod("checkForUpdates", &auto_updater::AutoUpdater::CheckForUpdates)
-+      .SetMethod("quitAndInstall", &AutoUpdater::QuitAndInstall);
-+}
-+
-+void AutoUpdater::QuitAndInstall() {
-+  // If we don't have any window then quitAndInstall immediately.
-+  WindowList* window_list = WindowList::GetInstance();
-+  if (window_list->size() == 0) {
-+    auto_updater::AutoUpdater::QuitAndInstall();
-+    return;
-+  }
-+
-+  // Otherwise do the restart after all windows have been closed.
-+  window_list->AddObserver(this);
-+  for (NativeWindow* window : *window_list)
-+    window->Close();
-+}
-+
-+// static
-+mate::Handle<AutoUpdater> AutoUpdater::Create(v8::Isolate* isolate) {
-+  return CreateHandle(isolate, new AutoUpdater);
-+}
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+
-+namespace {
-+
-+void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
-+                v8::Local<v8::Context> context, void* priv) {
-+  v8::Isolate* isolate = context->GetIsolate();
-+  mate::Dictionary dict(isolate, exports);
-+  dict.Set("autoUpdater", electron::api::AutoUpdater::Create(isolate));
-+}
-+
-+}  // namespace
-+
-+NODE_MODULE_CONTEXT_AWARE_BUILTIN(electron_browser_auto_updater, Initialize)
-added in remote
-  their  100644 cd9960f6a563774735fd25ecbb21eec3033d7383 electron/browser/api/electron_api_auto_updater.h
-@@ -0,0 +1,56 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_API_ELECTRON_API_AUTO_UPDATER_H_
-+#define ELECTRON_BROWSER_API_ELECTRON_API_AUTO_UPDATER_H_
-+
-+#include <string>
-+
-+#include "electron/browser/api/event_emitter.h"
-+#include "electron/browser/auto_updater.h"
-+#include "electron/browser/window_list_observer.h"
-+#include "native_mate/handle.h"
-+
-+namespace electron {
-+
-+namespace api {
-+
-+class AutoUpdater : public mate::EventEmitter,
-+                    public auto_updater::Delegate,
-+                    public WindowListObserver {
-+ public:
-+  static mate::Handle<AutoUpdater> Create(v8::Isolate* isolate);
-+
-+ protected:
-+  AutoUpdater();
-+  virtual ~AutoUpdater();
-+
-+  // Delegate implementations.
-+  void OnError(const std::string& error) override;
-+  void OnCheckingForUpdate() override;
-+  void OnUpdateAvailable() override;
-+  void OnUpdateNotAvailable() override;
-+  void OnUpdateDownloaded(const std::string& release_notes,
-+                          const std::string& release_name,
-+                          const base::Time& release_date,
-+                          const std::string& update_url) override;
-+
-+  // WindowListObserver:
-+  void OnWindowAllClosed() override;
-+
-+  // mate::Wrappable implementations:
-+  mate::ObjectTemplateBuilder GetObjectTemplateBuilder(
-+      v8::Isolate* isolate) override;
-+
-+ private:
-+  void QuitAndInstall();
-+
-+  DISALLOW_COPY_AND_ASSIGN(AutoUpdater);
-+};
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_API_ELECTRON_API_AUTO_UPDATER_H_
-added in remote
-  their  100644 3a2fb346beaa5eba580aa644b8aa35228388074c electron/browser/api/electron_api_content_tracing.cc
-@@ -0,0 +1,79 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include <set>
-+#include <string>
-+
-+#include "electron/common/native_mate_converters/callback.h"
-+#include "electron/common/native_mate_converters/file_path_converter.h"
-+#include "electron/common/node_includes.h"
-+#include "base/bind.h"
-+#include "base/files/file_util.h"
-+#include "content/public/browser/tracing_controller.h"
-+#include "native_mate/dictionary.h"
-+
-+using content::TracingController;
-+
-+namespace mate {
-+
-+template<>
-+struct Converter<base::trace_event::TraceConfig> {
-+  static bool FromV8(v8::Isolate* isolate,
-+                     v8::Local<v8::Value> val,
-+                     base::trace_event::TraceConfig* out) {
-+    Dictionary options;
-+    if (!ConvertFromV8(isolate, val, &options))
-+      return false;
-+    std::string category_filter, trace_options;
-+    if (!options.Get("categoryFilter", &category_filter) ||
-+        !options.Get("traceOptions", &trace_options))
-+      return false;
-+    *out = base::trace_event::TraceConfig(category_filter, trace_options);
-+    return true;
-+  }
-+};
-+
-+}  // namespace mate
-+
-+namespace {
-+
-+using CompletionCallback = base::Callback<void(const base::FilePath&)>;
-+
-+scoped_refptr<TracingController::TraceDataSink> GetTraceDataSink(
-+    const base::FilePath& path, const CompletionCallback& callback) {
-+  base::FilePath result_file_path = path;
-+  if (result_file_path.empty() && !base::CreateTemporaryFile(&result_file_path))
-+    LOG(ERROR) << "Creating temporary file failed";
-+
-+  return TracingController::CreateFileSink(result_file_path,
-+                                           base::Bind(callback,
-+                                                      result_file_path));
-+}
-+
-+void StopRecording(const base::FilePath& path,
-+                   const CompletionCallback& callback) {
-+  TracingController::GetInstance()->StopTracing(
-+      GetTraceDataSink(path, callback));
-+}
-+
-+void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
-+                v8::Local<v8::Context> context, void* priv) {
-+  auto controller = base::Unretained(TracingController::GetInstance());
-+  mate::Dictionary dict(context->GetIsolate(), exports);
-+  dict.SetMethod("getCategories", base::Bind(
-+      &TracingController::GetCategories, controller));
-+  dict.SetMethod("startRecording", base::Bind(
-+      &TracingController::StartTracing, controller));
-+  dict.SetMethod("stopRecording", &StopRecording);
-+  dict.SetMethod("getTraceBufferUsage", base::Bind(
-+      &TracingController::GetTraceBufferUsage, controller));
-+  dict.SetMethod("setWatchEvent", base::Bind(
-+      &TracingController::SetWatchEvent, controller));
-+  dict.SetMethod("cancelWatchEvent", base::Bind(
-+      &TracingController::CancelWatchEvent, controller));
-+}
-+
-+}  // namespace
-+
-+NODE_MODULE_CONTEXT_AWARE_BUILTIN(electron_browser_content_tracing, Initialize)
-added in remote
-  their  100644 8974d7492b6fb85ea50539c0cc79297c8050de41 electron/browser/api/electron_api_cookies.cc
-@@ -0,0 +1,240 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/api/electron_api_cookies.h"
-+
-+#include "electron/common/native_mate_converters/callback.h"
-+#include "electron/common/native_mate_converters/gurl_converter.h"
-+#include "electron/common/native_mate_converters/value_converter.h"
-+#include "base/time/time.h"
-+#include "base/values.h"
-+#include "content/public/browser/browser_context.h"
-+#include "content/public/browser/browser_thread.h"
-+#include "native_mate/dictionary.h"
-+#include "native_mate/object_template_builder.h"
-+#include "net/cookies/cookie_monster.h"
-+#include "net/cookies/cookie_store.h"
-+#include "net/cookies/cookie_util.h"
-+#include "net/url_request/url_request_context.h"
-+#include "net/url_request/url_request_context_getter.h"
-+
-+using content::BrowserThread;
-+
-+namespace mate {
-+
-+template<>
-+struct Converter<electron::api::Cookies::Error> {
-+  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-+                                   electron::api::Cookies::Error val) {
-+    if (val == electron::api::Cookies::SUCCESS)
-+      return v8::Null(isolate);
-+    else
-+      return v8::Exception::Error(StringToV8(isolate, "failed"));
-+  }
-+};
-+
-+template<>
-+struct Converter<net::CanonicalCookie> {
-+  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-+                                   const net::CanonicalCookie& val) {
-+    mate::Dictionary dict(isolate, v8::Object::New(isolate));
-+    dict.Set("name", val.Name());
-+    dict.Set("value", val.Value());
-+    dict.Set("domain", val.Domain());
-+    dict.Set("hostOnly", net::cookie_util::DomainIsHostOnly(val.Domain()));
-+    dict.Set("path", val.Path());
-+    dict.Set("secure", val.IsSecure());
-+    dict.Set("httpOnly", val.IsHttpOnly());
-+    dict.Set("session", !val.IsPersistent());
-+    if (!val.IsPersistent())
-+      dict.Set("expirationDate", val.ExpiryDate().ToDoubleT());
-+    return dict.GetHandle();
-+  }
-+};
-+
-+}  // namespace mate
-+
-+namespace electron {
-+
-+namespace api {
-+
-+namespace {
-+
-+// Returns whether |domain| matches |filter|.
-+bool MatchesDomain(std::string filter, const std::string& domain) {
-+  // Add a leading '.' character to the filter domain if it doesn't exist.
-+  if (net::cookie_util::DomainIsHostOnly(filter))
-+    filter.insert(0, ".");
-+
-+  std::string sub_domain(domain);
-+  // Strip any leading '.' character from the input cookie domain.
-+  if (!net::cookie_util::DomainIsHostOnly(sub_domain))
-+    sub_domain = sub_domain.substr(1);
-+
-+  // Now check whether the domain argument is a subdomain of the filter domain.
-+  for (sub_domain.insert(0, "."); sub_domain.length() >= filter.length();) {
-+    if (sub_domain == filter)
-+      return true;
-+    const size_t next_dot = sub_domain.find('.', 1);  // Skip over leading dot.
-+    sub_domain.erase(0, next_dot);
-+  }
-+  return false;
-+}
-+
-+// Returns whether |cookie| matches |filter|.
-+bool MatchesCookie(const base::DictionaryValue* filter,
-+                   const net::CanonicalCookie& cookie) {
-+  std::string str;
-+  bool b;
-+  if (filter->GetString("name", &str) && str != cookie.Name())
-+    return false;
-+  if (filter->GetString("path", &str) && str != cookie.Path())
-+    return false;
-+  if (filter->GetString("domain", &str) && !MatchesDomain(str, cookie.Domain()))
-+    return false;
-+  if (filter->GetBoolean("secure", &b) && b != cookie.IsSecure())
-+    return false;
-+  if (filter->GetBoolean("session", &b) && b != !cookie.IsPersistent())
-+    return false;
-+  return true;
-+}
-+
-+// Helper to returns the CookieStore.
-+inline net::CookieStore* GetCookieStore(
-+    scoped_refptr<net::URLRequestContextGetter> getter) {
-+  return getter->GetURLRequestContext()->cookie_store();
-+}
-+
-+// Run |callback| on UI thread.
-+void RunCallbackInUI(const base::Closure& callback) {
-+  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, callback);
-+}
-+
-+// Remove cookies from |list| not matching |filter|, and pass it to |callback|.
-+void FilterCookies(scoped_ptr<base::DictionaryValue> filter,
-+                   const Cookies::GetCallback& callback,
-+                   const net::CookieList& list) {
-+  net::CookieList result;
-+  for (const auto& cookie : list) {
-+    if (MatchesCookie(filter.get(), cookie))
-+      result.push_back(cookie);
-+  }
-+  RunCallbackInUI(base::Bind(callback, Cookies::SUCCESS, result));
-+}
-+
-+// Receives cookies matching |filter| in IO thread.
-+void GetCookiesOnIO(scoped_refptr<net::URLRequestContextGetter> getter,
-+                    scoped_ptr<base::DictionaryValue> filter,
-+                    const Cookies::GetCallback& callback) {
-+  std::string url;
-+  filter->GetString("url", &url);
-+
-+  auto filtered_callback =
-+      base::Bind(FilterCookies, base::Passed(&filter), callback);
-+
-+  net::CookieMonster* monster = GetCookieStore(getter)->GetCookieMonster();
-+  // Empty url will match all url cookies.
-+  if (url.empty())
-+    monster->GetAllCookiesAsync(filtered_callback);
-+  else
-+    monster->GetAllCookiesForURLAsync(GURL(url), filtered_callback);
-+}
-+
-+// Removes cookie with |url| and |name| in IO thread.
-+void RemoveCookieOnIOThread(scoped_refptr<net::URLRequestContextGetter> getter,
-+                            const GURL& url, const std::string& name,
-+                            const base::Closure& callback) {
-+  GetCookieStore(getter)->DeleteCookieAsync(
-+      url, name, base::Bind(RunCallbackInUI, callback));
-+}
-+
-+// Callback of SetCookie.
-+void OnSetCookie(const Cookies::SetCallback& callback, bool success) {
-+  RunCallbackInUI(
-+      base::Bind(callback, success ? Cookies::SUCCESS : Cookies::FAILED));
-+}
-+
-+// Sets cookie with |details| in IO thread.
-+void SetCookieOnIO(scoped_refptr<net::URLRequestContextGetter> getter,
-+                   scoped_ptr<base::DictionaryValue> details,
-+                   const Cookies::SetCallback& callback) {
-+  std::string url, name, value, domain, path;
-+  bool secure = false;
-+  bool http_only = false;
-+  double expiration_date;
-+  details->GetString("url", &url);
-+  details->GetString("name", &name);
-+  details->GetString("value", &value);
-+  details->GetString("domain", &domain);
-+  details->GetString("path", &path);
-+  details->GetBoolean("secure", &secure);
-+  details->GetBoolean("httpOnly", &http_only);
-+
-+  base::Time expiration_time;
-+  if (details->GetDouble("expirationDate", &expiration_date)) {
-+    expiration_time = (expiration_date == 0) ?
-+        base::Time::UnixEpoch() :
-+        base::Time::FromDoubleT(expiration_date);
-+  }
-+
-+  GetCookieStore(getter)->GetCookieMonster()->SetCookieWithDetailsAsync(
-+      GURL(url), name, value, domain, path, expiration_time, secure, http_only,
-+      false, false, false, net::COOKIE_PRIORITY_DEFAULT,
-+      base::Bind(OnSetCookie, callback));
-+}
-+
-+}  // namespace
-+
-+Cookies::Cookies(content::BrowserContext* browser_context)
-+    : request_context_getter_(browser_context->GetRequestContext()) {
-+}
-+
-+Cookies::~Cookies() {
-+}
-+
-+void Cookies::Get(const base::DictionaryValue& filter,
-+                  const GetCallback& callback) {
-+  scoped_ptr<base::DictionaryValue> copied(filter.CreateDeepCopy());
-+  auto getter = make_scoped_refptr(request_context_getter_);
-+  content::BrowserThread::PostTask(
-+      BrowserThread::IO, FROM_HERE,
-+      base::Bind(GetCookiesOnIO, getter, Passed(&copied), callback));
-+}
-+
-+void Cookies::Remove(const GURL& url, const std::string& name,
-+                     const base::Closure& callback) {
-+  auto getter = make_scoped_refptr(request_context_getter_);
-+  content::BrowserThread::PostTask(
-+      BrowserThread::IO, FROM_HERE,
-+      base::Bind(RemoveCookieOnIOThread, getter, url, name, callback));
-+}
-+
-+void Cookies::Set(const base::DictionaryValue& details,
-+                  const SetCallback& callback) {
-+  scoped_ptr<base::DictionaryValue> copied(details.CreateDeepCopy());
-+  auto getter = make_scoped_refptr(request_context_getter_);
-+  content::BrowserThread::PostTask(
-+      BrowserThread::IO, FROM_HERE,
-+      base::Bind(SetCookieOnIO, getter, Passed(&copied), callback));
-+}
-+
-+// static
-+mate::Handle<Cookies> Cookies::Create(
-+    v8::Isolate* isolate,
-+    content::BrowserContext* browser_context) {
-+  return mate::CreateHandle(isolate, new Cookies(browser_context));
-+}
-+
-+// static
-+void Cookies::BuildPrototype(v8::Isolate* isolate,
-+                             v8::Local<v8::ObjectTemplate> prototype) {
-+  mate::ObjectTemplateBuilder(isolate, prototype)
-+      .SetMethod("get", &Cookies::Get)
-+      .SetMethod("remove", &Cookies::Remove)
-+      .SetMethod("set", &Cookies::Set);
-+}
-+
-+}  // namespace api
-+
-+}  // namespace electron
-added in remote
-  their  100644 196f4576fe6c837eab191f92eee39f9879779dd0 electron/browser/api/electron_api_cookies.h
-@@ -0,0 +1,67 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_API_ELECTRON_API_COOKIES_H_
-+#define ELECTRON_BROWSER_API_ELECTRON_API_COOKIES_H_
-+
-+#include <string>
-+
-+#include "electron/browser/api/trackable_object.h"
-+#include "base/callback.h"
-+#include "native_mate/handle.h"
-+#include "net/cookies/canonical_cookie.h"
-+
-+namespace base {
-+class DictionaryValue;
-+}
-+
-+namespace content {
-+class BrowserContext;
-+}
-+
-+namespace net {
-+class URLRequestContextGetter;
-+}
-+
-+namespace electron {
-+
-+namespace api {
-+
-+class Cookies : public mate::TrackableObject<Cookies> {
-+ public:
-+  enum Error {
-+    SUCCESS,
-+    FAILED,
-+  };
-+
-+  using GetCallback = base::Callback<void(Error, const net::CookieList&)>;
-+  using SetCallback = base::Callback<void(Error)>;
-+
-+  static mate::Handle<Cookies> Create(v8::Isolate* isolate,
-+                                      content::BrowserContext* browser_context);
-+
-+  // mate::TrackableObject:
-+  static void BuildPrototype(v8::Isolate* isolate,
-+                             v8::Local<v8::ObjectTemplate> prototype);
-+
-+ protected:
-+  explicit Cookies(content::BrowserContext* browser_context);
-+  ~Cookies();
-+
-+  void Get(const base::DictionaryValue& filter, const GetCallback& callback);
-+  void Remove(const GURL& url, const std::string& name,
-+              const base::Closure& callback);
-+  void Set(const base::DictionaryValue& details, const SetCallback& callback);
-+
-+ private:
-+  net::URLRequestContextGetter* request_context_getter_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(Cookies);
-+};
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_API_ELECTRON_API_COOKIES_H_
-added in remote
-  their  100644 8721a8cb7299ddf611b5f543a9a834b8c8a22439 electron/browser/api/electron_api_debugger.cc
-@@ -0,0 +1,195 @@
-+// Copyright (c) 2016 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/api/electron_api_debugger.h"
-+
-+#include <string>
-+
-+#include "electron/browser/electron_browser_main_parts.h"
-+#include "electron/common/native_mate_converters/callback.h"
-+#include "electron/common/native_mate_converters/value_converter.h"
-+#include "electron/common/node_includes.h"
-+#include "base/json/json_reader.h"
-+#include "base/json/json_writer.h"
-+#include "content/public/browser/devtools_agent_host.h"
-+#include "content/public/browser/web_contents.h"
-+#include "native_mate/dictionary.h"
-+#include "native_mate/object_template_builder.h"
-+
-+using content::DevToolsAgentHost;
-+
-+namespace electron {
-+
-+namespace api {
-+
-+namespace {
-+
-+// The wrapDebugger funtion which is implemented in JavaScript.
-+using WrapDebuggerCallback = base::Callback<void(v8::Local<v8::Value>)>;
-+WrapDebuggerCallback g_wrap_debugger;
-+
-+}  // namespace
-+
-+Debugger::Debugger(content::WebContents* web_contents)
-+    : web_contents_(web_contents),
-+      previous_request_id_(0) {
-+}
-+
-+Debugger::~Debugger() {
-+}
-+
-+void Debugger::AgentHostClosed(DevToolsAgentHost* agent_host,
-+                               bool replaced_with_another_client) {
-+  std::string detach_reason = "target closed";
-+  if (replaced_with_another_client)
-+    detach_reason = "replaced with devtools";
-+  Emit("detach", detach_reason);
-+}
-+
-+void Debugger::DispatchProtocolMessage(DevToolsAgentHost* agent_host,
-+                                       const std::string& message) {
-+  DCHECK(agent_host == agent_host_.get());
-+
-+  scoped_ptr<base::Value> parsed_message(base::JSONReader::Read(message));
-+  if (!parsed_message->IsType(base::Value::TYPE_DICTIONARY))
-+    return;
-+
-+  base::DictionaryValue* dict =
-+      static_cast<base::DictionaryValue*>(parsed_message.get());
-+  int id;
-+  if (!dict->GetInteger("id", &id)) {
-+    std::string method;
-+    if (!dict->GetString("method", &method))
-+      return;
-+    base::DictionaryValue* params_value = nullptr;
-+    base::DictionaryValue params;
-+    if (dict->GetDictionary("params", &params_value))
-+      params.Swap(params_value);
-+    Emit("message", method, params);
-+  } else {
-+    auto send_command_callback = pending_requests_[id];
-+    pending_requests_.erase(id);
-+    if (send_command_callback.is_null())
-+      return;
-+    base::DictionaryValue* error_body = nullptr;
-+    base::DictionaryValue error;
-+    if (dict->GetDictionary("error", &error_body))
-+      error.Swap(error_body);
-+
-+    base::DictionaryValue* result_body = nullptr;
-+    base::DictionaryValue result;
-+    if (dict->GetDictionary("result", &result_body))
-+      result.Swap(result_body);
-+    send_command_callback.Run(error, result);
-+  }
-+}
-+
-+void Debugger::Attach(mate::Arguments* args) {
-+  std::string protocol_version;
-+  args->GetNext(&protocol_version);
-+
-+  if (!protocol_version.empty() &&
-+      !DevToolsAgentHost::IsSupportedProtocolVersion(protocol_version)) {
-+    args->ThrowError("Requested protocol version is not supported");
-+    return;
-+  }
-+  agent_host_ = DevToolsAgentHost::GetOrCreateFor(web_contents_);
-+  if (!agent_host_.get()) {
-+    args->ThrowError("No target available");
-+    return;
-+  }
-+  if (agent_host_->IsAttached()) {
-+    args->ThrowError("Another debugger is already attached to this target");
-+    return;
-+  }
-+
-+  agent_host_->AttachClient(this);
-+}
-+
-+bool Debugger::IsAttached() {
-+  return agent_host_.get() ? agent_host_->IsAttached() : false;
-+}
-+
-+void Debugger::Detach() {
-+  if (!agent_host_.get())
-+    return;
-+  agent_host_->DetachClient();
-+  AgentHostClosed(agent_host_.get(), false);
-+  agent_host_ = nullptr;
-+}
-+
-+void Debugger::SendCommand(mate::Arguments* args) {
-+  if (!agent_host_.get())
-+    return;
-+
-+  std::string method;
-+  if (!args->GetNext(&method)) {
-+    args->ThrowError();
-+    return;
-+  }
-+  base::DictionaryValue command_params;
-+  args->GetNext(&command_params);
-+  SendCommandCallback callback;
-+  args->GetNext(&callback);
-+
-+  base::DictionaryValue request;
-+  int request_id = ++previous_request_id_;
-+  pending_requests_[request_id] = callback;
-+  request.SetInteger("id", request_id);
-+  request.SetString("method", method);
-+  if (!command_params.empty())
-+    request.Set("params", command_params.DeepCopy());
-+
-+  std::string json_args;
-+  base::JSONWriter::Write(request, &json_args);
-+  agent_host_->DispatchProtocolMessage(json_args);
-+}
-+
-+// static
-+mate::Handle<Debugger> Debugger::Create(
-+    v8::Isolate* isolate,
-+    content::WebContents* web_contents) {
-+  auto handle = mate::CreateHandle(isolate, new Debugger(web_contents));
-+  g_wrap_debugger.Run(handle.ToV8());
-+  return handle;
-+}
-+
-+// static
-+void Debugger::BuildPrototype(v8::Isolate* isolate,
-+                              v8::Local<v8::ObjectTemplate> prototype) {
-+  mate::ObjectTemplateBuilder(isolate, prototype)
-+      .SetMethod("attach", &Debugger::Attach)
-+      .SetMethod("isAttached", &Debugger::IsAttached)
-+      .SetMethod("detach", &Debugger::Detach)
-+      .SetMethod("sendCommand", &Debugger::SendCommand);
-+}
-+
-+void ClearWrapDebugger() {
-+  g_wrap_debugger.Reset();
-+}
-+
-+void SetWrapDebugger(const WrapDebuggerCallback& callback) {
-+  g_wrap_debugger = callback;
-+
-+  // Cleanup the wrapper on exit.
-+  electron::ElectronBrowserMainParts::Get()->RegisterDestructionCallback(
-+      base::Bind(ClearWrapDebugger));
-+}
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+namespace {
-+
-+void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
-+                v8::Local<v8::Context> context, void* priv) {
-+  v8::Isolate* isolate = context->GetIsolate();
-+  mate::Dictionary dict(isolate, exports);
-+  dict.SetMethod("_setWrapDebugger", &electron::api::SetWrapDebugger);
-+}
-+
-+}  // namespace
-+
-+NODE_MODULE_CONTEXT_AWARE_BUILTIN(electron_browser_debugger, Initialize);
-added in remote
-  their  100644 5822573d3b1fd06dcba088a990f1fb0537050c9a electron/browser/api/electron_api_debugger.h
-@@ -0,0 +1,75 @@
-+// Copyright (c) 2016 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_API_ELECTRON_API_DEBUGGER_H_
-+#define ELECTRON_BROWSER_API_ELECTRON_API_DEBUGGER_H_
-+
-+#include <map>
-+#include <string>
-+
-+#include "electron/browser/api/trackable_object.h"
-+#include "base/callback.h"
-+#include "base/values.h"
-+#include "content/public/browser/devtools_agent_host_client.h"
-+#include "native_mate/handle.h"
-+
-+namespace content {
-+class DevToolsAgentHost;
-+class WebContents;
-+}
-+
-+namespace mate {
-+class Arguments;
-+}
-+
-+namespace electron {
-+
-+namespace api {
-+
-+class Debugger: public mate::TrackableObject<Debugger>,
-+                public content::DevToolsAgentHostClient {
-+ public:
-+  using SendCommandCallback =
-+      base::Callback<void(const base::DictionaryValue&,
-+                          const base::DictionaryValue&)>;
-+
-+  static mate::Handle<Debugger> Create(
-+      v8::Isolate* isolate, content::WebContents* web_contents);
-+
-+  // mate::TrackableObject:
-+  static void BuildPrototype(v8::Isolate* isolate,
-+                             v8::Local<v8::ObjectTemplate> prototype);
-+
-+ protected:
-+  explicit Debugger(content::WebContents* web_contents);
-+  ~Debugger();
-+
-+  // content::DevToolsAgentHostClient:
-+  void AgentHostClosed(content::DevToolsAgentHost* agent_host,
-+                       bool replaced_with_another_client) override;
-+  void DispatchProtocolMessage(content::DevToolsAgentHost* agent_host,
-+                               const std::string& message) override;
-+
-+ private:
-+  using PendingRequestMap = std::map<int, SendCommandCallback>;
-+
-+  void Attach(mate::Arguments* args);
-+  bool IsAttached();
-+  void Detach();
-+  void SendCommand(mate::Arguments* args);
-+
-+  content::WebContents* web_contents_;  // Weak Reference.
-+  scoped_refptr<content::DevToolsAgentHost> agent_host_;
-+
-+  PendingRequestMap pending_requests_;
-+  int previous_request_id_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(Debugger);
-+};
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_API_ELECTRON_API_DEBUGGER_H_
-added in remote
-  their  100644 18c562e8951d0da6eb37f20b0a513e8c2be2a8b9 electron/browser/api/electron_api_desktop_capturer.cc
-@@ -0,0 +1,121 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/api/electron_api_desktop_capturer.h"
-+
-+#include "electron/common/api/electron_api_native_image.h"
-+#include "electron/common/native_mate_converters/gfx_converter.h"
-+#include "base/strings/utf_string_conversions.h"
-+#include "chrome/browser/media/desktop_media_list.h"
-+#include "native_mate/dictionary.h"
-+#include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h"
-+#include "third_party/webrtc/modules/desktop_capture/screen_capturer.h"
-+#include "third_party/webrtc/modules/desktop_capture/window_capturer.h"
-+
-+#include "electron/common/node_includes.h"
-+
-+namespace mate {
-+
-+template<>
-+struct Converter<DesktopMediaList::Source> {
-+  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-+                                   const DesktopMediaList::Source& source) {
-+    mate::Dictionary dict(isolate, v8::Object::New(isolate));
-+    content::DesktopMediaID id = source.id;
-+    dict.Set("name", base::UTF16ToUTF8(source.name));
-+    dict.Set("id", id.ToString());
-+    dict.Set(
-+        "thumbnail",
-+        electron::api::NativeImage::Create(isolate, gfx::Image(source.thumbnail)));
-+    return ConvertToV8(isolate, dict);
-+  }
-+};
-+
-+}  // namespace mate
-+
-+namespace electron {
-+
-+namespace api {
-+
-+DesktopCapturer::DesktopCapturer() {
-+}
-+
-+DesktopCapturer::~DesktopCapturer() {
-+}
-+
-+void DesktopCapturer::StartHandling(bool capture_window,
-+                                    bool capture_screen,
-+                                    const gfx::Size& thumbnail_size) {
-+  webrtc::DesktopCaptureOptions options =
-+      webrtc::DesktopCaptureOptions::CreateDefault();
-+
-+#if defined(OS_WIN)
-+  // On windows, desktop effects (e.g. Aero) will be disabled when the Desktop
-+  // capture API is active by default.
-+  // We keep the desktop effects in most times. Howerver, the screen still
-+  // fickers when the API is capturing the window due to limitation of current
-+  // implemetation. This is a known and wontFix issue in webrtc (see:
-+  // http://code.google.com/p/webrtc/issues/detail?id=3373)
-+  options.set_disable_effects(false);
-+#endif
-+
-+  scoped_ptr<webrtc::ScreenCapturer> screen_capturer(
-+      capture_screen ? webrtc::ScreenCapturer::Create(options) : nullptr);
-+  scoped_ptr<webrtc::WindowCapturer> window_capturer(
-+      capture_window ? webrtc::WindowCapturer::Create(options) : nullptr);
-+  media_list_.reset(new NativeDesktopMediaList(
-+      std::move(screen_capturer), std::move(window_capturer)));
-+
-+  media_list_->SetThumbnailSize(thumbnail_size);
-+  media_list_->StartUpdating(this);
-+}
-+
-+void DesktopCapturer::OnSourceAdded(int index) {
-+}
-+
-+void DesktopCapturer::OnSourceRemoved(int index) {
-+}
-+
-+void DesktopCapturer::OnSourceMoved(int old_index, int new_index) {
-+}
-+
-+void DesktopCapturer::OnSourceNameChanged(int index) {
-+}
-+
-+void DesktopCapturer::OnSourceThumbnailChanged(int index) {
-+}
-+
-+bool DesktopCapturer::OnRefreshFinished() {
-+  Emit("finished", media_list_->GetSources());
-+  media_list_.reset();
-+  return false;
-+}
-+
-+mate::ObjectTemplateBuilder DesktopCapturer::GetObjectTemplateBuilder(
-+      v8::Isolate* isolate) {
-+  return mate::ObjectTemplateBuilder(isolate)
-+      .SetMethod("startHandling", &DesktopCapturer::StartHandling);
-+}
-+
-+// static
-+mate::Handle<DesktopCapturer> DesktopCapturer::Create(v8::Isolate* isolate) {
-+  return mate::CreateHandle(isolate, new DesktopCapturer);
-+}
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+namespace {
-+
-+void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
-+                v8::Local<v8::Context> context, void* priv) {
-+  v8::Isolate* isolate = context->GetIsolate();
-+  mate::Dictionary dict(isolate, exports);
-+  dict.Set("desktopCapturer", electron::api::DesktopCapturer::Create(isolate));
-+}
-+
-+}  // namespace
-+
-+NODE_MODULE_CONTEXT_AWARE_BUILTIN(electron_browser_desktop_capturer, Initialize);
-added in remote
-  their  100644 c70348207224d0e370348d10cbe662cf3777dda9 electron/browser/api/electron_api_desktop_capturer.h
-@@ -0,0 +1,52 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_API_ELECTRON_API_DESKTOP_CAPTURER_H_
-+#define ELECTRON_BROWSER_API_ELECTRON_API_DESKTOP_CAPTURER_H_
-+
-+#include "electron/browser/api/event_emitter.h"
-+#include "chrome/browser/media/desktop_media_list_observer.h"
-+#include "chrome/browser/media/native_desktop_media_list.h"
-+#include "native_mate/handle.h"
-+
-+namespace electron {
-+
-+namespace api {
-+
-+class DesktopCapturer: public mate::EventEmitter,
-+                       public DesktopMediaListObserver {
-+ public:
-+  static mate::Handle<DesktopCapturer> Create(v8::Isolate* isolate);
-+
-+  void StartHandling(bool capture_window,
-+                     bool capture_screen,
-+                     const gfx::Size& thumbnail_size);
-+
-+ protected:
-+  DesktopCapturer();
-+  ~DesktopCapturer();
-+
-+  // DesktopMediaListObserver overrides.
-+  void OnSourceAdded(int index) override;
-+  void OnSourceRemoved(int index) override;
-+  void OnSourceMoved(int old_index, int new_index) override;
-+  void OnSourceNameChanged(int index) override;
-+  void OnSourceThumbnailChanged(int index) override;
-+  bool OnRefreshFinished() override;
-+
-+ private:
-+  // mate::Wrappable:
-+  mate::ObjectTemplateBuilder GetObjectTemplateBuilder(
-+      v8::Isolate* isolate) override;
-+
-+  scoped_ptr<DesktopMediaList> media_list_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(DesktopCapturer);
-+};
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_API_ELECTRON_API_DESKTOP_CAPTURER_H_
-added in remote
-  their  100644 61e362f0eb861141de4ca58dc2e45b8cd7e6b6b4 electron/browser/api/electron_api_dialog.cc
-@@ -0,0 +1,120 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include <string>
-+#include <utility>
-+#include <vector>
-+
-+#include "electron/browser/api/electron_api_window.h"
-+#include "electron/browser/native_window.h"
-+#include "electron/browser/ui/file_dialog.h"
-+#include "electron/browser/ui/message_box.h"
-+#include "electron/common/native_mate_converters/callback.h"
-+#include "electron/common/native_mate_converters/file_path_converter.h"
-+#include "electron/common/native_mate_converters/image_converter.h"
-+#include "native_mate/dictionary.h"
-+
-+#include "electron/common/node_includes.h"
-+
-+namespace mate {
-+
-+template<>
-+struct Converter<file_dialog::Filter> {
-+  static bool FromV8(v8::Isolate* isolate,
-+                     v8::Local<v8::Value> val,
-+                     file_dialog::Filter* out) {
-+    mate::Dictionary dict;
-+    if (!ConvertFromV8(isolate, val, &dict))
-+      return false;
-+    if (!dict.Get("name", &(out->first)))
-+      return false;
-+    if (!dict.Get("extensions", &(out->second)))
-+      return false;
-+    return true;
-+  }
-+};
-+
-+}  // namespace mate
-+
-+namespace {
-+
-+void ShowMessageBox(int type,
-+                    const std::vector<std::string>& buttons,
-+                    int default_id,
-+                    int cancel_id,
-+                    int options,
-+                    const std::string& title,
-+                    const std::string& message,
-+                    const std::string& detail,
-+                    const gfx::ImageSkia& icon,
-+                    electron::NativeWindow* window,
-+                    mate::Arguments* args) {
-+  v8::Local<v8::Value> peek = args->PeekNext();
-+  electron::MessageBoxCallback callback;
-+  if (mate::Converter<electron::MessageBoxCallback>::FromV8(args->isolate(),
-+                                                        peek,
-+                                                        &callback)) {
-+    electron::ShowMessageBox(window, (electron::MessageBoxType)type, buttons,
-+                         default_id, cancel_id, options, title,
-+                         message, detail, icon, callback);
-+  } else {
-+    int chosen = electron::ShowMessageBox(window, (electron::MessageBoxType)type,
-+                                      buttons, default_id, cancel_id,
-+                                      options, title, message, detail, icon);
-+    args->Return(chosen);
-+  }
-+}
-+
-+void ShowOpenDialog(const std::string& title,
-+                    const base::FilePath& default_path,
-+                    const file_dialog::Filters& filters,
-+                    int properties,
-+                    electron::NativeWindow* window,
-+                    mate::Arguments* args) {
-+  v8::Local<v8::Value> peek = args->PeekNext();
-+  file_dialog::OpenDialogCallback callback;
-+  if (mate::Converter<file_dialog::OpenDialogCallback>::FromV8(args->isolate(),
-+                                                               peek,
-+                                                               &callback)) {
-+    file_dialog::ShowOpenDialog(window, title, default_path, filters,
-+                                properties, callback);
-+  } else {
-+    std::vector<base::FilePath> paths;
-+    if (file_dialog::ShowOpenDialog(window, title, default_path, filters,
-+                                    properties, &paths))
-+      args->Return(paths);
-+  }
-+}
-+
-+void ShowSaveDialog(const std::string& title,
-+                    const base::FilePath& default_path,
-+                    const file_dialog::Filters& filters,
-+                    electron::NativeWindow* window,
-+                    mate::Arguments* args) {
-+  v8::Local<v8::Value> peek = args->PeekNext();
-+  file_dialog::SaveDialogCallback callback;
-+  if (mate::Converter<file_dialog::SaveDialogCallback>::FromV8(args->isolate(),
-+                                                               peek,
-+                                                               &callback)) {
-+    file_dialog::ShowSaveDialog(window, title, default_path, filters, callback);
-+  } else {
-+    base::FilePath path;
-+    if (file_dialog::ShowSaveDialog(window, title, default_path, filters,
-+                                    &path))
-+      args->Return(path);
-+  }
-+}
-+
-+void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
-+                v8::Local<v8::Context> context, void* priv) {
-+  mate::Dictionary dict(context->GetIsolate(), exports);
-+  dict.SetMethod("showMessageBox", &ShowMessageBox);
-+  dict.SetMethod("showErrorBox", &electron::ShowErrorBox);
-+  dict.SetMethod("showOpenDialog", &ShowOpenDialog);
-+  dict.SetMethod("showSaveDialog", &ShowSaveDialog);
-+}
-+
-+}  // namespace
-+
-+NODE_MODULE_CONTEXT_AWARE_BUILTIN(electron_browser_dialog, Initialize)
-added in remote
-  their  100644 7e6db9f7152cbe1c1e7f83d8c649eafdc2796ba6 electron/browser/api/electron_api_download_item.cc
-@@ -0,0 +1,212 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/api/electron_api_download_item.h"
-+
-+#include <map>
-+
-+#include "electron/browser/electron_browser_main_parts.h"
-+#include "electron/common/native_mate_converters/callback.h"
-+#include "electron/common/native_mate_converters/file_path_converter.h"
-+#include "electron/common/native_mate_converters/gurl_converter.h"
-+#include "electron/common/node_includes.h"
-+#include "base/memory/linked_ptr.h"
-+#include "base/message_loop/message_loop.h"
-+#include "base/strings/utf_string_conversions.h"
-+#include "native_mate/dictionary.h"
-+#include "net/base/filename_util.h"
-+
-+namespace mate {
-+
-+template<>
-+struct Converter<content::DownloadItem::DownloadState> {
-+  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-+                                   content::DownloadItem::DownloadState state) {
-+    std::string download_state;
-+    switch (state) {
-+      case content::DownloadItem::COMPLETE:
-+        download_state = "completed";
-+        break;
-+      case content::DownloadItem::CANCELLED:
-+        download_state = "cancelled";
-+        break;
-+      case content::DownloadItem::INTERRUPTED:
-+        download_state = "interrupted";
-+        break;
-+      default:
-+        break;
-+    }
-+    return ConvertToV8(isolate, download_state);
-+  }
-+};
-+
-+}  // namespace mate
-+
-+namespace electron {
-+
-+namespace api {
-+
-+namespace {
-+
-+// The wrapDownloadItem funtion which is implemented in JavaScript
-+using WrapDownloadItemCallback = base::Callback<void(v8::Local<v8::Value>)>;
-+WrapDownloadItemCallback g_wrap_download_item;
-+
-+std::map<uint32_t, linked_ptr<v8::Global<v8::Value>>> g_download_item_objects;
-+
-+}  // namespace
-+
-+DownloadItem::DownloadItem(content::DownloadItem* download_item)
-+    : download_item_(download_item) {
-+  download_item_->AddObserver(this);
-+  AttachAsUserData(download_item);
-+}
-+
-+DownloadItem::~DownloadItem() {
-+  if (download_item_) {
-+    // Destroyed by either garbage collection or destroy().
-+    download_item_->RemoveObserver(this);
-+    download_item_->Remove();
-+  }
-+
-+  // Remove from the global map.
-+  auto iter = g_download_item_objects.find(weak_map_id());
-+  if (iter != g_download_item_objects.end())
-+    g_download_item_objects.erase(iter);
-+}
-+
-+void DownloadItem::OnDownloadUpdated(content::DownloadItem* item) {
-+  if (download_item_->IsDone()) {
-+    Emit("done", item->GetState());
-+
-+    // Destroy the item once item is downloaded.
-+    base::MessageLoop::current()->PostTask(FROM_HERE, GetDestroyClosure());
-+  } else {
-+    Emit("updated");
-+  }
-+}
-+
-+void DownloadItem::OnDownloadDestroyed(content::DownloadItem* download_item) {
-+  download_item_ = nullptr;
-+  // Destroy the native class immediately when downloadItem is destroyed.
-+  delete this;
-+}
-+
-+void DownloadItem::Pause() {
-+  download_item_->Pause();
-+}
-+
-+void DownloadItem::Resume() {
-+  download_item_->Resume();
-+}
-+
-+void DownloadItem::Cancel() {
-+  download_item_->Cancel(true);
-+  download_item_->Remove();
-+}
-+
-+int64_t DownloadItem::GetReceivedBytes() const {
-+  return download_item_->GetReceivedBytes();
-+}
-+
-+int64_t DownloadItem::GetTotalBytes() const {
-+  return download_item_->GetTotalBytes();
-+}
-+
-+std::string DownloadItem::GetMimeType() const {
-+  return download_item_->GetMimeType();
-+}
-+
-+bool DownloadItem::HasUserGesture() const {
-+  return download_item_->HasUserGesture();
-+}
-+
-+std::string DownloadItem::GetFilename() const {
-+  return base::UTF16ToUTF8(net::GenerateFileName(GetURL(),
-+                           GetContentDisposition(),
-+                           std::string(),
-+                           download_item_->GetSuggestedFilename(),
-+                           GetMimeType(),
-+                           std::string()).LossyDisplayName());
-+}
-+
-+std::string DownloadItem::GetContentDisposition() const {
-+  return download_item_->GetContentDisposition();
-+}
-+
-+const GURL& DownloadItem::GetURL() const {
-+  return download_item_->GetURL();
-+}
-+
-+void DownloadItem::SetSavePath(const base::FilePath& path) {
-+  save_path_ = path;
-+}
-+
-+base::FilePath DownloadItem::GetSavePath() const {
-+  return save_path_;
-+}
-+
-+// static
-+void DownloadItem::BuildPrototype(v8::Isolate* isolate,
-+                                  v8::Local<v8::ObjectTemplate> prototype) {
-+  mate::ObjectTemplateBuilder(isolate, prototype)
-+      .MakeDestroyable()
-+      .SetMethod("pause", &DownloadItem::Pause)
-+      .SetMethod("resume", &DownloadItem::Resume)
-+      .SetMethod("cancel", &DownloadItem::Cancel)
-+      .SetMethod("getReceivedBytes", &DownloadItem::GetReceivedBytes)
-+      .SetMethod("getTotalBytes", &DownloadItem::GetTotalBytes)
-+      .SetMethod("getMimeType", &DownloadItem::GetMimeType)
-+      .SetMethod("hasUserGesture", &DownloadItem::HasUserGesture)
-+      .SetMethod("getFilename", &DownloadItem::GetFilename)
-+      .SetMethod("getContentDisposition", &DownloadItem::GetContentDisposition)
-+      .SetMethod("getURL", &DownloadItem::GetURL)
-+      .SetMethod("setSavePath", &DownloadItem::SetSavePath)
-+      .SetMethod("getSavePath", &DownloadItem::GetSavePath);
-+}
-+
-+// static
-+mate::Handle<DownloadItem> DownloadItem::Create(
-+    v8::Isolate* isolate, content::DownloadItem* item) {
-+  auto existing = TrackableObject::FromWrappedClass(isolate, item);
-+  if (existing)
-+    return mate::CreateHandle(isolate, static_cast<DownloadItem*>(existing));
-+
-+  auto handle = mate::CreateHandle(isolate, new DownloadItem(item));
-+  g_wrap_download_item.Run(handle.ToV8());
-+
-+  // Reference this object in case it got garbage collected.
-+  g_download_item_objects[handle->weak_map_id()] = make_linked_ptr(
-+      new v8::Global<v8::Value>(isolate, handle.ToV8()));
-+  return handle;
-+}
-+
-+void ClearWrapDownloadItem() {
-+  g_wrap_download_item.Reset();
-+}
-+
-+void SetWrapDownloadItem(const WrapDownloadItemCallback& callback) {
-+  g_wrap_download_item = callback;
-+
-+  // Cleanup the wrapper on exit.
-+  electron::ElectronBrowserMainParts::Get()->RegisterDestructionCallback(
-+      base::Bind(ClearWrapDownloadItem));
-+}
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+namespace {
-+
-+void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
-+                v8::Local<v8::Context> context, void* priv) {
-+  v8::Isolate* isolate = context->GetIsolate();
-+  mate::Dictionary dict(isolate, exports);
-+  dict.SetMethod("_setWrapDownloadItem", &electron::api::SetWrapDownloadItem);
-+}
-+
-+}  // namespace
-+
-+NODE_MODULE_CONTEXT_AWARE_BUILTIN(electron_browser_download_item, Initialize);
-added in remote
-  their  100644 d9afc825c22553224e5865f7171bbfc490cb3f78 electron/browser/api/electron_api_download_item.h
-@@ -0,0 +1,62 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_API_ELECTRON_API_DOWNLOAD_ITEM_H_
-+#define ELECTRON_BROWSER_API_ELECTRON_API_DOWNLOAD_ITEM_H_
-+
-+#include <string>
-+
-+#include "electron/browser/api/trackable_object.h"
-+#include "base/files/file_path.h"
-+#include "content/public/browser/download_item.h"
-+#include "native_mate/handle.h"
-+#include "url/gurl.h"
-+
-+namespace electron {
-+
-+namespace api {
-+
-+class DownloadItem : public mate::TrackableObject<DownloadItem>,
-+                     public content::DownloadItem::Observer {
-+ public:
-+  static mate::Handle<DownloadItem> Create(v8::Isolate* isolate,
-+                                           content::DownloadItem* item);
-+
-+  // mate::TrackableObject:
-+  static void BuildPrototype(v8::Isolate* isolate,
-+                             v8::Local<v8::ObjectTemplate> prototype);
-+
-+  void Pause();
-+  void Resume();
-+  void Cancel();
-+  int64_t GetReceivedBytes() const;
-+  int64_t GetTotalBytes() const;
-+  std::string GetMimeType() const;
-+  bool HasUserGesture() const;
-+  std::string GetFilename() const;
-+  std::string GetContentDisposition() const;
-+  const GURL& GetURL() const;
-+  void SetSavePath(const base::FilePath& path);
-+  base::FilePath GetSavePath() const;
-+
-+ protected:
-+  explicit DownloadItem(content::DownloadItem* download_item);
-+  ~DownloadItem();
-+
-+  // Override content::DownloadItem::Observer methods
-+  void OnDownloadUpdated(content::DownloadItem* download) override;
-+  void OnDownloadDestroyed(content::DownloadItem* download) override;
-+
-+ private:
-+  base::FilePath save_path_;
-+  content::DownloadItem* download_item_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(DownloadItem);
-+};
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_API_ELECTRON_API_DOWNLOAD_ITEM_H_
-added in remote
-  their  100644 d2be70b1a5f282279671d8864f864e9712bcb955 electron/browser/api/electron_api_global_shortcut.cc
-@@ -0,0 +1,98 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/api/electron_api_global_shortcut.h"
-+
-+#include <string>
-+
-+#include "electron/common/native_mate_converters/accelerator_converter.h"
-+#include "electron/common/native_mate_converters/callback.h"
-+#include "base/stl_util.h"
-+#include "native_mate/dictionary.h"
-+
-+#include "electron/common/node_includes.h"
-+
-+using extensions::GlobalShortcutListener;
-+
-+namespace electron {
-+
-+namespace api {
-+
-+GlobalShortcut::GlobalShortcut() {
-+}
-+
-+GlobalShortcut::~GlobalShortcut() {
-+  UnregisterAll();
-+}
-+
-+void GlobalShortcut::OnKeyPressed(const ui::Accelerator& accelerator) {
-+  if (accelerator_callback_map_.find(accelerator) ==
-+      accelerator_callback_map_.end()) {
-+    // This should never occur, because if it does, GlobalGlobalShortcutListener
-+    // notifes us with wrong accelerator.
-+    NOTREACHED();
-+    return;
-+  }
-+  accelerator_callback_map_[accelerator].Run();
-+}
-+
-+bool GlobalShortcut::Register(const ui::Accelerator& accelerator,
-+                              const base::Closure& callback) {
-+  if (!GlobalShortcutListener::GetInstance()->RegisterAccelerator(
-+      accelerator, this)) {
-+    return false;
-+  }
-+
-+  accelerator_callback_map_[accelerator] = callback;
-+  return true;
-+}
-+
-+void GlobalShortcut::Unregister(const ui::Accelerator& accelerator) {
-+  if (!ContainsKey(accelerator_callback_map_, accelerator))
-+    return;
-+
-+  accelerator_callback_map_.erase(accelerator);
-+  GlobalShortcutListener::GetInstance()->UnregisterAccelerator(
-+      accelerator, this);
-+}
-+
-+bool GlobalShortcut::IsRegistered(const ui::Accelerator& accelerator) {
-+  return ContainsKey(accelerator_callback_map_, accelerator);
-+}
-+
-+void GlobalShortcut::UnregisterAll() {
-+  accelerator_callback_map_.clear();
-+  GlobalShortcutListener::GetInstance()->UnregisterAccelerators(this);
-+}
-+
-+mate::ObjectTemplateBuilder GlobalShortcut::GetObjectTemplateBuilder(
-+    v8::Isolate* isolate) {
-+  return mate::ObjectTemplateBuilder(isolate)
-+      .SetMethod("register", &GlobalShortcut::Register)
-+      .SetMethod("isRegistered", &GlobalShortcut::IsRegistered)
-+      .SetMethod("unregister", &GlobalShortcut::Unregister)
-+      .SetMethod("unregisterAll", &GlobalShortcut::UnregisterAll);
-+}
-+
-+// static
-+mate::Handle<GlobalShortcut> GlobalShortcut::Create(v8::Isolate* isolate) {
-+  return CreateHandle(isolate, new GlobalShortcut);
-+}
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+namespace {
-+
-+void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
-+                v8::Local<v8::Context> context, void* priv) {
-+  v8::Isolate* isolate = context->GetIsolate();
-+  mate::Dictionary dict(isolate, exports);
-+  dict.Set("globalShortcut", electron::api::GlobalShortcut::Create(isolate));
-+}
-+
-+}  // namespace
-+
-+NODE_MODULE_CONTEXT_AWARE_BUILTIN(electron_browser_global_shortcut, Initialize)
-added in remote
-  their  100644 48021f8fd15833886e717d0fc435e5428a78b9a4 electron/browser/api/electron_api_global_shortcut.h
-@@ -0,0 +1,55 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_API_ELECTRON_API_GLOBAL_SHORTCUT_H_
-+#define ELECTRON_BROWSER_API_ELECTRON_API_GLOBAL_SHORTCUT_H_
-+
-+#include <map>
-+#include <string>
-+
-+#include "electron/browser/api/trackable_object.h"
-+#include "base/callback.h"
-+#include "chrome/browser/extensions/global_shortcut_listener.h"
-+#include "native_mate/handle.h"
-+#include "ui/base/accelerators/accelerator.h"
-+
-+namespace electron {
-+
-+namespace api {
-+
-+class GlobalShortcut : public extensions::GlobalShortcutListener::Observer,
-+                       public mate::TrackableObject<GlobalShortcut> {
-+ public:
-+  static mate::Handle<GlobalShortcut> Create(v8::Isolate* isolate);
-+
-+ protected:
-+  GlobalShortcut();
-+  ~GlobalShortcut() override;
-+
-+  // mate::Wrappable implementations:
-+  mate::ObjectTemplateBuilder GetObjectTemplateBuilder(
-+      v8::Isolate* isolate) override;
-+
-+ private:
-+  typedef std::map<ui::Accelerator, base::Closure> AcceleratorCallbackMap;
-+
-+  bool Register(const ui::Accelerator& accelerator,
-+                const base::Closure& callback);
-+  bool IsRegistered(const ui::Accelerator& accelerator);
-+  void Unregister(const ui::Accelerator& accelerator);
-+  void UnregisterAll();
-+
-+  // GlobalShortcutListener::Observer implementation.
-+  void OnKeyPressed(const ui::Accelerator& accelerator) override;
-+
-+  AcceleratorCallbackMap accelerator_callback_map_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(GlobalShortcut);
-+};
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_API_ELECTRON_API_GLOBAL_SHORTCUT_H_
-added in remote
-  their  100644 6e2a3c3f80f176e7673b12b7d44640419db149de electron/browser/api/electron_api_menu.cc
-@@ -0,0 +1,199 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/api/electron_api_menu.h"
-+
-+#include "electron/browser/native_window.h"
-+#include "electron/common/native_mate_converters/accelerator_converter.h"
-+#include "electron/common/native_mate_converters/callback.h"
-+#include "electron/common/native_mate_converters/image_converter.h"
-+#include "electron/common/native_mate_converters/string16_converter.h"
-+#include "native_mate/constructor.h"
-+#include "native_mate/dictionary.h"
-+#include "native_mate/object_template_builder.h"
-+
-+#include "electron/common/node_includes.h"
-+
-+namespace electron {
-+
-+namespace api {
-+
-+Menu::Menu()
-+    : model_(new ElectronMenuModel(this)),
-+      parent_(NULL) {
-+}
-+
-+Menu::~Menu() {
-+}
-+
-+void Menu::AfterInit(v8::Isolate* isolate) {
-+  mate::Dictionary wrappable(isolate, GetWrapper(isolate));
-+  mate::Dictionary delegate;
-+  if (!wrappable.Get("delegate", &delegate))
-+    return;
-+
-+  delegate.Get("isCommandIdChecked", &is_checked_);
-+  delegate.Get("isCommandIdEnabled", &is_enabled_);
-+  delegate.Get("isCommandIdVisible", &is_visible_);
-+  delegate.Get("getAcceleratorForCommandId", &get_accelerator_);
-+  delegate.Get("executeCommand", &execute_command_);
-+  delegate.Get("menuWillShow", &menu_will_show_);
-+}
-+
-+bool Menu::IsCommandIdChecked(int command_id) const {
-+  return is_checked_.Run(command_id);
-+}
-+
-+bool Menu::IsCommandIdEnabled(int command_id) const {
-+  return is_enabled_.Run(command_id);
-+}
-+
-+bool Menu::IsCommandIdVisible(int command_id) const {
-+  return is_visible_.Run(command_id);
-+}
-+
-+bool Menu::GetAcceleratorForCommandId(int command_id,
-+                                      ui::Accelerator* accelerator) {
-+  v8::Locker locker(isolate());
-+  v8::HandleScope handle_scope(isolate());
-+  v8::Local<v8::Value> val = get_accelerator_.Run(command_id);
-+  return mate::ConvertFromV8(isolate(), val, accelerator);
-+}
-+
-+void Menu::ExecuteCommand(int command_id, int event_flags) {
-+  execute_command_.Run(command_id);
-+}
-+
-+void Menu::MenuWillShow(ui::SimpleMenuModel* source) {
-+  menu_will_show_.Run();
-+}
-+
-+void Menu::InsertItemAt(
-+    int index, int command_id, const base::string16& label) {
-+  model_->InsertItemAt(index, command_id, label);
-+}
-+
-+void Menu::InsertSeparatorAt(int index) {
-+  model_->InsertSeparatorAt(index, ui::NORMAL_SEPARATOR);
-+}
-+
-+void Menu::InsertCheckItemAt(int index,
-+                             int command_id,
-+                             const base::string16& label) {
-+  model_->InsertCheckItemAt(index, command_id, label);
-+}
-+
-+void Menu::InsertRadioItemAt(int index,
-+                             int command_id,
-+                             const base::string16& label,
-+                             int group_id) {
-+  model_->InsertRadioItemAt(index, command_id, label, group_id);
-+}
-+
-+void Menu::InsertSubMenuAt(int index,
-+                           int command_id,
-+                           const base::string16& label,
-+                           Menu* menu) {
-+  menu->parent_ = this;
-+  model_->InsertSubMenuAt(index, command_id, label, menu->model_.get());
-+}
-+
-+void Menu::SetIcon(int index, const gfx::Image& image) {
-+  model_->SetIcon(index, image);
-+}
-+
-+void Menu::SetSublabel(int index, const base::string16& sublabel) {
-+  model_->SetSublabel(index, sublabel);
-+}
-+
-+void Menu::SetRole(int index, const base::string16& role) {
-+  model_->SetRole(index, role);
-+}
-+
-+void Menu::Clear() {
-+  model_->Clear();
-+}
-+
-+int Menu::GetIndexOfCommandId(int command_id) {
-+  return model_->GetIndexOfCommandId(command_id);
-+}
-+
-+int Menu::GetItemCount() const {
-+  return model_->GetItemCount();
-+}
-+
-+int Menu::GetCommandIdAt(int index) const {
-+  return model_->GetCommandIdAt(index);
-+}
-+
-+base::string16 Menu::GetLabelAt(int index) const {
-+  return model_->GetLabelAt(index);
-+}
-+
-+base::string16 Menu::GetSublabelAt(int index) const {
-+  return model_->GetSublabelAt(index);
-+}
-+
-+bool Menu::IsItemCheckedAt(int index) const {
-+  return model_->IsItemCheckedAt(index);
-+}
-+
-+bool Menu::IsEnabledAt(int index) const {
-+  return model_->IsEnabledAt(index);
-+}
-+
-+bool Menu::IsVisibleAt(int index) const {
-+  return model_->IsVisibleAt(index);
-+}
-+
-+// static
-+void Menu::BuildPrototype(v8::Isolate* isolate,
-+                          v8::Local<v8::ObjectTemplate> prototype) {
-+  mate::ObjectTemplateBuilder(isolate, prototype)
-+      .MakeDestroyable()
-+      .SetMethod("insertItem", &Menu::InsertItemAt)
-+      .SetMethod("insertCheckItem", &Menu::InsertCheckItemAt)
-+      .SetMethod("insertRadioItem", &Menu::InsertRadioItemAt)
-+      .SetMethod("insertSeparator", &Menu::InsertSeparatorAt)
-+      .SetMethod("insertSubMenu", &Menu::InsertSubMenuAt)
-+      .SetMethod("setIcon", &Menu::SetIcon)
-+      .SetMethod("setSublabel", &Menu::SetSublabel)
-+      .SetMethod("setRole", &Menu::SetRole)
-+      .SetMethod("clear", &Menu::Clear)
-+      .SetMethod("getIndexOfCommandId", &Menu::GetIndexOfCommandId)
-+      .SetMethod("getItemCount", &Menu::GetItemCount)
-+      .SetMethod("getCommandIdAt", &Menu::GetCommandIdAt)
-+      .SetMethod("getLabelAt", &Menu::GetLabelAt)
-+      .SetMethod("getSublabelAt", &Menu::GetSublabelAt)
-+      .SetMethod("isItemCheckedAt", &Menu::IsItemCheckedAt)
-+      .SetMethod("isEnabledAt", &Menu::IsEnabledAt)
-+      .SetMethod("isVisibleAt", &Menu::IsVisibleAt)
-+      .SetMethod("popupAt", &Menu::PopupAt);
-+}
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+
-+namespace {
-+
-+void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
-+                v8::Local<v8::Context> context, void* priv) {
-+  using electron::api::Menu;
-+  v8::Isolate* isolate = context->GetIsolate();
-+  v8::Local<v8::Function> constructor = mate::CreateConstructor<Menu>(
-+      isolate, "Menu", base::Bind(&Menu::Create));
-+  mate::Dictionary dict(isolate, exports);
-+  dict.Set("Menu", static_cast<v8::Local<v8::Value>>(constructor));
-+#if defined(OS_MACOSX)
-+  dict.SetMethod("setApplicationMenu", &Menu::SetApplicationMenu);
-+  dict.SetMethod("sendActionToFirstResponder",
-+                 &Menu::SendActionToFirstResponder);
-+#endif
-+}
-+
-+}  // namespace
-+
-+NODE_MODULE_CONTEXT_AWARE_BUILTIN(electron_browser_menu, Initialize)
-added in remote
-  their  100644 91ecb49688edb4df91d2741681156b10aa2452ad electron/browser/api/electron_api_menu.h
-@@ -0,0 +1,126 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_API_ELECTRON_API_MENU_H_
-+#define ELECTRON_BROWSER_API_ELECTRON_API_MENU_H_
-+
-+#include <string>
-+
-+#include "electron/browser/api/electron_api_window.h"
-+#include "electron/browser/api/trackable_object.h"
-+#include "electron/browser/ui/electron_menu_model.h"
-+#include "base/callback.h"
-+#include "base/memory/scoped_ptr.h"
-+
-+namespace electron {
-+
-+namespace api {
-+
-+class Menu : public mate::TrackableObject<Menu>,
-+             public ElectronMenuModel::Delegate {
-+ public:
-+  static mate::Wrappable* Create();
-+
-+  static void BuildPrototype(v8::Isolate* isolate,
-+                             v8::Local<v8::ObjectTemplate> prototype);
-+
-+#if defined(OS_MACOSX)
-+  // Set the global menubar.
-+  static void SetApplicationMenu(Menu* menu);
-+
-+  // Fake sending an action from the application menu.
-+  static void SendActionToFirstResponder(const std::string& action);
-+#endif
-+
-+  ElectronMenuModel* model() const { return model_.get(); }
-+
-+ protected:
-+  Menu();
-+  ~Menu() override;
-+
-+  // mate::Wrappable:
-+  void AfterInit(v8::Isolate* isolate) override;
-+
-+  // ui::SimpleMenuModel::Delegate:
-+  bool IsCommandIdChecked(int command_id) const override;
-+  bool IsCommandIdEnabled(int command_id) const override;
-+  bool IsCommandIdVisible(int command_id) const override;
-+  bool GetAcceleratorForCommandId(int command_id,
-+                                  ui::Accelerator* accelerator) override;
-+  void ExecuteCommand(int command_id, int event_flags) override;
-+  void MenuWillShow(ui::SimpleMenuModel* source) override;
-+
-+  virtual void PopupAt(Window* window,
-+                       int x = -1, int y = -1,
-+                       int positioning_item = 0) = 0;
-+
-+  scoped_ptr<ElectronMenuModel> model_;
-+  Menu* parent_;
-+
-+ private:
-+  void InsertItemAt(int index, int command_id, const base::string16& label);
-+  void InsertSeparatorAt(int index);
-+  void InsertCheckItemAt(int index,
-+                         int command_id,
-+                         const base::string16& label);
-+  void InsertRadioItemAt(int index,
-+                         int command_id,
-+                         const base::string16& label,
-+                         int group_id);
-+  void InsertSubMenuAt(int index,
-+                       int command_id,
-+                       const base::string16& label,
-+                       Menu* menu);
-+  void SetIcon(int index, const gfx::Image& image);
-+  void SetSublabel(int index, const base::string16& sublabel);
-+  void SetRole(int index, const base::string16& role);
-+  void Clear();
-+  int GetIndexOfCommandId(int command_id);
-+  int GetItemCount() const;
-+  int GetCommandIdAt(int index) const;
-+  base::string16 GetLabelAt(int index) const;
-+  base::string16 GetSublabelAt(int index) const;
-+  bool IsItemCheckedAt(int index) const;
-+  bool IsEnabledAt(int index) const;
-+  bool IsVisibleAt(int index) const;
-+
-+  // Stored delegate methods.
-+  base::Callback<bool(int)> is_checked_;
-+  base::Callback<bool(int)> is_enabled_;
-+  base::Callback<bool(int)> is_visible_;
-+  base::Callback<v8::Local<v8::Value>(int)> get_accelerator_;
-+  base::Callback<void(int)> execute_command_;
-+  base::Callback<void()> menu_will_show_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(Menu);
-+};
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+
-+namespace mate {
-+
-+template<>
-+struct Converter<electron::ElectronMenuModel*> {
-+  static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
-+                     electron::ElectronMenuModel** out) {
-+    // null would be tranfered to NULL.
-+    if (val->IsNull()) {
-+      *out = nullptr;
-+      return true;
-+    }
-+
-+    electron::api::Menu* menu;
-+    if (!Converter<electron::api::Menu*>::FromV8(isolate, val, &menu))
-+      return false;
-+    *out = menu->model();
-+    return true;
-+  }
-+};
-+
-+}  // namespace mate
-+
-+#endif  // ELECTRON_BROWSER_API_ELECTRON_API_MENU_H_
-added in remote
-  their  100644 73bcdfb949a28820a28c0a4112474125e2e996a9 electron/browser/api/electron_api_menu_mac.h
-@@ -0,0 +1,38 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_API_ELECTRON_API_MENU_MAC_H_
-+#define ELECTRON_BROWSER_API_ELECTRON_API_MENU_MAC_H_
-+
-+#include "electron/browser/api/electron_api_menu.h"
-+
-+#include <string>
-+
-+#import "electron/browser/ui/cocoa/electron_menu_controller.h"
-+
-+namespace electron {
-+
-+namespace api {
-+
-+class MenuMac : public Menu {
-+ protected:
-+  MenuMac();
-+
-+  void PopupAt(Window* window, int x, int y, int positioning_item = 0) override;
-+
-+  base::scoped_nsobject<ElectronMenuController> menu_controller_;
-+
-+ private:
-+  friend class Menu;
-+
-+  static void SendActionToFirstResponder(const std::string& action);
-+
-+  DISALLOW_COPY_AND_ASSIGN(MenuMac);
-+};
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_API_ELECTRON_API_MENU_MAC_H_
-added in remote
-  their  100644 9999b30b934569227fc9a4d9eb11ca33bdd13126 electron/browser/api/electron_api_menu_mac.mm
-@@ -0,0 +1,77 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#import "electron/browser/api/electron_api_menu_mac.h"
-+
-+#include "electron/browser/native_window.h"
-+#include "base/message_loop/message_loop.h"
-+#include "base/strings/sys_string_conversions.h"
-+#include "content/public/browser/web_contents.h"
-+
-+#include "electron/common/node_includes.h"
-+
-+namespace electron {
-+
-+namespace api {
-+
-+MenuMac::MenuMac() {
-+}
-+
-+void MenuMac::PopupAt(Window* window, int x, int y, int positioning_item) {
-+  NativeWindow* native_window = window->window();
-+  if (!native_window)
-+    return;
-+  content::WebContents* web_contents = native_window->web_contents();
-+  if (!web_contents)
-+    return;
-+
-+  base::scoped_nsobject<ElectronMenuController> menu_controller(
-+      [[ElectronMenuController alloc] initWithModel:model_.get()]);
-+  NSMenu* menu = [menu_controller menu];
-+  NSView* view = web_contents->GetContentNativeView();
-+
-+  // Which menu item to show.
-+  NSMenuItem* item = nil;
-+  if (positioning_item < [menu numberOfItems] && positioning_item >= 0)
-+    item = [menu itemAtIndex:positioning_item];
-+
-+  // (-1, -1) means showing on mouse location.
-+  NSPoint position;
-+  if (x == -1 || y == -1) {
-+    NSWindow* nswindow = native_window->GetNativeWindow();
-+    position = [view convertPoint:[nswindow mouseLocationOutsideOfEventStream]
-+                         fromView:nil];
-+  } else {
-+    position = NSMakePoint(x, [view frame].size.height - y);
-+  }
-+
-+  // Show the menu.
-+  [menu popUpMenuPositioningItem:item atLocation:position inView:view];
-+}
-+
-+// static
-+void Menu::SetApplicationMenu(Menu* base_menu) {
-+  MenuMac* menu = static_cast<MenuMac*>(base_menu);
-+  base::scoped_nsobject<ElectronMenuController> menu_controller(
-+      [[ElectronMenuController alloc] initWithModel:menu->model_.get()]);
-+  [NSApp setMainMenu:[menu_controller menu]];
-+
-+  // Ensure the menu_controller_ is destroyed after main menu is set.
-+  menu_controller.swap(menu->menu_controller_);
-+}
-+
-+// static
-+void Menu::SendActionToFirstResponder(const std::string& action) {
-+  SEL selector = NSSelectorFromString(base::SysUTF8ToNSString(action));
-+  [NSApp sendAction:selector to:nil from:[NSApp mainMenu]];
-+}
-+
-+// static
-+mate::Wrappable* Menu::Create() {
-+  return new MenuMac();
-+}
-+
-+}  // namespace api
-+
-+}  // namespace electron
-added in remote
-  their  100644 1efa598d415ca0a311cae33e1ac80e1fdf28a1ea electron/browser/api/electron_api_menu_views.cc
-@@ -0,0 +1,58 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/api/electron_api_menu_views.h"
-+
-+#include "electron/browser/native_window_views.h"
-+#include "content/public/browser/render_widget_host_view.h"
-+#include "ui/gfx/screen.h"
-+#include "ui/views/controls/menu/menu_runner.h"
-+
-+namespace electron {
-+
-+namespace api {
-+
-+MenuViews::MenuViews() {
-+}
-+
-+void MenuViews::PopupAt(Window* window, int x, int y, int positioning_item) {
-+  NativeWindow* native_window = static_cast<NativeWindow*>(window->window());
-+  if (!native_window)
-+    return;
-+  content::WebContents* web_contents = native_window->web_contents();
-+  if (!web_contents)
-+    return;
-+  content::RenderWidgetHostView* view = web_contents->GetRenderWidgetHostView();
-+  if (!view)
-+    return;
-+
-+  // (-1, -1) means showing on mouse location.
-+  gfx::Point location;
-+  if (x == -1 || y == -1) {
-+    location = gfx::Screen::GetNativeScreen()->GetCursorScreenPoint();
-+  } else {
-+    gfx::Point origin = view->GetViewBounds().origin();
-+    location = gfx::Point(origin.x() + x, origin.y() + y);
-+  }
-+
-+  // Show the menu.
-+  views::MenuRunner menu_runner(
-+      model(),
-+      views::MenuRunner::CONTEXT_MENU | views::MenuRunner::HAS_MNEMONICS);
-+  ignore_result(menu_runner.RunMenuAt(
-+      static_cast<NativeWindowViews*>(window->window())->widget(),
-+      NULL,
-+      gfx::Rect(location, gfx::Size()),
-+      views::MENU_ANCHOR_TOPLEFT,
-+      ui::MENU_SOURCE_MOUSE));
-+}
-+
-+// static
-+mate::Wrappable* Menu::Create() {
-+  return new MenuViews();
-+}
-+
-+}  // namespace api
-+
-+}  // namespace electron
-added in remote
-  their  100644 be42d0abb557e067d4c17dfa74e30330084238d8 electron/browser/api/electron_api_menu_views.h
-@@ -0,0 +1,30 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_API_ELECTRON_API_MENU_VIEWS_H_
-+#define ELECTRON_BROWSER_API_ELECTRON_API_MENU_VIEWS_H_
-+
-+#include "electron/browser/api/electron_api_menu.h"
-+#include "ui/gfx/screen.h"
-+
-+namespace electron {
-+
-+namespace api {
-+
-+class MenuViews : public Menu {
-+ public:
-+  MenuViews();
-+
-+ protected:
-+  void PopupAt(Window* window, int x, int y, int positioning_item = 0) override;
-+
-+ private:
-+  DISALLOW_COPY_AND_ASSIGN(MenuViews);
-+};
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_API_ELECTRON_API_MENU_VIEWS_H_
-added in remote
-  their  100644 84fd7a55e005b81d4fa89a6edf2cd09580e1be43 electron/browser/api/electron_api_power_monitor.cc
-@@ -0,0 +1,73 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/api/electron_api_power_monitor.h"
-+
-+#include "electron/browser/browser.h"
-+#include "electron/common/node_includes.h"
-+#include "base/power_monitor/power_monitor.h"
-+#include "base/power_monitor/power_monitor_device_source.h"
-+#include "native_mate/dictionary.h"
-+
-+namespace electron {
-+
-+namespace api {
-+
-+PowerMonitor::PowerMonitor() {
-+  base::PowerMonitor::Get()->AddObserver(this);
-+}
-+
-+PowerMonitor::~PowerMonitor() {
-+  base::PowerMonitor::Get()->RemoveObserver(this);
-+}
-+
-+void PowerMonitor::OnPowerStateChange(bool on_battery_power) {
-+  if (on_battery_power)
-+    Emit("on-battery");
-+  else
-+    Emit("on-ac");
-+}
-+
-+void PowerMonitor::OnSuspend() {
-+  Emit("suspend");
-+}
-+
-+void PowerMonitor::OnResume() {
-+  Emit("resume");
-+}
-+
-+// static
-+v8::Local<v8::Value> PowerMonitor::Create(v8::Isolate* isolate) {
-+  if (!Browser::Get()->is_ready()) {
-+    isolate->ThrowException(v8::Exception::Error(mate::StringToV8(
-+        isolate,
-+        "Cannot initialize \"power-monitor\" module before app is ready")));
-+    return v8::Null(isolate);
-+  }
-+
-+  return CreateHandle(isolate, new PowerMonitor).ToV8();
-+}
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+
-+namespace {
-+
-+void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
-+                v8::Local<v8::Context> context, void* priv) {
-+#if defined(OS_MACOSX)
-+  base::PowerMonitorDeviceSource::AllocateSystemIOPorts();
-+#endif
-+
-+  using electron::api::PowerMonitor;
-+  v8::Isolate* isolate = context->GetIsolate();
-+  mate::Dictionary dict(isolate, exports);
-+  dict.Set("powerMonitor", PowerMonitor::Create(isolate));
-+}
-+
-+}  // namespace
-+
-+NODE_MODULE_CONTEXT_AWARE_BUILTIN(electron_browser_power_monitor, Initialize)
-added in remote
-  their  100644 1ed381df5b42bdea0c280a425895f8a294ac5271 electron/browser/api/electron_api_power_monitor.h
-@@ -0,0 +1,39 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_API_ELECTRON_API_POWER_MONITOR_H_
-+#define ELECTRON_BROWSER_API_ELECTRON_API_POWER_MONITOR_H_
-+
-+#include "electron/browser/api/trackable_object.h"
-+#include "base/compiler_specific.h"
-+#include "base/power_monitor/power_observer.h"
-+#include "native_mate/handle.h"
-+
-+namespace electron {
-+
-+namespace api {
-+
-+class PowerMonitor : public mate::TrackableObject<PowerMonitor>,
-+                     public base::PowerObserver {
-+ public:
-+  static v8::Local<v8::Value> Create(v8::Isolate* isolate);
-+
-+ protected:
-+  PowerMonitor();
-+  ~PowerMonitor() override;
-+
-+  // base::PowerObserver implementations:
-+  void OnPowerStateChange(bool on_battery_power) override;
-+  void OnSuspend() override;
-+  void OnResume() override;
-+
-+ private:
-+  DISALLOW_COPY_AND_ASSIGN(PowerMonitor);
-+};
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_API_ELECTRON_API_POWER_MONITOR_H_
-added in remote
-  their  100644 eb422da50a2f613bd41f18cde438a6028d15c992 electron/browser/api/electron_api_power_save_blocker.cc
-@@ -0,0 +1,128 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/api/electron_api_power_save_blocker.h"
-+
-+#include <string>
-+
-+#include "electron/common/node_includes.h"
-+#include "content/public/browser/power_save_blocker.h"
-+#include "native_mate/dictionary.h"
-+
-+namespace mate {
-+
-+template<>
-+struct Converter<content::PowerSaveBlocker::PowerSaveBlockerType> {
-+  static bool FromV8(v8::Isolate* isolate,
-+                     v8::Local<v8::Value> val,
-+                     content::PowerSaveBlocker::PowerSaveBlockerType* out) {
-+    using content::PowerSaveBlocker;
-+    std::string type;
-+    if (!ConvertFromV8(isolate, val, &type))
-+      return false;
-+    if (type == "prevent-app-suspension")
-+      *out = PowerSaveBlocker::kPowerSaveBlockPreventAppSuspension;
-+    else if (type == "prevent-display-sleep")
-+      *out = PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep;
-+    else
-+      return false;
-+    return true;
-+  }
-+};
-+
-+}  // namespace mate
-+
-+namespace electron {
-+
-+namespace api {
-+
-+PowerSaveBlocker::PowerSaveBlocker()
-+    : current_blocker_type_(
-+        content::PowerSaveBlocker::kPowerSaveBlockPreventAppSuspension) {
-+}
-+
-+PowerSaveBlocker::~PowerSaveBlocker() {
-+}
-+
-+void PowerSaveBlocker::UpdatePowerSaveBlocker() {
-+  if (power_save_blocker_types_.empty()) {
-+    power_save_blocker_.reset();
-+    return;
-+  }
-+
-+  // |kPowerSaveBlockPreventAppSuspension| keeps system active, but allows
-+  // screen to be turned off.
-+  // |kPowerSaveBlockPreventDisplaySleep| keeps system and screen active, has a
-+  // higher precedence level than |kPowerSaveBlockPreventAppSuspension|.
-+  //
-+  // Only the highest-precedence blocker type takes effect.
-+  content::PowerSaveBlocker::PowerSaveBlockerType new_blocker_type =
-+      content::PowerSaveBlocker::kPowerSaveBlockPreventAppSuspension;
-+  for (const auto& element : power_save_blocker_types_) {
-+    if (element.second ==
-+        content::PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep) {
-+      new_blocker_type =
-+          content::PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep;
-+      break;
-+    }
-+  }
-+
-+  if (!power_save_blocker_ || new_blocker_type != current_blocker_type_) {
-+    scoped_ptr<content::PowerSaveBlocker> new_blocker =
-+        content::PowerSaveBlocker::Create(
-+            new_blocker_type,
-+            content::PowerSaveBlocker::kReasonOther,
-+            ELECTRON_PRODUCT_NAME);
-+    power_save_blocker_.swap(new_blocker);
-+    current_blocker_type_ = new_blocker_type;
-+  }
-+}
-+
-+int PowerSaveBlocker::Start(
-+    content::PowerSaveBlocker::PowerSaveBlockerType type) {
-+  static int count = 0;
-+  power_save_blocker_types_[count] = type;
-+  UpdatePowerSaveBlocker();
-+  return count++;
-+}
-+
-+bool PowerSaveBlocker::Stop(int id) {
-+  bool success = power_save_blocker_types_.erase(id) > 0;
-+  UpdatePowerSaveBlocker();
-+  return success;
-+}
-+
-+bool PowerSaveBlocker::IsStarted(int id) {
-+  return power_save_blocker_types_.find(id) != power_save_blocker_types_.end();
-+}
-+
-+mate::ObjectTemplateBuilder PowerSaveBlocker::GetObjectTemplateBuilder(
-+    v8::Isolate* isolate) {
-+  return mate::ObjectTemplateBuilder(isolate)
-+      .SetMethod("start", &PowerSaveBlocker::Start)
-+      .SetMethod("stop", &PowerSaveBlocker::Stop)
-+      .SetMethod("isStarted", &PowerSaveBlocker::IsStarted);
-+}
-+
-+// static
-+mate::Handle<PowerSaveBlocker> PowerSaveBlocker::Create(v8::Isolate* isolate) {
-+  return CreateHandle(isolate, new PowerSaveBlocker);
-+}
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+namespace {
-+
-+void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
-+                v8::Local<v8::Context> context, void* priv) {
-+  v8::Isolate* isolate = context->GetIsolate();
-+  mate::Dictionary dict(isolate, exports);
-+  dict.Set("powerSaveBlocker", electron::api::PowerSaveBlocker::Create(isolate));
-+}
-+
-+}  // namespace
-+
-+NODE_MODULE_CONTEXT_AWARE_BUILTIN(electron_browser_power_save_blocker, Initialize);
-added in remote
-  their  100644 484913d4cacec1f5239300e895ea16668af7fae0 electron/browser/api/electron_api_power_save_blocker.h
-@@ -0,0 +1,58 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_API_ELECTRON_API_POWER_SAVE_BLOCKER_H_
-+#define ELECTRON_BROWSER_API_ELECTRON_API_POWER_SAVE_BLOCKER_H_
-+
-+#include <map>
-+
-+#include "electron/browser/api/trackable_object.h"
-+#include "base/memory/scoped_ptr.h"
-+#include "content/public/browser/power_save_blocker.h"
-+#include "native_mate/handle.h"
-+
-+namespace mate {
-+class Dictionary;
-+}
-+
-+namespace electron {
-+
-+namespace api {
-+
-+class PowerSaveBlocker : public mate::TrackableObject<PowerSaveBlocker> {
-+ public:
-+  static mate::Handle<PowerSaveBlocker> Create(v8::Isolate* isolate);
-+
-+ protected:
-+  PowerSaveBlocker();
-+  ~PowerSaveBlocker() override;
-+
-+  // mate::Wrappable implementations:
-+  mate::ObjectTemplateBuilder GetObjectTemplateBuilder(
-+      v8::Isolate* isolate) override;
-+
-+ private:
-+  void UpdatePowerSaveBlocker();
-+  int Start(content::PowerSaveBlocker::PowerSaveBlockerType type);
-+  bool Stop(int id);
-+  bool IsStarted(int id);
-+
-+  scoped_ptr<content::PowerSaveBlocker> power_save_blocker_;
-+
-+  // Currnet blocker type used by |power_save_blocker_|
-+  content::PowerSaveBlocker::PowerSaveBlockerType current_blocker_type_;
-+
-+  // Map from id to the corresponding blocker type for each request.
-+  using PowerSaveBlockerTypeMap =
-+      std::map<int, content::PowerSaveBlocker::PowerSaveBlockerType>;
-+  PowerSaveBlockerTypeMap power_save_blocker_types_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(PowerSaveBlocker);
-+};
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_API_ELECTRON_API_POWER_SAVE_BLOCKER_H_
-added in remote
-  their  100644 41fc5eadff2ca01963bea12f6f8381d98c85fd62 electron/browser/api/electron_api_protocol.cc
-@@ -0,0 +1,173 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/api/electron_api_protocol.h"
-+
-+#include "electron/browser/electron_browser_client.h"
-+#include "electron/browser/electron_browser_context.h"
-+#include "electron/browser/electron_browser_main_parts.h"
-+#include "electron/browser/net/url_request_async_asar_job.h"
-+#include "electron/browser/net/url_request_buffer_job.h"
-+#include "electron/browser/net/url_request_fetch_job.h"
-+#include "electron/browser/net/url_request_string_job.h"
-+#include "electron/common/native_mate_converters/callback.h"
-+#include "electron/common/native_mate_converters/net_converter.h"
-+#include "electron/common/node_includes.h"
-+#include "native_mate/dictionary.h"
-+
-+using content::BrowserThread;
-+
-+namespace electron {
-+
-+namespace api {
-+
-+Protocol::Protocol(ElectronBrowserContext* browser_context)
-+    : request_context_getter_(browser_context->GetRequestContext()),
-+      job_factory_(browser_context->job_factory()) {
-+  CHECK(job_factory_);
-+}
-+
-+mate::ObjectTemplateBuilder Protocol::GetObjectTemplateBuilder(
-+    v8::Isolate* isolate) {
-+  return mate::ObjectTemplateBuilder(isolate)
-+      .SetMethod("registerStandardSchemes", &Protocol::RegisterStandardSchemes)
-+      .SetMethod("registerServiceWorkerSchemes",
-+                 &Protocol::RegisterServiceWorkerSchemes)
-+      .SetMethod("registerStringProtocol",
-+                 &Protocol::RegisterProtocol<URLRequestStringJob>)
-+      .SetMethod("registerBufferProtocol",
-+                 &Protocol::RegisterProtocol<URLRequestBufferJob>)
-+      .SetMethod("registerFileProtocol",
-+                 &Protocol::RegisterProtocol<URLRequestAsyncAsarJob>)
-+      .SetMethod("registerHttpProtocol",
-+                 &Protocol::RegisterProtocol<URLRequestFetchJob>)
-+      .SetMethod("unregisterProtocol", &Protocol::UnregisterProtocol)
-+      .SetMethod("isProtocolHandled", &Protocol::IsProtocolHandled)
-+      .SetMethod("interceptStringProtocol",
-+                 &Protocol::InterceptProtocol<URLRequestStringJob>)
-+      .SetMethod("interceptBufferProtocol",
-+                 &Protocol::InterceptProtocol<URLRequestBufferJob>)
-+      .SetMethod("interceptFileProtocol",
-+                 &Protocol::InterceptProtocol<URLRequestAsyncAsarJob>)
-+      .SetMethod("interceptHttpProtocol",
-+                 &Protocol::InterceptProtocol<URLRequestFetchJob>)
-+      .SetMethod("uninterceptProtocol", &Protocol::UninterceptProtocol);
-+}
-+
-+void Protocol::RegisterStandardSchemes(
-+    const std::vector<std::string>& schemes) {
-+  electron::ElectronBrowserClient::SetCustomSchemes(schemes);
-+}
-+
-+void Protocol::RegisterServiceWorkerSchemes(
-+    const std::vector<std::string>& schemes) {
-+  electron::ElectronBrowserClient::SetCustomServiceWorkerSchemes(schemes);
-+}
-+
-+void Protocol::UnregisterProtocol(
-+    const std::string& scheme, mate::Arguments* args) {
-+  CompletionCallback callback;
-+  args->GetNext(&callback);
-+  content::BrowserThread::PostTaskAndReplyWithResult(
-+      content::BrowserThread::IO, FROM_HERE,
-+      base::Bind(&Protocol::UnregisterProtocolInIO,
-+                 base::Unretained(this), scheme),
-+      base::Bind(&Protocol::OnIOCompleted,
-+                 base::Unretained(this), callback));
-+}
-+
-+Protocol::ProtocolError Protocol::UnregisterProtocolInIO(
-+    const std::string& scheme) {
-+  if (!job_factory_->HasProtocolHandler(scheme))
-+    return PROTOCOL_NOT_REGISTERED;
-+  job_factory_->SetProtocolHandler(scheme, nullptr);
-+  return PROTOCOL_OK;
-+}
-+
-+void Protocol::IsProtocolHandled(const std::string& scheme,
-+                                    const BooleanCallback& callback) {
-+  content::BrowserThread::PostTaskAndReplyWithResult(
-+      content::BrowserThread::IO, FROM_HERE,
-+      base::Bind(&Protocol::IsProtocolHandledInIO,
-+                 base::Unretained(this), scheme),
-+      callback);
-+}
-+
-+bool Protocol::IsProtocolHandledInIO(const std::string& scheme) {
-+  return job_factory_->IsHandledProtocol(scheme);
-+}
-+
-+void Protocol::UninterceptProtocol(
-+    const std::string& scheme, mate::Arguments* args) {
-+  CompletionCallback callback;
-+  args->GetNext(&callback);
-+  content::BrowserThread::PostTaskAndReplyWithResult(
-+      content::BrowserThread::IO, FROM_HERE,
-+      base::Bind(&Protocol::UninterceptProtocolInIO,
-+                 base::Unretained(this), scheme),
-+      base::Bind(&Protocol::OnIOCompleted,
-+                 base::Unretained(this), callback));
-+}
-+
-+Protocol::ProtocolError Protocol::UninterceptProtocolInIO(
-+    const std::string& scheme) {
-+  if (!original_protocols_.contains(scheme))
-+    return PROTOCOL_NOT_INTERCEPTED;
-+  job_factory_->ReplaceProtocol(scheme,
-+                                original_protocols_.take_and_erase(scheme));
-+  return PROTOCOL_OK;
-+}
-+
-+void Protocol::OnIOCompleted(
-+    const CompletionCallback& callback, ProtocolError error) {
-+  // The completion callback is optional.
-+  if (callback.is_null())
-+    return;
-+
-+  v8::Locker locker(isolate());
-+  v8::HandleScope handle_scope(isolate());
-+
-+  if (error == PROTOCOL_OK) {
-+    callback.Run(v8::Null(isolate()));
-+  } else {
-+    std::string str = ErrorCodeToString(error);
-+    callback.Run(v8::Exception::Error(mate::StringToV8(isolate(), str)));
-+  }
-+}
-+
-+std::string Protocol::ErrorCodeToString(ProtocolError error) {
-+  switch (error) {
-+    case PROTOCOL_FAIL: return "Failed to manipulate protocol factory";
-+    case PROTOCOL_REGISTERED: return "The scheme has been registred";
-+    case PROTOCOL_NOT_REGISTERED: return "The scheme has not been registred";
-+    case PROTOCOL_INTERCEPTED: return "The scheme has been intercepted";
-+    case PROTOCOL_NOT_INTERCEPTED: return "The scheme has not been intercepted";
-+    default: return "Unexpected error";
-+  }
-+}
-+
-+// static
-+mate::Handle<Protocol> Protocol::Create(
-+    v8::Isolate* isolate, ElectronBrowserContext* browser_context) {
-+  return mate::CreateHandle(isolate, new Protocol(browser_context));
-+}
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+namespace {
-+
-+void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
-+                v8::Local<v8::Context> context, void* priv) {
-+  v8::Isolate* isolate = context->GetIsolate();
-+  mate::Dictionary dict(isolate, exports);
-+  auto browser_context = static_cast<electron::ElectronBrowserContext*>(
-+      electron::ElectronBrowserMainParts::Get()->browser_context());
-+  dict.Set("protocol", electron::api::Protocol::Create(isolate, browser_context));
-+}
-+
-+}  // namespace
-+
-+NODE_MODULE_CONTEXT_AWARE_BUILTIN(electron_browser_protocol, Initialize)
-added in remote
-  their  100644 5962211ea4eb443d84fb3f720d0f9c0ae1c0d715 electron/browser/api/electron_api_protocol.h
-@@ -0,0 +1,195 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_API_ELECTRON_API_PROTOCOL_H_
-+#define ELECTRON_BROWSER_API_ELECTRON_API_PROTOCOL_H_
-+
-+#include <string>
-+#include <map>
-+#include <vector>
-+
-+#include "electron/browser/net/electron_url_request_job_factory.h"
-+#include "base/callback.h"
-+#include "base/containers/scoped_ptr_hash_map.h"
-+#include "content/public/browser/browser_thread.h"
-+#include "native_mate/arguments.h"
-+#include "native_mate/dictionary.h"
-+#include "native_mate/handle.h"
-+#include "native_mate/wrappable.h"
-+
-+namespace net {
-+class URLRequest;
-+class URLRequestContextGetter;
-+}
-+
-+namespace electron {
-+
-+class ElectronBrowserContext;
-+class ElectronURLRequestJobFactory;
-+
-+namespace api {
-+
-+class Protocol : public mate::Wrappable {
-+ public:
-+  using Handler =
-+      base::Callback<void(const net::URLRequest*, v8::Local<v8::Value>)>;
-+  using CompletionCallback = base::Callback<void(v8::Local<v8::Value>)>;
-+  using BooleanCallback = base::Callback<void(bool)>;
-+
-+  static mate::Handle<Protocol> Create(
-+      v8::Isolate* isolate, ElectronBrowserContext* browser_context);
-+
-+ protected:
-+  explicit Protocol(ElectronBrowserContext* browser_context);
-+
-+  // mate::Wrappable implementations:
-+  virtual mate::ObjectTemplateBuilder GetObjectTemplateBuilder(
-+      v8::Isolate* isolate);
-+
-+ private:
-+  // Possible errors.
-+  enum ProtocolError {
-+    PROTOCOL_OK,  // no error
-+    PROTOCOL_FAIL,  // operation failed, should never occur
-+    PROTOCOL_REGISTERED,
-+    PROTOCOL_NOT_REGISTERED,
-+    PROTOCOL_INTERCEPTED,
-+    PROTOCOL_NOT_INTERCEPTED,
-+  };
-+
-+  // The protocol handler that will create a protocol handler for certain
-+  // request job.
-+  template<typename RequestJob>
-+  class CustomProtocolHandler
-+      : public net::URLRequestJobFactory::ProtocolHandler {
-+   public:
-+    CustomProtocolHandler(
-+        v8::Isolate* isolate,
-+        net::URLRequestContextGetter* request_context,
-+        const Handler& handler)
-+        : isolate_(isolate),
-+          request_context_(request_context),
-+          handler_(handler) {}
-+    ~CustomProtocolHandler() override {}
-+
-+    net::URLRequestJob* MaybeCreateJob(
-+        net::URLRequest* request,
-+        net::NetworkDelegate* network_delegate) const override {
-+      RequestJob* request_job = new RequestJob(request, network_delegate);
-+      request_job->SetHandlerInfo(isolate_, request_context_, handler_);
-+      return request_job;
-+    }
-+
-+   private:
-+    v8::Isolate* isolate_;
-+    net::URLRequestContextGetter* request_context_;
-+    Protocol::Handler handler_;
-+
-+    DISALLOW_COPY_AND_ASSIGN(CustomProtocolHandler);
-+  };
-+
-+  // Register schemes to standard scheme list.
-+  void RegisterStandardSchemes(const std::vector<std::string>& schemes);
-+
-+  // Register schemes that can handle service worker.
-+  void RegisterServiceWorkerSchemes(const std::vector<std::string>& schemes);
-+
-+  // Register the protocol with certain request job.
-+  template<typename RequestJob>
-+  void RegisterProtocol(const std::string& scheme,
-+                        const Handler& handler,
-+                        mate::Arguments* args) {
-+    CompletionCallback callback;
-+    args->GetNext(&callback);
-+    content::BrowserThread::PostTaskAndReplyWithResult(
-+        content::BrowserThread::IO, FROM_HERE,
-+        base::Bind(&Protocol::RegisterProtocolInIO<RequestJob>,
-+                   base::Unretained(this), scheme, handler),
-+        base::Bind(&Protocol::OnIOCompleted,
-+                   base::Unretained(this), callback));
-+  }
-+  template<typename RequestJob>
-+  ProtocolError RegisterProtocolInIO(const std::string& scheme,
-+                                     const Handler& handler) {
-+    if (job_factory_->IsHandledProtocol(scheme))
-+      return PROTOCOL_REGISTERED;
-+    scoped_ptr<CustomProtocolHandler<RequestJob>> protocol_handler(
-+        new CustomProtocolHandler<RequestJob>(
-+            isolate(), request_context_getter_, handler));
-+    if (job_factory_->SetProtocolHandler(scheme, std::move(protocol_handler)))
-+      return PROTOCOL_OK;
-+    else
-+      return PROTOCOL_FAIL;
-+  }
-+
-+  // Unregister the protocol handler that handles |scheme|.
-+  void UnregisterProtocol(const std::string& scheme, mate::Arguments* args);
-+  ProtocolError UnregisterProtocolInIO(const std::string& scheme);
-+
-+  // Whether the protocol has handler registered.
-+  void IsProtocolHandled(const std::string& scheme,
-+                         const BooleanCallback& callback);
-+  bool IsProtocolHandledInIO(const std::string& scheme);
-+
-+  // Replace the protocol handler with a new one.
-+  template<typename RequestJob>
-+  void InterceptProtocol(const std::string& scheme,
-+                         const Handler& handler,
-+                         mate::Arguments* args) {
-+    CompletionCallback callback;
-+    args->GetNext(&callback);
-+    content::BrowserThread::PostTaskAndReplyWithResult(
-+        content::BrowserThread::IO, FROM_HERE,
-+        base::Bind(&Protocol::InterceptProtocolInIO<RequestJob>,
-+                   base::Unretained(this), scheme, handler),
-+        base::Bind(&Protocol::OnIOCompleted,
-+                   base::Unretained(this), callback));
-+  }
-+  template<typename RequestJob>
-+  ProtocolError InterceptProtocolInIO(const std::string& scheme,
-+                                      const Handler& handler) {
-+    if (!job_factory_->IsHandledProtocol(scheme))
-+      return PROTOCOL_NOT_REGISTERED;
-+    // It is possible a protocol is handled but can not be intercepted.
-+    if (!job_factory_->HasProtocolHandler(scheme))
-+      return PROTOCOL_FAIL;
-+    if (ContainsKey(original_protocols_, scheme))
-+      return PROTOCOL_INTERCEPTED;
-+    scoped_ptr<CustomProtocolHandler<RequestJob>> protocol_handler(
-+        new CustomProtocolHandler<RequestJob>(
-+            isolate(), request_context_getter_, handler));
-+    original_protocols_.set(
-+        scheme,
-+        job_factory_->ReplaceProtocol(scheme, std::move(protocol_handler)));
-+    return PROTOCOL_OK;
-+  }
-+
-+  // Restore the |scheme| to its original protocol handler.
-+  void UninterceptProtocol(const std::string& scheme, mate::Arguments* args);
-+  ProtocolError UninterceptProtocolInIO(const std::string& scheme);
-+
-+  // Convert error code to JS exception and call the callback.
-+  void OnIOCompleted(const CompletionCallback& callback, ProtocolError error);
-+
-+  // Convert error code to string.
-+  std::string ErrorCodeToString(ProtocolError error);
-+
-+  net::URLRequestContextGetter* request_context_getter_;
-+
-+  // Map that stores the original protocols of schemes.
-+  using OriginalProtocolsMap = base::ScopedPtrHashMap<
-+      std::string,
-+      scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>>;
-+  OriginalProtocolsMap original_protocols_;
-+
-+  ElectronURLRequestJobFactory* job_factory_;  // weak ref
-+
-+  DISALLOW_COPY_AND_ASSIGN(Protocol);
-+};
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_API_ELECTRON_API_PROTOCOL_H_
-added in remote
-  their  100644 40e49d2833337c985eb7be6b32684c7d983c3f73 electron/browser/api/electron_api_screen.cc
-@@ -0,0 +1,146 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/api/electron_api_screen.h"
-+
-+#include <algorithm>
-+#include <string>
-+
-+#include "electron/browser/browser.h"
-+#include "electron/common/native_mate_converters/gfx_converter.h"
-+#include "base/bind.h"
-+#include "native_mate/dictionary.h"
-+#include "native_mate/object_template_builder.h"
-+#include "ui/gfx/screen.h"
-+
-+#include "electron/common/node_includes.h"
-+
-+namespace electron {
-+
-+namespace api {
-+
-+namespace {
-+
-+// Find an item in container according to its ID.
-+template<class T>
-+typename T::iterator FindById(T* container, int id) {
-+  auto predicate = [id] (const typename T::value_type& item) -> bool {
-+    return item.id() == id;
-+  };
-+  return std::find_if(container->begin(), container->end(), predicate);
-+}
-+
-+// Convert the changed_metrics bitmask to string array.
-+std::vector<std::string> MetricsToArray(uint32_t metrics) {
-+  std::vector<std::string> array;
-+  if (metrics & gfx::DisplayObserver::DISPLAY_METRIC_BOUNDS)
-+    array.push_back("bounds");
-+  if (metrics & gfx::DisplayObserver::DISPLAY_METRIC_WORK_AREA)
-+    array.push_back("workArea");
-+  if (metrics & gfx::DisplayObserver::DISPLAY_METRIC_DEVICE_SCALE_FACTOR)
-+    array.push_back("scaleFactor");
-+  if (metrics & gfx::DisplayObserver::DISPLAY_METRIC_ROTATION)
-+    array.push_back("rotation");
-+  return array;
-+}
-+
-+}  // namespace
-+
-+Screen::Screen(gfx::Screen* screen) : screen_(screen) {
-+  displays_ = screen_->GetAllDisplays();
-+  screen_->AddObserver(this);
-+}
-+
-+Screen::~Screen() {
-+  screen_->RemoveObserver(this);
-+}
-+
-+gfx::Point Screen::GetCursorScreenPoint() {
-+  return screen_->GetCursorScreenPoint();
-+}
-+
-+gfx::Display Screen::GetPrimaryDisplay() {
-+  return screen_->GetPrimaryDisplay();
-+}
-+
-+std::vector<gfx::Display> Screen::GetAllDisplays() {
-+  return displays_;
-+}
-+
-+gfx::Display Screen::GetDisplayNearestPoint(const gfx::Point& point) {
-+  return screen_->GetDisplayNearestPoint(point);
-+}
-+
-+gfx::Display Screen::GetDisplayMatching(const gfx::Rect& match_rect) {
-+  return screen_->GetDisplayMatching(match_rect);
-+}
-+
-+void Screen::OnDisplayAdded(const gfx::Display& new_display) {
-+  displays_.push_back(new_display);
-+  Emit("display-added", new_display);
-+}
-+
-+void Screen::OnDisplayRemoved(const gfx::Display& old_display) {
-+  auto iter = FindById(&displays_, old_display.id());
-+  if (iter == displays_.end())
-+    return;
-+
-+  displays_.erase(iter);
-+  Emit("display-removed", old_display);
-+}
-+
-+void Screen::OnDisplayMetricsChanged(const gfx::Display& display,
-+                                     uint32_t changed_metrics) {
-+  auto iter = FindById(&displays_, display.id());
-+  if (iter == displays_.end())
-+    return;
-+
-+  *iter = display;
-+  Emit("display-metrics-changed", display, MetricsToArray(changed_metrics));
-+}
-+
-+mate::ObjectTemplateBuilder Screen::GetObjectTemplateBuilder(
-+    v8::Isolate* isolate) {
-+  return mate::ObjectTemplateBuilder(isolate)
-+      .SetMethod("getCursorScreenPoint", &Screen::GetCursorScreenPoint)
-+      .SetMethod("getPrimaryDisplay", &Screen::GetPrimaryDisplay)
-+      .SetMethod("getAllDisplays", &Screen::GetAllDisplays)
-+      .SetMethod("getDisplayNearestPoint", &Screen::GetDisplayNearestPoint)
-+      .SetMethod("getDisplayMatching", &Screen::GetDisplayMatching);
-+}
-+
-+// static
-+v8::Local<v8::Value> Screen::Create(v8::Isolate* isolate) {
-+  if (!Browser::Get()->is_ready()) {
-+    isolate->ThrowException(v8::Exception::Error(mate::StringToV8(
-+        isolate,
-+        "Cannot initialize \"screen\" module before app is ready")));
-+    return v8::Null(isolate);
-+  }
-+
-+  gfx::Screen* screen = gfx::Screen::GetNativeScreen();
-+  if (!screen) {
-+    isolate->ThrowException(v8::Exception::Error(mate::StringToV8(
-+        isolate, "Failed to get screen information")));
-+    return v8::Null(isolate);
-+  }
-+
-+  return mate::CreateHandle(isolate, new Screen(screen)).ToV8();
-+}
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+namespace {
-+
-+void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
-+                v8::Local<v8::Context> context, void* priv) {
-+  mate::Dictionary dict(context->GetIsolate(), exports);
-+  dict.Set("screen", electron::api::Screen::Create(context->GetIsolate()));
-+}
-+
-+}  // namespace
-+
-+NODE_MODULE_CONTEXT_AWARE_BUILTIN(electron_common_screen, Initialize)
-added in remote
-  their  100644 6c44a66d4143a9bb935f27282a4e3cdc2b6d694b electron/browser/api/electron_api_screen.h
-@@ -0,0 +1,60 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_API_ELECTRON_API_SCREEN_H_
-+#define ELECTRON_BROWSER_API_ELECTRON_API_SCREEN_H_
-+
-+#include <vector>
-+
-+#include "electron/browser/api/event_emitter.h"
-+#include "native_mate/handle.h"
-+#include "ui/gfx/display_observer.h"
-+
-+namespace gfx {
-+class Point;
-+class Rect;
-+class Screen;
-+}
-+
-+namespace electron {
-+
-+namespace api {
-+
-+class Screen : public mate::EventEmitter,
-+               public gfx::DisplayObserver {
-+ public:
-+  static v8::Local<v8::Value> Create(v8::Isolate* isolate);
-+
-+ protected:
-+  explicit Screen(gfx::Screen* screen);
-+  virtual ~Screen();
-+
-+  gfx::Point GetCursorScreenPoint();
-+  gfx::Display GetPrimaryDisplay();
-+  std::vector<gfx::Display> GetAllDisplays();
-+  gfx::Display GetDisplayNearestPoint(const gfx::Point& point);
-+  gfx::Display GetDisplayMatching(const gfx::Rect& match_rect);
-+
-+  // gfx::DisplayObserver:
-+  void OnDisplayAdded(const gfx::Display& new_display) override;
-+  void OnDisplayRemoved(const gfx::Display& old_display) override;
-+  void OnDisplayMetricsChanged(const gfx::Display& display,
-+                               uint32_t changed_metrics) override;
-+
-+  // mate::Wrappable:
-+  mate::ObjectTemplateBuilder GetObjectTemplateBuilder(
-+      v8::Isolate* isolate) override;
-+
-+ private:
-+  gfx::Screen* screen_;
-+  std::vector<gfx::Display> displays_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(Screen);
-+};
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_API_ELECTRON_API_SCREEN_H_
-added in remote
-  their  100644 c4d14c26369a83eaa03514bebde0e217b8d94f49 electron/browser/api/electron_api_session.cc
-@@ -0,0 +1,524 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/api/electron_api_session.h"
-+
-+#include <string>
-+#include <vector>
-+
-+#include "electron/browser/api/electron_api_cookies.h"
-+#include "electron/browser/api/electron_api_download_item.h"
-+#include "electron/browser/api/electron_api_web_contents.h"
-+#include "electron/browser/api/electron_api_web_request.h"
-+#include "electron/browser/api/save_page_handler.h"
-+#include "electron/browser/electron_browser_context.h"
-+#include "electron/browser/electron_browser_main_parts.h"
-+#include "electron/browser/electron_permission_manager.h"
-+#include "electron/browser/net/electron_cert_verifier.h"
-+#include "electron/common/native_mate_converters/callback.h"
-+#include "electron/common/native_mate_converters/content_converter.h"
-+#include "electron/common/native_mate_converters/gurl_converter.h"
-+#include "electron/common/native_mate_converters/file_path_converter.h"
-+#include "electron/common/native_mate_converters/net_converter.h"
-+#include "electron/common/node_includes.h"
-+#include "base/files/file_path.h"
-+#include "base/prefs/pref_service.h"
-+#include "base/strings/string_number_conversions.h"
-+#include "base/strings/string_util.h"
-+#include "base/thread_task_runner_handle.h"
-+#include "brightray/browser/net/devtools_network_conditions.h"
-+#include "brightray/browser/net/devtools_network_controller.h"
-+#include "chrome/common/pref_names.h"
-+#include "content/public/browser/browser_thread.h"
-+#include "content/public/browser/storage_partition.h"
-+#include "native_mate/dictionary.h"
-+#include "native_mate/object_template_builder.h"
-+#include "net/base/load_flags.h"
-+#include "net/disk_cache/disk_cache.h"
-+#include "net/dns/host_cache.h"
-+#include "net/proxy/proxy_service.h"
-+#include "net/proxy/proxy_config_service_fixed.h"
-+#include "net/url_request/url_request_context.h"
-+#include "net/url_request/url_request_context_getter.h"
-+
-+using content::BrowserThread;
-+using content::StoragePartition;
-+
-+namespace {
-+
-+struct ClearStorageDataOptions {
-+  GURL origin;
-+  uint32_t storage_types = StoragePartition::REMOVE_DATA_MASK_ALL;
-+  uint32_t quota_types = StoragePartition::QUOTA_MANAGED_STORAGE_MASK_ALL;
-+};
-+
-+uint32_t GetStorageMask(const std::vector<std::string>& storage_types) {
-+  uint32_t storage_mask = 0;
-+  for (const auto& it : storage_types) {
-+    auto type = base::ToLowerASCII(it);
-+    if (type == "appcache")
-+      storage_mask |= StoragePartition::REMOVE_DATA_MASK_APPCACHE;
-+    else if (type == "cookies")
-+      storage_mask |= StoragePartition::REMOVE_DATA_MASK_COOKIES;
-+    else if (type == "filesystem")
-+      storage_mask |= StoragePartition::REMOVE_DATA_MASK_FILE_SYSTEMS;
-+    else if (type == "indexdb")
-+      storage_mask |= StoragePartition::REMOVE_DATA_MASK_INDEXEDDB;
-+    else if (type == "localstorage")
-+      storage_mask |= StoragePartition::REMOVE_DATA_MASK_LOCAL_STORAGE;
-+    else if (type == "shadercache")
-+      storage_mask |= StoragePartition::REMOVE_DATA_MASK_SHADER_CACHE;
-+    else if (type == "websql")
-+      storage_mask |= StoragePartition::REMOVE_DATA_MASK_WEBSQL;
-+    else if (type == "serviceworkers")
-+      storage_mask |= StoragePartition::REMOVE_DATA_MASK_SERVICE_WORKERS;
-+  }
-+  return storage_mask;
-+}
-+
-+uint32_t GetQuotaMask(const std::vector<std::string>& quota_types) {
-+  uint32_t quota_mask = 0;
-+  for (const auto& it : quota_types) {
-+    auto type = base::ToLowerASCII(it);
-+    if (type == "temporary")
-+      quota_mask |= StoragePartition::QUOTA_MANAGED_STORAGE_MASK_TEMPORARY;
-+    else if (type == "persistent")
-+      quota_mask |= StoragePartition::QUOTA_MANAGED_STORAGE_MASK_PERSISTENT;
-+    else if (type == "syncable")
-+      quota_mask |= StoragePartition::QUOTA_MANAGED_STORAGE_MASK_SYNCABLE;
-+  }
-+  return quota_mask;
-+}
-+
-+}  // namespace
-+
-+namespace mate {
-+
-+template<>
-+struct Converter<ClearStorageDataOptions> {
-+  static bool FromV8(v8::Isolate* isolate,
-+                     v8::Local<v8::Value> val,
-+                     ClearStorageDataOptions* out) {
-+    mate::Dictionary options;
-+    if (!ConvertFromV8(isolate, val, &options))
-+      return false;
-+    options.Get("origin", &out->origin);
-+    std::vector<std::string> types;
-+    if (options.Get("storages", &types))
-+      out->storage_types = GetStorageMask(types);
-+    if (options.Get("quotas", &types))
-+      out->quota_types = GetQuotaMask(types);
-+    return true;
-+  }
-+};
-+
-+template<>
-+struct Converter<net::ProxyConfig> {
-+  static bool FromV8(v8::Isolate* isolate,
-+                     v8::Local<v8::Value> val,
-+                     net::ProxyConfig* out) {
-+    std::string proxy_rules;
-+    GURL pac_url;
-+    mate::Dictionary options;
-+    // Fallback to previous API when passed String.
-+    // https://git.io/vuhjj
-+    if (ConvertFromV8(isolate, val, &proxy_rules)) {
-+      pac_url = GURL(proxy_rules);  // Assume it is PAC script if it is URL.
-+    } else if (ConvertFromV8(isolate, val, &options)) {
-+      options.Get("pacScript", &pac_url);
-+      options.Get("proxyRules", &proxy_rules);
-+    } else {
-+      return false;
-+    }
-+
-+    // pacScript takes precedence over proxyRules.
-+    if (!pac_url.is_empty() && pac_url.is_valid()) {
-+      out->set_pac_url(pac_url);
-+    } else {
-+      out->proxy_rules().ParseFromString(proxy_rules);
-+    }
-+    return true;
-+  }
-+};
-+
-+}  // namespace mate
-+
-+namespace electron {
-+
-+namespace api {
-+
-+namespace {
-+
-+// The wrapSession funtion which is implemented in JavaScript
-+using WrapSessionCallback = base::Callback<void(v8::Local<v8::Value>)>;
-+WrapSessionCallback g_wrap_session;
-+
-+class ResolveProxyHelper {
-+ public:
-+  ResolveProxyHelper(ElectronBrowserContext* browser_context,
-+                     const GURL& url,
-+                     Session::ResolveProxyCallback callback)
-+      : callback_(callback),
-+        original_thread_(base::ThreadTaskRunnerHandle::Get()) {
-+    scoped_refptr<net::URLRequestContextGetter> context_getter =
-+        browser_context->GetRequestContext();
-+    context_getter->GetNetworkTaskRunner()->PostTask(
-+        FROM_HERE,
-+        base::Bind(&ResolveProxyHelper::ResolveProxy,
-+                   base::Unretained(this), context_getter, url));
-+  }
-+
-+  void OnResolveProxyCompleted(int result) {
-+    std::string proxy;
-+    if (result == net::OK)
-+      proxy = proxy_info_.ToPacString();
-+    original_thread_->PostTask(FROM_HERE,
-+                               base::Bind(callback_, proxy));
-+    delete this;
-+  }
-+
-+ private:
-+  void ResolveProxy(scoped_refptr<net::URLRequestContextGetter> context_getter,
-+                    const GURL& url) {
-+    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-+
-+    net::ProxyService* proxy_service =
-+        context_getter->GetURLRequestContext()->proxy_service();
-+    net::CompletionCallback completion_callback =
-+        base::Bind(&ResolveProxyHelper::OnResolveProxyCompleted,
-+                   base::Unretained(this));
-+
-+    // Start the request.
-+    int result = proxy_service->ResolveProxy(
-+        url, net::LOAD_NORMAL, &proxy_info_, completion_callback,
-+        &pac_req_, nullptr, net::BoundNetLog());
-+
-+    // Completed synchronously.
-+    if (result != net::ERR_IO_PENDING)
-+      completion_callback.Run(result);
-+  }
-+
-+  Session::ResolveProxyCallback callback_;
-+  net::ProxyInfo proxy_info_;
-+  net::ProxyService::PacRequest* pac_req_;
-+  scoped_refptr<base::SingleThreadTaskRunner> original_thread_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(ResolveProxyHelper);
-+};
-+
-+// Runs the callback in UI thread.
-+template<typename ...T>
-+void RunCallbackInUI(const base::Callback<void(T...)>& callback, T... result) {
-+  BrowserThread::PostTask(
-+      BrowserThread::UI, FROM_HERE, base::Bind(callback, result...));
-+}
-+
-+// Callback of HttpCache::GetBackend.
-+void OnGetBackend(disk_cache::Backend** backend_ptr,
-+                  Session::CacheAction action,
-+                  const net::CompletionCallback& callback,
-+                  int result) {
-+  if (result != net::OK) {
-+    RunCallbackInUI(callback, result);
-+  } else if (backend_ptr && *backend_ptr) {
-+    if (action == Session::CacheAction::CLEAR) {
-+      (*backend_ptr)->DoomAllEntries(base::Bind(&RunCallbackInUI<int>,
-+                                                callback));
-+    } else if (action == Session::CacheAction::STATS) {
-+      base::StringPairs stats;
-+      (*backend_ptr)->GetStats(&stats);
-+      for (size_t i = 0; i < stats.size(); ++i) {
-+        if (stats[i].first == "Current size") {
-+          int current_size;
-+          base::StringToInt(stats[i].second, &current_size);
-+          RunCallbackInUI(callback, current_size);
-+          break;
-+        }
-+      }
-+    }
-+  } else {
-+    RunCallbackInUI<int>(callback, net::ERR_FAILED);
-+  }
-+}
-+
-+void DoCacheActionInIO(
-+    const scoped_refptr<net::URLRequestContextGetter>& context_getter,
-+    Session::CacheAction action,
-+    const net::CompletionCallback& callback) {
-+  auto request_context = context_getter->GetURLRequestContext();
-+  auto http_cache = request_context->http_transaction_factory()->GetCache();
-+  if (!http_cache)
-+    RunCallbackInUI<int>(callback, net::ERR_FAILED);
-+
-+  // Call GetBackend and make the backend's ptr accessable in OnGetBackend.
-+  using BackendPtr = disk_cache::Backend*;
-+  BackendPtr* backend_ptr = new BackendPtr(nullptr);
-+  net::CompletionCallback on_get_backend =
-+      base::Bind(&OnGetBackend, base::Owned(backend_ptr), action, callback);
-+  int rv = http_cache->GetBackend(backend_ptr, on_get_backend);
-+  if (rv != net::ERR_IO_PENDING)
-+    on_get_backend.Run(net::OK);
-+}
-+
-+void SetProxyInIO(net::URLRequestContextGetter* getter,
-+                  const net::ProxyConfig& config,
-+                  const base::Closure& callback) {
-+  auto proxy_service = getter->GetURLRequestContext()->proxy_service();
-+  proxy_service->ResetConfigService(make_scoped_ptr(
-+      new net::ProxyConfigServiceFixed(config)));
-+  // Refetches and applies the new pac script if provided.
-+  proxy_service->ForceReloadProxyConfig();
-+  RunCallbackInUI(callback);
-+}
-+
-+void ClearHostResolverCacheInIO(
-+    const scoped_refptr<net::URLRequestContextGetter>& context_getter,
-+    const base::Closure& callback) {
-+  auto request_context = context_getter->GetURLRequestContext();
-+  auto cache = request_context->host_resolver()->GetHostCache();
-+  if (cache) {
-+    cache->clear();
-+    DCHECK_EQ(0u, cache->size());
-+    if (!callback.is_null())
-+      RunCallbackInUI(callback);
-+  }
-+}
-+
-+}  // namespace
-+
-+Session::Session(ElectronBrowserContext* browser_context)
-+    : browser_context_(browser_context) {
-+  AttachAsUserData(browser_context);
-+
-+  // Observe DownloadManger to get download notifications.
-+  content::BrowserContext::GetDownloadManager(browser_context)->
-+      AddObserver(this);
-+}
-+
-+Session::~Session() {
-+  content::BrowserContext::GetDownloadManager(browser_context())->
-+      RemoveObserver(this);
-+}
-+
-+void Session::OnDownloadCreated(content::DownloadManager* manager,
-+                                content::DownloadItem* item) {
-+  auto web_contents = item->GetWebContents();
-+  if (SavePageHandler::IsSavePageTypes(item->GetMimeType()))
-+    return;
-+  bool prevent_default = Emit(
-+      "will-download",
-+      DownloadItem::Create(isolate(), item),
-+      api::WebContents::CreateFrom(isolate(), web_contents));
-+  if (prevent_default) {
-+    item->Cancel(true);
-+    item->Remove();
-+  }
-+}
-+
-+void Session::ResolveProxy(const GURL& url, ResolveProxyCallback callback) {
-+  new ResolveProxyHelper(browser_context(), url, callback);
-+}
-+
-+template<Session::CacheAction action>
-+void Session::DoCacheAction(const net::CompletionCallback& callback) {
-+  BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
-+      base::Bind(&DoCacheActionInIO,
-+                 make_scoped_refptr(browser_context_->GetRequestContext()),
-+                 action,
-+                 callback));
-+}
-+
-+void Session::ClearStorageData(mate::Arguments* args) {
-+  // clearStorageData([options, ]callback)
-+  ClearStorageDataOptions options;
-+  args->GetNext(&options);
-+  base::Closure callback;
-+  if (!args->GetNext(&callback)) {
-+    args->ThrowError();
-+    return;
-+  }
-+
-+  auto storage_partition =
-+      content::BrowserContext::GetStoragePartition(browser_context(), nullptr);
-+  storage_partition->ClearData(
-+      options.storage_types, options.quota_types, options.origin,
-+      content::StoragePartition::OriginMatcherFunction(),
-+      base::Time(), base::Time::Max(), callback);
-+}
-+
-+void Session::FlushStorageData() {
-+  auto storage_partition =
-+      content::BrowserContext::GetStoragePartition(browser_context(), nullptr);
-+  storage_partition->Flush();
-+}
-+
-+void Session::SetProxy(const net::ProxyConfig& config,
-+                       const base::Closure& callback) {
-+  auto getter = browser_context_->GetRequestContext();
-+  BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
-+      base::Bind(&SetProxyInIO, base::Unretained(getter), config, callback));
-+}
-+
-+void Session::SetDownloadPath(const base::FilePath& path) {
-+  browser_context_->prefs()->SetFilePath(
-+      prefs::kDownloadDefaultDirectory, path);
-+}
-+
-+void Session::EnableNetworkEmulation(const mate::Dictionary& options) {
-+  scoped_ptr<brightray::DevToolsNetworkConditions> conditions;
-+  bool offline = false;
-+  double latency, download_throughput, upload_throughput;
-+  if (options.Get("offline", &offline) && offline) {
-+    conditions.reset(new brightray::DevToolsNetworkConditions(offline));
-+  } else {
-+    options.Get("latency", &latency);
-+    options.Get("downloadThroughput", &download_throughput);
-+    options.Get("uploadThroughput", &upload_throughput);
-+    conditions.reset(
-+        new brightray::DevToolsNetworkConditions(false,
-+                                                 latency,
-+                                                 download_throughput,
-+                                                 upload_throughput));
-+  }
-+  auto controller = browser_context_->GetDevToolsNetworkController();
-+
-+  BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
-+      base::Bind(&brightray::DevToolsNetworkController::SetNetworkState,
-+                 base::Unretained(controller),
-+                 std::string(),
-+                 base::Passed(&conditions)));
-+}
-+
-+void Session::DisableNetworkEmulation() {
-+  scoped_ptr<brightray::DevToolsNetworkConditions> conditions(
-+      new brightray::DevToolsNetworkConditions(false));
-+  auto controller = browser_context_->GetDevToolsNetworkController();
-+
-+  BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
-+      base::Bind(&brightray::DevToolsNetworkController::SetNetworkState,
-+                 base::Unretained(controller),
-+                 std::string(),
-+                 base::Passed(&conditions)));
-+}
-+
-+void Session::SetCertVerifyProc(v8::Local<v8::Value> val,
-+                                mate::Arguments* args) {
-+  ElectronCertVerifier::VerifyProc proc;
-+  if (!(val->IsNull() || mate::ConvertFromV8(args->isolate(), val, &proc))) {
-+    args->ThrowError("Must pass null or function");
-+    return;
-+  }
-+
-+  browser_context_->cert_verifier()->SetVerifyProc(proc);
-+}
-+
-+void Session::SetPermissionRequestHandler(v8::Local<v8::Value> val,
-+                                          mate::Arguments* args) {
-+  ElectronPermissionManager::RequestHandler handler;
-+  if (!(val->IsNull() || mate::ConvertFromV8(args->isolate(), val, &handler))) {
-+    args->ThrowError("Must pass null or function");
-+    return;
-+  }
-+  auto permission_manager = static_cast<ElectronPermissionManager*>(
-+      browser_context()->GetPermissionManager());
-+  permission_manager->SetPermissionRequestHandler(handler);
-+}
-+
-+void Session::ClearHostResolverCache(mate::Arguments* args) {
-+  base::Closure callback;
-+  args->GetNext(&callback);
-+
-+  BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
-+      base::Bind(&ClearHostResolverCacheInIO,
-+                 make_scoped_refptr(browser_context_->GetRequestContext()),
-+                 callback));
-+}
-+
-+v8::Local<v8::Value> Session::Cookies(v8::Isolate* isolate) {
-+  if (cookies_.IsEmpty()) {
-+    auto handle = electron::api::Cookies::Create(isolate, browser_context());
-+    cookies_.Reset(isolate, handle.ToV8());
-+  }
-+  return v8::Local<v8::Value>::New(isolate, cookies_);
-+}
-+
-+v8::Local<v8::Value> Session::WebRequest(v8::Isolate* isolate) {
-+  if (web_request_.IsEmpty()) {
-+    auto handle = electron::api::WebRequest::Create(isolate, browser_context());
-+    web_request_.Reset(isolate, handle.ToV8());
-+  }
-+  return v8::Local<v8::Value>::New(isolate, web_request_);
-+}
-+
-+// static
-+mate::Handle<Session> Session::CreateFrom(
-+    v8::Isolate* isolate, ElectronBrowserContext* browser_context) {
-+  auto existing = TrackableObject::FromWrappedClass(isolate, browser_context);
-+  if (existing)
-+    return mate::CreateHandle(isolate, static_cast<Session*>(existing));
-+
-+  auto handle = mate::CreateHandle(isolate, new Session(browser_context));
-+  g_wrap_session.Run(handle.ToV8());
-+  return handle;
-+}
-+
-+// static
-+mate::Handle<Session> Session::FromPartition(
-+    v8::Isolate* isolate, const std::string& partition, bool in_memory) {
-+  auto browser_context = brightray::BrowserContext::From(partition, in_memory);
-+  return CreateFrom(isolate,
-+                    static_cast<ElectronBrowserContext*>(browser_context.get()));
-+}
-+
-+// static
-+void Session::BuildPrototype(v8::Isolate* isolate,
-+                             v8::Local<v8::ObjectTemplate> prototype) {
-+  mate::ObjectTemplateBuilder(isolate, prototype)
-+      .MakeDestroyable()
-+      .SetMethod("resolveProxy", &Session::ResolveProxy)
-+      .SetMethod("getCacheSize", &Session::DoCacheAction<CacheAction::STATS>)
-+      .SetMethod("clearCache", &Session::DoCacheAction<CacheAction::CLEAR>)
-+      .SetMethod("clearStorageData", &Session::ClearStorageData)
-+      .SetMethod("flushStorageData", &Session::FlushStorageData)
-+      .SetMethod("setProxy", &Session::SetProxy)
-+      .SetMethod("setDownloadPath", &Session::SetDownloadPath)
-+      .SetMethod("enableNetworkEmulation", &Session::EnableNetworkEmulation)
-+      .SetMethod("disableNetworkEmulation", &Session::DisableNetworkEmulation)
-+      .SetMethod("setCertificateVerifyProc", &Session::SetCertVerifyProc)
-+      .SetMethod("setPermissionRequestHandler",
-+                 &Session::SetPermissionRequestHandler)
-+      .SetMethod("clearHostResolverCache", &Session::ClearHostResolverCache)
-+      .SetProperty("cookies", &Session::Cookies)
-+      .SetProperty("webRequest", &Session::WebRequest);
-+}
-+
-+void ClearWrapSession() {
-+  g_wrap_session.Reset();
-+}
-+
-+void SetWrapSession(const WrapSessionCallback& callback) {
-+  g_wrap_session = callback;
-+
-+  // Cleanup the wrapper on exit.
-+  electron::ElectronBrowserMainParts::Get()->RegisterDestructionCallback(
-+      base::Bind(ClearWrapSession));
-+}
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+namespace {
-+
-+void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
-+                v8::Local<v8::Context> context, void* priv) {
-+  v8::Isolate* isolate = context->GetIsolate();
-+  mate::Dictionary dict(isolate, exports);
-+  dict.SetMethod("fromPartition", &electron::api::Session::FromPartition);
-+  dict.SetMethod("_setWrapSession", &electron::api::SetWrapSession);
-+}
-+
-+}  // namespace
-+
-+NODE_MODULE_CONTEXT_AWARE_BUILTIN(electron_browser_session, Initialize)
-added in remote
-  their  100644 42941fee865627a0af7b758e3b99c5e0c05c469a electron/browser/api/electron_api_session.h
-@@ -0,0 +1,98 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_API_ELECTRON_API_SESSION_H_
-+#define ELECTRON_BROWSER_API_ELECTRON_API_SESSION_H_
-+
-+#include <string>
-+
-+#include "electron/browser/api/trackable_object.h"
-+#include "content/public/browser/download_manager.h"
-+#include "native_mate/handle.h"
-+#include "net/base/completion_callback.h"
-+
-+class GURL;
-+
-+namespace base {
-+class FilePath;
-+}
-+
-+namespace mate {
-+class Arguments;
-+class Dictionary;
-+}
-+
-+namespace net {
-+class ProxyConfig;
-+}
-+
-+namespace electron {
-+
-+class ElectronBrowserContext;
-+
-+namespace api {
-+
-+class Session: public mate::TrackableObject<Session>,
-+               public content::DownloadManager::Observer {
-+ public:
-+  using ResolveProxyCallback = base::Callback<void(std::string)>;
-+
-+  enum class CacheAction {
-+    CLEAR,
-+    STATS,
-+  };
-+
-+  // Gets or creates Session from the |browser_context|.
-+  static mate::Handle<Session> CreateFrom(
-+      v8::Isolate* isolate, ElectronBrowserContext* browser_context);
-+
-+  // Gets the Session of |partition| and |in_memory|.
-+  static mate::Handle<Session> FromPartition(
-+      v8::Isolate* isolate, const std::string& partition, bool in_memory);
-+
-+  ElectronBrowserContext* browser_context() const { return browser_context_.get(); }
-+
-+  // mate::TrackableObject:
-+  static void BuildPrototype(v8::Isolate* isolate,
-+                             v8::Local<v8::ObjectTemplate> prototype);
-+
-+ protected:
-+  explicit Session(ElectronBrowserContext* browser_context);
-+  ~Session();
-+
-+  // content::DownloadManager::Observer:
-+  void OnDownloadCreated(content::DownloadManager* manager,
-+                         content::DownloadItem* item) override;
-+
-+ private:
-+  void ResolveProxy(const GURL& url, ResolveProxyCallback callback);
-+  template<CacheAction action>
-+  void DoCacheAction(const net::CompletionCallback& callback);
-+  void ClearStorageData(mate::Arguments* args);
-+  void FlushStorageData();
-+  void SetProxy(const net::ProxyConfig& config, const base::Closure& callback);
-+  void SetDownloadPath(const base::FilePath& path);
-+  void EnableNetworkEmulation(const mate::Dictionary& options);
-+  void DisableNetworkEmulation();
-+  void SetCertVerifyProc(v8::Local<v8::Value> proc, mate::Arguments* args);
-+  void SetPermissionRequestHandler(v8::Local<v8::Value> val,
-+                                   mate::Arguments* args);
-+  void ClearHostResolverCache(mate::Arguments* args);
-+  v8::Local<v8::Value> Cookies(v8::Isolate* isolate);
-+  v8::Local<v8::Value> WebRequest(v8::Isolate* isolate);
-+
-+  // Cached object.
-+  v8::Global<v8::Value> cookies_;
-+  v8::Global<v8::Value> web_request_;
-+
-+  scoped_refptr<ElectronBrowserContext> browser_context_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(Session);
-+};
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_API_ELECTRON_API_SESSION_H_
-added in remote
-  their  100644 c4dc2ddb2c7d674db6837be3859e4d98001816ee electron/browser/api/electron_api_tray.cc
-@@ -0,0 +1,187 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/api/electron_api_tray.h"
-+
-+#include <string>
-+
-+#include "electron/browser/api/electron_api_menu.h"
-+#include "electron/browser/browser.h"
-+#include "electron/browser/ui/tray_icon.h"
-+#include "electron/common/native_mate_converters/gfx_converter.h"
-+#include "electron/common/native_mate_converters/image_converter.h"
-+#include "electron/common/native_mate_converters/string16_converter.h"
-+#include "electron/common/node_includes.h"
-+#include "native_mate/constructor.h"
-+#include "native_mate/dictionary.h"
-+#include "ui/events/event_constants.h"
-+#include "ui/gfx/image/image.h"
-+
-+namespace electron {
-+
-+namespace api {
-+
-+Tray::Tray(const gfx::Image& image)
-+    : tray_icon_(TrayIcon::Create()) {
-+  tray_icon_->SetImage(image);
-+  tray_icon_->AddObserver(this);
-+}
-+
-+Tray::~Tray() {
-+}
-+
-+// static
-+mate::Wrappable* Tray::New(v8::Isolate* isolate, const gfx::Image& image) {
-+  if (!Browser::Get()->is_ready()) {
-+    isolate->ThrowException(v8::Exception::Error(mate::StringToV8(
-+        isolate, "Cannot create Tray before app is ready")));
-+    return nullptr;
-+  }
-+  return new Tray(image);
-+}
-+
-+void Tray::OnClicked(const gfx::Rect& bounds, int modifiers) {
-+  v8::Locker locker(isolate());
-+  v8::HandleScope handle_scope(isolate());
-+  EmitCustomEvent("click",
-+                  ModifiersToObject(isolate(), modifiers), bounds);
-+}
-+
-+void Tray::OnDoubleClicked(const gfx::Rect& bounds, int modifiers) {
-+  v8::Locker locker(isolate());
-+  v8::HandleScope handle_scope(isolate());
-+  EmitCustomEvent("double-click",
-+                  ModifiersToObject(isolate(), modifiers), bounds);
-+}
-+
-+void Tray::OnRightClicked(const gfx::Rect& bounds, int modifiers) {
-+  v8::Locker locker(isolate());
-+  v8::HandleScope handle_scope(isolate());
-+  EmitCustomEvent("right-click",
-+                  ModifiersToObject(isolate(), modifiers), bounds);
-+}
-+
-+void Tray::OnBalloonShow() {
-+  Emit("balloon-show");
-+}
-+
-+void Tray::OnBalloonClicked() {
-+  Emit("balloon-click");
-+}
-+
-+void Tray::OnBalloonClosed() {
-+  Emit("balloon-closed");
-+}
-+
-+void Tray::OnDrop() {
-+  Emit("drop");
-+}
-+
-+void Tray::OnDropFiles(const std::vector<std::string>& files) {
-+  Emit("drop-files", files);
-+}
-+
-+void Tray::OnDragEntered() {
-+  Emit("drag-enter");
-+}
-+
-+void Tray::OnDragExited() {
-+  Emit("drag-leave");
-+}
-+
-+void Tray::OnDragEnded() {
-+  Emit("drag-end");
-+}
-+
-+void Tray::SetImage(mate::Arguments* args, const gfx::Image& image) {
-+  tray_icon_->SetImage(image);
-+}
-+
-+void Tray::SetPressedImage(mate::Arguments* args, const gfx::Image& image) {
-+  tray_icon_->SetPressedImage(image);
-+}
-+
-+void Tray::SetToolTip(mate::Arguments* args, const std::string& tool_tip) {
-+  tray_icon_->SetToolTip(tool_tip);
-+}
-+
-+void Tray::SetTitle(mate::Arguments* args, const std::string& title) {
-+  tray_icon_->SetTitle(title);
-+}
-+
-+void Tray::SetHighlightMode(mate::Arguments* args, bool highlight) {
-+  tray_icon_->SetHighlightMode(highlight);
-+}
-+
-+void Tray::DisplayBalloon(mate::Arguments* args,
-+                          const mate::Dictionary& options) {
-+  gfx::Image icon;
-+  options.Get("icon", &icon);
-+  base::string16 title, content;
-+  if (!options.Get("title", &title) ||
-+      !options.Get("content", &content)) {
-+    args->ThrowError("'title' and 'content' must be defined");
-+    return;
-+  }
-+
-+  tray_icon_->DisplayBalloon(icon, title, content);
-+}
-+
-+void Tray::PopUpContextMenu(mate::Arguments* args) {
-+  mate::Handle<Menu> menu;
-+  args->GetNext(&menu);
-+  gfx::Point pos;
-+  args->GetNext(&pos);
-+  tray_icon_->PopUpContextMenu(pos, menu.IsEmpty() ? nullptr : menu->model());
-+}
-+
-+void Tray::SetContextMenu(mate::Arguments* args, Menu* menu) {
-+  tray_icon_->SetContextMenu(menu->model());
-+}
-+
-+v8::Local<v8::Object> Tray::ModifiersToObject(v8::Isolate* isolate,
-+                                              int modifiers) {
-+  mate::Dictionary obj(isolate, v8::Object::New(isolate));
-+  obj.Set("shiftKey", static_cast<bool>(modifiers & ui::EF_SHIFT_DOWN));
-+  obj.Set("ctrlKey", static_cast<bool>(modifiers & ui::EF_CONTROL_DOWN));
-+  obj.Set("altKey", static_cast<bool>(modifiers & ui::EF_ALT_DOWN));
-+  obj.Set("metaKey", static_cast<bool>(modifiers & ui::EF_COMMAND_DOWN));
-+  return obj.GetHandle();
-+}
-+
-+// static
-+void Tray::BuildPrototype(v8::Isolate* isolate,
-+                          v8::Local<v8::ObjectTemplate> prototype) {
-+  mate::ObjectTemplateBuilder(isolate, prototype)
-+      .MakeDestroyable()
-+      .SetMethod("setImage", &Tray::SetImage)
-+      .SetMethod("setPressedImage", &Tray::SetPressedImage)
-+      .SetMethod("setToolTip", &Tray::SetToolTip)
-+      .SetMethod("setTitle", &Tray::SetTitle)
-+      .SetMethod("setHighlightMode", &Tray::SetHighlightMode)
-+      .SetMethod("displayBalloon", &Tray::DisplayBalloon)
-+      .SetMethod("popUpContextMenu", &Tray::PopUpContextMenu)
-+      .SetMethod("_setContextMenu", &Tray::SetContextMenu);
-+}
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+
-+namespace {
-+
-+void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
-+                v8::Local<v8::Context> context, void* priv) {
-+  using electron::api::Tray;
-+  v8::Isolate* isolate = context->GetIsolate();
-+  v8::Local<v8::Function> constructor = mate::CreateConstructor<Tray>(
-+      isolate, "Tray", base::Bind(&Tray::New));
-+  mate::Dictionary dict(isolate, exports);
-+  dict.Set("Tray", static_cast<v8::Local<v8::Value>>(constructor));
-+}
-+
-+}  // namespace
-+
-+NODE_MODULE_CONTEXT_AWARE_BUILTIN(electron_browser_tray, Initialize)
-added in remote
-  their  100644 9fbea743753d9ba05213db03e0136a84388b0a26 electron/browser/api/electron_api_tray.h
-@@ -0,0 +1,78 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_API_ELECTRON_API_TRAY_H_
-+#define ELECTRON_BROWSER_API_ELECTRON_API_TRAY_H_
-+
-+#include <string>
-+#include <vector>
-+
-+#include "electron/browser/api/trackable_object.h"
-+#include "electron/browser/ui/tray_icon_observer.h"
-+#include "base/memory/scoped_ptr.h"
-+
-+namespace gfx {
-+class Image;
-+}
-+
-+namespace mate {
-+class Arguments;
-+class Dictionary;
-+}
-+
-+namespace electron {
-+
-+class TrayIcon;
-+
-+namespace api {
-+
-+class Menu;
-+
-+class Tray : public mate::TrackableObject<Tray>,
-+             public TrayIconObserver {
-+ public:
-+  static mate::Wrappable* New(v8::Isolate* isolate, const gfx::Image& image);
-+
-+  static void BuildPrototype(v8::Isolate* isolate,
-+                             v8::Local<v8::ObjectTemplate> prototype);
-+
-+ protected:
-+  explicit Tray(const gfx::Image& image);
-+  ~Tray() override;
-+
-+  // TrayIconObserver:
-+  void OnClicked(const gfx::Rect& bounds, int modifiers) override;
-+  void OnDoubleClicked(const gfx::Rect& bounds, int modifiers) override;
-+  void OnRightClicked(const gfx::Rect& bounds, int modifiers) override;
-+  void OnBalloonShow() override;
-+  void OnBalloonClicked() override;
-+  void OnBalloonClosed() override;
-+  void OnDrop() override;
-+  void OnDropFiles(const std::vector<std::string>& files) override;
-+  void OnDragEntered() override;
-+  void OnDragExited() override;
-+  void OnDragEnded() override;
-+
-+  void SetImage(mate::Arguments* args, const gfx::Image& image);
-+  void SetPressedImage(mate::Arguments* args, const gfx::Image& image);
-+  void SetToolTip(mate::Arguments* args, const std::string& tool_tip);
-+  void SetTitle(mate::Arguments* args, const std::string& title);
-+  void SetHighlightMode(mate::Arguments* args, bool highlight);
-+  void DisplayBalloon(mate::Arguments* args, const mate::Dictionary& options);
-+  void PopUpContextMenu(mate::Arguments* args);
-+  void SetContextMenu(mate::Arguments* args, Menu* menu);
-+
-+ private:
-+  v8::Local<v8::Object> ModifiersToObject(v8::Isolate* isolate, int modifiers);
-+
-+  scoped_ptr<TrayIcon> tray_icon_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(Tray);
-+};
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_API_ELECTRON_API_TRAY_H_
-added in remote
-  their  100644 488f516a3e91fa3856ea503a46d38dfd06d25f1d electron/browser/api/electron_api_web_contents.cc
-@@ -0,0 +1,1286 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/api/electron_api_web_contents.h"
-+
-+#include <set>
-+#include <string>
-+
-+#include "electron/browser/api/electron_api_debugger.h"
-+#include "electron/browser/api/electron_api_session.h"
-+#include "electron/browser/api/electron_api_window.h"
-+#include "electron/browser/electron_browser_client.h"
-+#include "electron/browser/electron_browser_context.h"
-+#include "electron/browser/electron_browser_main_parts.h"
-+#include "electron/browser/native_window.h"
-+#include "electron/browser/web_contents_permission_helper.h"
-+#include "electron/browser/web_contents_preferences.h"
-+#include "electron/browser/web_view_guest_delegate.h"
-+#include "electron/common/api/api_messages.h"
-+#include "electron/common/api/event_emitter_caller.h"
-+#include "electron/common/native_mate_converters/blink_converter.h"
-+#include "electron/common/native_mate_converters/callback.h"
-+#include "electron/common/native_mate_converters/content_converter.h"
-+#include "electron/common/native_mate_converters/file_path_converter.h"
-+#include "electron/common/native_mate_converters/gfx_converter.h"
-+#include "electron/common/native_mate_converters/gurl_converter.h"
-+#include "electron/common/native_mate_converters/image_converter.h"
-+#include "electron/common/native_mate_converters/string16_converter.h"
-+#include "electron/common/native_mate_converters/value_converter.h"
-+#include "electron/common/mouse_util.h"
-+#include "base/strings/string_util.h"
-+#include "base/strings/utf_string_conversions.h"
-+#include "brightray/browser/inspectable_web_contents.h"
-+#include "brightray/browser/inspectable_web_contents_view.h"
-+#include "chrome/browser/printing/print_view_manager_basic.h"
-+#include "chrome/browser/printing/print_preview_message_handler.h"
-+#include "content/common/view_messages.h"
-+#include "content/public/browser/favicon_status.h"
-+#include "content/public/browser/native_web_keyboard_event.h"
-+#include "content/public/browser/navigation_details.h"
-+#include "content/public/browser/navigation_entry.h"
-+#include "content/public/browser/plugin_service.h"
-+#include "content/public/browser/render_frame_host.h"
-+#include "content/public/browser/render_process_host.h"
-+#include "content/public/browser/render_view_host.h"
-+#include "content/public/browser/render_widget_host.h"
-+#include "content/public/browser/render_widget_host_view.h"
-+#include "content/public/browser/resource_request_details.h"
-+#include "content/public/browser/service_worker_context.h"
-+#include "content/public/browser/storage_partition.h"
-+#include "content/public/browser/site_instance.h"
-+#include "content/public/browser/web_contents.h"
-+#include "content/public/common/context_menu_params.h"
-+#include "native_mate/dictionary.h"
-+#include "native_mate/object_template_builder.h"
-+#include "net/http/http_response_headers.h"
-+#include "net/url_request/static_http_user_agent_settings.h"
-+#include "net/url_request/url_request_context.h"
-+#include "third_party/WebKit/public/web/WebInputEvent.h"
-+#include "ui/base/l10n/l10n_util.h"
-+
-+#include "electron/common/node_includes.h"
-+
-+namespace {
-+
-+struct PrintSettings {
-+  bool silent;
-+  bool print_background;
-+};
-+
-+void SetUserAgentInIO(scoped_refptr<net::URLRequestContextGetter> getter,
-+                      std::string accept_lang,
-+                      std::string user_agent) {
-+  getter->GetURLRequestContext()->set_http_user_agent_settings(
-+      new net::StaticHttpUserAgentSettings(
-+          net::HttpUtil::GenerateAcceptLanguageHeader(accept_lang),
-+          user_agent));
-+}
-+
-+}  // namespace
-+
-+namespace mate {
-+
-+template<>
-+struct Converter<electron::SetSizeParams> {
-+  static bool FromV8(v8::Isolate* isolate,
-+                     v8::Local<v8::Value> val,
-+                     electron::SetSizeParams* out) {
-+    mate::Dictionary params;
-+    if (!ConvertFromV8(isolate, val, &params))
-+      return false;
-+    bool autosize;
-+    if (params.Get("enableAutoSize", &autosize))
-+      out->enable_auto_size.reset(new bool(true));
-+    gfx::Size size;
-+    if (params.Get("min", &size))
-+      out->min_size.reset(new gfx::Size(size));
-+    if (params.Get("max", &size))
-+      out->max_size.reset(new gfx::Size(size));
-+    if (params.Get("normal", &size))
-+      out->normal_size.reset(new gfx::Size(size));
-+    return true;
-+  }
-+};
-+
-+template<>
-+struct Converter<PrintSettings> {
-+  static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
-+                     PrintSettings* out) {
-+    mate::Dictionary dict;
-+    if (!ConvertFromV8(isolate, val, &dict))
-+      return false;
-+    dict.Get("silent", &(out->silent));
-+    dict.Get("printBackground", &(out->print_background));
-+    return true;
-+  }
-+};
-+
-+template<>
-+struct Converter<WindowOpenDisposition> {
-+  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-+                                   WindowOpenDisposition val) {
-+    std::string disposition = "other";
-+    switch (val) {
-+      case CURRENT_TAB: disposition = "default"; break;
-+      case NEW_FOREGROUND_TAB: disposition = "foreground-tab"; break;
-+      case NEW_BACKGROUND_TAB: disposition = "background-tab"; break;
-+      case NEW_POPUP: case NEW_WINDOW: disposition = "new-window"; break;
-+      default: break;
-+    }
-+    return mate::ConvertToV8(isolate, disposition);
-+  }
-+};
-+
-+template<>
-+struct Converter<net::HttpResponseHeaders*> {
-+  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-+                                   net::HttpResponseHeaders* headers) {
-+    base::DictionaryValue response_headers;
-+    if (headers) {
-+      void* iter = nullptr;
-+      std::string key;
-+      std::string value;
-+      while (headers->EnumerateHeaderLines(&iter, &key, &value)) {
-+        key = base::ToLowerASCII(key);
-+        if (response_headers.HasKey(key)) {
-+          base::ListValue* values = nullptr;
-+          if (response_headers.GetList(key, &values))
-+            values->AppendString(value);
-+        } else {
-+          scoped_ptr<base::ListValue> values(new base::ListValue());
-+          values->AppendString(value);
-+          response_headers.Set(key, std::move(values));
-+        }
-+      }
-+    }
-+    return ConvertToV8(isolate, response_headers);
-+  }
-+};
-+
-+template<>
-+struct Converter<content::SavePageType> {
-+  static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
-+                     content::SavePageType* out) {
-+    std::string save_type;
-+    if (!ConvertFromV8(isolate, val, &save_type))
-+      return false;
-+    save_type = base::ToLowerASCII(save_type);
-+    if (save_type == "htmlonly") {
-+      *out = content::SAVE_PAGE_TYPE_AS_ONLY_HTML;
-+    } else if (save_type == "htmlcomplete") {
-+      *out = content::SAVE_PAGE_TYPE_AS_COMPLETE_HTML;
-+    } else if (save_type == "mhtml") {
-+      *out = content::SAVE_PAGE_TYPE_AS_MHTML;
-+    } else {
-+      return false;
-+    }
-+    return true;
-+  }
-+};
-+
-+}  // namespace mate
-+
-+
-+namespace electron {
-+
-+namespace api {
-+
-+namespace {
-+
-+// The wrapWebContents function which is implemented in JavaScript
-+using WrapWebContentsCallback = base::Callback<void(v8::Local<v8::Value>)>;
-+WrapWebContentsCallback g_wrap_web_contents;
-+
-+content::ServiceWorkerContext* GetServiceWorkerContext(
-+    const content::WebContents* web_contents) {
-+  auto context = web_contents->GetBrowserContext();
-+  auto site_instance = web_contents->GetSiteInstance();
-+  if (!context || !site_instance)
-+    return nullptr;
-+
-+  auto storage_partition =
-+      content::BrowserContext::GetStoragePartition(context, site_instance);
-+  if (!storage_partition)
-+    return nullptr;
-+
-+  return storage_partition->GetServiceWorkerContext();
-+}
-+
-+}  // namespace
-+
-+WebContents::WebContents(content::WebContents* web_contents)
-+    : content::WebContentsObserver(web_contents),
-+      type_(REMOTE) {
-+  AttachAsUserData(web_contents);
-+  web_contents->SetUserAgentOverride(GetBrowserContext()->GetUserAgent());
-+}
-+
-+WebContents::WebContents(v8::Isolate* isolate,
-+                         const mate::Dictionary& options)
-+    : embedder_(nullptr),
-+      request_id_(0) {
-+  // Whether it is a guest WebContents.
-+  bool is_guest = false;
-+  options.Get("isGuest", &is_guest);
-+  type_ = is_guest ? WEB_VIEW : BROWSER_WINDOW;
-+
-+  // Obtain the session.
-+  std::string partition;
-+  mate::Handle<api::Session> session;
-+  if (options.Get("session", &session)) {
-+  } else if (options.Get("partition", &partition) && !partition.empty()) {
-+    bool in_memory = true;
-+    if (base::StartsWith(partition, "persist:", base::CompareCase::SENSITIVE)) {
-+      in_memory = false;
-+      partition = partition.substr(8);
-+    }
-+    session = Session::FromPartition(isolate, partition, in_memory);
-+  } else {
-+    // Use the default session if not specified.
-+    session = Session::FromPartition(isolate, "", false);
-+  }
-+  session_.Reset(isolate, session.ToV8());
-+
-+  content::WebContents* web_contents;
-+  if (is_guest) {
-+    content::SiteInstance* site_instance = content::SiteInstance::CreateForURL(
-+        session->browser_context(), GURL("chrome-guest://fake-host"));
-+    content::WebContents::CreateParams params(
-+        session->browser_context(), site_instance);
-+    guest_delegate_.reset(new WebViewGuestDelegate);
-+    params.guest_delegate = guest_delegate_.get();
-+    web_contents = content::WebContents::Create(params);
-+  } else {
-+    content::WebContents::CreateParams params(session->browser_context());
-+    web_contents = content::WebContents::Create(params);
-+  }
-+
-+  Observe(web_contents);
-+  AttachAsUserData(web_contents);
-+  InitWithWebContents(web_contents);
-+
-+  managed_web_contents()->GetView()->SetDelegate(this);
-+
-+  // Save the preferences in C++.
-+  new WebContentsPreferences(web_contents, options);
-+
-+  // Intialize permission helper.
-+  WebContentsPermissionHelper::CreateForWebContents(web_contents);
-+
-+  web_contents->SetUserAgentOverride(GetBrowserContext()->GetUserAgent());
-+
-+  if (is_guest) {
-+    guest_delegate_->Initialize(this);
-+
-+    NativeWindow* owner_window = nullptr;
-+    if (options.Get("embedder", &embedder_) && embedder_) {
-+      // New WebContents's owner_window is the embedder's owner_window.
-+      auto relay =
-+          NativeWindowRelay::FromWebContents(embedder_->web_contents());
-+      if (relay)
-+        owner_window = relay->window.get();
-+    }
-+    if (owner_window)
-+      SetOwnerWindow(owner_window);
-+  }
-+}
-+
-+WebContents::~WebContents() {
-+  // The destroy() is called.
-+  if (managed_web_contents()) {
-+    // For webview we need to tell content module to do some cleanup work before
-+    // destroying it.
-+    if (type_ == WEB_VIEW)
-+      guest_delegate_->Destroy();
-+
-+    // The WebContentsDestroyed will not be called automatically because we
-+    // unsubscribe from webContents before destroying it. So we have to manually
-+    // call it here to make sure "destroyed" event is emitted.
-+    RenderViewDeleted(web_contents()->GetRenderViewHost());
-+    WebContentsDestroyed();
-+  }
-+}
-+
-+bool WebContents::AddMessageToConsole(content::WebContents* source,
-+                                      int32_t level,
-+                                      const base::string16& message,
-+                                      int32_t line_no,
-+                                      const base::string16& source_id) {
-+  if (type_ == BROWSER_WINDOW) {
-+    return false;
-+  } else {
-+    Emit("console-message", level, message, line_no, source_id);
-+    return true;
-+  }
-+}
-+
-+bool WebContents::ShouldCreateWebContents(
-+    content::WebContents* web_contents,
-+    int32_t route_id,
-+    int32_t main_frame_route_id,
-+    int32_t main_frame_widget_route_id,
-+    WindowContainerType window_container_type,
-+    const std::string& frame_name,
-+    const GURL& target_url,
-+    const std::string& partition_id,
-+    content::SessionStorageNamespace* session_storage_namespace) {
-+  if (type_ == BROWSER_WINDOW)
-+    Emit("-new-window", target_url, frame_name, NEW_FOREGROUND_TAB);
-+  else
-+    Emit("new-window", target_url, frame_name, NEW_FOREGROUND_TAB);
-+  return false;
-+}
-+
-+content::WebContents* WebContents::OpenURLFromTab(
-+    content::WebContents* source,
-+    const content::OpenURLParams& params) {
-+  if (params.disposition != CURRENT_TAB) {
-+    if (type_ == BROWSER_WINDOW)
-+      Emit("-new-window", params.url, "", params.disposition);
-+    else
-+      Emit("new-window", params.url, "", params.disposition);
-+    return nullptr;
-+  }
-+
-+  // Give user a chance to cancel navigation.
-+  if (Emit("will-navigate", params.url))
-+    return nullptr;
-+
-+  return CommonWebContentsDelegate::OpenURLFromTab(source, params);
-+}
-+
-+void WebContents::BeforeUnloadFired(content::WebContents* tab,
-+                                    bool proceed,
-+                                    bool* proceed_to_fire_unload) {
-+  if (type_ == BROWSER_WINDOW)
-+    *proceed_to_fire_unload = proceed;
-+  else
-+    *proceed_to_fire_unload = true;
-+}
-+
-+void WebContents::MoveContents(content::WebContents* source,
-+                               const gfx::Rect& pos) {
-+  Emit("move", pos);
-+}
-+
-+void WebContents::CloseContents(content::WebContents* source) {
-+  Emit("close");
-+  if (type_ == BROWSER_WINDOW)
-+    owner_window()->CloseContents(source);
-+}
-+
-+void WebContents::ActivateContents(content::WebContents* source) {
-+  Emit("activate");
-+}
-+
-+bool WebContents::IsPopupOrPanel(const content::WebContents* source) const {
-+  return type_ == BROWSER_WINDOW;
-+}
-+
-+void WebContents::HandleKeyboardEvent(
-+    content::WebContents* source,
-+    const content::NativeWebKeyboardEvent& event) {
-+  if (event.windowsKeyCode == ui::VKEY_ESCAPE && is_html_fullscreen()) {
-+    // Escape exits tabbed fullscreen mode.
-+    ExitFullscreenModeForTab(source);
-+  } else if (type_ == BROWSER_WINDOW) {
-+    owner_window()->HandleKeyboardEvent(source, event);
-+  } else if (type_ == WEB_VIEW && guest_delegate_) {
-+    // Send the unhandled keyboard events back to the embedder.
-+    guest_delegate_->HandleKeyboardEvent(source, event);
-+  }
-+}
-+
-+void WebContents::EnterFullscreenModeForTab(content::WebContents* source,
-+                                            const GURL& origin) {
-+  auto permission_helper =
-+      WebContentsPermissionHelper::FromWebContents(source);
-+  auto callback = base::Bind(&WebContents::OnEnterFullscreenModeForTab,
-+                             base::Unretained(this), source, origin);
-+  permission_helper->RequestFullscreenPermission(callback);
-+}
-+
-+void WebContents::OnEnterFullscreenModeForTab(content::WebContents* source,
-+                                              const GURL& origin,
-+                                              bool allowed) {
-+  if (!allowed)
-+    return;
-+  CommonWebContentsDelegate::EnterFullscreenModeForTab(source, origin);
-+  Emit("enter-html-full-screen");
-+}
-+
-+void WebContents::ExitFullscreenModeForTab(content::WebContents* source) {
-+  CommonWebContentsDelegate::ExitFullscreenModeForTab(source);
-+  Emit("leave-html-full-screen");
-+}
-+
-+void WebContents::RendererUnresponsive(content::WebContents* source) {
-+  Emit("unresponsive");
-+  if (type_ == BROWSER_WINDOW)
-+    owner_window()->RendererUnresponsive(source);
-+}
-+
-+void WebContents::RendererResponsive(content::WebContents* source) {
-+  Emit("responsive");
-+  if (type_ == BROWSER_WINDOW)
-+    owner_window()->RendererResponsive(source);
-+}
-+
-+bool WebContents::HandleContextMenu(const content::ContextMenuParams& params) {
-+  if (!params.custom_context.is_pepper_menu)
-+    return false;
-+
-+  Emit("pepper-context-menu", std::make_pair(params, web_contents()));
-+  web_contents()->NotifyContextMenuClosed(params.custom_context);
-+  return true;
-+}
-+
-+bool WebContents::OnGoToEntryOffset(int offset) {
-+  GoToOffset(offset);
-+  return false;
-+}
-+
-+void WebContents::FindReply(content::WebContents* web_contents,
-+                            int request_id,
-+                            int number_of_matches,
-+                            const gfx::Rect& selection_rect,
-+                            int active_match_ordinal,
-+                            bool final_update) {
-+  v8::Locker locker(isolate());
-+  v8::HandleScope handle_scope(isolate());
-+
-+  mate::Dictionary result = mate::Dictionary::CreateEmpty(isolate());
-+  if (number_of_matches == -1) {
-+    result.Set("requestId", request_id);
-+    result.Set("selectionArea", selection_rect);
-+    result.Set("finalUpdate", final_update);
-+    result.Set("activeMatchOrdinal", active_match_ordinal);
-+    Emit("found-in-page", result);
-+  } else if (final_update) {
-+    result.Set("requestId", request_id);
-+    result.Set("matches", number_of_matches);
-+    result.Set("finalUpdate", final_update);
-+    Emit("found-in-page", result);
-+  }
-+}
-+
-+bool WebContents::CheckMediaAccessPermission(
-+    content::WebContents* web_contents,
-+    const GURL& security_origin,
-+    content::MediaStreamType type) {
-+  return true;
-+}
-+
-+void WebContents::RequestMediaAccessPermission(
-+    content::WebContents* web_contents,
-+    const content::MediaStreamRequest& request,
-+    const content::MediaResponseCallback& callback) {
-+  auto permission_helper =
-+      WebContentsPermissionHelper::FromWebContents(web_contents);
-+  permission_helper->RequestMediaAccessPermission(request, callback);
-+}
-+
-+void WebContents::RequestToLockMouse(
-+    content::WebContents* web_contents,
-+    bool user_gesture,
-+    bool last_unlocked_by_target) {
-+  auto permission_helper =
-+      WebContentsPermissionHelper::FromWebContents(web_contents);
-+  permission_helper->RequestPointerLockPermission(user_gesture);
-+}
-+
-+void WebContents::BeforeUnloadFired(const base::TimeTicks& proceed_time) {
-+  // Do nothing, we override this method just to avoid compilation error since
-+  // there are two virtual functions named BeforeUnloadFired.
-+}
-+
-+void WebContents::RenderViewDeleted(content::RenderViewHost* render_view_host) {
-+  Emit("render-view-deleted", render_view_host->GetProcess()->GetID());
-+}
-+
-+void WebContents::RenderProcessGone(base::TerminationStatus status) {
-+  Emit("crashed");
-+}
-+
-+void WebContents::PluginCrashed(const base::FilePath& plugin_path,
-+                                base::ProcessId plugin_pid) {
-+  content::WebPluginInfo info;
-+  auto plugin_service = content::PluginService::GetInstance();
-+  plugin_service->GetPluginInfoByPath(plugin_path, &info);
-+  Emit("plugin-crashed", info.name, info.version);
-+}
-+
-+void WebContents::MediaStartedPlaying(const MediaPlayerId& id) {
-+  Emit("media-started-playing");
-+}
-+
-+void WebContents::MediaStoppedPlaying(const MediaPlayerId& id) {
-+  Emit("media-paused");
-+}
-+
-+void WebContents::DidChangeThemeColor(SkColor theme_color) {
-+  std::string hex_theme_color = base::StringPrintf("#%02X%02X%02X",
-+    SkColorGetR(theme_color),
-+    SkColorGetG(theme_color),
-+    SkColorGetB(theme_color));
-+  Emit("did-change-theme-color", hex_theme_color);
-+}
-+
-+void WebContents::DocumentLoadedInFrame(
-+    content::RenderFrameHost* render_frame_host) {
-+  if (!render_frame_host->GetParent())
-+    Emit("dom-ready");
-+}
-+
-+void WebContents::DidFinishLoad(content::RenderFrameHost* render_frame_host,
-+                                const GURL& validated_url) {
-+  bool is_main_frame = !render_frame_host->GetParent();
-+  Emit("did-frame-finish-load", is_main_frame);
-+
-+  if (is_main_frame)
-+    Emit("did-finish-load");
-+}
-+
-+void WebContents::DidFailProvisionalLoad(
-+    content::RenderFrameHost* render_frame_host,
-+    const GURL& url,
-+    int error_code,
-+    const base::string16& error_description,
-+    bool was_ignored_by_handler) {
-+  Emit("did-fail-provisional-load", error_code, error_description, url);
-+}
-+
-+void WebContents::DidFailLoad(content::RenderFrameHost* render_frame_host,
-+                              const GURL& validated_url,
-+                              int error_code,
-+                              const base::string16& error_description,
-+                              bool was_ignored_by_handler) {
-+  Emit("did-fail-load", error_code, error_description, validated_url);
-+}
-+
-+void WebContents::DidStartLoading() {
-+  Emit("did-start-loading");
-+}
-+
-+void WebContents::DidStopLoading() {
-+  Emit("did-stop-loading");
-+}
-+
-+void WebContents::DidGetResourceResponseStart(
-+    const content::ResourceRequestDetails& details) {
-+  Emit("did-get-response-details",
-+       details.socket_address.IsEmpty(),
-+       details.url,
-+       details.original_url,
-+       details.http_response_code,
-+       details.method,
-+       details.referrer,
-+       details.headers.get());
-+}
-+
-+void WebContents::DidGetRedirectForResourceRequest(
-+    content::RenderFrameHost* render_frame_host,
-+    const content::ResourceRedirectDetails& details) {
-+  Emit("did-get-redirect-request",
-+       details.url,
-+       details.new_url,
-+       (details.resource_type == content::RESOURCE_TYPE_MAIN_FRAME),
-+       details.http_response_code,
-+       details.method,
-+       details.referrer,
-+       details.headers.get());
-+}
-+
-+void WebContents::DidNavigateMainFrame(
-+    const content::LoadCommittedDetails& details,
-+    const content::FrameNavigateParams& params) {
-+  if (details.is_navigation_to_different_page())
-+    Emit("did-navigate", params.url);
-+  else if (details.is_in_page)
-+    Emit("did-navigate-in-page", params.url);
-+}
-+
-+void WebContents::TitleWasSet(content::NavigationEntry* entry,
-+                              bool explicit_set) {
-+  if (entry)
-+    Emit("-page-title-updated", entry->GetTitle(), explicit_set);
-+  else
-+    Emit("-page-title-updated", "", explicit_set);
-+}
-+
-+void WebContents::DidUpdateFaviconURL(
-+    const std::vector<content::FaviconURL>& urls) {
-+  std::set<GURL> unique_urls;
-+  for (auto iter = urls.begin(); iter != urls.end(); ++iter) {
-+    if (iter->icon_type != content::FaviconURL::FAVICON)
-+      continue;
-+    const GURL& url = iter->icon_url;
-+    if (url.is_valid())
-+      unique_urls.insert(url);
-+  }
-+  Emit("page-favicon-updated", unique_urls);
-+}
-+
-+void WebContents::DevToolsFocused() {
-+  Emit("devtools-focused");
-+}
-+
-+void WebContents::DevToolsOpened() {
-+  v8::Locker locker(isolate());
-+  v8::HandleScope handle_scope(isolate());
-+  auto handle = WebContents::CreateFrom(
-+      isolate(), managed_web_contents()->GetDevToolsWebContents());
-+  devtools_web_contents_.Reset(isolate(), handle.ToV8());
-+
-+  // Inherit owner window in devtools.
-+  if (owner_window())
-+    handle->SetOwnerWindow(managed_web_contents()->GetDevToolsWebContents(),
-+                           owner_window());
-+
-+  Emit("devtools-opened");
-+}
-+
-+void WebContents::DevToolsClosed() {
-+  v8::Locker locker(isolate());
-+  v8::HandleScope handle_scope(isolate());
-+  devtools_web_contents_.Reset();
-+
-+  Emit("devtools-closed");
-+}
-+
-+bool WebContents::OnMessageReceived(const IPC::Message& message) {
-+  bool handled = true;
-+  IPC_BEGIN_MESSAGE_MAP(WebContents, message)
-+    IPC_MESSAGE_HANDLER(ElectronViewHostMsg_Message, OnRendererMessage)
-+    IPC_MESSAGE_HANDLER_DELAY_REPLY(ElectronViewHostMsg_Message_Sync,
-+                                    OnRendererMessageSync)
-+    IPC_MESSAGE_HANDLER_CODE(ViewHostMsg_SetCursor, OnCursorChange,
-+      handled = false)
-+    IPC_MESSAGE_UNHANDLED(handled = false)
-+  IPC_END_MESSAGE_MAP()
-+
-+  return handled;
-+}
-+
-+// There are three ways of destroying a webContents:
-+// 1. call webContents.destory();
-+// 2. garbage collection;
-+// 3. user closes the window of webContents;
-+// For webview only #1 will happen, for BrowserWindow both #1 and #3 may
-+// happen. The #2 should never happen for webContents, because webview is
-+// managed by GuestViewManager, and BrowserWindow's webContents is managed
-+// by api::Window.
-+// For #1, the destructor will do the cleanup work and we only need to make
-+// sure "destroyed" event is emitted. For #3, the content::WebContents will
-+// be destroyed on close, and WebContentsDestroyed would be called for it, so
-+// we need to make sure the api::WebContents is also deleted.
-+void WebContents::WebContentsDestroyed() {
-+  // This event is only for internal use, which is emitted when WebContents is
-+  // being destroyed.
-+  Emit("will-destroy");
-+
-+  // Cleanup relationships with other parts.
-+  RemoveFromWeakMap();
-+
-+  // We can not call Destroy here because we need to call Emit first, but we
-+  // also do not want any method to be used, so just mark as destroyed here.
-+  MarkDestroyed();
-+
-+  Emit("destroyed");
-+
-+  // Destroy the native class in next tick.
-+  base::MessageLoop::current()->PostTask(FROM_HERE, GetDestroyClosure());
-+}
-+
-+void WebContents::NavigationEntryCommitted(
-+    const content::LoadCommittedDetails& details) {
-+  Emit("navigation-entry-commited", details.entry->GetURL(),
-+       details.is_in_page, details.did_replace_entry);
-+}
-+
-+int WebContents::GetID() const {
-+  return web_contents()->GetRenderProcessHost()->GetID();
-+}
-+
-+bool WebContents::Equal(const WebContents* web_contents) const {
-+  return GetID() == web_contents->GetID();
-+}
-+
-+void WebContents::LoadURL(const GURL& url, const mate::Dictionary& options) {
-+  if (!url.is_valid()) {
-+    Emit("did-fail-load",
-+         static_cast<int>(net::ERR_INVALID_URL),
-+         net::ErrorToShortString(net::ERR_INVALID_URL),
-+         url.possibly_invalid_spec());
-+    return;
-+  }
-+
-+  content::NavigationController::LoadURLParams params(url);
-+
-+  GURL http_referrer;
-+  if (options.Get("httpReferrer", &http_referrer))
-+    params.referrer = content::Referrer(http_referrer.GetAsReferrer(),
-+                                        blink::WebReferrerPolicyDefault);
-+
-+  std::string user_agent;
-+  if (options.Get("userAgent", &user_agent))
-+    SetUserAgent(user_agent);
-+
-+  std::string extra_headers;
-+  if (options.Get("extraHeaders", &extra_headers))
-+    params.extra_headers = extra_headers;
-+
-+  params.transition_type = ui::PAGE_TRANSITION_TYPED;
-+  params.should_clear_history_list = true;
-+  params.override_user_agent = content::NavigationController::UA_OVERRIDE_TRUE;
-+  web_contents()->GetController().LoadURLWithParams(params);
-+}
-+
-+void WebContents::DownloadURL(const GURL& url) {
-+  auto browser_context = web_contents()->GetBrowserContext();
-+  auto download_manager =
-+    content::BrowserContext::GetDownloadManager(browser_context);
-+
-+  download_manager->DownloadUrl(
-+    content::DownloadUrlParameters::FromWebContents(web_contents(), url));
-+}
-+
-+GURL WebContents::GetURL() const {
-+  return web_contents()->GetURL();
-+}
-+
-+base::string16 WebContents::GetTitle() const {
-+  return web_contents()->GetTitle();
-+}
-+
-+bool WebContents::IsLoading() const {
-+  return web_contents()->IsLoading();
-+}
-+
-+bool WebContents::IsWaitingForResponse() const {
-+  return web_contents()->IsWaitingForResponse();
-+}
-+
-+void WebContents::Stop() {
-+  web_contents()->Stop();
-+}
-+
-+void WebContents::GoBack() {
-+  electron::ElectronBrowserClient::SuppressRendererProcessRestartForOnce();
-+  web_contents()->GetController().GoBack();
-+}
-+
-+void WebContents::GoForward() {
-+  electron::ElectronBrowserClient::SuppressRendererProcessRestartForOnce();
-+  web_contents()->GetController().GoForward();
-+}
-+
-+void WebContents::GoToOffset(int offset) {
-+  electron::ElectronBrowserClient::SuppressRendererProcessRestartForOnce();
-+  web_contents()->GetController().GoToOffset(offset);
-+}
-+
-+bool WebContents::IsCrashed() const {
-+  return web_contents()->IsCrashed();
-+}
-+
-+void WebContents::SetUserAgent(const std::string& user_agent) {
-+  web_contents()->SetUserAgentOverride(user_agent);
-+  scoped_refptr<net::URLRequestContextGetter> getter =
-+      web_contents()->GetBrowserContext()->GetRequestContext();
-+
-+  auto accept_lang = l10n_util::GetApplicationLocale("");
-+  getter->GetNetworkTaskRunner()->PostTask(FROM_HERE,
-+      base::Bind(&SetUserAgentInIO, getter, accept_lang, user_agent));
-+}
-+
-+std::string WebContents::GetUserAgent() {
-+  return web_contents()->GetUserAgentOverride();
-+}
-+
-+void WebContents::InsertCSS(const std::string& css) {
-+  web_contents()->InsertCSS(css);
-+}
-+
-+bool WebContents::SavePage(const base::FilePath& full_file_path,
-+                           const content::SavePageType& save_type,
-+                           const SavePageHandler::SavePageCallback& callback) {
-+  auto handler = new SavePageHandler(web_contents(), callback);
-+  return handler->Handle(full_file_path, save_type);
-+}
-+
-+void WebContents::OpenDevTools(mate::Arguments* args) {
-+  if (type_ == REMOTE)
-+    return;
-+
-+  bool detach = false;
-+  if (type_ == WEB_VIEW) {
-+    detach = true;
-+  } else if (args && args->Length() == 1) {
-+    mate::Dictionary options;
-+    args->GetNext(&options) && options.Get("detach", &detach);
-+  }
-+  managed_web_contents()->SetCanDock(!detach);
-+  managed_web_contents()->ShowDevTools();
-+}
-+
-+void WebContents::CloseDevTools() {
-+  if (type_ == REMOTE)
-+    return;
-+
-+  managed_web_contents()->CloseDevTools();
-+}
-+
-+bool WebContents::IsDevToolsOpened() {
-+  if (type_ == REMOTE)
-+    return false;
-+
-+  return managed_web_contents()->IsDevToolsViewShowing();
-+}
-+
-+bool WebContents::IsDevToolsFocused() {
-+  if (type_ == REMOTE)
-+    return false;
-+
-+  return managed_web_contents()->GetView()->IsDevToolsViewFocused();
-+}
-+
-+void WebContents::EnableDeviceEmulation(
-+    const blink::WebDeviceEmulationParams& params) {
-+  if (type_ == REMOTE)
-+    return;
-+
-+  Send(new ViewMsg_EnableDeviceEmulation(routing_id(), params));
-+}
-+
-+void WebContents::DisableDeviceEmulation() {
-+  if (type_ == REMOTE)
-+    return;
-+
-+  Send(new ViewMsg_DisableDeviceEmulation(routing_id()));
-+}
-+
-+void WebContents::ToggleDevTools() {
-+  if (IsDevToolsOpened())
-+    CloseDevTools();
-+  else
-+    OpenDevTools(nullptr);
-+}
-+
-+void WebContents::InspectElement(int x, int y) {
-+  if (type_ == REMOTE)
-+    return;
-+
-+  OpenDevTools(nullptr);
-+  scoped_refptr<content::DevToolsAgentHost> agent(
-+    content::DevToolsAgentHost::GetOrCreateFor(web_contents()));
-+  agent->InspectElement(x, y);
-+}
-+
-+void WebContents::InspectServiceWorker() {
-+  if (type_ == REMOTE)
-+    return;
-+
-+  for (const auto& agent_host : content::DevToolsAgentHost::GetOrCreateAll()) {
-+    if (agent_host->GetType() ==
-+        content::DevToolsAgentHost::TYPE_SERVICE_WORKER) {
-+      OpenDevTools(nullptr);
-+      managed_web_contents()->AttachTo(agent_host);
-+      break;
-+    }
-+  }
-+}
-+
-+void WebContents::HasServiceWorker(
-+    const base::Callback<void(bool)>& callback) {
-+  auto context = GetServiceWorkerContext(web_contents());
-+  if (!context)
-+    return;
-+
-+  context->CheckHasServiceWorker(web_contents()->GetLastCommittedURL(),
-+                                 GURL::EmptyGURL(),
-+                                 callback);
-+}
-+
-+void WebContents::UnregisterServiceWorker(
-+    const base::Callback<void(bool)>& callback) {
-+  auto context = GetServiceWorkerContext(web_contents());
-+  if (!context)
-+    return;
-+
-+  context->UnregisterServiceWorker(web_contents()->GetLastCommittedURL(),
-+                                   callback);
-+}
-+
-+void WebContents::SetAudioMuted(bool muted) {
-+  web_contents()->SetAudioMuted(muted);
-+}
-+
-+bool WebContents::IsAudioMuted() {
-+  return web_contents()->IsAudioMuted();
-+}
-+
-+void WebContents::Print(mate::Arguments* args) {
-+  PrintSettings settings = { false, false };
-+  if (args->Length() == 1 && !args->GetNext(&settings)) {
-+    args->ThrowError();
-+    return;
-+  }
-+
-+  printing::PrintViewManagerBasic::FromWebContents(web_contents())->
-+      PrintNow(settings.silent, settings.print_background);
-+}
-+
-+void WebContents::PrintToPDF(const base::DictionaryValue& setting,
-+                             const PrintToPDFCallback& callback) {
-+  printing::PrintPreviewMessageHandler::FromWebContents(web_contents())->
-+      PrintToPDF(setting, callback);
-+}
-+
-+void WebContents::AddWorkSpace(mate::Arguments* args,
-+                               const base::FilePath& path) {
-+  if (path.empty()) {
-+    args->ThrowError("path cannot be empty");
-+    return;
-+  }
-+  DevToolsAddFileSystem(path);
-+}
-+
-+void WebContents::RemoveWorkSpace(mate::Arguments* args,
-+                                  const base::FilePath& path) {
-+  if (path.empty()) {
-+    args->ThrowError("path cannot be empty");
-+    return;
-+  }
-+  DevToolsRemoveFileSystem(path);
-+}
-+
-+void WebContents::Undo() {
-+  web_contents()->Undo();
-+}
-+
-+void WebContents::Redo() {
-+  web_contents()->Redo();
-+}
-+
-+void WebContents::Cut() {
-+  web_contents()->Cut();
-+}
-+
-+void WebContents::Copy() {
-+  web_contents()->Copy();
-+}
-+
-+void WebContents::Paste() {
-+  web_contents()->Paste();
-+}
-+
-+void WebContents::PasteAndMatchStyle() {
-+  web_contents()->PasteAndMatchStyle();
-+}
-+
-+void WebContents::Delete() {
-+  web_contents()->Delete();
-+}
-+
-+void WebContents::SelectAll() {
-+  web_contents()->SelectAll();
-+}
-+
-+void WebContents::Unselect() {
-+  web_contents()->Unselect();
-+}
-+
-+void WebContents::Replace(const base::string16& word) {
-+  web_contents()->Replace(word);
-+}
-+
-+void WebContents::ReplaceMisspelling(const base::string16& word) {
-+  web_contents()->ReplaceMisspelling(word);
-+}
-+
-+uint32_t WebContents::FindInPage(mate::Arguments* args) {
-+  uint32_t request_id = GetNextRequestId();
-+  base::string16 search_text;
-+  blink::WebFindOptions options;
-+  if (!args->GetNext(&search_text) || search_text.empty()) {
-+    args->ThrowError("Must provide a non-empty search content");
-+    return 0;
-+  }
-+
-+  args->GetNext(&options);
-+
-+  web_contents()->Find(request_id, search_text, options);
-+  return request_id;
-+}
-+
-+void WebContents::StopFindInPage(content::StopFindAction action) {
-+  web_contents()->StopFinding(action);
-+}
-+
-+void WebContents::Focus() {
-+  web_contents()->Focus();
-+}
-+
-+void WebContents::TabTraverse(bool reverse) {
-+  web_contents()->FocusThroughTabTraversal(reverse);
-+}
-+
-+bool WebContents::SendIPCMessage(const base::string16& channel,
-+                                 const base::ListValue& args) {
-+  return Send(new ElectronViewMsg_Message(routing_id(), channel, args));
-+}
-+
-+void WebContents::SendInputEvent(v8::Isolate* isolate,
-+                                 v8::Local<v8::Value> input_event) {
-+  const auto view = web_contents()->GetRenderWidgetHostView();
-+  if (!view)
-+    return;
-+  const auto host = view->GetRenderWidgetHost();
-+  if (!host)
-+    return;
-+
-+  int type = mate::GetWebInputEventType(isolate, input_event);
-+  if (blink::WebInputEvent::isMouseEventType(type)) {
-+    blink::WebMouseEvent mouse_event;
-+    if (mate::ConvertFromV8(isolate, input_event, &mouse_event)) {
-+      host->ForwardMouseEvent(mouse_event);
-+      return;
-+    }
-+  } else if (blink::WebInputEvent::isKeyboardEventType(type)) {
-+    content::NativeWebKeyboardEvent keyboard_event;
-+    if (mate::ConvertFromV8(isolate, input_event, &keyboard_event)) {
-+      host->ForwardKeyboardEvent(keyboard_event);
-+      return;
-+    }
-+  } else if (type == blink::WebInputEvent::MouseWheel) {
-+    blink::WebMouseWheelEvent mouse_wheel_event;
-+    if (mate::ConvertFromV8(isolate, input_event, &mouse_wheel_event)) {
-+      host->ForwardWheelEvent(mouse_wheel_event);
-+      return;
-+    }
-+  }
-+
-+  isolate->ThrowException(v8::Exception::Error(mate::StringToV8(
-+      isolate, "Invalid event object")));
-+}
-+
-+void WebContents::BeginFrameSubscription(
-+    const FrameSubscriber::FrameCaptureCallback& callback) {
-+  const auto view = web_contents()->GetRenderWidgetHostView();
-+  if (view) {
-+    scoped_ptr<FrameSubscriber> frame_subscriber(new FrameSubscriber(
-+        isolate(), view, callback));
-+    view->BeginFrameSubscription(std::move(frame_subscriber));
-+  }
-+}
-+
-+void WebContents::EndFrameSubscription() {
-+  const auto view = web_contents()->GetRenderWidgetHostView();
-+  if (view)
-+    view->EndFrameSubscription();
-+}
-+
-+void WebContents::OnCursorChange(const content::WebCursor& cursor) {
-+  content::WebCursor::CursorInfo info;
-+  cursor.GetCursorInfo(&info);
-+
-+  if (cursor.IsCustom()) {
-+    Emit("cursor-changed", CursorTypeToString(info),
-+      gfx::Image::CreateFrom1xBitmap(info.custom_image),
-+      info.image_scale_factor);
-+  } else {
-+    Emit("cursor-changed", CursorTypeToString(info));
-+  }
-+}
-+
-+void WebContents::SetSize(const SetSizeParams& params) {
-+  if (guest_delegate_)
-+    guest_delegate_->SetSize(params);
-+}
-+
-+bool WebContents::IsGuest() const {
-+  return type_ == WEB_VIEW;
-+}
-+
-+v8::Local<v8::Value> WebContents::GetWebPreferences(v8::Isolate* isolate) {
-+  WebContentsPreferences* web_preferences =
-+      WebContentsPreferences::FromWebContents(web_contents());
-+  return mate::ConvertToV8(isolate, *web_preferences->web_preferences());
-+}
-+
-+v8::Local<v8::Value> WebContents::GetOwnerBrowserWindow() {
-+  if (owner_window())
-+    return Window::From(isolate(), owner_window());
-+  else
-+    return v8::Null(isolate());
-+}
-+
-+v8::Local<v8::Value> WebContents::Session(v8::Isolate* isolate) {
-+  return v8::Local<v8::Value>::New(isolate, session_);
-+}
-+
-+content::WebContents* WebContents::HostWebContents() {
-+  if (!embedder_)
-+    return nullptr;
-+  return embedder_->web_contents();
-+}
-+
-+v8::Local<v8::Value> WebContents::DevToolsWebContents(v8::Isolate* isolate) {
-+  if (devtools_web_contents_.IsEmpty())
-+    return v8::Null(isolate);
-+  else
-+    return v8::Local<v8::Value>::New(isolate, devtools_web_contents_);
-+}
-+
-+v8::Local<v8::Value> WebContents::Debugger(v8::Isolate* isolate) {
-+  if (debugger_.IsEmpty()) {
-+    auto handle = electron::api::Debugger::Create(isolate, web_contents());
-+    debugger_.Reset(isolate, handle.ToV8());
-+  }
-+  return v8::Local<v8::Value>::New(isolate, debugger_);
-+}
-+
-+// static
-+void WebContents::BuildPrototype(v8::Isolate* isolate,
-+                                 v8::Local<v8::ObjectTemplate> prototype) {
-+  mate::ObjectTemplateBuilder(isolate, prototype)
-+      .MakeDestroyable()
-+      .SetMethod("getId", &WebContents::GetID)
-+      .SetMethod("equal", &WebContents::Equal)
-+      .SetMethod("_loadURL", &WebContents::LoadURL)
-+      .SetMethod("downloadURL", &WebContents::DownloadURL)
-+      .SetMethod("_getURL", &WebContents::GetURL)
-+      .SetMethod("getTitle", &WebContents::GetTitle)
-+      .SetMethod("isLoading", &WebContents::IsLoading)
-+      .SetMethod("isWaitingForResponse", &WebContents::IsWaitingForResponse)
-+      .SetMethod("_stop", &WebContents::Stop)
-+      .SetMethod("_goBack", &WebContents::GoBack)
-+      .SetMethod("_goForward", &WebContents::GoForward)
-+      .SetMethod("_goToOffset", &WebContents::GoToOffset)
-+      .SetMethod("isCrashed", &WebContents::IsCrashed)
-+      .SetMethod("setUserAgent", &WebContents::SetUserAgent)
-+      .SetMethod("getUserAgent", &WebContents::GetUserAgent)
-+      .SetMethod("insertCSS", &WebContents::InsertCSS)
-+      .SetMethod("savePage", &WebContents::SavePage)
-+      .SetMethod("openDevTools", &WebContents::OpenDevTools)
-+      .SetMethod("closeDevTools", &WebContents::CloseDevTools)
-+      .SetMethod("isDevToolsOpened", &WebContents::IsDevToolsOpened)
-+      .SetMethod("isDevToolsFocused", &WebContents::IsDevToolsFocused)
-+      .SetMethod("enableDeviceEmulation",
-+                 &WebContents::EnableDeviceEmulation)
-+      .SetMethod("disableDeviceEmulation",
-+                 &WebContents::DisableDeviceEmulation)
-+      .SetMethod("toggleDevTools", &WebContents::ToggleDevTools)
-+      .SetMethod("inspectElement", &WebContents::InspectElement)
-+      .SetMethod("setAudioMuted", &WebContents::SetAudioMuted)
-+      .SetMethod("isAudioMuted", &WebContents::IsAudioMuted)
-+      .SetMethod("undo", &WebContents::Undo)
-+      .SetMethod("redo", &WebContents::Redo)
-+      .SetMethod("cut", &WebContents::Cut)
-+      .SetMethod("copy", &WebContents::Copy)
-+      .SetMethod("paste", &WebContents::Paste)
-+      .SetMethod("pasteAndMatchStyle", &WebContents::PasteAndMatchStyle)
-+      .SetMethod("delete", &WebContents::Delete)
-+      .SetMethod("selectAll", &WebContents::SelectAll)
-+      .SetMethod("unselect", &WebContents::Unselect)
-+      .SetMethod("replace", &WebContents::Replace)
-+      .SetMethod("replaceMisspelling", &WebContents::ReplaceMisspelling)
-+      .SetMethod("findInPage", &WebContents::FindInPage)
-+      .SetMethod("stopFindInPage", &WebContents::StopFindInPage)
-+      .SetMethod("focus", &WebContents::Focus)
-+      .SetMethod("tabTraverse", &WebContents::TabTraverse)
-+      .SetMethod("_send", &WebContents::SendIPCMessage)
-+      .SetMethod("sendInputEvent", &WebContents::SendInputEvent)
-+      .SetMethod("beginFrameSubscription",
-+                 &WebContents::BeginFrameSubscription)
-+      .SetMethod("endFrameSubscription", &WebContents::EndFrameSubscription)
-+      .SetMethod("setSize", &WebContents::SetSize)
-+      .SetMethod("isGuest", &WebContents::IsGuest)
-+      .SetMethod("getWebPreferences", &WebContents::GetWebPreferences)
-+      .SetMethod("getOwnerBrowserWindow", &WebContents::GetOwnerBrowserWindow)
-+      .SetMethod("hasServiceWorker", &WebContents::HasServiceWorker)
-+      .SetMethod("unregisterServiceWorker",
-+                 &WebContents::UnregisterServiceWorker)
-+      .SetMethod("inspectServiceWorker", &WebContents::InspectServiceWorker)
-+      .SetMethod("print", &WebContents::Print)
-+      .SetMethod("_printToPDF", &WebContents::PrintToPDF)
-+      .SetMethod("addWorkSpace", &WebContents::AddWorkSpace)
-+      .SetMethod("removeWorkSpace", &WebContents::RemoveWorkSpace)
-+      .SetProperty("session", &WebContents::Session)
-+      .SetProperty("hostWebContents", &WebContents::HostWebContents)
-+      .SetProperty("devToolsWebContents", &WebContents::DevToolsWebContents)
-+      .SetProperty("debugger", &WebContents::Debugger);
-+}
-+
-+ElectronBrowserContext* WebContents::GetBrowserContext() const {
-+  return static_cast<ElectronBrowserContext*>(web_contents()->GetBrowserContext());
-+}
-+
-+void WebContents::OnRendererMessage(const base::string16& channel,
-+                                    const base::ListValue& args) {
-+  // webContents.emit(channel, new Event(), args...);
-+  Emit(base::UTF16ToUTF8(channel), args);
-+}
-+
-+void WebContents::OnRendererMessageSync(const base::string16& channel,
-+                                        const base::ListValue& args,
-+                                        IPC::Message* message) {
-+  // webContents.emit(channel, new Event(sender, message), args...);
-+  EmitWithSender(base::UTF16ToUTF8(channel), web_contents(), message, args);
-+}
-+
-+// static
-+mate::Handle<WebContents> WebContents::CreateFrom(
-+    v8::Isolate* isolate, content::WebContents* web_contents) {
-+  // We have an existing WebContents object in JS.
-+  auto existing = TrackableObject::FromWrappedClass(isolate, web_contents);
-+  if (existing)
-+    return mate::CreateHandle(isolate, static_cast<WebContents*>(existing));
-+
-+  // Otherwise create a new WebContents wrapper object.
-+  auto handle = mate::CreateHandle(isolate, new WebContents(web_contents));
-+  g_wrap_web_contents.Run(handle.ToV8());
-+  return handle;
-+}
-+
-+// static
-+mate::Handle<WebContents> WebContents::Create(
-+    v8::Isolate* isolate, const mate::Dictionary& options) {
-+  auto handle = mate::CreateHandle(isolate, new WebContents(isolate, options));
-+  g_wrap_web_contents.Run(handle.ToV8());
-+  return handle;
-+}
-+
-+void ClearWrapWebContents() {
-+  g_wrap_web_contents.Reset();
-+}
-+
-+void SetWrapWebContents(const WrapWebContentsCallback& callback) {
-+  g_wrap_web_contents = callback;
-+
-+  // Cleanup the wrapper on exit.
-+  electron::ElectronBrowserMainParts::Get()->RegisterDestructionCallback(
-+      base::Bind(ClearWrapWebContents));
-+}
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+
-+namespace {
-+
-+void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
-+                v8::Local<v8::Context> context, void* priv) {
-+  v8::Isolate* isolate = context->GetIsolate();
-+  mate::Dictionary dict(isolate, exports);
-+  dict.SetMethod("create", &electron::api::WebContents::Create);
-+  dict.SetMethod("_setWrapWebContents", &electron::api::SetWrapWebContents);
-+}
-+
-+}  // namespace
-+
-+NODE_MODULE_CONTEXT_AWARE_BUILTIN(electron_browser_web_contents, Initialize)
-added in remote
-  their  100644 f09e9597d1527a9e114c3de147708582ef6790dd electron/browser/api/electron_api_web_contents.h
-@@ -0,0 +1,311 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_API_ELECTRON_API_WEB_CONTENTS_H_
-+#define ELECTRON_BROWSER_API_ELECTRON_API_WEB_CONTENTS_H_
-+
-+#include <string>
-+#include <vector>
-+
-+#include "electron/browser/api/frame_subscriber.h"
-+#include "electron/browser/api/save_page_handler.h"
-+#include "electron/browser/api/trackable_object.h"
-+#include "electron/browser/common_web_contents_delegate.h"
-+#include "content/public/browser/web_contents_observer.h"
-+#include "content/public/common/favicon_url.h"
-+#include "content/common/cursors/webcursor.h"
-+#include "native_mate/handle.h"
-+#include "ui/gfx/image/image.h"
-+
-+namespace blink {
-+struct WebDeviceEmulationParams;
-+}
-+
-+namespace brightray {
-+class InspectableWebContents;
-+}
-+
-+namespace mate {
-+class Arguments;
-+class Dictionary;
-+}
-+
-+namespace electron {
-+
-+struct SetSizeParams;
-+class ElectronBrowserContext;
-+class WebViewGuestDelegate;
-+
-+namespace api {
-+
-+class WebContents : public mate::TrackableObject<WebContents>,
-+                    public CommonWebContentsDelegate,
-+                    public content::WebContentsObserver {
-+ public:
-+  // For node.js callback function type: function(error, buffer)
-+  using PrintToPDFCallback =
-+      base::Callback<void(v8::Local<v8::Value>, v8::Local<v8::Value>)>;
-+
-+  // Create from an existing WebContents.
-+  static mate::Handle<WebContents> CreateFrom(
-+      v8::Isolate* isolate, content::WebContents* web_contents);
-+
-+  // Create a new WebContents.
-+  static mate::Handle<WebContents> Create(
-+      v8::Isolate* isolate, const mate::Dictionary& options);
-+
-+  int GetID() const;
-+  bool Equal(const WebContents* web_contents) const;
-+  void LoadURL(const GURL& url, const mate::Dictionary& options);
-+  void DownloadURL(const GURL& url);
-+  GURL GetURL() const;
-+  base::string16 GetTitle() const;
-+  bool IsLoading() const;
-+  bool IsWaitingForResponse() const;
-+  void Stop();
-+  void ReloadIgnoringCache();
-+  void GoBack();
-+  void GoForward();
-+  void GoToOffset(int offset);
-+  bool IsCrashed() const;
-+  void SetUserAgent(const std::string& user_agent);
-+  std::string GetUserAgent();
-+  void InsertCSS(const std::string& css);
-+  bool SavePage(const base::FilePath& full_file_path,
-+                const content::SavePageType& save_type,
-+                const SavePageHandler::SavePageCallback& callback);
-+  void OpenDevTools(mate::Arguments* args);
-+  void CloseDevTools();
-+  bool IsDevToolsOpened();
-+  bool IsDevToolsFocused();
-+  void ToggleDevTools();
-+  void EnableDeviceEmulation(const blink::WebDeviceEmulationParams& params);
-+  void DisableDeviceEmulation();
-+  void InspectElement(int x, int y);
-+  void InspectServiceWorker();
-+  void HasServiceWorker(const base::Callback<void(bool)>&);
-+  void UnregisterServiceWorker(const base::Callback<void(bool)>&);
-+  void SetAudioMuted(bool muted);
-+  bool IsAudioMuted();
-+  void Print(mate::Arguments* args);
-+
-+  // Print current page as PDF.
-+  void PrintToPDF(const base::DictionaryValue& setting,
-+                  const PrintToPDFCallback& callback);
-+
-+  // DevTools workspace api.
-+  void AddWorkSpace(mate::Arguments* args, const base::FilePath& path);
-+  void RemoveWorkSpace(mate::Arguments* args, const base::FilePath& path);
-+
-+  // Editing commands.
-+  void Undo();
-+  void Redo();
-+  void Cut();
-+  void Copy();
-+  void Paste();
-+  void PasteAndMatchStyle();
-+  void Delete();
-+  void SelectAll();
-+  void Unselect();
-+  void Replace(const base::string16& word);
-+  void ReplaceMisspelling(const base::string16& word);
-+  uint32_t FindInPage(mate::Arguments* args);
-+  void StopFindInPage(content::StopFindAction action);
-+
-+  // Focus.
-+  void Focus();
-+  void TabTraverse(bool reverse);
-+
-+  // Send messages to browser.
-+  bool SendIPCMessage(const base::string16& channel,
-+                      const base::ListValue& args);
-+
-+  // Send WebInputEvent to the page.
-+  void SendInputEvent(v8::Isolate* isolate, v8::Local<v8::Value> input_event);
-+
-+  // Subscribe to the frame updates.
-+  void BeginFrameSubscription(
-+      const FrameSubscriber::FrameCaptureCallback& callback);
-+  void EndFrameSubscription();
-+
-+  // Methods for creating <webview>.
-+  void SetSize(const SetSizeParams& params);
-+  bool IsGuest() const;
-+
-+  // Callback triggered on permission response.
-+  void OnEnterFullscreenModeForTab(content::WebContents* source,
-+                                   const GURL& origin,
-+                                   bool allowed);
-+
-+  // Returns the web preferences of current WebContents.
-+  v8::Local<v8::Value> GetWebPreferences(v8::Isolate* isolate);
-+
-+  // Returns the owner window.
-+  v8::Local<v8::Value> GetOwnerBrowserWindow();
-+
-+  // Properties.
-+  v8::Local<v8::Value> Session(v8::Isolate* isolate);
-+  content::WebContents* HostWebContents();
-+  v8::Local<v8::Value> DevToolsWebContents(v8::Isolate* isolate);
-+  v8::Local<v8::Value> Debugger(v8::Isolate* isolate);
-+
-+  // mate::TrackableObject:
-+  static void BuildPrototype(v8::Isolate* isolate,
-+                             v8::Local<v8::ObjectTemplate> prototype);
-+
-+ protected:
-+  explicit WebContents(content::WebContents* web_contents);
-+  WebContents(v8::Isolate* isolate, const mate::Dictionary& options);
-+  ~WebContents();
-+
-+  // content::WebContentsDelegate:
-+  bool AddMessageToConsole(content::WebContents* source,
-+                           int32_t level,
-+                           const base::string16& message,
-+                           int32_t line_no,
-+                           const base::string16& source_id) override;
-+  bool ShouldCreateWebContents(
-+      content::WebContents* web_contents,
-+      int32_t route_id,
-+      int32_t main_frame_route_id,
-+      int32_t main_frame_widget_route_id,
-+      WindowContainerType window_container_type,
-+      const std::string& frame_name,
-+      const GURL& target_url,
-+      const std::string& partition_id,
-+      content::SessionStorageNamespace* session_storage_namespace) override;
-+  content::WebContents* OpenURLFromTab(
-+      content::WebContents* source,
-+      const content::OpenURLParams& params) override;
-+  void BeforeUnloadFired(content::WebContents* tab,
-+                         bool proceed,
-+                         bool* proceed_to_fire_unload) override;
-+  void MoveContents(content::WebContents* source,
-+                    const gfx::Rect& pos) override;
-+  void CloseContents(content::WebContents* source) override;
-+  void ActivateContents(content::WebContents* contents) override;
-+  bool IsPopupOrPanel(const content::WebContents* source) const override;
-+  void HandleKeyboardEvent(
-+      content::WebContents* source,
-+      const content::NativeWebKeyboardEvent& event) override;
-+  void EnterFullscreenModeForTab(content::WebContents* source,
-+                                 const GURL& origin) override;
-+  void ExitFullscreenModeForTab(content::WebContents* source) override;
-+  void RendererUnresponsive(content::WebContents* source) override;
-+  void RendererResponsive(content::WebContents* source) override;
-+  bool HandleContextMenu(const content::ContextMenuParams& params) override;
-+  bool OnGoToEntryOffset(int offset) override;
-+  void FindReply(content::WebContents* web_contents,
-+                 int request_id,
-+                 int number_of_matches,
-+                 const gfx::Rect& selection_rect,
-+                 int active_match_ordinal,
-+                 bool final_update) override;
-+  bool CheckMediaAccessPermission(
-+      content::WebContents* web_contents,
-+      const GURL& security_origin,
-+      content::MediaStreamType type) override;
-+  void RequestMediaAccessPermission(
-+      content::WebContents* web_contents,
-+      const content::MediaStreamRequest& request,
-+      const content::MediaResponseCallback& callback) override;
-+  void RequestToLockMouse(
-+      content::WebContents* web_contents,
-+      bool user_gesture,
-+      bool last_unlocked_by_target) override;
-+
-+  // content::WebContentsObserver:
-+  void BeforeUnloadFired(const base::TimeTicks& proceed_time) override;
-+  void RenderViewDeleted(content::RenderViewHost*) override;
-+  void RenderProcessGone(base::TerminationStatus status) override;
-+  void DocumentLoadedInFrame(
-+      content::RenderFrameHost* render_frame_host) override;
-+  void DidFinishLoad(content::RenderFrameHost* render_frame_host,
-+                     const GURL& validated_url) override;
-+  void DidFailLoad(content::RenderFrameHost* render_frame_host,
-+                   const GURL& validated_url,
-+                   int error_code,
-+                   const base::string16& error_description,
-+                   bool was_ignored_by_handler) override;
-+  void DidFailProvisionalLoad(content::RenderFrameHost* render_frame_host,
-+                              const GURL& validated_url,
-+                              int error_code,
-+                              const base::string16& error_description,
-+                              bool was_ignored_by_handler) override;
-+  void DidStartLoading() override;
-+  void DidStopLoading() override;
-+  void DidGetResourceResponseStart(
-+      const content::ResourceRequestDetails& details) override;
-+  void DidGetRedirectForResourceRequest(
-+      content::RenderFrameHost* render_frame_host,
-+      const content::ResourceRedirectDetails& details) override;
-+  void DidNavigateMainFrame(
-+      const content::LoadCommittedDetails& details,
-+      const content::FrameNavigateParams& params) override;
-+  bool OnMessageReceived(const IPC::Message& message) override;
-+  void WebContentsDestroyed() override;
-+  void NavigationEntryCommitted(
-+      const content::LoadCommittedDetails& load_details) override;
-+  void TitleWasSet(content::NavigationEntry* entry, bool explicit_set) override;
-+  void DidUpdateFaviconURL(
-+      const std::vector<content::FaviconURL>& urls) override;
-+  void PluginCrashed(const base::FilePath& plugin_path,
-+                     base::ProcessId plugin_pid) override;
-+  void MediaStartedPlaying(const MediaPlayerId& id) override;
-+  void MediaStoppedPlaying(const MediaPlayerId& id) override;
-+  void DidChangeThemeColor(SkColor theme_color) override;
-+
-+  // brightray::InspectableWebContentsViewDelegate:
-+  void DevToolsFocused() override;
-+  void DevToolsOpened() override;
-+  void DevToolsClosed() override;
-+
-+ private:
-+  enum Type {
-+    BROWSER_WINDOW,  // Used by BrowserWindow.
-+    WEB_VIEW,  // Used by <webview>.
-+    REMOTE,  // Thin wrap around an existing WebContents.
-+  };
-+
-+  ElectronBrowserContext* GetBrowserContext() const;
-+
-+  uint32_t GetNextRequestId() {
-+    return ++request_id_;
-+  }
-+
-+  // Called when we receive a CursorChange message from chromium.
-+  void OnCursorChange(const content::WebCursor& cursor);
-+
-+  // Called when received a message from renderer.
-+  void OnRendererMessage(const base::string16& channel,
-+                         const base::ListValue& args);
-+
-+  // Called when received a synchronous message from renderer.
-+  void OnRendererMessageSync(const base::string16& channel,
-+                             const base::ListValue& args,
-+                             IPC::Message* message);
-+
-+  v8::Global<v8::Value> session_;
-+  v8::Global<v8::Value> devtools_web_contents_;
-+  v8::Global<v8::Value> debugger_;
-+
-+  scoped_ptr<WebViewGuestDelegate> guest_delegate_;
-+
-+  // The host webcontents that may contain this webcontents.
-+  WebContents* embedder_;
-+
-+  // The type of current WebContents.
-+  Type type_;
-+
-+  // Request id used for findInPage request.
-+  uint32_t request_id_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(WebContents);
-+};
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_API_ELECTRON_API_WEB_CONTENTS_H_
-added in remote
-  their  100644 36ec558ef11671cb3177ed3ce0db619816f6d6c8 electron/browser/api/electron_api_web_request.cc
-@@ -0,0 +1,119 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/api/electron_api_web_request.h"
-+
-+#include <string>
-+
-+#include "electron/browser/electron_browser_context.h"
-+#include "electron/browser/net/electron_network_delegate.h"
-+#include "electron/common/native_mate_converters/callback.h"
-+#include "electron/common/native_mate_converters/net_converter.h"
-+#include "electron/common/native_mate_converters/value_converter.h"
-+#include "content/public/browser/browser_thread.h"
-+#include "native_mate/dictionary.h"
-+#include "native_mate/object_template_builder.h"
-+
-+using content::BrowserThread;
-+
-+namespace mate {
-+
-+template<>
-+struct Converter<extensions::URLPattern> {
-+  static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
-+                     extensions::URLPattern* out) {
-+    std::string pattern;
-+    if (!ConvertFromV8(isolate, val, &pattern))
-+      return false;
-+    return out->Parse(pattern) == extensions::URLPattern::PARSE_SUCCESS;
-+  }
-+};
-+
-+}  // namespace mate
-+
-+namespace electron {
-+
-+namespace api {
-+
-+WebRequest::WebRequest(ElectronBrowserContext* browser_context)
-+    : browser_context_(browser_context) {
-+}
-+
-+WebRequest::~WebRequest() {
-+}
-+
-+template<ElectronNetworkDelegate::SimpleEvent type>
-+void WebRequest::SetSimpleListener(mate::Arguments* args) {
-+  SetListener<ElectronNetworkDelegate::SimpleListener>(
-+      &ElectronNetworkDelegate::SetSimpleListenerInIO, type, args);
-+}
-+
-+template<ElectronNetworkDelegate::ResponseEvent type>
-+void WebRequest::SetResponseListener(mate::Arguments* args) {
-+  SetListener<ElectronNetworkDelegate::ResponseListener>(
-+      &ElectronNetworkDelegate::SetResponseListenerInIO, type, args);
-+}
-+
-+template<typename Listener, typename Method, typename Event>
-+void WebRequest::SetListener(Method method, Event type, mate::Arguments* args) {
-+  // { urls }.
-+  URLPatterns patterns;
-+  mate::Dictionary dict;
-+  args->GetNext(&dict) && dict.Get("urls", &patterns);
-+
-+  // Function or null.
-+  v8::Local<v8::Value> value;
-+  Listener listener;
-+  if (!args->GetNext(&listener) &&
-+      !(args->GetNext(&value) && value->IsNull())) {
-+    args->ThrowError("Must pass null or a Function");
-+    return;
-+  }
-+
-+  auto delegate = browser_context_->network_delegate();
-+  BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
-+                          base::Bind(method, base::Unretained(delegate), type,
-+                                     patterns, listener));
-+}
-+
-+// static
-+mate::Handle<WebRequest> WebRequest::Create(
-+    v8::Isolate* isolate,
-+    ElectronBrowserContext* browser_context) {
-+  return mate::CreateHandle(isolate, new WebRequest(browser_context));
-+}
-+
-+// static
-+void WebRequest::BuildPrototype(v8::Isolate* isolate,
-+                                v8::Local<v8::ObjectTemplate> prototype) {
-+  mate::ObjectTemplateBuilder(isolate, prototype)
-+      .SetMethod("onBeforeRequest",
-+                 &WebRequest::SetResponseListener<
-+                    ElectronNetworkDelegate::kOnBeforeRequest>)
-+      .SetMethod("onBeforeSendHeaders",
-+                 &WebRequest::SetResponseListener<
-+                    ElectronNetworkDelegate::kOnBeforeSendHeaders>)
-+      .SetMethod("onHeadersReceived",
-+                 &WebRequest::SetResponseListener<
-+                    ElectronNetworkDelegate::kOnHeadersReceived>)
-+      .SetMethod("onSendHeaders",
-+                 &WebRequest::SetSimpleListener<
-+                    ElectronNetworkDelegate::kOnSendHeaders>)
-+      .SetMethod("onBeforeRedirect",
-+                 &WebRequest::SetSimpleListener<
-+                    ElectronNetworkDelegate::kOnBeforeRedirect>)
-+      .SetMethod("onResponseStarted",
-+                 &WebRequest::SetSimpleListener<
-+                    ElectronNetworkDelegate::kOnResponseStarted>)
-+      .SetMethod("onCompleted",
-+                 &WebRequest::SetSimpleListener<
-+                    ElectronNetworkDelegate::kOnCompleted>)
-+      .SetMethod("onErrorOccurred",
-+                 &WebRequest::SetSimpleListener<
-+                    ElectronNetworkDelegate::kOnErrorOccurred>);
-+}
-+
-+}  // namespace api
-+
-+}  // namespace electron
-added in remote
-  their  100644 3005158188cbd7ed36cc99afc41967271f94a6a6 electron/browser/api/electron_api_web_request.h
-@@ -0,0 +1,50 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_API_ELECTRON_API_WEB_REQUEST_H_
-+#define ELECTRON_BROWSER_API_ELECTRON_API_WEB_REQUEST_H_
-+
-+#include "electron/browser/api/trackable_object.h"
-+#include "electron/browser/net/electron_network_delegate.h"
-+#include "native_mate/arguments.h"
-+#include "native_mate/handle.h"
-+
-+namespace electron {
-+
-+class ElectronBrowserContext;
-+
-+namespace api {
-+
-+class WebRequest : public mate::TrackableObject<WebRequest> {
-+ public:
-+  static mate::Handle<WebRequest> Create(v8::Isolate* isolate,
-+                                         ElectronBrowserContext* browser_context);
-+
-+  // mate::TrackableObject:
-+  static void BuildPrototype(v8::Isolate* isolate,
-+                             v8::Local<v8::ObjectTemplate> prototype);
-+
-+ protected:
-+  explicit WebRequest(ElectronBrowserContext* browser_context);
-+  ~WebRequest();
-+
-+  // C++ can not distinguish overloaded member function.
-+  template<ElectronNetworkDelegate::SimpleEvent type>
-+  void SetSimpleListener(mate::Arguments* args);
-+  template<ElectronNetworkDelegate::ResponseEvent type>
-+  void SetResponseListener(mate::Arguments* args);
-+  template<typename Listener, typename Method, typename Event>
-+  void SetListener(Method method, Event type, mate::Arguments* args);
-+
-+ private:
-+  scoped_refptr<ElectronBrowserContext> browser_context_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(WebRequest);
-+};
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_API_ELECTRON_API_WEB_REQUEST_H_
-added in remote
-  their  100644 8596ac2369a3f6515cd799a0ec8dd250dc3b639f electron/browser/api/electron_api_web_view_manager.cc
-@@ -0,0 +1,71 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/api/electron_api_web_contents.h"
-+#include "electron/browser/web_contents_preferences.h"
-+#include "electron/browser/web_view_manager.h"
-+#include "electron/common/native_mate_converters/value_converter.h"
-+#include "electron/common/node_includes.h"
-+#include "content/public/browser/browser_context.h"
-+#include "native_mate/dictionary.h"
-+
-+using electron::WebContentsPreferences;
-+
-+namespace mate {
-+
-+template<>
-+struct Converter<content::WebContents*> {
-+  static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
-+                     content::WebContents** out) {
-+    electron::api::WebContents* contents;
-+    if (!Converter<electron::api::WebContents*>::FromV8(isolate, val, &contents))
-+      return false;
-+    *out = contents->web_contents();
-+    return true;
-+  }
-+};
-+
-+}  // namespace mate
-+
-+namespace {
-+
-+electron::WebViewManager* GetWebViewManager(content::WebContents* web_contents) {
-+  auto context = web_contents->GetBrowserContext();
-+  if (context) {
-+    auto manager = context->GetGuestManager();
-+    return static_cast<electron::WebViewManager*>(manager);
-+  } else {
-+    return nullptr;
-+  }
-+}
-+
-+void AddGuest(int guest_instance_id,
-+              int element_instance_id,
-+              content::WebContents* embedder,
-+              content::WebContents* guest_web_contents,
-+              const base::DictionaryValue& options) {
-+  auto manager = GetWebViewManager(embedder);
-+  if (manager)
-+    manager->AddGuest(guest_instance_id, element_instance_id, embedder,
-+                      guest_web_contents);
-+
-+  WebContentsPreferences::FromWebContents(guest_web_contents)->Merge(options);
-+}
-+
-+void RemoveGuest(content::WebContents* embedder, int guest_instance_id) {
-+  auto manager = GetWebViewManager(embedder);
-+  if (manager)
-+    manager->RemoveGuest(guest_instance_id);
-+}
-+
-+void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
-+                v8::Local<v8::Context> context, void* priv) {
-+  mate::Dictionary dict(context->GetIsolate(), exports);
-+  dict.SetMethod("addGuest", &AddGuest);
-+  dict.SetMethod("removeGuest", &RemoveGuest);
-+}
-+
-+}  // namespace
-+
-+NODE_MODULE_CONTEXT_AWARE_BUILTIN(electron_browser_web_view_manager, Initialize)
-added in remote
-  their  100644 f9994cdc079e2e9159e3328d7bc465e20ef3a5b1 electron/browser/api/electron_api_window.cc
-@@ -0,0 +1,848 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/api/electron_api_window.h"
-+#include "electron/common/native_mate_converters/value_converter.h"
-+
-+#include "electron/browser/api/electron_api_menu.h"
-+#include "electron/browser/api/electron_api_web_contents.h"
-+#include "electron/browser/browser.h"
-+#include "electron/browser/native_window.h"
-+#include "electron/common/native_mate_converters/callback.h"
-+#include "electron/common/native_mate_converters/gfx_converter.h"
-+#include "electron/common/native_mate_converters/gurl_converter.h"
-+#include "electron/common/native_mate_converters/image_converter.h"
-+#include "electron/common/native_mate_converters/string16_converter.h"
-+#include "electron/common/node_includes.h"
-+#include "electron/common/options_switches.h"
-+#include "content/public/browser/render_process_host.h"
-+#include "native_mate/constructor.h"
-+#include "native_mate/dictionary.h"
-+#include "ui/gfx/geometry/rect.h"
-+
-+#if defined(OS_WIN)
-+#include "electron/browser/native_window_views.h"
-+#include "electron/browser/ui/win/taskbar_host.h"
-+#endif
-+
-+#if defined(OS_WIN)
-+namespace mate {
-+
-+template<>
-+struct Converter<electron::TaskbarHost::ThumbarButton> {
-+  static bool FromV8(v8::Isolate* isolate, v8::Handle<v8::Value> val,
-+                     electron::TaskbarHost::ThumbarButton* out) {
-+    mate::Dictionary dict;
-+    if (!ConvertFromV8(isolate, val, &dict))
-+      return false;
-+    dict.Get("click", &(out->clicked_callback));
-+    dict.Get("tooltip", &(out->tooltip));
-+    dict.Get("flags", &out->flags);
-+    return dict.Get("icon", &(out->icon));
-+  }
-+};
-+
-+}  // namespace mate
-+#endif
-+
-+namespace electron {
-+
-+namespace api {
-+
-+namespace {
-+
-+// This function is implemented in JavaScript
-+using DeprecatedOptionsCheckCallback =
-+    base::Callback<std::string(v8::Local<v8::Value>)>;
-+DeprecatedOptionsCheckCallback g_deprecated_options_check;
-+
-+void OnCapturePageDone(
-+    v8::Isolate* isolate,
-+    const base::Callback<void(const gfx::Image&)>& callback,
-+    const SkBitmap& bitmap) {
-+  v8::Locker locker(isolate);
-+  v8::HandleScope handle_scope(isolate);
-+  callback.Run(gfx::Image::CreateFrom1xBitmap(bitmap));
-+}
-+
-+// Converts min-width to minWidth, returns false if no conversion is needed.
-+bool TranslateOldKey(const std::string& key, std::string* new_key) {
-+  if (key.find('-') == std::string::npos)
-+    return false;
-+  new_key->reserve(key.size());
-+  bool next_upper_case = false;
-+  for (char c : key) {
-+    if (c == '-') {
-+      next_upper_case = true;
-+    } else if (next_upper_case) {
-+      new_key->push_back(base::ToUpperASCII(c));
-+      next_upper_case = false;
-+    } else {
-+      new_key->push_back(c);
-+    }
-+  }
-+  return true;
-+}
-+
-+// Converts min-width to minWidth recursively in the dictionary.
-+void TranslateOldOptions(v8::Isolate* isolate, v8::Local<v8::Object> options) {
-+  auto context = isolate->GetCurrentContext();
-+  auto maybe_keys = options->GetOwnPropertyNames(context);
-+  if (maybe_keys.IsEmpty())
-+    return;
-+  std::vector<std::string> keys;
-+  if (!mate::ConvertFromV8(isolate, maybe_keys.ToLocalChecked(), &keys))
-+    return;
-+  mate::Dictionary dict(isolate, options);
-+  for (const auto& key : keys) {
-+    v8::Local<v8::Value> value;
-+    if (!dict.Get(key, &value))  // Shouldn't happen, but guard it anyway.
-+      continue;
-+    // Go recursively.
-+    v8::Local<v8::Object> sub_options;
-+    if (mate::ConvertFromV8(isolate, value, &sub_options))
-+      TranslateOldOptions(isolate, sub_options);
-+    // Translate key.
-+    std::string new_key;
-+    if (TranslateOldKey(key, &new_key)) {
-+      dict.Set(new_key, value);
-+      dict.Delete(key);
-+    }
-+  }
-+}
-+
-+// Converts binary data to Buffer.
-+v8::Local<v8::Value> ToBuffer(v8::Isolate* isolate, void* val, int size) {
-+  auto buffer = node::Buffer::Copy(isolate, static_cast<char*>(val), size);
-+  if (buffer.IsEmpty())
-+    return v8::Null(isolate);
-+  else
-+    return buffer.ToLocalChecked();
-+}
-+
-+}  // namespace
-+
-+
-+Window::Window(v8::Isolate* isolate, const mate::Dictionary& options) {
-+  // Be compatible with old style field names like min-width.
-+  TranslateOldOptions(isolate, options.GetHandle());
-+
-+  // Use options.webPreferences to create WebContents.
-+  mate::Dictionary web_preferences = mate::Dictionary::CreateEmpty(isolate);
-+  options.Get(options::kWebPreferences, &web_preferences);
-+
-+  // Be compatible with old options which are now in web_preferences.
-+  v8::Local<v8::Value> value;
-+  if (options.Get(options::kNodeIntegration, &value))
-+    web_preferences.Set(options::kNodeIntegration, value);
-+  if (options.Get(options::kPreloadScript, &value))
-+    web_preferences.Set(options::kPreloadScript, value);
-+  if (options.Get(options::kZoomFactor, &value))
-+    web_preferences.Set(options::kZoomFactor, value);
-+
-+  // Creates the WebContents used by BrowserWindow.
-+  auto web_contents = WebContents::Create(isolate, web_preferences);
-+  web_contents_.Reset(isolate, web_contents.ToV8());
-+  api_web_contents_ = web_contents.get();
-+
-+  // Keep a copy of the options for later use.
-+  mate::Dictionary(isolate, web_contents->GetWrapper(isolate)).Set(
-+      "browserWindowOptions", options);
-+
-+  // Creates BrowserWindow.
-+  window_.reset(NativeWindow::Create(web_contents->managed_web_contents(),
-+                                     options));
-+  web_contents->SetOwnerWindow(window_.get());
-+  window_->InitFromOptions(options);
-+  window_->AddObserver(this);
-+  AttachAsUserData(window_.get());
-+}
-+
-+Window::~Window() {
-+  if (!window_->IsClosed())
-+    window_->CloseContents(nullptr);
-+
-+  // Destroy the native window in next tick because the native code might be
-+  // iterating all windows.
-+  base::MessageLoop::current()->DeleteSoon(FROM_HERE, window_.release());
-+}
-+
-+void Window::WillCloseWindow(bool* prevent_default) {
-+  *prevent_default = Emit("close");
-+}
-+
-+void Window::OnWindowClosed() {
-+  api_web_contents_->DestroyWebContents();
-+
-+  RemoveFromWeakMap();
-+  window_->RemoveObserver(this);
-+
-+  // We can not call Destroy here because we need to call Emit first, but we
-+  // also do not want any method to be used, so just mark as destroyed here.
-+  MarkDestroyed();
-+
-+  Emit("closed");
-+
-+  // Destroy the native class when window is closed.
-+  base::MessageLoop::current()->PostTask(FROM_HERE, GetDestroyClosure());
-+}
-+
-+void Window::OnWindowBlur() {
-+  Emit("blur");
-+}
-+
-+void Window::OnWindowFocus() {
-+  Emit("focus");
-+}
-+
-+void Window::OnWindowShow() {
-+  Emit("show");
-+}
-+
-+void Window::OnWindowHide() {
-+  Emit("hide");
-+}
-+
-+void Window::OnWindowMaximize() {
-+  Emit("maximize");
-+}
-+
-+void Window::OnWindowUnmaximize() {
-+  Emit("unmaximize");
-+}
-+
-+void Window::OnWindowMinimize() {
-+  Emit("minimize");
-+}
-+
-+void Window::OnWindowRestore() {
-+  Emit("restore");
-+}
-+
-+void Window::OnWindowResize() {
-+  Emit("resize");
-+}
-+
-+void Window::OnWindowMove() {
-+  Emit("move");
-+}
-+
-+void Window::OnWindowMoved() {
-+  Emit("moved");
-+}
-+
-+void Window::OnWindowEnterFullScreen() {
-+  Emit("enter-full-screen");
-+}
-+
-+void Window::OnWindowLeaveFullScreen() {
-+  Emit("leave-full-screen");
-+}
-+
-+void Window::OnWindowScrollTouchBegin() {
-+  Emit("scroll-touch-begin");
-+}
-+
-+void Window::OnWindowScrollTouchEnd() {
-+  Emit("scroll-touch-end");
-+}
-+
-+void Window::OnWindowSwipe(const std::string& direction) {
-+  Emit("swipe", direction);
-+}
-+
-+void Window::OnWindowEnterHtmlFullScreen() {
-+  Emit("enter-html-full-screen");
-+}
-+
-+void Window::OnWindowLeaveHtmlFullScreen() {
-+  Emit("leave-html-full-screen");
-+}
-+
-+void Window::OnRendererUnresponsive() {
-+  Emit("unresponsive");
-+}
-+
-+void Window::OnRendererResponsive() {
-+  Emit("responsive");
-+}
-+
-+void Window::OnExecuteWindowsCommand(const std::string& command_name) {
-+  Emit("app-command", command_name);
-+}
-+
-+#if defined(OS_WIN)
-+void Window::OnWindowMessage(UINT message, WPARAM w_param, LPARAM l_param) {
-+  if (IsWindowMessageHooked(message)) {
-+    messages_callback_map_[message].Run(
-+        ToBuffer(isolate(), static_cast<void*>(&w_param), sizeof(WPARAM)),
-+        ToBuffer(isolate(), static_cast<void*>(&l_param), sizeof(LPARAM)));
-+  }
-+}
-+#endif
-+
-+// static
-+mate::Wrappable* Window::New(v8::Isolate* isolate, mate::Arguments* args) {
-+  if (!Browser::Get()->is_ready()) {
-+    isolate->ThrowException(v8::Exception::Error(mate::StringToV8(
-+        isolate, "Cannot create BrowserWindow before app is ready")));
-+    return nullptr;
-+  }
-+
-+  if (args->Length() > 1) {
-+    args->ThrowError();
-+    return nullptr;
-+  }
-+
-+  mate::Dictionary options;
-+  if (!(args->Length() == 1 && args->GetNext(&options))) {
-+    options = mate::Dictionary::CreateEmpty(isolate);
-+  }
-+
-+  std::string deprecation_message = g_deprecated_options_check.Run(
-+      options.GetHandle());
-+  if (deprecation_message.length() > 0) {
-+    args->ThrowError(deprecation_message);
-+    return nullptr;
-+  }
-+
-+  return new Window(isolate, options);
-+}
-+
-+void Window::Close() {
-+  window_->Close();
-+}
-+
-+void Window::Focus() {
-+  window_->Focus(true);
-+}
-+
-+void Window::Blur() {
-+  window_->Focus(false);
-+}
-+
-+bool Window::IsFocused() {
-+  return window_->IsFocused();
-+}
-+
-+void Window::Show() {
-+  window_->Show();
-+}
-+
-+void Window::ShowInactive() {
-+  window_->ShowInactive();
-+}
-+
-+void Window::Hide() {
-+  window_->Hide();
-+}
-+
-+bool Window::IsVisible() {
-+  return window_->IsVisible();
-+}
-+
-+void Window::Maximize() {
-+  window_->Maximize();
-+}
-+
-+void Window::Unmaximize() {
-+  window_->Unmaximize();
-+}
-+
-+bool Window::IsMaximized() {
-+  return window_->IsMaximized();
-+}
-+
-+void Window::Minimize() {
-+  window_->Minimize();
-+}
-+
-+void Window::Restore() {
-+  window_->Restore();
-+}
-+
-+bool Window::IsMinimized() {
-+  return window_->IsMinimized();
-+}
-+
-+void Window::SetFullScreen(bool fullscreen) {
-+  window_->SetFullScreen(fullscreen);
-+}
-+
-+bool Window::IsFullscreen() {
-+  return window_->IsFullscreen();
-+}
-+
-+void Window::SetBounds(const gfx::Rect& bounds, mate::Arguments* args) {
-+  bool animate = false;
-+  args->GetNext(&animate);
-+  window_->SetBounds(bounds, animate);
-+}
-+
-+gfx::Rect Window::GetBounds() {
-+  return window_->GetBounds();
-+}
-+
-+void Window::SetSize(int width, int height, mate::Arguments* args) {
-+  bool animate = false;
-+  args->GetNext(&animate);
-+  window_->SetSize(gfx::Size(width, height), animate);
-+}
-+
-+std::vector<int> Window::GetSize() {
-+  std::vector<int> result(2);
-+  gfx::Size size = window_->GetSize();
-+  result[0] = size.width();
-+  result[1] = size.height();
-+  return result;
-+}
-+
-+void Window::SetContentSize(int width, int height, mate::Arguments* args) {
-+  bool animate = false;
-+  args->GetNext(&animate);
-+  window_->SetContentSize(gfx::Size(width, height), animate);
-+}
-+
-+std::vector<int> Window::GetContentSize() {
-+  std::vector<int> result(2);
-+  gfx::Size size = window_->GetContentSize();
-+  result[0] = size.width();
-+  result[1] = size.height();
-+  return result;
-+}
-+
-+void Window::SetMinimumSize(int width, int height) {
-+  window_->SetMinimumSize(gfx::Size(width, height));
-+}
-+
-+std::vector<int> Window::GetMinimumSize() {
-+  std::vector<int> result(2);
-+  gfx::Size size = window_->GetMinimumSize();
-+  result[0] = size.width();
-+  result[1] = size.height();
-+  return result;
-+}
-+
-+void Window::SetMaximumSize(int width, int height) {
-+  window_->SetMaximumSize(gfx::Size(width, height));
-+}
-+
-+std::vector<int> Window::GetMaximumSize() {
-+  std::vector<int> result(2);
-+  gfx::Size size = window_->GetMaximumSize();
-+  result[0] = size.width();
-+  result[1] = size.height();
-+  return result;
-+}
-+
-+void Window::SetResizable(bool resizable) {
-+  window_->SetResizable(resizable);
-+}
-+
-+bool Window::IsResizable() {
-+  return window_->IsResizable();
-+}
-+
-+void Window::SetMovable(bool movable) {
-+  window_->SetMovable(movable);
-+}
-+
-+bool Window::IsMovable() {
-+  return window_->IsMovable();
-+}
-+
-+void Window::SetMinimizable(bool minimizable) {
-+  window_->SetMinimizable(minimizable);
-+}
-+
-+bool Window::IsMinimizable() {
-+  return window_->IsMinimizable();
-+}
-+
-+void Window::SetMaximizable(bool maximizable) {
-+  window_->SetMaximizable(maximizable);
-+}
-+
-+bool Window::IsMaximizable() {
-+  return window_->IsMaximizable();
-+}
-+
-+void Window::SetFullScreenable(bool fullscreenable) {
-+  window_->SetFullScreenable(fullscreenable);
-+}
-+
-+bool Window::IsFullScreenable() {
-+  return window_->IsFullScreenable();
-+}
-+
-+void Window::SetClosable(bool closable) {
-+  window_->SetClosable(closable);
-+}
-+
-+bool Window::IsClosable() {
-+  return window_->IsClosable();
-+}
-+
-+void Window::SetAlwaysOnTop(bool top) {
-+  window_->SetAlwaysOnTop(top);
-+}
-+
-+bool Window::IsAlwaysOnTop() {
-+  return window_->IsAlwaysOnTop();
-+}
-+
-+void Window::Center() {
-+  window_->Center();
-+}
-+
-+void Window::SetPosition(int x, int y, mate::Arguments* args) {
-+  bool animate = false;
-+  args->GetNext(&animate);
-+  window_->SetPosition(gfx::Point(x, y), animate);
-+}
-+
-+std::vector<int> Window::GetPosition() {
-+  std::vector<int> result(2);
-+  gfx::Point pos = window_->GetPosition();
-+  result[0] = pos.x();
-+  result[1] = pos.y();
-+  return result;
-+}
-+
-+void Window::SetTitle(const std::string& title) {
-+  window_->SetTitle(title);
-+}
-+
-+std::string Window::GetTitle() {
-+  return window_->GetTitle();
-+}
-+
-+void Window::FlashFrame(bool flash) {
-+  window_->FlashFrame(flash);
-+}
-+
-+void Window::SetSkipTaskbar(bool skip) {
-+  window_->SetSkipTaskbar(skip);
-+}
-+
-+void Window::SetKiosk(bool kiosk) {
-+  window_->SetKiosk(kiosk);
-+}
-+
-+bool Window::IsKiosk() {
-+  return window_->IsKiosk();
-+}
-+
-+void Window::SetBackgroundColor(const std::string& color_name) {
-+  window_->SetBackgroundColor(color_name);
-+}
-+
-+void Window::SetHasShadow(bool has_shadow) {
-+  window_->SetHasShadow(has_shadow);
-+}
-+
-+bool Window::HasShadow() {
-+  return window_->HasShadow();
-+}
-+
-+void Window::FocusOnWebView() {
-+  window_->FocusOnWebView();
-+}
-+
-+void Window::BlurWebView() {
-+  window_->BlurWebView();
-+}
-+
-+bool Window::IsWebViewFocused() {
-+  return window_->IsWebViewFocused();
-+}
-+
-+void Window::SetRepresentedFilename(const std::string& filename) {
-+  window_->SetRepresentedFilename(filename);
-+}
-+
-+std::string Window::GetRepresentedFilename() {
-+  return window_->GetRepresentedFilename();
-+}
-+
-+void Window::SetDocumentEdited(bool edited) {
-+  window_->SetDocumentEdited(edited);
-+}
-+
-+bool Window::IsDocumentEdited() {
-+  return window_->IsDocumentEdited();
-+}
-+
-+void Window::SetIgnoreMouseEvents(bool ignore) {
-+  return window_->SetIgnoreMouseEvents(ignore);
-+}
-+
-+void Window::CapturePage(mate::Arguments* args) {
-+  gfx::Rect rect;
-+  base::Callback<void(const gfx::Image&)> callback;
-+
-+  if (!(args->Length() == 1 && args->GetNext(&callback)) &&
-+      !(args->Length() == 2 && args->GetNext(&rect)
-+                            && args->GetNext(&callback))) {
-+    args->ThrowError();
-+    return;
-+  }
-+
-+  window_->CapturePage(
-+      rect, base::Bind(&OnCapturePageDone, args->isolate(), callback));
-+}
-+
-+void Window::SetProgressBar(double progress) {
-+  window_->SetProgressBar(progress);
-+}
-+
-+void Window::SetOverlayIcon(const gfx::Image& overlay,
-+                            const std::string& description) {
-+  window_->SetOverlayIcon(overlay, description);
-+}
-+
-+bool Window::SetThumbarButtons(mate::Arguments* args) {
-+#if defined(OS_WIN)
-+  std::vector<TaskbarHost::ThumbarButton> buttons;
-+  if (!args->GetNext(&buttons)) {
-+    args->ThrowError();
-+    return false;
-+  }
-+  auto window = static_cast<NativeWindowViews*>(window_.get());
-+  return window->taskbar_host().SetThumbarButtons(
-+      window->GetAcceleratedWidget(), buttons);
-+#else
-+  return false;
-+#endif
-+}
-+
-+void Window::SetMenu(v8::Isolate* isolate, v8::Local<v8::Value> value) {
-+  mate::Handle<Menu> menu;
-+  if (value->IsObject() &&
-+      mate::V8ToString(value->ToObject()->GetConstructorName()) == "Menu" &&
-+      mate::ConvertFromV8(isolate, value, &menu)) {
-+    menu_.Reset(isolate, menu.ToV8());
-+    window_->SetMenu(menu->model());
-+  } else if (value->IsNull()) {
-+    menu_.Reset();
-+    window_->SetMenu(nullptr);
-+  } else {
-+    isolate->ThrowException(v8::Exception::TypeError(
-+        mate::StringToV8(isolate, "Invalid Menu")));
-+  }
-+}
-+
-+void Window::SetAutoHideMenuBar(bool auto_hide) {
-+  window_->SetAutoHideMenuBar(auto_hide);
-+}
-+
-+bool Window::IsMenuBarAutoHide() {
-+  return window_->IsMenuBarAutoHide();
-+}
-+
-+void Window::SetMenuBarVisibility(bool visible) {
-+  window_->SetMenuBarVisibility(visible);
-+}
-+
-+bool Window::IsMenuBarVisible() {
-+  return window_->IsMenuBarVisible();
-+}
-+
-+#if defined(OS_WIN)
-+bool Window::HookWindowMessage(UINT message,
-+                               const MessageCallback& callback) {
-+  messages_callback_map_[message] = callback;
-+  return true;
-+}
-+
-+void Window::UnhookWindowMessage(UINT message) {
-+  if (!ContainsKey(messages_callback_map_, message))
-+    return;
-+
-+  messages_callback_map_.erase(message);
-+}
-+
-+bool Window::IsWindowMessageHooked(UINT message) {
-+  return ContainsKey(messages_callback_map_, message);
-+}
-+
-+void Window::UnhookAllWindowMessages() {
-+  messages_callback_map_.clear();
-+}
-+#endif
-+
-+#if defined(OS_MACOSX)
-+void Window::ShowDefinitionForSelection() {
-+  window_->ShowDefinitionForSelection();
-+}
-+#endif
-+
-+void Window::SetAspectRatio(double aspect_ratio, mate::Arguments* args) {
-+  gfx::Size extra_size;
-+  args->GetNext(&extra_size);
-+  window_->SetAspectRatio(aspect_ratio, extra_size);
-+}
-+
-+v8::Local<v8::Value> Window::GetNativeWindowHandle() {
-+  gfx::AcceleratedWidget handle = window_->GetAcceleratedWidget();
-+  return ToBuffer(
-+      isolate(), static_cast<void*>(&handle), sizeof(gfx::AcceleratedWidget));
-+}
-+
-+void Window::SetVisibleOnAllWorkspaces(bool visible) {
-+  return window_->SetVisibleOnAllWorkspaces(visible);
-+}
-+
-+bool Window::IsVisibleOnAllWorkspaces() {
-+  return window_->IsVisibleOnAllWorkspaces();
-+}
-+
-+int32_t Window::ID() const {
-+  return weak_map_id();
-+}
-+
-+v8::Local<v8::Value> Window::WebContents(v8::Isolate* isolate) {
-+  if (web_contents_.IsEmpty())
-+    return v8::Null(isolate);
-+  else
-+    return v8::Local<v8::Value>::New(isolate, web_contents_);
-+}
-+
-+// static
-+void Window::BuildPrototype(v8::Isolate* isolate,
-+                            v8::Local<v8::ObjectTemplate> prototype) {
-+  mate::ObjectTemplateBuilder(isolate, prototype)
-+      .MakeDestroyable()
-+      .SetMethod("close", &Window::Close)
-+      .SetMethod("focus", &Window::Focus)
-+      .SetMethod("blur", &Window::Blur)
-+      .SetMethod("isFocused", &Window::IsFocused)
-+      .SetMethod("show", &Window::Show)
-+      .SetMethod("showInactive", &Window::ShowInactive)
-+      .SetMethod("hide", &Window::Hide)
-+      .SetMethod("isVisible", &Window::IsVisible)
-+      .SetMethod("maximize", &Window::Maximize)
-+      .SetMethod("unmaximize", &Window::Unmaximize)
-+      .SetMethod("isMaximized", &Window::IsMaximized)
-+      .SetMethod("minimize", &Window::Minimize)
-+      .SetMethod("restore", &Window::Restore)
-+      .SetMethod("isMinimized", &Window::IsMinimized)
-+      .SetMethod("setFullScreen", &Window::SetFullScreen)
-+      .SetMethod("isFullScreen", &Window::IsFullscreen)
-+      .SetMethod("setAspectRatio", &Window::SetAspectRatio)
-+      .SetMethod("getNativeWindowHandle", &Window::GetNativeWindowHandle)
-+      .SetMethod("getBounds", &Window::GetBounds)
-+      .SetMethod("setBounds", &Window::SetBounds)
-+      .SetMethod("getSize", &Window::GetSize)
-+      .SetMethod("setSize", &Window::SetSize)
-+      .SetMethod("getContentSize", &Window::GetContentSize)
-+      .SetMethod("setContentSize", &Window::SetContentSize)
-+      .SetMethod("setMinimumSize", &Window::SetMinimumSize)
-+      .SetMethod("getMinimumSize", &Window::GetMinimumSize)
-+      .SetMethod("setMaximumSize", &Window::SetMaximumSize)
-+      .SetMethod("getMaximumSize", &Window::GetMaximumSize)
-+      .SetMethod("setResizable", &Window::SetResizable)
-+      .SetMethod("isResizable", &Window::IsResizable)
-+      .SetMethod("setMovable", &Window::SetMovable)
-+      .SetMethod("isMovable", &Window::IsMovable)
-+      .SetMethod("setMinimizable", &Window::SetMinimizable)
-+      .SetMethod("isMinimizable", &Window::IsMinimizable)
-+      .SetMethod("setMaximizable", &Window::SetMaximizable)
-+      .SetMethod("isMaximizable", &Window::IsMaximizable)
-+      .SetMethod("setFullScreenable", &Window::SetFullScreenable)
-+      .SetMethod("isFullScreenable", &Window::IsFullScreenable)
-+      .SetMethod("setClosable", &Window::SetClosable)
-+      .SetMethod("isClosable", &Window::IsClosable)
-+      .SetMethod("setAlwaysOnTop", &Window::SetAlwaysOnTop)
-+      .SetMethod("isAlwaysOnTop", &Window::IsAlwaysOnTop)
-+      .SetMethod("center", &Window::Center)
-+      .SetMethod("setPosition", &Window::SetPosition)
-+      .SetMethod("getPosition", &Window::GetPosition)
-+      .SetMethod("setTitle", &Window::SetTitle)
-+      .SetMethod("getTitle", &Window::GetTitle)
-+      .SetMethod("flashFrame", &Window::FlashFrame)
-+      .SetMethod("setSkipTaskbar", &Window::SetSkipTaskbar)
-+      .SetMethod("setKiosk", &Window::SetKiosk)
-+      .SetMethod("isKiosk", &Window::IsKiosk)
-+      .SetMethod("setBackgroundColor", &Window::SetBackgroundColor)
-+      .SetMethod("setHasShadow", &Window::SetHasShadow)
-+      .SetMethod("hasShadow", &Window::HasShadow)
-+      .SetMethod("setRepresentedFilename", &Window::SetRepresentedFilename)
-+      .SetMethod("getRepresentedFilename", &Window::GetRepresentedFilename)
-+      .SetMethod("setDocumentEdited", &Window::SetDocumentEdited)
-+      .SetMethod("isDocumentEdited", &Window::IsDocumentEdited)
-+      .SetMethod("setIgnoreMouseEvents", &Window::SetIgnoreMouseEvents)
-+      .SetMethod("focusOnWebView", &Window::FocusOnWebView)
-+      .SetMethod("blurWebView", &Window::BlurWebView)
-+      .SetMethod("isWebViewFocused", &Window::IsWebViewFocused)
-+      .SetMethod("capturePage", &Window::CapturePage)
-+      .SetMethod("setProgressBar", &Window::SetProgressBar)
-+      .SetMethod("setOverlayIcon", &Window::SetOverlayIcon)
-+      .SetMethod("setThumbarButtons", &Window::SetThumbarButtons)
-+      .SetMethod("setMenu", &Window::SetMenu)
-+      .SetMethod("setAutoHideMenuBar", &Window::SetAutoHideMenuBar)
-+      .SetMethod("isMenuBarAutoHide", &Window::IsMenuBarAutoHide)
-+      .SetMethod("setMenuBarVisibility", &Window::SetMenuBarVisibility)
-+      .SetMethod("isMenuBarVisible", &Window::IsMenuBarVisible)
-+      .SetMethod("setVisibleOnAllWorkspaces",
-+                 &Window::SetVisibleOnAllWorkspaces)
-+      .SetMethod("isVisibleOnAllWorkspaces",
-+                 &Window::IsVisibleOnAllWorkspaces)
-+#if defined(OS_WIN)
-+      .SetMethod("hookWindowMessage", &Window::HookWindowMessage)
-+      .SetMethod("isWindowMessageHooked", &Window::IsWindowMessageHooked)
-+      .SetMethod("unhookWindowMessage", &Window::UnhookWindowMessage)
-+      .SetMethod("unhookAllWindowMessages", &Window::UnhookAllWindowMessages)
-+#endif
-+#if defined(OS_MACOSX)
-+      .SetMethod("showDefinitionForSelection",
-+                 &Window::ShowDefinitionForSelection)
-+#endif
-+      .SetProperty("id", &Window::ID)
-+      .SetProperty("webContents", &Window::WebContents);
-+}
-+
-+// static
-+v8::Local<v8::Value> Window::From(v8::Isolate* isolate,
-+                                  NativeWindow* native_window) {
-+  auto existing = TrackableObject::FromWrappedClass(isolate, native_window);
-+  if (existing)
-+    return existing->GetWrapper(isolate);
-+  else
-+    return v8::Null(isolate);
-+}
-+
-+void SetDeprecatedOptionsCheck(const DeprecatedOptionsCheckCallback& callback) {
-+  g_deprecated_options_check = callback;
-+}
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+
-+namespace {
-+
-+using electron::api::Window;
-+
-+void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
-+                v8::Local<v8::Context> context, void* priv) {
-+  v8::Isolate* isolate = context->GetIsolate();
-+  v8::Local<v8::Function> constructor = mate::CreateConstructor<Window>(
-+      isolate, "BrowserWindow", base::Bind(&Window::New));
-+  mate::Dictionary browser_window(isolate, constructor);
-+  browser_window.SetMethod("fromId",
-+                           &mate::TrackableObject<Window>::FromWeakMapID);
-+  browser_window.SetMethod("getAllWindows",
-+                           &mate::TrackableObject<Window>::GetAll);
-+
-+  mate::Dictionary dict(isolate, exports);
-+  dict.Set("BrowserWindow", browser_window);
-+  dict.SetMethod("_setDeprecatedOptionsCheck",
-+                 &electron::api::SetDeprecatedOptionsCheck);
-+}
-+
-+}  // namespace
-+
-+NODE_MODULE_CONTEXT_AWARE_BUILTIN(electron_browser_window, Initialize)
-added in remote
-  their  100644 bf2bb09510456036dfc5f501f39f871e40b59437 electron/browser/api/electron_api_window.h
-@@ -0,0 +1,222 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_API_ELECTRON_API_WINDOW_H_
-+#define ELECTRON_BROWSER_API_ELECTRON_API_WINDOW_H_
-+
-+#include <map>
-+#include <string>
-+#include <vector>
-+
-+#include "base/memory/scoped_ptr.h"
-+#include "ui/gfx/image/image.h"
-+#include "electron/browser/api/trackable_object.h"
-+#include "electron/browser/native_window.h"
-+#include "electron/browser/native_window_observer.h"
-+#include "native_mate/handle.h"
-+
-+class GURL;
-+
-+namespace gfx {
-+class Rect;
-+}
-+
-+namespace mate {
-+class Arguments;
-+class Dictionary;
-+}
-+
-+namespace electron {
-+
-+class NativeWindow;
-+
-+namespace api {
-+
-+class WebContents;
-+
-+class Window : public mate::TrackableObject<Window>,
-+               public NativeWindowObserver {
-+ public:
-+  static mate::Wrappable* New(v8::Isolate* isolate, mate::Arguments* args);
-+
-+  static void BuildPrototype(v8::Isolate* isolate,
-+                             v8::Local<v8::ObjectTemplate> prototype);
-+
-+  // Returns the BrowserWindow object from |native_window|.
-+  static v8::Local<v8::Value> From(v8::Isolate* isolate,
-+                                   NativeWindow* native_window);
-+
-+  NativeWindow* window() const { return window_.get(); }
-+
-+ protected:
-+  Window(v8::Isolate* isolate, const mate::Dictionary& options);
-+  virtual ~Window();
-+
-+  // NativeWindowObserver:
-+  void WillCloseWindow(bool* prevent_default) override;
-+  void OnWindowClosed() override;
-+  void OnWindowBlur() override;
-+  void OnWindowFocus() override;
-+  void OnWindowShow() override;
-+  void OnWindowHide() override;
-+  void OnWindowMaximize() override;
-+  void OnWindowUnmaximize() override;
-+  void OnWindowMinimize() override;
-+  void OnWindowRestore() override;
-+  void OnWindowResize() override;
-+  void OnWindowMove() override;
-+  void OnWindowMoved() override;
-+  void OnWindowScrollTouchBegin() override;
-+  void OnWindowScrollTouchEnd() override;
-+  void OnWindowSwipe(const std::string& direction) override;
-+  void OnWindowEnterFullScreen() override;
-+  void OnWindowLeaveFullScreen() override;
-+  void OnWindowEnterHtmlFullScreen() override;
-+  void OnWindowLeaveHtmlFullScreen() override;
-+  void OnRendererUnresponsive() override;
-+  void OnRendererResponsive() override;
-+  void OnExecuteWindowsCommand(const std::string& command_name) override;
-+
-+  #if defined(OS_WIN)
-+  void OnWindowMessage(UINT message, WPARAM w_param, LPARAM l_param) override;
-+  #endif
-+
-+ private:
-+  // APIs for NativeWindow.
-+  void Close();
-+  void Focus();
-+  void Blur();
-+  bool IsFocused();
-+  void Show();
-+  void ShowInactive();
-+  void Hide();
-+  bool IsVisible();
-+  void Maximize();
-+  void Unmaximize();
-+  bool IsMaximized();
-+  void Minimize();
-+  void Restore();
-+  bool IsMinimized();
-+  void SetFullScreen(bool fullscreen);
-+  bool IsFullscreen();
-+  void SetBounds(const gfx::Rect& bounds, mate::Arguments* args);
-+  gfx::Rect GetBounds();
-+  void SetSize(int width, int height, mate::Arguments* args);
-+  std::vector<int> GetSize();
-+  void SetContentSize(int width, int height, mate::Arguments* args);
-+  std::vector<int> GetContentSize();
-+  void SetMinimumSize(int width, int height);
-+  std::vector<int> GetMinimumSize();
-+  void SetMaximumSize(int width, int height);
-+  std::vector<int> GetMaximumSize();
-+  void SetResizable(bool resizable);
-+  bool IsResizable();
-+  void SetMovable(bool movable);
-+  bool IsMovable();
-+  void SetMinimizable(bool minimizable);
-+  bool IsMinimizable();
-+  void SetMaximizable(bool maximizable);
-+  bool IsMaximizable();
-+  void SetFullScreenable(bool fullscreenable);
-+  bool IsFullScreenable();
-+  void SetClosable(bool closable);
-+  bool IsClosable();
-+  void SetAlwaysOnTop(bool top);
-+  bool IsAlwaysOnTop();
-+  void Center();
-+  void SetPosition(int x, int y, mate::Arguments* args);
-+  std::vector<int> GetPosition();
-+  void SetTitle(const std::string& title);
-+  std::string GetTitle();
-+  void FlashFrame(bool flash);
-+  void SetSkipTaskbar(bool skip);
-+  void SetKiosk(bool kiosk);
-+  bool IsKiosk();
-+  void SetBackgroundColor(const std::string& color_name);
-+  void SetHasShadow(bool has_shadow);
-+  bool HasShadow();
-+  void FocusOnWebView();
-+  void BlurWebView();
-+  bool IsWebViewFocused();
-+  void SetRepresentedFilename(const std::string& filename);
-+  std::string GetRepresentedFilename();
-+  void SetDocumentEdited(bool edited);
-+  bool IsDocumentEdited();
-+  void SetIgnoreMouseEvents(bool ignore);
-+  void CapturePage(mate::Arguments* args);
-+  void SetProgressBar(double progress);
-+  void SetOverlayIcon(const gfx::Image& overlay,
-+                      const std::string& description);
-+  bool SetThumbarButtons(mate::Arguments* args);
-+  void SetMenu(v8::Isolate* isolate, v8::Local<v8::Value> menu);
-+  void SetAutoHideMenuBar(bool auto_hide);
-+  bool IsMenuBarAutoHide();
-+  void SetMenuBarVisibility(bool visible);
-+  bool IsMenuBarVisible();
-+  void SetAspectRatio(double aspect_ratio, mate::Arguments* args);
-+  v8::Local<v8::Value> GetNativeWindowHandle();
-+
-+#if defined(OS_WIN)
-+  typedef base::Callback<void(v8::Local<v8::Value>,
-+                              v8::Local<v8::Value>)> MessageCallback;
-+
-+  bool HookWindowMessage(UINT message, const MessageCallback& callback);
-+  bool IsWindowMessageHooked(UINT message);
-+  void UnhookWindowMessage(UINT message);
-+  void UnhookAllWindowMessages();
-+#endif
-+
-+#if defined(OS_MACOSX)
-+  void ShowDefinitionForSelection();
-+#endif
-+
-+  void SetVisibleOnAllWorkspaces(bool visible);
-+  bool IsVisibleOnAllWorkspaces();
-+
-+  int32_t ID() const;
-+  v8::Local<v8::Value> WebContents(v8::Isolate* isolate);
-+
-+#if defined(OS_WIN)
-+  typedef std::map<UINT, MessageCallback> MessageCallbackMap;
-+  MessageCallbackMap messages_callback_map_;
-+#endif
-+
-+  v8::Global<v8::Value> web_contents_;
-+  v8::Global<v8::Value> menu_;
-+
-+  api::WebContents* api_web_contents_;
-+
-+  scoped_ptr<NativeWindow> window_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(Window);
-+};
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+
-+namespace mate {
-+
-+template<>
-+struct Converter<electron::NativeWindow*> {
-+  static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
-+                     electron::NativeWindow** out) {
-+    // null would be tranfered to NULL.
-+    if (val->IsNull()) {
-+      *out = NULL;
-+      return true;
-+    }
-+
-+    electron::api::Window* window;
-+    if (!Converter<electron::api::Window*>::FromV8(isolate, val, &window))
-+      return false;
-+    *out = window->window();
-+    return true;
-+  }
-+};
-+
-+}  // namespace mate
-+
-+#endif  // ELECTRON_BROWSER_API_ELECTRON_API_WINDOW_H_
-added in remote
-  their  100644 451955a1fd4dfc2e9c747f18f97444085b5e0382 electron/browser/api/event.cc
-@@ -0,0 +1,72 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/api/event.h"
-+
-+#include "electron/common/api/api_messages.h"
-+#include "electron/common/native_mate_converters/string16_converter.h"
-+#include "content/public/browser/web_contents.h"
-+#include "native_mate/object_template_builder.h"
-+
-+namespace mate {
-+
-+namespace {
-+
-+v8::Persistent<v8::ObjectTemplate> template_;
-+
-+}  // namespace
-+
-+Event::Event()
-+    : sender_(NULL),
-+      message_(NULL) {
-+}
-+
-+Event::~Event() {
-+}
-+
-+ObjectTemplateBuilder Event::GetObjectTemplateBuilder(v8::Isolate* isolate) {
-+  if (template_.IsEmpty())
-+    template_.Reset(isolate, ObjectTemplateBuilder(isolate)
-+        .SetMethod("preventDefault", &Event::PreventDefault)
-+        .SetMethod("sendReply", &Event::SendReply)
-+        .Build());
-+
-+  return ObjectTemplateBuilder(
-+      isolate, v8::Local<v8::ObjectTemplate>::New(isolate, template_));
-+}
-+
-+void Event::SetSenderAndMessage(content::WebContents* sender,
-+                                IPC::Message* message) {
-+  DCHECK(!sender_);
-+  DCHECK(!message_);
-+  sender_ = sender;
-+  message_ = message;
-+
-+  Observe(sender);
-+}
-+
-+void Event::WebContentsDestroyed() {
-+  sender_ = NULL;
-+  message_ = NULL;
-+}
-+
-+void Event::PreventDefault(v8::Isolate* isolate) {
-+  GetWrapper(isolate)->Set(StringToV8(isolate, "defaultPrevented"),
-+                           v8::True(isolate));
-+}
-+
-+bool Event::SendReply(const base::string16& json) {
-+  if (message_ == NULL || sender_ == NULL)
-+    return false;
-+
-+  ElectronViewHostMsg_Message_Sync::WriteReplyParams(message_, json);
-+  return sender_->Send(message_);
-+}
-+
-+// static
-+Handle<Event> Event::Create(v8::Isolate* isolate) {
-+  return CreateHandle(isolate, new Event);
-+}
-+
-+}  // namespace mate
-added in remote
-  their  100644 ebdb32a30dd1cdf76511405928c076638ca7a684 electron/browser/api/event.h
-@@ -0,0 +1,52 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_API_EVENT_H_
-+#define ELECTRON_BROWSER_API_EVENT_H_
-+
-+#include "content/public/browser/web_contents_observer.h"
-+#include "native_mate/wrappable.h"
-+#include "native_mate/handle.h"
-+
-+namespace IPC {
-+class Message;
-+}
-+
-+namespace mate {
-+
-+class Event : public Wrappable,
-+              public content::WebContentsObserver {
-+ public:
-+  static Handle<Event> Create(v8::Isolate* isolate);
-+
-+  // Pass the sender and message to be replied.
-+  void SetSenderAndMessage(content::WebContents* sender, IPC::Message* message);
-+
-+  // event.PreventDefault().
-+  void PreventDefault(v8::Isolate* isolate);
-+
-+  // event.sendReply(json), used for replying synchronous message.
-+  bool SendReply(const base::string16& json);
-+
-+ protected:
-+  Event();
-+  virtual ~Event();
-+
-+  // Wrappable implementations:
-+  ObjectTemplateBuilder GetObjectTemplateBuilder(v8::Isolate* isolate) override;
-+
-+  // content::WebContentsObserver implementations:
-+  void WebContentsDestroyed() override;
-+
-+ private:
-+  // Replyer for the synchronous messages.
-+  content::WebContents* sender_;
-+  IPC::Message* message_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(Event);
-+};
-+
-+}  // namespace mate
-+
-+#endif  // ELECTRON_BROWSER_API_EVENT_H_
-added in remote
-  their  100644 6ef8aa4249a2f735b4be616507291917ad99d309 electron/browser/api/event_emitter.cc
-@@ -0,0 +1,64 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/api/event_emitter.h"
-+
-+#include "electron/browser/api/event.h"
-+#include "native_mate/arguments.h"
-+#include "native_mate/dictionary.h"
-+#include "native_mate/object_template_builder.h"
-+
-+namespace mate {
-+
-+namespace {
-+
-+v8::Persistent<v8::ObjectTemplate> event_template;
-+
-+void PreventDefault(mate::Arguments* args) {
-+  mate::Dictionary self(args->isolate(), args->GetThis());
-+  self.Set("defaultPrevented", true);
-+}
-+
-+// Create a pure JavaScript Event object.
-+v8::Local<v8::Object> CreateEventObject(v8::Isolate* isolate) {
-+  if (event_template.IsEmpty()) {
-+    event_template.Reset(isolate, ObjectTemplateBuilder(isolate)
-+        .SetMethod("preventDefault", &PreventDefault)
-+        .Build());
-+  }
-+
-+  return v8::Local<v8::ObjectTemplate>::New(
-+      isolate, event_template)->NewInstance();
-+}
-+
-+}  // namespace
-+
-+EventEmitter::EventEmitter() {
-+}
-+
-+v8::Local<v8::Object> EventEmitter::CreateJSEvent(
-+    v8::Isolate* isolate, content::WebContents* sender, IPC::Message* message) {
-+  v8::Local<v8::Object> event;
-+  bool use_native_event = sender && message;
-+
-+  if (use_native_event) {
-+    mate::Handle<mate::Event> native_event = mate::Event::Create(isolate);
-+    native_event->SetSenderAndMessage(sender, message);
-+    event = v8::Local<v8::Object>::Cast(native_event.ToV8());
-+  } else {
-+    event = CreateEventObject(isolate);
-+  }
-+  mate::Dictionary(isolate, event).Set("sender", GetWrapper(isolate));
-+  return event;
-+}
-+
-+v8::Local<v8::Object> EventEmitter::CreateCustomEvent(
-+    v8::Isolate* isolate, v8::Local<v8::Object> custom_event) {
-+  v8::Local<v8::Object> event = CreateEventObject(isolate);
-+  (void)event->SetPrototype(custom_event->CreationContext(), custom_event);
-+  mate::Dictionary(isolate, event).Set("sender", GetWrapper(isolate));
-+  return event;
-+}
-+
-+}  // namespace mate
-added in remote
-  their  100644 87b03328073b5b2bc07e6888b41129761f878bc7 electron/browser/api/event_emitter.h
-@@ -0,0 +1,81 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_API_EVENT_EMITTER_H_
-+#define ELECTRON_BROWSER_API_EVENT_EMITTER_H_
-+
-+#include <vector>
-+
-+#include "electron/common/api/event_emitter_caller.h"
-+#include "native_mate/wrappable.h"
-+
-+namespace content {
-+class WebContents;
-+}
-+
-+namespace IPC {
-+class Message;
-+}
-+
-+namespace mate {
-+
-+// Provide helperers to emit event in JavaScript.
-+class EventEmitter : public Wrappable {
-+ public:
-+  typedef std::vector<v8::Local<v8::Value>> ValueArray;
-+
-+  // this.emit(name, event, args...);
-+  template<typename... Args>
-+  bool EmitCustomEvent(const base::StringPiece& name,
-+                       v8::Local<v8::Object> event,
-+                       const Args&... args) {
-+    return EmitWithEvent(name, CreateCustomEvent(isolate(), event), args...);
-+  }
-+
-+  // this.emit(name, new Event(), args...);
-+  template<typename... Args>
-+  bool Emit(const base::StringPiece& name, const Args&... args) {
-+    return EmitWithSender(name, nullptr, nullptr, args...);
-+  }
-+
-+  // this.emit(name, new Event(sender, message), args...);
-+  template<typename... Args>
-+  bool EmitWithSender(const base::StringPiece& name,
-+                      content::WebContents* sender,
-+                      IPC::Message* message,
-+                      const Args&... args) {
-+    v8::Locker locker(isolate());
-+    v8::HandleScope handle_scope(isolate());
-+    v8::Local<v8::Object> event = CreateJSEvent(isolate(), sender, message);
-+    return EmitWithEvent(name, event, args...);
-+  }
-+
-+ protected:
-+  EventEmitter();
-+
-+ private:
-+  // this.emit(name, event, args...);
-+  template<typename... Args>
-+  bool EmitWithEvent(const base::StringPiece& name,
-+                     v8::Local<v8::Object> event,
-+                     const Args&... args) {
-+    v8::Locker locker(isolate());
-+    v8::HandleScope handle_scope(isolate());
-+    EmitEvent(isolate(), GetWrapper(isolate()), name, event, args...);
-+    return event->Get(
-+        StringToV8(isolate(), "defaultPrevented"))->BooleanValue();
-+  }
-+
-+  v8::Local<v8::Object> CreateJSEvent(v8::Isolate* isolate,
-+                                      content::WebContents* sender,
-+                                      IPC::Message* message);
-+  v8::Local<v8::Object> CreateCustomEvent(
-+      v8::Isolate* isolate, v8::Local<v8::Object> event);
-+
-+  DISALLOW_COPY_AND_ASSIGN(EventEmitter);
-+};
-+
-+}  // namespace mate
-+
-+#endif  // ELECTRON_BROWSER_API_EVENT_EMITTER_H_
-added in remote
-  their  100644 cee31b6a620c068b728ced1a7c0242805767e2f2 electron/browser/api/frame_subscriber.cc
-@@ -0,0 +1,65 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/api/frame_subscriber.h"
-+
-+#include "base/bind.h"
-+#include "electron/common/node_includes.h"
-+#include "content/public/browser/render_widget_host.h"
-+
-+namespace electron {
-+
-+namespace api {
-+
-+FrameSubscriber::FrameSubscriber(v8::Isolate* isolate,
-+                                 content::RenderWidgetHostView* view,
-+                                 const FrameCaptureCallback& callback)
-+    : isolate_(isolate), view_(view), callback_(callback), weak_factory_(this) {
-+}
-+
-+bool FrameSubscriber::ShouldCaptureFrame(
-+    const gfx::Rect& damage_rect,
-+    base::TimeTicks present_time,
-+    scoped_refptr<media::VideoFrame>* storage,
-+    DeliverFrameCallback* callback) {
-+  const auto host = view_ ? view_->GetRenderWidgetHost() : nullptr;
-+  if (!view_ || !host)
-+    return false;
-+
-+  const auto size = view_->GetVisibleViewportSize();
-+
-+  host->CopyFromBackingStore(
-+      gfx::Rect(size),
-+      size,
-+      base::Bind(&FrameSubscriber::OnFrameDelivered,
-+                 weak_factory_.GetWeakPtr(), callback_),
-+      kBGRA_8888_SkColorType);
-+
-+  return false;
-+}
-+
-+void FrameSubscriber::OnFrameDelivered(const FrameCaptureCallback& callback,
-+  const SkBitmap& bitmap, content::ReadbackResponse response) {
-+  if (bitmap.computeSize64() == 0)
-+    return;
-+
-+  v8::Locker locker(isolate_);
-+  v8::HandleScope handle_scope(isolate_);
-+
-+  size_t rgb_arr_size = bitmap.width() * bitmap.height() *
-+    bitmap.bytesPerPixel();
-+  v8::MaybeLocal<v8::Object> buffer = node::Buffer::New(isolate_, rgb_arr_size);
-+  if (buffer.IsEmpty())
-+    return;
-+
-+  bitmap.copyPixelsTo(
-+    reinterpret_cast<uint8_t*>(node::Buffer::Data(buffer.ToLocalChecked())),
-+    rgb_arr_size);
-+
-+  callback_.Run(buffer.ToLocalChecked());
-+}
-+
-+}  // namespace api
-+
-+}  // namespace electron
-added in remote
-  their  100644 321c75228c4989e90c5ae4a9068404e74f447144 electron/browser/api/frame_subscriber.h
-@@ -0,0 +1,51 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_API_FRAME_SUBSCRIBER_H_
-+#define ELECTRON_BROWSER_API_FRAME_SUBSCRIBER_H_
-+
-+#include "base/callback.h"
-+#include "base/memory/weak_ptr.h"
-+#include "content/public/browser/render_widget_host_view.h"
-+#include "content/public/browser/render_widget_host_view_frame_subscriber.h"
-+#include "content/public/browser/readback_types.h"
-+#include "third_party/skia/include/core/SkBitmap.h"
-+#include "ui/gfx/geometry/size.h"
-+#include "v8/include/v8.h"
-+
-+namespace electron {
-+
-+namespace api {
-+
-+class FrameSubscriber : public content::RenderWidgetHostViewFrameSubscriber {
-+ public:
-+  using FrameCaptureCallback = base::Callback<void(v8::Local<v8::Value>)>;
-+
-+  FrameSubscriber(v8::Isolate* isolate,
-+                  content::RenderWidgetHostView* view,
-+                  const FrameCaptureCallback& callback);
-+
-+  bool ShouldCaptureFrame(const gfx::Rect& damage_rect,
-+                          base::TimeTicks present_time,
-+                          scoped_refptr<media::VideoFrame>* storage,
-+                          DeliverFrameCallback* callback) override;
-+
-+ private:
-+  void OnFrameDelivered(const FrameCaptureCallback& callback,
-+    const SkBitmap& bitmap, content::ReadbackResponse response);
-+
-+  v8::Isolate* isolate_;
-+  content::RenderWidgetHostView* view_;
-+  FrameCaptureCallback callback_;
-+
-+  base::WeakPtrFactory<FrameSubscriber> weak_factory_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(FrameSubscriber);
-+};
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_API_FRAME_SUBSCRIBER_H_
-added in remote
-  their  100644 a700d330290eda14e2375d86737be2d95df10875 electron/browser/api/save_page_handler.cc
-@@ -0,0 +1,83 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/api/save_page_handler.h"
-+
-+#include <string>
-+
-+#include "electron/browser/electron_browser_context.h"
-+#include "base/callback.h"
-+#include "base/files/file_path.h"
-+#include "content/public/browser/web_contents.h"
-+
-+namespace electron {
-+
-+namespace api {
-+
-+SavePageHandler::SavePageHandler(content::WebContents* web_contents,
-+                                 const SavePageCallback& callback)
-+    : web_contents_(web_contents),
-+      callback_(callback) {
-+}
-+
-+SavePageHandler::~SavePageHandler() {
-+}
-+
-+void SavePageHandler::OnDownloadCreated(content::DownloadManager* manager,
-+                                        content::DownloadItem* item) {
-+  // OnDownloadCreated is invoked during WebContents::SavePage, so the |item|
-+  // here is the one stated by WebContents::SavePage.
-+  item->AddObserver(this);
-+}
-+
-+bool SavePageHandler::Handle(const base::FilePath& full_path,
-+                             const content::SavePageType& save_type) {
-+  auto download_manager = content::BrowserContext::GetDownloadManager(
-+      web_contents_->GetBrowserContext());
-+  download_manager->AddObserver(this);
-+  // Chromium will create a 'foo_files' directory under the directory of saving
-+  // page 'foo.html' for holding other resource files of 'foo.html'.
-+  base::FilePath saved_main_directory_path = full_path.DirName().Append(
-+      full_path.RemoveExtension().BaseName().value() +
-+      FILE_PATH_LITERAL("_files"));
-+  bool result = web_contents_->SavePage(full_path,
-+                                        saved_main_directory_path,
-+                                        save_type);
-+  download_manager->RemoveObserver(this);
-+  // If initialization fails which means fail to create |DownloadItem|, we need
-+  // to delete the |SavePageHandler| instance to avoid memory-leak.
-+  if (!result)
-+    delete this;
-+  return result;
-+}
-+
-+void SavePageHandler::OnDownloadUpdated(content::DownloadItem* item) {
-+  if (item->IsDone()) {
-+    v8::Isolate* isolate = v8::Isolate::GetCurrent();
-+    v8::Locker locker(isolate);
-+    v8::HandleScope handle_scope(isolate);
-+    if (item->GetState() == content::DownloadItem::COMPLETE) {
-+      callback_.Run(v8::Null(isolate));
-+    } else {
-+      v8::Local<v8::String> error_message = v8::String::NewFromUtf8(
-+          isolate, "Fail to save page");
-+      callback_.Run(v8::Exception::Error(error_message));
-+    }
-+    Destroy(item);
-+  }
-+}
-+
-+void SavePageHandler::Destroy(content::DownloadItem* item) {
-+  item->RemoveObserver(this);
-+  delete this;
-+}
-+
-+// static
-+bool SavePageHandler::IsSavePageTypes(const std::string& type) {
-+  return type == "multipart/related" || type == "text/html";
-+}
-+
-+}  // namespace api
-+
-+}  // namespace electron
-added in remote
-  their  100644 54829cb2ee0d8770de6e8b4f70aa0286a16a31a7 electron/browser/api/save_page_handler.h
-@@ -0,0 +1,60 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_API_SAVE_PAGE_HANDLER_H_
-+#define ELECTRON_BROWSER_API_SAVE_PAGE_HANDLER_H_
-+
-+#include <string>
-+
-+#include "content/public/browser/download_item.h"
-+#include "content/public/browser/download_manager.h"
-+#include "content/public/browser/save_page_type.h"
-+#include "v8/include/v8.h"
-+
-+namespace base {
-+class FilePath;
-+}
-+
-+namespace content {
-+class WebContents;
-+}
-+
-+namespace electron {
-+
-+namespace api {
-+
-+// A self-destroyed class for handling save page request.
-+class SavePageHandler : public content::DownloadManager::Observer,
-+                        public content::DownloadItem::Observer {
-+ public:
-+  using SavePageCallback = base::Callback<void(v8::Local<v8::Value>)>;
-+
-+  SavePageHandler(content::WebContents* web_contents,
-+                  const SavePageCallback& callback);
-+  ~SavePageHandler();
-+
-+  bool Handle(const base::FilePath& full_path,
-+              const content::SavePageType& save_type);
-+
-+  static bool IsSavePageTypes(const std::string& type);
-+
-+ private:
-+  void Destroy(content::DownloadItem* item);
-+
-+  // content::DownloadManager::Observer:
-+  void OnDownloadCreated(content::DownloadManager* manager,
-+                         content::DownloadItem* item) override;
-+
-+  // content::DownloadItem::Observer:
-+  void OnDownloadUpdated(content::DownloadItem* item) override;
-+
-+  content::WebContents* web_contents_;  // weak
-+  SavePageCallback callback_;
-+};
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_API_SAVE_PAGE_HANDLER_H_
-added in remote
-  their  100644 9f71c3432d26ba91a9445258917ffce7806ea189 electron/browser/api/trackable_object.cc
-@@ -0,0 +1,83 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/api/trackable_object.h"
-+
-+#include "electron/browser/electron_browser_main_parts.h"
-+#include "base/bind.h"
-+#include "base/supports_user_data.h"
-+
-+namespace mate {
-+
-+namespace {
-+
-+const char* kTrackedObjectKey = "TrackedObjectKey";
-+
-+class IDUserData : public base::SupportsUserData::Data {
-+ public:
-+  explicit IDUserData(int32_t id) : id_(id) {}
-+
-+  operator int32_t() const { return id_; }
-+
-+ private:
-+  int32_t id_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(IDUserData);
-+};
-+
-+}  // namespace
-+
-+TrackableObjectBase::TrackableObjectBase()
-+    : weak_map_id_(0), wrapped_(nullptr), weak_factory_(this) {
-+  cleanup_ = RegisterDestructionCallback(GetDestroyClosure());
-+}
-+
-+TrackableObjectBase::~TrackableObjectBase() {
-+  cleanup_.Run();
-+}
-+
-+void TrackableObjectBase::AfterInit(v8::Isolate* isolate) {
-+  if (wrapped_)
-+    AttachAsUserData(wrapped_);
-+}
-+
-+void TrackableObjectBase::MarkDestroyed() {
-+  GetWrapper(isolate())->SetAlignedPointerInInternalField(0, nullptr);
-+}
-+
-+base::Closure TrackableObjectBase::GetDestroyClosure() {
-+  return base::Bind(&TrackableObjectBase::Destroy, weak_factory_.GetWeakPtr());
-+}
-+
-+void TrackableObjectBase::Destroy() {
-+  delete this;
-+}
-+
-+void TrackableObjectBase::AttachAsUserData(base::SupportsUserData* wrapped) {
-+  if (weak_map_id_ != 0) {
-+    wrapped->SetUserData(kTrackedObjectKey, new IDUserData(weak_map_id_));
-+    wrapped_ = nullptr;
-+  } else {
-+    // If the TrackableObjectBase is not ready yet then delay SetUserData until
-+    // AfterInit is called.
-+    wrapped_ = wrapped;
-+  }
-+}
-+
-+// static
-+int32_t TrackableObjectBase::GetIDFromWrappedClass(base::SupportsUserData* w) {
-+  auto id = static_cast<IDUserData*>(w->GetUserData(kTrackedObjectKey));
-+  if (id)
-+    return *id;
-+  else
-+    return 0;
-+}
-+
-+// static
-+base::Closure TrackableObjectBase::RegisterDestructionCallback(
-+    const base::Closure& c) {
-+  return electron::ElectronBrowserMainParts::Get()->RegisterDestructionCallback(c);
-+}
-+
-+}  // namespace mate
-added in remote
-  their  100644 31db58795e0ea1b58d72fc993d934d8b3d60b2b7 electron/browser/api/trackable_object.h
-@@ -0,0 +1,156 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_API_TRACKABLE_OBJECT_H_
-+#define ELECTRON_BROWSER_API_TRACKABLE_OBJECT_H_
-+
-+#include <vector>
-+
-+#include "electron/browser/api/event_emitter.h"
-+#include "electron/common/id_weak_map.h"
-+#include "base/bind.h"
-+#include "base/memory/scoped_ptr.h"
-+#include "base/memory/weak_ptr.h"
-+#include "native_mate/object_template_builder.h"
-+
-+namespace base {
-+class SupportsUserData;
-+}
-+
-+namespace mate {
-+
-+// Users should use TrackableObject instead.
-+class TrackableObjectBase : public mate::EventEmitter {
-+ public:
-+  TrackableObjectBase();
-+
-+  // The ID in weak map.
-+  int32_t weak_map_id() const { return weak_map_id_; }
-+
-+  // Wrap TrackableObject into a class that SupportsUserData.
-+  void AttachAsUserData(base::SupportsUserData* wrapped);
-+
-+ protected:
-+  ~TrackableObjectBase() override;
-+
-+  // mate::Wrappable:
-+  void AfterInit(v8::Isolate* isolate) override;
-+
-+  // Mark the JS object as destroyed.
-+  void MarkDestroyed();
-+
-+  // Returns a closure that can destroy the native class.
-+  base::Closure GetDestroyClosure();
-+
-+  // Get the weak_map_id from SupportsUserData.
-+  static int32_t GetIDFromWrappedClass(base::SupportsUserData* wrapped);
-+
-+  // Register a callback that should be destroyed before JavaScript environment
-+  // gets destroyed.
-+  static base::Closure RegisterDestructionCallback(const base::Closure& c);
-+
-+  int32_t weak_map_id_;
-+  base::SupportsUserData* wrapped_;
-+
-+ private:
-+  void Destroy();
-+
-+  base::Closure cleanup_;
-+  base::WeakPtrFactory<TrackableObjectBase> weak_factory_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(TrackableObjectBase);
-+};
-+
-+// All instances of TrackableObject will be kept in a weak map and can be got
-+// from its ID.
-+template<typename T>
-+class TrackableObject : public TrackableObjectBase {
-+ public:
-+  // Finds out the TrackableObject from its ID in weak map.
-+  static T* FromWeakMapID(v8::Isolate* isolate, int32_t id) {
-+    if (!weak_map_)
-+      return nullptr;
-+
-+    v8::MaybeLocal<v8::Object> object = weak_map_->Get(isolate, id);
-+    if (object.IsEmpty())
-+      return nullptr;
-+
-+    T* self = nullptr;
-+    mate::ConvertFromV8(isolate, object.ToLocalChecked(), &self);
-+    return self;
-+  }
-+
-+  // Finds out the TrackableObject from the class it wraps.
-+  static T* FromWrappedClass(v8::Isolate* isolate,
-+                             base::SupportsUserData* wrapped) {
-+    int32_t id = GetIDFromWrappedClass(wrapped);
-+    if (!id)
-+      return nullptr;
-+    return FromWeakMapID(isolate, id);
-+  }
-+
-+  // Returns all objects in this class's weak map.
-+  static std::vector<v8::Local<v8::Object>> GetAll(v8::Isolate* isolate) {
-+    if (weak_map_)
-+      return weak_map_->Values(isolate);
-+    else
-+      return std::vector<v8::Local<v8::Object>>();
-+  }
-+
-+  // Removes this instance from the weak map.
-+  void RemoveFromWeakMap() {
-+    if (weak_map_ && weak_map_->Has(weak_map_id()))
-+      weak_map_->Remove(weak_map_id());
-+  }
-+
-+ protected:
-+  TrackableObject() {}
-+  ~TrackableObject() override {
-+    RemoveFromWeakMap();
-+  }
-+
-+  void AfterInit(v8::Isolate* isolate) override {
-+    if (!weak_map_) {
-+      weak_map_.reset(new electron::IDWeakMap);
-+      RegisterDestructionCallback(
-+          base::Bind(&TrackableObject<T>::ReleaseAllWeakReferences));
-+    }
-+    weak_map_id_ = weak_map_->Add(isolate, GetWrapper(isolate));
-+    TrackableObjectBase::AfterInit(isolate);
-+  }
-+
-+ private:
-+  // mate::Wrappable:
-+  mate::ObjectTemplateBuilder GetObjectTemplateBuilder(
-+      v8::Isolate* isolate) override {
-+    if (template_.IsEmpty()) {
-+      auto templ = v8::ObjectTemplate::New(isolate);
-+      T::BuildPrototype(isolate, templ);
-+      template_.Reset(isolate, templ);
-+    }
-+
-+    return ObjectTemplateBuilder(
-+        isolate, v8::Local<v8::ObjectTemplate>::New(isolate, template_));
-+  }
-+
-+  // Releases all weak references in weak map, called when app is terminating.
-+  static void ReleaseAllWeakReferences() {
-+    weak_map_.reset();
-+  }
-+
-+  static v8::Persistent<v8::ObjectTemplate> template_;
-+  static scoped_ptr<electron::IDWeakMap> weak_map_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(TrackableObject);
-+};
-+
-+template<typename T>
-+v8::Persistent<v8::ObjectTemplate> TrackableObject<T>::template_;
-+
-+template<typename T>
-+scoped_ptr<electron::IDWeakMap> TrackableObject<T>::weak_map_;
-+
-+}  // namespace mate
-+
-+#endif  // ELECTRON_BROWSER_API_TRACKABLE_OBJECT_H_
-added in remote
-  their  100644 329871b9e7837d4a9324034290eb3d6ae9515dd3 electron/browser/auto_updater.cc
-@@ -0,0 +1,30 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/auto_updater.h"
-+
-+namespace auto_updater {
-+
-+Delegate* AutoUpdater::delegate_ = nullptr;
-+
-+Delegate* AutoUpdater::GetDelegate() {
-+  return delegate_;
-+}
-+
-+void AutoUpdater::SetDelegate(Delegate* delegate) {
-+  delegate_ = delegate;
-+}
-+
-+#if !defined(OS_MACOSX) || defined(MAS_BUILD)
-+void AutoUpdater::SetFeedURL(const std::string& url) {
-+}
-+
-+void AutoUpdater::CheckForUpdates() {
-+}
-+
-+void AutoUpdater::QuitAndInstall() {
-+}
-+#endif
-+
-+}  // namespace auto_updater
-added in remote
-  their  100644 7f2d66882770041dddb05b61497bdf0954bf2223 electron/browser/auto_updater.h
-@@ -0,0 +1,61 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_AUTO_UPDATER_H_
-+#define ELECTRON_BROWSER_AUTO_UPDATER_H_
-+
-+#include <string>
-+
-+#include "base/macros.h"
-+#include "build/build_config.h"
-+
-+namespace base {
-+class Time;
-+}
-+
-+namespace auto_updater {
-+
-+class Delegate {
-+ public:
-+  // An error happened.
-+  virtual void OnError(const std::string& error) {}
-+
-+  // Checking to see if there is an update
-+  virtual void OnCheckingForUpdate() {}
-+
-+  // There is an update available and it is being downloaded
-+  virtual void OnUpdateAvailable() {}
-+
-+  // There is no available update.
-+  virtual void OnUpdateNotAvailable() {}
-+
-+  // There is a new update which has been downloaded.
-+  virtual void OnUpdateDownloaded(const std::string& release_notes,
-+                                  const std::string& release_name,
-+                                  const base::Time& release_date,
-+                                  const std::string& update_url) {}
-+
-+ protected:
-+  virtual ~Delegate() {}
-+};
-+
-+class AutoUpdater {
-+ public:
-+  // Gets/Sets the delegate.
-+  static Delegate* GetDelegate();
-+  static void SetDelegate(Delegate* delegate);
-+
-+  static void SetFeedURL(const std::string& url);
-+  static void CheckForUpdates();
-+  static void QuitAndInstall();
-+
-+ private:
-+  static Delegate* delegate_;
-+
-+  DISALLOW_IMPLICIT_CONSTRUCTORS(AutoUpdater);
-+};
-+
-+}  // namespace auto_updater
-+
-+#endif  // ELECTRON_BROWSER_AUTO_UPDATER_H_
-added in remote
-  their  100644 6ef2d7773a366ddc306ca2ff2620d7a43bb9b728 electron/browser/auto_updater_mac.mm
-@@ -0,0 +1,99 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/auto_updater.h"
-+
-+#import <ReactiveCocoa/RACCommand.h>
-+#import <ReactiveCocoa/RACSignal.h>
-+#import <ReactiveCocoa/NSObject+RACPropertySubscribing.h>
-+#import <Squirrel/Squirrel.h>
-+
-+#include "base/bind.h"
-+#include "base/time/time.h"
-+#include "base/strings/sys_string_conversions.h"
-+
-+namespace auto_updater {
-+
-+namespace {
-+
-+// The gloal SQRLUpdater object.
-+SQRLUpdater* g_updater = nil;
-+
-+}  // namespace
-+
-+// static
-+void AutoUpdater::SetFeedURL(const std::string& feed) {
-+  if (g_updater == nil) {
-+    Delegate* delegate = GetDelegate();
-+    if (!delegate)
-+      return;
-+
-+    // Initialize the SQRLUpdater.
-+    NSURL* url = [NSURL URLWithString:base::SysUTF8ToNSString(feed)];
-+    NSURLRequest* urlRequest = [NSURLRequest requestWithURL:url];
-+
-+    @try {
-+      g_updater = [[SQRLUpdater alloc] initWithUpdateRequest:urlRequest];
-+    } @catch (NSException* error) {
-+      delegate->OnError(base::SysNSStringToUTF8(error.reason));
-+      return;
-+    }
-+
-+    [[g_updater rac_valuesForKeyPath:@"state" observer:g_updater]
-+      subscribeNext:^(NSNumber *stateNumber) {
-+        int state = [stateNumber integerValue];
-+        // Dispatching the event on main thread.
-+        dispatch_async(dispatch_get_main_queue(), ^{
-+          if (state == SQRLUpdaterStateCheckingForUpdate)
-+            delegate->OnCheckingForUpdate();
-+          else if (state == SQRLUpdaterStateDownloadingUpdate)
-+            delegate->OnUpdateAvailable();
-+        });
-+    }];
-+  }
-+}
-+
-+// static
-+void AutoUpdater::CheckForUpdates() {
-+  Delegate* delegate = GetDelegate();
-+  if (!delegate)
-+    return;
-+
-+  [[[[g_updater.checkForUpdatesCommand
-+      execute:nil]
-+      // Send a `nil` after everything...
-+      concat:[RACSignal return:nil]]
-+      // But only take the first value. If an update is sent, we'll get that.
-+      // Otherwise, we'll get our inserted `nil` value.
-+      take:1]
-+      subscribeNext:^(SQRLDownloadedUpdate *downloadedUpdate) {
-+        if (downloadedUpdate) {
-+          SQRLUpdate* update = downloadedUpdate.update;
-+          // There is a new update that has been downloaded.
-+          delegate->OnUpdateDownloaded(
-+            base::SysNSStringToUTF8(update.releaseNotes),
-+            base::SysNSStringToUTF8(update.releaseName),
-+            base::Time::FromDoubleT(update.releaseDate.timeIntervalSince1970),
-+            base::SysNSStringToUTF8(update.updateURL.absoluteString));
-+        } else {
-+          // When the completed event is sent with no update, then we know there
-+          // is no update available.
-+          delegate->OnUpdateNotAvailable();
-+        }
-+      } error:^(NSError *error) {
-+        delegate->OnError(base::SysNSStringToUTF8(
-+            [NSString stringWithFormat:@"%@: %@",
-+                error.localizedDescription, error.localizedFailureReason]));
-+      }];
-+}
-+
-+void AutoUpdater::QuitAndInstall() {
-+  [[g_updater relaunchToInstallUpdate] subscribeError:^(NSError* error) {
-+    Delegate* delegate = AutoUpdater::GetDelegate();
-+    if (delegate)
-+      delegate->OnError(base::SysNSStringToUTF8(error.localizedDescription));
-+  }];
-+}
-+
-+}  // namespace auto_updater
-added in remote
-  their  100644 fb07c7d60a2e9783a0744bd6fd53e8a54114efd5 electron/browser/bridge_task_runner.cc
-@@ -0,0 +1,59 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/bridge_task_runner.h"
-+
-+#include "base/message_loop/message_loop.h"
-+
-+namespace electron {
-+
-+void BridgeTaskRunner::MessageLoopIsReady() {
-+  auto message_loop = base::MessageLoop::current();
-+  CHECK(message_loop);
-+  for (const TaskPair& task : tasks_) {
-+    message_loop->task_runner()->PostDelayedTask(
-+        base::get<0>(task), base::get<1>(task), base::get<2>(task));
-+  }
-+  for (const TaskPair& task : non_nestable_tasks_) {
-+    message_loop->task_runner()->PostNonNestableDelayedTask(
-+        base::get<0>(task), base::get<1>(task), base::get<2>(task));
-+  }
-+}
-+
-+bool BridgeTaskRunner::PostDelayedTask(
-+    const tracked_objects::Location& from_here,
-+    const base::Closure& task,
-+    base::TimeDelta delay) {
-+  auto message_loop = base::MessageLoop::current();
-+  if (!message_loop) {
-+    tasks_.push_back(base::MakeTuple(from_here, task, delay));
-+    return true;
-+  }
-+
-+  return message_loop->task_runner()->PostDelayedTask(from_here, task, delay);
-+}
-+
-+bool BridgeTaskRunner::RunsTasksOnCurrentThread() const {
-+  auto message_loop = base::MessageLoop::current();
-+  if (!message_loop)
-+    return true;
-+
-+  return message_loop->task_runner()->RunsTasksOnCurrentThread();
-+}
-+
-+bool BridgeTaskRunner::PostNonNestableDelayedTask(
-+    const tracked_objects::Location& from_here,
-+    const base::Closure& task,
-+    base::TimeDelta delay) {
-+  auto message_loop = base::MessageLoop::current();
-+  if (!message_loop) {
-+    non_nestable_tasks_.push_back(base::MakeTuple(from_here, task, delay));
-+    return true;
-+  }
-+
-+  return message_loop->task_runner()->PostNonNestableDelayedTask(
-+      from_here, task, delay);
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 5ed3ff65ab1fd629332fbf5785afdc3fc39198f1 electron/browser/bridge_task_runner.h
-@@ -0,0 +1,46 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_BRIDGE_TASK_RUNNER_H_
-+#define ELECTRON_BROWSER_BRIDGE_TASK_RUNNER_H_
-+
-+#include <vector>
-+
-+#include "base/single_thread_task_runner.h"
-+#include "base/tuple.h"
-+
-+namespace electron {
-+
-+// Post all tasks to the current message loop's task runner if available,
-+// otherwise delay the work until message loop is ready.
-+class BridgeTaskRunner : public base::SingleThreadTaskRunner {
-+ public:
-+  BridgeTaskRunner() {}
-+  ~BridgeTaskRunner() override {}
-+
-+  // Called when message loop is ready.
-+  void MessageLoopIsReady();
-+
-+  // base::SingleThreadTaskRunner:
-+  bool PostDelayedTask(const tracked_objects::Location& from_here,
-+                       const base::Closure& task,
-+                       base::TimeDelta delay) override;
-+  bool RunsTasksOnCurrentThread() const override;
-+  bool PostNonNestableDelayedTask(
-+      const tracked_objects::Location& from_here,
-+      const base::Closure& task,
-+      base::TimeDelta delay) override;
-+
-+ private:
-+  using TaskPair = base::Tuple<
-+      tracked_objects::Location, base::Closure, base::TimeDelta>;
-+  std::vector<TaskPair> tasks_;
-+  std::vector<TaskPair> non_nestable_tasks_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(BridgeTaskRunner);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_BRIDGE_TASK_RUNNER_H_
-added in remote
-  their  100644 f8781b9e719373cba5c2eb4b573da75711dd5e7e electron/browser/browser.cc
-@@ -0,0 +1,188 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/browser.h"
-+
-+#include <string>
-+
-+#include "electron/browser/electron_browser_main_parts.h"
-+#include "electron/browser/native_window.h"
-+#include "electron/browser/window_list.h"
-+#include "base/message_loop/message_loop.h"
-+
-+namespace electron {
-+
-+Browser::Browser()
-+    : is_quiting_(false),
-+      is_ready_(false),
-+      is_shutdown_(false) {
-+  WindowList::AddObserver(this);
-+}
-+
-+Browser::~Browser() {
-+  WindowList::RemoveObserver(this);
-+}
-+
-+// static
-+Browser* Browser::Get() {
-+  return ElectronBrowserMainParts::Get()->browser();
-+}
-+
-+void Browser::Quit() {
-+  if (is_quiting_)
-+    return;
-+
-+  is_quiting_ = HandleBeforeQuit();
-+  if (!is_quiting_)
-+    return;
-+
-+  electron::WindowList* window_list = electron::WindowList::GetInstance();
-+  if (window_list->size() == 0)
-+    NotifyAndShutdown();
-+
-+  window_list->CloseAllWindows();
-+}
-+
-+void Browser::Exit(int code) {
-+  if (!ElectronBrowserMainParts::Get()->SetExitCode(code)) {
-+    // Message loop is not ready, quit directly.
-+    exit(code);
-+  } else {
-+    // Prepare to quit when all windows have been closed..
-+    is_quiting_ = true;
-+
-+    // Must destroy windows before quitting, otherwise bad things can happen.
-+    electron::WindowList* window_list = electron::WindowList::GetInstance();
-+    if (window_list->size() == 0) {
-+      Shutdown();
-+    } else {
-+      // Unlike Quit(), we do not ask to close window, but destroy the window
-+      // without asking.
-+      for (NativeWindow* window : *window_list)
-+        window->CloseContents(nullptr);  // e.g. Destroy()
-+    }
-+  }
-+}
-+
-+void Browser::Shutdown() {
-+  if (is_shutdown_)
-+    return;
-+
-+  is_shutdown_ = true;
-+  is_quiting_ = true;
-+
-+  FOR_EACH_OBSERVER(BrowserObserver, observers_, OnQuit());
-+
-+  if (base::MessageLoop::current()) {
-+    base::MessageLoop::current()->PostTask(
-+        FROM_HERE, base::MessageLoop::QuitWhenIdleClosure());
-+  } else {
-+    // There is no message loop available so we are in early stage.
-+    exit(0);
-+  }
-+}
-+
-+std::string Browser::GetVersion() const {
-+  if (version_override_.empty()) {
-+    std::string version = GetExecutableFileVersion();
-+    if (!version.empty())
-+      return version;
-+  }
-+
-+  return version_override_;
-+}
-+
-+void Browser::SetVersion(const std::string& version) {
-+  version_override_ = version;
-+}
-+
-+std::string Browser::GetName() const {
-+  if (name_override_.empty()) {
-+    std::string name = GetExecutableFileProductName();
-+    if (!name.empty())
-+      return name;
-+  }
-+
-+  return name_override_;
-+}
-+
-+void Browser::SetName(const std::string& name) {
-+  name_override_ = name;
-+}
-+
-+bool Browser::OpenFile(const std::string& file_path) {
-+  bool prevent_default = false;
-+  FOR_EACH_OBSERVER(BrowserObserver,
-+                    observers_,
-+                    OnOpenFile(&prevent_default, file_path));
-+
-+  return prevent_default;
-+}
-+
-+void Browser::OpenURL(const std::string& url) {
-+  FOR_EACH_OBSERVER(BrowserObserver, observers_, OnOpenURL(url));
-+}
-+
-+void Browser::Activate(bool has_visible_windows) {
-+  FOR_EACH_OBSERVER(BrowserObserver,
-+                    observers_,
-+                    OnActivate(has_visible_windows));
-+}
-+
-+void Browser::WillFinishLaunching() {
-+  FOR_EACH_OBSERVER(BrowserObserver, observers_, OnWillFinishLaunching());
-+}
-+
-+void Browser::DidFinishLaunching() {
-+  is_ready_ = true;
-+  FOR_EACH_OBSERVER(BrowserObserver, observers_, OnFinishLaunching());
-+}
-+
-+void Browser::RequestLogin(LoginHandler* login_handler) {
-+  FOR_EACH_OBSERVER(BrowserObserver, observers_, OnLogin(login_handler));
-+}
-+
-+void Browser::NotifyAndShutdown() {
-+  if (is_shutdown_)
-+    return;
-+
-+  bool prevent_default = false;
-+  FOR_EACH_OBSERVER(BrowserObserver, observers_, OnWillQuit(&prevent_default));
-+
-+  if (prevent_default) {
-+    is_quiting_ = false;
-+    return;
-+  }
-+
-+  Shutdown();
-+}
-+
-+bool Browser::HandleBeforeQuit() {
-+  bool prevent_default = false;
-+  FOR_EACH_OBSERVER(BrowserObserver,
-+                    observers_,
-+                    OnBeforeQuit(&prevent_default));
-+
-+  return !prevent_default;
-+}
-+
-+void Browser::OnWindowCloseCancelled(NativeWindow* window) {
-+  if (is_quiting_)
-+    // Once a beforeunload handler has prevented the closing, we think the quit
-+    // is cancelled too.
-+    is_quiting_ = false;
-+}
-+
-+void Browser::OnWindowAllClosed() {
-+  if (is_quiting_)
-+    NotifyAndShutdown();
-+  else
-+    FOR_EACH_OBSERVER(BrowserObserver, observers_, OnWindowAllClosed());
-+}
-+
-+void Browser::PlatformThemeChanged() {
-+  FOR_EACH_OBSERVER(BrowserObserver, observers_, OnPlatformThemeChanged());
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 3913476ac4daac19fe0669b7170a4691b6f6652b electron/browser/browser.h
-@@ -0,0 +1,210 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_BROWSER_H_
-+#define ELECTRON_BROWSER_BROWSER_H_
-+
-+#include <string>
-+#include <vector>
-+
-+#include "base/macros.h"
-+#include "base/compiler_specific.h"
-+#include "base/observer_list.h"
-+#include "base/strings/string16.h"
-+#include "electron/browser/browser_observer.h"
-+#include "electron/browser/window_list_observer.h"
-+
-+#if defined(OS_WIN)
-+#include "base/files/file_path.h"
-+#endif
-+
-+namespace base {
-+class FilePath;
-+}
-+
-+namespace ui {
-+class MenuModel;
-+}
-+
-+namespace gfx {
-+class Image;
-+}
-+
-+namespace electron {
-+
-+class LoginHandler;
-+
-+// This class is used for control application-wide operations.
-+class Browser : public WindowListObserver {
-+ public:
-+  Browser();
-+  ~Browser();
-+
-+  static Browser* Get();
-+
-+  // Try to close all windows and quit the application.
-+  void Quit();
-+
-+  // Exit the application immediately and set exit code.
-+  void Exit(int code);
-+
-+  // Cleanup everything and shutdown the application gracefully.
-+  void Shutdown();
-+
-+  // Focus the application.
-+  void Focus();
-+
-+  // Returns the version of the executable (or bundle).
-+  std::string GetVersion() const;
-+
-+  // Overrides the application version.
-+  void SetVersion(const std::string& version);
-+
-+  // Returns the application's name, default is just Electron.
-+  std::string GetName() const;
-+
-+  // Overrides the application name.
-+  void SetName(const std::string& name);
-+
-+  // Add the |path| to recent documents list.
-+  void AddRecentDocument(const base::FilePath& path);
-+
-+  // Clear the recent documents list.
-+  void ClearRecentDocuments();
-+
-+  // Set the application user model ID.
-+  void SetAppUserModelID(const base::string16& name);
-+
-+  // Remove the default protocol handler registry key
-+  bool RemoveAsDefaultProtocolClient(const std::string& protocol);
-+
-+  // Set as default handler for a protocol.
-+  bool SetAsDefaultProtocolClient(const std::string& protocol);
-+
-+#if defined(OS_MACOSX)
-+  // Hide the application.
-+  void Hide();
-+
-+  // Show the application.
-+  void Show();
-+
-+  // Check if the system is in Dark Mode.
-+  bool IsDarkMode();
-+
-+  // Bounce the dock icon.
-+  enum BounceType {
-+    BOUNCE_CRITICAL = 0,
-+    BOUNCE_INFORMATIONAL = 10,
-+  };
-+  int DockBounce(BounceType type);
-+  void DockCancelBounce(int request_id);
-+
-+  // Set/Get dock's badge text.
-+  void DockSetBadgeText(const std::string& label);
-+  std::string DockGetBadgeText();
-+
-+  // Hide/Show dock.
-+  void DockHide();
-+  void DockShow();
-+
-+  // Set docks' menu.
-+  void DockSetMenu(ui::MenuModel* model);
-+
-+  // Set docks' icon.
-+  void DockSetIcon(const gfx::Image& image);
-+#endif  // defined(OS_MACOSX)
-+
-+#if defined(OS_WIN)
-+  struct UserTask {
-+    base::FilePath program;
-+    base::string16 arguments;
-+    base::string16 title;
-+    base::string16 description;
-+    base::FilePath icon_path;
-+    int icon_index;
-+  };
-+
-+  // Add a custom task to jump list.
-+  void SetUserTasks(const std::vector<UserTask>& tasks);
-+
-+  // Returns the application user model ID, if there isn't one, then create
-+  // one from app's name.
-+  // The returned string managed by Browser, and should not be modified.
-+  PCWSTR GetAppUserModelID();
-+#endif
-+
-+  // Tell the application to open a file.
-+  bool OpenFile(const std::string& file_path);
-+
-+  // Tell the application to open a url.
-+  void OpenURL(const std::string& url);
-+
-+  // Tell the application that application is activated with visible/invisible
-+  // windows.
-+  void Activate(bool has_visible_windows);
-+
-+  // Tell the application the loading has been done.
-+  void WillFinishLaunching();
-+  void DidFinishLaunching();
-+
-+  // Request basic auth login.
-+  void RequestLogin(LoginHandler* login_handler);
-+
-+  // Tell the application that plaform's theme changed.
-+  void PlatformThemeChanged();
-+
-+  void AddObserver(BrowserObserver* obs) {
-+    observers_.AddObserver(obs);
-+  }
-+
-+  void RemoveObserver(BrowserObserver* obs) {
-+    observers_.RemoveObserver(obs);
-+  }
-+
-+  bool is_shutting_down() const { return is_shutdown_; }
-+  bool is_quiting() const { return is_quiting_; }
-+  bool is_ready() const { return is_ready_; }
-+
-+ protected:
-+  // Returns the version of application bundle or executable file.
-+  std::string GetExecutableFileVersion() const;
-+
-+  // Returns the name of application bundle or executable file.
-+  std::string GetExecutableFileProductName() const;
-+
-+  // Send the will-quit message and then shutdown the application.
-+  void NotifyAndShutdown();
-+
-+  // Send the before-quit message and start closing windows.
-+  bool HandleBeforeQuit();
-+
-+  bool is_quiting_;
-+
-+ private:
-+  // WindowListObserver implementations:
-+  void OnWindowCloseCancelled(NativeWindow* window) override;
-+  void OnWindowAllClosed() override;
-+
-+  // Observers of the browser.
-+  base::ObserverList<BrowserObserver> observers_;
-+
-+  // Whether "ready" event has been emitted.
-+  bool is_ready_;
-+
-+  // The browse is being shutdown.
-+  bool is_shutdown_;
-+
-+  std::string version_override_;
-+  std::string name_override_;
-+
-+#if defined(OS_WIN)
-+  base::string16 app_user_model_id_;
-+#endif
-+
-+  DISALLOW_COPY_AND_ASSIGN(Browser);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_BROWSER_H_
-added in remote
-  their  100644 d7f09f8af61c3495f340dd7ff854ac8aa3b9e11e electron/browser/browser_linux.cc
-@@ -0,0 +1,53 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/browser.h"
-+
-+#include <stdlib.h>
-+
-+#include "electron/browser/native_window.h"
-+#include "electron/browser/window_list.h"
-+#include "electron/common/electron_version.h"
-+#include "brightray/common/application_info.h"
-+
-+namespace electron {
-+
-+void Browser::Focus() {
-+  // Focus on the first visible window.
-+  WindowList* list = WindowList::GetInstance();
-+  for (WindowList::iterator iter = list->begin(); iter != list->end(); ++iter) {
-+    NativeWindow* window = *iter;
-+    if (window->IsVisible()) {
-+      window->Focus(true);
-+      break;
-+    }
-+  }
-+}
-+
-+void Browser::AddRecentDocument(const base::FilePath& path) {
-+}
-+
-+void Browser::ClearRecentDocuments() {
-+}
-+
-+void Browser::SetAppUserModelID(const base::string16& name) {
-+}
-+
-+bool Browser::RemoveAsDefaultProtocolClient(const std::string& protocol) {
-+  return false;
-+}
-+
-+bool Browser::SetAsDefaultProtocolClient(const std::string& protocol) {
-+  return false;
-+}
-+
-+std::string Browser::GetExecutableFileVersion() const {
-+  return brightray::GetApplicationVersion();
-+}
-+
-+std::string Browser::GetExecutableFileProductName() const {
-+  return brightray::GetApplicationName();
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 bc707e6584eb4ba9872d04bdc2d6b99597772a49 electron/browser/browser_mac.mm
-@@ -0,0 +1,143 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/browser.h"
-+
-+#include "electron/browser/mac/electron_application.h"
-+#include "electron/browser/mac/electron_application_delegate.h"
-+#include "electron/browser/native_window.h"
-+#include "electron/browser/window_list.h"
-+#include "base/mac/bundle_locations.h"
-+#include "base/mac/foundation_util.h"
-+#include "base/strings/sys_string_conversions.h"
-+#include "brightray/common/application_info.h"
-+
-+namespace electron {
-+
-+void Browser::Focus() {
-+  [[ElectronApplication sharedApplication] activateIgnoringOtherApps:YES];
-+}
-+
-+void Browser::Hide() {
-+  [[ElectronApplication sharedApplication] hide:nil];
-+}
-+
-+void Browser::Show() {
-+  [[ElectronApplication sharedApplication] unhide:nil];
-+}
-+
-+bool Browser::IsDarkMode() {
-+  NSString *mode = [[NSUserDefaults standardUserDefaults] stringForKey:@"AppleInterfaceStyle"];
-+  return [mode isEqualToString: @"Dark"];
-+}
-+
-+void Browser::AddRecentDocument(const base::FilePath& path) {
-+  NSString* path_string = base::mac::FilePathToNSString(path);
-+  if (!path_string)
-+    return;
-+  NSURL* u = [NSURL fileURLWithPath:path_string];
-+  if (!u)
-+    return;
-+  [[NSDocumentController sharedDocumentController] noteNewRecentDocumentURL:u];
-+}
-+
-+void Browser::ClearRecentDocuments() {
-+  [[NSDocumentController sharedDocumentController] clearRecentDocuments:nil];
-+}
-+
-+bool Browser::RemoveAsDefaultProtocolClient(const std::string& protocol) {
-+  return false;
-+}
-+
-+bool Browser::SetAsDefaultProtocolClient(const std::string& protocol) {
-+  if (protocol.empty())
-+    return false;
-+
-+  NSString* identifier = [base::mac::MainBundle() bundleIdentifier];
-+  if (!identifier)
-+    return false;
-+
-+  NSString* protocol_ns = [NSString stringWithUTF8String:protocol.c_str()];
-+  OSStatus return_code =
-+      LSSetDefaultHandlerForURLScheme(base::mac::NSToCFCast(protocol_ns),
-+                                      base::mac::NSToCFCast(identifier));
-+  return return_code == noErr;
-+}
-+
-+void Browser::SetAppUserModelID(const base::string16& name) {
-+}
-+
-+std::string Browser::GetExecutableFileVersion() const {
-+  return brightray::GetApplicationVersion();
-+}
-+
-+std::string Browser::GetExecutableFileProductName() const {
-+  return brightray::GetApplicationName();
-+}
-+
-+int Browser::DockBounce(BounceType type) {
-+  return [[ElectronApplication sharedApplication]
-+      requestUserAttention:(NSRequestUserAttentionType)type];
-+}
-+
-+void Browser::DockCancelBounce(int request_id) {
-+  [[ElectronApplication sharedApplication] cancelUserAttentionRequest:request_id];
-+}
-+
-+void Browser::DockSetBadgeText(const std::string& label) {
-+  NSDockTile *tile = [[ElectronApplication sharedApplication] dockTile];
-+  [tile setBadgeLabel:base::SysUTF8ToNSString(label)];
-+}
-+
-+std::string Browser::DockGetBadgeText() {
-+  NSDockTile *tile = [[ElectronApplication sharedApplication] dockTile];
-+  return base::SysNSStringToUTF8([tile badgeLabel]);
-+}
-+
-+void Browser::DockHide() {
-+  WindowList* list = WindowList::GetInstance();
-+  for (WindowList::iterator it = list->begin(); it != list->end(); ++it)
-+    [(*it)->GetNativeWindow() setCanHide:NO];
-+
-+  ProcessSerialNumber psn = { 0, kCurrentProcess };
-+  TransformProcessType(&psn, kProcessTransformToUIElementApplication);
-+}
-+
-+void Browser::DockShow() {
-+  BOOL active = [[NSRunningApplication currentApplication] isActive];
-+  ProcessSerialNumber psn = { 0, kCurrentProcess };
-+  if (active) {
-+    // Workaround buggy behavior of TransformProcessType.
-+    // http://stackoverflow.com/questions/7596643/
-+    NSArray* runningApps = [NSRunningApplication
-+        runningApplicationsWithBundleIdentifier:@"com.apple.dock"];
-+    for (NSRunningApplication* app in runningApps) {
-+      [app activateWithOptions:NSApplicationActivateIgnoringOtherApps];
-+      break;
-+    }
-+    dispatch_time_t one_ms = dispatch_time(DISPATCH_TIME_NOW, USEC_PER_SEC);
-+    dispatch_after(one_ms, dispatch_get_main_queue(), ^{
-+      TransformProcessType(&psn, kProcessTransformToForegroundApplication);
-+      dispatch_time_t one_ms = dispatch_time(DISPATCH_TIME_NOW, USEC_PER_SEC);
-+      dispatch_after(one_ms, dispatch_get_main_queue(), ^{
-+        [[NSRunningApplication currentApplication]
-+            activateWithOptions:NSApplicationActivateIgnoringOtherApps];
-+      });
-+    });
-+  } else {
-+    TransformProcessType(&psn, kProcessTransformToForegroundApplication);
-+  }
-+}
-+
-+void Browser::DockSetMenu(ui::MenuModel* model) {
-+  ElectronApplicationDelegate* delegate = (ElectronApplicationDelegate*)[NSApp delegate];
-+  [delegate setApplicationDockMenu:model];
-+}
-+
-+void Browser::DockSetIcon(const gfx::Image& image) {
-+  [[ElectronApplication sharedApplication]
-+      setApplicationIconImage:image.AsNSImage()];
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 f3f1409ab58be372e97f7b94b253a50831790d45 electron/browser/browser_observer.h
-@@ -0,0 +1,56 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_BROWSER_OBSERVER_H_
-+#define ELECTRON_BROWSER_BROWSER_OBSERVER_H_
-+
-+#include <string>
-+
-+namespace electron {
-+
-+class LoginHandler;
-+
-+class BrowserObserver {
-+ public:
-+  // The browser is about to close all windows.
-+  virtual void OnBeforeQuit(bool* prevent_default) {}
-+
-+  // The browser has closed all windows and will quit.
-+  virtual void OnWillQuit(bool* prevent_default) {}
-+
-+  // The browser has closed all windows. If the browser is quiting, then this
-+  // method will not be called, instead it will call OnWillQuit.
-+  virtual void OnWindowAllClosed() {}
-+
-+  // The browser is quitting.
-+  virtual void OnQuit() {}
-+
-+  // The browser has opened a file by double clicking in Finder or dragging the
-+  // file to the Dock icon. (OS X only)
-+  virtual void OnOpenFile(bool* prevent_default,
-+                          const std::string& file_path) {}
-+
-+  // Browser is used to open a url.
-+  virtual void OnOpenURL(const std::string& url) {}
-+
-+  // The browser is activated with visible/invisible windows (usually by
-+  // clicking on the dock icon).
-+  virtual void OnActivate(bool has_visible_windows) {}
-+
-+  // The browser has finished loading.
-+  virtual void OnWillFinishLaunching() {}
-+  virtual void OnFinishLaunching() {}
-+
-+  // The browser requests HTTP login.
-+  virtual void OnLogin(LoginHandler* login_handler) {}
-+
-+  virtual void OnPlatformThemeChanged() {}
-+
-+ protected:
-+  virtual ~BrowserObserver() {}
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_BROWSER_OBSERVER_H_
-added in remote
-  their  100644 34f5df1b2f66bed0d09ac3aedbb7e186a9ff54a0 electron/browser/browser_win.cc
-@@ -0,0 +1,259 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/browser.h"
-+
-+#include <atlbase.h>
-+#include <propkey.h>
-+#include <windows.h>
-+#include <shlobj.h>
-+#include <shobjidl.h>
-+
-+#include "base/base_paths.h"
-+#include "base/file_version_info.h"
-+#include "base/files/file_path.h"
-+#include "base/memory/scoped_ptr.h"
-+#include "base/path_service.h"
-+#include "base/strings/string_util.h"
-+#include "base/strings/stringprintf.h"
-+#include "base/strings/utf_string_conversions.h"
-+#include "base/win/win_util.h"
-+#include "base/win/registry.h"
-+#include "base/win/windows_version.h"
-+#include "electron/common/electron_version.h"
-+
-+namespace electron {
-+
-+namespace {
-+
-+const wchar_t kAppUserModelIDFormat[] = L"electron.app.$1";
-+
-+BOOL CALLBACK WindowsEnumerationHandler(HWND hwnd, LPARAM param) {
-+  DWORD target_process_id = *reinterpret_cast<DWORD*>(param);
-+  DWORD process_id = 0;
-+
-+  GetWindowThreadProcessId(hwnd, &process_id);
-+  if (process_id == target_process_id) {
-+    SetFocus(hwnd);
-+    return FALSE;
-+  }
-+
-+  return TRUE;
-+}
-+
-+}  // namespace
-+
-+void Browser::Focus() {
-+  // On Windows we just focus on the first window found for this process.
-+  DWORD pid = GetCurrentProcessId();
-+  EnumWindows(&WindowsEnumerationHandler, reinterpret_cast<LPARAM>(&pid));
-+}
-+
-+void Browser::AddRecentDocument(const base::FilePath& path) {
-+  if (base::win::GetVersion() < base::win::VERSION_WIN7)
-+    return;
-+
-+  CComPtr<IShellItem> item;
-+  HRESULT hr = SHCreateItemFromParsingName(
-+      path.value().c_str(), NULL, IID_PPV_ARGS(&item));
-+  if (SUCCEEDED(hr)) {
-+    SHARDAPPIDINFO info;
-+    info.psi = item;
-+    info.pszAppID = GetAppUserModelID();
-+    SHAddToRecentDocs(SHARD_APPIDINFO, &info);
-+  }
-+}
-+
-+void Browser::ClearRecentDocuments() {
-+  CComPtr<IApplicationDestinations> destinations;
-+  if (FAILED(destinations.CoCreateInstance(CLSID_ApplicationDestinations,
-+                                           NULL, CLSCTX_INPROC_SERVER)))
-+    return;
-+  if (FAILED(destinations->SetAppID(GetAppUserModelID())))
-+    return;
-+  destinations->RemoveAllDestinations();
-+}
-+
-+void Browser::SetAppUserModelID(const base::string16& name) {
-+  app_user_model_id_ = name;
-+  SetCurrentProcessExplicitAppUserModelID(app_user_model_id_.c_str());
-+}
-+
-+void Browser::SetUserTasks(const std::vector<UserTask>& tasks) {
-+  CComPtr<ICustomDestinationList> destinations;
-+  if (FAILED(destinations.CoCreateInstance(CLSID_DestinationList)))
-+    return;
-+  if (FAILED(destinations->SetAppID(GetAppUserModelID())))
-+    return;
-+
-+  // Start a transaction that updates the JumpList of this application.
-+  UINT max_slots;
-+  CComPtr<IObjectArray> removed;
-+  if (FAILED(destinations->BeginList(&max_slots, IID_PPV_ARGS(&removed))))
-+    return;
-+
-+  CComPtr<IObjectCollection> collection;
-+  if (FAILED(collection.CoCreateInstance(CLSID_EnumerableObjectCollection)))
-+    return;
-+
-+  for (auto& task : tasks) {
-+    CComPtr<IShellLink> link;
-+    if (FAILED(link.CoCreateInstance(CLSID_ShellLink)) ||
-+        FAILED(link->SetPath(task.program.value().c_str())) ||
-+        FAILED(link->SetArguments(task.arguments.c_str())) ||
-+        FAILED(link->SetDescription(task.description.c_str())))
-+      return;
-+
-+    if (!task.icon_path.empty() &&
-+        FAILED(link->SetIconLocation(task.icon_path.value().c_str(),
-+                                     task.icon_index)))
-+      return;
-+
-+    CComQIPtr<IPropertyStore> property_store = link;
-+    if (!base::win::SetStringValueForPropertyStore(property_store, PKEY_Title,
-+                                                   task.title.c_str()))
-+      return;
-+
-+    if (FAILED(collection->AddObject(link)))
-+      return;
-+  }
-+
-+  // When the list is empty "AddUserTasks" could fail, so we don't check return
-+  // value for it.
-+  CComQIPtr<IObjectArray> task_array = collection;
-+  destinations->AddUserTasks(task_array);
-+  destinations->CommitList();
-+}
-+
-+bool Browser::RemoveAsDefaultProtocolClient(const std::string& protocol) {
-+  if (protocol.empty())
-+    return false;
-+
-+  base::FilePath path;
-+  if (!PathService::Get(base::FILE_EXE, &path)) {
-+    LOG(ERROR) << "Error getting app exe path";
-+    return false;
-+  }
-+
-+  // Main Registry Key
-+  HKEY root = HKEY_CURRENT_USER;
-+  std::string keyPathStr = "Software\\Classes\\" + protocol;
-+  std::wstring keyPath = std::wstring(keyPathStr.begin(), keyPathStr.end());
-+
-+  // Command Key
-+  std::string cmdPathStr = keyPathStr + "\\shell\\open\\command";
-+  std::wstring cmdPath = std::wstring(cmdPathStr.begin(), cmdPathStr.end());
-+
-+  base::win::RegKey key;
-+  base::win::RegKey commandKey;
-+  if (FAILED(key.Open(root, keyPath.c_str(), KEY_ALL_ACCESS)))
-+    // Key doesn't even exist, we can confirm that it is not set
-+    return true;
-+
-+  if (FAILED(commandKey.Open(root, cmdPath.c_str(), KEY_ALL_ACCESS)))
-+    // Key doesn't even exist, we can confirm that it is not set
-+    return true;
-+
-+  std::wstring keyVal;
-+  if (FAILED(commandKey.ReadValue(L"", &keyVal)))
-+    // Default value not set, we can confirm that it is not set
-+    return true;
-+
-+  std::wstring exePath(path.value());
-+  std::wstring exe = L"\"" + exePath + L"\" \"%1\"";
-+  if (keyVal == exe) {
-+    // Let's kill the key
-+    if (FAILED(key.DeleteKey(L"shell")))
-+      return false;
-+
-+    return true;
-+  } else {
-+    return true;
-+  }
-+}
-+
-+bool Browser::SetAsDefaultProtocolClient(const std::string& protocol) {
-+  // HKEY_CLASSES_ROOT
-+  //    $PROTOCOL
-+  //       (Default) = "URL:$NAME"
-+  //       URL Protocol = ""
-+  //       shell
-+  //          open
-+  //             command
-+  //                (Default) = "$COMMAND" "%1"
-+  //
-+  // However, the "HKEY_CLASSES_ROOT" key can only be written by the
-+  // Administrator user. So, we instead write to "HKEY_CURRENT_USER\
-+  // Software\Classes", which is inherited by "HKEY_CLASSES_ROOT"
-+  // anyway, and can be written by unprivileged users.
-+
-+  if (protocol.empty())
-+    return false;
-+
-+  base::FilePath path;
-+  if (!PathService::Get(base::FILE_EXE, &path)) {
-+    LOG(ERROR) << "Error getting app exe path";
-+    return false;
-+  }
-+
-+  // Main Registry Key
-+  HKEY root = HKEY_CURRENT_USER;
-+  std::string keyPathStr = "Software\\Classes\\" + protocol;
-+  std::wstring keyPath = std::wstring(keyPathStr.begin(), keyPathStr.end());
-+  std::string urlDeclStr = "URL:" + protocol;
-+  std::wstring urlDecl = std::wstring(urlDeclStr.begin(), urlDeclStr.end());
-+
-+  // Command Key
-+  std::string cmdPathStr = keyPathStr + "\\shell\\open\\command";
-+  std::wstring cmdPath = std::wstring(cmdPathStr.begin(), cmdPathStr.end());
-+
-+  // Executable Path
-+  std::wstring exePath(path.value());
-+  std::wstring exe = L"\"" + exePath + L"\" \"%1\"";
-+
-+  // Write information to registry
-+  base::win::RegKey key(root, keyPath.c_str(), KEY_ALL_ACCESS);
-+  if (FAILED(key.WriteValue(L"URL Protocol", L"")) ||
-+      FAILED(key.WriteValue(L"", urlDecl.c_str())))
-+    return false;
-+
-+  base::win::RegKey commandKey(root, cmdPath.c_str(), KEY_ALL_ACCESS);
-+  if (FAILED(commandKey.WriteValue(L"", exe.c_str())))
-+    return false;
-+
-+  return true;
-+}
-+
-+PCWSTR Browser::GetAppUserModelID() {
-+  if (app_user_model_id_.empty()) {
-+    SetAppUserModelID(base::ReplaceStringPlaceholders(
-+        kAppUserModelIDFormat, base::UTF8ToUTF16(GetName()), nullptr));
-+  }
-+
-+  return app_user_model_id_.c_str();
-+}
-+
-+std::string Browser::GetExecutableFileVersion() const {
-+  base::FilePath path;
-+  if (PathService::Get(base::FILE_EXE, &path)) {
-+    scoped_ptr<FileVersionInfo> version_info(
-+        FileVersionInfo::CreateFileVersionInfo(path));
-+    return base::UTF16ToUTF8(version_info->product_version());
-+  }
-+
-+  return ELECTRON_VERSION_STRING;
-+}
-+
-+std::string Browser::GetExecutableFileProductName() const {
-+  base::FilePath path;
-+  if (PathService::Get(base::FILE_EXE, &path)) {
-+    scoped_ptr<FileVersionInfo> version_info(
-+        FileVersionInfo::CreateFileVersionInfo(path));
-+    return base::UTF16ToUTF8(version_info->product_name());
-+  }
-+
-+  return ELECTRON_PRODUCT_NAME;
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 b04e9d46211bfb28e6e0f3628ffb3605140f1a66 electron/browser/common_web_contents_delegate.cc
-@@ -0,0 +1,443 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/common_web_contents_delegate.h"
-+
-+#include <set>
-+#include <string>
-+#include <vector>
-+
-+#include "electron/browser/electron_browser_context.h"
-+#include "electron/browser/electron_javascript_dialog_manager.h"
-+#include "electron/browser/native_window.h"
-+#include "electron/browser/ui/file_dialog.h"
-+#include "electron/browser/web_dialog_helper.h"
-+#include "base/files/file_util.h"
-+#include "base/prefs/pref_service.h"
-+#include "base/prefs/scoped_user_pref_update.h"
-+#include "chrome/browser/printing/print_preview_message_handler.h"
-+#include "chrome/browser/printing/print_view_manager_basic.h"
-+#include "chrome/browser/ui/browser_dialogs.h"
-+#include "chrome/common/pref_names.h"
-+#include "content/public/browser/browser_thread.h"
-+#include "content/public/browser/child_process_security_policy.h"
-+#include "content/public/browser/render_process_host.h"
-+#include "content/public/browser/render_view_host.h"
-+#include "content/public/browser/render_widget_host.h"
-+#include "storage/browser/fileapi/isolated_context.h"
-+
-+#if defined(TOOLKIT_VIEWS)
-+#include "electron/browser/native_window_views.h"
-+#endif
-+
-+#if defined(USE_X11)
-+#include "electron/browser/browser.h"
-+#endif
-+
-+using content::BrowserThread;
-+
-+namespace electron {
-+
-+namespace {
-+
-+const char kRootName[] = "<root>";
-+
-+struct FileSystem {
-+  FileSystem() {
-+  }
-+  FileSystem(const std::string& file_system_name,
-+             const std::string& root_url,
-+             const std::string& file_system_path)
-+    : file_system_name(file_system_name),
-+      root_url(root_url),
-+      file_system_path(file_system_path) {
-+  }
-+
-+  std::string file_system_name;
-+  std::string root_url;
-+  std::string file_system_path;
-+};
-+
-+std::string RegisterFileSystem(content::WebContents* web_contents,
-+                               const base::FilePath& path) {
-+  auto isolated_context = storage::IsolatedContext::GetInstance();
-+  std::string root_name(kRootName);
-+  std::string file_system_id = isolated_context->RegisterFileSystemForPath(
-+      storage::kFileSystemTypeNativeLocal,
-+      std::string(),
-+      path,
-+      &root_name);
-+
-+  content::ChildProcessSecurityPolicy* policy =
-+      content::ChildProcessSecurityPolicy::GetInstance();
-+  content::RenderViewHost* render_view_host = web_contents->GetRenderViewHost();
-+  int renderer_id = render_view_host->GetProcess()->GetID();
-+  policy->GrantReadFileSystem(renderer_id, file_system_id);
-+  policy->GrantWriteFileSystem(renderer_id, file_system_id);
-+  policy->GrantCreateFileForFileSystem(renderer_id, file_system_id);
-+  policy->GrantDeleteFromFileSystem(renderer_id, file_system_id);
-+
-+  if (!policy->CanReadFile(renderer_id, path))
-+    policy->GrantReadFile(renderer_id, path);
-+
-+  return file_system_id;
-+}
-+
-+FileSystem CreateFileSystemStruct(
-+    content::WebContents* web_contents,
-+    const std::string& file_system_id,
-+    const std::string& file_system_path) {
-+  const GURL origin = web_contents->GetURL().GetOrigin();
-+  std::string file_system_name =
-+      storage::GetIsolatedFileSystemName(origin, file_system_id);
-+  std::string root_url = storage::GetIsolatedFileSystemRootURIString(
-+      origin, file_system_id, kRootName);
-+  return FileSystem(file_system_name, root_url, file_system_path);
-+}
-+
-+base::DictionaryValue* CreateFileSystemValue(const FileSystem& file_system) {
-+  base::DictionaryValue* file_system_value = new base::DictionaryValue();
-+  file_system_value->SetString("fileSystemName", file_system.file_system_name);
-+  file_system_value->SetString("rootURL", file_system.root_url);
-+  file_system_value->SetString("fileSystemPath", file_system.file_system_path);
-+  return file_system_value;
-+}
-+
-+void WriteToFile(const base::FilePath& path,
-+                 const std::string& content) {
-+  DCHECK_CURRENTLY_ON(BrowserThread::FILE);
-+  DCHECK(!path.empty());
-+
-+  base::WriteFile(path, content.data(), content.size());
-+}
-+
-+void AppendToFile(const base::FilePath& path,
-+                  const std::string& content) {
-+  DCHECK_CURRENTLY_ON(BrowserThread::FILE);
-+  DCHECK(!path.empty());
-+
-+  base::AppendToFile(path, content.data(), content.size());
-+}
-+
-+PrefService* GetPrefService(content::WebContents* web_contents) {
-+  auto context = web_contents->GetBrowserContext();
-+  return static_cast<electron::ElectronBrowserContext*>(context)->prefs();
-+}
-+
-+std::set<std::string> GetAddedFileSystemPaths(
-+    content::WebContents* web_contents) {
-+  auto pref_service = GetPrefService(web_contents);
-+  const base::DictionaryValue* file_system_paths_value =
-+      pref_service->GetDictionary(prefs::kDevToolsFileSystemPaths);
-+  std::set<std::string> result;
-+  if (file_system_paths_value) {
-+    base::DictionaryValue::Iterator it(*file_system_paths_value);
-+    for (; !it.IsAtEnd(); it.Advance()) {
-+      result.insert(it.key());
-+    }
-+  }
-+  return result;
-+}
-+
-+}  // namespace
-+
-+CommonWebContentsDelegate::CommonWebContentsDelegate()
-+    : html_fullscreen_(false),
-+      native_fullscreen_(false) {
-+}
-+
-+CommonWebContentsDelegate::~CommonWebContentsDelegate() {
-+}
-+
-+void CommonWebContentsDelegate::InitWithWebContents(
-+    content::WebContents* web_contents) {
-+  web_contents->SetDelegate(this);
-+
-+  printing::PrintViewManagerBasic::CreateForWebContents(web_contents);
-+  printing::PrintPreviewMessageHandler::CreateForWebContents(web_contents);
-+
-+  // Create InspectableWebContents.
-+  web_contents_.reset(brightray::InspectableWebContents::Create(web_contents));
-+  web_contents_->SetDelegate(this);
-+}
-+
-+void CommonWebContentsDelegate::SetOwnerWindow(NativeWindow* owner_window) {
-+  SetOwnerWindow(GetWebContents(), owner_window);
-+}
-+
-+void CommonWebContentsDelegate::SetOwnerWindow(
-+    content::WebContents* web_contents, NativeWindow* owner_window) {
-+  owner_window_ = owner_window->GetWeakPtr();
-+  NativeWindowRelay* relay = new NativeWindowRelay(owner_window_);
-+  web_contents->SetUserData(relay->key, relay);
-+}
-+
-+void CommonWebContentsDelegate::DestroyWebContents() {
-+  web_contents_.reset();
-+}
-+
-+content::WebContents* CommonWebContentsDelegate::GetWebContents() const {
-+  if (!web_contents_)
-+    return nullptr;
-+  return web_contents_->GetWebContents();
-+}
-+
-+content::WebContents*
-+CommonWebContentsDelegate::GetDevToolsWebContents() const {
-+  if (!web_contents_)
-+    return nullptr;
-+  return web_contents_->GetDevToolsWebContents();
-+}
-+
-+content::WebContents* CommonWebContentsDelegate::OpenURLFromTab(
-+    content::WebContents* source,
-+    const content::OpenURLParams& params) {
-+  content::NavigationController::LoadURLParams load_url_params(params.url);
-+  load_url_params.referrer = params.referrer;
-+  load_url_params.transition_type = params.transition;
-+  load_url_params.extra_headers = params.extra_headers;
-+  load_url_params.should_replace_current_entry =
-+      params.should_replace_current_entry;
-+  load_url_params.is_renderer_initiated = params.is_renderer_initiated;
-+  load_url_params.should_clear_history_list = true;
-+
-+  source->GetController().LoadURLWithParams(load_url_params);
-+  return source;
-+}
-+
-+bool CommonWebContentsDelegate::CanOverscrollContent() const {
-+  return false;
-+}
-+
-+content::JavaScriptDialogManager*
-+CommonWebContentsDelegate::GetJavaScriptDialogManager(
-+    content::WebContents* source) {
-+  if (!dialog_manager_)
-+    dialog_manager_.reset(new ElectronJavaScriptDialogManager);
-+
-+  return dialog_manager_.get();
-+}
-+
-+content::ColorChooser* CommonWebContentsDelegate::OpenColorChooser(
-+    content::WebContents* web_contents,
-+    SkColor color,
-+    const std::vector<content::ColorSuggestion>& suggestions) {
-+  return chrome::ShowColorChooser(web_contents, color);
-+}
-+
-+void CommonWebContentsDelegate::RunFileChooser(
-+    content::WebContents* guest,
-+    const content::FileChooserParams& params) {
-+  if (!web_dialog_helper_)
-+    web_dialog_helper_.reset(new WebDialogHelper(owner_window()));
-+  web_dialog_helper_->RunFileChooser(guest, params);
-+}
-+
-+void CommonWebContentsDelegate::EnumerateDirectory(content::WebContents* guest,
-+                                                   int request_id,
-+                                                   const base::FilePath& path) {
-+  if (!web_dialog_helper_)
-+    web_dialog_helper_.reset(new WebDialogHelper(owner_window()));
-+  web_dialog_helper_->EnumerateDirectory(guest, request_id, path);
-+}
-+
-+void CommonWebContentsDelegate::EnterFullscreenModeForTab(
-+    content::WebContents* source, const GURL& origin) {
-+  if (!owner_window_)
-+    return;
-+  SetHtmlApiFullscreen(true);
-+  owner_window_->NotifyWindowEnterHtmlFullScreen();
-+  source->GetRenderViewHost()->GetWidget()->WasResized();
-+}
-+
-+void CommonWebContentsDelegate::ExitFullscreenModeForTab(
-+    content::WebContents* source) {
-+  if (!owner_window_)
-+    return;
-+  SetHtmlApiFullscreen(false);
-+  owner_window_->NotifyWindowLeaveHtmlFullScreen();
-+  source->GetRenderViewHost()->GetWidget()->WasResized();
-+}
-+
-+bool CommonWebContentsDelegate::IsFullscreenForTabOrPending(
-+    const content::WebContents* source) const {
-+  return html_fullscreen_;
-+}
-+
-+void CommonWebContentsDelegate::DevToolsSaveToFile(
-+    const std::string& url, const std::string& content, bool save_as) {
-+  base::FilePath path;
-+  PathsMap::iterator it = saved_files_.find(url);
-+  if (it != saved_files_.end() && !save_as) {
-+    path = it->second;
-+  } else {
-+    file_dialog::Filters filters;
-+    base::FilePath default_path(base::FilePath::FromUTF8Unsafe(url));
-+    if (!file_dialog::ShowSaveDialog(owner_window(), url, default_path,
-+                                     filters, &path)) {
-+      base::StringValue url_value(url);
-+      web_contents_->CallClientFunction(
-+          "DevToolsAPI.canceledSaveURL", &url_value, nullptr, nullptr);
-+      return;
-+    }
-+  }
-+
-+  saved_files_[url] = path;
-+  BrowserThread::PostTaskAndReply(
-+      BrowserThread::FILE, FROM_HERE,
-+      base::Bind(&WriteToFile, path, content),
-+      base::Bind(&CommonWebContentsDelegate::OnDevToolsSaveToFile,
-+                 base::Unretained(this), url));
-+}
-+
-+void CommonWebContentsDelegate::DevToolsAppendToFile(
-+    const std::string& url, const std::string& content) {
-+  PathsMap::iterator it = saved_files_.find(url);
-+  if (it == saved_files_.end())
-+    return;
-+
-+  BrowserThread::PostTaskAndReply(
-+      BrowserThread::FILE, FROM_HERE,
-+      base::Bind(&AppendToFile, it->second, content),
-+      base::Bind(&CommonWebContentsDelegate::OnDevToolsAppendToFile,
-+                 base::Unretained(this), url));
-+}
-+
-+void CommonWebContentsDelegate::DevToolsRequestFileSystems() {
-+  auto file_system_paths = GetAddedFileSystemPaths(GetDevToolsWebContents());
-+  if (file_system_paths.empty()) {
-+    base::ListValue empty_file_system_value;
-+    web_contents_->CallClientFunction("DevToolsAPI.fileSystemsLoaded",
-+                                      &empty_file_system_value,
-+                                      nullptr, nullptr);
-+    return;
-+  }
-+
-+  std::vector<FileSystem> file_systems;
-+  for (auto file_system_path : file_system_paths) {
-+    base::FilePath path = base::FilePath::FromUTF8Unsafe(file_system_path);
-+    std::string file_system_id = RegisterFileSystem(GetDevToolsWebContents(),
-+                                                    path);
-+    FileSystem file_system = CreateFileSystemStruct(GetDevToolsWebContents(),
-+                                                    file_system_id,
-+                                                    file_system_path);
-+    file_systems.push_back(file_system);
-+  }
-+
-+  base::ListValue file_system_value;
-+  for (size_t i = 0; i < file_systems.size(); ++i)
-+    file_system_value.Append(CreateFileSystemValue(file_systems[i]));
-+  web_contents_->CallClientFunction("DevToolsAPI.fileSystemsLoaded",
-+                                    &file_system_value, nullptr, nullptr);
-+}
-+
-+void CommonWebContentsDelegate::DevToolsAddFileSystem(
-+    const base::FilePath& file_system_path) {
-+  base::FilePath path = file_system_path;
-+  if (path.empty()) {
-+    file_dialog::Filters filters;
-+    base::FilePath default_path;
-+    std::vector<base::FilePath> paths;
-+    int flag = file_dialog::FILE_DIALOG_OPEN_DIRECTORY;
-+    if (!file_dialog::ShowOpenDialog(owner_window(), "", default_path,
-+                                     filters, flag, &paths))
-+      return;
-+
-+    path = paths[0];
-+  }
-+
-+  std::string file_system_id = RegisterFileSystem(GetDevToolsWebContents(),
-+                                                  path);
-+  auto file_system_paths = GetAddedFileSystemPaths(GetDevToolsWebContents());
-+  if (file_system_paths.find(path.AsUTF8Unsafe()) != file_system_paths.end())
-+    return;
-+
-+  FileSystem file_system = CreateFileSystemStruct(GetDevToolsWebContents(),
-+                                                 file_system_id,
-+                                                 path.AsUTF8Unsafe());
-+  scoped_ptr<base::DictionaryValue> file_system_value(
-+      CreateFileSystemValue(file_system));
-+
-+  auto pref_service = GetPrefService(GetDevToolsWebContents());
-+  DictionaryPrefUpdate update(pref_service, prefs::kDevToolsFileSystemPaths);
-+  update.Get()->SetWithoutPathExpansion(
-+      path.AsUTF8Unsafe(), base::Value::CreateNullValue());
-+
-+  web_contents_->CallClientFunction("DevToolsAPI.fileSystemAdded",
-+                                    file_system_value.get(),
-+                                    nullptr, nullptr);
-+}
-+
-+void CommonWebContentsDelegate::DevToolsRemoveFileSystem(
-+    const base::FilePath& file_system_path) {
-+  if (!web_contents_)
-+    return;
-+
-+  std::string path = file_system_path.AsUTF8Unsafe();
-+  storage::IsolatedContext::GetInstance()->
-+      RevokeFileSystemByPath(file_system_path);
-+
-+  auto pref_service = GetPrefService(GetDevToolsWebContents());
-+  DictionaryPrefUpdate update(pref_service, prefs::kDevToolsFileSystemPaths);
-+  update.Get()->RemoveWithoutPathExpansion(path, nullptr);
-+
-+  base::StringValue file_system_path_value(path);
-+  web_contents_->CallClientFunction("DevToolsAPI.fileSystemRemoved",
-+                                    &file_system_path_value,
-+                                    nullptr, nullptr);
-+}
-+
-+void CommonWebContentsDelegate::OnDevToolsSaveToFile(
-+    const std::string& url) {
-+  // Notify DevTools.
-+  base::StringValue url_value(url);
-+  web_contents_->CallClientFunction(
-+      "DevToolsAPI.savedURL", &url_value, nullptr, nullptr);
-+}
-+
-+void CommonWebContentsDelegate::OnDevToolsAppendToFile(
-+    const std::string& url) {
-+  // Notify DevTools.
-+  base::StringValue url_value(url);
-+  web_contents_->CallClientFunction(
-+      "DevToolsAPI.appendedToURL", &url_value, nullptr, nullptr);
-+}
-+
-+#if defined(TOOLKIT_VIEWS)
-+gfx::ImageSkia CommonWebContentsDelegate::GetDevToolsWindowIcon() {
-+  if (!owner_window())
-+    return gfx::ImageSkia();
-+  return static_cast<views::WidgetDelegate*>(static_cast<NativeWindowViews*>(
-+      owner_window()))->GetWindowAppIcon();
-+}
-+#endif
-+
-+#if defined(USE_X11)
-+void CommonWebContentsDelegate::GetDevToolsWindowWMClass(
-+    std::string* name, std::string* class_name) {
-+  *class_name = Browser::Get()->GetName();
-+  *name = base::ToLowerASCII(*class_name);
-+}
-+#endif
-+
-+void CommonWebContentsDelegate::SetHtmlApiFullscreen(bool enter_fullscreen) {
-+  // Window is already in fullscreen mode, save the state.
-+  if (enter_fullscreen && owner_window_->IsFullscreen()) {
-+    native_fullscreen_ = true;
-+    html_fullscreen_ = true;
-+    return;
-+  }
-+
-+  // Exit html fullscreen state but not window's fullscreen mode.
-+  if (!enter_fullscreen && native_fullscreen_) {
-+    html_fullscreen_ = false;
-+    return;
-+  }
-+
-+  owner_window_->SetFullScreen(enter_fullscreen);
-+  html_fullscreen_ = enter_fullscreen;
-+  native_fullscreen_ = false;
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 9a35fe85ae53a4ffe98b7fb7f9c75dac12980963 electron/browser/common_web_contents_delegate.h
-@@ -0,0 +1,137 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_COMMON_WEB_CONTENTS_DELEGATE_H_
-+#define ELECTRON_BROWSER_COMMON_WEB_CONTENTS_DELEGATE_H_
-+
-+#include <map>
-+#include <string>
-+#include <vector>
-+
-+#include "brightray/browser/inspectable_web_contents_impl.h"
-+#include "brightray/browser/inspectable_web_contents_delegate.h"
-+#include "brightray/browser/inspectable_web_contents_view_delegate.h"
-+#include "content/public/browser/web_contents_delegate.h"
-+
-+namespace electron {
-+
-+class ElectronJavaScriptDialogManager;
-+class NativeWindow;
-+class WebDialogHelper;
-+
-+class CommonWebContentsDelegate
-+    : public content::WebContentsDelegate,
-+      public brightray::InspectableWebContentsDelegate,
-+      public brightray::InspectableWebContentsViewDelegate {
-+ public:
-+  CommonWebContentsDelegate();
-+  virtual ~CommonWebContentsDelegate();
-+
-+  // Creates a InspectableWebContents object and takes onwership of
-+  // |web_contents|.
-+  void InitWithWebContents(content::WebContents* web_contents);
-+
-+  // Set the window as owner window.
-+  void SetOwnerWindow(NativeWindow* owner_window);
-+  void SetOwnerWindow(content::WebContents* web_contents,
-+                      NativeWindow* owner_window);
-+
-+  // Destroy the managed InspectableWebContents object.
-+  void DestroyWebContents();
-+
-+  // Returns the WebContents managed by this delegate.
-+  content::WebContents* GetWebContents() const;
-+
-+  // Returns the WebContents of devtools.
-+  content::WebContents* GetDevToolsWebContents() const;
-+
-+  brightray::InspectableWebContents* managed_web_contents() const {
-+    return web_contents_.get();
-+  }
-+
-+  NativeWindow* owner_window() const { return owner_window_.get(); }
-+
-+  bool is_html_fullscreen() const { return html_fullscreen_; }
-+
-+ protected:
-+  // content::WebContentsDelegate:
-+  content::WebContents* OpenURLFromTab(
-+      content::WebContents* source,
-+      const content::OpenURLParams& params) override;
-+  bool CanOverscrollContent() const override;
-+  content::JavaScriptDialogManager* GetJavaScriptDialogManager(
-+      content::WebContents* source) override;
-+  content::ColorChooser* OpenColorChooser(
-+      content::WebContents* web_contents,
-+      SkColor color,
-+      const std::vector<content::ColorSuggestion>& suggestions) override;
-+  void RunFileChooser(content::WebContents* web_contents,
-+                      const content::FileChooserParams& params) override;
-+  void EnumerateDirectory(content::WebContents* web_contents,
-+                          int request_id,
-+                          const base::FilePath& path) override;
-+  void EnterFullscreenModeForTab(content::WebContents* source,
-+                                 const GURL& origin) override;
-+  void ExitFullscreenModeForTab(content::WebContents* source) override;
-+  bool IsFullscreenForTabOrPending(
-+      const content::WebContents* source) const override;
-+
-+  // brightray::InspectableWebContentsDelegate:
-+  void DevToolsSaveToFile(const std::string& url,
-+                          const std::string& content,
-+                          bool save_as) override;
-+  void DevToolsAppendToFile(const std::string& url,
-+                            const std::string& content) override;
-+  void DevToolsRequestFileSystems() override;
-+  void DevToolsAddFileSystem(const base::FilePath& path) override;
-+  void DevToolsRemoveFileSystem(
-+      const base::FilePath& file_system_path) override;
-+
-+  // brightray::InspectableWebContentsViewDelegate:
-+#if defined(TOOLKIT_VIEWS)
-+  gfx::ImageSkia GetDevToolsWindowIcon() override;
-+#endif
-+#if defined(USE_X11)
-+  void GetDevToolsWindowWMClass(
-+      std::string* name, std::string* class_name) override;
-+#endif
-+
-+ private:
-+  // Callback for when DevToolsSaveToFile has completed.
-+  void OnDevToolsSaveToFile(const std::string& url);
-+
-+  // Callback for when DevToolsAppendToFile has completed.
-+  void OnDevToolsAppendToFile(const std::string& url);
-+
-+  // Set fullscreen mode triggered by html api.
-+  void SetHtmlApiFullscreen(bool enter_fullscreen);
-+
-+  // The window that this WebContents belongs to.
-+  base::WeakPtr<NativeWindow> owner_window_;
-+
-+  // Whether window is fullscreened by HTML5 api.
-+  bool html_fullscreen_;
-+
-+  // Whether window is fullscreened by window api.
-+  bool native_fullscreen_;
-+
-+  scoped_ptr<WebDialogHelper> web_dialog_helper_;
-+  scoped_ptr<ElectronJavaScriptDialogManager> dialog_manager_;
-+
-+  // The stored InspectableWebContents object.
-+  // Notice that web_contents_ must be placed after dialog_manager_, so we can
-+  // make sure web_contents_ is destroyed before dialog_manager_, otherwise a
-+  // crash would happen.
-+  scoped_ptr<brightray::InspectableWebContents> web_contents_;
-+
-+  // Maps url to file path, used by the file requests sent from devtools.
-+  typedef std::map<std::string, base::FilePath> PathsMap;
-+  PathsMap saved_files_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(CommonWebContentsDelegate);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_COMMON_WEB_CONTENTS_DELEGATE_H_
-added in remote
-  their  100644 da7cef5479361a662c388a5e81526c3a343aa702 electron/browser/electron_access_token_store.cc
-@@ -0,0 +1,53 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/electron_access_token_store.h"
-+
-+#include <utility>
-+
-+#include "electron/browser/electron_browser_context.h"
-+#include "electron/browser/electron_browser_main_parts.h"
-+#include "electron/common/google_api_key.h"
-+#include "content/public/browser/geolocation_provider.h"
-+
-+namespace electron {
-+
-+namespace {
-+
-+// Notice that we just combined the api key with the url together here, because
-+// if we use the standard {url: key} format Chromium would override our key with
-+// the predefined one in common.gypi of libchromiumcontent, which is empty.
-+const char* kGeolocationProviderURL =
-+    "https://www.googleapis.com/geolocation/v1/geolocate?key="
-+    GOOGLEAPIS_API_KEY;
-+
-+}  // namespace
-+
-+ElectronAccessTokenStore::ElectronAccessTokenStore() {
-+  content::GeolocationProvider::GetInstance()->UserDidOptIntoLocationServices();
-+}
-+
-+ElectronAccessTokenStore::~ElectronAccessTokenStore() {
-+}
-+
-+void ElectronAccessTokenStore::LoadAccessTokens(
-+    const LoadAccessTokensCallbackType& callback) {
-+  AccessTokenSet access_token_set;
-+
-+  // Equivelent to access_token_set[kGeolocationProviderURL].
-+  // Somehow base::string16 is causing compilation errors when used in a pair
-+  // of std::map on Linux, this can work around it.
-+  std::pair<GURL, base::string16> token_pair;
-+  token_pair.first = GURL(kGeolocationProviderURL);
-+  access_token_set.insert(token_pair);
-+
-+  auto browser_context = ElectronBrowserMainParts::Get()->browser_context();
-+  callback.Run(access_token_set, browser_context->url_request_context_getter());
-+}
-+
-+void ElectronAccessTokenStore::SaveAccessToken(const GURL& server_url,
-+                                           const base::string16& access_token) {
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 cfc689532517feb9cc0283c3bea033dac5c02752 electron/browser/electron_access_token_store.h
-@@ -0,0 +1,31 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_ELECTRON_ACCESS_TOKEN_STORE_H_
-+#define ELECTRON_BROWSER_ELECTRON_ACCESS_TOKEN_STORE_H_
-+
-+#include "content/public/browser/access_token_store.h"
-+
-+namespace electron {
-+
-+class ElectronBrowserContext;
-+
-+class ElectronAccessTokenStore : public content::AccessTokenStore {
-+ public:
-+  ElectronAccessTokenStore();
-+  virtual ~ElectronAccessTokenStore();
-+
-+  // content::AccessTokenStore:
-+  void LoadAccessTokens(
-+      const LoadAccessTokensCallbackType& callback) override;
-+  void SaveAccessToken(const GURL& server_url,
-+                       const base::string16& access_token) override;
-+
-+ private:
-+  DISALLOW_COPY_AND_ASSIGN(ElectronAccessTokenStore);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_ELECTRON_ACCESS_TOKEN_STORE_H_
-added in remote
-  their  100644 41d51d8c8347f0a1e577bd9ba6fe7eb90b905555 electron/browser/electron_browser_client.cc
-@@ -0,0 +1,302 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/electron_browser_client.h"
-+
-+#if defined(OS_WIN)
-+#include <shlobj.h>
-+#endif
-+
-+#include "electron/browser/electron_access_token_store.h"
-+#include "electron/browser/electron_browser_context.h"
-+#include "electron/browser/electron_browser_main_parts.h"
-+#include "electron/browser/electron_quota_permission_context.h"
-+#include "electron/browser/electron_resource_dispatcher_host_delegate.h"
-+#include "electron/browser/electron_speech_recognition_manager_delegate.h"
-+#include "electron/browser/native_window.h"
-+#include "electron/browser/web_contents_permission_helper.h"
-+#include "electron/browser/web_contents_preferences.h"
-+#include "electron/browser/window_list.h"
-+#include "electron/common/options_switches.h"
-+#include "base/command_line.h"
-+#include "base/files/file_util.h"
-+#include "base/stl_util.h"
-+#include "base/strings/string_util.h"
-+#include "base/strings/string_number_conversions.h"
-+#include "chrome/browser/printing/printing_message_filter.h"
-+#include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h"
-+#include "chrome/browser/renderer_host/pepper/widevine_cdm_message_filter.h"
-+#include "chrome/browser/speech/tts_message_filter.h"
-+#include "content/public/browser/browser_ppapi_host.h"
-+#include "content/public/browser/client_certificate_delegate.h"
-+#include "content/public/browser/render_process_host.h"
-+#include "content/public/browser/render_view_host.h"
-+#include "content/public/browser/resource_dispatcher_host.h"
-+#include "content/public/browser/site_instance.h"
-+#include "content/public/browser/web_contents.h"
-+#include "content/public/common/web_preferences.h"
-+#include "net/cert/x509_certificate.h"
-+#include "net/ssl/ssl_cert_request_info.h"
-+#include "ppapi/host/ppapi_host.h"
-+#include "ui/base/l10n/l10n_util.h"
-+#include "v8/include/v8.h"
-+
-+namespace electron {
-+
-+namespace {
-+
-+// Next navigation should not restart renderer process.
-+bool g_suppress_renderer_process_restart = false;
-+
-+// Custom schemes to be registered to standard.
-+std::string g_custom_schemes = "";
-+// Custom schemes to be registered to handle service worker.
-+std::string g_custom_service_worker_schemes = "";
-+
-+scoped_refptr<net::X509Certificate> ImportCertFromFile(
-+    const base::FilePath& path) {
-+  if (path.empty())
-+    return nullptr;
-+
-+  std::string cert_data;
-+  if (!base::ReadFileToString(path, &cert_data))
-+    return nullptr;
-+
-+  net::CertificateList certs =
-+      net::X509Certificate::CreateCertificateListFromBytes(
-+          cert_data.data(), cert_data.size(),
-+          net::X509Certificate::FORMAT_AUTO);
-+
-+  if (certs.empty())
-+    return nullptr;
-+
-+  return certs[0];
-+}
-+
-+}  // namespace
-+
-+// static
-+void ElectronBrowserClient::SuppressRendererProcessRestartForOnce() {
-+  g_suppress_renderer_process_restart = true;
-+}
-+
-+void ElectronBrowserClient::SetCustomSchemes(
-+    const std::vector<std::string>& schemes) {
-+  g_custom_schemes = base::JoinString(schemes, ",");
-+}
-+
-+void ElectronBrowserClient::SetCustomServiceWorkerSchemes(
-+    const std::vector<std::string>& schemes) {
-+  g_custom_service_worker_schemes = base::JoinString(schemes, ",");
-+}
-+
-+ElectronBrowserClient::ElectronBrowserClient() : delegate_(nullptr) {
-+}
-+
-+ElectronBrowserClient::~ElectronBrowserClient() {
-+}
-+
-+void ElectronBrowserClient::RenderProcessWillLaunch(
-+    content::RenderProcessHost* host) {
-+  int process_id = host->GetID();
-+  host->AddFilter(new printing::PrintingMessageFilter(process_id));
-+  host->AddFilter(new TtsMessageFilter(process_id, host->GetBrowserContext()));
-+  host->AddFilter(
-+      new WidevineCdmMessageFilter(process_id, host->GetBrowserContext()));
-+}
-+
-+content::SpeechRecognitionManagerDelegate*
-+    ElectronBrowserClient::CreateSpeechRecognitionManagerDelegate() {
-+  return new ElectronSpeechRecognitionManagerDelegate;
-+}
-+
-+content::AccessTokenStore* ElectronBrowserClient::CreateAccessTokenStore() {
-+  return new ElectronAccessTokenStore;
-+}
-+
-+void ElectronBrowserClient::OverrideWebkitPrefs(
-+    content::RenderViewHost* host, content::WebPreferences* prefs) {
-+  prefs->javascript_enabled = true;
-+  prefs->web_security_enabled = true;
-+  prefs->javascript_can_open_windows_automatically = true;
-+  prefs->plugins_enabled = true;
-+  prefs->dom_paste_enabled = true;
-+  prefs->allow_scripts_to_close_windows = true;
-+  prefs->javascript_can_access_clipboard = true;
-+  prefs->local_storage_enabled = true;
-+  prefs->databases_enabled = true;
-+  prefs->application_cache_enabled = true;
-+  prefs->allow_universal_access_from_file_urls = true;
-+  prefs->allow_file_access_from_file_urls = true;
-+  prefs->experimental_webgl_enabled = true;
-+  prefs->allow_displaying_insecure_content = false;
-+  prefs->allow_running_insecure_content = false;
-+
-+  // Custom preferences of guest page.
-+  auto web_contents = content::WebContents::FromRenderViewHost(host);
-+  WebContentsPreferences::OverrideWebkitPrefs(web_contents, prefs);
-+}
-+
-+std::string ElectronBrowserClient::GetApplicationLocale() {
-+  return l10n_util::GetApplicationLocale("");
-+}
-+
-+void ElectronBrowserClient::OverrideSiteInstanceForNavigation(
-+    content::BrowserContext* browser_context,
-+    content::SiteInstance* current_instance,
-+    const GURL& url,
-+    content::SiteInstance** new_instance) {
-+  if (g_suppress_renderer_process_restart) {
-+    g_suppress_renderer_process_restart = false;
-+    return;
-+  }
-+
-+  // Restart renderer process for all navigations except "javacript:" scheme.
-+  if (url.SchemeIs(url::kJavaScriptScheme))
-+    return;
-+
-+  *new_instance = content::SiteInstance::CreateForURL(browser_context, url);
-+
-+  // Remember the original renderer process of the pending renderer process.
-+  auto current_process = current_instance->GetProcess();
-+  auto pending_process = (*new_instance)->GetProcess();
-+  pending_processes_[pending_process->GetID()] = current_process->GetID();
-+  // Clear the entry in map when process ends.
-+  current_process->AddObserver(this);
-+}
-+
-+void ElectronBrowserClient::AppendExtraCommandLineSwitches(
-+    base::CommandLine* command_line,
-+    int process_id) {
-+  std::string process_type = command_line->GetSwitchValueASCII("type");
-+  if (process_type != "renderer")
-+    return;
-+
-+  // The registered standard schemes.
-+  if (!g_custom_schemes.empty())
-+    command_line->AppendSwitchASCII(switches::kRegisterStandardSchemes,
-+                                    g_custom_schemes);
-+
-+  // The registered service worker schemes.
-+  if (!g_custom_service_worker_schemes.empty())
-+    command_line->AppendSwitchASCII(switches::kRegisterServiceWorkerSchemes,
-+                                    g_custom_service_worker_schemes);
-+
-+#if defined(OS_WIN)
-+  // Append --app-user-model-id.
-+  PWSTR current_app_id;
-+  if (SUCCEEDED(GetCurrentProcessExplicitAppUserModelID(&current_app_id))) {
-+    command_line->AppendSwitchNative(switches::kAppUserModelId, current_app_id);
-+    CoTaskMemFree(current_app_id);
-+  }
-+#endif
-+
-+  // If the process is a pending process, we should use the old one.
-+  if (ContainsKey(pending_processes_, process_id))
-+    process_id = pending_processes_[process_id];
-+
-+  // Certain render process will be created with no associated render view,
-+  // for example: ServiceWorker.
-+  content::WebContents* web_contents =
-+      WebContentsPreferences::GetWebContentsFromProcessID(process_id);
-+  if (!web_contents)
-+    return;
-+
-+  WebContentsPreferences::AppendExtraCommandLineSwitches(
-+      web_contents, command_line);
-+}
-+
-+void ElectronBrowserClient::DidCreatePpapiPlugin(
-+    content::BrowserPpapiHost* host) {
-+  host->GetPpapiHost()->AddHostFactoryFilter(
-+      make_scoped_ptr(new chrome::ChromeBrowserPepperHostFactory(host)));
-+}
-+
-+content::QuotaPermissionContext*
-+    ElectronBrowserClient::CreateQuotaPermissionContext() {
-+  return new ElectronQuotaPermissionContext;
-+}
-+
-+void ElectronBrowserClient::AllowCertificateError(
-+    content::WebContents* web_contents,
-+    int cert_error,
-+    const net::SSLInfo& ssl_info,
-+    const GURL& request_url,
-+    content::ResourceType resource_type,
-+    bool overridable,
-+    bool strict_enforcement,
-+    bool expired_previous_decision,
-+    const base::Callback<void(bool)>& callback,
-+    content::CertificateRequestResultType* request) {
-+  if (delegate_) {
-+    delegate_->AllowCertificateError(
-+        web_contents, cert_error, ssl_info, request_url,
-+        resource_type, overridable, strict_enforcement,
-+        expired_previous_decision, callback, request);
-+  }
-+}
-+
-+void ElectronBrowserClient::SelectClientCertificate(
-+    content::WebContents* web_contents,
-+    net::SSLCertRequestInfo* cert_request_info,
-+    scoped_ptr<content::ClientCertificateDelegate> delegate) {
-+  // --client-certificate=`path`
-+  auto cmd = base::CommandLine::ForCurrentProcess();
-+  if (cmd->HasSwitch(switches::kClientCertificate)) {
-+    auto cert_path = cmd->GetSwitchValuePath(switches::kClientCertificate);
-+    auto certificate = ImportCertFromFile(cert_path);
-+    if (certificate.get())
-+      delegate->ContinueWithCertificate(certificate.get());
-+    return;
-+  }
-+
-+  if (!cert_request_info->client_certs.empty() && delegate_) {
-+    delegate_->SelectClientCertificate(
-+        web_contents, cert_request_info, std::move(delegate));
-+  }
-+}
-+
-+void ElectronBrowserClient::ResourceDispatcherHostCreated() {
-+  resource_dispatcher_host_delegate_.reset(
-+      new ElectronResourceDispatcherHostDelegate);
-+  content::ResourceDispatcherHost::Get()->SetDelegate(
-+      resource_dispatcher_host_delegate_.get());
-+}
-+
-+brightray::BrowserMainParts* ElectronBrowserClient::OverrideCreateBrowserMainParts(
-+    const content::MainFunctionParams&) {
-+  v8::V8::Initialize();  // Init V8 before creating main parts.
-+  return new ElectronBrowserMainParts;
-+}
-+
-+void ElectronBrowserClient::WebNotificationAllowed(
-+    int render_process_id,
-+    const base::Callback<void(bool)>& callback) {
-+  content::WebContents* web_contents =
-+      WebContentsPreferences::GetWebContentsFromProcessID(render_process_id);
-+  if (!web_contents) {
-+    callback.Run(false);
-+    return;
-+  }
-+  auto permission_helper =
-+      WebContentsPermissionHelper::FromWebContents(web_contents);
-+  if (!permission_helper) {
-+    callback.Run(false);
-+    return;
-+  }
-+  permission_helper->RequestWebNotificationPermission(callback);
-+}
-+
-+void ElectronBrowserClient::RenderProcessHostDestroyed(
-+    content::RenderProcessHost* host) {
-+  int process_id = host->GetID();
-+  for (const auto& entry : pending_processes_) {
-+    if (entry.first == process_id || entry.second == process_id) {
-+      pending_processes_.erase(entry.first);
-+      break;
-+    }
-+  }
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 5caf0726cdd06c49b68366b09e78348ed609297a electron/browser/electron_browser_client.h
-@@ -0,0 +1,104 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_ELECTRON_BROWSER_CLIENT_H_
-+#define ELECTRON_BROWSER_ELECTRON_BROWSER_CLIENT_H_
-+
-+#include <map>
-+#include <string>
-+#include <vector>
-+
-+#include "brightray/browser/browser_client.h"
-+#include "content/public/browser/render_process_host_observer.h"
-+
-+namespace content {
-+class QuotaPermissionContext;
-+class ClientCertificateDelegate;
-+}
-+
-+namespace net {
-+class SSLCertRequestInfo;
-+}
-+
-+namespace electron {
-+
-+class ElectronResourceDispatcherHostDelegate;
-+
-+class ElectronBrowserClient : public brightray::BrowserClient,
-+                          public content::RenderProcessHostObserver {
-+ public:
-+  ElectronBrowserClient();
-+  virtual ~ElectronBrowserClient();
-+
-+  using Delegate = content::ContentBrowserClient;
-+  void set_delegate(Delegate* delegate) { delegate_ = delegate; }
-+
-+  // Don't force renderer process to restart for once.
-+  static void SuppressRendererProcessRestartForOnce();
-+  // Custom schemes to be registered to standard.
-+  static void SetCustomSchemes(const std::vector<std::string>& schemes);
-+  // Custom schemes to be registered to handle service worker.
-+  static void SetCustomServiceWorkerSchemes(
-+      const std::vector<std::string>& schemes);
-+
-+ protected:
-+  // content::ContentBrowserClient:
-+  void RenderProcessWillLaunch(content::RenderProcessHost* host) override;
-+  content::SpeechRecognitionManagerDelegate*
-+      CreateSpeechRecognitionManagerDelegate() override;
-+  content::AccessTokenStore* CreateAccessTokenStore() override;
-+  void OverrideWebkitPrefs(content::RenderViewHost* render_view_host,
-+                           content::WebPreferences* prefs) override;
-+  std::string GetApplicationLocale() override;
-+  void OverrideSiteInstanceForNavigation(
-+      content::BrowserContext* browser_context,
-+      content::SiteInstance* current_instance,
-+      const GURL& dest_url,
-+      content::SiteInstance** new_instance) override;
-+  void AppendExtraCommandLineSwitches(base::CommandLine* command_line,
-+                                      int child_process_id) override;
-+  void DidCreatePpapiPlugin(content::BrowserPpapiHost* browser_host) override;
-+  content::QuotaPermissionContext* CreateQuotaPermissionContext() override;
-+  void AllowCertificateError(
-+      content::WebContents* web_contents,
-+      int cert_error,
-+      const net::SSLInfo& ssl_info,
-+      const GURL& request_url,
-+      content::ResourceType resource_type,
-+      bool overridable,
-+      bool strict_enforcement,
-+      bool expired_previous_decision,
-+      const base::Callback<void(bool)>& callback,
-+      content::CertificateRequestResultType* request) override;
-+  void SelectClientCertificate(
-+      content::WebContents* web_contents,
-+      net::SSLCertRequestInfo* cert_request_info,
-+      scoped_ptr<content::ClientCertificateDelegate> delegate) override;
-+  void ResourceDispatcherHostCreated() override;
-+
-+  // brightray::BrowserClient:
-+  brightray::BrowserMainParts* OverrideCreateBrowserMainParts(
-+      const content::MainFunctionParams&) override;
-+  void WebNotificationAllowed(
-+      int render_process_id,
-+      const base::Callback<void(bool)>& callback) override;
-+
-+  // content::RenderProcessHostObserver:
-+  void RenderProcessHostDestroyed(content::RenderProcessHost* host) override;
-+
-+ private:
-+  // pending_render_process => current_render_process.
-+  std::map<int, int> pending_processes_;
-+
-+  scoped_ptr<ElectronResourceDispatcherHostDelegate>
-+      resource_dispatcher_host_delegate_;
-+
-+  Delegate* delegate_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(ElectronBrowserClient);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_ELECTRON_BROWSER_CLIENT_H_
-added in remote
-  their  100644 3345ea0c21c29a299a3829d8f50bb9b8bacae8d6 electron/browser/electron_browser_context.cc
-@@ -0,0 +1,220 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/electron_browser_context.h"
-+
-+#include "electron/browser/electron_browser_main_parts.h"
-+#include "electron/browser/electron_download_manager_delegate.h"
-+#include "electron/browser/browser.h"
-+#include "electron/browser/net/electron_cert_verifier.h"
-+#include "electron/browser/net/electron_network_delegate.h"
-+#include "electron/browser/net/electron_ssl_config_service.h"
-+#include "electron/browser/net/electron_url_request_job_factory.h"
-+#include "electron/browser/net/asar/asar_protocol_handler.h"
-+#include "electron/browser/net/http_protocol_handler.h"
-+#include "electron/browser/electron_permission_manager.h"
-+#include "electron/browser/web_view_manager.h"
-+#include "electron/common/electron_version.h"
-+#include "electron/common/chrome_version.h"
-+#include "electron/common/options_switches.h"
-+#include "base/command_line.h"
-+#include "base/files/file_path.h"
-+#include "base/path_service.h"
-+#include "base/prefs/pref_registry_simple.h"
-+#include "base/strings/string_util.h"
-+#include "base/strings/stringprintf.h"
-+#include "base/threading/sequenced_worker_pool.h"
-+#include "base/threading/worker_pool.h"
-+#include "chrome/common/chrome_paths.h"
-+#include "chrome/common/pref_names.h"
-+#include "content/public/browser/browser_thread.h"
-+#include "content/public/common/url_constants.h"
-+#include "content/public/common/user_agent.h"
-+#include "net/ftp/ftp_network_layer.h"
-+#include "net/url_request/data_protocol_handler.h"
-+#include "net/url_request/ftp_protocol_handler.h"
-+#include "net/url_request/url_request_intercepting_job_factory.h"
-+#include "net/url_request/url_request_context.h"
-+#include "url/url_constants.h"
-+
-+using content::BrowserThread;
-+
-+namespace electron {
-+
-+namespace {
-+
-+class NoCacheBackend : public net::HttpCache::BackendFactory {
-+  int CreateBackend(net::NetLog* net_log,
-+                    scoped_ptr<disk_cache::Backend>* backend,
-+                    const net::CompletionCallback& callback) override {
-+    return net::ERR_FAILED;
-+  }
-+};
-+
-+std::string RemoveWhitespace(const std::string& str) {
-+  std::string trimmed;
-+  if (base::RemoveChars(str, " ", &trimmed))
-+    return trimmed;
-+  else
-+    return str;
-+}
-+
-+}  // namespace
-+
-+ElectronBrowserContext::ElectronBrowserContext(const std::string& partition,
-+                                       bool in_memory)
-+    : brightray::BrowserContext(partition, in_memory),
-+      cert_verifier_(nullptr),
-+      job_factory_(new ElectronURLRequestJobFactory),
-+      network_delegate_(new ElectronNetworkDelegate),
-+      allow_ntlm_everywhere_(false) {
-+}
-+
-+ElectronBrowserContext::~ElectronBrowserContext() {
-+}
-+
-+net::NetworkDelegate* ElectronBrowserContext::CreateNetworkDelegate() {
-+  return network_delegate_;
-+}
-+
-+std::string ElectronBrowserContext::GetUserAgent() {
-+  Browser* browser = Browser::Get();
-+  std::string name = RemoveWhitespace(browser->GetName());
-+  std::string user_agent;
-+  if (name == ELECTRON_PRODUCT_NAME) {
-+    user_agent = "Chrome/" CHROME_VERSION_STRING " "
-+                 ELECTRON_PRODUCT_NAME "/" ELECTRON_VERSION_STRING;
-+  } else {
-+    user_agent = base::StringPrintf(
-+        "%s/%s Chrome/%s " ELECTRON_PRODUCT_NAME "/" ELECTRON_VERSION_STRING,
-+        name.c_str(),
-+        browser->GetVersion().c_str(),
-+        CHROME_VERSION_STRING);
-+  }
-+  return content::BuildUserAgentFromProduct(user_agent);
-+}
-+
-+scoped_ptr<net::URLRequestJobFactory>
-+ElectronBrowserContext::CreateURLRequestJobFactory(
-+    content::ProtocolHandlerMap* handlers,
-+    content::URLRequestInterceptorScopedVector* interceptors) {
-+  scoped_ptr<ElectronURLRequestJobFactory> job_factory(job_factory_);
-+
-+  for (auto& it : *handlers) {
-+    job_factory->SetProtocolHandler(it.first,
-+                                    make_scoped_ptr(it.second.release()));
-+  }
-+  handlers->clear();
-+
-+  job_factory->SetProtocolHandler(
-+      url::kDataScheme, make_scoped_ptr(new net::DataProtocolHandler));
-+  job_factory->SetProtocolHandler(
-+      url::kFileScheme, make_scoped_ptr(new asar::AsarProtocolHandler(
-+          BrowserThread::GetBlockingPool()->GetTaskRunnerWithShutdownBehavior(
-+              base::SequencedWorkerPool::SKIP_ON_SHUTDOWN))));
-+  job_factory->SetProtocolHandler(
-+      url::kHttpScheme,
-+      make_scoped_ptr(new HttpProtocolHandler(url::kHttpScheme)));
-+  job_factory->SetProtocolHandler(
-+      url::kHttpsScheme,
-+      make_scoped_ptr(new HttpProtocolHandler(url::kHttpsScheme)));
-+  job_factory->SetProtocolHandler(
-+      url::kWsScheme,
-+      make_scoped_ptr(new HttpProtocolHandler(url::kWsScheme)));
-+  job_factory->SetProtocolHandler(
-+      url::kWssScheme,
-+      make_scoped_ptr(new HttpProtocolHandler(url::kWssScheme)));
-+
-+  auto host_resolver =
-+      url_request_context_getter()->GetURLRequestContext()->host_resolver();
-+  job_factory->SetProtocolHandler(
-+      url::kFtpScheme,
-+      make_scoped_ptr(new net::FtpProtocolHandler(
-+          new net::FtpNetworkLayer(host_resolver))));
-+
-+  // Set up interceptors in the reverse order.
-+  scoped_ptr<net::URLRequestJobFactory> top_job_factory =
-+      std::move(job_factory);
-+  content::URLRequestInterceptorScopedVector::reverse_iterator it;
-+  for (it = interceptors->rbegin(); it != interceptors->rend(); ++it)
-+    top_job_factory.reset(new net::URLRequestInterceptingJobFactory(
-+        std::move(top_job_factory), make_scoped_ptr(*it)));
-+  interceptors->weak_clear();
-+
-+  return top_job_factory;
-+}
-+
-+net::HttpCache::BackendFactory*
-+ElectronBrowserContext::CreateHttpCacheBackendFactory(
-+    const base::FilePath& base_path) {
-+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-+  if (command_line->HasSwitch(switches::kDisableHttpCache))
-+    return new NoCacheBackend;
-+  else
-+    return brightray::BrowserContext::CreateHttpCacheBackendFactory(base_path);
-+}
-+
-+content::DownloadManagerDelegate*
-+ElectronBrowserContext::GetDownloadManagerDelegate() {
-+  if (!download_manager_delegate_.get()) {
-+    auto download_manager = content::BrowserContext::GetDownloadManager(this);
-+    download_manager_delegate_.reset(
-+        new ElectronDownloadManagerDelegate(download_manager));
-+  }
-+  return download_manager_delegate_.get();
-+}
-+
-+content::BrowserPluginGuestManager* ElectronBrowserContext::GetGuestManager() {
-+  if (!guest_manager_)
-+    guest_manager_.reset(new WebViewManager);
-+  return guest_manager_.get();
-+}
-+
-+content::PermissionManager* ElectronBrowserContext::GetPermissionManager() {
-+  if (!permission_manager_.get())
-+    permission_manager_.reset(new ElectronPermissionManager);
-+  return permission_manager_.get();
-+}
-+
-+scoped_ptr<net::CertVerifier> ElectronBrowserContext::CreateCertVerifier() {
-+  DCHECK(!cert_verifier_);
-+  cert_verifier_ = new ElectronCertVerifier;
-+  return make_scoped_ptr(cert_verifier_);
-+}
-+
-+net::SSLConfigService* ElectronBrowserContext::CreateSSLConfigService() {
-+  return new ElectronSSLConfigService;
-+}
-+
-+void ElectronBrowserContext::RegisterPrefs(PrefRegistrySimple* pref_registry) {
-+  pref_registry->RegisterFilePathPref(prefs::kSelectFileLastDirectory,
-+                                      base::FilePath());
-+  base::FilePath download_dir;
-+  PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &download_dir);
-+  pref_registry->RegisterFilePathPref(prefs::kDownloadDefaultDirectory,
-+                                      download_dir);
-+  pref_registry->RegisterDictionaryPref(prefs::kDevToolsFileSystemPaths);
-+}
-+
-+bool ElectronBrowserContext::AllowNTLMCredentialsForDomain(const GURL& origin) {
-+  if (allow_ntlm_everywhere_)
-+    return true;
-+  return Delegate::AllowNTLMCredentialsForDomain(origin);
-+}
-+
-+void ElectronBrowserContext::AllowNTLMCredentialsForAllDomains(bool should_allow) {
-+  allow_ntlm_everywhere_ = should_allow;
-+}
-+
-+}  // namespace electron
-+
-+namespace brightray {
-+
-+// static
-+scoped_refptr<BrowserContext> BrowserContext::Create(
-+    const std::string& partition, bool in_memory) {
-+  return make_scoped_refptr(new electron::ElectronBrowserContext(partition, in_memory));
-+}
-+
-+}  // namespace brightray
-added in remote
-  their  100644 c310aa5f351f2b0c3ab4ce6bf95aa561255dfb4e electron/browser/electron_browser_context.h
-@@ -0,0 +1,71 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_ELECTRON_BROWSER_CONTEXT_H_
-+#define ELECTRON_BROWSER_ELECTRON_BROWSER_CONTEXT_H_
-+
-+#include <string>
-+
-+#include "brightray/browser/browser_context.h"
-+
-+namespace electron {
-+
-+class ElectronDownloadManagerDelegate;
-+class ElectronCertVerifier;
-+class ElectronNetworkDelegate;
-+class ElectronPermissionManager;
-+class ElectronURLRequestJobFactory;
-+class WebViewManager;
-+
-+class ElectronBrowserContext : public brightray::BrowserContext {
-+ public:
-+  ElectronBrowserContext(const std::string& partition, bool in_memory);
-+  ~ElectronBrowserContext() override;
-+
-+  // brightray::URLRequestContextGetter::Delegate:
-+  net::NetworkDelegate* CreateNetworkDelegate() override;
-+  std::string GetUserAgent() override;
-+  scoped_ptr<net::URLRequestJobFactory> CreateURLRequestJobFactory(
-+      content::ProtocolHandlerMap* handlers,
-+      content::URLRequestInterceptorScopedVector* interceptors) override;
-+  net::HttpCache::BackendFactory* CreateHttpCacheBackendFactory(
-+      const base::FilePath& base_path) override;
-+  scoped_ptr<net::CertVerifier> CreateCertVerifier() override;
-+  net::SSLConfigService* CreateSSLConfigService() override;
-+  bool AllowNTLMCredentialsForDomain(const GURL& auth_origin) override;
-+
-+  // content::BrowserContext:
-+  content::DownloadManagerDelegate* GetDownloadManagerDelegate() override;
-+  content::BrowserPluginGuestManager* GetGuestManager() override;
-+  content::PermissionManager* GetPermissionManager() override;
-+
-+  // brightray::BrowserContext:
-+  void RegisterPrefs(PrefRegistrySimple* pref_registry) override;
-+
-+  void AllowNTLMCredentialsForAllDomains(bool should_allow);
-+
-+  ElectronCertVerifier* cert_verifier() const { return cert_verifier_; }
-+
-+  ElectronURLRequestJobFactory* job_factory() const { return job_factory_; }
-+
-+  ElectronNetworkDelegate* network_delegate() const { return network_delegate_; }
-+
-+ private:
-+  scoped_ptr<ElectronDownloadManagerDelegate> download_manager_delegate_;
-+  scoped_ptr<WebViewManager> guest_manager_;
-+  scoped_ptr<ElectronPermissionManager> permission_manager_;
-+
-+  // Managed by brightray::BrowserContext.
-+  ElectronCertVerifier* cert_verifier_;
-+  ElectronURLRequestJobFactory* job_factory_;
-+  ElectronNetworkDelegate* network_delegate_;
-+
-+  bool allow_ntlm_everywhere_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(ElectronBrowserContext);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_ELECTRON_BROWSER_CONTEXT_H_
-added in remote
-  their  100644 3eb568425c7f3965effef3372a4f19d215c3f559 electron/browser/electron_browser_main_parts.cc
-@@ -0,0 +1,189 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/electron_browser_main_parts.h"
-+
-+#include "electron/browser/api/trackable_object.h"
-+#include "electron/browser/electron_browser_client.h"
-+#include "electron/browser/electron_browser_context.h"
-+#include "electron/browser/bridge_task_runner.h"
-+#include "electron/browser/browser.h"
-+#include "electron/browser/javascript_environment.h"
-+#include "electron/browser/node_debugger.h"
-+#include "electron/common/api/electron_bindings.h"
-+#include "electron/common/node_bindings.h"
-+#include "electron/common/node_includes.h"
-+#include "base/command_line.h"
-+#include "base/thread_task_runner_handle.h"
-+#include "chrome/browser/browser_process.h"
-+#include "v8/include/v8-debug.h"
-+
-+#if defined(USE_X11)
-+#include "chrome/browser/ui/libgtk2ui/gtk2_util.h"
-+#include "ui/events/devices/x11/touch_factory_x11.h"
-+#endif
-+
-+namespace electron {
-+
-+template<typename T>
-+void Erase(T* container, typename T::iterator iter) {
-+  container->erase(iter);
-+}
-+
-+// static
-+ElectronBrowserMainParts* ElectronBrowserMainParts::self_ = NULL;
-+
-+ElectronBrowserMainParts::ElectronBrowserMainParts()
-+    : fake_browser_process_(new BrowserProcess),
-+      exit_code_(nullptr),
-+      browser_(new Browser),
-+      node_bindings_(NodeBindings::Create(true)),
-+      electron_bindings_(new ElectronBindings),
-+      gc_timer_(true, true) {
-+  DCHECK(!self_) << "Cannot have two ElectronBrowserMainParts";
-+  self_ = this;
-+}
-+
-+ElectronBrowserMainParts::~ElectronBrowserMainParts() {
-+  // Leak the JavascriptEnvironment on exit.
-+  // This is to work around the bug that V8 would be waiting for background
-+  // tasks to finish on exit, while somehow it waits forever in Electron, more
-+  // about this can be found at https://github.com/electron/electron/issues/4767.
-+  // On the other handle there is actually no need to gracefully shutdown V8
-+  // on exit in the main process, we already ensured all necessary resources get
-+  // cleaned up, and it would make quitting faster.
-+  ignore_result(js_env_.release());
-+}
-+
-+// static
-+ElectronBrowserMainParts* ElectronBrowserMainParts::Get() {
-+  DCHECK(self_);
-+  return self_;
-+}
-+
-+bool ElectronBrowserMainParts::SetExitCode(int code) {
-+  if (!exit_code_)
-+    return false;
-+
-+  *exit_code_ = code;
-+  return true;
-+}
-+
-+int ElectronBrowserMainParts::GetExitCode() {
-+  return exit_code_ != nullptr ? *exit_code_ : 0;
-+}
-+
-+base::Closure ElectronBrowserMainParts::RegisterDestructionCallback(
-+    const base::Closure& callback) {
-+  auto iter = destructors_.insert(destructors_.end(), callback);
-+  return base::Bind(&Erase<std::list<base::Closure>>, &destructors_, iter);
-+}
-+
-+void ElectronBrowserMainParts::PreEarlyInitialization() {
-+  brightray::BrowserMainParts::PreEarlyInitialization();
-+#if defined(OS_POSIX)
-+  HandleSIGCHLD();
-+#endif
-+}
-+
-+void ElectronBrowserMainParts::PostEarlyInitialization() {
-+  brightray::BrowserMainParts::PostEarlyInitialization();
-+
-+  // Temporary set the bridge_task_runner_ as current thread's task runner,
-+  // so we can fool gin::PerIsolateData to use it as its task runner, instead
-+  // of getting current message loop's task runner, which is null for now.
-+  bridge_task_runner_ = new BridgeTaskRunner;
-+  base::ThreadTaskRunnerHandle handle(bridge_task_runner_);
-+
-+  // The ProxyResolverV8 has setup a complete V8 environment, in order to
-+  // avoid conflicts we only initialize our V8 environment after that.
-+  js_env_.reset(new JavascriptEnvironment);
-+
-+  node_bindings_->Initialize();
-+
-+  // Support the "--debug" switch.
-+  node_debugger_.reset(new NodeDebugger(js_env_->isolate()));
-+
-+  // Create the global environment.
-+  node::Environment* env =
-+      node_bindings_->CreateEnvironment(js_env_->context());
-+
-+  // Make sure node can get correct environment when debugging.
-+  if (node_debugger_->IsRunning())
-+    env->AssignToContext(v8::Debug::GetDebugContext());
-+
-+  // Add Electron extended APIs.
-+  electron_bindings_->BindTo(js_env_->isolate(), env->process_object());
-+
-+  // Load everything.
-+  node_bindings_->LoadEnvironment(env);
-+
-+  // Wrap the uv loop with global env.
-+  node_bindings_->set_uv_env(env);
-+}
-+
-+void ElectronBrowserMainParts::PreMainMessageLoopRun() {
-+  // Run user's main script before most things get initialized, so we can have
-+  // a chance to setup everything.
-+  node_bindings_->PrepareMessageLoop();
-+  node_bindings_->RunMessageLoop();
-+
-+#if defined(USE_X11)
-+  ui::TouchFactory::SetTouchDeviceListFromCommandLine();
-+#endif
-+
-+  // Start idle gc.
-+  gc_timer_.Start(
-+      FROM_HERE, base::TimeDelta::FromMinutes(1),
-+      base::Bind(base::IgnoreResult(&v8::Isolate::IdleNotification),
-+                 base::Unretained(js_env_->isolate()),
-+                 1000));
-+
-+  brightray::BrowserMainParts::PreMainMessageLoopRun();
-+  bridge_task_runner_->MessageLoopIsReady();
-+  bridge_task_runner_ = nullptr;
-+
-+#if defined(USE_X11)
-+  libgtk2ui::GtkInitFromCommandLine(*base::CommandLine::ForCurrentProcess());
-+#endif
-+
-+#if !defined(OS_MACOSX)
-+  // The corresponding call in OS X is in ElectronApplicationDelegate.
-+  Browser::Get()->WillFinishLaunching();
-+  Browser::Get()->DidFinishLaunching();
-+#endif
-+}
-+
-+bool ElectronBrowserMainParts::MainMessageLoopRun(int* result_code) {
-+  exit_code_ = result_code;
-+  return brightray::BrowserMainParts::MainMessageLoopRun(result_code);
-+}
-+
-+void ElectronBrowserMainParts::PostMainMessageLoopStart() {
-+  brightray::BrowserMainParts::PostMainMessageLoopStart();
-+#if defined(OS_POSIX)
-+  HandleShutdownSignals();
-+#endif
-+}
-+
-+void ElectronBrowserMainParts::PostMainMessageLoopRun() {
-+  brightray::BrowserMainParts::PostMainMessageLoopRun();
-+
-+#if defined(OS_MACOSX)
-+  FreeAppDelegate();
-+#endif
-+
-+  // Make sure destruction callbacks are called before message loop is
-+  // destroyed, otherwise some objects that need to be deleted on IO thread
-+  // won't be freed.
-+  // We don't use ranged for loop because iterators are getting invalided when
-+  // the callback runs.
-+  for (auto iter = destructors_.begin(); iter != destructors_.end();) {
-+    base::Closure& callback = *iter;
-+    ++iter;
-+    callback.Run();
-+  }
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 7018522f15ddaa570b28bad81d5b38097e3e47d8 electron/browser/electron_browser_main_parts.h
-@@ -0,0 +1,98 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_ELECTRON_BROWSER_MAIN_PARTS_H_
-+#define ELECTRON_BROWSER_ELECTRON_BROWSER_MAIN_PARTS_H_
-+
-+#include <list>
-+#include <string>
-+
-+#include "base/callback.h"
-+#include "base/timer/timer.h"
-+#include "brightray/browser/browser_main_parts.h"
-+#include "content/public/browser/browser_context.h"
-+
-+class BrowserProcess;
-+
-+namespace electron {
-+
-+class ElectronBindings;
-+class Browser;
-+class JavascriptEnvironment;
-+class NodeBindings;
-+class NodeDebugger;
-+class BridgeTaskRunner;
-+
-+class ElectronBrowserMainParts : public brightray::BrowserMainParts {
-+ public:
-+  ElectronBrowserMainParts();
-+  virtual ~ElectronBrowserMainParts();
-+
-+  static ElectronBrowserMainParts* Get();
-+
-+  // Sets the exit code, will fail if the message loop is not ready.
-+  bool SetExitCode(int code);
-+
-+  // Gets the exit code
-+  int GetExitCode();
-+
-+  // Register a callback that should be destroyed before JavaScript environment
-+  // gets destroyed.
-+  // Returns a closure that can be used to remove |callback| from the list.
-+  base::Closure RegisterDestructionCallback(const base::Closure& callback);
-+
-+  Browser* browser() { return browser_.get(); }
-+
-+ protected:
-+  // content::BrowserMainParts:
-+  void PreEarlyInitialization() override;
-+  void PostEarlyInitialization() override;
-+  void PreMainMessageLoopRun() override;
-+  bool MainMessageLoopRun(int* result_code) override;
-+  void PostMainMessageLoopStart() override;
-+  void PostMainMessageLoopRun() override;
-+#if defined(OS_MACOSX)
-+  void PreMainMessageLoopStart() override;
-+#endif
-+
-+ private:
-+#if defined(OS_POSIX)
-+  // Set signal handlers.
-+  void HandleSIGCHLD();
-+  void HandleShutdownSignals();
-+#endif
-+
-+#if defined(OS_MACOSX)
-+  void FreeAppDelegate();
-+#endif
-+
-+  // A fake BrowserProcess object that used to feed the source code from chrome.
-+  scoped_ptr<BrowserProcess> fake_browser_process_;
-+
-+  // The gin::PerIsolateData requires a task runner to create, so we feed it
-+  // with a task runner that will post all work to main loop.
-+  scoped_refptr<BridgeTaskRunner> bridge_task_runner_;
-+
-+  // Pointer to exit code.
-+  int* exit_code_;
-+
-+  scoped_ptr<Browser> browser_;
-+  scoped_ptr<JavascriptEnvironment> js_env_;
-+  scoped_ptr<NodeBindings> node_bindings_;
-+  scoped_ptr<ElectronBindings> electron_bindings_;
-+  scoped_ptr<NodeDebugger> node_debugger_;
-+
-+  base::Timer gc_timer_;
-+
-+  // List of callbacks should be executed before destroying JS env.
-+  std::list<base::Closure> destructors_;
-+
-+  static ElectronBrowserMainParts* self_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(ElectronBrowserMainParts);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_ELECTRON_BROWSER_MAIN_PARTS_H_
-added in remote
-  their  100644 c888de5eb3407eb5baeb8073f3d0f77988bc8db8 electron/browser/electron_browser_main_parts_mac.mm
-@@ -0,0 +1,36 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/electron_browser_main_parts.h"
-+
-+#include "electron/browser/mac/electron_application.h"
-+#include "electron/browser/mac/electron_application_delegate.h"
-+#include "base/mac/bundle_locations.h"
-+#include "base/mac/foundation_util.h"
-+#include "ui/base/l10n/l10n_util_mac.h"
-+
-+namespace electron {
-+
-+void ElectronBrowserMainParts::PreMainMessageLoopStart() {
-+  // Force the NSApplication subclass to be used.
-+  [ElectronApplication sharedApplication];
-+
-+  // Set our own application delegate.
-+  ElectronApplicationDelegate* delegate = [[ElectronApplicationDelegate alloc] init];
-+  [NSApp setDelegate:(id<NSFileManagerDelegate>)delegate];
-+
-+  brightray::BrowserMainParts::PreMainMessageLoopStart();
-+
-+  // Prevent Cocoa from turning command-line arguments into
-+  // |-application:openFiles:|, since we already handle them directly.
-+  [[NSUserDefaults standardUserDefaults]
-+      setObject:@"NO" forKey:@"NSTreatUnknownArgumentsAsOpen"];
-+}
-+
-+void ElectronBrowserMainParts::FreeAppDelegate() {
-+  [[NSApp delegate] release];
-+  [NSApp setDelegate:nil];
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 c0834e5d77035a69c2c62d679e6a8f8a260240ec electron/browser/electron_browser_main_parts_posix.cc
-@@ -0,0 +1,225 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+// Most code came from: chrome/browser/chrome_browser_main_posix.cc.
-+
-+#include "electron/browser/electron_browser_main_parts.h"
-+
-+#include <errno.h>
-+#include <limits.h>
-+#include <pthread.h>
-+#include <signal.h>
-+#include <sys/resource.h>
-+#include <unistd.h>
-+
-+#include "electron/browser/browser.h"
-+#include "base/posix/eintr_wrapper.h"
-+#include "content/public/browser/browser_thread.h"
-+
-+using content::BrowserThread;
-+
-+namespace electron {
-+
-+namespace {
-+
-+// See comment in |PreEarlyInitialization()|, where sigaction is called.
-+void SIGCHLDHandler(int signal) {
-+}
-+
-+// The OSX fork() implementation can crash in the child process before
-+// fork() returns.  In that case, the shutdown pipe will still be
-+// shared with the parent process.  To prevent child crashes from
-+// causing parent shutdowns, |g_pipe_pid| is the pid for the process
-+// which registered |g_shutdown_pipe_write_fd|.
-+// See <http://crbug.com/175341>.
-+pid_t g_pipe_pid = -1;
-+int g_shutdown_pipe_write_fd = -1;
-+int g_shutdown_pipe_read_fd = -1;
-+
-+// Common code between SIG{HUP, INT, TERM}Handler.
-+void GracefulShutdownHandler(int signal) {
-+  // Reinstall the default handler.  We had one shot at graceful shutdown.
-+  struct sigaction action;
-+  memset(&action, 0, sizeof(action));
-+  action.sa_handler = SIG_DFL;
-+  RAW_CHECK(sigaction(signal, &action, NULL) == 0);
-+
-+  RAW_CHECK(g_pipe_pid == getpid());
-+  RAW_CHECK(g_shutdown_pipe_write_fd != -1);
-+  RAW_CHECK(g_shutdown_pipe_read_fd != -1);
-+  size_t bytes_written = 0;
-+  do {
-+    int rv = HANDLE_EINTR(
-+        write(g_shutdown_pipe_write_fd,
-+              reinterpret_cast<const char*>(&signal) + bytes_written,
-+              sizeof(signal) - bytes_written));
-+    RAW_CHECK(rv >= 0);
-+    bytes_written += rv;
-+  } while (bytes_written < sizeof(signal));
-+}
-+
-+// See comment in |PostMainMessageLoopStart()|, where sigaction is called.
-+void SIGHUPHandler(int signal) {
-+  RAW_CHECK(signal == SIGHUP);
-+  GracefulShutdownHandler(signal);
-+}
-+
-+// See comment in |PostMainMessageLoopStart()|, where sigaction is called.
-+void SIGINTHandler(int signal) {
-+  RAW_CHECK(signal == SIGINT);
-+  GracefulShutdownHandler(signal);
-+}
-+
-+// See comment in |PostMainMessageLoopStart()|, where sigaction is called.
-+void SIGTERMHandler(int signal) {
-+  RAW_CHECK(signal == SIGTERM);
-+  GracefulShutdownHandler(signal);
-+}
-+
-+class ShutdownDetector : public base::PlatformThread::Delegate {
-+ public:
-+  explicit ShutdownDetector(int shutdown_fd);
-+
-+  void ThreadMain() override;
-+
-+ private:
-+  const int shutdown_fd_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(ShutdownDetector);
-+};
-+
-+ShutdownDetector::ShutdownDetector(int shutdown_fd)
-+    : shutdown_fd_(shutdown_fd) {
-+  CHECK_NE(shutdown_fd_, -1);
-+}
-+
-+// These functions are used to help us diagnose crash dumps that happen
-+// during the shutdown process.
-+NOINLINE void ShutdownFDReadError() {
-+  // Ensure function isn't optimized away.
-+  asm("");
-+  sleep(UINT_MAX);
-+}
-+
-+NOINLINE void ShutdownFDClosedError() {
-+  // Ensure function isn't optimized away.
-+  asm("");
-+  sleep(UINT_MAX);
-+}
-+
-+NOINLINE void ExitPosted() {
-+  // Ensure function isn't optimized away.
-+  asm("");
-+  sleep(UINT_MAX);
-+}
-+
-+void ShutdownDetector::ThreadMain() {
-+  base::PlatformThread::SetName("CrShutdownDetector");
-+
-+  int signal;
-+  size_t bytes_read = 0;
-+  ssize_t ret;
-+  do {
-+    ret = HANDLE_EINTR(
-+        read(shutdown_fd_,
-+             reinterpret_cast<char*>(&signal) + bytes_read,
-+             sizeof(signal) - bytes_read));
-+    if (ret < 0) {
-+      NOTREACHED() << "Unexpected error: " << strerror(errno);
-+      ShutdownFDReadError();
-+      break;
-+    } else if (ret == 0) {
-+      NOTREACHED() << "Unexpected closure of shutdown pipe.";
-+      ShutdownFDClosedError();
-+      break;
-+    }
-+    bytes_read += ret;
-+  } while (bytes_read < sizeof(signal));
-+  VLOG(1) << "Handling shutdown for signal " << signal << ".";
-+  base::Closure task =
-+      base::Bind(&Browser::Quit, base::Unretained(Browser::Get()));
-+
-+  if (!BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, task)) {
-+    // Without a UI thread to post the exit task to, there aren't many
-+    // options.  Raise the signal again.  The default handler will pick it up
-+    // and cause an ungraceful exit.
-+    RAW_LOG(WARNING, "No UI thread, exiting ungracefully.");
-+    kill(getpid(), signal);
-+
-+    // The signal may be handled on another thread.  Give that a chance to
-+    // happen.
-+    sleep(3);
-+
-+    // We really should be dead by now.  For whatever reason, we're not. Exit
-+    // immediately, with the exit status set to the signal number with bit 8
-+    // set.  On the systems that we care about, this exit status is what is
-+    // normally used to indicate an exit by this signal's default handler.
-+    // This mechanism isn't a de jure standard, but even in the worst case, it
-+    // should at least result in an immediate exit.
-+    RAW_LOG(WARNING, "Still here, exiting really ungracefully.");
-+    _exit(signal | (1 << 7));
-+  }
-+  ExitPosted();
-+}
-+
-+}  // namespace
-+
-+void ElectronBrowserMainParts::HandleSIGCHLD() {
-+  // We need to accept SIGCHLD, even though our handler is a no-op because
-+  // otherwise we cannot wait on children. (According to POSIX 2001.)
-+  struct sigaction action;
-+  memset(&action, 0, sizeof(action));
-+  action.sa_handler = SIGCHLDHandler;
-+  CHECK_EQ(sigaction(SIGCHLD, &action, NULL), 0);
-+}
-+
-+void ElectronBrowserMainParts::HandleShutdownSignals() {
-+  int pipefd[2];
-+  int ret = pipe(pipefd);
-+  if (ret < 0) {
-+    PLOG(DFATAL) << "Failed to create pipe";
-+  } else {
-+    g_pipe_pid = getpid();
-+    g_shutdown_pipe_read_fd = pipefd[0];
-+    g_shutdown_pipe_write_fd = pipefd[1];
-+#if !defined(ADDRESS_SANITIZER) && !defined(KEEP_SHADOW_STACKS)
-+    const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2;
-+#else
-+    // ASan instrumentation and -finstrument-functions (used for keeping the
-+    // shadow stacks) bloat the stack frames, so we need to increase the stack
-+    // size to avoid hitting the guard page.
-+    const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4;
-+#endif
-+    // TODO(viettrungluu,willchan): crbug.com/29675 - This currently leaks, so
-+    // if you change this, you'll probably need to change the suppression.
-+    if (!base::PlatformThread::CreateNonJoinable(
-+            kShutdownDetectorThreadStackSize,
-+            new ShutdownDetector(g_shutdown_pipe_read_fd))) {
-+      LOG(DFATAL) << "Failed to create shutdown detector task.";
-+    }
-+  }
-+  // Setup signal handlers for shutdown AFTER shutdown pipe is setup because
-+  // it may be called right away after handler is set.
-+
-+  // If adding to this list of signal handlers, note the new signal probably
-+  // needs to be reset in child processes. See
-+  // base/process_util_posix.cc:LaunchProcess.
-+
-+  // We need to handle SIGTERM, because that is how many POSIX-based distros ask
-+  // processes to quit gracefully at shutdown time.
-+  struct sigaction action;
-+  memset(&action, 0, sizeof(action));
-+  action.sa_handler = SIGTERMHandler;
-+  CHECK_EQ(sigaction(SIGTERM, &action, NULL), 0);
-+  // Also handle SIGINT - when the user terminates the browser via Ctrl+C. If
-+  // the browser process is being debugged, GDB will catch the SIGINT first.
-+  action.sa_handler = SIGINTHandler;
-+  CHECK_EQ(sigaction(SIGINT, &action, NULL), 0);
-+  // And SIGHUP, for when the terminal disappears. On shutdown, many Linux
-+  // distros send SIGHUP, SIGTERM, and then SIGKILL.
-+  action.sa_handler = SIGHUPHandler;
-+  CHECK_EQ(sigaction(SIGHUP, &action, NULL), 0);
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 91a7c49b7771172143cd632642f0622d56db4735 electron/browser/electron_download_manager_delegate.cc
-@@ -0,0 +1,167 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/electron_download_manager_delegate.h"
-+
-+#include <string>
-+
-+#include "electron/browser/api/electron_api_download_item.h"
-+#include "electron/browser/electron_browser_context.h"
-+#include "electron/browser/native_window.h"
-+#include "electron/browser/ui/file_dialog.h"
-+#include "base/bind.h"
-+#include "base/files/file_util.h"
-+#include "base/prefs/pref_service.h"
-+#include "chrome/common/pref_names.h"
-+#include "content/public/browser/browser_context.h"
-+#include "content/public/browser/browser_thread.h"
-+#include "content/public/browser/download_manager.h"
-+#include "net/base/filename_util.h"
-+
-+namespace electron {
-+
-+ElectronDownloadManagerDelegate::ElectronDownloadManagerDelegate(
-+    content::DownloadManager* manager)
-+    : download_manager_(manager),
-+      weak_ptr_factory_(this) {}
-+
-+ElectronDownloadManagerDelegate::~ElectronDownloadManagerDelegate() {
-+  if (download_manager_) {
-+    DCHECK_EQ(static_cast<content::DownloadManagerDelegate*>(this),
-+              download_manager_->GetDelegate());
-+    download_manager_->SetDelegate(nullptr);
-+    download_manager_ = nullptr;
-+  }
-+}
-+
-+void ElectronDownloadManagerDelegate::CreateDownloadPath(
-+    const GURL& url,
-+    const std::string& content_disposition,
-+    const std::string& suggested_filename,
-+    const std::string& mime_type,
-+    const base::FilePath& default_download_path,
-+    const CreateDownloadPathCallback& callback) {
-+  DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
-+
-+  auto generated_name = net::GenerateFileName(url,
-+                                              content_disposition,
-+                                              std::string(),
-+                                              suggested_filename,
-+                                              mime_type,
-+                                              std::string());
-+
-+  if (!base::PathExists(default_download_path))
-+    base::CreateDirectory(default_download_path);
-+
-+  base::FilePath path(default_download_path.Append(generated_name));
-+  content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE,
-+                                   base::Bind(callback, path));
-+}
-+
-+void ElectronDownloadManagerDelegate::OnDownloadPathGenerated(
-+    uint32_t download_id,
-+    const content::DownloadTargetCallback& callback,
-+    const base::FilePath& default_path) {
-+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-+
-+  auto item = download_manager_->GetDownload(download_id);
-+  if (!item)
-+    return;
-+
-+  NativeWindow* window = nullptr;
-+  auto relay = NativeWindowRelay::FromWebContents(item->GetWebContents());
-+  if (relay)
-+    window = relay->window.get();
-+
-+  base::FilePath path;
-+  if (file_dialog::ShowSaveDialog(window, item->GetURL().spec(), default_path,
-+                                  file_dialog::Filters(), &path)) {
-+    // Remember the last selected download directory.
-+    ElectronBrowserContext* browser_context = static_cast<ElectronBrowserContext*>(
-+        download_manager_->GetBrowserContext());
-+    browser_context->prefs()->SetFilePath(prefs::kDownloadDefaultDirectory,
-+                                          path.DirName());
-+  }
-+
-+  // Running the DownloadTargetCallback with an empty FilePath signals that the
-+  // download should be cancelled.
-+  // If user cancels the file save dialog, run the callback with empty FilePath.
-+  callback.Run(path,
-+               content::DownloadItem::TARGET_DISPOSITION_PROMPT,
-+               content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, path);
-+}
-+
-+void ElectronDownloadManagerDelegate::Shutdown() {
-+  weak_ptr_factory_.InvalidateWeakPtrs();
-+  download_manager_ = nullptr;
-+}
-+
-+bool ElectronDownloadManagerDelegate::DetermineDownloadTarget(
-+    content::DownloadItem* download,
-+    const content::DownloadTargetCallback& callback) {
-+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-+
-+  if (!download->GetForcedFilePath().empty()) {
-+    callback.Run(download->GetForcedFilePath(),
-+                 content::DownloadItem::TARGET_DISPOSITION_OVERWRITE,
-+                 content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
-+                 download->GetForcedFilePath());
-+    return true;
-+  }
-+
-+  // Try to get the save path from JS wrapper.
-+  {
-+    v8::Isolate* isolate = v8::Isolate::GetCurrent();
-+    v8::Locker locker(isolate);
-+    v8::HandleScope handle_scope(isolate);
-+    api::DownloadItem* download_item = api::DownloadItem::FromWrappedClass(
-+        isolate, download);
-+    if (download_item) {
-+      base::FilePath save_path = download_item->GetSavePath();
-+      if (!save_path.empty()) {
-+        callback.Run(save_path,
-+                     content::DownloadItem::TARGET_DISPOSITION_OVERWRITE,
-+                     content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
-+                     save_path);
-+        return true;
-+      }
-+    }
-+  }
-+
-+  ElectronBrowserContext* browser_context = static_cast<ElectronBrowserContext*>(
-+      download_manager_->GetBrowserContext());
-+  base::FilePath default_download_path = browser_context->prefs()->GetFilePath(
-+      prefs::kDownloadDefaultDirectory);
-+
-+  CreateDownloadPathCallback download_path_callback =
-+      base::Bind(&ElectronDownloadManagerDelegate::OnDownloadPathGenerated,
-+                 weak_ptr_factory_.GetWeakPtr(),
-+                 download->GetId(), callback);
-+
-+  content::BrowserThread::PostTask(
-+      content::BrowserThread::FILE, FROM_HERE,
-+      base::Bind(&ElectronDownloadManagerDelegate::CreateDownloadPath,
-+                 weak_ptr_factory_.GetWeakPtr(),
-+                 download->GetURL(),
-+                 download->GetContentDisposition(),
-+                 download->GetSuggestedFilename(),
-+                 download->GetMimeType(),
-+                 default_download_path,
-+                 download_path_callback));
-+  return true;
-+}
-+
-+bool ElectronDownloadManagerDelegate::ShouldOpenDownload(
-+    content::DownloadItem* download,
-+    const content::DownloadOpenDelayedCallback& callback) {
-+  return true;
-+}
-+
-+void ElectronDownloadManagerDelegate::GetNextId(
-+    const content::DownloadIdCallback& callback) {
-+  static uint32_t next_id = content::DownloadItem::kInvalidId + 1;
-+  callback.Run(next_id++);
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 a8f1e44b1a9584604025c3e8cefbddb77eb42c2e electron/browser/electron_download_manager_delegate.h
-@@ -0,0 +1,57 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_ELECTRON_DOWNLOAD_MANAGER_DELEGATE_H_
-+#define ELECTRON_BROWSER_ELECTRON_DOWNLOAD_MANAGER_DELEGATE_H_
-+
-+#include <string>
-+
-+#include "base/memory/weak_ptr.h"
-+#include "content/public/browser/download_manager_delegate.h"
-+
-+namespace content {
-+class DownloadManager;
-+}
-+
-+namespace electron {
-+
-+class ElectronDownloadManagerDelegate : public content::DownloadManagerDelegate {
-+ public:
-+  using CreateDownloadPathCallback =
-+      base::Callback<void(const base::FilePath&)>;
-+
-+  explicit ElectronDownloadManagerDelegate(content::DownloadManager* manager);
-+  virtual ~ElectronDownloadManagerDelegate();
-+
-+  // Generate default file path to save the download.
-+  void CreateDownloadPath(const GURL& url,
-+                          const std::string& suggested_filename,
-+                          const std::string& content_disposition,
-+                          const std::string& mime_type,
-+                          const base::FilePath& path,
-+                          const CreateDownloadPathCallback& callback);
-+  void OnDownloadPathGenerated(uint32_t download_id,
-+                               const content::DownloadTargetCallback& callback,
-+                               const base::FilePath& default_path);
-+
-+  // content::DownloadManagerDelegate:
-+  void Shutdown() override;
-+  bool DetermineDownloadTarget(
-+      content::DownloadItem* download,
-+      const content::DownloadTargetCallback& callback) override;
-+  bool ShouldOpenDownload(
-+      content::DownloadItem* download,
-+      const content::DownloadOpenDelayedCallback& callback) override;
-+  void GetNextId(const content::DownloadIdCallback& callback) override;
-+
-+ private:
-+  content::DownloadManager* download_manager_;
-+  base::WeakPtrFactory<ElectronDownloadManagerDelegate> weak_ptr_factory_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(ElectronDownloadManagerDelegate);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_ELECTRON_DOWNLOAD_MANAGER_DELEGATE_H_
-added in remote
-  their  100644 82543988ea9c4531a96bc3919cabc7d761e69989 electron/browser/electron_javascript_dialog_manager.cc
-@@ -0,0 +1,35 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/electron_javascript_dialog_manager.h"
-+
-+#include <string>
-+
-+#include "base/strings/utf_string_conversions.h"
-+
-+namespace electron {
-+
-+void ElectronJavaScriptDialogManager::RunJavaScriptDialog(
-+    content::WebContents* web_contents,
-+    const GURL& origin_url,
-+    const std::string& accept_lang,
-+    content::JavaScriptMessageType javascript_message_type,
-+    const base::string16& message_text,
-+    const base::string16& default_prompt_text,
-+    const DialogClosedCallback& callback,
-+    bool* did_suppress_message) {
-+  callback.Run(false, base::string16());
-+}
-+
-+void ElectronJavaScriptDialogManager::RunBeforeUnloadDialog(
-+    content::WebContents* web_contents,
-+    const base::string16& message_text,
-+    bool is_reload,
-+    const DialogClosedCallback& callback) {
-+  bool prevent_reload = message_text.empty() ||
-+                        message_text == base::ASCIIToUTF16("false");
-+  callback.Run(!prevent_reload, message_text);
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 eb9cc39cc638ca6e81ce2e6036f5b467b5b9d784 electron/browser/electron_javascript_dialog_manager.h
-@@ -0,0 +1,38 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_ELECTRON_JAVASCRIPT_DIALOG_MANAGER_H_
-+#define ELECTRON_BROWSER_ELECTRON_JAVASCRIPT_DIALOG_MANAGER_H_
-+
-+#include <string>
-+
-+#include "content/public/browser/javascript_dialog_manager.h"
-+
-+namespace electron {
-+
-+class ElectronJavaScriptDialogManager : public content::JavaScriptDialogManager {
-+ public:
-+  // content::JavaScriptDialogManager implementations.
-+  void RunJavaScriptDialog(
-+      content::WebContents* web_contents,
-+      const GURL& origin_url,
-+      const std::string& accept_lang,
-+      content::JavaScriptMessageType javascript_message_type,
-+      const base::string16& message_text,
-+      const base::string16& default_prompt_text,
-+      const DialogClosedCallback& callback,
-+      bool* did_suppress_message) override;
-+  void RunBeforeUnloadDialog(
-+      content::WebContents* web_contents,
-+      const base::string16& message_text,
-+      bool is_reload,
-+      const DialogClosedCallback& callback) override;
-+  void CancelActiveAndPendingDialogs(
-+      content::WebContents* web_contents) override {}
-+  void ResetDialogState(content::WebContents* web_contents) override {};
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_ELECTRON_JAVASCRIPT_DIALOG_MANAGER_H_
-added in remote
-  their  100644 46292e86419110f0e7e791ae2f8ff89ff0a0eae3 electron/browser/electron_permission_manager.cc
-@@ -0,0 +1,154 @@
-+// Copyright (c) 2016 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/electron_permission_manager.h"
-+
-+#include <vector>
-+
-+#include "electron/browser/web_contents_preferences.h"
-+#include "content/public/browser/child_process_security_policy.h"
-+#include "content/public/browser/permission_type.h"
-+#include "content/public/browser/render_frame_host.h"
-+#include "content/public/browser/render_process_host.h"
-+#include "content/public/browser/render_view_host.h"
-+#include "content/public/browser/web_contents.h"
-+
-+namespace electron {
-+
-+namespace {
-+
-+bool WebContentsDestroyed(int process_id) {
-+  auto contents =
-+      WebContentsPreferences::GetWebContentsFromProcessID(process_id);
-+  if (!contents)
-+    return true;
-+  return contents->IsBeingDestroyed();
-+}
-+
-+}  // namespace
-+
-+ElectronPermissionManager::ElectronPermissionManager()
-+    : request_id_(0) {
-+}
-+
-+ElectronPermissionManager::~ElectronPermissionManager() {
-+}
-+
-+void ElectronPermissionManager::SetPermissionRequestHandler(
-+    const RequestHandler& handler) {
-+  if (handler.is_null() && !pending_requests_.empty()) {
-+    for (const auto& request : pending_requests_) {
-+      if (!WebContentsDestroyed(request.second.render_process_id))
-+        request.second.callback.Run(content::PERMISSION_STATUS_DENIED);
-+    }
-+    pending_requests_.clear();
-+  }
-+  request_handler_ = handler;
-+}
-+
-+int ElectronPermissionManager::RequestPermission(
-+    content::PermissionType permission,
-+    content::RenderFrameHost* render_frame_host,
-+    const GURL& requesting_origin,
-+    bool user_gesture,
-+    const ResponseCallback& response_callback) {
-+  int process_id = render_frame_host->GetProcess()->GetID();
-+
-+  if (permission == content::PermissionType::MIDI_SYSEX) {
-+    content::ChildProcessSecurityPolicy::GetInstance()->
-+        GrantSendMidiSysExMessage(process_id);
-+  }
-+
-+  if (!request_handler_.is_null()) {
-+    auto web_contents =
-+        content::WebContents::FromRenderFrameHost(render_frame_host);
-+    ++request_id_;
-+    auto callback = base::Bind(&ElectronPermissionManager::OnPermissionResponse,
-+                               base::Unretained(this),
-+                               request_id_,
-+                               requesting_origin,
-+                               response_callback);
-+    pending_requests_[request_id_] = { process_id, callback };
-+    request_handler_.Run(web_contents, permission, callback);
-+    return request_id_;
-+  }
-+
-+  response_callback.Run(content::PERMISSION_STATUS_GRANTED);
-+  return kNoPendingOperation;
-+}
-+
-+int ElectronPermissionManager::RequestPermissions(
-+    const std::vector<content::PermissionType>& permissions,
-+    content::RenderFrameHost* render_frame_host,
-+    const GURL& requesting_origin,
-+    bool user_gesture,
-+    const base::Callback<void(
-+    const std::vector<content::PermissionStatus>&)>& callback) {
-+  // FIXME(zcbenz): Just ignore multiple permissions request for now.
-+  std::vector<content::PermissionStatus> permissionStatuses;
-+  for (auto permission : permissions) {
-+    if (permission == content::PermissionType::MIDI_SYSEX) {
-+      content::ChildProcessSecurityPolicy::GetInstance()->
-+          GrantSendMidiSysExMessage(render_frame_host->GetProcess()->GetID());
-+    }
-+    permissionStatuses.push_back(content::PERMISSION_STATUS_GRANTED);
-+  }
-+  callback.Run(permissionStatuses);
-+  return kNoPendingOperation;
-+}
-+
-+void ElectronPermissionManager::OnPermissionResponse(
-+    int request_id,
-+    const GURL& origin,
-+    const ResponseCallback& callback,
-+    content::PermissionStatus status) {
-+  auto request = pending_requests_.find(request_id);
-+  if (request != pending_requests_.end()) {
-+    if (!WebContentsDestroyed(request->second.render_process_id))
-+      callback.Run(status);
-+    pending_requests_.erase(request);
-+  }
-+}
-+
-+void ElectronPermissionManager::CancelPermissionRequest(int request_id) {
-+  auto request = pending_requests_.find(request_id);
-+  if (request != pending_requests_.end()) {
-+    if (!WebContentsDestroyed(request->second.render_process_id))
-+      request->second.callback.Run(content::PERMISSION_STATUS_DENIED);
-+    pending_requests_.erase(request);
-+  }
-+}
-+
-+void ElectronPermissionManager::ResetPermission(
-+    content::PermissionType permission,
-+    const GURL& requesting_origin,
-+    const GURL& embedding_origin) {
-+}
-+
-+content::PermissionStatus ElectronPermissionManager::GetPermissionStatus(
-+    content::PermissionType permission,
-+    const GURL& requesting_origin,
-+    const GURL& embedding_origin) {
-+  return content::PERMISSION_STATUS_GRANTED;
-+}
-+
-+void ElectronPermissionManager::RegisterPermissionUsage(
-+    content::PermissionType permission,
-+    const GURL& requesting_origin,
-+    const GURL& embedding_origin) {
-+}
-+
-+int ElectronPermissionManager::SubscribePermissionStatusChange(
-+    content::PermissionType permission,
-+    const GURL& requesting_origin,
-+    const GURL& embedding_origin,
-+    const ResponseCallback& callback) {
-+  return -1;
-+}
-+
-+void ElectronPermissionManager::UnsubscribePermissionStatusChange(
-+    int subscription_id) {
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 4f7fc605966790033025c1e0bdb4e17a51583be8 electron/browser/electron_permission_manager.h
-@@ -0,0 +1,92 @@
-+// Copyright (c) 2016 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_ELECTRON_PERMISSION_MANAGER_H_
-+#define ELECTRON_BROWSER_ELECTRON_PERMISSION_MANAGER_H_
-+
-+#include <map>
-+#include <vector>
-+
-+#include "base/callback.h"
-+#include "content/public/browser/permission_manager.h"
-+
-+namespace content {
-+class WebContents;
-+}
-+
-+namespace electron {
-+
-+class ElectronPermissionManager : public content::PermissionManager {
-+ public:
-+  ElectronPermissionManager();
-+  ~ElectronPermissionManager() override;
-+
-+  using ResponseCallback =
-+      base::Callback<void(content::PermissionStatus)>;
-+  using RequestHandler =
-+      base::Callback<void(content::WebContents*,
-+                          content::PermissionType,
-+                          const ResponseCallback&)>;
-+
-+  // Handler to dispatch permission requests in JS.
-+  void SetPermissionRequestHandler(const RequestHandler& handler);
-+
-+  // content::PermissionManager:
-+  int RequestPermission(
-+      content::PermissionType permission,
-+      content::RenderFrameHost* render_frame_host,
-+      const GURL& requesting_origin,
-+      bool user_gesture,
-+      const ResponseCallback& callback) override;
-+  int RequestPermissions(
-+      const std::vector<content::PermissionType>& permissions,
-+      content::RenderFrameHost* render_frame_host,
-+      const GURL& requesting_origin,
-+      bool user_gesture,
-+      const base::Callback<void(
-+      const std::vector<content::PermissionStatus>&)>& callback) override;
-+
-+ protected:
-+  void OnPermissionResponse(int request_id,
-+                            const GURL& url,
-+                            const ResponseCallback& callback,
-+                            content::PermissionStatus status);
-+
-+  // content::PermissionManager:
-+  void CancelPermissionRequest(int request_id) override;
-+  void ResetPermission(content::PermissionType permission,
-+                       const GURL& requesting_origin,
-+                       const GURL& embedding_origin) override;
-+  content::PermissionStatus GetPermissionStatus(
-+      content::PermissionType permission,
-+      const GURL& requesting_origin,
-+      const GURL& embedding_origin) override;
-+  void RegisterPermissionUsage(content::PermissionType permission,
-+                               const GURL& requesting_origin,
-+                               const GURL& embedding_origin) override;
-+  int SubscribePermissionStatusChange(
-+      content::PermissionType permission,
-+      const GURL& requesting_origin,
-+      const GURL& embedding_origin,
-+      const base::Callback<void(content::PermissionStatus)>& callback) override;
-+  void UnsubscribePermissionStatusChange(int subscription_id) override;
-+
-+ private:
-+  struct RequestInfo {
-+    int render_process_id;
-+    ResponseCallback callback;
-+  };
-+
-+  RequestHandler request_handler_;
-+
-+  std::map<int, RequestInfo> pending_requests_;
-+
-+  int request_id_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(ElectronPermissionManager);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_ELECTRON_PERMISSION_MANAGER_H_
-added in remote
-  their  100644 a7c7edf5322b260e90c137fb006bcb4de240bd53 electron/browser/electron_quota_permission_context.cc
-@@ -0,0 +1,24 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/electron_quota_permission_context.h"
-+
-+#include "storage/common/quota/quota_types.h"
-+
-+namespace electron {
-+
-+ElectronQuotaPermissionContext::ElectronQuotaPermissionContext() {
-+}
-+
-+ElectronQuotaPermissionContext::~ElectronQuotaPermissionContext() {
-+}
-+
-+void ElectronQuotaPermissionContext::RequestQuotaPermission(
-+    const content::StorageQuotaParams& params,
-+    int render_process_id,
-+    const PermissionCallback& callback) {
-+  callback.Run(response::QUOTA_PERMISSION_RESPONSE_ALLOW);
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 b38d69d1af1986c2a53851d120b953be13c8dd61 electron/browser/electron_quota_permission_context.h
-@@ -0,0 +1,31 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_ELECTRON_QUOTA_PERMISSION_CONTEXT_H_
-+#define ELECTRON_BROWSER_ELECTRON_QUOTA_PERMISSION_CONTEXT_H_
-+
-+#include "content/public/browser/quota_permission_context.h"
-+
-+namespace electron {
-+
-+class ElectronQuotaPermissionContext : public content::QuotaPermissionContext {
-+ public:
-+  typedef content::QuotaPermissionContext::QuotaPermissionResponse response;
-+
-+  ElectronQuotaPermissionContext();
-+  virtual ~ElectronQuotaPermissionContext();
-+
-+  // content::QuotaPermissionContext:
-+  void RequestQuotaPermission(
-+      const content::StorageQuotaParams& params,
-+      int render_process_id,
-+      const PermissionCallback& callback) override;
-+
-+ private:
-+  DISALLOW_COPY_AND_ASSIGN(ElectronQuotaPermissionContext);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_ELECTRON_QUOTA_PERMISSION_CONTEXT_H_
-added in remote
-  their  100644 9b91733f3f7875c89c513b363d3d626e0945645c electron/browser/electron_resource_dispatcher_host_delegate.cc
-@@ -0,0 +1,41 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/electron_resource_dispatcher_host_delegate.h"
-+
-+#include "electron/browser/login_handler.h"
-+#include "electron/common/platform_util.h"
-+#include "content/public/browser/browser_thread.h"
-+#include "net/base/escape.h"
-+#include "url/gurl.h"
-+
-+using content::BrowserThread;
-+
-+namespace electron {
-+
-+ElectronResourceDispatcherHostDelegate::ElectronResourceDispatcherHostDelegate() {
-+}
-+
-+bool ElectronResourceDispatcherHostDelegate::HandleExternalProtocol(
-+    const GURL& url,
-+    int child_id,
-+    const content::ResourceRequestInfo::WebContentsGetter&,
-+    bool is_main_frame,
-+    ui::PageTransition transition,
-+    bool has_user_gesture) {
-+  GURL escaped_url(net::EscapeExternalHandlerValue(url.spec()));
-+  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-+      base::Bind(
-+          base::IgnoreResult(platform_util::OpenExternal), escaped_url, true));
-+  return true;
-+}
-+
-+content::ResourceDispatcherHostLoginDelegate*
-+ElectronResourceDispatcherHostDelegate::CreateLoginDelegate(
-+    net::AuthChallengeInfo* auth_info,
-+    net::URLRequest* request) {
-+  return new LoginHandler(auth_info, request);
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 07082d7e4265a8e6933010be157896e1c4dc04cd electron/browser/electron_resource_dispatcher_host_delegate.h
-@@ -0,0 +1,32 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_ELECTRON_RESOURCE_DISPATCHER_HOST_DELEGATE_H_
-+#define ELECTRON_BROWSER_ELECTRON_RESOURCE_DISPATCHER_HOST_DELEGATE_H_
-+
-+#include "content/public/browser/resource_dispatcher_host_delegate.h"
-+
-+namespace electron {
-+
-+class ElectronResourceDispatcherHostDelegate
-+    : public content::ResourceDispatcherHostDelegate {
-+ public:
-+  ElectronResourceDispatcherHostDelegate();
-+
-+  // content::ResourceDispatcherHostDelegate:
-+  bool HandleExternalProtocol(
-+      const GURL& url,
-+      int child_id,
-+      const content::ResourceRequestInfo::WebContentsGetter&,
-+      bool is_main_frame,
-+      ui::PageTransition transition,
-+      bool has_user_gesture) override;
-+  content::ResourceDispatcherHostLoginDelegate* CreateLoginDelegate(
-+      net::AuthChallengeInfo* auth_info,
-+      net::URLRequest* request) override;
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_ELECTRON_RESOURCE_DISPATCHER_HOST_DELEGATE_H_
-added in remote
-  their  100644 7973568f1d455b06563238d17228d1ec73397693 electron/browser/electron_speech_recognition_manager_delegate.cc
-@@ -0,0 +1,74 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/electron_speech_recognition_manager_delegate.h"
-+
-+#include <string>
-+
-+#include "base/callback.h"
-+
-+namespace electron {
-+
-+ElectronSpeechRecognitionManagerDelegate::ElectronSpeechRecognitionManagerDelegate() {
-+}
-+
-+ElectronSpeechRecognitionManagerDelegate::~ElectronSpeechRecognitionManagerDelegate() {
-+}
-+
-+void ElectronSpeechRecognitionManagerDelegate::OnRecognitionStart(int session_id) {
-+}
-+
-+void ElectronSpeechRecognitionManagerDelegate::OnAudioStart(int session_id) {
-+}
-+
-+void ElectronSpeechRecognitionManagerDelegate::OnEnvironmentEstimationComplete(
-+    int session_id) {
-+}
-+
-+void ElectronSpeechRecognitionManagerDelegate::OnSoundStart(int session_id) {
-+}
-+
-+void ElectronSpeechRecognitionManagerDelegate::OnSoundEnd(int session_id) {
-+}
-+
-+void ElectronSpeechRecognitionManagerDelegate::OnAudioEnd(int session_id) {
-+}
-+
-+void ElectronSpeechRecognitionManagerDelegate::OnRecognitionEnd(int session_id) {
-+}
-+
-+void ElectronSpeechRecognitionManagerDelegate::OnRecognitionResults(
-+    int session_id, const content::SpeechRecognitionResults& result) {
-+}
-+
-+void ElectronSpeechRecognitionManagerDelegate::OnRecognitionError(
-+    int session_id, const content::SpeechRecognitionError& error) {
-+}
-+
-+void ElectronSpeechRecognitionManagerDelegate::OnAudioLevelsChange(
-+    int session_id, float volume, float noise_volume) {
-+}
-+
-+void ElectronSpeechRecognitionManagerDelegate::GetDiagnosticInformation(
-+    bool* can_report_metrics, std::string* hardware_info) {
-+  *can_report_metrics = false;
-+}
-+
-+void ElectronSpeechRecognitionManagerDelegate::CheckRecognitionIsAllowed(
-+    int session_id,
-+    base::Callback<void(bool ask_user, bool is_allowed)> callback) {
-+  callback.Run(true, true);
-+}
-+
-+content::SpeechRecognitionEventListener*
-+ElectronSpeechRecognitionManagerDelegate::GetEventListener() {
-+  return this;
-+}
-+
-+bool ElectronSpeechRecognitionManagerDelegate::FilterProfanities(
-+    int render_process_id) {
-+  return false;
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 f1a67941b2d8fae87934f949a3b7f41ea156806e electron/browser/electron_speech_recognition_manager_delegate.h
-@@ -0,0 +1,53 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_ELECTRON_SPEECH_RECOGNITION_MANAGER_DELEGATE_H_
-+#define ELECTRON_BROWSER_ELECTRON_SPEECH_RECOGNITION_MANAGER_DELEGATE_H_
-+
-+#include <string>
-+
-+#include "base/macros.h"
-+#include "content/public/browser/speech_recognition_event_listener.h"
-+#include "content/public/browser/speech_recognition_manager_delegate.h"
-+
-+namespace electron {
-+
-+class ElectronSpeechRecognitionManagerDelegate
-+    : public content::SpeechRecognitionManagerDelegate,
-+      public content::SpeechRecognitionEventListener {
-+ public:
-+  ElectronSpeechRecognitionManagerDelegate();
-+  virtual ~ElectronSpeechRecognitionManagerDelegate();
-+
-+  // content::SpeechRecognitionEventListener:
-+  void OnRecognitionStart(int session_id) override;
-+  void OnAudioStart(int session_id) override;
-+  void OnEnvironmentEstimationComplete(int session_id) override;
-+  void OnSoundStart(int session_id) override;
-+  void OnSoundEnd(int session_id) override;
-+  void OnAudioEnd(int session_id) override;
-+  void OnRecognitionEnd(int session_id) override;
-+  void OnRecognitionResults(
-+      int session_id, const content::SpeechRecognitionResults& result) override;
-+  void OnRecognitionError(
-+      int session_id, const content::SpeechRecognitionError& error) override;
-+  void OnAudioLevelsChange(int session_id, float volume,
-+                           float noise_volume) override;
-+
-+  // content::SpeechRecognitionManagerDelegate:
-+  void GetDiagnosticInformation(bool* can_report_metrics,
-+                                std::string* hardware_info) override;
-+  void CheckRecognitionIsAllowed(
-+      int session_id,
-+      base::Callback<void(bool ask_user, bool is_allowed)> callback) override;
-+  content::SpeechRecognitionEventListener* GetEventListener() override;
-+  bool FilterProfanities(int render_process_id) override;
-+
-+ private:
-+  DISALLOW_COPY_AND_ASSIGN(ElectronSpeechRecognitionManagerDelegate);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_ELECTRON_SPEECH_RECOGNITION_MANAGER_DELEGATE_H_
-added in remote
-  their  100644 e07b39e19c83d8fdc92187119b6dd0166f7902fd electron/browser/javascript_environment.cc
-@@ -0,0 +1,45 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/javascript_environment.h"
-+
-+#include <string>
-+
-+#include "base/command_line.h"
-+#include "content/public/common/content_switches.h"
-+#include "gin/array_buffer.h"
-+#include "gin/v8_initializer.h"
-+
-+namespace electron {
-+
-+JavascriptEnvironment::JavascriptEnvironment()
-+    : initialized_(Initialize()),
-+      isolate_(isolate_holder_.isolate()),
-+      isolate_scope_(isolate_),
-+      locker_(isolate_),
-+      handle_scope_(isolate_),
-+      context_(isolate_, v8::Context::New(isolate_)),
-+      context_scope_(v8::Local<v8::Context>::New(isolate_, context_)) {
-+}
-+
-+bool JavascriptEnvironment::Initialize() {
-+  auto cmd = base::CommandLine::ForCurrentProcess();
-+  if (cmd->HasSwitch("debug-brk")) {
-+    // Need to be called before v8::Initialize().
-+    const char expose_debug_as[] = "--expose_debug_as=v8debug";
-+    v8::V8::SetFlagsFromString(expose_debug_as, sizeof(expose_debug_as) - 1);
-+  }
-+
-+  // --js-flags.
-+  std::string js_flags = cmd->GetSwitchValueASCII(switches::kJavaScriptFlags);
-+  if (!js_flags.empty())
-+    v8::V8::SetFlagsFromString(js_flags.c_str(), js_flags.size());
-+
-+  gin::IsolateHolder::Initialize(gin::IsolateHolder::kNonStrictMode,
-+                                 gin::IsolateHolder::kStableV8Extras,
-+                                 gin::ArrayBufferAllocator::SharedInstance());
-+  return true;
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 72ae43e8e94040ca4e20d7169488152123e4226e electron/browser/javascript_environment.h
-@@ -0,0 +1,39 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_JAVASCRIPT_ENVIRONMENT_H_
-+#define ELECTRON_BROWSER_JAVASCRIPT_ENVIRONMENT_H_
-+
-+#include "base/macros.h"
-+#include "gin/public/isolate_holder.h"
-+
-+namespace electron {
-+
-+class JavascriptEnvironment {
-+ public:
-+  JavascriptEnvironment();
-+
-+  v8::Isolate* isolate() const { return isolate_; }
-+  v8::Local<v8::Context> context() const {
-+    return v8::Local<v8::Context>::New(isolate_, context_);
-+  }
-+
-+ private:
-+  bool Initialize();
-+
-+  bool initialized_;
-+  gin::IsolateHolder isolate_holder_;
-+  v8::Isolate* isolate_;
-+  v8::Isolate::Scope isolate_scope_;
-+  v8::Locker locker_;
-+  v8::HandleScope handle_scope_;
-+  v8::UniquePersistent<v8::Context> context_;
-+  v8::Context::Scope context_scope_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(JavascriptEnvironment);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_JAVASCRIPT_ENVIRONMENT_H_
-added in remote
-  their  100644 a1780da9aa67e1e861e57117428bc62edc7ccbf7 electron/browser/login_handler.cc
-@@ -0,0 +1,109 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/login_handler.h"
-+
-+#include "electron/browser/browser.h"
-+#include "content/public/browser/browser_thread.h"
-+#include "content/public/browser/render_frame_host.h"
-+#include "content/public/browser/resource_dispatcher_host.h"
-+#include "content/public/browser/resource_request_info.h"
-+#include "content/public/browser/web_contents.h"
-+#include "net/base/auth.h"
-+#include "net/url_request/url_request.h"
-+
-+using content::BrowserThread;
-+
-+namespace electron {
-+
-+namespace {
-+
-+// Helper to remove the ref from an net::URLRequest to the LoginHandler.
-+// Should only be called from the IO thread, since it accesses an
-+// net::URLRequest.
-+void ResetLoginHandlerForRequest(net::URLRequest* request) {
-+  content::ResourceDispatcherHost::Get()->ClearLoginDelegateForRequest(request);
-+}
-+
-+}  // namespace
-+
-+LoginHandler::LoginHandler(net::AuthChallengeInfo* auth_info,
-+                           net::URLRequest* request)
-+    : handled_auth_(false),
-+      auth_info_(auth_info),
-+      request_(request),
-+      render_process_host_id_(0),
-+      render_frame_id_(0) {
-+  content::ResourceRequestInfo::ForRequest(request_)->GetAssociatedRenderFrame(
-+      &render_process_host_id_,  &render_frame_id_);
-+  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-+                          base::Bind(&Browser::RequestLogin,
-+                                     base::Unretained(Browser::Get()),
-+                                     make_scoped_refptr(this)));
-+}
-+
-+LoginHandler::~LoginHandler() {
-+}
-+
-+content::WebContents* LoginHandler::GetWebContents() const {
-+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-+
-+  content::RenderFrameHost* rfh = content::RenderFrameHost::FromID(
-+      render_process_host_id_, render_frame_id_);
-+  return content::WebContents::FromRenderFrameHost(rfh);
-+}
-+
-+void LoginHandler::Login(const base::string16& username,
-+                         const base::string16& password) {
-+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-+  if (TestAndSetAuthHandled())
-+    return;
-+  BrowserThread::PostTask(
-+      BrowserThread::IO, FROM_HERE,
-+      base::Bind(&LoginHandler::DoLogin, this, username, password));
-+}
-+
-+void LoginHandler::CancelAuth() {
-+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-+  if (TestAndSetAuthHandled())
-+    return;
-+  BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
-+                          base::Bind(&LoginHandler::DoCancelAuth, this));
-+}
-+
-+void LoginHandler::OnRequestCancelled() {
-+  TestAndSetAuthHandled();
-+  request_ = nullptr;
-+}
-+
-+// Marks authentication as handled and returns the previous handled state.
-+bool LoginHandler::TestAndSetAuthHandled() {
-+  base::AutoLock lock(handled_auth_lock_);
-+  bool was_handled = handled_auth_;
-+  handled_auth_ = true;
-+  return was_handled;
-+}
-+
-+void LoginHandler::DoCancelAuth() {
-+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-+
-+  if (request_) {
-+    request_->CancelAuth();
-+    // Verify that CancelAuth doesn't destroy the request via our delegate.
-+    DCHECK(request_ != nullptr);
-+    ResetLoginHandlerForRequest(request_);
-+  }
-+}
-+
-+void LoginHandler::DoLogin(const base::string16& username,
-+                           const base::string16& password) {
-+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-+
-+  if (request_) {
-+    request_->SetAuth(net::AuthCredentials(username, password));
-+    ResetLoginHandlerForRequest(request_);
-+  }
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 52b94dfeb2a9d57305b418d722d0ed047be45237 electron/browser/login_handler.h
-@@ -0,0 +1,76 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_LOGIN_HANDLER_H_
-+#define ELECTRON_BROWSER_LOGIN_HANDLER_H_
-+
-+#include "base/strings/string16.h"
-+#include "base/synchronization/lock.h"
-+#include "content/public/browser/resource_dispatcher_host_login_delegate.h"
-+
-+namespace content {
-+class WebContents;
-+}
-+
-+namespace net {
-+class AuthChallengeInfo;
-+class URLRequest;
-+}
-+
-+namespace electron {
-+
-+// Handles the HTTP basic auth, must be created on IO thread.
-+class LoginHandler : public content::ResourceDispatcherHostLoginDelegate {
-+ public:
-+  LoginHandler(net::AuthChallengeInfo* auth_info, net::URLRequest* request);
-+
-+  // Returns the WebContents associated with the request, must be called on UI
-+  // thread.
-+  content::WebContents* GetWebContents() const;
-+
-+  // The auth is cancelled, must be called on UI thread.
-+  void CancelAuth();
-+
-+  // Login with |username| and |password|, must be called on UI thread.
-+  void Login(const base::string16& username, const base::string16& password);
-+
-+  const net::AuthChallengeInfo* auth_info() const { return auth_info_.get(); }
-+  const net::URLRequest* request() const { return request_; }
-+
-+ protected:
-+  ~LoginHandler() override;
-+
-+  // content::ResourceDispatcherHostLoginDelegate:
-+  void OnRequestCancelled() override;
-+
-+ private:
-+  // Must be called on IO thread.
-+  void DoCancelAuth();
-+  void DoLogin(const base::string16& username, const base::string16& password);
-+
-+  // Marks authentication as handled and returns the previous handled
-+  // state.
-+  bool TestAndSetAuthHandled();
-+
-+  // True if we've handled auth (Login or CancelAuth has been called).
-+  bool handled_auth_;
-+  mutable base::Lock handled_auth_lock_;
-+
-+  // Who/where/what asked for the authentication.
-+  scoped_refptr<net::AuthChallengeInfo> auth_info_;
-+
-+  // The request that wants login data.
-+  // This should only be accessed on the IO loop.
-+  net::URLRequest* request_;
-+
-+  // Cached from the net::URLRequest, in case it goes NULL on us.
-+  int render_process_host_id_;
-+  int render_frame_id_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(LoginHandler);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_LOGIN_HANDLER_H_
-added in remote
-  their  100644 aca9e8dae77b70efb1ef70adf45fc9c83fdb6e92 electron/browser/mac/electron_application.h
-@@ -0,0 +1,21 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#import "base/mac/scoped_sending_event.h"
-+
-+@interface ElectronApplication : NSApplication<CrAppProtocol,
-+                                           CrAppControlProtocol> {
-+ @private
-+  BOOL handlingSendEvent_;
-+}
-+
-++ (ElectronApplication*)sharedApplication;
-+
-+// CrAppProtocol:
-+- (BOOL)isHandlingSendEvent;
-+
-+// CrAppControlProtocol:
-+- (void)setHandlingSendEvent:(BOOL)handlingSendEvent;
-+
-+@end
-added in remote
-  their  100644 682030da3936d9740808da49b453471483d34148 electron/browser/mac/electron_application.mm
-@@ -0,0 +1,74 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#import "electron/browser/mac/electron_application.h"
-+
-+#include "electron/browser/browser.h"
-+#include "base/auto_reset.h"
-+#include "base/strings/sys_string_conversions.h"
-+#include "content/public/browser/browser_accessibility_state.h"
-+
-+@implementation ElectronApplication
-+
-++ (ElectronApplication*)sharedApplication {
-+  return (ElectronApplication*)[super sharedApplication];
-+}
-+
-+- (BOOL)isHandlingSendEvent {
-+  return handlingSendEvent_;
-+}
-+
-+- (void)sendEvent:(NSEvent*)event {
-+  base::AutoReset<BOOL> scoper(&handlingSendEvent_, YES);
-+  [super sendEvent:event];
-+}
-+
-+- (void)setHandlingSendEvent:(BOOL)handlingSendEvent {
-+  handlingSendEvent_ = handlingSendEvent;
-+}
-+
-+- (void)awakeFromNib {
-+  [[NSAppleEventManager sharedAppleEventManager]
-+      setEventHandler:self
-+          andSelector:@selector(handleURLEvent:withReplyEvent:)
-+        forEventClass:kInternetEventClass
-+           andEventID:kAEGetURL];
-+}
-+
-+- (void)handleURLEvent:(NSAppleEventDescriptor*)event
-+        withReplyEvent:(NSAppleEventDescriptor*)replyEvent {
-+  NSString* url = [
-+      [event paramDescriptorForKeyword:keyDirectObject] stringValue];
-+  electron::Browser::Get()->OpenURL(base::SysNSStringToUTF8(url));
-+}
-+
-+- (bool)voiceOverEnabled {
-+  NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-+  [defaults addSuiteNamed:@"com.apple.universalaccess"];
-+  [defaults synchronize];
-+
-+  return [defaults boolForKey:@"voiceOverOnOffKey"];
-+}
-+
-+- (void)accessibilitySetValue:(id)value forAttribute:(NSString *)attribute {
-+  // Undocumented attribute that VoiceOver happens to set while running.
-+  // Chromium uses this too, even though it's not exactly right.
-+  if ([attribute isEqualToString:@"AXEnhancedUserInterface"]) {
-+    bool enableAccessibility = ([self voiceOverEnabled] && [value boolValue]);
-+    [self updateAccessibilityEnabled:enableAccessibility];
-+  }
-+  return [super accessibilitySetValue:value forAttribute:attribute];
-+}
-+
-+- (void)updateAccessibilityEnabled:(BOOL)enabled {
-+  auto ax_state = content::BrowserAccessibilityState::GetInstance();
-+
-+  if (enabled) {
-+    ax_state->OnScreenReaderDetected();
-+  } else {
-+    ax_state->DisableAccessibility();
-+  }
-+}
-+
-+@end
-added in remote
-  their  100644 2a3e265f059d245b77b40eaec11905c1a1e3f683 electron/browser/mac/electron_application_delegate.h
-@@ -0,0 +1,19 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#import <Cocoa/Cocoa.h>
-+
-+#import "electron/browser/ui/cocoa/electron_menu_controller.h"
-+
-+@interface ElectronApplicationDelegate : NSObject<NSApplicationDelegate> {
-+ @private
-+  base::scoped_nsobject<ElectronMenuController> menu_controller_;
-+}
-+
-+- (id)init;
-+
-+// Sets the menu that will be returned in "applicationDockMenu:".
-+- (void)setApplicationDockMenu:(ui::MenuModel*)model;
-+
-+@end
-added in remote
-  their  100644 5d266386635714ed48619c98c16d1ae2674b5dab electron/browser/mac/electron_application_delegate.mm
-@@ -0,0 +1,69 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#import "electron/browser/mac/electron_application_delegate.h"
-+
-+#import "electron/browser/mac/electron_application.h"
-+#include "electron/browser/browser.h"
-+#include "base/strings/sys_string_conversions.h"
-+
-+@implementation ElectronApplicationDelegate
-+
-+- (id)init {
-+  self = [super init];
-+  menu_controller_.reset([[ElectronMenuController alloc] init]);
-+  return self;
-+}
-+
-+- (void)setApplicationDockMenu:(ui::MenuModel*)model {
-+  [menu_controller_ populateWithModel:model];
-+}
-+
-+- (void)applicationWillFinishLaunching:(NSNotification*)notify {
-+  // Don't add the "Enter Full Screen" menu item automatically.
-+  [[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"NSFullScreenMenuItemEverywhere"];
-+
-+  // Add observer to monitor the system's Dark Mode theme.
-+  [[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(platformThemeChanged:) name:@"AppleInterfaceThemeChangedNotification" object:nil];
-+
-+  electron::Browser::Get()->WillFinishLaunching();
-+}
-+
-+- (void)applicationDidFinishLaunching:(NSNotification*)notify {
-+  electron::Browser::Get()->DidFinishLaunching();
-+}
-+
-+- (NSMenu*)applicationDockMenu:(NSApplication*)sender {
-+  return [menu_controller_ menu];
-+}
-+
-+- (BOOL)application:(NSApplication*)sender
-+           openFile:(NSString*)filename {
-+  std::string filename_str(base::SysNSStringToUTF8(filename));
-+  return electron::Browser::Get()->OpenFile(filename_str) ? YES : NO;
-+}
-+
-+- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication*)sender {
-+  electron::Browser* browser = electron::Browser::Get();
-+  if (browser->is_quiting()) {
-+    return NSTerminateNow;
-+  } else {
-+    // System started termination.
-+    electron::Browser::Get()->Quit();
-+    return NSTerminateCancel;
-+  }
-+}
-+
-+- (BOOL)applicationShouldHandleReopen:(NSApplication*)theApplication
-+                    hasVisibleWindows:(BOOL)flag {
-+  electron::Browser* browser = electron::Browser::Get();
-+  browser->Activate(static_cast<bool>(flag));
-+  return flag;
-+}
-+
-+- (void)platformThemeChanged:(NSNotification *)notify {
-+  electron::Browser::Get()->PlatformThemeChanged();
-+}
-+
-+@end
-added in remote
-  their  100644 f7ba2f3d888d933266bc62eea033ded94a477065 electron/browser/native_window.cc
-@@ -0,0 +1,620 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/native_window.h"
-+
-+#include <string>
-+#include <utility>
-+#include <vector>
-+
-+#include "electron/browser/electron_browser_context.h"
-+#include "electron/browser/electron_browser_main_parts.h"
-+#include "electron/browser/window_list.h"
-+#include "electron/common/api/api_messages.h"
-+#include "electron/common/native_mate_converters/image_converter.h"
-+#include "electron/common/native_mate_converters/file_path_converter.h"
-+#include "electron/common/options_switches.h"
-+#include "base/files/file_util.h"
-+#include "base/json/json_writer.h"
-+#include "base/prefs/pref_service.h"
-+#include "base/message_loop/message_loop.h"
-+#include "base/strings/utf_string_conversions.h"
-+#include "brightray/browser/inspectable_web_contents.h"
-+#include "brightray/browser/inspectable_web_contents_view.h"
-+#include "content/browser/renderer_host/render_widget_host_impl.h"
-+#include "content/public/browser/navigation_entry.h"
-+#include "content/public/browser/plugin_service.h"
-+#include "content/public/browser/render_process_host.h"
-+#include "content/public/browser/render_view_host.h"
-+#include "content/public/browser/render_widget_host.h"
-+#include "content/public/browser/render_widget_host_view.h"
-+#include "content/public/common/content_switches.h"
-+#include "ipc/ipc_message_macros.h"
-+#include "native_mate/dictionary.h"
-+#include "ui/gfx/codec/png_codec.h"
-+#include "ui/gfx/geometry/point.h"
-+#include "ui/gfx/geometry/rect.h"
-+#include "ui/gfx/geometry/size.h"
-+#include "ui/gfx/geometry/size_conversions.h"
-+#include "ui/gfx/screen.h"
-+#include "ui/gl/gpu_switching_manager.h"
-+
-+DEFINE_WEB_CONTENTS_USER_DATA_KEY(electron::NativeWindowRelay);
-+
-+namespace electron {
-+
-+NativeWindow::NativeWindow(
-+    brightray::InspectableWebContents* inspectable_web_contents,
-+    const mate::Dictionary& options)
-+    : content::WebContentsObserver(inspectable_web_contents->GetWebContents()),
-+      has_frame_(true),
-+      force_using_draggable_region_(false),
-+      transparent_(false),
-+      enable_larger_than_screen_(false),
-+      is_closed_(false),
-+      has_dialog_attached_(false),
-+      aspect_ratio_(0.0),
-+      inspectable_web_contents_(inspectable_web_contents),
-+      weak_factory_(this) {
-+  options.Get(options::kFrame, &has_frame_);
-+  options.Get(options::kTransparent, &transparent_);
-+  options.Get(options::kEnableLargerThanScreen, &enable_larger_than_screen_);
-+
-+  // Tell the content module to initialize renderer widget with transparent
-+  // mode.
-+  ui::GpuSwitchingManager::SetTransparent(transparent_);
-+
-+  // Read icon before window is created.
-+  options.Get(options::kIcon, &icon_);
-+
-+  WindowList::AddWindow(this);
-+}
-+
-+NativeWindow::~NativeWindow() {
-+  // It's possible that the windows gets destroyed before it's closed, in that
-+  // case we need to ensure the OnWindowClosed message is still notified.
-+  NotifyWindowClosed();
-+}
-+
-+// static
-+NativeWindow* NativeWindow::FromWebContents(
-+    content::WebContents* web_contents) {
-+  WindowList& window_list = *WindowList::GetInstance();
-+  for (NativeWindow* window : window_list) {
-+    if (window->web_contents() == web_contents)
-+      return window;
-+  }
-+  return nullptr;
-+}
-+
-+void NativeWindow::InitFromOptions(const mate::Dictionary& options) {
-+  // Setup window from options.
-+  int x = -1, y = -1;
-+  bool center;
-+  if (options.Get(options::kX, &x) && options.Get(options::kY, &y)) {
-+    SetPosition(gfx::Point(x, y));
-+  } else if (options.Get(options::kCenter, &center) && center) {
-+    Center();
-+  }
-+  // On Linux and Window we may already have maximum size defined.
-+  extensions::SizeConstraints size_constraints(GetContentSizeConstraints());
-+  int min_height = 0, min_width = 0;
-+  if (options.Get(options::kMinHeight, &min_height) |
-+      options.Get(options::kMinWidth, &min_width)) {
-+    size_constraints.set_minimum_size(gfx::Size(min_width, min_height));
-+  }
-+  int max_height = INT_MAX, max_width = INT_MAX;
-+  if (options.Get(options::kMaxHeight, &max_height) |
-+      options.Get(options::kMaxWidth, &max_width)) {
-+    size_constraints.set_maximum_size(gfx::Size(max_width, max_height));
-+  }
-+  bool use_content_size = false;
-+  options.Get(options::kUseContentSize, &use_content_size);
-+  if (use_content_size) {
-+    SetContentSizeConstraints(size_constraints);
-+  } else {
-+    SetSizeConstraints(size_constraints);
-+  }
-+#if defined(USE_X11)
-+  bool resizable;
-+  if (options.Get(options::kResizable, &resizable)) {
-+    SetResizable(resizable);
-+  }
-+#endif
-+#if defined(OS_WIN) || defined(USE_X11)
-+  bool closable;
-+  if (options.Get(options::kClosable, &closable)) {
-+    SetClosable(closable);
-+  }
-+#endif
-+  bool movable;
-+  if (options.Get(options::kMovable, &movable)) {
-+    SetMovable(movable);
-+  }
-+  bool has_shadow;
-+  if (options.Get(options::kHasShadow, &has_shadow)) {
-+    SetHasShadow(has_shadow);
-+  }
-+  bool top;
-+  if (options.Get(options::kAlwaysOnTop, &top) && top) {
-+    SetAlwaysOnTop(true);
-+  }
-+  // Disable fullscreen button if 'fullscreen' is specified to false.
-+  bool fullscreenable = true;
-+  bool fullscreen = false;
-+  if (options.Get(options::kFullscreen, &fullscreen) && !fullscreen)
-+    fullscreenable = false;
-+  // Overriden by 'fullscreenable'.
-+  options.Get(options::kFullScreenable, &fullscreenable);
-+  SetFullScreenable(fullscreenable);
-+  if (fullscreen) {
-+    SetFullScreen(true);
-+  }
-+  bool skip;
-+  if (options.Get(options::kSkipTaskbar, &skip) && skip) {
-+    SetSkipTaskbar(skip);
-+  }
-+  bool kiosk;
-+  if (options.Get(options::kKiosk, &kiosk) && kiosk) {
-+    SetKiosk(kiosk);
-+  }
-+  std::string color;
-+  if (options.Get(options::kBackgroundColor, &color)) {
-+    SetBackgroundColor(color);
-+  }
-+  std::string title("Electron");
-+  options.Get(options::kTitle, &title);
-+  SetTitle(title);
-+
-+  // Then show it.
-+  bool show = true;
-+  options.Get(options::kShow, &show);
-+  if (show)
-+    Show();
-+}
-+
-+void NativeWindow::SetSize(const gfx::Size& size, bool animate) {
-+  SetBounds(gfx::Rect(GetPosition(), size), animate);
-+}
-+
-+gfx::Size NativeWindow::GetSize() {
-+  return GetBounds().size();
-+}
-+
-+void NativeWindow::SetPosition(const gfx::Point& position, bool animate) {
-+  SetBounds(gfx::Rect(position, GetSize()), animate);
-+}
-+
-+gfx::Point NativeWindow::GetPosition() {
-+  return GetBounds().origin();
-+}
-+
-+void NativeWindow::SetContentSize(const gfx::Size& size, bool animate) {
-+  SetSize(ContentSizeToWindowSize(size), animate);
-+}
-+
-+gfx::Size NativeWindow::GetContentSize() {
-+  return WindowSizeToContentSize(GetSize());
-+}
-+
-+void NativeWindow::SetSizeConstraints(
-+    const extensions::SizeConstraints& window_constraints) {
-+  extensions::SizeConstraints content_constraints;
-+  if (window_constraints.HasMaximumSize())
-+    content_constraints.set_maximum_size(
-+        WindowSizeToContentSize(window_constraints.GetMaximumSize()));
-+  if (window_constraints.HasMinimumSize())
-+    content_constraints.set_minimum_size(
-+        WindowSizeToContentSize(window_constraints.GetMinimumSize()));
-+  SetContentSizeConstraints(content_constraints);
-+}
-+
-+extensions::SizeConstraints NativeWindow::GetSizeConstraints() {
-+  extensions::SizeConstraints content_constraints = GetContentSizeConstraints();
-+  extensions::SizeConstraints window_constraints;
-+  if (content_constraints.HasMaximumSize())
-+    window_constraints.set_maximum_size(
-+        ContentSizeToWindowSize(content_constraints.GetMaximumSize()));
-+  if (content_constraints.HasMinimumSize())
-+    window_constraints.set_minimum_size(
-+        ContentSizeToWindowSize(content_constraints.GetMinimumSize()));
-+  return window_constraints;
-+}
-+
-+void NativeWindow::SetContentSizeConstraints(
-+    const extensions::SizeConstraints& size_constraints) {
-+  size_constraints_ = size_constraints;
-+}
-+
-+extensions::SizeConstraints NativeWindow::GetContentSizeConstraints() {
-+  return size_constraints_;
-+}
-+
-+void NativeWindow::SetMinimumSize(const gfx::Size& size) {
-+  extensions::SizeConstraints size_constraints;
-+  size_constraints.set_minimum_size(size);
-+  SetSizeConstraints(size_constraints);
-+}
-+
-+gfx::Size NativeWindow::GetMinimumSize() {
-+  return GetSizeConstraints().GetMinimumSize();
-+}
-+
-+void NativeWindow::SetMaximumSize(const gfx::Size& size) {
-+  extensions::SizeConstraints size_constraints;
-+  size_constraints.set_maximum_size(size);
-+  SetSizeConstraints(size_constraints);
-+}
-+
-+gfx::Size NativeWindow::GetMaximumSize() {
-+  return GetSizeConstraints().GetMaximumSize();
-+}
-+
-+void NativeWindow::SetRepresentedFilename(const std::string& filename) {
-+}
-+
-+std::string NativeWindow::GetRepresentedFilename() {
-+  return "";
-+}
-+
-+void NativeWindow::SetDocumentEdited(bool edited) {
-+}
-+
-+bool NativeWindow::IsDocumentEdited() {
-+  return false;
-+}
-+
-+void NativeWindow::SetIgnoreMouseEvents(bool ignore) {
-+}
-+
-+void NativeWindow::SetMenu(ui::MenuModel* menu) {
-+}
-+
-+bool NativeWindow::HasModalDialog() {
-+  return has_dialog_attached_;
-+}
-+
-+void NativeWindow::FocusOnWebView() {
-+  web_contents()->GetRenderViewHost()->GetWidget()->Focus();
-+}
-+
-+void NativeWindow::BlurWebView() {
-+  web_contents()->GetRenderViewHost()->GetWidget()->Blur();
-+}
-+
-+bool NativeWindow::IsWebViewFocused() {
-+  auto host_view = web_contents()->GetRenderViewHost()->GetWidget()->GetView();
-+  return host_view && host_view->HasFocus();
-+}
-+
-+void NativeWindow::CapturePage(const gfx::Rect& rect,
-+                               const CapturePageCallback& callback) {
-+  const auto view = web_contents()->GetRenderWidgetHostView();
-+  const auto host = view ? view->GetRenderWidgetHost() : nullptr;
-+  if (!view || !host) {
-+    callback.Run(SkBitmap());
-+    return;
-+  }
-+
-+  // Capture full page if user doesn't specify a |rect|.
-+  const gfx::Size view_size = rect.IsEmpty() ? view->GetViewBounds().size() :
-+                                               rect.size();
-+
-+  // By default, the requested bitmap size is the view size in screen
-+  // coordinates.  However, if there's more pixel detail available on the
-+  // current system, increase the requested bitmap size to capture it all.
-+  gfx::Size bitmap_size = view_size;
-+  const gfx::NativeView native_view = view->GetNativeView();
-+  gfx::Screen* const screen = gfx::Screen::GetScreenFor(native_view);
-+  const float scale =
-+      screen->GetDisplayNearestWindow(native_view).device_scale_factor();
-+  if (scale > 1.0f)
-+    bitmap_size = gfx::ScaleToCeiledSize(view_size, scale);
-+
-+  host->CopyFromBackingStore(
-+      gfx::Rect(rect.origin(), view_size),
-+      bitmap_size,
-+      base::Bind(&NativeWindow::OnCapturePageDone,
-+                 weak_factory_.GetWeakPtr(),
-+                 callback),
-+      kBGRA_8888_SkColorType);
-+}
-+
-+void NativeWindow::ShowDefinitionForSelection() {
-+  NOTIMPLEMENTED();
-+}
-+
-+void NativeWindow::SetAutoHideMenuBar(bool auto_hide) {
-+}
-+
-+bool NativeWindow::IsMenuBarAutoHide() {
-+  return false;
-+}
-+
-+void NativeWindow::SetMenuBarVisibility(bool visible) {
-+}
-+
-+bool NativeWindow::IsMenuBarVisible() {
-+  return true;
-+}
-+
-+double NativeWindow::GetAspectRatio() {
-+  return aspect_ratio_;
-+}
-+
-+gfx::Size NativeWindow::GetAspectRatioExtraSize() {
-+  return aspect_ratio_extraSize_;
-+}
-+
-+void NativeWindow::SetAspectRatio(double aspect_ratio,
-+                                  const gfx::Size& extra_size) {
-+  aspect_ratio_ = aspect_ratio;
-+  aspect_ratio_extraSize_ = extra_size;
-+}
-+
-+void NativeWindow::RequestToClosePage() {
-+  bool prevent_default = false;
-+  FOR_EACH_OBSERVER(NativeWindowObserver,
-+                    observers_,
-+                    WillCloseWindow(&prevent_default));
-+  if (prevent_default) {
-+    WindowList::WindowCloseCancelled(this);
-+    return;
-+  }
-+
-+  // Assume the window is not responding if it doesn't cancel the close and is
-+  // not closed in 5s, in this way we can quickly show the unresponsive
-+  // dialog when the window is busy executing some script withouth waiting for
-+  // the unresponsive timeout.
-+  if (window_unresposive_closure_.IsCancelled())
-+    ScheduleUnresponsiveEvent(5000);
-+
-+  if (web_contents()->NeedToFireBeforeUnload())
-+    web_contents()->DispatchBeforeUnload(false);
-+  else
-+    web_contents()->Close();
-+}
-+
-+void NativeWindow::CloseContents(content::WebContents* source) {
-+  if (!inspectable_web_contents_)
-+    return;
-+
-+  inspectable_web_contents_->GetView()->SetDelegate(nullptr);
-+  inspectable_web_contents_ = nullptr;
-+  Observe(nullptr);
-+
-+  // When the web contents is gone, close the window immediately, but the
-+  // memory will not be freed until you call delete.
-+  // In this way, it would be safe to manage windows via smart pointers. If you
-+  // want to free memory when the window is closed, you can do deleting by
-+  // overriding the OnWindowClosed method in the observer.
-+  CloseImmediately();
-+
-+  // Do not sent "unresponsive" event after window is closed.
-+  window_unresposive_closure_.Cancel();
-+}
-+
-+void NativeWindow::RendererUnresponsive(content::WebContents* source) {
-+  // Schedule the unresponsive shortly later, since we may receive the
-+  // responsive event soon. This could happen after the whole application had
-+  // blocked for a while.
-+  // Also notice that when closing this event would be ignored because we have
-+  // explicity started a close timeout counter. This is on purpose because we
-+  // don't want the unresponsive event to be sent too early when user is closing
-+  // the window.
-+  ScheduleUnresponsiveEvent(50);
-+}
-+
-+void NativeWindow::RendererResponsive(content::WebContents* source) {
-+  window_unresposive_closure_.Cancel();
-+  FOR_EACH_OBSERVER(NativeWindowObserver, observers_, OnRendererResponsive());
-+}
-+
-+void NativeWindow::NotifyWindowClosed() {
-+  if (is_closed_)
-+    return;
-+
-+  WindowList::RemoveWindow(this);
-+
-+  is_closed_ = true;
-+  FOR_EACH_OBSERVER(NativeWindowObserver, observers_, OnWindowClosed());
-+}
-+
-+void NativeWindow::NotifyWindowBlur() {
-+  FOR_EACH_OBSERVER(NativeWindowObserver, observers_, OnWindowBlur());
-+}
-+
-+void NativeWindow::NotifyWindowFocus() {
-+  FOR_EACH_OBSERVER(NativeWindowObserver, observers_, OnWindowFocus());
-+}
-+
-+void NativeWindow::NotifyWindowShow() {
-+  FOR_EACH_OBSERVER(NativeWindowObserver, observers_, OnWindowShow());
-+}
-+
-+void NativeWindow::NotifyWindowHide() {
-+  FOR_EACH_OBSERVER(NativeWindowObserver, observers_, OnWindowHide());
-+}
-+
-+void NativeWindow::NotifyWindowMaximize() {
-+  FOR_EACH_OBSERVER(NativeWindowObserver, observers_, OnWindowMaximize());
-+}
-+
-+void NativeWindow::NotifyWindowUnmaximize() {
-+  FOR_EACH_OBSERVER(NativeWindowObserver, observers_, OnWindowUnmaximize());
-+}
-+
-+void NativeWindow::NotifyWindowMinimize() {
-+  FOR_EACH_OBSERVER(NativeWindowObserver, observers_, OnWindowMinimize());
-+}
-+
-+void NativeWindow::NotifyWindowRestore() {
-+  FOR_EACH_OBSERVER(NativeWindowObserver, observers_, OnWindowRestore());
-+}
-+
-+void NativeWindow::NotifyWindowResize() {
-+  FOR_EACH_OBSERVER(NativeWindowObserver, observers_, OnWindowResize());
-+}
-+
-+void NativeWindow::NotifyWindowMove() {
-+  FOR_EACH_OBSERVER(NativeWindowObserver, observers_, OnWindowMove());
-+}
-+
-+void NativeWindow::NotifyWindowMoved() {
-+  FOR_EACH_OBSERVER(NativeWindowObserver, observers_, OnWindowMoved());
-+}
-+
-+void NativeWindow::NotifyWindowEnterFullScreen() {
-+  FOR_EACH_OBSERVER(NativeWindowObserver, observers_,
-+                    OnWindowEnterFullScreen());
-+}
-+
-+void NativeWindow::NotifyWindowScrollTouchBegin() {
-+  FOR_EACH_OBSERVER(NativeWindowObserver, observers_,
-+                    OnWindowScrollTouchBegin());
-+}
-+
-+void NativeWindow::NotifyWindowScrollTouchEnd() {
-+  FOR_EACH_OBSERVER(NativeWindowObserver, observers_,
-+                    OnWindowScrollTouchEnd());
-+}
-+
-+void NativeWindow::NotifyWindowSwipe(const std::string& direction) {
-+  FOR_EACH_OBSERVER(NativeWindowObserver, observers_,
-+                    OnWindowSwipe(direction));
-+}
-+
-+void NativeWindow::NotifyWindowLeaveFullScreen() {
-+  FOR_EACH_OBSERVER(NativeWindowObserver, observers_,
-+                    OnWindowLeaveFullScreen());
-+}
-+
-+void NativeWindow::NotifyWindowEnterHtmlFullScreen() {
-+  FOR_EACH_OBSERVER(NativeWindowObserver, observers_,
-+                    OnWindowEnterHtmlFullScreen());
-+}
-+
-+void NativeWindow::NotifyWindowLeaveHtmlFullScreen() {
-+  FOR_EACH_OBSERVER(NativeWindowObserver, observers_,
-+                    OnWindowLeaveHtmlFullScreen());
-+}
-+
-+void NativeWindow::NotifyWindowExecuteWindowsCommand(
-+    const std::string& command) {
-+  FOR_EACH_OBSERVER(NativeWindowObserver, observers_,
-+                    OnExecuteWindowsCommand(command));
-+}
-+
-+#if defined(OS_WIN)
-+void NativeWindow::NotifyWindowMessage(
-+    UINT message, WPARAM w_param, LPARAM l_param) {
-+  FOR_EACH_OBSERVER(NativeWindowObserver, observers_,
-+                    OnWindowMessage(message, w_param, l_param));
-+}
-+#endif
-+
-+scoped_ptr<SkRegion> NativeWindow::DraggableRegionsToSkRegion(
-+    const std::vector<DraggableRegion>& regions) {
-+  scoped_ptr<SkRegion> sk_region(new SkRegion);
-+  for (const DraggableRegion& region : regions) {
-+    sk_region->op(
-+        region.bounds.x(),
-+        region.bounds.y(),
-+        region.bounds.right(),
-+        region.bounds.bottom(),
-+        region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op);
-+  }
-+  return sk_region;
-+}
-+
-+void NativeWindow::RenderViewCreated(
-+    content::RenderViewHost* render_view_host) {
-+  if (!transparent_)
-+    return;
-+
-+  content::RenderWidgetHostImpl* impl = content::RenderWidgetHostImpl::FromID(
-+      render_view_host->GetProcess()->GetID(),
-+      render_view_host->GetRoutingID());
-+  if (impl)
-+    impl->SetBackgroundOpaque(false);
-+}
-+
-+void NativeWindow::BeforeUnloadDialogCancelled() {
-+  WindowList::WindowCloseCancelled(this);
-+
-+  // Cancel unresponsive event when window close is cancelled.
-+  window_unresposive_closure_.Cancel();
-+}
-+
-+bool NativeWindow::OnMessageReceived(const IPC::Message& message) {
-+  bool handled = true;
-+  IPC_BEGIN_MESSAGE_MAP(NativeWindow, message)
-+    IPC_MESSAGE_HANDLER(ElectronViewHostMsg_UpdateDraggableRegions,
-+                        UpdateDraggableRegions)
-+    IPC_MESSAGE_UNHANDLED(handled = false)
-+  IPC_END_MESSAGE_MAP()
-+
-+  return handled;
-+}
-+
-+void NativeWindow::UpdateDraggableRegions(
-+    const std::vector<DraggableRegion>& regions) {
-+  // Draggable region is not supported for non-frameless window.
-+  if (has_frame_ && !force_using_draggable_region_)
-+    return;
-+  draggable_region_ = DraggableRegionsToSkRegion(regions);
-+}
-+
-+void NativeWindow::ScheduleUnresponsiveEvent(int ms) {
-+  if (!window_unresposive_closure_.IsCancelled())
-+    return;
-+
-+  window_unresposive_closure_.Reset(
-+      base::Bind(&NativeWindow::NotifyWindowUnresponsive,
-+                 weak_factory_.GetWeakPtr()));
-+  base::MessageLoop::current()->PostDelayedTask(
-+      FROM_HERE,
-+      window_unresposive_closure_.callback(),
-+      base::TimeDelta::FromMilliseconds(ms));
-+}
-+
-+void NativeWindow::NotifyWindowUnresponsive() {
-+  window_unresposive_closure_.Cancel();
-+
-+  if (!is_closed_ && !HasModalDialog())
-+    FOR_EACH_OBSERVER(NativeWindowObserver,
-+                      observers_,
-+                      OnRendererUnresponsive());
-+}
-+
-+void NativeWindow::OnCapturePageDone(const CapturePageCallback& callback,
-+                                     const SkBitmap& bitmap,
-+                                     content::ReadbackResponse response) {
-+  callback.Run(bitmap);
-+}
-+
-+SkColor NativeWindow::ParseHexColor(const std::string& name) {
-+  auto color = name.substr(1);
-+  unsigned length = color.size();
-+  SkColor result = (length != 8 ? 0xFF000000 : 0x00000000);
-+  unsigned value = 0;
-+  if (length != 3 && length != 6 && length != 8)
-+    return result;
-+  for (unsigned i = 0; i < length; ++i) {
-+    if (!base::IsHexDigit(color[i]))
-+      return result;
-+    value <<= 4;
-+    value |= (color[i] < 'A' ? color[i] - '0' : (color[i] - 'A' + 10) & 0xF);
-+  }
-+  if (length == 6 || length == 8) {
-+    result |= value;
-+    return result;
-+  }
-+  result |= (value & 0xF00) << 12 | (value & 0xF00) << 8
-+      | (value & 0xF0) << 8 | (value & 0xF0) << 4
-+      | (value & 0xF) << 4 | (value & 0xF);
-+  return result;
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 ff46845fef38028b3c3280e7409c94965c769853 electron/browser/native_window.h
-@@ -0,0 +1,364 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_NATIVE_WINDOW_H_
-+#define ELECTRON_BROWSER_NATIVE_WINDOW_H_
-+
-+#include <map>
-+#include <string>
-+#include <vector>
-+
-+#include "electron/browser/native_window_observer.h"
-+#include "electron/browser/ui/accelerator_util.h"
-+#include "base/cancelable_callback.h"
-+#include "base/memory/scoped_ptr.h"
-+#include "base/memory/weak_ptr.h"
-+#include "base/observer_list.h"
-+#include "base/supports_user_data.h"
-+#include "content/public/browser/readback_types.h"
-+#include "content/public/browser/web_contents_observer.h"
-+#include "content/public/browser/web_contents_user_data.h"
-+#include "extensions/browser/app_window/size_constraints.h"
-+#include "ui/gfx/image/image.h"
-+#include "ui/gfx/image/image_skia.h"
-+
-+class SkRegion;
-+
-+namespace brightray {
-+class InspectableWebContents;
-+}
-+
-+namespace content {
-+struct NativeWebKeyboardEvent;
-+}
-+
-+namespace gfx {
-+class Point;
-+class Rect;
-+class Size;
-+}
-+
-+namespace mate {
-+class Dictionary;
-+}
-+
-+namespace ui {
-+class MenuModel;
-+}
-+
-+namespace electron {
-+
-+struct DraggableRegion;
-+
-+class NativeWindow : public base::SupportsUserData,
-+                     public content::WebContentsObserver {
-+ public:
-+  using CapturePageCallback = base::Callback<void(const SkBitmap& bitmap)>;
-+
-+  class DialogScope {
-+   public:
-+    explicit DialogScope(NativeWindow* window)
-+        : window_(window) {
-+      if (window_ != NULL)
-+        window_->set_has_dialog_attached(true);
-+    }
-+
-+    ~DialogScope() {
-+      if (window_ != NULL)
-+        window_->set_has_dialog_attached(false);
-+    }
-+
-+   private:
-+    NativeWindow* window_;
-+
-+    DISALLOW_COPY_AND_ASSIGN(DialogScope);
-+  };
-+
-+  virtual ~NativeWindow();
-+
-+  // Create window with existing WebContents, the caller is responsible for
-+  // managing the window's live.
-+  static NativeWindow* Create(
-+      brightray::InspectableWebContents* inspectable_web_contents,
-+      const mate::Dictionary& options);
-+
-+  // Find a window from its WebContents
-+  static NativeWindow* FromWebContents(content::WebContents* web_contents);
-+
-+  void InitFromOptions(const mate::Dictionary& options);
-+
-+  virtual void Close() = 0;
-+  virtual void CloseImmediately() = 0;
-+  virtual bool IsClosed() const { return is_closed_; }
-+  virtual void Focus(bool focus) = 0;
-+  virtual bool IsFocused() = 0;
-+  virtual void Show() = 0;
-+  virtual void ShowInactive() = 0;
-+  virtual void Hide() = 0;
-+  virtual bool IsVisible() = 0;
-+  virtual void Maximize() = 0;
-+  virtual void Unmaximize() = 0;
-+  virtual bool IsMaximized() = 0;
-+  virtual void Minimize() = 0;
-+  virtual void Restore() = 0;
-+  virtual bool IsMinimized() = 0;
-+  virtual void SetFullScreen(bool fullscreen) = 0;
-+  virtual bool IsFullscreen() const = 0;
-+  virtual void SetBounds(const gfx::Rect& bounds, bool animate = false) = 0;
-+  virtual gfx::Rect GetBounds() = 0;
-+  virtual void SetSize(const gfx::Size& size, bool animate = false);
-+  virtual gfx::Size GetSize();
-+  virtual void SetPosition(const gfx::Point& position, bool animate = false);
-+  virtual gfx::Point GetPosition();
-+  virtual void SetContentSize(const gfx::Size& size, bool animate = false);
-+  virtual gfx::Size GetContentSize();
-+  virtual void SetSizeConstraints(
-+      const extensions::SizeConstraints& size_constraints);
-+  virtual extensions::SizeConstraints GetSizeConstraints();
-+  virtual void SetContentSizeConstraints(
-+      const extensions::SizeConstraints& size_constraints);
-+  virtual extensions::SizeConstraints GetContentSizeConstraints();
-+  virtual void SetMinimumSize(const gfx::Size& size);
-+  virtual gfx::Size GetMinimumSize();
-+  virtual void SetMaximumSize(const gfx::Size& size);
-+  virtual gfx::Size GetMaximumSize();
-+  virtual void SetResizable(bool resizable) = 0;
-+  virtual bool IsResizable() = 0;
-+  virtual void SetMovable(bool movable) = 0;
-+  virtual bool IsMovable() = 0;
-+  virtual void SetMinimizable(bool minimizable) = 0;
-+  virtual bool IsMinimizable() = 0;
-+  virtual void SetMaximizable(bool maximizable) = 0;
-+  virtual bool IsMaximizable() = 0;
-+  virtual void SetFullScreenable(bool fullscreenable) = 0;
-+  virtual bool IsFullScreenable() = 0;
-+  virtual void SetClosable(bool closable) = 0;
-+  virtual bool IsClosable() = 0;
-+  virtual void SetAlwaysOnTop(bool top) = 0;
-+  virtual bool IsAlwaysOnTop() = 0;
-+  virtual void Center() = 0;
-+  virtual void SetTitle(const std::string& title) = 0;
-+  virtual std::string GetTitle() = 0;
-+  virtual void FlashFrame(bool flash) = 0;
-+  virtual void SetSkipTaskbar(bool skip) = 0;
-+  virtual void SetKiosk(bool kiosk) = 0;
-+  virtual bool IsKiosk() = 0;
-+  virtual void SetBackgroundColor(const std::string& color_name) = 0;
-+  virtual void SetHasShadow(bool has_shadow) = 0;
-+  virtual bool HasShadow() = 0;
-+  virtual void SetRepresentedFilename(const std::string& filename);
-+  virtual std::string GetRepresentedFilename();
-+  virtual void SetDocumentEdited(bool edited);
-+  virtual bool IsDocumentEdited();
-+  virtual void SetIgnoreMouseEvents(bool ignore);
-+  virtual void SetMenu(ui::MenuModel* menu);
-+  virtual bool HasModalDialog();
-+  virtual gfx::NativeWindow GetNativeWindow() = 0;
-+  virtual gfx::AcceleratedWidget GetAcceleratedWidget() = 0;
-+
-+  // Taskbar/Dock APIs.
-+  virtual void SetProgressBar(double progress) = 0;
-+  virtual void SetOverlayIcon(const gfx::Image& overlay,
-+                              const std::string& description) = 0;
-+
-+  // Workspace APIs.
-+  virtual void SetVisibleOnAllWorkspaces(bool visible) = 0;
-+  virtual bool IsVisibleOnAllWorkspaces() = 0;
-+
-+  // Webview APIs.
-+  virtual void FocusOnWebView();
-+  virtual void BlurWebView();
-+  virtual bool IsWebViewFocused();
-+
-+  // Captures the page with |rect|, |callback| would be called when capturing is
-+  // done.
-+  virtual void CapturePage(const gfx::Rect& rect,
-+                           const CapturePageCallback& callback);
-+
-+  // Show popup dictionary.
-+  virtual void ShowDefinitionForSelection();
-+
-+  // Toggle the menu bar.
-+  virtual void SetAutoHideMenuBar(bool auto_hide);
-+  virtual bool IsMenuBarAutoHide();
-+  virtual void SetMenuBarVisibility(bool visible);
-+  virtual bool IsMenuBarVisible();
-+
-+  // Set the aspect ratio when resizing window.
-+  double GetAspectRatio();
-+  gfx::Size GetAspectRatioExtraSize();
-+  void SetAspectRatio(double aspect_ratio, const gfx::Size& extra_size);
-+
-+  base::WeakPtr<NativeWindow> GetWeakPtr() {
-+    return weak_factory_.GetWeakPtr();
-+  }
-+
-+  // Requests the WebContents to close, can be cancelled by the page.
-+  virtual void RequestToClosePage();
-+
-+  // Methods called by the WebContents.
-+  virtual void CloseContents(content::WebContents* source);
-+  virtual void RendererUnresponsive(content::WebContents* source);
-+  virtual void RendererResponsive(content::WebContents* source);
-+  virtual void HandleKeyboardEvent(
-+      content::WebContents*,
-+      const content::NativeWebKeyboardEvent& event) {}
-+
-+  // Public API used by platform-dependent delegates and observers to send UI
-+  // related notifications.
-+  void NotifyWindowClosed();
-+  void NotifyWindowBlur();
-+  void NotifyWindowFocus();
-+  void NotifyWindowShow();
-+  void NotifyWindowHide();
-+  void NotifyWindowMaximize();
-+  void NotifyWindowUnmaximize();
-+  void NotifyWindowMinimize();
-+  void NotifyWindowRestore();
-+  void NotifyWindowMove();
-+  void NotifyWindowResize();
-+  void NotifyWindowMoved();
-+  void NotifyWindowScrollTouchBegin();
-+  void NotifyWindowScrollTouchEnd();
-+  void NotifyWindowSwipe(const std::string& direction);
-+  void NotifyWindowEnterFullScreen();
-+  void NotifyWindowLeaveFullScreen();
-+  void NotifyWindowEnterHtmlFullScreen();
-+  void NotifyWindowLeaveHtmlFullScreen();
-+  void NotifyWindowExecuteWindowsCommand(const std::string& command);
-+
-+  #if defined(OS_WIN)
-+  void NotifyWindowMessage(UINT message, WPARAM w_param, LPARAM l_param);
-+  #endif
-+
-+  void AddObserver(NativeWindowObserver* obs) {
-+    observers_.AddObserver(obs);
-+  }
-+  void RemoveObserver(NativeWindowObserver* obs) {
-+    observers_.RemoveObserver(obs);
-+  }
-+
-+  brightray::InspectableWebContents* inspectable_web_contents() const {
-+    return inspectable_web_contents_;
-+  }
-+
-+  bool has_frame() const { return has_frame_; }
-+  bool transparent() const { return transparent_; }
-+  SkRegion* draggable_region() const { return draggable_region_.get(); }
-+  bool enable_larger_than_screen() const { return enable_larger_than_screen_; }
-+  gfx::ImageSkia icon() const { return icon_; }
-+
-+  bool force_using_draggable_region() const {
-+    return force_using_draggable_region_;
-+  }
-+  void set_force_using_draggable_region(bool force) {
-+    force_using_draggable_region_ = true;
-+  }
-+
-+  void set_has_dialog_attached(bool has_dialog_attached) {
-+    has_dialog_attached_ = has_dialog_attached;
-+  }
-+
-+ protected:
-+  NativeWindow(brightray::InspectableWebContents* inspectable_web_contents,
-+               const mate::Dictionary& options);
-+
-+  // Convert draggable regions in raw format to SkRegion format. Caller is
-+  // responsible for deleting the returned SkRegion instance.
-+  scoped_ptr<SkRegion> DraggableRegionsToSkRegion(
-+      const std::vector<DraggableRegion>& regions);
-+
-+  // Converts between content size to window size.
-+  virtual gfx::Size ContentSizeToWindowSize(const gfx::Size& size) = 0;
-+  virtual gfx::Size WindowSizeToContentSize(const gfx::Size& size) = 0;
-+
-+  // Called when the window needs to update its draggable region.
-+  virtual void UpdateDraggableRegions(
-+      const std::vector<DraggableRegion>& regions);
-+
-+  // content::WebContentsObserver:
-+  void RenderViewCreated(content::RenderViewHost* render_view_host) override;
-+  void BeforeUnloadDialogCancelled() override;
-+  bool OnMessageReceived(const IPC::Message& message) override;
-+
-+  // Parse hex color like "#FFF" or "#EFEFEF"
-+  SkColor ParseHexColor(const std::string& name);
-+
-+ private:
-+  // Schedule a notification unresponsive event.
-+  void ScheduleUnresponsiveEvent(int ms);
-+
-+  // Dispatch unresponsive event to observers.
-+  void NotifyWindowUnresponsive();
-+
-+  // Called when CapturePage has done.
-+  void OnCapturePageDone(const CapturePageCallback& callback,
-+                         const SkBitmap& bitmap,
-+                         content::ReadbackResponse response);
-+
-+  // Whether window has standard frame.
-+  bool has_frame_;
-+
-+  // Force the window to be aware of draggable regions.
-+  bool force_using_draggable_region_;
-+
-+  // Whether window is transparent.
-+  bool transparent_;
-+
-+  // For custom drag, the whole window is non-draggable and the draggable region
-+  // has to been explicitly provided.
-+  scoped_ptr<SkRegion> draggable_region_;  // used in custom drag.
-+
-+  // Minimum and maximum size, stored as content size.
-+  extensions::SizeConstraints size_constraints_;
-+
-+  // Whether window can be resized larger than screen.
-+  bool enable_larger_than_screen_;
-+
-+  // Window icon.
-+  gfx::ImageSkia icon_;
-+
-+  // The windows has been closed.
-+  bool is_closed_;
-+
-+  // There is a dialog that has been attached to window.
-+  bool has_dialog_attached_;
-+
-+  // Closure that would be called when window is unresponsive when closing,
-+  // it should be cancelled when we can prove that the window is responsive.
-+  base::CancelableClosure window_unresposive_closure_;
-+
-+  // Used to maintain the aspect ratio of a view which is inside of the
-+  // content view.
-+  double aspect_ratio_;
-+  gfx::Size aspect_ratio_extraSize_;
-+
-+  // The page this window is viewing.
-+  brightray::InspectableWebContents* inspectable_web_contents_;
-+
-+  // Observers of this window.
-+  base::ObserverList<NativeWindowObserver> observers_;
-+
-+  base::WeakPtrFactory<NativeWindow> weak_factory_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(NativeWindow);
-+};
-+
-+// This class provides a hook to get a NativeWindow from a WebContents.
-+class NativeWindowRelay :
-+    public content::WebContentsUserData<NativeWindowRelay> {
-+ public:
-+  explicit NativeWindowRelay(base::WeakPtr<NativeWindow> window)
-+    : key(UserDataKey()), window(window) {}
-+
-+  void* key;
-+  base::WeakPtr<NativeWindow> window;
-+
-+ private:
-+  friend class content::WebContentsUserData<NativeWindow>;
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_NATIVE_WINDOW_H_
-added in remote
-  their  100644 04e2e6f0011cd87ce55b36add9ec0f85b95c4050 electron/browser/native_window_mac.h
-@@ -0,0 +1,152 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_NATIVE_WINDOW_MAC_H_
-+#define ELECTRON_BROWSER_NATIVE_WINDOW_MAC_H_
-+
-+#import <Cocoa/Cocoa.h>
-+
-+#include <string>
-+#include <vector>
-+
-+#include "base/mac/scoped_nsobject.h"
-+#include "electron/browser/native_window.h"
-+
-+@class ElectronNSWindow;
-+@class ElectronNSWindowDelegate;
-+@class FullSizeContentView;
-+
-+namespace electron {
-+
-+class NativeWindowMac : public NativeWindow {
-+ public:
-+  NativeWindowMac(brightray::InspectableWebContents* inspectable_web_contents,
-+                  const mate::Dictionary& options);
-+  ~NativeWindowMac() override;
-+
-+  // NativeWindow:
-+  void Close() override;
-+  void CloseImmediately() override;
-+  void Focus(bool focus) override;
-+  bool IsFocused() override;
-+  void Show() override;
-+  void ShowInactive() override;
-+  void Hide() override;
-+  bool IsVisible() override;
-+  void Maximize() override;
-+  void Unmaximize() override;
-+  bool IsMaximized() override;
-+  void Minimize() override;
-+  void Restore() override;
-+  bool IsMinimized() override;
-+  void SetFullScreen(bool fullscreen) override;
-+  bool IsFullscreen() const override;
-+  void SetBounds(const gfx::Rect& bounds, bool animate = false) override;
-+  gfx::Rect GetBounds() override;
-+  void SetContentSizeConstraints(
-+      const extensions::SizeConstraints& size_constraints) override;
-+  void SetResizable(bool resizable) override;
-+  bool IsResizable() override;
-+  void SetMovable(bool movable) override;
-+  bool IsMovable() override;
-+  void SetMinimizable(bool minimizable) override;
-+  bool IsMinimizable() override;
-+  void SetMaximizable(bool maximizable) override;
-+  bool IsMaximizable() override;
-+  void SetFullScreenable(bool fullscreenable) override;
-+  bool IsFullScreenable() override;
-+  void SetClosable(bool closable) override;
-+  bool IsClosable() override;
-+  void SetAlwaysOnTop(bool top) override;
-+  bool IsAlwaysOnTop() override;
-+  void Center() override;
-+  void SetTitle(const std::string& title) override;
-+  std::string GetTitle() override;
-+  void FlashFrame(bool flash) override;
-+  void SetSkipTaskbar(bool skip) override;
-+  void SetKiosk(bool kiosk) override;
-+  bool IsKiosk() override;
-+  void SetBackgroundColor(const std::string& color_name) override;
-+  void SetHasShadow(bool has_shadow) override;
-+  bool HasShadow() override;
-+  void SetRepresentedFilename(const std::string& filename) override;
-+  std::string GetRepresentedFilename() override;
-+  void SetDocumentEdited(bool edited) override;
-+  bool IsDocumentEdited() override;
-+  void SetIgnoreMouseEvents(bool ignore) override;
-+  bool HasModalDialog() override;
-+  gfx::NativeWindow GetNativeWindow() override;
-+  gfx::AcceleratedWidget GetAcceleratedWidget() override;
-+  void SetProgressBar(double progress) override;
-+  void SetOverlayIcon(const gfx::Image& overlay,
-+                      const std::string& description) override;
-+  void ShowDefinitionForSelection() override;
-+
-+  void SetVisibleOnAllWorkspaces(bool visible) override;
-+  bool IsVisibleOnAllWorkspaces() override;
-+
-+  // Refresh the DraggableRegion views.
-+  void UpdateDraggableRegionViews() {
-+    UpdateDraggableRegionViews(draggable_regions_);
-+  }
-+
-+  bool should_hide_native_toolbar_in_fullscreen() const {
-+    return should_hide_native_toolbar_in_fullscreen_;
-+  }
-+
-+ protected:
-+  // NativeWindow:
-+  void HandleKeyboardEvent(
-+      content::WebContents*,
-+      const content::NativeWebKeyboardEvent&) override;
-+
-+  // Return a vector of non-draggable regions that fill a window of size
-+  // |width| by |height|, but leave gaps where the window should be draggable.
-+  std::vector<gfx::Rect> CalculateNonDraggableRegions(
-+      const std::vector<DraggableRegion>& regions, int width, int height);
-+
-+ private:
-+  // NativeWindow:
-+  gfx::Size ContentSizeToWindowSize(const gfx::Size& size) override;
-+  gfx::Size WindowSizeToContentSize(const gfx::Size& size) override;
-+  void UpdateDraggableRegions(
-+      const std::vector<DraggableRegion>& regions) override;
-+
-+  void InstallView();
-+  void UninstallView();
-+
-+  // Install the drag view, which will cover the whole window and decides
-+  // whehter we can drag.
-+  void UpdateDraggableRegionViews(const std::vector<DraggableRegion>& regions);
-+
-+  // Set the attribute of NSWindow while work around a bug of zo0m button.
-+  void SetStyleMask(bool on, NSUInteger flag);
-+  void SetCollectionBehavior(bool on, NSUInteger flag);
-+
-+  base::scoped_nsobject<ElectronNSWindow> window_;
-+  base::scoped_nsobject<ElectronNSWindowDelegate> window_delegate_;
-+
-+  // Event monitor for scroll wheel event.
-+  id wheel_event_monitor_;
-+
-+  // The view that will fill the whole frameless window.
-+  base::scoped_nsobject<FullSizeContentView> content_view_;
-+
-+  std::vector<DraggableRegion> draggable_regions_;
-+
-+  bool is_kiosk_;
-+
-+  NSInteger attention_request_id_;  // identifier from requestUserAttention
-+
-+  // The presentation options before entering kiosk mode.
-+  NSApplicationPresentationOptions kiosk_options_;
-+
-+  bool should_hide_native_toolbar_in_fullscreen_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(NativeWindowMac);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_NATIVE_WINDOW_MAC_H_
-added in remote
-  their  100644 7fe60a43f141fd72ad518ee47c6b0fe94ac0227d electron/browser/native_window_mac.mm
-@@ -0,0 +1,1096 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/native_window_mac.h"
-+
-+#include <string>
-+
-+#include "electron/common/draggable_region.h"
-+#include "electron/common/options_switches.h"
-+#include "base/mac/mac_util.h"
-+#include "base/strings/sys_string_conversions.h"
-+#include "brightray/browser/inspectable_web_contents.h"
-+#include "brightray/browser/inspectable_web_contents_view.h"
-+#include "content/public/browser/browser_accessibility_state.h"
-+#include "content/public/browser/native_web_keyboard_event.h"
-+#include "content/public/browser/web_contents.h"
-+#include "content/public/browser/render_view_host.h"
-+#include "content/public/browser/render_widget_host_view.h"
-+#include "native_mate/dictionary.h"
-+#include "ui/gfx/skia_util.h"
-+
-+namespace {
-+
-+// Prevents window from resizing during the scope.
-+class ScopedDisableResize {
-+ public:
-+  ScopedDisableResize() { disable_resize_ = true; }
-+  ~ScopedDisableResize() { disable_resize_ = false; }
-+
-+  static bool IsResizeDisabled() { return disable_resize_; }
-+
-+ private:
-+  static bool disable_resize_;
-+};
-+
-+bool ScopedDisableResize::disable_resize_ = false;
-+
-+}  // namespace
-+
-+// This view always takes the size of its superview. It is intended to be used
-+// as a NSWindow's contentView.  It is needed because NSWindow's implementation
-+// explicitly resizes the contentView at inopportune times.
-+@interface FullSizeContentView : NSView
-+@end
-+
-+@implementation FullSizeContentView
-+
-+// This method is directly called by NSWindow during a window resize on OSX
-+// 10.10.0, beta 2. We must override it to prevent the content view from
-+// shrinking.
-+- (void)setFrameSize:(NSSize)size {
-+  if ([self superview])
-+    size = [[self superview] bounds].size;
-+  [super setFrameSize:size];
-+}
-+
-+// The contentView gets moved around during certain full-screen operations.
-+// This is less than ideal, and should eventually be removed.
-+- (void)viewDidMoveToSuperview {
-+  [self setFrame:[[self superview] bounds]];
-+}
-+
-+@end
-+
-+@interface ElectronNSWindowDelegate : NSObject<NSWindowDelegate> {
-+ @private
-+  electron::NativeWindowMac* shell_;
-+}
-+- (id)initWithShell:(electron::NativeWindowMac*)shell;
-+@end
-+
-+@implementation ElectronNSWindowDelegate
-+
-+- (id)initWithShell:(electron::NativeWindowMac*)shell {
-+  if ((self = [super init])) {
-+    shell_ = shell;
-+  }
-+  return self;
-+}
-+
-+- (void)windowDidChangeOcclusionState:(NSNotification *)notification {
-+  // notification.object is the window that changed its state.
-+  // It's safe to use self.window instead if you don't assign one delegate to many windows
-+  NSWindow *window = notification.object;
-+
-+  // check occlusion binary flag
-+  if (window.occlusionState & NSWindowOcclusionStateVisible)   {
-+     // The app is visible
-+     shell_->NotifyWindowShow();
-+   } else {
-+     // The app is not visible
-+     shell_->NotifyWindowHide();
-+   }
-+}
-+
-+- (void)windowDidBecomeMain:(NSNotification*)notification {
-+  content::WebContents* web_contents = shell_->web_contents();
-+  if (!web_contents)
-+    return;
-+
-+  web_contents->RestoreFocus();
-+
-+  content::RenderWidgetHostView* rwhv = web_contents->GetRenderWidgetHostView();
-+  if (rwhv)
-+    rwhv->SetActive(true);
-+
-+  shell_->NotifyWindowFocus();
-+}
-+
-+- (void)windowDidResignMain:(NSNotification*)notification {
-+  content::WebContents* web_contents = shell_->web_contents();
-+  if (!web_contents)
-+    return;
-+
-+  web_contents->StoreFocus();
-+
-+  content::RenderWidgetHostView* rwhv = web_contents->GetRenderWidgetHostView();
-+  if (rwhv)
-+    rwhv->SetActive(false);
-+
-+  shell_->NotifyWindowBlur();
-+}
-+
-+- (NSSize)windowWillResize:(NSWindow*)sender toSize:(NSSize)frameSize {
-+  NSSize newSize = frameSize;
-+  double aspectRatio = shell_->GetAspectRatio();
-+
-+  if (aspectRatio > 0.0) {
-+    gfx::Size windowSize = shell_->GetSize();
-+    gfx::Size contentSize = shell_->GetContentSize();
-+    gfx::Size extraSize = shell_->GetAspectRatioExtraSize();
-+
-+    double extraWidthPlusFrame =
-+        windowSize.width() - contentSize.width() + extraSize.width();
-+    double extraHeightPlusFrame =
-+        windowSize.height() - contentSize.height() + extraSize.height();
-+
-+    newSize.width =
-+        roundf((frameSize.height - extraHeightPlusFrame) * aspectRatio +
-+               extraWidthPlusFrame);
-+
-+    // If the new width is less than the frame size use it as the primary
-+    // constraint. This ensures that the value returned by this method will
-+    // never be larger than the users requested window size.
-+    if (newSize.width <= frameSize.width) {
-+      newSize.height =
-+          roundf((newSize.width - extraWidthPlusFrame) / aspectRatio +
-+                 extraHeightPlusFrame);
-+    } else {
-+      newSize.height =
-+          roundf((frameSize.width - extraWidthPlusFrame) / aspectRatio +
-+                 extraHeightPlusFrame);
-+      newSize.width =
-+          roundf((newSize.height - extraHeightPlusFrame) * aspectRatio +
-+                 extraWidthPlusFrame);
-+    }
-+  }
-+
-+  return newSize;
-+}
-+
-+- (void)windowDidResize:(NSNotification*)notification {
-+  shell_->UpdateDraggableRegionViews();
-+  shell_->NotifyWindowResize();
-+}
-+
-+- (void)windowDidMove:(NSNotification*)notification {
-+  // TODO(zcbenz): Remove the alias after figuring out a proper
-+  // way to disptach move.
-+  shell_->NotifyWindowMove();
-+  shell_->NotifyWindowMoved();
-+}
-+
-+- (void)windowDidMiniaturize:(NSNotification*)notification {
-+  shell_->NotifyWindowMinimize();
-+}
-+
-+- (void)windowDidDeminiaturize:(NSNotification*)notification {
-+  shell_->NotifyWindowRestore();
-+}
-+
-+- (BOOL)windowShouldZoom:(NSWindow*)window toFrame:(NSRect)newFrame {
-+  // Cocoa doen't have concept of maximize/unmaximize, so wee need to emulate
-+  // them by calculating size change when zooming.
-+  if (newFrame.size.width < [window frame].size.width ||
-+      newFrame.size.height < [window frame].size.height)
-+    shell_->NotifyWindowUnmaximize();
-+  else
-+    shell_->NotifyWindowMaximize();
-+  return YES;
-+}
-+
-+- (void)windowWillEnterFullScreen:(NSNotification*)notification {
-+  // Hide the native toolbar before entering fullscreen, so there is no visual
-+  // artifacts.
-+  if (shell_->should_hide_native_toolbar_in_fullscreen()) {
-+    NSWindow* window = shell_->GetNativeWindow();
-+    [window setToolbar:nil];
-+  }
-+}
-+
-+- (void)windowDidEnterFullScreen:(NSNotification*)notification {
-+  shell_->NotifyWindowEnterFullScreen();
-+
-+  // Restore the native toolbar immediately after entering fullscreen, if we do
-+  // this before leaving fullscreen, traffic light buttons will be jumping.
-+  if (shell_->should_hide_native_toolbar_in_fullscreen()) {
-+    NSWindow* window = shell_->GetNativeWindow();
-+    base::scoped_nsobject<NSToolbar> toolbar(
-+        [[NSToolbar alloc] initWithIdentifier:@"titlebarStylingToolbar"]);
-+    [toolbar setShowsBaselineSeparator:NO];
-+    [window setToolbar:toolbar];
-+  }
-+}
-+
-+- (void)windowDidExitFullScreen:(NSNotification*)notification {
-+  if (!shell_->has_frame()) {
-+    NSWindow* window = shell_->GetNativeWindow();
-+    [[window standardWindowButton:NSWindowFullScreenButton] setHidden:YES];
-+  }
-+
-+  shell_->NotifyWindowLeaveFullScreen();
-+}
-+
-+- (void)windowWillClose:(NSNotification*)notification {
-+  shell_->NotifyWindowClosed();
-+
-+  // Clears the delegate when window is going to be closed, since EL Capitan it
-+  // is possible that the methods of delegate would get called after the window
-+  // has been closed.
-+  [shell_->GetNativeWindow() setDelegate:nil];
-+}
-+
-+- (BOOL)windowShouldClose:(id)window {
-+  // When user tries to close the window by clicking the close button, we do
-+  // not close the window immediately, instead we try to close the web page
-+  // fisrt, and when the web page is closed the window will also be closed.
-+  shell_->RequestToClosePage();
-+  return NO;
-+}
-+
-+@end
-+
-+@interface ElectronNSWindow : NSWindow {
-+ @private
-+  electron::NativeWindowMac* shell_;
-+  bool enable_larger_than_screen_;
-+}
-+@property BOOL acceptsFirstMouse;
-+@property BOOL disableAutoHideCursor;
-+@property BOOL disableKeyOrMainWindow;
-+
-+- (void)setShell:(electron::NativeWindowMac*)shell;
-+- (void)setEnableLargerThanScreen:(bool)enable;
-+@end
-+
-+@implementation ElectronNSWindow
-+
-+- (void)setShell:(electron::NativeWindowMac*)shell {
-+  shell_ = shell;
-+}
-+
-+- (void)setEnableLargerThanScreen:(bool)enable {
-+  enable_larger_than_screen_ = enable;
-+}
-+
-+// NSWindow overrides.
-+
-+- (void)swipeWithEvent:(NSEvent *)event {
-+  if (event.deltaY == 1.0) {
-+    shell_->NotifyWindowSwipe("up");
-+  } else if (event.deltaX == -1.0) {
-+    shell_->NotifyWindowSwipe("right");
-+  } else if (event.deltaY == -1.0) {
-+    shell_->NotifyWindowSwipe("down");
-+  } else if (event.deltaX == 1.0) {
-+    shell_->NotifyWindowSwipe("left");
-+  }
-+}
-+
-+- (NSRect)constrainFrameRect:(NSRect)frameRect toScreen:(NSScreen*)screen {
-+  // Resizing is disabled.
-+  if (ScopedDisableResize::IsResizeDisabled())
-+    return [self frame];
-+
-+  // Enable the window to be larger than screen.
-+  if (enable_larger_than_screen_)
-+    return frameRect;
-+  else
-+    return [super constrainFrameRect:frameRect toScreen:screen];
-+}
-+
-+- (id)accessibilityAttributeValue:(NSString*)attribute {
-+  if (![attribute isEqualToString:@"AXChildren"])
-+    return [super accessibilityAttributeValue:attribute];
-+
-+  // Filter out objects that aren't the title bar buttons. This has the effect
-+  // of removing the window title, which VoiceOver already sees.
-+  // * when VoiceOver is disabled, this causes Cmd+C to be used for TTS but
-+  //   still leaves the buttons available in the accessibility tree.
-+  // * when VoiceOver is enabled, the full accessibility tree is used.
-+  // Without removing the title and with VO disabled, the TTS would always read
-+  // the window title instead of using Cmd+C to get the selected text.
-+  NSPredicate *predicate = [NSPredicate predicateWithFormat:
-+      @"(self isKindOfClass: %@) OR (self.className == %@)",
-+      [NSButtonCell class],
-+      @"RenderWidgetHostViewCocoa"];
-+
-+  NSArray *children = [super accessibilityAttributeValue:attribute];
-+  return [children filteredArrayUsingPredicate:predicate];
-+}
-+
-+- (BOOL)canBecomeMainWindow {
-+  return !self.disableKeyOrMainWindow;
-+}
-+
-+- (BOOL)canBecomeKeyWindow {
-+  return !self.disableKeyOrMainWindow;
-+}
-+
-+@end
-+
-+@interface ControlRegionView : NSView
-+@end
-+
-+@implementation ControlRegionView
-+
-+- (BOOL)mouseDownCanMoveWindow {
-+  return NO;
-+}
-+
-+- (NSView*)hitTest:(NSPoint)aPoint {
-+  return nil;
-+}
-+
-+@end
-+
-+@interface NSView (WebContentsView)
-+- (void)setMouseDownCanMoveWindow:(BOOL)can_move;
-+@end
-+
-+@interface ElectronProgressBar : NSProgressIndicator
-+@end
-+
-+@implementation ElectronProgressBar
-+
-+- (void)drawRect:(NSRect)dirtyRect {
-+  if (self.style != NSProgressIndicatorBarStyle)
-+    return;
-+  // Draw edges of rounded rect.
-+  NSRect rect = NSInsetRect([self bounds], 1.0, 1.0);
-+  CGFloat radius = rect.size.height / 2;
-+  NSBezierPath* bezier_path = [NSBezierPath bezierPathWithRoundedRect:rect xRadius:radius yRadius:radius];
-+  [bezier_path setLineWidth:2.0];
-+  [[NSColor grayColor] set];
-+  [bezier_path stroke];
-+
-+  // Fill the rounded rect.
-+  rect = NSInsetRect(rect, 2.0, 2.0);
-+  radius = rect.size.height / 2;
-+  bezier_path = [NSBezierPath bezierPathWithRoundedRect:rect xRadius:radius yRadius:radius];
-+  [bezier_path setLineWidth:1.0];
-+  [bezier_path addClip];
-+
-+  // Calculate the progress width.
-+  rect.size.width = floor(rect.size.width * ([self doubleValue] / [self maxValue]));
-+
-+  // Fill the progress bar with color blue.
-+  [[NSColor colorWithSRGBRed:0.2 green:0.6 blue:1 alpha:1] set];
-+  NSRectFill(rect);
-+}
-+
-+@end
-+
-+namespace electron {
-+
-+NativeWindowMac::NativeWindowMac(
-+    brightray::InspectableWebContents* web_contents,
-+    const mate::Dictionary& options)
-+    : NativeWindow(web_contents, options),
-+      is_kiosk_(false),
-+      attention_request_id_(0),
-+      should_hide_native_toolbar_in_fullscreen_(false) {
-+  int width = 800, height = 600;
-+  options.Get(options::kWidth, &width);
-+  options.Get(options::kHeight, &height);
-+
-+  NSRect main_screen_rect = [[[NSScreen screens] objectAtIndex:0] frame];
-+  NSRect cocoa_bounds = NSMakeRect(
-+      round((NSWidth(main_screen_rect) - width) / 2) ,
-+      round((NSHeight(main_screen_rect) - height) / 2),
-+      width,
-+      height);
-+
-+  bool resizable = true;
-+  options.Get(options::kResizable, &resizable);
-+
-+  bool minimizable = true;
-+  options.Get(options::kMinimizable, &minimizable);
-+
-+  bool maximizable = true;
-+  options.Get(options::kMaximizable, &maximizable);
-+
-+  bool closable = true;
-+  options.Get(options::kClosable, &closable);
-+
-+  // New title bar styles are available in Yosemite or newer
-+  std::string titleBarStyle;
-+  if (base::mac::IsOSYosemiteOrLater())
-+    options.Get(options::kTitleBarStyle, &titleBarStyle);
-+
-+  std::string windowType;
-+  options.Get(options::kType, &windowType);
-+
-+  bool useStandardWindow = true;
-+  // eventually deprecate separate "standardWindow" option in favor of
-+  // standard / textured window types
-+  options.Get(options::kStandardWindow, &useStandardWindow);
-+  if (windowType == "textured") {
-+    useStandardWindow = false;
-+  }
-+
-+  NSUInteger styleMask = NSTitledWindowMask;
-+  if (minimizable) {
-+    styleMask |= NSMiniaturizableWindowMask;
-+  }
-+  if (closable) {
-+    styleMask |= NSClosableWindowMask;
-+  }
-+  if (!useStandardWindow || transparent() || !has_frame()) {
-+    styleMask |= NSTexturedBackgroundWindowMask;
-+  }
-+  if (resizable) {
-+    styleMask |= NSResizableWindowMask;
-+  }
-+  if ((titleBarStyle == "hidden") || (titleBarStyle == "hidden-inset")) {
-+    styleMask |= NSFullSizeContentViewWindowMask;
-+    styleMask |= NSUnifiedTitleAndToolbarWindowMask;
-+  }
-+  // We capture this because we need to access the option later when
-+  // entering/exiting fullscreen and since the options dict is only passed to
-+  // the constructor but not stored, let’s store this option this way.
-+  if (titleBarStyle == "hidden-inset") {
-+    should_hide_native_toolbar_in_fullscreen_ = true;
-+  }
-+
-+  window_.reset([[ElectronNSWindow alloc]
-+      initWithContentRect:cocoa_bounds
-+                styleMask:styleMask
-+                  backing:NSBackingStoreBuffered
-+                    defer:YES]);
-+  [window_ setShell:this];
-+  [window_ setEnableLargerThanScreen:enable_larger_than_screen()];
-+
-+  window_delegate_.reset([[ElectronNSWindowDelegate alloc] initWithShell:this]);
-+  [window_ setDelegate:window_delegate_];
-+
-+  if (transparent()) {
-+    // Make window has transparent background.
-+    [window_ setOpaque:NO];
-+    // Setting the background color to clear will also hide the shadow.
-+    [window_ setBackgroundColor:[NSColor clearColor]];
-+  }
-+
-+  if (windowType == "desktop") {
-+    [window_ setLevel:kCGDesktopWindowLevel - 1];
-+    [window_ setDisableKeyOrMainWindow:YES];
-+    [window_ setCollectionBehavior:
-+        (NSWindowCollectionBehaviorCanJoinAllSpaces |
-+         NSWindowCollectionBehaviorStationary |
-+         NSWindowCollectionBehaviorIgnoresCycle)];
-+  }
-+
-+  // Remove non-transparent corners, see http://git.io/vfonD.
-+  if (!has_frame())
-+    [window_ setOpaque:NO];
-+
-+  // We will manage window's lifetime ourselves.
-+  [window_ setReleasedWhenClosed:NO];
-+
-+  // Hide the title bar.
-+  if ((titleBarStyle == "hidden") || (titleBarStyle == "hidden-inset")) {
-+    [window_ setTitlebarAppearsTransparent:YES];
-+    [window_ setTitleVisibility:NSWindowTitleHidden];
-+    if (titleBarStyle == "hidden-inset") {
-+      base::scoped_nsobject<NSToolbar> toolbar(
-+          [[NSToolbar alloc] initWithIdentifier:@"titlebarStylingToolbar"]);
-+      [toolbar setShowsBaselineSeparator:NO];
-+      [window_ setToolbar:toolbar];
-+    }
-+    // We should be aware of draggable regions when using hidden titlebar.
-+    set_force_using_draggable_region(true);
-+  }
-+
-+  // On OS X the initial window size doesn't include window frame.
-+  bool use_content_size = false;
-+  options.Get(options::kUseContentSize, &use_content_size);
-+  if (!has_frame() || !use_content_size)
-+    SetSize(gfx::Size(width, height));
-+
-+  // Enable the NSView to accept first mouse event.
-+  bool acceptsFirstMouse = false;
-+  options.Get(options::kAcceptFirstMouse, &acceptsFirstMouse);
-+  [window_ setAcceptsFirstMouse:acceptsFirstMouse];
-+
-+  // Disable auto-hiding cursor.
-+  bool disableAutoHideCursor = false;
-+  options.Get(options::kDisableAutoHideCursor, &disableAutoHideCursor);
-+  [window_ setDisableAutoHideCursor:disableAutoHideCursor];
-+
-+  // Disable zoom button if window is not resizable.
-+  if (!maximizable)
-+    SetMaximizable(false);
-+
-+  NSView* view = inspectable_web_contents()->GetView()->GetNativeView();
-+  [view setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
-+
-+  // Use an NSEvent monitor to listen for the wheel event.
-+  BOOL __block began = NO;
-+  wheel_event_monitor_ = [NSEvent
-+    addLocalMonitorForEventsMatchingMask:NSScrollWheelMask
-+    handler:^(NSEvent* event) {
-+      if ([[event window] windowNumber] != [window_ windowNumber])
-+        return event;
-+
-+      if (!web_contents)
-+        return event;
-+
-+      if (!began && (([event phase] == NSEventPhaseMayBegin) ||
-+                     ([event phase] == NSEventPhaseBegan))) {
-+        this->NotifyWindowScrollTouchBegin();
-+        began = YES;
-+      } else if (began && (([event phase] == NSEventPhaseEnded) ||
-+                           ([event phase] == NSEventPhaseCancelled))) {
-+        this->NotifyWindowScrollTouchEnd();
-+        began = NO;
-+      }
-+      return event;
-+  }];
-+
-+  InstallView();
-+}
-+
-+NativeWindowMac::~NativeWindowMac() {
-+  [NSEvent removeMonitor:wheel_event_monitor_];
-+  Observe(nullptr);
-+}
-+
-+void NativeWindowMac::Close() {
-+  [window_ performClose:nil];
-+}
-+
-+void NativeWindowMac::CloseImmediately() {
-+  [window_ close];
-+}
-+
-+void NativeWindowMac::Focus(bool focus) {
-+  if (!IsVisible())
-+    return;
-+
-+  if (focus) {
-+    [[NSApplication sharedApplication] activateIgnoringOtherApps:YES];
-+    [window_ makeKeyAndOrderFront:nil];
-+  } else {
-+    [window_ orderBack:nil];
-+  }
-+}
-+
-+bool NativeWindowMac::IsFocused() {
-+  return [window_ isKeyWindow];
-+}
-+
-+void NativeWindowMac::Show() {
-+  // This method is supposed to put focus on window, however if the app does not
-+  // have focus then "makeKeyAndOrderFront" will only show the window.
-+  [NSApp activateIgnoringOtherApps:YES];
-+
-+  [window_ makeKeyAndOrderFront:nil];
-+}
-+
-+void NativeWindowMac::ShowInactive() {
-+  [window_ orderFrontRegardless];
-+}
-+
-+void NativeWindowMac::Hide() {
-+  [window_ orderOut:nil];
-+}
-+
-+bool NativeWindowMac::IsVisible() {
-+  return [window_ isVisible];
-+}
-+
-+void NativeWindowMac::Maximize() {
-+  [window_ zoom:nil];
-+}
-+
-+void NativeWindowMac::Unmaximize() {
-+  [window_ zoom:nil];
-+}
-+
-+bool NativeWindowMac::IsMaximized() {
-+  if (([window_ styleMask] & NSResizableWindowMask) != 0) {
-+    return [window_ isZoomed];
-+  } else {
-+    NSRect rectScreen = [[NSScreen mainScreen] visibleFrame];
-+    NSRect rectWindow = [window_ frame];
-+    return (rectScreen.origin.x == rectWindow.origin.x &&
-+            rectScreen.origin.y == rectWindow.origin.y &&
-+            rectScreen.size.width == rectWindow.size.width &&
-+            rectScreen.size.height == rectWindow.size.height);
-+  }
-+}
-+
-+void NativeWindowMac::Minimize() {
-+  [window_ miniaturize:nil];
-+}
-+
-+void NativeWindowMac::Restore() {
-+  [window_ deminiaturize:nil];
-+}
-+
-+bool NativeWindowMac::IsMinimized() {
-+  return [window_ isMiniaturized];
-+}
-+
-+void NativeWindowMac::SetFullScreen(bool fullscreen) {
-+  if (fullscreen == IsFullscreen())
-+    return;
-+
-+  if (!base::mac::IsOSLionOrLater()) {
-+    LOG(ERROR) << "Fullscreen mode is only supported above Lion";
-+    return;
-+  }
-+
-+  [window_ toggleFullScreen:nil];
-+}
-+
-+bool NativeWindowMac::IsFullscreen() const {
-+  return [window_ styleMask] & NSFullScreenWindowMask;
-+}
-+
-+void NativeWindowMac::SetBounds(const gfx::Rect& bounds, bool animate) {
-+  NSRect cocoa_bounds = NSMakeRect(bounds.x(), 0,
-+                                   bounds.width(),
-+                                   bounds.height());
-+  // Flip coordinates based on the primary screen.
-+  NSScreen* screen = [[NSScreen screens] objectAtIndex:0];
-+  cocoa_bounds.origin.y =
-+      NSHeight([screen frame]) - bounds.height() - bounds.y();
-+
-+  [window_ setFrame:cocoa_bounds display:YES animate:animate];
-+}
-+
-+gfx::Rect NativeWindowMac::GetBounds() {
-+  NSRect frame = [window_ frame];
-+  gfx::Rect bounds(frame.origin.x, 0, NSWidth(frame), NSHeight(frame));
-+  NSScreen* screen = [[NSScreen screens] objectAtIndex:0];
-+  bounds.set_y(NSHeight([screen frame]) - NSMaxY(frame));
-+  return bounds;
-+}
-+
-+void NativeWindowMac::SetContentSizeConstraints(
-+    const extensions::SizeConstraints& size_constraints) {
-+  auto convertSize = [this](const gfx::Size& size) {
-+    // Our frameless window still has titlebar attached, so setting contentSize
-+    // will result in actual content size being larger.
-+    if (!has_frame()) {
-+      NSRect frame = NSMakeRect(0, 0, size.width(), size.height());
-+      NSRect content = [window_ contentRectForFrameRect:frame];
-+      return content.size;
-+    } else {
-+      return NSMakeSize(size.width(), size.height());
-+    }
-+  };
-+
-+  NSView* content = [window_ contentView];
-+  if (size_constraints.HasMinimumSize()) {
-+    NSSize min_size = convertSize(size_constraints.GetMinimumSize());
-+    [window_ setContentMinSize:[content convertSize:min_size toView:nil]];
-+  }
-+  if (size_constraints.HasMaximumSize()) {
-+    NSSize max_size = convertSize(size_constraints.GetMaximumSize());
-+    [window_ setContentMaxSize:[content convertSize:max_size toView:nil]];
-+  }
-+  NativeWindow::SetContentSizeConstraints(size_constraints);
-+}
-+
-+void NativeWindowMac::SetResizable(bool resizable) {
-+  // Change styleMask for frameless causes the window to change size, so we have
-+  // to explicitly disables that.
-+  ScopedDisableResize disable_resize;
-+  SetStyleMask(resizable, NSResizableWindowMask);
-+}
-+
-+bool NativeWindowMac::IsResizable() {
-+  return [window_ styleMask] & NSResizableWindowMask;
-+}
-+
-+void NativeWindowMac::SetMovable(bool movable) {
-+  [window_ setMovable:movable];
-+}
-+
-+bool NativeWindowMac::IsMovable() {
-+  return [window_ isMovable];
-+}
-+
-+void NativeWindowMac::SetMinimizable(bool minimizable) {
-+  SetStyleMask(minimizable, NSMiniaturizableWindowMask);
-+}
-+
-+bool NativeWindowMac::IsMinimizable() {
-+  return [window_ styleMask] & NSMiniaturizableWindowMask;
-+}
-+
-+void NativeWindowMac::SetMaximizable(bool maximizable) {
-+  [[window_ standardWindowButton:NSWindowZoomButton] setEnabled:maximizable];
-+}
-+
-+bool NativeWindowMac::IsMaximizable() {
-+  return [[window_ standardWindowButton:NSWindowZoomButton] isEnabled];
-+}
-+
-+void NativeWindowMac::SetFullScreenable(bool fullscreenable) {
-+  SetCollectionBehavior(
-+      fullscreenable, NSWindowCollectionBehaviorFullScreenPrimary);
-+  // On EL Capitan this flag is required to hide fullscreen button.
-+  SetCollectionBehavior(
-+      !fullscreenable, NSWindowCollectionBehaviorFullScreenAuxiliary);
-+}
-+
-+bool NativeWindowMac::IsFullScreenable() {
-+  NSUInteger collectionBehavior = [window_ collectionBehavior];
-+  return collectionBehavior & NSWindowCollectionBehaviorFullScreenPrimary;
-+}
-+
-+void NativeWindowMac::SetClosable(bool closable) {
-+  SetStyleMask(closable, NSClosableWindowMask);
-+}
-+
-+bool NativeWindowMac::IsClosable() {
-+  return [window_ styleMask] & NSClosableWindowMask;
-+}
-+
-+void NativeWindowMac::SetAlwaysOnTop(bool top) {
-+  [window_ setLevel:(top ? NSFloatingWindowLevel : NSNormalWindowLevel)];
-+}
-+
-+bool NativeWindowMac::IsAlwaysOnTop() {
-+  return [window_ level] == NSFloatingWindowLevel;
-+}
-+
-+void NativeWindowMac::Center() {
-+  [window_ center];
-+}
-+
-+void NativeWindowMac::SetTitle(const std::string& title) {
-+  // We don't want the title to show in transparent or frameless window.
-+  if (transparent() || !has_frame())
-+    return;
-+
-+  [window_ setTitle:base::SysUTF8ToNSString(title)];
-+}
-+
-+std::string NativeWindowMac::GetTitle() {
-+  return base::SysNSStringToUTF8([window_ title]);
-+}
-+
-+void NativeWindowMac::FlashFrame(bool flash) {
-+  if (flash) {
-+    attention_request_id_ = [NSApp requestUserAttention:NSInformationalRequest];
-+  } else {
-+    [NSApp cancelUserAttentionRequest:attention_request_id_];
-+    attention_request_id_ = 0;
-+  }
-+}
-+
-+void NativeWindowMac::SetSkipTaskbar(bool skip) {
-+}
-+
-+void NativeWindowMac::SetKiosk(bool kiosk) {
-+  if (kiosk && !is_kiosk_) {
-+    kiosk_options_ = [NSApp currentSystemPresentationOptions];
-+    NSApplicationPresentationOptions options =
-+        NSApplicationPresentationHideDock +
-+        NSApplicationPresentationHideMenuBar +
-+        NSApplicationPresentationDisableAppleMenu +
-+        NSApplicationPresentationDisableProcessSwitching +
-+        NSApplicationPresentationDisableForceQuit +
-+        NSApplicationPresentationDisableSessionTermination +
-+        NSApplicationPresentationDisableHideApplication;
-+    [NSApp setPresentationOptions:options];
-+    is_kiosk_ = true;
-+    SetFullScreen(true);
-+  } else if (!kiosk && is_kiosk_) {
-+    is_kiosk_ = false;
-+    SetFullScreen(false);
-+    [NSApp setPresentationOptions:kiosk_options_];
-+  }
-+}
-+
-+bool NativeWindowMac::IsKiosk() {
-+  return is_kiosk_;
-+}
-+
-+void NativeWindowMac::SetBackgroundColor(const std::string& color_name) {
-+  SkColor background_color = NativeWindow::ParseHexColor(color_name);
-+  NSColor *color = [NSColor colorWithCalibratedRed:SkColorGetR(background_color)
-+    green:SkColorGetG(background_color)
-+    blue:SkColorGetB(background_color)
-+    alpha:SkColorGetA(background_color)/255.0f];
-+  [window_ setBackgroundColor:color];
-+}
-+
-+void NativeWindowMac::SetHasShadow(bool has_shadow) {
-+  [window_ setHasShadow:has_shadow];
-+}
-+
-+bool NativeWindowMac::HasShadow() {
-+  return [window_ hasShadow];
-+}
-+
-+void NativeWindowMac::SetRepresentedFilename(const std::string& filename) {
-+  [window_ setRepresentedFilename:base::SysUTF8ToNSString(filename)];
-+}
-+
-+std::string NativeWindowMac::GetRepresentedFilename() {
-+  return base::SysNSStringToUTF8([window_ representedFilename]);
-+}
-+
-+void NativeWindowMac::SetDocumentEdited(bool edited) {
-+  [window_ setDocumentEdited:edited];
-+}
-+
-+bool NativeWindowMac::IsDocumentEdited() {
-+  return [window_ isDocumentEdited];
-+}
-+
-+void NativeWindowMac::SetIgnoreMouseEvents(bool ignore) {
-+  [window_ setIgnoresMouseEvents:ignore];
-+}
-+
-+bool NativeWindowMac::HasModalDialog() {
-+  return [window_ attachedSheet] != nil;
-+}
-+
-+gfx::NativeWindow NativeWindowMac::GetNativeWindow() {
-+  return window_;
-+}
-+
-+gfx::AcceleratedWidget NativeWindowMac::GetAcceleratedWidget() {
-+  return inspectable_web_contents()->GetView()->GetNativeView();
-+}
-+
-+void NativeWindowMac::SetProgressBar(double progress) {
-+  NSDockTile* dock_tile = [NSApp dockTile];
-+
-+  // For the first time API invoked, we need to create a ContentView in DockTile.
-+  if (dock_tile.contentView == NULL) {
-+    NSImageView* image_view = [[NSImageView alloc] init];
-+    [image_view setImage:[NSApp applicationIconImage]];
-+    [dock_tile setContentView:image_view];
-+
-+    NSProgressIndicator* progress_indicator = [[ElectronProgressBar alloc]
-+        initWithFrame:NSMakeRect(0.0f, 0.0f, dock_tile.size.width, 15.0)];
-+    [progress_indicator setStyle:NSProgressIndicatorBarStyle];
-+    [progress_indicator setIndeterminate:NO];
-+    [progress_indicator setBezeled:YES];
-+    [progress_indicator setMinValue:0];
-+    [progress_indicator setMaxValue:1];
-+    [progress_indicator setHidden:NO];
-+    [image_view addSubview:progress_indicator];
-+  }
-+
-+  NSProgressIndicator* progress_indicator =
-+      static_cast<NSProgressIndicator*>([[[dock_tile contentView] subviews]
-+           objectAtIndex:0]);
-+  if (progress < 0) {
-+    [progress_indicator setHidden:YES];
-+  } else if (progress > 1) {
-+    [progress_indicator setHidden:NO];
-+    [progress_indicator setIndeterminate:YES];
-+    [progress_indicator setDoubleValue:1];
-+  } else {
-+    [progress_indicator setHidden:NO];
-+    [progress_indicator setDoubleValue:progress];
-+  }
-+  [dock_tile display];
-+}
-+
-+void NativeWindowMac::SetOverlayIcon(const gfx::Image& overlay,
-+                                     const std::string& description) {
-+}
-+
-+void NativeWindowMac::ShowDefinitionForSelection() {
-+  if (!web_contents())
-+    return;
-+  auto rwhv = web_contents()->GetRenderWidgetHostView();
-+  if (!rwhv)
-+    return;
-+  rwhv->ShowDefinitionForSelection();
-+}
-+
-+void NativeWindowMac::SetVisibleOnAllWorkspaces(bool visible) {
-+  SetCollectionBehavior(visible, NSWindowCollectionBehaviorCanJoinAllSpaces);
-+}
-+
-+bool NativeWindowMac::IsVisibleOnAllWorkspaces() {
-+  NSUInteger collectionBehavior = [window_ collectionBehavior];
-+  return collectionBehavior & NSWindowCollectionBehaviorCanJoinAllSpaces;
-+}
-+
-+void NativeWindowMac::HandleKeyboardEvent(
-+    content::WebContents*,
-+    const content::NativeWebKeyboardEvent& event) {
-+  if (event.skip_in_browser ||
-+      event.type == content::NativeWebKeyboardEvent::Char)
-+    return;
-+
-+  BOOL handled = [[NSApp mainMenu] performKeyEquivalent:event.os_event];
-+  if (!handled && event.os_event.window) {
-+    // Handle the cmd+~ shortcut.
-+    if ((event.os_event.modifierFlags & NSCommandKeyMask) /* cmd */ &&
-+        (event.os_event.keyCode == 50  /* ~ */)) {
-+      if (event.os_event.modifierFlags & NSShiftKeyMask) {
-+        [NSApp sendAction:@selector(_cycleWindowsReversed:) to:nil from:nil];
-+      } else {
-+        [NSApp sendAction:@selector(_cycleWindows:) to:nil from:nil];
-+      }
-+    }
-+  }
-+}
-+
-+std::vector<gfx::Rect> NativeWindowMac::CalculateNonDraggableRegions(
-+    const std::vector<DraggableRegion>& regions, int width, int height) {
-+  std::vector<gfx::Rect> result;
-+  if (regions.empty()) {
-+    result.push_back(gfx::Rect(0, 0, width, height));
-+  } else {
-+    scoped_ptr<SkRegion> draggable(DraggableRegionsToSkRegion(regions));
-+    scoped_ptr<SkRegion> non_draggable(new SkRegion);
-+    non_draggable->op(0, 0, width, height, SkRegion::kUnion_Op);
-+    non_draggable->op(*draggable, SkRegion::kDifference_Op);
-+    for (SkRegion::Iterator it(*non_draggable); !it.done(); it.next()) {
-+      result.push_back(gfx::SkIRectToRect(it.rect()));
-+    }
-+  }
-+  return result;
-+}
-+
-+gfx::Size NativeWindowMac::ContentSizeToWindowSize(const gfx::Size& size) {
-+  if (!has_frame())
-+    return size;
-+
-+  NSRect content = NSMakeRect(0, 0, size.width(), size.height());
-+  NSRect frame = [window_ frameRectForContentRect:content];
-+  return gfx::Size(frame.size);
-+}
-+
-+gfx::Size NativeWindowMac::WindowSizeToContentSize(const gfx::Size& size) {
-+  if (!has_frame())
-+    return size;
-+
-+  NSRect frame = NSMakeRect(0, 0, size.width(), size.height());
-+  NSRect content = [window_ contentRectForFrameRect:frame];
-+  return gfx::Size(content.size);
-+}
-+
-+void NativeWindowMac::UpdateDraggableRegions(
-+    const std::vector<DraggableRegion>& regions) {
-+  NativeWindow::UpdateDraggableRegions(regions);
-+  draggable_regions_ = regions;
-+  UpdateDraggableRegionViews(regions);
-+}
-+
-+void NativeWindowMac::InstallView() {
-+  // Make sure the bottom corner is rounded: http://crbug.com/396264.
-+  [[window_ contentView] setWantsLayer:YES];
-+
-+  NSView* view = inspectable_web_contents()->GetView()->GetNativeView();
-+  if (has_frame()) {
-+    [view setFrame:[[window_ contentView] bounds]];
-+    [[window_ contentView] addSubview:view];
-+  } else {
-+    // In OSX 10.10, adding subviews to the root view for the NSView hierarchy
-+    // produces warnings. To eliminate the warnings, we resize the contentView
-+    // to fill the window, and add subviews to that.
-+    // http://crbug.com/380412
-+    content_view_.reset([[FullSizeContentView alloc] init]);
-+    [content_view_
-+        setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
-+    [content_view_ setFrame:[[[window_ contentView] superview] bounds]];
-+    [window_ setContentView:content_view_];
-+
-+    [view setFrame:[content_view_ bounds]];
-+    [content_view_ addSubview:view];
-+
-+    [[window_ standardWindowButton:NSWindowZoomButton] setHidden:YES];
-+    [[window_ standardWindowButton:NSWindowMiniaturizeButton] setHidden:YES];
-+    [[window_ standardWindowButton:NSWindowCloseButton] setHidden:YES];
-+
-+    // Some third-party OS X utilities check the zoom button's enabled state to
-+    // determine whether to show custom UI on hover, so we disable it here to
-+    // prevent them from doing so in a frameless app window.
-+    [[window_ standardWindowButton:NSWindowZoomButton] setEnabled:NO];
-+  }
-+}
-+
-+void NativeWindowMac::UninstallView() {
-+  NSView* view = inspectable_web_contents()->GetView()->GetNativeView();
-+  [view removeFromSuperview];
-+}
-+
-+void NativeWindowMac::UpdateDraggableRegionViews(
-+    const std::vector<DraggableRegion>& regions) {
-+  if (has_frame() && !force_using_draggable_region())
-+    return;
-+
-+  // All ControlRegionViews should be added as children of the WebContentsView,
-+  // because WebContentsView will be removed and re-added when entering and
-+  // leaving fullscreen mode.
-+  NSView* webView = web_contents()->GetNativeView();
-+  NSInteger webViewWidth = NSWidth([webView bounds]);
-+  NSInteger webViewHeight = NSHeight([webView bounds]);
-+
-+  [webView setMouseDownCanMoveWindow:YES];
-+
-+  // Remove all ControlRegionViews that are added last time.
-+  // Note that [webView subviews] returns the view's mutable internal array and
-+  // it should be copied to avoid mutating the original array while enumerating
-+  // it.
-+  base::scoped_nsobject<NSArray> subviews([[webView subviews] copy]);
-+  for (NSView* subview in subviews.get())
-+    if ([subview isKindOfClass:[ControlRegionView class]])
-+      [subview removeFromSuperview];
-+
-+  // Draggable regions is implemented by having the whole web view draggable
-+  // (mouseDownCanMoveWindow) and overlaying regions that are not draggable.
-+  std::vector<gfx::Rect> system_drag_exclude_areas =
-+      CalculateNonDraggableRegions(regions, webViewWidth, webViewHeight);
-+
-+  // Create and add a ControlRegionView for each region that needs to be
-+  // excluded from the dragging.
-+  for (std::vector<gfx::Rect>::const_iterator iter =
-+           system_drag_exclude_areas.begin();
-+       iter != system_drag_exclude_areas.end();
-+       ++iter) {
-+    base::scoped_nsobject<NSView> controlRegion(
-+        [[ControlRegionView alloc] initWithFrame:NSZeroRect]);
-+    [controlRegion setFrame:NSMakeRect(iter->x(),
-+                                       webViewHeight - iter->bottom(),
-+                                       iter->width(),
-+                                       iter->height())];
-+    [webView addSubview:controlRegion];
-+  }
-+
-+  // AppKit will not update its cache of mouseDownCanMoveWindow unless something
-+  // changes. Previously we tried adding an NSView and removing it, but for some
-+  // reason it required reposting the mouse-down event, and didn't always work.
-+  // Calling the below seems to be an effective solution.
-+  [window_ setMovableByWindowBackground:NO];
-+  [window_ setMovableByWindowBackground:YES];
-+}
-+
-+void NativeWindowMac::SetStyleMask(bool on, NSUInteger flag) {
-+  bool zoom_button_enabled = IsMaximizable();
-+  if (on)
-+    [window_ setStyleMask:[window_ styleMask] | flag];
-+  else
-+    [window_ setStyleMask:[window_ styleMask] & (~flag)];
-+  // Change style mask will make the zoom button revert to default, probably
-+  // a bug of Cocoa or OS X.
-+  if (!zoom_button_enabled)
-+    SetMaximizable(false);
-+}
-+
-+void NativeWindowMac::SetCollectionBehavior(bool on, NSUInteger flag) {
-+  bool zoom_button_enabled = IsMaximizable();
-+  if (on)
-+    [window_ setCollectionBehavior:[window_ collectionBehavior] | flag];
-+  else
-+    [window_ setCollectionBehavior:[window_ collectionBehavior] & (~flag)];
-+  // Change collectionBehavior will make the zoom button revert to default,
-+  // probably a bug of Cocoa or OS X.
-+  if (!zoom_button_enabled)
-+    SetMaximizable(false);
-+}
-+
-+// static
-+NativeWindow* NativeWindow::Create(
-+    brightray::InspectableWebContents* inspectable_web_contents,
-+    const mate::Dictionary& options) {
-+  return new NativeWindowMac(inspectable_web_contents, options);
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 459872dc07685e449bf394b60772d64761109cf3 electron/browser/native_window_observer.h
-@@ -0,0 +1,84 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_NATIVE_WINDOW_OBSERVER_H_
-+#define ELECTRON_BROWSER_NATIVE_WINDOW_OBSERVER_H_
-+
-+#include <string>
-+
-+#include "base/strings/string16.h"
-+#include "ui/base/window_open_disposition.h"
-+#include "url/gurl.h"
-+
-+#if defined(OS_WIN)
-+#include <windows.h>
-+#endif
-+
-+namespace electron {
-+
-+class NativeWindowObserver {
-+ public:
-+  virtual ~NativeWindowObserver() {}
-+
-+  // Called when the web page in window wants to create a popup window.
-+  virtual void WillCreatePopupWindow(const base::string16& frame_name,
-+                                     const GURL& target_url,
-+                                     const std::string& partition_id,
-+                                     WindowOpenDisposition disposition) {}
-+
-+  // Called when user is starting an navigation in web page.
-+  virtual void WillNavigate(bool* prevent_default, const GURL& url) {}
-+
-+  // Called when the window is gonna closed.
-+  virtual void WillCloseWindow(bool* prevent_default) {}
-+
-+  // Called when the window is closed.
-+  virtual void OnWindowClosed() {}
-+
-+  // Called when window loses focus.
-+  virtual void OnWindowBlur() {}
-+
-+  // Called when window gains focus.
-+  virtual void OnWindowFocus() {}
-+
-+  // Called when window is shown.
-+  virtual void OnWindowShow() {}
-+
-+  // Called when window is hidden.
-+  virtual void OnWindowHide() {}
-+
-+  // Called when window state changed.
-+  virtual void OnWindowMaximize() {}
-+  virtual void OnWindowUnmaximize() {}
-+  virtual void OnWindowMinimize() {}
-+  virtual void OnWindowRestore() {}
-+  virtual void OnWindowResize() {}
-+  virtual void OnWindowMove() {}
-+  virtual void OnWindowMoved() {}
-+  virtual void OnWindowScrollTouchBegin() {}
-+  virtual void OnWindowScrollTouchEnd() {}
-+  virtual void OnWindowSwipe(const std::string& direction) {}
-+  virtual void OnWindowEnterFullScreen() {}
-+  virtual void OnWindowLeaveFullScreen() {}
-+  virtual void OnWindowEnterHtmlFullScreen() {}
-+  virtual void OnWindowLeaveHtmlFullScreen() {}
-+
-+  // Called when window message received
-+  #if defined(OS_WIN)
-+  virtual void OnWindowMessage(UINT message, WPARAM w_param, LPARAM l_param) {}
-+  #endif
-+
-+  // Called when renderer is hung.
-+  virtual void OnRendererUnresponsive() {}
-+
-+  // Called when renderer recovers.
-+  virtual void OnRendererResponsive() {}
-+
-+  // Called on Windows when App Commands arrive (WM_APPCOMMAND)
-+  virtual void OnExecuteWindowsCommand(const std::string& command_name) {}
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_NATIVE_WINDOW_OBSERVER_H_
-added in remote
-  their  100644 470c32a21fbe2e1623686c4c17818ed6bbd2a5de electron/browser/native_window_views.cc
-@@ -0,0 +1,1030 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/native_window_views.h"
-+
-+#include <string>
-+#include <vector>
-+
-+#include "electron/browser/ui/views/menu_bar.h"
-+#include "electron/browser/ui/views/menu_layout.h"
-+#include "electron/common/draggable_region.h"
-+#include "electron/common/options_switches.h"
-+#include "base/strings/utf_string_conversions.h"
-+#include "brightray/browser/inspectable_web_contents.h"
-+#include "brightray/browser/inspectable_web_contents_view.h"
-+#include "content/public/browser/native_web_keyboard_event.h"
-+#include "native_mate/dictionary.h"
-+#include "ui/aura/window_tree_host.h"
-+#include "ui/base/hit_test.h"
-+#include "ui/gfx/image/image.h"
-+#include "ui/views/background.h"
-+#include "ui/views/controls/webview/unhandled_keyboard_event_handler.h"
-+#include "ui/views/controls/webview/webview.h"
-+#include "ui/views/window/client_view.h"
-+#include "ui/views/widget/native_widget_private.h"
-+#include "ui/views/widget/widget.h"
-+#include "ui/wm/core/shadow_types.h"
-+
-+#if defined(USE_X11)
-+#include "electron/browser/browser.h"
-+#include "electron/browser/ui/views/global_menu_bar_x11.h"
-+#include "electron/browser/ui/views/frameless_view.h"
-+#include "electron/browser/ui/views/native_frame_view.h"
-+#include "electron/browser/ui/x/window_state_watcher.h"
-+#include "electron/browser/ui/x/x_window_utils.h"
-+#include "base/strings/string_util.h"
-+#include "chrome/browser/ui/libgtk2ui/unity_service.h"
-+#include "ui/base/x/x11_util.h"
-+#include "ui/gfx/x/x11_types.h"
-+#include "ui/views/window/native_frame_view.h"
-+#elif defined(OS_WIN)
-+#include "electron/browser/ui/views/win_frame_view.h"
-+#include "electron/browser/ui/win/electron_desktop_window_tree_host_win.h"
-+#include "skia/ext/skia_utils_win.h"
-+#include "ui/base/win/shell.h"
-+#include "ui/gfx/win/dpi.h"
-+#include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
-+#endif
-+
-+namespace electron {
-+
-+namespace {
-+
-+// The menu bar height in pixels.
-+#if defined(OS_WIN)
-+const int kMenuBarHeight = 20;
-+#else
-+const int kMenuBarHeight = 25;
-+#endif
-+
-+#if defined(OS_WIN)
-+void FlipWindowStyle(HWND handle, bool on, DWORD flag) {
-+  DWORD style = ::GetWindowLong(handle, GWL_STYLE);
-+  if (on)
-+    style |= flag;
-+  else
-+    style &= ~flag;
-+  ::SetWindowLong(handle, GWL_STYLE, style);
-+}
-+#endif
-+
-+bool IsAltKey(const content::NativeWebKeyboardEvent& event) {
-+  return event.windowsKeyCode == ui::VKEY_MENU;
-+}
-+
-+bool IsAltModifier(const content::NativeWebKeyboardEvent& event) {
-+  typedef content::NativeWebKeyboardEvent::Modifiers Modifiers;
-+  int modifiers = event.modifiers;
-+  modifiers &= ~Modifiers::NumLockOn;
-+  modifiers &= ~Modifiers::CapsLockOn;
-+  return (modifiers == Modifiers::AltKey) ||
-+         (modifiers == (Modifiers::AltKey | Modifiers::IsLeft)) ||
-+         (modifiers == (Modifiers::AltKey | Modifiers::IsRight));
-+}
-+
-+class NativeWindowClientView : public views::ClientView {
-+ public:
-+  NativeWindowClientView(views::Widget* widget,
-+                         NativeWindowViews* contents_view)
-+      : views::ClientView(widget, contents_view) {
-+  }
-+  virtual ~NativeWindowClientView() {}
-+
-+  bool CanClose() override {
-+    static_cast<NativeWindowViews*>(contents_view())->RequestToClosePage();
-+    return false;
-+  }
-+
-+ private:
-+  DISALLOW_COPY_AND_ASSIGN(NativeWindowClientView);
-+};
-+
-+}  // namespace
-+
-+NativeWindowViews::NativeWindowViews(
-+    brightray::InspectableWebContents* web_contents,
-+    const mate::Dictionary& options)
-+    : NativeWindow(web_contents, options),
-+      window_(new views::Widget),
-+      web_view_(inspectable_web_contents()->GetView()->GetView()),
-+      menu_bar_autohide_(false),
-+      menu_bar_visible_(false),
-+      menu_bar_alt_pressed_(false),
-+      keyboard_event_handler_(new views::UnhandledKeyboardEventHandler),
-+      use_content_size_(false),
-+      movable_(true),
-+      resizable_(true),
-+      maximizable_(true),
-+      minimizable_(true),
-+      fullscreenable_(true) {
-+  options.Get(options::kTitle, &title_);
-+  options.Get(options::kAutoHideMenuBar, &menu_bar_autohide_);
-+
-+#if defined(OS_WIN)
-+  // On Windows we rely on the CanResize() to indicate whether window can be
-+  // resized, and it should be set before window is created.
-+  options.Get(options::kResizable, &resizable_);
-+  options.Get(options::kMinimizable, &minimizable_);
-+  options.Get(options::kMaximizable, &maximizable_);
-+#endif
-+
-+  if (enable_larger_than_screen())
-+    // We need to set a default maximum window size here otherwise Windows
-+    // will not allow us to resize the window larger than scree.
-+    // Setting directly to INT_MAX somehow doesn't work, so we just devide
-+    // by 10, which should still be large enough.
-+    SetContentSizeConstraints(extensions::SizeConstraints(
-+        gfx::Size(), gfx::Size(INT_MAX / 10, INT_MAX / 10)));
-+
-+  int width = 800, height = 600;
-+  options.Get(options::kWidth, &width);
-+  options.Get(options::kHeight, &height);
-+  gfx::Rect bounds(0, 0, width, height);
-+  widget_size_ = bounds.size();
-+
-+  window_->AddObserver(this);
-+
-+  views::Widget::InitParams params;
-+  params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
-+  params.bounds = bounds;
-+  params.delegate = this;
-+  params.type = views::Widget::InitParams::TYPE_WINDOW;
-+  params.remove_standard_frame = !has_frame();
-+
-+  if (transparent())
-+    params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
-+
-+  // The given window is most likely not rectangular since it uses
-+  // transparency and has no standard frame, don't show a shadow for it.
-+  if (transparent() && !has_frame())
-+    params.shadow_type = views::Widget::InitParams::SHADOW_TYPE_NONE;
-+
-+#if defined(OS_WIN)
-+  params.native_widget =
-+      new views::DesktopNativeWidgetAura(window_.get());
-+  electron_desktop_window_tree_host_win_ = new ElectronDesktopWindowTreeHostWin(
-+      this,
-+      window_.get(),
-+      static_cast<views::DesktopNativeWidgetAura*>(params.native_widget));
-+  params.desktop_window_tree_host = electron_desktop_window_tree_host_win_;
-+#elif defined(USE_X11)
-+  std::string name = Browser::Get()->GetName();
-+  // Set WM_WINDOW_ROLE.
-+  params.wm_role_name = "browser-window";
-+  // Set WM_CLASS.
-+  params.wm_class_name = base::ToLowerASCII(name);
-+  params.wm_class_class = name;
-+#endif
-+
-+  window_->Init(params);
-+
-+  bool fullscreen = false;
-+  options.Get(options::kFullscreen, &fullscreen);
-+
-+#if defined(USE_X11)
-+  // Start monitoring window states.
-+  window_state_watcher_.reset(new WindowStateWatcher(this));
-+
-+  // Set _GTK_THEME_VARIANT to dark if we have "dark-theme" option set.
-+  bool use_dark_theme = false;
-+  if (options.Get(options::kDarkTheme, &use_dark_theme) && use_dark_theme) {
-+    XDisplay* xdisplay = gfx::GetXDisplay();
-+    XChangeProperty(xdisplay, GetAcceleratedWidget(),
-+                    XInternAtom(xdisplay, "_GTK_THEME_VARIANT", False),
-+                    XInternAtom(xdisplay, "UTF8_STRING", False),
-+                    8, PropModeReplace,
-+                    reinterpret_cast<const unsigned char*>("dark"),
-+                    4);
-+  }
-+
-+  // Before the window is mapped the SetWMSpecState can not work, so we have
-+  // to manually set the _NET_WM_STATE.
-+  std::vector<::Atom> state_electron_list;
-+  bool skip_taskbar = false;
-+  if (options.Get(options::kSkipTaskbar, &skip_taskbar) && skip_taskbar) {
-+    state_electron_list.push_back(GetAtom("_NET_WM_STATE_SKIP_TASKBAR"));
-+  }
-+
-+  // Before the window is mapped, there is no SHOW_FULLSCREEN_STATE.
-+  if (fullscreen) {
-+    state_electron_list.push_back(GetAtom("_NET_WM_STATE_FULLSCREEN"));
-+  }
-+
-+  ui::SetElectronArrayProperty(GetAcceleratedWidget(), "_NET_WM_STATE", "ATOM",
-+                           state_electron_list);
-+
-+  // Set the _NET_WM_WINDOW_TYPE.
-+  std::string window_type;
-+  if (options.Get(options::kType, &window_type))
-+    SetWindowType(GetAcceleratedWidget(), window_type);
-+#endif
-+
-+  // Add web view.
-+  SetLayoutManager(new MenuLayout(this, kMenuBarHeight));
-+
-+  AddChildView(web_view_);
-+
-+#if defined(OS_WIN)
-+  // Save initial window state.
-+  if (fullscreen)
-+    last_window_state_ = ui::SHOW_STATE_FULLSCREEN;
-+  else
-+    last_window_state_ = ui::SHOW_STATE_NORMAL;
-+  last_normal_size_ = gfx::Size(widget_size_);
-+
-+  if (!has_frame()) {
-+    // Set Window style so that we get a minimize and maximize animation when
-+    // frameless.
-+    DWORD frame_style = WS_CAPTION;
-+    if (resizable_)
-+      frame_style |= WS_THICKFRAME;
-+    if (minimizable_)
-+      frame_style |= WS_MINIMIZEBOX;
-+    if (maximizable_)
-+      frame_style |= WS_MAXIMIZEBOX;
-+    // We should not show a frame for transparent window.
-+    if (transparent())
-+      frame_style &= ~(WS_THICKFRAME | WS_CAPTION);
-+    ::SetWindowLong(GetAcceleratedWidget(), GWL_STYLE, frame_style);
-+  }
-+
-+  if (transparent()) {
-+    // Transparent window on Windows has to have WS_EX_COMPOSITED style.
-+    LONG ex_style = ::GetWindowLong(GetAcceleratedWidget(), GWL_EXSTYLE);
-+    ex_style |= WS_EX_COMPOSITED;
-+    ::SetWindowLong(GetAcceleratedWidget(), GWL_EXSTYLE, ex_style);
-+  }
-+#endif
-+
-+  // TODO(zcbenz): This was used to force using native frame on Windows 2003, we
-+  // should check whether setting it in InitParams can work.
-+  if (has_frame()) {
-+    window_->set_frame_type(views::Widget::FrameType::FRAME_TYPE_FORCE_NATIVE);
-+    window_->FrameTypeChanged();
-+  }
-+
-+  gfx::Size size = bounds.size();
-+  if (has_frame() &&
-+      options.Get(options::kUseContentSize, &use_content_size_) &&
-+      use_content_size_)
-+    size = ContentSizeToWindowSize(size);
-+
-+  window_->UpdateWindowIcon();
-+  window_->CenterWindow(size);
-+  Layout();
-+}
-+
-+NativeWindowViews::~NativeWindowViews() {
-+  window_->RemoveObserver(this);
-+}
-+
-+void NativeWindowViews::Close() {
-+  window_->Close();
-+}
-+
-+void NativeWindowViews::CloseImmediately() {
-+  window_->CloseNow();
-+}
-+
-+void NativeWindowViews::Focus(bool focus) {
-+  if (focus)
-+    window_->Activate();
-+  else
-+    window_->Deactivate();
-+}
-+
-+bool NativeWindowViews::IsFocused() {
-+  return window_->IsActive();
-+}
-+
-+void NativeWindowViews::Show() {
-+  window_->native_widget_private()->ShowWithWindowState(GetRestoredState());
-+
-+  NotifyWindowShow();
-+
-+#if defined(USE_X11)
-+  if (global_menu_bar_)
-+    global_menu_bar_->OnWindowMapped();
-+#endif
-+}
-+
-+void NativeWindowViews::ShowInactive() {
-+  window_->ShowInactive();
-+
-+  NotifyWindowShow();
-+
-+#if defined(USE_X11)
-+  if (global_menu_bar_)
-+    global_menu_bar_->OnWindowMapped();
-+#endif
-+}
-+
-+void NativeWindowViews::Hide() {
-+  window_->Hide();
-+
-+  NotifyWindowHide();
-+
-+#if defined(USE_X11)
-+  if (global_menu_bar_)
-+    global_menu_bar_->OnWindowUnmapped();
-+#endif
-+}
-+
-+bool NativeWindowViews::IsVisible() {
-+  return window_->IsVisible();
-+}
-+
-+void NativeWindowViews::Maximize() {
-+  if (IsVisible())
-+    window_->Maximize();
-+  else
-+    window_->native_widget_private()->ShowWithWindowState(
-+        ui::SHOW_STATE_MAXIMIZED);
-+}
-+
-+void NativeWindowViews::Unmaximize() {
-+  window_->Restore();
-+}
-+
-+bool NativeWindowViews::IsMaximized() {
-+  return window_->IsMaximized();
-+}
-+
-+void NativeWindowViews::Minimize() {
-+  if (IsVisible())
-+    window_->Minimize();
-+  else
-+    window_->native_widget_private()->ShowWithWindowState(
-+        ui::SHOW_STATE_MINIMIZED);
-+}
-+
-+void NativeWindowViews::Restore() {
-+  window_->Restore();
-+}
-+
-+bool NativeWindowViews::IsMinimized() {
-+  return window_->IsMinimized();
-+}
-+
-+void NativeWindowViews::SetFullScreen(bool fullscreen) {
-+  if (!IsFullScreenable())
-+    return;
-+
-+#if defined(OS_WIN)
-+  // There is no native fullscreen state on Windows.
-+  if (fullscreen) {
-+    last_window_state_ = ui::SHOW_STATE_FULLSCREEN;
-+    NotifyWindowEnterFullScreen();
-+  } else {
-+    last_window_state_ = ui::SHOW_STATE_NORMAL;
-+    NotifyWindowLeaveFullScreen();
-+  }
-+  // We set the new value after notifying, so we can handle the size event
-+  // correctly.
-+  window_->SetFullscreen(fullscreen);
-+#else
-+  if (IsVisible())
-+    window_->SetFullscreen(fullscreen);
-+  else
-+    window_->native_widget_private()->ShowWithWindowState(
-+        ui::SHOW_STATE_FULLSCREEN);
-+#endif
-+}
-+
-+bool NativeWindowViews::IsFullscreen() const {
-+  return window_->IsFullscreen();
-+}
-+
-+void NativeWindowViews::SetBounds(const gfx::Rect& bounds,
-+    bool animate = false) {
-+#if defined(USE_X11)
-+  // On Linux the minimum and maximum size should be updated with window size
-+  // when window is not resizable.
-+  if (!resizable_) {
-+    SetMaximumSize(bounds.size());
-+    SetMinimumSize(bounds.size());
-+  }
-+#endif
-+
-+  window_->SetBounds(bounds);
-+}
-+
-+gfx::Rect NativeWindowViews::GetBounds() {
-+#if defined(OS_WIN)
-+  if (IsMinimized())
-+    return window_->GetRestoredBounds();
-+#endif
-+
-+  return window_->GetWindowBoundsInScreen();
-+}
-+
-+gfx::Size NativeWindowViews::GetContentSize() {
-+#if defined(OS_WIN)
-+  if (IsMinimized())
-+    return NativeWindow::GetContentSize();
-+#endif
-+
-+  return web_view_->size();
-+}
-+
-+void NativeWindowViews::SetContentSizeConstraints(
-+    const extensions::SizeConstraints& size_constraints) {
-+  NativeWindow::SetContentSizeConstraints(size_constraints);
-+  // widget_delegate() is only available after Init() is called, we make use of
-+  // this to determine whether native widget has initialized.
-+  if (window_ && window_->widget_delegate())
-+    window_->OnSizeConstraintsChanged();
-+#if defined(USE_X11)
-+  if (resizable_)
-+    old_size_constraints_ = size_constraints;
-+#endif
-+}
-+
-+void NativeWindowViews::SetResizable(bool resizable) {
-+#if defined(OS_WIN)
-+  if (!transparent())
-+    FlipWindowStyle(GetAcceleratedWidget(), resizable, WS_THICKFRAME);
-+#elif defined(USE_X11)
-+  if (resizable != resizable_) {
-+    // On Linux there is no "resizable" property of a window, we have to set
-+    // both the minimum and maximum size to the window size to achieve it.
-+    if (resizable) {
-+      SetContentSizeConstraints(old_size_constraints_);
-+    } else {
-+      old_size_constraints_ = GetContentSizeConstraints();
-+      resizable_ = false;
-+      gfx::Size content_size = GetContentSize();
-+      SetContentSizeConstraints(
-+          extensions::SizeConstraints(content_size, content_size));
-+    }
-+  }
-+#endif
-+
-+  resizable_ = resizable;
-+}
-+
-+bool NativeWindowViews::IsResizable() {
-+#if defined(OS_WIN)
-+  return ::GetWindowLong(GetAcceleratedWidget(), GWL_STYLE) & WS_THICKFRAME;
-+#else
-+  return CanResize();
-+#endif
-+}
-+
-+void NativeWindowViews::SetMovable(bool movable) {
-+  movable_ = movable;
-+}
-+
-+bool NativeWindowViews::IsMovable() {
-+#if defined(OS_WIN)
-+  return movable_;
-+#else
-+  return true;  // Not implemented on Linux.
-+#endif
-+}
-+
-+void NativeWindowViews::SetMinimizable(bool minimizable) {
-+#if defined(OS_WIN)
-+  FlipWindowStyle(GetAcceleratedWidget(), minimizable, WS_MINIMIZEBOX);
-+#endif
-+  minimizable_ = minimizable;
-+}
-+
-+bool NativeWindowViews::IsMinimizable() {
-+#if defined(OS_WIN)
-+  return ::GetWindowLong(GetAcceleratedWidget(), GWL_STYLE) & WS_MINIMIZEBOX;
-+#else
-+  return true;  // Not implemented on Linux.
-+#endif
-+}
-+
-+void NativeWindowViews::SetMaximizable(bool maximizable) {
-+#if defined(OS_WIN)
-+  FlipWindowStyle(GetAcceleratedWidget(), maximizable, WS_MAXIMIZEBOX);
-+#endif
-+  maximizable_ = maximizable;
-+}
-+
-+bool NativeWindowViews::IsMaximizable() {
-+#if defined(OS_WIN)
-+  return ::GetWindowLong(GetAcceleratedWidget(), GWL_STYLE) & WS_MAXIMIZEBOX;
-+#else
-+  return true;  // Not implemented on Linux.
-+#endif
-+}
-+
-+void NativeWindowViews::SetFullScreenable(bool fullscreenable) {
-+  fullscreenable_ = fullscreenable;
-+}
-+
-+bool NativeWindowViews::IsFullScreenable() {
-+  return fullscreenable_;
-+}
-+
-+void NativeWindowViews::SetClosable(bool closable) {
-+#if defined(OS_WIN)
-+  HMENU menu = GetSystemMenu(GetAcceleratedWidget(), false);
-+  if (closable) {
-+    EnableMenuItem(menu, SC_CLOSE, MF_BYCOMMAND | MF_ENABLED);
-+  } else {
-+    EnableMenuItem(menu, SC_CLOSE, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
-+  }
-+#endif
-+}
-+
-+bool NativeWindowViews::IsClosable() {
-+#if defined(OS_WIN)
-+  HMENU menu = GetSystemMenu(GetAcceleratedWidget(), false);
-+  MENUITEMINFO info;
-+  memset(&info, 0, sizeof(info));
-+  info.cbSize = sizeof(info);
-+  info.fMask = MIIM_STATE;
-+  if (!GetMenuItemInfo(menu, SC_CLOSE, false, &info)) {
-+    return false;
-+  }
-+  return !(info.fState & MFS_DISABLED);
-+#elif defined(USE_X11)
-+  return true;
-+#endif
-+}
-+
-+void NativeWindowViews::SetAlwaysOnTop(bool top) {
-+  window_->SetAlwaysOnTop(top);
-+}
-+
-+bool NativeWindowViews::IsAlwaysOnTop() {
-+  return window_->IsAlwaysOnTop();
-+}
-+
-+void NativeWindowViews::Center() {
-+  window_->CenterWindow(GetSize());
-+}
-+
-+void NativeWindowViews::SetTitle(const std::string& title) {
-+  title_ = title;
-+  window_->UpdateWindowTitle();
-+}
-+
-+std::string NativeWindowViews::GetTitle() {
-+  return title_;
-+}
-+
-+void NativeWindowViews::FlashFrame(bool flash) {
-+#if defined(OS_WIN)
-+  // The Chromium's implementation has a bug stopping flash.
-+  if (!flash) {
-+    FLASHWINFO fwi;
-+    fwi.cbSize = sizeof(fwi);
-+    fwi.hwnd = GetAcceleratedWidget();
-+    fwi.dwFlags = FLASHW_STOP;
-+    fwi.uCount = 0;
-+    FlashWindowEx(&fwi);
-+    return;
-+  }
-+#endif
-+  window_->FlashFrame(flash);
-+}
-+
-+void NativeWindowViews::SetSkipTaskbar(bool skip) {
-+#if defined(OS_WIN)
-+  base::win::ScopedComPtr<ITaskbarList> taskbar;
-+  if (FAILED(taskbar.CreateInstance(CLSID_TaskbarList, NULL,
-+                                    CLSCTX_INPROC_SERVER)) ||
-+      FAILED(taskbar->HrInit()))
-+    return;
-+  if (skip)
-+    taskbar->DeleteTab(GetAcceleratedWidget());
-+  else
-+    taskbar->AddTab(GetAcceleratedWidget());
-+#elif defined(USE_X11)
-+  SetWMSpecState(GetAcceleratedWidget(), skip,
-+                 GetAtom("_NET_WM_STATE_SKIP_TASKBAR"));
-+#endif
-+}
-+
-+void NativeWindowViews::SetKiosk(bool kiosk) {
-+  SetFullScreen(kiosk);
-+}
-+
-+bool NativeWindowViews::IsKiosk() {
-+  return IsFullscreen();
-+}
-+
-+void NativeWindowViews::SetBackgroundColor(const std::string& color_name) {
-+  // web views' background color.
-+  SkColor background_color = NativeWindow::ParseHexColor(color_name);
-+  set_background(views::Background::CreateSolidBackground(background_color));
-+
-+#if defined(OS_WIN)
-+  // Set the background color of native window.
-+  HBRUSH brush = CreateSolidBrush(skia::SkColorToCOLORREF(background_color));
-+  ULONG_PTR previous_brush = SetClassLongPtr(
-+      GetAcceleratedWidget(), GCLP_HBRBACKGROUND, (LONG)brush);
-+  if (previous_brush)
-+    DeleteObject((HBRUSH)previous_brush);
-+#endif
-+}
-+
-+void NativeWindowViews::SetHasShadow(bool has_shadow) {
-+  wm::SetShadowType(
-+      GetNativeWindow(),
-+      has_shadow ? wm::SHADOW_TYPE_RECTANGULAR : wm::SHADOW_TYPE_NONE);
-+}
-+
-+bool NativeWindowViews::HasShadow() {
-+  return wm::GetShadowType(GetNativeWindow()) != wm::SHADOW_TYPE_NONE;
-+}
-+
-+void NativeWindowViews::SetMenu(ui::MenuModel* menu_model) {
-+  if (menu_model == nullptr) {
-+    // Remove accelerators
-+    accelerator_table_.clear();
-+    GetFocusManager()->UnregisterAccelerators(this);
-+    // and menu bar.
-+#if defined(USE_X11)
-+    global_menu_bar_.reset();
-+#endif
-+    SetMenuBarVisibility(false);
-+    menu_bar_.reset();
-+    return;
-+  }
-+
-+  RegisterAccelerators(menu_model);
-+
-+#if defined(USE_X11)
-+  if (!global_menu_bar_ && ShouldUseGlobalMenuBar())
-+    global_menu_bar_.reset(new GlobalMenuBarX11(this));
-+
-+  // Use global application menu bar when possible.
-+  if (global_menu_bar_ && global_menu_bar_->IsServerStarted()) {
-+    global_menu_bar_->SetMenu(menu_model);
-+    return;
-+  }
-+#endif
-+
-+  // Do not show menu bar in frameless window.
-+  if (!has_frame())
-+    return;
-+
-+  if (!menu_bar_) {
-+    gfx::Size content_size = GetContentSize();
-+    menu_bar_.reset(new MenuBar);
-+    menu_bar_->set_owned_by_client();
-+
-+    if (!menu_bar_autohide_) {
-+      SetMenuBarVisibility(true);
-+      if (use_content_size_) {
-+        // Enlarge the size constraints for the menu.
-+        extensions::SizeConstraints constraints = GetContentSizeConstraints();
-+        if (constraints.HasMinimumSize()) {
-+          gfx::Size min_size = constraints.GetMinimumSize();
-+          min_size.set_height(min_size.height() + kMenuBarHeight);
-+          constraints.set_minimum_size(min_size);
-+        }
-+        if (constraints.HasMaximumSize()) {
-+          gfx::Size max_size = constraints.GetMaximumSize();
-+          max_size.set_height(max_size.height() + kMenuBarHeight);
-+          constraints.set_maximum_size(max_size);
-+        }
-+        SetContentSizeConstraints(constraints);
-+
-+        // Resize the window to make sure content size is not changed.
-+        SetContentSize(content_size);
-+      }
-+    }
-+  }
-+
-+  menu_bar_->SetMenu(menu_model);
-+  Layout();
-+}
-+
-+gfx::NativeWindow NativeWindowViews::GetNativeWindow() {
-+  return window_->GetNativeWindow();
-+}
-+
-+void NativeWindowViews::SetProgressBar(double progress) {
-+#if defined(OS_WIN)
-+  taskbar_host_.SetProgressBar(GetAcceleratedWidget(), progress);
-+#elif defined(USE_X11)
-+  if (unity::IsRunning()) {
-+    unity::SetProgressFraction(progress);
-+  }
-+#endif
-+}
-+
-+void NativeWindowViews::SetOverlayIcon(const gfx::Image& overlay,
-+                                       const std::string& description) {
-+#if defined(OS_WIN)
-+  taskbar_host_.SetOverlayIcon(GetAcceleratedWidget(), overlay, description);
-+#endif
-+}
-+
-+void NativeWindowViews::SetAutoHideMenuBar(bool auto_hide) {
-+  menu_bar_autohide_ = auto_hide;
-+}
-+
-+bool NativeWindowViews::IsMenuBarAutoHide() {
-+  return menu_bar_autohide_;
-+}
-+
-+void NativeWindowViews::SetMenuBarVisibility(bool visible) {
-+  if (!menu_bar_ || menu_bar_visible_ == visible)
-+    return;
-+
-+  // Always show the accelerator when the auto-hide menu bar shows.
-+  if (menu_bar_autohide_)
-+    menu_bar_->SetAcceleratorVisibility(visible);
-+
-+  menu_bar_visible_ = visible;
-+  if (visible) {
-+    DCHECK_EQ(child_count(), 1);
-+    AddChildView(menu_bar_.get());
-+  } else {
-+    DCHECK_EQ(child_count(), 2);
-+    RemoveChildView(menu_bar_.get());
-+  }
-+
-+  Layout();
-+}
-+
-+bool NativeWindowViews::IsMenuBarVisible() {
-+  return menu_bar_visible_;
-+}
-+
-+void NativeWindowViews::SetVisibleOnAllWorkspaces(bool visible) {
-+  window_->SetVisibleOnAllWorkspaces(visible);
-+}
-+
-+bool NativeWindowViews::IsVisibleOnAllWorkspaces() {
-+#if defined(USE_X11)
-+  // Use the presence/absence of _NET_WM_STATE_STICKY in _NET_WM_STATE to
-+  // determine whether the current window is visible on all workspaces.
-+  XAtom sticky_atom = GetAtom("_NET_WM_STATE_STICKY");
-+  std::vector<XAtom> wm_states;
-+  ui::GetElectronArrayProperty(GetAcceleratedWidget(), "_NET_WM_STATE", &wm_states);
-+  return std::find(wm_states.begin(),
-+                   wm_states.end(), sticky_atom) != wm_states.end();
-+#endif
-+  return false;
-+}
-+
-+gfx::AcceleratedWidget NativeWindowViews::GetAcceleratedWidget() {
-+  return GetNativeWindow()->GetHost()->GetAcceleratedWidget();
-+}
-+
-+void NativeWindowViews::OnWidgetActivationChanged(
-+    views::Widget* widget, bool active) {
-+  if (widget != window_.get())
-+    return;
-+
-+  if (active)
-+    NotifyWindowFocus();
-+  else
-+    NotifyWindowBlur();
-+
-+  if (active && inspectable_web_contents() &&
-+      !inspectable_web_contents()->IsDevToolsViewShowing())
-+    web_contents()->Focus();
-+
-+  // Hide menu bar when window is blured.
-+  if (!active && menu_bar_autohide_ && menu_bar_visible_)
-+    SetMenuBarVisibility(false);
-+}
-+
-+void NativeWindowViews::OnWidgetBoundsChanged(
-+    views::Widget* widget, const gfx::Rect& bounds) {
-+  if (widget != window_.get())
-+    return;
-+
-+  if (widget_size_ != bounds.size()) {
-+    NotifyWindowResize();
-+    widget_size_ = bounds.size();
-+  }
-+}
-+
-+void NativeWindowViews::DeleteDelegate() {
-+  NotifyWindowClosed();
-+}
-+
-+views::View* NativeWindowViews::GetInitiallyFocusedView() {
-+  return inspectable_web_contents()->GetView()->GetWebView();
-+}
-+
-+bool NativeWindowViews::CanResize() const {
-+  return resizable_;
-+}
-+
-+bool NativeWindowViews::CanMaximize() const {
-+  return resizable_ && maximizable_;
-+}
-+
-+bool NativeWindowViews::CanMinimize() const {
-+#if defined(OS_WIN)
-+  return minimizable_;
-+#elif defined(USE_X11)
-+  return true;
-+#endif
-+}
-+
-+base::string16 NativeWindowViews::GetWindowTitle() const {
-+  return base::UTF8ToUTF16(title_);
-+}
-+
-+bool NativeWindowViews::ShouldHandleSystemCommands() const {
-+  return true;
-+}
-+
-+gfx::ImageSkia NativeWindowViews::GetWindowAppIcon() {
-+  return icon();
-+}
-+
-+gfx::ImageSkia NativeWindowViews::GetWindowIcon() {
-+  return GetWindowAppIcon();
-+}
-+
-+views::Widget* NativeWindowViews::GetWidget() {
-+  return window_.get();
-+}
-+
-+const views::Widget* NativeWindowViews::GetWidget() const {
-+  return window_.get();
-+}
-+
-+views::View* NativeWindowViews::GetContentsView() {
-+  return this;
-+}
-+
-+bool NativeWindowViews::ShouldDescendIntoChildForEventHandling(
-+    gfx::NativeView child,
-+    const gfx::Point& location) {
-+  // App window should claim mouse events that fall within the draggable region.
-+  if (draggable_region() &&
-+      draggable_region()->contains(location.x(), location.y()))
-+    return false;
-+
-+  // And the events on border for dragging resizable frameless window.
-+  if (!has_frame() && CanResize()) {
-+    FramelessView* frame = static_cast<FramelessView*>(
-+        window_->non_client_view()->frame_view());
-+    return frame->ResizingBorderHitTest(location) == HTNOWHERE;
-+  }
-+
-+  return true;
-+}
-+
-+views::ClientView* NativeWindowViews::CreateClientView(views::Widget* widget) {
-+  return new NativeWindowClientView(widget, this);
-+}
-+
-+views::NonClientFrameView* NativeWindowViews::CreateNonClientFrameView(
-+    views::Widget* widget) {
-+#if defined(OS_WIN)
-+  WinFrameView* frame_view = new WinFrameView;
-+  frame_view->Init(this, widget);
-+  return frame_view;
-+#else
-+  if (has_frame()) {
-+    return new NativeFrameView(this, widget);
-+  } else {
-+    FramelessView* frame_view = new FramelessView;
-+    frame_view->Init(this, widget);
-+    return frame_view;
-+  }
-+#endif
-+}
-+
-+void NativeWindowViews::OnWidgetMove() {
-+  NotifyWindowMove();
-+}
-+
-+gfx::Size NativeWindowViews::ContentSizeToWindowSize(const gfx::Size& size) {
-+  if (!has_frame())
-+    return size;
-+
-+  gfx::Size window_size(size);
-+#if defined(OS_WIN)
-+  gfx::Rect dpi_bounds =
-+      gfx::Rect(gfx::Point(), gfx::win::DIPToScreenSize(size));
-+  gfx::Rect window_bounds = gfx::win::ScreenToDIPRect(
-+      window_->non_client_view()->GetWindowBoundsForClientBounds(dpi_bounds));
-+  window_size = window_bounds.size();
-+#endif
-+
-+  if (menu_bar_ && menu_bar_visible_)
-+    window_size.set_height(window_size.height() + kMenuBarHeight);
-+  return window_size;
-+}
-+
-+gfx::Size NativeWindowViews::WindowSizeToContentSize(const gfx::Size& size) {
-+  if (!has_frame())
-+    return size;
-+
-+  gfx::Size content_size(size);
-+#if defined(OS_WIN)
-+  content_size = gfx::win::DIPToScreenSize(content_size);
-+  RECT rect;
-+  SetRectEmpty(&rect);
-+  HWND hwnd = GetAcceleratedWidget();
-+  DWORD style = ::GetWindowLong(hwnd, GWL_STYLE);
-+  DWORD ex_style = ::GetWindowLong(hwnd, GWL_EXSTYLE);
-+  AdjustWindowRectEx(&rect, style, FALSE, ex_style);
-+  content_size.set_width(content_size.width() - (rect.right - rect.left));
-+  content_size.set_height(content_size.height() - (rect.bottom - rect.top));
-+  content_size = gfx::win::ScreenToDIPSize(content_size);
-+#endif
-+
-+  if (menu_bar_ && menu_bar_visible_)
-+    content_size.set_height(content_size.height() - kMenuBarHeight);
-+  return content_size;
-+}
-+
-+void NativeWindowViews::HandleKeyboardEvent(
-+    content::WebContents*,
-+    const content::NativeWebKeyboardEvent& event) {
-+  keyboard_event_handler_->HandleKeyboardEvent(event, GetFocusManager());
-+
-+  if (!menu_bar_)
-+    return;
-+
-+  // Show accelerator when "Alt" is pressed.
-+  if (menu_bar_visible_ && IsAltKey(event))
-+    menu_bar_->SetAcceleratorVisibility(
-+        event.type == blink::WebInputEvent::RawKeyDown);
-+
-+  // Show the submenu when "Alt+Key" is pressed.
-+  if (event.type == blink::WebInputEvent::RawKeyDown && !IsAltKey(event) &&
-+      IsAltModifier(event)) {
-+    if (!menu_bar_visible_ &&
-+        (menu_bar_->GetAcceleratorIndex(event.windowsKeyCode) != -1))
-+      SetMenuBarVisibility(true);
-+    menu_bar_->ActivateAccelerator(event.windowsKeyCode);
-+    return;
-+  }
-+
-+  if (!menu_bar_autohide_)
-+    return;
-+
-+  // Toggle the menu bar only when a single Alt is released.
-+  if (event.type == blink::WebInputEvent::RawKeyDown && IsAltKey(event)) {
-+    // When a single Alt is pressed:
-+    menu_bar_alt_pressed_ = true;
-+  } else if (event.type == blink::WebInputEvent::KeyUp && IsAltKey(event) &&
-+             menu_bar_alt_pressed_) {
-+    // When a single Alt is released right after a Alt is pressed:
-+    menu_bar_alt_pressed_ = false;
-+    SetMenuBarVisibility(!menu_bar_visible_);
-+  } else {
-+    // When any other keys except single Alt have been pressed/released:
-+    menu_bar_alt_pressed_ = false;
-+  }
-+}
-+
-+gfx::Size NativeWindowViews::GetMinimumSize() {
-+  return NativeWindow::GetMinimumSize();
-+}
-+
-+gfx::Size NativeWindowViews::GetMaximumSize() {
-+  return NativeWindow::GetMaximumSize();
-+}
-+
-+bool NativeWindowViews::AcceleratorPressed(const ui::Accelerator& accelerator) {
-+  return accelerator_util::TriggerAcceleratorTableCommand(
-+      &accelerator_table_, accelerator);
-+}
-+
-+void NativeWindowViews::RegisterAccelerators(ui::MenuModel* menu_model) {
-+  // Clear previous accelerators.
-+  views::FocusManager* focus_manager = GetFocusManager();
-+  accelerator_table_.clear();
-+  focus_manager->UnregisterAccelerators(this);
-+
-+  // Register accelerators with focus manager.
-+  accelerator_util::GenerateAcceleratorTable(&accelerator_table_, menu_model);
-+  accelerator_util::AcceleratorTable::const_iterator iter;
-+  for (iter = accelerator_table_.begin();
-+       iter != accelerator_table_.end();
-+       ++iter) {
-+    focus_manager->RegisterAccelerator(
-+        iter->first, ui::AcceleratorManager::kNormalPriority, this);
-+  }
-+}
-+
-+ui::WindowShowState NativeWindowViews::GetRestoredState() {
-+  if (IsMaximized())
-+    return ui::SHOW_STATE_MAXIMIZED;
-+  if (IsFullscreen())
-+    return ui::SHOW_STATE_FULLSCREEN;
-+
-+  return ui::SHOW_STATE_NORMAL;
-+}
-+
-+// static
-+NativeWindow* NativeWindow::Create(
-+    brightray::InspectableWebContents* inspectable_web_contents,
-+    const mate::Dictionary& options) {
-+  return new NativeWindowViews(inspectable_web_contents, options);
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 1412c047227d6fae7bba45289031615e3d76718c electron/browser/native_window_views.h
-@@ -0,0 +1,224 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_NATIVE_WINDOW_VIEWS_H_
-+#define ELECTRON_BROWSER_NATIVE_WINDOW_VIEWS_H_
-+
-+#include "electron/browser/native_window.h"
-+
-+#include <string>
-+#include <vector>
-+
-+#include "electron/browser/ui/accelerator_util.h"
-+#include "ui/views/widget/widget_delegate.h"
-+#include "ui/views/widget/widget_observer.h"
-+
-+#if defined(OS_WIN)
-+#include "electron/browser/ui/win/message_handler_delegate.h"
-+#include "electron/browser/ui/win/taskbar_host.h"
-+#endif
-+
-+namespace views {
-+class UnhandledKeyboardEventHandler;
-+}
-+
-+namespace electron {
-+
-+class GlobalMenuBarX11;
-+class MenuBar;
-+class WindowStateWatcher;
-+
-+#if defined(OS_WIN)
-+class ElectronDesktopWindowTreeHostWin;
-+#endif
-+
-+class NativeWindowViews : public NativeWindow,
-+#if defined(OS_WIN)
-+                          public MessageHandlerDelegate,
-+#endif
-+                          public views::WidgetDelegateView,
-+                          public views::WidgetObserver {
-+ public:
-+  NativeWindowViews(brightray::InspectableWebContents* inspectable_web_contents,
-+                    const mate::Dictionary& options);
-+  ~NativeWindowViews() override;
-+
-+  // NativeWindow:
-+  void Close() override;
-+  void CloseImmediately() override;
-+  void Focus(bool focus) override;
-+  bool IsFocused() override;
-+  void Show() override;
-+  void ShowInactive() override;
-+  void Hide() override;
-+  bool IsVisible() override;
-+  void Maximize() override;
-+  void Unmaximize() override;
-+  bool IsMaximized() override;
-+  void Minimize() override;
-+  void Restore() override;
-+  bool IsMinimized() override;
-+  void SetFullScreen(bool fullscreen) override;
-+  bool IsFullscreen() const override;
-+  void SetBounds(const gfx::Rect& bounds, bool animate) override;
-+  gfx::Rect GetBounds() override;
-+  gfx::Size GetContentSize() override;
-+  void SetContentSizeConstraints(
-+      const extensions::SizeConstraints& size_constraints) override;
-+  void SetResizable(bool resizable) override;
-+  bool IsResizable() override;
-+  void SetMovable(bool movable) override;
-+  bool IsMovable() override;
-+  void SetMinimizable(bool minimizable) override;
-+  bool IsMinimizable() override;
-+  void SetMaximizable(bool maximizable) override;
-+  bool IsMaximizable() override;
-+  void SetFullScreenable(bool fullscreenable) override;
-+  bool IsFullScreenable() override;
-+  void SetClosable(bool closable) override;
-+  bool IsClosable() override;
-+  void SetAlwaysOnTop(bool top) override;
-+  bool IsAlwaysOnTop() override;
-+  void Center() override;
-+  void SetTitle(const std::string& title) override;
-+  std::string GetTitle() override;
-+  void FlashFrame(bool flash) override;
-+  void SetSkipTaskbar(bool skip) override;
-+  void SetKiosk(bool kiosk) override;
-+  bool IsKiosk() override;
-+  void SetBackgroundColor(const std::string& color_name) override;
-+  void SetHasShadow(bool has_shadow) override;
-+  bool HasShadow() override;
-+  void SetMenu(ui::MenuModel* menu_model) override;
-+  gfx::NativeWindow GetNativeWindow() override;
-+  void SetOverlayIcon(const gfx::Image& overlay,
-+                      const std::string& description) override;
-+  void SetProgressBar(double value) override;
-+  void SetAutoHideMenuBar(bool auto_hide) override;
-+  bool IsMenuBarAutoHide() override;
-+  void SetMenuBarVisibility(bool visible) override;
-+  bool IsMenuBarVisible() override;
-+  void SetVisibleOnAllWorkspaces(bool visible) override;
-+  bool IsVisibleOnAllWorkspaces() override;
-+
-+  gfx::AcceleratedWidget GetAcceleratedWidget() override;
-+
-+  views::Widget* widget() const { return window_.get(); }
-+
-+#if defined(OS_WIN)
-+  TaskbarHost& taskbar_host() { return taskbar_host_; }
-+#endif
-+
-+ private:
-+  // views::WidgetObserver:
-+  void OnWidgetActivationChanged(
-+      views::Widget* widget, bool active) override;
-+  void OnWidgetBoundsChanged(
-+      views::Widget* widget, const gfx::Rect& bounds) override;
-+
-+  // views::WidgetDelegate:
-+  void DeleteDelegate() override;
-+  views::View* GetInitiallyFocusedView() override;
-+  bool CanResize() const override;
-+  bool CanMaximize() const override;
-+  bool CanMinimize() const override;
-+  base::string16 GetWindowTitle() const override;
-+  bool ShouldHandleSystemCommands() const override;
-+  gfx::ImageSkia GetWindowAppIcon() override;
-+  gfx::ImageSkia GetWindowIcon() override;
-+  views::Widget* GetWidget() override;
-+  const views::Widget* GetWidget() const override;
-+  views::View* GetContentsView() override;
-+  bool ShouldDescendIntoChildForEventHandling(
-+     gfx::NativeView child,
-+     const gfx::Point& location) override;
-+  views::ClientView* CreateClientView(views::Widget* widget) override;
-+  views::NonClientFrameView* CreateNonClientFrameView(
-+      views::Widget* widget) override;
-+  void OnWidgetMove() override;
-+#if defined(OS_WIN)
-+  bool ExecuteWindowsCommand(int command_id) override;
-+#endif
-+
-+#if defined(OS_WIN)
-+  // MessageHandlerDelegate:
-+  bool PreHandleMSG(
-+      UINT message, WPARAM w_param, LPARAM l_param, LRESULT* result) override;
-+
-+  void HandleSizeEvent(WPARAM w_param, LPARAM l_param);
-+#endif
-+
-+  // NativeWindow:
-+  gfx::Size ContentSizeToWindowSize(const gfx::Size& size) override;
-+  gfx::Size WindowSizeToContentSize(const gfx::Size& size) override;
-+  void HandleKeyboardEvent(
-+      content::WebContents*,
-+      const content::NativeWebKeyboardEvent& event) override;
-+
-+  // views::View:
-+  gfx::Size GetMinimumSize() override;
-+  gfx::Size GetMaximumSize() override;
-+  bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
-+
-+  // Register accelerators supported by the menu model.
-+  void RegisterAccelerators(ui::MenuModel* menu_model);
-+
-+  // Returns the restore state for the window.
-+  ui::WindowShowState GetRestoredState();
-+
-+  scoped_ptr<views::Widget> window_;
-+  views::View* web_view_;  // Managed by inspectable_web_contents_.
-+
-+  scoped_ptr<MenuBar> menu_bar_;
-+  bool menu_bar_autohide_;
-+  bool menu_bar_visible_;
-+  bool menu_bar_alt_pressed_;
-+
-+#if defined(USE_X11)
-+  scoped_ptr<GlobalMenuBarX11> global_menu_bar_;
-+
-+  // Handles window state events.
-+  scoped_ptr<WindowStateWatcher> window_state_watcher_;
-+
-+  // The "resizable" flag on Linux is implemented by setting size constraints,
-+  // we need to make sure size constraints are restored when window becomes
-+  // resizable again.
-+  extensions::SizeConstraints old_size_constraints_;
-+#elif defined(OS_WIN)
-+  // Weak ref.
-+  ElectronDesktopWindowTreeHostWin* electron_desktop_window_tree_host_win_;
-+
-+  ui::WindowShowState last_window_state_;
-+
-+  // There's an issue with restore on Windows, that sometimes causes the Window
-+  // to receive the wrong size (#2498). To circumvent that, we keep tabs on the
-+  // size of the window while in the normal state (not maximized, minimized or
-+  // fullscreen), so we restore it correctly.
-+  gfx::Size last_normal_size_;
-+
-+  // In charge of running taskbar related APIs.
-+  TaskbarHost taskbar_host_;
-+#endif
-+
-+  // Handles unhandled keyboard messages coming back from the renderer process.
-+  scoped_ptr<views::UnhandledKeyboardEventHandler> keyboard_event_handler_;
-+
-+  // Map from accelerator to menu item's command id.
-+  accelerator_util::AcceleratorTable accelerator_table_;
-+
-+  bool use_content_size_;
-+  bool movable_;
-+  bool resizable_;
-+  bool maximizable_;
-+  bool minimizable_;
-+  bool fullscreenable_;
-+  std::string title_;
-+  gfx::Size widget_size_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(NativeWindowViews);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_NATIVE_WINDOW_VIEWS_H_
-added in remote
-  their  100644 ccc583f4004e7f8489d1d0fa918d2d8253c88e13 electron/browser/native_window_views_win.cc
-@@ -0,0 +1,156 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/native_window_views.h"
-+#include "content/public/browser/browser_accessibility_state.h"
-+
-+namespace electron {
-+
-+namespace {
-+
-+// Convert Win32 WM_APPCOMMANDS to strings.
-+const char* AppCommandToString(int command_id) {
-+  switch (command_id) {
-+    case APPCOMMAND_BROWSER_BACKWARD       : return "browser-backward";
-+    case APPCOMMAND_BROWSER_FORWARD        : return "browser-forward";
-+    case APPCOMMAND_BROWSER_REFRESH        : return "browser-refresh";
-+    case APPCOMMAND_BROWSER_STOP           : return "browser-stop";
-+    case APPCOMMAND_BROWSER_SEARCH         : return "browser-search";
-+    case APPCOMMAND_BROWSER_FAVORITES      : return "browser-favorites";
-+    case APPCOMMAND_BROWSER_HOME           : return "browser-home";
-+    case APPCOMMAND_VOLUME_MUTE            : return "volume-mute";
-+    case APPCOMMAND_VOLUME_DOWN            : return "volume-down";
-+    case APPCOMMAND_VOLUME_UP              : return "volume-up";
-+    case APPCOMMAND_MEDIA_NEXTTRACK        : return "media-nexttrack";
-+    case APPCOMMAND_MEDIA_PREVIOUSTRACK    : return "media-previoustrack";
-+    case APPCOMMAND_MEDIA_STOP             : return "media-stop";
-+    case APPCOMMAND_MEDIA_PLAY_PAUSE       : return "media-play_pause";
-+    case APPCOMMAND_LAUNCH_MAIL            : return "launch-mail";
-+    case APPCOMMAND_LAUNCH_MEDIA_SELECT    : return "launch-media-select";
-+    case APPCOMMAND_LAUNCH_APP1            : return "launch-app1";
-+    case APPCOMMAND_LAUNCH_APP2            : return "launch-app2";
-+    case APPCOMMAND_BASS_DOWN              : return "bass-down";
-+    case APPCOMMAND_BASS_BOOST             : return "bass-boost";
-+    case APPCOMMAND_BASS_UP                : return "bass-up";
-+    case APPCOMMAND_TREBLE_DOWN            : return "treble-down";
-+    case APPCOMMAND_TREBLE_UP              : return "treble-up";
-+    case APPCOMMAND_MICROPHONE_VOLUME_MUTE : return "microphone-volume-mute";
-+    case APPCOMMAND_MICROPHONE_VOLUME_DOWN : return "microphone-volume-down";
-+    case APPCOMMAND_MICROPHONE_VOLUME_UP   : return "microphone-volume-up";
-+    case APPCOMMAND_HELP                   : return "help";
-+    case APPCOMMAND_FIND                   : return "find";
-+    case APPCOMMAND_NEW                    : return "new";
-+    case APPCOMMAND_OPEN                   : return "open";
-+    case APPCOMMAND_CLOSE                  : return "close";
-+    case APPCOMMAND_SAVE                   : return "save";
-+    case APPCOMMAND_PRINT                  : return "print";
-+    case APPCOMMAND_UNDO                   : return "undo";
-+    case APPCOMMAND_REDO                   : return "redo";
-+    case APPCOMMAND_COPY                   : return "copy";
-+    case APPCOMMAND_CUT                    : return "cut";
-+    case APPCOMMAND_PASTE                  : return "paste";
-+    case APPCOMMAND_REPLY_TO_MAIL          : return "reply-to-mail";
-+    case APPCOMMAND_FORWARD_MAIL           : return "forward-mail";
-+    case APPCOMMAND_SEND_MAIL              : return "send-mail";
-+    case APPCOMMAND_SPELL_CHECK            : return "spell-check";
-+    case APPCOMMAND_MIC_ON_OFF_TOGGLE      : return "mic-on-off-toggle";
-+    case APPCOMMAND_CORRECTION_LIST        : return "correction-list";
-+    case APPCOMMAND_MEDIA_PLAY             : return "media-play";
-+    case APPCOMMAND_MEDIA_PAUSE            : return "media-pause";
-+    case APPCOMMAND_MEDIA_RECORD           : return "media-record";
-+    case APPCOMMAND_MEDIA_FAST_FORWARD     : return "media-fast-forward";
-+    case APPCOMMAND_MEDIA_REWIND           : return "media-rewind";
-+    case APPCOMMAND_MEDIA_CHANNEL_UP       : return "media-channel-up";
-+    case APPCOMMAND_MEDIA_CHANNEL_DOWN     : return "media-channel-down";
-+    case APPCOMMAND_DELETE                 : return "delete";
-+    case APPCOMMAND_DICTATE_OR_COMMAND_CONTROL_TOGGLE:
-+      return "dictate-or-command-control-toggle";
-+    default:
-+      return "unknown";
-+  }
-+}
-+
-+}  // namespace
-+
-+bool NativeWindowViews::ExecuteWindowsCommand(int command_id) {
-+  std::string command = AppCommandToString(command_id);
-+  NotifyWindowExecuteWindowsCommand(command);
-+  return false;
-+}
-+
-+bool NativeWindowViews::PreHandleMSG(
-+    UINT message, WPARAM w_param, LPARAM l_param, LRESULT* result) {
-+  NotifyWindowMessage(message, w_param, l_param);
-+
-+  switch (message) {
-+    case WM_COMMAND:
-+      // Handle thumbar button click message.
-+      if (HIWORD(w_param) == THBN_CLICKED)
-+        return taskbar_host_.HandleThumbarButtonEvent(LOWORD(w_param));
-+      return false;
-+
-+    case WM_SIZE:
-+      // Handle window state change.
-+      HandleSizeEvent(w_param, l_param);
-+      return false;
-+
-+    case WM_MOVING: {
-+      if (!movable_)
-+        ::GetWindowRect(GetAcceleratedWidget(), (LPRECT)l_param);
-+      return false;
-+    }
-+
-+    default:
-+      return false;
-+  }
-+}
-+
-+void NativeWindowViews::HandleSizeEvent(WPARAM w_param, LPARAM l_param) {
-+  // Here we handle the WM_SIZE event in order to figure out what is the current
-+  // window state and notify the user accordingly.
-+  switch (w_param) {
-+    case SIZE_MAXIMIZED:
-+      last_window_state_ = ui::SHOW_STATE_MAXIMIZED;
-+      NotifyWindowMaximize();
-+      break;
-+    case SIZE_MINIMIZED:
-+      last_window_state_ = ui::SHOW_STATE_MINIMIZED;
-+      NotifyWindowMinimize();
-+      break;
-+    case SIZE_RESTORED:
-+      if (last_window_state_ == ui::SHOW_STATE_NORMAL) {
-+        // Window was resized so we save it's new size.
-+        last_normal_size_ = GetSize();
-+      } else {
-+        switch (last_window_state_) {
-+          case ui::SHOW_STATE_MAXIMIZED:
-+            last_window_state_ = ui::SHOW_STATE_NORMAL;
-+
-+            // When the window is restored we resize it to the previous known
-+            // normal size.
-+            NativeWindow::SetSize(last_normal_size_);
-+
-+            NotifyWindowUnmaximize();
-+            break;
-+          case ui::SHOW_STATE_MINIMIZED:
-+            if (IsFullscreen()) {
-+              last_window_state_ = ui::SHOW_STATE_FULLSCREEN;
-+              NotifyWindowEnterFullScreen();
-+            } else {
-+              last_window_state_ = ui::SHOW_STATE_NORMAL;
-+
-+              // When the window is restored we resize it to the previous known
-+              // normal size.
-+              NativeWindow::SetSize(last_normal_size_);
-+
-+              NotifyWindowRestore();
-+            }
-+            break;
-+        }
-+      }
-+      break;
-+  }
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 dbeabe15142fd505b5aa9ad2d3d7362876c33bc6 electron/browser/net/asar/asar_protocol_handler.cc
-@@ -0,0 +1,34 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/net/asar/asar_protocol_handler.h"
-+
-+#include "electron/browser/net/asar/url_request_asar_job.h"
-+#include "net/base/filename_util.h"
-+#include "net/base/net_errors.h"
-+
-+namespace asar {
-+
-+AsarProtocolHandler::AsarProtocolHandler(
-+    const scoped_refptr<base::TaskRunner>& file_task_runner)
-+    : file_task_runner_(file_task_runner) {}
-+
-+AsarProtocolHandler::~AsarProtocolHandler() {
-+}
-+
-+net::URLRequestJob* AsarProtocolHandler::MaybeCreateJob(
-+    net::URLRequest* request,
-+    net::NetworkDelegate* network_delegate) const {
-+  base::FilePath full_path;
-+  net::FileURLToFilePath(request->url(), &full_path);
-+  URLRequestAsarJob* job = new URLRequestAsarJob(request, network_delegate);
-+  job->Initialize(file_task_runner_, full_path);
-+  return job;
-+}
-+
-+bool AsarProtocolHandler::IsSafeRedirectTarget(const GURL& location) const {
-+  return false;
-+}
-+
-+}  // namespace asar
-added in remote
-  their  100644 98647a56e5a3103524262c947df1ee18d6ac5428 electron/browser/net/asar/asar_protocol_handler.h
-@@ -0,0 +1,37 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_NET_ASAR_ASAR_PROTOCOL_HANDLER_H_
-+#define ELECTRON_BROWSER_NET_ASAR_ASAR_PROTOCOL_HANDLER_H_
-+
-+#include "base/memory/ref_counted.h"
-+#include "net/url_request/url_request_job_factory.h"
-+
-+namespace base {
-+class TaskRunner;
-+}
-+
-+namespace asar {
-+
-+class AsarProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler {
-+ public:
-+  explicit AsarProtocolHandler(
-+      const scoped_refptr<base::TaskRunner>& file_task_runner);
-+  virtual ~AsarProtocolHandler();
-+
-+  // net::URLRequestJobFactory::ProtocolHandler:
-+  net::URLRequestJob* MaybeCreateJob(
-+      net::URLRequest* request,
-+      net::NetworkDelegate* network_delegate) const override;
-+  bool IsSafeRedirectTarget(const GURL& location) const override;
-+
-+ private:
-+  const scoped_refptr<base::TaskRunner> file_task_runner_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(AsarProtocolHandler);
-+};
-+
-+}  // namespace asar
-+
-+#endif  // ELECTRON_BROWSER_NET_ASAR_ASAR_PROTOCOL_HANDLER_H_
-added in remote
-  their  100644 dda5b8fdf29155291fec43494ec2fecd8e2b7ddd electron/browser/net/asar/url_request_asar_job.cc
-@@ -0,0 +1,346 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/net/asar/url_request_asar_job.h"
-+
-+#include <string>
-+#include <vector>
-+
-+#include "electron/common/asar/archive.h"
-+#include "electron/common/asar/asar_util.h"
-+#include "electron/common/electron_constants.h"
-+#include "base/bind.h"
-+#include "base/files/file_util.h"
-+#include "base/strings/string_util.h"
-+#include "base/synchronization/lock.h"
-+#include "base/task_runner.h"
-+#include "net/base/file_stream.h"
-+#include "net/base/filename_util.h"
-+#include "net/base/io_buffer.h"
-+#include "net/base/load_flags.h"
-+#include "net/base/mime_util.h"
-+#include "net/base/net_errors.h"
-+#include "net/filter/filter.h"
-+#include "net/http/http_util.h"
-+#include "net/url_request/url_request_status.h"
-+
-+#if defined(OS_WIN)
-+#include "base/win/shortcut.h"
-+#endif
-+
-+namespace asar {
-+
-+URLRequestAsarJob::FileMetaInfo::FileMetaInfo()
-+    : file_size(0),
-+      mime_type_result(false),
-+      file_exists(false),
-+      is_directory(false) {
-+}
-+
-+URLRequestAsarJob::URLRequestAsarJob(
-+    net::URLRequest* request,
-+    net::NetworkDelegate* network_delegate)
-+    : net::URLRequestJob(request, network_delegate),
-+      type_(TYPE_ERROR),
-+      remaining_bytes_(0),
-+      range_parse_result_(net::OK),
-+      weak_ptr_factory_(this) {}
-+
-+URLRequestAsarJob::~URLRequestAsarJob() {}
-+
-+void URLRequestAsarJob::Initialize(
-+    const scoped_refptr<base::TaskRunner> file_task_runner,
-+    const base::FilePath& file_path) {
-+  // Determine whether it is an asar file.
-+  base::FilePath asar_path, relative_path;
-+  if (!GetAsarArchivePath(file_path, &asar_path, &relative_path)) {
-+    InitializeFileJob(file_task_runner, file_path);
-+    return;
-+  }
-+
-+  std::shared_ptr<Archive> archive = GetOrCreateAsarArchive(asar_path);
-+  Archive::FileInfo file_info;
-+  if (!archive || !archive->GetFileInfo(relative_path, &file_info)) {
-+    type_ = TYPE_ERROR;
-+    return;
-+  }
-+
-+  if (file_info.unpacked) {
-+    base::FilePath real_path;
-+    archive->CopyFileOut(relative_path, &real_path);
-+    InitializeFileJob(file_task_runner, real_path);
-+    return;
-+  }
-+
-+  InitializeAsarJob(file_task_runner, archive, relative_path, file_info);
-+}
-+
-+void URLRequestAsarJob::InitializeAsarJob(
-+    const scoped_refptr<base::TaskRunner> file_task_runner,
-+    std::shared_ptr<Archive> archive,
-+    const base::FilePath& file_path,
-+    const Archive::FileInfo& file_info) {
-+  type_ = TYPE_ASAR;
-+  file_task_runner_ = file_task_runner;
-+  stream_.reset(new net::FileStream(file_task_runner_));
-+  archive_ = archive;
-+  file_path_ = file_path;
-+  file_info_ = file_info;
-+}
-+
-+void URLRequestAsarJob::InitializeFileJob(
-+    const scoped_refptr<base::TaskRunner> file_task_runner,
-+    const base::FilePath& file_path) {
-+  type_ = TYPE_FILE;
-+  file_task_runner_ = file_task_runner;
-+  stream_.reset(new net::FileStream(file_task_runner_));
-+  file_path_ = file_path;
-+}
-+
-+void URLRequestAsarJob::Start() {
-+  if (type_ == TYPE_ASAR) {
-+    remaining_bytes_ = static_cast<int64_t>(file_info_.size);
-+
-+    int flags = base::File::FLAG_OPEN |
-+                base::File::FLAG_READ |
-+                base::File::FLAG_ASYNC;
-+    int rv = stream_->Open(archive_->path(), flags,
-+                           base::Bind(&URLRequestAsarJob::DidOpen,
-+                                      weak_ptr_factory_.GetWeakPtr()));
-+    if (rv != net::ERR_IO_PENDING)
-+      DidOpen(rv);
-+  } else if (type_ == TYPE_FILE) {
-+    FileMetaInfo* meta_info = new FileMetaInfo();
-+    file_task_runner_->PostTaskAndReply(
-+        FROM_HERE,
-+        base::Bind(&URLRequestAsarJob::FetchMetaInfo, file_path_,
-+                   base::Unretained(meta_info)),
-+        base::Bind(&URLRequestAsarJob::DidFetchMetaInfo,
-+                   weak_ptr_factory_.GetWeakPtr(),
-+                   base::Owned(meta_info)));
-+  } else {
-+    NotifyStartError(net::URLRequestStatus(net::URLRequestStatus::FAILED,
-+                                           net::ERR_FILE_NOT_FOUND));
-+  }
-+}
-+
-+void URLRequestAsarJob::Kill() {
-+  stream_.reset();
-+  weak_ptr_factory_.InvalidateWeakPtrs();
-+
-+  URLRequestJob::Kill();
-+}
-+
-+int URLRequestAsarJob::ReadRawData(net::IOBuffer* dest, int dest_size) {
-+  if (remaining_bytes_ < dest_size)
-+    dest_size = static_cast<int>(remaining_bytes_);
-+
-+  // If we should copy zero bytes because |remaining_bytes_| is zero, short
-+  // circuit here.
-+  if (!dest_size)
-+    return 0;
-+
-+  int rv = stream_->Read(dest,
-+                         dest_size,
-+                         base::Bind(&URLRequestAsarJob::DidRead,
-+                                    weak_ptr_factory_.GetWeakPtr(),
-+                                    make_scoped_refptr(dest)));
-+  if (rv >= 0) {
-+    remaining_bytes_ -= rv;
-+    DCHECK_GE(remaining_bytes_, 0);
-+  }
-+
-+  return rv;
-+}
-+
-+bool URLRequestAsarJob::IsRedirectResponse(GURL* location,
-+                                           int* http_status_code) {
-+  if (type_ != TYPE_FILE)
-+    return false;
-+#if defined(OS_WIN)
-+  // Follow a Windows shortcut.
-+  // We just resolve .lnk file, ignore others.
-+  if (!base::LowerCaseEqualsASCII(file_path_.Extension(), ".lnk"))
-+    return false;
-+
-+  base::FilePath new_path = file_path_;
-+  bool resolved;
-+  resolved = base::win::ResolveShortcut(new_path, &new_path, NULL);
-+
-+  // If shortcut is not resolved succesfully, do not redirect.
-+  if (!resolved)
-+    return false;
-+
-+  *location = net::FilePathToFileURL(new_path);
-+  *http_status_code = 301;
-+  return true;
-+#else
-+  return false;
-+#endif
-+}
-+
-+net::Filter* URLRequestAsarJob::SetupFilter() const {
-+  // Bug 9936 - .svgz files needs to be decompressed.
-+  return base::LowerCaseEqualsASCII(file_path_.Extension(), ".svgz")
-+      ? net::Filter::GZipFactory() : NULL;
-+}
-+
-+bool URLRequestAsarJob::GetMimeType(std::string* mime_type) const {
-+  if (type_ == TYPE_ASAR) {
-+    return net::GetMimeTypeFromFile(file_path_, mime_type);
-+  } else {
-+    if (meta_info_.mime_type_result) {
-+      *mime_type = meta_info_.mime_type;
-+      return true;
-+    }
-+    return false;
-+  }
-+}
-+
-+void URLRequestAsarJob::SetExtraRequestHeaders(
-+    const net::HttpRequestHeaders& headers) {
-+  std::string range_header;
-+  if (headers.GetHeader(net::HttpRequestHeaders::kRange, &range_header)) {
-+    // This job only cares about the Range header. This method stashes the value
-+    // for later use in DidOpen(), which is responsible for some of the range
-+    // validation as well. NotifyStartError is not legal to call here since
-+    // the job has not started.
-+    std::vector<net::HttpByteRange> ranges;
-+    if (net::HttpUtil::ParseRangeHeader(range_header, &ranges)) {
-+      if (ranges.size() == 1) {
-+        byte_range_ = ranges[0];
-+      } else {
-+        range_parse_result_ = net::ERR_REQUEST_RANGE_NOT_SATISFIABLE;
-+      }
-+    }
-+  }
-+}
-+
-+int URLRequestAsarJob::GetResponseCode() const {
-+  // Request Job gets created only if path exists.
-+  return 200;
-+}
-+
-+void URLRequestAsarJob::GetResponseInfo(net::HttpResponseInfo* info) {
-+  std::string status("HTTP/1.1 200 OK");
-+  net::HttpResponseHeaders* headers = new net::HttpResponseHeaders(status);
-+
-+  headers->AddHeader(electron::kCORSHeader);
-+  info->headers = headers;
-+}
-+
-+void URLRequestAsarJob::FetchMetaInfo(const base::FilePath& file_path,
-+                                      FileMetaInfo* meta_info) {
-+  base::File::Info file_info;
-+  meta_info->file_exists = base::GetFileInfo(file_path, &file_info);
-+  if (meta_info->file_exists) {
-+    meta_info->file_size = file_info.size;
-+    meta_info->is_directory = file_info.is_directory;
-+  }
-+  // On Windows GetMimeTypeFromFile() goes to the registry. Thus it should be
-+  // done in WorkerPool.
-+  meta_info->mime_type_result =
-+      net::GetMimeTypeFromFile(file_path, &meta_info->mime_type);
-+}
-+
-+void URLRequestAsarJob::DidFetchMetaInfo(const FileMetaInfo* meta_info) {
-+  meta_info_ = *meta_info;
-+  if (!meta_info_.file_exists || meta_info_.is_directory) {
-+    DidOpen(net::ERR_FILE_NOT_FOUND);
-+    return;
-+  }
-+
-+  int flags = base::File::FLAG_OPEN |
-+              base::File::FLAG_READ |
-+              base::File::FLAG_ASYNC;
-+  int rv = stream_->Open(file_path_, flags,
-+                         base::Bind(&URLRequestAsarJob::DidOpen,
-+                                    weak_ptr_factory_.GetWeakPtr()));
-+  if (rv != net::ERR_IO_PENDING)
-+    DidOpen(rv);
-+}
-+
-+void URLRequestAsarJob::DidOpen(int result) {
-+  if (result != net::OK) {
-+    NotifyStartError(net::URLRequestStatus(net::URLRequestStatus::FAILED,
-+                                           result));
-+    return;
-+  }
-+
-+  if (range_parse_result_ != net::OK) {
-+    NotifyStartError(net::URLRequestStatus(net::URLRequestStatus::FAILED,
-+                                           range_parse_result_));
-+    return;
-+  }
-+
-+  if (type_ == TYPE_ASAR) {
-+    int rv = stream_->Seek(file_info_.offset,
-+                           base::Bind(&URLRequestAsarJob::DidSeek,
-+                                      weak_ptr_factory_.GetWeakPtr()));
-+    if (rv != net::ERR_IO_PENDING) {
-+      // stream_->Seek() failed, so pass an intentionally erroneous value
-+      // into DidSeek().
-+      DidSeek(-1);
-+    }
-+  } else {
-+    if (!byte_range_.ComputeBounds(meta_info_.file_size)) {
-+      NotifyStartError(
-+          net::URLRequestStatus(net::URLRequestStatus::FAILED,
-+                                net::ERR_REQUEST_RANGE_NOT_SATISFIABLE));
-+      return;
-+    }
-+
-+    remaining_bytes_ = byte_range_.last_byte_position() -
-+                       byte_range_.first_byte_position() + 1;
-+
-+    if (remaining_bytes_ > 0 && byte_range_.first_byte_position() != 0) {
-+      int rv = stream_->Seek(byte_range_.first_byte_position(),
-+                             base::Bind(&URLRequestAsarJob::DidSeek,
-+                                        weak_ptr_factory_.GetWeakPtr()));
-+      if (rv != net::ERR_IO_PENDING) {
-+        // stream_->Seek() failed, so pass an intentionally erroneous value
-+        // into DidSeek().
-+        DidSeek(-1);
-+      }
-+    } else {
-+      // We didn't need to call stream_->Seek() at all, so we pass to DidSeek()
-+      // the value that would mean seek success. This way we skip the code
-+      // handling seek failure.
-+      DidSeek(byte_range_.first_byte_position());
-+    }
-+  }
-+}
-+
-+void URLRequestAsarJob::DidSeek(int64_t result) {
-+  if (type_ == TYPE_ASAR) {
-+    if (result != static_cast<int64_t>(file_info_.offset)) {
-+      NotifyStartError(
-+          net::URLRequestStatus(net::URLRequestStatus::FAILED,
-+                                net::ERR_REQUEST_RANGE_NOT_SATISFIABLE));
-+      return;
-+    }
-+  } else {
-+    if (result != byte_range_.first_byte_position()) {
-+      NotifyStartError(
-+          net::URLRequestStatus(net::URLRequestStatus::FAILED,
-+                                net::ERR_REQUEST_RANGE_NOT_SATISFIABLE));
-+      return;
-+    }
-+  }
-+  set_expected_content_size(remaining_bytes_);
-+  NotifyHeadersComplete();
-+}
-+
-+void URLRequestAsarJob::DidRead(scoped_refptr<net::IOBuffer> buf, int result) {
-+  if (result >= 0) {
-+    remaining_bytes_ -= result;
-+    DCHECK_GE(remaining_bytes_, 0);
-+  }
-+
-+  buf = NULL;
-+
-+  ReadRawDataComplete(result);
-+}
-+
-+}  // namespace asar
-added in remote
-  their  100644 e4c5320cf4d68838c136d0f94bd84ecaab373a39 electron/browser/net/asar/url_request_asar_job.h
-@@ -0,0 +1,131 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_NET_ASAR_URL_REQUEST_ASAR_JOB_H_
-+#define ELECTRON_BROWSER_NET_ASAR_URL_REQUEST_ASAR_JOB_H_
-+
-+#include <memory>
-+#include <string>
-+
-+#include "electron/browser/net/js_asker.h"
-+#include "electron/common/asar/archive.h"
-+#include "base/files/file_path.h"
-+#include "base/memory/ref_counted.h"
-+#include "base/memory/weak_ptr.h"
-+#include "net/http/http_byte_range.h"
-+#include "net/url_request/url_request_job.h"
-+
-+namespace base {
-+class TaskRunner;
-+}
-+
-+namespace net {
-+class FileStream;
-+}
-+
-+namespace asar {
-+
-+// Createa a request job according to the file path.
-+net::URLRequestJob* CreateJobFromPath(
-+    const base::FilePath& full_path,
-+    net::URLRequest* request,
-+    net::NetworkDelegate* network_delegate,
-+    const scoped_refptr<base::TaskRunner> file_task_runner);
-+
-+class URLRequestAsarJob : public net::URLRequestJob {
-+ public:
-+  URLRequestAsarJob(net::URLRequest* request,
-+                    net::NetworkDelegate* network_delegate);
-+
-+  void Initialize(const scoped_refptr<base::TaskRunner> file_task_runner,
-+                  const base::FilePath& file_path);
-+
-+ protected:
-+  virtual ~URLRequestAsarJob();
-+
-+  void InitializeAsarJob(const scoped_refptr<base::TaskRunner> file_task_runner,
-+                         std::shared_ptr<Archive> archive,
-+                         const base::FilePath& file_path,
-+                         const Archive::FileInfo& file_info);
-+  void InitializeFileJob(const scoped_refptr<base::TaskRunner> file_task_runner,
-+                         const base::FilePath& file_path);
-+
-+  // net::URLRequestJob:
-+  void Start() override;
-+  void Kill() override;
-+  int ReadRawData(net::IOBuffer* buf, int buf_size) override;
-+  bool IsRedirectResponse(GURL* location, int* http_status_code) override;
-+  net::Filter* SetupFilter() const override;
-+  bool GetMimeType(std::string* mime_type) const override;
-+  void SetExtraRequestHeaders(const net::HttpRequestHeaders& headers) override;
-+  int GetResponseCode() const override;
-+  void GetResponseInfo(net::HttpResponseInfo* info) override;
-+
-+ private:
-+  // Meta information about the file. It's used as a member in the
-+  // URLRequestFileJob and also passed between threads because disk access is
-+  // necessary to obtain it.
-+  struct FileMetaInfo {
-+    FileMetaInfo();
-+
-+    // Size of the file.
-+    int64_t file_size;
-+    // Mime type associated with the file.
-+    std::string mime_type;
-+    // Result returned from GetMimeTypeFromFile(), i.e. flag showing whether
-+    // obtaining of the mime type was successful.
-+    bool mime_type_result;
-+    // Flag showing whether the file exists.
-+    bool file_exists;
-+    // Flag showing whether the file name actually refers to a directory.
-+    bool is_directory;
-+  };
-+
-+  // Fetches file info on a background thread.
-+  static void FetchMetaInfo(const base::FilePath& file_path,
-+                            FileMetaInfo* meta_info);
-+
-+  // Callback after fetching file info on a background thread.
-+  void DidFetchMetaInfo(const FileMetaInfo* meta_info);
-+
-+
-+  // Callback after opening file on a background thread.
-+  void DidOpen(int result);
-+
-+  // Callback after seeking to the beginning of |byte_range_| in the file
-+  // on a background thread.
-+  void DidSeek(int64_t result);
-+
-+  // Callback after data is asynchronously read from the file into |buf|.
-+  void DidRead(scoped_refptr<net::IOBuffer> buf, int result);
-+
-+  // The type of this job.
-+  enum JobType {
-+    TYPE_ERROR,
-+    TYPE_ASAR,
-+    TYPE_FILE,
-+  };
-+  JobType type_;
-+
-+  std::shared_ptr<Archive> archive_;
-+  base::FilePath file_path_;
-+  Archive::FileInfo file_info_;
-+
-+  scoped_ptr<net::FileStream> stream_;
-+  FileMetaInfo meta_info_;
-+  scoped_refptr<base::TaskRunner> file_task_runner_;
-+
-+  net::HttpByteRange byte_range_;
-+  int64_t remaining_bytes_;
-+
-+  net::Error range_parse_result_;
-+
-+  base::WeakPtrFactory<URLRequestAsarJob> weak_ptr_factory_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(URLRequestAsarJob);
-+};
-+
-+}  // namespace asar
-+
-+#endif  // ELECTRON_BROWSER_NET_ASAR_URL_REQUEST_ASAR_JOB_H_
-added in remote
-  their  100644 be5e2e2104c73c4e918ffac8046f6c2bd38fe2ec electron/browser/net/electron_cert_verifier.cc
-@@ -0,0 +1,77 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/net/electron_cert_verifier.h"
-+
-+#include "electron/browser/browser.h"
-+#include "electron/common/native_mate_converters/net_converter.h"
-+#include "content/public/browser/browser_thread.h"
-+#include "net/base/net_errors.h"
-+#include "net/cert/crl_set.h"
-+#include "net/cert/x509_certificate.h"
-+
-+using content::BrowserThread;
-+
-+namespace electron {
-+
-+namespace {
-+
-+void OnResult(
-+    net::CertVerifyResult* verify_result,
-+    const net::CompletionCallback& callback,
-+    bool result) {
-+  BrowserThread::PostTask(
-+      BrowserThread::IO, FROM_HERE,
-+      base::Bind(callback, result ? net::OK : net::ERR_FAILED));
-+}
-+
-+}  // namespace
-+
-+ElectronCertVerifier::ElectronCertVerifier()
-+    : default_cert_verifier_(net::CertVerifier::CreateDefault()) {
-+}
-+
-+ElectronCertVerifier::~ElectronCertVerifier() {
-+}
-+
-+void ElectronCertVerifier::SetVerifyProc(const VerifyProc& proc) {
-+  base::AutoLock auto_lock(lock_);
-+  verify_proc_ = proc;
-+}
-+
-+int ElectronCertVerifier::Verify(
-+    net::X509Certificate* cert,
-+    const std::string& hostname,
-+    const std::string& ocsp_response,
-+    int flags,
-+    net::CRLSet* crl_set,
-+    net::CertVerifyResult* verify_result,
-+    const net::CompletionCallback& callback,
-+    scoped_ptr<Request>* out_req,
-+    const net::BoundNetLog& net_log) {
-+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-+
-+  VerifyProc proc;
-+  {
-+    base::AutoLock auto_lock(lock_);
-+    proc = verify_proc_;
-+  }
-+
-+  if (proc.is_null())
-+    return default_cert_verifier_->Verify(
-+        cert, hostname, ocsp_response, flags, crl_set, verify_result, callback,
-+        out_req, net_log);
-+
-+  BrowserThread::PostTask(
-+      BrowserThread::UI, FROM_HERE,
-+      base::Bind(proc, hostname, make_scoped_refptr(cert),
-+                 base::Bind(OnResult, verify_result, callback)));
-+  return net::ERR_IO_PENDING;
-+}
-+
-+bool ElectronCertVerifier::SupportsOCSPStapling() {
-+  return true;
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 34343f3e5c717c052c0b176e7e502eee0e44325c electron/browser/net/electron_cert_verifier.h
-@@ -0,0 +1,51 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_NET_ELECTRON_CERT_VERIFIER_H_
-+#define ELECTRON_BROWSER_NET_ELECTRON_CERT_VERIFIER_H_
-+
-+#include <string>
-+
-+#include "base/memory/ref_counted.h"
-+#include "base/synchronization/lock.h"
-+#include "net/cert/cert_verifier.h"
-+
-+namespace electron {
-+
-+class ElectronCertVerifier : public net::CertVerifier {
-+ public:
-+  ElectronCertVerifier();
-+  virtual ~ElectronCertVerifier();
-+
-+  using VerifyProc =
-+      base::Callback<void(const std::string& hostname,
-+                          scoped_refptr<net::X509Certificate>,
-+                          const base::Callback<void(bool)>&)>;
-+
-+  void SetVerifyProc(const VerifyProc& proc);
-+
-+ protected:
-+  // net::CertVerifier:
-+  int Verify(net::X509Certificate* cert,
-+             const std::string& hostname,
-+             const std::string& ocsp_response,
-+             int flags,
-+             net::CRLSet* crl_set,
-+             net::CertVerifyResult* verify_result,
-+             const net::CompletionCallback& callback,
-+             scoped_ptr<Request>* out_req,
-+             const net::BoundNetLog& net_log) override;
-+  bool SupportsOCSPStapling() override;
-+
-+ private:
-+  base::Lock lock_;
-+  VerifyProc verify_proc_;
-+  scoped_ptr<net::CertVerifier> default_cert_verifier_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(ElectronCertVerifier);
-+};
-+
-+}   // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_NET_ELECTRON_CERT_VERIFIER_H_
-added in remote
-  their  100644 e6aa9d5e15cd40ad614c2c9d706b167d54a6513b electron/browser/net/electron_network_delegate.cc
-@@ -0,0 +1,401 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/net/electron_network_delegate.h"
-+
-+#include <string>
-+
-+#include "electron/common/native_mate_converters/net_converter.h"
-+#include "base/stl_util.h"
-+#include "base/strings/string_util.h"
-+#include "content/public/browser/browser_thread.h"
-+#include "content/public/browser/resource_request_info.h"
-+#include "net/url_request/url_request.h"
-+
-+using content::BrowserThread;
-+
-+namespace electron {
-+
-+namespace {
-+
-+const char* ResourceTypeToString(content::ResourceType type) {
-+  switch (type) {
-+    case content::RESOURCE_TYPE_MAIN_FRAME:
-+      return "mainFrame";
-+    case content::RESOURCE_TYPE_SUB_FRAME:
-+      return "subFrame";
-+    case content::RESOURCE_TYPE_STYLESHEET:
-+      return "stylesheet";
-+    case content::RESOURCE_TYPE_SCRIPT:
-+      return "script";
-+    case content::RESOURCE_TYPE_IMAGE:
-+      return "image";
-+    case content::RESOURCE_TYPE_OBJECT:
-+      return "object";
-+    case content::RESOURCE_TYPE_XHR:
-+      return "xhr";
-+    default:
-+      return "other";
-+  }
-+}
-+
-+void RunSimpleListener(const ElectronNetworkDelegate::SimpleListener& listener,
-+                       scoped_ptr<base::DictionaryValue> details) {
-+  return listener.Run(*(details.get()));
-+}
-+
-+void RunResponseListener(
-+    const ElectronNetworkDelegate::ResponseListener& listener,
-+    scoped_ptr<base::DictionaryValue> details,
-+    const ElectronNetworkDelegate::ResponseCallback& callback) {
-+  return listener.Run(*(details.get()), callback);
-+}
-+
-+// Test whether the URL of |request| matches |patterns|.
-+bool MatchesFilterCondition(net::URLRequest* request,
-+                            const URLPatterns& patterns) {
-+  if (patterns.empty())
-+    return true;
-+
-+  for (const auto& pattern : patterns) {
-+    if (pattern.MatchesURL(request->url()))
-+      return true;
-+  }
-+  return false;
-+}
-+
-+// Overloaded by multiple types to fill the |details| object.
-+void ToDictionary(base::DictionaryValue* details, net::URLRequest* request) {
-+  details->SetInteger("id", request->identifier());
-+  details->SetString("url", request->url().spec());
-+  details->SetString("method", request->method());
-+  details->SetDouble("timestamp", base::Time::Now().ToDoubleT() * 1000);
-+  auto info = content::ResourceRequestInfo::ForRequest(request);
-+  details->SetString("resourceType",
-+                     info ? ResourceTypeToString(info->GetResourceType())
-+                          : "other");
-+  scoped_ptr<base::ListValue> list(new base::ListValue);
-+  GetUploadData(list.get(), request);
-+  if (!list->empty())
-+    details->Set("uploadData", std::move(list));
-+}
-+
-+void ToDictionary(base::DictionaryValue* details,
-+                  const net::HttpRequestHeaders& headers) {
-+  scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue);
-+  net::HttpRequestHeaders::Iterator it(headers);
-+  while (it.GetNext())
-+    dict->SetString(it.name(), it.value());
-+  details->Set("requestHeaders", std::move(dict));
-+}
-+
-+void ToDictionary(base::DictionaryValue* details,
-+                  const net::HttpResponseHeaders* headers) {
-+  if (!headers)
-+    return;
-+
-+  scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue);
-+  void* iter = nullptr;
-+  std::string key;
-+  std::string value;
-+  while (headers->EnumerateHeaderLines(&iter, &key, &value)) {
-+    if (dict->HasKey(key)) {
-+      base::ListValue* values = nullptr;
-+      if (dict->GetList(key, &values))
-+        values->AppendString(value);
-+    } else {
-+      scoped_ptr<base::ListValue> values(new base::ListValue);
-+      values->AppendString(value);
-+      dict->Set(key, std::move(values));
-+    }
-+  }
-+  details->Set("responseHeaders", std::move(dict));
-+  details->SetString("statusLine", headers->GetStatusLine());
-+  details->SetInteger("statusCode", headers->response_code());
-+}
-+
-+void ToDictionary(base::DictionaryValue* details, const GURL& location) {
-+  details->SetString("redirectURL", location.spec());
-+}
-+
-+void ToDictionary(base::DictionaryValue* details,
-+                  const net::HostPortPair& host_port) {
-+  if (host_port.host().empty())
-+    details->SetString("ip", host_port.host());
-+}
-+
-+void ToDictionary(base::DictionaryValue* details, bool from_cache) {
-+  details->SetBoolean("fromCache", from_cache);
-+}
-+
-+void ToDictionary(base::DictionaryValue* details,
-+                  const net::URLRequestStatus& status) {
-+  details->SetString("error", net::ErrorToString(status.error()));
-+}
-+
-+// Helper function to fill |details| with arbitrary |args|.
-+template<typename Arg>
-+void FillDetailsObject(base::DictionaryValue* details, Arg arg) {
-+  ToDictionary(details, arg);
-+}
-+
-+template<typename Arg, typename... Args>
-+void FillDetailsObject(base::DictionaryValue* details, Arg arg, Args... args) {
-+  ToDictionary(details, arg);
-+  FillDetailsObject(details, args...);
-+}
-+
-+// Fill the native types with the result from the response object.
-+void ReadFromResponseObject(const base::DictionaryValue& response,
-+                            GURL* new_location) {
-+  std::string url;
-+  if (response.GetString("redirectURL", &url))
-+    *new_location = GURL(url);
-+}
-+
-+void ReadFromResponseObject(const base::DictionaryValue& response,
-+                            net::HttpRequestHeaders* headers) {
-+  const base::DictionaryValue* dict;
-+  if (response.GetDictionary("requestHeaders", &dict)) {
-+    headers->Clear();
-+    for (base::DictionaryValue::Iterator it(*dict);
-+         !it.IsAtEnd();
-+         it.Advance()) {
-+      std::string value;
-+      if (it.value().GetAsString(&value))
-+        headers->SetHeader(it.key(), value);
-+    }
-+  }
-+}
-+
-+void ReadFromResponseObject(const base::DictionaryValue& response,
-+                            scoped_refptr<net::HttpResponseHeaders>* headers) {
-+  const base::DictionaryValue* dict;
-+  if (response.GetDictionary("responseHeaders", &dict)) {
-+    *headers = new net::HttpResponseHeaders("");
-+    for (base::DictionaryValue::Iterator it(*dict);
-+         !it.IsAtEnd();
-+         it.Advance()) {
-+      const base::ListValue* list;
-+      if (it.value().GetAsList(&list)) {
-+        (*headers)->RemoveHeader(it.key());
-+        for (size_t i = 0; i < list->GetSize(); ++i) {
-+          std::string value;
-+          if (list->GetString(i, &value))
-+            (*headers)->AddHeader(it.key() + " : " + value);
-+        }
-+      }
-+    }
-+  }
-+}
-+
-+}  // namespace
-+
-+ElectronNetworkDelegate::ElectronNetworkDelegate() {
-+}
-+
-+ElectronNetworkDelegate::~ElectronNetworkDelegate() {
-+}
-+
-+void ElectronNetworkDelegate::SetSimpleListenerInIO(
-+    SimpleEvent type,
-+    const URLPatterns& patterns,
-+    const SimpleListener& callback) {
-+  if (callback.is_null())
-+    simple_listeners_.erase(type);
-+  else
-+    simple_listeners_[type] = { patterns, callback };
-+}
-+
-+void ElectronNetworkDelegate::SetResponseListenerInIO(
-+    ResponseEvent type,
-+    const URLPatterns& patterns,
-+    const ResponseListener& callback) {
-+  if (callback.is_null())
-+    response_listeners_.erase(type);
-+  else
-+    response_listeners_[type] = { patterns, callback };
-+}
-+
-+int ElectronNetworkDelegate::OnBeforeURLRequest(
-+    net::URLRequest* request,
-+    const net::CompletionCallback& callback,
-+    GURL* new_url) {
-+  if (!ContainsKey(response_listeners_, kOnBeforeRequest))
-+    return brightray::NetworkDelegate::OnBeforeURLRequest(
-+        request, callback, new_url);
-+
-+  return HandleResponseEvent(kOnBeforeRequest, request, callback, new_url);
-+}
-+
-+int ElectronNetworkDelegate::OnBeforeSendHeaders(
-+    net::URLRequest* request,
-+    const net::CompletionCallback& callback,
-+    net::HttpRequestHeaders* headers) {
-+  if (!ContainsKey(response_listeners_, kOnBeforeSendHeaders))
-+    return brightray::NetworkDelegate::OnBeforeSendHeaders(
-+        request, callback, headers);
-+
-+  return HandleResponseEvent(
-+      kOnBeforeSendHeaders, request, callback, headers, *headers);
-+}
-+
-+void ElectronNetworkDelegate::OnSendHeaders(
-+    net::URLRequest* request,
-+    const net::HttpRequestHeaders& headers) {
-+  if (!ContainsKey(simple_listeners_, kOnSendHeaders)) {
-+    brightray::NetworkDelegate::OnSendHeaders(request, headers);
-+    return;
-+  }
-+
-+  HandleSimpleEvent(kOnSendHeaders, request, headers);
-+}
-+
-+int ElectronNetworkDelegate::OnHeadersReceived(
-+    net::URLRequest* request,
-+    const net::CompletionCallback& callback,
-+    const net::HttpResponseHeaders* original,
-+    scoped_refptr<net::HttpResponseHeaders>* override,
-+    GURL* allowed) {
-+  if (!ContainsKey(response_listeners_, kOnHeadersReceived))
-+    return brightray::NetworkDelegate::OnHeadersReceived(
-+        request, callback, original, override, allowed);
-+
-+  return HandleResponseEvent(
-+      kOnHeadersReceived, request, callback, override, original);
-+}
-+
-+void ElectronNetworkDelegate::OnBeforeRedirect(net::URLRequest* request,
-+                                           const GURL& new_location) {
-+  if (!ContainsKey(simple_listeners_, kOnBeforeRedirect)) {
-+    brightray::NetworkDelegate::OnBeforeRedirect(request, new_location);
-+    return;
-+  }
-+
-+  HandleSimpleEvent(kOnBeforeRedirect, request, new_location,
-+                    request->response_headers(), request->GetSocketAddress(),
-+                    request->was_cached());
-+}
-+
-+void ElectronNetworkDelegate::OnResponseStarted(net::URLRequest* request) {
-+  if (!ContainsKey(simple_listeners_, kOnResponseStarted)) {
-+    brightray::NetworkDelegate::OnResponseStarted(request);
-+    return;
-+  }
-+
-+  if (request->status().status() != net::URLRequestStatus::SUCCESS)
-+    return;
-+
-+  HandleSimpleEvent(kOnResponseStarted, request, request->response_headers(),
-+                    request->was_cached());
-+}
-+
-+void ElectronNetworkDelegate::OnCompleted(net::URLRequest* request, bool started) {
-+  // OnCompleted may happen before other events.
-+  callbacks_.erase(request->identifier());
-+
-+  if (request->status().status() == net::URLRequestStatus::FAILED ||
-+      request->status().status() == net::URLRequestStatus::CANCELED) {
-+    // Error event.
-+    OnErrorOccurred(request, started);
-+    return;
-+  } else if (request->response_headers() &&
-+             net::HttpResponseHeaders::IsRedirectResponseCode(
-+                 request->response_headers()->response_code())) {
-+    // Redirect event.
-+    brightray::NetworkDelegate::OnCompleted(request, started);
-+    return;
-+  }
-+
-+  if (!ContainsKey(simple_listeners_, kOnCompleted)) {
-+    brightray::NetworkDelegate::OnCompleted(request, started);
-+    return;
-+  }
-+
-+  HandleSimpleEvent(kOnCompleted, request, request->response_headers(),
-+                    request->was_cached());
-+}
-+
-+void ElectronNetworkDelegate::OnURLRequestDestroyed(net::URLRequest* request) {
-+  callbacks_.erase(request->identifier());
-+}
-+
-+void ElectronNetworkDelegate::OnErrorOccurred(
-+    net::URLRequest* request, bool started) {
-+  if (!ContainsKey(simple_listeners_, kOnErrorOccurred)) {
-+    brightray::NetworkDelegate::OnCompleted(request, started);
-+    return;
-+  }
-+
-+  HandleSimpleEvent(kOnErrorOccurred, request, request->was_cached(),
-+                    request->status());
-+}
-+
-+template<typename Out, typename... Args>
-+int ElectronNetworkDelegate::HandleResponseEvent(
-+    ResponseEvent type,
-+    net::URLRequest* request,
-+    const net::CompletionCallback& callback,
-+    Out out,
-+    Args... args) {
-+  const auto& info = response_listeners_[type];
-+  if (!MatchesFilterCondition(request, info.url_patterns))
-+    return net::OK;
-+
-+  scoped_ptr<base::DictionaryValue> details(new base::DictionaryValue);
-+  FillDetailsObject(details.get(), request, args...);
-+
-+  // The |request| could be destroyed before the |callback| is called.
-+  callbacks_[request->identifier()] = callback;
-+
-+  ResponseCallback response =
-+      base::Bind(&ElectronNetworkDelegate::OnListenerResultInUI<Out>,
-+                 base::Unretained(this), request->identifier(), out);
-+  BrowserThread::PostTask(
-+      BrowserThread::UI, FROM_HERE,
-+      base::Bind(RunResponseListener, info.listener, base::Passed(&details),
-+                 response));
-+  return net::ERR_IO_PENDING;
-+}
-+
-+template<typename...Args>
-+void ElectronNetworkDelegate::HandleSimpleEvent(
-+    SimpleEvent type, net::URLRequest* request, Args... args) {
-+  const auto& info = simple_listeners_[type];
-+  if (!MatchesFilterCondition(request, info.url_patterns))
-+    return;
-+
-+  scoped_ptr<base::DictionaryValue> details(new base::DictionaryValue);
-+  FillDetailsObject(details.get(), request, args...);
-+
-+  BrowserThread::PostTask(
-+      BrowserThread::UI, FROM_HERE,
-+      base::Bind(RunSimpleListener, info.listener, base::Passed(&details)));
-+}
-+
-+template<typename T>
-+void ElectronNetworkDelegate::OnListenerResultInIO(
-+    uint64_t id, T out, scoped_ptr<base::DictionaryValue> response) {
-+  // The request has been destroyed.
-+  if (!ContainsKey(callbacks_, id))
-+    return;
-+
-+  ReadFromResponseObject(*response.get(), out);
-+
-+  bool cancel = false;
-+  response->GetBoolean("cancel", &cancel);
-+  callbacks_[id].Run(cancel ? net::ERR_BLOCKED_BY_CLIENT : net::OK);
-+}
-+
-+template<typename T>
-+void ElectronNetworkDelegate::OnListenerResultInUI(
-+    uint64_t id, T out, const base::DictionaryValue& response) {
-+  scoped_ptr<base::DictionaryValue> copy = response.CreateDeepCopy();
-+  BrowserThread::PostTask(
-+      BrowserThread::IO, FROM_HERE,
-+      base::Bind(&ElectronNetworkDelegate::OnListenerResultInIO<T>,
-+                 base::Unretained(this),  id, out, base::Passed(&copy)));
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 89f4290145df57e14d6e01a6654c8b294da7e644 electron/browser/net/electron_network_delegate.h
-@@ -0,0 +1,121 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_NET_ELECTRON_NETWORK_DELEGATE_H_
-+#define ELECTRON_BROWSER_NET_ELECTRON_NETWORK_DELEGATE_H_
-+
-+#include <map>
-+#include <set>
-+
-+#include "brightray/browser/network_delegate.h"
-+#include "base/callback.h"
-+#include "base/values.h"
-+#include "extensions/common/url_pattern.h"
-+#include "net/base/net_errors.h"
-+#include "net/http/http_request_headers.h"
-+#include "net/http/http_response_headers.h"
-+
-+namespace extensions {
-+class URLPattern;
-+}
-+
-+namespace electron {
-+
-+using URLPatterns = std::set<extensions::URLPattern>;
-+
-+class ElectronNetworkDelegate : public brightray::NetworkDelegate {
-+ public:
-+  using ResponseCallback = base::Callback<void(const base::DictionaryValue&)>;
-+  using SimpleListener = base::Callback<void(const base::DictionaryValue&)>;
-+  using ResponseListener = base::Callback<void(const base::DictionaryValue&,
-+                                               const ResponseCallback&)>;
-+
-+  enum SimpleEvent {
-+    kOnSendHeaders,
-+    kOnBeforeRedirect,
-+    kOnResponseStarted,
-+    kOnCompleted,
-+    kOnErrorOccurred,
-+  };
-+
-+  enum ResponseEvent {
-+    kOnBeforeRequest,
-+    kOnBeforeSendHeaders,
-+    kOnHeadersReceived,
-+  };
-+
-+  struct SimpleListenerInfo {
-+    URLPatterns url_patterns;
-+    SimpleListener listener;
-+  };
-+
-+  struct ResponseListenerInfo {
-+    URLPatterns url_patterns;
-+    ResponseListener listener;
-+  };
-+
-+  ElectronNetworkDelegate();
-+  ~ElectronNetworkDelegate() override;
-+
-+  void SetSimpleListenerInIO(SimpleEvent type,
-+                             const URLPatterns& patterns,
-+                             const SimpleListener& callback);
-+  void SetResponseListenerInIO(ResponseEvent type,
-+                               const URLPatterns& patterns,
-+                               const ResponseListener& callback);
-+
-+ protected:
-+  // net::NetworkDelegate:
-+  int OnBeforeURLRequest(net::URLRequest* request,
-+                         const net::CompletionCallback& callback,
-+                         GURL* new_url) override;
-+  int OnBeforeSendHeaders(net::URLRequest* request,
-+                          const net::CompletionCallback& callback,
-+                          net::HttpRequestHeaders* headers) override;
-+  void OnSendHeaders(net::URLRequest* request,
-+                     const net::HttpRequestHeaders& headers) override;
-+  int OnHeadersReceived(
-+      net::URLRequest* request,
-+      const net::CompletionCallback& callback,
-+      const net::HttpResponseHeaders* original_response_headers,
-+      scoped_refptr<net::HttpResponseHeaders>* override_response_headers,
-+      GURL* allowed_unsafe_redirect_url) override;
-+  void OnBeforeRedirect(net::URLRequest* request,
-+                        const GURL& new_location) override;
-+  void OnResponseStarted(net::URLRequest* request) override;
-+  void OnCompleted(net::URLRequest* request, bool started) override;
-+  void OnURLRequestDestroyed(net::URLRequest* request) override;
-+
-+ private:
-+  void OnErrorOccurred(net::URLRequest* request, bool started);
-+
-+  template<typename...Args>
-+  void HandleSimpleEvent(SimpleEvent type,
-+                         net::URLRequest* request,
-+                         Args... args);
-+  template<typename Out, typename... Args>
-+  int HandleResponseEvent(ResponseEvent type,
-+                          net::URLRequest* request,
-+                          const net::CompletionCallback& callback,
-+                          Out out,
-+                          Args... args);
-+
-+  // Deal with the results of Listener.
-+  template<typename T>
-+  void OnListenerResultInIO(
-+      uint64_t id, T out, scoped_ptr<base::DictionaryValue> response);
-+  template<typename T>
-+  void OnListenerResultInUI(
-+      uint64_t id, T out, const base::DictionaryValue& response);
-+
-+  std::map<SimpleEvent, SimpleListenerInfo> simple_listeners_;
-+  std::map<ResponseEvent, ResponseListenerInfo> response_listeners_;
-+  std::map<uint64_t, net::CompletionCallback> callbacks_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(ElectronNetworkDelegate);
-+};
-+
-+}   // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_NET_ELECTRON_NETWORK_DELEGATE_H_
-added in remote
-  their  100644 a07f31caa209bdf91d30d0d629aba525a18574a0 electron/browser/net/electron_ssl_config_service.cc
-@@ -0,0 +1,74 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/net/electron_ssl_config_service.h"
-+
-+#include <string>
-+#include <vector>
-+
-+#include "base/command_line.h"
-+#include "base/strings/string_split.h"
-+#include "electron/common/options_switches.h"
-+#include "content/public/browser/browser_thread.h"
-+#include "net/socket/ssl_client_socket.h"
-+#include "net/ssl/ssl_cipher_suite_names.h"
-+
-+namespace electron {
-+
-+namespace {
-+
-+uint16_t GetSSLProtocolVersion(const std::string& version_string) {
-+  uint16_t version = 0;  // Invalid
-+  if (version_string == "tls1")
-+    version = net::SSL_PROTOCOL_VERSION_TLS1;
-+  else if (version_string == "tls1.1")
-+    version = net::SSL_PROTOCOL_VERSION_TLS1_1;
-+  else if (version_string == "tls1.2")
-+    version = net::SSL_PROTOCOL_VERSION_TLS1_2;
-+  return version;
-+}
-+
-+std::vector<uint16_t> ParseCipherSuites(
-+    const std::vector<std::string>& cipher_strings) {
-+  std::vector<uint16_t> cipher_suites;
-+  cipher_suites.reserve(cipher_strings.size());
-+
-+  for (auto& cipher_string : cipher_strings) {
-+    uint16_t cipher_suite = 0;
-+    if (!net::ParseSSLCipherString(cipher_string, &cipher_suite)) {
-+      LOG(ERROR) << "Ignoring unrecognised cipher suite : "
-+                 << cipher_string;
-+      continue;
-+    }
-+    cipher_suites.push_back(cipher_suite);
-+  }
-+  return cipher_suites;
-+}
-+
-+}  // namespace
-+
-+ElectronSSLConfigService::ElectronSSLConfigService() {
-+  auto cmd_line = base::CommandLine::ForCurrentProcess();
-+  if (cmd_line->HasSwitch(switches::kSSLVersionFallbackMin)) {
-+    auto version_string =
-+        cmd_line->GetSwitchValueASCII(switches::kSSLVersionFallbackMin);
-+    config_.version_fallback_min = GetSSLProtocolVersion(version_string);
-+  }
-+
-+  if (cmd_line->HasSwitch(switches::kCipherSuiteBlacklist)) {
-+    auto cipher_strings = base::SplitString(
-+        cmd_line->GetSwitchValueASCII(switches::kCipherSuiteBlacklist),
-+        ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
-+    config_.disabled_cipher_suites = ParseCipherSuites(cipher_strings);
-+  }
-+}
-+
-+ElectronSSLConfigService::~ElectronSSLConfigService() {
-+}
-+
-+void ElectronSSLConfigService::GetSSLConfig(net::SSLConfig* config) {
-+  *config = config_;
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 4f96936754b74b63d7aec53ce7ba2aedde285b3e electron/browser/net/electron_ssl_config_service.h
-@@ -0,0 +1,28 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_NET_ELECTRON_SSL_CONFIG_SERVICE_H_
-+#define ELECTRON_BROWSER_NET_ELECTRON_SSL_CONFIG_SERVICE_H_
-+
-+#include "net/ssl/ssl_config_service.h"
-+
-+namespace electron {
-+
-+class ElectronSSLConfigService : public net::SSLConfigService {
-+ public:
-+  ElectronSSLConfigService();
-+  ~ElectronSSLConfigService() override;
-+
-+  // net::SSLConfigService:
-+  void GetSSLConfig(net::SSLConfig* config) override;
-+
-+ private:
-+  net::SSLConfig config_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(ElectronSSLConfigService);
-+};
-+
-+}   // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_NET_ELECTRON_SSL_CONFIG_SERVICE_H_
-added in remote
-  their  100644 10e3b93de7b8059c9b688732b031697f47186dfe electron/browser/net/electron_url_request_job_factory.cc
-@@ -0,0 +1,113 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/net/electron_url_request_job_factory.h"
-+
-+#include "base/stl_util.h"
-+#include "content/public/browser/browser_thread.h"
-+#include "net/base/load_flags.h"
-+#include "net/url_request/url_request.h"
-+
-+using content::BrowserThread;
-+
-+namespace electron {
-+
-+typedef net::URLRequestJobFactory::ProtocolHandler ProtocolHandler;
-+
-+ElectronURLRequestJobFactory::ElectronURLRequestJobFactory() {}
-+
-+ElectronURLRequestJobFactory::~ElectronURLRequestJobFactory() {
-+  STLDeleteValues(&protocol_handler_map_);
-+}
-+
-+bool ElectronURLRequestJobFactory::SetProtocolHandler(
-+    const std::string& scheme, scoped_ptr<ProtocolHandler> protocol_handler) {
-+  if (!protocol_handler) {
-+    ProtocolHandlerMap::iterator it = protocol_handler_map_.find(scheme);
-+    if (it == protocol_handler_map_.end())
-+      return false;
-+
-+    delete it->second;
-+    protocol_handler_map_.erase(it);
-+    return true;
-+  }
-+
-+  if (ContainsKey(protocol_handler_map_, scheme))
-+    return false;
-+  protocol_handler_map_[scheme] = protocol_handler.release();
-+  return true;
-+}
-+
-+scoped_ptr<ProtocolHandler> ElectronURLRequestJobFactory::ReplaceProtocol(
-+    const std::string& scheme, scoped_ptr<ProtocolHandler> protocol_handler) {
-+  if (!ContainsKey(protocol_handler_map_, scheme))
-+    return nullptr;
-+  ProtocolHandler* original_protocol_handler = protocol_handler_map_[scheme];
-+  protocol_handler_map_[scheme] = protocol_handler.release();
-+  return make_scoped_ptr(original_protocol_handler);
-+}
-+
-+ProtocolHandler* ElectronURLRequestJobFactory::GetProtocolHandler(
-+    const std::string& scheme) const {
-+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-+
-+  ProtocolHandlerMap::const_iterator it = protocol_handler_map_.find(scheme);
-+  if (it == protocol_handler_map_.end())
-+    return nullptr;
-+  return it->second;
-+}
-+
-+bool ElectronURLRequestJobFactory::HasProtocolHandler(
-+    const std::string& scheme) const {
-+  return ContainsKey(protocol_handler_map_, scheme);
-+}
-+
-+net::URLRequestJob* ElectronURLRequestJobFactory::MaybeCreateJobWithProtocolHandler(
-+    const std::string& scheme,
-+    net::URLRequest* request,
-+    net::NetworkDelegate* network_delegate) const {
-+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-+
-+  ProtocolHandlerMap::const_iterator it = protocol_handler_map_.find(scheme);
-+  if (it == protocol_handler_map_.end())
-+    return nullptr;
-+  return it->second->MaybeCreateJob(request, network_delegate);
-+}
-+
-+net::URLRequestJob* ElectronURLRequestJobFactory::MaybeInterceptRedirect(
-+    net::URLRequest* request,
-+    net::NetworkDelegate* network_delegate,
-+    const GURL& location) const {
-+  return nullptr;
-+}
-+
-+net::URLRequestJob* ElectronURLRequestJobFactory::MaybeInterceptResponse(
-+    net::URLRequest* request,
-+    net::NetworkDelegate* network_delegate) const {
-+  return nullptr;
-+}
-+
-+bool ElectronURLRequestJobFactory::IsHandledProtocol(
-+    const std::string& scheme) const {
-+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-+
-+  return HasProtocolHandler(scheme) ||
-+      net::URLRequest::IsHandledProtocol(scheme);
-+}
-+
-+bool ElectronURLRequestJobFactory::IsHandledURL(const GURL& url) const {
-+  if (!url.is_valid()) {
-+    // We handle error cases.
-+    return true;
-+  }
-+  return IsHandledProtocol(url.scheme());
-+}
-+
-+bool ElectronURLRequestJobFactory::IsSafeRedirectTarget(
-+    const GURL& location) const {
-+  return IsHandledURL(location);
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 4623e6c94cb5adb130f08efb27dc22366255e9ca electron/browser/net/electron_url_request_job_factory.h
-@@ -0,0 +1,67 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_NET_ELECTRON_URL_REQUEST_JOB_FACTORY_H_
-+#define ELECTRON_BROWSER_NET_ELECTRON_URL_REQUEST_JOB_FACTORY_H_
-+
-+#include <map>
-+#include <string>
-+#include <vector>
-+
-+#include "base/memory/scoped_ptr.h"
-+#include "base/synchronization/lock.h"
-+#include "net/url_request/url_request_job_factory.h"
-+
-+namespace electron {
-+
-+class ElectronURLRequestJobFactory : public net::URLRequestJobFactory {
-+ public:
-+  ElectronURLRequestJobFactory();
-+  virtual ~ElectronURLRequestJobFactory();
-+
-+  // Sets the ProtocolHandler for a scheme. Returns true on success, false on
-+  // failure (a ProtocolHandler already exists for |scheme|). On success,
-+  // URLRequestJobFactory takes ownership of |protocol_handler|.
-+  bool SetProtocolHandler(
-+      const std::string& scheme, scoped_ptr<ProtocolHandler> protocol_handler);
-+
-+  // Intercepts the ProtocolHandler for a scheme. Returns the original protocol
-+  // handler on success, otherwise returns NULL.
-+  scoped_ptr<ProtocolHandler> ReplaceProtocol(
-+      const std::string& scheme, scoped_ptr<ProtocolHandler> protocol_handler);
-+
-+  // Returns the protocol handler registered with scheme.
-+  ProtocolHandler* GetProtocolHandler(const std::string& scheme) const;
-+
-+  // Whether the protocol handler is registered by the job factory.
-+  bool HasProtocolHandler(const std::string& scheme) const;
-+
-+  // URLRequestJobFactory implementation
-+  net::URLRequestJob* MaybeCreateJobWithProtocolHandler(
-+      const std::string& scheme,
-+      net::URLRequest* request,
-+      net::NetworkDelegate* network_delegate) const override;
-+  net::URLRequestJob* MaybeInterceptRedirect(
-+      net::URLRequest* request,
-+      net::NetworkDelegate* network_delegate,
-+      const GURL& location) const override;
-+  net::URLRequestJob* MaybeInterceptResponse(
-+      net::URLRequest* request,
-+      net::NetworkDelegate* network_delegate) const override;
-+  bool IsHandledProtocol(const std::string& scheme) const override;
-+  bool IsHandledURL(const GURL& url) const override;
-+  bool IsSafeRedirectTarget(const GURL& location) const override;
-+
-+ private:
-+  using ProtocolHandlerMap = std::map<std::string, ProtocolHandler*>;
-+
-+  ProtocolHandlerMap protocol_handler_map_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(ElectronURLRequestJobFactory);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_NET_ELECTRON_URL_REQUEST_JOB_FACTORY_H_
-added in remote
-  their  100644 0425364c7ce4ed92960d77c7b9772351494dd4b4 electron/browser/net/http_protocol_handler.cc
-@@ -0,0 +1,26 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/net/http_protocol_handler.h"
-+
-+#include "net/url_request/url_request_http_job.h"
-+
-+namespace electron {
-+
-+HttpProtocolHandler::HttpProtocolHandler(const std::string& scheme)
-+    : scheme_(scheme) {
-+}
-+
-+HttpProtocolHandler::~HttpProtocolHandler() {
-+}
-+
-+net::URLRequestJob* HttpProtocolHandler::MaybeCreateJob(
-+    net::URLRequest* request,
-+    net::NetworkDelegate* network_delegate) const {
-+  return net::URLRequestHttpJob::Factory(request,
-+                                         network_delegate,
-+                                         scheme_);
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 570f8fa50fec76f14bd8a70c95b4b70bb7accfc4 electron/browser/net/http_protocol_handler.h
-@@ -0,0 +1,30 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_NET_HTTP_PROTOCOL_HANDLER_H_
-+#define ELECTRON_BROWSER_NET_HTTP_PROTOCOL_HANDLER_H_
-+
-+#include <string>
-+
-+#include "net/url_request/url_request_job_factory.h"
-+
-+namespace electron {
-+
-+class HttpProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler {
-+ public:
-+  explicit HttpProtocolHandler(const std::string&);
-+  virtual ~HttpProtocolHandler();
-+
-+  // net::URLRequestJobFactory::ProtocolHandler:
-+  net::URLRequestJob* MaybeCreateJob(
-+      net::URLRequest* request,
-+      net::NetworkDelegate* network_delegate) const override;
-+
-+ private:
-+  std::string scheme_;
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_NET_HTTP_PROTOCOL_HANDLER_H_
-added in remote
-  their  100644 0cad1065961363e23a75a6c1363bb05c298751c4 electron/browser/net/js_asker.cc
-@@ -0,0 +1,75 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/net/js_asker.h"
-+
-+#include <vector>
-+
-+#include "electron/common/native_mate_converters/callback.h"
-+#include "electron/common/native_mate_converters/v8_value_converter.h"
-+
-+namespace electron {
-+
-+namespace internal {
-+
-+namespace {
-+
-+// The callback which is passed to |handler|.
-+void HandlerCallback(const BeforeStartCallback& before_start,
-+                     const ResponseCallback& callback,
-+                     mate::Arguments* args) {
-+  // If there is no argument passed then we failed.
-+  v8::Local<v8::Value> value;
-+  if (!args->GetNext(&value)) {
-+    content::BrowserThread::PostTask(
-+        content::BrowserThread::IO, FROM_HERE,
-+        base::Bind(callback, false, nullptr));
-+    return;
-+  }
-+
-+  // Give the job a chance to parse V8 value.
-+  before_start.Run(args->isolate(), value);
-+
-+  // Pass whatever user passed to the actaul request job.
-+  V8ValueConverter converter;
-+  v8::Local<v8::Context> context = args->isolate()->GetCurrentContext();
-+  scoped_ptr<base::Value> options(converter.FromV8Value(value, context));
-+  content::BrowserThread::PostTask(
-+      content::BrowserThread::IO, FROM_HERE,
-+      base::Bind(callback, true, base::Passed(&options)));
-+}
-+
-+}  // namespace
-+
-+void AskForOptions(v8::Isolate* isolate,
-+                   const JavaScriptHandler& handler,
-+                   net::URLRequest* request,
-+                   const BeforeStartCallback& before_start,
-+                   const ResponseCallback& callback) {
-+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-+  v8::Locker locker(isolate);
-+  v8::HandleScope handle_scope(isolate);
-+  v8::Local<v8::Context> context = isolate->GetCurrentContext();
-+  v8::Context::Scope context_scope(context);
-+  handler.Run(
-+      request,
-+      mate::ConvertToV8(isolate,
-+                        base::Bind(&HandlerCallback, before_start, callback)));
-+}
-+
-+bool IsErrorOptions(base::Value* value, int* error) {
-+  if (value->IsType(base::Value::TYPE_DICTIONARY)) {
-+    base::DictionaryValue* dict = static_cast<base::DictionaryValue*>(value);
-+    if (dict->GetInteger("error", error))
-+      return true;
-+  } else if (value->IsType(base::Value::TYPE_INTEGER)) {
-+    if (value->GetAsInteger(error))
-+      return true;
-+  }
-+  return false;
-+}
-+
-+}  // namespace internal
-+
-+}  // namespace electron
-added in remote
-  their  100644 3d846f25fede7a774ec1aedb53249d7081639a93 electron/browser/net/js_asker.h
-@@ -0,0 +1,108 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_NET_JS_ASKER_H_
-+#define ELECTRON_BROWSER_NET_JS_ASKER_H_
-+
-+#include "base/callback.h"
-+#include "base/memory/ref_counted.h"
-+#include "base/memory/weak_ptr.h"
-+#include "base/values.h"
-+#include "content/public/browser/browser_thread.h"
-+#include "net/base/net_errors.h"
-+#include "net/http/http_response_headers.h"
-+#include "net/url_request/url_request_context_getter.h"
-+#include "net/url_request/url_request_job.h"
-+#include "v8/include/v8.h"
-+
-+namespace electron {
-+
-+using JavaScriptHandler =
-+    base::Callback<void(const net::URLRequest*, v8::Local<v8::Value>)>;
-+
-+namespace internal {
-+
-+using BeforeStartCallback =
-+    base::Callback<void(v8::Isolate*, v8::Local<v8::Value>)>;
-+using ResponseCallback =
-+    base::Callback<void(bool, scoped_ptr<base::Value> options)>;
-+
-+// Ask handler for options in UI thread.
-+void AskForOptions(v8::Isolate* isolate,
-+                   const JavaScriptHandler& handler,
-+                   net::URLRequest* request,
-+                   const BeforeStartCallback& before_start,
-+                   const ResponseCallback& callback);
-+
-+// Test whether the |options| means an error.
-+bool IsErrorOptions(base::Value* value, int* error);
-+
-+}  // namespace internal
-+
-+template<typename RequestJob>
-+class JsAsker : public RequestJob {
-+ public:
-+  JsAsker(net::URLRequest* request, net::NetworkDelegate* network_delegate)
-+      : RequestJob(request, network_delegate), weak_factory_(this) {}
-+
-+  // Called by |CustomProtocolHandler| to store handler related information.
-+  void SetHandlerInfo(
-+      v8::Isolate* isolate,
-+      net::URLRequestContextGetter* request_context_getter,
-+      const JavaScriptHandler& handler) {
-+    isolate_ = isolate;
-+    request_context_getter_ = request_context_getter;
-+    handler_ = handler;
-+  }
-+
-+  // Subclass should do initailze work here.
-+  virtual void BeforeStartInUI(v8::Isolate*, v8::Local<v8::Value>) {}
-+  virtual void StartAsync(scoped_ptr<base::Value> options) = 0;
-+
-+  net::URLRequestContextGetter* request_context_getter() const {
-+    return request_context_getter_;
-+  }
-+
-+ private:
-+  // RequestJob:
-+  void Start() override {
-+    content::BrowserThread::PostTask(
-+        content::BrowserThread::UI, FROM_HERE,
-+        base::Bind(&internal::AskForOptions,
-+                   isolate_,
-+                   handler_,
-+                   RequestJob::request(),
-+                   base::Bind(&JsAsker::BeforeStartInUI,
-+                              weak_factory_.GetWeakPtr()),
-+                   base::Bind(&JsAsker::OnResponse,
-+                              weak_factory_.GetWeakPtr())));
-+  }
-+  void GetResponseInfo(net::HttpResponseInfo* info) override {
-+    info->headers = new net::HttpResponseHeaders("");
-+  }
-+
-+  // Called when the JS handler has sent the response, we need to decide whether
-+  // to start, or fail the job.
-+  void OnResponse(bool success, scoped_ptr<base::Value> value) {
-+    int error = net::ERR_NOT_IMPLEMENTED;
-+    if (success && value && !internal::IsErrorOptions(value.get(), &error)) {
-+      StartAsync(std::move(value));
-+    } else {
-+      RequestJob::NotifyStartError(
-+          net::URLRequestStatus(net::URLRequestStatus::FAILED, error));
-+    }
-+  }
-+
-+  v8::Isolate* isolate_;
-+  net::URLRequestContextGetter* request_context_getter_;
-+  JavaScriptHandler handler_;
-+
-+  base::WeakPtrFactory<JsAsker> weak_factory_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(JsAsker);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_NET_JS_ASKER_H_
-added in remote
-  their  100644 fa88add14883ca721355322ede8281dbf5499d9b electron/browser/net/url_request_async_asar_job.cc
-@@ -0,0 +1,49 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/net/url_request_async_asar_job.h"
-+
-+#include <string>
-+
-+#include "electron/common/electron_constants.h"
-+
-+namespace electron {
-+
-+URLRequestAsyncAsarJob::URLRequestAsyncAsarJob(
-+    net::URLRequest* request,
-+    net::NetworkDelegate* network_delegate)
-+    : JsAsker<asar::URLRequestAsarJob>(request, network_delegate) {
-+}
-+
-+void URLRequestAsyncAsarJob::StartAsync(scoped_ptr<base::Value> options) {
-+  base::FilePath::StringType file_path;
-+  if (options->IsType(base::Value::TYPE_DICTIONARY)) {
-+    static_cast<base::DictionaryValue*>(options.get())->GetString(
-+        "path", &file_path);
-+  } else if (options->IsType(base::Value::TYPE_STRING)) {
-+    options->GetAsString(&file_path);
-+  }
-+
-+  if (file_path.empty()) {
-+    NotifyStartError(net::URLRequestStatus(
-+          net::URLRequestStatus::FAILED, net::ERR_NOT_IMPLEMENTED));
-+  } else {
-+    asar::URLRequestAsarJob::Initialize(
-+        content::BrowserThread::GetBlockingPool()->
-+            GetTaskRunnerWithShutdownBehavior(
-+                base::SequencedWorkerPool::SKIP_ON_SHUTDOWN),
-+        base::FilePath(file_path));
-+    asar::URLRequestAsarJob::Start();
-+  }
-+}
-+
-+void URLRequestAsyncAsarJob::GetResponseInfo(net::HttpResponseInfo* info) {
-+  std::string status("HTTP/1.1 200 OK");
-+  net::HttpResponseHeaders* headers = new net::HttpResponseHeaders(status);
-+
-+  headers->AddHeader(kCORSHeader);
-+  info->headers = headers;
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 ee921c64337d81d28b5b4b37165b753979a5abed electron/browser/net/url_request_async_asar_job.h
-@@ -0,0 +1,30 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_NET_URL_REQUEST_ASYNC_ASAR_JOB_H_
-+#define ELECTRON_BROWSER_NET_URL_REQUEST_ASYNC_ASAR_JOB_H_
-+
-+#include "electron/browser/net/asar/url_request_asar_job.h"
-+#include "electron/browser/net/js_asker.h"
-+
-+namespace electron {
-+
-+// Like URLRequestAsarJob, but asks the JavaScript handler for file path.
-+class URLRequestAsyncAsarJob : public JsAsker<asar::URLRequestAsarJob> {
-+ public:
-+  URLRequestAsyncAsarJob(net::URLRequest*, net::NetworkDelegate*);
-+
-+  // JsAsker:
-+  void StartAsync(scoped_ptr<base::Value> options) override;
-+
-+  // URLRequestJob:
-+  void GetResponseInfo(net::HttpResponseInfo* info) override;
-+
-+ private:
-+  DISALLOW_COPY_AND_ASSIGN(URLRequestAsyncAsarJob);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_NET_URL_REQUEST_ASYNC_ASAR_JOB_H_
-added in remote
-  their  100644 56a1b94b1f82b724b33a67d669a3a690bf4d5b3a electron/browser/net/url_request_buffer_job.cc
-@@ -0,0 +1,77 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/net/url_request_buffer_job.h"
-+
-+#include <string>
-+
-+#include "electron/common/electron_constants.h"
-+#include "base/strings/string_number_conversions.h"
-+#include "net/base/net_errors.h"
-+
-+namespace electron {
-+
-+URLRequestBufferJob::URLRequestBufferJob(
-+    net::URLRequest* request, net::NetworkDelegate* network_delegate)
-+    : JsAsker<net::URLRequestSimpleJob>(request, network_delegate),
-+      status_code_(net::HTTP_NOT_IMPLEMENTED) {
-+}
-+
-+void URLRequestBufferJob::StartAsync(scoped_ptr<base::Value> options) {
-+  const base::BinaryValue* binary = nullptr;
-+  if (options->IsType(base::Value::TYPE_DICTIONARY)) {
-+    base::DictionaryValue* dict =
-+        static_cast<base::DictionaryValue*>(options.get());
-+    dict->GetString("mimeType", &mime_type_);
-+    dict->GetString("charset", &charset_);
-+    dict->GetBinary("data", &binary);
-+  } else if (options->IsType(base::Value::TYPE_BINARY)) {
-+    options->GetAsBinary(&binary);
-+  }
-+
-+  if (!binary) {
-+    NotifyStartError(net::URLRequestStatus(
-+          net::URLRequestStatus::FAILED, net::ERR_NOT_IMPLEMENTED));
-+    return;
-+  }
-+
-+  data_ = new base::RefCountedBytes(
-+      reinterpret_cast<const unsigned char*>(binary->GetBuffer()),
-+      binary->GetSize());
-+  status_code_ = net::HTTP_OK;
-+  net::URLRequestSimpleJob::Start();
-+}
-+
-+void URLRequestBufferJob::GetResponseInfo(net::HttpResponseInfo* info) {
-+  std::string status("HTTP/1.1 ");
-+  status.append(base::IntToString(status_code_));
-+  status.append(" ");
-+  status.append(net::GetHttpReasonPhrase(status_code_));
-+  status.append("\0\0", 2);
-+  net::HttpResponseHeaders* headers = new net::HttpResponseHeaders(status);
-+
-+  headers->AddHeader(kCORSHeader);
-+
-+  if (!mime_type_.empty()) {
-+    std::string content_type_header(net::HttpRequestHeaders::kContentType);
-+    content_type_header.append(": ");
-+    content_type_header.append(mime_type_);
-+    headers->AddHeader(content_type_header);
-+  }
-+
-+  info->headers = headers;
-+}
-+
-+int URLRequestBufferJob::GetRefCountedData(
-+    std::string* mime_type,
-+    std::string* charset,
-+    scoped_refptr<base::RefCountedMemory>* data,
-+    const net::CompletionCallback& callback) const {
-+  *mime_type = mime_type_;
-+  *charset = charset_;
-+  *data = data_;
-+  return net::OK;
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 0868cb64f43aa61bb082dfde76894ff8211321b1 electron/browser/net/url_request_buffer_job.h
-@@ -0,0 +1,44 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_NET_URL_REQUEST_BUFFER_JOB_H_
-+#define ELECTRON_BROWSER_NET_URL_REQUEST_BUFFER_JOB_H_
-+
-+#include <string>
-+
-+#include "electron/browser/net/js_asker.h"
-+#include "base/memory/ref_counted_memory.h"
-+#include "net/http/http_status_code.h"
-+#include "net/url_request/url_request_simple_job.h"
-+
-+namespace electron {
-+
-+class URLRequestBufferJob : public JsAsker<net::URLRequestSimpleJob> {
-+ public:
-+  URLRequestBufferJob(net::URLRequest*, net::NetworkDelegate*);
-+
-+  // JsAsker:
-+  void StartAsync(scoped_ptr<base::Value> options) override;
-+
-+  // URLRequestJob:
-+  void GetResponseInfo(net::HttpResponseInfo* info) override;
-+
-+  // URLRequestSimpleJob:
-+  int GetRefCountedData(std::string* mime_type,
-+                        std::string* charset,
-+                        scoped_refptr<base::RefCountedMemory>* data,
-+                        const net::CompletionCallback& callback) const override;
-+
-+ private:
-+  std::string mime_type_;
-+  std::string charset_;
-+  scoped_refptr<base::RefCountedBytes> data_;
-+  net::HttpStatusCode status_code_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(URLRequestBufferJob);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_NET_URL_REQUEST_BUFFER_JOB_H_
-added in remote
-  their  100644 061a1a67e17b507a0b499eb41577ce8bb2dfa8f3 electron/browser/net/url_request_fetch_job.cc
-@@ -0,0 +1,240 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/net/url_request_fetch_job.h"
-+
-+#include <algorithm>
-+#include <string>
-+
-+#include "base/strings/string_util.h"
-+#include "native_mate/dictionary.h"
-+#include "net/base/io_buffer.h"
-+#include "net/base/net_errors.h"
-+#include "net/http/http_response_headers.h"
-+#include "net/url_request/url_fetcher.h"
-+#include "net/url_request/url_fetcher_response_writer.h"
-+
-+using content::BrowserThread;
-+
-+namespace electron {
-+
-+namespace {
-+
-+// Convert string to RequestType.
-+net::URLFetcher::RequestType GetRequestType(const std::string& raw) {
-+  std::string method = base::ToUpperASCII(raw);
-+  if (method.empty() || method == "GET")
-+    return net::URLFetcher::GET;
-+  else if (method == "POST")
-+    return net::URLFetcher::POST;
-+  else if (method == "HEAD")
-+    return net::URLFetcher::HEAD;
-+  else if (method == "DELETE")
-+    return net::URLFetcher::DELETE_REQUEST;
-+  else if (method == "PUT")
-+    return net::URLFetcher::PUT;
-+  else if (method == "PATCH")
-+    return net::URLFetcher::PATCH;
-+  else  // Use "GET" as fallback.
-+    return net::URLFetcher::GET;
-+}
-+
-+// Pipe the response writer back to URLRequestFetchJob.
-+class ResponsePiper : public net::URLFetcherResponseWriter {
-+ public:
-+  explicit ResponsePiper(URLRequestFetchJob* job)
-+      : first_write_(true), job_(job) {}
-+
-+  // net::URLFetcherResponseWriter:
-+  int Initialize(const net::CompletionCallback& callback) override {
-+    return net::OK;
-+  }
-+  int Write(net::IOBuffer* buffer,
-+            int num_bytes,
-+            const net::CompletionCallback& callback) override {
-+    if (first_write_) {
-+      // The URLFetcherResponseWriter doesn't have an event when headers have
-+      // been read, so we have to emulate by hooking to first write event.
-+      job_->HeadersCompleted();
-+      first_write_ = false;
-+    }
-+    return job_->DataAvailable(buffer, num_bytes);
-+  }
-+  int Finish(const net::CompletionCallback& callback) override {
-+    return net::OK;
-+  }
-+
-+ private:
-+  bool first_write_;
-+  URLRequestFetchJob* job_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(ResponsePiper);
-+};
-+
-+}  // namespace
-+
-+URLRequestFetchJob::URLRequestFetchJob(
-+    net::URLRequest* request, net::NetworkDelegate* network_delegate)
-+    : JsAsker<net::URLRequestJob>(request, network_delegate),
-+      pending_buffer_size_(0) {
-+}
-+
-+void URLRequestFetchJob::BeforeStartInUI(
-+    v8::Isolate* isolate, v8::Local<v8::Value> value) {
-+  mate::Dictionary options;
-+  if (!mate::ConvertFromV8(isolate, value, &options))
-+    return;
-+
-+  // When |session| is set to |null| we use a new request context for fetch job.
-+  // TODO(zcbenz): Handle the case when it is not null.
-+  v8::Local<v8::Value> session;
-+  if (options.Get("session", &session) && session->IsNull()) {
-+    // We have to create the URLRequestContextGetter on UI thread.
-+    url_request_context_getter_ = new brightray::URLRequestContextGetter(
-+        this, nullptr, nullptr, base::FilePath(), true,
-+        BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::IO),
-+        BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::FILE),
-+        nullptr, content::URLRequestInterceptorScopedVector());
-+  }
-+}
-+
-+void URLRequestFetchJob::StartAsync(scoped_ptr<base::Value> options) {
-+  if (!options->IsType(base::Value::TYPE_DICTIONARY)) {
-+    NotifyStartError(net::URLRequestStatus(
-+          net::URLRequestStatus::FAILED, net::ERR_NOT_IMPLEMENTED));
-+    return;
-+  }
-+
-+  std::string url, method, referrer;
-+  base::DictionaryValue* upload_data = nullptr;
-+  base::DictionaryValue* dict =
-+      static_cast<base::DictionaryValue*>(options.get());
-+  dict->GetString("url", &url);
-+  dict->GetString("method", &method);
-+  dict->GetString("referrer", &referrer);
-+  dict->GetDictionary("uploadData", &upload_data);
-+
-+  // Check if URL is valid.
-+  GURL formated_url(url);
-+  if (!formated_url.is_valid()) {
-+    NotifyStartError(net::URLRequestStatus(
-+          net::URLRequestStatus::FAILED, net::ERR_INVALID_URL));
-+    return;
-+  }
-+
-+  // Use |request|'s method if |method| is not specified.
-+  net::URLFetcher::RequestType request_type;
-+  if (method.empty())
-+    request_type = GetRequestType(request()->method());
-+  else
-+    request_type = GetRequestType(method);
-+
-+  fetcher_ = net::URLFetcher::Create(formated_url, request_type, this);
-+  fetcher_->SaveResponseWithWriter(make_scoped_ptr(new ResponsePiper(this)));
-+
-+  // A request context getter is passed by the user.
-+  if (url_request_context_getter_)
-+    fetcher_->SetRequestContext(url_request_context_getter_.get());
-+  else
-+    fetcher_->SetRequestContext(request_context_getter());
-+
-+  // Use |request|'s referrer if |referrer| is not specified.
-+  if (referrer.empty())
-+    fetcher_->SetReferrer(request()->referrer());
-+  else
-+    fetcher_->SetReferrer(referrer);
-+
-+  // Set the data needed for POSTs.
-+  if (upload_data && request_type == net::URLFetcher::POST) {
-+    std::string content_type, data;
-+    upload_data->GetString("contentType", &content_type);
-+    upload_data->GetString("data", &data);
-+    fetcher_->SetUploadData(content_type, data);
-+  }
-+
-+  // Use |request|'s headers.
-+  fetcher_->SetExtraRequestHeaders(
-+      request()->extra_request_headers().ToString());
-+
-+  fetcher_->Start();
-+}
-+
-+void URLRequestFetchJob::HeadersCompleted() {
-+  response_info_.reset(new net::HttpResponseInfo);
-+  response_info_->headers = fetcher_->GetResponseHeaders();
-+  NotifyHeadersComplete();
-+}
-+
-+int URLRequestFetchJob::DataAvailable(net::IOBuffer* buffer, int num_bytes) {
-+  // Do nothing if pending_buffer_ is empty, i.e. there's no ReadRawData()
-+  // operation waiting for IO completion.
-+  if (!pending_buffer_.get())
-+    return net::ERR_IO_PENDING;
-+
-+  // pending_buffer_ is set to the IOBuffer instance provided to ReadRawData()
-+  // by URLRequestJob.
-+  int bytes_read = std::min(num_bytes, pending_buffer_size_);
-+  memcpy(pending_buffer_->data(), buffer->data(), bytes_read);
-+
-+  // Clear the buffers before notifying the read is complete, so that it is
-+  // safe for the observer to read.
-+  pending_buffer_ = nullptr;
-+  pending_buffer_size_ = 0;
-+
-+  ReadRawDataComplete(bytes_read);
-+  return bytes_read;
-+}
-+
-+void URLRequestFetchJob::Kill() {
-+  JsAsker<URLRequestJob>::Kill();
-+  fetcher_.reset();
-+}
-+
-+int URLRequestFetchJob::ReadRawData(net::IOBuffer* dest, int dest_size) {
-+  if (GetResponseCode() == 204) {
-+    request()->set_received_response_content_length(prefilter_bytes_read());
-+    return net::OK;
-+  }
-+  pending_buffer_ = dest;
-+  pending_buffer_size_ = dest_size;
-+  return net::ERR_IO_PENDING;
-+}
-+
-+bool URLRequestFetchJob::GetMimeType(std::string* mime_type) const {
-+  if (!response_info_ || !response_info_->headers)
-+    return false;
-+
-+  return response_info_->headers->GetMimeType(mime_type);
-+}
-+
-+void URLRequestFetchJob::GetResponseInfo(net::HttpResponseInfo* info) {
-+  if (response_info_)
-+    *info = *response_info_;
-+}
-+
-+int URLRequestFetchJob::GetResponseCode() const {
-+  if (!response_info_ || !response_info_->headers)
-+    return -1;
-+
-+  return response_info_->headers->response_code();
-+}
-+
-+void URLRequestFetchJob::OnURLFetchComplete(const net::URLFetcher* source) {
-+  if (!response_info_) {
-+    // Since we notify header completion only after first write there will be
-+    // no response object constructed for http respones with no content 204.
-+    // We notify header completion here.
-+    HeadersCompleted();
-+    return;
-+  }
-+
-+  pending_buffer_ = nullptr;
-+  pending_buffer_size_ = 0;
-+  if (fetcher_->GetStatus().is_success())
-+    ReadRawDataComplete(0);
-+  else
-+    NotifyStartError(fetcher_->GetStatus());
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 78b819d068f2c0fc0845739b728c95a0f6d37799 electron/browser/net/url_request_fetch_job.h
-@@ -0,0 +1,57 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_NET_URL_REQUEST_FETCH_JOB_H_
-+#define ELECTRON_BROWSER_NET_URL_REQUEST_FETCH_JOB_H_
-+
-+#include <string>
-+
-+#include "electron/browser/net/js_asker.h"
-+#include "browser/url_request_context_getter.h"
-+#include "net/url_request/url_request_context_getter.h"
-+#include "net/url_request/url_fetcher_delegate.h"
-+#include "net/url_request/url_request_job.h"
-+
-+namespace electron {
-+
-+class ElectronBrowserContext;
-+
-+class URLRequestFetchJob : public JsAsker<net::URLRequestJob>,
-+                           public net::URLFetcherDelegate,
-+                           public brightray::URLRequestContextGetter::Delegate {
-+ public:
-+  URLRequestFetchJob(net::URLRequest*, net::NetworkDelegate*);
-+
-+  // Called by response writer.
-+  void HeadersCompleted();
-+  int DataAvailable(net::IOBuffer* buffer, int num_bytes);
-+
-+ protected:
-+  // JsAsker:
-+  void BeforeStartInUI(v8::Isolate*, v8::Local<v8::Value>) override;
-+  void StartAsync(scoped_ptr<base::Value> options) override;
-+
-+  // net::URLRequestJob:
-+  void Kill() override;
-+  int ReadRawData(net::IOBuffer* buf, int buf_size) override;
-+  bool GetMimeType(std::string* mime_type) const override;
-+  void GetResponseInfo(net::HttpResponseInfo* info) override;
-+  int GetResponseCode() const override;
-+
-+  // net::URLFetcherDelegate:
-+  void OnURLFetchComplete(const net::URLFetcher* source) override;
-+
-+ private:
-+  scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_;
-+  scoped_ptr<net::URLFetcher> fetcher_;
-+  scoped_refptr<net::IOBuffer> pending_buffer_;
-+  int pending_buffer_size_;
-+  scoped_ptr<net::HttpResponseInfo> response_info_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(URLRequestFetchJob);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_NET_URL_REQUEST_FETCH_JOB_H_
-added in remote
-  their  100644 0db713e4b752a4c58c8edfbc0911b09a2a163206 electron/browser/net/url_request_string_job.cc
-@@ -0,0 +1,59 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/net/url_request_string_job.h"
-+
-+#include <string>
-+
-+#include "electron/common/electron_constants.h"
-+#include "net/base/net_errors.h"
-+
-+namespace electron {
-+
-+URLRequestStringJob::URLRequestStringJob(
-+    net::URLRequest* request, net::NetworkDelegate* network_delegate)
-+    : JsAsker<net::URLRequestSimpleJob>(request, network_delegate) {
-+}
-+
-+void URLRequestStringJob::StartAsync(scoped_ptr<base::Value> options) {
-+  if (options->IsType(base::Value::TYPE_DICTIONARY)) {
-+    base::DictionaryValue* dict =
-+        static_cast<base::DictionaryValue*>(options.get());
-+    dict->GetString("mimeType", &mime_type_);
-+    dict->GetString("charset", &charset_);
-+    dict->GetString("data", &data_);
-+  } else if (options->IsType(base::Value::TYPE_STRING)) {
-+    options->GetAsString(&data_);
-+  }
-+  net::URLRequestSimpleJob::Start();
-+}
-+
-+void URLRequestStringJob::GetResponseInfo(net::HttpResponseInfo* info) {
-+  std::string status("HTTP/1.1 200 OK");
-+  net::HttpResponseHeaders* headers = new net::HttpResponseHeaders(status);
-+
-+  headers->AddHeader(kCORSHeader);
-+
-+  if (!mime_type_.empty()) {
-+    std::string content_type_header(net::HttpRequestHeaders::kContentType);
-+    content_type_header.append(": ");
-+    content_type_header.append(mime_type_);
-+    headers->AddHeader(content_type_header);
-+  }
-+
-+  info->headers = headers;
-+}
-+
-+int URLRequestStringJob::GetData(
-+    std::string* mime_type,
-+    std::string* charset,
-+    std::string* data,
-+    const net::CompletionCallback& callback) const {
-+  *mime_type = mime_type_;
-+  *charset = charset_;
-+  *data = data_;
-+  return net::OK;
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 bbcd1cb6a88fe96e3544152fa9f62efdfb4a51d3 electron/browser/net/url_request_string_job.h
-@@ -0,0 +1,41 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_NET_URL_REQUEST_STRING_JOB_H_
-+#define ELECTRON_BROWSER_NET_URL_REQUEST_STRING_JOB_H_
-+
-+#include <string>
-+
-+#include "electron/browser/net/js_asker.h"
-+#include "net/url_request/url_request_simple_job.h"
-+
-+namespace electron {
-+
-+class URLRequestStringJob : public JsAsker<net::URLRequestSimpleJob> {
-+ public:
-+  URLRequestStringJob(net::URLRequest*, net::NetworkDelegate*);
-+
-+  // JsAsker:
-+  void StartAsync(scoped_ptr<base::Value> options) override;
-+
-+  // URLRequestJob:
-+  void GetResponseInfo(net::HttpResponseInfo* info) override;
-+
-+  // URLRequestSimpleJob:
-+  int GetData(std::string* mime_type,
-+              std::string* charset,
-+              std::string* data,
-+              const net::CompletionCallback& callback) const override;
-+
-+ private:
-+  std::string mime_type_;
-+  std::string charset_;
-+  std::string data_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(URLRequestStringJob);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_NET_URL_REQUEST_STRING_JOB_H_
-added in remote
-  their  100644 e65cfb2c1c3396fe6c7d9552fad32770644aa309 electron/browser/node_debugger.cc
-@@ -0,0 +1,203 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/node_debugger.h"
-+
-+#include <string>
-+
-+#include "base/bind.h"
-+#include "base/command_line.h"
-+#include "base/strings/string_number_conversions.h"
-+#include "base/strings/stringprintf.h"
-+#include "base/strings/utf_string_conversions.h"
-+#include "content/public/browser/browser_thread.h"
-+#include "net/test/embedded_test_server/tcp_listen_socket.h"
-+
-+#include "electron/common/node_includes.h"
-+
-+namespace electron {
-+
-+namespace {
-+
-+// NodeDebugger is stored in Isolate's data, slots 0, 1, 3 have already been
-+// taken by gin, blink and node, using 2 is a safe option for now.
-+const int kIsolateSlot = 2;
-+
-+const char* kContentLength = "Content-Length";
-+
-+}  // namespace
-+
-+NodeDebugger::NodeDebugger(v8::Isolate* isolate)
-+    : isolate_(isolate),
-+      thread_("NodeDebugger"),
-+      content_length_(-1),
-+      weak_factory_(this) {
-+  bool use_debug_agent = false;
-+  int port = 5858;
-+
-+  std::string port_str;
-+  base::CommandLine* cmd = base::CommandLine::ForCurrentProcess();
-+  if (cmd->HasSwitch("debug")) {
-+    use_debug_agent = true;
-+    port_str = cmd->GetSwitchValueASCII("debug");
-+  } else if (cmd->HasSwitch("debug-brk")) {
-+    use_debug_agent = true;
-+    port_str = cmd->GetSwitchValueASCII("debug-brk");
-+  }
-+
-+  if (use_debug_agent) {
-+    if (!port_str.empty())
-+      base::StringToInt(port_str, &port);
-+
-+    isolate_->SetData(kIsolateSlot, this);
-+    v8::Debug::SetMessageHandler(DebugMessageHandler);
-+
-+    uv_async_init(uv_default_loop(), &weak_up_ui_handle_, ProcessMessageInUI);
-+
-+    // Start a new IO thread.
-+    base::Thread::Options options;
-+    options.message_loop_type = base::MessageLoop::TYPE_IO;
-+    if (!thread_.StartWithOptions(options)) {
-+      LOG(ERROR) << "Unable to start debugger thread";
-+      return;
-+    }
-+
-+    // Start the server in new IO thread.
-+    thread_.message_loop()->PostTask(
-+        FROM_HERE,
-+        base::Bind(&NodeDebugger::StartServer, weak_factory_.GetWeakPtr(),
-+                   port));
-+  }
-+}
-+
-+NodeDebugger::~NodeDebugger() {
-+  thread_.Stop();
-+}
-+
-+bool NodeDebugger::IsRunning() const {
-+  return thread_.IsRunning();
-+}
-+
-+void NodeDebugger::StartServer(int port) {
-+  server_ = net::test_server::TCPListenSocket::CreateAndListen(
-+      "127.0.0.1", port, this);
-+  if (!server_) {
-+    LOG(ERROR) << "Cannot start debugger server";
-+    return;
-+  }
-+}
-+
-+void NodeDebugger::CloseSession() {
-+  accepted_socket_.reset();
-+}
-+
-+void NodeDebugger::OnMessage(const std::string& message) {
-+  if (message.find("\"type\":\"request\",\"command\":\"disconnect\"}") !=
-+          std::string::npos)
-+    CloseSession();
-+
-+  base::string16 message16 = base::UTF8ToUTF16(message);
-+  v8::Debug::SendCommand(
-+      isolate_,
-+      reinterpret_cast<const uint16_t*>(message16.data()), message16.size());
-+
-+  uv_async_send(&weak_up_ui_handle_);
-+}
-+
-+void NodeDebugger::SendMessage(const std::string& message) {
-+  if (accepted_socket_) {
-+    std::string header = base::StringPrintf(
-+        "%s: %d\r\n\r\n", kContentLength, static_cast<int>(message.size()));
-+    accepted_socket_->Send(header);
-+    accepted_socket_->Send(message);
-+  }
-+}
-+
-+void NodeDebugger::SendConnectMessage() {
-+  accepted_socket_->Send(base::StringPrintf(
-+      "Type: connect\r\n"
-+      "V8-Version: %s\r\n"
-+      "Protocol-Version: 1\r\n"
-+      "Embedding-Host: %s\r\n"
-+      "%s: 0\r\n",
-+      v8::V8::GetVersion(), ELECTRON_PRODUCT_NAME, kContentLength), true);
-+}
-+
-+// static
-+void NodeDebugger::ProcessMessageInUI(uv_async_t* handle) {
-+  v8::Debug::ProcessDebugMessages();
-+}
-+
-+// static
-+void NodeDebugger::DebugMessageHandler(const v8::Debug::Message& message) {
-+  NodeDebugger* self = static_cast<NodeDebugger*>(
-+      message.GetIsolate()->GetData(kIsolateSlot));
-+
-+  if (self) {
-+    std::string message8(*v8::String::Utf8Value(message.GetJSON()));
-+    self->thread_.message_loop()->PostTask(
-+        FROM_HERE,
-+        base::Bind(&NodeDebugger::SendMessage, self->weak_factory_.GetWeakPtr(),
-+                   message8));
-+  }
-+}
-+
-+void NodeDebugger::DidAccept(
-+    net::test_server::StreamListenSocket* server,
-+    scoped_ptr<net::test_server::StreamListenSocket> socket) {
-+  // Only accept one session.
-+  if (accepted_socket_) {
-+    socket->Send(std::string("Remote debugging session already active"), true);
-+    return;
-+  }
-+
-+  accepted_socket_ = std::move(socket);
-+  SendConnectMessage();
-+}
-+
-+void NodeDebugger::DidRead(net::test_server::StreamListenSocket* socket,
-+                           const char* data,
-+                           int len) {
-+  buffer_.append(data, len);
-+
-+  do {
-+    if (buffer_.size() == 0)
-+      return;
-+
-+    // Read the "Content-Length" header.
-+    if (content_length_ < 0) {
-+      size_t pos = buffer_.find("\r\n\r\n");
-+      if (pos == std::string::npos)
-+        return;
-+
-+      // We can be sure that the header is "Content-Length: xxx\r\n".
-+      std::string content_length = buffer_.substr(16, pos - 16);
-+      if (!base::StringToInt(content_length, &content_length_)) {
-+        DidClose(accepted_socket_.get());
-+        return;
-+      }
-+
-+      // Strip header from buffer.
-+      buffer_ = buffer_.substr(pos + 4);
-+    }
-+
-+    // Read the message.
-+    if (buffer_.size() >= static_cast<size_t>(content_length_)) {
-+      std::string message = buffer_.substr(0, content_length_);
-+      buffer_ = buffer_.substr(content_length_);
-+
-+      OnMessage(message);
-+
-+      // Get ready for next message.
-+      content_length_ = -1;
-+    }
-+  } while (true);
-+}
-+
-+void NodeDebugger::DidClose(net::test_server::StreamListenSocket* socket) {
-+  // If we lost the connection, then simulate a disconnect msg:
-+  OnMessage("{\"seq\":1,\"type\":\"request\",\"command\":\"disconnect\"}");
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 8e650804fbb843ed07f8a008016042708f7d35ed electron/browser/node_debugger.h
-@@ -0,0 +1,65 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_NODE_DEBUGGER_H_
-+#define ELECTRON_BROWSER_NODE_DEBUGGER_H_
-+
-+#include <string>
-+
-+#include "base/memory/scoped_ptr.h"
-+#include "base/memory/weak_ptr.h"
-+#include "base/threading/thread.h"
-+#include "net/test/embedded_test_server/stream_listen_socket.h"
-+#include "v8/include/v8-debug.h"
-+#include "vendor/node/deps/uv/include/uv.h"
-+
-+namespace electron {
-+
-+// Add support for node's "--debug" switch.
-+class NodeDebugger : public net::test_server::StreamListenSocket::Delegate {
-+ public:
-+  explicit NodeDebugger(v8::Isolate* isolate);
-+  virtual ~NodeDebugger();
-+
-+  bool IsRunning() const;
-+
-+ private:
-+  void StartServer(int port);
-+  void CloseSession();
-+  void OnMessage(const std::string& message);
-+  void SendMessage(const std::string& message);
-+  void SendConnectMessage();
-+
-+  static void ProcessMessageInUI(uv_async_t* handle);
-+
-+  static void DebugMessageHandler(const v8::Debug::Message& message);
-+
-+  // net::test_server::StreamListenSocket::Delegate:
-+  void DidAccept(
-+      net::test_server::StreamListenSocket* server,
-+      scoped_ptr<net::test_server::StreamListenSocket> socket) override;
-+  void DidRead(net::test_server::StreamListenSocket* socket,
-+               const char* data,
-+               int len) override;
-+  void DidClose(net::test_server::StreamListenSocket* socket) override;
-+
-+  v8::Isolate* isolate_;
-+
-+  uv_async_t weak_up_ui_handle_;
-+
-+  base::Thread thread_;
-+  scoped_ptr<net::test_server::StreamListenSocket> server_;
-+  scoped_ptr<net::test_server::StreamListenSocket> accepted_socket_;
-+
-+  std::string buffer_;
-+  int content_length_;
-+
-+  base::WeakPtrFactory<NodeDebugger> weak_factory_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(NodeDebugger);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_NODE_DEBUGGER_H_
-added in remote
-  their  100644 21c02d74e2372989ce170a00fc5684ee1e119618 electron/browser/resources/mac/Info.plist
-@@ -0,0 +1,36 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-+<plist version="1.0">
-+<dict>
-+  <key>CFBundleDisplayName</key>
-+  <string>${PRODUCT_NAME}</string>
-+  <key>CFBundleExecutable</key>
-+  <string>${PRODUCT_NAME}</string>
-+  <key>CFBundleIdentifier</key>
-+  <string>${ELECTRON_BUNDLE_ID}</string>
-+  <key>CFBundleInfoDictionaryVersion</key>
-+  <string>6.0</string>
-+  <key>CFBundleName</key>
-+  <string>${PRODUCT_NAME}</string>
-+  <key>CFBundlePackageType</key>
-+  <string>APPL</string>
-+  <key>CFBundleIconFile</key>
-+  <string>electron.icns</string>
-+  <key>CFBundleVersion</key>
-+  <string>0.37.3</string>
-+  <key>CFBundleShortVersionString</key>
-+  <string>0.37.3</string>
-+  <key>LSApplicationCategoryType</key>
-+  <string>public.app-category.developer-tools</string>
-+  <key>LSMinimumSystemVersion</key>
-+  <string>10.9.0</string>
-+  <key>NSMainNibFile</key>
-+  <string>MainMenu</string>
-+  <key>NSPrincipalClass</key>
-+  <string>ElectronApplication</string>
-+  <key>NSSupportsAutomaticGraphicsSwitching</key>
-+  <true/>
-+  <key>NSHighResolutionCapable</key>
-+  <true/>
-+</dict>
-+</plist>
-added in remote
-  their  100644 dac213ed9d8c096d0b8c3a8848b1d3c4ab545059 electron/browser/resources/mac/electron.icns
-@@ -0,0 +1,3373 @@
-+icns+������������+���������������������+�������������������+
-++`�c�tW���U]]]�_J��5�����x_�k�}
����5��������-����ɕ�PCW$r\��`��l_�x/���D{���-�5JW� ��t�c�Nw(�Ѧ���GZ��n�[��q`�
��:th�_��_L��K&755M2d��
��ׯߠ���555WUU
��]]]�:;;�u���h�q���u�޽{�m۶m�%K���_������x���|����q��]0x���G�p�-����O~f����liiY!C�Ȉ]��".�)��(�ә�H�����	�,����T�aCFϰN��O��O�o���[/U�>G����-h�h�!v����C=�����])���e�с���R�My{���>D���_�p͚5_;r��K���]�=���ݑ����;���%dCFdՁ���Q!z�d}�d
-+�Vz�<p���3hР+O��V���ѕ*>�>آ)]��Ϊ���թ�*uiL�RCK�8V�m�:l��T8H�!�Q�A�z=��{�u�c�<xp��O?�m]&��^���Bo��H�~�d�ט�{�k.\�uuu�'�
�o�Ȼd�fW�o �Ș�0�g
ʵf\��*��
-+������R��j�҈~�*D���?��7�����O�A��ȗX(�����xgD�"�@��/�u޼y(���K��Vݤmj�J:�Ի=S�d+S�:m��0��2+/���U�
ꄣ����<tp��r��r���٤
}�Q���/���_��`v�h�
ec�����Gwܯ7~��_?���o�J���/F����[�g�Ooo�Ԑ+��L�2A�˽�XN5��j0$��\ܰQg�ʺ@�P���?�*�;;S��#��ԊF���[8|���������e���3��}GB=�`x���MR��ǎ��k1teب��Fw�\�ݐcƖqh���ML8C�e�;)p�.R����-���
-+�k��ĺ��9G�֭[�s�m���E�m)���
�5��6xF�?���N�Z�kJ���
�I�v���'G�0���
��$��$t2��&'�p�!�c@ٯ�%3�T*�f�d���"O�
Vו���>�ylե��p�
�
-+GxGF��ߎ+��?쌳��h����$���-]��9s��g5��R8����-UZ-qE�AM�:�b��J+/eRʶ9��\o����r��ו��ɜ�uHG(��:����dOS��'0>^I+=b���J_O8_N0�{�B�"R��/��W��*ޢ���KP�$������r��?�<y��t1̆���J[�݆�³B�3���
��c@��ԺB�����L�hԂ�(���u�&3�oD��Y�.W�Џ�J��F��緔l?����F�#;�u��}}֬Y/��:xy���|:t1�+��X^N�x	M	�M�ˍt��i@�H�� �P�d)��t�zA+��#\���u���$�F��*m��ʸ��C(��[��ьnr=mB���d�t�Œ��_9�j�>�3�<s۔)S��0>1�_|�*������FDy�0WF(�&��(�
-+5-Z/GI���2�M�h�x�[7�^DQ�0(�����.��e
��r���l���
�R�lke'�Ӈ����g-��2��zL��6�L�.ѩ��u�cZpJ�NE����t�=�|@���5�$$���-�I�����(��7�8���Y�28�H@ǔ�3�+���P�2��
-+(4�����*�アW��$�F��(UX{��y�"�DAy#�y#�Ik8΁*���@{V�C�M5��ݭZ�3�8�.�`�~�ny�H��=�VΧ�
ht�����������2D}�$����f��e��2C�[�
-+
�P/�b�7���]_�
-+�B��sf���cX��ҁ�<ϯi;��:�����
Vw��tp�����3�A�I�ӿ�kTO	�ϗ�0z��J�3��+�	`�V��c~��j��ɗj��/���[�lN
�%��M�ɟ,�ÃO�ד�˖-�V}}�yA��=��=j�7��,Ea-0A�b�	'�ZFu$��LQ'"@���T���%��p݀������/M5[�����,H�g�J{Y�E>��%A4tӸ�w�B04ʢ�/��'���`	�:��B�QO�u���h;ܲs�=�sz����X6F
FB�Io�I����LL&k��K�Ǐ�L�F�m����&[�G\��{L{��nN`�R5�f+��(`���묞ۼLX��C0�ܬh@�I�7�K�^]�tT�P_��o,a���6�_ktl��fYL&d�?s,�`�ʰ&�AeI���`Pެ��q�ե4B�>m~��e1�I�o�s���v(��p��:+��1�	����]�;������4�;��iڢr�߰ykjhoI�k�l!��z�)q�S�N�"��Li�e}�g��N؊�/�����Y�ӓ�T�S�D@�����~O��:��[��[A���
��|�ĉo3ë��d��Z��Yo��P�j�'
-+�KJ� �<�����:��`s+LU�j
-+7h�S�t	�JJJr]
P6P��r��LP��Q��]�M;�����7�56%�9d�)6���G���7�a
�i��1��قl�L�(�NΨ?+�x��JXi*��;��y�ЛQ6�X���w�i�(Bmm�/�p�&�kU��vCs�+�Z�?�(ۨ[�u�p"+��Z�6	NгCi�1�:aXzO�fì�պV�����ƈg�\u�!���G�s�;���G-N���Fiku�6A��\@���a�� ��R
@"E[�6��.�Z@�����تF�m��[�n�N�
@n�>����I��6!����1�s
i�	��`i����v�@c���|o���=P0#k����5ja{�kޟ�����wlMGw�������hsjR�m��8#�jR]{��#Cv
X��!B�+��<�A�pO���C%������mn����ꠡ�T���	����?��?�N�4iBl�H�4�i��V=҇u�š6�d�FXo0%�1�iq��wI�4���e�Ζ��UkҺ���6&gy�^tK��rT��0t�&wÆ���{�o�0h�]��BNe��9L�m��̺5ܸi�M�.^xqz��GM�Ͼ�<͜{NzbѢ�t�
-+�CI#��0�r��qiƴ�iʄ񩵪&���H�\�E�ڇ���3S"d
���v��t��� �]Dz�\{�U;�������Ϯ����W�:�½�p<@<��qƌ7�z�
-+���o�(�!m�@C���0J������Ő��-��V���d���ukK��j�Sv���رn�������_}�(�`Ј�0ޠG�
��[�mM��ߠ��Miˎ�S0����67N�H�X�6n�&���F��M-G��]����/���4��;cF���KRkm��l�|��ڍ���.	�G�cѴn%��
-+�Uf�<D��uj�!��k)p�c����$����c���C�Y���jV�,@q���!���1���
-+�T�i��L��,���"�H
��=��tσ�7w�)��^$MC���9��aõx3P
-+���9R[�q�E6|x�{�-&T1R
���k)�eߞ����駏>�����=8�|�I�>Q2r��F���ٌ�wss���K44��sT6�9q
���3m��fZ�'��Lg�lL-�h�8�GVԄUl�� (3���G��)5Yr��ڑ���2���U��P�PY�y�[��O=�����g��wvV������s_SJ�c��D��!Ȓ�g�9M�
g�>�Hz��
šu�?>M�25�7!
:�/7���;+���k��hm	~�W�����^����zqK�d�p�K+q1ts*��٤�@���Ah�5%����P9j��gU�ʞ$e_x�e��G�e��\/-�L�9u��$�`)��+ғ�>g�p������Yg�M3�1�. +�FD�F�r��8IYqS��-[RG�&�5����]�9�eW]��u9ڹ}�.���K��k���+����eD(�VZ!�Sґ� �)҉O��1';A�?��?>Gt�g�cN��2`¾��M��B�!f�*F+�VAAB[��
-+�l�bq�#�@��	N��g�4�ڠIV�͞ڐ�����IQ��%O��vEw{�lJ���;��O>���`/��\y�
���t���S]���N@�K����%�iLS�x�F,��)�����
f�&��^y��!���ט� ��R�g���`	wrTj�p6�Ćey�wj`C�8�;�<��`CG7��O}�+��ו����Xe8+N�[�oKs�s��.��R�F�2 �[k�����~�͙��r��w�L�<K�2a�]0��c���o��f�N�*���Y+#d��������-��E�ˮ�&M�<EE�ʆ4���2�Ο�
���n�Sg`�>�E����̭<ԃ)�b�t��fT��`���n۞143�Z@���@��NA)#�I�Ti��c`���;Rئ+?R�W�
�f�
-�� *A�Ӣ����B
<�©��4Q�%�d7�����m�
^V�0l�<=E8���R[�lX=�w�ڛ�c{c!hAO�4������J�NO�7j�o�-^�
-+�&�
9���M��Y+W��fi�\bW>�]�7�z�H��4���@T�g�3p!�ܟ���k�u�ԍ�hu���&"�M�,��9\^k�: o��`��)Юl���`;�o���6T�9���Q�P/|�d��Q�7���I�6"d\o*"��<����j	���U���7X�Sϯ�Hw��>3���~�����������/F/h@������9}.��(�$��Hgʆ�h@�Р����+z	T������P�a�C��!�O�H��.�ՀP@l�tC�
-+�8���+5��u��G�)��/�����Ľ���`�:
-+삋/��kЀM\-�aJm�c�Q��*����z$l©�ڔc��L�����oVv�f���CS�����6nՊ�I�t�~�*�<�� �(W��/	��?�N0�M�*�8GɁE���o`FVX��m�e^�v(���+(L�ԫ#,W���V�>����7Y1�.��*��s������3U��aJB96��@�x7��M5��R�6�4
�W~_��Q
-+��>�w��[j��~
-+�db�����e�Uɧ�{^� Sg�3�|Ӆф�r~��c���w�b~0n/��I�D��6�vg�1%�Hx�ϽM�X���9@ �K���
�܉<#H)�Q@��5
�+�bY)}<�ܦ�����ҧ��.���ҲmX�[Èi�`���i6
%�.�W&�<h!���
 �,����i�|-�zAȣ�`a��\��n&���Pm�$ok�Q]N6��6lڜڎ��|�hr���d���B+VlE���=*��hIW��=�5��9�/H;u�^��)���
�ӭ�~ �ѷԂԍq�#4�,�
-+pW��W\�ݳ����u�V���_t���-o��
-+�֟�;�V%�	\%�8d��SV�.��4��1�N�Ӑ��LN�y ��B��)��L�+�B�s�-���+p�ut/���
�q�nsJ+�i��H�8��v+r"Z��z�
{Y�
_$�
r,�}�}���Q����,0�9�y�=-��f���k'C��IS�\�C�_���39�H-��$T�%�YtFT%�%ᠪ\���������ʔ ��6����<4����@��H�
\
-+����ElTC�2��pc;�l|(8���A��<���2��Xi�Xx$P���PT�VQXB��b��}�p+

7H+�<i0���J�&�N��!��^���v�*���l
-+y��V��Q�4y�t�+�����m��Ҿ~9�]z}{����pPt�
-+��]>�A��%P�44HS�eȔ�vI�z��h��&OB��Rlޡ��va�F�����oJ�1i�8�v�ŁǑ�U�#k�d,��d�r���:I��]	�)��(����r+?�Q�*87��ߩ7y���˕正�H��E%�TJ{��|��1��)��.i�d,긤7a�	�:�����w��S6��+��9�-[���_�U����Z�3r�b�b�G�1S/��F�Ӫ���S��K��E���52*$�ʹ�t���/uơ0�P�e��2ۅT��2��D�J��&
-+���OƬ�v�0n9VT��r��
��8�h<�|'` �L>��!*^��T���ٙB��Z�z����
��Ml�M#4�ؚ�`PV7~�i�޼����$�,z�ء5�o~�{��%Ϥ1��C��t�(�F�~!L��mA:��^����=�=D���~@*�n�c�p��XŤ��4��hj�4��Aw/FZ<��`A�=x�H��c)Y�5��#��&!16�+��IJ}�Ɨ5Q,84�Q��3�5���}n�/�+b�^y%�ӫ[/\�v��yGXA0��r�~z��jo
�r�"]����O.�K��V�[��.5�eϽ���~��}�6�X3G�EmDFV.�
^Ť�5RqɁ�{�rV��9m�E������jw7�n��L������M�@���
-+Cþ$�䬢�ɱEe���>�=��+��aG(�񬸲��V�ߵ�_���k���
�ݪWߕ��aa�|ED#���m�Q̾�U˖�g����A-x�n�Ҝ�ǿ�{��!C���֨���������gc4�G�цR��;Ӵ�1i���j�g�c��\�Pl������կ���1zMl����d���F=����?��ݮ�����Cr �9�ַ
-+is�g-�J�o���<Vli	q�!\�:�t��;����{�֏K (�
�8M��w	�ƭ��ثE�׬�* ��;P���tI�Bd2@1���G��IO<��P+f*�KA��������^=S��y#����vh�#܆uo�I��1�
6ۊGwf2��.�����]�b�Ԉ�\�ܪ`�c:@_#+Ƅq��e�y��T�g���4J�n>H��n��%ܢM��\r�5zOP��~\�^��@�͌�h�u�Y� Zm�g�X�/���<~~���L�K�,=���!��.��#�2�fh�W�G���=��{/�*�ت��=*��^�s��㪍��ϿV���T�4wx�z`:h��Ҋ���(�BPX��(��f<x��Ү҄�;6U|@�Z���6�eMl�)xpm����?
�2�hޮ���Jj1���%��G���՚��M&͚�Y�!�sp|��4B�1|���u2���E2�T�c���w�V�u=вͦ*�,y���tj�m�
��0Q^�����#֧�:Ҽ���z�����^x�1U���* N@�58�^���bl�:f��ŋ�'�ݿHi�U�r�g��b��l�Mw�K�?���#k'p鹓�3D^r�ui��ən
�΃dZ�����P����/}���R���z��^gڹm��O#Q�!���t�&Mv/��}߷A�Zt���+v�r8��-#�� ���_^v�e�����f? ϭ�9� |�8�]
-+�rC�\I�7_vU������Ӷ�w?9��O�Fh{�@-�׻s3f�I^~�}��X�c�~�aͪWM��v�NjBٚ��+���a��*�e��&�Y����\_�=��.O�*!}��h�â�|���<ki����.��
��6n�d��0O��������%�}��!t���%�e`�g���@�3�-�1�N�\�!.�Xs�~�V��K��;u�X��#�Ch�MЎ�F�(+�J�n
-+�|���,!�ӻ�E����'�\~��i��>����(}+A��ݳ+�?�:�=pP�<���Ͷ�K+�ٹ3�����
��A�����
Ҏ��|@�^�6l�d���ɠ
�&H�qB�L�����Թq�0�n�֨C��$X�#z>���d��.��W�J!��+�X�.͟���闟^f#U�o����oiN?��^=.F���]NΜ=73΀Y�J1��v*uD:�g*'�=�눿�����g�z�]ʾ��ޏ���/�>n��=䖘����5�\s�j#I���
���JT���R��UFli@���)/�3ܘq��:=�k����bCZ#'�`���Y��ϱ+�C�_o�c�f���2�px��K�"n߶%����z=�}Z��}�	m@ѷ�"&F��q��jG	�ڀ@
-+Y4ϸ
-+ri�]y
�X�ɛc#Pрb������<�o����w�����~��9y]+�������
-++X̉
-+}�0���#(4��S�l;K��B+�v������>�o��oܡ�X���w+�Gث��V�99d/]���w�@:�.|\x�Ϟܨ�=�cu��
&��+���#�h�C4�8��������?x�vMQ�׀)�	p������@Ą��U>�Vs���zA�5
Qܛ"c��W���6������cQ�^�U��0~>�,��z���r,;A8B�8+�����;��W\7l+�&�zs�0|�r��:�s������;o����7n���Ç7j��^o4Ц�z��<�:���X�2G��M�vi�r�6d�Z�|�n-_�S9/`��1<��0n�Go�^r[x7:@Q��3`lF�0zeu�s�S�w��4�B��H�	a��1Y�cM�s�8b�Z��,��L��wE��\�»�
BА1�	�KD��#1�
��">a����=7Z�I�Ex҄��wٹR	�2�z�S4"�0��+�B�|1��*�|�Xq/h�+ӕJxW
-+هPE�V�q�bY1����cb�HW�u��s�/E���(Ƥ�y�T,뫍aT�èQV������/��}�VLC�2�����+����}
����5����o�3|J�,+
-++�WW됶�����c�.�Q��[�5��}�	K�,9aʔ)�Ə�D���Ç�:�jp79�M^e�����w�޽F�Ī͛7?�������#���e������k$�	����r&��M�p��W��������OG���w�����y���7�7�7O;��cO�>}��cƌY��:���
�.-�J�/�)���j�p����o}��o��?}�W�����ϊ�	��B��.ҡ�Jy����.����)W�#��O��O������s�:�7O�4�L-�OЀbRx���8}��7z��ޱc�}6l�����S����_�����&D"���ws�C�e�@��(�^T���S�:~�����<����?��3f�E�3YGQ�X�
8h�Ĥ�b�V��Y��n���?��?��[Ԗ�ژH5�lӟ���%y���%	b�ʗ5ػu���_��N;�s~d�̙�6���H�29��Ǜ��{��;�-�~�2<�v��+4\��?�ӷ�M݁_��>�-C��@�QQ�{����)�q[n��	����|�\�^�D�洿
]t��+܃���-�k��*�Wy���g�����/^��Q�F-�i�`�_�����?Xy��/��?�t��ޕ+W��'>�}�+_���
�	5`B�P:@M+WhU�����oVK���I[
�nNC���@�
��P������,�\s�5�u�Y�����f���7`�7����"�v���qX�Q7��D��a�p��Y��R�0^�S�ɇk�\e���uc�wy��=�DL���x��!"��X7��wq������롤�����}梋.�N,L�
-+hJ�&P�D�Ci��Ci�(��w7n�M�`�|�UW����O���mw�p�`*GNL���{����4vi�+�0�S�	7%��`CB����RD3L<���ʄ�(���e�=�8E��#�d�e�=&���G��k"��;������m��E�$���-�����PJ=@?�{��B��������+���GN:餏�������
P+a����FZx�Q9&��}�{M�������K�H�:���`��+�כs�.�+%����ХboN��DYPP!ش�扲p�fJ�I���f���*�Yp����iӦ�����'?�䓷�y��
Ck��;$��ö�zm���8{���@����(K����+����]
-+��
-+>
F�U)W�2�T�`|�SA��Q�/����]�
=�%�!ԃ=P�&踷^�x��T���@��9����j��6�"�ٝi7�
��1���ҨL�����=a�w��D�mE|R!~8����'�٣<0F�N��9%��?�)�3�4�[<*�����th�:��O�j��N�%���o��%�oh�?�ʧ`]���<�G�Z�C���@G2�+���킰j�S,Ȅۈ�aA!�m�U������#�6+��tJ�%��~�g�z�pJ����Ut���M��Gldx����fce3���ƻ��Q��A��t������#�9�D��¬24��sY�qԂ�#U�ڭAQO�AC
-+f%:��`��-/aW��򸚮�X�	y�͵��5^H}EM<�+v�D�T+���&��ԄV?���Y���fX3U}t�|��R�9�
=�@_�lҭB�
-+����/������+p5͋�+Xu�+SW #�KT��<FN])�Bu����d��O�Ɗ.Hkz1lm�		����_+�!�|e}j�~���x�F}��������;����Y[
��:��[}����?�&D`�,N}o3���Op-Wi_  #�"8\@���'Xk ��H���`�99�#y,%J�_,�[y�\���CH��H9ac��QE��݁	}ѡ'9��5�K^d$�?a�ʅ���~h����S��#x)���u�F0�j��e�}�z�u-������f�������}��u��Z	��X��
A��x�&w��k�-���j�]�p�[o��/&N�x��O�ܬ���.�9*�*83+oe��6��]h�Nj �A��^*�I>h!"�z_�b�B}�ud�`nQ1���r��:�և^Ӥ����U-`�>��������u���a�Qq�������㏯	36$צ����9a_m5���pŊ��v���#��{͍[��%$��D%
-++�0��%K���~���u��T�k��j���}�}��U�q��j
����z�����]�v��q�@�`�CP�
!�A2I��
-+��K
%�r�}ю"W��	;<D�Q	���͓�6c���d!�r�ן,O@��v��+炦���z�%��:7����/��Kȫ�P��)[`@�%���ې��]����ޓ��JS�ԫ*��
-+�=�|
-+"U���=��׵�͊x�t]�U��?FL
-+�@1Z���T<���:
TW��ȹ`9OOe������
<I������6��Y?��C�$���%��G��PTU�Iv�����$�`R�m@4	�r�a�b/�8��L0�R0^w
xX��ۡ
-++
-+<�YH�
V̀6E��&	�H1"�H�6�D9�[mVY�f�J7P)�6X>vH>܁��)_`n�
-+n�r?Ԥ}ݩ�y7����:��~:"��
-+%�Ԟe�Ą炵B�J��
�F����Z-��; ��Vt�=m���Ħ��i#VU��.�V�q��Y6����8t�u�]���K����
PQ�[Z�}7��>y_�D��f��2�q,P�_$�鎯2ylH��Do��-
����^��6e������[Xې6���<�-
@4ŊӲ%�L�]�6�Ϊ�b��P��"��Q6�jV��CU�.��fUm3��mG��^&9\�g���(?~��6Q�
ʩ�Ի�fΰ*Hʼv�bGL���+�hZ���ͺ;�\�Eo��ܱl�er��̜2�I�
-+4W1KQ�vX���ʶr����9_����}�g~�@-��߮�  %��qG�/X��'{��E@LE�D�-���a�*C�I�c��΄YW�-AxOD:��䍀�
�K+=�
��P*��D"���	,��I����8	�&>�t�
-+i�-eW�T��S��S��f�M�|���%��.3�J{���d�]4&�4�Ī�y��&
��0K��%a���I5��g����ͅ�u��TǍv e0�^�����
o�+���Y9�l:���c@��>�F �L��KYm_
-+ֆ_
-+*�!G{t��� !�ʶ�P��C	��(2����;��g�3��ik�'I�#�P��J"��o*kQ)��BY�����j�eR��S�3*�h����D��q�{�˼R(X���,��)R?Е~�1X;�U,_���j�?V2Z�!/U9�i��'�ޡ�6M�F̝��6N+�+����lg\5
���+/�mF��"DY��\�����F���n'3�$�!��o���_m���."��a���	g��s�i�~��-J�J�2�P����cP��I��k�.���������WXBtX�2!!��!�/E�\ � 7�e�)t9�\�A�2���p�BV��ٗ
�P/I���
xx<\�'��&i��5����y,�Y��Y����
/4;v�jƏ+�>��I+:��Coa�;�cX�P/�6VEk;%�ʶ7uQֶZ���W��f��S)�(�8o�U�UM��WUe����9�������+W��I�&]X��7���O���v�]��#��M����e`�`�:��q�E�	F`x�n�$�!Lf���d^�%��j�LL�₴Y��卶�]�r '�}�v�b���S4
\w��ͷn�ٓIj���Z٪r��mo:���3��5
ļ'�7ӻUҕ�_���S*
-+��Ͷ7�ø��9�������D��8A�7X)�k�,Q�
8z1�A �!�
��Qې�V�EX&:�ҷ�e�F�2v�u�;]�n��ſڹ�$Н+�j���+�ز�\��S�� ����2��DLۂs=+)
-+с��U�܂Ԋ	G@ЗO�:�
�Q����F�ӛ�]��,�dokA!"H5D̢n�7�IX�kY%;�G����p�-����nv�#s��/�J\9bD�d�<����_�fq��ρ�C=�y�X�v����k ��T<!
�*L�]���TP���`FQp���'�b�>*JF��dh��չ�B=��%
O��I>���Ն�3g����]v�e|a��	����Zd�W;���
c�=�ܣt���u�W|ˉ�cd�ɿ�m��+�v�aNG�(��8�eR��OzÂΰ�7�#0Eo����Ad^լ7�
�|�z����m���ҟ���r�/;	��74�j�o�Ab�#F�hf͙�̙;�eLh̀@��7��lۼ1�aH:r��	G1�+�+�!�l��+�O�h("�jB�ǁ��}��s2`��y|��?�nʔ)'�v߹�kxT������^A�'�WP~W4>�n����f�ʯ��o�<�V�&�[� �..����
�;Kg�~�D�^��G��m���#r"�T0@� 
-+J%ٷ
�5LP
-+
-+��"�JІTl%LL�r�\U�������+�Ԑ�0t9�5m�%}��ٸi�m��
�s�=7�m+�%�ݬ4,5�V���4*v*ӷ~����
$��S�����	(�n,	�a��M�
�5���r��я~�G�5[U�S������'��+���@#�����W\�>}��rN�©3›�l����S�'�.{��@t�Ν%���QڛPt�l�Q{�+N�EE-,��ҏȓ�ΰ�j>���ڶ�d����}�g;ms0��X���r�'�"�U�?l��	�h����/�؎�Aq;2�0�<�n�2,�~�v�ߦ���w�(W�F��p=C�������X�qD��m�+��Fu7�袋�q����#+��+�J�a;�a�~t���|�3Wj���
0��ʳ寐t��[��F�xι��?�s��R���k���#S�Yx+��h=z�f���W}ޫ�>���SO��)���
-W�@�1\ņ��3����+G&�l�Sb�|�a_I+�IzD�����<,����)ؗ����Ǭ�֡F.[w�'�X��#F�Xԡm� Ϭ�o�C�����%��"<�6&-�-"�Ò*�Z^��T� ��(��S�C�� ��6��$�C9��.�cY�y����鰛�2�]Xea�����|�$o������ov��9�WH�J�9��.��9�ef�?H�tq�7��y��U�N7��؇~�1~R�^��W�En{r�EE��5ZzXYԩ��@��]Aih�L�p�]�cJܖg�8)�����P�����j�=l]z��.�,="|�ng�b���)��G�1�nذ�>����ze�bA�0�^��J�+II��e�𠆲w0�V�o�a�����-mDD�c�~���f!tSV�cC^/�
-+J:0Nյ�G>���?�ꫲ
-+p�����!����9�.��:N?��y=���]� �k����,I����<`< "���,�?�'@!�=��ʷ�U��@��4h�'p(����P�!i�'�;8�a�)��Z�,70���Ö�W��O,]}U.��#)�Q��r^�s��=�[Q�/�E�MO%M�i�.(�h�q�ך�z�(RQ�5O>�y�[.lV�
-+Hށ"��OE�P~S!�)��Qe+��:z�Ȟ��")�L�c
dt��K�d��������"����+�ۮذ�Ƙ�K�"~�	H�nj�\�w5#G�K�{������UW7#�J�>�^��oL��N�埍�S��N)�N���萖��C�����+%�`��yeI="������m�_���
-+(D�֕��B�r��yf����
-+���t��"4BZ��'�i?	t�e%3�q��7V۪GW��K�qئo�x�b���Op�ު��
-+��[�p
�m�+H�w��0�C���ΤȠ`�8��r"P�uj�j����<g(��T+���#U���&ѝ���d�.�-C�h�b1L��uW�^�U'��-3���J�#���V+*����#�RO�+���/[d
-+d��؛�	B�m2`�Ñ~]+p�D03ا���$
�	
-+r΋�*�|��s\�.+J��Q>V�8�x'*�,9$�����ov`�یi��	�=-4����Oj���r+����xXZ�<E���j�,ѳyLF�^MJ*�|�ް�����z4J�#U�C���KM��65�e&�z�q��V9����l�p\��8���P��I���E�EkϘOݕ<v,r��S"�2�$%>>j�������*+�2�l{����4�=�9��[�^�ŷ�٤o��a�f��m�b�U��];�Q��>Z�ոŦ���董�Θf��O�:����uFjP0��2�D�X�����Dh�ʞ��TF���؍�i���<�;�GI �Uh'��~��E��y�4��|2�*S������f�v�����4�m�O�ݬG����X��v���&襣�z�`�6~�̓!B�٬�����Gb��-ػ�m9��
�꾢OMG��Ob�8������p�
-+a�^�;[߁T=09�����X���	Ж���"��r��`|�U!My�9�A��I/��>��
�L��'?�L5�+F���춶B ���@�
+Y�'����y�z��W�T��������nuk
-+:0Z�e	�`�CD����&�ΆT�r��H+�Hvh�z��JGA���أ���n����7�Ѭz�I�H*,��i��)w�*�JU��`�u�q˗��g��h⬽%�8�=SG��J.<��_�o��t��e�Lط��^s�C+��u�M�2l(�Y�<}�~fl��0�y��t}Co
-+G[!������S��:��F}h�	~R�{+^9o2)�v�|�d�l]h�)o!�B����6�;e��~V�E�@0���� ��I��.��Ip$#4'�OuvN+ѭt��gΕx��?�z��͆
-+b�J�%�9n��f�>�5u�.p�E����H]���+��)�x�v��=J�C_�ݪ��
�74^X�l���"�|���w�GO�-Q���I�ZA�L#wR�N��vp�
-+�|��n������}�nZv �I-�SH�%?�>_Ę;o���Y��&�.��|��uZ���꧞h^���j��;�}��f�V6�o6>/��zsFR�,c�I�q�ys�������I���Z	l������,K;��?�{P�b�ܮ Զ��g!"�w;�?��ڀ
AjOa�a�6�k���1vgK\/ޯZ��s��~��Jov��^̼H�s${E��VG~�J�G���~��w��0�<[*�O<��~�ˉ�H@��T���q�
�d�YtZ����ѥ���C��g�Hl��!�Z�(&<���G#0S5P��ͥ��7-�e�4Ȼ��&5��,i�Z���>m��8S摙��Mј�J
|��N��
��7<���`�=w����R��̤F
-+&�UD\ț�e�X
|���<�Ps��kՅ����<X�ǎ;�9�3��-
���[t����]{~�'~�3���q��z��'��ʌ�
�e��uu��'�']e�aO���|���.��9A��ݶ˟���Oa��<-^u�P$��UBy|���;bF8�A�l�h"A+��MG��T��K���:}Ԯf^�-�ֶ,�c!O�T��;w��`�5a�;q
-+�A���m��ȑ�6���ę�w��v{t���d��ҽ{
�Q�d��@�3��(&
�<���Zt+�#����7,�gΜՌ�-Bpn2%�'S�X̝�8������������{"����XB��0"sԁi�0bd3w����z�y��͛��f/� �:��r��g���!��h��\�{�1Z��0�}�~јW1�����6�t�X���D�x�l��1���H|P���
�50t��f�N1��;�٢ۣ<'�8��µ�o�F4#)��p��
-+�A
E\�������>X	N+���K4�'^3D4�7�"���\�dX���'\G
��^lE����O}�Fk�Q[O<��u�zʩ��-Z��]���ij�����
���S��a	?��iq�L��H$�8�ۃ)�|��atytH�����F`��x��S����>��ͧϘټC_Ν�2��TIr�a%&A���7�Q
�-ܓ`
-+�n�%2?��f��H
�a�ϓ��w�Z:�g��`XiC�h�ծ���*���o�Yz\3~�x�F
-+cÇ��~���l,<��6v��q%�S�����8q��l��������d�����Dj�j�d=u��������uߺ��J>����o6ճSf��7
-+���.�eo0��~m���7)w+���iw�f�Yu!C�V;��V�4 =�lش�y�N�8
�Y��vFXao�������S����Y�[�֯CRڧdž�F����"�D��+,a�Cau�•�zWJ�*�-��AcC���L*Vn�
;�1
��8ަI�-T
-+x��P'��_�G��o����-�@*l_���q�#�a��r|t�J��̿MDВpz]��O�)*x�I��6��\`(:2K�+JC�n?��
Mw�����ν,�E��EE���ӫu"���cF
5������M�Q�S��l���xb��l���B�Zw�_ա�h�K6uy�
-+�*n7��~�Ĉ~P�cc�A6 a)���-J�e%A�M9�c��+�v��?�q�po��}��w�+��u�kꩧ.�A�c��#�
�(��p�z�^���p�Nȅ-���E����+
:ē��
-+3yt�O$Ϸd���a�#+W�4f~���t<\�j�
-+�3��-th���ng�bH��D����h��X��j��x&��#N5��]>�oՕ�A�h�d��挳��+���
-+u�2�q�OM�R�?����WP
-+(WI�%�l'm�H�h�6��%|*���I��o<ʌ���v4�tKr���g
􇝉<q¬����v��m�x�+��l�~	<��^��v�- ��uai�=�%�H��T�1�Hǰf=̾ŏ��S��x�Ē����=�	��u�1zDq��sȉF�N9����?�c
i|��1{
-+�A�,i����NG����`0�hT!��<O&.Z�	S����+�O�O��Z��l�@���`wj��� �S4�r�q`�C�~�Wk}=��˯����þ	I��VY�Þu��=�
-+�h���3+�=p9ܮhq�5�0�Z:DP�$��C�9���%u?����Ӽ���^�	�v��P�
h���f�*(����˥Kʰ�!�2�Fmv�GKY��@A�p7�L��A���p���)9�q�SG	���-4�9WA՘��q�d'�`��J��ξQh�>��Y'hC���
��m1���4
��,���U��[�
�9a�
�2wڴ����]o��;$��I���g�MlZ��l�۟�
-+~`ş<T�SɅ8�Y��z8�Gީ�y�s��Mp�5O?�L�TkcȮL���O/�xc)��{�L�Bv�x�``�r'��O��h3�\FH� �L�q�1%Z����Zl'��a�m��z���o���sCz;�Fb�)��+6\}�4n�B�<��g�A�rk�>��«R���G(E�J
SYϱG�
�H?[�"9�7����\$X+H��(�F���&�t������SUo}��i�X������~��]�>p+6����|��ؔ�ݻ#��a"��x-D�g�v��X�p��I�T,���h�D*�6�d��x�4أXJ,�DG
�QԵm�"/
-+S&�Dm�}���*-�J��>�SM��d#N3+�t��u�u��7}u�����;?��x����b��baB�@�2J�r�ᄐ���<�B"��u�a��m��Ї/8up��[tU�+ M����vg����i#X���a�^�~ yF��ɑ�ul�E�#���6O��&����{^�F76⠼8�~� �!�M%���4I� �"��%������>G�[�v-�kb}� �$��<|j,�6)R
pµ�^�k��)�ة���n�T�+Sx�NZ*ƶ��&5e�4�v���Ѓ\��)��%�6�E��٫��M瓜�J� gh����p��uԑ��A�2\� W���� ٛ�i�s��z$�����G���=���3sU��|������o?�/�t����Sch�M� �VZ$؝XvԝY��-ˬ6T\�]z��[�qL�
�W��j|ūǮ+b���;wU{v�h���2?�O�[y�B�\��G�⢁�	F0 �M�+�B��
�4$Y��|YU�"OՈg>�G��?G�1~�ϣ6
I���c�"'�������>.%
-+��>�re�&�q)M�|�a��y��c��w�����{n=XS�k������C��F��A"m\L�A�Նg4���G�L߹�j��G��ư��A��?�0r��l��N�WMkI۵11�M�eѡ�t��H~}v,r�"����УDu��h�*��gt��Æ���(�b��ތ_T�WQ�K&��5�����%�lQ�0��&�=X���qр-��>%`w�v���
��(6R�8dߴ�AZ�m��h��ŋ�
f`���v���V;)j%ٕC~8�<w�:�Mp�A!T�$��j���6.��y�D)��[p��B*6A>�1a���\��R�@E�D��܈S�&�(��ۣUz�y���q��Mg���:uZ���}�Z���B`1��
-+�ʙ>m�I���&��̌�knȰ,�N��gZp��Wq ��g�X:� ��j�iS�"����J�[��'EA�Xm���;��!'|(6�(h��~ff��=�y��>ƅ�⁍A���k�3r�=ae\i�Ú����Pa��9�2Of{�,t��v��?J�&k鿣賓� 	�g.���-l�4-qF���z�@G`w0��(��oY�TF.J3�̜,ZI���3�+�|�!'�!��(��)�R�+(
p>��"��������,(�����Лe3����Õ�0DD�E��{W>���p�j����{��[�YE�N,�qɕWk5.�%WD��&�3%var��ִd��&�X���M]���E��W�ǻTG�I�>Q����D`ۋ.��=�O�R�NM�x����40�r�+	�6�y$�u��|h�ŏv����'���+{K,%ı�ei�-Я2��! �ٟ������z0h�M����\
t��pF`h�Xl�K�q�)�+�a'?m��-��bM��=��9�
9ITp�d��]���V�����o�k����aI�3?q^u��|��裡D�hly008�geE@$�;#��]V(N������gW���C�S���_$`�7y�)ŔX^�/�
:�
V3+2훘���Cz�e�>�G�J�^'Z%�Pv<�p��sд.�+eY�e�H�J<Ef���%d�	�
��x1&�f�@*J8VvX��	�Hi`�<�&0���8E8�>�x�l�s���ubt'������
-+�:6{Bm��0��K�!-5ɢ+FU�,�]�b� ��k�T{�����q4��i��L�8�{�����������y
-+���s�U�Tg�s�t�Gz(̄i~X�(1�r�_JL��Ϟ���-�\!��J�����ɼpR���"[vj'=:()�9�u�M�Y�H<��!?:�O،��N����7�����N^���{5������6b��K�b�h(�
-+����T~��K]���bR�m[�'�2��Dt�,���+�=�IyC˳�`��?q"}/^���HkL2�.[���"(n��qň!����-v��8����0+
�Q��4.�Le��K^����G��4����Ͻ����*�Z�ga[�_:0?4���%��7�!�l��զ'�{%=�45{�~͑޾�	I�H��U~�o�he�����O��g�z��\��mAW��ȃ���y�H�))�wy����3��0�؏t+�c�`5����J!��M�jS�E[�}�����"�<\::a�g�h
=r⬣s��zȐ		>ɦѺs���.��ɡ�ʨu�z"4'��߂�����%`��O
�V�6��6_��--{�M��w�g�v,�w��)z���j�^/.F�?l�fti��٠]n<@m����(3�b�B
{�OбS>N��)�H^��A��·]����"/p6�1
��!���v��f��+���q��$���
/��/�8��D���/�ӾA+n�̪Y�ZR��V���~����z� �a�6��������

���t�
Z���S]w�� ��$ծ����@<��]ІN�a(v³��!�F��MF�+md������d���eĎ>f�B	u
=��P8����i�q���<l~l�ba�姝
��=C���7Df�����JV��H�]����]w�� y`���l2��F[���Z��.�����86��
-+ +���B������Lɂ��!h#[�7�Ff*�[T[HVf5Q�
N��H���ް��jpc���n�E_��\t�
Kd�5��_��d��AMB�O�����dKI�ˀ�S�FI>F��\A7p��c�G�*e����׌���x�X��������j�5Qk�'#�,�;��ȵl� �t�&�K��
-+S,R�U�t��ӡ��cz=�/����q��L
Z�{[�c�
�8��]y}����c��$O��<���F

$
}l�Ύ��8���	fDG.��+�l�B^����#y���Kh{%X�~}Q)�H�+�ltm���m
~]� U���@J��9.H�)'r���Y$�B�u~`Xx\y%HQ�(�?��0aV�SD�B6���V�qv���+=�U�Gȗ�/��:M˞�QG�Y֣p�Jk�d+�iQ�XY\ٹ�e
-+����rA����TcMbI�� 1)* ��ɤ�ľ��;�b2���)��n�)�Mu���b�3�I�n;)L�MӀ>n�d�eb���"
��1��XG�A������
>8�'����3�l���/�^�a�Yd�eX��u��
-+G���j�|�Ym4W�?
-+�c@�h��=S+�8�V�**ԡ����	�^�������S��껚�{�}T/�����hԕ�z]{�g5
F?���߈9b�x&�<g��$���')'�+R��|'OF�����?�G~xǝ�n��z���ҷ�n���'��f�}7J廎t�x����}�a�T��x4�}�xS��Ɣ�n\?�k�%
-+ʹ�\W�S7��g���e�Nokf�
��O�_^:��N���԰�S��d&����`����¢<�����_��Y�f��a5EX��Z`џh�O{��P
-+�g�>�")Ms���r�8�Ai1���bEU�2�H�e��r74��p-'C$�ϲ�9j�>�[Hџ:�ܥ%D�bP�me4V�G�2 -���tTG-^\}��HN�&N�����TϽ�b��.��x���1�׽�ӟ��͘�ƁMh��N��``�٘��*0�Gvc�}5TT,���+�����3u�߲eS�c}=;�(!”q�5W�;n�]�L�D�IBU�ã��?����@�	���$t�E,��Ȉ�E�&�,�"�+�:�1S�03	
-+��ˈ�p�J��똳
-+�7��F�w5#�z�B�q�����;���p*y����uv5K/�p�C�,�j�g�
m�	�a�@�q%}I��ho&+W6�q
z�E7\�
-+�++�c,$�C'�$HF*��K�Z�W��M3fQ]|��v"��링 =���U�
-+��>L�A
�q�+J&�1L�m\�""Rhg%�+?��j�&�KU�?س�ڢ
Y�.Ya�t�W��B��a�s9{B1�-��-�>>�# 
-+���)r��IՎ�X��.=�w@�z8U���%�G�:�1�G}1*$yE.�Ь�=�/��E��r��(s�O�,�ƧѠ�VW�����#�t�/��=�c�ϸ�@,Գ��!�%���ZI���K��7օ
d�M�jS�2��J��D�r��
-+{���J̓��9�K�ٿ�ߤ{GT��.jm��]J���7>���4Ȗ��؇@��S�/��2�@)&>k*� �	qTJ�D�ۣ2�V�_*���ų�
؆��!i�o�†���BE3K?������9H|�c�Uu����̬�h�/>�5N�L=�>R�
@H�t\����DM����A���|�����h@=�sfE ٢
'�;괝�y񑍊L����$}fۉ�g!~W���Nt@Ǿ؋-
-+j�ao����W��
�1c0�ͱx������އV̵n���V�N<yy�T���{'�r�UF�b'u�������‰c�R�p(��G8�!��Ǜ��#�&!M�И�
�8y��W����EDn7r9�K}�w�kQ!���#�L��]�vm��t�%�m/Z�fM�d�ڹE�2��}Tv���j!uP�,��V�>�#�
��g�,y!���)/ϰ��;�+at���yw�/~���wT�������5�N��쎆o^l-���D%[@�
-+�h��Y3�O���3[�Ag+��� �S�<�z��7�5���Jǀ��p���D-A��~B��B�����D���)T,JJ���'�W�{�n���a���$���~�Zn�C3���O\ri]
h�?l+�؈I���u>�-��!߾J��U��5�����E"�N��3i�ep�3�v"�>V���+��h�[�ɣ賓�$��<bևI�e����2���w��S�)�$X\*�݊��	�Q�K����K��c��8��ƙ(�d@k]ʯ��*�p���ߟ�A���l|4�v��@O�o���	o&�p���m�{�J�`��>����f�ǭ����@D��ai\� ��#D�۸����ox���k��]}�O��Si�����?�?�wBqȩm��4xt��F��R�lJ{����
?��6�)�J��נ�N����}����}�"t5�Į�l��T�/�P��6�

��v�Xy��8sA:�8+��`���"�<
��uc��sew�9��v����֬�Ī�t�2U1G��B��\lE�����u܋��WY7Yt܋��+ dx���x�+�M��Cg���P�,{�+�Ϡ�U����(v7"jL�U���+Ec��G��ӲSW�W�j�f�q6��V#	0���#��ہv1���^j�P�ĄȰN$��@�bo5�н�rL���ט��[��ڎN"/8�
��ȶ�x�l'�;�9�)s`�L����-�YA�X�J�VH��^�'B�r-�v�e�U�]zi�^���f��	�MS�����)���uY	fc�\� l'�6�={���lE����@��'��&'�h�fI,)��P���}��۷���+8e����Y
-+;��)3�1
-+��bJ[m�v~x*�i�+L<d�d>�
-+m�$~�n�Fk��(6�r�
E�l������/�b?����%;y��o��/�O{
A1q�-��`0�[��ɯS8t�_��~��a$~#�j�?�BX�O}�n$lA�������.mmC�L���4#+N��"
�fA��I�>�8W��,$;�x�9�Y"�dg������z묓�8�\ZJI���'-?�:W_�q$�P��I�d��mw�!�n�J�NAy�|d
�G`ц�d�;�NЗ,A��������QC�����Pl�>�x��A�
���gȑK�}:�|����P�H�wx@i�ȂA)y�+���e����m6䚟x����/(Y
-+m�~��g��C�5��&6b����(L��<I�]Q!D��K����@�&!������"#�`S��ȹlz!�}�=��@lo<�È�
.�r��L�p+l�%A˹+���#(!8@o�X_!��+���}]@��s;!�Q^+|Vf s�4p�'P�+lCp�l�Cd��(J��yS%J��&�!��\%�I<�,
�.2��Q�)��	,)(����~:m����
��F��/��(Gܴi3�.�+�jp]�/��b�	?��ӫO\|���`$>v�|�z]?/��L-t
6�:W�LơH�E�����&!�+$�}��ܖ4 �'(~���U
�ȡS�8�(����װ�m�.&!�����Q��4Y˭����w����På#내��[��:d+��B���!W1m����U����i�i�'ݧ�����w���?��M[�ҪCy�� �b
�p�uJ
.�^	GA�Sy4b
-+�sB8��y
�ļ�*��(�V�!D��`�O\+J�L��z`��m4
-+����!W����O���+��H�1�S�_���J}�\d����B�E
-+_��?�&�Z��S�����f�f�	̉����|�+˫���+Zz9.
��z���~�:F��IP�I�<�}T�{�ƨ�2L�B[̐�<��Ф��=�D����(�e_��P��G���+��Q����@���U�r��"���:^�q�EA�H6Mu��ne��m+B�:C�_̳�h�3+$��q��5A�H6��6�B-5_���N�b-÷�>��|�Ń(��p�@�3���=�x�~'���9g�`:�
r�$^
�
-+�ƣ��YM9
���S�Ez��
�h�PdH��D���s檰��ۋ�r���r�p���Q�y��|�w�/����t�L�L��F*��@�ڷ�Smқ�����<�L�{�n�F������^m~te�z��A���_/l0e�m)�����ɳoԆ
�	�!F��l����2���:m��OO�9��2�f"BI!;bW(�u��Y�p)O����Y�Q�T�gp�% vi�E��2��ό-�!����a��.�b�I	�8y�fr�i��[��׺gkN����#��*�c�6MK|!�
 q ی|�rѕ?��Ң�4�2V%>�p�vT�O��0+=Nġ���-�)���"�)��V-@
n�\/��f��n���Z5��`�h�����8�\?��5"/hT���������M#���N_��Tb�J�}.��$���=zܨ���1�VCw'}\��d��xB�̃�B�:8��+�����@�����sEO�T�+]	���o�e�"�A�%q�5Jc�`D�3�]��ESq�
-+	-@
߭N�+g4�X�$��{�ԉ�bu�9Z�g�:�����Z$l�'r6�_i�������.�~�?}�Z���_#b��7���j�^J��9�&��>���d�wXⓜ�����5�s��}F�v���!d9��Q�G[1(��3?A�����#;��ED#��^L��F�5���J���rdW��}D E�L�����؜���o.�2�Z�:AR��M�u*�az��:/�o�D��Tq@���P��B�f���� �	ב�}�h�rT��R�k�
-+�{�p�=�2+P�rX1aҀ�̧�Mқ�W���9^�%�Ҩ���%�V�����_�zu�~-�c�j��	Zrl��H[�A#4�5�qQ�b�\@�ܔ���!1�/#���l*Z���sw�@��ԟ�U��
-+����N�}��0H�()0��\� 9vB��<� 8C`��j@�0����"��m�� �3H�[��z�2	;�(
-+C$F�+��"���\�}	��0�H&��p�k�+� 6��wm}#�J%���gժUZIzۚ)S�,J�����&B�"e��
38�~��$�M)*G���E]$� 
�KN7j��
-+�W�ч�J�Y|��n���W�����5�]rLu���w��c��t�ywǮj�/_%�ʒ\[�6�#c�|��N�ɑK#�(,?�L���~Zm�}sJ�,����كj���g���Z�h�n
�U[���V�@L-���	ڬ�Π/�fC�Bo�M�AD��+Ԗh�x(�Q6�ǫ�z�I�S�G΁�uG�<���E�D��J=��=I==�IT|�i��<ۥ��Ў�F�PͲ���\qj5W���]{�-{���S�����xY�r�N��b��iӋ���Gqdt)�)�Y#�������@.	���!|ĉ_&a5an�`�������3g�,KT;�9zeſ�W��l4���f��j@^�P>�Ԙ�A
��2A�Lf�����u^yuMOy�Ê6��[_�T|Eg�%�Us���6�u�P4��"�Fj]u!�2[�#B&M�\�)�:��ڴA�ZQ��痂��}N�*ޯ�,^XM�YP_��ƂZl��XD�`lx��A��]�^�Tv�g�|��1X4�v���ub�s.�8�5�bUS�b EN�޶o����ԡ��Ln��f/Ѿq��j�W�.M����[�V�ּ����܋��ͩ��vf�I�������0(h
-+�
-+:���K\GtR;F�5���}�Ց��z���ַ�u�r6jc�0��"p�I:�
+�7~�N�~m[�N��U	��n���6�$u
�x��k{��N;��^|�e}������Iv� �c��k�n	~��K��c�T�*���~��\ɮc�M[�NY�C���n����a���#�!��X�-�QZ+A�~�x�}�}_�n��+�x)|�f��"#+|u���<t����}/g:�\&N�P�׫ʬc8I��{8;����-$cd�
bQ�|��5�v ��c�&T
c���V|n,����s�c,+���U��@*�ѩm�~
-+ݤ
�;Z|�ˋ�V��&4d����
̙�Z;j��j�^b"^�
����!($A�#��Ѓ /UR�8�OB�9jo5o��{��O��F��D�+M���􊙙�� �u���p��E��Ԍ5���D(?�++����Ez�yk������9�S�'�λ��Գ���Y�m�Z������'M�s�O�֨��(�G�ݼb��+��<q ۍ7�����zJ��g
f�f�Gi*!�����RI�}�[��r��IN�Raۡy8�`IL`g��ҒI�6��,f]Bba��)KXԱ>>��T(*�ӦM�,��,
-+B!�&hR�'.�	v�J�����Gh�9L�+�N莅(��Ӵc�e����������i�ZhUW�\u�o�뗈��-�@�%ɯ�Ŧo~�_uk�u}]��j��1,��o�c��zh�pct��‘�D�7�!��1�_��5�(�+�48�[F(aQ42p(@[r*� ^TX�f�e`�9uā=�غ�Ř�]��%�q�&t%C��Q���>Z�y��l���ʑRݒŋ�z�nJ��{���N*݂�������#���e�	�}��V��_�E�I�r�A��(��pͨp�~�j���?s}5K��ʪՃ�
-+|GݭZ��o���;~o�E~O�,:�1X��s3���i��YT+�+�;Ta����GŃ����+Yț2y�s�D-k�۷GW/�8KdN�1[��
-+�\�n�#.��(PT`�-a?��	0�SX�����(�w �w���{]��K�R���y����'w��K���"JD����
@'�}5'��e˖}
�`^IӴL�d�δ]��%����&�+�J��"fQ��t�Z3��0�>
-+�[��5s��1����85��
-+|���I7��Q�?Y��f�R��
�)r]��Ŋ
-+,���Z����t���.3��Z��کEJS�;tX��G�+��T>����EGk����}��Ӱ��^l�v��\�����)�O�}��j�:N�<Ek��mɘj���f�6�r�
5.�l)����5�mz��{���$���as]d��n�����2���8�k.�&i�� ��M�,;V6���\5��NJ�9�\�����!�3�\{�� �^��Rٕym|���ڵe��q�E�9���K:�]O��k+�z�q�]x���rl��Ty���D�e"/��4�3�� )+HJچ?�l}�ߢءW�v�i��|պ��F�UT'�~��xit���ː�O?�a�������
���/�g��K��vӘ�߼�D]�s�i�!���2�u��ꪗ�-z��׿�tu
-+���Aa��ij4�32�Lg��a�nx<�'Qq�<�q�fM��b'6n�6j	�
�hJw�O�dHdp{g�哟���i�ᭈF�+|�#��&�F���fu•���ռ��l1�@����O}�S����>,2e���
-+�A�[
��CBG����w)���q�c�
�[��w�}��}��W2=3jr��g
�������+<({ˇ0x��;n�ֿW�miSG5#�Y�_X-׌�&���8TF����*68���{��3���c/�>��/Vvu~3�G�AR�M8?+��� ��
��!�DE��Z�k�2l��C�߶��û��o��Ӣc��.��:�P�/>C�80RW^W_�%�~`�L]��~�����^���ꫯ�;Q��v�/��~�
��D���p@��=��󯂸{���ƫ�;JcGVD�l���"-H�
,r�~`�;<I
�S�t;0y�4-ȱI�=�eg��u&[|�q���}�Z|�q�
�L�l�r�`r�f�1�Pr�.�I3Άg-?����+
.妓�Q�nRoi�c�б�
-+온����Nת�'h�N�S��١��>35.��	jHÕU��зۄ����3Sqg�~��ʫ�PQ?9W[u��.�vt�~�8Oӹ�8��2o�Wa���l��5�&k��U�]
�5��L�W�g]I_���n�m�SB?����?���=�4��#�?��$�+�R�����
N+A���o�����s�?�?Ғ<>(���@bd�%^0���+
+�(S)�t	���)Z��<�:�c�/�s�9���8�3U�3?�+�N���R��[;q��|)�b0 ����*&��gV�/zP3�x;���kٙL��&��9�Nx����~˫^�����6i��X_~X��w�T�qȄ�&�o�8X�OփT��p�>B_?C��8�fO�Z��p�lc@����qf�����
�B��}^-���v=�(���āN�P�鑩?R��#���m���>��:�럍��;
Y�� S���b�����E�ِ�ơ�a
-+���b�[��f)0R����eK�j͂�e9�R��������{��_��׿Q=���գO<�@��Z��O���
�F	�0�C��R�'T;u]K�mR���m�}]�~>**f4u/�s@��݈:d�p\
�<
��in����Gw��QI8;?0=�H�=��#��o7pwriK�c��K9�+?��ӫ),3�J����;��0/&���4;a�'Ѯ?���:�L]���L��-������;4����C�VͧH9	-����;��4�
�?Smy����Έu�ܞ��v���&}Dn��V���G@*&+'��=�
+y
?�ӆ��^3�+���i�@J�+Jh���!蔧}�����<�Y��0�8
-+i����ˎ���w�z��]m�L�@s��	�֗��Hm�uzg[�΄����e���i����3�W^}�y�+)/]vr��p�_� \i���z���?��_���S���ځIY����/}�Z��%�����(������
 ͡�r#/;��8��>��l��ˮPpH#�qrX5e�^���$K��du+��g�C5 $��
���Xӵ���*O[R���Jx�f��6WO�_[��F��|�+�+�-	ƪ<LD�ɝw֜YWc5q��o�z���XԄ��m+Pv��, �������΄��`����3�mrpRB��l��2�k��0�[;`�m@dA��~����ްZΖ�^��9L�?񘣽H�^���i\'�
-+�4)�ZH��#Z_o��	����~�h�c���')���Ϭ��H�`!�
�m}���zS�+�P�Ƒ���nnid��Y�q�����
C�
O�k�@��!��O�{�	�+k%��hƊSN��ꜥO����;+��t�_�G��)+O�~������!v���'m�ٍIWT����������;L.;�ԫo���:�����Q�t���7\�p�t��Q,4������%��o��~��{��+=��{���b�Nȓ�������
�=��K�H?Δ
:�I��cU�v�"���>��s5L��gJ��o�했m=w
��Ѐ�!c�@Rz��4Ѹ����F)㋪����"��>����5��#3|M��������i��?Q߿�s�|G��r�kv`�-llۑxĖI=�^z���4��H�-e�{���TL��p��|��z���<�%��MX�7��kQܯ�[���( ?;=�O��7~���+��Sk7�٘g+��G���Бbf
-+y��h t��6i0��+=y{�Gn3Xp���^��
�]�6�e#)R�!c���L�|�q��Ügy�D}s��G��|N��~��=tr~V<��OT�]~Eu�)�V�g����dF�����DJX���?#��8q������v}$�79�}��_���>y׿������3��>�ԍ�G�}l��
-+p[�BK>������H�w���Nя�<��(\K���d�$��A�쇣�7����Ǯ����ݾ^}�_~׿^�:3�ז8�2 ������3��}��n7��P�Gy�&=ܾE4L�����ĥ�L�~�	�9+I��ml�B)��7P^G|�J�{�,?��s��@{[��K��{gcWu��
-+l����C<0ARGj!B�@J�tDw$�� ���D�R����nAaJ:�J(�&RC���0����v�y�UN��>翵��ֹ�\vMgU���{���u����O�F���bT���wh����IC/Ll[����w�'�
�nx>��������|+��jc�V.|N�(L��
-+c$�
-+e�{<�Qv~�6��
-+��2�̥�$u����X!O��sy�����\����e�������n��̄��=&��
��d�wӦMϟ?ۅ^�9m+I������~&��L=PY�L���%���4�X$��
��~�>��<�_���r�_6��&�
�!���4�ʩ�!�ԣ��
-+�l4����7�lYZ*'0�����A9�K�h�Ɇ��[�#�S]������wZa/��2���L�G?3Wr��.*VF�+�8t�%x���{�k���_��}���}�χ
��{�oMwy��+Z6�i���2�z<)�exAE����J�ˤ	*=�@s?�x�F�����S�������Z)�ڧ=�Ǿ���9�m۶�^�֕*.�E�{`��
��
-+ګ;.���+���i:$��{�齆G9��؊��ioQnkˉW��*���v*V�6S��`��V�=��~�g�#���X�u�7p�^�q����&�y��W��k_���u���T�����V��M�H�Ld=�h�e�fY������?�}�ƍt��2"�2�F%�2|ᑡ
^.�ۆ�w�m2�+I_?��!�r+B�3̓v�Y����^���ģ��vk�i���_(�J�gɿN���.�u�]�w�^I�u'�z��#��K="�����	?F�
sݶ+�44!�����c���P_��^��zv n�V!&}I�u^��A^.�/�ښ#<�+
-+O�̙K`�1�
-+N1�p���S9?(;�@��2-�$f�$B
-+)�(y���H��n8����X
-+�����m�9I��P�?�����.D��R�5���;���o�
�y�W~��^�û9
eM.����3?
,Ӟ������v��|�[�/�F�|A-1�|��s#�<LT`���+@�2|P_$�\uX@KҌ-MZn!�=?W/K���
���@G�v�.قC�Er�_��%��T�~�����(mT׾9:��zh~[�>"<�s��7���믳�߬`�Wq������>-
�G$C�<�!�ޱc��}����y睷_wn��!A��!x�I��K��u��)����
�*J�4��P��j�u�A���WaN�R�#�z�ˊ���B�\gQ�e>ؒR�h��/d�~QοǪ���g���g醞9���.;m����%
������7�abݒ�{~+��*��V[���1¤��/�M�ܶ����|�����	��h�#�^�%�G�:�J�?��O����%?��ys�A���Iw+��_�]��Fv+���I���)ݢ�bS�
TW�-�.92��S���k��_�
�iJ����y����P͏�����O>��d���+��*܌��|<����������O�6�����#G���$�z��1��� U��t�b��{/��G��+V\{��	�׭[�9.#z���6�D��m��
��;Z��|����i��^{�?�㯛~��_m��'�2N���|;�G�{oo.�3�<�g^�;{챰#+N˹�Yw�ʟ.gp��W_��+�X���y:y�V+�[+�
]�y����U��H���ϕ#����}
-+m��ի���yzzq��W�/1O_HZ���<�w81����������Y�!œ�s���=����G�~���+��v�6mڴ[/����A8O�9�f F��<��u�v�,�
��^�I�P�#�q3H�`٠'n�ஊ�iy9��Ʃ�;q�!��z �yn�X�@�+
-++�]�3�_g`ޱ�#��δMҦ�E�J�T����^n����k��T>�f9�^zz����0�q��=�L���j�+鶲�&1m����rPC��y��1�k�m��)z��y��	�����vaO��v�7��H�^zz��@а:�3�3�L���ڭl���	}�j��Â��'<�	�?��#Uu�'n>�c�:���7r�!�7m�tԆ
6�[�n�ڵk7�Y��]�'썒�g�ֲ�}��-����_�}�۶msY-�x�[�l�r���{��w�}�w�q�M7�t�u�]w��_~˻����T�'N��ȅ�|P��<zOf�С����V꫞�9�`t ���g`z,���Х;��0<&^&���zԣ����O|�S�z�&�S�>��>��S4���I�xM�GI�P-s�&�%M�L�MMY$��
-+�U�ߥ��[t�p�N�t�=�\{��7Y'	�~���k_�����/r���+xɻ���Qj��֭̊�n�{�3�_d����3�=��t�n�E�T�2hn�o�¤��IOz�a�zի��TM�g�����5��ě)�	s�?����Hg�S��j����-›�/��>>���/��?��/������_��.�rR���È�D�ҸZ��ʠ)����؇3P��>܅z����~�C/�.Y�L�,_����?�O~�}�G�TM�gi2�0��m�e&�~ho�T���j�W��������K���'����^���_�׽�F�8��	�]��Д�G+��/޼v+�t��^��v@���
�L2��E�H��@��=����?�5�y�S�U�g�kv����O|�m��9t���B(��xvԟ����[n�僗^z�_��_��(r��N�uU�N�-�>.�neн��3��p�	�z�g��g�����-�n�,�Mz������<餓�����~/�_�ѻ>���|�Coy�[>�5��.r2pOּ��R'�&�)��m��E��g`��@
�{u�=�>�~:�n'���j���U�!��
�p�o��o}���y�QG}�������
�+� wV�+P���C��g`we F�݅�q���W��S�xU�y������7��=�q߳iӦ�c�D~ ��cۛ�/�_�o��>���|毞���G�� �
-+�k�5�Ok�_���)�N}��=��������+�6-;��@M�U�햦�K��Ne����=��v�I�<�x���<���������O��t��Q�p-;\M���OO'�ExS�]վ_S��Z�l۾�E�J-��[ugd�5K�D7J����&1aB�hU�G.U?���mi#7jk�Z�����H\�v��:魗|�ڵ�}��K�{8ʢ�Z���`�ߡ���կ~�~��~���#����f"����K��C���s�>�P��^��v?*��B/��I�������������o޼�
����	+'!ڋptV*;k�6�)�T��>�=ZݩY���k�hb�l�U5�*����	��@|r<�ׄ�5�7rAzr��#�l�
-+�+�M���O
>���������%/yɿJ�9 q��ƨ՜ۆO�d��=��@��6�=�@��M]I*�&}��6n�x�>��ӟ���x��t+.8�;j6�e�X �y�*��8F��˳M�@6���	>2r���	�jP$����?�l�Q'G������N˾��ۘW��������_����-��^��@� }�D�Md�wib\إ�l?�@��M]]/zf�����8�iO{�Oh�"�;SVPwwg�>��]��o�U����׬�l��6$g(̺ҙ�i����}W��h�,���t�t)-JL��J�6�,V�1U=+�����᥇�	o�� �8��8�1��\�g#�+9kh�&�wG�����y'�O9���uJ��z"q���z.�,�ݞ��/?��n��.�%�Ї^s������9�]$���SeJ�¾�X.�������G���ڥ&~^ջ��xǿ;��~���ƕ<Y;`b_W�5Y<̕la����7��8�c$�瑔�Й�*�����<�Ĩ�$l�x4ml��M���ē�1�2/���JL���`�Z8�f
O�k�f%��d�P�i��	ܺ�.1�}�e���h��X6����!`!r�d�
�X��o_ҍ
?hx��'8v�	
��Z��{�Yw���;��;�I�/: ����u�@�
��^z�e��7��]�f��|����7?U���	=�wNM��	{�ý�w����3/wh��
-+ߗ���Z�'!�ZO�L��cb���L���Ĥ�WY�t���ú&�]k���ᾞ H}9�/'1l�%N�d���<�%�Љm5�ґ�b�
V��{:�]�3�g��F��s�ę5h�M-J�Q}`_�
/=痳 ��ݖ��9KK�u�p��~��!
��=S9��\��������=�y�^�O	�V-�}}�9KY�����g�x���} �_�5��_�;ꕯ|����=��C��ˢ
rg�+:�p>��ߨ��o�U�]�=�Mq&&����3��JV�H�Iʏ�����k&�B�I\�,DX����K{Y[��a�vS�%�~�s;[)�ɩ�G\&����{���crԳ�@�L�XZ�c����S4���	~�#�Ρ
��:��]:
-+�
-+�ԏ�݁G�݁�a�8�t��Z�}�j�<��w��^�����G�>'�[��+��Hts�E"�������(���`4���S��w^7?���=�����^v�'���qN��eހW�V�҅E��c���w�ަ����W��ҫI3&fq�O��4���Ә�BW�^���zN2j�>��n�2�L϶i�@���eo��
>��O�Z�$@��I5��IA�Y.=+�W�=��-�(��Ƨ��S
���g�F�`�ªnճ���
-+
-+���;+Z<p�G�԰a4�$a�(e�oP㘵ۖN��ݚ�L�7���}#虘V���AM��i{��7]~�����;��$�
-+�{�k3T��R�hE��^����+�Xc/R>���:AX,�1���f�@��"�"�~��>p��)�W�9�"��N��s�z����G�#���i�����j����P�E�S�i{��N���җ���n��.��d����B�m-��m
��
��<$���.����m
]�v҇��R���у~��nݺG��Gʼ
�x�p�����g��j��)s��0��cL�B�0X��4�¤�A�z�~1| �?�
s�����d<9�E?/��9���89���h~H�9�!��HC6����
-+��
�����PE�A{�����e�$脞��O�p �O$�U�F@�=�s���?"���=�Ģf�� �m߸l��&���;a�7��j��}1�I��by�������>*E~��;�	+!��oM5b:L�"}�>��`�?��$@�
8�k�)s�X���2��Ex�礅���&�蕱DJ%���+s��~�@f�*��>u����b�5����Տ����o��SP�
�%Bdf���J괖I/�[��ͬ�-e�Tr�b�w��.]�,��؏�ؙzw������&�C��j��Zz*1��)��{��%���>����[����������c���0}��FWC�����B��Q%���\�=q`SF�C��O�O�^���;� ���Q����c̔�hAϖ0B�R�h�8��Pވaĉ�7J"k~e:�g�?h����-�N�o
-+!�
-+-��/��흣ֲ�׸�8�W?�7��|1��Q�����#p���c'Ҋ��D�:�M<7i_�^
r�*��S�xpf�%[��_�;�_�ds���9��/�����+���|p��!M�;�K^�Dܛ�C�������nW�喺�?D��w��������K��)d
>Ԕ]=���Ǔ�_�H�5
���:�Q�@��̔�ԕ0b:��c]��[��tD0M����c{�B*�T���@{����IM�â��o�C�r��F�;p���v$��
-+O-u�!�`.>	I�YZ��������:ɀ*9T��5�*/q:h�I����\�J�p��KbvJ���mEH���A7d1Yc���" m���
D�L�G8\Rs}��J�H�hH/�J�7J��P��ߡw��������A�܍k-+�
@^�����}8��>��	��������������O>�E�6�T5~����tɗ��S:UO��c�������&��4�3��4c4
-+S�X� ^#U�)[YL�!��,#���b"ń:cԴeT������>q��o+EoK��@�'e�6�xR��N���c}��_�DlD�S�=Q
-+k���s,�m�$�=B�:M��C|��d�eW�l�Uj�KMY����n{�^���_���x�p{PnkñR���>���;����kt��ٮ�0JCS�m~ozӛ����=�7����ۡ����M���0rՖ5zq�X�[c��a2���`��801�i��,��Y�6�l*��K��<|3��j\
��+�үl6�D`i�o�h�S��&��޼�֭[������^���:�i��ƕN��.V
��},���������^na�g9���?�#��?��!
�-�
g�+��ej}5��Ol��7s�%�-���hW�YQx��4|%>?x#z8�p��K%��� �}�"�NĜ�P��@ceC7�D0y�;|�vd��k�w�N�Hw8`�T����#��F}
����ez��B�r������:/�@�h{�FYRm�����q��6��}���.���Bчhy�
-+��4�_�I��$"d+zp.�|�YA���J�ɰ�}�P�iēh�f��ٵ�iD<.3��A�;�Lu�?�b?�D���U�}�\+Mh�Ϻ�E4���$o��BB���V��ێp��ʴV��J��ȑ��i�1��j��
-+��6��y��Ό@
�,�TqEl�0�َ��\ا]��^}�E�,I>��	�ၯ�k�F�a ������.�6����@����h�Z�E��������8;{_h����-5�S�����3�_8��c�;��4H1��@a +ԋ.�E����rxs�Ń-�?b@���̱d�%�q]���j�pO���إ��~����,L���aO�X��+��[,�����A�b_���Օ���
�D�cB�0`P��r��@��Al��h*?Շ�[�ͬ�$�"�qB�s0��E�)fvK4
X��(d>i�|$����G��B�8�K�|�]�42f*�fe�,r.��;��~��nЋDo߾U8����	A|d o%A�>�/�<���^'�i:	x���l�+u�L
��O�C���?��n�W	�{y�W�*Ỵ�B�z���l����e`���E��P��a�z����6=F��}�_��_�V������%ρ0D��
�t�[]J�k鐎�;�}�K}���=�y���-]������  �h�n�1�Z(�����/6Jy�f��!5��LIC0�؇j�aʽ��@�Ii�C��k 7P*9�a��ã�����n�_�������&�(�'�$z�;�)�\g���2��8!A^��*�S=����ɶC��X���Į��k��1�i�i5`�r�vg�poP��7(eO\��;�B����!�S�����mV�1�`ݰ�o�P#�jK�O�f��t�&{�����t)+�~��O��k?�~ +^�r�!Ox�K_��{���E�w ^T�Ë��a�@�P��
������Vڼs丷��-���o�����>�V{n��u�/7 �V�kz?������P���L��f,
5mdT1R�b�Zu�M�5X`���gp��Y������&fᖯ�N<Ǜ�U��;�����C]����I>EQ�E�;��#��J�!��T[�HB�CG��Wɍ��فЄ��sAND��Dl��XGRN�J�8
-+;�8���F��r�������O�)����۩c�}:�tX#�Jt�5_x�g�)��Gt��
�5A2p�+-$�@[K
��1q��VS����ȿ�tVt�v�3��������!��펗��rx�\�'p�^���u��rx���]�t���{��20�{Y\=��@m���f�I�N+C���W��k�r[�0EB������N��!���d�F�U���e�F�]	]��嬶JvՎ:KVG�
�8R	2�oӌ�|���`Lf���B�}�ׁ�i��S�7,Ї�d�T�t�H��X�x�A��L��l	�F���,�Q�;�+�9�N�fe��@W��ux��+ӯ
-+§8��@`��6��7��"+Z�̓���ś+�N��Сi�Ǜ����@�({8�;ஶ	�ta��G���	�|�;���[�Ӳ��Mz��s�]��|j����Ū���n�W�DD���\��-0�[w9>ZoF�1��J�X��?�Ive�RNƴB�n�T���U>�+q�f1@2ao|�sek��}	���.u�Us�3fڌ��05�
-+mӥ\�;�S�7�M�"���f]M������8��������֧i_H�y��?�AO
-+�����721��n���fa�ϊW¢�Աg:H���#ܡ�7�#�?��NU��;&lO��Gx��
+���3�l��$��)w������.��r����w�+�%"���^�
��^���=j�M�a^54��=�K.�^}&�
-+
�{|�)��ܫ��u8q\e��+�:
��ΰPZ:8}��e�����?����y�j�M�v�	�]v�O�p�	/V{na@����k���F�z��W�P�Z��g�4\-!{䍁̓�x��viMF#?ԫ��א;��&�k�Lk@��Fq��2ǩ�ʲF(��K7Σ���(�(#V����g�+8�%c
�Xç�]�
���w�� }��0Cw�OX�
����w;�CF"Fz"&:P��-v���Z����%�#�1J��PW,U׶�z�~˃����O|1cc���(���Ƭv��U�z
-+��{(�!�=��eܴt,�m�f=|s����'z+F��9�t;ps^����}d\-[��rL��l��bDQ��{�%����8�=�Siڃ�%�G\�J����v�K�j�W�m@$��="��3��ewp>L��w]�E��T^1W�iӦӾ�����]s�5�����4��O�ai˴��:��3�O+�p��1�٤ѕI�A�@�H�v�o�|�^
�@P*��VOy8�Ffl��.���+}ϸ̏�Ǿ��w����y��ھt�\M�7
ž��y�d�Y�|�c{�y��?�n�&HrXh��eu/{ �������y�.5�S3���я~�{�>��_��o���u�_~�AK��^3�p�rp{�f0`P��Ճ�4��
Ҥl�������	''A+,�W$��d��A�
(��9��#���."b�1T7Ŝ[��=�X7��Z��b4ɪ+Ur��_���Fؓ"���X{�����#ΚV���8��A;J��6l�o
-+�ĵ:��}�S���s�9��rs��zW@?	؍y_
�w��t݇���5u�0�Ѧf��I:p�_����{�ܦ��]�ɟ��T�8&�x԰��E�`�hݢ�0���Jf��L��N^�'
��rM̳wXxθr����K&S��1mk"1�W�q��h�4`
�����.qp��*�+�r��xEX�-��f�+����=C�S��g�G���:>YH�j��^� O~����D��د��S�
-+�NV�q
-+�Ր؊皶�C+���?�A�H?T3?�#<�Y;:F�p�ִo�0�/~i�5�����RO���w%�r]+��^��!��my�&r�V���'se�����?�Y���N��K��O�����V¬|�đx�f�_~B�#
���z.��x��
-+���}K��DMY$�R����+_�w��X�	���B�UC�"�4u/�)���&�K*����xO��e��?�����)����
'�n+��g{�ʃ~:�<�@0�x�σ�gB�Q񈞂]NP1�#��gV�`Y�� ���q���#E���r�:>�\~�
-+��T�G�J+N��c뤾c��y,Tq�*��x(
z�o7�0W��X��#�\��*�=U�}�׾�3��C��$@��'����&�ZDfg�z���=h��v��@嗺]a�e��I������>Xu�RS(�G���[M
�����^ ��'@���kd��DCOv��c�l����
��U�N�c�#Ҝ�l3Z7N"�+?M�����l)���V�ۖiy�6�e���9W'�*�����^�Q-�;�����
��b‰�'΀+>
� �-��!U��,�/[�������)����ӎ`�}*=����q������
-+
�U�?mئ_�8Z좩)�Y<�E/'G�-��կ~�
:	��-[��q@{'�=��(�E�!r�^vab��B�5d�rK�.��Q/�9I���ұ����Y�+��i��M7���3�<����.N�;
�$�M��ǽd8;�\T^�ۥ���7w�q�~�ӟ��#�<����,:��`k����~���z����Ee����J퀓r��[��[����%���5`����1�3��jl�ً��aʭ(y����h��%�F`���([�A
?���m�w�ez�+K@�3��[�,��{��|!��MM61�'':���7&���1&���"&U26�	�z(b�az�%�q�e�m���$�*Y�����42~�
-+n�Fܯ*b�C	���N��6D8d�G�.5�o��;
-+u���U2���U�-���@�>�����`#�ҳzB�!�AV����ɾ�y(�G陀G�˓.�(�_6mV%s��������=�IO�?n���/ɼ�4�ݓ�w�=��+���S�ʲ:v�/����X㕏�콂�V��c�1���]:f���'m$\e��W��3x��rxm��2h�o�喿=������|Y��q�4I{�[w8:@\T>�ۅ#�]���UW]���s�����Zt+��u������d�͝�c�M|��rb��.��>Z>a`ES��J&|���\�H]#�&����LN������I��Fn���9g�>��?L��!��%�r���6��(����K���~�F%Ut���TlO��/N+{hQ�d�"���=�aR�uim|Fq:%&1����A��6���A���W�����a{�g2b�1�K"����p�^��D�c �)�^1�G@���1�`�K$T<O�Z��P5�	�ra���[���s2�����?F0��Zy['��&�Y��Fk/�%K���N�6D��v|��p���҅����+G0"
e^��b���
йt<��U�8m
�I��蹀C��W��]E?'�}����ϝ+E�G��&��&현Q�(U�t��v��³?�p�j8!t��a�D�H��p�u
���o��'0,f�t�a�C��z`�1���E�;O@	�Bl?7n5�(g6��J��y�������,�2��J	�����+EY9`�J�emSX�jT5P��.�O�Y�i�~���^�؃�䆉]��I!�̊<AOq''X-/Bþrd���������ZY೎��]�u��"�C��ʷ-��>�qse�{b^@�&l16/q�O�Z�J���]���?&��9�Z��F`*&T��Ɔ�m�*9�b����Ψ�ë]����ᘏ�F�Ɩ�a
�;�$�U��'WYI�/�)Nc%�H��R�v���#Ӧ�_��=Aj��/+�%56>⤎X�t��Y�T��]cƚ�O魠�!{�0&26���Z+9h�1�RS��,T/)92>$�n4SV=�q١O�袋��7�1pP�vc�*�����E����3�xcY�3th`��±�O�*5��@W݉!�Z��QEÌ3�
Y2��9�(Xp�B�@�6V��)�7��3��ٓ��=�Z�-�B"�L	���JUWj����*l�W���T�sYG�ox�߁�Jclɓ�Qje�a�6Ns�ψ(1�'0���Ƕ�/�o����V�Q�N
�����k "�uX\c�Y>D�q���x�e�D�w�@��ur����!C�bh���/�" k��8��n(cSx�Զ�g��1�tPtD�+�؞�6�L [�6y����.��{;�҃���ҟXÏ;t!E�������3Fܹ��J�a	
�(�	v��1�&�
-+m�%Ɛ/�-��_
��@�:aW�Jw%{=�#�X�����]'�'+q��P�a��BFLD��o��V�'�3LR�
pN��b�O��������5�Ķ���Ylf`�bXQ26/�Tn��������2?�O��<��,�	n�]�F�q˪��Oc�~��v+	H?��Xn��"kH`I;m1�-��/y����u͋U،`��.�X����
?�~٨�2{g�Ɖ��P�.Y+�2��=�1�]�@�v�!�P�~j7�OI������훵N��p(�v�V
5�kc�8�i�~�Oܙ�#�v�k��}��
-+G:j�!�h�9�WGT;�����+�@�5�M��A�8��”�}��UN��s]�&��+��Qذ�OVt�5�x[�j�mP+���'M�7����'���v��ߢԞ�;
���G�b�z��<��7>�iO{���]v�ewH�w,*˅���d��f�\Q�R�M��l��^����?ݴiӓv~���1����k~���������l8�}+�
�G�)��R�\��毂���M�]
_dB���.��O]U.�=�g[b](��ڞ�vx؞�ibđ���pɓ��ց��1�8Nh��?}`�o���r6$߿˓�bȭ�Qd�
��	��tŗ}��x�d{4�lH�0�����<������ںt�N ���}A���{｟>��~H��r��q+\)f�ɏH|�C2��hT�p=0�7�G�1`�����D|�?C|jLr``7VL�L�T,暀���F_��_0�CqH��Mz�8��'6CѶ|"�O(8֨�[�5N�	6c]�U�'�0��n
-+[?�6�P�Q��
�v�I<��Uy���t;V�\[�ۚy`�9���zd����\���x�҈�dɎ_ 
-+�:9�������>�6�a�t2��נ)��#:ވ�r�+vL�'z�dۘ�r�#�
:ג�?l�]w |�`X�2�Wa�H9_Z:\�߰i�_�˯o���>�1������iq'�=	 !��]�t���e2�����.�B�.�]8
8�K.�)&�:��[�H;�jmZS&�Oh�K�Dp-��
���48�#x���Z�<�[d5D���"��,4"Fa"��P
z��f8���B�]�G�e>�2��Qz�"�(�3��=
��
YQ�=K�� /(Y
Z�d���{������Y.M��~`��\����uDby���B��H��>�B?�l��&�>~Y�3,SC0�UM���P�G�Il�G��K����3���"fPv;>@T�)�SM�O�\Lyf�:�26'
Sja���L�4���DN2'L��>Y?0@��@��sDE��(w�
�X+�ӭa[�`�2[�KktS|��X��:Ь��c��U��^��Vl7���,\sB���g�%?��{bLc��́��Э�J�Ԟ1��/~�lx[ cm;�Bg�C-V�����^g`�s�W;!;���ǿ���N�/�q�T��f�YMw�:Ш[��:�>��tޭ�	n8�Ep�>���f���`z8�c��S�1`�W1�eWMt_mPr�p�E�=^�� ��&d	Y|��^�
�F�ɻ�����'����g��ô3ū���'�1�n`���]�+��^K���+.�֤YZQ�++5�n7����s�cl�
kL�1�>�D�?\i��.%rzP�dNh"�
��!��Q���ܦ��P���
-+��52�UG
-+��5�f��S�����g���"G���6 {� I��E�5v��60��ؘ�!L�a�M�B�V؈1	��͕V���a�Ghl�!Pp�~�
 o'aڇd��=D�\M\�l_�{�:�:X'
ޡ$S�����C�൷��6�_c�)���X����=	�s�q#y��������^��@�#]u�p�ǽ��o��}��E?��k�v�:pЧp^���ʟ�%+�>x��Ղ~OtC�c·ˑ�A,��I@P�EM�M�S35`YY)3�g���`P�$yԬ1��k�W���v��%�CF��aJ	i`9�
g�ҍ�@��y��@e��Xx��=
H���,]���TA�ٕ��
new��,en#Z��v�+(�b-���"���a�}�Hp�K��1:%����u�Lc�����S�Gt1Y�\N�����}`Ё�NC�]�5t8�����3su�ƃO޿��ÜX��R}*~Վ�\�?єa�p+V����j���1j�
�˜p����^8�D���B�����������Do�2�y;p	=84;|���AR��ğԏ�ܪ��g$�G'lO`KȒ�쉿�g^��
��jQ�b��X�b2�I�̮;+���a����kۃC	ϸ�/�i�Z�gv['?���2�$�c(Ī%,�iQ����
mL�=�;�ڥxC-"|F��.^�v�{i|E
ڊPs���v؆���X��0�-����e�_��p���"G�R���$>����ab"B�b=�b	~�Yhl�JF��q�|\E��l��e�a��$}�����B 2������7��+�ŗGj9�Q�P����>��j��	#�v��H��ȑ�p�_���2vM�2�N_���A��Mr�_�l\���1	w��X�t���KO�o
-+{|��Rtē؊-rZ�c�H˖-W=������������w=��Á��m�ZD���%3[����@儺]j�$��a}ݵ�^�ۛ7o���wi��%z��F��q+��RzH�%�+/�L��n��IM
�i��gϞ?������k;��{���<��׊'(���8V�]������|�3o�T�e��2��Y�[����%?��)L��2M�̋Ls3� �d�	�
-+ü��|�cè�3��[�l��K
]������[��.mp�2�����l����*^V�K���C�d�<��k�j!��X����:�j�c��r��@�K�"�Q��6)r�čۖ�e����:h#n�#��+|�Ͳ�Q[���,�J��ص�U}��U��ji��
-+ڠ9��F�#�eb19I��4�JO����Y%c
�CZڔ���r�;Ռ�x<c��``H�3�e�&VZ�Bâcy9
��I�T��ؑ'zY���؉.�b���i`�#g8~y߀-�	U���@�W�Ť�,5������1Ck{�t�rp�����
-+��붉�emJM��[w�Ν?z��W���M���3}{����^Yf�;��9=`�,�~�O}�{��޿����/9UO~�Q����Gu�,�X}�t�1&)�SU}\����M��K�,��S��B�f��%g�Ɖ��l���+�v��ʚ��@j�6J-F�,$Wڕw��Vݱ!��<	p/~3C^�wn:?UG^b^p#���
"F��F#|�C����H�	w����z�~������N+F�R��;e��Zƾ�����>��74�RƑk
�|�1����
3��`���CE�6<>Ӳ>!��Z4��A��@I�i���Z0N��E�qm�+��_�c_0������WR|���>rAd�,�A���-!��Ґ�,��!m�n��m��6���V��ht��(�NЖ'+J��x-�������œ��*k��V[�Gc�[×\��:�#*�d;�����a�qn �E���_k�Э�	��Q3/Na����{E�z��YB��L`W�jq��1`���c���X�9n6Զ���;,�}����
!�?);������<��+���ͷ�z�-2��+�晇��-�����]i��۔�����1���Q�RG
�=%LZ� ���5 !)��5�F�-ѽ*ⶋw�U����E�X��X�Y+C,�V�����
���}o��Xѩ��C��fN-��QF鲇��|F.�ogAd���#VS�ZQ��z�7�UP��i9Y��+��z^��&�giD�oq��k��`����m\���o�΋}i��&�e���*���3��A�+��S�yY�8�-,��uQ�T�&=m�A�W�vh��:���{`��麛�2�|ǝ�}{��������<�����Ν���X��t�Vr^ ��Q�.А���0�n𺽶A���l���L�6g��)C�)�:��I�}�[���*�Œ
-+~��{N�Ča�Fb9a{֥E�$Bk��>�Sb�s/
� U�i_El8��ذU6g��8���\�$Fs5	�}!�Z�방Z��+x�+-��&J��w���FD��M��>�u��g|ڛA~�zN��u�L+q�b���e��1�+�Xᄫ�Ĵ�ь{D�+h���d1��{�
�vD�
�+�l�G� Z�J,��ز�E���ڼ��)��|�p���F����P�yjE;�@R��H��jHp(�aHY�{��Ńm@�cc��
���C�����G�Za�a��q
�u8���V���"1��/l�vi��4�� ���xX�k����������K�r�9�k7Ԡ饀��Z�M
��c�AkC˶��������p� �,7��������������k r�:JL��z-�����ߣYڣ-�H�:�fA�i8��'!3-�jz�{����Ԧ��D:�آ��B/^
E&d���bۍ^&u"b�qWe��J��z�M��z���X	�A	N�Qn<Ǽ����E���d98*n��$�b+���f����M�,�*����ٿY�ݍ��>�ش�)Z��˲�z�ȡÏN�|���~Îc��K��656Z��d�������@���[���t��;m:��v�e3iC'�<a2i>��J�~�<U
�˻�{BOv�f5�O��l�!�G������}4?'tc�w��Zܟ3��;>Vi�	U��F���m�6b�y��Nt���%�/RhX�f=k�k�<!�&]�(�C�/���E%���kH�fc
��B�u�b�n8��15[%7�J�;w֍M���
��{��s����q+�E�>چ���/�XO>�o�O]�*�R������Ey���I�˭/+ƶ<$P�d�
?��E�u
-+��4۵��䟥}t�_:�{Ƙ�$	>��Z�Ѱ�=]ya{F3�yB�~K��Ц
������m�g�4\�Wb�_�Fa�ٷo��5��ʶW��E�&�jS���aY�k�[�jګ�>.ۻ�7m"y�b �V۸�TDBW�*A�<Aq�#�� �,n���Xe[\#�vsD96=OZ�;�n���d���l�/'�+ƬJ�xj�D�mDK�M�w-ر�������Y��Y����A�ŇE��/�E��1qH�>�⳨��d��{�&+~u�Es�k��Z>t��"���,�O��3��B�W��s����OLw�}����X���,�g�s��+��~��?8��_6���/�.����SO�U����=Bc/�+����.�p: F�@+DZC�1X�(
-+�r���R'��p�۶����_��QzLF�3������v��-_x��#�@�+k<k��Oӆ6\욶]VMY�C9��}��>p}@�ux�-�|�+�{ի^�Ͽ��ToԻ�1�|���S.3.ٓ�N4�B���ڽ"!�-OR$t��H�-q��q�Ն��;���e��D�QN�֗�$����O���HG�Ɍ
-+�}���U�֧k�q���J��k�eՒ<6	��}�Ӽ�0/��~?�%{����"��1!��v.�s��v��+F�䒢QC�]5�d�p�f�@�������Q�6~*��y��HzAs�J�
-+k^���_</�+z�H�b!<�#�>���'��r٥�M����ظ�8�`h��2�M���z�Z���x]��EL1�LH+>@�_�?n#!e�u�n�=��l��^)!�8����;D�8�F�[��%d���LQr*����v"Nò}_�)N�3|*�X���}������J������<�e�E�4ڬ������v�sƖ��=���h>�cY
`y+kY28�0~!c��!���H�>�i���A.zj^�9�8��_����mƱǾsdG�P/X���������m"ڻ��g[m-�5��٧��F���W�	�9f>��wD������;��SM�x
NHG��<�ި�T]l�‹?b�S��,y+��w,q~�R���+�3����-����,�u�e���D��(�p��,9�W��c����*�QM��1�-a7��w���Sq�n��ܭm�g�H���
��*_rA)�Ԋ�e�Jy?�q���M[�����/�DL���S]��e�)�|�{����b��8������r2�Rr_lL@p+��������k�4DkS�W�c:Y��
��������ST�6h��ua�k������>�8Q%@�S�$ _�a2�h&(�|�6�i������N
-+.�����Y�`Qw��M;o�1,~^���qA���
-+j.8+i�Xc�x�Յ\��]"K?�#-d)�R�k�?;�q2D�эj#����� �9�+&�=�j7t�g	�„iB�d��ˡ�@"�u��
-+k���$rDY]�hڪ0��	���
s$�h��.�B��S9�A#��6lݺ�4���-�i�=����gW�^5�t͕.�4���հO6�0-.^[���X�B?�ߙ(�.hȨḮ��l��HC����
-+<�<��h߃��s�
-+�w;�TWӾ�A\ꀈ�(`�6j�B���u��a}�Њ.����w.D�ج�_����b�>8נ��ھ�#5�K��]��g_��[�cEm�װ@��Z#U9�E,:-?��&?� �����x,�9�e����kw��>����i�N�>��BnU�v�٢��S'�����,w�n�Hq���;������>�ן>�:|.*����d�aK�c����n�!��K��e?ё��9��߻hmĠbp���w[;�K��Dr�H��h)�Y
5j�
f���,�:���Q��J5�0���
�u�pW�p�.㟦���;�T��]�Sh�"$�s5'pa%����;���a87��%�2��W}�K֊�tޏ�1�~t�/⓳�J��Ǩ��C�ᆇ�G2�V��w�㜠s�3�3�Q�n"� ��r�������|�?�iӦK��@��a~��'N��ƏL�L��2ϪИ������I��C4|&�'��B�����A<%_�i=iU��Q��v�r��ʼnf.D:.�i�ĴK�]�
�B���5�D�3��g���ϴ�N8����|��;=+f��4m�7:���+���p"��^���ߺi�����_�Xeí�]�#�C�O��?~j��|x:�p�����$làJǞ�ĊO��l���;�����&>�e����ed��<�آWX���8�]++��k�����&�\��=LXj��:mC���7�!-��k
cnh��^���ή��N��E�H2YF������vԕ��Ǿ����
�%~�Ņ:h���ۆ�nb"K�Y��_!����u�WuU�Z�Zz�g,E�i�v����7o����OI��+4���&>i/<�ǵD#��y��"�z�����{V|��s�ai�NGe���j�s����y��W��T����b�}�:f�1���ˍ�'��.���������_�ܓKf^<$�M
-+z��X�?�����G���@�՞��� /w��t��$�ؼ)�y�b��45��X�`�Jٴ�@nl��hY�#&�9K�4����'�`�\C�Z��'�}(/>�H�,�YY����/$�|�i�hy��3m�R�
-+|k �����k�8ZQH<M�lu�۹�c�p0&L�%C�Բ�?Ӵ�v��E�%eU��x��vZ=J��M��c�>w��&��	eh���t�gNW\v�t�y�N��t���߷��Fw�w|�G�kl�'I��\1�����������W���~l�ǘs/dr��l��yC�|]i�,(��TS���1�ο/.
-+��u�F]T�eM/31v0�"�<MrG}�…D���?n�/�A��걩>��AJ��C��cBq��j/���?I��EĹ*�f�w�Rq����=v����"��
v��$����?���B}�L6�U�;W�̙�o�=6���U��o9�l���Q4�={���]����[�a�7\�����^�{�3V�B{�1z����/�?�˲݃��ֿM�S}�>�jG�uu�<�3=;y����IäfL�/�H2m}w.C5}ds^b��A�\숆s��m�i�հ�,d���!�K_B��]E٠����Q<��f#ix�V��J�^ę���(�5U��y���\�45�=f0#�<qB�/G�PV�>�X�,���'��R�,�͞:o���s��[�'���'K ��9����
��cVQM/{�K�n����|OZiй�]$�w~�nomu��K6D�n@��]�gZ�s�j������#/�"����/zR��$VץXٓ=��
U�h,@��.�ql�
Lg���ü���pd-��9F����)[��s��p��M:ֳÓW�d���u%!�Fw�_V��6:"�&=��F���1(!��
�B
-+]��	2���'+�
-+���+��S��Q_l86��6���I��ΏÏ
W��D�}�'�e��w��ݿ�wy�]S��z9X�`=��Z���t���{R��1G=Q�J��>�~��I��ѭLȌ��G(�Y.�;4\�LY�1�]���XOɤ�+��.'R����5F�ば*o��bէY��z�~�]�5>�H4B��E/���@,t�|9��2����	�������?�o+��z�q�9g��U�J��R�/��7�~�F8V�Y{r97�͉�z�/Fp��\І����>��x%!
z�	80�x��%�E�y�jt��'�Ɖ�����f�'K���|��>���\I�x
�^�����4��"��a����Jo���ܱ��c5���2�Q�|����k�?�G��R?I;�N�ٿ����1��)���'���0���r1��S/O��w�����+_����Oj�N?L�ޅ��+��˶�N[�/�v�t�. N�/2F��yX��YV;j��8בc�Xs�R�!(ݐ<E����t�k;«:ɀY�F͌�%�
�
-+�:cl��	N?�K�Q%�؊R��n�s1�b���c�n��R-x�ֽ�+�~J�|�/'f����&Ǖ�͛��$)Axm���
y��ia�3�VE=<ǣ�JH�5n��g#j���Ǵ�S��|��Ѧ�����}�C�Н2x��=���F�:N�vL�9��U|�U�65+��W<�v��o:��Z�[�w��Q��k��z��g�}��տYW���+�Ac�0�����|�|�y�dJz���b���x�VFb���D���~����)�0&L�1`#Jua:����g%c�D�jZ��Ҳ�:�膺h����R蔌�����/�X��H�D��n�K��@O\}A�Rʑ�t,E��&<�
-+�6�Ǿ�+[����
�\�/$[��MQ�l�2]��K���"����G|ĀdžDG���n�?K7�Ͼ�����k��O>Y�ܹ����']�<��O<�w�[~��J|h_"��7x�K�;mڰqڤG
4UXYS�
�I��:�9�׎
��E�q~C�X�G�]P�!*��,'��˜��k�Slb�6f��ΑM�ɘ��� ����/�2zN�c�b��w�1*��r`7ϊha[�%G[Hȏ������
-+�p�5�K.�$��s��+A�`�>QKI�mA&'Y�8(�?�T�D�K�_������
n�������Vf?�pd�<w�z���K/��}����+/��5r>���0�6y�����DU�j-v݋'V1�䥟�Ͱ�X^�m,�C�t�^��8������9+�(E�_�S���+875�u���E����˻z�ki�
Sض�Ā]@�cQ!6��&K�kj+����t�S�/�f��${� ���*?����7X���9�c��Q�n�����F�����Q�)�py��&�ԕ|ٖ�����[��ݼe��K.�;�/�(r�X������49��1���Kߒu!�NJ�}�"�����A����v�u�������4M���.8���d���v}�p7߼��qR�o��Y��,���=��/z���?�K?m���4����������ǂ��;�!�8t׹ұ3�e����[�2��Xx��u�*��&Ϭ����:}�����W�D �L؎]�4#��yW�>�g�Q�sR1�f9Tw�R�7���?ց�S�Ce�濟��~�.1ٸ���vj�k���f8 ���~��"��y=D�cd�`8΢IiZzk�z9�9�[���7�#��`�v���\�4h����g�S���c�����>�կ~�ϡ��zنw���z�F�&=�g����h�`�
FcB�B\\�0kb[��*�8��
?�.�Oߌtb���
�"�����B���ݶ�c[�A߶��M1�/�U���*��ؖ����%Z�Fb�G���6-�j�	
�Mpݞ86�r��IV"o��1-���}��G�:�.?A��k#���>>�_S�Q��"��5���x����p���68Σ��3�8�/(�2r#_��
b���!J�aO3��$�r�K��׸
-+%������3δ����M�fۯo��?��{�4̶Y@Iu��Q�޲S�q��`Ǿ������p�P��R��9	wٞ���<�����n_��)]�r!�\�~��b�jjȇ�
���EM��>|�8�&#v.���
9T��p�@؞|W�g�n[�����Lg�L��'�����J���2_�+K�_�#Bh�m��-��sAH��˚M1W�ģ�r��f�����r���cm����S��/<7z��:�G$���I����z�+^����V�<�u��߬�q�
Z#ѣ��1�౛������0�K
-�l	���y|#�	�R�Z�ݕ��+�_r +ݏm�Ee��逸�q_i��4��`s�LhB�ņ��Šk�/Yc��
e��m���5?�c�n+�P���S�ᛰZ_)��m�
�E��Q�Y$�5+���I��,�,[��F�cY[u�X�#e��M�h�2���M�%�s��������Y|*J�
-+Q�4V*w,a���`��|���SSD��bI�Ƀ�W�ɏ�y��<vҏ��zY�3���+1�O�?��3�{v�;�ޝ/+;���/�{�CG'n�2�{��Z�uan�J4�}J�j�b���H,�+�J��$����j�b8
-+:�S�8>���>N�&�U�\c�� g�W��C�rr80G~ැc�h�V��+��v�<���;σ�	�	0�9G�"ERjK�[j�A�-���ø�.�����n��6O���eσ��e%S�TjI�D1�Y �L$
�����u��.A��(+'��R��bUs�o�>�� �q�WL�o��K�X�G��\p�^=x������9+9r\�43�%.�	��O[�g�۾X	��A��b�j�_��,(�̸� 9��U:���#l����}8��8@��P��8(�X8�g6[nY����Gp�=�Rh�W
�A���4������'���PK�m+="7����i���ͩ�����s^��o���<�G���������n���������?��N�ܴ�|�	�=:��R�B�	`
-+�i�QJB�V�5++���G���B�=1�ck��g�n	�t�	Ýw�m��\d4��������sO?M
��]z7+.�O���&���P[z��e@@G�/¢��g�~2<���,��roR#a�o>+L4+/m#V��7�j�]�X����,����9P��%�U*��
�&K�3(���`�P��D����6���Zv19��
-+�y��U$��Lg�����dD�n��v�2>5O�5=���u�c�DC\�M�5���������=��
0��M?�٥cw�Y9�i@�ml_�7�7���ǁ��0��ў/��~p_.�A�e�3ۚ������t
\�������E�S;kq��S�I��Gj8�7�j#[���ZÁ-m�e��x�31#3;�LÊ�ư�}��m.M��Q�)��m��{
5-}��GM��j��(�h,O�����͋���ώ�W�RF���E3\Uz���"\!S�)�gڇ���
өW{ߠ[��f2k�C3��Gj}N�i��~ӘA�"�zQm�}���Lz��	y�A%��vL��D��W_��a���LI�7m��`����o��+�w�Q`y���7�#le�����e#d�?2f1�ي�9��/f�!!�d�ʖ�bh���	^x�K���(�A4+6�d���mE�s3�̀!���ޜ}�PF0�����͒)A�@MjB���t'##?;"��Cʸ7?Z��Ȏ�����>rPl�j��h�l�}'�t�_QS��ǜUO�o����{����+�8!Uߓ�0������e:L��QJ��3}@[v�m�'��B;=h�RH�ɿAȇ&�/�)��ً{-CJm�b?���n1"Zׂ��l�	߲��+@�ֽ������F,�.�Z��a�
'8��A���V��F��dJ����Wv
7�v��X�Z]������VȞ��|�6	�i�
��/����~�O��eY�!@`�&_������O8���ԑX��/X������1G/�!.���Z�d?�0��N�P.���H$��X��q�Zj�PIF�ϡѸ�W1�#�T����hZ��饍n�x�����2.�t�S��X9t�%�m��o&�Ac�ԟVz��5��˲�q ���o��ij9�g�!W�H�|@�y�M�6�r�)��V:d�\�=��E����W�.�LƓi@q�L�'+Oѷ���j-0꾲��u��BL��Y����K���U�lɰN���և6g�<X�v��t�F���u����ͫ�Y�0�n���u4�P|��A�)1�]�@����_�18ǁ4�/�Ç,U^�<���i�N��5�y���i�	��m��7K��C�U�}���xPL�:�$t���U77<�������r�����mj��E_\�_8<����'��F�
Ѩm�^%���~]��^��*��*�3���J}�)��ɾ%(bGԱPm���;Q����5<^�9Lأ4%�2a0c�m�"jy���1*���s?�g��Pˌ��#�u%�5�v�S���@6��6Z�5��w�J�4(�0'/U0�j��0��g�<�^���b}�)��9�t"+e���Ώ��6	�gg�rv
���
-+�}½���M��9����U�Α�CD���2��>�'~
�u�g~�T3�EO�Xd;� <��ahB�����)o�Y���4��DO��GRߗu��V��1\s����}����ݙ�-ߺ���K.�A��a�~��
���MG-[D�Q������P�`Q<�8
-+q��
��.9�LJ_��{�q�-8�B��ͼ5��HǞZ��UQiue}�B�5�x�Ѽ�
���3h	6��(r���|�I���3y�	�o[8�7��g8s�A��FKGbF�+g�GJ!Xjf��>ػ�~����������P��J`1V-���Vxh��ח��?�P�$Hڂɲ$>�I1�U�$�=��$WEJ��Ik �L/ܤ��L+�o����?K�b��3��V�:顇���w���H���g��oWg���:�+P}$��_�\�ڐ'!k9�����
/�R-��A�/�p[�y�΋>��6��i�^�'��MX���䨁o�Vգ�j��]uhr�E|�\v�,�K��%�[�r��.G_�����_���ȯ�ݭ��{��ٽ�
߿_������?;%aU#J���������`�/4�
V��q�zV�f(��d�|wY�o�� �E�t覥��A+ի��+W+u�yݚ5��uk�
G�߭_�zݰF��d�(1�����ȣ��ؿw��I6Fq��]���q�p�U/g��\�IE�5��l�+
4WhV(�����-�Th��wo<���ry���g�y���S�W�b\yC�uz��r]�GH�mC�
���k���?�|�9M�7���Y�z��W�_�_-\5�~�i��Gi:c���hb���z��>N�K�zݖxm���U9��m?1�l�?�&V2�m'1m�{(�*���t����ׅ%ÇR@N�X�=w�c9��.�zLi@�r�Fx3���
-+Zd���W�<p.p �B`#'�g�
��v�S��7�dA���)��X[+ME�u��/�kJ�+�$��Ú�R_3B���2�0�m:��%�+n��ϥ��kq}����Gb����3Ͻ0<��~@,� A�= �
t�q��P���k!ߩ�>]�
ԑ�J,˵S٨�M��;���X�[Ts��a�n4r8kܣ/(�g{�MF%R�,T�@�4��7L�FތFUB׋\$���yX�B~˔b��f��/��<L��3���}�<>s��h
�S{%C���r0�e��"�o���K�EË|�����kp�ϟ����h:v��+��AU�����ׯ_7�a�p�6����-���6W3�hg���
C�Q��zUW�^�=�hs�	�����C4�gb�<���%�ܷ>�K���v�!r����42�.Ά���>��`+�b�ґ��q���񏢄H���VR�xf-,�<�͓י\�CGQCpb���O�>������SO�k�
-+鵼0a9���vM��CMy3}�ZB�z�<�R���
{������S�������Y�a8k�)Õ]4�tܱ�\<��H�Ɍ'h���V*�i�l"����Ѕ�(���݅0kn��EeM���J	�~�u������$����+
e6�BsIՌQ/
PURur�&��o�N$���Ar���	~��Df�s6�I|v�͍���P�(�:��m�諆,�Z`KjM2�p�a���J&Hdz�0�°��<_��C�?q�'�c�RX��II\���8rLP����{x�p�C�~dxmw}ӦE�!<�*� �Fh�!��V�\b�nSS~Z>��Y]#㹗^��������1��/h���
'>^РFc���ew���2���Щ=*�bo��#���E&Qi��9��E2�|��K�+tG�L�b����{�
�lxDWm^}�U,�>������|�>�t����P�ڱ�d���P����z�p��g
k���}ڽ� �/]!+�Dn�as�0h�xب�>�h��K���x�iݳ�s���}V
��E������]�;�[�eӲ�����|]��v�hڦ?)�M���Ak��_�����N:e��*Hmc�iFm��)�g
-+[�ݶGoū,��&��mP$�����j`'�sʙO3ymy�w��5<��q���xlx��g�#�a�?���ñ�E�~�?�׬5k7{�p�'�[
�ɲ��u�u���Ǟ���6mv�Tv(	���~�ž�&J�a�+6�v�+�x�az��-4�$�D�vº�ǎ[�:0������H6�
-+;�d����.�ۺV�����h���mO�Ll�OzPF�˟}��A6��ڏn�������e�L�D(s��$yvz
����7�u���5�l5V
�7o�.��M��\�Q���w�9+EXС�1q��q�=�d��H��t�G��kk�D�h���Z��+�Nך���<S\:��n��rh�˾JC��G
��m�-�<��>Ʉ�����A�Q�ne�n�|d���l�G���j�Ŋ�եנ`��Oa)��W�3�8j��3GSl��[+�;�ݦ�2m;wB�|{�V�m��e�,��VN?-��o-������,Ӏp�D��?�G{�_��_}X_��(�?��`&��,��_4l?���� Gۘn�n~�
�d$�T���J(lxU|�L{�
�8!s��Q0�a�O
� g9�0[���*����)�趥�8��z��<p�٨�g� x�^��h�Y����K
-+�t?���K�]z�k��Z��#G�)ݦ�+���;
�{|��_q��x>�����i���S.�����32(�5h&ٓ�Eд$�)����df���¶'l_�Dg�.Щ�	�F��D
-+��<У)E�k�},/��r}�Qr�#9i�Ȑ�?((�ۭ��G�)������w����ؼC_���
_�xzᙝ���Mɶ؀P�����\��M��f�l�MTL�.�Y�g��MԌ�9v�ۦMǨ�IBjR]������_0F�@��f�]#���YUa#Opd㬍���t��m�_f�R/-һ�y�Ο�Dd><�ѥ��Y\�rh�����ؼ����2;Tc��: ���^���ciAU��_�x�{.�������5�fxꩧ������c��n��ǧ�u����ޫW��+�5z�!E��+�/�7�_�g�2�䃐�������?�9y�������<�>ޱ����Fm�"�)�R8�c�њ"���UPђ�b��F��)W4K�(
ݒ�dQ:�Z�8_)�d#������ηƐU�;�5�c���Y���bkÚj�_��Q�6���+�[��c8j���(��W��uG����.]v]��
-+���Ϫ:F��Q�Iܿ��a�n�*X/{t9Yo��k�_��ʰS;�Wv�^捃z�hNz�~	,��>���B�+��",>��E�����5����ⱟj#��~���<2ܢW�ޭ�%O�7-�x�'�j
-+U�G�շb6*ݮn+�ݷǷ�Ǘ��/���k�;~�b�M����}~�FW.>rݵ�
&
?`�_��<}�o��3�1��y��J�(�Xp
-+���8;r��X�T���D
�؛J�ȅ\X�6�f��O���<ا+��
2�X�,֬��K�Vk,�D�<�}Y�J�0ȡD�t��̛�o��iLg+��>G]v�e2�dà'
5�*ݦ���q��C�3-S��b�E5G�}��䚜ij��p`�]}'�+t�Q�	c�-U�{�/(YI
׻��G�����;2�Ͳ�m	l�3m��4_�qQ��;���o�+Y����)"�
-+hg\�d]=v{�q�qz+�q���q�m6�+eu�%7��x!|ed��|g4�	��K��\����^�����\jC�1T���+;w�1�
��^��Ͽ8����d.��Gm.�eߋ��� )g��@
�R���  �1g�H�	U�_0�R4t��^�ǜ�c5e
Z����dv���}�fJ�e��<�b6)=v���d�Hy���h�p���w�~��m~�_vG�튧�~��a�"9�@�Uߥ����ԯ������ޕ[�%J���ի���l���$�
	���:�۩��^|qx�'��������-�Ii!���.�����|��2���tظa��zcب{<}���D'{��2ׄ$V�ȵ���b�Z�������c4�@N]�"2>�F''�>�1�%��6����
>�D[^}h<3A�M/�02+F��z�B��|85������[�^t�M7����\
 ���w�6RêU�H�20	��̘NX�e��AiS��|��J1��+�oT���N�C�����P��*_%m'Yۈ��6�δ2$����R�|m�-��:1�O�m��EY$g+"�{e+��#���/�����@�0����m�UOw��}ƨ�Q�u�(��	��uk�SN٪�޾v�I�2=H�Kz"�ڹ�[������+Rd�ܱ(EV��@���C
|+J�ZsO�㪧��OC���\AxR��󸾦��~��cb���q���
-+��'��9{�s{虀XԔPL����e\bké]���hk��� R�>d�@��HM�:ƌ�Y�G��z�J�R��P��j��䀗��	ImM��
-+ӈ����-������_��s�3����Z�x�;E����+?�o�Az`Ʒ��FP9Ҡ�[�G$�C�=�W+�ƴ�+���$Vm3�xh�Z�g��t��{�+.���L���o�GW�|u��!�c�����P��\l_�1���+ �
�8����=��Sf�I�xJ��R?<��s������"Yɾ��������>��Z�v�j�K�����y+�z%�����b�Z�
�ႁ6S=��o]L&A8"��J��Z�� B�����Φ[Wm�zė&~�
q�o)����_��d�����3m�|�sY����*v��h��R5s� P���e��a��"n��\	 8>X	�/��
�dh���.�:R�}A�f8�ͅ��
�qV9ؗ�8BM^hkS9H�0�+,+�{�d�A�c�~X~;}�w��c\8�����^
˻0��1������Ȫȉ�q��.�ܗ����7�m��C=�5v���q��I�8`�XXV���-�෕�aى5�'�?��96�oo��h�1�Vnu��S�)��v���Ȃ�ڢ#�re��5��~-�!�N�Q�3/��w-�ݻ�i����_���l#Rv����Y���m멧
��Ǐ6빌���y��8����B�k��1��>+�nƧ+G�"�[N�i1�G,ȃ��U�xP��+lAձ"X�[+aH��U3�v�����2��&�H͐��_�$�t��l��^��ϗ6MiQe��H�& .2!��t�c�4XN���ߠLj�8syx��%�Vc�O�{�����7��V���:]^=5�BțhAő=���Ft,R��5>�.8�T�x@��S��5�H��^��/튯,Ԃ�B��,?g,x�C�j�_I�B�Jx���#�"G-�E���e��zO/V�[؂��~�o��������}+t�M`X�������_�oWlՓ����z����+7�ٙ J���{�38��G����7��M��՛
��9n̵�w��
pե�+�+�co����#�
��FOf
�M��-�K��uC������uŊ��UW]3\|��m��:�u׏��k���1	��bZ�F" �b�ٯ~�k�^�+=�5�^�W}P%�l!F���8Y�[����:ziS�9�
-+I0�&贱
Ps0����]Z�4��A@�{��.+o�{m�w�@����f��:�񁱚��j�^|�
�@�{`$�
��X����6v#��}�U������51<P���1��>��ܱI-��l�op+g���|x���|�m�@��ʹ�N1\mj�8c��_�Ȱ�o�*�q��:b�no��KH��׭j��{8|����y	��p+N�3�d���>Ƨǟ(E�H>Z���5�,Q���6�ib,���C��m�bxy�S�@�������b��ѽqvx�1��Rr��K�N�E6V��u#�:ޙg�5����/���Jh.�c��TW�8����7Q�a�+)�9��b(�e�8R�2��`�$�p/<ؑcp���*2�N�Ȫ���+�j&��#?6��%���
-+,2��(~�L�6hV8R}ZiS7��JǣűSҙ?��_��R>���ٵP/�Z[�X+X�ӽ���b�"�

��1@��q�(:����?!&a���6v�Jrk]�{�:,�m�H��m��/��TAtر�?g�������>��?S�}fF����7nK�
}N��ѶC��&��m�g��c�g䫢����a�˞|�I-�+ �ː7�?��w̻�7���M���!�?��?��?�V/L������G��ח/Y��
K�6�%2��ַ��2'X�T��	/��!s��,`�g[Ŷ0��ŗ� ��8��e+|B�Ejc'���j���(o�C�͉�������LP���9
^�+��s���%W����� �>,tW]���*����`+^�W[j���k��=<�[;�l�8l�
޻��ms�uْX�I���a��]���U7Pdi8xM+z*)�x�SN�>���x�&�K����O\�>�mݑa�`9g�>6�G)Ŭ��+
-+����@m )�/�r�7�s+I��TP�!D��r�pQ�D��^*'<R�	~d�m0晁$(r�Q�Erl��iI�"�&$4�*��+t�c�k�`E0���t[��4�[�+t�#���6�=�J���#s0����������6r���v��m_Љ	j��j����'����3u��\�����N��F~�te�[��}�3�p�A‰A����9��*܂3v��6�nC|�{����s���G�S���_��1����V�)mwz�-���/�I�Q�����p�e:K�s/���G?���+���9�����Mr+��Q�ᢺa��F��^(�LM��E򏝣�a[}����X��-��LJ/}���z�pX
-+o> Db&��n;�����2,�+�k{��
T?R�7)��X!�^�^�1��hiͦ���s5)�3��S���)�IH�-�n�6���wy��T��>�cT�6(D`��������A��'����/_<e	�l���W�Lmj��x��i�|���%��
��Fꘒ>�_x����
-+�����}���y�.��>�
�M�K:�lJ+��K\��:�9H�P`1�K�2=Qj��d�4��}�,��d�n����U���;ÑR��O=xQ�qFj8�x%�Iӱ� ���
x�Э�9��.|<sBkY:vR��|f%m~C~��.�m}�}��յ�
-+(�N���k�C���6�
-+�K�V�@��,+0���M�K�[����E�����8�k��`�
7~ߤ���;�Z!%��u�y��o����'���#��Mc,�M��
�]A!|��5��BFr#ɱ|@��z~����̒�ȺN� �LCM�Xf�m`�[�/��	:�o���ɂ����(]�NN�5}���@:�1;��Q���/#�0�:0�/�������=]�G��zI���lT���ߥ�5�蒜$����
 ������n�F�t� ���3Hz�}��� 	�k�ч&��ia~+����k���#lQ��bE[A�
�c��o�ҳ?��{zx�F�*�]��9�_PĬ��+��lf�́>ݚ�p�n9>�^�G��@��4���?X��.dO�OP˳l
|@�[�0�	4��xhq�J�G�-��`�@"
-+J��gt�����̖�Nk�t�m�c߶c��+h�l-�GM�alO"�/��6�2�t�W����Y
-+K��;���T���N�i��B�K��^;d��'D�#k��g�j�Z
59
-+Dl)51|
~��c�8���W�
PB��=�)�8��
Z�0ɜ���>�4x�o��}&�qtL/95�mrT�e��>P<�7t��?&+g���]_��"ӈ|,�l�Q_r�sbZ�D;ٱ���L5��(=�P�&|6�b`[������0���9Տ�ȧ����C�^,����=V��D��@'��F��7/_2��Ɗ�e}?�~�+�����!;����2���b����
�۪��YzKާ>�����z'�I•���.���z�
)x���I����g��8�&��u$��t��CW��1E��
P�H���J:<��=g=��s���q)9m��x|X+�a#��Ϭߺ�vV�1V�Y+���,�l�ʃ�>7]�G�ͣ51�X�h��5=7���y��G�`���q��y���>|���W�-�v]0TT+V�v��,�N�0Y4�s�SI�LeDќV�
�8�1ެ���\�'_�`�E�������;�@�j�^��1BD(m�������ՖSC���)o�{�7}�)p�r�9-IR�IZ�1�J�>����I�XT
��&���#�Ё���78@��n�NC�cl\�Y��GG?{a�cf/���R����cy�S?�sy���Q�ʊ�D��b�8̐��Mo<|G.�w�q�6>����~D߹S�Sl�$^V�v�B˟����M5���\WCGߋ?҈�9n2�g^��x@04a�q��NQ>J�GB֓�=�
(�\G.��O�������|����k	LAb��a1 k	6?V�����0'��L��E(G���`�+�DK��f��~�$��6�^[�\����g,���uC�v�9���
-+�F,������ȃ�b'�c
�1����f"�h�1�ȧ��)��U��&c%��D
-+Pp����u�G7���M��P���rBb���ה"f>�'7"�Ad���/}@e'��l{����w���q�>�,�W:Po���U+��UC�2�w��7���^��&��J��+ ���H_B|�Ļ)C�<�0r��Fc
	�ė;c�|��GK����_����?�����x�/>8vs�������1��7������|����ˇ�{�ߢ�#c�GwU���L��1x�İ���&~�ȋ�L��8b4ul�P�w��i{ ,�BH� ��Sr��x@\>Z�S��|�������x�C�́����b��G���u�9�RS��~����c��?c#F�A���̟����𠐂�.���M|��y�
-+��<�÷������|�����Vo�h����?���?��P���y+�c��R�?��'(��-!2Q����u
(>�c<r�#�Ӿ�G�����[�#��*�4�G�x�F4z���.Js�yl���&�v�#����v��K�7�ɯ�M���T~��o�[˭�S�c'6	?�����3֟NF�����iC;��l%���k6�@wD¥���9�t�
?:�H��ųA�L6+G�B�ß{���3<1���
-+�T���λб?��x�@�S��ݐi�On�ȺR�廅%gKĸk.J���5�	��荿z(��W9�j�u�ׯ�M��{g.���3����G�~*����|I2��}�W��+�O �1q!�'ҽ������o�*�s�K��'
@??���]��
�yP˦�G�Ƽ�Or�De��Cy톡ދY�v27��X�°oJr��@y�r*�9��(��hSe�U��q"Ϥ�~�	v�6NPa�+E0:f��3�����t�W�~�:�ށ^u����嗱�b�iN-=�:���id^ϕ��UO�ؔ	����rC1%�C�>B��J�W��T;mC�R�(����O<��;�1�M̨W�G3�}��2�����L����r
-+�&�����UN�qn�Q;�Ξ^8+2�
��@����<�\>R;��{�����l�1_�}W+
yX�/�
-+q0���J}0�_��@��X�k)9;
*@ם:���!Oޠ�mj1����c.�C�7��i�D�h�.��-ǧvŌo|�Z�U�k9�5�����=���3Z�s�K�*�_	z���������X?��1�yᯤp� {�Ȅ�lu�p��a"1���I�^$��"Ս1��G�6�r*��ģ�R���Ɗcb"�368�saS|e"L�r]*��>"���!��L�TE&m�HN��ª���l�C^c��*�Q6��5md�u�7�'f��(�*Ϲi�J��q삋�,��y![��"�(>!�6��A�D��"0
-+9@~��&
-+V���ܽy�٭^\�Q�ߚ�_��?��"0���!�����5nMʷ�Gz������?���q���\���w�m]p�aa��oD��S7=v7�7qOX��h�R��h����}�׾��
z�ضe��yxe)^mhlDKc�!O},�vQ�s5]�r����&�-�i@m�Aޗ��Y�I~��(�jԸ��s���������3J�3&6������R����p�r������UZ�h?�G�c���f���Kj���z���q˚ϛ�����n�\N�P��M��Cȡ�a*��:��X��g"����v�Bε�
�+�OYE���;N����o﮻�t9�覝�0M˧��y��}�J�Wc
��G�>�	IG�I��5xMX(==�
��dC�ylã�z3��.N6�+1��e���L�uj�Jų�OW�M��g��Z0#;�y{i�ܒ���B��}A��X�͆N���d�\�Y����.q���\B��?�c�`��[#H	�wpW~��y�
�g��b~��g���(������������w���nɗ%�ܬ�c����xn
��#jF7�2����γLőq.�ۓ^��fd&�_�Rֆ���YO
!X�X$`8=p�皵���|D��i�,.��O��W��B�OL�B?�+v͋N)
��C���� ��z
�o�s�����n&F������kb?�&z��o@`�	+�����/��p�
��ͷ�EҸ�-�J��<=���Muw���Ł��X:�e��Ʌ���4��=-�9sz�R��xED�\sQa�����䣉⩞������g�����9g�t^�O�[c��r"���|�s1G��OmC�7�Exd�ó��Ȱ����~��>6QJYڔ$�
���C��l_�G+�[�4�<Q ,>�ӻg|�@��,����.�I��Oo�G�x
-+�M���A�۫�f���p~L�}�yv����&��:)_my�8�u]�w��c�y=�����O�������\������uyG�w~�;oͻ�����?p���g(ɑ~������[��$d:y�f,����8�n��;"F6m�#����b��d`'p���L?���h�߱�u�V����ikG+
���S�"B�`�|��#�v��k."w�uO�8�¡��$vT���'?}xun+���5�=����|�\��;��^HI
 �zP;�Z�F�������F
����Z�2�0��Ķ�+��\�����Q�x{�2�X8L;���
-+���ԕ�A{��ㇼд����/
-+l�N�u:�b� ��]:��#v'���N��`s�1�"E"KB���,�q�9��'O�3
���\.�_�=o#�Eb�>�ý+q�`R��]�bQA�E+��Z(��{�H+S��͂���]>}
b����?���O����Xdu0�8e�\фч�6���_C��dD���o�[��^��vev�}��G�~,�^P
+�պ
8h[����������PSv��x��L�o+&��v#�,?�N����e�>���("�
�>�R|6Ј;���s�M/!L)�y�����c�'�<��O�;?淘Ԕ��Ӱ�ˮ�!^�/���w��Û��_�Ƌ��u��Φ���~r�g�.E&R��8�~|v@:��@1�e�D��`��5Z��L/V�����O�������)�O�q�9��|o.�!%s&.`���:(��G���s�Y//�w��y��������XCu���'{�o�*}ƹ�>C���rX�k���}*N����k�h4gA�촭A@Kα]Z>*�:���T��[5y@0�JG
-+��������S�b��͈���6+7to�(m��z�!3���4��f�J�};����P];Ÿ�_쾱ua�p�q�5/��ee�[Aj��q�2���s�n+�q
*oػ�z:�cjәi���7MA��=ruS}p�
U~'GbP�����)6s9����0�B���Zt�H]���Z���Z/��Y{]a|@!�N:��9��/�:UFmIW+�O^(+��6T�0t&��`(�F\�BCoqF+��魞K+c�ϑ3��DC+5��SӾ1k�u�L0��J�۽sR��o�g��]O`x�\p
�嵭5�f7�}�¶w�D��=�Hak �����G�Q����0�)I�&{.o3��y���r�p� ��)1v���|�2>��R���ď+�m�y\��<+}*:�\�e��S[������͆���@JlS�<�-�0�}�3�9�o��>�яF���j�|p,�ơ���{�J^������վ�r�"��í&qKs�&L��+)]�E/%?�v���Bm?!-d���{+n0+T�g���	��ʀ욏�����t�r��5��piD�c���=8}V|b���˜	ޔ�鈪W��2�5<�}��F@�8�v
���W�%�+�
l�!\��׽�+%t����Ґ��
+�ۦ~��$%Kz�VL��ɗk#�f��a��	*B��=0���n&�Q+t���A�%Ït:4��"�x
�� ��b��S��le���`�Ɵ,C��,PzDt��z^�3������|��{V��#���i�|����|��9f���n���
*G���f"���^��U(:f�ް�wx�?���W߈:������ޟ���Qo�h��ɠ?b[��������w���p��kt�5v�X*ԎsX�q���pV������W��]�T�_h]Z۽�ן�IU�S�l��ι��yA<����vD�1���8CF�|Ɣ+�yY�A3�[g\DJw(1�x�
_�,����b��K,)�M7��S�O��գ(�֨E�hy���wߕ��x�,Ԍi���r�N�V企�	�~��M��:7Z
�7�:~h���g
-+�L�=���T�e�BZ��)���>�b���u����#r�-��f�b�'?|rm�SB��5��R�fl�>6��}m�n��9@|��D�����{����-��m<��@(GL2V,0w���|A+��udË0k�
���ok����?��\zΑ���WԖ�l�����G�e��g�ͧ�x�3A��;Tk�6x�b����WYސE��u�lf��������Ə�ǟ>�7o�S�>�W.8EI}C���_������������\4����B��'��&>���K�3ȋ���|ܑ�`7��;MD����M������#f������t�S���s����E G|���g~�i�ɉ�`��U�G�B�6������e ���r���e_

��mR���\>.�����ؾN� D9H��5�E���#�M7'��#�
-+�k�:�����'>�)�OC�/sz�+��R���+k��p�qQ�7�
�H�g��i�@��Z]����>��v>R�79'�ƯXx��m�k('��)��³�w�Cs�ǖ�f9����D�
�z���~x�G�i�d>���>��KT��w���B~�l��K�Y8�7 S2���<��Ћh\D3K�I��&2<=��S���MF���C�������#�d
�M���`�Ӈ6xX�̘�et ����[iia�.�.Z�q��i[e����\�6&h���Q����F\�X,�t|3R�>�	8~sㄬ��ć�.&pr|Ͻ�>�|~��a5���w��í�}�v���z�`���6ct�j�Y�tJń�#���)ݗ��- ��S�?�?v��_�O�"�G���F�b-_�}��o�ݿ{x탯����n7�&&9r�O)�5L���
~/��!X�D���aM
+�V����H�_9kC�R���?s������y�<�R��FD9�0`���3}���MA�b�Z�0ʅH�'���ȩU}]�i�xk�'V�Ũ��t���8`g�^�3���`]4M:Z[:�����:X���&��5*���	��|�.�)1�H9^"p`G~>'���}��?z�_�蟷pۭ�n��V}�����1�q|vO{�!�Vy������6^�#�`^f���)/��46�J�a��X��
H������&������)��}�$4�H���fJ� �i���_�(���Q�<k��NW���曹���	�� �
-+�|_dƷe�+�ɷWް_�t��"B�;x[�'s��=�%$�2;.^kF��S��g��c`�vBxÀ2�E�j�9��4Gf��l$�v8�hhk�S�jB���]=��b��;��4�e/6��,��eR�8ĭ=�����X�Q�"uʼ�5�
=��65%�o~�w�m{yT�v7Њ�qtI.�SV�]��x�Xܙ�W�#��m+�c||o��;
.�>3����ܣ�&��gB`��}B��9��em1��||)��*
-+p�}��+��i/m�#Y��L�94�j}{>/Q
-+9��l���b���nn6�������FI⍈�d��Q�Ѥ�˝Z��f��*0�CX+��y��b����
>Rγ@̓{�`c9h���|��nz߀'�d�x�0��in#��
����nU�!�b�uB�h �Z{A2�y�ڝ�!vP6w�k�<0��AwJ�Q�����58h|m�����Ô
|�j���h`�^�|j�kߋ��U������/!�@���K�]wݝ�����65�����˧~:�g�6]��vq��b`[3{:a��ER&���>��P�F�ڽԔTʥُ���߰�O�j�i�p
ёiÅ, &�(<���Ơ�` .{W]���+�����G�Њo�/�H��W?�`�+��٩q$%8#�vd:F�v�P�$T��Q�j��<��b���<E�YeƟ3,���-:��9U���N�� @C[<r�r�����"z.O�b}i�P��a�A.^sp�:	���4��~�_v�飀Y���e���M��"�
���@N���sȺO�g���z�yی����<c��ß;|2k�Q�
�AK���<��R8����E�c�{ؗ\w�eh@r��i��Y��
�4o�k��5���+� 9���i�@����-�ʌݧ@-h�W����29WW����k�#�gIU�v�S�7���F���/(lQ��3+�ym���8�U&>� -�>ȁ���E�u�}��Q�/F�%*Y�7s
܋���k�d���t
�����o}�[ogts�A֧l{����[��c���
�C<�.��R6�}�9��Fy�<1�$P/�i�q��@�cl���4-�m�.i&Swe<���Y�Ҝ��
�6��Z��O��u�t�󂃈���A��Y$�}�`����u�W�w�1�&������2/��y�[�4�ܒp"���0�~�z�zՆ�߷&λ}ڿ���~���G��/����'���۶&�y>_!{��o�}xͫ�]}�Ǽ�$F}�l^�k~�W_;���S�8�rN�0E�T���O.H����<v';i1B}�f#)��s��,��-��2�ۆ�T�U`��S�[��-��Γ��p�)��t!_#�������j0�c�W8�(�F%�+%�{e�L��/�������c�
0�
�:�
-+��i���=~�Eb%�0V�Է�I�p��+vZ��_�_���F�!�Q|��M%g;s���DT����m�5�&���*6�tèO�I9��.��0)��&K����_�Zc��"Fl��\b��\���ԓ8�U�|�������,@�Ɂ7�ቋ������C��T_�;�)2�חm/�b�4������+z�p���lh�c�)d��+c���>��[�N�g��=���#�����5�g+E�E:%|X-h4&���z�
&2�����<Ҭ�����cY+�������>o��u�g/(AU
<r­1�������W	h�18ˉ��n�pԏ�Qj���ح�cFj��/�'��Bg��z>���3�^d�w���y����'��m$f
-+ސk���6yb�8v�B8"`�g�?�L+22�̘���@p��_9׃s{���7�����Q�v�m[D8)�}��l#gǗ_��?�{QG��
-+2�z3�<B���H
�؎+�`F��d#g�,�}cf�{��d�p�P3����3ѹ+��62����rz)���!��GЅ��o�LZ-�;���S{a�.w�N�.����U-]�ʙ����r�p	�����1>#��u���޾�����t��غ��n�)�o���y��of�6�Iч�'�����.b~v7t����Qݙ���X�����_��O�4C�Aٚve[�F���{�w��_���:�
-+?N�f@F!d��lƭ[l)d4�9�r�+����Ν�_�9����̻�'8���r����^�Z�I�i��6�i#�Bɇ�|"O�w���{B0�����q+uۇ�7��-R����3v���d��̏�Y+�y
��A�H�X��8��s��jSW�9�c�ύ }�؈����;F���v�e�@�~�����ѯ0;�������{Cd�\T,f���Κ�=��M�7���ƿ~wů~�7�,VnFO�#f�������&�`�����,��5s�A�����u����8_��R�S,���8�����[�D�h8,��O_��-��:#��ϧ*BEǽO|Nke��yl	"�7:Ka�t�k1p���dt�ڄD�`�s�M\hm�˜v|�F�+�:�/��ճ������563�{\�X���a�ܯ���&��L&��ňL̥޻v	R�LN��֬��p{�f�L[Ӣp�\����rw�4�H��l��X�7z�Iw�	��d�(ƪ��+�Ֆk����H?�-+��P�PS��c+Gq�s�$G�����P�wZ۳���q�_�4$��4�O+5v��
���[�I���F@�Ն���9��ۘY��%)�.ќ/��qbG2�N �
B��N���onlY�����S��Ԟ�6_���_��
-+�xJ�nuF�"�.�-���	\*1�W?����@��NN%��Y������3�� ��>`B�XC�ph�cpY�!(d��z��s�c��J��O{l�:�zא>�X-+��j0�근��������\�����a��v�+"�?�

�u�TS`1C/����-�E63�#��%qx���3� �/%c*���t˭ϡQ֪�>���=�l���G�IT����m�.#$:_��׷���)%��=���C_�5���E�����K3��tf��� ;n��C2GX�|��#�y
-+�h657;�WN"Y5xEI7tJ*�����;��i�p2��7(�)O�C��Y�����Ps�������s¿9B��\dy�S��'fބ�v�͹�9w^.�ë��'l� �9s����eWt���U���m����C��윘̳
-+(�C�aҊ�o�-��k���|�����	q.�|IL�U	9u�5��{�s���ڽݙ������������o����H�����*�w��^az�F)9–y��#b�����ʟ��9�6�98�UXx���I�k�����e}N����f'�"`�g�	ڻN(e���z�f;�o-��F|�Ih/�K�����W��M�`j�?le����(s��9OKY!?e�'����.\�?����M��H�g�|`ױ� 3ib�1K�bH��I�p�>��/��^v���.s��3a����"�)�|a�]�x�I�I�Si�}e�O���*�Y����o��"����S��&9}�a���G@���!^�f�CA�y�X�a��e�կ}-��(��P���@�x�h+W��5�bO�Fn����Ǎ
����J}[�;�~��Y�
�Ĵj(~d�<d�i[pho����/�P4pGA��Y�WD��}6/����L㫷7�%s��aW]���D��~wi|A$O]���<xU����.�hb5�^䥙��D��M��W�+�?���=A%�a�9R�*f��c�!�+l� ��I�_)H����a�[/�����[P�jm�+�|���
dJ�6N��mc����8�\��J��z���C����Kr�Ҵ�V�����Q|��c+tf~@g0X(L@�ƻu@�b�;	2)�IC��C/BN�5q�BI=�]�:Q{3��_�R��c��6�rv��ф�JZ�����쌐����O�@y�h�%N�v�'Ej]�K���>u��l_QD?�W��u����och�*U�g�r�������7���㝹���st}*M��O(7��7��[��O�u8��+nb�Y��WQ�� �7}�3ƣ�n��{��r�iAL��æ����-���!���v�j?�y���W2O��R|"�3�7���7����m���=�믻n{��o/{ɋ�����hU�ʌ˃٢�y�eO}��5�G��qcS&��?���'�,z����B�ӎ<��a�\R3�j���K/�̯�-G0,������9�|k+7����@�TuMq6m�'{ճ�q���Z�\0.2n����y�EǼ�Ț�����2��$4*�v��
-+}��.m�9�b��d1�.�e	��&��~�����+�گ�n������.�g�ǧ����7����yW�7؏n�~��`{����ӟ�l�w�NPR�з�n����Mo}�vi>���-}���#KtyЖ�62����o\ -�0��@�;&����b�]�;+y���_���{˕��ܨ#����<��
-+��%�������󗏡�
y,��{_d/"
���_�W���̙��	~��-�}fN�|���\L��=�_�5���b�c�����2��J.�	ǹ^��2�D�l����W-�R�� `��h�
-+q�c7���a!�Ղ3���8бAm�3��'�G��bw�f�Jx�c�p�����t��rQ��D1���a��������iHu���Mm.��Z���;��?�68^S�n�Gxz���p��гK�ctK�т=lg�>��Q��K3v�2f'�N�x��X�Xm癞Ϋ��5�9�g��`��FD'�C�3���Б�	���Q����g�y7b��:O����D��R�d�k���.����
ݓx��'(<Bď�)�{��+F7��4�R~�1��3c	V~�X|�&1�
o���7@�)h����`(�-8(9�s��O�7���\�G��.8�`�<��O��Z
?���,��3+���y����|-�ґv�]3��(>�H���Nf��Б$��JXDϼ�!m�X���4���������=�eU��e)����K-d�T�����ox�bKTzB�)�e��{������g>���]��?��sjLD��<�3��o~ۯl�\���.^�!G,���N�k��n '(����SfH'�iߌ�sʟx�$�6ɑM��_��litoq�����7-�.>@3��
�k���������;�?z�j_�O��M}�G&��A~��?��?{����u��\D7B�4����qMІ�?��*���v�(��T��<4�+�H��[o���+��������Ď.�8|*7�Y�����a����gd�'���|�o�]����ʙՁG��bЉĚ��?��}�JK��q�:��aF9��-��
`2����0�Fc�\�vZ�5��s#�5�]_q�yF;t}��|����13��؎�6��sq�=
K�&q@������1Gq�-����&��e��F�ʎ����i)O��D{�
=V�0�#=z~
-+�
[�F��b
�m��7XL���+���O�/y
a+k��*�HN"k�a�56z�YG:y�A3�skdǦ-F�r�.������G��*_zb�z�;3�#E�?��0�E4z����y.�X.kQ��Ms�����W���l��w�5Wo���Wm��]���w]^Y���o~c��9�8������L���_q���/��ݦ]��K	�X�}(�>cΘb�QR�#`�ȍ}�"��'@�M���Od0�
.�i�p�Rw�5���kT��n
-+�u: �<���z=�џ`]�����������T:�<�S�𵇝E�, ��"���?�C�/�Cν�Q�
-+�c%��{0�+-���'��7��R%��d���^��-MK8D����]/�a����%'�̃�_S�C
�s3�K�aH�!B�&�8AWu�єp7k�24�x�ȄmK����C��Gz}@o��|?�O�g+ee#�.넚���'����F"~sa���4��p�i%gؠ�j	�O��#�ɲ�Lj�b|�G�DuU�k�cqN�9Ni�H���O�W���K��F}�'���@@q��^2�O[I�?���R�>��}ޝt��
-+fF݉�$;��$���f�jC����_���=��xtx@���Lz
-+4k8�m��Nl{���H/
-+w"���MoC�o�'�=��F�E�F��ԉ
-+���b�x�Ł�BUn�<<�P���?�H
UM����0&���G��6hL��pH�ħ�/Z��������O�-�5rR��'�Щ_�?���/��M=T���M��a���1��mG81r�C��n@���A�9$]c�b0���tԉ.����E�1h���I`�/¸������>����m̮n�4��>��-���	��?���bޖ�o��'�|D�|�*������x_�1F�I�1&�\�.5�m�1�_hĎ�V1���y�+�(0��Z]�	#���TO�4��Z�{�b���N��=�(ΚcJ*�\Zp��\)ޓ���{m��Kt0���l�>�U���:��
�ѿ��C��4x��[++R�K��X*Wft����&�=�U>�m�|ѣ}`��W��DTl�z��9�O��{���-�<��ɿ?�|���_�J���?�_����I'k����'��Z,d�r
�Վñ�m+�n����\�N�ݻ��pȓ��R�{��
䀺��0�b��~N�#��X~�2����>�5i|�Ӯ_m�|���`�T�6N�{�)p�0���n�`r�?i��������c��{0�+�S�q�rܸ=�Ů�t�;ء�{�ko���`j�X��	�C�߾`3����bd٨��]{a��+c-���
��k�bS��[�ɗW�
��md�U��iXz���gRB�o��I+4���Ob��������"?P�`���|����w~P����|�o/|�K���M!#���}[E"g$�� )�c̏�"�f$ �@e�
���$W�15ҝ?����ً
��-�&w[𴋻&*�8�‘W@���Tv>�1EM��
q�UW��ڝ9!����7�ԏ6W^}U��v�
-+��@q���[<9��8�VɃ����Jb�9"���i���
��FMO�\���?|t;�ׇ-<S&Vق�om�k!�̝�
6(`�+:Lƿ%���e������~��(�k�
��9V,�W��Hiju��A_��UDr5/���e*B���4��Zq?��{"���t�q<]+�1Y��~T���'��X'��mP�y1�B�䆈-�_����i��ˈ4�X4�̯�a�2ӏ><"�+sr~�3��}�[�:c;h�j�8Tf�K�&���W��:���˜�N���Jt�N��k/p�����$@y����n<hw;쯀ˊrQiF���'
-+T��z?�
��ۍI�4+��#�ڼ�RDȣxb�OC��G��`��'X��a9/8�6ǵ5]�:6�s'td&}�a���`�q
~��6ۡs`��w<{���;:�o�[�
?͢�`Ę���綤�s��X�G�G��n�����O���s���H�n.P�K;������@s���}��I�>��s<�(=����������恍�L��z��Z��B�_�N���Y�Н/ӍIx�lL@m���Ձ�}x̿���U{��^����ի!�k�c�x�3��M�#�˦+�����.�2�����#l����ӘV.w�q%h��W��	<^,�s�}ۯ��o�{��=��4�Ց��
-+�����^���x�u��$����tڍ�/DL�5�"�91������{1�t�� ���\��u�;����cr	Wc�0�u.�KK�]o�ľ7����Z����llY{�N."��������%�\ G/����-{`2��sNa��������m����G�(S�������OK��{��O�v�����$��HOx
}�yI�q��Rh����Z�i�g�sbq����'�5�+�_s��/�j7
��7��pM/lx�5�xR�ѷ�e��+�b$k�5�n����u�+Z�����?8Q�#Y��B,^ P��{a����.���88��g�>�+�	�)�r~�����O�-$�r6Q�>&�254�/B������
��5�֬c�Y>�(	���چ�+��4K�N����N1��䏳mH&�,ޣ,K>L<����6U|�*v�c":a+��<�0u�H�K+zpR�}�q0@�a��V
-+ݵ���u�8�k�*&u�}�Ef�v��O�B��_���BW][S��x��(�[�G���:��?w�{m?�o
�u�]�0��$8g��Ę�}��.vXB�ݠeeĜ��
�q�+����2ٙ��&�E�Lg��Y���ɓJ?���P���ذ���
��][���e�9iĄ��Z˽:��+֓}�;z�FaG�~{�����U��c<���;�u��nѫ�i��e+|��o~��]��}��Fz"��2�G�)p٣~��~>��.����ԍ���c�����x����x�/���go?��n�?�yj_��B��[�l��V"̴��|�Ɓ~jt� �)�ԕ�a�Gs'+9Y��װL����6�k��8	�	���?��R	�D��	�����?�}�����|m�p]Z9��z�e�kr�����I���rz��kڎ��z��F���^}F���,<�,؋�Hm��\O�&k��b
-+�{P3���@05��m.~�!9@�V�v��w-;E���������������jUs"c؛�~�?�'���C��
 b�?�!⤑�">��� ���D�ck��������t��y�?z�,`��!��y1�Llchp��~�7�#�H:�7'8];ծrM�@���"5�b��_�~^4~������n�N�"�xd:�:��Q둇c������_���?�y�a�[+)<�;����
-+t7)�+�O�!Jm���31�;����	��k���i���e�����&��^��d�!F���
�#��7޸���^>H����G���ԧ�:�.:~������^���M�+�+]�pS[>4�xb��;_ɧ��D��+8�|T(k���L;��5}4*�me�H������J�ku��FP�G̩9
�k��M��p����j�t (
-+u��o�a���᪣ӵ�8a�Ԧ.x+O��o]����~�m|��Fy�%|�qM>��@nѿ�;"�˷���K�^�?��x��N���Z��H�6���|e����<������vi>;�W�p��1~|5�����M��e߰�-bj!�Rn!�Y>]�!t2��y�Zl��щ�*U���1�BC�[0y�P@�� +���������f0��As��}�Wl���H_�8K�҅���Ѓ�4�[,^�My����vI.^���ʺ)o|5�pW>x�C<4�wꨬ\��@�+v��R�]yͯq'%�k>`����n�D_>,��;wR+���Hd,�[�Ӷ�p8�M���=�9������a�o���~���0�w��NP���lW_{mnc��+a4(��:b>���s=��I2�DZ�"?yMg�>�&2r�%G���ө�\��/�Z-(���|
-+ؽ���pf̝_r"�x���?�����6���!��F&���_��m�߾�������&X�v�3�Ù��~�s�۞w{>#з�*:�XF�����Ux�R�DerH[r!�9��g���,Nm���X��+�p]��T7!��|I�\4�\�5_˜q��<�4nx��@�(���iY�B�f�����Ӈ�ۯ}��ѩ��k��ʈ��v3Wv�گ,y����Ѝ�$7�y���?�i>7o
L7u�=�Ǿ'�~�/+�u#����m�P�\L*�ȵR����԰�hЙ'mj�u�
2O�0���Wj;]�Se�j�Yp>jL�v�+�՗����i]�[�4�s	t�W��>j����_���i>mw+�@|��.��i���T���o���#�{�ڞE��e��� ���ƛo=���)��4'����x����`@�Ҫ�4<�|n���?o��O"e�"��
-+��޺��T���q7
�֓}��Lg�^T�cU�ݫ�'��\T�8�G����6�]>�Sq�L/>�����I_::��3��+<h6��׵1F�Q�'�R���ښ��}8d�3��e^���!���4w���D�
�G��+aj��ԧ
-+H_ct=ɷ4�V��!H�3���?8bj��u����9I�\2�5'R����f,"�`��v��#>΂rYc`��uc�<4�x}�9`@-��v?+�>���貉jnё^k�#�<���|�R4���G=Z|�r��ۯ��O�+$|�,���N�p5/8�<�K'�Z�yu�:��TH��ݾ�{�F�v� 
���{[`)Kl}���X^s1�����tq@�UK��ä�������q���T�7����[+6����A(�Y*�1nN�Aoh��I���N�`N�MW�&��=�jhV��G.��D�v:<0�Q��v^������}�)p�0�,��7w+��������5�Ӯ�8�g�Xl1g��C0����XD��D�� +�0ե�	25n�t����]�
-+z�e.A+�T������O^�Ћ��1ǠAS�4f��LJ���7���-+�r�Gp�C��t�']9l��#9�je�[��YgU�+O+�Čr�ӝ�+���
9M�"3�ƻ�0�ࡌRh�ٚ�,&�
-+WC�d���o�aU#D\K��_����Y(bu�c��|�������?Lj����ض���

F����O}�`\��Kz-Q�4�����+���[�
-+ U7��w��'OX���}a�W��׼�=c��o�,�ٳ�8[s-�9P{��7h�-�i����j�3@@�M}�ALt�ϷYiN���]�[�����Av#�^r�Ʒ�"��
d�/��Z�৳.����!��a.ԄQ�ތ"qi�X��	*<�s�(Ȫ��2�%|�?e�[�Gi�������m���'�N}e�_Bˊ~�"����C���Zs�G���A<ȃx�+�5�Cb欯��X�z!M&����Z��+�c��f=��9�Hs΋(�+��BBU��'���ꢻn.x�������.袠�HH���JB��L�c;�m�s<�lI�d�����u����>9&�����Y�y���gzϱZ�R�+�'���6uG��E��Af�o���b_����m���w.";r�_>��ι`�;���Qϓ�y%��YֶT=�Od���F.-k�$&z:][�EU���3�6e�,tH|T%�;��{�q�.��p��$԰��+l|�/���i�D�9�j+Mp��=î_	�3 ��ߦ��0=���Yl���v\��#��a�=���|�U��%�j�{&�1���`EGF
�n��%�/����s�LB�$���L�ASG7�z[b ��Ŗ�C��^;��A��Jb.�Ǡ��*^��k�^�	�
h@
-+���'�o�ɟ�^��WC�
�8����RH�������}�o5���=zW+�s
:�kk�!�q'3d	��۲Z�"��?��+<O�ٿ����ݗ/-n��i��cSɠIP��wo_Ԡs��'���td�կ{���w��|p��e�-�t�
|�������6����W��K���=��G ��'@\��u�@"eB�N��?��2|�k0�M�BY7�`�țB�叁��Wҋ�����W��	�Y#��aZ�W�j���Aj��~S�"�r�vm��g����b�F�61��3v��tH?O�8�"���W��޶Mv�)]O���-�Hw���R��Μ�F6+f�L���6�'��S�įĹ�G!��Z��KAW4Z�!L��K+�0��$�%b�f<��	��b��s�!۩8�d^J����^�l�&i�m�F�_T���v0���@+(����c5��?B�^���T
�g�+�������L�b���:O���S9++��>�+Vg��Oq�vgKr����;��i�h���f$f|F�_�%�/������o������k�cl�x����`������>= x�Y�d�g
���Ǘ駂1�RO�o��^�r�������m����X��b��
4k�\�Hi�0:Fj=�f�3r�v�'�Љ���׃	��"k�{�
�:%���ק��>@T�'��F6)9�ī�9LO�
-+@�5xjDx�ݺe�s�_�;Bd�?���=Ƿ��Q-�:���Jց���l�~��`��*��:1��J��� @�Z��#dh\��\��~�ʄ��'��+�����#0ܢY?�ێ�\��}�ةz�x�g	�T6||d=��#�M(�t<�丰J|�w�mh�Q�֋���/�Y�RN�0�^yYZeA���6Ra���<N2�I��Y^�+^I��j("�#R k�H��p�E�X3$[�4���}��`�uP��0�`�ї���|�?l30��/y��G�#Gx~�T8Ql���h����+%}�R������ΕM��m�-��.�I.]ư�?tv]�g����7Ӯ={‵c,8�-�8�!x�mߞ����� ߭" ����/ټ~ڡ� ��������Zy��Y׷��ْc7�0E]) 6��y�mR
���8���}0A�&��Z�ƀ}n��Q
Z�+Q�0�
I��vD,?��ʏe1ɇV�l�`��e��c�Z���9W�dA�t=��/ғ���J�N[wl��愙hؤt��٭��G��J

�j�gO�b�`nS�/:Bˮ7H�4sM����+��ء�"B�*E����3SMb��mT��%6�/��((���Ùm;vN?������qǬm�$��lc��I�9�+߸I��SI�v�v+���^+�oĕ
-+���;ԙ��E/1�O��l(rdž^���DA��j�hK��)
�ne�FP�M��-��l�uC�!R�y�)+>x�%b��a���S�X��`"�℀Y<�����ߦ�������R�%r�m·�Q)(ܼ��+Z�bp+��J���0�-���A���oq��+�5�ªa�f�\�؁����Z���zכ�2��/�-װ�2�I��+�)G�%-�����2�F�
U->��q�������1m�B�(Pfv��
���0F!�* �WJ�gZ����%8kZ��dX�0�k��,���+�5�m���Eu>��
H��ƿ�4��7�7W���@�D1�">��>\r��nI,�D�+�de�}_���3ghE��c�
����G?�48f�W<�<�(FG���BG0���}�����Gf�L=`ӡ��7fu�,<_㓂�Z��2���!W�mJ�:�_����}̀"�H{�U�%ne�2ˠ����3
�*Z͓��!\���,��a������о�����<�@q�ܓ��6o��W��GX�i�z�����cj�=n(�y��\2�II��Һz�z���?6�+I2���u�	]DU�����[��U(�Y�{KJ���y�O��=�u�y]� )�_С`\4;n^��������N_�Y_F��MM��¤K6�?m�Ci(�jD&r&��Ad�[���!�V���T�yY�;�j�`n�L�aB ~+	G6+>��+fAT�/ݞE�.�땝�8�h�e�y�Ah\��F��+�
-+�I�<�mv��=�� a+��`�b/�K�_v�*���%�e�s�E�t�@@��
6ʝ�U�4.�l�s�����e��&>P�٥�Vh[��b�]/�Յ�:bmr�g�����=��n��V���*���>�Bt�E�SJgs
-+�� �����I��t���_��CǏ?@�u�
G�+v��S6������謴0���h��YƄ�q1�cƶ삕�\E_\�]�҃�c�=�l�e��G��"�?����Ut�ө�mC�.��
'�����d"�R�蜯�3���v+������M��f��}�8��2�4�aZ�:������V���G+:?.
-+Py����cGO�u+MǑ�~�`4�˙�I�p��s<غy㴃W���<���󦧏�������	�p��a���J��G����\�A�vd�� š��B���}&ڪ��C���K���m�|SRc�x�(�c΍?��3z{�G�����Οxǔ���S�F�?o�~���g�OG\������nrqe���ϕ��j�u�0Q�3PO�x���E���m
���0)SL�Υ:����Vl��R����/QГ}ګ届K1L3d;���,9��do�V��N�
8��?���؛�)���%�e������ǒd|�:L�9��}$�r�q/���L3�8
-+h��UoE��N��^��uۈ����!�6�E�:�������Za�к��VU8�un�y����?��~ze[��x�۷��(9p�v�M춄5��hY�}Ɯ���@
-+�
-+z{o�"�����v�F���m{��XC��2�edzܿ��U�?[h�������D&�q$�5��zq����FOcmL��D��O��m&T�S��-c�S6��9�;�;���΍��v(ݨsE�-ê�hc�g�Rn�
i8�Wac�����`�]猪�tZ�ء%#2��
;�uP.;�Q�%�9P�8��"\g+��C1$r����;bՁ
��q���K_r��Ϣ�3t����%���_�����u�}R��C��'��]�ї����AR-���f�Rr�>H����C:�q�:��
-+]�A�F�Z.�E�>��ȋ����E�x
-+G�b�}���p	n��Ƅa�('��M�z�]J]��/��Jv~��hk�Jip�[��jn�+Ѝ�"} �d�g��������Ж��B��ֆm��%�V�8�U0�(���G܊A��\��	9$p�do�J�E�&�e�)��1D7Y���p�ݦJ�Bv¶�nܴQ�����=�m�.߼aک˚�_�5(��u׃�۲1��	�c�a?F&����%98,�ZJ+Bo�i0��6m�d!��DŽ^1��/���B��q鏘�ul˰y�uI�g�����5��t��r])٦<r��8�M��'r^gۮa	�1��%~pA�z2F����2iY�,zǓm�pH;Xh�a�p��v���+�2n7>B�3R^�Y�?#z@���90ea{�M���w��.��Ӯ�lPߧ�1Ltqg�pl��ô`�Q�r�#���[M~����Qqt��r���cU�2Àe���M1=V�r���[�vh!k��}��?d�*���4o6?,�:x�д__���}U�ҋ/�֯��m�J`ݴQ�tvC��< y�U2����l�3��YOL��ɛ�ꏢ �R�ć�}��v	�+��IЭۦk��^��>4=��c�6��"��
:�"6��Wo�IgsONW\z�� ��n��
-+��`���l@�aO�S��iL{-X�US�/��$����6���0����(��E��/��SciټE{�6*s؋M�'Z��� ��$���|���7��m�X��9.��O��7�y����u�}�D�J�^�����2�����X\5E����P.��/�m�>�����O�?�~������������R\@S��>���C�{���;�ݻvL���[k�J�v��ο�����6���wc!W+�G�҅���u�f�/�Uo���K_6�ؽ{z��&�l�T��4\h������������?]z�ų?|oХܭʉ+ .�9��T�!�kڗ/�5�V��
�ر�1`϶+�r��d�|i£�+�9`�D9[�H_���qi�����k����ַ
�
-+�^A�典�{�ĴO�:~���ګ_��h̲0?mb`����4ۢ����ϕ����	��]-��v}Y�W�×�G��%%�M�B!�S+ �K���+_�C����}�Β=�n{�)t��iZՈ��Y�q�vǏ]6�_�5��L���7��~ܗV����7��=2����秿��ǧ�(�Gc�9:̊G�)R��N�?���z�p���k^�7�1P��Z2��YDҧ8C�,\����ڿDе��`��H�'ӹ��}������K��VO��|��鄯`�O��i�G����7�9=���%_8mܸ�]*.=�	����:m�],��U�=����Ш��Hh-��%-�����J������)2��V�}��=�َ��G�ϢTH�Up	��j7�|t���`%�G�������-�M;��׾NWpx+d�.��)ȥV��x�-{����&}�r����X�^a��m�Gu�98�s1��&��?��1�?ن���+���Э���!+۰�V�7+�ic��R��`�%[�kY�*�0��G<�Fy�/�
+�]���
%&k�\1Nڶ`�1��Ӱs5��f
�;���G?��_���k+m�!l�f�S

�!���~fگ˷�y���-��K�^t2_n\��9��1!j��V�5�P�ƈ�:�����K}G�qZZ����`WzHr���̡��'��ـvZ�E��
/3�	�tk���g����$��
-+�bޢ�2��v�q)ך`��$SQ����glןs�X"-��mVˆ�R�iK�ʓ�����!ly�x��!��n�.+֊��R��zw0[X�<_`�s���pT����-?2��t�C}q=��U�:��-cy�dĂ�<��?D&\n7iR喔(L�+�����j�2-��e�7^�u�,�]�����]:�ԋ��>�A=[��cU<@J��;��jAT��p����	�F���(�1<T�PvpTv�7g�m�d�Y��2�/��l��J����x�9����Z�s2sX��֐߷o�'t��sb����ׂ�U��ˋ���+��x7zA���U�i��A
-+�w��"����@�i�N
��g�hS���bCc����l�NkM�n�g���W5�IQ���M1��Wn����|V����1��){5�ǂ�k���Sx8�O���+_�˥��>�\��{9��b������������V>K�0�&~T��<A	z�"���\gH6b;�O��K� �W�|����/��Հcz�e!�X	������嗿~#I���w�r���7g���+O!0U����"]&����<Y�����T=��eW� ��{��{�NG�>H����U�"}�CÅ�\��o�F�N�HgV�;�[U�ܵ_�?�F���YxE��o|��u;����xőJ">E���b�t�et�m�k�M���e=����k9|T��{}�Kk�^�#c?T��۱���q`���w쟮{�˧-��}�%6ۉ��(�-o�L �6
I;�/�*d(BG���6��|�Ŵm`Ʀl�b��
b��"+�Hs݊��g��:����}������1��!ʍ��Gl:G:3�&��u�J���.R�D$	�dV[Q?��"$��E3Px�9��R���q��>-![�֩>|,�M����W�A�#�c�����\�E�����)�=����Ӗ͛��tp��N��ت	f�/?������J��%�Ρgo}N��f�����6�@lj�(X���`�6��d�X
-+��-S &�M��Do���䀩mzF�Ư�O�g|�SdT�"�eW�ķm�c��O��0M�ֶR�n��� YL(�>D��'%de�8�Ưh8�~�_��&�!�R:3^���-ö���c�'�;�w	�5��_�_���Y�����R��Lۆ�]7xCĩ��R�+�p��P��~���V8m�
��l�FDo�e�R��?�~���=�K�/`�u�#����'��w�6����"nZl����~f]�L'4¦�O��GyD�@)��0�^�ڂT�Dc�z�ꞟ��I��
-+�3��P�;HAp��
G���En�ҝ�M��
/s��€D
���`
-+��ĥ?��m3qyB+܄ae{��f��� �:ڱ
)��Xw\
�3�����������r"�6�Lj�e��D�^��Co�Q������=�����<��Gq��[L&,e�u=�׿aڠ7��8���E1�-�	�9H�F&}MN
-+��o=:o}��<���@s1�ۊ,
+m0�	�ݔ�*3�%|�*���:O|��^�K�W�g�_�����ZW�r-/�e�Nx�X�X��+���}�.����?�#�5�	NI;6�q�y�~v���S�5Q��֝�`{��
-+j?�S��f�Ҝ8�,Գo}`���^��d�:@[N���"��ݳBB���Lڷl�#�Wx.d��xܽ���9 1)(b/NE89�߸qڭ+2efE�'t�V�r0�+=�L���d�I<�L����Q��7n�Y?M|<�UHXY����uٯ}��W���ӹ\ͩ�'���}�w����~�s�Ӈ���S)k�D�����8���Q��/Nwv5a���lZ�b��:ȯU�m8SiۧӉd�c��תi�\�m��u��Z��IlB䂓�ծ
-+:u�Ɓ�e��ê������"2W+R�zb���n�'�lH��N�k
L��S��]��8�è'A��A!u?Od��+w�~���.��%���R�c�'�җ_�=�7r>}���bقƳ	��ԁӛ����)�@���]��R{l�
���<� �Ω��/���G��[�g$�+g�ڣ#<���K=ěZ
�4�+%؃���+����S?�e�{
L
-+��q�^�\�r�~�CCWU��Dq�lM�Hހ}\�/�י����9z2��!}m������mi�a1
��f+�?����g�5if��r��	��e������"&��.��IO:L�R�)��
q�Qg ��ٝ�O#����Y�v�E�|��1n�P�w�چ���B{��DX2>�O[z+��k�r
�-`1�%�p�-�\�qW��� <�p �.�{��
-+�}��ܷ]��ZF�ƙ�$���9݂A����:��}+��}ޮ��i�ٷ�-��q68h�*;��kU
W/2��+�>�+J�	�c����s�&S~R�Kr��<R�A�7ڟ:�	x�AO������	�Z�����z?�x��G՗��.��P1�D+����u���|��_�?�)i����r�;����p[�ek�^bu�?,C�<�+<;t+��
@'����������ܬ�}��6�����!�{�<�+^ف�3u8����j�"�vgY��tu0:s 8
�gg5�[��Nv������M�}5`E"�����q>��ӓO���M�y��
�|@�3pm������l'����}��W�H|����x�.ggr &���48�7��g�F���%쐓����-�����c�\��f�Ro����e�[��y>p�ȓ���D-$��a-�>��t�#�w�'o�p�q�u�O����}z��u �ߋ���P�CÖX@��$��O�'u��a����~oz��?2}K_�;������&�:��X?������h�����+Xp �4ma�9`������h�Р��w}�u��Jp��jT9OY�̂�}+rv

+�C���׾�
Dž�E�������m��Ұ�,`p�m~(T����
-٦�h箷���ڈc!%������=h��#^�^�&�Ĵ�瀞#ܶI8}$
����?s����O�Uр�ݒ7��]��%ݺ�.���~˟{�UWmy�k^�4
-+���	lP��߬��)���ٷ)�qκ!8r�m�
-+yK��6Ef�o�=�b�X��[|Şc)Yt���e9�Qw��œ|��c�>2=����}8��^@��y���կ�~ڨ���`t���{&{^�ܡ���р��c&�6ɗ�xB�ǀ�]���7�������2
��Y+ՔΌ��o�K�s�Y��+�\�M��y�������p\�c��x��1}p�s����W�4h�K_�{���^1��w"�9�g51`��H��PG]�81�1.���}�L��S)v	��8ǿ�;;v��O�L�<=��vT>�+�0��|[D�E��m^��{ǎ醯�O�[N+��ƁZ���2}�i���ꇉ����:�sy��G��������ҪDV@Ӥ���ʗ����ɸ�pn7�ȟ┓nE�
�h闊��[����߯�����\S�#�1px�W���5z��aP�+�E�@��������N2)�^��e������}f;X��'q%N��E�sο�TYS
��e��E�B� ��@���A?�&c]�ʫ���3ߡx"��]7�<ٟCپ�؋����6q�N�
�n����goC�7ٻ�E*a��)D��N�����A8�3������˧�]���wT�d��k�� p�m�w����é�E����q�G�<JW?��)?�&_�c۶b3&t�t��� A?�Ļ��o����y~��o�c>{5�
|��q|������n^uw��\�-)��/�����+H�Rؼys1y��Y�x{��ko�a��	|AL�(�y8��G��8�
-+X�����2���n�����$�ʐd�]�a%��/����W;?s%?�3��wg�N��{0��^�„&M����/�5\}2x9���+M>Ea顫,�$���y+�t����0SY��2�c3̯j���v�+ij_�S�!��d��@�T<��`��b��ك�O7m��>b
��Q�Y6Z8�Ϟ3�x�@)]yQ+0���&U-%��������U]\���u��[�Է�о⤰
��ڵO&�%�o߾��?��?��ӂod�O+�A�����
��9d��I�� D��!�w�J���@&M�a>�XEd�}|��_�{���I# u����M��V��|4���0M#�~x7=�u?��s��4��?'f{�i]�d���L��yH��}ȃ�aK
-+��!��4Yeh��'?�Lq)�A�$wޚ5��{l��+ht�x,ߩ�Ӈ�W,�[0��`�$�m!�dH89���{���zOGC��h�<��%Mb	/��2�Mr��A3ēD�n�M��#S�ɗ�ү��^峏�޲v��,�~$�@6�b��I_lk��󨲂�VqUm�^R�&qm�ŝ��VZ)kI;n�Dm+'v+��g��&�KP���
-+.7Z��<��9�����7@���,'�~�Iw�7+�;�m�������yU�"OeSE3���B݈Vy��OI�p��…�s�l���|lgϞ�K��hե4��A4]@��`|	2-��G?�I��ۅ��7�7��^�x��W�uϿ�'#�2�!D-ɦd�[�LD��*!�'��X�����c3�7U"��cNȠz+ߩ��ɃM���m����W4�쬿.�*ۮ~����+0h��n=��+�oܸ��.����?G��������ۉ���*���Um������?��Ԁ�L��H�Ԁ�g��=�`�
��|@�,v,1���Ò9�4c�(F:�	��꘮/�/�R*�k�
���P�Fxe?���V{|͜=����T����$w�ϲ�B�عN�%H	�}.o��gb�_�Dʓl���oVᄅ�[S$�M_���_H�����̼v����1��ƽ
[7U��mW>/���/��l㋍�
-+�P���6��S[(�j�	/����FC;�g��x�b7���`;��\�3N�H@9^�p&�#��o�X��f�_zYq�%���1�u�y���W�uH)H�I*�LSa����A�M$G�b��"+y��!����z~��2�7��F��s�3�ʌiӊx��tA�瀵�4ʎ8Ӓh.��8�߆�Om��;
���v�
���)���+���,?��{�D�[��W��]X�}�w_��)�6#^�]U�����1i�ȡ�$Fܘ�C����;���ۛ�O)����[����
-+"S��[���O��w=͆+���kD�����[�>v�k��w�L����++��"l������Sq��:�1t�ԙ��8��Dc���P��^

"/�Ae9J���
o��Zt�nB�)�K:�l!l
-+��U��9�kŪS�
/�X��E3�"N��u��d�^���7_d��S��$�\��j��ΣzW���򪩼�\,��/,�d�a
I0��)7
~&
�4L��"�a�9�`��'���+xyo�mI ��~��S'����X
�K��;z��+&�bH�?h��AyvB����yI��n�c�dld���\>B����{���|�T}XA	i�luaP�h��y�!~ⶸcA�3�\�w�~^Z�7��
�<�g;��"x�s_�
��J�@�E3�`Ǧ�+V�,���늩�*R*�����m�oYaB��	�GG6�Sۨ�d�]nI�Wg����EG�&tܤ)��?g��c��1�``4���n����c��A.�y�Ÿ/�4�]� ����
`-����.!g����-[ƾ���~G(���7�E�(�*�9U��/�G\�Q���t'y���1@�tY�IX�NM�z.S1���P8��#x.������u�vIͅ�A�P�o����w�e.'� ����hן��)��]�{(�ɩf���m�[��m�k���V,2��y�93��p�iR)P�3!���>_�L�ʷ��i ���E��S��%撊<fc&�HcL��K+Px��f�Uj����L![�D�#|FnNu�?B杋�
�lΜ9��1Gx�v���x�'H�����W#u��م��)V���*W%�Cw	��>@�#�_��z���
6ј���=w��a��4|G�`�B4X�ols�����V��d�ܚ&�1����GΟ�s���_y������[�����������}�-����t�MY�*
-+y,/5
-+��ҟ�MELvY��)��)e��l-�a��B�ٴk
%Ȱ�6y(��o�
q��>Q��ul�Ҏ�O���a��pP$dP$�`u��"�%�J�%����}Y���?�'}|��o�<�L�6?���,=��k�Ɔ�]hW��؈��s־?wpzl
-+�+�10g��u��y����ViM�z��i�s����Gq�]XXds�3�4N@����%�ȅ_7�Eش!�1"yb�P�k�����i��Fa��Փ�:�ˢ�&\��!�*C�|?���}+�'�mr�G�T����ON���+=ɮ��RI�_���V���}&��/x��A�Xi��4�#�O���S�1���1�j�J��
�k�uk�M\��ROu��)����"�[�i�`t22�����r��|����ʻU<�]�lYq��p~�`�{���.n
-+���I���y��>R�.�ETL�r�j^.�^��(��>�\�)�m�/��E��'�Y�s�*��]��+�,.����w�=�bqc�"<�E|��E��2�8��/��D��󳾫N?��ѥW]U,[q�����Z]�\�JPy���tMyi�7��W�t^�J����wKݮX��=��_q����5������,��o��
�/�فz�Mg��1�pE#���9�P��iB]
 �g��'N�6�|\�����2�1`E��Z؏���b���g�NG
-+�N4��6�:?�s�L�k�m�W/ߚߤ3���1�xn�?�|~�}7�ރ3��xM��ɷ���v72�R��?�'~�pq�?�	?�ᄪ�UW^Q��n��+���F��<����n��x��|~z��D0y��'���zg�r�SB� ����5r����
-+����M��ׯ^��-Z��5�oi^��=�O����
y��Ǜ��A{��K/�8
m��?�~� nh�b�����]3:�Fd��&�H�+!�V�T;X��+�0*(i-̉_F1_8!͆��VM��&箪Vjd���Pw�~μ�'ȼ��w�}7q�
�}�.��vYC'��C�"���yO���inT�+���ߤ#�d[�'KZ�E�b��Q^��p�q\	�!�O�{��W�c��l�O
!�e�p_����>�+������o�}�z��m�.nvn/��s�{q��>�xio�{4��Y{�!�i��L>%��T3i�b¤���댙����Yv�*߅1_��G��1S���5���Y0�ek�m
-+���h.�~�~R��!Xc�F�O��� Y��F�eE��|͖��0�?vL��o�L�;��Y���Z�DV�kP��*-q҆LhӛO�}tL�!5�ɑt���I��w�}��/���Kw�瀫���	[� �,#��󦑥���������z�es���z	��C���s��b p�y�n�"��
]�c1�N�+D��R����U~)�卄��{�E�+���E8��*H��
-+����yf�C�C0eՀ�#>WH��I{���3};
�4��w��C6�0+Y�
INּ��)vS�|�7�M���R�nS��(���I�'�m���vI���)RK�_6lje��@����JÔG�R��52�����G��<�=��=�������o���{������
�o���	�Ւ@�V��9���%��tt�pA�m��W��ܦM��X�Q�vKq�M�ͣm 1j��r���L�L�T��%��|fP~b0~R��f6Pw�4!�1'��F�e�zZ>��J�����K0�*�3+��.ߘQ� ��?A�3y�]�F�cQ��.�U�?38��dUr����ܞb26+�'�F~����&M�
-+!A��Z���Gg���>�7x����s�|i?!��$hx�=�%D���[��ɵ�Pg�[�Y��>BD�/a�ŲM�#-�eH�|BD�I�p�DVɏ�R�|˹�h�-\c ���p�?�Tq�e�p��u��P�+<��,t/?ğ�����O	,��o~��������FqE�����jA6r�$�A�P�WyI#>
�ݮ�3��^�
-+鶁
��u�$��)��{I��O
�`떜�E68����K�,!U����3�%4�L��ŞJ����I7��� �����1?'��������;߸�j��Ħ��g�����������}�M�澬=r����_�
/�������}���}����jU��_��b:.ῴ�OR�OV�ɜ��_
Z��e|g��%�e�F��{['z��������N��F�3њ���u]t���M=�|~盃���	�3+0���M�:,;�
*��ѐ�n0�!n����)�I��V�I���I���ouEiM#��+O=�Xv��V�𔗁0��?�]�Of�E7|~�0\�6>�3�C��O>�L�Ӈ	UU�l�'�rjq��ӌ��4�6����K:?�:ـQl��ځ:�Wnj��H��X�DSzH���
�����
�(Mp��>��%H0�DHM<*�����*v<Xd>A�-^�/�+�%��w05�\-������G}A������|���;x�����b�N��o}&UL>��-.��m��%K�.7��ׇ��6�z�p����S��?�����s�sr~���Q�K��k������u����P�����+!�M�m���#�&Ǎ�ɔ-Nj�z����>
���hq��K/�w񫡭A}��a'�v��]��z�o�h��;o�&�����p�֒)�������y��_�����/�9�͗]��F����������3�y�����dO�b�"�G�G����'?�ɿ��gy��D-�Z���&�=Q�+���H�[�@kz��A�yP!Ո&���ݲ$��CcQ4�l�J�>�n��)
��8���whŘ-�Q�p�I_�'� q�-+A�+!�*��~��O�,Z��xo��лi�Q��P���^+��ӵK�,6���[AV�� q�u(՟�?����I���磏w�{Ѳα��1�0a����|�}��h�l���P��7�j ���h�	#��-����_��U*�B�W��nx�O}G�)�Z��昋1�����?����C�x�_��{-��Z�	X3���6��p�+\��w�nD�Y^ef��l�^t����ɲ�@�@�*���
-+�uj�*�vX
-+Qْ�I&p[���f���)RR�^�"l
-+(g!��,q!d.�������M��ϯ+��&���Y~|�u�⅋����7�)���{�s+~��'�SO9��>u*���8��.vnT�	�x���
���M_��ˌR�������U���?X}Y�T��O����˿RL�>ݫh���I���6��-A���q]I�#
G�u����o��ӧܹS0��qp7�/�D
��>$�Á���g��=���0�nG�Bߴ�3OQF��F��݆�A8a�Հ=����������X�I�:P�K��);P!?��� S�H<���`�	�&�@!��ij�M^2�,�c�2S6�I��DZ�����) >ew�wԟ���2mZ�~�s���	�l����>�>�M+�q@k���Ig��O\���[�n�{��ޫ���u.ˆS`SP��{
����+�, ˬ�&7Bf�&FAc�Ae	-�`"M�T˜��(&�"�M~d'� h�N��(hyPYBDK&�H'����/,���]l|�uS//�yni�������a�|ٲb��Y����́��ﳫ
�bHD��-� �<�5g��
�����M�Kz�y����p���=�O�>S��8���0���g��*1���U�ђ	&�фːè��EA�*�$�-!^)���(hyPYBDK&�Hí�K����|�:7��ƀ�\#t9�9<�(�����g^x������Q�1Ǚ�q��Vׇ�uo����6J�C��{�[�2q�…kR߼é�5u���l3_��Y�-Ә7+q$"��)���Y@�k�j����
c�r/_O�/��rZK�d��L��$��H4}�&y1I�t����[䛒� �à�Kqs�k�]|Wx�lm� +F7�����G�żY3��-�z3�
w}��u��AKHa%�Sd|�O�#~���lDXZ��?-n��
�q����`�.;���kގ4�=� �Q�	I6���%XS���s_g�&����IW2"&��� �Mq��*N�y�o����\�4��	:��1����
��hz���;]�g�#��0\7+�
��[
����A�ŇNU]I�~�vbR� C��i7K{	w��t��� ���X���u{T�Sn�h�ǁ�w�x��(i�a8��ڗ���y��s�T��!��Z�	݇�Y1�?	�=�8y�s����Sӥy>�B/��rI�ks��e>�z�����τbb���Z����?�i�,���ic��~�=M��&\:�b֜�ŵ����)S�}����5�����C��i#m���O��q��p���}q�z���G�G�E�Y�ng���!%qL�06+�N̜8־J8W��>������^cc��x�G�B̏�^��vd�����̘5g�(��n�F�4�����_�sĕ?��O���~?�)�E=�M�9m����?�я�>���x	n +�v�	j�ۺm[��C�cB;���q�����wn�B!�3��
˟�8i�y�����_%l
-+[�6����Q��[n�'���~��J��MP��\���ޏ���#P���ʾ��e\F%���}܍����7î�{�8�ǯ}�k�x�7�27!v��_�:�h��!҆
�<ʇ��f��@Ȩ���1�U}|]��"\����w/^ܸ	h]������g�N-^���f?�t^@)@��{������5�V��uk�,��j����k���?�s���{߸�؎��T8U�h��.0���-�=���/*-\���2��`��7l(~|�=œxC�=qP�r$�Y�w�gƬ��;�{_1}����k�jL�+V��^��N�ۯ�?��t����%d���S�c���8�`9�IA%*au��q��w�v�)��Ն�s�T��Tw_s�5�
���
-+7+']1n��"�� H�/��++R���
���ua5Yi3C��r����Q�9ɣ���9`婧p�ߞ���0]Ð {���7�F���
-+����z�x ���WL�>
7NrY�B�)����(��G-��m8뿳xc�F�Kj�RVBj�&���/Y����_~�����������k�O��ҳp�_W�Hgd�x�|+�c��~��~�3�4|ӧ~���+�ӈ҂��1��{�g6��]���姀Rf+Mʱs��)L�-���1�<h�lМ(e2�O
����OΤ�f�v@/�z�"9�0�q^ח�'3]��"�Z\[�E$=Ⴙ|�/�j\� �e��j
-+�E3^;��p�C���� ~@�_(p�rUׁb��W��k9�o��oa�N3����2���/_W�Xy�����D
-+*&�kw)��0���C}Œ�>�kS��i�{�ͷ�~ۅG�>�������N���7Az>?�O������"#q�z)h��5/	��5��˗/�y�g^T
-+J�;����v��Ve����}�i�b['��֔/���*�C	#����$g�����A M��u��	S0�D����t˗X�?�f��0��L�-�Yg�p)~�&ް��0�F<��֜]\��w3g��v��������W�e���Yx_�����@t:Q��sD3�|Ѿ��o�ӿ�˿܇�+�\��
@���j�$M��	�:FN��)�uS���'��Ӽ]�<�f�;˖-{˱p�
<[������ t-M
-+�%��)t�0ȟ��2r���TE� ��zg
-+�\_��.��V>�2����o��3y������s�]�ߊw[u�ޗ�W"odkm1u�uW}fUQ̞;���k��K�Z?&9o��w�It	+�,�������#�_�������y��T��wm��b|�W���3=�++�;uP�R�<\	؊�� R��w.�|>i�
-+A�SA`(�I�M�΂�O:�*�"V�V�'_eO�{>�#�_B�����:�s[*}��wn��c��.*�8�<;+�9{�5�n<=����D%��=�o\c���U.]V�����%o��8����2!~���
[�����?���נ����O�/j.$��Nm�'y"����|�����~�韁�����*?.��|��':b#,ذauʫc}
DA]	�v ^ ��o��oށ�����c'd:�+���GJ��n���_g]o㪾U/8��`�}�c�/�����!t�g�7+�iཬj��4i��O�{_~������_t�E�
�'���������@7����4��执�e��e+}.�/�;N���L��W�ڍ)�"�e�i�W�#�x��r*#2�W��=�k�*��^���9�o��������?��?|��o|+�"Ph�YdDZ)b9R����O��l�'��ԫ�������_Bw��"2S74�~-H	�	#�҃�Q��g��3�ſ�� M�i�&����?�h^����v�+���P8a�pʯ�(0S�%K�����|�i�.�[0[�Y�f?�����K��/��t�0K���ş���>t����1���(ƛ�ف�Mx�Ǿ�;��;7C��u�_ӂiq����GKڨ�zF{���z�4a��(Ũ�
�7y„	��t�M��dɒKQ���'�O��@�$�9�;gь�eE
U�\XSZ�6�hD�s.(Ԅ��d!C��F���<���Z�n����տ������:�3\�?�g�6l�/_���0_���ǩP�
Am+�F��xr<>#��k�&�ezX���=_�*f�`�{�q��"��!�7��O�����di{�A���֚��D$s�[��B�K��W��¼~��{_�s�-��3p��X�Dڸst	'<Ұm۶�����}��7�x��#r
��}���o+P��GU��;IN��)��!}�
�A�A��K�Qq���~;��O���}����u�|��i�M��9� �pT�����Z#H�^]�+�p�+M���w���W.���KСǩcW"+Ly&0
���|������;m@�&qRH��U~F��P�0KRG	�
u���.�p�a�"Iqr����0���l!�@�P�Z*�'�k�G�^�S���c{ʿ�|nM����z��~P�J^�g�WL~��1�S����A�~a�ӆ��X#O���������կ~����G�b�E^g�1-��EęfT��h��6+�1�Dk�4<N�ϟ��'ړ�\䵨j�i�Ҹ���� z��Ӱ��D�e�D���������u�Y;W�\�&�j0F�I�@h��A9cf�$��
>�h����f�MW4��G\��S�*)�m���)-��?L
$'�ze�싥��vBY-����7�_�I>���V��KY�E����k����Px-����y��j�޿_��ӭ��'8~�'K_��?�� �8b����	�v(n+����O>y����]�"r����t\��ňd�&�
�m+���Y�ׯ��u�]��ߟg�T��=.�M7��P��ň��	{��8����< _*r!'��+����9�1ظ	�x�W��A
��GJ�l��c!&
~Vx;��bA��ȉ�4�0^���c�i�M��N&�hbp�j�F����n��`���)|�k��|Ѿ���-�s6A��)���)�
ᡛ<�/����q�>PҲ��r�+�m�2�3�a�KB^��1��xH����Sz�zI�Ab2�꟩T	"O��O!��2�3�!��?
?��Cӂ=��#�i��u�]_����훐��t��z-�JG�<���[�ጣz������
o�Gz�������3�<s�U������2�
��m�� ��-^„p�&C�֔|ɴ�����ĥ�F���l&�i�K<��/\�YekQ7}`d9�%L�p�(�!�#�� �P{����^��w?X�a�P���?����ۋ���rS}��n��_?����
<�ϟ�����E_P+����M7}����mЩ��6��k��b!
o���������+��7-�
-+�6T�đ��h�7.B=��#Iu�a�e!�7.��D[l���'�����>��@�Y�Ḇ$J���=�����?��v��bn`
����b�����>$/��W��0r[�Fe��?z�|J;���4��
}�ȑ��_�W�&��SRlrG�Gr��8���"+�-ڞU�Q�4p��S$$�	�.zi�� 
��?�
V�ŶaC*�8��N�"����?u)�Fϱ��E���8`[L��?K��9S���e��{��r���O���ӟ���%$�#R��u҇L�ik1�"]��=4�s� �+v��E��	�E_�=��
�Q�"a�	渉Qu�8��Z��g&��H5z�)�aP�l 
-+v��q��+�2tc�8$]V>1�g2İp�Aa�l���pJ/^6����'N�����&��4F����|G�8����_�L����3��Ư9>��S����f�$�V/�#�e���
�W���f�{���m۶
��E)L��L������Ab�,B�a�"���pb"��`[˓[�xdZi��߿��í�{�
���Yr+_f�!�Ct�m3���4ٛV���x��
�r<�j��Ǐ�}�k~��\���vJa�g�6�[�u��10��e�s��`d�k�Ǚ�J��xԧ���رq�����ܦ.��ys�t{0�d�Hb�.�m�#��3䆤%�ژ�:�$(=�I9��5�	�)�7�#FD�Q+��Jyu�Y_�򗯘;w�z4����2𤩇LC��G'��l���3��=�i�0CT��,R@��W̡��0ߋ`+�+q�†��!�`C=hU�ICbH�)bɺb�5	ՖnGġV����U������4���Y5x�NJ��}4�<
���`x�kژV~B<��_���|�����r&�T��+q��h��?���;w��o��E]�"�
:<xf�?+H���>�81a"�}���7�Ǻ���>�����Y���xL���7�����k�W����c�{��o�������G�"�y�w.��x�_^w�u�G^7��x�!E'p&~b��)'�N	4y`��Q��Oh�
-+�	
wnc1�ę8eă�:�C��AN߇w���!/�xꕯ|����ޙ�X�+�t��6�m��t�[	��g��W<
O�7�@�FZ�'��a]om&��
C���?��1�fD
����c��G��DŽ�D�� w������7��>N�[] ��e������[��9��������)Ә4�1�c�XT'#�0:�{�&v�#�\	�}�Z�%�뭐w��������O�Xl�&�4`b�$9i`����Wf��<1����=/�U
|y�h|6o`r�<���Ŗ���+kð��P�tf^k;{�A���
R�
ݗ�S�暡l�R�m�l���?���\��=0��?����+m�#
��߾}�6}�����[n����$e��L�3�3�[;��_^U�
;�������A���rj�sh���넟G�V�Z:eʔU���'��Moz������v3�v����V��)�=���욌+S{��Kx��5�b�x�	���M���N���*���o�q;~��o>�>�*�oRLR����Zٿ�]]S����О���w�}�S��_����x~Q
-+�66�Nޤ���Ӗ���u6��vc�2ƺ��5�v��.:y�N�(�k|�� �8m��I��>���0y�~@���N'Բ	�]��Lk/���Ԟ�}�g�z�K��'tӢ�o�M	:L��J��3��&��]���?�?�C�+�Kw�4p�k�Ԟ��p�/g���??$}�r�1*۟��2{���پȇ}���-o�S^���[��g�1\&p��5�i���-"�UÐ9���rcp$�eD��X��+
�	�&�2}�/1.�+��(!~*xY�&ث���0X��.+��Ft�.ȣ|�ot�Fn�ó����}��R��T�O�l}��+�
-+���d�����d�o���?��Ơua‡�t
-+�ğ���~��H9�}�{ߙrU�y��m���$"�#	�'ْ�(�=(�;쓟	� �+x�o"��1U�'���+#�����<x�/J�y�����S�}�C:�-oy�es��Y���'}�e�գ��O�@��ݶG�a�	ヲ 849bи�+@�cg@��zL����q	w��f��zO딍w]S�����*�o�[�2�m�;w�|��n���%�?/6�R�N�L�:q��o���i�~���X���F�sʸ�,
nw�A���
Y^�*����͂+�j��W\q����	y�g|��
-+�M��W�}���?��E��B�����O
-+�e�
-+>*�3��WֶM��.�}����;��aS�IrxXpL��O��v2sI�,�Z�;tY̬�2�2=��8�7o�|��7�|���o9�����T�GB։��IuIk,bO��D�3zۇ9Y�@y��5�4����b;x|�T��Њ뮻�s�9��{{{�n��`'`[�,���־Lo�+�����9$�!I�C�F:Ӊ
�v��0��5ȓdA1,�8�\���}�g2lB��1{��,&ac]OO���;��� ���^I蠃L�#�
-+�;�<�֟�����m}k_���,?<<|P^��7�p�==��>���8���1�V
-+�h�
�+#��d�d��;m�,Ek;��ii�!�C ������d����~�1�T�@cKW]�z��9��R�*��k�� _ �hɒ%�uZ��Nֿ�>c�:��O��2뿬?�n���u��봾m���Yl}�R��a�2�=��ַ���}$|$��R����@'w�h��ZOZcЩ"�Z‡��#P�+C�B�<;��yqQK��
�-���#��+.�t�%�2d�'�q���&�
���+6����.KXR�:�_�\�ֿ�/[���־Lo۳|;�������zO<�����w�}�%�o���7�퓢߿/ln·ɘ�M�[�嵍���b�7��+���㏿(�x�ᇑ�d����D�$Kyb+O%j+�|��2�cy�M��@ZcK�w��H0�9xNt�~GZcK�/+�.+X�	��B�,��U�Y6l�'O̗�͓�,���@�'�@�#?+T~<��-����\�d�W��n��^N�w��v���/��˒���3�G��CR�؏H9�
-+n��%K&W���a���x��6y��?b�HS��#p�"�I��#0"��E�[:�C�b�|�r�+ˆ�e4�+�����ϐ�?k.0̜%Wf���N�҇"
�)�x�3O2�~� 8$I{P
-+p�B'�eP��Jb�/p`��݇��3�����!y��aI�%��wx$v$y$|ʘ�EԔ譌I����*�K���_��y�[��G�G@O@'�qo�#����'-M^cж�-ey�
ꁫ�h{K�����b赬*
;,�FC$n�S
9�{��hr`�+m���C1u�[�[Q=mS�u��Iȣ�w�8)�dtR�F=%��'��2к�	�3�A����i�����a��t�ϓAn
c+��Z��u5��)+��i}Oy;�I�%M?���X�I����v����M���ޑ	
���h�(טrb�t�qʷ��h�R8O��
K
-+��)�"_
-+�<��r�EX�,
>OF]�cM���X�2+M[��*2�h�"�����(��?���be�/��'�_��)u�ڦ*m��;x&\�=IL�+:X>�	
{����j��l�k�"%��h�
������k��QO�yt���U�a�����M ��I��G �ԱSEfm,�����g�����:ik�V^ƣn��է��� w�xr"p�&���]�W�;�R�NdZ�u�ezm[D����/ҧt���n����
�@�tk���x&l���<]�A,�1�Ulh[WI�E6y�<9�T���g��x
-+"��I��)Wy<&U��n٘���VI�ݲ�J�݉G�#P�@�ɥn�G�#p�#��1�n���UI䩺��K�r�G�#���vї��x�o<���m�#�x<
��G�#��x<
��G�#��x<
��G�#��x<
��G�#��x<
��G�#��x<
��G�#��x<
��G�#��x<
��G�#��x<
��G�#��x<
��G�#��x<
��G�#��x<
��G�#��B�?��p;OH��+
-++��?��?��/}�QOx�P�o<���(�Bq
-+��P���~�ݸ����چ�VxH"���@r�I�ݸ�`N��������p��n�(������=�\r��_��W��?O
-+ĝq��<QP�P��h�����[�Ƶ��}m|�B@
! �r�t@d$��B+
! ���@�x�&�B@�s�������㕅^�>��cw�*~�V�}��K�7~���N;�1x��	k׮},�䟈��?���WF�HA�gK�Qz�|�~�܂/�~!2�Χ֯�}�~�|������Ma�[q���q����j��w�q��W]u�M��û�k�qb`W�k��St�%���qiS�����v�իB@��@��0B@
! ����5�x���}���A{,�yE�����:j�;���N?���<�ȓ���P�?W�O�wƩ�Y�S�lu�Y�H�i-�ǵ�.�����e_˻���Χ��D��~'~��<s�Ƈz覻��&���w�woO'x"�O�/� ���!�z�ԭ���V�q�^��B`^#P.��5��B`�#0��A�/�%M��q=�W��J>��b�9�y�귾���}���xܺ2������N�L�n!c��ꂶ֯嵏.�ɖ�����eߕomߥ?��:���?���;����?kx�w�����k�Ã��I
>o Z�uO�(^)�}u�B�M���B@�y�@������B�@��o@�+��h�Y�m��EO���������=��sO>��O������,��diG��[��
-+Ps2⥶�UV
y����t��ϰ�����x���}�������D�G�}�[���9�o��߹��o��'?yÇ>���7���	��u" d�j9FS����O�B@�q�[L���jzB@���@�g~�5.eAGO\�������?�3V����/�=�I(���+�?�B��I]]�Eߥ�%?���������+����k�}�~�<�D_�?�:�Z��<�F��/�����k��G?��A�.�)��8)p~���������W^���I
>c ���k��W���鐧&��s�X�ͱii:B@
!�h���y帋n���yu�W��c[���/�C�N���?��=i͚5Oƕ�ǡ��-��&��
-+��Cƞm<\ؔ~��T��8���|';��w���`�[�p���w�L�k����.������~����sx�+
-+~>�h��Z����_m_��w����_���w������]���}����u��u������n������k?����+��/i��S��KS�-|�H�B@
!0#X�����B`~#��9]�萏�K����g�-[z���S?�S�ظq�3V�X�Խ{�.���`얈͞��E|�s��x]�Ow>�O�����
����o��G?��k_���=���o�Wʻ�_�b}�=�Q4el��s�*��3�X�͈d��B@m��%�����f0�y[�m����yԹ���G=�QO�S�����P*��
+PX��6��Lw�.L�;�鎧��#�������+��+>���]�_߸��3 �xC�}I�q=��r���O��
! ��AD �1�B@
 ��y\���Q<�B^���]~^�_�[�W|�#yҩ����?�x��ǀ�&��B`���7�{�_���k����}�u���6L�'���
,ңP/���J�)��)y5�1[���
-+
! ���"��i
�`B@
!��?��q=�GY�k�O�[��9�
����O<��k׮}6�뱵����
-+o��bj���b�s��~>�9��ܲe�Wo��������_|��ؗq2�?;E:�a4w�J��W�I��z�ѫB@L��/��@� B@�q#P���6z/�e_�qk��?��?=��/~�Oq�?������q�d��h�5n�4�p��,<h���.�'=;�?��O
��q���
q�@��KC׼��(��q�&��S�@,�0�\
! �+
! �@�@�Y��t[O^�/i~�����C������Nx���˟ʅ���z
_���Z����_���W�Z�w~]����q�}����5������;j<k�j|�q�}����5����u��~_y�����ۿy�-�������˾��/��0�g�t���|�jB@
!P!�Њ��B`�#P>��G���t9^�1�׿��K.�I���a~gb�͓
�^�8à�W��q���}�_�������Z^ǫ�ky=���������ky_�Z��_��x�~-�ǵ�ھ����~-�k_���ky�֯����W���ھ֯�}�k��-��������j�Z^ۗ��݆�~�_��_���Ͼ
-+��I+�(��1]���q�#�6>ҫB@���B@
G 
-+���=����ǘ���S����w=����Kp����^��b
��a˞�\p������Ûl�}�u�w��̵Mw����ץ�%o�S�d���K�K�g�m����.�.yۜ����޽{����C�Х��ۿ}|į�_��}lW���%�4[��H�B@�y�@,R�1��B��?c=�H�,���S�W?�)OY�����}�����+W>�z釺�-��ٺ
-+�V's�������Nv~�� ���L�78���~�l<���G��n�z�w���K���7~��k��c�+Qȗ'�m|���>�ꅀ��q-@�*�����3�=�����x!����������_����t�K0^;�|��ȡW��x�7Q�^���dǛ����k���l�'�o���f?������_|�߾�Mo��ʻx2`/�(�oC-_�/��g���_�B`N#�9=IMN
!P!P������G:6�'����~�������sџ�����v*Mw����&zů+��7�����cl:�7���L��8Y����o�p�
�|�k^�O�; �
-+���(�㤀z	�R`o�8�ꅀs
_�ɩiRB@���?�b=
HǸ�k:�x��?߷��}�u��/7n|9‡���&k��h�
-+ӝ�t��a���x��h�{Lw�ѳ�N�IB��~*ZW<Ľ��{���/��w��!��;�"A�%�a�{�4[-wnÏ�z! ���D �srr��B !P��x<=ub����^�[�W_z��:�S�]�j�3�`
�ԝ�ֵ`��3̡�?�����^�j�3
���=��#_�����y��^�U|U�'¶[]�Ǹ.��1�Ћ�z! ���B`J�s
-+)MF�و@��F��k��g�;�s�|������;�\,N����(g! ��lC+��.��I�}�s_�nݺ3��&��M�����$����7~_�b������7~_��Ĩ�o����T[Ƀ�o�����.��_��m����-[�|���>��W��z�y"��'0S�6�/e5ͱ�B`V"���B`�#P~������=q ���5h�]vٳ�'~��˗/*�}[ۂ5x}}�G?|�g�#`<>'�3��Lw�.l�;�鎧��F`���t�={T�=�P���%ߺu�7񜀿>묳������=��"�t�a���䍢)SB@�*b!<��V�B@��@��F���~�tGz	��(���G?���<�1�[�d�񱈥�d��͞�.ػ�]�����K��K>Q���D�����e�8v��;��œ�����˝8.����@�r&7V3{x��ݍ�<>{��?��-@_<���
��!1mȠn��Om
�s�.7�n���<S�4U�_�
4���L��B9�e��VΟ2���X�S�Y���~m�wܕ_�|X�ݻw����}��?��?�i�x+z�^�3b*�ӑ˘��\Rԍ6���{�� Q$�L���]�q��`�5#F���ON�'	x�`!K1 �<Y����[��J�+����m��c��¾����H�T���O�x}��x]�.��?p�w�����=������w���Cs��ɢ�^Љ��r�B@��@��<c�SbB@���3��&/�mt�_	�5�Gtҫ^���;찗b�ȓ
�u]q�4_դ��_m�'�K������Z�����~-��k����_��dǧ^�/���g�v���Q"lG
�K����+�t�y?4q�Q�Rߪ	�I��fzPąu�G1�+�9��#�]r�%�;�S^�lٲS�m���w!�e�%��w���ھ��j�}�w�w�'꯶/�ߌ"����߆�ү�{���q]�(�Mq�hq�_�{mL9��
-+oM���O��M�v��H��!,�#�|!�A"�&L򔄡S�'���!��밡=X���
���ʊ>_*��F�S�K�X�lC�m��/0��G��p�g�+p�a5Z��:|"t]��bX�e�%��v���ھ9n|���}��z<������)�cǎ��>|��g����]��|N���ym4yl���s�*���
�o��B`�!P~6�����{^�_{�	'�+�g��~oX�x�\�����ؔ:傳��忶����'�Z?���:�0�a��x]�k�Z�KμX�?��=����S��o:��)쬘L�$żj^��ȋ�,�&�+Y����bsU��P&���J�[�c�+�D֌�g&�����x��:�ቁh�������Y�u���k�.y�֯����W˻�]�����~��ί֧|Ϟ=?���/�
��r�-��@�P���s��/朙�&"��,F��Lj��~<�,�y�=~���'�|�-Ztl�dۂq"�v��뻯�.�.y��j���_���M(����w�+�H�+��*s�]��ek+�]+9h��
�KܤC5T����
l~��\�/���� �g_�V��ѣ�~�:�ܹ}�O�Is�g����}�e<w��#�����ay�	�0(\�'��9����2��(��z`L~x,t�[5�F<�
�N���W	V-�7v(�8'x�D[y���D?_���������D�
7��_�|w<���+��;p+��ځg�^i��7= ���
-+�i��-+��}H��
-+l�y�?�������o�)}� ��E,',-�P(�0k�u��ܒ�����R�ݚ�9��&f?������������=X�2̗<�������Ѧ���Q��Nw>�o��]2*��+����{��m�j+��a�
-+NV�V�&3��a�b̙^��R/�J��z��~�2,����YD�\ {dǔ�#�I#6�
�\�"-�\K<���؜iO6^��Ў��/#��>����;��\�'+
! �@�9S�1.{�ö���������e�eŊOc+}���Wdp��C𭀃1�hQ@2f����H��F��H'4��և�4���f>�Qr`'A��j�6+sN�z�y���J&���u��z��v�?��0NH�$�.���4��O��b�0���q�H,����Db_G�v@�1�`� ~����[���	�8s�#ʱ4�Ac1y�-�ώA��W��;���+d
-+%��"�D^�6Z�s��FFL��mncB��[y;$�
�R'��'��D�J6��aK�d�s1;
-+\�m�c��|��/�+++��=]�5�k��b��<�G
gt溥�����Y��)+��d �ƎBW�� ����7Γ�T��>�$	X&���6���;;�@�]��l�<v�b�o�/D�1�6���}�(��lƐ��a$�f6�y�$|��5
��9cD��m`��L1���c�Y�7���&",l"�7;�1d1�H�|��ɾ��xI)��W��
&�`�q�[#��ĈM��0�5�?�$;?~8?�
����� �2p4n��3��\ٳ�{���LM�+���&��"z�h�����S%�q{('��.
�O��iK�/���
[!wҋ��=������|�s�*z�_6/��v+�لB�4�a��5�^J�s��c^q\:n���i��E�������=[����J�zq�f��8�<C?M�>�����" ;Vx�+9�@��#s�!�I`hЇ�{�΀h֑'$��B+ښ���f�N�k��ԅ�/}�c�n>"�~�+�T�Y��va�K��
���a�ޏ�儠G�����\8��[ݑ�	O��E�ܒ�����b�]��S�a:�<��+�[�k�����ǀ�^[���W���(�T��c���gϞ{�����O��O_����$�Cظ�Gm�˞4uԄ����?
���@�ً@��t��4�m�2������U��e˖=����X�ۂ���.�Z^�&]ǯ�}��W^��믶�3�O�+W�9�6�Y����B�z<� �X=�����C�TP���`��+��5���Y��ݺsyp�j�����\��g�k&Ṙ.H�R:VG��{��яiS�����J<���KF�)v�3hŸsQ���`o�W
-+,N�$�	o�q�� iZ!K��{� ��c��+���C�cc?Nȧ+��	
2E��ԒO����|;�4�{�ЧS�\��T|%��fGg6�0O��š
-+}�@ ��b��$O�u��7�<�c+�5���;��,����>O�l�~)#������ڞ:e�ү�-���_�k�Z�����~ȷo����~���w��~>�Ƕ���
�,��k�c5! �@'���&���@��t[_�Hs����=nX[�����lo]�v�(�P�-T��j�Z^ڶ���z\����4�:�:�:�4�qk����GP���0�;������4�s�R��Z��햃	Y��.��*�0sZ���#,S���q�t�@�(f��qN��v�5u)0���x��a�*{��M�M��$/Qw���CP��
��9���xs�L-8�'�>�`�9��9��+��pǘ����ώ�2�P���Y.��Iй�=ب�����;��I����%G���9|�3A�H����<����������n�}�+�Ћ}j|�I�S�i�R~�=��Z�,.^�����������Qj�g21��Lu�5;?�8��T�F%�`�9�fls^�4������q>H0�;q��g��
�R
-+��dK���d�TW��~�˾K��͟�����?~���b�+�:i�C��_��$�I�q.��S>٧k����e*�':	�&+jB@�a��A����K�G����|���s�o�{�O����`�~��>�֥�%/}����(9�����Y��+I����a���t�G1�B�s����–�L���W���T��M-�
�w:�|���� ʟ�8�e^)~�Ǭ<X��
���a�&�Je
-+���fb
-+�\A��i|�b����htz-��J��md2�^hO�Zk��P��c�K[+�#YS��%�!��CmRd@M|;��G3;Љ��w��c���Ș+Vr�+��]0vˎ�c��sd����
K�H��u��dz�g]̝6�+}�7�(�x��x��W��'?�vm1�r����;�^��7��Q���[���o���H�ٙ�
<
��6^�&R
!0��!<��D�m
<�5�����?�	O����������n�9/|�"�F�rAF�����.]��_�x����wb��j�}c����	��f;��31,�i��!�<6�s����|�_V�%�n
@y+^<�܊*0,oz��,����X��b�xv��z0L�s7TA�&�Q���,5�!����vF{JL%kG�ư��Ұ�6��g�`f�.1��ٖ�;H
-+����8'?&������1h�bx��P) /��Ӑ�u�o�J7e8�x��b�0�/4���j�����]dȨ�Aw�-t�oi��Ԏ7���!!����q�&�\���t�n��)�l�4�i[+>�3��|�1�7��Ջ�F�rˇ}fÎ���
M�<*�0��*�̵�����<�&��?7����ڛ�lڲPA!fs���4�Ρ/=]�<ˆv��=OT�x!k�MC��볜�ۻ�gk�û�
S�Qn�t`[�dec� ��X�P
-+��ӹ��r�x��2��2�I��V�4���7όI����ЫG�>�`��6f���9(���L:ZR@0�'�]�Ŏ�����4Cϵ���� �ag�BcʲϬh
-+�!�{����S��}&��M@��,�.�~��ߤ>
-+L�ﶆ�M��d<��[��&�h|E��8�����}>!O;E6��mQɪ�����#�B<�����g�#����mظ[b���A��)�F5! �9�
-+�<?+�"���|M��G�k��0�����7v��cw���fK���tv�:¸���g�D�Ɔ�<�<�����G�'\~��^��n�Y��I�.	�I�����b�z猪��Q��1�e��
-+>��3fh5Es�j�5]�|&idY�={#/&�Kh��o�~XDN��0�>a-/�N,�nb�`Fބ�Z2�]X�6e�U�];"3�`�<ؓ`1m�����Ja�ZU�$�hOњ��"��⚪�Ę���z�k<�ٱ�W�d��c��h^�kqj{23�#S��|�s�-Oj'�x���/�{p���#����R�ԃ�3�@�Ťr�Ԅ���k~5��ȷyQ�����~� �6�+t�����ȭ��m�ψ�W
-+�d�Pb�n&M5bG>u���+��;&��/wX�����N����CaM[SB !P~�t�ُڸJ]�q��
�_~�kN:�_��~����'Y�͞�KnJ�e�������܋���6��=�s���)C��"�ԂOۙ�S�4�Ա�>'W�K/��H��(w���wG1�6%qSn�~��_���x��)�%��-���\�n��[�Ū�&Τ#�t��T���+<��M�(Ic�H'y�u�a��6�H��؞2I�y�NW--�>B���&c�C�0����8H��-3��JĂ�4��_S)dA�X�o�F�n�	�G���]����Db�Y�,!�9a�a����OF�آst����%_�C�y��f.����\����͇)o><2�"	o���s�$�r�x��.[���'x��99�L�����Ӥ��v��x�,����U���������#\O�h�����go��?{ֳ���{_x�^�Q�YN�-���hc�E�����_��1g�R
G�|�]�5�17�����������4�m<�����ྲྀ-��w�:�țqu�V\�K�]i�s�=�lQ�qQ��7���8���g�-U`s��V��QP������v/��d�dڌg11�y���҃�W����r�f
-+ilSu���~T+S
�}%���_�R7��t$�Ŭ�ME��
-+}K�M8A�@"��-�>�&��+?��L�ۭ����b�0��f��A9ԭK��M=��RZ>(��l�@H��6��Ǟ��hfE��Xc�
�"jh&�u�뀑�
��yR��C���c�X���[���)Ʈ��#7{@q/Z�~~Yf_:Iz����?����!��=�+�n�ߏ��*?�O;) �kV�0�b46sU�&���ٚS3^�}cc���_`��f+�4��]�+�-v#�S/﷚f��u0�;`k_k@v�o�D����3���<��i��}c��]
����\���OІ�L���y�����/���{�	l+�y���ᘭ�K�)�E����\�L��{M��@����I�c.���~�C/��g�y��^�x�q�M�q����������f�K�cb����93����3�ũ�J�rB��qR�Y=?�`.)A��.+��"9��ȋ��ol۟�>�M-;�r`��=Ř �-�B��h�&�8c���'+��E?��|���;�P���+���#M�o���Ϳ��.���T��`\긏Q��]�6�/h<��}:v�DN��	�Ҡ*
-+�!ҩ��)�5�`��(�<���i�[�1WCP^
M�@L&�<p;���Z����mΥt*iS<�e���~,.^�c� q����9�����T
iV�4R��Wc�1Ȱ<��_�#:��('%�i�h�������X�oəuܖì��&%�t�R��I�~-o�ѫϿ�Omo�G��r�-���m~H�<T���q��9
��_�:��Xqⁱi��q�� �W
-+���6��x<���~�5#~�����;	z��,��/}����qr9��ݽ������'���m?H�mL8�P�%���s��sl����p��3�c}]췍�q�����t�e���	'��&�W�"��=lA6��k�}Iӯ��MI�z1.uJ:�}�S�ߋj���cc��[��R����K/�U��s�i�}G��DS'�6h�K>6���
RoF��C_�a6M	��{��$�
c��(�3/dnE��Q�Z�E�T01I�l'�F��l�i��ګ;6Q�)�����!r~��S9_�f��%ߊ�DS@������T<�<�f�ё�vq�ޤ`�cc
����7��Ӑe�r��6��N{nm��QC�R��̞���Fls��\¿��ȁ&���e���Z~L���	�\h���.|“��KJ$�Z���7�l;�E>#zs@_���S8v6������3
C��\&̙��ׄAc���w\�c�Ǚ�,'��2�Z��c���̜z�����w����	?)�����5��/�w��MI�+uJ:���s���)���g��/mC?��|�l~2�̷���'oݺ�?���j�\ ���x�D���B@���#;R��{;h�5���Rl�ҥK�ꪫ^���?�b񱺊aîN_y�^0u����kym_ǯ�}�O��ȽyǾ�G�*?<�^H��C�v����P�8���I�/\R)�[��cr#�(<L/�P/�-�16�r	�(�r<32�r�-,&��gؙ�0�����#��aH�d�)��bi�/ȓ3<��E�ď�3�X1
-+P�����P�q����EޡZ8����wX�A~���x��w-�%Y���WZ2�O�_9�r�$�~
��M���v��H�����l�|�J��Oby�̅F����зy��\�
ha~�o�N��4H3�����e�aĞͳ3�"�����?�s�Z�����!��-��]�Og�6_���ܫ��}���o����W��;x�M�űI1i����0�9��0�h�����r.ԅ_~=�%���$���v�	:��o�g_T*Z�~-/L��l�����k���~��nx?�Ի��+�[8��r�5:nѾ������+�4�2™�>�c=�#��Űx�S�8+�{��!���`�yz�s�l��z�cL�AK�~�z+/n���
Yd;~�Ks��xacA8@c��&�,�Q��yV�/�5%+`�-va���|�gV!���8�A����BȎX�w�$���!��\��q,�4萓W��/�U
-+Aw�W�Éƫ�����L_���_����;��0�[�
�@�ж
���=�Մ����f�,�������˾���'��+7n�x�W\����G�	�������P��ھ�m_�w��x�~-��u�Z�#|���]x�2�T\�6%4c�nP'˴�%���65_V��X+f�/痋(X��M+e
J���9����c��-�(�����t���k��M��D��:;M+��N�g
-+��4�Tf`��8,��>h(z�i�4���8� #_�Q\��D���Ji�1g�ɵ��q,��M}�8�=��T%a&1W�i��'�M��t<���4Kz�3����)O�ܔ�K�g�f��N�*FX�o�#��{�_3
-+�ӑR��gQyǜªķ�*�s�Jn�R.�P��{�2�� ��i>+��m8S;T9�=���f{��Ml�ϑ�"{�B`��Õ�c�_D���XΦ�lj�%-�#����������:�

*'%9&u����c�(H
|?F@��j��1���q��+q�xT�|�6W�1lefY���5��)M���8��
��W�P��k^��[������6�r7��/�������托˜�E�/����~�:�wB��u�Eo�O�te�n�W���A�R�H�fD&��-���(x��d���(��Řxht-�����"�P����=�f��i���2�����q�(���i繅�s1Jg |7���L�����nM=;na�`�C�,i��i�2x����FE,;�,^�o$�L�ͯn������$�q
-+���~6��ıK/揽͕�������rPC�2���r�q͖���q!O�츷���m�?>T�IPϏ�`qa���!�uW�s)p=
�N�
;B���<諜Oi��W����M�������s�g?���x�+^�����6�6wF��+�X-�P��c��:Z�qF��Z���XG�ҙ�L'��A�I1D�T �A�&�lBp�$��n��q��u_��������f7��\����y��q�y��}?�u�Ϗ����/:�֧+m�i�fI�0�05 j�9.��֋q�>Y�^�p�11h��[>p�GV����ڔ��ƜI���'��6I�'�~ND�=l��)�]D|��_�
�ʗݶ�c��?��-؆�U����F�N�O�7���;_��w>�?�]�s�߹��@
-+BQ��A����C>�s��8��#�������+�@W7L�2��=X������o���������[�{����y���K�*-��yTg�7�f��._o*`���k���c�����?��w�Y���D^zz�/%��l@\���/�-h��,\5D��������`�/~��6������?q��.s�H���6m\��E���etl�k>|�GxL�+8��-�9�q��
 _���gR��%����B��^�B
O��3<���iۋU$��`��C�b&�4��߽�$��)!��͢6�!m����&���sy�y<�Ȧ{n�a��(�Ϟ��>H�#�E'%���M���o���4Ā*2¿�}���3�
E�m�����������
��H73��
-+�iF�z)��}nĤ���n�+0���~jO�~����p�5��w�a�Ǐ"�Ob(�$&��y~_�}.s���s���	�t�N���Տ^ՈQ�Ω�U��w]s�����
F�C?���O�����xƛ�p��@
-+wu�B�ۮ'_/�Y���OP���	J��\�s�S���W�������-��o|������e���g��Y@��FS�7����ĸ�/|������<���SE������u�+l`��U�U}�\>�q�{�W�W�?�'����O��?!��w�B�~�k�������.�L��������X��^�s�0��Y�d�.YvdsRO[� 6�G���I���<�����c6�1{�5:ln����XPZ��,�Y`�m��OL�]a�&�x�صOϢ��o��C4�r$�a炪y��A��%6L��G���-�D0��H��&��*6�rp1�y��~�;x7z��TgC'�q�KbR��#���<|���T�~��x��x��%�h�|A6cO[rs0f6@��=zA����
9�4t٧���'>4��sW+軐������ۼs�Upfb�w�c>.�h��.�$�w�&Ʊ����#s��`2T9̸���\H@������/VI��!t
&�Ɩ��}lS+�S��_0�5�G�d$k�n{|tj�(!&����qC�w��,��(�+u��$b/+����	dS��
-+�
�o�ж��8*���.{�������i�[ݘГ����G�AR����O��䓄��ߚA-�/5�����i6:��!�
OP�����c ���-�>Fl��ʼn��י�&�AE<B�:�{>R�L��&0�X�sn�k�@Ù��Ό�44t�s�����7
�јmӑ���
2Y:9��)3�ӱ�M���8!ncbt��I����nԌL����m�y���N���"�\���=��;���ŋ�O8�'�F?���
߬7~XS���n��n�՝ʌ��\�s��
-+�S���\�s�
-+�|���u�\>���w��ӻ��͋^��J����1n(w1�E-
N�7dxl
�u>��w�^����,,�ϫ/H�7eӒR:�)�>����E�p��Ŵ��\�� ռ`�(�ěq;�|d[�,���1�oæ[1�g�X�N���q]�g�-ˤ��P���Q�=J��"�]fa��AM�ݷ�o�p!�ix�q�I"���Rpy�ݪg�������?�M$yħ}� Bx.�����[“x��ض�/u'gn�ߥZ�)!ٱ+�]��.�C:�3|�"�����g�n���J��e�sIG�3-|g,b�Z��G.`��x��1����=��L��\�ǓG�0��s/D���u�g��ߞ�\�<����-�ژ�Ⱥ-N�='.�o�_����{]�=��59����|}��ypa����7�5��Ϲ:����L}Tr35ǟ�+
b����ʬ����o�b@���F�xrl�Fڒ�5��
�r��8��`P�#�]z��m+��‰~-$g�5\�a
f�0xk���
�-��.�s
��J�9��kt�w�
�Rmxf08����1?���[|A���z1�n]�`�ޥ��)�Ҫۦ(ls�`6c`v�&�ݘ��K�v G�T�
@j"��b�	Ŝz\ƃ��z��]N�+\�T�8E>�9W����~�U�?���g�Ӟ�v�ȯ��������~��n�-�öG����2���o��:�?��v.�߬�ȯi�v\�U�:_<�
-+��im��Å�ʌA�-8um����Q�S�Y�V�����,�)}���J5+~�f�?��Q>|���<$��Df�n,��^免he1+]�=;�"d|��	B&��Ёa.�s��@���;�Ġ���3�z�c���Q>���1���}� ������!�W:��ޞ�@G�~��&�m�ُån~��Z������kq&M����b�:�8��X:�eO6���%�%�f2�<ǎ�p3/t�jv����X��Y4���-S�����>�fO�6�V��r`�~�&���tAڱ?5���	�.�x��\��m�&�uސz���~̙^&�gr~d~���yos���|�?�SCO�r`��]����U
>rt�1�رcOn��졑Pl��뜬�Dcq��y+��`?��uv�s������ޟl2����G�3�{��>tx{B���F��Fz�1uN��Յ�
J}�<[����Z����-��]L�i�:�+fS/�����od_D����>��׾��ߨ�����W��Z\w�x������2=
칝+p���P��Y�q�vq���]��|�L�թ̪�T������7�����O��?�_/Gn� �to���v�|�@�
-+�p�G���4���{����;?L�����ƒ"=+eb%=k�^s�Ӻ�`\�
��N]�َ������<��b|�&��������n���%�KkJ`�id.�/��/��E0:jKkݎ�E_�q��
�'��6e�a���HC�Hǃ�rE��Љ	x��h��kB��z��5;�y�;$�4	�k+PN`%�:�r8d�5_S�eK�xJ9v�#��#%Ql�`�(�NSG�ls@JS�п��dt��o7zAG�ԉ���XٟK�\�L�F�q���lJ�6&V{# ̗��T�-�%����d�&��γ�|�3�PKg����F�0a���'�v�&5+�)��zڸU�{L����A�����r“L�[�΍X����2a?/���<�p�χ��+ek���:/��1���O?�\�y�㇋*a��
-+O�����1MEl�Z�G�M�3֙�4���a����h~��c�>������݇�s��l�<2�x
Y��˼�_k��z��MbRfD�!�{|�)PY?����9H)B�L��H�!
-+��N��;J";n�v"J
�F<L�N�=^j:8R+�X��;	��G~4t<��H�u� ��~�]�h����C]�q��
�	�S���RG�LσɌ�3��Yh��̹���-��py��>�㟹�aS�ga�Ȋ,۾��,�8^}̊�ck�@U�w�&��㎋��e|�B���z=�{�=o�<�$j�Y<ھ��|�]�}�O�j�/r�N{q>E�E��Y��F��Yzt�����1=����%����\�s>F��E��(ޙ�\�۱���N_��1/��/���~�~��^��W�]}���N_���L�H�)��*����*_��E-�~T���viG	��T�ŝ��L�˺T�T�i�F��Q�6f�J��f
	��X4m��K-�]��Bi���v��.��F��������8�U�;������c;f�2�= l-\�A��ݟ
葫3���u�$
-+�6C.Y�
-+g�d� ���f�	����\����F�$Rmf�ƵW��'�L!��p,��<s/7	����M�!��%W$B�rh�����^qT?���
-+\_zN�9�C&���Ş�-��N�§m�1z�­ܳ�<W���b,�6"V�S���
&�Q����o�4�(~�gr	�^s*�m��j���q��O��Kv�|���ZpQs�')� ��7��&D�3$�m���w��_�3!��9Vl4�6C��u1��ܘ��F���̓,DB�r�^�����t��7��%��I36Z��6��c}f�s��g������x@��/sx����>mv�p��7�<'qx�8�ks���4�)vtm��_/߻������/��{~�u�{*�O� ;/�l����~��8W�1���${�z�;W`��~~U�?��c)�����O����r���I�G�.�t�7j�/��7�?���������?��S�bX�mm�+<XO}�
י�\�s�
-+��Ve�>@Vf�p*?�y�{�}?��?��/zы���@�H�S�S�����Vǧ���
-�w^��#]�Q�6l,~4�r‹�,8�ٰ
r�AN�F��%�sh�`�M
̽0T�u!�$0B�ݪ�C��\t�wi�K!+<�
-+�����w�>W�
-+�++���M��a����,��1����Ç����ߋ����A���l������+V�\D�w-�g��!�f<�;��QJ���D]����p�N[������z�%��r�x�,�^]�=&|YĂD��	��+-�1 ��Q%���i�ZcX4�#�tI3�;g
=�ѭ8"b�K�͍\D`�3p�4�<������;1�(#�
_��0��H[�����Z�hB��`V�`�
>V���C`~D�:ؖ�8zR��]��ݏl9uɚ��%�.���jO����Ze�_2���3��bU>��笘$���F�ΏC���N�*�WP�踇Ϊ��f���j?93m�M��ӇԡG΍�I�$ g빀s���M�1�>ALb�i�s��9��T0�G-�n���1��4v/H��׿Uc9�B��]�8�����x#�Vy��J\�x�M~GL��0���J�|}��8��j�H#v���l���sc7��M�:���d��-&iG�s�1���]�f�х?2>Ɂq����<Z;}�Ǒ/{��zͺ_?H��;��7�i���L�9�������[I鮻��m_��_���ɟ�s����'��.+�+�(*��QP�]�8W`*��i�Oe�<X[���4��7���e/{�_�|wq����Fj(���h���A-�����.~A器��/�@�UE�a�l�
>7P�U�s0����.�����__�
���Ul~����aÏ�t��5�xz8�j�cX���q�VQ�#��dc�f"}�0<��o�Bm�<1��b�s��:��&m8��	����y��&�aς�1a^
�{��'.0S`�3o�C�c�,�1۪
�q�ȷW~�H�
�֬�������+���DÊ=���qE}��f�2�6`�f�$�d�q��=��Ѷ�Ñv�E
-+bW��3�X�\��%�|>�(6�+ƲD7){�:瀜k!��+g��6��8<t�βw���y��}p�#�����"�+���F�� x
P![�6�q�S��̻�3�(��<O��<Gv|���~��M}3�	��������W��߫��]+`��#>]ގ�TCz��D/#r�q#��l�_�9
��l��6��(P�����i���$�֭��lR(�d� ���$сz�3o��N�p����;����f+��v%�O�S�8yk��8IW�}6��b'uS�w�Q1�*�)5@�j!\�����h2`ۛQn�K:R��]�[S"$Z{aW�B�w�q㼢���+�bћz��-��D��OEs7���ޔ��y�p}�>�
��;���yv��<����r�ΟDJ��Q
-+P�30k��q���?tIs��yR�XCv��`@�9�h@@��P������Ff���I�>!Nt��'
^z�C/|�	yg��?��Λ��X�O��{���/��/��������}zPv+NI\��8CknR2�c�wp�e�"��vժ����)
A��㚘l�!��J�º��pI������w\���j����[���࠹.�|K$'�g<�/�������{����#7+�+p�8�+\Q����K@�*���o����o��o�n}W��dD�ɰ@�E}������ծ�U�.�Hc�r�E�B��Y�i���h�*->���;.P�IoIr�t�c�	�aVw���0Bz>��}�
����8�����
ƿ:��q$�{�`��@���#�����
"+��_X�[���zT�S���ݚ�5�����OV��b��j}F���6Ԇ'Wc����~��(��%|m�Ձ���"�K�
���
�(
���9ƂKn9�I�o��6�Є5�V&5HW��Y�$�,Ɓ�q�иk�8��
:�	ʺ�_ҮA�<R��D�T��#?�r����<n��Q��-Z�D�I�z��l�&Ƀ�sä�E�pcPK	��X���`�(�%��i������|��x��|��Gx��cf�8:���Z=��,ܼ;Rꅪ��]y=n���+l�`�s,�.-���q��1m\�9������8:L�m]/������0M��ݖ|��&�����;�x;M�XV|�P+S�gŤ���f�$�O�UI<���E(P,׸O<O������l8���E���������0�+��;�D��̼�b�r����S��
$��_#:8SG��B?l�;a��_	x����?�0�v�����������N3�Z��T���_��z�iS���s��qn履��8W�
-+�G�?��w��Iozӛ���/}�7kv�~
-+�z���N��?�k�T,U=
-+:�����p,��V��T�e���oG���䰖�
-+W���tQ~�W�D�bw�x����łҨr7����ҴJ����9�0ҷ,�}�3v'�Ϋ\v�����
e��|��*X}B�-��&�L!�Y��
-+3��
0YE/��@ݮ'F/��rL\���o�+<L�纇
�M�
-+�+����
�O���¿�g��u��V��ߗ�E�N7x���c��~#�GkgNW5^�ߢ���M��YQ��.
-+���:�1�|k�5���u+���a|
-+�}(�Ony�=�9�5@S�:-�ԑ�d�5>:�}�si4�C����lk�0�)~�1V.GFL��]]>�e}r�m=�gtE���_D�7�"��m�^���U�9�l�8�oΡ0[%��?��83�Z�'�f >6�E	�
�K���IKt	j#E��@q�9~��@8U:*8��0�7�\
-+��u�tSw���ʀ�q������ts�Yz�}&+�i�5�.׾�q��TW����\̮�囵׾��_���O�������������)�������H�U��bP��	�<<W�\
*p�
p>�x�
-+�/$���/�W�������W�����o�����'/v�a�;��&��nd�i��ߨ5�ý�Wez^��w\��^�?�K+6��rB'���.@?N1/��vߟ�=!���*Iŝn�j�9'�`'Ã��4�x�o�����o[s����c�~�pTc?�GP�g�,o�[Y2N�K5jĺ�3�q,�q�
���wy4������ճ?3L�Lэ
�n��}����s�'�F-z��^�5>2�7&��w���F��@����M!3��w��M>�C=� ��������Kaω)����ƆX9D�r��|؏}+>ܤ���8e";G������N�װf��_okvu�kj�@�Ą��XN��l�Yb=�4�g��i8f.���(�nd�=I�1��pOu��
���^p�6su�Rb:�$ퟐ��<FL��2W8�w��C�weN��!K�A'Y�9Ѵ����2�ُ������o.K��D&Zh��B]����		����Ӹ�k��z���/��O�FB_�ċ�r��a�3�-%�9q>����?
��t>L���n�J�
��\��w"�ݬ�z8���ކ�9��uR&/X�q��_�Jla�-�#��qր�ۈ�M�1�<��Y_�K+�
-+J�ׂF�(�Q���%A��9���u�3�VU��C�!�j��z=�0W�b���yx���P�`��t��?�'|ݏ�owq
-+�(LC��0#�D,��Fx����B���I�
��I��/o}�Iڱ̛�s`�/N'����!'��c������s
J{39�W>@f��1�HX�L���}�:P�D<��ʻ�N�9�2�<
]_�Y�[$�+�p;)�tQa.��3I>�fK��QWrJ�e�2ͼ�_�G��:�����ߚ�M��M�i�l���޾:�ޤs[��6�<��8>w?�q8�6��[��+(�Z
�M��MgwǷ���۪ "�TS?��!����…^A�2􌔫j���l<�Ͼ@7���m�=4'>=�"�g8���t4oI
yt����D�<Ra�:��N��(����}�Â<�S�8�'?8���졉y*����a�������86c��z�ם;�jݛ�m�oP@#�4��L����m����\s�.���O�o����<��fP��W���r�Jʭ��+�o+i1�}�R�y4H������xq`3G
-+͖������cH�P��� 	/�`�w�87����EÂ�~�����������Cp�v>@L0�l��~倊��}3	sY�~G�@�S~\,{Z�9������c'Sc������)�c�4�>`.����]+�I�I�����s&o=Ժ��c4&�&g�Qr�'�o����no黏�k�C���3��q�8�h�s����Z�K����n���6q¤���<WF]���e%��I�ύ y��V�YS�̯�s�K6:�
��|\���S0�MEZ��{��M�\ba�?NDt��_@d����Ѫ��01+�"�������@Ǖ�y�����?����^���*�/�`VO�����s����w�.?�/��C�7�e���q�cQ�u̪��
-+��#]�g	�ʧ�Sbi�Ȳ���!d�Jϻ��z��[_G�]*����B2„4�Fc^m�?8
w��a�)�itQ��H�pn�q�RF5�8��Q&�Z�2��ǸYl:��0G�N5.(l�ؽt�`b����'��2���m����>��<&�|�H[&i����=_�M:^�s�DOo��b��S[
5��x�hk���e��28�đ�&�b/��\$d:8�{�<�X�{:�;g拯��"�ĥ�.,}a<�
-+�9��E��d�?sW?y'�07��ػ��\���Pi)�Z�Ɂ|��<�LB���!g�Q��A`���F�\e!���޾���Ĩܚ�6
<L�l3&+�}M]z�*ƿ�͏�)����=M���'�(���]� �D0=.��?��ݾ˗���@����_�?�s�3������m
-+��ꫧ���g�\�ۥ�+���$���.v��.�S�i�s
�z+��'�=���؏���W=xIEߞ�f/��Ͼ\?��״�y��Oh�_�Id-�Y�<FMo2\��.��#Y��Ek�.J��2�:�z�"��)2������}G�Y�Y�
_n���XL�K�+�;�+��
-+�������G��#%n�3��ia��d�>�� q��e_.]sF�t��k?b��lZ0PZ�͉;C��~�N�~e+�I{�ORYGO�~n�
-+�68�In�)�'z�W`?�+�_�`ʼn���O����������o�앟��6=�rk�lޭ_���ׇU���s/��`b~���k��[���%�vP�¬M�!��,~�]����ҵz�9S�ib5��8fQ7��{��IO����қ��I@e1N�w�jP�f��ձC�SKdq;׌��h�T�� �ٞ��g�ķ<��	?��
��b��-�;�
-+C�sM� �Ck#9��,x�+�Dg�
�Br}��JٿqH-�,^y��3
-+TZY��0�}8�y�8�x���y2��'s0�{�
OL�?��XGB�����$?/�̥��$0��o|�”��$�q��=}������HЏW�1�}��~N��c���|�G~�G�������_俬G@E���!uʇ���I2���Wxb�!>�JpN�6��~�#w\y�ygLσ�����?��_����zQ˫��O���>������}�?���N<�^'����;z~�B	(eT�wCf�#���5�/|�{1%�_��)ܞ��6��k8�,�XP�5�;�����]��"1�����߱�wȡY�<�:��7|����w�|���Řz.4h���9�ы��g��
�X�{�n{r������y�}�'ӾZe��u��|l����\�!���Ox�������d��
�]#�����,���������������b^���6n�q#�m�)�x4�Rr��e;�	�y�r�4����|I`�{�/�9�)��Z���2�E��|�q.���1d2��H���GC�ӻ��]K9�z���xr��!��״�٧V�~��<�.����y�$��#7��ü��z�_n�>���4��sA���oY��s��03g"����u	53��M=��
�j�|}ǿ��|��q���},D��0\��?OC
��,��0�������L-�o��2�Ce>�i����½�|����#O:�Iw�jr��?t�KHvµM�5$xo֥����~+���Ut�z/�Y���Dz)^�����O�����V��YL��X���yB��*nV�&�C�C�?��8�p��2�h˜�C�ES>��vp�ƴ�t��Z�gj�؇�ִXQNYɡ��O�д_��bϢxGW\����q�F��E�u�M̕�`�0B�
!GTr�u	����e���yޒ����`�G5��H�m�*��W_�f_EK�D��;�,Z�h�qd�uD�Ȫ
	�M��uN�|u���4�Ź�~)^&��(��
�>���>�a�1��x߇��0n�����%t�e:=�=E������0�g��N?�̫�
`���<�8!����J������;ω}���!�7L ��R�8�MO��o�����N �A��q%��G�1f���u:K?�/��5:c'?'Ŧ`.�&i2�?>��l��
�sRn&Bg���a�IcbM9��\-���]��E�1C�䧍�=�Ө��Qy����H��S\�\�0:�?�F5N�|5	K��=l`3B:�sX��ֻ..>��m�>y7oy�[�C?�h���C�X��R`��yh���4��v�����l����yr�
-+��9rǕ۳��e�z	����o~��i��i� �Q�c�ט,���ޅ�I�[ş���������]�_sz,5��qp.��y��2�c�Y\��*Άч�`iXy�ݽ����D���i��) IƑ�-��C8��b>5FN!/�#A0�`KqS���|�*�Ybbw�w���`��<���g��c�����φ��&�6 C��L	*�H��R���G��iU�uR����T�&�J+		��"�
c\�ec�u��0�O��9�~�u_�Y{��7��g`���Ϻ�=\���~��<{��;}���`t���0�
��T��
��#�*4�����(+�k����p�h��@~8��3���F
��Q���������V����x~1�>�s�,��P���^����-����-o�����+,��)(/&��N�'��CӐ]ڥO�
-+lg�'l����bW`_���n�U������7��?��O���)�A����=('���r��޸qxl*�A�~�1P7r_)�������Xf�
ט����	��
dž�J�&[z�9]���	ıA��	=ɼ��F��Ĩ� ��un�r{�־�c�cK�Q?u;+@ًv��^�[���A�&ָނ����w8F��Z��3�0��
�q����d�V�~Pq&w���M�
�_z��`+?��A�>G;zd���������	�`;C�yQ8^;]��KMCvi�
-+<!+�Ƚ���$�8�����;.ݞ+4��?U�y��;���y�s��^��˿2o:��P/x�����<�;��n�ߤ+��h��:�3?�5�f
K6��g��ᙖ�� 	.��e$T�WW4�޾�~6��u��+���]�Yxԣ�X�WV>s��z6�ٰj6|C��4=��Z_�Ǒ�%�:]
	���,�B�0hX�nL�w�6r�0g�#�+�o,���|���p�o�x.Rk�ߵ@�<�r=`��x ���k�SNV|�������s�ãQ����'�pi�K3�3��C�l+7_�7�B��B�͜��s5W�zgd�
-+u������'<�a{�P�!���������ș?<�/�cr���X:5k�H<�����|�r��b�zi,b�u��1�:i�!�U,���qӓ	�A�y�%	k+7����E�[=O|�	s�1�A@�7�+9�W�+��(���7�CD��u�{�*�,�CX.���9�yH�bڌ��
�MM�V��f
-+w"�P66ǵ���o;i�}jc�Yb���L���r]|[�e�/��FX�kg��6��+�����`Y��[��#?j%�E�v�{�����GI�9��+��k�<j�8����������aiڲ!������4��9��OD�T
��H/d`���E^���3:K��8'�5�� ���>ۓ�ku�_"�+S)���#m��F�}?���?����k�T`�&�h'���r����*����������K�����o�d��ƞ`
-+Ë$�C�%����.xBT�8�<!ҹ$q��\7S�w�x��\��K?C_��W���c?�c���F���<���?���w�u���q�u^l�eм�gq����$��&�oƼY>n�e<��q0��ٶ
���;����~%胇�HO�Pt��p"���kȵ�q�������9����Jc�͆g�CZ|�)e��3iۑ�����{�xL\�l̈MB�'��2���>��©y�
iPL�ox��p�3&	0x���p���ޛbɱ��
֎�J.�^���.����7{MH��&��6����۞��y�Ir�ah0ڇ���;��qs�����6�
�yM�=)/��5)=��΍�
�g}(�cǿ�P�9�E�H4�*�'+
��r�(��	�z���?x�a����I:1��mhܛ����b
O�l�Nl�5D�[�H
�����]�%� ��R��Msp�@�?������^�9�.�U�t�A}
�k�.{��V����hB�gb�M��?�|�Uߚ:�&~���,�Ox��f�N4�$\;\T�t!���\"�a�-j+^S�Z�U��;�Ցf���?�!My�x���;.��d�^��+Z�`�.}��&{o<���.�P�%�~:�^~ߊ�r4+��yfv	�/Z���Aw\����f�1_��_��?��?�O��g|�Ʒl�������?�}4��d>�K׫�%�?�Ehi
��J;�;�����$:5�*��ؾyA?����g� ����ٔ�/�pL� �a��
�2�JU��h`:�5��$^�V����8��6�f���=k�����&�c�T#<V��h�ޡ�F��1����%���	�F�}1TyVV �K��X�9�q�uա���^f�d��������_�l��A+6��`O������ =��d�Z#1�s��Nb�u��._���ͬK�v�V���+<n*py+Ct�D?^��nMk����|��G?���?x��v-O��Y^}�D���A7����$y�O[ra'�\�b�~��ncT��hY��x8<t���t�OT%�~ 
ҿl�5>�ݖ�l^�?�����bh�I�UBݟy%^��+
-+��P�;��]~�"��z��-���Ѕ���c��;7m�E�Xz��
���´4
-+|�IC�_鯝D�_c�dL[Jf�c;��R��m�1;��g�c��zHȑ��+�n5g@
�|,`R��;n�㧸�Q��d��8�8v'A����
�|S`����<����3�I��i�ubVl���/ Г�p-��v��]}����̈�Ȟ_��m_�yC�$������`���92�Z9�#�1�v��7�S��\6-}to���J3BG�f�,+ ƈ����4����|4�MOM����i��$�`b]xRK���=?c�Z�˾q�uPGS<�l<���*VCkL1&L�e�5��4aD���^�mșx4�:�{
l�ǜAG�ރ������X
#K��e���\78s���u+g���y�3��n��2&�H�?��r J���s��4l��+������+;\����b3���C��Ï
��א��c��"���Ư4�wT�#�:�I�c6�	~�Ёl��b�n2���|�p��y�8��0l{};$�i{Ö�uk���l(o�G��J+$k�"��E)?�>�X��<q��bX�$�U�j�7�G�Vm��^y�K���uJ��e/{����x��:+���IKU��0�X�h(B
-+�&��@����n��'1�t�f�?L�%�蟿�Vj<�^L�ck'�
Xq����ǓO���<[��}��H�[����k1�t�}�#~׆tSg�
��N8�@�xh$e��\�]����д�g>�n哿,�;6��?�9�%���_�a������.*v��bzm�жCU����2HLɛ�7�1�Ug�Q�3�]O�](�%���ir;旙�d[�֋I��F2�!^�x��{�\�1:��<H���a�h���[ʫ�0��>s4O4C��<�nLKW�scL�3+*��g���Az�O�w�m�ƿ:�;C��C�c�Ԡ��b�
���$�=?hc
���
~>�'���9b��ٰ���k����2���kݎ%�l���FV��T�'�~��J��G�k ����p\��v.7��[ٿ�}�������[��
������4���p��i�/�R��U����������t{����}=�������o����q�qM��n����5��`p]<Tگ��}�������0ϟ^����Zzl�(��]s=�����}��@��]��LMI�X��y��xm`���[Z℮ǥC�b2�Ǝ!��F�a�2@���K����7�x{�?�-��u0&c`��_,V�����_��O��Ͼ@
a�k7��c��Tgp�Qz���n���&�����gV���dvW��{�}@��
W��-�泱��Ȗ���W���R7���B�`zoT����΋���!���l©�+lo��E�� /��,tǥ۳˃����zֳ^�ۿ���ó���o��^@�����+���֗�~���J�_�[(6����n�?Xp��ehl�9tC�>�v˸�?���"�nVr��ˉKM�sQ�Y�p����O\c��nG��gS<0�J�Ql��p�G�&{+[���"Vk��<���&��:̽M�xG̼G�l�ʗ��d
�0A����'���RF���f\ 䒝�2z`M.��Е��xO?��PX��\0K>F`����4>�[2t�m���O���z�v�����۹<�/yO4����+��������^j%��V�<rh����Ni�l���w&�3X�~����o��{s^�b�z."~]?ǭ�y��2�u�ڃ�\"��)%q���FY�@o*��R�>w�5*8�|.;$��G�8�,����(y��v�-�$2rB�fI=^B�:DG>e6<�)��/�� �os��|�Ƃa�mj��"��1,��ژ���VTt<�맢��S?�
|�0�t��y�I�����H_�S�|�֨�zͥ���DD|�,���uݲ%��
�lg����i:|�������g�?�]ң�#�?��?���������z׻~O��7&]<��r���W����]*�x���^Kӟ��
����<��O}������?������b�X���C�����sC�������,TF�������A@/��,`�6E��<�D�+�V��0�l�p�Ȍ�G,�c~x+�"H��QQsϸ��o`��i}$�ƛ�+6�N?�S6Bbۏ]��`Bk��{��&���ę�+��<n���M���ۡf��E��!+��m20�'Z�9��>bGd����b'Ց��o�!��T�ȕ9G]
~��v��OT(Yu�pGT��kc˝c�Ǘc��[}���R�|�����<����e���>�~ł�[��)o0�|›���9�X���9�w��;���5L�9R�u�8�mn����DY��(f�u|x3?�����D��>��aR����/�����@�ha8���\�qj'`�}���7�nk���1+�h��O���2��yO�I?ܩ5f�7wv?��Z������G��d�
Mʸ�F[�t�爚G{؇�8ͱ�{ ���<.�bG�{4�c>e�/�q���+p�ti�
-+<*����C��n����'��
o��;���ő~��"�;}3�]g�w���'��o����Z�(*Å��5�{4.��徸�c]ˀ8��u�f�a�p��X���8B���&>
:,
-+��K{i�G�ר�zn0a����CNņ�Hs�._�L��-c�I9����9�H����ZT��]�D��0LLjU]�i�V�|S
�NFe��Ăo�I��3qD!��K�C�U����S��Om��^]�YU|u���}}�=�<)��5v}&����/���.|�pfA��m4����u��6N;?�{5)��Gs���R��^�S:)��#~N��otM�1Dko�u�Qs�΍n�-�a���8��U�����	��pzh��
��,�f�%»����A��8��Py+�b���mX+���qv����q��:���U�Z���W.��՟�4�B�O��r��
��U#���R��x֑��~��-W��֮���6q����Gh��o�W���g?�F��)ފ��°ɱ����,��a�>r�<�z�Vm����,��������?L�c� ����#�	x��8ڂ(�؛�g\�&7t��Cv��˨5�]{�GLp�ѩO������N�Z�X���Rq�z��z��L��֍���_�T=Ua]ծ�Zk�-���EZݛ��N~��n�k��׿���/�?4�w�!+<Q�=�J|	�!T������_��/�17��{ի^��|��~����/4�;}3�^��w��;o�+�]���t��W��_�����T�?ל[^y�U�z�/�mz�&����	Y��-}G������b#unw�"Q˃�����,�V�F!�̓������[x#pgt�"\A�=��+̬�'�׏�Ԗ�n�b��xxed��[��aE
[��u��5�C�����ˬHAS7YL
Vo�"%�a[��G��Ӭ�h8���o�(,���y�6q�@L<�^qE7kځr��|b�V0�#p~"���r��3�?���
Fg�km�i_������|Xv�?<aGF�\���n���u�����@�D�M�x�N��Zx0�H��n�嬽�K��Fղ� ��X`�C��g��HuH�X�Gl����y���d~a26���?bc+�J��6>�1��:���0;�kd�<1P'�D�+FG9�`����{X�#34̳�G�1*F0J(���	���~���4�h�g�|&�m��0�ĸ2��DZ�Ν�'�)���\C��̯��u+�DWZ�g��`v{�Hq�l��?`Q2^�%��H�{�牋0�@�t���yP��6�7\ۑջ.3��Z�^�O<������+>��l�ӄb��#qݩzI����Ѝ�b4���)�F�ȕ9%�Y/�z^�(�e�:,C��`�`�>�M�b�;�ѐ�36��d>�H����Qa�W�'��) ����s>��Y�R�ZF����N>�nX;
g�#;�|�d���ȈxVF�uO�YT�SbO��"�w��={�wnv����G\g/P�����y;}���wM��u<9��t��A��+���LH�@.�r�ى��[ի'e�������7~��}�?�	����m�	��{a�-�CT���ǟ��@6\_r=���$��%�El����Y�ys0<h6�<��z�:\�m'{蠄JT♍�jӟځQ�f�i��$���+�e"F9 ښ��O�c��+&34���:���s(����0�b�%X��	2,��Z�����6:,�Zq�φ���^Q#�Śna�K�X���9a��dn�U�u�����.��͹�UԽv�k=7��y������ŝZQ���i�ʓ�Y\p�����ɛ�ɸ��^m/��h4>z5���)�z8�5�^��=�� aj �iF�]�ˆ�W��)�L}�������V:�om��/+
�y�!=�X�b|���Jl�����q�� �9��ܛcTlz;F��n`���$I}. fj>��'X5f�+�oX��p�¤ꩯUo�@�!���ꑷU��aϬ�<�ԥ7��4�7)�HH��H�u.��(
-+Ϛ+��Ow�]:`�?���	�f�Wd�]{	{�����+U�
-+�+�JI"#���8똞W�:�p�٬����'�8�pbG+��e<{$7T�54ܑ/���-�sյ�8+�c�j���/u���~�V3^5XM
-+���kP��A瓴0��^��� 8x'����H���8�7S�w��ђe��E���@�oq�ʵ�,����)������|�
u����~j��33��i���6��t��%~��?��:ڶ@8
�7;��r���oo���c�c��o��E���mֿ�C�S\;�Sca���i,}��<Ǐ1�&�o��!s��Rk+�&vs�c|��<'�M��JM����˩i�&��[ķ�v�g�e�.�/S��Ӛ"뢟��
�YB�5��z�5�p���F"�Μ���'��3�y��a�i��9B0�?����έ���Q��n]����Ꮖ����@������'e�;�]�W�
-+��V�6�Q��������vu�Νࡳ����������/y�K��?������ZK��N��۟/�K�
-+\+����H4����$�?�iG��ˑ͹�������\+��d5��w.�Kӈ^��#��b&�^�})ZD�Ht�܀
w�[�80ʤ�i�A,������z֕
�;eY�#ksl'�kq��?l�@�-�(�B}r}�Y3xz阸��14kh�ϫ�x�5����7�m6uz0���(�k1>����82^��A�l,����1�$6~��{4���'�Ǘߗ��xXv��zo��B_zNE6x�c�o����c������Qf�"�Z�l��
-+�
}���\[��=��.и,�=>ʓEV0H
0�<�->���٬��S�?k^�}�4����]W��=B˺��{i�mS����%�w���9ō��΢q��Np)Be���.+}]��1J�Әw�u���K����E_����?�S?�ǒ�o/��$V�z�0�]�:��w��G��+�b53��&Rp<�4��E7�ꌥ���c�
S�+�+~�f���$��'X�`���fM+�(��2Po�D����<���(��B����8�9���s��<&��_�9O<X�UaO�rrͪʹ����	�G^+�1/���2����K0�<
���<�"
�����t��ͩO�ۯ�5a�`
�+� �/gx
-+еb��ea�$kj�n2k��.:Y��W�J�i��^bk&h+w�d]O�,��xh����J�~�qg�^��?��x���S�4�ݞGK��t�:���NW�aŸ�N�y&�^���?��/~��=�������������Zg��j���(��x��B_*�Q���
�G��'���~B��4=�����w}�w}��}���o:y?[��ܸ�ӽ�;�/w�ֹ���u}���?��f��0\�����\�%b#ܿ�z.�|r�k}��\Y���o�n�7���"�����"����r��j�.m��'�M��ٷ끇RY������x�ڂ7�5F�O�:���uD&r�
-+wQ��E@Ũ
x;�
|�p�:��8:D�S^c�=�g]Q
�`�D��)k��o,�N�{b��y!�br����=f(r�̼>LB�̯mql����e�&�]V}�2_�[���2�n0�kP��|<������"����&�
�xuH���=1C�6|������x���i	�� *wN@��9�"M�3��@�Ff�Dj�nM��;_&�=O�]@�ã-�3&
p	2賆�f��bκ�&�#<ŭ��l�˚�N�������L��{w���>����+��	b�y>���j�6���c�¥�=v�M L>ą����4�i�Z��<�$����ŴYɊu���o�<i��v�
���y�q���O��FÜ�Ī7�9�9��mb9D�Z��?Jv�7�&(���	R|�;�H������k����'���!����'z��<r��������|
r6��x:��&P��eI,8&넹�'�؛��;C4Y7f�>��_�Pd�[��G��~N[��u�9�[�N�����������_������������<�뜏�+e��C?���?������S���B!�I��|N�''u��'��������c6n��?���=���mw���Yc8a2�"&���P[�pYuAo�%���+ԣ���ip6~`�NlK���I\��GW�n�٠�b80��~���[:x�ـOWt0��~#�_���t��l��Sy�v���̳�w�����K�1w��:��ic��Z(5��p���ę]�^.ew���3Ʃ��0�`�2��y�����=�9@,{�Q�P+g?�*�?Ml�I�l�/�dY�W�n'���uZ�}��'�qrA�ϟZ���Y�<���L�Ϟ����h5�)�I�WW~Y�?�������?h�8���+�W>���l*9ɮ)�V?�A�#�����@ ��qb���woBB���u5��J��^V��,�|b��l�F���Wt�)�`H���x�9^���B&N�YR�'\m��Cݴ%׸�oV��~`�d���,�R�1���z�0�qyֹ5��>F�|j2��A�Z���k���k���|j�aT�+�6���V�l��R}s]�q��q����Gˆ�ǿ8��Z��Zc\�Ԋ��$��,��h�94O�|���aǎ�ھNj�0ϴ��E�?|��$�C�(D�{n|�=���7�)�kZc�
8�ʎ�V�fr+��p;���o����������o����[�ÏP(^~���K�齇��K>��}{i�
-+<Z���{���u����t����W��I��7�	\�=T���_���+��'7�\��9�nov�i���=c�D<�\�����n�Ч�k�+�q���z���3��V|�k_���ҟf����'h䷻�ܭ�u>w���U��J��?p�ƻ�t�f�7[U��G�
B���7��{�����}b&L��p4
D�V��ɖ�9����OȲA�
-+@�S�?I�v
3�7+������]c����W��ߢ���Qi����C	��D����̻��?P_�tm��*+ �=���A�Z�
>�C5�=��(��q3�X�Ӎ����E��]��7�o�x<�AB����k`�ѧB�v��6��r���+�8�-<?D���r0���9N��a���p�8�`�3g
əK�3�8C�r�A/���S��+�':蛽�R!���������o�� �f��'s^�?���J3X�݋�m�E�o� �����s�ݛ�2��.γ��8��n@�|��Lxc�Xd�Ѿ�O���`T�d”��������t`x�
-+�Wf�����{fň�P��O}�u��
-+eb7�c�4R��߅�7��ԩA:^�F�P ��Ff��p���ҵ�T��ں�6�f}>�1�-+���:��z̭�|l2߇?":s~D�s)<�����V2��,�]5&�9��[A�J��!�N�"C�x�ʋ�_jد�[r�����X*G��r3׼b�:�f�3�X�{�O��IL`�o����V�,���n�A� ��A����.�%��Լk`��R�6��Ƨ:ض���	4z0�A�95�a��0{�$t���.2pm7�:1+\+�sB�1����l��=�	G*�e��<lq�G�Z�T���!��$�\"��,\5��9�{�-�v�s3v�#���6>�f�ge{�L_�@�8[-����QO���f��?%u�c`��!��Z�<H�(輇XM�h�z�抵n~%#%�z�#Vp�ub�>����^~�aݵ�?l
��x
��1s��%����=�kE?��K����<t0Mn+g�~`���岌m���>q ��g���ɺ"�i�`ڣ�U�.�}_v��>�ۚ~�1��K~8%��^kӪ�
�C��=���+Fs�����D��7�8���ᒎs5�1J��
g��m���d�����J}�?���{W��	2�̃���&q\��r��[�l8�������r�Ib�(��
���x����
T�.=��?��145u
�t���o�Q��Sy�P[z^j�֘Z�GV;�\Oj�B�fR��O�l�y���΃6�AEZ[j�s�
��j>�"�e��bȈ����4x��y��7�0C<����_���7��^�����r���Uc�i����R�G��������`*еFN3fw������~���/��=��|��wݺ����Pyw
&����vr|�K��_y�=zL�X���[{0�(r)�p.�1d�Pݹxڧ7\��y�Ѝ@.ɂ�����
H6��7��[.L����{�;�#q���3��������=��Q�F$��h?�u���ʧ�W=L'�
-+��fi�+�wWKP����{~�t�­una�N�wN`���[I���17���G�S�W˫�xo!s�*X{�t����cF�E�V;��rn��K���-���q3�h�{�3'�ca��~�����Y��?$����.�����y<+U���_��M��A��%�
-+
��.x�*�3�#��|��*�u���}q���{���/��o�{�zֳ�m���p_ n����w�rsH�\��b��G���\@���*e���I��u8q`Z�+\�&������-
/9��������(��me�#��m��1U�.���Q��=�K}�3<	�������17^3S�h�����ko�0�������׃�$O3�^3��+���^+����3��4�߱X\'��E�k��(z������<L<�;�XhXl��Ք���ډ��s{v#�¸�wx���)
����` 
-+�.�t��=:�œ+r[��c8�T"L�eZ����ަ�>��?<��������zѠ*�6��s3bdZ�����o|5bu6}/�:e~������t�z��8^����v���-����T�ַ�����������P(^��/���{�K�T�a����V�إ�@���C�/vٌ����_��W}�}�]�s�;
��Íw3��O�E�����
�3�OBsa�\���"�ᴈ\@�r#�*,+���a/��w����{���Y޷g<'����0�1��M�	
����(!RQ��QӨD!�A���H���*�!m�*M��i�8J*��RY�Ƅ��&��	6�bS۱S��=|�����k=�}��flL���}ϳ�u����s|߽w�Spk O�7+B,'��+��0�A�����S,��r�ȍ] ����XMϧ���y@J1dD0��RI��u��IrS*�i�_�{�	��z��:��j)yk=s,P��ѓ�W��<��x��O#o7���9�9&�E�c�l�'΅#��fh�KzP�]l�/�vl$���:�q����|ꔗTH4/���d���(H;P�&y��}����{��d�f��cǒh�C�J�ak\la�k�v�=��������Y���.;
-+��
-+�X�,c,�C	�1H�|�f����<Nl���_K�"�
-8����k��Pq�#�'�_^��\D��6��6��
T�3Љ�A^��;�	uK+o������z�k^��O��QƮ�Y���{}i�
-+|�*p�%���R^��*��J�зڸz�o/|���G����������R{��N�N��G����˱�2��o��c=�?��,ܜ�9���FJ�R*_�Мu�Ǧ�/�2��į���p��yF�7��6�ÈdBt���m.��s4dۈ��8�M�=�YX�����L$7��?[���|R�d�F.���0�2Z"���ˈ��SA	�b��㕄�u�3Na�^8�{�W1�_�`�<��/m��3Aő��7�zp��|&�Hő<��pD+�ޖadE�"�ћk���2���FU��f�8���+�z�ŗɌ�d0]K�k�7b����l��E?�GN�!\c��*Pļ��/1�1��c��޴��!����� �z�Lv�1־j�x%��EOϾ���������|��H��������u��D�^��R0+��%�����̘y�y4n��_������5�0�`b�s�����6�-kyt�ȵ� ~���������xY##���?o��L�F/�D��X�s����Z�?Ur�95�9��l|���q�\��p�>?M@
c�t�9��kA<�Y~��(�e�1�|N���EL@+�����~��:��lTMklM�o�;.����?=���+�E�o+}TСL���BS�U�2����	�b��bP�
-+����=�����DKX�#��M�EF�����%�|b�|en����\
!E+��s��.T�^���k,
H����Ws���M�d�z2��~f�Q�7���xƗ.7�=v�3/�c�^C�C>��5�袓#��
-+~�N��K{d���J���C�A�SĆf���w$�O�g<� /��`�,0�k�)
�kr<���:r�'��d('���*+�nv6z�C	�8��
=���1O�-��Tt�ʅ���]D'�X���0C��Z#��k��_�j#�9H���4܈0�q^t��[LQk&��� �-�Dv����.&��T�1������*�o`�
?��Z�%:�U��n����p�+4��=��#��������<�D�sr
`ܓ�N���X�;��I�\����?��W�׍{�Ս/�/1�@�qqt\&,�X��G�_S>����z.�"O�ʽ7��Sy��	u�R�r�g�3������^'�'��MΩ�APH2�4��:>�O-hG^�(7�V��Q$��&>u+��x��z�ܼ"w��E�v0v�c�����$'�`��+�p2`�t��,�G��Z�Ln1�_q05�h�d�6��};ND���C�����������=�X��Vi��i��I��I�\~í�q��۾����{��lnh���FB���MC����.��*�#󳂸_*�*�k��C�o������?�c?�����ݞ�����|�O�;]����9���8�לO���_�8����N�[���[:\8�̐�҃�F4�.�\А�"hA�
-+;�A�\CM�F�Þ��*�e�@�H�{蘊�E�0�7{�
bh�7� ��ޤ{X
k뵃�
cEvS(����k���\�t8y�p�(S0�H4�c��b����a��+ګ��p�x�#��v5��N�������R��Ň0�����{hh�\0�Y������\/�.S^�$��HR��\/��"J�kppD%�*+�u�y?�r��>;t����b���?
-+!:ਁ3���R�hX�9o��$N���"������*��?��X!�@<�nĖ�٧M�p+8�`�8m�<0$gMY5R*�lG�
�0�	 �\CI����gV(+�ANs���'�Ҙ�ѵ=)E[�"�R�<o�M��!k{�ʋ��	��m�'Npcʼnar���*�_���^)�K��\�o�K'x��b��ܦ&�����$",��^j����IZ�U�b
]J�.X~��|��oQ� �=m����pl�Zv?�t��ʝ<���>�!�[-��V������z/����'����8֤�A��o�c�^��Z���@#�Z*`
-+n��4��C��ب�U���dK��@�'6P4Ne|N�V|g=;�4��$b��̎G��/��{��a̖�W�[�
���3���Z{)ܴ���c�x�uD�*z����-)���n.�޶
-+�咫�\-�zl��z���+\��s�T��/�+��_(��p����t��'����ň���!���?
-+�S�y?���MΞ�|f���*�<Pぽgf�c̏����Nw|�9%jR�]	�O��I�1x����#7Ot,��7���_��{��'Z�ƥ�<1��Ϸ#z�<�:�W*7�����
^�W�zg��u���g-�Z�^���?�+�ڍl�^�׵k�	E!4Y��-�:3=Zk|*���S��(��&��
�yx,�N��8Y>��"?֪��?�;�2����Y�?����[�.ʼn
LHb�+,;��:E+�;�)����k�����o��_��_��&����m;�+��
-+<�
-+\ѓ*�E��
-+t
�=t7_?5�߷����g��W~�W��3���?t
�b���kO���x�J��zS�[+���g���/�q%m�nާ@���
�)�ik���А�xy�a�i��1���̼�)��U�jէz����x�S��[�b�ȳ���_�ɱ�I#���>��q	��q�3�]��GF���o���M�HM2:^͙��U���A,���Ѷ��?����ɰZ~�`�m�M�F�dt�?'c�2	�sA֫�9�Ϭ��7�J��Fh�ߎ%�o���q�
����DJ!��0ՙ9���YV+re�%�a�u�p�&<<�/&�75��
4��pRH�V�r�P��GnۃK�k��?tt{s&��C�;/�1
�x��+���@�����K��C���IM+ş,/��!���,�k�}S�\v��&��& �?b��
���T+S1�>��'�'��/�aG���5�؋���Am�Yy�,c9�R=�����/\�qk<&�:(��×_ϕ�N-z��\��nĨFTݯ�FfѶ+��J���d�d��M�%I��%F��Ǖm���'>�c;�X
��ۈy�@���_�WO���`��^sa'�/�s=&��ﰽ�E�_��IԒ���F��=<�J���N�-���0�	C�?p&s��A�{�d�.���e{�{���}J\ǣ�"�M����R��5�p���ε�J�6<��Y._�.�ޗ�V����=��p�D��acZDŽ˿���𰀤L1�	�/��6�D^���8
?�m�E/�U|��g���{����W���{���Q_+�����>o��G���S��'~������::���_B��4���'�r�����+�L��o>}�UD�:k�Q��[CH=j\F�Cu�.L]��g���Vϰ6�i�գ�kz�C������U����AA��I ����+~dvlE$0��+u�pXw�sk����+�|�-�
���:����9���u��۽1�뗝qᘬg�����||��mY�CF��0vY�x��I�rJ�d�4�TPF�0��U�X:c�'�1?�?�D�����\[�u�zQ1����0�#k"+4����
-+3^�Ip�bE#��n���t�
��A� &�nя(v��{/�I֝v���Y
kA�>��>���gl�������b�Y�C�?")[�|��ԼGZ�p�������p�	m|�8+�~S�@�n����<�uL^F?	ο8�Gy�b�G?�S?�!E���DF%]���\D�
-+�u.��KuQ�*�uCNsꆷ��l_������G~�G^w����Ɵ��ߨ��;]�z�x�A������"h.�\L�ז��Z<�Ց�\
-+��;0P�.x�ŏ&����/%F�VkX{T��M27I���$L�`$��#Gblz��i��CI�v/�DzХ���_��U�x���Z�����V��M�n�<�fD���{;r^];�_-����dlC���g�����_�W�j^�|�!�3w��r1�NlNv���,�\�צ� ��M��q���
��M���K�#�&�+\�[�tRGj1�N�2̧���U�d�T{�t���Y�e��S����]��G���<��n���,)ouKH���Ċ�i�b����:e
��ʎ�
�yy�G�Y��AǮ�"��\=.���
��-n�]礞����/��͈�R�kZ�ra��j��{<^��ڈ]c���W��Y6:�5~�lK����"�S�����ӂ����O2ϊD���4V�b'��!ƽ�e CO]�rA�T
�Zjә���/
�IαQݔ���<���������Ә\'��S�h�3W�u��>�J����8$9*6@6WHմk�|[�!��h�5,G����%�u�æ�sz������4�>��x�&���"�Du�y�����SUQ�k�Q"n0c�%"ھG�2�yy���4�j�9�;�%x/��3W��c����9j~ƚur��Y�k<>��c�������o~�U�G�1U�Hz�4�Nkxi�
-+�]�л;�֥�@���Cw�A�~���֗�g���~���������Y���8��W3�js%�2LL���-־-��9��m
-+~���>~�����i�fז`�bx&�^��4�7Zc{HF�
-+����%D�,�ӹ��/W+�+&\�]3����
m��6����(a��W�����������/c���|�G�;����wk�7J1��F����M�Td��]ڥ��+jҒ��+�Ժ�f��uA�Ӯ���/��Z/�u����iׅf;�kt	+��Z��CG#b��Y�M$ղf���MP�V{���̲�O���?�9V�qr�7E
���x����~��O}���1ꛤ���w����`JRz��?�o|<Kٔ��#�9R!��e�=�v��q��b�����9p���k�5`#���y�r1�����O�.>����z�[�Z0>�W*E����
��{����\�(�-��#�3BƆɽ��S����^���4�SŰӕ�v��ϝ����<�9���?��?�g��"m�c;�$.%��q�����T���F�ºT ��e?��tOR������w��k��[���M��A���ʜ0���Y��{���8�	�z��Ϟ�Y_��}|ʱJ5��K]/nV	��u� 6��#�\�<�=�4.s���<��g|�^+Bo~���c/`M��ٍh<�t҇��wG<��&�o��xdر��X��WO��c����v�7(�B�^J0����µ�Op�H�Nɮ��=;��M��Y퓁T����a���N�!Z��f��!�p���msT�������ghs �'/�����tL��`�@G�眸V+M�=@����E�����z��}�^=K=���b��׆�kʷ�ap�=7=M/
��Ob���h��a�'�bc�зh��Ϊ�ll�yOP�0�)&� P�c:��}i
{���b=z�}�+pގ"�K.�K�d./+�}Jя��'�Ş5��H�D��z���qN��a1��
-+��|W��9�X�l��h��8�b��<k�c��.�t��|l���lj�q$�D
�^�v��#|9�����ⲽF0����o\ ��Gi���=�c��oD�n�����3J�e�6s���z��xI.Ĕ�0�M��2n������5��_�U_�M����-oy�Gd��8]e�1��۳��M�B^*pZ��B9��et}�N��w�����K_��G����塇����tB��S����q8�V�\Ƹ2������?�q��'|�C���}F]�{�m����Թ:XY,{EO<�|
������ظS0N~��
hܼ`��v���#8�Y.�KƟ�w�ǫ-���N\�f@0��v�6����r���4��
|�ڿ�iP��8ܸ�;�ŭ�zM2,�eC�����e@u$������������3�y`;l�f�W疺9ݡEp�̧m�Y7R�9<(nɉ3��Mͧ�v��>��%l����_��t�9�IE��kx�cjbC��[�ahP�꫷��O-
p���M="�sI��_{�9l��9;�N(Q�P�(Ă�=lm�i�y���w'��Do��c7]��Gg�!��=G�����36�F;���D.�b�w�+_&�:�^�P73��`:7���{��d�8T�s�]ߙJ>������al��<�f~\/��d����C��j��y�5���\;��3}a`@�i��kG�J\��	�l�7���wŶ֔��������
C7��w:�&�#��E'�s���
�:��N��d3�1����ґ>5G�5>�	Z�}�\?<h-�9��C��<�:����.�c�5�\��d�'��=��C�/��f��|�?!E���m���;���S�訣���Λ��u}�
A��Ǿi��trxf���?���_�[���`���~��7>�ѫO��'�>u㱫�}J~��W�=�iW��z������ЃW���W�������wc5䊑щ�W�	�ŀ���z�KL�s>v���i�nD�ĺ���1��ji�b�^շ4��V�i�8�u�h=�vN
-+]?��<m��o�<D��W.�4���zx����+�c����v�`������o�y�/��192�9��t�́@��Ays����As�oa����K\�#�9펺x��9�z��p�@��,^c����4�[8췬�#\0s��mF�+ܲ]��4WUx��۳��{��~�w�ߖ����	Q:�mw�?�����;׿��ퟺ��W�SX\O�N�f
?�i�B�.Z��@<��ыO.�9G�ɥ�K�a�k�{�<H ͗�0e+�qI���O�L9Er�8����k�����3�o��>��Զ(����Q{��Okf]�B�V�4��-��x�	o�+�+w��}$Ǽ���5l|[9&�����C�qvmQ��a1���;�u���_ӧ���
-+~�>�yW�������+���|@�V��E��g?���to��9�{��w����R�a�[��c�n ���ͱ�|����DJ��U��qTf6��������W+hqY�!�cs�v�Ə����/vle�${�2?ntP�s�zCr�����P�&Q�Y;
]��~�r�S����qԁ]�1~�x�LF"�l"?o�s��+�J��>}7���^��׽�5�y�����c:as�Wk���YO�;훽3]�Ţ�N���y����>s������W��'��b�4F�qCL�`��|��XT�|�Ut����s�a��>���>��
S��>}�C��/N�ǻ��
 ���!��CK�w�z5.�?5��un|jg�tS���;<����5�M��������ጟa�'��+G��@����ϙ�3/��P��_�<k!�@ҫ<�ȩ�����ؘ�~��$6�Y3	W��`5��8l�G"�����$�q���'T��~�}(�a���2��ȼ����أ皏�%�/����P`��|>!�b���` $/�o�H�(>��4��Y�͠����K��=�����?O?���.�
3Q;%c�ү��W�G����z���ۡ�v��z���|\os'�O<��/��/�]n�z�?��i}���5�yH�fxT�ߥG�2w�гE#k�� =��?5hp���
-+�Ӡ�[�%�o����8��=k
��9�>@��@m�;~�ϲ�C.¥�"~_��
S5v��}BA#�����4���N��46[��)��F�
-+�4���ă�U��|F���G�+HGYL.�i�q����s߂?��`�]l��.���pil������X���V�}��������`0g�VV(�}�i`s�Ԭ{T�o�z�z�#G=C�8�j��v�ϕ��(8E�\+on��������K�%����_|��M��O�]���h�ɌV!b?�|�ֱ6R�F�)��J����
-+r��M�+?ڳ�%6V@w:?�V�����܄�'��-tw㬾`F�08�oT��YO\݁���'����������M1/�A�up�q��-^�7?������z
��>�W?��?q���`Ku�tR76k���]Rw�����o���W�����<����?��
��7ǎ-h�\�k��Jk��T9�َ��\s(ϻ�|̂<O>���[�.��K'_������$6�����!2�Ů���
-+'�T]���ٜӱ�B����7\�6:�v�g������"��J��|\�2�=�&{c۶#��}' Zq�;�[�1����󬯑�#�[�.g���G,�gM5��:��Q-����uy(E�Vg;̉[��F����Dv��Œ�
�
��dTkd��f
q=G]���O��@?�@�:ۙ����c�7Z�jc=�Y�~�kj0Eǯ5��v;��鬒`s�C�x���
��%�3�x���Q�?��5�O�U������S��~���v
=��B�o=�������S8��k���+�*��G�9M0�)܌WO��S�T�殿�`�%��Z�X5�^�y�?�F�G�C_��ci{]8
��}�i~����Zb�Zv
-+���{��
O�~�.�D�С���V��Kb�?�ֵ�� ͷ،�Jr�wmE���X��ۣ�5l��
-+8:ϒ����}̕�hL�]#{r;��y���?��_�_�݊��զT��+�\|��B�o�x��P��T0�傒OM4�U�2n
-+zq�P[_�7샃���@�@
-+>7�H{}Ų�#ޕ�?Q�DC�
v�������~3���9���חD�3���6N���r�O����U�!HH\���a���?��s��i!l��
/2��(
Qp}A�
�/���a�&�L�e�ه���>@������,q�f�"̢�&j�!T��똇���e��-����[��K��HS�l�u�_�d�nU��$���8����ȱ%GBp識�'mr�]e�=�}CI>�q�
8l[{��^�b,Pդ��_x�����7^�s�7�DK��ћ�z�4z���PL�
e����D`~�o�=���W���O@�_�_�i�.[}K�!��Q͵���
Z1?t�d������Z�8װ����V�Xx��6�S��p���4'C7Vp�yć�����3X��PE�ֿx�K�k�:ϋ[�|K��������~i�E��鉗��EғRRH^�m�"�\3�
-+L�$�Em�S��ƍ�<[ΐ�s���3�6��w�M�"ݐ�S�\�~9b=4lk�NU؍��]�\�`��_�T/�`s44h�8t*��
�6�>�1f�A�.(�a�5�:[�P^'���'�a����F�
~�p����r8�`~��F�o9C���5�k�`�ьOC�"}�D�2<Y�>	���o�t
�ݸ\���ZW�~�3;�|R9����'�K
[[��޽}>�/��/��7n�ԛ���O~?u��U�kd��$��م������mF�Z>]{�Ɲ�yϽ*��_���mo{��Лɯ���'����4��D�u}��m��?�\8���2O�q%^�%�::��a���'O�s��57w�����G�x�oM�Z7��4�\K��%v"�GSy�����Q�(�hr#0��r3*E�g� �ɫ��Q��g�qX}�G�#�:�2��:�o��O� �m��;��K����������UOV�b/�r2`���k���(ҧ��G��9Uo{�.�ѧ�X����σ���fƐ��Z�mb��Gnx�P���9�.6ˁ4K~a!k�:�2��<��`�ZK׷lR���Շ
p�
kP�/��VqĀVm��Z�!2��Cz��Nn�;U�M@c�����l�=�-��ײ�z\$�'���_���S�q���{?�SW���o[u2�$�{�tN=�|�Q��\���a�����Jڽ�%/�����?q����itC �y@�]��OLax������4���4��u)Bȿq�d]�Z�L���a����r���nQ��f蜄��_�^�����[]F�.�Ծ��I@�b�Z�^��E)�S�9'`�c����2�S��I*�z3x��q�\��$���jV{�i��_�sC[��Y�x�몉S�QX#`2-�=�O�z]��2
��9��0���bM�]��M�2�)u�=mz���`�re��e�y''t�s�~���S�ɿ�v�Sn+�}ׯsK`54^��ب����د�G,Mcԫk�mg7^�c �W�/��1�t?$q�|����w�}��_|ի^��~�x�l��]t>¢�+��-^}b�%N����O��3r��[�K���e+�Ą5���0O�BH�ґ�����S�Tw�%I��o�s�t�)i��'@��~��0�'����0Qj��QB�1�5;�]K�Ӱ������YY�ںg�͇�†F�Wt�y�ѱ�^�q}��yt��hQDi�x�X7�E}�,��6�����]�c���񧆝�=W���_�o
��]�翻��6�<������<��[~�~�?
xC[�Ū�B_ڥ�V���ڲ|�0{��{h����Ϸ/҃�W~��}�_ӟ�{�g[-��q�{B)�:�z�<��=���\�uYQ+h��W��
����G���eA���-�{��������_~��?"{�+�e�L�d��2�+���]��a^
�
-+t�w
-+߃��~y(����p�[�����f���
t۰0������N��
{��>����p��cw;J�.JR�v��
���u��˟����ys_����A���	e��U���+7��A0+��+���<���n������7�jrm\�=�v�I��*��o�h��'q�B~����
����Ϲ�WFX���|dλ��5�5��K�$ܱR'z�MA�,���1EM~����˫�}���۱���zmBic�WҜu��FQo�
���׀�$��:x��� ����C����_��H�{\��
-+x��y��F��_��_����{�_�S�ޘ�;ߺ�2�}C�YZ����GW�nW�XЋ��i���ǹq�?�J|g��#��Q=�}v�{D0��d�n���=^=�-nY��nh~Q�

��7�-���wl�!҈!D��`^�P��}�9�m3��Z�
xP��7)�<�F�ĉ
2J���$Ճ�e��6r���o?@�g��T@b��C/j��g]�����ņb��$Mg%IwI�m�%}9&��8
��C�?r�4����	�Lz5�'�,Q�oXNZ&�=�?��p�����AK�хIn��Ͼ�G-�̏��[���$�V|׿䅴Z�k�r3>µ�� �-��og��l�i#��ct&}��Z@��I�%��Ù� 0�"�Q6�Os�+[����'��2�xl<|�“<���}�+<^�ߩ��>����N�������
Od�������t�EN4a�(�qËV���Ty����X��㸓�|�����_3c栴w�/
wN_����+Ͻ�gG:6*�M�
��F�Zy��}��}�w�w��ڀ��:�/�l���M��)���쟎�X�����G����ӭA�cgs���DPs��R:i�A�qS����z��ǘK�� 
-+7����
Ӱ�CO�mB�P�p�ы���D��'���rƷy`�
�����
-+��e,}�s��{ק��AF �Q�<ED���,~6#
�y���s6�
����Di
��.���[y���_��U�|�}Td�o"��n���3����S?<���!8���ȣ�FCE�o~�[}����&(�zh�^
�Y���"�֍=��q�Y$�ѡP>ki:���
-+?hb�ÕK�1=Ï�1�E����y��3�%�1O����������#���������Jc��ג�|tl��`և�����x�*1j�T�5/E)6�4܎��?����_��������� �N�oX;8�Î��V��Y'�+�s^�H�iK��+�]i�㶜�����]��S�fƿ���$U#Qu�����
���bF���Y��^z�a�]�;����Cc��d���b����*�rb$(t�a���u��&�J��H&o�zm�
��@��}v�������X�������/����������C���j�-��� R��\��H���s~������	�O	P^�Co���^�������^��&����\.�`������~Jt�w�x;�[Jٛ�oTx�l��=�NJ��4
-+V��b�%���Ź�hul߽��+!���5f����-�£��|��jQ��Kl�\/�q���|��+O2�E�4`��\yxcՏ�eU��?Z�KS��2|i$���ߔ@O�<������8�𑃾��B'WB�g^��K]�rȱ~\p��|2O^�
���w�̩�8�aԠ��Y�	�(�Փ�ױ�
R�̧�c�X9'��ʷe�����2���
����z��H|��v$��w1L"$�7\k�&�"11��gL2Q�B��$82+���;���d����ON��_z,�q�|�����W�C[���PZ�R�R/0�0�e�j���\.8�/9����%�c�=v��_~�{���J��F|��E|p�ו��E`k��\����-��t�倳=�PS{�?����#BƵ������$��U�o�W�����=/��G�x�WS��r}U��qp+��<�F'�~:B/�%��d�q&�]����W��3��+p��3��q�o�.��2���5�=�+�^/��q��S6�n���c������4�7]���l˸��D"�т�T�&��ё���>����/S�}d0YKpO�gb7
-+x��v�J���M��%ytV�q�.�I$�8�\,[N�:��ݐ��H��T%p��2:d�����bZ��s�g����Dh�,�+_��;d6]>���	>Mx.��`qX�5�����V��0W��E�.u"-���f?�Z)?��A0�X3ӈ�Cm�
�N�:�5	{�%@J4��z�<s�d�;1��Q�;#Po0��";�\IU�df+�+�O|&����_԰kmv���l�/�c�Ĥ�V������W?��o��_��5��z=e�����l�{���,�+�h��C�?�h����CJ��S�����P|�x�57��:-Nzol���qȿ�s'u�D����U*n���FL7x��<�Þ?Ȍ��u���76��(\+��j�9�$�x��eG��#��~�XQ�%@��ID��t�`f]�Í�{H>�=l&����}D/<����
�sb4�ȉd�����U���Փ�*�"�Qx��+w™0�&M`x�6����qḍ
f��=�ņN#��GP{u�,��$���=yI˧�:h�\Li(;AtI���ׇׄlU ��M�6QL�漣��A*������d�+�y�k���?��o�������Q��`+tHG�bz�~���
-+��?��ӏ��O�+C��`�\�nd�^��uz��^w�k�kO/���OM5��2&dngQ�x��ӻ~睧������I�v��;��y����_����*�+{%����� 8d*������
-+
-+�A���ڸ$������Y\j���w��`�b�Me˖�1�3�d����T�ん:�1r����?���v���|d�bY����a��W�4<��o����ŧ�����/�+�Cr��uE�ы�W-�Cp�Ow�8}c�����qH����{���Y+�
-+\�
�J�d��h����vmYy(�
z�w|�w|�����NյnVН���.���)�1v���|D��;�M���Rtg�+N2��B=I���e��'��ٌ���Б��;�>��1
-+@s�IaE�C��jb�*7~"����p�������C>1��X/�䰰XgmS`�T�G������?�������0��ag
-+N�,Rg_�
-+��&:���}���2�בGc�{�ԗ+����u�_�eT0��P	�[/�m7����������~���?	/�(#�3���1n�`lq��G�]-"���<�m1�4���TƟOM�?�����QQ�҄"�nj������@]�!G7+<���l�{\����r��F����׽�e��m��_��YAw�����r�Lj���������[N�hc��Dy�X�+6����ϥӗ����ښ�������V:����uo�:c�7Vω
uµ0�fd�����w�_��_��4pwj�ܝ3c��`���Wy(�j�|��	��~��~�!C�E7b����&������{���L��=X:
-+yV�Ԃ\��C�e�8w-tn����c{a��4r�s񝤜��[�e�y&��X	fYj��'Lƈ>�"N+(A\+�L^l?2J�׿<e�?�).Rs�z�vȼ�n�|[�J?���$ L�����b[�J��+R>��7�����y�T��`I�F�Mdj����`��v��K��{����+��9�i�U��j�5<�d$:���!sb�5
-+T���շ��<����:8���{n��d�X�d��f]�'6�'lZj�ZC�ʃKlp�EKG�*n?bY�8�6
�'GP���/�<��Pk��6�A[����+8y��k���x���/���JtM�S���mop鮻�o�
-+\�
p�N��H����_��=��������
}�E������
�x���#����q~�HZhH,�Mp�"�ekĖ��ޠ$<z�m���!iLz�T���rT+���lnR{�s�?��sC�1���6׹2ԡ�s)�
Q�:3ִ�#���O-�U 74����y߭��$d��J,\��}�H��(�>F����t�]j������XX��Ŷ�v�A~ٖ*O׶����Y
"bŧ����bL�W�
-+V9��_<�y��7�-
zx���[:'D#^��V�m���Vٟp�:�^�r�o
�xS���`��g��M��-�4F�j��
-+��ѵ��5f�u\r���P|�C�+>ۃr@"�$�z@�
-+����i�'��_����e��匙��:xd<���O��*�A��G��2�+�94�5+�՚>�n?�6:r�T����
f�f�����>�S���e�t���t`�q��G��8��%�A���z�Q��8��dS��<�:J��
�Sc����>|aW�����z�\<��Ӿ.R�q₥�pF��]���W�����.�MR$FJ:3������������a&?�=W+��/|��Gx�R��J}u�ch�O�c�g�bb�s�c̸���A
	��4燰��Ϛj�܃Eë�ĵ#��#�^
-+�gN�г'Ϡ7j�C��_����e��;�j:h��<��C�1��ҽH�D
���_vH5��j7u��v�W ;���e2s�}������=���o�l�7!x�J�єR��НGwQ�m�S|j���L?��q�� w1�uЎw�ݳl�����l������E�� �u���^N���Y��-v"5_$�RǼ�N��k߼�^uِ�k���/)��-g���fp��Eb��V���Ӷ��G�'�1�8����k(y.Ar��d��D�&y�"5]��g~|8���X�?,�����䓭:A�����
[��]�����;�l�2�z�:�:$wiƣs��#��9#�4wP?7L
-+Ļn�c@<���+��.�rbK�:F��
-+Q�����Ŝ�XIC���^j�����Ҋg�e�Zu��h#���m���e���5��|m��Y���_���<4y�:����U�
'��B&���	���aQ;��q�?:j�돎�����=/�[��8TV䇵��7*A��:��J��G@^i�q/�Oܫ7�9:A��/2�GiN��
oA�&�Xm]7�8��ed�\ߕ�]�F����6J�V��`hrH.�"/7���H�Z��!�����Gf��N�aշ�aO��Q��7���8Մ6/�@L����`��VI��ce��j`w乏А
v�ŝ�f�=v�3H���M�b��^h��n��e E���Y�cm�P���qb�bo
�j3���(|ꋚ\��r����ޢ�T�����������떎ڌ�5u�
����V-lYf��1�T��*N�A&!�L��($a_Q'�f�#�>C|�m��Ndic��2�Տ�הŷ�>�����*���
(���=F��j�bW���k
-+��_F��Kv+��z���9�c/.Q	��R��u��wST���jϮ
-+t���2���ٟ�ٿ{�w~%��ͤ�y�]m�є�t�-:���Bw����������=x�l��wK�ѭ�ھ��gn�xrS�@�A�[�����X�?�*ET�2�k&BN����������w��#ޤ��y�
GN���5�8��(:�12g��?��<�2�mb�1��3PD�q�!'�L�j���}�0�R]��]$��3��-V���$~gmƉ�����I���\E`��8�����������ãb�p�!��3�E�O<�N�`������ë�V|��>$Q����\��r@�:!�q2q��?�JX�b��$���Β�<6�cF.���t��M&��(-�i�0�θ��<����tl"yK�Z㌗���:��#?1��%j �0���xP�><@�OZ����O~*���
-+�ƒ��r��YJ������x�c1��d|G|�p
�
r�}˩-2N���.���?Tz5r���/{����?1+^����%��m�=?Y�~�`�`��Q��Y�Ғ�c�w=��a�ɥ�&[���
-+8H��ML��"Ƒ����Ŀ�h�j8FF�Y���cc!1 +�{��·��K���_l��/�pӗ��?� W�U�
�~��XH��c��6O��������v�۰#}���QްЊ�0�1V�ך�E+�m���\t�Dz�\�(������e�G���^L�Gm
'��#�`��O�6�R.c���9����vd0.�Ҷ�4��qA�+�p��gO/����s
(�R����K
9À/Js�F`2��n�(~�����|�XU8w
A9h����t���l>���i�lZ^��i \��?
+ysFo���Y(K ��y�
Y����[�(E����L^d��ս��RZ�ɺPH��U�+)��?��.>��I┷�1-�5�1'c�`�B�
�wg"�z��1Q����#":(��@��i�w|��G��V�x:��XP#�߮���(��
}�d�OjR����o��㽓��O
-+Ɇ�+�6��q�0�D���:a��&���q�W&��,V�O,4>��!��d[3t���[f8քc]��
a�w�
x��%�����5������o_/����%����23�������e�x�J�9w꺀z�q]{��F��~���Ÿ����ާ�(V����+}t~X
K].�|��	��N>>�9wV��%Dnr΍��?�1ca;�Ț�'�r#q�<�8�l(16�/�ʭ����X�1>�o^h
fY;����	c�e �Vl��"N�\��F��@
ǵ�Jӄu���'�ƨU)��g��g%�̣����vYSve���g�w_��c������>�	N�9�G�d�Jf��"�<�A��8c��Ӫg�����k*��H-����[�mI���X�I�2�Z$�1���H�Q�k��`��AX74
\�3�D]	�_�(5�4�+҉!>o��sD�Ɠ�/{b�!'���������ۓz��p��S��Ьv�7@�
��i+D!�;��Љ���ֿ��aD�p3���y����/"iF���&�1Y�W'� |h��@��=3��PPM�::5�/��V1���P��F���V�T��}H)��Q������H�d5���O�~���4(+Y�w���ajYe�Y,�|P����'���miF�+!�3�2p]��#r�\��0��=as��Y��mH��%��;ꄵ���N��3Q͙_$�,�zQ�N^Bc+��@c����@�^+��
ʀ�]�+���ּM%C����:����->�ǏV��.��6��̹�Н���T���?������o�_���<=�����c�D����Iث��mh��}�����n���Y��6c�;h'.����#$"o_���dy�1>j�l�0_L�a���|6[�|�K�`tĊ����D'��Ԭ�y�\�����C�����,�p���5D�j3�	%Y�^���gV&�ǂs��Y#^����l�����W��R��`�#Ŗ��\�:�R��S��r��
u�	�FF<5��{��~�V
շ��.�%���˲_���xX�G
0c[���+@�6������qB돵�w�K5XoPl�5�������m�hG���'����/ƈ>�-��_ʕGLcϪ��Ȋ�5<�s����<xFu6Ω�gFY�4�}��iu6��v��}�T�����&��`�Z��2�_Gw�R���{��j7s�ثv�U���~!��)�ۋ��o��o赯}�wu�`��;����>���;��V[�E6�L���Qve6G�Л9�[���	#;��x�+�
ň�y��ͬ2�m����VAu�?��Øx^P�w�y�&>q���K�|&w2�S�!�ǞO��ݸ�#�t�+�į����z���+]���a$@d�9{��ty����lUW�%�=�:��⊛J�F?�7y��f� K����A�C~6�ߖN%��Nm�&+�q�#�����������RX_�F��+y��G<��!"���	L�j�4�6ꄎ�O���'ɽ!a�*4c	�ǢV3�e>���̈�(�w�5⿦����Z�|jԕ���:�s6���{d��{�jX��"W���I>�mۧ�:���':�92�-z�m�����m
\bA���'����^$>�W�xVM=�PK��G.�u����L��̛�gM)+����	~�~�U��PG6��M��|�U�?j�*�����y�B��$t_����<3~�{�������,����A۷�j�O�������Vػ�1��r�~�*�y�"�w6R�o^�c`*���\�$l`6e��Y

��IW#�)�m�����(%��#4��W�ܸ������ꄆ�i,z�i�O&���\���&:4��*B����$�3��H���b�~�m����ACt�@��Wu-����j�} ��@ 잮��A+Cۿr�ၸ���>�;�����9�DKk.P��ډ]i���&>�7�;v�P��f��d́�n����ur�\��
_���E%'��纗�t��ع�`��7�H����AL�?�q��*%�ؔv:�*�n,�B#����#}�Y���C(��O�Vj���(v�Xŋ��s�l?��-�\!�D�
-+��&��zƬ$@�'Ʈ��n'�b�/>�oz��{^��57-�/��X��/ߐ�01���Z73/�&�d]����F}�ꮴ.�7�@o4�&�-���.�>�_��Z�L}��Z���i��/|�/?�?���r��_�;v���HoR���y	�lYG~!*9����/�z���C��&�ݬ�
��{��|L��o�
+���r>�������o}�[�]���
oł|ƭ��
|v�=z�ߴ����^�P3e`3��zk��7���+h��\��JR�]�����C�u�\
�7�8�����}a�>����ؚv�GBh6�)sQ`ܨ�E��`��6#���F��h��b#�1v`�F"����4���e~$��f[���8��F�Zz�*���!2�t*��g�e�\>��+����~�1�T
��:����N09�
-+�!c;�
-+��a�/+]�YO(Hնe"=����MY��˨��V�.�:S����~Ӕi�:����)w��!�ױ���x��������#��&��6(w����W_=l�R<~
-+�7
(���ϑv��8�_���u�D�/���7/�e��~u���}�oK���;�O~�s��W\�\��d��iT�q��Ny<�7��0�LX���ץ+�c,�yCB�� ͽʶ����Z�3���L
_}C�e���@�㝮Ɓ)<+D��spf]&7��F7�`�0ֿD�P�x�Ɓ�u���e����?s�~�����k�IJ����S3�L�>�VsƘi�`�����>�UY�����5P�;^%Js�g~��+����:._���ê��>���Ï<�\ç
�˭{ϑ���*0g|`���{�Z	+Z��,焚$�f������Q��&��5B�y�i	�$Bc�g�k�[�ڼ4���ze�o^�IA�Jr�:ŗ�������?yټ�|�@��+	�ȭ{4hps%5&>��"�i,�t�����3�f\�g�b3�l�R�L�҈^��ϰ��)����b����a	mܻ�H�m�7!)Ɩ�*����q"�J���)6�2zO��m<I�
f|��T<�3��	�k����ղ��ë��E����ē�Q������g|�m��G�e��OO�.���i�/�V;��E�(����ҝ�>C�X�ud��$�g�κ�曯�����W}�@���`���0;8���
-+x�y��yx�*0_dлG�t�I6ӗ��=�y�����NoݟN\޴�H?Ӈ�66�L��~}��ϋwReC͡�D{���<�������)�_���
�qc�6O8�8����F9c�_��?��V���'
-+³A���8a(���M����Ǵ�l�;���9~�pތ�,���e��+:9R�B���5��"�>;��"��/�|8�Xs&?�q�?{�A�8PPlᓇ�n�����b���z��{��/Eĵ�NR��0���?j*E�5?��ˆ�6c�f�Tv�2���b�A��*&�sp5�MLpr�'
-+4�eش-�%&��7�e��%ƘhL�\4)Z�gpԌ
��H���NC��x�x��v��Z�zF���
(�3��Oc�s/���1��Z+$�u-��3
~��?Y�@"�;9~F�K��S�Cڸ7�^3�O��/�;z���I�����뉔<S�t�1>jC*������{��o��B�}��^�����7��ތk�8ن
�3i���v{�[�d~>q����r��3O�1�n��I]���@�Ih��D�_�����Kɲ��P��|�6��-?(�+M�����l� �.��:��;��aU�k�
O7*�o:����s����!",�@��2(�Kg@z����}ꔘ۔�����vf|nFh�e,�saG�Q�C1�M��#>>zR��@2��9-�m��#�9+�1g+
-+�j^�a�먈�&�c)ձ����t\"I]��c�� hd�.1�N��j��j����=e~��<��c|�ʛ��ⷼ�-���]���t(����zo�p48�+�ey��T��\��9�W�.�����n�����7���k�����b�&I?Ӈ�?�_\�,OUۋW��[sl*�i�����&�ǭ��f��r�|�����Ço�+-z��E��ןk�-<+n�P`D��K�=^�L8��ħ���}�k˽��}m�}��.X�Lx�45�L�m_����W��>F^���61��!��d��������%|�:��B?��t��t˷}�zX����X��g?�\��W,?����4o�<�|���=�"���}7���x�R�I�C�bd/��\�r�״�0�OX�@��˱oT���
-+3�cl� �34���?�,h�YnŎ7�h�ȨtR0�r�b�~B̵R5FO�ZВ��b[0D��z�B3��d�L
��(�D�f��DWxF�bulv?��?����/{+G�]W0h�^R�Ƞ�w0@��(�d���%&ti��E:<c���Oэ>��T?��?�:��Q
-+��m#z^���n
-++(ȧ�E%�_�;z:��t%q;vb�̟�~� F�a<Üj�5�/*����稞�W�h춖���^�{�{>6�k��o�)��y��x���Od{�s
��Go+��� e�|��u1�	X�M����xİ	�̈́k�'��G�6�h�M�/����{���	�\�Y���1p����g������ڣ�������W���V�"��+L��/�K��&^�r����מzr+�i�a7���l�`D�:��3�
-+�޳�i�t���&ӵ�G�_�0���k�/��]O�kf���,���b�+P�����j���
-+^�<O�p��~��u��3�|&dcw��k�Tس�C=��]w�����;�C��wDz2cs�q"74�v�U��+%�J��֬!
U2hCt�gэ��L5������cļ��r��L����=$��w���������i^�3O�8��5¥إ�ѿ���O���ˮ�ry�%�mqi{j��-����oy����~V�H'}莽Q�!�s"��?�7���~�ˣz���W��Qۣ�'h������5��DN���uViY��s�B���	���X��*�e--��`u/�1���%�aP�-t��B�s�&�=/�}��@�`@�*�ly�Ƨl�0������ѭ�����q�3�=),2��������d���;�� 4�J]�/u�5���F�
-+�fb�_a�SeՖu�U|ڮc�{��eh3a�G��h��A��C���g3�JM;WpM����ǦY�6+G�c.iR�A���D7k
ϲ
���}��!:jv�-\X>�C��+f�&��v�k
-+�A�|b�8���:�
��Rm����H�Z�`�q���j�F�q�?��wPn��Nc�n\�6�zo�LM����{��W
���_��[�Pǔц6֞Sr���|W�hr��8����s�c�
�{�F��ox�������;v��cs�
`���a�7����;ޮ�>��?k��G	_�hm1N�7�r��+ �
���
Bdj��M���7fr�lb��1岑1�l�������v~r؟���/nt���WP�c7$i��Q'!����v��R�M�`��;�RY�5��Y=P�M ���f�{1�yY!��U���4�u�hD�8�|8s����'��� ?Jd<�3���`5M?�_i�s}R��3�M��k_)���p��4=/���/�j��.X�n�����o�^}���5z|��|�ϖ}���O<^���m|��Ƿ�����?ka�w#�'����:��{�|K_<{�	�<Ya��8��X���:����!�
/Va�k
Y;>8�4��R��$�5��j���>�v�y��W������v��5��K:��9��J���]g�Eg�[#l�����z[�ͺxrh�:5����89&��s����m�Bf���McC�̢��'k�[��}[��x�������a߃	:������ƺ����kǣm.�
8����^�w'���LQ�M��E+���]D)7��&ф�Qo�`Q�,IE�E&?�tŸ����d����GȄɼ�v=�ܰT+�
ݼR�̞�����+ݦ�6N�ªEu��4L2����"�0ʲ�+c8js���ô���X=(�ѵ=ē���-w�u�r�=�DKl�	���Y{Y=m����o�����������r���\;���/^�;�?Ｇ	�Q�|��/.�gY�����n��q�?1�.��l�9���	��~��]��SϿ�Su�x�
׏����s����H�'O�_^G}
dB�d�HW��WV��gp�\j��d��pjҵ[���[�{��L;IĶQ��,�E���눞@���B
(AE�	DE�A�{X����;���Ok{��ж�Э��8�P��g�X���X�U�>�	8�bk���}lV���+�A���6
-+G�3�YQgVLG�d���u��l���/�/����������_���~�hn\�}��o��O%���O�*�����������-d�>��Nj[u}�d��8�8�h�}A5i���������KOk�����VjE@�6�0�/��T��F~b�n��g���1��S=�K7��)�g�e�j&��_���;��0��"�ꇻ�Z0=�����k=͘��y�\v,�h5�Np�9y�k�y����i~���ؓ_��u�B� "��V�3���a4�X�--�e�bta�^���(dz>��1!ٶ	��وj�\t�k��)cuZ�
-+�9QRg�p�NWa���X,�+�S��<���~7^s����;�s�q�l�Xp���>
@�HWB�M^m?4m�'�ec�����Kl��'�8goX�լ'��]�ӎ�>��O�;�tL徯�u��X���:���&��z}����ܤ>�%GZ�G(vr
zX�{��A��o3o��^�4��0���h��Vɲ���y�1���)��>*^B���F��"�Z*i8.�K���d�>l?T)�(8����k#	&,�|����s!Ѻ>����l���о��o\l��
�:� ��ԧ����sI��u�g_~&(=A9�z&���ɩ>pz%�G��9O����s�'�מ��]k�ǃ-u^�֮��|�T���z�����/~�~�#��M+n�U�"l�1��܃�b7Ǯ+�+T�.P���v��1��V
-+��!�,,���y�'
e���
-+���:V\��?c���mnj/�9���O�X�]!�t&��n�zDIr��g,�x��9O��8
-+0�/�y]"�}~��Wk��t�<��^���K��[�`0�ʹ-�HuaKV�a�+�M[
�:Z��lDXO~y�m�A's�R$�k����Σ������	�����].$�ԯ���:/�5�nj�
-+�͓��N8������7�D&����K}R8��'��E�����d�[��
-+��{{���6qw�7��m%�����+�)�{���sߜ�l�ԭ_E@�>�R�f�Z��&�z��m�n��t����\Za>G��y���t���s�����0���_�w�J� ���9�
}�΀
-+p<jgVz���=�.��s0�_�c?�c�mo{ۏ��E?_ܽq��)��
�Ǹi��nݓ�����[�
�ۅ2�+ٚ'���h6c6���-B���
̋`~|s���?��gKo��|�in6J!�&0���
������c��a�����m�������+ׁ���4.[�TqGn��;z��'��0D��bH#��ٜ�x5I(���w,�P&A^������l��j�e��G���ۼ��=�hw��](^7Rm�
%i�1�(���QL�&{̖FCOo_)�@N�u��wtm�e>pŃ�1�i��Q��{�(}C�F3@IǎF4���0z5?XL�
-+��+�Z����߱��Sk��`e��n�ɶ��_p�b����뺦�gat��`�����y�V�ُ,\��U��7L��q���X����1���������޷���/7�t�r��%y;k<-j���m'���z��sM|�:cӛ���U߶��"��e�K]��-7�M��5���׿����kٚWٖ��K4�Cm3�`Iƻ��5w����Ǩ����>���-��
1q�~���GFk��s꾊}
K������E�S?�fY���q�������4dt=7�)��	Z��+�̱u��
�
-+�ݤ;���]�_�6��{�8ky�9ʻ����k�+�91S�r��xHN3
-+��տ��O�$�X"�f�A�ɯi���+�^t:�o殨����C�k�mec�Ud��k9�1�Ohj�9��r,:�!)z���������~�j��3���lK��90������P��t�ն�tQ��C����<��:�P��3��$�-����SRu����\����JC�����
F?%���+�
pfMH��iKQx�8�M�b~�����ɟ|��~���O�O��
�����g�7�LϘ��/_�+�Zc�y�U J����
��4@��8���|�/�5=�{�)"�0�o}A�,/yɕ��_���෾�����p�>��|��
T�v
-+�����iH!�iF͈�V��M��^z�Ox���9�_x������^���nZ����/���
`�W �`��}�]x$�J�2��E}�����_�z����n��l�P-�'��V��Vq������}�,2��^:k�^�
��Q���IS�*���K�Dd�-w�#��x�P��d�0K�ѭj�Xk�x�Æ��:���A�6E�t��0h�>S`���9��ړ�L�ɪ�?}$�;�֫1��ơW����X�l�@R����z��N
bn}�YX1
#��)����m�q�Pk��7���ʾ�M�J�OSYI>�죕�����x�@�A�-���k(`�� `�M�Լ�����cjՅ�A1�l�u�b
X\t����@2濟!(���Q<k�W�����Ǧ\Kst�E[ 3=�"��y��:���_�_1������;����)�
}TW�0���X��7+c!�ZcE��s4�5|���6�&4�Z�^�D&��_��峟��+��M�����{�b��u�b���m��X;~t������e�_n���r�_�\p��W��}EK���(V3�&�r�S��
-+�Ѻ7�@F_������ܳ|Ǎz+�Y��Ǿ�p)
��ˏ���p��k�cd���&���_^x��>���n���~+��/�r���뗯���z衖���gf�t���ޯ�����91ߴs���)5>���
eB2n��x^��T��p�9�5?׉��͡K�>����CQ�:=
0��D�d�{������o�E�=�����1����E�6ۚ�h�5�zLz���h0|��OO|�膽A'A�Ƒl�C�m�z)f^�~�~ٌW���M�oe�����`�s����*��͝|x\��;VH�d��<�+��/{��>r�-��)�Gt�+*("Lc�:�m�k�ķ�Сu�Q���}�ؼ����{�h�
���%�D԰m�����j�\�J���<��g�j�V����l�
�6�9�*�z�mo�3cJ'/+0}�(.����fz�n���~���x��+���ů�VuޥZ��-�7���H����t��Ý�N���g~���C&�莏��;�ST9YVvxo��h��*}x�y檖�`c��7<7DL����<�[��W�F��m̑���V��h�~&�&�F�N�r�W(��u��
-+��_|�\�㨳7p�ܓ���'��U�Ӥ�6'�E*�k�4�+T�3�^7+���>7U�K��I>��o�G�_������sc�����KZ��ݜv�c������sJ��M�Ӯx�K����G�:Z$M�}� \�~�]���r�������{��|:5�1���,7^󪒶D�x�O
��/z$�A��
-+�����T{�͐��<�Q{H%�5���2޸�4d�?�>�4��ےǴ��j5sĸ��H}��1�[Ҳ��B+_� �In���,k��5?��7��	1u����w�6��]���>�OI7� +F;'+�|��g�/�/��_����o�a��ͩ�u#�&�\�o����>v��5}�_�图ľ�'��]��ֻ��$;i�����Q@}�Q0mMnd�/5�y�F���F����CE�M�7F�0������7���Z���n�Ɲ�,���5h�����)Gu���׺R�
-+pÏ���4%�O��F����3~y��_��	�Wj� ^ۚY)$ݡP�L,�	v��Ԥ�D�#W��A:~"[�+6�u�GEK�
vz|�~���@<�L��|�Ԍ�1���п������{1��H
-+����9�C�Z���Z��E\=�����տ�����F�s
-+1v(��{�d��3��VM�y(��.Amf�\�G�C���1jڌb:�o��,�
3�OȮ���?�߃���;g�4>hs��V��?z�Yx�#��n����t�;�������˹��O�bi�^�0�ø���/��p�r����6
-+�V���~z���3�~Qo+ĸ٬�0��Tf|�Xs�2t8HF���n����Ej���M�
-+̾ʏqg���[�ӷ4{��v��Ɯ؛�~F�2l���<�K:k�m+�a�k���m l��8�ú�٨�Fp�
K��o�
{g��Q��BM:�]S�{�N�j�=x���G�䚒�(�M�;��F�s�}a�ȷ�	�n�mC��j�+���mi��Y
�֟v�	_9��H��)���;X�O�茦A�!;�h�B��)�m����N��x��@#��sW'�4�,}r��

-+%�u���^"��V��j�r'�v�����^�h�ʑ�!�6�7/
-+���n�{�6��Fw�2#걾Eg~��OV�7o����^D�����U��!lM��7%�54����xdm_�����H���W��sً�b�����[�%U�/{��i�C��<����F��m0t+,�@V�P���1ۃ��Ot-G��$9;z�7u��A���d��K����D|�Z�׸e��Dx�ݖ��d:V���`����W��M+(�Q{�*pT������г�7z>�����o��_�O�o����/���w
�ٮ��|��T��Ԯ�G��76oZ��J�6�TC<�a�o���[E��\ݦ�֞���a��7�x!�M�_P��!�ί7���5(�9�V2��m�y�楸�G�2�\��X �9��acc����*�(:��9����'5A�\�C��࠘�V-6��Ď����^�}��&��m��зrx�I�_��|�S��J�4�J
-+��������bB�2z�sV︋g�!�.}�];�h�P���u�N�i~W�cj~��Xy����vs��k�#^���L�מ�0�\�^��0ju�zn�+��D䰝��Oj5j`��\0��i�����(9/0+Q�i��Q����5��-�� ���z(��w�������r�~'>�ll��׵�JGX�\+�4��3c��]�}�����y�`��X�]ϻ���}���Z{��?<�������2�Nj���,}^+;�q�6��2t�+f&��+gmKa��?8D�M�`�q�?2qA��i�=bI��w����� ?�eDC/�z��8����e�<M����:/��� 
-+A���&�ږ7p6��R���@]n�z�Q�1a5�N��k��'q�z��G�uɈ���O�^ׁ���y��j�JC��0
-+�Ҭ���3��_+��Y�rh?�\_�m$���4
l<��$&�e�v?�0�(�3m�O�͉}.1��e��t�P��;f���r��"����nZ�a��x�E­���Qe7�Y��c�S�12�`O���ڍ��p�S�4�ء[z��iO�3N���~�����{�O~��
��4�������������k���?�����.���s�~�����6�S3���X)Y"xы_|z��H�{�⽓7���F�"o�O$b}�{�wzͷ��K�X�H�O��]���'f~��
Vv��L���O�������95�5
-+�1�|�n�i��+�켠�+�&#����+:���y�y^�X��-x:�
�!#����O(u�>���^�o
0ǼF��K�o�׵�G�:�%�Ϋ���~���_��_z�x�w-u�ն�x�lun�OAn�)(�5.r�G+Y����s	���ڐ�۴�-��1[�j�`9�\g>B�:��߱%t�䞖��?���\��7x���RgY�`��+��6�	�s���{��}��	�X��
-+����QW�"��@[��f!��?��O�z�oj�
d��0�o=a���x�mЉ%D��n�����r��I�P8�W:�0�V{�Q+���Qł]�ċ^h��������S���q�����0e}d4��6s���w���ݸ��ѹ�ַ+�
-+�ou8Լu���><����w������������J�q1^٬�w�8���<�u�������=�T�;rS9�<?@�$o��{c݅9^~_*�J�F��bv���J0�Q��yٖ=�i�ٮ�;��}�
���Bs&G�����+�R}
-+<�rAZo���ɘ�����~�7�}�w|��*��^��<V�R.��p/����~��l�lȼ !%���T����xޙ��
-+�X=�*63^4z�Ћ�l،��wp���m	���P�l�l��D	^@����x7�����A��?5FT�g
�*#��Rc���!e/^�(`_�7-�d�O�f#	
���y� z=��Tr�݋�M���Pǯ���G�i�;�@o^c/x��d����:�����`��|9��+{�����O�ҕ�FC�
��J�s��ދ�te?sC4��������S��G�ɶ�Az�����?����
ox�/��:�¿=i���!2%��վ��
-+�����~T�z���ܹ˃������;������7����lO���>w��ot�����s6U�r�
t��_q��7�Ff���&�����΍�>�~e(�/�™i�A^j,P�W����%
 jnXM����SF��iO�&��Q_��k�8��"l���������
����&�E�4�ܼ8
-+v��N>e�e|(�{�.s(���^�9xst��3�'��#m��o,+��g=���6h���>d���,B|�︪b?����1�`��`o�M�
��x��@���Ѡ���S�E����m����9uO;����;�������'d��&'�9��TL�FIB�+�Km�X�b����Ȝ��%��7~�����`,��8pត�M�(`zˇ�u,�7}�ם��?~�e���o
|n¢���3RZpC5[e%�b���/�����q1�}4��S=��P*�9J÷��>��7���Tu�S�0���Y�o��Z���
���:o��G�+օ-���mS�DI,�?��]3��+<^̮g�T����u0��K�A��R�>FU\lPQs�	��{F���z��V�(�b�C���H��7��?�Ea0�	����䚚D�}!E��GQ'�E7"��o����Z��:ϛ)���ƶsj}%���m�����J�{����0;y"���F�|�?�A$�N�F�\�s3�ܖ��;f�1��oE��㗑�y���W������}��Ś�������x����)���[+�K�o>�	s��������=�O>����+�kqA�����O@�����M������@�zPJ��HBd�O�D��4�����n�C[���B3��%3^)xR�ٌ�~�����\�T�cLе���;N�����w?G>�+t����%�������m��N��mo;}�56a��R�������o���`m�T7�v
�^t\�y�7��!��k��a��9u��Q�����
�z�;���>����a�^0��XN���+l�1rƎ�f����%NT �E���~0P�#��x���yF���'��c�}�:�*�yS���+T�M+٘e��‰^{FͿ0���Ӳa/�1&*WS|�|=,@q0�+�s
.n��|5�g�#~�.C��`�۵ญ�oP�#�����K��2��9a��c�o��1i�5��j`��Cly�̻>��>��:r��eOՙ�κ�Ժ ,�L���5��0Ցp��8h;ݱ�N_�
-+<����o�����EO��q��oy�[�S����ԋ�@w��ID���[���q����A�4xkO�M}	�Y)r�{��A^ndh�]>DHIMf�E�#<���q&���̈́��7�x�6XHd�����L�	C��v���i�������
~>��
�9��9r�E\���@�#�]��yPK7�e;!mh�t4�Y
�����;��?z�I\�s.*�{�Ԑ�L�Z�&�A
V�+6]S�8߀ٯ�G9�7�=y2r���IN@4a�X�wZ��f�MWk;tr@S5]/��z1��>߱��,�:ph��M/��H�2��"[0���6X�Pb5A��3
A�[9y�3�r�]��6��&#�Ԗ_�=F��H��;^s���3�ƞ�_x��
J
:Z_g�����?��_���C:���7��;n?���V��+�%7@�{��?1��͉F7��^\K�\�,=����W�^�q�eHp�X1����s	����e
-+�]M�:�p�3���v>�Ĉ�߽�.}i�M�Gm$��ĘA<djL����.��{N'|*��g
F�(T{���9���%P�+�;�Teol���mz�-ǎOz�A& ����[Yь�ft���ž��|�d}���߃M<:V)���|�UT���!Q�z�U~��Q���<�
+�N�ALM��f
8T�%>����9���������=J��I�A�ß�>?�(NMmrs%�5t*[Dkp"���5��uHL� �{��ݞ�:^��9h��������;	���i���;|�s��.��.Q��m�t+(�3�V
��xG7�;�<�����t��w����7
f�D_i���t�{����
��+���uL��+�����s�@����_C6c�=�쁢j��c�I���نs������2��c��"\[FЊ�~o��[$T�{<{����W}�oeK4�c;�������m���)f��h�G��ƚ���{O����k`�-k�C!���C��O?4�������G���!R���]D&�|}���g/�(�G��k+~
-+
-+4s�*���_�(����i�dߌ��4�h�굃���O1���{
-+8��Cz�+���Ze��;�nVI����N�@B�Z#X��EۡDj�j�^���y��]$���>y8�⃜��9Х�)=�@]k�-}asϋ��=B��у�7�7*���:�"f��f6�����*vv�~�W<�w
-+�s�3D���T�+p�ak��oj�3��#�5��ɝQ�˼>(���mu�_�
�s�~��]�v�����c�+���Z�����ߡ��*�_w�}�_��v�+�����S	������<���^�ַ��M�/4��`���z1��ŷ˫���ҿN^��w|xŦ����8=�����5>�686Cv8�"�J��R�HJ����י��O�C(��k��0�.t�b+��hR�5ۚ���-RM��+��j�߃	�,,5�{�99Y�8ڈ��G�p
-+S�+3�`X6�ӆ���9(clW|�%o��9��oN�Csf��(W�e>��+��4�Z.R�����`�P����E�I�9�'�%
���c
��"�J�(2��7_�E/y�����0=�U״FBO;�yC��?��ӷ}˷��^��+��o���z]�g��k��>i���7�K��/�n���
-+x��1n�__�^���X�����{��{��
-+sі6��p�L��7rE|�{�i����~�c��7(�����s>���f�i#I��a�7˭���ۏ��w�?��:�8P��:"�x�N��!F4B�;�U�8�����%P|���$����:wr�'�IJ|~ƹk4���Z�����$oj�U:�E�˧�	%�
�.�ƮPu$Q����i	�8�/�԰�����@��tR_j��	�"�����؀�;���S/4<�6@l
-+��w��9>�5������	�40T|�e�+6�Ps!3D�����4�w^�~ͭ+eg��=6q.-�37��bq/�٣Ʃa8@���WZ8� 8�L��4��Qq
�+��ߞ���rf���U1���%&�7�S?-����!M��[�A+6+��c#n|�\#n�+��z*
/Q0��j{�RC�	,M�+?|�ۚ��Y��(�
x4�e`�r���ʇ��A��
-+�M�����DtyT�����Pln1������p���y P�t�x����L��]���	�Y��na�I��V�8S'^+�������������Ɗ�]�`���K��4c1o�4l��6�rΗR�l<y#�{W�75?�fm*:�3�!�C���#���,�)����s��%�Z@�������5�8�7��c
��`P���Z��xG��uNc@��Uf\�A����{о���d����%��s����o��e�9d�Ҵ/���d�n�_Rn�
�%��Zci*}��«����������g��^�;}����[q�#��]��n�G}�C��ݛ�.coj1��:�u|�5���K�%��O��/��E&*
-+�
-+Ho�h�eu����7�� �	�����`�o�1.!���
-+�i_�y��;�Ԡ���k��tb�M'�,���Ǎ(7~�pL[�pD'.
-+/9�,����UP
k5�hD)Y�iٔXrL5�1b�P��Z�̓�c���zD�_ b�����}��_�+ͬ�x��|%I�V�	�%@����:�"~bL���Ho�q�|7���C�@�u��jX�(��Y�l�-dFj�,�A�}6Œ�j��Z�^�<Tޫ�N+q�B��ml�"��b���ua)�~��ϙ`�_��p&�x�/1�؝C1�#q="�Nv��j�\���+kw�ϵ#K]׹~m��x��_�̷��-o����r����=��V��ؖ�MF���"�5����>t_�Sw��_��7��Uozӛ�]hŐ���E�_��鿘v�����'�/�?*_~����s�+r�y
d��ݕ![�jU@
-+DMZ�~�X�S�ӑ{�8&�G|}G55��1�w+���v�%�Xk��X*P#4�Ѫ;�\l���0`�6,|�T��h�����g���~���V&f��k�7
4��q�;��'o1��+�
�p�a�
:y\hY��S����@yr�=~����F|�}�7��"�����^��F�n|E��N�ح���!�5��K1�D0��h/[�9��G���s��y��,j�!1^'����k�<�vfi1�p��9�MB��ٱ׻�\�"�Йyvƍ�Z��krz��€:;Cu,��i��������@����L[���S�ι�J�G���S��]�^����]�~0TO]0cŒy�AOt����`�/<�L~���_U�(�o�f���[V��K#���uP�Z��s�o�(0z�[+��!*��1�u�,�q~�S�<�Zo�ݩ�|�k�\�:��O��^�%�m�!}L
-+V��\�h�ub��$ԍ[kܨ���!+/���h��Lt�^i��$b��+���&�}U��R��тt|]�w~�w�����{#�5�7,�ظ|�����S��G�:�����y��/�_�q����%�|bp�����9nJ�/��j�y$�—$<b{5��$���ԡ���,��Lo6�:4v� N7��5>�f�n�JN�ml�Ӹ�|�%���F�z+Sx�����Xۦ�,ǿ�z����	H��͹/��o�$�q��E{�c$D�	�!vR��r�!�i��e�w���<F�V���ģ��A����W��7XȮ6bR���r����_��n�O�)
�~V	�΍���ݐ"��ѡ,��P�1�X�+"��oxc�zO����N8G^��"h�s̐V��x��ߜa��?o6kd{��k�au��i�Ø�	�5@S�k��un��6��
t~��5��ͼ�:���傖��n��������T�W�r9z��������9+�OU�+���>*���D��v��H�I
@��	�;����,�#=�����\l���z���ju��NU�p�wWh��e�v9.��x���^��b����Rpc�1Á)癓ю�Zh����Ox�9�z�5
�p�2;fCʚ�E��܊c.X�ݺ),�	�m�tF]��@`�yĊ��87�3��[�גDO�W��������Ku�I�ֽ��Ԑ5�xF�qa�8=�G��N��o3}���8�;��6{��nE�R���#^Q"�u�H%����?@���T�A�1+���_�D+5��$/Zrf��7x�_*��R�k$X�	���R�.!5O+8FYKu������VH|�o����.�_b�9	-l���;�B��t���p8��y�	��y���q����,=C޽o(�#Z��n����׽��?�3?�'�=8|�d�����-⋫�����l��[�'�����?��Ͼ������{Nݸ�w�:;o�+�/���������#�E2��_7�/�7�k�B��l�݋��qu���M0��ㅱ��7�� G�,��G]�����5'L����Y�o�(�>��
�ꦥ2�i��s�����P�ő)T����mr��|S���Gׁ�@A�VL���n3-BZ�5t��2�3�ҏm5�Nޖ���x`��m� 6���C��vx`�3*/�?<u��U�v��Ư�B���
�P^O���譚j�D�l"�N�UA�k
�(�y�������z���
���b!J����\��n���u]+r���I�k�xq�����/6w�s|C�o}�-Ń�:+�42�Hi�w8NΈq`��0�S'a9!3�>}�E;����<<��>E߼1�g��|�H��"��������x����|*���WPu�`=.��/]���7z�=�p����"TP���>�ѳ;
ٟG�+�`�c�:I�?������
-+f��!r����4�X}�p<0u��zF�#�;-�����|:9�q&�?�y���1� t�����R�V�	�.w���!X�׵˅{9~�~��꫇|榵^l�u
>Yg����ؼJg/��̆�3�H�:�`�,O:�����2�ʛb�k�Nv5:���� /��
��7�Q�N��
-+9<�$��t��]�4	��x������n��Y6�+�G��K��@��<>l*�>0�b`�9W��ɼFğ��;N
6|чU�����]ߊ���m�m�Xk�u��[rL�����ʟ�JTǑ����̇�O&�DZ�ǁ�[��oN�<�U��Y�
�@~e�eֆ��Ӄ.��g����4�~�âF��4&`GOm5>lxhM�XѢ�A+w�b���h�3�'��"��H��|/D��}�W߯�7��u��3+w��`#,ck�,k��YG����������3H���[�{=��ϰ�^{x�ϒhu9��<�`��+&V�?k��)P�/��ڎ�C+`�^�Γq����[N�O��O�r�UW}�7z������q���;c�,�OD9�E��BX����Q��,tF����nl����6�EX�%R1����m&��c/����{"5�
d�p�B��G�>%S�wt
X +�#,������ʲŽ������v���%5^d��g���H�*Z��b%��	�F��^bN��?6�`-m�NU��z�S�Rz0�Z���w�ZAZ���D㊨�ȝ�}(3KUS�`T�]#7��s
^"Ęql��2�=��˜�ܲR�Z���S�"\�K+�vB68"��їB�n�B��`׳!93�4J/��6d���L�6�	A�qB���CcDu�!}��f]+�#��_1�]�Z�bH�A0k����r*3g��
J���6VG��w�k#=�����G	�q��
-+�M��f�wt[�}tR��<ț��*q�ۅ؃������o�kA�7�n^���ed=���y�a�=�FpV� lnc���It֚-�w��˱˯HJ�ki���|���b.L/Ggl4�lz��'�߾�|��x���0��h�	f���;���`Lٷ������쏷5!
-+'v��a(ުm��+r5���ƙ��}
-+0	ƺ�G��C�-�5�����򶿂d��5`�+����?^H�k��W�|���l+�[�)��6�L��
'�6=��Ʊ'��;$�H�0� {�
iWP]�T��������_�Qr�s��ƞ-p�F�J����X�
-+�^i^��}��������R8��+�SV`Ѭ˜��C�t)/��>l��E�N���B���(��A�o>��عV����'N|����ϼNa^�
o�:�N������Y��n�"
�����<I����տ����ZP�����C?��4����LO*�}�i��(Y�6��E��%�Q+"���'g�[Ţ�:�X��٫lj�ڱz���1�}`��zkbHy}�4��=|��v���������ͳ�h��#�*�������O��:S�j#Éj.���P�V�Z������f
�>Y�Հ���2�t��"Nb����`ko�����e�֜�l;���	���zF}Y��sӨ�b,T���'+�κ����d�@��=��y�����>�q߾�{? ���,6�e+?:�_tu�8��1��0tL�p<�y#��%܀��UE$z�9�z�4F���}�rK��
�0PڢRj��x�%	->@�[������uQ��y�~�3�<qI�	,�s��u���g�������C��r�f�5��/�.��/h¬x����cl����O��e�~���˾��ڡ��(��9�~
-+`�K�fچ�lf���E���}�������@�֫O�]���O����שY�N`a�����=���r�7�x�5��rˏ�x�6(-
-+3}>���63���~�9�����q��g�,$�Q^t��שޙ��21ǃ�B
��`�|�qc�Y��c�rٙ�E�<S:|�x,R�
[���o�\HY2�Z�m�/�8Y����*�L�`�W�7���j���p�Tn�#�6�4��L��8��Z^�H�?�����iSo�TWX�s�o�
�\Rr�]䜁Ss=�
�wm��Ɔͷd�e���d�v"Yv��uK,�~U8���
-+��5���}E�p�>�8�ʄl"*(�T�2u<l:���Rslb��3�
-+�{+7�r�2��@�qEs`��@�G���M�í�/��;5!
-+.N
}uԸ�@CDZ؇�n{��xT�
��u�/��sC��*��q��Hu���њ+P�}��q��}����[l:|���eE�)r1��mN$���U��/�>�lW^Wi�nҍ����\��?��N�F<%��6��G��Ǩ4�
-+��C���h�u_Cw�3hՉל�Dk��.x"�i�[o[n��f��kY�*4=X�NoZ��Q�1U�'?�����>+}<��/��8c4�1�5�G̀v�q����Ot��F
X��x )�>�	�m|Ա֞�	$��NȄ�6(�	���{�b�jӚ����P-/u>��^�%�^�^�Bk��+"X�rc����sa�������m��C��4��1&�5��%���>�^��Fm}�P�����՜#�>�e�!���`+��٧1LqR����}V֌�b�b�g��͵��p� l�Cm��������A�}���:6uMcX�QWI�������A�]y�Nf6��D7�P1xj��V��I�R��2��_AT{�PN�P��Q����?�?��"~�k;�+��Ecs{>��z��&�:�uf�[tĽ���1@L�z��﷗Q�^G_���9*0Oҙ�ތ���>����K� ۯ����h�#ݹ�uf�5g���W�O����FY$H���z�a%�љn���~���Y��(�2/Ԃ͈X-������׶H�e'�BBNz:!�4�\/c����%e߁>h��Nn�6r܈B�O�s����,�9
-+#q�t2�Et��S�h����P���7-C���v5J��r��*���ULw��xBk븲��D�t����&���
-+�;�/@)�#����cP/w3t�8��I.��4��)���9��_�2J<s��2�w~����ԭ��K4��7ڦ����V�ֆ��x�����7�h�-҆]^4�یKh|Z�"�lY+��G6l���k5;��E)1%��������z��?�����}gO#��Av��� ��vŞ�"�5��e���l�ƌ���oz$�r��א��6cYՈg���Z��<
-+�����}�@�y����7v��z�w��=��\xs���"�v.��&����}��N�������Q\_�_0Ǡ��)~hY�D���N�I*9��a" �h�
�&9O�W����s+��sX�i��qs#��H��|.��lSG#�.[t����[7���7$�d�MSj�UEf7�ҷ�E���|{@��~�OXq$��Gn�bޖ�7<^���2�x����.l&����<�n<�B�@�o,�Jk����P��s���ph��U�7�Χ�yY���H
�d`�P�\��#���'�`�9�927d3�c��e;�?+)�НsK8�s�Wlֳ7��W JOl5k��FM��6�+`�|�{a
h�o"c�J�w�}����F㘨z�uP�i����
-+}
�/�U,�`W�����u�z��ٻ�Z^:sv�۾�g(��ƴ*eOK��=����O-�|�Ҩy����V��x={����^Y����j����t�]{�P�9{�|��8d��5�h���:^��Z±�5�z�5�0�B�)u�U���"p�ՓG�Zu0���(�ة�f����z�ѥ9����_l�S�����E���j�;����>�E<V~�'�6�O��q@l���My+C<1�����H0C�Zo��]��+���^�8+���"�a��`���<Zi��?�`5"��Z��*D[��^&�?�>op����z~�#����ja^�Hl��|B�Q�Y���f���+>������n��x4�D;�#S�����+-2phkmR���ey��pÁ��z�;ۯ��ܴn��Sq�k|����;��������)��o���Nj��_b�G��.�ܘ�@9���e�i��^�|���7��?������<%ߋ7�m/o���Ӈ�XX�H��B�S���>�E��'��Uy�o>c���F��D�>Z��+/��W�ۭP���q�݂z7N~��1h�;?�Vk��p�ij�V,���q�#�hk�RL��چ>u�Eh�Z�����o`ĉ�d�g�機L�F,��y���d�ùj����F�-��gS'?���x�*�D�f05�!�
"�Xז�0S�ó�@�je�8����A��4�zӀ��?P(M�����
�m֛��.t]s���<��R��J��c�|Ԗ�ث�b(��{�y�����q0�5�����]��#T��:�k+
�ݺ��ê�T�c�))p��
	_a�+|��_w��o����}��Q�;G��|��c�嘑^�w�
-+�U����@����H3�+���0"z��X�yJ���Y,Ȧm�4��7
Ɔ�����ѣY������1:�=�P[}�'}3]/mz筚�,�
�k3TµjCp�bd��[7����{�6*��
›�{D�f��i=�/?���moy�r첣���+HZ�d�5*�u���ە���C���rl�u�b��X����W�$��Y�;�Ӛ�I��k�R�� �R(7�n6E����2D�k��Ǝ����xh`��(g���c߭�U�-ŽX�m�%>�.M�x��m�8��lT=L�,�+�rNԸbK�&u��9,x��4�V|�k��<G�6�Μ�=��Cu���7�xi�Mf7h�T�f��x��_>��-'��g9�i� ��`��̱�N�'�VP_��E�i%���P1U��_��⮶��:~Y^w�|�8:�V�݆��i��ڢ0�_�tc������n��C�нRy=���p�ݍ7����@]A_���v8���yMk����xǏ0�� �ix}Pt@�-�mf�����1ӭ7c@?�_$z�w����n�XhX�t�Wv�p�f�<t�"t9T�)������>�1�l�
-+7[���8il��.b衏��:/��rӨI�'��}��y�w��£��u�}����	�Z�F�Ux����F^�y�!S_�G:�:�`�E�
ԋ|5��l�!.����U���O�
c��<0�#��k�p��&s>&
W[�+��=���f���r�s�%����<�_�T������:� 1�y������Z}i�w�ҋa�ߘ�pL�+�k[��AO9mi�b������ ��4��V����AV�P�ҍU��}W���6YH�1jCoZ[���x0��,W�N�ߨ;�ר?�ڳ'���"�P?�RK�3�;�sW�@��nyO�k����C���1O�!Y�w��k9@[���_�|s�!���v��o��v*V\�͘����+A�(L�M�E�ٱ��}�Rt��ց��~K�:���=�bh}���+&���^�	����kbSS��a�W����4�L��ο���g�Y��[8lq赘^�#��A���O��xa�3X���l�a��;"	������}���e3@!%첟���F
8NY3�јO
x� v�]���hrs^0ۉzj�����v�a�8�<o�	��<>|�&��dz�u��$q^�i����'lJN_���6ǀ�%�Jڌ>�ΛZ�#׬��A�F����ys����������>Hb��$Q�Y�|�+��{�F�@4M��p᷸t��h���zދ�/V\�_��R���t_����mz�l�w�_q�˗ydy�����dُ�
4��9*��I��Y���-����Y^��$�[hÜI�0��_���[)>v4�c';6x!�����s�;�
Y%��
-+�0�g�(¢G��kQ<9
-+C7u�����QŋbQ��C@G��]C�\��U����˵p��97�𬫞fA�НP�ڿu1g����6u���O���I`���9WH
b&�
n;��F���x3+�em�����!l0r��ڰĊ+�+�U���ɦ������Q��
��.Y��ލ����
-+�ۮ?�n��֢�z4|�%�z��k��i�ԫ�=t�q�t�~��
-+��B+������I����z�C=����逰�m������s��̡��3,�YH8ƽ�����r�'2N��^��_�
-+Añ�%�߬��d� ������`���R%�v�^��D,��QR#g�L>y��ϗ�Z}?u�r3�5N�jp
-+ٝ�Ś��r��ֵ�"&N�<�]�7��B,M�'��R@��
W/��c�bI�c����9O�Ž?�,�%�����Q+.b�ol������m�TǮб3�^
Br�1�ď�����6ϻ����}J��O��g�d�W�x(Kw�ו[Y����Xq�.y��_֎�����:�=�����痓��u����/.gΞYΜ�K?�EZ��g�D�cggΜ���*���a��>t�h}�^=����I���K�cG�.�����e��K5�w�/S��aE�� �� ��ڋ����(^>�zRZU�}8]��o��c��~���3u!XB�=o�\�T����u֨��E,�zy����9��a�+p���������w�B�7���Ez���{�ѻ���>+5�I�AM����
�<�jt�����hT��Ш�+��v�m����Q��&Rv�[�p{��!�e~8��<$8~�ˉ�W,W�u��q��_q\�dϱ$��t�C/8s�3-�d�
-+?4;��X!��h�y�u���.9�W���)��Ga�V�*���m��]��О�*Ɨ�{�������h�&����f�e�:.� ���Th��֢'P�K�k���N�"�Ԋ�{��JrW���i��q�:��E�ê���q��-�l}+���}�U {��T��T������Co������w�u���W�����r`�+cM��Q3�!�9ƚ~�>����*~��FbFmp(�J/k��u3�~7{�u�l�k8C�D
5ϦaٿȄ�6VHh�En�R(9�:ǥ��?"���}�@��l�iV������cj����c�_�M�����~쫏-����w=�V+��8�޵�N-��G���_��rL���=�O
�i���ui�_�+���ym#��s)fN3�e����
-+�6?�E�Q�VFe�D;�xHه�Z�`b�#dzk
z%�Õ�D���l#�h�b�F�C=s>'�΁���JɤON	޹�9������N�Yτ����!�!��I�k��,ϕ`g�=/ސ����)�^�;�T��A�8K՚[��(�_?z����4J�$�|*�z�9yѫg�RG�hC)߮O+���ώ���
-+�X��O?J��q��+����PAX��\f�)&kf�
XkE�F�i�l�[R�TJ�.�p�x����M8���vIf��T�W6���h�ˣAVw�)�JZt'��زw�t�����O��ƿ����1�:ʮr��j��;ϧ�,���F����
�����ܲ/��QK�8�9��W}�t�l�
�FB�֟}C7=�|�V�6;��P�P*��2�N����w��Rpm=�+�I�$��YL�j������m�w��wd�w����j��@�b�7��W���A��Z8+�z͟+�e#j�b�iħ��u��+?���	E�\
-+κ>1�����Ԏ�.0��'�e߈����_b��!Pbb.d�K�+}Z�ج��Κk���ޠ����������r��a����x=[?���H�ճ�y>�K��*C��+�Q�^ǭ�����k,+�+=��:��+�Ê����8X�:f"�r)\rs��i�+l�C�+�Rr�E��^U1D��'��A\�	���&dS����Gy�0�q��w��'?��u�lP,h1��D���}
Q��q��S*n��eU���+'N#28y,�
H
Z�<HS҈��v��ق�]z��:K4,�aD�L�l��F�ʮ-�蘮�2���3�����i-�2���7Έ�{,�4 �cz��.���f��i`֖�y6��O<�����ܽ_X��~�K��c\kSU;�˖�<���a��L�w/2����{5��;��v�_�Nܻ�S�����⬓�����o!�O�Z~��hyX�W�'?��"�)D�������%L
EhB��n��ʼ�P(c�
w+�TJ\�Y��T�41���/�eŒ��5�l�oK���
{@�Ka���
-+Lk���ژnx�0C
-+�0H�u�V�t�Ё��u��_�EC�1��H�+Γ��	�,�p��.��7ܲ��oX��x�B�ߤW��	���ۧ��x��˃< 	�*���+��>�����/7�p�1�3���n*8Y�+ja}����ɹ������ߵ�����Z��ο�SĿ��o���[�t��
-+�k-*A�ƻg��*W�A�$�+��+��`�ɣs@���~��n������~�����Np��EQ�^�ǻ'��~۵p����Dk��'hz^<���׭?��9r�6�k� /�ʁڼ݂�����o1(����$��K�c��/���Y�j�1�.ϴ|���Eun�
^�xJ�"ܼs���ܱ��2�9(c'(��m}�k�����9�Šk+�s�i�i���8kK+�
�`�q�u���nهQ�
�1t@ǻ�w|��˧�k��~���>�r���������'o�����Is��Gn��6�N���>��4���'o_~�=�PO\_
�w�i}|d�������5ܡ?2�q�n/'5]�A]@�3�
-+|��aol�#�uy.ڼ	�X+dw�+�9��/479v�}H�x��Z.�
��6~����H�s��p��XIqtq�i}��>�����ҏ�}ո���|�w$�����w~��n�=���X��Rr��������I��E�cvX�|�o}����.3�9�*���v"�����~Dt/�j���xTz�w�M�Ӷ�	w��Ļ��W�P�ǹ�u7�vy�[޴|��W�|����1���Oc>��o����I�kʎн^��ӑ�Z_W�����^���b�S~�m�^}-��
F
��+�����ヮ�S"����
-+�s���)b��Ig�
�s�����k��7���u�4P�	�8�G�r)�i�����z��.�Q""�G�M�!��n���
5W��2�
x�y���$>\����񀧀��oz`.u���+p����]
���#s���������������6nhja���Y���o��n��9�E��)(9g����9a艬�<A�E9J���;+dwҥ�H��lR8[����h�r8/�ҷ�(�2=�=run�lS���"�ڄZ��c�Rz����u%[m������'�W�V)Tr(,��G�ݼ�Tjg�ā�}6ע}6�8&�X>I1�X)>���m��89싁BڈS�s~��n�"�F:��9~z��o��ٷ�3��iId%������N�Ļ@����|�ح�:���������_\>��?Y��x��������[Cn�++]<y1����p�˰c��;��T���5�V�.+}%~�ڋ�h�,W�_�ݢ?�lb��i`īj*6Z��07
H�{�x���ö���/�J1��/��a���#f��\q�desmr����u��Jj�ƞ�J����L��2a^�aY�6��j@O��I�'���-W����y�hݵ��m9p����a�{�x�Ʒ/
-+%�;�o�~jMn��O4�~�f�sF���NXm����t���5�@m��<<AvL�oQ��N��oͨ�̟��?��_��r�uh��]{���zV��+�3�j��s����	��zf�bS4o�I�q�k;�"�EË��D�b�S.��֑��`C0���
��K�|?�e��VS�Oz������������h1L5Y_Kj�;��}V���z���������M~5�{���U�Ml��(�u4R۞�����?���y�ށW��~A���|�-ˉ��^��C�Q��Zy;��u���/��3�?���^i�:"�<H9��l���\z�e��R����r�wi*ٮ�{'F-ֆ��inٽ��Wt�b?
-+s����O��?������;��ۖo����+��J���2�<���Gt���������R�a5C}��Ԇ��`1�#�zu��;xKِ���.1�%,Z|X�h%���r��'��:ն� T�����k���`PO˱i�(�4ظ�Y���>����w@����9Aڇ�'�+ś��m[э�cQ�������ӵR
�ѵ+!�������|zhի\� �����e��x���Z7M'�n??��;�s��ᷔ~�u۶e�X��>����?����'z��>�;�O��m)����rup��5��{�藗�n{���a~�`�˃����½�<G�i�g�srq4<s��r�5W/���:	�*�CN�|�~��_и��۶/z�&5�Z���Gی�3.��/��h��ct�e��mc"h�L����gl|<����]��{��3��<y����_�F���q�`^����Aͧ)��#F�y+���lڜ�m:	�D� �7�r��@����o�0�0��O���9��:�,8e��|m�5��D��?��4V�$���	d]��R���cG
-+�z��2P��i��Q�.v]UNZn��~Xyxt��8�������;F�J݁�&�_�Xl~bG�}ј��:d/��QYk�zbn����c'�ܾ�nV+�-x�$pp�����\d�T�N��E��&<p�4�����O"TbR��C:A�ai[��J��Gݯ��(��˰��o{*�W���L�,câ�=ac�Ρ�"��M����'ˤ�v�s+"�?��v@Z��I�#�+.H����σ0/ڑ1�����
/�� {��(`7���
-+���{����&S���hX�7�D�EN|`�Ĉ��?�2Џ�ڶ��3.��Ÿ흨'�V|>;Z���7o���N��>4�Ix�w����(.;�M-.�N����t�Ų ��[�#e����"�b�;%`��Q�����"��������:�S��O�H�E�aZ�t�Q��
��m1�\J�u�՟pm���S�P۶C�,�ONԗ8��>ȅT|2��X�����O�I�}z��;�X�e��d,I�W߰��?��iKgc���x��"��xt������>؛��i��*,��<�`��9��@ҟ.lZIZ��ࣴ�S���l]�p��l�a�J"}[��W���?�+m�ۿ���6��ғ����]C���}���|�u�{ݯ����8��v��L�$]o�ޜr��ۧG��W$��RR��Er��λ�j׎�]kU�S;s���	S��Z�}�cG��n'���T���������"��cUc�gA�c#|�����q�3���Zj�:e�;ݶ�>>!�O4�f�D8�-U��<6g����A�q�e���+�*���?��+���Y���>RK^�������QR)A��0�i�wRn1X�}ڤv�ȓx}�*��j,������n�ԧ>u��<S��C�v�ۥr�Z���O+G6/&P��R��X/�	��%���됵~���9�TC����4A� �B��w,��&:�G�wOc"�:�`�
u�'EG��I�
���-�Bǘ5�I!�!b(~я�h�s�R�u�B�~�ܨ�V�9����@!Ýeb5xm���	�ܿ�2V��v^�S�"���r�tK‹,z�)�A�6�V�C���)��v�>h)��(��X$�`9
�C���+ݤ�8vu�7-�
-+�
-+���$����`��
r�er��r��E���6��4��ͺ�F��S�I���?��S�s�S��G�h��?m�׋}�uj.���5G2��HTZ^�Fg܆G�����EB�ж��E��<�Y��s�1�ò�:k�;U����HsY�����P� �CO>�O��>�t��^�ȳ�b�ʏk�g��:��v�)��i�Ȧ_�S��b�:M�pٕWN��|sE��6&�1�ko������gڱs��n����/���ﯫ����O_�oz����FG�V�k
-+���2�5L���F��ǧ�/������dF@ȣ�nS�����|e��o�>���L�\uպH��-�!=���a= ��c��;���f5	���㙛�z+��|�
�׊"����ŌD+ǿy�1z����v��	�jt; 85����+'+|�^`��[���G�DIJ� �H��������¤��9U��
GAs-p�����ڢ�f̱Q��4�ݦެ��u�޺>������t���6�mj�@i��>Q���
0$ch��g {R��m��m߾}g�{��G�'�@{�	�4����H�#z�Ƣ� �4��c?�<xiX�;�
-+���X¼_��ill-2#rS��IN��Xߜ��\�	q/���bAN��"�zh��	���ů|y���Qc���ǰk��B���W�a��YU�|�X2�)q�	�I+�{}T�����#��]dʎ��n���m�,����}-5����
P�Mk��߆X��v�[�^��y~�����%;�K�
>���~Z��X�����"�І�/��9�{��<����!Z�骽z��ȵ����4�	��g��(�fCo!�B~��a_��x�m�=�~���V�6�1`�i�38��t�����o�����r�W�Y{b��\󆟚n�
+����y@�����ݻw��G~~�ܧ�|�S�_����O�'}���3~O�Sw�=�]�_ �8xh��?��>�u��|��pN#o��N
���D�#�$��Gk�+`��^�	օ��n"��/��e@���w��L�*c+I6�;���+~�f���t���Ea��d��c�I�b��6^�do�4�f�l?K��E��ԮK�ހGS%��������C)�Sd�X��W4��wf�����[��b!��9&��(�g��+�2
-+�Xw��������[�'��]|�ڭg�g�
�
-+�c�2=�k�Y����(]o����+
�[�#:��~��^��?�����>����Nޑ����'Q��r��t1���eR�"+^�e�	*}] ���P3���:��[�t��e�&ҳo�k�����Ԫ�l�
-+b�U�����-��.�aRT�-mZ:7T�|DU��9gp��.-r	�Ql,����A�6	1�1!��l���Q4�ؒ���-(��+^�6BlY`[1���hk:���݋z$@����+��@�nrV��(k�߭98�3
-+��+ʓ���`�54_duΓ��ŒWH����dRӧT����O���d'��.7	��ȁ1�d�?�z�G��[~��)�ޣe<'�G-�b
-+�?����ߤw��w��%�gV	�Z�FM�ɝ��v�Nׅu�:��m{lD~��_?=�7���L>��t��}~'�{���ƛ��ϝ�ſ���+&7�p��A��ﵺ��^n�kڌm��`�إY�f�"4\?i��y�?\�t�n���?<]~�@��yu�n�q���݉QX�>�!��VU���M��N$�|��
d�d��j����_�8BPWm/rժs�	��.7���J����	����y Ĉ����/\��0��ߒV�^�Q'����G%ݼQ�k��Lk������c�o�J
�r|SuQA�'
Զ�T�Q�0I+����RbE�i��&qS�L���x���9�G���^�ֈ3���Bۂ˳OE�c�C��Ўf�l��E���R=�s��VY���9�U�Q�<�"D7[~w�w�����!~�����~w������駟^Ї|��s��yt,�.�͢i�	O?!T�֠��m�X�_�����;�]��v�ڭw/wO��>��䝻�����v?�m�.����۵F�ͻ�������C�T��/�#�G�5��G����;����(��>��������ܳ�Nr�;�����:{�x�P�䏗�={�L��/c:Yyi�+���38-�
\�橾\?����Ht�mޚ^�`��?�׹�F��Ljʺ��.�uyq��ַLy�{
uP��!���>e����#p߽�N�>�pzH��s�I<�����/h?�����u(�U��9ƭ�_<�֚Ý�����WL��D�s�j�^�V�m?�����|��w����8��)�Ojm|�Ԛ ��Q��_s����x�۰��JR�@��5�����l7Rt��lc3��Ѿ�8����~��z�y���o�1��/$�s�>C�x~��AD�O��؟����4՞��ƒ�n^%�*F$Tx���/YC%6�[�	��f�o��~g�Oz�2M���*����5� �gQ봍�8��Om/гC3�8b�Y������t���������}u���3�<s����M�}�_�n�/�7��u��DQN|��Ӏ=�_-���>�w�w�y�/�1�B2����A�E��^I���?�$?m��";]W[ݾ�^t��ZYj^�®�v��܆F
4�s�g�?�H����~H����U�Z��G۬D?8s"+�Q�::��R���#�b}�Ԥ7~'n���&V��8~i��]71�ѕ�NV�Y����_�/���U�K�5]��t���u���NYS� ߸][o�G���n�6a0B]�8oȯ��z��3y��ׯ3��g�>s��v��]���Y�3o�qR��G҅9��v��1��K�.�u��S�K������yJE�N���C�飷�������������|�U^D�J��Pm���HRC�ܡޱs���_�or��i�DҌ�g(*΃b,���u�=q5������G���c��aϒe�hX5|R�4��]���߰��ث8|5�i�t
-+��8?7�Zi=�\<�p�mӵ7�4���{C�i��q؆��F����#���@�b�X�o��h��)�K�~w-�����75A5���*Tiڦ�_y�k�|�-x/C��ҳ~����ڷm:M7�Ѝ����{ƹ�^Ws���3Z�z�g��Oާ�
�^l���~���z�w�<�o"<�"v��tD�'H��6�ڮ���];!~�!X4��#l9>%?���f��~,��¯�~�R�|���ۿ{��k?�sӁ��.�K��ɍ����G�t�e����_�aZ�j��:2�%��}�T�m�{%Qy]"� ��@�3�Z�D��QCM�-�1�e�%~�^�Fq�K����
-+��׍I�6<5,�q>E��>�4�.�}��1Ɣ������w���m�����U��ڍ?kP�ew*-|,�7Č� �O����0"hs�᧝�:#�Z�[C�9Z#��;��|�W�>0�7��m��zcb?�X��[��=9ŧ+�n��+����#�'I��3W�"��T*�|��]9($ͭ���p�`�q
-�lg���p�v��+,V^d��b5�l�iKj��12�-$r�����agC�֥g�q�H�o!��u�)��Y�\�D�'�n�!��@"�}”�}��j�H�9�Em\����n��c�A��\�&��@F��QްQ�n��m8hT��=�ii��m�3\��G�������}�n꬏�����MV`�]�s�⿅�Z���#����d��DN)6-�"CU�~�/�9��$+��߸2��m#,�şw+й艌/+��|�]Z��9i-��V�x�������~�A
�?���?��c�S�����L���9�7��h��%OV?�O��5�_��_�v��
;��e�t���s�g��|X.�X���Kk^oC.��2Y?Jd�O��<�W��g� ��E�}�.�y��t� ���F�~T��'Tˊv�& �-5<|q�-���yA�?�X�㋴s\���ņx+���X�ŏEڐ�k%��^9V���}�?F���R�Q��<�4k�qE�)�NM��6L�����%���!�5475�GvԱ=K�_�L5e�&����+y�)i���7+�������,�֠Ⴟ�o��,�Lhg^@�;,�+���ϑ��FK��\�887���/:��OLB0m���s�sJL�
P���G�"�����k��@f�+ ��;Q�(GGu�q=+��.�BP�>���� 
�v4M��]H�!���cnEk6
JC��땹����߬-|d7�
-+>�����8�o�憏�/�oh�q��	h�I�/�r�Y"ңx�U��$���`��:e��k�:������(�g��ݑ���P�z��F�i�2NԜs6Jc�	Z䁂Toc3�K%�N鴏B��-هdXnX�4ݯk�K��z���p�ŵ�����pgu�O
��d ��5�D=g�4^፞4�5+b���m�~]�կ~�����ю[慪��D�h��R�7����^���r�DѶM�b*KBX^-l��Z g�t
-+���]�,w�9@�*WĢS{�m�K^���Ǔ��8>����tgY~m�X9Px���O�U��t�����SН5���=*��K(�M�i��"S�1mdٶ.(y��-yr�\��5$e�x�H��h����V�7ъm�hc�@�EÐq��q7",2�=��
-+
T�w��l�d�Un���ƹ���������t��F��!+���Z0��?z+�F]6ͣ��Зm4x��y�z�.�L�u���KD� `{�e]�\3�r�3o�:�K�ڻ
vI�c�4JC��a��$0�"��^6�����f��O��Z$�}j"�=DZ�H���b��
+��-�ţ�s��<�?��׾�m����^�T���D�:Q��OK:��O�A,�;�	ӹ�*ڔ�����ju���1a�x�_��|����
T���(�œd*}x�
-+�EO�fz�qՆ���$�";/+k��Tp>t�s��y��1U{+~�nY�טu���������w����D3?����uM�!m��DY�K'�A>�_��믾����{���upx�f)\���2/uX�_�_�c�N}���Gr/�O��
+��S�<yBh��2��C�Y�D�R!�JI�s@p�;���h������
0�����a4���2��q��g�?�h��
-+ω':����e/�`���S���E]X}r�������[1X�6�<��d�Y���:^.;�֥�N��x�����Z�a���wL�#K�B��1\x��� ����$�l��SEj�e��΂�W?\~�.�Ś��J�s����'?��*�̒4F�lz��Gj��*��۱s�t�%�M�]y�t�(��~g�(��}F�&>�[�(��;=���t�z��4T���5��;�� ���И{��<dD0�%s�O���t<���_�0�������6�4��-'��'�xT�׾.m�3��X��È��\tHE?f�\D���Д5��)_,v]����jytz�m����O�;��α��˵|cS�/N�:���<�����g-��1��ֆv�Җ�7C�>�9�	�<v�F��U{��������z_z�t��W�'�:
-+�;}�Kl�~�׎���G����秛��^�|�������_}�#��m>�c
-+�DZ:��Mc�E)8�(J?�D�e���5�6�����a��+P�I(�ߓ����&=P�����������Y��Ki䦌�#��/��:����3�֯1�G�ʐ����a�x�7
◷�$�1���=n�S��Rl-(Y�����y^�:��A��nȀ���d�%�,^�)�3�]ZE���G��A��DӺ��ck�_�5_B0�l����5�kЖ<�/3Ք�'�)�6�q��-��ڔ�X������d�w>*������`�\kΡu��j�9�+x��>�䎯��{�O����{�4�F�
�d���?j�1�ެ8�ί�Ad]�ȑ#�\p���y����E:�_^�t���
-+�2�g��hͣ�������ܹs��_��Ǜ฀L���T>���=�8�,���5��Ih��
XC�KJR�V4��e�cO��������������|����BH �.R)}��;�^k��

��˜ki�����Āҍ��lRxp��
-+~�'�z��͖}��,��ꢄ����[y `C��,��bb��|='n�ʡD��/��Ků�/�$i4|u+���]��7�/�.}~EhfK��9��횘R�M4������1��/�<�����~����}+ؑ����͞���j�;�ыԪ�j�G�D�|ՅM�_y�t�����]�������X%��%}�(�bNh�33�=CMma9*9���Ri�����$I�0(U�4��y`�5v�̬r��"K�eX�Y�Q�E��o���/9w1Zt%�}Jx�_�g#��?r�Qm��VTdN�4(v;���΂�[Y�-
-++.���Hh���\,Ϙbz�K��I@3���
|q��YG�	|�Q�\t��*O��@��Ϲx��7��1`?46��V�T7��d�
-+g�ۜ�Y�u�u��������s��5����#�������P��0���Q��>q`u�7�D��I{�G?�ѷ1ɻt�k�c�x�q����u��w������#�E�>m�I$�� �M�J���)l{��C/���ŗ�8.�N�Ă�(����2(*�a���++/D�x1�`40gMX���*��ft�;z9p���%@�L�ӎi��#Ǹ�>��k	���OI�֘09u+>h�+l�F���l�@��N�R���X�t��G=���A�����2cl	���ݴSW���Ү8�`���!������m�}���u�o?���^}���xQmW+���g�ïТ�6�.�����E��Yz'���I�i{�����I�ˢy�̑?���k{TZT�L�G�s����T�
-+#��uKƤn����d��ܦ��KXr�j�X���V�}���:Xo�Uƌ*[���g���s��������׍"�"V��˼�j��*�d,��U�c�����!Xm+�7�8r�!�����`o�o��m+�|��Ο�׳ λ@�j�رS
-+�c��(�Ʈ9n�m��r��z��h����聳���~=��#e�1�m��b�^�jx�;߮_D�)�#zQ�]Gm�'h��lVvk>"?�@��i�Ʌd;Nd3_�%t�	7���,���@(
���~�����T��)�6}���%��u�tD_����ۦ[�}����&��ڤ�v�RGG��D��jh-ߒKla��_��n<7��?�]"7��@?S�}����J�b��˸?O?{��ǏyI{4h9�ddKIs�J��I�2d�s�^.#ɚ���'�R�7�'Fٕ�q��+�&/+�b���U�7lk
���ͺֆ��󀟼�x}��x�7!:+�I:~�`�5��k���sEm������P�*�x�,�K�$����@���e�|�A
��,��Xg�U_��]i�U:[�#Y�iA
Ӹ9��ID�o�����O(8Qz� ����2�������r�; �$?��FL�����gJ���-��`�/�)Vw!�\��@a�β�Bs۪�i��a�ڲ-�=�J���Zy�g�R[�[���},L� 3��m�]Í���lg��1)�7��`����/���wI�����^�t�W'Ab'ʘ�7+X
t��DTM�9Q�7��Z����lΝ:J��,xj�g�
-+X�=�I:�� ݾٛ��?�?UZ|�nS���2�hS�x�y�yѬ�����c�~��ܱ]�L&�ŀiK$"qA��8?���'��Gh������B�{0�S�Ů���&��ɛl�5͜��v�=VV��Ա�����?m|�}�xhW�� |߰S
Vl�b�Q:�e#5=�k��we��y����g�L:�f]��›0�N��qͥk��_�����?߬��kD�Č$�%��+���־�b�,�qҰ7u�v��������>�����l�bi�sQ�m&�fe��M�z]�)-�ݡ��cGVQQ0���v���h`�Ţm����mPVƮ�V���	"X�tmY���Zt�"�w�B�6���z}[D��p+�ac�Y)�fR��~�`���wW$��~���P�	�LA8MB�j�\T?��3�_��O�G?.}���U[�壈�@�?5؛�GO[���FO�����������SO-߱!Q��?y�[*�>�"�=�|��q�?���.���a]��n�n*J���7C4��3���w���-+��1���8��
L�ln�N�m�}H��.�=���G��"a7ʗ�
y{�|��yO�;z��wO��c�{0�>��������Xl��S4���gr�ˀc��>?��*���ŗL]���={0.�����.����`�+ӱ�Q���[����g��l-xR�Y���|b�]���������X�1C�
���G&��~�ͷL?�Ӝ~�
�O�����>K��R�yIt��=#&d�}|����/Z�u5YO�7�O�c :�6���z&N��6���Ηs
-+���&F��>���O�~��p�կU~o��A7��8��a������f���v�RC:\6����36N��$?�:)���P��4.��ܨqN#8� s�In�Q\�K>��+�yb%/i
㡍z״��|�����U��~r�,R���mEzw׶V2��>:�p"PNe�,��AgZX���"{|E����Xo=���,�Z�=s����ɿ�����!P�;��R'���
���'��U��f���������#�D
�'��/P��5�,L��I����;�AN�_Kҧ���-#�g�#����!Wf.3�F�	|E!H8�o6b�=�bV���K���QV��6M]�Ħ=�-Y |bEC�:U�d�O���������|0�%���+W����夫K�
)dZi�����+������,��_/Q�s�E�+
��6K���"�B�P������h��R:��bZc��{7ؒ�	�w)��O�}'��n�W:�񫼳G!�٦����=���#a�=�j.��Q5�������fv��'/pR��8��m���\�9_���/~�kz�����`��Y
��r�rMC����^�L��r�t�gN��Ї������b�r�!"���6F3涚4�ߎC��!�����o�X)G�6��l�QG][����	#�].��;�1E7�I2�x��7��aC��]�)s��+'��q�b=��/=��'y�B��Bc~"f<�=?�
-+��QN.���I��+��n+7U�R)L�G��ø�K��� 7�$=�]sIw����c����d0��J��'t����������t�w���Ǟ���p�+�s��Hä庆 G�Q��m��-��+x���ŧm;��C칆���j
�o|�w����2]�w�O�{�p�6c�w��|�;��v�V��`y�kk���ܢ�_�+�d�9d����R��13��
�u���ӣ�<<=���Q<7�NB�;��
�.�>E<�L_`~=qD{����+y��w�(����I�y��/"��=�@K�`j���6@�}\�cl���_�,
��c�
��-�=$���ձ��;l�[�կ<\��ך��C��ꖸQ�u�+]0�R�6��;O'��x��gҾ���}��s��o�dv)�O�|�h��
-+]+1�"��'ս�e�/�X��
-+o�=#օ�z���IC�׎
��u����	㿅����޵w�ޯ��_��
xN/�頻n�������'+�׶kJ�?<�
-+n�sdX�Ã�>��h� �Z�zK�f�-���K0���]0"��d0�>�ط@�"��O����V����*�o	�Xi�G���2W4��&�4�]Z&	�����.IJ�+�.c��A
E�¥-��-�x���o{�t��c�M'�K)�y���V��GS�#������%����X��d���i�
-+
-+��x6n/l3�
���z��k���f�W?Lɩ�y��ڌ��5*@Q�1륟�:�sd3�Y	���?�r�3�[PR�C���|3�X]�li��W�IU�S\��,��2����~�l@)ġ�����(�<˂gZ�K�V���Gg�큇����������it
-+����9\���T�(ybF/�ݦ�l�SFjnEA��W��[t�ީ".���?�����e.�˜(L�Y�
/c�uT�Ϻ��ō�9�Z=���N(��/���X�TۡDCm5h�'l�O|�N���+�;n������DZk@h�t�-Ӈ����[7���_��mK��nL��*D�#u��E��`
c:�<��bm��n϶�2��a��d�{2:=���z6�x��3C������@
-+;w����w��_�ۿ�~���K��a9N�_�x`/co�4��?��i�YgN�s��y#c��Ӏ��O6#Z����^����℘t�<�Ϛn��e8���?,.�䙞ĥ�y�أ-˰���o�Y�V���a@���p~f�l�8�B	��%_�z�X\+�X�֦i���������3t�9rQ�'$��vNq�v����1N�w�
�#E��5d庭�t���ȷm�+)v��1�����c�"f"�?mY�
-+�O�ˈ�ɀ�ђwl��G�c$��m���Id��v��i�l#�.U�1�y�ey�k^�����>�I��Ss�x/=�1_9��"�~!�`���O)�����tޖ>�ⷬ���ū�z��O�VB��ξ��G����?����a����M|,��V��
-+���z�@q���6��v��-�xK{��`�����K�K.�\��?0m߹|M�Ō�x��{][sH�F�G|��5���8ԥ`��i�(�g�k�T���~�5�R�퉟��Kc��T���~*����)��z���+�u��$�7�
-+�y�'�k+�c1�]��Y�1��=�8>��}�(ϫ������ݴk'���`:Y[~�㐟�`R�F�����9�5��ٜ���J�3OW.h{�
-+���f�������������_��lHٱv%�j9���+r$��#dp��e���yފ�8����JhX
-+׺�ae)XY[j��O:�ս���[Ens$���+Ӵ�,5f;-.{�p�mI�ַ�����K��uܿ__!��Y�:gX����U�v�R��C��\�6u]����$�c�:)�~&e��WH��~`}���@ȍ�]���~ޮ]�.[������56��f;ȓr�	�y�a��^�La���Sѱ�{͑.���3,���)^�L�0J��+�����׼@+�����(€�����r��9��R�T}���{t���xШ�:}��mɩo�~������y@�+s� -�Q*����MMY�C]ݶ���g�h�W5��O�;�_r�t���}!Y߾C���2��9_�j~zN�?�[e���е$
-+S	x�-��h�+m�K�c#�O+Ɵx@��	.=_ց�%{Pq��_j6B�&w�3r�;)�X�ۈ1EY�\����h�A?UT�Z0�Z1�G|�fu���+��:�'J�l]��R���n��=q�B�r��t��;�X�HGcZ�Ikm�&�:�^�Bc�jFZ�yؙ��}.p}w<�3��y������	��be��1j����?p���Ɔ�?���aƮ��e�����T���k���#����A���,&�����E���y����L8>�8���z�^�
-+�T��ߺH'�NwoD��Gڌt"w�Ɇ�
���Jv8��볥w��ll�[����q1Bk!�<7�°p�����w���o�l����mk9R�6~gG�X^V@#F�<b�v�Hl���N2�oo���AE��]�p�&~;����>�꨽_E��n�-+���y�\��U��§���%GG��䒁�g
�IX*�j�w^�����s>f��p��ٵ�$��|p���e��-�K&��������V��`�hx��)�m͈�5��j�o���~�'�+��*�"
-+����J&��u0�BC��������7��T;%5�([׽�I���H�sa���8r^Dl;�ɀ�67�*{�
9%�o�7�H�=t��K�Q�d�� �z,j�
#/�s�Z�!"���Z�.՜�t'�cnaē���aG��O48+&�ó@�@6
���D�;J��9�=�]y�s�s�(�s/:��
���n����9��+.�ǝ��
-+<����Y�|��Ғ�-}op�O�,��
J�r�x�
�{8��F~٤��
��O^�����)}��(�
q5	��d�Ƈč���gST�8��"��3�_�P��ѯCR�љ�#�r�4������|���-5?C��Q����X~|ѡ�V�oϑS_7RK0Ѓ��O�4�O��#*�K���V_2���s۾���7�ᛗ<�ꤷ[��s���'1"���y/�^��?깩E��T��@�k��j�]� ��h���<�zu�qw�rQ��e�y鉞�?�s_�gM6<:
�rKNOD�N
��~�@���	6<��J�1s�1=�ֲ�-;?a��������K��R��$G����N�t�;5�:��;O2�װ�X��_�t,4��^؀��oH��1�O��������s<�!^9K�;O�ߪ/�����>=|xj}nl�^�	��ҡ�����v��W��H�*u̸t��6�U���|����"����-�L����Kt�C�*N��x��7�}f�Ḱa����ָ5r,��L��Z�+k~������\8���0�4�������L�P����n�����zG�Z(��mL����G>����/|�v���W���$�����g���D<���RC��ñ6WM|yR���	NX�=O���IF��'k"��X|b���h��
-+T�LVޗ5Z�#"��7�`��[�s����u����7l_ֿS�Վ&8�ty�u~�ڢ�x���?w����/�� ���)Z_ֻ4;���
��)b���M�Cj���������0��a��D�ڋ��I�J�h>��7�~���U
�$ֲY�Q1%;��2
��N]V��С	���$،�.�gu���x	�ņ�k��H�uD�=�i��'���
#�q_�1'�l*�:]zy�y���7Z��izT��FD��5f1Ч&��?�� ��?�� ��
-+�7�\��ob�uMi�׋+>*�F��ǰ��N�,���{�>�?����9��K3.�4}կ�꯾�u�{����XOp�>n�&���;�����^?�W�x�+�Ϝ:Y
#}#<}*�o��~�-�l�z3�-i�
��ʌ�{���(��G�>	B��1e�ml0�q� O
�0�6��]�&f����D�/�����"`�Kc�#�vW@6�*�X�X���Guv�Ң���R��
4 n��<�2W`#k���]M!��[_Ӊh����Sz��Zt�ԙg>B���*O��J���7���Y}k3��*mr��$C'�s�h��s�nzuw���wc`����s/�sa�����Ae�{���0
N�_�A�00V�Cs#b@���&y�V1��>���hv*hz���bϏ_D0>(ы�jh��O��0��E�v'��^+?�t��1M0�s��8�?Œ�c%�}��>�w�=�L���Q��c�g��׻�]v��.�n+��2���_���?~�>����?���[<Ysk&6�
-+?y|7�?��7�!y�5@�����>�|��ۋ^�����۝z�u�]�%zꖢ	MϢ
�����y�K�ǷS�b����gݬ���s�RH�5v�yn�-�����ƞ����׌%ƅ�|Z�
+j���H/��8��
�<k���E���������~�>�r��:��D���9O��4���Ҵji��N��3��	���>������=�e�/���৛c�1�4�<m����M
Z\���!.�l1�<E�tK^<�Н�u+�NA�ď�/`�E�Ҝ�1���I5ij��n��a�Wnъj*�iCtb;F��'��zE�Bɒ�kb����
�ly5���|�q`@S?���+暋G�H̃J��^C�4�v�
�.�B��_X]/q�W.���D���<P�Bfݮ80=�����ɿ�#~Gom�	���.�~�g���~��ۧ>�1�L�V�V��9y� }b�o��L�C����ߵ����_^����5���<�u�$�=��OLؘ=}���'�Ԙ쬾�+����Ժ�O��&��o���j���W�a:�H'+�^xN��k�x��'6���U&믺��j�OĔ܂C�1Vs����g�����]֕�d��7x���.��
�'N(4*fCz��?..^0����o=d4����-���v+(�����4}Q�~����~�Mo�0s!��Z��ڊ��x��'���x{��J��7��{S��&�9?�<%�ěU����'��d�W̰[����!��fY�>7���}�hq�^�+k�%�.����vOho(����S���uEj?s��
t�@>Y�D�<UO�;�Y��\'�4���FcG>ќ���Џ#p�f�����vϛMe�A���j�^��^�:C+����[�cs�n�A���ʧ�f����^k��m��V.���щ$�`R#D���v�}n�g�˔
-+o?�1Rc}�����9el�
A���£s�]1%��t��k�=j�H����Ms��F�AuS��lj�5Su�u�;�j� ����e��Mjhb��G�ځ�lj�>�`ւ�
8���p�&�8tw���:_�X^���n�}'���~;�ɦ/qr5ɾh�h�=�=��,��	������c��z�w�_t�w\��w+��Ó*�T}V��M0�7����o��ߍnb��mG:x�j���郾 W�ڏ��On��~�bimJҦ�U�M�{^R���jb��+��Z+�����O�'��E�M�����	l��Ѻ�H��e���g���1Az��zY%/^�A�#:�bU��_7a���ܩ�Z�}��:��4�0��/�Q+-��8&��W{E��_���]j�q�.�α���7F껊bn��9i�є�/�x��SH��<���4}�W���G���߽������~�_:'~��F{ɿ:��������j8�`׈��ϥ�^��஻�o�^���ߞ��g��.����f����'�naƶ,�3$KZ,��k��zoF�:L�ĩ��G��Z��|�qV��]ylmi�����!F���H��M��yHo}�.,�'PW_}�����]!(���O~��O+1q�e�Ƀ1��l�n���_�����d=�[@ɦks���@��L��95��}\����/�g���W¸X���#+j;���1�XP�{`�YO�L8��utwb��j4�z8�c�-}r�%]��`-�]C(��Һ�;�\3�c'�}h�>996���<�"���e;��������^��ãO(�Z��5���t�W��,1G��1
x�,{����?�����
-++��U���_�6��hk�D�I��*Z��`�#�d��!�+��c.��,��ހ,�{2]�!'��є��x`���ػ�y�+�*V�5
�/��A%kd�뜒_���M�����4��;��Xbض����F?����3��,Jɬ�,Ɓ�%E��f�u���8B}�h}���°o��x�:����(�D�������?�/���?�=�����*�W���t��1������E��(�?աo}vQ�'_�v%~�\���,
���0�,��C�g�×m:���Q �����Gs��Xi�ˏ������[�����r�6�L������%���8���o+��w�k��׾o�W�z�
}ۺ
:W�����	J�د���Se����\sm�ZLa3w3穇��r�����l�������0f��=���
�F��;\�u�w'������+=r��
-+����//�`3?�<�}Hb�;W�[7֎�ZTc+j�"g��N$bh������Q��=*���O;U۵W(`�X�˻t��2�G��ž�=���c皞�}�xnD3����{+ҟ�������;�>o���'���x��Քݏ�z\�ӣ>K6���|�D��&�]�'�5��CC�0~��������_���M�����qMy�B����I-Z�D�xT�u�>Z��ԅ
F<h�3Z�+��e��w����Wۏ��Om7>�Y^+���)e��|+6tt��6�I�b��Na5�D-w�ax���<�κA��NeT�e��&�sFR_��P�Z
�c��&�bת=.����:_ ,\PϺ��z]���t�����G$���ڐ���T��� onI�#���B��Œ����l98������
-+2<�0��Y��\}�7��ZM��ț��X������	3��K.�t�џ���>m���1?�=?��G��G�������sk���z
�߅�����a��|'
ұb�9�����e��oz!~V���-Sn+��Ѕ'��WB���Xq%[�ɞ��	B�z��8���'b���������[i��M	(rB�� �JH�6�ĉ�Q����bT���ڹ��򖷃+�%U��C�����[-c���G1K�2�t��K��e?�3�Loi�3��[Rvkϒ\�G�fa��
�ײG��&>�@�h����p#�_�G�RuƉǥw�5�+u���܁2�<A���Ѡ�����w߈�莓�Z�,
-+����`<��/��˟^?��7��Uyl<u�'$�
[		�:����E}�Ӫ#��w����
-+n<�S�����
-+��\�o�T_��Ο��}\��z�V����8��3zv��	߭K{�*��
7ޤ��߳�v�s�M���?��1�;ٺO��
CTaR.���yd����:>�x��H�!jXu���^U��[1D�����G���!�Vrz�X{�t�0������ȸ8��:��1Jg�N|���o�Ao5��R)ѹ>�_y�9����'��r�H��,�V�+���]�w �]+I��8���>@����E��.�n��nؙʼn���?�$D����1x{������e�ԕ7�!W��n�y8�/%��ñ�x���G]c�0k�@��b�x���Ҭȡ����ӌ��Z+�ֱ9u΢�k�gOO||�K_z��~W�� ��z�R9�������9?����¹�nx�q�v
�PgSG4�+��c�X��ߑ��ڬ�U�lo��3�
-+_7�����)A�[o�0X+v��w����T[�f�ť����ޮ')�H����P��
��NXj���Eo��(=��w�4p���`��5��J� �h�;l_T�!�=g��-W��dMc��s�5� �x�.��ox	�\H����T�Z�����"��[bV7��юp�!o�Z����/5���7&3��5>�n9��1���+���W[�:�V���Q{\��m�K�j�>8�o��T��D40����f�dJ���vt�L�[�`�
^tR�qS��~�|v(��P���{7��vf���,̒�8�R!�4��+o<����#��q� ��>�UG��j@?떛�w��mfuέ1k�<1v̠]y�L��������B���vL���IM6
�8Q�
��zcsN�F�D|��Guo�9F�^ռq,	*+��_q����5#V�qF	�+�ΞB#�i������z��#�@�5!���rN������}
-+��Guj2^��C����?&)���q����w��~]���t�O�+�Ӎ�������Q�ˤ�2
-+��R,cWm�#i8:��&'+�"I]�E�vD����W���I�~�Ն~�
kb0�h#Pn��>0�gC���P��Տ/R�c�Mos���������a�{vj{ϑ���+�0I�
���x���~-�w��?m���=��h�@���!�Z�7�U���;�۟�[�i�*���6�e�m��S��A�9��:�.V��2��с�e?�>SH�|b!v0"�ո����!]0l���1l�52���y�\}��C>�|�^�~p��
��M9�>`a$-��J�r�2�W���
Ƕp��̻��1Yx��"V�C�� PԈ/��V�6�8�a�^'�4|q�r����������A}��@Y������Y$�&�p��rҜ��F�n��ڟ�ϱW���x����e۵��ˏ�Z��|̟������[����SkK?q4�LPu��=��YkI��<'�K<6m�
6~W<k��V1����O㘵�B�{{��n}�L������5��^��ySg��Zc(y�A�߁�z^�����)�� ���)��+1Vf��8�D���_<�����'P�'N�/"C�L��pTU%ܸrI�x͑ |.Q�ǀ+	ƗU�����lS;��+s4=1���,
-+}��e
-+�k�k E�(o��B|r
�_��d�G�/._Z��	��:Y�E��H�e�ݶݧϨ~��_�'FRCSM��:>я�y:+�!^�mǑ�	�We�7�x��Q(
�^��"@�'L����`�F��1�/a�X+�(<>�r�1���л�mW�_)���f�.5��b�p�(�e��y�M=YY�t-&I�����^�̏~��j�ӄ��=���b��9
-+3�4��Xymp��_��lk�ZOZ�^�H�[����&��+��Y�j��!�
��!������5űK�y\z�3��	���,9�௫S�����[O���"�{?C�s�8��m��_r���O�l{ۻ�<�A
.�t�:"n0Kӯv��!��Q(=:t�@<��;~�3���XO�o������AR34h{��B��ꜷi*��ꢽ���؃�<#��NA76�+�u(�2+����v^c���NNs<��Ǐ��bb��b��|L���W�I˜3�u��ǹ�W?�K��Y�ys���&���~�_�J>]�~"d��sඉ/�U$���Z��,ݵ�W�~{���[��x�����w|Ҵ;[��\���k��+�)/�'H]s��'��qT�]�
:�	��oUP�e�z&�E�{���׬�Yc��Қ��c�.�J�)H�����q_��Ehd�Pqx��Rx���=�G�4\e�H����{��7��g������<W����Η+��G�4h�Gh��c�\�r��΋2؃B��i������VA=�3ԁ[��Vg���X�s	e�,�i�z�4
���.X^�4����x"�	�[�:^�Z�v3
�u.̒�_�Z�hӮ��g���;�K��K��8�9l�5:�~͈;?��On����~��!*bHu�J����5?�.(˱�4�v(��i::@j��zG����u�Ǘ꡷[�V���d�a���>^��9�<����<P��ćvbI�Q�޶���U����6ˇS����W��7��?���zA��_�����۸^>�˄�P����
-+�=�����O^]Þ �rT	"�co��]U�P�?`5!㚱�jO��y9ؽ+�h�=X��%Ҹ��O��]�vJ��[P@Tc�@�A+N�*i�4�n͝�%�i�5#��\��d��k�]��ß�b ��
9//A�P
��B�^��4Z�r��煓�
�g �
��	����#>�5�ܸ�ĩ�h	�x��+����F�k1"�e��;,�/�k�zڭY[Q0����'���!�v/#����o��M�B��}��	�g?���?���[�cw��}�kO�]j�����"�o}sjA�'
-+�����&v�d#޺��f�u��?�zk��V
����
T�����<�4�׽���N
A ��ol��H&�����8�W��#٣��Mr/Uk,o�����?}���?�#�8������o?���-}8����NDzNf�h�&`5��T3P��O�)����	:n�}�H���;�A��3$C�4�0�j�Bue؞{"k�ܤ��A�����X�Ob��3�ˠ�`�������	��G18�y�
-+�@3�
����:L,���x�1������~&�U�
��15V�Z�`��sg��=�S3�	X_�;Koѵ�x�e0�F��H��X}uۣw}��<g�s��y��h g��^�B��ܖ��v򏋡�?��_��_�I��(Q/M�v�U�أW�#]�#�H�%�+F�4��m��+���ٙ�`΂
��L?}b
O*j�G�!��1?�/Y���'^����4wT����SݝCF�����On��,	�r�
/+��_j��q�<u왠����/=���1}h�j_�[���W��7�G:�+��,��fl�(�ɡ�G�:�S��^�Plq��D|��T��0m�z�H�^�Kd����i=Ԋ}�Ƅ-�Ǧ��Ë󖶼�yHL.���3X.�Н�1��C������[��	5�Vs�k	�i\�
f�dBtt]l7ٴ-�=�$���=��+�;o�7Q$,�����#�J����j?G�R�R��?j�~�ܻ�	���	����@"sI�[�z3<+y.�17k��7�0�g�la�0"\�p���9I:����{.~}R�V�i�>���lx>K�M�ŋ큑�����V.V%+̔���w���7Ĩe�6s‚�"���;lC�+P7<��\LJ�JL�St�����������=�QQ��]l��x�=��47���:��l�z����
^�1��.s��ĸ.��]�����=�:OWN/k������g��?�G�_���jl�F��-$+9xD�
��?�g�Ė#
�f������Z#�܋ϟ��o�}�a���y7`�|?{A ���Q�/pʣnQ{d� {n�:�AM��K�Q�Ѓ��Z��9N7�v��p�5�7�(��ʜ�J�^
-+R���Y|:R2�{�����;N/���(��B����ko|�S}Չ�#H���
vt}�)��1vS���q�eڜحa1������{'h����&�<�}�r�E�9]ي����e�4���S���R���`�G��d�0,�CiGު�i��FP������q�ď?������ Y��������1�y?,7�?
-+�o�Z�!���P%�yx<��c��˰N���@�D��j~�;�^�^�^u�<�>;q��tɿpܯ!�/��w߭[�������7���L�lao�&w�D��o����
��1���ާ}�o��o=���M�Nf+j�U�~ۻ��Ff/���o����~^S��j��mu\ͼe!s-���x����r��E�7X���Mk.��!0���[m˯hC��u�sх�ؖu��M�����D��	N�dS3���;fm#Gh`ќ6�ڌȾ61�
�n������i�	<�'���$y������7Y�9�+���t1!�z`�}ft��I�P���`j�9G����C]�3��iA6�h�8��%O����0m�z���?���9�q��i�0<{#<L�.�|b?��񹈎�i�[VMau���0c46�
�8�C�����@� ��
?�ʗf�
�k�|��ػ���r��T�6��~��['��B�����7Ey�>+�l�}�Gp�o�:��їB�
J�d��b��9����.M�I�3�vw��cQ�BƁ}!����Goy�o��׏�i�L;������N������t�8�.SUrA���\�'8�[@nWPt�1|*���r��5����ٟ?���&):�%�D�ƿ-�
"c�����c���%�
��3�/c�O�~WL�^��G"�R7��;b���/�
������s���Q���yW:��L;���u��#�3g1H����8��8��䟚��8h!1^�YvTT�@#%r@RT{(�(
�}�}Ӯ��=��w���N?���A?$�
��4l"L�ڸ�/�|��_=��/}��B���.%0�m�<��0f/@���}QUP'���"w"�X�P�/!���^�7�+MXi޲~�1�η�|+�4��ܘc��w�KҞ��O֣7`��K�ep�х��R���bsE
f��z��$�j���1�h�Yٔ����\��}'
��?��͈O:k�?e\|l������~���:��{�7���(��p�Mfl�Z���qL%>��9Gb�Ղ�~ܘK_5j�	�l�8�O�<�S���
���i���g{𥁒K�Z�B�k%�1P^a�u�3�����:�H+��=�|�#��=}JsBM�_�f�oD��7���z�y׻��=�u�����h���#q�C�H�[���+�
-+K��-?�O��Y.���ȴQ,7���,��HIH����[����Q�E#q�N-'�>���t9
ct�:>
��-�:��$��������zx��KVXN������|W8�����|���ut�
����E�?[s��1d��նu���z�X�{�7'X|�D�����N�G`�M��?2��D���R����x�ձ��zij�����7`���k�f�:q'>��?��~:Ϗ�$'cT�S���#z���I��!O���"����B�3�G������
^�7`[�t�w��
�6��<�q�
�{����}�ߜ������*x�F|���:@��S�><� �jկ#���?��O�\T�# �w�b�jD4I��M�:���x|Ъ�}	VƄ=�Z0!J1�Uŀdg���s���e�3t]�b�Ŷ���W�#�>���	�?>��tXz/Ab��?�1��u��ƞ?����4f�Q@TQ�c��'��1���	�z3|�op�����P�9_.D��dx�E�_��v(��
�xR\�Xj�
��U��sϝ��o�Ԟy�%�*�؇��^JqN�۽Z��6+��4a��^�`�m:7 kDȥ����Gh�w��X�^G7dÓ�\d�}�O��5ʝw���y�;���Z��Y�����8��o�
-+W�g��'��	�I���`������}�1��O�q�vԦ���؏Y�<0D$��z"��µk�.k ��K0����{�&>ڬu�$���4���?�H��R\D��`c�#*Iۇ>��DT<c�w�ه+����=�F�T�8܌�щ�!ŗ�zy���Tx�[����8~Z��������>�6.��O�<��o�J8�����Y���s��W�F�9j��s��a������7ya�4�K�-�3<+M|�7(cd�������ۚ�w�#~��}0���v	2�
U�_���I�
-+'+a�d	u��/�6h���_�#ݦ+OM�v�\֯'o��8��իW����g?�٫��`��X�K����RZ���b�7��
Yލ����~��7R��&v'5��/'b����Q�\kd�����/�D���v��.���bN,h-dB�*��z����X99h����;��l���	��q3
 �54�D��%"�W�κ�7�G���I�\7
ƆM��s�i�ٜ��x�\��c��8H�N��Y�
g��4fIl��l+�5� .��kѐ&>�j���FUS��l�а�B�+i���ٱl�Mޯ.� -7q����Ot>�[����A.=�(���u�N\,������ 8Ko�*�9\@����'h|eR#�s�;�Xg����],v��r��P�'�Y��[IG�H�7�������V�	>�M�ۥ�.�5�]�7ZW�5�rz+y��ߵ�8��=�CҲ{]8^�Ck��ă�4�;�q��_���������?G�O��6������!�u��X>��F�1O+A�r��~��1�����<����.�b����`fV�8�]��!���wp����?��<��'��d��|F��=cH=�y�ɑl��'���Y'`�	���5��W�!�4He�ޡ�/���FM��q�mA��R��_���m�����9��p����l��=ut��$���3�Қ��t��5�D���?�zO-Gf�[��J��mDդ��`��ڂ:xB#�^�+�ic�:�#���r<�/�PS�������[���b\�<�-2�P�y/.�|�Z0Ƥ�+>��[��:�5��2~4�8]��,Cx�vd>Z+���6b
��A**���&����ʛ�3u�a���}	j49��Vo�0[�}
v����`|�-[�kl1O�<��s��+����{�/��v�Ղv7s3#�3Ͽ�w�?û��[4.�>���&��uە�^Z��^�>�o׻�����_��k������Q�k2�����-%�Ii.����!q�מkd	v����Inp�h�<�H.0CC���)�]���o�D�]ض�@�5l��b�#HGEd�m����!��f���b�_�<
-+��46�s��#=��q��\�#��?���&�pں�#2žh�nlɇ��~�+�Zk�SS􎯡cn���A�C�eC������!���|���{�+p��8O.�
-+MT��,kG$fQ����ﹻM��R��̡j�F�m��ŹV��
-+����-%�Ԇ������׉x ��G�lS9w���c�ه4�	|��d���
?��Jj�x%�
a}[�uǾ����!��φP��mT�a��Z���A����C�V���_0��^��
�Nq�b�b��������`+�,�M��\{��m�����9蹯�׿��??|���?׻������Q�+�-����u���ِq������8��֗�=�O��v]�2���O�Ml���6�ݑ���A��;���p��E+
b�J��Ɨ�Z��L�`�W/A�e�5a����!����E��V������� �v�ƪ�����`P:��{;-������`0f���h#��Z�M{��ϑuAq�dw�o���C9���#�tu����&񋓼�W�F�9Ј~�)�<���7��/�S���OJj������	+"U1cSO�uC܎�?���z�e��%�����(
�K�.KV�4e����;��6�A��P����=�w�G,^v���4p�� 8��\�ͦV�z6�!�S�B��L|������[�c��?<���7��j�l���x'���d@����x�8�Q?c�C.tn�@d�ƒ�:[�v�kL2�p*F��:����"�?{���j�N��^�
-+5e�*ܝ�� z��;*�g�Hu�s�Կ����kȿ�L���#yL����[�	�/5'	�R�M�K��%m1��6n�+�'��Ơ��G�BFu��tG��uݑ?����p��f�+Uc���@�Úv��ޮ���9k[o;ԟְ�6��],?пּz۵��Ejuę|���I<� ǜ�>�"��Q4�,Ld�,^��Am6pC>x�
�^��=Mf���'����42�`�.�͖������=
�)������"�C�fkS����}���/��}���죀cS���{��l	����A��ڀ1s�t�����n�����:ڳ^D��	b�]�&�÷��^��w~��=�=�<m`�
-+�Xwg|ȜE��mr攵�ڢ�3��2{��G�����x��y=�ű� \�j�f�U3�r�^搭��U���)��;��Öc�s��Z�f?�;���us&�+o�(�&�ڤ�g^�'���i��7��\�e^ˇ�	~i�_�C{�{��AU�'+�o�)��Ѓ��޻1��@$KZ0<������O�[1�\�M���qﾞ������^�vzⓟԿ��Y[�ct��nʻm����(y�5��3'�)�d^=
-+�](n�6�~*���xlLu�2P�1V�h��9e��X�^�5OG�iۛ��N�%T���}��(����>�ˣfr.1m-����G��U?j�?;�'�7~� �36��)x�-��"~ќ/	:~��7��q�����[.�Phh�����#�>�+���"3O0���|�W\�,J|FT;�_%νIǾ5(m;�/�B�Dkt����y}�$w
�)IJ:{�|j�	8�λ%ڷ�+����t�`7�}������!�����g�������%�س�sU>�7��[�m�C��9pڡ���1r��C�r%al0����mMC��84U�Xw;yK�_�=�!M�P{|B�&-|G��c�7(>����K�+逡 2�B��8��y�WR�Y8�]�W5d{�.ޠ��ο��qoʚ#n��*{$XEl���;�FG���rD���e�$T��\T���TX�R #�0
-+gQ��G
-+
�&7F!Zs�
�"fs�d�,�*�Y�][fX |�H�z8�����8�ٓ,H,h�L�]?���e8����+�{VсPM[N��ſ:������µ�i�'��m4�1�r3��[�JV���Ϝ��ԧ�7�y�.s)���,�]*Rߡ,�����4RT�ɧj�-P�
6�/j�/
2P�B/cggt(
t��F�����1�d�m
���+��3�ࡃy���J��#�4~|���ykSʏ�.�:�����6�1e��b�F1*�@�}�����v�.���+^����"�y�s��.��9��~��8��or��Y�����H��{`�6�� �r�;G�"�]��G;|	�!Z�����o������s�=rE'�w.ƃɉGM��Oq<ư@t���%��~)k�
�sG�f�Yc&��CN6���okb���:���6�Ј����C�- Yۇ���Vt�ep�S�K9����ʜv�.�G��-`��;���G�E�^�X�|��Ī��Y�X˗A`�$"��%�}�C,����d�m���������~s�V��~]�������M�KX�XQ�y]�]얶[7_Ԕ�Q~�~R5v��Ǹ�ӿ��l�
��:�v�8~�?)������+�U�r
t��[?�\W��ɑ�K!��z��f���F6��u�a�I�W�ذ�S�1#�+�p��F�۠�s�^����\S\l透��#��eD����9v�
9�D\�b�܀)/d0=�skַ�}�O���ܐ3|	>��N�7��8V�f��ʵ�W��������Y�9+q����Y+
-+*�:�rff�3f+&����+��l���n�ZXҷ͎��qb�$@<����o�a�y�6�$b���n�u�gǁZ��
�>�%�����O����N�#s��Fc�����r���P
�N9P�m�A������C�4&�
���ٱ���S�T����Vp'.:�8Ť�y!��D���Xj��M5,���g�KD�}��v)=�/����A18�v���[�~��������o}+�lЬÏ�6�V�C�l
�hW�u��1����W��>��O�����|r���6q��\&9�"�ز0B�O�m
y�����������Va]ɬ��?�[��wl3��c��ǒ�ķ��੘���OHM#7�}@Y�4tM�0E�1�yR?�"+��Ah{�(͜�	�r��QH'��D?�Ҽ�Ƚ��-}��+�|���?����uym��>���'~�O��q���a_�
F�?�RM�:%������O^'�M'��ޫ��μO,:ʁ�8�^�h=�Al|�¦\�=��K��3������j�(Tʹ;_�X�7�Y�׷�0�®a��Nr��<d�1o�
l�;1���-r�b@n���l�kn ��7v�:fᚻ�ز:,�Ԁfyk[b��紮G>����Hl��dj�q�o�ֽr��SO�^z��[�?��G�{S
F��EY
��������n�0�����܌�+����y
��:Ds���X
'�G���Z��2���UF=8��/��0F^=>�E� {�%���X�B������vb��y�O�����]
-+��5��/
����(3���㣆��\9B��L`��rk�(Zr����"�o,��f��E9�͐���>��64�{j�S:���+��)xp���`<l�m���0x(�xKr��I�*�R�~ `�s8����f�8��rOH����R��0�<6�pp[�C���R�=6��#��*sYۇK�M��*��X�>�{;+GJpBZ�܂I�/U~�����q��wi������
Nl�0I\�=Xj�*���<d��\Z�
�A�R�c@8�4�pT��Cl��ѓ�"��s���_�ׯ]����9	3�M~ꊟx��k~�i���u�s����Õ{�7OT�Ѷ/n��u�K?~Gf�����0�b#�oND���Vk�ᷨm�b��#a�x��5�hHp�`I�QӴ�<t� ��crP��d쬓��){,�-����YT�d����:���ӽz���=^����{��O�?�����M�!<��֯9��7�1i���8}R��|�+y�;g	�z�׿�0�nhj���jg �'����$�����sm/	gU��Au�2����T$��_�sy��
̚X��CT�cs���nd1�w�R�c:�����q3�r&���+���f`@�=����c�lt��q~5l.��t3}�$��O�%��"��|Į�x�qh��10ɮ�ۨ�@�
UlQ!bI��Ҭ�C+�Ǝ�v,5��ն@�`i{�`?��5�?X��rLޛ�i�/*�cq;o��L��M�U�v�Z����XFF�4��j����N��c`�9}�� �w�c�F�xjڜ��+�crdM��חڪ3.}z<N>���`��|�\��>��<H�>TQ��y�� �*�����d��@��N<
���g��O�T��}l^��_��t�q�O����[ޠ��W�����G��~�Y��2��p:��3�A;?�V��[�����O�~�A1��\C���G,� %�~3ܑ9�y$��1�ɷ�b�ƿ9J���L��=
-+���'*���eP�R��E,2�o��=�t[��%ʬS�Y����+���{�{���S���"�Ο]���)�������O�|�;�C�y�����3�H�G�'���d��AΛ�}"�CG�0?=E�� ��ȸ��CW9�IՄ9��3�1�65�����*�F���{�O��
����7L�g:�,�b]����@�	;>��	��.�
Sij��c��hk����Y�b���t�C�9���?�Fb��g���'u���<���bބ!|��"zV�`���QL[�
�a��v��(pLNܚX�;g��m��!��c��:gI�0�JP���Fě��|י��|��J������=H2���Ш`���N��Ǘ�X�;�C�Fx���@G؎_���?�&���O�:����أ�M{��Q�F4�_�zsow��5�'�+	�ÿ%ʭ�+;�"V$0�0���K	��S��:�8��� &V��#yCo]P��3�j����f���95!�p`���Qߨ�9�S�@�eA�������P��H-�\�D��K!�E��D�|Ǐ����395�Ql���e�D��ݩ�f��CX��a�q�?4�K�vk�c;N��Old��w������;!���r$�xJ���ɿ;}��x޵"��gd\
����){���g��X�~�y��GO�����}o��#�qS3=a��Cj6��\r�.�}���.,��v<p�;��&�۰	2�\�+�x�x2Ň���w�������s�,K:�%[�f�7���%m���cp��t�)�L;����t:Iӆa
-+-�Z�e�e2i��Ml˖ddI�u���~���>�9��tXϳ�k������������%���c�DJ��K�`+�?�<�G�=N��s��z�+f�o|n�ۡE��Uv�TL�jy}�z��w��<��|�=2�3æ��8��2^h��>��(��`0̴ؠ�뚫N��_�$[�.��%4���1F{�î�iG'N��&���(��c����g��g]�x��;f�~g�:�G�U�w���Q��K�
-+c<��
���Y�`���x��#�Q9�Ԋ����@��]�Am�%��	��
x�����a�qI���B����#���������.��^|�E»,;��Dy)v��Jﯨ�M�z��ɟ�I}�[�c�t���D��ە�n[�Qi�����&���Qo��(�]oኑ�P(=!��\�`�H�Q�Y�ر��n�e���F�M����W�.���%fx�r�\t&Z5W>ͯ>����|�K�/�
-+Uo-hx6>N|8�~.�y(`v0ť�l�gY	1���O]�G��᫙{7#�����9�Q�|P�}G9�C�=${a|p�8@�"A���c��G��c{	��C���m
�0�Gi�l�R{��^�&���o�g
-+�z�gr�aL��*�y�-�F`�g[!\%q���Bt{�$!\�<�}-�p���bY�m�u[��ئP票ݦ�:&���@��� �0r����ӓ���Py!�Z1���_~�����Ϝ��_��ӛol�'I���56��H��{���99�1��U����'
-+?��O��������B<v�6��5��>c��[���Nr,�isa�-{J���l����^1�fbk?��+;C<�L�RB�\��<4Կp��Ȟ��v[�� F�U�<�]?�,= ���؊OP�,ck3Y;�m�ZZzړ} ^dB����a��)�e߿��=��f���^j%3#�>|�؊ra
��v�
�I�E�.2mğ|�ӎ�l
�g	Z��:,�6���/�
+4�{� e�q؈���ұ������qi��rE���a<(��M��k+5�4U�Y~�reA�A�1"X(5]�U�p���N�C�xT3�x��8r
�dƎ�#���
��7CLj{��y(�|>""9y�;�5
~63Z�~=�V"�b�d=����G�b��1hh�Tm�hr���nx�r"9g�_�H��g�N��t����9�I ��g��O��S ���1��7�q6ʂ�v�x/����>�KC_�>
yęP�e��y��'	�]8y���V|�C���9?V־J�}������q������gq��`S{�aBqC���ā����?�-S�7���h�7cc�R|�C����7��[��
-+	�U��[��}����p���+e����F\������&���_�����<d;�Br��2��yK<w�B:_�wg�A�d��Jۇ��<�6qȢ�Q��%ț���N�j��ײϋ��+��h�6������?�z��9�лBQ���m�� �W�����n}�w�\��H���*o�����p����z[�0oܼa��Df]��zQŲf
�rD��Z��S<�=�p��d�
�2�J#$'ov"x'�Rb�S���s����.���qZ�D1AX�.����~}���;F~b�v�F�6S'G;f�
��n٨Zb�YPޙ�>i+�+�c����C(��ȍ�^��q�c�X�X�?�ݚI�q�e���M�S7���3�FO�ɬn��<��������� A`V��>$i�T9���ܝ�1�q������'N?�C?4�p�\�H/��$��y�!yV>����J��$~6�:�|$��n�
��ݠl��	�����{� ��7����v��{���x4n;����
;�䑲=7�8i�A�9)�ٛ����{����)�3
;�7ikU8N鯺$��?Ԥ�DH�f])�_D�-W������3�Sq��Y�蠛j��T��̲�']�����	��}�3�;"k_��
���ta�+�"�G��Ͱx�-ʑ�<̼5Kx?j���G�d���^	�c�z�v�ጏ�q�({��d��[���Kl��kzԉΤ���
-+�ˑٜ���ql��N�뢿�R��X���R[#��1~��Λ�K�n���g��p\�;�m^1S������]�"�hj?x��Y���>
�,nGF����L�<���K��Ŏc}��g��;z��*{*�z�^��:���&<���xw�x།�Q��pA�kN��Hn�|А���������\XΙa<Q�Ck-ġ(�z�0k�q;԰0��b*��&!�4k6���#��x|i�G�t�-�s�
��$�ο�`��K��Z�K~���+�l5��c�NDD���A$=q�(��A)�+J̇x^>_0&�����:y�QO������A^9
 V�p
��9���G�(�jgظ`�5�V
Q�T�'���9s�����vP���l��%9>_�Wn/�f�_<��d��O���*�Mj��/R�'+��7��8���M|�<y<:Α�4z��$|�D�&/��
a�!��ن4��^�ł=`���='V����|RS�eis��
^U�p'����N�w)�~|+�q!��lD�lw�0l�hȏT��`#w,�dGt���|p�?��NƼ�c�Ck�
.�-m�j��h �2yW0�#���`�;y�P� H�O���Kq
1cc�OR�]�:_g���Z�!|칀K&я����c��S�%㒓?~��WV�]�g����^��1`Q2/�|��J��u6G�w6m����up�c9�����
M��sѫ����x�o�
�T�!Ų��D:=\��T�0v4U�h䦼�`�h�kы��7?\ʼ�����u��%z\4�����N?�K��o$��ΏΗK���?��v���}�G�9&��9�
�X�P����<�?Ɗy��
QV���}�&��CcQ�#=й1���kru PZ���VTv0=��Fi�K
n.;o���5�-�U�X�c�58c���	4c�?��r3X�4�.mQ�n1�� f
-+2���LZ����U�_ͪZN�e�C��w�e<#�}�?��O���)�4������D+�~�?=ٷ�d�A\0�e�k���σ^;=~���=7����R����s�|�)����w+8q�zO��0
-+�I�:�2P�����u��#LWv,�&_f�<�rV�D�I���v�0�4Z/��+�j�_%��K��e��݅�m���_n������۷Ŏ�նC}N.��lV���W��
>��� kIڳ�E���$HwG`���}�h���㬷d���2�#-��bG��#��T#������P$���ʁ�Ġ{��2`��c72F���L��<��w|����c޻�C4\ψc	�ql�j���գ��C�ڳV���^G7qF��R�����G�sj4�b$����7��
-+T蛽�G���
�t̬��,��+�W��a����;��s�~0�U�hݍ�����o���n�����o��?_�w���s�}��FD���3�K~�9�"�lz���!s�7l�E�+~kJ׿�/�Ջ��5��6��U�Sv���Gl
�z_/�Q��������~����$Q����w�;�����=�`�.�����|���뮹�%�
qH
-+��9���"�:㊎KW�:{�Z�~Mq��g����)[[��K��y�S�8f&��~�'��A�v˥�s�+�j��1��u�c����h5�*���|�?�ʒ#�i|��,	�(cat��	�pT�9�r���#4R�j�?L3���#>p��C������.���g���_�ݿ�+E��G`��=�{�?�������~�h�#ra^�@�Gr��x�@~�('�lP�6P	��
-+^��muկ�9٣ey�uc�����후,#��|� G�b����tԥ�gr��؈tQ�Ei���/Cum��-�h�e�'��GxW{��{��c0(���vJ=��ca�퀍�����n_QY�=j���F�i6�C*���eW��'t�}���>oWmYZ���/o������jXH�Z�������N��[��3+I����[k�)?Ya����[[w��c?�c|�i��F�%��.qm�k���+��X?��{�;�p'��ƺI+>I��w}S�ցްw|�6#:pT*0[����"���nc�?�!��9h���յ:�ꞻ%��"�&�fLL<�o��F+��BVG�!��X���[�����FVu�Mu��/&J�%y���i���)�Gs(��M����>��y��i�9푶V�À�;H�02�+�
-�,0[�
-+S�+g��!�
�c�¶8�E[�������;h�<�w����r<�"O�WkP�KX�)�䈋�@q�+���dPR9,��#��0/m�����Ѹ���j�՞\t��p{�x+5:��D�N�5��6(���@;��5�6�6�*��=��Λ����}q��a�b;������.0��������o>pz�Aru��x[_%���nmȵ�s�6r��˽���}��5(���!�_�_�+�w����3O�`���Ա�QD���_I���e�b��z��4#x�Q��c�?>��E��4-�x*���O+©9�<��g�t�2�2籬�Զ={��>>���(�3V��ߘHM�����s^�xX#o�h�V�����
-+��W!ejb��t�h0���==��������}J�?93�JL�)5��yx�ij��3ǢH�����_��;1�T{Y�\fa:&D.~���|e���xR�,^��H�+Y�����Ib�hN���G#~�V�=N��v�55�����l:؋��y���p
\����e�=�'(�@G|0�V}�=	�x�-0�u��n��h�䠮'��=
-+���Q���ݫ��BiM��RB]���|�K_�0nr��f-'�{��N1L�����z�G��pA��0���@�>���3o����~[�@rF]E�rnt{�l�
1�58q�?���yM����Lk���/���������%=0�r4�ιg��4Bi}�6�8`��|��7>��N���.�p��n�6�o�u
�L�x�]�x��K�[)Z�pb	\2V�P9N4�-�=�Ae6�����%12fN��_���R�� 0��ν�(-HL����!j܀?2��΅*|h��\PR��-����tV�)ַK�C�u>�P��f������?�S+���V�F�Y�&꩑���'���l�$qPt\�����o�Z:⯔Q���q��}�V���xdNѮ^�K�"^"��;�}>A͗��J~P O.m���[#��1��7�y���]�����e����6�����&�E|
�>%�fGb����v��^L$,��:�3����t2�����p��R=<�`d���@M>
7׾]}J��bG>�F�����4���Y{H��Ek�:�-}9#_��w�`21{?��͚�6�^�h�\$�\+خ}C��D�SJbH��׈˷�p��C��F�ǃ�|���ExcQ���#���.���Tg�O�G����R�l�_i��!G�|�]��0x�'"6h����h�.��Q��X�[��U�e�+>1~V�����R�9�\�'��7r�&�أ����8V���/}ˍK�[��T��������U�s��|���9ڝ�ʶF�{�������+�-�)�S4jJ�f�:�÷����W��H��G�{�����}��\�xN,�񞦱I��T.�@Z�c�ȁƈs���ɱ��4����K�xG+�������R�����`!>ۚ�%�4V(�K̹T�\��wțS`�jL�
�e���v�(�[x�,�U�(B�\/�؅��s�-�uo{�����|nG�)tl	��>d��?���������\D�c��;㟑��1��jo��L��E���$O���?�V{'�r"}�8���B��$�=֚�I+�Z�P��!��•�̅؆��*��Σ�>����9z��W[�r,$@Fx����'?����tܚ���.�3L+� �sD�E��У��R�y�0�0�m*�^���F�0���ѵ�C��\
�v�}�ۡ�XA���{?�Uo�E��h8O���g�3+�_~����cD�ӢY��y-@�������wWF'h9&~f�Ĭ�4G���\?�������qC�d����|sޤ�pG�\#e�}�T<�j�
nJ,�=�9�#�*�<,�$�#���O��r��Б������0W#��$O�8&y�ڜ;�������ɑ~�朦�|���=,c�ҩ�GM�E���!���{�
-+�2�OĆx@`%oJ�S|u�m�>/���.�x�j���j�e|@��)��?xf�^՗+|�G�}��2'yHl��/U��+{	��X�A�i�X��-3%��$�v]�<����e�C<��b�q��‘{��lܤwt��]c�oS�����R#�=���x߁߅���
��df���w��>��ӝd0��'ٮpٮ\�bT�۝��yIWNj��9���&�E��"�d��D�A��0?ѥj�Řz[�,fD)�V����K�� K;��O��P���
]���)m�0kvE��#�0=y!]�8ۜm��s�ʆ�s�����|QK�&9�&6!���emM'8D�1��}F/�v�������5��Y�D�#W��h��t�3t�D�œ���<�wڭͫ��]�	����`:���^uN�b�G�""i�~:�_L1&${O=���_�O�ہ��so�45w�z��z+ŮH�}du�K&�:j%z�P��n<�>�z����V,C��������2ƥ�C<!Vc������z�Ѭ�5��9B5�0�k
l��7�50m|+HELi`+;ғ .��\���#���`���в�,�9�Xpɑ=6����ǚ��K �C�}RADt�'��W������=+%6L6I��͡�h�L^���Y'��@ָ@�O���u�O
���=?��/�����ӫ���eb�����T@��N���S}A��
d����3��՟�<�\ /����zZ��|�'j^��G����A9'�kǣ5�<����-Kj����3dD�BNe����~�'�)��[.M1��̛H-ًy�n��S	���cp�}p�V7
�\ ��b�ZwOT.�L"�hF[�-��n���
�W��].�$�R�<���
-+���l͏|�b�K��++>S�j�����w�����a��Qh
ikCSY���:^������GO��N׮_�����z�/���2����t�p�B^�À."8�#KZ0D$h��|%�#	�<��Ge���*DPy&'���������k�W�
V��|���w��[G��g��FIǞe��v-X����w��m��#��_�x��#�Jo��n����|v7���ĉ���#Ȯ���7w�b�F������7��;���l6_�2�5_5��?ft
D*G�����^��}y�׌�.E���Q�1h��j(��kd�}n��@�8�Ѵ���CO1�)��\�9k*�kK*�ޫ�ӭ�jۯ!ƈu�ažO��x�މ<���C����`=�O5���?���M})c�/�;���j��d����+�� �X�vV�����x��K�.����������?��?��b�"R��K��Ks[���zP���O����|�t�'+]�	`�Se�h&J�����j.L#�1c�v�K�D;x4:�Eu�!���'1��`lA�� Sݘ�.��=m�E�ʚ��@�����i���v���6)9������N+ߏv$�H�����N��g�� �(8����V�	����� ��� ����?�����NM^��޴�V����_���zn�m��M�Džv�Oc9��
l۩������ш{"�k=��՗�֗�s�S�(��
�q}��`����H��8�������,�(��/��X��M>��i����C�Nӎ��Du�P�
-+Y~�s���M�ŽO4
-+��k�D�,��K�

ky���)_����q��+�]����oն���p�Qd�nM�x��ߛ�N�+�y꺾 J�������x������/�~��cr0`�P��v�M\W�v��!݁[mh��{}����G����?�1�5���E?Uw>�}`o��
b�nj�r�H�ִ���i�˜Iӌ�
np���'���Z^˘��������΂n����\�K����h��)j�Xԇ�)~���%A����;b�MPtg��g�kK��w���~�k���)�9/�EEʑ��eе?0�~��w��]���ء�^�!U��@��#̜�8�<J[�4��ok�@�ot
h�C��i��Q���7�����T=���u}r<x�W����o���U������o���~59��ғ$s��R�m�����eB��~�?��d^I_�O�ؿ��#\�4�Y�4mW�iOm��3�����`~��q��8K8�Ȃ�M�rmb�M�f�{W�ǟ���G�����Ԇ�;�pӗ<>�$Up��*�~������;c%Z�Hn��
��������{�
-+�~�\��]�S�9��@Pժ{Mb��Ǎ�>��23�꒜ڌ�./���+,5�?�^c��z��6X��"lW�2_dùKM{��l<r�u����W/]���v��Y@�"�ᒖW
z�8Ж\�>�Irô=��9���w.��a�.�GW���Ğ���>
�����+BS�%�M��ǘ�?��Q����>J��,��S�%V�X;���h�`PVhw,��2�F|s�ƴ���2�J�E���+:�P�]�V?�O+��^q컑]<0�����s!����ƨ���`�Suƶ
-Y�x�w�_�V���"uE�����6��6����g��\���@���]���������2�5A[4	��o�{�|HȋbJJ�)�(el2P��l���D�+�^�]&,E��
-+�<��������=yr�֋1�3(P�����m�u׷����Z/�zK�lY��@l 
B0ƀ1��B%���M��U��JR	��6�-�
��#~�%Y�nY�~>�1�^��9}[�
�f��s<�c�9�k�}�=��x`)%ls��~����!��J,�=�s����X���y5���?��4��>{�i�����:〓�P�y"��+��������+c��w�;�›mD��o
FK�aS��r�g��W���p�a��]��0�@2NXiI4
a0Z�FFz�1���$����T�ĩ)XdDoq�&���M>�t�=n}s�\�
�
:n�|0�3xSNդ�ƚ�
�3��c�� ㈋�
-+9�E�\��;�V�}$�T�Q6�@h�|�5'�F�<�Y�3���+�eB���t��a�\	q{h�����Em��y�ο�Ĉ�N+�
�=
-+�甆?m)<�4�O�s���
-+�,��V|6>����;���~�6
�9�_�&!v��tL4&ּ�=��@��� ����6"uku/�����&<����OD���^�ͷ�Ȕ?�s?�S�������y2����͑�����ظ���%VR�����S3kl�#7Ϧ�o|v����O�g�G��9끡G̽t���4{�1�m�&���8��k*���\��t��)ώ�E��"9�o�j?~T�2�SY*�>��[7��S��c�c=��uП΃�y�$ADL�ȍ+�2pj�1��+̦Mu�
-+T̈���{z��&�r/�����_�����}8�mLX�}�������>vy饗지���pڱ=V��X���8����V����{����ſxy�������8�o�D3#=A X�
|��$�X�;��8��x�j�E0�8O6��7|�kj��ۚ�h��Ƈ���u*���9�>��8N��Kmb�릚�׎Y1��U��{x��B�?[��v�K�=���D��2|��s=W������1������Wv�F:���Z��<����
-+]ǥV���1�Q��`�^�q�����n��Y*��O\��1�������Fk��P�����������/P���ʜN��5)�`�h9�MH��e$���o��z�'�+<\5};��k[bbu�����:������
-+��E�i�$�_l����������4����P�����������<;��ع����pޔ1N�K&�Y�ۻ�D
j2>����~���sz����!2�]_��;6[:c���e{�Ì�ZY3W��+9�M?��6t�q�:.Az�C�m���1���-K_"� �7�+�\qqi����`�E=���1?4��ף�r�=�Iɟۛ�a"o�P��^�lS8\ڄ
-+�J�8ԧj04��&X�aǁ�������:���	����u���,�b-�vC������o+)/�����нy#�u��^/
�^%Q7-�w4ބ��<��+�|��J�@@9-ߘf4cj�>A�d)�+Cq�J�m�+�=���}M���z�&�-�}���;?�
-+�m��I���+�tqc���;�3
ex灮>�8��kp�.0'�f�P:}N���
�:R7AB3�4���ǯ�n.�#D��aH'c@�+f5����Ql��Y�07����L���G�Ɗ��Y@�a-��eސ弜]q���4����\�M�$m�򊮧�'�f����F{�l����k@vn�C����׺���Ա���7���j��?�f<cPK�ح'F���~��la��<MYY�/����*_�,~�@�.��2���f!Dfl0�����[c�*�X�sۉ2Nc�)�	�%��^���G��������O<8~*���0����g��o��4ϡ�2<qn�J�69��a
�Q���G��]��_����?y�����Ʃݍ������������k쫌��C�:m��N���x�A稀<
-+pM�sݸ���P��	B��3���,zŒ�xy������M�a9���*�'���E�0�vt[��_YT�lW;�H��\�D���~}��۞�˘#��l-62۶�[u��h��GN
��1=��f��Č�=/6ʐ�������V�ʨ�=6����P����=2MZ}Q5��K+��&�Z�f�<�3���v�{��+:|&�+���?��҈��_	���UGj�Oz����Ew`�
-+�9���灮�LN[>������_}��g�c
2�;�塯�+�<�dO��5R;�W<��lNx"{dx�-,\ԍ�������܄�g������e8����P�0޴W��5���4�e�������-:/�Ѝ�lۤ�_����(z��D���*�1�,〟@���̒����\�7�^�և,�>������n�d"&g�+/�-gdi�}�+_���/���x7&�\؞y9�E�=��!c�ԓO���4���6p�'���+k
��s�R�0�����}���H���*�
-+�=mu��:?�
�xo���m)9�G�up�8���-��f���c�M�ccC}�G���<_���c����`|��9�GN舙�+yP������t"�ֿ�*�g�[��\���9I�l���Mo�|���[����Iw�:�M7T���ϘK3�;T^�;7�}�S�A���MA
r���"�{.�]�A0�L�Zᱪ��}��	n}�n��{ePƞA)�|,td��b�]��2�l&�؈=��CU��\���ʼ��X��9�^rΗ+1��iS@�G�J�^��������3��7�{,��4�L�+��'7��h�Hh��������ս2��zw6Or5��ʘj=�bkPq�=��O�H����1+�b%7��P�x���#�g�P�r�_O+.{�k���E�s�`V���o�M��r�3?��(���.���t� ���_ģ֩
�(4�̝��<Uo@�	�M���{���i]b��q� ��/�0ю�t����Z�,|0���L�Mѡ�'
-+��z��c�8n����X(
�ʉ[P2��b�����%
͡��D*.��A����N�+�w�G-/m�`����T��0�!f�w�HZ�\�,u*f�&P;>�����z�Z��;�	y�����u�u�{���bh���59Ę�l���ć���+r"π���/Q���5<6�ǯ�ڑ�$���ұ�9� ܱ�]�4���?(.Q��g��a�ǖ�;�,���������鳉� ӥ��A�F��]�~��^� Z�y�!(��w��ݗ'��6t���Ѩ�֚����W��.���_U����2@��6�1��2h�?�ub:���Pqe�l����$^md�=8�l*؃��}����)�U�"�_������������7'�i���G.Ç�ٚ���G��~����K��<���YP�"�uŸ��&9A�yX}d�C�r��:ӧ��"#Gε��^��Z��9�����J�	‘9���+�&���Y�8Lsx�_E!����Ѝ#jG7bvmC:���!>�FdG����ȳk4�Al�t��o��s3�+c	Ny�
rJ�Mۜc�'6z�B3�ȟ������җ����m�6�WÕj�–����+Z��x`�np��7�z�c���*����.<#���,F���"�l@x�O��u��ec���=
���;>���b���kc����Td�I(?I��$�o@p"tCk��qG'w�#�-�ּU�3@9��	j���)@�ֈA"_�4=}ӏO?��S������c�8��ȆJ��)�Z�����(>1�XZ�I7r:��+<���O���{6o���wϩ=&���V�>:�`0#V��o���8vl:'�Qg.Xc�|
-+�t~�����cظ[]S�����{�_��_W�v-����yu��O5Vu��u��O�w_�����$W���Y�k�k�8�,e,��N�>�e�c|~��%����Uֽa�N�Εe��0����9F'�dN�h��B��H;��5�zP�@ܨ_(]w܄	k�tFN8���Z]O��P$@ǻZW,K����n��e����\����7}��5}���8������9^������E�t�Czw�$������
�Y��\�?����1�Y��'?��}t�/���\��������1��X��X=H�\�"���ܩq���u�v���Z�=��3�v[��c�2�E)��+Î�FN�qc��}����X�2�ο�S��h1�)^;+�Ů���)B)��cN�h�}�;�-���l#�oi�����>e�x.=��������$�^+ݺ���{W�z�ˌb7~k��駟����Z�����Mnk�r<����!��]?H(��_[�l{^Y(�Z)������y?��@M(�!Z�o$��]��Dq�����<�o�CY󱊌|�G��҈�����'��|J���O�y��3~�_���"7���}��O�\�^��Os'��
ǎ�QC�%<cs��ƅV��FsDƑ}yb��e���<<�󊿪ژ��S8R�Ƞ����p����L�㱢Z���}�76���4��n�c{$��t9A��BF0G}���uW�Sq�����&����1
-+�����w�1"�$�
<��H�tc�<�o
-+0Ti�@��Sje!���F�8t���6�MlNMǬ+�����?���3����̿{���a�+V s�����X�:�}��4ړ?�fK&y�פ鍁��rs�+��Աm|���q� |mkq���2�:ޑ�
��rJ�)���,4%�ż�p�c0ZC-���]zz�&��!Gϋx�	v$;�܄�S��X�w�1��L�&H=&^�����aK��Ə䨃��̾�BY��{��s&�� 3�ft���<B�>0����'���q��1�W�S�K���w�����MB��܃~��Q�����hr̄P�?i��Pc�i7
-++T�wɅݎ��2Y��5�o~�3�_�������8/EW��K����+�������7���ϋ�̯�Yv�W�>l�~�7L\�]\@m�l���ؚ�5.��Xc��5s<�s��	�MÛnxs������3��m_ժ���7�X�.99c�o��bSI7�t"��'�`�'*�b�e;6�1ƥ�����;cMM~��ox��e�X��f��6��D�^�RL�A�8�&cp.+����5�'�)�Aa��{Rr��)��~`�!y+.�u|��g���Y(�ű�7&>��޴���u��Um�؄ǽdS����$�VK,����.�}���7WX��%+>�X�C+���I}`��Gq��#��ʘ3��	M>��s^�w��fAڤ�^�~�4�+x$�R��x7/�^Nnu
����D�?^���!*�rk"�V����c�@p� @��Ln�A�,�M�|]���zX�ވ�w#M9͟�o��:h�
[/ƀt9�s6bnf ���i�]u+����
��MG�G\��-Ū�U�/�Q[?,��^����fد.6�CP'�����o��o�W��Z^�����c�o��/���Ì�)���])����X�N�����;x[����n�B�O�擻��f���>����$e�ud/�_��g.�����o��r� 'fc@��a���g~��������������/O>���ʼ���
㈅*#g �S��/���r��H��Q�y?(X��[?{
k͟��C^\�	,1�(�m��_z��O���n�*<
�
WNx-��y�f;+g-��}�q��x��ulc�C�5f���yp�nu�7F%�ӑ;ی�"N�bsJt���F|H���g��y9b�(m���lf�`�n�?��V�ೣ5.���:���ڀ_|j����ZԃĊD�+���Ÿ
ȵ�\�}�
Ә\z�ۘ���n�S㗿���K/���X��:��//z��������̓xg��S�N�7����7?4�䖇�]3��_���%�9i4�o.��A�j��(��~�./��m{�xo�P�8t@^�o�}Ӈ�5=��S�
9�u�{������wZ38lR�ڠˏHRY���Y?Z�=��uO������xN�^�:?�����t�[�8ƘxF%f���[3:,�cX�y�˱�(N/�mb2�
-+��;��\4��)
-+�O�`e�
y�_;l�n�́�<+���C��-��D�j��d����
ͪ�TƼ+;���?R��a9!k�!,"��T�u��=�YU�Bnq�����wލ�U�,6�EȪm)��*
Fp
p��ܖ��koM�
k{N�?ވx�3�A7Z��~}�q�mՌ��w039��u>��,�8s�q���Ѝ+@�\��x�)���@�a�V�,�V�|�������	
R76��f��
�(E
-+O����=��7qSs4��D+�\��g,�Ќ5���?����oP��!��w\��V߱�6Y�k���H��*��\���
	G�2�o���8��u�u��9������lsz�.?�~\=k�O�8_S�}��?�t^�I^
-+���
�T*K�v���9�|]7�o{���%�}�����ӗ��C?�O��}�^j����ץ�<����w��]��~��P
�-=�]P�ML��cܽŁI��@~��Ÿ�g|]�ٱ��އ��-l��1E��Q�7�^���?��
-+��Xq7�>8��RZ�����s5q+3�c?h>��YeN̅b�c-�*�(S�^��)Q��;]�F,|/����՟SS얧~bi'-�S�Ƽ�m�]��Gzm�O�k��Y����ԡ["���(m8닠�6/x9_y�4b?����=�{1����E���?5���ic�4�Fb�?�f}��H=�g��Y
-+�_��X.=�Ȕ���'����O����@�C����qO]È��&L���7T�s_���ݗ�W���)@���:
~?X/���Z��ö�Ǔ\�kg��`��CL������州�\z��#�<���-�1�A��<��з}���,>�
�Cs!�j�%��a�v�h'ڎсyǯ�;[��|��X�_2r�պ<��0�R4�;֥��?�0�m�#����µ�s�D�
-+b7ze3��9u<3JYK����k\��(�Kn�K�c
\�GL�&�xօ���t�7QDN�[�!J^��?-��Բ��u@,4�cuԑ��K����wLW�gm��Ƞ�;^�G:��4�����+��Ӽ�o+8��S* D�u�N�Ө���l��G�,^�����u�I^>(F.�����B#K�!]��2�̆�򜑑�#�h�]o�5���v�1C��Q�O����uZ,vM<Z3g+���'��t=�y��@N�xh������������ɷ�uL��j�t��k��P���6g2���m�ёW��3��t�"5���U�c�|�0�N�����;+*^��0�k���^��e-TP9�x�s[�u�/J�-ޕA=,�o�/2�!�6y�)�D$h�A9(�Ήz�Q��'���{^�<�wd��z����������H-�fJ�+��1`�nƴ�Sd��Q�ɠ����T�k+;��ю���1#����Xl�ro:��﨟q�8�3]�-�qMK���"��V{C�|�A\r�
��]+���2F�t8�h�4r�d��	M��3�yѿ�@P��h�q��:�	����H9�XLk1�cQU���Y����������kr�qB2y��4h�7�F4�w�􄌍��b���$1�!��
�LPdf�
����0`ę��ۻ7�
���㲵B;��, Ok��I#b^��5_s�sX��Wɍ�~���.��G���'����I�_�m�6����^~��?Oǀ��?���z����
-+5b�M���'����\a�<_�����z�,Z������������J�n�~o�>�o��_��{������K���C�<�
�t��V�a��tY�����/�Ӵ�a3 c�cO
-+��P̩
*�|BY��PF��d�p��g��t}���e)n[�<ތdr�+Ĉ1���"�5#yNږRG ���9�f?)�}o��;��Y����Zi|"�8�ёR�sS8�f6����d���
>�`dcJ>ٰ���4��/0�7@m��+���8P��!c)��&�W��?�ծ�Q�V
-+������@��R���u����[�����qT;�έ�����2����w�����OyX���O��cq�9�>�d���Ad���kr�$�w�����K�0@�t���~�2�3ǘ��k8�վ�|�9�/��\����˟�sߕZ/�v��0����	�G͓�AM��P�E5^Ue<����Pq�@�]���,o
��x�H��A��y�+ZQ���f��Q/���x�S��x���j�A��넗�i�
-+���r�+��w��=��;������y����u��-��H	���}p�O�kl�@��#���/ƆV?�$f�n(9`e"X��G�(4f�2��х�k�~e�7�Q?�/��
hp�7pS?�8���'<�����l�Y��!�+���y⟦�|���F�����?�u\q@o
��H��������[Z=��+yR��
� $+���WjZ�M�mȱ+�~n��a�o�1��i���͘\3���
sc.�@<��/�����q%�x�+�c�>*�9P3/�����83*�/t�<,+���L�`�oߊ���l<�;�q����g��:�Ë
���!5;[?��m�R�y��R�Ng�j��-9O��$S��`��6�D���C�i��G�ks0_�ӎ|c�ɍM��/�N�~8�C7I���i����5�X��_=y�C9�[*�/}��
-+=
-+kwd3b�j3��1���8��i(8ހ���o�n��I�\�"8F�#d^̹�.&cɫ��j9�͎��3����0�ж�����7ǰ���}Wv�ޱH>�(�������H��y�Qw�'r�Z3qs�َƸt䵪��i��X�)694��8T�f/�^�o!���~)�֔a�g
�����A{����(��IMԩoriYt���9G@������<�ޔ��]��=�������'�1([��}��֟��u�ި?��0�p�	�5�Q���5<�4��m�6��>D8W�-��u�!~�
�>gCHIp�aNQO5�7b� ���k�q+10�Mc�؎�΋�ȿ����8��,�`&
bX8�!1#a	��ԭ���<{�{��~�?96K÷ꜽ����w:�޺U��+��+�q��1��CF}!�}�׼�ˣ+�������o~��aR��l�4Jl��o"�
tǿB��A�;�|�!�N
��h�|Q)�4M��?�VA*���=g_�6��Ï9��>+�'G"�ֽ��
�����G��x m�c�X����ɛ��1g�o��-�[��89N��?�����!�?����4-J�A'_���+����^�N��v�8�����<��B�j��Y�����z��p�(��Oٹ���+��ҴFo�g~�.֎���o^���c�r���:�Mk,S�O��/L�LN+��߽����B�v����4��1�h�>@?�&�����wuQ&�g���w����M�y��8xM��37�_{����h�ۋ����R�HdG�/�`�v��x��;���ֿ����
+�M��͍jn�v�^9#��q��mbu�����������39���-�Z��ws�s'
шuTG�۶O��
�OU���;94��".G�sI��|���<z��a�C�}	���A٦����2�|��+;Ā�U� ��\����	M`����{��/�z��/�G��n,>+�	����8�
a3����9�t��D�㦙�t�-c:��L�����+�v�
f��@�~�¯��kV|�Чu�����2�>�>_���l@�'�m �+b�͑W�v���܍�ی����Ms�#Zl�^h�Gx)��S���o̧�%��<k�8��\�+u��r�DZ��1�����g���
-+`�K�L��kC���Ri��_����z~���h���囻�[�+��fWEn�X��_�?
Գg�0,���9�k{��_kN�I����t�m��_�OY�O��O�">����N�#뷓�^h��EoO0�V�b�k}&K�?�Q��YD���Xi�
/C�Z����.7K(.@��ݫ>H�PgJd�7�Y���C��E�81:8JxG�7)|�X#sN�|�K�C>��g
��~�/T�yW���B\r���Z}��ǟ�i�6CI	�R759x��d��F�0��{��#���yx/c��1����:�����[?���m��(7��BЧE�ښ��u�|{ZJ��Ў�Ò�fJ��"nИ:��|q]�U�]d�+��+�r���";:+����I�Pk��=#J{�y���m,�'z���/��p�a�-����4����D�3֟�QW?t�|����t�c�0w4�E]����w�+�2rݺ�#��3�j�:�S�6=U��F�>��	�u@�'��(Z.����n�;A�<X����<s��BRaI��r*���/�h{�k�>�^��P�����u^"�Z�Z�-�m���ҵ�~,�b[���c<}w�������)�B���Pߠ�q~�J;^�Qzt=5�1�T�ĉ.��k�
��
-+n��ߗ��M����O�5�~Ŋfe�щ)�5�yE��7����W>U��0�3?��< �����>kՈ�c�wN�!]��UcP��@�vq@�jF����j�}/��������#�)^�4�B�O�wd�>���c����(	��C�A}׽�hX���<`ӐS�}6��4��-ŇX3����p�=X0��+�
-+��f�3T��m��#v�b�f����X�Xۗ&���I�q|gB��]�m(��+-�y6��d�>�_��h�����Wb-=� ���!#����?pa�Q��`&gE�%���Ҵ�������ۨ^l��9�)�C�m�@
-+�_՚�?>���]��lj�g�
�E�ܵ�X;g:v~|�q��~�?li����x���.��df'P#�4$����suūl�u�'Ӹ��^M��T<��m��V0��Q
-+ؼ��5tl����<���dM����~������#t0�O�?��)�E��|�[��j�죱��ZF4j�u�`%zZ��~�?�	�`b��q�ב�}6���.�64}k�����O߰���ͯq6юO�y����7W`t+�{���&ZYtc���%&�U+v�������V��m��$���S)���\^������+��D������x�_�عQ�I%���d���_�i�}�*6]�ʈ끳+w�ၾ}��~�{<x����m5���KB4����H��
�5�����Qy�X����r�o(��]���N�Ι�qCx���	;tPZ���{��2��(�F�i�j1���h������u�����C�)���'���c_^��o�ws�ſ}W����#s�����O�!�v��\�)��|�O�ͥ����/�>e|�S7��gb�s�otw�?i�����,��g�Ex�����v��1X����wdF��J�.}��s���+�۰-�m�m�O�+����3. �^m�����02���|L8�"�hL�����/T+�.��ט�>��>i^�|1w�O��=��L��
�#�f���V�	�a��/�P{�o������yϵ�ԟ�~B�ɳ
I�G��J�A�W�x�I�֯æ�S#�E���}��8��S��kA�R�Jy�E��\������_�+���H#G
>�x���Ww9,�*��9��<�� 9{��\�� #Ǖ�n�kh�0��f,ƕ�:x�d��+Ŷ/��}���.O������M����EQ]��$|��{�‚�����Xk��9����%����=���:�����X�>�a�E�6���e�|tGN��O����d�'t�x��X��>e/�N�ܦ�ۍ�v 1i�W(�+C�v�4�!怠���m��/�'���}8����˃�
��؉��S�6�
-+���t���x�c]������)��ۣ�C���u��q3'�O��O��	B9N���P瞕~�.�qs�~<
��d����cC��;mea�!rk���Sl8�I;�z�:��5cΡ;~�q�=
-+K��������,���+8��QI/�


CXD\��E�G�P�֋=?��z����Z�����G���ɖ�g��C�O�R���$O�$�*�~�9���x�*?E��ϚƬ������`�>��}`R����]��ۍ!� ������z�A�8��Y@ބ]3�Hc�<d�pL�:d��$��>t�;�yU��[+0m��n�Dl���X�|����w�'�O�v��[+��&�Pk���� .�d�=��<�J��1wd�'}?v��5���'6
-+%0��Q��4�\:�5�b��6A���
�|2��2����V��1ѡs��G���	ps�әg ��`��)>R��g����8�13#:iҐ“Oƃ�Y�O}d:��q��{+�8K��
�p1�{j-!i��Y�E�/,�`�a��C���M�����c�����
�T�Kd���A�]�jK�?��_���mm<5�85���Œ
6�C�q��ފ*2��#|�c��ӵ��b/`+!�`
�>0V|s0��C,�79
-+�� }Þ��<�ߐ�.ט�]`-���a���p�:�>�{��͙��yR �$҉�_{^���M����>���?�
-+y�����}����#�11i��5�Γp��5�β3�>�t*��5t������4��-y�?�r����	J;hl�
5C
��`���v�f;�>�jȂ�3VYs3��"�VA�b�j����%�~}`n���57I�8���Fϵ���
-+`���������On�uW�+=&[o)�Z�@�׾�&�o� �A�ID�T18�f{Q+0��u�%Mh��Z��^�*}������L�F���y��g��}^�+�kU��s�u~����
-+�q�Dw?��u`�6g~m�7������c�k�؝:/���ӹ��r��ݶ����t�7�ۉwu�]��?��o+"�6���b���)�<��рݱ>xpsp�o�l��%'Zl|��>]�P�)���F���<�߼
��
��v��#��}�7^~�g~�����ri�k�f4�EM��I��~�c�\ȿ�ø��8�'=/l�ڝu��������m�g��j�*����'�7{}���'qÿ�/�����������8�+ܬ��%km
-+;F��]G�J-�P�5�L�	M^`����.L(i�.u$�3�^nj8Lk���
-+k�<+͗�xir�ު-.ϫ���h#�н�a�k^�y��`:D�Xھ��m9�u��ۜ�"&j�X�H�a��ҷ�@
'��b]cБ+�w�nχ�?��b�C����0ge�`��I�ؐgX�8��?D����Z;����'{
��^��+?3��S��\O_���%BmCXo���';�O�1:|6@�sެ�6�y]\���Ia`h��$�k0�+L,�A���ٟ}��K���_��_�w���k�r�k��.O<��v����򉄧>����ͣބ��r�����-N۶#�1u�~�Kj���+��3�;�Q�7���/]�fjF�>�y˼񬹽���v�{olvo<�9
+�|���V�]�ڃ�Mr�]z+FZ{b4��Z{h=��F�1>���w�'�l���4�KK�c]�p���Ļݐ�׏��>����B�D
H������q/����_z��W������7c�+��
O1��zey@|���e~�]�s����:���?�����ˁ~R��l�7���+�%��y}�����o�[����8��\lM|/��~21&E�So����yD|��4���/0	�
7�q����a
-+>XԨ�B���˼��W��ͬ��uݒܬCs+����ݟ`�}E�0~��������˻��k�� �9q��Epu�Y�i�8��y�[��˦���!�թ��������j?kH?
-+��6њ˵����,�0%�1�h�Ή�3u���X�@db�L�z�A�z�k�gHL�5hr$�&����}Qu���8`��:�����66��{�V8Oß췬vy�nj+x\�#��G�˽����ď��/ў�ƣs�m?���m��׉�!�{������B��������?�p��0;�v�=�������:&<7W�Y�ȷ<r��d��:G]It�\4`
�34�Ƚ�^Pd��W*��B
<bu
�2��'�$�4s$�ɝ��sI~u�őp�|1��`��
5��up�#�i���&h��
-+m��E
-+��ffi_0���,�/00W y�iBܠ��Q������ip#�A���8�G������~�
@c'f��>���|�Ć6��r8#7���	�zkS���vCxS�n����8����I�����M��^~�mߛ�]�F��s�_��M_F+,�
-+���׈�mz9ä�$�����مQ�&>z�j/кB�yE�+wI���~d~�)Q���coC��2�0W�g�‡j���9`�x4�q�ſ��ķ���V�1*�y"�ƱFMLD<����;�Uy�	�3��vNx�Ӗ����:<�����{�.��E_9�d5�/�_qG��ǟx��E_���N=�]^���_ɓ���������s�f����|鍾��*s
��ii�����[���/o��/HM��ߘy}a� ��0jGe�hr�k�e���`V4c��7���J�B��0+������|L�����c?�a�q"+2���`~�Q:�+{��ID;���v���x�c����w{.W�cC��yh)i�?x�ƶ��pP�
-+6�r?�
-+�o��#s���kj�II�c�w
2��#��u��}o)H�k�G
-+=p���2�x�
I�������Q�u��+���J㧖���k{����~�G�����Ux���#����؋A����~�_��/��/s�k+^�'�0s��9�K>rTn�a����"#��~�^� �!��9-����x/)��g�Mp��s�0��sR��f�S�q?�N��B�GNQ���n�^�+�P+��?8��4v�B_-
-+��/�撟�?<�fs���>x���=��KDA�/�4;/�&�yGϧ�|((sR9{�����}�PB��5
N
�X�M���0�?� 5�9j��>��n8��mly���I�y K����+0�;,�\�>�Z&��ȱ�8n�
-+��<�SH�}��~����V���8���=c\l�'3�� �`l;�y"p�Ɵ�?4���^�	}�8�Ϝ7:��l&>)S�!�8�#������`E�|'V$��y�O�Խ�1D�up���-+
�n����̩�0S��2���"�Y���\d�7���\�U�O	0�iҰ��s���yO���W�"�+�c��?�����:L'
n���|

ŕ�Ԗ�$ל�@��.�O<"�F -�jK�MĮ�H����BT<�Ay�\Y.mͬ�q�;_�D�	�g�����>~�G�����_��ȰD�a�C�#^�ً6��Asl���������?��������
"Ӡ�+�'�6�s�\��i��퇄a<�PƔ�)%ק�����Σ�3)g�]�΅�H�B��������f�85RjK���T1$~�ݽ��J+���!�@l8e� �4�2�\-����y��{���o�\��}a�>���WoE�0������؋
-+d
-+ʈs��4�=��7��M���s�X���Y+�J|Q����_d��8X��'�#���A7��^�����O�%����+�˗��qg�7[�4��R�"D>���a��oݰ�}|�_����m��u�ѷ��1������Y��\�GE��G�-�J����?�Xl����ڠ!��&�\lߢnk-�1�Y]zh��۱�$
-+�������U++��$ێ�?��6��':��`{L.����_
-+��$�9V��n}���c��ׂ
-+�°���}FH�U�gDq�"��}�p2+��e'ҕ=����	�����.|���Nu�<�u���X�Q����YeN����\ׄ�~n\C��כx���ԈJ�;�\lM�i���n�f�O���K���i	h87��G��q����YMD�d\;���y7�70����0�J��"ر;�X����g9����
�����b'�\́���tF4ƹ��(u@���E!�k?4�џ�&�
J�؂�>��	�]��	EO�a��9�z���V0�̍�֟�G���m������6���1�'uYyQ���W._��o4��)z�j�=�O����`^���ͫ�+
o���c��`��3b7���3���ݪ�+4<��)�2Qs�����v����␌��5׋��}@�k���Uכ�c�A���Lq+�K���@q��'QP�r��)��x����x���x@��Ly�i���x<Y����?���[���~��P�^ֆ�Y~cB�?��p��C����_����]��?�g�F��H�������:?���ɡy��3"w�����vs�5��s����7�/;�:O��J%��!
ڭ��
-+
�2ԏ���vc�"�F� ����!��H!������y߽����K�H�P�:���;<ﰆ=�s�=�����-�
���L�ç�Mm*撾��r=d��|G߸c
h|�˽0]�=�����ƭy�m�XgZ������I�4�l��#MN�șMr1m)��X��
r=F�o=l��i�cM�h�	��s�_"͚�UR��zA���#�}�6n�]��s?���7p��(~�˴ud�Z�_�M�����V?O���(V��ᘷ�i_t���i��ʡ������.F����kS�x�6WPaK#��Ss��s=���2��r��eSǀ�:d�3 `3��M�9��m����A���P��_����W��l�8�Ok�������C�k����3�zt�sOLX�V݇
-+��d"ӈ
-+7��q�^;h��b�c�H�����5i�`�5?G��
=q���Ў���x!*��~3�H����B����A��gb4o���sD���9�~�+���自�� �+�C{�3��?�-ԯ}fi���8���[����a�՝#�L
-+���l\�tw�g��,��#�9�����U�"�E���3��@���L��j�P.�Di�i�
�׼�Kn��m|�l|�LM��j��'8kZH�*U����H��虠j�
�y=q�A�7$r?����[&��=N�j
`�
��ѩ6��D�kk��P�u�F��0S�F �W��
�q�G��B��(�z��G�J�y®����~aX��`��=e��[�R؟�ک�)
-+8���\�{g�F��|( �d�P�N�\/�,���1�5"��N�^��e����;�_b�B˱n���q��-sR��[�Ee[�I�ao�����Wm������!d��\����ϯ+u|"ؓ�=mNW����>:��|@2ԯ�r�Xkis2���s�̉��Á��w�O[�\�W:���X�h0���%��ګC{���r���ȍ~�X֟���0 nhw}��}�wr��(G;�:�k'y�U����o���N]�ֳ���/��b~�zs[������~271��l��V�+
-+GZZ�R�1��0��׽�M����Ú^�TҜ4;����47p���c`8�UEj�K#������sr$���/�������90�&�S�]J��@���iP�̉&ˆI���v8L^��}H.+�z8}*3����BN<�yK�L��V��
c'x�U
Y
-+�9�{+�h��\�{vjf?�+Z��%�����)&������c��}1���yQ��4|��2{.;9�z��2#��8uڜ����fa�O쌸!��L�����dDZŲ&yQFoj0yu�C���d��oK�:`�ǤZ�1+ŋ���t�~mmN�[z16�?����S
�C�2O|+�����6k'��2��1G�O&��{膇_ME��hxs����
Y�r0n6Qo�+�~���(h��"k|����/
�R䧖�ގ#�b��2���C
�r��+��DfD�J[��|��lraA�:�(7zp8)ir�
�
-+�̱���ƞ��?��bB�яP�ںRpy��ޘ��O)��>�����~|�x7�r�.��=ؘ6��E����:�����;��Oul!�����A��b"��΂�Oa;&Gv����έ�j��'��]Q�����
��E~lG���Ca�W?�=�Wݥ�*,
�&�����
��(�癁��	�EH0�m��7�GN�N5&9��N�Wt@���cɴ�*��2/ʦv�>��A珚����䯘ⓟ+����_��x�-�/���:q� 8�+�c�u�G`쨔��!T��x.mh���b!�p4�����>S[����ٴiZ��QgM�YĤ6~tֶ��g�]�QLs�h��y�r�Ok��r�.�������w���/��
�����'�|҆�h�Լ���_}�3��K��C;�?���Q
�}�h۩��$�����%�f"����r땵9պ��(��ՀN�V�qhE�.a����?�8��0�3��S��#8sB����,����R�9G�|�И1��
-+�(�a�1%���7U�'�G�֪��TՖh*ׇv�2@b�>�ڤ6M0�&'{��2IE6<�����خ�kE��+�ޚ��zU���wΗ�
?�A�D�ܷh�3[؊hAd�c|*.\J/���7��鮿�.Z�3�;�v���q��Ԟ�����37�����k}���ݖ�X�Y���g(�%l��N��Y�#��%/���n��g?{�m�RtM�8�)�V;�}����l��G���������G�X]��#+m3����+4'X$.|gs(/Jmu�a밓��G�X����?���#Kc
3�K�K���;2z�����G��׻߭~��K*�'dh�:��ܗGX�+sV��7"[+���0���?���L��!@rB���|�&�&�
`�%v<��9��6}��ѿ7~�?>�����>1�'D^{sz�/��;�@~�e��:?��`�?��{3�ؙ_y��!pv���T���y����$&PY-�p��Zn�:���k!�чN̴���Y�i�ks��_�5R|X�'h����۫;*���]������*�x}���FXkA*��R�_�+�/}�k	l8�/�_����,��#�HF�9���D0�x2!�ka�?����3'*	z���9��X �M1{��u|�\}dQ���:�c'?d+ �z�Q�C�#E�9����
���"��<+>�P�N�5>���������Æ�g���G{˶�v��7�g���s!-2C����gi��M��#��"�2Ҕ]��S��
��&�mtk#(�?h"��w��r��O}�P�i����1��!C,����A��Q3�E>���g��׹^���U�ھ��&ƭ7ޭ�z�^5���<��*�H�W�/� �)|<�y`B���B��N:���_i��e��+����;2��Ă
��U��bo`�Z!W��+�]{�E/ti���N�!��x�!�7�M9������v����Gomc�y�e ��k��̓�Ƈg�m�[�+���|��w��n��ԧ���8^_IG{y[78إ4�z��?�go��׾�b�E;��͹�r�Z�X���i3�8
Ϛ
���vJ_.�&K�����Fup���&�?������?�RY?)Oۿ���=l�
-+�

-+�ӞJ�m.6��o�So4[�;�M�W��ٲ4���
����;tQ5&4(R���q��-:�Ͽ���Ûu������E��Vv�+^����'��^mW���:S�\�6�q��D.��W�9/W�C:;׫U$ڎ�� BiN��X
�D��������&k�� +12+L���lG�4�}�����4~���k�u|Y��yt���|�������ߗ�<;>��{��_�+LJ�Y�����t���YR�JdQ��F�GM��iB�X�t���T> �l�ܬ-�����'�����!{ޭ��C>�A��C��P�{l�/g#'�����nX��	j��P�:��X��䗸r���c��
-+*�����_t)]���!�75:��g.D�ο]۫��1���p86�6�����=�+�e��|Y�p��Ob*�9$;�<�M\45�Q��I�����rl���c�ѣ�
�t��6]N� �
/�W�U��(h��n^?��r{��+�6�ڔ�A�&G07��2�g�]�~���&?]C���?������Wu!�v��`�e[[���L��N�=�[m\��S�SS6w�y����k�Vz���n�ݘ;/6���⌫c�	cC�����!�s\I�ЯkG,Ue��ч5�9�ߛ��g��c���&/5����O�|>>�]�n��l��O����S����̙'^>d�P�*pP^��?���ͥ�?y��67\�
bg��7Ƶ}��:�㊑�r�%�Ϙ�.V���˟�!~�����?K,"5����Y���{��lsh����ď�}�׾���o���6�jsm#o9�z�7%�+r��ZNZ �뽁���0�k��n#�� 4{o���+�8,b���M��N�ژ�M��
-+�yh���g'k�ݨX�oڂ�T�����Mnf�l��R*���z��QX�El�n�����ƴ1�'��(e/<��8ʢ���m��̐�cwg3�
?/�^�����Ios��q踟Y
��o����X��
	.m���Χέ�db���ܴ4�����5mn�����C|͘2�<�c��_g*/A���𷜭��9�lB�hZ5_�;���MO�/���|�����w�S��ͼƃ��:�z�[��6h��^��?�7�����9";+lG|}��
-+��e�W�kgL�C��%�;'�]�+�%5��+UPje�+za����iK��L�m3�<�����bΪr�i5p)��`��z�;R�m�u|�.��V�K��U<���R�^�#׃��&���۩�,q"��9���֮?hb�ED��9���{�6�#_�zqCO��o���^���mE�k�O���+���΁ӂ0
nڵ�Z�6���sL�89!D3o"��y���&r�H�z[����#y)�M,�Sx���M�
-+5�v�Tp`�Us�]DK�52�4�	�ܤ���!�������]o��䢱_��_�����d~�����b�
�|)�*�����W<��1�o��������Q����+w�xS�y���k|
�5v�A�57ŏ��!2���/
-�5r)���wF�Y4?>K��~��+��5�R`e^S��N7r;N�z^ͷ�.���k 7�{� �í��o+Ҏ�%u���E�J蓭�P��~�48�ƁR�;��N��װ�k\$c��6J��w���}��
|�����G/�Q���<bC�P��#C,�ho�~p��2�-S��!H��X�LJ�;���?�;s��W��A�m{��x�T��$�3�����G��t��t�O�t���?�ġ��?W�v�R?�s'���{R�.��L���f�Eě/�l{��������9�Y��ܽ���{�~��CN��k<Nt�
�8����F�F5��3M�7��و"c?��5>ԟ�I��k��_i��+��g<G�q+^���_���o>�
��7~��A�~���#߰�xf&A8���fSH^*�A�9��#�0̉��G�8`�ot�J覡
��fk��x�&�����xaF�1�\���7�%�ic���}��b����HUWtx�O�`�8��a����rA$8��T���?�i#h�i0���N�bd=Z����Y�K��{���j ���0
�9��u(c��WAO͈~�׽���u�������� >B(�lt''�;~q��2B�_��jH�<�b���f:�w��J_������1K�uLj��a��+p�w(�
�ӥ��W�J����Bk� <�^�ދA�%�++�q� ,}���Y�-1o�r�>e0�������m�
�Y�]�����gbBDo��;o�\������d��<p��+M���+�	����7�!٦+�шΦ�1"�	lO���']}Vc��x�phc+2�z�p�;�5��9}�@흵������1�`��K�H+��1cK�Bs�M�*Y�cl��˕�ѩ�^���#�ސSg_Â��f���6��b���~ɾ:�d|w
��o۵
�9�|����}�b��Ǚ��ޙ�d0jEƯ�B
�����#}�Ŏi��f�
����X���
-+���Mx�ò�-eNQ�Et�P�98��)�: 4t�Ni�Y��%5V恒1�XwlA�*�a�C~����"u���K��mj
-+6���k}�M����$ė\y)?+�������>Q� �0PYus�n��ͦ����D'�ګ�1���
��C����S����7)��Qx��#Ӗ!�&$��'��q�O���@i��P�?td.c���qu}�Sl�&��H�9�5Bl|�u'�(�7���s�7<�/+�ǿP+�cc�/��a
��ĝ|:��3�yiK]D�^��ڜܭ4�-�A�A�h�ti]�>$���p(Ed�q<��
�S�}�]�,e�����or�-��ȋ6v�%����7H����/��41�֫�P�?�����g�y�����?�}8���?y	���G���~��`�L�&�����f�K�eF'��_�� �܏�O~���bse�FNC�G'YS���S���9��f�\�?�� �A�{�����5�2�g��詀��Y���_��Ո�
��ٿg����Ip+Q���@x	���7&�&N��P}�lq�O>������QA"v+�!,���E.�
���x���.9�:��F+��B�0�|[�FfrS������FBCF8*���>�
���w��)ꨚ�h�ǡ���
!�6�ೇ8�'(�b�F��.H����:j˞ 'ѧ�ze~�Sq
Xߨ
-+��#�5y_�bo��M�PY]jJ��i��g�˿gO����_��:;�v!��ȴc�N}���PF��F��@����h|���w�3��I++U�Tf��:������n�ѯﳿEt}ѿ�4Wա��X�?~�E
r4¶���Ù��������CZ�����I^y��
���=��"��X+>���Y�>�ߩ�ǜ\�d�y���M���n�A!�c���H�4�����	�6F%��ϸK���8K	?&,��.�Ȍ�=d�*xx��]�ޠ��5��{@�c�$cgD\f~pq�|����|��������3&�=����z��)���k_���_���o.�1��G��	����~m�
�yN;��r[/�֤��*:d`ۓ��<��n+��)?-��+'(ֈ�R��x;��P+G;��Wo�K�����/>���:���g��;����Q��C���>h����!%�af�qa�b�h��N�"�֔�#�N;�qk�
�X�)�t⛛Z��<��_z�/�����cb�\��꿐��������O��ٜn�q�qE<���K_���8罾k�s�5�(��
-+�͜��M+�M�>?����ǿ��Sz�W�kT((0�@m�
-+i�i{������ ��Ԕ�C!0T���7
-+��g��+#�?�3�HK-Hz���k?R�b�"h���״#o�nmT�0���w��
b?q���U�(��>q������@�(l�@|�PЄ�1���
o|��C��6��ߦ}���u�!�G�1t-���l�y2�����)��J���ظ�z�ON7>�^x�
�<��`;�t���e9&�#3�e��ԇ=�`k㪃�o��ˋ�*�7i��L
��
~ȄR���1&���3~S�\����ȕ]B��s�����;և-c�+�n�z̰�����aN�H&IA���r=`k¢? �)1�����[y�/Ӈ��n����˿���B�G�{~�o�|�i�,xi(���W�aȻƷ��������m-\⟼�f
fvBi�&����(>8֑t o�g��oh���������-j�����.
��o���Tص](�bz@ć����!H���Cob[7~�p��.
+dn*��ʃl;5�'�!��'N�����$g�է�e�ǁ�h��������^� �|/h������qӈ|�{S�a�:���o
,�3d��^�1v�t!L��[K�ߓqZ�ѣ4'�rpH���MRR�>켐l����h����E�p��hf����g��\���܌7V�n��Go?���1�X��z�����R�
B6̱��w|���^��7��O�1�b{e���+��'�9�gB�L�>����_���
Ւ������)dvZ�cYi,�m%�V�<(-��޹����3���[(��X0��9
	�c�/��(���9���و�u��Ÿ�����x�⬟
-+�M�ԉ��1
-+���5�՚.��h����J�պ`D��+�Nx�l��������|hzIy?������~�7�?�)�ݢl:�V��x��&�)�:�/���@7�^���_������+�_O;�PH�	����+3yBg�*�SC7Ƣ
#��&�|����������F~E��SHq���@�0��{}����GnX�O!��~9142B�
����3��>�ώ��+j�4�~̛�����6��2C:�'���0f�/ܠd����yݖ$���oEb�X
-+0?M�$)�3#���~�+�8p�7����������1�g�
����_��o����_�+{����?1�zmlϡ%ES��_���Bk�+��/'��ohV��?����]������،�
-+/b�K�
��+���c���$��n^⏾sH�p�k�D�*n����1�W<ߣ������,�q�)1ks}h}�KJ�?
k���8�6���ڸ�.>�	sXI��{�Y��{����:��7��s>&wr���c4đ��>�h���Y��=ח���Sw�G0���4s�?tlF�VS������ԫ��y�ϥ����\��1���������̬ή���>���j��k���+G�	0+|/r�e��`��\l]��d���ݔ�u&u��R��{�8�w���ʏ>�qH�ˆЬ�����SC7Z��A]�D���2>� �?�֜�JO�{�Ď�x���$�~��s&q����z������1�u��p)�n<���G�1E(}����M��!@��+����'�8���<E�~k|�7iS�x��Դ'*x�-�:����
��62�+�D��X��
��W�!Q>�я�~�g~vbAd��m���ƴqm
����6<�W�?
|�;��퉧�{�8���ix�7�#e*ۋo1r������$dž\���E��--6����������H�.�+�akh��|m)�$�q"u��>�O֎9)���bI�\H�,�?��hީ6�{�}`<��T�ց�k���\���!E\���bD���Lt�I���g�z��q�����1Bc�m�M��/5y�܏��/����v��؋�e���u�L�?���94|�a8i/�g�N��!���-�s����+浽�s/�n.���g�ݿ�˪�η�+��
-+
-+P���� (� "Qcb�aw�����������&m�$t�W"T��x��E
�	E}���|�g>k����oUMU�:g�9׼<sε�^{��9�=Ȯ��6Oh�9�fl_��v��}JY��γ�r�dm��mv�Dz��6�[�D.0u��&�P��p�B��
�S}�O6����ι��S�`���צ�k����
1C0ׯu�1k;��M>w@Z��u�cxo1��b������^�f�;�����}*6Va٨�P���~o��.�?]6N��|�ͷ/T�5�M~ɾ�OBnL��<�'7RS��W�
��nT��r�mX�&���!�=�P;
3��auL
g,Y_��/�ȏ��C������w^T�5?s
-+7
յ�~œt�+�q]+�h�A�0�2nk����m��d@f��͈��;���I�y���=j��5Ռ�}�6���!I�̠�ȶ�P˘s}���M�S���NǬg^+����g�ѿ���o��ILת�Z1�W���ɟ�ڍ�\�s��n�`�L-��YL-��獝#�eN)�c�\���ʞO���?h�Y+2�YE�:r�ȷ��3>X
-+1��`�ٿi�C��V�YZ��N��!c�&µ�9�0q�37S��i�?Y��C���į)y�-cR�Bձ��9��k��m�@+R���M
�C�lpK}h�s���S��L��?m�I�2�{3:�������	f>�����عD.��	,�H�6K)�]8b�*�����a:&t�"edzyǷt�����ł־��wz��k�G��5-�o�ֵ��/���
�.�U#T�.D(��ڕb�X����Xĺ�z����^������VJeRzo�h�lK>0��ảS
-+�Վl6.��EW4�̘�<�;R�A!�c7��r����~ג��3�
"��$ʍ|d��`�(!83q�PO�Ɨd�Q���{�v1��C��1��9ϛ��:q��4T�ߕW]�K��O�}�ঽ���H�/��m��`+���Z絼ͻ������e�qt�8tk��f���A��Fx^w����'6��~|�$���l�
X�����Juem6Լ���i,��q�>h���(��'13;G��Z>ڤO����x�mv��ġ56�P�g�s��%z�B;�2�Y���[��c e�C�gд^Ϲ�����'�'_��\*�W̿�6m-l[���VZ���ӈ؝�o�%�p_v�`��(}����̿��hc��+���|��:��k��՟Qb�v�P��Z��/�4y+9�=�HM�Em�끲�̼�4(���cQN���=}�����U�CwmԦ;�ÚU�>_����x���b0I�n���]�� k���*/�LN]?��d�h`w;b{���� ��fy��f����w��:�Z��φ w����~��v�W�כ�kF����Eu�tDh�{�Dq��d:V���H5ǩ_��1b|�E�j�]/R&Eǒ��Y��2��c�A�A���)�^���<&\�(iN|�+
-+5c
�o=�t�.�co��׽�d+k+�Ŷ��a�qr��!��8��H.>���i�X�
PiKm��p|�7�xm�f@Y8�lL��{�~ؗ�o­��L��E=�����r���qw���y��#������j;����'"�O�Uo�� �Ɍ��yhD{�Bi�aY
%�8�ΰ
-+��K+��.��<���c��v4���`���G���J@����q��lg�r �~S	�s��(��Z��,��P�ئN���������'d�X���x0L��</��o<�&|�¹������\���8�JoD��"箎�)M��t7�ʤ�I�ZS����}�1So�}mH��/1�����+
��1�2Yv�@iL��$�qr����<��{�a|Ro�Gy�v::�˞�6��������f��Zi4���x�>���7i��k}�;i?�=�ĥ�����=k|��|䳟���lX�j�)_�� w��Kz��+A����#T2>�Y��ir���
-+Y߮	�n�Y�;�S���.3��8��+V1�%f�H%���L��
�x2g
z/䤰R��|�y�����^��f�<
���AZ?T�5P1�?�s��C=*��b��"z4�~i'ֈ�;���><�w?������3D��α���?t痿�ɶ��?��@�E+)��9�9��e/�C�!c�!�'��5Ɛ1����K�q`ija0���`�dV��l�'��.�U��Z�
[xhߴ�?��AD��B[��Z)cUL,i�[8j�9G:�/�]�hT�1u���+
2,J�[g����C�u������ص��V�J3&��	Ϙ��<����f�k���/�ƪ=��$���fM���lO��+��כ�D�QgL(���1��
-+����W���[���ʋ�xD>�L�{�!��a^3Sdr��c�/~���wֆę����f�$Z�/�^d�E��06j��gŵ�%��7���b���A+��"|�?��+^2�=_��F��m��j��
'.*sgV'׿�k(\���7���;��D�����}��z�A����&9�@ܻ�W�S0��m@��
ye�W�|�$�O{�3Oo���y~�Ooؑ�E���O���c��>�a$�a�_��q����ӷ>O(x�ͳ�g����T��\��r�.��e�!�����M�|>
�cQl�X�;NmO�ce.<8)(�}���y�k��l�dc��j�Bd�=��(����f�Q����
T�Ysy�'��II�3��=��'��
ϣ0��})X��?��Y��;�w�u��Mo{�����/��ז��ќ�P����J�v�7��^}H����	�z�'y*t���+堕�Z��h�[1��@�E/п��a���Ts��{N������;���DžP�#*{�ο����~�e�w�"S����_��P_c�:&�c���}��z�~��*X2��vGL(�\g8c�����t�Dn���܀�t��&�Y�ɕ��4�$�hӜ��ץ��
	a#�,~��wR���|�R9M�G�hb3X�)*�Ёէٜ	m
-+Ր.��#{�^d���d��yȾ��[i	��ٯ���[�1��̀�=cͧ���G~T���%̛��-�k^ʵ�K�b�Nys
�acfX�W�J<�(B�`�[TT�pb�V�X>��`���`:¹D(�jU"�y���-��Smv�b�Uvp��HYup=X5O9]�7+8.x��D�j��ݘ�r��}u�͇�܄���Ϻ��*|�z�����\a��yz��������
�����S(������p��:Ԇ��[�H�5����
��N�$��m@>����˥y���&��}_�/`��q��A����=�+a��<���%�e�!�b�Tȩ|��D1+��%���� �
-+�k�Y{�;�,x�����W���|��y���[�k�kA�/�+���Ax�ᰄ"$wS��K�`㑻Mi����oh�̯kY��[?�����\�>I���u�V1k���s+K��P�PژdԬԟ	��]����̱�A�:���Ĝ�^ƲE���ߖ��~�s�#�k(�d��wCk�Ѝ�������t�w&=Љ�@��TC}$��R<��o�j�}֍&xʤ�Ym8]�7d�@���
H���9��ƍĹ��d��qTq�o_�6s<�������ol"�
�3/��958�$8lh������S����fm���� ����UGj�`D��81`�O�4��n�0�?U���@$|9�p@�����Hص������ֹYȒ�Iu�o
���+
Q�����쒐�#�����0��uJ��pѾ�
�1�])��vԐ�ql�֯�K{������˼���'_�����}2�
��L�n����׿t�4>�b�a��+����1/�ݡM�Vi|��h��ֹ6s-)>9�Ҵ��֥�[/����T.��ܢ��9hld̖��䘳�B9l�O��K��XS�ݐ�>�����Eb���C����8y0�8c���&
��
6X���Wt!�׵���%��86+Ѵ�E�������[�����Qv�%g%�����j��F��y싗z,��5�ԍ��w��M��[�z���Y=�4��S��ǻ<t���B�˦��4�,c�h�����d�*=#���7��HC����x�R�x��e~ ��10"�i�I<Լt������#�g�w��%f�t����@DZ5�$c쨟��<�Y�1���J���
Kda�����$*?fS���!׸a�4s6;�c^y)����mG0#�F`����	_[C�j�s&&@^�(��8R��!���~�9�����ϜRߠ�fY�klB�gQl�v�B���~�ߌ�d
>��I��3�+��b��s�!{��S?��EMb__Lc1q=}�|꟡���@~�׹�D�m
��(�Ŋ��|����]N���y��ƶ0ȧxC������"�m�/�j3�
�7+B0s
o������BK#D�2<�e6�ԋ\
��I�%�
�y<�M
��q�a���~�9�>����l�cM�۫YU}G�\|(v"7����;&�a�b�O�#4<����3��AT�,m 렍�LNFh��R��о�5�<�e�Sr�>>Yǭ���S�^d�|l��6�a;�/H����&�ē�޵1?2��ֿƋ������ߞ���_w�p҆�YpK�
-+D��J'ӗ�ꕧ���M
.V�vш���r}�o���`+��߶���2�>)�.|� ��L������*�O|�-�k͌�ﯲ�G������\�F�����4|F�s��l��t"k]���cV!�-
-+�'��3'�g,Tab��j��*��h��4��2��>z�d6��HC�ߢϣx��;_�R��X�����h��XS���>�Q��ȁ|{����d�!���.��0Xm�=�n���+�j_��gO�֧��Ֆ�>����`��Ѝ�����ӯ�?4�,��F����+�1����:Ai�����ҧ��k��WA��U�tj�����ؕ�9-v)��g�:~��HL|�:�\�Y_Ŀ��@m}8������y��f�o�]O�/�X�
-+m��q��yQ*��Z�������k�<"��[N�|�kO�=���G:w�Ώ�e����E�׽�M�!�FB�2�:�^��ʠF7��aw�Br�A;��U��?���T$�� �~�8N�4�U:�{*e�E=��e(�i��t��]����ܿ�T�8Mb&EM�X�_fbl���_=ek�=�M���	^��־�n�a��,ն��F�u-��Njo)o�ֱ�V�8q�Q��z�< �a��^��vhGT	�,Β��،�ƣ����y 9�U�@��m�MІ�(6��p3�&���>F��ղƕ����:ﲝ��yyn���jS:�
��+�
i�ݙD�]l�oM�3��v��)�nڎ-�o`(t�f�C�~3&�d,�|3"�2�f���`F��#��D��b�n�s�e����&��=��;}+�A��y�ԏI�����qq���㙘��+�}�a�9Z9&Ldξ��
-+�k2X��9�}����?>���8=M�_����EA��=���D��>�q뭷�^��o8�w��҇���=~��x2Y5�u��>ǩ?cT�}�H���d���۵﨏��)ߘ�i�q�����a�ws�}��42�u��1�5��t��`�v%^���5R�cU�)�V�g��r��C�u��Q�u���w�Ϟ��xFo=�m�)G9'����9���?�&{
-+�P����;=���p��uj���
Hi�sԩz�8�a��Pr�r�/�r�"��$Nv�Iz
�~�ql�@ƋL�=���~'��3���Mľ)St�&�>�>���h~����8���R� ���{�w���s4��Y#��L��
�T;�q�0��S!)@�h�
F		t�Hx�u<l�+)-��M�.9Ũ�.to"��D�|��A�ٜ��h5�#UE�31nu��
�n⎛A��E��"lcܤ�0zLil`�%����}͝�p���y�ȗZg��J`�E��;[��eNt�i�K +���kr�z����b�'��6܄Zgp��G|��Y� L��[?0�X��o��t�J��<C�~�|`�
-+��$6�5ʙ�"H���j��F�fv��u���+h���+�q�uơ0�gs�}����	n��J��"լ�
-+y�c�z�q�5�T�
�5G�:E~E�UoH|�[ު�{�����O���'��+��7�nӿ����������O�����(�#�&��6� �6Ev��#O7I�ni�cZ䋷X2}��ι}�ڠn���j�l�,B�K�!Ǒ�{I@���x ��
&��Y�2w���Gs��]�'�����q���q<�߾��ڳ����e�֘��j4h⒁Y3sڀmwC=q����LIqݰ��c��r=��8^��5ϧ��go��?mo�&�tbr��>"�T�i���[��c�����ˢ.���3&�Z��CV.�|��=���͟+�m�
��n&�!X\��
���Q�8���]z�ζk�}��OJ7��x�l���>v]w�"&9@iss����EZ+?b�
-+,���)��<�F��%=L�(���}�s�k�d�=��E_,ы�>bN�s=2�;����;�t~�� ��<]����g��av����Q���+��<��CJ��
:,f��z\dV�T&�2��6%}�ޠzū_}z���io��+���������0VZ#:��ă������$��	,�+�=�҉}�~��5iC��A9h���C�˶t��??��?��/����8�Ɓ$D��g<����p�ׄ>-�r����4v�I!�X����z�^V:/o�+AJ�6~��p�A#�e,��Ht����B�s�P?{��tꛇx�������'�dh+_�R��v�+�
�yt�,���Mv����>�o?�OO���O���\
-+�7
_�R"�|�&�J�r��]e�G�NzhPr�gP�ԨGl���]�y�WOfj�%fy"�5��Wr��zLN�%��u؀���:�"k>P�ZY֟�\C}	N-�%ċ
-+�����6cX?h���])v�{�]eՇ:E�@�C�]s�)�!G��K���0���\�C���1����m�+��;��=p�L�ot_�����'����x@\#7�c����M��Y�ysI�0_��z�:���'>�c]9_/,�H��̢��rHn����X^��֮?�?_
f��� -
��ݡ�IZ����tF`�}E.ʽ׏������H8I\b�m��]f��un#����G_���Rf�2_U2R
-+��FYi�}w��ϼa-;�{���}�{�;�_�IЁ�/�
-+Η���4sl>g'�n��+��ё���o�n������'���u2���Rb�Jݱ!�8������R��w��5�n��N��z��>�)�9Q
�qhG�C&q��;��UM6>t����?{�����i��ry��x��H���`��;�f��R��y(A�{�r���; u�R����܊�
ct�������N	��������u����m�L�ǧGcq���B���ְ�ρA}8���#���L��A3��,n)v�Oh�.��Z:�d��+#��i�?�y���p�b�1�o���R�ꗸuO�8�aK��Qs����s����
�a��5^�A{�f��K'4�\���7���|�O���Km����W^�����jB'���c��O���^�_I�8$o�͐
9�_5
ε�+�1�/垪Z�M�����v�VJ�`���h�����\��O�f�5�~ѝk�"�:�������Zc��k�o��|�
�̯:Fn�5�K�lk_J*�A�o
�wR����a�%�}_�`%����m]���O,ƺc�����
V�����k�xg
��p#?�E��>�~��l��qHs~�1�1���YH�#ޛ!�^4�:W��ώ��o�H�߀c�|�;9�i�Zme<�R\��^��f����������>o�b�������m�Y�������|!w�~�
�(�Gݞ�4OqO��nZT'���>��@��������/"����_6.��u�E��;dm����Nܖ�e.tK6���w��Ů��!�HޡlI�A�l��3���%�ܡy`��M��O��A�����C��!N?��0ƀ�~(���7���]6�l��N.˃\�)
�7^�>4dܨ�#y8�ɗlz�[5H��
OG6��hdJ�T��2k0t��2
>�r�'�+��=��g�����w��j��b����:r��r�y.��w�)'�`[V��X��0�h:6�Û_Ib��XA�W����N�!�����O6���}����A6znN��������!�@�%�'7�����.����)Oir@9h�+j�g�.>2�Jv��C1�v�I�4knd�_�2N����8����Xp+����(�y��$s��H�f���s
�9g�%*i��aMNؓ����2|��'G��O�:�[��ڦɘQ�^0�e���VL��1�"Q;���J�;����bos���}� <S�P�.�8���
-+
Oj�L�7���;�����<0�W���mv���l竿����
Ut���v�f�O(��fO��-�NP�٢{D�Z�9�r���堕�|��t�����=��as������#ir����A�{��8	����ؤ)˕���X�����*w����Ō}�[j��G��[6����nJ�Nbj&ּ�����bq4�H�sX� j)���C�^��ruY+���ݼ��f3��o �&7pM�&�p��L�
'��Mm�<����QT�T��U}j{6|wu
-+Nz�
-+�z|бHX�c�J�i��r�qw\�*y�m�f����-j�F��Ϙ���(s��}��g�c��!?��WN�����dZ)��E��z�y�@��uz���׹�Y	�8%�g}R#�2��ł262~���qz�K_�|q&_�I��R�����[c�$��ׯ_?���`��ٟo�(q�[�	p�<��\�q{��?c
�
��ZYk�e�:e�(⥃�ٙڰ�9'��9kŞ��f��Ka��j��@��|�ȅ��2#`M�G�>���2����<��5�yꆉ޼���%#�~�|�=�C�BA���E����g�=b5���(k�=��GKKT�ϼ��*��!~�]��ń�'Ns�?���na�./nj��dR���{ϱ8P�a�/	���2|���_�_�]������������#�s��������G�{�Z���81������T���s�>���^��O�bK���q�1e��#�ޮ�?�J������\|(�h׆�!�Q��/�`���n�q�����`��0'	�B�q_v|�h��r!���ju^�o�[��˚�_ř�U?�s�+v�U#��G��z��<���Ѽ"v��`�D
^*����fa��o���MU?��䧘�`�0�
-+d߼d̷u��#!ףe����4��}܌1�Iji�yc%c��L�տ�oH짢���3>����,{��>��xL��`�5���S:s.�(����[��+#��4���"4O���Pl���h|
-+����`�m����0ύ3Gd�2UAG<^\Ғ3�Z�n�S?6���g��t�I��#?E���'��4���ǟD�|�D���M��U���?��Y���u���@�%�p�����&�����Yv EV�fH^���:��QA�N�hs����|y�YiI�g���]?���׺�3�P��J�Y[��k˴���;vB�^ya&-�� �������Z������5�k� +�{���G�
�?
p�ę/����>T��ڔ�����ncH��T��&Vx��?\�pB�8����o"q)����яy��Sp�
3y�	r��@�R*)�}��l��į��Y<��7��<�^�Ă�o��ɍ�S�Ao^��CIp�K֥X�G�[���"%�r������I���Ԭ�.����Fr�ԃ]it?�A��G�@
-+�	&�3o5�
ֹ}փQ��1�]b$�y�'�9D��?��~֙Ƹ��^㑳�P4�s��ח��53��wlp�2�v�g�[���`(�o_Y��u���~c(��7��z\I_���d����0v����b�4�
��0�-z-�=_|��]��Wo�$k�����X��������|�A�+E��"|�n�<A$,�'C��]�v9a=����b�����d��<�t�U^�����e�4�5��8P��\H��#1�)��`�w$b��:qf��
6���H	^b�c����G�
�X<��m�	���x!�7~y���YC[��6�{��cT���A��U9��O���vn�xcn��h��
Bw��U_	?~��Z� 7�`F�2�f����oW��%��Ȳ�����l����i��%�9���
�������܌1���!45��'A�)?���#�Qz��O���
�+�Q`�y�Ĵ̋�5V`>�?��-�z�ۿ�O�WN9pڜˎڵ����u��6
��7���~��$�h%#��?.�U�tVK���C�r����������"2p����*c�ށ{�È�����G޻8ۖ]g}[���V˲,ɲd0`b0	�ȃ�T�a)c̟R��!1��Cc��
#����`�H�zv�$$����1�Z�����n�k�1��c�9�\k��9���g~�g}8�P�R`�
��GOde0wH�c���߇lF/5\�>�V[ NYs�X�[���c�E@N9���t�na�ԍ 9b�����O��,>�"qRCp	ĵ�s��l��m� ��o�����C�^�¥?�d%z$�D@F��,p!愖̈=��������S��	���k���y9E��|���7H���
��+�ԓ��]t�
��'}�̲9�5X����92i���x��:F�W�`a��-����ݛI�c۽����6����f���$�����
&q'1@��_k6�Ċ��*c	dNx�1��1��48վ�Q?�qj��6yĕ�޵bn�6t��$$���]���|ې�����>��I�~6Bִ̎�Rz�5����`9:&���KƗ&���:F&�zM�P�-v��~�
~j�?v�Ah��c��䚴�~r��0iƍB,eUg�
-+�+�k��v��o���蔅���I8�M'�_i��z�:��g�^no�q��wf�[�b]kF��ֺ!��/�b��}���O_|����+.W���5]D�Y�K�n�����b�����2nk망^�q#��8<��?�������A���b�&��lZ^�x��03#;�E;�{���7��%R�E�ʇ�&
.D��]�f�1�ԓ17�1�T�{�0�/2?h`��u6c�N�U(�+�Cc2Ms���v㇯�v�.m��k�;�'�s:�s
]^|��97��Q<x����!Þ<�+�Bd%�/����A�������C�_|�~e�
�v���|�dfRx2�����}�����Ӑ����_��\��z}cu���+�5w.c
W�S`�G���?�������P�-�t���#}��A������=x�(I*t�w��y�Ž��~��ӹ����0>�`JR{F���y������*�c��8>`��(��$��|�£\��A'O����J��3l�?8��
-+�Pk1[m]�ް��K�69TaZ(,�PNn�� '~�s��tLͱc�]+�l���vh��<��\`�����>�a��13ɸ��&J��y�� Kpz�1�~�x�#��������P��<�+qiX���pWffzM����?�k*}x����X�+��Z5&��y��jM9��x"�ض~��7�?�����o�&ej��u��I��S4�1+�X#3�`�]}�ClG��~��i��
����4�(/?�e즮0L5��&=�.��l�DDg��W>>O��+/��~��K+0��y�`v�!��߇��L[NiA���K�Ȉu��r��/�����q���Υ��oZ3�l��ז���&	mLd��aH�c3�G��ft�O��}y��N��L���F#B��K���}�Jj�|ވ"B�>��ۿ�W�ww�ׂ�?y
s"�Q7/�������o{��{���b�Vߌ/����(����@t�-
-+���C��H#{�ܳ����?p{�����9�3.Ȉ}�洑�W~�������O�~���Xs"��&�;y�+�����(D�Vh��% ����db>ԭ4T�>yq����y�
-++�o���y������&?�G6��`�B����P]�ģf�H�f�_����]�h�:�7y��T_�d��|F`�؇@&-S3�>ho�K{�����Cj���ku��{)��^�f��TrY��6S���\a8��?h� oWX;2Ͼ1��3� 46;�z�����
P׆1�q:�K}#��8o�����TO�xuvP�;�_	�_6�f��Py���ٰKqB���^o��o���$��������i�3�P^�����=z�?�?�UaQ�����ͻ$J�}3u���LN,JS
-+�4�h:
-+��3������7s5>�!�s���b�Q:[l��!�ʴ�����0�i���a��@��A5��P
�^�Qw�5k�1ش��ϸ����u���-������Bd��N'�^5�+V�6�X��m
�}++ml"����m|�O�a�>�tm�84���=#i��?��}�8}�>g�jmb�[t!,��=���8�Gh�m�햬$����;��v����RC��C#H�'�x�z��р�A˷��+�h����~��+�k�+�J>��y�?���N��r�F5���5��;�W���|�c{��_��g��H�+2��/�9w�Eȸw��(��
-+,�����\1G�p�7��b�(�r�R��g��v�(������:h�&&<�shk}y�l�8m;�8����+:_����ȡi��k;t�R6����ù��;�K��&ǵ������T���.��J0�	ƹ
�|�=�y�G�mDA<〃�3J���d�m�?�����3���zj����OyGZ;�ك��B���/�tx�'�4�,�3/��������<׿Ϲ�3�܇��(��k�[�T�����m����.=��#H�o[:�i��������e�������A��k���,��K/�j��O+��\mf�w`ضЌ�����ޟ������!�ި�)��6���oK� ���~:-����-�Y��N��ES�bl���Qgޜ�&%<�o��#S��3�T�a�ԗ�D�}��SӋ��сg��	�7��D:
-+����ֶ̓M����i�偑z�1�'����dp�=zF�\���k�}������(7c�;��7��݇�8Il�In}�z6+���{y�|��6��9��J��D�$��`��Z�!�ըX[- ����,��a���<��^�i\;~c ������x�37N9ȍ�P��۹�/����0�^����3��2.� ��
-+�Q?E�m�.sޘ��$�HdA�eO���'S�Ჱ.��8]#^Z�;��u{���?c&K��'����|�`�����m��?ׂ�t���F��q"?����0&
-+Ŧ�s�Y�Ԇf�t�K�u0ƍ-1kʷӢK��o/5��R
-+����/�/+�*kl}�q/^pg�!eM�;����2W�E���P%94�Q�;��(�����IG��0bG��W�NƎ�ʿWM�>˿�⋟�r��㠚��o9�՛�1i{��ھ���~��W��"��k��ʁ�҇�����x��/����s��^�ڬ-�#
:��.������
-+=���c�H`p�2��_+
-+� ���3?�f tg$z�!�8'0�d{^�k�W����z�{�!���=�ot�Vr���O�_s�������O��?w�7���
-+(�ZJ�N���)��A��'c�M���q�b04�t
�+��tԌK�:�E+���u�����\��L��1ّ��Y�Z���3�������g�baT̪��4;����Y�>�#x���2Z�)2�,�FǾFh�2(2��ä�S;�l]�v,�抌
���ǎ5�N���
-+M���࿐�
@t^�[��s�9j4c$rׅ<���sYȩ�@��$��7b��&�>d�殔����ysJ�䔨"2�h�Ʌ:��ء��Ƈ�)(���2�LbP��!�Yw@���
��1� O�
b���qDM��ǒ@B����5��RѺ75��t����x^Ǻ� o�*="
L�;G������;����8�+H��v��B~�,l�>}�x�R�c/��bLe���k�Z�ID�P��0#+w������@s�ٲ�?��7���FY+�SN�[n�ُ䁓Y�rZc����"+�n)��?���@�\
-+�v��zK9wn5����ԒVlS�u?���@2}�7��&ƙ+���\�	Sm���k�����<�~
�sm�Մ �A���v�P�M~�����Mm�?h�2~g�2'
-+)�󜒜R��-M�N���Đ���[S�� ���Yz�z%�<��>�B;�h)h]*���j�1�t�c�=�����]��'�������&<ة�Zɧ
-+\�1Ŝ�k���X}x�v���8�m���ti�c���QL���Q��ԱA�I(K��������4˖O>�h��n0S���0�5�]��z�Iʱ*tSdt��	БA-������	Y����R�A[=hQ���T�����ɑ9�a�ɥ���ν�Z�z�cA�詗�t��u�0����c<�E�/���Ad�
-+�]۰6d�h�s
�Y3h��i���9x악g.@��F-#���,�.�+_���	�Oõ���mi{�|��1g
�X2�w��N�t��>��]�Ž�������1>+?857��Ư3�H�PA��r�����&��xS�>@?7_�G����)�M9@[Z�����;�|��ı���;����a[,���c��D�u��&$��`�a��v�����y+��A��"-�2�7v�d�hv���&O���"#�0l���'-���n7�+^���s�B������+Q
2Z�6���k��{��uCi��7|��7��0���	��]o>"�y�q�Ï�"�=��8�{�1HN�x[��9�ʯ���_�/��4��=p�g.
\��&.���w}��	�1�xF�!���o�N��'&�9hR@q�ȅg� =U���w�_������0�?���x��=�Q#�vC��+�O�fy��Q��#��G>|�s?��o_�������5xk����C�w�`�T��Vm�1+5�J��Qjw8����%�=�$��k0}(�+x�)����xA��B/럇��4��U?��]�ū}1'x�#��n^���'�Q|��
�+�m˯����iK�<��/��u��y���� 4r�Ch
-+�ii+;�?��V�uľ����&�����66�[r�:�w��7pxH}�I�ʰ1��M�(C���f�Sk���Dd�+�v��d�&q�񘘑j��v���6rh�Y���	�7r>�����բ�+D>�ʟ�J[�[n������;�K�w�-]
���A���*��W�{��!�	e�4����w2g:�)VM�����)�!�F��ȡ^
���_�70�}<�Jtchޱ _s+ߣ�®{d3CY�V'�r�n��v)�ڔrƼ�3��G
-+N����{�,��� �J��E����9��Rq��\�)z����!�4���dU�3�f�4�	�7v9�p����
�y��i�w�U�~&�FGBa2�o�?�'0�����څ8�"&�P�#�C�TX�R@{�č���G���.����e��R<^o[_(GǾ������-�^������Po���͛��N��2����O|�_�W[@��+���r�E��cc����7:Zy��|�2z����U�pL�����*3~��q���,����8�
-+P�G=�$u�/ݚ�?ʮ��ON��>$���g�#&6m�_)�]0��d^C���Q�zc�Q���?�o�����/B���‹?����Ȩ������~���轉���<z��t�:�	_�v��fN��[����	����â'+���rPy|����P5��E�^K:��u��|��^�q��T��Ԙ�d'P���B+��Y�nn�F��������D�Uڛ����~�M��;�憂4�T��+��9sMd���S=�!�N��r�����w+��8��&N�����?��ӷ���}�����!p[�R��_��n��Wv���W�/���Go?�+��B������g���㩌�<����r3�ɮ���\s,[m�����h+����/���uz�c�m�$.w���{�6��

�J��u�X+S������`7��FRa"Xg���G��f��Nr�-�"��k����������ݽ�yŽx�����,"�W84����xM�;Fu�7�+TU}�1�j9��K��H
�<h{��K�d;s���)`�
��*���}͖&���	F�ҭ���QZ���]ե�� ޻tl{Y����mu����_����N��~���z!/]"S4�>_������
֛e������$޷x%9�/��O��'v
Ἃ�>�C�]\�+���C��ϕ_[��G��O
-+O�K�o/�]��4�a�t�r""+2��
"�C�Px�gi���E+��I/Hʠ�-������V�L�}}��NTd�l��y(�ı��ks+6rb!��\��6ͯhɒ�!�;�O���'���'^ʂS,jB2o�͑������{��LBd�OP�4����
�����	i�ɠ��N=	����[b̿����̈�z֟���־Q��@9�
6�Z��snZ|� �X��W]_�}��~���CiT@�^y��L=�����5��G�Ub�U���u���Oǯ���<(&@�b�3T�A��,,L4˨���+����"��S���z����������]u���ɘ���
��(�	�zߞ���>��o�����/����n)kX�W�{
�z{�'��x�N�/b>��$�)$ �!�n�Cl�O!Qձy�Ϛ�Nq
���&�9�h���l�d��$ώÙ��
�!^x��R!�2Qɭ���e
�C���ё#~J�tL)t���W��㚄ן\ҁ?ө,k�x�����M�l|�.����*���B �~��p��[��E���)��X?��t���?o�����¸&��Wi��9�,��;�[����q�P�%�Ll�
u��]�*�B��C�͈4wF��7�#�?��k�ݦ��1.�Ld���O}�3��6S`���/5VL��u�����=1�:}���t<��F�O�{e��e�^S�)��`1~�tw�k~D8�k~����p���)��9��Vx�q��qѲN����_懟n��
-+gd�Ð��Ѐ�8l��~h�x�����F{5�=B�
���b�WW��|�@[�����l�&+��H��Q~8@�7��D��`���Y�D���-k�n�<4B�@l����@09W����ڂ{�S�?4 �E,v�'N[vtH#(��<������q�xp�l����U�XKYz�/(k1FԵ��GX}���jd+��2�jK��uy����u�`W�q��&��v�׏�z��7Oҫ<i<��=N��7eWz���3!�^���K��>����
-+��(���\ٕ_��ѫϕ_������˫Et�aC�k��"�a�;%�׾g��n%l���i=(b�r,�G$/Si
+�c\�'�1e8�&Td&��l̡�I��W%cGd�Vnk-%v�N`q���#7���Ӹ��S�O�Ey��g�BC�FFf�84go
`w��~ā[m`��
��[�R��Ǔ�������H����.w�a�����Go�WX�n�o��k��l�T�'�X

!��B7������ߝ_�G4_�™���)�j�oP���ҜZm,��\=T���8�l��N;�g�]S�tE:���_L����{o��{~�+�!�9D2 ��2�;���>�����۟����'mN<�5���	x���Qr���<z�5�yf�?��S�hxb�:�%�$2��X�*j��5O��B8����y_�%���^,d�7�j�Y�+W6�N
W��9��D�6���3��(���
�4Or�+��8�ơ�y9k�m�W�٬�+���+����F�
C{�350m�c\�fqp_�^+����7�ݳ�Wp�0Љ 6���nyd~B����!��C��2/�B��c��E�X����'��Bi�&�Ę�!�Q�A�Pg:���2:D�C+ױ@��+��@!y����Ud{+f�I
��v���|������</��A9P-]��������e���3������ģ~�������5��}�>����W���!?�f����Ed��������������H;T�-���:D�o��+KRe�]^������<�G<�¯6�Th�����x����Z�o��w=��͠�y�@�M�o��t�
-+��++�5�ZcC�R�&l�[���q]��N��������9n��mV~��
��q�
����?Q��y~�ӟ��@���?���C����s�eCp�����Jr/k���7x��u�b�W�+
�bCy����si3�����Zs��32� �nF~U,<d��Dc�O�W�o���:2���~~b�U��cNp�|+k���Wy.�L�\i̽K:���������������+I�.�$�<GV��튧uj���I�G�{�����Ǿ���B�o`��|V�a���m�ۮ_}�/���b��m,�.m���v.��\�<^���������g�y�����=����9Gb?c��^r�ݧ{����_>}�š��2�T����lgM-Y���ua�����������r�EGV�e���O���1�`G�Lf��d$*����]%4���$�'��bC������6�K�E��ʃ�����Aq��l�
�XdEn�!�}=�PH�r�u}���b/|;��^©����C-��.(���Ќ�S�d��M���6fؠ�������ǡ6�kv�`�%��fK��b�oG���$V�wҰg�(���e��g ���8��D_+�L����$�U��G�N�(p�K�dU,����Al��/���
��G>�[��u(RY:��f���o����i������jP���,�u���kW�H^07����g<���ޙ���������~Ǖ�
-+�W��/�a�}������O+65�����U����lj�xxlc�qƂ��B�Sw3�~��o�&G�88O?�����
=�G��%u�;m<Nq��(�I��"94�E��˯3@A~P��#`�.<~952�S�L������çʿ�J�~�W_hxGIx�co�+W�Q��#���<��?�N��sN� ��ɿ|�}��'
|oyZljA��I�G͖�@��Qyq�Ɵ�Ǧͼ�q?F�1l�X�j�>sØ$��b�5'�%�Hh2�I�U�T^S,0 r�`}ı
;|Wx���G�C�Y�b�Z�G"WN1���o3�$��?��b�Y��y9'ۣ����%�0�W��PZB�.�Xq�6�v;��pj����7T@�˜�!q���PCJ���o�O>�;Y'`���x�1�����C�**��;"��^��7������|�>���M;j�slrɋ����C+g��5i]��4������|SI!
�ֲ~/�Am�����㡚zbN{�:�8�R9���{|�+��T��2�fD�W���3t�GTϝv\��C�<æ�9�lc@|cs��s�C�c� �d��V*o Ln3Dʚ�"$}�;�΋:7u�a?�He�d�:ا^Ieg���|�I'�c
-+�(K�2m"�V�����F��3
���������I�4)+�����q
�Yvrv&�';���V~�G�~�����>� ����d�z�׋�y���?2�#�!-���Q+������������[���K+n���U�ohY���%�%�OVy�%_Y值�/���ڿ�NN�:X|��aR�U!������=�D9q�l/����]>'��\[�5�5��}}��^�L+�k#�/�s��>>�3m��+�����MX�������9�'�g�ֱL�D��97���&��>�+�]��8q8�z���6;���ͫ�=�@�ބS��|�7+�)�Sz�uu�_|�{�˿|��B��|
w��W+����������� ��SI���:XK��d��Pwn����.'�]I�7Ћ���d}��%�x��7y�M]�=G��r��"2�'W�����z���h6�-�Z�|�$�푨
Xx� �D��7��}M��
o����t�r�C}��uŜ��t������o��S�]���Hp���o�r�H�ȧ��I;�>�fl��_+�^��-b��M0V���R(���W�L�Hvt�|����"��S欍��o��X����w�&�:럴/J�(���sP��n���o���=/�2C��мy~���+.�����lƎ(C���X�y+�s�Ÿq��*��S�������?(lԲ��]=~�k)���_��R���������k�)��h�`�<�����B���:T5ߣ�x �ɫY�"?�r��ys
-+?�!�@b���ʭ�?
��ΐ����٥rJ������sF�\g��l�b�3�Ayƶ~��9���
9�ʙ�$2my�_�`g�~���bo�ȄJ�����IO<��q�L���'��
���7��|.
-+ֱ�n";���a�n0]��'�̌��1s��Ď�ukjR�ɢY��CA�����@G}ǚO.H�Bzca'�|�{��1��㟞�[ެ�g���/���G��Qslu�*T�
-+����ɥ��_��
�������ɓ��r
�����%]��lX5� �O���ӱ�"Y,�t��v@
�Zu��v��G3W�u�»桫��S����,׾	
z��_�Nx;�+��.��O>�3ޤy�% ��K�;��+����	kڍ*��wً����b؃�N^�Y�]�;�mv�6`��@����Z<t�?
$���C��`S�R��$aJN��_��m/�y'�]�4��[��Р�~H�B�؈�bY�>�+lK�K�IE\�W�-rj;���o��z�������{�;��&�Xn�Ն$����.z���ۼ��2A�	I���t}�:Z�0����+ߤ�C����sC�H��Jn�r�q��C��q�%U��*��P�
-+^h�����;X2ڥ��Jӻ�W�X���}�Hld��F�;ګ+�F�B��4�
~ș#x��k<���&x��˔y���8�I.TC����c��xS�q���ij1�2��8&(�m��5�М�m7+��
'>VⱸҟsZ����+� 9��A��CG�=]����D��L�Ć�,�r��
-+˧�D�~�{5����/�V��!3x(-��G�e���p�S'�]�kà��v�E�h�I���@�=����TL�'22�N]$���hlr��
-+^��x<8��6�d�t����c�|<��`셐T��RklĚd�Ύ	Wk&�JpGbp��J>X�F�5��]��b22�`�o]���;v����yp��dFPNX
-+�bR���GQ�]s�e�*âxyN�{��<d��;�6���A�*>��7�Y�.���:Y;���7	|>�4o"DO�?1ĥn��Frd�N2q�lvj����<c< c�A��|��tr�e_��3x�1$���g#��������y0̥~D�!�ϳ�"1/ڲ6B�/7�9\�J���e;_�]���g���p��j�rd;�M��^��uo��ʝ�:q��_y)�?��O���.`�i]��-�\Z��[x��#�B�4�(Qo< ��i��sn��'B�N�#t����g�A@�����z*����6c�@Ps<����3Ə9A�
��	�DWsNf�h����B��%��֞��4�mT��a0�'��l��[���Ź��ὧF�;���r;
@y_��&������sa�<��s�`�G�1#�i�ݽ�8���'�ؒ�8l;��W/�A�'�~�����>	;�T��;�8mF�b�h�E�CZ]L�#@��W�d�G���r�9����A�
-+e+�C��|��ۿ��zs2i|�+{u��:A�P��z0������?}��?���1�Y ��Cz��]���~1$��ث������Y���(�ؽQ�۳��q��4s�Zb�,�x��9��<)b�i�7�Q.�.�C��+�s���f���n�͝p�m������P:$|p�s�`A�jk��ݛt����X�p�Jơ��j79��G�󩭡�^�����<|��X��O���W��5/�����Y~ǘ�i7�|����'��P�x�Gal"���������_ی�5g�{rq�+v$�[��DZ�H���P,�)/ɚ�j��N�7:ܱ9c�������*�r\������1P(S����<J�!`����1��<?Su�e��f{���x���m�u�D�qj���1��[9�������
�h@��[7u��5߅fj7��]��ǵ�o������!V#��]�tw����nri�GF���>:s�|�O	����
�o"�1w��l�?��|B6��V�Kz���_ڿa�]�o�^G�L�UP/���
_�.�e�-�k�X��@w�8���5{�k�M~rLZ���O+NNh<j��搐��8�a��1�����G������g�&�3��Z�X�r!�oJ�;ճ�u5�\�<����
-++R'�H�>!�ԏ=���u,�	�[p��e����3F�Ɨ-��.J���>����/��o;���4�=w����^�s���w�e�=y�džM�x�Y~����/��_=��?��ӗ��QH�_�)�����}"��:��<eH��Q���&sI�mSj��iߜE���
,z��a��x9&�M�S��ɛ��d�+�|�@Z՛h�i�k	�U��R���R$ˠjY����u>�
-+�)��#�N��o�zr��N�kW
-+�	$��?������8�+���#����<��x��~�	��䎨������g�8��+�?u��n��h���0���a���d �g��e���4\�gL�y1�4�����+l�6{׌����n�X��]������W<.ވȅ�>;5޵�\]��8�-v�Ï^������bb��N�X��^}����7W(v��c�#'a�����>}W��1�����愉S�ʆR��C�-a:~貭�W�h���0v"8p�MAr	��wcN�fA����Y��Q�6����Lݫ~������}������:�+Qr���A+Mr�+���V2�:�`	��>{����~�w7.��O`��M�)Pp���{�V7/��2'b!D&�Ъ5�c��Q��Ή_<Ԗk�ݰc�6v�E�#?��i�#7�$��-�
v����\�2��rCLf��'�����a@��+��Pm���+�q��qJ�Xۂ�_����7�V���8��@����A���l������h�;���%@%�u�cG�7�|� kAbb��w���8#ߵ�]T�|����Dz�}\7v�a�@X.MLE�r�F
:���M<��~{�'+a�o���F���<TI!P�ͧh���42�%��P9'���V�X�Y9I�k�M�r`����$��������7���/����b����żv�N	�g�^~���/��}�_����^�V��F��j}˽��@�	�!V�rr<ѩ?wW�ׯ<w��9��>j��-�yb�o[n�	?����5�H���O�R]ƧJ˰�teNT׽d��lZ�����Toy��#�&ᚒ_������	B����
:�b����R��&���+BRr�D��SѮ�9O.���0%�7�XB�5勩���]3���+�B�|�[1'>F��l6�ӵ�7��k����+�mԟ<go������p�>��R��R>��=�W���q�j<EkW��e��f�`����җ��2r$��/�^��F�7��W�7Pʷ�����������O?�Tծ(�`�W��Ȯ��F�j�8Ņ>쏁)mN� �;_��-�M+Cc���n<����3Ϝ���U���/>(�h��c(�n����vz�}״�����h��v<qL�~G�s���8�p�+���hkGγ���&�Q�;Ɗ�j��$h)��'�m�e�6c���bL���F��_
9)��8����ɕ1�w4��~0�{L&Ne��p`H��(�拟Ǜ���1f�D��v��@�a�,���ס�|��׏��#��xhqJ����+1�R1	j5�n�E}������#FģA�s���E������(9�7&M����"������w4�:��+}����j�7
cW�O~)�Gwd�&��y����]��}/��>=���+�+Siܕ���O���/V�{_�A�>5_��1���(�B�{�9cQ�3�u?�M2�7(��9����1�"�U�֞k�+�0��(��P ��F���f�q�̱�jS���C�
m���7��Ͻ�c��q+hPv�9��0�E��5&�
�R�u��+�.���0D �#��i�Nڸ+>� =$6V�03�æpCw-�b&Me��c�;J�����[���&9��(T��L�c+&��X `��^}��_�/�s�w��?�_�8\���?����_��9���ϟ|���������~z��9�����ǯ�}z�>
p?)h��.������ܛV��wu�(r���I�Iw�C�Ӡ�o��M�k>PZ
�ب<�@���2�O����|��ĭ�Zb�D�������P!��l������ulWx��ڮ�?�z�DZt-�mԏ�����Df��a^���V���U8�e�5+_�R��Cw�|#���Ol��IW\�-֊�O�+ӹf�&f���R�8��
@�w�ӷ�
-+uAWC@��|�%�Ki��!��X�sRM �dkyP��A|F�����<�ikv�
q�v��,]���cc;uK�J�:���7�7W�<
7c�e�Ǐl�|�
-+�<�c35�xH�?ЩRE���������Z����L0d�i8c�y�oI=�j#CܼGT
�M+�2�f�����Y���M��
-+J��ۿ�;O��W����{�v�`��q���{��d�<��}�~C�.��)�IDC�F+�����޼x�{5�9v��_�0�/���C���G��b>����̰���l�P�YܡlأC��c�z�
�u��6��~��Gf`}�
@�l�ȁ�����&�HQx
���Z��7�qY��^���~��`����14u����Z���O��
`�����c�Զ�S�]�#2�
5]�+	����{�mԹ���_�oj��m�k���Fƶ��c)
-+D���T��j��l��窭أth�ЦQj��
-+����%˳�b���|<*f�2Ʌ7��<�]~����y�����F�7�������	�o��U��xᓟ��G��^�p?�Б��u;�u�Z�ɀ�Vz։�OR2��m�3���N��������/�m����޴[���sm#�M��p٤�`Տ$�E�R���u;(F�K'8�,���Y�J=Q�����5�/�q��f(���Vӕ�qr���-̎'�R���R�"�Fg�v���;	������K��s����j�8zx��g�}f�/���+�M��O�+�WΫ~�x�e���ubࡐ
4�Am~����L�cb��t�&�g���6�r|���F�
-+~��Ӿ6�Jn�����8_++��\���0�hO4���j�N��dq�	�&g��7���3a�ns�I���#+?7�gc�N[M��P��Z�)7(S����t���W��Y��+j_49R���>��87Z�3&��s�M]�\Y�@�ЀMcp#�mM
��4ٚ�����K@0,�
��\~�s_0�md���Px�K�5؂��O)��v5"�O}n�|�N.4Q��6Jr�Z��R�FZ|��	8`�WnJ�5��<�Η�M
勀���g�07����'���qH��WѰ3p���'O���9=��w��C�nC"�.���6;_�/{��D�+z�{��������;}�9>�7m�w�8�|7�������
��w,�al<�]�
-+,��z�7O�ıL�����Z�Ǎ��ؿ��̉�����+��H�{�n	]��
-+r�;X�$����s��Jr�rJ`Aa�İ�z��T�@|gY�I��jEh���j���{,C=��Ϣg<��

�yR�Hք�*a��q��ր����Ч����Rxmc*۩n�P�f��^r�ӯo����5"��m���DU~��g�_T\�j�M�|?&
d���FZ�?�7+����~����:������7:<������D�zQ��k8;Hh^OZ�?�On��
�����1��s�h�jN�)��eC��ΐ�~?*Z���!��"�C2�{~umc�P���C�|3&8�Q+5��5�6]��
f��]�P󄩍��)����Aw��+v��Ώij�t�	�!��>팁��Mw�
-+FqJ1;�y�JϿ������r>%7���i��n�����vT��_�ް}n]��5&��	��>������]@6�J��Ue�b�����g�o���?zW�^�)�A����3�P{��R�VL@��5�M���P�Eu�:dP�]q����'(�����/��O�ғ3�}eą�qEaݝ:��p��~��Y
0��x2Qb��;��v@[������4v���B��#�ל�3���T����DI�
LQ^)X}�
+�&[�����W�	E�&�6׭�K�G�Y=VLj>����m�����8��؜7	��YK]z�v�8.F��>���D��ˊ�+?)V��OJ�u~V�3�p~��X�uB0��P�g��>�*C�M;h:0b%(}�&T���Ak�mi�v��$p�Ӳ�����=��j��Н��(LF��Ziz�{li�W������
-+t����n��7ZF�y����/��'��O+���L�
 �̥S�٩#E>f.!?:���������F\$|�L��N	>u�2 ����O�����O-���c����Ι�'�d��.���J��W	.�!̓g��lA4��2u�.�j#������cHr�Ș�q�*�56Ƌ�Ǘ���#iŠ�|M��@ ��Nj,�3�?���\��Fކ+^b������}���7 �+��F��+�xJ�
�+Q���g\	��
�x����O_��2$�I��sS)@�58Hh罴�\��$1���|���������G-�j�:9���
������T �Y�$�Z�j���q�t|b�f�Ğz�h�5���^�΃D��A\,���|+�y��܌h=���d��`����A��]e��R�b��?>��j������^���|�sɽ�0P�W����\��׸bf��R8�f,��cMpb�3��_s.�ŏ���Ė���]�]��>Op�i���I����J\d�q5���(���	��?���渣B��/��	�����M�Hx���ȵ{6�Pα~����7��[+0[>��,u��=bc0
-+2����S���b�������0]���ÿ�~�1~�
|���X��k�-��1}��������Z"�('�+��VWMx'��/�������GT_N�U���E	x�.��J�Z|k[ʁ��u��]�r�Oe-���:s��D�h����p���u����{��ON,n�WY�o�;lFÉв
-+.<���[cbڴK��Y�>�:V<�(��l�,�&f�8���xǾ��\t�OsXc�B
���i +�ˡ��H86���4J���ho\NH�;���+����q�+eabDP1^C�r3#�U��6X��/FL(��U�8��".�߹W��$p��\�Lr^�5���R
-+vN' ~���8�-
��e����!m`m9�3����m�S7�S;VN~K�3�����+��xvE�?t�y���O2��
�nvt?5���XX�bW=�Lʼ@1�'��s#��xW�Ι�,r���ȹ�I����㔱S��a�&�K
3	���SI�IxѮ=�	�@��^xF�M����0@㳆`�WA�Sxİi�V�t���x�����_��	*�7��:v0�)��3�"��ӟ��Wx��q��uu��b'!׽��W��v�ε	Z����̷a�sx�gY�d,����볽���2(M�ǩ�Ch�W��썋�_���c����>��"&�����F�w���&95�]j�~�A�����ލ{8����C%�<�S�f����3��X�k'~�0������ַ�d�۸`}P(�u�:�ˁ����d��>ttv��—T����+ő*wh��e�]�5�w��]�&�z��X��'��!T��j:��,'(�~c�~�9���ݑl��X��[�:7�����i��
-+;�t�?��-��
1E��
��
 ����*u���
���'b7ٵ����b��W-�UE�n���ㆶ�z
'G��@��_���k�S^��i�h���11��ݧ;{���kv�ܱ�����왮ԯ�_}`�t>�p�^[��"C�:��8��׼l<J�<��|�1)aR�<�Y�Y��=X K�9�X.$�{��m�-�ϻΣ��9s�Z����>�C��
�����m��_M{�9��W����z�
md�W/ɝj�c�Z��?y��'�������\W�\��.8g�t������+�Ԁ��I^Q�Ÿ|@�Zw&�!Ϊ)�}��~Z��z��]�
�`W�

�[(��鼫(��(6]���[�=Ne*1�ck�Ce��UD�a�$+��:�8���ad2�d����)-{L��$�׶(�φb��d>�Gf�
-+R��p��SٻV���~��X�CSwhℎ�+'X���F�ޖ}�f�a�ڰ;��{��G�+֨���2�4���.�
O�jɁg���`}�i`Y�yި�~��=S;����'
���e����s�����<���yd���bU(9�8�uJ+8�Z(༴u�	���U��/~q����ߟ��e��
�<z�����]�o�t�.��X�kμۊ��"6~'q^���:��h{%5�bɲK��SC���_ �=�1�7�Ѿ�W��E����!+�N�c��y�`���(�3�N8����ev�B�?Q �����W,Ͽt��l+�!;|���?L7���-_�ȃwf���~�my<{����?�����^�[��ԃ���e,�b�ݧ"/?���2�~Ћ���
��'�s�7�,�q�Q�Q�����!��!��'��l��:���Q!&9��ti>�x%\�3�̕��$��I�?�[zI-��RzlEtU��l��/��%�5��.�?�d��?#T�L�Kq���Y�}A/Y��3Ҡr<`�>0l�\�0�5�\��k8�Q!v�-�Eg��M��M��H�[�0�Թ��lJ\m~��|�#4��?0ǦO!�`�`Z蕡^=���j,���L���E�:���
-+=%� �'��w^�"Qu�+ی+	�V#�+2F�Z��pՓ:�C���mA�V��I��mĮ�M�i3���WN5᥃W��W�y�"� ���ِ�_c<`�g|������� �ѷ�z�>m_/��i�K�	%�I80~@���v��~7��c��>9�7��q ��y>�76��i�6>��?�8g*L�4bY}Sk�+�`4�ڒ�V�့�|Ͽ;�
-+3�T�T|�Z��:�{�j��|����8�X�jc��i\���C��.�����575�](c�q�q�7�H�P�%�ЗZ?� ��Z���T��ɉ�?�.���X�K�#��W��
@F����ueU��G�=���}!gP�zӇnڀ<�����A-���P_�}F>9g�BG�tz����9)��a_�K'�g��#_Z��#}�f|��?띛��6�L:Rph���	j^�P16-g���
-+����y�.NR� 
ǩ�3�'T��9�w�b�n��S�w����fÔ�j��ݜ���9']��gK*˜뉡���u��%��t�����?��n_L
-+�.d�ÿn[=j&
`�)��ײ�z�>�^��?�C�����eim�t|����#����Tf��08dne�g<������mb��r
e�Γ��-���Ƞ&��)�/�}���K���Ը�W�����G_���V�`K9"�Zը���G�~�vz���7Ӿ}�����侦��������ֆ�,�g�Ff��|�=����c��;�p�ؤ�Fa"�z�>p�~� �
-+Qs����b��W�k￦S%0�^˨�M�6�.N)
-+�Ǩ��x���Ԋ���m�h��o�0�;��gw��P�?4sM�n΍>�OϷ�NTI�W���P�㾖H�>9�'.%�
�Km���/8�cL�5-4���Wl+�Ɣ�E/xv�b�A��
����|∧�r�&IXtkWs�<2��z�/

@���c1W�_���0bj�*�Ό͚z���P%ӧ_.��<؎
�洚�;	�P�ZW�\�V2,��p#g����Ž�<��Ɠ��r����s���~~�
0�&@#_Rϻv�h|�ѾL��w�d,�;6��<V蔻k�>��I\(チ6�F��
Zd\����"��zq�hW=���H=���P:��˚�Y��2�N������h��s������ȋIk]����T㘯��w�S?8���N^�I�E��M�
-+�2�Խ跮��a�3X3�\-b�g�s�����=8��۩����1�R��
P�s>��K�?�+~>a	�!>��ƿLm�1@����kN:� m�N�K*�����W�IO��zp|t���k�~���X�i=�*7�3���~��X������&�o���¾���D�/��F_�c�.���^��{�Cz
�^+\��(H�N�� ˺�u^������z`�!��r�ͷ��qݒ�M��*C�`��5Ѽ3��G�ԏs�l*�S�z#�jYG�W����~闦+��Zq���M�i���4/b�ɦ��7���cӟ~���;�菧Ǟx|>6<U
-+g��UwQ�_���:�a���:Rr|x��E2c+ٍc�rG���G\���'o���<�β�-,��<C-20e�4��U}���N~���m��E=l�"4�>x��I6�j�KV:�h`��}�m�[F��
-+�܎8W�X���-4�
Ӧ�znJ�w{����\	����
I<�z����x�Ak���5u��˹����H_kęʛ�&
-+18���B?j�+Q���O�Լ��3�x~
�����U
_�Q�%� u�xB�@
Hb;
��N�Ų�?@��x�Q�np��
��+�n���90 ;����%���t䣯��_.;�s��u{�����ɉ{�5��2;�]�c���~^�y����ܳq�֘K2ۃ�J���,���+r��tZ|@�����$bI���Y}��#��Pe7c�s�Pr�On����~Uy��!�񄇯�쌧��w��g}�$����<��a7��o�q�m�n��~�<�eL��R?O�ȹ*���_�xr�'{��K\k���"�`�C��0V�l��u)���ݚ7�6u���ɗwTy���(��J�1*ek]��\�k���t���i������A�C�M��W�/=rd�D�T?N眀��2v��:�O�����DO@�ɹZIS}ZS��G��;χ5���Ʃ	X#����Xօ6ȸ(�
-+�Z�ʑ�FCV�L}U&���l�T�~q����.�oj\��|d��
IZ�=���_���v���N��̧�ݏ��)����`&�SͿ1� ����
��������~�mo���[�ԙ0��� P�G\y�n�׈Ǟ{>�b)=nb;Y�C�v�k$4G���l׻�h�y+�dM�+?)Hi{N��:�_rFe� |�Plw�7����?�w�3�(����igv7�;�{9��	�� �<Y�>'���M���Mc�ǎ�ˆ�Q��c��v�Yz�\�x.��W�ɯr h+������f�;$��_`ׅT�}�
-+�4�����ۡ}���
�s�+��Q���M}��1��l��S8X���'�C�#�+�����M�UW\1]��k��z�����=��Ur>^�O�� lu.���OLO<υV���a{�_�	+�H�"��cQ�d���
\�&|����^s+v��!���b��y��?���g���:�9�m���A�
-+&�l"�+
�:��bc��\��I�Xƫn���#��Ж�&���u!��R�^�a�j��۶���������O�����o�
-+#k�c�����&��nh
-+ǰ*N)�Ci��x�맟}�ۧ.8�[�	�p��ﺧG������.����ρ�~1T>���o�)9.����8�2�ّ�l�	O�.?���uV�v5Pv,��������S�g�}Z$m�HʆO(���$�/t����=���u�2&�9��FM��L��HG�l�mBHr�?��wܖ�"q�]^+U��N����<���kKS���;��Y5�(�d��u��12H���(�|��c'�y
@a�Kn4�S	?�
���?W��B��o��V�_rn�*k���#����2Ǐ
>�U3[c(��}����B��;�vs����eW��B��X�W5�'��j��r�"ml��m��%�%b�3T����z��{�ε����?���+>���NG�>�iM�H�q�oWu�@E�N�����kA��>�_~�S���ڿ����tݵ��qk>���Xb��\��i}Jm.�\8�61	��>ߕ\�ˢ챭�\#�w߀�Hz���/d�NK�\��񂟚�ؗ,hE������x�@c�Y	�9����\��qc�>|�O�_cn�W�������o���m�e�zF]�bC?�K��\���y3#�s�:�?F�{5����"ŝ6�K	�u��g�>{���8�6mT�y$:��Ï��������/�+�H��vQ��-�2�.�S�O�M+��F���|R���Xn�~�$�<-<T��
_YY*<jd�JCt�ڷw�7M\x�t��n��z��	}��H'N���G������f��Ǹ��|�s�W�;�.ӋB*?q(�+�1������b�$�u!�8�W%V+�N�y���|��������L���?���+����h�o�[U(���J��K�b{���/|a��+�O:8]�sR��Ķ8�U�cz��Č%�zA�^�c�|�
-+��2	�n�Q�~֡.�J����#{R����1tK�+h|����u��G2�&�%�h��Z�~���MZ�Mt���
c����K����wk?����@6��~E6>.כ����/���r���s���oy׻��ɟ��R��\��y�l}E�W�+N2n`n���:�w4���et#�Z
-+.X|!ZW.%���P8�r
-+o�n��sS
���L?km��D>���kʽ��e�I���ڢ�%;S�
cP2�Z+|^?��_��}�9{��o�q:_?���7�����諹���#�}���@юPm�j
-+�:=��^��wL�>������ǻp�1��+>2bYfo�ԫ���T�����7֯�8b��/:xj�Zl��߁����H>c�� 2���+g��Z���'�FCXΣ��2qf�$(�r>�$��8��7X�A�פO>���OsK�.�t��<��%vr���ox�[���x���U�-Ol��cG�yA�"�*g��a���n�gu:	d����ui{�qN,Ӥ��lq��]�k�Z��
ڥ��?�W������f��ɖ���?�w����A�t��Z����`�/N�J-�c�y�G_�ډ8O<�������C�<�߯�rڿ[H�<`��q>/��H܆U�u��-�I�<�:a��qr�*��Q4���Q�
����f�s�Fi;vYK|b͏!2�G�m�^�+	[���
;�ڔ,G��~
-+S�ZHnk�b�
�uT�r�v�X���ֲ�?���o�~���
��Ki�7��>�;a�X�|����[� <>�C�����M�ۺ�YE_)/+�ݖ5��2]�\4�x�V�\���K��#y�_�"2�G�?ȯ�����o{z橧d�5����b��_���o?�����>?�էX���Dpl g��Q<��&��c�|�{^ *4���oL͕?�a�;��ZTv�����y����y�5(�
����R�8�qC<�zF� �	?#`لɍ��t>Z�)/�߲9���u�����
s���zG��X��)��Y�ƒn��9z~]����s1�
\���l����
�ƻ���C�:�S��&���O?:��;�4�˵���O�Ĵ��71v�	�&�c�I[��_u�>�c�@Ƚ�u�,����l�E.o�9�����d��QZ�uϯ�!}��B��gMF
��:N�N�Ћ+��}�>���_�mwةm
^�\i��������T|��e�� ���L����G�k��JR)9�|�z�����o�ڂ8���/�-�ܝ�l�D"���3=5���Ԫ�N����!^��� ��%�D�z,�s�9V��̏�(��|�Ci�bY�~�>�9Rc�&
�N�Q;���G���C��6���h3������]ǵ�q>m}⸃�F�؝��Tz�:�ۿ����c�=v�B��Xn�7Q
-+Xo���;����+R9��	���=��E��n;�y1�7�3�K��(�B�R�M3�T����;���ӝ��k����(�#md���f{��m/?��~����l��^�׀�KQލ��|��_��Z�
�(*i]ݸ�ʳ<
[�^8K�$l�d,Kա(��1@�_���Q�~��r�;�|�Յk�v�Ȭ�,��
V�d��;O�6��!��7{2b���ߧ�����������Bl{^���Σ��۾mbZ�(g�X�A�z~��}��λ�.�WC�
-+��`?0zƹ:��0��O�075N�ģb�[���[���P��yQ�9�d���)��y N^�$���#��Rպ��������]���9��2�ĩ��6�_�w+~'{�su���-E���6쎗���i���N.��q�}���r'Dy�BşZ��Ż���"��
Om�]�~�ȟ���m��~�¿U>��K���x2N|_(s� ő�|��G�Ë��]F>V��3z�wIǘ;�H���s��Y
�
��Cm�`w*��B�}��t�_�w/�{�G�X7�<o�]y��}����Gd���g]A+��m	)�:ud�Q�k
n��e8Ef��d^�˘5���s���T�I�y'@�#���(�#�*��zY���i�=�����V�.���_���N�<����g�?� ws-�0�4���$�h��'N
-+︢G��k
w�k
��k
�N.��y��#B5|��s�>pBy滹Us�P|��80믩�����}��s
}m��|�Ƿ$��N�_�&�ܰ��/sNSz�'�����Z�������8_�~,Z�}ӈ�M�/�`@�S�l�����z�C��I�f�5����x$/Ƌ_,��Gr1�l,��c�^^[���+����F�m���+���,�����ٶ��x���G�;�I�k��
���+�M�>N��en:�Y�˟z�V�N�;6�r567�Z��s��y��;ٹ���:����Q=���*��B]k;������^ye���P�󍾱��ٺf���c!Ӷ�+���zAN'�?��?�W�c� �ð�@f�Z�вOz��\J�����?�*��~����/�t����t�yZ_Sc.+�F]jƲf��ɼ�״@���y�|����(�g>�]������z`�,���K~(���h���!�+���x`�]w���5���>-<t���)>����~b$n��;�o��1ٵ�����u-���/c@��=���jm�i���F
-+��Q��}����?/��ڸ��icX�A��}e�W�+��0	�Y�Cmx��YhX�G	u���/��U�%�{�:�_�~�u�.,�h���G
���0iW��!e2ϗ����hj��J�<�����-�>	�+l���l2G5>2�;mX�2o4>�u��F�e<;���������3^r�2��++����<2��pˤ*	�s�e �Z�X#>�f���wN�h��R��t\�^���y�W����Z˵�ߓ���I>5Fr���X0�r��ǧ���on���8�Q�>P�+�{r��kڧb�]InN�Z��g���Ijl��c�j�
�œw��i|�7��Y�Ε\԰E��ņhi�W�o[��%QO$=n�k��;Z���b2�5�Կ�#na�
�M���o�m{b
��wù�=.@If=������\
-+�}Vز�|�����y��[�?{�T?c����%kٕ.���-����S���2��%�t�]�e����]+
�ib� +[�v_��\|��^����we�1Rլu��3��)�M��z�9t��b�)u������h�ļ!�y�Bw�MےA�w��C���L�$8�?'A2��е?����q�
k�qC�Fd�~Pwj�/<����������&-t�On%æ�.�3إ���e��,��Z���Ϋ]�6�G��3�������.�oi�2%Þm��G.�<�Ӹ�:��nkY�Y;�'�����>�9Y��я�Ƃ
���t���%Ƒ�}����vS���9H:��^��`�[`<�y �����zCI���
�|�·�OZ�#=���|���I^�?(�k��+T9����O�̑�\�Yt4�L[��	
����tc�~�f��B��T��t+;�ĉ�E���u��_���'ݩ0�4�n��F�,� ���L�^�Rj,kh5ٚ�j��++,��@�N�1`1k��%�[�[|���2�b~��x�y)B7��n��}�� ���E�?� #�׭xh^d��<��z��;"a��Xl(��+����u���@��sl��A(�6�/�^c��!Z��xɸi=r���'�lz߇>��xj��i��f~��o��$��o�G�5�����jA�5�]hc:f�y�=wO�y�u��.���+G��Q���9�'�@AS�+�2qx(��eS��'��<�͊q��w�6�F�+�Tuwɭ���󘐋�s2��s~2.�h��t.
��!m�G�x�j��~��+��m�s�1��ֳ롶���&�����YK7��)��Qm��4�2��/t��|�k�>�}�{߻?�O�NԳژ-6.6�-���Ķ�WT{%�+�p���ۦ��ch���9����u�a~�^�a�����=�3O�+���xt�b�C�|�j
-+�Z��1��(m�-�¤T�;P�Oh��M���cB}�A�m\���?8=~H�4_8���i]W��� #��<C�]7?��Cx�<�b��(�踉�^��W��B��;>����7=�wf=���M>6C�z0i~����s�
1�~�
r�������/�qO<�����K��Z�;�D<w���yL�L\���`����C�L=G���qз!W05'�U�
T��\NBԻi8�F-Լ%����.=?�c�+,��
�N�z����O���M�����t��k+Oyd���x�N`nP�N$�m�)+����s�M|����������+-��]�dօ@�w:��k��7]�w0�ؑ��s
̙~��|�N�1ؑ��|�0ף�
-+������P�?6���w�2����
-+�m_d�W��7���w\��.����w<'Ċ�]~gS�Rn�f}���g�k���LA��ա�
ʖ��~j9u�UB
���&��
-+�?�u�w�;�e4��L�t#�����}�6��l/�iK�Z��f]��y��W꿚x�w�kP(��.�y�`���0�Ė
-+m�ԧC�3�,E�K��M	�"D5��5�1n�y�脊��`:��t��[�~P���K���Z����iP6�BG���[z�
���w�V���F~�M����i/>�'�|rz�_��S%
-+�tNṚ��?8=4f��α�0=@��co�5�^~6k,}<�
�4�7����F��P�V�)��Ʀ#�����G�E&=��u��M��/�N�}p[|ʯ0B��(��,3�!����ǚ���(�8��Q��P6Z(<6�#o���➌{3��?�ף��)����J���^)/+�2�����Tд��E��PlZ|=��~�/��&Y�˜��Z&v[{�ǧ|��IG�����ϒ��7|2u�.
�rv�`���<bn���N!�EVъ"�kR(J�sjؒ��O3/E~|�c�`Բ��Ip.��@\�YD �LI�N^:2��*�ޑ�3��
-+���~�\����]����K�<�����'	������1�Y<{r��i��O����?��2e�4�.U���O����k��5.ݿo�?��UU��WcQ�0X��9��gT��h;<�5�C˸`�94|�?tV�q��Ç�j�Ẏo���w��`�:��y�@'/O�ˆNI�ܸX^cA<u}ރ%C,6[��w3~�Jf��5
-+tF�7&�h]f�	��]���\��1��_j�t�9�_���T㼕G�8,�t����{��/�D0�c�f���!Lء9����{�8�P_���~]��u�˨�2�	��+��T.�C��3�+���LdZ��
>F����w�s����w��L/��\�8���)�?с�?���/_��Q8��,u���i���\J�0��qn�q�p��6ŷҙ�H�2d�l+/�3Eܱ��Ԥ��g�S��{�A��>z{��_���#nߘ.�M�!}?�&r6)S\�A��.0�h�՘<'L��ʤh���.+� ��gM��k�*�.�AY���|W%tb������pܦ�Cc)���g1��t�:쁎��{���n�V�_�x�7.�Sl�^��S�G{�7D�HJ���1���E;y���v�����
>z5x�?��w�ݱhΗ����Њ�=�8���*�/he�c��}�����q��ȶ22v�2j������57�ܱ�W�k<�I�D���
93n
�����q��$"w�({c���o����@��&�GO�L�5?���A��|o�����{Jk��f�m��|�Y��6���Q���/Z<c�56}t��������xo~��C���
-+_x����v
��!	�)c����&��\Yl��Ħ#���:^|�����z�����g�:K̑�x������]�l����f+j��)�P�V����0�������[W^��e���q��ߙ�q�F~'_l������������e� IF��3ܸE6�eb[�+���^+��@T�OP*T����N���tS���E��f���8
ͱuhBG��OR�Іn؜�y��b�[��x_X���Ǯ?On����\P*OM=�JW��nޥ��`~H`je��Y�"\��*׿��M�sǧw��O���qx�r�l&�d�=|�x#�~���N�n(��xd���V��R^��o���ɏ�Y�ũ@_6��q�@�]}ӎ�ja2�l�wI3���;4�[�5��6�`����sh%+ʔv6�fZ����o��8X�GlQ!P�p�ġx[����%U�
�ݦ���S��L,
�������iW	�j�Ԫ�Q�>���)W��S��o~�_�Zʠ����Mr��$<�%��Me��菲�O�:&:��[h��_�Z=������K+����j������xp��<�Ge�Qe~5���=tƦ������

-+E7:�·>�\��c�[/#�F��^M�ߴ�Ĵ��>c�W�='������'+<%�U��������ϥ+�p-Ç��m��?�|pG��$��RR@�~�<2
-+�n'�ҧ��E�
G�����0������w�1��wL/�
C�5�Q|�:;�}���1��q���؛R��K'ONw~V7>�������~�t�e�@�1�s�ͼQ��Ef�J̉���g�3�O�g|/�m��'�s�g��0vh��炒9$U�F1���z��b��2FCL�\��G�Ia]=_�n`n�"��Y�
A.+��9���D
-+mX������w|�mӍ7�2�;x�.<��M��;�� �?��t��0�󅻔f�
-+/��I��W��
�5�9���4�����<8�t���9]1I�v��v�+u�-8�P��j
������o��|\�˜p;�RÑo���\t
`<���?�T��Tjs�Ȍ��P\��?m�O��%�$��s-޽{��׾^��f��~���\A�+��aS�%���S;�?��Ǧ�}t�T����6~bA�\��VM����=:6]}�u����7��8�e��W٣���u��O2���}z"(+����M+V�
-+^�D��K�j���#��Y�̆8�a�����іx�
�?��#���E�5�Ѧ…����u��#���?�������:��>H�K���~�R0�̂eu�>���?�>}�R?�Fo}�lV>84��?
{��}����gy?�z
�b�b�7;cw%�ʛ7/�E���T�~���F2N�7ٖ��6#�V,�V��̬�&��/Le@[:�m�w�aBS��@�,�Z���G*�@�T�s��WRJ������֍��*�E�g٩�_w�:hZZ`2�v�55�;$n}�[�u#�q]$�w�i�t�m�U��deP�7g�3'�WX>q�_艀�u#��i�ދ*5��?�ϝ��S��SQ^ȵ�IF�y��SЕ�
�2��sN��X�Ƨ�|?�s��|��vW[}�K`; )�Z���ϼ�"�����E˵�c�
-+
˙�橖!�F��6�1�U�b��Y�N({�V
-+y8��=�$�Rp$A��e�0�}���|�]y^�/�c�~�1+�q~�7����N����k?4��
"w
����QO��5o�j@�ۣF~�%t��ROq�*�3d�I[ǣ�4^l�0�"n"��҄@���,/�:9����!=��>�l�?}b��UA��<(я���mo�~@���IO͗U��M��m��7�㠹�/��2���-�	0�`ոb���mO�Oڢ�_ǿ�n�޿ r܍��'�E���Zq���6�xuLk�Rl	���O?��8��Zl0
�ⶦ#o�Q�M�İ	O�+��0h[���"���o�����o���Ӧx�J_m	��}���{ӎ�}+��m߈~�#��CT����y�zV��P�y����j�W�6�nL?��D���x���?�:��H�Bͫ�B݁Ƣ����UY�����n?�,��5��*?��	n���g�n@Q���1��+����Lܳ�����l��l�&�F�u��`�
����+m���ξC�z$r�;+s/����dolS�U�C��
-+F�zbc+�b�MX^|�#
N(��VJ�쉥*|p�+�����eE����U�Ooxӛ�7�W��E2�ܚb����e�gJ�uo��1:�f��$@w	:`��*�jp��"2�J�s����f���%?��)�Ȭ��W-��Z������o�����33���"�X�若^����ݢ���ׯ>�)��˕��V�VX[%W(?	�=o�?��š�o���ҋ|�
-+�ZL��I�J���_c�>hj�s\�?xb�����Ao��D;���g?�8��߮�aV�v���r���/>���?����Ko�E�(c4�o+e
'�*6�@G�zV��y��*��x}�E��('�� �����F�_�}����6���2��xW��M���z|�������_V�j��hVlg�'��@J�e�C�����K/-\��*�b,�)��m[��h���w�Ń]�#+�}�m�z��ӧ�X��<�mtP�)Lˊä�J�i���k���e,�
��
-+�hڼ�(�ڷ��mK�LʩC�+k�X�2x6ux�JL��,���
�[��ݽ����e��n~1��5�l9�DŽڿ�,��+�#z�
_[��1+�x��<m*O<ydzL����V�Er�FV��Ű�+o_MG�6��.�����m�6�_=����(Ju��s^}/�=n��B�z��W@B�kz[5OY������7����`�1G�>M,;�4��^;��R�����Tv��3��{rڹg�&[�e�Р#�vǦ
-+�|������A��@ȶ��/�ttRK!�
��H�S�;��y�CV����—${olV�o�2���"�Ե�T�T�����'��EՈÂ����΋�8��Q�)z�i3��;�EK��~1Ob�?P5���.�ul*
�%��g�ʯu|퍯������t��˟āL�R�,��x����P��!�4@�vh3���o��>�39��/���[���t£�9k�ώg��謤G0zF�r]dܸo�t��
^�Faj,���)�"�v���ǵ�CާԄ�}���B��H�/�X�h���2G��O�랁mGP�#� �2X�TXH5���8�vfi��� YyW�1��,X���2��gՑ���w�8<5�����}�=�b7]+
����>>f���5g!�{+#�Y��:(�8�J��	���V��\��j�3i��r�@_����o�~�o���[�����bS�Oq��W5T���q`�i�/�AG~�m��
�t����r�����O�(PB�f{X��	�r@�B8�w�t������f�hd~1������c�$@6ۉ��&|�.�t��;
�"��͖\F��8�E���h���y›}���λni��\W��N���xZ���A	�.!`JLLI~e�r�=����NP™�+Fx�� Z�1�e���W��.`Da��G��ݭrP�V=��[u|�jſ'N�s#�ǟ��
+!�k��!�Լ����{\������/:p�nl�����C�������O^��e��
-+�e��u�����珨���d�E�<���w�M�L7�����=~�/�覄���_~�
���c���l*������T��nZiKú~�C(s�+R���-|���n����M�ڿ�Ե�_	�+oզ�����.i�*��l�"��v�A@?��{�<�)�_?2���{�����y�	�@��#[[跔o��F�)�raʙ`�1�=�0<�O-��}ևNn��Q�N�M�\ ���M�K%���@�j�.�g�nz��'���������O4.i�vZT�!?��#9W\i^�I��]���C0��+��ȼ�~��n��^��T]�ei�u1����������-�N�U_6���b+���1�Iu�.Ujt^��~$P������"�JF�m�d��qq��~��3��n��tVu��?�Gnm��mjA�t������ȌC��t	�'�����9�}=�S������	��T�0�X���v��ۭ9t��pþ��{�K<�n'R����9#ރ�n�B%^��n��|(��7vS�U�,�g��z�K�C�v�p����⚔�+-��g `NY�I]�1A�b��?��6߬K��ˡc�a�Xn`��1u�h�z������<��_�pRh�����E���O��
�q�D,ZlC_8���H��ٿx��>U�2Te[�*S�X�<�-�S�d�}��˂2�+���t:
-+?I%�ھ�_��ĸrt�n���z�*�L۫�^r��z̡k��<$#nv��<�E�N D�VRR�(�CAO�`���{o��ᭋ��fv��-
-+��ʚ���~�-(�yd�
�i��2l�h5S�MG~��Q%�2[�7���q�$;���tx
g��+E��Pڠ�W��~����.2-�l
-+�X�z\Z�-�ݼ]�R�R��6��'��^\���m�|
�7
��+j�ŗ_��~�Ɵ��?�����o�m��j]
,�v�[t���e����h
/2���}������݁�ժ�V���ڹ*`'Q�Бo�1���5L0hi:������J�;�
���+�s�Np��bl����נ,����O*�7�H�d�9����h�Kd|�?���l����m�D�����lR㄀�����O���o?;n�#��G�����*K��)/t�F
-+���0j�f^z�+;�61��
����A7RB��	-p5�I)؇�#o#H�eБ���P��a�*�����TΫ��.L�5��\N�=e��O=Dw^�s��[
-+DkN�O�%�l��F��z��EA�kN#��	��XԠ���n֛��}��ǟ�f��q�«�2S��n����{���/{Vl]B�u�0P��S5��Bʉ6~@�P��¾����U�ٰ�X��O���0`Їt,'��9
�M�k3�	d�8k�ܱs��^�KOՙ�B����T=3�C=+���c�	�:�si��>?��~t�����郿���#GdH �V�f�w��%�w١��@Oh��K���
�x$���uh)��u�N�կ2��/��r��b�� Y'C�yﱖ�(���m��v�c�9kJ��mƽimO���GV)(:�D�Ү�.}���O7�+���s#�u��t���I�^�N�BX��U==�r��JS��n�Qk,��wFk�����a�ZH-5HVW��~��x�`lu�ì��!L�
-+,����->�OBV�]��zi���w%Nޡ�(�+�ַ�I�qٕW�;��Ϙ�[��'��ƨ��S�*��[F��t�R+�;A�i���:6	8��
-+����j����*_;�D��������g64`�K/�B�ň
�M��U�t���J�f72-p)�Ia�����Ƌ��+�mD�N+[͵��I50Ȥ������f�	�t}56�]��ӆ�9�Q�����ť��~�+o���|�w~Z/���_�ֿ���'%����ęē'7Z�g���t�鉀��.��+�b5�=+M�׽���u|Q�Kb�F/t	}�{���|�*�R+QB����1����K����a4��X�i��j���h���l�,1dX��#]��7�q����������.~�K*^��ŸMͣF<)�QZ�):��������
]N�pϗ��}�g���N���.Z��w+����/�.����+3�&4�yv�b:�:Kl��G����M�B�G�/b��
vr��N�=Ɖ��!�}����'�P��"�:X�nLV��D_{�>��܏ֱ^_d��bxh/Bk`ss5zND�8�憃�GVY�+PXsQ�F����^炬�+<�D��E{�L��m������Mz�$�O��
-+o����p���1�V�r��X���PT�
-+ydO?���;����O���>�~DR�`������O��=:��z�~F�
�8^/�/un��Լ�R��BJ:E��*�}�ʫ�%��+�-=y��S��w��n�����b�m�i���b�e�e:�8�CW@dq6��>@��o:۳�L	_���ԴC�I����Ҷ�/��b1ҴA)�U
��Q�+|R9�r>�I�X�����7�]r�J��ձ�jUa��?���ۣ���j����/c��yN89��p����j~��U�\�ǙO�&�$��Oҕ�,�؊wv��b�&����MMl!;�+�ʑF-��?~+�j���o�<�k�[_=Q�����E�+�9������`4M��<�?0��f̩���ꫧ=�/�@����{��}!���5>#o0o+���	�J�䅮�Ӿ��\릉4z���$�����F\Tj.D96��X�RvVs�������<W�ל���x/s���^`G�BҰ�X���+<�*=�]����/I��R���
-+*[����T�Gu��ğ)���ȃb<|V��k�b3�7�l�خ�/�̠���Z��'�-�j���W�i����	��]r�pV�6�����F�Z��ϒ9J,���Z�Y,6]�Cv�t��
P)"{�ԡg3��9�}�Sߌ+Y�8�����l-Ce��-�� ~�����Q�e�R�������@�15_�(��ziT��~������N�8m�\MQ�<2���x��k	t/����QO߯FE���km>9t���+��~SL�����r\���C��N��8�������n+���պ��p�C[x�̱�m�^p᤹<�k�,	!sڞ�,�>���ϫ�n����x��~=p�~n쑣|r��!�/|B`�4��}>
���ČN�;N􀯕~�O:��۳G-�'��Ƭ.�B*jN��)��:i��	�����+��7M��KR�S�����6��_c�_�������n�~�3��A��ٜc⥙��+�Þ'=��1��	�heٙz	CU��[�m�+�e����bk��z���r@����X�+T�9F�LĻ��������_wӍ����@Զ��K��P=<s%S�u�z�X��
-+=��HDЄ��g*�����r\s��mL@t�F�p��wi�A�)�E�|!����
-+ZC<�,/�r�T�O�x��%]2���(�+��eY)KT�Vk.�/�O��gF���dc��Q�`U�=-m=u�SǦ��Q�+7����u�m��{l�Aϳ`X6ct��[��f�;ƚd]�^�+�
C~
-+��H��B�����*5����1]uѮ���QǦҫ�VZ�;��W��Ӟ_����������C�[}-�Ӷ>��[�k�ɪ�aK�$>�ڿ|ɹ������]��Z��y�Z��Ci��o��A��*�V���⟝0��r��|�lڮ��-?�o+#�F�
o���tW��ҏU(�ʼ}���`��_�+�XV-h9�l�v>����S?}v�n����O�W�B)9��I�z{ͅizꙧ�k��4�p�>�x��8� �m� iϸ�2x:X�.��Z�pl:���:/��G���O�SbY��
-+�8?����]b,Tl%�*�8�
b�li��DB��Z:���6R#K���/S4�ݔ�C����_����<�(�f��չ��m08\�_�Z}��@q��ͬ���1��9����S� �Ց�_vK�yq�ss�Vj����ɶ=G��
h}������?+�B2��>��?�ǀ1�1���B�ܹHs� _e��v9�����hP)�^�¨.�{A"7�W��+���k�������~�gn�V_+J��V�N존���BG~�� �fq�̓��[���߶+�`ڼDI����*y���d�P�F���mS�-t��Q
-+bi��˟���S/z�b�6��*��¿��%����5�g����پ+��#�gڠFx�CG���1��N����k�Y;�ډ&[V�t���_x-/�EYI*����%��c��ֲ���ò�'v(��#_:�W#�`�U���C"_bGRҴ���1�K.��9V��*��D�>@��f:�|�5������z�83����Kz1r�o�
��P,^�o���2V�����1�.^�	Z�+�QFQ��٩&NU�_�y���y���V�
PT�ؾ����o�0��v��'�OT��3���	Y�]Ъ�"�=���,�ZK_9�{�N����lЩ�}:&+hE����e�.�nb�$�C�8��+N�������L:u�ROT;#�
}#B��SAY�ZH�oy�@�U��8�
?������3?7���W�-}"�m��nؾ�0������Ҿ`�Y�E�C���b������w~f���������4��|tz��'�G����A�tb��x�O���^�7W���t3�:�����E�8B����{�E�yS�2�h7
-+z����fl��4s�m�uژ�gNV{�
-+=�S�ɿ.�gl���bئeOLKl�_�m��P����o4�B�Y��'��>oO�����	��k���J��>�]h���O�W���&u�҈���J����+�p�܀f�G�c��4.�d�
�V��)>�E^%�[����/}�m�Q���~�r��c�l:�¨��WKb��/�$`�rv��K��ĉ�O��x�I��C�
��r��6#V���]*�DD�C����QV:R�.t�����K/<ȋ$��ő4-��q�.h��x+��y�t{����?�x�?��zbuԻ3J�q���J��h����ȧ�|�ϸ�����t�I��VЃ@�&٪ƫ�v���+︚�SBWkH��F�dZx�fm1֞�m=���O�M�������_L��ǧ��]S��.F����#�k�e�Z/.S�_��
��f�
�vO�k�ৄ<����l"g�z[@�x˵$N�jK2+�>,�)e�yNI(�ʦ��<�_����$���h�&ux�2Pm�5�}�R�D�>�	�S��^��甬w��uzܛ���<��ei�dV�
]�B󆲍��S k?���s�/��{�`�8�����0�L�)������}:1�l�ʏ��Ɨ]Q
{=���G%}+=d������	Z|a�l���h�-l;o��7ߊ��N����ݎ?m�c��;���ыm�у?]�J�/��������Q���^�|�-�~Xf��#c���t�_o��;���w��������5������7m诗3���R�����N��i�op+�^�?=T#�me�����.`zr�JMXj[������1��b���3߳j�7_D8��D�k9��?J�j-��+쀾�Oq�O�ѯjs��3��I!���ƹ�)�����x��Q��JVm~k��b�a�?��o��>�y�p�ZɊA�8�M,��ƫ��8t��?���q}��3������\ΦTT�I}.��}����hj

-+�;��8�+�9ߤ��ȰI�~�_����?������|�ko�v��@��/��w�y��vga�ެ�_�v��|�w�BLM/(��#�/�o�f.hB0���y���8?�4��S��$_J��B뜪E��C�s����
-+ck�9*�_s�t��?�҆�ٔd
-+�׿n���Go�#�Ȓ_m�s.©�X����yk�r���D�+8\T��o��	ץ��OOxt��i�x4�����E�����VY��Q�����3K���ւMB�5|�[S��vbd�_;��o�\��iղ�,����M�qΗ��K��^��\@y��)�\�Bke9V�^֪hƜ����{�&[d�Ew�*��0��G��~�{��?�������'[�I�*�p<�̳����7}����.֧�t�J�'b�u��"o韱���8*E�T*��8�E�Wɧ�Ԓ�;��!-mf�y�~����b��FY|Dc5�Xk��;0ݬ'n��ӉNLO��>!���8���%<�%�-��xhŽИ�7�@��d��P0kU��-�x�����7���S1=y�I��}�t�%+�
-+i
-+�ܛ>9�)y�/qQ��{tE�M�K4�h��F[_PQ5'�y����c�V�Nl�Gg��ka��/���zp�ْ���yy�>�Y@����eĂ���#�Q�}rz���k����'�147CSE*.��!{:���_�����<2�h%�%���{��Ɗ-�&���0.�����/�>��O���	�qWHe_|��\�ɓ/N'��4���5R$nF���/2n���㸤E��_�x�+�x�,�&nb��?Ǧ��<h�����O��?8�(�d�iHNTUwUt�;�Ew���[ߨ��nl0�ТŃ�l�B[����#�,�Э��RV���K�v�� �w!�1��X[ڹ�ϟ�M���q:�7��3�Ν��Ҷ�z"2��C)��ȧ�J�Y�ʯ�ʯ~��`GyT���8/�������汚םX��^���fs�7��HI�$J��hy< �<p'c{g�A��F�	�e�@��F2�Dc9�,ɔ,Y%�I���\D6�l�����[~�sίnݺ�{�{�-����{��S��^u��%^.��J_F'+��� ��*�W�b��F�����v��˃��� >IdQ���r-B��Qe]x4�6t��6����7�J_�9f��YJZi�m�|�����j-L���C�G��ھ���v|#�Y�Ey����@��29���]+i*���w[�v��h�0�
-+uFi�w&�J�9�	��|�B�3q��K�?��`\\I��,�Vߙp�"�+�_K�V�H�q+�k��fa�s�h�f�z�Ɋ��N��4���w�߅��|X�.�ƆU��`�v��H|��
-+����0k�B��e�X����ݚ[�q!��x��8��0�AN������b
N(�
Y��|���:�����h�' �0
-+8�����Way5��}�?��{�3�)�S�^a�|�����l��o3�+g���~����·1�ǃ;�h���L#�H3<��.K�]�񉇕��G6-�$�uxn���u������8�/��Oo	�gƩ��,�>�Û�q"���nHc���D�Q<+nl�q�+����Y1g��)�gu�[@��`#f�V+�+��d�`�@�����x*�wlݶݜ^��g�Ɲ>n�QD�Y+C@5�fvE c�+����Ӣ%K�����`a�9��6L8`��9IA9�� ���"⨔���x��D+��>0�X@�Gq���;�S����?���<|�HZ�p~�I�K��I	�����
9����w����z�cu!N��9q���P�	�	u:�~b�y�&K��N���S:"�'�.���������]�R�Y$Ϋ����t�5ׁ�4A����N5V(�.{��H}����'�Ǩ}ـG��BCD݊��E�a�x�ƹ���/�������#Od��+��c�:�a�Q(�1h� �W���m:�A���H�f	�%m�?V̵ �
ϵن���U֌�F*�
�0tE+�T�eߌ�X���,�֌�W�^ye���?���]��Ĝ��goy˭�#_NW�n�.����Ν%]�?5�
���pg_4Sh�)c�a��9Ɯ�k��������=k��V�^��e(��~��[�'>�QS������1�R��r��szi�����O�:Y�4/��d<��p��g�E
�3g\�t��b`%;�哌xi��b�Ã�L�m���{�<�xz��~���(ՍMfŝ;~��)i�*
���%��b���5y�*u�?i�C�����_�.�袴l)^pF��p�vQ�
ފ+����ϓ�.�	|U���qT�3�|�+0�~5v�8��'���n��;��<�n8��+��|9-����쑓ؙ�N<�6|ط,���1�;0�h���8T�NF+5�d���x�W���q��J�����v�ϟ�����r8��r+��z��8�D��X���D�x�rQFc'q�5���͘n@��}&�~�#��q��&���P��KZ����\��@��sPwG
-+a�t�=p��ʟV�7��,��'�}&�衇�Q>:L�m�0�%�c
l9�hn��(����	����KpBj	�ư/�|��I;�g�8�s�mڹ{Oc������oK|��c���?�g�9|�3T��[��*Gps�2̧��V�\��m��/�"M��?	Yj���3%����o�Y�j����!T�Z���z�lf���և�KW��){��}��[o����	,:�ׁ��N�]�I�YBNCӨ0��L�|�@9p4��V/���.f�m�C=���o�	+�����e8�7[a��f�Lm�pR�� lF
-+��f�k���v�AN�A�� M]d=Dk.�-
-+@:
� ���1q�����P/}�5XtX#���D�ɒ��
]��+'��w�ț���G��#��˃�<��Ⳓ,�-�����⳥Ͽ�-f+ޭƓ�������U�/H�r}&����0nn����<��t�>��E+
`i�N��vkן?�
ܝ�6B�7s��˿�Y\m\j銚s5^�Pmm����xb�Vl�i S8#�N���(�	Y�>��>۹�	+��@��l1�ﴇL�M}(����=ۗ!��r��16y9�9Y`3����>>t��^Q���g;o+ڋ�y��+�qn���\�bk������އ%a@y������OO=�l�8:aqN��ޡ���x�|:����5��<[���
�0���e������:-Z�~峿�?�W����[`Ū�aT�_!:%�������g����ƿ/���ds�����c�<��O~��_~������+�<���A]�$n(}ȣ���+@�?��V`���#
��|)Y�yʤS����P��0C��dz��/�jځ�������q��
Й�j?OJxR(�*Fx)�r�Q�Y�$;02�����	���# މA�m�4Dz
��O$��
nz�
|�-E�[�"��F!s3����_<
�Ν����z|=�z|����<����ۑ��|t��4��~�)�8��K�_c�b+�-(9D���H�r2��~��j-��+���o۾=m�	K~Y�~��xw������5i1���F��j��F߂�yM��}.،�sDh����1a����s��y`��d�mO;d˾����s��>�_��x�7D�V��+�
7]���K�؛����B�x�+�C���|�"��;��2ן>�Dچ��M�k|�����Qw���<�ν���;?��yv��,�HJ�7���'��sı�Z�t��!|��<�C���/�
����O��m���P��ET܂��������)J�;57i[������?G����^Com��6�EF'+ڙ㵚���}��e�
-+;��Q;`�N�?�I����
�k��>�췜�j#=p�F��ν?���c��%˖�[���p&���D?��S��n7���6���$`\������V�#��`ۏ~��,�P�'�r�|r#�I^��S���7a$����A<�IGa��`$��� ����Q���I
ks�����"�lH�5@C�ϱ�r����5�<؝��M��ŁO���äs^�	�k[,i��k���]X�lG��'��>"�_ٲu+ݵ���
x����k��#+U�_��(��,����j�b,���V�\NFਹ��/�O�i#�F����+�W�.÷���+�@��+�����{��S�%�YQ�Ӓ�~o�ׄ,����N�4�|8��?���'~)�_��8!K�*%�qcj�(�ȩ�s�����j��>��0N�(�
B�_��h�Ԝ0̿ھ�0UV�v�x8�_��|*�}�P��\��y��$.Z��tў~����X	*8m�C��3��ɫRʉ6�UF'+_�����i5��nǭ��.D�_6�XUɑY�B�d��~�ē�B�+6e���������g9�G��C�Z˛onKol�e+�؆O�u
-+riiU�J�W	����������H��x3��k���B.���㭷��6��<lwH�������bd[����`=�{|N����:$2��X/�r'Hf�K�&h�[&ʁv��?�[�_��5��o��[��A<���I5Pm����C�I#
ַ��˥>9�o�J���
��+o�G.8�i��vY�m�.��+qA�%�_�~r���6_�D`^h0�H�T�b�Hz
-+/{�
י�E�g�}�+�x<�T�b��SЫ�$*$P�K��DD�����S�/e���D�����C�8\e��!��&uR�H�P��a���,��M�W^z!����i+��./��$�BXi�7�
P�4/�wARK���Rn�seP�-0����ϡ�4	���tx������W*���W����[�-�W-�E���r�"�
Ǘ.�/�2�YO�;�Q�-B6Fn��V{��d*���
-+]o��Q/S~'��8�`ٿ�@ڇ���w�J[q�ρ��V��P���ׂ�(�F.d�%���q��g>�6^����=���/[�?Lz�b[7�кx����E1tS�F��?KVQ2�� �\{E�����uh.�y��<q��X���Wa�~�'��m���oo��E|��w.l��.;����+�9<{K��5���\����������?o�H�.�s�&Ќ?����p���r|�<V��'GL��0+�n�n� �q���_/����k龿���8�������w
�uWZ�u��ߦ59���c"�2'\g�܍@�t��rb�7�Q3�\�����\��ߤQu�XkJ�p��V��-+��qܕp�<�Ք��3]���ىM7����b����ӝ�|2�Rؔ[��u��vh�V@�y�1*)�t�i�8���[E�C|���,*]y���G.������3��'���$ݙ��N��7��%��h�
Q�'�iӦ��ӟ�s���E���`�Nv�o�xt-�Q��@w��:�i>�}�+3Az�p����O�S�������D������
��������P҈�-�����̭�)/Yץ��g����gB:�tג%�&�:$^/�^3������K��������t-�X��A�E�*�^���>�F�:v�����控���2m۲��w�c�T�6�Ĉ��ħ"�ɻ:+�������I����b�.��
��
'`�4���-�e����9&�����+�8�@��#�W�!�1�?�r-��ƃE�-��/=�l��<��t
%�pL�Ͱ+��^u��0g���j�hۥ�§�����
��;N<W��W�2ϊ���K�R�~�plL�A����L6Da��T����B]X�
��/'	�al�P�Kh��dO��ظ�)%����q��=k��1� [{����oL/�,���K�LG�]%v�0����Q����M�Bu��Z�m���x�z���\QO��k��;�>����?�{���x��U΁��������ރ�<„���r��؇=y{��`Hۿ`�~pa����Q�V_L�R�s�@A�u쬏��1aۺ����������ī	��X�=���ZS�N�雊��>���_+1����"��O����z�w�\���^�q�~��贈�|y�ſ+1��̗���p>;�ܞkg����+,���uk���7��c;Kț]�K~�j5V[����K�k��/u��vr��@+�!�2c.s�4��S�L��7P�
��I��m�u�"����l��<y�E�	��������E�v~�v����g���KK۹N���_���\��ݛ�sby80�(���i�說j�ډ2PA[�~}��]K7��:�~�R�[	�����ܪ�8�32��hv�ϣ{$�o	W\�^t�f*����OYN�[g�EK���z"�8��p���Sm��nT�D3V ��%�妛�8�.���B�3S�K<��&��
-+��
 ?� ��'��?�h�����Z�
0Y�$7�	�Aso�7��b���<�C�F&��OD�_�C�G�C��q���d"-d����'��˒���"
C�2^_5�Ϛ=+�k|���7ݜV�[�������#�>5�����U���o��%A8'YB����V�K<@�7��h4ي�4ɔx�I7!JU5�I�-�g*�s5��s��n�%}�S�d���[�=��q��Z�paڅ����i	,Ve~���-��0%hR��˯H�����7�'��T���C�!�s��~a;���p��䌳����ƚ�p�
'h��6�uI�$<����8��o���6,�w�?J_�V�{��g蚓��1�v�����
NV���?�����_|^�����A�j
jEu�Q�b��L���fS�4{r[�[xre�B~�]����+V���Y[6���$+*k܊�ٻi���F^��X^M[�l�Eyg�4K�Zv���w�������]��o�Lq��7��Y���P%�}+<�+{�~7�ge�Ν�|��_��SXx��	-}'H�@*T�N8*�d`�$m��v4[�Z����`���x�����g?{V�+X���~k�_`/!���L��3Z��q#�Xϵ����쥱�nd���fDQK��G��q���h�[��+_uዌ���9���^G��o�ؖ	|��MϥW^|1���f::q��@]���i/��w��~_vC����jP�)�u���=�@��D��a�m{���WJ7r��5�����ݥiQ�o��E���>���w}������w�r�YngP�B�!M8�Y���ۆ�.k���@�[!�J��6�=��r{G$ˀ�EX.�+y��-���[��?H��/]~O�T9�]V��e�k���k(��%d�f��W�W�Z�V�Z����G��7^�9z�o��i/�:�̝�+<<�����]�۽ǚ1��{�t4�;�����wxyӱ���iɷ���C��/����9N�¹����vfƔ1�2��J���Ǎ8n,�3+��]+OJ��>o|r�����^&��yϭ��eS���G)�r���%W���G����T{��݌64�o�+W[
�2*��
����p��2g�!��E#Υ�@u�	P�yW]u����կ�o�+7t�T��h�����9#n�
yT�PL(��b(���.T4	��=v�۫���4�Un��qȦ*���pa_�(�hD��'��o2
.�����Q�����QZ��r���_���`k�h�Z4�	Y�M��x���ۿ�/�N?�$����]+���Iy&d�G�+r�)����*2�m�j{�]'>�-Y��h�S�Ϟ���\v>-yMZ�/�x���
����1��MG�ks�I$���N��(�hD��E��<��Q�����b����ā<�u=���z���|��8���g>��=��OP=����_�<	�w+�94��R��eXp�'m��Ryl6��ٰ���ɡ�*��6NA��xv����d��#���?�η��Ė78��s4=v,=𓟤O}죦ov��Ν�v��\����<���o��η4���=i��
9 ��P1*n=�Ua�ե7��+5UY��Bl��5C �p�M��~7;���c�$�mwU��B��}#�����_�,�|}�Xۧ��a
-+�`����"���q�4�F<;���.�s�8g��0�2����-U���#M�E���� ̚���c�5�SK@K;p��:h>������!���%��Y ��l��W���y�㠹�n��y��0������,��W�Ge��+�֞#��~��������wU�zA��E�70�E�l]�F�2U��'&�8>	x�\7Ad:��&5���D������.�dv�Q}0ݘo�l��Do�N�N\��w�+˟iϴ��g�9��F������Aus��?��M׏<�#���2�J}wl�?�ճ�6����c��;o�=-X0߆��93Ӿ����57'ʹT4�XE���Dr��|���1�t���vY��0$�
�X���>a����V�����a�E\��%l���Is,�M���}�{pϾ�0�B7����-�h�O�@�#_�C4�:��ֈVҧ��a�K>tD�e}��͟(�i~.n�^�q#^��R�Gv�ؑvnۖvl߆�R��ł;q#
�%aH��̈́[+rE���Vj.�����s��i��+��F��J�ٿ�MP��Aь���҅�\�6^rYZ�+�39~#�����P�9���x����Qg�a�n'��2��5(���=��
-+���!��2��\��q�a���z����km��,��D�L��A����S*D'�r�O��O�
m[�ЁS]���PI�f�S��L?���'�R?
-+�.l�`���}�{�rݺuwon8�� |����t�mIsӦcfb���€W���I|�v���׏kLTYT�:�Z�ϼ�l5L��>���������Q�csANΑ���H�?��u��m�	M��bl|��Lw}�&6O6��{+��Wp���G�_��;mSx��S�>lW[�
م�ؖ�3�"X�A�6L��o�f��}4}����1�t�e�ٸ�x:���vJ~N%�Y���pׁ$�+�'y���+t�-_��/1�z�w�i��NS���V����E�+=n���S��,��
h��&K�����K_��Ќ!g�5kfZ�f
��!=#��>��w�����ܙv�ޙ��K#��X�+H �d�t��=�1�=_������sqru�7ý�o'Əh�9�ʝ�q�ī�@2���P�O���/~����&�ƾ�>���!mT�@�Qp��g*�;叐�Z��;+y������EK6��2K����ߴ������ɀ��!��b���0�n֡����1C�z���7>;�3��6Z`����#G쑁��$�^|�t����)���#|�ߧ9�i�Py�h�G�:���C�Y���v;�E߹�CU-����/���Z�r|�u՚u8�_�V�]�/Y��K�R�T��bf�f���@O�}����t�;�W���*�Q�H�����m��a�C�_�.�}u}��F��{���#σ�w
-+���j���_�{��y_;�W����Z8�royr@8��#O-8J��et��u�fj�+�g+=7�)�39��6C5�	7h16F�Z}K�G�O=�2�mlx�?����%K��%˗�e˖��+V�����.-�Yց��)"
-+��L�yPUвρ7Iq}�ڭ��X�	Z�c�y`�����*�Ϊ	|}��Ҿ���G2rB����+�"�V�*��;�(!|P�����q�����|��o�M���6eX{��tI�ާ�涊��6 Mv��=ѷ���.�zO��FmI�Pq^�2}��Ky��me]�l|?�=?���@��7��n���eg��o+^�\�-�ń��
��~Ѧ�� ',�X��BU��3�+�v@F
�A��nM�+:�3�p�"0�)��r�W���:�/�+�A�̻����b�<x�\
ePºaM�<f�F�o΀�p�afO%�l��Lb�@bQ�惭���w�\�T�|V-u����g�xI��zΙ�̞��2O��M@��1�3+��p��$d�8t��ye����;~�gϚ�f͞��f�ڝ3���9��E|s��Mc���8�����γ8�9}�׀p8�vK,���7%�+갪��AS����
-+�)g���i���Q��0���.��ٖ�Q�H
-+s��0OJ�S~s[����U��y8>^��iK���~K�c��Zf5&�!�tL��O�]p�>���6��Ɏ�[�C�G���Q9�hK<U��]N�#�^�/^�g]W�k����+W����s�f�Z��.S�@5	Иpm���L�ӳ3�ABi�vJ��z8�8d]8aoi�7�N�_�HAm�׋�8L~��Q�M�3���o��b�5h=<���p:6��VP�
-+��0���'�_�����SK�R���9�����;�Hw�y��p5���[�w߻V2�+��&u��h�(��ҹ�Һ�+~B��C�T���<H���ݒ�[�`˲$��
��L…�K.�!í����P�P�_�^U*ëJQ/�T�B�
�1�6�Cld��ccl�%Y�,K�������[{��Yg��}_�Ԓ�彺�Yk�i�������cmCA>�vbOKN;ِ���s�M�T�T���:Q�m���ڑh1�'��'��U[R�J���h8�@i����Ka�
h�ո�����\����0��_�k㮋�1��x^/����
��t�����B<ҏ=��7p��O�y�"�va/z2��^We���#�O�[�b�U�s�����9��SO�}�Cz'����&17?Ꮽk���1_��+��N�*����Z�G��=���^� �u�m�Ϥ�_�ⴰi�z���o~N��[��N�qܐ�W�/����
-+��3�=��l彰)���`�@�ic����A[1�$��5�UC�C�Lߪp�����ޔ�N2��[+K��U?�����%<������>�,����������W��y]ٛ��y�S��~V%�F��9mń���_�_��b��t���HK��?��#��y���%���b\G����� �8�~�7��پ}�!�
+����3`.�I�/�μ%��_@m�_{�
�N.�� Kͽ>�&�4�~�Ѱ�hS�P�Oq
X�dA��j�p�7y���9o���V�+�����9V77B†�H�m���N{2���u	k����$"ҩx<�Ϛb�	�X������_:�rF�F���ϟXΛ���3�[���B�w���#
8�,��D��.a��p�����Ÿ���s	{ڄ��<��p�`���2`��/�I�6��A��Tg��O1���G]IJ%�����^������]�����5���������t_�>����C�t���<��e�ԇ
-+�m�	��pE8F����y�O�	��*62�.P�ډ#]�$2d��� L2�U{P6��X��5$��N�x=����*�/c��B��hȄ���+ӿ��L�hT �a�rg�ì0�:���P6�L��L�΍ 2W�X<ҕsV���J�h����!�A�.\���;EZ�"��I��c�c̍vCd����5yh�mT"� W'[<S񕀎�Gl4|	��l48\{�����b��1�7��#+1'�O=����UDGp�r�P����=	���+��l��������^����F�!0cnqwCdm��+�m������֣�V{�S�R�b�v���<����)�o�Że߿�2��Jb���
-++�Z7���9+u����p���*+h��D<*�&&d]���?.��¨�=��y��pĒ��d�d'���ڠ����{�^]�R-eA;Y�����+c|�
�;_�_}�p)~����^/Zl���9=�io:a��~�����ǿ����%�c&3����ߧ�u�y�i՛y4�v������_����6^�c��0�|�:����o`���1D��V�18|����e�D�´�]p�s����7U'⾆ZzĞ�P����tn<���7�s��\�� �����T��/���0^�/��WN���ւ����?b�ϲA��b{Zz��q����A�('R&5��!�!��hb��6��#��æ�x�gJ��X�2�����éCŹ�h4�kOF�Au�)g�۷�7��v��1'�m� ��%��2�_����#�a��G����sƒ�}8|����?��S�A$�Rp��}��͛�~�a�X<�sc�"-�
-+ĝ��T������e��,�&6;a�[!��m�P�Ot���2��=L�������2<���&q̺����]���y��g�����]w��t�`cXuA/��T&��@eb�p,��QG��+Sc&�#�)�j�Hc��q�薯��{�A{���g�]�s������?6=�9\y�ea7����G�~���+�-Y�gŒ�.�����zY��z�X"8��q�[���_p�<�	Z����x�:th�/��/�����ԯO��8]�{,�DZ#1;lwu��!��y�鋀�I�,Z�����ž'���瞯B�@��OfNxMza��>�n�-.(�忟��X���h���&��ۂ� (($�'�H's�L���j�����*�g:����23b]�R�1;w�-���S�_��rB	��!��缧+���¦#_=�Ǻ���t/�4v�$�	�\yuX~�J��s]#;akT��ʹ������u~}⚵�����{�4���}�3��u$�N��~��p5�d��sOWr�Q�ђ7|ʯ��W=�J�̔�@��亢�������Ž�h�mM�>{Z
�}�4��D�W���{�	KI��i�m-O8U�j¦��7n	��6+��B�i��x����a�Ġ*�d����J.=���#_=�Ǻ�|kk���;j�-���C�xbЌt2�}�t%�p����P���R��J1K)da#&0�)�*ڈ�]�uة9<�&�s��X��~���{޷U��|s��nݺ/��|R���i�#_�� ��I(/0M(�+
&O��.o����H�%K��g�y����lm�T#9�<Q>s��C�(�i��p!�{��p�W���vs��	�g�PDhT�yT濍��~�b�bB�\a��+F��i����?�����Y��W�"�=�R�&v������Ug����ܖ�ʾ�l/UQ��:�^��l��L�j��	����|ϤI�x��@�/�ǁ(��N��/ebJe+Y^�|<��祇��qĞV2��z�u�{i�w����=|���_��_���>��n+���ףp����N�v�Ť%*���@���Dm��V�\S+����W������;�˿���/��ƉGZQ4���&O|akL��<�/��ԓ������>������e�4�E��my<
���Ĥ��lz}���H�ąmML�����h��-{}�V�_�9�w�i��e�cL^=���߯'Z�p�Ƥ�ds
-+|aNJˡ�=m�>�(�����x �<~;�ro",ķ+�M֖�}��	
�T�UA�l:1���6�����2�L���i�4sc!.����v��r����LC�U�BA]-��=}�?p+�)�6u�#
�	��_��g��1?���������b>�?�
��aӦp��wW�'�,�j�6̴c�"6=�1���ҫ��|k�Ȓ8��v�-|�J�g-��/��\cP���t�`_��{Vtc'�9L��Q5M���Fg1LjB�
�0uJ�?�i|7aɈ�&��#6������!����Q���AZ[���� ܋�|2��C�|�O����n��aԷ�.��žh6��,�
�'"���r��m��wm���9�+q�Q��]������*�?3��|��%~Josǒ"�|Y��J��'������}���#G��G�O������x��NS��4G�<`�:	w]��I!�&��Q��<\c˭��j�P]��Ğ���A}ʅ=-��}ɿ�����kK�O�ٶD�G�%lt���g����'L[DL��Ia;f���>����U+L�0u��j���xf���ʱ-<�����C�G��1�����)^�N�J*�����b����qH�<��%���^kc���BA:."H����&f\�Hk͊�J����l_���+w�:t0|���C���? ����<U��|����ql�������e+�\�/�`���-[blv��7+��d���"���vV�gtM�&ʇ/�.x�#Pn+z�-��#��=-y>6�P�+��Cx���E#
�k˶��^��9#m�L�Ӧ�u�
�k�9ႋ/��C��J�9b;	���K.EK>��{[�&VU7;oLj�oO^}��6y̾�N��j���3c���BP�h�WY���k���s�b��3�6�Һ�s�ɜ�G/�>�G�x�VM�:<M
|�3�V��s��]�P�o�ؠw�H��c�@�
p�!��'�_F*wa��������O�ܹ�I:;�	�����M��^6~�}Q8_e��^���벺�nT4���cD�X'7�%L:�GL�@8=20�#]cs�9�:�>[C1��V�+���cc��㟰�5��Ɯ�-�oYv*����_ο��9q����Xs6a��F��ɌLz��u���"�گ�+��<��y�E*�}-�QJ��\'g�����*�}��\�V-���p<��
O�7�xLúb9
Fl�0K�{ȕz>��Xλ�2�)c������{a����u��BD��2�4W�Y�/��������鿅8����\�S�ˢ�u:/���W}�v�z�/��/�}��k&��z�:�ʒ|"Pn+�O����e�O����m7��4�Ƞc�q`a&<A8lo�Գ+��Aۚ<zx4�|뭕���p&
-+�A2bO{�~4�&�樣��x���4��O��0�J���'�m��A��+Z��=X_v¬�`mt��p^������3𺿅�xj݌�������/�\`��3�5Q�qH����\���V'��e�ž6�$vG��W����{5��x��~��}�t�׫��$���_��n���&w�A2bOw�v��F��+ژ���:Iӏp�?"p
-+�?_�7��d)1)�G�e<��������&{��	�uY���8
(
<
ANU�3��>_�cj�<�	�x�x��,Xm���
.�i��l��Z�Ks���_������}��&�Ar�%ԍk��VE����>�����-lGxOK��H���7H^�_Ɵ9u������04<^��l״�<�IĞ�mQIv���p�x�9�ؚ��?���M&��m�W�r��4��W�	�$/�=����IG�>�|���o��u�琧k��Թ^^��7��|��C�.<h|����ǿ� 1��r�G���Z�D�/Ͽ<�^��%�����	��o
Ό/Ǔ�ӑ,�I++��;v�x��~��nA�6bcuaO�o��em 
�ʒ|�"P�
p���-�\�^4��H�wM(ɶ|�ӟ�D<n�	O����Z!����=ٔ�u� �t�z���W�>)����ꡛ��ɯ�/��x�ﳧ{�U�_Ɵ��+�s>sj�����\V�yf�����r���Hs2'�5�M���s�}a��������pI����4����t�j���㝗g��M��������}��?��կU:��l����2H�E�|	o��]ZS��>{���2�e�gn�\�G���_�)�i���L� �:����g^sl����^�)]�4�'�>�bYt��9�+rZr���ˢ�?��C
}���p�…k�����f9��=�r]�%��~��a�؅_c�C�l�7i)�B���@�=���/�L?�_EGW��o��z�ό��6x�<��yZ��R���q���\�8su���0�����n�ƍᵯ�&�5_�phn8<>���15�9�i�o���e�#�n������f�p<������|Kغ���� %bO{���׽��s�+�?"�\g���cQ�:�q���_X��?�,�h@�̓=??V�W^y�_��_�*ں1�����	��m���*�&�\�D`&�p:
�>�U����/��k��X/|�S��2O������$��_��{_�՗-��Ռ��,+�n+hF:���ES1��L�ի���.��HuEq�0��?��&i��ޣ?��
��V*�-tb�,ڄ(��3*c� Q�W�Y��Uƿ�8��s��C�S�z�����Ё����ޤL#]�47l

��$*1_�۲u+~0?�w�ٖ#�'�8�ߚ/�o���R��bp��_����_�7�9��7���w��Lr��n��ʗ�V�
-+7��=�9[��
{�U�y�C��7']Ɵ�4ō�m��,Ğ��AҫƋL�,��L^�gs��7q8���R����y*�s�2��;�C��q�?���ccc�|���={�<��G��b�+�h�2y�@6h�����+�mK�U����t�Y1՛�S^�h�|��8��؛k�E�T�墓~�?��(��C.f��G��+��B�C�ox9e�V�#M�N���r�$�U��r[DK̲��W��]��w�}���]=22���8�uQ��@�z���I�x: �ϓ�s'��9è�^
Ds�2!l�H�z%M�#�A�Ӓ�;��-����
-+�F;L;;YH���|a����71��$Z���4U�\L_Ś�Ӕ<�t6&��I��?��#�t��4ٶ
U��|���/��ob�&���󺵂�I���Ы�\nΡ_U��gu��F;�:|�=ݳ��>�'��k��󺾽s�͡Ukֆ�O����%_��:;�:D���?�Q���Š�˪���������
ij�1�P�q�Z�Au{Z
�<�Y{�F<�H��F;L]���Ӕ��zI��ǔ���\<�KE~�ϋ��f�]��φ]{v۸�w���c�58ٮ7��ᜋ.������O[��bY|�]X|a�eKL�<�-��S�����'�mα���cJ��	���)���pW��G:k��U<��΄���0u}�=m~|]lA��
�O�M����y���������y�6�G��b��F;L]?�6?�O&m��������k�_�������t/^�4A����۷�G?��?�Y<���{7]�7��=�t�
"����+[7?���}�FeZW��9w��F;L}���(..�����+�Y�iB�С!�-`1n��k�x��#������>���+sW�œΉĬ��G��_��_���,^�w]�{��6�+����@�
0!5A˴o�_�%�<�z�h����o� ^�f�0�x�W1����)��9xC*"����:���*pY�D��0m�U7����y�t<���v��O���h׻2�1�R���'�>|8���EKM/Nr�6�
�]�P���iC=���r��]������žO�Ɯ��"|C������-7}��V�C�qY�W-������nÑ���q��[<�_���
-+��� Ŝ�J!��@�.��_{ι��|WT��ӗ���Y{�:U��l�>�Z��8.Q���ůk�<�r	�i�O'j���xZ%^N�I������?�I|��>�t+��S��&{zʎz�����>��ػw�SP9���/�I���I�
�VY<�'1��I~V5H������eK�8&���?��W\q��d̤ƚ�c��A�+�w-��\�m�Űg�.�If���3ۣ���6�9ҵ�؄�\͛+�+0C"`��iKiF\�5&���Hm���e�I�*���^{�}�����˯ԉ1�q�d��n��M�/}o��k����|F�ZRr������b��K
-+S�A�+���J����F�(�dd	Q��Ɵǣ3q�7O�
���-\�d��7^]���a{����5x�4ֽ�� y� d}h��U�ҧ���
Ȝd�X��WC�E.[
[<j�&&/UF<�Հ�i־�X�����p�ľ,��[l�u��j������w���$~2�ccc�A�O�y����i�U�NuS��em 4�Nbx�X`�D@+?���B��hϓ��\��={n��ƛ�4'���]�9H$�{��-0�.˽�y�t�\�`B]ɬ���B{Tc2<O:ӝ�+�¼�F�p,5�vbd:�$)њ�M�x`���+s�2�¹�GvĞ��~���-�W�3��U(��(�0�KE�V�&�t�E�¬�h���Xd:`�JA[1�H�v��A���'�ڐڥf
-+��hbOWn�+\����
QP�3ك����tU7�_5p��6�v���d'��ӕ�
-+��
-+x�Z-
쯭CX+z�I
-+A�0����7�8mx�Jx��g�%_�;�)тd�a�ŧ�Kq����0jm�/�klN_%�ϧ��Y�78�7�CЬ�GF���n�r�^������}��Y�Ɠ��>&Q�Yg����}��O�!;�,nY{�V�Af�Vo�S��Me��`�+B�"6��{��"��u�~�#�ahhh	�B��AVn��ӗ.O�����I��o����!  �v/.����ae�M�
-+�hb۰�0	����"Uij�	������Mq46��^�x����B(��*Z�I�hW���)~��`LmKr�'���c���H!75�AD�2���o�� ���Lj�sο lZ��0z�P�j�V���0K��
r�����=r$<��a���a�gF%3����|C���x�g0��0_���j=Iгd�/ķ V�S<�O��b��Ǯ]�}�3a����(T�Rd*y�k�,��>�C#�����K��xE��"��Ȑ�LY{�iQ�9xu��gO��#e��	�p؜�I�i?k�������W��;��ϱ�]�x���'zML�r����>������x����8Jl�.��E�t��7̆�+�؍��+ĞNr��$c'\�_ǂ1��8l!T�z�����+S�v������k�ƍ|��~l\M�.�s������L����1(7+~�Yk��܊l�"����EظR��F�,�������[�`~X+w	r�Ɲ��?�p���^]pA������YM�w�s��g�R�0�����6�����h�*���4~�
m��G�׳��͍u��v���[�~�,�8�
��V���e����*w��W����D?�|E+���1�䁭/�1/�_̏fv0M�G�̟��.ߘ��fEWy���̌�A/�����ƫ�4~�X�_����gN:���Nu[���i=������97�&���]�s?�s���W��G���D�
+o{�{,���(�c�t���h�%be�0���o�P#����[3L!#]�G[��p2Ɵ��퉔5�����ocmCZ��x�4�ʤ'�b�9�2�'��.�M��Z�;.@���ߴ�M����x_������?��O<�裏�f76&*��\�˦Õ
efp�
�<8�i<ҡ�‘��K/��V2�<��sn��ƑիW��Q|��%O�Ƕ��U��U�3�)���t:	���>��5)�GN����֍�,��QO]������aj�;`u��J܎��*ԖNR�K�cl��f�ȫǺ�k�bG�Y���迭Q���]���bG���;��[��y4��z��x+��}��ju��5NĞN��B�7��=M=����*�O=v���;��0��6����#�"{.������+��+�˗-�������&&xy��u$� �?X��䯘�O�����,�'�q�a
�|2?�A�m1��+oV��x�.�
mE������}�������O�L�<{�8ԫ�����=d�Y�������{)i^=��x�@X;~(v{��7l�p��������>6}�ϋ��O�%���(`�o(Z����+�k����x���p��أal�H�A�yK��<�-�D0_����=�/��!�V�S�W庲���f����ۓs���I���js�9����v{��j�'?��g�~���f��kM�1������g�fDUZ11jO�ϵgr����3?�3�~����ν�t?���v�0inOGN����b���+�����l|4V��^w}xݛ�\��e� �a�Q~w�73��yN75���6�"�5[�nO�����t<��A��>��5�Sk��T�ߌ��(�55��یw[^�|r�T_W�w���#Y;gvq۶m�5��7Z������ק��@^�:�9@�d&�
dZ(H�`��}и���?ˤ���y��+O>�4����b����}�g��������馟�^uu���y���+�_Y�uS�	�̎6��N���Yx����|p��B;opc�'σ	��	���1{������+��=��Be6]����,�|c#��OPY�1�nvD f��hkie3;�|��?��E�ʺ��o���O|�?��w��6����t,X^wW��G(Z_
ȥ� :���1���%j7�H���G�}�_�!Z�3jO�W~š5��a�u	#':W[�)��[3C��S7�w��#܍�+Zy�=���/��k-�_��[24�/���W���2B�'�<��Ꜭ�A�����?��?���@�~�-��t@���|�ƞ���*0�"�t��ɥ�Y4����/�=���_7t#��O�����~�:1r'�Y[�8h���&�������E� ����N1Dq�j�j������y�%Wu7�]�ݒzU�մ�hARk�
�8��,�b�?#a��Y�0^�v؄���
�`9�,�ƀ�Q�Ӱ	[ k�/HH�V��Kms~��_�ɓ�/��nuU�ӝy�=۽��=߫|}u��#s����(P
��Y�T�f��fR��]?���G���!H��q��M���m
���1y�S�S֭_/a�u�m�o=^��������6���R�
m�v߸V��������t�9ܙ���k����]R��җ��X�+Q�25s����?�J���,�_�k��*ʗ
-+R��?xa�-_Կ���v���������/ӃSo^8��3ۊ�o�����O�7��c��n�ԟ���hLN"'�#�c�Yq +�fj��$�� g]���`c}X��3NeGժ3�f~U���^�?���$�P�Ӑ#��-?�w����۶;�o���MX�nCh�D+q(n)�2�4HF�+E��'���Gp�7���M��_z�)6��\�wb�C?K�'w=�%Mys>�ք6}�SZ;��U�~���7��?�D�b�gR_�1��u�������N�ob��&�6
-+��W��������˟{M˟�~����>~�o�\�y��iO3m1h^B6h�h�
�m8Wl]z�Gl��
�����{�z?���K/��8���7�0�H�]�������6��g}��������œ��O
��܄�Ik-pS:1�"TmN`@hҔ�3�B�H|df
-+A��W�}�m����$R��N%O���O�Gr�O
I��x�6�F��G;���cc��ig�U�^�����o�;A;L�h+Ƞ�A#����r�k�Z���1��K�Vɾ�}%���cSN��(�0+`1+?�����M��ũ3{M��$��=(h+垦��ˑƲ���[ny��o~�%��㫡|$
&H+/���m-���
+;�'��@`��b�A����Mp��`�x#��"��Yc�|�|�-
}�g�o��=��O��5���������h��uُK
���'�V�l'�I��"m4xm��'��grL_m�m��?(q�
�t��蚸��6�A��+ib˳4�mW��}^�m�����2�_b���U�=:�(��������=x���>{�C�����?��?��{�/��O��"�.�����T+Ò1���Hd�9�Gz��س�xX^��C�˻���'V���xWg�������i_�-b�ƍ~���3�*�oH_�ǿj8��S�P�V�WI�K^V���o�a�
�g�/^6������ۧn���U���!�����ƙ�b������?��z�UW�ן��'�!%�)�8���:�S>�����y�*`QF���e�R�p��1s�2`^Y>�m<�l۶mj���[_򒗼B�Q�
-+��J3Q��1,H[�~��m��
l�?���R�T��܊�մ��0�pr���XL0+w�����+�*�߼Y?5?����o�[�\��طw��<0Y>�@Ys��]ˣ�*��+X����4"���4.�
+`�H�2O�/`�G���y5�z.X+A�
��ny����7�X~��
>�ۀ��/>Y��e}��Kż�>�^�/]/O*7y�%���Ǿ�9Q�h�+(�����?��Uޗ�12Ϣ��h�Y]`̧�m�BH6i�N�KS��G�ɾ_N����d�����]Q���u��L��mn�*�>��#�����R�/�x�
iš(�6^Ү�/�*˓��;�&�fyR�*��+���<Kw�S>���/��>B M~
^�ž��H���l��1�?c���㉸�gi���R�m;�w�2�&���n�%�J��*˓��;�&�fyRɪ2���;�,�%O��_3��Q��f&�M�s�}���ʇ~fff������o��6����Р�x���bqS�+PNp�}(*�����Ҷ}nN8<[
-+v�o�=4k��}q�/����|�V����O�жݿ�u�Zq�y��7J��ʼn��6��銯�I-��84z�0l� ��nS�vKA~������kdg]��eX�˿�

 N����C��ڱ)�l���V�ʎ1m�78>�4M�5ǪM�0ڿKe�1��mVr� u���-����ڧ�u���a�.�V4�8��w����?Y~��$�ɿ��������@���?r��~_�?*W�aA��Š�E��U�X��+a8X���
��)�� �,*�����]C�u�[B�~�pd��+͢2;����5DY��u ��gGV���+�[�lBԫ߳Ŧ����{ʽ͉��Ҕ������i`��+s�
v���O^}����'��ST���|���2dL�<^B�`y�"e�
@� L�,n�u:�����0e�~��;w�|�����R���ȉ��&uB�0�A�V���ذ�7;YL�C����K�f�Xm.��+;TT�Ӷ�'b�%��S��k>Y��h�3��p���
(*y�p7�J}�?��8�śm�K�1B-d-��/J�W(Hg��'|��ʣ2����n���ƿ�U��m���d=��} +!k���(Q_u�D �qß��k+���0+�e��}/��e^ɟ�[�xN�7�T���(���]�jy��4Q�=�^��]}����XB���]�t�%��`~���Wot0���G��w���z@b����{t���u�������b�_3;]�7����嬾������Y�ӟ���5��?u��k_���M�����;�S>���K���t@D�
�"�"�]�8��w��E
�Q>y���޿�^�Y��_���_,/\��Y��5&�6�v������<K3?��/<�8^�	�}|E19+���7H1$�%�^��:��qRZe����z���<�|�̊��,$�l��:��:��-�k�mr�,���ς+��W�@����a��
&
O���ӟ���֭[}ի^�R��O�'`(��V:���k���6L;�6{��U��3�g�VSx'�T3-�	CE.P-�܈A�n��	n��"�-�ȳ�r���+
w>�5�9�:Q�h��_�~�=��#&H�
-+�ayԱ8�+bǘ���k��&��7�%�(E�kR|;�!L��=���>o��-����}B�����&/w#A������sԑ1�-g�������d�=���<y�g������C�a�>{�S��:��O}�ß��'�/~��z��2�Vt�%l�+�(�Q�s��R������O��Oo�{�j;ГG�VMl���K�%�耈@o�
@o�B�D�K�a5H��Qh�H{=�i���_���)���͛�5.�J�ۨ�-��Y4��ڱ�!�ʟ�g Ԇ���$����p�T�
-+������F��}���yȭ�9ò0�]�}�|���꜋S�P
Wa����=�W���lw�!��_�@.�h����M������l��-���� w���i
-+}�O>�x-Ǻ��\��,�@rG?#���/�`�h|$N���
HkG�@�D�%���eϼ��ô�r1��U��?!�{���U.޼!�1�7l�,}�w~�k��������a�
���^��|��( "0|�(� 4�|�g,�+��{�W
���A��@�bŊ���/�։'��2I������ɻ�o���/$󛐟�c��s+�����吙g�K�:	Sˏ<���<�Ã6�P
lL�n�xЃP�tiox�`�+��l����ِk#T����c�����_1�IH$&1�����
�Sc>j��;����,Ξ�#��t,`�B}��>��˨�}��?���?���G���n^�����O�C?h�����08��
-+
�"����㑵�-t�g��:�Y���?x�Moz��+W�<�
-+=]n2�,���~�h��l�}��4�,4}
SzLj�w�Z6^���FU���N\���ȍ~�V\) ���vj%t6V;)�P�S�x�I����{����Bs�4}
'a��d=V�?�X�i`�
-+7�-I�=��@��J|dcŰ����/�!�5�8g���f���;�=�Ot�0��4{!�:�JA�?���4�FLc[�O�}��H���5��ƺ���,�4z+������a�M�yh&\�X�%��s�
��C\t-��|��e�h�1t�́;v��;{��^w�L��X'�������0�-��SoX������$�0!��w,=`�aXiS6���)7d����L�UE���8hF�d�|D�3�����O��el.�ȋuլ`ǂ���RAq*+xQ��)�+�:ڿ�����x�8"N+����x
�f�<���߹ޔq҈��<Lɸ��
����az�efO��%6&�qB���%��!��i�����oy�
Ė&orrrۻ�����뮻�S��ȅ���H�A+��S�
����H��̣"'mU�x�[ib�X齏>��~�:֣�zի^<66����(O얦�_@�'��]��m@`K+�+�?�K��$^�
��+&�0a�����/�
kSD�#Ն�J{`�����Xj���d�q+�)��<�U����w��2`�K�b,kS��G,���?A~��i�����b������o����S���C���?(p�u��&���:̏��td/I�@>�"��x+ly�R3��O�������ߖ�p�o;�{�=�#^��-q�dU�����F +n.�
2Ah�-�֩�=4ź���HXi�aD�)V�n��_m�����m#KG��o�ϧ�D��B|�`������1�c�K�@�B��iL �gg�[9;]�=��X73�����Xz��϶�߿�ۿ������|S���\���>d����^�#ML����T�#� �lz��ˈ��+�+�+Y	s(�����b�)�n�2�4�%:n��2
���Cy,�w
%������@d_ۼT�}1?�r����:[�,��
��)2[&eK9�������6�mRƞq%���|�\]��yP�/`�l�[�,��
��)2�Xْw������ �}@��H9��X�7�b~�?���mn��tЧ�l��-�����=|�$�Yn�2��+��o�3�ꚾ�tȃ}
�e���e�
�6�O��,�ʖ�e�/�ʝ5���,?l�����C	�C�4��Yr�C>W�/������|��鉉	�wɅ�
�b{���?|u]"R�Š"GL�
��Q��p�$nS����x�M[�6�MNMMm���>��W���+7nܨ�@���~
��,ͅ��@�
��N�hy+p`?����~������[����|G�8������.x#˄E�&x�������<��+����O����FuaV�4p����ys͗JȏtW�me2<o����*���9�{w>����AB�Ix�F��O���Q߻��E�K�$Ě4�A�7o����
-+����;�]���AB�Ix�F��O���Q߻�����{�N�ڭ�0Lz������2�����ۯ����%����g����o�=�[�:�y[���%,�Y: "p�E �
p�5I�#\���Լ̯���z���)��������K.9p�I'�A`A+m兮�[_������Q�ؗ��.ܪ��Qi���Wƈ�C߾��gi�g��A��lm���_ϳiK������?ƿ�E2'��
-+������?��A��W�������oJ�O:��}��,"#�+oLl�=PLK�� ���+M�ҟ�)�$
�\��f��K�Ҙ�2_W.$�H%�x�d%��2�e}8
�@�ęP�BӶ������i��L�>c��3�yB��P�t#)��1�(���
-++����Ҿ4&�9�E��kpӍ1AJ�1c\b�#�����<aZ[�+�P~-�Z~I�y�.1��*��E!������
̨�=��J����9��;H��v�5�T�����	ݘ��������̩=�J=�V�˵��\����K�hli�Y��)����ҴO���?�������\�<�[��G9�Ï��U�@�Xp�+k�+
�H`F��p+�
l,�4d]<L�]2듴����w߽G����.;c�ʕ�rqn��:�S݈�em�A&��jˏ�����G��3���X6^���!�C�	n���)p��,muM�BWs@NY��|�'�`9YWy�*L�W���}��@>Q�*�x��0�H��h����l�2�(��) 1��9
-+c*��=�������3��X���Rwa��������<KS��

��#݆'&&�����~�߸]����=�����+e��׈�d]�����r��2z�)�@e`#��Fu�zC�d$�����O�[?i?��
i`�o��5w��*�
}���/��}=�?E�ǫ� �r��[!ڿ X�%ݹO�0Hn˻o�R�����������M\s�
-+�B.���'o��A��:�5��+��O��s�TL� ȕӯ�s�/x.;	[�<^�O���˖?w�5��$||�/׃?:Ǡ+�����>��"Ż%㾂��� �˩�~J�/+���_}���|�|����jx�<�1���]u~��y�U�딞2�T�O���A���r�d�;�����;D�N26�8|q�O>��O���
ѓ#@�!�"����B@�q�,�'���Qֿ�O�p��[c�v��3.��?�?�Z}ҹ$l�R��U�]�����͕?8=�pW�7?�;�z
-�pah$�h����n����o��k��\6�����i+��O�uCT�I���-�{�#~Ŵ���9�yDf���#+>�?J���|�;���?��kd�����7������>�}Ƀ�H,�"Y���L2��$p�n)<���e�0�#�M��6C���w��c۶m�����M�6mn*p�lO�AY�x�#ձ ���}�
�*0�EH�瀻佈_�	��������{Ră)|�)���_t��� �(��-�H�>�I
-+=7g�
kЫ(���oa�9�al0R`�ǃXr�����plj� �'�q!l������O��9TL�0�C��?�C�A���#�����l��&��?vx�]��B�ű��<)�G��_~���?���}�#�E��Ƀ����_��
?��MQ�"�2��Q꟎�$D�uԙ���.;
~4��xԟ2��f\t����t�ڵkO���?��%K���;�}[����m��oM��H��ko��e�w�00��i+gɃ"u�7��71�+��T�A�X�A�X&�)xO���F�0���;_�+�'G`�#�����@@7��L^S>
�i���u������.7�OgϞ�2w�=�I�>БM���էbh����?c
�<0mN��3�jB���KI7∡�@�|�m��1�!�:P}�%O��>���[U����'[_�%+��Gh8��xWf���),X��/�W�0A��I.���
-+��h+���0flP�l}��>�^x.l/��Ok�p�Vy΃�<�h�=��b��r�9{����۷o�����3�]w�_'�{ �����)�X(�,��<l<9��B`tG �YG`#���Y&�)7쐥6��w��+8+A������0$0����?�+LCb��'
�A��|�Ο������T�B�����~����ێ/��)C٤l�u{�;��?kd�q����l�gL��^��+�<������ �=y���_No���׶U�e����7���W��W���Qɘz��
��U=�O{��~��eQ(�<9�@
�+�M{��
-+�$x��j��~�Fd��H��Pa}��!}F����ǿ�������xBLlA��>�'��\r0/h�7��Fd�!���&�/}��HE���/���DBG�E2z�g�ӼٶB0���k�j,�sN+�ɷ��'+4��(eT�L�)R�>E���*?R�C��������m/��
�v�+ڃ?f޼yk>��O�����ߕ2d�k�;Đ�IX�0�ȃ��d�;xhJ��s�L�!�����<(R�z5�)�c?�G{��'�o��щ����[}�TH�X�-6�R�}x��Ɯ�c�	��}�#�"N@b�d��G��g���CQ��ޚ|�������?焞�K���]�aO�:O�G[3z|p���ʋ��y�W��
o������D2�����;������5o���2�H���85�'+�_듕�����"����m���r�d���i�I�I4�|��0>�x��[
-+Ӗ,��^݄9�͗G�q���C�5�'"�q�����o�B^����H�f_Dn�5O�p�_�)[�@-/� ��eP$�=9��(�'+ۮ�3�Hb���ܜs��a�Z�����"�m��^0#D{u��
����pS��	�9��(�G����O��f>�/8�����?��^^�<�ǿ���+�����nۯ��8��w{u�;v����翾����J�|�d�
3
{K���k?��8(����<E!��8= P�{�எ�#`��+�,k�u�X�|71hgy���O�����{�/��>����
�*��5�W�\|��:C.�i�	����Ek���{��zZ��&F��`�����[�`P󣣽Re�������͒у�ؕB�a����I��sL�=>��G���%++���M[���ĤʖxRd�[�������7޷oߺs�9gʹi�概����&IS��O����ZFM�?t�i;�6>�e��?8��1kd��O^84�H+
�}#�S���L^�Ԧ��U:��zϞ={�G?����'�H\T�A6Q�du�6~��r��>[��Z/K����f56M���+l]{�_���FdQ�}`Vc����󀘰n
�\���T]l������N�+�R	�L�E���>��~�'���̍G���������|�}?�=.��շ�#����*�����=��^u饗�(�o��}�dn�q+f��En<;+5o̚�2��I4%c�2��@[ׯ_����~�z��'�t�Y�4�R+x�S�)Ӷe2�pسmlo]�6��G6��E*�{���T\Ċ��&P�7+�Ц���I��cHI��I�Cg�������){-CH���(���R��`�e�ٖ��j?k�ch�*c���E����R(
-+.E��Z�m�j����:���1F�^��\���(���R��`�e�ٖ��j?k�ch�*c���E����R(
-+.E��Z�m�j����:���1F�^��\���(���Zt��i����y�����ƴ�ǦC`z=_ c�G���?(����w��|���M��_��W]�n�:���~�x\��M�ez�O�~,k{�@-O���e$R��8���A�G��S���8)������SY�чe-cYSmgm��u���9眓�n‹�-[�D)�Jz�܂�V�>�U�Fdȶ�O엋
�'�N�H乞j�c�ͻ��Z
-+�kp�����n�ٞ�
-+z��k�{�}�}�cs�v��n��O�}?���˿L6�K��	�Ƿ%�<&�"�q*	T"����M�6��]�zוw�qǽ"_/����7�O�!c������STB4z&�S��p�X���z5���G�X�5wx,����iu)mO=hJN)�Pʏn޼y����{��+/�L)2m��+
,�0
-+�H�A��ݠ��Jb5��5�3�2cZRl�?6�2��E��?c��7x����&L��Ĥv���2ޜ�>�#0�>Δ��1���c�3{��o �h��:�
-+�M����wSG��֭[�����k7�tӽb�<(�v���G9E!әvږz��6,�"��Qu�:��8E��#�8m�7�����,yP�S�ij3�e��Ç<)eU�u-���Wu�^�̜9s)M/�e�܂+�G�3�ړ�۶��Gd��c@� A`���a�չ���C�5yP$����?{�׫�mi.^No��ʽ���߶//���r�^���oۗ����x�r��z�������m�\�<4�������#�P/�!b�xFY�F�@���"�O�KY�=9�m��%����<U�S�Y'y�d����y��^�P�8���u���5�@	��
G�@+tF����}�<ޏG�����j�z�t��\��[ko��?g���xRϡ����������;��>)#���S�u�@-��aЭ�2в,���<(|<9���+p�<�x�^��3cƌŹ��K���ZPi����M�u�[{[�z�FBp������w�����E"�HVmݍ��0@��`�v�x���1���@{}�VmݍC��ڀ�֏g�Q���ü�9��e귷�=��u���0��˦�`c���?Z����#�~����Ʒ�[{���[{[���������[���+�grwȣ��I�K�̳�zȹ�/�i[e���eYS����H���8G08#zr�����>��|U��6�@�ZW�S�)x�i�W.Y���|�Oғ�t��gba�T�`
-+�#g�ӛpE�o
���P��o�����eq!`��D`�Ty2@�m��I)�a�v��՟q����Ғ|�JI�q�.v�������7��&�n��8T���#���E��1�h��H~ӏ��t��o�G�֧>޴�-�������׍�jy䬿����>�/���n��w��]7mٲ�~�� yH2f#37礐Wm�i����1XG��Gc�1i�2���#p�!�\Za���:�@
��&���QF�Fߖs�Y;�v������'>�$����\��R�Hv��ZPi����7��x�&�ko����e�?#�'�M���=�`�S����C��u"��^��a�Sn֫��+�����t�`_���#e�ϓM��C�æ߾����������k{�>[��[}��������������}�C�/_�Svʪ6�)�җu�2�Hԓ���({r�#
�T���{�
G�
��&jy�,�v����[9cӏe�Үկx�+ּ����?�~����J��:P$�@�z������\��>��m�F�L�3+w�k�)��ONo��Vߏ�c 6y��$�^��]�v���ˮ����k��^�;$�R���<�hyħ��K�Ŭ��H���8
,�<9���D@��kjy�u�=E���qi���Q^:}��U�X乿�;��b��ǰp
�T�@�>��\�9�^����O�N���*/܋_gD�z�Vp��+:�'����r�ϑ;������G6f��s|G�_&Y���T|��W��E���W}��CCC�^s�5W���~|��������_o�S<d�w��P�}PNe7��5�<ʞ
G` �<M��x
G ������|.s���Zޖ[�Xe,�����;���H�<��G�ӹH]6��.h�
�A.^No�u��5��~����)�g;�ɀ]��jL%n�A���
-+�����E�x��ʵo|���= �A��Ng��j�	�n�-�ϧ�7���Gɋ�J>zh�1���|��;���ڬ���s����W��֟�W�?�����;�|�;��y���H�$�������)Km��t)�rYL��9�2i�2���#0A�+�	��#��"����5�<�:s�N
-+x�������g�t��^�ԧ>u��ŀ��/_~����b
�����no���a�k;�]
��b��i3�Pat�,$�9e(�/�
\�R�����g�k*K��O�)K������{}�l(��n� �ގx��	1�3��4�<�X w��'��S��������ƍ(������K<�}�񍴙�y��kZ�OŰ���D9yM-��'G��``
��p&�;O^S�l7��e�#NNF�k�B���/|�K.�䷗.]�����#������h�핟
-+l��
-+�����
#��d���JP��Mf���q4�bߊ^��H�4�X7(�mO�z�?Ǡ@XHk�,�Ѧ��㟙?mh�����<y������9ţ�-��9��7���n�X����~���<���?��'>q��i�u"�O�v��R�27�ЁgYSͧ쨧Nףu��
,kjy�=9��E �r����n9�@@@�ɧ(deYo�a�*kY�O��>�#��D����p����^$B�����a��r!���6�6�ͽ"��Hi��$���/�o�xq
4$�S_���J���Ls������1%�xL��Ǜ����:��@��	
�S~w~�3�����/�W��_�ɘ���z3ˤ��Z��6E!+ˢj�6H��J�p���@�K����������?yM-�227�L��e���mlL�I�����+_��U�z�E�-:c�����>yw���T�΁�����{��n}ن��y�3׾��kUL��f�������wē�
-+7��ml:��{�-S��}
a2�?f�|y��}��3���I�}E`۶mw}�s�������$�ɏHNm�����|�:ͧ�Y�XEb����Gٓ#�L���$�w�pR�c��Y����Æ����6e:m���X����/�x��_��.\xj�s�A�M(Rn�:��KFd�쐋
����򓁃SB8�C�R��\�)�4���Y�m��8�%�#�0v�>S]��[�PI�#����ąP���?cd8��ǝ~<�?5L��|;R8;�'��o�����|��Y��e�r��$�P��zcN^S��_�5�u�O�u��)�2���#0	�ɓ#�8�X@^Sˣ�37򐑯�ZG���L���<�…�7��M���%/�������g���T�w{{�7(O���;奂��\=u�L�+aL���(A.~ӶXV��>(R�O�T}���&������퀷�r#��;��?]~��@��%w��?s�w����/S�w�Lu=���^o�Ν뮸⊫?����Rʍ?7�8�l�(k�.[qhk����ȋk��5�<ʞ
G`�!�S�'G�p��=�Z��
;l)��)e:��Q�>˦N���-oy��^����ܹsOٸHz
���յ��h��.+4$+��ꣴ�i��TL~�0���p!�d�׍��>;�c��֘6�O����1�.���1�o��ǟ�;J��c�?O6�3����v��m�x+��O]����={����+���G>򑟏��<(un�̍9�y6k��Y�T�UV���F����e�L���p&9�Re����w
��>.����(ۜ��S��)bRny[��I�
o{���|��9s�Y[����k�V�a(�m�X���2n�)a`�\�-O�|(�$F��U��n���~�����}��x�7�����K�����&1��`�еۛ�L��
>b�NĶ+TR�
|�_i����(yАj�g/p�w��TԡIΠv{���~��h������//�+w��~�l��r�1�/������?럳��w<[����h�l�7]{����?x��� 7�C�6|k������2R�XNє,S�ȣ��	zO��#��!PrJj��#�L^�1�|�BF�޸S���S4%+�g|�`�(Å��g�^��w����>��ϟ5k��@e�Lkl�Vo�6^]/W�>�o��~��?�?(fO���b�^�80,2Ɔ
yИ0
��"��>J�i�e��;��vϚ"�[���
tG{Ā2D$�Z}�AL
-+E���xv�W|"d@�|s�?��ˆ�l�����e<�-��A�"�yP�>�o��k�����\ٶ�N}�������?��?�d߾}���q�����v�L]��de��M
-+_$�A�ʨ�C�p
G����ѝ:��DA@+�kjy�S�u��WQ��u=���B�Jy/��w��]Oxֳ����t�R �b�dξ����֧mK9[��[ko��?g�o=�? +=4�1$rL��9�r��~tF�Ѹ�o��������b
(Rn��������h/@�V�����Ь��i���h̐��̰��F_�/�8�=�C���)�F��W��J���W}���9�^����;o���>����_�
-+w��b��1���6y���^��ץ�X�Y��C^S�H���8�@m��Am?wp
G@#��%�gYS�7�гL��Qg���u�}к�R^�hѢe�^z���x�3��?!��,7c�A������{����ӫ�$Y�o��c��€L���<9�x��@q�+Kv���8�4&:�y����
}���jKH�������=SGF�ɲ�ǟ׋}�(�K�$.q��Xҡq.^N_�)��ME��y`���m�\y���m{������~�n���>��d۶m�$.6�{%��,l๙��T���(|�M*e��=��1���;u
G�k�J�ks7t
G�
}L!��Z�fn�)g�R�̖�
�i
-+{$-��+�?�b|!&�!�$�lذ�/|�߿����9��?$�j�+
{b9E�|Y��w]N�Z���rY����i��,���x��_��SN9�sa���3(/6�ݡk�~���Xcݟ��is?m�o���ٷnb�u�������۾���o���{�瞛?����"���w����m�C�����S��v�^V��2�.UdHԑOQȐ�K��8��aB+�1)�CFy��L�Ԧ]���:v�GWi3]����w�q�'r����K�@��(�mu���L
-+��g��r��������x�r����߶���l|[^���/W�������œ7�?t�w������w�z뭛�䃒Sjʺ�zS_�g|�G����d;)E���)s�8��aG+l]k_7���ū�����Y��o����[�����[o�۾����?g�o����_�W,�9��}]|���'��o~�[���o����~���^�G�w�*�`k��Su-+��Jg�aM�⋮�Ɵ@8u��+=9��#0Y��<�I�x�5�<�,e�n6������2�N��k:S
-+x�࢙3g.z�K^����~��SN9��s箄�'G��8�ٳg�=���믿����b��<X�_M-�*C6���&�6hb�mC���fYS�H�&J��p�	�+�t�Yg�]�|�����0��8Gr��ƍ~�w���o|�;���������c�\�'�r��A���˶
�ZF>E�<�c�?
G���p!8����s
G ��=�2�*
-+�ֳl)*����H�׾�1��)=e�—����
-+,�	.�����<�dy���xw�Ȧ�O����m�_1��p�捵��o��cݟ��Ǻ�6~�����m�X��yY��-[��-/������u���D��!���}����[Dm2����ZN^�pCy�娶�1S~V�r�:�H���p�I�+.;��N��z���'�OrS� �&�EoO�u��:����յ����c��_��n퇇�woݺu��տ��[o����o�<ҏ;�CR憶�m,�*C�ʀ���������2�ck�,�h�L��{r
G�0p�h�^t
G�H `���L�R��L˻-Ӯ��=. U���<�S���� 0O^ x�ӟ����|�3W�~��',[�l��y�N�M�+��E{��\�z��K�.=y��鋱QJ�����:s��7{�^۾܆���x9�����o��k����r�)�������u�~s��o��k���x��}d�{$#ٍ�-�F˻�agm)����*;��~Ue�RT�,�*C��p
G���
-+���Ŏ�#�8��.��A �rʴ<'��׶���k�OY7�6xJ+
,�<9��#��@�x�e�-E͐iy���LSW���2{+/+k9�n��!?S�y��+,�.�xZ`��t$���œ�#`MA��9���6/g���xu�u���sz۾�}BP~��i۶m�7���1�����-?��ݷo�^���>7����č*i�2���~V_Vf�ԧ(c�C�c�x�RT�,�*C��p
G`����(C��#�8�@�8���I�|�j��Q�#�����xl3}t�<��GY��d�#�ɸ 0����€�偅�s��9
.�hѢ��3��fq�/���CV'�
��e]��d��}N��Y%�x�n��ϵ'���r�x������f�m��͛7o�����;����}l���IƝ}��8�d�0 _ES:-oˌM��k9��O�.e�e)�2M5�vjx$���t
G��\��%�q
G�(E�o�ʔ�" yP�S�e֦�<Zy�.�&kK]�}J��Y=.��+�J��9���ݞn꓋�CCC;ds�S��!��J���;6lذ�{����`���+���
-+�r
-+��~�\/�墖�:����v]��뉧�����\��w�gc���Z[���Á���x����|��7���o��}H��/�ꫯ�o��m�����߿�ۻw�޿}���o޼y�mM�%�ұrü��6m����?����������q��������������_��q����w�}�����a[7�������z��7���m��7��1�9�����g�s�6_�5��5��+��{V���X�e.�8�Z͵q���5��� pu�����'wB�
-+�~6�\/��c���m������߮��^<�e�7���5q�5�f��ޚ�}�@`��?(�?o���������lQ�n����Âx����/��jo���f�� ��3�7��1������x�=�l��8ן���}P�nj��q��bDK����X�/��-����q�)���x����7��LJ������v���e����=���?���?o����=~�n��~c�a��>n���o���xč}����o�ǣw#��̳7�8I�9�rY�{�Zo�v��|[ۛ׵�x��Z�q�s�2��j=k�\��	 @�훝+�ک @`A��s������^��f�j-�j���{�,����׳��z��N���{=��^>n��C�����[�xþ�q��xS��q]��G?�����ǘ�-�כ����<"W�l��M{�����<y�7�9�=�ԯ�#�^o��ͳ�c\H�9�rY[{=5��u��\ͷq;��z�,���Xs�8jq�u�f� @���䛃�� B�+����>I� @�+
-++
�
-+)QH7$�@$䲻��y�=�ٓ�@�or�{~��{.g�dۭu�|
-+/k'�z�*,�*���Lj`܁��,����8�S�ԗM9On{'�KlX���MA�o(�GH�h�����S9�t�u8m�_�L�x�*�oH������J�,
%�@[�[����eɬ9i��w;��/:�UR�>�����^�D��r��b�e�TD��^/�{��f&:j��☮��D��au�;���(�w<��ҹn����\P���4�;
-+�~Y��f�v�R9O'�ߐ%��cJ�::+�����s
-+����f�y����!�.��_�i��`f�{{QRT���6$*!{�(�`��†!IJ��}z�ˋ"�y|���Dy���AG�b�#L�X2�X$���N��pq`�\/*,BՒ�H��Ȣ�+w�O���r�XX����cav���~���Zas^UV�$ca2KE����k��L.�H���Nߞ�"sB�p�G09����+0�hX�ãq��̢���>�Sd ��A;�vua�����:��%t�3+h��M;��O�����/}��A�{�.�Ete��O�����+>yM0��c1D��W¶����7lX�7�ǃL)V9	^*@:�6s;`q5,N-��Y&O�}����寧����	�i�sg�B/�^�/�䰈�X\R���F��}��}���`qe��SMțd���ƒ�&X���كc'O����..6��˿�
-+�D���OɆ����{q`���#��l�
���[;v`�Sm8�so����%N5!?��Cmm*��c��=��i���%�.1�TB�J�)��w*����;]��^-����V\��2~p�u����`lݼ��
#�nb`��zzPBÑ�y�=؍x<�z@���̹��8��%h�.��u��t�*�q�Q��{-�d���w�6����޿��?�!f�{@�b?�_��Lv8�2�Cum"���M�&�D��J��V�Υ��fGL�]�+��5��-l�p�k�p��!DIy�������?D��
+Wa?Pa"iJ�`�湘�S��w_��a�!�ӟ�����>I���<�tb�֮C*���3��z����¯�P�7"O�<�ȥ>gjU��m+Ԝ��W@&�l&s�1X'�G��p�J�ܼ
��C#s>ZU=�b&5yR�͍W��
;�޳^V?��,�1x�U��!^��L��'�7�^����r�XWUw&�:�����U����d]��K��%�ӆ��)�^�	�ޚ���ޚ:��^h��K{��!11��%��s2i"�a�y��3l�y�de�A���W�{�����*�6���״���;�3/�����u�¡�<��7����}�ڞ�����9/*�Z��~�j\8q~���
�нȩ?�٢���'���/��Q��+
-++V�U��K��vlg\kg���v:������ng��n��(���V-X."�
-+A"�bBB�		�~�n��=�}�vwf������v����E����m
8��Ŀ��_��+1r-� �8+{Q��=�N+�����(Cȣ�#V�U�_J
Ώ�������OV�x�s����'$$�x��\�ә�~��!�Hd "����t��ų555y�����
�1!SQ��g6����|Ϟ=���l	�B}�Qf8V�֯������-�E�čL�,]+ S���_|�kEEE��̦�\��E:BQ�C9��}�*Q˸a�³�>��gT��IA��V��Bcc�3�֭{�����+��*8fs�(!���R������3�A%�N[l���D#Q��Z�Ğ��2�cY���/�@��Ä�4I��H5yɒ%���Ϳ�:u��`�f8"���	ᣔ��Y���hFAB*)g���ڣ���8b�+?�kF3�0�CB����,_��C�hʪ��	��g�T��_/�}U�G���40O�i2T
zG$*K�H��Qw]�Fr�x���Ðb䏕��:���^xa"�o�#y?�����t�(���#��1���3�Q����������\�<]_/�l�*	QLa��*V�h-��M\l5��Cy�,���l
-+��8&7k�oʔ)U0���x<�G�ݦ��3I�6�����
-+���d{s5[m5��x���+/K�����%+;[�(/O��򗥏RPdL����F]I�O���t
�M��\���UE�����;Õv
ZF᫯�������
L�QΚ���t@:5!��k�p*����N+������������X.^"��$0�3uu224(ӊ���U.�0����4�_5%�"�����v��y�����Bpi�Tc	eee7�۷�%ly��.�s/g¯�PU:l�7��f�����3���̌њt�+����Vimn�t��s`��WV�F�ozU��|K���u8Gp��xEa�
�	*�#���ͧl��1�:�Nz��f�C'
B�+GǗ
-+ȟ�m�����4B	�K���u�ˊ�VK&�� I8U�p�[P��[�#Px΁��O|A!�ۻ:�"b
-+�8���j���Q�$�dy���LY5�.
U+
���R*��*��|w�{����
���ϒD�뭫���@�+j�u�Ic��:'��G g+ ��o���N�y�j���"@S##�}P�~.'[�s��9"^o����.)�^� ��f�F�8#������:�vk�kV2�f\`�����
�����v�T�G�����4&[*�_��,,)����4�^�G7A�?��ZDD�֨Ǩ����伸��jl���Fi�Q&ES�Q'v�bXFjZ�4�\_{����gV�T�����GO��Gƹ�Tp+jsaJ��Z,7/WJ�+Tʚ���݃��r��I�OO/�A,�K���s.��+��<���I��
_Q���0��̬l�"P,P�ݽG�kj���v��˯�h?.|mǥ�@Y �!ʆ�cГ�ζ]�v�!�,����.=�F �]�������U֩�gԢ�#��$�nΔ$Y~�Z�y�j=
-+p���gd��-�� y>����ۊkni%I��5��:��ӧ$eJ������f���a�:���W*��YfE� d�+.)�3vrhT�7~$ND�#س���)�Ԃ�5��T�8��fρO�.�%%zn8��!9�e����)�3*�tZ�ffhޞ���-E�M�Dž�[����F��hm����+BbK��KZJ�L��ʻD��p����$C�\53M�qՅ��5�܋��[�����8������۰a��h孰�+O4�JY�R�2�]Z^,�x�'�	�`)��S�$�	���0Mh�A(\�c�� �el�
,'&�}Eh@�x��^|���{���W���
&y�XW�
�0�JKhjj
-+���6b_-�ΐ�+c�຾̚5�c�fE��D�/�I����%3�^�|�+���?�
^�+ ذ�ec�*|�P���x�y�n�!j�����N\�SFP�2᧶���p��p^xr��\�ţn'D�q�{�G?��>\n6����u!s���:?u�<
-+ 1��5؊�'"R�����ַf�r�-s������<�����v����"���e����z�$b�f�q�c�_��Nh��
-+���lE�}���_���呁e>�(���φ���tXH<���V�Ƌ������j������uz̜žG>����Dg���YǸ�t�`#�"��pˤU0S!��*�~�m���8{�uf^V0x��FfkL3�w'��84]k�ⵕA!�m�Y��٦O%P(f
-+�ٵK�ξ�l�{�d3p��k�Hv���K�>��[��׈��hl&��e[�D��U�~N��~�N�+
-++�WW됶�����c�.�Q��[�5��}�	K�,9aʔ)�Ə�D���Ç�:�jp79�M^e�����w�޽F�Ī͛7?�������#���e������k$�	����r&��M�p��W��������OG���w�����y���7�7�7O;��cO�>}��cƌY��:���
�.-�J�/�)���j�p����o}��o��?}�W�����ϊ�	��B��.ҡ�Jy����.����)W�#��O��O������s�:�7O�4�L-�OЀbRx���8}��7z��ޱc�}6l�����S����_�����&D"���ws�C�e�@��(�^T���S�:~�����<����?��3f�E�3YGQ�X�
8h�Ĥ�b�V��Y��n���?��?��[Ԗ�ژH5�lӟ���%y���%	b�ʗ5ػu���_��N;�s~d�̙�6���H�29��Ǜ��{��;�-�~�2<�v��+4\��?�ӷ�M݁_��>�-C��@�QQ�{����)�q[n��	����|�\�^�D�洿
]t��+܃���-�k��*�Wy���g�����/^��Q�F-�i�`�_�����?Xy��/��?�t��ޕ+W��'>�}�+_���
�	5`B�P:@M+WhU�����oVK���I[
�nNC���@�
��P������,�\s�5�u�Y�����f���7`�7����"�v���qX�Q7��D��a�p��Y��R�0^�S�ɇk�\e���uc�wy��=�DL���x��!"��X7��wq������롤�����}梋.�N,L�
-+hJ�&P�D�Ci��Ci�(��w7n�M�`�|�UW����O���mw�p�`*GNL���{����4vi�+�0�S�	7%��`CB����RD3L<���ʄ�(���e�=�8E��#�d�e�=&���G��k"��;������m��E�$���-�����PJ=@?�{��B��������+���GN:餏�������
P+a����FZx�Q9&��}�{M�������K�H�:���`��+�כs�.�+%����ХboN��DYPP!ش�扲p�fJ�I���f���*�Yp����iӦ�����'?�䓷�y��
Ck��;$��ö�zm���8{���@����(K����+����]
-+��
-+>
F�U)W�2�T�`|�SA��Q�/����]�
=�%�!ԃ=P�&踷^�x��T���@��9����j��6�"�ٝi7�
��1���ҨL�����=a�w��D�mE|R!~8����'�٣<0F�N��9%��?�)�3�4�[<*�����th�:��O�j��N�%���o��%�oh�?�ʧ`]���<�G�Z�C���@G2�+���킰j�S,Ȅۈ�aA!�m�U������#�6+��tJ�%��~�g�z�pJ����Ut���M��Gldx����fce3���ƻ��Q��A��t������#�9�D��¬24��sY�qԂ�#U�ڭAQO�AC
-+f%:��`��-/aW��򸚮�X�	y�͵��5^H}EM<�+v�D�T+���&��ԄV?���Y���fX3U}t�|��R�9�
=�@_�lҭB�
-+����/������+p5͋�+Xu�+SW #�KT��<FN])�Bu����d��O�Ɗ.Hkz1lm�		����_+�!�|e}j�~���x�F}��������;����Y[
��:��[}����?�&D`�,N}o3���Op-Wi_  #�"8\@���'Xk ��H���`�99�#y,%J�_,�[y�\���CH��H9ac��QE��݁	}ѡ'9��5�K^d$�?a�ʅ���~h����S��#x)���u�F0�j��e�}�z�u-������f�������}��u��Z	��X��
A��x�&w��k�-���j�]�p�[o��/&N�x��O�ܬ���.�9*�*83+oe��6��]h�Nj �A��^*�I>h!"�z_�b�B}�ud�`nQ1���r��:�և^Ӥ����U-`�>��������u���a�Qq�������㏯	36$צ����9a_m5���pŊ��v���#��{͍[��%$��D%
-++�0��%K���~���u��T�k��j���}�}��U�q��j
����z�����]�v��q�@�`�CP�
!�A2I��
-+��K
%�r�}ю"W��	;<D�Q	���͓�6c���d!�r�ן,O@��v��+炦���z�%��:7����/��Kȫ�P��)[`@�%���ې��]����ޓ��JS�ԫ*��
-+�=�|
-+"U���=��׵�͊x�t]�U��?FL
-+�@1Z���T<���:
TW��ȹ`9OOe������
<I������6��Y?��C�$���%��G��PTU�Iv�����$�`R�m@4	�r�a�b/�8��L0�R0^w
xX��ۡ
-++
-+<�YH�
V̀6E��&	�H1"�H�6�D9�[mVY�f�J7P)�6X>vH>܁��)_`n�
-+n�r?Ԥ}ݩ�y7����:��~:"��
-+%�Ԟe�Ą炵B�J��
�F����Z-��; ��Vt�=m���Ħ��i#VU��.�V�q��Y6����8t�u�]���K����
PQ�[Z�}7��>y_�D��f��2�q,P�_$�鎯2ylH��Do��-
����^��6e������[Xې6���<�-
@4ŊӲ%�L�]�6�Ϊ�b��P��"��Q6�jV��CU�.��fUm3��mG��^&9\�g���(?~��6Q�
ʩ�Ի�fΰ*Hʼv�bGL���+�hZ���ͺ;�\�Eo��ܱl�er��̜2�I�
-+4W1KQ�vX���ʶr����9_����}�g~�@-��߮�  %��qG�/X��'{��E@LE�D�-���a�*C�I�c��΄YW�-AxOD:��䍀�
�K+=�
��P*��D"���	,��I����8	�&>�t�
-+i�-eW�T��S��S��f�M�|���%��.3�J{���d�]4&�4�Ī�y��&
��0K��%a���I5��g����ͅ�u��TǍv e0�^�����
o�+���Y9�l:���c@��>�F �L��KYm_
-+ֆ_
-+*�!G{t��� !�ʶ�P��C	��(2����;��g�3��ik�'I�#�P��J"��o*kQ)��BY�����j�eR��S�3*�h����D��q�{�˼R(X���,��)R?Е~�1X;�U,_���j�?V2Z�!/U9�i��'�ޡ�6M�F̝��6N+�+����lg\5
���+/�mF��"DY��\�����F���n'3�$�!��o���_m���."��a���	g��s�i�~��-J�J�2�P����cP��I��k�.���������WXBtX�2!!��!�/E�\ � 7�e�)t9�\�A�2���p�BV��ٗ
�P/I���
xx<\�'��&i��5����y,�Y��Y����
/4;v�jƏ+�>��I+:��Coa�;�cX�P/�6VEk;%�ʶ7uQֶZ���W��f��S)�(�8o�U�UM��WUe����9�������+W��I�&]X��7���O���v�]��#��M����e`�`�:��q�E�	F`x�n�$�!Lf���d^�%��j�LL�₴Y��卶�]�r '�}�v�b���S4
\w��ͷn�ٓIj���Z٪r��mo:���3��5
ļ'�7ӻUҕ�_���S*
-+��Ͷ7�ø��9�������D��8A�7X)�k�,Q�
8z1�A �!�
��Qې�V�EX&:�ҷ�e�F�2v�u�;]�n��ſڹ�$Н+�j���+�ز�\��S�� ����2��DLۂs=+)
-+с��U�܂Ԋ	G@ЗO�:�
�Q����F�ӛ�]��,�dokA!"H5D̢n�7�IX�kY%;�G����p�-����nv�#s��/�J\9bD�d�<����_�fq��ρ�C=�y�X�v����k ��T<!
�*L�]���TP���`FQp���'�b�>*JF��dh��չ�B=��%
O��I>���Ն�3g����]v�e|a��	����Zd�W;���
c�=�ܣt���u�W|ˉ�cd�ɿ�m��+�v�aNG�(��8�eR��OzÂΰ�7�#0Eo����Ad^լ7�
�|�z����m���ҟ���r�/;	��74�j�o�Ab�#F�hf͙�̙;�eLh̀@��7��lۼ1�aH:r��	G1�+�+�!�l��+�O�h("�jB�ǁ��}��s2`��y|��?�nʔ)'�v߹�kxT������^A�'�WP~W4>�n����f�ʯ��o�<�V�&�[� �..����
�;Kg�~�D�^��G��m���#r"�T0@� 
-+J%ٷ
�5LP
-+
-+��"�JІTl%LL�r�\U�������+�Ԑ�0t9�5m�%}��ٸi�m��
�s�=7�m+�%�ݬ4,5�V���4*v*ӷ~����
$��S�����	(�n,	�a��M�
�5���r��я~�G�5[U�S������'��+���@#�����W\�>}��rN�©3›�l����S�'�.{��@t�Ν%���QڛPt�l�Q{�+N�EE-,��ҏȓ�ΰ�j>���ڶ�d����}�g;ms0��X���r�'�"�U�?l��	�h����/�؎�Aq;2�0�<�n�2,�~�v�ߦ���w�(W�F��p=C�������X�qD��m�+��Fu7�袋�q����#+��+�J�a;�a�~t���|�3Wj���
0��ʳ寐t��[��F�xι��?�s��R���k���#S�Yx+��h=z�f���W}ޫ�>���SO��)���
-W�@�1\ņ��3����+G&�l�Sb�|�a_I+�IzD�����<,����)ؗ����Ǭ�֡F.[w�'�X��#F�Xԡm� Ϭ�o�C�����%��"<�6&-�-"�Ò*�Z^��T� ��(��S�C�� ��6��$�C9��.�cY�y����鰛�2�]Xea�����|�$o������ov��9�WH�J�9��.��9�ef�?H�tq�7��y��U�N7��؇~�1~R�^��W�En{r�EE��5ZzXYԩ��@��]Aih�L�p�]�cJܖg�8)�����P�����j�=l]z��.�,="|�ng�b���)��G�1�nذ�>����ze�bA�0�^��J�+II��e�𠆲w0�V�o�a�����-mDD�c�~���f!tSV�cC^/�
-+J:0Nյ�G>���?�ꫲ
-+p�����!����9�.��:N?��y=���]� �k����,I����<`< "���,�?�'@!�=��ʷ�U��@��4h�'p(����P�!i�'�;8�a�)��Z�,70���Ö�W��O,]}U.��#)�Q��r^�s��=�[Q�/�E�MO%M�i�.(�h�q�ך�z�(RQ�5O>�y�[.lV�
-+Hށ"��OE�P~S!�)��Qe+��:z�Ȟ��")�L�c
dt��K�d��������"����+�ۮذ�Ƙ�K�"~�	H�nj�\�w5#G�K�{������UW7#�J�>�^��oL��N�埍�S��N)�N���萖��C�����+%�`��yeI="������m�_���
-+(D�֕��B�r��yf����
-+���t��"4BZ��'�i?	t�e%3�q��7V۪GW��K�qئo�x�b���Op�ު��
-+��[�p
�m�+H�w��0�C���ΤȠ`�8��r"P�uj�j����<g(��T+���#U���&ѝ���d�.�-C�h�b1L��uW�^�U'��-3���J�#���V+*����#�RO�+���/[d
-+d��؛�	B�m2`�Ñ~]+p�D03ا���$
�	
-+r΋�*�|��s\�.+J��Q>V�8�x'*�,9$�����ov`�یi��	�=-4����Oj���r+����xXZ�<E���j�,ѳyLF�^MJ*�|�ް�����z4J�#U�C���KM��65�e&�z�q��V9����l�p\��8���P��I���E�EkϘOݕ<v,r��S"�2�$%>>j�������*+�2�l{����4�=�9��[�^�ŷ�٤o��a�f��m�b�U��];�Q��>Z�ոŦ���董�Θf��O�:����uFjP0��2�D�X�����Dh�ʞ��TF���؍�i���<�;�GI �Uh'��~��E��y�4��|2�*S������f�v�����4�m�O�ݬG����X��v���&襣�z�`�6~�̓!B�٬�����Gb��-ػ�m9��
�꾢OMG��Ob�8������p�
-+a�^�;[߁T=09�����X���	Ж���"��r��`|�U!My�9�A��I/��>��
�L��'?�L5�+F���춶B ���@�
+Y�'����y�z��W�T��������nuk
-+:0Z�e	�`�CD����&�ΆT�r��H+�Hvh�z��JGA���أ���n����7�Ѭz�I�H*,��i��)w�*�JU��`�u�q˗��g��h⬽%�8�=SG��J.<��_�o��t��e�Lط��^s�C+��u�M�2l(�Y�<}�~fl��0�y��t}Co
-+G[!������S��:��F}h�	~R�{+^9o2)�v�|�d�l]h�)o!�B����6�;e��~V�E�@0���� ��I��.��Ip$#4'�OuvN+ѭt��gΕx��?�z��͆
-+b�J�%�9n��f�>�5u�.p�E����H]���+��)�x�v��=J�C_�ݪ��
�74^X�l���"�|���w�GO�-Q���I�ZA�L#wR�N��vp�
-+�|��n������}�nZv �I-�SH�%?�>_Ę;o���Y��&�.��|��uZ���꧞h^���j��;�}��f�V6�o6>/��zsFR�,c�I�q�ys�������I���Z	l������,K;��?�{P�b�ܮ Զ��g!"�w;�?��ڀ
AjOa�a�6�k���1vgK\/ޯZ��s��~��Jov��^̼H�s${E��VG~�J�G���~��w��0�<[*�O<��~�ˉ�H@��T���q�
�d�YtZ����ѥ���C��g�Hl��!�Z�(&<���G#0S5P��ͥ��7-�e�4Ȼ��&5��,i�Z���>m��8S摙��Mј�J
|��N��
��7<���`�=w����R��̤F
-+&�UD\ț�e�X
|���<�Ps��kՅ����<X�ǎ;�9�3��-
���[t����]{~�'~�3���q��z��'��ʌ�
�e��uu��'�']e�aO���|���.��9A��ݶ˟���Oa��<-^u�P$��UBy|���;bF8�A�l�h"A+��MG��T��K���:}Ԯf^�-�ֶ,�c!O�T��;w��`�5a�;q
-+�A���m��ȑ�6���ę�w��v{t���d��ҽ{
�Q�d��@�3��(&
�<���Zt+�#����7,�gΜՌ�-Bpn2%�'S�X̝�8������������{"����XB��0"sԁi�0bd3w����z�y��͛��f/� �:��r��g���!��h��\�{�1Z��0�}�~јW1�����6�t�X���D�x�l��1���H|P���
�50t��f�N1��;�٢ۣ<'�8��µ�o�F4#)��p��
-+�A
E\�������>X	N+���K4�'^3D4�7�"���\�dX���'\G
��^lE����O}�Fk�Q[O<��u�zʩ��-Z��]���ij�����
���S��a	?��iq�L��H$�8�ۃ)�|��atytH�����F`��x��S����>��ͧϘټC_Ν�2��TIr�a%&A���7�Q
�-ܓ`
-+�n�%2?��f��H
�a�ϓ��w�Z:�g��`XiC�h�ծ���*���o�Yz\3~�x�F
-+cÇ��~���l,<��6v��q%�S�����8q��l��������d�����Dj�j�d=u��������uߺ��J>����o6ճSf��7
-+���.�eo0��~m���7)w+���iw�f�Yu!C�V;��V�4 =�lش�y�N�8
�Y��vFXao�������S����Y�[�֯CRڧdž�F����"�D��+,a�Cau�•�zWJ�*�-��AcC���L*Vn�
;�1
��8ަI�-T
-+x��P'��_�G��o����-�@*l_���q�#�a��r|t�J��̿MDВpz]��O�)*x�I��6��\`(:2K�+JC�n?��
Mw�����ν,�E��EE���ӫu"���cF
5������M�Q�S��l���xb��l���B�Zw�_ա�h�K6uy�
-+�*n7��~�Ĉ~P�cc�A6 a)���-J�e%A�M9�c��+�v��?�q�po��}��w�+��u�kꩧ.�A�c��#�
�(��p�z�^���p�Nȅ-���E����+
:ē��
-+3yt�O$Ϸd���a�#+W�4f~���t<\�j�
-+�3��-th���ng�bH��D����h��X��j��x&��#N5��]>�oՕ�A�h�d��挳��+���
-+u�2�q�OM�R�?����WP
-+(WI�%�l'm�H�h�6��%|*���I��o<ʌ���v4�tKr���g
􇝉<q¬����v��m�x�+��l�~	<��^��v�- ��uai�=�%�H��T�1�Hǰf=̾ŏ��S��x�Ē����=�	��u�1zDq��sȉF�N9����?�c
i|��1{
-+�A�,i����NG����`0�hT!��<O&.Z�	S����+�O�O��Z��l�@���`wj��� �S4�r�q`�C�~�Wk}=��˯����þ	I��VY�Þu��=�
-+�h���3+�=p9ܮhq�5�0�Z:DP�$��C�9���%u?����Ӽ���^�	�v��P�
h���f�*(����˥Kʰ�!�2�Fmv�GKY��@A�p7�L��A���p���)9�q�SG	���-4�9WA՘��q�d'�`��J��ξQh�>��Y'hC���
��m1���4
��,���U��[�
�9a�
�2wڴ����]o��;$��I���g�MlZ��l�۟�
-+~`ş<T�SɅ8�Y��z8�Gީ�y�s��Mp�5O?�L�TkcȮL���O/�xc)��{�L�Bv�x�``�r'��O��h3�\FH� �L�q�1%Z����Zl'��a�m��z���o���sCz;�Fb�)��+6\}�4n�B�<��g�A�rk�>��«R���G(E�J
SYϱG�
�H?[�"9�7����\$X+H��(�F���&�t������SUo}��i�X������~��]�>p+6����|��ؔ�ݻ#��a"��x-D�g�v��X�p��I�T,���h�D*�6�d��x�4أXJ,�DG
�QԵm�"/
-+S&�Dm�}���*-�J��>�SM��d#N3+�t��u�u��7}u�����;?��x����b��baB�@�2J�r�ᄐ���<�B"��u�a��m��Ї/8up��[tU�+ M����vg����i#X���a�^�~ yF��ɑ�ul�E�#���6O��&����{^�F76⠼8�~� �!�M%���4I� �"��%������>G�[�v-�kb}� �$��<|j,�6)R
pµ�^�k��)�ة���n�T�+Sx�NZ*ƶ��&5e�4�v���Ѓ\��)��%�6�E��٫��M瓜�J� gh����p��uԑ��A�2\� W���� ٛ�i�s��z$�����G���=���3sU��|������o?�/�t����Sch�M� �VZ$؝XvԝY��-ˬ6T\�]z��[�qL�
�W��j|ūǮ+b���;wU{v�h���2?�O�[y�B�\��G�⢁�	F0 �M�+�B��
�4$Y��|YU�"OՈg>�G��?G�1~�ϣ6
I���c�"'�������>.%
-+��>�re�&�q)M�|�a��y��c��w�����{n=XS�k������C��F��A"m\L�A�Նg4���G�L߹�j��G��ư��A��?�0r��l��N�WMkI۵11�M�eѡ�t��H~}v,r�"����УDu��h�*��gt��Æ���(�b��ތ_T�WQ�K&��5�����%�lQ�0��&�=X���qр-��>%`w�v���
��(6R�8dߴ�AZ�m��h��ŋ�
f`���v���V;)j%ٕC~8�<w�:�Mp�A!T�$��j���6.��y�D)��[p��B*6A>�1a���\��R�@E�D��܈S�&�(��ۣUz�y���q��Mg���:uZ���}�Z���B`1��
-+�ʙ>m�I���&��̌�knȰ,�N��gZp��Wq ��g�X:� ��j�iS�"����J�[��'EA�Xm���;��!'|(6�(h��~ff��=�y��>ƅ�⁍A���k�3r�=ae\i�Ú����Pa��9�2Of{�,t��v��?J�&k鿣賓� 	�g.���-l�4-qF���z�@G`w0��(��oY�TF.J3�̜,ZI���3�+�|�!'�!��(��)�R�+(
p>��"��������,(�����Лe3����Õ�0DD�E��{W>���p�j����{��[�YE�N,�qɕWk5.�%WD��&�3%var��ִd��&�X���M]���E��W�ǻTG�I�>Q����D`ۋ.��=�O�R�NM�x����40�r�+	�6�y$�u��|h�ŏv����'���+{K,%ı�ei�-Я2��! �ٟ������z0h�M����\
t��pF`h�Xl�K�q�)�+�a'?m��-��bM��=��9�
9ITp�d��]���V�����o�k����aI�3?q^u��|��裡D�hly008�geE@$�;#��]V(N������gW���C�S���_$`�7y�)ŔX^�/�
:�
V3+2훘���Cz�e�>�G�J�^'Z%�Pv<�p��sд.�+eY�e�H�J<Ef���%d�	�
��x1&�f�@*J8VvX��	�Hi`�<�&0���8E8�>�x�l�s���ubt'������
-+�:6{Bm��0��K�!-5ɢ+FU�,�]�b� ��k�T{�����q4��i��L�8�{�����������y
-+���s�U�Tg�s�t�Gz(̄i~X�(1�r�_JL��Ϟ���-�\!��J�����ɼpR���"[vj'=:()�9�u�M�Y�H<��!?:�O،��N����7�����N^���{5������6b��K�b�h(�
-+����T~��K]���bR�m[�'�2��Dt�,���+�=�IyC˳�`��?q"}/^���HkL2�.[���"(n��qň!����-v��8����0+
�Q��4.�Le��K^����G��4����Ͻ����*�Z�ga[�_:0?4���%��7�!�l��զ'�{%=�45{�~͑޾�	I�H��U~�o�he�����O��g�z��\��mAW��ȃ���y�H�))�wy����3��0�؏t+�c�`5����J!��M�jS�E[�}�����"�<\::a�g�h
=r⬣s��zȐ		>ɦѺs���.��ɡ�ʨu�z"4'��߂�����%`��O
�V�6��6_��--{�M��w�g�v,�w��)z���j�^/.F�?l�fti��٠]n<@m����(3�b�B
{�OбS>N��)�H^��A��·]����"/p6�1
��!���v��f��+���q��$���
/��/�8��D���/�ӾA+n�̪Y�ZR��V���~����z� �a�6��������

���t�
Z���S]w�� ��$ծ����@<��]ІN�a(v³��!�F��MF�+md������d���eĎ>f�B	u
=��P8����i�q���<l~l�ba�姝
��=C���7Df�����JV��H�]����]w�� y`���l2��F[���Z��.�����86��
-+ +���B������Lɂ��!h#[�7�Ff*�[T[HVf5Q�
N��H���ް��jpc���n�E_��\t�
Kd�5��_��d��AMB�O�����dKI�ˀ�S�FI>F��\A7p��c�G�*e����׌���x�X��������j�5Qk�'#�,�;��ȵl� �t�&�K��
-+S,R�U�t��ӡ��cz=�/����q��L
Z�{[�c�
�8��]y}����c��$O��<���F

$
}l�Ύ��8���	fDG.��+�l�B^����#y���Kh{%X�~}Q)�H�+�ltm���m
~]� U���@J��9.H�)'r���Y$�B�u~`Xx\y%HQ�(�?��0aV�SD�B6���V�qv���+=�U�Gȗ�/��:M˞�QG�Y֣p�Jk�d+�iQ�XY\ٹ�e
-+����rA����TcMbI�� 1)* ��ɤ�ľ��;�b2���)��n�)�Mu���b�3�I�n;)L�MӀ>n�d�eb���"
��1��XG�A������
>8�'����3�l���/�^�a�Yd�eX��u��
-+G���j�|�Ym4W�?
-+�c@�h��=S+�8�V�**ԡ����	�^�������S��껚�{�}T/�����hԕ�z]{�g5
F?���߈9b�x&�<g��$���')'�+R��|'OF�����?�G~xǝ�n��z���ҷ�n���'��f�}7J廎t�x����}�a�T��x4�}�xS��Ɣ�n\?�k�%
-+ʹ�\W�S7��g���e�Nokf�
��O�_^:��N���԰�S��d&����`����¢<�����_��Y�f��a5EX��Z`џh�O{��P
-+�g�>�")Ms���r�8�Ai1���bEU�2�H�e��r74��p-'C$�ϲ�9j�>�[Hџ:�ܥ%D�bP�me4V�G�2 -���tTG-^\}��HN�&N�����TϽ�b��.��x���1�׽�ӟ��͘�ƁMh��N��``�٘��*0�Gvc�}5TT,���+�����3u�߲eS�c}=;�(!”q�5W�;n�]�L�D�IBU�ã��?����@�	���$t�E,��Ȉ�E�&�,�"�+�:�1S�03	
-+��ˈ�p�J��똳
-+�7��F�w5#�z�B�q�����;���p*y����uv5K/�p�C�,�j�g�
m�	�a�@�q%}I��ho&+W6�q
z�E7\�
-+�++�c,$�C'�$HF*��K�Z�W��M3fQ]|��v"��링 =���U�
-+��>L�A
�q�+J&�1L�m\�""Rhg%�+?��j�&�KU�?س�ڢ
Y�.Ya�t�W��B��a�s9{B1�-��-�>>�# 
-+���)r��IՎ�X��.=�w@�z8U���%�G�:�1�G}1*$yE.�Ь�=�/��E��r��(s�O�,�ƧѠ�VW�����#�t�/��=�c�ϸ�@,Գ��!�%���ZI���K��7օ
d�M�jS�2��J��D�r��
-+{���J̓��9�K�ٿ�ߤ{GT��.jm��]J���7>���4Ȗ��؇@��S�/��2�@)&>k*� �	qTJ�D�ۣ2�V�_*���ų�
؆��!i�o�†���BE3K?������9H|�c�Uu����̬�h�/>�5N�L=�>R�
@H�t\����DM����A���|�����h@=�sfE ٢
'�;괝�y񑍊L����$}fۉ�g!~W���Nt@Ǿ؋-
-+j�ao����W��
�1c0�ͱx������އV̵n���V�N<yy�T���{'�r�UF�b'u�������‰c�R�p(��G8�!��Ǜ��#�&!M�И�
�8y��W����EDn7r9�K}�w�kQ!���#�L��]�vm��t�%�m/Z�fM�d�ڹE�2��}Tv���j!uP�,��V�>�#�
��g�,y!���)/ϰ��;�+at���yw�/~���wT�������5�N��쎆o^l-���D%[@�
-+�h��Y3�O���3[�Ag+��� �S�<�z��7�5���Jǀ��p���D-A��~B��B�����D���)T,JJ���'�W�{�n���a���$���~�Zn�C3���O\ri]
h�?l+�؈I���u>�-��!߾J��U��5�����E"�N��3i�ep�3�v"�>V���+��h�[�ɣ賓�$��<bևI�e����2���w��S�)�$X\*�݊��	�Q�K����K��c��8��ƙ(�d@k]ʯ��*�p���ߟ�A���l|4�v��@O�o���	o&�p���m�{�J�`��>����f�ǭ����@D��ai\� ��#D�۸����ox���k��]}�O��Si�����?�?�wBqȩm��4xt��F��R�lJ{����
?��6�)�J��נ�N����}����}�"t5�Į�l��T�/�P��6�

��v�Xy��8sA:�8+��`���"�<
��uc��sew�9��v����֬�Ī�t�2U1G��B��\lE�����u܋��WY7Yt܋��+ dx���x�+�M��Cg���P�,{�+�Ϡ�U����(v7"jL�U���+Ec��G��ӲSW�W�j�f�q6��V#	0���#��ہv1���^j�P�ĄȰN$��@�bo5�н�rL���ט��[��ڎN"/8�
��ȶ�x�l'�;�9�)s`�L����-�YA�X�J�VH��^�'B�r-�v�e�U�]zi�^���f��	�MS�����)���uY	fc�\� l'�6�={���lE����@��'��&'�h�fI,)��P���}��۷���+8e����Y
-+;��)3�1
-+��bJ[m�v~x*�i�+L<d�d>�
-+m�$~�n�Fk��(6�r�
E�l������/�b?����%;y��o��/�O{
A1q�-��`0�[��ɯS8t�_��~��a$~#�j�?�BX�O}�n$lA�������.mmC�L���4#+N��"
�fA��I�>�8W��,$;�x�9�Y"�dg������z묓�8�\ZJI���'-?�:W_�q$�P��I�d��mw�!�n�J�NAy�|d
�G`ц�d�;�NЗ,A��������QC�����Pl�>�x��A�
���gȑK�}:�|����P�H�wx@i�ȂA)y�+���e����m6䚟x����/(Y
-+m�~��g��C�5��&6b����(L��<I�]Q!D��K����@�&!������"#�`S��ȹlz!�}�=��@lo<�È�
.�r��L�p+l�%A˹+���#(!8@o�X_!��+���}]@��s;!�Q^+|Vf s�4p�'P�+lCp�l�Cd��(J��yS%J��&�!��\%�I<�,
�.2��Q�)��	,)(����~:m����
��F��/��(Gܴi3�.�+�jp]�/��b�	?��ӫO\|���`$>v�|�z]?/��L-t
6�:W�LơH�E�����&!�+$�}��ܖ4 �'(~���U
�ȡS�8�(����װ�m�.&!�����Q��4Y˭����w����På#내��[��:d+��B���!W1m����U����i�i�'ݧ�����w���?��M[�ҪCy�� �b
�p�uJ
.�^	GA�Sy4b
-+�sB8��y
�ļ�*��(�V�!D��`�O\+J�L��z`��m4
-+����!W����O���+��H�1�S�_���J}�\d����B�E
-+_��?�&�Z��S�����f�f�	̉����|�+˫���+Zz9.
��z���~�:F��IP�I�<�}T�{�ƨ�2L�B[̐�<��Ф��=�D����(�e_��P��G���+��Q����@���U�r��"���:^�q�EA�H6Mu��ne��m+B�:C�_̳�h�3+$��q��5A�H6��6�B-5_���N�b-÷�>��|�Ń(��p�@�3���=�x�~'���9g�`:�
r�$^
�
-+�ƣ��YM9
���S�Ez��
�h�PdH��D���s檰��ۋ�r���r�p���Q�y��|�w�/����t�L�L��F*��@�ڷ�Smқ�����<�L�{�n�F������^m~te�z��A���_/l0e�m)�����ɳoԆ
�	�!F��l����2���:m��OO�9��2�f"BI!;bW(�u��Y�p)O����Y�Q�T�gp�% vi�E��2��ό-�!����a��.�b�I	�8y�fr�i��[��׺gkN����#��*�c�6MK|!�
 q ی|�rѕ?��Ң�4�2V%>�p�vT�O��0+=Nġ���-�)���"�)��V-@
n�\/��f��n���Z5��`�h�����8�\?��5"/hT���������M#���N_��Tb�J�}.��$���=zܨ���1�VCw'}\��d��xB�̃�B�:8��+�����@�����sEO�T�+]	���o�e�"�A�%q�5Jc�`D�3�]��ESq�
-+	-@
߭N�+g4�X�$��{�ԉ�bu�9Z�g�:�����Z$l�'r6�_i�������.�~�?}�Z���_#b��7���j�^J��9�&��>���d�wXⓜ�����5�s��}F�v���!d9��Q�G[1(��3?A�����#;��ED#��^L��F�5���J���rdW��}D E�L�����؜���o.�2�Z�:AR��M�u*�az��:/�o�D��Tq@���P��B�f���� �	ב�}�h�rT��R�k�
-+�{�p�=�2+P�rX1aҀ�̧�Mқ�W���9^�%�Ҩ���%�V�����_�zu�~-�c�j��	Zrl��H[�A#4�5�qQ�b�\@�ܔ���!1�/#���l*Z���sw�@��ԟ�U��
-+����N�}��0H�()0��\� 9vB��<� 8C`��j@�0����"��m�� �3H�[��z�2	;�(
-+C$F�+��"���\�}	��0�H&��p�k�+� 6��wm}#�J%���gժUZIzۚ)S�,J�����&B�"e��
38�~��$�M)*G���E]$� 
�KN7j��
-+�W�ч�J�Y|��n���W�����5�]rLu���w��c��t�ywǮj�/_%�ʒ\[�6�#c�|��N�ɑK#�(,?�L���~Zm�}sJ�,����كj���g���Z�h�n
�U[���V�@L-���	ڬ�Π/�fC�Bo�M�AD��+Ԗh�x(�Q6�ǫ�z�I�S�G΁�uG�<���E�D��J=��=I==�IT|�i��<ۥ��Ў�F�PͲ���\qj5W���]{�-{���S�����xY�r�N��b��iӋ���Gqdt)�)�Y#�������@.	���!|ĉ_&a5an�`�������3g�,KT;�9zeſ�W��l4���f��j@^�P>�Ԙ�A
��2A�Lf�����u^yuMOy�Ê6��[_�T|Eg�%�Us���6�u�P4��"�Fj]u!�2[�#B&M�\�)�:��ڴA�ZQ��痂��}N�*ޯ�,^XM�YP_��ƂZl��XD�`lx��A��]�^�Tv�g�|��1X4�v���ub�s.�8�5�bUS�b EN�޶o����ԡ��Ln��f/Ѿq��j�W�.M����[�V�ּ����܋��ͩ��vf�I�������0(h
-+�
-+:���K\GtR;F�5���}�Ց��z���ַ�u�r6jc�0��"p�I:�
+�7~�N�~m[�N��U	��n���6�$u
�x��k{��N;��^|�e}������Iv� �c��k�n	~��K��c�T�*���~��\ɮc�M[�NY�C���n����a���#�!��X�-�QZ+A�~�x�}�}_�n��+�x)|�f��"#+|u���<t����}/g:�\&N�P�׫ʬc8I��{8;����-$cd�
bQ�|��5�v ��c�&T
c���V|n,����s�c,+���U��@*�ѩm�~
-+ݤ
�;Z|�ˋ�V��&4d����
̙�Z;j��j�^b"^�
����!($A�#��Ѓ /UR�8�OB�9jo5o��{��O��F��D�+M���􊙙�� �u���p��E��Ԍ5���D(?�++����Ez�yk������9�S�'�λ��Գ���Y�m�Z������'M�s�O�֨��(�G�ݼb��+��<q ۍ7�����zJ��g
f�f�Gi*!�����RI�}�[��r��IN�Raۡy8�`IL`g��ҒI�6��,f]Bba��)KXԱ>>��T(*�ӦM�,��,
-+B!�&hR�'.�	v�J�����Gh�9L�+�N莅(��Ӵc�e����������i�ZhUW�\u�o�뗈��-�@�%ɯ�Ŧo~�_uk�u}]��j��1,��o�c��zh�pct��‘�D�7�!��1�_��5�(�+�48�[F(aQ42p(@[r*� ^TX�f�e`�9uā=�غ�Ř�]��%�q�&t%C��Q���>Z�y��l���ʑRݒŋ�z�nJ��{���N*݂�������#���e�	�}��V��_�E�I�r�A��(��pͨp�~�j���?s}5K��ʪՃ�
-+|GݭZ��o���;~o�E~O�,:�1X��s3���i��YT+�+�;Ta����GŃ����+Yț2y�s�D-k�۷GW/�8KdN�1[��
-+�\�n�#.��(PT`�-a?��	0�SX�����(�w �w���{]��K�R���y����'w��K���"JD����
@'�}5'��e˖}
�`^IӴL�d�δ]��%����&�+�J��"fQ��t�Z3��0�>
-+�[��5s��1����85��
-+|���I7��Q�?Y��f�R��
�)r]��Ŋ
-+,���Z����t���.3��Z��کEJS�;tX��G�+��T>����EGk����}��Ӱ��^l�v��\�����)�O�}��j�:N�<Ek��mɘj���f�6�r�
5.�l)����5�mz��{���$���as]d��n�����2���8�k.�&i�� ��M�,;V6���\5��NJ�9�\�����!�3�\{�� �^��Rٕym|���ڵe��q�E�9���K:�]O��k+�z�q�]x���rl��Ty���D�e"/��4�3�� )+HJچ?�l}�ߢءW�v�i��|պ��F�UT'�~��xit���ː�O?�a�������
���/�g��K��vӘ�߼�D]�s�i�!���2�u��ꪗ�-z��׿�tu
-+���Aa��ij4�32�Lg��a�nx<�'Qq�<�q�fM��b'6n�6j	�
�hJw�O�dHdp{g�哟���i�ᭈF�+|�#��&�F���fu•���ռ��l1�@����O}�S����>,2e���
-+�A�[
��CBG����w)���q�c�
�[��w�}��}��W2=3jr��g
�������+<({ˇ0x��;n�ֿW�miSG5#�Y�_X-׌�&���8TF����*68���{��3���c/�>��/Vvu~3�G�AR�M8?+��� ��
��!�DE��Z�k�2l��C�߶��û��o��Ӣc��.��:�P�/>C�80RW^W_�%�~`�L]��~�����^���ꫯ�;Q��v�/��~�
��D���p@��=��󯂸{���ƫ�;JcGVD�l���"-H�
,r�~`�;<I
�S�t;0y�4-ȱI�=�eg��u&[|�q���}�Z|�q�
�L�l�r�`r�f�1�Pr�.�I3Άg-?����+
.妓�Q�nRoi�c�б�
-+온����Nת�'h�N�S��١��>35.��	jHÕU��зۄ����3Sqg�~��ʫ�PQ?9W[u��.�vt�~�8Oӹ�8��2o�Wa���l��5�&k��U�]
�5��L�W�g]I_���n�m�SB?����?���=�4��#�?��$�+�R�����
N+A���o�����s�?�?Ғ<>(���@bd�%^0���+
+�(S)�t	���)Z��<�:�c�/�s�9���8�3U�3?�+�N���R��[;q��|)�b0 ����*&��gV�/zP3�x;���kٙL��&��9�Nx����~˫^�����6i��X_~X��w�T�qȄ�&�o�8X�OփT��p�>B_?C��8�fO�Z��p�lc@����qf�����
�B��}^-���v=�(���āN�P�鑩?R��#���m���>��:�럍��;
Y�� S���b�����E�ِ�ơ�a
-+���b�[��f)0R����eK�j͂�e9�R��������{��_��׿Q=���գO<�@��Z��O���
�F	�0�C��R�'T;u]K�mR���m�}]�~>**f4u/�s@��݈:d�p\
�<
��in����Gw��QI8;?0=�H�=��#��o7pwriK�c��K9�+?��ӫ),3�J����;��0/&���4;a�'Ѯ?���:�L]���L��-������;4����C�VͧH9	-����;��4�
�?Smy����Έu�ܞ��v���&}Dn��V���G@*&+'��=�
+y
?�ӆ��^3�+���i�@J�+Jh���!蔧}�����<�Y��0�8
-+i����ˎ���w�z��]m�L�@s��	�֗��Hm�uzg[�΄����e���i����3�W^}�y�+)/]vr��p�_� \i���z���?��_���S���ځIY����/}�Z��%�����(������
 ͡�r#/;��8��>��l��ˮPpH#�qrX5e�^���$K��du+��g�C5 $��
���Xӵ���*O[R���Jx�f��6WO�_[��F��|�+�+�-	ƪ<LD�ɝw֜YWc5q��o�z���XԄ��m+Pv��, �������΄��`����3�mrpRB��l��2�k��0�[;`�m@dA��~����ްZΖ�^��9L�?񘣽H�^���i\'�
-+�4)�ZH��#Z_o��	����~�h�c���')���Ϭ��H�`!�
�m}���zS�+�P�Ƒ���nnid��Y�q�����
C�
O�k�@��!��O�{�	�+k%��hƊSN��ꜥO����;+��t�_�G��)+O�~������!v���'m�ٍIWT����������;L.;�ԫo���:�����Q�t���7\�p�t��Q,4������%��o��~��{��+=��{���b�Nȓ�������
�=��K�H?Δ
:�I��cU�v�"���>��s5L��gJ��o�했m=w
��Ѐ�!c�@Rz��4Ѹ����F)㋪����"��>����5��#3|M��������i��?Q߿�s�|G��r�kv`�-llۑxĖI=�^z���4��H�-e�{���TL��p��|��z���<�%��MX�7��kQܯ�[���( ?;=�O��7~���+��Sk7�٘g+��G���Бbf
-+y��h t��6i0��+=y{�Gn3Xp���^��
�]�6�e#)R�!c���L�|�q��Ügy�D}s��G��|N��~��=tr~V<��OT�]~Eu�)�V�g����dF�����DJX���?#��8q������v}$�79�}��_���>y׿������3��>�ԍ�G�}l��
-+p[�BK>������H�w���Nя�<��(\K���d�$��A�쇣�7����Ǯ����ݾ^}�_~׿^�:3�ז8�2 ������3��}��n7��P�Gy�&=ܾE4L�����ĥ�L�~�	�9+I��ml�B)��7P^G|�J�{�,?��s��@{[��K��{gcWu��
-+l����C<0ARGj!B�@J�tDw$�� ���D�R����nAaJ:�J(�&RC���0����v�y�UN��>翵��ֹ�\vMgU���{���u����O�F���bT���wh����IC/Ll[����w�'�
�nx>��������|+��jc�V.|N�(L��
-+c$�
-+e�{<�Qv~�6��
-+��2�̥�$u����X!O��sy�����\����e�������n��̄��=&��
��d�wӦMϟ?ۅ^�9m+I������~&��L=PY�L���%���4�X$��
��~�>��<�_���r�_6��&�
�!���4�ʩ�!�ԣ��
-+�l4����7�lYZ*'0�����A9�K�h�Ɇ��[�#�S]������wZa/��2���L�G?3Wr��.*VF�+�8t�%x���{�k���_��}���}�χ
��{�oMwy��+Z6�i���2�z<)�exAE����J�ˤ	*=�@s?�x�F�����S�������Z)�ڧ=�Ǿ���9�m۶�^�֕*.�E�{`��
��
-+ګ;.���+���i:$��{�齆G9��؊��ioQnkˉW��*���v*V�6S��`��V�=��~�g�#���X�u�7p�^�q����&�y��W��k_���u���T�����V��M�H�Ld=�h�e�fY������?�}�ƍt��2"�2�F%�2|ᑡ
^.�ۆ�w�m2�+I_?��!�r+B�3̓v�Y����^���ģ��vk�i���_(�J�gɿN���.�u�]�w�^I�u'�z��#��K="�����	?F�
sݶ+�44!�����c���P_��^��zv n�V!&}I�u^��A^.�/�ښ#<�+
-+O�̙K`�1�
-+N1�p���S9?(;�@��2-�$f�$B
-+)�(y���H��n8����X
-+�����m�9I��P�?�����.D��R�5���;���o�
�y�W~��^�û9
eM.����3?
,Ӟ������v��|�[�/�F�|A-1�|��s#�<LT`���+@�2|P_$�\uX@KҌ-MZn!�=?W/K���
���@G�v�.قC�Er�_��%��T�~�����(mT׾9:��zh~[�>"<�s��7���믳�߬`�Wq������>-
�G$C�<�!�ޱc��}����y睷_wn��!A��!x�I��K��u��)����
�*J�4��P��j�u�A���WaN�R�#�z�ˊ���B�\gQ�e>ؒR�h��/d�~QοǪ���g���g醞9���.;m����%
������7�abݒ�{~+��*��V[���1¤��/�M�ܶ����|�����	��h�#�^�%�G�:�J�?��O����%?��ys�A���Iw+��_�]��Fv+���I���)ݢ�bS�
TW�-�.92��S���k��_�
�iJ����y����P͏�����O>��d���+��*܌��|<����������O�6�����#G���$�z��1��� U��t�b��{/��G��+V\{��	�׭[�9.#z���6�D��m��
��;Z��|����i��^{�?�㯛~��_m��'�2N���|;�G�{oo.�3�<�g^�;{챰#+N˹�Yw�ʟ.gp��W_��+�X���y:y�V+�[+�
]�y����U��H���ϕ#����}
-+m��ի���yzzq��W�/1O_HZ���<�w81����������Y�!œ�s���=����G�~���+��v�6mڴ[/����A8O�9�f F��<��u�v�,�
��^�I�P�#�q3H�`٠'n�ஊ�iy9��Ʃ�;q�!��z �yn�X�@�+
-++�]�3�_g`ޱ�#��δMҦ�E�J�T����^n����k��T>�f9�^zz����0�q��=�L���j�+鶲�&1m����rPC��y��1�k�m��)z��y��	�����vaO��v�7��H�^zz��@а:�3�3�L���ڭl���	}�j��Â��'<�	�?��#Uu�'n>�c�:���7r�!�7m�tԆ
6�[�n�ڵk7�Y��]�'썒�g�ֲ�}��-����_�}�۶msY-�x�[�l�r���{��w�}�w�q�M7�t�u�]w��_~˻����T�'N��ȅ�|P��<zOf�С����V꫞�9�`t ���g`z,���Х;��0<&^&���zԣ����O|�S�z�&�S�>��>��S4���I�xM�GI�P-s�&�%M�L�MMY$��
-+�U�ߥ��[t�p�N�t�=�\{��7Y'	�~���k_�����/r���+xɻ���Qj��֭̊�n�{�3�_d����3�=��t�n�E�T�2hn�o�¤��IOz�a�zի��TM�g�����5��ě)�	s�?����Hg�S��j����-›�/��>>���/��?��/������_��.�rR���È�D�ҸZ��ʠ)����؇3P��>܅z����~�C/�.Y�L�,_����?�O~�}�G�TM�gi2�0��m�e&�~ho�T���j�W��������K���'����^���_�׽�F�8��	�]��Д�G+��/޼v+�t��^��v@���
�L2��E�H��@��=����?�5�y�S�U�g�kv����O|�m��9t���B(��xvԟ����[n�僗^z�_��_��(r��N�uU�N�-�>.�neн��3��p�	�z�g��g�����-�n�,�Mz������<餓�����~/�_�ѻ>���|�Coy�[>�5��.r2pOּ��R'�&�)��m��E��g`��@
�{u�=�>�~:�n'���j���U�!��
�p�o��o}���y�QG}�������
�+� wV�+P���C��g`we F�݅�q���W��S�xU�y������7��=�q߳iӦ�c�D~ ��cۛ�/�_�o��>���|毞���G�� �
-+�k�5�Ok�_���)�N}��=��������+�6-;��@M�U�햦�K��Ne����=��v�I�<�x���<���������O��t��Q�p-;\M���OO'�ExS�]վ_S��Z�l۾�E�J-��[ugd�5K�D7J����&1aB�hU�G.U?���mi#7jk�Z�����H\�v��:魗|�ڵ�}��K�{8ʢ�Z���`�ߡ���կ~�~��~���#����f"����K��C���s�>�P��^��v?*��B/��I�������������o޼�
����	+'!ڋptV*;k�6�)�T��>�=ZݩY���k�hb�l�U5�*����	��@|r<�ׄ�5�7rAzr��#�l�
-+�+�M���O
>���������%/yɿJ�9 q��ƨ՜ۆO�d��=��@��6�=�@��M]I*�&}��6n�x�>��ӟ���x��t+.8�;j6�e�X �y�*��8F��˳M�@6���	>2r���	�jP$����?�l�Q'G������N˾��ۘW��������_����-��^��@� }�D�Md�wib\إ�l?�@��M]]/zf�����8�iO{�Oh�"�;SVPwwg�>��]��o�U����׬�l��6$g(̺ҙ�i����}W��h�,���t�t)-JL��J�6�,V�1U=+�����᥇�	o�� �8��8�1��\�g#�+9kh�&�wG�����y'�O9���uJ��z"q���z.�,�ݞ��/?��n��.�%�Ї^s������9�]$���SeJ�¾�X.�������G���ڥ&~^ջ��xǿ;��~���ƕ<Y;`b_W�5Y<̕la����7��8�c$�瑔�Й�*�����<�Ĩ�$l�x4ml��M���ē�1�2/���JL���`�Z8�f
O�k�f%��d�P�i��	ܺ�.1�}�e���h��X6����!`!r�d�
�X��o_ҍ
?hx��'8v�	
��Z��{�Yw���;��;�I�/: ����u�@�
��^z�e��7��]�f��|����7?U���	=�wNM��	{�ý�w����3/wh��
-+ߗ���Z�'!�ZO�L��cb���L���Ĥ�WY�t���ú&�]k���ᾞ H}9�/'1l�%N�d���<�%�Љm5�ґ�b�
V��{:�]�3�g��F��s�ę5h�M-J�Q}`_�
/=痳 ��ݖ��9KK�u�p��~��!
��=S9��\��������=�y�^�O	�V-�}}�9KY�����g�x���} �_�5��_�;ꕯ|����=��C��ˢ
rg�+:�p>��ߨ��o�U�]�=�Mq&&����3��JV�H�Iʏ�����k&�B�I\�,DX����K{Y[��a�vS�%�~�s;[)�ɩ�G\&����{���crԳ�@�L�XZ�c����S4���	~�#�Ρ
��:��]:
-+�
-+�ԏ�݁G�݁�a�8�t��Z�}�j�<��w��^�����G�>'�[��+��Hts�E"�������(���`4���S��w^7?���=�����^v�'���qN��eހW�V�҅E��c���w�ަ����W��ҫI3&fq�O��4���Ә�BW�^���zN2j�>��n�2�L϶i�@���eo��
>��O�Z�$@��I5��IA�Y.=+�W�=��-�(��Ƨ��S
���g�F�`�ªnճ���
-+
-+���;+Z<p�G�԰a4�$a�(e�oP㘵ۖN��ݚ�L�7���}#虘V���AM��i{��7]~�����;��$�
-+�{�k3T��R�hE��^����+�Xc/R>���:AX,�1���f�@��"�"�~��>p��)�W�9�"��N��s�z����G�#���i�����j����P�E�S�i{��N���җ���n��.��d����B�m-��m
��
��<$���.����m
]�v҇��R���у~��nݺG��Gʼ
�x�p�����g��j��)s��0��cL�B�0X��4�¤�A�z�~1| �?�
s�����d<9�E?/��9���89���h~H�9�!��HC6����
-+��
�����PE�A{�����e�$脞��O�p �O$�U�F@�=�s���?"���=�Ģf�� �m߸l��&���;a�7��j��}1�I��by�������>*E~��;�	+!��oM5b:L�"}�>��`�?��$@�
8�k�)s�X���2��Ex�礅���&�蕱DJ%���+s��~�@f�*��>u����b�5����Տ����o��SP�
�%Bdf���J괖I/�[��ͬ�-e�Tr�b�w��.]�,��؏�ؙzw������&�C��j��Zz*1��)��{��%���>����[����������c���0}��FWC�����B��Q%���\�=q`SF�C��O�O�^���;� ���Q����c̔�hAϖ0B�R�h�8��Pވaĉ�7J"k~e:�g�?h����-�N�o
-+!�
-+-��/��흣ֲ�׸�8�W?�7��|1��Q�����#p���c'Ҋ��D�:�M<7i_�^
r�*��S�xpf�%[��_�;�_�ds���9��/�����+���|p��!M�;�K^�Dܛ�C�������nW�喺�?D��w��������K��)d
>Ԕ]=���Ǔ�_�H�5
���:�Q�@��̔�ԕ0b:��c]��[��tD0M����c{�B*�T���@{����IM�â��o�C�r��F�;p���v$��
-+O-u�!�`.>	I�YZ��������:ɀ*9T��5�*/q:h�I����\�J�p��KbvJ���mEH���A7d1Yc���" m���
D�L�G8\Rs}��J�H�hH/�J�7J��P��ߡw��������A�܍k-+�
@^�����}8��>��	��������������O>�E�6�T5~����tɗ��S:UO��c�������&��4�3��4c4
-+S�X� ^#U�)[YL�!��,#���b"ń:cԴeT������>q��o+EoK��@�'e�6�xR��N���c}��_�DlD�S�=Q
-+k���s,�m�$�=B�:M��C|��d�eW�l�Uj�KMY����n{�^���_���x�p{PnkñR���>���;����kt��ٮ�0JCS�m~ozӛ����=�7����ۡ����M���0rՖ5zq�X�[c��a2���`��801�i��,��Y�6�l*��K��<|3��j\
��+�үl6�D`i�o�h�S��&��޼�֭[������^���:�i��ƕN��.V
��},���������^na�g9���?�#��?��!
�-�
g�+��ej}5��Ol��7s�%�-���hW�YQx��4|%>?x#z8�p��K%��� �}�"�NĜ�P��@ceC7�D0y�;|�vd��k�w�N�Hw8`�T����#��F}
����ez��B�r������:/�@�h{�FYRm�����q��6��}���.���Bчhy�
-+��4�_�I��$"d+zp.�|�YA���J�ɰ�}�P�iēh�f��ٵ�iD<.3��A�;�Lu�?�b?�D���U�}�\+Mh�Ϻ�E4���$o��BB���V��ێp��ʴV��J��ȑ��i�1��j��
-+��6��y��Ό@
�,�TqEl�0�َ��\ا]��^}�E�,I>��	�ၯ�k�F�a ������.�6����@����h�Z�E��������8;{_h����-5�S�����3�_8��c�;��4H1��@a +ԋ.�E����rxs�Ń-�?b@���̱d�%�q]���j�pO���إ��~����,L���aO�X��+��[,�����A�b_���Օ���
�D�cB�0`P��r��@��Al��h*?Շ�[�ͬ�$�"�qB�s0��E�)fvK4
X��(d>i�|$����G��B�8�K�|�]�42f*�fe�,r.��;��~��nЋDo߾U8����	A|d o%A�>�/�<���^'�i:	x���l�+u�L
��O�C���?��n�W	�{y�W�*Ỵ�B�z���l����e`���E��P��a�z����6=F��}�_��_�V������%ρ0D��
�t�[]J�k鐎�;�}�K}���=�y���-]������  �h�n�1�Z(�����/6Jy�f��!5��LIC0�؇j�aʽ��@�Ii�C��k 7P*9�a��ã�����n�_�������&�(�'�$z�;�)�\g���2��8!A^��*�S=����ɶC��X���Į��k��1�i�i5`�r�vg�poP��7(eO\��;�B����!�S�����mV�1�`ݰ�o�P#�jK�O�f��t�&{�����t)+�~��O��k?�~ +^�r�!Ox�K_��{���E�w ^T�Ë��a�@�P��
������Vڼs丷��-���o�����>�V{n��u�/7 �V�kz?������P���L��f,
5mdT1R�b�Zu�M�5X`���gp��Y������&fᖯ�N<Ǜ�U��;�����C]����I>EQ�E�;��#��J�!��T[�HB�CG��Wɍ��فЄ��sAND��Dl��XGRN�J�8
-+;�8���F��r�������O�)����۩c�}:�tX#�Jt�5_x�g�)��Gt��
�5A2p�+-$�@[K
��1q��VS����ȿ�tVt�v�3��������!��펗��rx�\�'p�^���u��rx���]�t���{��20�{Y\=��@m���f�I�N+C���W��k�r[�0EB������N��!���d�F�U���e�F�]	]��嬶JvՎ:KVG�
�8R	2�oӌ�|���`Lf���B�}�ׁ�i��S�7,Ї�d�T�t�H��X�x�A��L��l	�F���,�Q�;�+�9�N�fe��@W��ux��+ӯ
-+§8��@`��6��7��"+Z�̓���ś+�N��Сi�Ǜ����@�({8�;ஶ	�ta��G���	�|�;���[�Ӳ��Mz��s�]��|j����Ū���n�W�DD���\��-0�[w9>ZoF�1��J�X��?�Ive�RNƴB�n�T���U>�+q�f1@2ao|�sek��}	���.u�Us�3fڌ��05�
-+mӥ\�;�S�7�M�"���f]M������8��������֧i_H�y��?�AO
-+�����721��n���fa�ϊW¢�Աg:H���#ܡ�7�#�?��NU��;&lO��Gx��
+���3�l��$��)w������.��r����w�+�%"���^�
��^���=j�M�a^54��=�K.�^}&�
-+
�{|�)��ܫ��u8q\e��+�:
��ΰPZ:8}��e�����?����y�j�M�v�	�]v�O�p�	/V{na@����k���F�z��W�P�Z��g�4\-!{䍁̓�x��viMF#?ԫ��א;��&�k�Lk@��Fq��2ǩ�ʲF(��K7Σ���(�(#V����g�+8�%c
�Xç�]�
���w�� }��0Cw�OX�
����w;�CF"Fz"&:P��-v���Z����%�#�1J��PW,U׶�z�~˃����O|1cc���(���Ƭv��U�z
-+��{(�!�=��eܴt,�m�f=|s����'z+F��9�t;ps^����}d\-[��rL��l��bDQ��{�%����8�=�Siڃ�%�G\�J����v�K�j�W�m@$��="��3��ewp>L��w]�E��T^1W�iӦӾ�����]s�5�����4��O�ai˴��:��3�O+�p��1�٤ѕI�A�@�H�v�o�|�^
�@P*��VOy8�Ffl��.���+}ϸ̏�Ǿ��w����y��ھt�\M�7
ž��y�d�Y�|�c{�y��?�n�&HrXh��eu/{ �������y�.5�S3���я~�{�>��_��o���u�_~�AK��^3�p�rp{�f0`P��Ճ�4��
Ҥl�������	''A+,�W$��d��A�
(��9��#���."b�1T7Ŝ[��=�X7��Z��b4ɪ+Ur��_���Fؓ"���X{�����#ΚV���8��A;J��6l�o
-+�ĵ:��}�S���s�9��rs��zW@?	؍y_
�w��t݇���5u�0�Ѧf��I:p�_����{�ܦ��]�ɟ��T�8&�x԰��E�`�hݢ�0���Jf��L��N^�'
��rM̳wXxθr����K&S��1mk"1�W�q��h�4`
�����.qp��*�+�r��xEX�-��f�+����=C�S��g�G���:>YH�j��^� O~����D��د��S�
-+�NV�q
-+�Ր؊皶�C+���?�A�H?T3?�#<�Y;:F�p�ִo�0�/~i�5�����RO���w%�r]+��^��!��my�&r�V���'se�����?�Y���N��K��O�����V¬|�đx�f�_~B�#
���z.��x��
-+���}K��DMY$�R����+_�w��X�	���B�UC�"�4u/�)���&�K*����xO��e��?�����)����
'�n+��g{�ʃ~:�<�@0�x�σ�gB�Q񈞂]NP1�#��gV�`Y�� ���q���#E���r�:>�\~�
-+��T�G�J+N��c뤾c��y,Tq�*��x(
z�o7�0W��X��#�\��*�=U�}�׾�3��C��$@��'����&�ZDfg�z���=h��v��@嗺]a�e��I������>Xu�RS(�G���[M
�����^ ��'@���kd��DCOv��c�l����
��U�N�c�#Ҝ�l3Z7N"�+?M�����l)���V�ۖiy�6�e���9W'�*�����^�Q-�;�����
��b‰�'΀+>
� �-��!U��,�/[�������)����ӎ`�}*=����q������
-+
�U�?mئ_�8Z좩)�Y<�E/'G�-��կ~�
:	��-[��q@{'�=��(�E�!r�^vab��B�5d�rK�.��Q/�9I���ұ����Y�+��i��M7���3�<����.N�;
�$�M��ǽd8;�\T^�ۥ���7w�q�~�ӟ��#�<����,:��`k����~���z����Ee����J퀓r��[��[����%���5`����1�3��jl�ً��aʭ(y����h��%�F`���([�A
?���m�w�ez�+K@�3��[�,��{��|!��MM61�'':���7&���1&���"&U26�	�z(b�az�%�q�e�m���$�*Y�����42~�
-+n�Fܯ*b�C	���N��6D8d�G�.5�o��;
-+u���U2���U�-���@�>�����`#�ҳzB�!�AV����ɾ�y(�G陀G�˓.�(�_6mV%s��������=�IO�?n���/ɼ�4�ݓ�w�=��+���S�ʲ:v�/����X㕏�콂�V��c�1���]:f���'m$\e��W��3x��rxm��2h�o�喿=������|Y��q�4I{�[w8:@\T>�ۅ#�]���UW]���s�����Zt+��u������d�͝�c�M|��rb��.��>Z>a`ES��J&|���\�H]#�&����LN������I��Fn���9g�>��?L��!��%�r���6��(����K���~�F%Ut���TlO��/N+{hQ�d�"���=�aR�uim|Fq:%&1����A��6���A���W�����a{�g2b�1�K"����p�^��D�c �)�^1�G@���1�`�K$T<O�Z��P5�	�ra���[���s2�����?F0��Zy['��&�Y��Fk/�%K���N�6D��v|��p���҅����+G0"
e^��b���
йt<��U�8m
�I��蹀C��W��]E?'�}����ϝ+E�G��&��&현Q�(U�t��v��³?�p�j8!t��a�D�H��p�u
���o��'0,f�t�a�C��z`�1���E�;O@	�Bl?7n5�(g6��J��y�������,�2��J	�����+EY9`�J�emSX�jT5P��.�O�Y�i�~���^�؃�䆉]��I!�̊<AOq''X-/Bþrd���������ZY೎��]�u��"�C��ʷ-��>�qse�{b^@�&l16/q�O�Z�J���]���?&��9�Z��F`*&T��Ɔ�m�*9�b����Ψ�ë]����ᘏ�F�Ɩ�a
�;�$�U��'WYI�/�)Nc%�H��R�v���#Ӧ�_��=Aj��/+�%56>⤎X�t��Y�T��]cƚ�O魠�!{�0&26���Z+9h�1�RS��,T/)92>$�n4SV=�q١O�袋��7�1pP�vc�*�����E����3�xcY�3th`��±�O�*5��@W݉!�Z��QEÌ3�
Y2��9�(Xp�B�@�6V��)�7��3��ٓ��=�Z�-�B"�L	���JUWj����*l�W���T�sYG�ox�߁�Jclɓ�Qje�a�6Ns�ψ(1�'0���Ƕ�/�o����V�Q�N
�����k "�uX\c�Y>D�q���x�e�D�w�@��ur����!C�bh���/�" k��8��n(cSx�Զ�g��1�tPtD�+�؞�6�L [�6y����.��{;�҃���ҟXÏ;t!E�������3Fܹ��J�a	
�(�	v��1�&�
-+m�%Ɛ/�-��_
��@�:aW�Jw%{=�#�X�����]'�'+q��P�a��BFLD��o��V�'�3LR�
pN��b�O��������5�Ķ���Ylf`�bXQ26/�Tn��������2?�O��<��,�	n�]�F�q˪��Oc�~��v+	H?��Xn��"kH`I;m1�-��/y����u͋U،`��.�X����
?�~٨�2{g�Ɖ��P�.Y+�2��=�1�]�@�v�!�P�~j7�OI������훵N��p(�v�V
5�kc�8�i�~�Oܙ�#�v�k��}��
-+G:j�!�h�9�WGT;�����+�@�5�M��A�8��”�}��UN��s]�&��+��Qذ�OVt�5�x[�j�mP+���'M�7����'���v��ߢԞ�;
���G�b�z��<��7>�iO{���]v�ewH�w,*˅���d��f�\Q�R�M��l��^����?ݴiӓv~���1����k~���������l8�}+�
�G�)��R�\��毂���M�]
_dB���.��O]U.�=�g[b](��ڞ�vx؞�ibđ���pɓ��ց��1�8Nh��?}`�o���r6$߿˓�bȭ�Qd�
��	��tŗ}��x�d{4�lH�0�����<������ںt�N ���}A���{｟>��~H��r��q+\)f�ɏH|�C2��hT�p=0�7�G�1`�����D|�?C|jLr``7VL�L�T,暀���F_��_0�CqH��Mz�8��'6CѶ|"�O(8֨�[�5N�	6c]�U�'�0��n
-+[?�6�P�Q��
�v�I<��Uy���t;V�\[�ۚy`�9���zd����\���x�҈�dɎ_ 
-+�:9�������>�6�a�t2��נ)��#:ވ�r�+vL�'z�dۘ�r�#�
:ג�?l�]w |�`X�2�Wa�H9_Z:\�߰i�_�˯o���>�1������iq'�=	 !��]�t���e2�����.�B�.�]8
8�K.�)&�:��[�H;�jmZS&�Oh�K�Dp-��
���48�#x���Z�<�[d5D���"��,4"Fa"��P
z��f8���B�]�G�e>�2��Qz�"�(�3��=
��
YQ�=K�� /(Y
Z�d���{������Y.M��~`��\����uDby���B��H��>�B?�l��&�>~Y�3,SC0�UM���P�G�Il�G��K����3���"fPv;>@T�)�SM�O�\Lyf�:�26'
Sja���L�4���DN2'L��>Y?0@��@��sDE��(w�
�X+�ӭa[�`�2[�KktS|��X��:Ь��c��U��^��Vl7���,\sB���g�%?��{bLc��́��Э�J�Ԟ1��/~�lx[ cm;�Bg�C-V�����^g`�s�W;!;���ǿ���N�/�q�T��f�YMw�:Ш[��:�>��tޭ�	n8�Ep�>���f���`z8�c��S�1`�W1�eWMt_mPr�p�E�=^�� ��&d	Y|��^�
�F�ɻ�����'����g��ô3ū���'�1�n`���]�+��^K���+.�֤YZQ�++5�n7����s�cl�
kL�1�>�D�?\i��.%rzP�dNh"�
��!��Q���ܦ��P���
-+��52�UG
-+��5�f��S�����g���"G���6 {� I��E�5v��60��ؘ�!L�a�M�B�V؈1	��͕V���a�Ghl�!Pp�~�
 o'aڇd��=D�\M\�l_�{�:�:X'
ޡ$S�����C�൷��6�_c�)���X����=	�s�q#y��������^��@�#]u�p�ǽ��o��}��E?��k�v�:pЧp^���ʟ�%+�>x��Ղ~OtC�c·ˑ�A,��I@P�EM�M�S35`YY)3�g���`P�$yԬ1��k�W���v��%�CF��aJ	i`9�
g�ҍ�@��y��@e��Xx��=
H���,]���TA�ٕ��
new��,en#Z��v�+(�b-���"���a�}�Hp�K��1:%����u�Lc�����S�Gt1Y�\N�����}`Ё�NC�]�5t8�����3su�ƃO޿��ÜX��R}*~Վ�\�?єa�p+V����j���1j�
�˜p����^8�D���B�����������Do�2�y;p	=84;|���AR��ğԏ�ܪ��g$�G'lO`KȒ�쉿�g^��
��jQ�b��X�b2�I�̮;+���a����kۃC	ϸ�/�i�Z�gv['?���2�$�c(Ī%,�iQ����
mL�=�;�ڥxC-"|F��.^�v�{i|E
ڊPs���v؆���X��0�-����e�_��p���"G�R���$>����ab"B�b=�b	~�Yhl�JF��q�|\E��l��e�a��$}�����B 2������7��+�ŗGj9�Q�P����>��j��	#�v��H��ȑ�p�_���2vM�2�N_���A��Mr�_�l\���1	w��X�t���KO�o
-+{|��Rtē؊-rZ�c�H˖-W=������������w=��Á��m�ZD���%3[����@儺]j�$��a}ݵ�^�ۛ7o���wi��%z��F��q+��RzH�%�+/�L��n��IM
�i��gϞ?������k;��{���<��׊'(���8V�]������|�3o�T�e��2��Y�[����%?��)L��2M�̋Ls3� �d�	�
-+ü��|�cè�3��[�l��K
]������[��.mp�2�����l����*^V�K���C�d�<��k�j!��X����:�j�c��r��@�K�"�Q��6)r�čۖ�e����:h#n�#��+|�Ͳ�Q[���,�J��ص�U}��U��ji��
-+ڠ9��F�#�eb19I��4�JO����Y%c
�CZڔ���r�;Ռ�x<c��``H�3�e�&VZ�Bâcy9
��I�T��ؑ'zY���؉.�b���i`�#g8~y߀-�	U���@�W�Ť�,5������1Ck{�t�rp�����
-+��붉�emJM��[w�Ν?z��W���M���3}{����^Yf�;��9=`�,�~�O}�{��޿����/9UO~�Q����Gu�,�X}�t�1&)�SU}\����M��K�,��S��B�f��%g�Ɖ��l���+�v��ʚ��@j�6J-F�,$Wڕw��Vݱ!��<	p/~3C^�wn:?UG^b^p#���
"F��F#|�C����H�	w����z�~������N+F�R��;e��Zƾ�����>��74�RƑk
�|�1����
3��`���CE�6<>Ӳ>!��Z4��A��@I�i���Z0N��E�qm�+��_�c_0������WR|���>rAd�,�A���-!��Ґ�,��!m�n��m��6���V��ht��(�NЖ'+J��x-�������œ��*k��V[�Gc�[×\��:�#*�d;�����a�qn �E���_k�Э�	��Q3/Na����{E�z��YB��L`W�jq��1`���c���X�9n6Զ���;,�}����
!�?);������<��+���ͷ�z�-2��+�晇��-�����]i��۔�����1���Q�RG
�=%LZ� ���5 !)��5�F�-ѽ*ⶋw�U����E�X��X�Y+C,�V�����
���}o��Xѩ��C��fN-��QF鲇��|F.�ogAd���#VS�ZQ��z�7�UP��i9Y��+��z^��&�giD�oq��k��`����m\���o�΋}i��&�e���*���3��A�+��S�yY�8�-,��uQ�T�&=m�A�W�vh��:���{`��麛�2�|ǝ�}{��������<�����Ν���X��t�Vr^ ��Q�.А���0�n𺽶A���l���L�6g��)C�)�:��I�}�[���*�Œ
-+~��{N�Ča�Fb9a{֥E�$Bk��>�Sb�s/
� U�i_El8��ذU6g��8���\�$Fs5	�}!�Z�방Z��+x�+-��&J��w���FD��M��>�u��g|ڛA~�zN��u�L+q�b���e��1�+�Xᄫ�Ĵ�ь{D�+h���d1��{�
�vD�
�+�l�G� Z�J,��ز�E���ڼ��)��|�p���F����P�yjE;�@R��H��jHp(�aHY�{��Ńm@�cc��
���C�����G�Za�a��q
�u8���V���"1��/l�vi��4�� ���xX�k����������K�r�9�k7Ԡ饀��Z�M
��c�AkC˶��������p� �,7��������������k r�:JL��z-�����ߣYڣ-�H�:�fA�i8��'!3-�jz�{����Ԧ��D:�آ��B/^
E&d���bۍ^&u"b�qWe��J��z�M��z���X	�A	N�Qn<Ǽ����E���d98*n��$�b+���f����M�,�*����ٿY�ݍ��>�ش�)Z��˲�z�ȡÏN�|���~Îc��K��656Z��d�������@���[���t��;m:��v�e3iC'�<a2i>��J�~�<U
�˻�{BOv�f5�O��l�!�G������}4?'tc�w��Zܟ3��;>Vi�	U��F���m�6b�y��Nt���%�/RhX�f=k�k�<!�&]�(�C�/���E%���kH�fc
��B�u�b�n8��15[%7�J�;w֍M���
��{��s����q+�E�>چ���/�XO>�o�O]�*�R������Ey���I�˭/+ƶ<$P�d�
?��E�u
-+��4۵��䟥}t�_:�{Ƙ�$	>��Z�Ѱ�=]ya{F3�yB�~K��Ц
������m�g�4\�Wb�_�Fa�ٷo��5��ʶW��E�&�jS���aY�k�[�jګ�>.ۻ�7m"y�b �V۸�TDBW�*A�<Aq�#�� �,n���Xe[\#�vsD96=OZ�;�n���d���l�/'�+ƬJ�xj�D�mDK�M�w-ر�������Y��Y����A�ŇE��/�E��1qH�>�⳨��d��{�&+~u�Es�k��Z>t��"���,�O��3��B�W��s����OLw�}����X���,�g�s��+��~��?8��_6���/�.����SO�U����=Bc/�+����.�p: F�@+DZC�1X�(
-+�r���R'��p�۶����_��QzLF�3������v��-_x��#�@�+k<k��Oӆ6\욶]VMY�C9��}��>p}@�ux�-�|�+�{ի^�Ͽ��ToԻ�1�|���S.3.ٓ�N4�B���ڽ"!�-OR$t��H�-q��q�Ն��;���e��D�QN�֗�$����O���HG�Ɍ
-+�}���U�֧k�q���J��k�eՒ<6	��}�Ӽ�0/��~?�%{����"��1!��v.�s��v��+F�䒢QC�]5�d�p�f�@�������Q�6~*��y��HzAs�J�
-+k^���_</�+z�H�b!<�#�>���'��r٥�M����ظ�8�`h��2�M���z�Z���x]��EL1�LH+>@�_�?n#!e�u�n�=��l��^)!�8����;D�8�F�[��%d���LQr*����v"Nò}_�)N�3|*�X���}������J������<�e�E�4ڬ������v�sƖ��=���h>�cY
`y+kY28�0~!c��!���H�>�i���A.zj^�9�8��_����mƱǾsdG�P/X���������m"ڻ��g[m-�5��٧��F���W�	�9f>��wD������;��SM�x
NHG��<�ި�T]l�‹?b�S��,y+��w,q~�R���+�3����-����,�u�e���D��(�p��,9�W��c����*�QM��1�-a7��w���Sq�n��ܭm�g�H���
��*_rA)�Ԋ�e�Jy?�q���M[�����/�DL���S]��e�)�|�{����b��8������r2�Rr_lL@p+��������k�4DkS�W�c:Y��
��������ST�6h��ua�k������>�8Q%@�S�$ _�a2�h&(�|�6�i������N
-+.�����Y�`Qw��M;o�1,~^���qA���
-+j.8+i�Xc�x�Յ\��]"K?�#-d)�R�k�?;�q2D�эj#����� �9�+&�=�j7t�g	�„iB�d��ˡ�@"�u��
-+k���$rDY]�hڪ0��	���
s$�h��.�B��S9�A#��6lݺ�4���-�i�=����gW�^5�t͕.�4���հO6�0-.^[���X�B?�ߙ(�.hȨḮ��l��HC����
-+<�<��h߃��s�
-+�w;�TWӾ�A\ꀈ�(`�6j�B���u��a}�Њ.����w.D�ج�_����b�>8נ��ھ�#5�K��]��g_��[�cEm�װ@��Z#U9�E,:-?��&?� �����x,�9�e����kw��>����i�N�>��BnU�v�٢��S'�����,w�n�Hq���;������>�ן>�:|.*����d�aK�c����n�!��K��e?ё��9��߻hmĠbp���w[;�K��Dr�H��h)�Y
5j�
f���,�:���Q��J5�0���
�u�pW�p�.㟦���;�T��]�Sh�"$�s5'pa%����;���a87��%�2��W}�K֊�tޏ�1�~t�/⓳�J��Ǩ��C�ᆇ�G2�V��w�㜠s�3�3�Q�n"� ��r�������|�?�iӦK��@��a~��'N��ƏL�L��2ϪИ������I��C4|&�'��B�����A<%_�i=iU��Q��v�r��ʼnf.D:.�i�ĴK�]�
�B���5�D�3��g���ϴ�N8����|��;=+f��4m�7:���+���p"��^���ߺi�����_�Xeí�]�#�C�O��?~j��|x:�p�����$làJǞ�ĊO��l���;�����&>�e����ed��<�آWX���8�]++��k�����&�\��=LXj��:mC���7�!-��k
cnh��^���ή��N��E�H2YF������vԕ��Ǿ����
�%~�Ņ:h���ۆ�nb"K�Y��_!����u�WuU�Z�Zz�g,E�i�v����7o����OI��+4���&>i/<�ǵD#��y��"�z�����{V|��s�ai�NGe���j�s����y��W��T����b�}�:f�1���ˍ�'��.���������_�ܓKf^<$�M
-+z��X�?�����G���@�՞��� /w��t��$�ؼ)�y�b��45��X�`�Jٴ�@nl��hY�#&�9K�4����'�`�\C�Z��'�}(/>�H�,�YY����/$�|�i�hy��3m�R�
-+|k �����k�8ZQH<M�lu�۹�c�p0&L�%C�Բ�?Ӵ�v��E�%eU��x��vZ=J��M��c�>w��&��	eh���t�gNW\v�t�y�N��t���߷��Fw�w|�G�kl�'I��\1�����������W���~l�ǘs/dr��l��yC�|]i�,(��TS���1�ο/.
-+��u�F]T�eM/31v0�"�<MrG}�…D���?n�/�A��걩>��AJ��C��cBq��j/���?I��EĹ*�f�w�Rq����=v����"��
v��$����?���B}�L6�U�;W�̙�o�=6���U��o9�l���Q4�={���]����[�a�7\�����^�{�3V�B{�1z����/�?�˲݃��ֿM�S}�>�jG�uu�<�3=;y����IäfL�/�H2m}w.C5}ds^b��A�\숆s��m�i�հ�,d���!�K_B��]E٠����Q<��f#ix�V��J�^ę���(�5U��y���\�45�=f0#�<qB�/G�PV�>�X�,���'��R�,�͞:o���s��[�'���'K ��9����
��cVQM/{�K�n����|OZiй�]$�w~�nomu��K6D�n@��]�gZ�s�j������#/�"����/zR��$VץXٓ=��
U�h,@��.�ql�
Lg���ü���pd-��9F����)[��s��p��M:ֳÓW�d���u%!�Fw�_V��6:"�&=��F���1(!��
�B
-+]��	2���'+�
-+���+��S��Q_l86��6���I��ΏÏ
W��D�}�'�e��w��ݿ�wy�]S��z9X�`=��Z���t���{R��1G=Q�J��>�~��I��ѭLȌ��G(�Y.�;4\�LY�1�]���XOɤ�+��.'R����5F�ば*o��bէY��z�~�]�5>�H4B��E/���@,t�|9��2����	�������?�o+��z�q�9g��U�J��R�/��7�~�F8V�Y{r97�͉�z�/Fp��\І����>��x%!
z�	80�x��%�E�y�jt��'�Ɖ�����f�'K���|��>���\I�x
�^�����4��"��a����Jo���ܱ��c5���2�Q�|����k�?�G��R?I;�N�ٿ����1��)���'���0���r1��S/O��w�����+_����Oj�N?L�ޅ��+��˶�N[�/�v�t�. N�/2F��yX��YV;j��8בc�Xs�R�!(ݐ<E����t�k;«:ɀY�F͌�%�
�
-+�:cl��	N?�K�Q%�؊R��n�s1�b���c�n��R-x�ֽ�+�~J�|�/'f����&Ǖ�͛��$)Axm���
y��ia�3�VE=<ǣ�JH�5n��g#j���Ǵ�S��|��Ѧ�����}�C�Н2x��=���F�:N�vL�9��U|�U�65+��W<�v��o:��Z�[�w��Q��k��z��g�}��տYW���+�Ac�0�����|�|�y�dJz���b���x�VFb���D���~����)�0&L�1`#Jua:����g%c�D�jZ��Ҳ�:�膺h����R蔌�����/�X��H�D��n�K��@O\}A�Rʑ�t,E��&<�
-+�6�Ǿ�+[����
�\�/$[��MQ�l�2]��K���"����G|ĀdžDG���n�?K7�Ͼ�����k��O>Y�ܹ����']�<��O<�w�[~��J|h_"��7x�K�;mڰqڤG
4UXYS�
�I��:�9�׎
��E�q~C�X�G�]P�!*��,'��˜��k�Slb�6f��ΑM�ɘ��� ����/�2zN�c�b��w�1*��r`7ϊha[�%G[Hȏ������
-+�p�5�K.�$��s��+A�`�>QKI�mA&'Y�8(�?�T�D�K�_������
n�������Vf?�pd�<w�z���K/��}����+/��5r>���0�6y�����DU�j-v݋'V1�䥟�Ͱ�X^�m,�C�t�^��8������9+�(E�_�S���+875�u���E����˻z�ki�
Sض�Ā]@�cQ!6��&K�kj+����t�S�/�f��${� ���*?����7X���9�c��Q�n�����F�����Q�)�py��&�ԕ|ٖ�����[��ݼe��K.�;�/�(r�X������49��1���Kߒu!�NJ�}�"�����A����v�u�������4M���.8���d���v}�p7߼��qR�o��Y��,���=��/z���?�K?m���4����������ǂ��;�!�8t׹ұ3�e����[�2��Xx��u�*��&Ϭ����:}�����W�D �L؎]�4#��yW�>�g�Q�sR1�f9Tw�R�7���?ց�S�Ce�濟��~�.1ٸ���vj�k���f8 ���~��"��y=D�cd�`8΢IiZzk�z9�9�[���7�#��`�v���\�4h����g�S���c�����>�կ~�ϡ��zنw���z�F�&=�g����h�`�
FcB�B\\�0kb[��*�8��
?�.�Oߌtb���
�"�����B���ݶ�c[�A߶��M1�/�U���*��ؖ����%Z�Fb�G���6-�j�	
�Mpݞ86�r��IV"o��1-���}��G�:�.?A��k#���>>�_S�Q��"��5���x����p���68Σ��3�8�/(�2r#_��
b���!J�aO3��$�r�K��׸
-+%������3δ����M�fۯo��?��{�4̶Y@Iu��Q�޲S�q��`Ǿ������p�P��R��9	wٞ���<�����n_��)]�r!�\�~��b�jjȇ�
���EM��>|�8�&#v.���
9T��p�@؞|W�g�n[�����Lg�L��'�����J���2_�+K�_�#Bh�m��-��sAH��˚M1W�ģ�r��f�����r���cm����S��/<7z��:�G$���I����z�+^����V�<�u��߬�q�
Z#ѣ��1�౛������0�K
-�l	���y|#�	�R�Z�ݕ��+�_r +ݏm�Ee��逸�q_i��4��`s�LhB�ņ��Šk�/Yc��
e��m���5?�c�n+�P���S�ᛰZ_)��m�
�E��Q�Y$�5+���I��,�,[��F�cY[u�X�#e��M�h�2���M�%�s��������Y|*J�
-+Q�4V*w,a���`��|���SSD��bI�Ƀ�W�ɏ�y��<vҏ��zY�3���+1�O�?��3�{v�;�ޝ/+;���/�{�CG'n�2�{��Z�uan�J4�}J�j�b���H,�+�J��$����j�b8
-+:�S�8>���>N�&�U�\c�� g�W��C�rr80G~ැc�h�V��+��v�<���;σ�	�	0�9G�"ERjK�[j�A�-���ø�.�����n��6O���eσ��e%S�TjI�D1�Y �L$
�����u��.A��(+'��R��bUs�o�>�� �q�WL�o��K�X�G��\p�^=x������9+9r\�43�%.�	��O[�g�۾X	��A��b�j�_��,(�̸� 9��U:���#l����}8��8@��P��8(�X8�g6[nY����Gp�=�Rh�W
�A���4������'���PK�m+="7����i���ͩ�����s^��o���<�G���������n���������?��N�ܴ�|�	�=:��R�B�	`
-+�i�QJB�V�5++���G���B�=1�ck��g�n	�t�	Ýw�m��\d4��������sO?M
��]z7+.�O���&���P[z��e@@G�/¢��g�~2<���,��roR#a�o>+L4+/m#V��7�j�]�X����,����9P��%�U*��
�&K�3(���`�P��D����6���Zv19��
-+�y��U$��Lg�����dD�n��v�2>5O�5=���u�c�DC\�M�5���������=��
0��M?�٥cw�Y9�i@�ml_�7�7���ǁ��0��ў/��~p_.�A�e�3ۚ������t
\�������E�S;kq��S�I��Gj8�7�j#[���ZÁ-m�e��x�31#3;�LÊ�ư�}��m.M��Q�)��m��{
5-}��GM��j��(�h,O�����͋���ώ�W�RF���E3\Uz���"\!S�)�gڇ���
өW{ߠ[��f2k�C3��Gj}N�i��~ӘA�"�zQm�}���Lz��	y�A%��vL��D��W_��a���LI�7m��`����o��+�w�Q`y���7�#le�����e#d�?2f1�ي�9��/f�!!�d�ʖ�bh���	^x�K���(�A4+6�d���mE�s3�̀!���ޜ}�PF0�����͒)A�@MjB���t'##?;"��Cʸ7?Z��Ȏ�����>rPl�j��h�l�}'�t�_QS��ǜUO�o����{����+�8!Uߓ�0������e:L��QJ��3}@[v�m�'��B;=h�RH�ɿAȇ&�/�)��ً{-CJm�b?���n1"Zׂ��l�	߲��+@�ֽ������F,�.�Z��a�
'8��A���V��F��dJ����Wv
7�v��X�Z]������VȞ��|�6	�i�
��/����~�O��eY�!@`�&_������O8���ԑX��/X������1G/�!.���Z�d?�0��N�P.���H$��X��q�Zj�PIF�ϡѸ�W1�#�T����hZ��饍n�x�����2.�t�S��X9t�%�m��o&�Ac�ԟVz��5��˲�q ���o��ij9�g�!W�H�|@�y�M�6�r�)��V:d�\�=��E����W�.�LƓi@q�L�'+Oѷ���j-0꾲��u��BL��Y����K���U�lɰN���և6g�<X�v��t�F���u����ͫ�Y�0�n���u4�P|��A�)1�]�@����_�18ǁ4�/�Ç,U^�<���i�N��5�y���i�	��m��7K��C�U�}���xPL�:�$t���U77<�������r�����mj��E_\�_8<����'��F�
Ѩm�^%���~]��^��*��*�3���J}�)��ɾ%(bGԱPm���;Q����5<^�9Lأ4%�2a0c�m�"jy���1*���s?�g��Pˌ��#�u%�5�v�S���@6��6Z�5��w�J�4(�0'/U0�j��0��g�<�^���b}�)��9�t"+e���Ώ��6	�gg�rv
���
-+�}½���M��9����U�Α�CD���2��>�'~
�u�g~�T3�EO�Xd;� <��ahB�����)o�Y���4��DO��GRߗu��V��1\s����}����ݙ�-ߺ���K.�A��a�~��
���MG-[D�Q������P�`Q<�8
-+q��
��.9�LJ_��{�q�-8�B��ͼ5��HǞZ��UQiue}�B�5�x�Ѽ�
���3h	6��(r���|�I���3y�	�o[8�7��g8s�A��FKGbF�+g�GJ!Xjf��>ػ�~����������P��J`1V-���Vxh��ח��?�P�$Hڂɲ$>�I1�U�$�=��$WEJ��Ik �L/ܤ��L+�o����?K�b��3��V�:顇���w���H���g��oWg���:�+P}$��_�\�ڐ'!k9�����
/�R-��A�/�p[�y�΋>��6��i�^�'��MX���䨁o�Vգ�j��]uhr�E|�\v�,�K��%�[�r��.G_�����_���ȯ�ݭ��{��ٽ�
߿_������?;%aU#J���������`�/4�
V��q�zV�f(��d�|wY�o�� �E�t覥��A+ի��+W+u�yݚ5��uk�
G�߭_�zݰF��d�(1�����ȣ��ؿw��I6Fq��]���q�p�U/g��\�IE�5��l�+
4WhV(�����-�Th��wo<���ry���g�y���S�W�b\yC�uz��r]�GH�mC�
���k���?�|�9M�7���Y�z��W�_�_-\5�~�i��Gi:c���hb���z��>N�K�zݖxm���U9��m?1�l�?�&V2�m'1m�{(�*���t����ׅ%ÇR@N�X�=w�c9��.�zLi@�r�Fx3���
-+Zd���W�<p.p �B`#'�g�
��v�S��7�dA���)��X[+ME�u��/�kJ�+�$��Ú�R_3B���2�0�m:��%�+n��ϥ��kq}����Gb����3Ͻ0<��~@,� A�= �
t�q��P���k!ߩ�>]�
ԑ�J,˵S٨�M��;���X�[Ts��a�n4r8kܣ/(�g{�MF%R�,T�@�4��7L�FތFUB׋\$���yX�B~˔b��f��/��<L��3���}�<>s��h
�S{%C���r0�e��"�o���K�EË|�����kp�ϟ����h:v��+��AU�����ׯ_7�a�p�6����-���6W3�hg���
C�Q��zUW�^�=�hs�	�����C4�gb�<���%�ܷ>�K���v�!r����42�.Ά���>��`+�b�ґ��q���񏢄H���VR�xf-,�<�͓י\�CGQCpb���O�>������SO�k�
-+鵼0a9���vM��CMy3}�ZB�z�<�R���
{������S�������Y�a8k�)Õ]4�tܱ�\<��H�Ɍ'h���V*�i�l"����Ѕ�(���݅0kn��EeM���J	�~�u������$����+
e6�BsIՌQ/
PURur�&��o�N$���Ar���	~��Df�s6�I|v�͍���P�(�:��m�諆,�Z`KjM2�p�a���J&Hdz�0�°��<_��C�?q�'�c�RX��II\���8rLP����{x�p�C�~dxmw}ӦE�!<�*� �Fh�!��V�\b�nSS~Z>��Y]#㹗^��������1��/h���
'>^РFc���ew���2���Щ=*�bo��#���E&Qi��9��E2�|��K�+tG�L�b����{�
�lxDWm^}�U,�>������|�>�t����P�ڱ�d���P����z�p��g
k���}ڽ� �/]!+�Dn�as�0h�xب�>�h��K���x�iݳ�s���}V
��E������]�;�[�eӲ�����|]��v�hڦ?)�M���Ak��_�����N:e��*Hmc�iFm��)�g
-+[�ݶGoū,��&��mP$�����j`'�sʙO3ymy�w��5<��q���xlx��g�#�a�?���ñ�E�~�?�׬5k7{�p�'�[
�ɲ��u�u���Ǟ���6mv�Tv(	���~�ž�&J�a�+6�v�+�x�az��-4�$�D�vº�ǎ[�:0������H6�
-+;�d����.�ۺV�����h���mO�Ll�OzPF�˟}��A6��ڏn�������e�L�D(s��$yvz
����7�u���5�l5V
�7o�.��M��\�Q���w�9+EXС�1q��q�=�d��H��t�G��kk�D�h���Z��+�Nך���<S\:��n��rh�˾JC��G
��m�-�<��>Ʉ�����A�Q�ne�n�|d���l�G���j�Ŋ�եנ`��Oa)��W�3�8j��3GSl��[+�;�ݦ�2m;wB�|{�V�m��e�,��VN?-��o-������,Ӏp�D��?�G{�_��_}X_��(�?��`&��,��_4l?���� Gۘn�n~�
�d$�T���J(lxU|�L{�
�8!s��Q0�a�O
� g9�0[���*����)�趥�8��z��<p�٨�g� x�^��h�Y����K
-+�t?���K�]z�k��Z��#G�)ݦ�+���;
�{|��_q��x>�����i���S.�����32(�5h&ٓ�Eд$�)����df���¶'l_�Dg�.Щ�	�F��D
-+��<У)E�k�},/��r}�Qr�#9i�Ȑ�?((�ۭ��G�)������w����ؼC_���
_�xzᙝ���Mɶ؀P�����\��M��f�l�MTL�.�Y�g��MԌ�9v�ۦMǨ�IBjR]������_0F�@��f�]#���YUa#Opd㬍���t��m�_f�R/-һ�y�Ο�Dd><�ѥ��Y\�rh�����ؼ����2;Tc��: ���^���ciAU��_�x�{.�������5�fxꩧ������c��n��ǧ�u����ޫW��+�5z�!E��+�/�7�_�g�2�䃐�������?�9y�������<�>ޱ����Fm�"�)�R8�c�њ"���UPђ�b��F��)W4K�(
ݒ�dQ:�Z�8_)�d#������ηƐU�;�5�c���Y���bkÚj�_��Q�6���+�[��c8j���(��W��uG����.]v]��
-+���Ϫ:F��Q�Iܿ��a�n�*X/{t9Yo��k�_��ʰS;�Wv�^捃z�hNz�~	,��>���B�+��",>��E�����5����ⱟj#��~���<2ܢW�ޭ�%O�7-�x�'�j
-+U�G�շb6*ݮn+�ݷǷ�Ǘ��/���k�;~�b�M����}~�FW.>rݵ�
&
?`�_��<}�o��3�1��y��J�(�Xp
-+���8;r��X�T���D
�؛J�ȅ\X�6�f��O���<ا+��
2�X�,֬��K�Vk,�D�<�}Y�J�0ȡD�t��̛�o��iLg+��>G]v�e2�dà'
5�*ݦ���q��C�3-S��b�E5G�}��䚜ij��p`�]}'�+t�Q�	c�-U�{�/(YI
׻��G�����;2�Ͳ�m	l�3m��4_�qQ��;���o�+Y����)"�
-+hg\�d]=v{�q�qz+�q���q�m6�+eu�%7��x!|ed��|g4�	��K��\����^�����\jC�1T���+;w�1�
��^��Ͽ8����d.��Gm.�eߋ��� )g��@
�R���  �1g�H�	U�_0�R4t��^�ǜ�c5e
Z����dv���}�fJ�e��<�b6)=v���d�Hy���h�p���w�~��m~�_vG�튧�~��a�"9�@�Uߥ����ԯ������ޕ[�%J���ի���l���$�
	���:�۩��^|qx�'��������-�Ii!���.�����|��2���tظa��zcب{<}���D'{��2ׄ$V�ȵ���b�Z�������c4�@N]�"2>�F''�>�1�%��6����
>�D[^}h<3A�M/�02+F��z�B��|85������[�^t�M7����\
 ���w�6RêU�H�20	��̘NX�e��AiS��|��J1��+�oT���N�C�����P��*_%m'Yۈ��6�δ2$����R�|m�-��:1�O�m��EY$g+"�{e+��#���/�����@�0����m�UOw��}ƨ�Q�u�(��	��uk�SN٪�޾v�I�2=H�Kz"�ڹ�[������+Rd�ܱ(EV��@���C
|+J�ZsO�㪧��OC���\AxR��󸾦��~��cb���q���
-+��'��9{�s{虀XԔPL����e\bké]���hk��� R�>d�@��HM�:ƌ�Y�G��z�J�R��P��j��䀗��	ImM��
-+ӈ����-������_��s�3����Z�x�;E����+?�o�Az`Ʒ��FP9Ҡ�[�G$�C�=�W+�ƴ�+���$Vm3�xh�Z�g��t��{�+.���L���o�GW�|u��!�c�����P��\l_�1���+ �
�8����=��Sf�I�xJ��R?<��s������"Yɾ��������>��Z�v�j�K�����y+�z%�����b�Z�
�ႁ6S=��o]L&A8"��J��Z�� B�����Φ[Wm�zė&~�
q�o)����_��d�����3m�|�sY����*v��h��R5s� P���e��a��"n��\	 8>X	�/��
�dh���.�:R�}A�f8�ͅ��
�qV9ؗ�8BM^hkS9H�0�+,+�{�d�A�c�~X~;}�w��c\8�����^
˻0��1������Ȫȉ�q��.�ܗ����7�m��C=�5v���q��I�8`�XXV���-�෕�aى5�'�?��96�oo��h�1�Vnu��S�)��v���Ȃ�ڢ#�re��5��~-�!�N�Q�3/��w-�ݻ�i����_���l#Rv����Y���m멧
��Ǐ6빌���y��8����B�k��1��>+�nƧ+G�"�[N�i1�G,ȃ��U�xP��+lAձ"X�[+aH��U3�v�����2��&�H͐��_�$�t��l��^��ϗ6MiQe��H�& .2!��t�c�4XN���ߠLj�8syx��%�Vc�O�{�����7��V���:]^=5�BțhAő=���Ft,R��5>�.8�T�x@��S��5�H��^��/튯,Ԃ�B��,?g,x�C�j�_I�B�Jx���#�"G-�E���e��zO/V�[؂��~�o��������}+t�M`X�������_�oWlՓ����z����+7�ٙ J���{�38��G����7��M��՛
��9n̵�w��
pե�+�+�co����#�
��FOf
�M��-�K��uC������uŊ��UW]3\|��m��:�u׏��k���1	��bZ�F" �b�ٯ~�k�^�+=�5�^�W}P%�l!F���8Y�[����:ziS�9�
-+I0�&贱
Ps0����]Z�4��A@�{��.+o�{m�w�@����f��:�񁱚��j�^|�
�@�{`$�
��X����6v#��}�U������51<P���1��>��ܱI-��l�op+g���|x���|�m�@��ʹ�N1\mj�8c��_�Ȱ�o�*�q��:b�no��KH��׭j��{8|����y	��p+N�3�d���>Ƨǟ(E�H>Z���5�,Q���6�ib,���C��m�bxy�S�@�������b��ѽqvx�1��Rr��K�N�E6V��u#�:ޙg�5����/���Jh.�c��TW�8����7Q�a�+)�9��b(�e�8R�2��`�$�p/<ؑcp���*2�N�Ȫ���+�j&��#?6��%���
-+,2��(~�L�6hV8R}ZiS7��JǣűSҙ?��_��R>���ٵP/�Z[�X+X�ӽ���b�"�

��1@��q�(:����?!&a���6v�Jrk]�{�:,�m�H��m��/��TAtر�?g�������>��?S�}fF����7nK�
}N��ѶC��&��m�g��c�g䫢����a�˞|�I-�+ �ː7�?��w̻�7���M���!�?��?��?�V/L������G��ח/Y��
K�6�%2��ַ��2'X�T��	/��!s��,`�g[Ŷ0��ŗ� ��8��e+|B�Ejc'���j���(o�C�͉�������LP���9
^�+��s���%W����� �>,tW]���*����`+^�W[j���k��=<�[;�l�8l�
޻��ms�uْX�I���a��]���U7Pdi8xM+z*)�x�SN�>���x�&�K����O\�>�mݑa�`9g�>6�G)Ŭ��+
-+����@m )�/�r�7�s+I��TP�!D��r�pQ�D��^*'<R�	~d�m0晁$(r�Q�Erl��iI�"�&$4�*��+t�c�k�`E0���t[��4�[�+t�#���6�=�J���#s0����������6r���v��m_Љ	j��j����'����3u��\�����N��F~�te�[��}�3�p�A‰A����9��*܂3v��6�nC|�{����s���G�S���_��1����V�)mwz�-���/�I�Q�����p�e:K�s/���G?���+���9�����Mr+��Q�ᢺa��F��^(�LM��E򏝣�a[}����X��-��LJ/}���z�pX
-+o> Db&��n;�����2,�+�k{��
T?R�7)��X!�^�^�1��hiͦ���s5)�3��S���)�IH�-�n�6���wy��T��>�cT�6(D`��������A��'����/_<e	�l���W�Lmj��x��i�|���%��
��Fꘒ>�_x����
-+�����}���y�.��>�
�M�K:�lJ+��K\��:�9H�P`1�K�2=Qj��d�4��}�,��d�n����U���;ÑR��O=xQ�qFj8�x%�Iӱ� ���
x�Э�9��.|<sBkY:vR��|f%m~C~��.�m}�}��յ�
-+(�N���k�C���6�
-+�K�V�@��,+0���M�K�[����E�����8�k��`�
7~ߤ���;�Z!%��u�y��o����'���#��Mc,�M��
�]A!|��5��BFr#ɱ|@��z~����̒�ȺN� �LCM�Xf�m`�[�/��	:�o���ɂ����(]�NN�5}���@:�1;��Q���/#�0�:0�/�������=]�G��zI���lT���ߥ�5�蒜$����
 ������n�F�t� ���3Hz�}��� 	�k�ч&��ia~+����k���#lQ��bE[A�
�c��o�ҳ?��{zx�F�*�]��9�_PĬ��+��lf�́>ݚ�p�n9>�^�G��@��4���?X��.dO�OP˳l
|@�[�0�	4��xhq�J�G�-��`�@"
-+J��gt�����̖�Nk�t�m�c߶c��+h�l-�GM�alO"�/��6�2�t�W����Y
-+K��;���T���N�i��B�K��^;d��'D�#k��g�j�Z
59
-+Dl)51|
~��c�8���W�
PB��=�)�8��
Z�0ɜ���>�4x�o��}&�qtL/95�mrT�e��>P<�7t��?&+g���]_��"ӈ|,�l�Q_r�sbZ�D;ٱ���L5��(=�P�&|6�b`[������0���9Տ�ȧ����C�^,����=V��D��@'��F��7/_2��Ɗ�e}?�~�+�����!;����2���b����
�۪��YzKާ>�����z'�I•���.���z�
)x���I����g��8�&��u$��t��CW��1E��
P�H���J:<��=g=��s���q)9m��x|X+�a#��Ϭߺ�vV�1V�Y+���,�l�ʃ�>7]�G�ͣ51�X�h��5=7���y��G�`���q��y���>|���W�-�v]0TT+V�v��,�N�0Y4�s�SI�LeDќV�
�8�1ެ���\�'_�`�E�������;�@�j�^��1BD(m�������ՖSC���)o�{�7}�)p�r�9-IR�IZ�1�J�>����I�XT
��&���#�Ё���78@��n�NC�cl\�Y��GG?{a�cf/���R����cy�S?�sy���Q�ʊ�D��b�8̐��Mo<|G.�w�q�6>����~D߹S�Sl�$^V�v�B˟����M5���\WCGߋ?҈�9n2�g^��x@04a�q��NQ>J�GB֓�=�
(�\G.��O�������|����k	LAb��a1 k	6?V�����0'��L��E(G���`�+�DK��f��~�$��6�^[�\����g,���uC�v�9���
-+�F,������ȃ�b'�c
�1����f"�h�1�ȧ��)��U��&c%��D
-+Pp����u�G7���M��P���rBb���ה"f>�'7"�Ad���/}@e'��l{����w���q�>�,�W:Po���U+��UC�2�w��7���^��&��J��+ ���H_B|�Ļ)C�<�0r��Fc
	�ė;c�|��GK����_����?�����x�/>8vs�������1��7������|����ˇ�{�ߢ�#c�GwU���L��1x�İ���&~�ȋ�L��8b4ul�P�w��i{ ,�BH� ��Sr��x@\>Z�S��|�������x�C�́����b��G���u�9�RS��~����c��?c#F�A���̟����𠐂�.���M|��y�
-+��<�÷������|�����Vo�h����?���?��P���y+�c��R�?��'(��-!2Q����u
(>�c<r�#�Ӿ�G�����[�#��*�4�G�x�F4z���.Js�yl���&�v�#����v��K�7�ɯ�M���T~��o�[˭�S�c'6	?�����3֟NF�����iC;��l%���k6�@wD¥���9�t�
?:�H��ųA�L6+G�B�ß{���3<1���
-+�T���λб?��x�@�S��ݐi�On�ȺR�廅%gKĸk.J���5�	��荿z(��W9�j�u�ׯ�M��{g.���3����G�~*����|I2��}�W��+�O �1q!�'ҽ������o�*�s�K��'
@??���]��
�yP˦�G�Ƽ�Or�De��Cy톡ދY�v27��X�°oJr��@y�r*�9��(��hSe�U��q"Ϥ�~�	v�6NPa�+E0:f��3�����t�W�~�:�ށ^u����嗱�b�iN-=�:���id^ϕ��UO�ؔ	����rC1%�C�>B��J�W��T;mC�R�(����O<��;�1�M̨W�G3�}��2�����L����r
-+�&�����UN�qn�Q;�Ξ^8+2�
��@����<�\>R;��{�����l�1_�}W+
yX�/�
-+q0���J}0�_��@��X�k)9;
*@ם:���!Oޠ�mj1����c.�C�7��i�D�h�.��-ǧvŌo|�Z�U�k9�5�����=���3Z�s�K�*�_	z���������X?��1�yᯤp� {�Ȅ�lu�p��a"1���I�^$��"Ս1��G�6�r*��ģ�R���Ɗcb"�368�saS|e"L�r]*��>"���!��L�TE&m�HN��ª���l�C^c��*�Q6��5md�u�7�'f��(�*Ϲi�J��q삋�,��y![��"�(>!�6��A�D��"0
-+9@~��&
-+V���ܽy�٭^\�Q�ߚ�_��?��"0���!�����5nMʷ�Gz������?���q���\���w�m]p�aa��oD��S7=v7�7qOX��h�R��h����}�׾��
z�ضe��yxe)^mhlDKc�!O},�vQ�s5]�r����&�-�i@m�Aޗ��Y�I~��(�jԸ��s���������3J�3&6������R����p�r������UZ�h?�G�c���f���Kj���z���q˚ϛ�����n�\N�P��M��Cȡ�a*��:��X��g"����v�Bε�
�+�OYE���;N����o﮻�t9�覝�0M˧��y��}�J�Wc
��G�>�	IG�I��5xMX(==�
��dC�ylã�z3��.N6�+1��e���L�uj�Jų�OW�M��g��Z0#;�y{i�ܒ���B��}A��X�͆N���d�\�Y����.q���\B��?�c�`��[#H	�wpW~��y�
�g��b~��g���(������������w���nɗ%�ܬ�c����xn
��#jF7�2����γLőq.�ۓ^��fd&�_�Rֆ���YO
!X�X$`8=p�皵���|D��i�,.��O��W��B�OL�B?�+v͋N)
��C���� ��z
�o�s�����n&F������kb?�&z��o@`�	+�����/��p�
��ͷ�EҸ�-�J��<=���Muw���Ł��X:�e��Ʌ���4��=-�9sz�R��xED�\sQa�����䣉⩞������g�����9g�t^�O�[c��r"���|�s1G��OmC�7�Exd�ó��Ȱ����~��>6QJYڔ$�
���C��l_�G+�[�4�<Q ,>�ӻg|�@��,����.�I��Oo�G�x
-+�M���A�۫�f���p~L�}�yv����&��:)_my�8�u]�w��c�y=�����O�������\������uyG�w~�;oͻ�����?p���g(ɑ~������[��$d:y�f,����8�n��;"F6m�#����b��d`'p���L?���h�߱�u�V����ikG+
���S�"B�`�|��#�v��k."w�uO�8�¡��$vT���'?}xun+���5�=����|�\��;��^HI
 �zP;�Z�F�������F
����Z�2�0��Ķ�+��\�����Q�x{�2�X8L;���
-+���ԕ�A{��ㇼд����/
-+l�N�u:�b� ��]:��#v'���N��`s�1�"E"KB���,�q�9��'O�3
���\.�_�=o#�Eb�>�ý+q�`R��]�bQA�E+��Z(��{�H+S��͂���]>}
b����?���O����Xdu0�8e�\фч�6���_C��dD���o�[��^��vev�}��G�~,�^P
+�պ
8h[����������PSv��x��L�o+&��v#�,?�N����e�>���("�
�>�R|6Ј;���s�M/!L)�y�����c�'�<��O�;?淘Ԕ��Ӱ�ˮ�!^�/���w��Û��_�Ƌ��u��Φ���~r�g�.E&R��8�~|v@:��@1�e�D��`��5Z��L/V�����O�������)�O�q�9��|o.�!%s&.`���:(��G���s�Y//�w��y��������XCu���'{�o�*}ƹ�>C���rX�k���}*N����k�h4gA�촭A@Kα]Z>*�:���T��[5y@0�JG
-+��������S�b��͈���6+7to�(m��z�!3���4��f�J�};����P];Ÿ�_쾱ua�p�q�5/��ee�[Aj��q�2���s�n+�q
*oػ�z:�cjәi���7MA��=ruS}p�
U~'GbP�����)6s9����0�B���Zt�H]���Z���Z/��Y{]a|@!�N:��9��/�:UFmIW+�O^(+��6T�0t&��`(�F\�BCoqF+��魞K+c�ϑ3��DC+5��SӾ1k�u�L0��J�۽sR��o�g��]O`x�\p
�嵭5�f7�}�¶w�D��=�Hak �����G�Q����0�)I�&{.o3��y���r�p� ��)1v���|�2>��R���ď+�m�y\��<+}*:�\�e��S[������͆���@JlS�<�-�0�}�3�9�o��>�яF���j�|p,�ơ���{�J^������վ�r�"��í&qKs�&L��+)]�E/%?�v���Bm?!-d���{+n0+T�g���	��ʀ욏�����t�r��5��piD�c���=8}V|b���˜	ޔ�鈪W��2�5<�}��F@�8�v
���W�%�+�
l�!\��׽�+%t����Ґ��
+�ۦ~��$%Kz�VL��ɗk#�f��a��	*B��=0���n&�Q+t���A�%Ït:4��"�x
�� ��b��S��le���`�Ɵ,C��,PzDt��z^�3������|��{V��#���i�|����|��9f���n���
*G���f"���^��U(:f�ް�wx�?���W߈:������ޟ���Qo�h��ɠ?b[��������w���p��kt�5v�X*ԎsX�q���pV������W��]�T�_h]Z۽�ן�IU�S�l��ι��yA<����vD�1���8CF�|Ɣ+�yY�A3�[g\DJw(1�x�
_�,����b��K,)�M7��S�O��գ(�֨E�hy���wߕ��x�,Ԍi���r�N�V企�	�~��M��:7Z
�7�:~h���g
-+�L�=���T�e�BZ��)���>�b���u����#r�-��f�b�'?|rm�SB��5��R�fl�>6��}m�n��9@|��D�����{����-��m<��@(GL2V,0w���|A+��udË0k�
���ok����?��\zΑ���WԖ�l�����G�e��g�ͧ�x�3A��;Tk�6x�b����WYސE��u�lf��������Ə�ǟ>�7o�S�>�W.8EI}C���_������������\4����B��'��&>���K�3ȋ���|ܑ�`7��;MD����M������#f������t�S���s����E G|���g~�i�ɉ�`��U�G�B�6������e ���r���e_

��mR���\>.�����ؾN� D9H��5�E���#�M7'��#�
-+�k�:�����'>�)�OC�/sz�+��R���+k��p�qQ�7�
�H�g��i�@��Z]����>��v>R�79'�ƯXx��m�k('��)��³�w�Cs�ǖ�f9����D�
�z���~x�G�i�d>���>��KT��w���B~�l��K�Y8�7 S2���<��Ћh\D3K�I��&2<=��S���MF���C�������#�d
�M���`�Ӈ6xX�̘�et ����[iia�.�.Z�q��i[e����\�6&h���Q����F\�X,�t|3R�>�	8~sㄬ��ć�.&pr|Ͻ�>�|~��a5���w��í�}�v���z�`���6ct�j�Y�tJń�#���)ݗ��- ��S�?�?v��_�O�"�G���F�b-_�}��o�ݿ{x탯����n7�&&9r�O)�5L���
~/��!X�D���aM
+�V����H�_9kC�R���?s������y�<�R��FD9�0`���3}���MA�b�Z�0ʅH�'���ȩU}]�i�xk�'V�Ũ��t���8`g�^�3���`]4M:Z[:�����:X���&��5*���	��|�.�)1�H9^"p`G~>'���}��?z�_�蟷pۭ�n��V}�����1�q|vO{�!�Vy������6^�#�`^f���)/��46�J�a��X��
H������&������)��}�$4�H���fJ� �i���_�(���Q�<k��NW���曹���	�� �
-+�|_dƷe�+�ɷWް_�t��"B�;x[�'s��=�%$�2;.^kF��S��g��c`�vBxÀ2�E�j�9��4Gf��l$�v8�hhk�S�jB���]=��b��;��4�e/6��,��eR�8ĭ=�����X�Q�"uʼ�5�
=��65%�o~�w�m{yT�v7Њ�qtI.�SV�]��x�Xܙ�W�#��m+�c||o��;
.�>3����ܣ�&��gB`��}B��9��em1��||)��*
-+p�}��+��i/m�#Y��L�94�j}{>/Q
-+9��l���b���nn6�������FI⍈�d��Q�Ѥ�˝Z��f��*0�CX+��y��b����
>Rγ@̓{�`c9h���|��nz߀'�d�x�0��in#��
����nU�!�b�uB�h �Z{A2�y�ڝ�!vP6w�k�<0��AwJ�Q�����58h|m�����Ô
|�j���h`�^�|j�kߋ��U������/!�@���K�]wݝ�����65�����˧~:�g�6]��vq��b`[3{:a��ER&���>��P�F�ڽԔTʥُ���߰�O�j�i�p
ёiÅ, &�(<���Ơ�` .{W]���+�����G�Њo�/�H��W?�`�+��٩q$%8#�vd:F�v�P�$T��Q�j��<��b���<E�YeƟ3,���-:��9U���N�� @C[<r�r�����"z.O�b}i�P��a�A.^sp�:	���4��~�_v�飀Y���e���M��"�
���@N���sȺO�g���z�yی����<c��ß;|2k�Q�
�AK���<��R8����E�c�{ؗ\w�eh@r��i��Y��
�4o�k��5���+� 9���i�@����-�ʌݧ@-h�W����29WW����k�#�gIU�v�S�7���F���/(lQ��3+�ym���8�U&>� -�>ȁ���E�u�}��Q�/F�%*Y�7s
܋���k�d���t
�����o}�[ogts�A֧l{����[��c���
�C<�.��R6�}�9��Fy�<1�$P/�i�q��@�cl���4-�m�.i&Swe<���Y�Ҝ��
�6��Z��O��u�t�󂃈���A��Y$�}�`����u�W�w�1�&������2/��y�[�4�ܒp"���0�~�z�zՆ�߷&λ}ڿ���~���G��/����'���۶&�y>_!{��o�}xͫ�]}�Ǽ�$F}�l^�k~�W_;���S�8�rN�0E�T���O.H����<v';i1B}�f#)��s��,��-��2�ۆ�T�U`��S�[��-��Γ��p�)��t!_#�������j0�c�W8�(�F%�+%�{e�L��/�������c�
0�
�:�
-+��i���=~�Eb%�0V�Է�I�p��+vZ��_�_���F�!�Q|��M%g;s���DT����m�5�&���*6�tèO�I9��.��0)��&K����_�Zc��"Fl��\b��\���ԓ8�U�|�������,@�Ɂ7�ቋ������C��T_�;�)2�חm/�b�4������+z�p���lh�c�)d��+c���>��[�N�g��=���#�����5�g+E�E:%|X-h4&���z�
&2�����<Ҭ�����cY+�������>o��u�g/(AU
<r­1�������W	h�18ˉ��n�pԏ�Qj���ح�cFj��/�'��Bg��z>���3�^d�w���y����'��m$f
-+ސk���6yb�8v�B8"`�g�?�L+22�̘���@p��_9׃s{���7�����Q�v�m[D8)�}��l#gǗ_��?�{QG��
-+2�z3�<B���H
�؎+�`F��d#g�,�}cf�{��d�p�P3����3ѹ+��62����rz)���!��GЅ��o�LZ-�;���S{a�.w�N�.����U-]�ʙ����r�p	�����1>#��u���޾�����t��غ��n�)�o���y��of�6�Iч�'�����.b~v7t����Qݙ���X�����_��O�4C�Aٚve[�F���{�w��_���:�
-+?N�f@F!d��lƭ[l)d4�9�r�+����Ν�_�9����̻�'8���r����^�Z�I�i��6�i#�Bɇ�|"O�w���{B0�����q+uۇ�7��-R����3v���d��̏�Y+�y
��A�H�X��8��s��jSW�9�c�ύ }�؈����;F���v�e�@�~�����ѯ0;�������{Cd�\T,f���Κ�=��M�7���ƿ~wů~�7�,VnFO�#f�������&�`�����,��5s�A�����u����8_��R�S,���8�����[�D�h8,��O_��-��:#��ϧ*BEǽO|Nke��yl	"�7:Ka�t�k1p���dt�ڄD�`�s�M\hm�˜v|�F�+�:�/��ճ������563�{\�X���a�ܯ���&��L&��ňL̥޻v	R�LN��֬��p{�f�L[Ӣp�\����rw�4�H��l��X�7z�Iw�	��d�(ƪ��+�Ֆk����H?�-+��P�PS��c+Gq�s�$G�����P�wZ۳���q�_�4$��4�O+5v��
���[�I���F@�Ն���9��ۘY��%)�.ќ/��qbG2�N �
B��N���onlY�����S��Ԟ�6_���_��
-+�xJ�nuF�"�.�-���	\*1�W?����@��NN%��Y������3�� ��>`B�XC�ph�cpY�!(d��z��s�c��J��O{l�:�zא>�X-+��j0�근��������\�����a��v�+"�?�

�u�TS`1C/����-�E63�#��%qx���3� �/%c*���t˭ϡQ֪�>���=�l���G�IT����m�.#$:_��׷���)%��=���C_�5���E�����K3��tf��� ;n��C2GX�|��#�y
-+�h657;�WN"Y5xEI7tJ*�����;��i�p2��7(�)O�C��Y�����Ps�������s¿9B��\dy�S��'fބ�v�͹�9w^.�ë��'l� �9s����eWt���U���m����C��윘̳
-+(�C�aҊ�o�-��k���|�����	q.�|IL�U	9u�5��{�s���ڽݙ������������o����H�����*�w��^az�F)9–y��#b�����ʟ��9�6�98�UXx���I�k�����e}N����f'�"`�g�	ڻN(e���z�f;�o-��F|�Ih/�K�����W��M�`j�?le����(s��9OKY!?e�'����.\�?����M��H�g�|`ױ� 3ib�1K�bH��I�p�>��/��^v���.s��3a����"�)�|a�]�x�I�I�Si�}e�O���*�Y����o��"����S��&9}�a���G@���!^�f�CA�y�X�a��e�կ}-��(��P���@�x�h+W��5�bO�Fn����Ǎ
����J}[�;�~��Y�
�Ĵj(~d�<d�i[pho����/�P4pGA��Y�WD��}6/����L㫷7�%s��aW]���D��~wi|A$O]���<xU����.�hb5�^䥙��D��M��W�+�?���=A%�a�9R�*f��c�!�+l� ��I�_)H����a�[/�����[P�jm�+�|���
dJ�6N��mc����8�\��J��z���C����Kr�Ҵ�V�����Q|��c+tf~@g0X(L@�ƻu@�b�;	2)�IC��C/BN�5q�BI=�]�:Q{3��_�R��c��6�rv��ф�JZ�����쌐����O�@y�h�%N�v�'Ej]�K���>u��l_QD?�W��u����och�*U�g�r�������7���㝹���st}*M��O(7��7��[��O�u8��+nb�Y��WQ�� �7}�3ƣ�n��{��r�iAL��æ����-���!���v�j?�y���W2O��R|"�3�7���7����m���=�믻n{��o/{ɋ�����hU�ʌ˃٢�y�eO}��5�G��qcS&��?���'�,z����B�ӎ<��a�\R3�j���K/�̯�-G0,������9�|k+7����@�TuMq6m�'{ճ�q���Z�\0.2n����y�EǼ�Ț�����2��$4*�v��
-+}��.m�9�b��d1�.�e	��&��~�����+�گ�n������.�g�ǧ����7����yW�7؏n�~��`{����ӟ�l�w�NPR�з�n����Mo}�vi>���-}���#KtyЖ�62����o\ -�0��@�;&����b�]�;+y���_���{˕��ܨ#����<��
-+��%�������󗏡�
y,��{_d/"
���_�W���̙��	~��-�}fN�|���\L��=�_�5���b�c�����2��J.�	ǹ^��2�D�l����W-�R�� `��h�
-+q�c7���a!�Ղ3���8бAm�3��'�G��bw�f�Jx�c�p�����t��rQ��D1���a��������iHu���Mm.��Z���;��?�68^S�n�Gxz���p��гK�ctK�т=lg�>��Q��K3v�2f'�N�x��X�Xm癞Ϋ��5�9�g��`��FD'�C�3���Б�	���Q����g�y7b��:O����D��R�d�k���.����
ݓx��'(<Bď�)�{��+F7��4�R~�1��3c	V~�X|�&1�
o���7@�)h����`(�-8(9�s��O�7���\�G��.8�`�<��O��Z
?���,��3+���y����|-�ґv�]3��(>�H���Nf��Б$��JXDϼ�!m�X���4���������=�eU��e)����K-d�T�����ox�bKTzB�)�e��{������g>���]��?��sjLD��<�3��o~ۯl�\���.^�!G,���N�k��n '(����SfH'�iߌ�sʟx�$�6ɑM��_��litoq�����7-�.>@3��
�k���������;�?z�j_�O��M}�G&��A~��?��?{����u��\D7B�4����qMІ�?��*���v�(��T��<4�+�H��[o���+��������Ď.�8|*7�Y�����a����gd�'���|�o�]����ʙՁG��bЉĚ��?��}�JK��q�:��aF9��-��
`2����0�Fc�\�vZ�5��s#�5�]_q�yF;t}��|����13��؎�6��sq�=
K�&q@������1Gq�-����&��e��F�ʎ����i)O��D{�
=V�0�#=z~
-+�
[�F��b
�m��7XL���+���O�/y
a+k��*�HN"k�a�56z�YG:y�A3�skdǦ-F�r�.������G��*_zb�z�;3�#E�?��0�E4z����y.�X.kQ��Ms�����W���l��w�5Wo���Wm��]���w]^Y���o~c��9�8������L���_q���/��ݦ]��K	�X�}(�>cΘb�QR�#`�ȍ}�"��'@�M���Od0�
.�i�p�Rw�5���kT��n
-+�u: �<���z=�џ`]�����������T:�<�S�𵇝E�, ��"���?�C�/�Cν�Q�
-+�c%��{0�+-���'��7��R%��d���^��-MK8D����]/�a����%'�̃�_S�C
�s3�K�aH�!B�&�8AWu�єp7k�24�x�ȄmK����C��Gz}@o��|?�O�g+ee#�.넚���'����F"~sa���4��p�i%gؠ�j	�O��#�ɲ�Lj�b|�G�DuU�k�cqN�9Ni�H���O�W���K��F}�'���@@q��^2�O[I�?���R�>��}ޝt��
-+fF݉�$;��$���f�jC����_���=��xtx@���Lz
-+4k8�m��Nl{���H/
-+w"���MoC�o�'�=��F�E�F��ԉ
-+���b�x�Ł�BUn�<<�P���?�H
UM����0&���G��6hL��pH�ħ�/Z��������O�-�5rR��'�Щ_�?���/��M=T���M��a���1��mG81r�C��n@���A�9$]c�b0���tԉ.����E�1h���I`�/¸������>����m̮n�4��>��-���	��?���bޖ�o��'�|D�|�*������x_�1F�I�1&�\�.5�m�1�_hĎ�V1���y�+�(0��Z]�	#���TO�4��Z�{�b���N��=�(ΚcJ*�\Zp��\)ޓ���{m��Kt0���l�>�U���:��
�ѿ��C��4x��[++R�K��X*Wft����&�=�U>�m�|ѣ}`��W��DTl�z��9�O��{���-�<��ɿ?�|���_�J���?�_����I'k����'��Z,d�r
�Վñ�m+�n����\�N�ݻ��pȓ��R�{��
䀺��0�b��~N�#��X~�2����>�5i|�Ӯ_m�|���`�T�6N�{�)p�0���n�`r�?i��������c��{0�+�S�q�rܸ=�Ů�t�;ء�{�ko���`j�X��	�C�߾`3����bd٨��]{a��+c-���
��k�bS��[�ɗW�
��md�U��iXz���gRB�o��I+4���Ob��������"?P�`���|����w~P����|�o/|�K���M!#���}[E"g$�� )�c̏�"�f$ �@e�
���$W�15ҝ?����ً
��-�&w[𴋻&*�8�‘W@���Tv>�1EM��
q�UW��ڝ9!����7�ԏ6W^}U��v�
-+��@q���[<9��8�VɃ����Jb�9"���i���
��FMO�\���?|t;�ׇ-<S&Vق�om�k!�̝�
6(`�+:Lƿ%���e������~��(�k�
��9V,�W��Hiju��A_��UDr5/���e*B���4��Zq?��{"���t�q<]+�1Y��~T���'��X'��mP�y1�B�䆈-�_����i��ˈ4�X4�̯�a�2ӏ><"�+sr~�3��}�[�:c;h�j�8Tf�K�&���W��:���˜�N���Jt�N��k/p�����$@y����n<hw;쯀ˊrQiF���'
-+T��z?�
��ۍI�4+��#�ڼ�RDȣxb�OC��G��`��'X��a9/8�6ǵ5]�:6�s'td&}�a���`�q
~��6ۡs`��w<{���;:�o�[�
?͢�`Ę���綤�s��X�G�G��n�����O���s���H�n.P�K;������@s���}��I�>��s<�(=����������恍�L��z��Z��B�_�N���Y�Н/ӍIx�lL@m���Ձ�}x̿���U{��^����ի!�k�c�x�3��M�#�˦+�����.�2�����#l����ӘV.w�q%h��W��	<^,�s�}ۯ��o�{��=��4�Ց��
-+�����^���x�u��$����tڍ�/DL�5�"�91������{1�t�� ���\��u�;����cr	Wc�0�u.�KK�]o�ľ7����Z����llY{�N."��������%�\ G/����-{`2��sNa��������m����G�(S�������OK��{��O�v�����$��HOx
}�yI�q��Rh����Z�i�g�sbq����'�5�+�_s��/�j7
��7��pM/lx�5�xR�ѷ�e��+�b$k�5�n����u�+Z�����?8Q�#Y��B,^ P��{a����.���88��g�>�+�	�)�r~�����O�-$�r6Q�>&�254�/B������
��5�֬c�Y>�(	���چ�+��4K�N����N1��䏳mH&�,ޣ,K>L<����6U|�*v�c":a+��<�0u�H�K+zpR�}�q0@�a��V
-+ݵ���u�8�k�*&u�}�Ef�v��O�B��_���BW][S��x��(�[�G���:��?w�{m?�o
�u�]�0��$8g��Ę�}��.vXB�ݠeeĜ��
�q�+����2ٙ��&�E�Lg��Y���ɓJ?���P���ذ���
��][���e�9iĄ��Z˽:��+֓}�;z�FaG�~{�����U��c<���;�u��nѫ�i��e+|��o~��]��}��Fz"��2�G�)p٣~��~>��.����ԍ���c�����x����x�/���go?��n�?�yj_��B��[�l��V"̴��|�Ɓ~jt� �)�ԕ�a�Gs'+9Y��װL����6�k��8	�	���?��R	�D��	�����?�}�����|m�p]Z9��z�e�kr�����I���rz��kڎ��z��F���^}F���,<�,؋�Hm��\O�&k��b
-+�{P3���@05��m.~�!9@�V�v��w-;E���������������jUs"c؛�~�?�'���C��
 b�?�!⤑�">��� ���D�ck��������t��y�?z�,`��!��y1�Llchp��~�7�#�H:�7'8];ծrM�@���"5�b��_�~^4~������n�N�"�xd:�:��Q둇c������_���?�y�a�[+)<�;����
-+t7)�+�O�!Jm���31�;����	��k���i���e�����&��^��d�!F���
�#��7޸���^>H����G���ԧ�:�.:~������^���M�+�+]�pS[>4�xb��;_ɧ��D��+8�|T(k���L;��5}4*�me�H������J�ku��FP�G̩9
�k��M��p����j�t (
-+u��o�a���᪣ӵ�8a�Ԧ.x+O��o]����~�m|��Fy�%|�qM>��@nѿ�;"�˷���K�^�?��x��N���Z��H�6���|e����<������vi>;�W�p��1~|5�����M��e߰�-bj!�Rn!�Y>]�!t2��y�Zl��щ�*U���1�BC�[0y�P@�� +���������f0��As��}�Wl���H_�8K�҅���Ѓ�4�[,^�My����vI.^���ʺ)o|5�pW>x�C<4�wꨬ\��@�+v��R�]yͯq'%�k>`����n�D_>,��;wR+���Hd,�[�Ӷ�p8�M���=�9������a�o���~���0�w��NP���lW_{mnc��+a4(��:b>���s=��I2�DZ�"?yMg�>�&2r�%G���ө�\��/�Z-(���|
-+ؽ���pf̝_r"�x���?�����6���!��F&���_��m�߾�������&X�v�3�Ù��~�s�۞w{>#з�*:�XF�����Ux�R�DerH[r!�9��g���,Nm���X��+�p]��T7!��|I�\4�\�5_˜q��<�4nx��@�(���iY�B�f�����Ӈ�ۯ}��ѩ��k��ʈ��v3Wv�گ,y����Ѝ�$7�y���?�i>7o
L7u�=�Ǿ'�~�/+�u#����m�P�\L*�ȵR����԰�hЙ'mj�u�
2O�0���Wj;]�Se�j�Yp>jL�v�+�՗����i]�[�4�s	t�W��>j����_���i>mw+�@|��.��i���T���o���#�{�ڞE��e��� ���ƛo=���)��4'����x����`@�Ҫ�4<�|n���?o��O"e�"��
-+��޺��T���q7
�֓}��Lg�^T�cU�ݫ�'��\T�8�G����6�]>�Sq�L/>�����I_::��3��+<h6��׵1F�Q�'�R���ښ��}8d�3��e^���!���4w���D�
�G��+aj��ԧ
-+H_ct=ɷ4�V��!H�3���?8bj��u����9I�\2�5'R����f,"�`��v��#>΂rYc`��uc�<4�x}�9`@-��v?+�>���貉jnё^k�#�<���|�R4���G=Z|�r��ۯ��O�+$|�,���N�p5/8�<�K'�Z�yu�:��TH��ݾ�{�F�v� 
���{[`)Kl}���X^s1�����tq@�UK��ä�������q���T�7����[+6����A(�Y*�1nN�Aoh��I���N�`N�MW�&��=�jhV��G.��D�v:<0�Q��v^������}�)p�0�,��7w+��������5�Ӯ�8�g�Xl1g��C0����XD��D�� +�0ե�	25n�t����]�
-+z�e.A+�T������O^�Ћ��1ǠAS�4f��LJ���7���-+�r�Gp�C��t�']9l��#9�je�[��YgU�+O+�Čr�ӝ�+���
9M�"3�ƻ�0�ࡌRh�ٚ�,&�
-+WC�d���o�aU#D\K��_����Y(bu�c��|�������?Lj����ض���

F����O}�`\��Kz-Q�4�����+���[�
-+ U7��w��'OX���}a�W��׼�=c��o�,�ٳ�8[s-�9P{��7h�-�i����j�3@@�M}�ALt�ϷYiN���]�[�����Av#�^r�Ʒ�"��
d�/��Z�৳.����!��a.ԄQ�ތ"qi�X��	*<�s�(Ȫ��2�%|�?e�[�Gi�������m���'�N}e�_Bˊ~�"����C���Zs�G���A<ȃx�+�5�Cb欯��X�z!M&����Z��+�c��f=��9�Hs΋(�+��BBU��'���ꢻn.x�������.袠�HH���JB��L�c;�m�s<�lI�d�����u����>9&�����Y�y���gzϱZ�R�+�'���6uG��E��Af�o���b_����m���w.";r�_>��ι`�;���Qϓ�y%��YֶT=�Od���F.-k�$&z:][�EU���3�6e�,tH|T%�;��{�q�.��p��$԰��+l|�/���i�D�9�j+Mp��=î_	�3 ��ߦ��0=���Yl���v\��#��a�=���|�U��%�j�{&�1���`EGF
�n��%�/����s�LB�$���L�ASG7�z[b ��Ŗ�C��^;��A��Jb.�Ǡ��*^��k�^�	�
h@
-+���'�o�ɟ�^��WC�
�8����RH�������}�o5���=zW+�s
:�kk�!�q'3d	��۲Z�"��?��+<O�ٿ����ݗ/-n��i��cSɠIP��wo_Ԡs��'���td�կ{���w��|p��e�-�t�
|�������6����W��K���=��G ��'@\��u�@"eB�N��?��2|�k0�M�BY7�`�țB�叁��Wҋ�����W��	�Y#��aZ�W�j���Aj��~S�"�r�vm��g����b�F�61��3v��tH?O�8�"���W��޶Mv�)]O���-�Hw���R��Μ�F6+f�L���6�'��S�įĹ�G!��Z��KAW4Z�!L��K+�0��$�%b�f<��	��b��s�!۩8�d^J����^�l�&i�m�F�_T���v0���@+(����c5��?B�^���T
�g�+�������L�b���:O���S9++��>�+Vg��Oq�vgKr����;��i�h���f$f|F�_�%�/������o������k�cl�x����`������>= x�Y�d�g
���Ǘ駂1�RO�o��^�r�������m����X��b��
4k�\�Hi�0:Fj=�f�3r�v�'�Љ���׃	��"k�{�
�:%���ק��>@T�'��F6)9�ī�9LO�
-+@�5xjDx�ݺe�s�_�;Bd�?���=Ƿ��Q-�:���Jց���l�~��`��*��:1��J��� @�Z��#dh\��\��~�ʄ��'��+�����#0ܢY?�ێ�\��}�ةz�x�g	�T6||d=��#�M(�t<�丰J|�w�mh�Q�֋���/�Y�RN�0�^yYZeA���6Ra���<N2�I��Y^�+^I��j("�#R k�H��p�E�X3$[�4���}��`�uP��0�`�ї���|�?l30��/y��G�#Gx~�T8Ql���h����+%}�R������ΕM��m�-��.�I.]ư�?tv]�g����7Ӯ={‵c,8�-�8�!x�mߞ����� ߭" ����/ټ~ڡ� ��������Zy��Y׷��ْc7�0E]) 6��y�mR
���8���}0A�&��Z�ƀ}n��Q
Z�+Q�0�
I��vD,?��ʏe1ɇV�l�`��e��c�Z���9W�dA�t=��/ғ���J�N[wl��愙hؤt��٭��G��J

�j�gO�b�`nS�/:Bˮ7H�4sM����+��ء�"B�*E����3SMb��mT��%6�/��((���Ùm;vN?������qǬm�$��lc��I�9�+߸I��SI�v�v+���^+�oĕ
-+���;ԙ��E/1�O��l(rdž^���DA��j�hK��)
�ne�FP�M��-��l�uC�!R�y�)+>x�%b��a���S�X��`"�℀Y<�����ߦ�������R�%r�m·�Q)(ܼ��+Z�bp+��J���0�-���A���oq��+�5�ªa�f�\�؁����Z���zכ�2��/�-װ�2�I��+�)G�%-�����2�F�
U->��q�������1m�B�(Pfv��
���0F!�* �WJ�gZ����%8kZ��dX�0�k��,���+�5�m���Eu>��
H��ƿ�4��7�7W���@�D1�">��>\r��nI,�D�+�de�}_���3ghE��c�
����G?�48f�W<�<�(FG���BG0���}�����Gf�L=`ӡ��7fu�,<_㓂�Z��2���!W�mJ�:�_����}̀"�H{�U�%ne�2ˠ����3
�*Z͓��!\���,��a������о�����<�@q�ܓ��6o��W��GX�i�z�����cj�=n(�y��\2�II��Һz�z���?6�+I2���u�	]DU�����[��U(�Y�{KJ���y�O��=�u�y]� )�_С`\4;n^��������N_�Y_F��MM��¤K6�?m�Ci(�jD&r&��Ad�[���!�V���T�yY�;�j�`n�L�aB ~+	G6+>��+fAT�/ݞE�.�땝�8�h�e�y�Ah\��F��+�
-+�I�<�mv��=�� a+��`�b/�K�_v�*���%�e�s�E�t�@@��
6ʝ�U�4.�l�s�����e��&>P�٥�Vh[��b�]/�Յ�:bmr�g�����=��n��V���*���>�Bt�E�SJgs
-+�� �����I��t���_��CǏ?@�u�
G�+v��S6������謴0���h��YƄ�q1�cƶ삕�\E_\�]�҃�c�=�l�e��G��"�?����Ut�ө�mC�.��
'�����d"�R�蜯�3���v+������M��f��}�8��2�4�aZ�:������V���G+:?.
-+Py����cGO�u+MǑ�~�`4�˙�I�p��s<غy㴃W���<���󦧏�������	�p��a���J��G����\�A�vd�� š��B���}&ڪ��C���K���m�|SRc�x�(�c΍?��3z{�G�����Οxǔ���S�F�?o�~���g�OG\������nrqe���ϕ��j�u�0Q�3PO�x���E���m
���0)SL�Υ:����Vl��R����/QГ}ګ届K1L3d;���,9��do�V��N�
8��?���؛�)���%�e������ǒd|�:L�9��}$�r�q/���L3�8
-+h��UoE��N��^��uۈ����!�6�E�:�������Za�к��VU8�un�y����?��~ze[��x�۷��(9p�v�M춄5��hY�}Ɯ���@
-+�
-+z{o�"�����v�F���m{��XC��2�edzܿ��U�?[h�������D&�q$�5��zq����FOcmL��D��O��m&T�S��-c�S6��9�;�;���΍��v(ݨsE�-ê�hc�g�Rn�
i8�Wac�����`�]猪�tZ�ء%#2��
;�uP.;�Q�%�9P�8��"\g+��C1$r����;bՁ
��q���K_r��Ϣ�3t����%���_�����u�}R��C��'��]�ї����AR-���f�Rr�>H����C:�q�:��
-+]�A�F�Z.�E�>��ȋ����E�x
-+G�b�}���p	n��Ƅa�('��M�z�]J]��/��Jv~��hk�Jip�[��jn�+Ѝ�"} �d�g��������Ж��B��ֆm��%�V�8�U0�(���G܊A��\��	9$p�do�J�E�&�e�)��1D7Y���p�ݦJ�Bv¶�nܴQ�����=�m�.߼aک˚�_�5(��u׃�۲1��	�c�a?F&����%98,�ZJ+Bo�i0��6m�d!��DŽ^1��/���B��q鏘�ul˰y�uI�g�����5��t��r])٦<r��8�M��'r^gۮa	�1��%~pA�z2F����2iY�,zǓm�pH;Xh�a�p��v���+�2n7>B�3R^�Y�?#z@���90ea{�M���w��.��Ӯ�lPߧ�1Ltqg�pl��ô`�Q�r�#���[M~����Qqt��r���cU�2Àe���M1=V�r���[�vh!k��}��?d�*���4o6?,�:x�д__���}U�ҋ/�֯��m�J`ݴQ�tvC��< y�U2����l�3��YOL��ɛ�ꏢ �R�ć�}��v	�+��IЭۦk��^��>4=��c�6��"��
:�"6��Wo�IgsONW\z�� ��n��
-+��`���l@�aO�S��iL{-X�US�/��$����6���0����(��E��/��SciټE{�6*s؋M�'Z��� ��$���|���7��m�X��9.��O��7�y����u�}�D�J�^�����2�����X\5E����P.��/�m�>�����O�?�~������������R\@S��>���C�{���;�ݻvL���[k�J�v��ο�����6���wc!W+�G�҅���u�f�/�Uo���K_6�ؽ{z��&�l�T��4\h������������?]z�ų?|oХܭʉ+ .�9��T�!�kڗ/�5�V��
�ر�1`϶+�r��d�|i£�+�9`�D9[�H_���qi�����k����ַ
�
-+�^A�典�{�ĴO�:~���ګ_��h̲0?mb`����4ۢ����ϕ����	��]-��v}Y�W�×�G��%%�M�B!�S+ �K���+_�C����}�Β=�n{�)t��iZՈ��Y�q�vǏ]6�_�5��L���7��~ܗV����7��=2����秿��ǧ�(�Gc�9:̊G�)R��N�?���z�p���k^�7�1P��Z2��YDҧ8C�,\����ڿDе��`��H�'ӹ��}������K��VO��|��鄯`�O��i�G����7�9=���%_8mܸ�]*.=�	����:m�],��U�=����Ш��Hh-��%-�����J������)2��V�}��=�َ��G�ϢTH�Up	��j7�|t���`%�G�������-�M;��׾NWpx+d�.��)ȥV��x�-{����&}�r����X�^a��m�Gu�98�s1��&��?��1�?ن���+���Э���!+۰�V�7+�ic��R��`�%[�kY�*�0��G<�Fy�/�
+�]���
%&k�\1Nڶ`�1��Ӱs5��f
�;���G?��_���k+m�!l�f�S

�!���~fگ˷�y���-��K�^t2_n\��9��1!j��V�5�P�ƈ�:�����K}G�qZZ����`WzHr���̡��'��ـvZ�E��
/3�	�tk���g����$��
-+�bޢ�2��v�q)ך`��$SQ����glןs�X"-��mVˆ�R�iK�ʓ�����!ly�x��!��n�.+֊��R��zw0[X�<_`�s���pT����-?2��t�C}q=��U�:��-cy�dĂ�<��?D&\n7iR喔(L�+�����j�2-��e�7^�u�,�]�����]:�ԋ��>�A=[��cU<@J��;��jAT��p����	�F���(�1<T�PvpTv�7g�m�d�Y��2�/��l��J����x�9����Z�s2sX��֐߷o�'t��sb����ׂ�U��ˋ���+��x7zA���U�i��A
-+�w��"����@�i�N
��g�hS���bCc����l�NkM�n�g���W5�IQ���M1��Wn����|V����1��){5�ǂ�k���Sx8�O���+_�˥��>�\��{9��b������������V>K�0�&~T��<A	z�"���\gH6b;�O��K� �W�|����/��Հcz�e!�X	������嗿~#I���w�r���7g���+O!0U����"]&����<Y�����T=��eW� ��{��{�NG�>H����U�"}�CÅ�\��o�F�N�HgV�;�[U�ܵ_�?�F���YxE��o|��u;����xőJ">E���b�t�et�m�k�M���e=����k9|T��{}�Kk�^�#c?T��۱���q`���w쟮{�˧-��}�%6ۉ��(�-o�L �6
I;�/�*d(BG���6��|�Ŵm`Ʀl�b��
b��"+�Hs݊��g��:����}������1��!ʍ��Gl:G:3�&��u�J���.R�D$	�dV[Q?��"$��E3Px�9��R���q��>-![�֩>|,�M����W�A�#�c�����\�E�����)�=����Ӗ͛��tp��N��ت	f�/?������J��%�Ρgo}N��f�����6�@lj�(X���`�6��d�X
-+��-S &�M��Do���䀩mzF�Ư�O�g|�SdT�"�eW�ķm�c��O��0M�ֶR�n��� YL(�>D��'%de�8�Ưh8�~�_��&�!�R:3^���-ö���c�'�;�w	�5��_�_���Y�����R��Lۆ�]7xCĩ��R�+�p��P��~���V8m�
��l�FDo�e�R��?�~���=�K�/`�u�#����'��w�6����"nZl����~f]�L'4¦�O��GyD�@)��0�^�ڂT�Dc�z�ꞟ��I��
-+�3��P�;HAp��
G���En�ҝ�M��
/s��€D
���`
-+��ĥ?��m3qyB+܄ae{��f��� �:ڱ
)��Xw\
�3�����������r"�6�Lj�e��D�^��Co�Q������=�����<��Gq��[L&,e�u=�׿aڠ7��8���E1�-�	�9H�F&}MN
-+��o=:o}��<���@s1�ۊ,
+m0�	�ݔ�*3�%|�*���:O|��^�K�W�g�_�����ZW�r-/�e�Nx�X�X��+���}�.����?�#�5�	NI;6�q�y�~v���S�5Q��֝�`{��
-+j?�S��f�Ҝ8�,Գo}`���^��d�:@[N���"��ݳBB���Lڷl�#�Wx.d��xܽ���9 1)(b/NE89�߸qڭ+2efE�'t�V�r0�+=�L���d�I<�L����Q��7n�Y?M|<�UHXY����uٯ}��W���ӹ\ͩ�'���}�w����~�s�Ӈ���S)k�D�����8���Q��/Nwv5a���lZ�b��:ȯU�m8SiۧӉd�c��תi�\�m��u��Z��IlB䂓�ծ
-+:u�Ɓ�e��ê������"2W+R�zb���n�'�lH��N�k
L��S��]��8�è'A��A!u?Od��+w�~���.��%���R�c�'�җ_�=�7r>}���bقƳ	��ԁӛ����)�@���]��R{l�
���<� �Ω��/���G��[�g$�+g�ڣ#<���K=ěZ
�4�+%؃���+����S?�e�{
L
-+��q�^�\�r�~�CCWU��Dq�lM�Hހ}\�/�י����9z2��!}m������mi�a1
��f+�?����g�5if��r��	��e������"&��.��IO:L�R�)��
q�Qg ��ٝ�O#����Y�v�E�|��1n�P�w�چ���B{��DX2>�O[z+��k�r
�-`1�%�p�-�\�qW��� <�p �.�{��
-+�}��ܷ]��ZF�ƙ�$���9݂A����:��}+��}ޮ��i�ٷ�-��q68h�*;��kU
W/2��+�>�+J�	�c����s�&S~R�Kr��<R�A�7ڟ:�	x�AO������	�Z�����z?�x��G՗��.��P1�D+����u���|��_�?�)i����r�;����p[�ek�^bu�?,C�<�+<;t+��
@'����������ܬ�}��6�����!�{�<�+^ف�3u8����j�"�vgY��tu0:s 8
�gg5�[��Nv������M�}5`E"�����q>��ӓO���M�y��
�|@�3pm������l'����}��W�H|����x�.ggr &���48�7��g�F���%쐓����-�����c�\��f�Ro����e�[��y>p�ȓ���D-$��a-�>��t�#�w�'o�p�q�u�O����}z��u �ߋ���P�CÖX@��$��O�'u��a����~oz��?2}K_�;������&�:��X?������h�����+Xp �4ma�9`������h�Р��w}�u��Jp��jT9OY�̂�}+rv

+�C���׾�
Dž�E�������m��Ұ�,`p�m~(T����
-٦�h箷���ڈc!%������=h��#^�^�&�Ĵ�瀞#ܶI8}$
����?s����O�Uр�ݒ7��]��%ݺ�.���~˟{�UWmy�k^�4
-+���	lP��߬��)���ٷ)�qκ!8r�m�
-+yK��6Ef�o�=�b�X��[|Şc)Yt���e9�Qw��œ|��c�>2=����}8��^@��y���կ�~ڨ���`t���{&{^�ܡ���р��c&�6ɗ�xB�ǀ�]���7�������2
��Y+ՔΌ��o�K�s�Y��+�\�M��y�������p\�c��x��1}p�s����W�4h�K_�{���^1��w"�9�g51`��H��PG]�81�1.���}�L��S)v	��8ǿ�;;v��O�L�<=��vT>�+�0��|[D�E��m^��{ǎ醯�O�[N+��ƁZ���2}�i���ꇉ����:�sy��G��������ҪDV@Ӥ���ʗ����ɸ�pn7�ȟ┓nE�
�h闊��[����߯�����\S�#�1px�W���5z��aP�+�E�@��������N2)�^��e������}f;X��'q%N��E�sο�TYS
��e��E�B� ��@���A?�&c]�ʫ���3ߡx"��]7�<ٟCپ�؋����6q�N�
�n����goC�7ٻ�E*a��)D��N�����A8�3������˧�]���wT�d��k�� p�m�w����é�E����q�G�<JW?��)?�&_�c۶b3&t�t��� A?�Ļ��o����y~��o�c>{5�
|��q|������n^uw��\�-)��/�����+H�Rؼys1y��Y�x{��ko�a��	|AL�(�y8��G��8�
-+X�����2���n�����$�ʐd�]�a%��/����W;?s%?�3��wg�N��{0��^�„&M����/�5\}2x9���+M>Ea顫,�$���y+�t����0SY��2�c3̯j���v�+ij_�S�!��d��@�T<��`��b��ك�O7m��>b
��Q�Y6Z8�Ϟ3�x�@)]yQ+0���&U-%��������U]\���u��[�Է�о⤰
��ڵO&�%�o߾��?��?��ӂod�O+�A�����
��9d��I�� D��!�w�J���@&M�a>�XEd�}|��_�{���I# u����M��V��|4���0M#�~x7=�u?��s��4��?'f{�i]�d���L��yH��}ȃ�aK
-+��!��4Yeh��'?�Lq)�A�$wޚ5��{l��+ht�x,ߩ�Ӈ�W,�[0��`�$�m!�dH89���{���zOGC��h�<��%Mb	/��2�Mr��A3ēD�n�M��#S�ɗ�ү��^峏�޲v��,�~$�@6�b��I_lk��󨲂�VqUm�^R�&qm�ŝ��VZ)kI;n�Dm+'v+��g��&�KP���
-+.7Z��<��9�����7@���,'�~�Iw�7+�;�m�������yU�"OeSE3���B݈Vy��OI�p��…�s�l���|lgϞ�K��hե4��A4]@��`|	2-��G?�I��ۅ��7�7��^�x��W�uϿ�'#�2�!D-ɦd�[�LD��*!�'��X�����c3�7U"��cNȠz+ߩ��ɃM���m����W4�쬿.�*ۮ~����+0h��n=��+�oܸ��.����?G��������ۉ���*���Um������?��Ԁ�L��H�Ԁ�g��=�`�
��|@�,v,1���Ò9�4c�(F:�	��꘮/�/�R*�k�
���P�Fxe?���V{|͜=����T����$w�ϲ�B�عN�%H	�}.o��gb�_�Dʓl���oVᄅ�[S$�M_���_H�����̼v����1��ƽ
[7U��mW>/���/��l㋍�
-+�P���6��S[(�j�	/����FC;�g��x�b7���`;��\�3N�H@9^�p&�#��o�X��f�_zYq�%���1�u�y���W�uH)H�I*�LSa����A�M$G�b��"+y��!����z~��2�7��F��s�3�ʌiӊx��tA�瀵�4ʎ8Ӓh.��8�߆�Om��;
���v�
���)���+���,?��{�D�[��W��]X�}�w_��)�6#^�]U�����1i�ȡ�$Fܘ�C����;���ۛ�O)����[����
-+"S��[���O��w=͆+���kD�����[�>v�k��w�L����++��"l������Sq��:�1t�ԙ��8��Dc���P��^

"/�Ae9J���
o��Zt�nB�)�K:�l!l
-+��U��9�kŪS�
/�X��E3�"N��u��d�^���7_d��S��$�\��j��ΣzW���򪩼�\,��/,�d�a
I0��)7
~&
�4L��"�a�9�`��'���+xyo�mI ��~��S'����X
�K��;z��+&�bH�?h��AyvB����yI��n�c�dld���\>B����{���|�T}XA	i�luaP�h��y�!~ⶸcA�3�\�w�~^Z�7��
�<�g;��"x�s_�
��J�@�E3�`Ǧ�+V�,���늩�*R*�����m�oYaB��	�GG6�Sۨ�d�]nI�Wg����EG�&tܤ)��?g��c��1�``4���n����c��A.�y�Ÿ/�4�]� ����
`-����.!g����-[ƾ���~G(���7�E�(�*�9U��/�G\�Q���t'y���1@�tY�IX�NM�z.S1���P8��#x.������u�vIͅ�A�P�o����w�e.'� ����hן��)��]�{(�ɩf���m�[��m�k���V,2��y�93��p�iR)P�3!���>_�L�ʷ��i ���E��S��%撊<fc&�HcL��K+Px��f�Uj����L![�D�#|FnNu�?B杋�
�lΜ9��1Gx�v���x�'H�����W#u��م��)V���*W%�Cw	��>@�#�_��z���
6ј���=w��a��4|G�`�B4X�ols�����V��d�ܚ&�1����GΟ�s���_y������[�����������}�-����t�MY�*
-+y,/5
-+��ҟ�MELvY��)��)e��l-�a��B�ٴk
%Ȱ�6y(��o�
q��>Q��ul�Ҏ�O���a��pP$dP$�`u��"�%�J�%����}Y���?�'}|��o�<�L�6?���,=��k�Ɔ�]hW��؈��s־?wpzl
-+�+�10g��u��y����ViM�z��i�s����Gq�]XXds�3�4N@����%�ȅ_7�Eش!�1"yb�P�k�����i��Fa��Փ�:�ˢ�&\��!�*C�|?���}+�'�mr�G�T����ON���+=ɮ��RI�_���V���}&��/x��A�Xi��4�#�O���S�1���1�j�J��
�k�uk�M\��ROu��)����"�[�i�`t22�����r��|����ʻU<�]�lYq��p~�`�{���.n
-+���I���y��>R�.�ETL�r�j^.�^��(��>�\�)�m�/��E��'�Y�s�*��]��+�,.����w�=�bqc�"<�E|��E��2�8��/��D��󳾫N?��ѥW]U,[q�����Z]�\�JPy���tMyi�7��W�t^�J����wKݮX��=��_q����5������,��o��
�/�فz�Mg��1�pE#���9�P��iB]
 �g��'N�6�|\�����2�1`E��Z؏���b���g�NG
-+�N4��6�:?�s�L�k�m�W/ߚߤ3���1�xn�?�|~�}7�ރ3��xM��ɷ���v72�R��?�'~�pq�?�	?�ᄪ�UW^Q��n��+���F��<����n��x��|~z��D0y��'���zg�r�SB� ����5r����
-+����M��ׯ^��-Z��5�oi^��=�O����
y��Ǜ��A{��K/�8
m��?�~� nh�b�����]3:�Fd��&�H�+!�V�T;X��+�0*(i-̉_F1_8!͆��VM��&箪Vjd���Pw�~μ�'ȼ��w�}7q�
�}�.��vYC'��C�"���yO���inT�+���ߤ#�d[�'KZ�E�b��Q^��p�q\	�!�O�{��W�c��l�O
!�e�p_����>�+������o�}�z��m�.nvn/��s�{q��>�xio�{4��Y{�!�i��L>%��T3i�b¤���댙����Yv�*߅1_��G��1S���5���Y0�ek�m
-+���h.�~�~R��!Xc�F�O��� Y��F�eE��|͖��0�?vL��o�L�;��Y���Z�DV�kP��*-q҆LhӛO�}tL�!5�ɑt���I��w�}��/���Kw�瀫���	[� �,#��󦑥���������z�es���z	��C���s��b p�y�n�"��
]�c1�N�+D��R����U~)�卄��{�E�+���E8��*H��
-+����yf�C�C0eՀ�#>WH��I{���3};
�4��w��C6�0+Y�
INּ��)vS�|�7�M���R�nS��(���I�'�m���vI���)RK�_6lje��@����JÔG�R��52�����G��<�=��=�������o���{������
�o���	�Ւ@�V��9���%��tt�pA�m��W��ܦM��X�Q�vKq�M�ͣm 1j��r���L�L�T��%��|fP~b0~R��f6Pw�4!�1'��F�e�zZ>��J�����K0�*�3+��.ߘQ� ��?A�3y�]�F�cQ��.�U�?38��dUr����ܞb26+�'�F~����&M�
-+!A��Z���Gg���>�7x����s�|i?!��$hx�=�%D���[��ɵ�Pg�[�Y��>BD�/a�ŲM�#-�eH�|BD�I�p�DVɏ�R�|˹�h�-\c ���p�?�Tq�e�p��u��P�+<��,t/?ğ�����O	,��o~��������FqE�����jA6r�$�A�P�WyI#>
�ݮ�3��^�
-+鶁
��u�$��)��{I��O
�`떜�E68����K�,!U����3�%4�L��ŞJ����I7��� �����1?'��������;߸�j��Ħ��g�����������}�M�澬=r����_�
/�������}���}����jU��_��b:.ῴ�OR�OV�ɜ��_
Z��e|g��%�e�F��{['z��������N��F�3њ���u]t���M=�|~盃���	�3+0���M�:,;�
*��ѐ�n0�!n����)�I��V�I���I���ouEiM#��+O=�Xv��V�𔗁0��?�]�Of�E7|~�0\�6>�3�C��O>�L�Ӈ	UU�l�'�rjq��ӌ��4�6����K:?�:ـQl��ځ:�Wnj��H��X�DSzH���
�����
�(Mp��>��%H0�DHM<*�����*v<Xd>A�-^�/�+�%��w05�\-������G}A������|���;x�����b�N��o}&UL>��-.��m��%K�.7��ׇ��6�z�p����S��?�����s�sr~���Q�K��k������u����P�����+!�M�m���#�&Ǎ�ɔ-Nj�z����>
���hq��K/�w񫡭A}��a'�v��]��z�o�h��;o�&�����p�֒)�������y��_�����/�9�͗]��F����������3�y�����dO�b�"�G�G����'?�ɿ��gy��D-�Z���&�=Q�+���H�[�@kz��A�yP!Ո&���ݲ$��CcQ4�l�J�>�n��)
��8���whŘ-�Q�p�I_�'� q�-+A�+!�*��~��O�,Z��xo��лi�Q��P���^+��ӵK�,6���[AV�� q�u(՟�?����I���磏w�{Ѳα��1�0a����|�}��h�l���P��7�j ���h�	#��-����_��U*�B�W��nx�O}G�)�Z��昋1�����?����C�x�_��{-��Z�	X3���6��p�+\��w�nD�Y^ef��l�^t����ɲ�@�@�*���
-+�uj�*�vX
-+Qْ�I&p[���f���)RR�^�"l
-+(g!��,q!d.�������M��ϯ+��&���Y~|�u�⅋����7�)���{�s+~��'�SO9��>u*���8��.vnT�	�x���
���M_��ˌR�������U���?X}Y�T��O����˿RL�>ݫh���I���6��-A���q]I�#
G�u����o��ӧܹS0��qp7�/�D
��>$�Á���g��=���0�nG�Bߴ�3OQF��F��݆�A8a�Հ=����������X�I�:P�K��);P!?��� S�H<���`�	�&�@!��ij�M^2�,�c�2S6�I��DZ�����) >ew�wԟ���2mZ�~�s���	�l����>�>�M+�q@k���Ig��O\���[�n�{��ޫ���u.ˆS`SP��{
����+�, ˬ�&7Bf�&FAc�Ae	-�`"M�T˜��(&�"�M~d'� h�N��(hyPYBDK&�H'����/,���]l|�uS//�yni�������a�|ٲb��Y����́��ﳫ
�bHD��-� �<�5g��
�����M�Kz�y����p���=�O�>S��8���0���g��*1���U�ђ	&�фːè��EA�*�$�-!^)���(hyPYBDK&�Hí�K����|�:7��ƀ�\#t9�9<�(�����g^x������Q�1Ǚ�q��Vׇ�uo����6J�C��{�[�2q�…kR߼é�5u���l3_��Y�-Ә7+q$"��)���Y@�k�j����
c�r/_O�/��rZK�d��L��$��H4}�&y1I�t����[䛒� �à�Kqs�k�]|Wx�lm� +F7�����G�żY3��-�z3�
w}��u��AKHa%�Sd|�O�#~���lDXZ��?-n��
�q����`�.;���kގ4�=� �Q�	I6���%XS���s_g�&����IW2"&��� �Mq��*N�y�o����\�4��	:��1����
��hz���;]�g�#��0\7+�
��[
����A�ŇNU]I�~�vbR� C��i7K{	w��t��� ���X���u{T�Sn�h�ǁ�w�x��(i�a8��ڗ���y��s�T��!��Z�	݇�Y1�?	�=�8y�s����Sӥy>�B/��rI�ks��e>�z�����τbb���Z����?�i�,���ic��~�=M��&\:�b֜�ŵ����)S�}����5�����C��i#m���O��q��p���}q�z���G�G�E�Y�ng���!%qL�06+�N̜8־J8W��>������^cc��x�G�B̏�^��vd�����̘5g�(��n�F�4�����_�sĕ?��O���~?�)�E=�M�9m����?�я�>���x	n +�v�	j�ۺm[��C�cB;���q�����wn�B!�3��
˟�8i�y�����_%l
-+[�6����Q��[n�'���~��J��MP��\���ޏ���#P���ʾ��e\F%���}܍����7î�{�8�ǯ}�k�x�7�27!v��_�:�h��!҆
�<ʇ��f��@Ȩ���1�U}|]��"\����w/^ܸ	h]������g�N-^���f?�t^@)@��{������5�V��uk�,��j����k���?�s���{߸�؎��T8U�h��.0���-�=���/*-\���2��`��7l(~|�=œxC�=qP�r$�Y�w�gƬ��;�{_1}����k�jL�+V��^��N�ۯ�?��t����%d���S�c���8�`9�IA%*au��q��w�v�)��Ն�s�T��Tw_s�5�
���
-+7+']1n��"�� H�/��++R���
���ua5Yi3C��r����Q�9ɣ���9`婧p�ߞ���0]Ð {���7�F���
-+����z�x ���WL�>
7NrY�B�)����(��G-��m8뿳xc�F�Kj�RVBj�&���/Y����_~�����������k�O��ҳp�_W�Hgd�x�|+�c��~��~�3�4|ӧ~���+�ӈ҂��1��{�g6��]���姀Rf+Mʱs��)L�-���1�<h�lМ(e2�O
����OΤ�f�v@/�z�"9�0�q^ח�'3]��"�Z\[�E$=Ⴙ|�/�j\� �e��j
-+�E3^;��p�C���� ~@�_(p�rUׁb��W��k9�o��oa�N3����2���/_W�Xy�����D
-+*&�kw)��0���C}Œ�>�kS��i�{�ͷ�~ۅG�>�������N���7Az>?�O������"#q�z)h��5/	��5��˗/�y�g^T
-+J�;����v��Ve����}�i�b['��֔/���*�C	#����$g�����A M��u��	S0�D����t˗X�?�f��0��L�-�Yg�p)~�&ް��0�F<��֜]\��w3g��v��������W�e���Yx_�����@t:Q��sD3�|Ѿ��o�ӿ�˿܇�+�\��
@���j�$M��	�:FN��)�uS���'��Ӽ]�<�f�;˖-{˱p�
<[������ t-M
-+�%��)t�0ȟ��2r���TE� ��zg
-+�\_��.��V>�2����o��3y������s�]�ߊw[u�ޗ�W"odkm1u�uW}fUQ̞;���k��K�Z?&9o��w�It	+�,�������#�_�������y��T��wm��b|�W���3=�++�;uP�R�<\	؊�� R��w.�|>i�
-+A�SA`(�I�M�΂�O:�*�"V�V�'_eO�{>�#�_B�����:�s[*}��wn��c��.*�8�<;+�9{�5�n<=����D%��=�o\c���U.]V�����%o��8����2!~���
[�����?���נ����O�/j.$��Nm�'y"����|�����~�韁�����*?.��|��':b#,ذauʫc}
DA]	�v ^ ��o��oށ�����c'd:�+���GJ��n���_g]o㪾U/8��`�}�c�/�����!t�g�7+�iཬj��4i��O�{_~������_t�E�
�'���������@7����4��执�e��e+}.�/�;N���L��W�ڍ)�"�e�i�W�#�x��r*#2�W��=�k�*��^���9�o��������?��?|��o|+�"Ph�YdDZ)b9R����O��l�'��ԫ�������_Bw��"2S74�~-H	�	#�҃�Q��g��3�ſ�� M�i�&����?�h^����v�+���P8a�pʯ�(0S�%K�����|�i�.�[0[�Y�f?�����K��/��t�0K���ş���>t����1���(ƛ�ف�Mx�Ǿ�;��;7C��u�_ӂiq����GKڨ�zF{���z�4a��(Ũ�
�7y„	��t�M��dɒKQ���'�O��@�$�9�;gь�eE
U�\XSZ�6�hD�s.(Ԅ��d!C��F���<���Z�n����տ������:�3\�?�g�6l�/_���0_���ǩP�
Am+�F��xr<>#��k�&�ezX���=_�*f�`�{�q��"��!�7��O�����di{�A���֚��D$s�[��B�K��W��¼~��{_�s�-��3p��X�Dڸst	'<Ұm۶�����}��7�x��#r
��}���o+P��GU��;IN��)��!}�
�A�A��K�Qq���~;��O���}����u�|��i�M��9� �pT�����Z#H�^]�+�p�+M���w���W.���KСǩcW"+Ly&0
���|������;m@�&qRH��U~F��P�0KRG	�
u���.�p�a�"Iqr����0���l!�@�P�Z*�'�k�G�^�S���c{ʿ�|nM����z��~P�J^�g�WL~��1�S����A�~a�ӆ��X#O���������կ~����G�b�E^g�1-��EęfT��h��6+�1�Dk�4<N�ϟ��'ړ�\䵨j�i�Ҹ���� z��Ӱ��D�e�D���������u�Y;W�\�&�j0F�I�@h��A9cf�$��
>�h����f�MW4��G\��S�*)�m���)-��?L
$'�ze�싥��vBY-����7�_�I>���V��KY�E����k����Px-����y��j�޿_��ӭ��'8~�'K_��?�� �8b����	�v(n+����O>y����]�"r����t\��ňd�&�
�m+���Y�ׯ��u�]��ߟg�T��=.�M7��P��ň��	{��8����< _*r!'��+����9�1ظ	�x�W��A
��GJ�l��c!&
~Vx;��bA��ȉ�4�0^���c�i�M��N&�hbp�j�F����n��`���)|�k��|Ѿ���-�s6A��)���)�
ᡛ<�/����q�>PҲ��r�+�m�2�3�a�KB^��1��xH����Sz�zI�Ab2�꟩T	"O��O!��2�3�!��?
?��Cӂ=��#�i��u�]_����훐��t��z-�JG�<���[�ጣz������
o�Gz�������3�<s�U������2�
��m�� ��-^„p�&C�֔|ɴ�����ĥ�F���l&�i�K<��/\�YekQ7}`d9�%L�p�(�!�#�� �P{����^��w?X�a�P���?����ۋ���rS}��n��_?����
<�ϟ�����E_P+����M7}����mЩ��6��k��b!
o���������+��7-�
-+�6T�đ��h�7.B=��#Iu�a�e!�7.��D[l���'�����>��@�Y�Ḇ$J���=�����?��v��bn`
����b�����>$/��W��0r[�Fe��?z�|J;���4��
}�ȑ��_�W�&��SRlrG�Gr��8���"+�-ڞU�Q�4p��S$$�	�.zi�� 
��?�
V�ŶaC*�8��N�"����?u)�Fϱ��E���8`[L��?K��9S���e��{��r���O���ӟ���%$�#R��u҇L�ik1�"]��=4�s� �+v��E��	�E_�=��
�Q�"a�	渉Qu�8��Z��g&��H5z�)�aP�l 
-+v��q��+�2tc�8$]V>1�g2İp�Aa�l���pJ/^6����'N�����&��4F����|G�8����_�L����3��Ư9>��S����f�$�V/�#�e���
�W���f�{���m۶
��E)L��L������Ab�,B�a�"���pb"��`[˓[�xdZi��߿��í�{�
���Yr+_f�!�Ct�m3���4ٛV���x��
�r<�j��Ǐ�}�k~��\���vJa�g�6�[�u��10��e�s��`d�k�Ǚ�J��xԧ���رq�����ܦ.��ys�t{0�d�Hb�.�m�#��3䆤%�ژ�:�$(=�I9��5�	�)�7�#FD�Q+��Jyu�Y_�򗯘;w�z4����2𤩇LC��G'��l���3��=�i�0CT��,R@��W̡��0ߋ`+�+q�†��!�`C=hU�ICbH�)bɺb�5	ՖnGġV����U������4���Y5x�NJ��}4�<
���`x�kژV~B<��_���|�����r&�T��+q��h��?���;w��o��E]�"�
:<xf�?+H���>�81a"�}���7�Ǻ���>�����Y���xL���7�����k�W����c�{��o�������G�"�y�w.��x�_^w�u�G^7��x�!E'p&~b��)'�N	4y`��Q��Oh�
-+�	
wnc1�ę8eă�:�C��AN߇w���!/�xꕯ|����ޙ�X�+�t��6�m��t�[	��g��W<
O�7�@�FZ�'��a]om&��
C���?��1�fD
����c��G��DŽ�D�� w������7��>N�[] ��e������[��9��������)Ә4�1�c�XT'#�0:�{�&v�#�\	�}�Z�%�뭐w��������O�Xl�&�4`b�$9i`����Wf��<1����=/�U
|y�h|6o`r�<���Ŗ���+kð��P�tf^k;{�A���
R�
ݗ�S�暡l�R�m�l���?���\��=0��?����+m�#
��߾}�6}�����[n����$e��L�3�3�[;��_^U�
;�������A���rj�sh���넟G�V�Z:eʔU���'��Moz������v3�v����V��)�=���욌+S{��Kx��5�b�x�	���M���N���*���o�q;~��o>�>�*�oRLR����Zٿ�]]S����О���w�}�S��_����x~Q
-+�66�Nޤ���Ӗ���u6��vc�2ƺ��5�v��.:y�N�(�k|�� �8m��I��>���0y�~@���N'Բ	�]��Lk/���Ԟ�}�g�z�K��'tӢ�o�M	:L��J��3��&��]���?�?�C�+�Kw�4p�k�Ԟ��p�/g���??$}�r�1*۟��2{���پȇ}���-o�S^���[��g�1\&p��5�i���-"�UÐ9���rcp$�eD��X��+
�	�&�2}�/1.�+��(!~*xY�&ث���0X��.+��Ft�.ȣ|�ot�Fn�ó����}��R��T�O�l}��+�
-+���d�����d�o���?��Ơua‡�t
-+�ğ���~��H9�}�{ߙrU�y��m���$"�#	�'ْ�(�=(�;쓟	� �+x�o"��1U�'���+#�����<x�/J�y�����S�}�C:�-oy�es��Y���'}�e�գ��O�@��ݶG�a�	ヲ 849bи�+@�cg@��zL����q	w��f��zO딍w]S�����*�o�[�2�m�;w�|��n���%�?/6�R�N�L�:q��o���i�~���X���F�sʸ�,
nw�A���
Y^�*����͂+�j��W\q����	y�g|��
-+�M��W�}���?��E��B�����O
-+�e�
-+>*�3��WֶM��.�}����;��aS�IrxXpL��O��v2sI�,�Z�;tY̬�2�2=��8�7o�|��7�|���o9�����T�GB։��IuIk,bO��D�3zۇ9Y�@y��5�4����b;x|�T��Њ뮻�s�9��{{{�n��`'`[�,���־Lo�+�����9$�!I�C�F:Ӊ
�v��0��5ȓdA1,�8�\���}�g2lB��1{��,&ac]OO���;��� ���^I蠃L�#�
-+�;�<�֟�����m}k_���,?<<|P^��7�p�==��>���8���1�V
-+�h�
�+#��d�d��;m�,Ek;��ii�!�C ������d����~�1�T�@cKW]�z��9��R�*��k�� _ �hɒ%�uZ��Nֿ�>c�:��O��2뿬?�n���u��봾m���Yl}�R��a�2�=��ַ���}$|$��R����@'w�h��ZOZcЩ"�Z‡��#P�+C�B�<;��yqQK��
�-���#��+.�t�%�2d�'�q���&�
���+6����.KXR�:�_�\�ֿ�/[���־Lo۳|;�������zO<�����w�}�%�o���7�퓢߿/ln·ɘ�M�[�嵍���b�7��+���㏿(�x�ᇑ�d����D�$Kyb+O%j+�|��2�cy�M��@ZcK�w��H0�9xNt�~GZcK�/+�.+X�	��B�,��U�Y6l�'O̗�͓�,���@�'�@�#?+T~<��-����\�d�W��n��^N�w��v���/��˒���3�G��CR�؏H9�
-+n��%K&W���a���x��6y��?b�HS��#p�"�I��#0"��E�[:�C�b�|�r�+ˆ�e4�+�����ϐ�?k.0̜%Wf���N�҇"
�)�x�3O2�~� 8$I{P
-+p�B'�eP��Jb�/p`��݇��3�����!y��aI�%��wx$v$y$|ʘ�EԔ譌I����*�K���_��y�[��G�G@O@'�qo�#����'-M^cж�-ey�
ꁫ�h{K�����b赬*
;,�FC$n�S
9�{��hr`�+m���C1u�[�[Q=mS�u��Iȣ�w�8)�dtR�F=%��'��2к�	�3�A����i�����a��t�ϓAn
c+��Z��u5��)+��i}Oy;�I�%M?���X�I����v����M���ޑ	
���h�(טrb�t�qʷ��h�R8O��
K
-+��)�"_
-+�<��r�EX�,
>OF]�cM���X�2+M[��*2�h�"�����(��?���be�/��'�_��)u�ڦ*m��;x&\�=IL�+:X>�	
{����j��l�k�"%��h�
������k��QO�yt���U�a�����M ��I��G �ԱSEfm,�����g�����:ik�V^ƣn��է��� w�xr"p�&���]�W�;�R�NdZ�u�ezm[D����/ҧt���n����
�@�tk���x&l���<]�A,�1�Ulh[WI�E6y�<9�T���g��x
-+"��I��)Wy<&U��n٘���VI�ݲ�J�݉G�#P�@�ɥn�G�#p�#��1�n���UI䩺��K�r�G�#���vї��x�o<���m�#�x<
��G�#��x<
��G�#��x<
��G�#��x<
��G�#��x<
��G�#��x<
��G�#��x<
��G�#��x<
��G�#��x<
��G�#��x<
��G�#��x<
��G�#��x<
��G�#��B�?��p;OH��
-\ No newline at end of file
-added in remote
-  their  100644 84970c7172887f460750705de8fc06ca7eea4a5b electron/browser/resources/win/atom.manifest
-@@ -0,0 +1,33 @@
-+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-+
-+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-+    <application>
-+      <!-- Windows 10 -->
-+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
-+      <!-- Windows 8.1 -->
-+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
-+      <!-- Windows 8 -->
-+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
-+      <!-- Windows 7 -->
-+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
-+      <!-- Windows Vista -->
-+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
-+    </application>
-+  </compatibility>
-+
-+  <dependency>
-+    <dependentAssembly>
-+      <assemblyIdentity type="Win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"></assemblyIdentity>
-+    </dependentAssembly>
-+  </dependency>
-+
-+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-+    <security>
-+      <requestedPrivileges>
-+        <requestedExecutionLevel level="asInvoker" />
-+      </requestedPrivileges>
-+    </security>
-+  </trustInfo>
-+
-+</assembly>
-added in remote
-  their  100644 ada12bf324ad1dc48e8a040da0f7309841f55f59 electron/browser/resources/win/atom.rc
-@@ -0,0 +1,139 @@
-+// Microsoft Visual C++ generated resource script.
-+//
-+#include "grit\\ui_unscaled_resources.h"
-+#include "resource.h"
-+#include <winresrc.h>
-+#ifdef IDC_STATIC
-+#undef IDC_STATIC
-+#endif
-+#define IDC_STATIC (-1)
-+
-+#define APSTUDIO_READONLY_SYMBOLS
-+/////////////////////////////////////////////////////////////////////////////
-+//
-+// Generated from the TEXTINCLUDE 2 resource.
-+//
-+#include "windows.h"
-+
-+/////////////////////////////////////////////////////////////////////////////
-+#undef APSTUDIO_READONLY_SYMBOLS
-+
-+/////////////////////////////////////////////////////////////////////////////
-+// English (United States) resources
-+
-+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-+
-+#ifdef APSTUDIO_INVOKED
-+/////////////////////////////////////////////////////////////////////////////
-+//
-+// TEXTINCLUDE
-+//
-+
-+1 TEXTINCLUDE
-+BEGIN
-+    "resource.h\0"
-+END
-+
-+2 TEXTINCLUDE
-+BEGIN
-+    "#include ""windows.h""\r\n"
-+    "\0"
-+END
-+
-+3 TEXTINCLUDE
-+BEGIN
-+    "\r\n"
-+    "\0"
-+END
-+
-+#endif    // APSTUDIO_INVOKED
-+
-+
-+/////////////////////////////////////////////////////////////////////////////
-+//
-+// Version
-+//
-+
-+VS_VERSION_INFO VERSIONINFO
-+ FILEVERSION 0,37,3,0
-+ PRODUCTVERSION 0,37,3,0
-+ FILEFLAGSMASK 0x3fL
-+#ifdef _DEBUG
-+ FILEFLAGS 0x1L
-+#else
-+ FILEFLAGS 0x0L
-+#endif
-+ FILEOS 0x40004L
-+ FILETYPE 0x1L
-+ FILESUBTYPE 0x0L
-+BEGIN
-+    BLOCK "StringFileInfo"
-+    BEGIN
-+        BLOCK "040904b0"
-+        BEGIN
-+            VALUE "CompanyName", "GitHub, Inc."
-+            VALUE "FileDescription", "Electron"
-+            VALUE "FileVersion", "0.37.3"
-+            VALUE "InternalName", "electron.exe"
-+            VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
-+            VALUE "OriginalFilename", "electron.exe"
-+            VALUE "ProductName", "Electron"
-+            VALUE "ProductVersion", "0.37.3"
-+            VALUE "SquirrelAwareVersion", "1"
-+        END
-+    END
-+    BLOCK "VarFileInfo"
-+    BEGIN
-+        VALUE "Translation", 0x409, 1200
-+    END
-+END
-+
-+#endif    // English (United States) resources
-+/////////////////////////////////////////////////////////////////////////////
-+
-+
-+
-+#ifndef APSTUDIO_INVOKED
-+/////////////////////////////////////////////////////////////////////////////
-+//
-+// Generated from the TEXTINCLUDE 3 resource.
-+//
-+
-+
-+/////////////////////////////////////////////////////////////////////////////
-+#endif    // not APSTUDIO_INVOKED
-+
-+/////////////////////////////////////////////////////////////////////////////
-+//
-+// Icon
-+//
-+
-+IDR_MAINFRAME           ICON                    "electron.ico"
-+/////////////////////////////////////////////////////////////////////////////
-+
-+/////////////////////////////////////////////////////////////////////////////
-+//
-+// Cursors
-+//
-+IDC_ALIAS          CURSOR             "ui\\resources\\cursors\\aliasb.cur"
-+IDC_CELL           CURSOR             "ui\\resources\\cursors\\cell.cur"
-+IDC_COLRESIZE      CURSOR             "ui\\resources\\cursors\\col_resize.cur"
-+IDC_COPYCUR        CURSOR             "ui\\resources\\cursors\\copy.cur"
-+IDC_CURSOR_NONE    CURSOR             "ui\\resources\\cursors\\none.cur"
-+IDC_HAND_GRAB      CURSOR             "ui\\resources\\cursors\\hand_grab.cur"
-+IDC_HAND_GRABBING  CURSOR             "ui\\resources\\cursors\\hand_grabbing.cur"
-+IDC_PAN_EAST       CURSOR             "ui\\resources\\cursors\\pan_east.cur"
-+IDC_PAN_MIDDLE     CURSOR             "ui\\resources\\cursors\\pan_middle.cur"
-+IDC_PAN_NORTH      CURSOR             "ui\\resources\\cursors\\pan_north.cur"
-+IDC_PAN_NORTH_EAST CURSOR             "ui\\resources\\cursors\\pan_north_east.cur"
-+IDC_PAN_NORTH_WEST CURSOR             "ui\\resources\\cursors\\pan_north_west.cur"
-+IDC_PAN_SOUTH      CURSOR             "ui\\resources\\cursors\\pan_south.cur"
-+IDC_PAN_SOUTH_EAST CURSOR             "ui\\resources\\cursors\\pan_south_east.cur"
-+IDC_PAN_SOUTH_WEST CURSOR             "ui\\resources\\cursors\\pan_south_west.cur"
-+IDC_PAN_WEST       CURSOR             "ui\\resources\\cursors\\pan_west.cur"
-+IDC_ROWRESIZE      CURSOR             "ui\\resources\\cursors\\row_resize.cur"
-+IDC_VERTICALTEXT   CURSOR             "ui\\resources\\cursors\\vertical_text.cur"
-+IDC_ZOOMIN         CURSOR             "ui\\resources\\cursors\\zoom_in.cur"
-+IDC_ZOOMOUT        CURSOR             "ui\\resources\\cursors\\zoom_out.cur"
-+/////////////////////////////////////////////////////////////////////////////
-added in remote
-  their  100644 aa09177554651fb38078881c4dd73f7d1d17ae7f electron/browser/resources/win/electron.ico
-@@ -0,0 +1,250 @@
-++�֘|�֘��՗��՗��՗��՗��՗��՗��՗��՗��՗��՗��՗��՗��՗��՗��՗��՗��֘��՗��י��ؘ|��
-++�ܛ��ڛ��ۛ��ۛ��ڛ��ۛ��ˎ�Ƚ���ԕ��ڛ��ڛ��ڛ��ښ��ڛ���[��|I��ܧ��ښ��ښ��ښ��ڛ��ښ��ؙ�������n���b���O��yD��xD��|F���U���k��ˍ��ʌ�̿���ؗ��ښ��ښ��ښ��ښ��ڛ��ښ���
-++
-++�WW됶�����c�.�Q��[�5��}�	K�,9aʔ)�Ə�D���Ç�:�jp79�M^e�����w�޽F�Ī͛7?�������#���e������k$�	����r&��M�p��W��������OG���w�����y���7�7�7O;��cO�>}��cƌY��:���
�.-�J�/�)���j�p����o}��o��?}�W�����ϊ�	��B��.ҡ�Jy����.����)W�#��O��O������s�:�7O�4�L-�OЀbRx���8}��7z��ޱc�}6l�����S����_�����&D"���ws�C�e�@��(�^T���S�:~�����<����?��3f�E�3YGQ�X�
8h�Ĥ�b�V��Y��n���?��?��[Ԗ�ژH5�lӟ���%y���%	b�ʗ5ػu���_��N;�s~d�̙�6���H�29��Ǜ��{��;�-�~�2<�v��+4\��?�ӷ�M݁_��>�-C��@�QQ�{����)�q[n��	����|�\�^�D�洿
]t��+܃���-�k��*�Wy���g�����/^��Q�F-�i�`�_�����?Xy��/��?�t��ޕ+W��'>�}�+_���
�	5`B�P:@M+WhU�����oVK���I[
�nNC���@�
��P������,�\s�5�u�Y�����f���7`�7����"�v���qX�Q7��D��a�p��Y��R�0^�S�ɇk�\e���uc�wy��=�DL���x��!"��X7��wq������롤�����}梋.�N,L�
-+hJ�&P�D�Ci��Ci�(��w7n�M�`�|�UW����O���mw�p�`*GNL���{����4vi�+�0�S�	7%��`CB����RD3L<���ʄ�(���e�=�8E��#�d�e�=&���G��k"��;������m��E�$���-�����PJ=@?�{��B��������+���GN:餏�������
P+a����FZx�Q9&��}�{M�������K�H�:���`��+�כs�.�+%����ХboN��DYPP!ش�扲p�fJ�I���f���*�Yp����iӦ�����'?�䓷�y��
Ck��;$��ö�zm���8{���@����(K����+����]
-+��
-+>
F�U)W�2�T�`|�SA��Q�/����]�
=�%�!ԃ=P�&踷^�x��T���@��9����j��6�"�ٝi7�
��1���ҨL�����=a�w��D�mE|R!~8����'�٣<0F�N��9%��?�)�3�4�[<*�����th�:��O�j��N�%���o��%�oh�?�ʧ`]���<�G�Z�C���@G2�+���킰j�S,Ȅۈ�aA!�m�U������#�6+��tJ�%��~�g�z�pJ����Ut���M��Gldx����fce3���ƻ��Q��A��t������#�9�D��¬24��sY�qԂ�#U�ڭAQO�AC
-+f%:��`��-/aW��򸚮�X�	y�͵��5^H}EM<�+v�D�T+���&��ԄV?���Y���fX3U}t�|��R�9�
=�@_�lҭB�
-+����/������+p5͋�+Xu�+SW #�KT��<FN])�Bu����d��O�Ɗ.Hkz1lm�		����_+�!�|e}j�~���x�F}��������;����Y[
��:��[}����?�&D`�,N}o3���Op-Wi_  #�"8\@���'Xk ��H���`�99�#y,%J�_,�[y�\���CH��H9ac��QE��݁	}ѡ'9��5�K^d$�?a�ʅ���~h����S��#x)���u�F0�j��e�}�z�u-������f�������}��u��Z	��X��
A��x�&w��k�-���j�]�p�[o��/&N�x��O�ܬ���.�9*�*83+oe��6��]h�Nj �A��^*�I>h!"�z_�b�B}�ud�`nQ1���r��:�և^Ӥ����U-`�>��������u���a�Qq�������㏯	36$צ����9a_m5���pŊ��v���#��{͍[��%$��D%
-++�0��%K���~���u��T�k��j���}�}��U�q��j
����z�����]�v��q�@�`�CP�
!�A2I��
-+��K
%�r�}ю"W��	;<D�Q	���͓�6c���d!�r�ן,O@��v��+炦���z�%��:7����/��Kȫ�P��)[`@�%���ې��]����ޓ��JS�ԫ*��
-+�=�|
-+"U���=��׵�͊x�t]�U��?FL
-+�@1Z���T<���:
TW��ȹ`9OOe������
<I������6��Y?��C�$���%��G��PTU�Iv�����$�`R�m@4	�r�a�b/�8��L0�R0^w
xX��ۡ
-++
-+<�YH�
V̀6E��&	�H1"�H�6�D9�[mVY�f�J7P)�6X>vH>܁��)_`n�
-+n�r?Ԥ}ݩ�y7����:��~:"��
-+%�Ԟe�Ą炵B�J��
�F����Z-��; ��Vt�=m���Ħ��i#VU��.�V�q��Y6����8t�u�]���K����
PQ�[Z�}7��>y_�D��f��2�q,P�_$�鎯2ylH��Do��-
����^��6e������[Xې6���<�-
@4ŊӲ%�L�]�6�Ϊ�b��P��"��Q6�jV��CU�.��fUm3��mG��^&9\�g���(?~��6Q�
ʩ�Ի�fΰ*Hʼv�bGL���+�hZ���ͺ;�\�Eo��ܱl�er��̜2�I�
-+4W1KQ�vX���ʶr����9_����}�g~�@-��߮�  %��qG�/X��'{��E@LE�D�-���a�*C�I�c��΄YW�-AxOD:��䍀�
�K+=�
��P*��D"���	,��I����8	�&>�t�
-+i�-eW�T��S��S��f�M�|���%��.3�J{���d�]4&�4�Ī�y��&
��0K��%a���I5��g����ͅ�u��TǍv e0�^�����
o�+���Y9�l:���c@��>�F �L��KYm_
-+ֆ_
-+*�!G{t��� !�ʶ�P��C	��(2����;��g�3��ik�'I�#�P��J"��o*kQ)��BY�����j�eR��S�3*�h����D��q�{�˼R(X���,��)R?Е~�1X;�U,_���j�?V2Z�!/U9�i��'�ޡ�6M�F̝��6N+�+����lg\5
���+/�mF��"DY��\�����F���n'3�$�!��o���_m���."��a���	g��s�i�~��-J�J�2�P����cP��I��k�.���������WXBtX�2!!��!�/E�\ � 7�e�)t9�\�A�2���p�BV��ٗ
�P/I���
xx<\�'��&i��5����y,�Y��Y����
/4;v�jƏ+�>��I+:��Coa�;�cX�P/�6VEk;%�ʶ7uQֶZ���W��f��S)�(�8o�U�UM��WUe����9�������+W��I�&]X��7���O���v�]��#��M����e`�`�:��q�E�	F`x�n�$�!Lf���d^�%��j�LL�₴Y��卶�]�r '�}�v�b���S4
\w��ͷn�ٓIj���Z٪r��mo:���3��5
ļ'�7ӻUҕ�_���S*
-+��Ͷ7�ø��9�������D��8A�7X)�k�,Q�
8z1�A �!�
��Qې�V�EX&:�ҷ�e�F�2v�u�;]�n��ſڹ�$Н+�j���+�ز�\��S�� ����2��DLۂs=+)
-+с��U�܂Ԋ	G@ЗO�:�
�Q����F�ӛ�]��,�dokA!"H5D̢n�7�IX�kY%;�G����p�-����nv�#s��/�J\9bD�d�<����_�fq��ρ�C=�y�X�v����k ��T<!
�*L�]���TP���`FQp���'�b�>*JF��dh��չ�B=��%
O��I>���Ն�3g����]v�e|a��	����Zd�W;���
c�=�ܣt���u�W|ˉ�cd�ɿ�m��+�v�aNG�(��8�eR��OzÂΰ�7�#0Eo����Ad^լ7�
�|�z����m���ҟ���r�/;	��74�j�o�Ab�#F�hf͙�̙;�eLh̀@��7��lۼ1�aH:r��	G1�+�+�!�l��+�O�h("�jB�ǁ��}��s2`��y|��?�nʔ)'�v߹�kxT������^A�'�WP~W4>�n����f�ʯ��o�<�V�&�[� �..����
�;Kg�~�D�^��G��m���#r"�T0@� 
-+J%ٷ
�5LP
-+
-+��"�JІTl%LL�r�\U�������+�Ԑ�0t9�5m�%}��ٸi�m��
�s�=7�m+�%�ݬ4,5�V���4*v*ӷ~����
$��S�����	(�n,	�a��M�
�5���r��я~�G�5[U�S������'��+���@#�����W\�>}��rN�©3›�l����S�'�.{��@t�Ν%���QڛPt�l�Q{�+N�EE-,��ҏȓ�ΰ�j>���ڶ�d����}�g;ms0��X���r�'�"�U�?l��	�h����/�؎�Aq;2�0�<�n�2,�~�v�ߦ���w�(W�F��p=C�������X�qD��m�+��Fu7�袋�q����#+��+�J�a;�a�~t���|�3Wj���
0��ʳ寐t��[��F�xι��?�s��R���k���#S�Yx+��h=z�f���W}ޫ�>���SO��)���
-W�@�1\ņ��3����+G&�l�Sb�|�a_I+�IzD�����<,����)ؗ����Ǭ�֡F.[w�'�X��#F�Xԡm� Ϭ�o�C�����%��"<�6&-�-"�Ò*�Z^��T� ��(��S�C�� ��6��$�C9��.�cY�y����鰛�2�]Xea�����|�$o������ov��9�WH�J�9��.��9�ef�?H�tq�7��y��U�N7��؇~�1~R�^��W�En{r�EE��5ZzXYԩ��@��]Aih�L�p�]�cJܖg�8)�����P�����j�=l]z��.�,="|�ng�b���)��G�1�nذ�>����ze�bA�0�^��J�+II��e�𠆲w0�V�o�a�����-mDD�c�~���f!tSV�cC^/�
-+J:0Nյ�G>���?�ꫲ
-+p�����!����9�.��:N?��y=���]� �k����,I����<`< "���,�?�'@!�=��ʷ�U��@��4h�'p(����P�!i�'�;8�a�)��Z�,70���Ö�W��O,]}U.��#)�Q��r^�s��=�[Q�/�E�MO%M�i�.(�h�q�ך�z�(RQ�5O>�y�[.lV�
-+Hށ"��OE�P~S!�)��Qe+��:z�Ȟ��")�L�c
dt��K�d��������"����+�ۮذ�Ƙ�K�"~�	H�nj�\�w5#G�K�{������UW7#�J�>�^��oL��N�埍�S��N)�N���萖��C�����+%�`��yeI="������m�_���
-+(D�֕��B�r��yf����
-+���t��"4BZ��'�i?	t�e%3�q��7V۪GW��K�qئo�x�b���Op�ު��
-+��[�p
�m�+H�w��0�C���ΤȠ`�8��r"P�uj�j����<g(��T+���#U���&ѝ���d�.�-C�h�b1L��uW�^�U'��-3���J�#���V+*����#�RO�+���/[d
-+d��؛�	B�m2`�Ñ~]+p�D03ا���$
�	
-+r΋�*�|��s\�.+J��Q>V�8�x'*�,9$�����ov`�یi��	�=-4����Oj���r+����xXZ�<E���j�,ѳyLF�^MJ*�|�ް�����z4J�#U�C���KM��65�e&�z�q��V9����l�p\��8���P��I���E�EkϘOݕ<v,r��S"�2�$%>>j�������*+�2�l{����4�=�9��[�^�ŷ�٤o��a�f��m�b�U��];�Q��>Z�ոŦ���董�Θf��O�:����uFjP0��2�D�X�����Dh�ʞ��TF���؍�i���<�;�GI �Uh'��~��E��y�4��|2�*S������f�v�����4�m�O�ݬG����X��v���&襣�z�`�6~�̓!B�٬�����Gb��-ػ�m9��
�꾢OMG��Ob�8������p�
-+a�^�;[߁T=09�����X���	Ж���"��r��`|�U!My�9�A��I/��>��
�L��'?�L5�+F���춶B ���@�
+Y�'����y�z��W�T��������nuk
-+:0Z�e	�`�CD����&�ΆT�r��H+�Hvh�z��JGA���أ���n����7�Ѭz�I�H*,��i��)w�*�JU��`�u�q˗��g��h⬽%�8�=SG��J.<��_�o��t��e�Lط��^s�C+��u�M�2l(�Y�<}�~fl��0�y��t}Co
-+G[!������S��:��F}h�	~R�{+^9o2)�v�|�d�l]h�)o!�B����6�;e��~V�E�@0���� ��I��.��Ip$#4'�OuvN+ѭt��gΕx��?�z��͆
-+b�J�%�9n��f�>�5u�.p�E����H]���+��)�x�v��=J�C_�ݪ��
�74^X�l���"�|���w�GO�-Q���I�ZA�L#wR�N��vp�
-+�|��n������}�nZv �I-�SH�%?�>_Ę;o���Y��&�.��|��uZ���꧞h^���j��;�}��f�V6�o6>/��zsFR�,c�I�q�ys�������I���Z	l������,K;��?�{P�b�ܮ Զ��g!"�w;�?��ڀ
AjOa�a�6�k���1vgK\/ޯZ��s��~��Jov��^̼H�s${E��VG~�J�G���~��w��0�<[*�O<��~�ˉ�H@��T���q�
�d�YtZ����ѥ���C��g�Hl��!�Z�(&<���G#0S5P��ͥ��7-�e�4Ȼ��&5��,i�Z���>m��8S摙��Mј�J
|��N��
��7<���`�=w����R��̤F
-+&�UD\ț�e�X
|���<�Ps��kՅ����<X�ǎ;�9�3��-
���[t����]{~�'~�3���q��z��'��ʌ�
�e��uu��'�']e�aO���|���.��9A��ݶ˟���Oa��<-^u�P$��UBy|���;bF8�A�l�h"A+��MG��T��K���:}Ԯf^�-�ֶ,�c!O�T��;w��`�5a�;q
-+�A���m��ȑ�6���ę�w��v{t���d��ҽ{
�Q�d��@�3��(&
�<���Zt+�#����7,�gΜՌ�-Bpn2%�'S�X̝�8������������{"����XB��0"sԁi�0bd3w����z�y��͛��f/� �:��r��g���!��h��\�{�1Z��0�}�~јW1�����6�t�X���D�x�l��1���H|P���
�50t��f�N1��;�٢ۣ<'�8��µ�o�F4#)��p��
-+�A
E\�������>X	N+���K4�'^3D4�7�"���\�dX���'\G
��^lE����O}�Fk�Q[O<��u�zʩ��-Z��]���ij�����
���S��a	?��iq�L��H$�8�ۃ)�|��atytH�����F`��x��S����>��ͧϘټC_Ν�2��TIr�a%&A���7�Q
�-ܓ`
-+�n�%2?��f��H
�a�ϓ��w�Z:�g��`XiC�h�ծ���*���o�Yz\3~�x�F
-+cÇ��~���l,<��6v��q%�S�����8q��l��������d�����Dj�j�d=u��������uߺ��J>����o6ճSf��7
-+���.�eo0��~m���7)w+���iw�f�Yu!C�V;��V�4 =�lش�y�N�8
�Y��vFXao�������S����Y�[�֯CRڧdž�F����"�D��+,a�Cau�•�zWJ�*�-��AcC���L*Vn�
;�1
��8ަI�-T
-+x��P'��_�G��o����-�@*l_���q�#�a��r|t�J��̿MDВpz]��O�)*x�I��6��\`(:2K�+JC�n?��
Mw�����ν,�E��EE���ӫu"���cF
5������M�Q�S��l���xb��l���B�Zw�_ա�h�K6uy�
-+�*n7��~�Ĉ~P�cc�A6 a)���-J�e%A�M9�c��+�v��?�q�po��}��w�+��u�kꩧ.�A�c��#�
�(��p�z�^���p�Nȅ-���E����+
:ē��
-+3yt�O$Ϸd���a�#+W�4f~���t<\�j�
-+�3��-th���ng�bH��D����h��X��j��x&��#N5��]>�oՕ�A�h�d��挳��+���
-+u�2�q�OM�R�?����WP
-+(WI�%�l'm�H�h�6��%|*���I��o<ʌ���v4�tKr���g
􇝉<q¬����v��m�x�+��l�~	<��^��v�- ��uai�=�%�H��T�1�Hǰf=̾ŏ��S��x�Ē����=�	��u�1zDq��sȉF�N9����?�c
i|��1{
-+�A�,i����NG����`0�hT!��<O&.Z�	S����+�O�O��Z��l�@���`wj��� �S4�r�q`�C�~�Wk}=��˯����þ	I��VY�Þu��=�
-+�h���3+�=p9ܮhq�5�0�Z:DP�$��C�9���%u?����Ӽ���^�	�v��P�
h���f�*(����˥Kʰ�!�2�Fmv�GKY��@A�p7�L��A���p���)9�q�SG	���-4�9WA՘��q�d'�`��J��ξQh�>��Y'hC���
��m1���4
��,���U��[�
�9a�
�2wڴ����]o��;$��I���g�MlZ��l�۟�
-+~`ş<T�SɅ8�Y��z8�Gީ�y�s��Mp�5O?�L�TkcȮL���O/�xc)��{�L�Bv�x�``�r'��O��h3�\FH� �L�q�1%Z����Zl'��a�m��z���o���sCz;�Fb�)��+6\}�4n�B�<��g�A�rk�>��«R���G(E�J
SYϱG�
�H?[�"9�7����\$X+H��(�F���&�t������SUo}��i�X������~��]�>p+6����|��ؔ�ݻ#��a"��x-D�g�v��X�p��I�T,���h�D*�6�d��x�4أXJ,�DG
�QԵm�"/
-+S&�Dm�}���*-�J��>�SM��d#N3+�t��u�u��7}u�����;?��x����b��baB�@�2J�r�ᄐ���<�B"��u�a��m��Ї/8up��[tU�+ M����vg����i#X���a�^�~ yF��ɑ�ul�E�#���6O��&����{^�F76⠼8�~� �!�M%���4I� �"��%������>G�[�v-�kb}� �$��<|j,�6)R
pµ�^�k��)�ة���n�T�+Sx�NZ*ƶ��&5e�4�v���Ѓ\��)��%�6�E��٫��M瓜�J� gh����p��uԑ��A�2\� W���� ٛ�i�s��z$�����G���=���3sU��|������o?�/�t����Sch�M� �VZ$؝XvԝY��-ˬ6T\�]z��[�qL�
�W��j|ūǮ+b���;wU{v�h���2?�O�[y�B�\��G�⢁�	F0 �M�+�B��
�4$Y��|YU�"OՈg>�G��?G�1~�ϣ6
I���c�"'�������>.%
-+��>�re�&�q)M�|�a��y��c��w�����{n=XS�k������C��F��A"m\L�A�Նg4���G�L߹�j��G��ư��A��?�0r��l��N�WMkI۵11�M�eѡ�t��H~}v,r�"����УDu��h�*��gt��Æ���(�b��ތ_T�WQ�K&��5�����%�lQ�0��&�=X���qр-��>%`w�v���
��(6R�8dߴ�AZ�m��h��ŋ�
f`���v���V;)j%ٕC~8�<w�:�Mp�A!T�$��j���6.��y�D)��[p��B*6A>�1a���\��R�@E�D��܈S�&�(��ۣUz�y���q��Mg���:uZ���}�Z���B`1��
-+�ʙ>m�I���&��̌�knȰ,�N��gZp��Wq ��g�X:� ��j�iS�"����J�[��'EA�Xm���;��!'|(6�(h��~ff��=�y��>ƅ�⁍A���k�3r�=ae\i�Ú����Pa��9�2Of{�,t��v��?J�&k鿣賓� 	�g.���-l�4-qF���z�@G`w0��(��oY�TF.J3�̜,ZI���3�+�|�!'�!��(��)�R�+(
p>��"��������,(�����Лe3����Õ�0DD�E��{W>���p�j����{��[�YE�N,�qɕWk5.�%WD��&�3%var��ִd��&�X���M]���E��W�ǻTG�I�>Q����D`ۋ.��=�O�R�NM�x����40�r�+	�6�y$�u��|h�ŏv����'���+{K,%ı�ei�-Я2��! �ٟ������z0h�M����\
t��pF`h�Xl�K�q�)�+�a'?m��-��bM��=��9�
9ITp�d��]���V�����o�k����aI�3?q^u��|��裡D�hly008�geE@$�;#��]V(N������gW���C�S���_$`�7y�)ŔX^�/�
:�
V3+2훘���Cz�e�>�G�J�^'Z%�Pv<�p��sд.�+eY�e�H�J<Ef���%d�	�
��x1&�f�@*J8VvX��	�Hi`�<�&0���8E8�>�x�l�s���ubt'������
-+�:6{Bm��0��K�!-5ɢ+FU�,�]�b� ��k�T{�����q4��i��L�8�{�����������y
-+���s�U�Tg�s�t�Gz(̄i~X�(1�r�_JL��Ϟ���-�\!��J�����ɼpR���"[vj'=:()�9�u�M�Y�H<��!?:�O،��N����7�����N^���{5������6b��K�b�h(�
-+����T~��K]���bR�m[�'�2��Dt�,���+�=�IyC˳�`��?q"}/^���HkL2�.[���"(n��qň!����-v��8����0+
�Q��4.�Le��K^����G��4����Ͻ����*�Z�ga[�_:0?4���%��7�!�l��զ'�{%=�45{�~͑޾�	I�H��U~�o�he�����O��g�z��\��mAW��ȃ���y�H�))�wy����3��0�؏t+�c�`5����J!��M�jS�E[�}�����"�<\::a�g�h
=r⬣s��zȐ		>ɦѺs���.��ɡ�ʨu�z"4'��߂�����%`��O
�V�6��6_��--{�M��w�g�v,�w��)z���j�^/.F�?l�fti��٠]n<@m����(3�b�B
{�OбS>N��)�H^��A��·]����"/p6�1
��!���v��f��+���q��$���
/��/�8��D���/�ӾA+n�̪Y�ZR��V���~����z� �a�6��������

���t�
Z���S]w�� ��$ծ����@<��]ІN�a(v³��!�F��MF�+md������d���eĎ>f�B	u
=��P8����i�q���<l~l�ba�姝
��=C���7Df�����JV��H�]����]w�� y`���l2��F[���Z��.�����86��
-+ +���B������Lɂ��!h#[�7�Ff*�[T[HVf5Q�
N��H���ް��jpc���n�E_��\t�
Kd�5��_��d��AMB�O�����dKI�ˀ�S�FI>F��\A7p��c�G�*e����׌���x�X��������j�5Qk�'#�,�;��ȵl� �t�&�K��
-+S,R�U�t��ӡ��cz=�/����q��L
Z�{[�c�
�8��]y}����c��$O��<���F

$
}l�Ύ��8���	fDG.��+�l�B^����#y���Kh{%X�~}Q)�H�+�ltm���m
~]� U���@J��9.H�)'r���Y$�B�u~`Xx\y%HQ�(�?��0aV�SD�B6���V�qv���+=�U�Gȗ�/��:M˞�QG�Y֣p�Jk�d+�iQ�XY\ٹ�e
-+����rA����TcMbI�� 1)* ��ɤ�ľ��;�b2���)��n�)�Mu���b�3�I�n;)L�MӀ>n�d�eb���"
��1��XG�A������
>8�'����3�l���/�^�a�Yd�eX��u��
-+G���j�|�Ym4W�?
-+�c@�h��=S+�8�V�**ԡ����	�^�������S��껚�{�}T/�����hԕ�z]{�g5
F?���߈9b�x&�<g��$���')'�+R��|'OF�����?�G~xǝ�n��z���ҷ�n���'��f�}7J廎t�x����}�a�T��x4�}�xS��Ɣ�n\?�k�%
-+ʹ�\W�S7��g���e�Nokf�
��O�_^:��N���԰�S��d&����`����¢<�����_��Y�f��a5EX��Z`џh�O{��P
-+�g�>�")Ms���r�8�Ai1���bEU�2�H�e��r74��p-'C$�ϲ�9j�>�[Hџ:�ܥ%D�bP�me4V�G�2 -���tTG-^\}��HN�&N�����TϽ�b��.��x���1�׽�ӟ��͘�ƁMh��N��``�٘��*0�Gvc�}5TT,���+�����3u�߲eS�c}=;�(!”q�5W�;n�]�L�D�IBU�ã��?����@�	���$t�E,��Ȉ�E�&�,�"�+�:�1S�03	
-+��ˈ�p�J��똳
-+�7��F�w5#�z�B�q�����;���p*y����uv5K/�p�C�,�j�g�
m�	�a�@�q%}I��ho&+W6�q
z�E7\�
-+�++�c,$�C'�$HF*��K�Z�W��M3fQ]|��v"��링 =���U�
-+��>L�A
�q�+J&�1L�m\�""Rhg%�+?��j�&�KU�?س�ڢ
Y�.Ya�t�W��B��a�s9{B1�-��-�>>�# 
-+���)r��IՎ�X��.=�w@�z8U���%�G�:�1�G}1*$yE.�Ь�=�/��E��r��(s�O�,�ƧѠ�VW�����#�t�/��=�c�ϸ�@,Գ��!�%���ZI���K��7օ
d�M�jS�2��J��D�r��
-+{���J̓��9�K�ٿ�ߤ{GT��.jm��]J���7>���4Ȗ��؇@��S�/��2�@)&>k*� �	qTJ�D�ۣ2�V�_*���ų�
؆��!i�o�†���BE3K?������9H|�c�Uu����̬�h�/>�5N�L=�>R�
@H�t\����DM����A���|�����h@=�sfE ٢
'�;괝�y񑍊L����$}fۉ�g!~W���Nt@Ǿ؋-
-+j�ao����W��
�1c0�ͱx������އV̵n���V�N<yy�T���{'�r�UF�b'u�������‰c�R�p(��G8�!��Ǜ��#�&!M�И�
�8y��W����EDn7r9�K}�w�kQ!���#�L��]�vm��t�%�m/Z�fM�d�ڹE�2��}Tv���j!uP�,��V�>�#�
��g�,y!���)/ϰ��;�+at���yw�/~���wT�������5�N��쎆o^l-���D%[@�
-+�h��Y3�O���3[�Ag+��� �S�<�z��7�5���Jǀ��p���D-A��~B��B�����D���)T,JJ���'�W�{�n���a���$���~�Zn�C3���O\ri]
h�?l+�؈I���u>�-��!߾J��U��5�����E"�N��3i�ep�3�v"�>V���+��h�[�ɣ賓�$��<bևI�e����2���w��S�)�$X\*�݊��	�Q�K����K��c��8��ƙ(�d@k]ʯ��*�p���ߟ�A���l|4�v��@O�o���	o&�p���m�{�J�`��>����f�ǭ����@D��ai\� ��#D�۸����ox���k��]}�O��Si�����?�?�wBqȩm��4xt��F��R�lJ{����
?��6�)�J��נ�N����}����}�"t5�Į�l��T�/�P��6�

��v�Xy��8sA:�8+��`���"�<
��uc��sew�9��v����֬�Ī�t�2U1G��B��\lE�����u܋��WY7Yt܋��+ dx���x�+�M��Cg���P�,{�+�Ϡ�U����(v7"jL�U���+Ec��G��ӲSW�W�j�f�q6��V#	0���#��ہv1���^j�P�ĄȰN$��@�bo5�н�rL���ט��[��ڎN"/8�
��ȶ�x�l'�;�9�)s`�L����-�YA�X�J�VH��^�'B�r-�v�e�U�]zi�^���f��	�MS�����)���uY	fc�\� l'�6�={���lE����@��'��&'�h�fI,)��P���}��۷���+8e����Y
-+;��)3�1
-+��bJ[m�v~x*�i�+L<d�d>�
-+m�$~�n�Fk��(6�r�
E�l������/�b?����%;y��o��/�O{
A1q�-��`0�[��ɯS8t�_��~��a$~#�j�?�BX�O}�n$lA�������.mmC�L���4#+N��"
�fA��I�>�8W��,$;�x�9�Y"�dg������z묓�8�\ZJI���'-?�:W_�q$�P��I�d��mw�!�n�J�NAy�|d
�G`ц�d�;�NЗ,A��������QC�����Pl�>�x��A�
���gȑK�}:�|����P�H�wx@i�ȂA)y�+���e����m6䚟x����/(Y
-+m�~��g��C�5��&6b����(L��<I�]Q!D��K����@�&!������"#�`S��ȹlz!�}�=��@lo<�È�
.�r��L�p+l�%A˹+���#(!8@o�X_!��+���}]@��s;!�Q^+|Vf s�4p�'P�+lCp�l�Cd��(J��yS%J��&�!��\%�I<�,
�.2��Q�)��	,)(����~:m����
��F��/��(Gܴi3�.�+�jp]�/��b�	?��ӫO\|���`$>v�|�z]?/��L-t
6�:W�LơH�E�����&!�+$�}��ܖ4 �'(~���U
�ȡS�8�(����װ�m�.&!�����Q��4Y˭����w����På#내��[��:d+��B���!W1m����U����i�i�'ݧ�����w���?��M[�ҪCy�� �b
�p�uJ
.�^	GA�Sy4b
-+�sB8��y
�ļ�*��(�V�!D��`�O\+J�L��z`��m4
-+����!W����O���+��H�1�S�_���J}�\d����B�E
-+_��?�&�Z��S�����f�f�	̉����|�+˫���+Zz9.
��z���~�:F��IP�I�<�}T�{�ƨ�2L�B[̐�<��Ф��=�D����(�e_��P��G���+��Q����@���U�r��"���:^�q�EA�H6Mu��ne��m+B�:C�_̳�h�3+$��q��5A�H6��6�B-5_���N�b-÷�>��|�Ń(��p�@�3���=�x�~'���9g�`:�
r�$^
�
-+�ƣ��YM9
���S�Ez��
�h�PdH��D���s檰��ۋ�r���r�p���Q�y��|�w�/����t�L�L��F*��@�ڷ�Smқ�����<�L�{�n�F������^m~te�z��A���_/l0e�m)�����ɳoԆ
�	�!F��l����2���:m��OO�9��2�f"BI!;bW(�u��Y�p)O����Y�Q�T�gp�% vi�E��2��ό-�!����a��.�b�I	�8y�fr�i��[��׺gkN����#��*�c�6MK|!�
 q ی|�rѕ?��Ң�4�2V%>�p�vT�O��0+=Nġ���-�)���"�)��V-@
n�\/��f��n���Z5��`�h�����8�\?��5"/hT���������M#���N_��Tb�J�}.��$���=zܨ���1�VCw'}\��d��xB�̃�B�:8��+�����@�����sEO�T�+]	���o�e�"�A�%q�5Jc�`D�3�]��ESq�
-+	-@
߭N�+g4�X�$��{�ԉ�bu�9Z�g�:�����Z$l�'r6�_i�������.�~�?}�Z���_#b��7���j�^J��9�&��>���d�wXⓜ�����5�s��}F�v���!d9��Q�G[1(��3?A�����#;��ED#��^L��F�5���J���rdW��}D E�L�����؜���o.�2�Z�:AR��M�u*�az��:/�o�D��Tq@���P��B�f���� �	ב�}�h�rT��R�k�
-+�{�p�=�2+P�rX1aҀ�̧�Mқ�W���9^�%�Ҩ���%�V�����_�zu�~-�c�j��	Zrl��H[�A#4�5�qQ�b�\@�ܔ���!1�/#���l*Z���sw�@��ԟ�U��
-+����N�}��0H�()0��\� 9vB��<� 8C`��j@�0����"��m�� �3H�[��z�2	;�(
-+C$F�+��"���\�}	��0�H&��p�k�+� 6��wm}#�J%���gժUZIzۚ)S�,J�����&B�"e��
38�~��$�M)*G���E]$� 
�KN7j��
-+�W�ч�J�Y|��n���W�����5�]rLu���w��c��t�ywǮj�/_%�ʒ\[�6�#c�|��N�ɑK#�(,?�L���~Zm�}sJ�,����كj���g���Z�h�n
�U[���V�@L-���	ڬ�Π/�fC�Bo�M�AD��+Ԗh�x(�Q6�ǫ�z�I�S�G΁�uG�<���E�D��J=��=I==�IT|�i��<ۥ��Ў�F�PͲ���\qj5W���]{�-{���S�����xY�r�N��b��iӋ���Gqdt)�)�Y#�������@.	���!|ĉ_&a5an�`�������3g�,KT;�9zeſ�W��l4���f��j@^�P>�Ԙ�A
��2A�Lf�����u^yuMOy�Ê6��[_�T|Eg�%�Us���6�u�P4��"�Fj]u!�2[�#B&M�\�)�:��ڴA�ZQ��痂��}N�*ޯ�,^XM�YP_��ƂZl��XD�`lx��A��]�^�Tv�g�|��1X4�v���ub�s.�8�5�bUS�b EN�޶o����ԡ��Ln��f/Ѿq��j�W�.M����[�V�ּ����܋��ͩ��vf�I�������0(h
-+�
-+:���K\GtR;F�5���}�Ց��z���ַ�u�r6jc�0��"p�I:�
+�7~�N�~m[�N��U	��n���6�$u
�x��k{��N;��^|�e}������Iv� �c��k�n	~��K��c�T�*���~��\ɮc�M[�NY�C���n����a���#�!��X�-�QZ+A�~�x�}�}_�n��+�x)|�f��"#+|u���<t����}/g:�\&N�P�׫ʬc8I��{8;����-$cd�
bQ�|��5�v ��c�&T
c���V|n,����s�c,+���U��@*�ѩm�~
-+ݤ
�;Z|�ˋ�V��&4d����
̙�Z;j��j�^b"^�
����!($A�#��Ѓ /UR�8�OB�9jo5o��{��O��F��D�+M���􊙙�� �u���p��E��Ԍ5���D(?�++����Ez�yk������9�S�'�λ��Գ���Y�m�Z������'M�s�O�֨��(�G�ݼb��+��<q ۍ7�����zJ��g
f�f�Gi*!�����RI�}�[��r��IN�Raۡy8�`IL`g��ҒI�6��,f]Bba��)KXԱ>>��T(*�ӦM�,��,
-+B!�&hR�'.�	v�J�����Gh�9L�+�N莅(��Ӵc�e����������i�ZhUW�\u�o�뗈��-�@�%ɯ�Ŧo~�_uk�u}]��j��1,��o�c��zh�pct��‘�D�7�!��1�_��5�(�+�48�[F(aQ42p(@[r*� ^TX�f�e`�9uā=�غ�Ř�]��%�q�&t%C��Q���>Z�y��l���ʑRݒŋ�z�nJ��{���N*݂�������#���e�	�}��V��_�E�I�r�A��(��pͨp�~�j���?s}5K��ʪՃ�
-+|GݭZ��o���;~o�E~O�,:�1X��s3���i��YT+�+�;Ta����GŃ����+Yț2y�s�D-k�۷GW/�8KdN�1[��
-+�\�n�#.��(PT`�-a?��	0�SX�����(�w �w���{]��K�R���y����'w��K���"JD����
@'�}5'��e˖}
�`^IӴL�d�δ]��%����&�+�J��"fQ��t�Z3��0�>
-+�[��5s��1����85��
-+|���I7��Q�?Y��f�R��
�)r]��Ŋ
-+,���Z����t���.3��Z��کEJS�;tX��G�+��T>����EGk����}��Ӱ��^l�v��\�����)�O�}��j�:N�<Ek��mɘj���f�6�r�
5.�l)����5�mz��{���$���as]d��n�����2���8�k.�&i�� ��M�,;V6���\5��NJ�9�\�����!�3�\{�� �^��Rٕym|���ڵe��q�E�9���K:�]O��k+�z�q�]x���rl��Ty���D�e"/��4�3�� )+HJچ?�l}�ߢءW�v�i��|պ��F�UT'�~��xit���ː�O?�a�������
���/�g��K��vӘ�߼�D]�s�i�!���2�u��ꪗ�-z��׿�tu
-+���Aa��ij4�32�Lg��a�nx<�'Qq�<�q�fM��b'6n�6j	�
�hJw�O�dHdp{g�哟���i�ᭈF�+|�#��&�F���fu•���ռ��l1�@����O}�S����>,2e���
-+�A�[
��CBG����w)���q�c�
�[��w�}��}��W2=3jr��g
�������+<({ˇ0x��;n�ֿW�miSG5#�Y�_X-׌�&���8TF����*68���{��3���c/�>��/Vvu~3�G�AR�M8?+��� ��
��!�DE��Z�k�2l��C�߶��û��o��Ӣc��.��:�P�/>C�80RW^W_�%�~`�L]��~�����^���ꫯ�;Q��v�/��~�
��D���p@��=��󯂸{���ƫ�;JcGVD�l���"-H�
,r�~`�;<I
�S�t;0y�4-ȱI�=�eg��u&[|�q���}�Z|�q�
�L�l�r�`r�f�1�Pr�.�I3Άg-?����+
.妓�Q�nRoi�c�б�
-+온����Nת�'h�N�S��١��>35.��	jHÕU��зۄ����3Sqg�~��ʫ�PQ?9W[u��.�vt�~�8Oӹ�8��2o�Wa���l��5�&k��U�]
�5��L�W�g]I_���n�m�SB?����?���=�4��#�?��$�+�R�����
N+A���o�����s�?�?Ғ<>(���@bd�%^0���+
+�(S)�t	���)Z��<�:�c�/�s�9���8�3U�3?�+�N���R��[;q��|)�b0 ����*&��gV�/zP3�x;���kٙL��&��9�Nx����~˫^�����6i��X_~X��w�T�qȄ�&�o�8X�OփT��p�>B_?C��8�fO�Z��p�lc@����qf�����
�B��}^-���v=�(���āN�P�鑩?R��#���m���>��:�럍��;
Y�� S���b�����E�ِ�ơ�a
-+���b�[��f)0R����eK�j͂�e9�R��������{��_��׿Q=���գO<�@��Z��O���
�F	�0�C��R�'T;u]K�mR���m�}]�~>**f4u/�s@��݈:d�p\
�<
��in����Gw��QI8;?0=�H�=��#��o7pwriK�c��K9�+?��ӫ),3�J����;��0/&���4;a�'Ѯ?���:�L]���L��-������;4����C�VͧH9	-����;��4�
�?Smy����Έu�ܞ��v���&}Dn��V���G@*&+'��=�
+y
?�ӆ��^3�+���i�@J�+Jh���!蔧}�����<�Y��0�8
-+i����ˎ���w�z��]m�L�@s��	�֗��Hm�uzg[�΄����e���i����3�W^}�y�+)/]vr��p�_� \i���z���?��_���S���ځIY����/}�Z��%�����(������
 ͡�r#/;��8��>��l��ˮPpH#�qrX5e�^���$K��du+��g�C5 $��
���Xӵ���*O[R���Jx�f��6WO�_[��F��|�+�+�-	ƪ<LD�ɝw֜YWc5q��o�z���XԄ��m+Pv��, �������΄��`����3�mrpRB��l��2�k��0�[;`�m@dA��~����ްZΖ�^��9L�?񘣽H�^���i\'�
-+�4)�ZH��#Z_o��	����~�h�c���')���Ϭ��H�`!�
�m}���zS�+�P�Ƒ���nnid��Y�q�����
C�
O�k�@��!��O�{�	�+k%��hƊSN��ꜥO����;+��t�_�G��)+O�~������!v���'m�ٍIWT����������;L.;�ԫo���:�����Q�t���7\�p�t��Q,4������%��o��~��{��+=��{���b�Nȓ�������
�=��K�H?Δ
:�I��cU�v�"���>��s5L��gJ��o�했m=w
��Ѐ�!c�@Rz��4Ѹ����F)㋪����"��>����5��#3|M��������i��?Q߿�s�|G��r�kv`�-llۑxĖI=�^z���4��H�-e�{���TL��p��|��z���<�%��MX�7��kQܯ�[���( ?;=�O��7~���+��Sk7�٘g+��G���Бbf
-+y��h t��6i0��+=y{�Gn3Xp���^��
�]�6�e#)R�!c���L�|�q��Ügy�D}s��G��|N��~��=tr~V<��OT�]~Eu�)�V�g����dF�����DJX���?#��8q������v}$�79�}��_���>y׿������3��>�ԍ�G�}l��
-+p[�BK>������H�w���Nя�<��(\K���d�$��A�쇣�7����Ǯ����ݾ^}�_~׿^�:3�ז8�2 ������3��}��n7��P�Gy�&=ܾE4L�����ĥ�L�~�	�9+I��ml�B)��7P^G|�J�{�,?��s��@{[��K��{gcWu��
-+l����C<0ARGj!B�@J�tDw$�� ���D�R����nAaJ:�J(�&RC���0����v�y�UN��>翵��ֹ�\vMgU���{���u����O�F���bT���wh����IC/Ll[����w�'�
�nx>��������|+��jc�V.|N�(L��
-+c$�
-+e�{<�Qv~�6��
-+��2�̥�$u����X!O��sy�����\����e�������n��̄��=&��
��d�wӦMϟ?ۅ^�9m+I������~&��L=PY�L���%���4�X$��
��~�>��<�_���r�_6��&�
�!���4�ʩ�!�ԣ��
-+�l4����7�lYZ*'0�����A9�K�h�Ɇ��[�#�S]������wZa/��2���L�G?3Wr��.*VF�+�8t�%x���{�k���_��}���}�χ
��{�oMwy��+Z6�i���2�z<)�exAE����J�ˤ	*=�@s?�x�F�����S�������Z)�ڧ=�Ǿ���9�m۶�^�֕*.�E�{`��
��
-+ګ;.���+���i:$��{�齆G9��؊��ioQnkˉW��*���v*V�6S��`��V�=��~�g�#���X�u�7p�^�q����&�y��W��k_���u���T�����V��M�H�Ld=�h�e�fY������?�}�ƍt��2"�2�F%�2|ᑡ
^.�ۆ�w�m2�+I_?��!�r+B�3̓v�Y����^���ģ��vk�i���_(�J�gɿN���.�u�]�w�^I�u'�z��#��K="�����	?F�
sݶ+�44!�����c���P_��^��zv n�V!&}I�u^��A^.�/�ښ#<�+
-+O�̙K`�1�
-+N1�p���S9?(;�@��2-�$f�$B
-+)�(y���H��n8����X
-+�����m�9I��P�?�����.D��R�5���;���o�
�y�W~��^�û9
eM.����3?
,Ӟ������v��|�[�/�F�|A-1�|��s#�<LT`���+@�2|P_$�\uX@KҌ-MZn!�=?W/K���
���@G�v�.قC�Er�_��%��T�~�����(mT׾9:��zh~[�>"<�s��7���믳�߬`�Wq������>-
�G$C�<�!�ޱc��}����y睷_wn��!A��!x�I��K��u��)����
�*J�4��P��j�u�A���WaN�R�#�z�ˊ���B�\gQ�e>ؒR�h��/d�~QοǪ���g���g醞9���.;m����%
������7�abݒ�{~+��*��V[���1¤��/�M�ܶ����|�����	��h�#�^�%�G�:�J�?��O����%?��ys�A���Iw+��_�]��Fv+���I���)ݢ�bS�
TW�-�.92��S���k��_�
�iJ����y����P͏�����O>��d���+��*܌��|<����������O�6�����#G���$�z��1��� U��t�b��{/��G��+V\{��	�׭[�9.#z���6�D��m��
��;Z��|����i��^{�?�㯛~��_m��'�2N���|;�G�{oo.�3�<�g^�;{챰#+N˹�Yw�ʟ.gp��W_��+�X���y:y�V+�[+�
]�y����U��H���ϕ#����}
-+m��ի���yzzq��W�/1O_HZ���<�w81����������Y�!œ�s���=����G�~���+��v�6mڴ[/����A8O�9�f F��<��u�v�,�
��^�I�P�#�q3H�`٠'n�ஊ�iy9��Ʃ�;q�!��z �yn�X�@�
-\ No newline at end of file
-added in remote
-  their  100644 d35e16d082e6dcaf15a9b58126f2770d5274bd70 electron/browser/resources/win/resource.h
-@@ -0,0 +1,15 @@
-+//{{NO_DEPENDENCIES}}
-+// Microsoft Visual C++ generated include file.
-+
-+#define IDR_MAINFRAME 1
-+
-+// Next default values for new objects
-+//
-+#ifdef APSTUDIO_INVOKED
-+#ifndef APSTUDIO_READONLY_SYMBOLS
-+#define _APS_NEXT_RESOURCE_VALUE        101
-+#define _APS_NEXT_COMMAND_VALUE         40001
-+#define _APS_NEXT_CONTROL_VALUE         1001
-+#define _APS_NEXT_SYMED_VALUE           101
-+#endif
-+#endif
-added in remote
-  their  100644 fda3f10fa6cb481d4d2909d145737a9cd27c2027 electron/browser/ui/accelerator_util.cc
-@@ -0,0 +1,100 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/ui/accelerator_util.h"
-+
-+#include <stdio.h>
-+
-+#include <string>
-+#include <vector>
-+
-+#include "electron/common/keyboard_util.h"
-+#include "base/stl_util.h"
-+#include "base/strings/string_number_conversions.h"
-+#include "base/strings/string_split.h"
-+#include "base/strings/string_util.h"
-+#include "ui/base/models/simple_menu_model.h"
-+
-+namespace accelerator_util {
-+
-+bool StringToAccelerator(const std::string& shortcut,
-+                         ui::Accelerator* accelerator) {
-+  if (!base::IsStringASCII(shortcut)) {
-+    LOG(ERROR) << "The accelerator string can only contain ASCII characters";
-+    return false;
-+  }
-+
-+  std::vector<std::string> tokens = base::SplitString(
-+     shortcut, "+", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
-+
-+  // Now, parse it into an accelerator.
-+  int modifiers = ui::EF_NONE;
-+  ui::KeyboardCode key = ui::VKEY_UNKNOWN;
-+  for (size_t i = 0; i < tokens.size(); i++) {
-+    bool shifted = false;
-+    ui::KeyboardCode code = electron::KeyboardCodeFromStr(tokens[i], &shifted);
-+    if (shifted)
-+      modifiers |= ui::EF_SHIFT_DOWN;
-+    switch (code) {
-+      // The token can be a modifier.
-+      case ui::VKEY_SHIFT:
-+        modifiers |= ui::EF_SHIFT_DOWN;
-+        break;
-+      case ui::VKEY_CONTROL:
-+        modifiers |= ui::EF_CONTROL_DOWN;
-+        break;
-+      case ui::VKEY_MENU:
-+        modifiers |= ui::EF_ALT_DOWN;
-+        break;
-+      case ui::VKEY_COMMAND:
-+        modifiers |= ui::EF_COMMAND_DOWN;
-+        break;
-+      case ui::VKEY_ALTGR:
-+        modifiers |= ui::EF_ALTGR_DOWN;
-+        break;
-+      // Or it is a normal key.
-+      default:
-+        key = code;
-+    }
-+  }
-+
-+  if (key == ui::VKEY_UNKNOWN) {
-+    LOG(WARNING) << shortcut << " doesn't contain a valid key";
-+    return false;
-+  }
-+
-+  *accelerator = ui::Accelerator(key, modifiers);
-+  SetPlatformAccelerator(accelerator);
-+  return true;
-+}
-+
-+void GenerateAcceleratorTable(AcceleratorTable* table, ui::MenuModel* model) {
-+  int count = model->GetItemCount();
-+  for (int i = 0; i < count; ++i) {
-+    ui::MenuModel::ItemType type = model->GetTypeAt(i);
-+    if (type == ui::MenuModel::TYPE_SUBMENU) {
-+      ui::MenuModel* submodel = model->GetSubmenuModelAt(i);
-+      GenerateAcceleratorTable(table, submodel);
-+    } else {
-+      ui::Accelerator accelerator;
-+      if (model->GetAcceleratorAt(i, &accelerator)) {
-+        MenuItem item = { i, model };
-+        (*table)[accelerator] = item;
-+      }
-+    }
-+  }
-+}
-+
-+bool TriggerAcceleratorTableCommand(AcceleratorTable* table,
-+                                    const ui::Accelerator& accelerator) {
-+  if (ContainsKey(*table, accelerator)) {
-+    const accelerator_util::MenuItem& item = (*table)[accelerator];
-+    item.model->ActivatedAt(item.position);
-+    return true;
-+  } else {
-+    return false;
-+  }
-+}
-+
-+}  // namespace accelerator_util
-added in remote
-  their  100644 8f9ff638dae03e61d762a31715c01d317a1c0498 electron/browser/ui/accelerator_util.h
-@@ -0,0 +1,38 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_UI_ACCELERATOR_UTIL_H_
-+#define ELECTRON_BROWSER_UI_ACCELERATOR_UTIL_H_
-+
-+#include <map>
-+#include <string>
-+
-+#include "ui/base/accelerators/accelerator.h"
-+
-+namespace ui {
-+class MenuModel;
-+}
-+
-+namespace accelerator_util {
-+
-+typedef struct { int position; ui::MenuModel* model; } MenuItem;
-+typedef std::map<ui::Accelerator, MenuItem> AcceleratorTable;
-+
-+// Parse a string as an accelerator.
-+bool StringToAccelerator(const std::string& description,
-+                         ui::Accelerator* accelerator);
-+
-+// Set platform accelerator for the Accelerator.
-+void SetPlatformAccelerator(ui::Accelerator* accelerator);
-+
-+// Generate a table that contains memu model's accelerators and command ids.
-+void GenerateAcceleratorTable(AcceleratorTable* table, ui::MenuModel* model);
-+
-+// Trigger command from the accelerators table.
-+bool TriggerAcceleratorTableCommand(AcceleratorTable* table,
-+                                    const ui::Accelerator& accelerator);
-+
-+}  // namespace accelerator_util
-+
-+#endif  // ELECTRON_BROWSER_UI_ACCELERATOR_UTIL_H_
-added in remote
-  their  100644 5f97c127bc59d7e1d1d0c7874d55d8fe517216ce electron/browser/ui/accelerator_util_mac.mm
-@@ -0,0 +1,34 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/ui/accelerator_util.h"
-+
-+#include "ui/base/accelerators/accelerator.h"
-+#import "ui/base/accelerators/platform_accelerator_cocoa.h"
-+#import "ui/events/keycodes/keyboard_code_conversion_mac.h"
-+
-+namespace accelerator_util {
-+
-+void SetPlatformAccelerator(ui::Accelerator* accelerator) {
-+  unichar character;
-+  unichar characterIgnoringModifiers;
-+  ui::MacKeyCodeForWindowsKeyCode(accelerator->key_code(),
-+                                  0,
-+                                  &character,
-+                                  &characterIgnoringModifiers);
-+  NSString* characters =
-+      [[[NSString alloc] initWithCharacters:&character length:1] autorelease];
-+
-+  NSUInteger modifiers =
-+      (accelerator->IsCtrlDown() ? NSControlKeyMask : 0) |
-+      (accelerator->IsCmdDown() ? NSCommandKeyMask : 0) |
-+      (accelerator->IsAltDown() ? NSAlternateKeyMask : 0) |
-+      (accelerator->IsShiftDown() ? NSShiftKeyMask : 0);
-+
-+  scoped_ptr<ui::PlatformAccelerator> platform_accelerator(
-+      new ui::PlatformAcceleratorCocoa(characters, modifiers));
-+  accelerator->set_platform_accelerator(std::move(platform_accelerator));
-+}
-+
-+}  // namespace accelerator_util
-added in remote
-  their  100644 7336cbf7a046880e7f590dc7830b66d93708917b electron/browser/ui/accelerator_util_views.cc
-@@ -0,0 +1,14 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/ui/accelerator_util.h"
-+
-+#include "ui/base/accelerators/accelerator.h"
-+
-+namespace accelerator_util {
-+
-+void SetPlatformAccelerator(ui::Accelerator* accelerator) {
-+}
-+
-+}  // namespace accelerator_util
-added in remote
-  their  100644 a339bf14dedcbb54455329cd092f47a13149ffe3 electron/browser/ui/cocoa/electron_menu_controller.h
-@@ -0,0 +1,62 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_UI_COCOA_ELECTRON_MENU_CONTROLLER_H_
-+#define ELECTRON_BROWSER_UI_COCOA_ELECTRON_MENU_CONTROLLER_H_
-+
-+#import <Cocoa/Cocoa.h>
-+
-+#include "base/mac/scoped_nsobject.h"
-+#include "base/strings/string16.h"
-+
-+namespace ui {
-+class MenuModel;
-+}
-+
-+// A controller for the cross-platform menu model. The menu that's created
-+// has the tag and represented object set for each menu item. The object is a
-+// NSValue holding a pointer to the model for that level of the menu (to
-+// allow for hierarchical menus). The tag is the index into that model for
-+// that particular item. It is important that the model outlives this object
-+// as it only maintains weak references.
-+@interface ElectronMenuController : NSObject<NSMenuDelegate> {
-+ @protected
-+  ui::MenuModel* model_;  // weak
-+  base::scoped_nsobject<NSMenu> menu_;
-+  BOOL isMenuOpen_;
-+}
-+
-+@property(nonatomic, assign) ui::MenuModel* model;
-+
-+// NIB-based initializer. This does not create a menu. Clients can set the
-+// properties of the object and the menu will be created upon the first call to
-+// |-menu|. Note that the menu will be immutable after creation.
-+- (id)init;
-+
-+// Builds a NSMenu from the pre-built model (must not be nil). Changes made
-+// to the contents of the model after calling this will not be noticed.
-+- (id)initWithModel:(ui::MenuModel*)model;
-+
-+// Populate current NSMenu with |model|.
-+- (void)populateWithModel:(ui::MenuModel*)model;
-+
-+// Programmatically close the constructed menu.
-+- (void)cancel;
-+
-+// Access to the constructed menu if the complex initializer was used. If the
-+// default initializer was used, then this will create the menu on first call.
-+- (NSMenu*)menu;
-+
-+// Whether the menu is currently open.
-+- (BOOL)isMenuOpen;
-+
-+// NSMenuDelegate methods this class implements. Subclasses should call super
-+// if extending the behavior.
-+- (void)menuWillOpen:(NSMenu*)menu;
-+- (void)menuDidClose:(NSMenu*)menu;
-+
-+@end
-+
-+#endif  // ELECTRON_BROWSER_UI_COCOA_ELECTRON_MENU_CONTROLLER_H_
-added in remote
-  their  100644 eb3578dd4b2728cbb20aa7e531620f7bed9f0625 electron/browser/ui/cocoa/electron_menu_controller.mm
-@@ -0,0 +1,273 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#import "electron/browser/ui/cocoa/electron_menu_controller.h"
-+
-+#include "electron/browser/ui/electron_menu_model.h"
-+#include "base/logging.h"
-+#include "base/strings/sys_string_conversions.h"
-+#include "base/strings/utf_string_conversions.h"
-+#include "ui/base/accelerators/accelerator.h"
-+#include "ui/base/accelerators/platform_accelerator_cocoa.h"
-+#include "ui/base/l10n/l10n_util_mac.h"
-+#include "ui/events/cocoa/cocoa_event_utils.h"
-+#include "ui/gfx/image/image.h"
-+
-+namespace {
-+
-+struct Role {
-+  SEL selector;
-+  const char* role;
-+};
-+Role kRolesMap[] = {
-+  { @selector(orderFrontStandardAboutPanel:), "about" },
-+  { @selector(hide:), "hide" },
-+  { @selector(hideOtherApplications:), "hideothers" },
-+  { @selector(unhideAllApplications:), "unhide" },
-+  { @selector(arrangeInFront:), "front" },
-+  { @selector(undo:), "undo" },
-+  { @selector(redo:), "redo" },
-+  { @selector(cut:), "cut" },
-+  { @selector(copy:), "copy" },
-+  { @selector(paste:), "paste" },
-+  { @selector(delete:), "delete" },
-+  { @selector(pasteAndMatchStyle:), "paste-and-match-style" },
-+  { @selector(selectAll:), "selectall" },
-+  { @selector(performMiniaturize:), "minimize" },
-+  { @selector(performClose:), "close" },
-+  { @selector(performZoom:), "zoom" },
-+};
-+
-+}  // namespace
-+
-+@implementation ElectronMenuController
-+
-+@synthesize model = model_;
-+
-+- (id)init {
-+  if ((self = [super init]))
-+    [self menu];
-+  return self;
-+}
-+
-+- (id)initWithModel:(ui::MenuModel*)model {
-+  if ((self = [super init])) {
-+    model_ = model;
-+    [self menu];
-+  }
-+  return self;
-+}
-+
-+- (void)dealloc {
-+  [menu_ setDelegate:nil];
-+
-+  // Close the menu if it is still open. This could happen if a tab gets closed
-+  // while its context menu is still open.
-+  [self cancel];
-+
-+  model_ = NULL;
-+  [super dealloc];
-+}
-+
-+- (void)populateWithModel:(ui::MenuModel*)model {
-+  if (!menu_)
-+    return;
-+
-+  model_ = model;
-+  [menu_ removeAllItems];
-+
-+  const int count = model->GetItemCount();
-+  for (int index = 0; index < count; index++) {
-+    if (model->GetTypeAt(index) == ui::MenuModel::TYPE_SEPARATOR)
-+      [self addSeparatorToMenu:menu_ atIndex:index];
-+    else
-+      [self addItemToMenu:menu_ atIndex:index fromModel:model];
-+  }
-+}
-+
-+- (void)cancel {
-+  if (isMenuOpen_) {
-+    [menu_ cancelTracking];
-+    model_->MenuClosed();
-+    isMenuOpen_ = NO;
-+  }
-+}
-+
-+// Creates a NSMenu from the given model. If the model has submenus, this can
-+// be invoked recursively.
-+- (NSMenu*)menuFromModel:(ui::MenuModel*)model {
-+  NSMenu* menu = [[[NSMenu alloc] initWithTitle:@""] autorelease];
-+
-+  const int count = model->GetItemCount();
-+  for (int index = 0; index < count; index++) {
-+    if (model->GetTypeAt(index) == ui::MenuModel::TYPE_SEPARATOR)
-+      [self addSeparatorToMenu:menu atIndex:index];
-+    else
-+      [self addItemToMenu:menu atIndex:index fromModel:model];
-+  }
-+
-+  return menu;
-+}
-+
-+// Adds a separator item at the given index. As the separator doesn't need
-+// anything from the model, this method doesn't need the model index as the
-+// other method below does.
-+- (void)addSeparatorToMenu:(NSMenu*)menu
-+                   atIndex:(int)index {
-+  NSMenuItem* separator = [NSMenuItem separatorItem];
-+  [menu insertItem:separator atIndex:index];
-+}
-+
-+// Adds an item or a hierarchical menu to the item at the |index|,
-+// associated with the entry in the model identified by |modelIndex|.
-+- (void)addItemToMenu:(NSMenu*)menu
-+              atIndex:(NSInteger)index
-+            fromModel:(ui::MenuModel*)ui_model {
-+  electron::ElectronMenuModel* model = static_cast<electron::ElectronMenuModel*>(ui_model);
-+
-+  base::string16 label16 = model->GetLabelAt(index);
-+  NSString* label = l10n_util::FixUpWindowsStyleLabel(label16);
-+  base::scoped_nsobject<NSMenuItem> item(
-+      [[NSMenuItem alloc] initWithTitle:label
-+                                 action:@selector(itemSelected:)
-+                          keyEquivalent:@""]);
-+
-+  // If the menu item has an icon, set it.
-+  gfx::Image icon;
-+  if (model->GetIconAt(index, &icon) && !icon.IsEmpty())
-+    [item setImage:icon.ToNSImage()];
-+
-+  ui::MenuModel::ItemType type = model->GetTypeAt(index);
-+  if (type == ui::MenuModel::TYPE_SUBMENU) {
-+    // Recursively build a submenu from the sub-model at this index.
-+    [item setTarget:nil];
-+    [item setAction:nil];
-+    ui::MenuModel* submenuModel = model->GetSubmenuModelAt(index);
-+    NSMenu* submenu = [self menuFromModel:submenuModel];
-+    [submenu setTitle:[item title]];
-+    [item setSubmenu:submenu];
-+
-+    // Set submenu's role.
-+    base::string16 role = model->GetRoleAt(index);
-+    if (role == base::ASCIIToUTF16("window") && [submenu numberOfItems])
-+      [NSApp setWindowsMenu:submenu];
-+    else if (role == base::ASCIIToUTF16("help"))
-+      [NSApp setHelpMenu:submenu];
-+
-+    if (role == base::ASCIIToUTF16("services"))
-+      [NSApp setServicesMenu:submenu];
-+  } else {
-+    // The MenuModel works on indexes so we can't just set the command id as the
-+    // tag like we do in other menus. Also set the represented object to be
-+    // the model so hierarchical menus check the correct index in the correct
-+    // model. Setting the target to |self| allows this class to participate
-+    // in validation of the menu items.
-+    [item setTag:index];
-+    NSValue* modelObject = [NSValue valueWithPointer:model];
-+    [item setRepresentedObject:modelObject];  // Retains |modelObject|.
-+    ui::Accelerator accelerator;
-+    if (model->GetAcceleratorAt(index, &accelerator)) {
-+      const ui::PlatformAcceleratorCocoa* platformAccelerator =
-+          static_cast<const ui::PlatformAcceleratorCocoa*>(
-+              accelerator.platform_accelerator());
-+      if (platformAccelerator) {
-+        [item setKeyEquivalent:platformAccelerator->characters()];
-+        [item setKeyEquivalentModifierMask:
-+            platformAccelerator->modifier_mask()];
-+      }
-+    }
-+
-+    // Set menu item's role.
-+    base::string16 role = model->GetRoleAt(index);
-+    if (role.empty()) {
-+      [item setTarget:self];
-+    } else {
-+      for (const Role& pair : kRolesMap) {
-+        if (role == base::ASCIIToUTF16(pair.role)) {
-+          [item setAction:pair.selector];
-+          break;
-+        }
-+      }
-+    }
-+  }
-+  [menu insertItem:item atIndex:index];
-+}
-+
-+// Called before the menu is to be displayed to update the state (enabled,
-+// radio, etc) of each item in the menu. Also will update the title if
-+// the item is marked as "dynamic".
-+- (BOOL)validateUserInterfaceItem:(id<NSValidatedUserInterfaceItem>)item {
-+  SEL action = [item action];
-+  if (action != @selector(itemSelected:))
-+    return NO;
-+
-+  NSInteger modelIndex = [item tag];
-+  ui::MenuModel* model =
-+      static_cast<ui::MenuModel*>(
-+          [[(id)item representedObject] pointerValue]);
-+  DCHECK(model);
-+  if (model) {
-+    BOOL checked = model->IsItemCheckedAt(modelIndex);
-+    DCHECK([(id)item isKindOfClass:[NSMenuItem class]]);
-+    [(id)item setState:(checked ? NSOnState : NSOffState)];
-+    [(id)item setHidden:(!model->IsVisibleAt(modelIndex))];
-+    if (model->IsItemDynamicAt(modelIndex)) {
-+      // Update the label and the icon.
-+      NSString* label =
-+          l10n_util::FixUpWindowsStyleLabel(model->GetLabelAt(modelIndex));
-+      [(id)item setTitle:label];
-+
-+      gfx::Image icon;
-+      model->GetIconAt(modelIndex, &icon);
-+      [(id)item setImage:icon.IsEmpty() ? nil : icon.ToNSImage()];
-+    }
-+    return model->IsEnabledAt(modelIndex);
-+  }
-+  return NO;
-+}
-+
-+// Called when the user chooses a particular menu item. |sender| is the menu
-+// item chosen.
-+- (void)itemSelected:(id)sender {
-+  NSInteger modelIndex = [sender tag];
-+  ui::MenuModel* model =
-+      static_cast<ui::MenuModel*>(
-+          [[sender representedObject] pointerValue]);
-+  DCHECK(model);
-+  if (model) {
-+    NSEvent* event = [NSApp currentEvent];
-+    model->ActivatedAt(modelIndex,
-+                       ui::EventFlagsFromModifiers([event modifierFlags]));
-+  }
-+}
-+
-+- (NSMenu*)menu {
-+  if (menu_)
-+    return menu_.get();
-+
-+  menu_.reset([[NSMenu alloc] initWithTitle:@""]);
-+  [menu_ setDelegate:self];
-+  if (model_)
-+    [self populateWithModel:model_];
-+  return menu_.get();
-+}
-+
-+- (BOOL)isMenuOpen {
-+  return isMenuOpen_;
-+}
-+
-+- (void)menuWillOpen:(NSMenu*)menu {
-+  isMenuOpen_ = YES;
-+  model_->MenuWillShow();
-+}
-+
-+- (void)menuDidClose:(NSMenu*)menu {
-+  if (isMenuOpen_) {
-+    model_->MenuClosed();
-+    isMenuOpen_ = NO;
-+  }
-+}
-+
-+@end
-added in remote
-  their  100644 681fef1a11504d815d2d2a0311d9bbfc7598e612 electron/browser/ui/electron_menu_model.cc
-@@ -0,0 +1,35 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/ui/electron_menu_model.h"
-+
-+#include "base/stl_util.h"
-+
-+namespace electron {
-+
-+ElectronMenuModel::ElectronMenuModel(Delegate* delegate)
-+    : ui::SimpleMenuModel(delegate),
-+      delegate_(delegate) {
-+}
-+
-+ElectronMenuModel::~ElectronMenuModel() {
-+}
-+
-+void ElectronMenuModel::SetRole(int index, const base::string16& role) {
-+  roles_[index] = role;
-+}
-+
-+base::string16 ElectronMenuModel::GetRoleAt(int index) {
-+  if (ContainsKey(roles_, index))
-+    return roles_[index];
-+  else
-+    return base::string16();
-+}
-+
-+void ElectronMenuModel::MenuClosed() {
-+  ui::SimpleMenuModel::MenuClosed();
-+  FOR_EACH_OBSERVER(Observer, observers_, MenuClosed());
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 3c8bd467c3254a43b3be409d0849c29f156cf30f electron/browser/ui/electron_menu_model.h
-@@ -0,0 +1,53 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_UI_ELECTRON_MENU_MODEL_H_
-+#define ELECTRON_BROWSER_UI_ELECTRON_MENU_MODEL_H_
-+
-+#include <map>
-+
-+#include "base/observer_list.h"
-+#include "ui/base/models/simple_menu_model.h"
-+
-+namespace electron {
-+
-+class ElectronMenuModel : public ui::SimpleMenuModel {
-+ public:
-+  class Delegate : public ui::SimpleMenuModel::Delegate {
-+   public:
-+    virtual ~Delegate() {}
-+  };
-+
-+  class Observer {
-+   public:
-+    virtual ~Observer() {}
-+
-+    // Notifies the menu has been closed.
-+    virtual void MenuClosed() {}
-+  };
-+
-+  explicit ElectronMenuModel(Delegate* delegate);
-+  virtual ~ElectronMenuModel();
-+
-+  void AddObserver(Observer* obs) { observers_.AddObserver(obs); }
-+  void RemoveObserver(Observer* obs) { observers_.RemoveObserver(obs); }
-+
-+  void SetRole(int index, const base::string16& role);
-+  base::string16 GetRoleAt(int index);
-+
-+  // ui::SimpleMenuModel:
-+  void MenuClosed() override;
-+
-+ private:
-+  Delegate* delegate_;  // weak ref.
-+
-+  std::map<int, base::string16> roles_;
-+  base::ObserverList<Observer> observers_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(ElectronMenuModel);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_UI_ELECTRON_MENU_MODEL_H_
-added in remote
-  their  100644 6020d8c76ff0e089c52f2273d41672a5ae973f4b electron/browser/ui/file_dialog.h
-@@ -0,0 +1,66 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_UI_FILE_DIALOG_H_
-+#define ELECTRON_BROWSER_UI_FILE_DIALOG_H_
-+
-+#include <string>
-+#include <utility>
-+#include <vector>
-+
-+#include "base/callback_forward.h"
-+#include "base/files/file_path.h"
-+
-+namespace electron {
-+class NativeWindow;
-+}
-+
-+namespace file_dialog {
-+
-+// <description, extensions>
-+typedef std::pair<std::string, std::vector<std::string> > Filter;
-+typedef std::vector<Filter> Filters;
-+
-+enum FileDialogProperty {
-+  FILE_DIALOG_OPEN_FILE        = 1 << 0,
-+  FILE_DIALOG_OPEN_DIRECTORY   = 1 << 1,
-+  FILE_DIALOG_MULTI_SELECTIONS = 1 << 2,
-+  FILE_DIALOG_CREATE_DIRECTORY = 1 << 3,
-+};
-+
-+typedef base::Callback<void(
-+    bool result, const std::vector<base::FilePath>& paths)> OpenDialogCallback;
-+
-+typedef base::Callback<void(
-+    bool result, const base::FilePath& path)> SaveDialogCallback;
-+
-+bool ShowOpenDialog(electron::NativeWindow* parent_window,
-+                    const std::string& title,
-+                    const base::FilePath& default_path,
-+                    const Filters& filters,
-+                    int properties,
-+                    std::vector<base::FilePath>* paths);
-+
-+void ShowOpenDialog(electron::NativeWindow* parent_window,
-+                    const std::string& title,
-+                    const base::FilePath& default_path,
-+                    const Filters& filters,
-+                    int properties,
-+                    const OpenDialogCallback& callback);
-+
-+bool ShowSaveDialog(electron::NativeWindow* parent_window,
-+                    const std::string& title,
-+                    const base::FilePath& default_path,
-+                    const Filters& filters,
-+                    base::FilePath* path);
-+
-+void ShowSaveDialog(electron::NativeWindow* parent_window,
-+                    const std::string& title,
-+                    const base::FilePath& default_path,
-+                    const Filters& filters,
-+                    const SaveDialogCallback& callback);
-+
-+}  // namespace file_dialog
-+
-+#endif  // ELECTRON_BROWSER_UI_FILE_DIALOG_H_
-added in remote
-  their  100644 d27386e0b9df8e777a2af8a62fdc3298c7de35ac electron/browser/ui/file_dialog_gtk.cc
-@@ -0,0 +1,288 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/ui/file_dialog.h"
-+
-+#include "electron/browser/native_window.h"
-+#include "base/callback.h"
-+#include "base/files/file_util.h"
-+#include "base/strings/string_util.h"
-+#include "chrome/browser/ui/libgtk2ui/gtk2_signal.h"
-+#include "chrome/browser/ui/libgtk2ui/gtk2_util.h"
-+#include "ui/views/widget/desktop_aura/x11_desktop_handler.h"
-+
-+namespace file_dialog {
-+
-+namespace {
-+
-+// Makes sure that .jpg also shows .JPG.
-+gboolean FileFilterCaseInsensitive(const GtkFileFilterInfo* file_info,
-+                                   std::string* file_extension) {
-+  // Makes .* file extension matches all file types.
-+  if (*file_extension == ".*")
-+    return true;
-+  return base::EndsWith(
-+    file_info->filename,
-+    *file_extension, base::CompareCase::INSENSITIVE_ASCII);
-+}
-+
-+// Deletes |data| when gtk_file_filter_add_custom() is done with it.
-+void OnFileFilterDataDestroyed(std::string* file_extension) {
-+  delete file_extension;
-+}
-+
-+class FileChooserDialog {
-+ public:
-+  FileChooserDialog(GtkFileChooserAction action,
-+                    electron::NativeWindow* parent_window,
-+                    const std::string& title,
-+                    const base::FilePath& default_path,
-+                    const Filters& filters)
-+      : dialog_scope_(parent_window),
-+        filters_(filters) {
-+    const char* confirm_text = GTK_STOCK_OK;
-+    if (action == GTK_FILE_CHOOSER_ACTION_SAVE)
-+      confirm_text = GTK_STOCK_SAVE;
-+    else if (action == GTK_FILE_CHOOSER_ACTION_OPEN)
-+      confirm_text = GTK_STOCK_OPEN;
-+
-+    dialog_ = gtk_file_chooser_dialog_new(
-+        title.c_str(),
-+        NULL,
-+        action,
-+        GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-+        confirm_text, GTK_RESPONSE_ACCEPT,
-+        NULL);
-+    if (parent_window) {
-+      gfx::NativeWindow window = parent_window->GetNativeWindow();
-+      libgtk2ui::SetGtkTransientForAura(dialog_, window);
-+    }
-+
-+    if (action == GTK_FILE_CHOOSER_ACTION_SAVE)
-+      gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dialog_),
-+                                                     TRUE);
-+    if (action != GTK_FILE_CHOOSER_ACTION_OPEN)
-+      gtk_file_chooser_set_create_folders(GTK_FILE_CHOOSER(dialog_), TRUE);
-+
-+    gtk_window_set_modal(GTK_WINDOW(dialog_), TRUE);
-+
-+    if (!default_path.empty()) {
-+      if (base::DirectoryExists(default_path)) {
-+        gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog_),
-+                                            default_path.value().c_str());
-+      } else {
-+        gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog_),
-+            default_path.DirName().value().c_str());
-+        gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog_),
-+            default_path.BaseName().value().c_str());
-+      }
-+    }
-+
-+    if (!filters.empty())
-+      AddFilters(filters);
-+  }
-+
-+  virtual ~FileChooserDialog() {
-+    gtk_widget_destroy(dialog_);
-+  }
-+
-+  void RunAsynchronous() {
-+    g_signal_connect(dialog_, "delete-event",
-+                     G_CALLBACK(gtk_widget_hide_on_delete), NULL);
-+    g_signal_connect(dialog_, "response",
-+                     G_CALLBACK(OnFileDialogResponseThunk), this);
-+    gtk_widget_show_all(dialog_);
-+
-+    // We need to call gtk_window_present after making the widgets visible to
-+    // make sure window gets correctly raised and gets focus.
-+    int time = views::X11DesktopHandler::get()->wm_user_time_ms();
-+    gtk_window_present_with_time(GTK_WINDOW(dialog_), time);
-+  }
-+
-+  void RunSaveAsynchronous(const SaveDialogCallback& callback) {
-+    save_callback_ = callback;
-+    RunAsynchronous();
-+  }
-+
-+  void RunOpenAsynchronous(const OpenDialogCallback& callback) {
-+    open_callback_ = callback;
-+    RunAsynchronous();
-+  }
-+
-+  base::FilePath GetFileName() const {
-+    gchar* filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog_));
-+    base::FilePath path = AddExtensionForFilename(filename);
-+    g_free(filename);
-+    return path;
-+  }
-+
-+  std::vector<base::FilePath> GetFileNames() const {
-+    std::vector<base::FilePath> paths;
-+    GSList* filenames = gtk_file_chooser_get_filenames(
-+        GTK_FILE_CHOOSER(dialog_));
-+    for (GSList* iter = filenames; iter != NULL; iter = g_slist_next(iter)) {
-+      base::FilePath path = AddExtensionForFilename(
-+          static_cast<char*>(iter->data));
-+      g_free(iter->data);
-+      paths.push_back(path);
-+    }
-+    g_slist_free(filenames);
-+    return paths;
-+  }
-+
-+  CHROMEGTK_CALLBACK_1(FileChooserDialog, void, OnFileDialogResponse, int);
-+
-+  GtkWidget* dialog() const { return dialog_; }
-+
-+ private:
-+  void AddFilters(const Filters& filters);
-+  base::FilePath AddExtensionForFilename(const gchar* filename) const;
-+
-+  electron::NativeWindow::DialogScope dialog_scope_;
-+
-+  GtkWidget* dialog_;
-+
-+  Filters filters_;
-+  SaveDialogCallback save_callback_;
-+  OpenDialogCallback open_callback_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(FileChooserDialog);
-+};
-+
-+void FileChooserDialog::OnFileDialogResponse(GtkWidget* widget, int response) {
-+  gtk_widget_hide_all(dialog_);
-+
-+  if (!save_callback_.is_null()) {
-+    if (response == GTK_RESPONSE_ACCEPT)
-+      save_callback_.Run(true, GetFileName());
-+    else
-+      save_callback_.Run(false, base::FilePath());
-+  } else if (!open_callback_.is_null()) {
-+    if (response == GTK_RESPONSE_ACCEPT)
-+      open_callback_.Run(true, GetFileNames());
-+    else
-+      open_callback_.Run(false, std::vector<base::FilePath>());
-+  }
-+  delete this;
-+}
-+
-+void FileChooserDialog::AddFilters(const Filters& filters) {
-+  for (size_t i = 0; i < filters.size(); ++i) {
-+    const Filter& filter = filters[i];
-+    GtkFileFilter* gtk_filter = gtk_file_filter_new();
-+
-+    for (size_t j = 0; j < filter.second.size(); ++j) {
-+      scoped_ptr<std::string> file_extension(
-+          new std::string("." + filter.second[j]));
-+      gtk_file_filter_add_custom(
-+          gtk_filter,
-+          GTK_FILE_FILTER_FILENAME,
-+          reinterpret_cast<GtkFileFilterFunc>(FileFilterCaseInsensitive),
-+          file_extension.release(),
-+          reinterpret_cast<GDestroyNotify>(OnFileFilterDataDestroyed));
-+    }
-+
-+    gtk_file_filter_set_name(gtk_filter, filter.first.c_str());
-+    gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog_), gtk_filter);
-+  }
-+}
-+
-+base::FilePath FileChooserDialog::AddExtensionForFilename(
-+    const gchar* filename) const {
-+  base::FilePath path(filename);
-+  GtkFileFilter* selected_filter =
-+      gtk_file_chooser_get_filter(GTK_FILE_CHOOSER(dialog_));
-+  if (!selected_filter)
-+    return path;
-+
-+  GSList* filters = gtk_file_chooser_list_filters(GTK_FILE_CHOOSER(dialog_));
-+  int i = g_slist_index(filters, selected_filter);
-+  g_slist_free(filters);
-+  if (i >= filters_.size())
-+    return path;
-+
-+  const auto& extensions = filters_[i].second;
-+  for (const auto& extension : extensions) {
-+    if (extension == "*" || path.MatchesExtension("." + extension))
-+      return path;
-+  }
-+
-+  return path.ReplaceExtension(extensions[0]);
-+}
-+
-+
-+}  // namespace
-+
-+bool ShowOpenDialog(electron::NativeWindow* parent_window,
-+                    const std::string& title,
-+                    const base::FilePath& default_path,
-+                    const Filters& filters,
-+                    int properties,
-+                    std::vector<base::FilePath>* paths) {
-+  GtkFileChooserAction action = GTK_FILE_CHOOSER_ACTION_OPEN;
-+  if (properties & FILE_DIALOG_OPEN_DIRECTORY)
-+    action = GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER;
-+  FileChooserDialog open_dialog(action, parent_window, title, default_path,
-+                                filters);
-+  if (properties & FILE_DIALOG_MULTI_SELECTIONS)
-+    gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(open_dialog.dialog()),
-+                                         TRUE);
-+
-+  gtk_widget_show_all(open_dialog.dialog());
-+  int response = gtk_dialog_run(GTK_DIALOG(open_dialog.dialog()));
-+  if (response == GTK_RESPONSE_ACCEPT) {
-+    *paths = open_dialog.GetFileNames();
-+    return true;
-+  } else {
-+    return false;
-+  }
-+}
-+
-+void ShowOpenDialog(electron::NativeWindow* parent_window,
-+                    const std::string& title,
-+                    const base::FilePath& default_path,
-+                    const Filters& filters,
-+                    int properties,
-+                    const OpenDialogCallback& callback) {
-+  GtkFileChooserAction action = GTK_FILE_CHOOSER_ACTION_OPEN;
-+  if (properties & FILE_DIALOG_OPEN_DIRECTORY)
-+    action = GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER;
-+  FileChooserDialog* open_dialog = new FileChooserDialog(
-+      action, parent_window, title, default_path, filters);
-+  if (properties & FILE_DIALOG_MULTI_SELECTIONS)
-+    gtk_file_chooser_set_select_multiple(
-+        GTK_FILE_CHOOSER(open_dialog->dialog()), TRUE);
-+
-+  open_dialog->RunOpenAsynchronous(callback);
-+}
-+
-+bool ShowSaveDialog(electron::NativeWindow* parent_window,
-+                    const std::string& title,
-+                    const base::FilePath& default_path,
-+                    const Filters& filters,
-+                    base::FilePath* path) {
-+  FileChooserDialog save_dialog(GTK_FILE_CHOOSER_ACTION_SAVE, parent_window,
-+                                title, default_path, filters);
-+  gtk_widget_show_all(save_dialog.dialog());
-+  int response = gtk_dialog_run(GTK_DIALOG(save_dialog.dialog()));
-+  if (response == GTK_RESPONSE_ACCEPT) {
-+    *path = save_dialog.GetFileName();
-+    return true;
-+  } else {
-+    return false;
-+  }
-+}
-+
-+void ShowSaveDialog(electron::NativeWindow* parent_window,
-+                    const std::string& title,
-+                    const base::FilePath& default_path,
-+                    const Filters& filters,
-+                    const SaveDialogCallback& callback) {
-+  FileChooserDialog* save_dialog = new FileChooserDialog(
-+      GTK_FILE_CHOOSER_ACTION_SAVE, parent_window, title, default_path,
-+      filters);
-+  save_dialog->RunSaveAsynchronous(callback);
-+}
-+
-+}  // namespace file_dialog
-added in remote
-  their  100644 53bbb2594c97367e7604399a547b0b846cad4d78 electron/browser/ui/file_dialog_mac.mm
-@@ -0,0 +1,204 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/ui/file_dialog.h"
-+
-+#import <Cocoa/Cocoa.h>
-+#import <CoreServices/CoreServices.h>
-+
-+#include "electron/browser/native_window.h"
-+#include "base/files/file_util.h"
-+#include "base/mac/foundation_util.h"
-+#include "base/mac/mac_util.h"
-+#include "base/mac/scoped_cftyperef.h"
-+#include "base/strings/sys_string_conversions.h"
-+
-+namespace file_dialog {
-+
-+namespace {
-+
-+void SetAllowedFileTypes(NSSavePanel* dialog, const Filters& filters) {
-+  NSMutableSet* file_type_set = [NSMutableSet set];
-+  for (size_t i = 0; i < filters.size(); ++i) {
-+    const Filter& filter = filters[i];
-+    for (size_t j = 0; j < filter.second.size(); ++j) {
-+      // If we meet a '*' file extension, we allow all the file types and no
-+      // need to set the specified file types.
-+      if (filter.second[j] == "*") {
-+        [dialog setAllowsOtherFileTypes:YES];
-+        return;
-+      }
-+      base::ScopedCFTypeRef<CFStringRef> ext_cf(
-+          base::SysUTF8ToCFStringRef(filter.second[j]));
-+      [file_type_set addObject:base::mac::CFToNSCast(ext_cf.get())];
-+    }
-+  }
-+
-+  // Passing empty array to setAllowedFileTypes will cause exception.
-+  NSArray* file_types = nil;
-+  if ([file_type_set count])
-+    file_types = [file_type_set allObjects];
-+
-+  [dialog setAllowedFileTypes:file_types];
-+}
-+
-+void SetupDialog(NSSavePanel* dialog,
-+                 const std::string& title,
-+                 const base::FilePath& default_path,
-+                 const Filters& filters) {
-+  if (!title.empty())
-+    [dialog setTitle:base::SysUTF8ToNSString(title)];
-+
-+  NSString* default_dir = nil;
-+  NSString* default_filename = nil;
-+  if (!default_path.empty()) {
-+    if (base::DirectoryExists(default_path)) {
-+      default_dir = base::SysUTF8ToNSString(default_path.value());
-+    } else {
-+      default_dir = base::SysUTF8ToNSString(default_path.DirName().value());
-+      default_filename =
-+          base::SysUTF8ToNSString(default_path.BaseName().value());
-+    }
-+  }
-+
-+  if (default_dir)
-+    [dialog setDirectoryURL:[NSURL fileURLWithPath:default_dir]];
-+  if (default_filename)
-+    [dialog setNameFieldStringValue:default_filename];
-+
-+  [dialog setCanSelectHiddenExtension:YES];
-+  if (filters.empty())
-+    [dialog setAllowsOtherFileTypes:YES];
-+  else
-+    SetAllowedFileTypes(dialog, filters);
-+}
-+
-+void SetupDialogForProperties(NSOpenPanel* dialog, int properties) {
-+  [dialog setCanChooseFiles:(properties & FILE_DIALOG_OPEN_FILE)];
-+  if (properties & FILE_DIALOG_OPEN_DIRECTORY)
-+    [dialog setCanChooseDirectories:YES];
-+  if (properties & FILE_DIALOG_CREATE_DIRECTORY)
-+    [dialog setCanCreateDirectories:YES];
-+  if (properties & FILE_DIALOG_MULTI_SELECTIONS)
-+    [dialog setAllowsMultipleSelection:YES];
-+}
-+
-+// Run modal dialog with parent window and return user's choice.
-+int RunModalDialog(NSSavePanel* dialog, electron::NativeWindow* parent_window) {
-+  __block int chosen = NSFileHandlingPanelCancelButton;
-+  if (!parent_window || !parent_window->GetNativeWindow()) {
-+    chosen = [dialog runModal];
-+  } else {
-+    NSWindow* window = parent_window->GetNativeWindow();
-+
-+    [dialog beginSheetModalForWindow:window
-+                   completionHandler:^(NSInteger c) {
-+      chosen = c;
-+      [NSApp stopModal];
-+    }];
-+    [NSApp runModalForWindow:window];
-+  }
-+
-+  return chosen;
-+}
-+
-+void ReadDialogPaths(NSOpenPanel* dialog, std::vector<base::FilePath>* paths) {
-+  NSArray* urls = [dialog URLs];
-+  for (NSURL* url in urls)
-+    if ([url isFileURL])
-+      paths->push_back(base::FilePath(base::SysNSStringToUTF8([url path])));
-+}
-+
-+}  // namespace
-+
-+bool ShowOpenDialog(electron::NativeWindow* parent_window,
-+                    const std::string& title,
-+                    const base::FilePath& default_path,
-+                    const Filters& filters,
-+                    int properties,
-+                    std::vector<base::FilePath>* paths) {
-+  DCHECK(paths);
-+  NSOpenPanel* dialog = [NSOpenPanel openPanel];
-+
-+  SetupDialog(dialog, title, default_path, filters);
-+  SetupDialogForProperties(dialog, properties);
-+
-+  int chosen = RunModalDialog(dialog, parent_window);
-+  if (chosen == NSFileHandlingPanelCancelButton)
-+    return false;
-+
-+  ReadDialogPaths(dialog, paths);
-+  return true;
-+}
-+
-+void ShowOpenDialog(electron::NativeWindow* parent_window,
-+                    const std::string& title,
-+                    const base::FilePath& default_path,
-+                    const Filters& filters,
-+                    int properties,
-+                    const OpenDialogCallback& c) {
-+  NSOpenPanel* dialog = [NSOpenPanel openPanel];
-+
-+  SetupDialog(dialog, title, default_path, filters);
-+  SetupDialogForProperties(dialog, properties);
-+
-+  // Duplicate the callback object here since c is a reference and gcd would
-+  // only store the pointer, by duplication we can force gcd to store a copy.
-+  __block OpenDialogCallback callback = c;
-+
-+  NSWindow* window = parent_window ? parent_window->GetNativeWindow() : NULL;
-+  [dialog beginSheetModalForWindow:window
-+                 completionHandler:^(NSInteger chosen) {
-+    if (chosen == NSFileHandlingPanelCancelButton) {
-+      callback.Run(false, std::vector<base::FilePath>());
-+    } else {
-+      std::vector<base::FilePath> paths;
-+      ReadDialogPaths(dialog, &paths);
-+      callback.Run(true, paths);
-+    }
-+  }];
-+}
-+
-+bool ShowSaveDialog(electron::NativeWindow* parent_window,
-+                    const std::string& title,
-+                    const base::FilePath& default_path,
-+                    const Filters& filters,
-+                    base::FilePath* path) {
-+  DCHECK(path);
-+  NSSavePanel* dialog = [NSSavePanel savePanel];
-+
-+  SetupDialog(dialog, title, default_path, filters);
-+
-+  int chosen = RunModalDialog(dialog, parent_window);
-+  if (chosen == NSFileHandlingPanelCancelButton || ![[dialog URL] isFileURL])
-+    return false;
-+
-+  *path = base::FilePath(base::SysNSStringToUTF8([[dialog URL] path]));
-+  return true;
-+}
-+
-+void ShowSaveDialog(electron::NativeWindow* parent_window,
-+                    const std::string& title,
-+                    const base::FilePath& default_path,
-+                    const Filters& filters,
-+                    const SaveDialogCallback& c) {
-+  NSSavePanel* dialog = [NSSavePanel savePanel];
-+
-+  SetupDialog(dialog, title, default_path, filters);
-+
-+  __block SaveDialogCallback callback = c;
-+
-+  NSWindow* window = parent_window ? parent_window->GetNativeWindow() : NULL;
-+  [dialog beginSheetModalForWindow:window
-+                 completionHandler:^(NSInteger chosen) {
-+    if (chosen == NSFileHandlingPanelCancelButton) {
-+      callback.Run(false, base::FilePath());
-+    } else {
-+      std::string path = base::SysNSStringToUTF8([[dialog URL] path]);
-+      callback.Run(true, base::FilePath(path));
-+    }
-+  }];
-+}
-+
-+}  // namespace file_dialog
-added in remote
-  their  100644 3f3698c42653b47c193e9e025613487a55ada851 electron/browser/ui/file_dialog_win.cc
-@@ -0,0 +1,286 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/ui/file_dialog.h"
-+
-+#include <atlbase.h>
-+#include <windows.h>
-+#include <commdlg.h>
-+#include <shlobj.h>
-+
-+#include "electron/browser/native_window_views.h"
-+#include "base/files/file_util.h"
-+#include "base/i18n/case_conversion.h"
-+#include "base/strings/string_util.h"
-+#include "base/strings/string_split.h"
-+#include "base/strings/utf_string_conversions.h"
-+#include "base/threading/thread.h"
-+#include "base/win/registry.h"
-+#include "third_party/wtl/include/atlapp.h"
-+#include "third_party/wtl/include/atldlgs.h"
-+
-+namespace file_dialog {
-+
-+namespace {
-+
-+// Distinguish directories from regular files.
-+bool IsDirectory(const base::FilePath& path) {
-+  base::File::Info file_info;
-+  return base::GetFileInfo(path, &file_info) ?
-+      file_info.is_directory : path.EndsWithSeparator();
-+}
-+
-+void ConvertFilters(const Filters& filters,
-+                    std::vector<std::wstring>* buffer,
-+                    std::vector<COMDLG_FILTERSPEC>* filterspec) {
-+  if (filters.empty()) {
-+    COMDLG_FILTERSPEC spec = { L"All Files (*.*)", L"*.*" };
-+    filterspec->push_back(spec);
-+    return;
-+  }
-+
-+  buffer->reserve(filters.size() * 2);
-+  for (size_t i = 0; i < filters.size(); ++i) {
-+    const Filter& filter = filters[i];
-+
-+    COMDLG_FILTERSPEC spec;
-+    buffer->push_back(base::UTF8ToWide(filter.first));
-+    spec.pszName = buffer->back().c_str();
-+
-+    std::vector<std::string> extensions(filter.second);
-+    for (size_t j = 0; j < extensions.size(); ++j)
-+      extensions[j].insert(0, "*.");
-+    buffer->push_back(base::UTF8ToWide(base::JoinString(extensions, ";")));
-+    spec.pszSpec = buffer->back().c_str();
-+
-+    filterspec->push_back(spec);
-+  }
-+}
-+
-+// Generic class to delegate common open/save dialog's behaviours, users need to
-+// call interface methods via GetPtr().
-+template <typename T>
-+class FileDialog {
-+ public:
-+  FileDialog(const base::FilePath& default_path, const std::string& title,
-+             const Filters& filters, int options) {
-+    std::wstring file_part;
-+    if (!IsDirectory(default_path))
-+      file_part = default_path.BaseName().value();
-+
-+    std::vector<std::wstring> buffer;
-+    std::vector<COMDLG_FILTERSPEC> filterspec;
-+    ConvertFilters(filters, &buffer, &filterspec);
-+
-+    dialog_.reset(new T(file_part.c_str(), options, NULL,
-+                        filterspec.data(), filterspec.size()));
-+
-+    if (!title.empty())
-+      GetPtr()->SetTitle(base::UTF8ToUTF16(title).c_str());
-+
-+    // By default, *.* will be added to the file name if file type is "*.*". In
-+    // Electron, we disable it to make a better experience.
-+    //
-+    // From MSDN: https://msdn.microsoft.com/en-us/library/windows/desktop/
-+    // bb775970(v=vs.85).aspx
-+    //
-+    // If SetDefaultExtension is not called, the dialog will not update
-+    // automatically when user choose a new file type in the file dialog.
-+    //
-+    // We set file extension to the first none-wildcard extension to make
-+    // sure the dialog will update file extension automatically.
-+    for (size_t i = 0; i < filterspec.size(); ++i) {
-+      if (std::wstring(filterspec[i].pszSpec) != L"*.*") {
-+        // SetFileTypeIndex is regarded as one-based index.
-+        GetPtr()->SetFileTypeIndex(i+1);
-+        GetPtr()->SetDefaultExtension(filterspec[i].pszSpec);
-+        break;
-+      }
-+    }
-+
-+    SetDefaultFolder(default_path);
-+  }
-+
-+  bool Show(electron::NativeWindow* parent_window) {
-+    electron::NativeWindow::DialogScope dialog_scope(parent_window);
-+    HWND window = parent_window ? static_cast<electron::NativeWindowViews*>(
-+        parent_window)->GetAcceleratedWidget() :
-+        NULL;
-+    return dialog_->DoModal(window) == IDOK;
-+  }
-+
-+  T* GetDialog() { return dialog_.get(); }
-+
-+  IFileDialog* GetPtr() const { return dialog_->GetPtr(); }
-+
-+ private:
-+  // Set up the initial directory for the dialog.
-+  void SetDefaultFolder(const base::FilePath file_path) {
-+    std::wstring directory = IsDirectory(file_path) ?
-+        file_path.value() :
-+        file_path.DirName().value();
-+
-+    ATL::CComPtr<IShellItem> folder_item;
-+    HRESULT hr = SHCreateItemFromParsingName(directory.c_str(),
-+                                             NULL,
-+                                             IID_PPV_ARGS(&folder_item));
-+    if (SUCCEEDED(hr))
-+      GetPtr()->SetFolder(folder_item);
-+  }
-+
-+  scoped_ptr<T> dialog_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(FileDialog);
-+};
-+
-+struct RunState {
-+  base::Thread* dialog_thread;
-+  base::MessageLoop* ui_message_loop;
-+};
-+
-+bool CreateDialogThread(RunState* run_state) {
-+  scoped_ptr<base::Thread> thread(
-+      new base::Thread(ELECTRON_PRODUCT_NAME "FileDialogThread"));
-+  thread->init_com_with_mta(false);
-+  if (!thread->Start())
-+    return false;
-+
-+  run_state->dialog_thread = thread.release();
-+  run_state->ui_message_loop = base::MessageLoop::current();
-+  return true;
-+}
-+
-+void RunOpenDialogInNewThread(const RunState& run_state,
-+                              electron::NativeWindow* parent,
-+                              const std::string& title,
-+                              const base::FilePath& default_path,
-+                              const Filters& filters,
-+                              int properties,
-+                              const OpenDialogCallback& callback) {
-+  std::vector<base::FilePath> paths;
-+  bool result = ShowOpenDialog(parent, title, default_path, filters, properties,
-+                               &paths);
-+  run_state.ui_message_loop->PostTask(FROM_HERE,
-+                                      base::Bind(callback, result, paths));
-+  run_state.ui_message_loop->DeleteSoon(FROM_HERE, run_state.dialog_thread);
-+}
-+
-+void RunSaveDialogInNewThread(const RunState& run_state,
-+                              electron::NativeWindow* parent,
-+                              const std::string& title,
-+                              const base::FilePath& default_path,
-+                              const Filters& filters,
-+                              const SaveDialogCallback& callback) {
-+  base::FilePath path;
-+  bool result = ShowSaveDialog(parent, title, default_path, filters, &path);
-+  run_state.ui_message_loop->PostTask(FROM_HERE,
-+                                      base::Bind(callback, result, path));
-+  run_state.ui_message_loop->DeleteSoon(FROM_HERE, run_state.dialog_thread);
-+}
-+
-+}  // namespace
-+
-+bool ShowOpenDialog(electron::NativeWindow* parent_window,
-+                    const std::string& title,
-+                    const base::FilePath& default_path,
-+                    const Filters& filters,
-+                    int properties,
-+                    std::vector<base::FilePath>* paths) {
-+  int options = FOS_FORCEFILESYSTEM | FOS_FILEMUSTEXIST;
-+  if (properties & FILE_DIALOG_OPEN_DIRECTORY)
-+    options |= FOS_PICKFOLDERS;
-+  if (properties & FILE_DIALOG_MULTI_SELECTIONS)
-+    options |= FOS_ALLOWMULTISELECT;
-+
-+  FileDialog<CShellFileOpenDialog> open_dialog(
-+      default_path, title, filters, options);
-+  if (!open_dialog.Show(parent_window))
-+    return false;
-+
-+  ATL::CComPtr<IShellItemArray> items;
-+  HRESULT hr = static_cast<IFileOpenDialog*>(open_dialog.GetPtr())->GetResults(
-+      &items);
-+  if (FAILED(hr))
-+    return false;
-+
-+  ATL::CComPtr<IShellItem> item;
-+  DWORD count = 0;
-+  hr = items->GetCount(&count);
-+  if (FAILED(hr))
-+    return false;
-+
-+  paths->reserve(count);
-+  for (DWORD i = 0; i < count; ++i) {
-+    hr = items->GetItemAt(i, &item);
-+    if (FAILED(hr))
-+      return false;
-+
-+    wchar_t file_name[MAX_PATH];
-+    hr = CShellFileOpenDialog::GetFileNameFromShellItem(
-+        item, SIGDN_FILESYSPATH, file_name, MAX_PATH);
-+    if (FAILED(hr))
-+      return false;
-+
-+    paths->push_back(base::FilePath(file_name));
-+  }
-+
-+  return true;
-+}
-+
-+void ShowOpenDialog(electron::NativeWindow* parent,
-+                    const std::string& title,
-+                    const base::FilePath& default_path,
-+                    const Filters& filters,
-+                    int properties,
-+                    const OpenDialogCallback& callback) {
-+  RunState run_state;
-+  if (!CreateDialogThread(&run_state)) {
-+    callback.Run(false, std::vector<base::FilePath>());
-+    return;
-+  }
-+
-+  run_state.dialog_thread->message_loop()->PostTask(
-+      FROM_HERE,
-+      base::Bind(&RunOpenDialogInNewThread, run_state, parent, title,
-+                 default_path, filters, properties, callback));
-+}
-+
-+bool ShowSaveDialog(electron::NativeWindow* parent_window,
-+                    const std::string& title,
-+                    const base::FilePath& default_path,
-+                    const Filters& filters,
-+                    base::FilePath* path) {
-+  FileDialog<CShellFileSaveDialog> save_dialog(
-+      default_path, title, filters,
-+      FOS_FORCEFILESYSTEM | FOS_PATHMUSTEXIST | FOS_OVERWRITEPROMPT);
-+  if (!save_dialog.Show(parent_window))
-+    return false;
-+
-+  wchar_t buffer[MAX_PATH];
-+  HRESULT hr = save_dialog.GetDialog()->GetFilePath(buffer, MAX_PATH);
-+  if (FAILED(hr))
-+    return false;
-+
-+  *path = base::FilePath(buffer);
-+  return true;
-+}
-+
-+void ShowSaveDialog(electron::NativeWindow* parent,
-+                    const std::string& title,
-+                    const base::FilePath& default_path,
-+                    const Filters& filters,
-+                    const SaveDialogCallback& callback) {
-+  RunState run_state;
-+  if (!CreateDialogThread(&run_state)) {
-+    callback.Run(false, base::FilePath());
-+    return;
-+  }
-+
-+  run_state.dialog_thread->message_loop()->PostTask(
-+      FROM_HERE,
-+      base::Bind(&RunSaveDialogInNewThread, run_state, parent, title,
-+                 default_path, filters, callback));
-+}
-+
-+}  // namespace file_dialog
-added in remote
-  their  100644 03c1228023f9c025fed69e3724af7080a2508d04 electron/browser/ui/message_box.h
-@@ -0,0 +1,66 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_UI_MESSAGE_BOX_H_
-+#define ELECTRON_BROWSER_UI_MESSAGE_BOX_H_
-+
-+#include <string>
-+#include <vector>
-+
-+#include "base/callback_forward.h"
-+#include "base/strings/string16.h"
-+
-+namespace gfx {
-+class ImageSkia;
-+}
-+
-+namespace electron {
-+
-+class NativeWindow;
-+
-+enum MessageBoxType {
-+  MESSAGE_BOX_TYPE_NONE = 0,
-+  MESSAGE_BOX_TYPE_INFORMATION,
-+  MESSAGE_BOX_TYPE_WARNING,
-+  MESSAGE_BOX_TYPE_ERROR,
-+  MESSAGE_BOX_TYPE_QUESTION,
-+};
-+
-+enum MessageBoxOptions {
-+  MESSAGE_BOX_NONE    = 0,
-+  MESSAGE_BOX_NO_LINK = 1 << 0,
-+};
-+
-+typedef base::Callback<void(int code)> MessageBoxCallback;
-+
-+int ShowMessageBox(NativeWindow* parent_window,
-+                   MessageBoxType type,
-+                   const std::vector<std::string>& buttons,
-+                   int cancel_id,
-+                   int default_id,
-+                   int options,
-+                   const std::string& title,
-+                   const std::string& message,
-+                   const std::string& detail,
-+                   const gfx::ImageSkia& icon);
-+
-+void ShowMessageBox(NativeWindow* parent_window,
-+                    MessageBoxType type,
-+                    const std::vector<std::string>& buttons,
-+                    int default_id,
-+                    int cancel_id,
-+                    int options,
-+                    const std::string& title,
-+                    const std::string& message,
-+                    const std::string& detail,
-+                    const gfx::ImageSkia& icon,
-+                    const MessageBoxCallback& callback);
-+
-+// Like ShowMessageBox with simplest settings, but safe to call at very early
-+// stage of application.
-+void ShowErrorBox(const base::string16& title, const base::string16& content);
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_UI_MESSAGE_BOX_H_
-added in remote
-  their  100644 d1f1187dc14a1ab2d71fecc2e5cf206a7d1b07c0 electron/browser/ui/message_box_gtk.cc
-@@ -0,0 +1,209 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/ui/message_box.h"
-+
-+#include "electron/browser/browser.h"
-+#include "electron/browser/native_window.h"
-+#include "base/callback.h"
-+#include "base/strings/string_util.h"
-+#include "base/strings/utf_string_conversions.h"
-+#include "chrome/browser/ui/libgtk2ui/gtk2_signal.h"
-+#include "chrome/browser/ui/libgtk2ui/gtk2_util.h"
-+#include "chrome/browser/ui/libgtk2ui/skia_utils_gtk2.h"
-+#include "ui/views/widget/desktop_aura/x11_desktop_handler.h"
-+
-+#define ANSI_FOREGROUND_RED   "\x1b[31m"
-+#define ANSI_FOREGROUND_BLACK "\x1b[30m"
-+#define ANSI_TEXT_BOLD        "\x1b[1m"
-+#define ANSI_BACKGROUND_GRAY  "\x1b[47m"
-+#define ANSI_RESET            "\x1b[0m"
-+
-+namespace electron {
-+
-+namespace {
-+
-+class GtkMessageBox {
-+ public:
-+  GtkMessageBox(NativeWindow* parent_window,
-+                MessageBoxType type,
-+                const std::vector<std::string>& buttons,
-+                int default_id,
-+                int cancel_id,
-+                const std::string& title,
-+                const std::string& message,
-+                const std::string& detail,
-+                const gfx::ImageSkia& icon)
-+      : dialog_scope_(parent_window),
-+        cancel_id_(cancel_id) {
-+    // Create dialog.
-+    dialog_ = gtk_message_dialog_new(
-+        nullptr,  // parent
-+        static_cast<GtkDialogFlags>(0),  // no flags
-+        GetMessageType(type),  // type
-+        GTK_BUTTONS_NONE,  // no buttons
-+        "%s", message.c_str());
-+    if (!detail.empty())
-+      gtk_message_dialog_format_secondary_text(
-+          GTK_MESSAGE_DIALOG(dialog_), "%s", detail.c_str());
-+    if (!title.empty())
-+      gtk_window_set_title(GTK_WINDOW(dialog_), title.c_str());
-+
-+    // Set dialog's icon.
-+    if (!icon.isNull()) {
-+      GdkPixbuf* pixbuf = libgtk2ui::GdkPixbufFromSkBitmap(*icon.bitmap());
-+      GtkWidget* image = gtk_image_new_from_pixbuf(pixbuf);
-+      gtk_message_dialog_set_image(GTK_MESSAGE_DIALOG(dialog_), image);
-+      gtk_widget_show(image);
-+      g_object_unref(pixbuf);
-+    }
-+
-+    // Add buttons.
-+    for (size_t i = 0; i < buttons.size(); ++i) {
-+      GtkWidget* button = gtk_dialog_add_button(
-+          GTK_DIALOG(dialog_), TranslateToStock(i, buttons[i]), i);
-+      if (static_cast<int>(i) == default_id)
-+        gtk_widget_grab_focus(button);
-+    }
-+
-+    // Parent window.
-+    if (parent_window) {
-+      gfx::NativeWindow window = parent_window->GetNativeWindow();
-+      libgtk2ui::SetGtkTransientForAura(dialog_, window);
-+    }
-+  }
-+
-+  ~GtkMessageBox() {
-+    gtk_widget_destroy(dialog_);
-+  }
-+
-+  GtkMessageType GetMessageType(MessageBoxType type) {
-+    switch (type) {
-+      case MESSAGE_BOX_TYPE_INFORMATION:
-+        return GTK_MESSAGE_INFO;
-+      case MESSAGE_BOX_TYPE_WARNING:
-+        return GTK_MESSAGE_WARNING;
-+      case MESSAGE_BOX_TYPE_QUESTION:
-+        return GTK_MESSAGE_QUESTION;
-+      case MESSAGE_BOX_TYPE_ERROR:
-+        return GTK_MESSAGE_ERROR;
-+      default:
-+        return GTK_MESSAGE_OTHER;
-+    }
-+  }
-+
-+  const char* TranslateToStock(int id, const std::string& text) {
-+    std::string lower = base::ToLowerASCII(text);
-+    if (lower == "cancel")
-+      return GTK_STOCK_CANCEL;
-+    else if (lower == "no")
-+      return GTK_STOCK_NO;
-+    else if (lower == "ok")
-+      return GTK_STOCK_OK;
-+    else if (lower == "yes")
-+      return GTK_STOCK_YES;
-+    else
-+      return text.c_str();
-+  }
-+
-+  void Show() {
-+    gtk_widget_show_all(dialog_);
-+    // We need to call gtk_window_present after making the widgets visible to
-+    // make sure window gets correctly raised and gets focus.
-+    int time = views::X11DesktopHandler::get()->wm_user_time_ms();
-+    gtk_window_present_with_time(GTK_WINDOW(dialog_), time);
-+  }
-+
-+  int RunSynchronous() {
-+    gtk_window_set_modal(GTK_WINDOW(dialog_), TRUE);
-+    Show();
-+    int response = gtk_dialog_run(GTK_DIALOG(dialog_));
-+    if (response < 0)
-+      return cancel_id_;
-+    else
-+      return response;
-+  }
-+
-+  void RunAsynchronous(const MessageBoxCallback& callback) {
-+    callback_ = callback;
-+    g_signal_connect(dialog_, "delete-event",
-+                     G_CALLBACK(gtk_widget_hide_on_delete), nullptr);
-+    g_signal_connect(dialog_, "response",
-+                     G_CALLBACK(OnResponseDialogThunk), this);
-+    Show();
-+  }
-+
-+  CHROMEGTK_CALLBACK_1(GtkMessageBox, void, OnResponseDialog, int);
-+
-+ private:
-+  electron::NativeWindow::DialogScope dialog_scope_;
-+
-+  // The id to return when the dialog is closed without pressing buttons.
-+  int cancel_id_;
-+
-+  GtkWidget* dialog_;
-+  MessageBoxCallback callback_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(GtkMessageBox);
-+};
-+
-+void GtkMessageBox::OnResponseDialog(GtkWidget* widget, int response) {
-+  gtk_widget_hide_all(dialog_);
-+
-+  if (response < 0)
-+    callback_.Run(cancel_id_);
-+  else
-+    callback_.Run(response);
-+  delete this;
-+}
-+
-+}  // namespace
-+
-+int ShowMessageBox(NativeWindow* parent,
-+                   MessageBoxType type,
-+                   const std::vector<std::string>& buttons,
-+                   int default_id,
-+                   int cancel_id,
-+                   int options,
-+                   const std::string& title,
-+                   const std::string& message,
-+                   const std::string& detail,
-+                   const gfx::ImageSkia& icon) {
-+  return GtkMessageBox(parent, type, buttons, default_id, cancel_id,
-+                       title, message, detail, icon).RunSynchronous();
-+}
-+
-+void ShowMessageBox(NativeWindow* parent,
-+                    MessageBoxType type,
-+                    const std::vector<std::string>& buttons,
-+                    int default_id,
-+                    int cancel_id,
-+                    int options,
-+                    const std::string& title,
-+                    const std::string& message,
-+                    const std::string& detail,
-+                    const gfx::ImageSkia& icon,
-+                    const MessageBoxCallback& callback) {
-+  (new GtkMessageBox(parent, type, buttons, default_id, cancel_id,
-+                     title, message, detail, icon))->RunAsynchronous(callback);
-+}
-+
-+void ShowErrorBox(const base::string16& title, const base::string16& content) {
-+  if (Browser::Get()->is_ready()) {
-+    GtkMessageBox(nullptr, MESSAGE_BOX_TYPE_ERROR, { "OK" }, -1, 0, "Error",
-+                  base::UTF16ToUTF8(title).c_str(),
-+                  base::UTF16ToUTF8(content).c_str(),
-+                  gfx::ImageSkia()).RunSynchronous();
-+  } else {
-+    fprintf(stderr,
-+            ANSI_TEXT_BOLD ANSI_BACKGROUND_GRAY
-+            ANSI_FOREGROUND_RED  "%s\n"
-+            ANSI_FOREGROUND_BLACK "%s"
-+            ANSI_RESET "\n",
-+            base::UTF16ToUTF8(title).c_str(),
-+            base::UTF16ToUTF8(content).c_str());
-+  }
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 34455d42dabd42312ad8fec114d08d832a996a8f electron/browser/ui/message_box_mac.mm
-@@ -0,0 +1,182 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/ui/message_box.h"
-+
-+#import <Cocoa/Cocoa.h>
-+
-+#include "electron/browser/native_window.h"
-+#include "base/callback.h"
-+#include "base/mac/mac_util.h"
-+#include "base/strings/sys_string_conversions.h"
-+#include "skia/ext/skia_utils_mac.h"
-+
-+@interface ModalDelegate : NSObject {
-+ @private
-+  electron::MessageBoxCallback callback_;
-+  NSAlert* alert_;
-+  bool callEndModal_;
-+}
-+- (id)initWithCallback:(const electron::MessageBoxCallback&)callback
-+              andAlert:(NSAlert*)alert
-+          callEndModal:(bool)flag;
-+@end
-+
-+@implementation ModalDelegate
-+
-+- (id)initWithCallback:(const electron::MessageBoxCallback&)callback
-+              andAlert:(NSAlert*)alert
-+          callEndModal:(bool)flag {
-+  if ((self = [super init])) {
-+    callback_ = callback;
-+    alert_ = alert;
-+    callEndModal_ = flag;
-+  }
-+  return self;
-+}
-+
-+- (void)alertDidEnd:(NSAlert*)alert
-+         returnCode:(NSInteger)returnCode
-+        contextInfo:(void*)contextInfo {
-+  callback_.Run(returnCode);
-+  [alert_ release];
-+  [self release];
-+
-+  if (callEndModal_)
-+    [NSApp stopModal];
-+}
-+
-+@end
-+
-+namespace electron {
-+
-+namespace {
-+
-+NSAlert* CreateNSAlert(NativeWindow* parent_window,
-+                       MessageBoxType type,
-+                       const std::vector<std::string>& buttons,
-+                       int default_id,
-+                       const std::string& title,
-+                       const std::string& message,
-+                       const std::string& detail,
-+                       const gfx::ImageSkia& icon) {
-+  // Ignore the title; it's the window title on other platforms and ignorable.
-+  NSAlert* alert = [[NSAlert alloc] init];
-+  [alert setMessageText:base::SysUTF8ToNSString(message)];
-+  [alert setInformativeText:base::SysUTF8ToNSString(detail)];
-+
-+  switch (type) {
-+    case MESSAGE_BOX_TYPE_INFORMATION:
-+      [alert setAlertStyle:NSInformationalAlertStyle];
-+      break;
-+    case MESSAGE_BOX_TYPE_WARNING:
-+      [alert setAlertStyle:NSWarningAlertStyle];
-+      break;
-+    default:
-+      break;
-+  }
-+
-+  for (size_t i = 0; i < buttons.size(); ++i) {
-+    NSString* title = base::SysUTF8ToNSString(buttons[i]);
-+    // An empty title causes crash on OS X.
-+    if (buttons[i].empty())
-+      title = @"(empty)";
-+    NSButton* button = [alert addButtonWithTitle:title];
-+    [button setTag:i];
-+  }
-+
-+  NSArray* ns_buttons = [alert buttons];
-+  if (default_id >= 0 && default_id < static_cast<int>([ns_buttons count])) {
-+    // Focus the button at default_id if the user opted to do so.
-+    // The first button added gets set as the default selected.
-+    // So remove that default, and make the requested button the default.
-+    [[ns_buttons objectAtIndex:0] setKeyEquivalent:@""];
-+    [[ns_buttons objectAtIndex:default_id] setKeyEquivalent:@"\r"];
-+  }
-+
-+  if (!icon.isNull()) {
-+    NSImage* image = skia::SkBitmapToNSImageWithColorSpace(
-+        *icon.bitmap(), base::mac::GetGenericRGBColorSpace());
-+    [alert setIcon:image];
-+  }
-+
-+  return alert;
-+}
-+
-+void SetReturnCode(int* ret_code, int result) {
-+  *ret_code = result;
-+}
-+
-+}  // namespace
-+
-+int ShowMessageBox(NativeWindow* parent_window,
-+                   MessageBoxType type,
-+                   const std::vector<std::string>& buttons,
-+                   int default_id,
-+                   int cancel_id,
-+                   int options,
-+                   const std::string& title,
-+                   const std::string& message,
-+                   const std::string& detail,
-+                   const gfx::ImageSkia& icon) {
-+  NSAlert* alert = CreateNSAlert(
-+      parent_window, type, buttons, default_id, title, message,
-+      detail, icon);
-+
-+  // Use runModal for synchronous alert without parent, since we don't have a
-+  // window to wait for.
-+  if (!parent_window || !parent_window->GetNativeWindow())
-+    return [[alert autorelease] runModal];
-+
-+  int ret_code = -1;
-+  ModalDelegate* delegate = [[ModalDelegate alloc]
-+      initWithCallback:base::Bind(&SetReturnCode, &ret_code)
-+              andAlert:alert
-+          callEndModal:true];
-+
-+  NSWindow* window = parent_window->GetNativeWindow();
-+  [alert beginSheetModalForWindow:window
-+                    modalDelegate:delegate
-+                   didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:)
-+                      contextInfo:nil];
-+
-+  [NSApp runModalForWindow:window];
-+  return ret_code;
-+}
-+
-+void ShowMessageBox(NativeWindow* parent_window,
-+                    MessageBoxType type,
-+                    const std::vector<std::string>& buttons,
-+                    int default_id,
-+                    int cancel_id,
-+                    int options,
-+                    const std::string& title,
-+                    const std::string& message,
-+                    const std::string& detail,
-+                    const gfx::ImageSkia& icon,
-+                    const MessageBoxCallback& callback) {
-+  NSAlert* alert = CreateNSAlert(
-+      parent_window, type, buttons, default_id, title, message,
-+      detail, icon);
-+  ModalDelegate* delegate = [[ModalDelegate alloc] initWithCallback:callback
-+                                                           andAlert:alert
-+                                                       callEndModal:false];
-+
-+  NSWindow* window = parent_window ? parent_window->GetNativeWindow() : nil;
-+  [alert beginSheetModalForWindow:window
-+                    modalDelegate:delegate
-+                   didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:)
-+                      contextInfo:nil];
-+}
-+
-+void ShowErrorBox(const base::string16& title, const base::string16& content) {
-+  NSAlert* alert = [[NSAlert alloc] init];
-+  [alert setMessageText:base::SysUTF16ToNSString(title)];
-+  [alert setInformativeText:base::SysUTF16ToNSString(content)];
-+  [alert setAlertStyle:NSWarningAlertStyle];
-+  [alert runModal];
-+  [alert release];
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 23588526adb24381e4b76704ebaa7a6b550d5be0 electron/browser/ui/message_box_win.cc
-@@ -0,0 +1,244 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/ui/message_box.h"
-+
-+#include <windows.h>
-+#include <commctrl.h>
-+
-+#include <map>
-+#include <vector>
-+
-+#include "electron/browser/browser.h"
-+#include "electron/browser/native_window_views.h"
-+#include "base/callback.h"
-+#include "base/strings/string_util.h"
-+#include "base/strings/utf_string_conversions.h"
-+#include "base/threading/thread.h"
-+#include "base/win/scoped_gdi_object.h"
-+#include "content/public/browser/browser_thread.h"
-+#include "ui/gfx/icon_util.h"
-+
-+namespace electron {
-+
-+namespace {
-+
-+// Small command ID values are already taken by Windows, we have to start from
-+// a large number to avoid conflicts with Windows.
-+const int kIDStart = 100;
-+
-+// Get the common ID from button's name.
-+struct CommonButtonID {
-+  int button;
-+  int id;
-+};
-+CommonButtonID GetCommonID(const base::string16& button) {
-+  base::string16 lower = base::ToLowerASCII(button);
-+  if (lower == L"ok")
-+    return { TDCBF_OK_BUTTON, IDOK };
-+  else if (lower == L"yes")
-+    return { TDCBF_YES_BUTTON, IDYES };
-+  else if (lower == L"no")
-+    return { TDCBF_NO_BUTTON, IDNO };
-+  else if (lower == L"cancel")
-+    return { TDCBF_CANCEL_BUTTON, IDCANCEL };
-+  else if (lower == L"retry")
-+    return { TDCBF_RETRY_BUTTON, IDRETRY };
-+  else if (lower == L"close")
-+    return { TDCBF_CLOSE_BUTTON, IDCLOSE };
-+  return { -1, -1 };
-+}
-+
-+// Determine whether the buttons are common buttons, if so map common ID
-+// to button ID.
-+void MapToCommonID(const std::vector<base::string16>& buttons,
-+                   std::map<int, int>* id_map,
-+                   TASKDIALOG_COMMON_BUTTON_FLAGS* button_flags,
-+                   std::vector<TASKDIALOG_BUTTON>* dialog_buttons) {
-+  for (size_t i = 0; i < buttons.size(); ++i) {
-+    auto common = GetCommonID(buttons[i]);
-+    if (common.button != -1) {
-+      // It is a common button.
-+      (*id_map)[common.id] = i;
-+      (*button_flags) |= common.button;
-+    } else {
-+      // It is a custom button.
-+      dialog_buttons->push_back({i + kIDStart, buttons[i].c_str()});
-+    }
-+  }
-+}
-+
-+int ShowMessageBoxUTF16(HWND parent,
-+                        MessageBoxType type,
-+                        const std::vector<base::string16>& buttons,
-+                        int default_id,
-+                        int cancel_id,
-+                        int options,
-+                        const base::string16& title,
-+                        const base::string16& message,
-+                        const base::string16& detail,
-+                        const gfx::ImageSkia& icon) {
-+  TASKDIALOG_FLAGS flags =
-+      TDF_SIZE_TO_CONTENT |  // Show all content.
-+      TDF_ALLOW_DIALOG_CANCELLATION;  // Allow canceling the dialog.
-+
-+  TASKDIALOGCONFIG config = { 0 };
-+  config.cbSize     = sizeof(config);
-+  config.hwndParent = parent;
-+  config.hInstance  = GetModuleHandle(NULL);
-+  config.dwFlags    = flags;
-+
-+  if (default_id > 0)
-+    config.nDefaultButton = kIDStart + default_id;
-+
-+  // TaskDialogIndirect doesn't allow empty name, if we set empty title it
-+  // will show "electron.exe" in title.
-+  base::string16 app_name = base::UTF8ToUTF16(Browser::Get()->GetName());
-+  if (title.empty())
-+    config.pszWindowTitle = app_name.c_str();
-+  else
-+    config.pszWindowTitle = title.c_str();
-+
-+  base::win::ScopedHICON hicon;
-+  if (!icon.isNull()) {
-+    hicon = IconUtil::CreateHICONFromSkBitmap(*icon.bitmap());
-+    config.dwFlags |= TDF_USE_HICON_MAIN;
-+    config.hMainIcon = hicon.get();
-+  } else {
-+    // Show icon according to dialog's type.
-+    switch (type) {
-+      case MESSAGE_BOX_TYPE_INFORMATION:
-+      case MESSAGE_BOX_TYPE_QUESTION:
-+        config.pszMainIcon = TD_INFORMATION_ICON;
-+        break;
-+      case MESSAGE_BOX_TYPE_WARNING:
-+        config.pszMainIcon = TD_WARNING_ICON;
-+        break;
-+      case MESSAGE_BOX_TYPE_ERROR:
-+        config.pszMainIcon = TD_ERROR_ICON;
-+        break;
-+    }
-+  }
-+
-+  // If "detail" is empty then don't make message hilighted.
-+  if (detail.empty()) {
-+    config.pszContent = message.c_str();
-+  } else {
-+    config.pszMainInstruction = message.c_str();
-+    config.pszContent = detail.c_str();
-+  }
-+
-+  // Iterate through the buttons, put common buttons in dwCommonButtons
-+  // and custom buttons in pButtons.
-+  std::map<int, int> id_map;
-+  std::vector<TASKDIALOG_BUTTON> dialog_buttons;
-+  if (options & MESSAGE_BOX_NO_LINK) {
-+    for (size_t i = 0; i < buttons.size(); ++i)
-+      dialog_buttons.push_back({i + kIDStart, buttons[i].c_str()});
-+  } else {
-+    MapToCommonID(buttons, &id_map, &config.dwCommonButtons, &dialog_buttons);
-+  }
-+  if (dialog_buttons.size() > 0) {
-+    config.pButtons = &dialog_buttons.front();
-+    config.cButtons = dialog_buttons.size();
-+    if (!(options & MESSAGE_BOX_NO_LINK))
-+      config.dwFlags |= TDF_USE_COMMAND_LINKS;  // custom buttons as links.
-+  }
-+
-+  int id = 0;
-+  TaskDialogIndirect(&config, &id, NULL, NULL);
-+  if (id_map.find(id) != id_map.end())  // common button.
-+    return id_map[id];
-+  else if (id >= kIDStart)  // custom button.
-+    return id - kIDStart;
-+  else
-+    return cancel_id;
-+}
-+
-+void RunMessageBoxInNewThread(base::Thread* thread,
-+                              NativeWindow* parent,
-+                              MessageBoxType type,
-+                              const std::vector<std::string>& buttons,
-+                              int default_id,
-+                              int cancel_id,
-+                              int options,
-+                              const std::string& title,
-+                              const std::string& message,
-+                              const std::string& detail,
-+                              const gfx::ImageSkia& icon,
-+                              const MessageBoxCallback& callback) {
-+  int result = ShowMessageBox(parent, type, buttons, default_id,
-+                              cancel_id, options, title, message, detail, icon);
-+  content::BrowserThread::PostTask(
-+      content::BrowserThread::UI, FROM_HERE, base::Bind(callback, result));
-+  content::BrowserThread::DeleteSoon(
-+      content::BrowserThread::UI, FROM_HERE, thread);
-+}
-+
-+}  // namespace
-+
-+int ShowMessageBox(NativeWindow* parent,
-+                   MessageBoxType type,
-+                   const std::vector<std::string>& buttons,
-+                   int default_id,
-+                   int cancel_id,
-+                   int options,
-+                   const std::string& title,
-+                   const std::string& message,
-+                   const std::string& detail,
-+                   const gfx::ImageSkia& icon) {
-+  std::vector<base::string16> utf16_buttons;
-+  for (const auto& button : buttons)
-+    utf16_buttons.push_back(base::UTF8ToUTF16(button));
-+
-+  HWND hwnd_parent = parent ?
-+      static_cast<electron::NativeWindowViews*>(parent)->GetAcceleratedWidget() :
-+      NULL;
-+
-+  NativeWindow::DialogScope dialog_scope(parent);
-+  return ShowMessageBoxUTF16(hwnd_parent,
-+                             type,
-+                             utf16_buttons,
-+                             default_id,
-+                             cancel_id,
-+                             options,
-+                             base::UTF8ToUTF16(title),
-+                             base::UTF8ToUTF16(message),
-+                             base::UTF8ToUTF16(detail),
-+                             icon);
-+}
-+
-+void ShowMessageBox(NativeWindow* parent,
-+                    MessageBoxType type,
-+                    const std::vector<std::string>& buttons,
-+                    int default_id,
-+                    int cancel_id,
-+                    int options,
-+                    const std::string& title,
-+                    const std::string& message,
-+                    const std::string& detail,
-+                    const gfx::ImageSkia& icon,
-+                    const MessageBoxCallback& callback) {
-+  scoped_ptr<base::Thread> thread(
-+      new base::Thread(ELECTRON_PRODUCT_NAME "MessageBoxThread"));
-+  thread->init_com_with_mta(false);
-+  if (!thread->Start()) {
-+    callback.Run(cancel_id);
-+    return;
-+  }
-+
-+  base::Thread* unretained = thread.release();
-+  unretained->message_loop()->PostTask(
-+      FROM_HERE,
-+      base::Bind(&RunMessageBoxInNewThread, base::Unretained(unretained),
-+                 parent, type, buttons, default_id, cancel_id, options, title,
-+                 message, detail, icon, callback));
-+}
-+
-+void ShowErrorBox(const base::string16& title, const base::string16& content) {
-+  ShowMessageBoxUTF16(NULL, MESSAGE_BOX_TYPE_ERROR, {}, -1, 0, 0, L"Error",
-+                      title, content, gfx::ImageSkia());
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 8000863912f27027b709548508e752cab218f859 electron/browser/ui/tray_icon.cc
-@@ -0,0 +1,79 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/ui/tray_icon.h"
-+
-+namespace electron {
-+
-+TrayIcon::TrayIcon() {
-+}
-+
-+TrayIcon::~TrayIcon() {
-+}
-+
-+void TrayIcon::SetPressedImage(const gfx::Image& image) {
-+}
-+
-+void TrayIcon::SetTitle(const std::string& title) {
-+}
-+
-+void TrayIcon::SetHighlightMode(bool highlight) {
-+}
-+
-+void TrayIcon::DisplayBalloon(const gfx::Image& icon,
-+                              const base::string16& title,
-+                              const base::string16& contents) {
-+}
-+
-+void TrayIcon::PopUpContextMenu(const gfx::Point& pos,
-+                                ui::SimpleMenuModel* menu_model) {
-+}
-+
-+void TrayIcon::NotifyClicked(const gfx::Rect& bounds, int modifiers) {
-+  FOR_EACH_OBSERVER(TrayIconObserver, observers_, OnClicked(bounds, modifiers));
-+}
-+
-+void TrayIcon::NotifyDoubleClicked(const gfx::Rect& bounds, int modifiers) {
-+  FOR_EACH_OBSERVER(TrayIconObserver, observers_,
-+                    OnDoubleClicked(bounds, modifiers));
-+}
-+
-+void TrayIcon::NotifyBalloonShow() {
-+  FOR_EACH_OBSERVER(TrayIconObserver, observers_, OnBalloonShow());
-+}
-+
-+void TrayIcon::NotifyBalloonClicked() {
-+  FOR_EACH_OBSERVER(TrayIconObserver, observers_, OnBalloonClicked());
-+}
-+
-+void TrayIcon::NotifyBalloonClosed() {
-+  FOR_EACH_OBSERVER(TrayIconObserver, observers_, OnBalloonClosed());
-+}
-+
-+void TrayIcon::NotifyRightClicked(const gfx::Rect& bounds, int modifiers) {
-+  FOR_EACH_OBSERVER(TrayIconObserver, observers_,
-+                    OnRightClicked(bounds, modifiers));
-+}
-+
-+void TrayIcon::NotifyDrop() {
-+  FOR_EACH_OBSERVER(TrayIconObserver, observers_, OnDrop());
-+}
-+
-+void TrayIcon::NotifyDropFiles(const std::vector<std::string>& files) {
-+  FOR_EACH_OBSERVER(TrayIconObserver, observers_, OnDropFiles(files));
-+}
-+
-+void TrayIcon::NotifyDragEntered() {
-+  FOR_EACH_OBSERVER(TrayIconObserver, observers_, OnDragEntered());
-+}
-+
-+void TrayIcon::NotifyDragExited() {
-+  FOR_EACH_OBSERVER(TrayIconObserver, observers_, OnDragExited());
-+}
-+
-+void TrayIcon::NotifyDragEnded() {
-+  FOR_EACH_OBSERVER(TrayIconObserver, observers_, OnDragEnded());
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 c5f3595ffe3f3983fa54935d2a42340bfb699128 electron/browser/ui/tray_icon.h
-@@ -0,0 +1,83 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_UI_TRAY_ICON_H_
-+#define ELECTRON_BROWSER_UI_TRAY_ICON_H_
-+
-+#include <string>
-+#include <vector>
-+
-+#include "electron/browser/ui/tray_icon_observer.h"
-+#include "base/observer_list.h"
-+#include "ui/base/models/simple_menu_model.h"
-+#include "ui/gfx/geometry/rect.h"
-+
-+namespace electron {
-+
-+class TrayIcon {
-+ public:
-+  static TrayIcon* Create();
-+
-+  virtual ~TrayIcon();
-+
-+  // Sets the image associated with this status icon.
-+  virtual void SetImage(const gfx::Image& image) = 0;
-+
-+  // Sets the image associated with this status icon when pressed.
-+  virtual void SetPressedImage(const gfx::Image& image);
-+
-+  // Sets the hover text for this status icon. This is also used as the label
-+  // for the menu item which is created as a replacement for the status icon
-+  // click action on platforms that do not support custom click actions for the
-+  // status icon (e.g. Ubuntu Unity).
-+  virtual void SetToolTip(const std::string& tool_tip) = 0;
-+
-+  // Sets the title displayed aside of the status icon in the status bar. This
-+  // only works on OS X.
-+  virtual void SetTitle(const std::string& title);
-+
-+  // Sets whether the status icon is highlighted when it is clicked. This only
-+  // works on OS X.
-+  virtual void SetHighlightMode(bool highlight);
-+
-+  // Displays a notification balloon with the specified contents.
-+  // Depending on the platform it might not appear by the icon tray.
-+  virtual void DisplayBalloon(const gfx::Image& icon,
-+                              const base::string16& title,
-+                              const base::string16& contents);
-+
-+  // Popups the menu.
-+  virtual void PopUpContextMenu(const gfx::Point& pos,
-+                                ui::SimpleMenuModel* menu_model);
-+
-+  // Set the context menu for this icon.
-+  virtual void SetContextMenu(ui::SimpleMenuModel* menu_model) = 0;
-+
-+  void AddObserver(TrayIconObserver* obs) { observers_.AddObserver(obs); }
-+  void RemoveObserver(TrayIconObserver* obs) { observers_.RemoveObserver(obs); }
-+  void NotifyClicked(const gfx::Rect& = gfx::Rect(), int modifiers = 0);
-+  void NotifyDoubleClicked(const gfx::Rect& = gfx::Rect(), int modifiers = 0);
-+  void NotifyBalloonShow();
-+  void NotifyBalloonClicked();
-+  void NotifyBalloonClosed();
-+  void NotifyRightClicked(const gfx::Rect& bounds = gfx::Rect(),
-+                          int modifiers = 0);
-+  void NotifyDrop();
-+  void NotifyDropFiles(const std::vector<std::string>& files);
-+  void NotifyDragEntered();
-+  void NotifyDragExited();
-+  void NotifyDragEnded();
-+
-+ protected:
-+  TrayIcon();
-+
-+ private:
-+  base::ObserverList<TrayIconObserver> observers_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(TrayIcon);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_UI_TRAY_ICON_H_
-added in remote
-  their  100644 b7e893c18054c5dc094412942497861d8539efd7 electron/browser/ui/tray_icon_cocoa.h
-@@ -0,0 +1,55 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_UI_TRAY_ICON_COCOA_H_
-+#define ELECTRON_BROWSER_UI_TRAY_ICON_COCOA_H_
-+
-+#import <Cocoa/Cocoa.h>
-+
-+#include <string>
-+
-+#include "electron/browser/ui/electron_menu_model.h"
-+#include "electron/browser/ui/tray_icon.h"
-+#include "base/mac/scoped_nsobject.h"
-+
-+@class ElectronMenuController;
-+@class StatusItemView;
-+
-+namespace electron {
-+
-+class TrayIconCocoa : public TrayIcon,
-+                      public ElectronMenuModel::Observer {
-+ public:
-+  TrayIconCocoa();
-+  virtual ~TrayIconCocoa();
-+
-+  void SetImage(const gfx::Image& image) override;
-+  void SetPressedImage(const gfx::Image& image) override;
-+  void SetToolTip(const std::string& tool_tip) override;
-+  void SetTitle(const std::string& title) override;
-+  void SetHighlightMode(bool highlight) override;
-+  void PopUpContextMenu(const gfx::Point& pos,
-+                        ui::SimpleMenuModel* menu_model) override;
-+  void SetContextMenu(ui::SimpleMenuModel* menu_model) override;
-+
-+ protected:
-+  // ElectronMenuModel::Observer:
-+  void MenuClosed() override;
-+
-+ private:
-+  // Atom custom view for NSStatusItem.
-+  base::scoped_nsobject<StatusItemView> status_item_view_;
-+
-+  // Status menu shown when right-clicking the system icon.
-+  base::scoped_nsobject<ElectronMenuController> menu_;
-+
-+  // Used for unregistering observer.
-+  ElectronMenuModel* menu_model_;  // weak ref.
-+
-+  DISALLOW_COPY_AND_ASSIGN(TrayIconCocoa);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_UI_TRAY_ICON_COCOA_H_
-added in remote
-  their  100644 b191951c1214f2057fd00afe38148cb561913b2a electron/browser/ui/tray_icon_cocoa.mm
-@@ -0,0 +1,391 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/ui/tray_icon_cocoa.h"
-+
-+#include "electron/browser/ui/cocoa/electron_menu_controller.h"
-+#include "base/strings/sys_string_conversions.h"
-+#include "ui/events/cocoa/cocoa_event_utils.h"
-+#include "ui/gfx/image/image.h"
-+#include "ui/gfx/screen.h"
-+
-+namespace {
-+
-+// By default, OS X sets 4px to tray image as left and right padding margin.
-+const CGFloat kHorizontalMargin = 4;
-+// OS X tends to make the title 2px lower.
-+const CGFloat kVerticalTitleMargin = 2;
-+
-+}  //  namespace
-+
-+@interface StatusItemView : NSView {
-+  electron::TrayIconCocoa* trayIcon_; // weak
-+  ElectronMenuController* menuController_; // weak
-+  BOOL isHighlightEnable_;
-+  BOOL forceHighlight_;
-+  BOOL inMouseEventSequence_;
-+  base::scoped_nsobject<NSImage> image_;
-+  base::scoped_nsobject<NSImage> alternateImage_;
-+  base::scoped_nsobject<NSImageView> image_view_;
-+  base::scoped_nsobject<NSString> title_;
-+  base::scoped_nsobject<NSStatusItem> statusItem_;
-+}
-+
-+@end  // @interface StatusItemView
-+
-+@implementation StatusItemView
-+
-+- (id)initWithImage:(NSImage*)image icon:(electron::TrayIconCocoa*)icon {
-+  image_.reset([image copy]);
-+  trayIcon_ = icon;
-+  isHighlightEnable_ = YES;
-+  forceHighlight_ = NO;
-+  inMouseEventSequence_ = NO;
-+
-+  if ((self = [super initWithFrame: CGRectZero])) {
-+    // Setup the image view.
-+    image_view_.reset([[NSImageView alloc] initWithFrame: CGRectZero]);
-+    [image_view_ setImageScaling:NSImageScaleNone];
-+    [image_view_ setImageAlignment:NSImageAlignCenter];
-+    [self addSubview:image_view_];
-+
-+    // Unregister image_view_ as a dragged destination, allows its parent view
-+    // (StatusItemView) handle dragging events.
-+    [image_view_ unregisterDraggedTypes];
-+    [self registerForDraggedTypes: @[NSFilenamesPboardType]];
-+
-+    // Create the status item.
-+    NSStatusItem * item = [[NSStatusBar systemStatusBar]
-+                            statusItemWithLength:NSVariableStatusItemLength];
-+    statusItem_.reset([item retain]);
-+    [statusItem_ setView:self];
-+
-+    // Finalize setup by sizing our views
-+    [self updateDimensions];
-+  }
-+  return self;
-+}
-+
-+- (void)updateDimensions {
-+  NSStatusBar * bar = [NSStatusBar systemStatusBar];
-+  [image_view_ setFrame: NSMakeRect(0, 0, [self iconWidth], [bar thickness])];
-+  [self setFrame: NSMakeRect(0, 0, [self fullWidth], [bar thickness])];
-+  [self setNeedsDisplay:YES];
-+}
-+
-+- (void)removeItem {
-+  [[NSStatusBar systemStatusBar] removeStatusItem:statusItem_];
-+  statusItem_.reset();
-+}
-+
-+- (void)drawRect:(NSRect)dirtyRect {
-+  // Draw the tray icon and title that align with NSStatusItem, layout:
-+  //   ----------------
-+  //   | icon | title |
-+  ///  ----------------
-+
-+  // Draw background.
-+  BOOL highlight = [self shouldHighlight];
-+  CGFloat thickness = [[statusItem_ statusBar] thickness];
-+  [statusItem_ drawStatusBarBackgroundInRect:self.bounds withHighlight:highlight];
-+
-+  // Make use of NSImageView to draw the image, which can correctly draw
-+  // template image under dark menu bar.
-+  if (inMouseEventSequence_ && alternateImage_ &&
-+      [image_view_ image] != alternateImage_.get()) {
-+    [image_view_ setImage:alternateImage_];
-+  } else if ([image_view_ image] != image_.get()) {
-+    [image_view_ setImage:image_];
-+  }
-+
-+  if (title_) {
-+    // Highlight the text when icon is highlighted or in dark mode.
-+    highlight |= [self isDarkMode];
-+    // Draw title.
-+    NSRect titleDrawRect = NSMakeRect(
-+        [self iconWidth], -kVerticalTitleMargin, [self titleWidth], thickness);
-+    [title_ drawInRect:titleDrawRect
-+        withAttributes:[self titleAttributesWithHighlight:highlight]];
-+  }
-+}
-+
-+- (BOOL)isDarkMode {
-+  NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
-+  NSString* mode = [defaults stringForKey:@"AppleInterfaceStyle"];
-+  return mode && [mode isEqualToString:@"Dark"];
-+}
-+
-+// The width of the full status item.
-+- (CGFloat)fullWidth {
-+  if (title_)
-+    return [self iconWidth] + [self titleWidth] + kHorizontalMargin;
-+  else
-+    return [self iconWidth];
-+}
-+
-+// The width of the icon.
-+- (CGFloat)iconWidth {
-+  CGFloat thickness = [[NSStatusBar systemStatusBar] thickness];
-+  CGFloat imageHeight = [image_ size].height;
-+  CGFloat imageWidth = [image_ size].width;
-+  CGFloat iconWidth = imageWidth;
-+  if (imageWidth < thickness) {
-+    // Image's width must be larger than menu bar's height.
-+    iconWidth = thickness;
-+  } else {
-+    CGFloat verticalMargin = thickness - imageHeight;
-+    // Image must have same horizontal vertical margin.
-+    if (verticalMargin > 0 && imageWidth != imageHeight)
-+      iconWidth = imageWidth + verticalMargin;
-+    CGFloat horizontalMargin = thickness - imageWidth;
-+    // Image must have at least kHorizontalMargin horizontal margin on each
-+    // side.
-+    if (horizontalMargin < 2 * kHorizontalMargin)
-+      iconWidth = imageWidth + 2 * kHorizontalMargin;
-+  }
-+  return iconWidth;
-+}
-+
-+// The width of the title.
-+- (CGFloat)titleWidth {
-+  if (!title_)
-+     return 0;
-+  base::scoped_nsobject<NSAttributedString> attributes(
-+      [[NSAttributedString alloc] initWithString:title_
-+                                      attributes:[self titleAttributes]]);
-+  return [attributes size].width;
-+}
-+
-+- (NSDictionary*)titleAttributesWithHighlight:(BOOL)highlight {
-+  NSFont* font = [NSFont menuBarFontOfSize:0];
-+  NSColor* foregroundColor = highlight ?
-+      [NSColor whiteColor] :
-+      [NSColor colorWithRed:0.265625 green:0.25390625 blue:0.234375 alpha:1.0];
-+  return @{
-+    NSFontAttributeName: font,
-+    NSForegroundColorAttributeName: foregroundColor
-+  };
-+}
-+
-+- (NSDictionary*)titleAttributes {
-+  return [self titleAttributesWithHighlight:[self isDarkMode]];
-+}
-+
-+- (void)setImage:(NSImage*)image {
-+  image_.reset([image copy]);
-+  [self updateDimensions];
-+}
-+
-+- (void)setAlternateImage:(NSImage*)image {
-+  alternateImage_.reset([image copy]);
-+}
-+
-+- (void)setHighlight:(BOOL)highlight {
-+  isHighlightEnable_ = highlight;
-+}
-+
-+- (void)setTitle:(NSString*)title {
-+  if (title.length > 0) {
-+    title_.reset([title copy]);
-+  } else {
-+    title_.reset();
-+  }
-+  [self updateDimensions];
-+}
-+
-+- (void)setMenuController:(ElectronMenuController*)menu {
-+  menuController_ = menu;
-+}
-+
-+- (void)mouseDown:(NSEvent*)event {
-+  inMouseEventSequence_ = YES;
-+  [self setNeedsDisplay:YES];
-+}
-+
-+- (void)mouseUp:(NSEvent*)event {
-+  if (!inMouseEventSequence_) {
-+     // If the menu is showing, when user clicked the tray icon, the `mouseDown`
-+     // event will be dissmissed, we need to close the menu at this time.
-+     [self setNeedsDisplay:YES];
-+     return;
-+  }
-+  inMouseEventSequence_ = NO;
-+
-+  // Show menu when there is a context menu.
-+  // NB(hokein): Make tray's behavior more like official one's.
-+  // When the tray icon gets clicked quickly multiple times, the
-+  // event.clickCount doesn't always return 1. Instead, it returns a value that
-+  // counts the clicked times.
-+  // So we don't check the clickCount here, just pop up the menu for each click
-+  // event.
-+  if (menuController_)
-+    [statusItem_ popUpStatusItemMenu:[menuController_ menu]];
-+
-+  // Don't emit click events when menu is showing.
-+  if (menuController_)
-+    return;
-+
-+  // Single click event.
-+  if (event.clickCount == 1)
-+    trayIcon_->NotifyClicked(
-+        [self getBoundsFromEvent:event],
-+        ui::EventFlagsFromModifiers([event modifierFlags]));
-+
-+  // Double click event.
-+  if (event.clickCount == 2)
-+    trayIcon_->NotifyDoubleClicked(
-+        [self getBoundsFromEvent:event],
-+        ui::EventFlagsFromModifiers([event modifierFlags]));
-+
-+  [self setNeedsDisplay:YES];
-+}
-+
-+- (void)popUpContextMenu:(ui::SimpleMenuModel*)menu_model {
-+  // Show a custom menu.
-+  if (menu_model) {
-+    base::scoped_nsobject<ElectronMenuController> menuController(
-+        [[ElectronMenuController alloc] initWithModel:menu_model]);
-+    forceHighlight_ = YES;  // Should highlight when showing menu.
-+    [self setNeedsDisplay:YES];
-+    [statusItem_ popUpStatusItemMenu:[menuController menu]];
-+    forceHighlight_ = NO;
-+    [self setNeedsDisplay:YES];
-+    return;
-+  }
-+
-+  if (menuController_ && ![menuController_ isMenuOpen]) {
-+    // Redraw the dray icon to show highlight if it is enabled.
-+    [self setNeedsDisplay:YES];
-+    [statusItem_ popUpStatusItemMenu:[menuController_ menu]];
-+    // The popUpStatusItemMenu returns only after the showing menu is closed.
-+    // When it returns, we need to redraw the tray icon to not show highlight.
-+    [self setNeedsDisplay:YES];
-+  }
-+}
-+
-+- (void)rightMouseUp:(NSEvent*)event {
-+  trayIcon_->NotifyRightClicked(
-+      [self getBoundsFromEvent:event],
-+      ui::EventFlagsFromModifiers([event modifierFlags]));
-+}
-+
-+- (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender {
-+  trayIcon_->NotifyDragEntered();
-+  return NSDragOperationCopy;
-+}
-+
-+- (void)draggingExited:(id <NSDraggingInfo>)sender {
-+  trayIcon_->NotifyDragExited();
-+}
-+
-+- (void)draggingEnded:(id <NSDraggingInfo>)sender {
-+  trayIcon_->NotifyDragEnded();
-+
-+  if (NSPointInRect([sender draggingLocation], self.frame)) {
-+    trayIcon_->NotifyDrop();
-+    [self handleDrop:sender];
-+  }
-+}
-+
-+- (BOOL)handleDrop:(id <NSDraggingInfo>)sender {
-+  NSPasteboard* pboard = [sender draggingPasteboard];
-+
-+  if ([[pboard types] containsObject:NSFilenamesPboardType]) {
-+    std::vector<std::string> dropFiles;
-+    NSArray* files = [pboard propertyListForType:NSFilenamesPboardType];
-+    for (NSString* file in files)
-+      dropFiles.push_back(base::SysNSStringToUTF8(file));
-+    trayIcon_->NotifyDropFiles(dropFiles);
-+    return YES;
-+  }
-+  return NO;
-+}
-+
-+- (BOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender {
-+  return YES;
-+}
-+
-+- (BOOL)performDragOperation:(id <NSDraggingInfo>)sender {
-+  return YES;
-+}
-+
-+- (BOOL)shouldHighlight {
-+  if (isHighlightEnable_ && forceHighlight_)
-+    return true;
-+  BOOL isMenuOpen = menuController_ && [menuController_ isMenuOpen];
-+  return isHighlightEnable_ && (inMouseEventSequence_ || isMenuOpen);
-+}
-+
-+- (gfx::Rect)getBoundsFromEvent:(NSEvent*)event {
-+  NSRect frame = event.window.frame;
-+  gfx::Rect bounds(frame.origin.x, 0, NSWidth(frame), NSHeight(frame));
-+  NSScreen* screen = [[NSScreen screens] objectAtIndex:0];
-+  bounds.set_y(NSHeight([screen frame]) - NSMaxY(frame));
-+  return bounds;
-+}
-+@end
-+
-+namespace electron {
-+
-+TrayIconCocoa::TrayIconCocoa() : menu_model_(nullptr) {
-+}
-+
-+TrayIconCocoa::~TrayIconCocoa() {
-+  [status_item_view_ removeItem];
-+  if (menu_model_)
-+    menu_model_->RemoveObserver(this);
-+}
-+
-+void TrayIconCocoa::SetImage(const gfx::Image& image) {
-+  if (status_item_view_) {
-+    [status_item_view_ setImage:image.AsNSImage()];
-+  } else {
-+    status_item_view_.reset(
-+        [[StatusItemView alloc] initWithImage:image.AsNSImage()
-+                                         icon:this]);
-+  }
-+}
-+
-+void TrayIconCocoa::SetPressedImage(const gfx::Image& image) {
-+  [status_item_view_ setAlternateImage:image.AsNSImage()];
-+}
-+
-+void TrayIconCocoa::SetToolTip(const std::string& tool_tip) {
-+  [status_item_view_ setToolTip:base::SysUTF8ToNSString(tool_tip)];
-+}
-+
-+void TrayIconCocoa::SetTitle(const std::string& title) {
-+  [status_item_view_ setTitle:base::SysUTF8ToNSString(title)];
-+}
-+
-+void TrayIconCocoa::SetHighlightMode(bool highlight) {
-+  [status_item_view_ setHighlight:highlight];
-+}
-+
-+void TrayIconCocoa::PopUpContextMenu(const gfx::Point& pos,
-+                                     ui::SimpleMenuModel* menu_model) {
-+  [status_item_view_ popUpContextMenu:menu_model];
-+}
-+
-+void TrayIconCocoa::SetContextMenu(ui::SimpleMenuModel* menu_model) {
-+  // Substribe to MenuClosed event.
-+  if (menu_model_)
-+    menu_model_->RemoveObserver(this);
-+  static_cast<ElectronMenuModel*>(menu_model)->AddObserver(this);
-+
-+  // Create native menu.
-+  menu_.reset([[ElectronMenuController alloc] initWithModel:menu_model]);
-+  [status_item_view_ setMenuController:menu_.get()];
-+}
-+
-+void TrayIconCocoa::MenuClosed() {
-+  [status_item_view_ setNeedsDisplay:YES];
-+}
-+
-+// static
-+TrayIcon* TrayIcon::Create() {
-+  return new TrayIconCocoa;
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 65ca76a62ffa000cc8d1cbe24b24e4cac4768de6 electron/browser/ui/tray_icon_gtk.cc
-@@ -0,0 +1,57 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/ui/tray_icon_gtk.h"
-+
-+#include "base/guid.h"
-+#include "base/strings/utf_string_conversions.h"
-+#include "chrome/browser/ui/libgtk2ui/app_indicator_icon.h"
-+#include "chrome/browser/ui/libgtk2ui/gtk2_status_icon.h"
-+#include "ui/gfx/image/image.h"
-+
-+namespace electron {
-+
-+TrayIconGtk::TrayIconGtk() {
-+}
-+
-+TrayIconGtk::~TrayIconGtk() {
-+}
-+
-+void TrayIconGtk::SetImage(const gfx::Image& image) {
-+  if (icon_) {
-+    icon_->SetImage(image.AsImageSkia());
-+    return;
-+  }
-+
-+  base::string16 empty;
-+  if (libgtk2ui::AppIndicatorIcon::CouldOpen())
-+    icon_.reset(new libgtk2ui::AppIndicatorIcon(
-+        base::GenerateGUID(), image.AsImageSkia(), empty));
-+  else
-+    icon_.reset(new libgtk2ui::Gtk2StatusIcon(image.AsImageSkia(), empty));
-+  icon_->set_delegate(this);
-+}
-+
-+void TrayIconGtk::SetToolTip(const std::string& tool_tip) {
-+  icon_->SetToolTip(base::UTF8ToUTF16(tool_tip));
-+}
-+
-+void TrayIconGtk::SetContextMenu(ui::SimpleMenuModel* menu_model) {
-+  icon_->UpdatePlatformContextMenu(menu_model);
-+}
-+
-+void TrayIconGtk::OnClick() {
-+  NotifyClicked();
-+}
-+
-+bool TrayIconGtk::HasClickAction() {
-+  return false;
-+}
-+
-+// static
-+TrayIcon* TrayIcon::Create() {
-+  return new TrayIconGtk;
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 1f1b807c229e6d7d122f26f745da5313e2892bd3 electron/browser/ui/tray_icon_gtk.h
-@@ -0,0 +1,42 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_UI_TRAY_ICON_GTK_H_
-+#define ELECTRON_BROWSER_UI_TRAY_ICON_GTK_H_
-+
-+#include <string>
-+
-+#include "electron/browser/ui/tray_icon.h"
-+#include "ui/views/linux_ui/status_icon_linux.h"
-+
-+namespace views {
-+class StatusIconLinux;
-+}
-+
-+namespace electron {
-+
-+class TrayIconGtk : public TrayIcon,
-+                    public views::StatusIconLinux::Delegate {
-+ public:
-+  TrayIconGtk();
-+  virtual ~TrayIconGtk();
-+
-+  // TrayIcon:
-+  void SetImage(const gfx::Image& image) override;
-+  void SetToolTip(const std::string& tool_tip) override;
-+  void SetContextMenu(ui::SimpleMenuModel* menu_model) override;
-+
-+ private:
-+  // views::StatusIconLinux::Delegate:
-+  void OnClick() override;
-+  bool HasClickAction() override;
-+
-+  scoped_ptr<views::StatusIconLinux> icon_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(TrayIconGtk);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_UI_TRAY_ICON_GTK_H_
-added in remote
-  their  100644 cb9c8ff63d0f0eaf77713dc2e034027d19d36772 electron/browser/ui/tray_icon_observer.h
-@@ -0,0 +1,37 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_UI_TRAY_ICON_OBSERVER_H_
-+#define ELECTRON_BROWSER_UI_TRAY_ICON_OBSERVER_H_
-+
-+#include <string>
-+#include <vector>
-+
-+namespace gfx {
-+class Rect;
-+}
-+
-+namespace electron {
-+
-+class TrayIconObserver {
-+ public:
-+  virtual void OnClicked(const gfx::Rect& bounds, int modifiers) {}
-+  virtual void OnDoubleClicked(const gfx::Rect& bounds, int modifiers) {}
-+  virtual void OnBalloonShow() {}
-+  virtual void OnBalloonClicked() {}
-+  virtual void OnBalloonClosed() {}
-+  virtual void OnRightClicked(const gfx::Rect& bounds, int modifiers) {}
-+  virtual void OnDrop() {}
-+  virtual void OnDropFiles(const std::vector<std::string>& files) {}
-+  virtual void OnDragEntered() {}
-+  virtual void OnDragExited() {}
-+  virtual void OnDragEnded() {}
-+
-+ protected:
-+  virtual ~TrayIconObserver() {}
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_UI_TRAY_ICON_OBSERVER_H_
-added in remote
-  their  100644 18aac4ca4afbf5bfe3e140b5565ddaea03882706 electron/browser/ui/tray_icon_win.cc
-@@ -0,0 +1,16 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/ui/win/notify_icon.h"
-+#include "electron/browser/ui/win/notify_icon_host.h"
-+
-+namespace electron {
-+
-+// static
-+TrayIcon* TrayIcon::Create() {
-+  static NotifyIconHost host;
-+  return host.CreateNotifyIcon();
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 71b045fc76937348c7059b27670bd2709d57438a electron/browser/ui/views/frameless_view.cc
-@@ -0,0 +1,118 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/ui/views/frameless_view.h"
-+
-+#include "electron/browser/native_window_views.h"
-+#include "ui/aura/window.h"
-+#include "ui/base/hit_test.h"
-+#include "ui/views/widget/widget.h"
-+#include "ui/views/widget/widget_delegate.h"
-+
-+namespace electron {
-+
-+namespace {
-+
-+const int kResizeInsideBoundsSize = 5;
-+const int kResizeAreaCornerSize = 16;
-+
-+const char kViewClassName[] = "FramelessView";
-+
-+}  // namespace
-+
-+FramelessView::FramelessView() : window_(NULL), frame_(NULL) {
-+}
-+
-+FramelessView::~FramelessView() {
-+}
-+
-+void FramelessView::Init(NativeWindowViews* window, views::Widget* frame) {
-+  window_ = window;
-+  frame_ = frame;
-+}
-+
-+int FramelessView::ResizingBorderHitTest(const gfx::Point& point) {
-+  // Check the frame first, as we allow a small area overlapping the contents
-+  // to be used for resize handles.
-+  bool can_ever_resize = frame_->widget_delegate() ?
-+      frame_->widget_delegate()->CanResize() :
-+      false;
-+  // Don't allow overlapping resize handles when the window is maximized or
-+  // fullscreen, as it can't be resized in those states.
-+  int resize_border =
-+      frame_->IsMaximized() || frame_->IsFullscreen() ? 0 :
-+      kResizeInsideBoundsSize;
-+  return GetHTComponentForFrame(point, resize_border, resize_border,
-+      kResizeAreaCornerSize, kResizeAreaCornerSize, can_ever_resize);
-+}
-+
-+gfx::Rect FramelessView::GetBoundsForClientView() const {
-+  return bounds();
-+}
-+
-+gfx::Rect FramelessView::GetWindowBoundsForClientBounds(
-+    const gfx::Rect& client_bounds) const {
-+  gfx::Rect window_bounds = client_bounds;
-+  // Enforce minimum size (1, 1) in case that client_bounds is passed with
-+  // empty size. This could occur when the frameless window is being
-+  // initialized.
-+  if (window_bounds.IsEmpty()) {
-+    window_bounds.set_width(1);
-+    window_bounds.set_height(1);
-+  }
-+  return window_bounds;
-+}
-+
-+int FramelessView::NonClientHitTest(const gfx::Point& cursor) {
-+  if (frame_->IsFullscreen())
-+    return HTCLIENT;
-+
-+  // Check for possible draggable region in the client area for the frameless
-+  // window.
-+  SkRegion* draggable_region = window_->draggable_region();
-+  if (draggable_region && draggable_region->contains(cursor.x(), cursor.y()))
-+    return HTCAPTION;
-+
-+  // Support resizing frameless window by dragging the border.
-+  int frame_component = ResizingBorderHitTest(cursor);
-+  if (frame_component != HTNOWHERE)
-+    return frame_component;
-+
-+  return HTCLIENT;
-+}
-+
-+void FramelessView::GetWindowMask(const gfx::Size& size,
-+                                  gfx::Path* window_mask) {
-+}
-+
-+void FramelessView::ResetWindowControls() {
-+}
-+
-+void FramelessView::UpdateWindowIcon() {
-+}
-+
-+void FramelessView::UpdateWindowTitle() {
-+}
-+
-+void FramelessView::SizeConstraintsChanged() {
-+}
-+
-+gfx::Size FramelessView::GetPreferredSize() const {
-+  return frame_->non_client_view()->GetWindowBoundsForClientBounds(
-+      gfx::Rect(frame_->client_view()->GetPreferredSize())).size();
-+}
-+
-+gfx::Size FramelessView::GetMinimumSize() const {
-+  return window_->GetContentSizeConstraints().GetMinimumSize();
-+}
-+
-+gfx::Size FramelessView::GetMaximumSize() const {
-+  return window_->GetContentSizeConstraints().GetMaximumSize();
-+}
-+
-+const char* FramelessView::GetClassName() const {
-+  return kViewClassName;
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 050b2e2bb49e28cfd24e51c139847a3b60ffb71f electron/browser/ui/views/frameless_view.h
-@@ -0,0 +1,57 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_UI_VIEWS_FRAMELESS_VIEW_H_
-+#define ELECTRON_BROWSER_UI_VIEWS_FRAMELESS_VIEW_H_
-+
-+#include "ui/views/window/non_client_view.h"
-+
-+namespace views {
-+class Widget;
-+}
-+
-+namespace electron {
-+
-+class NativeWindowViews;
-+
-+class FramelessView : public views::NonClientFrameView {
-+ public:
-+  FramelessView();
-+  virtual ~FramelessView();
-+
-+  virtual void Init(NativeWindowViews* window, views::Widget* frame);
-+
-+  // Returns whether the |point| is on frameless window's resizing border.
-+  int ResizingBorderHitTest(const gfx::Point& point);
-+
-+ protected:
-+  // views::NonClientFrameView:
-+  gfx::Rect GetBoundsForClientView() const override;
-+  gfx::Rect GetWindowBoundsForClientBounds(
-+      const gfx::Rect& client_bounds) const override;
-+  int NonClientHitTest(const gfx::Point& point) override;
-+  void GetWindowMask(const gfx::Size& size,
-+                     gfx::Path* window_mask) override;
-+  void ResetWindowControls() override;
-+  void UpdateWindowIcon() override;
-+  void UpdateWindowTitle() override;
-+  void SizeConstraintsChanged() override;
-+
-+  // Overridden from View:
-+  gfx::Size GetPreferredSize() const override;
-+  gfx::Size GetMinimumSize() const override;
-+  gfx::Size GetMaximumSize() const override;
-+  const char* GetClassName() const override;
-+
-+  // Not owned.
-+  NativeWindowViews* window_;
-+  views::Widget* frame_;
-+
-+ private:
-+  DISALLOW_COPY_AND_ASSIGN(FramelessView);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_UI_VIEWS_FRAMELESS_VIEW_H_
-added in remote
-  their  100644 71307107d11d262d7900e340bc72c69219991d69 electron/browser/ui/views/global_menu_bar_x11.cc
-@@ -0,0 +1,319 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/ui/views/global_menu_bar_x11.h"
-+
-+#include <X11/Xlib.h>
-+
-+// This conflicts with mate::Converter,
-+#undef True
-+#undef False
-+// and V8.
-+#undef None
-+
-+#include <dlfcn.h>
-+#include <glib-object.h>
-+
-+#include "electron/browser/native_window_views.h"
-+#include "base/logging.h"
-+#include "base/strings/stringprintf.h"
-+#include "base/strings/utf_string_conversions.h"
-+#include "chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h"
-+#include "ui/aura/window.h"
-+#include "ui/aura/window_tree_host.h"
-+#include "ui/base/accelerators/menu_label_accelerator_util_linux.h"
-+#include "ui/base/models/menu_model.h"
-+#include "ui/events/keycodes/keyboard_code_conversion_x.h"
-+
-+// libdbusmenu-glib types
-+typedef struct _DbusmenuMenuitem DbusmenuMenuitem;
-+typedef DbusmenuMenuitem* (*dbusmenu_menuitem_new_func)();
-+typedef DbusmenuMenuitem* (*dbusmenu_menuitem_new_with_id_func)(int id);
-+
-+typedef int (*dbusmenu_menuitem_get_id_func)(DbusmenuMenuitem* item);
-+typedef GList* (*dbusmenu_menuitem_get_children_func)(DbusmenuMenuitem* item);
-+typedef DbusmenuMenuitem* (*dbusmenu_menuitem_child_append_func)(
-+    DbusmenuMenuitem* parent,
-+    DbusmenuMenuitem* child);
-+typedef DbusmenuMenuitem* (*dbusmenu_menuitem_property_set_func)(
-+    DbusmenuMenuitem* item,
-+    const char* property,
-+    const char* value);
-+typedef DbusmenuMenuitem* (*dbusmenu_menuitem_property_set_variant_func)(
-+    DbusmenuMenuitem* item,
-+    const char* property,
-+    GVariant* value);
-+typedef DbusmenuMenuitem* (*dbusmenu_menuitem_property_set_bool_func)(
-+    DbusmenuMenuitem* item,
-+    const char* property,
-+    bool value);
-+typedef DbusmenuMenuitem* (*dbusmenu_menuitem_property_set_int_func)(
-+    DbusmenuMenuitem* item,
-+    const char* property,
-+    int value);
-+
-+typedef struct _DbusmenuServer      DbusmenuServer;
-+typedef DbusmenuServer* (*dbusmenu_server_new_func)(const char* object);
-+typedef void (*dbusmenu_server_set_root_func)(DbusmenuServer* self,
-+                                              DbusmenuMenuitem* root);
-+
-+namespace electron {
-+
-+namespace {
-+
-+// Retrieved functions from libdbusmenu-glib.
-+
-+// DbusmenuMenuItem methods:
-+dbusmenu_menuitem_new_func menuitem_new = NULL;
-+dbusmenu_menuitem_new_with_id_func menuitem_new_with_id = NULL;
-+dbusmenu_menuitem_get_id_func menuitem_get_id = NULL;
-+dbusmenu_menuitem_get_children_func menuitem_get_children = NULL;
-+dbusmenu_menuitem_get_children_func menuitem_take_children = NULL;
-+dbusmenu_menuitem_child_append_func menuitem_child_append = NULL;
-+dbusmenu_menuitem_property_set_func menuitem_property_set = NULL;
-+dbusmenu_menuitem_property_set_variant_func menuitem_property_set_variant =
-+    NULL;
-+dbusmenu_menuitem_property_set_bool_func menuitem_property_set_bool = NULL;
-+dbusmenu_menuitem_property_set_int_func menuitem_property_set_int = NULL;
-+
-+// DbusmenuServer methods:
-+dbusmenu_server_new_func server_new = NULL;
-+dbusmenu_server_set_root_func server_set_root = NULL;
-+
-+// Properties that we set on menu items:
-+const char kPropertyEnabled[] = "enabled";
-+const char kPropertyLabel[] = "label";
-+const char kPropertyShortcut[] = "shortcut";
-+const char kPropertyType[] = "type";
-+const char kPropertyToggleType[] = "toggle-type";
-+const char kPropertyToggleState[] = "toggle-state";
-+const char kPropertyVisible[] = "visible";
-+const char kPropertyChildrenDisplay[] = "children-display";
-+
-+const char kToggleCheck[] = "checkmark";
-+const char kToggleRadio[] = "radio";
-+const char kTypeSeparator[] = "separator";
-+const char kDisplaySubmenu[] = "submenu";
-+
-+void EnsureMethodsLoaded() {
-+  static bool attempted_load = false;
-+  if (attempted_load)
-+    return;
-+  attempted_load = true;
-+
-+  void* dbusmenu_lib = dlopen("libdbusmenu-glib.so", RTLD_LAZY);
-+  if (!dbusmenu_lib)
-+    dbusmenu_lib = dlopen("libdbusmenu-glib.so.4", RTLD_LAZY);
-+  if (!dbusmenu_lib)
-+    return;
-+
-+  // DbusmenuMenuItem methods.
-+  menuitem_new = reinterpret_cast<dbusmenu_menuitem_new_func>(
-+      dlsym(dbusmenu_lib, "dbusmenu_menuitem_new"));
-+  menuitem_new_with_id = reinterpret_cast<dbusmenu_menuitem_new_with_id_func>(
-+      dlsym(dbusmenu_lib, "dbusmenu_menuitem_new_with_id"));
-+  menuitem_get_id = reinterpret_cast<dbusmenu_menuitem_get_id_func>(
-+      dlsym(dbusmenu_lib, "dbusmenu_menuitem_get_id"));
-+  menuitem_get_children = reinterpret_cast<dbusmenu_menuitem_get_children_func>(
-+      dlsym(dbusmenu_lib, "dbusmenu_menuitem_get_children"));
-+  menuitem_take_children =
-+      reinterpret_cast<dbusmenu_menuitem_get_children_func>(
-+          dlsym(dbusmenu_lib, "dbusmenu_menuitem_take_children"));
-+  menuitem_child_append = reinterpret_cast<dbusmenu_menuitem_child_append_func>(
-+      dlsym(dbusmenu_lib, "dbusmenu_menuitem_child_append"));
-+  menuitem_property_set = reinterpret_cast<dbusmenu_menuitem_property_set_func>(
-+      dlsym(dbusmenu_lib, "dbusmenu_menuitem_property_set"));
-+  menuitem_property_set_variant =
-+      reinterpret_cast<dbusmenu_menuitem_property_set_variant_func>(
-+          dlsym(dbusmenu_lib, "dbusmenu_menuitem_property_set_variant"));
-+  menuitem_property_set_bool =
-+      reinterpret_cast<dbusmenu_menuitem_property_set_bool_func>(
-+          dlsym(dbusmenu_lib, "dbusmenu_menuitem_property_set_bool"));
-+  menuitem_property_set_int =
-+      reinterpret_cast<dbusmenu_menuitem_property_set_int_func>(
-+          dlsym(dbusmenu_lib, "dbusmenu_menuitem_property_set_int"));
-+
-+  // DbusmenuServer methods.
-+  server_new = reinterpret_cast<dbusmenu_server_new_func>(
-+      dlsym(dbusmenu_lib, "dbusmenu_server_new"));
-+  server_set_root = reinterpret_cast<dbusmenu_server_set_root_func>(
-+      dlsym(dbusmenu_lib, "dbusmenu_server_set_root"));
-+}
-+
-+ui::MenuModel* ModelForMenuItem(DbusmenuMenuitem* item) {
-+  return reinterpret_cast<ui::MenuModel*>(
-+      g_object_get_data(G_OBJECT(item), "model"));
-+}
-+
-+bool GetMenuItemID(DbusmenuMenuitem* item, int *id) {
-+  gpointer id_ptr = g_object_get_data(G_OBJECT(item), "menu-id");
-+  if (id_ptr != NULL) {
-+    *id = GPOINTER_TO_INT(id_ptr) - 1;
-+    return true;
-+  }
-+
-+  return false;
-+}
-+
-+void SetMenuItemID(DbusmenuMenuitem* item, int id) {
-+  DCHECK_GE(id, 0);
-+
-+  // Add 1 to the menu_id to avoid setting zero (null) to "menu-id".
-+  g_object_set_data(G_OBJECT(item), "menu-id", GINT_TO_POINTER(id + 1));
-+}
-+
-+}  // namespace
-+
-+GlobalMenuBarX11::GlobalMenuBarX11(NativeWindowViews* window)
-+    : window_(window),
-+      xid_(window_->GetNativeWindow()->GetHost()->GetAcceleratedWidget()),
-+      server_(NULL) {
-+  EnsureMethodsLoaded();
-+  if (server_new)
-+    InitServer(xid_);
-+
-+  GlobalMenuBarRegistrarX11::GetInstance()->OnWindowMapped(xid_);
-+}
-+
-+GlobalMenuBarX11::~GlobalMenuBarX11() {
-+  if (IsServerStarted())
-+    g_object_unref(server_);
-+
-+  GlobalMenuBarRegistrarX11::GetInstance()->OnWindowUnmapped(xid_);
-+}
-+
-+// static
-+std::string GlobalMenuBarX11::GetPathForWindow(gfx::AcceleratedWidget xid) {
-+  return base::StringPrintf("/com/canonical/menu/%lX", xid);
-+}
-+
-+void GlobalMenuBarX11::SetMenu(ui::MenuModel* menu_model) {
-+  if (!IsServerStarted())
-+    return;
-+
-+  DbusmenuMenuitem* root_item = menuitem_new();
-+  menuitem_property_set(root_item, kPropertyLabel, "Root");
-+  menuitem_property_set_bool(root_item, kPropertyVisible, true);
-+  BuildMenuFromModel(menu_model, root_item);
-+
-+  server_set_root(server_, root_item);
-+  g_object_unref(root_item);
-+}
-+
-+bool GlobalMenuBarX11::IsServerStarted() const {
-+  return server_;
-+}
-+
-+void GlobalMenuBarX11::InitServer(gfx::AcceleratedWidget xid) {
-+  std::string path = GetPathForWindow(xid);
-+  server_ = server_new(path.c_str());
-+}
-+
-+void GlobalMenuBarX11::OnWindowMapped() {
-+  GlobalMenuBarRegistrarX11::GetInstance()->OnWindowMapped(xid_);
-+}
-+
-+void GlobalMenuBarX11::OnWindowUnmapped() {
-+  GlobalMenuBarRegistrarX11::GetInstance()->OnWindowUnmapped(xid_);
-+}
-+
-+void GlobalMenuBarX11::BuildMenuFromModel(ui::MenuModel* model,
-+                                          DbusmenuMenuitem* parent) {
-+  for (int i = 0; i < model->GetItemCount(); ++i) {
-+    DbusmenuMenuitem* item = menuitem_new();
-+    menuitem_property_set_bool(item, kPropertyVisible, model->IsVisibleAt(i));
-+
-+    ui::MenuModel::ItemType type = model->GetTypeAt(i);
-+    if (type == ui::MenuModel::TYPE_SEPARATOR) {
-+      menuitem_property_set(item, kPropertyType, kTypeSeparator);
-+    } else {
-+      std::string label = ui::ConvertAcceleratorsFromWindowsStyle(
-+          base::UTF16ToUTF8(model->GetLabelAt(i)));
-+      menuitem_property_set(item, kPropertyLabel, label.c_str());
-+      menuitem_property_set_bool(item, kPropertyEnabled, model->IsEnabledAt(i));
-+
-+      g_object_set_data(G_OBJECT(item), "model", model);
-+      SetMenuItemID(item, i);
-+
-+      if (type == ui::MenuModel::TYPE_SUBMENU) {
-+        menuitem_property_set(item, kPropertyChildrenDisplay, kDisplaySubmenu);
-+        g_signal_connect(item, "about-to-show",
-+                         G_CALLBACK(OnSubMenuShowThunk), this);
-+      } else {
-+        ui::Accelerator accelerator;
-+        if (model->GetAcceleratorAt(i, &accelerator))
-+          RegisterAccelerator(item, accelerator);
-+
-+        g_signal_connect(item, "item-activated",
-+                         G_CALLBACK(OnItemActivatedThunk), this);
-+
-+        if (type == ui::MenuModel::TYPE_CHECK ||
-+            type == ui::MenuModel::TYPE_RADIO) {
-+          menuitem_property_set(item, kPropertyToggleType,
-+              type == ui::MenuModel::TYPE_CHECK ? kToggleCheck : kToggleRadio);
-+          menuitem_property_set_int(item, kPropertyToggleState,
-+              model->IsItemCheckedAt(i));
-+        }
-+      }
-+    }
-+
-+    menuitem_child_append(parent, item);
-+    g_object_unref(item);
-+  }
-+}
-+
-+void GlobalMenuBarX11::RegisterAccelerator(DbusmenuMenuitem* item,
-+                                           const ui::Accelerator& accelerator) {
-+  // A translation of libdbusmenu-gtk's menuitem_property_set_shortcut()
-+  // translated from GDK types to ui::Accelerator types.
-+  GVariantBuilder builder;
-+  g_variant_builder_init(&builder, G_VARIANT_TYPE_ARRAY);
-+
-+  if (accelerator.IsCtrlDown())
-+    g_variant_builder_add(&builder, "s", "Control");
-+  if (accelerator.IsAltDown())
-+    g_variant_builder_add(&builder, "s", "Alt");
-+  if (accelerator.IsShiftDown())
-+    g_variant_builder_add(&builder, "s", "Shift");
-+
-+  char* name = XKeysymToString(XKeysymForWindowsKeyCode(
-+      accelerator.key_code(), false));
-+  if (!name) {
-+    NOTIMPLEMENTED();
-+    return;
-+  }
-+  g_variant_builder_add(&builder, "s", name);
-+
-+  GVariant* inside_array = g_variant_builder_end(&builder);
-+  g_variant_builder_init(&builder, G_VARIANT_TYPE_ARRAY);
-+  g_variant_builder_add_value(&builder, inside_array);
-+  GVariant* outside_array = g_variant_builder_end(&builder);
-+
-+  menuitem_property_set_variant(item, kPropertyShortcut, outside_array);
-+}
-+
-+void GlobalMenuBarX11::OnItemActivated(DbusmenuMenuitem* item,
-+                                       unsigned int timestamp) {
-+  int id;
-+  ui::MenuModel* model = ModelForMenuItem(item);
-+  if (model && GetMenuItemID(item, &id))
-+    model->ActivatedAt(id, 0);
-+}
-+
-+void GlobalMenuBarX11::OnSubMenuShow(DbusmenuMenuitem* item) {
-+  int id;
-+  ui::MenuModel* model = ModelForMenuItem(item);
-+  if (!model || !GetMenuItemID(item, &id))
-+    return;
-+
-+  // Clear children.
-+  GList *children = menuitem_take_children(item);
-+  g_list_foreach(children, reinterpret_cast<GFunc>(g_object_unref), NULL);
-+  g_list_free(children);
-+
-+  // Build children.
-+  BuildMenuFromModel(model->GetSubmenuModelAt(id), item);
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 a6942f62d0065f000227744ac3212e1cdb05dd91 electron/browser/ui/views/global_menu_bar_x11.h
-@@ -0,0 +1,78 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_UI_VIEWS_GLOBAL_MENU_BAR_X11_H_
-+#define ELECTRON_BROWSER_UI_VIEWS_GLOBAL_MENU_BAR_X11_H_
-+
-+#include <string>
-+
-+#include "base/macros.h"
-+#include "base/compiler_specific.h"
-+#include "ui/base/glib/glib_signal.h"
-+#include "ui/gfx/native_widget_types.h"
-+
-+typedef struct _DbusmenuMenuitem DbusmenuMenuitem;
-+typedef struct _DbusmenuServer   DbusmenuServer;
-+
-+namespace ui {
-+class Accelerator;
-+class MenuModel;
-+}
-+
-+namespace electron {
-+
-+class NativeWindowViews;
-+
-+// Controls the Mac style menu bar on Unity.
-+//
-+// Unity has an Apple-like menu bar at the top of the screen that changes
-+// depending on the active window. In the GTK port, we had a hidden GtkMenuBar
-+// object in each GtkWindow which existed only to be scrapped by the
-+// libdbusmenu-gtk code. Since we don't have GtkWindows anymore, we need to
-+// interface directly with the lower level libdbusmenu-glib, which we
-+// opportunistically dlopen() since not everyone is running Ubuntu.
-+//
-+// This class is like the chrome's corresponding one, but it generates the menu
-+// from menu models instead, and it is also per-window specific.
-+class GlobalMenuBarX11 {
-+ public:
-+  explicit GlobalMenuBarX11(NativeWindowViews* window);
-+  virtual ~GlobalMenuBarX11();
-+
-+  // Creates the object path for DbusmenuServer which is attached to |xid|.
-+  static std::string GetPathForWindow(gfx::AcceleratedWidget xid);
-+
-+  void SetMenu(ui::MenuModel* menu_model);
-+  bool IsServerStarted() const;
-+
-+  // Called by NativeWindow when it show/hides.
-+  void OnWindowMapped();
-+  void OnWindowUnmapped();
-+
-+ private:
-+  // Creates a DbusmenuServer.
-+  void InitServer(gfx::AcceleratedWidget xid);
-+
-+  // Create a menu from menu model.
-+  void BuildMenuFromModel(ui::MenuModel* model, DbusmenuMenuitem* parent);
-+
-+  // Sets the accelerator for |item|.
-+  void RegisterAccelerator(DbusmenuMenuitem* item,
-+                           const ui::Accelerator& accelerator);
-+
-+  CHROMEG_CALLBACK_1(GlobalMenuBarX11, void, OnItemActivated, DbusmenuMenuitem*,
-+                     unsigned int);
-+  CHROMEG_CALLBACK_0(GlobalMenuBarX11, void, OnSubMenuShow, DbusmenuMenuitem*);
-+
-+  NativeWindowViews* window_;
-+  gfx::AcceleratedWidget xid_;
-+
-+  DbusmenuServer* server_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(GlobalMenuBarX11);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_UI_VIEWS_GLOBAL_MENU_BAR_X11_H_
-added in remote
-  their  100644 33e1755c50596aea4f605c3c5f0cc05ae4779d88 electron/browser/ui/views/menu_bar.cc
-@@ -0,0 +1,162 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/ui/views/menu_bar.h"
-+
-+#if defined(USE_X11)
-+#include "gtk/gtk.h"
-+#endif
-+
-+#include "electron/browser/ui/views/menu_delegate.h"
-+#include "electron/browser/ui/views/submenu_button.h"
-+#include "ui/base/models/menu_model.h"
-+#include "ui/views/background.h"
-+#include "ui/views/layout/box_layout.h"
-+
-+#if defined(OS_WIN)
-+#include "ui/gfx/color_utils.h"
-+#elif defined(USE_X11)
-+#include "chrome/browser/ui/libgtk2ui/skia_utils_gtk2.h"
-+#endif
-+
-+namespace electron {
-+
-+namespace {
-+
-+const char kViewClassName[] = "ElectronMenuBar";
-+
-+// Default color of the menu bar.
-+const SkColor kDefaultColor = SkColorSetARGB(255, 233, 233, 233);
-+
-+#if defined(USE_X11)
-+void GetMenuBarColor(SkColor* enabled, SkColor* disabled, SkColor* highlight,
-+                     SkColor* hover, SkColor* background) {
-+  GtkWidget* menu_bar = gtk_menu_bar_new();
-+
-+  GtkStyle* style = gtk_rc_get_style(menu_bar);
-+  *enabled = libgtk2ui::GdkColorToSkColor(style->fg[GTK_STATE_NORMAL]);
-+  *disabled = libgtk2ui::GdkColorToSkColor(style->fg[GTK_STATE_INSENSITIVE]);
-+  *highlight = libgtk2ui::GdkColorToSkColor(style->fg[GTK_STATE_SELECTED]);
-+  *hover = libgtk2ui::GdkColorToSkColor(style->fg[GTK_STATE_PRELIGHT]);
-+  *background = libgtk2ui::GdkColorToSkColor(style->bg[GTK_STATE_NORMAL]);
-+
-+  gtk_widget_destroy(menu_bar);
-+}
-+#endif
-+
-+}  // namespace
-+
-+MenuBar::MenuBar()
-+    : background_color_(kDefaultColor),
-+      menu_model_(NULL) {
-+#if defined(OS_WIN)
-+  background_color_ = color_utils::GetSysSkColor(COLOR_MENUBAR);
-+#elif defined(USE_X11)
-+  GetMenuBarColor(&enabled_color_, &disabled_color_, &highlight_color_,
-+                  &hover_color_, &background_color_);
-+#endif
-+
-+  set_background(views::Background::CreateSolidBackground(background_color_));
-+  SetLayoutManager(new views::BoxLayout(
-+      views::BoxLayout::kHorizontal, 0, 0, 0));
-+}
-+
-+MenuBar::~MenuBar() {
-+}
-+
-+void MenuBar::SetMenu(ui::MenuModel* model) {
-+  menu_model_ = model;
-+  RemoveAllChildViews(true);
-+
-+  for (int i = 0; i < model->GetItemCount(); ++i) {
-+    SubmenuButton* button = new SubmenuButton(this, model->GetLabelAt(i), this);
-+    button->set_tag(i);
-+
-+#if defined(USE_X11)
-+    button->SetTextColor(views::Button::STATE_NORMAL, enabled_color_);
-+    button->SetTextColor(views::Button::STATE_DISABLED, disabled_color_);
-+    button->SetTextColor(views::Button::STATE_PRESSED, highlight_color_);
-+    button->SetTextColor(views::Button::STATE_HOVERED, hover_color_);
-+    button->SetUnderlineColor(enabled_color_);
-+#elif defined(OS_WIN)
-+    button->SetUnderlineColor(color_utils::GetSysSkColor(COLOR_GRAYTEXT));
-+#endif
-+
-+    AddChildView(button);
-+  }
-+}
-+
-+void MenuBar::SetAcceleratorVisibility(bool visible) {
-+  for (int i = 0; i < child_count(); ++i)
-+    static_cast<SubmenuButton*>(child_at(i))->SetAcceleratorVisibility(visible);
-+}
-+
-+int MenuBar::GetAcceleratorIndex(base::char16 key) {
-+  for (int i = 0; i < child_count(); ++i) {
-+    SubmenuButton* button = static_cast<SubmenuButton*>(child_at(i));
-+    if (button->accelerator() == key)
-+      return i;
-+  }
-+  return -1;
-+}
-+
-+void MenuBar::ActivateAccelerator(base::char16 key) {
-+  int i = GetAcceleratorIndex(key);
-+  if (i != -1)
-+    static_cast<SubmenuButton*>(child_at(i))->Activate();
-+}
-+
-+int MenuBar::GetItemCount() const {
-+  return menu_model_->GetItemCount();
-+}
-+
-+bool MenuBar::GetMenuButtonFromScreenPoint(const gfx::Point& point,
-+                                           ui::MenuModel** menu_model,
-+                                           views::MenuButton** button) {
-+  gfx::Point location(point);
-+  views::View::ConvertPointFromScreen(this, &location);
-+
-+  if (location.x() < 0 || location.x() >= width() || location.y() < 0 ||
-+      location.y() >= height())
-+    return false;
-+
-+  for (int i = 0; i < child_count(); ++i) {
-+    views::View* view = child_at(i);
-+    if (view->bounds().Contains(location) &&
-+        (menu_model_->GetTypeAt(i) == ui::MenuModel::TYPE_SUBMENU)) {
-+      *menu_model = menu_model_->GetSubmenuModelAt(i);
-+      *button = static_cast<views::MenuButton*>(view);
-+      return true;
-+    }
-+  }
-+
-+  return false;
-+}
-+
-+const char* MenuBar::GetClassName() const {
-+  return kViewClassName;
-+}
-+
-+void MenuBar::ButtonPressed(views::Button* sender, const ui::Event& event) {
-+}
-+
-+void MenuBar::OnMenuButtonClicked(views::View* source,
-+                                  const gfx::Point& point) {
-+  // Hide the accelerator when a submenu is activated.
-+  SetAcceleratorVisibility(false);
-+
-+  if (!menu_model_)
-+    return;
-+
-+  views::MenuButton* button = static_cast<views::MenuButton*>(source);
-+  int id = button->tag();
-+  ui::MenuModel::ItemType type = menu_model_->GetTypeAt(id);
-+  if (type != ui::MenuModel::TYPE_SUBMENU)
-+    return;
-+
-+  MenuDelegate menu_delegate(this);
-+  menu_delegate.RunMenu(menu_model_->GetSubmenuModelAt(id), button);
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 74fdcd01c915280994c2232bcbcc1f38946edd27 electron/browser/ui/views/menu_bar.h
-@@ -0,0 +1,80 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_UI_VIEWS_MENU_BAR_H_
-+#define ELECTRON_BROWSER_UI_VIEWS_MENU_BAR_H_
-+
-+#include "ui/views/controls/button/button.h"
-+#include "ui/views/controls/button/menu_button_listener.h"
-+#include "ui/views/view.h"
-+
-+namespace ui {
-+class MenuModel;
-+}
-+
-+namespace views {
-+class MenuButton;
-+}
-+
-+namespace electron {
-+
-+class MenuDelegate;
-+
-+class MenuBar : public views::View,
-+                public views::ButtonListener,
-+                public views::MenuButtonListener {
-+ public:
-+  MenuBar();
-+  virtual ~MenuBar();
-+
-+  // Replaces current menu with a new one.
-+  void SetMenu(ui::MenuModel* menu_model);
-+
-+  // Shows underline under accelerators.
-+  void SetAcceleratorVisibility(bool visible);
-+
-+  // Returns which submenu has accelerator |key|, -1 would be returned when
-+  // there is no matching submenu.
-+  int GetAcceleratorIndex(base::char16 key);
-+
-+  // Shows the submenu whose accelerator is |key|.
-+  void ActivateAccelerator(base::char16 key);
-+
-+  // Returns there are how many items in the root menu.
-+  int GetItemCount() const;
-+
-+  // Get the menu under specified screen point.
-+  bool GetMenuButtonFromScreenPoint(const gfx::Point& point,
-+                                    ui::MenuModel** menu_model,
-+                                    views::MenuButton** button);
-+
-+ protected:
-+  // views::View:
-+  const char* GetClassName() const override;
-+
-+  // views::ButtonListener:
-+  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
-+
-+  // views::MenuButtonListener:
-+  void OnMenuButtonClicked(views::View* source,
-+                                   const gfx::Point& point) override;
-+
-+ private:
-+  SkColor background_color_;
-+
-+#if defined(USE_X11)
-+  SkColor enabled_color_;
-+  SkColor disabled_color_;
-+  SkColor highlight_color_;
-+  SkColor hover_color_;
-+#endif
-+
-+  ui::MenuModel* menu_model_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(MenuBar);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_UI_VIEWS_MENU_BAR_H_
-added in remote
-  their  100644 e315b0a4c78cb260d7c43086b18d6ac4ffd9313b electron/browser/ui/views/menu_delegate.cc
-@@ -0,0 +1,121 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/ui/views/menu_delegate.h"
-+
-+#include "electron/browser/ui/views/menu_bar.h"
-+#include "content/public/browser/browser_thread.h"
-+#include "ui/views/controls/button/menu_button.h"
-+#include "ui/views/controls/menu/menu_item_view.h"
-+#include "ui/views/controls/menu/menu_model_adapter.h"
-+#include "ui/views/controls/menu/menu_runner.h"
-+#include "ui/views/widget/widget.h"
-+
-+namespace electron {
-+
-+MenuDelegate::MenuDelegate(MenuBar* menu_bar)
-+    : menu_bar_(menu_bar),
-+      id_(-1) {
-+}
-+
-+MenuDelegate::~MenuDelegate() {
-+}
-+
-+void MenuDelegate::RunMenu(ui::MenuModel* model, views::MenuButton* button) {
-+  gfx::Point screen_loc;
-+  views::View::ConvertPointToScreen(button, &screen_loc);
-+  // Subtract 1 from the height to make the popup flush with the button border.
-+  gfx::Rect bounds(screen_loc.x(), screen_loc.y(), button->width(),
-+                   button->height() - 1);
-+
-+  id_ = button->tag();
-+  adapter_.reset(new views::MenuModelAdapter(model));
-+
-+  views::MenuItemView* item = new views::MenuItemView(this);
-+  static_cast<views::MenuModelAdapter*>(adapter_.get())->BuildMenu(item);
-+
-+  menu_runner_.reset(new views::MenuRunner(
-+      item,
-+      views::MenuRunner::CONTEXT_MENU | views::MenuRunner::HAS_MNEMONICS));
-+  ignore_result(menu_runner_->RunMenuAt(
-+      button->GetWidget()->GetTopLevelWidget(),
-+      button,
-+      bounds,
-+      views::MENU_ANCHOR_TOPRIGHT,
-+      ui::MENU_SOURCE_MOUSE));
-+}
-+
-+void MenuDelegate::ExecuteCommand(int id) {
-+  adapter_->ExecuteCommand(id);
-+}
-+
-+void MenuDelegate::ExecuteCommand(int id, int mouse_event_flags) {
-+  adapter_->ExecuteCommand(id, mouse_event_flags);
-+}
-+
-+bool MenuDelegate::IsTriggerableEvent(views::MenuItemView* source,
-+                                      const ui::Event& e) {
-+  return adapter_->IsTriggerableEvent(source, e);
-+}
-+
-+bool MenuDelegate::GetAccelerator(int id, ui::Accelerator* accelerator) const {
-+  return adapter_->GetAccelerator(id, accelerator);
-+}
-+
-+base::string16 MenuDelegate::GetLabel(int id) const {
-+  return adapter_->GetLabel(id);
-+}
-+
-+const gfx::FontList* MenuDelegate::GetLabelFontList(int id) const {
-+  return adapter_->GetLabelFontList(id);
-+}
-+
-+bool MenuDelegate::IsCommandEnabled(int id) const {
-+  return adapter_->IsCommandEnabled(id);
-+}
-+
-+bool MenuDelegate::IsCommandVisible(int id) const {
-+  return adapter_->IsCommandVisible(id);
-+}
-+
-+bool MenuDelegate::IsItemChecked(int id) const {
-+  return adapter_->IsItemChecked(id);
-+}
-+
-+void MenuDelegate::SelectionChanged(views::MenuItemView* menu) {
-+  adapter_->SelectionChanged(menu);
-+}
-+
-+void MenuDelegate::WillShowMenu(views::MenuItemView* menu) {
-+  adapter_->WillShowMenu(menu);
-+}
-+
-+void MenuDelegate::WillHideMenu(views::MenuItemView* menu) {
-+  adapter_->WillHideMenu(menu);
-+}
-+
-+views::MenuItemView* MenuDelegate::GetSiblingMenu(
-+    views::MenuItemView* menu,
-+    const gfx::Point& screen_point,
-+    views::MenuAnchorPosition* anchor,
-+    bool* has_mnemonics,
-+    views::MenuButton**) {
-+  views::MenuButton* button;
-+  ui::MenuModel* model;
-+  if (menu_bar_->GetMenuButtonFromScreenPoint(screen_point, &model, &button) &&
-+      button->tag() != id_) {
-+    DCHECK(menu_runner_->IsRunning());
-+    menu_runner_->Cancel();
-+    // After canceling the menu, we need to wait until next tick
-+    // so we are out of nested message loop.
-+    content::BrowserThread::PostTask(
-+        content::BrowserThread::UI, FROM_HERE,
-+        base::Bind(base::IgnoreResult(&views::MenuButton::Activate),
-+                   base::Unretained(button)));
-+  }
-+
-+  return nullptr;
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 e04cdc4de2fae7e19830cd1a2dbbd7ac6b63e516 electron/browser/ui/views/menu_delegate.h
-@@ -0,0 +1,63 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_UI_VIEWS_MENU_DELEGATE_H_
-+#define ELECTRON_BROWSER_UI_VIEWS_MENU_DELEGATE_H_
-+
-+#include "base/memory/scoped_ptr.h"
-+#include "ui/views/controls/menu/menu_delegate.h"
-+
-+namespace views {
-+class MenuRunner;
-+}
-+
-+namespace ui {
-+class MenuModel;
-+}
-+
-+namespace electron {
-+
-+class MenuBar;
-+
-+class MenuDelegate : public views::MenuDelegate {
-+ public:
-+  explicit MenuDelegate(MenuBar* menu_bar);
-+  virtual ~MenuDelegate();
-+
-+  void RunMenu(ui::MenuModel* model, views::MenuButton* button);
-+
-+ protected:
-+  // views::MenuDelegate:
-+  void ExecuteCommand(int id) override;
-+  void ExecuteCommand(int id, int mouse_event_flags) override;
-+  bool IsTriggerableEvent(views::MenuItemView* source,
-+                          const ui::Event& e) override;
-+  bool GetAccelerator(int id, ui::Accelerator* accelerator) const override;
-+  base::string16 GetLabel(int id) const override;
-+  const gfx::FontList* GetLabelFontList(int id) const override;
-+  bool IsCommandEnabled(int id) const override;
-+  bool IsCommandVisible(int id) const override;
-+  bool IsItemChecked(int id) const override;
-+  void SelectionChanged(views::MenuItemView* menu) override;
-+  void WillShowMenu(views::MenuItemView* menu) override;
-+  void WillHideMenu(views::MenuItemView* menu) override;
-+  views::MenuItemView* GetSiblingMenu(
-+      views::MenuItemView* menu,
-+      const gfx::Point& screen_point,
-+      views::MenuAnchorPosition* anchor,
-+      bool* has_mnemonics,
-+      views::MenuButton** button) override;
-+
-+ private:
-+  MenuBar* menu_bar_;
-+  int id_;
-+  scoped_ptr<views::MenuDelegate> adapter_;
-+  scoped_ptr<views::MenuRunner> menu_runner_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(MenuDelegate);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_UI_VIEWS_MENU_DELEGATE_H_
-added in remote
-  their  100644 7b519840d67a7985862e847db12e794ab4368b32 electron/browser/ui/views/menu_layout.cc
-@@ -0,0 +1,86 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/ui/views/menu_layout.h"
-+
-+#if defined(OS_WIN)
-+#include "electron/browser/native_window_views.h"
-+#endif
-+
-+namespace electron {
-+
-+namespace {
-+
-+#if defined(OS_WIN)
-+gfx::Rect SubstractBorderSize(gfx::Rect bounds) {
-+  int border_width = GetSystemMetrics(SM_CXSIZEFRAME) - 1;
-+  int border_height = GetSystemMetrics(SM_CYSIZEFRAME) - 1;
-+  bounds.set_x(bounds.x() + border_width);
-+  bounds.set_y(bounds.y() + border_height);
-+  bounds.set_width(bounds.width() - 2 * border_width);
-+  bounds.set_height(bounds.height() - 2 * border_height);
-+  return bounds;
-+}
-+#endif
-+
-+}  // namespace
-+
-+MenuLayout::MenuLayout(NativeWindowViews* window, int menu_height)
-+    : window_(window),
-+      menu_height_(menu_height) {
-+}
-+
-+MenuLayout::~MenuLayout() {
-+}
-+
-+void MenuLayout::Layout(views::View* host) {
-+#if defined(OS_WIN)
-+  // Reserve border space for maximized frameless window so we won't have the
-+  // content go outside of screen.
-+  if (!window_->has_frame() && window_->IsMaximized()) {
-+    gfx::Rect bounds = SubstractBorderSize(host->GetContentsBounds());
-+    host->child_at(0)->SetBoundsRect(bounds);
-+    return;
-+  }
-+#endif
-+
-+  if (!HasMenu(host)) {
-+    views::FillLayout::Layout(host);
-+    return;
-+  }
-+
-+  gfx::Size size = host->GetContentsBounds().size();
-+  gfx::Rect menu_Bar_bounds = gfx::Rect(0, 0, size.width(), menu_height_);
-+  gfx::Rect web_view_bounds = gfx::Rect(
-+      0, menu_height_, size.width(), size.height() - menu_height_);
-+
-+  views::View* web_view = host->child_at(0);
-+  views::View* menu_bar = host->child_at(1);
-+  web_view->SetBoundsRect(web_view_bounds);
-+  menu_bar->SetBoundsRect(menu_Bar_bounds);
-+}
-+
-+gfx::Size MenuLayout::GetPreferredSize(const views::View* host) const {
-+  gfx::Size size = views::FillLayout::GetPreferredSize(host);
-+  if (!HasMenu(host))
-+    return size;
-+
-+  size.set_height(size.height() + menu_height_);
-+  return size;
-+}
-+
-+int MenuLayout::GetPreferredHeightForWidth(
-+    const views::View* host, int width) const {
-+  int height = views::FillLayout::GetPreferredHeightForWidth(host, width);
-+  if (!HasMenu(host))
-+    return height;
-+
-+  return height + menu_height_;
-+}
-+
-+bool MenuLayout::HasMenu(const views::View* host) const {
-+  return host->child_count() == 2;
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 bd3cd0ce02fdc781f62087e2682bfa566ed080d9 electron/browser/ui/views/menu_layout.h
-@@ -0,0 +1,36 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_UI_VIEWS_MENU_LAYOUT_H_
-+#define ELECTRON_BROWSER_UI_VIEWS_MENU_LAYOUT_H_
-+
-+#include "ui/views/layout/fill_layout.h"
-+
-+namespace electron {
-+
-+class NativeWindowViews;
-+
-+class MenuLayout : public views::FillLayout {
-+ public:
-+  MenuLayout(NativeWindowViews* window, int menu_height);
-+  virtual ~MenuLayout();
-+
-+  // views::LayoutManager:
-+  void Layout(views::View* host) override;
-+  gfx::Size GetPreferredSize(const views::View* host) const override;
-+  int GetPreferredHeightForWidth(
-+      const views::View* host, int width) const override;
-+
-+ private:
-+  bool HasMenu(const views::View* host) const;
-+
-+  NativeWindowViews* window_;
-+  int menu_height_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(MenuLayout);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_UI_VIEWS_MENU_LAYOUT_H_
-added in remote
-  their  100644 e03594e14c81fcb3de7bfbadc21998482f1398be electron/browser/ui/views/native_frame_view.cc
-@@ -0,0 +1,34 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/ui/views/native_frame_view.h"
-+
-+#include "electron/browser/native_window.h"
-+
-+namespace electron {
-+
-+namespace {
-+
-+const char kViewClassName[] = "ElectronNativeFrameView";
-+
-+}  // namespace
-+
-+NativeFrameView::NativeFrameView(NativeWindow* window, views::Widget* widget)
-+    : views::NativeFrameView(widget),
-+      window_(window) {
-+}
-+
-+gfx::Size NativeFrameView::GetMinimumSize() const {
-+  return window_->GetMinimumSize();
-+}
-+
-+gfx::Size NativeFrameView::GetMaximumSize() const {
-+  return window_->GetMaximumSize();
-+}
-+
-+const char* NativeFrameView::GetClassName() const {
-+  return kViewClassName;
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 62120374283b0d91cc972ee0af0642d71b5df456 electron/browser/ui/views/native_frame_view.h
-@@ -0,0 +1,34 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_UI_VIEWS_NATIVE_FRAME_VIEW_H_
-+#define ELECTRON_BROWSER_UI_VIEWS_NATIVE_FRAME_VIEW_H_
-+
-+#include "ui/views/window/native_frame_view.h"
-+
-+namespace electron {
-+
-+class NativeWindow;
-+
-+// Like the views::NativeFrameView, but returns the min/max size from the
-+// NativeWindowViews.
-+class NativeFrameView : public views::NativeFrameView {
-+ public:
-+  NativeFrameView(NativeWindow* window, views::Widget* widget);
-+
-+ protected:
-+  // views::View:
-+  gfx::Size GetMinimumSize() const override;
-+  gfx::Size GetMaximumSize() const override;
-+  const char* GetClassName() const override;
-+
-+ private:
-+  NativeWindow* window_;  // weak ref.
-+
-+  DISALLOW_COPY_AND_ASSIGN(NativeFrameView);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_UI_VIEWS_NATIVE_FRAME_VIEW_H_
-added in remote
-  their  100644 d4eabbbe790294cded2902f879ec939931e9dcd4 electron/browser/ui/views/submenu_button.cc
-@@ -0,0 +1,98 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/ui/views/submenu_button.h"
-+
-+#include "base/strings/string_util.h"
-+#include "base/strings/utf_string_conversions.h"
-+#include "ui/gfx/canvas.h"
-+#include "ui/gfx/text_utils.h"
-+#include "ui/views/controls/button/label_button_border.h"
-+
-+namespace electron {
-+
-+namespace {
-+
-+// Filter out the "&" in menu label.
-+base::string16 FilterAccelerator(const base::string16& label) {
-+  base::string16 out;
-+  base::RemoveChars(label, base::ASCIIToUTF16("&").c_str(), &out);
-+  return out;
-+}
-+
-+}  // namespace
-+
-+SubmenuButton::SubmenuButton(views::ButtonListener* listener,
-+                             const base::string16& title,
-+                             views::MenuButtonListener* menu_button_listener)
-+    : views::MenuButton(listener, FilterAccelerator(title),
-+                        menu_button_listener, false),
-+      accelerator_(0),
-+      show_underline_(false),
-+      underline_start_(-1),
-+      underline_end_(-1),
-+      text_width_(0),
-+      text_height_(0),
-+      underline_color_(SK_ColorBLACK) {
-+#if defined(OS_LINUX)
-+  // Dont' use native style border.
-+  SetBorder(std::move(CreateDefaultBorder()));
-+#endif
-+
-+  if (GetUnderlinePosition(title, &accelerator_, &underline_start_,
-+                           &underline_end_))
-+    gfx::Canvas::SizeStringInt(GetText(), GetFontList(), &text_width_,
-+                               &text_height_, 0, 0);
-+}
-+
-+SubmenuButton::~SubmenuButton() {
-+}
-+
-+void SubmenuButton::SetAcceleratorVisibility(bool visible) {
-+  if (visible == show_underline_)
-+    return;
-+
-+  show_underline_ = visible;
-+  SchedulePaint();
-+}
-+
-+void SubmenuButton::SetUnderlineColor(SkColor color) {
-+  underline_color_ = color;
-+}
-+
-+void SubmenuButton::OnPaint(gfx::Canvas* canvas) {
-+  views::MenuButton::OnPaint(canvas);
-+
-+  if (show_underline_ && (underline_start_ != underline_end_)) {
-+    int padding = (width() - text_width_) / 2;
-+    int underline_height = (height() + text_height_) / 2 - 2;
-+    canvas->DrawLine(gfx::Point(underline_start_ + padding, underline_height),
-+                     gfx::Point(underline_end_ + padding, underline_height),
-+                     underline_color_);
-+  }
-+}
-+
-+bool SubmenuButton::GetUnderlinePosition(const base::string16& text,
-+                                         base::char16* accelerator,
-+                                         int* start, int* end) {
-+  int pos, span;
-+  base::string16 trimmed = gfx::RemoveAcceleratorChar(text, '&', &pos, &span);
-+  if (pos > -1 && span != 0) {
-+    *accelerator = base::ToUpperASCII(trimmed[pos]);
-+    GetCharacterPosition(trimmed, pos, start);
-+    GetCharacterPosition(trimmed, pos + span, end);
-+    return true;
-+  }
-+
-+  return false;
-+}
-+
-+void SubmenuButton::GetCharacterPosition(
-+    const base::string16& text, int index, int* pos) {
-+  int height;
-+  gfx::Canvas::SizeStringInt(text.substr(0, index), GetFontList(), pos, &height,
-+                             0, 0);
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 275c2b1873109c41364d76bb2964baa28b19ff50 electron/browser/ui/views/submenu_button.h
-@@ -0,0 +1,53 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_UI_VIEWS_SUBMENU_BUTTON_H_
-+#define ELECTRON_BROWSER_UI_VIEWS_SUBMENU_BUTTON_H_
-+
-+#include "ui/views/controls/button/menu_button.h"
-+
-+namespace electron {
-+
-+// Special button that used by menu bar to show submenus.
-+class SubmenuButton : public views::MenuButton {
-+ public:
-+  SubmenuButton(views::ButtonListener* listener,
-+                const base::string16& title,
-+                views::MenuButtonListener* menu_button_listener);
-+  virtual ~SubmenuButton();
-+
-+  void SetAcceleratorVisibility(bool visible);
-+  void SetUnderlineColor(SkColor color);
-+
-+  void SetEnabledColor(SkColor color);
-+  void SetBackgroundColor(SkColor color);
-+
-+  base::char16 accelerator() const { return accelerator_; }
-+
-+  // views::MenuButton:
-+  void OnPaint(gfx::Canvas* canvas) override;
-+
-+ private:
-+  bool GetUnderlinePosition(const base::string16& text,
-+                            base::char16* accelerator,
-+                            int* start, int* end);
-+  void GetCharacterPosition(
-+      const base::string16& text, int index, int* pos);
-+
-+  base::char16 accelerator_;
-+
-+  bool show_underline_;
-+
-+  int underline_start_;
-+  int underline_end_;
-+  int text_width_;
-+  int text_height_;
-+  SkColor underline_color_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(SubmenuButton);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_UI_VIEWS_SUBMENU_BUTTON_H_
-added in remote
-  their  100644 b2c6bffe4facf4dd1206961cda1aef8347bcbb19 electron/browser/ui/views/win_frame_view.cc
-@@ -0,0 +1,45 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/ui/views/win_frame_view.h"
-+
-+#include "electron/browser/native_window_views.h"
-+#include "ui/views/widget/widget.h"
-+#include "ui/views/win/hwnd_util.h"
-+
-+namespace electron {
-+
-+namespace {
-+
-+const char kViewClassName[] = "WinFrameView";
-+
-+}  // namespace
-+
-+
-+WinFrameView::WinFrameView() {
-+}
-+
-+WinFrameView::~WinFrameView() {
-+}
-+
-+
-+gfx::Rect WinFrameView::GetWindowBoundsForClientBounds(
-+    const gfx::Rect& client_bounds) const {
-+  return views::GetWindowBoundsForClientBounds(
-+      static_cast<views::View*>(const_cast<WinFrameView*>(this)),
-+      client_bounds);
-+}
-+
-+int WinFrameView::NonClientHitTest(const gfx::Point& point) {
-+  if (window_->has_frame())
-+    return frame_->client_view()->NonClientHitTest(point);
-+  else
-+    return FramelessView::NonClientHitTest(point);
-+}
-+
-+const char* WinFrameView::GetClassName() const {
-+  return kViewClassName;
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 b1646da0ea4bc8e1f9fd32fa2b3a6b63574d7ad2 electron/browser/ui/views/win_frame_view.h
-@@ -0,0 +1,31 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_UI_VIEWS_WIN_FRAME_VIEW_H_
-+#define ELECTRON_BROWSER_UI_VIEWS_WIN_FRAME_VIEW_H_
-+
-+#include "electron/browser/ui/views/frameless_view.h"
-+
-+namespace electron {
-+
-+class WinFrameView : public FramelessView {
-+ public:
-+  WinFrameView();
-+  virtual ~WinFrameView();
-+
-+  // views::NonClientFrameView:
-+  gfx::Rect GetWindowBoundsForClientBounds(
-+      const gfx::Rect& client_bounds) const override;
-+  int NonClientHitTest(const gfx::Point& point) override;
-+
-+  // views::View:
-+  const char* GetClassName() const override;
-+
-+ private:
-+  DISALLOW_COPY_AND_ASSIGN(WinFrameView);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_UI_VIEWS_WIN_FRAME_VIEW_H_
-added in remote
-  their  100644 20343b603c31e6dc24838892e611ec743bd11fa6 electron/browser/ui/win/electron_desktop_window_tree_host_win.cc
-@@ -0,0 +1,28 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/ui/win/electron_desktop_window_tree_host_win.h"
-+
-+#include "electron/browser/ui/win/message_handler_delegate.h"
-+
-+namespace electron {
-+
-+ElectronDesktopWindowTreeHostWin::ElectronDesktopWindowTreeHostWin(
-+    MessageHandlerDelegate* delegate,
-+    views::internal::NativeWidgetDelegate* native_widget_delegate,
-+    views::DesktopNativeWidgetAura* desktop_native_widget_aura)
-+        : views::DesktopWindowTreeHostWin(native_widget_delegate,
-+                                          desktop_native_widget_aura),
-+          delegate_(delegate) {
-+}
-+
-+ElectronDesktopWindowTreeHostWin::~ElectronDesktopWindowTreeHostWin() {
-+}
-+
-+bool ElectronDesktopWindowTreeHostWin::PreHandleMSG(
-+    UINT message, WPARAM w_param, LPARAM l_param, LRESULT* result) {
-+  return delegate_->PreHandleMSG(message, w_param, l_param, result);
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 496046cb2e888d916ba8c6dd7d9b037c96840e06 electron/browser/ui/win/electron_desktop_window_tree_host_win.h
-@@ -0,0 +1,39 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_UI_WIN_ELECTRON_DESKTOP_WINDOW_TREE_HOST_WIN_H_
-+#define ELECTRON_BROWSER_UI_WIN_ELECTRON_DESKTOP_WINDOW_TREE_HOST_WIN_H_
-+
-+#include <windows.h>
-+
-+#include <vector>
-+
-+#include "electron/browser/native_window.h"
-+#include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h"
-+
-+namespace electron {
-+
-+class MessageHandlerDelegate;
-+
-+class ElectronDesktopWindowTreeHostWin : public views::DesktopWindowTreeHostWin {
-+ public:
-+  ElectronDesktopWindowTreeHostWin(
-+      MessageHandlerDelegate* delegate,
-+      views::internal::NativeWidgetDelegate* native_widget_delegate,
-+      views::DesktopNativeWidgetAura* desktop_native_widget_aura);
-+  ~ElectronDesktopWindowTreeHostWin() override;
-+
-+ protected:
-+  bool PreHandleMSG(
-+      UINT message, WPARAM w_param, LPARAM l_param, LRESULT* result) override;
-+
-+ private:
-+  MessageHandlerDelegate* delegate_;  // weak ref
-+
-+  DISALLOW_COPY_AND_ASSIGN(ElectronDesktopWindowTreeHostWin);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_UI_WIN_ELECTRON_DESKTOP_WINDOW_TREE_HOST_WIN_H_
-added in remote
-  their  100644 42ac2ec021834f6d0f4d79e93eff111ae553eca9 electron/browser/ui/win/message_handler_delegate.cc
-@@ -0,0 +1,14 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/ui/win/message_handler_delegate.h"
-+
-+namespace electron {
-+
-+bool MessageHandlerDelegate::PreHandleMSG(
-+    UINT message, WPARAM w_param, LPARAM l_param, LRESULT* result) {
-+  return false;
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 6afa05169f48bf5c74502237371f7c03fece7c32 electron/browser/ui/win/message_handler_delegate.h
-@@ -0,0 +1,26 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_UI_WIN_MESSAGE_HANDLER_DELEGATE_H_
-+#define ELECTRON_BROWSER_UI_WIN_MESSAGE_HANDLER_DELEGATE_H_
-+
-+#include <windows.h>
-+
-+namespace electron {
-+
-+class MessageHandlerDelegate {
-+ public:
-+  // Catch-all message handling and filtering. Called before
-+  // HWNDMessageHandler's built-in handling, which may pre-empt some
-+  // expectations in Views/Aura if messages are consumed. Returns true if the
-+  // message was consumed by the delegate and should not be processed further
-+  // by the HWNDMessageHandler. In this case, |result| is returned. |result| is
-+  // not modified otherwise.
-+  virtual bool PreHandleMSG(
-+      UINT message, WPARAM w_param, LPARAM l_param, LRESULT* result);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_UI_WIN_MESSAGE_HANDLER_DELEGATE_H_
-added in remote
-  their  100644 7f49d84ec611d1bf202164aa718b95fdd6d4f0d3 electron/browser/ui/win/notify_icon.cc
-@@ -0,0 +1,178 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/ui/win/notify_icon.h"
-+
-+#include "electron/browser/ui/win/notify_icon_host.h"
-+#include "base/strings/string_number_conversions.h"
-+#include "base/strings/utf_string_conversions.h"
-+#include "base/win/windows_version.h"
-+#include "third_party/skia/include/core/SkBitmap.h"
-+#include "ui/gfx/icon_util.h"
-+#include "ui/gfx/image/image.h"
-+#include "ui/gfx/geometry/point.h"
-+#include "ui/gfx/geometry/rect.h"
-+#include "ui/gfx/screen.h"
-+#include "ui/views/controls/menu/menu_runner.h"
-+
-+namespace electron {
-+
-+NotifyIcon::NotifyIcon(NotifyIconHost* host,
-+                       UINT id,
-+                       HWND window,
-+                       UINT message)
-+    : host_(host),
-+      icon_id_(id),
-+      window_(window),
-+      message_id_(message),
-+      menu_model_(NULL) {
-+  NOTIFYICONDATA icon_data;
-+  InitIconData(&icon_data);
-+  icon_data.uFlags |= NIF_MESSAGE;
-+  icon_data.uCallbackMessage = message_id_;
-+  BOOL result = Shell_NotifyIcon(NIM_ADD, &icon_data);
-+  // This can happen if the explorer process isn't running when we try to
-+  // create the icon for some reason (for example, at startup).
-+  if (!result)
-+    LOG(WARNING) << "Unable to create status tray icon.";
-+}
-+
-+NotifyIcon::~NotifyIcon() {
-+  // Remove our icon.
-+  host_->Remove(this);
-+  NOTIFYICONDATA icon_data;
-+  InitIconData(&icon_data);
-+  Shell_NotifyIcon(NIM_DELETE, &icon_data);
-+}
-+
-+void NotifyIcon::HandleClickEvent(int modifiers,
-+                                  bool left_mouse_click,
-+                                  bool double_button_click) {
-+  NOTIFYICONIDENTIFIER icon_id;
-+  memset(&icon_id, 0, sizeof(NOTIFYICONIDENTIFIER));
-+  icon_id.uID = icon_id_;
-+  icon_id.hWnd = window_;
-+  icon_id.cbSize = sizeof(NOTIFYICONIDENTIFIER);
-+
-+  RECT rect = { 0 };
-+  Shell_NotifyIconGetRect(&icon_id, &rect);
-+
-+  if (left_mouse_click) {
-+    if (double_button_click)  // double left click
-+      NotifyDoubleClicked(gfx::Rect(rect), modifiers);
-+    else  // single left click
-+      NotifyClicked(gfx::Rect(rect), modifiers);
-+    return;
-+  } else if (!double_button_click) {  // single right click
-+    if (menu_model_)
-+      PopUpContextMenu(gfx::Point(), menu_model_);
-+    else
-+      NotifyRightClicked(gfx::Rect(rect), modifiers);
-+  }
-+}
-+
-+void NotifyIcon::ResetIcon() {
-+  NOTIFYICONDATA icon_data;
-+  InitIconData(&icon_data);
-+  // Delete any previously existing icon.
-+  Shell_NotifyIcon(NIM_DELETE, &icon_data);
-+  InitIconData(&icon_data);
-+  icon_data.uFlags |= NIF_MESSAGE;
-+  icon_data.uCallbackMessage = message_id_;
-+  icon_data.hIcon = icon_.get();
-+  // If we have an image, then set the NIF_ICON flag, which tells
-+  // Shell_NotifyIcon() to set the image for the status icon it creates.
-+  if (icon_data.hIcon)
-+    icon_data.uFlags |= NIF_ICON;
-+  // Re-add our icon.
-+  BOOL result = Shell_NotifyIcon(NIM_ADD, &icon_data);
-+  if (!result)
-+    LOG(WARNING) << "Unable to re-create status tray icon.";
-+}
-+
-+void NotifyIcon::SetImage(const gfx::Image& image) {
-+  // Create the icon.
-+  NOTIFYICONDATA icon_data;
-+  InitIconData(&icon_data);
-+  icon_data.uFlags |= NIF_ICON;
-+  icon_ = IconUtil::CreateHICONFromSkBitmap(image.AsBitmap());
-+  icon_data.hIcon = icon_.get();
-+  BOOL result = Shell_NotifyIcon(NIM_MODIFY, &icon_data);
-+  if (!result)
-+    LOG(WARNING) << "Error setting status tray icon image";
-+}
-+
-+void NotifyIcon::SetPressedImage(const gfx::Image& image) {
-+  // Ignore pressed images, since the standard on Windows is to not highlight
-+  // pressed status icons.
-+}
-+
-+void NotifyIcon::SetToolTip(const std::string& tool_tip) {
-+  // Create the icon.
-+  NOTIFYICONDATA icon_data;
-+  InitIconData(&icon_data);
-+  icon_data.uFlags |= NIF_TIP;
-+  wcsncpy_s(icon_data.szTip, base::UTF8ToUTF16(tool_tip).c_str(), _TRUNCATE);
-+  BOOL result = Shell_NotifyIcon(NIM_MODIFY, &icon_data);
-+  if (!result)
-+    LOG(WARNING) << "Unable to set tooltip for status tray icon";
-+}
-+
-+void NotifyIcon::DisplayBalloon(const gfx::Image& icon,
-+                                const base::string16& title,
-+                                const base::string16& contents) {
-+  NOTIFYICONDATA icon_data;
-+  InitIconData(&icon_data);
-+  icon_data.uFlags |= NIF_INFO;
-+  icon_data.dwInfoFlags = NIIF_INFO;
-+  wcsncpy_s(icon_data.szInfoTitle, title.c_str(), _TRUNCATE);
-+  wcsncpy_s(icon_data.szInfo, contents.c_str(), _TRUNCATE);
-+  icon_data.uTimeout = 0;
-+
-+  base::win::Version win_version = base::win::GetVersion();
-+  if (!icon.IsEmpty() && win_version != base::win::VERSION_PRE_XP) {
-+    balloon_icon_ = IconUtil::CreateHICONFromSkBitmap(icon.AsBitmap());
-+    icon_data.hBalloonIcon = balloon_icon_.get();
-+    icon_data.dwInfoFlags = NIIF_USER | NIIF_LARGE_ICON;
-+  }
-+
-+  BOOL result = Shell_NotifyIcon(NIM_MODIFY, &icon_data);
-+  if (!result)
-+    LOG(WARNING) << "Unable to create status tray balloon.";
-+}
-+
-+void NotifyIcon::PopUpContextMenu(const gfx::Point& pos,
-+                                  ui::SimpleMenuModel* menu_model) {
-+  // Returns if context menu isn't set.
-+  if (!menu_model)
-+    return;
-+  // Set our window as the foreground window, so the context menu closes when
-+  // we click away from it.
-+  if (!SetForegroundWindow(window_))
-+    return;
-+
-+  // Show menu at mouse's position by default.
-+  gfx::Rect rect(pos, gfx::Size());
-+  if (pos.IsOrigin())
-+    rect.set_origin(gfx::Screen::GetNativeScreen()->GetCursorScreenPoint());
-+
-+  views::MenuRunner menu_runner(
-+      menu_model,
-+      views::MenuRunner::CONTEXT_MENU | views::MenuRunner::HAS_MNEMONICS);
-+  ignore_result(menu_runner.RunMenuAt(
-+      NULL, NULL, rect, views::MENU_ANCHOR_TOPLEFT, ui::MENU_SOURCE_MOUSE));
-+}
-+
-+void NotifyIcon::SetContextMenu(ui::SimpleMenuModel* menu_model) {
-+  menu_model_ = menu_model;
-+}
-+
-+void NotifyIcon::InitIconData(NOTIFYICONDATA* icon_data) {
-+  memset(icon_data, 0, sizeof(NOTIFYICONDATA));
-+  icon_data->cbSize = sizeof(NOTIFYICONDATA);
-+  icon_data->hWnd = window_;
-+  icon_data->uID = icon_id_;
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 881bc42fac90122b20bb8ed53234f07f1fad0045 electron/browser/ui/win/notify_icon.h
-@@ -0,0 +1,87 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_UI_WIN_NOTIFY_ICON_H_
-+#define ELECTRON_BROWSER_UI_WIN_NOTIFY_ICON_H_
-+
-+#include <windows.h>
-+#include <shellapi.h>
-+
-+#include <string>
-+
-+#include "electron/browser/ui/tray_icon.h"
-+#include "base/macros.h"
-+#include "base/compiler_specific.h"
-+#include "base/memory/scoped_ptr.h"
-+#include "base/win/scoped_gdi_object.h"
-+
-+namespace gfx {
-+class Point;
-+}
-+
-+namespace electron {
-+
-+class NotifyIconHost;
-+
-+class NotifyIcon : public TrayIcon {
-+ public:
-+  // Constructor which provides this icon's unique ID and messaging window.
-+  NotifyIcon(NotifyIconHost* host, UINT id, HWND window, UINT message);
-+  virtual ~NotifyIcon();
-+
-+  // Handles a click event from the user - if |left_button_click| is true and
-+  // there is a registered observer, passes the click event to the observer,
-+  // otherwise displays the context menu if there is one.
-+  void HandleClickEvent(int modifiers,
-+                        bool left_button_click,
-+                        bool double_button_click);
-+
-+  // Re-creates the status tray icon now after the taskbar has been created.
-+  void ResetIcon();
-+
-+  UINT icon_id() const { return icon_id_; }
-+  HWND window() const { return window_; }
-+  UINT message_id() const { return message_id_; }
-+
-+  // Overridden from TrayIcon:
-+  void SetImage(const gfx::Image& image) override;
-+  void SetPressedImage(const gfx::Image& image) override;
-+  void SetToolTip(const std::string& tool_tip) override;
-+  void DisplayBalloon(const gfx::Image& icon,
-+                      const base::string16& title,
-+                      const base::string16& contents) override;
-+  void PopUpContextMenu(const gfx::Point& pos,
-+                        ui::SimpleMenuModel* menu_model) override;
-+  void SetContextMenu(ui::SimpleMenuModel* menu_model) override;
-+
-+ private:
-+  void InitIconData(NOTIFYICONDATA* icon_data);
-+
-+  // The tray that owns us.  Weak.
-+  NotifyIconHost* host_;
-+
-+  // The unique ID corresponding to this icon.
-+  UINT icon_id_;
-+
-+  // Window used for processing messages from this icon.
-+  HWND window_;
-+
-+  // The message identifier used for status icon messages.
-+  UINT message_id_;
-+
-+  // The currently-displayed icon for the window.
-+  base::win::ScopedHICON icon_;
-+
-+  // The currently-displayed icon for the notification balloon.
-+  base::win::ScopedHICON balloon_icon_;
-+
-+  // The context menu.
-+  ui::SimpleMenuModel* menu_model_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(NotifyIcon);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_UI_WIN_NOTIFY_ICON_H_
-added in remote
-  their  100644 13766649534a30eae66a1eb89288a24efd5c46c2 electron/browser/ui/win/notify_icon_host.cc
-@@ -0,0 +1,190 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/ui/win/notify_icon_host.h"
-+
-+#include <commctrl.h>
-+#include <winuser.h>
-+
-+#include "electron/browser/ui/win/notify_icon.h"
-+#include "base/bind.h"
-+#include "base/stl_util.h"
-+#include "base/threading/non_thread_safe.h"
-+#include "base/threading/thread.h"
-+#include "base/win/win_util.h"
-+#include "base/win/wrapped_window_proc.h"
-+#include "ui/events/event_constants.h"
-+#include "ui/events/win/system_event_state_lookup.h"
-+#include "ui/gfx/win/hwnd_util.h"
-+
-+namespace electron {
-+
-+namespace {
-+
-+const UINT kNotifyIconMessage = WM_APP + 1;
-+
-+// |kBaseIconId| is 2 to avoid conflicts with plugins that hard-code id 1.
-+const UINT kBaseIconId = 2;
-+
-+const wchar_t kNotifyIconHostWindowClass[] = L"Electron_NotifyIconHostWindow";
-+
-+bool IsWinPressed() {
-+  return ((::GetKeyState(VK_LWIN) & 0x8000) == 0x8000) ||
-+         ((::GetKeyState(VK_RWIN) & 0x8000) == 0x8000);
-+}
-+
-+int GetKeyboardModifers() {
-+  int modifiers = ui::EF_NONE;
-+  if (ui::win::IsShiftPressed())
-+    modifiers |= ui::EF_SHIFT_DOWN;
-+  if (ui::win::IsCtrlPressed())
-+    modifiers |= ui::EF_CONTROL_DOWN;
-+  if (ui::win::IsAltPressed())
-+    modifiers |= ui::EF_ALT_DOWN;
-+  if (IsWinPressed())
-+    modifiers |= ui::EF_COMMAND_DOWN;
-+  return modifiers;
-+}
-+
-+}  // namespace
-+
-+NotifyIconHost::NotifyIconHost()
-+    : next_icon_id_(1),
-+      electron_(0),
-+      instance_(NULL),
-+      window_(NULL) {
-+  // Register our window class
-+  WNDCLASSEX window_class;
-+  base::win::InitializeWindowClass(
-+      kNotifyIconHostWindowClass,
-+      &base::win::WrappedWindowProc<NotifyIconHost::WndProcStatic>,
-+      0, 0, 0, NULL, NULL, NULL, NULL, NULL,
-+      &window_class);
-+  instance_ = window_class.hInstance;
-+  electron_ = RegisterClassEx(&window_class);
-+  CHECK(electron_);
-+
-+  // If the taskbar is re-created after we start up, we have to rebuild all of
-+  // our icons.
-+  taskbar_created_message_ = RegisterWindowMessage(TEXT("TaskbarCreated"));
-+
-+  // Create an offscreen window for handling messages for the status icons. We
-+  // create a hidden WS_POPUP window instead of an HWND_MESSAGE window, because
-+  // only top-level windows such as popups can receive broadcast messages like
-+  // "TaskbarCreated".
-+  window_ = CreateWindow(MAKEINTATOM(electron_),
-+                         0, WS_POPUP, 0, 0, 0, 0, 0, 0, instance_, 0);
-+  gfx::CheckWindowCreated(window_);
-+  gfx::SetWindowUserData(window_, this);
-+}
-+
-+NotifyIconHost::~NotifyIconHost() {
-+  if (window_)
-+    DestroyWindow(window_);
-+
-+  if (electron_)
-+    UnregisterClass(MAKEINTATOM(electron_), instance_);
-+
-+  NotifyIcons copied_container(notify_icons_);
-+  STLDeleteContainerPointers(copied_container.begin(), copied_container.end());
-+}
-+
-+NotifyIcon* NotifyIconHost::CreateNotifyIcon() {
-+  NotifyIcon* notify_icon =
-+      new NotifyIcon(this, NextIconId(), window_, kNotifyIconMessage);
-+  notify_icons_.push_back(notify_icon);
-+  return notify_icon;
-+}
-+
-+void NotifyIconHost::Remove(NotifyIcon* icon) {
-+  NotifyIcons::iterator i(
-+      std::find(notify_icons_.begin(), notify_icons_.end(), icon));
-+
-+  if (i == notify_icons_.end()) {
-+    NOTREACHED();
-+    return;
-+  }
-+
-+  notify_icons_.erase(i);
-+}
-+
-+LRESULT CALLBACK NotifyIconHost::WndProcStatic(HWND hwnd,
-+                                              UINT message,
-+                                              WPARAM wparam,
-+                                              LPARAM lparam) {
-+  NotifyIconHost* msg_wnd = reinterpret_cast<NotifyIconHost*>(
-+      GetWindowLongPtr(hwnd, GWLP_USERDATA));
-+  if (msg_wnd)
-+    return msg_wnd->WndProc(hwnd, message, wparam, lparam);
-+  else
-+    return ::DefWindowProc(hwnd, message, wparam, lparam);
-+}
-+
-+LRESULT CALLBACK NotifyIconHost::WndProc(HWND hwnd,
-+                                        UINT message,
-+                                        WPARAM wparam,
-+                                        LPARAM lparam) {
-+  if (message == taskbar_created_message_) {
-+    // We need to reset all of our icons because the taskbar went away.
-+    for (NotifyIcons::const_iterator i(notify_icons_.begin());
-+         i != notify_icons_.end(); ++i) {
-+      NotifyIcon* win_icon = static_cast<NotifyIcon*>(*i);
-+      win_icon->ResetIcon();
-+    }
-+    return TRUE;
-+  } else if (message == kNotifyIconMessage) {
-+    NotifyIcon* win_icon = NULL;
-+
-+    // Find the selected status icon.
-+    for (NotifyIcons::const_iterator i(notify_icons_.begin());
-+         i != notify_icons_.end(); ++i) {
-+      NotifyIcon* current_win_icon = static_cast<NotifyIcon*>(*i);
-+      if (current_win_icon->icon_id() == wparam) {
-+        win_icon = current_win_icon;
-+        break;
-+      }
-+    }
-+
-+    // It is possible for this procedure to be called with an obsolete icon
-+    // id.  In that case we should just return early before handling any
-+    // actions.
-+    if (!win_icon)
-+      return TRUE;
-+
-+    switch (lparam) {
-+      case TB_CHECKBUTTON:
-+        win_icon->NotifyBalloonShow();
-+        return TRUE;
-+
-+      case TB_INDETERMINATE:
-+        win_icon->NotifyBalloonClicked();
-+        return TRUE;
-+
-+      case TB_HIDEBUTTON:
-+        win_icon->NotifyBalloonClosed();
-+        return TRUE;
-+
-+      case WM_LBUTTONDOWN:
-+      case WM_RBUTTONDOWN:
-+      case WM_LBUTTONDBLCLK:
-+      case WM_RBUTTONDBLCLK:
-+      case WM_CONTEXTMENU:
-+        // Walk our icons, find which one was clicked on, and invoke its
-+        // HandleClickEvent() method.
-+        win_icon->HandleClickEvent(
-+            GetKeyboardModifers(),
-+            (lparam == WM_LBUTTONDOWN || lparam == WM_LBUTTONDBLCLK),
-+            (lparam == WM_LBUTTONDBLCLK || lparam == WM_RBUTTONDBLCLK));
-+        return TRUE;
-+    }
-+  }
-+  return ::DefWindowProc(hwnd, message, wparam, lparam);
-+}
-+
-+UINT NotifyIconHost::NextIconId() {
-+  UINT icon_id = next_icon_id_++;
-+  return kBaseIconId + icon_id;
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 7a3383ee576ee87b11ea7c62b073f5179c2c2f76 electron/browser/ui/win/notify_icon_host.h
-@@ -0,0 +1,63 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_UI_WIN_NOTIFY_ICON_HOST_H_
-+#define ELECTRON_BROWSER_UI_WIN_NOTIFY_ICON_HOST_H_
-+
-+#include <windows.h>
-+
-+#include <vector>
-+
-+#include "base/compiler_specific.h"
-+#include "base/memory/scoped_ptr.h"
-+
-+namespace electron {
-+
-+class NotifyIcon;
-+
-+class NotifyIconHost {
-+ public:
-+  NotifyIconHost();
-+  ~NotifyIconHost();
-+
-+  NotifyIcon* CreateNotifyIcon();
-+  void Remove(NotifyIcon* notify_icon);
-+
-+ private:
-+  typedef std::vector<NotifyIcon*> NotifyIcons;
-+
-+  // Static callback invoked when a message comes in to our messaging window.
-+  static LRESULT CALLBACK
-+      WndProcStatic(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam);
-+
-+  LRESULT CALLBACK
-+      WndProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam);
-+
-+  UINT NextIconId();
-+
-+  // The unique icon ID we will assign to the next icon.
-+  UINT next_icon_id_;
-+
-+  // List containing all active NotifyIcons.
-+  NotifyIcons notify_icons_;
-+
-+  // The window class of |window_|.
-+  ATOM electron_;
-+
-+  // The handle of the module that contains the window procedure of |window_|.
-+  HMODULE instance_;
-+
-+  // The window used for processing events.
-+  HWND window_;
-+
-+  // The message ID of the "TaskbarCreated" message, sent to us when we need to
-+  // reset our status icons.
-+  UINT taskbar_created_message_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(NotifyIconHost);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_UI_WIN_NOTIFY_ICON_HOST_H_
-added in remote
-  their  100644 282717800b0cc78e81f24df32988a5b57bb604d2 electron/browser/ui/win/taskbar_host.cc
-@@ -0,0 +1,166 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/ui/win/taskbar_host.h"
-+
-+#include <string>
-+
-+#include "base/stl_util.h"
-+#include "base/win/scoped_gdi_object.h"
-+#include "base/strings/utf_string_conversions.h"
-+#include "third_party/skia/include/core/SkBitmap.h"
-+#include "ui/gfx/icon_util.h"
-+
-+namespace electron {
-+
-+namespace {
-+
-+// From MSDN: https://msdn.microsoft.com/en-us/library/windows/desktop/dd378460(v=vs.85).aspx#thumbbars
-+// The thumbnail toolbar has a maximum of seven buttons due to the limited room.
-+const size_t kMaxButtonsCount = 7;
-+
-+// The base id of Thumbar button.
-+const int kButtonIdBase = 40001;
-+
-+bool GetThumbarButtonFlags(const std::vector<std::string>& flags,
-+                           THUMBBUTTONFLAGS* out) {
-+  THUMBBUTTONFLAGS result = THBF_ENABLED;  // THBF_ENABLED == 0
-+  for (const auto& flag : flags) {
-+    if (flag == "disabled")
-+      result |= THBF_DISABLED;
-+    else if (flag == "dismissonclick")
-+      result |= THBF_DISMISSONCLICK;
-+    else if (flag == "nobackground")
-+      result |= THBF_NOBACKGROUND;
-+    else if (flag == "hidden")
-+      result |= THBF_HIDDEN;
-+    else if (flag == "noninteractive")
-+      result |= THBF_NONINTERACTIVE;
-+    else
-+      return false;
-+  }
-+  *out = result;
-+  return true;
-+}
-+
-+}  // namespace
-+
-+TaskbarHost::TaskbarHost() : thumbar_buttons_added_(false) {
-+}
-+
-+TaskbarHost::~TaskbarHost() {
-+}
-+
-+bool TaskbarHost::SetThumbarButtons(
-+    HWND window, const std::vector<ThumbarButton>& buttons) {
-+  if (buttons.size() > kMaxButtonsCount || !InitailizeTaskbar())
-+    return false;
-+
-+  callback_map_.clear();
-+
-+  // The number of buttons in thumbar can not be changed once it is created,
-+  // so we have to claim kMaxButtonsCount buttons initialy in case users add
-+  // more buttons later.
-+  base::win::ScopedHICON icons[kMaxButtonsCount] = {};
-+  THUMBBUTTON thumb_buttons[kMaxButtonsCount] = {};
-+
-+  for (size_t i = 0; i < kMaxButtonsCount; ++i) {
-+    THUMBBUTTON& thumb_button = thumb_buttons[i];
-+
-+    // Set ID.
-+    thumb_button.iId = kButtonIdBase + i;
-+    thumb_button.dwMask = THB_FLAGS;
-+
-+    if (i >= buttons.size()) {
-+      // This button is used to occupy the place in toolbar, and it does not
-+      // show.
-+      thumb_button.dwFlags = THBF_HIDDEN;
-+      continue;
-+    }
-+
-+    // This button is user's button.
-+    const ThumbarButton& button = buttons[i];
-+
-+    // Generate flags.
-+    thumb_button.dwFlags = THBF_ENABLED;
-+    if (!GetThumbarButtonFlags(button.flags, &thumb_button.dwFlags))
-+      return false;
-+
-+    // Set icon.
-+    if (!button.icon.IsEmpty()) {
-+      thumb_button.dwMask |= THB_ICON;
-+      icons[i] = IconUtil::CreateHICONFromSkBitmap(button.icon.AsBitmap());
-+      thumb_button.hIcon = icons[i].get();
-+    }
-+
-+    // Set tooltip.
-+    if (!button.tooltip.empty()) {
-+      thumb_button.dwMask |= THB_TOOLTIP;
-+      wcsncpy_s(thumb_button.szTip, base::UTF8ToUTF16(button.tooltip).c_str(),
-+                _TRUNCATE);
-+    }
-+
-+    // Save callback.
-+    callback_map_[thumb_button.iId] = button.clicked_callback;
-+  }
-+
-+  // Finally add them to taskbar.
-+  HRESULT r;
-+  if (thumbar_buttons_added_)
-+    r = taskbar_->ThumbBarUpdateButtons(window, kMaxButtonsCount,
-+                                        thumb_buttons);
-+  else
-+    r = taskbar_->ThumbBarAddButtons(window, kMaxButtonsCount, thumb_buttons);
-+
-+  thumbar_buttons_added_ = true;
-+  return SUCCEEDED(r);
-+}
-+
-+bool TaskbarHost::SetProgressBar(HWND window, double value) {
-+  if (!InitailizeTaskbar())
-+    return false;
-+
-+  HRESULT r;
-+  if (value > 1.0)
-+    r = taskbar_->SetProgressState(window, TBPF_INDETERMINATE);
-+  else if (value < 0)
-+    r = taskbar_->SetProgressState(window, TBPF_NOPROGRESS);
-+  else
-+    r = taskbar_->SetProgressValue(window, static_cast<int>(value * 100), 100);
-+  return SUCCEEDED(r);
-+}
-+
-+bool TaskbarHost::SetOverlayIcon(
-+    HWND window, const gfx::Image& overlay, const std::string& text) {
-+  if (!InitailizeTaskbar())
-+    return false;
-+
-+  base::win::ScopedHICON icon(
-+      IconUtil::CreateHICONFromSkBitmap(overlay.AsBitmap()));
-+  return SUCCEEDED(taskbar_->SetOverlayIcon(
-+      window, icon.get(), base::UTF8ToUTF16(text).c_str()));
-+}
-+
-+bool TaskbarHost::HandleThumbarButtonEvent(int button_id) {
-+  if (ContainsKey(callback_map_, button_id)) {
-+    auto callback = callback_map_[button_id];
-+    if (!callback.is_null())
-+      callback.Run();
-+    return true;
-+  }
-+  return false;
-+}
-+
-+bool TaskbarHost::InitailizeTaskbar() {
-+  if (FAILED(taskbar_.CreateInstance(CLSID_TaskbarList,
-+                                     nullptr,
-+                                     CLSCTX_INPROC_SERVER)) ||
-+      FAILED(taskbar_->HrInit())) {
-+    return false;
-+  } else {
-+    return true;
-+  }
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 bef917602487ee3d60637e9636be87655f5986ed electron/browser/ui/win/taskbar_host.h
-@@ -0,0 +1,64 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_UI_WIN_TASKBAR_HOST_H_
-+#define ELECTRON_BROWSER_UI_WIN_TASKBAR_HOST_H_
-+
-+#include <shobjidl.h>
-+
-+#include <map>
-+#include <string>
-+#include <vector>
-+
-+#include "base/callback.h"
-+#include "base/win/scoped_comptr.h"
-+#include "ui/gfx/image/image.h"
-+
-+namespace electron {
-+
-+class TaskbarHost {
-+ public:
-+  struct ThumbarButton {
-+    std::string tooltip;
-+    gfx::Image icon;
-+    std::vector<std::string> flags;
-+    base::Closure clicked_callback;
-+  };
-+
-+  TaskbarHost();
-+  virtual ~TaskbarHost();
-+
-+  // Add or update the buttons in thumbar.
-+  bool SetThumbarButtons(
-+      HWND window, const std::vector<ThumbarButton>& buttons);
-+
-+  // Set the progress state in taskbar.
-+  bool SetProgressBar(HWND window, double value);
-+
-+  // Set the overlay icon in taskbar.
-+  bool SetOverlayIcon(
-+      HWND window, const gfx::Image& overlay, const std::string& text);
-+
-+  // Called by the window that there is a button in thumbar clicked.
-+  bool HandleThumbarButtonEvent(int button_id);
-+
-+ private:
-+  // Initailize the taskbar object.
-+  bool InitailizeTaskbar();
-+
-+  using CallbackMap = std::map<int, base::Closure>;
-+  CallbackMap callback_map_;
-+
-+  // The COM object of taskbar.
-+  base::win::ScopedComPtr<ITaskbarList3> taskbar_;
-+
-+  // Whether we have already added the buttons to thumbar.
-+  bool thumbar_buttons_added_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(TaskbarHost);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_UI_WIN_TASKBAR_HOST_H_
-added in remote
-  their  100644 03973bb4a904f59c85780f2351872f2231b89854 electron/browser/ui/x/window_state_watcher.cc
-@@ -0,0 +1,78 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/ui/x/window_state_watcher.h"
-+
-+#include <X11/Xlib.h>
-+
-+#include "ui/events/platform/platform_event_source.h"
-+
-+namespace electron {
-+
-+namespace {
-+
-+const char* kAtomsToCache[] = {
-+  "_NET_WM_STATE",
-+  NULL,
-+};
-+
-+}  // namespace
-+
-+WindowStateWatcher::WindowStateWatcher(NativeWindowViews* window)
-+    : window_(window),
-+      widget_(window->GetAcceleratedWidget()),
-+      electron_cache_(gfx::GetXDisplay(), kAtomsToCache),
-+      was_minimized_(false),
-+      was_maximized_(false) {
-+  ui::PlatformEventSource::GetInstance()->AddPlatformEventObserver(this);
-+}
-+
-+WindowStateWatcher::~WindowStateWatcher() {
-+  ui::PlatformEventSource::GetInstance()->RemovePlatformEventObserver(this);
-+}
-+
-+void WindowStateWatcher::WillProcessEvent(const ui::PlatformEvent& event) {
-+  if (IsWindowStateEvent(event)) {
-+    was_minimized_ = window_->IsMinimized();
-+    was_maximized_ = window_->IsMaximized();
-+  }
-+}
-+
-+void WindowStateWatcher::DidProcessEvent(const ui::PlatformEvent& event) {
-+  if (IsWindowStateEvent(event)) {
-+    bool is_minimized = window_->IsMinimized();
-+    bool is_maximized = window_->IsMaximized();
-+    bool is_fullscreen = window_->IsFullscreen();
-+    if (is_minimized != was_minimized_) {
-+      if (is_minimized)
-+        window_->NotifyWindowMinimize();
-+      else
-+        window_->NotifyWindowRestore();
-+    } else if (is_maximized != was_maximized_) {
-+      if (is_maximized)
-+        window_->NotifyWindowMaximize();
-+      else
-+        window_->NotifyWindowUnmaximize();
-+    } else {
-+      // If this is neither a "maximize" or "minimize" event, then we think it
-+      // is a "fullscreen" event.
-+      // The "IsFullscreen()" becomes true immediately before "WillProcessEvent"
-+      // is called, so we can not handle this like "maximize" and "minimize" by
-+      // watching whether they have changed.
-+      if (is_fullscreen)
-+        window_->NotifyWindowEnterFullScreen();
-+      else
-+        window_->NotifyWindowLeaveFullScreen();
-+    }
-+  }
-+}
-+
-+bool WindowStateWatcher::IsWindowStateEvent(const ui::PlatformEvent& event) {
-+  ::Atom changed_atom = event->xproperty.atom;
-+  return (changed_atom == electron_cache_.GetAtom("_NET_WM_STATE") &&
-+          event->type == PropertyNotify &&
-+          event->xproperty.window == widget_);
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 74bc431ddeb1fa5de43c51765d168ae21913e9ce electron/browser/ui/x/window_state_watcher.h
-@@ -0,0 +1,41 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_UI_X_WINDOW_STATE_WATCHER_H_
-+#define ELECTRON_BROWSER_UI_X_WINDOW_STATE_WATCHER_H_
-+
-+#include "ui/events/platform/platform_event_observer.h"
-+
-+#include "electron/browser/native_window_views.h"
-+#include "ui/gfx/x/x11_electron_cache.h"
-+
-+namespace electron {
-+
-+class WindowStateWatcher : public ui::PlatformEventObserver {
-+ public:
-+  explicit WindowStateWatcher(NativeWindowViews* window);
-+  virtual ~WindowStateWatcher();
-+
-+ protected:
-+  // ui::PlatformEventObserver:
-+  void WillProcessEvent(const ui::PlatformEvent& event) override;
-+  void DidProcessEvent(const ui::PlatformEvent& event) override;
-+
-+ private:
-+  bool IsWindowStateEvent(const ui::PlatformEvent& event);
-+
-+  NativeWindowViews* window_;
-+  gfx::AcceleratedWidget widget_;
-+
-+  ui::X11ElectronCache electron_cache_;
-+
-+  bool was_minimized_;
-+  bool was_maximized_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(WindowStateWatcher);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_UI_X_WINDOW_STATE_WATCHER_H_
-added in remote
-  their  100644 3ac72fd71d88ccd7227d0d1b1da37108f91bc506 electron/browser/ui/x/x_window_utils.cc
-@@ -0,0 +1,90 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/ui/x/x_window_utils.h"
-+
-+#include <X11/Xatom.h>
-+
-+#include "base/environment.h"
-+#include "base/strings/string_util.h"
-+#include "dbus/bus.h"
-+#include "dbus/object_proxy.h"
-+#include "dbus/message.h"
-+#include "ui/base/x/x11_util.h"
-+
-+namespace electron {
-+
-+::Atom GetAtom(const char* name) {
-+  return XInternAtom(gfx::GetXDisplay(), name, false);
-+}
-+
-+void SetWMSpecState(::Window xwindow, bool enabled, ::Atom state) {
-+  XEvent xclient;
-+  memset(&xclient, 0, sizeof(xclient));
-+  xclient.type = ClientMessage;
-+  xclient.xclient.window = xwindow;
-+  xclient.xclient.message_type = GetAtom("_NET_WM_STATE");
-+  xclient.xclient.format = 32;
-+  xclient.xclient.data.l[0] = enabled ? 1 : 0;
-+  xclient.xclient.data.l[1] = state;
-+  xclient.xclient.data.l[2] = None;
-+  xclient.xclient.data.l[3] = 1;
-+  xclient.xclient.data.l[4] = 0;
-+
-+  XDisplay* xdisplay = gfx::GetXDisplay();
-+  XSendEvent(xdisplay, DefaultRootWindow(xdisplay), False,
-+             SubstructureRedirectMask | SubstructureNotifyMask,
-+             &xclient);
-+}
-+
-+void SetWindowType(::Window xwindow, const std::string& type) {
-+  XDisplay* xdisplay = gfx::GetXDisplay();
-+  std::string type_prefix = "_NET_WM_WINDOW_TYPE_";
-+  ::Atom window_type = XInternAtom(
-+      xdisplay, (type_prefix + base::ToUpperASCII(type)).c_str(), False);
-+  XChangeProperty(xdisplay, xwindow,
-+                  XInternAtom(xdisplay, "_NET_WM_WINDOW_TYPE", False),
-+                  XA_ATOM,
-+                  32, PropModeReplace,
-+                  reinterpret_cast<unsigned char*>(&window_type), 1);
-+}
-+
-+bool ShouldUseGlobalMenuBar() {
-+  scoped_ptr<base::Environment> env(base::Environment::Create());
-+  if (env->HasVar("ELECTRON_FORCE_WINDOW_MENU_BAR"))
-+    return false;
-+
-+  dbus::Bus::Options options;
-+  scoped_refptr<dbus::Bus> bus(new dbus::Bus(options));
-+
-+  dbus::ObjectProxy* object_proxy =
-+      bus->GetObjectProxy(DBUS_SERVICE_DBUS, dbus::ObjectPath(DBUS_PATH_DBUS));
-+  dbus::MethodCall method_call(DBUS_INTERFACE_DBUS, "ListNames");
-+  scoped_ptr<dbus::Response> response(object_proxy->CallMethodAndBlock(
-+      &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT));
-+  if (!response) {
-+    bus->ShutdownAndBlock();
-+    return false;
-+  }
-+
-+  dbus::MessageReader reader(response.get());
-+  dbus::MessageReader array_reader(NULL);
-+  if (!reader.PopArray(&array_reader)) {
-+    bus->ShutdownAndBlock();
-+    return false;
-+  }
-+  while (array_reader.HasMoreData()) {
-+    std::string name;
-+    if (array_reader.PopString(&name) &&
-+        name == "com.canonical.AppMenu.Registrar") {
-+      bus->ShutdownAndBlock();
-+      return true;
-+    }
-+  }
-+
-+  bus->ShutdownAndBlock();
-+  return false;
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 d089d1b3a38c87baabc4c0a1d7f4af36f58a510d electron/browser/ui/x/x_window_utils.h
-@@ -0,0 +1,30 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_UI_X_X_WINDOW_UTILS_H_
-+#define ELECTRON_BROWSER_UI_X_X_WINDOW_UTILS_H_
-+
-+#include <X11/extensions/XInput2.h>
-+#include <X11/extensions/Xrandr.h>
-+#include <X11/Xlib.h>
-+
-+#include <string>
-+
-+namespace electron {
-+
-+::Atom GetAtom(const char* name);
-+
-+// Sends a message to the x11 window manager, enabling or disabling the |state|
-+// for _NET_WM_STATE.
-+void SetWMSpecState(::Window xwindow, bool enabled, ::Atom state);
-+
-+// Sets the _NET_WM_WINDOW_TYPE of window.
-+void SetWindowType(::Window xwindow, const std::string& type);
-+
-+// Returns true if the bus name "com.canonical.AppMenu.Registrar" is available.
-+bool ShouldUseGlobalMenuBar();
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_UI_X_X_WINDOW_UTILS_H_
-added in remote
-  their  100644 135c54efc88b175de6c922777c263b4a9f85491d electron/browser/web_contents_permission_helper.cc
-@@ -0,0 +1,94 @@
-+// Copyright (c) 2016 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/web_contents_permission_helper.h"
-+
-+#include <string>
-+
-+#include "electron/browser/electron_permission_manager.h"
-+#include "brightray/browser/media/media_stream_devices_controller.h"
-+#include "content/public/browser/browser_context.h"
-+#include "content/public/browser/render_process_host.h"
-+
-+DEFINE_WEB_CONTENTS_USER_DATA_KEY(electron::WebContentsPermissionHelper);
-+
-+namespace electron {
-+
-+namespace {
-+
-+void MediaAccessAllowed(
-+    const content::MediaStreamRequest& request,
-+    const content::MediaResponseCallback& callback,
-+    bool allowed) {
-+  brightray::MediaStreamDevicesController controller(request, callback);
-+  if (allowed)
-+    controller.TakeAction();
-+  else
-+    controller.Deny(content::MEDIA_DEVICE_PERMISSION_DENIED);
-+}
-+
-+void OnPointerLockResponse(content::WebContents* web_contents, bool allowed) {
-+  if (web_contents)
-+    web_contents->GotResponseToLockMouseRequest(allowed);
-+}
-+
-+void OnPermissionResponse(const base::Callback<void(bool)>& callback,
-+                          content::PermissionStatus status) {
-+  if (status == content::PERMISSION_STATUS_GRANTED)
-+    callback.Run(true);
-+  else
-+    callback.Run(false);
-+}
-+
-+}  // namespace
-+
-+WebContentsPermissionHelper::WebContentsPermissionHelper(
-+    content::WebContents* web_contents)
-+    : web_contents_(web_contents) {
-+}
-+
-+WebContentsPermissionHelper::~WebContentsPermissionHelper() {
-+}
-+
-+void WebContentsPermissionHelper::RequestPermission(
-+    content::PermissionType permission,
-+    const base::Callback<void(bool)>& callback,
-+    bool user_gesture) {
-+  auto rfh = web_contents_->GetMainFrame();
-+  auto permission_manager = static_cast<ElectronPermissionManager*>(
-+      web_contents_->GetBrowserContext()->GetPermissionManager());
-+  auto origin = web_contents_->GetLastCommittedURL();
-+  permission_manager->RequestPermission(
-+      permission, rfh, origin, user_gesture,
-+      base::Bind(&OnPermissionResponse, callback));
-+}
-+
-+void WebContentsPermissionHelper::RequestFullscreenPermission(
-+    const base::Callback<void(bool)>& callback) {
-+  RequestPermission((content::PermissionType)(PermissionType::FULLSCREEN),
-+                    callback);
-+}
-+
-+void WebContentsPermissionHelper::RequestMediaAccessPermission(
-+    const content::MediaStreamRequest& request,
-+    const content::MediaResponseCallback& response_callback) {
-+  auto callback = base::Bind(&MediaAccessAllowed, request, response_callback);
-+  // The permission type doesn't matter here, AUDIO_CAPTURE/VIDEO_CAPTURE
-+  // are presented as same type in content_converter.h.
-+  RequestPermission(content::PermissionType::AUDIO_CAPTURE, callback);
-+}
-+
-+void WebContentsPermissionHelper::RequestWebNotificationPermission(
-+    const base::Callback<void(bool)>& callback) {
-+  RequestPermission(content::PermissionType::NOTIFICATIONS, callback);
-+}
-+
-+void WebContentsPermissionHelper::RequestPointerLockPermission(
-+    bool user_gesture) {
-+  RequestPermission((content::PermissionType)(PermissionType::POINTER_LOCK),
-+                    base::Bind(&OnPointerLockResponse, web_contents_),
-+                    user_gesture);
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 7eb71959cabd6f3ab628c3b721ff9dcc46e0c609 electron/browser/web_contents_permission_helper.h
-@@ -0,0 +1,50 @@
-+// Copyright (c) 2016 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_WEB_CONTENTS_PERMISSION_HELPER_H_
-+#define ELECTRON_BROWSER_WEB_CONTENTS_PERMISSION_HELPER_H_
-+
-+#include "content/public/browser/permission_type.h"
-+#include "content/public/browser/web_contents_user_data.h"
-+#include "content/public/common/media_stream_request.h"
-+
-+namespace electron {
-+
-+// Applies the permission requested for WebContents.
-+class WebContentsPermissionHelper
-+    : public content::WebContentsUserData<WebContentsPermissionHelper> {
-+ public:
-+  ~WebContentsPermissionHelper() override;
-+
-+  enum class PermissionType {
-+    POINTER_LOCK = static_cast<int>(content::PermissionType::NUM) + 1,
-+    FULLSCREEN
-+  };
-+
-+  void RequestFullscreenPermission(
-+      const base::Callback<void(bool)>& callback);
-+  void RequestMediaAccessPermission(
-+      const content::MediaStreamRequest& request,
-+      const content::MediaResponseCallback& callback);
-+  void RequestWebNotificationPermission(
-+      const base::Callback<void(bool)>& callback);
-+  void RequestPointerLockPermission(bool user_gesture);
-+
-+ private:
-+  explicit WebContentsPermissionHelper(content::WebContents* web_contents);
-+  friend class content::WebContentsUserData<WebContentsPermissionHelper>;
-+
-+  void RequestPermission(
-+      content::PermissionType permission,
-+      const base::Callback<void(bool)>& callback,
-+      bool user_gesture = false);
-+
-+  content::WebContents* web_contents_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(WebContentsPermissionHelper);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_WEB_CONTENTS_PERMISSION_HELPER_H_
-added in remote
-  their  100644 6ebe09ad537121f811cea6293095108a06d5ecee electron/browser/web_contents_preferences.cc
-@@ -0,0 +1,201 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/web_contents_preferences.h"
-+
-+#include <algorithm>
-+#include <string>
-+#include <vector>
-+
-+#include "electron/common/native_mate_converters/value_converter.h"
-+#include "electron/common/options_switches.h"
-+#include "base/command_line.h"
-+#include "base/strings/string_number_conversions.h"
-+#include "content/public/browser/render_process_host.h"
-+#include "content/public/common/content_switches.h"
-+#include "content/public/common/web_preferences.h"
-+#include "native_mate/dictionary.h"
-+#include "net/base/filename_util.h"
-+
-+#if defined(OS_WIN)
-+#include "ui/gfx/switches.h"
-+#endif
-+
-+DEFINE_WEB_CONTENTS_USER_DATA_KEY(electron::WebContentsPreferences);
-+
-+namespace electron {
-+
-+// static
-+std::vector<WebContentsPreferences*> WebContentsPreferences::instances_;
-+
-+WebContentsPreferences::WebContentsPreferences(
-+    content::WebContents* web_contents,
-+    const mate::Dictionary& web_preferences)
-+    : web_contents_(web_contents) {
-+  v8::Isolate* isolate = web_preferences.isolate();
-+  mate::Dictionary copied(isolate, web_preferences.GetHandle()->Clone());
-+  // Following fields should not be stored.
-+  copied.Delete("embedder");
-+  copied.Delete("isGuest");
-+  copied.Delete("session");
-+
-+  mate::ConvertFromV8(isolate, copied.GetHandle(), &web_preferences_);
-+  web_contents->SetUserData(UserDataKey(), this);
-+
-+  instances_.push_back(this);
-+}
-+
-+WebContentsPreferences::~WebContentsPreferences() {
-+  instances_.erase(
-+      std::remove(instances_.begin(), instances_.end(), this),
-+      instances_.end());
-+}
-+
-+void WebContentsPreferences::Merge(const base::DictionaryValue& extend) {
-+  web_preferences_.MergeDictionary(&extend);
-+}
-+
-+// static
-+content::WebContents* WebContentsPreferences::GetWebContentsFromProcessID(
-+    int process_id) {
-+  for (WebContentsPreferences* preferences : instances_) {
-+    content::WebContents* web_contents = preferences->web_contents_;
-+    if (web_contents->GetRenderProcessHost()->GetID() == process_id)
-+      return web_contents;
-+  }
-+  return nullptr;
-+}
-+
-+// static
-+void WebContentsPreferences::AppendExtraCommandLineSwitches(
-+    content::WebContents* web_contents, base::CommandLine* command_line) {
-+  WebContentsPreferences* self = FromWebContents(web_contents);
-+  if (!self)
-+    return;
-+
-+  base::DictionaryValue& web_preferences = self->web_preferences_;
-+
-+  bool b;
-+#if defined(OS_WIN)
-+  // Check if DirectWrite is disabled.
-+  if (web_preferences.GetBoolean(options::kDirectWrite, &b) && !b)
-+    command_line->AppendSwitch(::switches::kDisableDirectWrite);
-+#endif
-+
-+  // Check if plugins are enabled.
-+  if (web_preferences.GetBoolean("plugins", &b) && b)
-+    command_line->AppendSwitch(switches::kEnablePlugins);
-+
-+  // Experimental flags.
-+  if (web_preferences.GetBoolean(options::kExperimentalFeatures, &b) && b)
-+    command_line->AppendSwitch(
-+        ::switches::kEnableExperimentalWebPlatformFeatures);
-+  if (web_preferences.GetBoolean(options::kExperimentalCanvasFeatures, &b) && b)
-+    command_line->AppendSwitch(::switches::kEnableExperimentalCanvasFeatures);
-+
-+  // Check if we have node integration specified.
-+  bool node_integration = true;
-+  web_preferences.GetBoolean(options::kNodeIntegration, &node_integration);
-+  // Be compatible with old API of "node-integration" option.
-+  std::string old_token;
-+  if (web_preferences.GetString(options::kNodeIntegration, &old_token) &&
-+      old_token != "disable")
-+    node_integration = true;
-+  command_line->AppendSwitchASCII(switches::kNodeIntegration,
-+                                  node_integration ? "true" : "false");
-+
-+  // The preload script.
-+  base::FilePath::StringType preload;
-+  if (web_preferences.GetString(options::kPreloadScript, &preload)) {
-+    if (base::FilePath(preload).IsAbsolute())
-+      command_line->AppendSwitchNative(switches::kPreloadScript, preload);
-+    else
-+      LOG(ERROR) << "preload script must have absolute path.";
-+  } else if (web_preferences.GetString(options::kPreloadURL, &preload)) {
-+    // Translate to file path if there is "preload-url" option.
-+    base::FilePath preload_path;
-+    if (net::FileURLToFilePath(GURL(preload), &preload_path))
-+      command_line->AppendSwitchPath(switches::kPreloadScript, preload_path);
-+    else
-+      LOG(ERROR) << "preload url must be file:// protocol.";
-+  }
-+
-+  // The zoom factor.
-+  double zoom_factor = 1.0;
-+  if (web_preferences.GetDouble(options::kZoomFactor, &zoom_factor) &&
-+      zoom_factor != 1.0)
-+    command_line->AppendSwitchASCII(switches::kZoomFactor,
-+                                    base::DoubleToString(zoom_factor));
-+
-+  // --guest-instance-id, which is used to identify guest WebContents.
-+  int guest_instance_id;
-+  if (web_preferences.GetInteger(options::kGuestInstanceID, &guest_instance_id))
-+      command_line->AppendSwitchASCII(switches::kGuestInstanceID,
-+                                      base::IntToString(guest_instance_id));
-+
-+  // Pass the opener's window id.
-+  int opener_id;
-+  if (web_preferences.GetInteger(options::kOpenerID, &opener_id))
-+      command_line->AppendSwitchASCII(switches::kOpenerID,
-+                                      base::IntToString(opener_id));
-+
-+  // Enable blink features.
-+  std::string blink_features;
-+  if (web_preferences.GetString(options::kBlinkFeatures, &blink_features))
-+      command_line->AppendSwitchASCII(::switches::kEnableBlinkFeatures,
-+                                      blink_features);
-+}
-+
-+// static
-+void WebContentsPreferences::OverrideWebkitPrefs(
-+    content::WebContents* web_contents, content::WebPreferences* prefs) {
-+  WebContentsPreferences* self = FromWebContents(web_contents);
-+  if (!self)
-+    return;
-+
-+  bool b;
-+  if (self->web_preferences_.GetBoolean("javascript", &b))
-+    prefs->javascript_enabled = b;
-+  if (self->web_preferences_.GetBoolean("images", &b))
-+    prefs->images_enabled = b;
-+  if (self->web_preferences_.GetBoolean("textAreasAreResizable", &b))
-+    prefs->text_areas_are_resizable = b;
-+  if (self->web_preferences_.GetBoolean("webgl", &b))
-+    prefs->experimental_webgl_enabled = b;
-+  if (self->web_preferences_.GetBoolean("webaudio", &b))
-+    prefs->webaudio_enabled = b;
-+  if (self->web_preferences_.GetBoolean("webSecurity", &b)) {
-+    prefs->web_security_enabled = b;
-+    prefs->allow_displaying_insecure_content = !b;
-+    prefs->allow_running_insecure_content = !b;
-+  }
-+  if (self->web_preferences_.GetBoolean("allowDisplayingInsecureContent", &b))
-+    prefs->allow_displaying_insecure_content = b;
-+  if (self->web_preferences_.GetBoolean("allowRunningInsecureContent", &b))
-+    prefs->allow_running_insecure_content = b;
-+  const base::DictionaryValue* fonts = nullptr;
-+  if (self->web_preferences_.GetDictionary("defaultFontFamily", &fonts)) {
-+    base::string16 font;
-+    if (fonts->GetString("standard", &font))
-+      prefs->standard_font_family_map[content::kCommonScript] = font;
-+    if (fonts->GetString("serif", &font))
-+      prefs->serif_font_family_map[content::kCommonScript] = font;
-+    if (fonts->GetString("sansSerif", &font))
-+      prefs->sans_serif_font_family_map[content::kCommonScript] = font;
-+    if (fonts->GetString("monospace", &font))
-+      prefs->fixed_font_family_map[content::kCommonScript] = font;
-+  }
-+  int size;
-+  if (self->web_preferences_.GetInteger("defaultFontSize", &size))
-+    prefs->default_font_size = size;
-+  if (self->web_preferences_.GetInteger("defaultMonospaceFontSize", &size))
-+    prefs->default_fixed_font_size = size;
-+  if (self->web_preferences_.GetInteger("minimumFontSize", &size))
-+    prefs->minimum_font_size = size;
-+  std::string encoding;
-+  if (self->web_preferences_.GetString("defaultEncoding", &encoding))
-+    prefs->default_encoding = encoding;
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 50a0a01168755a9a21b81bf7bea13293be66a0a3 electron/browser/web_contents_preferences.h
-@@ -0,0 +1,65 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_WEB_CONTENTS_PREFERENCES_H_
-+#define ELECTRON_BROWSER_WEB_CONTENTS_PREFERENCES_H_
-+
-+#include <vector>
-+
-+#include "base/values.h"
-+#include "content/public/browser/web_contents_user_data.h"
-+
-+namespace base {
-+class CommandLine;
-+}
-+
-+namespace content {
-+struct WebPreferences;
-+}
-+
-+namespace mate {
-+class Dictionary;
-+}
-+
-+namespace electron {
-+
-+// Stores and applies the preferences of WebContents.
-+class WebContentsPreferences
-+    : public content::WebContentsUserData<WebContentsPreferences> {
-+ public:
-+  // Get WebContents according to process ID.
-+  static content::WebContents* GetWebContentsFromProcessID(int process_id);
-+
-+  // Append command paramters according to |web_contents|'s preferences.
-+  static void AppendExtraCommandLineSwitches(
-+      content::WebContents* web_contents, base::CommandLine* command_line);
-+
-+  // Modify the WebPreferences according to |web_contents|'s preferences.
-+  static void OverrideWebkitPrefs(
-+      content::WebContents* web_contents, content::WebPreferences* prefs);
-+
-+  WebContentsPreferences(content::WebContents* web_contents,
-+                         const mate::Dictionary& web_preferences);
-+  ~WebContentsPreferences() override;
-+
-+  // $.extend(|web_preferences_|, |new_web_preferences|).
-+  void Merge(const base::DictionaryValue& new_web_preferences);
-+
-+  // Returns the web preferences.
-+  base::DictionaryValue* web_preferences() { return &web_preferences_; }
-+
-+ private:
-+  friend class content::WebContentsUserData<WebContentsPreferences>;
-+
-+  static std::vector<WebContentsPreferences*> instances_;
-+
-+  content::WebContents* web_contents_;
-+  base::DictionaryValue web_preferences_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(WebContentsPreferences);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_WEB_CONTENTS_PREFERENCES_H_
-added in remote
-  their  100644 50ebe0e1e2e3e18763399bef278e177ecb9e12b1 electron/browser/web_dialog_helper.cc
-@@ -0,0 +1,155 @@
-+// Copyright (c) 2014 GitHub, Inc. All rights reserved.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/web_dialog_helper.h"
-+
-+#include <string>
-+#include <vector>
-+
-+#include "electron/browser/electron_browser_context.h"
-+#include "electron/browser/native_window.h"
-+#include "electron/browser/ui/file_dialog.h"
-+#include "base/bind.h"
-+#include "base/files/file_enumerator.h"
-+#include "base/files/file_path.h"
-+#include "base/prefs/pref_service.h"
-+#include "base/strings/utf_string_conversions.h"
-+#include "chrome/common/pref_names.h"
-+#include "content/public/browser/render_view_host.h"
-+#include "content/public/browser/web_contents.h"
-+#include "content/public/common/file_chooser_file_info.h"
-+#include "net/base/mime_util.h"
-+#include "ui/shell_dialogs/selected_file_info.h"
-+
-+namespace {
-+
-+file_dialog::Filters GetFileTypesFromAcceptType(
-+    const std::vector<base::string16>& accept_types) {
-+  file_dialog::Filters filters;
-+  if (accept_types.empty())
-+    return filters;
-+
-+  std::vector<base::FilePath::StringType> extensions;
-+
-+  for (const auto& accept_type : accept_types) {
-+    std::string ascii_type = base::UTF16ToASCII(accept_type);
-+    if (ascii_type[0] == '.') {
-+      // If the type starts with a period it is assumed to be a file extension,
-+      // like `.txt`, // so we just have to add it to the list.
-+      base::FilePath::StringType extension(
-+          ascii_type.begin(), ascii_type.end());
-+      // Skip the first character.
-+      extensions.push_back(extension.substr(1));
-+    } else {
-+      // For MIME Type, `audio/*, vidio/*, image/*
-+      net::GetExtensionsForMimeType(ascii_type, &extensions);
-+    }
-+  }
-+
-+  // If no valid exntesion is added, return empty filters.
-+  if (extensions.empty())
-+    return filters;
-+
-+  filters.push_back(file_dialog::Filter());
-+  for (const auto& extension : extensions) {
-+#if defined(OS_WIN)
-+    filters[0].second.push_back(base::UTF16ToASCII(extension));
-+#else
-+    filters[0].second.push_back(extension);
-+#endif
-+  }
-+  return filters;
-+}
-+
-+}  // namespace
-+
-+namespace electron {
-+
-+WebDialogHelper::WebDialogHelper(NativeWindow* window)
-+    : window_(window),
-+      weak_factory_(this) {
-+}
-+
-+WebDialogHelper::~WebDialogHelper() {
-+}
-+
-+
-+void WebDialogHelper::RunFileChooser(content::WebContents* web_contents,
-+                                     const content::FileChooserParams& params) {
-+  std::vector<content::FileChooserFileInfo> result;
-+  file_dialog::Filters filters = GetFileTypesFromAcceptType(
-+      params.accept_types);
-+  if (params.mode == content::FileChooserParams::Save) {
-+    base::FilePath path;
-+    if (file_dialog::ShowSaveDialog(window_,
-+                                    base::UTF16ToUTF8(params.title),
-+                                    params.default_file_name,
-+                                    filters,
-+                                    &path)) {
-+      content::FileChooserFileInfo info;
-+      info.file_path = path;
-+      info.display_name = path.BaseName().value();
-+      result.push_back(info);
-+    }
-+  } else {
-+    int flags = file_dialog::FILE_DIALOG_CREATE_DIRECTORY;
-+    switch (params.mode) {
-+      case content::FileChooserParams::OpenMultiple:
-+        flags |= file_dialog::FILE_DIALOG_MULTI_SELECTIONS;
-+      case content::FileChooserParams::Open:
-+        flags |= file_dialog::FILE_DIALOG_OPEN_FILE;
-+        break;
-+      case content::FileChooserParams::UploadFolder:
-+        flags |= file_dialog::FILE_DIALOG_OPEN_DIRECTORY;
-+        break;
-+      default:
-+        NOTREACHED();
-+    }
-+
-+    std::vector<base::FilePath> paths;
-+    ElectronBrowserContext* browser_context = static_cast<ElectronBrowserContext*>(
-+        window_->web_contents()->GetBrowserContext());
-+    base::FilePath default_file_path = browser_context->prefs()->GetFilePath(
-+        prefs::kSelectFileLastDirectory).Append(params.default_file_name);
-+    if (file_dialog::ShowOpenDialog(window_,
-+                                    base::UTF16ToUTF8(params.title),
-+                                    default_file_path,
-+                                    filters,
-+                                    flags,
-+                                    &paths)) {
-+      for (auto& path : paths) {
-+        content::FileChooserFileInfo info;
-+        info.file_path = path;
-+        info.display_name = path.BaseName().value();
-+        result.push_back(info);
-+      }
-+      if (!paths.empty()) {
-+        browser_context->prefs()->SetFilePath(prefs::kSelectFileLastDirectory,
-+                                              paths[0].DirName());
-+      }
-+    }
-+  }
-+
-+  web_contents->GetRenderViewHost()->FilesSelectedInChooser(
-+      result, params.mode);
-+}
-+
-+void WebDialogHelper::EnumerateDirectory(content::WebContents* web_contents,
-+                                         int request_id,
-+                                         const base::FilePath& dir) {
-+  int types = base::FileEnumerator::FILES |
-+              base::FileEnumerator::DIRECTORIES |
-+              base::FileEnumerator::INCLUDE_DOT_DOT;
-+  base::FileEnumerator file_enum(dir, false, types);
-+
-+  base::FilePath path;
-+  std::vector<base::FilePath> paths;
-+  while (!(path = file_enum.Next()).empty())
-+    paths.push_back(path);
-+
-+  web_contents->GetRenderViewHost()->DirectoryEnumerationFinished(
-+      request_id, paths);
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 1b9553541f826e1fa451b9ac0b2131b57c382b07 electron/browser/web_dialog_helper.h
-@@ -0,0 +1,44 @@
-+// Copyright (c) 2014 GitHub, Inc. All rights reserved.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_WEB_DIALOG_HELPER_H_
-+#define ELECTRON_BROWSER_WEB_DIALOG_HELPER_H_
-+
-+#include "base/memory/weak_ptr.h"
-+
-+namespace base {
-+class FilePath;
-+}
-+
-+namespace content {
-+struct FileChooserParams;
-+class WebContents;
-+}
-+
-+namespace electron {
-+
-+class NativeWindow;
-+
-+class WebDialogHelper {
-+ public:
-+  explicit WebDialogHelper(NativeWindow* window);
-+  ~WebDialogHelper();
-+
-+  void RunFileChooser(content::WebContents* web_contents,
-+                      const content::FileChooserParams& params);
-+  void EnumerateDirectory(content::WebContents* web_contents,
-+                          int request_id,
-+                          const base::FilePath& path);
-+
-+ private:
-+  NativeWindow* window_;
-+
-+  base::WeakPtrFactory<WebDialogHelper> weak_factory_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(WebDialogHelper);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_WEB_DIALOG_HELPER_H_
-added in remote
-  their  100644 14f4778359cd08208dbd7d05e1a1a5a10fb523a7 electron/browser/web_view_guest_delegate.cc
-@@ -0,0 +1,157 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/web_view_guest_delegate.h"
-+
-+#include "electron/browser/api/electron_api_web_contents.h"
-+#include "electron/common/native_mate_converters/gurl_converter.h"
-+#include "content/public/browser/guest_host.h"
-+#include "content/public/browser/render_frame_host.h"
-+#include "content/public/browser/render_view_host.h"
-+#include "content/public/browser/render_widget_host.h"
-+#include "content/public/browser/render_widget_host_view.h"
-+
-+namespace electron {
-+
-+namespace {
-+
-+const int kDefaultWidth = 300;
-+const int kDefaultHeight = 300;
-+
-+}  // namespace
-+
-+WebViewGuestDelegate::WebViewGuestDelegate()
-+    : guest_host_(nullptr),
-+      auto_size_enabled_(false),
-+      is_full_page_plugin_(false),
-+      api_web_contents_(nullptr) {
-+}
-+
-+WebViewGuestDelegate::~WebViewGuestDelegate() {
-+}
-+
-+void WebViewGuestDelegate::Initialize(api::WebContents* api_web_contents) {
-+  api_web_contents_ = api_web_contents;
-+  Observe(api_web_contents->GetWebContents());
-+}
-+
-+void WebViewGuestDelegate::Destroy() {
-+  // Give the content module an opportunity to perform some cleanup.
-+  guest_host_->WillDestroy();
-+  guest_host_ = nullptr;
-+}
-+
-+void WebViewGuestDelegate::SetSize(const SetSizeParams& params) {
-+  bool enable_auto_size =
-+      params.enable_auto_size ? *params.enable_auto_size : auto_size_enabled_;
-+  gfx::Size min_size = params.min_size ? *params.min_size : min_auto_size_;
-+  gfx::Size max_size = params.max_size ? *params.max_size : max_auto_size_;
-+
-+  if (params.normal_size)
-+    normal_size_ = *params.normal_size;
-+
-+  min_auto_size_ = min_size;
-+  min_auto_size_.SetToMin(max_size);
-+  max_auto_size_ = max_size;
-+  max_auto_size_.SetToMax(min_size);
-+
-+  enable_auto_size &= !min_auto_size_.IsEmpty() && !max_auto_size_.IsEmpty();
-+
-+  auto rvh = web_contents()->GetRenderViewHost();
-+  if (enable_auto_size) {
-+    // Autosize is being enabled.
-+    rvh->EnableAutoResize(min_auto_size_, max_auto_size_);
-+    normal_size_.SetSize(0, 0);
-+  } else {
-+    // Autosize is being disabled.
-+    // Use default width/height if missing from partially defined normal size.
-+    if (normal_size_.width() && !normal_size_.height())
-+      normal_size_.set_height(GetDefaultSize().height());
-+    if (!normal_size_.width() && normal_size_.height())
-+      normal_size_.set_width(GetDefaultSize().width());
-+
-+    gfx::Size new_size;
-+    if (!normal_size_.IsEmpty()) {
-+      new_size = normal_size_;
-+    } else if (!guest_size_.IsEmpty()) {
-+      new_size = guest_size_;
-+    } else {
-+      new_size = GetDefaultSize();
-+    }
-+
-+    if (auto_size_enabled_) {
-+      // Autosize was previously enabled.
-+      rvh->DisableAutoResize(new_size);
-+      GuestSizeChangedDueToAutoSize(guest_size_, new_size);
-+    } else {
-+      // Autosize was already disabled.
-+      guest_host_->SizeContents(new_size);
-+    }
-+
-+    guest_size_ = new_size;
-+  }
-+
-+  auto_size_enabled_ = enable_auto_size;
-+}
-+
-+void WebViewGuestDelegate::HandleKeyboardEvent(
-+    content::WebContents* source,
-+    const content::NativeWebKeyboardEvent& event) {
-+  if (embedder_web_contents_)
-+    embedder_web_contents_->GetDelegate()->HandleKeyboardEvent(source, event);
-+}
-+
-+void WebViewGuestDelegate::DidCommitProvisionalLoadForFrame(
-+    content::RenderFrameHost* render_frame_host,
-+    const GURL& url, ui::PageTransition transition_type) {
-+  api_web_contents_->Emit("load-commit", url, !render_frame_host->GetParent());
-+}
-+
-+void WebViewGuestDelegate::DidAttach(int guest_proxy_routing_id) {
-+  api_web_contents_->Emit("did-attach");
-+}
-+
-+content::WebContents* WebViewGuestDelegate::GetOwnerWebContents() const {
-+  return embedder_web_contents_;
-+}
-+
-+void WebViewGuestDelegate::GuestSizeChanged(const gfx::Size& new_size) {
-+  if (!auto_size_enabled_)
-+    return;
-+  GuestSizeChangedDueToAutoSize(guest_size_, new_size);
-+  guest_size_ = new_size;
-+}
-+
-+void WebViewGuestDelegate::SetGuestHost(content::GuestHost* guest_host) {
-+  guest_host_ = guest_host;
-+}
-+
-+void WebViewGuestDelegate::WillAttach(
-+    content::WebContents* embedder_web_contents,
-+    int element_instance_id,
-+    bool is_full_page_plugin,
-+    const base::Closure& completion_callback) {
-+  embedder_web_contents_ = embedder_web_contents;
-+  is_full_page_plugin_ = is_full_page_plugin;
-+  completion_callback.Run();
-+}
-+
-+void WebViewGuestDelegate::GuestSizeChangedDueToAutoSize(
-+    const gfx::Size& old_size, const gfx::Size& new_size) {
-+  api_web_contents_->Emit("size-changed",
-+                          old_size.width(), old_size.height(),
-+                          new_size.width(), new_size.height());
-+}
-+
-+gfx::Size WebViewGuestDelegate::GetDefaultSize() const {
-+  if (is_full_page_plugin_) {
-+    // Full page plugins default to the size of the owner's viewport.
-+    return embedder_web_contents_->GetRenderWidgetHostView()
-+                                 ->GetVisibleViewportSize();
-+  } else {
-+    return gfx::Size(kDefaultWidth, kDefaultHeight);
-+  }
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 ead0db7b50c1d913caf2da2f634998af50436014 electron/browser/web_view_guest_delegate.h
-@@ -0,0 +1,119 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_WEB_VIEW_GUEST_DELEGATE_H_
-+#define ELECTRON_BROWSER_WEB_VIEW_GUEST_DELEGATE_H_
-+
-+#include "content/public/browser/browser_plugin_guest_delegate.h"
-+#include "content/public/browser/web_contents_observer.h"
-+
-+namespace content {
-+struct NativeWebKeyboardEvent;
-+}
-+
-+namespace electron {
-+
-+namespace api {
-+class WebContents;
-+}
-+
-+// A struct of parameters for SetSize(). The parameters are all declared as
-+// scoped pointers since they are all optional. Null pointers indicate that the
-+// parameter has not been provided, and the last used value should be used. Note
-+// that when |enable_auto_size| is true, providing |normal_size| is not
-+// meaningful. This is because the normal size of the guestview is overridden
-+// whenever autosizing occurs.
-+struct SetSizeParams {
-+  SetSizeParams() {}
-+  ~SetSizeParams() {}
-+
-+  scoped_ptr<bool> enable_auto_size;
-+  scoped_ptr<gfx::Size> min_size;
-+  scoped_ptr<gfx::Size> max_size;
-+  scoped_ptr<gfx::Size> normal_size;
-+};
-+
-+class WebViewGuestDelegate : public content::BrowserPluginGuestDelegate,
-+                             public content::WebContentsObserver {
-+ public:
-+  WebViewGuestDelegate();
-+  ~WebViewGuestDelegate() override;
-+
-+  void Initialize(api::WebContents* api_web_contents);
-+
-+  // Called when the WebContents is going to be destroyed.
-+  void Destroy();
-+
-+  // Used to toggle autosize mode for this GuestView, and set both the automatic
-+  // and normal sizes.
-+  void SetSize(const SetSizeParams& params);
-+
-+  // Transfer the keyboard event to embedder.
-+  void HandleKeyboardEvent(content::WebContents* source,
-+                           const content::NativeWebKeyboardEvent& event);
-+
-+ protected:
-+  // content::WebContentsObserver:
-+  void DidCommitProvisionalLoadForFrame(
-+      content::RenderFrameHost* render_frame_host,
-+      const GURL& url, ui::PageTransition transition_type) override;
-+
-+  // content::BrowserPluginGuestDelegate:
-+  void DidAttach(int guest_proxy_routing_id) final;
-+  content::WebContents* GetOwnerWebContents() const final;
-+  void GuestSizeChanged(const gfx::Size& new_size) final;
-+  void SetGuestHost(content::GuestHost* guest_host) final;
-+  void WillAttach(content::WebContents* embedder_web_contents,
-+                  int element_instance_id,
-+                  bool is_full_page_plugin,
-+                  const base::Closure& completion_callback) final;
-+
-+ private:
-+  // This method is invoked when the contents auto-resized to give the container
-+  // an opportunity to match it if it wishes.
-+  //
-+  // This gives the derived class an opportunity to inform its container element
-+  // or perform other actions.
-+  void GuestSizeChangedDueToAutoSize(const gfx::Size& old_size,
-+                                     const gfx::Size& new_size);
-+
-+  // Returns the default size of the guestview.
-+  gfx::Size GetDefaultSize() const;
-+
-+  // The WebContents that attaches this guest view.
-+  content::WebContents* embedder_web_contents_;
-+
-+  // The size of the container element.
-+  gfx::Size element_size_;
-+
-+  // The size of the guest content. Note: In autosize mode, the container
-+  // element may not match the size of the guest.
-+  gfx::Size guest_size_;
-+
-+  // A pointer to the guest_host.
-+  content::GuestHost* guest_host_;
-+
-+  // Indicates whether autosize mode is enabled or not.
-+  bool auto_size_enabled_;
-+
-+  // The maximum size constraints of the container element in autosize mode.
-+  gfx::Size max_auto_size_;
-+
-+  // The minimum size constraints of the container element in autosize mode.
-+  gfx::Size min_auto_size_;
-+
-+  // The size that will be used when autosize mode is disabled.
-+  gfx::Size normal_size_;
-+
-+  // Whether the guest view is inside a plugin document.
-+  bool is_full_page_plugin_;
-+
-+  api::WebContents* api_web_contents_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(WebViewGuestDelegate);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_WEB_VIEW_GUEST_DELEGATE_H_
-added in remote
-  their  100644 172f2355395c9df73e5d5f7e85a61ca4254ae68f electron/browser/web_view_manager.cc
-@@ -0,0 +1,68 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/web_view_manager.h"
-+
-+#include "electron/browser/electron_browser_context.h"
-+#include "content/public/browser/render_process_host.h"
-+#include "content/public/browser/web_contents.h"
-+
-+namespace electron {
-+
-+WebViewManager::WebViewManager() {
-+}
-+
-+WebViewManager::~WebViewManager() {
-+}
-+
-+void WebViewManager::AddGuest(int guest_instance_id,
-+                              int element_instance_id,
-+                              content::WebContents* embedder,
-+                              content::WebContents* web_contents) {
-+  web_contents_embedder_map_[guest_instance_id] = { web_contents, embedder };
-+
-+  // Map the element in embedder to guest.
-+  int owner_process_id = embedder->GetRenderProcessHost()->GetID();
-+  ElementInstanceKey key(owner_process_id, element_instance_id);
-+  element_instance_id_to_guest_map_[key] = guest_instance_id;
-+}
-+
-+void WebViewManager::RemoveGuest(int guest_instance_id) {
-+  if (!ContainsKey(web_contents_embedder_map_, guest_instance_id))
-+    return;
-+
-+  web_contents_embedder_map_.erase(guest_instance_id);
-+
-+  // Remove the record of element in embedder too.
-+  for (const auto& element : element_instance_id_to_guest_map_)
-+    if (element.second == guest_instance_id) {
-+      element_instance_id_to_guest_map_.erase(element.first);
-+      break;
-+    }
-+}
-+
-+content::WebContents* WebViewManager::GetGuestByInstanceID(
-+    int owner_process_id,
-+    int element_instance_id) {
-+  ElementInstanceKey key(owner_process_id, element_instance_id);
-+  if (!ContainsKey(element_instance_id_to_guest_map_, key))
-+    return nullptr;
-+
-+  int guest_instance_id = element_instance_id_to_guest_map_[key];
-+  if (ContainsKey(web_contents_embedder_map_, guest_instance_id))
-+    return web_contents_embedder_map_[guest_instance_id].web_contents;
-+  else
-+    return nullptr;
-+}
-+
-+bool WebViewManager::ForEachGuest(content::WebContents* embedder_web_contents,
-+                                  const GuestCallback& callback) {
-+  for (auto& item : web_contents_embedder_map_)
-+    if (item.second.embedder == embedder_web_contents &&
-+        callback.Run(item.second.web_contents))
-+      return true;
-+  return false;
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 a722674cc26d5134e28e9be69d15f307147c01dc electron/browser/web_view_manager.h
-@@ -0,0 +1,67 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_WEB_VIEW_MANAGER_H_
-+#define ELECTRON_BROWSER_WEB_VIEW_MANAGER_H_
-+
-+#include <map>
-+
-+#include "content/public/browser/browser_plugin_guest_manager.h"
-+
-+namespace electron {
-+
-+class WebViewManager : public content::BrowserPluginGuestManager {
-+ public:
-+  WebViewManager();
-+  ~WebViewManager() override;
-+
-+  void AddGuest(int guest_instance_id,
-+                int element_instance_id,
-+                content::WebContents* embedder,
-+                content::WebContents* web_contents);
-+  void RemoveGuest(int guest_instance_id);
-+
-+ protected:
-+  // content::BrowserPluginGuestManager:
-+  content::WebContents* GetGuestByInstanceID(int owner_process_id,
-+                                             int element_instance_id) override;
-+  bool ForEachGuest(content::WebContents* embedder,
-+                    const GuestCallback& callback) override;
-+
-+ private:
-+  struct WebContentsWithEmbedder {
-+    content::WebContents* web_contents;
-+    content::WebContents* embedder;
-+  };
-+  // guest_instance_id => (web_contents, embedder)
-+  std::map<int, WebContentsWithEmbedder> web_contents_embedder_map_;
-+
-+  struct ElementInstanceKey {
-+    int embedder_process_id;
-+    int element_instance_id;
-+
-+    ElementInstanceKey(int embedder_process_id, int element_instance_id)
-+        : embedder_process_id(embedder_process_id),
-+          element_instance_id(element_instance_id) {}
-+
-+    bool operator<(const ElementInstanceKey& other) const {
-+      if (embedder_process_id != other.embedder_process_id)
-+        return embedder_process_id < other.embedder_process_id;
-+      return element_instance_id < other.element_instance_id;
-+    }
-+
-+    bool operator==(const ElementInstanceKey& other) const {
-+      return (embedder_process_id == other.embedder_process_id) &&
-+          (element_instance_id == other.element_instance_id);
-+    }
-+  };
-+  // (embedder_process_id, element_instance_id) => guest_instance_id
-+  std::map<ElementInstanceKey, int> element_instance_id_to_guest_map_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(WebViewManager);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_WEB_VIEW_MANAGER_H_
-added in remote
-  their  100644 17144bbc438be6bac5fe407519dbf78d9c0f1a2f electron/browser/window_list.cc
-@@ -0,0 +1,83 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/browser/window_list.h"
-+
-+#include <algorithm>
-+
-+#include "electron/browser/native_window.h"
-+#include "electron/browser/window_list_observer.h"
-+#include "base/logging.h"
-+
-+namespace electron {
-+
-+// static
-+base::LazyInstance<base::ObserverList<WindowListObserver>>::Leaky
-+    WindowList::observers_ = LAZY_INSTANCE_INITIALIZER;
-+
-+// static
-+WindowList* WindowList::instance_ = NULL;
-+
-+// static
-+WindowList* WindowList::GetInstance() {
-+  if (!instance_)
-+    instance_ = new WindowList;
-+  return instance_;
-+}
-+
-+// static
-+void WindowList::AddWindow(NativeWindow* window) {
-+  DCHECK(window);
-+  // Push |window| on the appropriate list instance.
-+  WindowVector& windows = GetInstance()->windows_;
-+  windows.push_back(window);
-+
-+  FOR_EACH_OBSERVER(WindowListObserver, observers_.Get(),
-+                    OnWindowAdded(window));
-+}
-+
-+// static
-+void WindowList::RemoveWindow(NativeWindow* window) {
-+  WindowVector& windows = GetInstance()->windows_;
-+  windows.erase(std::remove(windows.begin(), windows.end(), window),
-+                windows.end());
-+
-+  FOR_EACH_OBSERVER(WindowListObserver, observers_.Get(),
-+                    OnWindowRemoved(window));
-+
-+  if (windows.size() == 0)
-+    FOR_EACH_OBSERVER(WindowListObserver, observers_.Get(),
-+                      OnWindowAllClosed());
-+}
-+
-+// static
-+void WindowList::WindowCloseCancelled(NativeWindow* window) {
-+  FOR_EACH_OBSERVER(WindowListObserver, observers_.Get(),
-+                    OnWindowCloseCancelled(window));
-+}
-+
-+// static
-+void WindowList::AddObserver(WindowListObserver* observer) {
-+  observers_.Get().AddObserver(observer);
-+}
-+
-+// static
-+void WindowList::RemoveObserver(WindowListObserver* observer) {
-+  observers_.Get().RemoveObserver(observer);
-+}
-+
-+// static
-+void WindowList::CloseAllWindows() {
-+  WindowVector windows = GetInstance()->windows_;
-+  for (size_t i = 0; i < windows.size(); ++i)
-+    windows[i]->Close();
-+}
-+
-+WindowList::WindowList() {
-+}
-+
-+WindowList::~WindowList() {
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 ce25214c7af43af786fd500b1e84aa6098cff507 electron/browser/window_list.h
-@@ -0,0 +1,73 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_WINDOW_LIST_H_
-+#define ELECTRON_BROWSER_WINDOW_LIST_H_
-+
-+#include <vector>
-+
-+#include "base/macros.h"
-+#include "base/lazy_instance.h"
-+#include "base/observer_list.h"
-+
-+namespace electron {
-+
-+class NativeWindow;
-+class WindowListObserver;
-+
-+class WindowList {
-+ public:
-+  typedef std::vector<NativeWindow*> WindowVector;
-+  typedef WindowVector::iterator iterator;
-+  typedef WindowVector::const_iterator const_iterator;
-+
-+  // Windows are added to the list before they have constructed windows,
-+  // so the |window()| member function may return NULL.
-+  const_iterator begin() const { return windows_.begin(); }
-+  const_iterator end() const { return windows_.end(); }
-+
-+  iterator begin() { return windows_.begin(); }
-+  iterator end() { return windows_.end(); }
-+
-+  bool empty() const { return windows_.empty(); }
-+  size_t size() const { return windows_.size(); }
-+
-+  NativeWindow* get(size_t index) const { return windows_[index]; }
-+
-+  static WindowList* GetInstance();
-+
-+  // Adds or removes |window| from the list it is associated with.
-+  static void AddWindow(NativeWindow* window);
-+  static void RemoveWindow(NativeWindow* window);
-+
-+  // Called by window when a close is cancelled by beforeunload handler.
-+  static void WindowCloseCancelled(NativeWindow* window);
-+
-+  // Adds and removes |observer| from the observer list.
-+  static void AddObserver(WindowListObserver* observer);
-+  static void RemoveObserver(WindowListObserver* observer);
-+
-+  // Closes all windows.
-+  static void CloseAllWindows();
-+
-+ private:
-+  WindowList();
-+  ~WindowList();
-+
-+  // A vector of the windows in this list, in the order they were added.
-+  WindowVector windows_;
-+
-+  // A list of observers which will be notified of every window addition and
-+  // removal across all WindowLists.
-+  static base::LazyInstance<base::ObserverList<WindowListObserver>>::Leaky
-+      observers_;
-+
-+  static WindowList* instance_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(WindowList);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_WINDOW_LIST_H_
-added in remote
-  their  100644 e59cebaeb41225e02fb36cb642ba5609921e4561 electron/browser/window_list_observer.h
-@@ -0,0 +1,32 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_BROWSER_WINDOW_LIST_OBSERVER_H_
-+#define ELECTRON_BROWSER_WINDOW_LIST_OBSERVER_H_
-+
-+namespace electron {
-+
-+class NativeWindow;
-+
-+class WindowListObserver {
-+ public:
-+  // Called immediately after a window is added to the list.
-+  virtual void OnWindowAdded(NativeWindow* window) {}
-+
-+  // Called immediately after a window is removed from the list.
-+  virtual void OnWindowRemoved(NativeWindow* window) {}
-+
-+  // Called when a window close is cancelled by beforeunload handler.
-+  virtual void OnWindowCloseCancelled(NativeWindow* window) {}
-+
-+  // Called immediately after all windows are closed.
-+  virtual void OnWindowAllClosed() {}
-+
-+ protected:
-+  virtual ~WindowListObserver() {}
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_BROWSER_WINDOW_LIST_OBSERVER_H_
-added in remote
-  their  100644 ab6471ec9cc417da3c8ae93ffeed0b57bbaf104e electron/common/api/api_messages.h
-@@ -0,0 +1,39 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+// Multiply-included file, no traditional include guard.
-+
-+#include "electron/common/draggable_region.h"
-+#include "base/strings/string16.h"
-+#include "base/values.h"
-+#include "content/public/common/common_param_traits.h"
-+#include "ipc/ipc_message_macros.h"
-+#include "ui/gfx/ipc/gfx_param_traits.h"
-+
-+// The message starter should be declared in ipc/ipc_message_start.h. Since
-+// we don't want to patch Chromium, we just pretend to be Content Shell.
-+
-+#define IPC_MESSAGE_START ShellMsgStart
-+
-+IPC_STRUCT_TRAITS_BEGIN(electron::DraggableRegion)
-+  IPC_STRUCT_TRAITS_MEMBER(draggable)
-+  IPC_STRUCT_TRAITS_MEMBER(bounds)
-+IPC_STRUCT_TRAITS_END()
-+
-+IPC_MESSAGE_ROUTED2(ElectronViewHostMsg_Message,
-+                    base::string16 /* channel */,
-+                    base::ListValue /* arguments */)
-+
-+IPC_SYNC_MESSAGE_ROUTED2_1(ElectronViewHostMsg_Message_Sync,
-+                           base::string16 /* channel */,
-+                           base::ListValue /* arguments */,
-+                           base::string16 /* result (in JSON) */)
-+
-+IPC_MESSAGE_ROUTED2(ElectronViewMsg_Message,
-+                    base::string16 /* channel */,
-+                    base::ListValue /* arguments */)
-+
-+// Sent by the renderer when the draggable regions are updated.
-+IPC_MESSAGE_ROUTED1(ElectronViewHostMsg_UpdateDraggableRegions,
-+                    std::vector<electron::DraggableRegion> /* regions */)
-added in remote
-  their  100644 cb3975c4eb54115c36486a9154c3228fcf544bec electron/common/api/electron_api_asar.cc
-@@ -0,0 +1,163 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include <stddef.h>
-+
-+#include <vector>
-+
-+#include "electron_natives.h"  // NOLINT: This file is generated with coffee2c.
-+#include "electron/common/asar/archive.h"
-+#include "electron/common/native_mate_converters/callback.h"
-+#include "electron/common/native_mate_converters/file_path_converter.h"
-+#include "electron/common/node_includes.h"
-+#include "native_mate/arguments.h"
-+#include "native_mate/dictionary.h"
-+#include "native_mate/object_template_builder.h"
-+#include "native_mate/wrappable.h"
-+
-+namespace {
-+
-+v8::Persistent<v8::ObjectTemplate> template_;
-+
-+class Archive : public mate::Wrappable {
-+ public:
-+  static v8::Local<v8::Value> Create(v8::Isolate* isolate,
-+                                      const base::FilePath& path) {
-+    scoped_ptr<asar::Archive> archive(new asar::Archive(path));
-+    if (!archive->Init())
-+      return v8::False(isolate);
-+    return (new Archive(std::move(archive)))->GetWrapper(isolate);
-+  }
-+
-+ protected:
-+  explicit Archive(scoped_ptr<asar::Archive> archive)
-+      : archive_(std::move(archive)) {}
-+
-+  // Reads the offset and size of file.
-+  v8::Local<v8::Value> GetFileInfo(v8::Isolate* isolate,
-+                                    const base::FilePath& path) {
-+    asar::Archive::FileInfo info;
-+    if (!archive_ || !archive_->GetFileInfo(path, &info))
-+      return v8::False(isolate);
-+    mate::Dictionary dict(isolate, v8::Object::New(isolate));
-+    dict.Set("size", info.size);
-+    dict.Set("unpacked", info.unpacked);
-+    dict.Set("offset", info.offset);
-+    return dict.GetHandle();
-+  }
-+
-+  // Returns a fake result of fs.stat(path).
-+  v8::Local<v8::Value> Stat(v8::Isolate* isolate,
-+                             const base::FilePath& path) {
-+    asar::Archive::Stats stats;
-+    if (!archive_ || !archive_->Stat(path, &stats))
-+      return v8::False(isolate);
-+    mate::Dictionary dict(isolate, v8::Object::New(isolate));
-+    dict.Set("size", stats.size);
-+    dict.Set("offset", stats.offset);
-+    dict.Set("isFile", stats.is_file);
-+    dict.Set("isDirectory", stats.is_directory);
-+    dict.Set("isLink", stats.is_link);
-+    return dict.GetHandle();
-+  }
-+
-+  // Returns all files under a directory.
-+  v8::Local<v8::Value> Readdir(v8::Isolate* isolate,
-+                                const base::FilePath& path) {
-+    std::vector<base::FilePath> files;
-+    if (!archive_ || !archive_->Readdir(path, &files))
-+      return v8::False(isolate);
-+    return mate::ConvertToV8(isolate, files);
-+  }
-+
-+  // Returns the path of file with symbol link resolved.
-+  v8::Local<v8::Value> Realpath(v8::Isolate* isolate,
-+                                 const base::FilePath& path) {
-+    base::FilePath realpath;
-+    if (!archive_ || !archive_->Realpath(path, &realpath))
-+      return v8::False(isolate);
-+    return mate::ConvertToV8(isolate, realpath);
-+  }
-+
-+  // Copy the file out into a temporary file and returns the new path.
-+  v8::Local<v8::Value> CopyFileOut(v8::Isolate* isolate,
-+                                    const base::FilePath& path) {
-+    base::FilePath new_path;
-+    if (!archive_ || !archive_->CopyFileOut(path, &new_path))
-+      return v8::False(isolate);
-+    return mate::ConvertToV8(isolate, new_path);
-+  }
-+
-+  // Return the file descriptor.
-+  int GetFD() const {
-+    if (!archive_)
-+      return -1;
-+    return archive_->GetFD();
-+  }
-+
-+  // Free the resources used by archive.
-+  void Destroy() {
-+    archive_.reset();
-+  }
-+
-+  // mate::Wrappable:
-+  mate::ObjectTemplateBuilder GetObjectTemplateBuilder(v8::Isolate* isolate) {
-+    if (template_.IsEmpty())
-+      template_.Reset(isolate, mate::ObjectTemplateBuilder(isolate)
-+          .SetValue("path", archive_->path())
-+          .SetMethod("getFileInfo", &Archive::GetFileInfo)
-+          .SetMethod("stat", &Archive::Stat)
-+          .SetMethod("readdir", &Archive::Readdir)
-+          .SetMethod("realpath", &Archive::Realpath)
-+          .SetMethod("copyFileOut", &Archive::CopyFileOut)
-+          .SetMethod("getFd", &Archive::GetFD)
-+          .SetMethod("destroy", &Archive::Destroy)
-+          .Build());
-+
-+    return mate::ObjectTemplateBuilder(
-+        isolate, v8::Local<v8::ObjectTemplate>::New(isolate, template_));
-+  }
-+
-+ private:
-+  scoped_ptr<asar::Archive> archive_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(Archive);
-+};
-+
-+void InitAsarSupport(v8::Isolate* isolate,
-+                     v8::Local<v8::Value> process,
-+                     v8::Local<v8::Value> require) {
-+  // Evaluate asar_init.js.
-+  const char* asar_init_native = reinterpret_cast<const char*>(
-+      static_cast<const unsigned char*>(node::asar_init_native));
-+  v8::Local<v8::Script> asar_init = v8::Script::Compile(v8::String::NewFromUtf8(
-+      isolate,
-+      asar_init_native,
-+      v8::String::kNormalString,
-+      sizeof(node::asar_init_native) -1));
-+  v8::Local<v8::Value> result = asar_init->Run();
-+
-+  // Initialize asar support.
-+  base::Callback<void(v8::Local<v8::Value>,
-+                      v8::Local<v8::Value>,
-+                      std::string)> init;
-+  if (mate::ConvertFromV8(isolate, result, &init)) {
-+    const char* asar_native = reinterpret_cast<const char*>(
-+        static_cast<const unsigned char*>(node::asar_native));
-+    init.Run(process,
-+             require,
-+             std::string(asar_native, sizeof(node::asar_native) - 1));
-+  }
-+}
-+
-+void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
-+                v8::Local<v8::Context> context, void* priv) {
-+  mate::Dictionary dict(context->GetIsolate(), exports);
-+  dict.SetMethod("createArchive", &Archive::Create);
-+  dict.SetMethod("initAsarSupport", &InitAsarSupport);
-+}
-+
-+}  // namespace
-+
-+NODE_MODULE_CONTEXT_AWARE_BUILTIN(electron_common_asar, Initialize)
-added in remote
-  their  100644 7aadf8a26bc4179206ca6987a1c7be4dc5152b8a electron/common/api/electron_api_clipboard.cc
-@@ -0,0 +1,160 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include <string>
-+#include <vector>
-+
-+#include "electron/common/native_mate_converters/image_converter.h"
-+#include "electron/common/native_mate_converters/string16_converter.h"
-+#include "base/strings/utf_string_conversions.h"
-+#include "native_mate/arguments.h"
-+#include "native_mate/dictionary.h"
-+#include "third_party/skia/include/core/SkBitmap.h"
-+#include "ui/base/clipboard/clipboard.h"
-+#include "ui/base/clipboard/scoped_clipboard_writer.h"
-+#include "ui/gfx/image/image.h"
-+
-+#include "electron/common/node_includes.h"
-+
-+namespace {
-+
-+ui::ClipboardType GetClipboardType(mate::Arguments* args) {
-+  std::string type;
-+  if (args->GetNext(&type) && type == "selection")
-+    return ui::CLIPBOARD_TYPE_SELECTION;
-+  else
-+    return ui::CLIPBOARD_TYPE_COPY_PASTE;
-+}
-+
-+std::vector<base::string16> AvailableFormats(mate::Arguments* args) {
-+  std::vector<base::string16> format_types;
-+  bool ignore;
-+  ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
-+  clipboard->ReadAvailableTypes(GetClipboardType(args), &format_types, &ignore);
-+  return format_types;
-+}
-+
-+bool Has(const std::string& format_string, mate::Arguments* args) {
-+  ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
-+  ui::Clipboard::FormatType format(ui::Clipboard::GetFormatType(format_string));
-+  return clipboard->IsFormatAvailable(format, GetClipboardType(args));
-+}
-+
-+std::string Read(const std::string& format_string,
-+                 mate::Arguments* args) {
-+  ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
-+  ui::Clipboard::FormatType format(ui::Clipboard::GetFormatType(format_string));
-+
-+  std::string data;
-+  clipboard->ReadData(format, &data);
-+  return data;
-+}
-+
-+void Write(const mate::Dictionary& data,
-+           mate::Arguments* args) {
-+  ui::ScopedClipboardWriter writer(GetClipboardType(args));
-+  base::string16 text, html;
-+  gfx::Image image;
-+
-+  if (data.Get("text", &text))
-+    writer.WriteText(text);
-+
-+  if (data.Get("rtf", &text)) {
-+    std::string rtf = base::UTF16ToUTF8(text);
-+    writer.WriteRTF(rtf);
-+  }
-+
-+  if (data.Get("html", &html))
-+    writer.WriteHTML(html, std::string());
-+
-+  if (data.Get("image", &image))
-+    writer.WriteImage(image.AsBitmap());
-+}
-+
-+base::string16 ReadText(mate::Arguments* args) {
-+  base::string16 data;
-+  ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
-+  auto type = GetClipboardType(args);
-+  if (clipboard->IsFormatAvailable(
-+      ui::Clipboard::GetPlainTextWFormatType(), type)) {
-+    clipboard->ReadText(type, &data);
-+  } else if (clipboard->IsFormatAvailable(
-+             ui::Clipboard::GetPlainTextFormatType(), type)) {
-+    std::string result;
-+    clipboard->ReadAsciiText(type, &result);
-+    data = base::ASCIIToUTF16(result);
-+  }
-+  return data;
-+}
-+
-+void WriteText(const base::string16& text, mate::Arguments* args) {
-+  ui::ScopedClipboardWriter writer(GetClipboardType(args));
-+  writer.WriteText(text);
-+}
-+
-+base::string16 ReadRtf(mate::Arguments* args) {
-+  std::string data;
-+  ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
-+  clipboard->ReadRTF(GetClipboardType(args), &data);
-+  return base::UTF8ToUTF16(data);
-+}
-+
-+void WriteRtf(const std::string& text, mate::Arguments* args) {
-+  ui::ScopedClipboardWriter writer(GetClipboardType(args));
-+  writer.WriteRTF(text);
-+}
-+
-+base::string16 ReadHtml(mate::Arguments* args) {
-+  base::string16 data;
-+  base::string16 html;
-+  std::string url;
-+  uint32_t start;
-+  uint32_t end;
-+  ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
-+  clipboard->ReadHTML(GetClipboardType(args), &html, &url, &start, &end);
-+  data = html.substr(start, end - start);
-+  return data;
-+}
-+
-+void WriteHtml(const base::string16& html, mate::Arguments* args) {
-+  ui::ScopedClipboardWriter writer(GetClipboardType(args));
-+  writer.WriteHTML(html, std::string());
-+}
-+
-+gfx::Image ReadImage(mate::Arguments* args) {
-+  ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
-+  SkBitmap bitmap = clipboard->ReadImage(GetClipboardType(args));
-+  return gfx::Image::CreateFrom1xBitmap(bitmap);
-+}
-+
-+void WriteImage(const gfx::Image& image, mate::Arguments* args) {
-+  ui::ScopedClipboardWriter writer(GetClipboardType(args));
-+  writer.WriteImage(image.AsBitmap());
-+}
-+
-+void Clear(mate::Arguments* args) {
-+  ui::Clipboard::GetForCurrentThread()->Clear(GetClipboardType(args));
-+}
-+
-+void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
-+                v8::Local<v8::Context> context, void* priv) {
-+  mate::Dictionary dict(context->GetIsolate(), exports);
-+  dict.SetMethod("availableFormats", &AvailableFormats);
-+  dict.SetMethod("has", &Has);
-+  dict.SetMethod("read", &Read);
-+  dict.SetMethod("write", &Write);
-+  dict.SetMethod("readText", &ReadText);
-+  dict.SetMethod("writeText", &WriteText);
-+  dict.SetMethod("readRtf", &ReadRtf);
-+  dict.SetMethod("writeRtf", &WriteRtf);
-+  dict.SetMethod("readHtml", &ReadHtml);
-+  dict.SetMethod("writeHtml", &WriteHtml);
-+  dict.SetMethod("readImage", &ReadImage);
-+  dict.SetMethod("writeImage", &WriteImage);
-+  dict.SetMethod("clear", &Clear);
-+}
-+
-+}  // namespace
-+
-+NODE_MODULE_CONTEXT_AWARE_BUILTIN(electron_common_clipboard, Initialize)
-added in remote
-  their  100644 96997a96246310087fed827727eaaae7407c5fe3 electron/common/api/electron_api_crash_reporter.cc
-@@ -0,0 +1,64 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include <map>
-+#include <string>
-+
-+#include "electron/common/crash_reporter/crash_reporter.h"
-+#include "base/bind.h"
-+#include "native_mate/dictionary.h"
-+
-+#include "electron/common/node_includes.h"
-+
-+using crash_reporter::CrashReporter;
-+
-+namespace mate {
-+
-+template<>
-+struct Converter<std::map<std::string, std::string> > {
-+  static bool FromV8(v8::Isolate* isolate,
-+                     v8::Local<v8::Value> val,
-+                     std::map<std::string, std::string>* out) {
-+    if (!val->IsObject())
-+      return false;
-+
-+    v8::Local<v8::Object> dict = val->ToObject();
-+    v8::Local<v8::Array> keys = dict->GetOwnPropertyNames();
-+    for (uint32_t i = 0; i < keys->Length(); ++i) {
-+      v8::Local<v8::Value> key = keys->Get(i);
-+      (*out)[V8ToString(key)] = V8ToString(dict->Get(key));
-+    }
-+    return true;
-+  }
-+};
-+
-+template<>
-+struct Converter<CrashReporter::UploadReportResult> {
-+  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-+      const CrashReporter::UploadReportResult& reports) {
-+    mate::Dictionary dict(isolate, v8::Object::New(isolate));
-+    dict.Set("date", v8::Date::New(isolate, reports.first*1000.0));
-+    dict.Set("id", reports.second);
-+    return dict.GetHandle();
-+  }
-+};
-+
-+}  // namespace mate
-+
-+namespace {
-+
-+
-+void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
-+                v8::Local<v8::Context> context, void* priv) {
-+  mate::Dictionary dict(context->GetIsolate(), exports);
-+  auto report = base::Unretained(CrashReporter::GetInstance());
-+  dict.SetMethod("start",
-+                 base::Bind(&CrashReporter::Start, report));
-+  dict.SetMethod("_getUploadedReports",
-+                 base::Bind(&CrashReporter::GetUploadedReports, report));
-+}
-+
-+}  // namespace
-+
-+NODE_MODULE_CONTEXT_AWARE_BUILTIN(electron_common_crash_reporter, Initialize)
-added in remote
-  their  100644 6cc5ea385267dee88b182b610ebe84624d9a1354 electron/common/api/electron_api_id_weak_map.cc
-@@ -0,0 +1,79 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/common/api/electron_api_id_weak_map.h"
-+
-+#include "electron/common/node_includes.h"
-+#include "native_mate/constructor.h"
-+#include "native_mate/dictionary.h"
-+
-+namespace electron {
-+
-+namespace api {
-+
-+IDWeakMap::IDWeakMap() {
-+}
-+
-+IDWeakMap::~IDWeakMap() {
-+}
-+
-+void IDWeakMap::Set(v8::Isolate* isolate,
-+                    int32_t id,
-+                    v8::Local<v8::Object> object) {
-+  id_weak_map_.Set(isolate, id, object);
-+}
-+
-+v8::Local<v8::Object> IDWeakMap::Get(v8::Isolate* isolate, int32_t id) {
-+  return id_weak_map_.Get(isolate, id).ToLocalChecked();
-+}
-+
-+bool IDWeakMap::Has(int32_t id) {
-+  return id_weak_map_.Has(id);
-+}
-+
-+void IDWeakMap::Remove(int32_t id) {
-+  id_weak_map_.Remove(id);
-+}
-+
-+void IDWeakMap::Clear() {
-+  id_weak_map_.Clear();
-+}
-+
-+// static
-+void IDWeakMap::BuildPrototype(v8::Isolate* isolate,
-+                               v8::Local<v8::ObjectTemplate> prototype) {
-+  mate::ObjectTemplateBuilder(isolate, prototype)
-+      .SetMethod("set", &IDWeakMap::Set)
-+      .SetMethod("get", &IDWeakMap::Get)
-+      .SetMethod("has", &IDWeakMap::Has)
-+      .SetMethod("remove", &IDWeakMap::Remove)
-+      .SetMethod("clear", &IDWeakMap::Clear);
-+}
-+
-+// static
-+mate::Wrappable* IDWeakMap::Create(v8::Isolate* isolate) {
-+  return new IDWeakMap;
-+}
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+namespace {
-+
-+using electron::api::IDWeakMap;
-+
-+void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
-+                v8::Local<v8::Context> context, void* priv) {
-+  v8::Isolate* isolate = context->GetIsolate();
-+  v8::Local<v8::Function> constructor = mate::CreateConstructor<IDWeakMap>(
-+      isolate, "IDWeakMap", base::Bind(&IDWeakMap::Create));
-+  mate::Dictionary id_weak_map(isolate, constructor);
-+  mate::Dictionary dict(isolate, exports);
-+  dict.Set("IDWeakMap", id_weak_map);
-+}
-+
-+}  // namespace
-+
-+NODE_MODULE_CONTEXT_AWARE_BUILTIN(electron_common_id_weak_map, Initialize)
-added in remote
-  their  100644 c761450a1d7ebc5e483931f0cb173257db82b10a electron/common/api/electron_api_id_weak_map.h
-@@ -0,0 +1,44 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_COMMON_API_ELECTRON_API_ID_WEAK_MAP_H_
-+#define ELECTRON_COMMON_API_ELECTRON_API_ID_WEAK_MAP_H_
-+
-+#include "electron/common/id_weak_map.h"
-+#include "native_mate/object_template_builder.h"
-+#include "native_mate/handle.h"
-+
-+namespace electron {
-+
-+namespace api {
-+
-+class IDWeakMap : public mate::Wrappable {
-+ public:
-+  static mate::Wrappable* Create(v8::Isolate* isolate);
-+
-+  static void BuildPrototype(v8::Isolate* isolate,
-+                             v8::Local<v8::ObjectTemplate> prototype);
-+
-+ protected:
-+  IDWeakMap();
-+  ~IDWeakMap();
-+
-+ private:
-+  // Api for IDWeakMap.
-+  void Set(v8::Isolate* isolate, int32_t id, v8::Local<v8::Object> object);
-+  v8::Local<v8::Object> Get(v8::Isolate* isolate, int32_t id);
-+  bool Has(int32_t id);
-+  void Remove(int32_t id);
-+  void Clear();
-+
-+  electron::IDWeakMap id_weak_map_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(IDWeakMap);
-+};
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_COMMON_API_ELECTRON_API_ID_WEAK_MAP_H_
-added in remote
-  their  100644 a0d9b69ba01d4ec566fc29be37656e2b1c2dcab5 electron/common/api/electron_api_native_image.cc
-@@ -0,0 +1,352 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/common/api/electron_api_native_image.h"
-+
-+#include <string>
-+#include <vector>
-+
-+#include "electron/common/asar/asar_util.h"
-+#include "electron/common/native_mate_converters/file_path_converter.h"
-+#include "electron/common/native_mate_converters/gfx_converter.h"
-+#include "electron/common/native_mate_converters/gurl_converter.h"
-+#include "electron/common/node_includes.h"
-+#include "base/base64.h"
-+#include "base/files/file_util.h"
-+#include "base/strings/string_util.h"
-+#include "base/strings/pattern.h"
-+#include "native_mate/dictionary.h"
-+#include "native_mate/object_template_builder.h"
-+#include "net/base/data_url.h"
-+#include "ui/base/layout.h"
-+#include "ui/gfx/codec/jpeg_codec.h"
-+#include "ui/gfx/codec/png_codec.h"
-+#include "ui/gfx/geometry/size.h"
-+#include "ui/gfx/image/image_skia.h"
-+#include "ui/gfx/image/image_util.h"
-+
-+#if defined(OS_WIN)
-+#include "electron/common/asar/archive.h"
-+#include "base/win/scoped_gdi_object.h"
-+#include "ui/gfx/icon_util.h"
-+#endif
-+
-+namespace electron {
-+
-+namespace api {
-+
-+namespace {
-+
-+struct ScaleFactorPair {
-+  const char* name;
-+  float scale;
-+};
-+
-+ScaleFactorPair kScaleFactorPairs[] = {
-+  // The "@2x" is put as first one to make scale matching faster.
-+  { "@2x"    , 2.0f },
-+  { "@3x"    , 3.0f },
-+  { "@1x"    , 1.0f },
-+  { "@4x"    , 4.0f },
-+  { "@5x"    , 5.0f },
-+  { "@1.25x" , 1.25f },
-+  { "@1.33x" , 1.33f },
-+  { "@1.4x"  , 1.4f },
-+  { "@1.5x"  , 1.5f },
-+  { "@1.8x"  , 1.8f },
-+  { "@2.5x"  , 2.5f },
-+};
-+
-+float GetScaleFactorFromPath(const base::FilePath& path) {
-+  std::string filename(path.BaseName().RemoveExtension().AsUTF8Unsafe());
-+
-+  // We don't try to convert string to float here because it is very very
-+  // expensive.
-+  for (unsigned i = 0; i < arraysize(kScaleFactorPairs); ++i) {
-+    if (base::EndsWith(filename, kScaleFactorPairs[i].name,
-+                       base::CompareCase::INSENSITIVE_ASCII))
-+      return kScaleFactorPairs[i].scale;
-+  }
-+
-+  return 1.0f;
-+}
-+
-+bool AddImageSkiaRep(gfx::ImageSkia* image,
-+                     const unsigned char* data,
-+                     size_t size,
-+                     double scale_factor) {
-+  scoped_ptr<SkBitmap> decoded(new SkBitmap());
-+
-+  // Try PNG first.
-+  if (!gfx::PNGCodec::Decode(data, size, decoded.get()))
-+    // Try JPEG.
-+    decoded.reset(gfx::JPEGCodec::Decode(data, size));
-+
-+  if (!decoded)
-+    return false;
-+
-+  image->AddRepresentation(gfx::ImageSkiaRep(*decoded, scale_factor));
-+  return true;
-+}
-+
-+bool AddImageSkiaRep(gfx::ImageSkia* image,
-+                     const base::FilePath& path,
-+                     double scale_factor) {
-+  std::string file_contents;
-+  if (!asar::ReadFileToString(path, &file_contents))
-+    return false;
-+
-+  const unsigned char* data =
-+      reinterpret_cast<const unsigned char*>(file_contents.data());
-+  size_t size = file_contents.size();
-+  return AddImageSkiaRep(image, data, size, scale_factor);
-+}
-+
-+bool PopulateImageSkiaRepsFromPath(gfx::ImageSkia* image,
-+                                   const base::FilePath& path) {
-+  bool succeed = false;
-+  std::string filename(path.BaseName().RemoveExtension().AsUTF8Unsafe());
-+  if (base::MatchPattern(filename, "*@*x"))
-+    // Don't search for other representations if the DPI has been specified.
-+    return AddImageSkiaRep(image, path, GetScaleFactorFromPath(path));
-+  else
-+    succeed |= AddImageSkiaRep(image, path, 1.0f);
-+
-+  for (const ScaleFactorPair& pair : kScaleFactorPairs)
-+    succeed |= AddImageSkiaRep(image,
-+                               path.InsertBeforeExtensionASCII(pair.name),
-+                               pair.scale);
-+  return succeed;
-+}
-+
-+base::FilePath NormalizePath(const base::FilePath& path) {
-+  if (!path.ReferencesParent()) {
-+    return path;
-+  }
-+
-+  base::FilePath absolute_path = MakeAbsoluteFilePath(path);
-+  // MakeAbsoluteFilePath returns an empty path on failures so use original path
-+  if (absolute_path.empty()) {
-+    return path;
-+  } else {
-+    return absolute_path;
-+  }
-+}
-+
-+#if defined(OS_MACOSX)
-+bool IsTemplateFilename(const base::FilePath& path) {
-+  return (base::MatchPattern(path.value(), "*Template.*") ||
-+          base::MatchPattern(path.value(), "*Template@*x.*"));
-+}
-+#endif
-+
-+#if defined(OS_WIN)
-+bool ReadImageSkiaFromICO(gfx::ImageSkia* image, const base::FilePath& path) {
-+  // If file is in asar archive, we extract it to a temp file so LoadImage can
-+  // load it.
-+  base::FilePath asar_path, relative_path;
-+  base::FilePath image_path(path);
-+  if (asar::GetAsarArchivePath(image_path, &asar_path, &relative_path)) {
-+    std::shared_ptr<asar::Archive> archive =
-+        asar::GetOrCreateAsarArchive(asar_path);
-+    if (archive)
-+      archive->CopyFileOut(relative_path, &image_path);
-+  }
-+
-+  // Load the icon from file.
-+  base::win::ScopedHICON icon(static_cast<HICON>(
-+      LoadImage(NULL, image_path.value().c_str(), IMAGE_ICON, 0, 0,
-+                LR_DEFAULTSIZE | LR_LOADFROMFILE)));
-+  if (!icon.get())
-+    return false;
-+
-+  // Convert the icon from the Windows specific HICON to gfx::ImageSkia.
-+  scoped_ptr<SkBitmap> bitmap(IconUtil::  CreateSkBitmapFromHICON(icon.get()));
-+  image->AddRepresentation(gfx::ImageSkiaRep(*bitmap, 1.0f));
-+  return true;
-+}
-+#endif
-+
-+v8::Persistent<v8::ObjectTemplate> template_;
-+
-+}  // namespace
-+
-+NativeImage::NativeImage() {}
-+
-+NativeImage::NativeImage(const gfx::Image& image) : image_(image) {}
-+
-+NativeImage::~NativeImage() {}
-+
-+mate::ObjectTemplateBuilder NativeImage::GetObjectTemplateBuilder(
-+    v8::Isolate* isolate) {
-+  if (template_.IsEmpty())
-+    template_.Reset(isolate, mate::ObjectTemplateBuilder(isolate)
-+        .SetMethod("toPng", &NativeImage::ToPNG)
-+        .SetMethod("toJpeg", &NativeImage::ToJPEG)
-+        .SetMethod("getNativeHandle", &NativeImage::GetNativeHandle)
-+        .SetMethod("toDataURL", &NativeImage::ToDataURL)
-+        .SetMethod("toDataUrl", &NativeImage::ToDataURL)  // deprecated.
-+        .SetMethod("isEmpty", &NativeImage::IsEmpty)
-+        .SetMethod("getSize", &NativeImage::GetSize)
-+        .SetMethod("setTemplateImage", &NativeImage::SetTemplateImage)
-+        .SetMethod("isTemplateImage", &NativeImage::IsTemplateImage)
-+        .Build());
-+
-+  return mate::ObjectTemplateBuilder(
-+      isolate, v8::Local<v8::ObjectTemplate>::New(isolate, template_));
-+}
-+
-+v8::Local<v8::Value> NativeImage::ToPNG(v8::Isolate* isolate) {
-+  scoped_refptr<base::RefCountedMemory> png = image_.As1xPNGBytes();
-+  return node::Buffer::Copy(isolate,
-+                            reinterpret_cast<const char*>(png->front()),
-+                            static_cast<size_t>(png->size())).ToLocalChecked();
-+}
-+
-+v8::Local<v8::Value> NativeImage::ToJPEG(v8::Isolate* isolate, int quality) {
-+  std::vector<unsigned char> output;
-+  gfx::JPEG1xEncodedDataFromImage(image_, quality, &output);
-+  return node::Buffer::Copy(
-+      isolate,
-+      reinterpret_cast<const char*>(&output.front()),
-+      static_cast<size_t>(output.size())).ToLocalChecked();
-+}
-+
-+std::string NativeImage::ToDataURL() {
-+  scoped_refptr<base::RefCountedMemory> png = image_.As1xPNGBytes();
-+  std::string data_url;
-+  data_url.insert(data_url.end(), png->front(), png->front() + png->size());
-+  base::Base64Encode(data_url, &data_url);
-+  data_url.insert(0, "data:image/png;base64,");
-+  return data_url;
-+}
-+
-+v8::Local<v8::Value> NativeImage::GetNativeHandle(v8::Isolate* isolate,
-+                                                  mate::Arguments* args) {
-+#if defined(OS_MACOSX)
-+  NSImage* ptr = image_.AsNSImage();
-+  return node::Buffer::Copy(
-+      isolate,
-+      reinterpret_cast<char*>(ptr),
-+      sizeof(void*)).ToLocalChecked();
-+#else
-+  args->ThrowError("Not implemented");
-+  return v8::Undefined(isolate);
-+#endif
-+}
-+
-+bool NativeImage::IsEmpty() {
-+  return image_.IsEmpty();
-+}
-+
-+gfx::Size NativeImage::GetSize() {
-+  return image_.Size();
-+}
-+
-+#if !defined(OS_MACOSX)
-+void NativeImage::SetTemplateImage(bool setAsTemplate) {
-+}
-+
-+bool NativeImage::IsTemplateImage() {
-+  return false;
-+}
-+#endif
-+
-+// static
-+mate::Handle<NativeImage> NativeImage::CreateEmpty(v8::Isolate* isolate) {
-+  return mate::CreateHandle(isolate, new NativeImage);
-+}
-+
-+// static
-+mate::Handle<NativeImage> NativeImage::Create(
-+    v8::Isolate* isolate, const gfx::Image& image) {
-+  return mate::CreateHandle(isolate, new NativeImage(image));
-+}
-+
-+// static
-+mate::Handle<NativeImage> NativeImage::CreateFromPNG(
-+    v8::Isolate* isolate, const char* buffer, size_t length) {
-+  gfx::Image image = gfx::Image::CreateFrom1xPNGBytes(
-+      reinterpret_cast<const unsigned char*>(buffer), length);
-+  return Create(isolate, image);
-+}
-+
-+// static
-+mate::Handle<NativeImage> NativeImage::CreateFromJPEG(
-+    v8::Isolate* isolate, const char* buffer, size_t length) {
-+  gfx::Image image = gfx::ImageFrom1xJPEGEncodedData(
-+      reinterpret_cast<const unsigned char*>(buffer), length);
-+  return Create(isolate, image);
-+}
-+
-+// static
-+mate::Handle<NativeImage> NativeImage::CreateFromPath(
-+    v8::Isolate* isolate, const base::FilePath& path) {
-+  gfx::ImageSkia image_skia;
-+  base::FilePath image_path = NormalizePath(path);
-+
-+  if (image_path.MatchesExtension(FILE_PATH_LITERAL(".ico"))) {
-+#if defined(OS_WIN)
-+    ReadImageSkiaFromICO(&image_skia, image_path);
-+#endif
-+  } else {
-+    PopulateImageSkiaRepsFromPath(&image_skia, image_path);
-+  }
-+  gfx::Image image(image_skia);
-+  mate::Handle<NativeImage> handle = Create(isolate, image);
-+#if defined(OS_MACOSX)
-+  if (IsTemplateFilename(image_path))
-+    handle->SetTemplateImage(true);
-+#endif
-+  return handle;
-+}
-+
-+// static
-+mate::Handle<NativeImage> NativeImage::CreateFromBuffer(
-+    mate::Arguments* args, v8::Local<v8::Value> buffer) {
-+  double scale_factor = 1.;
-+  args->GetNext(&scale_factor);
-+
-+  gfx::ImageSkia image_skia;
-+  AddImageSkiaRep(&image_skia,
-+                  reinterpret_cast<unsigned char*>(node::Buffer::Data(buffer)),
-+                  node::Buffer::Length(buffer),
-+                  scale_factor);
-+  return Create(args->isolate(), gfx::Image(image_skia));
-+}
-+
-+// static
-+mate::Handle<NativeImage> NativeImage::CreateFromDataURL(
-+    v8::Isolate* isolate, const GURL& url) {
-+  std::string mime_type, charset, data;
-+  if (net::DataURL::Parse(url, &mime_type, &charset, &data)) {
-+    if (mime_type == "image/png")
-+      return CreateFromPNG(isolate, data.c_str(), data.size());
-+    else if (mime_type == "image/jpeg")
-+      return CreateFromJPEG(isolate, data.c_str(), data.size());
-+  }
-+
-+  return CreateEmpty(isolate);
-+}
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+
-+namespace {
-+
-+void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
-+                v8::Local<v8::Context> context, void* priv) {
-+  mate::Dictionary dict(context->GetIsolate(), exports);
-+  dict.SetMethod("createEmpty", &electron::api::NativeImage::CreateEmpty);
-+  dict.SetMethod("createFromPath", &electron::api::NativeImage::CreateFromPath);
-+  dict.SetMethod("createFromBuffer", &electron::api::NativeImage::CreateFromBuffer);
-+  dict.SetMethod("createFromDataURL",
-+                 &electron::api::NativeImage::CreateFromDataURL);
-+}
-+
-+}  // namespace
-+
-+NODE_MODULE_CONTEXT_AWARE_BUILTIN(electron_common_native_image, Initialize)
-added in remote
-  their  100644 29ccec20538730abb365bec3bbfcf59d23ecd5f5 electron/common/api/electron_api_native_image.h
-@@ -0,0 +1,85 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_COMMON_API_ELECTRON_API_NATIVE_IMAGE_H_
-+#define ELECTRON_COMMON_API_ELECTRON_API_NATIVE_IMAGE_H_
-+
-+#include <string>
-+
-+#include "native_mate/handle.h"
-+#include "native_mate/wrappable.h"
-+#include "ui/gfx/image/image.h"
-+
-+class GURL;
-+
-+namespace base {
-+class FilePath;
-+}
-+
-+namespace gfx {
-+class Size;
-+}
-+
-+namespace mate {
-+class Arguments;
-+}
-+
-+namespace electron {
-+
-+namespace api {
-+
-+class NativeImage : public mate::Wrappable {
-+ public:
-+  static mate::Handle<NativeImage> CreateEmpty(v8::Isolate* isolate);
-+  static mate::Handle<NativeImage> Create(
-+      v8::Isolate* isolate, const gfx::Image& image);
-+  static mate::Handle<NativeImage> CreateFromPNG(
-+      v8::Isolate* isolate, const char* buffer, size_t length);
-+  static mate::Handle<NativeImage> CreateFromJPEG(
-+      v8::Isolate* isolate, const char* buffer, size_t length);
-+  static mate::Handle<NativeImage> CreateFromPath(
-+      v8::Isolate* isolate, const base::FilePath& path);
-+  static mate::Handle<NativeImage> CreateFromBuffer(
-+      mate::Arguments* args, v8::Local<v8::Value> buffer);
-+  static mate::Handle<NativeImage> CreateFromDataURL(
-+      v8::Isolate* isolate, const GURL& url);
-+
-+  // The default constructor should only be used by image_converter.cc.
-+  NativeImage();
-+
-+  const gfx::Image& image() const { return image_; }
-+
-+ protected:
-+  explicit NativeImage(const gfx::Image& image);
-+  virtual ~NativeImage();
-+
-+  // mate::Wrappable:
-+  mate::ObjectTemplateBuilder GetObjectTemplateBuilder(
-+      v8::Isolate* isolate) override;
-+
-+ private:
-+  v8::Local<v8::Value> ToPNG(v8::Isolate* isolate);
-+  v8::Local<v8::Value> ToJPEG(v8::Isolate* isolate, int quality);
-+  v8::Local<v8::Value> GetNativeHandle(
-+    v8::Isolate* isolate,
-+    mate::Arguments* args);
-+  std::string ToDataURL();
-+  bool IsEmpty();
-+  gfx::Size GetSize();
-+
-+  // Mark the image as template image.
-+  void SetTemplateImage(bool setAsTemplate);
-+  // Determine if the image is a template image.
-+  bool IsTemplateImage();
-+
-+  gfx::Image image_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(NativeImage);
-+};
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_COMMON_API_ELECTRON_API_NATIVE_IMAGE_H_
-added in remote
-  their  100644 4ebdcefa764e1227069ce0c642140d12028122b0 electron/common/api/electron_api_native_image_mac.mm
-@@ -0,0 +1,23 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/common/api/electron_api_native_image.h"
-+
-+#import <Cocoa/Cocoa.h>
-+
-+namespace electron {
-+
-+namespace api {
-+
-+void NativeImage::SetTemplateImage(bool setAsTemplate) {
-+  [image_.AsNSImage() setTemplate:setAsTemplate];
-+}
-+
-+bool NativeImage::IsTemplateImage() {
-+  return [image_.AsNSImage() isTemplate];
-+}
-+
-+}  // namespace api
-+
-+}  // namespace electron
-added in remote
-  their  100644 53ad7c44b0c401460f65faf64c3c1b9355252ab8 electron/common/api/electron_api_shell.cc
-@@ -0,0 +1,38 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include <string>
-+
-+#include "electron/common/platform_util.h"
-+#include "electron/common/native_mate_converters/file_path_converter.h"
-+#include "electron/common/native_mate_converters/gurl_converter.h"
-+#include "electron/common/node_includes.h"
-+#include "native_mate/dictionary.h"
-+
-+namespace {
-+
-+bool OpenExternal(const GURL& url, mate::Arguments* args) {
-+  bool activate = true;
-+  if (args->Length() == 2) {
-+    mate::Dictionary options;
-+    if (args->GetNext(&options)) {
-+      options.Get("activate", &activate);
-+    }
-+  }
-+  return platform_util::OpenExternal(url, activate);
-+}
-+
-+void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
-+                v8::Local<v8::Context> context, void* priv) {
-+  mate::Dictionary dict(context->GetIsolate(), exports);
-+  dict.SetMethod("showItemInFolder", &platform_util::ShowItemInFolder);
-+  dict.SetMethod("openItem", &platform_util::OpenItem);
-+  dict.SetMethod("openExternal", &OpenExternal);
-+  dict.SetMethod("moveItemToTrash", &platform_util::MoveItemToTrash);
-+  dict.SetMethod("beep", &platform_util::Beep);
-+}
-+
-+}  // namespace
-+
-+NODE_MODULE_CONTEXT_AWARE_BUILTIN(electron_common_shell, Initialize)
-added in remote
-  their  100644 efec51533b73a5814701f28c478fbacfa106261d electron/common/api/electron_api_v8_util.cc
-@@ -0,0 +1,77 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include <string>
-+
-+#include "electron/common/api/object_life_monitor.h"
-+#include "electron/common/node_includes.h"
-+#include "native_mate/dictionary.h"
-+#include "v8/include/v8-profiler.h"
-+
-+namespace {
-+
-+v8::Local<v8::Value> GetHiddenValue(v8::Isolate* isolate,
-+                                    v8::Local<v8::Object> object,
-+                                    v8::Local<v8::String> key) {
-+  v8::Local<v8::Context> context = isolate->GetCurrentContext();
-+  v8::Local<v8::Private> privateKey = v8::Private::ForApi(isolate, key);
-+  v8::Local<v8::Value> value;
-+  v8::Maybe<bool> result = object->HasPrivate(context, privateKey);
-+  if (!(result.IsJust() && result.FromJust()))
-+    return v8::Local<v8::Value>();
-+  if (object->GetPrivate(context, privateKey).ToLocal(&value))
-+    return value;
-+  return v8::Local<v8::Value>();
-+}
-+
-+void SetHiddenValue(v8::Isolate* isolate,
-+                    v8::Local<v8::Object> object,
-+                    v8::Local<v8::String> key,
-+                    v8::Local<v8::Value> value) {
-+  if (value.IsEmpty())
-+    return;
-+  v8::Local<v8::Context> context = isolate->GetCurrentContext();
-+  v8::Local<v8::Private> privateKey = v8::Private::ForApi(isolate, key);
-+  object->SetPrivate(context, privateKey, value);
-+}
-+
-+void DeleteHiddenValue(v8::Isolate* isolate,
-+                       v8::Local<v8::Object> object,
-+                       v8::Local<v8::String> key) {
-+  v8::Local<v8::Context> context = isolate->GetCurrentContext();
-+  v8::Local<v8::Private> privateKey = v8::Private::ForApi(isolate, key);
-+  // Actually deleting the value would make force the object into
-+  // dictionary mode which is unnecessarily slow. Instead, we replace
-+  // the hidden value with "undefined".
-+  object->SetPrivate(context, privateKey, v8::Undefined(isolate));
-+}
-+
-+int32_t GetObjectHash(v8::Local<v8::Object> object) {
-+  return object->GetIdentityHash();
-+}
-+
-+void SetDestructor(v8::Isolate* isolate,
-+                   v8::Local<v8::Object> object,
-+                   v8::Local<v8::Function> callback) {
-+  electron::ObjectLifeMonitor::BindTo(isolate, object, callback);
-+}
-+
-+void TakeHeapSnapshot(v8::Isolate* isolate) {
-+  isolate->GetHeapProfiler()->TakeHeapSnapshot();
-+}
-+
-+void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
-+                v8::Local<v8::Context> context, void* priv) {
-+  mate::Dictionary dict(context->GetIsolate(), exports);
-+  dict.SetMethod("getHiddenValue", &GetHiddenValue);
-+  dict.SetMethod("setHiddenValue", &SetHiddenValue);
-+  dict.SetMethod("deleteHiddenValue", &DeleteHiddenValue);
-+  dict.SetMethod("getObjectHash", &GetObjectHash);
-+  dict.SetMethod("setDestructor", &SetDestructor);
-+  dict.SetMethod("takeHeapSnapshot", &TakeHeapSnapshot);
-+}
-+
-+}  // namespace
-+
-+NODE_MODULE_CONTEXT_AWARE_BUILTIN(electron_common_v8_util, Initialize)
-added in remote
-  their  100644 9771481bf75a34af826bf588e85b6ed99fb1e616 electron/common/api/electron_bindings.cc
-@@ -0,0 +1,108 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/common/api/electron_bindings.h"
-+
-+#include <algorithm>
-+#include <string>
-+#include <iostream>
-+
-+#include "electron/common/electron_version.h"
-+#include "electron/common/chrome_version.h"
-+#include "electron/common/native_mate_converters/string16_converter.h"
-+#include "base/logging.h"
-+#include "base/process/process_metrics.h"
-+#include "native_mate/dictionary.h"
-+
-+#include "electron/common/node_includes.h"
-+
-+namespace electron {
-+
-+namespace {
-+
-+// Dummy class type that used for crashing the program.
-+struct DummyClass { bool crash; };
-+
-+void Crash() {
-+  static_cast<DummyClass*>(NULL)->crash = true;
-+}
-+
-+void Hang() {
-+  for (;;)
-+    base::PlatformThread::Sleep(base::TimeDelta::FromSeconds(1));
-+}
-+
-+// Called when there is a fatal error in V8, we just crash the process here so
-+// we can get the stack trace.
-+void FatalErrorCallback(const char* location, const char* message) {
-+  LOG(ERROR) << "Fatal error in V8: " << location << " " << message;
-+  Crash();
-+}
-+
-+void Log(const base::string16& message) {
-+  std::cout << message << std::flush;
-+}
-+
-+}  // namespace
-+
-+
-+ElectronBindings::ElectronBindings() {
-+  uv_async_init(uv_default_loop(), &call_next_tick_async_, OnCallNextTick);
-+  call_next_tick_async_.data = this;
-+}
-+
-+ElectronBindings::~ElectronBindings() {
-+}
-+
-+void ElectronBindings::BindTo(v8::Isolate* isolate,
-+                          v8::Local<v8::Object> process) {
-+  v8::V8::SetFatalErrorHandler(FatalErrorCallback);
-+
-+  mate::Dictionary dict(isolate, process);
-+  dict.SetMethod("crash", &Crash);
-+  dict.SetMethod("hang", &Hang);
-+  dict.SetMethod("log", &Log);
-+#if defined(OS_POSIX)
-+  dict.SetMethod("setFdLimit", &base::SetFdLimit);
-+#endif
-+  dict.SetMethod("activateUvLoop",
-+      base::Bind(&ElectronBindings::ActivateUVLoop, base::Unretained(this)));
-+
-+#if defined(MAS_BUILD)
-+  dict.Set("mas", true);
-+#endif
-+
-+  mate::Dictionary versions;
-+  if (dict.Get("versions", &versions)) {
-+    versions.Set(ELECTRON_PROJECT_NAME, ELECTRON_VERSION_STRING);
-+    versions.Set("atom-shell", ELECTRON_VERSION_STRING);  // For compatibility.
-+    versions.Set("chrome", CHROME_VERSION_STRING);
-+  }
-+}
-+
-+void ElectronBindings::ActivateUVLoop(v8::Isolate* isolate) {
-+  node::Environment* env = node::Environment::GetCurrent(isolate);
-+  if (std::find(pending_next_ticks_.begin(), pending_next_ticks_.end(), env) !=
-+      pending_next_ticks_.end())
-+    return;
-+
-+  pending_next_ticks_.push_back(env);
-+  uv_async_send(&call_next_tick_async_);
-+}
-+
-+// static
-+void ElectronBindings::OnCallNextTick(uv_async_t* handle) {
-+  ElectronBindings* self = static_cast<ElectronBindings*>(handle->data);
-+  for (std::list<node::Environment*>::const_iterator it =
-+           self->pending_next_ticks_.begin();
-+       it != self->pending_next_ticks_.end(); ++it) {
-+    node::Environment* env = *it;
-+    node::Environment::AsyncCallbackScope callback_scope(env);
-+    env->KickNextTick(&callback_scope);
-+  }
-+
-+  self->pending_next_ticks_.clear();
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 9febb32a6ff1306fd129c0b82edd330fdd25c4b7 electron/common/api/electron_bindings.h
-@@ -0,0 +1,43 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_COMMON_API_ELECTRON_BINDINGS_H_
-+#define ELECTRON_COMMON_API_ELECTRON_BINDINGS_H_
-+
-+#include <list>
-+
-+#include "base/macros.h"
-+#include "base/strings/string16.h"
-+#include "v8/include/v8.h"
-+#include "vendor/node/deps/uv/include/uv.h"
-+
-+namespace node {
-+class Environment;
-+}
-+
-+namespace electron {
-+
-+class ElectronBindings {
-+ public:
-+  ElectronBindings();
-+  virtual ~ElectronBindings();
-+
-+  // Add process.atomBinding function, which behaves like process.binding but
-+  // load native code from Electron instead.
-+  void BindTo(v8::Isolate* isolate, v8::Local<v8::Object> process);
-+
-+ private:
-+  void ActivateUVLoop(v8::Isolate* isolate);
-+
-+  static void OnCallNextTick(uv_async_t* handle);
-+
-+  uv_async_t call_next_tick_async_;
-+  std::list<node::Environment*> pending_next_ticks_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(ElectronBindings);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_COMMON_API_ELECTRON_BINDINGS_H_
-added in remote
-  their  100644 e25bb7cb88379ff473911f7fbe964e0d249698c2 electron/common/api/event_emitter_caller.cc
-@@ -0,0 +1,31 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/common/api/event_emitter_caller.h"
-+
-+#include "electron/common/api/locker.h"
-+#include "electron/common/node_includes.h"
-+#include "base/memory/scoped_ptr.h"
-+#include "third_party/WebKit/public/web/WebScopedMicrotaskSuppression.h"
-+
-+namespace mate {
-+
-+namespace internal {
-+
-+v8::Local<v8::Value> CallEmitWithArgs(v8::Isolate* isolate,
-+                                      v8::Local<v8::Object> obj,
-+                                      ValueVector* args) {
-+  // Perform microtask checkpoint after running JavaScript.
-+  scoped_ptr<blink::WebScopedRunV8Script> script_scope(
-+      Locker::IsBrowserProcess() ?
-+      nullptr : new blink::WebScopedRunV8Script);
-+  // Use node::MakeCallback to call the callback, and it will also run pending
-+  // tasks in Node.js.
-+  return node::MakeCallback(
-+      isolate, obj, "emit", args->size(), &args->front());
-+}
-+
-+}  // namespace internal
-+
-+}  // namespace mate
-added in remote
-  their  100644 2a40a5b92a2a27cc2100f333213a610c7903a90d electron/common/api/event_emitter_caller.h
-@@ -0,0 +1,53 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_COMMON_API_EVENT_EMITTER_CALLER_H_
-+#define ELECTRON_COMMON_API_EVENT_EMITTER_CALLER_H_
-+
-+#include <vector>
-+
-+#include "native_mate/converter.h"
-+
-+namespace mate {
-+
-+namespace internal {
-+
-+using ValueVector = std::vector<v8::Local<v8::Value>>;
-+
-+v8::Local<v8::Value> CallEmitWithArgs(v8::Isolate* isolate,
-+                                      v8::Local<v8::Object> obj,
-+                                      ValueVector* args);
-+
-+}  // namespace internal
-+
-+// obj.emit.apply(obj, name, args...);
-+// The caller is responsible of allocating a HandleScope.
-+template<typename StringType, typename... Args>
-+v8::Local<v8::Value> EmitEvent(v8::Isolate* isolate,
-+                               v8::Local<v8::Object> obj,
-+                               const StringType& name,
-+                               const internal::ValueVector& args) {
-+  internal::ValueVector concatenated_args = { StringToV8(isolate, name) };
-+  concatenated_args.reserve(1 + args.size());
-+  concatenated_args.insert(concatenated_args.end(), args.begin(), args.end());
-+  return internal::CallEmitWithArgs(isolate, obj, &concatenated_args);
-+}
-+
-+// obj.emit(name, args...);
-+// The caller is responsible of allocating a HandleScope.
-+template<typename StringType, typename... Args>
-+v8::Local<v8::Value> EmitEvent(v8::Isolate* isolate,
-+                               v8::Local<v8::Object> obj,
-+                               const StringType& name,
-+                               const Args&... args) {
-+  internal::ValueVector converted_args = {
-+      StringToV8(isolate, name),
-+      ConvertToV8(isolate, args)...,
-+  };
-+  return internal::CallEmitWithArgs(isolate, obj, &converted_args);
-+}
-+
-+}  // namespace mate
-+
-+#endif  // ELECTRON_COMMON_API_EVENT_EMITTER_CALLER_H_
-added in remote
-  their  100644 96b9fa63326c48422d0cf5172682174cdbf4c650 electron/common/api/locker.cc
-@@ -0,0 +1,17 @@
-+// Copyright 2014 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE.chromium file.
-+
-+#include "electron/common/api/locker.h"
-+
-+namespace mate {
-+
-+Locker::Locker(v8::Isolate* isolate) {
-+  if (IsBrowserProcess())
-+    locker_.reset(new v8::Locker(isolate));
-+}
-+
-+Locker::~Locker() {
-+}
-+
-+}  // namespace mate
-added in remote
-  their  100644 80203fb942851db437007821d372fbe8ad1ed9ee electron/common/api/locker.h
-@@ -0,0 +1,34 @@
-+// Copyright 2014 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE.chromium file.
-+
-+#ifndef ELECTRON_COMMON_API_LOCKER_H_
-+#define ELECTRON_COMMON_API_LOCKER_H_
-+
-+#include "base/memory/scoped_ptr.h"
-+#include "v8/include/v8.h"
-+
-+namespace mate {
-+
-+// Only lock when lockers are used in current thread.
-+class Locker {
-+ public:
-+  explicit Locker(v8::Isolate* isolate);
-+  ~Locker();
-+
-+  // Returns whether current process is browser process, currently we detect it
-+  // by checking whether current has used V8 Lock, but it might be a bad idea.
-+  static inline bool IsBrowserProcess() { return v8::Locker::IsActive(); }
-+
-+ private:
-+  void* operator new(size_t size);
-+  void operator delete(void*, size_t);
-+
-+  scoped_ptr<v8::Locker> locker_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(Locker);
-+};
-+
-+}  // namespace mate
-+
-+#endif  // ELECTRON_COMMON_API_LOCKER_H_
-added in remote
-  their  100644 c5d219dfcdbee8480a418ce09ca75b15994747a8 electron/common/api/object_life_monitor.cc
-@@ -0,0 +1,55 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Copyright (c) 2012 Intel Corp. All rights reserved.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/common/api/object_life_monitor.h"
-+
-+#include "base/bind.h"
-+#include "base/message_loop/message_loop.h"
-+
-+namespace electron {
-+
-+// static
-+void ObjectLifeMonitor::BindTo(v8::Isolate* isolate,
-+                               v8::Local<v8::Object> target,
-+                               v8::Local<v8::Function> destructor) {
-+  new ObjectLifeMonitor(isolate, target, destructor);
-+}
-+
-+ObjectLifeMonitor::ObjectLifeMonitor(v8::Isolate* isolate,
-+                                     v8::Local<v8::Object> target,
-+                                     v8::Local<v8::Function> destructor)
-+    : isolate_(isolate),
-+      context_(isolate, isolate->GetCurrentContext()),
-+      target_(isolate, target),
-+      destructor_(isolate, destructor),
-+      weak_ptr_factory_(this) {
-+  target_.SetWeak(this, OnObjectGC, v8::WeakCallbackType::kParameter);
-+}
-+
-+// static
-+void ObjectLifeMonitor::OnObjectGC(
-+    const v8::WeakCallbackInfo<ObjectLifeMonitor>& data) {
-+  ObjectLifeMonitor* self = data.GetParameter();
-+  self->target_.Reset();
-+  self->RunCallback();
-+  data.SetSecondPassCallback(Free);
-+}
-+
-+// static
-+void ObjectLifeMonitor::Free(
-+    const v8::WeakCallbackInfo<ObjectLifeMonitor>& data) {
-+  delete data.GetParameter();
-+}
-+
-+void ObjectLifeMonitor::RunCallback() {
-+  v8::HandleScope handle_scope(isolate_);
-+  v8::Local<v8::Context> context = v8::Local<v8::Context>::New(
-+      isolate_, context_);
-+  v8::Context::Scope context_scope(context);
-+  v8::Local<v8::Function>::New(isolate_, destructor_)->Call(
-+      context->Global(), 0, nullptr);
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 487a4b288ccb8571acc7e98bfbaeac1afa6fb141 electron/common/api/object_life_monitor.h
-@@ -0,0 +1,42 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_COMMON_API_OBJECT_LIFE_MONITOR_H_
-+#define ELECTRON_COMMON_API_OBJECT_LIFE_MONITOR_H_
-+
-+#include "base/macros.h"
-+#include "base/memory/weak_ptr.h"
-+#include "v8/include/v8.h"
-+
-+namespace electron {
-+
-+class ObjectLifeMonitor {
-+ public:
-+  static void BindTo(v8::Isolate* isolate,
-+                     v8::Local<v8::Object> target,
-+                     v8::Local<v8::Function> destructor);
-+
-+ private:
-+  ObjectLifeMonitor(v8::Isolate* isolate,
-+                    v8::Local<v8::Object> target,
-+                    v8::Local<v8::Function> destructor);
-+
-+  static void OnObjectGC(const v8::WeakCallbackInfo<ObjectLifeMonitor>& data);
-+  static void Free(const v8::WeakCallbackInfo<ObjectLifeMonitor>& data);
-+
-+  void RunCallback();
-+
-+  v8::Isolate* isolate_;
-+  v8::Global<v8::Context> context_;
-+  v8::Global<v8::Object> target_;
-+  v8::Global<v8::Function> destructor_;
-+
-+  base::WeakPtrFactory<ObjectLifeMonitor> weak_ptr_factory_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(ObjectLifeMonitor);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_COMMON_API_OBJECT_LIFE_MONITOR_H_
-added in remote
-  their  100644 34250f9e824a5606d837e1e26b7697f4dec8b126 electron/common/asar/archive.cc
-@@ -0,0 +1,307 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/common/asar/archive.h"
-+
-+#if defined(OS_WIN)
-+#include <io.h>
-+#endif
-+
-+#include <string>
-+#include <vector>
-+
-+#include "electron/common/asar/scoped_temporary_file.h"
-+#include "base/files/file.h"
-+#include "base/files/file_util.h"
-+#include "base/logging.h"
-+#include "base/pickle.h"
-+#include "base/json/json_reader.h"
-+#include "base/strings/string_number_conversions.h"
-+#include "base/values.h"
-+
-+namespace asar {
-+
-+namespace {
-+
-+#if defined(OS_WIN)
-+const char kSeparators[] = "\\/";
-+#else
-+const char kSeparators[] = "/";
-+#endif
-+
-+bool GetNodeFromPath(std::string path,
-+                     const base::DictionaryValue* root,
-+                     const base::DictionaryValue** out);
-+
-+// Gets the "files" from "dir".
-+bool GetFilesNode(const base::DictionaryValue* root,
-+                  const base::DictionaryValue* dir,
-+                  const base::DictionaryValue** out) {
-+  // Test for symbol linked directory.
-+  std::string link;
-+  if (dir->GetStringWithoutPathExpansion("link", &link)) {
-+    const base::DictionaryValue* linked_node = NULL;
-+    if (!GetNodeFromPath(link, root, &linked_node))
-+      return false;
-+    dir = linked_node;
-+  }
-+
-+  return dir->GetDictionaryWithoutPathExpansion("files", out);
-+}
-+
-+// Gets sub-file "name" from "dir".
-+bool GetChildNode(const base::DictionaryValue* root,
-+                  const std::string& name,
-+                  const base::DictionaryValue* dir,
-+                  const base::DictionaryValue** out) {
-+  if (name == "") {
-+    *out = root;
-+    return true;
-+  }
-+
-+  const base::DictionaryValue* files = NULL;
-+  return GetFilesNode(root, dir, &files) &&
-+         files->GetDictionaryWithoutPathExpansion(name, out);
-+}
-+
-+// Gets the node of "path" from "root".
-+bool GetNodeFromPath(std::string path,
-+                     const base::DictionaryValue* root,
-+                     const base::DictionaryValue** out) {
-+  if (path == "") {
-+    *out = root;
-+    return true;
-+  }
-+
-+  const base::DictionaryValue* dir = root;
-+  for (size_t delimiter_position = path.find_first_of(kSeparators);
-+       delimiter_position != std::string::npos;
-+       delimiter_position = path.find_first_of(kSeparators)) {
-+    const base::DictionaryValue* child = NULL;
-+    if (!GetChildNode(root, path.substr(0, delimiter_position), dir, &child))
-+      return false;
-+
-+    dir = child;
-+    path.erase(0, delimiter_position + 1);
-+  }
-+
-+  return GetChildNode(root, path, dir, out);
-+}
-+
-+bool FillFileInfoWithNode(Archive::FileInfo* info,
-+                          uint32_t header_size,
-+                          const base::DictionaryValue* node) {
-+  int size;
-+  if (!node->GetInteger("size", &size))
-+    return false;
-+  info->size = static_cast<uint32_t>(size);
-+
-+  if (node->GetBoolean("unpacked", &info->unpacked) && info->unpacked)
-+    return true;
-+
-+  std::string offset;
-+  if (!node->GetString("offset", &offset))
-+    return false;
-+  if (!base::StringToUint64(offset, &info->offset))
-+    return false;
-+  info->offset += header_size;
-+
-+  node->GetBoolean("executable", &info->executable);
-+
-+  return true;
-+}
-+
-+}  // namespace
-+
-+Archive::Archive(const base::FilePath& path)
-+    : path_(path),
-+      file_(path_, base::File::FLAG_OPEN | base::File::FLAG_READ),
-+#if defined(OS_WIN)
-+      fd_(_open_osfhandle(
-+              reinterpret_cast<intptr_t>(file_.GetPlatformFile()), 0)),
-+#elif defined(OS_POSIX)
-+      fd_(file_.GetPlatformFile()),
-+#else
-+      fd_(-1),
-+#endif
-+      header_size_(0) {
-+}
-+
-+Archive::~Archive() {
-+#if defined(OS_WIN)
-+  if (fd_ != -1) {
-+    _close(fd_);
-+    // Don't close the handle since we already closed the fd.
-+    file_.TakePlatformFile();
-+  }
-+#endif
-+}
-+
-+bool Archive::Init() {
-+  if (!file_.IsValid()) {
-+    if (file_.error_details() != base::File::FILE_ERROR_NOT_FOUND) {
-+      LOG(WARNING) << "Opening " << path_.value()
-+                   << ": " << base::File::ErrorToString(file_.error_details());
-+    }
-+    return false;
-+  }
-+
-+  std::vector<char> buf;
-+  int len;
-+
-+  buf.resize(8);
-+  len = file_.ReadAtCurrentPos(buf.data(), buf.size());
-+  if (len != static_cast<int>(buf.size())) {
-+    PLOG(ERROR) << "Failed to read header size from " << path_.value();
-+    return false;
-+  }
-+
-+  uint32_t size;
-+  if (!base::PickleIterator(base::Pickle(buf.data(), buf.size())).ReadUInt32(
-+          &size)) {
-+    LOG(ERROR) << "Failed to parse header size from " << path_.value();
-+    return false;
-+  }
-+
-+  buf.resize(size);
-+  len = file_.ReadAtCurrentPos(buf.data(), buf.size());
-+  if (len != static_cast<int>(buf.size())) {
-+    PLOG(ERROR) << "Failed to read header from " << path_.value();
-+    return false;
-+  }
-+
-+  std::string header;
-+  if (!base::PickleIterator(base::Pickle(buf.data(), buf.size())).ReadString(
-+        &header)) {
-+    LOG(ERROR) << "Failed to parse header from " << path_.value();
-+    return false;
-+  }
-+
-+  std::string error;
-+  base::JSONReader reader;
-+  scoped_ptr<base::Value> value(reader.ReadToValue(header));
-+  if (!value || !value->IsType(base::Value::TYPE_DICTIONARY)) {
-+    LOG(ERROR) << "Failed to parse header: " << error;
-+    return false;
-+  }
-+
-+  header_size_ = 8 + size;
-+  header_.reset(static_cast<base::DictionaryValue*>(value.release()));
-+  return true;
-+}
-+
-+bool Archive::GetFileInfo(const base::FilePath& path, FileInfo* info) {
-+  if (!header_)
-+    return false;
-+
-+  const base::DictionaryValue* node;
-+  if (!GetNodeFromPath(path.AsUTF8Unsafe(), header_.get(), &node))
-+    return false;
-+
-+  std::string link;
-+  if (node->GetString("link", &link))
-+    return GetFileInfo(base::FilePath::FromUTF8Unsafe(link), info);
-+
-+  return FillFileInfoWithNode(info, header_size_, node);
-+}
-+
-+bool Archive::Stat(const base::FilePath& path, Stats* stats) {
-+  if (!header_)
-+    return false;
-+
-+  const base::DictionaryValue* node;
-+  if (!GetNodeFromPath(path.AsUTF8Unsafe(), header_.get(), &node))
-+    return false;
-+
-+  if (node->HasKey("link")) {
-+    stats->is_file = false;
-+    stats->is_link = true;
-+    return true;
-+  }
-+
-+  if (node->HasKey("files")) {
-+    stats->is_file = false;
-+    stats->is_directory = true;
-+    return true;
-+  }
-+
-+  return FillFileInfoWithNode(stats, header_size_, node);
-+}
-+
-+bool Archive::Readdir(const base::FilePath& path,
-+                      std::vector<base::FilePath>* list) {
-+  if (!header_)
-+    return false;
-+
-+  const base::DictionaryValue* node;
-+  if (!GetNodeFromPath(path.AsUTF8Unsafe(), header_.get(), &node))
-+    return false;
-+
-+  const base::DictionaryValue* files;
-+  if (!GetFilesNode(header_.get(), node, &files))
-+    return false;
-+
-+  base::DictionaryValue::Iterator iter(*files);
-+  while (!iter.IsAtEnd()) {
-+    list->push_back(base::FilePath::FromUTF8Unsafe(iter.key()));
-+    iter.Advance();
-+  }
-+  return true;
-+}
-+
-+bool Archive::Realpath(const base::FilePath& path, base::FilePath* realpath) {
-+  if (!header_)
-+    return false;
-+
-+  const base::DictionaryValue* node;
-+  if (!GetNodeFromPath(path.AsUTF8Unsafe(), header_.get(), &node))
-+    return false;
-+
-+  std::string link;
-+  if (node->GetString("link", &link)) {
-+    *realpath = base::FilePath::FromUTF8Unsafe(link);
-+    return true;
-+  }
-+
-+  *realpath = path;
-+  return true;
-+}
-+
-+bool Archive::CopyFileOut(const base::FilePath& path, base::FilePath* out) {
-+  if (external_files_.contains(path)) {
-+    *out = external_files_.get(path)->path();
-+    return true;
-+  }
-+
-+  FileInfo info;
-+  if (!GetFileInfo(path, &info))
-+    return false;
-+
-+  if (info.unpacked) {
-+    *out = path_.AddExtension(FILE_PATH_LITERAL("unpacked")).Append(path);
-+    return true;
-+  }
-+
-+  scoped_ptr<ScopedTemporaryFile> temp_file(new ScopedTemporaryFile);
-+  base::FilePath::StringType ext = path.Extension();
-+  if (!temp_file->InitFromFile(&file_, ext, info.offset, info.size))
-+    return false;
-+
-+#if defined(OS_POSIX)
-+  if (info.executable) {
-+    // chmod a+x temp_file;
-+    base::SetPosixFilePermissions(temp_file->path(), 0755);
-+  }
-+#endif
-+
-+  *out = temp_file->path();
-+  external_files_.set(path, std::move(temp_file));
-+  return true;
-+}
-+
-+int Archive::GetFD() const {
-+  return fd_;
-+}
-+
-+}  // namespace asar
-added in remote
-  their  100644 4468f1ccda7b1de4c3ed87a176c9615453075002 electron/common/asar/archive.h
-@@ -0,0 +1,86 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_COMMON_ASAR_ARCHIVE_H_
-+#define ELECTRON_COMMON_ASAR_ARCHIVE_H_
-+
-+#include <vector>
-+
-+#include "base/containers/scoped_ptr_hash_map.h"
-+#include "base/files/file.h"
-+#include "base/files/file_path.h"
-+#include "base/memory/scoped_ptr.h"
-+
-+namespace base {
-+class DictionaryValue;
-+}
-+
-+namespace asar {
-+
-+class ScopedTemporaryFile;
-+
-+// This class represents an asar package, and provides methods to read
-+// information from it.
-+class Archive {
-+ public:
-+  struct FileInfo {
-+    FileInfo() : unpacked(false), executable(false), size(0), offset(0) {}
-+    bool unpacked;
-+    bool executable;
-+    uint32_t size;
-+    uint64_t offset;
-+  };
-+
-+  struct Stats : public FileInfo {
-+    Stats() : is_file(true), is_directory(false), is_link(false) {}
-+    bool is_file;
-+    bool is_directory;
-+    bool is_link;
-+  };
-+
-+  explicit Archive(const base::FilePath& path);
-+  virtual ~Archive();
-+
-+  // Read and parse the header.
-+  bool Init();
-+
-+  // Get the info of a file.
-+  bool GetFileInfo(const base::FilePath& path, FileInfo* info);
-+
-+  // Fs.stat(path).
-+  bool Stat(const base::FilePath& path, Stats* stats);
-+
-+  // Fs.readdir(path).
-+  bool Readdir(const base::FilePath& path, std::vector<base::FilePath>* files);
-+
-+  // Fs.realpath(path).
-+  bool Realpath(const base::FilePath& path, base::FilePath* realpath);
-+
-+  // Copy the file into a temporary file, and return the new path.
-+  // For unpacked file, this method will return its real path.
-+  bool CopyFileOut(const base::FilePath& path, base::FilePath* out);
-+
-+  // Returns the file's fd.
-+  int GetFD() const;
-+
-+  base::FilePath path() const { return path_; }
-+  base::DictionaryValue* header() const { return header_.get(); }
-+
-+ private:
-+  base::FilePath path_;
-+  base::File file_;
-+  int fd_;
-+  uint32_t header_size_;
-+  scoped_ptr<base::DictionaryValue> header_;
-+
-+  // Cached external temporary files.
-+  base::ScopedPtrHashMap<base::FilePath, scoped_ptr<ScopedTemporaryFile>>
-+      external_files_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(Archive);
-+};
-+
-+}  // namespace asar
-+
-+#endif  // ELECTRON_COMMON_ASAR_ARCHIVE_H_
-added in remote
-  their  100644 56939ce43e1e3b780523838c21db4ee29f58c501 electron/common/asar/asar_util.cc
-@@ -0,0 +1,90 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/common/asar/asar_util.h"
-+
-+#include <map>
-+#include <string>
-+
-+#include "electron/common/asar/archive.h"
-+#include "base/files/file_path.h"
-+#include "base/files/file_util.h"
-+#include "base/lazy_instance.h"
-+#include "base/stl_util.h"
-+
-+namespace asar {
-+
-+namespace {
-+
-+// The global instance of ArchiveMap, will be destroyed on exit.
-+typedef std::map<base::FilePath, std::shared_ptr<Archive>> ArchiveMap;
-+static base::LazyInstance<ArchiveMap> g_archive_map = LAZY_INSTANCE_INITIALIZER;
-+
-+const base::FilePath::CharType kAsarExtension[] = FILE_PATH_LITERAL(".asar");
-+
-+}  // namespace
-+
-+std::shared_ptr<Archive> GetOrCreateAsarArchive(const base::FilePath& path) {
-+  ArchiveMap& archive_map = *g_archive_map.Pointer();
-+  if (!ContainsKey(archive_map, path)) {
-+    std::shared_ptr<Archive> archive(new Archive(path));
-+    if (!archive->Init())
-+      return nullptr;
-+    archive_map[path] = archive;
-+  }
-+  return archive_map[path];
-+}
-+
-+bool GetAsarArchivePath(const base::FilePath& full_path,
-+                        base::FilePath* asar_path,
-+                        base::FilePath* relative_path) {
-+  base::FilePath iter = full_path;
-+  while (true) {
-+    base::FilePath dirname = iter.DirName();
-+    if (iter.MatchesExtension(kAsarExtension))
-+      break;
-+    else if (iter == dirname)
-+      return false;
-+    iter = dirname;
-+  }
-+
-+  base::FilePath tail;
-+  if (!iter.AppendRelativePath(full_path, &tail))
-+    return false;
-+
-+  *asar_path = iter;
-+  *relative_path = tail;
-+  return true;
-+}
-+
-+bool ReadFileToString(const base::FilePath& path, std::string* contents) {
-+  base::FilePath asar_path, relative_path;
-+  if (!GetAsarArchivePath(path, &asar_path, &relative_path))
-+    return base::ReadFileToString(path, contents);
-+
-+  std::shared_ptr<Archive> archive = GetOrCreateAsarArchive(asar_path);
-+  if (!archive)
-+    return false;
-+
-+  Archive::FileInfo info;
-+  if (!archive->GetFileInfo(relative_path, &info))
-+    return false;
-+
-+  if (info.unpacked) {
-+    base::FilePath real_path;
-+    // For unpacked file it will return the real path instead of doing the copy.
-+    archive->CopyFileOut(relative_path, &real_path);
-+    return base::ReadFileToString(real_path, contents);
-+  }
-+
-+  base::File src(asar_path, base::File::FLAG_OPEN | base::File::FLAG_READ);
-+  if (!src.IsValid())
-+    return false;
-+
-+  contents->resize(info.size);
-+  return static_cast<int>(info.size) == src.Read(
-+      info.offset, const_cast<char*>(contents->data()), contents->size());
-+}
-+
-+}  // namespace asar
-added in remote
-  their  100644 062ef848f12694243a7a216f9016a26c9e6c319a electron/common/asar/asar_util.h
-@@ -0,0 +1,32 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_COMMON_ASAR_ASAR_UTIL_H_
-+#define ELECTRON_COMMON_ASAR_ASAR_UTIL_H_
-+
-+#include <memory>
-+#include <string>
-+
-+namespace base {
-+class FilePath;
-+}
-+
-+namespace asar {
-+
-+class Archive;
-+
-+// Gets or creates a new Archive from the path.
-+std::shared_ptr<Archive> GetOrCreateAsarArchive(const base::FilePath& path);
-+
-+// Separates the path to Archive out.
-+bool GetAsarArchivePath(const base::FilePath& full_path,
-+                        base::FilePath* asar_path,
-+                        base::FilePath* relative_path);
-+
-+// Same with base::ReadFileToString but supports asar Archive.
-+bool ReadFileToString(const base::FilePath& path, std::string* contents);
-+
-+}  // namespace asar
-+
-+#endif  // ELECTRON_COMMON_ASAR_ASAR_UTIL_H_
-added in remote
-  their  100644 8feea02a4a99ebbf70c39d32a1f7bb3c7572c9b0 electron/common/asar/scoped_temporary_file.cc
-@@ -0,0 +1,74 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/common/asar/scoped_temporary_file.h"
-+
-+#include <vector>
-+
-+#include "base/files/file_util.h"
-+#include "base/threading/thread_restrictions.h"
-+
-+namespace asar {
-+
-+ScopedTemporaryFile::ScopedTemporaryFile() {
-+}
-+
-+ScopedTemporaryFile::~ScopedTemporaryFile() {
-+  if (!path_.empty()) {
-+    base::ThreadRestrictions::ScopedAllowIO allow_io;
-+    // On Windows it is very likely the file is already in use (because it is
-+    // mostly used for Node native modules), so deleting it now will halt the
-+    // program.
-+#if defined(OS_WIN)
-+    base::DeleteFileAfterReboot(path_);
-+#else
-+    base::DeleteFile(path_, false);
-+#endif
-+  }
-+}
-+
-+bool ScopedTemporaryFile::Init(const base::FilePath::StringType& ext) {
-+  if (!path_.empty())
-+    return true;
-+
-+  base::ThreadRestrictions::ScopedAllowIO allow_io;
-+  if (!base::CreateTemporaryFile(&path_))
-+    return false;
-+
-+#if defined(OS_WIN)
-+  // Keep the original extension.
-+  if (!ext.empty()) {
-+    base::FilePath new_path = path_.AddExtension(ext);
-+    if (!base::Move(path_, new_path))
-+      return false;
-+    path_ = new_path;
-+  }
-+#endif
-+
-+  return true;
-+}
-+
-+bool ScopedTemporaryFile::InitFromFile(base::File* src,
-+                                       const base::FilePath::StringType& ext,
-+                                       uint64_t offset, uint64_t size) {
-+  if (!src->IsValid())
-+    return false;
-+
-+  if (!Init(ext))
-+    return false;
-+
-+  std::vector<char> buf(size);
-+  int len = src->Read(offset, buf.data(), buf.size());
-+  if (len != static_cast<int>(size))
-+    return false;
-+
-+  base::File dest(path_, base::File::FLAG_OPEN | base::File::FLAG_WRITE);
-+  if (!dest.IsValid())
-+    return false;
-+
-+  return dest.WriteAtCurrentPos(buf.data(), buf.size()) ==
-+      static_cast<int>(size);
-+}
-+
-+}  // namespace asar
-added in remote
-  their  100644 5200bb7184a29c98fde1fa048449ff8d211c0d7c electron/common/asar/scoped_temporary_file.h
-@@ -0,0 +1,43 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_COMMON_ASAR_SCOPED_TEMPORARY_FILE_H_
-+#define ELECTRON_COMMON_ASAR_SCOPED_TEMPORARY_FILE_H_
-+
-+#include "base/files/file_path.h"
-+
-+namespace base {
-+class File;
-+}
-+
-+namespace asar {
-+
-+// An object representing a temporary file that should be cleaned up when this
-+// object goes out of scope.  Note that since deletion occurs during the
-+// destructor, no further error handling is possible if the directory fails to
-+// be deleted.  As a result, deletion is not guaranteed by this class.
-+class ScopedTemporaryFile {
-+ public:
-+  ScopedTemporaryFile();
-+  virtual ~ScopedTemporaryFile();
-+
-+  // Init an empty temporary file with a certain extension.
-+  bool Init(const base::FilePath::StringType& ext);
-+
-+  // Init an temporary file and fill it with content of |path|.
-+  bool InitFromFile(base::File* src,
-+                    const base::FilePath::StringType& ext,
-+                    uint64_t offset, uint64_t size);
-+
-+  base::FilePath path() const { return path_; }
-+
-+ private:
-+  base::FilePath path_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(ScopedTemporaryFile);
-+};
-+
-+}  // namespace asar
-+
-+#endif  // ELECTRON_COMMON_ASAR_SCOPED_TEMPORARY_FILE_H_
-added in remote
-  their  100644 1ad11067dcb3f03bd010af7bb5dbc1965b067b59 electron/common/chrome_version.h
-@@ -0,0 +1,14 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+// This file is generated by script/bootstrap.py, you should never modify it
-+// by hand.
-+
-+#ifndef ELECTRON_COMMON_CHROME_VERSION_H_
-+#define ELECTRON_COMMON_CHROME_VERSION_H_
-+
-+#define CHROME_VERSION_STRING "49.0.2623.75"
-+#define CHROME_VERSION "v" CHROME_VERSION_STRING
-+
-+#endif  // ELECTRON_COMMON_CHROME_VERSION_H_
-added in remote
-  their  100644 2385f590a98f950df2628a9273a8969c25fa2fd6 electron/common/common_message_generator.cc
-@@ -0,0 +1,34 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+// Get basic type definitions.
-+#define IPC_MESSAGE_IMPL
-+#include "electron/common/common_message_generator.h"
-+
-+// Generate constructors.
-+#include "ipc/struct_constructor_macros.h"
-+#include "electron/common/common_message_generator.h"
-+
-+// Generate destructors.
-+#include "ipc/struct_destructor_macros.h"
-+#include "electron/common/common_message_generator.h"
-+
-+// Generate param traits write methods.
-+#include "ipc/param_traits_write_macros.h"
-+namespace IPC {
-+#include "electron/common/common_message_generator.h"
-+}  // namespace IPC
-+
-+// Generate param traits read methods.
-+#include "ipc/param_traits_read_macros.h"
-+namespace IPC {
-+#include "electron/common/common_message_generator.h"
-+}  // namespace IPC
-+
-+// Generate param traits log methods.
-+#include "ipc/param_traits_log_macros.h"
-+namespace IPC {
-+#include "electron/common/common_message_generator.h"
-+}  // namespace IPC
-+
-added in remote
-  their  100644 32dfbe347bfb9d1c7730e9563c99d2a6b5d1839c electron/common/common_message_generator.h
-@@ -0,0 +1,10 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+// Multiply-included file, no traditional include guard.
-+
-+#include "electron/common/api/api_messages.h"
-+#include "chrome/common/print_messages.h"
-+#include "chrome/common/tts_messages.h"
-+#include "chrome/common/widevine_cdm_messages.h"
-added in remote
-  their  100644 96b281887edfa08d9c37fddf8ba9cc55ad957903 electron/common/crash_reporter/crash_reporter.cc
-@@ -0,0 +1,86 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/common/crash_reporter/crash_reporter.h"
-+
-+#include "electron/browser/browser.h"
-+#include "electron/common/electron_version.h"
-+#include "base/command_line.h"
-+#include "base/files/file_util.h"
-+#include "base/strings/string_split.h"
-+#include "base/strings/string_number_conversions.h"
-+#include "content/public/common/content_switches.h"
-+
-+namespace crash_reporter {
-+
-+CrashReporter::CrashReporter() {
-+  auto cmd = base::CommandLine::ForCurrentProcess();
-+  is_browser_ = cmd->GetSwitchValueASCII(switches::kProcessType).empty();
-+}
-+
-+CrashReporter::~CrashReporter() {
-+}
-+
-+void CrashReporter::Start(const std::string& product_name,
-+                          const std::string& company_name,
-+                          const std::string& submit_url,
-+                          bool auto_submit,
-+                          bool skip_system_crash_handler,
-+                          const StringMap& extra_parameters) {
-+  SetUploadParameters(extra_parameters);
-+
-+  InitBreakpad(product_name, ELECTRON_VERSION_STRING, company_name, submit_url,
-+               auto_submit, skip_system_crash_handler);
-+}
-+
-+void CrashReporter::SetUploadParameters(const StringMap& parameters) {
-+  upload_parameters_ = parameters;
-+  upload_parameters_["process_type"] = is_browser_ ? "browser" : "renderer";
-+
-+  // Setting platform dependent parameters.
-+  SetUploadParameters();
-+}
-+
-+std::vector<CrashReporter::UploadReportResult>
-+CrashReporter::GetUploadedReports(const std::string& path) {
-+  std::string file_content;
-+  std::vector<CrashReporter::UploadReportResult> result;
-+  if (base::ReadFileToString(base::FilePath::FromUTF8Unsafe(path),
-+        &file_content)) {
-+    std::vector<std::string> reports = base::SplitString(
-+        file_content, "\n", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
-+    for (const std::string& report : reports) {
-+      std::vector<std::string> report_item = base::SplitString(
-+          report, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
-+      int report_time = 0;
-+      if (report_item.size() >= 2 && base::StringToInt(report_item[0],
-+            &report_time)) {
-+        result.push_back(CrashReporter::UploadReportResult(report_time,
-+            report_item[1]));
-+      }
-+    }
-+  }
-+  return result;
-+}
-+
-+void CrashReporter::InitBreakpad(const std::string& product_name,
-+                                 const std::string& version,
-+                                 const std::string& company_name,
-+                                 const std::string& submit_url,
-+                                 bool auto_submit,
-+                                 bool skip_system_crash_handler) {
-+}
-+
-+void CrashReporter::SetUploadParameters() {
-+}
-+
-+#if defined(OS_MACOSX) && defined(MAS_BUILD)
-+// static
-+CrashReporter* CrashReporter::GetInstance() {
-+  static CrashReporter crash_reporter;
-+  return &crash_reporter;
-+}
-+#endif
-+
-+}  // namespace crash_reporter
-added in remote
-  their  100644 2f997fab83f3c1ce2369675c6c75084406e16ae4 electron/common/crash_reporter/crash_reporter.h
-@@ -0,0 +1,57 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_COMMON_CRASH_REPORTER_CRASH_REPORTER_H_
-+#define ELECTRON_COMMON_CRASH_REPORTER_CRASH_REPORTER_H_
-+
-+#include <map>
-+#include <string>
-+#include <utility>
-+#include <vector>
-+
-+#include "base/macros.h"
-+
-+namespace crash_reporter {
-+
-+class CrashReporter {
-+ public:
-+  typedef std::map<std::string, std::string> StringMap;
-+  typedef std::pair<int, std::string> UploadReportResult;  // upload-date, id
-+
-+  static CrashReporter* GetInstance();
-+
-+  void Start(const std::string& product_name,
-+             const std::string& company_name,
-+             const std::string& submit_url,
-+             bool auto_submit,
-+             bool skip_system_crash_handler,
-+             const StringMap& extra_parameters);
-+
-+  virtual std::vector<CrashReporter::UploadReportResult> GetUploadedReports(
-+      const std::string& path);
-+
-+ protected:
-+  CrashReporter();
-+  virtual ~CrashReporter();
-+
-+  virtual void InitBreakpad(const std::string& product_name,
-+                            const std::string& version,
-+                            const std::string& company_name,
-+                            const std::string& submit_url,
-+                            bool auto_submit,
-+                            bool skip_system_crash_handler);
-+  virtual void SetUploadParameters();
-+
-+  StringMap upload_parameters_;
-+  bool is_browser_;
-+
-+ private:
-+  void SetUploadParameters(const StringMap& parameters);
-+
-+  DISALLOW_COPY_AND_ASSIGN(CrashReporter);
-+};
-+
-+}  // namespace crash_reporter
-+
-+#endif  // ELECTRON_COMMON_CRASH_REPORTER_CRASH_REPORTER_H_
-added in remote
-  their  100644 d9a5463a965604dface5a0056d12eb54bdcf0d4d electron/common/crash_reporter/crash_reporter_linux.cc
-@@ -0,0 +1,141 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/common/crash_reporter/crash_reporter_linux.h"
-+
-+#include <sys/time.h>
-+#include <unistd.h>
-+
-+#include <string>
-+
-+#include "base/debug/crash_logging.h"
-+#include "base/files/file_path.h"
-+#include "base/files/file_util.h"
-+#include "base/linux_util.h"
-+#include "base/logging.h"
-+#include "base/process/memory.h"
-+#include "base/memory/singleton.h"
-+#include "base/strings/stringprintf.h"
-+#include "vendor/breakpad/src/client/linux/handler/exception_handler.h"
-+#include "vendor/breakpad/src/common/linux/linux_libc_support.h"
-+
-+using google_breakpad::ExceptionHandler;
-+using google_breakpad::MinidumpDescriptor;
-+
-+namespace crash_reporter {
-+
-+namespace {
-+
-+static const size_t kDistroSize = 128;
-+
-+// Define a preferred limit on minidump sizes, because Crash Server currently
-+// throws away any larger than 1.2MB (1.2 * 1024 * 1024).  A value of -1 means
-+// no limit.
-+static const off_t kMaxMinidumpFileSize = 1258291;
-+
-+}  // namespace
-+
-+CrashReporterLinux::CrashReporterLinux()
-+    : process_start_time_(0),
-+      pid_(getpid()) {
-+  // Set the base process start time value.
-+  struct timeval tv;
-+  if (!gettimeofday(&tv, NULL)) {
-+    uint64_t ret = tv.tv_sec;
-+    ret *= 1000;
-+    ret += tv.tv_usec / 1000;
-+    process_start_time_ = ret;
-+  }
-+
-+  // Make base::g_linux_distro work.
-+  base::SetLinuxDistro(base::GetLinuxDistro());
-+}
-+
-+CrashReporterLinux::~CrashReporterLinux() {
-+}
-+
-+void CrashReporterLinux::InitBreakpad(const std::string& product_name,
-+                                      const std::string& version,
-+                                      const std::string& company_name,
-+                                      const std::string& submit_url,
-+                                      bool auto_submit,
-+                                      bool skip_system_crash_handler) {
-+  EnableCrashDumping(product_name);
-+
-+  crash_keys_.SetKeyValue("prod", ELECTRON_PRODUCT_NAME);
-+  crash_keys_.SetKeyValue("ver", version.c_str());
-+  upload_url_ = submit_url;
-+
-+  for (StringMap::const_iterator iter = upload_parameters_.begin();
-+       iter != upload_parameters_.end(); ++iter)
-+    crash_keys_.SetKeyValue(iter->first.c_str(), iter->second.c_str());
-+}
-+
-+void CrashReporterLinux::SetUploadParameters() {
-+  upload_parameters_["platform"] = "linux";
-+}
-+
-+void CrashReporterLinux::EnableCrashDumping(const std::string& product_name) {
-+  std::string dump_dir = "/tmp/" + product_name + " Crashes";
-+  base::FilePath dumps_path(dump_dir);
-+  base::CreateDirectory(dumps_path);
-+
-+  std::string log_file = base::StringPrintf(
-+      "%s/%s", dump_dir.c_str(), "uploads.log");
-+  strncpy(g_crash_log_path, log_file.c_str(), sizeof(g_crash_log_path));
-+
-+  MinidumpDescriptor minidump_descriptor(dumps_path.value());
-+  minidump_descriptor.set_size_limit(kMaxMinidumpFileSize);
-+
-+  breakpad_.reset(new ExceptionHandler(
-+      minidump_descriptor,
-+      NULL,
-+      CrashDone,
-+      this,
-+      true,  // Install handlers.
-+      -1));
-+}
-+
-+bool CrashReporterLinux::CrashDone(const MinidumpDescriptor& minidump,
-+                                   void* context,
-+                                   const bool succeeded) {
-+  CrashReporterLinux* self = static_cast<CrashReporterLinux*>(context);
-+
-+  // WARNING: this code runs in a compromised context. It may not call into
-+  // libc nor allocate memory normally.
-+  if (!succeeded) {
-+    const char msg[] = "Failed to generate minidump.";
-+    WriteLog(msg, sizeof(msg) - 1);
-+    return false;
-+  }
-+
-+  DCHECK(!minidump.IsFD());
-+
-+  BreakpadInfo info = {0};
-+  info.filename = minidump.path();
-+  info.fd = minidump.fd();
-+  info.distro = base::g_linux_distro;
-+  info.distro_length = my_strlen(base::g_linux_distro);
-+  info.upload = true;
-+  info.process_start_time = self->process_start_time_;
-+  info.oom_size = base::g_oom_size;
-+  info.pid = self->pid_;
-+  info.upload_url = self->upload_url_.c_str();
-+  info.crash_keys = &self->crash_keys_;
-+  HandleCrashDump(info);
-+  return true;
-+}
-+
-+// static
-+CrashReporterLinux* CrashReporterLinux::GetInstance() {
-+  return base::Singleton<CrashReporterLinux>::get();
-+}
-+
-+// static
-+CrashReporter* CrashReporter::GetInstance() {
-+  return CrashReporterLinux::GetInstance();
-+}
-+
-+}  // namespace crash_reporter
-added in remote
-  their  100644 3378b248088f28978fc91f8a305cf7aa7c5e51ab electron/common/crash_reporter/crash_reporter_linux.h
-@@ -0,0 +1,61 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_COMMON_CRASH_REPORTER_CRASH_REPORTER_LINUX_H_
-+#define ELECTRON_COMMON_CRASH_REPORTER_CRASH_REPORTER_LINUX_H_
-+
-+#include <string>
-+
-+#include "electron/common/crash_reporter/crash_reporter.h"
-+#include "electron/common/crash_reporter/linux/crash_dump_handler.h"
-+#include "base/compiler_specific.h"
-+#include "base/memory/scoped_ptr.h"
-+
-+namespace base {
-+template <typename T> struct DefaultSingletonTraits;
-+}
-+
-+namespace google_breakpad {
-+class ExceptionHandler;
-+class MinidumpDescriptor;
-+}
-+
-+namespace crash_reporter {
-+
-+class CrashReporterLinux : public CrashReporter {
-+ public:
-+  static CrashReporterLinux* GetInstance();
-+
-+  void InitBreakpad(const std::string& product_name,
-+                    const std::string& version,
-+                    const std::string& company_name,
-+                    const std::string& submit_url,
-+                    bool auto_submit,
-+                    bool skip_system_crash_handler) override;
-+  void SetUploadParameters() override;
-+
-+ private:
-+  friend struct base::DefaultSingletonTraits<CrashReporterLinux>;
-+
-+  CrashReporterLinux();
-+  virtual ~CrashReporterLinux();
-+
-+  void EnableCrashDumping(const std::string& product_name);
-+
-+  static bool CrashDone(const google_breakpad::MinidumpDescriptor& minidump,
-+                        void* context,
-+                        const bool succeeded);
-+
-+  scoped_ptr<google_breakpad::ExceptionHandler> breakpad_;
-+  CrashKeyStorage crash_keys_;
-+
-+  uint64_t process_start_time_;
-+  pid_t pid_;
-+  std::string upload_url_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(CrashReporterLinux);
-+};
-+}  // namespace crash_reporter
-+
-+#endif  // ELECTRON_COMMON_CRASH_REPORTER_CRASH_REPORTER_LINUX_H_
-added in remote
-  their  100644 de92f09c9e24cabe515c54227815d225c91ad1fd electron/common/crash_reporter/crash_reporter_mac.h
-@@ -0,0 +1,55 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_COMMON_CRASH_REPORTER_CRASH_REPORTER_MAC_H_
-+#define ELECTRON_COMMON_CRASH_REPORTER_CRASH_REPORTER_MAC_H_
-+
-+#include <string>
-+#include <vector>
-+
-+#include "electron/common/crash_reporter/crash_reporter.h"
-+#include "base/compiler_specific.h"
-+#include "base/memory/scoped_ptr.h"
-+#include "base/strings/string_piece.h"
-+#include "vendor/crashpad/client/simple_string_dictionary.h"
-+
-+namespace base {
-+template <typename T> struct DefaultSingletonTraits;
-+}
-+
-+namespace crash_reporter {
-+
-+class CrashReporterMac : public CrashReporter {
-+ public:
-+  static CrashReporterMac* GetInstance();
-+
-+  void InitBreakpad(const std::string& product_name,
-+                    const std::string& version,
-+                    const std::string& company_name,
-+                    const std::string& submit_url,
-+                    bool auto_submit,
-+                    bool skip_system_crash_handler) override;
-+  void SetUploadParameters() override;
-+
-+ private:
-+  friend struct base::DefaultSingletonTraits<CrashReporterMac>;
-+
-+  CrashReporterMac();
-+  virtual ~CrashReporterMac();
-+
-+  void SetUploadsEnabled(bool enable_uploads);
-+  void SetCrashKeyValue(const base::StringPiece& key,
-+                        const base::StringPiece& value);
-+
-+  std::vector<UploadReportResult> GetUploadedReports(
-+      const std::string& path) override;
-+
-+  scoped_ptr<crashpad::SimpleStringDictionary> simple_string_dictionary_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(CrashReporterMac);
-+};
-+
-+}  // namespace crash_reporter
-+
-+#endif  // ELECTRON_COMMON_CRASH_REPORTER_CRASH_REPORTER_MAC_H_
-added in remote
-  their  100644 4ecbc5472a0397227e8be8f816ded73b41a681e2 electron/common/crash_reporter/crash_reporter_mac.mm
-@@ -0,0 +1,138 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/common/crash_reporter/crash_reporter_mac.h"
-+
-+#include "base/files/file_path.h"
-+#include "base/files/file_util.h"
-+#include "base/mac/bundle_locations.h"
-+#include "base/mac/mac_util.h"
-+#include "base/memory/singleton.h"
-+#include "base/strings/string_piece.h"
-+#include "base/strings/stringprintf.h"
-+#include "base/strings/sys_string_conversions.h"
-+#include "vendor/crashpad/client/crash_report_database.h"
-+#include "vendor/crashpad/client/crashpad_client.h"
-+#include "vendor/crashpad/client/crashpad_info.h"
-+#include "vendor/crashpad/client/settings.h"
-+
-+namespace crash_reporter {
-+
-+CrashReporterMac::CrashReporterMac() {
-+}
-+
-+CrashReporterMac::~CrashReporterMac() {
-+}
-+
-+void CrashReporterMac::InitBreakpad(const std::string& product_name,
-+                                    const std::string& version,
-+                                    const std::string& company_name,
-+                                    const std::string& submit_url,
-+                                    bool auto_submit,
-+                                    bool skip_system_crash_handler) {
-+  // check whether crashpad has been initilized.
-+  // Only need to initilize once.
-+  if (simple_string_dictionary_)
-+    return;
-+
-+  std::string dump_dir = "/tmp/" + product_name + " Crashes";
-+  base::FilePath database_path(dump_dir);
-+  if (is_browser_) {
-+    @autoreleasepool {
-+      base::FilePath framework_bundle_path = base::mac::FrameworkBundlePath();
-+      base::FilePath handler_path =
-+          framework_bundle_path.Append("Resources").Append("crashpad_handler");
-+
-+      crashpad::CrashpadClient crashpad_client;
-+      if (crashpad_client.StartHandler(handler_path, database_path,
-+                                       submit_url,
-+                                       StringMap(),
-+                                       std::vector<std::string>(),
-+                                       true)) {
-+        crashpad_client.UseHandler();
-+      }
-+    }  // @autoreleasepool
-+  }
-+
-+  crashpad::CrashpadInfo* crashpad_info =
-+      crashpad::CrashpadInfo::GetCrashpadInfo();
-+  if (skip_system_crash_handler) {
-+    crashpad_info->set_system_crash_reporter_forwarding(
-+        crashpad::TriState::kDisabled);
-+  }
-+
-+  simple_string_dictionary_.reset(new crashpad::SimpleStringDictionary());
-+  crashpad_info->set_simple_annotations(simple_string_dictionary_.get());
-+
-+  SetCrashKeyValue("prod", ELECTRON_PRODUCT_NAME);
-+  SetCrashKeyValue("process_type", is_browser_ ? "browser" : "renderer");
-+  SetCrashKeyValue("ver", version);
-+
-+  for (const auto& upload_parameter: upload_parameters_) {
-+    SetCrashKeyValue(upload_parameter.first, upload_parameter.second);
-+  }
-+  if (is_browser_) {
-+    scoped_ptr<crashpad::CrashReportDatabase> database =
-+        crashpad::CrashReportDatabase::Initialize(database_path);
-+    if (database) {
-+      database->GetSettings()->SetUploadsEnabled(auto_submit);
-+    }
-+  }
-+}
-+
-+void CrashReporterMac::SetUploadParameters() {
-+  upload_parameters_["platform"] = "darwin";
-+}
-+
-+void CrashReporterMac::SetCrashKeyValue(const base::StringPiece& key,
-+                                        const base::StringPiece& value) {
-+  simple_string_dictionary_->SetKeyValue(key.data(), value.data());
-+}
-+
-+std::vector<CrashReporter::UploadReportResult>
-+CrashReporterMac::GetUploadedReports(const std::string& path) {
-+  std::vector<CrashReporter::UploadReportResult> uploaded_reports;
-+
-+  base::FilePath file_path(path);
-+  if (!base::PathExists(file_path)) {
-+    return uploaded_reports;
-+  }
-+  // Load crashpad database.
-+  scoped_ptr<crashpad::CrashReportDatabase> database =
-+    crashpad::CrashReportDatabase::Initialize(file_path);
-+  DCHECK(database);
-+
-+  std::vector<crashpad::CrashReportDatabase::Report> completed_reports;
-+  crashpad::CrashReportDatabase::OperationStatus status =
-+      database->GetCompletedReports(&completed_reports);
-+  if (status != crashpad::CrashReportDatabase::kNoError) {
-+    return uploaded_reports;
-+  }
-+
-+  for (const crashpad::CrashReportDatabase::Report& completed_report :
-+       completed_reports) {
-+    if (completed_report.uploaded) {
-+      uploaded_reports.push_back(
-+          UploadReportResult(static_cast<int>(completed_report.creation_time),
-+                             completed_report.id));
-+    }
-+  }
-+
-+  auto sort_by_time = [](const UploadReportResult& a,
-+      const UploadReportResult& b) {return a.first >= b.first;};
-+  std::sort(uploaded_reports.begin(), uploaded_reports.end(), sort_by_time);
-+  return uploaded_reports;
-+}
-+
-+// static
-+CrashReporterMac* CrashReporterMac::GetInstance() {
-+  return base::Singleton<CrashReporterMac>::get();
-+}
-+
-+// static
-+CrashReporter* CrashReporter::GetInstance() {
-+  return CrashReporterMac::GetInstance();
-+}
-+
-+}  // namespace crash_reporter
-added in remote
-  their  100644 0fd6ef32731daa9f760980acf673fe94d2eb2e50 electron/common/crash_reporter/crash_reporter_win.cc
-@@ -0,0 +1,270 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/common/crash_reporter/crash_reporter_win.h"
-+
-+#include <string>
-+
-+#include "base/files/file_util.h"
-+#include "base/logging.h"
-+#include "base/memory/singleton.h"
-+#include "base/strings/string_util.h"
-+#include "base/strings/utf_string_conversions.h"
-+#include "content/public/common/result_codes.h"
-+#include "gin/public/debug.h"
-+#include "sandbox/win/src/nt_internals.h"
-+
-+#pragma intrinsic(_AddressOfReturnAddress)
-+#pragma intrinsic(_ReturnAddress)
-+
-+#ifdef _WIN64
-+// See http://msdn.microsoft.com/en-us/library/ddssxxy8.aspx
-+typedef struct _UNWIND_INFO {
-+  unsigned char Version : 3;
-+  unsigned char Flags : 5;
-+  unsigned char SizeOfProlog;
-+  unsigned char CountOfCodes;
-+  unsigned char FrameRegister : 4;
-+  unsigned char FrameOffset : 4;
-+  ULONG ExceptionHandler;
-+} UNWIND_INFO, *PUNWIND_INFO;
-+#endif
-+
-+namespace crash_reporter {
-+
-+namespace {
-+
-+// Minidump with stacks, PEB, TEB, and unloaded module list.
-+const MINIDUMP_TYPE kSmallDumpType = static_cast<MINIDUMP_TYPE>(
-+    MiniDumpWithProcessThreadData |  // Get PEB and TEB.
-+    MiniDumpWithUnloadedModules);  // Get unloaded modules when available.
-+
-+const wchar_t kWaitEventFormat[] = L"$1CrashServiceWaitEvent";
-+const wchar_t kPipeNameFormat[] = L"\\\\.\\pipe\\$1 Crash Service";
-+
-+typedef NTSTATUS (WINAPI* NtTerminateProcessPtr)(HANDLE ProcessHandle,
-+                                                 NTSTATUS ExitStatus);
-+char* g_real_terminate_process_stub = NULL;
-+
-+void TerminateProcessWithoutDump() {
-+  // Patched stub exists based on conditions (See InitCrashReporter).
-+  // As a side note this function also gets called from
-+  // WindowProcExceptionFilter.
-+  if (g_real_terminate_process_stub == NULL) {
-+    ::TerminateProcess(::GetCurrentProcess(), content::RESULT_CODE_KILLED);
-+  } else {
-+    NtTerminateProcessPtr real_terminate_proc =
-+        reinterpret_cast<NtTerminateProcessPtr>(
-+            static_cast<char*>(g_real_terminate_process_stub));
-+    real_terminate_proc(::GetCurrentProcess(), content::RESULT_CODE_KILLED);
-+  }
-+}
-+
-+#ifdef _WIN64
-+int CrashForExceptionInNonABICompliantCodeRange(
-+    PEXCEPTION_RECORD ExceptionRecord,
-+    ULONG64 EstablisherFrame,
-+    PCONTEXT ContextRecord,
-+    PDISPATCHER_CONTEXT DispatcherContext) {
-+  EXCEPTION_POINTERS info = { ExceptionRecord, ContextRecord };
-+  if (!CrashReporter::GetInstance())
-+    return EXCEPTION_CONTINUE_SEARCH;
-+  return static_cast<CrashReporterWin*>(CrashReporter::GetInstance())->
-+      CrashForException(&info);
-+}
-+
-+struct ExceptionHandlerRecord {
-+  RUNTIME_FUNCTION runtime_function;
-+  UNWIND_INFO unwind_info;
-+  unsigned char thunk[12];
-+};
-+
-+bool RegisterNonABICompliantCodeRange(void* start, size_t size_in_bytes) {
-+  ExceptionHandlerRecord* record =
-+      reinterpret_cast<ExceptionHandlerRecord*>(start);
-+
-+  // We assume that the first page of the code range is executable and
-+  // committed and reserved for breakpad. What could possibly go wrong?
-+
-+  // All addresses are 32bit relative offsets to start.
-+  record->runtime_function.BeginAddress = 0;
-+  record->runtime_function.EndAddress =
-+      base::checked_cast<DWORD>(size_in_bytes);
-+  record->runtime_function.UnwindData =
-+      offsetof(ExceptionHandlerRecord, unwind_info);
-+
-+  // Create unwind info that only specifies an exception handler.
-+  record->unwind_info.Version = 1;
-+  record->unwind_info.Flags = UNW_FLAG_EHANDLER;
-+  record->unwind_info.SizeOfProlog = 0;
-+  record->unwind_info.CountOfCodes = 0;
-+  record->unwind_info.FrameRegister = 0;
-+  record->unwind_info.FrameOffset = 0;
-+  record->unwind_info.ExceptionHandler =
-+      offsetof(ExceptionHandlerRecord, thunk);
-+
-+  // Hardcoded thunk.
-+  // mov imm64, rax
-+  record->thunk[0] = 0x48;
-+  record->thunk[1] = 0xb8;
-+  void* handler = &CrashForExceptionInNonABICompliantCodeRange;
-+  memcpy(&record->thunk[2], &handler, 8);
-+
-+  // jmp rax
-+  record->thunk[10] = 0xff;
-+  record->thunk[11] = 0xe0;
-+
-+  // Protect reserved page against modifications.
-+  DWORD old_protect;
-+  return VirtualProtect(start, sizeof(ExceptionHandlerRecord),
-+                        PAGE_EXECUTE_READ, &old_protect) &&
-+         RtlAddFunctionTable(&record->runtime_function, 1,
-+                             reinterpret_cast<DWORD64>(start));
-+}
-+
-+void UnregisterNonABICompliantCodeRange(void* start) {
-+  ExceptionHandlerRecord* record =
-+      reinterpret_cast<ExceptionHandlerRecord*>(start);
-+
-+  RtlDeleteFunctionTable(&record->runtime_function);
-+}
-+#endif  // _WIN64
-+
-+}  // namespace
-+
-+CrashReporterWin::CrashReporterWin() {
-+}
-+
-+CrashReporterWin::~CrashReporterWin() {
-+}
-+
-+void CrashReporterWin::InitBreakpad(const std::string& product_name,
-+                                    const std::string& version,
-+                                    const std::string& company_name,
-+                                    const std::string& submit_url,
-+                                    bool auto_submit,
-+                                    bool skip_system_crash_handler) {
-+  skip_system_crash_handler_ = skip_system_crash_handler;
-+
-+  base::FilePath temp_dir;
-+  if (!base::GetTempDir(&temp_dir)) {
-+    LOG(ERROR) << "Cannot get temp directory";
-+    return;
-+  }
-+
-+  base::string16 pipe_name = base::ReplaceStringPlaceholders(
-+      kPipeNameFormat, base::UTF8ToUTF16(product_name), NULL);
-+  base::string16 wait_name = base::ReplaceStringPlaceholders(
-+      kWaitEventFormat, base::UTF8ToUTF16(product_name), NULL);
-+
-+  // Wait until the crash service is started.
-+  HANDLE wait_event = ::CreateEventW(NULL, TRUE, FALSE, wait_name.c_str());
-+  if (wait_event != NULL) {
-+    WaitForSingleObject(wait_event, 1000);
-+    CloseHandle(wait_event);
-+  }
-+
-+  // ExceptionHandler() attaches our handler and ~ExceptionHandler() detaches
-+  // it, so we must explicitly reset *before* we instantiate our new handler
-+  // to allow any previous handler to detach in the correct order.
-+  breakpad_.reset();
-+
-+  breakpad_.reset(new google_breakpad::ExceptionHandler(
-+      temp_dir.value(),
-+      FilterCallback,
-+      MinidumpCallback,
-+      this,
-+      google_breakpad::ExceptionHandler::HANDLER_ALL,
-+      kSmallDumpType,
-+      pipe_name.c_str(),
-+      GetCustomInfo(product_name, version, company_name)));
-+
-+  if (!breakpad_->IsOutOfProcess())
-+    LOG(ERROR) << "Cannot initialize out-of-process crash handler";
-+
-+#ifdef _WIN64
-+  bool registered = false;
-+  // Hook up V8 to breakpad.
-+  {
-+    // gin::Debug::SetCodeRangeCreatedCallback only runs the callback when
-+    // Isolate is just created, so we have to manually run following code here.
-+    void* code_range = nullptr;
-+    size_t size = 0;
-+    v8::Isolate::GetCurrent()->GetCodeRange(&code_range, &size);
-+    if (code_range && size)
-+      registered = RegisterNonABICompliantCodeRange(code_range, size);
-+  }
-+  if (registered)
-+    gin::Debug::SetCodeRangeDeletedCallback(UnregisterNonABICompliantCodeRange);
-+#endif
-+}
-+
-+void CrashReporterWin::SetUploadParameters() {
-+  upload_parameters_["platform"] = "win32";
-+}
-+
-+int CrashReporterWin::CrashForException(EXCEPTION_POINTERS* info) {
-+  if (breakpad_) {
-+    breakpad_->WriteMinidumpForException(info);
-+    TerminateProcessWithoutDump();
-+  }
-+  return EXCEPTION_CONTINUE_SEARCH;
-+}
-+
-+// static
-+bool CrashReporterWin::FilterCallback(void* context,
-+                                      EXCEPTION_POINTERS* exinfo,
-+                                      MDRawAssertionInfo* assertion) {
-+  return true;
-+}
-+
-+// static
-+bool CrashReporterWin::MinidumpCallback(const wchar_t* dump_path,
-+                                        const wchar_t* minidump_id,
-+                                        void* context,
-+                                        EXCEPTION_POINTERS* exinfo,
-+                                        MDRawAssertionInfo* assertion,
-+                                        bool succeeded) {
-+  CrashReporterWin* self = static_cast<CrashReporterWin*>(context);
-+  if (succeeded && !self->skip_system_crash_handler_)
-+    return true;
-+  else
-+    return false;
-+}
-+
-+google_breakpad::CustomClientInfo* CrashReporterWin::GetCustomInfo(
-+    const std::string& product_name,
-+    const std::string& version,
-+    const std::string& company_name) {
-+  custom_info_entries_.clear();
-+  custom_info_entries_.reserve(2 + upload_parameters_.size());
-+
-+  custom_info_entries_.push_back(google_breakpad::CustomInfoEntry(
-+      L"prod", L"Electron"));
-+  custom_info_entries_.push_back(google_breakpad::CustomInfoEntry(
-+      L"ver", base::UTF8ToWide(version).c_str()));
-+
-+  for (StringMap::const_iterator iter = upload_parameters_.begin();
-+       iter != upload_parameters_.end(); ++iter) {
-+    custom_info_entries_.push_back(google_breakpad::CustomInfoEntry(
-+        base::UTF8ToWide(iter->first).c_str(),
-+        base::UTF8ToWide(iter->second).c_str()));
-+  }
-+
-+  custom_info_.entries = &custom_info_entries_.front();
-+  custom_info_.count = custom_info_entries_.size();
-+  return &custom_info_;
-+}
-+
-+// static
-+CrashReporterWin* CrashReporterWin::GetInstance() {
-+  return base::Singleton<CrashReporterWin>::get();
-+}
-+
-+// static
-+CrashReporter* CrashReporter::GetInstance() {
-+  return CrashReporterWin::GetInstance();
-+}
-+
-+}  // namespace crash_reporter
-added in remote
-  their  100644 c0a00afca62ce8c01149aa66dd8f18ac4ffbac73 electron/common/crash_reporter/crash_reporter_win.h
-@@ -0,0 +1,72 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_COMMON_CRASH_REPORTER_CRASH_REPORTER_WIN_H_
-+#define ELECTRON_COMMON_CRASH_REPORTER_CRASH_REPORTER_WIN_H_
-+
-+#include <string>
-+#include <vector>
-+
-+#include "electron/common/crash_reporter/crash_reporter.h"
-+#include "base/compiler_specific.h"
-+#include "base/memory/scoped_ptr.h"
-+#include "vendor/breakpad/src/client/windows/handler/exception_handler.h"
-+
-+namespace base {
-+template <typename T> struct DefaultSingletonTraits;
-+}
-+
-+namespace crash_reporter {
-+
-+class CrashReporterWin : public CrashReporter {
-+ public:
-+  static CrashReporterWin* GetInstance();
-+
-+  void InitBreakpad(const std::string& product_name,
-+                    const std::string& version,
-+                    const std::string& company_name,
-+                    const std::string& submit_url,
-+                    bool auto_submit,
-+                    bool skip_system_crash_handler) override;
-+  void SetUploadParameters() override;
-+
-+  // Crashes the process after generating a dump for the provided exception.
-+  int CrashForException(EXCEPTION_POINTERS* info);
-+
-+ private:
-+  friend struct base::DefaultSingletonTraits<CrashReporterWin>;
-+
-+  CrashReporterWin();
-+  virtual ~CrashReporterWin();
-+
-+  static bool FilterCallback(void* context,
-+                             EXCEPTION_POINTERS* exinfo,
-+                             MDRawAssertionInfo* assertion);
-+
-+  static bool MinidumpCallback(const wchar_t* dump_path,
-+                               const wchar_t* minidump_id,
-+                               void* context,
-+                               EXCEPTION_POINTERS* exinfo,
-+                               MDRawAssertionInfo* assertion,
-+                               bool succeeded);
-+
-+  // Returns the custom info structure based on parameters.
-+  google_breakpad::CustomClientInfo* GetCustomInfo(
-+      const std::string& product_name,
-+      const std::string& version,
-+      const std::string& company_name);
-+
-+  // Custom information to be passed to crash handler.
-+  std::vector<google_breakpad::CustomInfoEntry> custom_info_entries_;
-+  google_breakpad::CustomClientInfo custom_info_;
-+
-+  bool skip_system_crash_handler_;
-+  scoped_ptr<google_breakpad::ExceptionHandler> breakpad_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(CrashReporterWin);
-+};
-+
-+}  // namespace crash_reporter
-+
-+#endif  // ELECTRON_COMMON_CRASH_REPORTER_CRASH_REPORTER_WIN_H_
-added in remote
-  their  100644 736ab5e849adbb932a37183a66a396628507cade electron/common/crash_reporter/linux/crash_dump_handler.cc
-@@ -0,0 +1,746 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+// For linux_syscall_support.h. This makes it safe to call embedded system
-+// calls when in seccomp mode.
-+
-+#include "electron/common/crash_reporter/linux/crash_dump_handler.h"
-+
-+#include <poll.h>
-+
-+#include <algorithm>
-+
-+#include "base/posix/eintr_wrapper.h"
-+#include "vendor/breakpad/src/client/linux/minidump_writer/directory_reader.h"
-+#include "vendor/breakpad/src/common/linux/linux_libc_support.h"
-+#include "vendor/breakpad/src/common/memory.h"
-+
-+#include "third_party/lss/linux_syscall_support.h"
-+
-+// Some versions of gcc are prone to warn about unused return values. In cases
-+// where we either a) know the call cannot fail, or b) there is nothing we
-+// can do when a call fails, we mark the return code as ignored. This avoids
-+// spurious compiler warnings.
-+#define IGNORE_RET(x) do { if (x); } while (0)
-+
-+namespace crash_reporter {
-+
-+namespace {
-+
-+// String buffer size to use to convert a uint64_t to string.
-+const size_t kUint64StringSize = 21;
-+
-+// Writes the value |v| as 16 hex characters to the memory pointed at by
-+// |output|.
-+void write_uint64_hex(char* output, uint64_t v) {
-+  static const char hextable[] = "0123456789abcdef";
-+
-+  for (int i = 15; i >= 0; --i) {
-+    output[i] = hextable[v & 15];
-+    v >>= 4;
-+  }
-+}
-+
-+// uint64_t version of my_int_len() from
-+// breakpad/src/common/linux/linux_libc_support.h. Return the length of the
-+// given, non-negative integer when expressed in base 10.
-+unsigned my_uint64_len(uint64_t i) {
-+  if (!i)
-+    return 1;
-+
-+  unsigned len = 0;
-+  while (i) {
-+    len++;
-+    i /= 10;
-+  }
-+
-+  return len;
-+}
-+
-+// uint64_t version of my_uitos() from
-+// breakpad/src/common/linux/linux_libc_support.h. Convert a non-negative
-+// integer to a string (not null-terminated).
-+void my_uint64tos(char* output, uint64_t i, unsigned i_len) {
-+  for (unsigned index = i_len; index; --index, i /= 10)
-+    output[index - 1] = '0' + (i % 10);
-+}
-+
-+// Converts a struct timeval to milliseconds.
-+uint64_t kernel_timeval_to_ms(struct kernel_timeval *tv) {
-+  uint64_t ret = tv->tv_sec;  // Avoid overflow by explicitly using a uint64_t.
-+  ret *= 1000;
-+  ret += tv->tv_usec / 1000;
-+  return ret;
-+}
-+
-+bool my_isxdigit(char c) {
-+  return (c >= '0' && c <= '9') || ((c | 0x20) >= 'a' && (c | 0x20) <= 'f');
-+}
-+
-+size_t LengthWithoutTrailingSpaces(const char* str, size_t len) {
-+  while (len > 0 && str[len - 1] == ' ') {
-+    len--;
-+  }
-+  return len;
-+}
-+
-+// MIME substrings.
-+const char g_rn[] = "\r\n";
-+const char g_form_data_msg[] = "Content-Disposition: form-data; name=\"";
-+const char g_quote_msg[] = "\"";
-+const char g_dashdash_msg[] = "--";
-+const char g_dump_msg[] = "upload_file_minidump\"; filename=\"dump\"";
-+const char g_content_type_msg[] = "Content-Type: application/octet-stream";
-+
-+// MimeWriter manages an iovec for writing MIMEs to a file.
-+class MimeWriter {
-+ public:
-+  static const int kIovCapacity = 30;
-+  static const size_t kMaxCrashChunkSize = 64;
-+
-+  MimeWriter(int fd, const char* const mime_boundary);
-+  ~MimeWriter();
-+
-+  // Append boundary.
-+  virtual void AddBoundary();
-+
-+  // Append end of file boundary.
-+  virtual void AddEnd();
-+
-+  // Append key/value pair with specified sizes.
-+  virtual void AddPairData(const char* msg_type,
-+                           size_t msg_type_size,
-+                           const char* msg_data,
-+                           size_t msg_data_size);
-+
-+  // Append key/value pair.
-+  void AddPairString(const char* msg_type,
-+                     const char* msg_data) {
-+    AddPairData(msg_type, my_strlen(msg_type), msg_data, my_strlen(msg_data));
-+  }
-+
-+  // Append key/value pair, splitting value into chunks no larger than
-+  // |chunk_size|. |chunk_size| cannot be greater than |kMaxCrashChunkSize|.
-+  // The msg_type string will have a counter suffix to distinguish each chunk.
-+  virtual void AddPairDataInChunks(const char* msg_type,
-+                                   size_t msg_type_size,
-+                                   const char* msg_data,
-+                                   size_t msg_data_size,
-+                                   size_t chunk_size,
-+                                   bool strip_trailing_spaces);
-+
-+  // Add binary file contents to be uploaded with the specified filename.
-+  virtual void AddFileContents(const char* filename_msg,
-+                               uint8_t* file_data,
-+                               size_t file_size);
-+
-+  // Flush any pending iovecs to the output file.
-+  void Flush() {
-+    IGNORE_RET(sys_writev(fd_, iov_, iov_index_));
-+    iov_index_ = 0;
-+  }
-+
-+ protected:
-+  void AddItem(const void* base, size_t size);
-+  // Minor performance trade-off for easier-to-maintain code.
-+  void AddString(const char* str) {
-+    AddItem(str, my_strlen(str));
-+  }
-+  void AddItemWithoutTrailingSpaces(const void* base, size_t size);
-+
-+  struct kernel_iovec iov_[kIovCapacity];
-+  int iov_index_;
-+
-+  // Output file descriptor.
-+  int fd_;
-+
-+  const char* const mime_boundary_;
-+
-+ private:
-+  DISALLOW_COPY_AND_ASSIGN(MimeWriter);
-+};
-+
-+MimeWriter::MimeWriter(int fd, const char* const mime_boundary)
-+    : iov_index_(0),
-+      fd_(fd),
-+      mime_boundary_(mime_boundary) {
-+}
-+
-+MimeWriter::~MimeWriter() {
-+}
-+
-+void MimeWriter::AddBoundary() {
-+  AddString(mime_boundary_);
-+  AddString(g_rn);
-+}
-+
-+void MimeWriter::AddEnd() {
-+  AddString(mime_boundary_);
-+  AddString(g_dashdash_msg);
-+  AddString(g_rn);
-+}
-+
-+void MimeWriter::AddPairData(const char* msg_type,
-+                             size_t msg_type_size,
-+                             const char* msg_data,
-+                             size_t msg_data_size) {
-+  AddString(g_form_data_msg);
-+  AddItem(msg_type, msg_type_size);
-+  AddString(g_quote_msg);
-+  AddString(g_rn);
-+  AddString(g_rn);
-+  AddItem(msg_data, msg_data_size);
-+  AddString(g_rn);
-+}
-+
-+void MimeWriter::AddPairDataInChunks(const char* msg_type,
-+                                     size_t msg_type_size,
-+                                     const char* msg_data,
-+                                     size_t msg_data_size,
-+                                     size_t chunk_size,
-+                                     bool strip_trailing_spaces) {
-+  if (chunk_size > kMaxCrashChunkSize)
-+    return;
-+
-+  unsigned i = 0;
-+  size_t done = 0, msg_length = msg_data_size;
-+
-+  while (msg_length) {
-+    char num[kUint64StringSize];
-+    const unsigned num_len = my_uint_len(++i);
-+    my_uitos(num, i, num_len);
-+
-+    size_t chunk_len = std::min(chunk_size, msg_length);
-+
-+    AddString(g_form_data_msg);
-+    AddItem(msg_type, msg_type_size);
-+    AddItem(num, num_len);
-+    AddString(g_quote_msg);
-+    AddString(g_rn);
-+    AddString(g_rn);
-+    if (strip_trailing_spaces) {
-+      AddItemWithoutTrailingSpaces(msg_data + done, chunk_len);
-+    } else {
-+      AddItem(msg_data + done, chunk_len);
-+    }
-+    AddString(g_rn);
-+    AddBoundary();
-+    Flush();
-+
-+    done += chunk_len;
-+    msg_length -= chunk_len;
-+  }
-+}
-+
-+void MimeWriter::AddFileContents(const char* filename_msg, uint8_t* file_data,
-+                                 size_t file_size) {
-+  AddString(g_form_data_msg);
-+  AddString(filename_msg);
-+  AddString(g_rn);
-+  AddString(g_content_type_msg);
-+  AddString(g_rn);
-+  AddString(g_rn);
-+  AddItem(file_data, file_size);
-+  AddString(g_rn);
-+}
-+
-+void MimeWriter::AddItem(const void* base, size_t size) {
-+  // Check if the iovec is full and needs to be flushed to output file.
-+  if (iov_index_ == kIovCapacity) {
-+    Flush();
-+  }
-+  iov_[iov_index_].iov_base = const_cast<void*>(base);
-+  iov_[iov_index_].iov_len = size;
-+  ++iov_index_;
-+}
-+
-+void MimeWriter::AddItemWithoutTrailingSpaces(const void* base, size_t size) {
-+  AddItem(base, LengthWithoutTrailingSpaces(static_cast<const char*>(base),
-+                                            size));
-+}
-+
-+void LoadDataFromFD(google_breakpad::PageAllocator* allocator,
-+                    int fd, bool close_fd, uint8_t** file_data, size_t* size) {
-+  struct kernel_stat st;
-+  if (sys_fstat(fd, &st) != 0) {
-+    static const char msg[] = "Cannot upload crash dump: stat failed\n";
-+    WriteLog(msg, sizeof(msg) - 1);
-+    if (close_fd)
-+      IGNORE_RET(sys_close(fd));
-+    return;
-+  }
-+
-+  *file_data = reinterpret_cast<uint8_t*>(allocator->Alloc(st.st_size));
-+  if (!(*file_data)) {
-+    static const char msg[] = "Cannot upload crash dump: cannot alloc\n";
-+    WriteLog(msg, sizeof(msg) - 1);
-+    if (close_fd)
-+      IGNORE_RET(sys_close(fd));
-+    return;
-+  }
-+  my_memset(*file_data, 0xf, st.st_size);
-+
-+  *size = st.st_size;
-+  int byte_read = sys_read(fd, *file_data, *size);
-+  if (byte_read == -1) {
-+    static const char msg[] = "Cannot upload crash dump: read failed\n";
-+    WriteLog(msg, sizeof(msg) - 1);
-+    if (close_fd)
-+      IGNORE_RET(sys_close(fd));
-+    return;
-+  }
-+
-+  if (close_fd)
-+    IGNORE_RET(sys_close(fd));
-+}
-+
-+void LoadDataFromFile(google_breakpad::PageAllocator* allocator,
-+                      const char* filename,
-+                      int* fd, uint8_t** file_data, size_t* size) {
-+  // WARNING: this code runs in a compromised context. It may not call into
-+  // libc nor allocate memory normally.
-+  *fd = sys_open(filename, O_RDONLY, 0);
-+  *size = 0;
-+
-+  if (*fd < 0) {
-+    static const char msg[] = "Cannot upload crash dump: failed to open\n";
-+    WriteLog(msg, sizeof(msg) - 1);
-+    return;
-+  }
-+
-+  LoadDataFromFD(allocator, *fd, true, file_data, size);
-+}
-+
-+// Spawn the appropriate upload process for the current OS:
-+// - generic Linux invokes wget.
-+// - ChromeOS invokes crash_reporter.
-+// |dumpfile| is the path to the dump data file.
-+// |mime_boundary| is only used on Linux.
-+// |exe_buf| is only used on CrOS and is the crashing process' name.
-+void ExecUploadProcessOrTerminate(const BreakpadInfo& info,
-+                                  const char* dumpfile,
-+                                  const char* mime_boundary,
-+                                  const char* exe_buf,
-+                                  google_breakpad::PageAllocator* allocator) {
-+  // The --header argument to wget looks like:
-+  //   --header=Content-Type: multipart/form-data; boundary=XYZ
-+  // where the boundary has two fewer leading '-' chars
-+  static const char header_msg[] =
-+      "--header=Content-Type: multipart/form-data; boundary=";
-+  char* const header = reinterpret_cast<char*>(allocator->Alloc(
-+      sizeof(header_msg) - 1 + strlen(mime_boundary) - 2 + 1));
-+  memcpy(header, header_msg, sizeof(header_msg) - 1);
-+  memcpy(header + sizeof(header_msg) - 1, mime_boundary + 2,
-+         strlen(mime_boundary) - 2);
-+  // We grab the NUL byte from the end of |mime_boundary|.
-+
-+  // The --post-file argument to wget looks like:
-+  //   --post-file=/tmp/...
-+  static const char post_file_msg[] = "--post-file=";
-+  char* const post_file = reinterpret_cast<char*>(allocator->Alloc(
-+       sizeof(post_file_msg) - 1 + strlen(dumpfile) + 1));
-+  memcpy(post_file, post_file_msg, sizeof(post_file_msg) - 1);
-+  memcpy(post_file + sizeof(post_file_msg) - 1, dumpfile, strlen(dumpfile));
-+
-+  static const char kWgetBinary[] = "/usr/bin/wget";
-+  const char* args[] = {
-+    kWgetBinary,
-+    header,
-+    post_file,
-+    info.upload_url,
-+    "--timeout=60",  // Set a timeout so we don't hang forever.
-+    "--tries=1",     // Don't retry if the upload fails.
-+    "--quiet",       // Be silent.
-+    "-O",            // output reply to /dev/null.
-+    "/dev/fd/3",
-+    NULL,
-+  };
-+  static const char msg[] = "Cannot upload crash dump: cannot exec "
-+                            "/usr/bin/wget\n";
-+  execve(args[0], const_cast<char**>(args), environ);
-+  WriteLog(msg, sizeof(msg) - 1);
-+  sys__exit(1);
-+}
-+
-+// Runs in the helper process to wait for the upload process running
-+// ExecUploadProcessOrTerminate() to finish. Returns the number of bytes written
-+// to |fd| and save the written contents to |buf|.
-+// |buf| needs to be big enough to hold |bytes_to_read| + 1 characters.
-+size_t WaitForCrashReportUploadProcess(int fd, size_t bytes_to_read,
-+                                       char* buf) {
-+  size_t bytes_read = 0;
-+
-+  // Upload should finish in about 10 seconds. Add a few more 500 ms
-+  // internals to account for process startup time.
-+  for (size_t wait_count = 0; wait_count < 24; ++wait_count) {
-+    struct kernel_pollfd poll_fd;
-+    poll_fd.fd = fd;
-+    poll_fd.events = POLLIN | POLLPRI | POLLERR;
-+    int ret = sys_poll(&poll_fd, 1, 500);
-+    if (ret < 0) {
-+      // Error
-+      break;
-+    } else if (ret > 0) {
-+      // There is data to read.
-+      ssize_t len = HANDLE_EINTR(
-+          sys_read(fd, buf + bytes_read, bytes_to_read - bytes_read));
-+      if (len < 0)
-+        break;
-+      bytes_read += len;
-+      if (bytes_read == bytes_to_read)
-+        break;
-+    }
-+    // |ret| == 0 -> timed out, continue waiting.
-+    // or |bytes_read| < |bytes_to_read| still, keep reading.
-+  }
-+  buf[bytes_to_read] = 0;  // Always NUL terminate the buffer.
-+  return bytes_read;
-+}
-+
-+// |buf| should be |expected_len| + 1 characters in size and NULL terminated.
-+bool IsValidCrashReportId(const char* buf, size_t bytes_read,
-+                          size_t expected_len) {
-+  if (bytes_read != expected_len)
-+    return false;
-+  for (size_t i = 0; i < bytes_read; ++i) {
-+    if (!my_isxdigit(buf[i]) && buf[i] != '-')
-+      return false;
-+  }
-+  return true;
-+}
-+
-+// |buf| should be |expected_len| + 1 characters in size and NULL terminated.
-+void HandleCrashReportId(const char* buf, size_t bytes_read,
-+                         size_t expected_len) {
-+  if (!IsValidCrashReportId(buf, bytes_read, expected_len)) {
-+    static const char msg[] = "Failed to get crash dump id.";
-+    WriteLog(msg, sizeof(msg) - 1);
-+    WriteNewline();
-+
-+    static const char id_msg[] = "Report Id: ";
-+    WriteLog(id_msg, sizeof(id_msg) - 1);
-+    WriteLog(buf, bytes_read);
-+    WriteNewline();
-+    return;
-+  }
-+
-+  // Write crash dump id to stderr.
-+  static const char msg[] = "Crash dump id: ";
-+  WriteLog(msg, sizeof(msg) - 1);
-+  WriteLog(buf, my_strlen(buf));
-+  WriteNewline();
-+
-+  // Write crash dump id to crash log as: seconds_since_epoch,crash_id
-+  struct kernel_timeval tv;
-+  if (!sys_gettimeofday(&tv, NULL)) {
-+    uint64_t time = kernel_timeval_to_ms(&tv) / 1000;
-+    char time_str[kUint64StringSize];
-+    const unsigned time_len = my_uint64_len(time);
-+    my_uint64tos(time_str, time, time_len);
-+
-+    const int kLogOpenFlags = O_CREAT | O_WRONLY | O_APPEND | O_CLOEXEC;
-+    int log_fd = sys_open(g_crash_log_path, kLogOpenFlags, 0600);
-+    if (log_fd > 0) {
-+      sys_write(log_fd, time_str, time_len);
-+      sys_write(log_fd, ",", 1);
-+      sys_write(log_fd, buf, my_strlen(buf));
-+      sys_write(log_fd, "\n", 1);
-+      IGNORE_RET(sys_close(log_fd));
-+    }
-+  }
-+}
-+
-+}  // namespace
-+
-+char g_crash_log_path[256];
-+
-+void HandleCrashDump(const BreakpadInfo& info) {
-+  int dumpfd;
-+  bool keep_fd = false;
-+  size_t dump_size;
-+  uint8_t* dump_data;
-+  google_breakpad::PageAllocator allocator;
-+  const char* exe_buf = NULL;
-+
-+  if (info.fd != -1) {
-+    // Dump is provided with an open FD.
-+    keep_fd = true;
-+    dumpfd = info.fd;
-+
-+    // The FD is pointing to the end of the file.
-+    // Rewind, we'll read the data next.
-+    if (lseek(dumpfd, 0, SEEK_SET) == -1) {
-+      static const char msg[] = "Cannot upload crash dump: failed to "
-+          "reposition minidump FD\n";
-+      WriteLog(msg, sizeof(msg) - 1);
-+      IGNORE_RET(sys_close(dumpfd));
-+      return;
-+    }
-+    LoadDataFromFD(&allocator, info.fd, false, &dump_data, &dump_size);
-+  } else {
-+    // Dump is provided with a path.
-+    keep_fd = false;
-+    LoadDataFromFile(
-+        &allocator, info.filename, &dumpfd, &dump_data, &dump_size);
-+  }
-+
-+  // We need to build a MIME block for uploading to the server. Since we are
-+  // going to fork and run wget, it needs to be written to a temp file.
-+  const int ufd = sys_open("/dev/urandom", O_RDONLY, 0);
-+  if (ufd < 0) {
-+    static const char msg[] = "Cannot upload crash dump because /dev/urandom"
-+                              " is missing\n";
-+    WriteLog(msg, sizeof(msg) - 1);
-+    return;
-+  }
-+
-+  static const char temp_file_template[] =
-+      "/tmp/chromium-upload-XXXXXXXXXXXXXXXX";
-+  char temp_file[sizeof(temp_file_template)];
-+  int temp_file_fd = -1;
-+  if (keep_fd) {
-+    temp_file_fd = dumpfd;
-+    // Rewind the destination, we are going to overwrite it.
-+    if (lseek(dumpfd, 0, SEEK_SET) == -1) {
-+      static const char msg[] = "Cannot upload crash dump: failed to "
-+          "reposition minidump FD (2)\n";
-+      WriteLog(msg, sizeof(msg) - 1);
-+      IGNORE_RET(sys_close(dumpfd));
-+      return;
-+    }
-+  } else {
-+    if (info.upload) {
-+      memcpy(temp_file, temp_file_template, sizeof(temp_file_template));
-+
-+      for (unsigned i = 0; i < 10; ++i) {
-+        uint64_t t;
-+        sys_read(ufd, &t, sizeof(t));
-+        write_uint64_hex(temp_file + sizeof(temp_file) - (16 + 1), t);
-+
-+        temp_file_fd = sys_open(temp_file, O_WRONLY | O_CREAT | O_EXCL, 0600);
-+        if (temp_file_fd >= 0)
-+          break;
-+      }
-+
-+      if (temp_file_fd < 0) {
-+        static const char msg[] = "Failed to create temporary file in /tmp: "
-+            "cannot upload crash dump\n";
-+        WriteLog(msg, sizeof(msg) - 1);
-+        IGNORE_RET(sys_close(ufd));
-+        return;
-+      }
-+    } else {
-+      temp_file_fd = sys_open(info.filename, O_WRONLY, 0600);
-+      if (temp_file_fd < 0) {
-+        static const char msg[] = "Failed to save crash dump: failed to open\n";
-+        WriteLog(msg, sizeof(msg) - 1);
-+        IGNORE_RET(sys_close(ufd));
-+        return;
-+      }
-+    }
-+  }
-+
-+  // The MIME boundary is 28 hyphens, followed by a 64-bit nonce and a NUL.
-+  char mime_boundary[28 + 16 + 1];
-+  my_memset(mime_boundary, '-', 28);
-+  uint64_t boundary_rand;
-+  sys_read(ufd, &boundary_rand, sizeof(boundary_rand));
-+  write_uint64_hex(mime_boundary + 28, boundary_rand);
-+  mime_boundary[28 + 16] = 0;
-+  IGNORE_RET(sys_close(ufd));
-+
-+  // The MIME block looks like this:
-+  //   BOUNDARY \r\n
-+  //   Content-Disposition: form-data; name="prod" \r\n \r\n
-+  //   Chrome_Linux \r\n
-+  //   BOUNDARY \r\n
-+  //   Content-Disposition: form-data; name="ver" \r\n \r\n
-+  //   1.2.3.4 \r\n
-+  //   BOUNDARY \r\n
-+  //
-+  //   zero or one:
-+  //   Content-Disposition: form-data; name="ptime" \r\n \r\n
-+  //   abcdef \r\n
-+  //   BOUNDARY \r\n
-+  //
-+  //   zero or one:
-+  //   Content-Disposition: form-data; name="ptype" \r\n \r\n
-+  //   abcdef \r\n
-+  //   BOUNDARY \r\n
-+  //
-+  //   zero or one:
-+  //   Content-Disposition: form-data; name="lsb-release" \r\n \r\n
-+  //   abcdef \r\n
-+  //   BOUNDARY \r\n
-+  //
-+  //   zero or one:
-+  //   Content-Disposition: form-data; name="oom-size" \r\n \r\n
-+  //   1234567890 \r\n
-+  //   BOUNDARY \r\n
-+  //
-+  //   zero or more (up to CrashKeyStorage::num_entries = 64):
-+  //   Content-Disposition: form-data; name=crash-key-name \r\n
-+  //   crash-key-value \r\n
-+  //   BOUNDARY \r\n
-+  //
-+  //   Content-Disposition: form-data; name="dump"; filename="dump" \r\n
-+  //   Content-Type: application/octet-stream \r\n \r\n
-+  //   <dump contents>
-+  //   \r\n BOUNDARY -- \r\n
-+
-+  MimeWriter writer(temp_file_fd, mime_boundary);
-+  {
-+    writer.AddBoundary();
-+    if (info.pid > 0) {
-+      char pid_value_buf[kUint64StringSize];
-+      uint64_t pid_value_len = my_uint64_len(info.pid);
-+      my_uint64tos(pid_value_buf, info.pid, pid_value_len);
-+      static const char pid_key_name[] = "pid";
-+      writer.AddPairData(pid_key_name, sizeof(pid_key_name) - 1,
-+                         pid_value_buf, pid_value_len);
-+      writer.AddBoundary();
-+    }
-+    writer.Flush();
-+  }
-+
-+  if (info.process_start_time > 0) {
-+    struct kernel_timeval tv;
-+    if (!sys_gettimeofday(&tv, NULL)) {
-+      uint64_t time = kernel_timeval_to_ms(&tv);
-+      if (time > info.process_start_time) {
-+        time -= info.process_start_time;
-+        char time_str[kUint64StringSize];
-+        const unsigned time_len = my_uint64_len(time);
-+        my_uint64tos(time_str, time, time_len);
-+
-+        static const char process_time_msg[] = "ptime";
-+        writer.AddPairData(process_time_msg, sizeof(process_time_msg) - 1,
-+                           time_str, time_len);
-+        writer.AddBoundary();
-+        writer.Flush();
-+      }
-+    }
-+  }
-+
-+  if (info.distro_length) {
-+    static const char distro_msg[] = "lsb-release";
-+    writer.AddPairString(distro_msg, info.distro);
-+    writer.AddBoundary();
-+    writer.Flush();
-+  }
-+
-+  if (info.oom_size) {
-+    char oom_size_str[kUint64StringSize];
-+    const unsigned oom_size_len = my_uint64_len(info.oom_size);
-+    my_uint64tos(oom_size_str, info.oom_size, oom_size_len);
-+    static const char oom_size_msg[] = "oom-size";
-+    writer.AddPairData(oom_size_msg, sizeof(oom_size_msg) - 1,
-+                       oom_size_str, oom_size_len);
-+    writer.AddBoundary();
-+    writer.Flush();
-+  }
-+
-+  if (info.crash_keys) {
-+    CrashKeyStorage::Iterator crash_key_iterator(*info.crash_keys);
-+    const CrashKeyStorage::Entry* entry;
-+    while ((entry = crash_key_iterator.Next())) {
-+      writer.AddPairString(entry->key, entry->value);
-+      writer.AddBoundary();
-+      writer.Flush();
-+    }
-+  }
-+
-+  writer.AddFileContents(g_dump_msg, dump_data, dump_size);
-+  writer.AddEnd();
-+  writer.Flush();
-+
-+  IGNORE_RET(sys_close(temp_file_fd));
-+
-+  if (!info.upload)
-+    return;
-+
-+  const pid_t child = sys_fork();
-+  if (!child) {
-+    // Spawned helper process.
-+    //
-+    // This code is called both when a browser is crashing (in which case,
-+    // nothing really matters any more) and when a renderer/plugin crashes, in
-+    // which case we need to continue.
-+    //
-+    // Since we are a multithreaded app, if we were just to fork(), we might
-+    // grab file descriptors which have just been created in another thread and
-+    // hold them open for too long.
-+    //
-+    // Thus, we have to loop and try and close everything.
-+    const int fd = sys_open("/proc/self/fd", O_DIRECTORY | O_RDONLY, 0);
-+    if (fd < 0) {
-+      for (unsigned i = 3; i < 8192; ++i)
-+        IGNORE_RET(sys_close(i));
-+    } else {
-+      google_breakpad::DirectoryReader reader(fd);
-+      const char* name;
-+      while (reader.GetNextEntry(&name)) {
-+        int i;
-+        if (my_strtoui(&i, name) && i > 2 && i != fd)
-+          IGNORE_RET(sys_close(i));
-+        reader.PopEntry();
-+      }
-+
-+      IGNORE_RET(sys_close(fd));
-+    }
-+
-+    IGNORE_RET(sys_setsid());
-+
-+    // Leave one end of a pipe in the upload process and watch for it getting
-+    // closed by the upload process exiting.
-+    int fds[2];
-+    if (sys_pipe(fds) >= 0) {
-+      const pid_t upload_child = sys_fork();
-+      if (!upload_child) {
-+        // Upload process.
-+        IGNORE_RET(sys_close(fds[0]));
-+        IGNORE_RET(sys_dup2(fds[1], 3));
-+        ExecUploadProcessOrTerminate(info, temp_file, mime_boundary, exe_buf,
-+                                     &allocator);
-+      }
-+
-+      // Helper process.
-+      if (upload_child > 0) {
-+        IGNORE_RET(sys_close(fds[1]));
-+
-+        const size_t kCrashIdLength = 36;
-+        char id_buf[kCrashIdLength + 1];
-+        size_t bytes_read =
-+            WaitForCrashReportUploadProcess(fds[0], kCrashIdLength, id_buf);
-+        HandleCrashReportId(id_buf, bytes_read, kCrashIdLength);
-+
-+        if (sys_waitpid(upload_child, NULL, WNOHANG) == 0) {
-+          // Upload process is still around, kill it.
-+          sys_kill(upload_child, SIGKILL);
-+        }
-+      }
-+    }
-+
-+    // Helper process.
-+    IGNORE_RET(sys_unlink(info.filename));
-+    IGNORE_RET(sys_unlink(temp_file));
-+    sys__exit(0);
-+  }
-+
-+  // Main browser process.
-+  if (child <= 0)
-+    return;
-+  (void) HANDLE_EINTR(sys_waitpid(child, NULL, 0));
-+}
-+
-+size_t WriteLog(const char* buf, size_t nbytes) {
-+  return sys_write(2, buf, nbytes);
-+}
-+
-+size_t WriteNewline() {
-+  return WriteLog("\n", 1);
-+}
-+
-+}  // namespace crash_reporter
-added in remote
-  their  100644 a0ae98704a204fb6d88ee9ee7eb630d5e5d75d80 electron/common/crash_reporter/linux/crash_dump_handler.h
-@@ -0,0 +1,46 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_COMMON_CRASH_REPORTER_LINUX_CRASH_DUMP_HANDLER_H_
-+#define ELECTRON_COMMON_CRASH_REPORTER_LINUX_CRASH_DUMP_HANDLER_H_
-+
-+#include <stddef.h>
-+#include <stdint.h>
-+#include <sys/types.h>
-+
-+#include "base/macros.h"
-+#include "vendor/breakpad/src/common/simple_string_dictionary.h"
-+
-+namespace crash_reporter {
-+
-+typedef google_breakpad::NonAllocatingMap<256, 256, 64> CrashKeyStorage;
-+
-+// BreakpadInfo describes a crash report.
-+// The minidump information can either be contained in a file descriptor (fd) or
-+// in a file (whose path is in filename).
-+struct BreakpadInfo {
-+  int fd;                          // File descriptor to the Breakpad dump data.
-+  const char* filename;            // Path to the Breakpad dump data.
-+  const char* distro;              // Linux distro string.
-+  unsigned distro_length;          // Length of |distro|.
-+  bool upload;                     // Whether to upload or save crash dump.
-+  uint64_t process_start_time;     // Uptime of the crashing process.
-+  size_t oom_size;                 // Amount of memory requested if OOM.
-+  uint64_t pid;                    // PID where applicable.
-+  const char* upload_url;          // URL to upload the minidump.
-+  CrashKeyStorage* crash_keys;
-+};
-+
-+void HandleCrashDump(const BreakpadInfo& info);
-+
-+size_t WriteLog(const char* buf, size_t nbytes);
-+size_t WriteNewline();
-+
-+// Global variable storing the path of upload log.
-+extern char g_crash_log_path[256];
-+
-+}  // namespace crash_reporter
-+
-+#endif  // ELECTRON_COMMON_CRASH_REPORTER_LINUX_CRASH_DUMP_HANDLER_H_
-added in remote
-  their  100644 c8bc9c70f4055b1774a06e91f261f157a5763a47 electron/common/crash_reporter/win/crash_service.cc
-@@ -0,0 +1,526 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/common/crash_reporter/win/crash_service.h"
-+
-+#include <windows.h>
-+
-+#include <sddl.h>
-+#include <fstream>  // NOLINT
-+#include <map>
-+
-+#include "base/command_line.h"
-+#include "base/files/file_util.h"
-+#include "base/logging.h"
-+#include "base/strings/string_number_conversions.h"
-+#include "base/strings/string_util.h"
-+#include "base/time/time.h"
-+#include "base/win/windows_version.h"
-+#include "vendor/breakpad/src/client/windows/crash_generation/client_info.h"
-+#include "vendor/breakpad/src/client/windows/crash_generation/crash_generation_server.h"
-+#include "vendor/breakpad/src/client/windows/sender/crash_report_sender.h"
-+
-+namespace breakpad {
-+
-+namespace {
-+
-+const wchar_t kWaitEventFormat[] = L"$1CrashServiceWaitEvent";
-+const wchar_t kClassNameFormat[] = L"$1CrashServiceWindow";
-+
-+const wchar_t kTestPipeName[] = L"\\\\.\\pipe\\ChromeCrashServices";
-+
-+const wchar_t kGoogleReportURL[] = L"https://clients2.google.com/cr/report";
-+const wchar_t kCheckPointFile[] = L"crash_checkpoint.txt";
-+
-+typedef std::map<std::wstring, std::wstring> CrashMap;
-+
-+bool CustomInfoToMap(const google_breakpad::ClientInfo* client_info,
-+                     const std::wstring& reporter_tag, CrashMap* map) {
-+  google_breakpad::CustomClientInfo info = client_info->GetCustomInfo();
-+
-+  for (uintptr_t i = 0; i < info.count; ++i) {
-+    (*map)[info.entries[i].name] = info.entries[i].value;
-+  }
-+
-+  (*map)[L"rept"] = reporter_tag;
-+
-+  return !map->empty();
-+}
-+
-+bool WriteCustomInfoToFile(const std::wstring& dump_path, const CrashMap& map) {
-+  std::wstring file_path(dump_path);
-+  size_t last_dot = file_path.rfind(L'.');
-+  if (last_dot == std::wstring::npos)
-+    return false;
-+  file_path.resize(last_dot);
-+  file_path += L".txt";
-+
-+  std::wofstream file(file_path.c_str(),
-+      std::ios_base::out | std::ios_base::app | std::ios::binary);
-+  if (!file.is_open())
-+    return false;
-+
-+  CrashMap::const_iterator pos;
-+  for (pos = map.begin(); pos != map.end(); ++pos) {
-+    std::wstring line = pos->first;
-+    line += L':';
-+    line += pos->second;
-+    line += L'\n';
-+    file.write(line.c_str(), static_cast<std::streamsize>(line.length()));
-+  }
-+  return true;
-+}
-+
-+bool WriteReportIDToFile(const std::wstring& dump_path,
-+                         const std::wstring& report_id) {
-+  std::wstring file_path(dump_path);
-+  size_t last_slash = file_path.rfind(L'\\');
-+  if (last_slash == std::wstring::npos)
-+    return false;
-+  file_path.resize(last_slash);
-+  file_path += L"\\uploads.log";
-+
-+  std::wofstream file(file_path.c_str(),
-+      std::ios_base::out | std::ios_base::app | std::ios::binary);
-+  if (!file.is_open())
-+    return false;
-+
-+  int64_t seconds_since_epoch =
-+      (base::Time::Now() - base::Time::UnixEpoch()).InSeconds();
-+  std::wstring line = base::Int64ToString16(seconds_since_epoch);
-+  line += L',';
-+  line += report_id;
-+  line += L'\n';
-+  file.write(line.c_str(), static_cast<std::streamsize>(line.length()));
-+  return true;
-+}
-+
-+// The window procedure task is to handle when a) the user logs off.
-+// b) the system shuts down or c) when the user closes the window.
-+LRESULT __stdcall CrashSvcWndProc(HWND hwnd, UINT message,
-+                                  WPARAM wparam, LPARAM lparam) {
-+  switch (message) {
-+    case WM_CLOSE:
-+    case WM_ENDSESSION:
-+    case WM_DESTROY:
-+      PostQuitMessage(0);
-+      break;
-+    default:
-+      return DefWindowProc(hwnd, message, wparam, lparam);
-+  }
-+  return 0;
-+}
-+
-+// This is the main and only application window.
-+HWND g_top_window = NULL;
-+
-+bool CreateTopWindow(HINSTANCE instance,
-+                     const base::string16& application_name,
-+                     bool visible) {
-+  base::string16 class_name = base::ReplaceStringPlaceholders(
-+      kClassNameFormat, application_name, NULL);
-+
-+  WNDCLASSEXW wcx = {0};
-+  wcx.cbSize = sizeof(wcx);
-+  wcx.style = CS_HREDRAW | CS_VREDRAW;
-+  wcx.lpfnWndProc = CrashSvcWndProc;
-+  wcx.hInstance = instance;
-+  wcx.lpszClassName = class_name.c_str();
-+  ATOM atom = ::RegisterClassExW(&wcx);
-+  DWORD style = visible ? WS_POPUPWINDOW | WS_VISIBLE : WS_OVERLAPPED;
-+
-+  // The window size is zero but being a popup window still shows in the
-+  // task bar and can be closed using the system menu or using task manager.
-+  HWND window = CreateWindowExW(0, wcx.lpszClassName, L"crash service", style,
-+                                CW_USEDEFAULT, CW_USEDEFAULT, 0, 0,
-+                                NULL, NULL, instance, NULL);
-+  if (!window)
-+    return false;
-+
-+  ::UpdateWindow(window);
-+  VLOG(1) << "window handle is " << window;
-+  g_top_window = window;
-+  return true;
-+}
-+
-+// Simple helper class to keep the process alive until the current request
-+// finishes.
-+class ProcessingLock {
-+ public:
-+  ProcessingLock() {
-+    ::InterlockedIncrement(&op_count_);
-+  }
-+  ~ProcessingLock() {
-+    ::InterlockedDecrement(&op_count_);
-+  }
-+  static bool IsWorking() {
-+    return (op_count_ != 0);
-+  }
-+ private:
-+  static volatile LONG op_count_;
-+};
-+
-+volatile LONG ProcessingLock::op_count_ = 0;
-+
-+// This structure contains the information that the worker thread needs to
-+// send a crash dump to the server.
-+struct DumpJobInfo {
-+  DWORD pid;
-+  CrashService* self;
-+  CrashMap map;
-+  std::wstring dump_path;
-+
-+  DumpJobInfo(DWORD process_id, CrashService* service,
-+              const CrashMap& crash_map, const std::wstring& path)
-+      : pid(process_id), self(service), map(crash_map), dump_path(path) {
-+  }
-+};
-+
-+}  // namespace
-+
-+// Command line switches:
-+const char CrashService::kMaxReports[]        = "max-reports";
-+const char CrashService::kNoWindow[]          = "no-window";
-+const char CrashService::kReporterTag[]       = "reporter";
-+const char CrashService::kDumpsDir[]          = "dumps-dir";
-+const char CrashService::kPipeName[]          = "pipe-name";
-+const char CrashService::kReporterURL[]       = "reporter-url";
-+
-+CrashService::CrashService()
-+    : sender_(NULL),
-+      dumper_(NULL),
-+      requests_handled_(0),
-+      requests_sent_(0),
-+      clients_connected_(0),
-+      clients_terminated_(0) {
-+}
-+
-+CrashService::~CrashService() {
-+  base::AutoLock lock(sending_);
-+  delete dumper_;
-+  delete sender_;
-+}
-+
-+bool CrashService::Initialize(const base::string16& application_name,
-+                              const base::FilePath& operating_dir,
-+                              const base::FilePath& dumps_path) {
-+  using google_breakpad::CrashReportSender;
-+  using google_breakpad::CrashGenerationServer;
-+
-+  std::wstring pipe_name = kTestPipeName;
-+  int max_reports = -1;
-+
-+  // The checkpoint file allows CrashReportSender to enforce the maximum
-+  // reports per day quota. Does not seem to serve any other purpose.
-+  base::FilePath checkpoint_path = operating_dir.Append(kCheckPointFile);
-+
-+  base::CommandLine& cmd_line = *base::CommandLine::ForCurrentProcess();
-+
-+  base::FilePath dumps_path_to_use = dumps_path;
-+
-+  if (cmd_line.HasSwitch(kDumpsDir)) {
-+    dumps_path_to_use =
-+        base::FilePath(cmd_line.GetSwitchValueNative(kDumpsDir));
-+  }
-+
-+  // We can override the send reports quota with a command line switch.
-+  if (cmd_line.HasSwitch(kMaxReports))
-+    max_reports = _wtoi(cmd_line.GetSwitchValueNative(kMaxReports).c_str());
-+
-+  // Allow the global pipe name to be overridden for better testability.
-+  if (cmd_line.HasSwitch(kPipeName))
-+    pipe_name = cmd_line.GetSwitchValueNative(kPipeName);
-+
-+  if (max_reports > 0) {
-+    // Create the http sender object.
-+    sender_ = new CrashReportSender(checkpoint_path.value());
-+    sender_->set_max_reports_per_day(max_reports);
-+  }
-+
-+  SECURITY_ATTRIBUTES security_attributes = {0};
-+  SECURITY_ATTRIBUTES* security_attributes_actual = NULL;
-+
-+  if (base::win::GetVersion() >= base::win::VERSION_VISTA) {
-+    SECURITY_DESCRIPTOR* security_descriptor =
-+        reinterpret_cast<SECURITY_DESCRIPTOR*>(
-+            GetSecurityDescriptorForLowIntegrity());
-+    DCHECK(security_descriptor != NULL);
-+
-+    security_attributes.nLength = sizeof(security_attributes);
-+    security_attributes.lpSecurityDescriptor = security_descriptor;
-+    security_attributes.bInheritHandle = FALSE;
-+
-+    security_attributes_actual = &security_attributes;
-+  }
-+
-+  // Create the OOP crash generator object.
-+  dumper_ = new CrashGenerationServer(pipe_name, security_attributes_actual,
-+                                      &CrashService::OnClientConnected, this,
-+                                      &CrashService::OnClientDumpRequest, this,
-+                                      &CrashService::OnClientExited, this,
-+                                      NULL, NULL,
-+                                      true, &dumps_path_to_use.value());
-+
-+  if (!dumper_) {
-+    LOG(ERROR) << "could not create dumper";
-+    if (security_attributes.lpSecurityDescriptor)
-+      LocalFree(security_attributes.lpSecurityDescriptor);
-+    return false;
-+  }
-+
-+  if (!CreateTopWindow(::GetModuleHandleW(NULL),
-+                       application_name,
-+                       !cmd_line.HasSwitch(kNoWindow))) {
-+    LOG(ERROR) << "could not create window";
-+    if (security_attributes.lpSecurityDescriptor)
-+      LocalFree(security_attributes.lpSecurityDescriptor);
-+    return false;
-+  }
-+
-+  reporter_tag_ = L"crash svc";
-+  if (cmd_line.HasSwitch(kReporterTag))
-+    reporter_tag_ = cmd_line.GetSwitchValueNative(kReporterTag);
-+
-+  reporter_url_ = kGoogleReportURL;
-+  if (cmd_line.HasSwitch(kReporterURL))
-+    reporter_url_ = cmd_line.GetSwitchValueNative(kReporterURL);
-+
-+  // Log basic information.
-+  VLOG(1) << "pipe name is " << pipe_name
-+          << "\ndumps at " << dumps_path_to_use.value();
-+
-+  if (sender_) {
-+    VLOG(1) << "checkpoint is " << checkpoint_path.value()
-+            << "\nserver is " << reporter_url_
-+            << "\nmaximum " << sender_->max_reports_per_day() << " reports/day"
-+            << "\nreporter is " << reporter_tag_;
-+  }
-+  // Start servicing clients.
-+  if (!dumper_->Start()) {
-+    LOG(ERROR) << "could not start dumper";
-+    if (security_attributes.lpSecurityDescriptor)
-+      LocalFree(security_attributes.lpSecurityDescriptor);
-+    return false;
-+  }
-+
-+  if (security_attributes.lpSecurityDescriptor)
-+    LocalFree(security_attributes.lpSecurityDescriptor);
-+
-+  // Create or open an event to signal the browser process that the crash
-+  // service is initialized.
-+  base::string16 wait_name = base::ReplaceStringPlaceholders(
-+      kWaitEventFormat, application_name, NULL);
-+  HANDLE wait_event = ::CreateEventW(NULL, TRUE, TRUE, wait_name.c_str());
-+  ::SetEvent(wait_event);
-+
-+  return true;
-+}
-+
-+void CrashService::OnClientConnected(void* context,
-+    const google_breakpad::ClientInfo* client_info) {
-+  ProcessingLock lock;
-+  VLOG(1) << "client start. pid = " << client_info->pid();
-+  CrashService* self = static_cast<CrashService*>(context);
-+  ::InterlockedIncrement(&self->clients_connected_);
-+}
-+
-+void CrashService::OnClientExited(void* context,
-+    const google_breakpad::ClientInfo* client_info) {
-+  ProcessingLock lock;
-+  VLOG(1) << "client end. pid = " << client_info->pid();
-+  CrashService* self = static_cast<CrashService*>(context);
-+  ::InterlockedIncrement(&self->clients_terminated_);
-+
-+  if (!self->sender_)
-+    return;
-+
-+  // When we are instructed to send reports we need to exit if there are
-+  // no more clients to service. The next client that runs will start us.
-+  // Only chrome.exe starts crash_service with a non-zero max_reports.
-+  if (self->clients_connected_ > self->clients_terminated_)
-+    return;
-+  if (self->sender_->max_reports_per_day() > 0) {
-+    // Wait for the other thread to send crashes, if applicable. The sender
-+    // thread takes the sending_ lock, so the sleep is just to give it a
-+    // chance to start.
-+    ::Sleep(1000);
-+    base::AutoLock lock(self->sending_);
-+    // Some people can restart chrome very fast, check again if we have
-+    // a new client before exiting for real.
-+    if (self->clients_connected_ == self->clients_terminated_) {
-+      VLOG(1) << "zero clients. exiting";
-+      ::PostMessage(g_top_window, WM_CLOSE, 0, 0);
-+    }
-+  }
-+}
-+
-+void CrashService::OnClientDumpRequest(void* context,
-+    const google_breakpad::ClientInfo* client_info,
-+    const std::wstring* file_path) {
-+  ProcessingLock lock;
-+
-+  if (!file_path) {
-+    LOG(ERROR) << "dump with no file path";
-+    return;
-+  }
-+  if (!client_info) {
-+    LOG(ERROR) << "dump with no client info";
-+    return;
-+  }
-+
-+  CrashService* self = static_cast<CrashService*>(context);
-+  if (!self) {
-+    LOG(ERROR) << "dump with no context";
-+    return;
-+  }
-+
-+  CrashMap map;
-+  CustomInfoToMap(client_info, self->reporter_tag_, &map);
-+
-+  // Move dump file to the directory under client breakpad dump location.
-+  base::FilePath dump_location = base::FilePath(*file_path);
-+  CrashMap::const_iterator it = map.find(L"breakpad-dump-location");
-+  if (it != map.end()) {
-+    base::FilePath alternate_dump_location = base::FilePath(it->second);
-+    base::CreateDirectoryW(alternate_dump_location);
-+    alternate_dump_location = alternate_dump_location.Append(
-+        dump_location.BaseName());
-+    base::Move(dump_location, alternate_dump_location);
-+    dump_location = alternate_dump_location;
-+  }
-+
-+  DWORD pid = client_info->pid();
-+  VLOG(1) << "dump for pid = " << pid << " is " << dump_location.value();
-+
-+  if (!WriteCustomInfoToFile(dump_location.value(), map)) {
-+    LOG(ERROR) << "could not write custom info file";
-+  }
-+
-+  if (!self->sender_)
-+    return;
-+
-+  // Send the crash dump using a worker thread. This operation has retry
-+  // logic in case there is no internet connection at the time.
-+  DumpJobInfo* dump_job = new DumpJobInfo(pid, self, map,
-+                                          dump_location.value());
-+  if (!::QueueUserWorkItem(&CrashService::AsyncSendDump,
-+                           dump_job, WT_EXECUTELONGFUNCTION)) {
-+    LOG(ERROR) << "could not queue job";
-+  }
-+}
-+
-+// We are going to try sending the report several times. If we can't send,
-+// we sleep from one minute to several hours depending on the retry round.
-+DWORD CrashService::AsyncSendDump(void* context) {
-+  if (!context)
-+    return 0;
-+
-+  DumpJobInfo* info = static_cast<DumpJobInfo*>(context);
-+
-+  std::wstring report_id = L"<unsent>";
-+
-+  const DWORD kOneMinute = 60*1000;
-+  const DWORD kOneHour = 60*kOneMinute;
-+
-+  const DWORD kSleepSchedule[] = {
-+      24*kOneHour,
-+      8*kOneHour,
-+      4*kOneHour,
-+      kOneHour,
-+      15*kOneMinute,
-+      0};
-+
-+  int retry_round = arraysize(kSleepSchedule) - 1;
-+
-+  do {
-+    ::Sleep(kSleepSchedule[retry_round]);
-+    {
-+      // Take the server lock while sending. This also prevent early
-+      // termination of the service object.
-+      base::AutoLock lock(info->self->sending_);
-+      VLOG(1) << "trying to send report for pid = " << info->pid;
-+      google_breakpad::ReportResult send_result
-+          = info->self->sender_->SendCrashReport(info->self->reporter_url_,
-+                                                 info->map,
-+                                                 info->dump_path,
-+                                                 &report_id);
-+      switch (send_result) {
-+        case google_breakpad::RESULT_FAILED:
-+          report_id = L"<network issue>";
-+          break;
-+        case google_breakpad::RESULT_REJECTED:
-+          report_id = L"<rejected>";
-+          ++info->self->requests_handled_;
-+          retry_round = 0;
-+          break;
-+        case google_breakpad::RESULT_SUCCEEDED:
-+          ++info->self->requests_sent_;
-+          ++info->self->requests_handled_;
-+          retry_round = 0;
-+          WriteReportIDToFile(info->dump_path, report_id);
-+          break;
-+        case google_breakpad::RESULT_THROTTLED:
-+          report_id = L"<throttled>";
-+          break;
-+        default:
-+          report_id = L"<unknown>";
-+          break;
-+      }
-+    }
-+
-+    VLOG(1) << "dump for pid =" << info->pid << " crash2 id =" << report_id;
-+    --retry_round;
-+  } while (retry_round >= 0);
-+
-+  if (!::DeleteFileW(info->dump_path.c_str()))
-+    LOG(WARNING) << "could not delete " << info->dump_path;
-+
-+  delete info;
-+  return 0;
-+}
-+
-+int CrashService::ProcessingLoop() {
-+  MSG msg;
-+  while (GetMessage(&msg, NULL, 0, 0)) {
-+    TranslateMessage(&msg);
-+    DispatchMessage(&msg);
-+  }
-+
-+  VLOG(1) << "session ending..";
-+  while (ProcessingLock::IsWorking()) {
-+    ::Sleep(50);
-+  }
-+
-+  VLOG(1) << "clients connected :" << clients_connected_
-+          << "\nclients terminated :" << clients_terminated_
-+          << "\ndumps serviced :" << requests_handled_
-+          << "\ndumps reported :" << requests_sent_;
-+
-+  return static_cast<int>(msg.wParam);
-+}
-+
-+PSECURITY_DESCRIPTOR CrashService::GetSecurityDescriptorForLowIntegrity() {
-+  // Build the SDDL string for the label.
-+  std::wstring sddl = L"S:(ML;;NW;;;S-1-16-4096)";
-+
-+  DWORD error = ERROR_SUCCESS;
-+  PSECURITY_DESCRIPTOR sec_desc = NULL;
-+
-+  PACL sacl = NULL;
-+  BOOL sacl_present = FALSE;
-+  BOOL sacl_defaulted = FALSE;
-+
-+  if (::ConvertStringSecurityDescriptorToSecurityDescriptorW(sddl.c_str(),
-+                                                             SDDL_REVISION,
-+                                                             &sec_desc, NULL)) {
-+    if (::GetSecurityDescriptorSacl(sec_desc, &sacl_present, &sacl,
-+                                    &sacl_defaulted)) {
-+      return sec_desc;
-+    }
-+  }
-+
-+  return NULL;
-+}
-+
-+}  // namespace breakpad
-added in remote
-  their  100644 10fde6374b1b58bc4789f5342fbacce75e54fadf electron/common/crash_reporter/win/crash_service.h
-@@ -0,0 +1,132 @@
-+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_COMMON_CRASH_REPORTER_WIN_CRASH_SERVICE_H_
-+#define ELECTRON_COMMON_CRASH_REPORTER_WIN_CRASH_SERVICE_H_
-+
-+#include <string>
-+
-+#include "base/macros.h"
-+#include "base/files/file_path.h"
-+#include "base/synchronization/lock.h"
-+
-+namespace google_breakpad {
-+
-+class CrashReportSender;
-+class CrashGenerationServer;
-+class ClientInfo;
-+
-+}
-+
-+namespace breakpad {
-+
-+// This class implements an out-of-process crash server. It uses breakpad's
-+// CrashGenerationServer and CrashReportSender to generate and then send the
-+// crash dumps. Internally, it uses OS specific pipe to allow applications to
-+// register for crash dumps and later on when a registered application crashes
-+// it will signal an event that causes this code to wake up and perform a
-+// crash dump on the signaling process. The dump is then stored on disk and
-+// possibly sent to the crash2 servers.
-+class CrashService {
-+ public:
-+  CrashService();
-+  ~CrashService();
-+
-+  // Starts servicing crash dumps. Returns false if it failed. Do not use
-+  // other members in that case. |operating_dir| is where the CrashService
-+  // should store breakpad's checkpoint file. |dumps_path| is the directory
-+  // where the crash dumps should be stored.
-+  bool Initialize(const base::string16& application_name,
-+                  const base::FilePath& operating_dir,
-+                  const base::FilePath& dumps_path);
-+
-+  // Command line switches:
-+  //
-+  // --max-reports=<number>
-+  // Allows to override the maximum number for reports per day. Normally
-+  // the crash dumps are never sent so if you want to send any you must
-+  // specify a positive number here.
-+  static const char kMaxReports[];
-+  // --no-window
-+  // Does not create a visible window on the desktop. The window does not have
-+  // any other functionality other than allowing the crash service to be
-+  // gracefully closed.
-+  static const char kNoWindow[];
-+  // --reporter=<string>
-+  // Allows to specify a custom string that appears on the detail crash report
-+  // page in the crash server. This should be a 25 chars or less string.
-+  // The default tag if not specified is 'crash svc'.
-+  static const char kReporterTag[];
-+  // --dumps-dir=<directory-path>
-+  // Override the directory to which crash dump files will be written.
-+  static const char kDumpsDir[];
-+  // --pipe-name=<string>
-+  // Override the name of the Windows named pipe on which we will
-+  // listen for crash dump request messages.
-+  static const char kPipeName[];
-+  // --reporter-url=<string>
-+  // Override the URL to which crash reports will be sent to.
-+  static const char kReporterURL[];
-+
-+  // Returns number of crash dumps handled.
-+  int requests_handled() const {
-+    return requests_handled_;
-+  }
-+  // Returns number of crash clients registered.
-+  int clients_connected() const {
-+    return clients_connected_;
-+  }
-+  // Returns number of crash clients terminated.
-+  int clients_terminated() const {
-+    return clients_terminated_;
-+  }
-+
-+  // Starts the processing loop. This function does not return unless the
-+  // user is logging off or the user closes the crash service window. The
-+  // return value is a good number to pass in ExitProcess().
-+  int ProcessingLoop();
-+
-+ private:
-+  static void OnClientConnected(void* context,
-+                                const google_breakpad::ClientInfo* client_info);
-+
-+  static void OnClientDumpRequest(
-+      void* context,
-+      const google_breakpad::ClientInfo* client_info,
-+      const std::wstring* file_path);
-+
-+  static void OnClientExited(void* context,
-+                             const google_breakpad::ClientInfo* client_info);
-+
-+  // This routine sends the crash dump to the server. It takes the sending_
-+  // lock when it is performing the send.
-+  static DWORD __stdcall AsyncSendDump(void* context);
-+
-+  // Returns the security descriptor which access to low integrity processes
-+  // The caller is supposed to free the security descriptor by calling
-+  // LocalFree.
-+  PSECURITY_DESCRIPTOR GetSecurityDescriptorForLowIntegrity();
-+
-+  google_breakpad::CrashGenerationServer* dumper_;
-+  google_breakpad::CrashReportSender* sender_;
-+
-+  // the extra tag sent to the server with each dump.
-+  std::wstring reporter_tag_;
-+
-+  // receiver URL of crash reports.
-+  std::wstring reporter_url_;
-+
-+  // clients serviced statistics:
-+  int requests_handled_;
-+  int requests_sent_;
-+  volatile LONG clients_connected_;
-+  volatile LONG clients_terminated_;
-+  base::Lock sending_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(CrashService);
-+};
-+
-+}  // namespace breakpad
-+
-+#endif  // ELECTRON_COMMON_CRASH_REPORTER_WIN_CRASH_SERVICE_H_
-added in remote
-  their  100644 014c230788b605041c1c63821a05bff641071935 electron/common/crash_reporter/win/crash_service_main.cc
-@@ -0,0 +1,93 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/common/crash_reporter/win/crash_service_main.h"
-+
-+#include "electron/common/crash_reporter/win/crash_service.h"
-+#include "base/at_exit.h"
-+#include "base/command_line.h"
-+#include "base/files/file_util.h"
-+#include "base/logging.h"
-+#include "base/strings/string_util.h"
-+
-+namespace crash_service {
-+
-+namespace {
-+
-+const char kApplicationName[] = "application-name";
-+
-+const wchar_t kPipeNameFormat[] = L"\\\\.\\pipe\\$1 Crash Service";
-+const wchar_t kStandardLogFile[] = L"operation_log.txt";
-+
-+bool GetCrashServiceDirectory(const std::wstring& application_name,
-+                              base::FilePath* dir) {
-+  base::FilePath temp_dir;
-+  if (!base::GetTempDir(&temp_dir))
-+    return false;
-+  temp_dir = temp_dir.Append(application_name + L" Crashes");
-+  if (!base::PathExists(temp_dir)) {
-+    if (!base::CreateDirectory(temp_dir))
-+      return false;
-+  }
-+  *dir = temp_dir;
-+  return true;
-+}
-+
-+}  // namespace.
-+
-+int Main(const wchar_t* cmd) {
-+  // Initialize all Chromium things.
-+  base::AtExitManager exit_manager;
-+  base::CommandLine::Init(0, NULL);
-+  base::CommandLine& cmd_line = *base::CommandLine::ForCurrentProcess();
-+
-+  // Use the application's name as pipe name and output directory.
-+  if (!cmd_line.HasSwitch(kApplicationName)) {
-+    LOG(ERROR) << "Application's name must be specified with --"
-+               << kApplicationName;
-+    return 1;
-+  }
-+  std::wstring application_name = cmd_line.GetSwitchValueNative(
-+      kApplicationName);
-+
-+  // We use/create a directory under the user's temp folder, for logging.
-+  base::FilePath operating_dir;
-+  GetCrashServiceDirectory(application_name, &operating_dir);
-+  base::FilePath log_file = operating_dir.Append(kStandardLogFile);
-+
-+  // Logging to stderr (to help with debugging failures on the
-+  // buildbots) and to a file.
-+  logging::LoggingSettings settings;
-+  settings.logging_dest = logging::LOG_TO_ALL;
-+  settings.log_file = log_file.value().c_str();
-+  logging::InitLogging(settings);
-+  // Logging with pid, tid and timestamp.
-+  logging::SetLogItems(true, true, true, false);
-+
-+  VLOG(1) << "Session start. cmdline is [" << cmd << "]";
-+
-+  // Setting the crash reporter.
-+  base::string16 pipe_name = base::ReplaceStringPlaceholders(kPipeNameFormat,
-+                                                 application_name,
-+                                                 NULL);
-+  cmd_line.AppendSwitch("no-window");
-+  cmd_line.AppendSwitchASCII("max-reports", "128");
-+  cmd_line.AppendSwitchASCII("reporter", ELECTRON_PROJECT_NAME "-crash-service");
-+  cmd_line.AppendSwitchNative("pipe-name", pipe_name);
-+
-+  breakpad::CrashService crash_service;
-+  if (!crash_service.Initialize(application_name, operating_dir,
-+                                operating_dir))
-+    return 2;
-+
-+  VLOG(1) << "Ready to process crash requests";
-+
-+  // Enter the message loop.
-+  int retv = crash_service.ProcessingLoop();
-+  // Time to exit.
-+  VLOG(1) << "Session end. return code is " << retv;
-+  return retv;
-+}
-+
-+}  // namespace crash_service
-added in remote
-  their  100644 53aab9ecdd0d7003e78f4168a0a1d5ac23e68941 electron/common/crash_reporter/win/crash_service_main.h
-@@ -0,0 +1,15 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_COMMON_CRASH_REPORTER_WIN_CRASH_SERVICE_MAIN_H_
-+#define ELECTRON_COMMON_CRASH_REPORTER_WIN_CRASH_SERVICE_MAIN_H_
-+
-+namespace crash_service {
-+
-+// Program entry, should be called by main();
-+int Main(const wchar_t* cmd_line);
-+
-+}  // namespace crash_service
-+
-+#endif  // ELECTRON_COMMON_CRASH_REPORTER_WIN_CRASH_SERVICE_MAIN_H_
-added in remote
-  their  100644 7888c249217dc32e90e0a8ebdf3e20664c406ed3 electron/common/draggable_region.cc
-@@ -0,0 +1,13 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/common/draggable_region.h"
-+
-+namespace electron {
-+
-+DraggableRegion::DraggableRegion()
-+    : draggable(false) {
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 5ef7ef60c38392701ef0e5850190ada56d3c283e electron/common/draggable_region.h
-@@ -0,0 +1,21 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_COMMON_DRAGGABLE_REGION_H_
-+#define ELECTRON_COMMON_DRAGGABLE_REGION_H_
-+
-+#include "ui/gfx/geometry/rect.h"
-+
-+namespace electron {
-+
-+struct DraggableRegion {
-+  bool draggable;
-+  gfx::Rect bounds;
-+
-+  DraggableRegion();
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_COMMON_DRAGGABLE_REGION_H_
-added in remote
-  their  100644 c4039a67c8ab00f25c3a94dce4733266d5101a54 electron/common/electron_command_line.cc
-@@ -0,0 +1,31 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/common/electron_command_line.h"
-+
-+#include "base/command_line.h"
-+#include "node/deps/uv/include/uv.h"
-+
-+namespace electron {
-+
-+// static
-+std::vector<std::string> ElectronCommandLine::argv_;
-+
-+// static
-+void ElectronCommandLine::Init(int argc, const char* const* argv) {
-+  // Hack around with the argv pointer. Used for process.title = "blah"
-+  char** new_argv = uv_setup_args(argc, const_cast<char**>(argv));
-+  for (int i = 0; i < argc; ++i) {
-+    argv_.push_back(new_argv[i]);
-+  }
-+}
-+
-+#if defined(OS_LINUX)
-+// static
-+void ElectronCommandLine::InitializeFromCommandLine() {
-+  argv_ = base::CommandLine::ForCurrentProcess()->argv();
-+}
-+#endif
-+
-+}  // namespace electron
-added in remote
-  their  100644 157dfc7f57838f076e0e281e51b1c2158611bb6a electron/common/electron_command_line.h
-@@ -0,0 +1,36 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_COMMON_ELECTRON_COMMAND_LINE_H_
-+#define ELECTRON_COMMON_ELECTRON_COMMAND_LINE_H_
-+
-+#include <string>
-+#include <vector>
-+
-+#include "base/macros.h"
-+#include "build/build_config.h"
-+
-+namespace electron {
-+
-+// Singleton to remember the original "argc" and "argv".
-+class ElectronCommandLine {
-+ public:
-+  static void Init(int argc, const char* const* argv);
-+  static std::vector<std::string> argv() { return argv_; }
-+
-+#if defined(OS_LINUX)
-+  // On Linux the command line has to be read from base::CommandLine since
-+  // it is using zygote.
-+  static void InitializeFromCommandLine();
-+#endif
-+
-+ private:
-+  static std::vector<std::string> argv_;
-+
-+  DISALLOW_IMPLICIT_CONSTRUCTORS(ElectronCommandLine);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_COMMON_ELECTRON_COMMAND_LINE_H_
-added in remote
-  their  100644 d32ed92c9e2b7a5636ed2b538720091cff1e414e electron/common/electron_constants.cc
-@@ -0,0 +1,11 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/common/electron_constants.h"
-+
-+namespace electron {
-+
-+const char* kCORSHeader = "Access-Control-Allow-Origin: *";
-+
-+}  // namespace electron
-added in remote
-  their  100644 277ef6f41e81aba66843f77317c1974817202517 electron/common/electron_constants.h
-@@ -0,0 +1,15 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_COMMON_ELECTRON_CONSTANTS_H_
-+#define ELECTRON_COMMON_ELECTRON_CONSTANTS_H_
-+
-+namespace electron {
-+
-+// Header to ignore CORS.
-+extern const char* kCORSHeader;
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_COMMON_ELECTRON_CONSTANTS_H_
-added in remote
-  their  100644 adb282d5dfd420fe6c037e7b7e1a25caa5cd7e55 electron/common/electron_version.h
-@@ -0,0 +1,43 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_VERSION_H
-+#define ELECTRON_VERSION_H
-+
-+#define ELECTRON_MAJOR_VERSION 0
-+#define ELECTRON_MINOR_VERSION 37
-+#define ELECTRON_PATCH_VERSION 3
-+
-+#define ELECTRON_VERSION_IS_RELEASE 1
-+
-+#ifndef ELECTRON_TAG
-+# define ELECTRON_TAG ""
-+#endif
-+
-+#ifndef ELECTRON_STRINGIFY
-+#define ELECTRON_STRINGIFY(n) ELECTRON_STRINGIFY_HELPER(n)
-+#define ELECTRON_STRINGIFY_HELPER(n) #n
-+#endif
-+
-+#if ELECTRON_VERSION_IS_RELEASE
-+# define ELECTRON_VERSION_STRING  ELECTRON_STRINGIFY(ELECTRON_MAJOR_VERSION) "." \
-+                              ELECTRON_STRINGIFY(ELECTRON_MINOR_VERSION) "." \
-+                              ELECTRON_STRINGIFY(ELECTRON_PATCH_VERSION)     \
-+                              ELECTRON_TAG
-+#else
-+# define ELECTRON_VERSION_STRING  ELECTRON_STRINGIFY(ELECTRON_MAJOR_VERSION) "." \
-+                              ELECTRON_STRINGIFY(ELECTRON_MINOR_VERSION) "." \
-+                              ELECTRON_STRINGIFY(ELECTRON_PATCH_VERSION)     \
-+                              ELECTRON_TAG "-pre"
-+#endif
-+
-+#define ELECTRON_VERSION "v" ELECTRON_VERSION_STRING
-+
-+
-+#define ELECTRON_VERSION_AT_LEAST(major, minor, patch) \
-+  (( (major) < ELECTRON_MAJOR_VERSION) \
-+  || ((major) == ELECTRON_MAJOR_VERSION && (minor) < ELECTRON_MINOR_VERSION) \
-+  || ((major) == ELECTRON_MAJOR_VERSION && (minor) == ELECTRON_MINOR_VERSION && (patch) <= ELECTRON_PATCH_VERSION))
-+
-+#endif /* ELECTRON_VERSION_H */
-added in remote
-  their  100644 15b242c336468a263da8a390300e9a36bc6dfee6 electron/common/google_api_key.h
-@@ -0,0 +1,12 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_COMMON_GOOGLE_API_KEY_H_
-+#define ELECTRON_COMMON_GOOGLE_API_KEY_H_
-+
-+#ifndef GOOGLEAPIS_API_KEY
-+#define GOOGLEAPIS_API_KEY "AIzaSyAQfxPJiounkhOjODEO5ZieffeBv6yft2Q"
-+#endif
-+
-+#endif  // ELECTRON_COMMON_GOOGLE_API_KEY_H_
-added in remote
-  their  100644 33456dd68c15d84ef2b1444161f026bd4bc93fac electron/common/id_weak_map.cc
-@@ -0,0 +1,94 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/common/id_weak_map.h"
-+
-+#include <utility>
-+
-+#include "native_mate/converter.h"
-+
-+namespace electron {
-+
-+namespace {
-+
-+struct ObjectKey {
-+  ObjectKey(int id, IDWeakMap* map) : id(id), map(map) {}
-+  int id;
-+  IDWeakMap* map;
-+};
-+
-+void OnObjectGC(const v8::WeakCallbackInfo<ObjectKey>& data) {
-+  ObjectKey* key = data.GetParameter();
-+  key->map->Remove(key->id);
-+  delete key;
-+}
-+
-+}  // namespace
-+
-+IDWeakMap::IDWeakMap() : next_id_(0) {
-+}
-+
-+IDWeakMap::~IDWeakMap() {
-+}
-+
-+void IDWeakMap::Set(v8::Isolate* isolate,
-+                    int32_t id,
-+                    v8::Local<v8::Object> object) {
-+  auto global = make_linked_ptr(new v8::Global<v8::Object>(isolate, object));
-+  ObjectKey* key = new ObjectKey(id, this);
-+  global->SetWeak(key, OnObjectGC, v8::WeakCallbackType::kParameter);
-+  map_[id] = global;
-+}
-+
-+int32_t IDWeakMap::Add(v8::Isolate* isolate, v8::Local<v8::Object> object) {
-+  int32_t id = GetNextID();
-+  Set(isolate, id, object);
-+  return id;
-+}
-+
-+v8::MaybeLocal<v8::Object> IDWeakMap::Get(v8::Isolate* isolate, int32_t id) {
-+  auto iter = map_.find(id);
-+  if (iter == map_.end())
-+    return v8::MaybeLocal<v8::Object>();
-+  else
-+    return v8::Local<v8::Object>::New(isolate, *iter->second);
-+}
-+
-+bool IDWeakMap::Has(int32_t id) const {
-+  return map_.find(id) != map_.end();
-+}
-+
-+std::vector<int32_t> IDWeakMap::Keys() const {
-+  std::vector<int32_t> keys;
-+  keys.reserve(map_.size());
-+  for (const auto& iter : map_)
-+    keys.emplace_back(iter.first);
-+  return keys;
-+}
-+
-+std::vector<v8::Local<v8::Object>> IDWeakMap::Values(v8::Isolate* isolate) {
-+  std::vector<v8::Local<v8::Object>> keys;
-+  keys.reserve(map_.size());
-+  for (const auto& iter : map_)
-+    keys.emplace_back(v8::Local<v8::Object>::New(isolate, *iter.second));
-+  return keys;
-+}
-+
-+void IDWeakMap::Remove(int32_t id) {
-+  auto iter = map_.find(id);
-+  if (iter == map_.end())
-+    LOG(WARNING) << "Removing unexist object with ID " << id;
-+  else
-+    map_.erase(iter);
-+}
-+
-+void IDWeakMap::Clear() {
-+  map_.clear();
-+}
-+
-+int32_t IDWeakMap::GetNextID() {
-+  return ++next_id_;
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 1ba179fab601d6d29940da2b1deda5d1f95aaf76 electron/common/id_weak_map.h
-@@ -0,0 +1,61 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_COMMON_ID_WEAK_MAP_H_
-+#define ELECTRON_COMMON_ID_WEAK_MAP_H_
-+
-+#include <unordered_map>
-+#include <vector>
-+
-+#include "base/memory/linked_ptr.h"
-+#include "v8/include/v8.h"
-+
-+namespace electron {
-+
-+// Like ES6's WeakMap, but the key is Integer and the value is Weak Pointer.
-+class IDWeakMap {
-+ public:
-+  IDWeakMap();
-+  ~IDWeakMap();
-+
-+  // Sets the object to WeakMap with the given |id|.
-+  void Set(v8::Isolate* isolate, int32_t id, v8::Local<v8::Object> object);
-+
-+  // Adds |object| to WeakMap and returns its allocated |id|.
-+  int32_t Add(v8::Isolate* isolate, v8::Local<v8::Object> object);
-+
-+  // Gets the object from WeakMap by its |id|.
-+  v8::MaybeLocal<v8::Object> Get(v8::Isolate* isolate, int32_t id);
-+
-+  // Whethere there is an object with |id| in this WeakMap.
-+  bool Has(int32_t id) const;
-+
-+  // Returns IDs of all available objects.
-+  std::vector<int32_t> Keys() const;
-+
-+  // Returns all objects.
-+  std::vector<v8::Local<v8::Object>> Values(v8::Isolate* isolate);
-+
-+  // Remove object with |id| in the WeakMap.
-+  void Remove(int32_t key);
-+
-+  // Clears the weak map.
-+  void Clear();
-+
-+ private:
-+  // Returns next available ID.
-+  int32_t GetNextID();
-+
-+  // ID of next stored object.
-+  int32_t next_id_;
-+
-+  // Map of stored objects.
-+  std::unordered_map<int32_t, linked_ptr<v8::Global<v8::Object>>> map_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(IDWeakMap);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_COMMON_ID_WEAK_MAP_H_
-added in remote
-  their  100644 4504df65bc043c77aa77274fe8d5d57c71c8e16b electron/common/keyboard_util.cc
-@@ -0,0 +1,176 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include <string>
-+
-+#include "electron/common/keyboard_util.h"
-+#include "base/strings/string_number_conversions.h"
-+#include "base/strings/string_util.h"
-+
-+namespace electron {
-+
-+namespace {
-+
-+// Return key code of the char, and also determine whether the SHIFT key is
-+// pressed.
-+ui::KeyboardCode KeyboardCodeFromCharCode(base::char16 c, bool* shifted) {
-+  c = base::ToLowerASCII(c);
-+  *shifted = false;
-+  switch (c) {
-+    case 0x08: return ui::VKEY_BACK;
-+    case 0x7F: return ui::VKEY_DELETE;
-+    case 0x09: return ui::VKEY_TAB;
-+    case 0x0D: return ui::VKEY_RETURN;
-+    case 0x1B: return ui::VKEY_ESCAPE;
-+    case ' ': return ui::VKEY_SPACE;
-+
-+    case 'a': return ui::VKEY_A;
-+    case 'b': return ui::VKEY_B;
-+    case 'c': return ui::VKEY_C;
-+    case 'd': return ui::VKEY_D;
-+    case 'e': return ui::VKEY_E;
-+    case 'f': return ui::VKEY_F;
-+    case 'g': return ui::VKEY_G;
-+    case 'h': return ui::VKEY_H;
-+    case 'i': return ui::VKEY_I;
-+    case 'j': return ui::VKEY_J;
-+    case 'k': return ui::VKEY_K;
-+    case 'l': return ui::VKEY_L;
-+    case 'm': return ui::VKEY_M;
-+    case 'n': return ui::VKEY_N;
-+    case 'o': return ui::VKEY_O;
-+    case 'p': return ui::VKEY_P;
-+    case 'q': return ui::VKEY_Q;
-+    case 'r': return ui::VKEY_R;
-+    case 's': return ui::VKEY_S;
-+    case 't': return ui::VKEY_T;
-+    case 'u': return ui::VKEY_U;
-+    case 'v': return ui::VKEY_V;
-+    case 'w': return ui::VKEY_W;
-+    case 'x': return ui::VKEY_X;
-+    case 'y': return ui::VKEY_Y;
-+    case 'z': return ui::VKEY_Z;
-+
-+    case ')': *shifted = true; case '0': return ui::VKEY_0;
-+    case '!': *shifted = true; case '1': return ui::VKEY_1;
-+    case '@': *shifted = true; case '2': return ui::VKEY_2;
-+    case '#': *shifted = true; case '3': return ui::VKEY_3;
-+    case '$': *shifted = true; case '4': return ui::VKEY_4;
-+    case '%': *shifted = true; case '5': return ui::VKEY_5;
-+    case '^': *shifted = true; case '6': return ui::VKEY_6;
-+    case '&': *shifted = true; case '7': return ui::VKEY_7;
-+    case '*': *shifted = true; case '8': return ui::VKEY_8;
-+    case '(': *shifted = true; case '9': return ui::VKEY_9;
-+
-+    case ':': *shifted = true; case ';': return ui::VKEY_OEM_1;
-+    case '+': *shifted = true; case '=': return ui::VKEY_OEM_PLUS;
-+    case '<': *shifted = true; case ',': return ui::VKEY_OEM_COMMA;
-+    case '_': *shifted = true; case '-': return ui::VKEY_OEM_MINUS;
-+    case '>': *shifted = true; case '.': return ui::VKEY_OEM_PERIOD;
-+    case '?': *shifted = true; case '/': return ui::VKEY_OEM_2;
-+    case '~': *shifted = true; case '`': return ui::VKEY_OEM_3;
-+    case '{': *shifted = true; case '[': return ui::VKEY_OEM_4;
-+    case '|': *shifted = true; case '\\': return ui::VKEY_OEM_5;
-+    case '}': *shifted = true; case ']': return ui::VKEY_OEM_6;
-+    case '"': *shifted = true; case '\'': return ui::VKEY_OEM_7;
-+
-+    default: return ui::VKEY_UNKNOWN;
-+  }
-+}
-+
-+// Return key code represented by |str|.
-+ui::KeyboardCode KeyboardCodeFromKeyIdentifier(const std::string& s,
-+                                               bool* shifted) {
-+  std::string str = base::ToLowerASCII(s);
-+  if (str == "ctrl" || str == "control") {
-+    return ui::VKEY_CONTROL;
-+  } else if (str == "super" || str == "cmd" || str == "command" ||
-+             str == "meta") {
-+    return ui::VKEY_COMMAND;
-+  } else if (str == "commandorcontrol" || str == "cmdorctrl") {
-+#if defined(OS_MACOSX)
-+    return ui::VKEY_COMMAND;
-+#else
-+    return ui::VKEY_CONTROL;
-+#endif
-+  } else if (str == "alt" || str == "option") {
-+    return ui::VKEY_MENU;
-+  } else if (str == "shift") {
-+    return ui::VKEY_SHIFT;
-+  } else if (str == "altgr") {
-+    return ui::VKEY_ALTGR;
-+  } else if (str == "plus") {
-+    *shifted = true;
-+    return ui::VKEY_OEM_PLUS;
-+  } else if (str == "tab") {
-+    return ui::VKEY_TAB;
-+  } else if (str == "space") {
-+    return ui::VKEY_SPACE;
-+  } else if (str == "backspace") {
-+    return ui::VKEY_BACK;
-+  } else if (str == "delete") {
-+    return ui::VKEY_DELETE;
-+  } else if (str == "insert") {
-+    return ui::VKEY_INSERT;
-+  } else if (str == "enter" || str == "return") {
-+    return ui::VKEY_RETURN;
-+  } else if (str == "up") {
-+    return ui::VKEY_UP;
-+  } else if (str == "down") {
-+    return ui::VKEY_DOWN;
-+  } else if (str == "left") {
-+    return ui::VKEY_LEFT;
-+  } else if (str == "right") {
-+    return ui::VKEY_RIGHT;
-+  } else if (str == "home") {
-+    return ui::VKEY_HOME;
-+  } else if (str == "end") {
-+    return ui::VKEY_END;
-+  } else if (str == "pageup") {
-+    return ui::VKEY_PRIOR;
-+  } else if (str == "pagedown") {
-+    return ui::VKEY_NEXT;
-+  } else if (str == "esc" || str == "escape") {
-+    return ui::VKEY_ESCAPE;
-+  } else if (str == "volumemute") {
-+    return ui::VKEY_VOLUME_MUTE;
-+  } else if (str == "volumeup") {
-+    return ui::VKEY_VOLUME_UP;
-+  } else if (str == "volumedown") {
-+    return ui::VKEY_VOLUME_DOWN;
-+  } else if (str == "medianexttrack") {
-+    return ui::VKEY_MEDIA_NEXT_TRACK;
-+  } else if (str == "mediaprevioustrack") {
-+    return ui::VKEY_MEDIA_PREV_TRACK;
-+  } else if (str == "mediastop") {
-+    return ui::VKEY_MEDIA_STOP;
-+  } else if (str == "mediaplaypause") {
-+    return ui::VKEY_MEDIA_PLAY_PAUSE;
-+  } else if (str == "printscreen") {
-+    return ui::VKEY_SNAPSHOT;
-+  } else if (str.size() > 1 && str[0] == 'f') {
-+    // F1 - F24.
-+    int n;
-+    if (base::StringToInt(str.c_str() + 1, &n) && n > 0 && n < 25) {
-+      return static_cast<ui::KeyboardCode>(ui::VKEY_F1 + n - 1);
-+    } else {
-+      LOG(WARNING) << str << "is not available on keyboard";
-+      return ui::VKEY_UNKNOWN;
-+    }
-+  } else {
-+    LOG(WARNING) << "Invalid accelerator token: " << str;
-+    return ui::VKEY_UNKNOWN;
-+  }
-+}
-+
-+}  // namespace
-+
-+ui::KeyboardCode KeyboardCodeFromStr(const std::string& str, bool* shifted) {
-+  if (str.size() == 1)
-+    return KeyboardCodeFromCharCode(str[0], shifted);
-+  else
-+    return KeyboardCodeFromKeyIdentifier(str, shifted);
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 0dec464f4c0f5de1c9e49edd819a9b0fa3352f00 electron/common/keyboard_util.h
-@@ -0,0 +1,20 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_COMMON_KEYBOARD_UTIL_H_
-+#define ELECTRON_COMMON_KEYBOARD_UTIL_H_
-+
-+#include <string>
-+
-+#include "ui/events/keycodes/keyboard_codes.h"
-+
-+namespace electron {
-+
-+// Return key code of the |str|, and also determine whether the SHIFT key is
-+// pressed.
-+ui::KeyboardCode KeyboardCodeFromStr(const std::string& str, bool* shifted);
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_COMMON_KEYBOARD_UTIL_H_
-added in remote
-  their  100644 498cc377154bf0d1fb9ed0c6ad5959a0b5d1a5f3 electron/common/linux/application_info.cc
-@@ -0,0 +1,19 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include <string>
-+
-+#include "electron/common/electron_version.h"
-+
-+namespace brightray {
-+
-+std::string GetApplicationName() {
-+  return ELECTRON_PRODUCT_NAME;
-+}
-+
-+std::string GetApplicationVersion() {
-+  return ELECTRON_VERSION_STRING;
-+}
-+
-+}  // namespace brightray
-added in remote
-  their  100644 f920d2b36cfca98a9bf1d9f44e738e58a59ee65a electron/common/mouse_util.cc
-@@ -0,0 +1,62 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include <string>
-+#include "electron/common/mouse_util.h"
-+
-+using Cursor = blink::WebCursorInfo::Type;
-+
-+namespace electron {
-+
-+std::string CursorTypeToString(const content::WebCursor::CursorInfo& info) {
-+  switch (info.type) {
-+    case Cursor::TypePointer: return "default";
-+    case Cursor::TypeCross: return "crosshair";
-+    case Cursor::TypeHand: return "pointer";
-+    case Cursor::TypeIBeam: return "text";
-+    case Cursor::TypeWait: return "wait";
-+    case Cursor::TypeHelp: return "help";
-+    case Cursor::TypeEastResize: return "e-resize";
-+    case Cursor::TypeNorthResize: return "n-resize";
-+    case Cursor::TypeNorthEastResize: return "ne-resize";
-+    case Cursor::TypeNorthWestResize: return "nw-resize";
-+    case Cursor::TypeSouthResize: return "s-resize";
-+    case Cursor::TypeSouthEastResize: return "se-resize";
-+    case Cursor::TypeSouthWestResize: return "sw-resize";
-+    case Cursor::TypeWestResize: return "w-resize";
-+    case Cursor::TypeNorthSouthResize: return "ns-resize";
-+    case Cursor::TypeEastWestResize: return "ew-resize";
-+    case Cursor::TypeNorthEastSouthWestResize: return "nesw-resize";
-+    case Cursor::TypeNorthWestSouthEastResize: return "nwse-resize";
-+    case Cursor::TypeColumnResize: return "col-resize";
-+    case Cursor::TypeRowResize: return "row-resize";
-+    case Cursor::TypeMiddlePanning: return "m-panning";
-+    case Cursor::TypeEastPanning: return "e-panning";
-+    case Cursor::TypeNorthPanning: return "n-panning";
-+    case Cursor::TypeNorthEastPanning: return "ne-panning";
-+    case Cursor::TypeNorthWestPanning: return "nw-panning";
-+    case Cursor::TypeSouthPanning: return "s-panning";
-+    case Cursor::TypeSouthEastPanning: return "se-panning";
-+    case Cursor::TypeSouthWestPanning: return "sw-panning";
-+    case Cursor::TypeWestPanning: return "w-panning";
-+    case Cursor::TypeMove: return "move";
-+    case Cursor::TypeVerticalText: return "vertical-text";
-+    case Cursor::TypeCell: return "cell";
-+    case Cursor::TypeContextMenu: return "context-menu";
-+    case Cursor::TypeAlias: return "alias";
-+    case Cursor::TypeProgress: return "progress";
-+    case Cursor::TypeNoDrop: return "nodrop";
-+    case Cursor::TypeCopy: return "copy";
-+    case Cursor::TypeNone: return "none";
-+    case Cursor::TypeNotAllowed: return "not-allowed";
-+    case Cursor::TypeZoomIn: return "zoom-in";
-+    case Cursor::TypeZoomOut: return "zoom-out";
-+    case Cursor::TypeGrab: return "grab";
-+    case Cursor::TypeGrabbing: return "grabbing";
-+    case Cursor::TypeCustom: return "custom";
-+    default: return "default";
-+  }
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 54e549b4ac7b592d5eccea6e447d1bcf132a9fee electron/common/mouse_util.h
-@@ -0,0 +1,36 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_COMMON_MOUSE_UTIL_H_
-+#define ELECTRON_COMMON_MOUSE_UTIL_H_
-+
-+#include <string>
-+#include "content/common/cursors/webcursor.h"
-+#include "ipc/ipc_message_macros.h"
-+
-+// IPC macros similar to the already existing ones in the chromium source.
-+// We need these to listen to the cursor change IPC message while still
-+// letting chromium handle the actual cursor change by setting handled = false.
-+#define IPC_MESSAGE_HANDLER_CODE(msg_class, member_func, code)                 \
-+  IPC_MESSAGE_FORWARD_CODE(msg_class, this,                                    \
-+    _IpcMessageHandlerClass::member_func, code)
-+
-+#define IPC_MESSAGE_FORWARD_CODE(msg_class, obj, member_func, code)            \
-+    case msg_class::ID: {                                                      \
-+        TRACK_RUN_IN_THIS_SCOPED_REGION(member_func);                          \
-+        if (!msg_class::Dispatch(&ipc_message__, obj, this, param__,           \
-+                                 &member_func))                                \
-+          ipc_message__.set_dispatch_error();                                  \
-+        code;                                                                  \
-+      }                                                                        \
-+      break;
-+
-+namespace electron {
-+
-+// Returns the cursor's type as a string.
-+std::string CursorTypeToString(const content::WebCursor::CursorInfo& info);
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_COMMON_MOUSE_UTIL_H_
-added in remote
-  their  100644 142a2e73a6559b29d2f14c111b779253470b5638 electron/common/native_mate_converters/accelerator_converter.cc
-@@ -0,0 +1,22 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/common/native_mate_converters/accelerator_converter.h"
-+
-+#include <string>
-+
-+#include "electron/browser/ui/accelerator_util.h"
-+
-+namespace mate {
-+
-+// static
-+bool Converter<ui::Accelerator>::FromV8(
-+    v8::Isolate* isolate, v8::Local<v8::Value> val, ui::Accelerator* out) {
-+  std::string keycode;
-+  if (!ConvertFromV8(isolate, val, &keycode))
-+    return false;
-+  return accelerator_util::StringToAccelerator(keycode, out);
-+}
-+
-+}  // namespace mate
-added in remote
-  their  100644 2941bcb7a9e24728b3cefcb3b9f805d7bdba4e43 electron/common/native_mate_converters/accelerator_converter.h
-@@ -0,0 +1,24 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_COMMON_NATIVE_MATE_CONVERTERS_ACCELERATOR_CONVERTER_H_
-+#define ELECTRON_COMMON_NATIVE_MATE_CONVERTERS_ACCELERATOR_CONVERTER_H_
-+
-+#include "native_mate/converter.h"
-+
-+namespace ui {
-+class Accelerator;
-+}
-+
-+namespace mate {
-+
-+template<>
-+struct Converter<ui::Accelerator> {
-+  static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
-+                     ui::Accelerator* out);
-+};
-+
-+}  // namespace mate
-+
-+#endif  // ELECTRON_COMMON_NATIVE_MATE_CONVERTERS_ACCELERATOR_CONVERTER_H_
-added in remote
-  their  100644 6307bad231e6754231304f8f99dd1b80b309d236 electron/common/native_mate_converters/blink_converter.cc
-@@ -0,0 +1,299 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/common/native_mate_converters/blink_converter.h"
-+
-+#include <string>
-+#include <vector>
-+
-+#include "electron/common/keyboard_util.h"
-+#include "base/strings/string_util.h"
-+#include "base/strings/utf_string_conversions.h"
-+#include "content/public/browser/native_web_keyboard_event.h"
-+#include "native_mate/dictionary.h"
-+#include "third_party/WebKit/public/web/WebDeviceEmulationParams.h"
-+#include "third_party/WebKit/public/web/WebFindOptions.h"
-+#include "third_party/WebKit/public/web/WebInputEvent.h"
-+
-+namespace {
-+
-+template<typename T>
-+int VectorToBitArray(const std::vector<T>& vec) {
-+  int bits = 0;
-+  for (const T& item : vec)
-+    bits |= item;
-+  return bits;
-+}
-+
-+}  // namespace
-+
-+namespace mate {
-+
-+template<>
-+struct Converter<base::char16> {
-+  static bool FromV8(v8::Isolate* isolate, v8::Handle<v8::Value> val,
-+                     base::char16* out) {
-+    base::string16 code = base::UTF8ToUTF16(V8ToString(val));
-+    if (code.length() != 1)
-+      return false;
-+    *out = code[0];
-+    return true;
-+  }
-+};
-+
-+template<>
-+struct Converter<blink::WebInputEvent::Type> {
-+  static bool FromV8(v8::Isolate* isolate, v8::Handle<v8::Value> val,
-+                     blink::WebInputEvent::Type* out) {
-+    std::string type = base::ToLowerASCII(V8ToString(val));
-+    if (type == "mousedown")
-+      *out = blink::WebInputEvent::MouseDown;
-+    else if (type == "mouseup")
-+      *out = blink::WebInputEvent::MouseUp;
-+    else if (type == "mousemove")
-+      *out = blink::WebInputEvent::MouseMove;
-+    else if (type == "mouseenter")
-+      *out = blink::WebInputEvent::MouseEnter;
-+    else if (type == "mouseleave")
-+      *out = blink::WebInputEvent::MouseLeave;
-+    else if (type == "contextmenu")
-+      *out = blink::WebInputEvent::ContextMenu;
-+    else if (type == "mousewheel")
-+      *out = blink::WebInputEvent::MouseWheel;
-+    else if (type == "keydown")
-+      *out = blink::WebInputEvent::RawKeyDown;
-+    else if (type == "keyup")
-+      *out = blink::WebInputEvent::KeyUp;
-+    else if (type == "char")
-+      *out = blink::WebInputEvent::Char;
-+    else if (type == "touchstart")
-+      *out = blink::WebInputEvent::TouchStart;
-+    else if (type == "touchmove")
-+      *out = blink::WebInputEvent::TouchMove;
-+    else if (type == "touchend")
-+      *out = blink::WebInputEvent::TouchEnd;
-+    else if (type == "touchcancel")
-+      *out = blink::WebInputEvent::TouchCancel;
-+    return true;
-+  }
-+};
-+
-+template<>
-+struct Converter<blink::WebMouseEvent::Button> {
-+  static bool FromV8(v8::Isolate* isolate, v8::Handle<v8::Value> val,
-+                     blink::WebMouseEvent::Button* out) {
-+    std::string button = base::ToLowerASCII(V8ToString(val));
-+    if (button == "left")
-+      *out = blink::WebMouseEvent::Button::ButtonLeft;
-+    else if (button == "middle")
-+      *out = blink::WebMouseEvent::Button::ButtonMiddle;
-+    else if (button == "right")
-+      *out = blink::WebMouseEvent::Button::ButtonRight;
-+    return true;
-+  }
-+};
-+
-+template<>
-+struct Converter<blink::WebInputEvent::Modifiers> {
-+  static bool FromV8(v8::Isolate* isolate, v8::Handle<v8::Value> val,
-+                     blink::WebInputEvent::Modifiers* out) {
-+    std::string modifier = base::ToLowerASCII(V8ToString(val));
-+    if (modifier == "shift")
-+      *out = blink::WebInputEvent::ShiftKey;
-+    else if (modifier == "control" || modifier == "ctrl")
-+      *out = blink::WebInputEvent::ControlKey;
-+    else if (modifier == "alt")
-+      *out = blink::WebInputEvent::AltKey;
-+    else if (modifier == "meta" || modifier == "command" || modifier == "cmd")
-+      *out = blink::WebInputEvent::MetaKey;
-+    else if (modifier == "iskeypad")
-+      *out = blink::WebInputEvent::IsKeyPad;
-+    else if (modifier == "isautorepeat")
-+      *out = blink::WebInputEvent::IsAutoRepeat;
-+    else if (modifier == "leftbuttondown")
-+      *out = blink::WebInputEvent::LeftButtonDown;
-+    else if (modifier == "middlebuttondown")
-+      *out = blink::WebInputEvent::MiddleButtonDown;
-+    else if (modifier == "rightbuttondown")
-+      *out = blink::WebInputEvent::RightButtonDown;
-+    else if (modifier == "capslock")
-+      *out = blink::WebInputEvent::CapsLockOn;
-+    else if (modifier == "numlock")
-+      *out = blink::WebInputEvent::NumLockOn;
-+    else if (modifier == "left")
-+      *out = blink::WebInputEvent::IsLeft;
-+    else if (modifier == "right")
-+      *out = blink::WebInputEvent::IsRight;
-+    return true;
-+  }
-+};
-+
-+int GetWebInputEventType(v8::Isolate* isolate, v8::Local<v8::Value> val) {
-+  blink::WebInputEvent::Type type = blink::WebInputEvent::Undefined;
-+  mate::Dictionary dict;
-+  ConvertFromV8(isolate, val, &dict) && dict.Get("type", &type);
-+  return type;
-+}
-+
-+bool Converter<blink::WebInputEvent>::FromV8(
-+    v8::Isolate* isolate, v8::Local<v8::Value> val,
-+    blink::WebInputEvent* out) {
-+  mate::Dictionary dict;
-+  if (!ConvertFromV8(isolate, val, &dict))
-+    return false;
-+  if (!dict.Get("type", &out->type))
-+    return false;
-+  std::vector<blink::WebInputEvent::Modifiers> modifiers;
-+  if (dict.Get("modifiers", &modifiers))
-+    out->modifiers = VectorToBitArray(modifiers);
-+  out->timeStampSeconds = base::Time::Now().ToDoubleT();
-+  return true;
-+}
-+
-+bool Converter<blink::WebKeyboardEvent>::FromV8(
-+    v8::Isolate* isolate, v8::Local<v8::Value> val,
-+    blink::WebKeyboardEvent* out) {
-+  mate::Dictionary dict;
-+  if (!ConvertFromV8(isolate, val, &dict))
-+    return false;
-+  if (!ConvertFromV8(isolate, val, static_cast<blink::WebInputEvent*>(out)))
-+    return false;
-+
-+  std::string str;
-+  bool shifted = false;
-+  if (dict.Get("keyCode", &str))
-+    out->windowsKeyCode = electron::KeyboardCodeFromStr(str, &shifted);
-+  else
-+    return false;
-+
-+  if (shifted)
-+    out->modifiers |= blink::WebInputEvent::ShiftKey;
-+  out->setKeyIdentifierFromWindowsKeyCode();
-+  if ((out->type == blink::WebInputEvent::Char ||
-+       out->type == blink::WebInputEvent::RawKeyDown) &&
-+      str.size() == 1) {
-+    out->text[0] = str[0];
-+    out->unmodifiedText[0] = str[0];
-+  }
-+  return true;
-+}
-+
-+bool Converter<content::NativeWebKeyboardEvent>::FromV8(
-+    v8::Isolate* isolate, v8::Local<v8::Value> val,
-+    content::NativeWebKeyboardEvent* out) {
-+  mate::Dictionary dict;
-+  if (!ConvertFromV8(isolate, val, &dict))
-+    return false;
-+  if (!ConvertFromV8(isolate, val, static_cast<blink::WebKeyboardEvent*>(out)))
-+    return false;
-+  dict.Get("skipInBrowser", &out->skip_in_browser);
-+  return true;
-+}
-+
-+bool Converter<blink::WebMouseEvent>::FromV8(
-+    v8::Isolate* isolate, v8::Local<v8::Value> val, blink::WebMouseEvent* out) {
-+  mate::Dictionary dict;
-+  if (!ConvertFromV8(isolate, val, &dict))
-+    return false;
-+  if (!ConvertFromV8(isolate, val, static_cast<blink::WebInputEvent*>(out)))
-+    return false;
-+  if (!dict.Get("x", &out->x) || !dict.Get("y", &out->y))
-+    return false;
-+  dict.Get("button", &out->button);
-+  dict.Get("globalX", &out->globalX);
-+  dict.Get("globalY", &out->globalY);
-+  dict.Get("movementX", &out->movementX);
-+  dict.Get("movementY", &out->movementY);
-+  dict.Get("clickCount", &out->clickCount);
-+  return true;
-+}
-+
-+bool Converter<blink::WebMouseWheelEvent>::FromV8(
-+    v8::Isolate* isolate, v8::Local<v8::Value> val,
-+    blink::WebMouseWheelEvent* out) {
-+  mate::Dictionary dict;
-+  if (!ConvertFromV8(isolate, val, &dict))
-+    return false;
-+  if (!ConvertFromV8(isolate, val, static_cast<blink::WebMouseEvent*>(out)))
-+    return false;
-+  dict.Get("deltaX", &out->deltaX);
-+  dict.Get("deltaY", &out->deltaY);
-+  dict.Get("wheelTicksX", &out->wheelTicksX);
-+  dict.Get("wheelTicksY", &out->wheelTicksY);
-+  dict.Get("accelerationRatioX", &out->accelerationRatioX);
-+  dict.Get("accelerationRatioY", &out->accelerationRatioY);
-+  dict.Get("hasPreciseScrollingDeltas", &out->hasPreciseScrollingDeltas);
-+  dict.Get("canScroll", &out->canScroll);
-+  return true;
-+}
-+
-+bool Converter<blink::WebFloatPoint>::FromV8(
-+    v8::Isolate* isolate, v8::Local<v8::Value> val, blink::WebFloatPoint* out) {
-+  mate::Dictionary dict;
-+  if (!ConvertFromV8(isolate, val, &dict))
-+    return false;
-+  return dict.Get("x", &out->x) && dict.Get("y", &out->y);
-+}
-+
-+bool Converter<blink::WebPoint>::FromV8(
-+    v8::Isolate* isolate, v8::Local<v8::Value> val, blink::WebPoint* out) {
-+  mate::Dictionary dict;
-+  if (!ConvertFromV8(isolate, val, &dict))
-+    return false;
-+  return dict.Get("x", &out->x) && dict.Get("y", &out->y);
-+}
-+
-+bool Converter<blink::WebSize>::FromV8(
-+    v8::Isolate* isolate, v8::Local<v8::Value> val, blink::WebSize* out) {
-+  mate::Dictionary dict;
-+  if (!ConvertFromV8(isolate, val, &dict))
-+    return false;
-+  return dict.Get("width", &out->width) && dict.Get("height", &out->height);
-+}
-+
-+bool Converter<blink::WebDeviceEmulationParams>::FromV8(
-+    v8::Isolate* isolate, v8::Local<v8::Value> val,
-+    blink::WebDeviceEmulationParams* out) {
-+  mate::Dictionary dict;
-+  if (!ConvertFromV8(isolate, val, &dict))
-+    return false;
-+
-+  std::string screen_position;
-+  if (dict.Get("screenPosition", &screen_position)) {
-+    screen_position = base::ToLowerASCII(screen_position);
-+    if (screen_position == "mobile")
-+      out->screenPosition = blink::WebDeviceEmulationParams::Mobile;
-+    else if (screen_position == "desktop")
-+      out->screenPosition = blink::WebDeviceEmulationParams::Desktop;
-+    else
-+      return false;
-+  }
-+
-+  dict.Get("screenSize", &out->screenSize);
-+  dict.Get("viewPosition", &out->viewPosition);
-+  dict.Get("deviceScaleFactor", &out->deviceScaleFactor);
-+  dict.Get("viewSize", &out->viewSize);
-+  dict.Get("fitToView", &out->fitToView);
-+  dict.Get("offset", &out->offset);
-+  dict.Get("scale", &out->scale);
-+  return true;
-+}
-+
-+bool Converter<blink::WebFindOptions>::FromV8(
-+    v8::Isolate* isolate,
-+    v8::Local<v8::Value> val,
-+    blink::WebFindOptions* out) {
-+  mate::Dictionary dict;
-+  if (!ConvertFromV8(isolate, val, &dict))
-+    return false;
-+
-+  dict.Get("forward", &out->forward);
-+  dict.Get("matchCase", &out->matchCase);
-+  dict.Get("findNext", &out->findNext);
-+  dict.Get("wordStart", &out->wordStart);
-+  dict.Get("medialCapitalAsWordStart", &out->medialCapitalAsWordStart);
-+  return true;
-+}
-+
-+}  // namespace mate
-added in remote
-  their  100644 421306f8a83bf7843e96a7e2174cbeba61f86eb6 electron/common/native_mate_converters/blink_converter.h
-@@ -0,0 +1,92 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_COMMON_NATIVE_MATE_CONVERTERS_BLINK_CONVERTER_H_
-+#define ELECTRON_COMMON_NATIVE_MATE_CONVERTERS_BLINK_CONVERTER_H_
-+
-+#include "native_mate/converter.h"
-+
-+namespace blink {
-+class WebInputEvent;
-+class WebMouseEvent;
-+class WebMouseWheelEvent;
-+class WebKeyboardEvent;
-+struct WebDeviceEmulationParams;
-+struct WebFindOptions;
-+struct WebFloatPoint;
-+struct WebPoint;
-+struct WebSize;
-+}  // namespace blink
-+
-+namespace content {
-+struct NativeWebKeyboardEvent;
-+}
-+
-+namespace mate {
-+
-+int GetWebInputEventType(v8::Isolate* isolate, v8::Local<v8::Value> val);
-+
-+template<>
-+struct Converter<blink::WebInputEvent> {
-+  static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
-+                     blink::WebInputEvent* out);
-+};
-+
-+template<>
-+struct Converter<blink::WebKeyboardEvent> {
-+  static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
-+                     blink::WebKeyboardEvent* out);
-+};
-+
-+template<>
-+struct Converter<content::NativeWebKeyboardEvent> {
-+  static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
-+                     content::NativeWebKeyboardEvent* out);
-+};
-+
-+template<>
-+struct Converter<blink::WebMouseEvent> {
-+  static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
-+                     blink::WebMouseEvent* out);
-+};
-+
-+template<>
-+struct Converter<blink::WebMouseWheelEvent> {
-+  static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
-+                     blink::WebMouseWheelEvent* out);
-+};
-+
-+template<>
-+struct Converter<blink::WebFloatPoint> {
-+  static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
-+                     blink::WebFloatPoint* out);
-+};
-+
-+template<>
-+struct Converter<blink::WebPoint> {
-+  static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
-+                     blink::WebPoint* out);
-+};
-+
-+template<>
-+struct Converter<blink::WebSize> {
-+  static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
-+                     blink::WebSize* out);
-+};
-+
-+template<>
-+struct Converter<blink::WebDeviceEmulationParams> {
-+  static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
-+                     blink::WebDeviceEmulationParams* out);
-+};
-+
-+template<>
-+struct Converter<blink::WebFindOptions> {
-+  static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
-+                     blink::WebFindOptions* out);
-+};
-+
-+}  // namespace mate
-+
-+#endif  // ELECTRON_COMMON_NATIVE_MATE_CONVERTERS_BLINK_CONVERTER_H_
-added in remote
-  their  100644 2c4d31ae293aebe6c4e660c9d85138bc97d39b89 electron/common/native_mate_converters/callback.cc
-@@ -0,0 +1,137 @@
-+// Copyright (c) 2015 GitHub, Inc. All rights reserved.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/common/native_mate_converters/callback.h"
-+
-+#include "content/public/browser/browser_thread.h"
-+
-+using content::BrowserThread;
-+
-+namespace mate {
-+
-+namespace internal {
-+
-+namespace {
-+
-+struct TranslaterHolder {
-+  Translater translater;
-+};
-+
-+// Cached JavaScript version of |CallTranslater|.
-+v8::Persistent<v8::FunctionTemplate> g_call_translater;
-+
-+void CallTranslater(v8::Local<v8::External> external,
-+                    v8::Local<v8::Object> state,
-+                    mate::Arguments* args) {
-+  v8::Isolate* isolate = args->isolate();
-+
-+  // Check if the callback has already been called.
-+  v8::Local<v8::String> called_symbol = mate::StringToSymbol(isolate, "called");
-+  if (state->Has(called_symbol)) {
-+    args->ThrowError("callback can only be called for once");
-+    return;
-+  } else {
-+    state->Set(called_symbol, v8::Boolean::New(isolate, true));
-+  }
-+
-+  TranslaterHolder* holder = static_cast<TranslaterHolder*>(external->Value());
-+  holder->translater.Run(args);
-+  delete holder;
-+}
-+
-+// func.bind(func, arg1).
-+// NB(zcbenz): Using C++11 version crashes VS.
-+v8::Local<v8::Value> BindFunctionWith(v8::Isolate* isolate,
-+                                      v8::Local<v8::Context> context,
-+                                      v8::Local<v8::Function> func,
-+                                      v8::Local<v8::Value> arg1,
-+                                      v8::Local<v8::Value> arg2) {
-+  v8::MaybeLocal<v8::Value> bind = func->Get(mate::StringToV8(isolate, "bind"));
-+  CHECK(!bind.IsEmpty());
-+  v8::Local<v8::Function> bind_func =
-+      v8::Local<v8::Function>::Cast(bind.ToLocalChecked());
-+  v8::Local<v8::Value> converted[] = { func, arg1, arg2 };
-+  return bind_func->Call(
-+      context, func, arraysize(converted), converted).ToLocalChecked();
-+}
-+
-+}  // namespace
-+
-+// Destroy the class on UI thread when possible.
-+struct DeleteOnUIThread {
-+  template<typename T>
-+  static void Destruct(const T* x) {
-+    if (Locker::IsBrowserProcess() &&
-+        !BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-+      BrowserThread::DeleteSoon(BrowserThread::UI, FROM_HERE, x);
-+    } else {
-+      delete x;
-+    }
-+  }
-+};
-+
-+// Like v8::Global, but ref-counted.
-+template<typename T>
-+class RefCountedGlobal : public base::RefCountedThreadSafe<RefCountedGlobal<T>,
-+                                                           DeleteOnUIThread> {
-+ public:
-+  RefCountedGlobal(v8::Isolate* isolate, v8::Local<v8::Value> value)
-+      : handle_(isolate, v8::Local<T>::Cast(value)) {
-+  }
-+
-+  bool IsAlive() const {
-+    return !handle_.IsEmpty();
-+  }
-+
-+  v8::Local<T> NewHandle(v8::Isolate* isolate) const {
-+    return v8::Local<T>::New(isolate, handle_);
-+  }
-+
-+ private:
-+  v8::Global<T> handle_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(RefCountedGlobal);
-+};
-+
-+SafeV8Function::SafeV8Function(v8::Isolate* isolate, v8::Local<v8::Value> value)
-+    : v8_function_(new RefCountedGlobal<v8::Function>(isolate, value)) {
-+}
-+
-+SafeV8Function::SafeV8Function(const SafeV8Function& other)
-+    : v8_function_(other.v8_function_) {
-+}
-+
-+SafeV8Function::~SafeV8Function() {
-+}
-+
-+bool SafeV8Function::IsAlive() const {
-+  return v8_function_.get() && v8_function_->IsAlive();
-+}
-+
-+v8::Local<v8::Function> SafeV8Function::NewHandle(v8::Isolate* isolate) const {
-+  return v8_function_->NewHandle(isolate);
-+}
-+
-+v8::Local<v8::Value> CreateFunctionFromTranslater(
-+    v8::Isolate* isolate, const Translater& translater) {
-+  // The FunctionTemplate is cached.
-+  if (g_call_translater.IsEmpty())
-+    g_call_translater.Reset(
-+        isolate,
-+        mate::CreateFunctionTemplate(isolate, base::Bind(&CallTranslater)));
-+
-+  v8::Local<v8::FunctionTemplate> call_translater =
-+      v8::Local<v8::FunctionTemplate>::New(isolate, g_call_translater);
-+  TranslaterHolder* holder = new TranslaterHolder;
-+  holder->translater = translater;
-+  return BindFunctionWith(isolate,
-+                          isolate->GetCurrentContext(),
-+                          call_translater->GetFunction(),
-+                          v8::External::New(isolate, holder),
-+                          v8::Object::New(isolate));
-+}
-+
-+}  // namespace internal
-+
-+}  // namespace mate
-added in remote
-  their  100644 77c92e191926789c7c2e61de9514caf5a68e63bc electron/common/native_mate_converters/callback.h
-@@ -0,0 +1,155 @@
-+// Copyright (c) 2015 GitHub, Inc. All rights reserved.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_COMMON_NATIVE_MATE_CONVERTERS_CALLBACK_H_
-+#define ELECTRON_COMMON_NATIVE_MATE_CONVERTERS_CALLBACK_H_
-+
-+#include <vector>
-+
-+#include "electron/common/api/locker.h"
-+#include "base/bind.h"
-+#include "base/callback.h"
-+#include "base/memory/weak_ptr.h"
-+#include "native_mate/function_template.h"
-+#include "native_mate/scoped_persistent.h"
-+#include "third_party/WebKit/public/web/WebScopedMicrotaskSuppression.h"
-+
-+namespace mate {
-+
-+namespace internal {
-+
-+template<typename T>
-+class RefCountedGlobal;
-+
-+// Manages the V8 function with RAII.
-+class SafeV8Function {
-+ public:
-+  SafeV8Function(v8::Isolate* isolate, v8::Local<v8::Value> value);
-+  SafeV8Function(const SafeV8Function& other);
-+  ~SafeV8Function();
-+
-+  bool IsAlive() const;
-+  v8::Local<v8::Function> NewHandle(v8::Isolate* isolate) const;
-+
-+ private:
-+  scoped_refptr<RefCountedGlobal<v8::Function>> v8_function_;
-+};
-+
-+// Helper to invoke a V8 function with C++ parameters.
-+template <typename Sig>
-+struct V8FunctionInvoker {};
-+
-+template <typename... ArgTypes>
-+struct V8FunctionInvoker<v8::Local<v8::Value>(ArgTypes...)> {
-+  static v8::Local<v8::Value> Go(v8::Isolate* isolate,
-+                                 const SafeV8Function& function,
-+                                 ArgTypes... raw) {
-+    Locker locker(isolate);
-+    v8::EscapableHandleScope handle_scope(isolate);
-+    if (!function.IsAlive())
-+      return v8::Null(isolate);
-+    scoped_ptr<blink::WebScopedRunV8Script> script_scope(
-+        Locker::IsBrowserProcess() ?
-+        nullptr : new blink::WebScopedRunV8Script);
-+    v8::Local<v8::Function> holder = function.NewHandle(isolate);
-+    v8::Local<v8::Context> context = holder->CreationContext();
-+    v8::Context::Scope context_scope(context);
-+    std::vector<v8::Local<v8::Value>> args = { ConvertToV8(isolate, raw)... };
-+    v8::Local<v8::Value> ret(holder->Call(holder, args.size(), &args.front()));
-+    return handle_scope.Escape(ret);
-+  }
-+};
-+
-+template <typename... ArgTypes>
-+struct V8FunctionInvoker<void(ArgTypes...)> {
-+  static void Go(v8::Isolate* isolate,
-+                 const SafeV8Function& function,
-+                 ArgTypes... raw) {
-+    Locker locker(isolate);
-+    v8::HandleScope handle_scope(isolate);
-+    if (!function.IsAlive())
-+      return;
-+    scoped_ptr<blink::WebScopedRunV8Script> script_scope(
-+        Locker::IsBrowserProcess() ?
-+        nullptr : new blink::WebScopedRunV8Script);
-+    v8::Local<v8::Function> holder = function.NewHandle(isolate);
-+    v8::Local<v8::Context> context = holder->CreationContext();
-+    v8::Context::Scope context_scope(context);
-+    std::vector<v8::Local<v8::Value>> args = { ConvertToV8(isolate, raw)... };
-+    holder->Call(holder, args.size(), &args.front());
-+  }
-+};
-+
-+template <typename ReturnType, typename... ArgTypes>
-+struct V8FunctionInvoker<ReturnType(ArgTypes...)> {
-+  static ReturnType Go(v8::Isolate* isolate,
-+                       const SafeV8Function& function,
-+                       ArgTypes... raw) {
-+    Locker locker(isolate);
-+    v8::HandleScope handle_scope(isolate);
-+    ReturnType ret = ReturnType();
-+    if (!function.IsAlive())
-+      return ret;
-+    scoped_ptr<blink::WebScopedRunV8Script> script_scope(
-+        Locker::IsBrowserProcess() ?
-+        nullptr : new blink::WebScopedRunV8Script);
-+    v8::Local<v8::Function> holder = function.NewHandle(isolate);
-+    v8::Local<v8::Context> context = holder->CreationContext();
-+    v8::Context::Scope context_scope(context);
-+    std::vector<v8::Local<v8::Value>> args = { ConvertToV8(isolate, raw)... };
-+    v8::Local<v8::Value> result;
-+    auto maybe_result =
-+        holder->Call(context, holder, args.size(), &args.front());
-+    if (maybe_result.ToLocal(&result))
-+      Converter<ReturnType>::FromV8(isolate, result, &ret);
-+    return ret;
-+  }
-+};
-+
-+// Helper to pass a C++ funtion to JavaScript.
-+using Translater = base::Callback<void(Arguments* args)>;
-+v8::Local<v8::Value> CreateFunctionFromTranslater(
-+    v8::Isolate* isolate, const Translater& translater);
-+
-+// Calls callback with Arguments.
-+template <typename Sig>
-+struct NativeFunctionInvoker {};
-+
-+template <typename ReturnType, typename... ArgTypes>
-+struct NativeFunctionInvoker<ReturnType(ArgTypes...)> {
-+  static void Go(base::Callback<ReturnType(ArgTypes...)> val, Arguments* args) {
-+    using Indices = typename IndicesGenerator<sizeof...(ArgTypes)>::type;
-+    Invoker<Indices, ArgTypes...> invoker(args, 0);
-+    if (invoker.IsOK())
-+      invoker.DispatchToCallback(val);
-+  }
-+};
-+
-+}  // namespace internal
-+
-+template<typename Sig>
-+struct Converter<base::Callback<Sig>> {
-+  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-+                                   const base::Callback<Sig>& val) {
-+    // We don't use CreateFunctionTemplate here because it creates a new
-+    // FunctionTemplate everytime, which is cached by V8 and causes leaks.
-+    internal::Translater translater = base::Bind(
-+        &internal::NativeFunctionInvoker<Sig>::Go, val);
-+    return internal::CreateFunctionFromTranslater(isolate, translater);
-+  }
-+  static bool FromV8(v8::Isolate* isolate,
-+                     v8::Local<v8::Value> val,
-+                     base::Callback<Sig>* out) {
-+    if (!val->IsFunction())
-+      return false;
-+
-+    *out = base::Bind(&internal::V8FunctionInvoker<Sig>::Go,
-+                      isolate, internal::SafeV8Function(isolate, val));
-+    return true;
-+  }
-+};
-+
-+}  // namespace mate
-+
-+#endif  // ELECTRON_COMMON_NATIVE_MATE_CONVERTERS_CALLBACK_H_
-added in remote
-  their  100644 f32bf20ab95c1481f72e91bd0028ee9ec12cd9d9 electron/common/native_mate_converters/content_converter.cc
-@@ -0,0 +1,181 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/common/native_mate_converters/content_converter.h"
-+
-+#include <string>
-+#include <vector>
-+
-+#include "electron/browser/api/electron_api_web_contents.h"
-+#include "electron/browser/web_contents_permission_helper.h"
-+#include "electron/common/native_mate_converters/callback.h"
-+#include "electron/common/native_mate_converters/string16_converter.h"
-+#include "content/public/browser/web_contents.h"
-+#include "content/public/common/context_menu_params.h"
-+#include "native_mate/dictionary.h"
-+
-+namespace {
-+
-+void ExecuteCommand(content::WebContents* web_contents,
-+                    int action,
-+                    const content::CustomContextMenuContext& context) {
-+  web_contents->ExecuteCustomContextMenuCommand(action, context);
-+}
-+
-+// Forward declaration for nested recursive call.
-+v8::Local<v8::Value> MenuToV8(v8::Isolate* isolate,
-+                              content::WebContents* web_contents,
-+                              const content::CustomContextMenuContext& context,
-+                              const std::vector<content::MenuItem>& menu);
-+
-+v8::Local<v8::Value> MenuItemToV8(
-+    v8::Isolate* isolate,
-+    content::WebContents* web_contents,
-+    const content::CustomContextMenuContext& context,
-+    const content::MenuItem& item) {
-+  mate::Dictionary v8_item = mate::Dictionary::CreateEmpty(isolate);
-+  switch (item.type) {
-+    case content::MenuItem::CHECKABLE_OPTION:
-+    case content::MenuItem::GROUP:
-+      v8_item.Set("checked", item.checked);
-+    case content::MenuItem::OPTION:
-+    case content::MenuItem::SUBMENU:
-+      v8_item.Set("label", item.label);
-+      v8_item.Set("enabled", item.enabled);
-+    default:
-+      v8_item.Set("type", item.type);
-+  }
-+  if (item.type == content::MenuItem::SUBMENU)
-+    v8_item.Set("submenu",
-+                MenuToV8(isolate, web_contents, context, item.submenu));
-+  else if (item.action > 0)
-+    v8_item.Set("click",
-+                base::Bind(ExecuteCommand, web_contents, item.action, context));
-+  return v8_item.GetHandle();
-+}
-+
-+v8::Local<v8::Value> MenuToV8(v8::Isolate* isolate,
-+                              content::WebContents* web_contents,
-+                              const content::CustomContextMenuContext& context,
-+                              const std::vector<content::MenuItem>& menu) {
-+  std::vector<v8::Local<v8::Value>> v8_menu;
-+  for (const auto& menu_item : menu)
-+    v8_menu.push_back(MenuItemToV8(isolate, web_contents, context, menu_item));
-+  return mate::ConvertToV8(isolate, v8_menu);
-+}
-+
-+}  // namespace
-+
-+namespace mate {
-+
-+// static
-+v8::Local<v8::Value> Converter<content::MenuItem::Type>::ToV8(
-+    v8::Isolate* isolate, const content::MenuItem::Type& val) {
-+  switch (val) {
-+    case content::MenuItem::CHECKABLE_OPTION:
-+      return StringToV8(isolate, "checkbox");
-+    case content::MenuItem::GROUP:
-+      return StringToV8(isolate, "radio");
-+    case content::MenuItem::SEPARATOR:
-+      return StringToV8(isolate, "separator");
-+    case content::MenuItem::SUBMENU:
-+      return StringToV8(isolate, "submenu");
-+    case content::MenuItem::OPTION:
-+    default:
-+      return StringToV8(isolate, "normal");
-+  }
-+}
-+
-+// static
-+v8::Local<v8::Value> Converter<ContextMenuParamsWithWebContents>::ToV8(
-+    v8::Isolate* isolate, const ContextMenuParamsWithWebContents& val) {
-+  const auto& params = val.first;
-+  mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
-+  dict.Set("x", params.x);
-+  dict.Set("y", params.y);
-+  if (params.custom_context.is_pepper_menu)
-+    dict.Set("menu", MenuToV8(isolate, val.second, params.custom_context,
-+                              params.custom_items));
-+  return mate::ConvertToV8(isolate, dict);
-+}
-+
-+// static
-+bool Converter<content::PermissionStatus>::FromV8(
-+    v8::Isolate* isolate,
-+    v8::Local<v8::Value> val,
-+    content::PermissionStatus* out) {
-+  bool result;
-+  if (!ConvertFromV8(isolate, val, &result))
-+    return false;
-+
-+  if (result)
-+    *out = content::PERMISSION_STATUS_GRANTED;
-+  else
-+    *out = content::PERMISSION_STATUS_DENIED;
-+
-+  return true;
-+}
-+
-+// static
-+v8::Local<v8::Value> Converter<content::PermissionType>::ToV8(
-+    v8::Isolate* isolate, const content::PermissionType& val) {
-+  using PermissionType = electron::WebContentsPermissionHelper::PermissionType;
-+  switch (val) {
-+    case content::PermissionType::MIDI_SYSEX:
-+      return StringToV8(isolate, "midiSysex");
-+    case content::PermissionType::PUSH_MESSAGING:
-+      return StringToV8(isolate, "pushMessaging");
-+    case content::PermissionType::NOTIFICATIONS:
-+      return StringToV8(isolate, "notifications");
-+    case content::PermissionType::GEOLOCATION:
-+      return StringToV8(isolate, "geolocation");
-+    case content::PermissionType::AUDIO_CAPTURE:
-+    case content::PermissionType::VIDEO_CAPTURE:
-+      return StringToV8(isolate, "media");
-+    case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER:
-+      return StringToV8(isolate, "mediaKeySystem");
-+    case content::PermissionType::MIDI:
-+      return StringToV8(isolate, "midi");
-+    default:
-+      break;
-+  }
-+
-+  if (val == (content::PermissionType)(PermissionType::POINTER_LOCK))
-+    return StringToV8(isolate, "pointerLock");
-+  else if (val == (content::PermissionType)(PermissionType::FULLSCREEN))
-+    return StringToV8(isolate, "fullscreen");
-+
-+  return StringToV8(isolate, "unknown");
-+}
-+
-+// static
-+bool Converter<content::StopFindAction>::FromV8(
-+    v8::Isolate* isolate,
-+    v8::Local<v8::Value> val,
-+    content::StopFindAction* out) {
-+  std::string action;
-+  if (!ConvertFromV8(isolate, val, &action))
-+    return false;
-+
-+  if (action == "clearSelection")
-+    *out = content::STOP_FIND_ACTION_CLEAR_SELECTION;
-+  else if (action == "keepSelection")
-+    *out = content::STOP_FIND_ACTION_KEEP_SELECTION;
-+  else if (action == "activateSelection")
-+    *out = content::STOP_FIND_ACTION_ACTIVATE_SELECTION;
-+  else
-+    return false;
-+
-+  return true;
-+}
-+
-+// static
-+v8::Local<v8::Value> Converter<content::WebContents*>::ToV8(
-+    v8::Isolate* isolate, content::WebContents* val) {
-+  if (!val)
-+    return v8::Null(isolate);
-+  return electron::api::WebContents::CreateFrom(isolate, val).ToV8();
-+}
-+
-+}  // namespace mate
-added in remote
-  their  100644 00764b15e3257bd4be31c2a9edeb3ff7353d5b44 electron/common/native_mate_converters/content_converter.h
-@@ -0,0 +1,64 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_COMMON_NATIVE_MATE_CONVERTERS_CONTENT_CONVERTER_H_
-+#define ELECTRON_COMMON_NATIVE_MATE_CONVERTERS_CONTENT_CONVERTER_H_
-+
-+#include <utility>
-+
-+#include "content/public/browser/permission_type.h"
-+#include "content/public/common/menu_item.h"
-+#include "content/public/common/permission_status.mojom.h"
-+#include "content/public/common/stop_find_action.h"
-+#include "native_mate/converter.h"
-+
-+namespace content {
-+struct ContextMenuParams;
-+class WebContents;
-+}
-+
-+using ContextMenuParamsWithWebContents =
-+    std::pair<content::ContextMenuParams, content::WebContents*>;
-+
-+namespace mate {
-+
-+template<>
-+struct Converter<content::MenuItem::Type> {
-+  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-+                                   const content::MenuItem::Type& val);
-+};
-+
-+template<>
-+struct Converter<ContextMenuParamsWithWebContents> {
-+  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-+                                   const ContextMenuParamsWithWebContents& val);
-+};
-+
-+template<>
-+struct Converter<content::PermissionStatus> {
-+  static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
-+                     content::PermissionStatus* out);
-+};
-+
-+template<>
-+struct Converter<content::PermissionType> {
-+  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-+                                   const content::PermissionType& val);
-+};
-+
-+template<>
-+struct Converter<content::StopFindAction> {
-+  static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
-+                     content::StopFindAction* out);
-+};
-+
-+template<>
-+struct Converter<content::WebContents*> {
-+  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-+                                   content::WebContents* val);
-+};
-+
-+}  // namespace mate
-+
-+#endif  // ELECTRON_COMMON_NATIVE_MATE_CONVERTERS_CONTENT_CONVERTER_H_
-added in remote
-  their  100644 28b965e16055f0968ae3b3dd2f4a706315698caa electron/common/native_mate_converters/file_path_converter.h
-@@ -0,0 +1,39 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_COMMON_NATIVE_MATE_CONVERTERS_FILE_PATH_CONVERTER_H_
-+#define ELECTRON_COMMON_NATIVE_MATE_CONVERTERS_FILE_PATH_CONVERTER_H_
-+
-+#include <string>
-+
-+#include "electron/common/native_mate_converters/string16_converter.h"
-+#include "base/files/file_path.h"
-+
-+namespace mate {
-+
-+template<>
-+struct Converter<base::FilePath> {
-+  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-+                                    const base::FilePath& val) {
-+    return Converter<base::FilePath::StringType>::ToV8(isolate, val.value());
-+  }
-+  static bool FromV8(v8::Isolate* isolate,
-+                     v8::Local<v8::Value> val,
-+                     base::FilePath* out) {
-+    if (val->IsNull())
-+      return true;
-+
-+    base::FilePath::StringType path;
-+    if (Converter<base::FilePath::StringType>::FromV8(isolate, val, &path)) {
-+      *out = base::FilePath(path);
-+      return true;
-+    } else {
-+      return false;
-+    }
-+  }
-+};
-+
-+}  // namespace mate
-+
-+#endif  // ELECTRON_COMMON_NATIVE_MATE_CONVERTERS_FILE_PATH_CONVERTER_H_
-added in remote
-  their  100644 8de28554eb036b8d6af872bfb772508857b2411f electron/common/native_mate_converters/gfx_converter.cc
-@@ -0,0 +1,114 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/common/native_mate_converters/gfx_converter.h"
-+
-+#include "native_mate/dictionary.h"
-+#include "ui/gfx/geometry/point.h"
-+#include "ui/gfx/geometry/rect.h"
-+#include "ui/gfx/screen.h"
-+#include "ui/gfx/geometry/size.h"
-+
-+namespace mate {
-+
-+v8::Local<v8::Value> Converter<gfx::Point>::ToV8(v8::Isolate* isolate,
-+                                                  const gfx::Point& val) {
-+  mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
-+  dict.SetHidden("simple", true);
-+  dict.Set("x", val.x());
-+  dict.Set("y", val.y());
-+  return dict.GetHandle();
-+}
-+
-+bool Converter<gfx::Point>::FromV8(v8::Isolate* isolate,
-+                                   v8::Local<v8::Value> val,
-+                                   gfx::Point* out) {
-+  mate::Dictionary dict;
-+  if (!ConvertFromV8(isolate, val, &dict))
-+    return false;
-+  int x, y;
-+  if (!dict.Get("x", &x) || !dict.Get("y", &y))
-+    return false;
-+  *out = gfx::Point(x, y);
-+  return true;
-+}
-+
-+v8::Local<v8::Value> Converter<gfx::Size>::ToV8(v8::Isolate* isolate,
-+                                                  const gfx::Size& val) {
-+  mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
-+  dict.SetHidden("simple", true);
-+  dict.Set("width", val.width());
-+  dict.Set("height", val.height());
-+  return dict.GetHandle();
-+}
-+
-+bool Converter<gfx::Size>::FromV8(v8::Isolate* isolate,
-+                                  v8::Local<v8::Value> val,
-+                                  gfx::Size* out) {
-+  mate::Dictionary dict;
-+  if (!ConvertFromV8(isolate, val, &dict))
-+    return false;
-+  int width, height;
-+  if (!dict.Get("width", &width) || !dict.Get("height", &height))
-+    return false;
-+  *out = gfx::Size(width, height);
-+  return true;
-+}
-+
-+v8::Local<v8::Value> Converter<gfx::Rect>::ToV8(v8::Isolate* isolate,
-+                                                 const gfx::Rect& val) {
-+  mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
-+  dict.SetHidden("simple", true);
-+  dict.Set("x", val.x());
-+  dict.Set("y", val.y());
-+  dict.Set("width", val.width());
-+  dict.Set("height", val.height());
-+  return dict.GetHandle();
-+}
-+
-+bool Converter<gfx::Rect>::FromV8(v8::Isolate* isolate,
-+                                  v8::Local<v8::Value> val,
-+                                  gfx::Rect* out) {
-+  mate::Dictionary dict;
-+  if (!ConvertFromV8(isolate, val, &dict))
-+    return false;
-+  int x, y, width, height;
-+  if (!dict.Get("x", &x) || !dict.Get("y", &y) ||
-+      !dict.Get("width", &width) || !dict.Get("height", &height))
-+    return false;
-+  *out = gfx::Rect(x, y, width, height);
-+  return true;
-+}
-+
-+template<>
-+struct Converter<gfx::Display::TouchSupport> {
-+  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-+                                    const gfx::Display::TouchSupport& val) {
-+    switch (val) {
-+      case gfx::Display::TOUCH_SUPPORT_AVAILABLE:
-+        return StringToV8(isolate, "available");
-+      case gfx::Display::TOUCH_SUPPORT_UNAVAILABLE:
-+        return StringToV8(isolate, "unavailable");
-+      default:
-+        return StringToV8(isolate, "unknown");
-+    }
-+  }
-+};
-+
-+v8::Local<v8::Value> Converter<gfx::Display>::ToV8(v8::Isolate* isolate,
-+                                                    const gfx::Display& val) {
-+  mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
-+  dict.SetHidden("simple", true);
-+  dict.Set("id", val.id());
-+  dict.Set("bounds", val.bounds());
-+  dict.Set("workArea", val.work_area());
-+  dict.Set("size", val.size());
-+  dict.Set("workAreaSize", val.work_area_size());
-+  dict.Set("scaleFactor", val.device_scale_factor());
-+  dict.Set("rotation", val.RotationAsDegree());
-+  dict.Set("touchSupport", val.touch_support());
-+  return dict.GetHandle();
-+}
-+
-+}  // namespace mate
-added in remote
-  their  100644 eb4a98f93ec7a98160c41f23ae8e79e8bd66ada7 electron/common/native_mate_converters/gfx_converter.h
-@@ -0,0 +1,57 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_COMMON_NATIVE_MATE_CONVERTERS_GFX_CONVERTER_H_
-+#define ELECTRON_COMMON_NATIVE_MATE_CONVERTERS_GFX_CONVERTER_H_
-+
-+#include "native_mate/converter.h"
-+
-+namespace gfx {
-+class Point;
-+class Size;
-+class Rect;
-+class Display;
-+}
-+
-+namespace mate {
-+
-+template<>
-+struct Converter<gfx::Point> {
-+  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-+                                    const gfx::Point& val);
-+  static bool FromV8(v8::Isolate* isolate,
-+                     v8::Local<v8::Value> val,
-+                     gfx::Point* out);
-+};
-+
-+template<>
-+struct Converter<gfx::Size> {
-+  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-+                                    const gfx::Size& val);
-+  static bool FromV8(v8::Isolate* isolate,
-+                     v8::Local<v8::Value> val,
-+                     gfx::Size* out);
-+};
-+
-+template<>
-+struct Converter<gfx::Rect> {
-+  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-+                                    const gfx::Rect& val);
-+  static bool FromV8(v8::Isolate* isolate,
-+                     v8::Local<v8::Value> val,
-+                     gfx::Rect* out);
-+};
-+
-+template<>
-+struct Converter<gfx::Display> {
-+  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-+                                    const gfx::Display& val);
-+  static bool FromV8(v8::Isolate* isolate,
-+                     v8::Local<v8::Value> val,
-+                     gfx::Display* out);
-+};
-+
-+}  // namespace mate
-+
-+#endif  // ELECTRON_COMMON_NATIVE_MATE_CONVERTERS_GFX_CONVERTER_H_
-added in remote
-  their  100644 343df5d654fe40063e62598281965048b05b0fca electron/common/native_mate_converters/gurl_converter.h
-@@ -0,0 +1,36 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_COMMON_NATIVE_MATE_CONVERTERS_GURL_CONVERTER_H_
-+#define ELECTRON_COMMON_NATIVE_MATE_CONVERTERS_GURL_CONVERTER_H_
-+
-+#include <string>
-+
-+#include "native_mate/converter.h"
-+#include "url/gurl.h"
-+
-+namespace mate {
-+
-+template<>
-+struct Converter<GURL> {
-+  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-+                                    const GURL& val) {
-+    return ConvertToV8(isolate, val.spec());
-+  }
-+  static bool FromV8(v8::Isolate* isolate,
-+                     v8::Local<v8::Value> val,
-+                     GURL* out) {
-+    std::string url;
-+    if (Converter<std::string>::FromV8(isolate, val, &url)) {
-+      *out = GURL(url);
-+      return true;
-+    } else {
-+      return false;
-+    }
-+  }
-+};
-+
-+}  // namespace mate
-+
-+#endif  // ELECTRON_COMMON_NATIVE_MATE_CONVERTERS_GURL_CONVERTER_H_
-added in remote
-  their  100644 6998d1bf4c983005120d11473cce6e7a1f0d44ac electron/common/native_mate_converters/image_converter.cc
-@@ -0,0 +1,51 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/common/native_mate_converters/image_converter.h"
-+
-+#include "electron/common/api/electron_api_native_image.h"
-+#include "electron/common/native_mate_converters/file_path_converter.h"
-+#include "ui/gfx/image/image_skia.h"
-+
-+namespace mate {
-+
-+bool Converter<gfx::ImageSkia>::FromV8(v8::Isolate* isolate,
-+                                       v8::Local<v8::Value> val,
-+                                       gfx::ImageSkia* out) {
-+  gfx::Image image;
-+  if (!ConvertFromV8(isolate, val, &image))
-+    return false;
-+
-+  *out = image.AsImageSkia();
-+  return true;
-+}
-+
-+bool Converter<gfx::Image>::FromV8(v8::Isolate* isolate,
-+                                   v8::Local<v8::Value> val,
-+                                   gfx::Image* out) {
-+  if (val->IsNull())
-+    return true;
-+
-+  Handle<electron::api::NativeImage> native_image;
-+  if (!ConvertFromV8(isolate, val, &native_image)) {
-+    // Try converting from file path.
-+    base::FilePath path;
-+    if (!Converter<base::FilePath>::FromV8(isolate, val, &path))
-+      return false;
-+
-+    native_image = electron::api::NativeImage::CreateFromPath(isolate, path);
-+    if (native_image->image().IsEmpty())
-+      return false;
-+  }
-+
-+  *out = native_image->image();
-+  return true;
-+}
-+
-+v8::Local<v8::Value> Converter<gfx::Image>::ToV8(v8::Isolate* isolate,
-+                                                  const gfx::Image& val) {
-+  return ConvertToV8(isolate, electron::api::NativeImage::Create(isolate, val));
-+}
-+
-+}  // namespace mate
-added in remote
-  their  100644 d9a5739303088f38ecee5e978fc473bd2089e69c electron/common/native_mate_converters/image_converter.h
-@@ -0,0 +1,35 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_COMMON_NATIVE_MATE_CONVERTERS_IMAGE_CONVERTER_H_
-+#define ELECTRON_COMMON_NATIVE_MATE_CONVERTERS_IMAGE_CONVERTER_H_
-+
-+#include "native_mate/converter.h"
-+
-+namespace gfx {
-+class Image;
-+class ImageSkia;
-+}
-+
-+namespace mate {
-+
-+template<>
-+struct Converter<gfx::ImageSkia> {
-+  static bool FromV8(v8::Isolate* isolate,
-+                     v8::Local<v8::Value> val,
-+                     gfx::ImageSkia* out);
-+};
-+
-+template<>
-+struct Converter<gfx::Image> {
-+  static bool FromV8(v8::Isolate* isolate,
-+                     v8::Local<v8::Value> val,
-+                     gfx::Image* out);
-+  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-+                                    const gfx::Image& val);
-+};
-+
-+}  // namespace mate
-+
-+#endif  // ELECTRON_COMMON_NATIVE_MATE_CONVERTERS_IMAGE_CONVERTER_H_
-added in remote
-  their  100644 3d63cadbec97e8b36131b4e0616444b915d6a485 electron/common/native_mate_converters/net_converter.cc
-@@ -0,0 +1,99 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/common/native_mate_converters/net_converter.h"
-+
-+#include <string>
-+#include <vector>
-+
-+#include "electron/common/node_includes.h"
-+#include "electron/common/native_mate_converters/gurl_converter.h"
-+#include "electron/common/native_mate_converters/value_converter.h"
-+#include "base/values.h"
-+#include "native_mate/dictionary.h"
-+#include "net/base/upload_bytes_element_reader.h"
-+#include "net/base/upload_data_stream.h"
-+#include "net/base/upload_element_reader.h"
-+#include "net/base/upload_file_element_reader.h"
-+#include "net/cert/x509_certificate.h"
-+#include "net/http/http_response_headers.h"
-+#include "net/url_request/url_request.h"
-+
-+namespace mate {
-+
-+// static
-+v8::Local<v8::Value> Converter<const net::URLRequest*>::ToV8(
-+    v8::Isolate* isolate, const net::URLRequest* val) {
-+  scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue);
-+  dict->SetString("method", val->method());
-+  std::string url;
-+  if (!val->url_chain().empty()) url = val->url().spec();
-+  dict->SetStringWithoutPathExpansion("url", url);
-+  dict->SetString("referrer", val->referrer());
-+  scoped_ptr<base::ListValue> list(new base::ListValue);
-+  electron::GetUploadData(list.get(), val);
-+  if (!list->empty())
-+    dict->Set("uploadData", std::move(list));
-+  return mate::ConvertToV8(isolate, *(dict.get()));
-+}
-+
-+// static
-+v8::Local<v8::Value> Converter<const net::AuthChallengeInfo*>::ToV8(
-+    v8::Isolate* isolate, const net::AuthChallengeInfo* val) {
-+  mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
-+  dict.Set("isProxy", val->is_proxy);
-+  dict.Set("scheme", val->scheme);
-+  dict.Set("host", val->challenger.host());
-+  dict.Set("port", static_cast<uint32_t>(val->challenger.port()));
-+  dict.Set("realm", val->realm);
-+  return mate::ConvertToV8(isolate, dict);
-+}
-+
-+// static
-+v8::Local<v8::Value> Converter<scoped_refptr<net::X509Certificate>>::ToV8(
-+    v8::Isolate* isolate, const scoped_refptr<net::X509Certificate>& val) {
-+  mate::Dictionary dict(isolate, v8::Object::New(isolate));
-+  std::string encoded_data;
-+  net::X509Certificate::GetPEMEncoded(
-+      val->os_cert_handle(), &encoded_data);
-+  auto buffer = node::Buffer::Copy(isolate,
-+                                   encoded_data.data(),
-+                                   encoded_data.size()).ToLocalChecked();
-+  dict.Set("data", buffer);
-+  dict.Set("issuerName", val->issuer().GetDisplayName());
-+  return dict.GetHandle();
-+}
-+
-+}  // namespace mate
-+
-+namespace electron {
-+
-+void GetUploadData(base::ListValue* upload_data_list,
-+                   const net::URLRequest* request) {
-+  const net::UploadDataStream* upload_data = request->get_upload();
-+  if (!upload_data)
-+    return;
-+  const std::vector<scoped_ptr<net::UploadElementReader>>* readers =
-+      upload_data->GetElementReaders();
-+  for (const auto& reader : *readers) {
-+    scoped_ptr<base::DictionaryValue> upload_data_dict(
-+        new base::DictionaryValue);
-+    if (reader->AsBytesReader()) {
-+      const net::UploadBytesElementReader* bytes_reader =
-+          reader->AsBytesReader();
-+      scoped_ptr<base::Value> bytes(
-+          base::BinaryValue::CreateWithCopiedBuffer(bytes_reader->bytes(),
-+                                                    bytes_reader->length()));
-+      upload_data_dict->Set("bytes", std::move(bytes));
-+    } else if (reader->AsFileReader()) {
-+      const net::UploadFileElementReader* file_reader =
-+          reader->AsFileReader();
-+      auto file_path = file_reader->path().AsUTF8Unsafe();
-+      upload_data_dict->SetStringWithoutPathExpansion("file", file_path);
-+    }
-+    upload_data_list->Append(std::move(upload_data_dict));
-+  }
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 5527ae4195242262dc2ba1263f0443e2810e2ece electron/common/native_mate_converters/net_converter.h
-@@ -0,0 +1,50 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_COMMON_NATIVE_MATE_CONVERTERS_NET_CONVERTER_H_
-+#define ELECTRON_COMMON_NATIVE_MATE_CONVERTERS_NET_CONVERTER_H_
-+
-+#include "base/memory/ref_counted.h"
-+#include "native_mate/converter.h"
-+
-+namespace base {
-+class ListValue;
-+}
-+
-+namespace net {
-+class AuthChallengeInfo;
-+class URLRequest;
-+class X509Certificate;
-+}
-+
-+namespace mate {
-+
-+template<>
-+struct Converter<const net::URLRequest*> {
-+  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-+                                   const net::URLRequest* val);
-+};
-+
-+template<>
-+struct Converter<const net::AuthChallengeInfo*> {
-+  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-+                                   const net::AuthChallengeInfo* val);
-+};
-+
-+template<>
-+struct Converter<scoped_refptr<net::X509Certificate>> {
-+  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-+      const scoped_refptr<net::X509Certificate>& val);
-+};
-+
-+}  // namespace mate
-+
-+namespace electron {
-+
-+void GetUploadData(base::ListValue* upload_data_list,
-+                   const net::URLRequest* request);
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_COMMON_NATIVE_MATE_CONVERTERS_NET_CONVERTER_H_
-added in remote
-  their  100644 db6fb3f5f729b1db5ef0fb4acef3b22a18ee5449 electron/common/native_mate_converters/string16_converter.h
-@@ -0,0 +1,40 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_COMMON_NATIVE_MATE_CONVERTERS_STRING16_CONVERTER_H_
-+#define ELECTRON_COMMON_NATIVE_MATE_CONVERTERS_STRING16_CONVERTER_H_
-+
-+#include "base/strings/string16.h"
-+#include "native_mate/converter.h"
-+
-+namespace mate {
-+
-+template<>
-+struct Converter<base::string16> {
-+  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-+                                    const base::string16& val) {
-+    return MATE_STRING_NEW_FROM_UTF16(
-+        isolate, reinterpret_cast<const uint16_t*>(val.data()), val.size());
-+  }
-+  static bool FromV8(v8::Isolate* isolate,
-+                     v8::Local<v8::Value> val,
-+                     base::string16* out) {
-+    if (!val->IsString())
-+      return false;
-+
-+    v8::String::Value s(val);
-+    out->assign(reinterpret_cast<const base::char16*>(*s), s.length());
-+    return true;
-+  }
-+};
-+
-+inline v8::Local<v8::String> StringToV8(
-+    v8::Isolate* isolate,
-+    const base::string16& input) {
-+  return ConvertToV8(isolate, input).As<v8::String>();
-+}
-+
-+}  // namespace mate
-+
-+#endif  // ELECTRON_COMMON_NATIVE_MATE_CONVERTERS_STRING16_CONVERTER_H_
-added in remote
-  their  100644 40d71b0e694d24e5ddce7ccbe699795cf1ecf598 electron/common/native_mate_converters/v8_value_converter.cc
-@@ -0,0 +1,410 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/common/native_mate_converters/v8_value_converter.h"
-+
-+#include <map>
-+#include <string>
-+#include <utility>
-+
-+#include "base/logging.h"
-+#include "base/memory/scoped_ptr.h"
-+#include "base/values.h"
-+#include "native_mate/dictionary.h"
-+#include "vendor/node/src/node_buffer.h"
-+
-+namespace electron {
-+
-+namespace {
-+
-+const int kMaxRecursionDepth = 100;
-+
-+}  // namespace
-+
-+// The state of a call to FromV8Value.
-+class V8ValueConverter::FromV8ValueState {
-+ public:
-+  // Level scope which updates the current depth of some FromV8ValueState.
-+  class Level {
-+   public:
-+    explicit Level(FromV8ValueState* state) : state_(state) {
-+      state_->max_recursion_depth_--;
-+    }
-+    ~Level() {
-+      state_->max_recursion_depth_++;
-+    }
-+
-+   private:
-+    FromV8ValueState* state_;
-+  };
-+
-+  FromV8ValueState() : max_recursion_depth_(kMaxRecursionDepth) {}
-+
-+  // If |handle| is not in |unique_map_|, then add it to |unique_map_| and
-+  // return true.
-+  //
-+  // Otherwise do nothing and return false. Here "A is unique" means that no
-+  // other handle B in the map points to the same object as A. Note that A can
-+  // be unique even if there already is another handle with the same identity
-+  // hash (key) in the map, because two objects can have the same hash.
-+  bool UpdateAndCheckUniqueness(v8::Local<v8::Object> handle) {
-+    typedef HashToHandleMap::const_iterator Iterator;
-+    int hash = handle->GetIdentityHash();
-+    // We only compare using == with handles to objects with the same identity
-+    // hash. Different hash obviously means different objects, but two objects
-+    // in a couple of thousands could have the same identity hash.
-+    std::pair<Iterator, Iterator> range = unique_map_.equal_range(hash);
-+    for (Iterator it = range.first; it != range.second; ++it) {
-+      // Operator == for handles actually compares the underlying objects.
-+      if (it->second == handle)
-+        return false;
-+    }
-+    unique_map_.insert(std::make_pair(hash, handle));
-+    return true;
-+  }
-+
-+  bool HasReachedMaxRecursionDepth() {
-+    return max_recursion_depth_ < 0;
-+  }
-+
-+ private:
-+  typedef std::multimap<int, v8::Local<v8::Object> > HashToHandleMap;
-+  HashToHandleMap unique_map_;
-+
-+  int max_recursion_depth_;
-+};
-+
-+V8ValueConverter::V8ValueConverter()
-+    : reg_exp_allowed_(false),
-+      function_allowed_(false),
-+      strip_null_from_objects_(false) {}
-+
-+void V8ValueConverter::SetRegExpAllowed(bool val) {
-+  reg_exp_allowed_ = val;
-+}
-+
-+void V8ValueConverter::SetFunctionAllowed(bool val) {
-+  function_allowed_ = val;
-+}
-+
-+void V8ValueConverter::SetStripNullFromObjects(bool val) {
-+  strip_null_from_objects_ = val;
-+}
-+
-+v8::Local<v8::Value> V8ValueConverter::ToV8Value(
-+    const base::Value* value, v8::Local<v8::Context> context) const {
-+  v8::Context::Scope context_scope(context);
-+  v8::EscapableHandleScope handle_scope(context->GetIsolate());
-+  return handle_scope.Escape(ToV8ValueImpl(context->GetIsolate(), value));
-+}
-+
-+base::Value* V8ValueConverter::FromV8Value(
-+    v8::Local<v8::Value> val,
-+    v8::Local<v8::Context> context) const {
-+  v8::Context::Scope context_scope(context);
-+  v8::HandleScope handle_scope(context->GetIsolate());
-+  FromV8ValueState state;
-+  return FromV8ValueImpl(&state, val, context->GetIsolate());
-+}
-+
-+v8::Local<v8::Value> V8ValueConverter::ToV8ValueImpl(
-+     v8::Isolate* isolate, const base::Value* value) const {
-+  CHECK(value);
-+  switch (value->GetType()) {
-+    case base::Value::TYPE_NULL:
-+      return v8::Null(isolate);
-+
-+    case base::Value::TYPE_BOOLEAN: {
-+      bool val = false;
-+      CHECK(value->GetAsBoolean(&val));
-+      return v8::Boolean::New(isolate, val);
-+    }
-+
-+    case base::Value::TYPE_INTEGER: {
-+      int val = 0;
-+      CHECK(value->GetAsInteger(&val));
-+      return v8::Integer::New(isolate, val);
-+    }
-+
-+    case base::Value::TYPE_DOUBLE: {
-+      double val = 0.0;
-+      CHECK(value->GetAsDouble(&val));
-+      return v8::Number::New(isolate, val);
-+    }
-+
-+    case base::Value::TYPE_STRING: {
-+      std::string val;
-+      CHECK(value->GetAsString(&val));
-+      return v8::String::NewFromUtf8(
-+          isolate, val.c_str(), v8::String::kNormalString, val.length());
-+    }
-+
-+    case base::Value::TYPE_LIST:
-+      return ToV8Array(isolate, static_cast<const base::ListValue*>(value));
-+
-+    case base::Value::TYPE_DICTIONARY:
-+      return ToV8Object(isolate,
-+                        static_cast<const base::DictionaryValue*>(value));
-+
-+    case base::Value::TYPE_BINARY:
-+      return ToArrayBuffer(isolate,
-+                           static_cast<const base::BinaryValue*>(value));
-+
-+    default:
-+      LOG(ERROR) << "Unexpected value type: " << value->GetType();
-+      return v8::Null(isolate);
-+  }
-+}
-+
-+v8::Local<v8::Value> V8ValueConverter::ToV8Array(
-+    v8::Isolate* isolate, const base::ListValue* val) const {
-+  v8::Local<v8::Array> result(v8::Array::New(isolate, val->GetSize()));
-+
-+  for (size_t i = 0; i < val->GetSize(); ++i) {
-+    const base::Value* child = NULL;
-+    CHECK(val->Get(i, &child));
-+
-+    v8::Local<v8::Value> child_v8 = ToV8ValueImpl(isolate, child);
-+    CHECK(!child_v8.IsEmpty());
-+
-+    v8::TryCatch try_catch;
-+    result->Set(static_cast<uint32_t>(i), child_v8);
-+    if (try_catch.HasCaught())
-+      LOG(ERROR) << "Setter for index " << i << " threw an exception.";
-+  }
-+
-+  return result;
-+}
-+
-+v8::Local<v8::Value> V8ValueConverter::ToV8Object(
-+    v8::Isolate* isolate, const base::DictionaryValue* val) const {
-+  mate::Dictionary result = mate::Dictionary::CreateEmpty(isolate);
-+  result.SetHidden("simple", true);
-+
-+  for (base::DictionaryValue::Iterator iter(*val);
-+       !iter.IsAtEnd(); iter.Advance()) {
-+    const std::string& key = iter.key();
-+    v8::Local<v8::Value> child_v8 = ToV8ValueImpl(isolate, &iter.value());
-+    CHECK(!child_v8.IsEmpty());
-+
-+    v8::TryCatch try_catch;
-+    result.Set(key, child_v8);
-+    if (try_catch.HasCaught()) {
-+      LOG(ERROR) << "Setter for property " << key.c_str() << " threw an "
-+                 << "exception.";
-+    }
-+  }
-+
-+  return result.GetHandle();
-+}
-+
-+v8::Local<v8::Value> V8ValueConverter::ToArrayBuffer(
-+    v8::Isolate* isolate, const base::BinaryValue* value) const {
-+  return node::Buffer::Copy(isolate,
-+                            value->GetBuffer(),
-+                            value->GetSize()).ToLocalChecked();
-+}
-+
-+base::Value* V8ValueConverter::FromV8ValueImpl(
-+    FromV8ValueState* state,
-+    v8::Local<v8::Value> val,
-+    v8::Isolate* isolate) const {
-+  CHECK(!val.IsEmpty());
-+
-+  FromV8ValueState::Level state_level(state);
-+  if (state->HasReachedMaxRecursionDepth())
-+    return NULL;
-+
-+  if (val->IsNull())
-+    return base::Value::CreateNullValue().release();
-+
-+  if (val->IsBoolean())
-+    return new base::FundamentalValue(val->ToBoolean()->Value());
-+
-+  if (val->IsInt32())
-+    return new base::FundamentalValue(val->ToInt32()->Value());
-+
-+  if (val->IsNumber())
-+    return new base::FundamentalValue(val->ToNumber()->Value());
-+
-+  if (val->IsString()) {
-+    v8::String::Utf8Value utf8(val->ToString());
-+    return new base::StringValue(std::string(*utf8, utf8.length()));
-+  }
-+
-+  if (val->IsUndefined())
-+    // JSON.stringify ignores undefined.
-+    return NULL;
-+
-+  if (val->IsDate()) {
-+    v8::Date* date = v8::Date::Cast(*val);
-+    v8::Local<v8::Value> toISOString =
-+        date->Get(v8::String::NewFromUtf8(isolate, "toISOString"));
-+    if (toISOString->IsFunction()) {
-+      v8::Local<v8::Value> result =
-+          toISOString.As<v8::Function>()->Call(val, 0, nullptr);
-+      if (!result.IsEmpty()) {
-+        v8::String::Utf8Value utf8(result->ToString());
-+        return new base::StringValue(std::string(*utf8, utf8.length()));
-+      }
-+    }
-+  }
-+
-+  if (val->IsRegExp()) {
-+    if (!reg_exp_allowed_)
-+      // JSON.stringify converts to an object.
-+      return FromV8Object(val->ToObject(), state, isolate);
-+    return new base::StringValue(*v8::String::Utf8Value(val->ToString()));
-+  }
-+
-+  // v8::Value doesn't have a ToArray() method for some reason.
-+  if (val->IsArray())
-+    return FromV8Array(val.As<v8::Array>(), state, isolate);
-+
-+  if (val->IsFunction()) {
-+    if (!function_allowed_)
-+      // JSON.stringify refuses to convert function(){}.
-+      return NULL;
-+    return FromV8Object(val->ToObject(), state, isolate);
-+  }
-+
-+  if (node::Buffer::HasInstance(val)) {
-+    return FromNodeBuffer(val, state, isolate);
-+  }
-+
-+  if (val->IsObject()) {
-+    return FromV8Object(val->ToObject(), state, isolate);
-+  }
-+
-+  LOG(ERROR) << "Unexpected v8 value type encountered.";
-+  return NULL;
-+}
-+
-+base::Value* V8ValueConverter::FromV8Array(
-+    v8::Local<v8::Array> val,
-+    FromV8ValueState* state,
-+    v8::Isolate* isolate) const {
-+  if (!state->UpdateAndCheckUniqueness(val))
-+    return base::Value::CreateNullValue().release();
-+
-+  scoped_ptr<v8::Context::Scope> scope;
-+  // If val was created in a different context than our current one, change to
-+  // that context, but change back after val is converted.
-+  if (!val->CreationContext().IsEmpty() &&
-+      val->CreationContext() != isolate->GetCurrentContext())
-+    scope.reset(new v8::Context::Scope(val->CreationContext()));
-+
-+  base::ListValue* result = new base::ListValue();
-+
-+  // Only fields with integer keys are carried over to the ListValue.
-+  for (uint32_t i = 0; i < val->Length(); ++i) {
-+    v8::TryCatch try_catch;
-+    v8::Local<v8::Value> child_v8 = val->Get(i);
-+    if (try_catch.HasCaught()) {
-+      LOG(ERROR) << "Getter for index " << i << " threw an exception.";
-+      child_v8 = v8::Null(isolate);
-+    }
-+
-+    if (!val->HasRealIndexedProperty(i))
-+      continue;
-+
-+    base::Value* child = FromV8ValueImpl(state, child_v8, isolate);
-+    if (child)
-+      result->Append(child);
-+    else
-+      // JSON.stringify puts null in places where values don't serialize, for
-+      // example undefined and functions. Emulate that behavior.
-+      result->Append(base::Value::CreateNullValue());
-+  }
-+  return result;
-+}
-+
-+base::Value* V8ValueConverter::FromNodeBuffer(
-+    v8::Local<v8::Value> value,
-+    FromV8ValueState* state,
-+    v8::Isolate* isolate) const {
-+  return base::BinaryValue::CreateWithCopiedBuffer(
-+      node::Buffer::Data(value), node::Buffer::Length(value));
-+}
-+
-+base::Value* V8ValueConverter::FromV8Object(
-+    v8::Local<v8::Object> val,
-+    FromV8ValueState* state,
-+    v8::Isolate* isolate) const {
-+  if (!state->UpdateAndCheckUniqueness(val))
-+    return base::Value::CreateNullValue().release();
-+
-+  scoped_ptr<v8::Context::Scope> scope;
-+  // If val was created in a different context than our current one, change to
-+  // that context, but change back after val is converted.
-+  if (!val->CreationContext().IsEmpty() &&
-+      val->CreationContext() != isolate->GetCurrentContext())
-+    scope.reset(new v8::Context::Scope(val->CreationContext()));
-+
-+  scoped_ptr<base::DictionaryValue> result(new base::DictionaryValue());
-+  v8::Local<v8::Array> property_names(val->GetOwnPropertyNames());
-+
-+  for (uint32_t i = 0; i < property_names->Length(); ++i) {
-+    v8::Local<v8::Value> key(property_names->Get(i));
-+
-+    // Extend this test to cover more types as necessary and if sensible.
-+    if (!key->IsString() &&
-+        !key->IsNumber()) {
-+      NOTREACHED() << "Key \"" << *v8::String::Utf8Value(key) << "\" "
-+                      "is neither a string nor a number";
-+      continue;
-+    }
-+
-+    // Skip all callbacks: crbug.com/139933
-+    if (val->HasRealNamedCallbackProperty(key->ToString()))
-+      continue;
-+
-+    v8::String::Utf8Value name_utf8(key->ToString());
-+
-+    v8::TryCatch try_catch;
-+    v8::Local<v8::Value> child_v8 = val->Get(key);
-+
-+    if (try_catch.HasCaught()) {
-+      LOG(ERROR) << "Getter for property " << *name_utf8
-+                 << " threw an exception.";
-+      child_v8 = v8::Null(isolate);
-+    }
-+
-+    scoped_ptr<base::Value> child(FromV8ValueImpl(state, child_v8, isolate));
-+    if (!child.get())
-+      // JSON.stringify skips properties whose values don't serialize, for
-+      // example undefined and functions. Emulate that behavior.
-+      continue;
-+
-+    // Strip null if asked (and since undefined is turned into null, undefined
-+    // too). The use case for supporting this is JSON-schema support,
-+    // specifically for extensions, where "optional" JSON properties may be
-+    // represented as null, yet due to buggy legacy code elsewhere isn't
-+    // treated as such (potentially causing crashes). For example, the
-+    // "tabs.create" function takes an object as its first argument with an
-+    // optional "windowId" property.
-+    //
-+    // Given just
-+    //
-+    //   tabs.create({})
-+    //
-+    // this will work as expected on code that only checks for the existence of
-+    // a "windowId" property (such as that legacy code). However given
-+    //
-+    //   tabs.create({windowId: null})
-+    //
-+    // there *is* a "windowId" property, but since it should be an int, code
-+    // on the browser which doesn't additionally check for null will fail.
-+    // We can avoid all bugs related to this by stripping null.
-+    if (strip_null_from_objects_ && child->IsType(base::Value::TYPE_NULL))
-+      continue;
-+
-+    result->SetWithoutPathExpansion(std::string(*name_utf8, name_utf8.length()),
-+                                    child.release());
-+  }
-+
-+  return result.release();
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 9b1d76d15de1bd8354b4715b05c15a1ee64595c0 electron/common/native_mate_converters/v8_value_converter.h
-@@ -0,0 +1,75 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_COMMON_NATIVE_MATE_CONVERTERS_V8_VALUE_CONVERTER_H_
-+#define ELECTRON_COMMON_NATIVE_MATE_CONVERTERS_V8_VALUE_CONVERTER_H_
-+
-+#include "base/macros.h"
-+#include "base/compiler_specific.h"
-+#include "v8/include/v8.h"
-+
-+namespace base {
-+class BinaryValue;
-+class DictionaryValue;
-+class ListValue;
-+class Value;
-+}
-+
-+namespace electron {
-+
-+class V8ValueConverter {
-+ public:
-+  V8ValueConverter();
-+
-+  void SetRegExpAllowed(bool val);
-+  void SetFunctionAllowed(bool val);
-+  void SetStripNullFromObjects(bool val);
-+  v8::Local<v8::Value> ToV8Value(const base::Value* value,
-+                                 v8::Local<v8::Context> context) const;
-+  base::Value* FromV8Value(v8::Local<v8::Value> value,
-+                           v8::Local<v8::Context> context) const;
-+
-+ private:
-+  class FromV8ValueState;
-+
-+  v8::Local<v8::Value> ToV8ValueImpl(v8::Isolate* isolate,
-+                                     const base::Value* value) const;
-+  v8::Local<v8::Value> ToV8Array(v8::Isolate* isolate,
-+                                 const base::ListValue* list) const;
-+  v8::Local<v8::Value> ToV8Object(
-+      v8::Isolate* isolate,
-+      const base::DictionaryValue* dictionary) const;
-+  v8::Local<v8::Value> ToArrayBuffer(
-+      v8::Isolate* isolate,
-+      const base::BinaryValue* value) const;
-+
-+  base::Value* FromV8ValueImpl(FromV8ValueState* state,
-+                               v8::Local<v8::Value> value,
-+                               v8::Isolate* isolate) const;
-+  base::Value* FromV8Array(v8::Local<v8::Array> array,
-+                           FromV8ValueState* state,
-+                           v8::Isolate* isolate) const;
-+  base::Value* FromNodeBuffer(v8::Local<v8::Value> value,
-+                              FromV8ValueState* state,
-+                              v8::Isolate* isolate) const;
-+  base::Value* FromV8Object(v8::Local<v8::Object> object,
-+                            FromV8ValueState* state,
-+                            v8::Isolate* isolate) const;
-+
-+  // If true, we will convert RegExp JavaScript objects to string.
-+  bool reg_exp_allowed_;
-+
-+  // If true, we will convert Function JavaScript objects to dictionaries.
-+  bool function_allowed_;
-+
-+  // If true, undefined and null values are ignored when converting v8 objects
-+  // into Values.
-+  bool strip_null_from_objects_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(V8ValueConverter);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_COMMON_NATIVE_MATE_CONVERTERS_V8_VALUE_CONVERTER_H_
-added in remote
-  their  100644 25689927d9c4edaf1229ddbf424b94e9461a886e electron/common/native_mate_converters/value_converter.cc
-@@ -0,0 +1,54 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/common/native_mate_converters/value_converter.h"
-+
-+#include "electron/common/native_mate_converters/v8_value_converter.h"
-+#include "base/values.h"
-+
-+namespace mate {
-+
-+bool Converter<base::DictionaryValue>::FromV8(v8::Isolate* isolate,
-+                                              v8::Local<v8::Value> val,
-+                                              base::DictionaryValue* out) {
-+  scoped_ptr<electron::V8ValueConverter> converter(new electron::V8ValueConverter);
-+  scoped_ptr<base::Value> value(converter->FromV8Value(
-+      val, isolate->GetCurrentContext()));
-+  if (value && value->IsType(base::Value::TYPE_DICTIONARY)) {
-+    out->Swap(static_cast<base::DictionaryValue*>(value.get()));
-+    return true;
-+  } else {
-+    return false;
-+  }
-+}
-+
-+v8::Local<v8::Value> Converter<base::DictionaryValue>::ToV8(
-+    v8::Isolate* isolate,
-+    const base::DictionaryValue& val) {
-+  scoped_ptr<electron::V8ValueConverter> converter(new electron::V8ValueConverter);
-+  return converter->ToV8Value(&val, isolate->GetCurrentContext());
-+}
-+
-+bool Converter<base::ListValue>::FromV8(v8::Isolate* isolate,
-+                                        v8::Local<v8::Value> val,
-+                                        base::ListValue* out) {
-+  scoped_ptr<electron::V8ValueConverter> converter(new electron::V8ValueConverter);
-+  scoped_ptr<base::Value> value(converter->FromV8Value(
-+      val, isolate->GetCurrentContext()));
-+  if (value->IsType(base::Value::TYPE_LIST)) {
-+    out->Swap(static_cast<base::ListValue*>(value.get()));
-+    return true;
-+  } else {
-+    return false;
-+  }
-+}
-+
-+v8::Local<v8::Value> Converter<base::ListValue>::ToV8(
-+    v8::Isolate* isolate,
-+    const base::ListValue& val) {
-+  scoped_ptr<electron::V8ValueConverter> converter(new electron::V8ValueConverter);
-+  return converter->ToV8Value(&val, isolate->GetCurrentContext());
-+}
-+
-+}  // namespace mate
-added in remote
-  their  100644 661cbcc37968bc47994e95f64d66c8cbc2110af7 electron/common/native_mate_converters/value_converter.h
-@@ -0,0 +1,37 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_COMMON_NATIVE_MATE_CONVERTERS_VALUE_CONVERTER_H_
-+#define ELECTRON_COMMON_NATIVE_MATE_CONVERTERS_VALUE_CONVERTER_H_
-+
-+#include "native_mate/converter.h"
-+
-+namespace base {
-+class DictionaryValue;
-+class ListValue;
-+}
-+
-+namespace mate {
-+
-+template<>
-+struct Converter<base::DictionaryValue> {
-+  static bool FromV8(v8::Isolate* isolate,
-+                     v8::Local<v8::Value> val,
-+                     base::DictionaryValue* out);
-+  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-+                                   const base::DictionaryValue& val);
-+};
-+
-+template<>
-+struct Converter<base::ListValue> {
-+  static bool FromV8(v8::Isolate* isolate,
-+                     v8::Local<v8::Value> val,
-+                     base::ListValue* out);
-+  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-+                                   const base::ListValue& val);
-+};
-+
-+}  // namespace mate
-+
-+#endif  // ELECTRON_COMMON_NATIVE_MATE_CONVERTERS_VALUE_CONVERTER_H_
-added in remote
-  their  100644 eb5f2255261f0d185291279482eda55548167426 electron/common/node_bindings.cc
-@@ -0,0 +1,272 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/common/node_bindings.h"
-+
-+#include <string>
-+#include <vector>
-+
-+#include "electron/common/api/event_emitter_caller.h"
-+#include "electron/common/api/locker.h"
-+#include "electron/common/electron_command_line.h"
-+#include "electron/common/native_mate_converters/file_path_converter.h"
-+#include "electron/common/node_includes.h"
-+#include "base/command_line.h"
-+#include "base/base_paths.h"
-+#include "base/environment.h"
-+#include "base/files/file_path.h"
-+#include "base/message_loop/message_loop.h"
-+#include "base/path_service.h"
-+#include "content/public/browser/browser_thread.h"
-+#include "content/public/common/content_paths.h"
-+#include "native_mate/dictionary.h"
-+#include "third_party/WebKit/public/web/WebScopedMicrotaskSuppression.h"
-+
-+using content::BrowserThread;
-+
-+// Force all builtin modules to be referenced so they can actually run their
-+// DSO constructors, see http://git.io/DRIqCg.
-+#define REFERENCE_MODULE(name) \
-+  extern "C" void _register_ ## name(void); \
-+  void (*fp_register_ ## name)(void) = _register_ ## name
-+// Electron's builtin modules.
-+REFERENCE_MODULE(electron_browser_app);
-+REFERENCE_MODULE(electron_browser_auto_updater);
-+REFERENCE_MODULE(electron_browser_content_tracing);
-+REFERENCE_MODULE(electron_browser_dialog);
-+REFERENCE_MODULE(electron_browser_debugger);
-+REFERENCE_MODULE(electron_browser_desktop_capturer);
-+REFERENCE_MODULE(electron_browser_download_item);
-+REFERENCE_MODULE(electron_browser_menu);
-+REFERENCE_MODULE(electron_browser_power_monitor);
-+REFERENCE_MODULE(electron_browser_power_save_blocker);
-+REFERENCE_MODULE(electron_browser_protocol);
-+REFERENCE_MODULE(electron_browser_global_shortcut);
-+REFERENCE_MODULE(electron_browser_session);
-+REFERENCE_MODULE(electron_browser_tray);
-+REFERENCE_MODULE(electron_browser_web_contents);
-+REFERENCE_MODULE(electron_browser_web_view_manager);
-+REFERENCE_MODULE(electron_browser_window);
-+REFERENCE_MODULE(electron_common_asar);
-+REFERENCE_MODULE(electron_common_clipboard);
-+REFERENCE_MODULE(electron_common_crash_reporter);
-+REFERENCE_MODULE(electron_common_id_weak_map);
-+REFERENCE_MODULE(electron_common_native_image);
-+REFERENCE_MODULE(electron_common_screen);
-+REFERENCE_MODULE(electron_common_shell);
-+REFERENCE_MODULE(electron_common_v8_util);
-+REFERENCE_MODULE(electron_renderer_ipc);
-+REFERENCE_MODULE(electron_renderer_web_frame);
-+#undef REFERENCE_MODULE
-+
-+// The "v8::Function::kLineOffsetNotFound" is exported in node.dll, but the
-+// linker can not find it, could be a bug of VS.
-+#if defined(OS_WIN) && !defined(DEBUG)
-+namespace v8 {
-+const int Function::kLineOffsetNotFound = -1;
-+}
-+#endif
-+
-+namespace electron {
-+
-+namespace {
-+
-+// Empty callback for async handle.
-+void UvNoOp(uv_async_t* handle) {
-+}
-+
-+// Convert the given vector to an array of C-strings. The strings in the
-+// returned vector are only guaranteed valid so long as the vector of strings
-+// is not modified.
-+scoped_ptr<const char*[]> StringVectorToArgArray(
-+    const std::vector<std::string>& vector) {
-+  scoped_ptr<const char*[]> array(new const char*[vector.size()]);
-+  for (size_t i = 0; i < vector.size(); ++i) {
-+    array[i] = vector[i].c_str();
-+  }
-+  return array;
-+}
-+
-+base::FilePath GetResourcesPath(bool is_browser) {
-+  auto command_line = base::CommandLine::ForCurrentProcess();
-+  base::FilePath exec_path(command_line->GetProgram());
-+  PathService::Get(base::FILE_EXE, &exec_path);
-+
-+  base::FilePath resources_path =
-+#if defined(OS_MACOSX)
-+      is_browser ? exec_path.DirName().DirName().Append("Resources") :
-+                   exec_path.DirName().DirName().DirName().DirName().DirName()
-+                            .Append("Resources");
-+#else
-+      exec_path.DirName().Append(FILE_PATH_LITERAL("resources"));
-+#endif
-+  return resources_path;
-+}
-+
-+}  // namespace
-+
-+NodeBindings::NodeBindings(bool is_browser)
-+    : is_browser_(is_browser),
-+      message_loop_(nullptr),
-+      uv_loop_(uv_default_loop()),
-+      embed_closed_(false),
-+      uv_env_(nullptr),
-+      weak_factory_(this) {
-+}
-+
-+NodeBindings::~NodeBindings() {
-+  // Quit the embed thread.
-+  embed_closed_ = true;
-+  uv_sem_post(&embed_sem_);
-+  WakeupEmbedThread();
-+
-+  // Wait for everything to be done.
-+  uv_thread_join(&embed_thread_);
-+
-+  // Clear uv.
-+  uv_sem_destroy(&embed_sem_);
-+}
-+
-+void NodeBindings::Initialize() {
-+  // Open node's error reporting system for browser process.
-+  node::g_standalone_mode = is_browser_;
-+  node::g_upstream_node_mode = false;
-+
-+#if defined(OS_LINUX)
-+  // Get real command line in renderer process forked by zygote.
-+  if (!is_browser_)
-+    ElectronCommandLine::InitializeFromCommandLine();
-+#endif
-+
-+  // Init node.
-+  // (we assume node::Init would not modify the parameters under embedded mode).
-+  node::Init(nullptr, nullptr, nullptr, nullptr);
-+
-+#if defined(OS_WIN)
-+  // uv_init overrides error mode to suppress the default crash dialog, bring
-+  // it back if user wants to show it.
-+  scoped_ptr<base::Environment> env(base::Environment::Create());
-+  if (env->HasVar("ELECTRON_DEFAULT_ERROR_MODE"))
-+    SetErrorMode(0);
-+#endif
-+}
-+
-+node::Environment* NodeBindings::CreateEnvironment(
-+    v8::Handle<v8::Context> context) {
-+  auto args = ElectronCommandLine::argv();
-+
-+  // Feed node the path to initialization script.
-+  base::FilePath::StringType process_type = is_browser_ ?
-+      FILE_PATH_LITERAL("browser") : FILE_PATH_LITERAL("renderer");
-+  base::FilePath resources_path = GetResourcesPath(is_browser_);
-+  base::FilePath script_path =
-+      resources_path.Append(FILE_PATH_LITERAL("electron.asar"))
-+                    .Append(process_type)
-+                    .Append(FILE_PATH_LITERAL("init.js"));
-+  std::string script_path_str = script_path.AsUTF8Unsafe();
-+  args.insert(args.begin() + 1, script_path_str.c_str());
-+
-+  scoped_ptr<const char*[]> c_argv = StringVectorToArgArray(args);
-+  node::Environment* env = node::CreateEnvironment(
-+      context->GetIsolate(), uv_default_loop(), context,
-+      args.size(), c_argv.get(), 0, nullptr);
-+
-+  mate::Dictionary process(context->GetIsolate(), env->process_object());
-+  process.Set("type", process_type);
-+  process.Set("resourcesPath", resources_path);
-+  // The path to helper app.
-+  base::FilePath helper_exec_path;
-+  PathService::Get(content::CHILD_PROCESS_EXE, &helper_exec_path);
-+  process.Set("helperExecPath", helper_exec_path);
-+  return env;
-+}
-+
-+void NodeBindings::LoadEnvironment(node::Environment* env) {
-+  node::LoadEnvironment(env);
-+  mate::EmitEvent(env->isolate(), env->process_object(), "loaded");
-+}
-+
-+void NodeBindings::PrepareMessageLoop() {
-+  DCHECK(!is_browser_ || BrowserThread::CurrentlyOn(BrowserThread::UI));
-+
-+  // Add dummy handle for libuv, otherwise libuv would quit when there is
-+  // nothing to do.
-+  uv_async_init(uv_loop_, &dummy_uv_handle_, UvNoOp);
-+
-+  // Start worker that will interrupt main loop when having uv events.
-+  uv_sem_init(&embed_sem_, 0);
-+  uv_thread_create(&embed_thread_, EmbedThreadRunner, this);
-+}
-+
-+void NodeBindings::RunMessageLoop() {
-+  DCHECK(!is_browser_ || BrowserThread::CurrentlyOn(BrowserThread::UI));
-+
-+  // The MessageLoop should have been created, remember the one in main thread.
-+  message_loop_ = base::MessageLoop::current();
-+
-+  // Run uv loop for once to give the uv__io_poll a chance to add all events.
-+  UvRunOnce();
-+}
-+
-+void NodeBindings::UvRunOnce() {
-+  DCHECK(!is_browser_ || BrowserThread::CurrentlyOn(BrowserThread::UI));
-+
-+  node::Environment* env = uv_env();
-+  CHECK(env);
-+
-+  // Use Locker in browser process.
-+  mate::Locker locker(env->isolate());
-+  v8::HandleScope handle_scope(env->isolate());
-+
-+  // Enter node context while dealing with uv events.
-+  v8::Context::Scope context_scope(env->context());
-+
-+  // Perform microtask checkpoint after running JavaScript.
-+  scoped_ptr<blink::WebScopedRunV8Script> script_scope(
-+      is_browser_ ? nullptr : new blink::WebScopedRunV8Script);
-+
-+  // Deal with uv events.
-+  int r = uv_run(uv_loop_, UV_RUN_NOWAIT);
-+  if (r == 0 || uv_loop_->stop_flag != 0)
-+    message_loop_->QuitWhenIdle();  // Quit from uv.
-+
-+  // Tell the worker thread to continue polling.
-+  uv_sem_post(&embed_sem_);
-+}
-+
-+void NodeBindings::WakeupMainThread() {
-+  DCHECK(message_loop_);
-+  message_loop_->PostTask(FROM_HERE, base::Bind(&NodeBindings::UvRunOnce,
-+                                                weak_factory_.GetWeakPtr()));
-+}
-+
-+void NodeBindings::WakeupEmbedThread() {
-+  uv_async_send(&dummy_uv_handle_);
-+}
-+
-+// static
-+void NodeBindings::EmbedThreadRunner(void *arg) {
-+  NodeBindings* self = static_cast<NodeBindings*>(arg);
-+
-+  while (true) {
-+    // Wait for the main loop to deal with events.
-+    uv_sem_wait(&self->embed_sem_);
-+    if (self->embed_closed_)
-+      break;
-+
-+    // Wait for something to happen in uv loop.
-+    // Note that the PollEvents() is implemented by derived classes, so when
-+    // this class is being destructed the PollEvents() would not be available
-+    // anymore. Because of it we must make sure we only invoke PollEvents()
-+    // when this class is alive.
-+    self->PollEvents();
-+    if (self->embed_closed_)
-+      break;
-+
-+    // Deal with event in main thread.
-+    self->WakeupMainThread();
-+  }
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 39f471883b143caab1502d04157ace731128b74a electron/common/node_bindings.h
-@@ -0,0 +1,98 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_COMMON_NODE_BINDINGS_H_
-+#define ELECTRON_COMMON_NODE_BINDINGS_H_
-+
-+#include "base/macros.h"
-+#include "base/memory/weak_ptr.h"
-+#include "v8/include/v8.h"
-+#include "vendor/node/deps/uv/include/uv.h"
-+
-+namespace base {
-+class MessageLoop;
-+}
-+
-+namespace node {
-+class Environment;
-+}
-+
-+namespace electron {
-+
-+class NodeBindings {
-+ public:
-+  static NodeBindings* Create(bool is_browser);
-+
-+  virtual ~NodeBindings();
-+
-+  // Setup V8, libuv.
-+  void Initialize();
-+
-+  // Create the environment and load node.js.
-+  node::Environment* CreateEnvironment(v8::Handle<v8::Context> context);
-+
-+  // Load node.js in the environment.
-+  void LoadEnvironment(node::Environment* env);
-+
-+  // Prepare for message loop integration.
-+  void PrepareMessageLoop();
-+
-+  // Do message loop integration.
-+  virtual void RunMessageLoop();
-+
-+  // Gets/sets the environment to wrap uv loop.
-+  void set_uv_env(node::Environment* env) { uv_env_ = env; }
-+  node::Environment* uv_env() const { return uv_env_; }
-+
-+ protected:
-+  explicit NodeBindings(bool is_browser);
-+
-+  // Called to poll events in new thread.
-+  virtual void PollEvents() = 0;
-+
-+  // Run the libuv loop for once.
-+  void UvRunOnce();
-+
-+  // Make the main thread run libuv loop.
-+  void WakeupMainThread();
-+
-+  // Interrupt the PollEvents.
-+  void WakeupEmbedThread();
-+
-+  // Are we running in browser.
-+  bool is_browser_;
-+
-+  // Main thread's MessageLoop.
-+  base::MessageLoop* message_loop_;
-+
-+  // Main thread's libuv loop.
-+  uv_loop_t* uv_loop_;
-+
-+ private:
-+  // Thread to poll uv events.
-+  static void EmbedThreadRunner(void *arg);
-+
-+  // Whether the libuv loop has ended.
-+  bool embed_closed_;
-+
-+  // Dummy handle to make uv's loop not quit.
-+  uv_async_t dummy_uv_handle_;
-+
-+  // Thread for polling events.
-+  uv_thread_t embed_thread_;
-+
-+  // Semaphore to wait for main loop in the embed thread.
-+  uv_sem_t embed_sem_;
-+
-+  // Environment that to wrap the uv loop.
-+  node::Environment* uv_env_;
-+
-+  base::WeakPtrFactory<NodeBindings> weak_factory_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(NodeBindings);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_COMMON_NODE_BINDINGS_H_
-added in remote
-  their  100644 9c3e4f7606e94203b044e099a96bcdd005de1b10 electron/common/node_bindings_linux.cc
-@@ -0,0 +1,57 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/common/node_bindings_linux.h"
-+
-+#include <sys/epoll.h>
-+
-+namespace electron {
-+
-+NodeBindingsLinux::NodeBindingsLinux(bool is_browser)
-+    : NodeBindings(is_browser),
-+      epoll_(epoll_create(1)) {
-+  int backend_fd = uv_backend_fd(uv_loop_);
-+  struct epoll_event ev = { 0 };
-+  ev.events = EPOLLIN;
-+  ev.data.fd = backend_fd;
-+  epoll_ctl(epoll_, EPOLL_CTL_ADD, backend_fd, &ev);
-+}
-+
-+NodeBindingsLinux::~NodeBindingsLinux() {
-+}
-+
-+void NodeBindingsLinux::RunMessageLoop() {
-+  // Get notified when libuv's watcher queue changes.
-+  uv_loop_->data = this;
-+  uv_loop_->on_watcher_queue_updated = OnWatcherQueueChanged;
-+
-+  NodeBindings::RunMessageLoop();
-+}
-+
-+// static
-+void NodeBindingsLinux::OnWatcherQueueChanged(uv_loop_t* loop) {
-+  NodeBindingsLinux* self = static_cast<NodeBindingsLinux*>(loop->data);
-+
-+  // We need to break the io polling in the epoll thread when loop's watcher
-+  // queue changes, otherwise new events cannot be notified.
-+  self->WakeupEmbedThread();
-+}
-+
-+void NodeBindingsLinux::PollEvents() {
-+  int timeout = uv_backend_timeout(uv_loop_);
-+
-+  // Wait for new libuv events.
-+  int r;
-+  do {
-+    struct epoll_event ev;
-+    r = epoll_wait(epoll_, &ev, 1, timeout);
-+  } while (r == -1 && errno == EINTR);
-+}
-+
-+// static
-+NodeBindings* NodeBindings::Create(bool is_browser) {
-+  return new NodeBindingsLinux(is_browser);
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 b2e77d1aeaa894f97273b8eec7f63e3492f1178d electron/common/node_bindings_linux.h
-@@ -0,0 +1,34 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_COMMON_NODE_BINDINGS_LINUX_H_
-+#define ELECTRON_COMMON_NODE_BINDINGS_LINUX_H_
-+
-+#include "base/compiler_specific.h"
-+#include "electron/common/node_bindings.h"
-+
-+namespace electron {
-+
-+class NodeBindingsLinux : public NodeBindings {
-+ public:
-+  explicit NodeBindingsLinux(bool is_browser);
-+  virtual ~NodeBindingsLinux();
-+
-+  void RunMessageLoop() override;
-+
-+ private:
-+  // Called when uv's watcher queue changes.
-+  static void OnWatcherQueueChanged(uv_loop_t* loop);
-+
-+  void PollEvents() override;
-+
-+  // Epoll to poll for uv's backend fd.
-+  int epoll_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(NodeBindingsLinux);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_COMMON_NODE_BINDINGS_LINUX_H_
-added in remote
-  their  100644 fce1852f2946aa2533a559c1c465f0dbaa7a97d8 electron/common/node_bindings_mac.cc
-@@ -0,0 +1,68 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/common/node_bindings_mac.h"
-+
-+#include <errno.h>
-+#include <sys/sysctl.h>
-+#include <sys/time.h>
-+#include <sys/types.h>
-+
-+#include "electron/common/node_includes.h"
-+
-+namespace electron {
-+
-+NodeBindingsMac::NodeBindingsMac(bool is_browser)
-+    : NodeBindings(is_browser),
-+      kqueue_(kqueue()) {
-+  // Add uv's backend fd to kqueue.
-+  struct kevent ev;
-+  EV_SET(&ev, uv_backend_fd(uv_loop_), EVFILT_READ, EV_ADD | EV_ENABLE,
-+         0, 0, 0);
-+  kevent(kqueue_, &ev, 1, NULL, 0, NULL);
-+}
-+
-+NodeBindingsMac::~NodeBindingsMac() {
-+}
-+
-+void NodeBindingsMac::RunMessageLoop() {
-+  // Get notified when libuv's watcher queue changes.
-+  uv_loop_->data = this;
-+  uv_loop_->on_watcher_queue_updated = OnWatcherQueueChanged;
-+
-+  NodeBindings::RunMessageLoop();
-+}
-+
-+// static
-+void NodeBindingsMac::OnWatcherQueueChanged(uv_loop_t* loop) {
-+  NodeBindingsMac* self = static_cast<NodeBindingsMac*>(loop->data);
-+
-+  // We need to break the io polling in the kqueue thread when loop's watcher
-+  // queue changes, otherwise new events cannot be notified.
-+  self->WakeupEmbedThread();
-+}
-+
-+void NodeBindingsMac::PollEvents() {
-+  struct timespec spec;
-+  int timeout = uv_backend_timeout(uv_loop_);
-+  if (timeout != -1) {
-+    spec.tv_sec = timeout / 1000;
-+    spec.tv_nsec = (timeout % 1000) * 1000000;
-+  }
-+
-+  // Wait for new libuv events.
-+  int r;
-+  do {
-+    struct kevent ev;
-+    r = ::kevent(kqueue_, NULL, 0, &ev, 1,
-+                 timeout == -1 ? NULL : &spec);
-+  } while (r == -1 && errno == EINTR);
-+}
-+
-+// static
-+NodeBindings* NodeBindings::Create(bool is_browser) {
-+  return new NodeBindingsMac(is_browser);
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 e4c8c7c11e1c2b75d9994f876c8f5d2fbce0a9a2 electron/common/node_bindings_mac.h
-@@ -0,0 +1,34 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_COMMON_NODE_BINDINGS_MAC_H_
-+#define ELECTRON_COMMON_NODE_BINDINGS_MAC_H_
-+
-+#include "electron/common/node_bindings.h"
-+#include "base/compiler_specific.h"
-+
-+namespace electron {
-+
-+class NodeBindingsMac : public NodeBindings {
-+ public:
-+  explicit NodeBindingsMac(bool is_browser);
-+  virtual ~NodeBindingsMac();
-+
-+  void RunMessageLoop() override;
-+
-+ private:
-+  // Called when uv's watcher queue changes.
-+  static void OnWatcherQueueChanged(uv_loop_t* loop);
-+
-+  void PollEvents() override;
-+
-+  // Kqueue to poll for uv's backend fd.
-+  int kqueue_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(NodeBindingsMac);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_COMMON_NODE_BINDINGS_MAC_H_
-added in remote
-  their  100644 ca0b40490c698ca833f109208c9ba5c533a0874d electron/common/node_bindings_win.cc
-@@ -0,0 +1,52 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/common/node_bindings_win.h"
-+
-+#include <windows.h>
-+
-+#include "base/logging.h"
-+
-+extern "C" {
-+#include "vendor/node/deps/uv/src/win/internal.h"
-+}
-+
-+namespace electron {
-+
-+NodeBindingsWin::NodeBindingsWin(bool is_browser)
-+    : NodeBindings(is_browser) {
-+}
-+
-+NodeBindingsWin::~NodeBindingsWin() {
-+}
-+
-+void NodeBindingsWin::PollEvents() {
-+  // If there are other kinds of events pending, uv_backend_timeout will
-+  // instruct us not to wait.
-+  DWORD bytes, timeout;
-+  ULONG_PTR key;
-+  OVERLAPPED* overlapped;
-+
-+  timeout = uv_backend_timeout(uv_loop_);
-+
-+  GetQueuedCompletionStatus(uv_loop_->iocp,
-+                            &bytes,
-+                            &key,
-+                            &overlapped,
-+                            timeout);
-+
-+  // Give the event back so libuv can deal with it.
-+  if (overlapped != NULL)
-+    PostQueuedCompletionStatus(uv_loop_->iocp,
-+                               bytes,
-+                               key,
-+                               overlapped);
-+}
-+
-+// static
-+NodeBindings* NodeBindings::Create(bool is_browser) {
-+  return new NodeBindingsWin(is_browser);
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 c6599fe682c3bbc91abb6c619bce46605ca7a747 electron/common/node_bindings_win.h
-@@ -0,0 +1,26 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_COMMON_NODE_BINDINGS_WIN_H_
-+#define ELECTRON_COMMON_NODE_BINDINGS_WIN_H_
-+
-+#include "electron/common/node_bindings.h"
-+#include "base/compiler_specific.h"
-+
-+namespace electron {
-+
-+class NodeBindingsWin : public NodeBindings {
-+ public:
-+  explicit NodeBindingsWin(bool is_browser);
-+  virtual ~NodeBindingsWin();
-+
-+ private:
-+  void PollEvents() override;
-+
-+  DISALLOW_COPY_AND_ASSIGN(NodeBindingsWin);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_COMMON_NODE_BINDINGS_WIN_H_
-added in remote
-  their  100644 57c82cb5ba4555bd957f764656fd2c9964703111 electron/common/node_includes.h
-@@ -0,0 +1,31 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_COMMON_NODE_INCLUDES_H_
-+#define ELECTRON_COMMON_NODE_INCLUDES_H_
-+
-+#include "base/logging.h"
-+
-+// Include common headers for using node APIs.
-+
-+#define BUILDING_NODE_EXTENSION
-+
-+#undef ASSERT
-+#undef CHECK
-+#undef CHECK_EQ
-+#undef CHECK_NE
-+#undef CHECK_GE
-+#undef CHECK_GT
-+#undef CHECK_LE
-+#undef CHECK_LT
-+#undef DISALLOW_COPY_AND_ASSIGN
-+#undef NO_RETURN
-+#undef debug_string  // This is defined in OS X 10.9 SDK in AssertMacros.h.
-+#include "vendor/node/src/env.h"
-+#include "vendor/node/src/env-inl.h"
-+#include "vendor/node/src/node.h"
-+#include "vendor/node/src/node_buffer.h"
-+#include "vendor/node/src/node_internals.h"
-+
-+#endif  // ELECTRON_COMMON_NODE_INCLUDES_H_
-added in remote
-  their  100644 1aa8c5e403f2468b076a0098532cb9e6d40ccff8 electron/common/options_switches.cc
-@@ -0,0 +1,160 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/common/options_switches.h"
-+
-+namespace electron {
-+
-+namespace options {
-+
-+const char kTitle[]          = "title";
-+const char kIcon[]           = "icon";
-+const char kFrame[]          = "frame";
-+const char kShow[]           = "show";
-+const char kCenter[]         = "center";
-+const char kX[]              = "x";
-+const char kY[]              = "y";
-+const char kWidth[]          = "width";
-+const char kHeight[]         = "height";
-+const char kMinWidth[]       = "minWidth";
-+const char kMinHeight[]      = "minHeight";
-+const char kMaxWidth[]       = "maxWidth";
-+const char kMaxHeight[]      = "maxHeight";
-+const char kResizable[]      = "resizable";
-+const char kMovable[]        = "movable";
-+const char kMinimizable[]    = "minimizable";
-+const char kMaximizable[]    = "maximizable";
-+const char kFullScreenable[] = "fullscreenable";
-+const char kClosable[]       = "closable";
-+const char kFullscreen[]     = "fullscreen";
-+
-+// Whether the window should show in taskbar.
-+const char kSkipTaskbar[] = "skipTaskbar";
-+
-+// Start with the kiosk mode, see Opera's page for description:
-+// http://www.opera.com/support/mastering/kiosk/
-+const char kKiosk[] = "kiosk";
-+
-+// Make windows stays on the top of all other windows.
-+const char kAlwaysOnTop[] = "alwaysOnTop";
-+
-+// Enable the NSView to accept first mouse event.
-+const char kAcceptFirstMouse[] = "acceptFirstMouse";
-+
-+// Whether window size should include window frame.
-+const char kUseContentSize[] = "useContentSize";
-+
-+// The requested title bar style for the window
-+const char kTitleBarStyle[] = "titleBarStyle";
-+
-+// The menu bar is hidden unless "Alt" is pressed.
-+const char kAutoHideMenuBar[] = "autoHideMenuBar";
-+
-+// Enable window to be resized larger than screen.
-+const char kEnableLargerThanScreen[] = "enableLargerThanScreen";
-+
-+// Forces to use dark theme on Linux.
-+const char kDarkTheme[] = "darkTheme";
-+
-+// Whether the window should be transparent.
-+const char kTransparent[] = "transparent";
-+
-+// Window type hint.
-+const char kType[] = "type";
-+
-+// Disable auto-hiding cursor.
-+const char kDisableAutoHideCursor[] = "disableAutoHideCursor";
-+
-+// Use the OS X's standard window instead of the textured window.
-+const char kStandardWindow[] = "standardWindow";
-+
-+// Default browser window background color.
-+const char kBackgroundColor[] = "backgroundColor";
-+
-+// Whether the window should have a shadow.
-+const char kHasShadow[] = "hasShadow";
-+
-+// The WebPreferences.
-+const char kWebPreferences[] = "webPreferences";
-+
-+// The factor of which page should be zoomed.
-+const char kZoomFactor[] = "zoomFactor";
-+
-+// Script that will be loaded by guest WebContents before other scripts.
-+const char kPreloadScript[] = "preload";
-+
-+// Like --preload, but the passed argument is an URL.
-+const char kPreloadURL[] = "preloadURL";
-+
-+// Enable the node integration.
-+const char kNodeIntegration[] = "nodeIntegration";
-+
-+// Instancd ID of guest WebContents.
-+const char kGuestInstanceID[] = "guestInstanceId";
-+
-+// Enable DirectWrite on Windows.
-+const char kDirectWrite[] = "directWrite";
-+
-+// Web runtime features.
-+const char kExperimentalFeatures[]       = "experimentalFeatures";
-+const char kExperimentalCanvasFeatures[] = "experimentalCanvasFeatures";
-+
-+// Opener window's ID.
-+const char kOpenerID[] = "openerId";
-+
-+// Enable blink features.
-+const char kBlinkFeatures[] = "blinkFeatures";
-+
-+}  // namespace options
-+
-+namespace switches {
-+
-+// Enable plugins.
-+const char kEnablePlugins[] = "enable-plugins";
-+
-+// Ppapi Flash path.
-+const char kPpapiFlashPath[] = "ppapi-flash-path";
-+
-+// Ppapi Flash version.
-+const char kPpapiFlashVersion[] = "ppapi-flash-version";
-+
-+// Path to client certificate.
-+const char kClientCertificate[] = "client-certificate";
-+
-+// Disable HTTP cache.
-+const char kDisableHttpCache[] = "disable-http-cache";
-+
-+// Register schemes to standard.
-+const char kRegisterStandardSchemes[] = "register-standard-schemes";
-+
-+// Register schemes to handle service worker.
-+const char kRegisterServiceWorkerSchemes[] = "register-service-worker-schemes";
-+
-+// The minimum SSL/TLS version ("tls1", "tls1.1", or "tls1.2") that
-+// TLS fallback will accept.
-+const char kSSLVersionFallbackMin[] = "ssl-version-fallback-min";
-+
-+// Comma-separated list of SSL cipher suites to disable.
-+const char kCipherSuiteBlacklist[] = "cipher-suite-blacklist";
-+
-+// The browser process app model ID
-+const char kAppUserModelId[] = "app-user-model-id";
-+
-+// The command line switch versions of the options.
-+const char kZoomFactor[]                 = "zoom-factor";
-+const char kPreloadScript[]              = "preload";
-+const char kPreloadURL[]                 = "preload-url";
-+const char kNodeIntegration[]            = "node-integration";
-+const char kGuestInstanceID[]            = "guest-instance-id";
-+const char kOpenerID[]                   = "opener-id";
-+
-+// Widevine options
-+// Path to Widevine CDM binaries.
-+const char kWidevineCdmPath[] = "widevine-cdm-path";
-+// Widevine CDM version.
-+const char kWidevineCdmVersion[] = "widevine-cdm-version";
-+
-+}  // namespace switches
-+
-+}  // namespace electron
-added in remote
-  their  100644 d7fee063f7e2fc2c07e725d1b05f79ec104e1187 electron/common/options_switches.h
-@@ -0,0 +1,93 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_COMMON_OPTIONS_SWITCHES_H_
-+#define ELECTRON_COMMON_OPTIONS_SWITCHES_H_
-+
-+namespace electron {
-+
-+namespace options {
-+
-+extern const char kTitle[];
-+extern const char kIcon[];
-+extern const char kFrame[];
-+extern const char kShow[];
-+extern const char kCenter[];
-+extern const char kX[];
-+extern const char kY[];
-+extern const char kWidth[];
-+extern const char kHeight[];
-+extern const char kMinWidth[];
-+extern const char kMinHeight[];
-+extern const char kMaxWidth[];
-+extern const char kMaxHeight[];
-+extern const char kResizable[];
-+extern const char kMovable[];
-+extern const char kMinimizable[];
-+extern const char kMaximizable[];
-+extern const char kFullScreenable[];
-+extern const char kClosable[];
-+extern const char kFullscreen[];
-+extern const char kSkipTaskbar[];
-+extern const char kKiosk[];
-+extern const char kAlwaysOnTop[];
-+extern const char kAcceptFirstMouse[];
-+extern const char kUseContentSize[];
-+extern const char kTitleBarStyle[];
-+extern const char kAutoHideMenuBar[];
-+extern const char kEnableLargerThanScreen[];
-+extern const char kDarkTheme[];
-+extern const char kTransparent[];
-+extern const char kType[];
-+extern const char kDisableAutoHideCursor[];
-+extern const char kStandardWindow[];
-+extern const char kBackgroundColor[];
-+extern const char kHasShadow[];
-+extern const char kWebPreferences[];
-+
-+// WebPreferences.
-+extern const char kDirectWrite[];
-+extern const char kZoomFactor[];
-+extern const char kPreloadScript[];
-+extern const char kPreloadURL[];
-+extern const char kNodeIntegration[];
-+extern const char kGuestInstanceID[];
-+extern const char kExperimentalFeatures[];
-+extern const char kExperimentalCanvasFeatures[];
-+extern const char kOpenerID[];
-+extern const char kBlinkFeatures[];
-+
-+}   // namespace options
-+
-+
-+// Following are actually command line switches, should be moved to other files.
-+
-+namespace switches {
-+
-+extern const char kEnablePlugins[];
-+extern const char kPpapiFlashPath[];
-+extern const char kPpapiFlashVersion[];
-+extern const char kClientCertificate[];
-+extern const char kDisableHttpCache[];
-+extern const char kRegisterStandardSchemes[];
-+extern const char kRegisterServiceWorkerSchemes[];
-+extern const char kSSLVersionFallbackMin[];
-+extern const char kCipherSuiteBlacklist[];
-+extern const char kAppUserModelId[];
-+
-+extern const char kZoomFactor[];
-+extern const char kPreloadScript[];
-+extern const char kPreloadURL[];
-+extern const char kNodeIntegration[];
-+extern const char kGuestInstanceID[];
-+extern const char kOpenerID[];
-+
-+extern const char kWidevineCdmPath[];
-+extern const char kWidevineCdmVersion[];
-+
-+}  // namespace switches
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_COMMON_OPTIONS_SWITCHES_H_
-added in remote
-  their  100644 c06f74061cb24f97b6f8937cef2f6ac084d4388c electron/common/platform_util.h
-@@ -0,0 +1,35 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_COMMON_PLATFORM_UTIL_H_
-+#define ELECTRON_COMMON_PLATFORM_UTIL_H_
-+
-+class GURL;
-+
-+namespace base {
-+class FilePath;
-+}
-+
-+namespace platform_util {
-+
-+// Show the given file in a file manager. If possible, select the file.
-+// Must be called from the UI thread.
-+void ShowItemInFolder(const base::FilePath& full_path);
-+
-+// Open the given file in the desktop's default manner.
-+// Must be called from the UI thread.
-+void OpenItem(const base::FilePath& full_path);
-+
-+// Open the given external protocol URL in the desktop's default manner.
-+// (For example, mailto: URLs in the default mail user agent.)
-+bool OpenExternal(const GURL& url, bool activate);
-+
-+// Move a file to trash.
-+bool MoveItemToTrash(const base::FilePath& full_path);
-+
-+void Beep();
-+
-+}  // namespace platform_util
-+
-+#endif  // ELECTRON_COMMON_PLATFORM_UTIL_H_
-added in remote
-  their  100644 3a9f000c4a8cf579605ced3f0b47cd9ae4535b27 electron/common/platform_util_linux.cc
-@@ -0,0 +1,87 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/common/platform_util.h"
-+
-+#include <stdio.h>
-+
-+#include "base/files/file_util.h"
-+#include "base/process/kill.h"
-+#include "base/process/launch.h"
-+#include "url/gurl.h"
-+
-+namespace {
-+
-+bool XDGUtil(const std::string& util, const std::string& arg) {
-+  std::vector<std::string> argv;
-+  argv.push_back(util);
-+  argv.push_back(arg);
-+
-+  base::LaunchOptions options;
-+  options.allow_new_privs = true;
-+  // xdg-open can fall back on mailcap which eventually might plumb through
-+  // to a command that needs a terminal.  Set the environment variable telling
-+  // it that we definitely don't have a terminal available and that it should
-+  // bring up a new terminal if necessary.  See "man mailcap".
-+  options.environ["MM_NOTTTY"] = "1";
-+
-+  base::Process process = base::LaunchProcess(argv, options);
-+  if (!process.IsValid())
-+    return false;
-+
-+  int exit_code = -1;
-+  if (!process.WaitForExit(&exit_code))
-+    return false;
-+
-+  return (exit_code == 0);
-+}
-+
-+bool XDGOpen(const std::string& path) {
-+  return XDGUtil("xdg-open", path);
-+}
-+
-+bool XDGEmail(const std::string& email) {
-+  return XDGUtil("xdg-email", email);
-+}
-+
-+}  // namespace
-+
-+namespace platform_util {
-+
-+// TODO(estade): It would be nice to be able to select the file in the file
-+// manager, but that probably requires extending xdg-open. For now just
-+// show the folder.
-+void ShowItemInFolder(const base::FilePath& full_path) {
-+  base::FilePath dir = full_path.DirName();
-+  if (!base::DirectoryExists(dir))
-+    return;
-+
-+  XDGOpen(dir.value());
-+}
-+
-+void OpenItem(const base::FilePath& full_path) {
-+  XDGOpen(full_path.value());
-+}
-+
-+bool OpenExternal(const GURL& url, bool activate) {
-+  if (url.SchemeIs("mailto"))
-+    return XDGEmail(url.spec());
-+  else
-+    return XDGOpen(url.spec());
-+}
-+
-+bool MoveItemToTrash(const base::FilePath& full_path) {
-+  return XDGUtil("gvfs-trash", full_path.value());
-+}
-+
-+void Beep() {
-+  // echo '\a' > /dev/console
-+  FILE* console = fopen("/dev/console", "r");
-+  if (console == NULL)
-+    return;
-+  fprintf(console, "\a");
-+  fclose(console);
-+}
-+
-+}  // namespace platform_util
-added in remote
-  their  100644 da6b6a80ac2a216d4a0726b2c99ef98595bc28b4 electron/common/platform_util_mac.mm
-@@ -0,0 +1,166 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/common/platform_util.h"
-+
-+#include <Carbon/Carbon.h>
-+#import <Cocoa/Cocoa.h>
-+
-+#include "base/files/file_path.h"
-+#include "base/logging.h"
-+#include "base/mac/mac_logging.h"
-+#include "base/mac/scoped_aedesc.h"
-+#include "base/strings/sys_string_conversions.h"
-+#include "net/base/mac/url_conversions.h"
-+#include "url/gurl.h"
-+
-+namespace platform_util {
-+
-+void ShowItemInFolder(const base::FilePath& full_path) {
-+  DCHECK([NSThread isMainThread]);
-+  NSString* path_string = base::SysUTF8ToNSString(full_path.value());
-+  if (!path_string || ![[NSWorkspace sharedWorkspace] selectFile:path_string
-+                                        inFileViewerRootedAtPath:@""])
-+    LOG(WARNING) << "NSWorkspace failed to select file " << full_path.value();
-+}
-+
-+// This function opens a file.  This doesn't use LaunchServices or NSWorkspace
-+// because of two bugs:
-+//  1. Incorrect app activation with com.apple.quarantine:
-+//     http://crbug.com/32921
-+//  2. Silent no-op for unassociated file types: http://crbug.com/50263
-+// Instead, an AppleEvent is constructed to tell the Finder to open the
-+// document.
-+void OpenItem(const base::FilePath& full_path) {
-+  DCHECK([NSThread isMainThread]);
-+  NSString* path_string = base::SysUTF8ToNSString(full_path.value());
-+  if (!path_string)
-+    return;
-+
-+  // Create the target of this AppleEvent, the Finder.
-+  base::mac::ScopedAEDesc<AEAddressDesc> address;
-+  const OSType finderCreatorCode = 'MACS';
-+  OSErr status = AECreateDesc(typeApplSignature,  // type
-+                              &finderCreatorCode,  // data
-+                              sizeof(finderCreatorCode),  // dataSize
-+                              address.OutPointer());  // result
-+  if (status != noErr) {
-+    OSSTATUS_LOG(WARNING, status) << "Could not create OpenItem() AE target";
-+    return;
-+  }
-+
-+  // Build the AppleEvent data structure that instructs Finder to open files.
-+  base::mac::ScopedAEDesc<AppleEvent> theEvent;
-+  status = AECreateAppleEvent(kCoreEventClass,  // theAEEventClass
-+                              kAEOpenDocuments,  // theAEEventID
-+                              address,  // target
-+                              kAutoGenerateReturnID,  // returnID
-+                              kAnyTransactionID,  // transactionID
-+                              theEvent.OutPointer());  // result
-+  if (status != noErr) {
-+    OSSTATUS_LOG(WARNING, status) << "Could not create OpenItem() AE event";
-+    return;
-+  }
-+
-+  // Create the list of files (only ever one) to open.
-+  base::mac::ScopedAEDesc<AEDescList> fileList;
-+  status = AECreateList(NULL,  // factoringPtr
-+                        0,  // factoredSize
-+                        false,  // isRecord
-+                        fileList.OutPointer());  // resultList
-+  if (status != noErr) {
-+    OSSTATUS_LOG(WARNING, status) << "Could not create OpenItem() AE file list";
-+    return;
-+  }
-+
-+  // Add the single path to the file list.  C-style cast to avoid both a
-+  // static_cast and a const_cast to get across the toll-free bridge.
-+  CFURLRef pathURLRef = (CFURLRef)[NSURL fileURLWithPath:path_string];
-+  FSRef pathRef;
-+  if (CFURLGetFSRef(pathURLRef, &pathRef)) {
-+    status = AEPutPtr(fileList.OutPointer(),  // theAEDescList
-+                      0,  // index
-+                      typeFSRef,  // typeCode
-+                      &pathRef,  // dataPtr
-+                      sizeof(pathRef));  // dataSize
-+    if (status != noErr) {
-+      OSSTATUS_LOG(WARNING, status)
-+          << "Could not add file path to AE list in OpenItem()";
-+      return;
-+    }
-+  } else {
-+    LOG(WARNING) << "Could not get FSRef for path URL in OpenItem()";
-+    return;
-+  }
-+
-+  // Attach the file list to the AppleEvent.
-+  status = AEPutParamDesc(theEvent.OutPointer(),  // theAppleEvent
-+                          keyDirectObject,  // theAEKeyword
-+                          fileList);  // theAEDesc
-+  if (status != noErr) {
-+    OSSTATUS_LOG(WARNING, status)
-+        << "Could not put the AE file list the path in OpenItem()";
-+    return;
-+  }
-+
-+  // Send the actual event.  Do not care about the reply.
-+  base::mac::ScopedAEDesc<AppleEvent> reply;
-+  status = AESend(theEvent,  // theAppleEvent
-+                  reply.OutPointer(),  // reply
-+                  kAENoReply + kAEAlwaysInteract,  // sendMode
-+                  kAENormalPriority,  // sendPriority
-+                  kAEDefaultTimeout,  // timeOutInTicks
-+                  NULL, // idleProc
-+                  NULL);  // filterProc
-+  if (status != noErr) {
-+    OSSTATUS_LOG(WARNING, status)
-+        << "Could not send AE to Finder in OpenItem()";
-+  }
-+}
-+
-+bool OpenExternal(const GURL& url, bool activate) {
-+  DCHECK([NSThread isMainThread]);
-+  NSURL* ns_url = net::NSURLWithGURL(url);
-+  if (!ns_url) {
-+    return false;
-+  }
-+
-+  CFURLRef openingApp = NULL;
-+  OSStatus status = LSGetApplicationForURL((CFURLRef)ns_url,
-+                                           kLSRolesAll,
-+                                           NULL,
-+                                           &openingApp);
-+  if (status != noErr) {
-+    return false;
-+  }
-+  CFRelease(openingApp);  // NOT A BUG; LSGetApplicationForURL retains for us
-+
-+  NSUInteger launchOptions = NSWorkspaceLaunchDefault;
-+  if (!activate)
-+    launchOptions |= NSWorkspaceLaunchWithoutActivation;
-+
-+  return [[NSWorkspace sharedWorkspace] openURLs: @[ns_url]
-+                                        withAppBundleIdentifier: nil
-+                                        options: launchOptions
-+                                        additionalEventParamDescriptor: NULL
-+                                        launchIdentifiers: NULL];
-+}
-+
-+bool MoveItemToTrash(const base::FilePath& full_path) {
-+  NSString* path_string = base::SysUTF8ToNSString(full_path.value());
-+  BOOL status = [[NSFileManager defaultManager]
-+                trashItemAtURL:[NSURL fileURLWithPath:path_string]
-+                resultingItemURL:nil
-+                error:nil];
-+  if (!path_string || !status)
-+    LOG(WARNING) << "NSWorkspace failed to move file " << full_path.value()
-+                 << " to trash";
-+  return status;
-+}
-+
-+void Beep() {
-+  NSBeep();
-+}
-+
-+}  // namespace platform_util
-added in remote
-  their  100644 baf691a4f737f40009b881721145b544d96d3f6f electron/common/platform_util_win.cc
-@@ -0,0 +1,392 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/common/platform_util.h"
-+
-+#include <windows.h>
-+#include <atlbase.h>
-+#include <commdlg.h>
-+#include <comdef.h>
-+#include <dwmapi.h>
-+#include <shellapi.h>
-+#include <shlobj.h>
-+
-+#include "base/bind.h"
-+#include "base/bind_helpers.h"
-+#include "base/files/file_path.h"
-+#include "base/files/file_util.h"
-+#include "base/logging.h"
-+#include "base/strings/string_util.h"
-+#include "base/strings/utf_string_conversions.h"
-+#include "base/win/registry.h"
-+#include "base/win/scoped_co_mem.h"
-+#include "base/win/scoped_com_initializer.h"
-+#include "base/win/scoped_comptr.h"
-+#include "base/win/windows_version.h"
-+#include "url/gurl.h"
-+#include "ui/base/win/shell.h"
-+
-+namespace {
-+
-+// Old ShellExecute crashes the process when the command for a given scheme
-+// is empty. This function tells if it is.
-+bool ValidateShellCommandForScheme(const std::string& scheme) {
-+  base::win::RegKey key;
-+  base::string16 registry_path = base::ASCIIToUTF16(scheme) +
-+                                 L"\\shell\\open\\command";
-+  key.Open(HKEY_CLASSES_ROOT, registry_path.c_str(), KEY_READ);
-+  if (!key.Valid())
-+    return false;
-+  DWORD size = 0;
-+  key.ReadValue(NULL, NULL, &size, NULL);
-+  if (size <= 2)
-+    return false;
-+  return true;
-+}
-+
-+// Required COM implementation of IFileOperationProgressSink so we can
-+// precheck files before deletion to make sure they can be move to the
-+// Recycle Bin.
-+class DeleteFileProgressSink : public IFileOperationProgressSink {
-+ public:
-+  DeleteFileProgressSink();
-+
-+ private:
-+  ULONG STDMETHODCALLTYPE AddRef(void);
-+  ULONG STDMETHODCALLTYPE Release(void);
-+  HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, LPVOID* ppvObj);
-+  HRESULT STDMETHODCALLTYPE StartOperations(void);
-+  HRESULT STDMETHODCALLTYPE FinishOperations(HRESULT);
-+  HRESULT STDMETHODCALLTYPE PreRenameItem(
-+      DWORD, IShellItem*, LPCWSTR);
-+  HRESULT STDMETHODCALLTYPE PostRenameItem(
-+      DWORD, IShellItem*, LPCWSTR, HRESULT, IShellItem*);
-+  HRESULT STDMETHODCALLTYPE PreMoveItem(
-+      DWORD, IShellItem*, IShellItem*, LPCWSTR);
-+  HRESULT STDMETHODCALLTYPE PostMoveItem(
-+      DWORD, IShellItem*, IShellItem*, LPCWSTR, HRESULT, IShellItem*);
-+  HRESULT STDMETHODCALLTYPE PreCopyItem(
-+      DWORD, IShellItem*, IShellItem*, LPCWSTR);
-+  HRESULT STDMETHODCALLTYPE PostCopyItem(
-+      DWORD, IShellItem*, IShellItem*, LPCWSTR, HRESULT, IShellItem*);
-+  HRESULT STDMETHODCALLTYPE PreDeleteItem(DWORD, IShellItem*);
-+  HRESULT STDMETHODCALLTYPE PostDeleteItem(
-+      DWORD, IShellItem*, HRESULT, IShellItem*);
-+  HRESULT STDMETHODCALLTYPE PreNewItem(
-+      DWORD, IShellItem*, LPCWSTR);
-+  HRESULT STDMETHODCALLTYPE PostNewItem(
-+      DWORD, IShellItem*, LPCWSTR, LPCWSTR, DWORD, HRESULT, IShellItem*);
-+  HRESULT STDMETHODCALLTYPE UpdateProgress(UINT, UINT);
-+  HRESULT STDMETHODCALLTYPE ResetTimer(void);
-+  HRESULT STDMETHODCALLTYPE PauseTimer(void);
-+  HRESULT STDMETHODCALLTYPE ResumeTimer(void);
-+
-+  ULONG m_cRef;
-+};
-+
-+DeleteFileProgressSink::DeleteFileProgressSink() {
-+  m_cRef = 0;
-+}
-+
-+HRESULT DeleteFileProgressSink::PreDeleteItem(DWORD dwFlags, IShellItem*) {
-+  if (!(dwFlags & TSF_DELETE_RECYCLE_IF_POSSIBLE)) {
-+    // TSF_DELETE_RECYCLE_IF_POSSIBLE will not be set for items that cannot be
-+    // recycled.  In this case, we abort the delete operation.  This bubbles
-+    // up and stops the Delete in IFileOperation.
-+    return E_ABORT;
-+  }
-+  // Returns S_OK if successful, or an error value otherwise. In the case of an
-+  // error value, the delete operation and all subsequent operations pending
-+  // from the call to IFileOperation are canceled.
-+  return S_OK;
-+}
-+
-+HRESULT DeleteFileProgressSink::QueryInterface(REFIID riid, LPVOID* ppvObj) {
-+  // Always set out parameter to NULL, validating it first.
-+  if (!ppvObj)
-+    return E_INVALIDARG;
-+  *ppvObj = nullptr;
-+  if (riid == IID_IUnknown || riid == IID_IFileOperationProgressSink) {
-+    // Increment the reference count and return the pointer.
-+    *ppvObj = reinterpret_cast<IUnknown*>(this);
-+    AddRef();
-+    return NOERROR;
-+  }
-+  return E_NOINTERFACE;
-+}
-+
-+ULONG DeleteFileProgressSink::AddRef() {
-+  InterlockedIncrement(&m_cRef);
-+  return m_cRef;
-+}
-+
-+ULONG DeleteFileProgressSink::Release() {
-+  // Decrement the object's internal counter.
-+  ULONG ulRefCount = InterlockedDecrement(&m_cRef);
-+  if (0 == m_cRef) {
-+    delete this;
-+  }
-+  return ulRefCount;
-+}
-+
-+HRESULT DeleteFileProgressSink::StartOperations() {
-+  return S_OK;
-+}
-+
-+HRESULT DeleteFileProgressSink::FinishOperations(HRESULT) {
-+  return S_OK;
-+}
-+
-+HRESULT DeleteFileProgressSink::PreRenameItem(DWORD, IShellItem*, LPCWSTR) {
-+  return S_OK;
-+}
-+
-+HRESULT DeleteFileProgressSink::PostRenameItem(
-+    DWORD, IShellItem*, __RPC__in_string LPCWSTR, HRESULT, IShellItem*) {
-+  return E_NOTIMPL;
-+}
-+
-+HRESULT DeleteFileProgressSink::PreMoveItem(
-+    DWORD, IShellItem*, IShellItem*, LPCWSTR) {
-+  return E_NOTIMPL;
-+}
-+
-+HRESULT DeleteFileProgressSink::PostMoveItem(
-+    DWORD, IShellItem*, IShellItem*, LPCWSTR, HRESULT, IShellItem*) {
-+  return E_NOTIMPL;
-+}
-+
-+HRESULT DeleteFileProgressSink::PreCopyItem(
-+    DWORD, IShellItem*, IShellItem*, LPCWSTR) {
-+  return E_NOTIMPL;
-+}
-+
-+HRESULT DeleteFileProgressSink::PostCopyItem(
-+    DWORD, IShellItem*, IShellItem*, LPCWSTR, HRESULT, IShellItem*) {
-+  return E_NOTIMPL;
-+}
-+
-+HRESULT DeleteFileProgressSink::PostDeleteItem(
-+    DWORD, IShellItem*, HRESULT, IShellItem*) {
-+  return S_OK;
-+}
-+
-+HRESULT DeleteFileProgressSink::PreNewItem(
-+    DWORD dwFlags, IShellItem*, LPCWSTR) {
-+  return E_NOTIMPL;
-+}
-+
-+HRESULT DeleteFileProgressSink::PostNewItem(
-+    DWORD, IShellItem*, LPCWSTR, LPCWSTR, DWORD, HRESULT, IShellItem*) {
-+  return E_NOTIMPL;
-+}
-+
-+HRESULT DeleteFileProgressSink::UpdateProgress(UINT, UINT) {
-+  return S_OK;
-+}
-+
-+HRESULT DeleteFileProgressSink::ResetTimer() {
-+  return S_OK;
-+}
-+
-+HRESULT DeleteFileProgressSink::PauseTimer() {
-+  return S_OK;
-+}
-+
-+HRESULT DeleteFileProgressSink::ResumeTimer() {
-+  return S_OK;
-+}
-+
-+}  // namespace
-+
-+namespace platform_util {
-+
-+void ShowItemInFolder(const base::FilePath& full_path) {
-+  base::win::ScopedCOMInitializer com_initializer;
-+  if (!com_initializer.succeeded())
-+    return;
-+
-+  base::FilePath dir = full_path.DirName().AsEndingWithSeparator();
-+  // ParseDisplayName will fail if the directory is "C:", it must be "C:\\".
-+  if (dir.empty())
-+    return;
-+
-+  typedef HRESULT (WINAPI *SHOpenFolderAndSelectItemsFuncPtr)(
-+      PCIDLIST_ABSOLUTE pidl_Folder,
-+      UINT cidl,
-+      PCUITEMID_CHILD_ARRAY pidls,
-+      DWORD flags);
-+
-+  static SHOpenFolderAndSelectItemsFuncPtr open_folder_and_select_itemsPtr =
-+    NULL;
-+  static bool initialize_open_folder_proc = true;
-+  if (initialize_open_folder_proc) {
-+    initialize_open_folder_proc = false;
-+    // The SHOpenFolderAndSelectItems API is exposed by shell32 version 6
-+    // and does not exist in Win2K. We attempt to retrieve this function export
-+    // from shell32 and if it does not exist, we just invoke ShellExecute to
-+    // open the folder thus losing the functionality to select the item in
-+    // the process.
-+    HMODULE shell32_base = GetModuleHandle(L"shell32.dll");
-+    if (!shell32_base) {
-+      NOTREACHED() << " " << __FUNCTION__ << "(): Can't open shell32.dll";
-+      return;
-+    }
-+    open_folder_and_select_itemsPtr =
-+        reinterpret_cast<SHOpenFolderAndSelectItemsFuncPtr>
-+            (GetProcAddress(shell32_base, "SHOpenFolderAndSelectItems"));
-+  }
-+  if (!open_folder_and_select_itemsPtr) {
-+    ui::win::OpenFolderViaShell(dir);
-+    return;
-+  }
-+
-+  base::win::ScopedComPtr<IShellFolder> desktop;
-+  HRESULT hr = SHGetDesktopFolder(desktop.Receive());
-+  if (FAILED(hr))
-+    return;
-+
-+  base::win::ScopedCoMem<ITEMIDLIST> dir_item;
-+  hr = desktop->ParseDisplayName(NULL, NULL,
-+                                 const_cast<wchar_t *>(dir.value().c_str()),
-+                                 NULL, &dir_item, NULL);
-+  if (FAILED(hr)) {
-+    ui::win::OpenFolderViaShell(dir);
-+    return;
-+  }
-+
-+  base::win::ScopedCoMem<ITEMIDLIST> file_item;
-+  hr = desktop->ParseDisplayName(NULL, NULL,
-+      const_cast<wchar_t *>(full_path.value().c_str()),
-+      NULL, &file_item, NULL);
-+  if (FAILED(hr)) {
-+    ui::win::OpenFolderViaShell(dir);
-+    return;
-+  }
-+
-+  const ITEMIDLIST* highlight[] = { file_item };
-+
-+  hr = (*open_folder_and_select_itemsPtr)(dir_item, arraysize(highlight),
-+                                          highlight, NULL);
-+
-+  if (FAILED(hr)) {
-+    // On some systems, the above call mysteriously fails with "file not
-+    // found" even though the file is there.  In these cases, ShellExecute()
-+    // seems to work as a fallback (although it won't select the file).
-+    if (hr == ERROR_FILE_NOT_FOUND) {
-+      ui::win::OpenFolderViaShell(dir);
-+    } else {
-+      LPTSTR message = NULL;
-+      DWORD message_length = FormatMessage(
-+          FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
-+          0, hr, 0, reinterpret_cast<LPTSTR>(&message), 0, NULL);
-+      LOG(WARNING) << " " << __FUNCTION__
-+                   << "(): Can't open full_path = \""
-+                   << full_path.value() << "\""
-+                   << " hr = " << hr
-+                   << " " << reinterpret_cast<LPTSTR>(&message);
-+      if (message)
-+        LocalFree(message);
-+
-+      ui::win::OpenFolderViaShell(dir);
-+    }
-+  }
-+}
-+
-+void OpenItem(const base::FilePath& full_path) {
-+  if (base::DirectoryExists(full_path))
-+    ui::win::OpenFolderViaShell(full_path);
-+  else
-+    ui::win::OpenFileViaShell(full_path);
-+}
-+
-+bool OpenExternal(const GURL& url, bool activate) {
-+  // Quote the input scheme to be sure that the command does not have
-+  // parameters unexpected by the external program. This url should already
-+  // have been escaped.
-+  std::string escaped_url = url.spec();
-+  escaped_url.insert(0, "\"");
-+  escaped_url += "\"";
-+
-+  // According to Mozilla in uriloader/exthandler/win/nsOSHelperAppService.cpp:
-+  // "Some versions of windows (Win2k before SP3, Win XP before SP1) crash in
-+  // ShellExecute on long URLs (bug 161357 on bugzilla.mozilla.org). IE 5 and 6
-+  // support URLS of 2083 chars in length, 2K is safe."
-+  const size_t kMaxURLLength = 2048;
-+  if (escaped_url.length() > kMaxURLLength) {
-+    NOTREACHED();
-+    return false;
-+  }
-+
-+  if (base::win::GetVersion() < base::win::VERSION_WIN7) {
-+    if (!ValidateShellCommandForScheme(url.scheme()))
-+      return false;
-+  }
-+
-+  if (reinterpret_cast<ULONG_PTR>(ShellExecuteA(NULL, "open",
-+                                                escaped_url.c_str(), NULL, NULL,
-+                                                SW_SHOWNORMAL)) <= 32) {
-+    // We fail to execute the call. We could display a message to the user.
-+    // TODO(nsylvain): we should also add a dialog to warn on errors. See
-+    // bug 1136923.
-+    return false;
-+  }
-+  return true;
-+}
-+
-+bool MoveItemToTrash(const base::FilePath& path) {
-+  base::win::ScopedCOMInitializer com_initializer;
-+  if (!com_initializer.succeeded())
-+    return false;
-+
-+  base::win::ScopedComPtr<IFileOperation> pfo;
-+  if (FAILED(pfo.CreateInstance(CLSID_FileOperation)))
-+    return false;
-+
-+  // Elevation prompt enabled for UAC protected files.  This overrides the
-+  // SILENT, NO_UI and NOERRORUI flags.
-+
-+  if (base::win::GetVersion() >= base::win::VERSION_WIN8) {
-+    // Windows 8 introduces the flag RECYCLEONDELETE and deprecates the
-+    // ALLOWUNDO in favor of ADDUNDORECORD.
-+    if (FAILED(pfo->SetOperationFlags(FOF_NO_UI |
-+                                      FOFX_ADDUNDORECORD |
-+                                      FOF_NOERRORUI |
-+                                      FOF_SILENT |
-+                                      FOFX_SHOWELEVATIONPROMPT |
-+                                      FOFX_RECYCLEONDELETE)))
-+      return false;
-+  } else {
-+    // For Windows 7 and Vista, RecycleOnDelete is the default behavior.
-+    if (FAILED(pfo->SetOperationFlags(FOF_NO_UI |
-+                                      FOF_ALLOWUNDO |
-+                                      FOF_NOERRORUI |
-+                                      FOF_SILENT |
-+                                      FOFX_SHOWELEVATIONPROMPT)))
-+      return false;
-+  }
-+
-+  // Create an IShellItem from the supplied source path.
-+  base::win::ScopedComPtr<IShellItem> delete_item;
-+  if (FAILED(SHCreateItemFromParsingName(path.value().c_str(),
-+                                         NULL,
-+                                         IID_PPV_ARGS(delete_item.Receive()))))
-+    return false;
-+
-+  base::win::ScopedComPtr<IFileOperationProgressSink> delete_sink(
-+      new DeleteFileProgressSink);
-+  if (!delete_sink)
-+    return false;
-+
-+  // Processes the queued command DeleteItem. This will trigger
-+  // the DeleteFileProgressSink to check for Recycle Bin.
-+  return SUCCEEDED(pfo->DeleteItem(delete_item.get(), delete_sink.get())) &&
-+         SUCCEEDED(pfo->PerformOperations());
-+}
-+
-+void Beep() {
-+  MessageBeep(MB_OK);
-+}
-+
-+}  // namespace platform_util
-added in remote
-  their  100644 e39b2b84171ce2ebdef3cbe22597bd68fb822c08 electron/common/resources/mac/Info.plist
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-+<plist version="1.0">
-+<dict>
-+	<key>CFBundleIdentifier</key>
-+	<string>${ELECTRON_BUNDLE_ID}</string>
-+	<key>CFBundleName</key>
-+	<string>${PRODUCT_NAME}</string>
-+	<key>CFBundleExecutable</key>
-+	<string>${PRODUCT_NAME}</string>
-+	<key>CFBundlePackageType</key>
-+	<string>FMWK</string>
-+	<key>NSSupportsAutomaticGraphicsSwitching</key>
-+	<true/>
-+</dict>
-+</plist>
-added in remote
-  their  100644 8cb57c709237496ee9b263834d0f10b1455f42d3 electron/common/resources/mac/MainMenu.xib
-@@ -0,0 +1,180 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
-+	<data>
-+		<int key="IBDocument.SystemTarget">101000</int>
-+		<string key="IBDocument.SystemVersion">14D136</string>
-+		<string key="IBDocument.InterfaceBuilderVersion">7531</string>
-+		<string key="IBDocument.AppKitVersion">1347.57</string>
-+		<string key="IBDocument.HIToolboxVersion">758.70</string>
-+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-+			<string key="NS.object.0">7531</string>
-+		</object>
-+		<array key="IBDocument.IntegratedClassDependencies">
-+			<string>NSCustomObject</string>
-+			<string>NSMenu</string>
-+			<string>NSMenuItem</string>
-+		</array>
-+		<array key="IBDocument.PluginDependencies">
-+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-+		</array>
-+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-+			<integer value="1" key="NS.object.0"/>
-+		</object>
-+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1048">
-+			<object class="NSCustomObject" id="1021">
-+				<string key="NSClassName">ElectronApplication</string>
-+			</object>
-+			<object class="NSCustomObject" id="1014">
-+				<string key="NSClassName">FirstResponder</string>
-+			</object>
-+			<object class="NSCustomObject" id="1050">
-+				<string key="NSClassName">NSApplication</string>
-+			</object>
-+			<object class="NSCustomObject" id="903638069">
-+				<string key="NSClassName">NSFontManager</string>
-+			</object>
-+			<object class="NSMenu" id="649796088">
-+				<string key="NSTitle">Main Menu</string>
-+				<array class="NSMutableArray" key="NSMenuItems">
-+					<object class="NSMenuItem" id="694149608">
-+						<reference key="NSMenu" ref="649796088"/>
-+						<string key="NSTitle">Electron</string>
-+						<string key="NSKeyEquiv"/>
-+						<int key="NSMnemonicLoc">2147483647</int>
-+						<object class="NSCustomResource" key="NSOnImage" id="229763992">
-+							<string key="NSClassName">NSImage</string>
-+							<string key="NSResourceName">NSMenuCheckmark</string>
-+						</object>
-+						<object class="NSCustomResource" key="NSMixedImage" id="909111550">
-+							<string key="NSClassName">NSImage</string>
-+							<string key="NSResourceName">NSMenuMixedState</string>
-+						</object>
-+						<string key="NSAction">submenuAction:</string>
-+						<reference key="NSTarget" ref="110575045"/>
-+						<object class="NSMenu" key="NSSubmenu" id="110575045">
-+							<string key="NSTitle">Electron</string>
-+							<array class="NSMutableArray" key="NSMenuItems">
-+								<object class="NSMenuItem" id="632727374">
-+									<reference key="NSMenu" ref="110575045"/>
-+									<string key="NSTitle">Quit</string>
-+									<string key="NSKeyEquiv">q</string>
-+									<int key="NSKeyEquivModMask">1048576</int>
-+									<int key="NSMnemonicLoc">2147483647</int>
-+									<reference key="NSOnImage" ref="229763992"/>
-+									<reference key="NSMixedImage" ref="909111550"/>
-+								</object>
-+							</array>
-+							<string key="NSName">_NSAppleMenu</string>
-+						</object>
-+					</object>
-+				</array>
-+				<string key="NSName">_NSMainMenu</string>
-+			</object>
-+		</array>
-+		<object class="IBObjectContainer" key="IBDocument.Objects">
-+			<array key="connectionRecords">
-+				<object class="IBConnectionRecord">
-+					<object class="IBActionConnection" key="connection">
-+						<string key="label">terminate:</string>
-+						<reference key="source" ref="1014"/>
-+						<reference key="destination" ref="632727374"/>
-+					</object>
-+					<int key="connectionID">807</int>
-+				</object>
-+			</array>
-+			<object class="IBMutableOrderedSet" key="objectRecords">
-+				<array key="orderedObjects">
-+					<object class="IBObjectRecord">
-+						<int key="objectID">0</int>
-+						<array key="object" id="0"/>
-+						<reference key="children" ref="1048"/>
-+						<nil key="parent"/>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">-2</int>
-+						<reference key="object" ref="1021"/>
-+						<reference key="parent" ref="0"/>
-+						<string key="objectName">File's Owner</string>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">-1</int>
-+						<reference key="object" ref="1014"/>
-+						<reference key="parent" ref="0"/>
-+						<string key="objectName">First Responder</string>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">-3</int>
-+						<reference key="object" ref="1050"/>
-+						<reference key="parent" ref="0"/>
-+						<string key="objectName">Application</string>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">371</int>
-+						<reference key="object" ref="903638069"/>
-+						<reference key="parent" ref="0"/>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">29</int>
-+						<reference key="object" ref="649796088"/>
-+						<array class="NSMutableArray" key="children">
-+							<reference ref="694149608"/>
-+						</array>
-+						<reference key="parent" ref="0"/>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">56</int>
-+						<reference key="object" ref="694149608"/>
-+						<array class="NSMutableArray" key="children">
-+							<reference ref="110575045"/>
-+						</array>
-+						<reference key="parent" ref="649796088"/>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">57</int>
-+						<reference key="object" ref="110575045"/>
-+						<array class="NSMutableArray" key="children">
-+							<reference ref="632727374"/>
-+						</array>
-+						<reference key="parent" ref="694149608"/>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">136</int>
-+						<reference key="object" ref="632727374"/>
-+						<reference key="parent" ref="110575045"/>
-+					</object>
-+				</array>
-+			</object>
-+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
-+				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-+				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-+				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-+				<string key="136.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-+				<string key="29.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-+				<string key="371.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-+				<string key="56.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-+				<string key="57.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-+			</dictionary>
-+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
-+			<nil key="activeLocalization"/>
-+			<dictionary class="NSMutableDictionary" key="localizations"/>
-+			<nil key="sourceID"/>
-+			<int key="maxID">807</int>
-+		</object>
-+		<int key="IBDocument.localizationMode">0</int>
-+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-+		<bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">NO</bool>
-+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
-+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
-+			<integer value="4600" key="NS.object.0"/>
-+		</object>
-+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-+		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-+			<string key="NSMenuCheckmark">{12, 12}</string>
-+			<string key="NSMenuMixedState">{10, 2}</string>
-+		</dictionary>
-+		<bool key="IBDocument.UseAutolayout">YES</bool>
-+	</data>
-+</archive>
-added in remote
-  their  100644 9ec1b0cf2470f653d8df7f103f82c6ecaf8ed73c electron/renderer/api/electron_api_renderer_ipc.cc
-@@ -0,0 +1,74 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/common/api/api_messages.h"
-+#include "electron/common/native_mate_converters/string16_converter.h"
-+#include "electron/common/native_mate_converters/value_converter.h"
-+#include "electron/common/node_includes.h"
-+#include "content/public/renderer/render_view.h"
-+#include "native_mate/dictionary.h"
-+#include "third_party/WebKit/public/web/WebLocalFrame.h"
-+#include "third_party/WebKit/public/web/WebView.h"
-+
-+using content::RenderView;
-+using blink::WebLocalFrame;
-+using blink::WebView;
-+
-+namespace {
-+
-+RenderView* GetCurrentRenderView() {
-+  WebLocalFrame* frame = WebLocalFrame::frameForCurrentContext();
-+  if (!frame)
-+    return NULL;
-+
-+  WebView* view = frame->view();
-+  if (!view)
-+    return NULL;  // can happen during closing.
-+
-+  return RenderView::FromWebView(view);
-+}
-+
-+void Send(mate::Arguments* args,
-+          const base::string16& channel,
-+          const base::ListValue& arguments) {
-+  RenderView* render_view = GetCurrentRenderView();
-+  if (render_view == NULL)
-+    return;
-+
-+  bool success = render_view->Send(new ElectronViewHostMsg_Message(
-+      render_view->GetRoutingID(), channel, arguments));
-+
-+  if (!success)
-+    args->ThrowError("Unable to send ElectronViewHostMsg_Message");
-+}
-+
-+base::string16 SendSync(mate::Arguments* args,
-+                        const base::string16& channel,
-+                        const base::ListValue& arguments) {
-+  base::string16 json;
-+
-+  RenderView* render_view = GetCurrentRenderView();
-+  if (render_view == NULL)
-+    return json;
-+
-+  IPC::SyncMessage* message = new ElectronViewHostMsg_Message_Sync(
-+      render_view->GetRoutingID(), channel, arguments, &json);
-+  bool success = render_view->Send(message);
-+
-+  if (!success)
-+    args->ThrowError("Unable to send ElectronViewHostMsg_Message_Sync");
-+
-+  return json;
-+}
-+
-+void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
-+                v8::Local<v8::Context> context, void* priv) {
-+  mate::Dictionary dict(context->GetIsolate(), exports);
-+  dict.SetMethod("send", &Send);
-+  dict.SetMethod("sendSync", &SendSync);
-+}
-+
-+}  // namespace
-+
-+NODE_MODULE_CONTEXT_AWARE_BUILTIN(electron_renderer_ipc, Initialize)
-added in remote
-  their  100644 8e704aa729fe453b2f4863517b94631990fe81d9 electron/renderer/api/electron_api_spell_check_client.cc
-@@ -0,0 +1,189 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/renderer/api/electron_api_spell_check_client.h"
-+
-+#include <algorithm>
-+#include <vector>
-+
-+#include "electron/common/native_mate_converters/string16_converter.h"
-+#include "base/logging.h"
-+#include "native_mate/converter.h"
-+#include "native_mate/dictionary.h"
-+#include "third_party/icu/source/common/unicode/uscript.h"
-+#include "third_party/WebKit/public/web/WebTextCheckingCompletion.h"
-+#include "third_party/WebKit/public/web/WebTextCheckingResult.h"
-+
-+namespace electron {
-+
-+namespace api {
-+
-+namespace {
-+
-+bool HasWordCharacters(const base::string16& text, int index) {
-+  const base::char16* data = text.data();
-+  int length = text.length();
-+  while (index < length) {
-+    uint32_t code = 0;
-+    U16_NEXT(data, index, length, code);
-+    UErrorCode error = U_ZERO_ERROR;
-+    if (uscript_getScript(code, &error) != USCRIPT_COMMON)
-+      return true;
-+  }
-+  return false;
-+}
-+
-+}  // namespace
-+
-+SpellCheckClient::SpellCheckClient(const std::string& language,
-+                                   bool auto_spell_correct_turned_on,
-+                                   v8::Isolate* isolate,
-+                                   v8::Local<v8::Object> provider)
-+    : isolate_(isolate),
-+      provider_(isolate, provider) {
-+  character_attributes_.SetDefaultLanguage(language);
-+
-+  // Persistent the method.
-+  mate::Dictionary dict(isolate, provider);
-+  dict.Get("spellCheck", &spell_check_);
-+}
-+
-+SpellCheckClient::~SpellCheckClient() {}
-+
-+void SpellCheckClient::spellCheck(
-+    const blink::WebString& text,
-+    int& misspelling_start,
-+    int& misspelling_len,
-+    blink::WebVector<blink::WebString>* optional_suggestions) {
-+  std::vector<blink::WebTextCheckingResult> results;
-+  SpellCheckText(base::string16(text), true, &results);
-+  if (results.size() == 1) {
-+    misspelling_start = results[0].location;
-+    misspelling_len = results[0].length;
-+  }
-+}
-+
-+void SpellCheckClient::checkTextOfParagraph(
-+    const blink::WebString& text,
-+    blink::WebTextCheckingTypeMask mask,
-+    blink::WebVector<blink::WebTextCheckingResult>* results) {
-+  if (!results)
-+    return;
-+
-+  if (!(mask & blink::WebTextCheckingTypeSpelling))
-+    return;
-+
-+  NOTREACHED() << "checkTextOfParagraph should never be called";
-+}
-+
-+void SpellCheckClient::requestCheckingOfText(
-+    const blink::WebString& textToCheck,
-+    const blink::WebVector<uint32_t>& markersInText,
-+    const blink::WebVector<unsigned>& markerOffsets,
-+    blink::WebTextCheckingCompletion* completionCallback) {
-+  base::string16 text(textToCheck);
-+  if (text.empty() || !HasWordCharacters(text, 0)) {
-+    completionCallback->didCancelCheckingText();
-+    return;
-+  }
-+
-+  std::vector<blink::WebTextCheckingResult> results;
-+  SpellCheckText(text, false, &results);
-+  completionCallback->didFinishCheckingText(results);
-+}
-+
-+void SpellCheckClient::showSpellingUI(bool show) {
-+}
-+
-+bool SpellCheckClient::isShowingSpellingUI() {
-+  return false;
-+}
-+
-+void SpellCheckClient::updateSpellingUIWithMisspelledWord(
-+    const blink::WebString& word) {
-+}
-+
-+void SpellCheckClient::SpellCheckText(
-+    const base::string16& text,
-+    bool stop_at_first_result,
-+    std::vector<blink::WebTextCheckingResult>* results) {
-+  if (text.length() == 0 || spell_check_.IsEmpty())
-+    return;
-+
-+  base::string16 word;
-+  int word_start;
-+  int word_length;
-+  if (!text_iterator_.IsInitialized() &&
-+      !text_iterator_.Initialize(&character_attributes_, true)) {
-+      // We failed to initialize text_iterator_, return as spelled correctly.
-+      VLOG(1) << "Failed to initialize SpellcheckWordIterator";
-+      return;
-+  }
-+
-+  base::string16 in_word(text);
-+  text_iterator_.SetText(in_word.c_str(), in_word.size());
-+  while (text_iterator_.GetNextWord(&word, &word_start, &word_length)) {
-+    // Found a word (or a contraction) that the spellchecker can check the
-+    // spelling of.
-+    if (SpellCheckWord(word))
-+      continue;
-+
-+    // If the given word is a concatenated word of two or more valid words
-+    // (e.g. "hello:hello"), we should treat it as a valid word.
-+    if (IsValidContraction(word))
-+      continue;
-+
-+    blink::WebTextCheckingResult result;
-+    result.location = word_start;
-+    result.length = word_length;
-+    results->push_back(result);
-+
-+    if (stop_at_first_result)
-+      return;
-+  }
-+}
-+
-+bool SpellCheckClient::SpellCheckWord(const base::string16& word_to_check) {
-+  if (spell_check_.IsEmpty())
-+    return true;
-+
-+  v8::HandleScope handle_scope(isolate_);
-+  v8::Local<v8::Value> word = mate::ConvertToV8(isolate_, word_to_check);
-+  v8::Local<v8::Value> result = spell_check_.NewHandle()->Call(
-+      provider_.NewHandle(), 1, &word);
-+
-+  if (result->IsBoolean())
-+    return result->BooleanValue();
-+  else
-+    return true;
-+}
-+
-+// Returns whether or not the given string is a valid contraction.
-+// This function is a fall-back when the SpellcheckWordIterator class
-+// returns a concatenated word which is not in the selected dictionary
-+// (e.g. "in'n'out") but each word is valid.
-+bool SpellCheckClient::IsValidContraction(const base::string16& contraction) {
-+  if (!contraction_iterator_.IsInitialized() &&
-+      !contraction_iterator_.Initialize(&character_attributes_, false)) {
-+    // We failed to initialize the word iterator, return as spelled correctly.
-+    VLOG(1) << "Failed to initialize contraction_iterator_";
-+    return true;
-+  }
-+
-+  contraction_iterator_.SetText(contraction.c_str(), contraction.length());
-+
-+  base::string16 word;
-+  int word_start;
-+  int word_length;
-+
-+  while (contraction_iterator_.GetNextWord(&word, &word_start, &word_length)) {
-+    if (!SpellCheckWord(word))
-+      return false;
-+  }
-+  return true;
-+}
-+
-+}  // namespace api
-+
-+}  // namespace electron
-added in remote
-  their  100644 85f7541857b00affa935eca56ac1bd530ee9718a electron/renderer/api/electron_api_spell_check_client.h
-@@ -0,0 +1,91 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_RENDERER_API_ELECTRON_API_SPELL_CHECK_CLIENT_H_
-+#define ELECTRON_RENDERER_API_ELECTRON_API_SPELL_CHECK_CLIENT_H_
-+
-+#include <string>
-+#include <vector>
-+
-+#include "base/callback.h"
-+#include "chrome/renderer/spellchecker/spellcheck_worditerator.h"
-+#include "native_mate/scoped_persistent.h"
-+#include "third_party/WebKit/public/web/WebSpellCheckClient.h"
-+
-+namespace electron {
-+
-+namespace api {
-+
-+class SpellCheckClient : public blink::WebSpellCheckClient {
-+ public:
-+  SpellCheckClient(const std::string& language,
-+                   bool auto_spell_correct_turned_on,
-+                   v8::Isolate* isolate,
-+                   v8::Local<v8::Object> provider);
-+  virtual ~SpellCheckClient();
-+
-+ private:
-+  // blink::WebSpellCheckClient:
-+  void spellCheck(
-+      const blink::WebString& text,
-+      int& misspelledOffset,
-+      int& misspelledLength,
-+      blink::WebVector<blink::WebString>* optionalSuggestions) override;
-+  void checkTextOfParagraph(
-+      const blink::WebString&,
-+      blink::WebTextCheckingTypeMask mask,
-+      blink::WebVector<blink::WebTextCheckingResult>* results) override;
-+  void requestCheckingOfText(
-+      const blink::WebString& textToCheck,
-+      const blink::WebVector<uint32_t>& markersInText,
-+      const blink::WebVector<unsigned>& markerOffsets,
-+      blink::WebTextCheckingCompletion* completionCallback) override;
-+  void showSpellingUI(bool show) override;
-+  bool isShowingSpellingUI() override;
-+  void updateSpellingUIWithMisspelledWord(
-+      const blink::WebString& word) override;
-+
-+  // Check the spelling of text.
-+  void SpellCheckText(const base::string16& text,
-+                      bool stop_at_first_result,
-+                      std::vector<blink::WebTextCheckingResult>* results);
-+
-+  // Call JavaScript to check spelling a word.
-+  bool SpellCheckWord(const base::string16& word_to_check);
-+
-+  // Find a possible correctly spelled word for a misspelled word. Computes an
-+  // empty string if input misspelled word is too long, there is ambiguity, or
-+  // the correct spelling cannot be determined.
-+  base::string16 GetAutoCorrectionWord(const base::string16& word);
-+
-+  // Returns whether or not the given word is a contraction of valid words
-+  // (e.g. "word:word").
-+  bool IsValidContraction(const base::string16& word);
-+
-+  // Represents character attributes used for filtering out characters which
-+  // are not supported by this SpellCheck object.
-+  SpellcheckCharAttribute character_attributes_;
-+
-+  // Represents word iterators used in this spellchecker. The |text_iterator_|
-+  // splits text provided by WebKit into words, contractions, or concatenated
-+  // words. The |contraction_iterator_| splits a concatenated word extracted by
-+  // |text_iterator_| into word components so we can treat a concatenated word
-+  // consisting only of correct words as a correct word.
-+  SpellcheckWordIterator text_iterator_;
-+  SpellcheckWordIterator contraction_iterator_;
-+
-+  bool auto_spell_correct_turned_on_;
-+
-+  v8::Isolate* isolate_;
-+  mate::ScopedPersistent<v8::Object> provider_;
-+  mate::ScopedPersistent<v8::Function> spell_check_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(SpellCheckClient);
-+};
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_RENDERER_API_ELECTRON_API_SPELL_CHECK_CLIENT_H_
-added in remote
-  their  100644 184b597d27b12619e2fba2387ce2c4250e74a669 electron/renderer/api/electron_api_web_frame.cc
-@@ -0,0 +1,210 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/renderer/api/electron_api_web_frame.h"
-+
-+#include "electron/common/api/event_emitter_caller.h"
-+#include "electron/common/native_mate_converters/callback.h"
-+#include "electron/common/native_mate_converters/gfx_converter.h"
-+#include "electron/common/native_mate_converters/string16_converter.h"
-+#include "electron/renderer/api/electron_api_spell_check_client.h"
-+#include "content/public/renderer/render_frame.h"
-+#include "content/public/renderer/render_view.h"
-+#include "native_mate/dictionary.h"
-+#include "native_mate/object_template_builder.h"
-+#include "third_party/WebKit/public/web/WebDocument.h"
-+#include "third_party/WebKit/public/web/WebLocalFrame.h"
-+#include "third_party/WebKit/public/web/WebScriptExecutionCallback.h"
-+#include "third_party/WebKit/public/web/WebScriptSource.h"
-+#include "third_party/WebKit/public/web/WebSecurityPolicy.h"
-+#include "third_party/WebKit/public/web/WebView.h"
-+
-+#include "electron/common/node_includes.h"
-+
-+namespace electron {
-+
-+namespace api {
-+
-+namespace {
-+
-+class ScriptExecutionCallback : public blink::WebScriptExecutionCallback {
-+ public:
-+  using CompletionCallback =
-+      base::Callback<void(
-+          const v8::Local<v8::Value>& result)>;
-+
-+  explicit ScriptExecutionCallback(const CompletionCallback& callback)
-+      : callback_(callback) {}
-+  ~ScriptExecutionCallback() {}
-+
-+  void completed(
-+      const blink::WebVector<v8::Local<v8::Value>>& result) override {
-+    if (!callback_.is_null() && !result.isEmpty() && !result[0].IsEmpty())
-+      // Right now only single results per frame is supported.
-+      callback_.Run(result[0]);
-+    delete this;
-+  }
-+
-+ private:
-+  CompletionCallback callback_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(ScriptExecutionCallback);
-+};
-+
-+}  // namespace
-+
-+WebFrame::WebFrame()
-+    : web_frame_(blink::WebLocalFrame::frameForCurrentContext()) {
-+}
-+
-+WebFrame::~WebFrame() {
-+}
-+
-+void WebFrame::SetName(const std::string& name) {
-+  web_frame_->setName(blink::WebString::fromUTF8(name));
-+}
-+
-+double WebFrame::SetZoomLevel(double level) {
-+  double ret = web_frame_->view()->setZoomLevel(level);
-+  mate::EmitEvent(isolate(), GetWrapper(isolate()), "zoom-level-changed", ret);
-+  return ret;
-+}
-+
-+double WebFrame::GetZoomLevel() const {
-+  return web_frame_->view()->zoomLevel();
-+}
-+
-+double WebFrame::SetZoomFactor(double factor) {
-+  return blink::WebView::zoomLevelToZoomFactor(SetZoomLevel(
-+      blink::WebView::zoomFactorToZoomLevel(factor)));
-+}
-+
-+double WebFrame::GetZoomFactor() const {
-+  return blink::WebView::zoomLevelToZoomFactor(GetZoomLevel());
-+}
-+
-+void WebFrame::SetZoomLevelLimits(double min_level, double max_level) {
-+  web_frame_->view()->setDefaultPageScaleLimits(min_level, max_level);
-+}
-+
-+v8::Local<v8::Value> WebFrame::RegisterEmbedderCustomElement(
-+    const base::string16& name, v8::Local<v8::Object> options) {
-+  blink::WebExceptionCode c = 0;
-+  return web_frame_->document().registerEmbedderCustomElement(name, options, c);
-+}
-+
-+void WebFrame::RegisterElementResizeCallback(
-+    int element_instance_id,
-+    const GuestViewContainer::ResizeCallback& callback) {
-+  auto guest_view_container = GuestViewContainer::FromID(element_instance_id);
-+  if (guest_view_container)
-+    guest_view_container->RegisterElementResizeCallback(callback);
-+}
-+
-+void WebFrame::AttachGuest(int id) {
-+  content::RenderFrame::FromWebFrame(web_frame_)->AttachGuest(id);
-+}
-+
-+void WebFrame::SetSpellCheckProvider(mate::Arguments* args,
-+                                     const std::string& language,
-+                                     bool auto_spell_correct_turned_on,
-+                                     v8::Local<v8::Object> provider) {
-+  if (!provider->Has(mate::StringToV8(args->isolate(), "spellCheck"))) {
-+    args->ThrowError("\"spellCheck\" has to be defined");
-+    return;
-+  }
-+
-+  spell_check_client_.reset(new SpellCheckClient(
-+      language, auto_spell_correct_turned_on, args->isolate(), provider));
-+  web_frame_->view()->setSpellCheckClient(spell_check_client_.get());
-+}
-+
-+void WebFrame::RegisterURLSchemeAsSecure(const std::string& scheme) {
-+  // Register scheme to secure list (https, wss, data).
-+  blink::WebSecurityPolicy::registerURLSchemeAsSecure(
-+      blink::WebString::fromUTF8(scheme));
-+}
-+
-+void WebFrame::RegisterURLSchemeAsBypassingCSP(const std::string& scheme) {
-+  // Register scheme to bypass pages's Content Security Policy.
-+  blink::WebSecurityPolicy::registerURLSchemeAsBypassingContentSecurityPolicy(
-+      blink::WebString::fromUTF8(scheme));
-+}
-+
-+void WebFrame::RegisterURLSchemeAsPrivileged(const std::string& scheme) {
-+  // Register scheme to privileged list (https, wss, data, chrome-extension)
-+  blink::WebString privileged_scheme(blink::WebString::fromUTF8(scheme));
-+  blink::WebSecurityPolicy::registerURLSchemeAsSecure(privileged_scheme);
-+  blink::WebSecurityPolicy::registerURLSchemeAsBypassingContentSecurityPolicy(
-+      privileged_scheme);
-+  blink::WebSecurityPolicy::registerURLSchemeAsAllowingServiceWorkers(
-+      privileged_scheme);
-+  blink::WebSecurityPolicy::registerURLSchemeAsSupportingFetchAPI(
-+      privileged_scheme);
-+}
-+
-+void WebFrame::InsertText(const std::string& text) {
-+  web_frame_->insertText(blink::WebString::fromUTF8(text));
-+}
-+
-+void WebFrame::ExecuteJavaScript(const base::string16& code,
-+                                 mate::Arguments* args) {
-+  bool has_user_gesture = false;
-+  args->GetNext(&has_user_gesture);
-+  ScriptExecutionCallback::CompletionCallback completion_callback;
-+  args->GetNext(&completion_callback);
-+  scoped_ptr<blink::WebScriptExecutionCallback> callback(
-+      new ScriptExecutionCallback(completion_callback));
-+  web_frame_->requestExecuteScriptAndReturnValue(
-+      blink::WebScriptSource(code),
-+      has_user_gesture,
-+      callback.release());
-+}
-+
-+mate::ObjectTemplateBuilder WebFrame::GetObjectTemplateBuilder(
-+    v8::Isolate* isolate) {
-+  return mate::ObjectTemplateBuilder(isolate)
-+      .SetMethod("setName", &WebFrame::SetName)
-+      .SetMethod("setZoomLevel", &WebFrame::SetZoomLevel)
-+      .SetMethod("getZoomLevel", &WebFrame::GetZoomLevel)
-+      .SetMethod("setZoomFactor", &WebFrame::SetZoomFactor)
-+      .SetMethod("getZoomFactor", &WebFrame::GetZoomFactor)
-+      .SetMethod("setZoomLevelLimits", &WebFrame::SetZoomLevelLimits)
-+      .SetMethod("registerEmbedderCustomElement",
-+                 &WebFrame::RegisterEmbedderCustomElement)
-+      .SetMethod("registerElementResizeCallback",
-+                 &WebFrame::RegisterElementResizeCallback)
-+      .SetMethod("attachGuest", &WebFrame::AttachGuest)
-+      .SetMethod("setSpellCheckProvider", &WebFrame::SetSpellCheckProvider)
-+      .SetMethod("registerURLSchemeAsSecure",
-+                 &WebFrame::RegisterURLSchemeAsSecure)
-+      .SetMethod("registerURLSchemeAsBypassingCSP",
-+                 &WebFrame::RegisterURLSchemeAsBypassingCSP)
-+      .SetMethod("registerURLSchemeAsPrivileged",
-+                 &WebFrame::RegisterURLSchemeAsPrivileged)
-+      .SetMethod("insertText", &WebFrame::InsertText)
-+      .SetMethod("executeJavaScript", &WebFrame::ExecuteJavaScript);
-+}
-+
-+// static
-+mate::Handle<WebFrame> WebFrame::Create(v8::Isolate* isolate) {
-+  return CreateHandle(isolate, new WebFrame);
-+}
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+namespace {
-+
-+void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
-+                v8::Local<v8::Context> context, void* priv) {
-+  v8::Isolate* isolate = context->GetIsolate();
-+  mate::Dictionary dict(isolate, exports);
-+  dict.Set("webFrame", electron::api::WebFrame::Create(isolate));
-+}
-+
-+}  // namespace
-+
-+NODE_MODULE_CONTEXT_AWARE_BUILTIN(electron_renderer_web_frame, Initialize)
-added in remote
-  their  100644 7723e08a579bef948d2139e066a42783377ab1d0 electron/renderer/api/electron_api_web_frame.h
-@@ -0,0 +1,84 @@
-+// Copyright (c) 2014 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_RENDERER_API_ELECTRON_API_WEB_FRAME_H_
-+#define ELECTRON_RENDERER_API_ELECTRON_API_WEB_FRAME_H_
-+
-+#include <string>
-+
-+#include "electron/renderer/guest_view_container.h"
-+#include "base/memory/scoped_ptr.h"
-+#include "native_mate/handle.h"
-+#include "native_mate/wrappable.h"
-+
-+namespace blink {
-+class WebLocalFrame;
-+}
-+
-+namespace mate {
-+class Arguments;
-+}
-+
-+namespace electron {
-+
-+namespace api {
-+
-+class SpellCheckClient;
-+
-+class WebFrame : public mate::Wrappable {
-+ public:
-+  static mate::Handle<WebFrame> Create(v8::Isolate* isolate);
-+
-+ private:
-+  WebFrame();
-+  virtual ~WebFrame();
-+
-+  void SetName(const std::string& name);
-+
-+  double SetZoomLevel(double level);
-+  double GetZoomLevel() const;
-+  double SetZoomFactor(double factor);
-+  double GetZoomFactor() const;
-+
-+  void SetZoomLevelLimits(double min_level, double max_level);
-+
-+  v8::Local<v8::Value> RegisterEmbedderCustomElement(
-+      const base::string16& name, v8::Local<v8::Object> options);
-+  void RegisterElementResizeCallback(
-+      int element_instance_id,
-+      const GuestViewContainer::ResizeCallback& callback);
-+  void AttachGuest(int element_instance_id);
-+
-+  // Set the provider that will be used by SpellCheckClient for spell check.
-+  void SetSpellCheckProvider(mate::Arguments* args,
-+                             const std::string& language,
-+                             bool auto_spell_correct_turned_on,
-+                             v8::Local<v8::Object> provider);
-+
-+  void RegisterURLSchemeAsSecure(const std::string& scheme);
-+  void RegisterURLSchemeAsBypassingCSP(const std::string& scheme);
-+  void RegisterURLSchemeAsPrivileged(const std::string& scheme);
-+
-+  // Editing.
-+  void InsertText(const std::string& text);
-+
-+  // Excecuting scripts.
-+  void ExecuteJavaScript(const base::string16& code, mate::Arguments* args);
-+
-+  // mate::Wrappable:
-+  virtual mate::ObjectTemplateBuilder GetObjectTemplateBuilder(
-+      v8::Isolate* isolate);
-+
-+  scoped_ptr<SpellCheckClient> spell_check_client_;
-+
-+  blink::WebLocalFrame* web_frame_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(WebFrame);
-+};
-+
-+}  // namespace api
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_RENDERER_API_ELECTRON_API_WEB_FRAME_H_
-added in remote
-  their  100644 9caa7dec200dbfb466a528213e09023834989cd4 electron/renderer/electron_render_view_observer.cc
-@@ -0,0 +1,155 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/renderer/electron_render_view_observer.h"
-+
-+#include <string>
-+#include <vector>
-+
-+// Put this before event_emitter_caller.h to have string16 support.
-+#include "electron/common/native_mate_converters/string16_converter.h"
-+
-+#include "electron/common/api/api_messages.h"
-+#include "electron/common/api/event_emitter_caller.h"
-+#include "electron/common/native_mate_converters/value_converter.h"
-+#include "electron/common/node_includes.h"
-+#include "electron/common/options_switches.h"
-+#include "electron/renderer/electron_renderer_client.h"
-+#include "base/command_line.h"
-+#include "base/strings/string_number_conversions.h"
-+#include "content/public/renderer/render_view.h"
-+#include "ipc/ipc_message_macros.h"
-+#include "net/base/net_module.h"
-+#include "net/grit/net_resources.h"
-+#include "third_party/WebKit/public/web/WebDraggableRegion.h"
-+#include "third_party/WebKit/public/web/WebDocument.h"
-+#include "third_party/WebKit/public/web/WebFrame.h"
-+#include "third_party/WebKit/public/web/WebLocalFrame.h"
-+#include "third_party/WebKit/public/web/WebKit.h"
-+#include "third_party/WebKit/public/web/WebView.h"
-+#include "ui/base/resource/resource_bundle.h"
-+#include "native_mate/dictionary.h"
-+
-+namespace electron {
-+
-+namespace {
-+
-+bool GetIPCObject(v8::Isolate* isolate,
-+                  v8::Local<v8::Context> context,
-+                  v8::Local<v8::Object>* ipc) {
-+  v8::Local<v8::String> key = mate::StringToV8(isolate, "ipc");
-+  v8::Local<v8::Private> privateKey = v8::Private::ForApi(isolate, key);
-+  v8::Local<v8::Object> global_object = context->Global();
-+  v8::Local<v8::Value> value;
-+  if (!global_object->GetPrivate(context, privateKey).ToLocal(&value))
-+    return false;
-+  if (value.IsEmpty() || !value->IsObject())
-+    return false;
-+  *ipc = value->ToObject();
-+  return true;
-+}
-+
-+std::vector<v8::Local<v8::Value>> ListValueToVector(
-+    v8::Isolate* isolate,
-+    const base::ListValue& list) {
-+  v8::Local<v8::Value> array = mate::ConvertToV8(isolate, list);
-+  std::vector<v8::Local<v8::Value>> result;
-+  mate::ConvertFromV8(isolate, array, &result);
-+  return result;
-+}
-+
-+base::StringPiece NetResourceProvider(int key) {
-+  if (key == IDR_DIR_HEADER_HTML) {
-+    base::StringPiece html_data =
-+        ui::ResourceBundle::GetSharedInstance().GetRawDataResource(
-+            IDR_DIR_HEADER_HTML);
-+    return html_data;
-+  }
-+  return base::StringPiece();
-+}
-+
-+}  // namespace
-+
-+ElectronRenderViewObserver::ElectronRenderViewObserver(
-+    content::RenderView* render_view,
-+    ElectronRendererClient* renderer_client)
-+    : content::RenderViewObserver(render_view),
-+      renderer_client_(renderer_client),
-+      document_created_(false) {
-+  // Initialise resource for directory listing.
-+  net::NetModule::SetResourceProvider(NetResourceProvider);
-+}
-+
-+ElectronRenderViewObserver::~ElectronRenderViewObserver() {
-+}
-+
-+void ElectronRenderViewObserver::DidCreateDocumentElement(
-+    blink::WebLocalFrame* frame) {
-+  document_created_ = true;
-+
-+  // Read --zoom-factor from command line.
-+  std::string zoom_factor_str = base::CommandLine::ForCurrentProcess()->
-+      GetSwitchValueASCII(switches::kZoomFactor);
-+  if (zoom_factor_str.empty())
-+    return;
-+  double zoom_factor;
-+  if (!base::StringToDouble(zoom_factor_str, &zoom_factor))
-+    return;
-+  double zoom_level = blink::WebView::zoomFactorToZoomLevel(zoom_factor);
-+  frame->view()->setZoomLevel(zoom_level);
-+}
-+
-+void ElectronRenderViewObserver::DraggableRegionsChanged(blink::WebFrame* frame) {
-+  blink::WebVector<blink::WebDraggableRegion> webregions =
-+      frame->document().draggableRegions();
-+  std::vector<DraggableRegion> regions;
-+  for (size_t i = 0; i < webregions.size(); ++i) {
-+    DraggableRegion region;
-+    region.bounds = webregions[i].bounds;
-+    region.draggable = webregions[i].draggable;
-+    regions.push_back(region);
-+  }
-+  Send(new ElectronViewHostMsg_UpdateDraggableRegions(routing_id(), regions));
-+}
-+
-+bool ElectronRenderViewObserver::OnMessageReceived(const IPC::Message& message) {
-+  bool handled = true;
-+  IPC_BEGIN_MESSAGE_MAP(ElectronRenderViewObserver, message)
-+    IPC_MESSAGE_HANDLER(ElectronViewMsg_Message, OnBrowserMessage)
-+    IPC_MESSAGE_UNHANDLED(handled = false)
-+  IPC_END_MESSAGE_MAP()
-+
-+  return handled;
-+}
-+
-+void ElectronRenderViewObserver::OnBrowserMessage(const base::string16& channel,
-+                                              const base::ListValue& args) {
-+  if (!document_created_)
-+    return;
-+
-+  if (!render_view()->GetWebView())
-+    return;
-+
-+  blink::WebFrame* frame = render_view()->GetWebView()->mainFrame();
-+  if (!frame || frame->isWebRemoteFrame())
-+    return;
-+
-+  v8::Isolate* isolate = blink::mainThreadIsolate();
-+  v8::HandleScope handle_scope(isolate);
-+
-+  v8::Local<v8::Context> context = frame->mainWorldScriptContext();
-+  v8::Context::Scope context_scope(context);
-+
-+  v8::Local<v8::Object> ipc;
-+  if (GetIPCObject(isolate, context, &ipc)) {
-+    auto args_vector = ListValueToVector(isolate, args);
-+    // Insert the Event object, event.sender is ipc.
-+    mate::Dictionary event = mate::Dictionary::CreateEmpty(isolate);
-+    event.Set("sender", ipc);
-+    args_vector.insert(args_vector.begin(), event.GetHandle());
-+    mate::EmitEvent(isolate, ipc, channel, args_vector);
-+  }
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 714395305caebceaffba5558cca3930501b3650d electron/renderer/electron_render_view_observer.h
-@@ -0,0 +1,47 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_RENDERER_ELECTRON_RENDER_VIEW_OBSERVER_H_
-+#define ELECTRON_RENDERER_ELECTRON_RENDER_VIEW_OBSERVER_H_
-+
-+#include "base/strings/string16.h"
-+#include "content/public/renderer/render_view_observer.h"
-+
-+namespace base {
-+class ListValue;
-+}
-+
-+namespace electron {
-+
-+class ElectronRendererClient;
-+
-+class ElectronRenderViewObserver : public content::RenderViewObserver {
-+ public:
-+  explicit ElectronRenderViewObserver(content::RenderView* render_view,
-+                                  ElectronRendererClient* renderer_client);
-+
-+ protected:
-+  virtual ~ElectronRenderViewObserver();
-+
-+ private:
-+  // content::RenderViewObserver implementation.
-+  void DidCreateDocumentElement(blink::WebLocalFrame* frame) override;
-+  void DraggableRegionsChanged(blink::WebFrame* frame) override;
-+  bool OnMessageReceived(const IPC::Message& message) override;
-+
-+  void OnBrowserMessage(const base::string16& channel,
-+                        const base::ListValue& args);
-+
-+  // Weak reference to renderer client.
-+  ElectronRendererClient* renderer_client_;
-+
-+  // Whether the document object has been created.
-+  bool document_created_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(ElectronRenderViewObserver);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_RENDERER_ELECTRON_RENDER_VIEW_OBSERVER_H_
-added in remote
-  their  100644 6eb66e35b8e76b305296e14079e20e0305845ac0 electron/renderer/electron_renderer_client.cc
-@@ -0,0 +1,214 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/renderer/electron_renderer_client.h"
-+
-+#include <string>
-+#include <vector>
-+
-+#include "electron/common/api/api_messages.h"
-+#include "electron/common/api/electron_bindings.h"
-+#include "electron/common/api/event_emitter_caller.h"
-+#include "electron/common/node_bindings.h"
-+#include "electron/common/node_includes.h"
-+#include "electron/common/options_switches.h"
-+#include "electron/renderer/electron_render_view_observer.h"
-+#include "electron/renderer/guest_view_container.h"
-+#include "electron/renderer/node_array_buffer_bridge.h"
-+#include "base/command_line.h"
-+#include "chrome/renderer/media/chrome_key_systems.h"
-+#include "chrome/renderer/pepper/pepper_helper.h"
-+#include "chrome/renderer/printing/print_web_view_helper.h"
-+#include "chrome/renderer/tts_dispatcher.h"
-+#include "content/public/common/content_constants.h"
-+#include "content/public/renderer/render_frame.h"
-+#include "content/public/renderer/render_frame_observer.h"
-+#include "content/public/renderer/render_thread.h"
-+#include "content/public/renderer/render_view.h"
-+#include "ipc/ipc_message_macros.h"
-+#include "third_party/WebKit/public/web/WebCustomElement.h"
-+#include "third_party/WebKit/public/web/WebLocalFrame.h"
-+#include "third_party/WebKit/public/web/WebPluginParams.h"
-+#include "third_party/WebKit/public/web/WebKit.h"
-+#include "third_party/WebKit/public/web/WebSecurityPolicy.h"
-+#include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
-+#include "third_party/WebKit/public/web/WebView.h"
-+
-+#if defined(OS_WIN)
-+#include <shlobj.h>
-+#endif
-+
-+namespace electron {
-+
-+namespace {
-+
-+// Helper class to forward the messages to the client.
-+class ElectronRenderFrameObserver : public content::RenderFrameObserver {
-+ public:
-+  ElectronRenderFrameObserver(content::RenderFrame* frame,
-+                          ElectronRendererClient* renderer_client)
-+      : content::RenderFrameObserver(frame),
-+        world_id_(-1),
-+        renderer_client_(renderer_client) {}
-+
-+  // content::RenderFrameObserver:
-+  void DidCreateScriptContext(v8::Handle<v8::Context> context,
-+                              int extension_group,
-+                              int world_id) override {
-+    if (world_id_ != -1 && world_id_ != world_id)
-+      return;
-+    world_id_ = world_id;
-+    renderer_client_->DidCreateScriptContext(context);
-+  }
-+  void WillReleaseScriptContext(v8::Local<v8::Context> context,
-+                                int world_id) override {
-+    if (world_id_ != world_id)
-+      return;
-+    renderer_client_->WillReleaseScriptContext(context);
-+  }
-+
-+ private:
-+  int world_id_;
-+  ElectronRendererClient* renderer_client_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(ElectronRenderFrameObserver);
-+};
-+
-+}  // namespace
-+
-+ElectronRendererClient::ElectronRendererClient()
-+    : node_bindings_(NodeBindings::Create(false)),
-+      electron_bindings_(new ElectronBindings) {
-+}
-+
-+ElectronRendererClient::~ElectronRendererClient() {
-+}
-+
-+void ElectronRendererClient::WebKitInitialized() {
-+  blink::WebCustomElement::addEmbedderCustomElementName("webview");
-+  blink::WebCustomElement::addEmbedderCustomElementName("browserplugin");
-+
-+  OverrideNodeArrayBuffer();
-+}
-+
-+void ElectronRendererClient::RenderThreadStarted() {
-+  content::RenderThread::Get()->AddObserver(this);
-+
-+#if defined(OS_WIN)
-+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-+  base::string16 app_id =
-+      command_line->GetSwitchValueNative(switches::kAppUserModelId);
-+  if (!app_id.empty()) {
-+    SetCurrentProcessExplicitAppUserModelID(app_id.c_str());
-+  }
-+#endif
-+}
-+
-+void ElectronRendererClient::RenderFrameCreated(
-+    content::RenderFrame* render_frame) {
-+  new PepperHelper(render_frame);
-+
-+  // Allow file scheme to handle service worker by default.
-+  blink::WebSecurityPolicy::registerURLSchemeAsAllowingServiceWorkers("file");
-+
-+  // Only insert node integration for the main frame.
-+  if (!render_frame->IsMainFrame())
-+    return;
-+
-+  new ElectronRenderFrameObserver(render_frame, this);
-+}
-+
-+void ElectronRendererClient::RenderViewCreated(content::RenderView* render_view) {
-+  // Set default UA-dependent background as transparent.
-+  render_view->GetWebView()->setBaseBackgroundColor(SK_ColorTRANSPARENT);
-+
-+  new printing::PrintWebViewHelper(render_view);
-+  new ElectronRenderViewObserver(render_view, this);
-+}
-+
-+blink::WebSpeechSynthesizer* ElectronRendererClient::OverrideSpeechSynthesizer(
-+    blink::WebSpeechSynthesizerClient* client) {
-+  return new TtsDispatcher(client);
-+}
-+
-+bool ElectronRendererClient::OverrideCreatePlugin(
-+    content::RenderFrame* render_frame,
-+    blink::WebLocalFrame* frame,
-+    const blink::WebPluginParams& params,
-+    blink::WebPlugin** plugin) {
-+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-+  if (params.mimeType.utf8() == content::kBrowserPluginMimeType ||
-+      command_line->HasSwitch(switches::kEnablePlugins))
-+    return false;
-+
-+  *plugin = nullptr;
-+  return true;
-+}
-+
-+void ElectronRendererClient::DidCreateScriptContext(
-+    v8::Handle<v8::Context> context) {
-+  // Whether the node binding has been initialized.
-+  bool first_time = node_bindings_->uv_env() == nullptr;
-+
-+  // Prepare the node bindings.
-+  if (first_time) {
-+    node_bindings_->Initialize();
-+    node_bindings_->PrepareMessageLoop();
-+  }
-+
-+  // Setup node environment for each window.
-+  node::Environment* env = node_bindings_->CreateEnvironment(context);
-+
-+  // Add Electron extended APIs.
-+  electron_bindings_->BindTo(env->isolate(), env->process_object());
-+
-+  // Load everything.
-+  node_bindings_->LoadEnvironment(env);
-+
-+  if (first_time) {
-+    // Make uv loop being wrapped by window context.
-+    node_bindings_->set_uv_env(env);
-+
-+    // Give the node loop a run to make sure everything is ready.
-+    node_bindings_->RunMessageLoop();
-+  }
-+}
-+
-+void ElectronRendererClient::WillReleaseScriptContext(
-+    v8::Handle<v8::Context> context) {
-+  node::Environment* env = node::Environment::GetCurrent(context);
-+  mate::EmitEvent(env->isolate(), env->process_object(), "exit");
-+}
-+
-+bool ElectronRendererClient::ShouldFork(blink::WebLocalFrame* frame,
-+                                    const GURL& url,
-+                                    const std::string& http_method,
-+                                    bool is_initial_navigation,
-+                                    bool is_server_redirect,
-+                                    bool* send_referrer) {
-+  // Handle all the navigations and reloads in browser.
-+  // FIXME We only support GET here because http method will be ignored when
-+  // the OpenURLFromTab is triggered, which means form posting would not work,
-+  // we should solve this by patching Chromium in future.
-+  *send_referrer = true;
-+  return http_method == "GET";
-+}
-+
-+content::BrowserPluginDelegate* ElectronRendererClient::CreateBrowserPluginDelegate(
-+    content::RenderFrame* render_frame,
-+    const std::string& mime_type,
-+    const GURL& original_url) {
-+  if (mime_type == content::kBrowserPluginMimeType) {
-+    return new GuestViewContainer(render_frame);
-+  } else {
-+    return nullptr;
-+  }
-+}
-+
-+void ElectronRendererClient::AddKeySystems(
-+    std::vector<media::KeySystemInfo>* key_systems) {
-+  AddChromeKeySystems(key_systems);
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 9a5440c6b71174f94d37bfa148151b8b862199aa electron/renderer/electron_renderer_client.h
-@@ -0,0 +1,69 @@
-+// Copyright (c) 2013 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_RENDERER_ELECTRON_RENDERER_CLIENT_H_
-+#define ELECTRON_RENDERER_ELECTRON_RENDERER_CLIENT_H_
-+
-+#include <string>
-+#include <vector>
-+
-+#include "content/public/renderer/content_renderer_client.h"
-+#include "content/public/renderer/render_process_observer.h"
-+
-+namespace electron {
-+
-+class ElectronBindings;
-+class NodeBindings;
-+
-+class ElectronRendererClient : public content::ContentRendererClient,
-+                           public content::RenderProcessObserver {
-+ public:
-+  ElectronRendererClient();
-+  virtual ~ElectronRendererClient();
-+
-+  void DidCreateScriptContext(v8::Handle<v8::Context> context);
-+  void WillReleaseScriptContext(v8::Handle<v8::Context> context);
-+
-+ private:
-+  enum NodeIntegration {
-+    ALL,
-+    EXCEPT_IFRAME,
-+    MANUAL_ENABLE_IFRAME,
-+    DISABLE,
-+  };
-+
-+  // content::RenderProcessObserver:
-+  void WebKitInitialized() override;
-+
-+  // content::ContentRendererClient:
-+  void RenderThreadStarted() override;
-+  void RenderFrameCreated(content::RenderFrame*) override;
-+  void RenderViewCreated(content::RenderView*) override;
-+  blink::WebSpeechSynthesizer* OverrideSpeechSynthesizer(
-+      blink::WebSpeechSynthesizerClient* client) override;
-+  bool OverrideCreatePlugin(content::RenderFrame* render_frame,
-+                            blink::WebLocalFrame* frame,
-+                            const blink::WebPluginParams& params,
-+                            blink::WebPlugin** plugin) override;
-+  bool ShouldFork(blink::WebLocalFrame* frame,
-+                  const GURL& url,
-+                  const std::string& http_method,
-+                  bool is_initial_navigation,
-+                  bool is_server_redirect,
-+                  bool* send_referrer) override;
-+  content::BrowserPluginDelegate* CreateBrowserPluginDelegate(
-+      content::RenderFrame* render_frame,
-+      const std::string& mime_type,
-+      const GURL& original_url) override;
-+  void AddKeySystems(std::vector<media::KeySystemInfo>* key_systems) override;
-+
-+  scoped_ptr<NodeBindings> node_bindings_;
-+  scoped_ptr<ElectronBindings> electron_bindings_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(ElectronRendererClient);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_RENDERER_ELECTRON_RENDERER_CLIENT_H_
-added in remote
-  their  100644 40541fccd4e27021915b2290b2aff68ee1b962aa electron/renderer/guest_view_container.cc
-@@ -0,0 +1,65 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/renderer/guest_view_container.h"
-+
-+#include <map>
-+
-+#include "base/bind.h"
-+#include "base/lazy_instance.h"
-+#include "base/message_loop/message_loop.h"
-+#include "ui/gfx/geometry/size.h"
-+
-+namespace electron {
-+
-+namespace {
-+
-+using GuestViewContainerMap = std::map<int, GuestViewContainer*>;
-+static base::LazyInstance<GuestViewContainerMap> g_guest_view_container_map =
-+    LAZY_INSTANCE_INITIALIZER;
-+
-+}  // namespace
-+
-+GuestViewContainer::GuestViewContainer(content::RenderFrame* render_frame)
-+    : render_frame_(render_frame),
-+      weak_ptr_factory_(this) {
-+}
-+
-+GuestViewContainer::~GuestViewContainer() {
-+  if (element_instance_id_ > 0)
-+    g_guest_view_container_map.Get().erase(element_instance_id_);
-+}
-+
-+// static
-+GuestViewContainer* GuestViewContainer::FromID(int element_instance_id) {
-+  GuestViewContainerMap* guest_view_containers =
-+      g_guest_view_container_map.Pointer();
-+  auto it = guest_view_containers->find(element_instance_id);
-+  return it == guest_view_containers->end() ? nullptr : it->second;
-+}
-+
-+void GuestViewContainer::RegisterElementResizeCallback(
-+    const ResizeCallback& callback) {
-+  element_resize_callback_ = callback;
-+}
-+
-+void GuestViewContainer::SetElementInstanceID(int element_instance_id) {
-+  element_instance_id_ = element_instance_id;
-+  g_guest_view_container_map.Get().insert(
-+      std::make_pair(element_instance_id, this));
-+}
-+
-+void GuestViewContainer::DidResizeElement(const gfx::Size& new_size) {
-+  if (element_resize_callback_.is_null())
-+    return;
-+
-+  base::MessageLoop::current()->PostTask(
-+      FROM_HERE, base::Bind(element_resize_callback_, new_size));
-+}
-+
-+base::WeakPtr<content::BrowserPluginDelegate> GuestViewContainer::GetWeakPtr() {
-+  return weak_ptr_factory_.GetWeakPtr();
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 3fd4dc87aff131b320551b3cb4c31d59f9fc3e57 electron/renderer/guest_view_container.h
-@@ -0,0 +1,46 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_RENDERER_GUEST_VIEW_CONTAINER_H_
-+#define ELECTRON_RENDERER_GUEST_VIEW_CONTAINER_H_
-+
-+#include "base/callback.h"
-+#include "content/public/renderer/browser_plugin_delegate.h"
-+
-+namespace gfx {
-+class Size;
-+}
-+
-+namespace electron {
-+
-+class GuestViewContainer : public content::BrowserPluginDelegate {
-+ public:
-+  typedef base::Callback<void(const gfx::Size&)> ResizeCallback;
-+
-+  explicit GuestViewContainer(content::RenderFrame* render_frame);
-+  ~GuestViewContainer() override;
-+
-+  static GuestViewContainer* FromID(int element_instance_id);
-+
-+  void RegisterElementResizeCallback(const ResizeCallback& callback);
-+
-+  // content::BrowserPluginDelegate:
-+  void SetElementInstanceID(int element_instance_id) final;
-+  void DidResizeElement(const gfx::Size& new_size) final;
-+  base::WeakPtr<BrowserPluginDelegate> GetWeakPtr() final;
-+
-+ private:
-+  int element_instance_id_;
-+  content::RenderFrame* render_frame_;
-+
-+  ResizeCallback element_resize_callback_;
-+
-+  base::WeakPtrFactory<GuestViewContainer> weak_ptr_factory_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(GuestViewContainer);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_RENDERER_GUEST_VIEW_CONTAINER_H_
-added in remote
-  their  100644 3c5f7df558e9ec455f35596d7fdd626298ce38ed electron/renderer/node_array_buffer_bridge.cc
-@@ -0,0 +1,66 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/renderer/node_array_buffer_bridge.h"
-+
-+#include "base/macros.h"
-+#include "electron/common/node_includes.h"
-+#include "native_mate/converter.h"
-+#include "third_party/WebKit/public/web/WebArrayBuffer.h"
-+#include "third_party/WebKit/public/web/WebArrayBufferConverter.h"
-+
-+namespace electron {
-+
-+namespace {
-+
-+// global.Uint8Array;
-+v8::Local<v8::Function> GetUint8ArrayConstructor(
-+    v8::Isolate* isolate, v8::Local<v8::Context> context) {
-+  v8::Local<v8::Value> constructor = context->Global()->Get(
-+      mate::StringToV8(isolate, "Uint8Array"));
-+  return v8::Local<v8::Function>::Cast(constructor);
-+}
-+
-+// new ArrayBuffer(size);
-+v8::Local<v8::ArrayBuffer> BlinkArrayBufferNew(
-+    v8::Isolate* isolate, size_t size) {
-+  blink::WebArrayBuffer buffer = blink::WebArrayBuffer::create(size, 1);
-+  return v8::Local<v8::ArrayBuffer>::Cast(
-+      blink::WebArrayBufferConverter::toV8Value(
-+          &buffer, isolate->GetCurrentContext()->Global(), isolate));
-+}
-+
-+// new ArrayBuffer(data, size);
-+v8::Local<v8::ArrayBuffer> BlinkArrayBufferNewWith(
-+    v8::Isolate* isolate, void* data, size_t size) {
-+  blink::WebArrayBuffer buffer = blink::WebArrayBuffer::createExternal(
-+      data, size);
-+  return v8::Local<v8::ArrayBuffer>::Cast(
-+      blink::WebArrayBufferConverter::toV8Value(
-+          &buffer, isolate->GetCurrentContext()->Global(), isolate));
-+}
-+
-+// new Uint8Array(array_buffer, offset, size);
-+v8::Local<v8::Uint8Array> BlinkUint8ArrayNew(
-+    v8::Local<v8::ArrayBuffer> ab, size_t offset, size_t size) {
-+  // Use the DOM's Uint8Array constructor to create Uint8Array.
-+  v8::Local<v8::Context> context = ab->CreationContext();
-+  v8::Isolate* isolate = context->GetIsolate();
-+  v8::Local<v8::Function> constructor =
-+      GetUint8ArrayConstructor(isolate, context);
-+  v8::Local<v8::Value> args[] = {
-+      ab, mate::ConvertToV8(isolate, offset), mate::ConvertToV8(isolate, size)
-+  };
-+  return v8::Local<v8::Uint8Array>::Cast(constructor->NewInstance(
-+      context, arraysize(args), args).ToLocalChecked());
-+}
-+
-+}  // namespace
-+
-+void OverrideNodeArrayBuffer() {
-+  node::Buffer::SetArrayBufferCreator(
-+      BlinkArrayBufferNew, BlinkArrayBufferNewWith, BlinkUint8ArrayNew);
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 182f19e8ec16c8312fa70ea67c2376a74043bd5b electron/renderer/node_array_buffer_bridge.h
-@@ -0,0 +1,15 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_RENDERER_NODE_ARRAY_BUFFER_BRIDGE_H_
-+#define ELECTRON_RENDERER_NODE_ARRAY_BUFFER_BRIDGE_H_
-+
-+namespace electron {
-+
-+// Override Node's ArrayBuffer with DOM's ArrayBuffer.
-+void OverrideNodeArrayBuffer();
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_RENDERER_NODE_ARRAY_BUFFER_BRIDGE_H_
-added in remote
-  their  100644 2d39d2a9845a90a066120fa302b031641faa11b9 electron/renderer/resources/mac/Info.plist
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-+<plist version="1.0">
-+<dict>
-+  <key>CFBundleIdentifier</key>
-+  <string>${ELECTRON_BUNDLE_ID}</string>
-+  <key>CFBundleName</key>
-+  <string>${PRODUCT_NAME}</string>
-+  <key>CFBundlePackageType</key>
-+  <string>APPL</string>
-+  <key>LSUIElement</key>
-+  <true/>
-+  <key>NSSupportsAutomaticGraphicsSwitching</key>
-+  <true/>
-+</dict>
-+</plist>
-added in remote
-  their  100644 879c3ffccdd878603c11d69bb754690d936b531a electron/utility/electron_content_utility_client.cc
-@@ -0,0 +1,81 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "electron/utility/electron_content_utility_client.h"
-+
-+#include "base/command_line.h"
-+#include "base/files/file_path.h"
-+#include "base/memory/ref_counted.h"
-+#include "base/time/time.h"
-+#include "chrome/common/chrome_utility_messages.h"
-+#include "chrome/utility/utility_message_handler.h"
-+#include "content/public/common/content_switches.h"
-+#include "content/public/utility/utility_thread.h"
-+#include "ipc/ipc_channel.h"
-+#include "ipc/ipc_message_macros.h"
-+
-+
-+#if defined(OS_WIN)
-+#include "chrome/utility/printing_handler_win.h"
-+#endif
-+
-+
-+namespace {
-+
-+bool Send(IPC::Message* message) {
-+  return content::UtilityThread::Get()->Send(message);
-+}
-+
-+}  // namespace
-+
-+namespace electron {
-+
-+int64_t ElectronContentUtilityClient::max_ipc_message_size_ =
-+    IPC::Channel::kMaximumMessageSize;
-+
-+ElectronContentUtilityClient::ElectronContentUtilityClient()
-+    : filter_messages_(false) {
-+#if defined(OS_WIN)
-+  handlers_.push_back(new PrintingHandlerWin());
-+#endif
-+}
-+
-+ElectronContentUtilityClient::~ElectronContentUtilityClient() {
-+}
-+
-+void ElectronContentUtilityClient::UtilityThreadStarted() {
-+}
-+
-+bool ElectronContentUtilityClient::OnMessageReceived(
-+    const IPC::Message& message) {
-+  if (filter_messages_ && !ContainsKey(message_id_whitelist_, message.type()))
-+    return false;
-+
-+  bool handled = true;
-+  IPC_BEGIN_MESSAGE_MAP(ElectronContentUtilityClient, message)
-+    IPC_MESSAGE_HANDLER(ChromeUtilityMsg_StartupPing, OnStartupPing)
-+    IPC_MESSAGE_UNHANDLED(handled = false)
-+  IPC_END_MESSAGE_MAP()
-+
-+  for (Handlers::iterator it = handlers_.begin();
-+       !handled && it != handlers_.end(); ++it) {
-+    handled = (*it)->OnMessageReceived(message);
-+  }
-+
-+  return handled;
-+}
-+
-+void ElectronContentUtilityClient::OnStartupPing() {
-+  Send(new ChromeUtilityHostMsg_ProcessStarted);
-+  // Don't release the process, we assume further messages are on the way.
-+}
-+
-+// static
-+void ElectronContentUtilityClient::PreSandboxStartup() {
-+#if defined(OS_WIN)
-+  PrintingHandlerWin::PreSandboxStartup();
-+#endif
-+}
-+
-+}  // namespace electron
-added in remote
-  their  100644 29700bb05c8e8ae9fa408096cd0da806b9cc232a electron/utility/electron_content_utility_client.h
-@@ -0,0 +1,58 @@
-+// Copyright (c) 2015 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ELECTRON_UTILITY_ELECTRON_CONTENT_UTILITY_CLIENT_H_
-+#define ELECTRON_UTILITY_ELECTRON_CONTENT_UTILITY_CLIENT_H_
-+
-+#include <set>
-+#include <string>
-+#include <vector>
-+
-+#include "base/compiler_specific.h"
-+#include "base/memory/scoped_vector.h"
-+#include "content/public/utility/content_utility_client.h"
-+#include "ipc/ipc_platform_file.h"
-+
-+namespace base {
-+class FilePath;
-+struct FileDescriptor;
-+}
-+
-+class UtilityMessageHandler;
-+
-+namespace electron {
-+
-+class ElectronContentUtilityClient : public content::ContentUtilityClient {
-+ public:
-+  ElectronContentUtilityClient();
-+  ~ElectronContentUtilityClient() override;
-+
-+  void UtilityThreadStarted() override;
-+  bool OnMessageReceived(const IPC::Message& message) override;
-+
-+  static void PreSandboxStartup();
-+
-+  static void set_max_ipc_message_size_for_test(int64_t max_message_size) {
-+    max_ipc_message_size_ = max_message_size;
-+  }
-+
-+ private:
-+  void OnStartupPing();
-+
-+  typedef ScopedVector<UtilityMessageHandler> Handlers;
-+  Handlers handlers_;
-+
-+  // Flag to enable whitelisting.
-+  bool filter_messages_;
-+  // A list of message_ids to filter.
-+  std::set<int> message_id_whitelist_;
-+  // Maximum IPC msg size (default to kMaximumMessageSize; override for testing)
-+  static int64_t max_ipc_message_size_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(ElectronContentUtilityClient);
-+};
-+
-+}  // namespace electron
-+
-+#endif  // ELECTRON_UTILITY_ELECTRON_CONTENT_UTILITY_CLIENT_H_
-changed in both
-  base   100644 baf0202f3eca9811577c06ca30e215eae1da888a filenames.gypi
-  our    100644 f57860558f06b7e5d8a50f48cfc7e53044df0bc6 filenames.gypi
-  their  100644 75c0fbc18740d07f20b3cdbe5075e233f2ac3856 filenames.gypi
-@@ -1,11 +1,15 @@
- {
-   'variables': {
-     'app_sources': [
--      'atom/app/atom_main.cc',
--      'atom/app/atom_main.h',
-+      'electron/app/electron_main.cc',
-+      'electron/app/electron_main.h',
-     ],
-     'bundle_sources': [
-+<<<<<<< .our
-       'atom/browser/resources/mac/electron.icns',
-+=======
-+      'electron/browser/resources/mac/electron.icns',
-+>>>>>>> .their
-     ],
-     'js_sources': [
-       'lib/browser/api/app.js',
-@@ -107,6 +111,7 @@
-       'node_modules/octicons/build/svg/gift.svg',
-     ],
-     'lib_sources': [
-+<<<<<<< .our
-       'atom/app/atom_content_client.cc',
-       'atom/app/atom_content_client.h',
-       'atom/app/atom_main_delegate.cc',
-@@ -563,6 +568,318 @@
-       'atom/renderer/web_worker_observer.h',
-       'atom/utility/atom_content_utility_client.cc',
-       'atom/utility/atom_content_utility_client.h',
-+=======
-+      'electron/app/electron_content_client.cc',
-+      'electron/app/electron_content_client.h',
-+      'electron/app/electron_main_delegate.cc',
-+      'electron/app/electron_main_delegate.h',
-+      'electron/app/electron_main_delegate_mac.mm',
-+      'electron/app/node_main.cc',
-+      'electron/app/node_main.h',
-+      'electron/app/uv_task_runner.cc',
-+      'electron/app/uv_task_runner.h',
-+      'electron/browser/api/electron_api_app.cc',
-+      'electron/browser/api/electron_api_app.h',
-+      'electron/browser/api/electron_api_auto_updater.cc',
-+      'electron/browser/api/electron_api_auto_updater.h',
-+      'electron/browser/api/electron_api_content_tracing.cc',
-+      'electron/browser/api/electron_api_cookies.cc',
-+      'electron/browser/api/electron_api_cookies.h',
-+      'electron/browser/api/electron_api_debugger.cc',
-+      'electron/browser/api/electron_api_debugger.h',
-+      'electron/browser/api/electron_api_desktop_capturer.cc',
-+      'electron/browser/api/electron_api_desktop_capturer.h',
-+      'electron/browser/api/electron_api_download_item.cc',
-+      'electron/browser/api/electron_api_download_item.h',
-+      'electron/browser/api/electron_api_dialog.cc',
-+      'electron/browser/api/electron_api_global_shortcut.cc',
-+      'electron/browser/api/electron_api_global_shortcut.h',
-+      'electron/browser/api/electron_api_menu.cc',
-+      'electron/browser/api/electron_api_menu.h',
-+      'electron/browser/api/electron_api_menu_views.cc',
-+      'electron/browser/api/electron_api_menu_views.h',
-+      'electron/browser/api/electron_api_menu_mac.h',
-+      'electron/browser/api/electron_api_menu_mac.mm',
-+      'electron/browser/api/electron_api_power_monitor.cc',
-+      'electron/browser/api/electron_api_power_monitor.h',
-+      'electron/browser/api/electron_api_power_save_blocker.cc',
-+      'electron/browser/api/electron_api_power_save_blocker.h',
-+      'electron/browser/api/electron_api_protocol.cc',
-+      'electron/browser/api/electron_api_protocol.h',
-+      'electron/browser/api/electron_api_screen.cc',
-+      'electron/browser/api/electron_api_screen.h',
-+      'electron/browser/api/electron_api_session.cc',
-+      'electron/browser/api/electron_api_session.h',
-+      'electron/browser/api/electron_api_tray.cc',
-+      'electron/browser/api/electron_api_tray.h',
-+      'electron/browser/api/electron_api_web_contents.cc',
-+      'electron/browser/api/electron_api_web_contents.h',
-+      'electron/browser/api/electron_api_web_request.cc',
-+      'electron/browser/api/electron_api_web_request.h',
-+      'electron/browser/api/electron_api_web_view_manager.cc',
-+      'electron/browser/api/electron_api_window.cc',
-+      'electron/browser/api/electron_api_window.h',
-+      'electron/browser/api/event.cc',
-+      'electron/browser/api/event.h',
-+      'electron/browser/api/event_emitter.cc',
-+      'electron/browser/api/event_emitter.h',
-+      'electron/browser/api/trackable_object.cc',
-+      'electron/browser/api/trackable_object.h',
-+      'electron/browser/api/frame_subscriber.cc',
-+      'electron/browser/api/frame_subscriber.h',
-+      'electron/browser/api/save_page_handler.cc',
-+      'electron/browser/api/save_page_handler.h',
-+      'electron/browser/auto_updater.cc',
-+      'electron/browser/auto_updater.h',
-+      'electron/browser/auto_updater_mac.mm',
-+      'electron/browser/electron_access_token_store.cc',
-+      'electron/browser/electron_access_token_store.h',
-+      'electron/browser/electron_browser_client.cc',
-+      'electron/browser/electron_browser_client.h',
-+      'electron/browser/electron_browser_context.cc',
-+      'electron/browser/electron_browser_context.h',
-+      'electron/browser/electron_download_manager_delegate.cc',
-+      'electron/browser/electron_download_manager_delegate.h',
-+      'electron/browser/electron_browser_main_parts.cc',
-+      'electron/browser/electron_browser_main_parts.h',
-+      'electron/browser/electron_browser_main_parts_mac.mm',
-+      'electron/browser/electron_browser_main_parts_posix.cc',
-+      'electron/browser/electron_javascript_dialog_manager.cc',
-+      'electron/browser/electron_javascript_dialog_manager.h',
-+      'electron/browser/electron_permission_manager.cc',
-+      'electron/browser/electron_permission_manager.h',
-+      'electron/browser/electron_quota_permission_context.cc',
-+      'electron/browser/electron_quota_permission_context.h',
-+      'electron/browser/electron_resource_dispatcher_host_delegate.cc',
-+      'electron/browser/electron_resource_dispatcher_host_delegate.h',
-+      'electron/browser/electron_speech_recognition_manager_delegate.cc',
-+      'electron/browser/electron_speech_recognition_manager_delegate.h',
-+      'electron/browser/bridge_task_runner.cc',
-+      'electron/browser/bridge_task_runner.h',
-+      'electron/browser/browser.cc',
-+      'electron/browser/browser.h',
-+      'electron/browser/browser_linux.cc',
-+      'electron/browser/browser_mac.mm',
-+      'electron/browser/browser_win.cc',
-+      'electron/browser/browser_observer.h',
-+      'electron/browser/common_web_contents_delegate.cc',
-+      'electron/browser/common_web_contents_delegate.h',
-+      'electron/browser/javascript_environment.cc',
-+      'electron/browser/javascript_environment.h',
-+      'electron/browser/login_handler.cc',
-+      'electron/browser/login_handler.h',
-+      'electron/browser/mac/electron_application.h',
-+      'electron/browser/mac/electron_application.mm',
-+      'electron/browser/mac/electron_application_delegate.h',
-+      'electron/browser/mac/electron_application_delegate.mm',
-+      'electron/browser/native_window.cc',
-+      'electron/browser/native_window.h',
-+      'electron/browser/native_window_views_win.cc',
-+      'electron/browser/native_window_views.cc',
-+      'electron/browser/native_window_views.h',
-+      'electron/browser/native_window_mac.h',
-+      'electron/browser/native_window_mac.mm',
-+      'electron/browser/native_window_observer.h',
-+      'electron/browser/net/asar/asar_protocol_handler.cc',
-+      'electron/browser/net/asar/asar_protocol_handler.h',
-+      'electron/browser/net/asar/url_request_asar_job.cc',
-+      'electron/browser/net/asar/url_request_asar_job.h',
-+      'electron/browser/net/electron_cert_verifier.cc',
-+      'electron/browser/net/electron_cert_verifier.h',
-+      'electron/browser/net/electron_network_delegate.cc',
-+      'electron/browser/net/electron_network_delegate.h',
-+      'electron/browser/net/electron_ssl_config_service.cc',
-+      'electron/browser/net/electron_ssl_config_service.h',
-+      'electron/browser/net/electron_url_request_job_factory.cc',
-+      'electron/browser/net/electron_url_request_job_factory.h',
-+      'electron/browser/net/http_protocol_handler.cc',
-+      'electron/browser/net/http_protocol_handler.h',
-+      'electron/browser/net/js_asker.cc',
-+      'electron/browser/net/js_asker.h',
-+      'electron/browser/net/url_request_async_asar_job.cc',
-+      'electron/browser/net/url_request_async_asar_job.h',
-+      'electron/browser/net/url_request_string_job.cc',
-+      'electron/browser/net/url_request_string_job.h',
-+      'electron/browser/net/url_request_buffer_job.cc',
-+      'electron/browser/net/url_request_buffer_job.h',
-+      'electron/browser/net/url_request_fetch_job.cc',
-+      'electron/browser/net/url_request_fetch_job.h',
-+      'electron/browser/node_debugger.cc',
-+      'electron/browser/node_debugger.h',
-+      'electron/browser/ui/accelerator_util.cc',
-+      'electron/browser/ui/accelerator_util.h',
-+      'electron/browser/ui/accelerator_util_mac.mm',
-+      'electron/browser/ui/accelerator_util_views.cc',
-+      'electron/browser/ui/electron_menu_model.cc',
-+      'electron/browser/ui/electron_menu_model.h',
-+      'electron/browser/ui/cocoa/electron_menu_controller.h',
-+      'electron/browser/ui/cocoa/electron_menu_controller.mm',
-+      'electron/browser/ui/file_dialog.h',
-+      'electron/browser/ui/file_dialog_gtk.cc',
-+      'electron/browser/ui/file_dialog_mac.mm',
-+      'electron/browser/ui/file_dialog_win.cc',
-+      'electron/browser/ui/message_box.h',
-+      'electron/browser/ui/message_box_gtk.cc',
-+      'electron/browser/ui/message_box_mac.mm',
-+      'electron/browser/ui/message_box_win.cc',
-+      'electron/browser/ui/tray_icon.cc',
-+      'electron/browser/ui/tray_icon.h',
-+      'electron/browser/ui/tray_icon_gtk.cc',
-+      'electron/browser/ui/tray_icon_gtk.h',
-+      'electron/browser/ui/tray_icon_cocoa.h',
-+      'electron/browser/ui/tray_icon_cocoa.mm',
-+      'electron/browser/ui/tray_icon_observer.h',
-+      'electron/browser/ui/tray_icon_win.cc',
-+      'electron/browser/ui/views/frameless_view.cc',
-+      'electron/browser/ui/views/frameless_view.h',
-+      'electron/browser/ui/views/global_menu_bar_x11.cc',
-+      'electron/browser/ui/views/global_menu_bar_x11.h',
-+      'electron/browser/ui/views/menu_bar.cc',
-+      'electron/browser/ui/views/menu_bar.h',
-+      'electron/browser/ui/views/menu_delegate.cc',
-+      'electron/browser/ui/views/menu_delegate.h',
-+      'electron/browser/ui/views/menu_layout.cc',
-+      'electron/browser/ui/views/menu_layout.h',
-+      'electron/browser/ui/views/native_frame_view.cc',
-+      'electron/browser/ui/views/native_frame_view.h',
-+      'electron/browser/ui/views/submenu_button.cc',
-+      'electron/browser/ui/views/submenu_button.h',
-+      'electron/browser/ui/views/win_frame_view.cc',
-+      'electron/browser/ui/views/win_frame_view.h',
-+      'electron/browser/ui/win/electron_desktop_window_tree_host_win.cc',
-+      'electron/browser/ui/win/electron_desktop_window_tree_host_win.h',
-+      'electron/browser/ui/win/message_handler_delegate.cc',
-+      'electron/browser/ui/win/message_handler_delegate.h',
-+      'electron/browser/ui/win/notify_icon_host.cc',
-+      'electron/browser/ui/win/notify_icon_host.h',
-+      'electron/browser/ui/win/notify_icon.cc',
-+      'electron/browser/ui/win/notify_icon.h',
-+      'electron/browser/ui/win/taskbar_host.cc',
-+      'electron/browser/ui/win/taskbar_host.h',
-+      'electron/browser/ui/x/window_state_watcher.cc',
-+      'electron/browser/ui/x/window_state_watcher.h',
-+      'electron/browser/ui/x/x_window_utils.cc',
-+      'electron/browser/ui/x/x_window_utils.h',
-+      'electron/browser/web_contents_permission_helper.cc',
-+      'electron/browser/web_contents_permission_helper.h',
-+      'electron/browser/web_contents_preferences.cc',
-+      'electron/browser/web_contents_preferences.h',
-+      'electron/browser/web_dialog_helper.cc',
-+      'electron/browser/web_dialog_helper.h',
-+      'electron/browser/web_view_guest_delegate.cc',
-+      'electron/browser/web_view_guest_delegate.h',
-+      'electron/browser/web_view_manager.cc',
-+      'electron/browser/web_view_manager.h',
-+      'electron/browser/window_list.cc',
-+      'electron/browser/window_list.h',
-+      'electron/browser/window_list_observer.h',
-+      'electron/common/api/api_messages.h',
-+      'electron/common/api/electron_api_asar.cc',
-+      'electron/common/api/electron_api_clipboard.cc',
-+      'electron/common/api/electron_api_crash_reporter.cc',
-+      'electron/common/api/electron_api_id_weak_map.cc',
-+      'electron/common/api/electron_api_id_weak_map.h',
-+      'electron/common/api/electron_api_native_image.cc',
-+      'electron/common/api/electron_api_native_image.h',
-+      'electron/common/api/electron_api_native_image_mac.mm',
-+      'electron/common/api/electron_api_shell.cc',
-+      'electron/common/api/electron_api_v8_util.cc',
-+      'electron/common/api/electron_bindings.cc',
-+      'electron/common/api/electron_bindings.h',
-+      'electron/common/api/event_emitter_caller.cc',
-+      'electron/common/api/event_emitter_caller.h',
-+      'electron/common/api/locker.cc',
-+      'electron/common/api/locker.h',
-+      'electron/common/api/object_life_monitor.cc',
-+      'electron/common/api/object_life_monitor.h',
-+      'electron/common/asar/archive.cc',
-+      'electron/common/asar/archive.h',
-+      'electron/common/asar/asar_util.cc',
-+      'electron/common/asar/asar_util.h',
-+      'electron/common/asar/scoped_temporary_file.cc',
-+      'electron/common/asar/scoped_temporary_file.h',
-+      'electron/common/electron_command_line.cc',
-+      'electron/common/electron_command_line.h',
-+      'electron/common/electron_constants.cc',
-+      'electron/common/electron_constants.h',
-+      'electron/common/common_message_generator.cc',
-+      'electron/common/common_message_generator.h',
-+      'electron/common/crash_reporter/crash_reporter.cc',
-+      'electron/common/crash_reporter/crash_reporter.h',
-+      'electron/common/crash_reporter/crash_reporter_linux.cc',
-+      'electron/common/crash_reporter/crash_reporter_linux.h',
-+      'electron/common/crash_reporter/crash_reporter_mac.h',
-+      'electron/common/crash_reporter/crash_reporter_mac.mm',
-+      'electron/common/crash_reporter/crash_reporter_win.cc',
-+      'electron/common/crash_reporter/crash_reporter_win.h',
-+      'electron/common/crash_reporter/linux/crash_dump_handler.cc',
-+      'electron/common/crash_reporter/linux/crash_dump_handler.h',
-+      'electron/common/crash_reporter/win/crash_service.cc',
-+      'electron/common/crash_reporter/win/crash_service.h',
-+      'electron/common/crash_reporter/win/crash_service_main.cc',
-+      'electron/common/crash_reporter/win/crash_service_main.h',
-+      'electron/common/draggable_region.cc',
-+      'electron/common/draggable_region.h',
-+      'electron/common/google_api_key.h',
-+      'electron/common/id_weak_map.cc',
-+      'electron/common/id_weak_map.h',
-+      'electron/common/keyboard_util.cc',
-+      'electron/common/keyboard_util.h',
-+      'electron/common/mouse_util.cc',
-+      'electron/common/mouse_util.h',
-+      'electron/common/linux/application_info.cc',
-+      'electron/common/native_mate_converters/accelerator_converter.cc',
-+      'electron/common/native_mate_converters/accelerator_converter.h',
-+      'electron/common/native_mate_converters/blink_converter.cc',
-+      'electron/common/native_mate_converters/blink_converter.h',
-+      'electron/common/native_mate_converters/callback.cc',
-+      'electron/common/native_mate_converters/callback.h',
-+      'electron/common/native_mate_converters/content_converter.cc',
-+      'electron/common/native_mate_converters/content_converter.h',
-+      'electron/common/native_mate_converters/file_path_converter.h',
-+      'electron/common/native_mate_converters/gfx_converter.cc',
-+      'electron/common/native_mate_converters/gfx_converter.h',
-+      'electron/common/native_mate_converters/gurl_converter.h',
-+      'electron/common/native_mate_converters/image_converter.cc',
-+      'electron/common/native_mate_converters/image_converter.h',
-+      'electron/common/native_mate_converters/net_converter.cc',
-+      'electron/common/native_mate_converters/net_converter.h',
-+      'electron/common/native_mate_converters/string16_converter.h',
-+      'electron/common/native_mate_converters/v8_value_converter.cc',
-+      'electron/common/native_mate_converters/v8_value_converter.h',
-+      'electron/common/native_mate_converters/value_converter.cc',
-+      'electron/common/native_mate_converters/value_converter.h',
-+      'electron/common/node_bindings.cc',
-+      'electron/common/node_bindings.h',
-+      'electron/common/node_bindings_linux.cc',
-+      'electron/common/node_bindings_linux.h',
-+      'electron/common/node_bindings_mac.cc',
-+      'electron/common/node_bindings_mac.h',
-+      'electron/common/node_bindings_win.cc',
-+      'electron/common/node_bindings_win.h',
-+      'electron/common/node_includes.h',
-+      'electron/common/options_switches.cc',
-+      'electron/common/options_switches.h',
-+      'electron/common/platform_util.h',
-+      'electron/common/platform_util_linux.cc',
-+      'electron/common/platform_util_mac.mm',
-+      'electron/common/platform_util_win.cc',
-+      'electron/renderer/api/electron_api_renderer_ipc.cc',
-+      'electron/renderer/api/electron_api_spell_check_client.cc',
-+      'electron/renderer/api/electron_api_spell_check_client.h',
-+      'electron/renderer/api/electron_api_web_frame.cc',
-+      'electron/renderer/api/electron_api_web_frame.h',
-+      'electron/renderer/electron_render_view_observer.cc',
-+      'electron/renderer/electron_render_view_observer.h',
-+      'electron/renderer/electron_renderer_client.cc',
-+      'electron/renderer/electron_renderer_client.h',
-+      'electron/renderer/guest_view_container.cc',
-+      'electron/renderer/guest_view_container.h',
-+      'electron/renderer/node_array_buffer_bridge.cc',
-+      'electron/renderer/node_array_buffer_bridge.h',
-+      'electron/utility/electron_content_utility_client.cc',
-+      'electron/utility/electron_content_utility_client.h',
-+>>>>>>> .their
-       'chromium_src/chrome/browser/browser_process.cc',
-       'chromium_src/chrome/browser/browser_process.h',
-       'chromium_src/chrome/browser/chrome_process_finder_win.cc',
-@@ -662,7 +979,7 @@
-       'chromium_src/library_loaders/libspeechd_loader.cc',
-       'chromium_src/library_loaders/libspeechd.h',
-       '<@(native_mate_files)',
--      '<(SHARED_INTERMEDIATE_DIR)/atom_natives.h',
-+      '<(SHARED_INTERMEDIATE_DIR)/electron_natives.h',
-     ],
-     'lib_sources_linux': [
-       'chromium_src/chrome/browser/icon_loader_auralinux.cc',
-@@ -681,8 +998,8 @@
-       'chromium_src/chrome/utility/printing_handler_win.h',
-     ],
-     'framework_sources': [
--      'atom/app/atom_library_main.h',
--      'atom/app/atom_library_main.mm',
-+      'electron/app/electron_library_main.h',
-+      'electron/app/electron_library_main.mm',
-     ],
-     'login_helper_sources': [
-       'atom/app/atom_login_helper.mm',
-@@ -698,9 +1015,9 @@
-     'conditions': [
-       ['OS=="win"', {
-         'app_sources': [
--          'atom/browser/resources/win/resource.h',
--          'atom/browser/resources/win/atom.ico',
--          'atom/browser/resources/win/atom.rc',
-+          'electron/browser/resources/win/resource.h',
-+          'electron/browser/resources/win/electron.ico',
-+          'electron/browser/resources/win/electron.rc',
-           # Cursors.
-           '<(libchromiumcontent_src_dir)/ui/resources/cursors/aliasb.cur',
-           '<(libchromiumcontent_src_dir)/ui/resources/cursors/cell.cur',
-changed in both
-  base   100644 d5cfd2da8399c2a2b0c2492df5713378747ad82b lib/common/api/callbacks-registry.js
-  our    100644 6a1c63b20413753eeb9c5f8d190a9f5d2f303d22 lib/common/api/callbacks-registry.js
-  their  100644 91356627865ec6455033a56464da3b9919cb91dc lib/common/api/callbacks-registry.js
-@@ -24,6 +24,7 @@
-     let match
- 
-     while ((match = regexp.exec(stackString)) !== null) {
-+<<<<<<< .our
-       const location = match[1]
-       if (location.includes('(native)')) continue
-       if (location.includes('(<anonymous>)')) continue
-@@ -32,6 +33,18 @@
-       const ref = /([^/^)]*)\)?$/gi.exec(location)
-       filenameAndLine = ref[1]
-       break
-+=======
-+      location = match[1];
-+      if (location.indexOf('(native)') !== -1) {
-+        continue;
-+      }
-+      if (location.indexOf('electron.asar') !== -1) {
-+        continue;
-+      }
-+      ref = /([^\/^\)]*)\)?$/gi.exec(location);
-+      filenameAndLine = ref[1];
-+      break;
-+>>>>>>> .their
-     }
-     this.callbacks[id] = callback
-     v8Util.setHiddenValue(callback, 'callbackId', id)
-changed in both
-  base   100644 e3996a193aced293e4ed4808f804f39a4150823f lib/common/asar.js
-  our    100644 41c3d0c85c69954dddad53c674f84051f25372e4 lib/common/asar.js
-  their  100644 6bfe38783a9ea737481b6635e64c8ab56009d600 lib/common/asar.js
-@@ -1,9 +1,16 @@
- (function () {
-+<<<<<<< .our
-   const asar = process.binding('atom_common_asar')
-   const {Buffer} = require('buffer')
-   const childProcess = require('child_process')
-   const path = require('path')
-   const util = require('util')
-+=======
-+  const asar = process.binding('electron_common_asar');
-+  const child_process = require('child_process');
-+  const path = require('path');
-+  const util = require('util');
-+>>>>>>> .their
- 
-   const hasProp = {}.hasOwnProperty
- 
-changed in both
-  base   100644 85bb828583bc25841141d79f3a4bb40af1560f36 lib/common/asar_init.js
-  our    100644 33abc155a54e6f78d6d9cd29ccaa182f8bf69647 lib/common/asar_init.js
-  their  100644 b758084f9b21112d48f07938946d4d5cc75ce96b lib/common/asar_init.js
-@@ -1,6 +1,13 @@
-+<<<<<<< .our
- ;(function () {
-   return function (process, require, asarSource) {
-     const source = process.binding('natives')
-+=======
-+(function () {
-+  return function(process, require, asarSource) {
-+    // Make asar.js accessible via "require".
-+    process.binding('natives').ATOM_SHELL_ASAR = asarSource;
-+>>>>>>> .their
- 
-     // Expose fs module without asar support.
-     source['original-fs'] = source.fs
-changed in both
-  base   100644 923ef910886de402706f29eccf497ecc5c0a8cea lib/common/init.js
-  our    100644 b424768414b857b485bd5e29bfce504de6f1d749 lib/common/init.js
-  their  100644 8a4bb1de6872f397007f3e55b8543ebe0edafa15 lib/common/init.js
-@@ -1,5 +1,26 @@
-+<<<<<<< .our
- const timers = require('timers')
- const util = require('util')
-+=======
-+const path = require('path');
-+const timers = require('timers');
-+const Module = require('module');
-+
-+process.atomBinding = function(name) {
-+  try {
-+    return process.binding("electron_" + process.type + "_" + name);
-+  } catch (error) {
-+    if (/No such module/.test(error.message)) {
-+      return process.binding("electron_common_" + name);
-+    }
-+  }
-+};
-+
-+if (!process.env.ELECTRON_HIDE_INTERNAL_MODULES) {
-+  // Add common/api/lib to module search paths.
-+  Module.globalPaths.push(path.join(__dirname, 'api'));
-+}
-+>>>>>>> .their
- 
- process.atomBinding = require('./atom-binding-setup')(process.binding, process.type)
- 
-changed in both
-  base   100755 1efea3c289731cba4c457ec367083c1e5bd55fc9 script/bootstrap.py
-  our    100755 e4aaf89e216b0164f15882a3040e8cac70bf1fd9 script/bootstrap.py
-  their  100755 4a1ba528921206a7673b897568e7111c43f9b385 script/bootstrap.py
-@@ -238,8 +238,14 @@
-     os.remove(tar_name)
- 
- def create_chrome_version_h():
-+<<<<<<< .our
-   version_file = os.path.join(VENDOR_DIR, 'libchromiumcontent', 'VERSION')
-   target_file = os.path.join(SOURCE_ROOT, 'atom', 'common', 'chrome_version.h')
-+=======
-+  version_file = os.path.join(SOURCE_ROOT, 'vendor', 'brightray', 'vendor',
-+                              'libchromiumcontent', 'VERSION')
-+  target_file = os.path.join(SOURCE_ROOT, 'electron', 'common', 'chrome_version.h')
-+>>>>>>> .their
-   template_file = os.path.join(SOURCE_ROOT, 'script', 'chrome_version.h.in')
- 
-   with open(version_file, 'r') as f:
-changed in both
-  base   100755 e2c22e8cd9d4714ecba9cf8899a01faea14487d0 script/bump-version.py
-  our    100755 564adb2116312b0f6d0351096bd89cb373cd3bab script/bump-version.py
-  their  100755 679eb28dddcbb235efd77cc9b9786438b7960b8e script/bump-version.py
-@@ -115,15 +115,24 @@
-   return versions
- 
- 
-+<<<<<<< .our
- def update_electron_gyp(version, suffix):
-   pattern = re.compile(" *'version%' *: *'[0-9.]+(-beta[0-9.]*)?(-dev)?"
-     + "(-nightly[0-9.]*)?'")
-+=======
-+def update_atom_gyp(version):
-+  pattern = re.compile(" *'version%' *: *'[0-9.]+'")
-+>>>>>>> .their
-   with open('electron.gyp', 'r') as f:
-     lines = f.readlines()
- 
-   for i in range(0, len(lines)):
-     if pattern.match(lines[i]):
-+<<<<<<< .our
-       lines[i] = "    'version%': '{0}',\n".format(version + suffix)
-+=======
-+      lines[i] = "    'version%': '{0}',\n".format(version)
-+>>>>>>> .their
-       with open('electron.gyp', 'w') as f:
-         f.write(''.join(lines))
-       return
-@@ -135,7 +144,7 @@
-   pattern_fvs = re.compile(' *VALUE "FileVersion", "[0-9.]+"')
-   pattern_pvs = re.compile(' *VALUE "ProductVersion", "[0-9.]+"')
- 
--  win_rc = os.path.join('atom', 'browser', 'resources', 'win', 'atom.rc')
-+  win_rc = os.path.join('atom', 'browser', 'resources', 'win', 'electron.rc')
-   with open(win_rc, 'r') as f:
-     lines = f.readlines()
- 
-@@ -162,10 +171,10 @@
- 
-   for i in range(0, len(lines)):
-     line = lines[i]
--    if 'ATOM_MAJOR_VERSION' in line:
--      lines[i] = '#define ATOM_MAJOR_VERSION {0}\n'.format(versions[0])
--      lines[i + 1] = '#define ATOM_MINOR_VERSION {0}\n'.format(versions[1])
--      lines[i + 2] = '#define ATOM_PATCH_VERSION {0}\n'.format(versions[2])
-+    if 'ELECTRON_MAJOR_VERSION' in line:
-+      lines[i] = '#define ELECTRON_MAJOR_VERSION {0}\n'.format(versions[0])
-+      lines[i + 1] = '#define ELECTRON_MINOR_VERSION {0}\n'.format(versions[1])
-+      lines[i + 2] = '#define ELECTRON_PATCH_VERSION {0}\n'.format(versions[2])
- 
-       if (suffix):
-         lines[i + 3] = '#define ATOM_PRE_RELEASE_VERSION {0}\n'.format(suffix)
-merged
-  result 100644 7cbfdfd87896fc3af08df33b9be616e51ab78e83 script/chrome_version.h.in
-  our    100644 be20655ec6d73b6aca9930911a464b96f098e5b9 script/chrome_version.h.in
-@@ -5,10 +5,10 @@
- // This file is generated by script/bootstrap.py, you should never modify it
- // by hand.
- 
--#ifndef ATOM_COMMON_CHROME_VERSION_H_
--#define ATOM_COMMON_CHROME_VERSION_H_
-+#ifndef ELECTRON_COMMON_CHROME_VERSION_H_
-+#define ELECTRON_COMMON_CHROME_VERSION_H_
- 
- #define CHROME_VERSION_STRING "{PLACEHOLDER}"
- #define CHROME_VERSION "v" CHROME_VERSION_STRING
- 
--#endif  // ATOM_COMMON_CHROME_VERSION_H_
-+#endif  // ELECTRON_COMMON_CHROME_VERSION_H_
-changed in both
-  base   100755 d647bed2de4150a251dce6fde1dfb5fc455bdbfc script/cpplint.py
-  our    100755 da4b6212f4b1a8ad187f8eae970e4887b71d73da script/cpplint.py
-  their  100755 ed9e31b978362d16e392869a2479eeb8a4239aa9 script/cpplint.py
-@@ -7,6 +7,7 @@
- from lib.config import enable_verbose_mode
- from lib.util import execute
- 
-+<<<<<<< .our
- IGNORE_FILES = set(os.path.join(*components) for components in [
-   ['atom', 'browser', 'mac', 'atom_application.h'],
-   ['atom', 'browser', 'mac', 'atom_application_delegate.h'],
-@@ -36,6 +37,25 @@
-   ['brightray', 'browser', 'win', 'win32_desktop_notifications', 'toast.h'],
-   ['brightray', 'browser', 'win', 'win32_notification.h']
- ])
-+=======
-+IGNORE_FILES = [
-+  os.path.join('electron', 'app', 'electron_main.cc'),
-+  os.path.join('electron', 'browser', 'mac', 'electron_application.h'),
-+  os.path.join('electron', 'browser', 'mac', 'electron_application_delegate.h'),
-+  os.path.join('electron', 'browser', 'native_window_mac.h'),
-+  os.path.join('electron', 'browser', 'resources', 'win', 'resource.h'),
-+  os.path.join('electron', 'browser', 'ui', 'cocoa', 'event_processing_window.h'),
-+  os.path.join('electron', 'browser', 'ui', 'cocoa', 'electron_menu_controller.h'),
-+  os.path.join('electron', 'browser', 'ui', 'gtk', 'gtk_custom_menu.cc'),
-+  os.path.join('electron', 'browser', 'ui', 'gtk', 'gtk_custom_menu_item.cc'),
-+  os.path.join('electron', 'common', 'api', 'api_messages.h'),
-+  os.path.join('electron', 'common', 'api', 'electron_extensions.h'),
-+  os.path.join('electron', 'common', 'electron_version.h'),
-+  os.path.join('electron', 'common', 'common_message_generator.cc'),
-+  os.path.join('electron', 'common', 'common_message_generator.h'),
-+  os.path.join('electron', 'common', 'swap_or_assign.h'),
-+]
-+>>>>>>> .their
- 
- SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
- 
-@@ -70,6 +90,7 @@
-     enable_verbose_mode()
- 
-   os.chdir(SOURCE_ROOT)
-+<<<<<<< .our
-   files = find_files(['atom', 'brightray'], is_cpp_file)
-   files -= IGNORE_FILES
-   if args.only_changed:
-@@ -85,6 +106,20 @@
-         filename = os.path.join(parent, child)
-         if test(filename):
-           matches.add(filename)
-+=======
-+  files = list_files(['app', 'browser', 'common', 'renderer', 'utility'],
-+                     ['*.cc', '*.h'])
-+  call_cpplint(list(set(files) - set(IGNORE_FILES)))
-+
-+
-+def list_files(directories, filters):
-+  matches = []
-+  for directory in directories:
-+    for root, _, filenames, in os.walk(os.path.join('electron', directory)):
-+      for f in filters:
-+        for filename in fnmatch.filter(filenames, f):
-+          matches.append(os.path.join(root, filename))
-+>>>>>>> .their
-   return matches
- 
- 
-changed in both
-  base   100755 e25845432c774c33bf718e56b9291293b7eec369 script/create-dist.py
-  our    100755 4a6c0c7ce8f275175e48c4c380ff33627f7a5961 script/create-dist.py
-  their  100755 b8f40a8bf076a392cd30f0b87a3948e24299d60d script/create-dist.py
-@@ -18,10 +18,14 @@
-                      execute, get_electron_version, make_zip, \
-                      parse_version, rm_rf, scoped_cwd
- 
-+<<<<<<< .our
- from lib.env_util import get_vs_location
- 
- 
- ELECTRON_VERSION = get_electron_version()
-+=======
-+ELECTRON_SHELL_VERSION = get_atom_shell_version()
-+>>>>>>> .their
- 
- SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
- DIST_DIR = os.path.join(SOURCE_ROOT, 'dist')
-@@ -114,8 +118,13 @@
- 
-   create_version()
-   create_dist_zip()
-+<<<<<<< .our
-   create_chrome_binary_zip('chromedriver', ELECTRON_VERSION)
-   create_chrome_binary_zip('mksnapshot', ELECTRON_VERSION)
-+=======
-+  create_chrome_binary_zip('chromedriver', get_chromedriver_version())
-+  create_chrome_binary_zip('mksnapshot', ELECTRON_SHELL_VERSION)
-+>>>>>>> .their
-   create_ffmpeg_zip()
-   create_symbols_zip()
- 
-@@ -240,7 +249,11 @@
- def create_version():
-   version_path = os.path.join(SOURCE_ROOT, 'dist', 'version')
-   with open(version_path, 'w') as version_file:
-+<<<<<<< .our
-     version_file.write(ELECTRON_VERSION)
-+=======
-+    version_file.write(ELECTRON_SHELL_VERSION)
-+>>>>>>> .their
- 
- 
- def create_symbols():
-@@ -262,7 +275,13 @@
- 
- 
- def create_dist_zip():
-+<<<<<<< .our
-   dist_name = get_zip_name(PROJECT_NAME, ELECTRON_VERSION)
-+=======
-+  dist_name = '{0}-{1}-{2}-{3}.zip'.format(PROJECT_NAME, ELECTRON_SHELL_VERSION,
-+                                           get_platform_key(),
-+                                           get_target_arch())
-+>>>>>>> .their
-   zip_file = os.path.join(SOURCE_ROOT, 'dist', dist_name)
- 
-   with scoped_cwd(DIST_DIR):
-@@ -310,7 +329,12 @@
-       make_zip(zip_file, files, [])
- 
- def create_ffmpeg_zip():
-+<<<<<<< .our
-   dist_name = get_zip_name('ffmpeg', ELECTRON_VERSION)
-+=======
-+  dist_name = 'ffmpeg-{0}-{1}-{2}.zip'.format(
-+      ELECTRON_SHELL_VERSION, get_platform_key(), get_target_arch())
-+>>>>>>> .their
-   zip_file = os.path.join(SOURCE_ROOT, 'dist', dist_name)
- 
-   if PLATFORM == 'darwin':
-@@ -331,10 +355,17 @@
- 
- 
- def create_symbols_zip():
-+<<<<<<< .our
-   if get_target_arch() == 'mips64el':
-     return
- 
-   dist_name = get_zip_name(PROJECT_NAME, ELECTRON_VERSION, 'symbols')
-+=======
-+  dist_name = '{0}-{1}-{2}-{3}-symbols.zip'.format(PROJECT_NAME,
-+                                                   ELECTRON_SHELL_VERSION,
-+                                                   get_platform_key(),
-+                                                   get_target_arch())
-+>>>>>>> .their
-   zip_file = os.path.join(DIST_DIR, dist_name)
-   licenses = ['LICENSE', 'LICENSES.chromium.html', 'version']
- 
-@@ -343,7 +374,14 @@
-     make_zip(zip_file, licenses, dirs)
- 
-   if PLATFORM == 'darwin':
-+<<<<<<< .our
-     dsym_name = get_zip_name(PROJECT_NAME, ELECTRON_VERSION, 'dsym')
-+=======
-+    dsym_name = '{0}-{1}-{2}-{3}-dsym.zip'.format(PROJECT_NAME,
-+                                                  ELECTRON_SHELL_VERSION,
-+                                                  get_platform_key(),
-+                                                  get_target_arch())
-+>>>>>>> .their
-     with scoped_cwd(DIST_DIR):
-       dsyms = glob.glob('*.dSYM')
-       make_zip(os.path.join(DIST_DIR, dsym_name), licenses, dsyms)
-changed in both
-  base   100644 fb1a4b89f27f3eb647638e9183d110287698964a script/lib/config.py
-  our    100644 9ad0fbc680e5ecdeb8c13d0f0d6678bbba7d9031 script/lib/config.py
-  their  100644 88b560c712316b0ffaac4cb2258f117d7f368146 script/lib/config.py
-@@ -56,12 +56,21 @@
- 
- 
- def s3_config():
-+<<<<<<< .our
-   config = (get_env_var('S3_BUCKET'),
-             get_env_var('S3_ACCESS_KEY'),
-             get_env_var('S3_SECRET_KEY'))
-   message = ('Error: Please set the $ELECTRON_S3_BUCKET, '
-              '$ELECTRON_S3_ACCESS_KEY, and '
-              '$ELECTRON_S3_SECRET_KEY environment variables')
-+=======
-+  config = (os.environ.get('ELECTRON_SHELL_S3_BUCKET', ''),
-+            os.environ.get('ELECTRON_SHELL_S3_ACCESS_KEY', ''),
-+            os.environ.get('ELECTRON_SHELL_S3_SECRET_KEY', ''))
-+  message = ('Error: Please set the $ELECTRON_SHELL_S3_BUCKET, '
-+             '$ELECTRON_SHELL_S3_ACCESS_KEY, and '
-+             '$ELECTRON_SHELL_S3_SECRET_KEY environment variables')
-+>>>>>>> .their
-   assert all(len(c) for c in config), message
-   return config
- 
-changed in both
-  base   100644 fc52d316d30cc108850f51ec62ea3297161cc86e script/lib/util.py
-  our    100644 d479d5a9556534c5d98ae1fdc97397cdd14376f5 script/lib/util.py
-  their  100644 4e5fb90988d7382ded1744e35e8df9d786ecc5f9 script/lib/util.py
-changed in both
-  base   100755 e91e8401cbffca0ed484297ebedacfd0383ea940 script/update.py
-  our    100755 5b4e201d76ab3689bc8847d6141b2fff1a852174 script/update.py
-  their  100755 33a4cff50f64c16ff696634713b9784d6bb80953 script/update.py
-@@ -84,6 +84,7 @@
-     '-Dlibrary=static_library',
-     '-Dmas_build={0}'.format(mas_build),
-   ]
-+<<<<<<< .our
- 
-   # Add the defines passed from command line.
-   args = parse_args()
-@@ -98,6 +99,9 @@
-     generator = 'xcode-ninja'
- 
-   return subprocess.call([python, gyp, '-f', generator, '--depth', '.',
-+=======
-+  return subprocess.call([python, gyp, '-f', 'ninja', '--depth', '.',
-+>>>>>>> .their
-                           'electron.gyp', '-Icommon.gypi'] + defines, env=env)
- 
- 
-changed in both
-  base   100755 d23bc554c3ccdd0aacbec84d763cebab55db7b9b script/upload.py
-  our    100755 2d9eaa201265971ca01acaea6e84a440e5db0532 script/upload.py
-  their  100755 01edd91ccae024fdad884decd7ce16235215cd8e script/upload.py
-@@ -17,8 +17,13 @@
-                      parse_version, scoped_cwd, s3put
- 
- 
-+<<<<<<< .our
- ELECTRON_REPO = 'electron/electron'
- ELECTRON_VERSION = get_electron_version()
-+=======
-+ELECTRON_SHELL_REPO = 'atom/electron'
-+ELECTRON_SHELL_VERSION = get_atom_shell_version()
-+>>>>>>> .their
- 
- PROJECT_NAME = electron_gyp()['project_name%']
- PRODUCT_NAME = electron_gyp()['product_name%']
-@@ -26,11 +31,26 @@
- SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
- OUT_DIR = os.path.join(SOURCE_ROOT, 'out', 'R')
- DIST_DIR = os.path.join(SOURCE_ROOT, 'dist')
-+<<<<<<< .our
- 
- DIST_NAME = get_zip_name(PROJECT_NAME, ELECTRON_VERSION)
- SYMBOLS_NAME = get_zip_name(PROJECT_NAME, ELECTRON_VERSION, 'symbols')
- DSYM_NAME = get_zip_name(PROJECT_NAME, ELECTRON_VERSION, 'dsym')
- PDB_NAME = get_zip_name(PROJECT_NAME, ELECTRON_VERSION, 'pdb')
-+=======
-+DIST_NAME = '{0}-{1}-{2}-{3}.zip'.format(PROJECT_NAME,
-+                                         ELECTRON_SHELL_VERSION,
-+                                         get_platform_key(),
-+                                         get_target_arch())
-+SYMBOLS_NAME = '{0}-{1}-{2}-{3}-symbols.zip'.format(PROJECT_NAME,
-+                                                    ELECTRON_SHELL_VERSION,
-+                                                    get_platform_key(),
-+                                                    get_target_arch())
-+DSYM_NAME = '{0}-{1}-{2}-{3}-dsym.zip'.format(PROJECT_NAME,
-+                                              ELECTRON_SHELL_VERSION,
-+                                              get_platform_key(),
-+                                              get_target_arch())
-+>>>>>>> .their
- 
- 
- def main():
-@@ -39,6 +59,7 @@
-     utcnow = datetime.datetime.utcnow()
-     args.upload_timestamp = utcnow.strftime('%Y%m%d')
- 
-+<<<<<<< .our
-   if not dist_newer_than_head():
-     run_python_script('create-dist.py')
- 
-@@ -49,6 +70,37 @@
-     sys.stderr.write(error)
-     sys.stderr.flush()
-     return 1
-+=======
-+  if not args.publish_release:
-+    if not dist_newer_than_head():
-+      create_dist = os.path.join(SOURCE_ROOT, 'script', 'create-dist.py')
-+      execute([sys.executable, create_dist])
-+
-+    build_version = get_atom_shell_build_version()
-+    if not ELECTRON_SHELL_VERSION.startswith(build_version):
-+      error = 'Tag name ({0}) should match build version ({1})\n'.format(
-+          ELECTRON_SHELL_VERSION, build_version)
-+      sys.stderr.write(error)
-+      sys.stderr.flush()
-+      return 1
-+
-+  github = GitHub(auth_token())
-+  releases = github.repos(ELECTRON_SHELL_REPO).releases.get()
-+  tag_exists = False
-+  for release in releases:
-+    if not release['draft'] and release['tag_name'] == args.version:
-+      tag_exists = True
-+      break
-+
-+  release = create_or_get_release_draft(github, releases, args.version,
-+                                        tag_exists)
-+
-+  if args.publish_release:
-+    # Upload the SHASUMS.txt.
-+    execute([sys.executable,
-+             os.path.join(SOURCE_ROOT, 'script', 'upload-checksums.py'),
-+             '-v', ELECTRON_SHELL_VERSION])
-+>>>>>>> .their
- 
-   tag_exists = False
-   release = get_release(args.version)
-@@ -85,6 +137,7 @@
-     mksnapshot = get_zip_name('mksnapshot', ELECTRON_VERSION, 'x64')
-     upload_electron(release, os.path.join(DIST_DIR, mksnapshot), args)
- 
-+<<<<<<< .our
-   if not tag_exists and not args.upload_to_s3:
-     # Upload symbols to symbol server.
-     run_python_script('upload-symbols.py')
-@@ -92,15 +145,40 @@
-       # Upload node headers.
-       run_python_script('create-node-headers.py', '-v', args.version)
-       run_python_script('upload-node-headers.py', '-v', args.version)
-+=======
-+  # Upload free version of ffmpeg.
-+  ffmpeg = 'ffmpeg-{0}-{1}-{2}.zip'.format(
-+      ELECTRON_SHELL_VERSION, get_platform_key(), get_target_arch())
-+  upload_atom_shell(github, release, os.path.join(DIST_DIR, ffmpeg))
-+
-+  # Upload chromedriver and mksnapshot for minor version update.
-+  if parse_version(args.version)[2] == '0':
-+    chromedriver = 'chromedriver-{0}-{1}-{2}.zip'.format(
-+        get_chromedriver_version(), get_platform_key(), get_target_arch())
-+    upload_atom_shell(github, release, os.path.join(DIST_DIR, chromedriver))
-+    mksnapshot = 'mksnapshot-{0}-{1}-{2}.zip'.format(
-+        ELECTRON_SHELL_VERSION, get_platform_key(), get_target_arch())
-+    upload_atom_shell(github, release, os.path.join(DIST_DIR, mksnapshot))
-+
-+  if PLATFORM == 'win32' and not tag_exists:
-+    # Upload node headers.
-+    execute([sys.executable,
-+             os.path.join(SOURCE_ROOT, 'script', 'upload-node-headers.py'),
-+             '-v', args.version])
-+>>>>>>> .their
- 
- 
- def parse_args():
-   parser = argparse.ArgumentParser(description='upload distribution file')
-   parser.add_argument('-v', '--version', help='Specify the version',
-+<<<<<<< .our
-                       default=ELECTRON_VERSION)
-   parser.add_argument('-o', '--overwrite',
-                       help='Overwrite a published release',
-                       action='store_true')
-+=======
-+                      default=ELECTRON_SHELL_VERSION)
-+>>>>>>> .their
-   parser.add_argument('-p', '--publish-release',
-                       help='Publish the release',
-                       action='store_true')
-@@ -121,7 +199,11 @@
- def get_electron_build_version():
-   if get_target_arch().startswith('arm') or os.environ.has_key('CI'):
-     # In CI we just build as told.
-+<<<<<<< .our
-     return ELECTRON_VERSION
-+=======
-+    return ELECTRON_SHELL_VERSION
-+>>>>>>> .their
-   if PLATFORM == 'darwin':
-     electron = os.path.join(SOURCE_ROOT, 'out', 'R',
-                               '{0}.app'.format(PRODUCT_NAME), 'Contents',
-@@ -170,6 +252,12 @@
-   # Upload the checksum file.
-   upload_sha256_checksum(args.version, file_path)
- 
-+<<<<<<< .our
-+=======
-+  data = dict(tag_name=tag, name=name, body=body, draft=True)
-+  r = github.repos(ELECTRON_SHELL_REPO).releases.post(data=data)
-+  return r
-+>>>>>>> .their
- 
- def upload_io_to_github(release, filename, filepath, version):
-   print 'Uploading %s to Github' % \
-@@ -178,6 +266,19 @@
-   execute(['node', script_path, filepath, filename, str(release['id']),
-           version])
- 
-+<<<<<<< .our
-+=======
-+def upload_atom_shell(github, release, file_path):
-+  # Delete the original file before uploading in CI.
-+  if os.environ.has_key('CI'):
-+    try:
-+      for asset in release['assets']:
-+        if asset['name'] == os.path.basename(file_path):
-+          github.repos(ELECTRON_SHELL_REPO).releases.assets(asset['id']).delete()
-+          break
-+    except Exception:
-+      pass
-+>>>>>>> .their
- 
- def upload_sha256_checksum(version, file_path, key_prefix=None):
-   bucket, access_key, secret_key = s3_config()
-@@ -186,6 +287,7 @@
-     key_prefix = 'atom-shell/tmp/{0}'.format(version)
-   sha256 = hashlib.sha256()
-   with open(file_path, 'rb') as f:
-+<<<<<<< .our
-     sha256.update(f.read())
- 
-   filename = os.path.basename(file_path)
-@@ -198,6 +300,20 @@
- def auth_token():
-   token = get_env_var('GITHUB_TOKEN')
-   message = ('Error: Please set the $ELECTRON_GITHUB_TOKEN '
-+=======
-+    github.repos(ELECTRON_SHELL_REPO).releases(release['id']).assets.post(
-+        params=params, headers=headers, data=f, verify=False)
-+
-+
-+def publish_release(github, release_id):
-+  data = dict(draft=False)
-+  github.repos(ELECTRON_SHELL_REPO).releases(release_id).patch(data=data)
-+
-+
-+def auth_token():
-+  token = os.environ.get('ELECTRON_SHELL_GITHUB_TOKEN')
-+  message = ('Error: Please set the $ELECTRON_SHELL_GITHUB_TOKEN '
-+>>>>>>> .their
-              'environment variable, which is your personal token')
-   assert token, message
-   return token
-changed in both
-  base   160000 d8e7d3e76cb3c6e709449d181ddc2af8c4859303 vendor/node
-  our    160000 ece0a06ac8147efb5b5af431c21f312f1884616e vendor/node
-  their  160000 fc81e4e8cc13f606cc18096a3f407e2a7aac82bb vendor/node
diff --git a/app/test/fixtures/merge-parser/electron/merge-revert-10204-fix-window-opener-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-revert-10204-fix-window-opener-into-master.txt
deleted file mode 100644
index 9c19c04f8a9..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-revert-10204-fix-window-opener-into-master.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-changed in both
-  base   100644 26193a0afd4cd1299e47b8c7c0ffd04bd66ee316 atom/browser/atom_browser_client.cc
-  our    100644 57c4ee582405e6d501ec23940ccb10689ecd64a1 atom/browser/atom_browser_client.cc
-  their  100644 f976f83c8762b279ad4fa697f6923c422e4902c2 atom/browser/atom_browser_client.cc
-@@ -127,13 +127,19 @@
- 
-   int process_id = current_instance->GetProcess()->GetID();
-   if (!IsRendererSandboxed(process_id)) {
--    if (!RendererUsesNativeWindowOpen(process_id)) {
-+    auto web_contents =
-+        content::WebContents::FromRenderFrameHost(render_frame_host);
-+    if (!WebContentsPreferences::UsesNativeWindowOpen(web_contents)) {
-       // non-sandboxed renderers without native window.open should always create
-       // a new SiteInstance
-       return true;
-     }
-+<<<<<<< .our
-     auto* web_contents =
-         content::WebContents::FromRenderFrameHost(render_frame_host);
-+=======
-+
-+>>>>>>> .their
-     if (!ChildWebContentsTracker::IsChildWebContents(web_contents)) {
-       // Root WebContents should always create new process to make sure
-       // native addons are loaded correctly after reload / navigation.
-@@ -141,6 +147,17 @@
-       //  reuse process to allow synchronous cross-window scripting.)
-       return true;
-     }
-+
-+    // In a non-sandboxed renderer with native window open we should
-+    // reuse the same site to allow cross-window scripting.  We do
-+    // not need to check urls / domains as native window open logic
-+    // handles cross site scripting protection.
-+    //
-+    // NOTE: We know that nativeWindowOpen is enabled at this point
-+    // because we check if it is NOT enabled above this point.  We
-+    // will only reach this return if sandbox is disabled but
-+    // nativeWindowOpen is enabled.
-+    return false;
-   }
- 
-   // Create new a SiteInstance if navigating to a different site.
diff --git a/app/test/fixtures/merge-parser/electron/merge-roll-libcc-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-roll-libcc-into-master.txt
deleted file mode 100644
index 16b31583f87..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-roll-libcc-into-master.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-changed in both
-  base   100644 98735b8ab0182db210153efe6e8a70a12b4dcfce DEPS
-  our    100644 b3b9d650b27274f4f98f7408319b1e6b35f63abf DEPS
-  their  100644 ecda3ab13f34e03fe90000b6d42ccda3a54aabfb DEPS
-@@ -4,7 +4,11 @@
-   'libchromiumcontent_revision':
-     'c85470a1c379b1c4bedb372c146521bc4be9b75d',
-   'node_version':
-+<<<<<<< .our
-     'ece0a06ac8147efb5b5af431c21f312f1884616e',
-+=======
-+    'v10.2.0-37-g48e8a2a839',
-+>>>>>>> .their
- 
-   'chromium_git':
-     'https://chromium.googlesource.com',
diff --git a/app/test/fixtures/merge-parser/electron/merge-test-change-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-test-change-into-master.txt
deleted file mode 100644
index d03742653ae..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-test-change-into-master.txt
+++ /dev/null
@@ -1,2515 +0,0 @@
-added in both
-  our    100644 67a2b2124619d866f67d849f57f3548ba28be26a appveyor.yml
-  their  100644 cb0c8a67db55630fd6d94204955c56016c9937cf appveyor.yml
-@@ -1,4 +1,5 @@
- version: 1.0.{build}
-+<<<<<<< .our
- branches:
-   except:
-   - /^release$|^release-\d-\d-x$/
-@@ -6,10 +7,20 @@
- image: electron-16-vs2017-15.4.5
- environment:
-   DISABLE_CRASH_REPORTER_TESTS: true
-+=======
-+build_cloud: electron-16
-+image: electron-16-vs2017
-+environment:
-+  DISABLE_CRASH_REPORTER_TESTS: true
-+  matrix:
-+  - TARGET_ARCH: ia32
-+  - TARGET_ARCH: x64
-+>>>>>>> .their
- build_script:
- - ps: >-
-     if(($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME -split "/")[0] -eq ($env:APPVEYOR_REPO_NAME -split "/")[0]) {
-       Write-warning "Skipping PR build for branch"; Exit-AppveyorBuild
-+<<<<<<< .our
-     } else {
-       Add-Path "$env:ProgramFiles (x86)\Windows Kits\10\Debuggers\x64"
-       $env:path = "$env:ProgramFiles (x86)\Windows Kits\10\Debuggers\x64;$env:path"
-@@ -17,10 +28,24 @@
-         $env:RUN_RELEASE_BUILD = "1"
-       }
-       $Message = (git log --format=%B -n 1 HEAD) | Out-String
-+=======
-+
-+    } else {
-+      Add-Path "$env:ProgramFiles (x86)\Windows Kits\10\Debuggers\x64"
-+
-+      $env:path = "$env:ProgramFiles (x86)\Windows Kits\10\Debuggers\x64;$env:path"
-+
-+      $Message = (git log --format=%B -n 1 HEAD) | Out-String
-+
-+>>>>>>> .their
-       if ((Test-Path Env:\RUN_RELEASE_BUILD)) {
-         $env:ELECTRON_RELEASE = '1'
-         Write-Output "release build triggered from api"
-       }
-+<<<<<<< .our
-+=======
-+
-+>>>>>>> .their
-       if ((Test-Path Env:\ELECTRON_RELEASE)) {
-         Write-Output "Running release build"
-         python script\bootstrap.py --target_arch=$env:TARGET_ARCH
-@@ -36,21 +61,34 @@
-       } else {
-         "Build succeeded."
-       }
-+<<<<<<< .our
-       Push-AppveyorArtifact out
-     }
-+=======
-+    }
-+
-+>>>>>>> .their
- test_script:
- - ps: >-
-     if (Test-Path Env:\ELECTRON_RELEASE) {
-       Write-Output "Skipping tests for release build"
-     } else {
-       Write-Output "Running tests for debug build"
-+<<<<<<< .our
-       python script\test.py --ci --rebuild_native_modules
-+=======
-+      python script\test.py --ci
-+>>>>>>> .their
-       if ($LASTEXITCODE -ne '0') {
-         throw "Tests failed with exit code $LASTEXITCODE"
-       } else {
-         Write-Output "Tests succeeded."
-       }
-       python script\verify-ffmpeg.py
-+<<<<<<< .our
-+=======
-+
-+>>>>>>> .their
-       if ($LASTEXITCODE -ne '0') {
-         throw "Verify ffmpeg failed with exit code $LASTEXITCODE"
-       } else {
-@@ -58,6 +96,7 @@
-       }
-     }
- artifacts:
-+<<<<<<< .our
- - path: test-results.xml
-   name: test-results.xml
- deploy_script:
-@@ -71,3 +110,7 @@
-         & python script\upload.py
-       }
-     }
-+=======
-+- path: out
-+  name: out
-+>>>>>>> .their
-changed in both
-  base   100644 08e0776daf674e01202cdb55435c71ea554a1409 atom/app/atom_main_delegate.cc
-  our    100644 b3b5b8f2a8f24b8928f69a286c80e8a3b8464366 atom/app/atom_main_delegate.cc
-  their  100644 5cb10dece3e145ac5a4a7a3da2e277a511d826e8 atom/app/atom_main_delegate.cc
-changed in both
-  base   100644 c2fdf716cf98bb2b332780d4b948eeeb69c66a8d atom/browser/api/atom_api_app.cc
-  our    100644 089a2b63d1bae3afebea925582a3aac81ddeaa4f atom/browser/api/atom_api_app.cc
-  their  100644 c64a0d1a8a7f23145a724ea7202dda495271fbf9 atom/browser/api/atom_api_app.cc
-changed in both
-  base   100644 ac7c256928d6f941b490853792fddbef92f31829 atom/browser/api/atom_api_app.h
-  our    100644 ee0ad42c05fe33be17146b79cbe3422953516621 atom/browser/api/atom_api_app.h
-  their  100644 332dcbdb015570bea966afab70cee2047192ec9b atom/browser/api/atom_api_app.h
-changed in both
-  base   100644 ee487781528e1e4cc6863817021a5346393e1f45 atom/browser/api/atom_api_browser_window.cc
-  our    100644 d0ae6f4ea78407c70e4cce6ff1181ce01e395133 atom/browser/api/atom_api_browser_window.cc
-  their  100644 37c545cfceb7c4f2c0e60c9579f8228024ba281a atom/browser/api/atom_api_browser_window.cc
-changed in both
-  base   100644 5f9610f3a3c2c2946f7a0ec38e3094f7b494cb29 atom/browser/api/atom_api_browser_window.h
-  our    100644 770181f5b7f4e01f0124f44991ee5332771db6e2 atom/browser/api/atom_api_browser_window.h
-  their  100644 d39a1583b2ec7a488613bff60bb0670b0091711b atom/browser/api/atom_api_browser_window.h
-changed in both
-  base   100644 9c4f2e97f22ada9be327b52862cbf70cc102c95c atom/browser/api/atom_api_cookies.cc
-  our    100644 daccf443927abdf444845613b6e2916d167f96f3 atom/browser/api/atom_api_cookies.cc
-  their  100644 767d920913247f24ae3cff83baec89ed10dd23e9 atom/browser/api/atom_api_cookies.cc
-@@ -232,6 +232,7 @@
-           last_access_time, secure, http_only,
-           net::CookieSameSite::DEFAULT_MODE, net::COOKIE_PRIORITY_DEFAULT));
-   auto completion_callback = base::BindOnce(OnSetCookie, callback);
-+<<<<<<< .our
-   if (!canonical_cookie || !canonical_cookie->IsCanonical()) {
-     std::move(completion_callback).Run(false);
-     return;
-@@ -241,6 +242,9 @@
-     return;
-   }
-   if (name.empty()) {
-+=======
-+  if (!canonical_cookie) {
-+>>>>>>> .their
-     std::move(completion_callback).Run(false);
-     return;
-   }
-changed in both
-  base   100644 6307b37f9efa548f54b4294b5352910f7dcfaca4 atom/browser/api/atom_api_debugger.cc
-  our    100644 603382d8a7ac5de596cfdc4ca419f5243287166e atom/browser/api/atom_api_debugger.cc
-  their  100644 f0c4aa5bcbf79c6208404f2ccbc9ecc778b41ea9 atom/browser/api/atom_api_debugger.cc
-changed in both
-  base   100644 7441fac797400cfaab5525a94d5552edc657f7d5 atom/browser/api/atom_api_debugger.h
-  our    100644 d3774dae9dc58ed005274bd756b1b40cb7ca7b0e atom/browser/api/atom_api_debugger.h
-  their  100644 5f600a353dab6486c859292347accb181dfca3e3 atom/browser/api/atom_api_debugger.h
-changed in both
-  base   100644 3bf2df9679a050ddc0ee1e882fdae778bcf2e515 atom/browser/api/atom_api_desktop_capturer.cc
-  our    100644 135b4edd11048a4635f9017f569f4b4ae644a09c atom/browser/api/atom_api_desktop_capturer.cc
-  their  100644 2fc771eb567cf52b40537603ac1c845d0240e86e atom/browser/api/atom_api_desktop_capturer.cc
-@@ -57,6 +57,7 @@
-   cap->Emit("finished", sources);
- }
- 
-+<<<<<<< .our
- void StartHandlingTask(bool capture_window,
-                        bool capture_screen,
-                        const gfx::Size& thumbnail_size,
-@@ -71,11 +72,22 @@
-         webrtc::ScreenCapturerWinDirectx::IsSupported();
-   }
- #endif  // defined(OS_WIN)
-+=======
-+DesktopCapturer::~DesktopCapturer() {}
-+
-+void DesktopCapturer::StartHandling(bool capture_window,
-+                                    bool capture_screen,
-+                                    const gfx::Size& thumbnail_size) {
-+>>>>>>> .their
-   std::unique_ptr<webrtc::DesktopCapturer> screen_capturer(
-       capture_screen ? content::desktop_capture::CreateScreenCapturer()
-                      : nullptr);
-   std::unique_ptr<webrtc::DesktopCapturer> window_capturer(
-+<<<<<<< .our
-       capture_window ? content::desktop_capture::CreateWindowCapturer()
-+=======
-+      capture_window ? content::desktop_capture::CreateScreenCapturer()
-+>>>>>>> .their
-                      : nullptr);
-   cap->media_list_.reset(new NativeDesktopMediaList(
-       std::move(screen_capturer), std::move(window_capturer)));
-changed in both
-  base   100644 51df0a63a5e835f9eee83c3d957b3269d918bb57 atom/browser/api/atom_api_power_save_blocker.cc
-  our    100644 0b06a9f583782b55296498159059e35b8f27f186 atom/browser/api/atom_api_power_save_blocker.cc
-  their  100644 d16265f50115de48112778c3ede58b423bb2b4d3 atom/browser/api/atom_api_power_save_blocker.cc
-@@ -70,6 +70,7 @@
-   }
- 
-   if (!power_save_blocker_ || new_blocker_type != current_blocker_type_) {
-+<<<<<<< .our
-     auto new_blocker = std::make_unique<device::PowerSaveBlocker>(
-         new_blocker_type, device::mojom::WakeLockReason::kOther,
-         ATOM_PRODUCT_NAME, base::ThreadTaskRunnerHandle::Get(),
-@@ -79,6 +80,18 @@
-         // therefore require a single-thread runner.
-         base::CreateSingleThreadTaskRunnerWithTraits(
-             {base::MayBlock(), base::TaskPriority::BACKGROUND}));
-+=======
-+    std::unique_ptr<device::PowerSaveBlocker> new_blocker(
-+        new device::PowerSaveBlocker(
-+            new_blocker_type, device::mojom::WakeLockReason::kOther,
-+            ATOM_PRODUCT_NAME, base::ThreadTaskRunnerHandle::Get(),
-+            // This task runner may be used by some device service
-+            // implementation bits to interface with dbus client code, which in
-+            // turn imposes some subtle thread affinity on the clients. We
-+            // therefore require a single-thread runner.
-+            base::CreateSingleThreadTaskRunnerWithTraits(
-+                {base::MayBlock(), base::TaskPriority::BACKGROUND})));
-+>>>>>>> .their
-     power_save_blocker_.swap(new_blocker);
-     current_blocker_type_ = new_blocker_type;
-   }
-changed in both
-  base   100644 3668cc8663c6f662cfb542f32daaedaa286cfda5 atom/browser/api/atom_api_session.cc
-  our    100644 658f913bb60b66ae1bf3aae97d7d9158e56f7ee0 atom/browser/api/atom_api_session.cc
-  their  100644 49a9d710b4ef91626d054f1f545dbcaf507cb336 atom/browser/api/atom_api_session.cc
-changed in both
-  base   100644 e51792d1f5165b15c250669623ce3d1c7b2128a6 atom/browser/api/atom_api_web_contents.cc
-  our    100644 20a1ac2e672f08ffea528b6e094ba530ff8083d1 atom/browser/api/atom_api_web_contents.cc
-  their  100644 7af82e9886924ac8c7725744e9e42f35c57bb60e atom/browser/api/atom_api_web_contents.cc
-@@ -752,6 +752,13 @@
-   return dialog_manager_.get();
- }
- 
-+void WebContents::ResizeDueToAutoResize(content::WebContents* web_contents,
-+                                        const gfx::Size& new_size) {
-+  if (IsGuest()) {
-+    guest_delegate_->ResizeDueToAutoResize(new_size);
-+  }
-+}
-+
- void WebContents::BeforeUnloadFired(const base::TimeTicks& proceed_time) {
-   // Do nothing, we override this method just to avoid compilation error since
-   // there are two virtual functions named BeforeUnloadFired.
-changed in both
-  base   100644 84c4e3eccba559176e3e7a0bd5c3d1dac033a5d3 atom/browser/api/atom_api_web_contents.h
-  our    100644 7939f8268aa8c3371623e0c15f3b6001d7f1efa4 atom/browser/api/atom_api_web_contents.h
-  their  100644 9ef256350a36ffa5b8a5c1f988e67183b39533f2 atom/browser/api/atom_api_web_contents.h
-@@ -229,9 +229,12 @@
-                       WindowOpenDisposition disposition,
-                       const std::vector<std::string>& features,
-                       const scoped_refptr<network::ResourceRequestBody>& body);
-+<<<<<<< .our
- 
-   // Returns the preload script path of current WebContents.
-   v8::Local<v8::Value> GetPreloadPath(v8::Isolate* isolate) const;
-+=======
-+>>>>>>> .their
- 
-   // Returns the web preferences of current WebContents.
-   v8::Local<v8::Value> GetWebPreferences(v8::Isolate* isolate) const;
-@@ -340,6 +343,8 @@
-       const content::BluetoothChooser::EventHandler& handler) override;
-   content::JavaScriptDialogManager* GetJavaScriptDialogManager(
-       content::WebContents* source) override;
-+  void ResizeDueToAutoResize(content::WebContents* web_contents,
-+                             const gfx::Size& new_size) override;
- 
-   // content::WebContentsObserver:
-   void BeforeUnloadFired(const base::TimeTicks& proceed_time) override;
-changed in both
-  base   100644 8c2ce34a8a051fefe6a00ac2df33ebcb769b24b2 atom/browser/api/frame_subscriber.cc
-  our    100644 7bcb7ab9370a8b3fe245c9569c93dbbdac0a0697 atom/browser/api/frame_subscriber.cc
-  their  100644 b729a1cf6efc5fa974c609c08c60af2f8675f6d1 atom/browser/api/frame_subscriber.cc
-@@ -12,8 +12,11 @@
- #include "content/browser/renderer_host/render_widget_host_view_base.h"
- #include "ui/gfx/geometry/rect_conversions.h"
- #include "ui/gfx/skbitmap_operations.h"
-+<<<<<<< .our
- 
- #include "atom/common/node_includes.h"
-+=======
-+>>>>>>> .their
- 
- namespace atom {
- 
-@@ -26,8 +29,12 @@
-     : content::WebContentsObserver(web_contents),
-       isolate_(isolate),
-       callback_(callback),
-+<<<<<<< .our
-       only_dirty_(only_dirty),
-       weak_ptr_factory_(this) {}
-+=======
-+      only_dirty_(only_dirty) {}
-+>>>>>>> .their
- 
- FrameSubscriber::~FrameSubscriber() = default;
- 
-@@ -56,6 +63,7 @@
-   } else {
-     return gfx::Rect();
-   }
-+<<<<<<< .our
- }
- 
- void FrameSubscriber::DidReceiveCompositorFrame() {
-@@ -93,6 +101,36 @@
-       mate::Converter<gfx::Rect>::ToV8(isolate_, damage);
- 
-   callback_.Run(local_buffer, damage_rect);
-+=======
-+}
-+
-+void FrameSubscriber::DidReceiveCompositorFrame() {
-+  auto* view = web_contents()->GetRenderWidgetHostView();
-+  if (view == nullptr)
-+    return;
-+
-+  view->CopyFromSurface(
-+      gfx::Rect(), view->GetViewBounds().size(),
-+      base::BindOnce(&FrameSubscriber::Done, base::Unretained(this),
-+                     GetDamageRect()));
-+}
-+
-+void FrameSubscriber::Done(const gfx::Rect& damage, const SkBitmap& frame) {
-+  if (frame.drawsNothing())
-+    return;
-+
-+  const_cast<SkBitmap&>(frame).setAlphaType(kPremul_SkAlphaType);
-+  v8::Local<v8::Value> damage_rect =
-+      mate::Converter<gfx::Rect>::ToV8(isolate_, damage);
-+
-+  if (only_dirty_) {
-+    const SkBitmap& damageFrame = SkBitmapOperations::CreateTiledBitmap(
-+        frame, damage.x(), damage.y(), damage.width(), damage.height());
-+    callback_.Run(gfx::Image::CreateFrom1xBitmap(damageFrame), damage_rect);
-+  } else {
-+    callback_.Run(gfx::Image::CreateFrom1xBitmap(frame), damage_rect);
-+  }
-+>>>>>>> .their
- }
- 
- }  // namespace api
-changed in both
-  base   100644 4dbef58d9f0bd8591222f88f7cbaa43d32b98ca1 atom/browser/api/frame_subscriber.h
-  our    100644 d3e82855417cb59c0449f1c1b685970ffaea2af6 atom/browser/api/frame_subscriber.h
-  their  100644 1e43bae6035747dffd4a08f952c240c6169a8c21 atom/browser/api/frame_subscriber.h
-@@ -8,7 +8,10 @@
- #include "content/public/browser/web_contents.h"
- 
- #include "base/callback.h"
-+<<<<<<< .our
- #include "base/memory/weak_ptr.h"
-+=======
-+>>>>>>> .their
- #include "components/viz/common/frame_sinks/copy_output_result.h"
- #include "content/public/browser/web_contents_observer.h"
- #include "ui/gfx/image/image.h"
-@@ -23,13 +26,17 @@
- class FrameSubscriber : public content::WebContentsObserver {
-  public:
-   using FrameCaptureCallback =
--      base::Callback<void(v8::Local<v8::Value>, v8::Local<v8::Value>)>;
-+      base::Callback<void(const gfx::Image&, v8::Local<v8::Value>)>;
- 
-   FrameSubscriber(v8::Isolate* isolate,
-                   content::WebContents* web_contents,
-                   const FrameCaptureCallback& callback,
-                   bool only_dirty);
-+<<<<<<< .our
-   ~FrameSubscriber() override;
-+=======
-+  ~FrameSubscriber();
-+>>>>>>> .their
- 
-  private:
-   gfx::Rect GetDamageRect();
-@@ -40,8 +47,11 @@
-   FrameCaptureCallback callback_;
-   bool only_dirty_;
- 
-+<<<<<<< .our
-   base::WeakPtrFactory<FrameSubscriber> weak_ptr_factory_;
- 
-+=======
-+>>>>>>> .their
-   DISALLOW_COPY_AND_ASSIGN(FrameSubscriber);
- };
- 
-changed in both
-  base   100644 d653c6deb6179f06fe53774773d5502261c43333 atom/browser/atom_browser_client.cc
-  our    100644 57c4ee582405e6d501ec23940ccb10689ecd64a1 atom/browser/atom_browser_client.cc
-  their  100644 f0ace672ffda441e598225475cd5546d6aae96c8 atom/browser/atom_browser_client.cc
-@@ -17,6 +17,7 @@
- #include "atom/browser/atom_resource_dispatcher_host_delegate.h"
- #include "atom/browser/atom_speech_recognition_manager_delegate.h"
- #include "atom/browser/child_web_contents_tracker.h"
-+#include "atom/browser/login_handler.h"
- #include "atom/browser/native_window.h"
- #include "atom/browser/session_preferences.h"
- #include "atom/browser/web_contents_permission_helper.h"
-@@ -31,6 +32,10 @@
- #include "base/strings/string_number_conversions.h"
- #include "base/strings/string_util.h"
- #include "chrome/browser/printing/printing_message_filter.h"
-+<<<<<<< .our
-+=======
-+#include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h"
-+>>>>>>> .their
- #include "chrome/browser/speech/tts_message_filter.h"
- #include "content/public/browser/browser_ppapi_host.h"
- #include "content/public/browser/client_certificate_delegate.h"
-@@ -60,10 +65,13 @@
- #include "net/ssl/client_cert_store.h"
- #endif
- 
-+<<<<<<< .our
- #if defined(ENABLE_PEPPER_FLASH)
- #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h"
- #endif  // defined(ENABLE_PEPPER_FLASH)
- 
-+=======
-+>>>>>>> .their
- using content::BrowserThread;
- 
- namespace atom {
-@@ -484,17 +492,42 @@
- std::unique_ptr<net::ClientCertStore> AtomBrowserClient::CreateClientCertStore(
-     content::ResourceContext* resource_context) {
- #if defined(USE_NSS_CERTS)
-+<<<<<<< .our
-   return std::make_unique<net::ClientCertStoreNSS>(
-       net::ClientCertStoreNSS::PasswordDelegateFactory());
- #elif defined(OS_WIN)
-   return std::make_unique<net::ClientCertStoreWin>();
- #elif defined(OS_MACOSX)
-   return std::make_unique<net::ClientCertStoreMac>();
-+=======
-+  return std::unique_ptr<net::ClientCertStore>(new net::ClientCertStoreNSS(
-+      net::ClientCertStoreNSS::PasswordDelegateFactory()));
-+#elif defined(OS_WIN)
-+  return std::unique_ptr<net::ClientCertStore>(new net::ClientCertStoreWin());
-+#elif defined(OS_MACOSX)
-+  return std::unique_ptr<net::ClientCertStore>(new net::ClientCertStoreMac());
-+>>>>>>> .their
- #elif defined(USE_OPENSSL)
-   return std::unique_ptr<net::ClientCertStore>();
- #endif
- }
- 
-+<<<<<<< .our
-+=======
-+content::ResourceDispatcherHostLoginDelegate*
-+AtomBrowserClient::CreateLoginDelegate(
-+    net::AuthChallengeInfo* auth_info,
-+    content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
-+    bool is_main_frame,
-+    const GURL& url,
-+    bool first_auth_attempt,
-+    const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-+        auth_required_callback) {
-+  return new LoginHandler(auth_info, web_contents_getter, url,
-+                          auth_required_callback);
-+}
-+
-+>>>>>>> .their
- brightray::BrowserMainParts* AtomBrowserClient::OverrideCreateBrowserMainParts(
-     const content::MainFunctionParams&) {
-   v8::V8::Initialize();  // Init V8 before creating main parts.
-changed in both
-  base   100644 abb592cc90ca8ab84da990eb56814804d1dc8ff2 atom/browser/atom_browser_client.h
-  our    100644 a0284cf3f72e9cd4292b636948f92bb09b97f0ae atom/browser/atom_browser_client.h
-  their  100644 78e81d42dcb4a9a841f2b0c3dce32cf819750e54 atom/browser/atom_browser_client.h
-@@ -106,6 +106,17 @@
-   void SiteInstanceDeleting(content::SiteInstance* site_instance) override;
-   std::unique_ptr<net::ClientCertStore> CreateClientCertStore(
-       content::ResourceContext* resource_context) override;
-+<<<<<<< .our
-+=======
-+  content::ResourceDispatcherHostLoginDelegate* CreateLoginDelegate(
-+      net::AuthChallengeInfo* auth_info,
-+      content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
-+      bool is_main_frame,
-+      const GURL& url,
-+      bool first_auth_attempt,
-+      const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-+          auth_required_callback) override;
-+>>>>>>> .their
- 
-   // brightray::BrowserClient:
-   brightray::BrowserMainParts* OverrideCreateBrowserMainParts(
-changed in both
-  base   100644 1cc741e2f406187564c95f286a35a77cf3cf98f8 atom/browser/atom_browser_context.cc
-  our    100644 e036cbc8103f19a034ce386940462f8a23ea6807 atom/browser/atom_browser_context.cc
-  their  100644 e3dbfedc0c2d70762301b86f3138cc325131e7f5 atom/browser/atom_browser_context.cc
-@@ -19,6 +19,10 @@
- #include "base/files/file_path.h"
- #include "base/path_service.h"
- #include "base/strings/stringprintf.h"
-+<<<<<<< .our
-+=======
-+#include "base/task_scheduler/post_task.h"
-+>>>>>>> .their
- #include "chrome/common/chrome_paths.h"
- #include "chrome/common/pref_names.h"
- #include "components/prefs/pref_registry_simple.h"
-@@ -100,8 +104,29 @@
-   return permission_manager_.get();
- }
- 
-+<<<<<<< .our
- storage::SpecialStoragePolicy* AtomBrowserContext::GetSpecialStoragePolicy() {
-   return storage_policy_.get();
-+=======
-+std::unique_ptr<net::CertVerifier> AtomBrowserContext::CreateCertVerifier(
-+    brightray::RequireCTDelegate* ct_delegate) {
-+  return base::WrapUnique(new AtomCertVerifier(ct_delegate));
-+}
-+
-+std::vector<std::string> AtomBrowserContext::GetCookieableSchemes() {
-+  auto default_schemes = brightray::BrowserContext::GetCookieableSchemes();
-+  const auto& standard_schemes = atom::api::GetStandardSchemes();
-+  default_schemes.insert(default_schemes.end(), standard_schemes.begin(),
-+                         standard_schemes.end());
-+  return default_schemes;
-+}
-+
-+void AtomBrowserContext::NotifyCookieChange(const net::CanonicalCookie& cookie,
-+                                            bool removed,
-+                                            net::CookieChangeCause cause) {
-+  CookieDetails cookie_details(&cookie, removed, cause);
-+  cookie_change_sub_list_.Notify(&cookie_details);
-+>>>>>>> .their
- }
- 
- void AtomBrowserContext::RegisterPrefs(PrefRegistrySimple* pref_registry) {
-changed in both
-  base   100644 f825413a96c6a98cf3de319ca7474554e5238a77 atom/browser/atom_browser_context.h
-  our    100644 9e6a841ceb8d11069a1a094bf7dbbd3a788918b3 atom/browser/atom_browser_context.h
-  their  100644 b60a4e682b0a77acf31def4ea2ef0b7dae187b99 atom/browser/atom_browser_context.h
-@@ -35,7 +35,28 @@
-       const base::DictionaryValue& options = base::DictionaryValue());
- 
-   void SetUserAgent(const std::string& user_agent);
-+<<<<<<< .our
-   AtomBlobReader* GetBlobReader();
-+=======
-+  // Register callbacks that needs to notified on any cookie store changes.
-+  std::unique_ptr<base::CallbackList<void(const CookieDetails*)>::Subscription>
-+  RegisterCookieChangeCallback(
-+      const base::Callback<void(const CookieDetails*)>& cb);
-+
-+  // brightray::URLRequestContextGetter::Delegate:
-+  std::unique_ptr<net::NetworkDelegate> CreateNetworkDelegate() override;
-+  std::string GetUserAgent() override;
-+  std::unique_ptr<net::URLRequestJobFactory> CreateURLRequestJobFactory(
-+      content::ProtocolHandlerMap* protocol_handlers) override;
-+  net::HttpCache::BackendFactory* CreateHttpCacheBackendFactory(
-+      const base::FilePath& base_path) override;
-+  std::unique_ptr<net::CertVerifier> CreateCertVerifier(
-+      brightray::RequireCTDelegate* ct_delegate) override;
-+  std::vector<std::string> GetCookieableSchemes() override;
-+  void NotifyCookieChange(const net::CanonicalCookie& cookie,
-+                          bool removed,
-+                          net::CookieChangeCause cause) override;
-+>>>>>>> .their
- 
-   // content::BrowserContext:
-   content::DownloadManagerDelegate* GetDownloadManagerDelegate() override;
-changed in both
-  base   100644 8cccac09931ffbcca0f7b8365dfeb8f8ff7ad9b0 atom/browser/atom_browser_main_parts.cc
-  our    100644 5229b19ca9af7845a3f2f13b7e0913f633b68b1d atom/browser/atom_browser_main_parts.cc
-  their  100644 7e7bc2dcff5fa530d07f9c6f108ccf249e7272cd atom/browser/atom_browser_main_parts.cc
-changed in both
-  base   100644 129ad2d868763c35a4d9cc6d9a8a1ab3f083e888 atom/browser/atom_browser_main_parts.h
-  our    100644 e73f4581202e6853ffc6a51dbd9116c0ab2097d6 atom/browser/atom_browser_main_parts.h
-  their  100644 4f1ecaa6ac224f8956d3904b4e9b7d504996e393 atom/browser/atom_browser_main_parts.h
-changed in both
-  base   100644 791a6f7b67717ccd60b58a3bd2466a6d8a0d4c18 atom/browser/atom_download_manager_delegate.cc
-  our    100644 83276affb18df31ebe64fad6c53960baad498582 atom/browser/atom_download_manager_delegate.cc
-  their  100644 e8e139dcfd3c9122b04674ef6763e83c0614458b atom/browser/atom_download_manager_delegate.cc
-changed in both
-  base   100644 fcbf6ea75e53215365df25ec033c05eab2ad517e atom/browser/atom_javascript_dialog_manager.cc
-  our    100644 25fc326ebac3f2a5beb9199194067dae12c8229b atom/browser/atom_javascript_dialog_manager.cc
-  their  100644 fbb64d3543f8a490d477bc9a9b3a15e31e9e71cf atom/browser/atom_javascript_dialog_manager.cc
-changed in both
-  base   100644 84261e92534c7741df0fe99fe28e7a4dabb3c3a4 atom/browser/atom_resource_dispatcher_host_delegate.cc
-  our    100644 934b0ebaa49b711490c58fc73b91985633cba439 atom/browser/atom_resource_dispatcher_host_delegate.cc
-  their  100644 7382bc44b302fcc3f8ccc43607db8c13952dd6f1 atom/browser/atom_resource_dispatcher_host_delegate.cc
-changed in both
-  base   100644 87774c5bd91ca77d1518bee38765d31fe8fb3890 atom/browser/browser.h
-  our    100644 aed7d25c37da59c0dd5e09940a064c329353a0b2 atom/browser/browser.h
-  their  100644 626666bf2f5073a3c0931b31d5cbc506948b3c5f atom/browser/browser.h
-changed in both
-  base   100644 af9e65a22016df63e27975f3930667dc46d331ee atom/browser/common_web_contents_delegate.cc
-  our    100644 b3b1195e044cd2c74b246aa13e9e85953d694477 atom/browser/common_web_contents_delegate.cc
-  their  100644 4f749ed142398aefc50faabc7817cca1d704c045 atom/browser/common_web_contents_delegate.cc
-@@ -144,7 +144,15 @@
- }  // namespace
- 
- CommonWebContentsDelegate::CommonWebContentsDelegate()
-+<<<<<<< .our
-     : devtools_file_system_indexer_(new DevToolsFileSystemIndexer),
-+=======
-+    : offscreen_(false),
-+      ignore_menu_shortcuts_(false),
-+      html_fullscreen_(false),
-+      native_fullscreen_(false),
-+      devtools_file_system_indexer_(new DevToolsFileSystemIndexer),
-+>>>>>>> .their
-       file_task_runner_(
-           base::CreateSequencedTaskRunnerWithTraits({base::MayBlock()})) {}
- 
-changed in both
-  base   100644 5c24e606a73b280ae04a78dcbb2521a9aaecd97e atom/browser/common_web_contents_delegate.h
-  our    100644 5da5d20975b8e795e34c9d8c7649f6f0eb3d0a50 atom/browser/common_web_contents_delegate.h
-  their  100644 3376508f28b00b94ebe97436ff920e2afbb63121 atom/browser/common_web_contents_delegate.h
-changed in both
-  base   100644 c158759e2de8f805455aca97b2323a3febb68102 atom/browser/javascript_environment.cc
-  our    100644 ddb689236bdfd958b05f28e5f5cb8c35ad47902a atom/browser/javascript_environment.cc
-  their  100644 8e5540ce71d190f353c864197073c35f7b629e06 atom/browser/javascript_environment.cc
-changed in both
-  base   100644 2c1f012592576136a2e1632517505a26c3da0f3a atom/browser/login_handler.cc
-  our    100644 2063c6197fce449d1692f1b067c17e043b1d37e4 atom/browser/login_handler.cc
-  their  100644 047903326c33cbae5ab219f4a0173659b296579a atom/browser/login_handler.cc
-@@ -5,7 +5,6 @@
- #include "atom/browser/login_handler.h"
- 
- #include "atom/browser/browser.h"
--#include "atom/common/native_mate_converters/net_converter.h"
- #include "base/values.h"
- #include "content/public/browser/browser_thread.h"
- #include "content/public/browser/web_contents.h"
-@@ -16,6 +15,7 @@
- namespace atom {
- 
- LoginHandler::LoginHandler(
-+<<<<<<< .our
-     net::URLRequest* request,
-     const net::AuthChallengeInfo& auth_info,
-     const net::NetworkDelegate::AuthCallback& callback,
-@@ -33,6 +33,23 @@
- 
-   web_contents_getter_ =
-       resource_request_info->GetWebContentsGetterForRequest();
-+=======
-+    net::AuthChallengeInfo* auth_info,
-+    content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
-+    const GURL& url,
-+    const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-+        auth_required_callback)
-+    : handled_auth_(false),
-+      auth_info_(auth_info),
-+      web_contents_getter_(web_contents_getter),
-+      auth_required_callback_(auth_required_callback) {
-+  // Fill request details on IO thread.
-+  // TODO(deepak1556): Fill in method and referrer details to
-+  // avoid breaking the app login event.
-+  std::unique_ptr<base::DictionaryValue> request_details(
-+      new base::DictionaryValue);
-+  request_details->SetKey("url", base::Value(url.spec()));
-+>>>>>>> .their
- 
-   BrowserThread::PostTask(
-       BrowserThread::UI, FROM_HERE,
-@@ -42,6 +59,14 @@
- 
- LoginHandler::~LoginHandler() {}
- 
-+<<<<<<< .our
-+=======
-+content::WebContents* LoginHandler::GetWebContents() const {
-+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-+  return web_contents_getter_.Run();
-+}
-+
-+>>>>>>> .their
- void LoginHandler::Login(const base::string16& username,
-                          const base::string16& password) {
-   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-@@ -60,10 +85,16 @@
-       base::BindOnce(&LoginHandler::DoCancelAuth, weak_factory_.GetWeakPtr()));
- }
- 
-+<<<<<<< .our
- void LoginHandler::NotifyRequestDestroyed() {
-   auth_callback_.Reset();
-   credentials_ = nullptr;
-   weak_factory_.InvalidateWeakPtrs();
-+=======
-+void LoginHandler::OnRequestCancelled() {
-+  TestAndSetAuthHandled();
-+  auth_required_callback_.Reset();
-+>>>>>>> .their
- }
- 
- content::WebContents* LoginHandler::GetWebContents() const {
-@@ -73,18 +104,29 @@
- 
- void LoginHandler::DoCancelAuth() {
-   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-+<<<<<<< .our
-   if (!auth_callback_.is_null())
-     std::move(auth_callback_)
-         .Run(net::NetworkDelegate::AUTH_REQUIRED_RESPONSE_CANCEL_AUTH);
-+=======
-+  if (!auth_required_callback_.is_null())
-+    std::move(auth_required_callback_).Run(base::nullopt);
-+>>>>>>> .their
- }
- 
- void LoginHandler::DoLogin(const base::string16& username,
-                            const base::string16& password) {
-   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-+<<<<<<< .our
-   if (!auth_callback_.is_null()) {
-     credentials_->Set(username, password);
-     std::move(auth_callback_)
-         .Run(net::NetworkDelegate::AUTH_REQUIRED_RESPONSE_SET_AUTH);
-+=======
-+  if (!auth_required_callback_.is_null()) {
-+    std::move(auth_required_callback_)
-+        .Run(net::AuthCredentials(username, password));
-+>>>>>>> .their
-   }
- }
- 
-changed in both
-  base   100644 f4cbccd7c2c5ae99f446c042bea0ae00739647c3 atom/browser/login_handler.h
-  our    100644 e7f1c5be0094506e01d2cccc0073fa864dfefb56 atom/browser/login_handler.h
-  their  100644 43d7fb1d19a2b24d5e1b7012bc7246de88a52f54 atom/browser/login_handler.h
-@@ -6,26 +6,55 @@
- #define ATOM_BROWSER_LOGIN_HANDLER_H_
- 
- #include "base/callback.h"
-+<<<<<<< .our
- #include "base/memory/ref_counted.h"
- #include "base/memory/weak_ptr.h"
- #include "base/strings/string16.h"
- #include "content/public/browser/resource_request_info.h"
- #include "net/base/network_delegate.h"
-+=======
-+#include "base/optional.h"
-+#include "base/strings/string16.h"
-+#include "base/synchronization/lock.h"
-+#include "content/public/browser/resource_dispatcher_host_login_delegate.h"
-+#include "content/public/browser/resource_request_info.h"
-+>>>>>>> .their
- 
- namespace content {
- class WebContents;
- }
- 
-+<<<<<<< .our
-+=======
-+namespace net {
-+class AuthChallengeInfo;
-+class AuthCredentials;
-+}  // namespace net
-+
-+>>>>>>> .their
- namespace atom {
- 
- // Handles the HTTP basic auth, must be created on IO thread.
- class LoginHandler : public base::RefCountedThreadSafe<LoginHandler> {
-  public:
-+<<<<<<< .our
-   LoginHandler(net::URLRequest* request,
-                const net::AuthChallengeInfo& auth_info,
-                const net::NetworkDelegate::AuthCallback& callback,
-                net::AuthCredentials* credentials,
-                const content::ResourceRequestInfo* resource_request_info);
-+=======
-+  LoginHandler(
-+      net::AuthChallengeInfo* auth_info,
-+      content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
-+      const GURL& url,
-+      const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-+          auth_required_callback);
-+
-+  // Returns the WebContents associated with the request, must be called on UI
-+  // thread.
-+  content::WebContents* GetWebContents() const;
-+>>>>>>> .their
- 
-   // The auth is cancelled, must be called on UI thread.
-   void CancelAuth();
-@@ -61,10 +90,18 @@
-   // WebContents associated with the login request.
-   content::ResourceRequestInfo::WebContentsGetter web_contents_getter_;
- 
-+<<<<<<< .our
-   // Called with preferred value of net::NetworkDelegate::AuthRequiredResponse.
-   net::NetworkDelegate::AuthCallback auth_callback_;
- 
-   base::WeakPtrFactory<LoginHandler> weak_factory_;
-+=======
-+  // WebContents associated with the login request.
-+  content::ResourceRequestInfo::WebContentsGetter web_contents_getter_;
-+
-+  base::Callback<void(const base::Optional<net::AuthCredentials>&)>
-+      auth_required_callback_;
-+>>>>>>> .their
- 
-   DISALLOW_COPY_AND_ASSIGN(LoginHandler);
- };
-changed in both
-  base   100644 8f8ea28cd20f7895d12aa50b98ae89d3365157e5 atom/browser/mac/atom_application_delegate.mm
-  our    100644 683f7a84bcaa2c47bb78cf299314a5afeb15639b atom/browser/mac/atom_application_delegate.mm
-  their  100644 66fe539406a52046d114f52feb1c9f1b8403c828 atom/browser/mac/atom_application_delegate.mm
-changed in both
-  base   100644 feb2f8c6f88d2e094dec19fb84bf187fbecdbbb6 atom/browser/native_window_mac.mm
-  our    100644 004263ec127709067e903ffbf31003b8844226b4 atom/browser/native_window_mac.mm
-  their  100644 e830b8e8b445ace47ec46c84292aacde55bf0099 atom/browser/native_window_mac.mm
-changed in both
-  base   100644 a391bc09c8908249ac188a52e3b45893063fa482 atom/browser/native_window_views.cc
-  our    100644 0dba39942f92d54ba34db7709b73012055680d94 atom/browser/native_window_views.cc
-  their  100644 2b0da73a22ee298f09bbd1190f50b507e37adc94 atom/browser/native_window_views.cc
-changed in both
-  base   100644 fdf5e5772ee8037f5512999631c8eabae5b8c8e0 atom/browser/native_window_views.h
-  our    100644 ef1e4413ca879980e46f301bccd6c8fe2b1a4611 atom/browser/native_window_views.h
-  their  100644 9ae2a5f325611a2baaf6b3f7ffbab2ee5897f128 atom/browser/native_window_views.h
-changed in both
-  base   100644 3471622db0b92b4b3a9d181e3b74053667b58060 atom/browser/net/atom_network_delegate.cc
-  our    100644 e71ea74317b69f31a5aac8e723902748972fed8f atom/browser/net/atom_network_delegate.cc
-  their  100644 21ea34d57739878358d0822f3377cc97fefc4ec0 atom/browser/net/atom_network_delegate.cc
-@@ -342,7 +342,12 @@
- 
- void AtomNetworkDelegate::OnResponseStarted(net::URLRequest* request,
-                                             int net_error) {
-+<<<<<<< .our
-   if (!base::ContainsKey(simple_listeners_, kOnResponseStarted))
-+=======
-+  if (!base::ContainsKey(simple_listeners_, kOnResponseStarted)) {
-+    brightray::NetworkDelegate::OnResponseStarted(request, net_error);
-+>>>>>>> .their
-     return;
- 
-   if (request->status().status() != net::URLRequestStatus::SUCCESS)
-changed in both
-  base   100644 1ee8d19dc90081a4617f4d27b9efb571d1bf6159 atom/browser/net/atom_network_delegate.h
-  our    100644 39a7a8ddfcda17fd7d022331132b54485d07a279 atom/browser/net/atom_network_delegate.h
-  their  100644 9288b70cb422caf38485d33212ec4a4be4ceb97e atom/browser/net/atom_network_delegate.h
-@@ -103,10 +103,13 @@
-   void OnBeforeRedirect(net::URLRequest* request,
-                         const GURL& new_location) override;
-   void OnResponseStarted(net::URLRequest* request, int net_error) override;
-+<<<<<<< .our
-   void OnNetworkBytesReceived(net::URLRequest* request,
-                               int64_t bytes_read) override {}
-   void OnNetworkBytesSent(net::URLRequest* request,
-                           int64_t bytes_sent) override {}
-+=======
-+>>>>>>> .their
-   void OnCompleted(net::URLRequest* request, bool started) override;
-   void OnURLRequestDestroyed(net::URLRequest* request) override;
-   void OnPACScriptError(int line_number, const base::string16& error) override {
-changed in both
-  base   100644 36d9b6df6d634a08144276d95d741972b8452fb2 atom/browser/net/atom_url_request.cc
-  our    100644 5ffbfd65a48b4459b2ebca66a5c2259f18ed80a8 atom/browser/net/atom_url_request.cc
-  their  100644 a9547a4d2597fca88c30f3d21d0866dc21d3afd6 atom/browser/net/atom_url_request.cc
-changed in both
-  base   100644 654798d8aac82409d3959cd06077c568f1e064d6 atom/browser/net/atom_url_request.h
-  our    100644 fde7b161385fb431b2d807012a00679a4bdb507a atom/browser/net/atom_url_request.h
-  their  100644 e52968efa275397b6f060fbcb89d233a5e764ce1 atom/browser/net/atom_url_request.h
-changed in both
-  base   100644 7b5e20631aaf927b714c4a3edf89c3ab820bc800 atom/browser/net/js_asker.cc
-  our    100644 59e3ab881c2355c2ed29b806de59ef372c170b62 atom/browser/net/js_asker.cc
-  their  100644 daf978082f102937d142dcddbdd860c92c709dbe atom/browser/net/js_asker.cc
-@@ -62,8 +62,13 @@
-     if (dict->GetInteger("error", error))
-       return true;
-   } else if (value->is_int()) {
-+<<<<<<< .our
-     *error = value->GetInt();
-     return true;
-+=======
-+    if (value->GetAsInteger(error))
-+      return true;
-+>>>>>>> .their
-   }
-   return false;
- }
-changed in both
-  base   100644 a51e08e486bffb2cf2f8fb6b26358f299f8b2061 atom/browser/net/url_request_async_asar_job.cc
-  our    100644 1c15fd39b9d479b441b0931564f9e2c3f9de37c7 atom/browser/net/url_request_async_asar_job.cc
-  their  100644 06959032411d27e69ec441577b7a1987a2117080 atom/browser/net/url_request_async_asar_job.cc
-@@ -18,6 +18,7 @@
-     : JsAsker<asar::URLRequestAsarJob>(request, network_delegate) {}
- 
- void URLRequestAsyncAsarJob::StartAsync(std::unique_ptr<base::Value> options) {
-+<<<<<<< .our
-   std::string file_path;
-   if (options->is_dict()) {
-     auto* path_value =
-@@ -26,6 +27,14 @@
-       file_path = path_value->GetString();
-   } else if (options->is_string()) {
-     file_path = options->GetString();
-+=======
-+  base::FilePath::StringType file_path;
-+  if (options->is_dict()) {
-+    static_cast<base::DictionaryValue*>(options.get())
-+        ->GetString("path", &file_path);
-+  } else if (options->is_string()) {
-+    options->GetAsString(&file_path);
-+>>>>>>> .their
-   }
- 
-   if (file_path.empty()) {
-changed in both
-  base   100644 7c85835264299ac67d4b33c2370a64850884641a atom/browser/net/url_request_fetch_job.cc
-  our    100644 68539433f4de80a96bc672de3a2834b299d6c04b atom/browser/net/url_request_fetch_job.cc
-  their  100644 b24f3c39c5302938968fb35bb5211211c2e3924f atom/browser/net/url_request_fetch_job.cc
-changed in both
-  base   100644 82d76d2854a2f73f2e997a60df01b4acbee1feb3 atom/browser/net/url_request_string_job.cc
-  our    100644 31381ff118665f10a53e13fbe0044046738ca230 atom/browser/net/url_request_string_job.cc
-  their  100644 453dd0bb6615880d75f73294d22e67ec9975b7c3 atom/browser/net/url_request_string_job.cc
-@@ -25,7 +25,11 @@
-     dict->GetString("charset", &charset_);
-     dict->GetString("data", &data_);
-   } else if (options->is_string()) {
-+<<<<<<< .our
-     data_ = options->GetString();
-+=======
-+    options->GetAsString(&data_);
-+>>>>>>> .their
-   }
-   net::URLRequestSimpleJob::Start();
- }
-changed in both
-  base   100644 025a41d3290a9885f5b6c3e96a8c917e9c8a5d05 atom/browser/osr/osr_render_widget_host_view.cc
-  our    100644 4a2a0747fe2e6bf38c8999b80dbfea31e52a17fd atom/browser/osr/osr_render_widget_host_view.cc
-  their  100644 4675aec058c7df9f501bffc3c7e7fee7199f460f atom/browser/osr/osr_render_widget_host_view.cc
-@@ -280,6 +280,9 @@
- 
-   local_surface_id_ = local_surface_id_allocator_.GenerateId();
- 
-+  // Surface synchronization is not supported with OSR.
-+  DCHECK(!features::IsSurfaceSynchronizationEnabled());
-+
- #if defined(OS_MACOSX)
-   last_frame_root_background_color_ = SK_ColorTRANSPARENT;
-   CreatePlatformWidget(is_guest_view_hack);
-@@ -755,6 +758,18 @@
-   render_widget_host_->DidProcessFrame(frame_token);
- }
- 
-+<<<<<<< .our
-+=======
-+void OffScreenRenderWidgetHostView::OnFirstSurfaceActivation(
-+    const viz::SurfaceInfo& surface_info) {}
-+
-+void OffScreenRenderWidgetHostView::OnBeginFrame(base::TimeTicks frame_time) {}
-+
-+void OffScreenRenderWidgetHostView::OnFrameTokenChanged(uint32_t frame_token) {
-+  render_widget_host_->DidProcessFrame(frame_token);
-+}
-+
-+>>>>>>> .their
- void OffScreenRenderWidgetHostView::DidReceiveFirstFrameAfterNavigation() {
-   render_widget_host_->DidReceiveFirstFrameAfterNavigation();
- }
-@@ -1060,7 +1075,11 @@
- 
- void OffScreenRenderWidgetHostView::SendMouseEvent(
-     const blink::WebMouseEvent& event) {
-+<<<<<<< .our
-   for (auto* proxy_view : proxy_views_) {
-+=======
-+  for (auto proxy_view : proxy_views_) {
-+>>>>>>> .their
-     gfx::Rect bounds = proxy_view->GetBounds();
-     if (bounds.Contains(event.PositionInWidget().x,
-                         event.PositionInWidget().y)) {
-@@ -1098,7 +1117,11 @@
- 
- void OffScreenRenderWidgetHostView::SendMouseWheelEvent(
-     const blink::WebMouseWheelEvent& event) {
-+<<<<<<< .our
-   for (auto* proxy_view : proxy_views_) {
-+=======
-+  for (auto proxy_view : proxy_views_) {
-+>>>>>>> .their
-     gfx::Rect bounds = proxy_view->GetBounds();
-     if (bounds.Contains(event.PositionInWidget().x,
-                         event.PositionInWidget().y)) {
-@@ -1131,11 +1154,16 @@
-                 popup_host_view_->popup_position_.x(),
-             mouse_wheel_event.PositionInWidget().y -
-                 popup_host_view_->popup_position_.y());
-+<<<<<<< .our
-         popup_mouse_wheel_event.SetPositionInScreen(
-             popup_mouse_wheel_event.PositionInWidget().x,
-             popup_mouse_wheel_event.PositionInWidget().y);
- 
-         popup_host_view_->SendMouseWheelEvent(popup_mouse_wheel_event);
-+=======
-+        popup_host_view_->ProcessMouseWheelEvent(popup_event,
-+                                                 ui::LatencyInfo());
-+>>>>>>> .their
-         return;
-       } else {
-         // Scrolling outside of the popup widget so destroy it.
-changed in both
-  base   100644 7e237096d06751ae4c66dc03643906f351e9d64f atom/browser/osr/osr_render_widget_host_view.h
-  our    100644 b81f6310f864c00fea50b1aac49dc89173eaa302 atom/browser/osr/osr_render_widget_host_view.h
-  their  100644 40f8cafbacb628c3aec4711341be424f55f90ea3 atom/browser/osr/osr_render_widget_host_view.h
-@@ -170,6 +170,10 @@
-   bool DelegatedFrameCanCreateResizeLock() const override;
-   std::unique_ptr<content::CompositorResizeLock>
-   DelegatedFrameHostCreateResizeLock() override;
-+<<<<<<< .our
-+=======
-+  viz::LocalSurfaceId GetLocalSurfaceId() const override;
-+>>>>>>> .their
-   void OnFirstSurfaceActivation(const viz::SurfaceInfo& surface_info) override;
-   void OnBeginFrame(base::TimeTicks frame_time) override;
-   void OnFrameTokenChanged(uint32_t frame_token) override;
-@@ -181,11 +185,14 @@
-   bool IsAutoResizeEnabled() const override;
- #endif  // !defined(OS_MACOSX)
- 
-+<<<<<<< .our
-   viz::LocalSurfaceId GetLocalSurfaceId() const override;
-   viz::FrameSinkId GetFrameSinkId() override;
- 
-   void DidNavigate() override;
- 
-+=======
-+>>>>>>> .their
-   bool TransformPointToLocalCoordSpace(const gfx::PointF& point,
-                                        const viz::SurfaceId& original_surface,
-                                        gfx::PointF* transformed_point) override;
-changed in both
-  base   100644 4c6f88efb6eb3d6db1235079a18fa27cddee988e atom/browser/osr/osr_render_widget_host_view_mac.mm
-  our    100644 8af4ce6ec263a6fba9f3c736ff74247c86787dbc atom/browser/osr/osr_render_widget_host_view_mac.mm
-  their  100644 81d39897f656613002d24a329eeb92d055d4be20 atom/browser/osr/osr_render_widget_host_view_mac.mm
-@@ -22,7 +22,11 @@
-   virtual ~MacHelper() {}
- 
-   // content::BrowserCompositorMacClient:
-+<<<<<<< .our
-   SkColor BrowserCompositorMacGetGutterColor() const override {
-+=======
-+  SkColor BrowserCompositorMacGetGutterColor(SkColor color) const override {
-+>>>>>>> .their
-     // When making an element on the page fullscreen the element's background
-     // may not match the page's, so use black as the gutter color to avoid
-     // flashes of brighter colors during the transition.
-@@ -81,7 +85,11 @@
- 
- void OffScreenRenderWidgetHostView::StopSpeaking() {}
- 
-+<<<<<<< .our
- bool OffScreenRenderWidgetHostView::ShouldContinueToPauseForFrame() {
-+=======
-+bool CefRenderWidgetHostViewOSR::ShouldContinueToPauseForFrame() {
-+>>>>>>> .their
-   return browser_compositor_->ShouldContinueToPauseForFrame();
- }
- 
-changed in both
-  base   100644 6042a9e499e32590b6721ee6acf6fcf1a16288b9 atom/browser/osr/osr_web_contents_view.cc
-  our    100644 c8223df0d8c6f3436d323059686e42684ff98462 atom/browser/osr/osr_web_contents_view.cc
-  their  100644 6be4f0c84b8e0936e98387fb0ee62804ecd4772f atom/browser/osr/osr_web_contents_view.cc
-changed in both
-  base   100644 048bb093dc94ce805f7f706db42d8fc9789600bd atom/browser/osr/osr_web_contents_view.h
-  our    100644 206ab9dd3421af522a12aba615c6f040ba176ba4 atom/browser/osr/osr_web_contents_view.h
-  their  100644 8202eb15a171110a56edea02c32ee9dcb9ed1492 atom/browser/osr/osr_web_contents_view.h
-changed in both
-  base   100644 89b6213a49ebc406a19fc4aae3b1ca718f09fe40 atom/browser/ui/autofill_popup.cc
-  our    100644 f7bd98dacb9812491e80f03a093381f145b03587 atom/browser/ui/autofill_popup.cc
-  their  100644 8719421abefdb4bc634c3eef27390d59a4125823 atom/browser/ui/autofill_popup.cc
-changed in both
-  base   100644 d0fbf08068f849d31de74aac78115382985e3685 atom/browser/ui/autofill_popup.h
-  our    100644 fe1b91760d8628566a858e406a896a006aa5d4ca atom/browser/ui/autofill_popup.h
-  their  100644 7e4f591f7436ced6bccc0032114239b9e50959bf atom/browser/ui/autofill_popup.h
-changed in both
-  base   100644 ac68d8313055f1b9f2c0d5242fda6d8c488d3d10 atom/browser/ui/certificate_trust_win.cc
-  our    100644 f3dc0e0cc6ae044daf9cc499061db98f387d7dea atom/browser/ui/certificate_trust_win.cc
-  their  100644 6179b08607041c38996d7faef8f7f456e42e4ac4 atom/browser/ui/certificate_trust_win.cc
-changed in both
-  base   100644 bea0e949d87dde5816b519088a0719b6643f20a4 atom/browser/ui/views/autofill_popup_view.cc
-  our    100644 e215f0248733d8c68d57cf74e7aade9d72fec2b1 atom/browser/ui/views/autofill_popup_view.cc
-  their  100644 914f1e2f1a0b078e6940bb2b7b8bacc7b6b7ed36 atom/browser/ui/views/autofill_popup_view.cc
-changed in both
-  base   100644 13cf167be38bc4985d6b4b9cea752f46254f7174 atom/browser/ui/views/global_menu_bar_x11.cc
-  our    100644 656bd8f991f87c06a240cdc09a3bfcd500d1c1c8 atom/browser/ui/views/global_menu_bar_x11.cc
-  their  100644 d5fbe03b2f0343698c8e7edb0cfeda09d120f4b7 atom/browser/ui/views/global_menu_bar_x11.cc
-changed in both
-  base   100644 66ad0ededeffca52a597a06799f50c7b80f64006 atom/browser/ui/views/menu_bar.cc
-  our    100644 e838d3cc217b5ffdb77226beff0d7217539f23f9 atom/browser/ui/views/menu_bar.cc
-  their  100644 950a381722803346591ff65ae3ce65813517ad0d atom/browser/ui/views/menu_bar.cc
-@@ -29,8 +29,13 @@
-     : background_color_(kDefaultColor), window_(window) {
-   RefreshColorCache();
-   UpdateViewColors();
-+<<<<<<< .our
-   SetLayoutManager(
-       std::make_unique<views::BoxLayout>(views::BoxLayout::kHorizontal));
-+=======
-+  SetLayoutManager(std::make_unique<views::BoxLayout>(
-+      views::BoxLayout::kHorizontal));
-+>>>>>>> .their
-   window_->GetFocusManager()->AddFocusChangeListener(this);
- }
- 
-changed in both
-  base   100644 e6b5a3e46f897f32131a1c1a4cc459627c2a51e1 atom/browser/ui/win/taskbar_host.h
-  our    100644 2182d377a7736f5e135d2f518c2a0a838cd0d1a0 atom/browser/ui/win/taskbar_host.h
-  their  100644 b0da29e08e035ae17b8714abdf411284f9db8895 atom/browser/ui/win/taskbar_host.h
-changed in both
-  base   100644 e0fbf2a3abc0f048057efafe1f60374b70ff5b59 atom/browser/ui/x/window_state_watcher.cc
-  our    100644 9eebc361d7d0c5915345e73f0a6eba8f5336b003 atom/browser/ui/x/window_state_watcher.cc
-  their  100644 982b230dc95716347a112d702ce3c8090e088912 atom/browser/ui/x/window_state_watcher.cc
-changed in both
-  base   100644 8894c92fa32b61a3caaad9526f65e861d406f6d7 atom/browser/web_view_guest_delegate.cc
-  our    100644 27fbff7e9e3633bd17c54b4c67ba4a1d5993e449 atom/browser/web_view_guest_delegate.cc
-  their  100644 80bd22c01b37d8a58a6b52e4f23636d2fe039bdc atom/browser/web_view_guest_delegate.cc
-@@ -24,6 +24,7 @@
-   ResetZoomController();
- }
- 
-+<<<<<<< .our
- void WebViewGuestDelegate::AttachToIframe(
-     content::WebContents* embedder_web_contents,
-     int embedder_frame_id) {
-@@ -41,6 +42,83 @@
-   // frame |embedder_frame| hosts the inner WebContents.
-   api_web_contents_->web_contents()->AttachToOuterWebContentsFrame(
-       embedder_web_contents_, embedder_frame);
-+=======
-+void WebViewGuestDelegate::SetSize(const SetSizeParams& params) {
-+  bool enable_auto_size =
-+      params.enable_auto_size ? *params.enable_auto_size : auto_size_enabled_;
-+  gfx::Size min_size = params.min_size ? *params.min_size : min_auto_size_;
-+  gfx::Size max_size = params.max_size ? *params.max_size : max_auto_size_;
-+
-+  if (params.normal_size)
-+    normal_size_ = *params.normal_size;
-+
-+  min_auto_size_ = min_size;
-+  min_auto_size_.SetToMin(max_size);
-+  max_auto_size_ = max_size;
-+  max_auto_size_.SetToMax(min_size);
-+
-+  enable_auto_size &= !min_auto_size_.IsEmpty() && !max_auto_size_.IsEmpty();
-+
-+  auto* rvh = web_contents()->GetRenderViewHost();
-+  if (enable_auto_size) {
-+    // Autosize is being enabled.
-+    rvh->EnableAutoResize(min_auto_size_, max_auto_size_);
-+    normal_size_.SetSize(0, 0);
-+  } else {
-+    // Autosize is being disabled.
-+    // Use default width/height if missing from partially defined normal size.
-+    if (normal_size_.width() && !normal_size_.height())
-+      normal_size_.set_height(GetDefaultSize().height());
-+    if (!normal_size_.width() && normal_size_.height())
-+      normal_size_.set_width(GetDefaultSize().width());
-+
-+    gfx::Size new_size;
-+    if (!normal_size_.IsEmpty()) {
-+      new_size = normal_size_;
-+    } else if (!guest_size_.IsEmpty()) {
-+      new_size = guest_size_;
-+    } else {
-+      new_size = GetDefaultSize();
-+    }
-+
-+    bool changed_due_to_auto_resize = false;
-+    if (auto_size_enabled_) {
-+      // Autosize was previously enabled.
-+      rvh->DisableAutoResize(new_size);
-+      changed_due_to_auto_resize = true;
-+    } else {
-+      // Autosize was already disabled.
-+      guest_host_->SizeContents(new_size);
-+    }
-+
-+    UpdateGuestSize(new_size, changed_due_to_auto_resize);
-+  }
-+
-+  auto_size_enabled_ = enable_auto_size;
-+}
-+
-+void WebViewGuestDelegate::ResizeDueToAutoResize(const gfx::Size& new_size) {
-+  UpdateGuestSize(new_size, auto_size_enabled_);
-+}
-+
-+void WebViewGuestDelegate::DidFinishNavigation(
-+    content::NavigationHandle* navigation_handle) {
-+  if (navigation_handle->HasCommitted() && !navigation_handle->IsErrorPage()) {
-+    auto is_main_frame = navigation_handle->IsInMainFrame();
-+    auto url = navigation_handle->GetURL();
-+    api_web_contents_->Emit("load-commit", url, is_main_frame);
-+  }
-+}
-+
-+void WebViewGuestDelegate::DidDetach() {
-+  attached_ = false;
-+  ResetZoomController();
-+}
-+
-+void WebViewGuestDelegate::DidAttach(int guest_proxy_routing_id) {
-+  attached_ = true;
-+  api_web_contents_->Emit("did-attach");
-+>>>>>>> .their
- 
-   ResetZoomController();
- 
-@@ -50,11 +128,20 @@
-   auto* zoom_controller = api_web_contents_->GetZoomController();
-   zoom_controller->SetEmbedderZoomController(embedder_zoom_controller_);
- 
-+<<<<<<< .our
-   api_web_contents_->Emit("did-attach");
- }
- 
- void WebViewGuestDelegate::DidDetach() {
-   ResetZoomController();
-+=======
-+content::WebContents* WebViewGuestDelegate::GetOwnerWebContents() const {
-+  return embedder_web_contents_;
-+}
-+
-+void WebViewGuestDelegate::SetGuestHost(content::GuestHost* guest_host) {
-+  guest_host_ = guest_host;
-+>>>>>>> .their
- }
- 
- content::WebContents* WebViewGuestDelegate::GetOwnerWebContents() const {
-@@ -77,8 +164,28 @@
-   }
- }
- 
-+<<<<<<< .our
- void WebViewGuestDelegate::OnZoomControllerWebContentsDestroyed() {
-   ResetZoomController();
-+=======
-+void WebViewGuestDelegate::UpdateGuestSize(const gfx::Size& new_size,
-+                                           bool due_to_auto_resize) {
-+  if (due_to_auto_resize)
-+    api_web_contents_->Emit("size-changed", guest_size_.width(),
-+                            guest_size_.height(), new_size.width(),
-+                            new_size.height());
-+  guest_size_ = new_size;
-+}
-+
-+gfx::Size WebViewGuestDelegate::GetDefaultSize() const {
-+  if (is_full_page_plugin_) {
-+    // Full page plugins default to the size of the owner's viewport.
-+    return embedder_web_contents_->GetRenderWidgetHostView()
-+        ->GetVisibleViewportSize();
-+  } else {
-+    return gfx::Size(kDefaultWidth, kDefaultHeight);
-+  }
-+>>>>>>> .their
- }
- 
- void WebViewGuestDelegate::ResetZoomController() {
-changed in both
-  base   100644 e9850076b0746069130d57ac21cf041f597c94bb atom/browser/web_view_guest_delegate.h
-  our    100644 6d9f440588d1d38a869ca6b6a33fd31031091efa atom/browser/web_view_guest_delegate.h
-  their  100644 e9973e9e75e943b85be81eeb5b8542f9ce92f3d0 atom/browser/web_view_guest_delegate.h
-@@ -21,16 +21,44 @@
-                        api::WebContents* api_web_contents);
-   ~WebViewGuestDelegate() override;
- 
-+<<<<<<< .our
-   // Attach to the iframe.
-   void AttachToIframe(content::WebContents* embedder_web_contents,
-                       int embedder_frame_id);
-+=======
-+  void Initialize(api::WebContents* api_web_contents);
-+
-+  // Called when the WebContents is going to be destroyed.
-+  void Destroy();
-+
-+  // Used to toggle autosize mode for this GuestView, and set both the automatic
-+  // and normal sizes.
-+  void SetSize(const SetSizeParams& params);
-+
-+  // Invoked when the contents auto-resized and the container should match it.
-+  void ResizeDueToAutoResize(const gfx::Size& new_size);
-+
-+  // Return true if attached.
-+  bool IsAttached() const { return attached_; }
-+>>>>>>> .their
- 
-  protected:
-   // content::BrowserPluginGuestDelegate:
-   void DidDetach() final;
-   content::WebContents* GetOwnerWebContents() const final;
-+<<<<<<< .our
-   content::RenderWidgetHost* GetOwnerRenderWidgetHost() final;
-   content::SiteInstance* GetOwnerSiteInstance() final;
-+=======
-+  void SetGuestHost(content::GuestHost* guest_host) final;
-+  void WillAttach(content::WebContents* embedder_web_contents,
-+                  int element_instance_id,
-+                  bool is_full_page_plugin,
-+                  const base::Closure& completion_callback) final;
-+  bool CanBeEmbeddedInsideCrossProcessFrames() override;
-+  content::RenderWidgetHost* GetOwnerRenderWidgetHost() override;
-+  content::SiteInstance* GetOwnerSiteInstance() override;
-+>>>>>>> .their
-   content::WebContents* CreateNewGuestWindow(
-       const content::WebContents::CreateParams& create_params) final;
- 
-@@ -41,6 +69,19 @@
-   void OnZoomControllerWebContentsDestroyed() override;
- 
-  private:
-+<<<<<<< .our
-+=======
-+  // This method is invoked when the contents auto-resized to give the container
-+  // an opportunity to match it if it wishes.
-+  //
-+  // This gives the derived class an opportunity to inform its container element
-+  // or perform other actions.
-+  void UpdateGuestSize(const gfx::Size& new_size, bool due_to_auto_resize);
-+
-+  // Returns the default size of the guestview.
-+  gfx::Size GetDefaultSize() const;
-+
-+>>>>>>> .their
-   void ResetZoomController();
- 
-   // The WebContents that attaches this guest view.
-changed in both
-  base   100644 0770f061acf6529ca55207258d70c3a2947e402f atom/common/api/atom_api_v8_util.cc
-  our    100644 3d80db0c0a4cdbb4c7a78fa7e4266fc6fc87193f atom/common/api/atom_api_v8_util.cc
-  their  100644 a7bf28a8e2cfd62ba198aabcc572fbb31cd0a8a7 atom/common/api/atom_api_v8_util.cc
-changed in both
-  base   100644 ccd9ebd6780d2e57de9da3c7246a0b674a7248ea atom/common/api/atom_bindings.cc
-  our    100644 3dba3d63673ca8eb02044bd1335a3095f0194971 atom/common/api/atom_bindings.cc
-  their  100644 41beabf3f6e733b097c7fb3a12db18504e7d9c12 atom/common/api/atom_bindings.cc
-@@ -14,7 +14,10 @@
- #include "atom/common/native_mate_converters/string16_converter.h"
- #include "atom/common/node_includes.h"
- #include "base/logging.h"
-+<<<<<<< .our
- #include "base/process/process_info.h"
-+=======
-+>>>>>>> .their
- #include "base/process/process_metrics_iocounters.h"
- #include "base/sys_info.h"
- #include "native_mate/dictionary.h"
-changed in both
-  base   100644 4d5465b9c5f264297979112c74909d9c49f53d30 atom/common/asar/archive.cc
-  our    100644 9b37f94a4dc462c0cc84e0182654ff2571952df9 atom/common/asar/archive.cc
-  their  100644 2f3fbc1246284a13fc5b97814714f90ed5855de0 atom/common/asar/archive.cc
-changed in both
-  base   100644 03d72ca70f5f0cc67a010eaa7befdbac40a6e638 atom/common/chrome_version.h
-  our    100644 35666ab599410942900abd2a7d9ad4b3e5c138af atom/common/chrome_version.h
-  their  100644 bb16578f38617d2eb230e4062df17a70916a174d atom/common/chrome_version.h
-@@ -8,7 +8,11 @@
- #ifndef ATOM_COMMON_CHROME_VERSION_H_
- #define ATOM_COMMON_CHROME_VERSION_H_
- 
-+<<<<<<< .our
- #define CHROME_VERSION_STRING "66.0.3359.181"
-+=======
-+#define CHROME_VERSION_STRING "66.0.3359.117"
-+>>>>>>> .their
- #define CHROME_VERSION "v" CHROME_VERSION_STRING
- 
- #endif  // ATOM_COMMON_CHROME_VERSION_H_
-changed in both
-  base   100644 160a0c4ce5f6fbd494bf4f78c406541d7999c069 atom/common/crash_reporter/win/crash_service.h
-  our    100644 93bbb7c36de3d256acae5ff8dfaa447f8a438b14 atom/common/crash_reporter/win/crash_service.h
-  their  100644 72974a1205c65cc4ef9e32e8cfd92200a5e7d4af atom/common/crash_reporter/win/crash_service.h
-changed in both
-  base   100644 a74ae403213bdce8b5b605caaa3c042d08254b28 atom/common/native_mate_converters/content_converter.cc
-  our    100644 2684aa7dda07ac79e47823c3cf9bf00d3f5cf3f5 atom/common/native_mate_converters/content_converter.cc
-  their  100644 46364e21266a93c7c496d87acbf6cc4ff4965194 atom/common/native_mate_converters/content_converter.cc
-changed in both
-  base   100644 54b7cb71c9ff7425efc91a8c59f9d6dd0767fbaa atom/common/native_mate_converters/gfx_converter.cc
-  our    100644 7a7cfd39e061837f7772be91b43f5851d8278c00 atom/common/native_mate_converters/gfx_converter.cc
-  their  100644 9ce2fffc39354ba93d80479d9fd15d3b546e22a1 atom/common/native_mate_converters/gfx_converter.cc
-changed in both
-  base   100644 8e490ca733b4a97ac18f288e0b8c58c812c76a66 atom/common/native_mate_converters/net_converter.cc
-  our    100644 db54210e7c095da593c6f5b9f4ed1eafb91b945d atom/common/native_mate_converters/net_converter.cc
-  their  100644 b95cfbaeb5e0595dd5f22728a575b571a5d50eb3 atom/common/native_mate_converters/net_converter.cc
-added in both
-  our    100644 61a6563a617030684081e4934044865fdc3c6540 atom/common/native_mate_converters/network_converter.cc
-  their  100644 1037e5f111fbea5c780a168305b2d102e41a58d3 atom/common/native_mate_converters/network_converter.cc
-@@ -6,7 +6,10 @@
- 
- #include <string>
- #include <utility>
-+<<<<<<< .our
- #include <vector>
-+=======
-+>>>>>>> .their
- 
- #include "atom/common/native_mate_converters/value_converter.h"
- #include "native_mate/dictionary.h"
-@@ -21,6 +24,7 @@
-     const scoped_refptr<network::ResourceRequestBody>& val) {
-   if (!val)
-     return v8::Null(isolate);
-+<<<<<<< .our
-   auto list = std::make_unique<base::ListValue>();
-   for (const auto& element : *(val->elements())) {
-     auto post_data_dict = std::make_unique<base::DictionaryValue>();
-@@ -28,6 +32,16 @@
-     if (type == network::DataElement::TYPE_BYTES) {
-       auto bytes = std::make_unique<base::Value>(std::vector<char>(
-           element.bytes(), element.bytes() + (element.length())));
-+=======
-+  std::unique_ptr<base::ListValue> list(new base::ListValue);
-+  for (const auto& element : *(val->elements())) {
-+    std::unique_ptr<base::DictionaryValue> post_data_dict(
-+        new base::DictionaryValue);
-+    auto type = element.type();
-+    if (type == network::DataElement::TYPE_BYTES) {
-+      std::unique_ptr<base::Value> bytes(base::Value::CreateWithCopiedBuffer(
-+          element.bytes(), static_cast<size_t>(element.length())));
-+>>>>>>> .their
-       post_data_dict->SetString("type", "rawData");
-       post_data_dict->Set("bytes", std::move(bytes));
-     } else if (type == network::DataElement::TYPE_FILE) {
-@@ -52,7 +66,11 @@
-     v8::Isolate* isolate,
-     v8::Local<v8::Value> val,
-     scoped_refptr<network::ResourceRequestBody>* out) {
-+<<<<<<< .our
-   auto list = std::make_unique<base::ListValue>();
-+=======
-+  std::unique_ptr<base::ListValue> list(new base::ListValue);
-+>>>>>>> .their
-   if (!ConvertFromV8(isolate, val, list.get()))
-     return false;
-   *out = new network::ResourceRequestBody();
-changed in both
-  base   100644 2e0d594069cbff0f867ba96f5f8e7a70967aeac4 atom/common/native_mate_converters/v8_value_converter.cc
-  our    100644 3fa070771d6843e9428e560c746965b095961e2a atom/common/native_mate_converters/v8_value_converter.cc
-  their  100644 30cfdfabc0670721fe746b617db0623a23547782 atom/common/native_mate_converters/v8_value_converter.cc
-@@ -342,8 +342,13 @@
-   if (val->IsRegExp()) {
-     if (!reg_exp_allowed_)
-       // JSON.stringify converts to an object.
-+<<<<<<< .our
-       return FromV8Object(val->ToObject(context).ToLocalChecked(), state,
-                           isolate);
-+=======
-+      return FromV8Object(val->ToObject(context).ToLocalChecked(),
-+          state, isolate);
-+>>>>>>> .their
-     return new base::Value(
-         *v8::String::Utf8Value(val->ToString(context).ToLocalChecked()));
-   }
-@@ -356,8 +361,13 @@
-     if (!function_allowed_)
-       // JSON.stringify refuses to convert function(){}.
-       return nullptr;
-+<<<<<<< .our
-     return FromV8Object(val->ToObject(context).ToLocalChecked(), state,
-                         isolate);
-+=======
-+    return FromV8Object(val->ToObject(context).ToLocalChecked(),
-+        state, isolate);
-+>>>>>>> .their
-   }
- 
-   if (node::Buffer::HasInstance(val)) {
-@@ -365,8 +375,13 @@
-   }
- 
-   if (val->IsObject()) {
-+<<<<<<< .our
-     return FromV8Object(val->ToObject(context).ToLocalChecked(), state,
-                         isolate);
-+=======
-+    return FromV8Object(val->ToObject(context).ToLocalChecked(),
-+        state, isolate);
-+>>>>>>> .their
-   }
- 
-   LOG(ERROR) << "Unexpected v8 value type encountered.";
-changed in both
-  base   100644 769965f6445b4c9319262c614360da4c3d793201 atom/common/native_mate_converters/value_converter.cc
-  our    100644 a71cc70f83d2526596a75d8daf036f905ca099be atom/common/native_mate_converters/value_converter.cc
-  their  100644 12491806c047e5c8949509d4db2296e9ae26db9c atom/common/native_mate_converters/value_converter.cc
-@@ -14,7 +14,11 @@
-                                               base::DictionaryValue* out) {
-   atom::V8ValueConverter converter;
-   std::unique_ptr<base::Value> value(
-+<<<<<<< .our
-       converter.FromV8Value(val, isolate->GetCurrentContext()));
-+=======
-+      converter->FromV8Value(val, isolate->GetCurrentContext()));
-+>>>>>>> .their
-   if (value && value->is_dict()) {
-     out->Swap(static_cast<base::DictionaryValue*>(value.get()));
-     return true;
-@@ -55,7 +59,11 @@
-                                         base::ListValue* out) {
-   atom::V8ValueConverter converter;
-   std::unique_ptr<base::Value> value(
-+<<<<<<< .our
-       converter.FromV8Value(val, isolate->GetCurrentContext()));
-+=======
-+      converter->FromV8Value(val, isolate->GetCurrentContext()));
-+>>>>>>> .their
-   if (value->is_list()) {
-     out->Swap(static_cast<base::ListValue*>(value.get()));
-     return true;
-changed in both
-  base   100644 947d3bc1a08b5e5bcd1489c2622ae633c4646651 atom/common/platform_util_win.cc
-  our    100644 34576be95f2552aaa985dacb3f36406dfc29d54c atom/common/platform_util_win.cc
-  their  100644 193e2ece0042367113ee23512b5b3ee6d4785fca atom/common/platform_util_win.cc
-@@ -240,6 +240,36 @@
-   if (dir.empty())
-     return false;
- 
-+<<<<<<< .our
-+=======
-+  typedef HRESULT(WINAPI * SHOpenFolderAndSelectItemsFuncPtr)(
-+      PCIDLIST_ABSOLUTE pidl_Folder, UINT cidl, PCUITEMID_CHILD_ARRAY pidls,
-+      DWORD flags);
-+
-+  static SHOpenFolderAndSelectItemsFuncPtr open_folder_and_select_itemsPtr =
-+      NULL;
-+  static bool initialize_open_folder_proc = true;
-+  if (initialize_open_folder_proc) {
-+    initialize_open_folder_proc = false;
-+    // The SHOpenFolderAndSelectItems API is exposed by shell32 version 6
-+    // and does not exist in Win2K. We attempt to retrieve this function export
-+    // from shell32 and if it does not exist, we just invoke ShellExecute to
-+    // open the folder thus losing the functionality to select the item in
-+    // the process.
-+    HMODULE shell32_base = GetModuleHandle(L"shell32.dll");
-+    if (!shell32_base) {
-+      NOTREACHED() << " " << __FUNCTION__ << "(): Can't open shell32.dll";
-+      return false;
-+    }
-+    open_folder_and_select_itemsPtr =
-+        reinterpret_cast<SHOpenFolderAndSelectItemsFuncPtr>(
-+            GetProcAddress(shell32_base, "SHOpenFolderAndSelectItems"));
-+  }
-+  if (!open_folder_and_select_itemsPtr) {
-+    return ui::win::OpenFolderViaShell(dir);
-+  }
-+
-+>>>>>>> .their
-   Microsoft::WRL::ComPtr<IShellFolder> desktop;
-   HRESULT hr = SHGetDesktopFolder(desktop.GetAddressOf());
-   if (FAILED(hr))
-changed in both
-  base   100644 1a407ff54e71512bd0b64cb41b1a753de94c4605 brightray/brightray.gyp
-  our    100644 f233257e88bad8f0ff703034bea02e4715a5b5b9 brightray/brightray.gyp
-  their  100644 08dbba5d230f3448c1219eb40905622440db50f0 brightray/brightray.gyp
-@@ -114,6 +114,10 @@
-                   '<(libchromiumcontent_dir)/libbase_static.a',
-                   '<(libchromiumcontent_dir)/libgtkui.a',
-                   '<(libchromiumcontent_dir)/libhttp_server.a',
-+<<<<<<< .our
-+=======
-+                  '<(libchromiumcontent_dir)/libdesktop_capture.a',
-+>>>>>>> .their
-                   '<(libchromiumcontent_dir)/libdevice_service.a',
-                   '<(libchromiumcontent_dir)/libdom_keycode_converter.a',
-                   '<(libchromiumcontent_dir)/libsystem_wrappers.a',
-@@ -122,6 +126,7 @@
-                   '<(libchromiumcontent_dir)/libwebrtc_common.a',
-                   '<(libchromiumcontent_dir)/libinit_webrtc.a',
-                   '<(libchromiumcontent_dir)/libyuv.a',
-+                  '<(libchromiumcontent_dir)/libpdfium_skia_shared.a',
-                   '<(libchromiumcontent_dir)/librenderer.a',
-                   '<(libchromiumcontent_dir)/libsecurity_state.a',
-                   '<(libchromiumcontent_dir)/libviz_service.a',
-@@ -345,6 +350,10 @@
-                   '<(libchromiumcontent_dir)/sandbox.lib',
-                   '<(libchromiumcontent_dir)/sandbox_helper_win.lib',
-                   '<(libchromiumcontent_dir)/http_server.lib',
-+<<<<<<< .our
-+=======
-+                  '<(libchromiumcontent_dir)/desktop_capture.lib',
-+>>>>>>> .their
-                   '<(libchromiumcontent_dir)/device_service.lib',
-                   '<(libchromiumcontent_dir)/dom_keycode_converter.lib',
-                   '<(libchromiumcontent_dir)/rtc_base.lib',
-changed in both
-  base   100644 596b9bd373ed12292dcbb527e8df9c84b7a9bd84 brightray/brightray.gypi
-  our    100644 8a945dc0219293d90e30162e4691a4d871071f4f brightray/brightray.gypi
-  their  100644 07bd6d61f9f6efb2f528fb9de18c2a8537dc1aef brightray/brightray.gypi
-changed in both
-  base   100644 6951bd8f4eab3a51d3e1295bafd8dac7209579f3 brightray/browser/browser_context.cc
-  our    100644 1eff7344e9aef78bb88720c38c0f75fb92e6bc09 brightray/browser/browser_context.cc
-  their  100644 6123937cb564831e21373b48405f7ba8d3f5efe1 brightray/browser/browser_context.cc
-changed in both
-  base   100644 96c3e661d651e0a469b04313ead75d8bf7b03aa9 brightray/browser/browser_context.h
-  our    100644 1fb1c59b8043dbb711a364fca3c357c11993bedc brightray/browser/browser_context.h
-  their  100644 8f3de784cfe25b64b2dd767f5efd91845a3aecb6 brightray/browser/browser_context.h
-@@ -19,6 +19,7 @@
- 
- namespace brightray {
- 
-+<<<<<<< .our
- class BrowserContext;
- 
- struct BrowserContextDeleter {
-@@ -28,6 +29,11 @@
- class BrowserContext
-     : public base::RefCountedThreadSafe<BrowserContext, BrowserContextDeleter>,
-       public content::BrowserContext {
-+=======
-+class BrowserContext : public base::RefCounted<BrowserContext>,
-+                       public content::BrowserContext,
-+                       public brightray::URLRequestContextGetter::Delegate {
-+>>>>>>> .their
-  public:
-   // Get the BrowserContext according to its |partition| and |in_memory|,
-   // empty pointer when be returned when there is no matching BrowserContext.
-changed in both
-  base   100644 4705abc986661ba3cb6bddfd0e9b70bfd45f19d8 brightray/browser/browser_main_parts.cc
-  our    100644 78d0ef15ef1343e7db123f97182bac7f9a98b3eb brightray/browser/browser_main_parts.cc
-  their  100644 d44ace2dc3306b0f98737297f59292778468e569 brightray/browser/browser_main_parts.cc
-@@ -179,6 +179,7 @@
- }
- #endif
- 
-+<<<<<<< .our
- void BrowserMainParts::InitializeFeatureList() {
-   auto* cmd_line = base::CommandLine::ForCurrentProcess();
-   const auto enable_features =
-@@ -187,6 +188,15 @@
-       cmd_line->GetSwitchValueASCII(switches::kDisableFeatures);
-   auto feature_list = std::make_unique<base::FeatureList>();
-   feature_list->InitializeFromCommandLine(enable_features, disable_features);
-+=======
-+int BrowserMainParts::PreEarlyInitialization() {
-+  std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);
-+  // TODO(deepak1556): Disable guest webcontents based on OOPIF feature.
-+  // Disable surface synchronization and async wheel events to make OSR work.
-+  feature_list->InitializeFromCommandLine(
-+      "",
-+      "GuestViewCrossProcessFrames,SurfaceSynchronization,AsyncWheelEvents");
-+>>>>>>> .their
-   base::FeatureList::SetInstance(std::move(feature_list));
- }
- 
-changed in both
-  base   100644 2173339853647f6d904e8d4822422adc495c7822 brightray/browser/browser_main_parts.h
-  our    100644 cf8e0296585b17f1e7dab1717e0aa80293d902dd brightray/browser/browser_main_parts.h
-  their  100644 0f82ce6daa9a7fc82aa70c68d8d5fd9dc0951a99 brightray/browser/browser_main_parts.h
-@@ -33,7 +33,10 @@
- 
-  protected:
-   // content::BrowserMainParts:
-+<<<<<<< .our
-   bool ShouldContentCreateFeatureList() override;
-+=======
-+>>>>>>> .their
-   int PreEarlyInitialization() override;
-   void ToolkitInitialized() override;
-   void PreMainMessageLoopStart() override;
-changed in both
-  base   100644 1182073dfac5ffc858a36eded964fe03b44dbe6e brightray/browser/inspectable_web_contents_impl.cc
-  our    100644 32b5743b8db53ef2628d062e9942e30ec7c52b2f brightray/browser/inspectable_web_contents_impl.cc
-  their  100644 70ff7d2ff53611acd21199b35a3912489fe45d13 brightray/browser/inspectable_web_contents_impl.cc
-changed in both
-  base   100644 32145f281fb350df13e105fd835d74f61f4a428d brightray/browser/inspectable_web_contents_impl.h
-  our    100644 3f0fe0093cf724e9f090a036a259e823c12f9294 brightray/browser/inspectable_web_contents_impl.h
-  their  100644 9ebcbfdd1ff3e995ac10e8a7ba07c2bdfe20a692 brightray/browser/inspectable_web_contents_impl.h
-changed in both
-  base   100644 771b5451f109d8dc7323c1773037c0f0271edd3c brightray/browser/net_log.cc
-  our    100644 fb443ea0b72b9659d98d1873fad1a714483bb13f brightray/browser/net_log.cc
-  their  100644 4ab488cf26f4fbe80002aa2dbc2012f7e3ff85bc brightray/browser/net_log.cc
-@@ -46,11 +46,17 @@
- 
-   base::FilePath log_path =
-       command_line->GetSwitchValuePath(network::switches::kLogNetLog);
-+<<<<<<< .our
-   if (log_path.empty())
-     return;
- 
-   std::unique_ptr<base::Value> constants(GetConstants());  // Net constants
-   net::NetLogCaptureMode capture_mode = net::NetLogCaptureMode::Default();
-+=======
-+  std::unique_ptr<base::Value> constants(GetConstants());
-+  net::NetLogCaptureMode capture_mode =
-+      net::NetLogCaptureMode::IncludeCookiesAndCredentials();
-+>>>>>>> .their
- 
-   file_net_log_observer_ =
-       net::FileNetLogObserver::CreateUnbounded(log_path, std::move(constants));
-removed in local
-  base   100644 e5c0186a7b3d12ce8880670d81702757d4e898fb brightray/browser/network_delegate.cc
-  their  100644 32981cb8b8d53ee2b797c366dd80d5efcc82d2c9 brightray/browser/network_delegate.cc
-removed in local
-  base   100644 3c12624b27e1801350945a758e20d2d4ab835cad brightray/browser/network_delegate.h
-  their  100644 77625e5c86b13bdd3619d82d59f98d6acdcf9e36 brightray/browser/network_delegate.h
-changed in both
-  base   100644 7c58f4c2f1ff7e1671bbafc827a21dcd1802d30e brightray/browser/platform_notification_service.cc
-  our    100644 5913de18e298ab6f2388243b42af20ecba9c2ee0 brightray/browser/platform_notification_service.cc
-  their  100644 36b2cfb812f3919d053174bfe4475f4ecb59c319 brightray/browser/platform_notification_service.cc
-removed in local
-  base   100644 a9b45296f0313704eadb4bba69598db7fce8b8a3 brightray/browser/special_storage_policy.cc
-  their  100644 e662441dedbfe3c5cf08e8dcce3413153c1fcf82 brightray/browser/special_storage_policy.cc
-removed in local
-  base   100644 0c89db2d4c511da16fefcf2cf4ea75541ab30e15 brightray/browser/special_storage_policy.h
-  their  100644 2d02cdd293438d4f10863c4cf6a7932dc20a3666 brightray/browser/special_storage_policy.h
-changed in both
-  base   100644 31219c5fa604cd1e8f48715beea394dccf7cf0bc brightray/browser/url_request_context_getter.cc
-  our    100644 c07ba80cbc522030af580adc5d8676ed31d592d1 brightray/browser/url_request_context_getter.cc
-  their  100644 68041972af79509c018d6ec045461bf0b2b50a83 brightray/browser/url_request_context_getter.cc
-@@ -20,7 +20,10 @@
- #include "content/public/browser/browser_thread.h"
- #include "content/public/browser/cookie_store_factory.h"
- #include "content/public/browser/devtools_network_transaction_factory.h"
-+<<<<<<< .our
- #include "content/public/browser/resource_context.h"
-+=======
-+>>>>>>> .their
- #include "net/base/host_mapping_rules.h"
- #include "net/cert/cert_verifier.h"
- #include "net/cert/ct_known_logs.h"
-@@ -172,7 +175,11 @@
-   // the URLRequestContextStorage on the IO thread in GetURLRequestContext().
-   proxy_config_service_ =
-       net::ProxyResolutionService::CreateSystemProxyConfigService(
-+<<<<<<< .our
-           BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
-+=======
-+          io_task_runner_);
-+>>>>>>> .their
- }
- 
- URLRequestContextGetter::~URLRequestContextGetter() {}
-@@ -191,6 +198,29 @@
-   http_auth_preferences_.reset();
-   host_mapping_rules_.reset();
-   ct_delegate_.reset();
-+<<<<<<< .our
-+=======
-+  net::URLRequestContextGetter::NotifyContextShuttingDown();
-+}
-+
-+void URLRequestContextGetter::OnCookieChanged(
-+    const net::CanonicalCookie& cookie,
-+    net::CookieChangeCause cause) {
-+  DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-+
-+  if (!delegate_ || context_shutting_down_)
-+    return;
-+
-+  content::BrowserThread::PostTask(
-+      content::BrowserThread::UI, FROM_HERE,
-+      base::BindOnce(&Delegate::NotifyCookieChange, base::Unretained(delegate_),
-+                     cookie, !(cause == net::CookieChangeCause::INSERTED),
-+                     cause));
-+}
-+
-+net::HostResolver* URLRequestContextGetter::host_resolver() {
-+  return url_request_context_->host_resolver();
-+>>>>>>> .their
- }
- 
- net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
-@@ -218,8 +248,14 @@
-     auto cookie_path = in_memory_
-                            ? base::FilePath()
-                            : base_path_.Append(FILE_PATH_LITERAL("Cookies"));
-+<<<<<<< .our
-     std::unique_ptr<net::CookieStore> cookie_store = content::CreateCookieStore(
-         content::CookieStoreConfig(cookie_path, false, false, nullptr));
-+=======
-+    std::unique_ptr<net::CookieStore> cookie_store =
-+        content::CreateCookieStore(content::CookieStoreConfig(
-+            cookie_path, false, false, nullptr));
-+>>>>>>> .their
-     storage_->set_cookie_store(std::move(cookie_store));
- 
-     // Set custom schemes that can accept cookies.
-@@ -230,11 +266,19 @@
-     cookie_monster->SetCookieableSchemes(cookie_schemes);
-     // Cookie store will outlive notifier by order of declaration
-     // in the header.
-+<<<<<<< .our
-     cookie_change_sub_ = url_request_context_->cookie_store()
-                              ->GetChangeDispatcher()
-                              .AddCallbackForAllChanges(base::Bind(
-                                  &URLRequestContextGetter::OnCookieChanged,
-                                  base::RetainedRef(this)));
-+=======
-+    cookie_change_sub_ =
-+        url_request_context_->cookie_store()
-+            ->GetChangeDispatcher()
-+            .AddCallbackForAllChanges(
-+                base::Bind(&URLRequestContextGetter::OnCookieChanged, this));
-+>>>>>>> .their
- 
-     storage_->set_channel_id_service(std::make_unique<net::ChannelIDService>(
-         new net::DefaultChannelIDStore(nullptr)));
-changed in both
-  base   100644 0cfd921babe5e8595583ad1beed0fa4a2e3ed89a brightray/browser/url_request_context_getter.h
-  our    100644 941a5782b14a941bb25a7a9ef6ca6d73f8bc3ec1 brightray/browser/url_request_context_getter.h
-  their  100644 b990d479a06cb7c26f306bf50179eb87c9af4472 brightray/browser/url_request_context_getter.h
-@@ -54,11 +54,20 @@
-     virtual net::HttpCache::BackendFactory* CreateHttpCacheBackendFactory(
-         const base::FilePath& base_path) = 0;
-     virtual std::unique_ptr<net::CertVerifier> CreateCertVerifier(
-+<<<<<<< .our
-         RequireCTDelegate* ct_delegate) = 0;
-     virtual void GetCookieableSchemes(
-         std::vector<std::string>* cookie_schemes) {}
-     virtual void OnCookieChanged(const net::CanonicalCookie& cookie,
-                                  net::CookieChangeCause cause) {}
-+=======
-+        RequireCTDelegate* ct_delegate);
-+    virtual net::SSLConfigService* CreateSSLConfigService();
-+    virtual std::vector<std::string> GetCookieableSchemes();
-+    virtual void NotifyCookieChange(const net::CanonicalCookie& cookie,
-+                                    bool removed,
-+                                    net::CookieChangeCause cause) {}
-+>>>>>>> .their
-   };
- 
-   URLRequestContextGetter(
-@@ -70,6 +79,13 @@
-       content::ProtocolHandlerMap* protocol_handlers,
-       content::URLRequestInterceptorScopedVector protocol_interceptors);
- 
-+<<<<<<< .our
-+=======
-+  // net::CookieChangeDispatcher::CookieChangedCallback implementation.
-+  void OnCookieChanged(const net::CanonicalCookie& cookie,
-+                       net::CookieChangeCause cause);
-+
-+>>>>>>> .their
-   // net::URLRequestContextGetter:
-   net::URLRequestContext* GetURLRequestContext() override;
-   scoped_refptr<base::SingleThreadTaskRunner> GetNetworkTaskRunner()
-@@ -129,11 +145,14 @@
-   std::unique_ptr<net::HttpAuthPreferences> http_auth_preferences_;
-   std::unique_ptr<net::HttpNetworkSession> http_network_session_;
-   std::unique_ptr<net::CookieChangeSubscription> cookie_change_sub_;
-+<<<<<<< .our
- 
-   net::URLRequestJobFactory* job_factory_;
-   Delegate* delegate_;
-   NetLog* net_log_;
-   ResourceContext* resource_context_;
-+=======
-+>>>>>>> .their
-   content::ProtocolHandlerMap protocol_handlers_;
-   content::URLRequestInterceptorScopedVector protocol_interceptors_;
-   base::FilePath base_path_;
-changed in both
-  base   100644 4b14b1cddb06816a1ffbcedf178e6888814f26af brightray/browser/views/views_delegate.cc
-  our    100644 233a595eb38adc189af12736e5cec20a9a8d7d86 brightray/browser/views/views_delegate.cc
-  their  100644 06c7e326ca8614515e009adedb33d19085f1228c brightray/browser/views/views_delegate.cc
-changed in both
-  base   100644 c6c7d4e8e66de2da3ded6b03ef82ac0701c5ef6a brightray/filenames.gypi
-  our    100644 b9e2d96175f8ee2d407db9c49b2e2b74756327de brightray/filenames.gypi
-  their  100644 0d79b5faf74f5e113b69137d6f2ab9986ff79f09 brightray/filenames.gypi
-changed in both
-  base   100644 5da793ec584f1ffcf59e1b288cf28b3e7c43b047 chromium_src/chrome/renderer/media/chrome_key_systems.cc
-  our    100644 c4ab859f06ba0758e857a222d7caf87230adb1fe chromium_src/chrome/renderer/media/chrome_key_systems.cc
-  their  100644 9ab77139c5bc045dd2390f21f849acf7a0d27c19 chromium_src/chrome/renderer/media/chrome_key_systems.cc
-@@ -24,7 +24,12 @@
- #include "media/base/video_codecs.h"
- #endif
- 
-+<<<<<<< .our
- #include "widevine_cdm_version.h"  // In SHARED_INTERMEDIATE_DIR.
-+=======
-+// #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
-+#include "third_party/widevine/cdm/stub/widevine_cdm_version.h"
-+>>>>>>> .their
- 
- // The following must be after widevine_cdm_version.h.
- 
-removed in local
-  base   100644 5aabe7032f4c3e5cebcd9da892ff732cafafc12a chromium_src/chrome/renderer/pepper/pepper_flash_renderer_host.cc
-  their  100644 50015122ccc7e2da02d0e9b2c7014e085c3ffec4 chromium_src/chrome/renderer/pepper/pepper_flash_renderer_host.cc
-changed in both
-  base   100644 a40b669b401517b10def136a1a3b91c04e41f4c1 chromium_src/chrome/renderer/printing/print_web_view_helper.cc
-  our    100644 506223fc82e63ee682a2e608cc6957c55d958115 chromium_src/chrome/renderer/printing/print_web_view_helper.cc
-  their  100644 de79a398e0bd05b50c81ee9db54761d4b06fe5aa chromium_src/chrome/renderer/printing/print_web_view_helper.cc
-changed in both
-  base   100644 5c6677b333ef1c47710499c97e9fd763eebe2aad common.gypi
-  our    100644 676d1e904127066e4a3d313106f15406fcbed8b6 common.gypi
-  their  100644 17d1db1bf3faf3b2175e7b4ac9c8262198f39f9c common.gypi
-changed in both
-  base   100644 35f4e4242c210bd28dce248aaac6550703159d12 docs/api/browser-window.md
-  our    100644 dff61dd336f047cf2f6f06228b2df2b98ff2304d docs/api/browser-window.md
-  their  100644 39120b24e70f19f00e426e481d15296dc8bce844 docs/api/browser-window.md
-changed in both
-  base   100644 a16c887ca2a9fc3da4d862f997b23110a7011c64 docs/api/web-contents.md
-  our    100644 8990fe2e97ab62eafdd3f7a4eb8ee782415124c5 docs/api/web-contents.md
-  their  100644 17513b5b170f2939facc97fba9bff1c93e93f99d docs/api/web-contents.md
-changed in both
-  base   100644 b623db083ee3100b210daeba7b762bf4d4cf9fa3 docs/api/webview-tag.md
-  our    100644 8dc16b4a4e92ad132c7722ac400e2be851723f9b docs/api/webview-tag.md
-  their  100644 e9b9824c0c7adf753df8cd87e0ffd1a8ba3ce0cc docs/api/webview-tag.md
-@@ -266,7 +266,11 @@
-   * `httpReferrer` (String | [Referrer](structures/referrer.md)) (optional) - An HTTP Referrer url.
-   * `userAgent` String (optional) - A user agent originating the request.
-   * `extraHeaders` String (optional) - Extra headers separated by "\n"
-+<<<<<<< .our
-   * `postData` ([UploadRawData[]](structures/upload-raw-data.md) | [UploadFile[]](structures/upload-file.md) | [UploadBlob[]](structures/upload-blob.md)) (optional)
-+=======
-+  * `postData` ([UploadRawData[]](structures/upload-raw-data.md) | [UploadFile[]](structures/upload-file.md) | [UploadBlob[]](structures/upload-blob.md)) (optional) -
-+>>>>>>> .their
-   * `baseURLForDataURL` String (optional) - Base url (with trailing path separator) for files to be loaded by the data url. This is needed only if the specified `url` is a data url and needs to load other files.
- 
- Loads the `url` in the webview, the `url` must contain the protocol prefix,
-changed in both
-  base   100644 b7b430bdd697780deca40ba36efb68c700594149 docs/tutorial/snapcraft.md
-  our    100644 c188adeea48f2a12dc9cb3b4d67befcb5e871051 docs/tutorial/snapcraft.md
-  their  100644 f26ba7824da31dd303d6135b3b121f4b3b93e094 docs/tutorial/snapcraft.md
-changed in both
-  base   100644 5068d85d034110ab5fe1d6c5bc27b435a69f2492 docs/tutorial/windows-store-guide.md
-  our    100644 1e500b88da84ddf3cca08dd44b0d694e12ef85d9 docs/tutorial/windows-store-guide.md
-  their  100644 bfd9b962a607be92a04a903cab8790f9c4bcb826 docs/tutorial/windows-store-guide.md
-changed in both
-  base   100644 62dfef265ea8b378ba08e76b79ae7efba8773233 electron.gyp
-  our    100644 944ddab2a3fd879044e31677e4bac2843fffbdee electron.gyp
-  their  100644 c273227a661cc8474d2af8a43b417de21a81f44f electron.gyp
-changed in both
-  base   100644 247d828bbc01d4411f82d6a063044504889a757b features.gypi
-  our    100644 86543a4db1195223a3556fa71583038f15d79a0a features.gypi
-  their  100644 405b37c8e232eded3eaf477e32ab5136af035fe0 features.gypi
-@@ -2,8 +2,12 @@
-   # If it looks stupid but it works it ain't stupid.
-   'variables': {
-     'variables': {
-+<<<<<<< .our
-       'enable_desktop_capturer%': 1,
-       'enable_osr%': 1,
-+=======
-+      'enable_osr%': 0,  # FIXME(alexeykuzmin)
-+>>>>>>> .their
-       'enable_pdf_viewer%': 0,  # FIXME(deepak1556)
-       'enable_run_as_node%': 1,
-       'enable_view_api%': 0,
-changed in both
-  base   100644 44dcc015d58abeab12e4db6124f9c0798ecb539a filenames.gypi
-  our    100644 f57860558f06b7e5d8a50f48cfc7e53044df0bc6 filenames.gypi
-  their  100644 552d15e093880de1bfc02e889b5661bf881d7575 filenames.gypi
-@@ -608,6 +608,23 @@
-       'chromium_src/chrome/browser/process_singleton_posix.cc',
-       'chromium_src/chrome/browser/process_singleton_win.cc',
-       'chromium_src/chrome/browser/process_singleton.h',
-+<<<<<<< .our
-+=======
-+      'chromium_src/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc',
-+      'chromium_src/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h',
-+      'chromium_src/chrome/browser/renderer_host/pepper/monitor_finder_mac.h',
-+      'chromium_src/chrome/browser/renderer_host/pepper/monitor_finder_mac.mm',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.h',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.h',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h',
-+>>>>>>> .their
-       'chromium_src/chrome/browser/speech/tts_controller.h',
-       'chromium_src/chrome/browser/speech/tts_controller_impl.cc',
-       'chromium_src/chrome/browser/speech/tts_controller_impl.h',
-changed in both
-  base   100644 e7f620a6e291fa1af83f025e862b3d3c076a36f2 lib/browser/guest-view-manager.js
-  our    100644 1e4029e39a981c85fb6ff18c5ccd52f81b3c56f2 lib/browser/guest-view-manager.js
-  their  100644 48258d360f6bc39f05c2455350bef7838c934efa lib/browser/guest-view-manager.js
-changed in both
-  base   100644 52ef64cd777769a86dbbac1a16015994b6b81ea1 lib/renderer/web-view/guest-view-internal.js
-  our    100644 6e42c769b70e5223fe97397f87144ec342882f8d lib/renderer/web-view/guest-view-internal.js
-  their  100644 a868b513eb4221bbf311f8f43ad4f94fff323928 lib/renderer/web-view/guest-view-internal.js
-changed in both
-  base   100755 de3b9ffd48156379afd677b98c40c97532cb8367 script/create-dist.py
-  our    100755 4a6c0c7ce8f275175e48c4c380ff33627f7a5961 script/create-dist.py
-  their  100755 646b4c42f095c8eb3a7750a482c25811794fbba0 script/create-dist.py
-merged
-  result 100755 96052162795ed9506073e6cdb8726645f937e0a0 script/update.py
-  our    100755 5b4e201d76ab3689bc8847d6141b2fff1a852174 script/update.py
-@@ -60,8 +60,6 @@
-   env = os.environ.copy()
-   if PLATFORM == 'linux' and target_arch != get_host_arch():
-     env['GYP_CROSSCOMPILE'] = '1'
--  elif PLATFORM == 'win32':
--    env['GYP_MSVS_VERSION'] = '2017'
-   python = sys.executable
-   if sys.platform == 'cygwin':
-     # Force using win32 python on cygwin.
-changed in both
-  base   100644 47d8cd1ecf010a00cd74cfcf4fff8e6aca03e7bd spec/api-browser-window-spec.js
-  our    100644 f4cba12ec19d224bc46fca898db42a99baf4972e spec/api-browser-window-spec.js
-  their  100644 edfdb159cab25d35a880957aab479516d6dcf56b spec/api-browser-window-spec.js
-@@ -1,8 +1,12 @@
- 'use strict'
- 
- const assert = require('assert')
-+<<<<<<< .our
- const chai = require('chai')
- const dirtyChai = require('dirty-chai')
-+=======
-+const {expect} = require('chai')
-+>>>>>>> .their
- const fs = require('fs')
- const path = require('path')
- const os = require('os')
-@@ -2142,7 +2146,9 @@
-     })
-   })
- 
--  describe('beginFrameSubscription method', () => {
-+  // TODO(alexeykuzmin): It crashes the app.
-+  // Fix the crash and enable the tests.
-+  xdescribe('beginFrameSubscription method', () => {
-     before(function () {
-       // This test is too slow, only test it on CI.
-       if (!isCI) {
-@@ -2832,16 +2838,28 @@
-       describe('for invalid extensions', () => {
-         it('throws errors for missing manifest.json files', () => {
-           const nonexistentExtensionPath = path.join(__dirname, 'does-not-exist')
-+<<<<<<< .our
-           expect(() => {
-             BrowserWindow.addDevToolsExtension(nonexistentExtensionPath)
-           }).to.throw(/ENOENT: no such file or directory/)
-+=======
-+          assert.throws(() => {
-+            BrowserWindow.addDevToolsExtension(nonexistentExtensionPath)
-+          }, /ENOENT: no such file or directory/)
-+>>>>>>> .their
-         })
- 
-         it('throws errors for invalid manifest.json files', () => {
-           const badManifestExtensionPath = path.join(__dirname, 'fixtures', 'devtools-extensions', 'bad-manifest')
-+<<<<<<< .our
-           expect(() => {
-             BrowserWindow.addDevToolsExtension(badManifestExtensionPath)
-           }).to.throw(/Unexpected token }/)
-+=======
-+          assert.throws(() => {
-+            BrowserWindow.addDevToolsExtension(badManifestExtensionPath)
-+          }, /Unexpected token }/)
-+>>>>>>> .their
-         })
-       })
- 
-@@ -2850,13 +2868,21 @@
- 
-         const removeExtension = () => {
-           BrowserWindow.removeDevToolsExtension('foo')
-+<<<<<<< .our
-           expect(BrowserWindow.getDevToolsExtensions().hasOwnProperty(extensionName)).to.equal(false)
-+=======
-+          assert.equal(BrowserWindow.getDevToolsExtensions().hasOwnProperty(extensionName), false)
-+>>>>>>> .their
-         }
- 
-         const addExtension = () => {
-           const extensionPath = path.join(__dirname, 'fixtures', 'devtools-extensions', 'foo')
-           BrowserWindow.addDevToolsExtension(extensionPath)
-+<<<<<<< .our
-           expect(BrowserWindow.getDevToolsExtensions().hasOwnProperty(extensionName)).to.equal(true)
-+=======
-+          assert.equal(BrowserWindow.getDevToolsExtensions().hasOwnProperty(extensionName), true)
-+>>>>>>> .their
- 
-           showLastDevToolsPanel()
- 
-@@ -2877,6 +2903,7 @@
-             })
-           })
- 
-+<<<<<<< .our
-           describe('created extension info', function () {
-             it('has proper "runtimeId"', function () {
-               expect(this.message).to.have.own.property('runtimeId')
-@@ -2891,6 +2918,22 @@
-               expect(this.message.i18nString).to.equal('foo - bar (baz)')
-             })
-             it('has "storageItems" with proper contents', function () {
-+=======
-+          describe('created extension', function () {
-+            it('has proper runtimeId', function () {
-+              expect(this.message).to.have.own.property('runtimeId')
-+              expect(this.message.runtimeId).to.equal(extensionName)
-+            })
-+            it('has tabId matching webContents id', function () {
-+              expect(this.message).to.have.own.property('tabId')
-+              expect(this.message.tabId).to.equal(w.webContents.id)
-+            })
-+            it('has i18nString with proper contents', function () {
-+              expect(this.message).to.have.own.property('i18nString')
-+              expect(this.message.i18nString).to.equal('foo - bar (baz)')
-+            })
-+            it('has storageItems with proper contents', function () {
-+>>>>>>> .their
-               expect(this.message).to.have.own.property('storageItems')
-               expect(this.message.storageItems).to.deep.equal({
-                 local: {
-@@ -2918,12 +2961,21 @@
-             })
-           })
- 
-+<<<<<<< .our
-           describe('created extension info', function () {
-             it('has proper "runtimeId"', function () {
-               expect(this.message).to.have.own.property('runtimeId')
-               expect(this.message.runtimeId).to.equal(extensionName)
-             })
-             it('has "tabId" matching webContents id', function () {
-+=======
-+          describe('created extension', function () {
-+            it('has proper runtimeId', function () {
-+              expect(this.message).to.have.own.property('runtimeId')
-+              expect(this.message.runtimeId).to.equal(extensionName)
-+            })
-+            it('has tabId matching webContents id', function () {
-+>>>>>>> .their
-               expect(this.message).to.have.own.property('tabId')
-               expect(this.message.tabId).to.equal(w.webContents.id)
-             })
-changed in both
-  base   100644 c85220bce65785fc2face8a1d2934c9d9c204c79 spec/api-desktop-capturer-spec.js
-  our    100644 339d9756e40f8a532322800349b36d4371a2c9b0 spec/api-desktop-capturer-spec.js
-  their  100644 4ede734e6878ca029d1c67421f1e9de7d087d50c spec/api-desktop-capturer-spec.js
-@@ -8,7 +8,9 @@
- 
- const isCI = remote.getGlobal('isCi')
- 
--describe('desktopCapturer', () => {
-+// FIXME(alexeykuzmin): Crashes the app.
-+// Fix the crash and enable the tests.
-+xdescribe('desktopCapturer', () => {
-   before(function () {
-     if (!features.isDesktopCapturerEnabled()) {
-       // It's been disabled during build time.
-changed in both
-  base   100644 847462e2f48eca7bd5b5fe442fac4a5765542d88 spec/api-web-contents-spec.js
-  our    100644 be02cb3f84001a541d64b11fe6eda50fc32e8afd spec/api-web-contents-spec.js
-  their  100644 1cb169e769fa5becafebe6349c569e8738652d72 spec/api-web-contents-spec.js
-changed in both
-  base   100644 f87554f32e267b46fe3501405617a289b6cccedb spec/asar-spec.js
-  our    100644 489f68c96d41e80c308560a98486a07756a03be7 spec/asar-spec.js
-  their  100644 f087ceea2df00d05056f524bac2b6d2f43737a5d spec/asar-spec.js
-@@ -789,7 +789,9 @@
-       })
-     })
- 
--    describe('child_process.fork', function () {
-+    // TODO(alexeykuzmin): Fail on timeout.
-+    // Fix them and enable.
-+    xdescribe('child_process.fork', function () {
-       it('opens a normal js file', function (done) {
-         var child = ChildProcess.fork(path.join(fixtures, 'asar', 'a.asar', 'ping.js'))
-         child.on('message', function (msg) {
-changed in both
-  base   100644 3567ef56478a91a7b32a3acf7c99b700bdbca680 spec/webview-spec.js
-  our    100644 db75a4e3754e24a5e6740be61be4f4098c58006e spec/webview-spec.js
-  their  100644 649208bdbf290303ae81129c6e276f381330a95f spec/webview-spec.js
-@@ -1,6 +1,10 @@
- const assert = require('assert')
-+<<<<<<< .our
- const chai = require('chai')
- const dirtyChai = require('dirty-chai')
-+=======
-+const {expect} = require('chai')
-+>>>>>>> .their
- const path = require('path')
- const http = require('http')
- const url = require('url')
-@@ -895,9 +899,13 @@
- 
-     it('throws a custom error when an API method is called before the event is emitted', () => {
-       const expectedErrorMessage =
-+<<<<<<< .our
-           'Cannot call stop because the webContents is unavailable. ' +
-           'The WebView must be attached to the DOM ' +
-           'and the dom-ready event emitted before this method can be called.'
-+=======
-+          'Cannot call stop because the webContents is unavailable. The WebView must be attached to the DOM and the dom-ready event emitted before this method can be called.'
-+>>>>>>> .their
-       expect(() => { webview.stop() }).to.throw(expectedErrorMessage)
-     })
-   })
-@@ -1134,12 +1142,15 @@
-       const src = 'about:blank'
-       await loadWebView(webview, {src})
- 
-+<<<<<<< .our
-       const webviewContents = webview.getWebContents()
-       assert(webviewContents)
-       expect(webviewContents.getURL()).to.equal(src)
-     })
-   })
- 
-+=======
-+>>>>>>> .their
-   describe('document.visibilityState/hidden', () => {
-     afterEach(() => {
-       ipcMain.removeAllListeners('pong')
-@@ -1242,8 +1253,16 @@
-     })
-   })
- 
-+<<<<<<< .our
-   it('loads devtools extensions registered on the parent window', async () => {
-     const w = await openTheWindow({ show: false })
-+=======
-+  // TODO(alexeykuzmin): Enable the test.
-+  // The app crashes if this test and "devtools-opened event" tests
-+  // are run at the same time.
-+  it('loads devtools extensions registered on the parent window', (done) => {
-+    w = new BrowserWindow({ show: false })
-+>>>>>>> .their
-     BrowserWindow.removeDevToolsExtension('foo')
- 
-     const extensionPath = path.join(__dirname, 'fixtures', 'devtools-extensions', 'foo')
-@@ -1251,9 +1270,262 @@
- 
-     w.loadURL(`file://${fixtures}/pages/webview-devtools.html`)
- 
-+<<<<<<< .our
-     const [, {runtimeId, tabId}] = await emittedOnce(ipcMain, 'answer')
-     expect(runtimeId).to.equal('foo')
-     expect(tabId).to.be.not.equal(w.webContents.id)
-+=======
-+    ipcMain.once('answer', (event, message) => {
-+      assert.equal(message.runtimeId, 'foo')
-+      assert.notEqual(message.tabId, w.webContents.id)
-+      done()
-+    })
-+  })
-+
-+  // TODO(alexeykuzmin): Some tests rashe a renderer process.
-+  // Fix them and enable the tests.
-+  xdescribe('guestinstance attribute', () => {
-+    it('before loading there is no attribute', () => {
-+      document.body.appendChild(webview)
-+      assert(!webview.hasAttribute('guestinstance'))
-+    })
-+
-+    it('loading a page sets the guest view', (done) => {
-+      const loadListener = () => {
-+        webview.removeEventListener('did-finish-load', loadListener, false)
-+        const instance = webview.getAttribute('guestinstance')
-+        assert.equal(instance, parseInt(instance))
-+
-+        const guest = getGuestWebContents(parseInt(instance))
-+        assert.equal(guest, webview.getWebContents())
-+        done()
-+      }
-+      webview.addEventListener('did-finish-load', loadListener, false)
-+      webview.src = `file://${fixtures}/api/blank.html`
-+      document.body.appendChild(webview)
-+    })
-+
-+    it('deleting the attribute destroys the webview', (done) => {
-+      const loadListener = () => {
-+        webview.removeEventListener('did-finish-load', loadListener, false)
-+        const destroyListener = () => {
-+          webview.removeEventListener('destroyed', destroyListener, false)
-+          assert.equal(getGuestWebContents(instance), null)
-+          done()
-+        }
-+        webview.addEventListener('destroyed', destroyListener, false)
-+
-+        const instance = parseInt(webview.getAttribute('guestinstance'))
-+        webview.removeAttribute('guestinstance')
-+      }
-+      webview.addEventListener('did-finish-load', loadListener, false)
-+      webview.src = `file://${fixtures}/api/blank.html`
-+      document.body.appendChild(webview)
-+    })
-+
-+    it('setting the attribute on a new webview moves the contents', (done) => {
-+      const loadListener = () => {
-+        webview.removeEventListener('did-finish-load', loadListener, false)
-+        const webContents = webview.getWebContents()
-+        const instance = webview.getAttribute('guestinstance')
-+
-+        const destroyListener = () => {
-+          webview.removeEventListener('destroyed', destroyListener, false)
-+          assert.equal(webContents, webview2.getWebContents())
-+          // Make sure that events are hooked up to the right webview now
-+          webview2.addEventListener('console-message', (e) => {
-+            assert.equal(e.message, 'a')
-+            document.body.removeChild(webview2)
-+            done()
-+          })
-+
-+          webview2.src = `file://${fixtures}/pages/a.html`
-+        }
-+        webview.addEventListener('destroyed', destroyListener, false)
-+
-+        const webview2 = new WebView()
-+        webview2.setAttribute('guestinstance', instance)
-+        document.body.appendChild(webview2)
-+      }
-+      webview.addEventListener('did-finish-load', loadListener, false)
-+      webview.src = `file://${fixtures}/api/blank.html`
-+      document.body.appendChild(webview)
-+    })
-+
-+    it('setting the attribute to an invalid guestinstance does nothing', (done) => {
-+      const loadListener = () => {
-+        webview.removeEventListener('did-finish-load', loadListener, false)
-+        webview.setAttribute('guestinstance', 55)
-+
-+        // Make sure that events are still hooked up to the webview
-+        webview.addEventListener('console-message', (e) => {
-+          assert.equal(e.message, 'a')
-+          done()
-+        })
-+        webview.src = `file://${fixtures}/pages/a.html`
-+      }
-+      webview.addEventListener('did-finish-load', loadListener, false)
-+
-+      webview.src = `file://${fixtures}/api/blank.html`
-+      document.body.appendChild(webview)
-+    })
-+
-+    it('setting the attribute on an existing webview moves the contents', (done) => {
-+      const load1Listener = () => {
-+        webview.removeEventListener('did-finish-load', load1Listener, false)
-+        const webContents = webview.getWebContents()
-+        const instance = webview.getAttribute('guestinstance')
-+        let destroyedInstance
-+
-+        const destroyListener = () => {
-+          webview.removeEventListener('destroyed', destroyListener, false)
-+          assert.equal(webContents, webview2.getWebContents())
-+          assert.equal(null, getGuestWebContents(parseInt(destroyedInstance)))
-+
-+          // Make sure that events are hooked up to the right webview now
-+          webview2.addEventListener('console-message', (e) => {
-+            assert.equal(e.message, 'a')
-+            document.body.removeChild(webview2)
-+            done()
-+          })
-+
-+          webview2.src = 'file://' + fixtures + '/pages/a.html'
-+        }
-+        webview.addEventListener('destroyed', destroyListener, false)
-+
-+        const webview2 = new WebView()
-+        const load2Listener = () => {
-+          webview2.removeEventListener('did-finish-load', load2Listener, false)
-+          destroyedInstance = webview2.getAttribute('guestinstance')
-+          assert.notEqual(instance, destroyedInstance)
-+
-+          webview2.setAttribute('guestinstance', instance)
-+        }
-+        webview2.addEventListener('did-finish-load', load2Listener, false)
-+        webview2.src = 'file://' + fixtures + '/api/blank.html'
-+        document.body.appendChild(webview2)
-+      }
-+      webview.addEventListener('did-finish-load', load1Listener, false)
-+      webview.src = 'file://' + fixtures + '/api/blank.html'
-+      document.body.appendChild(webview)
-+    })
-+
-+    it('moving a guest back to its original webview should work', (done) => {
-+      const loadListener = () => {
-+        webview.removeEventListener('did-finish-load', loadListener, false)
-+        const webContents = webview.getWebContents()
-+        const instance = webview.getAttribute('guestinstance')
-+
-+        const destroy1Listener = () => {
-+          webview.removeEventListener('destroyed', destroy1Listener, false)
-+          assert.equal(webContents, webview2.getWebContents())
-+          assert.equal(null, webview.getWebContents())
-+
-+          const destroy2Listener = () => {
-+            webview2.removeEventListener('destroyed', destroy2Listener, false)
-+            assert.equal(webContents, webview.getWebContents())
-+            assert.equal(null, webview2.getWebContents())
-+
-+            // Make sure that events are hooked up to the right webview now
-+            webview.addEventListener('console-message', (e) => {
-+              assert.equal(e.message, 'a')
-+              document.body.removeChild(webview2)
-+              done()
-+            })
-+
-+            webview.src = `file://${fixtures}/pages/a.html`
-+          }
-+          webview2.addEventListener('destroyed', destroy2Listener, false)
-+          webview.setAttribute('guestinstance', instance)
-+        }
-+        webview.addEventListener('destroyed', destroy1Listener, false)
-+
-+        const webview2 = new WebView()
-+        webview2.setAttribute('guestinstance', instance)
-+        document.body.appendChild(webview2)
-+      }
-+      webview.addEventListener('did-finish-load', loadListener, false)
-+      webview.src = `file://${fixtures}/api/blank.html`
-+      document.body.appendChild(webview)
-+    })
-+
-+    it('setting the attribute on a webview in a different window moves the contents', (done) => {
-+      const loadListener = () => {
-+        webview.removeEventListener('did-finish-load', loadListener, false)
-+        const instance = webview.getAttribute('guestinstance')
-+
-+        w = new BrowserWindow({ show: false })
-+        w.webContents.once('did-finish-load', () => {
-+          ipcMain.once('pong', () => {
-+            assert(!webview.hasAttribute('guestinstance'))
-+            done()
-+          })
-+
-+          w.webContents.send('guestinstance', instance)
-+        })
-+        w.loadURL(`file://${fixtures}/pages/webview-move-to-window.html`)
-+      }
-+      webview.addEventListener('did-finish-load', loadListener, false)
-+      webview.src = `file://${fixtures}/api/blank.html`
-+      document.body.appendChild(webview)
-+    })
-+
-+    it('does not delete the guestinstance attribute when moving the webview to another parent node', (done) => {
-+      webview.addEventListener('dom-ready', function domReadyListener () {
-+        webview.addEventListener('did-attach', () => {
-+          assert(webview.guestinstance != null)
-+          assert(webview.getWebContents() != null)
-+          done()
-+        })
-+
-+        document.body.replaceChild(webview, div)
-+      })
-+      webview.src = `file://${fixtures}/pages/a.html`
-+
-+      const div = document.createElement('div')
-+      div.appendChild(webview)
-+      document.body.appendChild(div)
-+    })
-+
-+    it('does not destroy the webContents when hiding/showing the webview (regression)', (done) => {
-+      webview.addEventListener('dom-ready', function domReadyListener () {
-+        const instance = webview.getAttribute('guestinstance')
-+        assert(instance != null)
-+
-+        // Wait for event directly since attach happens asynchronously over IPC
-+        ipcMain.once('ELECTRON_GUEST_VIEW_MANAGER_ATTACH_GUEST', () => {
-+          assert(webview.getWebContents() != null)
-+          assert.equal(instance, webview.getAttribute('guestinstance'))
-+          done()
-+        })
-+
-+        webview.style.display = 'none'
-+        webview.offsetHeight // eslint-disable-line
-+        webview.style.display = 'block'
-+      })
-+      webview.src = `file://${fixtures}/pages/a.html`
-+      document.body.appendChild(webview)
-+    })
-+
-+    it('does not reload the webContents when hiding/showing the webview (regression)', (done) => {
-+      webview.addEventListener('dom-ready', function domReadyListener () {
-+        webview.addEventListener('did-start-loading', () => {
-+          done(new Error('webview started loading unexpectedly'))
-+        })
-+
-+        // Wait for event directly since attach happens asynchronously over IPC
-+        webview.addEventListener('did-attach', () => {
-+          done()
-+        })
-+
-+        webview.style.display = 'none'
-+        webview.offsetHeight  // eslint-disable-line
-+        webview.style.display = 'block'
-+      })
-+      webview.src = `file://${fixtures}/pages/a.html`
-+      document.body.appendChild(webview)
-+    })
-+>>>>>>> .their
-   })
- 
-   describe('DOM events', () => {
-changed in both
-  base   100644 f4cc9df68d54b62358834054f4a4cf129cce59ba toolchain.gypi
-  our    100644 697add78e42191741cee1b015cdcf4f801c570e7 toolchain.gypi
-  their  100644 f1c675ca558181ed847e7aef80d740a7c2fd786c toolchain.gypi
-@@ -36,10 +36,10 @@
-     'use_lto_o2%': 0,
- 
-     'conditions': [
--      # Do not use Clang on Windows or when building for mips64el.
--      ['OS=="win" or target_arch=="mips64el"', {
-+      # Do not use Clang when building for mips64el.
-+      ['target_arch=="mips64el"', {
-         'clang%': 0,
--      }],  # OS=="win"
-+      }],  # target_arch=="mips64el"
- 
-       # Search for the available version of SDK.
-       ['OS=="mac"', {
-changed in both
-  base   160000 90df5e9e88810a49a2e0db71f4e8d3a635108efa vendor/libchromiumcontent
-  our    160000 c85470a1c379b1c4bedb372c146521bc4be9b75d vendor/libchromiumcontent
-  their  160000 ce478b8e2ae2da549beb61b521f09e7584eb289e vendor/libchromiumcontent
-removed in local
-  base   160000 02693839ca2570a5f14b4270573c91cbf1bd9b1d vendor/native_mate
-  their  160000 875706f66008e03a0c7a699de16d7e2bde0efb90 vendor/native_mate
-changed in both
-  base   160000 538a5023af0a92ba19de2420a0eada6ad4cd18f6 vendor/node
-  our    160000 ece0a06ac8147efb5b5af431c21f312f1884616e vendor/node
-  their  160000 ea3592dc23ce43feb5aaa2990303fa5683404ff5 vendor/node
diff --git a/app/test/fixtures/merge-parser/electron/merge-test-context-id-2-0-x-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-test-context-id-2-0-x-into-master.txt
deleted file mode 100644
index 9babf570424..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-test-context-id-2-0-x-into-master.txt
+++ /dev/null
@@ -1,31402 +0,0 @@
-added in both
-  our    100644 6d44d618aabcce04c60344f2274dec5b0c2a1f68 .circleci/config.yml
-  their  100644 7bc5ddc6be0269ab0ed88cc2a569de36ba93e5fa .circleci/config.yml
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- notify-slack-failure: &notify-slack-failure
-   run:
-     name: Send a slack notification on failure
-@@ -19,6 +20,8 @@
-       fi
-     when: on_success
- 
-+=======
-+>>>>>>> .their
- build-steps: &build-steps
-   steps:
-     - checkout
-@@ -122,7 +125,11 @@
-               script/verify-ffmpeg.py
-             else
-               echo 'Verifying ffmpeg on release build'
-+<<<<<<< .our
-               script/verify-ffmpeg.py -c R
-+=======
-+              script/verify-ffmpeg.py -R
-+>>>>>>> .their
-             fi
-           else
-             echo 'Skipping tests due to configuration'
-@@ -134,8 +141,11 @@
-           if [ "$CREATE_TYPESCRIPT_DEFS" == "true" ]; then
-             npm run create-typescript-definitions
-           fi
-+<<<<<<< .our
-     - <<: *notify-slack-failure
-     - <<: *notify-slack-success
-+=======
-+>>>>>>> .their
-     - persist_to_workspace:
-         root: out
-         paths:
-@@ -147,6 +157,7 @@
-     - store_artifacts:
-         path: out
- 
-+<<<<<<< .our
- gn-build-steps: &gn-build-steps
-   steps:
-     - run:
-@@ -344,6 +355,8 @@
-     xcode: "8.3.3"
-   resource_class: large
- 
-+=======
-+>>>>>>> .their
- build-defaults: &build-defaults
-   docker:
-     - image: electronbuilds/electron:0.0.8
-@@ -386,7 +399,10 @@
-     environment:
-       TARGET_ARCH: arm
-       RUN_RELEASE_BUILD: true
-+<<<<<<< .our
-       NIGHTLY_BUILD: true
-+=======
-+>>>>>>> .their
-     <<: *build-defaults
-     resource_class: 2xlarge
- 
-@@ -425,7 +441,10 @@
-     environment:
-       TARGET_ARCH: arm64
-       RUN_RELEASE_BUILD: true
-+<<<<<<< .our
-       NIGHTLY_BUILD: true
-+=======
-+>>>>>>> .their
-     <<: *build-defaults
-     resource_class: 2xlarge
- 
-@@ -442,7 +461,10 @@
-     environment:
-       TARGET_ARCH: ia32
-       RUN_RELEASE_BUILD: true
-+<<<<<<< .our
-       NIGHTLY_BUILD: true
-+=======
-+>>>>>>> .their
-     <<: *build-defaults
-     resource_class: xlarge
- 
-@@ -466,7 +488,10 @@
-     environment:
-       TARGET_ARCH: x64
-       RUN_RELEASE_BUILD: true
-+<<<<<<< .our
-       NIGHTLY_BUILD: true
-+=======
-+>>>>>>> .their
-     <<: *build-defaults
-     resource_class: xlarge
- 
-@@ -484,7 +509,10 @@
-       TARGET_ARCH: x64
-       RUN_RELEASE_BUILD: true
-       INSTALL_MACOS_NODE: true
-+<<<<<<< .our
-       NIGHTLY_BUILD: true
-+=======
-+>>>>>>> .their
-     macos:
-       xcode: "8.3.3"
-     <<: *build-steps
-@@ -505,11 +533,15 @@
-       MAS_BUILD: 1
-       RUN_RELEASE_BUILD: true
-       INSTALL_MACOS_NODE: true
-+<<<<<<< .our
-       NIGHTLY_BUILD: true
-+=======
-+>>>>>>> .their
-     macos:
-       xcode: "8.3.3"
-     <<: *build-steps
- 
-+<<<<<<< .our
-   electron-gn-linux-x64-debug-fyi:
-     environment:
-       DISPLAY: ':99.0'
-@@ -668,6 +700,8 @@
-       GN_EXTRA_ARGS: 'is_mas_build = true'
-     <<: *gn-mac-build-machine
-     <<: *gn-mac-build-steps
-+=======
-+>>>>>>> .their
- 
- workflows:
-   version: 2
-@@ -695,6 +729,7 @@
-   build-mas-x64:
-     jobs:
-       - electron-mas-x64
-+<<<<<<< .our
-   build-gn-linux:
-     jobs:
-       - electron-gn-linux-x64-debug-fyi
-@@ -711,6 +746,8 @@
-       - electron-gn-mas-testing-fyi
-       - electron-gn-osx-debug-fyi
-       - electron-gn-osx-testing-fyi
-+=======
-+>>>>>>> .their
- 
-   nightly-release-test:
-     triggers:
-@@ -720,7 +757,10 @@
-             branches:
-               only:
-                 - master
-+<<<<<<< .our
-                 - 3-0-x
-+=======
-+>>>>>>> .their
-                 - 2-0-x
-                 - 1-8-x
-                 - 1-7-x
-@@ -730,6 +770,7 @@
-       - electron-linux-ia32-release-nightly
-       - electron-linux-x64-release-nightly
- 
-+<<<<<<< .our
-   nightly-gn-release-test:
-     triggers:
-       - schedule:
-@@ -745,3 +786,13 @@
-       - electron-gn-linux-arm64-release-fyi
-       - electron-gn-mas-release-fyi
-       - electron-gn-osx-release-fyi
-+=======
-+experimental:
-+  notify:
-+    branches:
-+      only:
-+        - master
-+        - 2-0-x
-+        - 1-8-x
-+        - 1-7-x
-+>>>>>>> .their
-added in both
-  our    100644 e9c110640201b62255ffa62eea2a6f4ccbadb34f .github/ISSUE_TEMPLATE.md
-  their  100644 7a21d0e22a6442a1cc509acbdb4ca9bf865a3014 .github/ISSUE_TEMPLATE.md
-@@ -7,11 +7,19 @@
- - If you need general advice, join our Slack: http://atom-slack.herokuapp.com
- -->
- 
-+<<<<<<< .our
- * Output of `node_modules/.bin/electron --version`:
- * Operating System (Platform and Version):
- 
- <!-- If this used to work -->
- * Output of `node_modules/.bin/electron --version` on last known working Electron version (if applicable):
-+=======
-+* Electron version:
-+* Operating system:
-+
-+<!-- If this used to work -->
-+* Last known working Electron version: 
-+>>>>>>> .their
- 
- ### Expected behavior
- 
-added in both
-  our    100644 10cb69a7a8e4ca3b2e9ca08515eacced297bb277 .github/ISSUE_TEMPLATE/Bug_report.md
-  their  100644 a5cad57bfaef1e29296926448a251d1fe3e5419f .github/ISSUE_TEMPLATE/Bug_report.md
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- ---
- name: Bug report
- about: Create a report to help us improve Electron
-@@ -30,3 +31,37 @@
- 
- **Additional Information**
- Add any other context about the problem here.
-+=======
-+---
-+name: Bug report
-+about: Create a report to help us improve Electron
-+
-+---
-+
-+* Electron Version:
-+* Operating System (Platform and Version):
-+* Last known working Electron version: 
-+
-+**Expected Behavior**
-+A clear and concise description of what you expected to happen.
-+
-+**Actual behavior**
-+A clear and concise description of what actually happened.
-+
-+**To Reproduce**
-+Your best chance of getting this bug looked at quickly is to provide a REPOSITORY that can be cloned and run.
-+
-+You can fork [electron-quick-start](https://github.com/electron/electron-quick-start) and include a link to the branch with your changes.
-+
-+If you provide a URL, please list the commands required to clone/setup/run your repo e.g.
-+```sh
-+$ git clone $YOUR_URL -b $BRANCH
-+$ npm install
-+$ npm start || electron .
-+```
-+**Screenshots**
-+If applicable, add screenshots to help explain your problem.
-+
-+**Additional Information**
-+Add any other context about the problem here.
-+>>>>>>> .their
-added in both
-  our    100644 51c2e6c8d52c9343a0853d2d2ec5b205a3aca790 .github/ISSUE_TEMPLATE/Feature_request.md
-  their  100644 9f3aa9e21d7bf082f3d486f49603406bb10fd8f5 .github/ISSUE_TEMPLATE/Feature_request.md
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- ---
- name: Feature request
- about: Suggest an idea for Electron
-@@ -15,3 +16,22 @@
- 
- **Additional context**
- Add any other context or screenshots about the feature request here.
-+=======
-+---
-+name: Feature request
-+about: Suggest an idea for Electron
-+
-+---
-+
-+**Is your feature request related to a problem? Please describe.**
-+A clear and concise description of what the problem is.
-+
-+**Describe the solution you'd like**
-+A clear and concise description of what you want to happen.
-+
-+**Describe alternatives you've considered**
-+A clear and concise description of any alternative solutions or features you've considered.
-+
-+**Additional context**
-+Add any other context or screenshots about the feature request here.
-+>>>>>>> .their
-added in both
-  our    100644 67a1646fee28c2c19cd1ec7301b587c0c8d6cb66 .github/PULL_REQUEST_TEMPLATE.md
-  their  100644 9a2d96970f629ee5eedadaac694d2423f6fb6005 .github/PULL_REQUEST_TEMPLATE.md
-@@ -1,4 +1,7 @@
-+<<<<<<< .our
- ##### Description of Change
-+=======
-+>>>>>>> .their
- <!--
- Thank you for your Pull Request. Please provide a description above and review
- the requirements below.
-@@ -13,10 +16,14 @@
- - [ ] `npm test` passes
- - [ ] tests are [changed or added](https://github.com/electron/electron/blob/master/docs/development/testing.md)
- - [ ] relevant documentation is changed or added
-+<<<<<<< .our
- - [ ] PR title follows semantic [commit guidelines](https://github.com/electron/electron/blob/master/docs/development/pull-requests.md#commit-message-guidelines)
- 
- 
- ##### Release Notes
- <!-- Used to describe release notes for future release versions. See https://github.com/electron/clerk/blob/master/README.md for details. -->
- 
--Notes: <!-- One-line Change Summary Here-->
-\ No newline at end of file
-+Notes: <!-- One-line Change Summary Here-->
-+=======
-+- [ ] commit messages or PR title follow semantic [commit guidelines](https://github.com/electron/electron/blob/master/docs/development/pull-requests.md#commit-message-guidelines)
-+>>>>>>> .their
-added in both
-  our    100644 ff8d1b64f1b2f68ceaf63ce74ede3b01625586ba .github/config.yml
-  their  100644 3c222c2f14dcbcab344059e6e4031edec6935f3c .github/config.yml
-@@ -12,7 +12,11 @@
- newPRWelcomeComment: |
-   💖 Thanks for opening this pull request! 💖
- 
-+<<<<<<< .our
-   We use [semantic commit messages](https://github.com/electron/electron/blob/master/docs/development/pull-requests.md#commit-message-guidelines) to streamline the release process. Before your pull request can be merged, you should **update your pull request title** to start with a semantic prefix.
-+=======
-+  We use [semantic commit messages](https://github.com/electron/electron/blob/master/docs/development/pull-requests.md#commit-message-guidelines) to streamline the release process. Before your pull request can be merged, you should **update your pull request title** to start with a semantic prefix, OR prefix at least one of your commit messages.
-+>>>>>>> .their
- 
-   Examples of commit messages with semantic prefixes:
- 
-added in both
-  our    100644 f393b1cdcef87b41bb3ed47ebae59757fed3a780 .gitignore
-  their  100644 665fb6fa10444592991a714828b60ca08daa4a2f .gitignore
-@@ -50,5 +50,8 @@
- # npm package
- /npm/dist
- /npm/path.txt
-+<<<<<<< .our
- 
--.npmrc
-\ No newline at end of file
-+.npmrc
-+=======
-+>>>>>>> .their
-added in both
-  our    100644 d00c4b1e3d3523641210ff20fda41d76c9eb546c BUILD.gn
-  their  100644 4a71e5550f6c7b8b74fcd15ceffdace06c8f9f52 BUILD.gn
-@@ -1,5 +1,6 @@
- import("//build/config/locales.gni")
- import("//tools/grit/repack.gni")
-+<<<<<<< .our
- import("//tools/v8_context_snapshot/v8_context_snapshot.gni")
- import("build/asar.gni")
- import("build/npm.gni")
-@@ -7,6 +8,10 @@
- import("//build/config/win/manifest.gni")
- import("electron_paks.gni")
- import("//third_party/ffmpeg/ffmpeg_options.gni")
-+=======
-+import("build/asar.gni")
-+import("build/npm.gni")
-+>>>>>>> .their
- 
- if (is_mac) {
-   import("//build/config/mac/rules.gni")
-@@ -31,6 +36,7 @@
- 
-   enable_desktop_capturer = true
-   enable_run_as_node = true
-+<<<<<<< .our
-   enable_osr = false
- }
- 
-@@ -47,6 +53,20 @@
-                 ],
-                 "scope",
-                 [ "filenames.gypi" ])
-+=======
-+  enable_osr = true
-+}
-+
-+filenames_gypi = exec_script(
-+  "//build/gypi_to_gn.py",
-+  [
-+    rebase_path("filenames.gypi"),
-+    "--replace=<(SHARED_INTERMEDIATE_DIR)=$target_gen_dir",
-+  ],
-+  "scope",
-+  [ "filenames.gypi" ]
-+)
-+>>>>>>> .their
- 
- config("branding") {
-   defines = [
-@@ -68,6 +88,7 @@
-   }
- }
- 
-+<<<<<<< .our
- npm_action("atom_browserify_sandbox") {
-   deps = [
-     ":atom_js2c_copy",
-@@ -85,6 +106,59 @@
-     "./lib/sandboxed_renderer/api/exports/path.js:path",
-     "-r",
-     "./lib/sandboxed_renderer/api/exports/child_process.js:child_process",
-+=======
-+config("native_mate_config") {
-+  include_dirs = [
-+    "//third_party/native_mate",
-+  ]
-+  cflags_cc = [
-+    "-Wno-deprecated-declarations",
-+  ]
-+  cflags_objcc = cflags_cc
-+}
-+
-+source_set("native_mate") {
-+  deps = [
-+    "//base",
-+    "//net",
-+    "//v8:v8_headers",
-+    "build/node",
-+  ]
-+  public_configs = [ ":native_mate_config" ]
-+  sources = [
-+    "//third_party/native_mate/native_mate/arguments.cc",
-+    "//third_party/native_mate/native_mate/arguments.h",
-+    "//third_party/native_mate/native_mate/compat.h",
-+    "//third_party/native_mate/native_mate/constructor.h",
-+    "//third_party/native_mate/native_mate/converter.cc",
-+    "//third_party/native_mate/native_mate/converter.h",
-+    "//third_party/native_mate/native_mate/dictionary.cc",
-+    "//third_party/native_mate/native_mate/dictionary.h",
-+    "//third_party/native_mate/native_mate/function_template.cc",
-+    "//third_party/native_mate/native_mate/function_template.h",
-+    "//third_party/native_mate/native_mate/handle.h",
-+    "//third_party/native_mate/native_mate/object_template_builder.cc",
-+    "//third_party/native_mate/native_mate/object_template_builder.h",
-+    "//third_party/native_mate/native_mate/persistent_dictionary.cc",
-+    "//third_party/native_mate/native_mate/persistent_dictionary.h",
-+    "//third_party/native_mate/native_mate/scoped_persistent.h",
-+    "//third_party/native_mate/native_mate/wrappable.cc",
-+    "//third_party/native_mate/native_mate/wrappable.h",
-+    "//third_party/native_mate/native_mate/wrappable_base.h",
-+  ]
-+}
-+
-+npm_action("atom_browserify_sandbox") {
-+  deps = [ ":atom_js2c_copy" ]
-+
-+  sandbox_args = [
-+    "lib/sandboxed_renderer/init.js",
-+    "-r", "./lib/sandboxed_renderer/api/exports/electron.js:electron",
-+    "-r", "./lib/sandboxed_renderer/api/exports/fs.js:fs",
-+    "-r", "./lib/sandboxed_renderer/api/exports/os.js:os",
-+    "-r", "./lib/sandboxed_renderer/api/exports/path.js:path",
-+    "-r", "./lib/sandboxed_renderer/api/exports/child_process.js:child_process",
-+>>>>>>> .their
-   ]
- 
-   inputs = [
-@@ -95,6 +169,7 @@
-     "lib/sandboxed_renderer/api/exports/path.js",
-     "lib/sandboxed_renderer/api/exports/child_process.js",
-   ]
-+<<<<<<< .our
-   outputs = [
-     "$target_gen_dir/js2c/preload_bundle.js",
-   ]
-@@ -123,6 +198,26 @@
-            "-o",
-            rebase_path(outputs[0]),
-          ]
-+=======
-+  outputs = [ "$target_gen_dir/js2c/preload_bundle.js" ]
-+
-+  script = "browserify"
-+  args = sandbox_args + [
-+    "-o", rebase_path(outputs[0])
-+  ]
-+}
-+
-+npm_action("atom_browserify_isolated") {
-+  deps = [ ":atom_js2c_copy" ]
-+
-+  inputs = [ "lib/isolated_renderer/init.js" ]
-+  outputs = [ "$target_gen_dir/js2c/isolated_bundle.js" ]
-+
-+  script = "browserify"
-+  args = inputs + [
-+    "-o", rebase_path(outputs[0])
-+  ]
-+>>>>>>> .their
- }
- 
- copy("atom_js2c_copy") {
-@@ -130,16 +225,26 @@
-     "lib/common/asar.js",
-     "lib/common/asar_init.js",
-   ]
-+<<<<<<< .our
-   outputs = [
-     "$target_gen_dir/js2c/{{source_file_part}}",
-   ]
-+=======
-+  outputs = [ "$target_gen_dir/js2c/{{source_file_part}}" ]
-+>>>>>>> .their
- }
- 
- action("atom_js2c") {
-   deps = [
-+<<<<<<< .our
-     ":atom_browserify_isolated",
-     ":atom_browserify_sandbox",
-     ":atom_js2c_copy",
-+=======
-+    ":atom_js2c_copy",
-+    ":atom_browserify_sandbox",
-+    ":atom_browserify_isolated",
-+>>>>>>> .their
-   ]
- 
-   js2c_sources = filenames_gypi.js2c_sources
-@@ -151,6 +256,7 @@
- 
-   inputs = js2c_sources + browserify_sources
- 
-+<<<<<<< .our
-   outputs = [
-     "$target_gen_dir/atom_natives.h",
-   ]
-@@ -159,10 +265,21 @@
-   args = [ rebase_path("//third_party/electron_node") ] +
-          rebase_path(outputs, root_build_dir) +
-          [ rebase_path("$target_gen_dir/js2c", root_build_dir) ]
-+=======
-+  outputs = [ "$target_gen_dir/atom_natives.h" ]
-+
-+  script = "tools/js2c.py"
-+  args = [
-+    rebase_path("//third_party/electron_node")
-+  ] + rebase_path(outputs, root_build_dir) + [
-+    rebase_path("$target_gen_dir/js2c", root_build_dir)
-+  ]
-+>>>>>>> .their
- }
- 
- asar("js2asar") {
-   sources = filenames_gypi.js_sources
-+<<<<<<< .our
-   if (enable_desktop_capturer) {
-     sources += [
-       "lib/browser/desktop-capturer.js",
-@@ -172,11 +289,15 @@
-   outputs = [
-     "$root_out_dir/resources/electron.asar",
-   ]
-+=======
-+  outputs = [ "$root_out_dir/resources/electron.asar" ]
-+>>>>>>> .their
-   root = "lib"
- }
- 
- asar("app2asar") {
-   sources = filenames_gypi.default_app_sources
-+<<<<<<< .our
-   outputs = [
-     "$root_out_dir/resources/default_app.asar",
-   ]
-@@ -187,10 +308,25 @@
-   configs += [ "//v8:external_startup_data" ]
-   configs += [ "//third_party/electron_node:node_internals" ]
- 
-+=======
-+  outputs = [ "$root_out_dir/resources/default_app.asar" ]
-+  root = "default_app"
-+}
-+
-+group("electron") {
-+  deps = [ ":electron_lib" ]
-+}
-+
-+static_library("electron_lib") {
-+  configs += [
-+    "//v8:external_startup_data",
-+  ]
-+>>>>>>> .their
-   public_configs = [
-     ":branding",
-     ":features",
-   ]
-+<<<<<<< .our
- 
-   deps = [
-     ":atom_js2c",
-@@ -198,15 +334,22 @@
-     "native_mate",
-     "//base",
-     "//base:i18n",
-+=======
-+  deps = [
-+>>>>>>> .their
-     "//chrome/common:constants",
-     "//components/cdm/renderer",
-     "//components/network_session_configurator/common",
-     "//components/prefs",
-     "//components/printing/common",
-     "//components/security_state/content",
-+<<<<<<< .our
-     "//components/viz/service",
-     "//content/public/app:both",
-     "//content/public/child",
-+=======
-+    "//content/public/browser",
-+>>>>>>> .their
-     "//device/geolocation",
-     "//gin",
-     "//net:net_resources",
-@@ -214,6 +357,7 @@
-     "//ppapi/proxy",
-     "//ppapi/shared_impl",
-     "//printing",
-+<<<<<<< .our
-     "//services/device/wake_lock/power_save_blocker",  # TODO: this requires a visibility patch to chromium src
-     "//skia",
-     "//third_party/WebKit/public:blink",
-@@ -228,10 +372,64 @@
-     "//v8",
-   ]
- 
-+=======
-+    "//services/device/wake_lock/power_save_blocker", # TODO: this requires a visibility patch to chromium src
-+    "//skia",
-+    "//third_party/WebKit/public:blink",
-+    "//third_party/boringssl",
-+    "//third_party/crashpad/crashpad/client",
-+    "//third_party/leveldatabase",
-+    "//third_party/libyuv",
-+    "//third_party/webrtc/modules/desktop_capture",
-+    "//third_party/webrtc/modules/desktop_capture:primitives",
-+    "//ui/events:dom_keycode_converter",
-+    "//ui/views",
-+    "//v8",
-+    ":atom_js2c",
-+    ":native_mate",
-+    "brightray",
-+    "build/node",
-+  ]
-+  if (is_mac) {
-+    deps += [
-+      "//ui/accelerated_widget_mac",
-+      "//base/allocator:features",
-+    ]
-+  }
-+  if (is_linux) {
-+    deps += [
-+      "//build/config/linux/gtk3",
-+      "//chrome/browser/ui/libgtkui",
-+      "//device/bluetooth",
-+      "//third_party/breakpad:client",
-+      "//ui/events/devices/x11",
-+      "//ui/events/platform/x11",
-+      "//ui/native_theme",
-+      "//ui/views/controls/webview",
-+      "//ui/wm",
-+    ]
-+    configs += [ ":gio_unix" ]
-+  }
-+  defines = [
-+    # This is defined in skia/skia_common.gypi.
-+    "SK_SUPPORT_LEGACY_GETTOPDEVICE",
-+    # Disable warnings for g_settings_list_schemas.
-+    "GLIB_DISABLE_DEPRECATION_WARNINGS",
-+
-+    # Import V8 symbols from shared library (node.dll / libnode.so)
-+    "USING_V8_SHARED",
-+    "USING_V8_PLATFORM_SHARED",
-+    "USING_V8_BASE_SHARED",
-+
-+    # Enables SkBitmap size 64 operations
-+    #"SK_SUPPORT_LEGACY_SAFESIZE64", # doesn't seem to be needed to build?
-+  ]
-+>>>>>>> .their
-   include_dirs = [
-     "chromium_src",
-     ".",
-     "$target_gen_dir",
-+<<<<<<< .our
- 
-     # TODO(nornagon): replace usage of SchemeRegistry by an actually exported
-     # API of blink, then delete this include dir.
-@@ -240,6 +438,21 @@
- 
-   defines = []
-   libs = []
-+=======
-+    # TODO(nornagon): replace usage of SchemeRegistry by an actually exported
-+    # API of blink, then delete this include dir.
-+    "//third_party/WebKit/Source",
-+    # NOTE(nornagon): other chromium files use the full path to include
-+    # crashpad; this is just here for compatibility between GN and GYP, so that
-+    # the #includes can be agnostic about where crashpad is vendored.
-+    "//third_party/crashpad",
-+  ]
-+  if (is_linux) {
-+    include_dirs += [
-+      "//third_party/breakpad",
-+    ]
-+  }
-+>>>>>>> .their
- 
-   extra_source_filters = []
-   if (!is_linux) {
-@@ -249,7 +462,10 @@
-       "*_x11.cc",
-       "*_gtk.h",
-       "*_gtk.cc",
-+<<<<<<< .our
-       "*\blibrary_loaders/*",
-+=======
-+>>>>>>> .their
-     ]
-   }
-   if (!is_win) {
-@@ -268,6 +484,7 @@
-     ]
-   }
- 
-+<<<<<<< .our
-   set_sources_assignment_filter(
-       sources_assignment_filter + extra_source_filters)
-   sources = filenames_gypi.lib_sources
-@@ -349,6 +566,12 @@
-     deps += [ "//pdf" ]
-   }
- 
-+=======
-+  set_sources_assignment_filter(sources_assignment_filter + extra_source_filters)
-+  sources = filenames_gypi.lib_sources
-+  set_sources_assignment_filter(sources_assignment_filter)
-+
-+>>>>>>> .their
-   if (enable_run_as_node) {
-     sources += [
-       "atom/app/node_main.cc",
-@@ -371,18 +594,27 @@
-       "atom/browser/osr/osr_web_contents_view_mac.mm",
-     ]
-     deps += [
-+<<<<<<< .our
-       "//components/viz/service",
-       "//ui/compositor",
-+=======
-+      "//ui/compositor",
-+      "//components/viz/service",
-+>>>>>>> .their
-     ]
-   }
- 
-   if (enable_desktop_capturer) {
-+<<<<<<< .our
-     deps += [ "//third_party/webrtc/modules/desktop_capture" ]
-+=======
-+>>>>>>> .their
-     sources += [
-       "atom/browser/api/atom_api_desktop_capturer.cc",
-       "atom/browser/api/atom_api_desktop_capturer.h",
-     ]
-   }
-+<<<<<<< .our
- }
- 
- electron_paks("packed_resources") {
-@@ -391,32 +623,69 @@
-     copy_data_to_bundle = true
-   } else {
-     output_dir = root_out_dir
-+=======
-+
-+  if (is_mac) {
-+    libs = [
-+      "Squirrel.framework",
-+      "ReactiveCocoa.framework",
-+      "Mantle.framework",
-+    ]
-+    cflags_objcc = [
-+      "-F", rebase_path("external_binaries", root_build_dir)
-+    ]
-+    if (true) { # !is_mas_build
-+      # ReactiveCocoa which is used by Squirrel requires using __weak.
-+      cflags_objcc += [ "-fobjc-weak" ]
-+    }
-+  }
-+  if (is_linux) {
-+    sources += filenames_gypi.lib_sources_linux
-+    sources += filenames_gypi.lib_sources_nss
-+>>>>>>> .their
-   }
- }
- 
- if (is_mac) {
-   electron_framework_name = electron_product_name + " Framework"
-   electron_helper_name = electron_product_name + " Helper"
-+<<<<<<< .our
-   electron_login_helper_name = electron_product_name + " Login Helper"
-+=======
-+>>>>>>> .their
-   electron_framework_version = "A"
-   electron_mac_bundle_id = "com.$electron_company_abbr.$electron_project_name"
- 
-   mac_xib_bundle_data("electron_xibs") {
-+<<<<<<< .our
-     sources = [
-       "atom/common/resources/mac/MainMenu.xib",
-     ]
-+=======
-+    sources = [ "atom/common/resources/mac/MainMenu.xib" ]
-+>>>>>>> .their
-   }
- 
-   bundle_data("electron_framework_resources") {
-     public_deps = [
-+<<<<<<< .our
-       ":packed_resources",
-     ]
-     sources = []
-+=======
-+      "//content/shell:pak",
-+      ":electron_locales",
-+    ]
-+    sources = [
-+      "$root_out_dir/content_shell.pak",
-+    ]
-+>>>>>>> .their
-     if (icu_use_data_file) {
-       sources += [ "$root_out_dir/icudtl.dat" ]
-       public_deps += [ "//third_party/icu:icudata" ]
-     }
-     if (v8_use_external_startup_data) {
-+<<<<<<< .our
-       sources += [ "$root_out_dir/natives_blob.bin" ]
-       public_deps += [ "//v8" ]
-       if (use_v8_context_snapshot) {
-@@ -425,12 +694,20 @@
-       } else {
-         sources += [ "$root_out_dir/snapshot_blob.bin" ]
-       }
-+=======
-+      sources += [
-+        "$root_out_dir/natives_blob.bin",
-+        "$root_out_dir/snapshot_blob.bin",
-+      ]
-+      public_deps += [ "//v8" ]
-+>>>>>>> .their
-     }
-     outputs = [
-       "{{bundle_resources_dir}}/{{source_file_part}}",
-     ]
-   }
- 
-+<<<<<<< .our
-   if (!is_component_build) {
-     bundle_data("electron_framework_libraries") {
-       sources = []
-@@ -453,6 +730,19 @@
-   }
- 
-   bundle_data("electron_crashpad_helper") {
-+=======
-+  bundle_data("electron_framework_libraries") {
-+    public_deps = [ "build/node" ]
-+    sources = [
-+      "$root_out_dir/libnode.dylib"
-+    ]
-+    outputs = [
-+      "{{bundle_contents_dir}}/Libraries/{{source_file_part}}"
-+    ]
-+  }
-+
-+  bundle_data("electron_framework_helpers") {
-+>>>>>>> .their
-     sources = [
-       "$root_out_dir/crashpad_handler",
-     ]
-@@ -470,6 +760,7 @@
-     output_name = electron_framework_name
-     framework_version = electron_framework_version
-     framework_contents = [ "Resources" ]
-+<<<<<<< .our
-     public_deps = [
-       ":electron_lib",
-     ]
-@@ -485,6 +776,25 @@
-     extra_substitutions = [ "ATOM_BUNDLE_ID=$electron_mac_bundle_id.framework" ]
- 
-     include_dirs = [ "." ]
-+=======
-+    public_deps = [ ":electron_lib" ]
-+    deps = [
-+      "//base",
-+      "//base:i18n",
-+      ":electron_framework_helpers",
-+      ":electron_framework_libraries",
-+      ":electron_framework_resources",
-+      ":electron_xibs",
-+    ]
-+    info_plist = "atom/common/resources/mac/Info.plist"
-+    extra_substitutions = [
-+      "ATOM_BUNDLE_ID=$electron_mac_bundle_id.framework",
-+    ]
-+
-+    include_dirs = [
-+      ".",
-+    ]
-+>>>>>>> .their
-     sources = filenames_gypi.framework_sources
- 
-     libs = [
-@@ -497,8 +807,12 @@
-       "StoreKit.framework",
-     ]
-     ldflags = [
-+<<<<<<< .our
-       "-F",
-       rebase_path("external_binaries", root_build_dir),
-+=======
-+      "-F", rebase_path("external_binaries", root_build_dir),
-+>>>>>>> .their
-       "-Wl,-install_name,@rpath/$output_name.framework/$output_name",
-       "-rpath",
-       "@loader_path/Libraries",
-@@ -506,13 +820,18 @@
-     if (is_component_build) {
-       ldflags += [
-         "-rpath",
-+<<<<<<< .our
-         "@executable_path/../../../../../..",
-+=======
-+        "@executable_path/../../../../../.."
-+>>>>>>> .their
-       ]
-     }
-   }
- 
-   mac_app_bundle("electron_helper_app") {
-     output_name = electron_helper_name
-+<<<<<<< .our
-     deps = [
-       ":electron_framework+link",
-     ]
-@@ -520,6 +839,15 @@
-     include_dirs = [ "." ]
-     info_plist = "atom/renderer/resources/mac/Info.plist"
-     extra_substitutions = [ "ATOM_BUNDLE_ID=$electron_mac_bundle_id.helper" ]
-+=======
-+    deps = [ ":electron_framework+link" ]
-+    sources = filenames_gypi.app_sources
-+    include_dirs = [ "." ]
-+    info_plist = "atom/renderer/resources/mac/Info.plist"
-+    extra_substitutions = [
-+      "ATOM_BUNDLE_ID=$electron_mac_bundle_id.helper",
-+    ]
-+>>>>>>> .their
-     ldflags = [
-       "-rpath",
-       "@executable_path/../../..",
-@@ -530,6 +858,7 @@
-     sources = [
-       "$root_out_dir/$electron_framework_name.framework",
-       "$root_out_dir/$electron_helper_name.app",
-+<<<<<<< .our
-     ]
-     if (!is_mas_build) {
-       sources += [
-@@ -538,6 +867,12 @@
-         "external_binaries/Squirrel.framework",
-       ]
-     }
-+=======
-+      "external_binaries/Squirrel.framework",
-+      "external_binaries/ReactiveCocoa.framework",
-+      "external_binaries/Mantle.framework",
-+    ]
-+>>>>>>> .their
-     outputs = [
-       "{{bundle_contents_dir}}/Frameworks/{{source_file_part}}",
-     ]
-@@ -547,6 +882,7 @@
-     ]
-   }
- 
-+<<<<<<< .our
-   mac_app_bundle("electron_login_helper") {
-     output_name = electron_login_helper_name
-     sources = filenames_gypi.login_helper_sources
-@@ -581,6 +917,44 @@
-     outputs = [
-       "{{bundle_resources_dir}}/{{source_file_part}}",
-     ]
-+=======
-+  bundle_data("electron_app_resources") {
-+    public_deps = [
-+      ":js2asar",
-+      ":app2asar",
-+    ]
-+    sources = [
-+      "$root_out_dir/resources/electron.asar",
-+      "$root_out_dir/resources/default_app.asar",
-+    ]
-+    outputs = [
-+      "{{bundle_resources_dir}}/{{source_file_part}}"
-+    ]
-+  }
-+
-+  repack_locales("electron_locales") {
-+    source_patterns = [
-+      "${root_gen_dir}/content/app/strings/content_strings_",
-+    ]
-+    deps = [
-+      "//content/app/strings",
-+    ]
-+
-+    input_locales = locales
-+
-+    if (is_mac) {
-+      output_locales = locales_as_mac_outputs
-+    } else {
-+      output_locales = locales
-+    }
-+
-+    if (is_mac) {
-+      output_dir = "$root_gen_dir/repack"
-+      copy_data_to_bundle = true
-+    } else {
-+      output_dir = root_out_dir
-+    }
-+>>>>>>> .their
-   }
- 
-   mac_app_bundle("electron_app") {
-@@ -591,16 +965,24 @@
-       ":electron_app_framework_bundle_data",
-       ":electron_app_resources",
-     ]
-+<<<<<<< .our
-     if (is_mas_build) {
-       deps += [ ":electron_login_helper_app" ]
-     }
-     info_plist = "atom/browser/resources/mac/Info.plist"
-     extra_substitutions = [ "ATOM_BUNDLE_ID=$electron_mac_bundle_id" ]
-+=======
-+    info_plist = "atom/browser/resources/mac/Info.plist"
-+    extra_substitutions = [
-+      "ATOM_BUNDLE_ID=$electron_mac_bundle_id",
-+    ]
-+>>>>>>> .their
-     ldflags = [
-       "-rpath",
-       "@executable_path/../Frameworks",
-     ]
-   }
-+<<<<<<< .our
- } else {
-   windows_manifest("electron_app_manifest") {
-     sources = [
-@@ -610,12 +992,18 @@
-     ]
-   }
- 
-+=======
-+}
-+
-+if (is_linux) {
-+>>>>>>> .their
-   executable("electron_app") {
-     output_name = electron_project_name
-     sources = filenames_gypi.app_sources
-     include_dirs = [ "." ]
-     deps = [
-       ":app2asar",
-+<<<<<<< .our
-       ":electron_app_manifest",
-       ":electron_lib",
-       ":js2asar",
-@@ -814,3 +1202,16 @@
- group("electron") {
-   deps = [ ":electron_app" ]
- }
-+=======
-+      ":electron_lib",
-+      ":js2asar",
-+      "//build/config:exe_and_shlib_deps",
-+      "//chrome:packed_resources",
-+      "//content/shell:copy_shell_resources",
-+      "//content/shell:pak",
-+      "//third_party/WebKit/public:image_resources",
-+      "//ui/strings",
-+    ]
-+  }
-+}
-+>>>>>>> .their
-added in both
-  our    100644 b3b9d650b27274f4f98f7408319b1e6b35f63abf DEPS
-  their  100644 3de2d30f4655533910aeb12603e1c0be1c7c89b3 DEPS
-@@ -1,16 +1,27 @@
- vars = {
-   'chromium_version':
-+<<<<<<< .our
-     '66.0.3359.181',
-   'libchromiumcontent_revision':
-     'c85470a1c379b1c4bedb372c146521bc4be9b75d',
-   'node_version':
-     'ece0a06ac8147efb5b5af431c21f312f1884616e',
-+=======
-+    '63.0.3239.150',
-+  'libchromiumcontent_revision':
-+    '1c542968990da951df27c8a0371a4ab5494a5a6c',
-+  'node_version':
-+    'v9.7.0-33-g538a5023af',
-+  'native_mate_revision':
-+    '4cd7d113915de0cc08e9a218be35bff9c7361906',
-+>>>>>>> .their
- 
-   'chromium_git':
-     'https://chromium.googlesource.com',
- 
-   'electron_git':
-     'https://github.com/electron',
-+<<<<<<< .our
- 
-   'checkout_nacl':
-     False,
-@@ -18,6 +29,8 @@
-     True,
-   'checkout_oculus_sdk':
-     False,
-+=======
-+>>>>>>> .their
- }
- 
- deps = {
-@@ -27,15 +40,24 @@
-     (Var("electron_git")) + '/libchromiumcontent.git@' + (Var("libchromiumcontent_revision")),
-   'src/third_party/electron_node':
-     (Var("electron_git")) + '/node.git@' + (Var("node_version")),
-+<<<<<<< .our
-+=======
-+  'src/third_party/native_mate':
-+    (Var("electron_git")) + '/native-mate.git@' + (Var("native_mate_revision")),
-+>>>>>>> .their
- }
- 
- hooks = [
-   {
-     'action': [
-+<<<<<<< .our
-       'python',
-       'src/libchromiumcontent/script/apply-patches',
-       '--project-root=.',
-       '--commit'
-+=======
-+      'src/libchromiumcontent/script/apply-patches'
-+>>>>>>> .their
-     ],
-     'pattern':
-       'src/libchromiumcontent',
-@@ -44,7 +66,10 @@
-   },
-   {
-     'action': [
-+<<<<<<< .our
-       'python',
-+=======
-+>>>>>>> .their
-       'src/electron/script/update-external-binaries.py'
-     ],
-     'pattern':
-@@ -54,9 +79,26 @@
-   },
-   {
-     'action': [
-+<<<<<<< .our
-       'python',
-       '-c',
-       'import os; os.chdir("src"); os.chdir("electron"); os.system("npm install")',
-+=======
-+      'bash',
-+      '-c',
-+      # NOTE(nornagon): this ridiculous {{}} stuff is because these strings get
-+      # variable-substituted twice by gclient.
-+      'echo -e "#\\n{{{{\'variables\':{{{{}}}}}}}}" > src/third_party/electron_node/config.gypi',
-+    ],
-+    'pattern': 'src/third_party/electron_node',
-+    'name': 'touch_node_config_gypi'
-+  },
-+  {
-+    'action': [
-+      'bash',
-+      '-c',
-+      'cd src/electron; npm install',
-+>>>>>>> .their
-     ],
-     'pattern': 'src/electron/package.json',
-     'name': 'electron_npm_deps'
-@@ -67,6 +109,7 @@
-   'src',
-   'src/libchromiumcontent',
- ]
-+<<<<<<< .our
- 
- gclient_gn_args = [
-   'checkout_libaom',
-@@ -74,3 +117,5 @@
-   'checkout_oculus_sdk'
- ]
- gclient_gn_args_file =  'src/build/config/gclient_args.gni'
-+=======
-+>>>>>>> .their
-added in both
-  our    100644 67a2b2124619d866f67d849f57f3548ba28be26a appveyor.yml
-  their  100644 60a97ce048a579888762a2b167b7368e01001c2b appveyor.yml
-@@ -3,7 +3,11 @@
-   except:
-   - /^release$|^release-\d-\d-x$/
- build_cloud: electron-16
-+<<<<<<< .our
- image: electron-16-vs2017-15.4.5
-+=======
-+image: electron-16-vs2017
-+>>>>>>> .their
- environment:
-   DISABLE_CRASH_REPORTER_TESTS: true
- build_script:
-added in both
-  our    100644 fc77100d9acb58221c35f364c4db7866a44d347d atom/app/atom_main.cc
-  their  100644 d6f3e0a1cfa59ce910557e8b04f001db9f9ad8aa atom/app/atom_main.cc
-@@ -71,7 +71,11 @@
- 
- #ifdef _DEBUG
-   // Don't display assert dialog boxes in CI test runs
-+<<<<<<< .our
-   static const char* kCI = "ELECTRON_CI";
-+=======
-+  static const auto kCI = "ELECTRON_CI";
-+>>>>>>> .their
-   bool is_ci = IsEnvSet(kCI);
-   if (!is_ci) {
-     for (int i = 0; i < arguments.argc; ++i) {
-added in both
-  our    100644 b3b5b8f2a8f24b8928f69a286c80e8a3b8464366 atom/app/atom_main_delegate.cc
-  their  100644 40be88a55abf6b054aad50b4c20c270588ac69a9 atom/app/atom_main_delegate.cc
-@@ -131,6 +131,11 @@
-   brightray::MainDelegate::PreSandboxStartup();
- 
-   auto* command_line = base::CommandLine::ForCurrentProcess();
-+<<<<<<< .our
-+=======
-+  std::string process_type =
-+      command_line->GetSwitchValueASCII(::switches::kProcessType);
-+>>>>>>> .their
- 
-   // Only append arguments for browser process.
-   if (!IsBrowserProcess(command_line))
-added in both
-  our    100644 089a2b63d1bae3afebea925582a3aac81ddeaa4f atom/browser/api/atom_api_app.cc
-  their  100644 57116862783196f37dc1f5cfbd196b81e41a0350 atom/browser/api/atom_api_app.cc
-@@ -667,17 +667,28 @@
- }
- #endif
- 
-+<<<<<<< .our
- void App::OnLogin(scoped_refptr<LoginHandler> login_handler,
-+=======
-+void App::OnLogin(LoginHandler* login_handler,
-+>>>>>>> .their
-                   const base::DictionaryValue& request_details) {
-   v8::Locker locker(isolate());
-   v8::HandleScope handle_scope(isolate());
-   bool prevent_default = false;
-   content::WebContents* web_contents = login_handler->GetWebContents();
-   if (web_contents) {
-+<<<<<<< .our
-     prevent_default = Emit(
-         "login", WebContents::CreateFrom(isolate(), web_contents),
-         request_details, login_handler->auth_info(),
-         base::Bind(&PassLoginInformation, base::RetainedRef(login_handler)));
-+=======
-+    prevent_default =
-+        Emit("login", WebContents::CreateFrom(isolate(), web_contents),
-+             request_details, login_handler->auth_info(),
-+             base::Bind(&PassLoginInformation, WrapRefCounted(login_handler)));
-+>>>>>>> .their
-   }
- 
-   // Default behavior is to always cancel the auth.
-@@ -990,8 +1001,12 @@
-                             const net::CompletionCallback& callback) {
-   auto browser_context = AtomBrowserContext::From("", false);
-   if (!certificate_manager_model_) {
-+<<<<<<< .our
-     auto copy = base::DictionaryValue::From(
-         base::Value::ToUniquePtrValue(options.Clone()));
-+=======
-+    std::unique_ptr<base::DictionaryValue> copy = options.CreateDeepCopy();
-+>>>>>>> .their
-     CertificateManagerModel::Create(
-         browser_context.get(),
-         base::Bind(&App::OnCertificateManagerModelCreated,
-@@ -1115,10 +1130,13 @@
-     mate::Dictionary memory_dict = mate::Dictionary::CreateEmpty(isolate);
-     mate::Dictionary cpu_dict = mate::Dictionary::CreateEmpty(isolate);
- 
-+<<<<<<< .our
-     pid_dict.SetHidden("simple", true);
-     memory_dict.SetHidden("simple", true);
-     cpu_dict.SetHidden("simple", true);
- 
-+=======
-+>>>>>>> .their
-     memory_dict.Set(
-         "workingSetSize",
-         static_cast<double>(
-@@ -1224,7 +1242,10 @@
-       .SetMethod("getName", base::Bind(&Browser::GetName, browser))
-       .SetMethod("setName", base::Bind(&Browser::SetName, browser))
-       .SetMethod("isReady", base::Bind(&Browser::is_ready, browser))
-+<<<<<<< .our
-       .SetMethod("whenReady", base::Bind(&Browser::WhenReady, browser))
-+=======
-+>>>>>>> .their
-       .SetMethod("addRecentDocument",
-                  base::Bind(&Browser::AddRecentDocument, browser))
-       .SetMethod("clearRecentDocuments",
-added in both
-  our    100644 ee0ad42c05fe33be17146b79cbe3422953516621 atom/browser/api/atom_api_app.h
-  their  100644 6093ad05b6343c85799789a9dc68abbf7294dc88 atom/browser/api/atom_api_app.h
-@@ -15,7 +15,10 @@
- #include "atom/browser/browser.h"
- #include "atom/browser/browser_observer.h"
- #include "atom/common/native_mate_converters/callback.h"
-+<<<<<<< .our
- #include "atom/common/promise_util.h"
-+=======
-+>>>>>>> .their
- #include "base/process/process_iterator.h"
- #include "base/task/cancelable_task_tracker.h"
- #include "chrome/browser/icon_manager.h"
-@@ -99,7 +102,11 @@
-   void OnActivate(bool has_visible_windows) override;
-   void OnWillFinishLaunching() override;
-   void OnFinishLaunching(const base::DictionaryValue& launch_info) override;
-+<<<<<<< .our
-   void OnLogin(scoped_refptr<LoginHandler> login_handler,
-+=======
-+  void OnLogin(LoginHandler* login_handler,
-+>>>>>>> .their
-                const base::DictionaryValue& request_details) override;
-   void OnAccessibilitySupportChanged() override;
-   void OnPreMainMessageLoopRun() override;
-added in both
-  our    100644 d0ae6f4ea78407c70e4cce6ff1181ce01e395133 atom/browser/api/atom_api_browser_window.cc
-  their  100644 0c1ba8cbc098cb16426702e2f49a66bc9a600cb1 atom/browser/api/atom_api_browser_window.cc
-@@ -55,7 +55,11 @@
-     base::DictionaryValue web_preferences_dict;
-     if (mate::ConvertFromV8(isolate, web_preferences.GetHandle(),
-                             &web_preferences_dict)) {
-+<<<<<<< .our
-       existing_preferences->Clear();
-+=======
-+      existing_preferences->dict()->Clear();
-+>>>>>>> .their
-       existing_preferences->Merge(web_preferences_dict);
-     }
-   } else {
-@@ -311,9 +315,15 @@
- #endif
- }
- 
-+<<<<<<< .our
- void BrowserWindow::SetVibrancy(v8::Isolate* isolate,
-                                 v8::Local<v8::Value> value) {
-   std::string type = mate::V8ToString(value);
-+=======
-+void BrowserWindow::SetVibrancy(mate::Arguments* args) {
-+  std::string type;
-+  args->GetNext(&type);
-+>>>>>>> .their
- 
-   auto* render_view_host = web_contents()->GetRenderViewHost();
-   if (render_view_host) {
-@@ -324,7 +334,11 @@
-       impl->SetBackgroundOpaque(type.empty() ? !window_->transparent() : false);
-   }
- 
-+<<<<<<< .our
-   TopLevelWindow::SetVibrancy(isolate, value);
-+=======
-+  TopLevelWindow::SetVibrancy(args);
-+>>>>>>> .their
- }
- 
- void BrowserWindow::FocusOnWebView() {
-added in both
-  our    100644 770181f5b7f4e01f0124f44991ee5332771db6e2 atom/browser/api/atom_api_browser_window.h
-  their  100644 f1cbf4733b819c025acbbd547b4f8aadc18d2861 atom/browser/api/atom_api_browser_window.h
-@@ -71,7 +71,11 @@
-   void Blur() override;
-   void SetBackgroundColor(const std::string& color_name) override;
-   void SetBrowserView(v8::Local<v8::Value> value) override;
-+<<<<<<< .our
-   void SetVibrancy(v8::Isolate* isolate, v8::Local<v8::Value> value) override;
-+=======
-+  void SetVibrancy(mate::Arguments* args) override;
-+>>>>>>> .their
- 
-   // BrowserWindow APIs.
-   void FocusOnWebView();
-added in both
-  our    100644 daccf443927abdf444845613b6e2916d167f96f3 atom/browser/api/atom_api_cookies.cc
-  their  100644 f55ed136adfb15fed7065a60df6320de90c63fdb atom/browser/api/atom_api_cookies.cc
-@@ -5,7 +5,10 @@
- #include "atom/browser/api/atom_api_cookies.h"
- 
- #include "atom/browser/atom_browser_context.h"
-+<<<<<<< .our
- #include "atom/browser/request_context_delegate.h"
-+=======
-+>>>>>>> .their
- #include "atom/common/native_mate_converters/callback.h"
- #include "atom/common/native_mate_converters/gurl_converter.h"
- #include "atom/common/native_mate_converters/value_converter.h"
-@@ -254,16 +257,23 @@
- Cookies::Cookies(v8::Isolate* isolate, AtomBrowserContext* browser_context)
-     : browser_context_(browser_context) {
-   Init(isolate);
-+<<<<<<< .our
-   cookie_change_subscription_ =
-       browser_context->GetRequestContextDelegate()
-           ->RegisterCookieChangeCallback(
-               base::Bind(&Cookies::OnCookieChanged, base::Unretained(this)));
-+=======
-+  auto subscription = browser_context->RegisterCookieChangeCallback(
-+      base::Bind(&Cookies::OnCookieChanged, base::Unretained(this)));
-+  browser_context->set_cookie_change_subscription(std::move(subscription));
-+>>>>>>> .their
- }
- 
- Cookies::~Cookies() {}
- 
- void Cookies::Get(const base::DictionaryValue& filter,
-                   const GetCallback& callback) {
-+<<<<<<< .our
-   auto copy = base::DictionaryValue::From(
-       base::Value::ToUniquePtrValue(filter.Clone()));
-   auto* getter = browser_context_->GetRequestContext();
-@@ -271,6 +281,14 @@
-       BrowserThread::IO, FROM_HERE,
-       base::BindOnce(GetCookiesOnIO, base::RetainedRef(getter), std::move(copy),
-                      callback));
-+=======
-+  std::unique_ptr<base::DictionaryValue> copied(filter.CreateDeepCopy());
-+  auto* getter = browser_context_->GetRequestContext();
-+  content::BrowserThread::PostTask(
-+      BrowserThread::IO, FROM_HERE,
-+      base::BindOnce(GetCookiesOnIO, base::RetainedRef(getter),
-+                     std::move(copied), callback));
-+>>>>>>> .their
- }
- 
- void Cookies::Remove(const GURL& url,
-@@ -285,6 +303,7 @@
- 
- void Cookies::Set(const base::DictionaryValue& details,
-                   const SetCallback& callback) {
-+<<<<<<< .our
-   auto copy = base::DictionaryValue::From(
-       base::Value::ToUniquePtrValue(details.Clone()));
-   auto* getter = browser_context_->GetRequestContext();
-@@ -292,6 +311,14 @@
-       BrowserThread::IO, FROM_HERE,
-       base::BindOnce(SetCookieOnIO, base::RetainedRef(getter), std::move(copy),
-                      callback));
-+=======
-+  std::unique_ptr<base::DictionaryValue> copied(details.CreateDeepCopy());
-+  auto* getter = browser_context_->GetRequestContext();
-+  content::BrowserThread::PostTask(
-+      BrowserThread::IO, FROM_HERE,
-+      base::BindOnce(SetCookieOnIO, base::RetainedRef(getter),
-+                     std::move(copied), callback));
-+>>>>>>> .their
- }
- 
- void Cookies::FlushStore(const base::Closure& callback) {
-added in both
-  our    100644 8a83a64ca1012e11cb9629ea172f578eca545abe atom/browser/api/atom_api_cookies.h
-  their  100644 403e22623302087ac93283d37981d4e02f7596d9 atom/browser/api/atom_api_cookies.h
-@@ -9,7 +9,11 @@
- 
- #include "atom/browser/api/trackable_object.h"
- #include "atom/browser/net/cookie_details.h"
-+<<<<<<< .our
- #include "base/callback_list.h"
-+=======
-+#include "base/callback.h"
-+>>>>>>> .their
- #include "native_mate/handle.h"
- #include "net/cookies/canonical_cookie.h"
- 
-@@ -59,8 +63,11 @@
-   void OnCookieChanged(const CookieDetails*);
- 
-  private:
-+<<<<<<< .our
-   std::unique_ptr<base::CallbackList<void(const CookieDetails*)>::Subscription>
-       cookie_change_subscription_;
-+=======
-+>>>>>>> .their
-   scoped_refptr<AtomBrowserContext> browser_context_;
- 
-   DISALLOW_COPY_AND_ASSIGN(Cookies);
-added in both
-  our    100644 135b4edd11048a4635f9017f569f4b4ae644a09c atom/browser/api/atom_api_desktop_capturer.cc
-  their  100644 daf291e7f9585645b8a96d6e096bacbc852633b4 atom/browser/api/atom_api_desktop_capturer.cc
-@@ -22,7 +22,10 @@
- #include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h"
- #if defined(OS_WIN)
- #include "third_party/webrtc/modules/desktop_capture/win/dxgi_duplicator_controller.h"
-+<<<<<<< .our
- #include "third_party/webrtc/modules/desktop_capture/win/screen_capturer_win_directx.h"
-+=======
-+>>>>>>> .their
- #include "ui/display/win/display_info.h"
- #endif  // defined(OS_WIN)
- 
-@@ -62,6 +65,7 @@
-                        const gfx::Size& thumbnail_size,
-                        atom::api::DesktopCapturer* cap) {
- #if defined(OS_WIN)
-+<<<<<<< .our
-   if (content::desktop_capture::CreateDesktopCaptureOptions()
-       .allow_directx_capturer()) {
-     // DxgiDuplicatorController should be alive in this scope according to
-@@ -70,6 +74,11 @@
-     cap->using_directx_capturer_ =
-         webrtc::ScreenCapturerWinDirectx::IsSupported();
-   }
-+=======
-+  cap->using_directx_capturer_ =
-+      content::desktop_capture::CreateDesktopCaptureOptions()
-+          .allow_directx_capturer();
-+>>>>>>> .their
- #endif  // defined(OS_WIN)
-   std::unique_ptr<webrtc::DesktopCapturer> screen_capturer(
-       capture_screen ? content::desktop_capture::CreateScreenCapturer()
-added in both
-  our    100644 88960e46d49dd0b68c51647be18066a2d097ce79 atom/browser/api/atom_api_desktop_capturer.h
-  their  100644 85244b47a013019cbe7e1455407d0c276506ddf8 atom/browser/api/atom_api_desktop_capturer.h
-@@ -36,7 +36,11 @@
- 
-   std::unique_ptr<DesktopMediaList> media_list_;
- #if defined(OS_WIN)
-+<<<<<<< .our
-   bool using_directx_capturer_ = false;
-+=======
-+  bool using_directx_capturer_;
-+>>>>>>> .their
- #endif  // defined(OS_WIN)
- 
-  protected:
-added in both
-  our    100644 deaf680c996ce0dd74af45e7c7c95f711884bb07 atom/browser/api/atom_api_protocol.h
-  their  100644 ab5e34872c6e9f346c31efd7e9135ce6bfa90393 atom/browser/api/atom_api_protocol.h
-@@ -78,13 +78,21 @@
-         net::URLRequest* request,
-         net::NetworkDelegate* network_delegate) const override {
-       RequestJob* request_job = new RequestJob(request, network_delegate);
-+<<<<<<< .our
-       request_job->SetHandlerInfo(isolate_, request_context_, handler_);
-+=======
-+      request_job->SetHandlerInfo(isolate_, request_context_.get(), handler_);
-+>>>>>>> .their
-       return request_job;
-     }
- 
-    private:
-     v8::Isolate* isolate_;
-+<<<<<<< .our
-     net::URLRequestContextGetter* request_context_;
-+=======
-+    scoped_refptr<net::URLRequestContextGetter> request_context_;
-+>>>>>>> .their
-     Protocol::Handler handler_;
- 
-     DISALLOW_COPY_AND_ASSIGN(CustomProtocolHandler);
-added in both
-  our    100644 658f913bb60b66ae1bf3aae97d7d9158e56f7ee0 atom/browser/api/atom_api_session.cc
-  their  100644 2ca8ae0e26ddeaa9db681e3bfb9d98582e4c154a atom/browser/api/atom_api_session.cc
-@@ -244,7 +244,11 @@
-       : callback_(callback),
-         original_thread_(base::ThreadTaskRunnerHandle::Get()) {
-     scoped_refptr<net::URLRequestContextGetter> context_getter =
-+<<<<<<< .our
-         browser_context->GetRequestContext();
-+=======
-+        browser_context->url_request_context_getter();
-+>>>>>>> .their
-     context_getter->GetNetworkTaskRunner()->PostTask(
-         FROM_HERE, base::BindOnce(&ResolveProxyHelper::ResolveProxy,
-                                   base::Unretained(this), context_getter, url));
-@@ -453,6 +457,18 @@
-   network_delegate->SetDevToolsNetworkEmulationClientId(client_id);
- }
- 
-+<<<<<<< .our
-+=======
-+// Clear protocol handlers in IO thread.
-+void ClearJobFactoryInIO(
-+    scoped_refptr<brightray::URLRequestContextGetter> request_context_getter) {
-+  auto* job_factory = static_cast<AtomURLRequestJobFactory*>(
-+      request_context_getter->job_factory());
-+  if (job_factory)
-+    job_factory->Clear();
-+}
-+
-+>>>>>>> .their
- void DestroyGlobalHandle(v8::Isolate* isolate,
-                          const v8::Global<v8::Value>& global_handle) {
-   v8::Locker locker(isolate);
-@@ -486,6 +502,13 @@
- }
- 
- Session::~Session() {
-+<<<<<<< .our
-+=======
-+  auto* getter = browser_context_->GetRequestContext();
-+  content::BrowserThread::PostTask(
-+      content::BrowserThread::IO, FROM_HERE,
-+      base::BindOnce(ClearJobFactoryInIO, base::RetainedRef(getter)));
-+>>>>>>> .their
-   content::BrowserContext::GetDownloadManager(browser_context())
-       ->RemoveObserver(this);
-   DestroyGlobalHandle(isolate(), cookies_);
-@@ -584,9 +607,16 @@
-       devtools_network_emulation_client_id_, std::move(conditions));
-   BrowserThread::PostTask(
-       BrowserThread::IO, FROM_HERE,
-+<<<<<<< .our
-       base::BindOnce(&SetDevToolsNetworkEmulationClientIdInIO,
-                      base::RetainedRef(browser_context_->GetRequestContext()),
-                      devtools_network_emulation_client_id_));
-+=======
-+      base::BindOnce(
-+          &SetDevToolsNetworkEmulationClientIdInIO,
-+          base::RetainedRef(browser_context_->url_request_context_getter()),
-+          devtools_network_emulation_client_id_));
-+>>>>>>> .their
- }
- 
- void Session::DisableNetworkEmulation() {
-@@ -595,9 +625,16 @@
-       devtools_network_emulation_client_id_, std::move(conditions));
-   BrowserThread::PostTask(
-       BrowserThread::IO, FROM_HERE,
-+<<<<<<< .our
-       base::BindOnce(&SetDevToolsNetworkEmulationClientIdInIO,
-                      base::RetainedRef(browser_context_->GetRequestContext()),
-                      std::string()));
-+=======
-+      base::BindOnce(
-+          &SetDevToolsNetworkEmulationClientIdInIO,
-+          base::RetainedRef(browser_context_->url_request_context_getter()),
-+          std::string()));
-+>>>>>>> .their
- }
- 
- void Session::SetCertVerifyProc(v8::Local<v8::Value> val,
-added in both
-  our    100644 e0ef26a9fc46818056581a69169395e741ce2efe atom/browser/api/atom_api_system_preferences.h
-  their  100644 bfd64e80159dc46806360f14fd609ba24ccc09cb atom/browser/api/atom_api_system_preferences.h
-@@ -50,6 +50,14 @@
- #if defined(OS_WIN)
-   bool IsAeroGlassEnabled();
- 
-+<<<<<<< .our
-+=======
-+  typedef HRESULT(STDAPICALLTYPE* DwmGetColorizationColor)(DWORD*, BOOL*);
-+  DwmGetColorizationColor dwmGetColorizationColor =
-+      (DwmGetColorizationColor)GetProcAddress(LoadLibraryW(L"dwmapi.dll"),
-+                                              "DwmGetColorizationColor");
-+
-+>>>>>>> .their
-   std::string GetAccentColor();
-   std::string GetColor(const std::string& color, mate::Arguments* args);
- 
-added in both
-  our    100644 0a24d1abf45fe7ff244386ea238b0e7b03b2df00 atom/browser/api/atom_api_system_preferences_win.cc
-  their  100644 b3fd74d59d9bcb53a23712f4a48206af191d45a6 atom/browser/api/atom_api_system_preferences_win.cc
-@@ -2,7 +2,10 @@
- // Use of this source code is governed by the MIT license that can be
- // found in the LICENSE file.
- 
-+<<<<<<< .our
- #include <dwmapi.h>
-+=======
-+>>>>>>> .their
- #include <iomanip>
- 
- #include "atom/browser/api/atom_api_system_preferences.h"
-@@ -39,7 +42,11 @@
-   DWORD color = 0;
-   BOOL opaque = FALSE;
- 
-+<<<<<<< .our
-   if (FAILED(DwmGetColorizationColor(&color, &opaque))) {
-+=======
-+  if (FAILED(dwmGetColorizationColor(&color, &opaque))) {
-+>>>>>>> .their
-     return "";
-   }
- 
-added in both
-  our    100644 c8db6b0bb468a2a722d8d830a9b2cb4bf2ce116b atom/browser/api/atom_api_top_level_window.cc
-  their  100644 145b6b2e98b84da1900e293018bbaad649b02e6f atom/browser/api/atom_api_top_level_window.cc
-@@ -194,6 +194,7 @@
-   Emit("restore");
- }
- 
-+<<<<<<< .our
- void TopLevelWindow::OnWindowWillResize(const gfx::Rect& new_bounds,
-                                         bool* prevent_default) {
-   if (Emit("will-resize", new_bounds)) {
-@@ -201,6 +202,8 @@
-   }
- }
- 
-+=======
-+>>>>>>> .their
- void TopLevelWindow::OnWindowResize() {
-   Emit("resize");
- }
-@@ -578,10 +581,13 @@
-   return window_->GetOpacity();
- }
- 
-+<<<<<<< .our
- void TopLevelWindow::SetShape(const std::vector<gfx::Rect>& rects) {
-   window_->widget()->SetShape(std::make_unique<std::vector<gfx::Rect>>(rects));
- }
- 
-+=======
-+>>>>>>> .their
- void TopLevelWindow::SetRepresentedFilename(const std::string& filename) {
-   window_->SetRepresentedFilename(filename);
- }
-@@ -703,9 +709,15 @@
-   window_->SetAutoHideCursor(auto_hide);
- }
- 
-+<<<<<<< .our
- void TopLevelWindow::SetVibrancy(v8::Isolate* isolate,
-                                  v8::Local<v8::Value> value) {
-   std::string type = mate::V8ToString(value);
-+=======
-+void TopLevelWindow::SetVibrancy(mate::Arguments* args) {
-+  std::string type;
-+  args->GetNext(&type);
-+>>>>>>> .their
-   window_->SetVibrancy(type);
- }
- 
-@@ -749,6 +761,7 @@
-     args->ThrowError("AddTabbedWindow cannot be called by a window on itself.");
- }
- 
-+<<<<<<< .our
- void TopLevelWindow::SetWindowButtonVisibility(bool visible,
-                                                mate::Arguments* args) {
-   if (!window_->SetWindowButtonVisibility(visible)) {
-@@ -756,6 +769,8 @@
-   }
- }
- 
-+=======
-+>>>>>>> .their
- void TopLevelWindow::SetAutoHideMenuBar(bool auto_hide) {
-   window_->SetAutoHideMenuBar(auto_hide);
- }
-@@ -828,7 +843,11 @@
-     args->ThrowError();
-     return false;
-   }
-+<<<<<<< .our
-   auto* window = static_cast<NativeWindowViews*>(window_.get());
-+=======
-+  auto window = static_cast<NativeWindowViews*>(window_.get());
-+>>>>>>> .their
-   return window->taskbar_host().SetThumbarButtons(
-       window_->GetAcceleratedWidget(), buttons);
- #else
-@@ -1011,7 +1030,10 @@
-       .SetMethod("hasShadow", &TopLevelWindow::HasShadow)
-       .SetMethod("setOpacity", &TopLevelWindow::SetOpacity)
-       .SetMethod("getOpacity", &TopLevelWindow::GetOpacity)
-+<<<<<<< .our
-       .SetMethod("setShape", &TopLevelWindow::SetShape)
-+=======
-+>>>>>>> .their
-       .SetMethod("setRepresentedFilename",
-                  &TopLevelWindow::SetRepresentedFilename)
-       .SetMethod("getRepresentedFilename",
-@@ -1049,8 +1071,11 @@
-       .SetMethod("moveTabToNewWindow", &TopLevelWindow::MoveTabToNewWindow)
-       .SetMethod("toggleTabBar", &TopLevelWindow::ToggleTabBar)
-       .SetMethod("addTabbedWindow", &TopLevelWindow::AddTabbedWindow)
-+<<<<<<< .our
-       .SetMethod("setWindowButtonVisibility",
-                  &TopLevelWindow::SetWindowButtonVisibility)
-+=======
-+>>>>>>> .their
- #endif
-       .SetMethod("setAutoHideMenuBar", &TopLevelWindow::SetAutoHideMenuBar)
-       .SetMethod("isMenuBarAutoHide", &TopLevelWindow::IsMenuBarAutoHide)
-added in both
-  our    100644 ac4c7670a544abc25029314122ba6124a81cc81a atom/browser/api/atom_api_top_level_window.h
-  their  100644 bf64ac7c616af884629ff377ca1d00740cc42676 atom/browser/api/atom_api_top_level_window.h
-@@ -60,8 +60,11 @@
-   void OnWindowUnmaximize() override;
-   void OnWindowMinimize() override;
-   void OnWindowRestore() override;
-+<<<<<<< .our
-   void OnWindowWillResize(const gfx::Rect& new_bounds,
-                           bool* prevent_default) override;
-+=======
-+>>>>>>> .their
-   void OnWindowResize() override;
-   void OnWindowMove() override;
-   void OnWindowMoved() override;
-@@ -148,7 +151,10 @@
-   bool HasShadow();
-   void SetOpacity(const double opacity);
-   double GetOpacity();
-+<<<<<<< .our
-   void SetShape(const std::vector<gfx::Rect>& rects);
-+=======
-+>>>>>>> .their
-   void SetRepresentedFilename(const std::string& filename);
-   std::string GetRepresentedFilename();
-   void SetDocumentEdited(bool edited);
-@@ -166,7 +172,11 @@
-   void SetVisibleOnAllWorkspaces(bool visible);
-   bool IsVisibleOnAllWorkspaces();
-   void SetAutoHideCursor(bool auto_hide);
-+<<<<<<< .our
-   virtual void SetVibrancy(v8::Isolate* isolate, v8::Local<v8::Value> value);
-+=======
-+  virtual void SetVibrancy(mate::Arguments* args);
-+>>>>>>> .their
-   void SetTouchBar(const std::vector<mate::PersistentDictionary>& items);
-   void RefreshTouchBarItem(const std::string& item_id);
-   void SetEscapeTouchBarItem(const mate::PersistentDictionary& item);
-@@ -176,7 +186,10 @@
-   void MoveTabToNewWindow();
-   void ToggleTabBar();
-   void AddTabbedWindow(NativeWindow* window, mate::Arguments* args);
-+<<<<<<< .our
-   void SetWindowButtonVisibility(bool visible, mate::Arguments* args);
-+=======
-+>>>>>>> .their
-   void SetAutoHideMenuBar(bool auto_hide);
-   bool IsMenuBarAutoHide();
-   void SetMenuBarVisibility(bool visible);
-added in both
-  our    100644 9f18d97d2656fbc5dc62b7bcea05a8acab63e847 atom/browser/api/atom_api_url_request.cc
-  their  100644 51c7969e31f44c9c08dbc5aa7ccc8b1e60fff863 atom/browser/api/atom_api_url_request.cc
-@@ -125,6 +125,7 @@
-   return IsFlagSet(ResponseStateFlags::kFailed);
- }
- 
-+<<<<<<< .our
- mate::Dictionary URLRequest::GetUploadProgress(v8::Isolate* isolate) {
-   mate::Dictionary progress = mate::Dictionary::CreateEmpty(isolate);
- 
-@@ -137,6 +138,8 @@
-   return progress;
- }
- 
-+=======
-+>>>>>>> .their
- URLRequest::URLRequest(v8::Isolate* isolate, v8::Local<v8::Object> wrapper) {
-   InitWith(isolate, wrapper);
- }
-@@ -195,7 +198,10 @@
-       .SetMethod("setChunkedUpload", &URLRequest::SetChunkedUpload)
-       .SetMethod("followRedirect", &URLRequest::FollowRedirect)
-       .SetMethod("_setLoadFlags", &URLRequest::SetLoadFlags)
-+<<<<<<< .our
-       .SetMethod("getUploadProgress", &URLRequest::GetUploadProgress)
-+=======
-+>>>>>>> .their
-       .SetProperty("notStarted", &URLRequest::NotStarted)
-       .SetProperty("finished", &URLRequest::Finished)
-       // Response APi
-added in both
-  our    100644 4a5a2b65160bf0590c9e890e52d0531b799b583a atom/browser/api/atom_api_url_request.h
-  their  100644 3b5e667d7590b9398b6d41632f0f016f1a6c27d5 atom/browser/api/atom_api_url_request.h
-@@ -112,7 +112,10 @@
-   void OnResponseData(scoped_refptr<const net::IOBufferWithSize> data);
-   void OnResponseCompleted();
-   void OnError(const std::string& error, bool isRequestError);
-+<<<<<<< .our
-   mate::Dictionary GetUploadProgress(v8::Isolate* isolate);
-+=======
-+>>>>>>> .their
- 
-  protected:
-   explicit URLRequest(v8::Isolate* isolate, v8::Local<v8::Object> wrapper);
-added in both
-  our    100644 20a1ac2e672f08ffea528b6e094ba530ff8083d1 atom/browser/api/atom_api_web_contents.cc
-  their  100644 170e1d7cedd9cf89fddd6688a608559fb43ca261 atom/browser/api/atom_api_web_contents.cc
-@@ -121,6 +121,31 @@
- namespace mate {
- 
- template <>
-+<<<<<<< .our
-+=======
-+struct Converter<atom::SetSizeParams> {
-+  static bool FromV8(v8::Isolate* isolate,
-+                     v8::Local<v8::Value> val,
-+                     atom::SetSizeParams* out) {
-+    mate::Dictionary params;
-+    if (!ConvertFromV8(isolate, val, &params))
-+      return false;
-+    bool autosize;
-+    if (params.Get("enableAutoSize", &autosize))
-+      out->enable_auto_size.reset(new bool(autosize));
-+    gfx::Size size;
-+    if (params.Get("min", &size))
-+      out->min_size.reset(new gfx::Size(size));
-+    if (params.Get("max", &size))
-+      out->max_size.reset(new gfx::Size(size));
-+    if (params.Get("normal", &size))
-+      out->normal_size.reset(new gfx::Size(size));
-+    return true;
-+  }
-+};
-+
-+template <>
-+>>>>>>> .their
- struct Converter<PrintSettings> {
-   static bool FromV8(v8::Isolate* isolate,
-                      v8::Local<v8::Value> val,
-@@ -374,8 +399,12 @@
-                                             GURL("chrome-guest://fake-host"));
-     content::WebContents::CreateParams params(session->browser_context(),
-                                               site_instance);
-+<<<<<<< .our
-     guest_delegate_.reset(
-         new WebViewGuestDelegate(embedder_->web_contents(), this));
-+=======
-+    guest_delegate_.reset(new WebViewGuestDelegate);
-+>>>>>>> .their
-     params.guest_delegate = guest_delegate_.get();
- 
- #if defined(ENABLE_OSR)
-@@ -427,7 +456,11 @@
-                                             mate::Handle<api::Session> session,
-                                             const mate::Dictionary& options) {
-   Observe(web_contents);
-+<<<<<<< .our
-   InitWithWebContents(web_contents, session->browser_context(), IsGuest());
-+=======
-+  InitWithWebContents(web_contents, session->browser_context());
-+>>>>>>> .their
- 
-   managed_web_contents()->GetView()->SetDelegate(this);
- 
-@@ -460,6 +493,11 @@
-   web_contents->SetUserAgentOverride(GetBrowserContext()->GetUserAgent());
- 
-   if (IsGuest()) {
-+<<<<<<< .our
-+=======
-+    guest_delegate_->Initialize(this);
-+
-+>>>>>>> .their
-     NativeWindow* owner_window = nullptr;
-     if (embedder_) {
-       // New WebContents's owner_window is the embedder's owner_window.
-@@ -481,6 +519,7 @@
-   if (managed_web_contents()) {
-     managed_web_contents()->GetView()->SetDelegate(nullptr);
- 
-+<<<<<<< .our
-     RenderViewDeleted(web_contents()->GetRenderViewHost());
- 
-     if (type_ == BROWSER_WINDOW && owner_window()) {
-@@ -493,6 +532,29 @@
-     // destroy the webContents in the next tick. So we have to manually
-     // call it here to make sure "destroyed" event is emitted.
-     WebContentsDestroyed();
-+=======
-+    // For webview we need to tell content module to do some cleanup work before
-+    // destroying it.
-+    if (type_ == WEB_VIEW)
-+      guest_delegate_->Destroy();
-+
-+    RenderViewDeleted(web_contents()->GetRenderViewHost());
-+
-+    if (type_ == WEB_VIEW) {
-+      DestroyWebContents(false /* async */);
-+    } else {
-+      if (type_ == BROWSER_WINDOW && owner_window()) {
-+        for (ExtendedWebContentsObserver& observer : observers_)
-+          observer.OnCloseContents();
-+      } else {
-+        DestroyWebContents(true /* async */);
-+      }
-+      // The WebContentsDestroyed will not be called automatically because we
-+      // destroy the webContents in the next tick. So we have to manually
-+      // call it here to make sure "destroyed" event is emitted.
-+      WebContentsDestroyed();
-+    }
-+>>>>>>> .their
-   }
- }
- 
-@@ -752,6 +814,16 @@
-   return dialog_manager_.get();
- }
- 
-+<<<<<<< .our
-+=======
-+void WebContents::ResizeDueToAutoResize(content::WebContents* web_contents,
-+                                        const gfx::Size& new_size) {
-+  if (IsGuest()) {
-+    guest_delegate_->ResizeDueToAutoResize(new_size);
-+  }
-+}
-+
-+>>>>>>> .their
- void WebContents::BeforeUnloadFired(const base::TimeTicks& proceed_time) {
-   // Do nothing, we override this method just to avoid compilation error since
-   // there are two virtual functions named BeforeUnloadFired.
-@@ -896,8 +968,11 @@
-         Emit("did-navigate", url, http_response_code, http_status_text);
-       }
-     }
-+<<<<<<< .our
-     if (IsGuest())
-       Emit("load-commit", url, is_main_frame);
-+=======
-+>>>>>>> .their
-   } else {
-     auto url = navigation_handle->GetURL();
-     int code = navigation_handle->GetNetErrorCode();
-@@ -1038,8 +1113,12 @@
- // 1. call webContents.destroy();
- // 2. garbage collection;
- // 3. user closes the window of webContents;
-+<<<<<<< .our
- // 4. the embedder detaches the frame.
- // For webview only #4 will happen, for BrowserWindow both #1 and #3 may
-+=======
-+// For webview only #1 will happen, for BrowserWindow both #1 and #3 may
-+>>>>>>> .their
- // happen. The #2 should never happen for webContents, because webview is
- // managed by GuestViewManager, and BrowserWindow's webContents is managed
- // by api::BrowserWindow.
-@@ -1047,7 +1126,10 @@
- // sure "destroyed" event is emitted. For #3, the content::WebContents will
- // be destroyed on close, and WebContentsDestroyed would be called for it, so
- // we need to make sure the api::WebContents is also deleted.
-+<<<<<<< .our
- // For #4, the WebContents will be destroyed by embedder.
-+=======
-+>>>>>>> .their
- void WebContents::WebContentsDestroyed() {
-   // Cleanup relationships with other parts.
-   RemoveFromWeakMap();
-@@ -1058,6 +1140,7 @@
- 
-   Emit("destroyed");
- 
-+<<<<<<< .our
-   // For guest view based on OOPIF, the WebContents is released by the embedder
-   // frame, and we need to clear the reference to the memory.
-   if (IsGuest() && managed_web_contents()) {
-@@ -1065,6 +1148,8 @@
-     ResetManagedWebContents(false);
-   }
- 
-+=======
-+>>>>>>> .their
-   // Destroy the native class in next tick.
-   base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, GetDestroyClosure());
- }
-@@ -1075,12 +1160,30 @@
-        details.is_same_document, details.did_replace_entry);
- }
- 
-+<<<<<<< .our
-+=======
-+int64_t WebContents::GetIDForContents(content::WebContents* web_contents) {
-+  int64_t process_id = web_contents->GetMainFrame()->GetProcess()->GetID();
-+  int64_t routing_id = web_contents->GetMainFrame()->GetRoutingID();
-+  int64_t rv = (process_id << 32) + routing_id;
-+  return rv;
-+}
-+
-+int64_t WebContents::GetID() const {
-+  return WebContents::GetIDForContents(web_contents());
-+}
-+
-+>>>>>>> .their
- int WebContents::GetProcessID() const {
-   return web_contents()->GetMainFrame()->GetProcess()->GetID();
- }
- 
- base::ProcessId WebContents::GetOSProcessID() const {
-+<<<<<<< .our
-   base::ProcessHandle process_handle =
-+=======
-+  auto process_handle =
-+>>>>>>> .their
-       web_contents()->GetMainFrame()->GetProcess()->GetHandle();
-   return base::GetProcId(process_handle);
- }
-@@ -1090,7 +1193,11 @@
- }
- 
- bool WebContents::Equal(const WebContents* web_contents) const {
-+<<<<<<< .our
-   return ID() == web_contents->ID();
-+=======
-+  return GetID() == web_contents->GetID();
-+>>>>>>> .their
- }
- 
- void WebContents::LoadURL(const GURL& url, const mate::Dictionary& options) {
-@@ -1101,6 +1208,13 @@
-     return;
-   }
- 
-+<<<<<<< .our
-+=======
-+  if (guest_delegate_ && !guest_delegate_->IsAttached()) {
-+    return;
-+  }
-+
-+>>>>>>> .their
-   content::NavigationController::LoadURLParams params(url);
- 
-   if (!options.Get("httpReferrer", &params.referrer)) {
-@@ -1142,8 +1256,13 @@
-   if (view) {
-     auto* web_preferences = WebContentsPreferences::From(web_contents());
-     std::string color_name;
-+<<<<<<< .our
-     if (web_preferences->GetPreference(options::kBackgroundColor,
-                                        &color_name)) {
-+=======
-+    if (web_preferences->dict()->GetString(options::kBackgroundColor,
-+                                           &color_name)) {
-+>>>>>>> .their
-       view->SetBackgroundColor(ParseHexColor(color_name));
-     } else {
-       view->SetBackgroundColor(SK_ColorTRANSPARENT);
-@@ -1391,10 +1510,13 @@
-   return web_contents()->IsAudioMuted();
- }
- 
-+<<<<<<< .our
- bool WebContents::IsCurrentlyAudible() {
-   return web_contents()->IsCurrentlyAudible();
- }
- 
-+=======
-+>>>>>>> .their
- void WebContents::Print(mate::Arguments* args) {
-   PrintSettings settings = {false, false, base::string16()};
-   if (args->Length() >= 1 && !args->GetNext(&settings)) {
-@@ -1715,6 +1837,7 @@
-   }
- }
- 
-+<<<<<<< .our
- bool WebContents::IsGuest() const {
-   return type_ == WEB_VIEW;
- }
-@@ -1723,6 +1846,15 @@
-                                  int embedder_frame_id) {
-   if (guest_delegate_)
-     guest_delegate_->AttachToIframe(embedder_web_contents, embedder_frame_id);
-+=======
-+void WebContents::SetSize(const SetSizeParams& params) {
-+  if (guest_delegate_)
-+    guest_delegate_->SetSize(params);
-+}
-+
-+bool WebContents::IsGuest() const {
-+  return type_ == WEB_VIEW;
-+>>>>>>> .their
- }
- 
- bool WebContents::IsOffScreen() const {
-@@ -1823,7 +1955,11 @@
-   zoom_controller_->SetZoomLevel(level);
- }
- 
-+<<<<<<< .our
- double WebContents::GetZoomLevel() const {
-+=======
-+double WebContents::GetZoomLevel() {
-+>>>>>>> .their
-   return zoom_controller_->GetZoomLevel();
- }
- 
-@@ -1832,7 +1968,11 @@
-   SetZoomLevel(level);
- }
- 
-+<<<<<<< .our
- double WebContents::GetZoomFactor() const {
-+=======
-+double WebContents::GetZoomFactor() {
-+>>>>>>> .their
-   auto level = GetZoomLevel();
-   return content::ZoomLevelToZoomFactor(level);
- }
-@@ -1853,6 +1993,7 @@
-   rfh->Send(reply_msg);
- }
- 
-+<<<<<<< .our
- v8::Local<v8::Value> WebContents::GetPreloadPath(v8::Isolate* isolate) const {
-   if (auto* web_preferences = WebContentsPreferences::From(web_contents())) {
-     base::FilePath::StringType preload;
-@@ -1880,6 +2021,24 @@
- }
- 
- v8::Local<v8::Value> WebContents::GetOwnerBrowserWindow() const {
-+=======
-+v8::Local<v8::Value> WebContents::GetWebPreferences(v8::Isolate* isolate) {
-+  auto* web_preferences = WebContentsPreferences::From(web_contents());
-+  if (!web_preferences)
-+    return v8::Null(isolate);
-+  return mate::ConvertToV8(isolate, *web_preferences->dict());
-+}
-+
-+v8::Local<v8::Value> WebContents::GetLastWebPreferences(v8::Isolate* isolate) {
-+  WebContentsPreferences* web_preferences =
-+      WebContentsPreferences::FromWebContents(web_contents());
-+  if (!web_preferences)
-+    return v8::Null(isolate);
-+  return mate::ConvertToV8(isolate, *web_preferences->last_dict());
-+}
-+
-+v8::Local<v8::Value> WebContents::GetOwnerBrowserWindow() {
-+>>>>>>> .their
-   if (owner_window())
-     return BrowserWindow::From(isolate(), owner_window());
-   else
-@@ -1961,6 +2120,10 @@
-   prototype->SetClassName(mate::StringToV8(isolate, "WebContents"));
-   mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
-       .MakeDestroyable()
-+<<<<<<< .our
-+=======
-+      .SetMethod("getId", &WebContents::GetID)
-+>>>>>>> .their
-       .SetMethod("getProcessId", &WebContents::GetProcessID)
-       .SetMethod("getOSProcessId", &WebContents::GetOSProcessID)
-       .SetMethod("equal", &WebContents::Equal)
-@@ -1990,7 +2153,10 @@
-       .SetMethod("setIgnoreMenuShortcuts", &WebContents::SetIgnoreMenuShortcuts)
-       .SetMethod("setAudioMuted", &WebContents::SetAudioMuted)
-       .SetMethod("isAudioMuted", &WebContents::IsAudioMuted)
-+<<<<<<< .our
-       .SetMethod("isCurrentlyAudible", &WebContents::IsCurrentlyAudible)
-+=======
-+>>>>>>> .their
-       .SetMethod("undo", &WebContents::Undo)
-       .SetMethod("redo", &WebContents::Redo)
-       .SetMethod("cut", &WebContents::Cut)
-@@ -2012,8 +2178,13 @@
-       .SetMethod("beginFrameSubscription", &WebContents::BeginFrameSubscription)
-       .SetMethod("endFrameSubscription", &WebContents::EndFrameSubscription)
-       .SetMethod("startDrag", &WebContents::StartDrag)
-+<<<<<<< .our
-       .SetMethod("isGuest", &WebContents::IsGuest)
-       .SetMethod("attachToIframe", &WebContents::AttachToIframe)
-+=======
-+      .SetMethod("setSize", &WebContents::SetSize)
-+      .SetMethod("isGuest", &WebContents::IsGuest)
-+>>>>>>> .their
-       .SetMethod("isOffscreen", &WebContents::IsOffScreen)
-       .SetMethod("startPainting", &WebContents::StartPainting)
-       .SetMethod("stopPainting", &WebContents::StopPainting)
-@@ -2026,7 +2197,10 @@
-       .SetMethod("setZoomFactor", &WebContents::SetZoomFactor)
-       .SetMethod("_getZoomFactor", &WebContents::GetZoomFactor)
-       .SetMethod("getType", &WebContents::GetType)
-+<<<<<<< .our
-       .SetMethod("_getPreloadPath", &WebContents::GetPreloadPath)
-+=======
-+>>>>>>> .their
-       .SetMethod("getWebPreferences", &WebContents::GetWebPreferences)
-       .SetMethod("getLastWebPreferences", &WebContents::GetLastWebPreferences)
-       .SetMethod("getOwnerBrowserWindow", &WebContents::GetOwnerBrowserWindow)
-added in both
-  our    100644 7939f8268aa8c3371623e0c15f3b6001d7f1efa4 atom/browser/api/atom_api_web_contents.h
-  their  100644 2155656ccbdcc34731bcb01b99a89b7c321a96da atom/browser/api/atom_api_web_contents.h
-@@ -42,6 +42,10 @@
- 
- namespace atom {
- 
-+<<<<<<< .our
-+=======
-+struct SetSizeParams;
-+>>>>>>> .their
- class AtomBrowserContext;
- class AtomJavaScriptDialogManager;
- class WebContentsZoomController;
-@@ -97,9 +101,18 @@
-   static void BuildPrototype(v8::Isolate* isolate,
-                              v8::Local<v8::FunctionTemplate> prototype);
- 
-+<<<<<<< .our
-   // Notifies to destroy any guest web contents before destroying self.
-   void DestroyWebContents(bool async);
- 
-+=======
-+  static int64_t GetIDForContents(content::WebContents* web_contents);
-+
-+  // Notifies to destroy any guest web contents before destroying self.
-+  void DestroyWebContents(bool async);
-+
-+  int64_t GetID() const;
-+>>>>>>> .their
-   int GetProcessID() const;
-   base::ProcessId GetOSProcessID() const;
-   Type GetType() const;
-@@ -139,7 +152,10 @@
-   void SetIgnoreMenuShortcuts(bool ignore);
-   void SetAudioMuted(bool muted);
-   bool IsAudioMuted();
-+<<<<<<< .our
-   bool IsCurrentlyAudible();
-+=======
-+>>>>>>> .their
-   void Print(mate::Arguments* args);
-   std::vector<printing::PrinterBasicInfo> GetPrinterList();
-   void SetEmbedder(const WebContents* embedder);
-@@ -196,9 +212,14 @@
-   void CapturePage(mate::Arguments* args);
- 
-   // Methods for creating <webview>.
-+<<<<<<< .our
-   bool IsGuest() const;
-   void AttachToIframe(content::WebContents* embedder_web_contents,
-                       int embedder_frame_id);
-+=======
-+  void SetSize(const SetSizeParams& params);
-+  bool IsGuest() const;
-+>>>>>>> .their
- 
-   // Methods for offscreen rendering
-   bool IsOffScreen() const;
-@@ -213,9 +234,15 @@
- 
-   // Methods for zoom handling.
-   void SetZoomLevel(double level);
-+<<<<<<< .our
-   double GetZoomLevel() const;
-   void SetZoomFactor(double factor);
-   double GetZoomFactor() const;
-+=======
-+  double GetZoomLevel();
-+  void SetZoomFactor(double factor);
-+  double GetZoomFactor();
-+>>>>>>> .their
- 
-   // Callback triggered on permission response.
-   void OnEnterFullscreenModeForTab(content::WebContents* source,
-@@ -230,6 +257,7 @@
-                       const std::vector<std::string>& features,
-                       const scoped_refptr<network::ResourceRequestBody>& body);
- 
-+<<<<<<< .our
-   // Returns the preload script path of current WebContents.
-   v8::Local<v8::Value> GetPreloadPath(v8::Isolate* isolate) const;
- 
-@@ -239,6 +267,14 @@
- 
-   // Returns the owner window.
-   v8::Local<v8::Value> GetOwnerBrowserWindow() const;
-+=======
-+  // Returns the web preferences of current WebContents.
-+  v8::Local<v8::Value> GetWebPreferences(v8::Isolate* isolate);
-+  v8::Local<v8::Value> GetLastWebPreferences(v8::Isolate* isolate);
-+
-+  // Returns the owner window.
-+  v8::Local<v8::Value> GetOwnerBrowserWindow();
-+>>>>>>> .their
- 
-   // Grants the child process the capability to access URLs with the origin of
-   // the specified URL.
-@@ -340,6 +376,11 @@
-       const content::BluetoothChooser::EventHandler& handler) override;
-   content::JavaScriptDialogManager* GetJavaScriptDialogManager(
-       content::WebContents* source) override;
-+<<<<<<< .our
-+=======
-+  void ResizeDueToAutoResize(content::WebContents* web_contents,
-+                             const gfx::Size& new_size) override;
-+>>>>>>> .their
- 
-   // content::WebContentsObserver:
-   void BeforeUnloadFired(const base::TimeTicks& proceed_time) override;
-added in both
-  our    100644 c088196f833160ac964e67030fa083302dd090b0 atom/browser/api/atom_api_web_request.cc
-  their  100644 ac265fb168ae6d90844c00d5c40e0646875d0cab atom/browser/api/atom_api_web_request.cc
-@@ -95,7 +95,11 @@
-   }
- 
-   brightray::URLRequestContextGetter* url_request_context_getter =
-+<<<<<<< .our
-       browser_context_->GetRequestContext();
-+=======
-+      browser_context_->url_request_context_getter();
-+>>>>>>> .their
-   if (!url_request_context_getter)
-     return;
-   BrowserThread::PostTask(
-added in both
-  our    100644 e24d6306f62a63331304617c969db410db0ae0c4 atom/browser/api/atom_api_web_view_manager.cc
-  their  100644 27fb2cf3fc3956ae5366a2e86ed50fbda3f94072 atom/browser/api/atom_api_web_view_manager.cc
-@@ -10,7 +10,10 @@
- #include "atom/common/options_switches.h"
- #include "content/public/browser/browser_context.h"
- #include "native_mate/dictionary.h"
-+<<<<<<< .our
- 
-+=======
-+>>>>>>> .their
- // Must be the last in the includes list.
- // See https://github.com/electron/electron/issues/10363
- #include "atom/common/node_includes.h"
-added in both
-  our    100644 7bcb7ab9370a8b3fe245c9569c93dbbdac0a0697 atom/browser/api/frame_subscriber.cc
-  their  100644 4b1234d5677e15b9c77d1e8a80e2be159b7d75e7 atom/browser/api/frame_subscriber.cc
-@@ -83,7 +83,11 @@
-                                        : frame;
- 
-   size_t rgb_row_size = bitmap.width() * bitmap.bytesPerPixel();
-+<<<<<<< .our
-   auto* source = static_cast<const char*>(bitmap.getPixels());
-+=======
-+  auto source = static_cast<const char*>(bitmap.getPixels());
-+>>>>>>> .their
- 
-   v8::MaybeLocal<v8::Object> buffer =
-       node::Buffer::Copy(isolate_, source, rgb_row_size * bitmap.height());
-added in both
-  our    100644 d3e82855417cb59c0449f1c1b685970ffaea2af6 atom/browser/api/frame_subscriber.h
-  their  100644 3de976f3051139f7ebd3a63da7455faf9d69ef76 atom/browser/api/frame_subscriber.h
-@@ -29,7 +29,11 @@
-                   content::WebContents* web_contents,
-                   const FrameCaptureCallback& callback,
-                   bool only_dirty);
-+<<<<<<< .our
-   ~FrameSubscriber() override;
-+=======
-+  ~FrameSubscriber();
-+>>>>>>> .their
- 
-  private:
-   gfx::Rect GetDamageRect();
-added in both
-  our    100644 57c4ee582405e6d501ec23940ccb10689ecd64a1 atom/browser/atom_browser_client.cc
-  their  100644 9475e5f79fa614f3dab4f488b6d14ef10fc2da97 atom/browser/atom_browser_client.cc
-@@ -17,6 +17,10 @@
- #include "atom/browser/atom_resource_dispatcher_host_delegate.h"
- #include "atom/browser/atom_speech_recognition_manager_delegate.h"
- #include "atom/browser/child_web_contents_tracker.h"
-+<<<<<<< .our
-+=======
-+#include "atom/browser/login_handler.h"
-+>>>>>>> .their
- #include "atom/browser/native_window.h"
- #include "atom/browser/session_preferences.h"
- #include "atom/browser/web_contents_permission_helper.h"
-@@ -31,6 +35,10 @@
- #include "base/strings/string_number_conversions.h"
- #include "base/strings/string_util.h"
- #include "chrome/browser/printing/printing_message_filter.h"
-+<<<<<<< .our
-+=======
-+#include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h"
-+>>>>>>> .their
- #include "chrome/browser/speech/tts_message_filter.h"
- #include "content/public/browser/browser_ppapi_host.h"
- #include "content/public/browser/client_certificate_delegate.h"
-@@ -60,10 +68,13 @@
- #include "net/ssl/client_cert_store.h"
- #endif
- 
-+<<<<<<< .our
- #if defined(ENABLE_PEPPER_FLASH)
- #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h"
- #endif  // defined(ENABLE_PEPPER_FLASH)
- 
-+=======
-+>>>>>>> .their
- using content::BrowserThread;
- 
- namespace atom {
-@@ -251,11 +262,19 @@
-     return;
- 
-   // Do we have an affinity site to manage ?
-+<<<<<<< .our
-   auto* web_contents = content::WebContents::FromRenderFrameHost(rfh);
-   auto* web_preferences = WebContentsPreferences::From(web_contents);
-   std::string affinity;
-   if (web_preferences &&
-       web_preferences->GetPreference("affinity", &affinity) &&
-+=======
-+  std::string affinity;
-+  auto* web_contents = content::WebContents::FromRenderFrameHost(rfh);
-+  auto* web_preferences = WebContentsPreferences::From(web_contents);
-+  if (web_preferences &&
-+      web_preferences->dict()->GetString("affinity", &affinity) &&
-+>>>>>>> .their
-       !affinity.empty()) {
-     affinity = base::ToLowerASCII(affinity);
-     auto iter = site_per_affinities.find(affinity);
-@@ -343,14 +362,26 @@
-       web_preferences->AppendCommandLineSwitches(command_line);
-     SessionPreferences::AppendExtraCommandLineSwitches(
-         web_contents->GetBrowserContext(), command_line);
-+<<<<<<< .our
-+=======
-+
-+    auto context_id = atom::api::WebContents::GetIDForContents(web_contents);
-+    command_line->AppendSwitchASCII(switches::kContextId,
-+                                    base::IntToString(context_id));
-+>>>>>>> .their
-   }
- }
- 
- void AtomBrowserClient::DidCreatePpapiPlugin(content::BrowserPpapiHost* host) {
-+<<<<<<< .our
- #if defined(ENABLE_PEPPER_FLASH)
-   host->GetPpapiHost()->AddHostFactoryFilter(
-       base::WrapUnique(new ChromeBrowserPepperHostFactory(host)));
- #endif
-+=======
-+  host->GetPpapiHost()->AddHostFactoryFilter(
-+      base::WrapUnique(new chrome::ChromeBrowserPepperHostFactory(host)));
-+>>>>>>> .their
- }
- 
- void AtomBrowserClient::GetGeolocationRequestContext(
-@@ -495,6 +526,22 @@
- #endif
- }
- 
-+<<<<<<< .our
-+=======
-+content::ResourceDispatcherHostLoginDelegate*
-+AtomBrowserClient::CreateLoginDelegate(
-+    net::AuthChallengeInfo* auth_info,
-+    content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
-+    bool is_main_frame,
-+    const GURL& url,
-+    bool first_auth_attempt,
-+    const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-+        auth_required_callback) {
-+  return new LoginHandler(auth_info, web_contents_getter, url,
-+                          auth_required_callback);
-+}
-+
-+>>>>>>> .their
- brightray::BrowserMainParts* AtomBrowserClient::OverrideCreateBrowserMainParts(
-     const content::MainFunctionParams&) {
-   v8::V8::Initialize();  // Init V8 before creating main parts.
-added in both
-  our    100644 a0284cf3f72e9cd4292b636948f92bb09b97f0ae atom/browser/atom_browser_client.h
-  their  100644 51cd6ebc6f01b916af0889b7308909a416b92bf0 atom/browser/atom_browser_client.h
-@@ -106,6 +106,17 @@
-   void SiteInstanceDeleting(content::SiteInstance* site_instance) override;
-   std::unique_ptr<net::ClientCertStore> CreateClientCertStore(
-       content::ResourceContext* resource_context) override;
-+<<<<<<< .our
-+=======
-+  content::ResourceDispatcherHostLoginDelegate* CreateLoginDelegate(
-+      net::AuthChallengeInfo* auth_info,
-+      content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
-+      bool is_main_frame,
-+      const GURL& url,
-+      bool first_auth_attempt,
-+      const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-+          auth_required_callback) override;
-+>>>>>>> .their
- 
-   // brightray::BrowserClient:
-   brightray::BrowserMainParts* OverrideCreateBrowserMainParts(
-added in both
-  our    100644 e036cbc8103f19a034ce386940462f8a23ea6807 atom/browser/atom_browser_context.cc
-  their  100644 e3dbfedc0c2d70762301b86f3138cc325131e7f5 atom/browser/atom_browser_context.cc
-@@ -4,31 +4,79 @@
- 
- #include "atom/browser/atom_browser_context.h"
- 
-+<<<<<<< .our
-+=======
-+#include "atom/browser/api/atom_api_protocol.h"
-+>>>>>>> .their
- #include "atom/browser/atom_blob_reader.h"
- #include "atom/browser/atom_browser_main_parts.h"
- #include "atom/browser/atom_download_manager_delegate.h"
- #include "atom/browser/atom_permission_manager.h"
- #include "atom/browser/browser.h"
-+<<<<<<< .our
- #include "atom/browser/request_context_delegate.h"
- #include "atom/browser/special_storage_policy.h"
-+=======
-+#include "atom/browser/net/about_protocol_handler.h"
-+#include "atom/browser/net/asar/asar_protocol_handler.h"
-+#include "atom/browser/net/atom_cert_verifier.h"
-+#include "atom/browser/net/atom_network_delegate.h"
-+#include "atom/browser/net/atom_url_request_job_factory.h"
-+#include "atom/browser/net/cookie_details.h"
-+#include "atom/browser/net/http_protocol_handler.h"
-+>>>>>>> .their
- #include "atom/browser/web_view_manager.h"
- #include "atom/common/atom_version.h"
- #include "atom/common/chrome_version.h"
- #include "atom/common/options_switches.h"
- #include "base/command_line.h"
- #include "base/files/file_path.h"
-+<<<<<<< .our
- #include "base/path_service.h"
- #include "base/strings/stringprintf.h"
-+=======
-+#include "base/memory/ptr_util.h"
-+#include "base/path_service.h"
-+#include "base/strings/string_util.h"
-+#include "base/strings/stringprintf.h"
-+#include "base/task_scheduler/post_task.h"
-+>>>>>>> .their
- #include "chrome/common/chrome_paths.h"
- #include "chrome/common/pref_names.h"
- #include "components/prefs/pref_registry_simple.h"
- #include "content/browser/blob_storage/chrome_blob_storage_context.h"
-+<<<<<<< .our
- #include "content/public/common/user_agent.h"
-+=======
-+#include "content/public/browser/browser_thread.h"
-+#include "content/public/browser/storage_partition.h"
-+#include "content/public/common/url_constants.h"
-+#include "content/public/common/user_agent.h"
-+#include "net/ftp/ftp_network_layer.h"
-+#include "net/url_request/data_protocol_handler.h"
-+#include "net/url_request/ftp_protocol_handler.h"
-+#include "net/url_request/url_request_context.h"
-+#include "net/url_request/url_request_intercepting_job_factory.h"
-+#include "url/url_constants.h"
-+
-+using content::BrowserThread;
-+>>>>>>> .their
- 
- namespace atom {
- 
- namespace {
- 
-+<<<<<<< .our
-+=======
-+class NoCacheBackend : public net::HttpCache::BackendFactory {
-+  int CreateBackend(net::NetLog* net_log,
-+                    std::unique_ptr<disk_cache::Backend>* backend,
-+                    const net::CompletionCallback& callback) override {
-+    return net::ERR_FAILED;
-+  }
-+};
-+
-+>>>>>>> .their
- std::string RemoveWhitespace(const std::string& str) {
-   std::string trimmed;
-   if (base::RemoveChars(str, " ", &trimmed))
-@@ -42,9 +90,13 @@
- AtomBrowserContext::AtomBrowserContext(const std::string& partition,
-                                        bool in_memory,
-                                        const base::DictionaryValue& options)
-+<<<<<<< .our
-     : brightray::BrowserContext(partition, in_memory),
-       url_request_context_getter_(nullptr),
-       storage_policy_(new SpecialStoragePolicy) {
-+=======
-+    : brightray::BrowserContext(partition, in_memory) {
-+>>>>>>> .their
-   // Construct user agent string.
-   Browser* browser = Browser::Get();
-   std::string name = RemoveWhitespace(browser->GetName());
-@@ -60,24 +112,104 @@
-   user_agent_ = content::BuildUserAgentFromProduct(user_agent);
- 
-   // Read options.
-+<<<<<<< .our
-   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-   bool use_cache = !command_line->HasSwitch(switches::kDisableHttpCache);
-   options.GetBoolean("cache", &use_cache);
- 
-   request_context_delegate_.reset(new RequestContextDelegate(use_cache));
-+=======
-+  use_cache_ = true;
-+  options.GetBoolean("cache", &use_cache_);
-+>>>>>>> .their
- 
-   // Initialize Pref Registry in brightray.
-   InitPrefs();
- }
- 
-+<<<<<<< .our
- AtomBrowserContext::~AtomBrowserContext() {
-   url_request_context_getter_->set_delegate(nullptr);
- }
-+=======
-+AtomBrowserContext::~AtomBrowserContext() {}
-+>>>>>>> .their
- 
- void AtomBrowserContext::SetUserAgent(const std::string& user_agent) {
-   user_agent_ = user_agent;
- }
- 
-+<<<<<<< .our
-+=======
-+std::unique_ptr<base::CallbackList<void(const CookieDetails*)>::Subscription>
-+AtomBrowserContext::RegisterCookieChangeCallback(
-+    const base::Callback<void(const CookieDetails*)>& cb) {
-+  return cookie_change_sub_list_.Add(cb);
-+}
-+
-+std::unique_ptr<net::NetworkDelegate>
-+AtomBrowserContext::CreateNetworkDelegate() {
-+  return std::make_unique<AtomNetworkDelegate>();
-+}
-+
-+std::string AtomBrowserContext::GetUserAgent() {
-+  return user_agent_;
-+}
-+
-+std::unique_ptr<net::URLRequestJobFactory>
-+AtomBrowserContext::CreateURLRequestJobFactory(
-+    content::ProtocolHandlerMap* protocol_handlers) {
-+  std::unique_ptr<AtomURLRequestJobFactory> job_factory(
-+      new AtomURLRequestJobFactory);
-+
-+  for (auto& it : *protocol_handlers) {
-+    job_factory->SetProtocolHandler(it.first,
-+                                    base::WrapUnique(it.second.release()));
-+  }
-+  protocol_handlers->clear();
-+
-+  job_factory->SetProtocolHandler(url::kAboutScheme,
-+                                  base::WrapUnique(new AboutProtocolHandler));
-+  job_factory->SetProtocolHandler(
-+      url::kDataScheme, base::WrapUnique(new net::DataProtocolHandler));
-+  job_factory->SetProtocolHandler(
-+      url::kFileScheme,
-+      base::WrapUnique(
-+          new asar::AsarProtocolHandler(base::CreateTaskRunnerWithTraits(
-+              {base::MayBlock(), base::TaskPriority::USER_VISIBLE,
-+               base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN}))));
-+  job_factory->SetProtocolHandler(
-+      url::kHttpScheme,
-+      base::WrapUnique(new HttpProtocolHandler(url::kHttpScheme)));
-+  job_factory->SetProtocolHandler(
-+      url::kHttpsScheme,
-+      base::WrapUnique(new HttpProtocolHandler(url::kHttpsScheme)));
-+  job_factory->SetProtocolHandler(
-+      url::kWsScheme,
-+      base::WrapUnique(new HttpProtocolHandler(url::kWsScheme)));
-+  job_factory->SetProtocolHandler(
-+      url::kWssScheme,
-+      base::WrapUnique(new HttpProtocolHandler(url::kWssScheme)));
-+
-+  auto* host_resolver =
-+      url_request_context_getter()->GetURLRequestContext()->host_resolver();
-+  job_factory->SetProtocolHandler(
-+      url::kFtpScheme, net::FtpProtocolHandler::Create(host_resolver));
-+
-+  return std::move(job_factory);
-+}
-+
-+net::HttpCache::BackendFactory*
-+AtomBrowserContext::CreateHttpCacheBackendFactory(
-+    const base::FilePath& base_path) {
-+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-+  if (!use_cache_ || command_line->HasSwitch(switches::kDisableHttpCache))
-+    return new NoCacheBackend;
-+  else
-+    return brightray::BrowserContext::CreateHttpCacheBackendFactory(base_path);
-+}
-+
-+>>>>>>> .their
- content::DownloadManagerDelegate*
- AtomBrowserContext::GetDownloadManagerDelegate() {
-   if (!download_manager_delegate_.get()) {
-@@ -100,8 +232,29 @@
-   return permission_manager_.get();
- }
- 
-+<<<<<<< .our
- storage::SpecialStoragePolicy* AtomBrowserContext::GetSpecialStoragePolicy() {
-   return storage_policy_.get();
-+=======
-+std::unique_ptr<net::CertVerifier> AtomBrowserContext::CreateCertVerifier(
-+    brightray::RequireCTDelegate* ct_delegate) {
-+  return base::WrapUnique(new AtomCertVerifier(ct_delegate));
-+}
-+
-+std::vector<std::string> AtomBrowserContext::GetCookieableSchemes() {
-+  auto default_schemes = brightray::BrowserContext::GetCookieableSchemes();
-+  const auto& standard_schemes = atom::api::GetStandardSchemes();
-+  default_schemes.insert(default_schemes.end(), standard_schemes.begin(),
-+                         standard_schemes.end());
-+  return default_schemes;
-+}
-+
-+void AtomBrowserContext::NotifyCookieChange(const net::CanonicalCookie& cookie,
-+                                            bool removed,
-+                                            net::CookieChangeCause cause) {
-+  CookieDetails cookie_details(&cookie, removed, cause);
-+  cookie_change_sub_list_.Notify(&cookie_details);
-+>>>>>>> .their
- }
- 
- void AtomBrowserContext::RegisterPrefs(PrefRegistrySimple* pref_registry) {
-@@ -114,6 +267,7 @@
-   pref_registry->RegisterDictionaryPref(prefs::kDevToolsFileSystemPaths);
- }
- 
-+<<<<<<< .our
- std::string AtomBrowserContext::GetUserAgent() const {
-   return user_agent_;
- }
-@@ -124,6 +278,8 @@
-   url_request_context_getter_ = getter;
- }
- 
-+=======
-+>>>>>>> .their
- AtomBlobReader* AtomBrowserContext::GetBlobReader() {
-   if (!blob_reader_.get()) {
-     content::ChromeBlobStorageContext* blob_context =
-added in both
-  our    100644 9e6a841ceb8d11069a1a094bf7dbbd3a788918b3 atom/browser/atom_browser_context.h
-  their  100644 b60a4e682b0a77acf31def4ea2ef0b7dae187b99 atom/browser/atom_browser_context.h
-@@ -8,6 +8,7 @@
- #include <string>
- #include <vector>
- 
-+<<<<<<< .our
- #include "base/memory/scoped_refptr.h"
- #include "brightray/browser/browser_context.h"
- 
-@@ -15,14 +16,26 @@
- class SpecialStoragePolicy;
- }
- 
-+=======
-+#include "base/callback_list.h"
-+#include "brightray/browser/browser_context.h"
-+
-+>>>>>>> .their
- namespace atom {
- 
- class AtomBlobReader;
- class AtomDownloadManagerDelegate;
-+<<<<<<< .our
- class AtomPermissionManager;
- class RequestContextDelegate;
- class SpecialStoragePolicy;
- class WebViewManager;
-+=======
-+class AtomNetworkDelegate;
-+class AtomPermissionManager;
-+class WebViewManager;
-+struct CookieDetails;
-+>>>>>>> .their
- 
- class AtomBrowserContext : public brightray::BrowserContext {
-  public:
-@@ -35,12 +48,34 @@
-       const base::DictionaryValue& options = base::DictionaryValue());
- 
-   void SetUserAgent(const std::string& user_agent);
-+<<<<<<< .our
-   AtomBlobReader* GetBlobReader();
-+=======
-+  // Register callbacks that needs to notified on any cookie store changes.
-+  std::unique_ptr<base::CallbackList<void(const CookieDetails*)>::Subscription>
-+  RegisterCookieChangeCallback(
-+      const base::Callback<void(const CookieDetails*)>& cb);
-+
-+  // brightray::URLRequestContextGetter::Delegate:
-+  std::unique_ptr<net::NetworkDelegate> CreateNetworkDelegate() override;
-+  std::string GetUserAgent() override;
-+  std::unique_ptr<net::URLRequestJobFactory> CreateURLRequestJobFactory(
-+      content::ProtocolHandlerMap* protocol_handlers) override;
-+  net::HttpCache::BackendFactory* CreateHttpCacheBackendFactory(
-+      const base::FilePath& base_path) override;
-+  std::unique_ptr<net::CertVerifier> CreateCertVerifier(
-+      brightray::RequireCTDelegate* ct_delegate) override;
-+  std::vector<std::string> GetCookieableSchemes() override;
-+  void NotifyCookieChange(const net::CanonicalCookie& cookie,
-+                          bool removed,
-+                          net::CookieChangeCause cause) override;
-+>>>>>>> .their
- 
-   // content::BrowserContext:
-   content::DownloadManagerDelegate* GetDownloadManagerDelegate() override;
-   content::BrowserPluginGuestManager* GetGuestManager() override;
-   content::PermissionManager* GetPermissionManager() override;
-+<<<<<<< .our
-   storage::SpecialStoragePolicy* GetSpecialStoragePolicy() override;
- 
-   // brightray::BrowserContext:
-@@ -51,6 +86,19 @@
- 
-   RequestContextDelegate* GetRequestContextDelegate() const {
-     return request_context_delegate_.get();
-+=======
-+
-+  // brightray::BrowserContext:
-+  void RegisterPrefs(PrefRegistrySimple* pref_registry) override;
-+
-+  AtomBlobReader* GetBlobReader();
-+
-+  void set_cookie_change_subscription(
-+      std::unique_ptr<
-+          base::CallbackList<void(const CookieDetails*)>::Subscription>
-+          subscription) {
-+    cookie_change_subscription_.swap(subscription);
-+>>>>>>> .their
-   }
- 
-  protected:
-@@ -60,6 +108,7 @@
-   ~AtomBrowserContext() override;
- 
-  private:
-+<<<<<<< .our
-   brightray::URLRequestContextGetter* url_request_context_getter_;
- 
-   std::unique_ptr<AtomDownloadManagerDelegate> download_manager_delegate_;
-@@ -69,6 +118,18 @@
-   std::unique_ptr<AtomBlobReader> blob_reader_;
-   std::unique_ptr<RequestContextDelegate> request_context_delegate_;
-   std::string user_agent_;
-+=======
-+  std::unique_ptr<AtomDownloadManagerDelegate> download_manager_delegate_;
-+  std::unique_ptr<WebViewManager> guest_manager_;
-+  std::unique_ptr<AtomPermissionManager> permission_manager_;
-+  std::unique_ptr<AtomBlobReader> blob_reader_;
-+  std::string user_agent_;
-+  bool use_cache_;
-+
-+  base::CallbackList<void(const CookieDetails*)> cookie_change_sub_list_;
-+  std::unique_ptr<base::CallbackList<void(const CookieDetails*)>::Subscription>
-+      cookie_change_subscription_;
-+>>>>>>> .their
- 
-   DISALLOW_COPY_AND_ASSIGN(AtomBrowserContext);
- };
-added in both
-  our    100644 5229b19ca9af7845a3f2f13b7e0913f633b68b1d atom/browser/atom_browser_main_parts.cc
-  their  100644 13db661a2e65e99ad2b65731f162bb14599cfe37 atom/browser/atom_browser_main_parts.cc
-@@ -154,6 +154,7 @@
- 
-   // Wrap the uv loop with global env.
-   node_bindings_->set_uv_env(env);
-+<<<<<<< .our
- 
-   // We already initialized the feature list in
-   // brightray::BrowserMainParts::PreEarlyInitialization(), but
-@@ -162,6 +163,8 @@
-   // command-line changes.
-   base::FeatureList::ClearInstanceForTesting();
-   brightray::BrowserMainParts::InitializeFeatureList();
-+=======
-+>>>>>>> .their
- }
- 
- int AtomBrowserMainParts::PreCreateThreads() {
-added in both
-  our    100644 25fc326ebac3f2a5beb9199194067dae12c8229b atom/browser/atom_javascript_dialog_manager.cc
-  their  100644 c0c7be6302796cf774923757b466084816d897fe atom/browser/atom_javascript_dialog_manager.cc
-@@ -62,7 +62,11 @@
-   std::string checkbox;
-   if (origin_counts_[origin] > 1 && web_preferences &&
-       web_preferences->IsEnabled("safeDialogs") &&
-+<<<<<<< .our
-       !web_preferences->GetPreference("safeDialogsMessage", &checkbox)) {
-+=======
-+      !web_preferences->dict()->GetString("safeDialogsMessage", &checkbox)) {
-+>>>>>>> .their
-     checkbox = "Prevent this app from creating additional dialogs";
-   }
- 
-added in both
-  our    100644 ce35de64d60c6767ac52596c1b32e7bde5ceefa0 atom/browser/browser.cc
-  their  100644 2897b1157257b1646a0a52776d64afa90fc845a0 atom/browser/browser.cc
-@@ -8,7 +8,10 @@
- 
- #include "atom/browser/atom_browser_main_parts.h"
- #include "atom/browser/browser_observer.h"
-+<<<<<<< .our
- #include "atom/browser/login_handler.h"
-+=======
-+>>>>>>> .their
- #include "atom/browser/native_window.h"
- #include "atom/browser/window_list.h"
- #include "base/files/file_util.h"
-@@ -155,13 +158,17 @@
-     base::CreateDirectoryAndGetError(user_data, nullptr);
- 
-   is_ready_ = true;
-+<<<<<<< .our
-   if (ready_promise_) {
-     ready_promise_->Resolve();
-   }
-+=======
-+>>>>>>> .their
-   for (BrowserObserver& observer : observers_)
-     observer.OnFinishLaunching(launch_info);
- }
- 
-+<<<<<<< .our
- util::Promise* Browser::WhenReady(v8::Isolate* isolate) {
-   if (!ready_promise_) {
-     ready_promise_ = new util::Promise(isolate);
-@@ -172,13 +179,19 @@
-   return ready_promise_;
- }
- 
-+=======
-+>>>>>>> .their
- void Browser::OnAccessibilitySupportChanged() {
-   for (BrowserObserver& observer : observers_)
-     observer.OnAccessibilitySupportChanged();
- }
- 
- void Browser::RequestLogin(
-+<<<<<<< .our
-     scoped_refptr<LoginHandler> login_handler,
-+=======
-+    LoginHandler* login_handler,
-+>>>>>>> .their
-     std::unique_ptr<base::DictionaryValue> request_details) {
-   for (BrowserObserver& observer : observers_)
-     observer.OnLogin(login_handler, *(request_details.get()));
-added in both
-  our    100644 aed7d25c37da59c0dd5e09940a064c329353a0b2 atom/browser/browser.h
-  their  100644 39cc0f9812ac766ff70f3eabb62882c04a2bfd4f atom/browser/browser.h
-@@ -10,7 +10,10 @@
- 
- #include "atom/browser/browser_observer.h"
- #include "atom/browser/window_list_observer.h"
-+<<<<<<< .our
- #include "atom/common/promise_util.h"
-+=======
-+>>>>>>> .their
- #include "base/compiler_specific.h"
- #include "base/macros.h"
- #include "base/observer_list.h"
-@@ -34,6 +37,10 @@
- namespace atom {
- 
- class AtomMenuModel;
-+<<<<<<< .our
-+=======
-+class LoginHandler;
-+>>>>>>> .their
- 
- // This class is used for control application-wide operations.
- class Browser : public WindowListObserver {
-@@ -191,10 +198,13 @@
-     base::string16 description;
-     base::FilePath icon_path;
-     int icon_index;
-+<<<<<<< .our
- 
-     UserTask();
-     UserTask(const UserTask&);
-     ~UserTask();
-+=======
-+>>>>>>> .their
-   };
- 
-   // Add a custom task to jump list.
-@@ -233,7 +243,11 @@
-   void OnAccessibilitySupportChanged();
- 
-   // Request basic auth login.
-+<<<<<<< .our
-   void RequestLogin(scoped_refptr<LoginHandler> login_handler,
-+=======
-+  void RequestLogin(LoginHandler* login_handler,
-+>>>>>>> .their
-                     std::unique_ptr<base::DictionaryValue> request_details);
- 
-   void PreMainMessageLoopRun();
-@@ -245,7 +259,10 @@
-   bool is_shutting_down() const { return is_shutdown_; }
-   bool is_quiting() const { return is_quiting_; }
-   bool is_ready() const { return is_ready_; }
-+<<<<<<< .our
-   util::Promise* WhenReady(v8::Isolate* isolate);
-+=======
-+>>>>>>> .their
- 
-  protected:
-   // Returns the version of application bundle or executable file.
-@@ -281,8 +298,11 @@
- 
-   int badge_count_ = 0;
- 
-+<<<<<<< .our
-   util::Promise* ready_promise_ = nullptr;
- 
-+=======
-+>>>>>>> .their
- #if defined(OS_MACOSX)
-   base::DictionaryValue about_panel_options_;
- #endif
-added in both
-  our    100644 27e347eccebf006336d5d110c81717ecc45af9c3 atom/browser/browser_mac.mm
-  their  100644 19b27416a16dfedbe960ee42d6e6a98ca197a6cb atom/browser/browser_mac.mm
-@@ -336,9 +336,16 @@
-   for (base::DictionaryValue::Iterator iter(options); !iter.IsAtEnd();
-        iter.Advance()) {
-     std::string key = iter.key();
-+<<<<<<< .our
-     if (!key.empty() && iter.value().is_string()) {
-       key[0] = base::ToUpperASCII(key[0]);
-       about_panel_options_.SetString(key, iter.value().GetString());
-+=======
-+    std::string value;
-+    if (!key.empty() && iter.value().GetAsString(&value)) {
-+      key[0] = base::ToUpperASCII(key[0]);
-+      about_panel_options_.SetString(key, value);
-+>>>>>>> .their
-     }
-   }
- }
-added in both
-  our    100644 d518e8d6a7c6e8e30c09498883719a58c8a9f5e8 atom/browser/browser_observer.h
-  their  100644 fb47492aef564c347b0d574678e3ddbdff46c17e atom/browser/browser_observer.h
-@@ -7,8 +7,11 @@
- 
- #include <string>
- 
-+<<<<<<< .our
- #include "atom/browser/login_handler.h"
- #include "base/memory/scoped_refptr.h"
-+=======
-+>>>>>>> .their
- #include "build/build_config.h"
- 
- namespace base {
-@@ -17,6 +20,11 @@
- 
- namespace atom {
- 
-+<<<<<<< .our
-+=======
-+class LoginHandler;
-+
-+>>>>>>> .their
- class BrowserObserver {
-  public:
-   // The browser is about to close all windows.
-@@ -49,7 +57,11 @@
-   virtual void OnFinishLaunching(const base::DictionaryValue& launch_info) {}
- 
-   // The browser requests HTTP login.
-+<<<<<<< .our
-   virtual void OnLogin(scoped_refptr<LoginHandler> login_handler,
-+=======
-+  virtual void OnLogin(LoginHandler* login_handler,
-+>>>>>>> .their
-                        const base::DictionaryValue& request_details) {}
- 
-   // The browser's accessibility suppport has changed.
-added in both
-  our    100644 fc3b9f330a4958b0b1e30d41c2bebe091b135856 atom/browser/browser_win.cc
-  their  100644 d109129afbb40471006560d895d94aa7e9a0e288 atom/browser/browser_win.cc
-@@ -84,10 +84,13 @@
- 
- }  // namespace
- 
-+<<<<<<< .our
- Browser::UserTask::UserTask() = default;
- Browser::UserTask::UserTask(const UserTask&) = default;
- Browser::UserTask::~UserTask() = default;
- 
-+=======
-+>>>>>>> .their
- void Browser::Focus() {
-   // On Windows we just focus on the first window found for this process.
-   DWORD pid = GetCurrentProcessId();
-added in both
-  our    100644 b3b1195e044cd2c74b246aa13e9e85953d694477 atom/browser/common_web_contents_delegate.cc
-  their  100644 d5ab67eef25b489e46569076d5bd63ab92a6d325 atom/browser/common_web_contents_delegate.cc
-@@ -152,8 +152,12 @@
- 
- void CommonWebContentsDelegate::InitWithWebContents(
-     content::WebContents* web_contents,
-+<<<<<<< .our
-     AtomBrowserContext* browser_context,
-     bool is_guest) {
-+=======
-+    AtomBrowserContext* browser_context) {
-+>>>>>>> .their
-   browser_context_ = browser_context;
-   web_contents->SetDelegate(this);
- 
-@@ -166,8 +170,12 @@
-       !web_preferences || web_preferences->IsEnabled(options::kOffscreen);
- 
-   // Create InspectableWebContents.
-+<<<<<<< .our
-   web_contents_.reset(
-       brightray::InspectableWebContents::Create(web_contents, is_guest));
-+=======
-+  web_contents_.reset(brightray::InspectableWebContents::Create(web_contents));
-+>>>>>>> .their
-   web_contents_->SetDelegate(this);
- }
- 
-added in both
-  our    100644 5da5d20975b8e795e34c9d8c7649f6f0eb3d0a50 atom/browser/common_web_contents_delegate.h
-  their  100644 962f573dde88188d1964cb2d3aed084b2fdfc86f atom/browser/common_web_contents_delegate.h
-@@ -42,8 +42,12 @@
-   // Creates a InspectableWebContents object and takes onwership of
-   // |web_contents|.
-   void InitWithWebContents(content::WebContents* web_contents,
-+<<<<<<< .our
-                            AtomBrowserContext* browser_context,
-                            bool is_guest);
-+=======
-+                           AtomBrowserContext* browser_context);
-+>>>>>>> .their
- 
-   // Set the window as owner window.
-   void SetOwnerWindow(NativeWindow* owner_window);
-added in both
-  our    100644 2063c6197fce449d1692f1b067c17e043b1d37e4 atom/browser/login_handler.cc
-  their  100644 0bba530d6086001a6d4d049c6355487c6e5bf613 atom/browser/login_handler.cc
-@@ -5,7 +5,10 @@
- #include "atom/browser/login_handler.h"
- 
- #include "atom/browser/browser.h"
-+<<<<<<< .our
- #include "atom/common/native_mate_converters/net_converter.h"
-+=======
-+>>>>>>> .their
- #include "base/values.h"
- #include "content/public/browser/browser_thread.h"
- #include "content/public/browser/web_contents.h"
-@@ -16,6 +19,7 @@
- namespace atom {
- 
- LoginHandler::LoginHandler(
-+<<<<<<< .our
-     net::URLRequest* request,
-     const net::AuthChallengeInfo& auth_info,
-     const net::NetworkDelegate::AuthCallback& callback,
-@@ -33,15 +37,37 @@
- 
-   web_contents_getter_ =
-       resource_request_info->GetWebContentsGetterForRequest();
-+=======
-+    net::AuthChallengeInfo* auth_info,
-+    content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
-+    const GURL& url,
-+    const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-+        auth_required_callback)
-+    : auth_info_(auth_info),
-+      web_contents_getter_(web_contents_getter),
-+      auth_required_callback_(auth_required_callback) {
-+  // Fill request details on IO thread.
-+  // TODO(deepak1556): Fill in method and referrer details to
-+  // avoid breaking the app login event.
-+  std::unique_ptr<base::DictionaryValue> request_details(
-+      new base::DictionaryValue);
-+  request_details->SetKey("url", base::Value(url.spec()));
-+>>>>>>> .their
- 
-   BrowserThread::PostTask(
-       BrowserThread::UI, FROM_HERE,
-       base::BindOnce(&Browser::RequestLogin, base::Unretained(Browser::Get()),
-+<<<<<<< .our
-                      base::RetainedRef(this), std::move(request_details)));
-+=======
-+                     base::RetainedRef(WrapRefCounted(this)),
-+                     std::move(request_details)));
-+>>>>>>> .their
- }
- 
- LoginHandler::~LoginHandler() {}
- 
-+<<<<<<< .our
- void LoginHandler::Login(const base::string16& username,
-                          const base::string16& password) {
-   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-@@ -50,10 +76,26 @@
-       BrowserThread::IO, FROM_HERE,
-       base::BindOnce(&LoginHandler::DoLogin, weak_factory_.GetWeakPtr(),
-                      username, password));
-+=======
-+content::WebContents* LoginHandler::GetWebContents() const {
-+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-+  return web_contents_getter_.Run();
-+}
-+
-+void LoginHandler::Login(const base::string16& username,
-+                         const base::string16& password) {
-+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-+  if (TestAndSetAuthHandled())
-+    return;
-+  BrowserThread::PostTask(
-+      BrowserThread::IO, FROM_HERE,
-+      base::BindOnce(&LoginHandler::DoLogin, this, username, password));
-+>>>>>>> .their
- }
- 
- void LoginHandler::CancelAuth() {
-   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-+<<<<<<< .our
- 
-   BrowserThread::PostTask(
-       BrowserThread::IO, FROM_HERE,
-@@ -69,22 +111,52 @@
- content::WebContents* LoginHandler::GetWebContents() const {
-   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-   return web_contents_getter_.Run();
-+=======
-+  if (TestAndSetAuthHandled())
-+    return;
-+  BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
-+                          base::BindOnce(&LoginHandler::DoCancelAuth, this));
-+}
-+
-+void LoginHandler::OnRequestCancelled() {
-+  TestAndSetAuthHandled();
-+  auth_required_callback_.Reset();
-+}
-+
-+// Marks authentication as handled and returns the previous handled state.
-+bool LoginHandler::TestAndSetAuthHandled() {
-+  base::AutoLock lock(handled_auth_lock_);
-+  bool was_handled = handled_auth_;
-+  handled_auth_ = true;
-+  return was_handled;
-+>>>>>>> .their
- }
- 
- void LoginHandler::DoCancelAuth() {
-   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-+<<<<<<< .our
-   if (!auth_callback_.is_null())
-     std::move(auth_callback_)
-         .Run(net::NetworkDelegate::AUTH_REQUIRED_RESPONSE_CANCEL_AUTH);
-+=======
-+  if (!auth_required_callback_.is_null())
-+    std::move(auth_required_callback_).Run(base::nullopt);
-+>>>>>>> .their
- }
- 
- void LoginHandler::DoLogin(const base::string16& username,
-                            const base::string16& password) {
-   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-+<<<<<<< .our
-   if (!auth_callback_.is_null()) {
-     credentials_->Set(username, password);
-     std::move(auth_callback_)
-         .Run(net::NetworkDelegate::AUTH_REQUIRED_RESPONSE_SET_AUTH);
-+=======
-+  if (!auth_required_callback_.is_null()) {
-+    std::move(auth_required_callback_)
-+        .Run(net::AuthCredentials(username, password));
-+>>>>>>> .their
-   }
- }
- 
-added in both
-  our    100644 e7f1c5be0094506e01d2cccc0073fa864dfefb56 atom/browser/login_handler.h
-  their  100644 80ff986e0be400c13388607abfe48fe51ac6d512 atom/browser/login_handler.h
-@@ -6,16 +6,25 @@
- #define ATOM_BROWSER_LOGIN_HANDLER_H_
- 
- #include "base/callback.h"
-+<<<<<<< .our
- #include "base/memory/ref_counted.h"
- #include "base/memory/weak_ptr.h"
- #include "base/strings/string16.h"
- #include "content/public/browser/resource_request_info.h"
- #include "net/base/network_delegate.h"
-+=======
-+#include "base/optional.h"
-+#include "base/strings/string16.h"
-+#include "base/synchronization/lock.h"
-+#include "content/public/browser/resource_dispatcher_host_login_delegate.h"
-+#include "content/public/browser/resource_request_info.h"
-+>>>>>>> .their
- 
- namespace content {
- class WebContents;
- }
- 
-+<<<<<<< .our
- namespace atom {
- 
- // Handles the HTTP basic auth, must be created on IO thread.
-@@ -26,10 +35,33 @@
-                const net::NetworkDelegate::AuthCallback& callback,
-                net::AuthCredentials* credentials,
-                const content::ResourceRequestInfo* resource_request_info);
-+=======
-+namespace net {
-+class AuthChallengeInfo;
-+class AuthCredentials;
-+}  // namespace net
-+
-+namespace atom {
-+
-+// Handles the HTTP basic auth, must be created on IO thread.
-+class LoginHandler : public content::ResourceDispatcherHostLoginDelegate {
-+ public:
-+  LoginHandler(
-+      net::AuthChallengeInfo* auth_info,
-+      content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
-+      const GURL& url,
-+      const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-+          auth_required_callback);
-+
-+  // Returns the WebContents associated with the request, must be called on UI
-+  // thread.
-+  content::WebContents* GetWebContents() const;
-+>>>>>>> .their
- 
-   // The auth is cancelled, must be called on UI thread.
-   void CancelAuth();
- 
-+<<<<<<< .our
-   // The URLRequest associated with the auth is destroyed.
-   void NotifyRequestDestroyed();
- 
-@@ -48,23 +80,55 @@
- 
-   ~LoginHandler();
- 
-+=======
-+  // Login with |username| and |password|, must be called on UI thread.
-+  void Login(const base::string16& username, const base::string16& password);
-+
-+  const net::AuthChallengeInfo* auth_info() const { return auth_info_.get(); }
-+
-+ protected:
-+  ~LoginHandler() override;
-+
-+  // content::ResourceDispatcherHostLoginDelegate:
-+  void OnRequestCancelled() override;
-+
-+ private:
-+>>>>>>> .their
-   // Must be called on IO thread.
-   void DoCancelAuth();
-   void DoLogin(const base::string16& username, const base::string16& password);
- 
-+<<<<<<< .our
-   // Credentials to be used for the auth.
-   net::AuthCredentials* credentials_;
- 
-   // Who/where/what asked for the authentication.
-   const net::AuthChallengeInfo& auth_info_;
-+=======
-+  // Marks authentication as handled and returns the previous handled
-+  // state.
-+  bool TestAndSetAuthHandled();
-+
-+  // True if we've handled auth (Login or CancelAuth has been called).
-+  bool handled_auth_ = false;
-+  mutable base::Lock handled_auth_lock_;
-+
-+  // Who/where/what asked for the authentication.
-+  scoped_refptr<net::AuthChallengeInfo> auth_info_;
-+>>>>>>> .their
- 
-   // WebContents associated with the login request.
-   content::ResourceRequestInfo::WebContentsGetter web_contents_getter_;
- 
-+<<<<<<< .our
-   // Called with preferred value of net::NetworkDelegate::AuthRequiredResponse.
-   net::NetworkDelegate::AuthCallback auth_callback_;
- 
-   base::WeakPtrFactory<LoginHandler> weak_factory_;
-+=======
-+  base::Callback<void(const base::Optional<net::AuthCredentials>&)>
-+      auth_required_callback_;
-+>>>>>>> .their
- 
-   DISALLOW_COPY_AND_ASSIGN(LoginHandler);
- };
-added in both
-  our    100644 4ff2bcfcabfd34d8563f9ed213c03655a99dd9c6 atom/browser/native_window.cc
-  their  100644 4048e2a32b251859efccb22d8fc03d8a6d22d672 atom/browser/native_window.cc
-@@ -355,10 +355,13 @@
-   return true;
- }
- 
-+<<<<<<< .our
- bool NativeWindow::SetWindowButtonVisibility(bool visible) {
-   return false;
- }
- 
-+=======
-+>>>>>>> .their
- double NativeWindow::GetAspectRatio() {
-   return aspect_ratio_;
- }
-@@ -458,12 +461,15 @@
-     observer.OnWindowRestore();
- }
- 
-+<<<<<<< .our
- void NativeWindow::NotifyWindowWillResize(const gfx::Rect& new_bounds,
-                                           bool* prevent_default) {
-   for (NativeWindowObserver& observer : observers_)
-     observer.OnWindowWillResize(new_bounds, prevent_default);
- }
- 
-+=======
-+>>>>>>> .their
- void NativeWindow::NotifyWindowResize() {
-   for (NativeWindowObserver& observer : observers_)
-     observer.OnWindowResize();
-added in both
-  our    100644 35b67e2dd230692c415a32aae5f0a5e99ab74ac0 atom/browser/native_window.h
-  their  100644 759d7cb202101710855c3fabada43c976c8543df atom/browser/native_window.h
-@@ -187,9 +187,12 @@
-   virtual void ToggleTabBar();
-   virtual bool AddTabbedWindow(NativeWindow* window);
- 
-+<<<<<<< .our
-   // Returns false if unsupported.
-   virtual bool SetWindowButtonVisibility(bool visible);
- 
-+=======
-+>>>>>>> .their
-   // Toggle the menu bar.
-   virtual void SetAutoHideMenuBar(bool auto_hide);
-   virtual bool IsMenuBarAutoHide();
-@@ -236,8 +239,11 @@
-   void NotifyWindowMinimize();
-   void NotifyWindowRestore();
-   void NotifyWindowMove();
-+<<<<<<< .our
-   void NotifyWindowWillResize(const gfx::Rect& new_bounds,
-                               bool* prevent_default);
-+=======
-+>>>>>>> .their
-   void NotifyWindowResize();
-   void NotifyWindowMoved();
-   void NotifyWindowScrollTouchBegin();
-added in both
-  our    100644 44a78198f44cdba9875e3fb27c8e2c87eaa6f33b atom/browser/native_window_mac.h
-  their  100644 54891c5b35af7a88c842e95b9b72a2f2be363681 atom/browser/native_window_mac.h
-@@ -119,8 +119,11 @@
-   void ToggleTabBar() override;
-   bool AddTabbedWindow(NativeWindow* window) override;
- 
-+<<<<<<< .our
-   bool SetWindowButtonVisibility(bool visible) override;
- 
-+=======
-+>>>>>>> .their
-   void SetVibrancy(const std::string& type) override;
-   void SetTouchBar(
-       const std::vector<mate::PersistentDictionary>& items) override;
-@@ -195,10 +198,13 @@
-   // The "titleBarStyle" option.
-   TitleBarStyle title_bar_style_ = NORMAL;
- 
-+<<<<<<< .our
-   // The visibility mode of window button controls when explicitly set through
-   // setWindowButtonVisibility().
-   base::Optional<bool> window_button_visibility_;
- 
-+=======
-+>>>>>>> .their
-   // Simple (pre-Lion) Fullscreen Settings
-   bool always_simple_fullscreen_ = false;
-   bool is_simple_fullscreen_ = false;
-added in both
-  our    100644 004263ec127709067e903ffbf31003b8844226b4 atom/browser/native_window_mac.mm
-  their  100644 2d8149668e5988c2f26c39678a57a9780ca150c6 atom/browser/native_window_mac.mm
-@@ -884,9 +884,14 @@
-       // Resize the window to accomodate the _entire_ screen size
-       fullscreenFrame.size.height -=
-           [[[NSApplication sharedApplication] mainMenu] menuBarHeight];
-+<<<<<<< .our
-     } else if (!window_button_visibility_.has_value()) {
-       // Lets keep previous behaviour - hide window controls in titled
-       // fullscreen mode when not specified otherwise.
-+=======
-+    } else {
-+      // No need to hide the title, but we should still hide the window buttons
-+>>>>>>> .their
-       [[window standardWindowButton:NSWindowZoomButton] setHidden:YES];
-       [[window standardWindowButton:NSWindowMiniaturizeButton] setHidden:YES];
-       [[window standardWindowButton:NSWindowCloseButton] setHidden:YES];
-@@ -905,6 +910,7 @@
-     if (!fullscreen_window_title()) {
-       // Restore the titlebar
-       SetStyleMask(true, NSTitledWindowMask);
-+<<<<<<< .our
-     }
- 
-     // Restore window controls visibility state
-@@ -916,6 +922,15 @@
-     [[window standardWindowButton:NSWindowCloseButton]
-         setHidden:window_button_hidden];
- 
-+=======
-+    } else {
-+      // Show the window buttons
-+      [[window standardWindowButton:NSWindowZoomButton] setHidden:NO];
-+      [[window standardWindowButton:NSWindowMiniaturizeButton] setHidden:NO];
-+      [[window standardWindowButton:NSWindowCloseButton] setHidden:NO];
-+    }
-+
-+>>>>>>> .their
-     [window setFrame:original_frame_ display:YES animate:YES];
- 
-     [NSApp setPresentationOptions:simple_fullscreen_options_];
-@@ -1153,6 +1168,7 @@
-   return true;
- }
- 
-+<<<<<<< .our
- bool NativeWindowMac::SetWindowButtonVisibility(bool visible) {
-   if (title_bar_style_ == CUSTOM_BUTTONS_ON_HOVER) {
-     return false;
-@@ -1166,6 +1182,8 @@
-   return true;
- }
- 
-+=======
-+>>>>>>> .their
- void NativeWindowMac::SetVibrancy(const std::string& type) {
-   if (@available(macOS 10.10, *)) {
-     NSView* vibrant_view = [window_ vibrantView];
-added in both
-  our    100644 c2a86ea6b65cd6091fa7e8018bed0b11c7390f23 atom/browser/native_window_observer.h
-  their  100644 33e9eb643254c9066bfafbae993d2f98c624a5f3 atom/browser/native_window_observer.h
-@@ -16,10 +16,13 @@
- #include <windows.h>
- #endif
- 
-+<<<<<<< .our
- namespace gfx {
- class Rect;
- }
- 
-+=======
-+>>>>>>> .their
- namespace atom {
- 
- class NativeWindowObserver {
-@@ -67,8 +70,11 @@
-   virtual void OnWindowUnmaximize() {}
-   virtual void OnWindowMinimize() {}
-   virtual void OnWindowRestore() {}
-+<<<<<<< .our
-   virtual void OnWindowWillResize(const gfx::Rect& new_bounds,
-                                   bool* prevent_default) {}
-+=======
-+>>>>>>> .their
-   virtual void OnWindowResize() {}
-   virtual void OnWindowMove() {}
-   virtual void OnWindowMoved() {}
-added in both
-  our    100644 0e61d18b915924eb3d3d14e40d1cbbd199631bed atom/browser/native_window_views_win.cc
-  their  100644 c9802b2e0a83680a2df01e18cd2674e4d114f2af atom/browser/native_window_views_win.cc
-@@ -164,7 +164,11 @@
- 
-       const DWORD obj_id = static_cast<DWORD>(l_param);
- 
-+<<<<<<< .our
-       if (obj_id != static_cast<DWORD>(OBJID_CLIENT)) {
-+=======
-+      if (obj_id != OBJID_CLIENT) {
-+>>>>>>> .their
-         return false;
-       }
- 
-@@ -174,7 +178,11 @@
- 
-       checked_for_a11y_support_ = true;
- 
-+<<<<<<< .our
-       auto* const axState = content::BrowserAccessibilityState::GetInstance();
-+=======
-+      const auto axState = content::BrowserAccessibilityState::GetInstance();
-+>>>>>>> .their
-       if (axState && !axState->IsAccessibleBrowser()) {
-         axState->OnScreenReaderDetected();
-         Browser::Get()->OnAccessibilitySupportChanged();
-@@ -187,6 +195,7 @@
-       if (HIWORD(w_param) == THBN_CLICKED)
-         return taskbar_host_.HandleThumbarButtonEvent(LOWORD(w_param));
-       return false;
-+<<<<<<< .our
-     case WM_SIZING: {
-       bool prevent_default = false;
-       NotifyWindowWillResize(gfx::Rect(*reinterpret_cast<RECT*>(l_param)),
-@@ -197,6 +206,8 @@
-       }
-       return false;
-     }
-+=======
-+>>>>>>> .their
-     case WM_SIZE: {
-       // Handle window state change.
-       HandleSizeEvent(w_param, l_param);
-@@ -208,8 +219,12 @@
-     }
-     case WM_MOVING: {
-       if (!movable_)
-+<<<<<<< .our
-         ::GetWindowRect(GetAcceleratedWidget(),
-                         reinterpret_cast<RECT*>(l_param));
-+=======
-+        ::GetWindowRect(GetAcceleratedWidget(), (LPRECT)l_param);
-+>>>>>>> .their
-       return false;
-     }
-     case WM_MOVE: {
-@@ -289,8 +304,11 @@
-               NotifyWindowRestore();
-             }
-             break;
-+<<<<<<< .our
-           default:
-             break;
-+=======
-+>>>>>>> .their
-         }
-       }
-       break;
-@@ -363,7 +381,11 @@
-   // the cursor since they are in a state where they would otherwise ignore all
-   // mouse input.
-   if (w_param == WM_MOUSEMOVE) {
-+<<<<<<< .our
-     for (auto* window : forwarding_windows_) {
-+=======
-+    for (auto window : forwarding_windows_) {
-+>>>>>>> .their
-       // At first I considered enumerating windows to check whether the cursor
-       // was directly above the window, but since nothing bad seems to happen
-       // if we post the message even if some other window occludes it I have
-added in both
-  our    100644 e71ea74317b69f31a5aac8e723902748972fed8f atom/browser/net/atom_network_delegate.cc
-  their  100644 2708de29712df615defbf95a109dc1b4a3c6400d atom/browser/net/atom_network_delegate.cc
-@@ -7,17 +7,24 @@
- #include <utility>
- 
- #include "atom/browser/api/atom_api_web_contents.h"
-+<<<<<<< .our
- #include "atom/browser/login_handler.h"
- #include "atom/common/native_mate_converters/net_converter.h"
- #include "atom/common/options_switches.h"
- #include "base/command_line.h"
-+=======
-+#include "atom/common/native_mate_converters/net_converter.h"
-+>>>>>>> .their
- #include "base/stl_util.h"
- #include "base/strings/string_util.h"
- #include "content/public/browser/browser_thread.h"
- #include "content/public/browser/render_frame_host.h"
-+<<<<<<< .our
- #include "content/public/browser/resource_request_info.h"
- #include "net/base/load_flags.h"
- #include "net/base/net_errors.h"
-+=======
-+>>>>>>> .their
- #include "net/url_request/url_request.h"
- #include "services/network/throttling/throttling_network_transaction.h"
- 
-@@ -128,7 +135,11 @@
-   std::string key;
-   std::string value;
-   while (headers->EnumerateHeaderLines(&iter, &key, &value)) {
-+<<<<<<< .our
-     if (dict->FindKey(key)) {
-+=======
-+    if (dict->HasKey(key)) {
-+>>>>>>> .their
-       base::ListValue* values = nullptr;
-       if (dict->GetList(key, &values))
-         values->AppendString(value);
-@@ -189,10 +200,16 @@
-     headers->Clear();
-     for (base::DictionaryValue::Iterator it(*dict); !it.IsAtEnd();
-          it.Advance()) {
-+<<<<<<< .our
-       if (it.value().is_string()) {
-         std::string value = it.value().GetString();
-         headers->SetHeader(it.key(), value);
-       }
-+=======
-+      std::string value;
-+      if (it.value().GetAsString(&value))
-+        headers->SetHeader(it.key(), value);
-+>>>>>>> .their
-     }
-   }
- }
-@@ -238,6 +255,7 @@
- AtomNetworkDelegate::ResponseListenerInfo::ResponseListenerInfo() = default;
- AtomNetworkDelegate::ResponseListenerInfo::~ResponseListenerInfo() = default;
- 
-+<<<<<<< .our
- AtomNetworkDelegate::AtomNetworkDelegate() {
-   auto* command_line = base::CommandLine::ForCurrentProcess();
-   if (command_line->HasSwitch(switches::kIgnoreConnectionsLimit)) {
-@@ -247,6 +265,9 @@
-         value, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
-   }
- }
-+=======
-+AtomNetworkDelegate::AtomNetworkDelegate() {}
-+>>>>>>> .their
- 
- AtomNetworkDelegate::~AtomNetworkDelegate() {}
- 
-@@ -277,6 +298,7 @@
-     net::URLRequest* request,
-     const net::CompletionCallback& callback,
-     GURL* new_url) {
-+<<<<<<< .our
-   if (!base::ContainsKey(response_listeners_, kOnBeforeRequest)) {
-     for (const auto& domain : ignore_connections_limit_domains_) {
-       if (request->url().DomainIs(domain)) {
-@@ -288,6 +310,11 @@
-     }
-     return net::OK;
-   }
-+=======
-+  if (!base::ContainsKey(response_listeners_, kOnBeforeRequest))
-+    return brightray::NetworkDelegate::OnBeforeURLRequest(request, callback,
-+                                                          new_url);
-+>>>>>>> .their
- 
-   return HandleResponseEvent(kOnBeforeRequest, request, callback, new_url);
- }
-@@ -301,7 +328,12 @@
-                            kDevToolsEmulateNetworkConditionsClientId,
-                        client_id_);
-   if (!base::ContainsKey(response_listeners_, kOnBeforeSendHeaders))
-+<<<<<<< .our
-     return net::OK;
-+=======
-+    return brightray::NetworkDelegate::OnBeforeStartTransaction(
-+        request, callback, headers);
-+>>>>>>> .their
- 
-   return HandleResponseEvent(kOnBeforeSendHeaders, request, callback, headers,
-                              *headers);
-@@ -310,8 +342,15 @@
- void AtomNetworkDelegate::OnStartTransaction(
-     net::URLRequest* request,
-     const net::HttpRequestHeaders& headers) {
-+<<<<<<< .our
-   if (!base::ContainsKey(simple_listeners_, kOnSendHeaders))
-     return;
-+=======
-+  if (!base::ContainsKey(simple_listeners_, kOnSendHeaders)) {
-+    brightray::NetworkDelegate::OnStartTransaction(request, headers);
-+    return;
-+  }
-+>>>>>>> .their
- 
-   HandleSimpleEvent(kOnSendHeaders, request, headers);
- }
-@@ -323,7 +362,12 @@
-     scoped_refptr<net::HttpResponseHeaders>* override,
-     GURL* allowed) {
-   if (!base::ContainsKey(response_listeners_, kOnHeadersReceived))
-+<<<<<<< .our
-     return net::OK;
-+=======
-+    return brightray::NetworkDelegate::OnHeadersReceived(
-+        request, callback, original, override, allowed);
-+>>>>>>> .their
- 
-   return HandleResponseEvent(
-       kOnHeadersReceived, request, callback,
-@@ -332,8 +376,15 @@
- 
- void AtomNetworkDelegate::OnBeforeRedirect(net::URLRequest* request,
-                                            const GURL& new_location) {
-+<<<<<<< .our
-   if (!base::ContainsKey(simple_listeners_, kOnBeforeRedirect))
-     return;
-+=======
-+  if (!base::ContainsKey(simple_listeners_, kOnBeforeRedirect)) {
-+    brightray::NetworkDelegate::OnBeforeRedirect(request, new_location);
-+    return;
-+  }
-+>>>>>>> .their
- 
-   HandleSimpleEvent(kOnBeforeRedirect, request, new_location,
-                     request->response_headers(), request->GetSocketAddress(),
-@@ -342,8 +393,15 @@
- 
- void AtomNetworkDelegate::OnResponseStarted(net::URLRequest* request,
-                                             int net_error) {
-+<<<<<<< .our
-   if (!base::ContainsKey(simple_listeners_, kOnResponseStarted))
-     return;
-+=======
-+  if (!base::ContainsKey(simple_listeners_, kOnResponseStarted)) {
-+    brightray::NetworkDelegate::OnResponseStarted(request, net_error);
-+    return;
-+  }
-+>>>>>>> .their
- 
-   if (request->status().status() != net::URLRequestStatus::SUCCESS)
-     return;
-@@ -361,6 +419,7 @@
-     // Error event.
-     OnErrorOccurred(request, started);
-     return;
-+<<<<<<< .our
-   }
- 
-   if (request->response_headers() &&
-@@ -372,12 +431,27 @@
- 
-   if (!base::ContainsKey(simple_listeners_, kOnCompleted))
-     return;
-+=======
-+  } else if (request->response_headers() &&
-+             net::HttpResponseHeaders::IsRedirectResponseCode(
-+                 request->response_headers()->response_code())) {
-+    // Redirect event.
-+    brightray::NetworkDelegate::OnCompleted(request, started);
-+    return;
-+  }
-+
-+  if (!base::ContainsKey(simple_listeners_, kOnCompleted)) {
-+    brightray::NetworkDelegate::OnCompleted(request, started);
-+    return;
-+  }
-+>>>>>>> .their
- 
-   HandleSimpleEvent(kOnCompleted, request, request->response_headers(),
-                     request->was_cached());
- }
- 
- void AtomNetworkDelegate::OnURLRequestDestroyed(net::URLRequest* request) {
-+<<<<<<< .our
-   const auto& it = login_handler_map_.find(request->identifier());
-   if (it != login_handler_map_.end()) {
-     it->second->NotifyRequestDestroyed();
-@@ -464,6 +538,17 @@
-                                           bool started) {
-   if (!base::ContainsKey(simple_listeners_, kOnErrorOccurred))
-     return;
-+=======
-+  callbacks_.erase(request->identifier());
-+}
-+
-+void AtomNetworkDelegate::OnErrorOccurred(net::URLRequest* request,
-+                                          bool started) {
-+  if (!base::ContainsKey(simple_listeners_, kOnErrorOccurred)) {
-+    brightray::NetworkDelegate::OnCompleted(request, started);
-+    return;
-+  }
-+>>>>>>> .their
- 
-   HandleSimpleEvent(kOnErrorOccurred, request, request->was_cached(),
-                     request->status());
-@@ -542,8 +627,12 @@
-     uint64_t id,
-     T out,
-     const base::DictionaryValue& response) {
-+<<<<<<< .our
-   auto copy = base::DictionaryValue::From(
-       base::Value::ToUniquePtrValue(response.Clone()));
-+=======
-+  std::unique_ptr<base::DictionaryValue> copy = response.CreateDeepCopy();
-+>>>>>>> .their
-   BrowserThread::PostTask(
-       BrowserThread::IO, FROM_HERE,
-       base::BindOnce(&AtomNetworkDelegate::OnListenerResultInIO<T>,
-added in both
-  our    100644 39a7a8ddfcda17fd7d022331132b54485d07a279 atom/browser/net/atom_network_delegate.h
-  their  100644 9288b70cb422caf38485d33212ec4a4be4ceb97e atom/browser/net/atom_network_delegate.h
-@@ -8,14 +8,24 @@
- #include <map>
- #include <set>
- #include <string>
-+<<<<<<< .our
- #include <vector>
-+=======
-+>>>>>>> .their
- 
- #include "base/callback.h"
- #include "base/synchronization/lock.h"
- #include "base/values.h"
-+<<<<<<< .our
- #include "content/public/browser/resource_request_info.h"
- #include "extensions/common/url_pattern.h"
- #include "net/base/network_delegate.h"
-+=======
-+#include "brightray/browser/network_delegate.h"
-+#include "content/public/browser/resource_request_info.h"
-+#include "extensions/common/url_pattern.h"
-+#include "net/base/net_errors.h"
-+>>>>>>> .their
- #include "net/http/http_request_headers.h"
- #include "net/http/http_response_headers.h"
- 
-@@ -27,9 +37,13 @@
- 
- const char* ResourceTypeToString(content::ResourceType type);
- 
-+<<<<<<< .our
- class LoginHandler;
- 
- class AtomNetworkDelegate : public net::NetworkDelegate {
-+=======
-+class AtomNetworkDelegate : public brightray::NetworkDelegate {
-+>>>>>>> .their
-  public:
-   using ResponseCallback = base::Callback<void(const base::DictionaryValue&)>;
-   using SimpleListener = base::Callback<void(const base::DictionaryValue&)>;
-@@ -88,10 +102,13 @@
-   int OnBeforeStartTransaction(net::URLRequest* request,
-                                const net::CompletionCallback& callback,
-                                net::HttpRequestHeaders* headers) override;
-+<<<<<<< .our
-   void OnBeforeSendHeaders(net::URLRequest* request,
-                            const net::ProxyInfo& proxy_info,
-                            const net::ProxyRetryInfoMap& proxy_retry_info,
-                            net::HttpRequestHeaders* headers) override {}
-+=======
-+>>>>>>> .their
-   void OnStartTransaction(net::URLRequest* request,
-                           const net::HttpRequestHeaders& headers) override;
-   int OnHeadersReceived(
-@@ -103,6 +120,7 @@
-   void OnBeforeRedirect(net::URLRequest* request,
-                         const GURL& new_location) override;
-   void OnResponseStarted(net::URLRequest* request, int net_error) override;
-+<<<<<<< .our
-   void OnNetworkBytesReceived(net::URLRequest* request,
-                               int64_t bytes_read) override {}
-   void OnNetworkBytesSent(net::URLRequest* request,
-@@ -140,6 +158,10 @@
-                                const GURL& endpoint) const override;
-   bool OnCanUseReportingClient(const url::Origin& origin,
-                                const GURL& endpoint) const override;
-+=======
-+  void OnCompleted(net::URLRequest* request, bool started) override;
-+  void OnURLRequestDestroyed(net::URLRequest* request) override;
-+>>>>>>> .their
- 
-  private:
-   void OnErrorOccurred(net::URLRequest* request, bool started);
-@@ -165,11 +187,17 @@
-                             T out,
-                             const base::DictionaryValue& response);
- 
-+<<<<<<< .our
-   std::map<uint64_t, scoped_refptr<LoginHandler>> login_handler_map_;
-   std::map<SimpleEvent, SimpleListenerInfo> simple_listeners_;
-   std::map<ResponseEvent, ResponseListenerInfo> response_listeners_;
-   std::map<uint64_t, net::CompletionCallback> callbacks_;
-   std::vector<std::string> ignore_connections_limit_domains_;
-+=======
-+  std::map<SimpleEvent, SimpleListenerInfo> simple_listeners_;
-+  std::map<ResponseEvent, ResponseListenerInfo> response_listeners_;
-+  std::map<uint64_t, net::CompletionCallback> callbacks_;
-+>>>>>>> .their
- 
-   // Client id for devtools network emulation.
-   std::string client_id_;
-added in both
-  our    100644 5ffbfd65a48b4459b2ebca66a5c2259f18ed80a8 atom/browser/net/atom_url_request.cc
-  their  100644 1aac780d88213871ab258845f8a0e3baf990cf27 atom/browser/net/atom_url_request.cc
-@@ -70,8 +70,16 @@
-     return nullptr;
-   }
-   scoped_refptr<brightray::URLRequestContextGetter> request_context_getter(
-+<<<<<<< .our
-       browser_context->GetRequestContext());
-   DCHECK(request_context_getter);
-+=======
-+      browser_context->url_request_context_getter());
-+  DCHECK(request_context_getter);
-+  if (!request_context_getter) {
-+    return nullptr;
-+  }
-+>>>>>>> .their
-   scoped_refptr<AtomURLRequest> atom_url_request(new AtomURLRequest(delegate));
-   if (content::BrowserThread::PostTask(
-           content::BrowserThread::IO, FROM_HERE,
-@@ -501,6 +509,7 @@
-     delegate_->OnError(error, isRequestError);
- }
- 
-+<<<<<<< .our
- void AtomURLRequest::GetUploadProgress(mate::Dictionary* progress) const {
-   net::UploadProgress upload_progress;
-   if (request_) {
-@@ -513,4 +522,6 @@
-   progress->Set("total", upload_progress.size());
- }
- 
-+=======
-+>>>>>>> .their
- }  // namespace atom
-added in both
-  our    100644 fde7b161385fb431b2d807012a00679a4bdb507a atom/browser/net/atom_url_request.h
-  their  100644 2b03ad7bc37ce6cfec1ff79ce183d37adf90749b atom/browser/net/atom_url_request.h
-@@ -43,7 +43,10 @@
-   void PassLoginInformation(const base::string16& username,
-                             const base::string16& password) const;
-   void SetLoadFlags(int flags) const;
-+<<<<<<< .our
-   void GetUploadProgress(mate::Dictionary* progress) const;
-+=======
-+>>>>>>> .their
- 
-  protected:
-   // Overrides of net::URLRequest::Delegate
-added in both
-  our    100644 59e3ab881c2355c2ed29b806de59ef372c170b62 atom/browser/net/js_asker.cc
-  their  100644 daf978082f102937d142dcddbdd860c92c709dbe atom/browser/net/js_asker.cc
-@@ -62,8 +62,13 @@
-     if (dict->GetInteger("error", error))
-       return true;
-   } else if (value->is_int()) {
-+<<<<<<< .our
-     *error = value->GetInt();
-     return true;
-+=======
-+    if (value->GetAsInteger(error))
-+      return true;
-+>>>>>>> .their
-   }
-   return false;
- }
-added in both
-  our    100644 1c15fd39b9d479b441b0931564f9e2c3f9de37c7 atom/browser/net/url_request_async_asar_job.cc
-  their  100644 06959032411d27e69ec441577b7a1987a2117080 atom/browser/net/url_request_async_asar_job.cc
-@@ -7,7 +7,10 @@
- #include <string>
- 
- #include "atom/common/atom_constants.h"
-+<<<<<<< .our
- #include "base/strings/utf_string_conversions.h"
-+=======
-+>>>>>>> .their
- #include "base/task_scheduler/post_task.h"
- 
- namespace atom {
-@@ -18,6 +21,7 @@
-     : JsAsker<asar::URLRequestAsarJob>(request, network_delegate) {}
- 
- void URLRequestAsyncAsarJob::StartAsync(std::unique_ptr<base::Value> options) {
-+<<<<<<< .our
-   std::string file_path;
-   if (options->is_dict()) {
-     auto* path_value =
-@@ -26,6 +30,14 @@
-       file_path = path_value->GetString();
-   } else if (options->is_string()) {
-     file_path = options->GetString();
-+=======
-+  base::FilePath::StringType file_path;
-+  if (options->is_dict()) {
-+    static_cast<base::DictionaryValue*>(options.get())
-+        ->GetString("path", &file_path);
-+  } else if (options->is_string()) {
-+    options->GetAsString(&file_path);
-+>>>>>>> .their
-   }
- 
-   if (file_path.empty()) {
-@@ -36,11 +48,15 @@
-         base::CreateSequencedTaskRunnerWithTraits(
-             {base::MayBlock(), base::TaskPriority::USER_VISIBLE,
-              base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN}),
-+<<<<<<< .our
- #if defined(OS_WIN)
-         base::FilePath(base::UTF8ToWide(file_path)));
- #else
-         base::FilePath(file_path));
- #endif
-+=======
-+        base::FilePath(file_path));
-+>>>>>>> .their
-     asar::URLRequestAsarJob::Start();
-   }
- }
-added in both
-  our    100644 68539433f4de80a96bc672de3a2834b299d6c04b atom/browser/net/url_request_fetch_job.cc
-  their  100644 09f7277ab6595e0e21d99e53a63d84ef6259de6d atom/browser/net/url_request_fetch_job.cc
-@@ -9,7 +9,10 @@
- 
- #include "atom/browser/api/atom_api_session.h"
- #include "atom/browser/atom_browser_context.h"
-+<<<<<<< .our
- #include "base/guid.h"
-+=======
-+>>>>>>> .their
- #include "base/memory/ptr_util.h"
- #include "base/strings/string_util.h"
- #include "native_mate/dictionary.h"
-@@ -94,15 +97,27 @@
-   if (options.Get("session", &val)) {
-     if (val->IsNull()) {
-       // We have to create the URLRequestContextGetter on UI thread.
-+<<<<<<< .our
-       custom_browser_context_ =
-           AtomBrowserContext::From(base::GenerateGUID(), true);
-       url_request_context_getter_ =
-           custom_browser_context_->GetRequestContext();
-+=======
-+      url_request_context_getter_ = new brightray::URLRequestContextGetter(
-+          this, nullptr, base::FilePath(), true,
-+          BrowserThread::GetTaskRunnerForThread(BrowserThread::IO), nullptr,
-+          content::URLRequestInterceptorScopedVector());
-+>>>>>>> .their
-     } else {
-       mate::Handle<api::Session> session;
-       if (mate::ConvertFromV8(isolate, val, &session) && !session.IsEmpty()) {
-         AtomBrowserContext* browser_context = session->browser_context();
-+<<<<<<< .our
-         url_request_context_getter_ = browser_context->GetRequestContext();
-+=======
-+        url_request_context_getter_ =
-+            browser_context->url_request_context_getter();
-+>>>>>>> .their
-       }
-     }
-   }
-added in both
-  our    100644 c38be1cbf86c72ac427b136cd5ebcb7fc0256d21 atom/browser/net/url_request_fetch_job.h
-  their  100644 d952074b20978f506fe727c182133e2122f7c572 atom/browser/net/url_request_fetch_job.h
-@@ -8,6 +8,7 @@
- #include <string>
- 
- #include "atom/browser/net/js_asker.h"
-+<<<<<<< .our
- #include "content/browser/streams/stream.h"
- #include "content/browser/streams/stream_read_observer.h"
- #include "net/url_request/url_fetcher_delegate.h"
-@@ -19,6 +20,18 @@
- 
- class URLRequestFetchJob : public JsAsker<net::URLRequestJob>,
-                            public net::URLFetcherDelegate {
-+=======
-+#include "brightray/browser/url_request_context_getter.h"
-+#include "content/browser/streams/stream.h"
-+#include "content/browser/streams/stream_read_observer.h"
-+#include "net/url_request/url_fetcher_delegate.h"
-+
-+namespace atom {
-+
-+class URLRequestFetchJob : public JsAsker<net::URLRequestJob>,
-+                           public net::URLFetcherDelegate,
-+                           public brightray::URLRequestContextGetter::Delegate {
-+>>>>>>> .their
-  public:
-   URLRequestFetchJob(net::URLRequest*, net::NetworkDelegate*);
-   ~URLRequestFetchJob() override;
-@@ -52,7 +65,10 @@
-   void ClearPendingBuffer();
-   void ClearWriteBuffer();
- 
-+<<<<<<< .our
-   scoped_refptr<AtomBrowserContext> custom_browser_context_;
-+=======
-+>>>>>>> .their
-   scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_;
-   std::unique_ptr<net::URLFetcher> fetcher_;
-   std::unique_ptr<net::HttpResponseInfo> response_info_;
-added in both
-  our    100644 31381ff118665f10a53e13fbe0044046738ca230 atom/browser/net/url_request_string_job.cc
-  their  100644 453dd0bb6615880d75f73294d22e67ec9975b7c3 atom/browser/net/url_request_string_job.cc
-@@ -25,7 +25,11 @@
-     dict->GetString("charset", &charset_);
-     dict->GetString("data", &data_);
-   } else if (options->is_string()) {
-+<<<<<<< .our
-     data_ = options->GetString();
-+=======
-+    options->GetAsString(&data_);
-+>>>>>>> .their
-   }
-   net::URLRequestSimpleJob::Start();
- }
-added in both
-  our    100644 4a2a0747fe2e6bf38c8999b80dbfea31e52a17fd atom/browser/osr/osr_render_widget_host_view.cc
-  their  100644 669785cbaa7762ebb8220632db229b24e58ebdca atom/browser/osr/osr_render_widget_host_view.cc
-@@ -264,7 +264,10 @@
-       size_(native_window->GetSize()),
-       painting_(painting),
-       is_showing_(!render_widget_host_->is_hidden()),
-+<<<<<<< .our
-       mouse_wheel_phase_handler_(render_widget_host_, this),
-+=======
-+>>>>>>> .their
-       weak_ptr_factory_(this) {
-   DCHECK(render_widget_host_);
-   bool is_guest_view_hack = parent_host_view_ != nullptr;
-@@ -280,8 +283,15 @@
- 
-   local_surface_id_ = local_surface_id_allocator_.GenerateId();
- 
-+<<<<<<< .our
- #if defined(OS_MACOSX)
-   last_frame_root_background_color_ = SK_ColorTRANSPARENT;
-+=======
-+  // Surface synchronization is not supported with OSR.
-+  DCHECK(!features::IsSurfaceSynchronizationEnabled());
-+
-+#if defined(OS_MACOSX)
-+>>>>>>> .their
-   CreatePlatformWidget(is_guest_view_hack);
- #else
-   // On macOS the ui::Compositor is created/owned by the platform view.
-@@ -302,7 +312,11 @@
- 
-   native_window_->AddObserver(this);
- 
-+<<<<<<< .our
-   ResizeRootLayer(false);
-+=======
-+  ResizeRootLayer();
-+>>>>>>> .their
-   render_widget_host_->SetView(this);
-   InstallTransparency();
- }
-@@ -384,7 +398,11 @@
-   parent_host_view_->set_child_host_view(this);
-   parent_host_view_->Hide();
- 
-+<<<<<<< .our
-   ResizeRootLayer(false);
-+=======
-+  ResizeRootLayer();
-+>>>>>>> .their
-   Show();
- }
- 
-@@ -513,10 +531,13 @@
-   TRACE_EVENT0("electron",
-                "OffScreenRenderWidgetHostView::SubmitCompositorFrame");
- 
-+<<<<<<< .our
- #if defined(OS_MACOSX)
-   last_frame_root_background_color_ = frame.metadata.root_background_color;
- #endif
- 
-+=======
-+>>>>>>> .their
-   if (frame.metadata.root_scroll_offset != last_scroll_offset_) {
-     last_scroll_offset_ = frame.metadata.root_scroll_offset;
-   }
-@@ -582,7 +603,11 @@
- 
-   popup_position_ = pos;
- 
-+<<<<<<< .our
-   ResizeRootLayer(false);
-+=======
-+  ResizeRootLayer();
-+>>>>>>> .their
-   Show();
- }
- 
-@@ -746,6 +771,13 @@
-   return std::make_unique<content::CompositorResizeLock>(this, desired_size);
- }
- 
-+<<<<<<< .our
-+=======
-+viz::LocalSurfaceId OffScreenRenderWidgetHostView::GetLocalSurfaceId() const {
-+  return local_surface_id_;
-+}
-+
-+>>>>>>> .their
- void OffScreenRenderWidgetHostView::OnFirstSurfaceActivation(
-     const viz::SurfaceInfo& surface_info) {}
- 
-@@ -773,6 +805,7 @@
-   return render_widget_host_->auto_resize_enabled();
- }
- 
-+<<<<<<< .our
- viz::LocalSurfaceId OffScreenRenderWidgetHostView::GetLocalSurfaceId() const {
-   return local_surface_id_;
- }
-@@ -793,6 +826,10 @@
- #endif
- }
- 
-+=======
-+#endif  // !defined(OS_MACOSX)
-+
-+>>>>>>> .their
- bool OffScreenRenderWidgetHostView::TransformPointToLocalCoordSpace(
-     const gfx::PointF& point,
-     const viz::SurfaceId& original_surface,
-@@ -899,7 +936,11 @@
-   DCHECK(!copy_frame_generator_);
-   DCHECK(!software_output_device_);
- 
-+<<<<<<< .our
-   ResizeRootLayer(false);
-+=======
-+  ResizeRootLayer();
-+>>>>>>> .their
- 
-   software_output_device_ = new OffScreenOutputDevice(
-       transparent_, base::Bind(&OffScreenRenderWidgetHostView::OnPaint,
-@@ -1051,7 +1092,11 @@
-     return;
-   }
- 
-+<<<<<<< .our
-   ResizeRootLayer(false);
-+=======
-+  ResizeRootLayer();
-+>>>>>>> .their
-   if (render_widget_host_)
-     render_widget_host_->WasResized();
-   GetDelegatedFrameHost()->WasResized(local_surface_id_, size_,
-@@ -1113,6 +1158,7 @@
-       return;
-     }
-   }
-+<<<<<<< .our
- 
-   blink::WebMouseWheelEvent mouse_wheel_event(event);
- 
-@@ -1136,6 +1182,20 @@
-             popup_mouse_wheel_event.PositionInWidget().y);
- 
-         popup_host_view_->SendMouseWheelEvent(popup_mouse_wheel_event);
-+=======
-+  if (!IsPopupWidget()) {
-+    if (popup_host_view_) {
-+      if (popup_host_view_->popup_position_.Contains(
-+              event.PositionInWidget().x, event.PositionInWidget().y)) {
-+        blink::WebMouseWheelEvent popup_event(event);
-+        popup_event.SetPositionInWidget(
-+            popup_event.PositionInWidget().x -
-+                popup_host_view_->popup_position_.x(),
-+            popup_event.PositionInWidget().y -
-+                popup_host_view_->popup_position_.y());
-+        popup_host_view_->ProcessMouseWheelEvent(popup_event,
-+                                                 ui::LatencyInfo());
-+>>>>>>> .their
-         return;
-       } else {
-         // Scrolling outside of the popup widget so destroy it.
-@@ -1146,6 +1206,7 @@
-             base::BindOnce(&OffScreenRenderWidgetHostView::CancelWidget,
-                            popup_host_view_->weak_ptr_factory_.GetWeakPtr()));
-       }
-+<<<<<<< .our
-     } else if (!guest_host_views_.empty()) {
-       for (auto guest_host_view : guest_host_views_) {
-         if (!guest_host_view->render_widget_host_ ||
-@@ -1168,6 +1229,8 @@
-           return;
-         }
-       }
-+=======
-+>>>>>>> .their
-     }
-   }
-   if (!render_widget_host_)
-@@ -1233,10 +1296,15 @@
- 
-   frame_rate_threshold_us_ = 1000000 / frame_rate_;
- 
-+<<<<<<< .our
-   if (GetCompositor()) {
-     GetCompositor()->SetAuthoritativeVSyncInterval(
-         base::TimeDelta::FromMicroseconds(frame_rate_threshold_us_));
-   }
-+=======
-+  GetCompositor()->SetAuthoritativeVSyncInterval(
-+      base::TimeDelta::FromMicroseconds(frame_rate_threshold_us_));
-+>>>>>>> .their
- 
-   if (copy_frame_generator_.get()) {
-     copy_frame_generator_->set_frame_rate_threshold_us(
-@@ -1265,7 +1333,11 @@
-   }
- }
- 
-+<<<<<<< .our
- void OffScreenRenderWidgetHostView::ResizeRootLayer(bool force) {
-+=======
-+void OffScreenRenderWidgetHostView::ResizeRootLayer() {
-+>>>>>>> .their
-   SetupFrameRate(false);
- 
-   const float compositorScaleFactor = GetCompositor()->device_scale_factor();
-@@ -1277,8 +1349,12 @@
-   else
-     size = popup_position_.size();
- 
-+<<<<<<< .our
-   if (!force && !scaleFactorDidChange &&
-       size == GetRootLayer()->bounds().size())
-+=======
-+  if (!scaleFactorDidChange && size == GetRootLayer()->bounds().size())
-+>>>>>>> .their
-     return;
- 
-   const gfx::Size& size_in_pixels =
-added in both
-  our    100644 b81f6310f864c00fea50b1aac49dc89173eaa302 atom/browser/osr/osr_render_widget_host_view.h
-  their  100644 10cc7530f8b177d667f170fb08b32d6c44dd957d atom/browser/osr/osr_render_widget_host_view.h
-@@ -27,7 +27,10 @@
- #include "content/browser/frame_host/render_widget_host_view_guest.h"
- #include "content/browser/renderer_host/compositor_resize_lock.h"
- #include "content/browser/renderer_host/delegated_frame_host.h"
-+<<<<<<< .our
- #include "content/browser/renderer_host/input/mouse_wheel_phase_handler.h"
-+=======
-+>>>>>>> .their
- #include "content/browser/renderer_host/render_widget_host_impl.h"
- #include "content/browser/renderer_host/render_widget_host_view_base.h"
- #include "content/browser/web_contents/web_contents_view.h"
-@@ -109,12 +112,19 @@
-   void SetNeedsBeginFrames(bool needs_begin_frames) override;
-   void SetWantsAnimateOnlyBeginFrames() override;
- #if defined(OS_MACOSX)
-+<<<<<<< .our
-+=======
-+  ui::AcceleratedWidgetMac* GetAcceleratedWidgetMac() const override;
-+>>>>>>> .their
-   void SetActive(bool active) override;
-   void ShowDefinitionForSelection() override;
-   bool SupportsSpeech() const override;
-   void SpeakSelection() override;
-   bool IsSpeaking() const override;
-+<<<<<<< .our
-   bool ShouldContinueToPauseForFrame() override;
-+=======
-+>>>>>>> .their
-   void StopSpeaking() override;
- #endif  // defined(OS_MACOSX)
- 
-@@ -170,6 +180,10 @@
-   bool DelegatedFrameCanCreateResizeLock() const override;
-   std::unique_ptr<content::CompositorResizeLock>
-   DelegatedFrameHostCreateResizeLock() override;
-+<<<<<<< .our
-+=======
-+  viz::LocalSurfaceId GetLocalSurfaceId() const override;
-+>>>>>>> .their
-   void OnFirstSurfaceActivation(const viz::SurfaceInfo& surface_info) override;
-   void OnBeginFrame(base::TimeTicks frame_time) override;
-   void OnFrameTokenChanged(uint32_t frame_token) override;
-@@ -181,11 +195,14 @@
-   bool IsAutoResizeEnabled() const override;
- #endif  // !defined(OS_MACOSX)
- 
-+<<<<<<< .our
-   viz::LocalSurfaceId GetLocalSurfaceId() const override;
-   viz::FrameSinkId GetFrameSinkId() override;
- 
-   void DidNavigate() override;
- 
-+=======
-+>>>>>>> .their
-   bool TransformPointToLocalCoordSpace(const gfx::PointF& point,
-                                        const viz::SurfaceId& original_surface,
-                                        gfx::PointF* transformed_point) override;
-@@ -210,9 +227,12 @@
- #if defined(OS_MACOSX)
-   void CreatePlatformWidget(bool is_guest_view_hack);
-   void DestroyPlatformWidget();
-+<<<<<<< .our
-   SkColor last_frame_root_background_color() const {
-     return last_frame_root_background_color_;
-   }
-+=======
-+>>>>>>> .their
- #endif
- 
-   void CancelWidget();
-@@ -268,9 +288,17 @@
-     child_host_view_ = child_view;
-   }
- 
-+<<<<<<< .our
-  private:
-   void SetupFrameRate(bool force);
-   void ResizeRootLayer(bool force);
-+=======
-+  viz::LocalSurfaceId local_surface_id() const { return local_surface_id_; }
-+
-+ private:
-+  void SetupFrameRate(bool force);
-+  void ResizeRootLayer();
-+>>>>>>> .their
- 
-   viz::FrameSinkId AllocateFrameSinkId(bool is_guest_view_hack);
- 
-@@ -331,8 +359,11 @@
- #if defined(OS_MACOSX)
-   std::unique_ptr<content::BrowserCompositorMac> browser_compositor_;
- 
-+<<<<<<< .our
-   SkColor last_frame_root_background_color_;
- 
-+=======
-+>>>>>>> .their
-   // Can not be managed by smart pointer because its header can not be included
-   // in the file that has the destructor.
-   MacHelper* mac_helper_;
-@@ -341,8 +372,11 @@
-   std::string selected_text_;
- #endif
- 
-+<<<<<<< .our
-   content::MouseWheelPhaseHandler mouse_wheel_phase_handler_;
- 
-+=======
-+>>>>>>> .their
-   viz::mojom::CompositorFrameSinkClient* renderer_compositor_frame_sink_ =
-       nullptr;
- 
-added in both
-  our    100644 8af4ce6ec263a6fba9f3c736ff74247c86787dbc atom/browser/osr/osr_render_widget_host_view_mac.mm
-  their  100644 81d39897f656613002d24a329eeb92d055d4be20 atom/browser/osr/osr_render_widget_host_view_mac.mm
-@@ -22,7 +22,11 @@
-   virtual ~MacHelper() {}
- 
-   // content::BrowserCompositorMacClient:
-+<<<<<<< .our
-   SkColor BrowserCompositorMacGetGutterColor() const override {
-+=======
-+  SkColor BrowserCompositorMacGetGutterColor(SkColor color) const override {
-+>>>>>>> .their
-     // When making an element on the page fullscreen the element's background
-     // may not match the page's, so use black as the gutter color to avoid
-     // flashes of brighter colors during the transition.
-@@ -30,7 +34,11 @@
-         view_->render_widget_host()->delegate()->IsFullscreenForCurrentTab()) {
-       return SK_ColorBLACK;
-     }
-+<<<<<<< .our
-     return view_->last_frame_root_background_color();
-+=======
-+    return color;
-+>>>>>>> .their
-   }
- 
-   void BrowserCompositorMacOnBeginFrame() override {}
-@@ -81,7 +89,11 @@
- 
- void OffScreenRenderWidgetHostView::StopSpeaking() {}
- 
-+<<<<<<< .our
- bool OffScreenRenderWidgetHostView::ShouldContinueToPauseForFrame() {
-+=======
-+bool CefRenderWidgetHostViewOSR::ShouldContinueToPauseForFrame() {
-+>>>>>>> .their
-   return browser_compositor_->ShouldContinueToPauseForFrame();
- }
- 
-@@ -98,10 +110,13 @@
-   delete mac_helper_;
- }
- 
-+<<<<<<< .our
- viz::LocalSurfaceId OffScreenRenderWidgetHostView::GetLocalSurfaceId() const {
-   return browser_compositor_->GetRendererLocalSurfaceId();
- }
- 
-+=======
-+>>>>>>> .their
- ui::Compositor* OffScreenRenderWidgetHostView::GetCompositor() const {
-   return browser_compositor_->GetCompositor();
- }
-added in both
-  our    100644 ae60f3c21ca91f7065da3eb0926ee62a27cb5e97 atom/browser/render_process_preferences.cc
-  their  100644 1d11181776616d20bbd3c349559423b76d08aa7e atom/browser/render_process_preferences.cc
-@@ -21,8 +21,12 @@
- 
- int RenderProcessPreferences::AddEntry(const base::DictionaryValue& entry) {
-   int id = ++next_id_;
-+<<<<<<< .our
-   entries_[id] =
-       base::DictionaryValue::From(base::Value::ToUniquePtrValue(entry.Clone()));
-+=======
-+  entries_[id] = entry.CreateDeepCopy();
-+>>>>>>> .their
-   cache_needs_update_ = true;
-   return id;
- }
-added in both
-  our    100644 9094f0f7335edf833d51f688851e6a105de60433 atom/browser/resources/mac/Info.plist
-  their  100644 70a794e41b94870bf45efa8f692d25f8c43998cd atom/browser/resources/mac/Info.plist
-@@ -17,9 +17,15 @@
-   <key>CFBundleIconFile</key>
-   <string>electron.icns</string>
-   <key>CFBundleVersion</key>
-+<<<<<<< .our
-   <string>4.0.0</string>
-   <key>CFBundleShortVersionString</key>
-   <string>4.0.0</string>
-+=======
-+  <string>3.0.0</string>
-+  <key>CFBundleShortVersionString</key>
-+  <string>3.0.0</string>
-+>>>>>>> .their
-   <key>LSApplicationCategoryType</key>
-   <string>public.app-category.developer-tools</string>
-   <key>LSMinimumSystemVersion</key>
-added in both
-  our    100644 c0bd831e8bddf10180f75cd40694831e2e98622d atom/browser/resources/win/atom.rc
-  their  100644 e71d61c04567c59bc4de106a56cc501a3a57f6b0 atom/browser/resources/win/atom.rc
-@@ -1,6 +1,10 @@
- // Microsoft Visual C++ generated resource script.
- //
-+<<<<<<< .our
- #include "ui\\resources\\grit\\ui_unscaled_resources.h"
-+=======
-+#include "grit\\ui_unscaled_resources.h"
-+>>>>>>> .their
- #include "resource.h"
- #include <winresrc.h>
- #ifdef IDC_STATIC
-@@ -56,8 +60,13 @@
- //
- 
- VS_VERSION_INFO VERSIONINFO
-+<<<<<<< .our
-  FILEVERSION 4,0,0,20180821
-  PRODUCTVERSION 4,0,0,20180821
-+=======
-+ FILEVERSION 3,0,0,3
-+ PRODUCTVERSION 3,0,0,3
-+>>>>>>> .their
-  FILEFLAGSMASK 0x3fL
- #ifdef _DEBUG
-  FILEFLAGS 0x1L
-@@ -74,12 +83,20 @@
-         BEGIN
-             VALUE "CompanyName", "GitHub, Inc."
-             VALUE "FileDescription", "Electron"
-+<<<<<<< .our
-             VALUE "FileVersion", "4.0.0"
-+=======
-+            VALUE "FileVersion", "3.0.0"
-+>>>>>>> .their
-             VALUE "InternalName", "electron.exe"
-             VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
-             VALUE "OriginalFilename", "electron.exe"
-             VALUE "ProductName", "Electron"
-+<<<<<<< .our
-             VALUE "ProductVersion", "4.0.0"
-+=======
-+            VALUE "ProductVersion", "3.0.0"
-+>>>>>>> .their
-             VALUE "SquirrelAwareVersion", "1"
-         END
-     END
-added in both
-  our    100644 f3dc0e0cc6ae044daf9cc499061db98f387d7dea atom/browser/ui/certificate_trust_win.cc
-  their  100644 6179b08607041c38996d7faef8f7f456e42e4ac4 atom/browser/ui/certificate_trust_win.cc
-@@ -20,8 +20,13 @@
- // This requires prompting the user to confirm they trust the certificate.
- BOOL AddToTrustedRootStore(const PCCERT_CONTEXT cert_context,
-                            const scoped_refptr<net::X509Certificate>& cert) {
-+<<<<<<< .our
-   auto* root_cert_store = CertOpenStore(
-       CERT_STORE_PROV_SYSTEM, 0, NULL, CERT_SYSTEM_STORE_CURRENT_USER, L"Root");
-+=======
-+  auto root_cert_store = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, NULL,
-+                                       CERT_SYSTEM_STORE_CURRENT_USER, L"Root");
-+>>>>>>> .their
- 
-   if (root_cert_store == NULL) {
-     return false;
-@@ -32,7 +37,11 @@
- 
-   if (result) {
-     // force Chromium to reload it's database for this certificate
-+<<<<<<< .our
-     auto* cert_db = net::CertDatabase::GetInstance();
-+=======
-+    auto cert_db = net::CertDatabase::GetInstance();
-+>>>>>>> .their
-     cert_db->NotifyObserversCertDBChanged();
-   }
- 
-added in both
-  our    100644 aaaf933e106080002d198ad6c15e637043609618 atom/browser/ui/cocoa/atom_ns_window.mm
-  their  100644 56ed5dc2319ccc62ad26919460a416a8c1ccc047 atom/browser/ui/cocoa/atom_ns_window.mm
-@@ -173,12 +173,20 @@
-       buttonFrame.origin.x += NSWidth(
-           [[self standardWindowButton:NSWindowMiniaturizeButton] frame]);
-       buttonFrame.origin.x += windowButtonsInterButtonSpacing_;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+      // fallthrough
-+>>>>>>> .their
-     case NSWindowMiniaturizeButton:
-       buttonFrame.origin.x +=
-           NSWidth([[self standardWindowButton:NSWindowCloseButton] frame]);
-       buttonFrame.origin.x += windowButtonsInterButtonSpacing_;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+      // fallthrough
-+>>>>>>> .their
-     default:
-       break;
-   }
-added in both
-  our    100644 c58da546dc8dab14b6f32e284727342bc8096d0c atom/browser/ui/cocoa/atom_ns_window_delegate.mm
-  their  100644 78bfe1fcd7b523290c190bdbe9b04ae250a6af1b atom/browser/ui/cocoa/atom_ns_window_delegate.mm
-@@ -112,6 +112,7 @@
-                extraHeightPlusFrame);
-   }
- 
-+<<<<<<< .our
-   {
-     bool prevent_default = false;
-     gfx::Rect new_bounds(gfx::Point(sender.frame.origin), gfx::Size(newSize));
-@@ -121,6 +122,8 @@
-     }
-   }
- 
-+=======
-+>>>>>>> .their
-   return newSize;
- }
- 
-added in both
-  our    100644 becc1806610ae54c005b3e8aef17a9ef19d730bf atom/browser/ui/file_dialog.h
-  their  100644 efa50062bb8284149a893c9bff174ed1cdb10ced atom/browser/ui/file_dialog.h
-@@ -66,7 +66,10 @@
-   bool security_scoped_bookmarks = false;
- 
-   DialogSettings();
-+<<<<<<< .our
-   DialogSettings(const DialogSettings&);
-+=======
-+>>>>>>> .their
-   ~DialogSettings();
- };
- 
-added in both
-  our    100644 dab125ec881bc75ff608dbbfddff972169049e54 atom/browser/ui/file_dialog_win.cc
-  their  100644 2d708086bfdf28bd31dd735360e36ed6222a6a16 atom/browser/ui/file_dialog_win.cc
-@@ -6,10 +6,16 @@
- 
- #include <windows.h>  // windows.h must be included first
- 
-+<<<<<<< .our
- #include <atlbase.h>  // atlbase.h for CComPtr
- 
- #include <shlobj.h>
- #include <shobjidl.h>
-+=======
-+#include <atlbase.h>
-+#include <commdlg.h>
-+#include <shlobj.h>
-+>>>>>>> .their
- 
- #include "atom/browser/native_window_views.h"
- #include "atom/browser/unresponsive_suppressor.h"
-@@ -21,11 +27,19 @@
- #include "base/threading/thread.h"
- #include "base/threading/thread_task_runner_handle.h"
- #include "base/win/registry.h"
-+<<<<<<< .our
-+=======
-+#include "third_party/wtl/include/atlapp.h"
-+#include "third_party/wtl/include/atldlgs.h"
-+>>>>>>> .their
- 
- namespace file_dialog {
- 
- DialogSettings::DialogSettings() = default;
-+<<<<<<< .our
- DialogSettings::DialogSettings(const DialogSettings&) = default;
-+=======
-+>>>>>>> .their
- DialogSettings::~DialogSettings() = default;
- 
- namespace {
-@@ -64,6 +78,90 @@
-   }
- }
- 
-+<<<<<<< .our
-+=======
-+// Generic class to delegate common open/save dialog's behaviours, users need to
-+// call interface methods via GetPtr().
-+template <typename T>
-+class FileDialog {
-+ public:
-+  FileDialog(const DialogSettings& settings, int options) {
-+    std::wstring file_part;
-+    if (!IsDirectory(settings.default_path))
-+      file_part = settings.default_path.BaseName().value();
-+
-+    std::vector<std::wstring> buffer;
-+    std::vector<COMDLG_FILTERSPEC> filterspec;
-+    ConvertFilters(settings.filters, &buffer, &filterspec);
-+
-+    dialog_.reset(new T(file_part.c_str(), options, NULL, filterspec.data(),
-+                        filterspec.size()));
-+
-+    if (!settings.title.empty())
-+      GetPtr()->SetTitle(base::UTF8ToUTF16(settings.title).c_str());
-+
-+    if (!settings.button_label.empty())
-+      GetPtr()->SetOkButtonLabel(
-+          base::UTF8ToUTF16(settings.button_label).c_str());
-+
-+    // By default, *.* will be added to the file name if file type is "*.*". In
-+    // Electron, we disable it to make a better experience.
-+    //
-+    // From MSDN: https://msdn.microsoft.com/en-us/library/windows/desktop/
-+    // bb775970(v=vs.85).aspx
-+    //
-+    // If SetDefaultExtension is not called, the dialog will not update
-+    // automatically when user choose a new file type in the file dialog.
-+    //
-+    // We set file extension to the first none-wildcard extension to make
-+    // sure the dialog will update file extension automatically.
-+    for (size_t i = 0; i < filterspec.size(); ++i) {
-+      if (std::wstring(filterspec[i].pszSpec) != L"*.*") {
-+        // SetFileTypeIndex is regarded as one-based index.
-+        GetPtr()->SetFileTypeIndex(i + 1);
-+        GetPtr()->SetDefaultExtension(filterspec[i].pszSpec);
-+        break;
-+      }
-+    }
-+
-+    if (settings.default_path.IsAbsolute()) {
-+      SetDefaultFolder(settings.default_path);
-+    }
-+  }
-+
-+  bool Show(atom::NativeWindow* parent_window) {
-+    atom::UnresponsiveSuppressor suppressor;
-+    HWND window = parent_window
-+                      ? static_cast<atom::NativeWindowViews*>(parent_window)
-+                            ->GetAcceleratedWidget()
-+                      : NULL;
-+    return dialog_->DoModal(window) == IDOK;
-+  }
-+
-+  T* GetDialog() { return dialog_.get(); }
-+
-+  IFileDialog* GetPtr() const { return dialog_->GetPtr(); }
-+
-+ private:
-+  // Set up the initial directory for the dialog.
-+  void SetDefaultFolder(const base::FilePath file_path) {
-+    std::wstring directory = IsDirectory(file_path)
-+                                 ? file_path.value()
-+                                 : file_path.DirName().value();
-+
-+    ATL::CComPtr<IShellItem> folder_item;
-+    HRESULT hr = SHCreateItemFromParsingName(directory.c_str(), NULL,
-+                                             IID_PPV_ARGS(&folder_item));
-+    if (SUCCEEDED(hr))
-+      GetPtr()->SetFolder(folder_item);
-+  }
-+
-+  std::unique_ptr<T> dialog_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(FileDialog);
-+};
-+
-+>>>>>>> .their
- struct RunState {
-   base::Thread* dialog_thread;
-   scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner;
-@@ -103,6 +201,7 @@
- 
- }  // namespace
- 
-+<<<<<<< .our
- static HRESULT GetFileNameFromShellItem(IShellItem* pShellItem,
-                                         SIGDN type,
-                                         LPWSTR lpstr,
-@@ -207,6 +306,11 @@
-     return false;
- 
-   DWORD options = FOS_FORCEFILESYSTEM | FOS_FILEMUSTEXIST;
-+=======
-+bool ShowOpenDialog(const DialogSettings& settings,
-+                    std::vector<base::FilePath>* paths) {
-+  int options = FOS_FORCEFILESYSTEM | FOS_FILEMUSTEXIST;
-+>>>>>>> .their
-   if (settings.properties & FILE_DIALOG_OPEN_DIRECTORY)
-     options |= FOS_PICKFOLDERS;
-   if (settings.properties & FILE_DIALOG_MULTI_SELECTIONS)
-@@ -215,6 +319,7 @@
-     options |= FOS_FORCESHOWHIDDEN;
-   if (settings.properties & FILE_DIALOG_PROMPT_TO_CREATE)
-     options |= FOS_CREATEPROMPT;
-+<<<<<<< .our
-   file_open_dialog->SetOptions(options);
- 
-   ApplySettings(file_open_dialog, settings);
-@@ -224,6 +329,16 @@
- 
-   ATL::CComPtr<IShellItemArray> items;
-   hr = file_open_dialog->GetResults(&items);
-+=======
-+
-+  FileDialog<CShellFileOpenDialog> open_dialog(settings, options);
-+  if (!open_dialog.Show(settings.parent_window))
-+    return false;
-+
-+  ATL::CComPtr<IShellItemArray> items;
-+  HRESULT hr =
-+      static_cast<IFileOpenDialog*>(open_dialog.GetPtr())->GetResults(&items);
-+>>>>>>> .their
-   if (FAILED(hr))
-     return false;
- 
-@@ -240,8 +355,13 @@
-       return false;
- 
-     wchar_t file_name[MAX_PATH];
-+<<<<<<< .our
-     hr = GetFileNameFromShellItem(item, SIGDN_FILESYSPATH, file_name, MAX_PATH);
- 
-+=======
-+    hr = CShellFileOpenDialog::GetFileNameFromShellItem(item, SIGDN_FILESYSPATH,
-+                                                        file_name, MAX_PATH);
-+>>>>>>> .their
-     if (FAILED(hr))
-       return false;
- 
-@@ -265,6 +385,7 @@
- }
- 
- bool ShowSaveDialog(const DialogSettings& settings, base::FilePath* path) {
-+<<<<<<< .our
-   ATL::CComPtr<IFileSaveDialog> file_save_dialog;
-   HRESULT hr = file_save_dialog.CoCreateInstance(CLSID_FileSaveDialog);
-   if (FAILED(hr))
-@@ -291,6 +412,19 @@
-   *path = base::FilePath(result_path);
-   CoTaskMemFree(result_path);
- 
-+=======
-+  FileDialog<CShellFileSaveDialog> save_dialog(
-+      settings, FOS_FORCEFILESYSTEM | FOS_PATHMUSTEXIST | FOS_OVERWRITEPROMPT);
-+  if (!save_dialog.Show(settings.parent_window))
-+    return false;
-+
-+  wchar_t buffer[MAX_PATH];
-+  HRESULT hr = save_dialog.GetDialog()->GetFilePath(buffer, MAX_PATH);
-+  if (FAILED(hr))
-+    return false;
-+
-+  *path = base::FilePath(buffer);
-+>>>>>>> .their
-   return true;
- }
- 
-added in both
-  our    100644 ee2f59dc8c84ba0bf5fe049a133f403d550a9473 atom/browser/ui/message_box_mac.mm
-  their  100644 a29ebff7bead0b798a2fbe962f6ff0f9bd0b5f16 atom/browser/ui/message_box_mac.mm
-@@ -97,6 +97,14 @@
-   NSArray* ns_buttons = [alert buttons];
-   int button_count = static_cast<int>([ns_buttons count]);
- 
-+<<<<<<< .our
-+=======
-+  // Bind cancel id button to escape key if there is more than one button
-+  if (button_count > 1 && cancel_id >= 0 && cancel_id < button_count) {
-+    [[ns_buttons objectAtIndex:cancel_id] setKeyEquivalent:@"\e"];
-+  }
-+
-+>>>>>>> .their
-   if (default_id >= 0 && default_id < button_count) {
-     // Focus the button at default_id if the user opted to do so.
-     // The first button added gets set as the default selected.
-@@ -105,11 +113,14 @@
-     [[ns_buttons objectAtIndex:default_id] setKeyEquivalent:@"\r"];
-   }
- 
-+<<<<<<< .our
-   // Bind cancel id button to escape key if there is more than one button
-   if (button_count > 1 && cancel_id >= 0 && cancel_id < button_count) {
-     [[ns_buttons objectAtIndex:cancel_id] setKeyEquivalent:@"\e"];
-   }
- 
-+=======
-+>>>>>>> .their
-   if (!checkbox_label.empty()) {
-     alert.showsSuppressionButton = YES;
-     alert.suppressionButton.title = base::SysUTF8ToNSString(checkbox_label);
-added in both
-  our    100644 b0e73f550e1d3a91f15e8d2d0604518027f75298 atom/browser/ui/message_box_win.cc
-  their  100644 e5a0e61379d0b7f294253e3bf1daa005dccfbfbd atom/browser/ui/message_box_win.cc
-@@ -128,8 +128,11 @@
-       case MESSAGE_BOX_TYPE_ERROR:
-         config.pszMainIcon = TD_ERROR_ICON;
-         break;
-+<<<<<<< .our
-       case MESSAGE_BOX_TYPE_NONE:
-         break;
-+=======
-+>>>>>>> .their
-     }
-   }
- 
-added in both
-  our    100644 e838d3cc217b5ffdb77226beff0d7217539f23f9 atom/browser/ui/views/menu_bar.cc
-  their  100644 535af8f2803187d737e1f5e42507d95b9b7272c2 atom/browser/ui/views/menu_bar.cc
-@@ -29,8 +29,13 @@
-     : background_color_(kDefaultColor), window_(window) {
-   RefreshColorCache();
-   UpdateViewColors();
-+<<<<<<< .our
-   SetLayoutManager(
-       std::make_unique<views::BoxLayout>(views::BoxLayout::kHorizontal));
-+=======
-+  SetLayoutManager(std::make_unique<views::BoxLayout>(
-+      views::BoxLayout::kHorizontal));
-+>>>>>>> .their
-   window_->GetFocusManager()->AddFocusChangeListener(this);
- }
- 
-@@ -178,7 +183,11 @@
-   }
- #elif defined(OS_WIN)
-   for (auto* child : GetChildrenInZOrder()) {
-+<<<<<<< .our
-     auto* button = static_cast<SubmenuButton*>(child);
-+=======
-+    auto button = static_cast<SubmenuButton*>(child);
-+>>>>>>> .their
-     button->SetUnderlineColor(color_utils::GetSysSkColor(COLOR_MENUTEXT));
-   }
- #endif
-added in both
-  our    100644 8f2139cb90fab876a1db1b17cac016997a3904ba atom/browser/ui/views/win_frame_view.cc
-  their  100644 91fdb8a966809633d934f97b46861aa4ef4c8120 atom/browser/ui/views/win_frame_view.cc
-@@ -10,7 +10,15 @@
- 
- namespace atom {
- 
-+<<<<<<< .our
- const char WinFrameView::kViewClassName[] = "WinFrameView";
-+=======
-+namespace {
-+
-+const char kViewClassName[] = "WinFrameView";
-+
-+}  // namespace
-+>>>>>>> .their
- 
- WinFrameView::WinFrameView() {}
- 
-added in both
-  our    100644 a6ffd7f363304913bb124908f138258bb804e56f atom/browser/ui/views/win_frame_view.h
-  their  100644 b2c1ef3a15de9a222233a27193ed811a8add09f6 atom/browser/ui/views/win_frame_view.h
-@@ -11,9 +11,14 @@
- 
- class WinFrameView : public FramelessView {
-  public:
-+<<<<<<< .our
-   static const char kViewClassName[];
-   WinFrameView();
-   ~WinFrameView() override;
-+=======
-+  WinFrameView();
-+  virtual ~WinFrameView();
-+>>>>>>> .their
- 
-   // views::NonClientFrameView:
-   gfx::Rect GetWindowBoundsForClientBounds(
-added in both
-  our    100644 39197cdccc994ee96aad07d8f5db01258fcb66a4 atom/browser/ui/webui/pdf_viewer_handler.cc
-  their  100644 4b63c3dc7112a85f594061bb262def495da69582 atom/browser/ui/webui/pdf_viewer_handler.cc
-@@ -112,8 +112,12 @@
-     PopulateStreamInfo(stream_info.get(), stream_, original_url_);
-     ResolveJavascriptCallback(*callback_id, *stream_info);
-   } else {
-+<<<<<<< .our
-     initialize_callback_id_ =
-         base::Value::ToUniquePtrValue(callback_id.Clone());
-+=======
-+    initialize_callback_id_ = callback_id->CreateDeepCopy();
-+>>>>>>> .their
-   }
- 
-   auto zoom_controller =
-added in both
-  our    100644 4a76126214e7ae0063fa379c64aaca6be9f17d20 atom/browser/ui/win/jump_list.cc
-  their  100644 6af235e756c227c0b1d7fed0446e08ee10352800 atom/browser/ui/win/jump_list.cc
-@@ -144,6 +144,7 @@
- 
- namespace atom {
- 
-+<<<<<<< .our
- JumpListItem::JumpListItem() = default;
- JumpListItem::JumpListItem(const JumpListItem&) = default;
- JumpListItem::~JumpListItem() = default;
-@@ -151,12 +152,17 @@
- JumpListCategory::JumpListCategory(const JumpListCategory&) = default;
- JumpListCategory::~JumpListCategory() = default;
- 
-+=======
-+>>>>>>> .their
- JumpList::JumpList(const base::string16& app_id) : app_id_(app_id) {
-   destinations_.CoCreateInstance(CLSID_DestinationList);
- }
- 
-+<<<<<<< .our
- JumpList::~JumpList() = default;
- 
-+=======
-+>>>>>>> .their
- bool JumpList::Begin(int* min_items, std::vector<JumpListItem>* removed_items) {
-   DCHECK(destinations_);
-   if (!destinations_)
-@@ -275,9 +281,15 @@
-         result = JumpListResult::GENERIC_ERROR;
-     }
-   } else {
-+<<<<<<< .our
-     HRESULT hr = destinations_->AppendCategory(category.name.c_str(), items);
-     if (FAILED(hr)) {
-       if (hr == static_cast<HRESULT>(0x80040F03)) {
-+=======
-+    auto hr = destinations_->AppendCategory(category.name.c_str(), items);
-+    if (FAILED(hr)) {
-+      if (hr == 0x80040F03) {
-+>>>>>>> .their
-         LOG(ERROR) << "Failed to append custom category "
-                    << "'" << category.name << "' "
-                    << "to Jump List due to missing file type registration.";
-added in both
-  our    100644 59d9a21a6c31f4d8fa5ebc0261630f3383138e84 atom/browser/ui/win/jump_list.h
-  their  100644 fc4ab085fc0db76b0d392abd5402adf35abe6ba1 atom/browser/ui/win/jump_list.h
-@@ -51,10 +51,13 @@
-   base::string16 description;
-   base::FilePath icon_path;
-   int icon_index = 0;
-+<<<<<<< .our
- 
-   JumpListItem();
-   JumpListItem(const JumpListItem&);
-   ~JumpListItem();
-+=======
-+>>>>>>> .their
- };
- 
- struct JumpListCategory {
-@@ -74,10 +77,13 @@
-   Type type = Type::TASKS;
-   base::string16 name;
-   std::vector<JumpListItem> items;
-+<<<<<<< .our
- 
-   JumpListCategory();
-   JumpListCategory(const JumpListCategory&);
-   ~JumpListCategory();
-+=======
-+>>>>>>> .their
- };
- 
- // Creates or removes a custom Jump List for an app.
-@@ -88,7 +94,10 @@
-   // custom Jump List should be created/removed, it's usually obtained by
-   // calling GetCurrentProcessExplicitAppUserModelID().
-   explicit JumpList(const base::string16& app_id);
-+<<<<<<< .our
-   ~JumpList();
-+=======
-+>>>>>>> .their
- 
-   // Starts a new transaction, must be called before appending any categories,
-   // aborting or committing. After the method returns |min_items| will indicate
-added in both
-  our    100644 bd4c17d2fcee53c7c106b0912252848cd6de0dc7 atom/browser/ui/win/notify_icon.h
-  their  100644 aed548ecb6188ccdfd71b93684a613ee2fe21d1a atom/browser/ui/win/notify_icon.h
-@@ -32,7 +32,11 @@
-  public:
-   // Constructor which provides this icon's unique ID and messaging window.
-   NotifyIcon(NotifyIconHost* host, UINT id, HWND window, UINT message);
-+<<<<<<< .our
-   ~NotifyIcon() override;
-+=======
-+  virtual ~NotifyIcon();
-+>>>>>>> .their
- 
-   // Handles a click event from the user - if |left_button_click| is true and
-   // there is a registered observer, passes the click event to the observer,
-added in both
-  our    100644 c4b92a24aefb3afa3ff2929eea59940d439e8709 atom/browser/ui/win/taskbar_host.cc
-  their  100644 e023fdc8c836899b7a8b9a80d4bc57edb365f3cc atom/browser/ui/win/taskbar_host.cc
-@@ -50,11 +50,14 @@
- 
- }  // namespace
- 
-+<<<<<<< .our
- TaskbarHost::ThumbarButton::ThumbarButton() = default;
- TaskbarHost::ThumbarButton::ThumbarButton(const TaskbarHost::ThumbarButton&) =
-     default;
- TaskbarHost::ThumbarButton::~ThumbarButton() = default;
- 
-+=======
-+>>>>>>> .their
- TaskbarHost::TaskbarHost() {}
- 
- TaskbarHost::~TaskbarHost() {}
-added in both
-  our    100644 2182d377a7736f5e135d2f518c2a0a838cd0d1a0 atom/browser/ui/win/taskbar_host.h
-  their  100644 31199cf22837b604beca1fe92627b53cf6f71e8f atom/browser/ui/win/taskbar_host.h
-@@ -26,10 +26,13 @@
-     gfx::Image icon;
-     std::vector<std::string> flags;
-     base::Closure clicked_callback;
-+<<<<<<< .our
- 
-     ThumbarButton();
-     ThumbarButton(const ThumbarButton&);
-     ~ThumbarButton();
-+=======
-+>>>>>>> .their
-   };
- 
-   TaskbarHost();
-added in both
-  our    100644 c21c93383155091a7481cdd4e741cefad90a4a55 atom/browser/web_contents_preferences.cc
-  their  100644 1046a55b05791d48316afee7052e8fa2e23d131c atom/browser/web_contents_preferences.cc
-@@ -15,7 +15,10 @@
- #include "base/command_line.h"
- #include "base/memory/ptr_util.h"
- #include "base/strings/string_number_conversions.h"
-+<<<<<<< .our
- #include "base/strings/utf_string_conversions.h"
-+=======
-+>>>>>>> .their
- #include "cc/base/switches.h"
- #include "content/public/browser/render_frame_host.h"
- #include "content/public/browser/render_process_host.h"
-@@ -30,6 +33,7 @@
- 
- DEFINE_WEB_CONTENTS_USER_DATA_KEY(atom::WebContentsPreferences);
- 
-+<<<<<<< .our
- namespace {
- 
- bool GetAsString(const base::Value* val,
-@@ -75,6 +79,8 @@
- 
- }  // namespace
- 
-+=======
-+>>>>>>> .their
- namespace atom {
- 
- // static
-@@ -91,7 +97,11 @@
-   copied.Delete("isGuest");
-   copied.Delete("session");
- 
-+<<<<<<< .our
-   mate::ConvertFromV8(isolate, copied.GetHandle(), &preference_);
-+=======
-+  mate::ConvertFromV8(isolate, copied.GetHandle(), &dict_);
-+>>>>>>> .their
-   web_contents->SetUserData(UserDataKey(), base::WrapUnique(this));
- 
-   instances_.push_back(this);
-@@ -99,6 +109,10 @@
-   // Set WebPreferences defaults onto the JS object
-   SetDefaultBoolIfUndefined(options::kPlugins, false);
-   SetDefaultBoolIfUndefined(options::kExperimentalFeatures, false);
-+<<<<<<< .our
-+=======
-+  SetDefaultBoolIfUndefined(options::kExperimentalCanvasFeatures, false);
-+>>>>>>> .their
-   bool node = SetDefaultBoolIfUndefined(options::kNodeIntegration, true);
-   SetDefaultBoolIfUndefined(options::kNodeIntegrationInWorker, false);
-   SetDefaultBoolIfUndefined(options::kWebviewTag, node);
-@@ -124,7 +138,11 @@
- #endif
-   SetDefaultBoolIfUndefined(options::kOffscreen, false);
- 
-+<<<<<<< .our
-   last_preference_ = preference_.Clone();
-+=======
-+  last_dict_ = std::move(*dict_.CreateDeepCopy());
-+>>>>>>> .their
- }
- 
- WebContentsPreferences::~WebContentsPreferences() {
-@@ -135,6 +153,7 @@
- bool WebContentsPreferences::SetDefaultBoolIfUndefined(
-     const base::StringPiece& key,
-     bool val) {
-+<<<<<<< .our
-   auto* current_value =
-       preference_.FindKeyOfType(key, base::Value::Type::BOOLEAN);
-   if (current_value) {
-@@ -191,6 +210,25 @@
-     }
-   }
-   return false;
-+=======
-+  bool existing;
-+  if (!dict_.GetBoolean(key, &existing)) {
-+    dict_.SetBoolean(key, val);
-+    return val;
-+  }
-+  return existing;
-+}
-+
-+bool WebContentsPreferences::IsEnabled(const base::StringPiece& name,
-+                                       bool default_value) {
-+  bool bool_value = default_value;
-+  dict_.GetBoolean(name, &bool_value);
-+  return bool_value;
-+}
-+
-+void WebContentsPreferences::Merge(const base::DictionaryValue& extend) {
-+  dict_.MergeDictionary(&extend);
-+>>>>>>> .their
- }
- 
- // static
-@@ -214,6 +252,7 @@
- 
- void WebContentsPreferences::AppendCommandLineSwitches(
-     base::CommandLine* command_line) {
-+<<<<<<< .our
-   // Check if plugins are enabled.
-   if (IsEnabled(options::kPlugins))
-     command_line->AppendSwitch(switches::kEnablePlugins);
-@@ -230,17 +269,45 @@
- 
-   // Whether to enable node integration in Worker.
-   if (IsEnabled(options::kNodeIntegrationInWorker))
-+=======
-+  bool b;
-+  // Check if plugins are enabled.
-+  if (dict_.GetBoolean(options::kPlugins, &b) && b)
-+    command_line->AppendSwitch(switches::kEnablePlugins);
-+
-+  // Experimental flags.
-+  if (dict_.GetBoolean(options::kExperimentalFeatures, &b) && b)
-+    command_line->AppendSwitch(
-+        ::switches::kEnableExperimentalWebPlatformFeatures);
-+  if (dict_.GetBoolean(options::kExperimentalCanvasFeatures, &b) && b)
-+    command_line->AppendSwitch(::switches::kEnableExperimentalCanvasFeatures);
-+
-+  // Check if we have node integration specified.
-+  bool node_integration = true;
-+  dict_.GetBoolean(options::kNodeIntegration, &node_integration);
-+  command_line->AppendSwitchASCII(switches::kNodeIntegration,
-+                                  node_integration ? "true" : "false");
-+
-+  // Whether to enable node integration in Worker.
-+  if (dict_.GetBoolean(options::kNodeIntegrationInWorker, &b) && b)
-+>>>>>>> .their
-     command_line->AppendSwitch(switches::kNodeIntegrationInWorker);
- 
-   // Check if webview tag creation is enabled, default to nodeIntegration value.
-   // TODO(kevinsawicki): Default to false in 2.0
-+<<<<<<< .our
-   bool webview_tag = IsEnabled(options::kWebviewTag, enable_node_integration);
-+=======
-+  bool webview_tag = node_integration;
-+  dict_.GetBoolean(options::kWebviewTag, &webview_tag);
-+>>>>>>> .their
-   command_line->AppendSwitchASCII(switches::kWebviewTag,
-                                   webview_tag ? "true" : "false");
- 
-   // If the `sandbox` option was passed to the BrowserWindow's webPreferences,
-   // pass `--enable-sandbox` to the renderer so it won't have any node.js
-   // integration.
-+<<<<<<< .our
-   if (IsEnabled(options::kSandbox))
-     command_line->AppendSwitch(switches::kEnableSandbox);
-   else if (!command_line->HasSwitch(switches::kEnableSandbox))
-@@ -248,10 +315,18 @@
- 
-   // Check if nativeWindowOpen is enabled.
-   if (IsEnabled(options::kNativeWindowOpen))
-+=======
-+  if (dict_.GetBoolean(options::kSandbox, &b) && b)
-+    command_line->AppendSwitch(switches::kEnableSandbox);
-+  else if (!command_line->HasSwitch(switches::kEnableSandbox))
-+    command_line->AppendSwitch(::switches::kNoSandbox);
-+  if (dict_.GetBoolean(options::kNativeWindowOpen, &b) && b)
-+>>>>>>> .their
-     command_line->AppendSwitch(switches::kNativeWindowOpen);
- 
-   // The preload script.
-   base::FilePath::StringType preload;
-+<<<<<<< .our
-   if (GetPreloadPath(&preload))
-     command_line->AppendSwitchNative(switches::kPreloadScript, preload);
- 
-@@ -260,39 +335,80 @@
-       preference_.FindKeyOfType(options::kCustomArgs, base::Value::Type::LIST);
-   if (customArgs) {
-     for (const auto& customArg : customArgs->GetList()) {
-+=======
-+  if (dict_.GetString(options::kPreloadScript, &preload)) {
-+    if (base::FilePath(preload).IsAbsolute())
-+      command_line->AppendSwitchNative(switches::kPreloadScript, preload);
-+    else
-+      LOG(ERROR) << "preload script must have absolute path.";
-+  } else if (dict_.GetString(options::kPreloadURL, &preload)) {
-+    // Translate to file path if there is "preload-url" option.
-+    base::FilePath preload_path;
-+    if (net::FileURLToFilePath(GURL(preload), &preload_path))
-+      command_line->AppendSwitchPath(switches::kPreloadScript, preload_path);
-+    else
-+      LOG(ERROR) << "preload url must be file:// protocol.";
-+  }
-+
-+  // Custom args for renderer process
-+  base::Value* customArgs;
-+  if (dict_.Get(options::kCustomArgs, &customArgs) && customArgs->is_list()) {
-+    for (const base::Value& customArg : customArgs->GetList()) {
-+>>>>>>> .their
-       if (customArg.is_string())
-         command_line->AppendArg(customArg.GetString());
-     }
-   }
- 
-   // Run Electron APIs and preload script in isolated world
-+<<<<<<< .our
-   if (IsEnabled(options::kContextIsolation))
-+=======
-+  if (dict_.GetBoolean(options::kContextIsolation, &b) && b)
-+>>>>>>> .their
-     command_line->AppendSwitch(switches::kContextIsolation);
- 
-   // --background-color.
-   std::string s;
-+<<<<<<< .our
-   if (GetAsString(&preference_, options::kBackgroundColor, &s))
-+=======
-+  if (dict_.GetString(options::kBackgroundColor, &s))
-+>>>>>>> .their
-     command_line->AppendSwitchASCII(switches::kBackgroundColor, s);
- 
-   // --guest-instance-id, which is used to identify guest WebContents.
-   int guest_instance_id = 0;
-+<<<<<<< .our
-   if (GetAsInteger(&preference_, options::kGuestInstanceID, &guest_instance_id))
-+=======
-+  if (dict_.GetInteger(options::kGuestInstanceID, &guest_instance_id))
-+>>>>>>> .their
-     command_line->AppendSwitchASCII(switches::kGuestInstanceID,
-                                     base::IntToString(guest_instance_id));
- 
-   // Pass the opener's window id.
-   int opener_id;
-+<<<<<<< .our
-   if (GetAsInteger(&preference_, options::kOpenerID, &opener_id))
-+=======
-+  if (dict_.GetInteger(options::kOpenerID, &opener_id))
-+>>>>>>> .their
-     command_line->AppendSwitchASCII(switches::kOpenerID,
-                                     base::IntToString(opener_id));
- 
- #if defined(OS_MACOSX)
-   // Enable scroll bounce.
-+<<<<<<< .our
-   if (IsEnabled(options::kScrollBounce))
-+=======
-+  if (dict_.GetBoolean(options::kScrollBounce, &b) && b)
-+>>>>>>> .their
-     command_line->AppendSwitch(switches::kScrollBounce);
- #endif
- 
-   // Custom command line switches.
-+<<<<<<< .our
-   auto* args =
-       preference_.FindKeyOfType("commandLineSwitches", base::Value::Type::LIST);
-   if (args) {
-@@ -302,15 +418,31 @@
-         if (!arg_val.empty())
-           command_line->AppendSwitch(arg_val);
-       }
-+=======
-+  const base::ListValue* args;
-+  if (dict_.GetList("commandLineSwitches", &args)) {
-+    for (size_t i = 0; i < args->GetSize(); ++i) {
-+      std::string arg;
-+      if (args->GetString(i, &arg) && !arg.empty())
-+        command_line->AppendSwitch(arg);
-+>>>>>>> .their
-     }
-   }
- 
-   // Enable blink features.
-+<<<<<<< .our
-   if (GetAsString(&preference_, options::kEnableBlinkFeatures, &s))
-     command_line->AppendSwitchASCII(::switches::kEnableBlinkFeatures, s);
- 
-   // Disable blink features.
-   if (GetAsString(&preference_, options::kDisableBlinkFeatures, &s))
-+=======
-+  if (dict_.GetString(options::kEnableBlinkFeatures, &s))
-+    command_line->AppendSwitchASCII(::switches::kEnableBlinkFeatures, s);
-+
-+  // Disable blink features.
-+  if (dict_.GetString(options::kDisableBlinkFeatures, &s))
-+>>>>>>> .their
-     command_line->AppendSwitchASCII(::switches::kDisableBlinkFeatures, s);
- 
-   if (guest_instance_id) {
-@@ -337,11 +469,16 @@
-   // We are appending args to a webContents so let's save the current state
-   // of our preferences object so that during the lifetime of the WebContents
-   // we can fetch the options used to initally configure the WebContents
-+<<<<<<< .our
-   last_preference_ = preference_.Clone();
-+=======
-+  last_dict_ = std::move(*dict_.CreateDeepCopy());
-+>>>>>>> .their
- }
- 
- void WebContentsPreferences::OverrideWebkitPrefs(
-     content::WebPreferences* prefs) {
-+<<<<<<< .our
-   prefs->javascript_enabled = IsEnabled("javascript", true /* default_value */);
-   prefs->images_enabled = IsEnabled("images", true /* default_value */);
-   prefs->text_areas_are_resizable =
-@@ -392,4 +529,66 @@
-     prefs->default_encoding = encoding;
- }
- 
-+=======
-+  bool b;
-+  if (dict_.GetBoolean("javascript", &b))
-+    prefs->javascript_enabled = b;
-+  if (dict_.GetBoolean("images", &b))
-+    prefs->images_enabled = b;
-+  if (dict_.GetBoolean("textAreasAreResizable", &b))
-+    prefs->text_areas_are_resizable = b;
-+  if (dict_.GetBoolean("webgl", &b)) {
-+    prefs->webgl1_enabled = b;
-+    prefs->webgl2_enabled = b;
-+  }
-+  if (dict_.GetBoolean(options::kWebSecurity, &b)) {
-+    prefs->web_security_enabled = b;
-+    prefs->allow_running_insecure_content = !b;
-+  }
-+  if (dict_.GetBoolean(options::kAllowRunningInsecureContent, &b))
-+    prefs->allow_running_insecure_content = b;
-+  if (dict_.GetBoolean("navigateOnDragDrop", &b))
-+    prefs->navigate_on_drag_drop = b;
-+  const base::DictionaryValue* fonts = nullptr;
-+  if (dict_.GetDictionary("defaultFontFamily", &fonts)) {
-+    base::string16 font;
-+    if (fonts->GetString("standard", &font))
-+      prefs->standard_font_family_map[content::kCommonScript] = font;
-+    if (fonts->GetString("serif", &font))
-+      prefs->serif_font_family_map[content::kCommonScript] = font;
-+    if (fonts->GetString("sansSerif", &font))
-+      prefs->sans_serif_font_family_map[content::kCommonScript] = font;
-+    if (fonts->GetString("monospace", &font))
-+      prefs->fixed_font_family_map[content::kCommonScript] = font;
-+    if (fonts->GetString("cursive", &font))
-+      prefs->cursive_font_family_map[content::kCommonScript] = font;
-+    if (fonts->GetString("fantasy", &font))
-+      prefs->fantasy_font_family_map[content::kCommonScript] = font;
-+  }
-+  int size;
-+  if (GetInteger("defaultFontSize", &size))
-+    prefs->default_font_size = size;
-+  if (GetInteger("defaultMonospaceFontSize", &size))
-+    prefs->default_fixed_font_size = size;
-+  if (GetInteger("minimumFontSize", &size))
-+    prefs->minimum_font_size = size;
-+  std::string encoding;
-+  if (dict_.GetString("defaultEncoding", &encoding))
-+    prefs->default_encoding = encoding;
-+}
-+
-+bool WebContentsPreferences::GetInteger(const base::StringPiece& attribute_name,
-+                                        int* val) {
-+  // if it is already an integer, no conversion needed
-+  if (dict_.GetInteger(attribute_name, val))
-+    return true;
-+
-+  std::string str;
-+  if (dict_.GetString(attribute_name, &str))
-+    return base::StringToInt(str, val);
-+
-+  return false;
-+}
-+
-+>>>>>>> .their
- }  // namespace atom
-added in both
-  our    100644 d835347afcd259f473f95271a2c19e42afcc6f2b atom/browser/web_contents_preferences.h
-  their  100644 f08a614bf8c1a4df9a0df6acf28c882f79beabf0 atom/browser/web_contents_preferences.h
-@@ -37,8 +37,12 @@
-   ~WebContentsPreferences() override;
- 
-   // A simple way to know whether a Boolean property is enabled.
-+<<<<<<< .our
-   bool IsEnabled(const base::StringPiece& name,
-                  bool default_value = false) const;
-+=======
-+  bool IsEnabled(const base::StringPiece& name, bool default_value = false);
-+>>>>>>> .their
- 
-   // $.extend(|web_preferences|, |new_web_preferences|).
-   void Merge(const base::DictionaryValue& new_web_preferences);
-@@ -49,6 +53,7 @@
-   // Modify the WebPreferences according to preferences.
-   void OverrideWebkitPrefs(content::WebPreferences* prefs);
- 
-+<<<<<<< .our
-   // Clear the current WebPreferences.
-   void Clear();
- 
-@@ -61,6 +66,12 @@
-   // Returns the web preferences.
-   base::Value* preference() { return &preference_; }
-   base::Value* last_preference() { return &last_preference_; }
-+=======
-+  // Returns the web preferences.
-+  base::DictionaryValue* dict() { return &dict_; }
-+  const base::DictionaryValue* dict() const { return &dict_; }
-+  base::DictionaryValue* last_dict() { return &last_dict_; }
-+>>>>>>> .their
- 
-  private:
-   friend class content::WebContentsUserData<WebContentsPreferences>;
-@@ -72,12 +83,23 @@
-   // Set preference value to given bool if user did not provide value
-   bool SetDefaultBoolIfUndefined(const base::StringPiece& key, bool val);
- 
-+<<<<<<< .our
-+=======
-+  // Get preferences value as integer possibly coercing it from a string
-+  bool GetInteger(const base::StringPiece& attribute_name, int* val);
-+
-+>>>>>>> .their
-   static std::vector<WebContentsPreferences*> instances_;
- 
-   content::WebContents* web_contents_;
- 
-+<<<<<<< .our
-   base::Value preference_ = base::Value(base::Value::Type::DICTIONARY);
-   base::Value last_preference_ = base::Value(base::Value::Type::DICTIONARY);
-+=======
-+  base::DictionaryValue dict_;
-+  base::DictionaryValue last_dict_;
-+>>>>>>> .their
- 
-   DISALLOW_COPY_AND_ASSIGN(WebContentsPreferences);
- };
-added in both
-  our    100644 35b8e4635cff23875091db7f35bea349cf1460c2 atom/browser/web_contents_zoom_controller.cc
-  their  100644 489321810cfedb77f00739fca971c44dfd556700 atom/browser/web_contents_zoom_controller.cc
-@@ -228,9 +228,12 @@
- }
- 
- void WebContentsZoomController::WebContentsDestroyed() {
-+<<<<<<< .our
-   for (Observer& observer : observers_)
-     observer.OnZoomControllerWebContentsDestroyed();
- 
-+=======
-+>>>>>>> .their
-   observers_.Clear();
-   embedder_zoom_controller_ = nullptr;
- }
-added in both
-  our    100644 bafbbbfb491b4d0e70f2b44d974877fcd2e73ba8 atom/browser/web_contents_zoom_controller.h
-  their  100644 478326f1b82fc5f42e4af20cdf09e23b376f0e05 atom/browser/web_contents_zoom_controller.h
-@@ -24,7 +24,10 @@
-     virtual void OnZoomLevelChanged(content::WebContents* web_contents,
-                                     double level,
-                                     bool is_temporary) {}
-+<<<<<<< .our
-     virtual void OnZoomControllerWebContentsDestroyed() {}
-+=======
-+>>>>>>> .their
- 
-    protected:
-     virtual ~Observer() {}
-added in both
-  our    100644 74c8573d13f15bcaa189abdc40fa0cd8e48f89be atom/browser/web_dialog_helper.cc
-  their  100644 f39f77a643522bba10cc2f764b0d5daf02f35d42 atom/browser/web_dialog_helper.cc
-@@ -220,7 +220,10 @@
-     switch (params.mode) {
-       case content::FileChooserParams::OpenMultiple:
-         flags |= file_dialog::FILE_DIALOG_MULTI_SELECTIONS;
-+<<<<<<< .our
-         FALLTHROUGH;
-+=======
-+>>>>>>> .their
-       case content::FileChooserParams::Open:
-         flags |= file_dialog::FILE_DIALOG_OPEN_FILE;
-         flags |= file_dialog::FILE_DIALOG_TREAT_PACKAGE_APP_AS_DIRECTORY;
-added in both
-  our    100644 27fbff7e9e3633bd17c54b4c67ba4a1d5993e449 atom/browser/web_view_guest_delegate.cc
-  their  100644 ed8e2d87c7609fe2e1b11d20fa5a664107bcfca2 atom/browser/web_view_guest_delegate.cc
-@@ -7,15 +7,22 @@
- #include "atom/browser/api/atom_api_web_contents.h"
- #include "atom/common/native_mate_converters/gurl_converter.h"
- #include "content/browser/web_contents/web_contents_impl.h"
-+<<<<<<< .our
- #include "content/public/browser/navigation_handle.h"
- #include "content/public/browser/render_frame_host.h"
- #include "content/public/browser/render_process_host.h"
-+=======
-+#include "content/public/browser/guest_host.h"
-+#include "content/public/browser/navigation_handle.h"
-+#include "content/public/browser/render_frame_host.h"
-+>>>>>>> .their
- #include "content/public/browser/render_view_host.h"
- #include "content/public/browser/render_widget_host.h"
- #include "content/public/browser/render_widget_host_view.h"
- 
- namespace atom {
- 
-+<<<<<<< .our
- WebViewGuestDelegate::WebViewGuestDelegate(content::WebContents* embedder,
-                                            api::WebContents* api_web_contents)
-     : embedder_web_contents_(embedder), api_web_contents_(api_web_contents) {}
-@@ -41,11 +48,115 @@
-   // frame |embedder_frame| hosts the inner WebContents.
-   api_web_contents_->web_contents()->AttachToOuterWebContentsFrame(
-       embedder_web_contents_, embedder_frame);
-+=======
-+namespace {
-+
-+const int kDefaultWidth = 300;
-+const int kDefaultHeight = 300;
-+
-+}  // namespace
-+
-+SetSizeParams::SetSizeParams() = default;
-+SetSizeParams::~SetSizeParams() = default;
-+
-+WebViewGuestDelegate::WebViewGuestDelegate() {}
-+
-+WebViewGuestDelegate::~WebViewGuestDelegate() {}
-+
-+void WebViewGuestDelegate::Initialize(api::WebContents* api_web_contents) {
-+  api_web_contents_ = api_web_contents;
-+  Observe(api_web_contents->GetWebContents());
-+}
-+
-+void WebViewGuestDelegate::Destroy() {
-+  // Give the content module an opportunity to perform some cleanup.
-+  ResetZoomController();
-+  guest_host_->WillDestroy();
-+  guest_host_ = nullptr;
-+}
-+
-+void WebViewGuestDelegate::SetSize(const SetSizeParams& params) {
-+  bool enable_auto_size =
-+      params.enable_auto_size ? *params.enable_auto_size : auto_size_enabled_;
-+  gfx::Size min_size = params.min_size ? *params.min_size : min_auto_size_;
-+  gfx::Size max_size = params.max_size ? *params.max_size : max_auto_size_;
-+
-+  if (params.normal_size)
-+    normal_size_ = *params.normal_size;
-+
-+  min_auto_size_ = min_size;
-+  min_auto_size_.SetToMin(max_size);
-+  max_auto_size_ = max_size;
-+  max_auto_size_.SetToMax(min_size);
-+
-+  enable_auto_size &= !min_auto_size_.IsEmpty() && !max_auto_size_.IsEmpty();
-+
-+  auto* rvh = web_contents()->GetRenderViewHost();
-+  if (enable_auto_size) {
-+    // Autosize is being enabled.
-+    rvh->EnableAutoResize(min_auto_size_, max_auto_size_);
-+    normal_size_.SetSize(0, 0);
-+  } else {
-+    // Autosize is being disabled.
-+    // Use default width/height if missing from partially defined normal size.
-+    if (normal_size_.width() && !normal_size_.height())
-+      normal_size_.set_height(GetDefaultSize().height());
-+    if (!normal_size_.width() && normal_size_.height())
-+      normal_size_.set_width(GetDefaultSize().width());
-+
-+    gfx::Size new_size;
-+    if (!normal_size_.IsEmpty()) {
-+      new_size = normal_size_;
-+    } else if (!guest_size_.IsEmpty()) {
-+      new_size = guest_size_;
-+    } else {
-+      new_size = GetDefaultSize();
-+    }
-+
-+    bool changed_due_to_auto_resize = false;
-+    if (auto_size_enabled_) {
-+      // Autosize was previously enabled.
-+      rvh->DisableAutoResize(new_size);
-+      changed_due_to_auto_resize = true;
-+    } else {
-+      // Autosize was already disabled.
-+      guest_host_->SizeContents(new_size);
-+    }
-+
-+    UpdateGuestSize(new_size, changed_due_to_auto_resize);
-+  }
-+
-+  auto_size_enabled_ = enable_auto_size;
-+}
-+
-+void WebViewGuestDelegate::ResizeDueToAutoResize(const gfx::Size& new_size) {
-+  UpdateGuestSize(new_size, auto_size_enabled_);
-+}
-+
-+void WebViewGuestDelegate::DidFinishNavigation(
-+    content::NavigationHandle* navigation_handle) {
-+  if (navigation_handle->HasCommitted() && !navigation_handle->IsErrorPage()) {
-+    auto is_main_frame = navigation_handle->IsInMainFrame();
-+    auto url = navigation_handle->GetURL();
-+    api_web_contents_->Emit("load-commit", url, is_main_frame);
-+  }
-+}
-+
-+void WebViewGuestDelegate::DidDetach() {
-+  attached_ = false;
-+  ResetZoomController();
-+}
-+
-+void WebViewGuestDelegate::DidAttach(int guest_proxy_routing_id) {
-+  attached_ = true;
-+  api_web_contents_->Emit("did-attach");
-+>>>>>>> .their
- 
-   ResetZoomController();
- 
-   embedder_zoom_controller_ =
-       WebContentsZoomController::FromWebContents(embedder_web_contents_);
-+<<<<<<< .our
-   embedder_zoom_controller_->AddObserver(this);
-   auto* zoom_controller = api_web_contents_->GetZoomController();
-   zoom_controller->SetEmbedderZoomController(embedder_zoom_controller_);
-@@ -59,6 +170,29 @@
- 
- content::WebContents* WebViewGuestDelegate::GetOwnerWebContents() const {
-   return embedder_web_contents_;
-+=======
-+  auto* zoom_controller = api_web_contents_->GetZoomController();
-+  embedder_zoom_controller_->AddObserver(this);
-+  zoom_controller->SetEmbedderZoomController(embedder_zoom_controller_);
-+}
-+
-+content::WebContents* WebViewGuestDelegate::GetOwnerWebContents() const {
-+  return embedder_web_contents_;
-+}
-+
-+void WebViewGuestDelegate::SetGuestHost(content::GuestHost* guest_host) {
-+  guest_host_ = guest_host;
-+}
-+
-+void WebViewGuestDelegate::WillAttach(
-+    content::WebContents* embedder_web_contents,
-+    int element_instance_id,
-+    bool is_full_page_plugin,
-+    const base::Closure& completion_callback) {
-+  embedder_web_contents_ = embedder_web_contents;
-+  is_full_page_plugin_ = is_full_page_plugin;
-+  completion_callback.Run();
-+>>>>>>> .their
- }
- 
- void WebViewGuestDelegate::OnZoomLevelChanged(
-@@ -77,8 +211,28 @@
-   }
- }
- 
-+<<<<<<< .our
- void WebViewGuestDelegate::OnZoomControllerWebContentsDestroyed() {
-   ResetZoomController();
-+=======
-+void WebViewGuestDelegate::UpdateGuestSize(const gfx::Size& new_size,
-+                                           bool due_to_auto_resize) {
-+  if (due_to_auto_resize)
-+    api_web_contents_->Emit("size-changed", guest_size_.width(),
-+                            guest_size_.height(), new_size.width(),
-+                            new_size.height());
-+  guest_size_ = new_size;
-+}
-+
-+gfx::Size WebViewGuestDelegate::GetDefaultSize() const {
-+  if (is_full_page_plugin_) {
-+    // Full page plugins default to the size of the owner's viewport.
-+    return embedder_web_contents_->GetRenderWidgetHostView()
-+        ->GetVisibleViewportSize();
-+  } else {
-+    return gfx::Size(kDefaultWidth, kDefaultHeight);
-+  }
-+>>>>>>> .their
- }
- 
- void WebViewGuestDelegate::ResetZoomController() {
-@@ -88,6 +242,13 @@
-   }
- }
- 
-+<<<<<<< .our
-+=======
-+bool WebViewGuestDelegate::CanBeEmbeddedInsideCrossProcessFrames() {
-+  return true;
-+}
-+
-+>>>>>>> .their
- content::RenderWidgetHost* WebViewGuestDelegate::GetOwnerRenderWidgetHost() {
-   return embedder_web_contents_->GetRenderViewHost()->GetWidget();
- }
-added in both
-  our    100644 6d9f440588d1d38a869ca6b6a33fd31031091efa atom/browser/web_view_guest_delegate.h
-  their  100644 784ca99275dd97e32b22a68d1bc49a804e48b213 atom/browser/web_view_guest_delegate.h
-@@ -7,6 +7,10 @@
- 
- #include "atom/browser/web_contents_zoom_controller.h"
- #include "content/public/browser/browser_plugin_guest_delegate.h"
-+<<<<<<< .our
-+=======
-+#include "content/public/browser/web_contents_observer.h"
-+>>>>>>> .their
- 
- namespace atom {
- 
-@@ -14,6 +18,7 @@
- class WebContents;
- }
- 
-+<<<<<<< .our
- class WebViewGuestDelegate : public content::BrowserPluginGuestDelegate,
-                              public WebContentsZoomController::Observer {
-  public:
-@@ -33,14 +38,88 @@
-   content::SiteInstance* GetOwnerSiteInstance() final;
-   content::WebContents* CreateNewGuestWindow(
-       const content::WebContents::CreateParams& create_params) final;
-+=======
-+// A struct of parameters for SetSize(). The parameters are all declared as
-+// scoped pointers since they are all optional. Null pointers indicate that the
-+// parameter has not been provided, and the last used value should be used. Note
-+// that when |enable_auto_size| is true, providing |normal_size| is not
-+// meaningful. This is because the normal size of the guestview is overridden
-+// whenever autosizing occurs.
-+struct SetSizeParams {
-+  SetSizeParams();
-+  ~SetSizeParams();
-+
-+  std::unique_ptr<bool> enable_auto_size;
-+  std::unique_ptr<gfx::Size> min_size;
-+  std::unique_ptr<gfx::Size> max_size;
-+  std::unique_ptr<gfx::Size> normal_size;
-+};
-+
-+class WebViewGuestDelegate : public content::BrowserPluginGuestDelegate,
-+                             public content::WebContentsObserver,
-+                             public WebContentsZoomController::Observer {
-+ public:
-+  WebViewGuestDelegate();
-+  ~WebViewGuestDelegate() override;
-+
-+  void Initialize(api::WebContents* api_web_contents);
-+
-+  // Called when the WebContents is going to be destroyed.
-+  void Destroy();
-+
-+  // Used to toggle autosize mode for this GuestView, and set both the automatic
-+  // and normal sizes.
-+  void SetSize(const SetSizeParams& params);
-+
-+  // Invoked when the contents auto-resized and the container should match it.
-+  void ResizeDueToAutoResize(const gfx::Size& new_size);
-+
-+  // Return true if attached.
-+  bool IsAttached() const { return attached_; }
-+
-+ protected:
-+  // content::WebContentsObserver:
-+  void DidFinishNavigation(
-+      content::NavigationHandle* navigation_handle) override;
-+
-+  // content::BrowserPluginGuestDelegate:
-+  void DidAttach(int guest_proxy_routing_id) final;
-+  void DidDetach() final;
-+  content::WebContents* GetOwnerWebContents() const final;
-+  void SetGuestHost(content::GuestHost* guest_host) final;
-+  void WillAttach(content::WebContents* embedder_web_contents,
-+                  int element_instance_id,
-+                  bool is_full_page_plugin,
-+                  const base::Closure& completion_callback) final;
-+  bool CanBeEmbeddedInsideCrossProcessFrames() override;
-+  content::RenderWidgetHost* GetOwnerRenderWidgetHost() override;
-+  content::SiteInstance* GetOwnerSiteInstance() override;
-+  content::WebContents* CreateNewGuestWindow(
-+      const content::WebContents::CreateParams& create_params) override;
-+>>>>>>> .their
- 
-   // WebContentsZoomController::Observer:
-   void OnZoomLevelChanged(content::WebContents* web_contents,
-                           double level,
-                           bool is_temporary) override;
-+<<<<<<< .our
-   void OnZoomControllerWebContentsDestroyed() override;
- 
-  private:
-+=======
-+
-+ private:
-+  // This method is invoked when the contents auto-resized to give the container
-+  // an opportunity to match it if it wishes.
-+  //
-+  // This gives the derived class an opportunity to inform its container element
-+  // or perform other actions.
-+  void UpdateGuestSize(const gfx::Size& new_size, bool due_to_auto_resize);
-+
-+  // Returns the default size of the guestview.
-+  gfx::Size GetDefaultSize() const;
-+
-+>>>>>>> .their
-   void ResetZoomController();
- 
-   // The WebContents that attaches this guest view.
-@@ -50,6 +129,37 @@
-   // to subscribe for zoom changes.
-   WebContentsZoomController* embedder_zoom_controller_ = nullptr;
- 
-+<<<<<<< .our
-+=======
-+  // The size of the container element.
-+  gfx::Size element_size_;
-+
-+  // The size of the guest content. Note: In autosize mode, the container
-+  // element may not match the size of the guest.
-+  gfx::Size guest_size_;
-+
-+  // A pointer to the guest_host.
-+  content::GuestHost* guest_host_ = nullptr;
-+
-+  // Indicates whether autosize mode is enabled or not.
-+  bool auto_size_enabled_ = false;
-+
-+  // The maximum size constraints of the container element in autosize mode.
-+  gfx::Size max_auto_size_;
-+
-+  // The minimum size constraints of the container element in autosize mode.
-+  gfx::Size min_auto_size_;
-+
-+  // The size that will be used when autosize mode is disabled.
-+  gfx::Size normal_size_;
-+
-+  // Whether the guest view is inside a plugin document.
-+  bool is_full_page_plugin_ = false;
-+
-+  // Whether attached.
-+  bool attached_ = false;
-+
-+>>>>>>> .their
-   api::WebContents* api_web_contents_ = nullptr;
- 
-   DISALLOW_COPY_AND_ASSIGN(WebViewGuestDelegate);
-added in both
-  our    100644 09edfdaac9107386241505d2d5763b1b24aa73a4 atom/common/api/atom_api_native_image.cc
-  their  100644 7b274b38cae7e44b0737912e93a7015c64a60895 atom/common/api/atom_api_native_image.cc
-@@ -245,14 +245,23 @@
- 
-   // First try loading the icon with specified size.
-   if (!hicon_path_.empty()) {
-+<<<<<<< .our
-     hicons_[size] = ReadICOFromPath(size, hicon_path_);
-+=======
-+    hicons_[size] = std::move(ReadICOFromPath(size, hicon_path_));
-+>>>>>>> .their
-     return hicons_[size].get();
-   }
- 
-   // Then convert the image to ICO.
-   if (image_.IsEmpty())
-     return NULL;
-+<<<<<<< .our
-   hicons_[size] = IconUtil::CreateHICONFromSkBitmap(image_.AsBitmap());
-+=======
-+  hicons_[size] =
-+      std::move(IconUtil::CreateHICONFromSkBitmap(image_.AsBitmap()));
-+>>>>>>> .their
-   return hicons_[size].get();
- }
- #endif
-added in both
-  our    100644 3d80db0c0a4cdbb4c7a78fa7e4266fc6fc87193f atom/common/api/atom_api_v8_util.cc
-  their  100644 7eda0e667c90cdd23a50e05aaf0527fe39a0bc4e atom/common/api/atom_api_v8_util.cc
-@@ -12,10 +12,26 @@
- #include "atom/common/native_mate_converters/gurl_converter.h"
- #include "atom/common/node_includes.h"
- #include "base/hash.h"
-+<<<<<<< .our
-+=======
-+#include "base/process/process_handle.h"
-+#include "base/strings/stringprintf.h"
-+>>>>>>> .their
- #include "native_mate/dictionary.h"
- #include "url/origin.h"
- #include "v8/include/v8-profiler.h"
- 
-+<<<<<<< .our
-+=======
-+// This is defined in later versions of Chromium, remove this if you see
-+// compiler complaining duplicate defines.
-+#if defined(OS_WIN) || defined(OS_FUCHSIA)
-+#define CrPRIdPid "ld"
-+#else
-+#define CrPRIdPid "d"
-+#endif
-+
-+>>>>>>> .their
- namespace std {
- 
- // The hash function used by DoubleIDWeakMap.
-@@ -90,6 +106,19 @@
-   return object->GetIdentityHash();
- }
- 
-+<<<<<<< .our
-+=======
-+std::string GetContextID(v8::Isolate* isolate) {
-+  // When a page is reloaded, V8 and blink may have optimizations that do not
-+  // free blink::WebLocalFrame and v8::Context and reuse them for the new page,
-+  // while we always recreate node::Environment when a page is loaded.
-+  // So the only reliable way to return an identity for a page, is to return the
-+  // address of the node::Environment instance.
-+  node::Environment* env = node::Environment::GetCurrent(isolate);
-+  return base::StringPrintf("%" CrPRIdPid "-%p", base::GetCurrentProcId(), env);
-+}
-+
-+>>>>>>> .their
- void TakeHeapSnapshot(v8::Isolate* isolate) {
-   isolate->GetHeapProfiler()->TakeHeapSnapshot();
- }
-@@ -112,6 +141,10 @@
-   dict.SetMethod("setHiddenValue", &SetHiddenValue);
-   dict.SetMethod("deleteHiddenValue", &DeleteHiddenValue);
-   dict.SetMethod("getObjectHash", &GetObjectHash);
-+<<<<<<< .our
-+=======
-+  dict.SetMethod("getContextId", &GetContextID);
-+>>>>>>> .their
-   dict.SetMethod("takeHeapSnapshot", &TakeHeapSnapshot);
-   dict.SetMethod("setRemoteCallbackFreer", &atom::RemoteCallbackFreer::BindTo);
-   dict.SetMethod("setRemoteObjectFreer", &atom::RemoteObjectFreer::BindTo);
-added in both
-  our    100644 3dba3d63673ca8eb02044bd1335a3095f0194971 atom/common/api/atom_bindings.cc
-  their  100644 ee02ed3f6a28bcc15407465ae0cc34f71664d9dc atom/common/api/atom_bindings.cc
-@@ -14,7 +14,10 @@
- #include "atom/common/native_mate_converters/string16_converter.h"
- #include "atom/common/node_includes.h"
- #include "base/logging.h"
-+<<<<<<< .our
- #include "base/process/process_info.h"
-+=======
-+>>>>>>> .their
- #include "base/process/process_metrics_iocounters.h"
- #include "base/sys_info.h"
- #include "native_mate/dictionary.h"
-@@ -56,10 +59,16 @@
-   dict.SetMethod("log", &Log);
-   dict.SetMethod("getHeapStatistics", &GetHeapStatistics);
-   dict.SetMethod("getProcessMemoryInfo", &GetProcessMemoryInfo);
-+<<<<<<< .our
-   dict.SetMethod("getCreationTime", &GetCreationTime);
-   dict.SetMethod("getSystemMemoryInfo", &GetSystemMemoryInfo);
-   dict.SetMethod("getCPUUsage", base::Bind(&AtomBindings::GetCPUUsage,
-                                            base::Unretained(metrics_.get())));
-+=======
-+  dict.SetMethod("getSystemMemoryInfo", &GetSystemMemoryInfo);
-+  dict.SetMethod("getCPUUsage", base::Bind(&AtomBindings::GetCPUUsage,
-+                                           base::Unretained(this)));
-+>>>>>>> .their
-   dict.SetMethod("getIOCounters", &GetIOCounters);
- #if defined(OS_POSIX)
-   dict.SetMethod("setFdLimit", &base::SetFdLimit);
-@@ -135,7 +144,10 @@
-   isolate->GetHeapStatistics(&v8_heap_stats);
- 
-   mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
-+<<<<<<< .our
-   dict.SetHidden("simple", true);
-+=======
-+>>>>>>> .their
-   dict.Set("totalHeapSize",
-            static_cast<double>(v8_heap_stats.total_heap_size() >> 10));
-   dict.Set(
-@@ -164,7 +176,10 @@
-   auto metrics = base::ProcessMetrics::CreateCurrentProcessMetrics();
- 
-   mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
-+<<<<<<< .our
-   dict.SetHidden("simple", true);
-+=======
-+>>>>>>> .their
-   dict.Set("workingSetSize",
-            static_cast<double>(metrics->GetWorkingSetSize() >> 10));
-   dict.Set("peakWorkingSetSize",
-@@ -180,6 +195,7 @@
- }
- 
- // static
-+<<<<<<< .our
- v8::Local<v8::Value> AtomBindings::GetCreationTime(v8::Isolate* isolate) {
-   auto timeValue = base::CurrentProcessInfo::CreationTime();
-   if (timeValue.is_null()) {
-@@ -190,6 +206,8 @@
- }
- 
- // static
-+=======
-+>>>>>>> .their
- v8::Local<v8::Value> AtomBindings::GetSystemMemoryInfo(v8::Isolate* isolate,
-                                                        mate::Arguments* args) {
-   base::SystemMemoryInfoKB mem_info;
-@@ -199,7 +217,10 @@
-   }
- 
-   mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
-+<<<<<<< .our
-   dict.SetHidden("simple", true);
-+=======
-+>>>>>>> .their
-   dict.Set("total", mem_info.total);
- 
-   // See Chromium's "base/process/process_metrics.h" for an explanation.
-@@ -220,6 +241,7 @@
-   return dict.GetHandle();
- }
- 
-+<<<<<<< .our
- // static
- v8::Local<v8::Value> AtomBindings::GetCPUUsage(base::ProcessMetrics* metrics,
-                                                v8::Isolate* isolate) {
-@@ -228,11 +250,22 @@
-   int processor_count = base::SysInfo::NumberOfProcessors();
-   dict.Set("percentCPUUsage",
-            metrics->GetPlatformIndependentCPUUsage() / processor_count);
-+=======
-+v8::Local<v8::Value> AtomBindings::GetCPUUsage(v8::Isolate* isolate) {
-+  mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
-+  int processor_count = base::SysInfo::NumberOfProcessors();
-+  dict.Set("percentCPUUsage",
-+           metrics_->GetPlatformIndependentCPUUsage() / processor_count);
-+>>>>>>> .their
- 
-   // NB: This will throw NOTIMPLEMENTED() on Windows
-   // For backwards compatibility, we'll return 0
- #if !defined(OS_WIN)
-+<<<<<<< .our
-   dict.Set("idleWakeupsPerSecond", metrics->GetIdleWakeupsPerSecond());
-+=======
-+  dict.Set("idleWakeupsPerSecond", metrics_->GetIdleWakeupsPerSecond());
-+>>>>>>> .their
- #else
-   dict.Set("idleWakeupsPerSecond", 0);
- #endif
-@@ -245,7 +278,10 @@
-   auto metrics = base::ProcessMetrics::CreateCurrentProcessMetrics();
-   base::IoCounters io_counters;
-   mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
-+<<<<<<< .our
-   dict.SetHidden("simple", true);
-+=======
-+>>>>>>> .their
- 
-   if (metrics->GetIOCounters(&io_counters)) {
-     dict.Set("readOperationCount", io_counters.ReadOperationCount);
-added in both
-  our    100644 ba8385c979b15286fd7647582e7d0aee93e1974e atom/common/api/atom_bindings.h
-  their  100644 46a5f36bdcea9adb76c091b17bbed47a0ba8a2ea atom/common/api/atom_bindings.h
-@@ -37,11 +37,17 @@
-   static void Hang();
-   static v8::Local<v8::Value> GetHeapStatistics(v8::Isolate* isolate);
-   static v8::Local<v8::Value> GetProcessMemoryInfo(v8::Isolate* isolate);
-+<<<<<<< .our
-   static v8::Local<v8::Value> GetCreationTime(v8::Isolate* isolate);
-   static v8::Local<v8::Value> GetSystemMemoryInfo(v8::Isolate* isolate,
-                                                   mate::Arguments* args);
-   static v8::Local<v8::Value> GetCPUUsage(base::ProcessMetrics* metrics,
-                                           v8::Isolate* isolate);
-+=======
-+  static v8::Local<v8::Value> GetSystemMemoryInfo(v8::Isolate* isolate,
-+                                                  mate::Arguments* args);
-+  v8::Local<v8::Value> GetCPUUsage(v8::Isolate* isolate);
-+>>>>>>> .their
-   static v8::Local<v8::Value> GetIOCounters(v8::Isolate* isolate);
- 
-  private:
-added in both
-  our    100644 9b37f94a4dc462c0cc84e0182654ff2571952df9 atom/common/asar/archive.cc
-  their  100644 769efec0a2b0d402428ab10ced26feeb5c6157c5 atom/common/asar/archive.cc
-@@ -221,13 +221,21 @@
-   if (!GetNodeFromPath(path.AsUTF8Unsafe(), header_.get(), &node))
-     return false;
- 
-+<<<<<<< .our
-   if (node->FindKey("link")) {
-+=======
-+  if (node->HasKey("link")) {
-+>>>>>>> .their
-     stats->is_file = false;
-     stats->is_link = true;
-     return true;
-   }
- 
-+<<<<<<< .our
-   if (node->FindKey("files")) {
-+=======
-+  if (node->HasKey("files")) {
-+>>>>>>> .their
-     stats->is_file = false;
-     stats->is_directory = true;
-     return true;
-added in both
-  our    100644 65e7d19911559a40b1b258319df5fe0fa180354f atom/common/atom_version.h
-  their  100644 cd9f1a159e33d421133d91645432e24ea055f47b atom/common/atom_version.h
-@@ -5,10 +5,17 @@
- #ifndef ATOM_COMMON_ATOM_VERSION_H_
- #define ATOM_COMMON_ATOM_VERSION_H_
- 
-+<<<<<<< .our
- #define ATOM_MAJOR_VERSION 4
- #define ATOM_MINOR_VERSION 0
- #define ATOM_PATCH_VERSION 0
- #define ATOM_PRE_RELEASE_VERSION -nightly.20180821
-+=======
-+#define ATOM_MAJOR_VERSION 3
-+#define ATOM_MINOR_VERSION 0
-+#define ATOM_PATCH_VERSION 0
-+#define ATOM_PRE_RELEASE_VERSION -beta.3
-+>>>>>>> .their
- 
- #ifndef ATOM_STRINGIFY
- #define ATOM_STRINGIFY(n) ATOM_STRINGIFY_HELPER(n)
-added in both
-  our    100644 89a2a5966d6caf3c13643065ef084e98b69efcaf atom/common/crash_reporter/crash_reporter_win.h
-  their  100644 f7f1c6b28455a52daf0860028df1054788ddde54 atom/common/crash_reporter/crash_reporter_win.h
-@@ -11,7 +11,11 @@
- 
- #include "atom/common/crash_reporter/crash_reporter.h"
- #include "base/compiler_specific.h"
-+<<<<<<< .our
- #include "breakpad/src/client/windows/handler/exception_handler.h"
-+=======
-+#include "vendor/breakpad/src/client/windows/handler/exception_handler.h"
-+>>>>>>> .their
- 
- namespace base {
- template <typename T>
-@@ -40,7 +44,11 @@
-   friend struct base::DefaultSingletonTraits<CrashReporterWin>;
- 
-   CrashReporterWin();
-+<<<<<<< .our
-   ~CrashReporterWin() override;
-+=======
-+  virtual ~CrashReporterWin();
-+>>>>>>> .their
- 
-   static bool FilterCallback(void* context,
-                              EXCEPTION_POINTERS* exinfo,
-@@ -65,9 +73,13 @@
-   google_breakpad::CustomClientInfo custom_info_;
- 
-   bool skip_system_crash_handler_ = false;
-+<<<<<<< .our
- #ifdef _WIN64
-   bool code_range_registered_ = false;
- #endif
-+=======
-+  bool code_range_registered_ = false;
-+>>>>>>> .their
-   std::unique_ptr<google_breakpad::ExceptionHandler> breakpad_;
- 
-   DISALLOW_COPY_AND_ASSIGN(CrashReporterWin);
-added in both
-  our    100644 8b0e3de5cecdda5c97237ebd5d6e0bbbd99a280b atom/common/crash_reporter/linux/crash_dump_handler.cc
-  their  100644 ccc8d0d538e3a23a85f7dc3dd2d2650f6cb88bcd atom/common/crash_reporter/linux/crash_dump_handler.cc
-@@ -15,7 +15,11 @@
- #include "base/posix/eintr_wrapper.h"
- #include "breakpad/src/client/linux/minidump_writer/directory_reader.h"
- #include "breakpad/src/common/linux/linux_libc_support.h"
-+<<<<<<< .our
- #include "breakpad/src/common/memory_allocator.h"
-+=======
-+#include "breakpad/src/common/memory.h"
-+>>>>>>> .their
- 
- #include "third_party/lss/linux_syscall_support.h"
- 
-added in both
-  our    100644 d13111f495be844df10deebacd572560021bbb4e atom/common/crash_reporter/win/crash_service.cc
-  their  100644 a1a6ab6d7908389bdc0a400cf751fde809408115 atom/common/crash_reporter/win/crash_service.cc
-@@ -17,9 +17,15 @@
- #include "base/strings/string_util.h"
- #include "base/time/time.h"
- #include "base/win/windows_version.h"
-+<<<<<<< .our
- #include "breakpad/src/client/windows/crash_generation/client_info.h"
- #include "breakpad/src/client/windows/crash_generation/crash_generation_server.h"
- #include "breakpad/src/client/windows/sender/crash_report_sender.h"
-+=======
-+#include "vendor/breakpad/src/client/windows/crash_generation/client_info.h"
-+#include "vendor/breakpad/src/client/windows/crash_generation/crash_generation_server.h"
-+#include "vendor/breakpad/src/client/windows/sender/crash_report_sender.h"
-+>>>>>>> .their
- 
- namespace breakpad {
- 
-@@ -132,7 +138,11 @@
-   wcx.lpfnWndProc = CrashSvcWndProc;
-   wcx.hInstance = instance;
-   wcx.lpszClassName = class_name.c_str();
-+<<<<<<< .our
-   ::RegisterClassExW(&wcx);
-+=======
-+  ATOM atom = ::RegisterClassExW(&wcx);
-+>>>>>>> .their
-   DWORD style = visible ? WS_POPUPWINDOW | WS_VISIBLE : WS_OVERLAPPED;
- 
-   // The window size is zero but being a popup window still shows in the
-@@ -487,6 +497,10 @@
-   // Build the SDDL string for the label.
-   std::wstring sddl = L"S:(ML;;NW;;;S-1-16-4096)";
- 
-+<<<<<<< .our
-+=======
-+  DWORD error = ERROR_SUCCESS;
-+>>>>>>> .their
-   PSECURITY_DESCRIPTOR sec_desc = NULL;
- 
-   PACL sacl = NULL;
-added in both
-  our    100644 d0a12cb6d91b9688c1bed496e64d6bbaccaf244a atom/common/keyboard_util.cc
-  their  100644 b8caa1f1b00d652a67ecd103e5ce3a78b70c01f4 atom/common/keyboard_util.cc
-@@ -88,108 +88,171 @@
- 
-     case ')':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '0':
-       return ui::VKEY_0;
-     case '!':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '1':
-       return ui::VKEY_1;
-     case '@':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '2':
-       return ui::VKEY_2;
-     case '#':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '3':
-       return ui::VKEY_3;
-     case '$':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '4':
-       return ui::VKEY_4;
-     case '%':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '5':
-       return ui::VKEY_5;
-     case '^':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '6':
-       return ui::VKEY_6;
-     case '&':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '7':
-       return ui::VKEY_7;
-     case '*':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '8':
-       return ui::VKEY_8;
-     case '(':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '9':
-       return ui::VKEY_9;
- 
-     case ':':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case ';':
-       return ui::VKEY_OEM_1;
-     case '+':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '=':
-       return ui::VKEY_OEM_PLUS;
-     case '<':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case ',':
-       return ui::VKEY_OEM_COMMA;
-     case '_':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '-':
-       return ui::VKEY_OEM_MINUS;
-     case '>':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '.':
-       return ui::VKEY_OEM_PERIOD;
-     case '?':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '/':
-       return ui::VKEY_OEM_2;
-     case '~':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '`':
-       return ui::VKEY_OEM_3;
-     case '{':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '[':
-       return ui::VKEY_OEM_4;
-     case '|':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '\\':
-       return ui::VKEY_OEM_5;
-     case '}':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case ']':
-       return ui::VKEY_OEM_6;
-     case '"':
-       *shifted = true;
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case '\'':
-       return ui::VKEY_OEM_7;
- 
-added in both
-  our    100644 2684aa7dda07ac79e47823c3cf9bf00d3f5cf3f5 atom/common/native_mate_converters/content_converter.cc
-  their  100644 46364e21266a93c7c496d87acbf6cc4ff4965194 atom/common/native_mate_converters/content_converter.cc
-@@ -43,12 +43,18 @@
-     case content::MenuItem::CHECKABLE_OPTION:
-     case content::MenuItem::GROUP:
-       v8_item.Set("checked", item.checked);
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     case content::MenuItem::OPTION:
-     case content::MenuItem::SUBMENU:
-       v8_item.Set("label", item.label);
-       v8_item.Set("enabled", item.enabled);
-+<<<<<<< .our
-       FALLTHROUGH;
-+=======
-+>>>>>>> .their
-     default:
-       v8_item.Set("type", item.type);
-   }
-added in both
-  our    100644 db54210e7c095da593c6f5b9f4ed1eafb91b945d atom/common/native_mate_converters/net_converter.cc
-  their  100644 d3890bbff79276627528e7ced7eb69ffcf367f43 atom/common/native_mate_converters/net_converter.cc
-@@ -160,7 +160,11 @@
-     std::string value;
-     while (headers->EnumerateHeaderLines(&iter, &key, &value)) {
-       key = base::ToLowerASCII(key);
-+<<<<<<< .our
-       if (response_headers.FindKey(key)) {
-+=======
-+      if (response_headers.HasKey(key)) {
-+>>>>>>> .their
-         base::ListValue* values = nullptr;
-         if (response_headers.GetList(key, &values))
-           values->AppendString(value);
-@@ -239,9 +243,14 @@
-     if (reader->AsBytesReader()) {
-       const net::UploadBytesElementReader* bytes_reader =
-           reader->AsBytesReader();
-+<<<<<<< .our
-       auto bytes = std::make_unique<base::Value>(
-           std::vector<char>(bytes_reader->bytes(),
-                             bytes_reader->bytes() + bytes_reader->length()));
-+=======
-+      std::unique_ptr<base::Value> bytes(base::Value::CreateWithCopiedBuffer(
-+          bytes_reader->bytes(), bytes_reader->length()));
-+>>>>>>> .their
-       upload_data_dict->Set("bytes", std::move(bytes));
-     } else if (reader->AsFileReader()) {
-       const net::UploadFileElementReader* file_reader = reader->AsFileReader();
-added in both
-  our    100644 61a6563a617030684081e4934044865fdc3c6540 atom/common/native_mate_converters/network_converter.cc
-  their  100644 1f98a5b8ebd548f54a8113f186c5344618dcd027 atom/common/native_mate_converters/network_converter.cc
-@@ -6,7 +6,10 @@
- 
- #include <string>
- #include <utility>
-+<<<<<<< .our
- #include <vector>
-+=======
-+>>>>>>> .their
- 
- #include "atom/common/native_mate_converters/value_converter.h"
- #include "native_mate/dictionary.h"
-@@ -26,8 +29,13 @@
-     auto post_data_dict = std::make_unique<base::DictionaryValue>();
-     auto type = element.type();
-     if (type == network::DataElement::TYPE_BYTES) {
-+<<<<<<< .our
-       auto bytes = std::make_unique<base::Value>(std::vector<char>(
-           element.bytes(), element.bytes() + (element.length())));
-+=======
-+      auto bytes = base::Value::CreateWithCopiedBuffer(
-+          element.bytes(), static_cast<size_t>(element.length()));
-+>>>>>>> .their
-       post_data_dict->SetString("type", "rawData");
-       post_data_dict->Set("bytes", std::move(bytes));
-     } else if (type == network::DataElement::TYPE_FILE) {
-added in both
-  our    100644 3fa070771d6843e9428e560c746965b095961e2a atom/common/native_mate_converters/v8_value_converter.cc
-  their  100644 fbc410bdcb7111bf2ee86dbe07538957de486b68 atom/common/native_mate_converters/v8_value_converter.cc
-@@ -8,7 +8,10 @@
- #include <memory>
- #include <string>
- #include <utility>
-+<<<<<<< .our
- #include <vector>
-+=======
-+>>>>>>> .their
- 
- #include "base/logging.h"
- #include "base/values.h"
-@@ -163,22 +166,42 @@
-       return v8::Null(isolate);
- 
-     case base::Value::Type::BOOLEAN: {
-+<<<<<<< .our
-       bool val = value->GetBool();
-+=======
-+      bool val = false;
-+      value->GetAsBoolean(&val);
-+>>>>>>> .their
-       return v8::Boolean::New(isolate, val);
-     }
- 
-     case base::Value::Type::INTEGER: {
-+<<<<<<< .our
-       int val = value->GetInt();
-+=======
-+      int val = 0;
-+      value->GetAsInteger(&val);
-+>>>>>>> .their
-       return v8::Integer::New(isolate, val);
-     }
- 
-     case base::Value::Type::DOUBLE: {
-+<<<<<<< .our
-       double val = value->GetDouble();
-+=======
-+      double val = 0.0;
-+      value->GetAsDouble(&val);
-+>>>>>>> .their
-       return v8::Number::New(isolate, val);
-     }
- 
-     case base::Value::Type::STRING: {
-+<<<<<<< .our
-       std::string val = value->GetString();
-+=======
-+      std::string val;
-+      value->GetAsString(&val);
-+>>>>>>> .their
-       return v8::String::NewFromUtf8(isolate, val.c_str(),
-                                      v8::String::kNormalString, val.length());
-     }
-@@ -342,8 +365,13 @@
-   if (val->IsRegExp()) {
-     if (!reg_exp_allowed_)
-       // JSON.stringify converts to an object.
-+<<<<<<< .our
-       return FromV8Object(val->ToObject(context).ToLocalChecked(), state,
-                           isolate);
-+=======
-+      return FromV8Object(val->ToObject(context).ToLocalChecked(),
-+          state, isolate);
-+>>>>>>> .their
-     return new base::Value(
-         *v8::String::Utf8Value(val->ToString(context).ToLocalChecked()));
-   }
-@@ -356,8 +384,13 @@
-     if (!function_allowed_)
-       // JSON.stringify refuses to convert function(){}.
-       return nullptr;
-+<<<<<<< .our
-     return FromV8Object(val->ToObject(context).ToLocalChecked(), state,
-                         isolate);
-+=======
-+    return FromV8Object(val->ToObject(context).ToLocalChecked(),
-+        state, isolate);
-+>>>>>>> .their
-   }
- 
-   if (node::Buffer::HasInstance(val)) {
-@@ -365,8 +398,13 @@
-   }
- 
-   if (val->IsObject()) {
-+<<<<<<< .our
-     return FromV8Object(val->ToObject(context).ToLocalChecked(), state,
-                         isolate);
-+=======
-+    return FromV8Object(val->ToObject(context).ToLocalChecked(),
-+        state, isolate);
-+>>>>>>> .their
-   }
- 
-   LOG(ERROR) << "Unexpected v8 value type encountered.";
-@@ -415,9 +453,15 @@
- base::Value* V8ValueConverter::FromNodeBuffer(v8::Local<v8::Value> value,
-                                               FromV8ValueState* state,
-                                               v8::Isolate* isolate) const {
-+<<<<<<< .our
-   return new base::Value(std::vector<char>(
-       node::Buffer::Data(value),
-       node::Buffer::Data(value) + node::Buffer::Length(value)));
-+=======
-+  return base::Value::CreateWithCopiedBuffer(node::Buffer::Data(value),
-+                                             node::Buffer::Length(value))
-+      .release();
-+>>>>>>> .their
- }
- 
- base::Value* V8ValueConverter::FromV8Object(v8::Local<v8::Object> val,
-added in both
-  our    100644 a71cc70f83d2526596a75d8daf036f905ca099be atom/common/native_mate_converters/value_converter.cc
-  their  100644 0412a0118f2b5f6e2801f02e6089f9d12214d311 atom/common/native_mate_converters/value_converter.cc
-@@ -30,6 +30,7 @@
-   return converter.ToV8Value(&val, isolate->GetCurrentContext());
- }
- 
-+<<<<<<< .our
- bool Converter<base::Value>::FromV8(v8::Isolate* isolate,
-                                     v8::Local<v8::Value> val,
-                                     base::Value* out) {
-@@ -50,6 +51,8 @@
-   return converter.ToV8Value(&val, isolate->GetCurrentContext());
- }
- 
-+=======
-+>>>>>>> .their
- bool Converter<base::ListValue>::FromV8(v8::Isolate* isolate,
-                                         v8::Local<v8::Value> val,
-                                         base::ListValue* out) {
-added in both
-  our    100644 b2ea5def0aa9646791c635c15e0ed504dc0af465 atom/common/native_mate_converters/value_converter.h
-  their  100644 a53b2724b0883ab343f6262f7e506deb39e5b34d atom/common/native_mate_converters/value_converter.h
-@@ -10,7 +10,10 @@
- namespace base {
- class DictionaryValue;
- class ListValue;
-+<<<<<<< .our
- class Value;
-+=======
-+>>>>>>> .their
- }  // namespace base
- 
- namespace mate {
-@@ -25,6 +28,7 @@
- };
- 
- template <>
-+<<<<<<< .our
- struct Converter<base::Value> {
-   static bool FromV8(v8::Isolate* isolate,
-                      v8::Local<v8::Value> val,
-@@ -34,6 +38,8 @@
- };
- 
- template <>
-+=======
-+>>>>>>> .their
- struct Converter<base::ListValue> {
-   static bool FromV8(v8::Isolate* isolate,
-                      v8::Local<v8::Value> val,
-added in both
-  our    100644 e6aded2e661af919c2d89c2f9bd46b4921d4aec4 atom/common/node_bindings.cc
-  their  100644 a26747cf03c85a7ada7e84a2bda860791a4d73e2 atom/common/node_bindings.cc
-@@ -15,6 +15,10 @@
- #include "base/base_paths.h"
- #include "base/command_line.h"
- #include "base/environment.h"
-+<<<<<<< .our
-+=======
-+#include "base/files/file_path.h"
-+>>>>>>> .their
- #include "base/path_service.h"
- #include "base/run_loop.h"
- #include "base/strings/utf_string_conversions.h"
-@@ -194,10 +198,13 @@
-   return g_is_initialized;
- }
- 
-+<<<<<<< .our
- base::FilePath::StringType NodeBindings::GetHelperResourcesPath() {
-   return GetResourcesPath(false).value();
- }
- 
-+=======
-+>>>>>>> .their
- void NodeBindings::Initialize() {
-   // Open node's error reporting system for browser process.
-   node::g_standalone_mode = browser_env_ == BROWSER;
-added in both
-  our    100644 5e5ec8e5300ba2c1917e3e9d7e2e8ea1ee341e3b atom/common/node_bindings.h
-  their  100644 7c8cad46cc6927de6746ea65b7db536245baad20 atom/common/node_bindings.h
-@@ -5,7 +5,10 @@
- #ifndef ATOM_COMMON_NODE_BINDINGS_H_
- #define ATOM_COMMON_NODE_BINDINGS_H_
- 
-+<<<<<<< .our
- #include "base/files/file_path.h"
-+=======
-+>>>>>>> .their
- #include "base/macros.h"
- #include "base/memory/weak_ptr.h"
- #include "base/single_thread_task_runner.h"
-@@ -34,7 +37,10 @@
-   static NodeBindings* Create(BrowserEnvironment browser_env);
-   static void RegisterBuiltinModules();
-   static bool IsInitialized();
-+<<<<<<< .our
-   static base::FilePath::StringType GetHelperResourcesPath();
-+=======
-+>>>>>>> .their
- 
-   virtual ~NodeBindings();
- 
-added in both
-  our    100644 e41fb585f57114de00376f52e0d97277e6eca94b atom/common/node_bindings_win.cc
-  their  100644 4a5ff5c51406d0b051f6d790b111a3477da561bf atom/common/node_bindings_win.cc
-@@ -8,6 +8,13 @@
- 
- #include "base/logging.h"
- 
-+<<<<<<< .our
-+=======
-+extern "C" {
-+#include "vendor/node/deps/uv/src/win/internal.h"
-+}
-+
-+>>>>>>> .their
- namespace atom {
- 
- NodeBindingsWin::NodeBindingsWin(BrowserEnvironment browser_env)
-added in both
-  our    100644 77fe5f43b54c8d53bfc5a4a29c9c0a6f62bea423 atom/common/node_bindings_win.h
-  their  100644 793586d88da8a40c86a322bef383f118404d2480 atom/common/node_bindings_win.h
-@@ -13,7 +13,11 @@
- class NodeBindingsWin : public NodeBindings {
-  public:
-   explicit NodeBindingsWin(BrowserEnvironment browser_env);
-+<<<<<<< .our
-   ~NodeBindingsWin() override;
-+=======
-+  virtual ~NodeBindingsWin();
-+>>>>>>> .their
- 
-  private:
-   void PollEvents() override;
-added in both
-  our    100644 fa1a7499a8b082fe9007f04041b46e58502b3ad9 atom/common/node_includes.h
-  their  100644 edd4812e01c29f9307a21b59db876106ae8fc8ec atom/common/node_includes.h
-@@ -9,9 +9,13 @@
- 
- // Include common headers for using node APIs.
- 
-+<<<<<<< .our
- #ifdef NODE_SHARED_MODE
- #define BUILDING_NODE_EXTENSION
- #endif
-+=======
-+#define BUILDING_NODE_EXTENSION
-+>>>>>>> .their
- 
- // The following define makes sure that we do not include the macros
- // again. But we still need the tracing functions, so declaring them.
-added in both
-  our    100644 8b1836f80c583e4db68971ff1b00ca4f86356b45 atom/common/options_switches.cc
-  their  100644 f85d1a97c177b5458cca5bab2ba6b2f05c2c9337 atom/common/options_switches.cc
-@@ -118,6 +118,10 @@
- 
- // Web runtime features.
- const char kExperimentalFeatures[] = "experimentalFeatures";
-+<<<<<<< .our
-+=======
-+const char kExperimentalCanvasFeatures[] = "experimentalCanvasFeatures";
-+>>>>>>> .their
- 
- // Opener window's ID.
- const char kOpenerID[] = "openerId";
-@@ -188,9 +192,19 @@
- // The application path
- const char kAppPath[] = "app-path";
- 
-+<<<<<<< .our
- // The command line switch versions of the options.
- const char kBackgroundColor[] = "background-color";
- const char kPreloadScript[] = "preload";
-+=======
-+// The context ID for this process
-+const char kContextId[] = "context-id";
-+
-+// The command line switch versions of the options.
-+const char kBackgroundColor[] = "background-color";
-+const char kPreloadScript[] = "preload";
-+const char kPreloadURL[] = "preload-url";
-+>>>>>>> .their
- const char kPreloadScripts[] = "preload-scripts";
- const char kNodeIntegration[] = "node-integration";
- const char kContextIsolation[] = "context-isolation";
-@@ -210,12 +224,15 @@
- // Widevine CDM version.
- const char kWidevineCdmVersion[] = "widevine-cdm-version";
- 
-+<<<<<<< .our
- // Forces the maximum disk space to be used by the disk cache, in bytes.
- const char kDiskCacheSize[] = "disk-cache-size";
- 
- // Ignore the limit of 6 connections per host.
- const char kIgnoreConnectionsLimit[] = "ignore-connections-limit";
- 
-+=======
-+>>>>>>> .their
- }  // namespace switches
- 
- }  // namespace atom
-added in both
-  our    100644 5f6d7e9d38120668ed06922ced2f8d6a6e27a52b atom/common/options_switches.h
-  their  100644 fa8e7e8c42999063122001969a7fccb2e5de6182 atom/common/options_switches.h
-@@ -61,6 +61,10 @@
- extern const char kContextIsolation[];
- extern const char kGuestInstanceID[];
- extern const char kExperimentalFeatures[];
-+<<<<<<< .our
-+=======
-+extern const char kExperimentalCanvasFeatures[];
-+>>>>>>> .their
- extern const char kOpenerID[];
- extern const char kScrollBounce[];
- extern const char kEnableBlinkFeatures[];
-@@ -92,9 +96,17 @@
- extern const char kSecureSchemes[];
- extern const char kAppUserModelId[];
- extern const char kAppPath[];
-+<<<<<<< .our
- 
- extern const char kBackgroundColor[];
- extern const char kPreloadScript[];
-+=======
-+extern const char kContextId[];
-+
-+extern const char kBackgroundColor[];
-+extern const char kPreloadScript[];
-+extern const char kPreloadURL[];
-+>>>>>>> .their
- extern const char kPreloadScripts[];
- extern const char kNodeIntegration[];
- extern const char kContextIsolation[];
-@@ -109,9 +121,12 @@
- extern const char kWidevineCdmPath[];
- extern const char kWidevineCdmVersion[];
- 
-+<<<<<<< .our
- extern const char kDiskCacheSize[];
- extern const char kIgnoreConnectionsLimit[];
- 
-+=======
-+>>>>>>> .their
- }  // namespace switches
- 
- }  // namespace atom
-added in both
-  our    100644 34576be95f2552aaa985dacb3f36406dfc29d54c atom/common/platform_util_win.cc
-  their  100644 193e2ece0042367113ee23512b5b3ee6d4785fca atom/common/platform_util_win.cc
-@@ -31,12 +31,32 @@
- 
- namespace {
- 
-+<<<<<<< .our
-+=======
-+// Old ShellExecute crashes the process when the command for a given scheme
-+// is empty. This function tells if it is.
-+bool ValidateShellCommandForScheme(const std::string& scheme) {
-+  base::win::RegKey key;
-+  base::string16 registry_path =
-+      base::ASCIIToUTF16(scheme) + L"\\shell\\open\\command";
-+  key.Open(HKEY_CLASSES_ROOT, registry_path.c_str(), KEY_READ);
-+  if (!key.Valid())
-+    return false;
-+  DWORD size = 0;
-+  key.ReadValue(NULL, NULL, &size, NULL);
-+  if (size <= 2)
-+    return false;
-+  return true;
-+}
-+
-+>>>>>>> .their
- // Required COM implementation of IFileOperationProgressSink so we can
- // precheck files before deletion to make sure they can be move to the
- // Recycle Bin.
- class DeleteFileProgressSink : public IFileOperationProgressSink {
-  public:
-   DeleteFileProgressSink();
-+<<<<<<< .our
-   virtual ~DeleteFileProgressSink() = default;
- 
-  private:
-@@ -75,17 +95,55 @@
-                                            HRESULT,
-                                            IShellItem*) override;
-   HRESULT STDMETHODCALLTYPE PreNewItem(DWORD, IShellItem*, LPCWSTR) override;
-+=======
-+
-+ private:
-+  ULONG STDMETHODCALLTYPE AddRef(void);
-+  ULONG STDMETHODCALLTYPE Release(void);
-+  HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, LPVOID* ppvObj);
-+  HRESULT STDMETHODCALLTYPE StartOperations(void);
-+  HRESULT STDMETHODCALLTYPE FinishOperations(HRESULT);
-+  HRESULT STDMETHODCALLTYPE PreRenameItem(DWORD, IShellItem*, LPCWSTR);
-+  HRESULT STDMETHODCALLTYPE
-+  PostRenameItem(DWORD, IShellItem*, LPCWSTR, HRESULT, IShellItem*);
-+  HRESULT STDMETHODCALLTYPE PreMoveItem(DWORD,
-+                                        IShellItem*,
-+                                        IShellItem*,
-+                                        LPCWSTR);
-+  HRESULT STDMETHODCALLTYPE
-+  PostMoveItem(DWORD, IShellItem*, IShellItem*, LPCWSTR, HRESULT, IShellItem*);
-+  HRESULT STDMETHODCALLTYPE PreCopyItem(DWORD,
-+                                        IShellItem*,
-+                                        IShellItem*,
-+                                        LPCWSTR);
-+  HRESULT STDMETHODCALLTYPE
-+  PostCopyItem(DWORD, IShellItem*, IShellItem*, LPCWSTR, HRESULT, IShellItem*);
-+  HRESULT STDMETHODCALLTYPE PreDeleteItem(DWORD, IShellItem*);
-+  HRESULT STDMETHODCALLTYPE PostDeleteItem(DWORD,
-+                                           IShellItem*,
-+                                           HRESULT,
-+                                           IShellItem*);
-+  HRESULT STDMETHODCALLTYPE PreNewItem(DWORD, IShellItem*, LPCWSTR);
-+>>>>>>> .their
-   HRESULT STDMETHODCALLTYPE PostNewItem(DWORD,
-                                         IShellItem*,
-                                         LPCWSTR,
-                                         LPCWSTR,
-                                         DWORD,
-                                         HRESULT,
-+<<<<<<< .our
-                                         IShellItem*) override;
-   HRESULT STDMETHODCALLTYPE UpdateProgress(UINT, UINT) override;
-   HRESULT STDMETHODCALLTYPE ResetTimer(void) override;
-   HRESULT STDMETHODCALLTYPE PauseTimer(void) override;
-   HRESULT STDMETHODCALLTYPE ResumeTimer(void) override;
-+=======
-+                                        IShellItem*);
-+  HRESULT STDMETHODCALLTYPE UpdateProgress(UINT, UINT);
-+  HRESULT STDMETHODCALLTYPE ResetTimer(void);
-+  HRESULT STDMETHODCALLTYPE PauseTimer(void);
-+  HRESULT STDMETHODCALLTYPE ResumeTimer(void);
-+>>>>>>> .their
- 
-   ULONG m_cRef;
- };
-@@ -240,6 +298,36 @@
-   if (dir.empty())
-     return false;
- 
-+<<<<<<< .our
-+=======
-+  typedef HRESULT(WINAPI * SHOpenFolderAndSelectItemsFuncPtr)(
-+      PCIDLIST_ABSOLUTE pidl_Folder, UINT cidl, PCUITEMID_CHILD_ARRAY pidls,
-+      DWORD flags);
-+
-+  static SHOpenFolderAndSelectItemsFuncPtr open_folder_and_select_itemsPtr =
-+      NULL;
-+  static bool initialize_open_folder_proc = true;
-+  if (initialize_open_folder_proc) {
-+    initialize_open_folder_proc = false;
-+    // The SHOpenFolderAndSelectItems API is exposed by shell32 version 6
-+    // and does not exist in Win2K. We attempt to retrieve this function export
-+    // from shell32 and if it does not exist, we just invoke ShellExecute to
-+    // open the folder thus losing the functionality to select the item in
-+    // the process.
-+    HMODULE shell32_base = GetModuleHandle(L"shell32.dll");
-+    if (!shell32_base) {
-+      NOTREACHED() << " " << __FUNCTION__ << "(): Can't open shell32.dll";
-+      return false;
-+    }
-+    open_folder_and_select_itemsPtr =
-+        reinterpret_cast<SHOpenFolderAndSelectItemsFuncPtr>(
-+            GetProcAddress(shell32_base, "SHOpenFolderAndSelectItems"));
-+  }
-+  if (!open_folder_and_select_itemsPtr) {
-+    return ui::win::OpenFolderViaShell(dir);
-+  }
-+
-+>>>>>>> .their
-   Microsoft::WRL::ComPtr<IShellFolder> desktop;
-   HRESULT hr = SHGetDesktopFolder(desktop.GetAddressOf());
-   if (FAILED(hr))
-@@ -263,8 +351,13 @@
- 
-   const ITEMIDLIST* highlight[] = {file_item};
- 
-+<<<<<<< .our
-   hr = SHOpenFolderAndSelectItems(dir_item, arraysize(highlight), highlight,
-                                   NULL);
-+=======
-+  hr = (*open_folder_and_select_itemsPtr)(dir_item, arraysize(highlight),
-+                                          highlight, NULL);
-+>>>>>>> .their
-   if (!FAILED(hr))
-     return true;
- 
-@@ -275,8 +368,14 @@
-     return ui::win::OpenFolderViaShell(dir);
-   } else {
-     LPTSTR message = NULL;
-+<<<<<<< .our
-     FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
-                   0, hr, 0, reinterpret_cast<LPTSTR>(&message), 0, NULL);
-+=======
-+    DWORD message_length = FormatMessage(
-+        FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, 0, hr, 0,
-+        reinterpret_cast<LPTSTR>(&message), 0, NULL);
-+>>>>>>> .their
-     LOG(WARNING) << " " << __FUNCTION__ << "(): Can't open full_path = \""
-                  << full_path.value() << "\""
-                  << " hr = " << hr << " " << reinterpret_cast<LPTSTR>(&message);
-added in both
-  our    100644 f0f7ef249d73876f7107d3d3865e8fc71ee33945 atom/renderer/api/atom_api_web_frame.cc
-  their  100644 68bb084a2fc7d7dc1728473397a4a4dcf73ad273 atom/renderer/api/atom_api_web_frame.cc
-@@ -13,7 +13,10 @@
- #include "atom/renderer/api/atom_api_spell_check_client.h"
- #include "base/memory/memory_pressure_listener.h"
- #include "content/public/renderer/render_frame.h"
-+<<<<<<< .our
- #include "content/public/renderer/render_frame_observer.h"
-+=======
-+>>>>>>> .their
- #include "content/public/renderer/render_frame_visitor.h"
- #include "content/public/renderer/render_view.h"
- #include "native_mate/dictionary.h"
-@@ -63,6 +66,7 @@
- 
- namespace {
- 
-+<<<<<<< .our
- content::RenderFrame* GetRenderFrame(v8::Local<v8::Value> value) {
-   v8::Local<v8::Context> context =
-       v8::Local<v8::Object>::Cast(value)->CreationContext();
-@@ -86,6 +90,8 @@
-   void OnDestruct() final {}
- };
- 
-+=======
-+>>>>>>> .their
- class ScriptExecutionCallback : public blink::WebScriptExecutionCallback {
-  public:
-   using CompletionCallback =
-@@ -194,6 +200,7 @@
-       blink::WebString::FromUTF16(name), options);
- }
- 
-+<<<<<<< .our
- int WebFrame::GetWebFrameId(v8::Local<v8::Value> content_window) {
-   // Get the WebLocalFrame before (possibly) executing any user-space JS while
-   // getting the |params|. We track the status of the RenderFrame via an
-@@ -211,6 +218,22 @@
-   DCHECK(parent_frame->IsWebLocalFrame());
- 
-   return render_frame->GetRoutingID();
-+=======
-+void WebFrame::RegisterElementResizeCallback(
-+    int element_instance_id,
-+    const GuestViewContainer::ResizeCallback& callback) {
-+  auto* guest_view_container = GuestViewContainer::FromID(element_instance_id);
-+  if (guest_view_container)
-+    guest_view_container->RegisterElementResizeCallback(callback);
-+}
-+
-+void WebFrame::AttachGuest(int id) {
-+  content::RenderFrame::FromWebFrame(web_frame_)->AttachGuest(id);
-+}
-+
-+void WebFrame::DetachGuest(int id) {
-+  content::RenderFrame::FromWebFrame(web_frame_)->DetachGuest(id);
-+>>>>>>> .their
- }
- 
- void WebFrame::SetSpellCheckProvider(mate::Arguments* args,
-@@ -491,7 +514,14 @@
-                  &WebFrame::SetLayoutZoomLevelLimits)
-       .SetMethod("registerEmbedderCustomElement",
-                  &WebFrame::RegisterEmbedderCustomElement)
-+<<<<<<< .our
-       .SetMethod("getWebFrameId", &WebFrame::GetWebFrameId)
-+=======
-+      .SetMethod("registerElementResizeCallback",
-+                 &WebFrame::RegisterElementResizeCallback)
-+      .SetMethod("attachGuest", &WebFrame::AttachGuest)
-+      .SetMethod("detachGuest", &WebFrame::DetachGuest)
-+>>>>>>> .their
-       .SetMethod("setSpellCheckProvider", &WebFrame::SetSpellCheckProvider)
-       .SetMethod("registerURLSchemeAsBypassingCSP",
-                  &WebFrame::RegisterURLSchemeAsBypassingCSP)
-added in both
-  our    100644 4cc6386abcb41cfa29fdc002f6fb267329bb112d atom/renderer/api/atom_api_web_frame.h
-  their  100644 3c28b19ff754140fc83f43bc2e1f8fdc76b39153 atom/renderer/api/atom_api_web_frame.h
-@@ -9,6 +9,10 @@
- #include <string>
- #include <vector>
- 
-+<<<<<<< .our
-+=======
-+#include "atom/renderer/guest_view_container.h"
-+>>>>>>> .their
- #include "native_mate/handle.h"
- #include "native_mate/wrappable.h"
- #include "third_party/WebKit/public/platform/WebCache.h"
-@@ -53,7 +57,15 @@
-   v8::Local<v8::Value> RegisterEmbedderCustomElement(
-       const base::string16& name,
-       v8::Local<v8::Object> options);
-+<<<<<<< .our
-   int GetWebFrameId(v8::Local<v8::Value> content_window);
-+=======
-+  void RegisterElementResizeCallback(
-+      int element_instance_id,
-+      const GuestViewContainer::ResizeCallback& callback);
-+  void AttachGuest(int element_instance_id);
-+  void DetachGuest(int element_instance_id);
-+>>>>>>> .their
- 
-   // Set the provider that will be used by SpellCheckClient for spell check.
-   void SetSpellCheckProvider(mate::Arguments* args,
-added in both
-  our    100644 204f17c2cf0d2d4ec4a71bdbecfcd1cbdc5fc8be atom/renderer/atom_renderer_client.cc
-  their  100644 2794ce0ad92e082a1bfd97b77bfbf3b49ebe2dca atom/renderer/atom_renderer_client.cc
-@@ -79,8 +79,11 @@
- void AtomRendererClient::DidCreateScriptContext(
-     v8::Handle<v8::Context> context,
-     content::RenderFrame* render_frame) {
-+<<<<<<< .our
-   RendererClientBase::DidCreateScriptContext(context, render_frame);
- 
-+=======
-+>>>>>>> .their
-   // Only allow node integration for the main frame, unless it is a devtools
-   // extension page.
-   if (!render_frame->IsMainFrame() && !IsDevToolsExtension(render_frame))
-added in both
-  our    100644 6e29fe45a69f44856d7fca449ec1be4eaf6970a2 atom/renderer/atom_sandboxed_renderer_client.cc
-  their  100644 042a89bf839da277043e45653b25e83aab4d9c66 atom/renderer/atom_sandboxed_renderer_client.cc
-@@ -12,11 +12,16 @@
- #include "atom/common/options_switches.h"
- #include "atom/renderer/api/atom_api_renderer_ipc.h"
- #include "atom/renderer/atom_render_frame_observer.h"
-+<<<<<<< .our
- #include "base/base_paths.h"
- #include "base/command_line.h"
- #include "base/files/file_path.h"
- #include "base/path_service.h"
- #include "base/process/process_handle.h"
-+=======
-+#include "base/command_line.h"
-+#include "base/files/file_path.h"
-+>>>>>>> .their
- #include "chrome/renderer/printing/print_web_view_helper.h"
- #include "content/public/renderer/render_frame.h"
- #include "native_mate/dictionary.h"
-@@ -84,6 +89,7 @@
-   return base::CommandLine::ForCurrentProcess()->argv();
- }
- 
-+<<<<<<< .our
- base::FilePath::StringType GetExecPath() {
-   base::FilePath path;
-   PathService::Get(base::FILE_EXE, &path);
-@@ -95,6 +101,25 @@
-   auto script = v8::Script::Compile(preloadSrc);
-   auto func = script->Run();
-   return func;
-+=======
-+void InitializeBindings(v8::Local<v8::Object> binding,
-+                        v8::Local<v8::Context> context) {
-+  auto* isolate = context->GetIsolate();
-+  mate::Dictionary b(isolate, binding);
-+  b.SetMethod("get", GetBinding);
-+  b.SetMethod("crash", AtomBindings::Crash);
-+  b.SetMethod("hang", AtomBindings::Hang);
-+  b.SetMethod("getArgv", GetArgv);
-+  b.SetMethod("getHeapStatistics", &AtomBindings::GetHeapStatistics);
-+  b.SetMethod("getProcessMemoryInfo", &AtomBindings::GetProcessMemoryInfo);
-+  b.SetMethod("getSystemMemoryInfo", &AtomBindings::GetSystemMemoryInfo);
-+
-+  // Pass in CLI flags needed to setup the renderer
-+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-+  if (command_line->HasSwitch(switches::kGuestInstanceID))
-+    b.Set(options::kGuestInstanceID,
-+        command_line->GetSwitchValueASCII(switches::kGuestInstanceID));
-+>>>>>>> .their
- }
- 
- class AtomSandboxedRenderFrameObserver : public AtomRenderFrameObserver {
-@@ -132,11 +157,15 @@
- AtomSandboxedRendererClient::AtomSandboxedRendererClient() {
-   // Explicitly register electron's builtin modules.
-   NodeBindings::RegisterBuiltinModules();
-+<<<<<<< .our
-   metrics_ = base::ProcessMetrics::CreateCurrentProcessMetrics();
-+=======
-+>>>>>>> .their
- }
- 
- AtomSandboxedRendererClient::~AtomSandboxedRendererClient() {}
- 
-+<<<<<<< .our
- void AtomSandboxedRendererClient::InitializeBindings(
-     v8::Local<v8::Object> binding,
-     v8::Local<v8::Context> context) {
-@@ -164,6 +193,8 @@
-           command_line->GetSwitchValueASCII(switches::kGuestInstanceID));
- }
- 
-+=======
-+>>>>>>> .their
- void AtomSandboxedRendererClient::RenderFrameCreated(
-     content::RenderFrame* render_frame) {
-   new AtomSandboxedRenderFrameObserver(render_frame, this);
-@@ -178,19 +209,33 @@
- void AtomSandboxedRendererClient::DidCreateScriptContext(
-     v8::Handle<v8::Context> context,
-     content::RenderFrame* render_frame) {
-+<<<<<<< .our
-   RendererClientBase::DidCreateScriptContext(context, render_frame);
- 
-+=======
-+>>>>>>> .their
-   // Only allow preload for the main frame or
-   // For devtools we still want to run the preload_bundle script
-   if (!render_frame->IsMainFrame() && !IsDevTools(render_frame))
-     return;
- 
-+<<<<<<< .our
-+=======
-+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-+  base::FilePath preload_script_path =
-+      command_line->GetSwitchValuePath(switches::kPreloadScript);
-+
-+>>>>>>> .their
-   auto* isolate = context->GetIsolate();
-   v8::HandleScope handle_scope(isolate);
-   v8::Context::Scope context_scope(context);
-   // Wrap the bundle into a function that receives the binding object and the
-   // preload script path as arguments.
-+<<<<<<< .our
-   std::string left = "(function(binding, require) {\n";
-+=======
-+  std::string left = "(function(binding, preloadPath, require) {\n";
-+>>>>>>> .their
-   std::string right = "\n})";
-   // Compile the wrapper and run it to get the function object
-   auto script = v8::Script::Compile(v8::String::Concat(
-@@ -203,10 +248,17 @@
-   auto binding = v8::Object::New(isolate);
-   InitializeBindings(binding, context);
-   AddRenderBindings(isolate, binding);
-+<<<<<<< .our
-   v8::Local<v8::Value> args[] = {binding};
-   // Execute the function with proper arguments
-   ignore_result(
-       func->Call(context, v8::Null(isolate), node::arraysize(args), args));
-+=======
-+  v8::Local<v8::Value> args[] = {
-+      binding, mate::ConvertToV8(isolate, preload_script_path.value())};
-+  // Execute the function with proper arguments
-+  ignore_result(func->Call(context, v8::Null(isolate), 2, args));
-+>>>>>>> .their
- }
- 
- void AtomSandboxedRendererClient::WillReleaseScriptContext(
-added in both
-  our    100644 4afef42dfd43d9e177d93a3c49b115c34f7e2e6a atom/renderer/atom_sandboxed_renderer_client.h
-  their  100644 1ebf4429794f47996c8f92f66b1c5b0295365b06 atom/renderer/atom_sandboxed_renderer_client.h
-@@ -8,7 +8,10 @@
- #include <vector>
- 
- #include "atom/renderer/renderer_client_base.h"
-+<<<<<<< .our
- #include "base/process/process_metrics.h"
-+=======
-+>>>>>>> .their
- 
- namespace atom {
- 
-@@ -17,8 +20,11 @@
-   AtomSandboxedRendererClient();
-   ~AtomSandboxedRendererClient() override;
- 
-+<<<<<<< .our
-   void InitializeBindings(v8::Local<v8::Object> binding,
-                           v8::Local<v8::Context> context);
-+=======
-+>>>>>>> .their
-   void InvokeIpcCallback(v8::Handle<v8::Context> context,
-                          const std::string& callback_name,
-                          std::vector<v8::Handle<v8::Value>> args);
-@@ -33,8 +39,11 @@
-   void RenderViewCreated(content::RenderView*) override;
- 
-  private:
-+<<<<<<< .our
-   std::unique_ptr<base::ProcessMetrics> metrics_;
- 
-+=======
-+>>>>>>> .their
-   DISALLOW_COPY_AND_ASSIGN(AtomSandboxedRendererClient);
- };
- 
-added in both
-  our    100644 3c591201532e4510010f5bc895da3c16780d08d9 atom/renderer/preferences_manager.cc
-  their  100644 2c6540cd5f40b7244e70a55f9c146571ec91e4a1 atom/renderer/preferences_manager.cc
-@@ -26,9 +26,13 @@
- 
- void PreferencesManager::OnUpdatePreferences(
-     const base::ListValue& preferences) {
-+<<<<<<< .our
-   auto copy =
-       base::ListValue::From(base::Value::ToUniquePtrValue(preferences.Clone()));
-   preferences_.swap(copy);
-+=======
-+  preferences_ = preferences.CreateDeepCopy();
-+>>>>>>> .their
- }
- 
- }  // namespace atom
-added in both
-  our    100644 69490420ef5b8f87e7cb8fd97ebd5ec4509fa1ae atom/renderer/renderer_client_base.cc
-  their  100644 aca4f9360316f22054e93f0cee227371be357410 atom/renderer/renderer_client_base.cc
-@@ -14,6 +14,7 @@
- #include "atom/renderer/atom_render_frame_observer.h"
- #include "atom/renderer/atom_render_view_observer.h"
- #include "atom/renderer/content_settings_observer.h"
-+<<<<<<< .our
- #include "atom/renderer/preferences_manager.h"
- #include "base/command_line.h"
- #include "base/process/process_handle.h"
-@@ -24,6 +25,17 @@
- #include "chrome/renderer/tts_dispatcher.h"
- #include "content/public/common/content_constants.h"
- #include "content/public/renderer/render_frame.h"
-+=======
-+#include "atom/renderer/guest_view_container.h"
-+#include "atom/renderer/preferences_manager.h"
-+#include "base/command_line.h"
-+#include "base/strings/string_split.h"
-+#include "chrome/renderer/media/chrome_key_systems.h"
-+#include "chrome/renderer/pepper/pepper_helper.h"
-+#include "chrome/renderer/printing/print_web_view_helper.h"
-+#include "chrome/renderer/tts_dispatcher.h"
-+#include "content/public/common/content_constants.h"
-+>>>>>>> .their
- #include "content/public/renderer/render_view.h"
- #include "native_mate/dictionary.h"
- #include "third_party/WebKit/Source/platform/weborigin/SchemeRegistry.h"
-@@ -35,6 +47,10 @@
- #include "third_party/WebKit/public/web/WebSecurityPolicy.h"
- 
- #if defined(OS_MACOSX)
-+<<<<<<< .our
-+=======
-+#include "base/mac/mac_util.h"
-+>>>>>>> .their
- #include "base/strings/sys_string_conversions.h"
- #endif
- 
-@@ -46,6 +62,7 @@
- #include "atom/common/atom_constants.h"
- #endif  // defined(ENABLE_PDF_VIEWER)
- 
-+<<<<<<< .our
- #if defined(ENABLE_PEPPER_FLASH)
- #include "chrome/renderer/pepper/pepper_helper.h"
- #endif  // defined(ENABLE_PEPPER_FLASH)
-@@ -58,6 +75,8 @@
- #define CrPRIdPid "d"
- #endif
- 
-+=======
-+>>>>>>> .their
- namespace atom {
- 
- namespace {
-@@ -92,6 +111,7 @@
- 
- RendererClientBase::~RendererClientBase() {}
- 
-+<<<<<<< .our
- void RendererClientBase::DidCreateScriptContext(
-     v8::Handle<v8::Context> context,
-     content::RenderFrame* render_frame) {
-@@ -105,6 +125,8 @@
-   context->Global()->SetPrivate(context, private_key, value);
- }
- 
-+=======
-+>>>>>>> .their
- void RendererClientBase::AddRenderBindings(
-     v8::Isolate* isolate,
-     v8::Local<v8::Object> binding_object) {
-@@ -157,6 +179,18 @@
-     SetCurrentProcessExplicitAppUserModelID(app_id.c_str());
-   }
- #endif
-+<<<<<<< .our
-+=======
-+
-+#if defined(OS_MACOSX)
-+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-+  bool scroll_bounce = command_line->HasSwitch(switches::kScrollBounce);
-+  CFPreferencesSetAppValue(CFSTR("NSScrollViewRubberbanding"),
-+                           scroll_bounce ? kCFBooleanTrue : kCFBooleanFalse,
-+                           kCFPreferencesCurrentApplication);
-+  CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);
-+#endif
-+>>>>>>> .their
- }
- 
- void RendererClientBase::RenderFrameCreated(
-@@ -164,9 +198,13 @@
- #if defined(TOOLKIT_VIEWS)
-   new AutofillAgent(render_frame);
- #endif
-+<<<<<<< .our
- #if defined(ENABLE_PEPPER_FLASH)
-   new PepperHelper(render_frame);
- #endif
-+=======
-+  new PepperHelper(render_frame);
-+>>>>>>> .their
-   new ContentSettingsObserver(render_frame);
-   new printing::PrintWebViewHelper(render_frame);
- 
-@@ -224,6 +262,20 @@
-   return true;
- }
- 
-+<<<<<<< .our
-+=======
-+content::BrowserPluginDelegate* RendererClientBase::CreateBrowserPluginDelegate(
-+    content::RenderFrame* render_frame,
-+    const std::string& mime_type,
-+    const GURL& original_url) {
-+  if (mime_type == content::kBrowserPluginMimeType) {
-+    return new GuestViewContainer(render_frame);
-+  } else {
-+    return nullptr;
-+  }
-+}
-+
-+>>>>>>> .their
- void RendererClientBase::AddSupportedKeySystems(
-     std::vector<std::unique_ptr<::media::KeySystemProperties>>* key_systems) {
-   AddChromeKeySystems(key_systems);
-added in both
-  our    100644 f04be0a0fb555fce88aa006c6c6623cc8730d4ed atom/renderer/renderer_client_base.h
-  their  100644 3dea78cee775296dea358d9439421884387ff35d atom/renderer/renderer_client_base.h
-@@ -21,7 +21,11 @@
-   ~RendererClientBase() override;
- 
-   virtual void DidCreateScriptContext(v8::Handle<v8::Context> context,
-+<<<<<<< .our
-                                       content::RenderFrame* render_frame);
-+=======
-+                                      content::RenderFrame* render_frame) = 0;
-+>>>>>>> .their
-   virtual void WillReleaseScriptContext(v8::Handle<v8::Context> context,
-                                         content::RenderFrame* render_frame) = 0;
-   virtual void DidClearWindowObject(content::RenderFrame* render_frame);
-@@ -46,6 +50,13 @@
-   bool OverrideCreatePlugin(content::RenderFrame* render_frame,
-                             const blink::WebPluginParams& params,
-                             blink::WebPlugin** plugin) override;
-+<<<<<<< .our
-+=======
-+  content::BrowserPluginDelegate* CreateBrowserPluginDelegate(
-+      content::RenderFrame* render_frame,
-+      const std::string& mime_type,
-+      const GURL& original_url) override;
-+>>>>>>> .their
-   void AddSupportedKeySystems(
-       std::vector<std::unique_ptr<::media::KeySystemProperties>>* key_systems)
-       override;
-@@ -53,9 +64,12 @@
-  private:
-   std::unique_ptr<PreferencesManager> preferences_manager_;
-   bool isolated_world_;
-+<<<<<<< .our
- 
-   // An increasing ID used for indentifying an V8 context in this process.
-   int next_context_id_ = 0;
-+=======
-+>>>>>>> .their
- };
- 
- }  // namespace atom
-added in both
-  our    100644 166c01b8686498ecb9cb1929e872309441eeaf36 brightray/BUILD.gn
-  their  100644 c2185726abdf17d7c24010a0b076b7e33496f2ad brightray/BUILD.gn
-@@ -1,14 +1,48 @@
- import("//build/config/ui.gni")
- 
-+<<<<<<< .our
- filenames_gypi = exec_script("//build/gypi_to_gn.py",
-                              [ rebase_path("filenames.gypi") ],
-                              "scope",
-                              [ "filenames.gypi" ])
-+=======
-+filenames_gypi = exec_script(
-+  "//build/gypi_to_gn.py",
-+  [ rebase_path("filenames.gypi") ],
-+  "scope",
-+  [ "filenames.gypi" ]
-+)
-+
-+
-+if (is_linux) {
-+  # TODO: Experiment with using //tools/generate_library_loader for generating
-+  # the libnotify loader.
-+  copy("libnotify_headers") {
-+    sources = [
-+      "/usr/include/libnotify/notify.h",
-+      "/usr/include/libnotify/notification.h",
-+      "/usr/include/libnotify/notify-enum-types.h",
-+      "/usr/include/libnotify/notify-features.h",
-+    ]
-+    outputs = [ "$target_gen_dir/libnotify-copy/libnotify/{{source_file_part}}" ]
-+  }
-+  config("libnotify_config") {
-+    include_dirs = [ "$target_gen_dir/libnotify-copy" ]
-+  }
-+  group("libnotify") {
-+    deps = [ ":libnotify_headers" ]
-+    public_configs = [ ":libnotify_config" ]
-+  }
-+}
-+>>>>>>> .their
- 
- static_library("brightray") {
-   deps = [
-     "//base",
-+<<<<<<< .our
-     "//base:base_static",
-+=======
-+>>>>>>> .their
-     "//components/network_session_configurator/common",
-     "//components/prefs",
-     "//content/public/browser",
-@@ -18,6 +52,7 @@
-     "//ui/views",
-   ]
- 
-+<<<<<<< .our
-   include_dirs = [ ".." ]
- 
-   defines = [
-@@ -27,6 +62,21 @@
- 
-   if (is_linux) {
-     deps += [ "//build/config/linux/gtk" ]
-+=======
-+  include_dirs = [
-+    "..",
-+  ]
-+
-+  defines = [
-+    "DISABLE_NACL=1",
-+  ]
-+
-+  if (is_linux) {
-+    deps += [
-+      "//build/config/linux/gtk3",
-+      ":libnotify",
-+    ]
-+>>>>>>> .their
-   }
- 
-   extra_source_filters = []
-@@ -38,8 +88,12 @@
-     ]
-   }
- 
-+<<<<<<< .our
-   set_sources_assignment_filter(
-       sources_assignment_filter + extra_source_filters)
-+=======
-+  set_sources_assignment_filter(sources_assignment_filter + extra_source_filters)
-+>>>>>>> .their
-   sources = filenames_gypi.brightray_sources
-   set_sources_assignment_filter(sources_assignment_filter)
- }
-added in both
-  our    100644 f233257e88bad8f0ff703034bea02e4715a5b5b9 brightray/brightray.gyp
-  their  100644 312255cffc122fbff5083163ad6414b714bca7f3 brightray/brightray.gyp
-@@ -111,7 +111,10 @@
-               'link_settings': {
-                 'libraries': [
-                   # Following libraries are always linked statically.
-+<<<<<<< .our
-                   '<(libchromiumcontent_dir)/libbase_static.a',
-+=======
-+>>>>>>> .their
-                   '<(libchromiumcontent_dir)/libgtkui.a',
-                   '<(libchromiumcontent_dir)/libhttp_server.a',
-                   '<(libchromiumcontent_dir)/libdevice_service.a',
-@@ -205,7 +208,10 @@
-               'link_settings': {
-                 'libraries': [
-                   # Following libraries are always linked statically.
-+<<<<<<< .our
-                   '<(libchromiumcontent_dir)/libbase_static.a',
-+=======
-+>>>>>>> .their
-                   '<(libchromiumcontent_dir)/libhttp_server.a',
-                   '<(libchromiumcontent_dir)/libdevice_service.a',
-                   '<(libchromiumcontent_dir)/libdom_keycode_converter.a',
-added in both
-  our    100644 8a945dc0219293d90e30162e4691a4d871071f4f brightray/brightray.gypi
-  their  100644 33d42bc8069ce4031cbb4375e37194c923b9de89 brightray/brightray.gypi
-@@ -155,7 +155,14 @@
-               'WEBRTC_MAC',
-              ],
-           }],  # OS=="mac"
-+<<<<<<< .our
-           ['OS=="win"', {            
-+=======
-+          ['OS=="win"', {
-+            'include_dirs': [
-+              '<(libchromiumcontent_src_dir)/third_party/wtl/include',
-+            ],
-+>>>>>>> .their
-             'defines': [
-               '_WIN32_WINNT=0x0602',
-               'WINVER=0x0602',
-@@ -205,7 +212,10 @@
-           'SKIA_DLL',
-           'USING_V8_SHARED',
-           'WEBKIT_DLL',
-+<<<<<<< .our
-           'V8_ENABLE_CHECKS',
-+=======
-+>>>>>>> .their
-         ],
-         'msvs_settings': {
-           'VCCLCompilerTool': {
-added in both
-  our    100644 1eff7344e9aef78bb88720c38c0f75fb92e6bc09 brightray/browser/browser_context.cc
-  their  100644 6123937cb564831e21373b48405f7ba8d3f5efe1 brightray/browser/browser_context.cc
-@@ -11,6 +11,11 @@
- #include "brightray/browser/brightray_paths.h"
- #include "brightray/browser/browser_client.h"
- #include "brightray/browser/inspectable_web_contents_impl.h"
-+<<<<<<< .our
-+=======
-+#include "brightray/browser/network_delegate.h"
-+#include "brightray/browser/special_storage_policy.h"
-+>>>>>>> .their
- #include "brightray/browser/zoom_level_delegate.h"
- #include "brightray/common/application_info.h"
- #include "components/prefs/json_pref_store.h"
-@@ -18,6 +23,10 @@
- #include "components/prefs/pref_service.h"
- #include "components/prefs/pref_service_factory.h"
- #include "content/public/browser/browser_thread.h"
-+<<<<<<< .our
-+=======
-+#include "content/public/browser/resource_context.h"
-+>>>>>>> .their
- #include "content/public/browser/storage_partition.h"
- #include "net/base/escape.h"
- 
-@@ -34,10 +43,32 @@
- 
- }  // namespace
- 
-+<<<<<<< .our
- // static
- void BrowserContextDeleter::Destruct(const BrowserContext* browser_context) {
-   browser_context->OnDestruct();
- }
-+=======
-+class BrowserContext::ResourceContext : public content::ResourceContext {
-+ public:
-+  ResourceContext() : getter_(nullptr) {}
-+
-+  void set_url_request_context_getter(URLRequestContextGetter* getter) {
-+    getter_ = getter;
-+  }
-+
-+ private:
-+  net::HostResolver* GetHostResolver() override {
-+    return getter_->host_resolver();
-+  }
-+
-+  net::URLRequestContext* GetRequestContext() override {
-+    return getter_->GetURLRequestContext();
-+  }
-+
-+  URLRequestContextGetter* getter_;
-+};
-+>>>>>>> .their
- 
- // static
- BrowserContext::BrowserContextMap BrowserContext::browser_context_map_;
-@@ -54,6 +85,11 @@
- 
- BrowserContext::BrowserContext(const std::string& partition, bool in_memory)
-     : in_memory_(in_memory),
-+<<<<<<< .our
-+=======
-+      resource_context_(new ResourceContext),
-+      storage_policy_(new SpecialStoragePolicy),
-+>>>>>>> .their
-       weak_factory_(this) {
-   if (!PathService::Get(DIR_USER_DATA, &path_)) {
-     PathService::Get(DIR_APP_DATA, &path_);
-@@ -68,8 +104,11 @@
- 
-   content::BrowserContext::Initialize(this, path_);
- 
-+<<<<<<< .our
-   io_handle_ = new URLRequestContextGetter::Handle(GetWeakPtr());
- 
-+=======
-+>>>>>>> .their
-   browser_context_map_[PartitionKey(partition, in_memory)] = GetWeakPtr();
- }
- 
-@@ -77,6 +116,7 @@
-   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-   NotifyWillBeDestroyed(this);
-   ShutdownStoragePartitions();
-+<<<<<<< .our
-   io_handle_->ShutdownOnUIThread();
- }
- 
-@@ -85,6 +125,15 @@
-     delete this;
-   } else {
-     BrowserThread::DeleteSoon(BrowserThread::UI, FROM_HERE, this);
-+=======
-+  if (BrowserThread::IsMessageLoopValid(BrowserThread::IO)) {
-+    BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE,
-+                              resource_context_.release());
-+    BrowserThread::PostTask(
-+        BrowserThread::IO, FROM_HERE,
-+        base::BindOnce(&URLRequestContextGetter::NotifyContextShutdownOnIO,
-+                       base::RetainedRef(url_request_getter_)));
-+>>>>>>> .their
-   }
- }
- 
-@@ -118,10 +167,24 @@
- net::URLRequestContextGetter* BrowserContext::CreateRequestContext(
-     content::ProtocolHandlerMap* protocol_handlers,
-     content::URLRequestInterceptorScopedVector protocol_interceptors) {
-+<<<<<<< .our
-   return io_handle_
-       ->CreateMainRequestContextGetter(protocol_handlers,
-                                        std::move(protocol_interceptors))
-       .get();
-+=======
-+  DCHECK(!url_request_getter_.get());
-+  url_request_getter_ = new URLRequestContextGetter(
-+      this, static_cast<NetLog*>(BrowserClient::Get()->GetNetLog()), GetPath(),
-+      in_memory_, BrowserThread::GetTaskRunnerForThread(BrowserThread::IO),
-+      protocol_handlers, std::move(protocol_interceptors));
-+  resource_context_->set_url_request_context_getter(url_request_getter_.get());
-+  return url_request_getter_.get();
-+}
-+
-+std::unique_ptr<net::NetworkDelegate> BrowserContext::CreateNetworkDelegate() {
-+  return std::make_unique<NetworkDelegate>();
-+>>>>>>> .their
- }
- 
- std::string BrowserContext::GetMediaDeviceIDSalt() {
-@@ -147,7 +210,11 @@
- }
- 
- content::ResourceContext* BrowserContext::GetResourceContext() {
-+<<<<<<< .our
-   return io_handle_->GetResourceContext();
-+=======
-+  return resource_context_.get();
-+>>>>>>> .their
- }
- 
- content::DownloadManagerDelegate* BrowserContext::GetDownloadManagerDelegate() {
-@@ -158,6 +225,13 @@
-   return nullptr;
- }
- 
-+<<<<<<< .our
-+=======
-+storage::SpecialStoragePolicy* BrowserContext::GetSpecialStoragePolicy() {
-+  return storage_policy_.get();
-+}
-+
-+>>>>>>> .their
- content::PushMessagingService* BrowserContext::GetPushMessagingService() {
-   return nullptr;
- }
-@@ -186,19 +260,29 @@
-     bool in_memory,
-     content::ProtocolHandlerMap* protocol_handlers,
-     content::URLRequestInterceptorScopedVector request_interceptors) {
-+<<<<<<< .our
-   NOTREACHED();
-+=======
-+>>>>>>> .their
-   return nullptr;
- }
- 
- net::URLRequestContextGetter* BrowserContext::CreateMediaRequestContext() {
-+<<<<<<< .our
-   return io_handle_->GetMainRequestContextGetter().get();
-+=======
-+  return url_request_getter_.get();
-+>>>>>>> .their
- }
- 
- net::URLRequestContextGetter*
- BrowserContext::CreateMediaRequestContextForStoragePartition(
-     const base::FilePath& partition_path,
-     bool in_memory) {
-+<<<<<<< .our
-   NOTREACHED();
-+=======
-+>>>>>>> .their
-   return nullptr;
- }
- 
-added in both
-  our    100644 1fb1c59b8043dbb711a364fca3c357c11993bedc brightray/browser/browser_context.h
-  their  100644 8f3de784cfe25b64b2dd767f5efd91845a3aecb6 brightray/browser/browser_context.h
-@@ -17,6 +17,7 @@
- class PrefRegistrySimple;
- class PrefService;
- 
-+<<<<<<< .our
- namespace brightray {
- 
- class BrowserContext;
-@@ -28,6 +29,17 @@
- class BrowserContext
-     : public base::RefCountedThreadSafe<BrowserContext, BrowserContextDeleter>,
-       public content::BrowserContext {
-+=======
-+namespace storage {
-+class SpecialStoragePolicy;
-+}
-+
-+namespace brightray {
-+
-+class BrowserContext : public base::RefCounted<BrowserContext>,
-+                       public content::BrowserContext,
-+                       public brightray::URLRequestContextGetter::Delegate {
-+>>>>>>> .their
-  public:
-   // Get the BrowserContext according to its |partition| and |in_memory|,
-   // empty pointer when be returned when there is no matching BrowserContext.
-@@ -48,6 +60,10 @@
-   content::ResourceContext* GetResourceContext() override;
-   content::DownloadManagerDelegate* GetDownloadManagerDelegate() override;
-   content::BrowserPluginGuestManager* GetGuestManager() override;
-+<<<<<<< .our
-+=======
-+  storage::SpecialStoragePolicy* GetSpecialStoragePolicy() override;
-+>>>>>>> .their
-   content::PushMessagingService* GetPushMessagingService() override;
-   content::SSLHostStateDelegate* GetSSLHostStateDelegate() override;
-   content::BackgroundFetchDelegate* GetBackgroundFetchDelegate() override;
-@@ -67,14 +83,24 @@
-       const base::FilePath& partition_path,
-       bool in_memory) override;
-   std::string GetMediaDeviceIDSalt() override;
-+<<<<<<< .our
-   base::FilePath GetPath() const override;
-+=======
-+
-+  URLRequestContextGetter* url_request_context_getter() const {
-+    return url_request_getter_.get();
-+  }
-+>>>>>>> .their
- 
-   void InitPrefs();
-   PrefService* prefs() { return prefs_.get(); }
- 
-+<<<<<<< .our
-   virtual std::string GetUserAgent() const = 0;
-   virtual void OnMainRequestContextCreated(URLRequestContextGetter* getter) {}
- 
-+=======
-+>>>>>>> .their
-  protected:
-   BrowserContext(const std::string& partition, bool in_memory);
-   ~BrowserContext() override;
-@@ -82,6 +108,7 @@
-   // Subclasses should override this to register custom preferences.
-   virtual void RegisterPrefs(PrefRegistrySimple* pref_registry) {}
- 
-+<<<<<<< .our
-  private:
-   friend class base::RefCountedThreadSafe<BrowserContext,
-                                           BrowserContextDeleter>;
-@@ -90,6 +117,18 @@
- 
-   void RegisterInternalPrefs(PrefRegistrySimple* pref_registry);
-   void OnDestruct() const;
-+=======
-+  // URLRequestContextGetter::Delegate:
-+  std::unique_ptr<net::NetworkDelegate> CreateNetworkDelegate() override;
-+
-+  base::FilePath GetPath() const override;
-+
-+ private:
-+  friend class base::RefCounted<BrowserContext>;
-+  class ResourceContext;
-+
-+  void RegisterInternalPrefs(PrefRegistrySimple* pref_registry);
-+>>>>>>> .their
- 
-   // partition_id => browser_context
-   struct PartitionKey {
-@@ -116,11 +155,19 @@
-   base::FilePath path_;
-   bool in_memory_;
- 
-+<<<<<<< .our
-   std::unique_ptr<PrefService> prefs_;
-   std::unique_ptr<MediaDeviceIDSalt> media_device_id_salt_;
-   // Self-destructing class responsible for creating URLRequestContextGetter
-   // on the UI thread and deletes itself on the IO thread.
-   URLRequestContextGetter::Handle* io_handle_;
-+=======
-+  std::unique_ptr<ResourceContext> resource_context_;
-+  scoped_refptr<URLRequestContextGetter> url_request_getter_;
-+  scoped_refptr<storage::SpecialStoragePolicy> storage_policy_;
-+  std::unique_ptr<PrefService> prefs_;
-+  std::unique_ptr<MediaDeviceIDSalt> media_device_id_salt_;
-+>>>>>>> .their
- 
-   base::WeakPtrFactory<BrowserContext> weak_factory_;
- 
-added in both
-  our    100644 78d0ef15ef1343e7db123f97182bac7f9a98b3eb brightray/browser/browser_main_parts.cc
-  their  100644 d44ace2dc3306b0f98737297f59292778468e569 brightray/browser/browser_main_parts.cc
-@@ -15,7 +15,10 @@
- #include <glib.h>  // for g_setenv()
- #endif
- 
-+<<<<<<< .our
- #include "base/base_switches.h"
-+=======
-+>>>>>>> .their
- #include "base/command_line.h"
- #include "base/feature_list.h"
- #include "base/message_loop/message_loop.h"
-@@ -179,6 +182,7 @@
- }
- #endif
- 
-+<<<<<<< .our
- void BrowserMainParts::InitializeFeatureList() {
-   auto* cmd_line = base::CommandLine::ForCurrentProcess();
-   const auto enable_features =
-@@ -196,6 +200,16 @@
- 
- int BrowserMainParts::PreEarlyInitialization() {
-   InitializeFeatureList();
-+=======
-+int BrowserMainParts::PreEarlyInitialization() {
-+  std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);
-+  // TODO(deepak1556): Disable guest webcontents based on OOPIF feature.
-+  // Disable surface synchronization and async wheel events to make OSR work.
-+  feature_list->InitializeFromCommandLine(
-+      "",
-+      "GuestViewCrossProcessFrames,SurfaceSynchronization,AsyncWheelEvents");
-+  base::FeatureList::SetInstance(std::move(feature_list));
-+>>>>>>> .their
-   OverrideAppLogsPath();
- #if defined(USE_X11)
-   views::LinuxUI::SetInstance(BuildGtkUi());
-added in both
-  our    100644 cf8e0296585b17f1e7dab1717e0aa80293d902dd brightray/browser/browser_main_parts.h
-  their  100644 0f82ce6daa9a7fc82aa70c68d8d5fd9dc0951a99 brightray/browser/browser_main_parts.h
-@@ -33,7 +33,10 @@
- 
-  protected:
-   // content::BrowserMainParts:
-+<<<<<<< .our
-   bool ShouldContentCreateFeatureList() override;
-+=======
-+>>>>>>> .their
-   int PreEarlyInitialization() override;
-   void ToolkitInitialized() override;
-   void PreMainMessageLoopStart() override;
-@@ -43,8 +46,11 @@
-   int PreCreateThreads() override;
-   void PostDestroyThreads() override;
- 
-+<<<<<<< .our
-   void InitializeFeatureList();
- 
-+=======
-+>>>>>>> .their
-  private:
- #if defined(OS_MACOSX)
-   void InitializeMainNib();
-added in both
-  our    100644 ab6d87d6c69228f75863789de8407a54cb151617 brightray/browser/inspectable_web_contents.cc
-  their  100644 f389f75db62f311bddf82ba47cd484148ba2838a brightray/browser/inspectable_web_contents.cc
-@@ -5,9 +5,20 @@
- namespace brightray {
- 
- InspectableWebContents* InspectableWebContents::Create(
-+<<<<<<< .our
-     content::WebContents* web_contents,
-     bool is_guest) {
-   return new InspectableWebContentsImpl(web_contents, is_guest);
-+=======
-+    const content::WebContents::CreateParams& create_params) {
-+  auto* contents = content::WebContents::Create(create_params);
-+  return Create(contents);
-+}
-+
-+InspectableWebContents* InspectableWebContents::Create(
-+    content::WebContents* web_contents) {
-+  return new InspectableWebContentsImpl(web_contents);
-+>>>>>>> .their
- }
- 
- }  // namespace brightray
-added in both
-  our    100644 4abaa03c5f9c9895d427e156aaa64f1c0be3b1bc brightray/browser/inspectable_web_contents.h
-  their  100644 7b0a010b9e217dc017e228718e19f24099566f66 brightray/browser/inspectable_web_contents.h
-@@ -20,10 +20,19 @@
- 
- class InspectableWebContents {
-  public:
-+<<<<<<< .our
-   // The returned InspectableWebContents takes ownership of the passed-in
-   // WebContents.
-   static InspectableWebContents* Create(content::WebContents* web_contents,
-                                         bool is_guest);
-+=======
-+  static InspectableWebContents* Create(
-+      const content::WebContents::CreateParams&);
-+
-+  // The returned InspectableWebContents takes ownership of the passed-in
-+  // WebContents.
-+  static InspectableWebContents* Create(content::WebContents*);
-+>>>>>>> .their
- 
-   virtual ~InspectableWebContents() {}
- 
-@@ -35,8 +44,11 @@
-   virtual void SetDelegate(InspectableWebContentsDelegate* delegate) = 0;
-   virtual InspectableWebContentsDelegate* GetDelegate() const = 0;
- 
-+<<<<<<< .our
-   virtual bool IsGuest() const = 0;
-   virtual void ReleaseWebContents() = 0;
-+=======
-+>>>>>>> .their
-   virtual void SetDevToolsWebContents(content::WebContents* devtools) = 0;
-   virtual void SetDockState(const std::string& state) = 0;
-   virtual void ShowDevTools() = 0;
-added in both
-  our    100644 32b5743b8db53ef2628d062e9942e30ec7c52b2f brightray/browser/inspectable_web_contents_impl.cc
-  their  100644 2f682b021a4b5893026e4152a7b7e006b691946a brightray/browser/inspectable_web_contents_impl.cc
-@@ -167,18 +167,27 @@
- int ResponseWriter::Write(net::IOBuffer* buffer,
-                           int num_bytes,
-                           const net::CompletionCallback& callback) {
-+<<<<<<< .our
-   std::string chunk = std::string(buffer->data(), num_bytes);
-   if (!base::IsStringUTF8(chunk))
-     return num_bytes;
- 
-   base::Value* id = new base::Value(stream_id_);
-   base::Value* chunk_value = new base::Value(chunk);
-+=======
-+  auto* id = new base::Value(stream_id_);
-+  base::Value* chunk = new base::Value(std::string(buffer->data(), num_bytes));
-+>>>>>>> .their
- 
-   content::BrowserThread::PostTask(
-       content::BrowserThread::UI, FROM_HERE,
-       base::BindOnce(&InspectableWebContentsImpl::CallClientFunction, bindings_,
-                      "DevToolsAPI.streamWrite", base::Owned(id),
-+<<<<<<< .our
-                      base::Owned(chunk_value), nullptr));
-+=======
-+                     base::Owned(chunk), nullptr));
-+>>>>>>> .their
-   return num_bytes;
- }
- 
-@@ -202,6 +211,7 @@
- }
- 
- InspectableWebContentsImpl::InspectableWebContentsImpl(
-+<<<<<<< .our
-     content::WebContents* web_contents,
-     bool is_guest)
-     : frontend_loaded_(false),
-@@ -216,6 +226,17 @@
-       weak_factory_(this) {
-   if (is_guest)
-     return;
-+=======
-+    content::WebContents* web_contents)
-+    : frontend_loaded_(false),
-+      can_dock_(true),
-+      delegate_(nullptr),
-+      web_contents_(web_contents),
-+      weak_factory_(this) {
-+  auto* context =
-+      static_cast<BrowserContext*>(web_contents_->GetBrowserContext());
-+  pref_service_ = context->prefs();
-+>>>>>>> .their
-   auto* bounds_dict = pref_service_->GetDictionary(kDevToolsBoundsPref);
-   if (bounds_dict) {
-     DictionaryToRect(*bounds_dict, &devtools_bounds_);
-@@ -240,6 +261,11 @@
-           display.y() + (display.height() - devtools_bounds_.height()) / 2);
-     }
-   }
-+<<<<<<< .our
-+=======
-+
-+  view_.reset(CreateInspectableContentsView(this));
-+>>>>>>> .their
- }
- 
- InspectableWebContentsImpl::~InspectableWebContentsImpl() {
-@@ -285,6 +311,7 @@
-   return delegate_;
- }
- 
-+<<<<<<< .our
- bool InspectableWebContentsImpl::IsGuest() const {
-   return is_guest_;
- }
-@@ -293,6 +320,8 @@
-   web_contents_.release();
- }
- 
-+=======
-+>>>>>>> .their
- void InspectableWebContentsImpl::SetDockState(const std::string& state) {
-   if (state == "detach") {
-     can_dock_ = false;
-@@ -343,8 +372,12 @@
-       managed_devtools_web_contents_.reset();
-     }
-     embedder_message_dispatcher_.reset();
-+<<<<<<< .our
-     if (!IsGuest())
-       web_contents_->Focus();
-+=======
-+    web_contents_->Focus();
-+>>>>>>> .their
-   }
- }
- 
-@@ -484,7 +517,11 @@
-   net::URLFetcher* fetcher =
-       (net::URLFetcher::Create(gurl, net::URLFetcher::GET, this)).release();
-   pending_requests_[fetcher] = callback;
-+<<<<<<< .our
-   fetcher->SetRequestContext(browser_context->GetRequestContext());
-+=======
-+  fetcher->SetRequestContext(browser_context->url_request_context_getter());
-+>>>>>>> .their
-   fetcher->SetExtraRequestHeaders(headers);
-   fetcher->SaveResponseWithWriter(
-       std::unique_ptr<net::URLFetcherResponseWriter>(
-added in both
-  our    100644 3f0fe0093cf724e9f090a036a259e823c12f9294 brightray/browser/inspectable_web_contents_impl.h
-  their  100644 c75f46fed4270ac77aa4bad5196eb3f4578bcd3a brightray/browser/inspectable_web_contents_impl.h
-@@ -39,7 +39,11 @@
-  public:
-   static void RegisterPrefs(PrefRegistrySimple* pref_registry);
- 
-+<<<<<<< .our
-   InspectableWebContentsImpl(content::WebContents* web_contents, bool is_guest);
-+=======
-+  explicit InspectableWebContentsImpl(content::WebContents*);
-+>>>>>>> .their
-   ~InspectableWebContentsImpl() override;
- 
-   InspectableWebContentsView* GetView() const override;
-@@ -48,8 +52,11 @@
- 
-   void SetDelegate(InspectableWebContentsDelegate* delegate) override;
-   InspectableWebContentsDelegate* GetDelegate() const override;
-+<<<<<<< .our
-   bool IsGuest() const override;
-   void ReleaseWebContents() override;
-+=======
-+>>>>>>> .their
-   void SetDevToolsWebContents(content::WebContents* devtools) override;
-   void SetDockState(const std::string& state) override;
-   void ShowDevTools() override;
-@@ -216,7 +223,10 @@
-   // The external devtools assigned by SetDevToolsWebContents.
-   content::WebContents* external_devtools_web_contents_ = nullptr;
- 
-+<<<<<<< .our
-   bool is_guest_;
-+=======
-+>>>>>>> .their
-   std::unique_ptr<InspectableWebContentsView> view_;
- 
-   using ExtensionsAPIs = std::map<std::string, std::string>;
-added in both
-  our    100644 e0693507fe09bba95e2dd9623950e40e42ff555b brightray/browser/mac/bry_inspectable_web_contents_view.h
-  their  100644 2a99ff0e9f9f751a914d64cbd535ec98d7471565 brightray/browser/mac/bry_inspectable_web_contents_view.h
-@@ -14,7 +14,10 @@
-  @private
-   brightray::InspectableWebContentsViewMac* inspectableWebContentsView_;
- 
-+<<<<<<< .our
-   base::scoped_nsobject<NSView> fake_view_;
-+=======
-+>>>>>>> .their
-   base::scoped_nsobject<NSWindow> devtools_window_;
-   BOOL devtools_visible_;
-   BOOL devtools_docked_;
-added in both
-  our    100644 1a9139e7af5cf58ee00eaeecdefd5cbe18e96870 brightray/browser/mac/bry_inspectable_web_contents_view.mm
-  their  100644 b72a489ba77450fe38a14b957b1113f392b24b29 brightray/browser/mac/bry_inspectable_web_contents_view.mm
-@@ -32,6 +32,7 @@
-              name:NSWindowDidBecomeMainNotification
-            object:nil];
- 
-+<<<<<<< .our
-   if (inspectableWebContentsView_->inspectable_web_contents()->IsGuest()) {
-     fake_view_.reset([[NSView alloc] init]);
-     [fake_view_ setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
-@@ -43,6 +44,13 @@
-     [contentsView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
-     [self addSubview:contentsView];
-   }
-+=======
-+  auto* contents =
-+      inspectableWebContentsView_->inspectable_web_contents()->GetWebContents();
-+  auto contentsView = contents->GetNativeView();
-+  [contentsView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
-+  [self addSubview:contentsView];
-+>>>>>>> .their
- 
-   // See https://code.google.com/p/chromium/issues/detail?id=348490.
-   [self setWantsLayer:YES];
-@@ -81,7 +89,11 @@
-   if (visible && devtools_docked_) {
-     webContents->SetAllowOtherViews(true);
-     devToolsWebContents->SetAllowOtherViews(true);
-+<<<<<<< .our
-   } else if (!inspectable_web_contents->IsGuest()) {
-+=======
-+  } else {
-+>>>>>>> .their
-     webContents->SetAllowOtherViews(false);
-   }
- 
-@@ -200,7 +212,11 @@
- - (void)viewDidBecomeFirstResponder:(NSNotification*)notification {
-   auto* inspectable_web_contents =
-       inspectableWebContentsView_->inspectable_web_contents();
-+<<<<<<< .our
-   if (!inspectable_web_contents || inspectable_web_contents->IsGuest())
-+=======
-+  if (!inspectable_web_contents)
-+>>>>>>> .their
-     return;
-   auto* webContents = inspectable_web_contents->GetWebContents();
-   auto webContentsView = webContents->GetNativeView();
-added in both
-  our    100644 80e6615be13d8dd8fd244c1b2c90b3630e893578 brightray/browser/mac/cocoa_notification.h
-  their  100644 066528ee490b8821bd797c49805cd34bbcdf0bc0 brightray/browser/mac/cocoa_notification.h
-@@ -31,7 +31,10 @@
-   void NotificationActivated();
-   void NotificationActivated(NSUserNotificationAction* action)
-     API_AVAILABLE(macosx(10.10));
-+<<<<<<< .our
-   void NotificationDismissed();
-+=======
-+>>>>>>> .their
- 
-   NSUserNotification* notification() const { return notification_; }
- 
-added in both
-  our    100644 57f53931e972adac9cbadf643c737b21d6b9b712 brightray/browser/mac/cocoa_notification.mm
-  their  100644 6b576497d41a9b747b702d5502583637d96606df brightray/browser/mac/cocoa_notification.mm
-@@ -156,6 +156,7 @@
-   this->LogAction("button clicked");
- }
- 
-+<<<<<<< .our
- void CocoaNotification::NotificationDismissed() {
-   if (delegate())
-     delegate()->NotificationClosed();
-@@ -163,6 +164,8 @@
-   this->LogAction("dismissed");
- }
- 
-+=======
-+>>>>>>> .their
- void CocoaNotification::LogAction(const char* action) {
-   if (getenv("ELECTRON_DEBUG_NOTIFICATIONS")) {
-     NSString* identifier = [notification_ valueForKey:@"identifier"];
-added in both
-  our    100644 ddf0cbfa888d3f3be47db890c842900ce52d2411 brightray/browser/mac/notification_center_delegate.mm
-  their  100644 7ae24b8979b441e7583583ade5aa2708cfb1b994 brightray/browser/mac/notification_center_delegate.mm
-@@ -65,6 +65,7 @@
-   return YES;
- }
- 
-+<<<<<<< .our
- #if !defined(MAS_BUILD)
- // This undocumented method notifies us if a user closes "Alert" notifications
- // https://chromium.googlesource.com/chromium/src/+/lkgr/chrome/browser/notifications/notification_platform_bridge_mac.mm
-@@ -89,4 +90,6 @@
- }
- #endif
- 
-+=======
-+>>>>>>> .their
- @end
-added in remote
-  their  100644 32981cb8b8d53ee2b797c366dd80d5efcc82d2c9 brightray/browser/network_delegate.cc
-@@ -0,0 +1,161 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE-CHROMIUM file.
-+
-+#include "brightray/browser/network_delegate.h"
-+
-+#include <string>
-+#include <vector>
-+
-+#include "base/command_line.h"
-+#include "base/strings/string_split.h"
-+#include "net/base/load_flags.h"
-+#include "net/base/net_errors.h"
-+#include "net/url_request/url_request.h"
-+
-+namespace brightray {
-+
-+namespace {
-+
-+// Ignore the limit of 6 connections per host.
-+const char kIgnoreConnectionsLimit[] = "ignore-connections-limit";
-+
-+}  // namespace
-+
-+NetworkDelegate::NetworkDelegate() {
-+  auto* command_line = base::CommandLine::ForCurrentProcess();
-+  if (command_line->HasSwitch(kIgnoreConnectionsLimit)) {
-+    std::string value =
-+        command_line->GetSwitchValueASCII(kIgnoreConnectionsLimit);
-+    ignore_connections_limit_domains_ = base::SplitString(
-+        value, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
-+  }
-+}
-+
-+NetworkDelegate::~NetworkDelegate() {}
-+
-+int NetworkDelegate::OnBeforeURLRequest(net::URLRequest* request,
-+                                        const net::CompletionCallback& callback,
-+                                        GURL* new_url) {
-+  for (const auto& domain : ignore_connections_limit_domains_) {
-+    if (request->url().DomainIs(domain)) {
-+      // Allow unlimited concurrent connections.
-+      request->SetPriority(net::MAXIMUM_PRIORITY);
-+      request->SetLoadFlags(request->load_flags() | net::LOAD_IGNORE_LIMITS);
-+      break;
-+    }
-+  }
-+
-+  return net::OK;
-+}
-+
-+int NetworkDelegate::OnBeforeStartTransaction(
-+    net::URLRequest* request,
-+    const net::CompletionCallback& callback,
-+    net::HttpRequestHeaders* headers) {
-+  return net::OK;
-+}
-+
-+void NetworkDelegate::OnStartTransaction(
-+    net::URLRequest* request,
-+    const net::HttpRequestHeaders& headers) {}
-+
-+void NetworkDelegate::OnBeforeSendHeaders(
-+    net::URLRequest* request,
-+    const net::ProxyInfo& proxy_info,
-+    const net::ProxyRetryInfoMap& proxy_retry_info,
-+    net::HttpRequestHeaders* headers) {}
-+
-+int NetworkDelegate::OnHeadersReceived(
-+    net::URLRequest* request,
-+    const net::CompletionCallback& callback,
-+    const net::HttpResponseHeaders* original_response_headers,
-+    scoped_refptr<net::HttpResponseHeaders>* override_response_headers,
-+    GURL* allowed_unsafe_redirect_url) {
-+  return net::OK;
-+}
-+
-+void NetworkDelegate::OnBeforeRedirect(net::URLRequest* request,
-+                                       const GURL& new_location) {}
-+
-+void NetworkDelegate::OnResponseStarted(net::URLRequest* request,
-+                                        int net_error) {}
-+
-+void NetworkDelegate::OnNetworkBytesReceived(net::URLRequest* request,
-+                                             int64_t bytes_read) {}
-+
-+void NetworkDelegate::OnNetworkBytesSent(net::URLRequest* request,
-+                                         int64_t bytes_sent) {}
-+
-+void NetworkDelegate::OnCompleted(net::URLRequest* request, bool started) {}
-+
-+void NetworkDelegate::OnURLRequestDestroyed(net::URLRequest* request) {}
-+
-+void NetworkDelegate::OnPACScriptError(int line_number,
-+                                       const base::string16& error) {}
-+
-+NetworkDelegate::AuthRequiredResponse NetworkDelegate::OnAuthRequired(
-+    net::URLRequest* request,
-+    const net::AuthChallengeInfo& auth_info,
-+    const AuthCallback& callback,
-+    net::AuthCredentials* credentials) {
-+  return AUTH_REQUIRED_RESPONSE_NO_ACTION;
-+}
-+
-+bool NetworkDelegate::OnCanGetCookies(const net::URLRequest& request,
-+                                      const net::CookieList& cookie_list) {
-+  return true;
-+}
-+
-+bool NetworkDelegate::OnCanSetCookie(const net::URLRequest& request,
-+                                     const net::CanonicalCookie& cookie_line,
-+                                     net::CookieOptions* options) {
-+  return true;
-+}
-+
-+bool NetworkDelegate::OnCanAccessFile(
-+    const net::URLRequest& request,
-+    const base::FilePath& original_path,
-+    const base::FilePath& absolute_path) const {
-+  return true;
-+}
-+
-+bool NetworkDelegate::OnCanEnablePrivacyMode(
-+    const GURL& url,
-+    const GURL& first_party_for_cookies) const {
-+  return false;
-+}
-+
-+bool NetworkDelegate::OnAreExperimentalCookieFeaturesEnabled() const {
-+  return true;
-+}
-+
-+bool NetworkDelegate::OnCancelURLRequestWithPolicyViolatingReferrerHeader(
-+    const net::URLRequest& request,
-+    const GURL& target_url,
-+    const GURL& referrer_url) const {
-+  return false;
-+}
-+
-+// TODO(deepak1556) : Enable after hooking into the reporting service
-+// https://crbug.com/704259
-+bool NetworkDelegate::OnCanQueueReportingReport(
-+    const url::Origin& origin) const {
-+  return false;
-+}
-+
-+void NetworkDelegate::OnCanSendReportingReports(
-+    std::set<url::Origin> origins,
-+    base::OnceCallback<void(std::set<url::Origin>)> result_callback) const {}
-+
-+bool NetworkDelegate::OnCanSetReportingClient(const url::Origin& origin,
-+                                              const GURL& endpoint) const {
-+  return false;
-+}
-+
-+bool NetworkDelegate::OnCanUseReportingClient(const url::Origin& origin,
-+                                              const GURL& endpoint) const {
-+  return false;
-+}
-+
-+}  // namespace brightray
-added in remote
-  their  100644 77625e5c86b13bdd3619d82d59f98d6acdcf9e36 brightray/browser/network_delegate.h
-@@ -0,0 +1,88 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE-CHROMIUM file.
-+
-+#ifndef BRIGHTRAY_BROWSER_NETWORK_DELEGATE_H_
-+#define BRIGHTRAY_BROWSER_NETWORK_DELEGATE_H_
-+
-+#include <set>
-+#include <string>
-+#include <vector>
-+
-+#include "net/base/network_delegate.h"
-+
-+namespace brightray {
-+
-+class NetworkDelegate : public net::NetworkDelegate {
-+ public:
-+  NetworkDelegate();
-+  ~NetworkDelegate() override;
-+
-+ protected:
-+  int OnBeforeURLRequest(net::URLRequest* request,
-+                         const net::CompletionCallback& callback,
-+                         GURL* new_url) override;
-+  int OnBeforeStartTransaction(net::URLRequest* request,
-+                               const net::CompletionCallback& callback,
-+                               net::HttpRequestHeaders* headers) override;
-+  void OnBeforeSendHeaders(net::URLRequest* request,
-+                           const net::ProxyInfo& proxy_info,
-+                           const net::ProxyRetryInfoMap& proxy_retry_info,
-+                           net::HttpRequestHeaders* headers) override;
-+  void OnStartTransaction(net::URLRequest* request,
-+                          const net::HttpRequestHeaders& headers) override;
-+  int OnHeadersReceived(
-+      net::URLRequest* request,
-+      const net::CompletionCallback& callback,
-+      const net::HttpResponseHeaders* original_response_headers,
-+      scoped_refptr<net::HttpResponseHeaders>* override_response_headers,
-+      GURL* allowed_unsafe_redirect_url) override;
-+  void OnBeforeRedirect(net::URLRequest* request,
-+                        const GURL& new_location) override;
-+  void OnResponseStarted(net::URLRequest* request, int net_error) override;
-+  void OnNetworkBytesReceived(net::URLRequest* request,
-+                              int64_t bytes_read) override;
-+  void OnNetworkBytesSent(net::URLRequest* request,
-+                          int64_t bytes_sent) override;
-+  void OnCompleted(net::URLRequest* request, bool started) override;
-+  void OnURLRequestDestroyed(net::URLRequest* request) override;
-+  void OnPACScriptError(int line_number, const base::string16& error) override;
-+  AuthRequiredResponse OnAuthRequired(
-+      net::URLRequest* request,
-+      const net::AuthChallengeInfo& auth_info,
-+      const AuthCallback& callback,
-+      net::AuthCredentials* credentials) override;
-+  bool OnCanGetCookies(const net::URLRequest& request,
-+                       const net::CookieList& cookie_list) override;
-+  bool OnCanSetCookie(const net::URLRequest& request,
-+                      const net::CanonicalCookie& cookie_line,
-+                      net::CookieOptions* options) override;
-+  bool OnCanAccessFile(const net::URLRequest& request,
-+                       const base::FilePath& original_path,
-+                       const base::FilePath& absolute_path) const override;
-+  bool OnCanEnablePrivacyMode(
-+      const GURL& url,
-+      const GURL& first_party_for_cookies) const override;
-+  bool OnAreExperimentalCookieFeaturesEnabled() const override;
-+  bool OnCancelURLRequestWithPolicyViolatingReferrerHeader(
-+      const net::URLRequest& request,
-+      const GURL& target_url,
-+      const GURL& referrer_url) const override;
-+  bool OnCanQueueReportingReport(const url::Origin& origin) const override;
-+  void OnCanSendReportingReports(std::set<url::Origin> origins,
-+                                 base::OnceCallback<void(std::set<url::Origin>)>
-+                                     result_callback) const override;
-+  bool OnCanSetReportingClient(const url::Origin& origin,
-+                               const GURL& endpoint) const override;
-+  bool OnCanUseReportingClient(const url::Origin& origin,
-+                               const GURL& endpoint) const override;
-+
-+ private:
-+  std::vector<std::string> ignore_connections_limit_domains_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(NetworkDelegate);
-+};
-+
-+}  // namespace brightray
-+
-+#endif  // BRIGHTRAY_BROWSER_NETWORK_DELEGATE_H_
-added in remote
-  their  100644 e662441dedbfe3c5cf08e8dcce3413153c1fcf82 brightray/browser/special_storage_policy.cc
-@@ -0,0 +1,41 @@
-+// Copyright 2014 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "brightray/browser/special_storage_policy.h"
-+
-+namespace brightray {
-+
-+SpecialStoragePolicy::SpecialStoragePolicy() {}
-+
-+SpecialStoragePolicy::~SpecialStoragePolicy() {}
-+
-+bool SpecialStoragePolicy::IsStorageProtected(const GURL& origin) {
-+  return true;
-+}
-+
-+bool SpecialStoragePolicy::IsStorageUnlimited(const GURL& origin) {
-+  return true;
-+}
-+
-+bool SpecialStoragePolicy::IsStorageDurable(const GURL& origin) {
-+  return true;
-+}
-+
-+bool SpecialStoragePolicy::HasIsolatedStorage(const GURL& origin) {
-+  return false;
-+}
-+
-+bool SpecialStoragePolicy::IsStorageSessionOnly(const GURL& origin) {
-+  return false;
-+}
-+
-+bool SpecialStoragePolicy::HasSessionOnlyOrigins() {
-+  return false;
-+}
-+
-+bool SpecialStoragePolicy::ShouldDeleteCookieOnExit(const GURL& origin) {
-+  return false;
-+}
-+
-+}  // namespace brightray
-added in remote
-  their  100644 2d02cdd293438d4f10863c4cf6a7932dc20a3666 brightray/browser/special_storage_policy.h
-@@ -0,0 +1,31 @@
-+// Copyright 2014 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef BRIGHTRAY_BROWSER_SPECIAL_STORAGE_POLICY_H_
-+#define BRIGHTRAY_BROWSER_SPECIAL_STORAGE_POLICY_H_
-+
-+#include "storage/browser/quota/special_storage_policy.h"
-+
-+namespace brightray {
-+
-+class SpecialStoragePolicy : public storage::SpecialStoragePolicy {
-+ public:
-+  SpecialStoragePolicy();
-+
-+  // storage::SpecialStoragePolicy implementation.
-+  bool IsStorageProtected(const GURL& origin) override;
-+  bool IsStorageUnlimited(const GURL& origin) override;
-+  bool IsStorageDurable(const GURL& origin) override;
-+  bool HasIsolatedStorage(const GURL& origin) override;
-+  bool IsStorageSessionOnly(const GURL& origin) override;
-+  bool HasSessionOnlyOrigins() override;
-+  bool ShouldDeleteCookieOnExit(const GURL& origin) override;
-+
-+ protected:
-+  ~SpecialStoragePolicy() override;
-+};
-+
-+}  // namespace brightray
-+
-+#endif  // BRIGHTRAY_BROWSER_SPECIAL_STORAGE_POLICY_H_
-added in both
-  our    100644 c07ba80cbc522030af580adc5d8676ed31d592d1 brightray/browser/url_request_context_getter.cc
-  their  100644 68041972af79509c018d6ec045461bf0b2b50a83 brightray/browser/url_request_context_getter.cc
-@@ -12,15 +12,24 @@
- #include "base/strings/string_util.h"
- #include "base/task_scheduler/post_task.h"
- #include "brightray/browser/browser_client.h"
-+<<<<<<< .our
- #include "brightray/browser/browser_context.h"
- #include "brightray/browser/net/require_ct_delegate.h"
- #include "brightray/browser/net_log.h"
-+=======
-+#include "brightray/browser/net/require_ct_delegate.h"
-+#include "brightray/browser/net_log.h"
-+#include "brightray/browser/network_delegate.h"
-+>>>>>>> .their
- #include "brightray/common/switches.h"
- #include "components/network_session_configurator/common/network_switches.h"
- #include "content/public/browser/browser_thread.h"
- #include "content/public/browser/cookie_store_factory.h"
- #include "content/public/browser/devtools_network_transaction_factory.h"
-+<<<<<<< .our
- #include "content/public/browser/resource_context.h"
-+=======
-+>>>>>>> .their
- #include "net/base/host_mapping_rules.h"
- #include "net/cert/cert_verifier.h"
- #include "net/cert/ct_known_logs.h"
-@@ -59,6 +68,7 @@
- 
- namespace brightray {
- 
-+<<<<<<< .our
- class ResourceContext : public content::ResourceContext {
-  public:
-   ResourceContext() = default;
-@@ -160,6 +170,85 @@
-       base_path_(base_path),
-       in_memory_(in_memory),
-       user_agent_(user_agent),
-+=======
-+std::string URLRequestContextGetter::Delegate::GetUserAgent() {
-+  return base::EmptyString();
-+}
-+
-+std::unique_ptr<net::NetworkDelegate>
-+URLRequestContextGetter::Delegate::CreateNetworkDelegate() {
-+  return nullptr;
-+}
-+
-+std::unique_ptr<net::URLRequestJobFactory>
-+URLRequestContextGetter::Delegate::CreateURLRequestJobFactory(
-+    content::ProtocolHandlerMap* protocol_handlers) {
-+  std::unique_ptr<net::URLRequestJobFactoryImpl> job_factory(
-+      new net::URLRequestJobFactoryImpl);
-+
-+  for (auto& it : *protocol_handlers) {
-+    job_factory->SetProtocolHandler(it.first,
-+                                    base::WrapUnique(it.second.release()));
-+  }
-+  protocol_handlers->clear();
-+
-+  job_factory->SetProtocolHandler(
-+      url::kDataScheme, base::WrapUnique(new net::DataProtocolHandler));
-+  job_factory->SetProtocolHandler(
-+      url::kFileScheme,
-+      base::WrapUnique(
-+          new net::FileProtocolHandler(base::CreateTaskRunnerWithTraits(
-+              {base::MayBlock(), base::TaskPriority::USER_VISIBLE,
-+               base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN}))));
-+
-+  return std::move(job_factory);
-+}
-+
-+net::HttpCache::BackendFactory*
-+URLRequestContextGetter::Delegate::CreateHttpCacheBackendFactory(
-+    const base::FilePath& base_path) {
-+  auto* command_line = base::CommandLine::ForCurrentProcess();
-+  int max_size = 0;
-+  base::StringToInt(command_line->GetSwitchValueASCII(switches::kDiskCacheSize),
-+                    &max_size);
-+
-+  base::FilePath cache_path = base_path.Append(FILE_PATH_LITERAL("Cache"));
-+  return new net::HttpCache::DefaultBackend(
-+      net::DISK_CACHE, net::CACHE_BACKEND_DEFAULT, cache_path, max_size);
-+}
-+
-+std::unique_ptr<net::CertVerifier>
-+URLRequestContextGetter::Delegate::CreateCertVerifier(
-+    RequireCTDelegate* ct_delegate) {
-+  return net::CertVerifier::CreateDefault();
-+}
-+
-+net::SSLConfigService*
-+URLRequestContextGetter::Delegate::CreateSSLConfigService() {
-+  return new net::SSLConfigServiceDefaults;
-+}
-+
-+std::vector<std::string>
-+URLRequestContextGetter::Delegate::GetCookieableSchemes() {
-+  return {"http", "https", "ws", "wss"};
-+}
-+
-+URLRequestContextGetter::URLRequestContextGetter(
-+    Delegate* delegate,
-+    NetLog* net_log,
-+    const base::FilePath& base_path,
-+    bool in_memory,
-+    scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
-+    content::ProtocolHandlerMap* protocol_handlers,
-+    content::URLRequestInterceptorScopedVector protocol_interceptors)
-+    : delegate_(delegate),
-+      net_log_(net_log),
-+      base_path_(base_path),
-+      in_memory_(in_memory),
-+      io_task_runner_(io_task_runner),
-+      protocol_interceptors_(std::move(protocol_interceptors)),
-+      job_factory_(nullptr),
-+>>>>>>> .their
-       context_shutting_down_(false) {
-   // Must first be created on the UI thread.
-   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-@@ -167,16 +256,27 @@
-   if (protocol_handlers)
-     std::swap(protocol_handlers_, *protocol_handlers);
- 
-+<<<<<<< .our
-+=======
-+  if (delegate_)
-+    user_agent_ = delegate_->GetUserAgent();
-+
-+>>>>>>> .their
-   // We must create the proxy config service on the UI loop on Linux because it
-   // must synchronously run on the glib message loop. This will be passed to
-   // the URLRequestContextStorage on the IO thread in GetURLRequestContext().
-   proxy_config_service_ =
-       net::ProxyResolutionService::CreateSystemProxyConfigService(
-+<<<<<<< .our
-           BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
-+=======
-+          io_task_runner_);
-+>>>>>>> .their
- }
- 
- URLRequestContextGetter::~URLRequestContextGetter() {}
- 
-+<<<<<<< .our
- void URLRequestContextGetter::NotifyContextShuttingDown(
-     std::unique_ptr<ResourceContext> resource_context) {
-   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-@@ -191,6 +291,37 @@
-   http_auth_preferences_.reset();
-   host_mapping_rules_.reset();
-   ct_delegate_.reset();
-+=======
-+void URLRequestContextGetter::NotifyContextShutdownOnIO() {
-+  context_shutting_down_ = true;
-+  cookie_change_sub_.reset();
-+  http_network_session_.reset();
-+  http_auth_preferences_.reset();
-+  host_mapping_rules_.reset();
-+  url_request_context_.reset();
-+  storage_.reset();
-+  ct_delegate_.reset();
-+  net::URLRequestContextGetter::NotifyContextShuttingDown();
-+}
-+
-+void URLRequestContextGetter::OnCookieChanged(
-+    const net::CanonicalCookie& cookie,
-+    net::CookieChangeCause cause) {
-+  DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-+
-+  if (!delegate_ || context_shutting_down_)
-+    return;
-+
-+  content::BrowserThread::PostTask(
-+      content::BrowserThread::UI, FROM_HERE,
-+      base::BindOnce(&Delegate::NotifyCookieChange, base::Unretained(delegate_),
-+                     cookie, !(cause == net::CookieChangeCause::INSERTED),
-+                     cause));
-+}
-+
-+net::HostResolver* URLRequestContextGetter::host_resolver() {
-+  return url_request_context_->host_resolver();
-+>>>>>>> .their
- }
- 
- net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
-@@ -218,13 +349,20 @@
-     auto cookie_path = in_memory_
-                            ? base::FilePath()
-                            : base_path_.Append(FILE_PATH_LITERAL("Cookies"));
-+<<<<<<< .our
-     std::unique_ptr<net::CookieStore> cookie_store = content::CreateCookieStore(
-         content::CookieStoreConfig(cookie_path, false, false, nullptr));
-+=======
-+    std::unique_ptr<net::CookieStore> cookie_store =
-+        content::CreateCookieStore(content::CookieStoreConfig(
-+            cookie_path, false, false, nullptr));
-+>>>>>>> .their
-     storage_->set_cookie_store(std::move(cookie_store));
- 
-     // Set custom schemes that can accept cookies.
-     net::CookieMonster* cookie_monster =
-         static_cast<net::CookieMonster*>(url_request_context_->cookie_store());
-+<<<<<<< .our
-     std::vector<std::string> cookie_schemes({"http", "https", "ws", "wss"});
-     delegate_->GetCookieableSchemes(&cookie_schemes);
-     cookie_monster->SetCookieableSchemes(cookie_schemes);
-@@ -235,6 +373,16 @@
-                              .AddCallbackForAllChanges(base::Bind(
-                                  &URLRequestContextGetter::OnCookieChanged,
-                                  base::RetainedRef(this)));
-+=======
-+    cookie_monster->SetCookieableSchemes(delegate_->GetCookieableSchemes());
-+    // Cookie store will outlive notifier by order of declaration
-+    // in the header.
-+    cookie_change_sub_ =
-+        url_request_context_->cookie_store()
-+            ->GetChangeDispatcher()
-+            .AddCallbackForAllChanges(
-+                base::Bind(&URLRequestContextGetter::OnCookieChanged, this));
-+>>>>>>> .their
- 
-     storage_->set_channel_id_service(std::make_unique<net::ChannelIDService>(
-         new net::DefaultChannelIDStore(nullptr)));
-@@ -315,7 +463,11 @@
-     storage_->set_transport_security_state(std::move(transport_security_state));
-     storage_->set_cert_verifier(
-         delegate_->CreateCertVerifier(ct_delegate_.get()));
-+<<<<<<< .our
-     storage_->set_ssl_config_service(new net::SSLConfigServiceDefaults());
-+=======
-+    storage_->set_ssl_config_service(delegate_->CreateSSLConfigService());
-+>>>>>>> .their
-     storage_->set_http_auth_handler_factory(std::move(auth_handler_factory));
-     std::unique_ptr<net::HttpServerProperties> server_properties(
-         new net::HttpServerPropertiesImpl);
-@@ -368,8 +520,12 @@
-         std::move(backend), false));
- 
-     std::unique_ptr<net::URLRequestJobFactory> job_factory =
-+<<<<<<< .our
-         delegate_->CreateURLRequestJobFactory(url_request_context_.get(),
-                                               &protocol_handlers_);
-+=======
-+        delegate_->CreateURLRequestJobFactory(&protocol_handlers_);
-+>>>>>>> .their
-     job_factory_ = job_factory.get();
- 
-     // Set up interceptors in the reverse order.
-@@ -387,9 +543,12 @@
-     storage_->set_job_factory(std::move(top_job_factory));
-   }
- 
-+<<<<<<< .our
-   if (resource_context_)
-     resource_context_->request_context_ = url_request_context_.get();
- 
-+=======
-+>>>>>>> .their
-   return url_request_context_.get();
- }
- 
-@@ -398,6 +557,7 @@
-   return BrowserThread::GetTaskRunnerForThread(BrowserThread::IO);
- }
- 
-+<<<<<<< .our
- void URLRequestContextGetter::OnCookieChanged(
-     const net::CanonicalCookie& cookie,
-     net::CookieChangeCause cause) const {
-@@ -405,4 +565,6 @@
-     delegate_->OnCookieChanged(cookie, cause);
- }
- 
-+=======
-+>>>>>>> .their
- }  // namespace brightray
-added in both
-  our    100644 941a5782b14a941bb25a7a9ef6ca6d73f8bc3ec1 brightray/browser/url_request_context_getter.h
-  their  100644 b990d479a06cb7c26f306bf50179eb87c9af4472 brightray/browser/url_request_context_getter.h
-@@ -22,6 +22,13 @@
- #include "base/debug/leak_tracker.h"
- #endif
- 
-+<<<<<<< .our
-+=======
-+namespace base {
-+class MessageLoop;
-+}
-+
-+>>>>>>> .their
- namespace net {
- class HostMappingRules;
- class HostResolver;
-@@ -34,8 +41,11 @@
- 
- namespace brightray {
- 
-+<<<<<<< .our
- class BrowserContext;
- class ResourceContext;
-+=======
-+>>>>>>> .their
- class RequireCTDelegate;
- class NetLog;
- 
-@@ -46,6 +56,7 @@
-     Delegate() {}
-     virtual ~Delegate() {}
- 
-+<<<<<<< .our
-     virtual std::unique_ptr<net::NetworkDelegate> CreateNetworkDelegate() = 0;
-     virtual std::unique_ptr<net::URLRequestJobFactory>
-     CreateURLRequestJobFactory(
-@@ -70,11 +81,42 @@
-       content::ProtocolHandlerMap* protocol_handlers,
-       content::URLRequestInterceptorScopedVector protocol_interceptors);
- 
-+=======
-+    virtual std::unique_ptr<net::NetworkDelegate> CreateNetworkDelegate();
-+    virtual std::string GetUserAgent();
-+    virtual std::unique_ptr<net::URLRequestJobFactory>
-+    CreateURLRequestJobFactory(content::ProtocolHandlerMap* protocol_handlers);
-+    virtual net::HttpCache::BackendFactory* CreateHttpCacheBackendFactory(
-+        const base::FilePath& base_path);
-+    virtual std::unique_ptr<net::CertVerifier> CreateCertVerifier(
-+        RequireCTDelegate* ct_delegate);
-+    virtual net::SSLConfigService* CreateSSLConfigService();
-+    virtual std::vector<std::string> GetCookieableSchemes();
-+    virtual void NotifyCookieChange(const net::CanonicalCookie& cookie,
-+                                    bool removed,
-+                                    net::CookieChangeCause cause) {}
-+  };
-+
-+  URLRequestContextGetter(
-+      Delegate* delegate,
-+      NetLog* net_log,
-+      const base::FilePath& base_path,
-+      bool in_memory,
-+      scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
-+      content::ProtocolHandlerMap* protocol_handlers,
-+      content::URLRequestInterceptorScopedVector protocol_interceptors);
-+
-+  // net::CookieChangeDispatcher::CookieChangedCallback implementation.
-+  void OnCookieChanged(const net::CanonicalCookie& cookie,
-+                       net::CookieChangeCause cause);
-+
-+>>>>>>> .their
-   // net::URLRequestContextGetter:
-   net::URLRequestContext* GetURLRequestContext() override;
-   scoped_refptr<base::SingleThreadTaskRunner> GetNetworkTaskRunner()
-       const override;
- 
-+<<<<<<< .our
-   net::URLRequestJobFactory* job_factory() const { return job_factory_; }
-   void set_delegate(Delegate* delegate) { delegate_ = delegate; }
- 
-@@ -116,6 +158,24 @@
-   // net::CookieChangeDispatcher::CookieChangedCallback implementation.
-   void OnCookieChanged(const net::CanonicalCookie& cookie,
-                        net::CookieChangeCause cause) const;
-+=======
-+  net::HostResolver* host_resolver();
-+  net::URLRequestJobFactory* job_factory() const { return job_factory_; }
-+
-+  void NotifyContextShutdownOnIO();
-+
-+ private:
-+  ~URLRequestContextGetter() override;
-+
-+  Delegate* delegate_;
-+
-+  NetLog* net_log_;
-+  base::FilePath base_path_;
-+  bool in_memory_;
-+  scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
-+
-+  std::string user_agent_;
-+>>>>>>> .their
- 
- #if DCHECK_IS_ON()
-   base::debug::LeakTracker<URLRequestContextGetter> leak_tracker_;
-@@ -129,6 +189,7 @@
-   std::unique_ptr<net::HttpAuthPreferences> http_auth_preferences_;
-   std::unique_ptr<net::HttpNetworkSession> http_network_session_;
-   std::unique_ptr<net::CookieChangeSubscription> cookie_change_sub_;
-+<<<<<<< .our
- 
-   net::URLRequestJobFactory* job_factory_;
-   Delegate* delegate_;
-@@ -139,6 +200,13 @@
-   base::FilePath base_path_;
-   bool in_memory_;
-   std::string user_agent_;
-+=======
-+  content::ProtocolHandlerMap protocol_handlers_;
-+  content::URLRequestInterceptorScopedVector protocol_interceptors_;
-+
-+  net::URLRequestJobFactory* job_factory_;  // weak ref
-+
-+>>>>>>> .their
-   bool context_shutting_down_;
- 
-   DISALLOW_COPY_AND_ASSIGN(URLRequestContextGetter);
-added in both
-  our    100644 7cca54f03144d59595ee3f79c8ee8b6cf30c257e brightray/browser/views/inspectable_web_contents_view_views.cc
-  their  100644 e95ffd05ee3c1d1dc59c29f60c470eb04524a461 brightray/browser/views/inspectable_web_contents_view_views.cc
-@@ -81,8 +81,12 @@
-       title_(base::ASCIIToUTF16("Developer Tools")) {
-   set_owned_by_client();
- 
-+<<<<<<< .our
-   if (!inspectable_web_contents_->IsGuest() &&
-       inspectable_web_contents_->GetWebContents()->GetNativeView()) {
-+=======
-+  if (inspectable_web_contents_->GetWebContents()->GetNativeView()) {
-+>>>>>>> .their
-     views::WebView* contents_web_view = new views::WebView(nullptr);
-     contents_web_view->SetWebContents(
-         inspectable_web_contents_->GetWebContents());
-added in both
-  our    100644 f954489704cf1147b13937bc3a228898f45cb38d brightray/browser/win/notification_presenter_win.h
-  their  100644 2a1a779bfa3d53e693b50d3b7f669a6afd92efaa brightray/browser/win/notification_presenter_win.h
-@@ -35,7 +35,11 @@
- class NotificationPresenterWin : public NotificationPresenter {
-  public:
-   NotificationPresenterWin();
-+<<<<<<< .our
-   ~NotificationPresenterWin() override;
-+=======
-+  ~NotificationPresenterWin();
-+>>>>>>> .their
- 
-   bool Init();
- 
-added in both
-  our    100644 cbfea8360b983a139736c01e93f0fda5b104f900 brightray/browser/win/notification_presenter_win7.cc
-  their  100644 9a1ede3642afae305a6f5b1f388d04646f6b765b brightray/browser/win/notification_presenter_win7.cc
-@@ -13,8 +13,13 @@
- 
- Win32Notification* NotificationPresenterWin7::GetNotificationObjectByRef(
-     const DesktopNotificationController::Notification& ref) {
-+<<<<<<< .our
-   for (auto* n : this->notifications()) {
-     auto* w32n = static_cast<Win32Notification*>(n);
-+=======
-+  for (auto n : this->notifications()) {
-+    auto w32n = static_cast<Win32Notification*>(n);
-+>>>>>>> .their
-     if (w32n->GetRef() == ref)
-       return w32n;
-   }
-@@ -24,8 +29,13 @@
- 
- Win32Notification* NotificationPresenterWin7::GetNotificationObjectByTag(
-     const std::string& tag) {
-+<<<<<<< .our
-   for (auto* n : this->notifications()) {
-     auto* w32n = static_cast<Win32Notification*>(n);
-+=======
-+  for (auto n : this->notifications()) {
-+    auto w32n = static_cast<Win32Notification*>(n);
-+>>>>>>> .their
-     if (w32n->GetTag() == tag)
-       return w32n;
-   }
-@@ -35,14 +45,22 @@
- 
- void NotificationPresenterWin7::OnNotificationClicked(
-     Notification& notification) {
-+<<<<<<< .our
-   auto* n = GetNotificationObjectByRef(notification);
-+=======
-+  auto n = GetNotificationObjectByRef(notification);
-+>>>>>>> .their
-   if (n)
-     n->NotificationClicked();
- }
- 
- void NotificationPresenterWin7::OnNotificationDismissed(
-     Notification& notification) {
-+<<<<<<< .our
-   auto* n = GetNotificationObjectByRef(notification);
-+=======
-+  auto n = GetNotificationObjectByRef(notification);
-+>>>>>>> .their
-   if (n)
-     n->NotificationDismissed();
- }
-added in both
-  our    100644 f07d43105fc1b99b7421e38b7d937a280738a6b6 brightray/browser/win/win32_desktop_notifications/common.h
-  their  100644 967ad247481f224e0c4f305337d6127ffd9cfa19 brightray/browser/win/win32_desktop_notifications/common.h
-@@ -36,7 +36,11 @@
-         GetProcAddress(GetModuleHandle(TEXT("shcore")), "GetDpiForMonitor"));
- 
-     if (GetDpiForMonitor) {
-+<<<<<<< .our
-       auto* monitor = MonitorFromPoint({}, MONITOR_DEFAULTTOPRIMARY);
-+=======
-+      auto monitor = MonitorFromPoint({}, MONITOR_DEFAULTTOPRIMARY);
-+>>>>>>> .their
-       if (GetDpiForMonitor(monitor, 0, &dpi_x, &dpi_y) == S_OK)
-         return;
-     }
-added in both
-  our    100644 71395a49d82f7be8a3ffd66e4795af968973a274 brightray/browser/win/win32_desktop_notifications/desktop_notification_controller.cc
-  their  100644 0840d9e6364dc743458588dd21464f32ea946adf brightray/browser/win/win32_desktop_notifications/desktop_notification_controller.cc
-@@ -1,9 +1,14 @@
-+<<<<<<< .our
- #ifndef NOMINMAX
- #define NOMINMAX
- #endif
- #ifndef WIN32_LEAN_AND_MEAN
- #define WIN32_LEAN_AND_MEAN
- #endif
-+=======
-+#define NOMINMAX
-+#define WIN32_LEAN_AND_MEAN
-+>>>>>>> .their
- #include "brightray/browser/win/win32_desktop_notifications/desktop_notification_controller.h"
- #include <windowsx.h>
- #include <algorithm>
-@@ -39,9 +44,12 @@
-   return ret;
- }
- 
-+<<<<<<< .our
- const TCHAR DesktopNotificationController::class_name_[] =
-       TEXT("DesktopNotificationController");
- 
-+=======
-+>>>>>>> .their
- HINSTANCE DesktopNotificationController::RegisterWndClasses() {
-   // We keep a static `module` variable which serves a dual purpose:
-   // 1. Stores the HINSTANCE where the window classes are registered,
-@@ -90,7 +98,11 @@
-                                                         LPARAM lparam) {
-   switch (message) {
-     case WM_CREATE: {
-+<<<<<<< .our
-       auto*& cs = reinterpret_cast<const CREATESTRUCT*&>(lparam);
-+=======
-+      auto& cs = reinterpret_cast<const CREATESTRUCT*&>(lparam);
-+>>>>>>> .their
-       SetWindowLongPtr(hwnd, 0, (LONG_PTR)cs->lpCreateParams);
-     } break;
- 
-@@ -101,7 +113,11 @@
-       return 0;
- 
-     case WM_DISPLAYCHANGE: {
-+<<<<<<< .our
-       auto* inst = Get(hwnd);
-+=======
-+      auto inst = Get(hwnd);
-+>>>>>>> .their
-       inst->ClearAssets();
-       inst->AnimateAll();
-     } break;
-@@ -189,13 +205,21 @@
-       POINT origin = {work_area.right,
-                       work_area.bottom - metrics.Y(toast_margin_)};
- 
-+<<<<<<< .our
-       auto* hdwp = BeginDeferWindowPos(static_cast<int>(instances_.size()));
-+=======
-+      auto hdwp = BeginDeferWindowPos(static_cast<int>(instances_.size()));
-+>>>>>>> .their
- 
-       for (auto&& inst : instances_) {
-         if (!inst.hwnd)
-           continue;
- 
-+<<<<<<< .our
-         auto* notification = Toast::Get(inst.hwnd);
-+=======
-+        auto notification = Toast::Get(inst.hwnd);
-+>>>>>>> .their
-         hdwp = notification->Animate(hdwp, origin);
-         if (!hdwp)
-           break;
-@@ -252,7 +276,11 @@
-     int target_pos = 0;
-     for (auto&& inst : instances_) {
-       if (inst.hwnd) {
-+<<<<<<< .our
-         auto* toast = Toast::Get(inst.hwnd);
-+=======
-+        auto toast = Toast::Get(inst.hwnd);
-+>>>>>>> .their
- 
-         if (toast->IsHighlighted())
-           target_pos = toast->GetVerticalPosition();
-@@ -295,9 +323,15 @@
-   }
- 
-   // Dismiss active toast
-+<<<<<<< .our
-   auto* hwnd = GetToast(notification.data_.get());
-   if (hwnd) {
-     auto* toast = Toast::Get(hwnd);
-+=======
-+  auto hwnd = GetToast(notification.data_.get());
-+  if (hwnd) {
-+    auto toast = Toast::Get(hwnd);
-+>>>>>>> .their
-     toast->Dismiss();
-   }
- }
-@@ -310,8 +344,13 @@
- }
- 
- void DesktopNotificationController::CreateToast(NotificationLink&& data) {
-+<<<<<<< .our
-   auto* hinstance = RegisterWndClasses();
-   auto* hwnd = Toast::Create(hinstance, data);
-+=======
-+  auto hinstance = RegisterWndClasses();
-+  auto hwnd = Toast::Create(hinstance, data);
-+>>>>>>> .their
-   if (hwnd) {
-     int toast_pos = 0;
-     if (!instances_.empty()) {
-@@ -319,7 +358,11 @@
-       _ASSERT(item.hwnd);
- 
-       ScreenMetrics scr;
-+<<<<<<< .our
-       auto* toast = Toast::Get(item.hwnd);
-+=======
-+      auto toast = Toast::Get(item.hwnd);
-+>>>>>>> .their
-       toast_pos = toast->GetVerticalPosition() + toast->GetHeight() +
-                   scr.Y(toast_margin_);
-     }
-@@ -333,7 +376,11 @@
-                                       NULL, hinstance, this);
-     }
- 
-+<<<<<<< .our
-     auto* toast = Toast::Get(hwnd);
-+=======
-+    auto toast = Toast::Get(hwnd);
-+>>>>>>> .their
-     toast->PopUp(toast_pos);
-   }
- }
-@@ -363,18 +410,24 @@
-   }
- }
- 
-+<<<<<<< .our
- DesktopNotificationController::Notification::Notification() = default;
- DesktopNotificationController::Notification::Notification(
-   const DesktopNotificationController::Notification&) = default;
- 
-+=======
-+>>>>>>> .their
- DesktopNotificationController::Notification::Notification(
-     const shared_ptr<NotificationData>& data)
-     : data_(data) {
-   _ASSERT(data != nullptr);
- }
- 
-+<<<<<<< .our
- DesktopNotificationController::Notification::~Notification() = default;
- 
-+=======
-+>>>>>>> .their
- bool DesktopNotificationController::Notification::operator==(
-     const Notification& other) const {
-   return data_ == other.data_;
-@@ -405,9 +458,15 @@
-   data_->body_text = move(body_text);
-   data_->image = CopyBitmap(image);
- 
-+<<<<<<< .our
-   auto* hwnd = data_->controller->GetToast(data_.get());
-   if (hwnd) {
-     auto* toast = Toast::Get(hwnd);
-+=======
-+  auto hwnd = data_->controller->GetToast(data_.get());
-+  if (hwnd) {
-+    auto toast = Toast::Get(hwnd);
-+>>>>>>> .their
-     toast->ResetContents();
-   }
- 
-@@ -422,7 +481,11 @@
- }
- 
- DesktopNotificationController::NotificationLink::~NotificationLink() {
-+<<<<<<< .our
-   auto* p = get();
-+=======
-+  auto p = get();
-+>>>>>>> .their
-   if (p)
-     p->controller = nullptr;
- }
-added in both
-  our    100644 d6d8fd35a2958b39dc0f6a76b4ee110b2951c832 brightray/browser/win/win32_desktop_notifications/desktop_notification_controller.h
-  their  100644 ad62fa727b453510e07917ee718e830e8ac84d2d brightray/browser/win/win32_desktop_notifications/desktop_notification_controller.h
-@@ -76,7 +76,12 @@
-   void DestroyToast(ToastInstance& inst);
- 
-  private:
-+<<<<<<< .our
-   static const TCHAR class_name_[];
-+=======
-+  static constexpr const TCHAR class_name_[] =
-+      TEXT("DesktopNotificationController");
-+>>>>>>> .their
- 
-   HWND hwnd_controller_ = NULL;
-   HFONT caption_font_ = NULL, body_font_ = NULL;
-@@ -87,10 +92,15 @@
- 
- class DesktopNotificationController::Notification {
-  public:
-+<<<<<<< .our
-   Notification();
-   explicit Notification(const std::shared_ptr<NotificationData>& data);
-   Notification(const Notification&);
-   ~Notification();
-+=======
-+  Notification() = default;
-+  explicit Notification(const std::shared_ptr<NotificationData>& data);
-+>>>>>>> .their
- 
-   bool operator==(const Notification& other) const;
- 
-added in both
-  our    100644 061eb977a8dc58f07aff1370467f88b10aec8003 brightray/browser/win/win32_desktop_notifications/toast.cc
-  their  100644 9a1e7cb099e83e4b6af7c5bcdde3f5c83d09e454 brightray/browser/win/win32_desktop_notifications/toast.cc
-@@ -1,11 +1,18 @@
-+<<<<<<< .our
- #ifndef NOMINMAX
- #define NOMINMAX
- #endif
-+=======
-+#define NOMINMAX
-+>>>>>>> .their
- #include "brightray/browser/win/win32_desktop_notifications/toast.h"
- #include <uxtheme.h>
- #include <windowsx.h>
- #include <algorithm>
-+<<<<<<< .our
- #include "base/logging.h"
-+=======
-+>>>>>>> .their
- #include "brightray/browser/win/win32_desktop_notifications/common.h"
- 
- #pragma comment(lib, "msimg32.lib")
-@@ -86,7 +93,11 @@
-       if (GetDIBits(hdc_screen, bitmap, 0, 0, 0,
-                     reinterpret_cast<BITMAPINFO*>(&bmi), DIB_RGB_COLORS) &&
-           bmi.biSizeImage > 0 && (bmi.biSizeImage % 4) == 0) {
-+<<<<<<< .our
-         auto* buf = reinterpret_cast<BYTE*>(
-+=======
-+        auto buf = reinterpret_cast<BYTE*>(
-+>>>>>>> .their
-             _aligned_malloc(bmi.biSizeImage, sizeof(DWORD)));
- 
-         if (buf) {
-@@ -120,12 +131,20 @@
-     bmi.biCompression = BI_RGB;
- 
-     void* color_bits;
-+<<<<<<< .our
-     auto* color_bitmap =
-+=======
-+    auto color_bitmap =
-+>>>>>>> .their
-         CreateDIBSection(NULL, reinterpret_cast<BITMAPINFO*>(&bmi),
-                          DIB_RGB_COLORS, &color_bits, NULL, 0);
- 
-     void* alpha_bits;
-+<<<<<<< .our
-     auto* alpha_bitmap =
-+=======
-+    auto alpha_bitmap =
-+>>>>>>> .their
-         CreateDIBSection(NULL, reinterpret_cast<BITMAPINFO*>(&bmi),
-                          DIB_RGB_COLORS, &alpha_bits, NULL, 0);
- 
-@@ -151,9 +170,15 @@
-       GdiFlush();
- 
-       // apply the alpha channel
-+<<<<<<< .our
-       auto* dest = reinterpret_cast<BYTE*>(color_bits);
-       auto* src = reinterpret_cast<const BYTE*>(alpha_bits);
-       auto* end = src + (width * height * 4);
-+=======
-+      auto dest = reinterpret_cast<BYTE*>(color_bits);
-+      auto src = reinterpret_cast<const BYTE*>(alpha_bits);
-+      auto end = src + (width * height * 4);
-+>>>>>>> .their
-       while (src != end) {
-         dest[3] = src[0];
-         dest += 4;
-@@ -184,9 +209,12 @@
-   return result_bitmap;
- }
- 
-+<<<<<<< .our
- const TCHAR DesktopNotificationController::Toast::class_name_[] =
-     TEXT("DesktopNotificationToast");
- 
-+=======
-+>>>>>>> .their
- DesktopNotificationController::Toast::Toast(HWND hwnd,
-                                             shared_ptr<NotificationData>* data)
-     : hwnd_(hwnd), data_(*data) {
-@@ -220,10 +248,17 @@
-                                                       LPARAM lparam) {
-   switch (message) {
-     case WM_CREATE: {
-+<<<<<<< .our
-       auto*& cs = reinterpret_cast<const CREATESTRUCT*&>(lparam);
-       auto* data =
-           static_cast<shared_ptr<NotificationData>*>(cs->lpCreateParams);
-       auto* inst = new Toast(hwnd, data);
-+=======
-+      auto& cs = reinterpret_cast<const CREATESTRUCT*&>(lparam);
-+      auto data =
-+          static_cast<shared_ptr<NotificationData>*>(cs->lpCreateParams);
-+      auto inst = new Toast(hwnd, data);
-+>>>>>>> .their
-       SetWindowLongPtr(hwnd, 0, (LONG_PTR)inst);
-     } break;
- 
-@@ -242,7 +277,11 @@
-       return 0;
- 
-     case WM_LBUTTONDOWN: {
-+<<<<<<< .our
-       auto* inst = Get(hwnd);
-+=======
-+      auto inst = Get(hwnd);
-+>>>>>>> .their
- 
-       inst->Dismiss();
- 
-@@ -255,7 +294,11 @@
-       return 0;
- 
-     case WM_MOUSEMOVE: {
-+<<<<<<< .our
-       auto* inst = Get(hwnd);
-+=======
-+      auto inst = Get(hwnd);
-+>>>>>>> .their
-       if (!inst->is_highlighted_) {
-         inst->is_highlighted_ = true;
- 
-@@ -275,7 +318,11 @@
-       return 0;
- 
-     case WM_MOUSELEAVE: {
-+<<<<<<< .our
-       auto* inst = Get(hwnd);
-+=======
-+      auto inst = Get(hwnd);
-+>>>>>>> .their
-       inst->is_highlighted_ = false;
-       inst->is_close_hot_ = false;
-       inst->UpdateContents();
-@@ -289,7 +336,11 @@
-       return 0;
- 
-     case WM_WINDOWPOSCHANGED: {
-+<<<<<<< .our
-       auto*& wp = reinterpret_cast<WINDOWPOS*&>(lparam);
-+=======
-+      auto& wp = reinterpret_cast<WINDOWPOS*&>(lparam);
-+>>>>>>> .their
-       if (wp->flags & SWP_HIDEWINDOW) {
-         if (!IsWindowVisible(hwnd))
-           Get(hwnd)->is_highlighted_ = false;
-@@ -363,7 +414,11 @@
- 
-   // Draw background
-   {
-+<<<<<<< .our
-     auto* brush = CreateSolidBrush(back_color);
-+=======
-+    auto brush = CreateSolidBrush(back_color);
-+>>>>>>> .their
- 
-     RECT rc = {0, 0, toast_size_.cx, toast_size_.cy};
-     FillRect(hdc_, &rc, brush);
-@@ -374,8 +429,13 @@
-   SetBkMode(hdc_, TRANSPARENT);
- 
-   const auto close = L'\x2715';
-+<<<<<<< .our
-   auto* caption_font = data_->controller->GetCaptionFont();
-   auto* body_font = data_->controller->GetBodyFont();
-+=======
-+  auto caption_font = data_->controller->GetCaptionFont();
-+  auto body_font = data_->controller->GetBodyFont();
-+>>>>>>> .their
- 
-   TEXTMETRIC tm_cap;
-   SelectFont(hdc_, caption_font);
-@@ -526,7 +586,11 @@
-     if (new_size.cx != this->toast_size_.cx ||
-         new_size.cy != this->toast_size_.cy) {
-       HDC hdc_screen = GetDC(NULL);
-+<<<<<<< .our
-       auto* new_bitmap =
-+=======
-+      auto new_bitmap =
-+>>>>>>> .their
-           CreateCompatibleBitmap(hdc_screen, new_size.cx, new_size.cy);
-       ReleaseDC(NULL, hdc_screen);
- 
-@@ -567,7 +631,11 @@
-             auto b1 = UpdateLayeredWindowIndirect(hwnd_, &ulw);
-             ulw.prcDirty = &dirty2;
-             auto b2 = UpdateLayeredWindowIndirect(hwnd_, &ulw);
-+<<<<<<< .our
-             DCHECK(b1 && b2);
-+=======
-+            _ASSERT(b1 && b2);
-+>>>>>>> .their
-           }
- 
-           return;
-@@ -739,21 +807,33 @@
-   // ULWI fails, which can happen when one of the dimensions is zero (e.g.
-   // at the beginning of ease-in).
- 
-+<<<<<<< .our
-   UpdateLayeredWindowIndirect(hwnd_, &ulw);
-+=======
-+  auto ulw_result = UpdateLayeredWindowIndirect(hwnd_, &ulw);
-+>>>>>>> .their
-   hdwp = DeferWindowPos(hdwp, hwnd_, HWND_TOPMOST, pt.x, pt.y, size.cx, size.cy,
-                         dwpFlags);
-   return hdwp;
- }
- 
- void DesktopNotificationController::Toast::StartEaseIn() {
-+<<<<<<< .our
-   DCHECK(!ease_in_active_);
-+=======
-+  _ASSERT(!ease_in_active_);
-+>>>>>>> .their
-   ease_in_start_ = GetTickCount();
-   ease_in_active_ = true;
-   data_->controller->StartAnimation();
- }
- 
- void DesktopNotificationController::Toast::StartEaseOut() {
-+<<<<<<< .our
-   DCHECK(!ease_out_active_);
-+=======
-+  _ASSERT(!ease_out_active_);
-+>>>>>>> .their
-   ease_out_start_ = GetTickCount();
-   ease_out_active_ = true;
-   data_->controller->StartAnimation();
-added in both
-  our    100644 5a0e91b5e5ca02a51d4938c853c8b14903a403b4 brightray/browser/win/win32_desktop_notifications/toast.h
-  their  100644 967697ac8ccaf5a72825446137b845ed64b44acd brightray/browser/win/win32_desktop_notifications/toast.h
-@@ -64,7 +64,11 @@
-   float AnimateStackCollapse();
- 
-  private:
-+<<<<<<< .our
-   static const TCHAR class_name_[];
-+=======
-+  static constexpr const TCHAR class_name_[] = TEXT("DesktopNotificationToast");
-+>>>>>>> .their
- 
-   const HWND hwnd_;
-   HDC hdc_;
-added in both
-  our    100644 adeb55656b5130e4cc09b7a5d82b78cc50a3b873 brightray/browser/win/win32_notification.cc
-  their  100644 d459438ea952de679d2197dec90656a87f8e2351 brightray/browser/win/win32_notification.cc
-@@ -1,6 +1,10 @@
-+<<<<<<< .our
- #ifndef WIN32_LEAN_AND_MEAN
- #define WIN32_LEAN_AND_MEAN
- #endif
-+=======
-+#define WIN32_LEAN_AND_MEAN
-+>>>>>>> .their
- 
- #include "brightray/browser/win/win32_notification.h"
- 
-@@ -13,7 +17,11 @@
- namespace brightray {
- 
- void Win32Notification::Show(const NotificationOptions& options) {
-+<<<<<<< .our
-   auto* presenter = static_cast<NotificationPresenterWin7*>(this->presenter());
-+=======
-+  auto presenter = static_cast<NotificationPresenterWin7*>(this->presenter());
-+>>>>>>> .their
-   if (!presenter)
-     return;
- 
-added in both
-  our    100644 a87ca051ff4ca81b0e4d6130ca3c7a2106204bdd brightray/browser/win/windows_toast_notification.cc
-  their  100644 72adba548493129d094fc044ae76ddf616dc10a3 brightray/browser/win/windows_toast_notification.cc
-@@ -80,7 +80,11 @@
- }
- 
- void WindowsToastNotification::Show(const NotificationOptions& options) {
-+<<<<<<< .our
-   auto* presenter_win = static_cast<NotificationPresenterWin*>(presenter());
-+=======
-+  auto presenter_win = static_cast<NotificationPresenterWin*>(presenter());
-+>>>>>>> .their
-   std::wstring icon_path =
-       presenter_win->SaveIconToFilesystem(options.icon, options.icon_url);
- 
-added in both
-  our    100644 6e368fb38dcb9e2fbf6d6108e39c5cfb25a5b7a5 brightray/browser/win/windows_toast_notification.h
-  their  100644 62c8b844c753ae5a35c676cdca1adcab8018f65b brightray/browser/win/windows_toast_notification.h
-@@ -47,7 +47,11 @@
- 
-   WindowsToastNotification(NotificationDelegate* delegate,
-                            NotificationPresenter* presenter);
-+<<<<<<< .our
-   ~WindowsToastNotification() override;
-+=======
-+  ~WindowsToastNotification();
-+>>>>>>> .their
- 
-  protected:
-   // Notification:
-@@ -108,7 +112,11 @@
-                                               DesktopToastFailedEventHandler> {
-  public:
-   explicit ToastEventHandler(Notification* notification);
-+<<<<<<< .our
-   ~ToastEventHandler() override;
-+=======
-+  ~ToastEventHandler();
-+>>>>>>> .their
- 
-   IFACEMETHODIMP Invoke(
-       ABI::Windows::UI::Notifications::IToastNotification* sender,
-added in both
-  our    100644 407866f006d51ac528efaba97cb3750687229900 brightray/common/application_info.h
-  their  100644 a4918cc7c3d5b3f73a5e50b2adeccbb4e527c127 brightray/common/application_info.h
-@@ -2,7 +2,10 @@
- #define BRIGHTRAY_COMMON_APPLICATION_INFO_H_
- 
- #if defined(OS_WIN)
-+<<<<<<< .our
- #include "base/strings/string16.h"
-+=======
-+>>>>>>> .their
- #include "brightray/browser/win/scoped_hstring.h"
- #endif
- 
-added in both
-  our    100644 a0256372bbdbbc1d77cb84885faab42a27f55c9f brightray/common/application_info_win.cc
-  their  100644 49a3720f01e97316b58791c9c6e8333c8d0d8314 brightray/common/application_info_win.cc
-@@ -22,14 +22,22 @@
- const wchar_t kAppUserModelIDFormat[] = L"electron.app.$1";
- 
- std::string GetApplicationName() {
-+<<<<<<< .our
-   auto* module = GetModuleHandle(nullptr);
-+=======
-+  auto module = GetModuleHandle(nullptr);
-+>>>>>>> .their
-   std::unique_ptr<FileVersionInfo> info(
-       FileVersionInfo::CreateFileVersionInfoForModule(module));
-   return base::UTF16ToUTF8(info->product_name());
- }
- 
- std::string GetApplicationVersion() {
-+<<<<<<< .our
-   auto* module = GetModuleHandle(nullptr);
-+=======
-+  auto module = GetModuleHandle(nullptr);
-+>>>>>>> .their
-   std::unique_ptr<FileVersionInfo> info(
-       FileVersionInfo::CreateFileVersionInfoForModule(module));
-   return base::UTF16ToUTF8(info->product_version());
-added in both
-  our    100644 c25cb5f0c02e6b29139cb44f01d8aab69b713381 brightray/common/main_delegate.cc
-  their  100644 5f94601be9163415329b6fa5bf372ecb8445bb79 brightray/common/main_delegate.cc
-@@ -48,6 +48,7 @@
-   if (initialized)
-     ui::ResourceBundle::CleanupSharedInstance();
- 
-+<<<<<<< .our
-   // Load other resource files.
-   base::FilePath pak_dir;
- #if defined(OS_MACOSX)
-@@ -70,6 +71,21 @@
-   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
-   bundle.ReloadLocaleResources(locale);
- 
-+=======
-+  ui::ResourceBundle::InitSharedInstanceWithLocale(
-+      locale, nullptr, ui::ResourceBundle::DO_NOT_LOAD_COMMON_RESOURCES);
-+
-+  ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
-+  bundle.ReloadLocaleResources(locale);
-+
-+  // Load other resource files.
-+  base::FilePath pak_dir;
-+#if defined(OS_MACOSX)
-+  pak_dir = base::mac::FrameworkBundlePath().Append("Resources");
-+#else
-+  PathService::Get(base::DIR_MODULE, &pak_dir);
-+#endif
-+>>>>>>> .their
-   bundle.AddDataPackFromPath(
-       pak_dir.Append(FILE_PATH_LITERAL("content_shell.pak")),
-       ui::GetSupportedScaleFactors()[0]);
-@@ -90,7 +106,10 @@
-   bundle.AddDataPackFromPath(
-       pak_dir.Append(FILE_PATH_LITERAL("views_resources_200_percent.pak")),
-       ui::SCALE_FACTOR_200P);
-+<<<<<<< .our
- #endif
-+=======
-+>>>>>>> .their
- }
- 
- MainDelegate::MainDelegate() {}
-added in both
-  our    100644 ef7a138375bd73c593b44bc93390318f3d24453f brightray/common/switches.cc
-  their  100644 9985f9f15e0b79203aabf417f41d5b50c7d24bb5 brightray/common/switches.cc
-@@ -50,6 +50,12 @@
- const char kAuthNegotiateDelegateWhitelist[] =
-     "auth-negotiate-delegate-whitelist";
- 
-+<<<<<<< .our
-+=======
-+// Forces the maximum disk space to be used by the disk cache, in bytes.
-+const char kDiskCacheSize[] = "disk-cache-size";
-+
-+>>>>>>> .their
- }  // namespace switches
- 
- }  // namespace brightray
-added in both
-  our    100644 3af00813830f724d193c923d3d5794be2be793b2 brightray/common/switches.h
-  their  100644 6262f5f962ca204cd3ccc354f7d85662a484902f brightray/common/switches.h
-@@ -17,6 +17,10 @@
- extern const char kDisableHttp2[];
- extern const char kAuthServerWhitelist[];
- extern const char kAuthNegotiateDelegateWhitelist[];
-+<<<<<<< .our
-+=======
-+extern const char kDiskCacheSize[];
-+>>>>>>> .their
- 
- }  // namespace switches
- 
-added in both
-  our    100644 b9e2d96175f8ee2d407db9c49b2e2b74756327de brightray/filenames.gypi
-  their  100644 0d79b5faf74f5e113b69137d6f2ab9986ff79f09 brightray/filenames.gypi
-@@ -51,6 +51,11 @@
-       'browser/net/require_ct_delegate.h',
-       'browser/net_log.cc',
-       'browser/net_log.h',
-+<<<<<<< .our
-+=======
-+      'browser/network_delegate.cc',
-+      'browser/network_delegate.h',
-+>>>>>>> .their
-       'browser/notification_delegate.h',
-       'browser/notification_presenter.cc',
-       'browser/notification_presenter.h',
-@@ -79,6 +84,11 @@
-       'browser/win/win32_notification.h',
-       'browser/win/windows_toast_notification.cc',
-       'browser/win/windows_toast_notification.h',
-+<<<<<<< .our
-+=======
-+      'browser/special_storage_policy.cc',
-+      'browser/special_storage_policy.h',
-+>>>>>>> .their
-       'browser/url_request_context_getter.cc',
-       'browser/url_request_context_getter.h',
-       'browser/views/inspectable_web_contents_view_views.h',
-added in both
-  our    100644 110a1d892892d3e27618574c45ae9c12757eb280 build/asar.gni
-  their  100644 d9298e82d42b072c6b0c0173f913561c80eafd32 build/asar.gni
-@@ -1,5 +1,6 @@
- import("npm.gni")
- 
-+<<<<<<< .our
- # Run an action with a given working directory. Behaves identically to the
- # action() target type, with the exception that it changes directory before
- # running the script.
-@@ -30,11 +31,14 @@
-   }
- }
- 
-+=======
-+>>>>>>> .their
- template("asar") {
-   assert(defined(invoker.sources),
-          "Need sources in $target_name listing the JS files.")
-   assert(defined(invoker.outputs),
-          "Need asar name (as 1-element array, e.g. \$root_out_dir/foo.asar)")
-+<<<<<<< .our
-   assert(defined(invoker.root), "Need asar root directory")
-   asar_root = invoker.root
- 
-@@ -46,5 +50,27 @@
-     script = "//electron/tools/js2asar.py"
-     cwd = rebase_path(get_path_info(".", "abspath"))
-     args = rebase_path(outputs, cwd) + [ asar_root ] + rebase_path(sources, ".")
-+=======
-+  assert(defined(invoker.root),
-+         "Need asar root directory")
-+  asar_root = invoker.root
-+  copy_target_name = target_name + "_inputs"
-+  copy(copy_target_name) {
-+    sources = invoker.sources
-+    outputs = [
-+      "$target_gen_dir/$target_name/{{source_target_relative}}"
-+    ]
-+  }
-+  npm_action(target_name) {
-+    forward_variables_from(invoker, ["deps", "public_deps"])
-+    deps = [":$copy_target_name"]
-+    sources = invoker.sources
-+    script = "asar"
-+    outputs = invoker.outputs
-+    args = [
-+      "pack",
-+      rebase_path("$target_gen_dir/$target_name/$asar_root")
-+    ] + rebase_path(outputs)
-+>>>>>>> .their
-   }
- }
-added in remote
-  their  100644 59a181b1ac668b563384e6d3f40b3693845532b3 build/node/BUILD.gn
-@@ -0,0 +1,113 @@
-+action("configure_node") {
-+  script = "//third_party/electron_node/configure"
-+  args = [
-+    "--enable-static",
-+    "--release-urlbase=https://atom.io/download/electron",
-+    "--shared",
-+    "--shared-openssl",
-+    "--shared-openssl-includes=" + rebase_path("//third_party/boringssl/src/include"),
-+    "--shared-openssl-libname=boringssl",
-+    "--shared-openssl-libpath=" + rebase_path(root_out_dir),
-+    "--without-npm",
-+    "--without-bundled-v8",
-+    "--without-dtrace",
-+    "--without-etw",
-+    "--without-perfctr",
-+    "--without-v8-platform",
-+    "--without-intl",
-+    "--prefix=",
-+    "--config-out-dir=" + rebase_path(target_gen_dir),
-+    "--no-run-gyp",
-+  ]
-+  outputs = [
-+    "$target_gen_dir/config.gypi",
-+  ]
-+}
-+
-+action("gyp_node") {
-+  script = "//tools/gyp/gyp_main.py"
-+  deps = [ ":configure_node" ]
-+  inputs = [
-+    "//third_party/electron_node/common.gypi",
-+    "//third_party/electron_node/node.gyp",
-+    "//third_party/electron_node/node.gypi",
-+    "$target_gen_dir/config.gypi",
-+    "node_override.gypi",
-+  ]
-+  outputs = [
-+    "$target_out_dir/Release/build.ninja",
-+  ]
-+
-+  # TODO(jeremy): should shlib_suffix be set inside node.gypi?
-+  if (is_mac) {
-+    shlib_suffix = "dylib"
-+  } else if (is_linux) {
-+    shlib_suffix = "so"
-+  }
-+  args = [
-+    "-I", rebase_path("$target_gen_dir/config.gypi", root_build_dir),
-+    "-I", rebase_path("node_override.gypi", root_build_dir),
-+    "-I", rebase_path("//third_party/electron_node/common.gypi", root_build_dir),
-+    "-D", "component=shared_library",
-+    "-D", "target_arch=$target_cpu",
-+    "-D", "host_arch=$host_cpu",
-+    "-D", "config_gypi=" + rebase_path("$target_gen_dir/config.gypi"),
-+    "-Goutput_dir=./$target_out_dir", # bizarrely, gyp generates from the build root instead of from cwd
-+    "-fninja",
-+    rebase_path("//third_party/electron_node/node.gyp", root_build_dir),
-+  ]
-+}
-+
-+action("build_node") {
-+  deps = [
-+    "//third_party/boringssl",
-+    "//third_party/icu",
-+    "//v8",
-+    "//v8:v8_libbase",
-+    "//v8:v8_libplatform",
-+    ":gyp_node",
-+  ]
-+  script = "//electron/build/run-ninja.py"
-+  args = [
-+    "-C", rebase_path(target_out_dir, root_build_dir) + "/Release",
-+    "node_lib"
-+  ]
-+  if (is_mac) {
-+    outputs = [ "$target_out_dir/Release/libnode.dylib" ]
-+  }
-+  if (is_linux) {
-+    outputs = [ "$target_out_dir/Release/lib/libnode.so" ]
-+  }
-+}
-+
-+node_libs = get_target_outputs(":build_node")
-+
-+copy("copy_node") {
-+  deps = [ ":build_node" ]
-+  sources = node_libs
-+  outputs = [ "$root_out_dir/{{source_file_part}}" ]
-+}
-+
-+config("node_config") {
-+  include_dirs = [
-+    "//third_party/electron_node/src",
-+    "//third_party/electron_node/deps/uv/include",
-+    "//third_party/electron_node/deps/cares/include",
-+  ]
-+  libs = node_libs
-+  cflags_cc = [
-+    "-Wno-deprecated-declarations",
-+  ]
-+  defines = [
-+    # We need to access internal implementations of Node.
-+    "NODE_WANT_INTERNALS=1",
-+    "NODE_SHARED_MODE",
-+    "HAVE_OPENSSL=1",
-+    "HAVE_INSPECTOR=1",
-+  ]
-+}
-+
-+group("node") {
-+  public_configs = [ ":node_config" ]
-+  public_deps = [ ":copy_node" ]
-+}
-added in remote
-  their  100644 01ff4ff249786f56c7162ab4d0272711e61395a9 build/node/node_override.gypi
-@@ -0,0 +1,41 @@
-+{
-+  'variables': {
-+    # Node disables the inspector unless icu is enabled. But node doesn't know
-+    # that we're building v8 with icu, so force it on.
-+    'v8_enable_inspector': 1,
-+
-+    # By default, node will build a dylib called something like
-+    # libnode.$node_module_version.dylib, which is inconvenient for our
-+    # purposes (since it makes the library's name unpredictable). This forces
-+    # it to drop the module_version from the filename and just produce
-+    # `libnode.dylib`.
-+    'shlib_suffix': 'dylib',
-+  },
-+  'target_defaults': {
-+    'target_conditions': [
-+      ['_target_name=="node_lib"', {
-+        'include_dirs': [
-+          '../../../v8',
-+          '../../../v8/include',
-+          '../../../third_party/icu/source/common',
-+          '../../../third_party/icu/source/i18n',
-+        ],
-+        'libraries': [
-+          '../../../../../../libv8.dylib',
-+          '../../../../../../libv8_libbase.dylib',
-+          '../../../../../../libv8_libplatform.dylib',
-+          '../../../../../../libicuuc.dylib',
-+        ],
-+        'defines': [
-+          # These will no longer be necessary once
-+          # https://github.com/google/boringssl/commit/a02ed04d527e1b57b4efaa0b4f9bdbc1ed5975b2
-+          # is in the past for Electron
-+          'EVP_CIPH_CCM_MODE=0',
-+          'EVP_CIPH_WRAP_MODE=0',
-+          'EVP_CIPHER_CTX_FLAG_WRAP_ALLOW=0',
-+          'EVP_CIPHER_CTX_set_flags(...)',
-+        ],
-+      }],
-+    ],
-+  },
-+}
-added in remote
-  their  100644 802b17d51df17893196e59446fcbf6fb495310e4 build/node/toolchain.gypi
-@@ -0,0 +1,35 @@
-+{
-+  'variables': {
-+    'llvm_dir': '<(chromium_src_dir)/third_party/llvm-build/Release+Asserts',
-+  },
-+  'conditions': [
-+    ['clang==1', {
-+      'make_global_settings': [
-+        ['CC', '<(llvm_dir)/bin/clang'],
-+        ['CXX', '<(llvm_dir)/bin/clang++'],
-+        ['CC.host', '$(CC)'],
-+        ['CXX.host', '$(CXX)'],
-+      ],
-+      'target_defaults': {
-+        'target_conditions': [
-+          ['OS=="linux" and _toolset=="target"', {
-+            'cflags_cc': [
-+              '-std=gnu++14',
-+              '-nostdinc++',
-+              '-isystem<(chromium_src_dir)/buildtools/third_party/libc++/trunk/include',
-+              '-isystem<(chromium_src_dir)/buildtools/third_party/libc++abi/trunk/include',
-+            ],
-+            'ldflags': [
-+              '-nostdlib++',
-+            ],
-+          }],
-+          ['OS=="linux" and _toolset=="host"', {
-+            'cflags_cc': [
-+              '-std=gnu++14',
-+            ],
-+          }],
-+        ],
-+      },
-+    }],  # clang==1
-+  ],
-+}
-added in both
-  our    100644 1a8b6dddefd1d868bb9d2453655223742b227976 chromium_src/chrome/browser/extensions/global_shortcut_listener_win.h
-  their  100644 83e9fdff283fb9e582ed7cd65365ec88cd925530 chromium_src/chrome/browser/extensions/global_shortcut_listener_win.h
-@@ -21,17 +21,30 @@
- class GlobalShortcutListenerWin : public GlobalShortcutListener {
-  public:
-   GlobalShortcutListenerWin();
-+<<<<<<< .our
-   ~GlobalShortcutListenerWin() override;
-+=======
-+  virtual ~GlobalShortcutListenerWin();
-+>>>>>>> .their
- 
-  private:
-   // The implementation of our Window Proc, called by SingletonHwndObserver.
-   void OnWndProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam);
- 
-   // GlobalShortcutListener implementation.
-+<<<<<<< .our
-   void StartListening() override;
-   void StopListening() override;
-   bool RegisterAcceleratorImpl(const ui::Accelerator& accelerator) override;
-   void UnregisterAcceleratorImpl(const ui::Accelerator& accelerator) override;
-+=======
-+  virtual void StartListening() override;
-+  virtual void StopListening() override;
-+  virtual bool RegisterAcceleratorImpl(
-+      const ui::Accelerator& accelerator) override;
-+  virtual void UnregisterAcceleratorImpl(
-+      const ui::Accelerator& accelerator) override;
-+>>>>>>> .their
- 
-   // Whether this object is listening for global shortcuts.
-   bool is_listening_;
-added in remote
-  their  100644 28229a178e6ca1103e5b0fdffc9718a5bd8d79b8 chromium_src/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc
-@@ -0,0 +1,94 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h"
-+
-+#include "build/build_config.h"
-+#include "chrome/browser/renderer_host/pepper/pepper_broker_message_filter.h"
-+#include "chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h"
-+#include "chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.h"
-+#include "chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h"
-+#include "chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h"
-+#include "content/public/browser/browser_ppapi_host.h"
-+#include "ppapi/host/message_filter_host.h"
-+#include "ppapi/host/ppapi_host.h"
-+#include "ppapi/host/resource_host.h"
-+#include "ppapi/proxy/ppapi_messages.h"
-+#include "ppapi/shared_impl/ppapi_permissions.h"
-+
-+using ppapi::host::MessageFilterHost;
-+using ppapi::host::ResourceHost;
-+using ppapi::host::ResourceMessageFilter;
-+
-+namespace chrome {
-+
-+ChromeBrowserPepperHostFactory::ChromeBrowserPepperHostFactory(
-+    content::BrowserPpapiHost* host)
-+    : host_(host) {}
-+
-+ChromeBrowserPepperHostFactory::~ChromeBrowserPepperHostFactory() {}
-+
-+std::unique_ptr<ResourceHost>
-+ChromeBrowserPepperHostFactory::CreateResourceHost(
-+    ppapi::host::PpapiHost* host,
-+    PP_Resource resource,
-+    PP_Instance instance,
-+    const IPC::Message& message) {
-+  DCHECK(host == host_->GetPpapiHost());
-+
-+  // Make sure the plugin is giving us a valid instance for this resource.
-+  if (!host_->IsValidInstance(instance))
-+    return std::unique_ptr<ResourceHost>();
-+
-+  // Private interfaces.
-+  if (host_->GetPpapiHost()->permissions().HasPermission(
-+          ppapi::PERMISSION_PRIVATE)) {
-+    switch (message.type()) {
-+      case PpapiHostMsg_Broker_Create::ID: {
-+        scoped_refptr<ResourceMessageFilter> broker_filter(
-+            new PepperBrokerMessageFilter(instance, host_));
-+        return std::unique_ptr<ResourceHost>(new MessageFilterHost(
-+            host_->GetPpapiHost(), instance, resource, broker_filter));
-+      }
-+    }
-+  }
-+
-+  // Flash interfaces.
-+  if (host_->GetPpapiHost()->permissions().HasPermission(
-+          ppapi::PERMISSION_FLASH)) {
-+    switch (message.type()) {
-+      case PpapiHostMsg_Flash_Create::ID:
-+        return std::unique_ptr<ResourceHost>(
-+            new PepperFlashBrowserHost(host_, instance, resource));
-+      case PpapiHostMsg_FlashClipboard_Create::ID: {
-+        scoped_refptr<ResourceMessageFilter> clipboard_filter(
-+            new PepperFlashClipboardMessageFilter);
-+        return std::unique_ptr<ResourceHost>(new MessageFilterHost(
-+            host_->GetPpapiHost(), instance, resource, clipboard_filter));
-+      }
-+      case PpapiHostMsg_FlashDRM_Create::ID:
-+        return std::unique_ptr<ResourceHost>(
-+            new chrome::PepperFlashDRMHost(host_, instance, resource));
-+    }
-+  }
-+
-+  // Permissions for the following interfaces will be checked at the
-+  // time of the corresponding instance's methods calls (because
-+  // permission check can be performed only on the UI
-+  // thread). Currently these interfaces are available only for
-+  // whitelisted apps which may not have access to the other private
-+  // interfaces.
-+  if (message.type() == PpapiHostMsg_IsolatedFileSystem_Create::ID) {
-+    PepperIsolatedFileSystemMessageFilter* isolated_fs_filter =
-+        PepperIsolatedFileSystemMessageFilter::Create(instance, host_);
-+    if (!isolated_fs_filter)
-+      return std::unique_ptr<ResourceHost>();
-+    return std::unique_ptr<ResourceHost>(
-+        new MessageFilterHost(host, instance, resource, isolated_fs_filter));
-+  }
-+
-+  return std::unique_ptr<ResourceHost>();
-+}
-+
-+}  // namespace chrome
-added in remote
-  their  100644 84385140ceca7e4eb2e16b2a0802714fd0aa392b chromium_src/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h
-@@ -0,0 +1,38 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_BROWSER_RENDERER_HOST_PEPPER_CHROME_BROWSER_PEPPER_HOST_FACTORY_H_
-+#define CHROME_BROWSER_RENDERER_HOST_PEPPER_CHROME_BROWSER_PEPPER_HOST_FACTORY_H_
-+
-+#include "base/macros.h"
-+#include "ppapi/host/host_factory.h"
-+
-+namespace content {
-+class BrowserPpapiHost;
-+}  // namespace content
-+
-+namespace chrome {
-+
-+class ChromeBrowserPepperHostFactory : public ppapi::host::HostFactory {
-+ public:
-+  // Non-owning pointer to the filter must outlive this class.
-+  explicit ChromeBrowserPepperHostFactory(content::BrowserPpapiHost* host);
-+  ~ChromeBrowserPepperHostFactory() override;
-+
-+  std::unique_ptr<ppapi::host::ResourceHost> CreateResourceHost(
-+      ppapi::host::PpapiHost* host,
-+      PP_Resource resource,
-+      PP_Instance instance,
-+      const IPC::Message& message) override;
-+
-+ private:
-+  // Non-owning pointer.
-+  content::BrowserPpapiHost* host_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(ChromeBrowserPepperHostFactory);
-+};
-+
-+}  // namespace chrome
-+
-+#endif  // CHROME_BROWSER_RENDERER_HOST_PEPPER_CHROME_BROWSER_PEPPER_HOST_FACTORY_H_
-added in remote
-  their  100644 cc10ee85780caa46817802f861e38f9ce9af9d61 chromium_src/chrome/browser/renderer_host/pepper/monitor_finder_mac.h
-@@ -0,0 +1,52 @@
-+// Copyright 2014 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_BROWSER_RENDERER_HOST_PEPPER_MONITOR_FINDER_MAC_H_
-+#define CHROME_BROWSER_RENDERER_HOST_PEPPER_MONITOR_FINDER_MAC_H_
-+
-+#include <ApplicationServices/ApplicationServices.h>
-+#include <stdint.h>
-+
-+#include "base/macros.h"
-+#include "base/memory/ref_counted.h"
-+#include "base/synchronization/lock.h"
-+
-+namespace chrome {
-+
-+// MonitorFinder maps a RenderFrameHost to the display ID on which the widget
-+// is painting. This class operates on the IO thread while the RenderFrameHost
-+// is on the UI thread, so the value returned by GetMonitor() may be 0 until
-+// the information can be retrieved asynchronously.
-+class MonitorFinder : public base::RefCountedThreadSafe<MonitorFinder> {
-+ public:
-+  MonitorFinder(int process_id, int render_frame_id);
-+
-+  // Gets the native display ID for the <process_id, render_frame_id> tuple.
-+  int64_t GetMonitor();
-+
-+  // Checks if the given |monitor_id| represents a built-in display.
-+  static bool IsMonitorBuiltIn(int64_t monitor_id);
-+
-+ private:
-+  friend class base::RefCountedThreadSafe<MonitorFinder>;
-+  ~MonitorFinder();
-+
-+  // Method run on the UI thread to get the display information.
-+  void FetchMonitorFromWidget();
-+
-+  const int process_id_;
-+  const int render_frame_id_;
-+
-+  base::Lock mutex_;  // Protects the two members below.
-+  // Whether one request to FetchMonitorFromWidget() has been made already.
-+  bool request_sent_;
-+  // The native display ID for the RenderFrameHost.
-+  CGDirectDisplayID display_id_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(MonitorFinder);
-+};
-+
-+}  // namespace chrome
-+
-+#endif  // CHROME_BROWSER_RENDERER_HOST_PEPPER_MONITOR_FINDER_H_
-added in remote
-  their  100644 e6e0a62fa67edabae605c17ae87a38df083f70cc chromium_src/chrome/browser/renderer_host/pepper/monitor_finder_mac.mm
-@@ -0,0 +1,61 @@
-+// Copyright 2014 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/browser/renderer_host/pepper/monitor_finder_mac.h"
-+
-+#import <Cocoa/Cocoa.h>
-+
-+#include "content/public/browser/browser_thread.h"
-+#include "content/public/browser/render_frame_host.h"
-+
-+namespace chrome {
-+
-+MonitorFinder::MonitorFinder(int process_id, int render_frame_id)
-+    : process_id_(process_id),
-+      render_frame_id_(render_frame_id),
-+      request_sent_(false),
-+      display_id_(kCGNullDirectDisplay) {}
-+
-+MonitorFinder::~MonitorFinder() {}
-+
-+int64_t MonitorFinder::GetMonitor() {
-+  {
-+    // The plugin may call this method several times, so avoid spamming the UI
-+    // thread with requests by only allowing one outstanding request at a time.
-+    base::AutoLock lock(mutex_);
-+    if (request_sent_)
-+      return display_id_;
-+    request_sent_ = true;
-+  }
-+
-+  content::BrowserThread::PostTask(
-+      content::BrowserThread::UI, FROM_HERE,
-+      base::Bind(&MonitorFinder::FetchMonitorFromWidget, this));
-+  return display_id_;
-+}
-+
-+// static
-+bool MonitorFinder::IsMonitorBuiltIn(int64_t display_id) {
-+  return CGDisplayIsBuiltin(display_id);
-+}
-+
-+void MonitorFinder::FetchMonitorFromWidget() {
-+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-+  content::RenderFrameHost* rfh =
-+      content::RenderFrameHost::FromID(process_id_, render_frame_id_);
-+  if (!rfh)
-+    return;
-+
-+  gfx::NativeView native_view = rfh->GetNativeView();
-+  NSWindow* window = [native_view window];
-+  NSScreen* screen = [window screen];
-+  CGDirectDisplayID display_id =
-+      [[[screen deviceDescription] objectForKey:@"NSScreenNumber"] intValue];
-+
-+  base::AutoLock lock(mutex_);
-+  request_sent_ = false;
-+  display_id_ = display_id;
-+}
-+
-+}  // namespace chrome
-added in remote
-  their  100644 d40ad53dd17d24a24f00b5c669d6e113760a1c0a chromium_src/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc
-@@ -0,0 +1,53 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/browser/renderer_host/pepper/pepper_broker_message_filter.h"
-+
-+#include <string>
-+
-+#include "content/public/browser/browser_ppapi_host.h"
-+#include "content/public/browser/browser_thread.h"
-+#include "content/public/browser/render_process_host.h"
-+#include "ipc/ipc_message_macros.h"
-+#include "ppapi/c/pp_errors.h"
-+#include "ppapi/host/dispatch_host_message.h"
-+#include "ppapi/proxy/ppapi_messages.h"
-+#include "url/gurl.h"
-+
-+using content::BrowserPpapiHost;
-+using content::BrowserThread;
-+
-+namespace chrome {
-+
-+PepperBrokerMessageFilter::PepperBrokerMessageFilter(PP_Instance instance,
-+                                                     BrowserPpapiHost* host)
-+    : document_url_(host->GetDocumentURLForInstance(instance)) {
-+  int unused;
-+  host->GetRenderFrameIDsForInstance(instance, &render_process_id_, &unused);
-+}
-+
-+PepperBrokerMessageFilter::~PepperBrokerMessageFilter() {}
-+
-+scoped_refptr<base::TaskRunner>
-+PepperBrokerMessageFilter::OverrideTaskRunnerForMessage(
-+    const IPC::Message& message) {
-+  return BrowserThread::GetTaskRunnerForThread(BrowserThread::UI);
-+}
-+
-+int32_t PepperBrokerMessageFilter::OnResourceMessageReceived(
-+    const IPC::Message& msg,
-+    ppapi::host::HostMessageContext* context) {
-+  PPAPI_BEGIN_MESSAGE_MAP(PepperBrokerMessageFilter, msg)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL_0(PpapiHostMsg_Broker_IsAllowed,
-+                                        OnIsAllowed)
-+  PPAPI_END_MESSAGE_MAP()
-+  return PP_ERROR_FAILED;
-+}
-+
-+int32_t PepperBrokerMessageFilter::OnIsAllowed(
-+    ppapi::host::HostMessageContext* context) {
-+  return PP_OK;
-+}
-+
-+}  // namespace chrome
-added in remote
-  their  100644 2aad5593b26a1eab56841e56fc56acf1d5cba28b chromium_src/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.h
-@@ -0,0 +1,51 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_BROKER_MESSAGE_FILTER_H_
-+#define CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_BROKER_MESSAGE_FILTER_H_
-+
-+#include "base/compiler_specific.h"
-+#include "ppapi/c/pp_instance.h"
-+#include "ppapi/host/resource_message_filter.h"
-+#include "url/gurl.h"
-+
-+namespace content {
-+class BrowserPpapiHost;
-+}
-+
-+namespace ppapi {
-+namespace host {
-+struct HostMessageContext;
-+}
-+}  // namespace ppapi
-+
-+namespace chrome {
-+
-+// This filter handles messages for the PepperBrokerHost on the UI thread.
-+class PepperBrokerMessageFilter : public ppapi::host::ResourceMessageFilter {
-+ public:
-+  PepperBrokerMessageFilter(PP_Instance instance,
-+                            content::BrowserPpapiHost* host);
-+
-+ private:
-+  ~PepperBrokerMessageFilter() override;
-+
-+  // ppapi::host::ResourceMessageFilter overrides.
-+  scoped_refptr<base::TaskRunner> OverrideTaskRunnerForMessage(
-+      const IPC::Message& message) override;
-+  int32_t OnResourceMessageReceived(
-+      const IPC::Message& msg,
-+      ppapi::host::HostMessageContext* context) override;
-+
-+  int32_t OnIsAllowed(ppapi::host::HostMessageContext* context);
-+
-+  int render_process_id_;
-+  GURL document_url_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(PepperBrokerMessageFilter);
-+};
-+
-+}  // namespace chrome
-+
-+#endif  // CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_BROKER_MESSAGE_FILTER_H_
-added in remote
-  their  100644 901da1ad6e221b55196a1b25a1549fa272b4fdf7 chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc
-@@ -0,0 +1,111 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h"
-+
-+#include "base/time/time.h"
-+#include "content/public/browser/browser_context.h"
-+#include "content/public/browser/browser_ppapi_host.h"
-+#include "content/public/browser/browser_thread.h"
-+#include "content/public/browser/render_process_host.h"
-+#include "ipc/ipc_message_macros.h"
-+#include "ppapi/c/pp_errors.h"
-+#include "ppapi/c/private/ppb_flash.h"
-+#include "ppapi/host/dispatch_host_message.h"
-+#include "ppapi/proxy/ppapi_messages.h"
-+#include "ppapi/proxy/resource_message_params.h"
-+#include "ppapi/shared_impl/time_conversion.h"
-+#include "url/gurl.h"
-+
-+#if defined(OS_WIN)
-+#include <windows.h>
-+#elif defined(OS_MACOSX)
-+#include <CoreServices/CoreServices.h>
-+#endif
-+
-+using content::BrowserPpapiHost;
-+using content::BrowserThread;
-+
-+namespace chrome {
-+
-+PepperFlashBrowserHost::PepperFlashBrowserHost(BrowserPpapiHost* host,
-+                                               PP_Instance instance,
-+                                               PP_Resource resource)
-+    : ResourceHost(host->GetPpapiHost(), instance, resource),
-+      host_(host),
-+      weak_factory_(this) {
-+  int unused;
-+  host->GetRenderFrameIDsForInstance(instance, &render_process_id_, &unused);
-+}
-+
-+PepperFlashBrowserHost::~PepperFlashBrowserHost() {}
-+
-+int32_t PepperFlashBrowserHost::OnResourceMessageReceived(
-+    const IPC::Message& msg,
-+    ppapi::host::HostMessageContext* context) {
-+  PPAPI_BEGIN_MESSAGE_MAP(PepperFlashBrowserHost, msg)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL_0(PpapiHostMsg_Flash_UpdateActivity,
-+                                        OnUpdateActivity)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_Flash_GetLocalTimeZoneOffset,
-+                                      OnGetLocalTimeZoneOffset)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL_0(
-+        PpapiHostMsg_Flash_GetLocalDataRestrictions, OnGetLocalDataRestrictions)
-+  PPAPI_END_MESSAGE_MAP()
-+  return PP_ERROR_FAILED;
-+}
-+
-+int32_t PepperFlashBrowserHost::OnUpdateActivity(
-+    ppapi::host::HostMessageContext* host_context) {
-+#if defined(OS_WIN)
-+  // Reading then writing back the same value to the screensaver timeout system
-+  // setting resets the countdown which prevents the screensaver from turning
-+  // on "for a while". As long as the plugin pings us with this message faster
-+  // than the screensaver timeout, it won't go on.
-+  int value = 0;
-+  if (SystemParametersInfo(SPI_GETSCREENSAVETIMEOUT, 0, &value, 0))
-+    SystemParametersInfo(SPI_SETSCREENSAVETIMEOUT, value, NULL, 0);
-+#elif defined(OS_MACOSX)
-+// UpdateSystemActivity(OverallAct);
-+#else
-+// TODO(brettw) implement this for other platforms.
-+#endif
-+  return PP_OK;
-+}
-+
-+int32_t PepperFlashBrowserHost::OnGetLocalTimeZoneOffset(
-+    ppapi::host::HostMessageContext* host_context,
-+    const base::Time& t) {
-+  // The reason for this processing being in the browser process is that on
-+  // Linux, the localtime calls require filesystem access prohibited by the
-+  // sandbox.
-+  host_context->reply_msg = PpapiPluginMsg_Flash_GetLocalTimeZoneOffsetReply(
-+      ppapi::PPGetLocalTimeZoneOffset(t));
-+  return PP_OK;
-+}
-+
-+int32_t PepperFlashBrowserHost::OnGetLocalDataRestrictions(
-+    ppapi::host::HostMessageContext* context) {
-+  // Getting the Flash LSO settings requires using the CookieSettings which
-+  // belong to the profile which lives on the UI thread. We lazily initialize
-+  // |cookie_settings_| by grabbing the reference from the UI thread and then
-+  // call |GetLocalDataRestrictions| with it.
-+  GURL document_url = host_->GetDocumentURLForInstance(pp_instance());
-+  GURL plugin_url = host_->GetPluginURLForInstance(pp_instance());
-+  GetLocalDataRestrictions(context->MakeReplyMessageContext(), document_url,
-+                           plugin_url);
-+  return PP_OK_COMPLETIONPENDING;
-+}
-+
-+void PepperFlashBrowserHost::GetLocalDataRestrictions(
-+    ppapi::host::ReplyMessageContext reply_context,
-+    const GURL& document_url,
-+    const GURL& plugin_url) {
-+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-+
-+  PP_FlashLSORestrictions restrictions = PP_FLASHLSORESTRICTIONS_NONE;
-+  SendReply(reply_context, PpapiPluginMsg_Flash_GetLocalDataRestrictionsReply(
-+                               static_cast<int32_t>(restrictions)));
-+}
-+
-+}  // namespace chrome
-added in remote
-  their  100644 65e0d02c001c6086d78d09154a515d031293227d chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h
-@@ -0,0 +1,59 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_FLASH_BROWSER_HOST_H_
-+#define CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_FLASH_BROWSER_HOST_H_
-+
-+#include "base/memory/ref_counted.h"
-+#include "base/memory/weak_ptr.h"
-+#include "ppapi/host/host_message_context.h"
-+#include "ppapi/host/resource_host.h"
-+
-+namespace base {
-+class Time;
-+}
-+
-+namespace content {
-+class BrowserPpapiHost;
-+class ResourceContext;
-+}  // namespace content
-+
-+class GURL;
-+
-+namespace chrome {
-+
-+class PepperFlashBrowserHost : public ppapi::host::ResourceHost {
-+ public:
-+  PepperFlashBrowserHost(content::BrowserPpapiHost* host,
-+                         PP_Instance instance,
-+                         PP_Resource resource);
-+  ~PepperFlashBrowserHost() override;
-+
-+  // ppapi::host::ResourceHost override.
-+  int32_t OnResourceMessageReceived(
-+      const IPC::Message& msg,
-+      ppapi::host::HostMessageContext* context) override;
-+
-+ private:
-+  int32_t OnUpdateActivity(ppapi::host::HostMessageContext* host_context);
-+  int32_t OnGetLocalTimeZoneOffset(
-+      ppapi::host::HostMessageContext* host_context,
-+      const base::Time& t);
-+  int32_t OnGetLocalDataRestrictions(ppapi::host::HostMessageContext* context);
-+
-+  void GetLocalDataRestrictions(ppapi::host::ReplyMessageContext reply_context,
-+                                const GURL& document_url,
-+                                const GURL& plugin_url);
-+
-+  content::BrowserPpapiHost* host_;
-+  int render_process_id_;
-+  // For fetching the Flash LSO settings.
-+  base::WeakPtrFactory<PepperFlashBrowserHost> weak_factory_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(PepperFlashBrowserHost);
-+};
-+
-+}  // namespace chrome
-+
-+#endif  // CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_FLASH_BROWSER_HOST_H_
-added in remote
-  their  100644 c62d2d98621d6f8cc651501111af81f7a5ade2c0 chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc
-@@ -0,0 +1,372 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.h"
-+
-+#include <stddef.h>
-+
-+#include "base/pickle.h"
-+#include "base/strings/utf_string_conversions.h"
-+#include "content/public/browser/browser_thread.h"
-+#include "ipc/ipc_message.h"
-+#include "ipc/ipc_message_macros.h"
-+#include "ppapi/c/pp_errors.h"
-+#include "ppapi/c/private/ppb_flash_clipboard.h"
-+#include "ppapi/host/dispatch_host_message.h"
-+#include "ppapi/host/host_message_context.h"
-+#include "ppapi/host/ppapi_host.h"
-+#include "ppapi/proxy/ppapi_messages.h"
-+#include "ppapi/proxy/resource_message_params.h"
-+#include "ui/base/clipboard/scoped_clipboard_writer.h"
-+
-+using content::BrowserThread;
-+
-+namespace chrome {
-+
-+namespace {
-+
-+const size_t kMaxClipboardWriteSize = 1000000;
-+
-+ui::ClipboardType ConvertClipboardType(uint32_t type) {
-+  switch (type) {
-+    case PP_FLASH_CLIPBOARD_TYPE_STANDARD:
-+      return ui::CLIPBOARD_TYPE_COPY_PASTE;
-+    case PP_FLASH_CLIPBOARD_TYPE_SELECTION:
-+      return ui::CLIPBOARD_TYPE_SELECTION;
-+  }
-+  NOTREACHED();
-+  return ui::CLIPBOARD_TYPE_COPY_PASTE;
-+}
-+
-+// Functions to pack/unpack custom data from a pickle. See the header file for
-+// more detail on custom formats in Pepper.
-+// TODO(raymes): Currently pepper custom formats are stored in their own
-+// native format type. However we should be able to store them in the same way
-+// as "Web Custom" formats are. This would allow clipboard data to be shared
-+// between pepper applications and web applications. However currently web apps
-+// assume all data that is placed on the clipboard is UTF16 and pepper allows
-+// arbitrary data so this change would require some reworking of the chrome
-+// clipboard interface for custom data.
-+bool JumpToFormatInPickle(const base::string16& format,
-+                          base::PickleIterator* iter) {
-+  uint32_t size = 0;
-+  if (!iter->ReadUInt32(&size))
-+    return false;
-+  for (uint32_t i = 0; i < size; ++i) {
-+    base::string16 stored_format;
-+    if (!iter->ReadString16(&stored_format))
-+      return false;
-+    if (stored_format == format)
-+      return true;
-+    int skip_length;
-+    if (!iter->ReadLength(&skip_length))
-+      return false;
-+    if (!iter->SkipBytes(skip_length))
-+      return false;
-+  }
-+  return false;
-+}
-+
-+bool IsFormatAvailableInPickle(const base::string16& format,
-+                               const base::Pickle& pickle) {
-+  base::PickleIterator iter(pickle);
-+  return JumpToFormatInPickle(format, &iter);
-+}
-+
-+std::string ReadDataFromPickle(const base::string16& format,
-+                               const base::Pickle& pickle) {
-+  std::string result;
-+  base::PickleIterator iter(pickle);
-+  if (!JumpToFormatInPickle(format, &iter) || !iter.ReadString(&result))
-+    return std::string();
-+  return result;
-+}
-+
-+void WriteDataToPickle(const std::map<base::string16, std::string>& data,
-+                       base::Pickle* pickle) {
-+  pickle->WriteUInt32(data.size());
-+  for (std::map<base::string16, std::string>::const_iterator it = data.begin();
-+       it != data.end(); ++it) {
-+    pickle->WriteString16(it->first);
-+    pickle->WriteString(it->second);
-+  }
-+}
-+
-+}  // namespace
-+
-+PepperFlashClipboardMessageFilter::PepperFlashClipboardMessageFilter() {}
-+
-+PepperFlashClipboardMessageFilter::~PepperFlashClipboardMessageFilter() {}
-+
-+scoped_refptr<base::TaskRunner>
-+PepperFlashClipboardMessageFilter::OverrideTaskRunnerForMessage(
-+    const IPC::Message& msg) {
-+  // Clipboard writes should always occur on the UI thread due to the
-+  // restrictions of various platform APIs. In general, the clipboard is not
-+  // thread-safe, so all clipboard calls should be serviced from the UI thread.
-+  if (msg.type() == PpapiHostMsg_FlashClipboard_WriteData::ID)
-+    return BrowserThread::GetTaskRunnerForThread(BrowserThread::UI);
-+
-+// Windows needs clipboard reads to be serviced from the IO thread because
-+// these are sync IPCs which can result in deadlocks with plugins if serviced
-+// from the UI thread. Note that Windows clipboard calls ARE thread-safe so it
-+// is ok for reads and writes to be serviced from different threads.
-+#if !defined(OS_WIN)
-+  return BrowserThread::GetTaskRunnerForThread(BrowserThread::UI);
-+#else
-+  return BrowserThread::GetTaskRunnerForThread(BrowserThread::IO);
-+#endif
-+}
-+
-+int32_t PepperFlashClipboardMessageFilter::OnResourceMessageReceived(
-+    const IPC::Message& msg,
-+    ppapi::host::HostMessageContext* context) {
-+  PPAPI_BEGIN_MESSAGE_MAP(PepperFlashClipboardMessageFilter, msg)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(
-+        PpapiHostMsg_FlashClipboard_RegisterCustomFormat,
-+        OnMsgRegisterCustomFormat)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(
-+        PpapiHostMsg_FlashClipboard_IsFormatAvailable, OnMsgIsFormatAvailable)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_FlashClipboard_ReadData,
-+                                      OnMsgReadData)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_FlashClipboard_WriteData,
-+                                      OnMsgWriteData)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(
-+        PpapiHostMsg_FlashClipboard_GetSequenceNumber, OnMsgGetSequenceNumber)
-+  PPAPI_END_MESSAGE_MAP()
-+  return PP_ERROR_FAILED;
-+}
-+
-+int32_t PepperFlashClipboardMessageFilter::OnMsgRegisterCustomFormat(
-+    ppapi::host::HostMessageContext* host_context,
-+    const std::string& format_name) {
-+  uint32_t format = custom_formats_.RegisterFormat(format_name);
-+  if (format == PP_FLASH_CLIPBOARD_FORMAT_INVALID)
-+    return PP_ERROR_FAILED;
-+  host_context->reply_msg =
-+      PpapiPluginMsg_FlashClipboard_RegisterCustomFormatReply(format);
-+  return PP_OK;
-+}
-+
-+int32_t PepperFlashClipboardMessageFilter::OnMsgIsFormatAvailable(
-+    ppapi::host::HostMessageContext* host_context,
-+    uint32_t clipboard_type,
-+    uint32_t format) {
-+  if (clipboard_type != PP_FLASH_CLIPBOARD_TYPE_STANDARD) {
-+    NOTIMPLEMENTED();
-+    return PP_ERROR_FAILED;
-+  }
-+
-+  ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
-+  ui::ClipboardType type = ConvertClipboardType(clipboard_type);
-+  bool available = false;
-+  switch (format) {
-+    case PP_FLASH_CLIPBOARD_FORMAT_PLAINTEXT: {
-+      bool plain = clipboard->IsFormatAvailable(
-+          ui::Clipboard::GetPlainTextFormatType(), type);
-+      bool plainw = clipboard->IsFormatAvailable(
-+          ui::Clipboard::GetPlainTextWFormatType(), type);
-+      available = plain || plainw;
-+      break;
-+    }
-+    case PP_FLASH_CLIPBOARD_FORMAT_HTML:
-+      available = clipboard->IsFormatAvailable(
-+          ui::Clipboard::GetHtmlFormatType(), type);
-+      break;
-+    case PP_FLASH_CLIPBOARD_FORMAT_RTF:
-+      available =
-+          clipboard->IsFormatAvailable(ui::Clipboard::GetRtfFormatType(), type);
-+      break;
-+    case PP_FLASH_CLIPBOARD_FORMAT_INVALID:
-+      break;
-+    default:
-+      if (custom_formats_.IsFormatRegistered(format)) {
-+        std::string format_name = custom_formats_.GetFormatName(format);
-+        std::string clipboard_data;
-+        clipboard->ReadData(ui::Clipboard::GetPepperCustomDataFormatType(),
-+                            &clipboard_data);
-+        base::Pickle pickle(clipboard_data.data(), clipboard_data.size());
-+        available =
-+            IsFormatAvailableInPickle(base::UTF8ToUTF16(format_name), pickle);
-+      }
-+      break;
-+  }
-+
-+  return available ? PP_OK : PP_ERROR_FAILED;
-+}
-+
-+int32_t PepperFlashClipboardMessageFilter::OnMsgReadData(
-+    ppapi::host::HostMessageContext* host_context,
-+    uint32_t clipboard_type,
-+    uint32_t format) {
-+  if (clipboard_type != PP_FLASH_CLIPBOARD_TYPE_STANDARD) {
-+    NOTIMPLEMENTED();
-+    return PP_ERROR_FAILED;
-+  }
-+
-+  ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
-+  ui::ClipboardType type = ConvertClipboardType(clipboard_type);
-+  std::string clipboard_string;
-+  int32_t result = PP_ERROR_FAILED;
-+  switch (format) {
-+    case PP_FLASH_CLIPBOARD_FORMAT_PLAINTEXT: {
-+      if (clipboard->IsFormatAvailable(ui::Clipboard::GetPlainTextWFormatType(),
-+                                       type)) {
-+        base::string16 text;
-+        clipboard->ReadText(type, &text);
-+        if (!text.empty()) {
-+          result = PP_OK;
-+          clipboard_string = base::UTF16ToUTF8(text);
-+          break;
-+        }
-+      }
-+      // If the PlainTextW format isn't available or is empty, take the
-+      // ASCII text format.
-+      if (clipboard->IsFormatAvailable(ui::Clipboard::GetPlainTextFormatType(),
-+                                       type)) {
-+        result = PP_OK;
-+        clipboard->ReadAsciiText(type, &clipboard_string);
-+      }
-+      break;
-+    }
-+    case PP_FLASH_CLIPBOARD_FORMAT_HTML: {
-+      if (!clipboard->IsFormatAvailable(ui::Clipboard::GetHtmlFormatType(),
-+                                        type)) {
-+        break;
-+      }
-+
-+      base::string16 html;
-+      std::string url;
-+      uint32_t fragment_start;
-+      uint32_t fragment_end;
-+      clipboard->ReadHTML(type, &html, &url, &fragment_start, &fragment_end);
-+      result = PP_OK;
-+      clipboard_string = base::UTF16ToUTF8(
-+          html.substr(fragment_start, fragment_end - fragment_start));
-+      break;
-+    }
-+    case PP_FLASH_CLIPBOARD_FORMAT_RTF: {
-+      if (!clipboard->IsFormatAvailable(ui::Clipboard::GetRtfFormatType(),
-+                                        type)) {
-+        break;
-+      }
-+      result = PP_OK;
-+      clipboard->ReadRTF(type, &clipboard_string);
-+      break;
-+    }
-+    case PP_FLASH_CLIPBOARD_FORMAT_INVALID:
-+      break;
-+    default: {
-+      if (custom_formats_.IsFormatRegistered(format)) {
-+        base::string16 format_name =
-+            base::UTF8ToUTF16(custom_formats_.GetFormatName(format));
-+        std::string clipboard_data;
-+        clipboard->ReadData(ui::Clipboard::GetPepperCustomDataFormatType(),
-+                            &clipboard_data);
-+        base::Pickle pickle(clipboard_data.data(), clipboard_data.size());
-+        if (IsFormatAvailableInPickle(format_name, pickle)) {
-+          result = PP_OK;
-+          clipboard_string = ReadDataFromPickle(format_name, pickle);
-+        }
-+      }
-+      break;
-+    }
-+  }
-+
-+  if (result == PP_OK) {
-+    host_context->reply_msg =
-+        PpapiPluginMsg_FlashClipboard_ReadDataReply(clipboard_string);
-+  }
-+  return result;
-+}
-+
-+int32_t PepperFlashClipboardMessageFilter::OnMsgWriteData(
-+    ppapi::host::HostMessageContext* host_context,
-+    uint32_t clipboard_type,
-+    const std::vector<uint32_t>& formats,
-+    const std::vector<std::string>& data) {
-+  if (clipboard_type != PP_FLASH_CLIPBOARD_TYPE_STANDARD) {
-+    NOTIMPLEMENTED();
-+    return PP_ERROR_FAILED;
-+  }
-+  if (formats.size() != data.size())
-+    return PP_ERROR_FAILED;
-+
-+  ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
-+  ui::ClipboardType type = ConvertClipboardType(clipboard_type);
-+  // If no formats are passed in clear the clipboard.
-+  if (formats.size() == 0) {
-+    clipboard->Clear(type);
-+    return PP_OK;
-+  }
-+
-+  ui::ScopedClipboardWriter scw(type);
-+  std::map<base::string16, std::string> custom_data_map;
-+  int32_t res = PP_OK;
-+  for (uint32_t i = 0; i < formats.size(); ++i) {
-+    if (data[i].length() > kMaxClipboardWriteSize) {
-+      res = PP_ERROR_NOSPACE;
-+      break;
-+    }
-+
-+    switch (formats[i]) {
-+      case PP_FLASH_CLIPBOARD_FORMAT_PLAINTEXT:
-+        scw.WriteText(base::UTF8ToUTF16(data[i]));
-+        break;
-+      case PP_FLASH_CLIPBOARD_FORMAT_HTML:
-+        scw.WriteHTML(base::UTF8ToUTF16(data[i]), std::string());
-+        break;
-+      case PP_FLASH_CLIPBOARD_FORMAT_RTF:
-+        scw.WriteRTF(data[i]);
-+        break;
-+      case PP_FLASH_CLIPBOARD_FORMAT_INVALID:
-+        res = PP_ERROR_BADARGUMENT;
-+        break;
-+      default:
-+        if (custom_formats_.IsFormatRegistered(formats[i])) {
-+          std::string format_name = custom_formats_.GetFormatName(formats[i]);
-+          custom_data_map[base::UTF8ToUTF16(format_name)] = data[i];
-+        } else {
-+          // Invalid format.
-+          res = PP_ERROR_BADARGUMENT;
-+          break;
-+        }
-+    }
-+
-+    if (res != PP_OK)
-+      break;
-+  }
-+
-+  if (custom_data_map.size() > 0) {
-+    base::Pickle pickle;
-+    WriteDataToPickle(custom_data_map, &pickle);
-+    scw.WritePickledData(pickle,
-+                         ui::Clipboard::GetPepperCustomDataFormatType());
-+  }
-+
-+  if (res != PP_OK) {
-+    // Need to clear the objects so nothing is written.
-+    scw.Reset();
-+  }
-+
-+  return res;
-+}
-+
-+int32_t PepperFlashClipboardMessageFilter::OnMsgGetSequenceNumber(
-+    ppapi::host::HostMessageContext* host_context,
-+    uint32_t clipboard_type) {
-+  if (clipboard_type != PP_FLASH_CLIPBOARD_TYPE_STANDARD) {
-+    NOTIMPLEMENTED();
-+    return PP_ERROR_FAILED;
-+  }
-+
-+  ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
-+  ui::ClipboardType type = ConvertClipboardType(clipboard_type);
-+  int64_t sequence_number = clipboard->GetSequenceNumber(type);
-+  host_context->reply_msg =
-+      PpapiPluginMsg_FlashClipboard_GetSequenceNumberReply(sequence_number);
-+  return PP_OK;
-+}
-+
-+}  // namespace chrome
-added in remote
-  their  100644 b282d54df28cbb43b5a1b49c6272b504565cde2b chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.h
-@@ -0,0 +1,76 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_FLASH_CLIPBOARD_MESSAGE_FILTER_H_
-+#define CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_FLASH_CLIPBOARD_MESSAGE_FILTER_H_
-+
-+#include <string>
-+#include <vector>
-+
-+#include "ppapi/host/resource_message_filter.h"
-+#include "ppapi/shared_impl/flash_clipboard_format_registry.h"
-+
-+namespace ppapi {
-+namespace host {
-+struct HostMessageContext;
-+}
-+}  // namespace ppapi
-+
-+namespace ui {
-+class ScopedClipboardWriter;
-+}
-+
-+namespace chrome {
-+
-+// Resource message filter for accessing the clipboard in Pepper. Pepper
-+// supports reading/writing custom formats from the clipboard. Currently, all
-+// custom formats that are read/written from the clipboard through pepper are
-+// stored in a single real clipboard format (in the same way the "web custom"
-+// clipboard formats are). This is done so that we don't have to have use real
-+// clipboard types for each custom clipboard format which may be a limited
-+// resource on a particular platform.
-+class PepperFlashClipboardMessageFilter
-+    : public ppapi::host::ResourceMessageFilter {
-+ public:
-+  PepperFlashClipboardMessageFilter();
-+
-+ protected:
-+  // ppapi::host::ResourceMessageFilter overrides.
-+  scoped_refptr<base::TaskRunner> OverrideTaskRunnerForMessage(
-+      const IPC::Message& msg) override;
-+  int32_t OnResourceMessageReceived(
-+      const IPC::Message& msg,
-+      ppapi::host::HostMessageContext* context) override;
-+
-+ private:
-+  ~PepperFlashClipboardMessageFilter() override;
-+
-+  int32_t OnMsgRegisterCustomFormat(
-+      ppapi::host::HostMessageContext* host_context,
-+      const std::string& format_name);
-+  int32_t OnMsgIsFormatAvailable(ppapi::host::HostMessageContext* host_context,
-+                                 uint32_t clipboard_type,
-+                                 uint32_t format);
-+  int32_t OnMsgReadData(ppapi::host::HostMessageContext* host_context,
-+                        uint32_t clipoard_type,
-+                        uint32_t format);
-+  int32_t OnMsgWriteData(ppapi::host::HostMessageContext* host_context,
-+                         uint32_t clipboard_type,
-+                         const std::vector<uint32_t>& formats,
-+                         const std::vector<std::string>& data);
-+  int32_t OnMsgGetSequenceNumber(ppapi::host::HostMessageContext* host_context,
-+                                 uint32_t clipboard_type);
-+
-+  int32_t WriteClipboardDataItem(uint32_t format,
-+                                 const std::string& data,
-+                                 ui::ScopedClipboardWriter* scw);
-+
-+  ppapi::FlashClipboardFormatRegistry custom_formats_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(PepperFlashClipboardMessageFilter);
-+};
-+
-+}  // namespace chrome
-+
-+#endif  // CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_FLASH_CLIPBOARD_MESSAGE_FILTER_H_
-added in remote
-  their  100644 06b0b583a6441819cb6486e99a3aa77c4ed906db chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc
-@@ -0,0 +1,216 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h"
-+
-+#include <cmath>
-+
-+#if defined(OS_WIN)
-+#include <Windows.h>
-+#endif
-+
-+#include "base/bind.h"
-+#include "base/compiler_specific.h"
-+#include "base/logging.h"
-+#include "base/memory/ref_counted.h"
-+#include "base/strings/string_number_conversions.h"
-+#include "build/build_config.h"
-+#include "content/public/browser/browser_ppapi_host.h"
-+#include "content/public/browser/browser_thread.h"
-+#include "content/public/browser/child_process_security_policy.h"
-+#include "content/public/browser/render_frame_host.h"
-+#include "content/public/common/pepper_plugin_info.h"
-+#include "net/base/network_interfaces.h"
-+#include "ppapi/c/pp_errors.h"
-+#include "ppapi/host/dispatch_host_message.h"
-+#include "ppapi/host/host_message_context.h"
-+#include "ppapi/host/ppapi_host.h"
-+#include "ppapi/proxy/ppapi_messages.h"
-+
-+#if defined(USE_AURA)
-+#include "ui/aura/window.h"
-+#include "ui/aura/window_tree_host.h"
-+#endif
-+
-+#if defined(OS_MACOSX)
-+#include "chrome/browser/renderer_host/pepper/monitor_finder_mac.h"
-+#endif
-+
-+using content::BrowserPpapiHost;
-+
-+namespace chrome {
-+
-+namespace {
-+
-+const char kVoucherFilename[] = "plugin.vch";
-+
-+#if defined(OS_WIN)
-+bool GetSystemVolumeSerialNumber(std::string* number) {
-+  // Find the system root path (e.g: C:\).
-+  wchar_t system_path[MAX_PATH + 1];
-+  if (!GetSystemDirectoryW(system_path, MAX_PATH))
-+    return false;
-+
-+  wchar_t* first_slash = wcspbrk(system_path, L"\\/");
-+  if (first_slash != NULL)
-+    *(first_slash + 1) = 0;
-+
-+  DWORD number_local = 0;
-+  if (!GetVolumeInformationW(system_path, NULL, 0, &number_local, NULL, NULL,
-+                             NULL, 0))
-+    return false;
-+
-+  *number = base::IntToString(std::abs(static_cast<int>(number_local)));
-+  return true;
-+}
-+#endif
-+
-+}  // namespace
-+
-+#if defined(OS_WIN)
-+// Helper class to get the UI thread which monitor is showing the
-+// window associated with the instance's render view. Since we get
-+// called by the IO thread and we cannot block, the first answer is
-+// of GetMonitor() may be NULL, but eventually it will contain the
-+// right monitor.
-+class MonitorFinder : public base::RefCountedThreadSafe<MonitorFinder> {
-+ public:
-+  MonitorFinder(int process_id, int render_frame_id)
-+      : process_id_(process_id),
-+        render_frame_id_(render_frame_id),
-+        monitor_(NULL),
-+        request_sent_(0) {}
-+
-+  int64_t GetMonitor() {
-+    // We use |request_sent_| as an atomic boolean so that we
-+    // never have more than one task posted at a given time. We
-+    // do this because we don't know how often our client is going
-+    // to call and we can't cache the |monitor_| value.
-+    if (InterlockedCompareExchange(&request_sent_, 1, 0) == 0) {
-+      content::BrowserThread::PostTask(
-+          content::BrowserThread::UI, FROM_HERE,
-+          base::Bind(&MonitorFinder::FetchMonitorFromWidget, this));
-+    }
-+    return reinterpret_cast<int64_t>(monitor_);
-+  }
-+
-+ private:
-+  friend class base::RefCountedThreadSafe<MonitorFinder>;
-+  ~MonitorFinder() {}
-+
-+  void FetchMonitorFromWidget() {
-+    InterlockedExchange(&request_sent_, 0);
-+    content::RenderFrameHost* rfh =
-+        content::RenderFrameHost::FromID(process_id_, render_frame_id_);
-+    if (!rfh)
-+      return;
-+    gfx::NativeView native_view = rfh->GetNativeView();
-+#if defined(USE_AURA)
-+    aura::WindowTreeHost* host = native_view->GetHost();
-+    if (!host)
-+      return;
-+    HWND window = host->GetAcceleratedWidget();
-+#else
-+    HWND window = native_view;
-+#endif
-+    HMONITOR monitor = ::MonitorFromWindow(window, MONITOR_DEFAULTTONULL);
-+    InterlockedExchangePointer(reinterpret_cast<void* volatile*>(&monitor_),
-+                               monitor);
-+  }
-+
-+  const int process_id_;
-+  const int render_frame_id_;
-+  volatile HMONITOR monitor_;
-+  volatile long request_sent_;
-+};
-+#elif !defined(OS_MACOSX)
-+// TODO(cpu): Support Linux someday.
-+class MonitorFinder : public base::RefCountedThreadSafe<MonitorFinder> {
-+ public:
-+  MonitorFinder(int, int) {}
-+  int64_t GetMonitor() { return 0; }
-+
-+ private:
-+  friend class base::RefCountedThreadSafe<MonitorFinder>;
-+  ~MonitorFinder() {}
-+};
-+#endif
-+
-+PepperFlashDRMHost::PepperFlashDRMHost(BrowserPpapiHost* host,
-+                                       PP_Instance instance,
-+                                       PP_Resource resource)
-+    : ppapi::host::ResourceHost(host->GetPpapiHost(), instance, resource),
-+      weak_factory_(this) {
-+  // Grant permissions to read the flash voucher file.
-+  int render_process_id;
-+  int render_frame_id;
-+  bool success = host->GetRenderFrameIDsForInstance(
-+      instance, &render_process_id, &render_frame_id);
-+  base::FilePath plugin_dir = host->GetPluginPath().DirName();
-+  DCHECK(!plugin_dir.empty() && success);
-+  base::FilePath voucher_file = plugin_dir.AppendASCII(kVoucherFilename);
-+  content::ChildProcessSecurityPolicy::GetInstance()->GrantReadFile(
-+      render_process_id, voucher_file);
-+
-+  monitor_finder_ = new MonitorFinder(render_process_id, render_frame_id);
-+  monitor_finder_->GetMonitor();
-+}
-+
-+PepperFlashDRMHost::~PepperFlashDRMHost() {}
-+
-+int32_t PepperFlashDRMHost::OnResourceMessageReceived(
-+    const IPC::Message& msg,
-+    ppapi::host::HostMessageContext* context) {
-+  PPAPI_BEGIN_MESSAGE_MAP(PepperFlashDRMHost, msg)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL_0(PpapiHostMsg_FlashDRM_GetDeviceID,
-+                                        OnHostMsgGetDeviceID)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL_0(PpapiHostMsg_FlashDRM_GetHmonitor,
-+                                        OnHostMsgGetHmonitor)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL_0(PpapiHostMsg_FlashDRM_MonitorIsExternal,
-+                                        OnHostMsgMonitorIsExternal)
-+  PPAPI_END_MESSAGE_MAP()
-+  return PP_ERROR_FAILED;
-+}
-+
-+int32_t PepperFlashDRMHost::OnHostMsgGetDeviceID(
-+    ppapi::host::HostMessageContext* context) {
-+  static std::string id;
-+#if defined(OS_WIN)
-+  if (id.empty() && !GetSystemVolumeSerialNumber(&id))
-+    id = net::GetHostName();
-+#else
-+  if (id.empty())
-+    id = net::GetHostName();
-+#endif
-+  context->reply_msg = PpapiPluginMsg_FlashDRM_GetDeviceIDReply(id);
-+  return PP_OK;
-+}
-+
-+int32_t PepperFlashDRMHost::OnHostMsgGetHmonitor(
-+    ppapi::host::HostMessageContext* context) {
-+  int64_t monitor_id = monitor_finder_->GetMonitor();
-+  if (monitor_id) {
-+    context->reply_msg = PpapiPluginMsg_FlashDRM_GetHmonitorReply(monitor_id);
-+    return PP_OK;
-+  }
-+  return PP_ERROR_FAILED;
-+}
-+
-+int32_t PepperFlashDRMHost::OnHostMsgMonitorIsExternal(
-+    ppapi::host::HostMessageContext* context) {
-+  int64_t monitor_id = monitor_finder_->GetMonitor();
-+  if (!monitor_id)
-+    return PP_ERROR_FAILED;
-+
-+  PP_Bool is_external = PP_FALSE;
-+#if defined(OS_MACOSX)
-+  if (!MonitorFinder::IsMonitorBuiltIn(monitor_id))
-+    is_external = PP_TRUE;
-+#endif
-+  context->reply_msg =
-+      PpapiPluginMsg_FlashDRM_MonitorIsExternalReply(is_external);
-+  return PP_OK;
-+}
-+
-+}  // namespace chrome
-added in remote
-  their  100644 91bba9631e68f08728d5d926528fc80ce4f9cb00 chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h
-@@ -0,0 +1,55 @@
-+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_FLASH_DRM_HOST_H_
-+#define CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_FLASH_DRM_HOST_H_
-+
-+#include <stdint.h>
-+
-+#include <string>
-+
-+#include "base/macros.h"
-+#include "base/memory/weak_ptr.h"
-+#include "ppapi/host/host_message_context.h"
-+#include "ppapi/host/resource_host.h"
-+
-+namespace content {
-+class BrowserPpapiHost;
-+}
-+
-+namespace IPC {
-+class Message;
-+}
-+
-+namespace chrome {
-+class MonitorFinder;
-+
-+class PepperFlashDRMHost : public ppapi::host::ResourceHost {
-+ public:
-+  PepperFlashDRMHost(content::BrowserPpapiHost* host,
-+                     PP_Instance instance,
-+                     PP_Resource resource);
-+  ~PepperFlashDRMHost() override;
-+
-+  // ResourceHost override.
-+  int32_t OnResourceMessageReceived(
-+      const IPC::Message& msg,
-+      ppapi::host::HostMessageContext* context) override;
-+
-+ private:
-+  // IPC message handler.
-+  int32_t OnHostMsgGetDeviceID(ppapi::host::HostMessageContext* context);
-+  int32_t OnHostMsgGetHmonitor(ppapi::host::HostMessageContext* context);
-+  int32_t OnHostMsgMonitorIsExternal(ppapi::host::HostMessageContext* context);
-+
-+  scoped_refptr<MonitorFinder> monitor_finder_;
-+
-+  base::WeakPtrFactory<PepperFlashDRMHost> weak_factory_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(PepperFlashDRMHost);
-+};
-+
-+}  // namespace chrome
-+
-+#endif  // CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_FLASH_DRM_HOST_H_
-added in remote
-  their  100644 be771653066bf4689f9857e6a218dd3c79d9696e chromium_src/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc
-@@ -0,0 +1,106 @@
-+// Copyright 2013 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h"
-+
-+#include "content/public/browser/browser_ppapi_host.h"
-+#include "content/public/browser/browser_thread.h"
-+#include "content/public/browser/child_process_security_policy.h"
-+#include "content/public/browser/render_view_host.h"
-+#include "ppapi/c/pp_errors.h"
-+#include "ppapi/host/dispatch_host_message.h"
-+#include "ppapi/host/host_message_context.h"
-+#include "ppapi/host/ppapi_host.h"
-+#include "ppapi/proxy/ppapi_messages.h"
-+#include "ppapi/shared_impl/file_system_util.h"
-+#include "storage/browser/fileapi/isolated_context.h"
-+
-+namespace chrome {
-+
-+// static
-+PepperIsolatedFileSystemMessageFilter*
-+PepperIsolatedFileSystemMessageFilter::Create(PP_Instance instance,
-+                                              content::BrowserPpapiHost* host) {
-+  int render_process_id;
-+  int unused_render_frame_id;
-+  if (!host->GetRenderFrameIDsForInstance(instance, &render_process_id,
-+                                          &unused_render_frame_id)) {
-+    return NULL;
-+  }
-+  return new PepperIsolatedFileSystemMessageFilter(
-+      render_process_id, host->GetProfileDataDirectory(),
-+      host->GetDocumentURLForInstance(instance), host->GetPpapiHost());
-+}
-+
-+PepperIsolatedFileSystemMessageFilter::PepperIsolatedFileSystemMessageFilter(
-+    int render_process_id,
-+    const base::FilePath& profile_directory,
-+    const GURL& document_url,
-+    ppapi::host::PpapiHost* ppapi_host)
-+    : render_process_id_(render_process_id),
-+      profile_directory_(profile_directory),
-+      document_url_(document_url),
-+      ppapi_host_(ppapi_host) {}
-+
-+PepperIsolatedFileSystemMessageFilter::
-+    ~PepperIsolatedFileSystemMessageFilter() {}
-+
-+scoped_refptr<base::TaskRunner>
-+PepperIsolatedFileSystemMessageFilter::OverrideTaskRunnerForMessage(
-+    const IPC::Message& msg) {
-+  // In order to reach ExtensionSystem, we need to get ProfileManager first.
-+  // ProfileManager lives in UI thread, so we need to do this in UI thread.
-+  return content::BrowserThread::GetTaskRunnerForThread(
-+      content::BrowserThread::UI);
-+}
-+
-+int32_t PepperIsolatedFileSystemMessageFilter::OnResourceMessageReceived(
-+    const IPC::Message& msg,
-+    ppapi::host::HostMessageContext* context) {
-+  PPAPI_BEGIN_MESSAGE_MAP(PepperIsolatedFileSystemMessageFilter, msg)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(
-+        PpapiHostMsg_IsolatedFileSystem_BrowserOpen, OnOpenFileSystem)
-+  PPAPI_END_MESSAGE_MAP()
-+  return PP_ERROR_FAILED;
-+}
-+
-+int32_t PepperIsolatedFileSystemMessageFilter::OnOpenFileSystem(
-+    ppapi::host::HostMessageContext* context,
-+    PP_IsolatedFileSystemType_Private type) {
-+  switch (type) {
-+    case PP_ISOLATEDFILESYSTEMTYPE_PRIVATE_INVALID:
-+    case PP_ISOLATEDFILESYSTEMTYPE_PRIVATE_CRX:
-+      break;
-+    case PP_ISOLATEDFILESYSTEMTYPE_PRIVATE_PLUGINPRIVATE:
-+      return OpenPluginPrivateFileSystem(context);
-+  }
-+  NOTREACHED();
-+  context->reply_msg =
-+      PpapiPluginMsg_IsolatedFileSystem_BrowserOpenReply(std::string());
-+  return PP_ERROR_FAILED;
-+}
-+
-+int32_t PepperIsolatedFileSystemMessageFilter::OpenPluginPrivateFileSystem(
-+    ppapi::host::HostMessageContext* context) {
-+  DCHECK(ppapi_host_);
-+  // Only plugins with private permission can open the filesystem.
-+  if (!ppapi_host_->permissions().HasPermission(ppapi::PERMISSION_PRIVATE))
-+    return PP_ERROR_NOACCESS;
-+
-+  const std::string& root_name = ppapi::IsolatedFileSystemTypeToRootName(
-+      PP_ISOLATEDFILESYSTEMTYPE_PRIVATE_PLUGINPRIVATE);
-+  const std::string& fsid =
-+      storage::IsolatedContext::GetInstance()->RegisterFileSystemForVirtualPath(
-+          storage::kFileSystemTypePluginPrivate, root_name, base::FilePath());
-+
-+  // Grant full access of isolated filesystem to renderer process.
-+  content::ChildProcessSecurityPolicy* policy =
-+      content::ChildProcessSecurityPolicy::GetInstance();
-+  policy->GrantCreateReadWriteFileSystem(render_process_id_, fsid);
-+
-+  context->reply_msg = PpapiPluginMsg_IsolatedFileSystem_BrowserOpenReply(fsid);
-+  return PP_OK;
-+}
-+
-+}  // namespace chrome
-added in remote
-  their  100644 6a24feadd150e0c5ecd1fa44c7e412262ecae55d chromium_src/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h
-@@ -0,0 +1,76 @@
-+// Copyright 2013 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_ISOLATED_FILE_SYSTEM_MESSAGE_FILTER_H_
-+#define CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_ISOLATED_FILE_SYSTEM_MESSAGE_FILTER_H_
-+
-+#include <set>
-+#include <string>
-+
-+#include "base/files/file_path.h"
-+#include "ppapi/c/pp_instance.h"
-+#include "ppapi/c/pp_resource.h"
-+#include "ppapi/c/private/ppb_isolated_file_system_private.h"
-+#include "ppapi/host/resource_host.h"
-+#include "ppapi/host/resource_message_filter.h"
-+#include "url/gurl.h"
-+
-+class Profile;
-+
-+namespace content {
-+class BrowserPpapiHost;
-+}
-+
-+namespace ppapi {
-+namespace host {
-+struct HostMessageContext;
-+}  // namespace host
-+}  // namespace ppapi
-+
-+namespace chrome {
-+
-+class PepperIsolatedFileSystemMessageFilter
-+    : public ppapi::host::ResourceMessageFilter {
-+ public:
-+  static PepperIsolatedFileSystemMessageFilter* Create(
-+      PP_Instance instance,
-+      content::BrowserPpapiHost* host);
-+
-+  // ppapi::host::ResourceMessageFilter implementation.
-+  scoped_refptr<base::TaskRunner> OverrideTaskRunnerForMessage(
-+      const IPC::Message& msg) override;
-+  int32_t OnResourceMessageReceived(
-+      const IPC::Message& msg,
-+      ppapi::host::HostMessageContext* context) override;
-+
-+ private:
-+  PepperIsolatedFileSystemMessageFilter(int render_process_id,
-+                                        const base::FilePath& profile_directory,
-+                                        const GURL& document_url,
-+                                        ppapi::host::PpapiHost* ppapi_host_);
-+
-+  ~PepperIsolatedFileSystemMessageFilter() override;
-+
-+  // Returns filesystem id of isolated filesystem if valid, or empty string
-+  // otherwise.  This must run on the UI thread because ProfileManager only
-+  // allows access on that thread.
-+
-+  int32_t OnOpenFileSystem(ppapi::host::HostMessageContext* context,
-+                           PP_IsolatedFileSystemType_Private type);
-+  int32_t OpenPluginPrivateFileSystem(ppapi::host::HostMessageContext* context);
-+
-+  const int render_process_id_;
-+  // Keep a copy from original thread.
-+  const base::FilePath profile_directory_;
-+  const GURL document_url_;
-+
-+  // Not owned by this object.
-+  ppapi::host::PpapiHost* ppapi_host_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(PepperIsolatedFileSystemMessageFilter);
-+};
-+
-+}  // namespace chrome
-+
-+#endif  // CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_ISOLATED_FILE_SYSTEM_MESSAGE_FILTER_H_
-added in both
-  our    100644 850bd7ad3630604fa35bdb67397eb789e059973a chromium_src/chrome/browser/ui/views/color_chooser_dialog.h
-  their  100644 b23061a386dc0dc235f5924fc559aa3b7d355a56 chromium_src/chrome/browser/ui/views/color_chooser_dialog.h
-@@ -23,6 +23,7 @@
-   ColorChooserDialog(views::ColorChooserListener* listener,
-                      SkColor initial_color,
-                      gfx::NativeWindow owning_window);
-+<<<<<<< .our
- 
-   // BaseShellDialog:
-   bool IsRunning(gfx::NativeWindow owning_window) const override;
-@@ -32,6 +33,15 @@
-   ~ColorChooserDialog() override;
-   friend class base::RefCountedThreadSafe<ColorChooserDialog>;
- 
-+=======
-+  virtual ~ColorChooserDialog();
-+
-+  // BaseShellDialog:
-+  virtual bool IsRunning(gfx::NativeWindow owning_window) const override;
-+  virtual void ListenerDestroyed() override;
-+
-+ private:
-+>>>>>>> .their
-   struct ExecuteOpenParams {
-     ExecuteOpenParams(SkColor color, RunState run_state, HWND owner);
-     SkColor color;
-added in both
-  our    100644 0f8ebfa6366f90e435dc0e854b20cef92fc2964f chromium_src/chrome/browser/ui/views/color_chooser_win.cc
-  their  100644 fc330dd63f1810bc9486428a32f351ec0cdfb3eb chromium_src/chrome/browser/ui/views/color_chooser_win.cc
-@@ -22,6 +22,7 @@
-                                SkColor initial_color);
- 
-   ColorChooserWin(content::WebContents* web_contents, SkColor initial_color);
-+<<<<<<< .our
-   ~ColorChooserWin() override;
- 
-   // content::ColorChooser overrides:
-@@ -31,6 +32,17 @@
-   // views::ColorChooserListener overrides:
-   void OnColorChosen(SkColor color) override;
-   void OnColorChooserDialogClosed() override;
-+=======
-+  ~ColorChooserWin();
-+
-+  // content::ColorChooser overrides:
-+  virtual void End() override;
-+  virtual void SetSelectedColor(SkColor color) override {}
-+
-+  // views::ColorChooserListener overrides:
-+  virtual void OnColorChosen(SkColor color);
-+  virtual void OnColorChooserDialogClosed();
-+>>>>>>> .their
- 
-  private:
-   static ColorChooserWin* current_color_chooser_;
-added in remote
-  their  100644 437d87f8ff5e89c13990e1fba87e7e51de7d962f chromium_src/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc
-@@ -0,0 +1,99 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/renderer/pepper/chrome_renderer_pepper_host_factory.h"
-+
-+#include "base/logging.h"
-+#include "chrome/renderer/pepper/pepper_flash_font_file_host.h"
-+#include "chrome/renderer/pepper/pepper_flash_fullscreen_host.h"
-+#include "chrome/renderer/pepper/pepper_flash_menu_host.h"
-+#include "chrome/renderer/pepper/pepper_flash_renderer_host.h"
-+#include "content/public/renderer/renderer_ppapi_host.h"
-+#include "ppapi/host/ppapi_host.h"
-+#include "ppapi/host/resource_host.h"
-+#include "ppapi/proxy/ppapi_message_utils.h"
-+#include "ppapi/proxy/ppapi_messages.h"
-+#include "ppapi/shared_impl/ppapi_permissions.h"
-+
-+#if defined(ENABLE_PDF_VIEWER)
-+#include "components/pdf/renderer/pepper_pdf_host.h"
-+#endif  // defined(ENABLE_PDF_VIEWER)
-+
-+using ppapi::host::ResourceHost;
-+
-+ChromeRendererPepperHostFactory::ChromeRendererPepperHostFactory(
-+    content::RendererPpapiHost* host)
-+    : host_(host) {}
-+
-+ChromeRendererPepperHostFactory::~ChromeRendererPepperHostFactory() {}
-+
-+std::unique_ptr<ResourceHost>
-+ChromeRendererPepperHostFactory::CreateResourceHost(
-+    ppapi::host::PpapiHost* host,
-+    PP_Resource resource,
-+    PP_Instance instance,
-+    const IPC::Message& message) {
-+  DCHECK_EQ(host_->GetPpapiHost(), host);
-+
-+  // Make sure the plugin is giving us a valid instance for this resource.
-+  if (!host_->IsValidInstance(instance))
-+    return std::unique_ptr<ResourceHost>();
-+
-+  if (host_->GetPpapiHost()->permissions().HasPermission(
-+          ppapi::PERMISSION_FLASH)) {
-+    switch (message.type()) {
-+      case PpapiHostMsg_Flash_Create::ID: {
-+        return std::unique_ptr<ResourceHost>(
-+            new PepperFlashRendererHost(host_, instance, resource));
-+      }
-+      case PpapiHostMsg_FlashFullscreen_Create::ID: {
-+        return std::unique_ptr<ResourceHost>(
-+            new PepperFlashFullscreenHost(host_, instance, resource));
-+      }
-+      case PpapiHostMsg_FlashMenu_Create::ID: {
-+        ppapi::proxy::SerializedFlashMenu serialized_menu;
-+        if (ppapi::UnpackMessage<PpapiHostMsg_FlashMenu_Create>(
-+                message, &serialized_menu)) {
-+          return std::unique_ptr<ResourceHost>(new PepperFlashMenuHost(
-+              host_, instance, resource, serialized_menu));
-+        }
-+        break;
-+      }
-+    }
-+  }
-+
-+  // TODO(raymes): PDF also needs access to the FlashFontFileHost currently.
-+  // We should either rename PPB_FlashFont_File to PPB_FontFile_Private or get
-+  // rid of its use in PDF if possible.
-+  if (host_->GetPpapiHost()->permissions().HasPermission(
-+          ppapi::PERMISSION_FLASH) ||
-+      host_->GetPpapiHost()->permissions().HasPermission(
-+          ppapi::PERMISSION_PRIVATE)) {
-+    switch (message.type()) {
-+      case PpapiHostMsg_FlashFontFile_Create::ID: {
-+        ppapi::proxy::SerializedFontDescription description;
-+        PP_PrivateFontCharset charset;
-+        if (ppapi::UnpackMessage<PpapiHostMsg_FlashFontFile_Create>(
-+                message, &description, &charset)) {
-+          return std::unique_ptr<ResourceHost>(new PepperFlashFontFileHost(
-+              host_, instance, resource, description, charset));
-+        }
-+        break;
-+      }
-+    }
-+  }
-+
-+#if defined(ENABLE_PDF_VIEWER)
-+  if (host_->GetPpapiHost()->permissions().HasPermission(
-+          ppapi::PERMISSION_PRIVATE)) {
-+    switch (message.type()) {
-+      case PpapiHostMsg_PDF_Create::ID: {
-+        return std::make_unique<pdf::PepperPDFHost>(host_, instance, resource);
-+      }
-+    }
-+  }
-+#endif  // defined(ENABLE_PDF_VIEWER)
-+
-+  return std::unique_ptr<ResourceHost>();
-+}
-added in remote
-  their  100644 c52c73b56f048fc522f4879597e870285ec7009d chromium_src/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.h
-@@ -0,0 +1,34 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_RENDERER_PEPPER_CHROME_RENDERER_PEPPER_HOST_FACTORY_H_
-+#define CHROME_RENDERER_PEPPER_CHROME_RENDERER_PEPPER_HOST_FACTORY_H_
-+
-+#include "base/macros.h"
-+#include "ppapi/host/host_factory.h"
-+
-+namespace content {
-+class RendererPpapiHost;
-+}
-+
-+class ChromeRendererPepperHostFactory : public ppapi::host::HostFactory {
-+ public:
-+  explicit ChromeRendererPepperHostFactory(content::RendererPpapiHost* host);
-+  ~ChromeRendererPepperHostFactory() override;
-+
-+  // HostFactory.
-+  std::unique_ptr<ppapi::host::ResourceHost> CreateResourceHost(
-+      ppapi::host::PpapiHost* host,
-+      PP_Resource resource,
-+      PP_Instance instance,
-+      const IPC::Message& message) override;
-+
-+ private:
-+  // Not owned by this object.
-+  content::RendererPpapiHost* host_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(ChromeRendererPepperHostFactory);
-+};
-+
-+#endif  // CHROME_RENDERER_PEPPER_CHROME_RENDERER_PEPPER_HOST_FACTORY_H_
-added in remote
-  their  100644 efdc9316b82976b2e07cb3c8aec06141304f390c chromium_src/chrome/renderer/pepper/pepper_flash_font_file_host.cc
-@@ -0,0 +1,105 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/renderer/pepper/pepper_flash_font_file_host.h"
-+
-+#include "base/sys_byteorder.h"
-+#include "build/build_config.h"
-+#include "content/public/renderer/renderer_ppapi_host.h"
-+#include "ppapi/c/pp_errors.h"
-+#include "ppapi/host/dispatch_host_message.h"
-+#include "ppapi/host/host_message_context.h"
-+#include "ppapi/host/ppapi_host.h"
-+#include "ppapi/proxy/ppapi_messages.h"
-+#include "ppapi/proxy/serialized_structs.h"
-+
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
-+#include "content/public/child/child_process_sandbox_support_linux.h"
-+#include "content/public/common/common_sandbox_support_linux.h"
-+#elif defined(OS_WIN)
-+#include "third_party/skia/include/ports/SkFontMgr.h"
-+#endif
-+
-+PepperFlashFontFileHost::PepperFlashFontFileHost(
-+    content::RendererPpapiHost* host,
-+    PP_Instance instance,
-+    PP_Resource resource,
-+    const ppapi::proxy::SerializedFontDescription& description,
-+    PP_PrivateFontCharset charset)
-+    : ResourceHost(host->GetPpapiHost(), instance, resource) {
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
-+  fd_.reset(content::MatchFontWithFallback(
-+      description.face.c_str(),
-+      description.weight >= PP_BROWSERFONT_TRUSTED_WEIGHT_BOLD,
-+      description.italic, charset, PP_BROWSERFONT_TRUSTED_FAMILY_DEFAULT));
-+#elif defined(OS_WIN)  // defined(OS_LINUX) || defined(OS_OPENBSD)
-+  int weight = description.weight;
-+  if (weight == FW_DONTCARE)
-+    weight = SkFontStyle::kNormal_Weight;
-+  SkFontStyle style(weight, SkFontStyle::kNormal_Width,
-+                    description.italic ? SkFontStyle::kItalic_Slant
-+                                       : SkFontStyle::kUpright_Slant);
-+  sk_sp<SkFontMgr> font_mgr(SkFontMgr::RefDefault());
-+  typeface_ = sk_sp<SkTypeface>(
-+      font_mgr->matchFamilyStyle(description.face.c_str(), style));
-+#endif                 // defined(OS_WIN)
-+}
-+
-+PepperFlashFontFileHost::~PepperFlashFontFileHost() {}
-+
-+int32_t PepperFlashFontFileHost::OnResourceMessageReceived(
-+    const IPC::Message& msg,
-+    ppapi::host::HostMessageContext* context) {
-+  PPAPI_BEGIN_MESSAGE_MAP(PepperFlashFontFileHost, msg)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_FlashFontFile_GetFontTable,
-+                                      OnGetFontTable)
-+  PPAPI_END_MESSAGE_MAP()
-+  return PP_ERROR_FAILED;
-+}
-+bool PepperFlashFontFileHost::GetFontData(uint32_t table,
-+                                          void* buffer,
-+                                          size_t* length) {
-+  bool result = false;
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
-+  int fd = fd_.get();
-+  if (fd != -1)
-+    result = content::GetFontTable(fd, table, 0 /* offset */,
-+                                   reinterpret_cast<uint8_t*>(buffer), length);
-+#elif defined(OS_WIN)
-+  if (typeface_) {
-+    table = base::ByteSwap(table);
-+    if (buffer == NULL) {
-+      *length = typeface_->getTableSize(table);
-+      if (*length > 0)
-+        result = true;
-+    } else {
-+      size_t new_length = typeface_->getTableData(table, 0, *length, buffer);
-+      if (new_length == *length)
-+        result = true;
-+    }
-+  }
-+#endif
-+  return result;
-+}
-+
-+int32_t PepperFlashFontFileHost::OnGetFontTable(
-+    ppapi::host::HostMessageContext* context,
-+    uint32_t table) {
-+  std::string contents;
-+  int32_t result = PP_ERROR_FAILED;
-+  size_t length = 0;
-+  if (GetFontData(table, NULL, &length)) {
-+    contents.resize(length);
-+    uint8_t* contents_ptr =
-+        reinterpret_cast<uint8_t*>(const_cast<char*>(contents.c_str()));
-+    if (GetFontData(table, contents_ptr, &length)) {
-+      result = PP_OK;
-+    } else {
-+      contents.clear();
-+    }
-+  }
-+
-+  context->reply_msg = PpapiPluginMsg_FlashFontFile_GetFontTableReply(contents);
-+  return result;
-+}
-added in remote
-  their  100644 15eb73837b50dbb85d607a84bc3b3a71cf789ac5 chromium_src/chrome/renderer/pepper/pepper_flash_font_file_host.h
-@@ -0,0 +1,56 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_RENDERER_PEPPER_PEPPER_FLASH_FONT_FILE_HOST_H_
-+#define CHROME_RENDERER_PEPPER_PEPPER_FLASH_FONT_FILE_HOST_H_
-+
-+#include "ppapi/c/private/pp_private_font_charset.h"
-+#include "ppapi/host/resource_host.h"
-+
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
-+#include "base/files/scoped_file.h"
-+#elif defined(OS_WIN)
-+#include "third_party/skia/include/core/SkRefCnt.h"
-+#include "third_party/skia/include/core/SkTypeface.h"
-+#endif
-+
-+namespace content {
-+class RendererPpapiHost;
-+}
-+
-+namespace ppapi {
-+namespace proxy {
-+struct SerializedFontDescription;
-+}
-+}  // namespace ppapi
-+
-+class PepperFlashFontFileHost : public ppapi::host::ResourceHost {
-+ public:
-+  PepperFlashFontFileHost(
-+      content::RendererPpapiHost* host,
-+      PP_Instance instance,
-+      PP_Resource resource,
-+      const ppapi::proxy::SerializedFontDescription& description,
-+      PP_PrivateFontCharset charset);
-+  ~PepperFlashFontFileHost() override;
-+
-+  int32_t OnResourceMessageReceived(
-+      const IPC::Message& msg,
-+      ppapi::host::HostMessageContext* context) override;
-+
-+ private:
-+  int32_t OnGetFontTable(ppapi::host::HostMessageContext* context,
-+                         uint32_t table);
-+  bool GetFontData(uint32_t table, void* buffer, size_t* length);
-+
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
-+  base::ScopedFD fd_;
-+#elif defined(OS_WIN)
-+  sk_sp<SkTypeface> typeface_;
-+#endif
-+
-+  DISALLOW_COPY_AND_ASSIGN(PepperFlashFontFileHost);
-+};
-+
-+#endif  // CHROME_RENDERER_PEPPER_PEPPER_FLASH_FONT_FILE_HOST_H_
-added in remote
-  their  100644 f4367ef73ce882cec4392da24413800620237c25 chromium_src/chrome/renderer/pepper/pepper_flash_fullscreen_host.cc
-@@ -0,0 +1,42 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/renderer/pepper/pepper_flash_fullscreen_host.h"
-+
-+#include "content/public/renderer/pepper_plugin_instance.h"
-+#include "content/public/renderer/renderer_ppapi_host.h"
-+#include "ppapi/c/pp_errors.h"
-+#include "ppapi/host/dispatch_host_message.h"
-+#include "ppapi/host/host_message_context.h"
-+#include "ppapi/host/ppapi_host.h"
-+#include "ppapi/proxy/ppapi_messages.h"
-+
-+PepperFlashFullscreenHost::PepperFlashFullscreenHost(
-+    content::RendererPpapiHost* host,
-+    PP_Instance instance,
-+    PP_Resource resource)
-+    : ResourceHost(host->GetPpapiHost(), instance, resource),
-+      renderer_ppapi_host_(host) {}
-+
-+PepperFlashFullscreenHost::~PepperFlashFullscreenHost() {}
-+
-+int32_t PepperFlashFullscreenHost::OnResourceMessageReceived(
-+    const IPC::Message& msg,
-+    ppapi::host::HostMessageContext* context) {
-+  PPAPI_BEGIN_MESSAGE_MAP(PepperFlashFullscreenHost, msg)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(
-+        PpapiHostMsg_FlashFullscreen_SetFullscreen, OnSetFullscreen)
-+  PPAPI_END_MESSAGE_MAP()
-+  return PP_ERROR_FAILED;
-+}
-+
-+int32_t PepperFlashFullscreenHost::OnSetFullscreen(
-+    ppapi::host::HostMessageContext* context,
-+    bool fullscreen) {
-+  content::PepperPluginInstance* plugin_instance =
-+      renderer_ppapi_host_->GetPluginInstance(pp_instance());
-+  if (plugin_instance && plugin_instance->FlashSetFullscreen(fullscreen, true))
-+    return PP_OK;
-+  return PP_ERROR_FAILED;
-+}
-added in remote
-  their  100644 86d0af73aee54451905485e2afa0e4cd08d0037e chromium_src/chrome/renderer/pepper/pepper_flash_fullscreen_host.h
-@@ -0,0 +1,35 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_RENDERER_PEPPER_PEPPER_FLASH_FULLSCREEN_HOST_H_
-+#define CHROME_RENDERER_PEPPER_PEPPER_FLASH_FULLSCREEN_HOST_H_
-+
-+#include "ppapi/host/resource_host.h"
-+
-+namespace content {
-+class RendererPpapiHost;
-+}
-+
-+class PepperFlashFullscreenHost : public ppapi::host::ResourceHost {
-+ public:
-+  PepperFlashFullscreenHost(content::RendererPpapiHost* host,
-+                            PP_Instance instance,
-+                            PP_Resource resource);
-+  ~PepperFlashFullscreenHost() override;
-+
-+  int32_t OnResourceMessageReceived(
-+      const IPC::Message& msg,
-+      ppapi::host::HostMessageContext* context) override;
-+
-+ private:
-+  int32_t OnSetFullscreen(ppapi::host::HostMessageContext* context,
-+                          bool fullscreen);
-+
-+  // Non-owning pointer.
-+  content::RendererPpapiHost* renderer_ppapi_host_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(PepperFlashFullscreenHost);
-+};
-+
-+#endif  // CHROME_RENDERER_PEPPER_PEPPER_FLASH_FULLSCREEN_HOST_H_
-added in remote
-  their  100644 45a79349a1c5e6f0b2767cbb1f5e678358f714b8 chromium_src/chrome/renderer/pepper/pepper_flash_menu_host.cc
-@@ -0,0 +1,201 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/renderer/pepper/pepper_flash_menu_host.h"
-+
-+#include "base/strings/utf_string_conversions.h"
-+#include "content/public/common/context_menu_params.h"
-+#include "content/public/renderer/render_frame.h"
-+#include "content/public/renderer/renderer_ppapi_host.h"
-+#include "ipc/ipc_message.h"
-+#include "ppapi/c/private/ppb_flash_menu.h"
-+#include "ppapi/host/dispatch_host_message.h"
-+#include "ppapi/host/ppapi_host.h"
-+#include "ppapi/proxy/ppapi_messages.h"
-+#include "ppapi/proxy/serialized_flash_menu.h"
-+#include "ui/gfx/geometry/point.h"
-+
-+namespace {
-+
-+// Maximum depth of submenus allowed (e.g., 1 indicates that submenus are
-+// allowed, but not sub-submenus).
-+const size_t kMaxMenuDepth = 2;
-+
-+// Maximum number of entries in any single menu (including separators).
-+const size_t kMaxMenuEntries = 50;
-+
-+// Maximum total number of entries in the |menu_id_map| (see below).
-+// (Limit to 500 real entries; reserve the 0 action as an invalid entry.)
-+const size_t kMaxMenuIdMapEntries = 501;
-+
-+// Converts menu data from one form to another.
-+//  - |depth| is the current nested depth (call it starting with 0).
-+//  - |menu_id_map| is such that |menu_id_map[output_item.action] ==
-+//    input_item.id| (where |action| is what a |MenuItem| has, |id| is what a
-+//    |PP_Flash_MenuItem| has).
-+bool ConvertMenuData(const PP_Flash_Menu* in_menu,
-+                     size_t depth,
-+                     std::vector<content::MenuItem>* out_menu,
-+                     std::vector<int32_t>* menu_id_map) {
-+  if (depth > kMaxMenuDepth || !in_menu)
-+    return false;
-+
-+  // Clear the output, just in case.
-+  out_menu->clear();
-+
-+  if (!in_menu->count)
-+    return true;  // Nothing else to do.
-+
-+  if (!in_menu->items || in_menu->count > kMaxMenuEntries)
-+    return false;
-+  for (uint32_t i = 0; i < in_menu->count; i++) {
-+    content::MenuItem item;
-+
-+    PP_Flash_MenuItem_Type type = in_menu->items[i].type;
-+    switch (type) {
-+      case PP_FLASH_MENUITEM_TYPE_NORMAL:
-+        item.type = content::MenuItem::OPTION;
-+        break;
-+      case PP_FLASH_MENUITEM_TYPE_CHECKBOX:
-+        item.type = content::MenuItem::CHECKABLE_OPTION;
-+        break;
-+      case PP_FLASH_MENUITEM_TYPE_SEPARATOR:
-+        item.type = content::MenuItem::SEPARATOR;
-+        break;
-+      case PP_FLASH_MENUITEM_TYPE_SUBMENU:
-+        item.type = content::MenuItem::SUBMENU;
-+        break;
-+      default:
-+        return false;
-+    }
-+    if (in_menu->items[i].name)
-+      item.label = base::UTF8ToUTF16(in_menu->items[i].name);
-+    if (menu_id_map->size() >= kMaxMenuIdMapEntries)
-+      return false;
-+    item.action = static_cast<unsigned>(menu_id_map->size());
-+    // This sets |(*menu_id_map)[item.action] = in_menu->items[i].id|.
-+    menu_id_map->push_back(in_menu->items[i].id);
-+    item.enabled = PP_ToBool(in_menu->items[i].enabled);
-+    item.checked = PP_ToBool(in_menu->items[i].checked);
-+    if (type == PP_FLASH_MENUITEM_TYPE_SUBMENU) {
-+      if (!ConvertMenuData(in_menu->items[i].submenu, depth + 1, &item.submenu,
-+                           menu_id_map))
-+        return false;
-+    }
-+
-+    out_menu->push_back(item);
-+  }
-+
-+  return true;
-+}
-+
-+}  // namespace
-+
-+PepperFlashMenuHost::PepperFlashMenuHost(
-+    content::RendererPpapiHost* host,
-+    PP_Instance instance,
-+    PP_Resource resource,
-+    const ppapi::proxy::SerializedFlashMenu& serial_menu)
-+    : ppapi::host::ResourceHost(host->GetPpapiHost(), instance, resource),
-+      renderer_ppapi_host_(host),
-+      showing_context_menu_(false),
-+      context_menu_request_id_(0),
-+      has_saved_context_menu_action_(false),
-+      saved_context_menu_action_(0) {
-+  menu_id_map_.push_back(0);  // Reserve |menu_id_map_[0]|.
-+  if (!ConvertMenuData(serial_menu.pp_menu(), 0, &menu_data_, &menu_id_map_)) {
-+    menu_data_.clear();
-+    menu_id_map_.clear();
-+  }
-+}
-+
-+PepperFlashMenuHost::~PepperFlashMenuHost() {
-+  if (showing_context_menu_) {
-+    content::RenderFrame* render_frame =
-+        renderer_ppapi_host_->GetRenderFrameForInstance(pp_instance());
-+    if (render_frame)
-+      render_frame->CancelContextMenu(context_menu_request_id_);
-+  }
-+}
-+
-+int32_t PepperFlashMenuHost::OnResourceMessageReceived(
-+    const IPC::Message& msg,
-+    ppapi::host::HostMessageContext* context) {
-+  PPAPI_BEGIN_MESSAGE_MAP(PepperFlashMenuHost, msg)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_FlashMenu_Show,
-+                                      OnHostMsgShow)
-+  PPAPI_END_MESSAGE_MAP()
-+  return PP_ERROR_FAILED;
-+}
-+
-+int32_t PepperFlashMenuHost::OnHostMsgShow(
-+    ppapi::host::HostMessageContext* context,
-+    const PP_Point& location) {
-+  // Note that all early returns must do a SendMenuReply. The sync result for
-+  // this message isn't used, so to forward the error to the plugin, we need to
-+  // additionally call SendMenuReply explicitly.
-+  if (menu_data_.empty()) {
-+    SendMenuReply(PP_ERROR_FAILED, -1);
-+    return PP_ERROR_FAILED;
-+  }
-+  if (showing_context_menu_) {
-+    SendMenuReply(PP_ERROR_INPROGRESS, -1);
-+    return PP_ERROR_INPROGRESS;
-+  }
-+
-+  content::RenderFrame* render_frame =
-+      renderer_ppapi_host_->GetRenderFrameForInstance(pp_instance());
-+
-+  content::ContextMenuParams params;
-+  params.x = location.x;
-+  params.y = location.y;
-+  params.custom_context.is_pepper_menu = true;
-+  params.custom_context.render_widget_id =
-+      renderer_ppapi_host_->GetRoutingIDForWidget(pp_instance());
-+  params.custom_items = menu_data_;
-+
-+  // Transform the position to be in render frame's coordinates.
-+  gfx::Point render_frame_pt = renderer_ppapi_host_->PluginPointToRenderFrame(
-+      pp_instance(), gfx::Point(location.x, location.y));
-+  params.x = render_frame_pt.x();
-+  params.y = render_frame_pt.y();
-+
-+  showing_context_menu_ = true;
-+  context_menu_request_id_ = render_frame->ShowContextMenu(this, params);
-+
-+  // Note: the show message is sync so this OK is for the sync reply which we
-+  // don't actually use (see the comment in the resource file for this). The
-+  // async message containing the context menu action will be sent in the
-+  // future.
-+  return PP_OK;
-+}
-+
-+void PepperFlashMenuHost::OnMenuAction(int request_id, unsigned action) {
-+  // Just save the action.
-+  DCHECK(!has_saved_context_menu_action_);
-+  has_saved_context_menu_action_ = true;
-+  saved_context_menu_action_ = action;
-+}
-+
-+void PepperFlashMenuHost::OnMenuClosed(int request_id) {
-+  if (has_saved_context_menu_action_ &&
-+      saved_context_menu_action_ < menu_id_map_.size()) {
-+    SendMenuReply(PP_OK, menu_id_map_[saved_context_menu_action_]);
-+    has_saved_context_menu_action_ = false;
-+    saved_context_menu_action_ = 0;
-+  } else {
-+    SendMenuReply(PP_ERROR_USERCANCEL, -1);
-+  }
-+
-+  showing_context_menu_ = false;
-+  context_menu_request_id_ = 0;
-+}
-+
-+void PepperFlashMenuHost::SendMenuReply(int32_t result, int action) {
-+  ppapi::host::ReplyMessageContext reply_context(
-+      ppapi::proxy::ResourceMessageReplyParams(pp_resource(), 0), NULL,
-+      MSG_ROUTING_NONE);
-+  reply_context.params.set_result(result);
-+  host()->SendReply(reply_context, PpapiPluginMsg_FlashMenu_ShowReply(action));
-+}
-added in remote
-  their  100644 a2b4f9cb40098aa65bd8c15759dbbfbcc4fa6674 chromium_src/chrome/renderer/pepper/pepper_flash_menu_host.h
-@@ -0,0 +1,69 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_RENDERER_PEPPER_PEPPER_FLASH_MENU_HOST_H_
-+#define CHROME_RENDERER_PEPPER_PEPPER_FLASH_MENU_HOST_H_
-+
-+#include <vector>
-+
-+#include "base/compiler_specific.h"
-+#include "content/public/renderer/context_menu_client.h"
-+#include "ppapi/c/pp_point.h"
-+#include "ppapi/host/host_message_context.h"
-+#include "ppapi/host/resource_host.h"
-+
-+namespace content {
-+class RendererPpapiHost;
-+struct MenuItem;
-+}  // namespace content
-+
-+namespace ppapi {
-+namespace proxy {
-+class SerializedFlashMenu;
-+}
-+}  // namespace ppapi
-+
-+class PepperFlashMenuHost : public ppapi::host::ResourceHost,
-+                            public content::ContextMenuClient {
-+ public:
-+  PepperFlashMenuHost(content::RendererPpapiHost* host,
-+                      PP_Instance instance,
-+                      PP_Resource resource,
-+                      const ppapi::proxy::SerializedFlashMenu& serial_menu);
-+  ~PepperFlashMenuHost() override;
-+
-+  int32_t OnResourceMessageReceived(
-+      const IPC::Message& msg,
-+      ppapi::host::HostMessageContext* context) override;
-+
-+ private:
-+  int32_t OnHostMsgShow(ppapi::host::HostMessageContext* context,
-+                        const PP_Point& location);
-+
-+  // ContextMenuClient implementation.
-+  void OnMenuAction(int request_id, unsigned action) override;
-+  void OnMenuClosed(int request_id) override;
-+
-+  void SendMenuReply(int32_t result, int action);
-+
-+  content::RendererPpapiHost* renderer_ppapi_host_;
-+
-+  bool showing_context_menu_;
-+  int context_menu_request_id_;
-+
-+  std::vector<content::MenuItem> menu_data_;
-+
-+  // We send |MenuItem|s, which have an |unsigned| "action" field instead of
-+  // an |int32_t| ID. (CONTENT also limits the range of valid values for
-+  // actions.) This maps actions to IDs.
-+  std::vector<int32_t> menu_id_map_;
-+
-+  // Used to send a single context menu "completion" upon menu close.
-+  bool has_saved_context_menu_action_;
-+  unsigned saved_context_menu_action_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(PepperFlashMenuHost);
-+};
-+
-+#endif  // CHROME_RENDERER_PEPPER_PEPPER_FLASH_MENU_HOST_H_
-added in remote
-  their  100644 50015122ccc7e2da02d0e9b2c7014e085c3ffec4 chromium_src/chrome/renderer/pepper/pepper_flash_renderer_host.cc
-@@ -0,0 +1,370 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/renderer/pepper/pepper_flash_renderer_host.h"
-+
-+#include <map>
-+#include <vector>
-+
-+#include "base/lazy_instance.h"
-+#include "base/macros.h"
-+#include "base/metrics/histogram_macros.h"
-+#include "base/strings/string_util.h"
-+#include "content/public/renderer/pepper_plugin_instance.h"
-+#include "content/public/renderer/render_thread.h"
-+#include "content/public/renderer/renderer_ppapi_host.h"
-+#include "ipc/ipc_message_macros.h"
-+#include "net/http/http_util.h"
-+#include "ppapi/c/pp_errors.h"
-+#include "ppapi/c/trusted/ppb_browser_font_trusted.h"
-+#include "ppapi/host/dispatch_host_message.h"
-+#include "ppapi/proxy/host_dispatcher.h"
-+#include "ppapi/proxy/ppapi_messages.h"
-+#include "ppapi/proxy/resource_message_params.h"
-+#include "ppapi/proxy/serialized_structs.h"
-+#include "ppapi/thunk/enter.h"
-+#include "ppapi/thunk/ppb_image_data_api.h"
-+#include "skia/ext/platform_canvas.h"
-+#include "third_party/skia/include/core/SkCanvas.h"
-+#include "third_party/skia/include/core/SkFontStyle.h"
-+#include "third_party/skia/include/core/SkMatrix.h"
-+#include "third_party/skia/include/core/SkPaint.h"
-+#include "third_party/skia/include/core/SkPoint.h"
-+#include "third_party/skia/include/core/SkTypeface.h"
-+#include "ui/gfx/geometry/rect.h"
-+#include "url/gurl.h"
-+
-+using ppapi::thunk::EnterResourceNoLock;
-+using ppapi::thunk::PPB_ImageData_API;
-+
-+namespace {
-+
-+// Some non-simple HTTP request headers that Flash may set.
-+// (Please see http://www.w3.org/TR/cors/#simple-header for the definition of
-+// simple headers.)
-+//
-+// The list and the enum defined below are used to collect data about request
-+// headers used in PPB_Flash.Navigate() calls, in order to understand the impact
-+// of rejecting PPB_Flash.Navigate() requests with non-simple headers.
-+//
-+// TODO(yzshen): We should be able to remove the histogram recording code once
-+// we get the answer.
-+const char* const kRejectedHttpRequestHeaders[] = {
-+    "authorization",     //
-+    "cache-control",     //
-+    "content-encoding",  //
-+    "content-md5",       //
-+    "content-type",      // If the media type is not one of those covered by the
-+                         // simple header definition.
-+    "expires",           //
-+    "from",              //
-+    "if-match",          //
-+    "if-none-match",     //
-+    "if-range",          //
-+    "if-unmodified-since",  //
-+    "pragma",               //
-+    "referer"               //
-+};
-+
-+// Please note that new entries should be added right above
-+// FLASH_NAVIGATE_USAGE_ENUM_COUNT, and existing entries shouldn't be re-ordered
-+// or removed, since this ordering is used in a histogram.
-+enum FlashNavigateUsage {
-+  // This section must be in the same order as kRejectedHttpRequestHeaders.
-+  REJECT_AUTHORIZATION = 0,
-+  REJECT_CACHE_CONTROL,
-+  REJECT_CONTENT_ENCODING,
-+  REJECT_CONTENT_MD5,
-+  REJECT_CONTENT_TYPE,
-+  REJECT_EXPIRES,
-+  REJECT_FROM,
-+  REJECT_IF_MATCH,
-+  REJECT_IF_NONE_MATCH,
-+  REJECT_IF_RANGE,
-+  REJECT_IF_UNMODIFIED_SINCE,
-+  REJECT_PRAGMA,
-+  REJECT_REFERER,
-+
-+  // The navigate request is rejected because of headers not listed above
-+  // (e.g., custom headers).
-+  REJECT_OTHER_HEADERS,
-+
-+  // Total number of rejected navigate requests.
-+  TOTAL_REJECTED_NAVIGATE_REQUESTS,
-+
-+  // Total number of navigate requests.
-+  TOTAL_NAVIGATE_REQUESTS,
-+  FLASH_NAVIGATE_USAGE_ENUM_COUNT
-+};
-+
-+static base::LazyInstance<std::map<std::string, FlashNavigateUsage>>::
-+    DestructorAtExit g_rejected_headers = LAZY_INSTANCE_INITIALIZER;
-+
-+bool IsSimpleHeader(const std::string& lower_case_header_name,
-+                    const std::string& header_value) {
-+  if (lower_case_header_name == "accept" ||
-+      lower_case_header_name == "accept-language" ||
-+      lower_case_header_name == "content-language") {
-+    return true;
-+  }
-+
-+  if (lower_case_header_name == "content-type") {
-+    std::string lower_case_mime_type;
-+    std::string lower_case_charset;
-+    bool had_charset = false;
-+    net::HttpUtil::ParseContentType(header_value, &lower_case_mime_type,
-+                                    &lower_case_charset, &had_charset, NULL);
-+    return lower_case_mime_type == "application/x-www-form-urlencoded" ||
-+           lower_case_mime_type == "multipart/form-data" ||
-+           lower_case_mime_type == "text/plain";
-+  }
-+
-+  return false;
-+}
-+
-+void RecordFlashNavigateUsage(FlashNavigateUsage usage) {
-+  DCHECK_NE(FLASH_NAVIGATE_USAGE_ENUM_COUNT, usage);
-+  UMA_HISTOGRAM_ENUMERATION("Plugin.FlashNavigateUsage", usage,
-+                            FLASH_NAVIGATE_USAGE_ENUM_COUNT);
-+}
-+
-+}  // namespace
-+
-+PepperFlashRendererHost::PepperFlashRendererHost(
-+    content::RendererPpapiHost* host,
-+    PP_Instance instance,
-+    PP_Resource resource)
-+    : ResourceHost(host->GetPpapiHost(), instance, resource),
-+      host_(host),
-+      weak_factory_(this) {}
-+
-+PepperFlashRendererHost::~PepperFlashRendererHost() {
-+  // This object may be destroyed in the middle of a sync message. If that is
-+  // the case, make sure we respond to all the pending navigate calls.
-+  std::vector<ppapi::host::ReplyMessageContext>::reverse_iterator it;
-+  for (it = navigate_replies_.rbegin(); it != navigate_replies_.rend(); ++it)
-+    SendReply(*it, IPC::Message());
-+}
-+
-+int32_t PepperFlashRendererHost::OnResourceMessageReceived(
-+    const IPC::Message& msg,
-+    ppapi::host::HostMessageContext* context) {
-+  PPAPI_BEGIN_MESSAGE_MAP(PepperFlashRendererHost, msg)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_Flash_GetProxyForURL,
-+                                      OnGetProxyForURL)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_Flash_SetInstanceAlwaysOnTop,
-+                                      OnSetInstanceAlwaysOnTop)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_Flash_DrawGlyphs,
-+                                      OnDrawGlyphs)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_Flash_Navigate, OnNavigate)
-+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_Flash_IsRectTopmost,
-+                                      OnIsRectTopmost)
-+  PPAPI_END_MESSAGE_MAP()
-+  return PP_ERROR_FAILED;
-+}
-+
-+int32_t PepperFlashRendererHost::OnGetProxyForURL(
-+    ppapi::host::HostMessageContext* host_context,
-+    const std::string& url) {
-+  GURL gurl(url);
-+  if (!gurl.is_valid())
-+    return PP_ERROR_FAILED;
-+  std::string proxy;
-+  bool result = content::RenderThread::Get()->ResolveProxy(gurl, &proxy);
-+  if (!result)
-+    return PP_ERROR_FAILED;
-+  host_context->reply_msg = PpapiPluginMsg_Flash_GetProxyForURLReply(proxy);
-+  return PP_OK;
-+}
-+
-+int32_t PepperFlashRendererHost::OnSetInstanceAlwaysOnTop(
-+    ppapi::host::HostMessageContext* host_context,
-+    bool on_top) {
-+  content::PepperPluginInstance* plugin_instance =
-+      host_->GetPluginInstance(pp_instance());
-+  if (plugin_instance)
-+    plugin_instance->SetAlwaysOnTop(on_top);
-+  // Since no reply is sent for this message, it doesn't make sense to return an
-+  // error.
-+  return PP_OK;
-+}
-+
-+int32_t PepperFlashRendererHost::OnDrawGlyphs(
-+    ppapi::host::HostMessageContext* host_context,
-+    ppapi::proxy::PPBFlash_DrawGlyphs_Params params) {
-+  return PP_ERROR_FAILED;
-+  // if (params.glyph_indices.size() != params.glyph_advances.size() ||
-+  //     params.glyph_indices.empty())
-+  //   return PP_ERROR_FAILED;
-+  //
-+  // // Set up the typeface.
-+  // int weight = (params.font_desc.weight + 1) * 100;
-+  // SkFontStyle::Slant slant = SkFontStyle::kUpright_Slant;
-+  // if (params.font_desc.italic)
-+  //   slant = SkFontStyle::kItalic_Slant;
-+  // SkFontStyle style(weight, SkFontStyle::kNormal_Width, slant);
-+  // sk_sp<SkTypeface> typeface(
-+  //     SkTypeface::MakeFromName(params.font_desc.face.c_str(), style));
-+  // if (!typeface)
-+  //   return PP_ERROR_FAILED;
-+  //
-+  // EnterResourceNoLock<PPB_ImageData_API> enter(
-+  //     params.image_data.host_resource(), true);
-+  // if (enter.failed())
-+  //   return PP_ERROR_FAILED;
-+  //
-+  // // Set up the canvas.
-+  // PPB_ImageData_API* image = static_cast<PPB_ImageData_API*>(enter.object());
-+  // SkCanvas* canvas = image->GetCanvas();
-+  // bool needs_unmapping = false;
-+  // if (!canvas) {
-+  //   needs_unmapping = true;
-+  //   image->Map();
-+  //   canvas = image->GetCanvas();
-+  //   if (!canvas)
-+  //     return PP_ERROR_FAILED;  // Failure mapping.
-+  // }
-+  //
-+  // SkAutoCanvasRestore acr(canvas, true);
-+  //
-+  // // Clip is applied in pixels before the transform.
-+  // SkRect clip_rect = {
-+  //     SkIntToScalar(params.clip.point.x), SkIntToScalar(params.clip.point.y),
-+  //     SkIntToScalar(params.clip.point.x + params.clip.size.width),
-+  //     SkIntToScalar(params.clip.point.y + params.clip.size.height)};
-+  // canvas->clipRect(clip_rect);
-+  //
-+  // // Convert & set the matrix.
-+  // SkMatrix matrix;
-+  // matrix.set(SkMatrix::kMScaleX, SkFloatToScalar(params.transformation[0][0]));
-+  // matrix.set(SkMatrix::kMSkewX, SkFloatToScalar(params.transformation[0][1]));
-+  // matrix.set(SkMatrix::kMTransX, SkFloatToScalar(params.transformation[0][2]));
-+  // matrix.set(SkMatrix::kMSkewY, SkFloatToScalar(params.transformation[1][0]));
-+  // matrix.set(SkMatrix::kMScaleY, SkFloatToScalar(params.transformation[1][1]));
-+  // matrix.set(SkMatrix::kMTransY, SkFloatToScalar(params.transformation[1][2]));
-+  // matrix.set(SkMatrix::kMPersp0, SkFloatToScalar(params.transformation[2][0]));
-+  // matrix.set(SkMatrix::kMPersp1, SkFloatToScalar(params.transformation[2][1]));
-+  // matrix.set(SkMatrix::kMPersp2, SkFloatToScalar(params.transformation[2][2]));
-+  // canvas->concat(matrix);
-+  //
-+  // SkPaint paint;
-+  // paint.setColor(params.color);
-+  // paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
-+  // paint.setAntiAlias(true);
-+  // paint.setHinting(SkPaint::kFull_Hinting);
-+  // paint.setTextSize(SkIntToScalar(params.font_desc.size));
-+  // paint.setTypeface(std::move(typeface));
-+  // if (params.allow_subpixel_aa) {
-+  //   paint.setSubpixelText(true);
-+  //   paint.setLCDRenderText(true);
-+  // }
-+  //
-+  // SkScalar x = SkIntToScalar(params.position.x);
-+  // SkScalar y = SkIntToScalar(params.position.y);
-+  //
-+  // // Build up the skia advances.
-+  // size_t glyph_count = params.glyph_indices.size();
-+  // if (glyph_count) {
-+  //   std::vector<SkPoint> storage;
-+  //   storage.resize(glyph_count);
-+  //   SkPoint* sk_positions = &storage[0];
-+  //   for (uint32_t i = 0; i < glyph_count; i++) {
-+  //     sk_positions[i].set(x, y);
-+  //     x += SkFloatToScalar(params.glyph_advances[i].x);
-+  //     y += SkFloatToScalar(params.glyph_advances[i].y);
-+  //   }
-+  //
-+  //   canvas->drawPosText(&params.glyph_indices[0], glyph_count * 2, sk_positions,
-+  //                       paint);
-+  // }
-+  //
-+  // if (needs_unmapping)
-+  //   image->Unmap();
-+  //
-+  // return PP_OK;
-+}
-+
-+// CAUTION: This code is subtle because Navigate is a sync call which may
-+// cause re-entrancy or cause the instance to be destroyed. If the instance
-+// is destroyed we need to ensure that we respond to all outstanding sync
-+// messages so that the plugin process does not remain blocked.
-+int32_t PepperFlashRendererHost::OnNavigate(
-+    ppapi::host::HostMessageContext* host_context,
-+    const ppapi::URLRequestInfoData& data,
-+    const std::string& target,
-+    bool from_user_action) {
-+  // If our PepperPluginInstance is already destroyed, just return a failure.
-+  content::PepperPluginInstance* plugin_instance =
-+      host_->GetPluginInstance(pp_instance());
-+  if (!plugin_instance)
-+    return PP_ERROR_FAILED;
-+
-+  std::map<std::string, FlashNavigateUsage>& rejected_headers =
-+      g_rejected_headers.Get();
-+  if (rejected_headers.empty()) {
-+    for (size_t i = 0; i < arraysize(kRejectedHttpRequestHeaders); ++i)
-+      rejected_headers[kRejectedHttpRequestHeaders[i]] =
-+          static_cast<FlashNavigateUsage>(i);
-+  }
-+
-+  net::HttpUtil::HeadersIterator header_iter(data.headers.begin(),
-+                                             data.headers.end(), "\n\r");
-+  bool rejected = false;
-+  while (header_iter.GetNext()) {
-+    std::string lower_case_header_name = base::ToLowerASCII(header_iter.name());
-+    if (!IsSimpleHeader(lower_case_header_name, header_iter.values())) {
-+      rejected = true;
-+
-+      std::map<std::string, FlashNavigateUsage>::const_iterator iter =
-+          rejected_headers.find(lower_case_header_name);
-+      FlashNavigateUsage usage =
-+          iter != rejected_headers.end() ? iter->second : REJECT_OTHER_HEADERS;
-+      RecordFlashNavigateUsage(usage);
-+    }
-+  }
-+
-+  RecordFlashNavigateUsage(TOTAL_NAVIGATE_REQUESTS);
-+  if (rejected) {
-+    RecordFlashNavigateUsage(TOTAL_REJECTED_NAVIGATE_REQUESTS);
-+    return PP_ERROR_NOACCESS;
-+  }
-+
-+  // Navigate may call into Javascript (e.g. with a "javascript:" URL),
-+  // or do things like navigate away from the page, either one of which will
-+  // need to re-enter into the plugin. It is safe, because it is essentially
-+  // equivalent to NPN_GetURL, where Flash would expect re-entrancy.
-+  ppapi::proxy::HostDispatcher* host_dispatcher =
-+      ppapi::proxy::HostDispatcher::GetForInstance(pp_instance());
-+  host_dispatcher->set_allow_plugin_reentrancy();
-+
-+  // Grab a weak pointer to ourselves on the stack so we can check if we are
-+  // still alive.
-+  base::WeakPtr<PepperFlashRendererHost> weak_ptr = weak_factory_.GetWeakPtr();
-+  // Keep track of reply contexts in case we are destroyed during a Navigate
-+  // call. Even if we are destroyed, we still need to send these replies to
-+  // unblock the plugin process.
-+  navigate_replies_.push_back(host_context->MakeReplyMessageContext());
-+  plugin_instance->Navigate(data, target.c_str(), from_user_action);
-+  // This object might have been destroyed by this point. If it is destroyed
-+  // the reply will be sent in the destructor. Otherwise send the reply here.
-+  if (weak_ptr.get()) {
-+    SendReply(navigate_replies_.back(), IPC::Message());
-+    navigate_replies_.pop_back();
-+  }
-+
-+  // Return PP_OK_COMPLETIONPENDING so that no reply is automatically sent.
-+  return PP_OK_COMPLETIONPENDING;
-+}
-+
-+int32_t PepperFlashRendererHost::OnIsRectTopmost(
-+    ppapi::host::HostMessageContext* host_context,
-+    const PP_Rect& rect) {
-+  content::PepperPluginInstance* plugin_instance =
-+      host_->GetPluginInstance(pp_instance());
-+  if (plugin_instance &&
-+      plugin_instance->IsRectTopmost(gfx::Rect(
-+          rect.point.x, rect.point.y, rect.size.width, rect.size.height)))
-+    return PP_OK;
-+  return PP_ERROR_FAILED;
-+}
-added in remote
-  their  100644 b080f1d9fbf0db2e6adaf67dd783b05eeb9d06a0 chromium_src/chrome/renderer/pepper/pepper_flash_renderer_host.h
-@@ -0,0 +1,68 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_RENDERER_PEPPER_PEPPER_FLASH_RENDERER_HOST_H_
-+#define CHROME_RENDERER_PEPPER_PEPPER_FLASH_RENDERER_HOST_H_
-+
-+#include <string>
-+#include <vector>
-+
-+#include "base/memory/weak_ptr.h"
-+#include "ppapi/host/host_message_context.h"
-+#include "ppapi/host/resource_host.h"
-+
-+struct PP_Rect;
-+
-+namespace ppapi {
-+struct URLRequestInfoData;
-+}
-+
-+namespace ppapi {
-+namespace proxy {
-+struct PPBFlash_DrawGlyphs_Params;
-+}
-+}  // namespace ppapi
-+
-+namespace content {
-+class RendererPpapiHost;
-+}
-+
-+class PepperFlashRendererHost : public ppapi::host::ResourceHost {
-+ public:
-+  PepperFlashRendererHost(content::RendererPpapiHost* host,
-+                          PP_Instance instance,
-+                          PP_Resource resource);
-+  ~PepperFlashRendererHost() override;
-+
-+  // ppapi::host::ResourceHost override.
-+  int32_t OnResourceMessageReceived(
-+      const IPC::Message& msg,
-+      ppapi::host::HostMessageContext* context) override;
-+
-+ private:
-+  int32_t OnGetProxyForURL(ppapi::host::HostMessageContext* host_context,
-+                           const std::string& url);
-+  int32_t OnSetInstanceAlwaysOnTop(
-+      ppapi::host::HostMessageContext* host_context,
-+      bool on_top);
-+  int32_t OnDrawGlyphs(ppapi::host::HostMessageContext* host_context,
-+                       ppapi::proxy::PPBFlash_DrawGlyphs_Params params);
-+  int32_t OnNavigate(ppapi::host::HostMessageContext* host_context,
-+                     const ppapi::URLRequestInfoData& data,
-+                     const std::string& target,
-+                     bool from_user_action);
-+  int32_t OnIsRectTopmost(ppapi::host::HostMessageContext* host_context,
-+                          const PP_Rect& rect);
-+
-+  // A stack of ReplyMessageContexts to track Navigate() calls which have not
-+  // yet been replied to.
-+  std::vector<ppapi::host::ReplyMessageContext> navigate_replies_;
-+
-+  content::RendererPpapiHost* host_;
-+  base::WeakPtrFactory<PepperFlashRendererHost> weak_factory_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(PepperFlashRendererHost);
-+};
-+
-+#endif  // CHROME_RENDERER_PEPPER_PEPPER_FLASH_RENDERER_HOST_H_
-added in remote
-  their  100644 eef18560f9e577a77f8dc4eba64bf5907f77a0e2 chromium_src/chrome/renderer/pepper/pepper_helper.cc
-@@ -0,0 +1,30 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/renderer/pepper/pepper_helper.h"
-+
-+#include "chrome/renderer/pepper/chrome_renderer_pepper_host_factory.h"
-+#include "chrome/renderer/pepper/pepper_shared_memory_message_filter.h"
-+#include "content/public/renderer/renderer_ppapi_host.h"
-+#include "ppapi/host/ppapi_host.h"
-+
-+PepperHelper::PepperHelper(content::RenderFrame* render_frame)
-+    : RenderFrameObserver(render_frame) {}
-+
-+PepperHelper::~PepperHelper() {}
-+
-+void PepperHelper::DidCreatePepperPlugin(content::RendererPpapiHost* host) {
-+  // TODO(brettw) figure out how to hook up the host factory. It needs some
-+  // kind of filter-like system to allow dynamic additions.
-+  host->GetPpapiHost()->AddHostFactoryFilter(
-+      std::unique_ptr<ppapi::host::HostFactory>(
-+          new ChromeRendererPepperHostFactory(host)));
-+  host->GetPpapiHost()->AddInstanceMessageFilter(
-+      std::unique_ptr<ppapi::host::InstanceMessageFilter>(
-+          new PepperSharedMemoryMessageFilter(host)));
-+}
-+
-+void PepperHelper::OnDestruct() {
-+  delete this;
-+}
-added in remote
-  their  100644 6157d2c794868d5d2b5f39ddd6f38cbce72a0a9f chromium_src/chrome/renderer/pepper/pepper_helper.h
-@@ -0,0 +1,26 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_RENDERER_PEPPER_PEPPER_HELPER_H_
-+#define CHROME_RENDERER_PEPPER_PEPPER_HELPER_H_
-+
-+#include "base/compiler_specific.h"
-+#include "content/public/renderer/render_frame_observer.h"
-+
-+// This class listens for Pepper creation events from the RenderFrame and
-+// attaches the parts required for Chrome-specific plugin support.
-+class PepperHelper : public content::RenderFrameObserver {
-+ public:
-+  explicit PepperHelper(content::RenderFrame* render_frame);
-+  ~PepperHelper() override;
-+
-+  // RenderFrameObserver.
-+  void DidCreatePepperPlugin(content::RendererPpapiHost* host) override;
-+  void OnDestruct() override;
-+
-+ private:
-+  DISALLOW_COPY_AND_ASSIGN(PepperHelper);
-+};
-+
-+#endif  // CHROME_RENDERER_PEPPER_PEPPER_HELPER_H_
-added in remote
-  their  100644 fb72c2da786b3cbcef7ce149f560821592df1747 chromium_src/chrome/renderer/pepper/pepper_shared_memory_message_filter.cc
-@@ -0,0 +1,63 @@
-+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "chrome/renderer/pepper/pepper_shared_memory_message_filter.h"
-+
-+#include <memory>
-+
-+#include "base/memory/shared_memory.h"
-+#include "base/process/process_handle.h"
-+#include "content/public/common/content_client.h"
-+#include "content/public/renderer/pepper_plugin_instance.h"
-+#include "content/public/renderer/render_thread.h"
-+#include "content/public/renderer/renderer_ppapi_host.h"
-+#include "ppapi/host/ppapi_host.h"
-+#include "ppapi/proxy/ppapi_messages.h"
-+#include "ppapi/shared_impl/var_tracker.h"
-+
-+PepperSharedMemoryMessageFilter::PepperSharedMemoryMessageFilter(
-+    content::RendererPpapiHost* host)
-+    : InstanceMessageFilter(host->GetPpapiHost()), host_(host) {}
-+
-+PepperSharedMemoryMessageFilter::~PepperSharedMemoryMessageFilter() {}
-+
-+bool PepperSharedMemoryMessageFilter::OnInstanceMessageReceived(
-+    const IPC::Message& msg) {
-+  bool handled = true;
-+  IPC_BEGIN_MESSAGE_MAP(PepperSharedMemoryMessageFilter, msg)
-+    IPC_MESSAGE_HANDLER(PpapiHostMsg_SharedMemory_CreateSharedMemory,
-+                        OnHostMsgCreateSharedMemory)
-+    IPC_MESSAGE_UNHANDLED(handled = false)
-+  IPC_END_MESSAGE_MAP()
-+  return handled;
-+}
-+
-+bool PepperSharedMemoryMessageFilter::Send(IPC::Message* msg) {
-+  return host_->GetPpapiHost()->Send(msg);
-+}
-+
-+void PepperSharedMemoryMessageFilter::OnHostMsgCreateSharedMemory(
-+    PP_Instance instance,
-+    uint32_t size,
-+    int* host_handle_id,
-+    ppapi::proxy::SerializedHandle* plugin_handle) {
-+  plugin_handle->set_null_shmem();
-+  *host_handle_id = -1;
-+  std::unique_ptr<base::SharedMemory> shm(
-+      content::RenderThread::Get()->HostAllocateSharedMemoryBuffer(size));
-+  if (!shm.get())
-+    return;
-+
-+  base::SharedMemoryHandle host_shm_handle = shm->handle().Duplicate();
-+  *host_handle_id =
-+      content::PepperPluginInstance::Get(instance)
-+          ->GetVarTracker()
-+          ->TrackSharedMemoryHandle(instance, host_shm_handle, size);
-+
-+  // We set auto_close to false since we need our file descriptor to
-+  // actually be duplicated on linux. The shared memory destructor will
-+  // close the original handle for us.
-+  plugin_handle->set_shmem(
-+      host_->ShareSharedMemoryHandleWithRemote(host_shm_handle), size);
-+}
-added in remote
-  their  100644 d1e2dc1719e501561941cafeab4fd95ef0779314 chromium_src/chrome/renderer/pepper/pepper_shared_memory_message_filter.h
-@@ -0,0 +1,46 @@
-+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_RENDERER_PEPPER_PEPPER_SHARED_MEMORY_MESSAGE_FILTER_H_
-+#define CHROME_RENDERER_PEPPER_PEPPER_SHARED_MEMORY_MESSAGE_FILTER_H_
-+
-+#include "ppapi/c/pp_instance.h"
-+#include "ppapi/host/instance_message_filter.h"
-+
-+namespace content {
-+class RendererPpapiHost;
-+}
-+
-+namespace ppapi {
-+namespace proxy {
-+class SerializedHandle;
-+}
-+}  // namespace ppapi
-+
-+// Implements the backend for shared memory messages from a plugin process.
-+class PepperSharedMemoryMessageFilter
-+    : public ppapi::host::InstanceMessageFilter {
-+ public:
-+  explicit PepperSharedMemoryMessageFilter(content::RendererPpapiHost* host);
-+  ~PepperSharedMemoryMessageFilter() override;
-+
-+  // InstanceMessageFilter:
-+  bool OnInstanceMessageReceived(const IPC::Message& msg) override;
-+
-+  bool Send(IPC::Message* msg);
-+
-+ private:
-+  // Message handlers.
-+  void OnHostMsgCreateSharedMemory(
-+      PP_Instance instance,
-+      uint32_t size,
-+      int* host_shm_handle_id,
-+      ppapi::proxy::SerializedHandle* plugin_shm_handle);
-+
-+  content::RendererPpapiHost* host_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(PepperSharedMemoryMessageFilter);
-+};
-+
-+#endif  // CHROME_RENDERER_PEPPER_PEPPER_SHARED_MEMORY_MESSAGE_FILTER_H_
-added in both
-  our    100644 8744574f10aa0235234f87cd1b614572d9ba98e9 chromium_src/chrome/utility/printing_handler_win.h
-  their  100644 d058e7e505569126827ba24b3a42051ba386630c chromium_src/chrome/utility/printing_handler_win.h
-@@ -13,7 +13,11 @@
- 
- namespace printing {
- 
-+<<<<<<< .our
- struct PdfRenderSettings;
-+=======
-+class PdfRenderSettings;
-+>>>>>>> .their
- struct PwgRasterSettings;
- struct PageRange;
- 
-added in both
-  our    100644 1b9da74e503ab4afa8d2c530cd45332f0868a463 default_app/default_app.js
-  their  100644 e6ba9eea2cb5938fe71ab7c18a47921d3959061e default_app/default_app.js
-@@ -18,17 +18,24 @@
-       webPreferences: {
-         nodeIntegrationInWorker: true
-       },
-+<<<<<<< .our
-       useContentSize: true,
-       show: false
-+=======
-+      useContentSize: true
-+>>>>>>> .their
-     }
-     if (process.platform === 'linux') {
-       options.icon = path.join(__dirname, 'icon.png')
-     }
- 
-     mainWindow = new BrowserWindow(options)
-+<<<<<<< .our
- 
-     mainWindow.on('ready-to-show', () => mainWindow.show())
- 
-+=======
-+>>>>>>> .their
-     mainWindow.loadURL(appUrl)
-     mainWindow.focus()
-   })
-added in both
-  our    100644 fd4525f128b5f7718e03998a9d83ae79ff163078 default_app/index.html
-  their  100644 c8564cb57a11cbfea4bea37db09df4cd82dee4fb default_app/index.html
-@@ -2,13 +2,174 @@
- 
- <head>
-   <title>Electron</title>
-+<<<<<<< .our
-   <meta http-equiv="Content-Security-Policy" content="default-src 'none'; script-src 'self'; style-src 'self'; img-src 'self'" />
-   <link href="./styles.css" type="text/css" rel="stylesheet" />
-   <link href="./node_modules/octicons/build/build.css" type="text/css" rel="stylesheet" />
-+=======
-+  <style>
-+    body {
-+      color: #86a5b1;
-+      background-color: #2f3241;
-+      font-family: Roboto, -apple-system, BlinkMacSystemFont, "Helvetica Neue", "Segoe UI", "Oxygen", "Ubuntu", "Cantarell", "Open Sans", sans-serif;
-+      margin: 0;
-+      display: flex;
-+      flex-direction: column;
-+    }
-+
-+    .container {
-+      margin: 15px 30px 30px 30px;
-+      background-color: #2f3241;
-+      flex: 1;
-+      display: flex;
-+      flex-direction: column;
-+    }
-+
-+    .svg-stroke {
-+      stroke: #9feaf9;
-+    }
-+
-+    .svg-fill {
-+      fill: #9feaf9;
-+    }
-+
-+    .vertical-middle {
-+      vertical-align: middle !important;
-+    }
-+
-+    h2, h4, p {
-+      text-align: center;
-+    }
-+
-+    h4 {
-+      font-weight: normal;
-+      margin: 0;
-+      line-height: 3;
-+    }
-+
-+    .hero-icons {
-+      transform-origin: 50% 50%;
-+    }
-+
-+    hero-icon.loop-3 {
-+      transform: translate(79px, 21px);
-+      opacity: 1;
-+    }
-+
-+    .hero-icon {
-+      fill: #c2f5ff;
-+      opacity: 1;
-+      transform-origin: 50% 50%;
-+    }
-+
-+    .hero-app {
-+      fill: #71abb7;
-+      transform-origin: 50% 50%;
-+    }
-+
-+    a {
-+      color: #86a5b1;
-+      text-decoration: none;
-+      transition: all 0.2s;
-+    }
-+
-+    a:hover {
-+      color: #c2f5ff;
-+      text-decoration: none;
-+    }
-+
-+    pre, code, .code {
-+      font-family: "Menlo", "Lucida Console", monospace;
-+      color: #c2f5ff;
-+    }
-+
-+    pre {
-+      background-color: #26282E;
-+      white-space: pre-wrap;
-+      line-height: 2.5;
-+      overflow: auto;
-+      margin: 0 auto;
-+      display: inline-block;
-+      padding: 6px 15px;
-+      text-align: center;
-+      border-radius: 3px;
-+    }
-+
-+    pre.with-prompt:before {
-+      content: "$ ";
-+      opacity: 0.7;
-+    }
-+
-+    code {
-+      padding: 1px 4px;
-+      font-size: 14px;
-+      text-align: center;
-+    }
-+
-+    .versions {
-+      list-style: none;
-+      margin: 0 auto;
-+      padding: 0;
-+      float: none;
-+      clear: both;
-+      overflow: hidden;
-+    }
-+
-+    .versions li {
-+      display: block;
-+      float: left;
-+      border-right: 1px solid rgba(194, 245, 255, 0.4);
-+      padding: 0 20px;
-+      font-size: 13px;
-+      opacity: 0.8;
-+    }
-+
-+    .versions li:last-child {
-+      border: none;
-+    }
-+
-+    nav {
-+      margin: 40px 0 0 0;
-+    }
-+
-+    .linkcol {
-+      width: 19%;
-+      display: inline-block;
-+      text-align: center;
-+    }
-+
-+    .hero-octicon {
-+      display: block;
-+      width: 80px;
-+      height: 80px;
-+      margin: 0;
-+      padding: 0;
-+      font-size: 42px !important;
-+      color: #9feaf9;
-+      text-align: center;
-+      background-color: rgba(194, 245, 255, 0.1);
-+      border-radius: 50%;
-+    }
-+
-+    .hero-octicon:before {
-+      display: block;
-+      padding-top: 20px;
-+    }
-+
-+    .octicon-gist:before { padding-left: 10px; }
-+    .octicon-gear:before { padding-left: 5px; }
-+    .octicon-star:before { padding-left: 6px; }
-+    .octicon-gift:before { padding-left: 2px; }
-+  </style>
-+>>>>>>> .their
- </head>
- 
- <body>
-   <div class="container">
-+<<<<<<< .our
-+=======
-+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/octicons/4.4.0/font/octicons.css">
-+>>>>>>> .their
-     <ul class="versions code">
-       <li class="electron-version"></li>
-       <li class="chrome-version"></li>
-@@ -84,7 +245,13 @@
-     </div>
-   </nav>
- 
-+<<<<<<< .our
-   <script src="./renderer.js"></script>
-+=======
-+  <script>
-+    require('./renderer')
-+  </script>
-+>>>>>>> .their
- </body>
- 
- </html>
-\ No newline at end of file
-added in both
-  our    100644 0e93f684875ca8c4fd8c771c93dce9110de57c15 default_app/main.js
-  their  100644 7fdfc7c3fa3607f1cb664bf50a9b536abe5c40d5 default_app/main.js
-@@ -320,7 +320,11 @@
-   const file = option.file
-   const protocol = url.parse(file).protocol
-   const extension = path.extname(file)
-+<<<<<<< .our
-   if (protocol === 'http:' || protocol === 'https:' || protocol === 'file:' || protocol === 'chrome:') {
-+=======
-+  if (protocol === 'http:' || protocol === 'https:' || protocol === 'file:') {
-+>>>>>>> .their
-     loadApplicationByUrl(file)
-   } else if (extension === '.html' || extension === '.htm') {
-     loadApplicationByUrl('file://' + path.resolve(file))
-added in both
-  our    100644 977aad7ab9d4171d2ab86b599eee1e39b4b82041 default_app/renderer.js
-  their  100644 92e5530ada1aa971e28b276164e1a8885bce9f45 default_app/renderer.js
-@@ -1,5 +1,8 @@
- const {remote, shell} = require('electron')
-+<<<<<<< .our
- const fs = require('fs')
-+=======
-+>>>>>>> .their
- const path = require('path')
- const URL = require('url')
- const electronPath = path.relative(process.cwd(), remote.process.execPath)
-@@ -21,6 +24,7 @@
- document.querySelector('.node-version').innerText = `Node v${process.versions.node}`
- document.querySelector('.v8-version').innerText = `v8 v${process.versions.v8}`
- document.querySelector('.command-example').innerText = `${electronPath} path-to-app`
-+<<<<<<< .our
- 
- function getOcticonSvg (name) {
-   const octiconPath = path.resolve(__dirname, 'node_modules', 'octicons', 'build', 'svg', `${name}.svg`)
-@@ -50,3 +54,5 @@
- for (const element of document.querySelectorAll('.octicon')) {
-   loadSVG(element)
- }
-+=======
-+>>>>>>> .their
-added in both
-  our    100644 14dc557e237404cbbd5bcebabb0e65486dc36926 docs/api/app.md
-  their  100644 740da22d82ee5662e5bb994fa8e1c2eadb907a5e docs/api/app.md
-@@ -881,7 +881,11 @@
- 
- Imports the certificate in pkcs12 format into the platform certificate store.
- `callback` is called with the `result` of import operation, a value of `0`
-+<<<<<<< .our
- indicates success while any other value indicates failure according to Chromium [net_error_list](https://code.google.com/p/chromium/codesearch#chromium/src/net/base/net_error_list.h).
-+=======
-+indicates success while any other value indicates failure according to chromium [net_error_list](https://code.google.com/p/chromium/codesearch#chromium/src/net/base/net_error_list.h).
-+>>>>>>> .their
- 
- ### `app.disableHardwareAcceleration()`
- 
-@@ -1033,7 +1037,11 @@
- stopAccessingSecurityScopedResource()
- ```
- 
-+<<<<<<< .our
- Start accessing a security scoped resource. With this method Electron applications that are packaged for the Mac App Store may reach outside their sandbox to access files chosen by the user. See [Apple's documentation](https://developer.apple.com/library/content/documentation/Security/Conceptual/AppSandboxDesignGuide/AppSandboxInDepth/AppSandboxInDepth.html#//apple_ref/doc/uid/TP40011183-CH3-SW16) for a description of how this system works.
-+=======
-+Start accessing a security scoped resource. With this method electron applications that are packaged for the Mac App Store may reach outside their sandbox to access files chosen by the user. See [Apple's documentation](https://developer.apple.com/library/content/documentation/Security/Conceptual/AppSandboxDesignGuide/AppSandboxInDepth/AppSandboxInDepth.html#//apple_ref/doc/uid/TP40011183-CH3-SW16) for a description of how this system works.
-+>>>>>>> .their
- 
- ### `app.commandLine.appendSwitch(switch[, value])`
- 
-added in both
-  our    100644 7f840f07102aae0f0308742e66692345a84cb84b docs/api/auto-updater.md
-  their  100644 bb181347a0ae9c4f78c48f4932c569db9f2627b5 docs/api/auto-updater.md
-@@ -84,9 +84,12 @@
- 
- On Windows only `releaseName` is available.
- 
-+<<<<<<< .our
- **Note:** It is not strictly necessary to handle this event. A successfully 
- downloaded update will still be applied the next time the application starts.
- 
-+=======
-+>>>>>>> .their
- ### Event: 'before-quit-for-update'
- 
- This event is emitted after a user calls `quitAndInstall()`.
-@@ -125,9 +128,15 @@
- windows first, and automatically call `app.quit()` after all windows have been
- closed.
- 
-+<<<<<<< .our
- **Note:** It is not strictly necessary to call this function to apply an update, 
- as a successfully downloaded update will always be applied the next time the 
- application starts.
-+=======
-+**Note:** If the application is quit without calling this API after the
-+`update-downloaded` event has been emitted, the application will still be
-+replaced by the updated one on the next run.
-+>>>>>>> .their
- 
- [squirrel-mac]: https://github.com/Squirrel/Squirrel.Mac
- [server-support]: https://github.com/Squirrel/Squirrel.Mac#server-support
-added in both
-  our    100644 7e3557fbb399d4691628f059f419a2b5027f4333 docs/api/breaking-changes.md
-  their  100644 1e38f4a8823c0c164efdaf361a306fd2d4a85f24 docs/api/breaking-changes.md
-@@ -182,10 +182,13 @@
- webContents.openDevTools({detach: true})
- // Replace with
- webContents.openDevTools({mode: 'detach'})
-+<<<<<<< .our
- 
- // Removed
- webContents.setSize(options)
- // There is no replacement for this API
-+=======
-+>>>>>>> .their
- ```
- 
- ## `webFrame`
-@@ -202,6 +205,7 @@
- protocol.registerStandardSchemes(['app'], {secure: true})
- ```
- 
-+<<<<<<< .our
- ## `<webview>`
- 
- ```js
-@@ -214,6 +218,8 @@
- // There is no replacement for this API
- ```
- 
-+=======
-+>>>>>>> .their
- ## Node Headers URL
- 
- This is the URL specified as `disturl` in a `.npmrc` file or as the `--dist-url`
-added in both
-  our    100644 dff61dd336f047cf2f6f06228b2df2b98ff2304d docs/api/browser-window.md
-  their  100644 3536b6581a376776abdf1945aba7038c65dab1e9 docs/api/browser-window.md
-@@ -305,6 +305,11 @@
-     * `plugins` Boolean (optional) - Whether plugins should be enabled. Default is `false`.
-     * `experimentalFeatures` Boolean (optional) - Enables Chromium's experimental features.
-       Default is `false`.
-+<<<<<<< .our
-+=======
-+    * `experimentalCanvasFeatures` Boolean (optional) - Enables Chromium's experimental
-+      canvas features. Default is `false`.
-+>>>>>>> .their
-     * `scrollBounce` Boolean (optional) - Enables scroll bounce (rubber banding) effect on
-       macOS. Default is `false`.
-     * `enableBlinkFeatures` String (optional) - A list of feature strings separated by `,`, like
-@@ -490,6 +495,7 @@
- 
- Emitted when the window is restored from a minimized state.
- 
-+<<<<<<< .our
- #### Event: 'will-resize' _macOS_ _Windows_
- 
- Returns:
-@@ -504,6 +510,11 @@
- #### Event: 'resize'
- 
- Emitted after the window has been resized.
-+=======
-+#### Event: 'resize'
-+
-+Emitted when the window is being resized.
-+>>>>>>> .their
- 
- #### Event: 'move'
- 
-@@ -1240,7 +1251,11 @@
- 
- #### `win.setOverlayIcon(overlay, description)` _Windows_
- 
-+<<<<<<< .our
- * `overlay` [NativeImage](native-image.md) | null - the icon to display on the bottom
-+=======
-+* `overlay` [NativeImage](native-image.md) - the icon to display on the bottom
-+>>>>>>> .their
- right corner of the taskbar icon. If this parameter is `null`, the overlay is
- cleared
- * `description` String - a description that will be provided to Accessibility
-@@ -1273,6 +1288,7 @@
- 
- Returns `Number` - between 0.0 (fully transparent) and 1.0 (fully opaque)
- 
-+<<<<<<< .our
- #### `win.setShape(rects)` _Windows_ _Linux_ _Experimental_
- 
- * `rects` [Rectangle[]](structures/rectangle.md) - Sets a shape on the window.
-@@ -1284,6 +1300,8 @@
- the region will not be received by that window, but will fall through to
- whatever is behind the window.
- 
-+=======
-+>>>>>>> .their
- #### `win.setThumbarButtons(buttons)` _Windows_
- 
- * `buttons` [ThumbarButton[]](structures/thumbar-button.md)
-@@ -1364,6 +1382,7 @@
- 
- Changes window icon.
- 
-+<<<<<<< .our
- #### `win.setWindowButtonVisibility(visible)` _macOS_
- 
- * `visible` Boolean
-@@ -1372,6 +1391,8 @@
- 
- This cannot be called when `titleBarStyle` is set to `customButtonsOnHover`.
- 
-+=======
-+>>>>>>> .their
- #### `win.setAutoHideMenuBar(hide)`
- 
- * `hide` Boolean
-added in both
-  our    100644 b2b28f5adb7de78a0d945e0ed1ee196d6aa45fd1 docs/api/chrome-command-line-switches.md
-  their  100644 132eddfdeb74b007958793ca62a033ecbf8d486d docs/api/chrome-command-line-switches.md
-@@ -60,8 +60,12 @@
- Use a specified proxy server, which overrides the system setting. This switch
- only affects requests with HTTP protocol, including HTTPS and WebSocket
- requests. It is also noteworthy that not all proxy servers support HTTPS and
-+<<<<<<< .our
- WebSocket requests. The proxy URL does not support username and password
- authentication [per Chromium issue](https://bugs.chromium.org/p/chromium/issues/detail?id=615947).
-+=======
-+WebSocket requests.
-+>>>>>>> .their
- 
- ## --proxy-bypass-list=`hosts`
- 
-added in both
-  our    100644 586c17e37ac1afaf7aaac3b213434ab4ecbb1ca2 docs/api/client-request.md
-  their  100644 5cd9562b654a2e8d4483d25254bb2ae72ec5b7bc docs/api/client-request.md
-@@ -215,6 +215,7 @@
- #### `request.followRedirect()`
- 
- Continues any deferred redirection request when the redirection mode is `manual`.
-+<<<<<<< .our
- 
- #### `request.getUploadProgress()`
- 
-@@ -229,3 +230,5 @@
- 
- You can use this method in conjunction with `POST` requests to get the progress
- of a file upload or other data transfer.
-+=======
-+>>>>>>> .their
-added in both
-  our    100644 80d266ab56382901e7745067488d3d316c172294 docs/api/crash-reporter.md
-  their  100644 d8f9f060241760ac723f7202d11edf2b93c04272 docs/api/crash-reporter.md
-@@ -42,7 +42,11 @@
- ### `crashReporter.start(options)`
- 
- * `options` Object
-+<<<<<<< .our
-   * `companyName` String
-+=======
-+  * `companyName` String (optional)
-+>>>>>>> .their
-   * `submitURL` String - URL that crash reports will be sent to as POST.
-   * `productName` String (optional) - Defaults to `app.getName()`.
-   * `uploadToServer` Boolean (optional) - Whether crash reports should be sent to the server
-added in both
-  our    100644 11101ae3ec01954b61266051ee74078ebfe8b299 docs/api/dialog.md
-  their  100644 a69cba8b969eeb8c7f06b9d246981d9291dae0ed docs/api/dialog.md
-@@ -141,7 +141,11 @@
-   * `cancelId` Integer (optional) - The index of the button to be used to cancel the dialog, via
-     the `Esc` key. By default this is assigned to the first button with "cancel" or "no" as the
-     label. If no such labeled buttons exist and this option is not set, `0` will be used as the
-+<<<<<<< .our
-     return value or callback response.
-+=======
-+    return value or callback response. This option is ignored on Windows.
-+>>>>>>> .their
-   * `noLink` Boolean (optional) - On Windows Electron will try to figure out which one of
-     the `buttons` are common buttons (like "Cancel" or "Yes"), and show the
-     others as command links in the dialog. This can make the dialog appear in
-added in both
-  our    100644 ae04a286821de314680b67c9a666e6d2a0f42db0 docs/api/menu-item.md
-  their  100644 f687e43dbc9f5fa925a06ceeaa67bf503fff5c37 docs/api/menu-item.md
-@@ -47,9 +47,12 @@
- The `label` and `accelerator` values are optional when using a `role` and will
- default to appropriate values for each platform.
- 
-+<<<<<<< .our
- Every menu item must have either a `role`, `label`, or in the case of a separator
- a `type`.
- 
-+=======
-+>>>>>>> .their
- The `role` property can have following values:
- 
- * `undo`
-@@ -62,11 +65,19 @@
- * `delete`
- * `minimize` - Minimize current window.
- * `close` - Close current window.
-+<<<<<<< .our
- * `quit` - Quit the application.
- * `reload` - Reload the current window.
- * `forceReload` - Reload the current window ignoring the cache.
- * `toggleDevTools` - Toggle developer tools in the current window.
- * `toggleFullScreen` - Toggle full screen mode on the current window.
-+=======
-+* `quit`- Quit the application.
-+* `reload` - Reload the current window.
-+* `forceReload` - Reload the current window ignoring the cache.
-+* `toggleDevTools` - Toggle developer tools in the current window.
-+* `toggleFullScreen`- Toggle full screen mode on the current window.
-+>>>>>>> .their
- * `resetZoom` - Reset the focused page's zoom level to the original size.
- * `zoomIn` - Zoom in the focused page by 10%.
- * `zoomOut` - Zoom out the focused page by 10%.
-added in both
-  our    100644 e1d6e9958de7f2b95129c9c7e69f0941e466e3e8 docs/api/menu.md
-  their  100644 339a9ef7986b545829195d5e5600a678849f3782 docs/api/menu.md
-@@ -61,7 +61,11 @@
- 
- #### `menu.popup(options)`
- 
-+<<<<<<< .our
- * `options` Object (optional)
-+=======
-+* `options` Object
-+>>>>>>> .their
-   * `window` [BrowserWindow](browser-window.md) (optional) - Default is the focused window.
-   * `x` Number (optional) - Default is the current mouse cursor position.
-     Must be declared if `y` is declared.
-added in both
-  our    100644 1f6b20d2f25c31b48fbb2bfedc6a064ae283424f docs/api/process.md
-  their  100644 ada0554bd83f7ca5aca12aeb09ef72c0b232919c docs/api/process.md
-@@ -8,6 +8,7 @@
- [Node.js `process` object](https://nodejs.org/api/process.html).
- It adds the following events, properties, and methods:
- 
-+<<<<<<< .our
- ## Sandbox
- 
- In sandboxed renderers the `process` object contains only a subset of the APIs:
-@@ -30,6 +31,8 @@
- - `version`
- - `versions`
- 
-+=======
-+>>>>>>> .their
- ## Events
- 
- ### Event: 'loaded'
-@@ -77,11 +80,14 @@
- 
- A `String` representing the path to the resources directory.
- 
-+<<<<<<< .our
- ### `process.sandboxed`
- 
- A `Boolean`. When the renderer process is sandboxed, this property is `true`,
- otherwise it is `undefined`.
- 
-+=======
-+>>>>>>> .their
- ### `process.throwDeprecation`
- 
- A `Boolean` that controls whether or not deprecation warnings will be thrown as
-@@ -125,6 +131,7 @@
- 
- Causes the main thread of the current process crash.
- 
-+<<<<<<< .our
- ### `process.getCreationTime()`
- 
- Returns `Number | null` - The number of milliseconds since epoch, or `null` if the information is unavailable
-@@ -132,6 +139,8 @@
- Indicates the creation time of the application.
- The time is represented as number of milliseconds since epoch. It returns null if it is unable to get the process creation time.
- 
-+=======
-+>>>>>>> .their
- ### `process.getCPUUsage()`
- 
- Returns [`CPUUsage`](structures/cpu-usage.md)
-added in both
-  our    100644 8a9d242fce0e5b35af4d2a45dfe30153d73a0532 docs/api/sandbox-option.md
-  their  100644 4923f93bbe6d47c86e9c2c5a273c4c469d3a1fa7 docs/api/sandbox-option.md
-@@ -2,7 +2,11 @@
- 
- > Create a browser window with a renderer that can run inside Chromium OS sandbox. With this
- option enabled, the renderer must communicate via IPC to the main process in order to access node APIs.
-+<<<<<<< .our
- However, in order to enable the Chromium OS sandbox, Electron must be run with the `--enable-sandbox`
-+=======
-+However, in order to enable the Chromium OS sandbox, electron must be run with the `--enable-sandbox`
-+>>>>>>> .their
- command line argument.
- 
- One of the key security features of Chromium is that all blink rendering/JavaScript
-@@ -14,14 +18,22 @@
- [Here's](https://www.chromium.org/developers/design-documents/sandbox) more
- information about the sandbox.
- 
-+<<<<<<< .our
- Since a major feature in Electron is the ability to run Node.js in the
- renderer process (making it easier to develop desktop applications using web
- technologies), the sandbox is disabled by electron. This is because
- most Node.js APIs require system access. `require()` for example, is not
-+=======
-+Since a major feature in electron is the ability to run node.js in the
-+renderer process (making it easier to develop desktop applications using web
-+technologies), the sandbox is disabled by electron. This is because
-+most node.js APIs require system access. `require()` for example, is not
-+>>>>>>> .their
- possible without file system permissions, which are not available in a sandboxed
- environment.
- 
- Usually this is not a problem for desktop applications since the code is always
-+<<<<<<< .our
- trusted, but it makes Electron less secure than Chromium for displaying
- untrusted web content. For applications that require more security, the
- `sandbox` flag will force Electron to spawn a classic Chromium renderer that is
-@@ -34,6 +46,20 @@
- Another difference is that sandboxed renderers don't modify any of the default
- JavaScript APIs. Consequently, some APIs such as `window.open` will work as they
- do in Chromium (i.e. they do not return a [`BrowserWindowProxy`](browser-window-proxy.md)).
-+=======
-+trusted, but it makes electron less secure than chromium for displaying
-+untrusted web content. For applications that require more security, the
-+`sandbox` flag will force electron to spawn a classic chromium renderer that is
-+compatible with the sandbox.
-+
-+A sandboxed renderer doesn't have a node.js environment running and doesn't
-+expose node.js JavaScript APIs to client code. The only exception is the preload script,
-+which has access to a subset of the electron renderer API.
-+
-+Another difference is that sandboxed renderers don't modify any of the default
-+JavaScript APIs. Consequently, some APIs such as `window.open` will work as they
-+do in chromium (i.e. they do not return a [`BrowserWindowProxy`](browser-window-proxy.md)).
-+>>>>>>> .their
- 
- ## Example
- 
-@@ -51,9 +77,15 @@
- })
- ```
- 
-+<<<<<<< .our
- In the above code the [`BrowserWindow`](browser-window.md) that was created has Node.js disabled and can communicate
- only via IPC. The use of this option stops Electron from creating a Node.js runtime in the renderer. Also,
- within this new window `window.open` follows the native behaviour (by default Electron creates a [`BrowserWindow`](browser-window.md)
-+=======
-+In the above code the [`BrowserWindow`](browser-window.md) that was created has node.js disabled and can communicate
-+only via IPC. The use of this option stops electron from creating a node.js runtime in the renderer. Also,
-+within this new window `window.open` follows the native behaviour (by default electron creates a [`BrowserWindow`](browser-window.md)
-+>>>>>>> .their
- and returns a proxy to this via `window.open`).
- 
- It is important to note that this option alone won't enable the OS-enforced sandbox. To enable this feature, the
-@@ -75,19 +107,32 @@
- 
- Note that it is not enough to call
- `app.commandLine.appendSwitch('--enable-sandbox')`, as electron/node startup
-+<<<<<<< .our
- code runs after it is possible to make changes to Chromium sandbox settings. The
- switch must be passed to Electron on the command-line:
-+=======
-+code runs after it is possible to make changes to chromium sandbox settings. The
-+switch must be passed to electron on the command-line:
-+>>>>>>> .their
- 
- ```sh
- electron --enable-sandbox app.js
- ```
- 
- It is not possible to have the OS sandbox active only for some renderers, if
-+<<<<<<< .our
- `--enable-sandbox` is enabled, normal Electron windows cannot be created.
- 
- If you need to mix sandboxed and non-sandboxed renderers in one application,
- omit the `--enable-sandbox` argument. Without this argument, windows
- created with `sandbox: true` will still have Node.js disabled and communicate
-+=======
-+`--enable-sandbox` is enabled, normal electron windows cannot be created.
-+
-+If you need to mix sandboxed and non-sandboxed renderers in one application,
-+omit the `--enable-sandbox` argument. Without this argument, windows
-+created with `sandbox: true` will still have node.js disabled and communicate
-+>>>>>>> .their
- only via IPC, which by itself is already a gain from security POV.
- 
- ## Preload
-@@ -112,7 +157,11 @@
- 
- ```js
- // This file is loaded whenever a javascript context is created. It runs in a
-+<<<<<<< .our
- // private scope that can access a subset of Electron renderer APIs. We must be
-+=======
-+// private scope that can access a subset of electron renderer APIs. We must be
-+>>>>>>> .their
- // careful to not leak any objects into the global scope!
- const fs = require('fs')
- const {ipcRenderer} = require('electron')
-@@ -136,7 +185,11 @@
- 
- Important things to notice in the preload script:
- 
-+<<<<<<< .our
- - Even though the sandboxed renderer doesn't have Node.js running, it still has
-+=======
-+- Even though the sandboxed renderer doesn't have node.js running, it still has
-+>>>>>>> .their
-   access to a limited node-like environment: `Buffer`, `process`, `setImmediate`
-   and `require` are available.
- - The preload script can indirectly access all APIs from the main process through the
-@@ -146,7 +199,11 @@
- - The preload script must be contained in a single script, but it is possible to have
-   complex preload code composed with multiple modules by using a tool like
-   browserify, as explained below. In fact, browserify is already used by
-+<<<<<<< .our
-   Electron to provide a node-like environment to the preload script.
-+=======
-+  electron to provide a node-like environment to the preload script.
-+>>>>>>> .their
- 
- To create a browserify bundle and use it as a preload script, something like
- the following should be used:
-@@ -178,7 +235,11 @@
- - `timers`
- - `url`
- 
-+<<<<<<< .our
- More may be added as needed to expose more Electron APIs in the sandbox, but any
-+=======
-+More may be added as needed to expose more electron APIs in the sandbox, but any
-+>>>>>>> .their
- module in the main process can already be used through
- `electron.remote.require`.
- 
-@@ -186,7 +247,11 @@
- 
- Please use the `sandbox` option with care, as it is still an experimental
- feature. We are still not aware of the security implications of exposing some
-+<<<<<<< .our
- Electron renderer APIs to the preload script, but here are some things to
-+=======
-+electron renderer APIs to the preload script, but here are some things to
-+>>>>>>> .their
- consider before rendering untrusted content:
- 
- - A preload script can accidentally leak privileged APIs to untrusted code.
-@@ -194,9 +259,15 @@
-   APIs, effectively granting full access to the system through the `remote`
-   module.
- 
-+<<<<<<< .our
- Since rendering untrusted content in Electron is still uncharted territory,
- the APIs exposed to the sandbox preload script should be considered more
- unstable than the rest of Electron APIs, and may have breaking changes to fix
-+=======
-+Since rendering untrusted content in electron is still uncharted territory,
-+the APIs exposed to the sandbox preload script should be considered more
-+unstable than the rest of electron APIs, and may have breaking changes to fix
-+>>>>>>> .their
- security issues.
- 
- One planned enhancement that should greatly increase security is to block IPC
-added in both
-  our    100644 bb3aed2c4131ef0d270b29b4f58d5837b9d4ee4e docs/api/screen.md
-  their  100644 cf96c456ff8f977d7721cab777ebe6608b7a3310 docs/api/screen.md
-@@ -136,7 +136,11 @@
- 
- ### `screen.screenToDipRect(window, rect)` _Windows_
- 
-+<<<<<<< .our
- * `window` [BrowserWindow](browser-window.md) | null
-+=======
-+* `window` [BrowserWindow](browser-window.md)
-+>>>>>>> .their
- * `rect` [Rectangle](structures/rectangle.md)
- 
- Returns [`Rectangle`](structures/rectangle.md)
-@@ -147,7 +151,11 @@
- 
- ### `screen.dipToScreenRect(window, rect)` _Windows_
- 
-+<<<<<<< .our
- * `window` [BrowserWindow](browser-window.md) | null
-+=======
-+* `window` [BrowserWindow](browser-window.md)
-+>>>>>>> .their
- * `rect` [Rectangle](structures/rectangle.md)
- 
- Returns [`Rectangle`](structures/rectangle.md)
-added in both
-  our    100644 2eb5574bffe05def2ec3646b200038db15df2e9b docs/api/structures/certificate-principal.md
-  their  100644 12c46382aaf3d098b8845176eda99e9dddd82d83 docs/api/structures/certificate-principal.md
-@@ -1,8 +1,17 @@
- # CertificatePrincipal Object
- 
-+<<<<<<< .our
- * `commonName` String - Common Name.
- * `organizations` String[] - Organization names.
- * `organizationUnits` String[] - Organization Unit names.
- * `locality` String - Locality.
- * `state` String - State or province.
- * `country` String - Country or region.
-+=======
-+* `commonName` String - Common Name
-+* `organizations` String[] - Organization names
-+* `organizationUnits` String[] - Organization Unit names
-+* `locality` String - Locality
-+* `state` String - State or province
-+* `country` String - Country or region
-+>>>>>>> .their
-added in both
-  our    100644 b0e5b8d15165b23035303bafe049c1824a759439 docs/api/structures/gpu-feature-status.md
-  their  100644 f7bf3933d6c4c620c8f4d40fbda8a4c7c6b311ee docs/api/structures/gpu-feature-status.md
-@@ -1,5 +1,6 @@
- # GPUFeatureStatus Object
- 
-+<<<<<<< .our
- * `2d_canvas` String - Canvas.
- * `flash_3d` String - Flash.
- * `flash_stage3d` String - Flash Stage3D.
-@@ -13,6 +14,21 @@
- * `vpx_decode` String - VPx Video Decode.
- * `webgl` String - WebGL.
- * `webgl2` String - WebGL2.
-+=======
-+* `2d_canvas` String - Canvas
-+* `flash_3d` String - Flash
-+* `flash_stage3d` String - Flash Stage3D
-+* `flash_stage3d_baseline` String - Flash Stage3D Baseline profile
-+* `gpu_compositing` String - Compositing
-+* `multiple_raster_threads` String - Multiple Raster Threads
-+* `native_gpu_memory_buffers` String - Native GpuMemoryBuffers
-+* `rasterization` String - Rasterization
-+* `video_decode` String - Video Decode
-+* `video_encode` String - Video Encode
-+* `vpx_decode` String - VPx Video Decode
-+* `webgl` String - WebGL
-+* `webgl2` String - WebGL2
-+>>>>>>> .their
- 
- Possible values:
- 
-added in both
-  our    100644 470dd3a3f7d70f059c0a42736c20213b19372014 docs/api/structures/mime-typed-buffer.md
-  their  100644 08e5cd47a4a9a5f5ec7784c14b26c82502e20155 docs/api/structures/mime-typed-buffer.md
-@@ -1,4 +1,9 @@
- # MimeTypedBuffer Object
- 
-+<<<<<<< .our
- * `mimeType` String - The mimeType of the Buffer that you are sending.
- * `data` Buffer - The actual Buffer content.
-+=======
-+* `mimeType` String - The mimeType of the Buffer that you are sending
-+* `data` Buffer - The actual Buffer content
-+>>>>>>> .their
-added in both
-  our    100644 9f7a000967d09895fe3f43b9792578d6219a43b5 docs/api/structures/rectangle.md
-  their  100644 1a1228bc0b7c8d0d0f0ae3cea09048960f9df197 docs/api/structures/rectangle.md
-@@ -1,6 +1,13 @@
- # Rectangle Object
- 
-+<<<<<<< .our
- * `x` Number - The x coordinate of the origin of the rectangle (must be an integer).
- * `y` Number - The y coordinate of the origin of the rectangle (must be an integer).
- * `width` Number - The width of the rectangle (must be an integer).
- * `height` Number - The height of the rectangle (must be an integer).
-+=======
-+* `x` Number - The x coordinate of the origin of the rectangle (must be an integer)
-+* `y` Number - The y coordinate of the origin of the rectangle (must be an integer)
-+* `width` Number - The width of the rectangle (must be an integer)
-+* `height` Number - The height of the rectangle (must be an integer)
-+>>>>>>> .their
-added in both
-  our    100644 538579684242b9de3921d944b9d2fb64cf957a13 docs/api/structures/scrubber-item.md
-  their  100644 584593b6fde7e089fa296fc891eca05588c108cb docs/api/structures/scrubber-item.md
-@@ -1,4 +1,9 @@
- # ScrubberItem Object
- 
-+<<<<<<< .our
- * `label` String (optional) - The text to appear in this item.
- * `icon` NativeImage (optional) - The image to appear in this item.
-+=======
-+* `label` String (optional) - The text to appear in this item
-+* `icon` NativeImage (optional) - The image to appear in this item
-+>>>>>>> .their
-added in both
-  our    100644 47dfaa24027550db196340bc4f63906b6cf43ee2 docs/api/structures/segmented-control-segment.md
-  their  100644 06a8fd201a190e7787ed7f7c9c55fe31c8f1f37a docs/api/structures/segmented-control-segment.md
-@@ -1,5 +1,11 @@
- # SegmentedControlSegment Object
- 
-+<<<<<<< .our
- * `label` String (optional) - The text to appear in this segment.
- * `icon` NativeImage (optional) - The image to appear in this segment.
- * `enabled` Boolean (optional) - Whether this segment is selectable. Default: true.
-+=======
-+* `label` String (optional) - The text to appear in this segment
-+* `icon` NativeImage (optional) - The image to appear in this segment
-+* `enabled` Boolean (optional) - Whether this segment is selectable. Default: true
-+>>>>>>> .their
-added in both
-  our    100644 ec1fa27e5e7de32e18f4a8ca0ec1969d21054fd4 docs/api/structures/stream-protocol-response.md
-  their  100644 64847075a05e796a32e46c57eec865ae46740eed docs/api/structures/stream-protocol-response.md
-@@ -1,5 +1,11 @@
- # StreamProtocolResponse Object
- 
-+<<<<<<< .our
- * `statusCode` Number - The HTTP response code.
- * `headers` Object - An object containing the response headers.
- * `data` ReadableStream - A Node.js readable stream representing the response body.
-+=======
-+* `statusCode` Number - The HTTP response code
-+* `headers` Object - An object containing the response headers
-+* `data` ReadableStream - A Node.js readable stream representing the response body
-+>>>>>>> .their
-added in both
-  our    100644 c60f7ba4c9e9b6ad3fc1b2f717983b71bd286842 docs/api/tray.md
-  their  100644 28892a33d120604afd6eb80e4ae681387b130fdb docs/api/tray.md
-@@ -194,7 +194,11 @@
- 
- #### `tray.setPressedImage(image)` _macOS_
- 
-+<<<<<<< .our
- * `image` ([NativeImage](native-image.md) | String)
-+=======
-+* `image` [NativeImage](native-image.md)
-+>>>>>>> .their
- 
- Sets the `image` associated with this tray icon when pressed on macOS.
- 
-added in both
-  our    100644 8990fe2e97ab62eafdd3f7a4eb8ee782415124c5 docs/api/web-contents.md
-  their  100644 efba30d5be16f7bfa9fa80b644e3b52702baafae docs/api/web-contents.md
-@@ -832,10 +832,13 @@
- 
- Returns `Boolean` - Whether this page has been muted.
- 
-+<<<<<<< .our
- #### `contents.isCurrentlyAudible()`
- 
- Returns `Boolean` - Whether audio is currently playing.
- 
-+=======
-+>>>>>>> .their
- #### `contents.setZoomFactor(factor)`
- 
- * `factor` Number - Zoom factor.
-@@ -1385,6 +1388,26 @@
- 
- Shows pop-up dictionary that searches the selected word on the page.
- 
-+<<<<<<< .our
-+=======
-+#### `contents.setSize(options)`
-+
-+Set the size of the page. This is only supported for `<webview>` guest contents.
-+
-+* `options` Object
-+  * `enableAutoSize` Boolean (optional) - true to make the webview container automatically
-+    resize within the bounds specified by the attributes normal, min and max.
-+  * `normal` [Size](structures/size.md) (optional) - Normal size of the page. This can be used in
-+    combination with the [`disableguestresize`](webview-tag.md#disableguestresize)
-+    attribute to manually resize the webview guest contents.
-+  * `min` [Size](structures/size.md) (optional) - Minimum size of the page. This can be used in
-+    combination with the [`disableguestresize`](webview-tag.md#disableguestresize)
-+    attribute to manually resize the webview guest contents.
-+  * `max` [Size](structures/size.md) (optional) - Maximium size of the page. This can be used in
-+    combination with the [`disableguestresize`](webview-tag.md#disableguestresize)
-+    attribute to manually resize the webview guest contents.
-+
-+>>>>>>> .their
- #### `contents.isOffscreen()`
- 
- Returns `Boolean` - Indicates whether *offscreen rendering* is enabled.
-@@ -1451,7 +1474,11 @@
- 
- #### `contents.getProcessId()`
- 
-+<<<<<<< .our
- Returns `Integer` - The Chromium internal `pid` of the associated renderer. Can
-+=======
-+Returns `Integer` - The chromium internal `pid` of the associated renderer. Can
-+>>>>>>> .their
- be compared to the `frameProcessId` passed by frame specific navigation events
- (e.g. `did-frame-navigate`)
- 
-added in both
-  our    100644 989060ef3e50c5d93db1a914997f1d190edf3cf5 docs/api/web-frame.md
-  their  100644 c891bd5e56716fe4ac49bd23d86716ebd3e002af docs/api/web-frame.md
-@@ -4,7 +4,11 @@
- 
- Process: [Renderer](../glossary.md#renderer-process)
- 
-+<<<<<<< .our
- `webFrame` export of the Electron module is an instance of the `WebFrame`
-+=======
-+`webFrame` export of the electron module is an instance of the `WebFrame`
-+>>>>>>> .their
- class representing the top frame of the current `BrowserWindow`. Sub-frames can
- be retrieved by certain properties and methods (e.g. `webFrame.firstChild`).
- 
-@@ -167,7 +171,10 @@
- Returns `Object`:
- 
- * `images` [MemoryUsageDetails](structures/memory-usage-details.md)
-+<<<<<<< .our
- * `scripts` [MemoryUsageDetails](structures/memory-usage-details.md)
-+=======
-+>>>>>>> .their
- * `cssStyleSheets` [MemoryUsageDetails](structures/memory-usage-details.md)
- * `xslStyleSheets` [MemoryUsageDetails](structures/memory-usage-details.md)
- * `fonts` [MemoryUsageDetails](structures/memory-usage-details.md)
-@@ -232,8 +239,13 @@
-    current renderer process. Routing IDs can be retrieved from `WebFrame`
-    instances (`webFrame.routingId`) and are also passed by frame
-    specific `WebContents` navigation events (e.g. `did-frame-navigate`)
-+<<<<<<< .our
- 
- Returns `WebFrame` - that has the supplied `routingId`, `null` if not found.
-+=======
-+  
-+Returns `WebFrame` - that has the supplied `routingId`, `null` if not found. 
-+>>>>>>> .their
- 
- ## Properties
- 
-added in both
-  our    100644 0904db05accd92a661a6b02275c2166b7a8af2af docs/api/web-request.md
-  their  100644 2d039923d6f14f3231c7177b8c1b4242b3e4126c docs/api/web-request.md
-@@ -9,9 +9,14 @@
- 
- The methods of `WebRequest` accept an optional `filter` and a `listener`. The
- `listener` will be called with `listener(details)` when the API's event has
-+<<<<<<< .our
- happened. The `details` object describes the request.
- 
- ⚠️ Only the last attached `listener` will be used. Passing `null` as `listener` will unsubscribe from the event.
-+=======
-+happened. The `details` object describes the request. Passing `null`
-+as `listener` will unsubscribe from the event.
-+>>>>>>> .their
- 
- The `filter` object has a `urls` property which is an Array of URL
- patterns that will be used to filter out the requests that do not match the URL
-added in both
-  our    100644 8dc16b4a4e92ad132c7722ac400e2be851723f9b docs/api/webview-tag.md
-  their  100644 25edb6052f752ada2b809d0610c8278fcfc04cab docs/api/webview-tag.md
-@@ -1,5 +1,6 @@
- # `<webview>` Tag
- 
-+<<<<<<< .our
- ## Warning
- 
- Electron's `webview` tag is based on [Chromium's `webview`][chrome-webview], which
-@@ -10,6 +11,8 @@
- 
- ## Overview
- 
-+=======
-+>>>>>>> .their
- > Display external web content in an isolated frame and process.
- 
- Process: [Renderer](../glossary.md#renderer-process)
-@@ -244,6 +247,62 @@
- The full list of supported feature strings can be found in the
- [RuntimeEnabledFeatures.json5][runtime-enabled-features] file.
- 
-+<<<<<<< .our
-+=======
-+### `guestinstance`
-+
-+```html
-+<webview src="https://www.github.com/" guestinstance="3"></webview>
-+```
-+
-+A value that links the webview to a specific webContents. When a webview
-+first loads a new webContents is created and this attribute is set to its
-+instance identifier. Setting this attribute on a new or existing webview
-+connects it to the existing webContents that currently renders in a different
-+webview.
-+
-+The existing webview will see the `destroy` event and will then create a new
-+webContents when a new url is loaded.
-+
-+### `disableguestresize`
-+
-+```html
-+<webview src="https://www.github.com/" disableguestresize></webview>
-+```
-+
-+When this attribute is present the `webview` contents will be prevented from
-+resizing when the `webview` element itself is resized.
-+
-+This can be used in combination with
-+[`webContents.setSize`](web-contents.md#contentssetsizeoptions) to manually
-+resize the webview contents in reaction to a window size change. This can
-+make resizing faster compared to relying on the webview element bounds to
-+automatically resize the contents.
-+
-+```javascript
-+const {webContents} = require('electron')
-+
-+// We assume that `win` points to a `BrowserWindow` instance containing a
-+// `<webview>` with `disableguestresize`.
-+
-+win.on('resize', () => {
-+  const [width, height] = win.getContentSize()
-+  for (let wc of webContents.getAllWebContents()) {
-+    // Check if `wc` belongs to a webview in the `win` window.
-+    if (wc.hostWebContents &&
-+        wc.hostWebContents.id === win.webContents.id) {
-+      wc.setSize({
-+        normal: {
-+          width: width,
-+          height: height
-+        }
-+      })
-+    }
-+  }
-+})
-+```
-+
-+>>>>>>> .their
- ## Methods
- 
- The `webview` tag has the following methods:
-@@ -407,10 +466,13 @@
- 
- Returns `Boolean` - Whether guest page has been muted.
- 
-+<<<<<<< .our
- #### `<webview>.isCurrentlyAudible()`
- 
- Returns `Boolean` - Whether audio is currently playing.
- 
-+=======
-+>>>>>>> .their
- ### `<webview>.undo()`
- 
- Executes editing command `undo` in page.
-@@ -875,4 +937,7 @@
- Emitted when DevTools is focused / opened.
- 
- [runtime-enabled-features]: https://cs.chromium.org/chromium/src/third_party/blink/renderer/platform/runtime_enabled_features.json5?l=70
-+<<<<<<< .our
- [chrome-webview]: https://developer.chrome.com/apps/tags/webview
-+=======
-+>>>>>>> .their
-added in both
-  our    100644 cbbdaf4c3d1998ccce8e5438eea1a7c9b00f2e37 docs/development/build-instructions-gn.md
-  their  100644 cdddc4dc8e54b8ce21c4bba333edd128eab5636f docs/development/build-instructions-gn.md
-@@ -3,6 +3,7 @@
- Follow the guidelines below for building Electron with the experimental GN
- build.
- 
-+<<<<<<< .our
- > **NOTE**: The GN build system is in _experimental_ status.
- 
- ## Platform prerequisites
-@@ -61,6 +62,34 @@
-     --name "src/electron" \
-     --unmanaged \
-     https://github.com/electron/electron
-+=======
-+> **NOTE**: The GN build system is in _experimental_ status, and currently only
-+> works on macOS and Linux, in debug mode, as a component build.
-+
-+## Prerequisites
-+
-+See the [macOS](build-instructions-osx.md#prerequisites) or
-+[Linux](build-instructions-linux.md#prerequisites) build instructions for the
-+requirements for your platform. In addition, you'll need to install
-+[`depot_tools`][depot-tools], the toolset used for fetching Chromium and its
-+dependencies.
-+
-+[depot-tools]: http://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/docs/html/depot_tools_tutorial.html#_setting_up
-+
-+## Getting the Code
-+
-+```sh
-+$ mkdir electron-gn && cd electron-gn
-+$ cat > .gclient <<-GCLIENT
-+solutions = [
-+  {
-+    "url": "https://github.com/electron/electron",
-+    "managed": False,
-+    "name": "src/electron",
-+  },
-+]
-+GCLIENT
-+>>>>>>> .their
- $ gclient sync --with_branch_heads --with_tags
- # This will take a while, go get a coffee.
- ```
-@@ -70,6 +99,7 @@
- ```sh
- $ cd src
- $ export CHROMIUM_BUILDTOOLS_PATH=`pwd`/buildtools
-+<<<<<<< .our
- # this next line is needed only if building with sccache
- $ export GN_EXTRA_ARGS="${GN_EXTRA_ARGS} cc_wrapper=\"${PWD}/electron/external_binaries/sccache\""
- $ gn gen out/Default --args="import(\"//electron/build/args/debug.gn\") $GN_EXTRA_ARGS"
-@@ -99,6 +129,16 @@
- ```
- 
- **To build, run `ninja` with the `electron:electron_app` target:**
-+=======
-+$ gn gen out/Default --args='root_extra_deps=["//electron"] is_electron_build=true is_component_build=true use_jumbo_build=true v8_promise_internal_field_count=1 v8_typed_array_max_size_in_heap=0'
-+```
-+
-+This will generate all the ninja files needed for the build. You shouldn't have
-+to run `gn gen` again—if you want to change the build arguments you can run `gn
-+args out/Default` to bring up an editor.
-+
-+To build, run `ninja` with the `electron:electron_app` target:
-+>>>>>>> .their
- 
- ```sh
- $ ninja -C out/Default electron:electron_app
-@@ -110,8 +150,12 @@
- so it will take a while.
- 
- To speed up subsequent builds, you can use [sccache][sccache]. Add the GN arg
-+<<<<<<< .our
- `cc_wrapper = "sccache"` by running `gn args out/Default` to bring up an
- editor and adding a line to the end of the file.
-+=======
-+`cc_wrapper="sccache"` by running `gn args out/Default` to bring up an editor.
-+>>>>>>> .their
- 
- [sccache]: https://github.com/mozilla/sccache
- 
-@@ -119,12 +163,16 @@
- 
- ```sh
- $ ./out/Default/Electron.app/Contents/MacOS/Electron
-+<<<<<<< .our
- # or, on Windows
- $ ./out/Default/electron.exe
-+=======
-+>>>>>>> .their
- # or, on Linux
- $ ./out/Default/electron
- ```
- 
-+<<<<<<< .our
- ### Cross-compiling
- 
- To compile for a platform that isn't the same as the one you're building on,
-@@ -157,17 +205,30 @@
- $ ninja -C out/Default third_party/electron_node:headers
- # Install the test modules with the generated headers
- $ (cd electron/spec && npm i --nodedir=../../out/Default/gen/node_headers)
-+=======
-+## Tests
-+
-+To run the tests, you'll first need to build the test modules against the
-+same version of node.js that was built as part of the build process.
-+
-+```sh
-+$ (cd electron/spec && npm i --nodedir=../../third_party/electron_node)
-+>>>>>>> .their
- ```
- 
- Then, run Electron with `electron/spec` as the argument:
- 
- ```sh
-+<<<<<<< .our
- # on Mac:
- $ ./out/Default/Electron.app/Contents/MacOS/Electron electron/spec
- # on Windows:
- $ ./out/Default/electron.exe electron/spec
- # on Linux:
- $ ./out/Default/electron electron/spec
-+=======
-+$ ./out/Default/Electron.app/Contents/MacOS/Electron electron/spec
-+>>>>>>> .their
- ```
- 
- If you're debugging something, it can be helpful to pass some extra flags to
-added in both
-  our    100644 3276b494aec5d1a49626b8c24d725ec665cf2c62 docs/development/build-instructions-linux.md
-  their  100644 6f7660669bf071628d6d3d9458640a61e5bcda0e docs/development/build-instructions-linux.md
-@@ -12,7 +12,11 @@
-   For a quick test, run the following script:
- 
-   ```sh
-+<<<<<<< .our
-   $ npm run check-tls
-+=======
-+  $ python ./script/tls.py
-+>>>>>>> .their
-   ```
- 
-   If the script returns that your configuration is using an outdated security
-@@ -71,6 +75,7 @@
- Downloading certain files can take a long time. Notice that we are using
- `ninja` to build Electron so there is no `Makefile` generated.
- 
-+<<<<<<< .our
- To bootstrap for a static, non-developer build, run:
- 
- ```sh
-@@ -83,6 +88,11 @@
- ```sh
- $ cd electron
- $ npm run bootstrap:dev
-+=======
-+```sh
-+$ cd electron
-+$ ./script/bootstrap.py --verbose
-+>>>>>>> .their
- ```
- 
- If you are using editor supports [JSON compilation database](http://clang.llvm.org/docs/JSONCompilationDatabase.html) based
-@@ -121,7 +131,11 @@
- If you would like to build both `Release` and `Debug` targets:
- 
- ```sh
-+<<<<<<< .our
- $ npm run build
-+=======
-+$ ./script/build.py
-+>>>>>>> .their
- ```
- 
- This script will cause a very large Electron executable to be placed in
-@@ -137,6 +151,7 @@
- the `dist` directory. After running the `create-dist.py` script, you
- may want to remove the 1.3+ gigabyte binary which is still in `out/R`.
- 
-+<<<<<<< .our
- You can also build either the `Debug` or `Release` target on its own:
- 
- ```sh
-@@ -145,6 +160,12 @@
- 
- ```sh
- $ npm run build:release
-+=======
-+You can also build the `Debug` target only:
-+
-+```sh
-+$ ./script/build.py -c D
-+>>>>>>> .their
- ```
- 
- After building is done, you can find the `electron` debug binary under `out/D`.
-added in both
-  our    100644 22dba096b73d1f99ee323f6822abb54a8b453477 docs/development/build-instructions-osx.md
-  their  100644 157ab0d3e5f38e0c07695128832565f9aeffd27e docs/development/build-instructions-osx.md
-@@ -15,7 +15,11 @@
- This depends on both your version of macOS and Python. For a quick test, run:
- 
- ```sh
-+<<<<<<< .our
- $ npm run check-tls
-+=======
-+$ python ./script/tls.py
-+>>>>>>> .their
- ```
- 
- If the script returns that your configuration is using an outdated security
-@@ -69,6 +73,7 @@
- the build project files. Notice that we're using [ninja](https://ninja-build.org/)
- to build Electron so there is no Xcode project generated.
- 
-+<<<<<<< .our
- To bootstrap for a static, non-developer build, run:
- 
- ```sh
-@@ -81,6 +86,11 @@
- ```sh
- $ cd electron
- $ npm run bootstrap:dev
-+=======
-+```sh
-+$ cd electron
-+$ ./script/bootstrap.py -v
-+>>>>>>> .their
- ```
- 
- If you are using editor supports [JSON compilation database](http://clang.llvm.org/docs/JSONCompilationDatabase.html) based
-@@ -92,6 +102,7 @@
- 
- ## Building
- 
-+<<<<<<< .our
- To build both `Release` and `Debug` targets:
- 
- ```sh
-@@ -106,6 +117,18 @@
- 
- ```sh
- $ npm run build:release
-+=======
-+Build both `Release` and `Debug` targets:
-+
-+```sh
-+$ ./script/build.py
-+```
-+
-+You can also only build the `Debug` target:
-+
-+```sh
-+$ ./script/build.py -c D
-+>>>>>>> .their
- ```
- 
- After building is done, you can find `Electron.app` under `out/D`.
-added in both
-  our    100644 86f9d2b6f82bb28fe8dda7ec2bea9eccd6119fd4 docs/development/build-instructions-windows.md
-  their  100644 0afd0ef3ea4636acfb2f67c05cb913403f9da2b7 docs/development/build-instructions-windows.md
-@@ -4,7 +4,11 @@
- 
- ## Prerequisites
- 
-+<<<<<<< .our
- * Windows 10 / Server 2012 R2 or higher
-+=======
-+* Windows 7 / Server 2008 R2 or higher
-+>>>>>>> .their
- * Visual Studio 2017 15.7.2 or higher - [download VS 2017 Community Edition for
-   free](https://www.visualstudio.com/vs/)
- * [Python 2.7](http://www.python.org/download/releases/2.7/)
-@@ -37,6 +41,7 @@
- the build project files. Notice that we're using `ninja` to build Electron so
- there is no Visual Studio project generated.
- 
-+<<<<<<< .our
- To bootstrap for a static, non-developer build, run:
- 
- ```powershell
-@@ -49,10 +54,16 @@
- ```powershell
- $ cd electron
- $ npm run bootstrap:dev
-+=======
-+```powershell
-+$ cd electron
-+$ python script\bootstrap.py -v
-+>>>>>>> .their
- ```
- 
- ## Building
- 
-+<<<<<<< .our
- Build both `Release` and `Debug` targets:
- 
- ```powershell
-@@ -67,6 +78,18 @@
- 
- ```powershell
- $ npm run build:release
-+=======
-+Build both Release and Debug targets:
-+
-+```powershell
-+$ python script\build.py
-+```
-+
-+You can also only build the Debug target:
-+
-+```powershell
-+$ python script\build.py -c D
-+>>>>>>> .their
- ```
- 
- After building is done, you can find `electron.exe` under `out\D` (debug
-@@ -166,6 +189,7 @@
- 
- You may get this error if you are using Git Bash for building, you should use
- PowerShell or VS2015 Command Prompt instead.
-+<<<<<<< .our
- 
- ### cannot create directory at '...': Filename too long
- 
-@@ -174,3 +198,5 @@
- ```sh
- $ git config --system core.longpaths true
- ```
-+=======
-+>>>>>>> .their
-added in both
-  our    100644 0abaea2417d7e88955bf60c6dd8f2206b51c99af docs/development/coding-style.md
-  their  100644 870cb85c7f1855a089b1adc76b6ea0cc2819d58d docs/development/coding-style.md
-@@ -40,7 +40,11 @@
- 
- ## Documentation
- 
-+<<<<<<< .our
- * Write [remark](https://github.com/remarkjs/remark) markdown style.
-+=======
-+* Write [remark](https://github.com/remarkjs/remark) markdown style
-+>>>>>>> .their
- 
- You can run `npm run lint-docs` to ensure that your documentation changes are
- formatted correctly.
-added in both
-  our    100644 95f4cbab47f5a4ae40f733fd3f8942a63bf4382d docs/development/debug-instructions-windows.md
-  their  100644 b689ef4480365ad1b56c9bdd2fd028f0d797f1be docs/development/debug-instructions-windows.md
-@@ -7,8 +7,11 @@
- and the Electron source code, you can enable step-through debugging
- with breakpoints inside Electron's source code.
- 
-+<<<<<<< .our
- **See also**: There's a wealth of information on debugging Chromium, much of which also applies to Electron, on the Chromium developers site: [Debugging Chromium on Windows](https://www.chromium.org/developers/how-tos/debugging-on-windows).
- 
-+=======
-+>>>>>>> .their
- ## Requirements
- 
- * **A debug build of Electron**: The easiest way is usually building it
-added in both
-  our    100644 6c2234477a35701b5d2e4f845d954bccbb203977 docs/development/debugging-instructions-macos-xcode.md
-  their  100644 e136ee9253cea6fb4debe3c4d73454468cbc8551 docs/development/debugging-instructions-macos-xcode.md
-@@ -1,12 +1,21 @@
- ## Debugging with XCode
- 
- ### Build Debug Electron with Release libchromiumcontent
-+<<<<<<< .our
- You can create a debug build of Electron by following [build instructions for macOS](build-instructions-osx.md).
- The bootstrap process will download Release version of libchromiumcontent by default,
- so you will not be able to step through the Chromium source.
- 
- ### Build Debug Electron with Debug libchromiumcontent
- If you want to debug and step through libchromiumcontent, you will have to run the
-+=======
-+You can create a debug build of electron by following [build instructions for macOS](build-instructions-osx.md).
-+The bootstrap process will download Release version of libchromiumcontent by default,
-+so you will not be able to step through the chromium source.
-+
-+### Build Debug Electron with Debug libchromiumcontent
-+If you want to debug and step through libchromiumcontent, you will have to run the 
-+>>>>>>> .their
- bootsrap script with the `--build_debug_libcc` argument.
- 
- ```sh
-@@ -25,7 +34,11 @@
- ```sh
- $ ./script/build.py -c D --libcc
- ```
-+<<<<<<< .our
- This will build debug Electron with debug version of libchromiumcontent.
-+=======
-+This will build debug electron with debug version of libchromiumcontent.
-+>>>>>>> .their
- 
- ### Generate xcode project for debugging sources (cannot build code from xcode)
- Run the update script with the --xcode argument.
-@@ -37,16 +50,30 @@
- 
- ### Debugging and breakpoints
- 
-+<<<<<<< .our
- Launch Electron app after build.
- You can now open the xcode workspace created above and attach to the Electron process
-+=======
-+Launch electron app after build.
-+You can now open the xcode workspace created above and attach to the electron process
-+>>>>>>> .their
- through the Debug > Attach To Process > Electron debug menu. [Note: If you want to debug
- the renderer process, you need to attach to the Electron Helper as well.]
- 
- You can now set breakpoints in any of the indexed files. However, you will not be able
-+<<<<<<< .our
- to set breakpoints directly in the Chromium source.
- To set break points in the Chromium source, you can choose Debug > Breakpoints > Create
-+=======
-+to set breakpoints directly in the chromium source.
-+To set break points in the chromium source, you can choose Debug > Breakpoints > Create
-+>>>>>>> .their
- Symbolic Breakpoint and set any function name as the symbol. This will set the breakpoint
- for all functions with that name, from all the classes if there are more than one.
- You can also do this step of setting break points prior to attaching the debugger,
- however, actual breakpoints for symbolic breakpoint functions may not show up until the
-+<<<<<<< .our
-+debugger is attached to the app.
-+=======
- debugger is attached to the app.
-+>>>>>>> .their
-added in both
-  our    100644 c7b4ae62d30fe55da6ba4d03ae2df95141920f99 docs/development/pull-requests.md
-  their  100644 3b404343efa0d00e06e5bbab4b81a3b6eb25c737 docs/development/pull-requests.md
-@@ -86,7 +86,14 @@
- uses [semantic commit messages](https://conventionalcommits.org/) to streamline
- the release process.
- 
-+<<<<<<< .our
- Before a pull request can be merged, it **must** have a pull request title with a semantic prefix.
-+=======
-+Before a pull request can be merged, it should include at least one semantic
-+commit message, though it's not necessary for all commits in the pull request
-+to be semantic. Alternatively, you can **update your pull request title**  to
-+start with a semantic prefix.
-+>>>>>>> .their
- 
- Examples of commit messages with semantic prefixes:
- 
-@@ -105,7 +112,10 @@
-   - perf: A code change that improves performance
-   - refactor: A code change that neither fixes a bug nor adds a feature
-   - style: Changes that do not affect the meaning of the code (linting)
-+<<<<<<< .our
-   - vendor: Bumping a dependency like libchromiumcontent or node
-+=======
-+>>>>>>> .their
- 
- Other things to keep in mind when writing a commit message:
- 
-added in both
-  our    100644 85a5fa0a935201521155dc60de45986db5829613 docs/development/releasing.md
-  their  100644 7fe929515bcdffbbbf3e454cbd72fdda0e25c7cb docs/development/releasing.md
-@@ -8,16 +8,25 @@
- information.
- 
- There are a handful of `*_TOKEN` environment variables needed by the release
-+<<<<<<< .our
- scripts:
- 
- * `ELECTRON_GITHUB_TOKEN`:
- Create this by visiting https://github.com/settings/tokens/new?scopes=repo
-+=======
-+scripts. Once you've generated these per-user tokens, you may want to keep
-+them in a local file that you can `source` when starting a release.
-+* `ELECTRON_GITHUB_TOKEN`:
-+Create as described at https://github.com/settings/tokens/new,
-+giving the token repo access scope.
-+>>>>>>> .their
- * `APPVEYOR_TOKEN`:
- Create a token from https://windows-ci.electronjs.org/api-token
- If you don't have an account, ask a team member to add you.
- * `CIRCLE_TOKEN`:
- Create a token from "Personal API Tokens" at https://circleci.com/account/api
- * `VSTS_TOKEN`:
-+<<<<<<< .our
- Create a Personal Access Token at https://github.visualstudio.com/_usersSettings/tokens or https://github.visualstudio.com/_details/security/tokens
- with the scope of `Build (read and execute)`.
- * `ELECTRON_S3_BUCKET`:
-@@ -29,6 +38,10 @@
- of the project. This file is gitignored, and will be loaded into the 
- environment by the release scripts.
- 
-+=======
-+Create a Personal Access Token at https://github.visualstudio.com/_usersSettings/tokens
-+with the scope of `Build (read and execute)`.
-+>>>>>>> .their
- 
- ## Determine which branch to release from
- 
-@@ -73,7 +86,11 @@
- ```
- ### Patch version change
- ```sh
-+<<<<<<< .our
- npm run prepare-release -- patch --stable
-+=======
-+npm run prepare-release -- patch
-+>>>>>>> .their
- ```
- ### Beta version change
- ```sh
-@@ -212,10 +229,13 @@
- ```sh
- $ npm run release -- --validateRelease
- ```
-+<<<<<<< .our
- Note, if you need to run `--validateRelease` more than once to check the assets,
- run it as above the first time, then `node ./script/release.js --validateRelease`
- for subsequent calls so that you don't have to rebuild each time you want to
- check the assets.
-+=======
-+>>>>>>> .their
- 
- ## Publish the release
- 
-@@ -259,6 +279,7 @@
- $ npm run publish-to-npm
- ```
- 
-+<<<<<<< .our
- After publishing, you can check the `latest` release:
- ```sh
- $ npm dist-tag ls electron
-@@ -274,6 +295,8 @@
- $ npm dist-tag add electron@2.0.0 latest
- ```
- 
-+=======
-+>>>>>>> .their
- [the releases page]: https://github.com/electron/electron/releases
- [this bump commit]: https://github.com/electron/electron/commit/78ec1b8f89b3886b856377a1756a51617bc33f5a
- [versioning]: /docs/tutorial/electron-versioning.md
-@@ -303,7 +326,11 @@
- ```
- 
- Additionally you can pass a job name to the script to run an individual job, eg:
-+<<<<<<< .our
- ```sh
-+=======
-+````sh
-+>>>>>>> .their
- node script/ci-release-build.js --ci=AppVeyor --ghRelease --job=electron-x64 TARGET_BRANCH
- ```
- 
-added in both
-  our    100644 1c61b3ee66504a23d72478c2e35a48ebeba3372a docs/development/upgrading-node.md
-  their  100644 821a89391dfd06a158d0fe76272a244ead5f3971 docs/development/upgrading-node.md
-@@ -61,6 +61,7 @@
- 2. Run `script/update` to get the latest libcc
-   - This will be time-consuming
- 3. Remove our copies of the old Node v8 patches
-+<<<<<<< .our
-   - (In libchromiumcontent repo) Read `patches/common/v8/README.md` to see which patchfiles
-     were created during the last update
-   - Remove those files from `patches/common/v8/`:
-@@ -77,6 +78,52 @@
- 7. Apply all patches with the [`get-patch` script](https://github.com/electron/libchromiumcontent/blob/master/script/README.md#get-patch):
-   - `./script/get-patch --repo src/v8 --output-dir patches/v8 --commit abc123 def456 ...`
- 8. Update `patches/common/v8/README.md` with references to all new patches that have been added so that the next person will know which need to be removed.
-+=======
-+  - (In libchromiumcontent repo) Read `patches/v8/README.md` to see which patchfiles
-+    were created during the last update
-+  - Remove those files from `patches/v8/`:
-+    - `git rm` the patchfiles
-+    - edit `patches/v8/README.md`
-+    - commit these removals
-+4. Inspect Node [repo](https://github.com/electron/node) to see what patches upstream Node
-+  used with their v8 after bumping its version
-+  - `git log --oneline deps/V8`
-+5. Create a checklist of the patches. This is useful for tracking your work and for
-+  having a quick reference of commit hashes to use in the `git diff-tree` step below.
-+6. Read `patches/v8/README.md` to see which patchfiles came from the previous version of V8 and therefore need to be removed.
-+  - Delete each patchfile referenced in `patches/v8/README.md`
-+7. For each patch, do:
-+  - (In node repo) `git diff-tree --patch HASH > ~/path_to_libchromiumcontent/patches/v8/xxx-patch_name.patch`
-+    - `xxx` is an incremented three-digit number (to force patch order)
-+    - `patch_name` should loosely match the node commit messages,
-+      e.g. `030-cherry_pick_cc55747,patch` if the Node commit message was "cherry-pick cc55747"
-+  - (remainder of steps in libchromium repo)
-+     Manually edit the `.patch` file to match upstream V8's directory:
-+    - If a diff section has no instances of `deps/V8`, remove it altogether.
-+      - We don’t want those patches because we’re only patching V8.
-+    - Replace instances of `a/deps/v8/filename.ext` with `a/filename.ext`
-+      - This is needed because upstream Node keeps its V8 files in a subdirectory
-+  - Ensure that local status is clean: `git status` to make sure there are no unstaged changes.
-+  - Confirm that the patch applies cleanly with
-+     `script/patch.py -r src/V8 -p patches/v8/xxx-patch_name.patch.patch`
-+  - Create a new copy of the patch:
-+     - `cd src/v8 && git diff > ../../test.patch && cd ../..`
-+     - This is needed because the first patch has Node commit checksums that we don't want
-+  - Confirm that checksums are the only difference between the two patches:
-+     - `diff -u test.patch patches/v8/xxx-patch_name.patch`
-+  - Replace the old patch with the new:
-+     - `mv test.patch patches/v8/xxx-patch_name.patch`
-+  - Add the patched code to the index _without_ committing:
-+     - `cd src/v8 && git add . && cd ../..`
-+     - We don't want to commit the changes (they're kept in the patchfiles)
-+        but need them locally so that they don't show up in subsequent diffs
-+        while we iterate through more patches
-+  - Add the patch file to the index:
-+     - `git add a patches/v8/`
-+  - (Optionally) commit each patch file to ensure you can back up if you mess up a step:
-+     - `git commit patches/v8/`
-+8. Update `patches/v8/README.md` with references to all new patches that have been added so that the next person will know which need to be removed.
-+>>>>>>> .their
- 9. Update Electron's submodule references:
-   ```sh
-   $ cd electron/vendor/node
-@@ -87,8 +134,13 @@
-   electron/vendor/libchromiumcontent$ git checkout upgrade-to-chromium-X
-   electron/vendor/libchromiumcontent$ cd ../..
-   electron$ git add vendor
-+<<<<<<< .our
-   electron$ git commit -m "update submodule references for node and libcc"
-   electron$ git push origin upgrade-to-chromium-<VERSION>
-+=======
-+  electron$ git commit -m "update submodule referefences for node and libc"
-+  electron$ git pso upgrade-to-chromium-62
-+>>>>>>> .their
-   electron$ script/bootstrap.py -d
-   electron$ script/build.py -c -D
-   ```
-added in both
-  our    100644 162300c6e17ce19fef7ee7c3baa1d74a2cb0dc7a docs/tutorial/application-architecture.md
-  their  100644 7411f025823483cb2d755a4a033102e1ca1b1f36 docs/tutorial/application-architecture.md
-@@ -39,7 +39,11 @@
- 
- > #### Aside: Communication Between Processes
- > In Electron, we have several ways to communicate between the main process
-+<<<<<<< .our
- and renderer processes, such as [`ipcRenderer`](../api/ipc-renderer.md) and
-+=======
-+and renderer processes. Like [`ipcRenderer`](../api/ipc-renderer.md) and
-+>>>>>>> .their
- [`ipcMain`](../api/ipc-main.md) modules for sending messages, and the
- [remote](../api/remote.md) module for RPC style communication. There is also
- an FAQ entry on [how to share data between web pages][share-data].
-added in both
-  our    100644 22b861749cb9c5d7fe6982d273856fb3c4bf04c9 docs/tutorial/application-distribution.md
-  their  100644 83d7c7bdfe6ac01d981e1bae47c8303f8de9e4fe docs/tutorial/application-distribution.md
-@@ -141,7 +141,11 @@
- 2. Create a new S3 bucket and create the following empty directory structure:
- 
-     ```sh
-+<<<<<<< .our
-     - electron/
-+=======
-+    - atom-shell/
-+>>>>>>> .their
-       - symbols/
-       - dist/
-     ```
-@@ -150,7 +154,11 @@
- 
-   * `ELECTRON_GITHUB_TOKEN` - a token that can create releases on GitHub
-   * `ELECTRON_S3_ACCESS_KEY`, `ELECTRON_S3_BUCKET`, `ELECTRON_S3_SECRET_KEY` -
-+<<<<<<< .our
-     the place where you'll upload Node.js headers as well as symbols
-+=======
-+    the place where you'll upload node.js headers as well as symbols
-+>>>>>>> .their
-   * `ELECTRON_RELEASE` - Set to `true` and the upload part will run, leave unset
-     and `surf-build` will do CI-type checks, appropriate to run for every
-     pull request.
-added in both
-  our    100644 16eb961fabe09001e621b834b297cada6918c102 docs/tutorial/code-signing.md
-  their  100644 236ebe80ef02f38a094404a79f067120d32adaa7 docs/tutorial/code-signing.md
-@@ -66,7 +66,11 @@
- See the [Windows Store Guide].
- 
- [Apple Developer Program]: https://developer.apple.com/programs/
-+<<<<<<< .our
- [`electron-builder`]: https://github.com/electron-userland/electron-builder
-+=======
-+[`electron-builder`]: https://github.com/electron/electron-builder
-+>>>>>>> .their
- [`electron-forge`]: https://github.com/electron-userland/electron-forge
- [`electron-osx-sign`]: https://github.com/electron-userland/electron-osx-sign
- [`electron-packager`]: https://github.com/electron-userland/electron-packager
-added in both
-  our    100644 9629bb98282d080bc53171a619d83a193041a022 docs/tutorial/electron-versioning.md
-  their  100644 883f20eefa9e59450efaed9fbd4dbafb2632b4e5 docs/tutorial/electron-versioning.md
-@@ -49,7 +49,11 @@
- | Chromium version updates        |                                    | fix-related chromium patches  |
- 
- 
-+<<<<<<< .our
- Note that most Chromium updates will be considered breaking. Fixes that can be backported will likely be cherry-picked as patches.
-+=======
-+Note that most chromium updates will be considered breaking. Fixes that can be backported will likely be cherry-picked as patches.
-+>>>>>>> .their
- 
- # Stabilization Branches
- 
-@@ -136,12 +140,20 @@
- 
- We seek to increase clarity at all levels of the update and releases process. Starting with `2.0.0` we will require pull requests adhere to the [Conventional Commits](https://conventionalcommits.org/) spec, which can be summarized as follows:
- 
-+<<<<<<< .our
- * Commits that would result in a semver **major** bump must start their body with `BREAKING CHANGE:`.
-+=======
-+* Commits that would result in a semver **major** bump must start with `BREAKING CHANGE:`.
-+>>>>>>> .their
- * Commits that would result in a semver **minor** bump must start with `feat:`.
- * Commits that would result in a semver **patch** bump must start with `fix:`.
- 
- * We allow squashing of commits, provided that the squashed message adheres the the above message format.
-+<<<<<<< .our
- * It is acceptable for some commits in a pull request to not include a semantic prefix, as long as the pull request title contains a meaningful encompassing semantic message.
-+=======
-+* It is acceptable for some commits in a pull request to not include a semantic prefix, as long as a later commit in the same pull request contains a meaningful encompassing semantic message.
-+>>>>>>> .their
- 
- # Versionless `master`
- 
-added in both
-  our    100644 081c82031907404938387485dc95414c7de4e4db docs/tutorial/mac-app-store-submission-guide.md
-  their  100644 e8812a85b57f6d10900b8932ebe790c499ba8476 docs/tutorial/mac-app-store-submission-guide.md
-@@ -229,6 +229,20 @@
- See the [Enabling User-Selected File Access documentation][user-selected] for
- more details.
- 
-+<<<<<<< .our
-+=======
-+## Known issues
-+
-+### `shell.openItem(filePath)`
-+
-+This will fail when the app is signed for distribution in the Mac App Store.
-+Subscribe to [#9005](https://github.com/electron/electron/issues/9005) for updates.
-+
-+#### Workaround
-+
-+`shell.openExternal('file://' + filePath)` will open the file in the default application as long as the extension is associated with an installed app.
-+
-+>>>>>>> .their
- ## Cryptographic Algorithms Used by Electron
- 
- Depending on the country and region you are located, Mac App Store may require
-added in both
-  our    100644 77f5d9632f58a1874c3d962b981619872a73a8b2 docs/tutorial/security.md
-  their  100644 8da43e6391d2761adc03014fb86ca87ca2040950 docs/tutorial/security.md
-@@ -31,7 +31,11 @@
- developers should be aware that upgrading is a serious undertaking - involving
- hand-editing dozens or even hundreds of files. Given the resources and
- contributions available today, Electron will often not be on the very latest
-+<<<<<<< .our
- version of Chromium, lagging behind by several weeks or a few months.
-+=======
-+version of Chromium, lagging behind by either days or weeks.
-+>>>>>>> .their
- 
- We feel that our current system of updating the Chromium component strikes an
- appropriate balance between the resources we have available and the needs of
-@@ -81,8 +85,12 @@
- 10. [Do not use `enableBlinkFeatures`](#10-do-not-use-enableblinkfeatures)
- 11. [`<webview>`: Do not use `allowpopups`](#11-do-not-use-allowpopups)
- 12. [`<webview>`: Verify options and params](#12-verify-webview-options-before-creation)
-+<<<<<<< .our
- 13. [Disable or limit navigation](#13-disable-or-limit-navigation)
- 14. [Disable or limit creation of new windows](#14-disable-or-limit-creation-of-new-windows)
-+=======
-+
-+>>>>>>> .their
- 
- ## 1) Only Load Secure Content
- 
-@@ -340,7 +348,16 @@
- Electron can load for that given web page. `https://your-page.com` should
- be allowed to load scripts from the origins you defined while scripts from
- `https://evil.attacker.com` should not be allowed to run. Defining a CSP is an
-+<<<<<<< .our
- easy way to improve your application's security.
-+=======
-+easy way to improve your applications security.
-+
-+### How?
-+
-+Electron respects [the `Content-Security-Policy` HTTP header](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy)
-+and the respective `<meta>` tag.
-+>>>>>>> .their
- 
- The following CSP will allow Electron to execute scripts from the current
- website and from `apis.mydomain.com`.
-@@ -353,6 +370,7 @@
- Content-Security-Policy: script-src 'self' https://apis.mydomain.com
- ```
- 
-+<<<<<<< .our
- ### CSP HTTP Header
- 
- Electron respects the [`Content-Security-Policy` HTTP header](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy)
-@@ -379,6 +397,8 @@
- 
- #### `webRequest.onHeadersReceived([filter, ]listener)`
- 
-+=======
-+>>>>>>> .their
- 
- ## 7) Override and Disable `eval`
- 
-@@ -446,7 +466,11 @@
- _Recommendation is Electron's default_
- 
- Advanced users of Electron can enable experimental Chromium features using the
-+<<<<<<< .our
- `experimentalFeatures` property.
-+=======
-+`experimentalFeatures` and `experimentalCanvasFeatures` properties.
-+>>>>>>> .their
- 
- ### Why?
- 
-@@ -558,7 +582,11 @@
- 
- Before a [`<webview>`][webview-tag] tag is attached, Electron will fire the
- `will-attach-webview` event on the hosting `webContents`. Use the event to
-+<<<<<<< .our
- prevent the creation of `webViews` with possibly insecure options.
-+=======
-+prevent the creation of webviews with possibly insecure options.
-+>>>>>>> .their
- 
- ```js
- app.on('web-contents-created', (event, contents) => {
-@@ -581,6 +609,7 @@
- Again, this list merely minimizes the risk, it does not remove it. If your goal
- is to display a website, a browser will be a more secure option.
- 
-+<<<<<<< .our
- ## 13) Disable or limit navigation
- 
- If your app has no need to navigate or only needs to navigate to known pages,
-@@ -671,3 +700,8 @@
- [web-contents]: ../api/web-contents.md
- [new-window]: ../api/web-contents.md#event-new-window
- [will-navigate]: ../api/web-contents.md#event-will-navigate
-+=======
-+[browser-window]: ../api/browser-window.md
-+[browser-view]: ../api/browser-view.md
-+[webview-tag]: ../api/webview-tag.md
-+>>>>>>> .their
-added in both
-  our    100644 bf01dc632319a6dfa147fcbc8376686778e71714 docs/tutorial/using-pepper-flash-plugin.md
-  their  100644 42ead0d694916bd22dad19e3487ccf73fc9f6190 docs/tutorial/using-pepper-flash-plugin.md
-@@ -7,7 +7,11 @@
- ## Prepare a Copy of Flash Plugin
- 
- On macOS and Linux, the details of the Pepper Flash plugin can be found by
-+<<<<<<< .our
- navigating to `chrome://flash` in the Chrome browser. Its location and version
-+=======
-+navigating to `chrome://plugins` in the Chrome browser. Its location and version
-+>>>>>>> .their
- are useful for Electron's Pepper Flash support. You can also copy it to another
- location.
- 
-added in both
-  our    100644 1ceae13473af2a1ccd888924f342e5137c83e7e5 docs/tutorial/using-selenium-and-webdriver.md
-  their  100644 5df8818d5b83c73469de4b3e5760baa5ee37591a docs/tutorial/using-selenium-and-webdriver.md
-@@ -164,7 +164,11 @@
- [place](https://github.com/electron/electron/blob/master/docs/tutorial/application-distribution.md)
- your app source into Electron's resource directory.
- 
-+<<<<<<< .our
- Alternatively, pass an argument to run with your Electron binary that points to
-+=======
-+Alternatively, pass an argument to run with your electron binary that points to
-+>>>>>>> .their
- your app's folder. This eliminates the need to copy-paste your app into
- Electron's resource directory.
- 
-added in both
-  our    100644 944ddab2a3fd879044e31677e4bac2843fffbdee electron.gyp
-  their  100644 7fd92efeb1d090ba7152c4339ab3d16ae90eef6f electron.gyp
-@@ -4,7 +4,11 @@
-     'product_name%': 'Electron',
-     'company_name%': 'GitHub, Inc',
-     'company_abbr%': 'github',
-+<<<<<<< .our
-     'version%': '4.0.0-nightly.20180821',
-+=======
-+    'version%': '3.0.0-beta.3',
-+>>>>>>> .their
-     'js2c_input_dir': '<(SHARED_INTERMEDIATE_DIR)/js2c',
-   },
-   'includes': [
-@@ -48,11 +52,14 @@
-           'ENABLE_VIEW_API',
-         ],
-       }],  # enable_view_api
-+<<<<<<< .our
-       ['enable_pepper_flash==1', {
-         'defines': [
-           'ENABLE_PEPPER_FLASH',
-         ],
-       }],  # enable_pepper_flash
-+=======
-+>>>>>>> .their
-     ],
-   },
-   'targets': [
-@@ -163,6 +170,12 @@
-           ],
-         }],  # OS!="mac"
-         ['OS=="win"', {
-+<<<<<<< .our
-+=======
-+          'include_dirs': [
-+            '<(libchromiumcontent_dir)/gen/ui/resources',
-+          ],
-+>>>>>>> .their
-           'msvs_settings': {
-             'VCManifestTool': {
-               'EmbedManifest': 'true',
-@@ -272,6 +285,11 @@
-         'NODE_SHARED_MODE',
-         'HAVE_OPENSSL=1',
-         'HAVE_INSPECTOR=1',
-+<<<<<<< .our
-+=======
-+        # This is defined in skia/skia_common.gypi.
-+        'SK_SUPPORT_LEGACY_GETTOPDEVICE',
-+>>>>>>> .their
-         # Disable warnings for g_settings_list_schemas.
-         'GLIB_DISABLE_DEPRECATION_WARNINGS',
-         # Defined in Chromium but not exposed in its gyp file.
-@@ -285,6 +303,12 @@
-         # See Chromium src/third_party/protobuf/BUILD.gn
-         'GOOGLE_PROTOBUF_NO_RTTI',
-         'GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER',
-+<<<<<<< .our
-+=======
-+
-+        # Enables SkBitmap size 64 operations
-+        'SK_SUPPORT_LEGACY_SAFESIZE64',
-+>>>>>>> .their
-       ],
-       'sources': [
-         '<@(lib_sources)',
-@@ -333,6 +357,7 @@
-             'vendor/pdf_viewer/pdf_viewer.gyp:pdf_viewer',
-           ],
-         }],  # enable_pdf_viewer
-+<<<<<<< .our
-         ['enable_pepper_flash==1', {
-           'include_dirs': [
-             '<(libchromiumcontent_src_dir)/chrome/browser/renderer_host/pepper',
-@@ -352,6 +377,8 @@
-             ],
-           },
-         }],  # enable_pepper_flash
-+=======
-+>>>>>>> .their
-         ['libchromiumcontent_component', {
-           'link_settings': {
-             'libraries': [ '<@(libchromiumcontent_v8_libraries)' ],
-@@ -363,9 +390,13 @@
-           ],
-           'link_settings': {
-             'libraries': [
-+<<<<<<< .our
-               '-ldwmapi.lib',
-               '-limm32.lib',
-               '-lgdi32.lib',
-+=======
-+              '-limm32.lib',
-+>>>>>>> .their
-               '-loleacc.lib',
-               '-lcomctl32.lib',
-               '-lcomdlg32.lib',
-added in both
-  our    100644 86543a4db1195223a3556fa71583038f15d79a0a features.gypi
-  their  100644 ab0c34e8545810ff5e1077d1012b696275f452b1 features.gypi
-@@ -3,17 +3,27 @@
-   'variables': {
-     'variables': {
-       'enable_desktop_capturer%': 1,
-+<<<<<<< .our
-       'enable_osr%': 1,
-       'enable_pdf_viewer%': 0,  # FIXME(deepak1556)
-       'enable_run_as_node%': 1,
-       'enable_view_api%': 0,
-       'enable_pepper_flash%': 1,
-+=======
-+      'enable_osr%': 0,  # FIXME(alexeykuzmin)
-+      'enable_pdf_viewer%': 0,  # FIXME(deepak1556)
-+      'enable_run_as_node%': 1,
-+      'enable_view_api%': 0,
-+>>>>>>> .their
-     },
-     'enable_desktop_capturer%': '<(enable_desktop_capturer)',
-     'enable_osr%': '<(enable_osr)',
-     'enable_pdf_viewer%': '<(enable_pdf_viewer)',
-     'enable_run_as_node%': '<(enable_run_as_node)',
-     'enable_view_api%': '<(enable_view_api)',
-+<<<<<<< .our
-     'enable_pepper_flash%': '<(enable_pepper_flash)',
-+=======
-+>>>>>>> .their
-   },
- }
-added in both
-  our    100644 f57860558f06b7e5d8a50f48cfc7e53044df0bc6 filenames.gypi
-  their  100644 19fb7492250fe763c189e1f727e54a0694148a63 filenames.gypi
-@@ -98,6 +98,7 @@
-       'default_app/main.js',
-       'default_app/package.json',
-       'default_app/renderer.js',
-+<<<<<<< .our
-       'default_app/styles.css',
-       'node_modules/octicons/build/build.css',
-       'node_modules/octicons/build/svg/gist.svg',
-@@ -105,6 +106,8 @@
-       'node_modules/octicons/build/svg/gear.svg',
-       'node_modules/octicons/build/svg/star.svg',
-       'node_modules/octicons/build/svg/gift.svg',
-+=======
-+>>>>>>> .their
-     ],
-     'lib_sources': [
-       'atom/app/atom_content_client.cc',
-@@ -313,12 +316,17 @@
-       'atom/browser/relauncher.h',
-       'atom/browser/render_process_preferences.cc',
-       'atom/browser/render_process_preferences.h',
-+<<<<<<< .our
-       'atom/browser/request_context_delegate.cc',
-       'atom/browser/request_context_delegate.h',
-       'atom/browser/session_preferences.cc',
-       'atom/browser/session_preferences.h',
-       'atom/browser/special_storage_policy.cc',
-       'atom/browser/special_storage_policy.h',
-+=======
-+      'atom/browser/session_preferences.cc',
-+      'atom/browser/session_preferences.h',
-+>>>>>>> .their
-       'atom/browser/ui/accelerator_util.cc',
-       'atom/browser/ui/accelerator_util.h',
-       'atom/browser/ui/accelerator_util_mac.mm',
-@@ -533,8 +541,11 @@
-       'atom/common/platform_util_linux.cc',
-       'atom/common/platform_util_mac.mm',
-       'atom/common/platform_util_win.cc',
-+<<<<<<< .our
-       'atom/common/promise_util.h',
-       'atom/common/promise_util.cc',
-+=======
-+>>>>>>> .their
-       'atom/renderer/api/atom_api_renderer_ipc.h',
-       'atom/renderer/api/atom_api_renderer_ipc.cc',
-       'atom/renderer/api/atom_api_spell_check_client.cc',
-@@ -608,6 +619,23 @@
-       'chromium_src/chrome/browser/process_singleton_posix.cc',
-       'chromium_src/chrome/browser/process_singleton_win.cc',
-       'chromium_src/chrome/browser/process_singleton.h',
-+<<<<<<< .our
-+=======
-+      'chromium_src/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc',
-+      'chromium_src/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h',
-+      'chromium_src/chrome/browser/renderer_host/pepper/monitor_finder_mac.h',
-+      'chromium_src/chrome/browser/renderer_host/pepper/monitor_finder_mac.mm',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.h',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.h',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc',
-+      'chromium_src/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h',
-+>>>>>>> .their
-       'chromium_src/chrome/browser/speech/tts_controller.h',
-       'chromium_src/chrome/browser/speech/tts_controller_impl.cc',
-       'chromium_src/chrome/browser/speech/tts_controller_impl.h',
-@@ -645,6 +673,23 @@
-       'chromium_src/chrome/common/widevine_cdm_constants.h',
-       'chromium_src/chrome/renderer/media/chrome_key_systems.cc',
-       'chromium_src/chrome/renderer/media/chrome_key_systems.h',
-+<<<<<<< .our
-+=======
-+      'chromium_src/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc',
-+      'chromium_src/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.h',
-+      'chromium_src/chrome/renderer/pepper/pepper_flash_font_file_host.cc',
-+      'chromium_src/chrome/renderer/pepper/pepper_flash_font_file_host.h',
-+      'chromium_src/chrome/renderer/pepper/pepper_flash_fullscreen_host.cc',
-+      'chromium_src/chrome/renderer/pepper/pepper_flash_fullscreen_host.h',
-+      'chromium_src/chrome/renderer/pepper/pepper_flash_menu_host.cc',
-+      'chromium_src/chrome/renderer/pepper/pepper_flash_menu_host.h',
-+      'chromium_src/chrome/renderer/pepper/pepper_flash_renderer_host.cc',
-+      'chromium_src/chrome/renderer/pepper/pepper_flash_renderer_host.h',
-+      'chromium_src/chrome/renderer/pepper/pepper_helper.cc',
-+      'chromium_src/chrome/renderer/pepper/pepper_helper.h',
-+      'chromium_src/chrome/renderer/pepper/pepper_shared_memory_message_filter.cc',
-+      'chromium_src/chrome/renderer/pepper/pepper_shared_memory_message_filter.h',
-+>>>>>>> .their
-       'chromium_src/chrome/renderer/printing/print_web_view_helper.cc',
-       'chromium_src/chrome/renderer/printing/print_web_view_helper_linux.cc',
-       'chromium_src/chrome/renderer/printing/print_web_view_helper_mac.mm',
-added in both
-  our    100644 66f6ae651acf10fb19b8ec068fc5280850dd3d91 lib/browser/api/app.js
-  their  100644 a6d94a20a40051faf01c2c15cd6d492235d17a1d lib/browser/api/app.js
-@@ -12,12 +12,36 @@
- const {EventEmitter} = require('events')
- 
- let dockMenu = null
-+<<<<<<< .our
-+=======
-+let readyPromise = null
-+>>>>>>> .their
- 
- // App is an EventEmitter.
- Object.setPrototypeOf(App.prototype, EventEmitter.prototype)
- EventEmitter.call(app)
- 
- Object.assign(app, {
-+<<<<<<< .our
-+=======
-+  whenReady () {
-+    if (readyPromise !== null) {
-+      return readyPromise
-+    }
-+
-+    if (app.isReady()) {
-+      readyPromise = Promise.resolve()
-+    } else {
-+      readyPromise = new Promise(resolve => {
-+        // XXX(alexeykuzmin): Explicitly ignore any data
-+        // passed to the event handler to avoid memory leaks.
-+        app.once('ready', () => resolve())
-+      })
-+    }
-+
-+    return readyPromise
-+  },
-+>>>>>>> .their
-   setApplicationMenu (menu) {
-     return Menu.setApplicationMenu(menu)
-   },
-added in both
-  our    100644 506e3525c10ce142cafe3fc1bf4de1c255e48503 lib/browser/api/menu.js
-  their  100644 dcc446587913f37a58c86f4d1bf612371589960e lib/browser/api/menu.js
-@@ -47,7 +47,11 @@
-   this.delegate = delegate
- }
- 
-+<<<<<<< .our
- Menu.prototype.popup = function (options = {}) {
-+=======
-+Menu.prototype.popup = function (options) {
-+>>>>>>> .their
-   if (options == null || typeof options !== 'object') {
-     throw new TypeError('Options must be an object')
-   }
-@@ -156,6 +160,7 @@
- 
- Menu.buildFromTemplate = function (template) {
-   if (!Array.isArray(template)) {
-+<<<<<<< .our
-     throw new TypeError('Invalid template for Menu: Menu template must be an array')
-   }
-   const menu = new Menu()
-@@ -166,18 +171,36 @@
-   const sorted = sortTemplate(filtered)
- 
-   sorted.forEach((item) => menu.append(new MenuItem(item)))
-+=======
-+    throw new TypeError('Invalid template for Menu')
-+  }
-+
-+  const menu = new Menu()
-+  const filtered = removeExtraSeparators(template)
-+  const sorted = sortTemplate(filtered)
-+
-+  sorted.forEach((item) => {
-+    if (typeof item !== 'object') {
-+      throw new TypeError('Invalid template for MenuItem')
-+    }
-+    menu.append(new MenuItem(item))
-+  })
-+>>>>>>> .their
- 
-   return menu
- }
- 
- /* Helper Functions */
- 
-+<<<<<<< .our
- // validate the template against having the wrong attribute
- function areValidTemplateItems (template) {
-   return template.every(item =>
-   item != null && typeof item === 'object' && (item.hasOwnProperty('label') || item.hasOwnProperty('role') || item.type === 'separator'))
- }
- 
-+=======
-+>>>>>>> .their
- function sortTemplate (template) {
-   const sorted = sortMenuItems(template)
-   for (let id in sorted) {
-added in both
-  our    100644 3f2d470a270378ce1221c928e549d0857755fa09 lib/browser/api/net.js
-  their  100644 54ef99d407ff3a7d7e853b8ccda350d5f8d47fa8 lib/browser/api/net.js
-@@ -352,10 +352,13 @@
-   abort () {
-     this.urlRequest.cancel()
-   }
-+<<<<<<< .our
- 
-   getUploadProgress () {
-     return this.urlRequest.getUploadProgress()
-   }
-+=======
-+>>>>>>> .their
- }
- 
- function writeAfterEndNT (self, error, callback) {
-added in both
-  our    100644 8f5bd037b14d05db7396bb8b5de1a29fdef167ae lib/browser/api/web-contents.js
-  their  100644 4b3e777b4dcbfe7e6bc55c7e4ffcc12f09d3ecac lib/browser/api/web-contents.js
-@@ -264,12 +264,15 @@
-   })
- }
- 
-+<<<<<<< .our
- // TODO(zcbenz): Remove the stub in 4.0.
- WebContents.prototype.setSize = function () {
-   console.error('The WebContents.setSize method has been removed, see',
-                 'https://github.com/electron/electron/issues/14120 for more.')
- }
- 
-+=======
-+>>>>>>> .their
- // Add JavaScript wrappers for WebContents class.
- WebContents.prototype._init = function () {
-   // The navigation controller.
-added in both
-  our    100644 1e4029e39a981c85fb6ff18c5ccd52f81b3c56f2 lib/browser/guest-view-manager.js
-  their  100644 da2663e6060a71f400c26ed59f1d6c27a59f1e9f lib/browser/guest-view-manager.js
-@@ -46,6 +46,14 @@
- const guestInstances = {}
- const embedderElementsMap = {}
- 
-+<<<<<<< .our
-+=======
-+// Moves the last element of array to the first one.
-+const moveLastToFirst = function (list) {
-+  list.unshift(list.pop())
-+}
-+
-+>>>>>>> .their
- // Generate guestInstanceId.
- const getNextGuestInstanceId = function () {
-   return ++nextGuestInstanceId
-@@ -68,6 +76,7 @@
-     embedder: embedder
-   }
- 
-+<<<<<<< .our
-   // Clear the guest from map when it is destroyed.
-   guest.once('destroyed', () => {
-     if (guestInstanceId in guestInstances) {
-@@ -77,6 +86,12 @@
- 
-   // Init guest web view after attached.
-   guest.once('did-attach', function (event) {
-+=======
-+  watchEmbedder(embedder)
-+
-+  // Init guest web view after attached.
-+  guest.on('did-attach', function (event) {
-+>>>>>>> .their
-     params = this.attachParams
-     delete this.attachParams
- 
-@@ -88,6 +103,24 @@
-       return
-     }
- 
-+<<<<<<< .our
-+=======
-+    this.setSize({
-+      normal: {
-+        width: params.elementWidth,
-+        height: params.elementHeight
-+      },
-+      enableAutoSize: params.autosize,
-+      min: {
-+        width: params.minwidth,
-+        height: params.minheight
-+      },
-+      max: {
-+        width: params.maxwidth,
-+        height: params.maxheight
-+      }
-+    })
-+>>>>>>> .their
-     if (params.src) {
-       const opts = {}
-       if (params.httpreferrer) {
-@@ -103,7 +136,12 @@
-   })
- 
-   const sendToEmbedder = (channel, ...args) => {
-+<<<<<<< .our
-     if (!embedder.isDestroyed()) {
-+=======
-+    const embedder = getEmbedder(guestInstanceId)
-+    if (embedder != null) {
-+>>>>>>> .their
-       embedder.send(`${channel}-${guest.viewInstanceId}`, ...args)
-     }
-   }
-@@ -123,6 +161,14 @@
-     sendToEmbedder('ELECTRON_GUEST_VIEW_INTERNAL_IPC_MESSAGE', channel, ...args)
-   })
- 
-+<<<<<<< .our
-+=======
-+  // Autosize.
-+  guest.on('size-changed', function (_, ...args) {
-+    sendToEmbedder('ELECTRON_GUEST_VIEW_INTERNAL_SIZE_CHANGED', ...args)
-+  })
-+
-+>>>>>>> .their
-   // Notify guest of embedder window visibility when it is ready
-   // FIXME Remove once https://github.com/electron/electron/issues/6828 is fixed
-   guest.on('dom-ready', function () {
-@@ -155,10 +201,17 @@
- }
- 
- // Attach the guest to an element of embedder.
-+<<<<<<< .our
- const attachGuest = function (event, embedderFrameId, elementInstanceId, guestInstanceId, params) {
-   const embedder = event.sender
-   // Destroy the old guest when attaching.
-   const key = `${embedder.id}-${elementInstanceId}`
-+=======
-+const attachGuest = function (event, elementInstanceId, guestInstanceId, params) {
-+  const embedder = event.sender
-+  // Destroy the old guest when attaching.
-+  const key = `${embedder.getId()}-${elementInstanceId}`
-+>>>>>>> .their
-   const oldGuestInstanceId = embedderElementsMap[key]
-   if (oldGuestInstanceId != null) {
-     // Reattachment to the same guest is just a no-op.
-@@ -166,10 +219,14 @@
-       return
-     }
- 
-+<<<<<<< .our
-     const oldGuestInstance = guestInstances[oldGuestInstanceId]
-     if (oldGuestInstance) {
-       oldGuestInstance.guest.destroy()
-     }
-+=======
-+    destroyGuest(embedder, oldGuestInstanceId)
-+>>>>>>> .their
-   }
- 
-   const guestInstance = guestInstances[guestInstanceId]
-@@ -181,7 +238,11 @@
- 
-   // If this guest is already attached to an element then remove it
-   if (guestInstance.elementInstanceId) {
-+<<<<<<< .our
-     const oldKey = `${guestInstance.embedder.id}-${guestInstance.elementInstanceId}`
-+=======
-+    const oldKey = `${guestInstance.embedder.getId()}-${guestInstance.elementInstanceId}`
-+>>>>>>> .their
-     delete embedderElementsMap[oldKey]
- 
-     // Remove guest from embedder if moving across web views
-@@ -242,10 +303,18 @@
-   embedder.emit('will-attach-webview', event, webPreferences, params)
-   if (event.defaultPrevented) {
-     if (guest.viewInstanceId == null) guest.viewInstanceId = params.instanceId
-+<<<<<<< .our
-     guest.destroy()
-     return
-   }
- 
-+=======
-+    destroyGuest(embedder, guestInstanceId)
-+    return
-+  }
-+
-+  webViewManager.addGuest(guestInstanceId, elementInstanceId, embedder, guest, webPreferences)
-+>>>>>>> .their
-   guest.attachParams = params
-   embedderElementsMap[key] = guestInstanceId
- 
-@@ -254,6 +323,7 @@
-   guestInstance.elementInstanceId = elementInstanceId
- 
-   watchEmbedder(embedder)
-+<<<<<<< .our
- 
-   webViewManager.addGuest(guestInstanceId, elementInstanceId, embedder, guest, webPreferences)
-   guest.attachToIframe(embedder, embedderFrameId)
-@@ -261,15 +331,32 @@
- 
- // Remove an guest-embedder relationship.
- const detachGuest = function (embedder, guestInstanceId) {
-+=======
-+}
-+
-+// Destroy an existing guest instance.
-+const destroyGuest = function (embedder, guestInstanceId) {
-+  if (!(guestInstanceId in guestInstances)) {
-+    return
-+  }
-+
-+>>>>>>> .their
-   const guestInstance = guestInstances[guestInstanceId]
-   if (embedder !== guestInstance.embedder) {
-     return
-   }
- 
-   webViewManager.removeGuest(embedder, guestInstanceId)
-+<<<<<<< .our
-   delete guestInstances[guestInstanceId]
- 
-   const key = `${embedder.id}-${guestInstance.elementInstanceId}`
-+=======
-+  guestInstance.guest.destroy()
-+  delete guestInstances[guestInstanceId]
-+
-+  const key = `${embedder.getId()}-${guestInstance.elementInstanceId}`
-+>>>>>>> .their
-   delete embedderElementsMap[key]
- }
- 
-@@ -284,7 +371,11 @@
- 
-   // Forward embedder window visiblity change events to guest
-   const onVisibilityChange = function (visibilityState) {
-+<<<<<<< .our
-     for (const guestInstanceId in guestInstances) {
-+=======
-+    for (const guestInstanceId of Object.keys(guestInstances)) {
-+>>>>>>> .their
-       const guestInstance = guestInstances[guestInstanceId]
-       guestInstance.visibilityState = visibilityState
-       if (guestInstance.embedder === embedder) {
-@@ -294,6 +385,7 @@
-   }
-   embedder.on('-window-visibility-change', onVisibilityChange)
- 
-+<<<<<<< .our
-   embedder.once('will-destroy', () => {
-     // Usually the guestInstances is cleared when guest is destroyed, but it
-     // may happen that the embedder gets manually destroyed earlier than guest,
-@@ -308,18 +400,61 @@
-     embedder.removeListener('-window-visibility-change', onVisibilityChange)
-     watchedEmbedders.delete(embedder)
-   })
-+=======
-+  const destroyEvents = ['will-destroy', 'crashed', 'did-navigate']
-+  const destroy = function () {
-+    for (const guestInstanceId of Object.keys(guestInstances)) {
-+      if (guestInstances[guestInstanceId].embedder === embedder) {
-+        destroyGuest(embedder, parseInt(guestInstanceId))
-+      }
-+    }
-+
-+    for (const event of destroyEvents) {
-+      embedder.removeListener(event, destroy)
-+    }
-+    embedder.removeListener('-window-visibility-change', onVisibilityChange)
-+
-+    watchedEmbedders.delete(embedder)
-+  }
-+
-+  for (const event of destroyEvents) {
-+    embedder.once(event, destroy)
-+
-+    // Users might also listen to the crashed event, so we must ensure the guest
-+    // is destroyed before users' listener gets called. It is done by moving our
-+    // listener to the first one in queue.
-+    const listeners = embedder._events[event]
-+    if (Array.isArray(listeners)) {
-+      moveLastToFirst(listeners)
-+    }
-+  }
-+>>>>>>> .their
- }
- 
- ipcMain.on('ELECTRON_GUEST_VIEW_MANAGER_CREATE_GUEST', function (event, params, requestId) {
-   event.sender.send(`ELECTRON_RESPONSE_${requestId}`, createGuest(event.sender, params))
- })
- 
-+<<<<<<< .our
- ipcMain.on('ELECTRON_GUEST_VIEW_MANAGER_CREATE_GUEST_SYNC', function (event, params) {
-   event.returnValue = createGuest(event.sender, params)
- })
- 
- ipcMain.on('ELECTRON_GUEST_VIEW_MANAGER_ATTACH_GUEST', function (event, embedderFrameId, elementInstanceId, guestInstanceId, params) {
-   attachGuest(event, embedderFrameId, elementInstanceId, guestInstanceId, params)
-+=======
-+ipcMain.on('ELECTRON_GUEST_VIEW_MANAGER_ATTACH_GUEST', function (event, elementInstanceId, guestInstanceId, params) {
-+  attachGuest(event, elementInstanceId, guestInstanceId, params)
-+})
-+
-+ipcMain.on('ELECTRON_GUEST_VIEW_MANAGER_DESTROY_GUEST', function (event, guestInstanceId) {
-+  destroyGuest(event.sender, guestInstanceId)
-+})
-+
-+ipcMain.on('ELECTRON_GUEST_VIEW_MANAGER_SET_SIZE', function (event, guestInstanceId, params) {
-+  const guest = getGuest(guestInstanceId)
-+  if (guest != null) guest.setSize(params)
-+>>>>>>> .their
- })
- 
- // Returns WebContents from its guest id.
-added in both
-  our    100644 7253c1942b0956ae6b9b0c80a23470fc26669b8a lib/browser/guest-window-manager.js
-  their  100644 8e2aa3bb988208ec4f266d3169020daca4068de3 lib/browser/guest-window-manager.js
-@@ -27,11 +27,19 @@
-   for (const key in parent) {
-     if (key === 'isBrowserView') continue
-     if (!hasProp.call(parent, key)) continue
-+<<<<<<< .our
-     if (key in child && key !== 'webPreferences') continue
- 
-     const value = parent[key]
-     if (typeof value === 'object') {
-       child[key] = mergeOptions(child[key] || {}, value, visited)
-+=======
-+    if (key in child) continue
-+
-+    const value = parent[key]
-+    if (typeof value === 'object') {
-+      child[key] = mergeOptions({}, value, visited)
-+>>>>>>> .their
-     } else {
-       child[key] = value
-     }
-@@ -63,9 +71,14 @@
-   }
- 
-   // Inherit certain option values from parent window
-+<<<<<<< .our
-   const webPreferences = embedder.getLastWebPreferences()
-   for (const [name, value] of inheritedWebPreferences) {
-     if (webPreferences[name] === value) {
-+=======
-+  for (const [name, value] of inheritedWebPreferences) {
-+    if (embedder.getLastWebPreferences()[name] === value) {
-+>>>>>>> .their
-       options.webPreferences[name] = value
-     }
-   }
-added in both
-  our    100644 f03a23d2f6910d6555bb9469180d1b60b94bc313 lib/browser/objects-registry.js
-  their  100644 b2667454152c271bfb088e50c29c096dd1f51c63 lib/browser/objects-registry.js
-@@ -2,10 +2,13 @@
- 
- const v8Util = process.atomBinding('v8_util')
- 
-+<<<<<<< .our
- const getOwnerKey = (webContents, contextId) => {
-   return `${webContents.id}-${contextId}`
- }
- 
-+=======
-+>>>>>>> .their
- class ObjectsRegistry {
-   constructor () {
-     this.nextId = 0
-@@ -15,7 +18,11 @@
-     this.storage = {}
- 
-     // Stores the IDs of objects referenced by WebContents.
-+<<<<<<< .our
-     // (ownerKey) => [id]
-+=======
-+    // (webContentsId) => [id]
-+>>>>>>> .their
-     this.owners = {}
-   }
- 
-@@ -26,10 +33,16 @@
-     const id = this.saveToStorage(obj)
- 
-     // Add object to the set of referenced objects.
-+<<<<<<< .our
-     const ownerKey = getOwnerKey(webContents, contextId)
-     let owner = this.owners[ownerKey]
-     if (!owner) {
-       owner = this.owners[ownerKey] = new Set()
-+=======
-+    let owner = this.owners[contextId]
-+    if (!owner) {
-+      owner = this.owners[contextId] = new Set()
-+>>>>>>> .their
-       this.registerDeleteListener(webContents, contextId)
-     }
-     if (!owner.has(id)) {
-@@ -49,9 +62,14 @@
-   // Dereference an object according to its ID.
-   // Note that an object may be double-freed (cleared when page is reloaded, and
-   // then garbage collected in old page).
-+<<<<<<< .our
-   remove (webContents, contextId, id) {
-     const ownerKey = getOwnerKey(webContents, contextId)
-     let owner = this.owners[ownerKey]
-+=======
-+  remove (contextId, id) {
-+    let owner = this.owners[contextId]
-+>>>>>>> .their
-     if (owner) {
-       // Remove the reference in owner.
-       owner.delete(id)
-@@ -61,14 +79,23 @@
-   }
- 
-   // Clear all references to objects refrenced by the WebContents.
-+<<<<<<< .our
-   clear (webContents, contextId) {
-     const ownerKey = getOwnerKey(webContents, contextId)
-     let owner = this.owners[ownerKey]
-+=======
-+  clear (contextId) {
-+    let owner = this.owners[contextId]
-+>>>>>>> .their
-     if (!owner) return
- 
-     for (let id of owner) this.dereference(id)
- 
-+<<<<<<< .our
-     delete this.owners[ownerKey]
-+=======
-+    delete this.owners[contextId]
-+>>>>>>> .their
-   }
- 
-   // Private: Saves the object into storage and assigns an ID for it.
-@@ -87,9 +114,12 @@
- 
-   // Private: Dereference the object from store.
-   dereference (id) {
-+<<<<<<< .our
-     // FIXME(MarshallOfSound): We should remove this once remote deref works well
-     if (process.env.ELECTRON_DISABLE_REMOTE_DEREFERENCING) return
- 
-+=======
-+>>>>>>> .their
-     let pointer = this.storage[id]
-     if (pointer == null) {
-       return
-@@ -101,13 +131,21 @@
-     }
-   }
- 
-+<<<<<<< .our
-   // Private: Clear the storage when renderer process is destroyed.
-+=======
-+  // Private: Clear the storage when webContents is reloaded/navigated.
-+>>>>>>> .their
-   registerDeleteListener (webContents, contextId) {
-     const processId = webContents.getProcessId()
-     const listener = (event, deletedProcessId) => {
-       if (deletedProcessId === processId) {
-         webContents.removeListener('render-view-deleted', listener)
-+<<<<<<< .our
-         this.clear(webContents, contextId)
-+=======
-+        this.clear(contextId)
-+>>>>>>> .their
-       }
-     }
-     webContents.on('render-view-deleted', listener)
-added in both
-  our    100644 ff9f77321de3a4145946b67f3fe2a597f98e2510 lib/browser/rpc-server.js
-  their  100644 043ddf37f669d6df568be867a3f0fe76483b1c0d lib/browser/rpc-server.js
-@@ -171,6 +171,10 @@
- // Convert array of meta data from renderer into array of real values.
- const unwrapArgs = function (sender, contextId, args) {
-   const metaToValue = function (meta) {
-+<<<<<<< .our
-+=======
-+    let i, len, member, ref, returnValue
-+>>>>>>> .their
-     switch (meta.type) {
-       case 'value':
-         return meta.value
-@@ -190,13 +194,24 @@
-         let ret = {}
-         Object.defineProperty(ret.constructor, 'name', { value: meta.name })
- 
-+<<<<<<< .our
-         for (const {name, value} of meta.members) {
-           ret[name] = metaToValue(value)
-+=======
-+        ref = meta.members
-+        for (i = 0, len = ref.length; i < len; i++) {
-+          member = ref[i]
-+          ret[member.name] = metaToValue(member.value)
-+>>>>>>> .their
-         }
-         return ret
-       }
-       case 'function-with-return-value':
-+<<<<<<< .our
-         const returnValue = metaToValue(meta.value)
-+=======
-+        returnValue = metaToValue(meta.value)
-+>>>>>>> .their
-         return function () {
-           return returnValue
-         }
-@@ -210,9 +225,15 @@
-           return rendererFunctions.get(objectId)
-         }
- 
-+<<<<<<< .our
-         const processId = sender.getProcessId()
-         let callIntoRenderer = function (...args) {
-           if (!sender.isDestroyed() && processId === sender.getProcessId()) {
-+=======
-+        const webContentsId = sender.getId()
-+        let callIntoRenderer = function (...args) {
-+          if (!sender.isDestroyed() && webContentsId === sender.getId()) {
-+>>>>>>> .their
-             sender.send('ELECTRON_RENDERER_CALLBACK', contextId, meta.id, valueToMeta(sender, contextId, args))
-           } else {
-             removeRemoteListenersAndLogWarning(this, meta, callIntoRenderer)
-@@ -234,8 +255,14 @@
- // Call a function and send reply asynchronously if it's a an asynchronous
- // style function and the caller didn't pass a callback.
- const callFunction = function (event, contextId, func, caller, args) {
-+<<<<<<< .our
-   const funcMarkedAsync = v8Util.getHiddenValue(func, 'asynchronous')
-   const funcPassedCallback = typeof args[args.length - 1] === 'function'
-+=======
-+  let err, funcMarkedAsync, funcName, funcPassedCallback, ref, ret
-+  funcMarkedAsync = v8Util.getHiddenValue(func, 'asynchronous')
-+  funcPassedCallback = typeof args[args.length - 1] === 'function'
-+>>>>>>> .their
-   try {
-     if (funcMarkedAsync && !funcPassedCallback) {
-       args.push(function (ret) {
-@@ -243,15 +270,24 @@
-       })
-       func.apply(caller, args)
-     } else {
-+<<<<<<< .our
-       const ret = func.apply(caller, args)
-+=======
-+      ret = func.apply(caller, args)
-+>>>>>>> .their
-       event.returnValue = valueToMeta(event.sender, contextId, ret, true)
-     }
-   } catch (error) {
-     // Catch functions thrown further down in function invocation and wrap
-     // them with the function name so it's easier to trace things like
-     // `Error processing argument -1.`
-+<<<<<<< .our
-     const funcName = func.name || 'anonymous'
-     const err = new Error(`Could not call remote function '${funcName}'. Check that the function signature is correct. Underlying error: ${error.message}`)
-+=======
-+    funcName = ((ref = func.name) != null) ? ref : 'anonymous'
-+    err = new Error(`Could not call remote function '${funcName}'. Check that the function signature is correct. Underlying error: ${error.message}`)
-+>>>>>>> .their
-     err.cause = error
-     throw err
-   }
-@@ -302,7 +338,14 @@
-       throwRPCError(`Cannot call constructor on missing remote object ${id}`)
-     }
- 
-+<<<<<<< .our
-     event.returnValue = valueToMeta(event.sender, contextId, new constructor(...args))
-+=======
-+    // Call new with array of arguments.
-+    // http://stackoverflow.com/questions/1606797/use-of-apply-with-new-operator-is-this-possible
-+    let obj = new (Function.prototype.bind.apply(constructor, [null].concat(args)))()
-+    event.returnValue = valueToMeta(event.sender, contextId, obj)
-+>>>>>>> .their
-   } catch (error) {
-     event.returnValue = exceptionToMeta(event.sender, contextId, error)
-   }
-@@ -332,7 +375,14 @@
-       throwRPCError(`Cannot call constructor '${method}' on missing remote object ${id}`)
-     }
- 
-+<<<<<<< .our
-     event.returnValue = valueToMeta(event.sender, contextId, new object[method](...args))
-+=======
-+    // Call new with array of arguments.
-+    let constructor = object[method]
-+    let obj = new (Function.prototype.bind.apply(constructor, [null].concat(args)))()
-+    event.returnValue = valueToMeta(event.sender, contextId, obj)
-+>>>>>>> .their
-   } catch (error) {
-     event.returnValue = exceptionToMeta(event.sender, contextId, error)
-   }
-@@ -384,12 +434,21 @@
- })
- 
- ipcMain.on('ELECTRON_BROWSER_DEREFERENCE', function (event, contextId, id) {
-+<<<<<<< .our
-   objectsRegistry.remove(event.sender, contextId, id)
- })
- 
- ipcMain.on('ELECTRON_BROWSER_CONTEXT_RELEASE', (event, contextId) => {
-   objectsRegistry.clear(event.sender, contextId)
-   event.returnValue = null
-+=======
-+  objectsRegistry.remove(contextId, id)
-+})
-+
-+ipcMain.on('ELECTRON_BROWSER_CONTEXT_RELEASE', (e, contextId) => {
-+  objectsRegistry.clear(contextId)
-+  e.returnValue = null
-+>>>>>>> .their
- })
- 
- ipcMain.on('ELECTRON_BROWSER_GUEST_WEB_CONTENTS', function (event, contextId, guestInstanceId) {
-@@ -440,8 +499,12 @@
-   event.returnValue = null
- })
- 
-+<<<<<<< .our
- ipcMain.on('ELECTRON_BROWSER_SANDBOX_LOAD', function (event) {
-   const preloadPath = event.sender._getPreloadPath()
-+=======
-+ipcMain.on('ELECTRON_BROWSER_SANDBOX_LOAD', function (event, preloadPath) {
-+>>>>>>> .their
-   let preloadSrc = null
-   let preloadError = null
-   if (preloadPath) {
-@@ -454,6 +517,7 @@
-   event.returnValue = {
-     preloadSrc: preloadSrc,
-     preloadError: preloadError,
-+<<<<<<< .our
-     process: {
-       arch: process.arch,
-       platform: process.platform,
-@@ -461,5 +525,11 @@
-       version: process.version,
-       versions: process.versions
-     }
-+=======
-+    webContentsId: event.sender.getId(),
-+    platform: process.platform,
-+    execPath: process.execPath,
-+    env: process.env
-+>>>>>>> .their
-   }
- })
-added in both
-  our    100644 41c3d0c85c69954dddad53c674f84051f25372e4 lib/common/asar.js
-  their  100644 20385da135967d386247544570c65b1efdb5a8c1 lib/common/asar.js
-@@ -3,7 +3,10 @@
-   const {Buffer} = require('buffer')
-   const childProcess = require('child_process')
-   const path = require('path')
-+<<<<<<< .our
-   const util = require('util')
-+=======
-+>>>>>>> .their
- 
-   const hasProp = {}.hasOwnProperty
- 
-@@ -67,6 +70,7 @@
-   let nextInode = 0
- 
-   const uid = process.getuid != null ? process.getuid() : 0
-+<<<<<<< .our
-   const gid = process.getgid != null ? process.getgid() : 0
- 
-   const fakeTime = new Date()
-@@ -101,6 +105,49 @@
-       msec(stats.ctime), // ctim_msec
-       msec(stats.birthtime) // birthtim_msec
-     )
-+=======
-+
-+  const gid = process.getgid != null ? process.getgid() : 0
-+
-+  const fakeTime = new Date()
-+
-+  const asarStatsToFsStats = function (stats) {
-+    return {
-+      dev: 1,
-+      ino: ++nextInode,
-+      mode: 33188,
-+      nlink: 1,
-+      uid: uid,
-+      gid: gid,
-+      rdev: 0,
-+      atime: stats.atime || fakeTime,
-+      birthtime: stats.birthtime || fakeTime,
-+      mtime: stats.mtime || fakeTime,
-+      ctime: stats.ctime || fakeTime,
-+      size: stats.size,
-+      isFile: function () {
-+        return stats.isFile
-+      },
-+      isDirectory: function () {
-+        return stats.isDirectory
-+      },
-+      isSymbolicLink: function () {
-+        return stats.isLink
-+      },
-+      isBlockDevice: function () {
-+        return false
-+      },
-+      isCharacterDevice: function () {
-+        return false
-+      },
-+      isFIFO: function () {
-+        return false
-+      },
-+      isSocket: function () {
-+        return false
-+      }
-+    }
-+>>>>>>> .their
-   }
- 
-   // Create a ENOENT error.
-@@ -211,6 +258,7 @@
-       arguments[arg] = newPath
-       return old.apply(this, arguments)
-     }
-+<<<<<<< .our
-     if (old[util.promisify.custom]) {
-       module[name][util.promisify.custom] = function () {
-         const p = arguments[arg]
-@@ -233,6 +281,8 @@
-         return old[util.promisify.custom].apply(this, arguments)
-       }
-     }
-+=======
-+>>>>>>> .their
-   }
- 
-   // Override fs APIs.
-@@ -332,6 +382,7 @@
-     const {realpathSync} = fs
-     fs.realpathSync = function (p) {
-       const [isAsar, asarPath, filePath] = splitPath(p)
-+<<<<<<< .our
-       if (!isAsar) return realpathSync.apply(this, arguments)
- 
-       const archive = getOrCreateArchive(asarPath)
-@@ -381,10 +432,33 @@
-       const [isAsar, asarPath, filePath] = splitPath(p)
-       if (!isAsar) return realpath.native.apply(this, arguments)
- 
-+=======
-+      if (!isAsar) {
-+        return realpathSync.apply(this, arguments)
-+      }
-+      const archive = getOrCreateArchive(asarPath)
-+      if (!archive) {
-+        invalidArchiveError(asarPath)
-+      }
-+      const real = archive.realpath(filePath)
-+      if (real === false) {
-+        notFoundError(asarPath, filePath)
-+      }
-+      return path.join(realpathSync(asarPath), real)
-+    }
-+
-+    const {realpath} = fs
-+    fs.realpath = function (p, cache, callback) {
-+      const [isAsar, asarPath, filePath] = splitPath(p)
-+      if (!isAsar) {
-+        return realpath.apply(this, arguments)
-+      }
-+>>>>>>> .their
-       if (typeof cache === 'function') {
-         callback = cache
-         cache = void 0
-       }
-+<<<<<<< .our
- 
-       const archive = getOrCreateArchive(asarPath)
-       if (!archive) return invalidArchiveError(asarPath, callback)
-@@ -394,6 +468,21 @@
- 
-       return realpath.native(asarPath, (err, p) => {
-         return (err) ? callback(err) : callback(null, path.join(p, real))
-+=======
-+      const archive = getOrCreateArchive(asarPath)
-+      if (!archive) {
-+        return invalidArchiveError(asarPath, callback)
-+      }
-+      const real = archive.realpath(filePath)
-+      if (real === false) {
-+        return notFoundError(asarPath, filePath, callback)
-+      }
-+      return realpath(asarPath, function (err, p) {
-+        if (err) {
-+          return callback(err)
-+        }
-+        return callback(null, path.join(p, real))
-+>>>>>>> .their
-       })
-     }
- 
-@@ -414,6 +503,7 @@
-       })
-     }
- 
-+<<<<<<< .our
-     fs.exists[util.promisify.custom] = function (p) {
-       const [isAsar, asarPath, filePath] = splitPath(p)
-       if (!isAsar) {
-@@ -426,6 +516,8 @@
-       return Promise.resolve(archive.stat(filePath) !== false)
-     }
- 
-+=======
-+>>>>>>> .their
-     const {existsSync} = fs
-     fs.existsSync = function (p) {
-       const [isAsar, asarPath, filePath] = splitPath(p)
-@@ -733,6 +825,7 @@
-     // called by `childProcess.{exec,execSync}`, causing
-     // Electron to consider the full command as a single path
-     // to an archive.
-+<<<<<<< .our
-     const {exec, execSync} = childProcess
-     childProcess.exec = invokeWithNoAsar(exec)
-     childProcess.exec[util.promisify.custom] = invokeWithNoAsar(exec[util.promisify.custom])
-@@ -744,11 +837,24 @@
-         process.noAsar = true
-         try {
-           return func.apply(this, arguments)
-+=======
-+    ['exec', 'execSync'].forEach(function (functionName) {
-+      const old = childProcess[functionName]
-+      childProcess[functionName] = function () {
-+        const processNoAsarOriginalValue = process.noAsar
-+        process.noAsar = true
-+        try {
-+          return old.apply(this, arguments)
-+>>>>>>> .their
-         } finally {
-           process.noAsar = processNoAsarOriginalValue
-         }
-       }
-+<<<<<<< .our
-     }
-+=======
-+    })
-+>>>>>>> .their
- 
-     overrideAPI(fs, 'open')
-     overrideAPI(childProcess, 'execFile')
-added in both
-  our    100644 b424768414b857b485bd5e29bfce504de6f1d749 lib/common/init.js
-  their  100644 d732352a30514333edc45e727aec87958866abd5 lib/common/init.js
-@@ -1,5 +1,8 @@
- const timers = require('timers')
-+<<<<<<< .our
- const util = require('util')
-+=======
-+>>>>>>> .their
- 
- process.atomBinding = require('./atom-binding-setup')(process.binding, process.type)
- 
-@@ -9,6 +12,7 @@
- // which would delay the callbacks for arbitrary long time. So we should
- // initiatively activate the uv loop once setImmediate and process.nextTick is
- // called.
-+<<<<<<< .our
- const wrapWithActivateUvLoop = function (func) {
-   return wrap(func, function (func) {
-     return function () {
-@@ -24,6 +28,13 @@
-     wrapped[util.promisify.custom] = wrapper(func[util.promisify.custom])
-   }
-   return wrapped
-+=======
-+var wrapWithActivateUvLoop = function (func) {
-+  return function () {
-+    process.activateUvLoop()
-+    return func.apply(this, arguments)
-+  }
-+>>>>>>> .their
- }
- 
- process.nextTick = wrapWithActivateUvLoop(process.nextTick)
-added in both
-  our    100644 4ea6fae6b0b9ec76ea313b212d8737fcfdb92887 lib/isolated_renderer/init.js
-  their  100644 1536ab10638fe91c8216877c720c9153ffaa009a lib/isolated_renderer/init.js
-@@ -3,6 +3,10 @@
- 'use strict'
- 
- const {send, sendSync} = binding
-+<<<<<<< .our
-+=======
-+const {parse} = JSON
-+>>>>>>> .their
- 
- const ipcRenderer = {
-   send (...args) {
-@@ -10,7 +14,11 @@
-   },
- 
-   sendSync (...args) {
-+<<<<<<< .our
-     return sendSync('ipc-message-sync', args)[0]
-+=======
-+    return parse(sendSync('ipc-message-sync', args))
-+>>>>>>> .their
-   },
- 
-   // No-ops since events aren't received
-added in both
-  our    100644 59117f8f2dd977fc1817a6b1d540b616ddcb0dae lib/renderer/api/remote.js
-  their  100644 55359bad5c44e1e6ba51cf73c1b4cd6d41b03baf lib/renderer/api/remote.js
-@@ -10,7 +10,11 @@
- const remoteObjectCache = v8Util.createIDWeakMap()
- 
- // An unique ID that can represent current context.
-+<<<<<<< .our
- const contextId = v8Util.getHiddenValue(global, 'contextId')
-+=======
-+const contextId = v8Util.getContextId()
-+>>>>>>> .their
- 
- // Notify the main process when current context is going to be released.
- // Note that when the renderer process is destroyed, the message may not be
-added in both
-  our    100644 b24f9e28b879154457be0342b9d4b44c0e651253 lib/renderer/security-warnings.js
-  their  100644 033fcdb1c16b12f3f7530adcea6310debe52ca7c lib/renderer/security-warnings.js
-@@ -45,7 +45,11 @@
- }
- 
- /**
-+<<<<<<< .our
-  * Checks if the current window is remote.
-+=======
-+ * Check's if the current window is remote.
-+>>>>>>> .their
-  *
-  * @returns {boolean} - Is this a remote protocol?
-  */
-@@ -137,8 +141,13 @@
-   warnAboutNodeWithRemoteContent: () => {
-     if (getIsRemoteProtocol()) {
-       const warning = `This renderer process has Node.js integration enabled
-+<<<<<<< .our
-       and attempted to load remote content from '${window.location}'. This
-       exposes users of this app to severe security risks.\n ${moreInformation}`
-+=======
-+      and attempted to load remote content. This exposes users of this app to
-+      severe security risks.\n ${moreInformation}`
-+>>>>>>> .their
- 
-       console.warn('%cElectron Security Warning (Node.js Integration with Remote Content)',
-         'font-weight: bold;', warning)
-@@ -210,7 +219,12 @@
-    */
-   warnAboutExperimentalFeatures: () => {
-     const webPreferences = getWebPreferences()
-+<<<<<<< .our
-     if (!webPreferences || (!webPreferences.experimentalFeatures)) {
-+=======
-+    if (!webPreferences || (!webPreferences.experimentalFeatures &&
-+        !webPreferences.experimentalCanvasFeatures)) {
-+>>>>>>> .their
-       return
-     }
- 
-added in both
-  our    100644 6e42c769b70e5223fe97397f87144ec342882f8d lib/renderer/web-view/guest-view-internal.js
-  their  100644 a868b513eb4221bbf311f8f43ad4f94fff323928 lib/renderer/web-view/guest-view-internal.js
-@@ -61,6 +61,10 @@
- module.exports = {
-   registerEvents: function (webView, viewInstanceId) {
-     ipcRenderer.on(`ELECTRON_GUEST_VIEW_INTERNAL_DESTROY_GUEST-${viewInstanceId}`, function () {
-+<<<<<<< .our
-+=======
-+      webFrame.detachGuest(webView.internalInstanceId)
-+>>>>>>> .their
-       webView.guestInstanceId = undefined
-       webView.reset()
-       const domEvent = new Event('destroyed')
-@@ -77,17 +81,35 @@
-       domEvent.args = args
-       webView.dispatchEvent(domEvent)
-     })
-+<<<<<<< .our
-+=======
-+
-+    ipcRenderer.on(`ELECTRON_GUEST_VIEW_INTERNAL_SIZE_CHANGED-${viewInstanceId}`, function (event, ...args) {
-+      const domEvent = new Event('size-changed')
-+      const props = ['oldWidth', 'oldHeight', 'newWidth', 'newHeight']
-+      for (let i = 0; i < props.length; i++) {
-+        const prop = props[i]
-+        domEvent[prop] = args[i]
-+      }
-+      webView.onSizeChanged(domEvent)
-+    })
-+>>>>>>> .their
-   },
-   deregisterEvents: function (viewInstanceId) {
-     ipcRenderer.removeAllListeners(`ELECTRON_GUEST_VIEW_INTERNAL_DESTROY_GUEST-${viewInstanceId}`)
-     ipcRenderer.removeAllListeners(`ELECTRON_GUEST_VIEW_INTERNAL_DISPATCH_EVENT-${viewInstanceId}`)
-     ipcRenderer.removeAllListeners(`ELECTRON_GUEST_VIEW_INTERNAL_IPC_MESSAGE-${viewInstanceId}`)
-+<<<<<<< .our
-+=======
-+    ipcRenderer.removeAllListeners(`ELECTRON_GUEST_VIEW_INTERNAL_SIZE_CHANGED-${viewInstanceId}`)
-+>>>>>>> .their
-   },
-   createGuest: function (params, callback) {
-     requestId++
-     ipcRenderer.send('ELECTRON_GUEST_VIEW_MANAGER_CREATE_GUEST', params, requestId)
-     ipcRenderer.once(`ELECTRON_RESPONSE_${requestId}`, callback)
-   },
-+<<<<<<< .our
-   createGuestSync: function (params) {
-     return ipcRenderer.sendSync('ELECTRON_GUEST_VIEW_MANAGER_CREATE_GUEST_SYNC', params)
-   },
-@@ -97,5 +119,16 @@
-       throw new Error('Invalid embedder frame')
-     }
-     ipcRenderer.send('ELECTRON_GUEST_VIEW_MANAGER_ATTACH_GUEST', embedderFrameId, elementInstanceId, guestInstanceId, params)
-+=======
-+  attachGuest: function (elementInstanceId, guestInstanceId, params) {
-+    ipcRenderer.send('ELECTRON_GUEST_VIEW_MANAGER_ATTACH_GUEST', elementInstanceId, guestInstanceId, params)
-+    webFrame.attachGuest(elementInstanceId)
-+  },
-+  destroyGuest: function (guestInstanceId) {
-+    ipcRenderer.send('ELECTRON_GUEST_VIEW_MANAGER_DESTROY_GUEST', guestInstanceId)
-+  },
-+  setSize: function (guestInstanceId, params) {
-+    ipcRenderer.send('ELECTRON_GUEST_VIEW_MANAGER_SET_SIZE', guestInstanceId, params)
-+>>>>>>> .their
-   }
- }
-added in both
-  our    100644 ad9970bd0b9355ac8163c82f6fa7f3ca08a05de6 lib/renderer/web-view/web-view-attributes.js
-  their  100644 16bfe7e61ac6e2c516f4523f2854a4f1db169c70 lib/renderer/web-view/web-view-attributes.js
-@@ -1,6 +1,10 @@
- 'use strict'
- 
- const WebViewImpl = require('./web-view')
-+<<<<<<< .our
-+=======
-+const guestViewInternal = require('./guest-view-internal')
-+>>>>>>> .their
- const webViewConstants = require('./web-view-constants')
- const {remote} = require('electron')
- 
-@@ -73,6 +77,42 @@
-   }
- }
- 
-+<<<<<<< .our
-+=======
-+// Attribute used to define the demension limits of autosizing.
-+class AutosizeDimensionAttribute extends WebViewAttribute {
-+  getValue () {
-+    return parseInt(this.webViewImpl.webviewNode.getAttribute(this.name)) || 0
-+  }
-+
-+  handleMutation () {
-+    if (!this.webViewImpl.guestInstanceId) {
-+      return
-+    }
-+    guestViewInternal.setSize(this.webViewImpl.guestInstanceId, {
-+      enableAutoSize: this.webViewImpl.attributes[webViewConstants.ATTRIBUTE_AUTOSIZE].getValue(),
-+      min: {
-+        width: parseInt(this.webViewImpl.attributes[webViewConstants.ATTRIBUTE_MINWIDTH].getValue() || 0),
-+        height: parseInt(this.webViewImpl.attributes[webViewConstants.ATTRIBUTE_MINHEIGHT].getValue() || 0)
-+      },
-+      max: {
-+        width: parseInt(this.webViewImpl.attributes[webViewConstants.ATTRIBUTE_MAXWIDTH].getValue() || 0),
-+        height: parseInt(this.webViewImpl.attributes[webViewConstants.ATTRIBUTE_MAXHEIGHT].getValue() || 0)
-+      }
-+    })
-+  }
-+}
-+
-+// Attribute that specifies whether the webview should be autosized.
-+class AutosizeAttribute extends BooleanAttribute {
-+  constructor (webViewImpl) {
-+    super(webViewConstants.ATTRIBUTE_AUTOSIZE, webViewImpl)
-+  }
-+}
-+
-+AutosizeAttribute.prototype.handleMutation = AutosizeDimensionAttribute.prototype.handleMutation
-+
-+>>>>>>> .their
- // Attribute representing the state of the storage partition.
- class PartitionAttribute extends WebViewAttribute {
-   constructor (webViewImpl) {
-@@ -96,6 +136,46 @@
-   }
- }
- 
-+<<<<<<< .our
-+=======
-+// An attribute that controls the guest instance this webview is connected to
-+class GuestInstanceAttribute extends WebViewAttribute {
-+  constructor (webViewImpl) {
-+    super(webViewConstants.ATTRIBUTE_GUESTINSTANCE, webViewImpl)
-+  }
-+
-+  // Retrieves and returns the attribute's value.
-+  getValue () {
-+    if (this.webViewImpl.webviewNode.hasAttribute(this.name)) {
-+      return parseInt(this.webViewImpl.webviewNode.getAttribute(this.name))
-+    }
-+  }
-+
-+  // Sets the attribute's value.
-+  setValue (value) {
-+    if (!value) {
-+      this.webViewImpl.webviewNode.removeAttribute(this.name)
-+    } else if (!isNaN(value)) {
-+      this.webViewImpl.webviewNode.setAttribute(this.name, value)
-+    }
-+  }
-+
-+  handleMutation (oldValue, newValue) {
-+    if (!newValue) {
-+      this.webViewImpl.reset()
-+      return
-+    }
-+
-+    const intVal = parseInt(newValue)
-+    if (!isNaN(newValue) && remote.getGuestWebContents(intVal)) {
-+      this.webViewImpl.attachGuestInstance(intVal)
-+    } else {
-+      this.setValueIgnoreMutation(oldValue)
-+    }
-+  }
-+}
-+
-+>>>>>>> .their
- // Attribute that handles the location and navigation of the webview.
- class SrcAttribute extends WebViewAttribute {
-   constructor (webViewImpl) {
-@@ -159,7 +239,11 @@
-   }
- 
-   parse () {
-+<<<<<<< .our
-     if (!this.webViewImpl.elementAttached || !this.webViewImpl.attributes[webViewConstants.ATTRIBUTE_PARTITION].validPartitionId || !this.getValue()) {
-+=======
-+    if (!this.webViewImpl.elementAttached || !this.webViewImpl.attributes[webViewConstants.ATTRIBUTE_PARTITION].validPartitionId) {
-+>>>>>>> .their
-       return
-     }
-     if (this.webViewImpl.guestInstanceId == null) {
-@@ -169,6 +253,12 @@
-       }
-       return
-     }
-+<<<<<<< .our
-+=======
-+    if (!this.getValue()) {
-+      return
-+    }
-+>>>>>>> .their
- 
-     // Navigate to |this.src|.
-     const opts = {}
-@@ -243,6 +333,10 @@
- // Sets up all of the webview attributes.
- WebViewImpl.prototype.setupWebViewAttributes = function () {
-   this.attributes = {}
-+<<<<<<< .our
-+=======
-+  this.attributes[webViewConstants.ATTRIBUTE_AUTOSIZE] = new AutosizeAttribute(this)
-+>>>>>>> .their
-   this.attributes[webViewConstants.ATTRIBUTE_PARTITION] = new PartitionAttribute(this)
-   this.attributes[webViewConstants.ATTRIBUTE_SRC] = new SrcAttribute(this)
-   this.attributes[webViewConstants.ATTRIBUTE_HTTPREFERRER] = new HttpReferrerAttribute(this)
-@@ -254,5 +348,16 @@
-   this.attributes[webViewConstants.ATTRIBUTE_PRELOAD] = new PreloadAttribute(this)
-   this.attributes[webViewConstants.ATTRIBUTE_BLINKFEATURES] = new BlinkFeaturesAttribute(this)
-   this.attributes[webViewConstants.ATTRIBUTE_DISABLEBLINKFEATURES] = new DisableBlinkFeaturesAttribute(this)
-+<<<<<<< .our
-   this.attributes[webViewConstants.ATTRIBUTE_WEBPREFERENCES] = new WebPreferencesAttribute(this)
-+=======
-+  this.attributes[webViewConstants.ATTRIBUTE_GUESTINSTANCE] = new GuestInstanceAttribute(this)
-+  this.attributes[webViewConstants.ATTRIBUTE_DISABLEGUESTRESIZE] = new BooleanAttribute(webViewConstants.ATTRIBUTE_DISABLEGUESTRESIZE, this)
-+  this.attributes[webViewConstants.ATTRIBUTE_WEBPREFERENCES] = new WebPreferencesAttribute(this)
-+
-+  const autosizeAttributes = [webViewConstants.ATTRIBUTE_MAXHEIGHT, webViewConstants.ATTRIBUTE_MAXWIDTH, webViewConstants.ATTRIBUTE_MINHEIGHT, webViewConstants.ATTRIBUTE_MINWIDTH]
-+  autosizeAttributes.forEach((attribute) => {
-+    this.attributes[attribute] = new AutosizeDimensionAttribute(attribute, this)
-+  })
-+>>>>>>> .their
- }
-added in both
-  our    100644 327114be508dcbee0f516e2340e3904475ece859 lib/renderer/web-view/web-view-constants.js
-  their  100644 bf2601822d3319f1e30bb90b6dc7542cdba35ab6 lib/renderer/web-view/web-view-constants.js
-@@ -1,5 +1,13 @@
- module.exports = {
-   // Attributes.
-+<<<<<<< .our
-+=======
-+  ATTRIBUTE_AUTOSIZE: 'autosize',
-+  ATTRIBUTE_MAXHEIGHT: 'maxheight',
-+  ATTRIBUTE_MAXWIDTH: 'maxwidth',
-+  ATTRIBUTE_MINHEIGHT: 'minheight',
-+  ATTRIBUTE_MINWIDTH: 'minwidth',
-+>>>>>>> .their
-   ATTRIBUTE_NAME: 'name',
-   ATTRIBUTE_PARTITION: 'partition',
-   ATTRIBUTE_SRC: 'src',
-@@ -12,6 +20,11 @@
-   ATTRIBUTE_USERAGENT: 'useragent',
-   ATTRIBUTE_BLINKFEATURES: 'blinkfeatures',
-   ATTRIBUTE_DISABLEBLINKFEATURES: 'disableblinkfeatures',
-+<<<<<<< .our
-+=======
-+  ATTRIBUTE_GUESTINSTANCE: 'guestinstance',
-+  ATTRIBUTE_DISABLEGUESTRESIZE: 'disableguestresize',
-+>>>>>>> .their
-   ATTRIBUTE_WEBPREFERENCES: 'webpreferences',
- 
-   // Internal attribute.
-added in both
-  our    100644 574a2b545597f9d1c05ec9b7147585063e90ae89 lib/renderer/web-view/web-view.js
-  their  100644 590991177595eeedb73674ae9b38b866ecd7455c lib/renderer/web-view/web-view.js
-@@ -6,8 +6,15 @@
- const guestViewInternal = require('./guest-view-internal')
- const webViewConstants = require('./web-view-constants')
- 
-+<<<<<<< .our
- // An unique ID that can represent current context.
- const contextId = v8Util.getHiddenValue(global, 'contextId')
-+=======
-+const hasProp = {}.hasOwnProperty
-+
-+// An unique ID that can represent current context.
-+const contextId = v8Util.getContextId()
-+>>>>>>> .their
- 
- // ID generator.
- let nextId = 0
-@@ -16,6 +23,7 @@
-   return ++nextId
- }
- 
-+<<<<<<< .our
- // A list of removed attributes from 3.0.
- const removedAttributes = [
-   'autoresize',
-@@ -23,11 +31,14 @@
-   'guestinstance'
- ]
- 
-+=======
-+>>>>>>> .their
- // Represents the internal state of the WebView node.
- class WebViewImpl {
-   constructor (webviewNode) {
-     this.webviewNode = webviewNode
-     v8Util.setHiddenValue(this.webviewNode, 'internal', this)
-+<<<<<<< .our
-     this.elementAttached = false
-     this.beforeFirstNavigation = true
- 
-@@ -42,11 +53,21 @@
-     this.on = {}
- 
-     this.internalElement = this.createInternalElement()
-+=======
-+    this.attached = false
-+    this.elementAttached = false
-+    this.beforeFirstNavigation = true
-+
-+    // on* Event handlers.
-+    this.on = {}
-+    this.browserPluginNode = this.createBrowserPluginNode()
-+>>>>>>> .their
-     const shadowRoot = this.webviewNode.attachShadow({mode: 'open'})
-     shadowRoot.innerHTML = '<!DOCTYPE html><style type="text/css">:host { display: flex; }</style>'
-     this.setupWebViewAttributes()
-     this.setupFocusPropagation()
-     this.viewInstanceId = getNextId()
-+<<<<<<< .our
-     shadowRoot.appendChild(this.internalElement)
-   }
- 
-@@ -57,6 +78,17 @@
-     iframeElement.style.border = '0'
-     v8Util.setHiddenValue(iframeElement, 'internal', this)
-     return iframeElement
-+=======
-+    shadowRoot.appendChild(this.browserPluginNode)
-+  }
-+
-+  createBrowserPluginNode () {
-+    // We create BrowserPlugin as a custom element in order to observe changes
-+    // to attributes synchronously.
-+    const browserPluginNode = new WebViewImpl.BrowserPlugin()
-+    v8Util.setHiddenValue(browserPluginNode, 'internal', this)
-+    return browserPluginNode
-+>>>>>>> .their
-   }
- 
-   // Resets some state upon reattaching <webview> element to the DOM.
-@@ -68,6 +100,10 @@
-     // heard back from createGuest yet. We will not reset the flag in this case so
-     // that we don't end up allocating a second guest.
-     if (this.guestInstanceId) {
-+<<<<<<< .our
-+=======
-+      guestViewInternal.destroyGuest(this.guestInstanceId)
-+>>>>>>> .their
-       this.guestInstanceId = void 0
-     }
- 
-@@ -75,12 +111,18 @@
-     this.beforeFirstNavigation = true
-     this.attributes[webViewConstants.ATTRIBUTE_PARTITION].validPartitionId = true
- 
-+<<<<<<< .our
-     // Since attachment swaps a local frame for a remote frame, we need our
-     // internal iframe element to be local again before we can reattach.
-     const newFrame = this.createInternalElement()
-     const oldFrame = this.internalElement
-     this.internalElement = newFrame
-     oldFrame.parentNode.replaceChild(newFrame, oldFrame)
-+=======
-+    // Set guestinstance last since this can trigger the attachedCallback to fire
-+    // when moving the webview using element.replaceChild
-+    this.attributes[webViewConstants.ATTRIBUTE_GUESTINSTANCE].setValueIgnoreMutation(undefined)
-+>>>>>>> .their
-   }
- 
-   // Sets the <webview>.request property.
-@@ -102,12 +144,20 @@
- 
-     // Focus the BrowserPlugin when the <webview> takes focus.
-     this.webviewNode.addEventListener('focus', () => {
-+<<<<<<< .our
-       this.internalElement.focus()
-+=======
-+      this.browserPluginNode.focus()
-+>>>>>>> .their
-     })
- 
-     // Blur the BrowserPlugin when the <webview> loses focus.
-     this.webviewNode.addEventListener('blur', () => {
-+<<<<<<< .our
-       this.internalElement.blur()
-+=======
-+      this.browserPluginNode.blur()
-+>>>>>>> .their
-     })
-   }
- 
-@@ -117,11 +167,14 @@
-   // attribute, if necessary. See BrowserPlugin::UpdateDOMAttribute for more
-   // details.
-   handleWebviewAttributeMutation (attributeName, oldValue, newValue) {
-+<<<<<<< .our
-     if (removedAttributes.includes(attributeName)) {
-       this.reportRemovedAttribute(attributeName)
-       return
-     }
- 
-+=======
-+>>>>>>> .their
-     if (!this.attributes[attributeName] || this.attributes[attributeName].ignoreMutation) {
-       return
-     }
-@@ -130,11 +183,70 @@
-     this.attributes[attributeName].handleMutation(oldValue, newValue)
-   }
- 
-+<<<<<<< .our
-   onElementResize () {
-     const resizeEvent = new Event('resize')
-     resizeEvent.newWidth = this.webviewNode.clientWidth
-     resizeEvent.newHeight = this.webviewNode.clientHeight
-     this.dispatchEvent(resizeEvent)
-+=======
-+  handleBrowserPluginAttributeMutation (attributeName, oldValue, newValue) {
-+    if (attributeName === webViewConstants.ATTRIBUTE_INTERNALINSTANCEID && !oldValue && !!newValue) {
-+      this.browserPluginNode.removeAttribute(webViewConstants.ATTRIBUTE_INTERNALINSTANCEID)
-+      this.internalInstanceId = parseInt(newValue)
-+
-+      // Track when the element resizes using the element resize callback.
-+      webFrame.registerElementResizeCallback(this.internalInstanceId, this.onElementResize.bind(this))
-+      if (this.guestInstanceId) {
-+        guestViewInternal.attachGuest(this.internalInstanceId, this.guestInstanceId, this.buildParams())
-+      }
-+    }
-+  }
-+
-+  onSizeChanged (webViewEvent) {
-+    const {newHeight, newWidth} = webViewEvent
-+    const node = this.webviewNode
-+    const width = node.offsetWidth
-+
-+    // Check the current bounds to make sure we do not resize <webview>
-+    // outside of current constraints.
-+    const maxWidth = this.attributes[webViewConstants.ATTRIBUTE_MAXWIDTH].getValue() | width
-+    const maxHeight = this.attributes[webViewConstants.ATTRIBUTE_MAXHEIGHT].getValue() | width
-+    let minWidth = this.attributes[webViewConstants.ATTRIBUTE_MINWIDTH].getValue() | width
-+    let minHeight = this.attributes[webViewConstants.ATTRIBUTE_MINHEIGHT].getValue() | width
-+    minWidth = Math.min(minWidth, maxWidth)
-+    minHeight = Math.min(minHeight, maxHeight)
-+    if (!this.attributes[webViewConstants.ATTRIBUTE_AUTOSIZE].getValue() || (newWidth >= minWidth && newWidth <= maxWidth && newHeight >= minHeight && newHeight <= maxHeight)) {
-+      node.style.width = `${newWidth}px`
-+      node.style.height = `${newHeight}px`
-+
-+      // Only fire the DOM event if the size of the <webview> has actually
-+      // changed.
-+      this.dispatchEvent(webViewEvent)
-+    }
-+  }
-+
-+  onElementResize (newSize) {
-+    // Dispatch the 'resize' event.
-+    const resizeEvent = new Event('resize', {
-+      bubbles: true
-+    })
-+
-+    // Using client size values, because when a webview is transformed `newSize`
-+    // is incorrect
-+    newSize.width = this.webviewNode.clientWidth
-+    newSize.height = this.webviewNode.clientHeight
-+
-+    resizeEvent.newWidth = newSize.width
-+    resizeEvent.newHeight = newSize.height
-+    this.dispatchEvent(resizeEvent)
-+    if (this.guestInstanceId &&
-+        !this.attributes[webViewConstants.ATTRIBUTE_DISABLEGUESTRESIZE].getValue()) {
-+      guestViewInternal.setSize(this.guestInstanceId, {
-+        normal: newSize
-+      })
-+    }
-+>>>>>>> .their
-   }
- 
-   createGuest () {
-@@ -143,11 +255,14 @@
-     })
-   }
- 
-+<<<<<<< .our
-   createGuestSync () {
-     this.beforeFirstNavigation = false
-     this.attachGuestInstance(guestViewInternal.createGuestSync(this.buildParams()))
-   }
- 
-+=======
-+>>>>>>> .their
-   dispatchEvent (webViewEvent) {
-     this.webviewNode.dispatchEvent(webViewEvent)
-   }
-@@ -195,14 +310,32 @@
-       userAgentOverride: this.userAgentOverride
-     }
-     for (const attributeName in this.attributes) {
-+<<<<<<< .our
-       if (this.attributes.hasOwnProperty(attributeName)) {
-         params[attributeName] = this.attributes[attributeName].getValue()
-       }
-     }
-+=======
-+      if (hasProp.call(this.attributes, attributeName)) {
-+        params[attributeName] = this.attributes[attributeName].getValue()
-+      }
-+    }
-+
-+    // When the WebView is not participating in layout (display:none)
-+    // then getBoundingClientRect() would report a width and height of 0.
-+    // However, in the case where the WebView has a fixed size we can
-+    // use that value to initially size the guest so as to avoid a relayout of
-+    // the on display:block.
-+    const css = window.getComputedStyle(this.webviewNode, null)
-+    const elementRect = this.webviewNode.getBoundingClientRect()
-+    params.elementWidth = parseInt(elementRect.width) || parseInt(css.getPropertyValue('width'))
-+    params.elementHeight = parseInt(elementRect.height) || parseInt(css.getPropertyValue('height'))
-+>>>>>>> .their
-     return params
-   }
- 
-   attachGuestInstance (guestInstanceId) {
-+<<<<<<< .our
-     if (!this.elementAttached) {
-       // The element could be detached before we got response from browser.
-       return
-@@ -223,6 +356,46 @@
-     console.error(`The "${attributeName}" attribute has been removed from the <webview> tag,`,
-                   'see https://github.com/electron/electron/issues/14120 for more.')
-   }
-+=======
-+    this.guestInstanceId = guestInstanceId
-+    this.attributes[webViewConstants.ATTRIBUTE_GUESTINSTANCE].setValueIgnoreMutation(guestInstanceId)
-+    this.webContents = remote.getGuestWebContents(this.guestInstanceId)
-+    if (!this.internalInstanceId) {
-+      return true
-+    }
-+    return guestViewInternal.attachGuest(this.internalInstanceId, this.guestInstanceId, this.buildParams())
-+  }
-+}
-+
-+// Registers browser plugin <object> custom element.
-+const registerBrowserPluginElement = function () {
-+  const proto = Object.create(HTMLObjectElement.prototype)
-+  proto.createdCallback = function () {
-+    this.setAttribute('type', 'application/browser-plugin')
-+    this.setAttribute('id', `browser-plugin-${getNextId()}`)
-+
-+    // The <object> node fills in the <webview> container.
-+    this.style.flex = '1 1 auto'
-+  }
-+  proto.attributeChangedCallback = function (name, oldValue, newValue) {
-+    const internal = v8Util.getHiddenValue(this, 'internal')
-+    if (internal) {
-+      internal.handleBrowserPluginAttributeMutation(name, oldValue, newValue)
-+    }
-+  }
-+  proto.attachedCallback = function () {
-+    // Load the plugin immediately.
-+    return this.nonExistentAttribute
-+  }
-+  WebViewImpl.BrowserPlugin = webFrame.registerEmbedderCustomElement('browserplugin', {
-+    'extends': 'object',
-+    prototype: proto
-+  })
-+  delete proto.createdCallback
-+  delete proto.attachedCallback
-+  delete proto.detachedCallback
-+  delete proto.attributeChangedCallback
-+>>>>>>> .their
- }
- 
- // Registers <webview> custom element.
-@@ -255,7 +428,16 @@
-     if (!internal.elementAttached) {
-       guestViewInternal.registerEvents(internal, internal.viewInstanceId)
-       internal.elementAttached = true
-+<<<<<<< .our
-       internal.attributes[webViewConstants.ATTRIBUTE_SRC].parse()
-+=======
-+      const instance = internal.attributes[webViewConstants.ATTRIBUTE_GUESTINSTANCE].getValue()
-+      if (instance) {
-+        internal.attachGuestInstance(instance)
-+      } else {
-+        internal.attributes[webViewConstants.ATTRIBUTE_SRC].parse()
-+      }
-+>>>>>>> .their
-     }
-   }
- 
-@@ -288,7 +470,10 @@
-     'inspectElement',
-     'setAudioMuted',
-     'isAudioMuted',
-+<<<<<<< .our
-     'isCurrentlyAudible',
-+=======
-+>>>>>>> .their
-     'undo',
-     'redo',
-     'cut',
-@@ -302,6 +487,10 @@
-     'replaceMisspelling',
-     'findInPage',
-     'stopFindInPage',
-+<<<<<<< .our
-+=======
-+    'getId',
-+>>>>>>> .their
-     'downloadURL',
-     'inspectServiceWorker',
-     'print',
-@@ -362,11 +551,15 @@
- 
-   // WebContents associated with this webview.
-   proto.getWebContents = function () {
-+<<<<<<< .our
-     const internal = v8Util.getHiddenValue(this, 'internal')
-     if (!internal.webContents) {
-       internal.createGuestSync()
-     }
-     return internal.webContents
-+=======
-+    return v8Util.getHiddenValue(this, 'internal').webContents
-+>>>>>>> .their
-   }
- 
-   window.WebView = webFrame.registerEmbedderCustomElement('webview', {
-@@ -387,6 +580,10 @@
-   if (document.readyState === 'loading') {
-     return
-   }
-+<<<<<<< .our
-+=======
-+  registerBrowserPluginElement()
-+>>>>>>> .their
-   registerWebViewElement()
-   window.removeEventListener(event.type, listener, useCapture)
- }
-added in both
-  our    100644 30a3fa55216f6bf7588c3accc07b150a31163b7c lib/sandboxed_renderer/init.js
-  their  100644 d4d63cf2fca5fc2e1f75f9b731ffc7e4649141a6 lib/sandboxed_renderer/init.js
-@@ -1,5 +1,9 @@
- /* eslint no-eval: "off" */
-+<<<<<<< .our
- /* global binding, Buffer */
-+=======
-+/* global binding, preloadPath, Buffer */
-+>>>>>>> .their
- const events = require('events')
- const electron = require('electron')
- 
-@@ -36,8 +40,19 @@
- ])
- 
- const {
-+<<<<<<< .our
-   preloadSrc, preloadError, process: processProps
- } = electron.ipcRenderer.sendSync('ELECTRON_BROWSER_SANDBOX_LOAD')
-+=======
-+  preloadSrc, preloadError, webContentsId, platform, execPath, env
-+} = electron.ipcRenderer.sendSync('ELECTRON_BROWSER_SANDBOX_LOAD', preloadPath)
-+
-+Object.defineProperty(process, 'webContentsId', {
-+  configurable: false,
-+  writable: false,
-+  value: webContentsId
-+})
-+>>>>>>> .their
- 
- require('../renderer/web-frame-init')()
- 
-@@ -49,6 +64,7 @@
- preloadProcess.getHeapStatistics = () => binding.getHeapStatistics()
- preloadProcess.getProcessMemoryInfo = () => binding.getProcessMemoryInfo()
- preloadProcess.getSystemMemoryInfo = () => binding.getSystemMemoryInfo()
-+<<<<<<< .our
- preloadProcess.getCPUUsage = () => binding.getCPUUsage()
- preloadProcess.getIOCounters = () => binding.getIOCounters()
- preloadProcess.argv = process.argv = binding.getArgv()
-@@ -59,6 +75,12 @@
- preloadProcess.type = 'renderer'
- Object.assign(preloadProcess, processProps)
- Object.assign(process, processProps)
-+=======
-+preloadProcess.argv = binding.getArgv()
-+preloadProcess.platform = process.platform = platform
-+preloadProcess.execPath = process.execPath = execPath
-+preloadProcess.env = process.env = env
-+>>>>>>> .their
- 
- process.on('exit', () => preloadProcess.emit('exit'))
- 
-@@ -112,8 +134,15 @@
-   ${preloadSrc}
-   })`
- 
-+<<<<<<< .our
-   // eval in window scope
-   const preloadFn = binding.createPreloadScript(preloadWrapperSrc)
-+=======
-+  // eval in window scope:
-+  // http://www.ecma-international.org/ecma-262/5.1/#sec-10.4.2
-+  const geval = eval
-+  const preloadFn = geval(preloadWrapperSrc)
-+>>>>>>> .their
-   const {setImmediate, clearImmediate} = require('timers')
-   preloadFn(preloadRequire, preloadProcess, Buffer, global, setImmediate, clearImmediate)
- } else if (preloadError) {
-added in both
-  our    100644 bac533f6786ffad78ef1e711bc4a94d5b51cd36d native_mate/native_mate/dictionary.cc
-  their  100644 3caff114597440fecf0494c8565b4524602f2694 native_mate/native_mate/dictionary.cc
-@@ -6,6 +6,7 @@
- 
- namespace mate {
- 
-+<<<<<<< .our
- Dictionary::Dictionary() : isolate_(NULL) {}
- 
- Dictionary::Dictionary(v8::Isolate* isolate, v8::Local<v8::Object> object)
-@@ -14,6 +15,20 @@
- Dictionary::Dictionary(const Dictionary& other) = default;
- 
- Dictionary::~Dictionary() = default;
-+=======
-+Dictionary::Dictionary()
-+    : isolate_(NULL) {
-+}
-+
-+Dictionary::Dictionary(v8::Isolate* isolate,
-+                       v8::Local<v8::Object> object)
-+    : isolate_(isolate),
-+      object_(object) {
-+}
-+
-+Dictionary::~Dictionary() {
-+}
-+>>>>>>> .their
- 
- Dictionary Dictionary::CreateEmpty(v8::Isolate* isolate) {
-   return Dictionary(isolate, v8::Object::New(isolate));
-@@ -24,7 +39,11 @@
- }
- 
- v8::Local<v8::Value> Converter<Dictionary>::ToV8(v8::Isolate* isolate,
-+<<<<<<< .our
-                                                  Dictionary val) {
-+=======
-+                                                  Dictionary val) {
-+>>>>>>> .their
-   return val.GetHandle();
- }
- 
-added in both
-  our    100644 63a1350597604f9a0ab3233f7f6f24b0d3a81c22 native_mate/native_mate/dictionary.h
-  their  100644 9e80cb99acfdbedbeacc6a98d2398f9a2c17713f native_mate/native_mate/dictionary.h
-@@ -35,12 +35,19 @@
-  public:
-   Dictionary();
-   Dictionary(v8::Isolate* isolate, v8::Local<v8::Object> object);
-+<<<<<<< .our
-   Dictionary(const Dictionary& other);
-+=======
-+>>>>>>> .their
-   virtual ~Dictionary();
- 
-   static Dictionary CreateEmpty(v8::Isolate* isolate);
- 
-+<<<<<<< .our
-   template <typename T>
-+=======
-+  template<typename T>
-+>>>>>>> .their
-   bool Get(const base::StringPiece& key, T* out) const {
-     // Check for existence before getting, otherwise this method will always
-     // returns true when T == v8::Local<v8::Value>.
-@@ -55,30 +62,54 @@
-     return ConvertFromV8(isolate_, val, out);
-   }
- 
-+<<<<<<< .our
-   template <typename T>
-+=======
-+  template<typename T>
-+>>>>>>> .their
-   bool GetHidden(const base::StringPiece& key, T* out) const {
-     v8::Local<v8::Context> context = isolate_->GetCurrentContext();
-     v8::Local<v8::Private> privateKey =
-         v8::Private::ForApi(isolate_, StringToV8(isolate_, key));
-     v8::Local<v8::Value> value;
-+<<<<<<< .our
-     v8::Maybe<bool> result = GetHandle()->HasPrivate(context, privateKey);
-+=======
-+    v8::Maybe<bool> result =
-+        GetHandle()->HasPrivate(context, privateKey);
-+>>>>>>> .their
-     if (internal::IsTrue(result) &&
-         GetHandle()->GetPrivate(context, privateKey).ToLocal(&value))
-       return ConvertFromV8(isolate_, value, out);
-     return false;
-   }
- 
-+<<<<<<< .our
-   template <typename T>
-+=======
-+  template<typename T>
-+>>>>>>> .their
-   bool Set(const base::StringPiece& key, const T& val) {
-     v8::Local<v8::Value> v8_value;
-     if (!TryConvertToV8(isolate_, val, &v8_value))
-       return false;
-+<<<<<<< .our
-     v8::Maybe<bool> result = GetHandle()->Set(
-         isolate_->GetCurrentContext(), StringToV8(isolate_, key), v8_value);
-     return !result.IsNothing() && result.FromJust();
-   }
- 
-   template <typename T>
-+=======
-+    v8::Maybe<bool> result =
-+        GetHandle()->Set(isolate_->GetCurrentContext(),
-+                         StringToV8(isolate_, key),
-+                         v8_value);
-+    return !result.IsNothing() && result.FromJust();
-+  }
-+
-+  template<typename T>
-+>>>>>>> .their
-   bool SetHidden(const base::StringPiece& key, T val) {
-     v8::Local<v8::Value> v8_value;
-     if (!TryConvertToV8(isolate_, val, &v8_value))
-@@ -91,11 +122,16 @@
-     return !result.IsNothing() && result.FromJust();
-   }
- 
-+<<<<<<< .our
-   template <typename T>
-+=======
-+  template<typename T>
-+>>>>>>> .their
-   bool SetReadOnly(const base::StringPiece& key, T val) {
-     v8::Local<v8::Value> v8_value;
-     if (!TryConvertToV8(isolate_, val, &v8_value))
-       return false;
-+<<<<<<< .our
-     v8::Maybe<bool> result = GetHandle()->DefineOwnProperty(
-         isolate_->GetCurrentContext(), StringToV8(isolate_, key), v8_value,
-         v8::ReadOnly);
-@@ -103,6 +139,17 @@
-   }
- 
-   template <typename T>
-+=======
-+    v8::Maybe<bool> result =
-+        GetHandle()->DefineOwnProperty(isolate_->GetCurrentContext(),
-+                                       StringToV8(isolate_, key),
-+                                       v8_value,
-+                                       v8::ReadOnly);
-+    return !result.IsNothing() && result.FromJust();
-+  }
-+
-+  template<typename T>
-+>>>>>>> .their
-   bool SetMethod(const base::StringPiece& key, const T& callback) {
-     return GetHandle()->Set(
-         StringToV8(isolate_, key),
-@@ -128,9 +175,16 @@
-   v8::Local<v8::Object> object_;
- };
- 
-+<<<<<<< .our
- template <>
- struct Converter<Dictionary> {
-   static v8::Local<v8::Value> ToV8(v8::Isolate* isolate, Dictionary val);
-+=======
-+template<>
-+struct Converter<Dictionary> {
-+  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-+                                    Dictionary val);
-+>>>>>>> .their
-   static bool FromV8(v8::Isolate* isolate,
-                      v8::Local<v8::Value> val,
-                      Dictionary* out);
-added in both
-  our    100644 6a5e5a0253f4f465747fd0a4d96aad2336784d9c native_mate/native_mate/persistent_dictionary.cc
-  their  100644 fd68cdced275ed4848a9b866caea02b50fff8613 native_mate/native_mate/persistent_dictionary.cc
-@@ -6,7 +6,12 @@
- 
- namespace mate {
- 
-+<<<<<<< .our
- PersistentDictionary::PersistentDictionary() {}
-+=======
-+PersistentDictionary::PersistentDictionary() {
-+}
-+>>>>>>> .their
- 
- PersistentDictionary::PersistentDictionary(v8::Isolate* isolate,
-                                            v8::Local<v8::Object> object)
-@@ -14,10 +19,15 @@
-   isolate_ = isolate;
- }
- 
-+<<<<<<< .our
- PersistentDictionary::PersistentDictionary(const PersistentDictionary& other) =
-     default;
- 
- PersistentDictionary::~PersistentDictionary() {}
-+=======
-+PersistentDictionary::~PersistentDictionary() {
-+}
-+>>>>>>> .their
- 
- v8::Local<v8::Object> PersistentDictionary::GetHandle() const {
-   return handle_->NewHandle();
-added in both
-  our    100644 7a83916f1505d53a8694c9d438485177d6cb539e native_mate/native_mate/persistent_dictionary.h
-  their  100644 26c8998632bd80876f5448a86a8f57b25e73801e native_mate/native_mate/persistent_dictionary.h
-@@ -16,16 +16,27 @@
-  public:
-   PersistentDictionary();
-   PersistentDictionary(v8::Isolate* isolate, v8::Local<v8::Object> object);
-+<<<<<<< .our
-   PersistentDictionary(const PersistentDictionary& other);
-   ~PersistentDictionary() override;
-+=======
-+  virtual ~PersistentDictionary();
-+>>>>>>> .their
- 
-   v8::Local<v8::Object> GetHandle() const override;
- 
-  private:
-+<<<<<<< .our
-   scoped_refptr<RefCountedPersistent<v8::Object>> handle_;
- };
- 
- template <>
-+=======
-+  scoped_refptr<RefCountedPersistent<v8::Object> > handle_;
-+};
-+
-+template<>
-+>>>>>>> .their
- struct Converter<PersistentDictionary> {
-   static bool FromV8(v8::Isolate* isolate,
-                      v8::Local<v8::Value> val,
-added in both
-  our    100644 faba6f332e4ac31eb55f08e9a76ae216f0916311 native_mate/native_mate/wrappable.h
-  their  100644 489c5817481b8663ffc2500ec89bf8c1e72dea0e native_mate/native_mate/wrappable.h
-@@ -6,9 +6,15 @@
- #define NATIVE_MATE_WRAPPABLE_H_
- 
- #include "base/bind.h"
-+<<<<<<< .our
- #include "gin/per_isolate_data.h"
- #include "native_mate/constructor.h"
- #include "native_mate/converter.h"
-+=======
-+#include "native_mate/converter.h"
-+#include "native_mate/constructor.h"
-+#include "gin/per_isolate_data.h"
-+>>>>>>> .their
- 
- namespace mate {
- 
-@@ -18,25 +24,42 @@
- 
- }  // namespace internal
- 
-+<<<<<<< .our
- template <typename T>
-+=======
-+template<typename T>
-+>>>>>>> .their
- class Wrappable : public WrappableBase {
-  public:
-   Wrappable() {}
- 
-+<<<<<<< .our
-   template <typename Sig>
-+=======
-+  template<typename Sig>
-+>>>>>>> .their
-   static void SetConstructor(v8::Isolate* isolate,
-                              const base::Callback<Sig>& constructor) {
-     v8::Local<v8::FunctionTemplate> templ = CreateFunctionTemplate(
-         isolate, base::Bind(&internal::InvokeNew<Sig>, constructor));
-     templ->InstanceTemplate()->SetInternalFieldCount(1);
-     T::BuildPrototype(isolate, templ);
-+<<<<<<< .our
-     gin::PerIsolateData::From(isolate)->SetFunctionTemplate(&kWrapperInfo,
-                                                             templ);
-+=======
-+    gin::PerIsolateData::From(isolate)->SetFunctionTemplate(
-+        &kWrapperInfo, templ);
-+>>>>>>> .their
-   }
- 
-   static v8::Local<v8::FunctionTemplate> GetConstructor(v8::Isolate* isolate) {
-     // Fill the object template.
-+<<<<<<< .our
-     auto* data = gin::PerIsolateData::From(isolate);
-+=======
-+    auto data = gin::PerIsolateData::From(isolate);
-+>>>>>>> .their
-     auto templ = data->GetFunctionTemplate(&kWrapperInfo);
-     if (templ.IsEmpty()) {
-       templ = v8::FunctionTemplate::New(isolate);
-@@ -55,9 +78,14 @@
-     // |wrapper| may be empty in some extreme cases, e.g., when
-     // Object.prototype.constructor is overwritten.
-     v8::Local<v8::Object> wrapper;
-+<<<<<<< .our
-     if (!templ->InstanceTemplate()
-              ->NewInstance(isolate->GetCurrentContext())
-              .ToLocal(&wrapper)) {
-+=======
-+    if (!templ->InstanceTemplate()->NewInstance(
-+            isolate->GetCurrentContext()).ToLocal(&wrapper)) {
-+>>>>>>> .their
-       // The current wrappable object will be no longer managed by V8. Delete
-       // this now.
-       delete this;
-@@ -73,8 +101,13 @@
- };
- 
- // static
-+<<<<<<< .our
- template <typename T>
- gin::WrapperInfo Wrappable<T>::kWrapperInfo = {gin::kEmbedderNativeGin};
-+=======
-+template<typename T>
-+gin::WrapperInfo Wrappable<T>::kWrapperInfo = { gin::kEmbedderNativeGin };
-+>>>>>>> .their
- 
- // This converter handles any subclass of Wrappable.
- template <typename T>
-@@ -89,8 +122,13 @@
-   }
- 
-   static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val, T** out) {
-+<<<<<<< .our
-     *out = static_cast<T*>(
-         static_cast<WrappableBase*>(internal::FromV8Impl(isolate, val)));
-+=======
-+    *out = static_cast<T*>(static_cast<WrappableBase*>(
-+        internal::FromV8Impl(isolate, val)));
-+>>>>>>> .their
-     return *out != nullptr;
-   }
- };
-added in both
-  our    100755 48cdef8f1988b6d3d6ab27a7adc598108c2e987d npm/cli.js
-  their  100755 bfe2c11be311eff92a95b576d04d08db4a29f52b npm/cli.js
-@@ -8,6 +8,7 @@
- child.on('close', function (code) {
-   process.exit(code)
- })
-+<<<<<<< .our
- 
- const handleTerminationSignal = function (signal) {
-   process.on(signal, function signalHandler () {
-@@ -19,3 +20,5 @@
- 
- handleTerminationSignal('SIGINT')
- handleTerminationSignal('SIGTERM')
-+=======
-+>>>>>>> .their
-added in both
-  our    100755 ed208de247ef151147c58d9efc4af9519e983f86 npm/install.js
-  their  100755 41052ac07b6fbae10fd64e85097d471c0628063d npm/install.js
-@@ -17,9 +17,13 @@
- 
- var platformPath = getPlatformPath()
- 
-+<<<<<<< .our
- var electronPath = process.env.ELECTRON_OVERRIDE_DIST_PATH || path.join(__dirname, 'dist', platformPath)
- 
- if (installedVersion === version && fs.existsSync(electronPath)) {
-+=======
-+if (installedVersion === version && fs.existsSync(path.join(__dirname, platformPath))) {
-+>>>>>>> .their
-   process.exit(0)
- }
- 
-added in both
-  our    100644 b1d8824658ea05c277e82d1ac6c6febab9c55030 package-lock.json
-  their  100644 9ea2fedc3a74191515141ee895a778229e9c0fd6 package-lock.json
-@@ -1,13 +1,23 @@
- {
-   "name": "electron",
-+<<<<<<< .our
-   "version": "4.0.0-nightly.20180819",
-+=======
-+  "version": "0.0.0-dev",
-+>>>>>>> .their
-   "lockfileVersion": 1,
-   "requires": true,
-   "dependencies": {
-     "@types/node": {
-+<<<<<<< .our
-       "version": "7.0.69",
-       "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.69.tgz",
-       "integrity": "sha512-S5NC8HV6HnRipg8nC0j30TPl7ktXjRTKqgyINLNe8K/64UJUI8Lq0sRopXC0hProsV2F5ibj8IqPkl1xpGggrw==",
-+=======
-+      "version": "7.0.65",
-+      "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.65.tgz",
-+      "integrity": "sha512-iUdyWWikcQnGvIZnYh5ZxnxeREykndA9+iGdo068NGNutibWknDjmmNMq/8cnS1eaTCcgqJsPsFppw3XJWNlUg==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "JSONStream": {
-@@ -16,8 +26,13 @@
-       "integrity": "sha1-wQI3G27Dp887hHygDCC7D85Mbeo=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "jsonparse": "1.3.1",
-         "through": "2.3.8"
-+=======
-+        "jsonparse": "^1.2.0",
-+        "through": ">=2.2.7 <3"
-+>>>>>>> .their
-       }
-     },
-     "abab": {
-@@ -30,7 +45,11 @@
-     "abbrev": {
-       "version": "1.1.1",
-       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg=",
-+=======
-+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "accepts": {
-@@ -39,7 +58,11 @@
-       "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "mime-types": "2.1.18",
-+=======
-+        "mime-types": "~2.1.18",
-+>>>>>>> .their
-         "negotiator": "0.6.1"
-       }
-     },
-@@ -56,7 +79,11 @@
-       "dev": true,
-       "optional": true,
-       "requires": {
-+<<<<<<< .our
-         "acorn": "2.7.0"
-+=======
-+        "acorn": "^2.1.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "acorn": {
-@@ -74,7 +101,11 @@
-       "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "acorn": "3.3.0"
-+=======
-+        "acorn": "^3.0.4"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "acorn": {
-@@ -91,8 +122,13 @@
-       "integrity": "sha512-efP54n3d1aLfjL2UMdaXa6DsswwzJeI5rqhbFvXMrKiJ6eJFpf+7R0zN7t8IC+XKn2YOAFAv6xbBNgHUkoHWLw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "acorn": "5.5.3",
-         "xtend": "4.0.1"
-+=======
-+        "acorn": "^5.4.1",
-+        "xtend": "^4.0.1"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "acorn": {
-@@ -121,8 +157,13 @@
-       "integrity": "sha1-1t4Q1a9hMtW9aSQn1G/FOFOQlMc=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "extend": "3.0.1",
-         "semver": "5.0.3"
-+=======
-+        "extend": "~3.0.0",
-+        "semver": "~5.0.1"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "semver": {
-@@ -139,10 +180,17 @@
-       "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "co": "4.6.0",
-         "fast-deep-equal": "1.1.0",
-         "fast-json-stable-stringify": "2.0.0",
-         "json-schema-traverse": "0.3.1"
-+=======
-+        "co": "^4.6.0",
-+        "fast-deep-equal": "^1.0.0",
-+        "fast-json-stable-stringify": "^2.0.0",
-+        "json-schema-traverse": "^0.3.0"
-+>>>>>>> .their
-       }
-     },
-     "ajv-keywords": {
-@@ -157,9 +205,15 @@
-       "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "kind-of": "3.2.2",
-         "longest": "1.0.1",
-         "repeat-string": "1.6.1"
-+=======
-+        "kind-of": "^3.0.2",
-+        "longest": "^1.0.1",
-+        "repeat-string": "^1.5.2"
-+>>>>>>> .their
-       }
-     },
-     "amdefine": {
-@@ -174,7 +228,11 @@
-       "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "string-width": "2.1.1"
-+=======
-+        "string-width": "^2.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "ansi-regex": {
-@@ -192,11 +250,19 @@
-         "string-width": {
-           "version": "2.1.1",
-           "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
-           "dev": true,
-           "requires": {
-             "is-fullwidth-code-point": "2.0.0",
-             "strip-ansi": "4.0.0"
-+=======
-+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-+          "dev": true,
-+          "requires": {
-+            "is-fullwidth-code-point": "^2.0.0",
-+            "strip-ansi": "^4.0.0"
-+>>>>>>> .their
-           }
-         },
-         "strip-ansi": {
-@@ -205,7 +271,11 @@
-           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "ansi-regex": "3.0.0"
-+=======
-+            "ansi-regex": "^3.0.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -231,6 +301,7 @@
-     "anymatch": {
-       "version": "1.3.2",
-       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-VT3Lj5HjyImEXf26NMd3IbkLnXo=",
-       "dev": true,
-       "requires": {
-@@ -248,6 +319,19 @@
-       "version": "2.0.0",
-       "resolved": "https://registry.npmjs.org/arg/-/arg-2.0.0.tgz",
-       "integrity": "sha512-XxNTUzKnz1ctK3ZIcI2XUPlD96wbHP2nGqkPKpvk/HNRlPveYrXIVSTk9m3LcqOgDPg3B1nMvdV/K8wZd7PG4w==",
-+=======
-+      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
-+      "dev": true,
-+      "requires": {
-+        "micromatch": "^2.1.5",
-+        "normalize-path": "^2.0.0"
-+      }
-+    },
-+    "arch": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/arch/-/arch-2.1.0.tgz",
-+      "integrity": "sha1-NhOqRhSQZLPB8GB5Gb8dR4boKIk=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "argparse": {
-@@ -256,7 +340,11 @@
-       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "sprintf-js": "1.0.3"
-+=======
-+        "sprintf-js": "~1.0.2"
-+>>>>>>> .their
-       }
-     },
-     "args": {
-@@ -277,7 +365,11 @@
-           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "color-convert": "1.9.1"
-+=======
-+            "color-convert": "^1.9.0"
-+>>>>>>> .their
-           }
-         },
-         "camelcase": {
-@@ -292,9 +384,15 @@
-           "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "ansi-styles": "3.2.1",
-             "escape-string-regexp": "1.0.5",
-             "supports-color": "5.4.0"
-+=======
-+            "ansi-styles": "^3.2.1",
-+            "escape-string-regexp": "^1.0.5",
-+            "supports-color": "^5.3.0"
-+>>>>>>> .their
-           }
-         },
-         "has-flag": {
-@@ -309,7 +407,11 @@
-           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "has-flag": "3.0.0"
-+=======
-+            "has-flag": "^3.0.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -320,13 +422,21 @@
-       "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "arr-flatten": "1.1.0"
-+=======
-+        "arr-flatten": "^1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "arr-flatten": {
-       "version": "1.1.0",
-       "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE=",
-+=======
-+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "array-filter": {
-@@ -371,7 +481,11 @@
-       "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "array-uniq": "1.0.3"
-+=======
-+        "array-uniq": "^1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "array-uniq": {
-@@ -392,8 +506,13 @@
-       "integrity": "sha1-VWpcU2LAhkgyPdrrnenRS8GGTJA=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "define-properties": "1.1.2",
-         "es-abstract": "1.11.0"
-+=======
-+        "define-properties": "^1.1.2",
-+        "es-abstract": "^1.7.0"
-+>>>>>>> .their
-       }
-     },
-     "arrify": {
-@@ -408,6 +527,7 @@
-       "integrity": "sha1-uSbnksMV+MBIxDNx4yWwnJenZGQ=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "chromium-pickle-js": "0.1.0",
-         "commander": "2.15.1",
-         "cuint": "0.2.2",
-@@ -415,6 +535,15 @@
-         "minimatch": "3.0.4",
-         "mkdirp": "0.5.1",
-         "mksnapshot": "0.3.1"
-+=======
-+        "chromium-pickle-js": "^0.1.0",
-+        "commander": "^2.9.0",
-+        "cuint": "^0.2.1",
-+        "glob": "^6.0.4",
-+        "minimatch": "^3.0.0",
-+        "mkdirp": "^0.5.0",
-+        "mksnapshot": "^0.3.0"
-+>>>>>>> .their
-       }
-     },
-     "asn1": {
-@@ -429,9 +558,15 @@
-       "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "bn.js": "4.11.8",
-         "inherits": "2.0.3",
-         "minimalistic-assert": "1.0.1"
-+=======
-+        "bn.js": "^4.0.0",
-+        "inherits": "^2.0.1",
-+        "minimalistic-assert": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "assert": {
-@@ -455,7 +590,11 @@
-       "integrity": "sha1-e9QXhNMkk5h66yOba04cV6hzuRc=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "acorn": "4.0.13"
-+=======
-+        "acorn": "^4.0.3"
-+>>>>>>> .their
-       }
-     },
-     "async": {
-@@ -494,9 +633,15 @@
-       "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "chalk": "1.1.3",
-         "esutils": "2.0.2",
-         "js-tokens": "3.0.2"
-+=======
-+        "chalk": "^1.1.3",
-+        "esutils": "^2.0.2",
-+        "js-tokens": "^3.0.2"
-+>>>>>>> .their
-       }
-     },
-     "bail": {
-@@ -541,7 +686,11 @@
-       "dev": true,
-       "optional": true,
-       "requires": {
-+<<<<<<< .our
-         "tweetnacl": "0.14.5"
-+=======
-+        "tweetnacl": "^0.14.3"
-+>>>>>>> .their
-       }
-     },
-     "binary": {
-@@ -550,8 +699,13 @@
-       "integrity": "sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "buffers": "0.1.1",
-         "chainsaw": "0.1.0"
-+=======
-+        "buffers": "~0.1.1",
-+        "chainsaw": "~0.1.0"
-+>>>>>>> .their
-       }
-     },
-     "binary-extensions": {
-@@ -566,8 +720,13 @@
-       "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "readable-stream": "2.3.6",
-         "safe-buffer": "5.1.2"
-+=======
-+        "readable-stream": "^2.3.5",
-+        "safe-buffer": "^5.1.1"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -582,6 +741,7 @@
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-@@ -589,6 +749,15 @@
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-+=======
-+            "core-util-is": "~1.0.0",
-+            "inherits": "~2.0.3",
-+            "isarray": "~1.0.0",
-+            "process-nextick-args": "~2.0.0",
-+            "safe-buffer": "~5.1.1",
-+            "string_decoder": "~1.1.1",
-+            "util-deprecate": "~1.0.1"
-+>>>>>>> .their
-           }
-         },
-         "string_decoder": {
-@@ -597,7 +766,11 @@
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "safe-buffer": "5.1.2"
-+=======
-+            "safe-buffer": "~5.1.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -611,7 +784,11 @@
-     "bn.js": {
-       "version": "4.11.8",
-       "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-LN4J617jQfSEdGuwMJsyU7GxRC8=",
-+=======
-+      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "boolbase": {
-@@ -626,7 +803,11 @@
-       "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "hoek": "4.2.1"
-+=======
-+        "hoek": "4.x.x"
-+>>>>>>> .their
-       }
-     },
-     "boxen": {
-@@ -635,6 +816,7 @@
-       "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "ansi-align": "2.0.0",
-         "camelcase": "4.1.0",
-         "chalk": "2.4.1",
-@@ -642,6 +824,15 @@
-         "string-width": "2.1.1",
-         "term-size": "1.2.0",
-         "widest-line": "2.0.0"
-+=======
-+        "ansi-align": "^2.0.0",
-+        "camelcase": "^4.0.0",
-+        "chalk": "^2.0.1",
-+        "cli-boxes": "^1.0.0",
-+        "string-width": "^2.0.0",
-+        "term-size": "^1.2.0",
-+        "widest-line": "^2.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "ansi-regex": {
-@@ -656,7 +847,11 @@
-           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "color-convert": "1.9.1"
-+=======
-+            "color-convert": "^1.9.0"
-+>>>>>>> .their
-           }
-         },
-         "camelcase": {
-@@ -671,9 +866,15 @@
-           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "ansi-styles": "3.2.1",
-             "escape-string-regexp": "1.0.5",
-             "supports-color": "5.4.0"
-+=======
-+            "ansi-styles": "^3.2.1",
-+            "escape-string-regexp": "^1.0.5",
-+            "supports-color": "^5.3.0"
-+>>>>>>> .their
-           }
-         },
-         "has-flag": {
-@@ -691,11 +892,19 @@
-         "string-width": {
-           "version": "2.1.1",
-           "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
-           "dev": true,
-           "requires": {
-             "is-fullwidth-code-point": "2.0.0",
-             "strip-ansi": "4.0.0"
-+=======
-+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-+          "dev": true,
-+          "requires": {
-+            "is-fullwidth-code-point": "^2.0.0",
-+            "strip-ansi": "^4.0.0"
-+>>>>>>> .their
-           }
-         },
-         "strip-ansi": {
-@@ -704,7 +913,11 @@
-           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "ansi-regex": "3.0.0"
-+=======
-+            "ansi-regex": "^3.0.0"
-+>>>>>>> .their
-           }
-         },
-         "supports-color": {
-@@ -713,7 +926,11 @@
-           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "has-flag": "3.0.0"
-+=======
-+            "has-flag": "^3.0.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -724,7 +941,11 @@
-       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "balanced-match": "1.0.0",
-+=======
-+        "balanced-match": "^1.0.0",
-+>>>>>>> .their
-         "concat-map": "0.0.1"
-       }
-     },
-@@ -734,9 +955,15 @@
-       "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "expand-range": "1.8.2",
-         "preserve": "0.2.0",
-         "repeat-element": "1.1.2"
-+=======
-+        "expand-range": "^1.8.1",
-+        "preserve": "^0.2.0",
-+        "repeat-element": "^1.1.2"
-+>>>>>>> .their
-       }
-     },
-     "brorand": {
-@@ -751,12 +978,21 @@
-       "integrity": "sha512-erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "JSONStream": "1.3.2",
-         "combine-source-map": "0.8.0",
-         "defined": "1.0.0",
-         "safe-buffer": "5.1.2",
-         "through2": "2.0.3",
-         "umd": "3.0.3"
-+=======
-+        "JSONStream": "^1.0.3",
-+        "combine-source-map": "~0.8.0",
-+        "defined": "^1.0.0",
-+        "safe-buffer": "^5.1.1",
-+        "through2": "^2.0.0",
-+        "umd": "^3.0.0"
-+>>>>>>> .their
-       }
-     },
-     "browser-resolve": {
-@@ -782,6 +1018,7 @@
-       "integrity": "sha1-tanJAgJD8McORnW+yCI7xifkFc4=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "JSONStream": "1.3.2",
-         "assert": "1.4.1",
-         "browser-pack": "6.1.0",
-@@ -829,11 +1066,61 @@
-         "util": "0.10.3",
-         "vm-browserify": "0.0.4",
-         "xtend": "4.0.1"
-+=======
-+        "JSONStream": "^1.0.3",
-+        "assert": "^1.4.0",
-+        "browser-pack": "^6.0.1",
-+        "browser-resolve": "^1.11.0",
-+        "browserify-zlib": "~0.1.2",
-+        "buffer": "^4.1.0",
-+        "cached-path-relative": "^1.0.0",
-+        "concat-stream": "~1.5.1",
-+        "console-browserify": "^1.1.0",
-+        "constants-browserify": "~1.0.0",
-+        "crypto-browserify": "^3.0.0",
-+        "defined": "^1.0.0",
-+        "deps-sort": "^2.0.0",
-+        "domain-browser": "~1.1.0",
-+        "duplexer2": "~0.1.2",
-+        "events": "~1.1.0",
-+        "glob": "^7.1.0",
-+        "has": "^1.0.0",
-+        "htmlescape": "^1.1.0",
-+        "https-browserify": "~0.0.0",
-+        "inherits": "~2.0.1",
-+        "insert-module-globals": "^7.0.0",
-+        "labeled-stream-splicer": "^2.0.0",
-+        "module-deps": "^4.0.8",
-+        "os-browserify": "~0.1.1",
-+        "parents": "^1.0.1",
-+        "path-browserify": "~0.0.0",
-+        "process": "~0.11.0",
-+        "punycode": "^1.3.2",
-+        "querystring-es3": "~0.2.0",
-+        "read-only-stream": "^2.0.0",
-+        "readable-stream": "^2.0.2",
-+        "resolve": "^1.1.4",
-+        "shasum": "^1.0.0",
-+        "shell-quote": "^1.6.1",
-+        "stream-browserify": "^2.0.0",
-+        "stream-http": "^2.0.0",
-+        "string_decoder": "~0.10.0",
-+        "subarg": "^1.0.0",
-+        "syntax-error": "^1.1.1",
-+        "through2": "^2.0.0",
-+        "timers-browserify": "^1.0.1",
-+        "tty-browserify": "~0.0.0",
-+        "url": "~0.11.0",
-+        "util": "~0.10.1",
-+        "vm-browserify": "~0.0.1",
-+        "xtend": "^4.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-           "dev": true,
-           "requires": {
-@@ -843,6 +1130,17 @@
-             "minimatch": "3.0.4",
-             "once": "1.4.0",
-             "path-is-absolute": "1.0.1"
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+          "dev": true,
-+          "requires": {
-+            "fs.realpath": "^1.0.0",
-+            "inflight": "^1.0.4",
-+            "inherits": "2",
-+            "minimatch": "^3.0.4",
-+            "once": "^1.3.0",
-+            "path-is-absolute": "^1.0.0"
-+>>>>>>> .their
-           }
-         },
-         "isarray": {
-@@ -857,6 +1155,7 @@
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-@@ -864,6 +1163,15 @@
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-+=======
-+            "core-util-is": "~1.0.0",
-+            "inherits": "~2.0.3",
-+            "isarray": "~1.0.0",
-+            "process-nextick-args": "~2.0.0",
-+            "safe-buffer": "~5.1.1",
-+            "string_decoder": "~1.1.1",
-+            "util-deprecate": "~1.0.1"
-+>>>>>>> .their
-           },
-           "dependencies": {
-             "string_decoder": {
-@@ -872,7 +1180,11 @@
-               "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-               "dev": true,
-               "requires": {
-+<<<<<<< .our
-                 "safe-buffer": "5.1.2"
-+=======
-+                "safe-buffer": "~5.1.0"
-+>>>>>>> .their
-               }
-             }
-           }
-@@ -885,12 +1197,21 @@
-       "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "buffer-xor": "1.0.3",
-         "cipher-base": "1.0.4",
-         "create-hash": "1.2.0",
-         "evp_bytestokey": "1.0.3",
-         "inherits": "2.0.3",
-         "safe-buffer": "5.1.2"
-+=======
-+        "buffer-xor": "^1.0.3",
-+        "cipher-base": "^1.0.0",
-+        "create-hash": "^1.1.0",
-+        "evp_bytestokey": "^1.0.3",
-+        "inherits": "^2.0.1",
-+        "safe-buffer": "^5.0.1"
-+>>>>>>> .their
-       }
-     },
-     "browserify-cipher": {
-@@ -899,9 +1220,15 @@
-       "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "browserify-aes": "1.2.0",
-         "browserify-des": "1.0.1",
-         "evp_bytestokey": "1.0.3"
-+=======
-+        "browserify-aes": "^1.0.4",
-+        "browserify-des": "^1.0.0",
-+        "evp_bytestokey": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "browserify-des": {
-@@ -910,9 +1237,15 @@
-       "integrity": "sha512-zy0Cobe3hhgpiOM32Tj7KQ3Vl91m0njwsjzZQK1L+JDf11dzP9qIvjreVinsvXrgfjhStXwUWAEpB9D7Gwmayw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "cipher-base": "1.0.4",
-         "des.js": "1.0.0",
-         "inherits": "2.0.3"
-+=======
-+        "cipher-base": "^1.0.1",
-+        "des.js": "^1.0.0",
-+        "inherits": "^2.0.1"
-+>>>>>>> .their
-       }
-     },
-     "browserify-rsa": {
-@@ -921,8 +1254,13 @@
-       "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "bn.js": "4.11.8",
-         "randombytes": "2.0.6"
-+=======
-+        "bn.js": "^4.1.0",
-+        "randombytes": "^2.0.1"
-+>>>>>>> .their
-       }
-     },
-     "browserify-sign": {
-@@ -931,6 +1269,7 @@
-       "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "bn.js": "4.11.8",
-         "browserify-rsa": "4.0.1",
-         "create-hash": "1.2.0",
-@@ -938,6 +1277,15 @@
-         "elliptic": "6.4.0",
-         "inherits": "2.0.3",
-         "parse-asn1": "5.1.1"
-+=======
-+        "bn.js": "^4.1.1",
-+        "browserify-rsa": "^4.0.0",
-+        "create-hash": "^1.1.0",
-+        "create-hmac": "^1.1.2",
-+        "elliptic": "^6.0.0",
-+        "inherits": "^2.0.1",
-+        "parse-asn1": "^5.0.0"
-+>>>>>>> .their
-       }
-     },
-     "browserify-zlib": {
-@@ -946,7 +1294,11 @@
-       "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "pako": "0.2.9"
-+=======
-+        "pako": "~0.2.0"
-+>>>>>>> .their
-       }
-     },
-     "buffer": {
-@@ -955,9 +1307,15 @@
-       "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "base64-js": "1.3.0",
-         "ieee754": "1.1.11",
-         "isarray": "1.0.0"
-+=======
-+        "base64-js": "^1.0.2",
-+        "ieee754": "^1.1.4",
-+        "isarray": "^1.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -974,8 +1332,13 @@
-       "integrity": "sha1-BVFNM78WVtNUDGhPZbEgLpDsowM=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "buffer-alloc-unsafe": "0.1.1",
-         "buffer-fill": "0.1.1"
-+=======
-+        "buffer-alloc-unsafe": "^0.1.0",
-+        "buffer-fill": "^0.1.0"
-+>>>>>>> .their
-       }
-     },
-     "buffer-alloc-unsafe": {
-@@ -1038,7 +1401,11 @@
-       "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "callsites": "0.2.0"
-+=======
-+        "callsites": "^0.2.0"
-+>>>>>>> .their
-       }
-     },
-     "callsites": {
-@@ -1060,9 +1427,15 @@
-       "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "camelcase": "4.1.0",
-         "map-obj": "2.0.0",
-         "quick-lru": "1.1.0"
-+=======
-+        "camelcase": "^4.1.0",
-+        "map-obj": "^2.0.0",
-+        "quick-lru": "^1.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "camelcase": {
-@@ -1098,8 +1471,13 @@
-       "dev": true,
-       "optional": true,
-       "requires": {
-+<<<<<<< .our
-         "align-text": "0.1.4",
-         "lazy-cache": "1.0.4"
-+=======
-+        "align-text": "^0.1.3",
-+        "lazy-cache": "^1.0.3"
-+>>>>>>> .their
-       }
-     },
-     "chainsaw": {
-@@ -1108,7 +1486,11 @@
-       "integrity": "sha1-XqtQsor+WAdNDVgpE4iCi15fvJg=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "traverse": "0.3.9"
-+=======
-+        "traverse": ">=0.3.0 <0.4"
-+>>>>>>> .their
-       }
-     },
-     "chalk": {
-@@ -1117,11 +1499,19 @@
-       "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "ansi-styles": "2.2.1",
-         "escape-string-regexp": "1.0.5",
-         "has-ansi": "2.0.0",
-         "strip-ansi": "3.0.1",
-         "supports-color": "2.0.0"
-+=======
-+        "ansi-styles": "^2.2.1",
-+        "escape-string-regexp": "^1.0.2",
-+        "has-ansi": "^2.0.0",
-+        "strip-ansi": "^3.0.0",
-+        "supports-color": "^2.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "supports-color": {
-@@ -1159,6 +1549,7 @@
-     "check-for-leaks": {
-       "version": "1.2.0",
-       "resolved": "https://registry.npmjs.org/check-for-leaks/-/check-for-leaks-1.2.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-6jtQFk6XV3kzLGKBMZX/jGr4Jsw=",
-       "dev": true,
-       "requires": {
-@@ -1166,6 +1557,15 @@
-         "minimist": "1.2.0",
-         "parse-gitignore": "0.4.0",
-         "walk-sync": "0.3.2"
-+=======
-+      "integrity": "sha512-bJ2Bzo6RtsYqamMnsjtVzowGvBNVrR5IPK8Bd+lx5W1TNgOKMsF+AyNHVkqFqO7cpDZNfny5SaqH6gEovpV5Gw==",
-+      "dev": true,
-+      "requires": {
-+        "anymatch": "^1.3.0",
-+        "minimist": "^1.2.0",
-+        "parse-gitignore": "^0.4.0",
-+        "walk-sync": "^0.3.2"
-+>>>>>>> .their
-       }
-     },
-     "checksum": {
-@@ -1174,7 +1574,11 @@
-       "integrity": "sha1-3GUn1MkL6FYNvR7Uzs8yl9Uo6ek=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "optimist": "0.3.7"
-+=======
-+        "optimist": "~0.3.5"
-+>>>>>>> .their
-       }
-     },
-     "cheerio": {
-@@ -1183,6 +1587,7 @@
-       "integrity": "sha1-qbqoYKP5tZWmuBsahocxIe06Jp4=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "css-select": "1.2.0",
-         "dom-serializer": "0.1.0",
-         "entities": "1.1.1",
-@@ -1199,6 +1604,24 @@
-         "lodash.reduce": "4.6.0",
-         "lodash.reject": "4.6.0",
-         "lodash.some": "4.6.0"
-+=======
-+        "css-select": "~1.2.0",
-+        "dom-serializer": "~0.1.0",
-+        "entities": "~1.1.1",
-+        "htmlparser2": "^3.9.1",
-+        "lodash.assignin": "^4.0.9",
-+        "lodash.bind": "^4.1.4",
-+        "lodash.defaults": "^4.0.1",
-+        "lodash.filter": "^4.4.0",
-+        "lodash.flatten": "^4.2.0",
-+        "lodash.foreach": "^4.3.0",
-+        "lodash.map": "^4.4.0",
-+        "lodash.merge": "^4.4.0",
-+        "lodash.pick": "^4.2.1",
-+        "lodash.reduce": "^4.4.0",
-+        "lodash.reject": "^4.4.0",
-+        "lodash.some": "^4.4.0"
-+>>>>>>> .their
-       }
-     },
-     "chokidar": {
-@@ -1207,6 +1630,7 @@
-       "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "anymatch": "1.3.2",
-         "async-each": "1.0.1",
-         "fsevents": "1.2.4",
-@@ -1216,6 +1640,17 @@
-         "is-glob": "2.0.1",
-         "path-is-absolute": "1.0.1",
-         "readdirp": "2.1.0"
-+=======
-+        "anymatch": "^1.3.0",
-+        "async-each": "^1.0.0",
-+        "fsevents": "^1.0.0",
-+        "glob-parent": "^2.0.0",
-+        "inherits": "^2.0.1",
-+        "is-binary-path": "^1.0.0",
-+        "is-glob": "^2.0.0",
-+        "path-is-absolute": "^1.0.0",
-+        "readdirp": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "chownr": {
-@@ -1239,17 +1674,29 @@
-     "cipher-base": {
-       "version": "1.0.4",
-       "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-h2Dk7MJy9MNjUy+SbYdKriwTl94=",
-       "dev": true,
-       "requires": {
-         "inherits": "2.0.3",
-         "safe-buffer": "5.1.2"
-+=======
-+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-+      "dev": true,
-+      "requires": {
-+        "inherits": "^2.0.1",
-+        "safe-buffer": "^5.0.1"
-+>>>>>>> .their
-       }
-     },
-     "circular-json": {
-       "version": "0.3.3",
-       "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-gVyZ6oT2gJUp0vRXkb34JxE1LWY=",
-+=======
-+      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "clang-format": {
-@@ -1258,9 +1705,15 @@
-       "integrity": "sha512-x90Hac4ERacGDcZSvHKK58Ga0STuMD+Doi5g0iG2zf7wlJef5Huvhs/3BvMRFxwRYyYSdl6mpQNrtfMxE8MQzw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "async": "1.5.2",
-         "glob": "7.1.2",
-         "resolve": "1.7.1"
-+=======
-+        "async": "^1.5.2",
-+        "glob": "^7.0.0",
-+        "resolve": "^1.1.6"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "glob": {
-@@ -1269,12 +1722,21 @@
-           "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "fs.realpath": "1.0.0",
-             "inflight": "1.0.6",
-             "inherits": "2.0.3",
-             "minimatch": "3.0.4",
-             "once": "1.4.0",
-             "path-is-absolute": "1.0.1"
-+=======
-+            "fs.realpath": "^1.0.0",
-+            "inflight": "^1.0.4",
-+            "inherits": "2",
-+            "minimatch": "^3.0.4",
-+            "once": "^1.3.0",
-+            "path-is-absolute": "^1.0.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -1285,9 +1747,15 @@
-       "integrity": "sha1-d83ZTmsmZkTw95Cy9XbL7wOOJ8E=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "lodash.isempty": "4.4.0",
-         "lodash.isplainobject": "4.0.6",
-         "lodash.transform": "4.6.0"
-+=======
-+        "lodash.isempty": "^4.4.0",
-+        "lodash.isplainobject": "^4.0.6",
-+        "lodash.transform": "^4.6.0"
-+>>>>>>> .their
-       }
-     },
-     "cli-boxes": {
-@@ -1302,7 +1770,11 @@
-       "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "restore-cursor": "1.0.1"
-+=======
-+        "restore-cursor": "^1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "cli-spinners": {
-@@ -1323,8 +1795,13 @@
-       "integrity": "sha512-2WNImOvCRe6r63Gk9pShfkwXsVtKCroMAevIbiae021mS850UkWPbevxsBz3tnvjZIEGvlwaqCPsw+4ulzNgJA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "arch": "2.1.1",
-         "execa": "0.8.0"
-+=======
-+        "arch": "^2.1.0",
-+        "execa": "^0.8.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "execa": {
-@@ -1333,6 +1810,7 @@
-           "integrity": "sha1-2NdrvBtVIX7RkP1t1J08d07PyNo=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "cross-spawn": "5.1.0",
-             "get-stream": "3.0.0",
-             "is-stream": "1.1.0",
-@@ -1340,6 +1818,15 @@
-             "p-finally": "1.0.0",
-             "signal-exit": "3.0.2",
-             "strip-eof": "1.0.0"
-+=======
-+            "cross-spawn": "^5.0.1",
-+            "get-stream": "^3.0.0",
-+            "is-stream": "^1.1.0",
-+            "npm-run-path": "^2.0.0",
-+            "p-finally": "^1.0.0",
-+            "signal-exit": "^3.0.0",
-+            "strip-eof": "^1.0.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -1351,8 +1838,13 @@
-       "dev": true,
-       "optional": true,
-       "requires": {
-+<<<<<<< .our
-         "center-align": "0.1.3",
-         "right-align": "0.1.3",
-+=======
-+        "center-align": "^0.1.1",
-+        "right-align": "^0.1.1",
-+>>>>>>> .their
-         "wordwrap": "0.0.2"
-       },
-       "dependencies": {
-@@ -1389,7 +1881,11 @@
-       "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "color-name": "1.1.3"
-+=======
-+        "color-name": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "color-name": {
-@@ -1410,10 +1906,17 @@
-       "integrity": "sha1-pY0N8ELBhvz4IqjoAV9UUNLXmos=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "convert-source-map": "1.1.3",
-         "inline-source-map": "0.6.2",
-         "lodash.memoize": "3.0.4",
-         "source-map": "0.5.7"
-+=======
-+        "convert-source-map": "~1.1.0",
-+        "inline-source-map": "~0.6.0",
-+        "lodash.memoize": "~3.0.3",
-+        "source-map": "~0.5.3"
-+>>>>>>> .their
-       }
-     },
-     "combined-stream": {
-@@ -1422,7 +1925,11 @@
-       "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "delayed-stream": "1.0.0"
-+=======
-+        "delayed-stream": "~1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "commander": {
-@@ -1437,6 +1944,7 @@
-       "integrity": "sha1-md0LpFfh+bxyKxLAjsM+6rMfpkg=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "array-ify": "1.0.0",
-         "dot-prop": "3.0.0"
-       }
-@@ -1471,6 +1979,42 @@
-         "on-headers": "1.0.1",
-         "safe-buffer": "5.1.2",
-         "vary": "1.1.2"
-+=======
-+        "array-ify": "^1.0.0",
-+        "dot-prop": "^3.0.0"
-+      }
-+    },
-+    "compressible": {
-+      "version": "2.0.13",
-+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.13.tgz",
-+      "integrity": "sha1-DRAgq5JLL9tNYnmHXH1tq6a6p6k=",
-+      "dev": true,
-+      "requires": {
-+        "mime-db": ">= 1.33.0 < 2"
-+      }
-+    },
-+    "compression": {
-+      "version": "1.7.2",
-+      "resolved": "http://registry.npmjs.org/compression/-/compression-1.7.2.tgz",
-+      "integrity": "sha1-qv+81qr4VLROuygDU9WtFlH1mmk=",
-+      "dev": true,
-+      "requires": {
-+        "accepts": "~1.3.4",
-+        "bytes": "3.0.0",
-+        "compressible": "~2.0.13",
-+        "debug": "2.6.9",
-+        "on-headers": "~1.0.1",
-+        "safe-buffer": "5.1.1",
-+        "vary": "~1.1.2"
-+      },
-+      "dependencies": {
-+        "safe-buffer": {
-+          "version": "5.1.1",
-+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-+          "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
-+          "dev": true
-+        }
-+>>>>>>> .their
-       }
-     },
-     "concat-map": {
-@@ -1485,9 +2029,15 @@
-       "integrity": "sha1-cIl4Yk2FavQaWnQd790mHadSwmY=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "inherits": "2.0.3",
-         "readable-stream": "2.0.6",
-         "typedarray": "0.0.6"
-+=======
-+        "inherits": "~2.0.1",
-+        "readable-stream": "~2.0.0",
-+        "typedarray": "~0.0.5"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -1508,12 +2058,21 @@
-           "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-             "process-nextick-args": "1.0.7",
-             "string_decoder": "0.10.31",
-             "util-deprecate": "1.0.2"
-+=======
-+            "core-util-is": "~1.0.0",
-+            "inherits": "~2.0.1",
-+            "isarray": "~1.0.0",
-+            "process-nextick-args": "~1.0.6",
-+            "string_decoder": "~0.10.x",
-+            "util-deprecate": "~1.0.1"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -1524,21 +2083,37 @@
-       "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "dot-prop": "4.2.0",
-         "graceful-fs": "4.1.11",
-         "make-dir": "1.3.0",
-         "unique-string": "1.0.0",
-         "write-file-atomic": "2.3.0",
-         "xdg-basedir": "3.0.0"
-+=======
-+        "dot-prop": "^4.1.0",
-+        "graceful-fs": "^4.1.2",
-+        "make-dir": "^1.0.0",
-+        "unique-string": "^1.0.0",
-+        "write-file-atomic": "^2.0.0",
-+        "xdg-basedir": "^3.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "dot-prop": {
-           "version": "4.2.0",
-           "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-HxngwuGqDjJ5fEl5nyg3rGr2nFc=",
-           "dev": true,
-           "requires": {
-             "is-obj": "1.0.1"
-+=======
-+          "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
-+          "dev": true,
-+          "requires": {
-+            "is-obj": "^1.0.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -1549,7 +2124,11 @@
-       "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "date-now": "0.1.4"
-+=======
-+        "date-now": "^0.1.4"
-+>>>>>>> .their
-       }
-     },
-     "constants-browserify": {
-@@ -1576,6 +2155,7 @@
-       "integrity": "sha512-2WcSUst4Y3Z4hHvoMTWXMJr/DmgVdLiMOVY1Kak2LfFz+GIz2KDp5naqbFesYbfXPmaZ5p491dO0FWZIJoJw1Q==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "conventional-changelog-angular": "1.6.6",
-         "conventional-changelog-atom": "0.2.8",
-         "conventional-changelog-codemirror": "0.3.8",
-@@ -1587,6 +2167,19 @@
-         "conventional-changelog-jscs": "0.1.0",
-         "conventional-changelog-jshint": "0.3.8",
-         "conventional-changelog-preset-loader": "1.1.8"
-+=======
-+        "conventional-changelog-angular": "^1.6.6",
-+        "conventional-changelog-atom": "^0.2.8",
-+        "conventional-changelog-codemirror": "^0.3.8",
-+        "conventional-changelog-core": "^2.0.11",
-+        "conventional-changelog-ember": "^0.3.12",
-+        "conventional-changelog-eslint": "^1.0.9",
-+        "conventional-changelog-express": "^0.3.6",
-+        "conventional-changelog-jquery": "^0.1.0",
-+        "conventional-changelog-jscs": "^0.1.0",
-+        "conventional-changelog-jshint": "^0.3.8",
-+        "conventional-changelog-preset-loader": "^1.1.8"
-+>>>>>>> .their
-       }
-     },
-     "conventional-changelog-angular": {
-@@ -1595,8 +2188,13 @@
-       "integrity": "sha512-suQnFSqCxRwyBxY68pYTsFkG0taIdinHLNEAX5ivtw8bCRnIgnpvcHmlR/yjUyZIrNPYAoXlY1WiEKWgSE4BNg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "compare-func": "1.3.2",
-         "q": "1.5.1"
-+=======
-+        "compare-func": "^1.3.1",
-+        "q": "^1.5.1"
-+>>>>>>> .their
-       }
-     },
-     "conventional-changelog-atom": {
-@@ -1605,7 +2203,11 @@
-       "integrity": "sha512-8pPZqhMbrnltNBizjoDCb/Sz85KyUXNDQxuAEYAU5V/eHn0okMBVjqc8aHWYpHrytyZWvMGbayOlDv7i8kEf6g==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "q": "1.5.1"
-+=======
-+        "q": "^1.5.1"
-+>>>>>>> .their
-       }
-     },
-     "conventional-changelog-cli": {
-@@ -1614,11 +2216,19 @@
-       "integrity": "sha512-pnjdIJbxjkZ5VdAX/H1wndr1G10CY8MuZgnXuJhIHglOXfIrXygb7KZC836GW9uo1u8PjEIvIw/bKX0lOmOzZg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "add-stream": "1.0.0",
-         "conventional-changelog": "1.1.24",
-         "lodash": "4.17.10",
-         "meow": "4.0.1",
-         "tempfile": "1.1.1"
-+=======
-+        "add-stream": "^1.0.0",
-+        "conventional-changelog": "^1.1.24",
-+        "lodash": "^4.2.1",
-+        "meow": "^4.0.0",
-+        "tempfile": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "conventional-changelog-codemirror": {
-@@ -1627,7 +2237,11 @@
-       "integrity": "sha512-3HFZKtBXTaUCHvz7ai6nk2+psRIkldDoNzCsom0egDtVmPsvvHZkzjynhdQyULfacRSsBTaiQ0ol6nBOL4dDiQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "q": "1.5.1"
-+=======
-+        "q": "^1.5.1"
-+>>>>>>> .their
-       }
-     },
-     "conventional-changelog-core": {
-@@ -1636,6 +2250,7 @@
-       "integrity": "sha512-HvTE6RlqeEZ/NFPtQeFLsIDOLrGP3bXYr7lFLMhCVsbduF1MXIe8OODkwMFyo1i9ku9NWBwVnVn0jDmIFXjDRg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "conventional-changelog-writer": "3.0.9",
-         "conventional-commits-parser": "2.1.7",
-         "dateformat": "3.0.3",
-@@ -1649,6 +2264,21 @@
-         "read-pkg": "1.1.0",
-         "read-pkg-up": "1.0.1",
-         "through2": "2.0.3"
-+=======
-+        "conventional-changelog-writer": "^3.0.9",
-+        "conventional-commits-parser": "^2.1.7",
-+        "dateformat": "^3.0.0",
-+        "get-pkg-repo": "^1.0.0",
-+        "git-raw-commits": "^1.3.6",
-+        "git-remote-origin-url": "^2.0.0",
-+        "git-semver-tags": "^1.3.6",
-+        "lodash": "^4.2.1",
-+        "normalize-package-data": "^2.3.5",
-+        "q": "^1.5.1",
-+        "read-pkg": "^1.1.0",
-+        "read-pkg-up": "^1.0.1",
-+        "through2": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "conventional-changelog-ember": {
-@@ -1657,7 +2287,11 @@
-       "integrity": "sha512-mmJzA7uzbrOqeF89dMMi6z17O07ORTXlTMArnLG9ZTX4oLaKNolUlxFUFlFm9JUoVWajVpaHQWjxH1EOQ+ARoQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "q": "1.5.1"
-+=======
-+        "q": "^1.5.1"
-+>>>>>>> .their
-       }
-     },
-     "conventional-changelog-eslint": {
-@@ -1666,7 +2300,11 @@
-       "integrity": "sha512-h87nfVh2fdk9fJIvz26wCBsbDC/KxqCc5wSlNMZbXcARtbgNbNDIF7Y7ctokFdnxkzVdaHsbINkh548T9eBA7Q==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "q": "1.5.1"
-+=======
-+        "q": "^1.5.1"
-+>>>>>>> .their
-       }
-     },
-     "conventional-changelog-express": {
-@@ -1675,7 +2313,11 @@
-       "integrity": "sha512-3iWVtBJZ9RnRnZveNDzOD8QRn6g6vUif0qVTWWyi5nUIAbuN1FfPVyKdAlJJfp5Im+dE8Kiy/d2SpaX/0X678Q==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "q": "1.5.1"
-+=======
-+        "q": "^1.5.1"
-+>>>>>>> .their
-       }
-     },
-     "conventional-changelog-jquery": {
-@@ -1684,7 +2326,11 @@
-       "integrity": "sha1-Agg5cWLjhGmG5xJztsecW1+A9RA=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "q": "1.5.1"
-+=======
-+        "q": "^1.4.1"
-+>>>>>>> .their
-       }
-     },
-     "conventional-changelog-jscs": {
-@@ -1693,7 +2339,11 @@
-       "integrity": "sha1-BHnrRDzH1yxYvwvPDvHURKkvDlw=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "q": "1.5.1"
-+=======
-+        "q": "^1.4.1"
-+>>>>>>> .their
-       }
-     },
-     "conventional-changelog-jshint": {
-@@ -1702,8 +2352,13 @@
-       "integrity": "sha512-hn9QU4ZI/5V50wKPJNPGT4gEWgiBFpV6adieILW4MaUFynuDYOvQ71EMSj3EznJyKi/KzuXpc9dGmX8njZMjig==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "compare-func": "1.3.2",
-         "q": "1.5.1"
-+=======
-+        "compare-func": "^1.3.1",
-+        "q": "^1.5.1"
-+>>>>>>> .their
-       }
-     },
-     "conventional-changelog-preset-loader": {
-@@ -1718,6 +2373,7 @@
-       "integrity": "sha512-n9KbsxlJxRQsUnK6wIBRnARacvNnN4C/nxnxCkH+B/R1JS2Fa+DiP1dU4I59mEDEjgnFaN2+9wr1P1s7GYB5/Q==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "compare-func": "1.3.2",
-         "conventional-commits-filter": "1.1.6",
-         "dateformat": "3.0.3",
-@@ -1728,6 +2384,18 @@
-         "semver": "5.5.0",
-         "split": "1.0.1",
-         "through2": "2.0.3"
-+=======
-+        "compare-func": "^1.3.1",
-+        "conventional-commits-filter": "^1.1.6",
-+        "dateformat": "^3.0.0",
-+        "handlebars": "^4.0.2",
-+        "json-stringify-safe": "^5.0.1",
-+        "lodash": "^4.2.1",
-+        "meow": "^4.0.0",
-+        "semver": "^5.5.0",
-+        "split": "^1.0.0",
-+        "through2": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "conventional-commits-filter": {
-@@ -1736,8 +2404,13 @@
-       "integrity": "sha512-KcDgtCRKJCQhyk6VLT7zR+ZOyCnerfemE/CsR3iQpzRRFbLEs0Y6rwk3mpDvtOh04X223z+1xyJ582Stfct/0Q==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "is-subset": "0.1.1",
-         "modify-values": "1.0.1"
-+=======
-+        "is-subset": "^0.1.1",
-+        "modify-values": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "conventional-commits-parser": {
-@@ -1746,6 +2419,7 @@
-       "integrity": "sha512-BoMaddIEJ6B4QVMSDu9IkVImlGOSGA1I2BQyOZHeLQ6qVOJLcLKn97+fL6dGbzWEiqDzfH4OkcveULmeq2MHFQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "JSONStream": "1.3.2",
-         "is-text-path": "1.0.1",
-         "lodash": "4.17.10",
-@@ -1753,6 +2427,15 @@
-         "split2": "2.2.0",
-         "through2": "2.0.3",
-         "trim-off-newlines": "1.0.1"
-+=======
-+        "JSONStream": "^1.0.4",
-+        "is-text-path": "^1.0.0",
-+        "lodash": "^4.2.1",
-+        "meow": "^4.0.0",
-+        "split2": "^2.0.0",
-+        "through2": "^2.0.0",
-+        "trim-off-newlines": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "convert-source-map": {
-@@ -1773,8 +2456,13 @@
-       "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "bn.js": "4.11.8",
-         "elliptic": "6.4.0"
-+=======
-+        "bn.js": "^4.1.0",
-+        "elliptic": "^6.0.0"
-+>>>>>>> .their
-       }
-     },
-     "create-error-class": {
-@@ -1783,7 +2471,11 @@
-       "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "capture-stack-trace": "1.0.0"
-+=======
-+        "capture-stack-trace": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "create-hash": {
-@@ -1792,11 +2484,19 @@
-       "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "cipher-base": "1.0.4",
-         "inherits": "2.0.3",
-         "md5.js": "1.3.4",
-         "ripemd160": "2.0.2",
-         "sha.js": "2.4.11"
-+=======
-+        "cipher-base": "^1.0.1",
-+        "inherits": "^2.0.1",
-+        "md5.js": "^1.3.4",
-+        "ripemd160": "^2.0.1",
-+        "sha.js": "^2.4.0"
-+>>>>>>> .their
-       }
-     },
-     "create-hmac": {
-@@ -1805,12 +2505,21 @@
-       "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "cipher-base": "1.0.4",
-         "create-hash": "1.2.0",
-         "inherits": "2.0.3",
-         "ripemd160": "2.0.2",
-         "safe-buffer": "5.1.2",
-         "sha.js": "2.4.11"
-+=======
-+        "cipher-base": "^1.0.3",
-+        "create-hash": "^1.1.0",
-+        "inherits": "^2.0.1",
-+        "ripemd160": "^2.0.0",
-+        "safe-buffer": "^5.0.1",
-+        "sha.js": "^2.4.8"
-+>>>>>>> .their
-       }
-     },
-     "cross-spawn": {
-@@ -1819,9 +2528,15 @@
-       "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "lru-cache": "4.1.3",
-         "shebang-command": "1.2.0",
-         "which": "1.3.0"
-+=======
-+        "lru-cache": "^4.0.1",
-+        "shebang-command": "^1.2.0",
-+        "which": "^1.2.9"
-+>>>>>>> .their
-       }
-     },
-     "cryptiles": {
-@@ -1830,16 +2545,27 @@
-       "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "boom": "5.2.0"
-+=======
-+        "boom": "5.x.x"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "boom": {
-           "version": "5.2.0",
-           "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-XdnabuOl8wIHdDYpDLcX0/SlTgI=",
-           "dev": true,
-           "requires": {
-             "hoek": "4.2.1"
-+=======
-+          "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
-+          "dev": true,
-+          "requires": {
-+            "hoek": "4.x.x"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -1850,6 +2576,7 @@
-       "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "browserify-cipher": "1.0.1",
-         "browserify-sign": "4.0.4",
-         "create-ecdh": "4.0.3",
-@@ -1861,6 +2588,19 @@
-         "public-encrypt": "4.0.2",
-         "randombytes": "2.0.6",
-         "randomfill": "1.0.4"
-+=======
-+        "browserify-cipher": "^1.0.0",
-+        "browserify-sign": "^4.0.0",
-+        "create-ecdh": "^4.0.0",
-+        "create-hash": "^1.1.0",
-+        "create-hmac": "^1.1.0",
-+        "diffie-hellman": "^5.0.0",
-+        "inherits": "^2.0.1",
-+        "pbkdf2": "^3.0.3",
-+        "public-encrypt": "^4.0.0",
-+        "randombytes": "^2.0.0",
-+        "randomfill": "^1.0.3"
-+>>>>>>> .their
-       }
-     },
-     "crypto-random-string": {
-@@ -1875,10 +2615,17 @@
-       "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "boolbase": "1.0.0",
-         "css-what": "2.1.0",
-         "domutils": "1.5.1",
-         "nth-check": "1.0.1"
-+=======
-+        "boolbase": "~1.0.0",
-+        "css-what": "2.1",
-+        "domutils": "1.5.1",
-+        "nth-check": "~1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "css-what": {
-@@ -1900,7 +2647,11 @@
-       "dev": true,
-       "optional": true,
-       "requires": {
-+<<<<<<< .our
-         "cssom": "0.3.2"
-+=======
-+        "cssom": "0.3.x"
-+>>>>>>> .their
-       }
-     },
-     "cuint": {
-@@ -1915,7 +2666,11 @@
-       "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "array-find-index": "1.0.2"
-+=======
-+        "array-find-index": "^1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "d": {
-@@ -1924,7 +2679,11 @@
-       "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "es5-ext": "0.10.42"
-+=======
-+        "es5-ext": "^0.10.9"
-+>>>>>>> .their
-       }
-     },
-     "dargs": {
-@@ -1933,7 +2692,11 @@
-       "integrity": "sha1-A6nbtLXC8Tm/FK5T8LiipqhvThc=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "number-is-nan": "1.0.1"
-+=======
-+        "number-is-nan": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "dashdash": {
-@@ -1942,7 +2705,11 @@
-       "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "assert-plus": "1.0.0"
-+=======
-+        "assert-plus": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "date-now": {
-@@ -1960,7 +2727,11 @@
-     "debug": {
-       "version": "2.6.9",
-       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
-+=======
-+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "ms": "2.0.0"
-@@ -1984,8 +2755,13 @@
-       "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "decamelize": "1.2.0",
-         "map-obj": "1.0.1"
-+=======
-+        "decamelize": "^1.1.0",
-+        "map-obj": "^1.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "map-obj": {
-@@ -2002,12 +2778,21 @@
-       "integrity": "sha1-rjvLfjTGWHmt/nfhnDD4ZgK0vbA=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "binary": "0.3.0",
-         "graceful-fs": "4.1.11",
-         "mkpath": "0.1.0",
-         "nopt": "3.0.6",
-         "q": "1.5.1",
-         "readable-stream": "1.1.14",
-+=======
-+        "binary": "^0.3.0",
-+        "graceful-fs": "^4.1.3",
-+        "mkpath": "^0.1.0",
-+        "nopt": "^3.0.1",
-+        "q": "^1.1.2",
-+        "readable-stream": "^1.1.8",
-+>>>>>>> .their
-         "touch": "0.0.3"
-       }
-     },
-@@ -2035,8 +2820,13 @@
-       "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "foreach": "2.0.5",
-         "object-keys": "1.0.11"
-+=======
-+        "foreach": "^2.0.5",
-+        "object-keys": "^1.0.8"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "object-keys": {
-@@ -2059,17 +2849,27 @@
-       "integrity": "sha1-TUSr4W7zLHebSXK9FBqAMlApoUo=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "find-root": "1.1.0",
-         "glob": "7.1.2",
-         "ignore": "3.3.8",
-         "pkg-config": "1.1.1",
-         "run-parallel": "1.1.9",
-         "uniq": "1.0.1"
-+=======
-+        "find-root": "^1.0.0",
-+        "glob": "^7.0.5",
-+        "ignore": "^3.0.9",
-+        "pkg-config": "^1.1.0",
-+        "run-parallel": "^1.1.2",
-+        "uniq": "^1.0.1"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-           "dev": true,
-           "requires": {
-@@ -2079,6 +2879,17 @@
-             "minimatch": "3.0.4",
-             "once": "1.4.0",
-             "path-is-absolute": "1.0.1"
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+          "dev": true,
-+          "requires": {
-+            "fs.realpath": "^1.0.0",
-+            "inflight": "^1.0.4",
-+            "inherits": "2",
-+            "minimatch": "^3.0.4",
-+            "once": "^1.3.0",
-+            "path-is-absolute": "^1.0.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -2089,6 +2900,7 @@
-       "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "globby": "5.0.0",
-         "is-path-cwd": "1.0.0",
-         "is-path-in-cwd": "1.0.1",
-@@ -2096,6 +2908,15 @@
-         "pify": "2.3.0",
-         "pinkie-promise": "2.0.1",
-         "rimraf": "2.6.2"
-+=======
-+        "globby": "^5.0.0",
-+        "is-path-cwd": "^1.0.0",
-+        "is-path-in-cwd": "^1.0.0",
-+        "object-assign": "^4.0.1",
-+        "pify": "^2.0.0",
-+        "pinkie-promise": "^2.0.0",
-+        "rimraf": "^2.2.8"
-+>>>>>>> .their
-       }
-     },
-     "delayed-stream": {
-@@ -2116,10 +2937,17 @@
-       "integrity": "sha1-CRckkC6EZYJg65EHSMzNGvbiH7U=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "JSONStream": "1.3.2",
-         "shasum": "1.0.2",
-         "subarg": "1.0.0",
-         "through2": "2.0.3"
-+=======
-+        "JSONStream": "^1.0.3",
-+        "shasum": "^1.0.0",
-+        "subarg": "^1.0.0",
-+        "through2": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "des.js": {
-@@ -2128,8 +2956,13 @@
-       "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "inherits": "2.0.3",
-         "minimalistic-assert": "1.0.1"
-+=======
-+        "inherits": "^2.0.1",
-+        "minimalistic-assert": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "destroy": {
-@@ -2139,6 +2972,7 @@
-       "dev": true
-     },
-     "detect-port": {
-+<<<<<<< .our
-       "version": "1.2.3",
-       "resolved": "https://registry.npmjs.org/detect-port/-/detect-port-1.2.3.tgz",
-       "integrity": "sha512-IDbrX6PxqnYy8jV4wSHBaJlErYKTJvW8OQb9F7xivl1iQLqiUYHGa+nZ61Do6+N5uuOn/pReXKNqI9rUn04vug==",
-@@ -2146,6 +2980,15 @@
-       "requires": {
-         "address": "1.0.3",
-         "debug": "2.6.9"
-+=======
-+      "version": "1.2.2",
-+      "resolved": "https://registry.npmjs.org/detect-port/-/detect-port-1.2.2.tgz",
-+      "integrity": "sha512-06H99JMCwgbYbA+codm97aBhFLAjABftetp+v+Z88Pvvlkawp2N+1bP/9J24+mihrvk9yBvUYTyIj3NixG1CsA==",
-+      "dev": true,
-+      "requires": {
-+        "address": "^1.0.1",
-+        "debug": "^2.6.0"
-+>>>>>>> .their
-       }
-     },
-     "detective": {
-@@ -2154,8 +2997,13 @@
-       "integrity": "sha512-H6PmeeUcZloWtdt4DAkFyzFL94arpHr3NOwwmVILFiy+9Qd4JTxxXrzfyGk/lmct2qVGBwTSwSXagqu2BxmWig==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "acorn": "5.5.3",
-         "defined": "1.0.0"
-+=======
-+        "acorn": "^5.2.1",
-+        "defined": "^1.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "acorn": {
-@@ -2178,9 +3026,15 @@
-       "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "bn.js": "4.11.8",
-         "miller-rabin": "4.0.1",
-         "randombytes": "2.0.6"
-+=======
-+        "bn.js": "^4.1.0",
-+        "miller-rabin": "^4.0.0",
-+        "randombytes": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "doctrine": {
-@@ -2189,7 +3043,11 @@
-       "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "esutils": "2.0.2"
-+=======
-+        "esutils": "^2.0.2"
-+>>>>>>> .their
-       }
-     },
-     "dom-serializer": {
-@@ -2198,8 +3056,13 @@
-       "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "domelementtype": "1.1.3",
-         "entities": "1.1.1"
-+=======
-+        "domelementtype": "~1.1.1",
-+        "entities": "~1.1.1"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "domelementtype": {
-@@ -2228,7 +3091,11 @@
-       "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "domelementtype": "1.3.0"
-+=======
-+        "domelementtype": "1"
-+>>>>>>> .their
-       }
-     },
-     "domutils": {
-@@ -2237,8 +3104,13 @@
-       "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "dom-serializer": "0.1.0",
-         "domelementtype": "1.3.0"
-+=======
-+        "dom-serializer": "0",
-+        "domelementtype": "1"
-+>>>>>>> .their
-       }
-     },
-     "dot-prop": {
-@@ -2247,7 +3119,11 @@
-       "integrity": "sha1-G3CK8JSknJoOfbyteQq6U52sEXc=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "is-obj": "1.0.1"
-+=======
-+        "is-obj": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "dotenv": {
-@@ -2262,7 +3138,11 @@
-       "integrity": "sha1-iw587Y5wsdPF2HTvlCDkBvOUJbM=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "dotenv": "4.0.0"
-+=======
-+        "dotenv": "^4.0.0"
-+>>>>>>> .their
-       }
-     },
-     "dugite": {
-@@ -2271,12 +3151,21 @@
-       "integrity": "sha512-CFd0sWTB2oouat0kJA4/rEQAeh6ZUvCDL9uFOaSBhLX+2CM/YL+ebKJXd8dYVIe8iVXmK5R9P31NVbRw4Ccoxw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "checksum": "0.1.1",
-         "mkdirp": "0.5.1",
-         "progress": "2.0.0",
-         "request": "2.85.0",
-         "rimraf": "2.6.2",
-         "tar": "4.4.2"
-+=======
-+        "checksum": "^0.1.1",
-+        "mkdirp": "^0.5.1",
-+        "progress": "^2.0.0",
-+        "request": "^2.85.0",
-+        "rimraf": "^2.5.4",
-+        "tar": "^4.0.2"
-+>>>>>>> .their
-       }
-     },
-     "duplexer2": {
-@@ -2285,7 +3174,11 @@
-       "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "readable-stream": "2.3.6"
-+=======
-+        "readable-stream": "^2.0.2"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -2300,6 +3193,7 @@
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-@@ -2307,6 +3201,15 @@
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-+=======
-+            "core-util-is": "~1.0.0",
-+            "inherits": "~2.0.3",
-+            "isarray": "~1.0.0",
-+            "process-nextick-args": "~2.0.0",
-+            "safe-buffer": "~5.1.1",
-+            "string_decoder": "~1.1.1",
-+            "util-deprecate": "~1.0.1"
-+>>>>>>> .their
-           }
-         },
-         "string_decoder": {
-@@ -2315,7 +3218,11 @@
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "safe-buffer": "5.1.2"
-+=======
-+            "safe-buffer": "~5.1.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -2332,10 +3239,17 @@
-       "integrity": "sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "end-of-stream": "1.4.1",
-         "inherits": "2.0.3",
-         "readable-stream": "2.3.6",
-         "stream-shift": "1.0.0"
-+=======
-+        "end-of-stream": "^1.0.0",
-+        "inherits": "^2.0.1",
-+        "readable-stream": "^2.0.0",
-+        "stream-shift": "^1.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -2350,6 +3264,7 @@
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-@@ -2357,6 +3272,15 @@
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-+=======
-+            "core-util-is": "~1.0.0",
-+            "inherits": "~2.0.3",
-+            "isarray": "~1.0.0",
-+            "process-nextick-args": "~2.0.0",
-+            "safe-buffer": "~5.1.1",
-+            "string_decoder": "~1.1.1",
-+            "util-deprecate": "~1.0.1"
-+>>>>>>> .their
-           }
-         },
-         "string_decoder": {
-@@ -2365,7 +3289,11 @@
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "safe-buffer": "5.1.2"
-+=======
-+            "safe-buffer": "~5.1.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -2377,7 +3305,11 @@
-       "dev": true,
-       "optional": true,
-       "requires": {
-+<<<<<<< .our
-         "jsbn": "0.1.1"
-+=======
-+        "jsbn": "~0.1.0"
-+>>>>>>> .their
-       }
-     },
-     "ee-first": {
-@@ -2392,6 +3324,7 @@
-       "integrity": "sha1-aBO+LTdwciKVrFXxM0/mu5iymsI=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "asar": "0.12.4",
-         "glob": "7.1.2",
-         "istanbul": "0.4.5",
-@@ -2399,6 +3332,15 @@
-         "rimraf": "2.6.2",
-         "temp": "0.8.3",
-         "yargs": "4.8.1"
-+=======
-+        "asar": "^0.12.1",
-+        "glob": "^7.0.5",
-+        "istanbul": "^0.4.4",
-+        "mkdirp": "^0.5.1",
-+        "rimraf": "^2.5.4",
-+        "temp": "^0.8.3",
-+        "yargs": "^4.8.1"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "asar": {
-@@ -2407,6 +3349,7 @@
-           "integrity": "sha1-LdPxFoguq4wPI7dUeSqCp9n84XE=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "chromium-pickle-js": "0.2.0",
-             "commander": "2.15.1",
-             "cuint": "0.2.2",
-@@ -2414,6 +3357,15 @@
-             "minimatch": "3.0.4",
-             "mkdirp": "0.5.1",
-             "mksnapshot": "0.3.1",
-+=======
-+            "chromium-pickle-js": "^0.2.0",
-+            "commander": "^2.9.0",
-+            "cuint": "^0.2.1",
-+            "glob": "^6.0.4",
-+            "minimatch": "^3.0.3",
-+            "mkdirp": "^0.5.0",
-+            "mksnapshot": "^0.3.0",
-+>>>>>>> .their
-             "tmp": "0.0.28"
-           },
-           "dependencies": {
-@@ -2423,11 +3375,19 @@
-               "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
-               "dev": true,
-               "requires": {
-+<<<<<<< .our
-                 "inflight": "1.0.6",
-                 "inherits": "2.0.3",
-                 "minimatch": "3.0.4",
-                 "once": "1.4.0",
-                 "path-is-absolute": "1.0.1"
-+=======
-+                "inflight": "^1.0.4",
-+                "inherits": "2",
-+                "minimatch": "2 || 3",
-+                "once": "^1.3.0",
-+                "path-is-absolute": "^1.0.0"
-+>>>>>>> .their
-               }
-             }
-           }
-@@ -2441,6 +3401,7 @@
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-           "dev": true,
-           "requires": {
-@@ -2450,6 +3411,17 @@
-             "minimatch": "3.0.4",
-             "once": "1.4.0",
-             "path-is-absolute": "1.0.1"
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+          "dev": true,
-+          "requires": {
-+            "fs.realpath": "^1.0.0",
-+            "inflight": "^1.0.4",
-+            "inherits": "2",
-+            "minimatch": "^3.0.4",
-+            "once": "^1.3.0",
-+            "path-is-absolute": "^1.0.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -2460,6 +3432,7 @@
-       "integrity": "sha1-ARI6T8y2vieswSgAJ7/LJAxUsdI=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "got": "6.7.1",
-         "gunzip-maybe": "1.4.1",
-         "node-dir": "0.1.17",
-@@ -2468,6 +3441,16 @@
-         "pify": "2.3.0",
-         "semver": "5.5.0",
-         "tar-fs": "1.16.2"
-+=======
-+        "got": "^6.3.0",
-+        "gunzip-maybe": "^1.3.1",
-+        "node-dir": "^0.1.12",
-+        "ora": "^0.2.3",
-+        "path-exists": "^3.0.0",
-+        "pify": "^2.3.0",
-+        "semver": "^5.1.0",
-+        "tar-fs": "^1.13.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "ora": {
-@@ -2476,10 +3459,17 @@
-           "integrity": "sha1-N1J9Igrc1Tw5tzVx11QVbV22V6Q=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "chalk": "1.1.3",
-             "cli-cursor": "1.0.2",
-             "cli-spinners": "0.1.2",
-             "object-assign": "4.1.1"
-+=======
-+            "chalk": "^1.1.1",
-+            "cli-cursor": "^1.0.2",
-+            "cli-spinners": "^0.1.2",
-+            "object-assign": "^4.0.1"
-+>>>>>>> .their
-           }
-         },
-         "path-exists": {
-@@ -2496,6 +3486,7 @@
-       "integrity": "sha512-omAdcSUPTzeIUzyMwA3W54mcw09AEy2THUQCDgDV0dAQA2urV5VpEaB3ts66aVQmw8j6AxK/CBAfBcYy5ZW0bw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "cheerio": "0.22.0",
-         "clean-deep": "2.0.2",
-         "decamelize": "1.2.0",
-@@ -2512,6 +3503,24 @@
-         "pify": "2.3.0",
-         "revalidator": "0.3.1",
-         "semver": "5.5.0"
-+=======
-+        "cheerio": "^0.22.0",
-+        "clean-deep": "^2.0.1",
-+        "decamelize": "^1.2.0",
-+        "dedent": "^0.6.0",
-+        "electron-docs": "^2.0.1",
-+        "entities": "^1.1.1",
-+        "keyed-array": "^2.1.2",
-+        "lodash.merge": "^4.6.0",
-+        "lodash.pick": "^4.2.1",
-+        "marky-markdown-lite": "^1.2.0",
-+        "minimist": "^1.2.0",
-+        "ora": "^0.3.0",
-+        "path-exists": "^3.0.0",
-+        "pify": "^2.3.0",
-+        "revalidator": "^0.3.1",
-+        "semver": "^5.3.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "path-exists": {
-@@ -2523,6 +3532,7 @@
-       }
-     },
-     "electron-typescript-definitions": {
-+<<<<<<< .our
-       "version": "1.3.6",
-       "resolved": "https://registry.npmjs.org/electron-typescript-definitions/-/electron-typescript-definitions-1.3.6.tgz",
-       "integrity": "sha512-Wz6tPaaZ22lbfWwF9bzVSki7LMW96xilCT1M8eeNYZG6LcpA9x34jlrAZg5HZWTHXR2tfbTQhSmrY+FEVulD/A==",
-@@ -2538,6 +3548,23 @@
-         "rimraf": "2.6.2",
-         "tslint": "4.5.1",
-         "typescript": "2.9.2"
-+=======
-+      "version": "1.3.4",
-+      "resolved": "https://registry.npmjs.org/electron-typescript-definitions/-/electron-typescript-definitions-1.3.4.tgz",
-+      "integrity": "sha512-/JI+ifj/Q4wtUTdsheACQS8fBIQ/eGvpLnmWCRpzZHl648gk4PxtsrrrnQYF5ZajSx9SXUTSq5UgfDt9Bq7Bhg==",
-+      "dev": true,
-+      "requires": {
-+        "@types/node": "^7.0.18",
-+        "colors": "^1.1.2",
-+        "debug": "^2.6.3",
-+        "electron-docs": "^2.0.0",
-+        "electron-docs-linter": "^2.3.4",
-+        "lodash": "^4.16.1",
-+        "mkdirp": "^0.5.1",
-+        "rimraf": "^2.5.4",
-+        "tslint": "^4.5.1",
-+        "typescript": "^2.2.1"
-+>>>>>>> .their
-       }
-     },
-     "elliptic": {
-@@ -2546,6 +3573,7 @@
-       "integrity": "sha1-ysmvh2LIWDYYcAPI3+GT5eLq5d8=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "bn.js": "4.11.8",
-         "brorand": "1.1.0",
-         "hash.js": "1.1.3",
-@@ -2553,6 +3581,15 @@
-         "inherits": "2.0.3",
-         "minimalistic-assert": "1.0.1",
-         "minimalistic-crypto-utils": "1.0.1"
-+=======
-+        "bn.js": "^4.4.0",
-+        "brorand": "^1.0.1",
-+        "hash.js": "^1.0.0",
-+        "hmac-drbg": "^1.0.0",
-+        "inherits": "^2.0.1",
-+        "minimalistic-assert": "^1.0.0",
-+        "minimalistic-crypto-utils": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "encodeurl": {
-@@ -2567,7 +3604,11 @@
-       "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "once": "1.4.0"
-+=======
-+        "once": "^1.4.0"
-+>>>>>>> .their
-       }
-     },
-     "ensure-posix-path": {
-@@ -2588,7 +3629,11 @@
-       "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "is-arrayish": "0.2.1"
-+=======
-+        "is-arrayish": "^0.2.1"
-+>>>>>>> .their
-       }
-     },
-     "es-abstract": {
-@@ -2597,11 +3642,19 @@
-       "integrity": "sha512-ZnQrE/lXTTQ39ulXZ+J1DTFazV9qBy61x2bY071B+qGco8Z8q1QddsLdt/EF8Ai9hcWH72dWS0kFqXLxOxqslA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "es-to-primitive": "1.1.1",
-         "function-bind": "1.1.1",
-         "has": "1.0.1",
-         "is-callable": "1.1.3",
-         "is-regex": "1.0.4"
-+=======
-+        "es-to-primitive": "^1.1.1",
-+        "function-bind": "^1.1.1",
-+        "has": "^1.0.1",
-+        "is-callable": "^1.1.3",
-+        "is-regex": "^1.0.4"
-+>>>>>>> .their
-       }
-     },
-     "es-to-primitive": {
-@@ -2610,9 +3663,15 @@
-       "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "is-callable": "1.1.3",
-         "is-date-object": "1.0.1",
-         "is-symbol": "1.0.1"
-+=======
-+        "is-callable": "^1.1.1",
-+        "is-date-object": "^1.0.1",
-+        "is-symbol": "^1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "es5-ext": {
-@@ -2621,9 +3680,15 @@
-       "integrity": "sha512-AJxO1rmPe1bDEfSR6TJ/FgMFYuTBhR5R57KW58iCkYACMyFbrkqVyzXSurYoScDGvgyMpk7uRF/lPUPPTmsRSA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "es6-iterator": "2.0.3",
-         "es6-symbol": "3.1.1",
-         "next-tick": "1.0.0"
-+=======
-+        "es6-iterator": "~2.0.3",
-+        "es6-symbol": "~3.1.1",
-+        "next-tick": "1"
-+>>>>>>> .their
-       }
-     },
-     "es6-iterator": {
-@@ -2632,9 +3697,15 @@
-       "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "d": "1.0.0",
-         "es5-ext": "0.10.42",
-         "es6-symbol": "3.1.1"
-+=======
-+        "d": "1",
-+        "es5-ext": "^0.10.35",
-+        "es6-symbol": "^3.1.1"
-+>>>>>>> .their
-       }
-     },
-     "es6-map": {
-@@ -2643,12 +3714,21 @@
-       "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "d": "1.0.0",
-         "es5-ext": "0.10.42",
-         "es6-iterator": "2.0.3",
-         "es6-set": "0.1.5",
-         "es6-symbol": "3.1.1",
-         "event-emitter": "0.3.5"
-+=======
-+        "d": "1",
-+        "es5-ext": "~0.10.14",
-+        "es6-iterator": "~2.0.1",
-+        "es6-set": "~0.1.5",
-+        "es6-symbol": "~3.1.1",
-+        "event-emitter": "~0.3.5"
-+>>>>>>> .their
-       }
-     },
-     "es6-set": {
-@@ -2657,11 +3737,19 @@
-       "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "d": "1.0.0",
-         "es5-ext": "0.10.42",
-         "es6-iterator": "2.0.3",
-         "es6-symbol": "3.1.1",
-         "event-emitter": "0.3.5"
-+=======
-+        "d": "1",
-+        "es5-ext": "~0.10.14",
-+        "es6-iterator": "~2.0.1",
-+        "es6-symbol": "3.1.1",
-+        "event-emitter": "~0.3.5"
-+>>>>>>> .their
-       }
-     },
-     "es6-symbol": {
-@@ -2670,8 +3758,13 @@
-       "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "d": "1.0.0",
-         "es5-ext": "0.10.42"
-+=======
-+        "d": "1",
-+        "es5-ext": "~0.10.14"
-+>>>>>>> .their
-       }
-     },
-     "es6-weak-map": {
-@@ -2680,10 +3773,17 @@
-       "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "d": "1.0.0",
-         "es5-ext": "0.10.42",
-         "es6-iterator": "2.0.3",
-         "es6-symbol": "3.1.1"
-+=======
-+        "d": "1",
-+        "es5-ext": "^0.10.14",
-+        "es6-iterator": "^2.0.1",
-+        "es6-symbol": "^3.1.1"
-+>>>>>>> .their
-       }
-     },
-     "escape-html": {
-@@ -2704,11 +3804,19 @@
-       "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "esprima": "2.7.3",
-         "estraverse": "1.9.3",
-         "esutils": "2.0.2",
-         "optionator": "0.8.2",
-         "source-map": "0.2.0"
-+=======
-+        "esprima": "^2.7.1",
-+        "estraverse": "^1.9.1",
-+        "esutils": "^2.0.2",
-+        "optionator": "^0.8.1",
-+        "source-map": "~0.2.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "source-map": {
-@@ -2718,7 +3826,11 @@
-           "dev": true,
-           "optional": true,
-           "requires": {
-+<<<<<<< .our
-             "amdefine": "1.0.1"
-+=======
-+            "amdefine": ">=0.0.4"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -2729,10 +3841,17 @@
-       "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "es6-map": "0.1.5",
-         "es6-weak-map": "2.0.2",
-         "esrecurse": "4.2.1",
-         "estraverse": "4.2.0"
-+=======
-+        "es6-map": "^0.1.3",
-+        "es6-weak-map": "^2.0.1",
-+        "esrecurse": "^4.1.0",
-+        "estraverse": "^4.1.1"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "estraverse": {
-@@ -2749,6 +3868,7 @@
-       "integrity": "sha1-yPxiAcf0DdCJQbh8CFdnOGpnmsw=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "babel-code-frame": "6.26.0",
-         "chalk": "1.1.3",
-         "concat-stream": "1.5.2",
-@@ -2784,6 +3904,43 @@
-         "table": "3.8.3",
-         "text-table": "0.2.0",
-         "user-home": "2.0.0"
-+=======
-+        "babel-code-frame": "^6.16.0",
-+        "chalk": "^1.1.3",
-+        "concat-stream": "^1.5.2",
-+        "debug": "^2.1.1",
-+        "doctrine": "^2.0.0",
-+        "escope": "^3.6.0",
-+        "espree": "^3.4.0",
-+        "esquery": "^1.0.0",
-+        "estraverse": "^4.2.0",
-+        "esutils": "^2.0.2",
-+        "file-entry-cache": "^2.0.0",
-+        "glob": "^7.0.3",
-+        "globals": "^9.14.0",
-+        "ignore": "^3.2.0",
-+        "imurmurhash": "^0.1.4",
-+        "inquirer": "^0.12.0",
-+        "is-my-json-valid": "^2.10.0",
-+        "is-resolvable": "^1.0.0",
-+        "js-yaml": "^3.5.1",
-+        "json-stable-stringify": "^1.0.0",
-+        "levn": "^0.3.0",
-+        "lodash": "^4.0.0",
-+        "mkdirp": "^0.5.0",
-+        "natural-compare": "^1.4.0",
-+        "optionator": "^0.8.2",
-+        "path-is-inside": "^1.0.1",
-+        "pluralize": "^1.2.1",
-+        "progress": "^1.1.8",
-+        "require-uncached": "^1.0.2",
-+        "shelljs": "^0.7.5",
-+        "strip-bom": "^3.0.0",
-+        "strip-json-comments": "~2.0.1",
-+        "table": "^3.7.8",
-+        "text-table": "~0.2.0",
-+        "user-home": "^2.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "estraverse": {
-@@ -2795,6 +3952,7 @@
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-           "dev": true,
-           "requires": {
-@@ -2804,6 +3962,17 @@
-             "minimatch": "3.0.4",
-             "once": "1.4.0",
-             "path-is-absolute": "1.0.1"
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+          "dev": true,
-+          "requires": {
-+            "fs.realpath": "^1.0.0",
-+            "inflight": "^1.0.4",
-+            "inherits": "2",
-+            "minimatch": "^3.0.4",
-+            "once": "^1.3.0",
-+            "path-is-absolute": "^1.0.0"
-+>>>>>>> .their
-           }
-         },
-         "json-stable-stringify": {
-@@ -2812,7 +3981,11 @@
-           "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "jsonify": "0.0.0"
-+=======
-+            "jsonify": "~0.0.0"
-+>>>>>>> .their
-           }
-         },
-         "progress": {
-@@ -2847,9 +4020,15 @@
-       "integrity": "sha1-Wt2BBujJKNssuiMrzZ76hG49oWw=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "debug": "2.6.9",
-         "object-assign": "4.1.1",
-         "resolve": "1.7.1"
-+=======
-+        "debug": "^2.2.0",
-+        "object-assign": "^4.0.1",
-+        "resolve": "^1.1.6"
-+>>>>>>> .their
-       }
-     },
-     "eslint-module-utils": {
-@@ -2858,8 +4037,13 @@
-       "integrity": "sha1-snA2LNiLGkitMIl2zn+lTphBF0Y=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "debug": "2.6.9",
-         "pkg-dir": "1.0.0"
-+=======
-+        "debug": "^2.6.8",
-+        "pkg-dir": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "eslint-plugin-import": {
-@@ -2868,6 +4052,7 @@
-       "integrity": "sha1-crowb60wXWfEgWNIpGmaQimsi04=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "builtin-modules": "1.1.1",
-         "contains-path": "0.1.0",
-         "debug": "2.6.9",
-@@ -2878,6 +4063,18 @@
-         "lodash.cond": "4.5.2",
-         "minimatch": "3.0.4",
-         "pkg-up": "1.0.0"
-+=======
-+        "builtin-modules": "^1.1.1",
-+        "contains-path": "^0.1.0",
-+        "debug": "^2.2.0",
-+        "doctrine": "1.5.0",
-+        "eslint-import-resolver-node": "^0.2.0",
-+        "eslint-module-utils": "^2.0.0",
-+        "has": "^1.0.1",
-+        "lodash.cond": "^4.3.0",
-+        "minimatch": "^3.0.3",
-+        "pkg-up": "^1.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "doctrine": {
-@@ -2886,8 +4083,13 @@
-           "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "esutils": "2.0.2",
-             "isarray": "1.0.0"
-+=======
-+            "esutils": "^2.0.2",
-+            "isarray": "^1.0.0"
-+>>>>>>> .their
-           }
-         },
-         "isarray": {
-@@ -2901,6 +4103,7 @@
-     "eslint-plugin-node": {
-       "version": "4.2.3",
-       "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-4.2.3.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-wEOQq428u2iHF0Aj1vOnJ2nmO5c=",
-       "dev": true,
-       "requires": {
-@@ -2908,6 +4111,15 @@
-         "minimatch": "3.0.4",
-         "object-assign": "4.1.1",
-         "resolve": "1.7.1",
-+=======
-+      "integrity": "sha512-vIUQPuwbVYdz/CYnlTLsJrRy7iXHQjdEe5wz0XhhdTym3IInM/zZLlPf9nZ2mThsH0QcsieCOWs2vOeCy/22LQ==",
-+      "dev": true,
-+      "requires": {
-+        "ignore": "^3.0.11",
-+        "minimatch": "^3.0.2",
-+        "object-assign": "^4.0.1",
-+        "resolve": "^1.1.7",
-+>>>>>>> .their
-         "semver": "5.3.0"
-       },
-       "dependencies": {
-@@ -2931,11 +4143,19 @@
-       "integrity": "sha1-xUNb6wZ3ThLH2y9qut3L+QDNP3g=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "array.prototype.find": "2.0.4",
-         "doctrine": "1.5.0",
-         "has": "1.0.1",
-         "jsx-ast-utils": "1.4.1",
-         "object.assign": "4.1.0"
-+=======
-+        "array.prototype.find": "^2.0.1",
-+        "doctrine": "^1.2.2",
-+        "has": "^1.0.1",
-+        "jsx-ast-utils": "^1.3.4",
-+        "object.assign": "^4.0.4"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "doctrine": {
-@@ -2944,8 +4164,13 @@
-           "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "esutils": "2.0.2",
-             "isarray": "1.0.0"
-+=======
-+            "esutils": "^2.0.2",
-+            "isarray": "^1.0.0"
-+>>>>>>> .their
-           }
-         },
-         "isarray": {
-@@ -2968,8 +4193,13 @@
-       "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "acorn": "5.5.3",
-         "acorn-jsx": "3.0.1"
-+=======
-+        "acorn": "^5.5.0",
-+        "acorn-jsx": "^3.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "acorn": {
-@@ -2992,7 +4222,11 @@
-       "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "estraverse": "4.2.0"
-+=======
-+        "estraverse": "^4.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "estraverse": {
-@@ -3009,7 +4243,11 @@
-       "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "estraverse": "4.2.0"
-+=======
-+        "estraverse": "^4.1.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "estraverse": {
-@@ -3044,8 +4282,13 @@
-       "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "d": "1.0.0",
-         "es5-ext": "0.10.42"
-+=======
-+        "d": "1",
-+        "es5-ext": "~0.10.14"
-+>>>>>>> .their
-       }
-     },
-     "events": {
-@@ -3057,11 +4300,19 @@
-     "evp_bytestokey": {
-       "version": "1.0.3",
-       "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-f8vbGY3HGVlDLv4ThCaE4FJaywI=",
-       "dev": true,
-       "requires": {
-         "md5.js": "1.3.4",
-         "safe-buffer": "5.1.2"
-+=======
-+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-+      "dev": true,
-+      "requires": {
-+        "md5.js": "^1.3.4",
-+        "safe-buffer": "^5.1.1"
-+>>>>>>> .their
-       }
-     },
-     "execa": {
-@@ -3070,6 +4321,7 @@
-       "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "cross-spawn": "5.1.0",
-         "get-stream": "3.0.0",
-         "is-stream": "1.1.0",
-@@ -3077,6 +4329,15 @@
-         "p-finally": "1.0.0",
-         "signal-exit": "3.0.2",
-         "strip-eof": "1.0.0"
-+=======
-+        "cross-spawn": "^5.0.1",
-+        "get-stream": "^3.0.0",
-+        "is-stream": "^1.1.0",
-+        "npm-run-path": "^2.0.0",
-+        "p-finally": "^1.0.0",
-+        "signal-exit": "^3.0.0",
-+        "strip-eof": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "exit-hook": {
-@@ -3091,7 +4352,11 @@
-       "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "is-posix-bracket": "0.1.1"
-+=======
-+        "is-posix-bracket": "^0.1.0"
-+>>>>>>> .their
-       }
-     },
-     "expand-range": {
-@@ -3100,7 +4365,11 @@
-       "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "fill-range": "2.2.4"
-+=======
-+        "fill-range": "^2.1.0"
-+>>>>>>> .their
-       }
-     },
-     "extend": {
-@@ -3115,7 +4384,11 @@
-       "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "is-extglob": "1.0.0"
-+=======
-+        "is-extglob": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "extsprintf": {
-@@ -3148,7 +4421,11 @@
-       "integrity": "sha512-o2eo/X2syzzERAtN5LcGbiVQ0WwZSlN3qLtadwAz3X8Bu+XWD16dja/KMsjZLiQr+BLGPDnHGkc4yUJf1Xpkpw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "format": "0.2.2"
-+=======
-+        "format": "^0.2.2"
-+>>>>>>> .their
-       }
-     },
-     "figures": {
-@@ -3157,8 +4434,13 @@
-       "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "escape-string-regexp": "1.0.5",
-         "object-assign": "4.1.1"
-+=======
-+        "escape-string-regexp": "^1.0.5",
-+        "object-assign": "^4.1.0"
-+>>>>>>> .their
-       }
-     },
-     "file-entry-cache": {
-@@ -3167,8 +4449,13 @@
-       "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "flat-cache": "1.3.0",
-         "object-assign": "4.1.1"
-+=======
-+        "flat-cache": "^1.2.1",
-+        "object-assign": "^4.0.1"
-+>>>>>>> .their
-       }
-     },
-     "filename-regex": {
-@@ -3189,17 +4476,29 @@
-       "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "is-number": "2.1.0",
-         "isobject": "2.1.0",
-         "randomatic": "3.0.0",
-         "repeat-element": "1.1.2",
-         "repeat-string": "1.6.1"
-+=======
-+        "is-number": "^2.1.0",
-+        "isobject": "^2.0.0",
-+        "randomatic": "^3.0.0",
-+        "repeat-element": "^1.1.2",
-+        "repeat-string": "^1.5.2"
-+>>>>>>> .their
-       }
-     },
-     "find-root": {
-       "version": "1.1.0",
-       "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-q8/Iunb3CMQql7PWhbfpRQv7nOQ=",
-+=======
-+      "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "find-up": {
-@@ -3208,8 +4507,13 @@
-       "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "path-exists": "2.1.0",
-         "pinkie-promise": "2.0.1"
-+=======
-+        "path-exists": "^2.0.0",
-+        "pinkie-promise": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "findup-sync": {
-@@ -3218,7 +4522,11 @@
-       "integrity": "sha1-N5MKpdgWt3fANEXhlmzGeQpMCxY=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "glob": "5.0.15"
-+=======
-+        "glob": "~5.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "glob": {
-@@ -3227,11 +4535,19 @@
-           "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "inflight": "1.0.6",
-             "inherits": "2.0.3",
-             "minimatch": "3.0.4",
-             "once": "1.4.0",
-             "path-is-absolute": "1.0.1"
-+=======
-+            "inflight": "^1.0.4",
-+            "inherits": "2",
-+            "minimatch": "2 || 3",
-+            "once": "^1.3.0",
-+            "path-is-absolute": "^1.0.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -3242,10 +4558,17 @@
-       "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "circular-json": "0.3.3",
-         "del": "2.2.2",
-         "graceful-fs": "4.1.11",
-         "write": "0.2.1"
-+=======
-+        "circular-json": "^0.3.1",
-+        "del": "^2.0.2",
-+        "graceful-fs": "^4.1.2",
-+        "write": "^0.2.1"
-+>>>>>>> .their
-       }
-     },
-     "fn-name": {
-@@ -3260,8 +4583,13 @@
-       "integrity": "sha1-NLkLqyqRGqNHVx2pDyK9NuzYqRk=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "debug": "2.6.9",
-         "stream-consume": "0.1.1"
-+=======
-+        "debug": "^2.2.0",
-+        "stream-consume": "^0.1.0"
-+>>>>>>> .their
-       }
-     },
-     "for-in": {
-@@ -3276,7 +4604,11 @@
-       "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "for-in": "1.0.2"
-+=======
-+        "for-in": "^1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "foreach": {
-@@ -3297,9 +4629,15 @@
-       "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "asynckit": "0.4.0",
-         "combined-stream": "1.0.6",
-         "mime-types": "2.1.18"
-+=======
-+        "asynckit": "^0.4.0",
-+        "combined-stream": "1.0.6",
-+        "mime-types": "^2.1.12"
-+>>>>>>> .their
-       }
-     },
-     "format": {
-@@ -3326,11 +4664,19 @@
-       "integrity": "sha1-muH92UiXeY7at20JGM9C0MMYT6k=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "graceful-fs": "4.1.11",
-         "jsonfile": "2.4.0",
-         "klaw": "1.3.1",
-         "path-is-absolute": "1.0.1",
-         "rimraf": "2.6.2"
-+=======
-+        "graceful-fs": "^4.1.2",
-+        "jsonfile": "^2.1.0",
-+        "klaw": "^1.0.0",
-+        "path-is-absolute": "^1.0.0",
-+        "rimraf": "^2.2.8"
-+>>>>>>> .their
-       }
-     },
-     "fs-minipass": {
-@@ -3339,7 +4685,11 @@
-       "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "minipass": "2.3.0"
-+=======
-+        "minipass": "^2.2.1"
-+>>>>>>> .their
-       }
-     },
-     "fs.realpath": {
-@@ -3355,8 +4705,13 @@
-       "dev": true,
-       "optional": true,
-       "requires": {
-+<<<<<<< .our
-         "nan": "2.10.0",
-         "node-pre-gyp": "0.10.0"
-+=======
-+        "nan": "^2.9.2",
-+        "node-pre-gyp": "^0.10.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "abbrev": {
-@@ -3880,7 +5235,11 @@
-     "function-bind": {
-       "version": "1.1.1",
-       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0=",
-+=======
-+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "generate-function": {
-@@ -3895,7 +5254,11 @@
-       "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "is-property": "1.0.2"
-+=======
-+        "is-property": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "get-caller-file": {
-@@ -3910,11 +5273,19 @@
-       "integrity": "sha1-xztInAbYDMVTbCyFP54FIyBWly0=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "hosted-git-info": "2.6.0",
-         "meow": "3.7.0",
-         "normalize-package-data": "2.4.0",
-         "parse-github-repo-url": "1.4.1",
-         "through2": "2.0.3"
-+=======
-+        "hosted-git-info": "^2.1.4",
-+        "meow": "^3.3.0",
-+        "normalize-package-data": "^2.3.0",
-+        "parse-github-repo-url": "^1.3.0",
-+        "through2": "^2.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "camelcase": {
-@@ -3929,8 +5300,13 @@
-           "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "camelcase": "2.1.1",
-             "map-obj": "1.0.1"
-+=======
-+            "camelcase": "^2.0.0",
-+            "map-obj": "^1.0.0"
-+>>>>>>> .their
-           }
-         },
-         "indent-string": {
-@@ -3939,7 +5315,11 @@
-           "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "repeating": "2.0.1"
-+=======
-+            "repeating": "^2.0.0"
-+>>>>>>> .their
-           }
-         },
-         "map-obj": {
-@@ -3954,6 +5334,7 @@
-           "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "camelcase-keys": "2.1.0",
-             "decamelize": "1.2.0",
-             "loud-rejection": "1.6.0",
-@@ -3964,6 +5345,18 @@
-             "read-pkg-up": "1.0.1",
-             "redent": "1.0.0",
-             "trim-newlines": "1.0.0"
-+=======
-+            "camelcase-keys": "^2.0.0",
-+            "decamelize": "^1.1.2",
-+            "loud-rejection": "^1.0.0",
-+            "map-obj": "^1.0.1",
-+            "minimist": "^1.1.3",
-+            "normalize-package-data": "^2.3.4",
-+            "object-assign": "^4.0.1",
-+            "read-pkg-up": "^1.0.1",
-+            "redent": "^1.0.0",
-+            "trim-newlines": "^1.0.0"
-+>>>>>>> .their
-           }
-         },
-         "redent": {
-@@ -3972,8 +5365,13 @@
-           "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "indent-string": "2.1.0",
-             "strip-indent": "1.0.1"
-+=======
-+            "indent-string": "^2.1.0",
-+            "strip-indent": "^1.0.1"
-+>>>>>>> .their
-           }
-         },
-         "strip-indent": {
-@@ -3982,7 +5380,11 @@
-           "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "get-stdin": "4.0.1"
-+=======
-+            "get-stdin": "^4.0.1"
-+>>>>>>> .their
-           }
-         },
-         "trim-newlines": {
-@@ -4011,7 +5413,11 @@
-       "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "assert-plus": "1.0.0"
-+=======
-+        "assert-plus": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "git-raw-commits": {
-@@ -4020,11 +5426,19 @@
-       "integrity": "sha512-svsK26tQ8vEKnMshTDatSIQSMDdz8CxIIqKsvPqbtV23Etmw6VNaFAitu8zwZ0VrOne7FztwPyRLxK7/DIUTQg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "dargs": "4.1.0",
-         "lodash.template": "4.4.0",
-         "meow": "4.0.1",
-         "split2": "2.2.0",
-         "through2": "2.0.3"
-+=======
-+        "dargs": "^4.0.1",
-+        "lodash.template": "^4.0.2",
-+        "meow": "^4.0.0",
-+        "split2": "^2.0.0",
-+        "through2": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "git-remote-origin-url": {
-@@ -4033,8 +5447,13 @@
-       "integrity": "sha1-UoJlna4hBxRaERJhEq0yFuxfpl8=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "gitconfiglocal": "1.0.0",
-         "pify": "2.3.0"
-+=======
-+        "gitconfiglocal": "^1.0.0",
-+        "pify": "^2.3.0"
-+>>>>>>> .their
-       }
-     },
-     "git-semver-tags": {
-@@ -4043,8 +5462,13 @@
-       "integrity": "sha512-2jHlJnln4D/ECk9FxGEBh3k44wgYdWjWDtMmJPaecjoRmxKo3Y1Lh8GMYuOPu04CHw86NTAODchYjC5pnpMQig==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "meow": "4.0.1",
-         "semver": "5.5.0"
-+=======
-+        "meow": "^4.0.0",
-+        "semver": "^5.5.0"
-+>>>>>>> .their
-       }
-     },
-     "gitconfiglocal": {
-@@ -4053,12 +5477,17 @@
-       "integrity": "sha1-QdBF84UaXqiPA/JMocYXgRRGS5s=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "ini": "1.3.5"
-+=======
-+        "ini": "^1.3.2"
-+>>>>>>> .their
-       }
-     },
-     "github": {
-       "version": "9.3.1",
-       "resolved": "https://registry.npmjs.org/github/-/github-9.3.1.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-ajxanMKhzQtdCXpHuu+50Ryu+J4=",
-       "dev": true,
-       "requires": {
-@@ -4066,6 +5495,15 @@
-         "https-proxy-agent": "1.0.0",
-         "mime": "1.6.0",
-         "netrc": "0.1.4"
-+=======
-+      "integrity": "sha512-LvVb6iR8/7bqYgj0VeAtqys0t427jwIBkv/+or/ssypfIk5R1fnz4aeIEv4udPw6VFoH6vL4gi+foBoD5aazXg==",
-+      "dev": true,
-+      "requires": {
-+        "follow-redirects": "0.0.7",
-+        "https-proxy-agent": "^1.0.0",
-+        "mime": "^1.2.11",
-+        "netrc": "^0.1.4"
-+>>>>>>> .their
-       }
-     },
-     "glob": {
-@@ -4074,11 +5512,19 @@
-       "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "inflight": "1.0.6",
-         "inherits": "2.0.3",
-         "minimatch": "3.0.4",
-         "once": "1.4.0",
-         "path-is-absolute": "1.0.1"
-+=======
-+        "inflight": "^1.0.4",
-+        "inherits": "2",
-+        "minimatch": "2 || 3",
-+        "once": "^1.3.0",
-+        "path-is-absolute": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "glob-base": {
-@@ -4087,8 +5533,13 @@
-       "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "glob-parent": "2.0.0",
-         "is-glob": "2.0.1"
-+=======
-+        "glob-parent": "^2.0.0",
-+        "is-glob": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "glob-parent": {
-@@ -4097,7 +5548,11 @@
-       "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "is-glob": "2.0.1"
-+=======
-+        "is-glob": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "global-dirs": {
-@@ -4106,13 +5561,21 @@
-       "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "ini": "1.3.5"
-+=======
-+        "ini": "^1.3.4"
-+>>>>>>> .their
-       }
-     },
-     "globals": {
-       "version": "9.18.0",
-       "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-qjiWs+abSH8X4x7SFD1pqOMMLYo=",
-+=======
-+      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "globby": {
-@@ -4121,17 +5584,27 @@
-       "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "array-union": "1.0.2",
-         "arrify": "1.0.1",
-         "glob": "7.1.2",
-         "object-assign": "4.1.1",
-         "pify": "2.3.0",
-         "pinkie-promise": "2.0.1"
-+=======
-+        "array-union": "^1.0.1",
-+        "arrify": "^1.0.0",
-+        "glob": "^7.0.3",
-+        "object-assign": "^4.0.1",
-+        "pify": "^2.0.0",
-+        "pinkie-promise": "^2.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-           "dev": true,
-           "requires": {
-@@ -4141,6 +5614,17 @@
-             "minimatch": "3.0.4",
-             "once": "1.4.0",
-             "path-is-absolute": "1.0.1"
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+          "dev": true,
-+          "requires": {
-+            "fs.realpath": "^1.0.0",
-+            "inflight": "^1.0.4",
-+            "inherits": "2",
-+            "minimatch": "^3.0.4",
-+            "once": "^1.3.0",
-+            "path-is-absolute": "^1.0.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -4151,6 +5635,7 @@
-       "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "create-error-class": "3.0.2",
-         "duplexer3": "0.1.4",
-         "get-stream": "3.0.0",
-@@ -4162,6 +5647,19 @@
-         "timed-out": "4.0.1",
-         "unzip-response": "2.0.1",
-         "url-parse-lax": "1.0.0"
-+=======
-+        "create-error-class": "^3.0.0",
-+        "duplexer3": "^0.1.4",
-+        "get-stream": "^3.0.0",
-+        "is-redirect": "^1.0.0",
-+        "is-retry-allowed": "^1.0.0",
-+        "is-stream": "^1.0.0",
-+        "lowercase-keys": "^1.0.0",
-+        "safe-buffer": "^5.0.1",
-+        "timed-out": "^4.0.0",
-+        "unzip-response": "^2.0.1",
-+        "url-parse-lax": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "graceful-fs": {
-@@ -4173,6 +5671,7 @@
-     "gunzip-maybe": {
-       "version": "1.4.1",
-       "resolved": "https://registry.npmjs.org/gunzip-maybe/-/gunzip-maybe-1.4.1.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-Occu2J0bSbpwjhh3ZQBIiQKlICc=",
-       "dev": true,
-       "requires": {
-@@ -4182,6 +5681,17 @@
-         "peek-stream": "1.1.3",
-         "pumpify": "1.5.0",
-         "through2": "2.0.3"
-+=======
-+      "integrity": "sha512-qtutIKMthNJJgeHQS7kZ9FqDq59/Wn0G2HYCRNjpup7yKfVI6/eqwpmroyZGFoCYaG+sW6psNVb4zoLADHpp2g==",
-+      "dev": true,
-+      "requires": {
-+        "browserify-zlib": "^0.1.4",
-+        "is-deflate": "^1.0.0",
-+        "is-gzip": "^1.0.0",
-+        "peek-stream": "^1.1.0",
-+        "pumpify": "^1.3.3",
-+        "through2": "^2.0.3"
-+>>>>>>> .their
-       }
-     },
-     "handlebars": {
-@@ -4190,10 +5700,17 @@
-       "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "async": "1.5.2",
-         "optimist": "0.6.1",
-         "source-map": "0.4.4",
-         "uglify-js": "2.8.29"
-+=======
-+        "async": "^1.4.0",
-+        "optimist": "^0.6.1",
-+        "source-map": "^0.4.4",
-+        "uglify-js": "^2.6"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "minimist": {
-@@ -4208,8 +5725,13 @@
-           "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "minimist": "0.0.10",
-             "wordwrap": "0.0.3"
-+=======
-+            "minimist": "~0.0.1",
-+            "wordwrap": "~0.0.2"
-+>>>>>>> .their
-           }
-         },
-         "source-map": {
-@@ -4218,7 +5740,11 @@
-           "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "amdefine": "1.0.1"
-+=======
-+            "amdefine": ">=0.0.4"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -4235,8 +5761,13 @@
-       "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "ajv": "5.5.2",
-         "har-schema": "2.0.0"
-+=======
-+        "ajv": "^5.1.0",
-+        "har-schema": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "has": {
-@@ -4245,7 +5776,11 @@
-       "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "function-bind": "1.1.1"
-+=======
-+        "function-bind": "^1.0.2"
-+>>>>>>> .their
-       }
-     },
-     "has-ansi": {
-@@ -4254,7 +5789,11 @@
-       "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "ansi-regex": "2.1.1"
-+=======
-+        "ansi-regex": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "has-flag": {
-@@ -4275,23 +5814,37 @@
-       "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "inherits": "2.0.3",
-         "safe-buffer": "5.1.2"
-+=======
-+        "inherits": "^2.0.1",
-+        "safe-buffer": "^5.0.1"
-+>>>>>>> .their
-       }
-     },
-     "hash.js": {
-       "version": "1.1.3",
-       "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-NA3tvmKQGHFRweodd3o0SJNd+EY=",
-       "dev": true,
-       "requires": {
-         "inherits": "2.0.3",
-         "minimalistic-assert": "1.0.1"
-+=======
-+      "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==",
-+      "dev": true,
-+      "requires": {
-+        "inherits": "^2.0.3",
-+        "minimalistic-assert": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "hawk": {
-       "version": "6.0.2",
-       "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-r02RTrBl+bXOTZ0RwcshJu7MMDg=",
-       "dev": true,
-       "requires": {
-@@ -4299,6 +5852,15 @@
-         "cryptiles": "3.1.2",
-         "hoek": "4.2.1",
-         "sntp": "2.1.0"
-+=======
-+      "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
-+      "dev": true,
-+      "requires": {
-+        "boom": "4.x.x",
-+        "cryptiles": "3.x.x",
-+        "hoek": "4.x.x",
-+        "sntp": "2.x.x"
-+>>>>>>> .their
-       }
-     },
-     "hmac-drbg": {
-@@ -4307,9 +5869,15 @@
-       "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "hash.js": "1.1.3",
-         "minimalistic-assert": "1.0.1",
-         "minimalistic-crypto-utils": "1.0.1"
-+=======
-+        "hash.js": "^1.0.3",
-+        "minimalistic-assert": "^1.0.0",
-+        "minimalistic-crypto-utils": "^1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "hoek": {
-@@ -4324,12 +5892,15 @@
-       "integrity": "sha512-lIbgIIQA3lz5XaB6vxakj6sDHADJiZadYEJB+FgA+C4nubM1NwcuvUr9EJPmnH1skZqpqUzWborWo8EIUi0Sdw==",
-       "dev": true
-     },
-+<<<<<<< .our
-     "html-entities": {
-       "version": "1.2.1",
-       "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz",
-       "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=",
-       "dev": true
-     },
-+=======
-+>>>>>>> .their
-     "htmlescape": {
-       "version": "1.1.1",
-       "resolved": "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz",
-@@ -4342,12 +5913,21 @@
-       "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "domelementtype": "1.3.0",
-         "domhandler": "2.4.2",
-         "domutils": "1.5.1",
-         "entities": "1.1.1",
-         "inherits": "2.0.3",
-         "readable-stream": "2.3.6"
-+=======
-+        "domelementtype": "^1.3.0",
-+        "domhandler": "^2.3.0",
-+        "domutils": "^1.5.1",
-+        "entities": "^1.1.1",
-+        "inherits": "^2.0.1",
-+        "readable-stream": "^2.0.2"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -4362,6 +5942,7 @@
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-@@ -4369,6 +5950,15 @@
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-+=======
-+            "core-util-is": "~1.0.0",
-+            "inherits": "~2.0.3",
-+            "isarray": "~1.0.0",
-+            "process-nextick-args": "~2.0.0",
-+            "safe-buffer": "~5.1.1",
-+            "string_decoder": "~1.1.1",
-+            "util-deprecate": "~1.0.1"
-+>>>>>>> .their
-           }
-         },
-         "string_decoder": {
-@@ -4377,7 +5967,11 @@
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "safe-buffer": "5.1.2"
-+=======
-+            "safe-buffer": "~5.1.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -4391,7 +5985,11 @@
-         "depd": "1.1.1",
-         "inherits": "2.0.3",
-         "setprototypeof": "1.0.3",
-+<<<<<<< .our
-         "statuses": "1.5.0"
-+=======
-+        "statuses": ">= 1.3.1 < 2"
-+>>>>>>> .their
-       }
-     },
-     "http-signature": {
-@@ -4400,9 +5998,15 @@
-       "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "assert-plus": "1.0.0",
-         "jsprim": "1.4.1",
-         "sshpk": "1.14.1"
-+=======
-+        "assert-plus": "^1.0.0",
-+        "jsprim": "^1.2.2",
-+        "sshpk": "^1.7.0"
-+>>>>>>> .their
-       }
-     },
-     "https-browserify": {
-@@ -4417,20 +6021,35 @@
-       "integrity": "sha1-NffabEjOTdv6JkiRrFk+5f+GceY=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "agent-base": "2.1.1",
-         "debug": "2.6.9",
-         "extend": "3.0.1"
-+=======
-+        "agent-base": "2",
-+        "debug": "2",
-+        "extend": "3"
-+>>>>>>> .their
-       }
-     },
-     "husky": {
-       "version": "0.14.3",
-       "resolved": "https://registry.npmjs.org/husky/-/husky-0.14.3.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-xp7XTi0neXaaF7qDmbVM4LY8EsM=",
-       "dev": true,
-       "requires": {
-         "is-ci": "1.1.0",
-         "normalize-path": "1.0.0",
-         "strip-indent": "2.0.0"
-+=======
-+      "integrity": "sha512-e21wivqHpstpoiWA/Yi8eFti8E+sQDSS53cpJsPptPs295QTOQR0ZwnHo2TXy1XOpZFD9rPOd3NpmqTK6uMLJA==",
-+      "dev": true,
-+      "requires": {
-+        "is-ci": "^1.0.10",
-+        "normalize-path": "^1.0.0",
-+        "strip-indent": "^2.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "normalize-path": {
-@@ -4489,8 +6108,13 @@
-       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "once": "1.4.0",
-         "wrappy": "1.0.2"
-+=======
-+        "once": "^1.3.0",
-+        "wrappy": "1"
-+>>>>>>> .their
-       }
-     },
-     "inherits": {
-@@ -4511,7 +6135,11 @@
-       "integrity": "sha1-+Tk0ccGKedFyT4Y/o4tYY3Ct4qU=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "source-map": "0.5.7"
-+=======
-+        "source-map": "~0.5.3"
-+>>>>>>> .their
-       }
-     },
-     "inquirer": {
-@@ -4520,6 +6148,7 @@
-       "integrity": "sha1-HvK/1jUE3wvHV4X/+MLEHfEvB34=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "ansi-escapes": "1.4.0",
-         "ansi-regex": "2.1.1",
-         "chalk": "1.1.3",
-@@ -4533,6 +6162,21 @@
-         "string-width": "1.0.2",
-         "strip-ansi": "3.0.1",
-         "through": "2.3.8"
-+=======
-+        "ansi-escapes": "^1.1.0",
-+        "ansi-regex": "^2.0.0",
-+        "chalk": "^1.0.0",
-+        "cli-cursor": "^1.0.1",
-+        "cli-width": "^2.0.0",
-+        "figures": "^1.3.5",
-+        "lodash": "^4.3.0",
-+        "readline2": "^1.0.1",
-+        "run-async": "^0.1.0",
-+        "rx-lite": "^3.1.2",
-+        "string-width": "^1.0.1",
-+        "strip-ansi": "^3.0.0",
-+        "through": "^2.3.6"
-+>>>>>>> .their
-       }
-     },
-     "insert-module-globals": {
-@@ -4541,6 +6185,7 @@
-       "integrity": "sha512-R3sidKJr3SsggqQQ5cEwQb3pWG8RNx0UnpyeiOSR6jorRIeAOzH2gkTWnNdMnyRiVbjrG047K7UCtlMkQ1Mo9w==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "JSONStream": "1.3.2",
-         "combine-source-map": "0.8.0",
-         "concat-stream": "1.6.2",
-@@ -4550,6 +6195,17 @@
-         "process": "0.11.10",
-         "through2": "2.0.3",
-         "xtend": "4.0.1"
-+=======
-+        "JSONStream": "^1.0.3",
-+        "combine-source-map": "^0.8.0",
-+        "concat-stream": "^1.6.1",
-+        "is-buffer": "^1.1.0",
-+        "lexical-scope": "^1.2.0",
-+        "path-is-absolute": "^1.0.1",
-+        "process": "~0.11.0",
-+        "through2": "^2.0.0",
-+        "xtend": "^4.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "concat-stream": {
-@@ -4558,10 +6214,17 @@
-           "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "buffer-from": "1.0.0",
-             "inherits": "2.0.3",
-             "readable-stream": "2.3.6",
-             "typedarray": "0.0.6"
-+=======
-+            "buffer-from": "^1.0.0",
-+            "inherits": "^2.0.3",
-+            "readable-stream": "^2.2.2",
-+            "typedarray": "^0.0.6"
-+>>>>>>> .their
-           }
-         },
-         "isarray": {
-@@ -4576,6 +6239,7 @@
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-@@ -4583,6 +6247,15 @@
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-+=======
-+            "core-util-is": "~1.0.0",
-+            "inherits": "~2.0.3",
-+            "isarray": "~1.0.0",
-+            "process-nextick-args": "~2.0.0",
-+            "safe-buffer": "~5.1.1",
-+            "string_decoder": "~1.1.1",
-+            "util-deprecate": "~1.0.1"
-+>>>>>>> .their
-           }
-         },
-         "string_decoder": {
-@@ -4591,7 +6264,11 @@
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "safe-buffer": "5.1.2"
-+=======
-+            "safe-buffer": "~5.1.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -4638,8 +6315,13 @@
-       "integrity": "sha512-pyfU/0kHdISIgslFfZN9nfY1Gk3MquQgUm1mJTjdkEPpkAKNWuBTSqFwewOpR7N351VkErCiyV71zX7mlQQqsg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "is-alphabetical": "1.0.2",
-         "is-decimal": "1.0.2"
-+=======
-+        "is-alphabetical": "^1.0.0",
-+        "is-decimal": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "is-arrayish": {
-@@ -4654,7 +6336,11 @@
-       "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "binary-extensions": "1.11.0"
-+=======
-+        "binary-extensions": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "is-buffer": {
-@@ -4669,7 +6355,11 @@
-       "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "builtin-modules": "1.1.1"
-+=======
-+        "builtin-modules": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "is-callable": {
-@@ -4684,7 +6374,11 @@
-       "integrity": "sha512-c7TnwxLePuqIlxHgr7xtxzycJPegNHFuIrBkwbf8hc58//+Op1CqFkyS+xnIMkwn9UsJIwc174BIjkyBmSpjKg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "ci-info": "1.1.3"
-+=======
-+        "ci-info": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "is-date-object": {
-@@ -4723,7 +6417,11 @@
-       "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "is-primitive": "2.0.0"
-+=======
-+        "is-primitive": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "is-extendable": {
-@@ -4750,7 +6448,11 @@
-       "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "number-is-nan": "1.0.1"
-+=======
-+        "number-is-nan": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "is-fullwidth-code-point": {
-@@ -4759,7 +6461,11 @@
-       "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "number-is-nan": "1.0.1"
-+=======
-+        "number-is-nan": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "is-glob": {
-@@ -4768,7 +6474,11 @@
-       "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "is-extglob": "1.0.0"
-+=======
-+        "is-extglob": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "is-gzip": {
-@@ -4795,8 +6505,13 @@
-       "integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "global-dirs": "0.1.1",
-         "is-path-inside": "1.0.1"
-+=======
-+        "global-dirs": "^0.1.0",
-+        "is-path-inside": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "is-my-ip-valid": {
-@@ -4811,11 +6526,19 @@
-       "integrity": "sha512-IBhBslgngMQN8DDSppmgDv7RNrlFotuuDsKcrCP3+HbFaVivIBU7u9oiiErw8sH4ynx3+gOGQ3q2otkgiSi6kg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "generate-function": "2.0.0",
-         "generate-object-property": "1.2.0",
-         "is-my-ip-valid": "1.0.0",
-         "jsonpointer": "4.0.1",
-         "xtend": "4.0.1"
-+=======
-+        "generate-function": "^2.0.0",
-+        "generate-object-property": "^1.1.0",
-+        "is-my-ip-valid": "^1.0.0",
-+        "jsonpointer": "^4.0.0",
-+        "xtend": "^4.0.0"
-+>>>>>>> .their
-       }
-     },
-     "is-npm": {
-@@ -4830,7 +6553,11 @@
-       "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "kind-of": "3.2.2"
-+=======
-+        "kind-of": "^3.0.2"
-+>>>>>>> .their
-       }
-     },
-     "is-obj": {
-@@ -4857,7 +6584,11 @@
-       "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "is-path-inside": "1.0.1"
-+=======
-+        "is-path-inside": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "is-path-inside": {
-@@ -4866,7 +6597,11 @@
-       "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "path-is-inside": "1.0.2"
-+=======
-+        "path-is-inside": "^1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "is-plain-obj": {
-@@ -4905,7 +6640,11 @@
-       "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "has": "1.0.1"
-+=======
-+        "has": "^1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "is-resolvable": {
-@@ -4944,7 +6683,11 @@
-       "integrity": "sha1-Thqg+1G/vLPpJogAE5cgLBd1tm4=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "text-extensions": "1.7.0"
-+=======
-+        "text-extensions": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "is-typedarray": {
-@@ -5018,6 +6761,7 @@
-       "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "abbrev": "1.0.9",
-         "async": "1.5.2",
-         "escodegen": "1.8.1",
-@@ -5032,6 +6776,22 @@
-         "supports-color": "3.2.3",
-         "which": "1.3.0",
-         "wordwrap": "1.0.0"
-+=======
-+        "abbrev": "1.0.x",
-+        "async": "1.x",
-+        "escodegen": "1.8.x",
-+        "esprima": "2.7.x",
-+        "glob": "^5.0.15",
-+        "handlebars": "^4.0.1",
-+        "js-yaml": "3.x",
-+        "mkdirp": "0.5.x",
-+        "nopt": "3.x",
-+        "once": "1.x",
-+        "resolve": "1.1.x",
-+        "supports-color": "^3.1.0",
-+        "which": "^1.1.1",
-+        "wordwrap": "^1.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "abbrev": {
-@@ -5046,11 +6806,19 @@
-           "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "inflight": "1.0.6",
-             "inherits": "2.0.3",
-             "minimatch": "3.0.4",
-             "once": "1.4.0",
-             "path-is-absolute": "1.0.1"
-+=======
-+            "inflight": "^1.0.4",
-+            "inherits": "2",
-+            "minimatch": "2 || 3",
-+            "once": "^1.3.0",
-+            "path-is-absolute": "^1.0.0"
-+>>>>>>> .their
-           }
-         },
-         "resolve": {
-@@ -5079,14 +6847,23 @@
-       "integrity": "sha512-saJstZWv7oNeOyBh3+Dx1qWzhW0+e6/8eDzo7p5rDFqxntSztloLtuKu+Ejhtq82jsilwOIZYsCz+lIjthg1Hw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "argparse": "1.0.10",
-         "esprima": "4.0.0"
-+=======
-+        "argparse": "^1.0.7",
-+        "esprima": "^4.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "esprima": {
-           "version": "4.0.0",
-           "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-RJnt3NERDgshi6zy+n9/WfVcqAQ=",
-+=======
-+          "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==",
-+>>>>>>> .their
-           "dev": true
-         }
-       }
-@@ -5105,6 +6882,7 @@
-       "dev": true,
-       "optional": true,
-       "requires": {
-+<<<<<<< .our
-         "abab": "1.0.4",
-         "acorn": "2.7.0",
-         "acorn-globals": "1.0.9",
-@@ -5120,6 +6898,23 @@
-         "webidl-conversions": "2.0.1",
-         "whatwg-url-compat": "0.6.5",
-         "xml-name-validator": "2.0.1"
-+=======
-+        "abab": "^1.0.0",
-+        "acorn": "^2.4.0",
-+        "acorn-globals": "^1.0.4",
-+        "cssom": ">= 0.3.0 < 0.4.0",
-+        "cssstyle": ">= 0.2.29 < 0.3.0",
-+        "escodegen": "^1.6.1",
-+        "nwmatcher": ">= 1.3.7 < 2.0.0",
-+        "parse5": "^1.5.1",
-+        "request": "^2.55.0",
-+        "sax": "^1.1.4",
-+        "symbol-tree": ">= 3.1.0 < 4.0.0",
-+        "tough-cookie": "^2.2.0",
-+        "webidl-conversions": "^2.0.0",
-+        "whatwg-url-compat": "~0.6.5",
-+        "xml-name-validator": ">= 2.0.1 < 3.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "acorn": {
-@@ -5155,7 +6950,11 @@
-       "integrity": "sha1-YRwj6BTbN1Un34URk9tZ3Sryf0U=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "jsonify": "0.0.0"
-+=======
-+        "jsonify": "~0.0.0"
-+>>>>>>> .their
-       }
-     },
-     "json-stringify-safe": {
-@@ -5170,7 +6969,11 @@
-       "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "graceful-fs": "4.1.11"
-+=======
-+        "graceful-fs": "^4.1.6"
-+>>>>>>> .their
-       }
-     },
-     "jsonify": {
-@@ -5221,7 +7024,11 @@
-       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "is-buffer": "1.1.6"
-+=======
-+        "is-buffer": "^1.1.5"
-+>>>>>>> .their
-       }
-     },
-     "klaw": {
-@@ -5230,7 +7037,11 @@
-       "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "graceful-fs": "4.1.11"
-+=======
-+        "graceful-fs": "^4.1.9"
-+>>>>>>> .their
-       }
-     },
-     "labeled-stream-splicer": {
-@@ -5239,9 +7050,15 @@
-       "integrity": "sha512-MC94mHZRvJ3LfykJlTUipBqenZz1pacOZEMhhQ8dMGcDHs0SBE5GbsavUXV7YtP3icBW17W0Zy1I0lfASmo9Pg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "inherits": "2.0.3",
-         "isarray": "2.0.4",
-         "stream-splicer": "2.0.0"
-+=======
-+        "inherits": "^2.0.1",
-+        "isarray": "^2.0.4",
-+        "stream-splicer": "^2.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -5258,7 +7075,11 @@
-       "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "package-json": "4.0.1"
-+=======
-+        "package-json": "^4.0.0"
-+>>>>>>> .their
-       }
-     },
-     "lazy-cache": {
-@@ -5274,7 +7095,11 @@
-       "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "invert-kv": "1.0.0"
-+=======
-+        "invert-kv": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "leven": {
-@@ -5289,8 +7114,13 @@
-       "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "prelude-ls": "1.1.2",
-         "type-check": "0.3.2"
-+=======
-+        "prelude-ls": "~1.1.2",
-+        "type-check": "~0.3.2"
-+>>>>>>> .their
-       }
-     },
-     "lexical-scope": {
-@@ -5299,7 +7129,11 @@
-       "integrity": "sha1-/Ope3HBKSzqHls3KQZw6CvryLfQ=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "astw": "2.2.0"
-+=======
-+        "astw": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "linkify-it": {
-@@ -5308,7 +7142,11 @@
-       "integrity": "sha1-B3NSbDF8j9E71TTuHRgP+Iq/iBo=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "uc.micro": "1.0.5"
-+=======
-+        "uc.micro": "^1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "lint": {
-@@ -5323,11 +7161,19 @@
-       "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "graceful-fs": "4.1.11",
-         "parse-json": "2.2.0",
-         "pify": "2.3.0",
-         "pinkie-promise": "2.0.1",
-         "strip-bom": "2.0.0"
-+=======
-+        "graceful-fs": "^4.1.2",
-+        "parse-json": "^2.2.0",
-+        "pify": "^2.0.0",
-+        "pinkie-promise": "^2.0.0",
-+        "strip-bom": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "load-plugin": {
-@@ -5336,8 +7182,13 @@
-       "integrity": "sha512-FYzamtURIJefQykZGtiClYuZkJBUKzmx8Tc74y8JGAulDzbzVm/C+w/MbAljHRr+REL0cRzy3WgnHE+T8gce5g==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "npm-prefix": "1.2.0",
-         "resolve-from": "4.0.0"
-+=======
-+        "npm-prefix": "^1.2.0",
-+        "resolve-from": "^4.0.0"
-+>>>>>>> .their
-       }
-     },
-     "locate-path": {
-@@ -5346,8 +7197,13 @@
-       "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "p-locate": "2.0.0",
-         "path-exists": "3.0.0"
-+=======
-+        "p-locate": "^2.0.0",
-+        "path-exists": "^3.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "path-exists": {
-@@ -5484,8 +7340,13 @@
-       "integrity": "sha1-5zoDhcg1VZF0bgILmWecaQ5o+6A=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "lodash._reinterpolate": "3.0.0",
-         "lodash.templatesettings": "4.1.0"
-+=======
-+        "lodash._reinterpolate": "~3.0.0",
-+        "lodash.templatesettings": "^4.0.0"
-+>>>>>>> .their
-       }
-     },
-     "lodash.templatesettings": {
-@@ -5494,7 +7355,11 @@
-       "integrity": "sha1-K01OlbpEDZFf8IvImeRVNmZxMxY=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "lodash._reinterpolate": "3.0.0"
-+=======
-+        "lodash._reinterpolate": "~3.0.0"
-+>>>>>>> .their
-       }
-     },
-     "lodash.transform": {
-@@ -5509,7 +7374,11 @@
-       "integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "chalk": "1.1.3"
-+=======
-+        "chalk": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "longest": {
-@@ -5530,8 +7399,13 @@
-       "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "currently-unhandled": "0.4.1",
-         "signal-exit": "3.0.2"
-+=======
-+        "currently-unhandled": "^0.4.1",
-+        "signal-exit": "^3.0.0"
-+>>>>>>> .their
-       }
-     },
-     "lowercase-keys": {
-@@ -5546,8 +7420,13 @@
-       "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "pseudomap": "1.0.2",
-         "yallist": "2.1.2"
-+=======
-+        "pseudomap": "^1.0.2",
-+        "yallist": "^2.1.2"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "yallist": {
-@@ -5564,7 +7443,11 @@
-       "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "pify": "3.0.0"
-+=======
-+        "pify": "^3.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "pify": {
-@@ -5599,11 +7482,19 @@
-       "integrity": "sha1-ztA39Ec+6fUVOsQU933IPJG6knw=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "argparse": "1.0.10",
-         "entities": "1.1.1",
-         "linkify-it": "1.2.4",
-         "mdurl": "1.0.1",
-         "uc.micro": "1.0.5"
-+=======
-+        "argparse": "^1.0.7",
-+        "entities": "~1.1.1",
-+        "linkify-it": "~1.2.2",
-+        "mdurl": "~1.0.1",
-+        "uc.micro": "^1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "markdown-it-named-headers": {
-@@ -5612,7 +7503,11 @@
-       "integrity": "sha1-gu/CgyQkCmsed7mq5QF3HV81HB8=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "string": "3.3.3"
-+=======
-+        "string": "^3.0.1"
-+>>>>>>> .their
-       }
-     },
-     "markdown-table": {
-@@ -5627,10 +7522,17 @@
-       "integrity": "sha1-dO2phLgTZVfe4QZO/RXkBhdAaZc=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "cheerio": "0.20.0",
-         "conventional-changelog-cli": "1.3.22",
-         "is-file": "1.0.0",
-         "markdown-it": "6.1.1",
-+=======
-+        "cheerio": "^0.20.0",
-+        "conventional-changelog-cli": "^1.2.0",
-+        "is-file": "^1.0.0",
-+        "markdown-it": "^6.0.1",
-+>>>>>>> .their
-         "markdown-it-named-headers": "0.0.4"
-       },
-       "dependencies": {
-@@ -5640,12 +7542,21 @@
-           "integrity": "sha1-XHEPK6uVZTJyhCugHG6mGzVF7DU=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "css-select": "1.2.0",
-             "dom-serializer": "0.1.0",
-             "entities": "1.1.1",
-             "htmlparser2": "3.8.3",
-             "jsdom": "7.2.2",
-             "lodash": "4.17.10"
-+=======
-+            "css-select": "~1.2.0",
-+            "dom-serializer": "~0.1.0",
-+            "entities": "~1.1.1",
-+            "htmlparser2": "~3.8.1",
-+            "jsdom": "^7.0.2",
-+            "lodash": "^4.1.0"
-+>>>>>>> .their
-           }
-         },
-         "domhandler": {
-@@ -5654,7 +7565,11 @@
-           "integrity": "sha1-LeWaCCLVAn+r/28DLCsloqir5zg=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "domelementtype": "1.3.0"
-+=======
-+            "domelementtype": "1"
-+>>>>>>> .their
-           }
-         },
-         "htmlparser2": {
-@@ -5663,11 +7578,19 @@
-           "integrity": "sha1-mWwosZFRaovoZQGn15dX5ccMEGg=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "domelementtype": "1.3.0",
-             "domhandler": "2.3.0",
-             "domutils": "1.5.1",
-             "entities": "1.0.0",
-             "readable-stream": "1.1.14"
-+=======
-+            "domelementtype": "1",
-+            "domhandler": "2.3",
-+            "domutils": "1.5",
-+            "entities": "1.0",
-+            "readable-stream": "1.1"
-+>>>>>>> .their
-           },
-           "dependencies": {
-             "entities": {
-@@ -5683,10 +7606,17 @@
-     "matcher-collection": {
-       "version": "1.0.5",
-       "resolved": "https://registry.npmjs.org/matcher-collection/-/matcher-collection-1.0.5.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-LuCVQ4Nyy4iE8FgjQTjAXGROwzk=",
-       "dev": true,
-       "requires": {
-         "minimatch": "3.0.4"
-+=======
-+      "integrity": "sha512-nUCmzKipcJEwYsBVAFh5P+d7JBuhJaW1xs85Hara9xuMLqtCVUrW6DSC0JVIkluxEH2W45nPBM/wjHtBXa/tYA==",
-+      "dev": true,
-+      "requires": {
-+        "minimatch": "^3.0.2"
-+>>>>>>> .their
-       }
-     },
-     "math-random": {
-@@ -5701,8 +7631,13 @@
-       "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "hash-base": "3.0.4",
-         "inherits": "2.0.3"
-+=======
-+        "hash-base": "^3.0.0",
-+        "inherits": "^2.0.1"
-+>>>>>>> .their
-       }
-     },
-     "mdast-comment-marker": {
-@@ -5717,8 +7652,13 @@
-       "integrity": "sha1-zbX4TitqLTEU3zO9BdnLMuPECDo=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unist-util-modify-children": "1.1.2",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unist-util-modify-children": "^1.0.0",
-+        "unist-util-visit": "^1.1.0"
-+>>>>>>> .their
-       }
-     },
-     "mdast-util-heading-style": {
-@@ -5745,6 +7685,7 @@
-       "integrity": "sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "camelcase-keys": "4.2.0",
-         "decamelize-keys": "1.1.0",
-         "loud-rejection": "1.6.0",
-@@ -5754,6 +7695,17 @@
-         "read-pkg-up": "3.0.0",
-         "redent": "2.0.0",
-         "trim-newlines": "2.0.0"
-+=======
-+        "camelcase-keys": "^4.0.0",
-+        "decamelize-keys": "^1.0.0",
-+        "loud-rejection": "^1.0.0",
-+        "minimist": "^1.1.3",
-+        "minimist-options": "^3.0.1",
-+        "normalize-package-data": "^2.3.4",
-+        "read-pkg-up": "^3.0.0",
-+        "redent": "^2.0.0",
-+        "trim-newlines": "^2.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "find-up": {
-@@ -5762,7 +7714,11 @@
-           "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "locate-path": "2.0.0"
-+=======
-+            "locate-path": "^2.0.0"
-+>>>>>>> .their
-           }
-         },
-         "load-json-file": {
-@@ -5771,10 +7727,17 @@
-           "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "graceful-fs": "4.1.11",
-             "parse-json": "4.0.0",
-             "pify": "3.0.0",
-             "strip-bom": "3.0.0"
-+=======
-+            "graceful-fs": "^4.1.2",
-+            "parse-json": "^4.0.0",
-+            "pify": "^3.0.0",
-+            "strip-bom": "^3.0.0"
-+>>>>>>> .their
-           }
-         },
-         "parse-json": {
-@@ -5783,8 +7746,13 @@
-           "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "error-ex": "1.3.1",
-             "json-parse-better-errors": "1.0.2"
-+=======
-+            "error-ex": "^1.3.1",
-+            "json-parse-better-errors": "^1.0.1"
-+>>>>>>> .their
-           }
-         },
-         "path-type": {
-@@ -5793,7 +7761,11 @@
-           "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "pify": "3.0.0"
-+=======
-+            "pify": "^3.0.0"
-+>>>>>>> .their
-           }
-         },
-         "pify": {
-@@ -5808,9 +7780,15 @@
-           "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "load-json-file": "4.0.0",
-             "normalize-package-data": "2.4.0",
-             "path-type": "3.0.0"
-+=======
-+            "load-json-file": "^4.0.0",
-+            "normalize-package-data": "^2.3.2",
-+            "path-type": "^3.0.0"
-+>>>>>>> .their
-           }
-         },
-         "read-pkg-up": {
-@@ -5819,8 +7797,13 @@
-           "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "find-up": "2.1.0",
-             "read-pkg": "3.0.0"
-+=======
-+            "find-up": "^2.0.0",
-+            "read-pkg": "^3.0.0"
-+>>>>>>> .their
-           }
-         },
-         "strip-bom": {
-@@ -5832,6 +7815,7 @@
-       }
-     },
-     "micro": {
-+<<<<<<< .our
-       "version": "9.3.1",
-       "resolved": "https://registry.npmjs.org/micro/-/micro-9.3.1.tgz",
-       "integrity": "sha512-83uimpPJqfwkfKvJl2WWontBlV3hmzrIgyJ+L2uhDXKNk7Ll+/ezK3zBz7TljubpKPqjM0JdT2Ker4MTPmhjgA==",
-@@ -5879,6 +7863,17 @@
-             "has-flag": "3.0.0"
-           }
-         }
-+=======
-+      "version": "9.1.4",
-+      "resolved": "https://registry.npmjs.org/micro/-/micro-9.1.4.tgz",
-+      "integrity": "sha512-2eQ5QpO33LAPQJ/1iA3BrtLzdYlOCAXlstY4vcIj3SEmv0tsWuNZpsfgn1o8xGAYzf15kb+FXnEx8EklXz+pPg==",
-+      "dev": true,
-+      "requires": {
-+        "content-type": "1.0.4",
-+        "is-stream": "1.1.0",
-+        "mri": "1.1.0",
-+        "raw-body": "2.3.2"
-+>>>>>>> .their
-       }
-     },
-     "micro-compress": {
-@@ -5887,7 +7882,11 @@
-       "integrity": "sha1-U/WoC0rQMgyhZaVZtuPfFF1PcE8=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "compression": "1.7.3"
-+=======
-+        "compression": "^1.6.2"
-+>>>>>>> .their
-       }
-     },
-     "micromatch": {
-@@ -5896,6 +7895,7 @@
-       "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "arr-diff": "2.0.0",
-         "array-unique": "0.2.1",
-         "braces": "1.8.5",
-@@ -5909,16 +7909,39 @@
-         "object.omit": "2.0.1",
-         "parse-glob": "3.0.4",
-         "regex-cache": "0.4.4"
-+=======
-+        "arr-diff": "^2.0.0",
-+        "array-unique": "^0.2.1",
-+        "braces": "^1.8.2",
-+        "expand-brackets": "^0.1.4",
-+        "extglob": "^0.3.1",
-+        "filename-regex": "^2.0.0",
-+        "is-extglob": "^1.0.0",
-+        "is-glob": "^2.0.1",
-+        "kind-of": "^3.0.2",
-+        "normalize-path": "^2.0.1",
-+        "object.omit": "^2.0.0",
-+        "parse-glob": "^3.0.4",
-+        "regex-cache": "^0.4.2"
-+>>>>>>> .their
-       }
-     },
-     "miller-rabin": {
-       "version": "4.0.1",
-       "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-8IA1HIZbDcViqEYpZtqlNUPHik0=",
-       "dev": true,
-       "requires": {
-         "bn.js": "4.11.8",
-         "brorand": "1.1.0"
-+=======
-+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
-+      "dev": true,
-+      "requires": {
-+        "bn.js": "^4.0.0",
-+        "brorand": "^1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "mime": {
-@@ -5939,7 +7962,11 @@
-       "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "mime-db": "1.33.0"
-+=======
-+        "mime-db": "~1.33.0"
-+>>>>>>> .their
-       }
-     },
-     "mimic-fn": {
-@@ -5963,10 +7990,17 @@
-     "minimatch": {
-       "version": "3.0.4",
-       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
-       "dev": true,
-       "requires": {
-         "brace-expansion": "1.1.11"
-+=======
-+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-+      "dev": true,
-+      "requires": {
-+        "brace-expansion": "^1.1.7"
-+>>>>>>> .their
-       }
-     },
-     "minimist": {
-@@ -5981,8 +8015,13 @@
-       "integrity": "sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "arrify": "1.0.1",
-         "is-plain-obj": "1.1.0"
-+=======
-+        "arrify": "^1.0.1",
-+        "is-plain-obj": "^1.1.0"
-+>>>>>>> .their
-       }
-     },
-     "minipass": {
-@@ -5991,8 +8030,13 @@
-       "integrity": "sha512-jWC2Eg+Np4bxah7llu1IrUNSJQxtLz/J+pOjTM0nFpJXGAaV18XBWhUn031Q1tAA/TJtA1jgwnOe9S2PQa4Lbg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "safe-buffer": "5.1.2",
-         "yallist": "3.0.2"
-+=======
-+        "safe-buffer": "^5.1.1",
-+        "yallist": "^3.0.0"
-+>>>>>>> .their
-       }
-     },
-     "minizlib": {
-@@ -6001,7 +8045,11 @@
-       "integrity": "sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "minipass": "2.3.0"
-+=======
-+        "minipass": "^2.2.1"
-+>>>>>>> .their
-       }
-     },
-     "mkdirp": {
-@@ -6035,7 +8083,11 @@
-       "requires": {
-         "decompress-zip": "0.3.0",
-         "fs-extra": "0.26.7",
-+<<<<<<< .our
-         "request": "2.85.0"
-+=======
-+        "request": "^2.79.0"
-+>>>>>>> .their
-       }
-     },
-     "modify-values": {
-@@ -6050,6 +8102,7 @@
-       "integrity": "sha1-IyFYM/HaE/1gbMuAh7RIUty4If0=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "JSONStream": "1.3.2",
-         "browser-resolve": "1.11.2",
-         "cached-path-relative": "1.0.1",
-@@ -6065,6 +8118,23 @@
-         "subarg": "1.0.0",
-         "through2": "2.0.3",
-         "xtend": "4.0.1"
-+=======
-+        "JSONStream": "^1.0.3",
-+        "browser-resolve": "^1.7.0",
-+        "cached-path-relative": "^1.0.0",
-+        "concat-stream": "~1.5.0",
-+        "defined": "^1.0.0",
-+        "detective": "^4.0.0",
-+        "duplexer2": "^0.1.2",
-+        "inherits": "^2.0.1",
-+        "parents": "^1.0.0",
-+        "readable-stream": "^2.0.2",
-+        "resolve": "^1.1.3",
-+        "stream-combiner2": "^1.1.1",
-+        "subarg": "^1.0.0",
-+        "through2": "^2.0.0",
-+        "xtend": "^4.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -6079,6 +8149,7 @@
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-@@ -6086,6 +8157,15 @@
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-+=======
-+            "core-util-is": "~1.0.0",
-+            "inherits": "~2.0.3",
-+            "isarray": "~1.0.0",
-+            "process-nextick-args": "~2.0.0",
-+            "safe-buffer": "~5.1.1",
-+            "string_decoder": "~1.1.1",
-+            "util-deprecate": "~1.0.1"
-+>>>>>>> .their
-           }
-         },
-         "string_decoder": {
-@@ -6094,7 +8174,11 @@
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "safe-buffer": "5.1.2"
-+=======
-+            "safe-buffer": "~5.1.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -6154,6 +8238,7 @@
-       "integrity": "sha1-X1Zl2TNRM1yqvvjxxVRRbPXx5OU=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "minimatch": "3.0.4"
-       }
-     },
-@@ -6163,6 +8248,11 @@
-       "integrity": "sha1-q4hOjn5X44qUR1POxwb3iNF2i7U=",
-       "dev": true
-     },
-+=======
-+        "minimatch": "^3.0.2"
-+      }
-+    },
-+>>>>>>> .their
-     "node-version": {
-       "version": "1.1.3",
-       "resolved": "https://registry.npmjs.org/node-version/-/node-version-1.1.3.tgz",
-@@ -6175,12 +8265,17 @@
-       "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "abbrev": "1.1.1"
-+=======
-+        "abbrev": "1"
-+>>>>>>> .their
-       }
-     },
-     "normalize-package-data": {
-       "version": "2.4.0",
-       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-EvlaMH1YNSB1oEkHuErIvpisAS8=",
-       "dev": true,
-       "requires": {
-@@ -6188,6 +8283,15 @@
-         "is-builtin-module": "1.0.0",
-         "semver": "5.5.0",
-         "validate-npm-package-license": "3.0.3"
-+=======
-+      "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
-+      "dev": true,
-+      "requires": {
-+        "hosted-git-info": "^2.1.4",
-+        "is-builtin-module": "^1.0.0",
-+        "semver": "2 || 3 || 4 || 5",
-+        "validate-npm-package-license": "^3.0.1"
-+>>>>>>> .their
-       }
-     },
-     "normalize-path": {
-@@ -6196,7 +8300,11 @@
-       "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "remove-trailing-separator": "1.1.0"
-+=======
-+        "remove-trailing-separator": "^1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "npm-prefix": {
-@@ -6205,9 +8313,15 @@
-       "integrity": "sha1-5hlFX3B0ulTMZtbQ033Z8b5ry8A=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "rc": "1.2.7",
-         "shellsubstitute": "1.2.0",
-         "untildify": "2.1.0"
-+=======
-+        "rc": "^1.1.0",
-+        "shellsubstitute": "^1.1.0",
-+        "untildify": "^2.1.0"
-+>>>>>>> .their
-       }
-     },
-     "npm-run-path": {
-@@ -6216,7 +8330,11 @@
-       "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "path-key": "2.0.1"
-+=======
-+        "path-key": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "nth-check": {
-@@ -6225,7 +8343,11 @@
-       "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "boolbase": "1.0.0"
-+=======
-+        "boolbase": "~1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "nugget": {
-@@ -6234,12 +8356,21 @@
-       "integrity": "sha1-IBCVpIfhrTYIGzQy+jytpPjQcbA=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "debug": "2.6.9",
-         "minimist": "1.2.0",
-         "pretty-bytes": "1.0.4",
-         "progress-stream": "1.2.0",
-         "request": "2.85.0",
-         "single-line-log": "1.1.2",
-+=======
-+        "debug": "^2.1.3",
-+        "minimist": "^1.1.0",
-+        "pretty-bytes": "^1.0.2",
-+        "progress-stream": "^1.1.0",
-+        "request": "^2.45.0",
-+        "single-line-log": "^1.1.2",
-+>>>>>>> .their
-         "throttleit": "0.0.2"
-       }
-     },
-@@ -6280,10 +8411,17 @@
-       "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "define-properties": "1.1.2",
-         "function-bind": "1.1.1",
-         "has-symbols": "1.0.0",
-         "object-keys": "1.0.11"
-+=======
-+        "define-properties": "^1.1.2",
-+        "function-bind": "^1.1.1",
-+        "has-symbols": "^1.0.0",
-+        "object-keys": "^1.0.11"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "object-keys": {
-@@ -6300,6 +8438,7 @@
-       "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "for-own": "0.1.5",
-         "is-extendable": "0.1.1"
-       }
-@@ -6311,6 +8450,10 @@
-       "dev": true,
-       "requires": {
-         "object-assign": "4.1.1"
-+=======
-+        "for-own": "^0.1.4",
-+        "is-extendable": "^0.1.1"
-+>>>>>>> .their
-       }
-     },
-     "on-finished": {
-@@ -6334,7 +8477,11 @@
-       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "wrappy": "1.0.2"
-+=======
-+        "wrappy": "1"
-+>>>>>>> .their
-       }
-     },
-     "onetime": {
-@@ -6355,7 +8502,11 @@
-       "integrity": "sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "is-wsl": "1.1.0"
-+=======
-+        "is-wsl": "^1.1.0"
-+>>>>>>> .their
-       }
-     },
-     "optimist": {
-@@ -6364,7 +8515,11 @@
-       "integrity": "sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "wordwrap": "0.0.3"
-+=======
-+        "wordwrap": "~0.0.2"
-+>>>>>>> .their
-       }
-     },
-     "optionator": {
-@@ -6373,12 +8528,21 @@
-       "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "deep-is": "0.1.3",
-         "fast-levenshtein": "2.0.6",
-         "levn": "0.3.0",
-         "prelude-ls": "1.1.2",
-         "type-check": "0.3.2",
-         "wordwrap": "1.0.0"
-+=======
-+        "deep-is": "~0.1.3",
-+        "fast-levenshtein": "~2.0.4",
-+        "levn": "~0.3.0",
-+        "prelude-ls": "~1.1.2",
-+        "type-check": "~0.3.2",
-+        "wordwrap": "~1.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "wordwrap": {
-@@ -6395,10 +8559,17 @@
-       "integrity": "sha1-NnoHitJc+wltpQERXrW0AeB9dJU=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "chalk": "1.1.3",
-         "cli-cursor": "1.0.2",
-         "cli-spinners": "0.2.0",
-         "log-symbols": "1.0.2"
-+=======
-+        "chalk": "^1.1.1",
-+        "cli-cursor": "^1.0.2",
-+        "cli-spinners": "^0.2.0",
-+        "log-symbols": "^1.0.2"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "cli-spinners": {
-@@ -6427,7 +8598,11 @@
-       "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "lcid": "1.0.0"
-+=======
-+        "lcid": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "os-tmpdir": {
-@@ -6448,7 +8623,11 @@
-       "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "p-try": "1.0.0"
-+=======
-+        "p-try": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "p-locate": {
-@@ -6457,7 +8636,11 @@
-       "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "p-limit": "1.2.0"
-+=======
-+        "p-limit": "^1.1.0"
-+>>>>>>> .their
-       }
-     },
-     "p-try": {
-@@ -6472,10 +8655,17 @@
-       "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "got": "6.7.1",
-         "registry-auth-token": "3.3.2",
-         "registry-url": "3.1.0",
-         "semver": "5.5.0"
-+=======
-+        "got": "^6.7.1",
-+        "registry-auth-token": "^3.0.1",
-+        "registry-url": "^3.0.3",
-+        "semver": "^5.1.0"
-+>>>>>>> .their
-       }
-     },
-     "pako": {
-@@ -6490,7 +8680,11 @@
-       "integrity": "sha1-/t1NK/GTp3dF/nHjcdc8MwfZx1E=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "path-platform": "0.11.15"
-+=======
-+        "path-platform": "~0.11.15"
-+>>>>>>> .their
-       }
-     },
-     "parse-asn1": {
-@@ -6499,11 +8693,19 @@
-       "integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "asn1.js": "4.10.1",
-         "browserify-aes": "1.2.0",
-         "create-hash": "1.2.0",
-         "evp_bytestokey": "1.0.3",
-         "pbkdf2": "3.0.16"
-+=======
-+        "asn1.js": "^4.0.0",
-+        "browserify-aes": "^1.0.0",
-+        "create-hash": "^1.1.0",
-+        "evp_bytestokey": "^1.0.0",
-+        "pbkdf2": "^3.0.3"
-+>>>>>>> .their
-       }
-     },
-     "parse-entities": {
-@@ -6512,12 +8714,21 @@
-       "integrity": "sha512-5N9lmQ7tmxfXf+hO3X6KRG6w7uYO/HL9fHalSySTdyn63C3WNvTM/1R8tn1u1larNcEbo3Slcy2bsVDQqvEpUg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "character-entities": "1.2.2",
-         "character-entities-legacy": "1.1.2",
-         "character-reference-invalid": "1.1.2",
-         "is-alphanumerical": "1.0.2",
-         "is-decimal": "1.0.2",
-         "is-hexadecimal": "1.0.2"
-+=======
-+        "character-entities": "^1.0.0",
-+        "character-entities-legacy": "^1.0.0",
-+        "character-reference-invalid": "^1.0.0",
-+        "is-alphanumerical": "^1.0.0",
-+        "is-decimal": "^1.0.0",
-+        "is-hexadecimal": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "parse-github-repo-url": {
-@@ -6532,8 +8743,13 @@
-       "integrity": "sha1-q/cC5LkAUk//eQK2g4YoV7Y/k/4=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "array-unique": "0.3.2",
-         "is-glob": "3.1.0"
-+=======
-+        "array-unique": "^0.3.2",
-+        "is-glob": "^3.1.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "array-unique": {
-@@ -6554,7 +8770,11 @@
-           "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "is-extglob": "2.1.1"
-+=======
-+            "is-extglob": "^2.1.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -6565,10 +8785,17 @@
-       "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "glob-base": "0.3.0",
-         "is-dotfile": "1.0.3",
-         "is-extglob": "1.0.0",
-         "is-glob": "2.0.1"
-+=======
-+        "glob-base": "^0.3.0",
-+        "is-dotfile": "^1.0.0",
-+        "is-extglob": "^1.0.0",
-+        "is-glob": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "parse-json": {
-@@ -6577,7 +8804,11 @@
-       "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "error-ex": "1.3.1"
-+=======
-+        "error-ex": "^1.2.0"
-+>>>>>>> .their
-       }
-     },
-     "parse5": {
-@@ -6599,7 +8830,11 @@
-       "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "pinkie-promise": "2.0.1"
-+=======
-+        "pinkie-promise": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "path-is-absolute": {
-@@ -6638,9 +8873,15 @@
-       "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "graceful-fs": "4.1.11",
-         "pify": "2.3.0",
-         "pinkie-promise": "2.0.1"
-+=======
-+        "graceful-fs": "^4.1.2",
-+        "pify": "^2.0.0",
-+        "pinkie-promise": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "pbkdf2": {
-@@ -6649,11 +8890,19 @@
-       "integrity": "sha512-y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "create-hash": "1.2.0",
-         "create-hmac": "1.1.7",
-         "ripemd160": "2.0.2",
-         "safe-buffer": "5.1.2",
-         "sha.js": "2.4.11"
-+=======
-+        "create-hash": "^1.1.2",
-+        "create-hmac": "^1.1.4",
-+        "ripemd160": "^2.0.1",
-+        "safe-buffer": "^5.0.1",
-+        "sha.js": "^2.4.8"
-+>>>>>>> .their
-       }
-     },
-     "peek-stream": {
-@@ -6662,9 +8911,15 @@
-       "integrity": "sha512-FhJ+YbOSBb9/rIl2ZeE/QHEsWn7PqNYt8ARAY3kIgNGOk13g9FGyIY6JIl/xB/3TFRVoTv5as0l11weORrTekA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "buffer-from": "1.0.0",
-         "duplexify": "3.6.0",
-         "through2": "2.0.3"
-+=======
-+        "buffer-from": "^1.0.0",
-+        "duplexify": "^3.5.0",
-+        "through2": "^2.0.3"
-+>>>>>>> .their
-       }
-     },
-     "performance-now": {
-@@ -6691,7 +8946,11 @@
-       "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "pinkie": "2.0.4"
-+=======
-+        "pinkie": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "pkg-conf": {
-@@ -6700,8 +8959,13 @@
-       "integrity": "sha1-ISZRTKbyq/69FoWW3xi6V4Z/AFg=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "find-up": "2.1.0",
-         "load-json-file": "4.0.0"
-+=======
-+        "find-up": "^2.0.0",
-+        "load-json-file": "^4.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "find-up": {
-@@ -6710,7 +8974,11 @@
-           "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "locate-path": "2.0.0"
-+=======
-+            "locate-path": "^2.0.0"
-+>>>>>>> .their
-           }
-         },
-         "load-json-file": {
-@@ -6719,10 +8987,17 @@
-           "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "graceful-fs": "4.1.11",
-             "parse-json": "4.0.0",
-             "pify": "3.0.0",
-             "strip-bom": "3.0.0"
-+=======
-+            "graceful-fs": "^4.1.2",
-+            "parse-json": "^4.0.0",
-+            "pify": "^3.0.0",
-+            "strip-bom": "^3.0.0"
-+>>>>>>> .their
-           }
-         },
-         "parse-json": {
-@@ -6731,8 +9006,13 @@
-           "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "error-ex": "1.3.1",
-             "json-parse-better-errors": "1.0.2"
-+=======
-+            "error-ex": "^1.3.1",
-+            "json-parse-better-errors": "^1.0.1"
-+>>>>>>> .their
-           }
-         },
-         "pify": {
-@@ -6755,9 +9035,15 @@
-       "integrity": "sha1-VX7yLXPaPIg3EHdmxS6tq94pj+Q=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "debug-log": "1.0.1",
-         "find-root": "1.1.0",
-         "xtend": "4.0.1"
-+=======
-+        "debug-log": "^1.0.0",
-+        "find-root": "^1.0.0",
-+        "xtend": "^4.0.1"
-+>>>>>>> .their
-       }
-     },
-     "pkg-dir": {
-@@ -6766,7 +9052,11 @@
-       "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "find-up": "1.1.2"
-+=======
-+        "find-up": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "pkg-up": {
-@@ -6775,7 +9065,11 @@
-       "integrity": "sha1-Pgj7RhUlxEIWJKM7n35tCvWwWiY=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "find-up": "1.1.2"
-+=======
-+        "find-up": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "plur": {
-@@ -6784,7 +9078,11 @@
-       "integrity": "sha1-dIJFLBoPUI4+NE6uwxLJHCncZVo=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "irregular-plurals": "1.4.0"
-+=======
-+        "irregular-plurals": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "pluralize": {
-@@ -6817,8 +9115,13 @@
-       "integrity": "sha1-CiLoIQYJrTVUL4yNXSFZr/B1HIQ=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "get-stdin": "4.0.1",
-         "meow": "3.7.0"
-+=======
-+        "get-stdin": "^4.0.1",
-+        "meow": "^3.1.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "camelcase": {
-@@ -6833,8 +9136,13 @@
-           "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "camelcase": "2.1.1",
-             "map-obj": "1.0.1"
-+=======
-+            "camelcase": "^2.0.0",
-+            "map-obj": "^1.0.0"
-+>>>>>>> .their
-           }
-         },
-         "indent-string": {
-@@ -6843,7 +9151,11 @@
-           "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "repeating": "2.0.1"
-+=======
-+            "repeating": "^2.0.0"
-+>>>>>>> .their
-           }
-         },
-         "map-obj": {
-@@ -6858,6 +9170,7 @@
-           "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "camelcase-keys": "2.1.0",
-             "decamelize": "1.2.0",
-             "loud-rejection": "1.6.0",
-@@ -6868,6 +9181,18 @@
-             "read-pkg-up": "1.0.1",
-             "redent": "1.0.0",
-             "trim-newlines": "1.0.0"
-+=======
-+            "camelcase-keys": "^2.0.0",
-+            "decamelize": "^1.1.2",
-+            "loud-rejection": "^1.0.0",
-+            "map-obj": "^1.0.1",
-+            "minimist": "^1.1.3",
-+            "normalize-package-data": "^2.3.4",
-+            "object-assign": "^4.0.1",
-+            "read-pkg-up": "^1.0.1",
-+            "redent": "^1.0.0",
-+            "trim-newlines": "^1.0.0"
-+>>>>>>> .their
-           }
-         },
-         "redent": {
-@@ -6876,8 +9201,13 @@
-           "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "indent-string": "2.1.0",
-             "strip-indent": "1.0.1"
-+=======
-+            "indent-string": "^2.1.0",
-+            "strip-indent": "^1.0.1"
-+>>>>>>> .their
-           }
-         },
-         "strip-indent": {
-@@ -6886,7 +9216,11 @@
-           "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "get-stdin": "4.0.1"
-+=======
-+            "get-stdin": "^4.0.1"
-+>>>>>>> .their
-           }
-         },
-         "trim-newlines": {
-@@ -6921,8 +9255,13 @@
-       "integrity": "sha1-LNPP6jO6OonJwSHsM0er6asSX3c=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "speedometer": "0.1.4",
-         "through2": "0.2.3"
-+=======
-+        "speedometer": "~0.1.2",
-+        "through2": "~0.2.3"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "through2": {
-@@ -6931,8 +9270,13 @@
-           "integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "readable-stream": "1.1.14",
-             "xtend": "2.1.2"
-+=======
-+            "readable-stream": "~1.1.9",
-+            "xtend": "~2.1.1"
-+>>>>>>> .their
-           }
-         },
-         "xtend": {
-@@ -6941,7 +9285,11 @@
-           "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "object-keys": "0.4.0"
-+=======
-+            "object-keys": "~0.4.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -6958,11 +9306,19 @@
-       "integrity": "sha512-4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "bn.js": "4.11.8",
-         "browserify-rsa": "4.0.1",
-         "create-hash": "1.2.0",
-         "parse-asn1": "5.1.1",
-         "randombytes": "2.0.6"
-+=======
-+        "bn.js": "^4.1.0",
-+        "browserify-rsa": "^4.0.0",
-+        "create-hash": "^1.1.0",
-+        "parse-asn1": "^5.0.0",
-+        "randombytes": "^2.0.1"
-+>>>>>>> .their
-       }
-     },
-     "pump": {
-@@ -6971,8 +9327,13 @@
-       "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "end-of-stream": "1.4.1",
-         "once": "1.4.0"
-+=======
-+        "end-of-stream": "^1.1.0",
-+        "once": "^1.3.1"
-+>>>>>>> .their
-       }
-     },
-     "pumpify": {
-@@ -6981,9 +9342,15 @@
-       "integrity": "sha512-UWi0klDoq8xtVzlMRgENV9F7iCTZExaJQSQL187UXsxpk9NnrKGqTqqUNYAKGOzucSOxs2+jUnRNI+rLviPhJg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "duplexify": "3.6.0",
-         "inherits": "2.0.3",
-         "pump": "2.0.1"
-+=======
-+        "duplexify": "^3.6.0",
-+        "inherits": "^2.0.3",
-+        "pump": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "punycode": {
-@@ -7028,9 +9395,15 @@
-       "integrity": "sha512-VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "is-number": "4.0.0",
-         "kind-of": "6.0.2",
-         "math-random": "1.0.1"
-+=======
-+        "is-number": "^4.0.0",
-+        "kind-of": "^6.0.0",
-+        "math-random": "^1.0.1"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "is-number": {
-@@ -7053,7 +9426,11 @@
-       "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "safe-buffer": "5.1.2"
-+=======
-+        "safe-buffer": "^5.1.0"
-+>>>>>>> .their
-       }
-     },
-     "randomfill": {
-@@ -7062,8 +9439,13 @@
-       "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "randombytes": "2.0.6",
-         "safe-buffer": "5.1.2"
-+=======
-+        "randombytes": "^2.0.5",
-+        "safe-buffer": "^5.1.0"
-+>>>>>>> .their
-       }
-     },
-     "range-parser": {
-@@ -7090,10 +9472,17 @@
-       "integrity": "sha512-LdLD8xD4zzLsAT5xyushXDNscEjB7+2ulnl8+r1pnESlYtlJtVSoCMBGr30eDRJ3+2Gq89jK9P9e4tCEH1+ywA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "deep-extend": "0.5.1",
-         "ini": "1.3.5",
-         "minimist": "1.2.0",
-         "strip-json-comments": "2.0.1"
-+=======
-+        "deep-extend": "^0.5.1",
-+        "ini": "~1.3.0",
-+        "minimist": "^1.2.0",
-+        "strip-json-comments": "~2.0.1"
-+>>>>>>> .their
-       }
-     },
-     "read-only-stream": {
-@@ -7102,7 +9491,11 @@
-       "integrity": "sha1-JyT9aoET1zdkrCiNQ4YnDB2/F/A=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "readable-stream": "2.3.6"
-+=======
-+        "readable-stream": "^2.0.2"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -7117,6 +9510,7 @@
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-@@ -7124,6 +9518,15 @@
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-+=======
-+            "core-util-is": "~1.0.0",
-+            "inherits": "~2.0.3",
-+            "isarray": "~1.0.0",
-+            "process-nextick-args": "~2.0.0",
-+            "safe-buffer": "~5.1.1",
-+            "string_decoder": "~1.1.1",
-+            "util-deprecate": "~1.0.1"
-+>>>>>>> .their
-           }
-         },
-         "string_decoder": {
-@@ -7132,7 +9535,11 @@
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "safe-buffer": "5.1.2"
-+=======
-+            "safe-buffer": "~5.1.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -7143,9 +9550,15 @@
-       "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "load-json-file": "1.1.0",
-         "normalize-package-data": "2.4.0",
-         "path-type": "1.1.0"
-+=======
-+        "load-json-file": "^1.0.0",
-+        "normalize-package-data": "^2.3.2",
-+        "path-type": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "read-pkg-up": {
-@@ -7154,8 +9567,13 @@
-       "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "find-up": "1.1.2",
-         "read-pkg": "1.1.0"
-+=======
-+        "find-up": "^1.0.0",
-+        "read-pkg": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "readable-stream": {
-@@ -7164,10 +9582,17 @@
-       "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "core-util-is": "1.0.2",
-         "inherits": "2.0.3",
-         "isarray": "0.0.1",
-         "string_decoder": "0.10.31"
-+=======
-+        "core-util-is": "~1.0.0",
-+        "inherits": "~2.0.1",
-+        "isarray": "0.0.1",
-+        "string_decoder": "~0.10.x"
-+>>>>>>> .their
-       }
-     },
-     "readdirp": {
-@@ -7176,10 +9601,17 @@
-       "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "graceful-fs": "4.1.11",
-         "minimatch": "3.0.4",
-         "readable-stream": "2.3.6",
-         "set-immediate-shim": "1.0.1"
-+=======
-+        "graceful-fs": "^4.1.2",
-+        "minimatch": "^3.0.2",
-+        "readable-stream": "^2.0.2",
-+        "set-immediate-shim": "^1.0.1"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -7194,6 +9626,7 @@
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-@@ -7201,6 +9634,15 @@
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-+=======
-+            "core-util-is": "~1.0.0",
-+            "inherits": "~2.0.3",
-+            "isarray": "~1.0.0",
-+            "process-nextick-args": "~2.0.0",
-+            "safe-buffer": "~5.1.1",
-+            "string_decoder": "~1.1.1",
-+            "util-deprecate": "~1.0.1"
-+>>>>>>> .their
-           }
-         },
-         "string_decoder": {
-@@ -7209,7 +9651,11 @@
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "safe-buffer": "5.1.2"
-+=======
-+            "safe-buffer": "~5.1.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -7220,8 +9666,13 @@
-       "integrity": "sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "code-point-at": "1.1.0",
-         "is-fullwidth-code-point": "1.0.0",
-+=======
-+        "code-point-at": "^1.0.0",
-+        "is-fullwidth-code-point": "^1.0.0",
-+>>>>>>> .their
-         "mute-stream": "0.0.5"
-       }
-     },
-@@ -7231,7 +9682,11 @@
-       "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "resolve": "1.7.1"
-+=======
-+        "resolve": "^1.1.6"
-+>>>>>>> .their
-       }
-     },
-     "redent": {
-@@ -7240,17 +9695,29 @@
-       "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "indent-string": "3.2.0",
-         "strip-indent": "2.0.0"
-+=======
-+        "indent-string": "^3.0.0",
-+        "strip-indent": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "regex-cache": {
-       "version": "0.4.4",
-       "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-db3FiioUls7EihKDW8VMjVYjNt0=",
-       "dev": true,
-       "requires": {
-         "is-equal-shallow": "0.1.3"
-+=======
-+      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
-+      "dev": true,
-+      "requires": {
-+        "is-equal-shallow": "^0.1.3"
-+>>>>>>> .their
-       }
-     },
-     "registry-auth-token": {
-@@ -7259,8 +9726,13 @@
-       "integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "rc": "1.2.7",
-         "safe-buffer": "5.1.2"
-+=======
-+        "rc": "^1.1.6",
-+        "safe-buffer": "^5.0.1"
-+>>>>>>> .their
-       }
-     },
-     "registry-url": {
-@@ -7269,7 +9741,11 @@
-       "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "rc": "1.2.7"
-+=======
-+        "rc": "^1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "remark": {
-@@ -7278,9 +9754,15 @@
-       "integrity": "sha512-K0PTsaZvJlXTl9DN6qYlvjTkqSZBFELhROZMrblm2rB+085flN84nz4g/BscKRMqDvhzlK1oQ/xnWQumdeNZYw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "remark-parse": "4.0.0",
-         "remark-stringify": "4.0.0",
-         "unified": "6.2.0"
-+=======
-+        "remark-parse": "^4.0.0",
-+        "remark-stringify": "^4.0.0",
-+        "unified": "^6.0.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-cli": {
-@@ -7289,9 +9771,15 @@
-       "integrity": "sha512-q5GMjGypUS4rTZb3WfMQcGpClSC38A9Ogg1h/HB2GLsqypDetmAfy0X+tuJ6JeyCPVOXXCDgsDCQq4QPqKmxBA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "markdown-extensions": "1.1.1",
-         "remark": "8.0.0",
-         "unified-args": "4.0.0"
-+=======
-+        "markdown-extensions": "^1.1.0",
-+        "remark": "^8.0.0",
-+        "unified-args": "^4.0.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint": {
-@@ -7300,7 +9788,11 @@
-       "integrity": "sha512-wvTTuB5O5pF8SxqahQjjrU3dtuhygYjaGcOZTw+4ACgSE4RBINDlNqN46HjcV3X0ib5GmObJUt5a2mmhtmuTqw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "remark-message-control": "4.1.0"
-+=======
-+        "remark-message-control": "^4.0.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-blockquote-indentation": {
-@@ -7309,12 +9801,21 @@
-       "integrity": "sha512-YrP99MJ3+dQ5JXzq39fUOcYzwcumva/xEM1eFtD2TrQcSdlMLoqYa7gj+aEEhZCjlA5BssTiVoWWW0RjyPPGZw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "mdast-util-to-string": "1.0.4",
-         "plur": "2.1.2",
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "mdast-util-to-string": "^1.0.2",
-+        "plur": "^2.1.2",
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-code-block-style": {
-@@ -7323,10 +9824,17 @@
-       "integrity": "sha512-FRUMhhKwCruH4vkatdMhVO4WlYpysV1NmMILVoK/k+/7uFLSfgvlqo66nzhpMdWL8TQHqdo0LhiXuetGC2WjsQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-definition-case": {
-@@ -7335,10 +9843,17 @@
-       "integrity": "sha512-TxLye5KF4o/rKVTvmPRX5jS9itamFS02yy1IG8bIYcIAJvWsW3GlJaXq4ohK3hKwSQOhtCherEfD6XF9BHLNYQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-definition-spacing": {
-@@ -7347,10 +9862,17 @@
-       "integrity": "sha512-ewzdlFfpTSP11ZuiOln0yfz6Y03aWtgJmLVQNfF1spaT1gURaShjs8Hiilbo719bz96DgvXSZLP6UnkSiZL1vg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-emphasis-marker": {
-@@ -7359,10 +9881,17 @@
-       "integrity": "sha512-QyNsD6y8EZQqhechw0XFGybYMlxn6PFLSlFUO50KSQlJEOgkImN2yJfrNrET2GY4t/fc/uYmeI/q7auUIkLX2w==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-fenced-code-flag": {
-@@ -7371,10 +9900,17 @@
-       "integrity": "sha512-P24T9DRe/nnywPFRpE1UAXAVzN1CX6HmINr15UHbQZo1Cy8KYt7uV9YOR0/XzphtnO/AFenAqZyf7tchW5AUNQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-fenced-code-marker": {
-@@ -7383,10 +9919,17 @@
-       "integrity": "sha512-mX7xAMl5m7xGX+YtOtyXIyv+egD4IQAm6DPGdfunI734QwODwcoBydtpTD56jrY+48nVcQ/anFYT1Blg3Xk3sQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-file-extension": {
-@@ -7395,7 +9938,11 @@
-       "integrity": "sha512-K1Pf5oviaFyCs0FhZqaNZ2odgd5KoV6AlA4nNAMxyylB0Y6t0mYpzECoLSS5Bgxf6f8Op9YbuM2cbjBAsv0dIA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2"
-+=======
-+        "unified-lint-rule": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-final-definition": {
-@@ -7404,10 +9951,17 @@
-       "integrity": "sha512-DK6bphJdQ0xSOQAn+8wOyLIVc3SZW2+ZzCMCLkQnVtHiQ9GHMzFiCkeE3Cq+OClsMI5Yn8wFTHZHPUn58VhNEQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-hard-break-spaces": {
-@@ -7416,10 +9970,17 @@
-       "integrity": "sha512-uh7LqHgRPCphiCvRzBVA4D0Ml2IqPaw89lWJdQ6HvYiV8ChB/OFLBapHi6OKW7NVVVPPJsElPMB/UPUsKFaPTg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-heading-increment": {
-@@ -7428,9 +9989,15 @@
-       "integrity": "sha512-jBAJacXAU5drUpvmymOoFmrdCCNDiz8bzGgJIMjpT0Vyjd0+qdXu2iyFMl/4RkkUli25rpUDXkTHTcxmNbh7Zw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-heading-style": {
-@@ -7439,10 +10006,17 @@
-       "integrity": "sha512-m9Gqr091YdxUtG69xdXYH8fSd3+nsrsMamB/qSWpVSZuWQKZ1mRotr1LO9NphJh6vhw8IfBtG07wgEDn6b40sQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "mdast-util-heading-style": "1.0.3",
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "mdast-util-heading-style": "^1.0.2",
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-link-title-style": {
-@@ -7451,11 +10025,19 @@
-       "integrity": "sha512-91MyqmZjokSzRbgvlKq5sLCJEFkM/MNKT1PDaWa3+GDLBGu7D4eMQGd2x49xX8IdJDEoWy5D8W+2Gb8XKWMUyw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1",
-         "vfile-location": "2.0.3"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1",
-+        "vfile-location": "^2.0.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-list-item-content-indent": {
-@@ -7464,11 +10046,19 @@
-       "integrity": "sha512-R5cdXFFywoBcg+2UUcF9OJ/vt9oqJv+KmTKIQV9CFHWeAfMFiZbxazsSPNaCcO1fW9622hxPCawN/AofDTbP7Q==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "plur": "2.1.2",
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "plur": "^2.1.2",
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-list-item-indent": {
-@@ -7477,11 +10067,19 @@
-       "integrity": "sha512-dSUFGQYtduuaos+5oXH89RTk0rGUe6DFf04q+rxQ7Z3YRbuXhAU2nYeY0/HENYiWJU1xFLteZkDvKMj0NfS3DQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "plur": "2.1.2",
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "plur": "^2.1.2",
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-list-item-spacing": {
-@@ -7490,10 +10088,17 @@
-       "integrity": "sha512-HlPEzRq4LJB6tQ72zgIZ42mOaOSX92O268BLolys/H1x6N29/JNMLfurWqLsrxZrxxHH3H7EUP4dNM2P1kDGBw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-maximum-heading-length": {
-@@ -7502,10 +10107,17 @@
-       "integrity": "sha512-f8ChV9U238gncyvTqmzJ+UpCMj+hFyluWBjVYr2K8CNh+MdSivIxS4zw4170sBRoqNuS3gBxRHG9f4rmdqotJA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "mdast-util-to-string": "1.0.4",
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "mdast-util-to-string": "^1.0.2",
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-maximum-line-length": {
-@@ -7514,10 +10126,17 @@
-       "integrity": "sha512-M4UIXAAbtLgoQbTDVwdKOEFbTKtJSZ+pCW7ZqMFs+cbIN0Svm32LM9+xpVfVU0hLYt3Ypl++EAPfguBNe1PZEw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-auto-link-without-protocol": {
-@@ -7526,11 +10145,19 @@
-       "integrity": "sha512-MHl0hNtF8Rc0lg6iuVP7/0rnp4uZadm3S07/1TiFeqzU22KFxxzcC8980Q4+I8oPZE0d1x80h9DmkNAVFwhDjQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "mdast-util-to-string": "1.0.4",
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "mdast-util-to-string": "^1.0.2",
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-blockquote-without-marker": {
-@@ -7539,11 +10166,19 @@
-       "integrity": "sha512-8VTQ/MP3flvG4U0tFSD+DMVT7F/4u9SnQLb/jjeRC3DzgbsIagIUqpWYAKkc+yBz9S/lgftA92lLP5PrlOa5DA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1",
-         "vfile-location": "2.0.3"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1",
-+        "vfile-location": "^2.0.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-consecutive-blank-lines": {
-@@ -7552,11 +10187,19 @@
-       "integrity": "sha512-IhyUiGTpb/hjtusIVg10q963KeL5CyNfbWOfDZ1KtY2tvdoSPRGrrCuTKo6OG8r1qavM6bU0mtRuIBqNh4lIzA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "plur": "2.1.2",
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "plur": "^2.1.2",
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-duplicate-headings": {
-@@ -7565,11 +10208,19 @@
-       "integrity": "sha512-iZZxyZgwnjvDkydKZzqHBueJvIpGbxnITmgd8xN8TOLZoAg9/KGTQRAkotL1HXNRdkzwggfgB9ONxv/rWtYBmg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "mdast-util-to-string": "1.0.4",
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "mdast-util-to-string": "^1.0.2",
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-emphasis-as-heading": {
-@@ -7578,9 +10229,15 @@
-       "integrity": "sha512-+x17Hrjwne4Mhk2x/Zolnuv/sOclF1oYMDBSEYhBUpn/UAwxhXEXYKkeo0KkWA7Q3+UCLELJvzsk4cGNP6Sgow==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-file-name-articles": {
-@@ -7589,7 +10246,11 @@
-       "integrity": "sha512-SzebnFnilrsINA6QZP1YqPa3SrfSotrLkRWl5FUCoVshBvEFNKJFWXj6Xyt4NjWQ5tJWFtOMysAuHdGT+Odhjg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2"
-+=======
-+        "unified-lint-rule": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-file-name-consecutive-dashes": {
-@@ -7598,7 +10259,11 @@
-       "integrity": "sha512-YP2HBwA00yeD7phvxp4ftiqbfBPfYHPgPfcEcb8oNa1WlUh/58cs9DbSHWKsZG+XLkvEaheC6qUQG02jEKZHPA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2"
-+=======
-+        "unified-lint-rule": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-file-name-irregular-characters": {
-@@ -7607,7 +10272,11 @@
-       "integrity": "sha512-+ks/V6OVMGOPZKw+fe2E4DPvLoslGxvdgtqXq2Nyz0cEdYX8RP45kI79V4w95H7UCJAeOFM9mZzVLvmCY1sEbg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2"
-+=======
-+        "unified-lint-rule": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-file-name-mixed-case": {
-@@ -7616,7 +10285,11 @@
-       "integrity": "sha512-bcqPsow1C0LrsKII1YehUO7VPOER7nze6FzsZZ8/NP+d200OL7Y7VMCqN1kscAvG+PTJgjznyXuLEpy7KQnVFg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2"
-+=======
-+        "unified-lint-rule": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-file-name-outer-dashes": {
-@@ -7625,7 +10298,11 @@
-       "integrity": "sha512-BVEwLrA4kipalgKrxhncpgtmh6eUmHBH1ggC+X3csYR4X5vXv4vHQqpov4I1vMyWxMLMBnq7lTL3Iqp0CS4vwg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2"
-+=======
-+        "unified-lint-rule": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-heading-punctuation": {
-@@ -7634,10 +10311,17 @@
-       "integrity": "sha512-/7kGRmPT+JLxEME1Z/rQn99mP8yr4qXFwcniKYsefR1jl8pCZciwCIp2Tq92Nn+FPELVrpk9sloRBb2JP3UB0A==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "mdast-util-to-string": "1.0.4",
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "mdast-util-to-string": "^1.0.2",
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-inline-padding": {
-@@ -7646,10 +10330,17 @@
-       "integrity": "sha512-nRl6vA45ZPdMz3/rVMZw7WRRqLFuMrzhdkrbrGLjwBovdIeD/IGCEbDA5NR60g2xT9V5dAmKogvHEH1bIr8SdQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "mdast-util-to-string": "1.0.4",
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "mdast-util-to-string": "^1.0.2",
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-literal-urls": {
-@@ -7658,11 +10349,19 @@
-       "integrity": "sha512-YMsZFVYQDt9gvpc6THL76GzyhCR+cK79vjyEOEmX+O3tOjxQstbi0oW6Lngbl1WbpkCW5TWEzSKOorQowYI2wg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "mdast-util-to-string": "1.0.4",
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "mdast-util-to-string": "^1.0.2",
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-multiple-toplevel-headings": {
-@@ -7671,10 +10370,17 @@
-       "integrity": "sha512-LFfgjF3NKFkt0tGNnJ8Exf8+DrVcMRwek5qu5mvh2KrZnmSpm5flYWzUy2UnnIyicDL3CZYC/r3Fjz6CeBYgZA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-shell-dollars": {
-@@ -7683,9 +10389,15 @@
-       "integrity": "sha512-YryHem73PTxjCkuC4HONJWHsmrLyXmF7r+cCH36Ys3vuWsfAbwkbOwpyuPB4KXn+6fHaTUfz/B5BPp3iwzJwyA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-shortcut-reference-image": {
-@@ -7694,9 +10406,15 @@
-       "integrity": "sha512-nUQ+4xB5hKZTCl9gvg7c+W1T3ddsnjgu4zwRza2Bn+21cKmUzx+z9dvlZ4aVuNGmxuWHbKI8/ZkKuB8Eu27vJw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-shortcut-reference-link": {
-@@ -7705,9 +10423,15 @@
-       "integrity": "sha512-A6ZexZ6XyQ7fXebrj5WgW5FkSJ81GobjWyMFVmBxgxPd9GH2BkRsZ10aFSkQQvfKSrqbnOL2vrigGMgbiERRxA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-no-table-indentation": {
-@@ -7716,10 +10440,17 @@
-       "integrity": "sha512-QrtT1GvJmAoNsWh+gmHFajFlM+ubm9rd3Cbz2OYPix8ZM6g907aIfG2NusJFXL9D8/CExQWYhlBvelFBbHgqbQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-ordered-list-marker-style": {
-@@ -7728,10 +10459,17 @@
-       "integrity": "sha512-LJICUZIxqHHi360EP90zbDP+2QQIVVgPGlz0AatuR9ifd7xqAzraQKxsQajAZpuOepZgjBMTOz9L9W0Znx7ujA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-ordered-list-marker-value": {
-@@ -7740,10 +10478,17 @@
-       "integrity": "sha512-P6fYui3MvuB21+6AYH8Lbe7SVZ2VQL+FVJUuDCBhe01bgx6SajGmQ/f4Iqt0gCHEAaKw7e2B7tdwd36ifbs1EA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-rule-style": {
-@@ -7752,10 +10497,17 @@
-       "integrity": "sha512-dzH+K6DcPIIMBq6LUQgE4dR9TiQGZrQOoULD7m0Y0lIb2EoR2FK5Zd4TgZg/LnvTs6fid37t0xFoaY4/lXV/5Q==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-strong-marker": {
-@@ -7764,10 +10516,17 @@
-       "integrity": "sha512-+bwWKWAqDwqd21Vw+ndqVFh5V27Dp4MKhk9AUlKmcvgJYHuvQ8UfWQdpZcP218ps/4EbwTfyi33TaPyXqOTlXA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-table-cell-padding": {
-@@ -7776,10 +10535,17 @@
-       "integrity": "sha512-o3WwC9YysXbQKf0D5nvhhJPcLagqedLwGdifukdgyaKvuIQVbtWbNv1/UOdB3LL+D+2fUrwrCmnQ8J3E1r0lBw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-table-pipe-alignment": {
-@@ -7788,10 +10554,17 @@
-       "integrity": "sha512-lYfK2gWGN45hYfAOZw5gscQ4uDaO9bJLp+H64jvrTQzBV+OCvB9kRQwI0oIrJAa4XMmipAZR+2XhjNSCfQ0fRA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-table-pipes": {
-@@ -7800,10 +10573,17 @@
-       "integrity": "sha512-VHfDRvcovLBl/cvSjwDoA0xRizdZU33A6F2qFD9A5hu1sDWgGxMLg5m2MOvFlRkUVxSwUv47cuD0/yxB4THYXQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-lint-unordered-list-marker-style": {
-@@ -7812,10 +10592,17 @@
-       "integrity": "sha512-dHYD9cHM9ZJ7BKUZ1nEPGfLAHgUmYxccXtms1GSEM/uyUtR2SU/ao1RwZZ+LvacZFCNZ1yG2yKCJhGI/5U/GrA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unified-lint-rule": "1.0.2",
-         "unist-util-generated": "1.1.2",
-         "unist-util-position": "3.0.1",
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unified-lint-rule": "^1.0.0",
-+        "unist-util-generated": "^1.1.0",
-+        "unist-util-position": "^3.0.0",
-+        "unist-util-visit": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-message-control": {
-@@ -7824,9 +10611,15 @@
-       "integrity": "sha512-e1dszks4YKY7hLAkhS2367jBjBpAfvi+kVgSN/tOFrdp3qxITjiNR5fOFnyYF8vvorkQ9uxlKJoZUOW8T7rKDg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "mdast-comment-marker": "1.0.2",
-         "unified-message-control": "1.0.4",
-         "xtend": "4.0.1"
-+=======
-+        "mdast-comment-marker": "^1.0.0",
-+        "unified-message-control": "^1.0.0",
-+        "xtend": "^4.0.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-parse": {
-@@ -7835,6 +10628,7 @@
-       "integrity": "sha512-XZgICP2gJ1MHU7+vQaRM+VA9HEL3X253uwUM/BGgx3iv6TH2B3bF3B8q00DKcyP9YrJV+/7WOWEWBFF/u8cIsw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "collapse-white-space": "1.0.4",
-         "is-alphabetical": "1.0.2",
-         "is-decimal": "1.0.2",
-@@ -7850,6 +10644,23 @@
-         "unist-util-remove-position": "1.1.2",
-         "vfile-location": "2.0.3",
-         "xtend": "4.0.1"
-+=======
-+        "collapse-white-space": "^1.0.2",
-+        "is-alphabetical": "^1.0.0",
-+        "is-decimal": "^1.0.0",
-+        "is-whitespace-character": "^1.0.0",
-+        "is-word-character": "^1.0.0",
-+        "markdown-escapes": "^1.0.0",
-+        "parse-entities": "^1.0.2",
-+        "repeat-string": "^1.5.4",
-+        "state-toggle": "^1.0.0",
-+        "trim": "0.0.1",
-+        "trim-trailing-lines": "^1.0.0",
-+        "unherit": "^1.0.4",
-+        "unist-util-remove-position": "^1.0.0",
-+        "vfile-location": "^2.0.0",
-+        "xtend": "^4.0.1"
-+>>>>>>> .their
-       }
-     },
-     "remark-preset-lint-markdown-style-guide": {
-@@ -7858,6 +10669,7 @@
-       "integrity": "sha512-Ao6fB63WuGtz1fa4rjoI+u1EOu21rWVGPmJlUKZlCICPPB6I815nJ52V0sLYjaw2cs+ZiXsXhdVinN7UpVgXcQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "remark-lint": "6.0.1",
-         "remark-lint-blockquote-indentation": "1.0.1",
-         "remark-lint-code-block-style": "1.0.1",
-@@ -7903,6 +10715,53 @@
-         "remark-lint-table-pipe-alignment": "1.0.1",
-         "remark-lint-table-pipes": "1.0.1",
-         "remark-lint-unordered-list-marker-style": "1.0.1"
-+=======
-+        "remark-lint": "^6.0.0",
-+        "remark-lint-blockquote-indentation": "^1.0.0",
-+        "remark-lint-code-block-style": "^1.0.0",
-+        "remark-lint-definition-case": "^1.0.0",
-+        "remark-lint-definition-spacing": "^1.0.0",
-+        "remark-lint-emphasis-marker": "^1.0.0",
-+        "remark-lint-fenced-code-flag": "^1.0.0",
-+        "remark-lint-fenced-code-marker": "^1.0.0",
-+        "remark-lint-file-extension": "^1.0.0",
-+        "remark-lint-final-definition": "^1.0.0",
-+        "remark-lint-hard-break-spaces": "^1.0.0",
-+        "remark-lint-heading-increment": "^1.0.0",
-+        "remark-lint-heading-style": "^1.0.0",
-+        "remark-lint-link-title-style": "^1.0.0",
-+        "remark-lint-list-item-content-indent": "^1.0.0",
-+        "remark-lint-list-item-indent": "^1.0.0",
-+        "remark-lint-list-item-spacing": "^1.0.0",
-+        "remark-lint-maximum-heading-length": "^1.0.0",
-+        "remark-lint-maximum-line-length": "^1.0.0",
-+        "remark-lint-no-auto-link-without-protocol": "^1.0.0",
-+        "remark-lint-no-blockquote-without-marker": "^2.0.0",
-+        "remark-lint-no-consecutive-blank-lines": "^1.0.0",
-+        "remark-lint-no-duplicate-headings": "^1.0.0",
-+        "remark-lint-no-emphasis-as-heading": "^1.0.0",
-+        "remark-lint-no-file-name-articles": "^1.0.0",
-+        "remark-lint-no-file-name-consecutive-dashes": "^1.0.0",
-+        "remark-lint-no-file-name-irregular-characters": "^1.0.0",
-+        "remark-lint-no-file-name-mixed-case": "^1.0.0",
-+        "remark-lint-no-file-name-outer-dashes": "^1.0.0",
-+        "remark-lint-no-heading-punctuation": "^1.0.0",
-+        "remark-lint-no-inline-padding": "^1.0.0",
-+        "remark-lint-no-literal-urls": "^1.0.0",
-+        "remark-lint-no-multiple-toplevel-headings": "^1.0.0",
-+        "remark-lint-no-shell-dollars": "^1.0.0",
-+        "remark-lint-no-shortcut-reference-image": "^1.0.0",
-+        "remark-lint-no-shortcut-reference-link": "^1.0.0",
-+        "remark-lint-no-table-indentation": "^1.0.0",
-+        "remark-lint-ordered-list-marker-style": "^1.0.0",
-+        "remark-lint-ordered-list-marker-value": "^1.0.0",
-+        "remark-lint-rule-style": "^1.0.0",
-+        "remark-lint-strong-marker": "^1.0.0",
-+        "remark-lint-table-cell-padding": "^1.0.0",
-+        "remark-lint-table-pipe-alignment": "^1.0.0",
-+        "remark-lint-table-pipes": "^1.0.0",
-+        "remark-lint-unordered-list-marker-style": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "remark-stringify": {
-@@ -7911,6 +10770,7 @@
-       "integrity": "sha512-xLuyKTnuQer3ke9hkU38SUYLiTmS078QOnoFavztmbt/pAJtNSkNtFgR0U//uCcmG0qnyxao+PDuatQav46F1w==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "ccount": "1.0.3",
-         "is-alphanumeric": "1.0.0",
-         "is-decimal": "1.0.2",
-@@ -7925,6 +10785,22 @@
-         "stringify-entities": "1.3.2",
-         "unherit": "1.1.1",
-         "xtend": "4.0.1"
-+=======
-+        "ccount": "^1.0.0",
-+        "is-alphanumeric": "^1.0.0",
-+        "is-decimal": "^1.0.0",
-+        "is-whitespace-character": "^1.0.0",
-+        "longest-streak": "^2.0.1",
-+        "markdown-escapes": "^1.0.0",
-+        "markdown-table": "^1.1.0",
-+        "mdast-util-compact": "^1.0.0",
-+        "parse-entities": "^1.0.2",
-+        "repeat-string": "^1.5.4",
-+        "state-toggle": "^1.0.0",
-+        "stringify-entities": "^1.0.1",
-+        "unherit": "^1.0.4",
-+        "xtend": "^4.0.1"
-+>>>>>>> .their
-       }
-     },
-     "remove-trailing-separator": {
-@@ -7951,7 +10827,11 @@
-       "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "is-finite": "1.0.2"
-+=======
-+        "is-finite": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "replace-ext": {
-@@ -7966,6 +10846,7 @@
-       "integrity": "sha512-8H7Ehijd4js+s6wuVPLjwORxD4zeuyjYugprdOXlPSqaApmL/QOy+EB/beICHVCHkGMKNh5rvihb5ov+IDw4mg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "aws-sign2": "0.7.0",
-         "aws4": "1.7.0",
-         "caseless": "0.12.0",
-@@ -7988,6 +10869,30 @@
-         "tough-cookie": "2.3.4",
-         "tunnel-agent": "0.6.0",
-         "uuid": "3.2.1"
-+=======
-+        "aws-sign2": "~0.7.0",
-+        "aws4": "^1.6.0",
-+        "caseless": "~0.12.0",
-+        "combined-stream": "~1.0.5",
-+        "extend": "~3.0.1",
-+        "forever-agent": "~0.6.1",
-+        "form-data": "~2.3.1",
-+        "har-validator": "~5.0.3",
-+        "hawk": "~6.0.2",
-+        "http-signature": "~1.2.0",
-+        "is-typedarray": "~1.0.0",
-+        "isstream": "~0.1.2",
-+        "json-stringify-safe": "~5.0.1",
-+        "mime-types": "~2.1.17",
-+        "oauth-sign": "~0.8.2",
-+        "performance-now": "^2.1.0",
-+        "qs": "~6.5.1",
-+        "safe-buffer": "^5.1.1",
-+        "stringstream": "~0.0.5",
-+        "tough-cookie": "~2.3.3",
-+        "tunnel-agent": "^0.6.0",
-+        "uuid": "^3.1.0"
-+>>>>>>> .their
-       }
-     },
-     "require-directory": {
-@@ -8008,8 +10913,13 @@
-       "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "caller-path": "0.1.0",
-         "resolve-from": "1.0.1"
-+=======
-+        "caller-path": "^0.1.0",
-+        "resolve-from": "^1.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "resolve-from": {
-@@ -8026,7 +10936,11 @@
-       "integrity": "sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "path-parse": "1.0.5"
-+=======
-+        "path-parse": "^1.0.5"
-+>>>>>>> .their
-       }
-     },
-     "resolve-from": {
-@@ -8041,8 +10955,13 @@
-       "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "exit-hook": "1.1.1",
-         "onetime": "1.1.0"
-+=======
-+        "exit-hook": "^1.0.0",
-+        "onetime": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "revalidator": {
-@@ -8058,21 +10977,33 @@
-       "dev": true,
-       "optional": true,
-       "requires": {
-+<<<<<<< .our
-         "align-text": "0.1.4"
-+=======
-+        "align-text": "^0.1.1"
-+>>>>>>> .their
-       }
-     },
-     "rimraf": {
-       "version": "2.6.2",
-       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-LtgVDSShbqhlHm1u8PR8QVjOejY=",
-       "dev": true,
-       "requires": {
-         "glob": "7.1.2"
-+=======
-+      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
-+      "dev": true,
-+      "requires": {
-+        "glob": "^7.0.5"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-           "dev": true,
-           "requires": {
-@@ -8082,6 +11013,17 @@
-             "minimatch": "3.0.4",
-             "once": "1.4.0",
-             "path-is-absolute": "1.0.1"
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+          "dev": true,
-+          "requires": {
-+            "fs.realpath": "^1.0.0",
-+            "inflight": "^1.0.4",
-+            "inherits": "2",
-+            "minimatch": "^3.0.4",
-+            "once": "^1.3.0",
-+            "path-is-absolute": "^1.0.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -8092,8 +11034,13 @@
-       "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "hash-base": "3.0.4",
-         "inherits": "2.0.3"
-+=======
-+        "hash-base": "^3.0.0",
-+        "inherits": "^2.0.1"
-+>>>>>>> .their
-       }
-     },
-     "run-async": {
-@@ -8102,7 +11049,11 @@
-       "integrity": "sha1-yK1KXhEGYeQCp9IbUw4AnyX444k=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "once": "1.4.0"
-+=======
-+        "once": "^1.3.0"
-+>>>>>>> .their
-       }
-     },
-     "run-parallel": {
-@@ -8126,7 +11077,11 @@
-     "sax": {
-       "version": "1.2.4",
-       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-KBYjTiN4vdxOU1T6tcqold9xANk=",
-+=======
-+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-+>>>>>>> .their
-       "dev": true,
-       "optional": true
-     },
-@@ -8142,7 +11097,11 @@
-       "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "semver": "5.5.0"
-+=======
-+        "semver": "^5.0.3"
-+>>>>>>> .their
-       }
-     },
-     "send": {
-@@ -8152,6 +11111,7 @@
-       "dev": true,
-       "requires": {
-         "debug": "2.6.9",
-+<<<<<<< .our
-         "depd": "1.1.2",
-         "destroy": "1.0.4",
-         "encodeurl": "1.0.2",
-@@ -8164,6 +11124,20 @@
-         "on-finished": "2.3.0",
-         "range-parser": "1.2.0",
-         "statuses": "1.4.0"
-+=======
-+        "depd": "~1.1.2",
-+        "destroy": "~1.0.4",
-+        "encodeurl": "~1.0.2",
-+        "escape-html": "~1.0.3",
-+        "etag": "~1.8.1",
-+        "fresh": "0.5.2",
-+        "http-errors": "~1.6.2",
-+        "mime": "1.4.1",
-+        "ms": "2.0.0",
-+        "on-finished": "~2.3.0",
-+        "range-parser": "~1.2.0",
-+        "statuses": "~1.4.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "depd": {
-@@ -8187,15 +11161,22 @@
-       }
-     },
-     "serve": {
-+<<<<<<< .our
-       "version": "6.5.8",
-       "resolved": "https://registry.npmjs.org/serve/-/serve-6.5.8.tgz",
-       "integrity": "sha512-GZYlJz7f6E7Xq6xbg1rTSvQQV9x4v/yYB/sum6egzSBLa/mdk1PViDSX2JvL0Me83sxu3JpEpQELfakDKbGcrw==",
-+=======
-+      "version": "6.5.6",
-+      "resolved": "https://registry.npmjs.org/serve/-/serve-6.5.6.tgz",
-+      "integrity": "sha512-rdbHRzBh94UdZPktcoNjWEUqY0ILanZ8Q+VwNfhw5n93pkCPn86wH8x+hXgRi8II9+xj3DvGMWL/6hGUQyfuXg==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "args": "4.0.0",
-         "basic-auth": "2.0.0",
-         "bluebird": "3.5.1",
-         "boxen": "1.3.0",
-+<<<<<<< .our
-         "chalk": "2.4.1",
-         "clipboardy": "1.2.3",
-         "dargs": "5.1.0",
-@@ -8205,6 +11186,17 @@
-         "handlebars": "4.0.11",
-         "ip": "1.1.5",
-         "micro": "9.3.1",
-+=======
-+        "chalk": "2.4.0",
-+        "clipboardy": "1.2.3",
-+        "dargs": "5.1.0",
-+        "detect-port": "1.2.2",
-+        "filesize": "3.6.1",
-+        "fs-extra": "5.0.0",
-+        "handlebars": "4.0.11",
-+        "ip": "1.1.5",
-+        "micro": "9.1.4",
-+>>>>>>> .their
-         "micro-compress": "1.0.0",
-         "mime-types": "2.1.18",
-         "node-version": "1.1.3",
-@@ -8213,7 +11205,11 @@
-         "path-is-inside": "1.0.2",
-         "path-type": "3.0.0",
-         "send": "0.16.2",
-+<<<<<<< .our
-         "update-check": "1.5.1"
-+=======
-+        "update-check": "1.3.2"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "ansi-styles": {
-@@ -8222,6 +11218,7 @@
-           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "color-convert": "1.9.1"
-           }
-         },
-@@ -8234,6 +11231,20 @@
-             "ansi-styles": "3.2.1",
-             "escape-string-regexp": "1.0.5",
-             "supports-color": "5.4.0"
-+=======
-+            "color-convert": "^1.9.0"
-+          }
-+        },
-+        "chalk": {
-+          "version": "2.4.0",
-+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz",
-+          "integrity": "sha512-Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw==",
-+          "dev": true,
-+          "requires": {
-+            "ansi-styles": "^3.2.1",
-+            "escape-string-regexp": "^1.0.5",
-+            "supports-color": "^5.3.0"
-+>>>>>>> .their
-           }
-         },
-         "dargs": {
-@@ -8243,6 +11254,7 @@
-           "dev": true
-         },
-         "fs-extra": {
-+<<<<<<< .our
-           "version": "6.0.1",
-           "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz",
-           "integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==",
-@@ -8251,6 +11263,16 @@
-             "graceful-fs": "4.1.11",
-             "jsonfile": "4.0.0",
-             "universalify": "0.1.2"
-+=======
-+          "version": "5.0.0",
-+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz",
-+          "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
-+          "dev": true,
-+          "requires": {
-+            "graceful-fs": "^4.1.2",
-+            "jsonfile": "^4.0.0",
-+            "universalify": "^0.1.0"
-+>>>>>>> .their
-           }
-         },
-         "has-flag": {
-@@ -8265,7 +11287,11 @@
-           "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "graceful-fs": "4.1.11"
-+=======
-+            "graceful-fs": "^4.1.6"
-+>>>>>>> .their
-           }
-         },
-         "path-type": {
-@@ -8274,7 +11300,11 @@
-           "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "pify": "3.0.0"
-+=======
-+            "pify": "^3.0.0"
-+>>>>>>> .their
-           }
-         },
-         "pify": {
-@@ -8289,7 +11319,11 @@
-           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "has-flag": "3.0.0"
-+=======
-+            "has-flag": "^3.0.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -8318,8 +11352,13 @@
-       "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "inherits": "2.0.3",
-         "safe-buffer": "5.1.2"
-+=======
-+        "inherits": "^2.0.1",
-+        "safe-buffer": "^5.0.1"
-+>>>>>>> .their
-       }
-     },
-     "shasum": {
-@@ -8328,8 +11367,13 @@
-       "integrity": "sha1-5wEjENj0F/TetXEhUOVni4euVl8=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "json-stable-stringify": "0.0.1",
-         "sha.js": "2.4.11"
-+=======
-+        "json-stable-stringify": "~0.0.0",
-+        "sha.js": "~2.4.4"
-+>>>>>>> .their
-       }
-     },
-     "shebang-command": {
-@@ -8338,7 +11382,11 @@
-       "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "shebang-regex": "1.0.0"
-+=======
-+        "shebang-regex": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "shebang-regex": {
-@@ -8353,10 +11401,17 @@
-       "integrity": "sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "array-filter": "0.0.1",
-         "array-map": "0.0.0",
-         "array-reduce": "0.0.0",
-         "jsonify": "0.0.0"
-+=======
-+        "array-filter": "~0.0.0",
-+        "array-map": "~0.0.0",
-+        "array-reduce": "~0.0.0",
-+        "jsonify": "~0.0.0"
-+>>>>>>> .their
-       }
-     },
-     "shelljs": {
-@@ -8365,14 +11420,21 @@
-       "integrity": "sha1-3svPh0sNHl+3LhSxZKloMEjprLM=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "glob": "7.1.2",
-         "interpret": "1.1.0",
-         "rechoir": "0.6.2"
-+=======
-+        "glob": "^7.0.0",
-+        "interpret": "^1.0.0",
-+        "rechoir": "^0.6.2"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-           "dev": true,
-           "requires": {
-@@ -8382,6 +11444,17 @@
-             "minimatch": "3.0.4",
-             "once": "1.4.0",
-             "path-is-absolute": "1.0.1"
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+          "dev": true,
-+          "requires": {
-+            "fs.realpath": "^1.0.0",
-+            "inflight": "^1.0.4",
-+            "inherits": "2",
-+            "minimatch": "^3.0.4",
-+            "once": "^1.3.0",
-+            "path-is-absolute": "^1.0.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -8404,7 +11477,11 @@
-       "integrity": "sha1-wvg/Jzo+GhbtsJlWYdoO1e8DM2Q=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "string-width": "1.0.2"
-+=======
-+        "string-width": "^1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "slice-ansi": {
-@@ -8425,7 +11502,11 @@
-       "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "hoek": "4.2.1"
-+=======
-+        "hoek": "4.x.x"
-+>>>>>>> .their
-       }
-     },
-     "source-map": {
-@@ -8440,8 +11521,13 @@
-       "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "spdx-expression-parse": "3.0.0",
-         "spdx-license-ids": "3.0.0"
-+=======
-+        "spdx-expression-parse": "^3.0.0",
-+        "spdx-license-ids": "^3.0.0"
-+>>>>>>> .their
-       }
-     },
-     "spdx-exceptions": {
-@@ -8456,8 +11542,13 @@
-       "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "spdx-exceptions": "2.1.0",
-         "spdx-license-ids": "3.0.0"
-+=======
-+        "spdx-exceptions": "^2.1.0",
-+        "spdx-license-ids": "^3.0.0"
-+>>>>>>> .their
-       }
-     },
-     "spdx-license-ids": {
-@@ -8475,19 +11566,33 @@
-     "split": {
-       "version": "1.0.1",
-       "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-YFvZvjA6pZ+zX5Ip++oN3snqB9k=",
-       "dev": true,
-       "requires": {
-         "through": "2.3.8"
-+=======
-+      "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
-+      "dev": true,
-+      "requires": {
-+        "through": "2"
-+>>>>>>> .their
-       }
-     },
-     "split2": {
-       "version": "2.2.0",
-       "resolved": "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-GGsldbz4PoW30YRldWI47k7kJJM=",
-       "dev": true,
-       "requires": {
-         "through2": "2.0.3"
-+=======
-+      "integrity": "sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==",
-+      "dev": true,
-+      "requires": {
-+        "through2": "^2.0.2"
-+>>>>>>> .their
-       }
-     },
-     "sprintf-js": {
-@@ -8502,6 +11607,7 @@
-       "integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "asn1": "0.2.3",
-         "assert-plus": "1.0.0",
-         "bcrypt-pbkdf": "1.0.1",
-@@ -8510,6 +11616,16 @@
-         "getpass": "0.1.7",
-         "jsbn": "0.1.1",
-         "tweetnacl": "0.14.5"
-+=======
-+        "asn1": "~0.2.3",
-+        "assert-plus": "^1.0.0",
-+        "bcrypt-pbkdf": "^1.0.0",
-+        "dashdash": "^1.12.0",
-+        "ecc-jsbn": "~0.1.1",
-+        "getpass": "^0.1.1",
-+        "jsbn": "~0.1.0",
-+        "tweetnacl": "~0.14.0"
-+>>>>>>> .their
-       }
-     },
-     "standard": {
-@@ -8518,6 +11634,7 @@
-       "integrity": "sha512-JURZ+85ExKLQULckDFijdX5WHzN6RC7fgiZNSV4jFQVo+3tPoQGHyBrGekye/yf0aOfb4210EM5qPNlc2cRh4w==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "eslint": "3.19.0",
-         "eslint-config-standard": "10.2.1",
-         "eslint-config-standard-jsx": "4.0.2",
-@@ -8527,6 +11644,17 @@
-         "eslint-plugin-react": "6.10.3",
-         "eslint-plugin-standard": "3.0.1",
-         "standard-engine": "7.0.0"
-+=======
-+        "eslint": "~3.19.0",
-+        "eslint-config-standard": "10.2.1",
-+        "eslint-config-standard-jsx": "4.0.2",
-+        "eslint-plugin-import": "~2.2.0",
-+        "eslint-plugin-node": "~4.2.2",
-+        "eslint-plugin-promise": "~3.5.0",
-+        "eslint-plugin-react": "~6.10.0",
-+        "eslint-plugin-standard": "~3.0.1",
-+        "standard-engine": "~7.0.0"
-+>>>>>>> .their
-       }
-     },
-     "standard-engine": {
-@@ -8535,10 +11663,17 @@
-       "integrity": "sha1-67d7nI/CyBZf+jU72Rug3/Qa9pA=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "deglob": "2.1.0",
-         "get-stdin": "5.0.1",
-         "minimist": "1.2.0",
-         "pkg-conf": "2.1.0"
-+=======
-+        "deglob": "^2.1.0",
-+        "get-stdin": "^5.0.1",
-+        "minimist": "^1.1.0",
-+        "pkg-conf": "^2.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "get-stdin": {
-@@ -8552,6 +11687,7 @@
-     "standard-markdown": {
-       "version": "4.0.2",
-       "resolved": "https://registry.npmjs.org/standard-markdown/-/standard-markdown-4.0.2.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-NaC1bLtX5JzuLXQ9ocmERMNK1Lg=",
-       "dev": true,
-       "requires": {
-@@ -8562,6 +11698,18 @@
-         "lodash.range": "3.2.0",
-         "ora": "1.4.0",
-         "standard": "10.0.3"
-+=======
-+      "integrity": "sha512-h+WTmoGN0qmse8I1VX8VD6V5JeVLXZOPQltvxQP9FfSpSl6RmKYMLTUQ2j/QhdmsdxQKDqulZF/Bf8oEnttIQA==",
-+      "dev": true,
-+      "requires": {
-+        "async": "^2.0.1",
-+        "commander": "^2.9.0",
-+        "globby": "^6.0.0",
-+        "lodash.flatten": "^4.2.0",
-+        "lodash.range": "^3.1.5",
-+        "ora": "^1.2.0",
-+        "standard": "^10.0.2"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "ansi-styles": {
-@@ -8570,7 +11718,11 @@
-           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "color-convert": "1.9.1"
-+=======
-+            "color-convert": "^1.9.0"
-+>>>>>>> .their
-           }
-         },
-         "async": {
-@@ -8579,7 +11731,11 @@
-           "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "lodash": "4.17.10"
-+=======
-+            "lodash": "^4.14.0"
-+>>>>>>> .their
-           }
-         },
-         "chalk": {
-@@ -8588,9 +11744,15 @@
-           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "ansi-styles": "3.2.1",
-             "escape-string-regexp": "1.0.5",
-             "supports-color": "5.4.0"
-+=======
-+            "ansi-styles": "^3.2.1",
-+            "escape-string-regexp": "^1.0.5",
-+            "supports-color": "^5.3.0"
-+>>>>>>> .their
-           }
-         },
-         "cli-cursor": {
-@@ -8599,7 +11761,11 @@
-           "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "restore-cursor": "2.0.0"
-+=======
-+            "restore-cursor": "^2.0.0"
-+>>>>>>> .their
-           }
-         },
-         "cli-spinners": {
-@@ -8611,6 +11777,7 @@
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-           "dev": true,
-           "requires": {
-@@ -8620,6 +11787,17 @@
-             "minimatch": "3.0.4",
-             "once": "1.4.0",
-             "path-is-absolute": "1.0.1"
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+          "dev": true,
-+          "requires": {
-+            "fs.realpath": "^1.0.0",
-+            "inflight": "^1.0.4",
-+            "inherits": "2",
-+            "minimatch": "^3.0.4",
-+            "once": "^1.3.0",
-+            "path-is-absolute": "^1.0.0"
-+>>>>>>> .their
-           }
-         },
-         "globby": {
-@@ -8628,11 +11806,19 @@
-           "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "array-union": "1.0.2",
-             "glob": "7.1.2",
-             "object-assign": "4.1.1",
-             "pify": "2.3.0",
-             "pinkie-promise": "2.0.1"
-+=======
-+            "array-union": "^1.0.1",
-+            "glob": "^7.0.3",
-+            "object-assign": "^4.0.1",
-+            "pify": "^2.0.0",
-+            "pinkie-promise": "^2.0.0"
-+>>>>>>> .their
-           }
-         },
-         "has-flag": {
-@@ -8647,7 +11833,11 @@
-           "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "chalk": "2.4.1"
-+=======
-+            "chalk": "^2.0.1"
-+>>>>>>> .their
-           }
-         },
-         "onetime": {
-@@ -8656,7 +11846,11 @@
-           "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "mimic-fn": "1.2.0"
-+=======
-+            "mimic-fn": "^1.0.0"
-+>>>>>>> .their
-           }
-         },
-         "ora": {
-@@ -8665,10 +11859,17 @@
-           "integrity": "sha512-iMK1DOQxzzh2MBlVsU42G80mnrvUhqsMh74phHtDlrcTZPK0pH6o7l7DRshK+0YsxDyEuaOkziVdvM3T0QTzpw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "chalk": "2.4.1",
-             "cli-cursor": "2.1.0",
-             "cli-spinners": "1.3.1",
-             "log-symbols": "2.2.0"
-+=======
-+            "chalk": "^2.1.0",
-+            "cli-cursor": "^2.1.0",
-+            "cli-spinners": "^1.0.1",
-+            "log-symbols": "^2.1.0"
-+>>>>>>> .their
-           }
-         },
-         "restore-cursor": {
-@@ -8677,8 +11878,13 @@
-           "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "onetime": "2.0.1",
-             "signal-exit": "3.0.2"
-+=======
-+            "onetime": "^2.0.0",
-+            "signal-exit": "^3.0.2"
-+>>>>>>> .their
-           }
-         },
-         "supports-color": {
-@@ -8687,7 +11893,11 @@
-           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "has-flag": "3.0.0"
-+=======
-+            "has-flag": "^3.0.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -8710,8 +11920,13 @@
-       "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "inherits": "2.0.3",
-         "readable-stream": "2.3.6"
-+=======
-+        "inherits": "~2.0.1",
-+        "readable-stream": "^2.0.2"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -8726,6 +11941,7 @@
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-@@ -8733,6 +11949,15 @@
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-+=======
-+            "core-util-is": "~1.0.0",
-+            "inherits": "~2.0.3",
-+            "isarray": "~1.0.0",
-+            "process-nextick-args": "~2.0.0",
-+            "safe-buffer": "~5.1.1",
-+            "string_decoder": "~1.1.1",
-+            "util-deprecate": "~1.0.1"
-+>>>>>>> .their
-           }
-         },
-         "string_decoder": {
-@@ -8741,7 +11966,11 @@
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "safe-buffer": "5.1.2"
-+=======
-+            "safe-buffer": "~5.1.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -8752,8 +11981,13 @@
-       "integrity": "sha1-+02KFCDqNidk4hrUeAOXvry0HL4=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "duplexer2": "0.1.4",
-         "readable-stream": "2.3.6"
-+=======
-+        "duplexer2": "~0.1.0",
-+        "readable-stream": "^2.0.2"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -8768,6 +12002,7 @@
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-@@ -8775,6 +12010,15 @@
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-+=======
-+            "core-util-is": "~1.0.0",
-+            "inherits": "~2.0.3",
-+            "isarray": "~1.0.0",
-+            "process-nextick-args": "~2.0.0",
-+            "safe-buffer": "~5.1.1",
-+            "string_decoder": "~1.1.1",
-+            "util-deprecate": "~1.0.1"
-+>>>>>>> .their
-           }
-         },
-         "string_decoder": {
-@@ -8783,7 +12027,11 @@
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "safe-buffer": "5.1.2"
-+=======
-+            "safe-buffer": "~5.1.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -8800,11 +12048,19 @@
-       "integrity": "sha512-QllfrBhqF1DPcz46WxKTs6Mz1Bpc+8Qm6vbqOpVav5odAXwbyzwnEczoWqtxrsmlO+cJqtPrp/8gWKWjaKLLlA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "builtin-status-codes": "3.0.0",
-         "inherits": "2.0.3",
-         "readable-stream": "2.3.6",
-         "to-arraybuffer": "1.0.1",
-         "xtend": "4.0.1"
-+=======
-+        "builtin-status-codes": "^3.0.0",
-+        "inherits": "^2.0.1",
-+        "readable-stream": "^2.3.6",
-+        "to-arraybuffer": "^1.0.0",
-+        "xtend": "^4.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -8819,6 +12075,7 @@
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-@@ -8826,6 +12083,15 @@
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-+=======
-+            "core-util-is": "~1.0.0",
-+            "inherits": "~2.0.3",
-+            "isarray": "~1.0.0",
-+            "process-nextick-args": "~2.0.0",
-+            "safe-buffer": "~5.1.1",
-+            "string_decoder": "~1.1.1",
-+            "util-deprecate": "~1.0.1"
-+>>>>>>> .their
-           }
-         },
-         "string_decoder": {
-@@ -8834,7 +12100,11 @@
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "safe-buffer": "5.1.2"
-+=======
-+            "safe-buffer": "~5.1.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -8851,8 +12121,13 @@
-       "integrity": "sha1-G2O+Q4oTPktnHMGTUZdgAXWRDYM=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "inherits": "2.0.3",
-         "readable-stream": "2.3.6"
-+=======
-+        "inherits": "^2.0.1",
-+        "readable-stream": "^2.0.2"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -8867,6 +12142,7 @@
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-@@ -8874,6 +12150,15 @@
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-+=======
-+            "core-util-is": "~1.0.0",
-+            "inherits": "~2.0.3",
-+            "isarray": "~1.0.0",
-+            "process-nextick-args": "~2.0.0",
-+            "safe-buffer": "~5.1.1",
-+            "string_decoder": "~1.1.1",
-+            "util-deprecate": "~1.0.1"
-+>>>>>>> .their
-           }
-         },
-         "string_decoder": {
-@@ -8882,7 +12167,11 @@
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "safe-buffer": "5.1.2"
-+=======
-+            "safe-buffer": "~5.1.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -8899,9 +12188,15 @@
-       "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "code-point-at": "1.1.0",
-         "is-fullwidth-code-point": "1.0.0",
-         "strip-ansi": "3.0.1"
-+=======
-+        "code-point-at": "^1.0.0",
-+        "is-fullwidth-code-point": "^1.0.0",
-+        "strip-ansi": "^3.0.0"
-+>>>>>>> .their
-       }
-     },
-     "string_decoder": {
-@@ -8916,10 +12211,17 @@
-       "integrity": "sha512-nrBAQClJAPN2p+uGCVJRPIPakKeKWZ9GtBCmormE7pWOSlHat7+x5A8gx85M7HM5Dt0BP3pP5RhVW77WdbJJ3A==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "character-entities-html4": "1.1.2",
-         "character-entities-legacy": "1.1.2",
-         "is-alphanumerical": "1.0.2",
-         "is-hexadecimal": "1.0.2"
-+=======
-+        "character-entities-html4": "^1.0.0",
-+        "character-entities-legacy": "^1.0.0",
-+        "is-alphanumerical": "^1.0.0",
-+        "is-hexadecimal": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "stringstream": {
-@@ -8934,7 +12236,11 @@
-       "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "ansi-regex": "2.1.1"
-+=======
-+        "ansi-regex": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "strip-bom": {
-@@ -8943,7 +12249,11 @@
-       "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "is-utf8": "0.2.1"
-+=======
-+        "is-utf8": "^0.2.0"
-+>>>>>>> .their
-       }
-     },
-     "strip-eof": {
-@@ -8970,7 +12280,11 @@
-       "integrity": "sha1-9izxdYHplrSPyWVpn1TAauJouNI=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "minimist": "1.2.0"
-+=======
-+        "minimist": "^1.1.0"
-+>>>>>>> .their
-       }
-     },
-     "sumchecker": {
-@@ -8979,7 +12293,11 @@
-       "integrity": "sha1-D0LBDl0F2l1C7qPlbDOZo31sWz4=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "debug": "2.6.9"
-+=======
-+        "debug": "^2.2.0"
-+>>>>>>> .their
-       }
-     },
-     "supports-color": {
-@@ -8988,7 +12306,11 @@
-       "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "has-flag": "1.0.0"
-+=======
-+        "has-flag": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "symbol-tree": {
-@@ -9004,7 +12326,11 @@
-       "integrity": "sha512-YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "acorn-node": "1.3.0"
-+=======
-+        "acorn-node": "^1.2.0"
-+>>>>>>> .their
-       }
-     },
-     "table": {
-@@ -9013,12 +12339,21 @@
-       "integrity": "sha1-K7xULw/amGGnVdOUf+/Ys/UThV8=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "ajv": "4.11.8",
-         "ajv-keywords": "1.5.1",
-         "chalk": "1.1.3",
-         "lodash": "4.17.10",
-         "slice-ansi": "0.0.4",
-         "string-width": "2.1.1"
-+=======
-+        "ajv": "^4.7.0",
-+        "ajv-keywords": "^1.0.0",
-+        "chalk": "^1.1.1",
-+        "lodash": "^4.0.0",
-+        "slice-ansi": "0.0.4",
-+        "string-width": "^2.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "ajv": {
-@@ -9027,8 +12362,13 @@
-           "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "co": "4.6.0",
-             "json-stable-stringify": "1.0.1"
-+=======
-+            "co": "^4.6.0",
-+            "json-stable-stringify": "^1.0.1"
-+>>>>>>> .their
-           }
-         },
-         "ansi-regex": {
-@@ -9049,17 +12389,29 @@
-           "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "jsonify": "0.0.0"
-+=======
-+            "jsonify": "~0.0.0"
-+>>>>>>> .their
-           }
-         },
-         "string-width": {
-           "version": "2.1.1",
-           "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
-           "dev": true,
-           "requires": {
-             "is-fullwidth-code-point": "2.0.0",
-             "strip-ansi": "4.0.0"
-+=======
-+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-+          "dev": true,
-+          "requires": {
-+            "is-fullwidth-code-point": "^2.0.0",
-+            "strip-ansi": "^4.0.0"
-+>>>>>>> .their
-           }
-         },
-         "strip-ansi": {
-@@ -9068,7 +12420,11 @@
-           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "ansi-regex": "3.0.0"
-+=======
-+            "ansi-regex": "^3.0.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -9079,6 +12435,7 @@
-       "integrity": "sha512-BfkE9CciGGgDsATqkikUHrQrraBCO+ke/1f6SFAEMnxyyfN9lxC+nW1NFWMpqH865DhHIy9vQi682gk1X7friw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "chownr": "1.0.1",
-         "fs-minipass": "1.2.5",
-         "minipass": "2.3.0",
-@@ -9086,6 +12443,15 @@
-         "mkdirp": "0.5.1",
-         "safe-buffer": "5.1.2",
-         "yallist": "3.0.2"
-+=======
-+        "chownr": "^1.0.1",
-+        "fs-minipass": "^1.2.5",
-+        "minipass": "^2.2.4",
-+        "minizlib": "^1.1.0",
-+        "mkdirp": "^0.5.0",
-+        "safe-buffer": "^5.1.2",
-+        "yallist": "^3.0.2"
-+>>>>>>> .their
-       }
-     },
-     "tar-fs": {
-@@ -9094,10 +12460,17 @@
-       "integrity": "sha512-LdknWjPEiZC1nOBwhv0JBzfJBGPJar08dZg2rwZe0ZTLQoRGEzgrl7vF3qUEkCHpI/wN9e7RyCuDhMsJUCLPPQ==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "chownr": "1.0.1",
-         "mkdirp": "0.5.1",
-         "pump": "1.0.3",
-         "tar-stream": "1.6.0"
-+=======
-+        "chownr": "^1.0.1",
-+        "mkdirp": "^0.5.1",
-+        "pump": "^1.0.0",
-+        "tar-stream": "^1.1.2"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "pump": {
-@@ -9106,8 +12479,13 @@
-           "integrity": "sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "end-of-stream": "1.4.1",
-             "once": "1.4.0"
-+=======
-+            "end-of-stream": "^1.1.0",
-+            "once": "^1.3.1"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -9118,6 +12496,7 @@
-       "integrity": "sha512-lh2iAPG/BHNmN6WB9Ybdynk9rEJ5GD/dy4zscHmVlwa1dq2tpE+BH78i5vjYwYVWEaOXGBjzxr89aVACF17Cpw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "bl": "1.2.2",
-         "buffer-alloc": "1.1.0",
-         "end-of-stream": "1.4.1",
-@@ -9125,6 +12504,15 @@
-         "readable-stream": "2.3.6",
-         "to-buffer": "1.1.1",
-         "xtend": "4.0.1"
-+=======
-+        "bl": "^1.0.0",
-+        "buffer-alloc": "^1.1.0",
-+        "end-of-stream": "^1.0.0",
-+        "fs-constants": "^1.0.0",
-+        "readable-stream": "^2.0.0",
-+        "to-buffer": "^1.1.0",
-+        "xtend": "^4.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -9139,6 +12527,7 @@
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-@@ -9146,6 +12535,15 @@
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-+=======
-+            "core-util-is": "~1.0.0",
-+            "inherits": "~2.0.3",
-+            "isarray": "~1.0.0",
-+            "process-nextick-args": "~2.0.0",
-+            "safe-buffer": "~5.1.1",
-+            "string_decoder": "~1.1.1",
-+            "util-deprecate": "~1.0.1"
-+>>>>>>> .their
-           }
-         },
-         "string_decoder": {
-@@ -9154,7 +12552,11 @@
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "safe-buffer": "5.1.2"
-+=======
-+            "safe-buffer": "~5.1.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -9165,8 +12567,13 @@
-       "integrity": "sha1-4Ma8TSa5AxJEEOT+2BEDAU38H1k=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "os-tmpdir": "1.0.2",
-         "rimraf": "2.2.8"
-+=======
-+        "os-tmpdir": "^1.0.0",
-+        "rimraf": "~2.2.6"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "rimraf": {
-@@ -9183,8 +12590,13 @@
-       "integrity": "sha1-W8xOrsxKsscH2LwR2ZzMmiyyh/I=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "os-tmpdir": "1.0.2",
-         "uuid": "2.0.3"
-+=======
-+        "os-tmpdir": "^1.0.0",
-+        "uuid": "^2.0.1"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "uuid": {
-@@ -9201,13 +12613,21 @@
-       "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "execa": "0.7.0"
-+=======
-+        "execa": "^0.7.0"
-+>>>>>>> .their
-       }
-     },
-     "text-extensions": {
-       "version": "1.7.0",
-       "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.7.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-+qq6JiXtdG1WiiPk0KrNm/CKizk=",
-+=======
-+      "integrity": "sha512-AKXZeDq230UaSzaO5s3qQUZOaC7iKbzq0jOFL614R7d9R593HLqAOL0cYoqLdkNrjBSOdmoQI06yigq1TSBXAg==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "text-table": {
-@@ -9234,8 +12654,13 @@
-       "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "readable-stream": "2.3.6",
-         "xtend": "4.0.1"
-+=======
-+        "readable-stream": "^2.1.5",
-+        "xtend": "~4.0.1"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "isarray": {
-@@ -9250,6 +12675,7 @@
-           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "core-util-is": "1.0.2",
-             "inherits": "2.0.3",
-             "isarray": "1.0.0",
-@@ -9257,6 +12683,15 @@
-             "safe-buffer": "5.1.2",
-             "string_decoder": "1.1.1",
-             "util-deprecate": "1.0.2"
-+=======
-+            "core-util-is": "~1.0.0",
-+            "inherits": "~2.0.3",
-+            "isarray": "~1.0.0",
-+            "process-nextick-args": "~2.0.0",
-+            "safe-buffer": "~5.1.1",
-+            "string_decoder": "~1.1.1",
-+            "util-deprecate": "~1.0.1"
-+>>>>>>> .their
-           }
-         },
-         "string_decoder": {
-@@ -9265,7 +12700,11 @@
-           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "safe-buffer": "5.1.2"
-+=======
-+            "safe-buffer": "~5.1.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -9282,7 +12721,11 @@
-       "integrity": "sha1-ycWLV1voQHN1y14kYtrO50NZ9B0=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "process": "0.11.10"
-+=======
-+        "process": "~0.11.0"
-+>>>>>>> .their
-       }
-     },
-     "tmp": {
-@@ -9291,7 +12734,11 @@
-       "integrity": "sha1-Fyc1t/YU6nrzlmT6hM8N5OUV0SA=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "os-tmpdir": "1.0.2"
-+=======
-+        "os-tmpdir": "~1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "to-arraybuffer": {
-@@ -9312,9 +12759,15 @@
-       "integrity": "sha512-saGC8/lWdGrEoBMLUtgzhRHWAkQMP8gdldA3MOAUhBwTGEb1RSMVcflHGSx4ZJsdEZ9o1qDBCPp47LCPrbZWow==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "is-buffer": "1.1.6",
-         "vfile": "2.3.0",
-         "x-is-function": "1.0.4"
-+=======
-+        "is-buffer": "^1.1.4",
-+        "vfile": "^2.0.0",
-+        "x-is-function": "^1.0.4"
-+>>>>>>> .their
-       }
-     },
-     "touch": {
-@@ -9323,7 +12776,11 @@
-       "integrity": "sha1-Ua7z1ElXHU8oel2Hyci0kYGg2x0=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "nopt": "1.0.10"
-+=======
-+        "nopt": "~1.0.10"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "nopt": {
-@@ -9332,7 +12789,11 @@
-           "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "abbrev": "1.1.1"
-+=======
-+            "abbrev": "1"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -9343,7 +12804,11 @@
-       "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "punycode": "1.4.1"
-+=======
-+        "punycode": "^1.4.1"
-+>>>>>>> .their
-       }
-     },
-     "tr46": {
-@@ -9395,6 +12860,7 @@
-       "integrity": "sha1-BTVocb7yOkNJBnNABvwYgza6gks=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "babel-code-frame": "6.26.0",
-         "colors": "1.2.5",
-         "diff": "3.5.0",
-@@ -9404,11 +12870,23 @@
-         "resolve": "1.7.1",
-         "tsutils": "1.9.1",
-         "update-notifier": "2.5.0"
-+=======
-+        "babel-code-frame": "^6.20.0",
-+        "colors": "^1.1.2",
-+        "diff": "^3.0.1",
-+        "findup-sync": "~0.3.0",
-+        "glob": "^7.1.1",
-+        "optimist": "~0.6.0",
-+        "resolve": "^1.1.7",
-+        "tsutils": "^1.1.0",
-+        "update-notifier": "^2.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "glob": {
-           "version": "7.1.2",
-           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+<<<<<<< .our
-           "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-           "dev": true,
-           "requires": {
-@@ -9418,6 +12896,17 @@
-             "minimatch": "3.0.4",
-             "once": "1.4.0",
-             "path-is-absolute": "1.0.1"
-+=======
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+          "dev": true,
-+          "requires": {
-+            "fs.realpath": "^1.0.0",
-+            "inflight": "^1.0.4",
-+            "inherits": "2",
-+            "minimatch": "^3.0.4",
-+            "once": "^1.3.0",
-+            "path-is-absolute": "^1.0.0"
-+>>>>>>> .their
-           }
-         },
-         "minimist": {
-@@ -9432,8 +12921,13 @@
-           "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "minimist": "0.0.10",
-             "wordwrap": "0.0.3"
-+=======
-+            "minimist": "~0.0.1",
-+            "wordwrap": "~0.0.2"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -9456,7 +12950,11 @@
-       "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "safe-buffer": "5.1.2"
-+=======
-+        "safe-buffer": "^5.0.1"
-+>>>>>>> .their
-       }
-     },
-     "tweetnacl": {
-@@ -9472,7 +12970,11 @@
-       "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "prelude-ls": "1.1.2"
-+=======
-+        "prelude-ls": "~1.1.2"
-+>>>>>>> .their
-       }
-     },
-     "typedarray": {
-@@ -9482,9 +12984,15 @@
-       "dev": true
-     },
-     "typescript": {
-+<<<<<<< .our
-       "version": "2.9.2",
-       "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
-       "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==",
-+=======
-+      "version": "2.8.3",
-+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.8.3.tgz",
-+      "integrity": "sha512-K7g15Bb6Ra4lKf7Iq2l/I5/En+hLIHmxWZGq3D4DIRNFxMNV6j2SHSvDOqs2tGd4UvD/fJvrwopzQXjLrT7Itw==",
-+>>>>>>> .their
-       "dev": true
-     },
-     "uc.micro": {
-@@ -9500,9 +13008,15 @@
-       "dev": true,
-       "optional": true,
-       "requires": {
-+<<<<<<< .our
-         "source-map": "0.5.7",
-         "uglify-to-browserify": "1.0.2",
-         "yargs": "3.10.0"
-+=======
-+        "source-map": "~0.5.1",
-+        "uglify-to-browserify": "~1.0.0",
-+        "yargs": "~3.10.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "yargs": {
-@@ -9512,9 +13026,15 @@
-           "dev": true,
-           "optional": true,
-           "requires": {
-+<<<<<<< .our
-             "camelcase": "1.2.1",
-             "cliui": "2.1.0",
-             "decamelize": "1.2.0",
-+=======
-+            "camelcase": "^1.0.2",
-+            "cliui": "^2.1.0",
-+            "decamelize": "^1.0.0",
-+>>>>>>> .their
-             "window-size": "0.1.0"
-           }
-         }
-@@ -9539,8 +13059,13 @@
-       "integrity": "sha512-+XZuV691Cn4zHsK0vkKYwBEwB74T3IZIcxrgn2E4rKwTfFyI1zCh7X7grwh9Re08fdPlarIdyWgI8aVB3F5A5g==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "inherits": "2.0.3",
-         "xtend": "4.0.1"
-+=======
-+        "inherits": "^2.0.1",
-+        "xtend": "^4.0.1"
-+>>>>>>> .their
-       }
-     },
-     "unified": {
-@@ -9549,12 +13074,21 @@
-       "integrity": "sha512-1k+KPhlVtqmG99RaTbAv/usu85fcSRu3wY8X+vnsEhIxNP5VbVIDiXnLqyKIG+UMdyTg0ZX9EI6k2AfjJkHPtA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "bail": "1.0.3",
-         "extend": "3.0.1",
-         "is-plain-obj": "1.1.0",
-         "trough": "1.0.2",
-         "vfile": "2.3.0",
-         "x-is-string": "0.1.0"
-+=======
-+        "bail": "^1.0.0",
-+        "extend": "^3.0.0",
-+        "is-plain-obj": "^1.1.0",
-+        "trough": "^1.0.0",
-+        "vfile": "^2.0.0",
-+        "x-is-string": "^0.1.0"
-+>>>>>>> .their
-       }
-     },
-     "unified-args": {
-@@ -9563,12 +13097,21 @@
-       "integrity": "sha1-jZubitNHvrN/QwVipixNNhtCIg8=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "camelcase": "4.1.0",
-         "chalk": "2.4.1",
-         "chokidar": "1.7.0",
-         "minimist": "1.2.0",
-         "text-table": "0.2.0",
-         "unified-engine": "4.0.1"
-+=======
-+        "camelcase": "^4.0.0",
-+        "chalk": "^2.0.0",
-+        "chokidar": "^1.5.1",
-+        "minimist": "^1.2.0",
-+        "text-table": "^0.2.0",
-+        "unified-engine": "^4.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "ansi-styles": {
-@@ -9577,7 +13120,11 @@
-           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "color-convert": "1.9.1"
-+=======
-+            "color-convert": "^1.9.0"
-+>>>>>>> .their
-           }
-         },
-         "camelcase": {
-@@ -9592,9 +13139,15 @@
-           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "ansi-styles": "3.2.1",
-             "escape-string-regexp": "1.0.5",
-             "supports-color": "5.4.0"
-+=======
-+            "ansi-styles": "^3.2.1",
-+            "escape-string-regexp": "^1.0.5",
-+            "supports-color": "^5.3.0"
-+>>>>>>> .their
-           }
-         },
-         "has-flag": {
-@@ -9609,7 +13162,11 @@
-           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "has-flag": "3.0.0"
-+=======
-+            "has-flag": "^3.0.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -9620,6 +13177,7 @@
-       "integrity": "sha1-lpKql/1cTsNoiXeeElFL746GP8M=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "concat-stream": "1.5.2",
-         "debug": "2.6.9",
-         "fault": "1.0.2",
-@@ -9639,6 +13197,27 @@
-         "x-is-function": "1.0.4",
-         "x-is-string": "0.1.0",
-         "xtend": "4.0.1"
-+=======
-+        "concat-stream": "^1.5.1",
-+        "debug": "^2.2.0",
-+        "fault": "^1.0.0",
-+        "fn-name": "^2.0.1",
-+        "glob": "^7.0.3",
-+        "ignore": "^3.2.0",
-+        "is-empty": "^1.0.0",
-+        "is-hidden": "^1.0.1",
-+        "is-object": "^1.0.1",
-+        "js-yaml": "^3.6.1",
-+        "load-plugin": "^2.0.0",
-+        "parse-json": "^2.2.0",
-+        "to-vfile": "^2.0.0",
-+        "trough": "^1.0.0",
-+        "vfile-reporter": "^4.0.0",
-+        "vfile-statistics": "^1.1.0",
-+        "x-is-function": "^1.0.4",
-+        "x-is-string": "^0.1.0",
-+        "xtend": "^4.0.1"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "glob": {
-@@ -9647,12 +13226,21 @@
-           "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "fs.realpath": "1.0.0",
-             "inflight": "1.0.6",
-             "inherits": "2.0.3",
-             "minimatch": "3.0.4",
-             "once": "1.4.0",
-             "path-is-absolute": "1.0.1"
-+=======
-+            "fs.realpath": "^1.0.0",
-+            "inflight": "^1.0.4",
-+            "inherits": "2",
-+            "minimatch": "^3.0.4",
-+            "once": "^1.3.0",
-+            "path-is-absolute": "^1.0.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -9663,7 +13251,11 @@
-       "integrity": "sha512-WkqwMC1aijHE17W3Z1co7aTI+Dzo1jHdwhI66fTClU1yOTbzAsTqlOD6eeR/MI9235Y3nu2jMDcm8GCeq4gaLg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "wrapped": "1.0.1"
-+=======
-+        "wrapped": "^1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "unified-message-control": {
-@@ -9673,8 +13265,13 @@
-       "dev": true,
-       "requires": {
-         "trim": "0.0.1",
-+<<<<<<< .our
-         "unist-util-visit": "1.3.1",
-         "vfile-location": "2.0.3"
-+=======
-+        "unist-util-visit": "^1.0.0",
-+        "vfile-location": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "uniq": {
-@@ -9689,7 +13286,11 @@
-       "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "crypto-random-string": "1.0.0"
-+=======
-+        "crypto-random-string": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "unist-util-generated": {
-@@ -9710,7 +13311,11 @@
-       "integrity": "sha512-GRi04yhng1WqBf5RBzPkOtWAadcZS2gvuOgNn/cyJBYNxtTuyYqTKN0eg4rC1YJwGnzrqfRB3dSKm8cNCjNirg==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "array-iterate": "1.1.2"
-+=======
-+        "array-iterate": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "unist-util-position": {
-@@ -9725,7 +13330,11 @@
-       "integrity": "sha512-XxoNOBvq1WXRKXxgnSYbtCF76TJrRoe5++pD4cCBsssSiWSnPEktyFrFLE8LTk3JW5mt9hB0Sk5zn4x/JeWY7Q==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unist-util-visit": "1.3.1"
-+=======
-+        "unist-util-visit": "^1.1.0"
-+>>>>>>> .their
-       }
-     },
-     "unist-util-stringify-position": {
-@@ -9740,6 +13349,7 @@
-       "integrity": "sha512-0fdB9EQJU0tho5tK0VzOJzAQpPv2LyLZ030b10GxuzAWEfvd54mpY7BMjQ1L69k2YNvL+SvxRzH0yUIehOO8aA==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unist-util-is": "2.1.2"
-       }
-     },
-@@ -9747,6 +13357,15 @@
-       "version": "0.1.2",
-       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-       "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-+=======
-+        "unist-util-is": "^2.1.1"
-+      }
-+    },
-+    "universalify": {
-+      "version": "0.1.1",
-+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz",
-+      "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=",
-+>>>>>>> .their
-       "dev": true
-     },
-     "unpipe": {
-@@ -9761,7 +13380,11 @@
-       "integrity": "sha1-F+soB5h/dpUunASF/DEdBqgmouA=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "os-homedir": "1.0.2"
-+=======
-+        "os-homedir": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "unzip-response": {
-@@ -9771,9 +13394,15 @@
-       "dev": true
-     },
-     "update-check": {
-+<<<<<<< .our
-       "version": "1.5.1",
-       "resolved": "https://registry.npmjs.org/update-check/-/update-check-1.5.1.tgz",
-       "integrity": "sha512-M3rjq5KwSrWZrm2GVPIQIF+NXpIn5I9mIV67gGoydptQvzRjLp9ZbM6ctFJeNuaWSm5+mNP7aInELjSiLcIw6A==",
-+=======
-+      "version": "1.3.2",
-+      "resolved": "https://registry.npmjs.org/update-check/-/update-check-1.3.2.tgz",
-+      "integrity": "sha512-0iGt63gXrsU4VTw4tIGVVk14H6KLHI7ExNPuSmdDdwUrUAQTBnh1hQcRpnoBWetb3/Ab4YyXK1iDWXP7D0VHTQ==",
-+>>>>>>> .their
-       "dev": true,
-       "requires": {
-         "registry-auth-token": "3.3.2",
-@@ -9786,6 +13415,7 @@
-       "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "boxen": "1.3.0",
-         "chalk": "2.4.1",
-         "configstore": "3.1.2",
-@@ -9796,6 +13426,18 @@
-         "latest-version": "3.1.0",
-         "semver-diff": "2.1.0",
-         "xdg-basedir": "3.0.0"
-+=======
-+        "boxen": "^1.2.1",
-+        "chalk": "^2.0.1",
-+        "configstore": "^3.0.0",
-+        "import-lazy": "^2.1.0",
-+        "is-ci": "^1.0.10",
-+        "is-installed-globally": "^0.1.0",
-+        "is-npm": "^1.0.0",
-+        "latest-version": "^3.0.0",
-+        "semver-diff": "^2.0.0",
-+        "xdg-basedir": "^3.0.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "ansi-styles": {
-@@ -9804,7 +13446,11 @@
-           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "color-convert": "1.9.1"
-+=======
-+            "color-convert": "^1.9.0"
-+>>>>>>> .their
-           }
-         },
-         "chalk": {
-@@ -9813,9 +13459,15 @@
-           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "ansi-styles": "3.2.1",
-             "escape-string-regexp": "1.0.5",
-             "supports-color": "5.4.0"
-+=======
-+            "ansi-styles": "^3.2.1",
-+            "escape-string-regexp": "^1.0.5",
-+            "supports-color": "^5.3.0"
-+>>>>>>> .their
-           }
-         },
-         "has-flag": {
-@@ -9830,7 +13482,11 @@
-           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "has-flag": "3.0.0"
-+=======
-+            "has-flag": "^3.0.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -9859,7 +13515,11 @@
-       "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "prepend-http": "1.0.4"
-+=======
-+        "prepend-http": "^1.0.1"
-+>>>>>>> .their
-       }
-     },
-     "user-home": {
-@@ -9868,7 +13528,11 @@
-       "integrity": "sha1-nHC/2Babwdy/SGBODwS4tJzenp8=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "os-homedir": "1.0.2"
-+=======
-+        "os-homedir": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "util": {
-@@ -9906,8 +13570,13 @@
-       "integrity": "sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "spdx-correct": "3.0.0",
-         "spdx-expression-parse": "3.0.0"
-+=======
-+        "spdx-correct": "^3.0.0",
-+        "spdx-expression-parse": "^3.0.0"
-+>>>>>>> .their
-       }
-     },
-     "vary": {
-@@ -9922,9 +13591,15 @@
-       "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "assert-plus": "1.0.0",
-         "core-util-is": "1.0.2",
-         "extsprintf": "1.3.0"
-+=======
-+        "assert-plus": "^1.0.0",
-+        "core-util-is": "1.0.2",
-+        "extsprintf": "^1.2.0"
-+>>>>>>> .their
-       }
-     },
-     "vfile": {
-@@ -9933,10 +13608,17 @@
-       "integrity": "sha512-ASt4mBUHcTpMKD/l5Q+WJXNtshlWxOogYyGYYrg4lt/vuRjC1EFQtlAofL5VmtVNIZJzWYFJjzGWZ0Gw8pzW1w==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "is-buffer": "1.1.6",
-         "replace-ext": "1.0.0",
-         "unist-util-stringify-position": "1.1.2",
-         "vfile-message": "1.0.1"
-+=======
-+        "is-buffer": "^1.1.4",
-+        "replace-ext": "1.0.0",
-+        "unist-util-stringify-position": "^1.0.0",
-+        "vfile-message": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "vfile-location": {
-@@ -9951,7 +13633,11 @@
-       "integrity": "sha512-vSGCkhNvJzO6VcWC6AlJW4NtYOVtS+RgCaqFIYUjoGIlHnFL+i0LbtYvonDWOMcB97uTPT4PRsyYY7REWC9vug==",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "unist-util-stringify-position": "1.1.2"
-+=======
-+        "unist-util-stringify-position": "^1.1.1"
-+>>>>>>> .their
-       }
-     },
-     "vfile-reporter": {
-@@ -9960,11 +13646,19 @@
-       "integrity": "sha1-6m8K4TQvSEFXOYXgX5QXNvJ96do=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "repeat-string": "1.6.1",
-         "string-width": "1.0.2",
-         "supports-color": "4.5.0",
-         "unist-util-stringify-position": "1.1.2",
-         "vfile-statistics": "1.1.1"
-+=======
-+        "repeat-string": "^1.5.0",
-+        "string-width": "^1.0.0",
-+        "supports-color": "^4.1.0",
-+        "unist-util-stringify-position": "^1.0.0",
-+        "vfile-statistics": "^1.1.0"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "has-flag": {
-@@ -9979,7 +13673,11 @@
-           "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "has-flag": "2.0.0"
-+=======
-+            "has-flag": "^2.0.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -10002,11 +13700,19 @@
-     "walk-sync": {
-       "version": "0.3.2",
-       "resolved": "https://registry.npmjs.org/walk-sync/-/walk-sync-0.3.2.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-SCcoCvxC0OA1NnxKTjHurA0Tb3U=",
-       "dev": true,
-       "requires": {
-         "ensure-posix-path": "1.0.2",
-         "matcher-collection": "1.0.5"
-+=======
-+      "integrity": "sha512-FMB5VqpLqOCcqrzA9okZFc0wq0Qbmdm396qJxvQZhDpyu0W95G9JCmp74tx7iyYnyOcBtUuKJsgIKAqjozvmmQ==",
-+      "dev": true,
-+      "requires": {
-+        "ensure-posix-path": "^1.0.0",
-+        "matcher-collection": "^1.0.0"
-+>>>>>>> .their
-       }
-     },
-     "webidl-conversions": {
-@@ -10023,16 +13729,27 @@
-       "dev": true,
-       "optional": true,
-       "requires": {
-+<<<<<<< .our
-         "tr46": "0.0.3"
-+=======
-+        "tr46": "~0.0.1"
-+>>>>>>> .their
-       }
-     },
-     "which": {
-       "version": "1.3.0",
-       "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-/wS9/AEO5UfXgL7DjhrBwnd9JTo=",
-       "dev": true,
-       "requires": {
-         "isexe": "2.0.0"
-+=======
-+      "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==",
-+      "dev": true,
-+      "requires": {
-+        "isexe": "^2.0.0"
-+>>>>>>> .their
-       }
-     },
-     "which-module": {
-@@ -10047,7 +13764,11 @@
-       "integrity": "sha1-AUKk6KJD+IgsAjOqDgKBqnYVInM=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "string-width": "2.1.1"
-+=======
-+        "string-width": "^2.1.1"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "ansi-regex": {
-@@ -10068,8 +13789,13 @@
-           "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "is-fullwidth-code-point": "2.0.0",
-             "strip-ansi": "4.0.0"
-+=======
-+            "is-fullwidth-code-point": "^2.0.0",
-+            "strip-ansi": "^4.0.0"
-+>>>>>>> .their
-           }
-         },
-         "strip-ansi": {
-@@ -10078,7 +13804,11 @@
-           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "ansi-regex": "3.0.0"
-+=======
-+            "ansi-regex": "^3.0.0"
-+>>>>>>> .their
-           }
-         }
-       }
-@@ -10102,8 +13832,13 @@
-       "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "string-width": "1.0.2",
-         "strip-ansi": "3.0.1"
-+=======
-+        "string-width": "^1.0.1",
-+        "strip-ansi": "^3.0.1"
-+>>>>>>> .their
-       }
-     },
-     "wrapped": {
-@@ -10113,7 +13848,11 @@
-       "dev": true,
-       "requires": {
-         "co": "3.1.0",
-+<<<<<<< .our
-         "sliced": "1.0.1"
-+=======
-+        "sliced": "^1.0.1"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "co": {
-@@ -10136,18 +13875,31 @@
-       "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "mkdirp": "0.5.1"
-+=======
-+        "mkdirp": "^0.5.1"
-+>>>>>>> .their
-       }
-     },
-     "write-file-atomic": {
-       "version": "2.3.0",
-       "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz",
-+<<<<<<< .our
-       "integrity": "sha1-H/YVdcLipOjlENb6TiQ8zhg5mas=",
-       "dev": true,
-       "requires": {
-         "graceful-fs": "4.1.11",
-         "imurmurhash": "0.1.4",
-         "signal-exit": "3.0.2"
-+=======
-+      "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==",
-+      "dev": true,
-+      "requires": {
-+        "graceful-fs": "^4.1.11",
-+        "imurmurhash": "^0.1.4",
-+        "signal-exit": "^3.0.2"
-+>>>>>>> .their
-       }
-     },
-     "x-is-function": {
-@@ -10199,6 +13951,7 @@
-       "integrity": "sha1-wMQpJMpKqmsObaFznfshZDn53cA=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "cliui": "3.2.0",
-         "decamelize": "1.2.0",
-         "get-caller-file": "1.0.2",
-@@ -10213,6 +13966,22 @@
-         "window-size": "0.2.0",
-         "y18n": "3.2.1",
-         "yargs-parser": "2.4.1"
-+=======
-+        "cliui": "^3.2.0",
-+        "decamelize": "^1.1.1",
-+        "get-caller-file": "^1.0.1",
-+        "lodash.assign": "^4.0.3",
-+        "os-locale": "^1.4.0",
-+        "read-pkg-up": "^1.0.1",
-+        "require-directory": "^2.1.1",
-+        "require-main-filename": "^1.0.1",
-+        "set-blocking": "^2.0.0",
-+        "string-width": "^1.0.1",
-+        "which-module": "^1.0.0",
-+        "window-size": "^0.2.0",
-+        "y18n": "^3.2.1",
-+        "yargs-parser": "^2.4.1"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "cliui": {
-@@ -10221,9 +13990,15 @@
-           "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-           "dev": true,
-           "requires": {
-+<<<<<<< .our
-             "string-width": "1.0.2",
-             "strip-ansi": "3.0.1",
-             "wrap-ansi": "2.1.0"
-+=======
-+            "string-width": "^1.0.1",
-+            "strip-ansi": "^3.0.1",
-+            "wrap-ansi": "^2.0.0"
-+>>>>>>> .their
-           }
-         },
-         "window-size": {
-@@ -10240,8 +14015,13 @@
-       "integrity": "sha1-hVaN488VD/SfpRgl8DqMiA3cxcQ=",
-       "dev": true,
-       "requires": {
-+<<<<<<< .our
-         "camelcase": "3.0.0",
-         "lodash.assign": "4.2.0"
-+=======
-+        "camelcase": "^3.0.0",
-+        "lodash.assign": "^4.0.6"
-+>>>>>>> .their
-       },
-       "dependencies": {
-         "camelcase": {
-added in both
-  our    100644 c081cd89450cd50efba1ec280ff1349a96ea3ce0 package.json
-  their  100644 6120673fa40adc1bf94316f575ac59cdc9069bbf package.json
-@@ -1,6 +1,10 @@
- {
-   "name": "electron",
-+<<<<<<< .our
-   "version": "4.0.0-nightly.20180821",
-+=======
-+  "version": "3.0.0-beta.3",
-+>>>>>>> .their
-   "repository": "https://github.com/electron/electron",
-   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
-   "devDependencies": {
-@@ -13,6 +17,7 @@
-     "dugite": "^1.45.0",
-     "electabul": "~0.0.4",
-     "electron-docs-linter": "^2.3.4",
-+<<<<<<< .our
-     "electron-typescript-definitions": "^1.3.6",
-     "github": "^9.2.0",
-     "html-entities": "^1.2.1",
-@@ -27,6 +32,18 @@
-     "request": "^2.68.0",
-     "semver": "^5.5.0",
-     "serve": "^6.5.8",
-+=======
-+    "electron-typescript-definitions": "^1.3.5",
-+    "github": "^9.2.0",
-+    "husky": "^0.14.3",
-+    "lint": "^1.1.2",
-+    "minimist": "^1.2.0",
-+    "nugget": "^2.0.1",
-+    "remark-cli": "^4.0.0",
-+    "remark-preset-lint-markdown-style-guide": "^2.1.1",
-+    "request": "^2.68.0",
-+    "serve": "^6.5.3",
-+>>>>>>> .their
-     "standard": "^10.0.0",
-     "standard-markdown": "^4.0.0",
-     "sumchecker": "^2.0.2",
-@@ -45,6 +62,7 @@
-   "private": true,
-   "scripts": {
-     "asar": "asar",
-+<<<<<<< .our
-     "bootstrap:dev": "python ./script/bootstrap.py -d -v",
-     "bootstrap": "python ./script/bootstrap.py -v",
-     "browserify": "browserify",
-@@ -54,11 +72,19 @@
-     "build:release": "python ./script/build.py -c R",
-     "rebuild-test-modules": "python ./script/rebuild-test-modules.py",
-     "check-tls": "python ./script/tls.py",
-+=======
-+    "bootstrap": "python ./script/bootstrap.py",
-+    "browserify": "browserify",
-+    "bump-version": "./script/bump-version.py",
-+    "build": "python ./script/build.py -c D",
-+    "rebuild-test-modules": "python ./script/rebuild-test-modules.py",
-+>>>>>>> .their
-     "clean": "python ./script/clean.py",
-     "clean-build": "python ./script/clean.py --build",
-     "clang-format": "find atom/ brightray/ chromium_src/ -iname *.h -o -iname *.cc -o -iname *.mm | xargs clang-format -i",
-     "coverage": "npm run instrument-code-coverage && npm test -- --use_instrumented_asar",
-     "instrument-code-coverage": "electabul instrument --input-path ./lib --output-path ./out/coverage/electron.asar",
-+<<<<<<< .our
-     "lint": "npm run lint:js && npm run lint:cpp && npm run lint:clang-format && npm run lint:py && npm run lint:docs",
-     "lint:js": "standard && cd spec && standard",
-     "lint:clang-format": "python script/run-clang-format.py -r -c atom/ chromium_src/ brightray/ || (echo \"\\nCode not formatted correctly.\" && exit 1)",
-@@ -67,12 +93,26 @@
-     "lint:docs": "remark docs -qf && npm run lint:js-in-markdown && npm run create-typescript-definitions && npm run lint:docs-relative-links",
-     "lint:docs-relative-links": "python ./script/check-relative-doc-links.py",
-     "lint:js-in-markdown": "standard-markdown docs",
-+=======
-+    "lint": "npm run lint-js && npm run lint-cpp && npm run lint-clang-format && npm run lint-py && npm run lint-docs",
-+    "lint-js": "standard && cd spec && standard",
-+    "lint-clang-format": "python script/run-clang-format.py -r -c atom/ chromium_src/ brightray/ || (echo \"\\nCode not formatted correctly.\" && exit 1)",
-+    "lint-cpp": "python ./script/cpplint.py",
-+    "lint-py": "python ./script/pylint.py",
-+    "lint-docs": "remark docs -qf && npm run lint-js-in-markdown && npm run create-typescript-definitions && npm run lint-docs-relative-links",
-+    "lint-docs-relative-links": "python ./script/check-relative-doc-links.py",
-+    "lint-js-in-markdown": "standard-markdown docs",
-+>>>>>>> .their
-     "create-api-json": "electron-docs-linter docs --outfile=out/electron-api.json --version=$npm_package_version",
-     "create-typescript-definitions": "npm run create-api-json && electron-typescript-definitions --in=out/electron-api.json --out=out/electron.d.ts",
-     "mock-release": "node ./script/ci-release-build.js",
-     "preinstall": "node -e 'process.exit(0)'",
-     "publish-to-npm": "node ./script/publish-to-npm.js",
-+<<<<<<< .our
-     "precommit": "python script/run-clang-format.py -r -c atom/ chromium_src/ brightray/ && npm run lint:js && remark docs -qf || (echo \"Code not formatted correctly.\" && exit 1)",
-+=======
-+    "precommit": "python script/run-clang-format.py -r -c atom/ chromium_src/ brightray/ || (echo \"Code not formatted correctly.\" && exit 1)",
-+>>>>>>> .their
-     "prepack": "check-for-leaks",
-     "prepush": "check-for-leaks",
-     "prepare-release": "node ./script/prepare-release.js",
-added in both
-  our    100755 e4aaf89e216b0164f15882a3040e8cac70bf1fd9 script/bootstrap.py
-  their  100755 3195fa459b918bd14baee8b8766cae8461a1ad62 script/bootstrap.py
-@@ -169,8 +169,11 @@
-     mkdir_p(target_dir)
-   else:
-     mkdir_p(DOWNLOAD_DIR)
-+<<<<<<< .our
-   if is_verbose_mode():
-     args += ['-v']
-+=======
-+>>>>>>> .their
-   if is_dev:
-     subprocess.check_call([sys.executable, script] + args)
-   else:
-added in both
-  our    100755 564adb2116312b0f6d0351096bd89cb373cd3bab script/bump-version.py
-  their  100755 c6daf4e26b210c92e0a2f57d8e5a804373b8f8fb script/bump-version.py
-@@ -5,12 +5,21 @@
- import sys
- import argparse
- 
-+<<<<<<< .our
- from lib.util import execute, get_electron_version, parse_version, scoped_cwd, \
- is_nightly, is_beta, is_stable, get_next_nightly, get_next_beta, \
- get_next_stable_from_pre, get_next_stable_from_stable, clean_parse_version
- 
- SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
- 
-+=======
-+from lib.util import execute, get_electron_version, parse_version, scoped_cwd
-+
-+
-+SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
-+
-+
-+>>>>>>> .their
- def main():
- 
-   parser = argparse.ArgumentParser(
-@@ -34,7 +43,18 @@
-     action='store',
-     default=None,
-     dest='bump',
-+<<<<<<< .our
-     help='increment [stable | beta | nightly]'
-+=======
-+    help='increment [major | minor | patch | beta]'
-+  )
-+  parser.add_argument(
-+    '--stable',
-+    action='store_true',
-+    default= False,
-+    dest='stable',
-+    help='promote to stable (i.e. remove `-beta.x` suffix)'
-+>>>>>>> .their
-   )
-   parser.add_argument(
-     '--dry-run',
-@@ -45,6 +65,7 @@
-   )
- 
-   args = parser.parse_args()
-+<<<<<<< .our
-   curr_version = get_electron_version()
- 
-   if args.bump not in ['stable', 'beta', 'nightly']:
-@@ -79,22 +100,50 @@
-       not_reached()
-   else:
-     raise Exception("Invalid current version: " + curr_version)
-+=======
-+>>>>>>> .their
- 
-   if args.new_version == None and args.bump == None and args.stable == False:
-     parser.print_help()
-     return 1
- 
-+<<<<<<< .our
-   versions = clean_parse_version(version)
-   suffix = ''
-   if '-' in version:
-     suffix = '-' + version.split('-')[1]
-     versions[3] = parse_version(version)[3]
-   version = version.split('-')[0]
-+=======
-+  increments = ['major', 'minor', 'patch', 'beta']
-+
-+  curr_version = get_electron_version()
-+  versions = parse_version(re.sub('-beta', '', curr_version))
-+
-+  if args.bump in increments:
-+    versions = increase_version(versions, increments.index(args.bump))
-+    if versions[3] == '0':
-+      # beta starts at 1
-+      versions = increase_version(versions, increments.index('beta'))
-+
-+  if args.stable == True:
-+    versions[3] = '0'
-+
-+  if args.new_version != None:
-+    versions = parse_version(re.sub('-beta', '', args.new_version))
-+
-+  version = '.'.join(versions[:3])
-+  suffix = '' if versions[3] == '0' else '-beta.' + versions[3]
-+>>>>>>> .their
- 
-   if args.dry_run:
-     print 'new version number would be: {0}\n'.format(version + suffix)
-     return 0
- 
-+<<<<<<< .our
-+=======
-+
-+>>>>>>> .their
-   with scoped_cwd(SOURCE_ROOT):
-     update_electron_gyp(version, suffix)
-     update_win_rc(version, versions)
-@@ -105,9 +154,12 @@
- 
-   print 'Bumped to version: {0}'.format(version + suffix)
- 
-+<<<<<<< .our
- def not_reached():
-   raise Exception('Unreachable code was reached')
- 
-+=======
-+>>>>>>> .their
- def increase_version(versions, index):
-   for i in range(index + 1, 4):
-     versions[i] = '0'
-@@ -116,8 +168,12 @@
- 
- 
- def update_electron_gyp(version, suffix):
-+<<<<<<< .our
-   pattern = re.compile(" *'version%' *: *'[0-9.]+(-beta[0-9.]*)?(-dev)?"
-     + "(-nightly[0-9.]*)?'")
-+=======
-+  pattern = re.compile(" *'version%' *: *'[0-9.]+(-beta[0-9.]*)?'")
-+>>>>>>> .their
-   with open('electron.gyp', 'r') as f:
-     lines = f.readlines()
- 
-@@ -209,6 +265,7 @@
- 
- 
- def tag_version(version, suffix):
-+<<<<<<< .our
-   execute([
-     'git',
-     'commit',
-@@ -217,6 +274,10 @@
-     'Bump v{0}'.format(version + suffix),
-     '-n'
-   ])
-+=======
-+  commit_message = 'Bump v{0}'.format(version + suffix)
-+  execute(['git', 'commit', '-a', '--no-verify', '-m', commit_message])
-+>>>>>>> .their
- 
- 
- if __name__ == '__main__':
-added in both
-  our    100644 be9f9597387f5f8b7bfddc61c202f32ce4c6d478 script/ci-release-build.js
-  their  100644 1a15cd55b266363bea4394e970d274b2caa2d716 script/ci-release-build.js
-@@ -1,5 +1,8 @@
-+<<<<<<< .our
- require('dotenv-safe').load()
- 
-+=======
-+>>>>>>> .their
- const assert = require('assert')
- const request = require('request')
- const buildAppVeyorURL = 'https://windows-ci.electronjs.org/api/builds'
-@@ -34,6 +37,7 @@
-           resolve(body)
-         }
-       } else {
-+<<<<<<< .our
-         console.error('Error occurred while requesting:', requestOptions.url)
-         if (parseResponse) {
-           try {
-@@ -41,6 +45,10 @@
-           } catch (err) {
-             console.log('Error: ', `(status ${res.statusCode})`, err || res.body, requestOptions)
-           }
-+=======
-+        if (parseResponse) {
-+          console.log('Error: ', `(status ${res.statusCode})`, err || JSON.parse(res.body), requestOptions)
-+>>>>>>> .their
-         } else {
-           console.log('Error: ', `(status ${res.statusCode})`, err || res.body, requestOptions)
-         }
-@@ -51,6 +59,10 @@
- }
- 
- async function circleCIcall (buildUrl, targetBranch, job, options) {
-+<<<<<<< .our
-+=======
-+  assert(process.env.CIRCLE_TOKEN, 'CIRCLE_TOKEN not found in environment')
-+>>>>>>> .their
-   console.log(`Triggering CircleCI to run build job: ${job} on branch: ${targetBranch} with release flag.`)
-   let buildRequest = {
-     'build_parameters': {
-@@ -83,6 +95,10 @@
- }
- 
- function buildAppVeyor (targetBranch, options) {
-+<<<<<<< .our
-+=======
-+  assert(process.env.APPVEYOR_TOKEN, 'APPVEYOR_TOKEN not found in environment')
-+>>>>>>> .their
-   const validJobs = Object.keys(appVeyorJobs)
-   if (options.job) {
-     assert(validJobs.includes(options.job), `Unknown AppVeyor CI job name: ${options.job}.  Valid values are: ${validJobs}.`)
-@@ -144,6 +160,10 @@
-     assert(vstsJobs.includes(options.job), `Unknown VSTS CI job name: ${options.job}. Valid values are: ${vstsJobs}.`)
-   }
-   console.log(`Triggering VSTS to run build on branch: ${targetBranch} with release flag.`)
-+<<<<<<< .our
-+=======
-+  assert(process.env.VSTS_TOKEN, 'VSTS_TOKEN not found in environment')
-+>>>>>>> .their
-   let environmentVariables = {}
- 
-   if (!options.ghRelease) {
-added in both
-  our    100755 4a6c0c7ce8f275175e48c4c380ff33627f7a5961 script/create-dist.py
-  their  100755 ae5ce3707c38e61716f96cf5e7627cc909597fb8 script/create-dist.py
-@@ -11,6 +11,7 @@
- if sys.platform == "win32":
-   import _winreg
- 
-+<<<<<<< .our
- from lib.config import BASE_URL, PLATFORM, build_env, \
-                        enable_verbose_mode, get_target_arch, get_zip_name
- 
-@@ -18,6 +19,12 @@
-                      execute, get_electron_version, make_zip, \
-                      parse_version, rm_rf, scoped_cwd
- 
-+=======
-+from lib.config import BASE_URL, PLATFORM, enable_verbose_mode, \
-+                       get_target_arch, get_zip_name, build_env
-+from lib.util import scoped_cwd, rm_rf, get_electron_version, make_zip, \
-+                     execute, electron_gyp, electron_features, parse_version
-+>>>>>>> .their
- from lib.env_util import get_vs_location
- 
- 
-@@ -147,7 +154,11 @@
- 
-   # Copy file and keep the executable bit.
-   shutil.copyfile(src, dest)
-+<<<<<<< .our
-   add_exec_bit(dest)
-+=======
-+  os.chmod(dest, os.stat(dest).st_mode | stat.S_IEXEC)
-+>>>>>>> .their
- 
- def copy_vcruntime_binaries():
-   arch = get_target_arch()
-@@ -302,7 +313,11 @@
-     dest = os.path.join(DIST_DIR, binary)
-     # Copy file and keep the executable bit.
-     shutil.copyfile(src, dest)
-+<<<<<<< .our
-     add_exec_bit(dest)
-+=======
-+    os.chmod(dest, os.stat(dest).st_mode | stat.S_IEXEC)
-+>>>>>>> .their
- 
-     dist_name = get_zip_name(binary, version)
-     zip_file = os.path.join(SOURCE_ROOT, 'dist', dist_name)
-added in both
-  our    100644 d8cfb2be8af17bc5536e521848c64b14b155015a script/find-release.js
-  their  100644 3cfd79aae1427c3b432076a869e6cf689d79871f script/find-release.js
-@@ -1,5 +1,8 @@
-+<<<<<<< .our
- if (!process.env.CI) require('dotenv-safe').load()
- 
-+=======
-+>>>>>>> .their
- const GitHub = require('github')
- const github = new GitHub()
- 
-@@ -14,7 +17,11 @@
-   github.authenticate({type: 'token', token: process.env.ELECTRON_GITHUB_TOKEN})
-   let releases = await github.repos.getReleases({
-     owner: 'electron',
-+<<<<<<< .our
-     repo: version.indexOf('nightly') > 0 ? 'nightlies' : 'electron'
-+=======
-+    repo: 'electron'
-+>>>>>>> .their
-   })
-   let targetRelease = releases.data.find(release => {
-     return release.tag_name === version
-added in both
-  our    100644 9b9c8029cb75a9d84c632d04f234c2020542ca68 script/lib/dbus_mock.py
-  their  100644 00b1fd98d7837cfef60460f9d456a5cb8340761c script/lib/dbus_mock.py
-@@ -6,6 +6,7 @@
- import sys
- 
- 
-+<<<<<<< .our
- def stop():
-     DBusTestCase.stop_dbus(DBusTestCase.system_bus_pid)
-     DBusTestCase.stop_dbus(DBusTestCase.session_bus_pid)
-@@ -26,3 +27,19 @@
-         subprocess.check_call(sys.argv[1:])
-     finally:
-         stop()
-+=======
-+def cleanup():
-+    DBusTestCase.stop_dbus(DBusTestCase.system_bus_pid)
-+    DBusTestCase.stop_dbus(DBusTestCase.session_bus_pid)
-+
-+
-+atexit.register(cleanup)
-+
-+dbusmock_log = sys.stdout if is_verbose_mode() else open(os.devnull, 'w')
-+
-+DBusTestCase.start_system_bus()
-+DBusTestCase.spawn_server_template('logind', None, dbusmock_log)
-+
-+DBusTestCase.start_session_bus()
-+DBusTestCase.spawn_server_template('notification_daemon', None, dbusmock_log)
-+>>>>>>> .their
-added in both
-  our    100644 d479d5a9556534c5d98ae1fdc97397cdd14376f5 script/lib/util.py
-  their  100644 3859bf64b43d2b4d42c027ebe1bdc713b3ce56ab script/lib/util.py
-@@ -2,13 +2,19 @@
- 
- import atexit
- import contextlib
-+<<<<<<< .our
- import datetime
-+=======
-+>>>>>>> .their
- import errno
- import platform
- import re
- import shutil
- import ssl
-+<<<<<<< .our
- import stat
-+=======
-+>>>>>>> .their
- import subprocess
- import sys
- import tarfile
-@@ -84,13 +90,20 @@
-     if hasattr(ssl, '_create_unverified_context'):
-       ssl._create_default_https_context = ssl._create_unverified_context
- 
-+<<<<<<< .our
-     print "Downloading %s to %s" % (url, path)
-+=======
-+>>>>>>> .their
-     web_file = urllib2.urlopen(url)
-     file_size = int(web_file.info().getheaders("Content-Length")[0])
-     downloaded_size = 0
-     block_size = 128
- 
-+<<<<<<< .our
-     ci = os.environ.get('CI') is not None
-+=======
-+    ci = os.environ.get('CI') == '1'
-+>>>>>>> .their
- 
-     while True:
-       buf = web_file.read(block_size)
-@@ -296,6 +309,7 @@
-         pass
-     else:
-       execute_stdout(args, env)
-+<<<<<<< .our
- 
- def add_exec_bit(filename):
-   os.chmod(filename, os.stat(filename).st_mode | stat.S_IEXEC)
-@@ -363,3 +377,5 @@
-   if pre is None:
-     return major + '.' + minor + '.' + patch
-   return major + "." + minor + "." + patch + '-' + pre
-+=======
-+>>>>>>> .their
-added in both
-  our    100755 72a28b719bf1ff7770692caef86c76746c4d8edf script/prepare-release.js
-  their  100755 8021fa331da3e8afd8810b8bb4a87eb39e859e75 script/prepare-release.js
-@@ -1,10 +1,17 @@
- #!/usr/bin/env node
- 
-+<<<<<<< .our
- if (!process.env.CI) require('dotenv-safe').load()
-+=======
-+>>>>>>> .their
- require('colors')
- const args = require('minimist')(process.argv.slice(2), {
-   boolean: ['automaticRelease', 'notesOnly', 'stable']
- })
-+<<<<<<< .our
-+=======
-+const assert = require('assert')
-+>>>>>>> .their
- const ciReleaseBuild = require('./ci-release-build')
- const { execSync } = require('child_process')
- const fail = '\u2717'.red
-@@ -15,13 +22,22 @@
- const pkg = require('../package.json')
- const readline = require('readline')
- const versionType = args._[0]
-+<<<<<<< .our
- const targetRepo = versionType === 'nightly' ? 'nightlies' : 'electron'
-+=======
-+>>>>>>> .their
- 
- // TODO (future) automatically determine version based on conventional commits
- // via conventional-recommended-bump
- 
-+<<<<<<< .our
- if (!versionType && !args.notesOnly) {
-   console.log(`Usage: prepare-release versionType [stable | beta | nightly]` +
-+=======
-+assert(process.env.ELECTRON_GITHUB_TOKEN, 'ELECTRON_GITHUB_TOKEN not found in environment')
-+if (!versionType && !args.notesOnly) {
-+  console.log(`Usage: prepare-release versionType [major | minor | patch | beta]` +
-+>>>>>>> .their
-      ` (--stable) (--notesOnly) (--automaticRelease) (--branch)`)
-   process.exit(1)
- }
-@@ -30,12 +46,19 @@
- const gitDir = path.resolve(__dirname, '..')
- github.authenticate({type: 'token', token: process.env.ELECTRON_GITHUB_TOKEN})
- 
-+<<<<<<< .our
- async function getNewVersion (dryRun) {
-   if (!dryRun) {
-     console.log(`Bumping for new "${versionType}" version.`)
-   }
-   let bumpScript = path.join(__dirname, 'bump-version.py')
-   let scriptArgs = [bumpScript, '--bump', versionType]
-+=======
-+function getNewVersion (dryRun) {
-+  console.log(`Bumping for new "${versionType}" version.`)
-+  let bumpScript = path.join(__dirname, 'bump-version.py')
-+  let scriptArgs = [bumpScript, `--bump ${versionType}`]
-+>>>>>>> .their
-   if (args.stable) {
-     scriptArgs.push('--stable')
-   }
-@@ -52,7 +75,10 @@
-     return newVersion
-   } catch (err) {
-     console.log(`${fail} Could not bump version, error was:`, err)
-+<<<<<<< .our
-     throw err
-+=======
-+>>>>>>> .their
-   }
- }
- 
-@@ -74,6 +100,7 @@
- }
- 
- async function getReleaseNotes (currentBranch) {
-+<<<<<<< .our
-   if (versionType === 'nightly') {
-     return 'Nightlies do not get release notes, please compare tags for info'
-   }
-@@ -81,6 +108,12 @@
-   let githubOpts = {
-     owner: 'electron',
-     repo: targetRepo,
-+=======
-+  console.log(`Generating release notes for ${currentBranch}.`)
-+  let githubOpts = {
-+    owner: 'electron',
-+    repo: 'electron',
-+>>>>>>> .their
-     base: `v${pkg.version}`,
-     head: currentBranch
-   }
-@@ -142,11 +175,19 @@
- 
- async function createRelease (branchToTarget, isBeta) {
-   let releaseNotes = await getReleaseNotes(branchToTarget)
-+<<<<<<< .our
-   let newVersion = await getNewVersion()
-   await tagRelease(newVersion)
-   const githubOpts = {
-     owner: 'electron',
-     repo: targetRepo
-+=======
-+  let newVersion = getNewVersion()
-+  await tagRelease(newVersion)
-+  const githubOpts = {
-+    owner: 'electron',
-+    repo: 'electron'
-+>>>>>>> .their
-   }
-   console.log(`Checking for existing draft release.`)
-   let releases = await github.repos.getReleases(githubOpts)
-@@ -164,6 +205,7 @@
-   githubOpts.draft = true
-   githubOpts.name = `electron ${newVersion}`
-   if (isBeta) {
-+<<<<<<< .our
-     if (newVersion.indexOf('nightly') > 0) {
-       githubOpts.body = `Note: This is a nightly release.  Please file new issues ` +
-         `for any bugs you find in it.\n \n This release is published to npm ` +
-@@ -175,13 +217,23 @@
-         `under the beta tag and can be installed via npm install electron@beta, ` +
-         `or npm i electron@${newVersion.substr(1)}.\n \n ${releaseNotes}`
-     }
-+=======
-+    githubOpts.body = `Note: This is a beta release.  Please file new issues ` +
-+      `for any bugs you find in it.\n \n This release is published to npm ` +
-+      `under the beta tag and can be installed via npm install electron@beta, ` +
-+      `or npm i electron@${newVersion.substr(1)}.\n \n ${releaseNotes}`
-+>>>>>>> .their
-     githubOpts.name = `${githubOpts.name}`
-     githubOpts.prerelease = true
-   } else {
-     githubOpts.body = releaseNotes
-   }
-   githubOpts.tag_name = newVersion
-+<<<<<<< .our
-   githubOpts.target_commitish = newVersion.indexOf('nightly') !== -1 ? 'master' : branchToTarget
-+=======
-+  githubOpts.target_commitish = branchToTarget
-+>>>>>>> .their
-   await github.repos.createRelease(githubOpts)
-     .catch(err => {
-       console.log(`${fail} Error creating new release: `, err)
-@@ -222,7 +274,11 @@
- }
- 
- async function verifyNewVersion () {
-+<<<<<<< .our
-   let newVersion = await getNewVersion(true)
-+=======
-+  let newVersion = getNewVersion(true)
-+>>>>>>> .their
-   let response
-   if (args.automaticRelease) {
-     response = 'y'
-@@ -250,6 +306,7 @@
-   })
- }
- 
-+<<<<<<< .our
- // function to determine if there have been commits to master since the last release
- async function changesToRelease () {
-   let lastCommitWasRelease = new RegExp(`^Bump v[0-9.]*(-beta[0-9.]*)?(-nightly[0-9.]*)?$`, 'g')
-@@ -278,6 +335,28 @@
-         process.exit(1)
-       }
-     }
-+=======
-+async function prepareRelease (isBeta, notesOnly) {
-+  if (args.automaticRelease && (pkg.version.indexOf('beta') === -1 ||
-+      versionType !== 'beta')) {
-+    console.log(`${fail} Automatic release is only supported for beta releases`)
-+    process.exit(1)
-+  }
-+  let currentBranch
-+  if (args.branch) {
-+    currentBranch = args.branch
-+  } else {
-+    currentBranch = await getCurrentBranch(gitDir)
-+  }
-+  if (notesOnly) {
-+    let releaseNotes = await getReleaseNotes(currentBranch)
-+    console.log(`Draft release notes are: \n${releaseNotes}`)
-+  } else {
-+    await verifyNewVersion()
-+    await createRelease(currentBranch, isBeta)
-+    await pushRelease(currentBranch)
-+    await runReleaseBuilds(currentBranch)
-+>>>>>>> .their
-   }
- }
- 
-added in both
-  our    100644 27290c513bb28d9bd394575d833f1e6786e3b479 script/publish-to-npm.js
-  their  100644 eb0702ff5ef265b545824ba21ffb4c5d760d5476 script/publish-to-npm.js
-@@ -3,6 +3,7 @@
- const path = require('path')
- const childProcess = require('child_process')
- const GitHubApi = require('github')
-+<<<<<<< .our
- const {GitProcess} = require('dugite')
- const request = require('request')
- const rootPackageJson = require('../package.json')
-@@ -12,6 +13,12 @@
-   process.exit(1)
- }
- 
-+=======
-+const request = require('request')
-+const assert = require('assert')
-+const rootPackageJson = require('../package.json')
-+
-+>>>>>>> .their
- const github = new GitHubApi({
-   // debug: true,
-   headers: { 'User-Agent': 'electron-npm-publisher' },
-@@ -73,7 +80,11 @@
- 
-   return github.repos.getReleases({
-     owner: 'electron',
-+<<<<<<< .our
-     repo: rootPackageJson.version.indexOf('nightly') > 0 ? 'nightlies' : 'electron'
-+=======
-+    repo: 'electron'
-+>>>>>>> .their
-   })
- })
- .then((releases) => {
-@@ -108,6 +119,7 @@
-     })
-   })
- })
-+<<<<<<< .our
- .then(async (release) => {
-   if (release.tag_name.indexOf('nightly') > 0) {
-     const currentBranch = await getCurrentBranch()
-@@ -119,6 +131,10 @@
-   } else {
-     npmTag = release.prerelease ? 'beta' : 'latest'
-   }
-+=======
-+.then((release) => {
-+  npmTag = release.prerelease ? 'beta' : 'latest'
-+>>>>>>> .their
- })
- .then(() => childProcess.execSync('npm pack', { cwd: tempDir }))
- .then(() => {
-@@ -129,14 +145,24 @@
-       env: Object.assign({}, process.env, { electron_config_cache: tempDir }),
-       cwd: tempDir
-     })
-+<<<<<<< .our
-     resolve(tarballPath)
-   })
- })
- .then((tarballPath) => childProcess.execSync(`npm publish ${tarballPath} --tag ${npmTag} --otp=${process.env.ELECTRON_NPM_OTP}`))
-+=======
-+    const checkVersion = childProcess.execSync(`${path.join(tempDir, 'node_modules', '.bin', 'electron')} -v`)
-+    assert.ok((`v${rootPackageJson.version}`.indexOf(checkVersion.toString().trim()) === 0), `Version is correct`)
-+    resolve(tarballPath)
-+  })
-+})
-+.then((tarballPath) => childProcess.execSync(`npm publish ${tarballPath} --tag ${npmTag}`))
-+>>>>>>> .their
- .catch((err) => {
-   console.error(`Error: ${err}`)
-   process.exit(1)
- })
-+<<<<<<< .our
- 
- async function getCurrentBranch () {
-   const gitDir = path.resolve(__dirname, '..')
-@@ -155,3 +181,5 @@
-     process.exit(1)
-   }
- }
-+=======
-+>>>>>>> .their
-added in both
-  our    100755 abf1800e33cebdc81f4498ad22aef26afc224945 script/rebuild-test-modules.py
-  their  100755 87add8c3116c47c9618e2fe45232dea9da5fb06d script/rebuild-test-modules.py
-@@ -39,8 +39,11 @@
-     iojs_lib = os.path.join(lib_dir, 'iojs.lib')
-     atom_lib = os.path.join(out_dir, 'node.dll.lib')
-     shutil.copy2(atom_lib, iojs_lib)
-+<<<<<<< .our
-     node_lib = os.path.join(lib_dir, 'node.lib')
-     shutil.copy2(atom_lib, node_lib)
-+=======
-+>>>>>>> .their
- 
-   # Native modules can only be compiled against release builds on Windows
-   if config[0] == 'R' or PLATFORM != 'win32':
-added in both
-  our    100755 84e00ad4f309201f151c3f8fcbaf9ee536c9b6cb script/release.js
-  their  100755 23c3e879e501f9c7a399b15a68e332b3197315a8 script/release.js
-@@ -1,8 +1,14 @@
- #!/usr/bin/env node
- 
-+<<<<<<< .our
- if (!process.env.CI) require('dotenv-safe').load()
- require('colors')
- const args = require('minimist')(process.argv.slice(2))
-+=======
-+require('colors')
-+const args = require('minimist')(process.argv.slice(2))
-+const assert = require('assert')
-+>>>>>>> .their
- const fs = require('fs')
- const { execSync } = require('child_process')
- const GitHub = require('github')
-@@ -16,16 +22,27 @@
- const sumchecker = require('sumchecker')
- const temp = require('temp').track()
- const { URL } = require('url')
-+<<<<<<< .our
- const targetRepo = pkgVersion.indexOf('nightly') > 0 ? 'nightlies' : 'electron'
- let failureCount = 0
- 
-+=======
-+let failureCount = 0
-+
-+assert(process.env.ELECTRON_GITHUB_TOKEN, 'ELECTRON_GITHUB_TOKEN not found in environment')
-+
-+>>>>>>> .their
- const github = new GitHub({
-   followRedirects: false
- })
- github.authenticate({type: 'token', token: process.env.ELECTRON_GITHUB_TOKEN})
- 
- async function getDraftRelease (version, skipValidation) {
-+<<<<<<< .our
-   let releaseInfo = await github.repos.getReleases({owner: 'electron', repo: targetRepo})
-+=======
-+  let releaseInfo = await github.repos.getReleases({owner: 'electron', repo: 'electron'})
-+>>>>>>> .their
-   let drafts
-   let versionToCheck
-   if (version) {
-@@ -95,6 +112,10 @@
-     `electron-${version}-linux-armv7l.zip`,
-     `electron-${version}-linux-ia32-symbols.zip`,
-     `electron-${version}-linux-ia32.zip`,
-+<<<<<<< .our
-+=======
-+//    `electron-${version}-linux-mips64el.zip`,
-+>>>>>>> .their
-     `electron-${version}-linux-x64-symbols.zip`,
-     `electron-${version}-linux-x64.zip`,
-     `electron-${version}-mas-x64-dsym.zip`,
-@@ -112,6 +133,10 @@
-     `ffmpeg-${version}-linux-arm64.zip`,
-     `ffmpeg-${version}-linux-armv7l.zip`,
-     `ffmpeg-${version}-linux-ia32.zip`,
-+<<<<<<< .our
-+=======
-+//    `ffmpeg-${version}-linux-mips64el.zip`,
-+>>>>>>> .their
-     `ffmpeg-${version}-linux-x64.zip`,
-     `ffmpeg-${version}-mas-x64.zip`,
-     `ffmpeg-${version}-win32-ia32.zip`,
-@@ -141,8 +166,11 @@
- }
- 
- function checkVersion () {
-+<<<<<<< .our
-   if (args.skipVersionCheck) return
- 
-+=======
-+>>>>>>> .their
-   console.log(`Verifying that app version matches package version ${pkgVersion}.`)
-   let startScript = path.join(__dirname, 'start.py')
-   let scriptArgs = ['--version']
-@@ -180,7 +208,15 @@
- function uploadIndexJson () {
-   console.log('Uploading index.json to S3.')
-   let scriptPath = path.join(__dirname, 'upload-index-json.py')
-+<<<<<<< .our
-   runScript(scriptPath, [pkgVersion])
-+=======
-+  let scriptArgs = []
-+  if (args.automaticRelease) {
-+    scriptArgs.push('-R')
-+  }
-+  runScript(scriptPath, scriptArgs)
-+>>>>>>> .their
-   console.log(`${pass} Done uploading index.json to S3.`)
- }
- 
-@@ -191,7 +227,11 @@
-     console.log(`${fileName} already exists on GitHub; deleting before creating new file.`)
-     await github.repos.deleteAsset({
-       owner: 'electron',
-+<<<<<<< .our
-       repo: targetRepo,
-+=======
-+      repo: 'electron',
-+>>>>>>> .their
-       id: existingAssets[0].id
-     }).catch(err => {
-       console.log(`${fail} Error deleting ${fileName} on GitHub:`, err)
-@@ -210,7 +250,11 @@
- async function uploadShasumFile (filePath, fileName, release) {
-   let githubOpts = {
-     owner: 'electron',
-+<<<<<<< .our
-     repo: targetRepo,
-+=======
-+    repo: 'electron',
-+>>>>>>> .their
-     id: release.id,
-     filePath,
-     name: fileName
-@@ -245,7 +289,11 @@
- async function publishRelease (release) {
-   let githubOpts = {
-     owner: 'electron',
-+<<<<<<< .our
-     repo: targetRepo,
-+=======
-+    repo: 'electron',
-+>>>>>>> .their
-     id: release.id,
-     tag_name: release.tag_name,
-     draft: false
-@@ -272,7 +320,10 @@
-     let draftRelease = await getDraftRelease()
-     uploadNodeShasums()
-     uploadIndexJson()
-+<<<<<<< .our
- 
-+=======
-+>>>>>>> .their
-     await createReleaseShasums(draftRelease)
-     // Fetch latest version of release before verifying
-     draftRelease = await getDraftRelease(pkgVersion, true)
-@@ -300,7 +351,11 @@
-   let downloadDir = await makeTempDir()
-   let githubOpts = {
-     owner: 'electron',
-+<<<<<<< .our
-     repo: targetRepo,
-+=======
-+    repo: 'electron',
-+>>>>>>> .their
-     headers: {
-       Accept: 'application/octet-stream'
-     }
-added in both
-  our    100644 010f094c9a426188a65443b114788a41969115de script/run-clang-format.py
-  their  100644 8b88153946ebc701b1f1f2c7ecbc0b941e6c1832 script/run-clang-format.py
-@@ -19,7 +19,10 @@
- import subprocess
- import sys
- import traceback
-+<<<<<<< .our
- import tempfile
-+=======
-+>>>>>>> .their
- 
- from functools import partial
- 
-@@ -69,8 +72,13 @@
-         difflib.unified_diff(
-             original,
-             reformatted,
-+<<<<<<< .our
-             fromfile='a/{}'.format(diff_file),
-             tofile='b/{}'.format(diff_file),
-+=======
-+            fromfile='{}\t(original)'.format(diff_file),
-+            tofile='{}\t(reformatted)'.format(diff_file),
-+>>>>>>> .their
-             n=3))
- 
- 
-@@ -313,12 +321,15 @@
-                 continue
-             if not args.quiet:
-                 print_diff(outs, use_color=colored_stdout)
-+<<<<<<< .our
-                 with tempfile.NamedTemporaryFile(delete=False) as patch_file:
-                     for line in outs:
-                         patch_file.write(line)
-                     patch_file.write('\n')
-                     print("\nTo apply this patch, run:\n$ git apply {}\n"
-                           .format(patch_file.name))
-+=======
-+>>>>>>> .their
-             if retcode == ExitStatus.SUCCESS:
-                 retcode = ExitStatus.DIFF
-     return retcode
-added in both
-  our    100755 46cada435e1bd6ecaa2111cdf29e5aeb834b227e script/test.py
-  their  100755 cb17102557dca975208140b479168906100cfd74 script/test.py
-@@ -18,9 +18,12 @@
-     # will be picked up by electron.
-     try:
-         import lib.dbus_mock
-+<<<<<<< .our
-         import atexit
-         lib.dbus_mock.start()
-         atexit.register(lib.dbus_mock.stop)
-+=======
-+>>>>>>> .their
-     except ImportError:
-         # If not available, the powerMonitor tests will be skipped since
-         # DBUS_SYSTEM_BUS_ADDRESS will not be set
-@@ -58,8 +61,11 @@
-     electron = os.path.join(SOURCE_ROOT, 'out', config,
-                               '{0}.exe'.format(PROJECT_NAME))
-     resources_path = os.path.join(SOURCE_ROOT, 'out', config)
-+<<<<<<< .our
-     if config != 'R':
-       os.environ['ELECTRON_SKIP_NATIVE_MODULE_TESTS'] = '1'
-+=======
-+>>>>>>> .their
-   else:
-     electron = os.path.join(SOURCE_ROOT, 'out', config, PROJECT_NAME)
-     resources_path = os.path.join(SOURCE_ROOT, 'out', config)
-added in both
-  our    100755 0bc9d0f632057f4a17aa811340ba21631433f173 script/update-external-binaries.py
-  their  100755 e67ac996e2605be675a0431db7fb61fd28a1445c script/update-external-binaries.py
-@@ -4,11 +4,19 @@
- import sys
- import os
- 
-+<<<<<<< .our
- from lib.config import PLATFORM, get_target_arch
- from lib.util import add_exec_bit, download, extract_zip, rm_rf, \
-                      safe_mkdir, tempdir
- 
- VERSION = 'v1.4.0'
-+=======
-+from lib.config import get_target_arch
-+from lib.util import safe_mkdir, rm_rf, extract_zip, tempdir, download
-+
-+
-+VERSION = 'v1.3.0'
-+>>>>>>> .their
- SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
- FRAMEWORKS_URL = 'http://github.com/electron/electron-frameworks/releases' \
-                  '/download/' + VERSION
-@@ -31,6 +39,7 @@
-   elif sys.platform in ['cygwin', 'win32']:
-     download_and_unzip('directxsdk-' + get_target_arch())
- 
-+<<<<<<< .our
-   # get sccache & set exec bit. https://bugs.python.org/issue15795
-   download_and_unzip('sccache-{0}-x64'.format(PLATFORM))
-   appname = 'sccache'
-@@ -38,6 +47,8 @@
-     appname += '.exe'
-   add_exec_bit(os.path.join('external_binaries', appname))
- 
-+=======
-+>>>>>>> .their
-   with open(version_file, 'w') as f:
-     f.write(VERSION)
- 
-added in both
-  our    100755 55d0675d0707d34c806847f3a64aa77f20a4830d script/upload-index-json.py
-  their  100755 f5e5b3c7a6adcaf7005ad9242c1664ad2f243d1f script/upload-index-json.py
-@@ -2,14 +2,22 @@
- 
- import os
- import sys
-+<<<<<<< .our
- import urllib2
- 
- from lib.config import s3_config
- from lib.util import s3put, scoped_cwd, safe_mkdir
-+=======
-+
-+from lib.config import PLATFORM, s3_config
-+from lib.util import electron_gyp, execute, s3put, scoped_cwd
-+
-+>>>>>>> .their
- 
- SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
- OUT_DIR     = os.path.join(SOURCE_ROOT, 'out', 'D')
- 
-+<<<<<<< .our
- BASE_URL = 'https://electron-metadumper.herokuapp.com/?version='
- 
- version = sys.argv[1]
-@@ -42,6 +50,26 @@
- 
-     with open(index_json, "w") as f:
-       f.write(new_content)
-+=======
-+PROJECT_NAME = electron_gyp()['project_name%']
-+PRODUCT_NAME = electron_gyp()['product_name%']
-+
-+
-+def main():
-+  # Upload the index.json.
-+  with scoped_cwd(SOURCE_ROOT):
-+    if sys.platform == 'darwin':
-+      electron = os.path.join(OUT_DIR, '{0}.app'.format(PRODUCT_NAME),
-+                                'Contents', 'MacOS', PRODUCT_NAME)
-+    elif sys.platform == 'win32':
-+      electron = os.path.join(OUT_DIR, '{0}.exe'.format(PROJECT_NAME))
-+    else:
-+      electron = os.path.join(OUT_DIR, PROJECT_NAME)
-+    index_json = os.path.relpath(os.path.join(OUT_DIR, 'index.json'))
-+    execute([electron,
-+             os.path.join('tools', 'dump-version-info.js'),
-+             index_json])
-+>>>>>>> .their
- 
-     bucket, access_key, secret_key = s3_config()
-     s3put(bucket, access_key, secret_key, OUT_DIR, 'atom-shell/dist',
-added in both
-  our    100644 2facda2daa1b8a8ccb63a28198a15b7e7ecb0880 script/upload-to-github.js
-  their  100644 7c3f8d9c11ce7b75f307850663efd2e571e8644a script/upload-to-github.js
-@@ -1,16 +1,24 @@
-+<<<<<<< .our
- if (!process.env.CI) require('dotenv-safe').load()
- 
-+=======
-+>>>>>>> .their
- const GitHub = require('github')
- const github = new GitHub()
- github.authenticate({type: 'token', token: process.env.ELECTRON_GITHUB_TOKEN})
- 
-+<<<<<<< .our
- if (process.argv.length < 6) {
-+=======
-+if (process.argv.length < 5) {
-+>>>>>>> .their
-   console.log('Usage: upload-to-github filePath fileName releaseId')
-   process.exit(1)
- }
- let filePath = process.argv[2]
- let fileName = process.argv[3]
- let releaseId = process.argv[4]
-+<<<<<<< .our
- let releaseVersion = process.argv[5]
- 
- const targetRepo = releaseVersion.indexOf('nightly') > 0 ? 'nightlies' : 'electron'
-@@ -18,6 +26,12 @@
- let githubOpts = {
-   owner: 'electron',
-   repo: targetRepo,
-+=======
-+
-+let githubOpts = {
-+  owner: 'electron',
-+  repo: 'electron',
-+>>>>>>> .their
-   id: releaseId,
-   filePath: filePath,
-   name: fileName
-@@ -39,7 +53,11 @@
-           console.log(`${fileName} already exists; will delete before retrying upload.`)
-           github.repos.deleteAsset({
-             owner: 'electron',
-+<<<<<<< .our
-             repo: targetRepo,
-+=======
-+            repo: 'electron',
-+>>>>>>> .their
-             id: existingAssets[0].id
-           }).then(uploadToGitHub).catch(uploadToGitHub)
-         } else {
-added in both
-  our    100755 2d9eaa201265971ca01acaea6e84a440e5db0532 script/upload.py
-  their  100755 6d71fc69d4d708cae4ee2f5a7d41e60bdc5d2e79 script/upload.py
-@@ -37,7 +37,11 @@
-   args = parse_args()
-   if  args.upload_to_s3:
-     utcnow = datetime.datetime.utcnow()
-+<<<<<<< .our
-     args.upload_timestamp = utcnow.strftime('%Y%m%d')
-+=======
-+    args.upload_timestamp = utcnow.strftime('%Y-%m-%d_%H:%M:%S')
-+>>>>>>> .their
- 
-   if not dist_newer_than_head():
-     run_python_script('create-dist.py')
-@@ -165,18 +169,30 @@
-     return
- 
-   # Upload the file.
-+<<<<<<< .our
-   upload_io_to_github(release, filename, file_path, args.version)
-+=======
-+  upload_io_to_github(release, filename, file_path)
-+>>>>>>> .their
- 
-   # Upload the checksum file.
-   upload_sha256_checksum(args.version, file_path)
- 
- 
-+<<<<<<< .our
- def upload_io_to_github(release, filename, filepath, version):
-   print 'Uploading %s to Github' % \
-       (filename)
-   script_path = os.path.join(SOURCE_ROOT, 'script', 'upload-to-github.js')
-   execute(['node', script_path, filepath, filename, str(release['id']),
-           version])
-+=======
-+def upload_io_to_github(release, filename, filepath):
-+  print 'Uploading %s to Github' % \
-+      (filename)
-+  script_path = os.path.join(SOURCE_ROOT, 'script', 'upload-to-github.js')
-+  execute(['node', script_path, filepath, filename, str(release['id'])])
-+>>>>>>> .their
- 
- 
- def upload_sha256_checksum(version, file_path, key_prefix=None):
-added in both
-  our    100755 5fe196270e64f8d9b5f16483a10425382135cc2e script/verify-ffmpeg.py
-  their  100755 1d78515a4ade0f9f283e9064ad08e3637affb003 script/verify-ffmpeg.py
-@@ -1,5 +1,9 @@
- #!/usr/bin/env python
-+<<<<<<< .our
- import argparse
-+=======
-+
-+>>>>>>> .their
- import os
- import shutil
- import subprocess
-@@ -17,10 +21,21 @@
- 
- 
- def main():
-+<<<<<<< .our
-   args = parse_args()
-   os.chdir(args.source_root)
- 
-   app_path = create_app_copy(args)
-+=======
-+  os.chdir(SOURCE_ROOT)
-+
-+  if len(sys.argv) == 2 and sys.argv[1] == '-R':
-+    config = 'R'
-+  else:
-+    config = 'D'
-+
-+  app_path = create_app_copy(config)
-+>>>>>>> .their
- 
-   if sys.platform == 'darwin':
-     electron = os.path.join(app_path, 'Contents', 'MacOS', PRODUCT_NAME)
-@@ -38,12 +53,20 @@
-     ffmpeg_name = 'libffmpeg.so'
- 
-   # Copy ffmpeg without proprietary codecs into app
-+<<<<<<< .our
-   shutil.copy(os.path.join(args.ffmpeg_path, ffmpeg_name), ffmpeg_app_path)
- 
-   returncode = 0
-   try:
-     test_path = os.path.join(SOURCE_ROOT, 'spec', 'fixtures',
-         'no-proprietary-codecs.js')
-+=======
-+  shutil.copy(os.path.join(FFMPEG_LIBCC_PATH, ffmpeg_name), ffmpeg_app_path)
-+
-+  returncode = 0
-+  try:
-+    test_path = os.path.join('spec', 'fixtures', 'no-proprietary-codecs.js')
-+>>>>>>> .their
-     subprocess.check_call([electron, test_path] + sys.argv[1:])
-   except subprocess.CalledProcessError as e:
-     returncode = e.returncode
-@@ -54,10 +77,16 @@
- 
- 
- # Create copy of app to install ffmpeg library without proprietary codecs into
-+<<<<<<< .our
- def create_app_copy(args):
-   initial_app_path = os.path.join(args.source_root, 'out', args.config)
-   app_path = os.path.join(args.source_root, 'out',
-     args.config + '-no-proprietary-codecs')
-+=======
-+def create_app_copy(config):
-+  initial_app_path = os.path.join(SOURCE_ROOT, 'out', config)
-+  app_path = os.path.join(SOURCE_ROOT, 'out', config + '-no-proprietary-codecs')
-+>>>>>>> .their
- 
-   if sys.platform == 'darwin':
-     app_name = '{0}.app'.format(PRODUCT_NAME)
-@@ -68,6 +97,7 @@
-   shutil.copytree(initial_app_path, app_path, symlinks=True)
-   return app_path
- 
-+<<<<<<< .our
- def parse_args():
-   parser = argparse.ArgumentParser(description='Test non-proprietary ffmpeg')
-   parser.add_argument('-c', '--config',
-@@ -81,6 +111,8 @@
-                       default=FFMPEG_LIBCC_PATH,
-                       required=False)
-   return parser.parse_args()
-+=======
-+>>>>>>> .their
- 
- if __name__ == '__main__':
-   sys.exit(main())
-added in both
-  our    100644 d224eda2989332c18d655cef05a8bacc2eb6d4b8 spec/api-app-spec.js
-  their  100644 37c5520a1d27d6988eb30267b7a8ca6ae83d2b20 spec/api-app-spec.js
-@@ -168,9 +168,14 @@
-       const electronPath = remote.getGlobal('process').execPath
- 
-       appProcess = ChildProcess.spawn(electronPath, [appPath])
-+<<<<<<< .our
-       appProcess.on('close', (code, signal) => {
-         expect(signal).to.equal(null, 'exit signal should be null, if you see this please tag @MarshallOfSound')
-         expect(code).to.equal(123, 'exit code should be 123, if you see this please tag @MarshallOfSound')
-+=======
-+      appProcess.on('close', code => {
-+        expect(code).to.equal(123)
-+>>>>>>> .their
-         done()
-       })
-     })
-@@ -796,7 +801,12 @@
-     })
-   })
- 
-+<<<<<<< .our
-   describe('getAppMetrics() API', () => {
-+=======
-+  // TODO(marshallofsound): [Ch66] Failed on Windows x64 + ia32 on CI, passes locally
-+  xdescribe('getAppMetrics() API', () => {
-+>>>>>>> .their
-     it('returns memory and cpu stats of all running electron processes', () => {
-       const appMetrics = app.getAppMetrics()
-       expect(appMetrics).to.be.an('array').and.have.lengthOf.at.least(1, 'App memory info object is not > 0')
-@@ -804,6 +814,7 @@
-       const types = []
-       for (const {memory, pid, type, cpu} of appMetrics) {
-         expect(memory.workingSetSize).to.be.above(0, 'working set size is not > 0')
-+<<<<<<< .our
- 
-         // windows causes failures here due to CI server configuration
-         if (process.platform !== 'win32') {
-@@ -811,6 +822,10 @@
-           expect(memory.sharedBytes).to.be.above(0, 'shared bytes is not > 0')
-         }
- 
-+=======
-+        expect(memory.privateBytes).to.be.above(0, 'private bytes is not > 0')
-+        expect(memory.sharedBytes).to.be.above(0, 'shared bytes is not > 0')
-+>>>>>>> .their
-         expect(pid).to.be.above(0, 'pid is not > 0')
-         expect(type).to.be.a('string').that.is.not.empty()
- 
-added in both
-  our    100644 f4cba12ec19d224bc46fca898db42a99baf4972e spec/api-browser-window-spec.js
-  their  100644 36b98f5ff742246156749159d64463dfd358ce55 spec/api-browser-window-spec.js
-@@ -1,8 +1,12 @@
- 'use strict'
- 
- const assert = require('assert')
-+<<<<<<< .our
- const chai = require('chai')
- const dirtyChai = require('dirty-chai')
-+=======
-+const {expect} = require('chai')
-+>>>>>>> .their
- const fs = require('fs')
- const path = require('path')
- const os = require('os')
-@@ -14,12 +18,19 @@
- const {app, ipcMain, BrowserWindow, BrowserView, protocol, session, webContents} = remote
- 
- const features = process.atomBinding('features')
-+<<<<<<< .our
- const {expect} = chai
- const isCI = remote.getGlobal('isCi')
- const nativeModulesEnabled = remote.getGlobal('nativeModulesEnabled')
- 
- chai.use(dirtyChai)
- 
-+=======
-+
-+const isCI = remote.getGlobal('isCi')
-+const nativeModulesEnabled = remote.getGlobal('nativeModulesEnabled')
-+
-+>>>>>>> .their
- describe('BrowserWindow module', () => {
-   const fixtures = path.resolve(__dirname, 'fixtures')
-   let w = null
-@@ -27,6 +38,7 @@
-   let server
-   let postData
- 
-+<<<<<<< .our
-   const defaultOptions = {
-     show: false,
-     width: 400,
-@@ -45,6 +57,8 @@
-     return w
-   }
- 
-+=======
-+>>>>>>> .their
-   const closeTheWindow = function () {
-     return closeWindow(w).then(() => { w = null })
-   }
-@@ -99,13 +113,32 @@
-     server = null
-   })
- 
-+<<<<<<< .our
-   beforeEach(openTheWindow)
-+=======
-+  beforeEach(() => {
-+    w = new BrowserWindow({
-+      show: false,
-+      width: 400,
-+      height: 400,
-+      webPreferences: {
-+        backgroundThrottling: false
-+      }
-+    })
-+  })
-+>>>>>>> .their
- 
-   afterEach(closeTheWindow)
- 
-   describe('BrowserWindow constructor', () => {
-     it('allows passing void 0 as the webContents', () => {
-+<<<<<<< .our
-       openTheWindow({
-+=======
-+      w.close()
-+      w = null
-+      w = new BrowserWindow({
-+>>>>>>> .their
-         webContents: void 0
-       })
-     })
-@@ -217,7 +250,11 @@
-       const contents = w.webContents
-       w.destroy()
-       assert.throws(() => {
-+<<<<<<< .our
-         contents.getProcessId()
-+=======
-+        contents.getId()
-+>>>>>>> .their
-       }, /Object has been destroyed/)
-     })
-   })
-@@ -422,6 +459,7 @@
-   })
- 
-   describe('BrowserWindow.capturePage(rect, callback)', () => {
-+<<<<<<< .our
-     it('calls the callback with a Buffer', async () => {
-       const image = await new Promise((resolve) => {
-         w.capturePage({
-@@ -452,10 +490,46 @@
-       // Check the 25th byte in the PNG.
-       // Values can be 0,2,3,4, or 6. We want 6, which is RGB + Alpha
-       expect(imgBuffer[25]).to.equal(6)
-+=======
-+    it('calls the callback with a Buffer', (done) => {
-+      w.capturePage({
-+        x: 0,
-+        y: 0,
-+        width: 100,
-+        height: 100
-+      }, (image) => {
-+        assert.equal(image.isEmpty(), true)
-+        done()
-+      })
-+    })
-+
-+    it('preserves transparency', (done) => {
-+      w.close()
-+      const width = 400
-+      const height = 400
-+      w = new BrowserWindow({
-+        show: false,
-+        width: width,
-+        height: height,
-+        transparent: true
-+      })
-+      w.loadURL('data:text/html,<html><body background-color: rgba(255,255,255,0)></body></html>')
-+      w.once('ready-to-show', () => {
-+        w.show()
-+        w.capturePage((image) => {
-+          let imgBuffer = image.toPNG()
-+          // Check 25th byte in the PNG
-+          // Values can be 0,2,3,4, or 6. We want 6, which is RGB + Alpha
-+          assert.equal(imgBuffer[25], 6)
-+          done()
-+        })
-+      })
-+>>>>>>> .their
-     })
-   })
- 
-   describe('BrowserWindow.setSize(width, height)', () => {
-+<<<<<<< .our
-     it('sets the window size', async () => {
-       const size = [300, 400]
- 
-@@ -464,6 +538,15 @@
-       await resized
- 
-       assertBoundsEqual(w.getSize(), size)
-+=======
-+    it('sets the window size', (done) => {
-+      const size = [300, 400]
-+      w.once('resize', () => {
-+        assertBoundsEqual(w.getSize(), size)
-+        done()
-+      })
-+      w.setSize(size[0], size[1])
-+>>>>>>> .their
-     })
-   })
- 
-@@ -765,6 +848,7 @@
-     })
-   })
- 
-+<<<<<<< .our
-   describe('BrowserWindow.setWindowButtonVisibility()', () => {
-     before(function () {
-       if (process.platform !== 'darwin') {
-@@ -792,6 +876,8 @@
-     })
-   })
- 
-+=======
-+>>>>>>> .their
-   describe('BrowserWindow.setVibrancy(type)', () => {
-     it('allows setting, changing, and removing the vibrancy', () => {
-       assert.doesNotThrow(() => {
-@@ -928,6 +1014,7 @@
-     })
-   })
- 
-+<<<<<<< .our
-   describe('BrowserWindow.setShape(rects)', () => {
-     it('allows setting shape', () => {
-       assert.doesNotThrow(() => {
-@@ -939,6 +1026,8 @@
-     })
-   })
- 
-+=======
-+>>>>>>> .their
-   describe('"useContentSize" option', () => {
-     it('make window created with content size when used', () => {
-       w.destroy()
-@@ -1409,8 +1498,11 @@
-             preload: preload
-           }
-         })
-+<<<<<<< .our
-         ipcRenderer.send('set-web-preferences-on-next-new-window', w.webContents.id, 'preload', preload)
- 
-+=======
-+>>>>>>> .their
-         let htmlPath = path.join(fixtures, 'api', 'sandbox.html?verify-ipc-sender')
-         const pageUrl = 'file://' + htmlPath
-         let childWc
-@@ -1589,8 +1681,11 @@
-             sandbox: true
-           }
-         })
-+<<<<<<< .our
-         ipcRenderer.send('set-web-preferences-on-next-new-window', w.webContents.id, 'preload', preload)
- 
-+=======
-+>>>>>>> .their
-         w.loadURL('file://' + path.join(fixtures, 'api', 'sandbox.html?reload-remote-child'))
- 
-         ipcMain.on('get-remote-module-path', (event) => {
-@@ -1615,6 +1710,7 @@
-         })
-       })
- 
-+<<<<<<< .our
-       it('validates process APIs access in sandboxed renderer', (done) => {
-         ipcMain.once('answer', function (event, test) {
-           assert.equal(test.pid, w.webContents.getOSProcessId())
-@@ -1627,6 +1723,11 @@
-           assert.equal(test.type, 'renderer')
-           assert.equal(test.version, remote.process.version)
-           assert.deepEqual(test.versions, remote.process.versions)
-+=======
-+      it('validate process.env access in sandbox renderer', (done) => {
-+        ipcMain.once('answer', function (event, test) {
-+          assert.equal(test, 'foo')
-+>>>>>>> .their
-           done()
-         })
-         remote.process.env.sandboxmain = 'foo'
-@@ -3131,7 +3232,10 @@
-         typeofFunctionApply: 'function'
-       },
-       pageContext: {
-+<<<<<<< .our
-         openedLocation: '',
-+=======
-+>>>>>>> .their
-         preloadProperty: 'undefined',
-         pageProperty: 'string',
-         typeofRequire: 'undefined',
-added in both
-  our    100644 fb3ee998eace4401d6f129930d802677ce5feb85 spec/api-menu-item-spec.js
-  their  100644 9bbb2e38da2cecb068528ded21307b387da337f1 spec/api-menu-item-spec.js
-@@ -1,11 +1,16 @@
-+<<<<<<< .our
- const chai = require('chai')
- const dirtyChai = require('dirty-chai')
-+=======
-+const assert = require('assert')
-+>>>>>>> .their
- 
- const {remote} = require('electron')
- const {BrowserWindow, app, Menu, MenuItem} = remote
- const roles = require('../lib/browser/api/menu-item-roles')
- const {closeWindow} = require('./window-helpers')
- 
-+<<<<<<< .our
- const {expect} = chai
- chai.use(dirtyChai)
- 
-@@ -17,6 +22,16 @@
-         click: (item) => {
-           expect(item.constructor.name).to.equal('MenuItem')
-           expect(item.label).to.equal('text')
-+=======
-+describe('MenuItems', () => {
-+  describe('MenuItem.click', () => {
-+    it('should be called with the item object passed', (done) => {
-+      const menu = Menu.buildFromTemplate([{
-+        label: 'text',
-+        click: (item) => {
-+          assert.equal(item.constructor.name, 'MenuItem')
-+          assert.equal(item.label, 'text')
-+>>>>>>> .their
-           done()
-         }
-       }])
-@@ -31,9 +46,15 @@
-         type: 'checkbox'
-       }])
- 
-+<<<<<<< .our
-       expect(menu.items[0].checked).to.be.false()
-       menu.delegate.executeCommand(menu, {}, menu.items[0].commandId)
-       expect(menu.items[0].checked).to.be.true()
-+=======
-+      assert.equal(menu.items[0].checked, false)
-+      menu.delegate.executeCommand(menu, {}, menu.items[0].commandId)
-+      assert.equal(menu.items[0].checked, true)
-+>>>>>>> .their
-     })
- 
-     it('clicking an radio item should always make checked property true', () => {
-@@ -43,9 +64,15 @@
-       }])
- 
-       menu.delegate.executeCommand(menu, {}, menu.items[0].commandId)
-+<<<<<<< .our
-       expect(menu.items[0].checked).to.be.true()
-       menu.delegate.executeCommand(menu, {}, menu.items[0].commandId)
-       expect(menu.items[0].checked).to.be.true()
-+=======
-+      assert.equal(menu.items[0].checked, true)
-+      menu.delegate.executeCommand(menu, {}, menu.items[0].commandId)
-+      assert.equal(menu.items[0].checked, true)
-+>>>>>>> .their
-     })
- 
-     describe('MenuItem group properties', () => {
-@@ -100,7 +127,11 @@
-         const groups = findRadioGroups(template)
- 
-         groups.forEach(g => {
-+<<<<<<< .our
-           expect(findChecked(menu.items, g.begin, g.end)).to.deep.equal([g.begin])
-+=======
-+          assert.deepEqual(findChecked(menu.items, g.begin, g.end), [g.begin])
-+>>>>>>> .their
-         })
-       })
- 
-@@ -113,12 +144,20 @@
-           const groupId = menu.items[g.begin].groupId
- 
-           // groupId should be previously unused
-+<<<<<<< .our
-           expect(usedGroupIds.has(groupId)).to.be.false()
-+=======
-+          assert(!usedGroupIds.has(groupId))
-+>>>>>>> .their
-           usedGroupIds.add(groupId)
- 
-           // everything in the group should have the same id
-           for (let i = g.begin; i < g.end; ++i) {
-+<<<<<<< .our
-             expect(menu.items[i].groupId).to.equal(groupId)
-+=======
-+            assert.equal(menu.items[i].groupId, groupId)
-+>>>>>>> .their
-           }
-         })
-       })
-@@ -128,6 +167,7 @@
- 
-         const groups = findRadioGroups(template)
-         groups.forEach(g => {
-+<<<<<<< .our
-           expect(findChecked(menu.items, g.begin, g.end)).to.deep.equal([])
- 
-           menu.items[g.begin].checked = true
-@@ -135,6 +175,15 @@
- 
-           menu.items[g.end - 1].checked = true
-           expect(findChecked(menu.items, g.begin, g.end)).to.deep.equal([g.end - 1])
-+=======
-+          assert.deepEqual(findChecked(menu.items, g.begin, g.end), [])
-+
-+          menu.items[g.begin].checked = true
-+          assert.deepEqual(findChecked(menu.items, g.begin, g.end), [g.begin])
-+
-+          menu.items[g.end - 1].checked = true
-+          assert.deepEqual(findChecked(menu.items, g.begin, g.end), [g.end - 1])
-+>>>>>>> .their
-         })
-       })
-     })
-@@ -146,7 +195,11 @@
-       let item = new MenuItem({role: 'asdfghjkl'})
- 
-       const canExecute = roles.execute(item.role, win, win.webContents)
-+<<<<<<< .our
-       expect(canExecute).to.be.false()
-+=======
-+      assert.equal(false, canExecute)
-+>>>>>>> .their
- 
-       closeWindow(win).then(() => { win = null })
-     })
-@@ -156,7 +209,11 @@
-       let item = new MenuItem({role: 'reload'})
- 
-       const canExecute = roles.execute(item.role, win, win.webContents)
-+<<<<<<< .our
-       expect(canExecute).to.be.true()
-+=======
-+      assert.equal(true, canExecute)
-+>>>>>>> .their
- 
-       closeWindow(win).then(() => { win = null })
-     })
-@@ -166,7 +223,11 @@
-       let item = new MenuItem({role: 'resetzoom'})
- 
-       const canExecute = roles.execute(item.role, win, win.webContents)
-+<<<<<<< .our
-       expect(canExecute).to.be.true()
-+=======
-+      assert.equal(true, canExecute)
-+>>>>>>> .their
- 
-       closeWindow(win).then(() => { win = null })
-     })
-@@ -177,31 +238,53 @@
-       const item = new MenuItem({label: 'item'})
- 
-       const commandId = item.commandId
-+<<<<<<< .our
-       expect(commandId).to.not.be.undefined()
-       item.commandId = `${commandId}-modified`
-       expect(item.commandId).to.equal(commandId)
-+=======
-+      assert(commandId)
-+      item.commandId = `${commandId}-modified`
-+      assert.equal(item.commandId, commandId)
-+>>>>>>> .their
-     })
-   })
- 
-   describe('MenuItem with invalid type', () => {
-     it('throws an exception', () => {
-+<<<<<<< .our
-       expect(() => {
-+=======
-+      assert.throws(() => {
-+>>>>>>> .their
-         Menu.buildFromTemplate([{
-           label: 'text',
-           type: 'not-a-type'
-         }])
-+<<<<<<< .our
-       }).to.throw(/Unknown menu item type: not-a-type/)
-+=======
-+      }, /Unknown menu item type: not-a-type/)
-+>>>>>>> .their
-     })
-   })
- 
-   describe('MenuItem with submenu type and missing submenu', () => {
-     it('throws an exception', () => {
-+<<<<<<< .our
-       expect(() => {
-+=======
-+      assert.throws(() => {
-+>>>>>>> .their
-         Menu.buildFromTemplate([{
-           label: 'text',
-           type: 'submenu'
-         }])
-+<<<<<<< .our
-       }).to.throw(/Invalid submenu/)
-+=======
-+      }, /Invalid submenu/)
-+>>>>>>> .their
-     })
-   })
- 
-@@ -231,7 +314,11 @@
- 
-       for (let role in roleList) {
-         const item = new MenuItem({role})
-+<<<<<<< .our
-         expect(item.getDefaultRoleAccelerator()).to.be.undefined()
-+=======
-+        assert.equal(item.getDefaultRoleAccelerator(), undefined)
-+>>>>>>> .their
-       }
-     })
- 
-@@ -260,7 +347,11 @@
- 
-       for (let role in roleList) {
-         const item = new MenuItem({role})
-+<<<<<<< .our
-         expect(item.label).to.equal(roleList[role])
-+=======
-+        assert.equal(item.label, roleList[role])
-+>>>>>>> .their
-       }
-     })
- 
-@@ -289,7 +380,11 @@
- 
-       for (let role in roleList) {
-         const item = new MenuItem({role})
-+<<<<<<< .our
-         expect(item.getDefaultRoleAccelerator()).to.equal(roleList[role])
-+=======
-+        assert.equal(item.getDefaultRoleAccelerator(), roleList[role])
-+>>>>>>> .their
-       }
-     })
- 
-@@ -300,9 +395,15 @@
-         accelerator: 'D'
-       })
- 
-+<<<<<<< .our
-       expect(item.label).to.equal('Custom Close!')
-       expect(item.accelerator).to.equal('D')
-       expect(item.getDefaultRoleAccelerator()).to.equal('CommandOrControl+W')
-+=======
-+      assert.equal(item.label, 'Custom Close!')
-+      assert.equal(item.accelerator, 'D')
-+      assert.equal(item.getDefaultRoleAccelerator(), 'CommandOrControl+W')
-+>>>>>>> .their
-     })
-   })
- 
-@@ -310,6 +411,7 @@
-     it('includes a default submenu layout when submenu is empty', () => {
-       const item = new MenuItem({role: 'editMenu'})
- 
-+<<<<<<< .our
-       expect(item.label).to.equal('Edit')
-       expect(item.submenu.items[0].role).to.equal('undo')
-       expect(item.submenu.items[1].role).to.equal('redo')
-@@ -328,6 +430,26 @@
-         expect(item.submenu.items[6].role).to.equal('delete')
-         expect(item.submenu.items[7].type).to.equal('separator')
-         expect(item.submenu.items[8].role).to.equal('selectall')
-+=======
-+      assert.equal(item.label, 'Edit')
-+      assert.equal(item.submenu.items[0].role, 'undo')
-+      assert.equal(item.submenu.items[1].role, 'redo')
-+      assert.equal(item.submenu.items[2].type, 'separator')
-+      assert.equal(item.submenu.items[3].role, 'cut')
-+      assert.equal(item.submenu.items[4].role, 'copy')
-+      assert.equal(item.submenu.items[5].role, 'paste')
-+
-+      if (process.platform === 'darwin') {
-+        assert.equal(item.submenu.items[6].role, 'pasteandmatchstyle')
-+        assert.equal(item.submenu.items[7].role, 'delete')
-+        assert.equal(item.submenu.items[8].role, 'selectall')
-+      }
-+
-+      if (process.platform === 'win32') {
-+        assert.equal(item.submenu.items[6].role, 'delete')
-+        assert.equal(item.submenu.items[7].type, 'separator')
-+        assert.equal(item.submenu.items[8].role, 'selectall')
-+>>>>>>> .their
-       }
-     })
- 
-@@ -338,8 +460,13 @@
-           role: 'close'
-         }]
-       })
-+<<<<<<< .our
-       expect(item.label).to.equal('Edit')
-       expect(item.submenu.items[0].role).to.equal('close')
-+=======
-+      assert.equal(item.label, 'Edit')
-+      assert.equal(item.submenu.items[0].role, 'close')
-+>>>>>>> .their
-     })
-   })
- 
-@@ -347,6 +474,7 @@
-     it('includes a default submenu layout when submenu is empty', () => {
-       const item = new MenuItem({role: 'windowMenu'})
- 
-+<<<<<<< .our
-       expect(item.label).to.equal('Window')
-       expect(item.submenu.items[0].role).to.equal('minimize')
-       expect(item.submenu.items[1].role).to.equal('close')
-@@ -354,6 +482,15 @@
-       if (process.platform === 'darwin') {
-         expect(item.submenu.items[2].type).to.equal('separator')
-         expect(item.submenu.items[3].role).to.equal('front')
-+=======
-+      assert.equal(item.label, 'Window')
-+      assert.equal(item.submenu.items[0].role, 'minimize')
-+      assert.equal(item.submenu.items[1].role, 'close')
-+
-+      if (process.platform === 'darwin') {
-+        assert.equal(item.submenu.items[2].type, 'separator')
-+        assert.equal(item.submenu.items[3].role, 'front')
-+>>>>>>> .their
-       }
-     })
- 
-@@ -363,8 +500,13 @@
-         submenu: [{role: 'copy'}]
-       })
- 
-+<<<<<<< .our
-       expect(item.label).to.equal('Window')
-       expect(item.submenu.items[0].role).to.equal('copy')
-+=======
-+      assert.equal(item.label, 'Window')
-+      assert.equal(item.submenu.items[0].role, 'copy')
-+>>>>>>> .their
-     })
-   })
- 
-@@ -383,10 +525,17 @@
-         overrideProperty: 'oops not allowed'
-       }))
- 
-+<<<<<<< .our
-       expect(menu.items[0].customProp).to.equal('foo')
-       expect(menu.items[0].submenu.items[0].label).to.equal('item 1')
-       expect(menu.items[0].submenu.items[0].customProp).to.equal('bar')
-       expect(menu.items[0].submenu.items[0].overrideProperty).to.be.a('function')
-+=======
-+      assert.equal(menu.items[0].customProp, 'foo')
-+      assert.equal(menu.items[0].submenu.items[0].label, 'item 1')
-+      assert.equal(menu.items[0].submenu.items[0].customProp, 'bar')
-+      assert.equal(typeof menu.items[0].submenu.items[0].overrideProperty, 'function')
-+>>>>>>> .their
-     })
-   })
- })
-added in both
-  our    100644 ed2749700c6c8bf299f507d52606c1ae3f597e5c spec/api-menu-spec.js
-  their  100644 4a25e3ce4d7c05892374a0e93928e3a33b643174 spec/api-menu-spec.js
-@@ -1,14 +1,21 @@
-+<<<<<<< .our
- const chai = require('chai')
- const dirtyChai = require('dirty-chai')
-+=======
-+const assert = require('assert')
-+>>>>>>> .their
- 
- const {ipcRenderer, remote} = require('electron')
- const {BrowserWindow, Menu, MenuItem} = remote
- const {sortMenuItems} = require('../lib/browser/api/menu-utils')
- const {closeWindow} = require('./window-helpers')
- 
-+<<<<<<< .our
- const {expect} = chai
- chai.use(dirtyChai)
- 
-+=======
-+>>>>>>> .their
- describe('Menu module', () => {
-   describe('Menu.buildFromTemplate', () => {
-     it('should be able to attach extra fields', () => {
-@@ -18,17 +25,29 @@
-           extra: 'field'
-         }
-       ])
-+<<<<<<< .our
-       expect(menu.items[0].extra).to.equal('field')
-+=======
-+      assert.equal(menu.items[0].extra, 'field')
-+>>>>>>> .their
-     })
- 
-     it('does not modify the specified template', () => {
-       const template = [{label: 'text', submenu: [{label: 'sub'}]}]
-       const result = ipcRenderer.sendSync('eval', `const template = [{label: 'text', submenu: [{label: 'sub'}]}]\nrequire('electron').Menu.buildFromTemplate(template)\ntemplate`)
-+<<<<<<< .our
-       expect(result).to.deep.equal(template)
-     })
- 
-     it('does not throw exceptions for undefined/null values', () => {
-       expect(() => {
-+=======
-+      assert.deepStrictEqual(result, template)
-+    })
-+
-+    it('does not throw exceptions for undefined/null values', () => {
-+      assert.doesNotThrow(() => {
-+>>>>>>> .their
-         Menu.buildFromTemplate([
-           {
-             label: 'text',
-@@ -39,6 +58,7 @@
-             accelerator: null
-           }
-         ])
-+<<<<<<< .our
-       }).to.not.throw()
-     })
- 
-@@ -57,6 +77,9 @@
-       expect(() => {
-         Menu.buildFromTemplate([undefined])
-       }).to.throw(/Invalid template for MenuItem: must have at least one of label, role or type/)
-+=======
-+      })
-+>>>>>>> .their
-     })
- 
-     describe('Menu sorting and building', () => {
-@@ -87,7 +110,11 @@
-             }
-           ]
- 
-+<<<<<<< .our
-           expect(sortMenuItems(items)).to.deep.equal(expected)
-+=======
-+          assert.deepEqual(sortMenuItems(items), expected)
-+>>>>>>> .their
-         })
- 
-         it('resolves cycles by ignoring things that conflict', () => {
-@@ -119,7 +146,11 @@
-             }
-           ]
- 
-+<<<<<<< .our
-           expect(sortMenuItems(items)).to.deep.equal(expected)
-+=======
-+          assert.deepEqual(sortMenuItems(items), expected)
-+>>>>>>> .their
-         })
- 
-         it('ignores references to commands that do not exist', () => {
-@@ -149,7 +180,11 @@
-             }
-           ]
- 
-+<<<<<<< .our
-           expect(sortMenuItems(items)).to.deep.equal(expected)
-+=======
-+          assert.deepEqual(sortMenuItems(items), expected)
-+>>>>>>> .their
-         })
- 
-         it('only respects the first matching [before|after]GroupContaining rule in a given group', () => {
-@@ -199,7 +234,11 @@
-             }
-           ]
- 
-+<<<<<<< .our
-           expect(sortMenuItems(items)).to.deep.equal(expected)
-+=======
-+          assert.deepEqual(sortMenuItems(items), expected)
-+>>>>>>> .their
-         })
-       })
- 
-@@ -241,7 +280,11 @@
-             }
-           ]
- 
-+<<<<<<< .our
-           expect(sortMenuItems(items)).to.deep.equal(expected)
-+=======
-+          assert.deepEqual(sortMenuItems(items), expected)
-+>>>>>>> .their
-         })
- 
-         it("moves all items in the moving item's group", () => {
-@@ -289,7 +332,11 @@
-             }
-           ]
- 
-+<<<<<<< .our
-           expect(sortMenuItems(items)).to.deep.equal(expected)
-+=======
-+          assert.deepEqual(sortMenuItems(items), expected)
-+>>>>>>> .their
-         })
- 
-         it("ignores positions relative to commands that don't exist", () => {
-@@ -339,7 +386,11 @@
-             }
-           ]
- 
-+<<<<<<< .our
-           expect(sortMenuItems(items)).to.deep.equal(expected)
-+=======
-+          assert.deepEqual(sortMenuItems(items), expected)
-+>>>>>>> .their
-         })
- 
-         it('can handle recursive group merging', () => {
-@@ -377,7 +428,11 @@
-             }
-           ]
- 
-+<<<<<<< .our
-           expect(sortMenuItems(items)).to.deep.equal(expected)
-+=======
-+          assert.deepEqual(sortMenuItems(items), expected)
-+>>>>>>> .their
-         })
- 
-         it('can merge multiple groups when given a list of before/after commands', () => {
-@@ -415,7 +470,11 @@
-             }
-           ]
- 
-+<<<<<<< .our
-           expect(sortMenuItems(items)).to.deep.equal(expected)
-+=======
-+          assert.deepEqual(sortMenuItems(items), expected)
-+>>>>>>> .their
-         })
- 
-         it('can merge multiple groups based on both before/after commands', () => {
-@@ -455,7 +514,11 @@
-             }
-           ]
- 
-+<<<<<<< .our
-           expect(sortMenuItems(items)).to.deep.equal(expected)
-+=======
-+          assert.deepEqual(sortMenuItems(items), expected)
-+>>>>>>> .their
-         })
-       })
- 
-@@ -474,9 +537,15 @@
-           }
-         ])
- 
-+<<<<<<< .our
-         expect(menu.items[0].label).to.equal('one')
-         expect(menu.items[1].label).to.equal('two')
-         expect(menu.items[2].label).to.equal('three')
-+=======
-+        assert.equal(menu.items[0].label, 'one')
-+        assert.equal(menu.items[1].label, 'two')
-+        assert.equal(menu.items[2].label, 'three')
-+>>>>>>> .their
-       })
- 
-       it('should position after existing item', () => {
-@@ -495,9 +564,15 @@
-           }
-         ])
- 
-+<<<<<<< .our
-         expect(menu.items[0].label).to.equal('one')
-         expect(menu.items[1].label).to.equal('two')
-         expect(menu.items[2].label).to.equal('three')
-+=======
-+        assert.equal(menu.items[0].label, 'one')
-+        assert.equal(menu.items[1].label, 'two')
-+        assert.equal(menu.items[2].label, 'three')
-+>>>>>>> .their
-       })
- 
-       it('should filter excess menu separators', () => {
-@@ -515,10 +590,17 @@
-           }
-         ])
- 
-+<<<<<<< .our
-         expect(menuOne.items).to.have.length(3)
-         expect(menuOne.items[0].label).to.equal('a')
-         expect(menuOne.items[1].label).to.equal('b')
-         expect(menuOne.items[2].label).to.equal('c')
-+=======
-+        assert.equal(menuOne.items.length, 3)
-+        assert.equal(menuOne.items[0].label, 'a')
-+        assert.equal(menuOne.items[1].label, 'b')
-+        assert.equal(menuOne.items[2].label, 'c')
-+>>>>>>> .their
- 
-         const menuTwo = Menu.buildFromTemplate([
-           {
-@@ -538,10 +620,17 @@
-           }
-         ])
- 
-+<<<<<<< .our
-         expect(menuTwo.items).to.have.length(3)
-         expect(menuTwo.items[0].label).to.equal('a')
-         expect(menuTwo.items[1].label).to.equal('b')
-         expect(menuTwo.items[2].label).to.equal('c')
-+=======
-+        assert.equal(menuTwo.items.length, 3)
-+        assert.equal(menuTwo.items[0].label, 'a')
-+        assert.equal(menuTwo.items[1].label, 'b')
-+        assert.equal(menuTwo.items[2].label, 'c')
-+>>>>>>> .their
-       })
- 
-       it('should continue inserting items at next index when no specifier is present', () => {
-@@ -565,11 +654,19 @@
-           }
-         ])
- 
-+<<<<<<< .our
-         expect(menu.items[0].label).to.equal('one')
-         expect(menu.items[1].label).to.equal('two')
-         expect(menu.items[2].label).to.equal('three')
-         expect(menu.items[3].label).to.equal('four')
-         expect(menu.items[4].label).to.equal('five')
-+=======
-+        assert.equal(menu.items[0].label, 'one')
-+        assert.equal(menu.items[1].label, 'two')
-+        assert.equal(menu.items[2].label, 'three')
-+        assert.equal(menu.items[3].label, 'four')
-+        assert.equal(menu.items[4].label, 'five')
-+>>>>>>> .their
-       })
-     })
-   })
-@@ -589,7 +686,11 @@
-         }
-       ])
-       const fsc = menu.getMenuItemById('fullScreen')
-+<<<<<<< .our
-       expect(menu.items[0].submenu.items[0]).to.equal(fsc)
-+=======
-+      assert.equal(menu.items[0].submenu.items[0], fsc)
-+>>>>>>> .their
-     })
-   })
- 
-@@ -604,10 +705,17 @@
-       const item = new MenuItem({ label: 'inserted' })
- 
-       menu.insert(1, item)
-+<<<<<<< .our
-       expect(menu.items[0].label).to.equal('1')
-       expect(menu.items[1].label).to.equal('inserted')
-       expect(menu.items[2].label).to.equal('2')
-       expect(menu.items[3].label).to.equal('3')
-+=======
-+      assert.equal(menu.items[0].label, '1')
-+      assert.equal(menu.items[1].label, 'inserted')
-+      assert.equal(menu.items[2].label, '2')
-+      assert.equal(menu.items[3].label, '3')
-+>>>>>>> .their
-     })
-   })
- 
-@@ -622,10 +730,17 @@
-       const item = new MenuItem({ label: 'inserted' })
-       menu.append(item)
- 
-+<<<<<<< .our
-       expect(menu.items[0].label).to.equal('1')
-       expect(menu.items[1].label).to.equal('2')
-       expect(menu.items[2].label).to.equal('3')
-       expect(menu.items[3].label).to.equal('inserted')
-+=======
-+      assert.equal(menu.items[0].label, '1')
-+      assert.equal(menu.items[1].label, '2')
-+      assert.equal(menu.items[2].label, '3')
-+      assert.equal(menu.items[3].label, 'inserted')
-+>>>>>>> .their
-     })
-   })
- 
-@@ -649,6 +764,7 @@
-     })
- 
-     it('throws an error if options is not an object', () => {
-+<<<<<<< .our
-       expect(() => {
-         menu.popup('this is a string, not an object')
-       }).to.throw(/Options must be an object/)
-@@ -658,6 +774,11 @@
-       expect(() => {
-         menu.popup({})
-       }).to.not.throw()
-+=======
-+      assert.throws(() => {
-+        menu.popup()
-+      }, /Options must be an object/)
-+>>>>>>> .their
-     })
- 
-     it('should emit menu-will-show event', (done) => {
-@@ -674,17 +795,29 @@
-     it('returns immediately', () => {
-       const input = {window: w, x: 100, y: 101}
-       const output = menu.popup(input)
-+<<<<<<< .our
-       expect(output.x).to.equal(input.x)
-       expect(output.y).to.equal(input.y)
-       expect(output.browserWindow).to.equal(input.window)
-+=======
-+      assert.equal(output.x, input.x)
-+      assert.equal(output.y, input.y)
-+      assert.equal(output.browserWindow, input.window)
-+>>>>>>> .their
-     })
- 
-     it('works without a given BrowserWindow and options', () => {
-       const {browserWindow, x, y} = menu.popup({x: 100, y: 101})
- 
-+<<<<<<< .our
-       expect(browserWindow.constructor.name).to.equal('BrowserWindow')
-       expect(x).to.equal(100)
-       expect(y).to.equal(101)
-+=======
-+      assert.equal(browserWindow.constructor.name, 'BrowserWindow')
-+      assert.equal(x, 100)
-+      assert.equal(y, 101)
-+>>>>>>> .their
-     })
- 
-     it('works with a given BrowserWindow, options and callback', (done) => {
-@@ -695,8 +828,13 @@
-         callback: () => done()
-       })
- 
-+<<<<<<< .our
-       expect(x).to.equal(100)
-       expect(y).to.equal(101)
-+=======
-+      assert.equal(x, 100)
-+      assert.equal(y, 101)
-+>>>>>>> .their
-       menu.closePopup()
-     })
- 
-@@ -714,12 +852,20 @@
-       ])
- 
-       Menu.setApplicationMenu(menu)
-+<<<<<<< .our
-       expect(Menu.getApplicationMenu()).to.not.be.null()
-+=======
-+      assert.notEqual(Menu.getApplicationMenu(), null)
-+>>>>>>> .their
-     })
- 
-     it('unsets a menu with null', () => {
-       Menu.setApplicationMenu(null)
-+<<<<<<< .our
-       expect(Menu.getApplicationMenu()).to.be.null()
-+=======
-+      assert.equal(Menu.getApplicationMenu(), null)
-+>>>>>>> .their
-     })
-   })
- })
-added in both
-  our    100644 0546971b716e0d29d1e76d689be0a182c3f4b52d spec/api-native-image-spec.js
-  their  100644 87399921ff14ac2c594bb88a0c4493d4e9575e49 spec/api-native-image-spec.js
-@@ -1,5 +1,6 @@
- 'use strict'
- 
-+<<<<<<< .our
- const chai = require('chai')
- const dirtyChai = require('dirty-chai')
- const {nativeImage} = require('electron')
-@@ -8,6 +9,14 @@
- const {expect} = chai
- chai.use(dirtyChai)
- 
-+=======
-+/* eslint-disable no-unused-expressions */
-+
-+const {expect} = require('chai')
-+const {nativeImage} = require('electron')
-+const path = require('path')
-+
-+>>>>>>> .their
- describe('nativeImage module', () => {
-   const ImageFormat = {
-     PNG: 'png',
-@@ -113,6 +122,7 @@
-       expect(empty.toDataURL()).to.equal('data:image/png;base64,')
-       expect(empty.toDataURL({scaleFactor: 2.0})).to.equal('data:image/png;base64,')
-       expect(empty.getSize()).to.deep.equal({width: 0, height: 0})
-+<<<<<<< .our
-       expect(empty.getBitmap()).to.be.empty()
-       expect(empty.getBitmap({scaleFactor: 2.0})).to.be.empty()
-       expect(empty.toBitmap()).to.be.empty()
-@@ -123,6 +133,18 @@
- 
-       if (process.platform === 'darwin') {
-         expect(empty.getNativeHandle()).to.be.empty()
-+=======
-+      expect(empty.getBitmap()).to.be.empty
-+      expect(empty.getBitmap({scaleFactor: 2.0})).to.be.empty
-+      expect(empty.toBitmap()).to.be.empty
-+      expect(empty.toBitmap({scaleFactor: 2.0})).to.be.empty
-+      expect(empty.toJPEG(100)).to.be.empty
-+      expect(empty.toPNG()).to.be.empty
-+      expect(empty.toPNG({scaleFactor: 2.0})).to.be.empty
-+
-+      if (process.platform === 'darwin') {
-+        expect(empty.getNativeHandle()).to.be.empty
-+>>>>>>> .their
-       }
-     })
-   })
-@@ -137,7 +159,11 @@
- 
-       const imageB = nativeImage.createFromBuffer(imageA.toPNG())
-       expect(imageB.getSize()).to.deep.equal({width: 538, height: 190})
-+<<<<<<< .our
-       expect(imageA.toBitmap().equals(imageB.toBitmap())).to.be.true()
-+=======
-+      expect(imageA.toBitmap().equals(imageB.toBitmap())).to.be.true
-+>>>>>>> .their
- 
-       const imageC = nativeImage.createFromBuffer(imageA.toJPEG(100))
-       expect(imageC.getSize()).to.deep.equal({width: 538, height: 190})
-@@ -216,7 +242,11 @@
-       expect(imageTwo.getSize()).to.deep.equal(
-           {width: imageData.width, height: imageData.height})
- 
-+<<<<<<< .our
-       expect(imageOne.toBitmap().equals(imageTwo.toBitmap())).to.be.true()
-+=======
-+      expect(imageOne.toBitmap().equals(imageTwo.toBitmap())).to.be.true
-+>>>>>>> .their
-     })
- 
-     it('supports a scale factor', () => {
-@@ -251,7 +281,11 @@
-       expect(imageC.getSize()).to.deep.equal(
-           {width: imageData.width, height: imageData.height})
- 
-+<<<<<<< .our
-       expect(imageB.toBitmap().equals(imageC.toBitmap())).to.be.true()
-+=======
-+      expect(imageB.toBitmap().equals(imageC.toBitmap())).to.be.true
-+>>>>>>> .their
-     })
- 
-     it('supports a scale factor', () => {
-@@ -280,23 +314,37 @@
-     })
- 
-     it('loads images from paths relative to the current working directory', () => {
-+<<<<<<< .our
-       const imagePath = path.relative('.', path.join(__dirname, 'fixtures', 'assets', 'logo.png'))
-       const image = nativeImage.createFromPath(imagePath)
-       expect(image.isEmpty()).to.be.false()
-+=======
-+      const imagePath = `.${path.sep}${path.join('spec', 'fixtures', 'assets', 'logo.png')}`
-+      const image = nativeImage.createFromPath(imagePath)
-+      expect(image.isEmpty()).to.be.false
-+>>>>>>> .their
-       expect(image.getSize()).to.deep.equal({width: 538, height: 190})
-     })
- 
-     it('loads images from paths with `.` segments', () => {
-       const imagePath = `${path.join(__dirname, 'fixtures')}${path.sep}.${path.sep}${path.join('assets', 'logo.png')}`
-       const image = nativeImage.createFromPath(imagePath)
-+<<<<<<< .our
-       expect(image.isEmpty()).to.be.false()
-+=======
-+      expect(image.isEmpty()).to.be.false
-+>>>>>>> .their
-       expect(image.getSize()).to.deep.equal({width: 538, height: 190})
-     })
- 
-     it('loads images from paths with `..` segments', () => {
-       const imagePath = `${path.join(__dirname, 'fixtures', 'api')}${path.sep}..${path.sep}${path.join('assets', 'logo.png')}`
-       const image = nativeImage.createFromPath(imagePath)
-+<<<<<<< .our
-       expect(image.isEmpty()).to.be.false()
-+=======
-+      expect(image.isEmpty()).to.be.false
-+>>>>>>> .their
-       expect(image.getSize()).to.deep.equal({width: 538, height: 190})
-     })
- 
-@@ -327,7 +375,11 @@
- 
-       const imagePath = path.join(__dirname, 'fixtures', 'assets', 'icon.ico')
-       const image = nativeImage.createFromPath(imagePath)
-+<<<<<<< .our
-       expect(image.isEmpty()).to.be.false()
-+=======
-+      expect(image.isEmpty()).to.be.false
-+>>>>>>> .their
-       expect(image.getSize()).to.deep.equal({width: 256, height: 256})
-     })
-   })
-@@ -357,7 +409,11 @@
-       }
- 
-       const image = nativeImage.createFromNamedImage('NSActionTemplate')
-+<<<<<<< .our
-       expect(image.isEmpty()).to.be.false()
-+=======
-+      expect(image.isEmpty()).to.be.false
-+>>>>>>> .their
-     })
- 
-     it('returns allows an HSL shift for a valid image on darwin', function () {
-@@ -368,7 +424,11 @@
-       }
- 
-       const image = nativeImage.createFromNamedImage('NSActionTemplate', [0.5, 0.2, 0.8])
-+<<<<<<< .our
-       expect(image.isEmpty()).to.be.false()
-+=======
-+      expect(image.isEmpty()).to.be.false
-+>>>>>>> .their
-     })
-   })
- 
-@@ -427,7 +487,11 @@
-       const cropB = image.crop({width: 25, height: 64, x: 30, y: 40})
-       expect(cropA.getSize()).to.deep.equal({width: 25, height: 64})
-       expect(cropB.getSize()).to.deep.equal({width: 25, height: 64})
-+<<<<<<< .our
-       expect(cropA.toPNG().equals(cropB.toPNG())).to.be.false()
-+=======
-+      expect(cropA.toPNG().equals(cropB.toPNG())).to.be.false
-+>>>>>>> .their
-     })
-   })
- 
-@@ -473,7 +537,11 @@
-         buffer: 'invalid'
-       })
- 
-+<<<<<<< .our
-       expect(image.isEmpty()).to.be.false()
-+=======
-+      expect(image.isEmpty()).to.be.false
-+>>>>>>> .their
-       expect(image.getSize()).to.deep.equal({width: 1, height: 1})
- 
-       expect(image.toDataURL({scaleFactor: 1.0})).to.equal(imageDataOne.dataUrl)
-@@ -508,7 +576,11 @@
-         dataURL: 'invalid'
-       })
- 
-+<<<<<<< .our
-       expect(image.isEmpty()).to.be.false()
-+=======
-+      expect(image.isEmpty()).to.be.false
-+>>>>>>> .their
-       expect(image.getSize()).to.deep.equal({width: 1, height: 1})
- 
-       expect(image.toDataURL({scaleFactor: 1.0})).to.equal(imageDataOne.dataUrl)
-added in both
-  our    100644 fa282244df66e955c97554c240f8e7bb7ca4cbf3 spec/api-net-log-spec.js
-  their  100644 1e9ca66722dc2f5fccc450729ef405d8d2bd8246 spec/api-net-log-spec.js
-@@ -1,5 +1,9 @@
-+<<<<<<< .our
- const chai = require('chai')
- const dirtyChai = require('dirty-chai')
-+=======
-+const assert = require('assert')
-+>>>>>>> .their
- const http = require('http')
- const fs = require('fs')
- const os = require('os')
-@@ -11,15 +15,22 @@
- const dumpFile = path.join(os.tmpdir(), 'net_log.json')
- const dumpFileDynamic = path.join(os.tmpdir(), 'net_log_dynamic.json')
- 
-+<<<<<<< .our
- const {expect} = chai
- chai.use(dirtyChai)
-+=======
-+>>>>>>> .their
- const isCI = remote.getGlobal('isCi')
- 
- describe('netLog module', () => {
-   let server
-   const connections = new Set()
- 
-+<<<<<<< .our
-   before(done => {
-+=======
-+  before((done) => {
-+>>>>>>> .their
-     server = http.createServer()
-     server.listen(0, '127.0.0.1', () => {
-       server.url = `http://127.0.0.1:${server.address().port}`
-@@ -36,7 +47,11 @@
-     })
-   })
- 
-+<<<<<<< .our
-   after(done => {
-+=======
-+  after((done) => {
-+>>>>>>> .their
-     for (const connection of connections) {
-       connection.destroy()
-     }
-@@ -55,6 +70,7 @@
-     }
-   })
- 
-+<<<<<<< .our
-   it('should begin and end logging to file when .startLogging() and .stopLogging() is called', done => {
-     expect(netLog.currentlyLogging).to.be.false()
-     expect(netLog.currentlyLoggingPath).to.equal('')
-@@ -70,11 +86,30 @@
- 
-       expect(path).to.equal(dumpFileDynamic)
-       expect(fs.existsSync(dumpFileDynamic)).to.be.true()
-+=======
-+  it('should begin and end logging to file when .startLogging() and .stopLogging() is called', (done) => {
-+    assert(!netLog.currentlyLogging)
-+    assert.equal(netLog.currentlyLoggingPath, '')
-+
-+    netLog.startLogging(dumpFileDynamic)
-+
-+    assert(netLog.currentlyLogging)
-+    assert.equal(netLog.currentlyLoggingPath, dumpFileDynamic)
-+
-+    netLog.stopLogging((path) => {
-+      assert(!netLog.currentlyLogging)
-+      assert.equal(netLog.currentlyLoggingPath, '')
-+
-+      assert.equal(path, dumpFileDynamic)
-+
-+      assert(fs.existsSync(dumpFileDynamic))
-+>>>>>>> .their
- 
-       done()
-     })
-   })
- 
-+<<<<<<< .our
-   it('should silence when .stopLogging() is called without calling .startLogging()', done => {
-     expect(netLog.currentlyLogging).to.be.false()
-     expect(netLog.currentlyLoggingPath).to.equal('')
-@@ -84,6 +119,17 @@
-       expect(netLog.currentlyLoggingPath).to.equal('')
- 
-       expect(path).to.equal('')
-+=======
-+  it('should silence when .stopLogging() is called without calling .startLogging()', (done) => {
-+    assert(!netLog.currentlyLogging)
-+    assert.equal(netLog.currentlyLoggingPath, '')
-+
-+    netLog.stopLogging((path) => {
-+      assert(!netLog.currentlyLogging)
-+      assert.equal(netLog.currentlyLoggingPath, '')
-+
-+      assert.equal(path, '')
-+>>>>>>> .their
- 
-       done()
-     })
-@@ -91,7 +137,11 @@
- 
-   // The following tests are skipped on Linux CI
- 
-+<<<<<<< .our
-   it('should begin and end logging automatically when --log-net-log is passed', done => {
-+=======
-+  it('should begin and end logging automatically when --log-net-log is passed', (done) => {
-+>>>>>>> .their
-     if (isCI && process.platform === 'linux') {
-       done()
-       return
-@@ -105,12 +155,20 @@
-       })
- 
-     appProcess.once('exit', () => {
-+<<<<<<< .our
-       expect(fs.existsSync(dumpFile)).to.be.true()
-+=======
-+      assert(fs.existsSync(dumpFile))
-+>>>>>>> .their
-       done()
-     })
-   })
- 
-+<<<<<<< .our
-   it('should begin and end logging automtically when --log-net-log is passed, and behave correctly when .startLogging() and .stopLogging() is called', done => {
-+=======
-+  it('should begin and end logging automtically when --log-net-log is passed, and behave correctly when .startLogging() and .stopLogging() is called', (done) => {
-+>>>>>>> .their
-     if (isCI && process.platform === 'linux') {
-       done()
-       return
-@@ -125,18 +183,31 @@
-         }
-       })
- 
-+<<<<<<< .our
-     appProcess.stdout.on('data', data => {
-+=======
-+    appProcess.stdout.on('data', (data) => {
-+>>>>>>> .their
-       console.log(data.toString())
-     })
- 
-     appProcess.once('exit', () => {
-+<<<<<<< .our
-       expect(fs.existsSync(dumpFile)).to.be.true()
-       expect(fs.existsSync(dumpFileDynamic)).to.be.true()
-+=======
-+      assert(fs.existsSync(dumpFile))
-+      assert(fs.existsSync(dumpFileDynamic))
-+>>>>>>> .their
-       done()
-     })
-   })
- 
-+<<<<<<< .our
-   it('should end logging automatically when only .startLogging() is called', done => {
-+=======
-+  it('should end logging automatically when only .startLogging() is called', (done) => {
-+>>>>>>> .their
-     if (isCI && process.platform === 'linux') {
-       done()
-       return
-@@ -151,7 +222,11 @@
-       })
- 
-     appProcess.once('exit', () => {
-+<<<<<<< .our
-       expect(fs.existsSync(dumpFileDynamic)).to.be.true()
-+=======
-+      assert(fs.existsSync(dumpFileDynamic))
-+>>>>>>> .their
-       done()
-     })
-   })
-added in both
-  our    100644 9ab56d88e50ae5891364cb271362e5ec0c0edd26 spec/api-notification-dbus-spec.js
-  their  100644 81c1b68f31d0c9490742d3bd4b4227abaaf72ca3 spec/api-notification-dbus-spec.js
-@@ -6,7 +6,11 @@
- //
- // See https://pypi.python.org/pypi/python-dbusmock to read about dbusmock.
- 
-+<<<<<<< .our
- const {expect} = require('chai')
-+=======
-+const assert = require('assert')
-+>>>>>>> .their
- const dbus = require('dbus-native')
- const Promise = require('bluebird')
- 
-@@ -27,12 +31,20 @@
-   before(async () => {
-     // init app
-     app.setName(appName)
-+<<<<<<< .our
-     app.setDesktopName(`${appName}.desktop`)
-+=======
-+    app.setDesktopName(appName + '.desktop')
-+>>>>>>> .their
-     // init dbus
-     const path = '/org/freedesktop/Notifications'
-     const iface = 'org.freedesktop.DBus.Mock'
-     const bus = dbus.sessionBus()
-+<<<<<<< .our
-     console.log(`session bus: ${process.env.DBUS_SESSION_BUS_ADDRESS}`)
-+=======
-+    console.log('session bus: ' + process.env.DBUS_SESSION_BUS_ADDRESS)
-+>>>>>>> .their
-     const service = bus.getService(serviceName)
-     const getInterface = Promise.promisify(service.getInterface, {context: service})
-     mock = await getInterface(path, iface)
-@@ -48,10 +60,17 @@
-     app.setVersion(realAppVersion)
-   })
- 
-+<<<<<<< .our
-   describe(`Notification module using ${serviceName}`, () => {
-     function onMethodCalled (done) {
-       function cb (name) {
-         console.log(`onMethodCalled: ${name}`)
-+=======
-+  describe('Notification module using ' + serviceName, () => {
-+    function onMethodCalled (done) {
-+      function cb (name) {
-+        console.log('onMethodCalled: ' + name)
-+>>>>>>> .their
-         if (name === 'Notify') {
-           mock.removeListener('MethodCalled', cb)
-           console.log('done')
-@@ -83,7 +102,11 @@
-       }
-     }
- 
-+<<<<<<< .our
-     before(done => {
-+=======
-+    before((done) => {
-+>>>>>>> .their
-       mock.on('MethodCalled', onMethodCalled(done))
-       // lazy load Notification after we listen to MethodCalled mock signal
-       Notification = require('electron').remote.Notification
-@@ -98,6 +121,7 @@
-       n.show()
-     })
- 
-+<<<<<<< .our
-     it(`should call ${serviceName} to show notifications`, async () => {
-       const calls = await getCalls()
-       expect(calls).to.be.an('array').of.lengthOf.at.least(1)
-@@ -108,6 +132,16 @@
- 
-       let args = unmarshalDBusNotifyArgs(lastCall[2])
-       expect(args).to.deep.equal({
-+=======
-+    it('should call ' + serviceName + ' to show notifications', async () => {
-+      const calls = await getCalls()
-+      assert(calls.length >= 1)
-+      let lastCall = calls[calls.length - 1]
-+      let methodName = lastCall[1]
-+      assert.equal(methodName, 'Notify')
-+      let args = unmarshalDBusNotifyArgs(lastCall[2])
-+      assert.deepEqual(args, {
-+>>>>>>> .their
-         app_name: appName,
-         replaces_id: 0,
-         app_icon: '',
-added in both
-  our    100644 ad8f1faea14208d2659c505105c1e70938bba2b9 spec/api-process-spec.js
-  their  100644 1de5e1a19dc7175eac1338b89d0f882a37bd91c0 spec/api-process-spec.js
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- const {expect} = require('chai')
- 
- describe('process module', () => {
-@@ -13,6 +14,16 @@
-       const cpuUsage = process.getCPUUsage()
-       expect(cpuUsage.percentCPUUsage).to.be.a('number')
-       expect(cpuUsage.idleWakeupsPerSecond).to.be.a('number')
-+=======
-+const assert = require('assert')
-+
-+describe('process module', () => {
-+  describe('process.getCPUUsage()', () => {
-+    it('returns a cpu usage object', () => {
-+      const cpuUsage = process.getCPUUsage()
-+      assert.equal(typeof cpuUsage.percentCPUUsage, 'number')
-+      assert.equal(typeof cpuUsage.idleWakeupsPerSecond, 'number')
-+>>>>>>> .their
-     })
-   })
- 
-@@ -25,6 +36,7 @@
- 
-     it('returns an io counters object', () => {
-       const ioCounters = process.getIOCounters()
-+<<<<<<< .our
-       expect(ioCounters.readOperationCount).to.be.a('number')
-       expect(ioCounters.writeOperationCount).to.be.a('number')
-       expect(ioCounters.otherOperationCount).to.be.a('number')
-@@ -49,12 +61,21 @@
-       const systemMemoryInfo = process.getSystemMemoryInfo()
-       expect(systemMemoryInfo.free).to.be.a('number')
-       expect(systemMemoryInfo.total).to.be.a('number')
-+=======
-+      assert.equal(typeof ioCounters.readOperationCount, 'number')
-+      assert.equal(typeof ioCounters.writeOperationCount, 'number')
-+      assert.equal(typeof ioCounters.otherOperationCount, 'number')
-+      assert.equal(typeof ioCounters.readTransferCount, 'number')
-+      assert.equal(typeof ioCounters.writeTransferCount, 'number')
-+      assert.equal(typeof ioCounters.otherTransferCount, 'number')
-+>>>>>>> .their
-     })
-   })
- 
-   describe('process.getHeapStatistics()', () => {
-     it('returns heap statistics object', () => {
-       const heapStats = process.getHeapStatistics()
-+<<<<<<< .our
-       expect(heapStats.totalHeapSize).to.be.a('number')
-       expect(heapStats.totalHeapSizeExecutable).to.be.a('number')
-       expect(heapStats.totalPhysicalSize).to.be.a('number')
-@@ -64,6 +85,17 @@
-       expect(heapStats.mallocedMemory).to.be.a('number')
-       expect(heapStats.peakMallocedMemory).to.be.a('number')
-       expect(heapStats.doesZapGarbage).to.be.a('boolean')
-+=======
-+      assert.equal(typeof heapStats.totalHeapSize, 'number')
-+      assert.equal(typeof heapStats.totalHeapSizeExecutable, 'number')
-+      assert.equal(typeof heapStats.totalPhysicalSize, 'number')
-+      assert.equal(typeof heapStats.totalAvailableSize, 'number')
-+      assert.equal(typeof heapStats.usedHeapSize, 'number')
-+      assert.equal(typeof heapStats.heapSizeLimit, 'number')
-+      assert.equal(typeof heapStats.mallocedMemory, 'number')
-+      assert.equal(typeof heapStats.peakMallocedMemory, 'number')
-+      assert.equal(typeof heapStats.doesZapGarbage, 'boolean')
-+>>>>>>> .their
-     })
-   })
- })
-added in both
-  our    100644 b9093d1d6335ece5ca713a668a67bf3b40f4fabe spec/api-session-spec.js
-  their  100644 7ac14e1f1f88549aa6594e96906cc77906c0accd spec/api-session-spec.js
-@@ -289,17 +289,24 @@
-       res.end(mockPDF)
-       downloadServer.close()
-     })
-+<<<<<<< .our
- 
-     const isPathEqual = (path1, path2) => {
-       return path.relative(path1, path2) === ''
-     }
-+=======
-+>>>>>>> .their
-     const assertDownload = (event, state, url, mimeType,
-                                    receivedBytes, totalBytes, disposition,
-                                    filename, port, savePath, isCustom) => {
-       assert.equal(state, 'completed')
-       assert.equal(filename, 'mock.pdf')
-+<<<<<<< .our
-       assert.ok(path.isAbsolute(savePath))
-       assert.ok(isPathEqual(savePath, path.join(__dirname, 'fixtures', 'mock.pdf')))
-+=======
-+      assert.equal(savePath, path.join(__dirname, 'fixtures', 'mock.pdf'))
-+>>>>>>> .their
-       if (isCustom) {
-         assert.equal(url, `${protocolName}://item`)
-       } else {
-added in both
-  our    100644 be02cb3f84001a541d64b11fe6eda50fc32e8afd spec/api-web-contents-spec.js
-  their  100644 b1b1d206a2934dbc0e6d3b57cffdc9b9345d7b7a spec/api-web-contents-spec.js
-@@ -4,6 +4,7 @@
- const http = require('http')
- const path = require('path')
- const {closeWindow} = require('./window-helpers')
-+<<<<<<< .our
- const {emittedOnce} = require('./events-helpers')
- const chai = require('chai')
- const dirtyChai = require('dirty-chai')
-@@ -16,6 +17,14 @@
- 
- chai.use(dirtyChai)
- 
-+=======
-+
-+const {ipcRenderer, remote} = require('electron')
-+const {BrowserWindow, webContents, ipcMain, session} = remote
-+
-+const isCi = remote.getGlobal('isCi')
-+
-+>>>>>>> .their
- /* The whole webContents API doesn't use standard callbacks */
- /* eslint-disable standard/no-callback-literal */
- 
-@@ -40,7 +49,11 @@
-     it('returns an array of web contents', (done) => {
-       w.webContents.on('devtools-opened', () => {
-         const all = webContents.getAllWebContents().sort((a, b) => {
-+<<<<<<< .our
-           return a.id - b.id
-+=======
-+          return a.getId() - b.getId()
-+>>>>>>> .their
-         })
- 
-         assert.ok(all.length >= 4)
-@@ -61,15 +74,26 @@
-       if (isCi) return done()
- 
-       const specWebContents = remote.getCurrentWebContents()
-+<<<<<<< .our
-       assert.equal(specWebContents.id, webContents.getFocusedWebContents().id)
- 
-       specWebContents.once('devtools-opened', () => {
-         assert.equal(specWebContents.devToolsWebContents.id, webContents.getFocusedWebContents().id)
-+=======
-+      assert.equal(specWebContents.getId(), webContents.getFocusedWebContents().getId())
-+
-+      specWebContents.once('devtools-opened', () => {
-+        assert.equal(specWebContents.devToolsWebContents.getId(), webContents.getFocusedWebContents().getId())
-+>>>>>>> .their
-         specWebContents.closeDevTools()
-       })
- 
-       specWebContents.once('devtools-closed', () => {
-+<<<<<<< .our
-         assert.equal(specWebContents.id, webContents.getFocusedWebContents().id)
-+=======
-+        assert.equal(specWebContents.getId(), webContents.getFocusedWebContents().getId())
-+>>>>>>> .their
-         done()
-       })
- 
-@@ -122,6 +146,7 @@
-     })
-   })
- 
-+<<<<<<< .our
-   // Disabled because flaky. See #13969
-   xdescribe('isCurrentlyAudible() API', () => {
-     it('returns whether audio is playing', async () => {
-@@ -138,6 +163,8 @@
-     })
-   })
- 
-+=======
-+>>>>>>> .their
-   describe('getWebPreferences() API', () => {
-     it('should not crash when called for devTools webContents', (done) => {
-       w.webContents.openDevTools()
-added in both
-  our    100644 489f68c96d41e80c308560a98486a07756a03be7 spec/asar-spec.js
-  their  100644 131619d5f21985ae1b904f53a37af8959a9ff11e spec/asar-spec.js
-@@ -2,7 +2,10 @@
- const ChildProcess = require('child_process')
- const fs = require('fs')
- const path = require('path')
-+<<<<<<< .our
- const util = require('util')
-+=======
-+>>>>>>> .their
- const {closeWindow} = require('./window-helpers')
- 
- const nativeImage = require('electron').nativeImage
-@@ -297,6 +300,7 @@
-       })
-     })
- 
-+<<<<<<< .our
-     describe('fs.realpathSync', () => {
-       it('returns real path root', () => {
-         const parent = fs.realpathSync(path.join(fixtures, 'asar'))
-@@ -395,61 +399,149 @@
-         const parent = fs.realpathSync.native(path.join(fixtures, 'asar'))
-         const p = path.join('a.asar', 'not-exist')
-         const throws = () => fs.realpathSync.native(path.join(parent, p))
-+=======
-+    describe('fs.realpathSync', function () {
-+      it('returns real path root', function () {
-+        var parent = fs.realpathSync(path.join(fixtures, 'asar'))
-+        var p = 'a.asar'
-+        var r = fs.realpathSync(path.join(parent, p))
-+        assert.equal(r, path.join(parent, p))
-+      })
-+
-+      it('returns real path of a normal file', function () {
-+        var parent = fs.realpathSync(path.join(fixtures, 'asar'))
-+        var p = path.join('a.asar', 'file1')
-+        var r = fs.realpathSync(path.join(parent, p))
-+        assert.equal(r, path.join(parent, p))
-+      })
-+
-+      it('returns real path of a normal directory', function () {
-+        var parent = fs.realpathSync(path.join(fixtures, 'asar'))
-+        var p = path.join('a.asar', 'dir1')
-+        var r = fs.realpathSync(path.join(parent, p))
-+        assert.equal(r, path.join(parent, p))
-+      })
-+
-+      it('returns real path of a linked file', function () {
-+        var parent = fs.realpathSync(path.join(fixtures, 'asar'))
-+        var p = path.join('a.asar', 'link2', 'link1')
-+        var r = fs.realpathSync(path.join(parent, p))
-+        assert.equal(r, path.join(parent, 'a.asar', 'file1'))
-+      })
-+
-+      it('returns real path of a linked directory', function () {
-+        var parent = fs.realpathSync(path.join(fixtures, 'asar'))
-+        var p = path.join('a.asar', 'link2', 'link2')
-+        var r = fs.realpathSync(path.join(parent, p))
-+        assert.equal(r, path.join(parent, 'a.asar', 'dir1'))
-+      })
-+
-+      it('returns real path of an unpacked file', function () {
-+        var parent = fs.realpathSync(path.join(fixtures, 'asar'))
-+        var p = path.join('unpack.asar', 'a.txt')
-+        var r = fs.realpathSync(path.join(parent, p))
-+        assert.equal(r, path.join(parent, p))
-+      })
-+
-+      it('throws ENOENT error when can not find file', function () {
-+        var parent = fs.realpathSync(path.join(fixtures, 'asar'))
-+        var p = path.join('a.asar', 'not-exist')
-+        var throws = function () {
-+          fs.realpathSync(path.join(parent, p))
-+        }
-+>>>>>>> .their
-         assert.throws(throws, /ENOENT/)
-       })
-     })
- 
-+<<<<<<< .our
-     describe('fs.realpath', () => {
-       it('returns real path root', done => {
-         const parent = fs.realpathSync(path.join(fixtures, 'asar'))
-         const p = 'a.asar'
-         fs.realpath(path.join(parent, p), (err, r) => {
-+=======
-+    describe('fs.realpath', function () {
-+      it('returns real path root', function (done) {
-+        var parent = fs.realpathSync(path.join(fixtures, 'asar'))
-+        var p = 'a.asar'
-+        fs.realpath(path.join(parent, p), function (err, r) {
-+>>>>>>> .their
-           assert.equal(err, null)
-           assert.equal(r, path.join(parent, p))
-           done()
-         })
-       })
- 
-+<<<<<<< .our
-       it('returns real path of a normal file', done => {
-         const parent = fs.realpathSync(path.join(fixtures, 'asar'))
-         const p = path.join('a.asar', 'file1')
-         fs.realpath(path.join(parent, p), (err, r) => {
-+=======
-+      it('returns real path of a normal file', function (done) {
-+        var parent = fs.realpathSync(path.join(fixtures, 'asar'))
-+        var p = path.join('a.asar', 'file1')
-+        fs.realpath(path.join(parent, p), function (err, r) {
-+>>>>>>> .their
-           assert.equal(err, null)
-           assert.equal(r, path.join(parent, p))
-           done()
-         })
-       })
- 
-+<<<<<<< .our
-       it('returns real path of a normal directory', done => {
-         const parent = fs.realpathSync(path.join(fixtures, 'asar'))
-         const p = path.join('a.asar', 'dir1')
-         fs.realpath(path.join(parent, p), (err, r) => {
-+=======
-+      it('returns real path of a normal directory', function (done) {
-+        var parent = fs.realpathSync(path.join(fixtures, 'asar'))
-+        var p = path.join('a.asar', 'dir1')
-+        fs.realpath(path.join(parent, p), function (err, r) {
-+>>>>>>> .their
-           assert.equal(err, null)
-           assert.equal(r, path.join(parent, p))
-           done()
-         })
-       })
- 
-+<<<<<<< .our
-       it('returns real path of a linked file', done => {
-         const parent = fs.realpathSync(path.join(fixtures, 'asar'))
-         const p = path.join('a.asar', 'link2', 'link1')
-         fs.realpath(path.join(parent, p), (err, r) => {
-+=======
-+      it('returns real path of a linked file', function (done) {
-+        var parent = fs.realpathSync(path.join(fixtures, 'asar'))
-+        var p = path.join('a.asar', 'link2', 'link1')
-+        fs.realpath(path.join(parent, p), function (err, r) {
-+>>>>>>> .their
-           assert.equal(err, null)
-           assert.equal(r, path.join(parent, 'a.asar', 'file1'))
-           done()
-         })
-       })
- 
-+<<<<<<< .our
-       it('returns real path of a linked directory', done => {
-         const parent = fs.realpathSync(path.join(fixtures, 'asar'))
-         const p = path.join('a.asar', 'link2', 'link2')
-         fs.realpath(path.join(parent, p), (err, r) => {
-+=======
-+      it('returns real path of a linked directory', function (done) {
-+        var parent = fs.realpathSync(path.join(fixtures, 'asar'))
-+        var p = path.join('a.asar', 'link2', 'link2')
-+        fs.realpath(path.join(parent, p), function (err, r) {
-+>>>>>>> .their
-           assert.equal(err, null)
-           assert.equal(r, path.join(parent, 'a.asar', 'dir1'))
-           done()
-         })
-       })
- 
-+<<<<<<< .our
-       it('returns real path of an unpacked file', done => {
-         const parent = fs.realpathSync(path.join(fixtures, 'asar'))
-         const p = path.join('unpack.asar', 'a.txt')
-@@ -475,12 +567,19 @@
-         const parent = fs.realpathSync.native(path.join(fixtures, 'asar'))
-         const p = 'a.asar'
-         fs.realpath.native(path.join(parent, p), (err, r) => {
-+=======
-+      it('returns real path of an unpacked file', function (done) {
-+        var parent = fs.realpathSync(path.join(fixtures, 'asar'))
-+        var p = path.join('unpack.asar', 'a.txt')
-+        fs.realpath(path.join(parent, p), function (err, r) {
-+>>>>>>> .their
-           assert.equal(err, null)
-           assert.equal(r, path.join(parent, p))
-           done()
-         })
-       })
- 
-+<<<<<<< .our
-       it('returns real path of a normal file', done => {
-         const parent = fs.realpathSync.native(path.join(fixtures, 'asar'))
-         const p = path.join('a.asar', 'file1')
-@@ -535,12 +634,21 @@
-         const parent = fs.realpathSync.native(path.join(fixtures, 'asar'))
-         const p = path.join('a.asar', 'not-exist')
-         fs.realpath.native(path.join(parent, p), err => {
-+=======
-+      it('throws ENOENT error when can not find file', function (done) {
-+        var parent = fs.realpathSync(path.join(fixtures, 'asar'))
-+        var p = path.join('a.asar', 'not-exist')
-+        fs.realpath(path.join(parent, p), function (err) {
-+>>>>>>> .their
-           assert.equal(err.code, 'ENOENT')
-           done()
-         })
-       })
-     })
-+<<<<<<< .our
- 
-+=======
-+>>>>>>> .their
-     describe('fs.readdirSync', function () {
-       it('reads dirs from root', function () {
-         var p = path.join(fixtures, 'asar', 'a.asar')
-@@ -671,6 +779,7 @@
-       })
-     })
- 
-+<<<<<<< .our
-     describe('fs.exists', function () {
-       it('handles an existing file', function (done) {
-         var p = path.join(fixtures, 'asar', 'a.asar', 'file1')
-@@ -725,6 +834,8 @@
-       })
-     })
- 
-+=======
-+>>>>>>> .their
-     describe('fs.access', function () {
-       it('accesses a normal file', function (done) {
-         var p = path.join(fixtures, 'asar', 'a.asar', 'file1')
-@@ -820,12 +931,15 @@
-           done()
-         })
-       })
-+<<<<<<< .our
- 
-       it('can be promisified', () => {
-         return util.promisify(ChildProcess.exec)('echo ' + echo + ' foo bar').then(({ stdout }) => {
-           assert.equal(stdout.toString().replace(/\r/g, ''), echo + ' foo bar\n')
-         })
-       })
-+=======
-+>>>>>>> .their
-     })
- 
-     describe('child_process.execSync', function () {
-@@ -862,12 +976,15 @@
-         var output = execFileSync(echo, ['test'])
-         assert.equal(String(output), 'test\n')
-       })
-+<<<<<<< .our
- 
-       it('can be promisified', () => {
-         return util.promisify(ChildProcess.execFile)(echo, ['test']).then(({ stdout }) => {
-           assert.equal(stdout, 'test\n')
-         })
-       })
-+=======
-+>>>>>>> .their
-     })
- 
-     describe('internalModuleReadJSON', function () {
-@@ -888,6 +1005,7 @@
-       })
-     })
- 
-+<<<<<<< .our
-     describe('util.promisify', function () {
-       it('can promisify all fs functions', function () {
-         const originalFs = require('original-fs')
-@@ -900,6 +1018,8 @@
-       })
-     })
- 
-+=======
-+>>>>>>> .their
-     describe('process.noAsar', function () {
-       var errorName = process.platform === 'win32' ? 'ENOENT' : 'ENOTDIR'
- 
-added in both
-  our    100644 d90269769d269e4054d25cba4b6c4ac8a1929aa6 spec/chromium-spec.js
-  their  100644 938798f001b866a34eae50db37c40e314866c28a spec/chromium-spec.js
-@@ -319,7 +319,11 @@
-       b = window.open(windowUrl, '', 'nodeIntegration=no,show=no')
-     })
- 
-+<<<<<<< .our
-     // TODO(codebytere): re-enable this test
-+=======
-+    // TODO(alexeykuzmin): [Ch66] Fix the test.
-+>>>>>>> .their
-     xit('disables node integration when it is disabled on the parent window for chrome devtools URLs', (done) => {
-       let b
-       app.once('web-contents-created', (event, contents) => {
-added in both
-  our    100644 245801b320d737e0a8c6c715753f2866ea8a96d2 spec/fixtures/api/isolated.html
-  their  100644 562bf01b7c1037431642c66e1e98c14514174bba spec/fixtures/api/isolated.html
-@@ -9,11 +9,17 @@
-       Function.prototype.apply = true
- 
-       const opened = window.open()
-+<<<<<<< .our
-       const openedLocation = opened.location
-       opened.close()
- 
-       window.postMessage({
-         openedLocation,
-+=======
-+      opened.close()
-+
-+      window.postMessage({
-+>>>>>>> .their
-         preloadProperty: typeof window.foo,
-         pageProperty: typeof window.hello,
-         typeofRequire: typeof require,
-added in both
-  our    100644 3a6945b0f2a1cb645a6ca7b0a97356c0164cc3b8 spec/fixtures/api/mixed-sandbox-app/main.js
-  their  100644 19b69e0189b16aa76e6d1f75ee5b2aabaaab031d spec/fixtures/api/mixed-sandbox-app/main.js
-@@ -10,6 +10,7 @@
-   app.enableMixedSandbox()
- }
- 
-+<<<<<<< .our
- let currentWindowSandboxed = false
- 
- app.once('ready', () => {
-@@ -36,6 +37,29 @@
-     })
-     currentWindow.webContents.openDevTools()
-   }
-+=======
-+let sandboxWindow
-+let noSandboxWindow
-+
-+app.once('ready', () => {
-+  sandboxWindow = new BrowserWindow({
-+    show: false,
-+    webPreferences: {
-+      preload: path.join(__dirname, 'electron-app-mixed-sandbox-preload.js'),
-+      sandbox: true
-+    }
-+  })
-+  sandboxWindow.loadURL('about:blank')
-+
-+  noSandboxWindow = new BrowserWindow({
-+    show: false,
-+    webPreferences: {
-+      preload: path.join(__dirname, 'electron-app-mixed-sandbox-preload.js'),
-+      sandbox: false
-+    }
-+  })
-+  noSandboxWindow.loadURL('about:blank')
-+>>>>>>> .their
- 
-   const argv = {
-     sandbox: null,
-@@ -46,10 +70,13 @@
- 
-   let connected = false
- 
-+<<<<<<< .our
-   testWindow(true, () => {
-     testWindow()
-   })
- 
-+=======
-+>>>>>>> .their
-   function finish () {
-     if (connected && argv.sandbox != null && argv.noSandbox != null &&
-         argv.noSandboxDevtools != null && argv.sandboxDevtools != null) {
-@@ -66,10 +93,29 @@
-     finish()
-   })
- 
-+<<<<<<< .our
-   ipcMain.on('argv', (event, value) => {
-     if (currentWindowSandboxed) {
-       argv.sandbox = value
-     } else {
-+=======
-+  noSandboxWindow.webContents.once('devtools-opened', () => {
-+    argv.noSandboxDevtools = true
-+    finish()
-+  })
-+  noSandboxWindow.webContents.openDevTools()
-+
-+  sandboxWindow.webContents.once('devtools-opened', () => {
-+    argv.sandboxDevtools = true
-+    finish()
-+  })
-+  sandboxWindow.webContents.openDevTools()
-+
-+  ipcMain.on('argv', (event, value) => {
-+    if (event.sender === sandboxWindow.webContents) {
-+      argv.sandbox = value
-+    } else if (event.sender === noSandboxWindow.webContents) {
-+>>>>>>> .their
-       argv.noSandbox = value
-     }
-     finish()
-added in both
-  our    100644 6901be56d0c5fa9f0a318edeb235eef60624ac52 spec/fixtures/module/preload-sandbox.js
-  their  100644 44c0226c7c01b87770b6f4def4ca4c16438fc44d spec/fixtures/module/preload-sandbox.js
-@@ -8,6 +8,7 @@
-     window.test = 'preload'
-     window.process = process
-     if (process.env.sandboxmain) {
-+<<<<<<< .our
-       window.test = {
-         env: process.env,
-         execPath: process.execPath,
-@@ -20,6 +21,9 @@
-         version: process.version,
-         versions: process.versions
-       }
-+=======
-+      window.test = process.env.sandboxmain
-+>>>>>>> .their
-     }
-   } else if (location.href !== 'about:blank') {
-     addEventListener('DOMContentLoaded', () => {
-added in both
-  our    100644 675d81e97b7240d61b49fbbbee857144033a0378 spec/fixtures/pages/a.html
-  their  100644 568973aed1cf5d40100d8b233fb9548d61bbebf2 spec/fixtures/pages/a.html
-@@ -1,7 +1,10 @@
- <html>
- <link rel="icon" type="image/png" href="/favicon.png"/>
- <link rel="icon" type="image/png" href="http://test.com/favicon.png"/>
-+<<<<<<< .our
- <meta http-equiv="content-security-policy" content="script-src 'self' 'unsafe-inline'" />
-+=======
-+>>>>>>> .their
- <body>
- <script type="text/javascript" charset="utf-8">
-   console.log('a');
-added in both
-  our    100644 9bb03494a56ffacec075c40bebde39a3b57ac734 spec/node-spec.js
-  their  100644 b87ed189633ade07bf1a02636e00f22078d34d35 spec/node-spec.js
-@@ -179,10 +179,13 @@
-       it('can be scheduled in time', (done) => {
-         remote.getGlobal('setTimeout')(done, 0)
-       })
-+<<<<<<< .our
- 
-       it('can be promisified', (done) => {
-         remote.getGlobal('setTimeoutPromisified')(0).then(done)
-       })
-+=======
-+>>>>>>> .their
-     })
- 
-     describe('setInterval called under Chromium event loop in browser process', () => {
-added in both
-  our    100644 fc1e153c0af2908cf7ee4c3ea4f05522de04f0f8 spec/static/index.html
-  their  100644 ca5cc28d4f9f860947454dfc964208dd13ba1434 spec/static/index.html
-@@ -10,8 +10,13 @@
- 
- <script type="text/javascript" charset="utf-8">
- (function() {
-+<<<<<<< .our
-   // Deprecated APIs are still supported and should be tested.
-   process.throwDeprecation = false
-+=======
-+  // Disable use of deprecated functions.
-+  process.throwDeprecation = true
-+>>>>>>> .their
- 
-   const path = require('path')
-   const electron = require('electron')
-added in both
-  our    100644 5659c44c8de4456a25e0026e29199b827c89cb08 spec/static/main.js
-  their  100644 d920426df3d9595b9366cb7f3e93a7c5471640f9 spec/static/main.js
-@@ -1,5 +1,10 @@
-+<<<<<<< .our
- // Deprecated APIs are still supported and should be tested.
- process.throwDeprecation = false
-+=======
-+// Disable use of deprecated functions.
-+process.throwDeprecation = true
-+>>>>>>> .their
- 
- const electron = require('electron')
- const {app, BrowserWindow, crashReporter, dialog, ipcMain, protocol, webContents} = electron
-@@ -79,8 +84,11 @@
-   event.returnValue = msg
- })
- 
-+<<<<<<< .our
- global.setTimeoutPromisified = util.promisify(setTimeout)
- 
-+=======
-+>>>>>>> .their
- const coverage = new Coverage({
-   outputPath: path.join(__dirname, '..', '..', 'out', 'coverage')
- })
-@@ -99,7 +107,11 @@
-   })
- }
- 
-+<<<<<<< .our
- global.nativeModulesEnabled = !process.env.ELECTRON_SKIP_NATIVE_MODULE_TESTS
-+=======
-+global.nativeModulesEnabled = process.platform !== 'win32' || process.execPath.toLowerCase().indexOf('\\out\\d\\') === -1
-+>>>>>>> .their
- 
- // Register app as standard scheme.
- global.standardScheme = 'app'
-added in both
-  our    100644 db75a4e3754e24a5e6740be61be4f4098c58006e spec/webview-spec.js
-  their  100644 7f52cad128fc4a30feae77bf0c9dbcb2124a5d15 spec/webview-spec.js
-@@ -5,7 +5,11 @@
- const http = require('http')
- const url = require('url')
- const {ipcRenderer, remote} = require('electron')
-+<<<<<<< .our
- const {app, session, ipcMain, BrowserWindow} = remote
-+=======
-+const {app, session, getGuestWebContents, ipcMain, BrowserWindow, webContents} = remote
-+>>>>>>> .their
- const {closeWindow} = require('./window-helpers')
- const {emittedOnce, waitForEvent} = require('./events-helpers')
- 
-@@ -248,6 +252,7 @@
-       })
-     })
- 
-+<<<<<<< .our
-     it('runs in the correct scope when sandboxed', async () => {
-       const message = await startLoadingWebViewAndWaitForMessage(webview, {
-         preload: `${fixtures}/module/preload-context.js`,
-@@ -264,6 +269,8 @@
-       })
-     })
- 
-+=======
-+>>>>>>> .their
-     it('preload script can require modules that still use "process" and "Buffer" when nodeintegration is off', async () => {
-       const message = await startLoadingWebViewAndWaitForMessage(webview, {
-         preload: `${fixtures}/module/preload-node-off-wrapper.js`,
-@@ -543,7 +550,10 @@
-           typeofFunctionApply: 'function'
-         },
-         pageContext: {
-+<<<<<<< .our
-           openedLocation: '',
-+=======
-+>>>>>>> .their
-           preloadProperty: 'undefined',
-           pageProperty: 'string',
-           typeofRequire: 'undefined',
-@@ -692,11 +702,19 @@
-     })
-   })
- 
-+<<<<<<< .our
-   // FIXME(zcbenz): Disabled because of moving to OOPIF webview.
-   xdescribe('setDevToolsWebContents() API', () => {
-     it('sets webContents of webview as devtools', async () => {
-       const webview2 = new WebView()
-       loadWebView(webview2)
-+=======
-+  describe('setDevToolsWebContents() API', () => {
-+    it('sets webContents of webview as devtools', async () => {
-+      const webview2 = new WebView()
-+      loadWebView(webview2)
-+      await waitForEvent(webview2, 'did-attach')
-+>>>>>>> .their
- 
-       // Setup an event handler for further usage.
-       const waitForDomReady = waitForEvent(webview2, 'dom-ready')
-@@ -1034,7 +1052,11 @@
-       assert.ok(webview.partition)
- 
-       const listener = function (webContents, permission, callback) {
-+<<<<<<< .our
-         if (webContents.id === webview.getWebContents().id) {
-+=======
-+        if (webContents.getId() === webview.getId()) {
-+>>>>>>> .their
-           // requestMIDIAccess with sysex requests both midi and midiSysex so
-           // grant the first midi one and then reject the midiSysex one
-           if (requestedPermission === 'midiSysex' && permission === 'midi') {
-@@ -1120,7 +1142,11 @@
-       webview.partition = 'permissionTest'
-       webview.setAttribute('nodeintegration', 'on')
-       session.fromPartition(webview.partition).setPermissionRequestHandler((webContents, permission, callback) => {
-+<<<<<<< .our
-         if (webContents.id === webview.getWebContents().id) {
-+=======
-+        if (webContents.getId() === webview.getId()) {
-+>>>>>>> .their
-           assert.equal(permission, 'notifications')
-           setTimeout(() => { callback(true) }, 10)
-         }
-@@ -1147,6 +1173,7 @@
- 
-     it('updates when the window is shown after the ready-to-show event', async () => {
-       const w = await openTheWindow({ show: false })
-+<<<<<<< .our
-       const readyToShowSignal = emittedOnce(w, 'ready-to-show')
-       const pongSignal1 = emittedOnce(ipcMain, 'pong')
-       w.loadURL(`file://${fixtures}/pages/webview-visibilitychange.html`)
-@@ -1156,6 +1183,14 @@
-       w.show()
- 
-       const [, visibilityState, hidden] = await pongSignal2
-+=======
-+      w.loadURL(`file://${fixtures}/pages/webview-visibilitychange.html`)
-+
-+      await emittedOnce(w, 'ready-to-show')
-+      w.show()
-+
-+      const [, visibilityState, hidden] = await emittedOnce(ipcMain, 'pong')
-+>>>>>>> .their
-       assert(!hidden)
-       assert.equal(visibilityState, 'visible')
-     })
-@@ -1181,6 +1216,7 @@
-   })
- 
-   describe('will-attach-webview event', () => {
-+<<<<<<< .our
-     it('does not emit when src is not changed', (done) => {
-       loadWebView(webview)
-       setTimeout(() => {
-@@ -1193,6 +1229,8 @@
-       })
-     })
- 
-+=======
-+>>>>>>> .their
-     it('supports changing the web preferences', async () => {
-       ipcRenderer.send('disable-node-on-next-will-attach-webview')
-       const message = await startLoadingWebViewAndWaitForMessage(webview, {
-@@ -1256,6 +1294,235 @@
-     expect(tabId).to.be.not.equal(w.webContents.id)
-   })
- 
-+<<<<<<< .our
-+=======
-+  // TODO(alexeykuzmin): Some tests rashe a renderer process.
-+  // Fix them and enable the tests.
-+  xdescribe('guestinstance attribute', () => {
-+    it('before loading there is no attribute', () => {
-+      loadWebView(webview)  // Don't wait for loading to finish.
-+      assert(!webview.hasAttribute('guestinstance'))
-+    })
-+
-+    it('loading a page sets the guest view', async () => {
-+      await loadWebView(webview, {
-+        src: `file://${fixtures}/api/blank.html`
-+      })
-+
-+      const instance = webview.getAttribute('guestinstance')
-+      assert.equal(instance, parseInt(instance))
-+
-+      const guest = getGuestWebContents(parseInt(instance))
-+      assert.equal(guest, webview.getWebContents())
-+    })
-+
-+    it('deleting the attribute destroys the webview', async () => {
-+      await loadWebView(webview, {
-+        src: `file://${fixtures}/api/blank.html`
-+      })
-+
-+      const instance = parseInt(webview.getAttribute('guestinstance'))
-+      const waitForDestroy = waitForEvent(webview, 'destroyed')
-+      webview.removeAttribute('guestinstance')
-+
-+      await waitForDestroy
-+      expect(getGuestWebContents(instance)).to.equal(undefined)
-+    })
-+
-+    it('setting the attribute on a new webview moves the contents', (done) => {
-+      const loadListener = () => {
-+        const webContents = webview.getWebContents()
-+        const instance = webview.getAttribute('guestinstance')
-+
-+        const destroyListener = () => {
-+          assert.equal(webContents, webview2.getWebContents())
-+
-+          // Make sure that events are hooked up to the right webview now
-+          webview2.addEventListener('console-message', (e) => {
-+            assert.equal(e.message, 'a')
-+            document.body.removeChild(webview2)
-+            done()
-+          })
-+
-+          webview2.src = `file://${fixtures}/pages/a.html`
-+        }
-+        webview.addEventListener('destroyed', destroyListener, {once: true})
-+
-+        const webview2 = new WebView()
-+        loadWebView(webview2, {
-+          guestinstance: instance
-+        })
-+      }
-+      webview.addEventListener('did-finish-load', loadListener, {once: true})
-+      loadWebView(webview, {
-+        src: `file://${fixtures}/api/blank.html`
-+      })
-+    })
-+
-+    it('setting the attribute to an invalid guestinstance does nothing', async () => {
-+      await loadWebView(webview, {
-+        src: `file://${fixtures}/api/blank.html`
-+      })
-+      webview.setAttribute('guestinstance', 55)
-+
-+      // Make sure that events are still hooked up to the webview
-+      const waitForMessage = waitForEvent(webview, 'console-message')
-+      webview.src = `file://${fixtures}/pages/a.html`
-+      const {message} = await waitForMessage
-+      assert.equal(message, 'a')
-+    })
-+
-+    it('setting the attribute on an existing webview moves the contents', (done) => {
-+      const load1Listener = () => {
-+        const webContents = webview.getWebContents()
-+        const instance = webview.getAttribute('guestinstance')
-+        let destroyedInstance
-+
-+        const destroyListener = () => {
-+          assert.equal(webContents, webview2.getWebContents())
-+          assert.equal(null, getGuestWebContents(parseInt(destroyedInstance)))
-+
-+          // Make sure that events are hooked up to the right webview now
-+          webview2.addEventListener('console-message', (e) => {
-+            assert.equal(e.message, 'a')
-+            document.body.removeChild(webview2)
-+            done()
-+          })
-+
-+          webview2.src = 'file://' + fixtures + '/pages/a.html'
-+        }
-+        webview.addEventListener('destroyed', destroyListener, {once: true})
-+
-+        const webview2 = new WebView()
-+        const load2Listener = () => {
-+          destroyedInstance = webview2.getAttribute('guestinstance')
-+          assert.notEqual(instance, destroyedInstance)
-+
-+          webview2.setAttribute('guestinstance', instance)
-+        }
-+        webview2.addEventListener('did-finish-load', load2Listener, {once: true})
-+        loadWebView(webview2, {
-+          src: `file://${fixtures}/api/blank.html`
-+        })
-+      }
-+
-+      webview.addEventListener('did-finish-load', load1Listener, {once: true})
-+      loadWebView(webview, {
-+        src: `file://${fixtures}/api/blank.html`
-+      })
-+    })
-+
-+    it('moving a guest back to its original webview should work', (done) => {
-+      loadWebView(webview, {
-+        src: `file://${fixtures}/api/blank.html`
-+      }).then(() => {
-+        const webContents = webview.getWebContents()
-+        const instance = webview.getAttribute('guestinstance')
-+
-+        const destroy1Listener = () => {
-+          assert.equal(webContents, webview2.getWebContents())
-+          assert.equal(null, webview.getWebContents())
-+
-+          const destroy2Listener = () => {
-+            assert.equal(webContents, webview.getWebContents())
-+            assert.equal(null, webview2.getWebContents())
-+
-+            // Make sure that events are hooked up to the right webview now
-+            webview.addEventListener('console-message', (e) => {
-+              document.body.removeChild(webview2)
-+              assert.equal(e.message, 'a')
-+              done()
-+            })
-+
-+            webview.src = `file://${fixtures}/pages/a.html`
-+          }
-+          webview2.addEventListener('destroyed', destroy2Listener, {once: true})
-+          webview.setAttribute('guestinstance', instance)
-+        }
-+        webview.addEventListener('destroyed', destroy1Listener, {once: true})
-+
-+        const webview2 = new WebView()
-+        loadWebView(webview2, {guestinstance: instance})
-+      })
-+    })
-+
-+    // FIXME(alexeykuzmin): This test only passes if the previous test ^
-+    // is run alongside.
-+    it('setting the attribute on a webview in a different window moves the contents', (done) => {
-+      loadWebView(webview, {
-+        src: `file://${fixtures}/api/blank.html`
-+      }).then(() => {
-+        const instance = webview.getAttribute('guestinstance')
-+
-+        w = new BrowserWindow({ show: false })
-+        w.webContents.once('did-finish-load', () => {
-+          ipcMain.once('pong', () => {
-+            assert(!webview.hasAttribute('guestinstance'))
-+            done()
-+          })
-+
-+          w.webContents.send('guestinstance', instance)
-+        })
-+        w.loadURL(`file://${fixtures}/pages/webview-move-to-window.html`)
-+      })
-+    })
-+
-+    it('does not delete the guestinstance attribute when moving the webview to another parent node', (done) => {
-+      webview.addEventListener('dom-ready', function domReadyListener () {
-+        webview.addEventListener('did-attach', () => {
-+          assert(webview.guestinstance != null)
-+          assert(webview.getWebContents() != null)
-+          done()
-+        })
-+
-+        document.body.replaceChild(webview, div)
-+      })
-+      webview.src = `file://${fixtures}/pages/a.html`
-+
-+      const div = document.createElement('div')
-+      div.appendChild(webview)
-+      document.body.appendChild(div)
-+    })
-+
-+    it('does not destroy the webContents when hiding/showing the webview (regression)', (done) => {
-+      webview.addEventListener('dom-ready', function () {
-+        const instance = webview.getAttribute('guestinstance')
-+        assert(instance != null)
-+
-+        // Wait for event directly since attach happens asynchronously over IPC
-+        ipcMain.once('ELECTRON_GUEST_VIEW_MANAGER_ATTACH_GUEST', () => {
-+          assert(webview.getWebContents() != null)
-+          assert.equal(instance, webview.getAttribute('guestinstance'))
-+          done()
-+        })
-+
-+        webview.style.display = 'none'
-+        webview.offsetHeight // eslint-disable-line
-+        webview.style.display = 'block'
-+      }, {once: true})
-+      loadWebView(webview, {src: `file://${fixtures}/pages/a.html`})
-+    })
-+
-+    it('does not reload the webContents when hiding/showing the webview (regression)', (done) => {
-+      webview.addEventListener('dom-ready', function () {
-+        webview.addEventListener('did-start-loading', () => {
-+          done(new Error('webview started loading unexpectedly'))
-+        })
-+
-+        // Wait for event directly since attach happens asynchronously over IPC
-+        webview.addEventListener('did-attach', () => {
-+          done()
-+        })
-+
-+        webview.style.display = 'none'
-+        webview.offsetHeight  // eslint-disable-line
-+        webview.style.display = 'block'
-+      }, {once: true})
-+      loadWebView(webview, {src: `file://${fixtures}/pages/a.html`})
-+    })
-+  })
-+
-+>>>>>>> .their
-   describe('DOM events', () => {
-     let div
- 
-@@ -1273,34 +1540,163 @@
-     })
- 
-     it('emits resize events', async () => {
-+<<<<<<< .our
-       const firstResizeSignal = waitForEvent(webview, 'resize')
-       const domReadySignal = waitForEvent(webview, 'dom-ready')
- 
-+=======
-+>>>>>>> .their
-       webview.src = `file://${fixtures}/pages/a.html`
-       div.appendChild(webview)
-       document.body.appendChild(div)
- 
-+<<<<<<< .our
-       const firstResizeEvent = await firstResizeSignal
-+=======
-+      const firstResizeEvent = await waitForEvent(webview, 'resize')
-+>>>>>>> .their
-       expect(firstResizeEvent.target).to.equal(webview)
-       expect(firstResizeEvent.newWidth).to.equal(100)
-       expect(firstResizeEvent.newHeight).to.equal(10)
- 
-+<<<<<<< .our
-       await domReadySignal
- 
-       const secondResizeSignal = waitForEvent(webview, 'resize')
-+=======
-+      await waitForEvent(webview, 'dom-ready')
-+>>>>>>> .their
- 
-       const newWidth = 1234
-       const newHeight = 789
-       div.style.width = `${newWidth}px`
-       div.style.height = `${newHeight}px`
- 
-+<<<<<<< .our
-       const secondResizeEvent = await secondResizeSignal
-+=======
-+      const secondResizeEvent = await waitForEvent(webview, 'resize')
-+>>>>>>> .their
-       expect(secondResizeEvent.target).to.equal(webview)
-       expect(secondResizeEvent.newWidth).to.equal(newWidth)
-       expect(secondResizeEvent.newHeight).to.equal(newHeight)
-     })
-   })
- 
-+<<<<<<< .our
-+=======
-+  describe('disableguestresize attribute', () => {
-+    it('does not have attribute by default', () => {
-+      loadWebView(webview)
-+      assert(!webview.hasAttribute('disableguestresize'))
-+    })
-+
-+    it('resizes guest when attribute is not present', async () => {
-+      const INITIAL_SIZE = 200
-+      const w = await openTheWindow(
-+          {show: false, width: INITIAL_SIZE, height: INITIAL_SIZE})
-+      w.loadURL(`file://${fixtures}/pages/webview-guest-resize.html`)
-+      await emittedOnce(ipcMain, 'webview-loaded')
-+
-+      const elementResize = emittedOnce(ipcMain, 'webview-element-resize')
-+          .then(([, width, height]) => {
-+            assert.equal(width, CONTENT_SIZE)
-+            assert.equal(height, CONTENT_SIZE)
-+          })
-+
-+      const guestResize = emittedOnce(ipcMain, 'webview-guest-resize')
-+          .then(([, width, height]) => {
-+            assert.equal(width, CONTENT_SIZE)
-+            assert.equal(height, CONTENT_SIZE)
-+          })
-+
-+      const CONTENT_SIZE = 300
-+      assert(CONTENT_SIZE !== INITIAL_SIZE)
-+      w.setContentSize(CONTENT_SIZE, CONTENT_SIZE)
-+
-+      return Promise.all([elementResize, guestResize])
-+    })
-+
-+    // TODO(alexeykuzmin): [Ch66] Enable the test.
-+    xit('does not resize guest when attribute is present', async () => {
-+      const INITIAL_SIZE = 200
-+      const w = await openTheWindow(
-+          {show: false, width: INITIAL_SIZE, height: INITIAL_SIZE})
-+      w.loadURL(`file://${fixtures}/pages/webview-no-guest-resize.html`)
-+      await emittedOnce(ipcMain, 'webview-loaded')
-+
-+      const noGuestResizePromise = Promise.race([
-+        emittedOnce(ipcMain, 'webview-guest-resize'),
-+        new Promise(resolve => setTimeout(() => resolve(), 500))
-+      ]).then((eventData = null) => {
-+        if (eventData !== null) {
-+          // Means we got the 'webview-guest-resize' event before the time out.
-+          return Promise.reject(new Error('Unexpected guest resize message'))
-+        }
-+      })
-+
-+      const CONTENT_SIZE = 300
-+      assert(CONTENT_SIZE !== INITIAL_SIZE)
-+      w.setContentSize(CONTENT_SIZE, CONTENT_SIZE)
-+
-+      return noGuestResizePromise
-+    })
-+
-+    // TODO(alexeykuzmin): [Ch66] Enable the test.
-+    xit('dispatches element resize event even when attribute is present', async () => {
-+      const INITIAL_SIZE = 200
-+      const w = await openTheWindow(
-+          {show: false, width: INITIAL_SIZE, height: INITIAL_SIZE})
-+      w.loadURL(`file://${fixtures}/pages/webview-no-guest-resize.html`)
-+      await emittedOnce(ipcMain, 'webview-loaded')
-+
-+      const elementResizePromise = emittedOnce(ipcMain, 'webview-element-resize')
-+          .then(([, width, height]) => {
-+            expect(width).to.equal(CONTENT_SIZE)
-+            expect(height).to.equal(CONTENT_SIZE)
-+          })
-+
-+      const CONTENT_SIZE = 300
-+      assert(CONTENT_SIZE !== INITIAL_SIZE)
-+      w.setContentSize(CONTENT_SIZE, CONTENT_SIZE)
-+
-+      return elementResizePromise
-+    })
-+
-+    // TODO(alexeykuzmin): [Ch66] Enable the test.
-+    xit('can be manually resized with setSize even when attribute is present', async () => {
-+      const INITIAL_SIZE = 200
-+      const w = await openTheWindow(
-+          {show: false, width: INITIAL_SIZE, height: INITIAL_SIZE})
-+      w.loadURL(`file://${fixtures}/pages/webview-no-guest-resize.html`)
-+      await emittedOnce(ipcMain, 'webview-loaded')
-+
-+      const GUEST_WIDTH = 10
-+      const GUEST_HEIGHT = 20
-+
-+      const guestResizePromise = emittedOnce(ipcMain, 'webview-guest-resize')
-+          .then(([, width, height]) => {
-+            expect(width).to.be.equal(GUEST_WIDTH)
-+            expect(height).to.be.equal(GUEST_HEIGHT)
-+          })
-+
-+      const wc = webContents.getAllWebContents().find((wc) => {
-+        return wc.hostWebContents &&
-+            wc.hostWebContents.id === w.webContents.id
-+      })
-+      assert(wc)
-+      wc.setSize({
-+        normal: {
-+          width: GUEST_WIDTH,
-+          height: GUEST_HEIGHT
-+        }
-+      })
-+
-+      return guestResizePromise
-+    })
-+  })
-+
-+>>>>>>> .their
-   describe('zoom behavior', () => {
-     const zoomScheme = remote.getGlobal('zoomScheme')
-     const webviewSession = session.fromPartition('webview-temp')
-added in both
-  our    100644 808f646f3cf52981f8d75aa8212f3c97b02f055a spec/window-helpers.js
-  their  100644 5a63100f9d0e6452c35c5d31190b37f840066d2a spec/window-helpers.js
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- const {expect} = require('chai')
- const {BrowserWindow} = require('electron').remote
- 
-@@ -15,5 +16,27 @@
- 
-   if (assertSingleWindow) {
-     expect(BrowserWindow.getAllWindows()).to.have.lengthOf(1)
-+=======
-+const assert = require('assert')
-+const {BrowserWindow} = require('electron').remote
-+
-+exports.closeWindow = (window, {assertSingleWindow} = {assertSingleWindow: true}) => {
-+  if (window == null || window.isDestroyed()) {
-+    if (assertSingleWindow) {
-+      assert.equal(BrowserWindow.getAllWindows().length, 1)
-+    }
-+    return Promise.resolve()
-+  } else {
-+    return new Promise((resolve, reject) => {
-+      window.once('closed', () => {
-+        if (assertSingleWindow) {
-+          assert.equal(BrowserWindow.getAllWindows().length, 1)
-+        }
-+        resolve()
-+      })
-+      window.setClosable(true)
-+      window.close()
-+    })
-+>>>>>>> .their
-   }
- }
-added in both
-  our    100755 145c1298c6fbba0a7863fa32cb25e2c6c8eb7e2c tools/js2asar.py
-  their  100755 adad1751e33d21173eaa0b60a9f987f7f074a6fd tools/js2asar.py
-@@ -16,11 +16,16 @@
-   source_files = sys.argv[3:]
- 
-   output_dir = tempfile.mkdtemp()
-+<<<<<<< .our
-   copy_files(source_files, output_dir, folder_name)
-+=======
-+  copy_files(source_files, output_dir)
-+>>>>>>> .their
-   call_asar(archive, os.path.join(output_dir, folder_name))
-   shutil.rmtree(output_dir)
- 
- 
-+<<<<<<< .our
- def copy_files(source_files, output_dir, folder_name):
-   for source_file in source_files:
-     output_path = os.path.join(output_dir, source_file)
-@@ -28,6 +33,11 @@
-     # the temp one we are making so they end up in the ASAR
-     if not os.path.normpath(source_file).startswith(folder_name + os.sep):
-       output_path = os.path.join(output_dir, folder_name, source_file)
-+=======
-+def copy_files(source_files, output_dir):
-+  for source_file in source_files:
-+    output_path = os.path.join(output_dir, source_file)
-+>>>>>>> .their
-     safe_mkdir(os.path.dirname(output_path))
-     shutil.copy2(source_file, output_path)
- 
-added in both
-  our    160000 f5f20660f20c281c1cbf1097ed55204b50711846 vendor/breakpad
-  their  160000 82f0452e6b687b3c1e14e08d172b2f3fb79ae91a vendor/breakpad
-added in both
-  our    160000 c85470a1c379b1c4bedb372c146521bc4be9b75d vendor/libchromiumcontent
-  their  160000 a3dc4d7c3542aab8b8a3e75f84981a948a958594 vendor/libchromiumcontent
-added in both
-  our    160000 ece0a06ac8147efb5b5af431c21f312f1884616e vendor/node
-  their  160000 a782199c99b5716582791fe8145756fd5bcfde27 vendor/node
-added in both
-  our    100644 84bd69c2b2868ac23bc30061aa208ad38fbb9506 vsts.yml
-  their  100644 72418c7baa6ff63e01b55e0f4051abb2830ea746 vsts.yml
-@@ -59,7 +59,11 @@
- - bash: |
-     echo 'Verifying ffmpeg on build'
-     if [ "$ELECTRON_RELEASE" == "1" ]; then
-+<<<<<<< .our
-       script/verify-ffmpeg.py -c R
-+=======
-+      script/verify-ffmpeg.py -R
-+>>>>>>> .their
-     else
-       script/verify-ffmpeg.py
-     fi
-@@ -69,8 +73,14 @@
- - task: PublishTestResults@2
-   displayName: Publish Test Results
-   inputs:
-+<<<<<<< .our
-     testResultsFiles: '**/test-*.xml'
-   condition: and(always(), eq(variables['MOCHA_FILE'], 'test-results.xml'))
-+=======
-+    testResultsFiles: 'test-results.xml'
-+    searchFolder: junit
-+  condition: and(always(), ne(variables['ELECTRON_RELEASE'], '1'))
-+>>>>>>> .their
- 
- - bash: |
-     export BUILD_URL="${SYSTEM_TEAMFOUNDATIONCOLLECTIONURI}${SYSTEM_TEAMPROJECT}/_build/results?buildId=${BUILD_BUILDID}"
diff --git a/app/test/fixtures/merge-parser/electron/merge-test-context-id-3-0-x-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-test-context-id-3-0-x-into-master.txt
deleted file mode 100644
index cdd6da9c367..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-test-context-id-3-0-x-into-master.txt
+++ /dev/null
@@ -1,6517 +0,0 @@
-changed in both
-  base   100644 d4f98eab95b73b59018f170b09b9132d4d03477b .circleci/config.yml
-  our    100644 6d44d618aabcce04c60344f2274dec5b0c2a1f68 .circleci/config.yml
-  their  100644 8d065e3f257178d4706dcbd1340326be42b2e2e2 .circleci/config.yml
-@@ -19,6 +19,7 @@
-       fi
-     when: on_success
- 
-+<<<<<<< .our
- build-steps: &build-steps
-   steps:
-     - checkout
-@@ -92,6 +93,13 @@
-           fi
-     - run:
-         name: Test
-+=======
-+version: 2
-+jobs:
-+  electron-linux-arm:
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+>>>>>>> .their
-         environment:
-           MOCHA_FILE: junit/test-results.xml
-           MOCHA_REPORTER: mocha-junit-reporter
-@@ -110,6 +118,7 @@
-                 echo 'Skipping tests on GitHub release'
-               fi
-             fi
-+<<<<<<< .our
-           else
-            echo 'Skipping tests due to configuration'
-           fi
-@@ -117,6 +126,76 @@
-         name: Verify FFmpeg
-         command: |
-           if [ "$RUN_TESTS" == "true" ]; then
-+=======
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Optionally finish release
-+          shell: /bin/sh
-+          command: |
-+            if [ "$ELECTRON_RELEASE" == "1" ] && [ "$AUTO_RELEASE" == "true" ]; then
-+              echo 'Trying to finish release'
-+              node script/release.js --validateRelease --automaticRelease
-+              releaseExitCode=$?
-+              if [ $releaseExitCode -eq 0 ]; then
-+                echo 'Release is ready to go; releasing'
-+                node script/release.js--automaticRelease
-+                if [ $releaseExitCode -eq 0 ]; then
-+                  echo 'Release successful, now publishing to npm'
-+                  echo "//registry.npmjs.org/:_authToken=$ELECTRON_NPM_TOKEN" >> ~/.npmrc
-+                  npm run publish-to-npm
-+                  echo 'Release has been published to npm'
-+                fi
-+              else
-+                echo 'Release is not complete, skipping publish for now'
-+              fi
-+            else
-+              echo 'Skipping finishing release because build is not for release'
-+            fi
-+      - run:
-+          name: Zip out directory
-+          command: |
-+>>>>>>> .their
-             if [ "$ELECTRON_RELEASE" != "1" ]; then
-               echo 'Verifying ffmpeg on debug build'
-               script/verify-ffmpeg.py
-@@ -391,11 +470,105 @@
-     resource_class: 2xlarge
- 
-   electron-linux-arm64:
-+<<<<<<< .our
-     environment:
-       TARGET_ARCH: arm64
-     <<: *build-defaults
-     resource_class: 2xlarge
- 
-+=======
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: arm64
-+    resource_class: 2xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Optionally finish release
-+          shell: /bin/sh
-+          command: |
-+            if [ "$ELECTRON_RELEASE" == "1" ] && [ "$AUTO_RELEASE" == "true" ]; then
-+              echo 'Trying to finish release'
-+              node script/release.js --validateRelease --automaticRelease
-+              releaseExitCode=$?
-+              if [ $releaseExitCode -eq 0 ]; then
-+                echo 'Release is ready to go; releasing'
-+                node script/release.js--automaticRelease
-+                if [ $releaseExitCode -eq 0 ]; then
-+                  echo 'Release successful, now publishing to npm'
-+                  echo "//registry.npmjs.org/:_authToken=$ELECTRON_NPM_TOKEN" >> ~/.npmrc
-+                  npm run publish-to-npm
-+                  echo 'Release has been published to npm'
-+                fi
-+              else
-+                echo 'Release is not complete, skipping publish for now'
-+              fi
-+            else
-+              echo 'Skipping finishing release because build is not for release'
-+            fi
-+      - run:
-+          name: Zip out directory
-+          command: |
-+            if [ "$ELECTRON_RELEASE" != "1" ]; then
-+              zip -r electron.zip out/D
-+            fi
-+      - persist_to_workspace:
-+          root: /home/builduser
-+          paths:
-+            - project/out
-+      - store_artifacts:
-+          path: electron.zip
-+>>>>>>> .their
-   electron-linux-arm64-test:
-     machine: true
-     steps:
-@@ -430,6 +603,7 @@
-     resource_class: 2xlarge
- 
-   electron-linux-ia32:
-+<<<<<<< .our
-     environment:
-       TARGET_ARCH: ia32
-       DISPLAY: ':99.0'
-@@ -469,10 +643,317 @@
-       NIGHTLY_BUILD: true
-     <<: *build-defaults
-     resource_class: xlarge
-+=======
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: ia32
-+          DISPLAY: ':99.0'
-+    resource_class: xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Setup for headless testing
-+          command: sh -e /etc/init.d/xvfb start
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Optionally finish release
-+          shell: /bin/sh
-+          command: |
-+            if [ "$ELECTRON_RELEASE" == "1" ] && [ "$AUTO_RELEASE" == "true" ]; then
-+              echo 'Trying to finish release'
-+              node script/release.js --validateRelease --automaticRelease
-+              releaseExitCode=$?
-+              if [ $releaseExitCode -eq 0 ]; then
-+                echo 'Release is ready to go; releasing'
-+                node script/release.js--automaticRelease
-+                if [ $releaseExitCode -eq 0 ]; then
-+                  echo 'Release successful, now publishing to npm'
-+                  echo "//registry.npmjs.org/:_authToken=$ELECTRON_NPM_TOKEN" >> ~/.npmrc
-+                  npm run publish-to-npm
-+                  echo 'Release has been published to npm'
-+                fi
-+              else
-+                echo 'Release is not complete, skipping publish for now'
-+              fi
-+            else
-+              echo 'Skipping finishing release because build is not for release'
-+            fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                out/D/electron --version
-+                mkdir junit
-+                script/test.py --ci --rebuild_native_modules
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+  electron-linux-mips64el:
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: mips64el
-+    resource_class: xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Optionally finish release
-+          shell: /bin/sh
-+          command: |
-+            if [ "$ELECTRON_RELEASE" == "1" ] && [ "$AUTO_RELEASE" == "true" ]; then
-+              echo 'Trying to finish release'
-+              node script/release.js --validateRelease --automaticRelease
-+              releaseExitCode=$?
-+              if [ $releaseExitCode -eq 0 ]; then
-+                echo 'Release is ready to go; releasing'
-+                node script/release.js--automaticRelease
-+                if [ $releaseExitCode -eq 0 ]; then
-+                  echo 'Release successful, now publishing to npm'
-+                  echo "//registry.npmjs.org/:_authToken=$ELECTRON_NPM_TOKEN" >> ~/.npmrc
-+                  npm run publish-to-npm
-+                  echo 'Release has been published to npm'
-+                fi
-+              else
-+                echo 'Release is not complete, skipping publish for now'
-+              fi
-+            else
-+              echo 'Skipping finishing release because build is not for release'
-+            fi
-+
-+  electron-linux-x64:
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: x64
-+          DISPLAY: ':99.0'
-+    resource_class: xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Setup for headless testing
-+          command: sh -e /etc/init.d/xvfb start
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Optionally finish release
-+          shell: /bin/sh
-+          command: |
-+            if [ "$ELECTRON_RELEASE" == "1" ] && [ "$AUTO_RELEASE" == "true" ]; then
-+              echo 'Trying to finish release'
-+              node script/release.js --validateRelease --automaticRelease
-+              releaseExitCode=$?
-+              if [ $releaseExitCode -eq 0 ]; then
-+                echo 'Release is ready to go; releasing'
-+                node script/release.js--automaticRelease
-+                if [ $releaseExitCode -eq 0 ]; then
-+                  echo 'Release successful, now publishing to npm'
-+                  echo "//registry.npmjs.org/:_authToken=$ELECTRON_NPM_TOKEN" >> ~/.npmrc
-+                  npm run publish-to-npm
-+                  echo 'Release has been published to npm'
-+                fi
-+              else
-+                echo 'Release is not complete, skipping publish for now'
-+              fi
-+            else
-+              echo 'Skipping finishing release because build is not for release'
-+            fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                mkdir junit
-+                script/test.py --ci --rebuild_native_modules
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+      - run:
-+          name: Generate Typescript Definitions
-+          command: npm run create-typescript-definitions
-+      - store_test_results:
-+          path: junit
-+      - store_artifacts:
-+          path: junit
-+      - store_artifacts:
-+          path: out/electron.d.ts
-+      - store_artifacts:
-+          path: out/electron-api.json
-+>>>>>>> .their
- 
-   electron-osx-x64:
-     environment:
-       TARGET_ARCH: x64
-+<<<<<<< .our
-       RUN_TESTS: true
-       INSTALL_MACOS_NODE: true
-     macos:
-@@ -488,11 +969,107 @@
-     macos:
-       xcode: "8.3.3"
-     <<: *build-steps
-+=======
-+    macos:
-+        xcode: "9.0"
-+    steps:
-+      - checkout
-+      - run:
-+          name: Reclaim disk space
-+          command: |
-+            df -h
-+            sudo rm -rf /Library/Developer/CoreSimulator
-+            df -h
-+            sysctl -n hw.ncpu
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                mkdir junit
-+                script/test.py --ci --rebuild_native_modules
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+      - run:
-+          name: Generate Typescript Definitions
-+          command: npm run create-typescript-definitions
-+      - store_test_results:
-+          path: junit
-+      - store_artifacts:
-+          path: junit
-+      - store_artifacts:
-+          path: out/electron.d.ts
-+      - store_artifacts:
-+          path: out/electron-api.json
-+>>>>>>> .their
- 
-   electron-mas-x64:
-     environment:
-       TARGET_ARCH: x64
-       MAS_BUILD: 1
-+<<<<<<< .our
-       RUN_TESTS: true
-       INSTALL_MACOS_NODE: true
-     macos:
-@@ -668,6 +1245,101 @@
-       GN_EXTRA_ARGS: 'is_mas_build = true'
-     <<: *gn-mac-build-machine
-     <<: *gn-mac-build-steps
-+=======
-+    macos:
-+        xcode: "9.0"
-+    steps:
-+      - checkout
-+      - run:
-+          name: Reclaim disk space
-+          command: |
-+            df -h
-+            sudo rm -rf /Library/Developer/CoreSimulator
-+            df -h
-+            sysctl -n hw.ncpu
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                mkdir junit
-+                script/test.py --ci --rebuild_native_modules
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+      - run:
-+          name: Generate Typescript Definitions
-+          command: npm run create-typescript-definitions
-+      - store_test_results:
-+          path: junit
-+      - store_artifacts:
-+          path: junit
-+      - store_artifacts:
-+          path: out/electron.d.ts
-+      - store_artifacts:
-+          path: out/electron-api.json
-+>>>>>>> .their
- 
- workflows:
-   version: 2
-@@ -695,6 +1367,7 @@
-   build-mas-x64:
-     jobs:
-       - electron-mas-x64
-+<<<<<<< .our
-   build-gn-linux:
-     jobs:
-       - electron-gn-linux-x64-debug-fyi
-@@ -745,3 +1418,5 @@
-       - electron-gn-linux-arm64-release-fyi
-       - electron-gn-mas-release-fyi
-       - electron-gn-osx-release-fyi
-+=======
-+>>>>>>> .their
-changed in both
-  base   100644 8632e8e30869d32176552cd218560f5016a24300 .gitignore
-  our    100644 f393b1cdcef87b41bb3ed47ebae59757fed3a780 .gitignore
-  their  100644 f82d92052e4f7ac936637ac2c163633e02588f12 .gitignore
-changed in both
-  base   100644 5d04da05397c4c74ce00d6d6c8969ce370adb32d CONTRIBUTING.md
-  our    100644 414f83db905db904728facf3b40e70e7b7973193 CONTRIBUTING.md
-  their  100644 0955f68c4f2b1097e770398cf51d3af811f53050 CONTRIBUTING.md
-changed in both
-  base   100644 4cfea0e70f9af56ba746347b4cae410970f3d900 Dockerfile
-  our    100644 74e5eeedea9bea87cd7a98ac2cb63f4376275a2a Dockerfile
-  their  100644 2d74e16915d2e89e1e1e7f3ffd259cc448e1b864 Dockerfile
-@@ -7,8 +7,13 @@
- RUN chmod a+rwx /home
- 
- # Install node.js
-+<<<<<<< .our
- RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
- RUN apt-get install -y nodejs
-+=======
-+RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
-+RUN apt-get update && apt-get install -y nodejs
-+>>>>>>> .their
- 
- # Install wget used by crash reporter
- RUN apt-get install -y wget
-changed in both
-  base   100644 271947c56e39b91fc23bf10579f61cab50b0f4dc Dockerfile.circleci
-  our    100644 d369c8c640161fc3ba65935297aec7dd27eb1e9f Dockerfile.circleci
-  their  100644 0cdb1e88c24f01a5acdfd8ef348126819f593454 Dockerfile.circleci
-@@ -3,8 +3,13 @@
- USER root
- 
- # Install node.js
-+<<<<<<< .our
- RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
- RUN apt-get install -y nodejs
-+=======
-+RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
-+RUN apt-get update && apt-get install -y nodejs
-+>>>>>>> .their
- 
- # Install wget used by crash reporter
- RUN apt-get install -y wget
-added in remote
-  their  100644 c6d558f7f3518ea2924fa9075ed38ab48d70d204 Jenkinsfile.arm64
-@@ -0,0 +1,36 @@
-+pipeline {
-+  agent {
-+    docker {
-+      image 'electronbuilds/arm64v8:0.0.2'
-+      args '--privileged'
-+    }
-+  }
-+  environment {
-+    TARGET_ARCH='arm64'
-+    DISPLAY=':99.0'
-+    MOCHA_TIMEOUT='60000'
-+  }
-+  stages {
-+    stage('Bootstrap') {
-+      steps {
-+        sh 'script/bootstrap.py -v --dev --target_arch=$TARGET_ARCH'
-+      }
-+    }
-+    stage('Build') {
-+      steps {
-+        sh 'script/build.py -c D --ninja-path /usr/local/ninja/ninja'
-+      }
-+    }
-+    stage('Test') {
-+      steps {
-+        sh '/etc/init.d/xvfb start'
-+        sh 'script/test.py --ci'
-+      }
-+    }
-+  }
-+  post {
-+    always {
-+      cleanWs()
-+    }
-+  }
-+}
-changed in both
-  base   100644 160dae7908236105f8534f9448f4111da1bcb014 README.md
-  our    100644 ec09364417b767ac59b2d970fee5e2ab2db2173b README.md
-  their  100644 a7b4fa6ed40a6449245cfdbdace8bb38945284d2 README.md
-added in remote
-  their  100644 2ed4ebcf4b90c2c28d9fd36af13198be5a08e5ad appveyor-override.yml
-@@ -0,0 +1,58 @@
-+build_cloud: electron-16
-+image: electron-16-vs2015
-+build_script:
-+- ps: >-
-+    if(($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME -split "/")[0] -eq ($env:APPVEYOR_REPO_NAME -split "/")[0]) {
-+      Write-warning "Skipping PR build for branch"; Exit-AppveyorBuild
-+    } else {
-+      Add-Path "$env:ProgramFiles (x86)\Windows Kits\10\Debuggers\x64"
-+      $env:path = "$env:ProgramFiles (x86)\Windows Kits\10\Debuggers\x64;$env:path"
-+      if($env:APPVEYOR_SCHEDULED_BUILD -eq 'True')  {
-+        $env:RUN_RELEASE_BUILD = "1"
-+      }
-+      $Message = (git log --format=%B -n 1 HEAD) | Out-String
-+      if ((Test-Path Env:\RUN_RELEASE_BUILD)) {
-+        $env:ELECTRON_RELEASE = '1'
-+        Write-Output "release build triggered from api"
-+      }
-+      if ((Test-Path Env:\ELECTRON_RELEASE)) {
-+        Write-Output "Running release build"
-+        python script\bootstrap.py --target_arch=$env:TARGET_ARCH
-+        python script\build.py -c R
-+        python script\create-dist.py
-+      } else {
-+        Write-Output "Running debug build"
-+        python script\bootstrap.py --target_arch=$env:TARGET_ARCH --dev
-+        python script\build.py -c D
-+      }
-+      if ($? -ne 'True') {
-+        throw "Build failed with exit code $?"
-+      } else {
-+        "Build succeeded."
-+      }
-+      Push-AppveyorArtifact out
-+    }
-+test_script:
-+- ps: >-
-+    if (Test-Path Env:\ELECTRON_RELEASE) {
-+      Write-Output "Skipping tests for release build"
-+    } else {
-+      Write-Output "Running tests for debug build"
-+      python script\test.py --ci --rebuild_native_modules
-+      if ($LASTEXITCODE -ne '0') {
-+        throw "Tests failed with exit code $LASTEXITCODE"
-+      } else {
-+        Write-Output "Tests succeeded."
-+      }
-+      python script\verify-ffmpeg.py
-+      if ($LASTEXITCODE -ne '0') {
-+        throw "Verify ffmpeg failed with exit code $LASTEXITCODE"
-+      } else {
-+        "Verify ffmpeg succeeded."
-+      }
-+    }
-+artifacts:
-+- path: test-results.xml
-+  name: test-results.xml
-+deploy_script:
-+- ps: "if (Test-Path Env:\\ELECTRON_RELEASE) {\n  if (Test-Path Env:\\RUN_RELEASE_BUILD) {\n    Write-Output \"Uploading Electron release distribution to s3\"\n    & python script\\upload.py --upload_to_s3\n  } else {\n    Write-Output \"Uploading Electron release distribution to github releases\"\n    & python script\\upload.py\n    if (Test-Path Env:\\AUTO_RELEASE) {\n      node script\\release.js --validateRelease --automaticRelease\n      if ($? -eq 'True') {\n        echo 'Release is ready to go; now running release'\n        node script\\release.js --automaticRelease\n        if ($? -eq 'True') {      \n          echo 'Release successful, now publishing to npm'      \n          $npmfile = \"$HOME\\.npmrc\"\n          \"//registry.npmjs.org/:_authToken=$env:ELECTRON_NPM_TOKEN\" > $npmfile\n          npm run publish-to-npm\n        }\n      } else {\n        echo 'Release is not complete, skipping publish for now.'\n      }\n    }\n  }\n} else {\n  Write-Output \"Skipping upload distribution because build is not for release\"\n}"
-\ No newline at end of file
-changed in both
-  base   100644 9472d1cb9fd76beca4047bb24db024b9c6378aae atom/app/command_line_args.cc
-  our    100644 23e870cf4a32aecfc246a81edad46971b4456a55 atom/app/command_line_args.cc
-  their  100644 be171457726a09cde9eb7a090ba1e2a67f4cb9cb atom/app/command_line_args.cc
-@@ -31,6 +31,1376 @@
-   return false;
- }
- 
-+<<<<<<< .our
-+=======
-+/*
-+ * The blacklist of command line switches, must be sorted.
-+ * Update the list by pasting the following command into bash
-+ * in libchromiumcontent/src/:
-+
-+   (find ./ \( -name "*switches.cc" -o -name "*switch_list.h" \) | \
-+      xargs grep -P --no-filename '"\S+"[);]$' | \
-+      perl -pe 's|^.*?"(\S+)"[);]$|  "$1",|'; \
-+      echo '  "inspect",'; \
-+      echo '  "inspect-brk",') | \
-+    LANG="C" sort | \
-+    uniq > blacklist-switches.txt
-+
-+ */
-+const char* kBlacklist[] = {
-+  "/prefetch:1",
-+  "/prefetch:2",
-+  "/prefetch:3",
-+  "/prefetch:4",
-+  "/prefetch:5",
-+  "/prefetch:6",
-+  "/prefetch:8",
-+  "0",
-+  "?",
-+  "BlacklistOnly",
-+  "ChromeOSMemoryPressureHandling",
-+  "Disabled",
-+  "OnlineCheckOnly",
-+  "SafeSites",
-+  "accept-resource-provider",
-+  "account-consistency",
-+  "adaboost",
-+  "aec-refined-adaptive-filter",
-+  "agc-startup-min-volume",
-+  "aggressive",
-+  "aggressive-cache-discard",
-+  "aggressive-tab-discard",
-+  "all-toolchains",
-+  "allarticles",
-+  "allow-cross-origin-auth-prompt",
-+  "allow-external-pages",
-+  "allow-failed-policy-fetch-for-test",
-+  "allow-file-access-from-files",
-+  "allow-hidden-media-playback",
-+  "allow-http-background-page",
-+  "allow-http-screen-capture",
-+  "allow-insecure-localhost",
-+  "allow-legacy-extension-manifests",
-+  "allow-loopback-in-peer-connection",
-+  "allow-nacl-crxfs-api",
-+  "allow-nacl-file-handle-api",
-+  "allow-nacl-socket-api",
-+  "allow-no-sandbox-job",
-+  "allow-outdated-plugins",
-+  "allow-ra-in-dev-mode",
-+  "allow-running-insecure-content",
-+  "allow-sandbox-debugging",
-+  "allow-silent-push",
-+  "alsa-check-close-timeout",
-+  "alsa-enable-upsampling",
-+  "alsa-fixed-output-sample-rate",
-+  "alsa-input-device",
-+  "alsa-mute-device-name",
-+  "alsa-mute-element-name",
-+  "alsa-output-avail-min",
-+  "alsa-output-buffer-size",
-+  "alsa-output-device",
-+  "alsa-output-period-size",
-+  "alsa-output-start-threshold",
-+  "alsa-volume-device-name",
-+  "alsa-volume-element-name",
-+  "also-emit-success-logs",
-+  "alternative",
-+  "always-authorize-plugins",
-+  "always-on",
-+  "always-use-complex-text",
-+  "alwaystrue",
-+  "android-fonts-path",
-+  "android-stderr-port",
-+  "android-stdin-port",
-+  "android-stdout-port",
-+  "angle",
-+  "app",
-+  "app-auto-launched",
-+  "app-id",
-+  "app-mode-auth-code",
-+  "app-mode-oauth-token",
-+  "app-mode-oem-manifest",
-+  "app-shell-allow-roaming",
-+  "app-shell-host-window-size",
-+  "app-shell-preferred-network",
-+  "app-shell-refresh-token",
-+  "app-shell-user",
-+  "apple",
-+  "apps-gallery-download-url",
-+  "apps-gallery-update-url",
-+  "apps-gallery-url",
-+  "apps-keep-chrome-alive-in-tests",
-+  "arc-availability",
-+  "arc-available",
-+  "arc-start-mode",
-+  "arc-transition-migration-required",
-+  "args",
-+  "artifacts-dir",
-+  "ash-animate-from-boot-splash-screen",
-+  "ash-constrain-pointer-to-root",
-+  "ash-copy-host-background-at-boot",
-+  "ash-debug-shortcuts",
-+  "ash-dev-shortcuts",
-+  "ash-disable-smooth-screen-rotation",
-+  "ash-disable-touch-exploration-mode",
-+  "ash-enable-magnifier-key-scroller",
-+  "ash-enable-mirrored-screen",
-+  "ash-enable-night-light",
-+  "ash-enable-palette-on-all-displays",
-+  "ash-enable-scale-settings-tray",
-+  "ash-enable-software-mirroring",
-+  "ash-enable-unified-desktop",
-+  "ash-estimated-presentation-delay",
-+  "ash-hide-notifications-for-factory",
-+  "ash-host-window-bounds",
-+  "ash-shelf-color",
-+  "ash-shelf-color-scheme",
-+  "ash-touch-hud",
-+  "ash-webui-init",
-+  "attestation-server",
-+  "audio-buffer-size",
-+  "audio-output-channels",
-+  "aura-legacy-power-button",
-+  "auth-ext-path",
-+  "auth-server-whitelist",
-+  "auth-spnego-account-type",
-+  "auto",
-+  "auto-open-devtools-for-tabs",
-+  "auto-select-desktop-capture-source",
-+  "autoplay-policy",
-+  "blink-settings",
-+  "bootstrap",
-+  "browser-subprocess-path",
-+  "browser-test",
-+  "bwsi",
-+  "bypass-app-banner-engagement-checks",
-+  "canvas-msaa-sample-count",
-+  "cast-initial-screen-height",
-+  "cast-initial-screen-width",
-+  "cc-layer-tree-test-long-timeout",
-+  "cc-layer-tree-test-no-timeout",
-+  "cc-rebaseline-pixeltests",
-+  "cellular-first",
-+  "cellular-only",
-+  "check-for-update-interval",
-+  "check-layout-test-sys-deps",
-+  "child-wallpaper-large",
-+  "child-wallpaper-small",
-+  "chrome-home-swipe-logic",
-+  "cipher-suite-blacklist",
-+  "clamshell",
-+  "class",
-+  "clear-token-service",
-+  "cloud-print-file",
-+  "cloud-print-file-type",
-+  "cloud-print-job-title",
-+  "cloud-print-print-ticket",
-+  "cloud-print-setup-proxy",
-+  "cloud-print-url",
-+  "cloud-print-xmpp-endpoint",
-+  "color",
-+  "compensate-for-unstable-pinch-zoom",
-+  "compile-shader-always-succeeds",
-+  "component-updater",
-+  "connectivity-check-url",
-+  "conservative",
-+  "content-image-texture-target",
-+  "content-shell-host-window-size",
-+  "controller",
-+  "crash-dumps-dir",
-+  "crash-on-failure",
-+  "crash-on-hang-threads",
-+  "crash-server-url",
-+  "crash-test",
-+  "crashpad-handler",
-+  "create-browser-on-startup-for-tests",
-+  "create-default-gl-context",
-+  "cros-gaia-api-v1",
-+  "cros-region",
-+  "cros-regions-mode",
-+  "crosh-command",
-+  "cryptauth-http-host",
-+  "custom-devtools-frontend",
-+  "custom-launcher-page",
-+  "custom_summary",
-+  "d3d11",
-+  "d3d9",
-+  "daemon",
-+  "dark_muted",
-+  "dark_vibrant",
-+  "data-path",
-+  "data-reduction-proxy-config-url",
-+  "data-reduction-proxy-experiment",
-+  "data-reduction-proxy-http-proxies",
-+  "data-reduction-proxy-lo-fi",
-+  "data-reduction-proxy-pingback-url",
-+  "data-reduction-proxy-secure-proxy-check-url",
-+  "data-reduction-proxy-server-experiments-disabled",
-+  "dbus-stub",
-+  "debug-devtools",
-+  "debug-enable-frame-toggle",
-+  "debug-packed-apps",
-+  "debug-print",
-+  "default",
-+  "default-background-color",
-+  "default-tile-height",
-+  "default-tile-width",
-+  "default-wallpaper-is-oem",
-+  "default-wallpaper-large",
-+  "default-wallpaper-small",
-+  "delay-reload-stop-button-change",
-+  "demo",
-+  "derelict-detection-timeout",
-+  "derelict-idle-timeout",
-+  "desktop",
-+  "desktop-window-1080p",
-+  "deterministic-fetch",
-+  "device-management-url",
-+  "device-scale-factor",
-+  "devtools-flags",
-+  "diagnostics",
-+  "diagnostics-format",
-+  "diagnostics-recovery",
-+  "dice",
-+  "disable",
-+  "disable-2d-canvas-clip-aa",
-+  "disable-2d-canvas-image-chromium",
-+  "disable-3d-apis",
-+  "disable-accelerated-2d-canvas",
-+  "disable-accelerated-jpeg-decoding",
-+  "disable-accelerated-mjpeg-decode",
-+  "disable-accelerated-video-decode",
-+  "disable-app-info-dialog-mac",
-+  "disable-app-list-dismiss-on-blur",
-+  "disable-app-window-cycling",
-+  "disable-appcontainer",
-+  "disable-arc-data-wipe",
-+  "disable-arc-opt-in-verification",
-+  "disable-audio-support-for-desktop-share",
-+  "disable-avfoundation-overlays",
-+  "disable-background-networking",
-+  "disable-background-timer-throttling",
-+  "disable-backgrounding-occluded-windows",
-+  "disable-backing-store-limit",
-+  "disable-blink-features",
-+  "disable-bookmark-reordering",
-+  "disable-boot-animation",
-+  "disable-breakpad",
-+  "disable-browser-task-scheduler",
-+  "disable-bundled-ppapi-flash",
-+  "disable-canvas-aa",
-+  "disable-captive-portal-bypass-proxy",
-+  "disable-cast-streaming-hw-encoding",
-+  "disable-checker-imaging",
-+  "disable-clear-browsing-data-counters",
-+  "disable-client-side-phishing-detection",
-+  "disable-cloud-import",
-+  "disable-component-cloud-policy",
-+  "disable-component-extensions-with-background-pages",
-+  "disable-component-update",
-+  "disable-composited-antialiasing",
-+  "disable-contextual-search",
-+  "disable-d3d11",
-+  "disable-databases",
-+  "disable-datasaver-prompt",
-+  "disable-default-apps",
-+  "disable-demo-mode",
-+  "disable-device-disabling",
-+  "disable-device-discovery-notifications",
-+  "disable-dinosaur-easter-egg",
-+  "disable-direct-composition",
-+  "disable-direct-composition-layers",
-+  "disable-directwrite-for-ui",
-+  "disable-display-color-calibration",
-+  "disable-display-list-2d-canvas",
-+  "disable-distance-field-text",
-+  "disable-domain-blocking-for-3d-apis",
-+  "disable-domain-reliability",
-+  "disable-drive-search-in-app-launcher",
-+  "disable-dwm-composition",
-+  "disable-encryption-migration",
-+  "disable-eol-notification",
-+  "disable-es3-apis",
-+  "disable-es3-gl-context",
-+  "disable-extensions",
-+  "disable-extensions-except",
-+  "disable-extensions-file-access-check",
-+  "disable-extensions-http-throttling",
-+  "disable-fast-web-scroll-view-insets",
-+  "disable-features",
-+  "disable-field-trial-config",
-+  "disable-file-manager-touch-mode",
-+  "disable-file-system",
-+  "disable-flash-3d",
-+  "disable-flash-stage3d",
-+  "disable-fullscreen-low-power-mode",
-+  "disable-fullscreen-tab-detaching",
-+  "disable-gaia-services",
-+  "disable-gesture-editing",
-+  "disable-gesture-requirement-for-presentation",
-+  "disable-gesture-typing",
-+  "disable-gl-drawing-for-tests",
-+  "disable-gl-error-limit",
-+  "disable-gl-extensions",
-+  "disable-glsl-translator",
-+  "disable-gpu",
-+  "disable-gpu-compositing",
-+  "disable-gpu-driver-bug-workarounds",
-+  "disable-gpu-early-init",
-+  "disable-gpu-memory-buffer-compositor-resources",
-+  "disable-gpu-memory-buffer-video-frames",
-+  "disable-gpu-process-crash-limit",
-+  "disable-gpu-program-cache",
-+  "disable-gpu-rasterization",
-+  "disable-gpu-sandbox",
-+  "disable-gpu-shader-disk-cache",
-+  "disable-gpu-vsync",
-+  "disable-gpu-watchdog",
-+  "disable-hang-monitor",
-+  "disable-hid-detection-on-oobe",
-+  "disable-histogram-customizer",
-+  "disable-hosted-app-shim-creation",
-+  "disable-hosted-apps-in-windows",
-+  "disable-http2",
-+  "disable-in-process-stack-traces",
-+  "disable-infobars",
-+  "disable-input-ime-api",
-+  "disable-input-view",
-+  "disable-ios-password-generation",
-+  "disable-ios-password-suggestions",
-+  "disable-ios-physical-web",
-+  "disable-javascript-harmony-shipping",
-+  "disable-kill-after-bad-ipc",
-+  "disable-lcd-text",
-+  "disable-legacy-window",
-+  "disable-local-storage",
-+  "disable-lock-screen-apps",
-+  "disable-logging",
-+  "disable-logging-redirect",
-+  "disable-login-animations",
-+  "disable-login-screen-apps",
-+  "disable-low-end-device-mode",
-+  "disable-low-latency-dxva",
-+  "disable-low-res-tiling",
-+  "disable-lru-snapshot-cache",
-+  "disable-mac-overlays",
-+  "disable-mac-views-native-app-windows",
-+  "disable-machine-cert-request",
-+  "disable-main-frame-before-activation",
-+  "disable-md-error-screen",
-+  "disable-md-oobe",
-+  "disable-media-session-api",
-+  "disable-media-suspend",
-+  "disable-merge-key-char-events",
-+  "disable-mojo-local-storage",
-+  "disable-mojo-renderer",
-+  "disable-mtp-write-support",
-+  "disable-multi-display-layout",
-+  "disable-namespace-sandbox",
-+  "disable-native-gpu-memory-buffers",
-+  "disable-network-portal-notification",
-+  "disable-new-channel-switcher-ui",
-+  "disable-new-korean-ime",
-+  "disable-new-virtual-keyboard-behavior",
-+  "disable-new-zip-unpacker",
-+  "disable-notifications",
-+  "disable-ntp-most-likely-favicons-from-server",
-+  "disable-ntp-popular-sites",
-+  "disable-nv12-dxgi-video",
-+  "disable-offer-store-unmasked-wallet-cards",
-+  "disable-offer-upload-credit-cards",
-+  "disable-office-editing-component-extension",
-+  "disable-offline-auto-reload",
-+  "disable-offline-auto-reload-visible-only",
-+  "disable-origin-trial-controlled-blink-features",
-+  "disable-overscroll-edge-effect",
-+  "disable-panel-fitting",
-+  "disable-partial-raster",
-+  "disable-password-generation",
-+  "disable-pepper-3d",
-+  "disable-pepper-3d-image-chromium",
-+  "disable-permission-action-reporting",
-+  "disable-permissions-api",
-+  "disable-physical-keyboard-autocorrect",
-+  "disable-pinch",
-+  "disable-pnacl-crash-throttling",
-+  "disable-popup-blocking",
-+  "disable-prefer-compositing-to-lcd-text",
-+  "disable-presentation-api",
-+  "disable-print-preview",
-+  "disable-prompt-on-repost",
-+  "disable-proximity-auth-bluetooth-low-energy-discovery",
-+  "disable-pull-to-refresh-effect",
-+  "disable-push-api-background-mode",
-+  "disable-quic",
-+  "disable-reading-from-canvas",
-+  "disable-remote-core-animation",
-+  "disable-remote-fonts",
-+  "disable-remote-playback-api",
-+  "disable-renderer-accessibility",
-+  "disable-renderer-backgrounding",
-+  "disable-renderer-priority-management",
-+  "disable-request-mobile-site",
-+  "disable-resize-lock",
-+  "disable-rgba-4444-textures",
-+  "disable-rollback-option",
-+  "disable-rtc-smoothness-algorithm",
-+  "disable-screen-orientation-lock",
-+  "disable-search-geolocation-disclosure",
-+  "disable-seccomp-filter-sandbox",
-+  "disable-settings-window",
-+  "disable-setuid-sandbox",
-+  "disable-shader-name-hashing",
-+  "disable-shared-workers",
-+  "disable-signin-promo",
-+  "disable-signin-scoped-device-id",
-+  "disable-single-click-autofill",
-+  "disable-skia-runtime-opts",
-+  "disable-slim-navigation-manager",
-+  "disable-slimming-paint-invalidation",
-+  "disable-smooth-scrolling",
-+  "disable-software-rasterizer",
-+  "disable-speech-api",
-+  "disable-suggestions-ui",
-+  "disable-sync",
-+  "disable-sync-app-list",
-+  "disable-sync-types",
-+  "disable-system-timezone-automatic-detection",
-+  "disable-tab-for-desktop-share",
-+  "disable-tab-strip-autoscroll-new-tabs",
-+  "disable-third-party-keyboard-workaround",
-+  "disable-threaded-animation",
-+  "disable-threaded-compositing",
-+  "disable-threaded-scrolling",
-+  "disable-touch-adjustment",
-+  "disable-touch-drag-drop",
-+  "disable-translate-new-ux",
-+  "disable-usb-keyboard-detect",
-+  "disable-v8-idle-tasks",
-+  "disable-vaapi-accelerated-video-encode",
-+  "disable-virtual-keyboard-overscroll",
-+  "disable-voice-input",
-+  "disable-volume-adjust-sound",
-+  "disable-wake-on-wifi",
-+  "disable-web-notification-custom-layouts",
-+  "disable-web-security",
-+  "disable-webgl",
-+  "disable-webgl-image-chromium",
-+  "disable-webrtc-encryption",
-+  "disable-webrtc-hw-decoding",
-+  "disable-webrtc-hw-encoding",
-+  "disable-win32k-lockdown",
-+  "disable-xss-auditor",
-+  "disable-zero-browsers-open-for-tests",
-+  "disable-zero-copy",
-+  "disable-zero-copy-dxgi-video",
-+  "disabled",
-+  "disabled-new-style-notification",
-+  "disallow-non-exact-resource-reuse",
-+  "disk-cache-dir",
-+  "disk-cache-size",
-+  "display",
-+  "dmg-device",
-+  "dns-log-details",
-+  "document-user-activation-required",
-+  "dom-automation",
-+  "dotfile",
-+  "draft",
-+  "draw-view-bounds-rects",
-+  "duck-flash",
-+  "dump-blink-runtime-call-stats",
-+  "dump-browser-histograms",
-+  "dump-dom",
-+  "eafe-path",
-+  "eafe-url",
-+  "easy-unlock-app-path",
-+  "edge-touch-filtering",
-+  "egl",
-+  "elevate",
-+  "embedded-extension-options",
-+  "emphasize-titles-in-omnibox-dropdown",
-+  "emulate-shader-precision",
-+  "enable-accelerated-2d-canvas",
-+  "enable-accelerated-vpx-decode",
-+  "enable-accessibility-tab-switcher",
-+  "enable-adaptive-selection-handle-orientation",
-+  "enable-aggressive-domstorage-flushing",
-+  "enable-android-wallpapers-app",
-+  "enable-app-info-dialog-mac",
-+  "enable-app-list",
-+  "enable-app-window-cycling",
-+  "enable-appcontainer",
-+  "enable-arc",
-+  "enable-arc-oobe-optin",
-+  "enable-audio-debug-recordings-from-extension",
-+  "enable-audio-focus",
-+  "enable-automation",
-+  "enable-benchmarking",
-+  "enable-ble-advertising-in-apps",
-+  "enable-blink-features",
-+  "enable-bookmark-reordering",
-+  "enable-bookmark-undo",
-+  "enable-browser-side-navigation",
-+  "enable-browser-task-scheduler",
-+  "enable-checker-imaging",
-+  "enable-chromevox-arc-support",
-+  "enable-clear-browsing-data-counters",
-+  "enable-cloud-print-proxy",
-+  "enable-cloud-print-xps",
-+  "enable-consumer-kiosk",
-+  "enable-contextual-search",
-+  "enable-crash-reporter",
-+  "enable-crash-reporter-for-testing",
-+  "enable-crx-hash-check",
-+  "enable-data-reduction-proxy-bypass-warning",
-+  "enable-data-reduction-proxy-force-pingback",
-+  "enable-data-reduction-proxy-lite-page",
-+  "enable-data-reduction-proxy-savings-promo",
-+  "enable-datasaver-prompt",
-+  "enable-device-discovery-notifications",
-+  "enable-devtools-experiments",
-+  "enable-direct-composition-layers",
-+  "enable-display-list-2d-canvas",
-+  "enable-distance-field-text",
-+  "enable-distillability-service",
-+  "enable-dom-distiller",
-+  "enable-domain-reliability",
-+  "enable-drive-search-in-app-launcher",
-+  "enable-drm-atomic",
-+  "enable-embedded-extension-options",
-+  "enable-encryption-migration",
-+  "enable-encryption-selection",
-+  "enable-es3-apis",
-+  "enable-exclusive-audio",
-+  "enable-experimental-accessibility-features",
-+  "enable-experimental-canvas-features",
-+  "enable-experimental-extension-apis",
-+  "enable-experimental-fullscreen-exit-ui",
-+  "enable-experimental-input-view-features",
-+  "enable-experimental-web-platform-features",
-+  "enable-extension-activity-log-testing",
-+  "enable-extension-activity-logging",
-+  "enable-extension-assets-sharing",
-+  "enable-fast-unload",
-+  "enable-fast-web-scroll-view-insets",
-+  "enable-features",
-+  "enable-file-manager-touch-mode",
-+  "enable-first-run-ui-transitions",
-+  "enable-floating-virtual-keyboard",
-+  "enable-font-antialiasing",
-+  "enable-fullscreen-tab-detaching",
-+  "enable-fullscreen-toolbar-reveal",
-+  "enable-google-branded-context-menu",
-+  "enable-gpu-async-worker-context",
-+  "enable-gpu-benchmarking",
-+  "enable-gpu-client-logging",
-+  "enable-gpu-client-tracing",
-+  "enable-gpu-command-logging",
-+  "enable-gpu-debugging",
-+  "enable-gpu-driver-debug-logging",
-+  "enable-gpu-memory-buffer-compositor-resources",
-+  "enable-gpu-memory-buffer-video-frames",
-+  "enable-gpu-rasterization",
-+  "enable-gpu-service-logging",
-+  "enable-gpu-service-tracing",
-+  "enable-hardware-overlays",
-+  "enable-harfbuzz-rendertext",
-+  "enable-hdr",
-+  "enable-heap-profiling",
-+  "enable-hosted-app-quit-notification",
-+  "enable-hosted-apps-in-windows",
-+  "enable-hotword-hardware",
-+  "enable-hung-renderer-infobar",
-+  "enable-inband-text-tracks",
-+  "enable-input-ime-api",
-+  "enable-internal-media-session",
-+  "enable-ios-handoff-to-other-devices",
-+  "enable-ios-password-generation",
-+  "enable-ios-physical-web",
-+  "enable-layer-lists",
-+  "enable-lcd-text",
-+  "enable-leak-detection",
-+  "enable-local-file-accesses",
-+  "enable-local-sync-backend",
-+  "enable-logging",
-+  "enable-longpress-drag-selection",
-+  "enable-low-end-device-mode",
-+  "enable-low-res-tiling",
-+  "enable-lru-snapshot-cache",
-+  "enable-mac-views-native-app-windows",
-+  "enable-main-frame-before-activation",
-+  "enable-md-feedback",
-+  "enable-md-policy-page",
-+  "enable-media-suspend",
-+  "enable-merge-key-char-events",
-+  "enable-message-center-always-scroll-up-upon-notification-removal",
-+  "enable-nacl",
-+  "enable-nacl-debug",
-+  "enable-nacl-nonsfi-mode",
-+  "enable-native-gpu-memory-buffers",
-+  "enable-natural-scroll-default",
-+  "enable-navigation-tracing",
-+  "enable-net-benchmarking",
-+  "enable-network-information-downlink-max",
-+  "enable-network-portal-notification",
-+  "enable-new-app-menu-icon",
-+  "enable-ntp-most-likely-favicons-from-server",
-+  "enable-ntp-popular-sites",
-+  "enable-ntp-search-engine-country-detection",
-+  "enable-offer-store-unmasked-wallet-cards",
-+  "enable-offer-upload-credit-cards",
-+  "enable-offline-auto-reload",
-+  "enable-offline-auto-reload-visible-only",
-+  "enable-osk-overscroll",
-+  "enable-override-bookmarks-ui",
-+  "enable-partial-raster",
-+  "enable-password-generation",
-+  "enable-pepper-testing",
-+  "enable-permission-action-reporting",
-+  "enable-physical-keyboard-autocorrect",
-+  "enable-picture-in-picture",
-+  "enable-pinch",
-+  "enable-pixel-output-in-tests",
-+  "enable-plugin-placeholder-testing",
-+  "enable-potentially-annoying-security-features",
-+  "enable-power-overlay",
-+  "enable-precise-memory-info",
-+  "enable-prefer-compositing-to-lcd-text",
-+  "enable-print-browser",
-+  "enable-print-preview-register-promos",
-+  "enable-profile-shortcut-manager",
-+  "enable-profiling",
-+  "enable-push-api-background-mode",
-+  "enable-quic",
-+  "enable-reader-mode-toolbar-icon",
-+  "enable-refresh-token-annotation-request",
-+  "enable-request-tablet-site",
-+  "enable-rgba-4444-textures",
-+  "enable-sandbox",
-+  "enable-sandbox-logging",
-+  "enable-screenshot-testing-with-mode",
-+  "enable-scripts-require-action",
-+  "enable-scroll-prediction",
-+  "enable-service-manager-tracing",
-+  "enable-settings-window",
-+  "enable-sgi-video-sync",
-+  "enable-signin-promo",
-+  "enable-single-click-autofill",
-+  "enable-site-settings",
-+  "enable-skia-benchmarking",
-+  "enable-slim-navigation-manager",
-+  "enable-slimming-paint-invalidation",
-+  "enable-slimming-paint-v2",
-+  "enable-smooth-scrolling",
-+  "enable-spatial-navigation",
-+  "enable-spdy-proxy-auth",
-+  "enable-speech-dispatcher",
-+  "enable-spelling-feedback-field-trial",
-+  "enable-spotlight-actions",
-+  "enable-stats-collection-bindings",
-+  "enable-stats-table",
-+  "enable-strict-mixed-content-checking",
-+  "enable-strict-powerful-feature-restrictions",
-+  "enable-suggestions-ui",
-+  "enable-suggestions-with-substring-match",
-+  "enable-supervised-user-managed-bookmarks-folder",
-+  "enable-surface-synchronization",
-+  "enable-swap-buffers-with-bounds",
-+  "enable-sync-app-list",
-+  "enable-sync-articles",
-+  "enable-tab-audio-muting",
-+  "enable-tablet-splitview",
-+  "enable-tcp-fastopen",
-+  "enable-third-party-keyboard-workaround",
-+  "enable-threaded-compositing",
-+  "enable-threaded-texture-mailboxes",
-+  "enable-tile-compression",
-+  "enable-touch-calibration-setting",
-+  "enable-touch-drag-drop",
-+  "enable-touchpad-three-finger-click",
-+  "enable-touchview",
-+  "enable-trace-app-source",
-+  "enable-tracing",
-+  "enable-tracing-output",
-+  "enable-translate-new-ux",
-+  "enable-ui-devtools",
-+  "enable-use-zoom-for-dsf",
-+  "enable-user-controlled-alternate-protocol-ports",
-+  "enable-user-metrics",
-+  "enable-usermedia-screen-capturing",
-+  "enable-video-player-chromecast-support",
-+  "enable-viewport",
-+  "enable-virtual-keyboard",
-+  "enable-voice-interaction",
-+  "enable-vtune-support",
-+  "enable-vulkan",
-+  "enable-wayland-server",
-+  "enable-web-notification-custom-layouts",
-+  "enable-webfonts-intervention-trigger",
-+  "enable-webfonts-intervention-v2",
-+  "enable-webgl-draft-extensions",
-+  "enable-webgl-image-chromium",
-+  "enable-webrtc-event-logging-from-extension",
-+  "enable-webrtc-srtp-aes-gcm",
-+  "enable-webrtc-stun-origin",
-+  "enable-webview-finch",
-+  "enable-webvr",
-+  "enable-wifi-credential-sync",
-+  "enable-win7-webrtc-hw-h264-decoding",
-+  "enable-zero-copy",
-+  "enable-zip-archiver-on-file-manager",
-+  "enabled",
-+  "enabled-2g",
-+  "enabled-3g",
-+  "enabled-new-style-notification",
-+  "enabled-slow2g",
-+  "encode-binary",
-+  "enforce",
-+  "enforce-gl-minimums",
-+  "enforce-webrtc-ip-permission-check",
-+  "enforce_strict",
-+  "enterprise-disable-arc",
-+  "enterprise-enable-forced-re-enrollment",
-+  "enterprise-enable-license-type-selection",
-+  "enterprise-enable-zero-touch-enrollment",
-+  "enterprise-enrollment-initial-modulus",
-+  "enterprise-enrollment-modulus-limit",
-+  "error-console",
-+  "experiment",
-+  "explicitly-allowed-ports",
-+  "expose-internals-for-testing",
-+  "extension-content-verification",
-+  "extension-process",
-+  "extensions-install-verification",
-+  "extensions-multi-account",
-+  "extensions-not-webstore",
-+  "extensions-on-chrome-urls",
-+  "extensions-update-frequency",
-+  "extra-search-query-params",
-+  "fail-on-unused-args",
-+  "fake-variations-channel",
-+  "false",
-+  "fast",
-+  "fast-start",
-+  "feedback-server",
-+  "field-trial-handle",
-+  "first-exec-after-boot",
-+  "flag-switches-begin",
-+  "flag-switches-end",
-+  "font-cache-shared-handle",
-+  "force-android-app-mode",
-+  "force-app-mode",
-+  "force-clamshell-power-button",
-+  "force-color-profile",
-+  "force-desktop-ios-promotion",
-+  "force-dev-mode-highlighting",
-+  "force-device-scale-factor",
-+  "force-display-list-2d-canvas",
-+  "force-effective-connection-type",
-+  "force-enable-metrics-reporting",
-+  "force-enable-stylus-tools",
-+  "force-fieldtrial-params",
-+  "force-fieldtrials",
-+  "force-first-run",
-+  "force-first-run-ui",
-+  "force-gpu-mem-available-mb",
-+  "force-gpu-rasterization",
-+  "force-happiness-tracking-system",
-+  "force-load-easy-unlock-app-in-tests",
-+  "force-local-ntp",
-+  "force-login-manager-in-tests",
-+  "force-mediafoundation",
-+  "force-overlay-fullscreen-video",
-+  "force-password-reauth",
-+  "force-pnacl-subzero",
-+  "force-renderer-accessibility",
-+  "force-show-update-menu-badge",
-+  "force-show-update-menu-item",
-+  "force-system-compositor-mode",
-+  "force-tablet-mode",
-+  "force-text-direction",
-+  "force-ui-direction",
-+  "force-variation-ids",
-+  "force-video-overlays",
-+  "force-wave-audio",
-+  "force-webrtc-ip-handling-policy",
-+  "full-memory-crash-report",
-+  "gaia-url",
-+  "gcm-checkin-url",
-+  "gcm-mcs-endpoint",
-+  "gcm-registration-url",
-+  "generate-accessibility-test-expectations",
-+  "gl",
-+  "gl-composited-overlay-candidate-quad-border",
-+  "gl-shader-interm-output",
-+  "gles",
-+  "golden-screenshots-dir",
-+  "google-apis-url",
-+  "google-base-url",
-+  "google-doodle-url",
-+  "google-url",
-+  "gpu-active-device-id",
-+  "gpu-active-vendor-id",
-+  "gpu-device-id",
-+  "gpu-driver-bug-workarounds",
-+  "gpu-driver-date",
-+  "gpu-driver-vendor",
-+  "gpu-driver-version",
-+  "gpu-launcher",
-+  "gpu-no-complete-info-collection",
-+  "gpu-no-context-lost",
-+  "gpu-process",
-+  "gpu-program-cache-size-kb",
-+  "gpu-rasterization-msaa-sample-count",
-+  "gpu-sandbox-allow-sysv-shm",
-+  "gpu-sandbox-failures-fatal",
-+  "gpu-sandbox-start-early",
-+  "gpu-secondary-device-ids",
-+  "gpu-secondary-vendor-ids",
-+  "gpu-startup-dialog",
-+  "gpu-testing-device-id",
-+  "gpu-testing-driver-date",
-+  "gpu-testing-gl-renderer",
-+  "gpu-testing-gl-vendor",
-+  "gpu-testing-gl-version",
-+  "gpu-testing-os-version",
-+  "gpu-testing-secondary-device-ids",
-+  "gpu-testing-secondary-vendor-ids",
-+  "gpu-testing-vendor-id",
-+  "gpu-vendor-id",
-+  "guest-wallpaper-large",
-+  "guest-wallpaper-small",
-+  "h",
-+  "has-chromeos-diamond-key",
-+  "has-chromeos-keyboard",
-+  "has-internal-stylus",
-+  "headless",
-+  "help",
-+  "hide",
-+  "hide-icons",
-+  "hide-scrollbars",
-+  "history-entry-requires-user-gesture",
-+  "homedir",
-+  "homepage",
-+  "host",
-+  "host-pairing-oobe",
-+  "host-resolver-rules",
-+  "host-rules",
-+  "icu-data-dir",
-+  "ignore-autocomplete-off-autofill",
-+  "ignore-autoplay-restrictions",
-+  "ignore-certificate-errors",
-+  "ignore-certificate-errors-spki-list",
-+  "ignore-gpu-blacklist",
-+  "ignore-urlfetcher-cert-requests",
-+  "ignore-user-profile-mapping-for-tests",
-+  "in-process-gpu",
-+  "incognito",
-+  "input",
-+  "inspect",
-+  "inspect-brk",
-+  "install-chrome-app",
-+  "install-supervised-user-whitelists",
-+  "instant-process",
-+  "invalidation-use-gcm-channel",
-+  "ipc-connection-timeout",
-+  "ipc-dump-directory",
-+  "ipc-fuzzer-testcase",
-+  "is-running-in-mash",
-+  "isolate-origins",
-+  "isolate-sites-for-testing",
-+  "javascript-harmony",
-+  "js-flags",
-+  "keep-alive-for-test",
-+  "kiosk",
-+  "kiosk-printing",
-+  "lang",
-+  "last-launched-app",
-+  "layer",
-+  "light_muted",
-+  "light_vibrant",
-+  "limit-fps",
-+  "load-and-launch-app",
-+  "load-apps",
-+  "load-extension",
-+  "load-media-router-component-extension",
-+  "local-heuristics-only-for-password-generation",
-+  "local-ntp-reload",
-+  "local-sync-backend-dir",
-+  "log-gpu-control-list-decisions",
-+  "log-level",
-+  "log-net-log",
-+  "login-manager",
-+  "login-profile",
-+  "login-user",
-+  "lso-url",
-+  "ltr",
-+  "main-frame-resizes-are-orientation-changes",
-+  "make-chrome-default",
-+  "make-default-browser",
-+  "managed-user-id",
-+  "managed-user-sync-token",
-+  "mark-non-secure-as",
-+  "markdown",
-+  "market-url-for-testing",
-+  "mash",
-+  "material",
-+  "material-design-ink-drop-animation-speed",
-+  "material-hybrid",
-+  "max-gum-fps",
-+  "max-output-volume-dba1m",
-+  "max-untiled-layer-height",
-+  "max-untiled-layer-width",
-+  "media-cache-size",
-+  "mem-pressure-system-reserved-kb",
-+  "memlog",
-+  "memlog-pipe",
-+  "memory-pressure-off",
-+  "memory-pressure-thresholds",
-+  "memory-pressure-thresholds-mb",
-+  "message-center-changes-while-open",
-+  "metrics-client-id",
-+  "metrics-recording-only",
-+  "mhtml-generator-option",
-+  "mirror",
-+  "mock",
-+  "mojo-local-storage",
-+  "mojo-pipe-token",
-+  "monitoring-destination-id",
-+  "mse-audio-buffer-size-limit",
-+  "mse-video-buffer-size-limit",
-+  "mus",
-+  "mus-config",
-+  "mute-audio",
-+  "nacl-broker",
-+  "nacl-dangerous-no-sandbox-nonsfi",
-+  "nacl-debug-mask",
-+  "nacl-gdb",
-+  "nacl-gdb-script",
-+  "nacl-loader",
-+  "nacl-loader-nonsfi",
-+  "native",
-+  "native-crx-bindings",
-+  "need-arc-migration-policy-check",
-+  "net-log-capture-mode",
-+  "netifs-to-ignore",
-+  "network-country-iso",
-+  "network-settings-config",
-+  "new-window",
-+  "no-default-browser-check",
-+  "no-experiments",
-+  "no-first-run",
-+  "no-managed-user-acknowledgment-check",
-+  "no-network-profile-warning",
-+  "no-pings",
-+  "no-proxy-server",
-+  "no-referrers",
-+  "no-sandbox",
-+  "no-service-autorun",
-+  "no-session-id",
-+  "no-startup-window",
-+  "no-user-gesture-required",
-+  "no-wifi",
-+  "no-zygote",
-+  "nocolor",
-+  "noerrdialogs",
-+  "non-material",
-+  "non-secure",
-+  "non-secure-after-editing",
-+  "non-secure-while-incognito",
-+  "non-secure-while-incognito-or-editing",
-+  "none",
-+  "normal_muted",
-+  "normal_vibrant",
-+  "note-taking-app-ids",
-+  "ntp-snippets-add-incomplete",
-+  "ntp-switch-to-existing-tab",
-+  "null",
-+  "num-raster-threads",
-+  "oauth2-client-id",
-+  "oauth2-client-secret",
-+  "off",
-+  "on",
-+  "oobe-bootstrapping-master",
-+  "oobe-force-show-screen",
-+  "oobe-guest-session",
-+  "oobe-skip-postlogin",
-+  "oobe-timer-interval",
-+  "open-ash",
-+  "opengraph",
-+  "origin-to-force-quic-on",
-+  "origin-trial-disabled-features",
-+  "origin-trial-disabled-tokens",
-+  "origin-trial-public-key",
-+  "original-process-start-time",
-+  "osmesa",
-+  "output",
-+  "override",
-+  "override-metrics-upload-url",
-+  "override-plugin-power-saver-for-testing",
-+  "override-use-software-gl-for-tests",
-+  "overscroll-history-navigation",
-+  "overscroll-start-threshold",
-+  "ozone-dump-file",
-+  "ozone-platform",
-+  "pack-extension",
-+  "pack-extension-key",
-+  "parent-profile",
-+  "parent-window",
-+  "passive-listeners-default",
-+  "password-store",
-+  "permission-request-api-scope",
-+  "permission-request-api-url",
-+  "ppapi",
-+  "ppapi-antialiased-text-enabled",
-+  "ppapi-broker",
-+  "ppapi-flash-args",
-+  "ppapi-flash-path",
-+  "ppapi-flash-version",
-+  "ppapi-in-process",
-+  "ppapi-plugin-launcher",
-+  "ppapi-startup-dialog",
-+  "ppapi-subpixel-rendering-setting",
-+  "prerender-from-omnibox",
-+  "previous-app",
-+  "primary",
-+  "print-to-pdf",
-+  "privet-ipv6-only",
-+  "process-per-site",
-+  "process-per-tab",
-+  "product-version",
-+  "profile-directory",
-+  "profiler-timing",
-+  "profiling",
-+  "profiling-at-start",
-+  "profiling-file",
-+  "profiling-flush",
-+  "progress-bar-animation",
-+  "progress-bar-completion",
-+  "prompt-for-external-extensions",
-+  "proxy-auto-detect",
-+  "proxy-bypass-list",
-+  "proxy-pac-url",
-+  "proxy-server",
-+  "q",
-+  "quic-connection-options",
-+  "quic-max-packet-length",
-+  "quic-version",
-+  "rdp_desktop_session",
-+  "reader-mode-feedback",
-+  "reader-mode-heuristics",
-+  "rebaseline-pixel-tests",
-+  "record-type",
-+  "reduce-security-for-testing",
-+  "reduced-referrer-granularity",
-+  "register-font-files",
-+  "register-pepper-plugins",
-+  "relauncher",
-+  "remote-debugging-address",
-+  "remote-debugging-port",
-+  "remote-debugging-socket-fd",
-+  "remote-debugging-socket-name",
-+  "remote-debugging-targets",
-+  "renderer",
-+  "renderer-client-id",
-+  "renderer-cmd-prefix",
-+  "renderer-process-limit",
-+  "renderer-startup-dialog",
-+  "renderer-wait-for-java-debugger",
-+  "renderpass",
-+  "repl",
-+  "report-vp9-as-an-unsupported-mime-type",
-+  "require-audio-hardware-for-testing",
-+  "reset-app-list-install-state",
-+  "reset-variation-state",
-+  "restore-last-session",
-+  "root",
-+  "root-layer-scrolls",
-+  "rtl",
-+  "run-layout-test",
-+  "runtime-deps-list-file",
-+  "safebrowsing-disable-auto-update",
-+  "safebrowsing-disable-download-protection",
-+  "safebrowsing-disable-extension-blacklist",
-+  "safebrowsing-manual-download-blacklist",
-+  "sandbox-ipc",
-+  "save-page-as-mhtml",
-+  "screen-config",
-+  "screenshot",
-+  "script-executable",
-+  "scripts-require-action",
-+  "scroll-end-effect",
-+  "search-provider-logo-url",
-+  "secondary",
-+  "secondary-display-layout",
-+  "secondary-ui-md",
-+  "service",
-+  "service-manager",
-+  "service-name",
-+  "service-pipe-token",
-+  "service-request-channel-token",
-+  "service-runner",
-+  "shared-files",
-+  "shill-stub",
-+  "show-app-list",
-+  "show-autofill-signatures",
-+  "show-autofill-type-predictions",
-+  "show-cert-link",
-+  "show-component-extension-options",
-+  "show-composited-layer-borders",
-+  "show-fps-counter",
-+  "show-icons",
-+  "show-layer-animation-bounds",
-+  "show-login-dev-overlay",
-+  "show-mac-overlay-borders",
-+  "show-md-login",
-+  "show-non-md-login",
-+  "show-overdraw-feedback",
-+  "show-paint-rects",
-+  "show-property-changed-rects",
-+  "show-saved-copy",
-+  "show-screenspace-rects",
-+  "show-surface-damage-rects",
-+  "silent-debugger-extension-api",
-+  "silent-launch",
-+  "simulate-critical-update",
-+  "simulate-elevated-recovery",
-+  "simulate-outdated",
-+  "simulate-outdated-no-au",
-+  "simulate-upgrade",
-+  "single-process",
-+  "site-per-process",
-+  "skip-gpu-data-loading",
-+  "skip-nostore-all",
-+  "skip-nostore-main",
-+  "skip-reencoding-on-skp-capture",
-+  "slow",
-+  "slow-connections-only",
-+  "slow-down-raster-scale-factor",
-+  "sms-test-messages",
-+  "spdy-proxy-auth-fallback",
-+  "spdy-proxy-auth-origin",
-+  "spdy-proxy-auth-value",
-+  "spelling-service-feedback-interval-seconds",
-+  "spelling-service-feedback-url",
-+  "spurious-power-button-accel-count",
-+  "spurious-power-button-keyboard-accel",
-+  "spurious-power-button-lid-angle-change",
-+  "spurious-power-button-screen-accel",
-+  "spurious-power-button-window",
-+  "ssl-key-log-file",
-+  "ssl-version-max",
-+  "ssl-version-min",
-+  "stable-release-mode",
-+  "start-fullscreen",
-+  "start-maximized",
-+  "start-stack-profiler",
-+  "started",
-+  "stub",
-+  "stub-cros-settings",
-+  "supports-dual-gpus",
-+  "surface",
-+  "swiftshader",
-+  "swiftshader-webgl",
-+  "sync-allow-insecure-xmpp-connection",
-+  "sync-deferred-startup-timeout-seconds",
-+  "sync-disable-deferred-startup",
-+  "sync-enable-get-update-avoidance",
-+  "sync-notification-host-port",
-+  "sync-on-draw-hardware",
-+  "sync-short-initial-retry-override",
-+  "sync-short-nudge-delay-for-test",
-+  "sync-url",
-+  "system-developer-mode",
-+  "system-log-upload-frequency",
-+  "tab-management-experiment-type-disabled",
-+  "tab-management-experiment-type-elderberry",
-+  "task-profiler",
-+  "team-drives",
-+  "test-auto-update-ui",
-+  "test-child-process",
-+  "test-cros-gaia-id-migration",
-+  "test-do-not-initialize-icu",
-+  "test-encryption-migration-ui",
-+  "test-gl-lib",
-+  "test-launcher-batch-limit",
-+  "test-launcher-bot-mode",
-+  "test-launcher-debug-launcher",
-+  "test-launcher-filter-file",
-+  "test-launcher-force-run-broken-tests",
-+  "test-launcher-jobs",
-+  "test-launcher-list-tests",
-+  "test-launcher-output",
-+  "test-launcher-print-test-stdio",
-+  "test-launcher-print-writable-path",
-+  "test-launcher-retry-limit",
-+  "test-launcher-shard-index",
-+  "test-launcher-summary-output",
-+  "test-launcher-test-part-results-limit",
-+  "test-launcher-timeout",
-+  "test-launcher-total-shards",
-+  "test-launcher-trace",
-+  "test-name",
-+  "test-tiny-timeout",
-+  "test-type",
-+  "testing-fixed-http-port",
-+  "testing-fixed-https-port",
-+  "tether-stub",
-+  "threads",
-+  "time",
-+  "timeout",
-+  "tls1",
-+  "tls1.1",
-+  "tls1.2",
-+  "tls1.3",
-+  "tls13-variant",
-+  "top-chrome-md",
-+  "top-controls-hide-threshold",
-+  "top-controls-show-threshold",
-+  "touch-calibration",
-+  "touch-devices",
-+  "touch-events",
-+  "touch-noise-filtering",
-+  "touch-selection-strategy",
-+  "touch_view",
-+  "trace-config-file",
-+  "trace-export-events-to-etw",
-+  "trace-shutdown",
-+  "trace-shutdown-file",
-+  "trace-startup",
-+  "trace-startup-duration",
-+  "trace-startup-file",
-+  "trace-to-console",
-+  "trace-to-file",
-+  "trace-to-file-name",
-+  "trace-upload-url",
-+  "tracelog",
-+  "translate-ranker-model-url",
-+  "translate-script-url",
-+  "translate-security-origin",
-+  "true",
-+  "trusted-download-sources",
-+  "try-chrome-again",
-+  "try-supported-channel-layouts",
-+  "type",
-+  "ui-disable-partial-swap",
-+  "ui-enable-layer-lists",
-+  "ui-enable-rgba-4444-textures",
-+  "ui-enable-zero-copy",
-+  "ui-prioritize-in-gpu-process",
-+  "ui-show-composited-layer-borders",
-+  "ui-show-fps-counter",
-+  "ui-show-layer-animation-bounds",
-+  "ui-show-paint-rects",
-+  "ui-show-property-changed-rects",
-+  "ui-show-screenspace-rects",
-+  "ui-show-surface-damage-rects",
-+  "ui-slow-animations",
-+  "ui-test-action-max-timeout",
-+  "ui-test-action-timeout",
-+  "uninstall",
-+  "unlimited-storage",
-+  "unsafe-pac-url",
-+  "unsafely-allow-protected-media-identifier-for-domain",
-+  "unsafely-treat-insecure-origin-as-secure",
-+  "use-angle",
-+  "use-cras",
-+  "use-double-buffering",
-+  "use-fake-device-for-media-stream",
-+  "use-fake-jpeg-decode-accelerator",
-+  "use-fake-ui-for-media-stream",
-+  "use-file-for-fake-audio-capture",
-+  "use-file-for-fake-video-capture",
-+  "use-first-display-as-internal",
-+  "use-gl",
-+  "use-gpu-in-tests",
-+  "use-ime-service",
-+  "use-mobile-user-agent",
-+  "use-mock-keychain",
-+  "use-passthrough-cmd-decoder",
-+  "use-simple-cache-backend",
-+  "use-system-default-printer",
-+  "use-test-config",
-+  "user-agent",
-+  "user-always-affiliated",
-+  "user-data-dir",
-+  "user-gesture-required",
-+  "user-gesture-required-for-cross-origin",
-+  "utility",
-+  "utility-allowed-dir",
-+  "utility-cmd-prefix",
-+  "utility-run-elevated",
-+  "v",
-+  "v2-sandbox",
-+  "v2-sandbox-enabled",
-+  "v8-cache-options",
-+  "v8-cache-strategies-for-cache-storage",
-+  "validate-crx",
-+  "validate-input-event-stream",
-+  "variations-override-country",
-+  "variations-server-url",
-+  "version",
-+  "video-image-texture-target",
-+  "video-threads",
-+  "video-underflow-threshold-ms",
-+  "virtual-time-budget",
-+  "vmodule",
-+  "voice-interaction-supported-locales",
-+  "wait-for-debugger",
-+  "wait-for-debugger-children",
-+  "wake-on-wifi-packet",
-+  "wallet-service-use-sandbox",
-+  "watcher",
-+  "waveout-buffers",
-+  "webapk-server-url",
-+  "webrtc-max-cpu-consumption-percentage",
-+  "webrtc-stun-probe-trial",
-+  "webview-enable-safebrowsing-support",
-+  "webview-sandboxed-renderer",
-+  "whitelisted-extension-id",
-+  "win-jumplist-action",
-+  "window-position",
-+  "window-size",
-+  "window-workspace",
-+  "windows10-custom-titlebar",
-+  "winhttp-proxy-resolver",
-+  "wm-window-animations-disabled",
-+  "yield-between-content-script-runs",
-+  "zygote",
-+  "zygote-cmd-prefix",
-+};
-+
-+bool IsBlacklistedArg(const base::CommandLine::CharType* arg) {
-+#if defined(OS_WIN)
-+  const auto converted = base::WideToUTF8(arg);
-+  const char* a = converted.c_str();
-+#else
-+  const char* a = arg;
-+#endif
-+
-+  static const char* prefixes[] = {"--", "-", "/"};
-+
-+  int prefix_length = 0;
-+  for (auto& prefix : prefixes) {
-+    if (base::StartsWith(a, prefix, base::CompareCase::SENSITIVE)) {
-+      prefix_length = strlen(prefix);
-+      break;
-+    }
-+  }
-+
-+  if (prefix_length > 0) {
-+    a += prefix_length;
-+    std::string switch_name =
-+        base::ToLowerASCII(base::StringPiece(a, strcspn(a, "=")));
-+    return std::binary_search(std::begin(kBlacklist), std::end(kBlacklist),
-+                              switch_name);
-+  }
-+
-+  return false;
-+}
-+
-+>>>>>>> .their
- }  // namespace
- 
- namespace atom {
-changed in both
-  base   100644 4bd88a5a43c03ceba308ec06fdf0cbadeddcaae3 atom/browser/api/atom_api_browser_view.cc
-  our    100644 bd83208694c61c4d7c43ce4be26939c2682b2a13 atom/browser/api/atom_api_browser_view.cc
-  their  100644 41f0e99cdd79bf1ad2c4c8c0db5aaa97ac5e1297 atom/browser/api/atom_api_browser_view.cc
-changed in both
-  base   100644 ced1cb31d8df7689f7652111720ba20fb029b1fe atom/browser/api/atom_api_menu_views.cc
-  our    100644 3da7dc2842fa4561e037aa67f290d0cc6ca71014 atom/browser/api/atom_api_menu_views.cc
-  their  100644 fa178e57d82413544b92172ae0ed4401ea5f178b atom/browser/api/atom_api_menu_views.cc
-@@ -49,8 +49,16 @@
-   menu_runners_[window_id] =
-       std::make_unique<MenuRunner>(model(), flags, close_callback);
-   menu_runners_[window_id]->RunMenuAt(
-+<<<<<<< .our
-       native_window->widget(), NULL, gfx::Rect(location, gfx::Size()),
-       views::MENU_ANCHOR_TOPLEFT, ui::MENU_SOURCE_MOUSE);
-+=======
-+      native_window->widget(),
-+      NULL,
-+      gfx::Rect(location, gfx::Size()),
-+      views::MENU_ANCHOR_TOPLEFT,
-+      ui::MENU_SOURCE_MOUSE);
-+>>>>>>> .their
- }
- 
- void MenuViews::ClosePopupAt(int32_t window_id) {
-removed in local
-  base   100644 0d22fad5b8b5e3ed7711d55aa763f930014a75d7 atom/browser/api/atom_api_screen_mac.mm
-  their  100644 056b775fdfc221cb0501ba5b7afd8de01f2d4d63 atom/browser/api/atom_api_screen_mac.mm
-changed in both
-  base   100644 6e5c4b9cbe77c1a4004bbc2bf7b0f0089ffb9004 atom/browser/api/atom_api_session.cc
-  our    100644 658f913bb60b66ae1bf3aae97d7d9158e56f7ee0 atom/browser/api/atom_api_session.cc
-  their  100644 d36812daa35dc795b667c190952b980f25d9e618 atom/browser/api/atom_api_session.cc
-@@ -29,7 +29,6 @@
- #include "base/guid.h"
- #include "base/strings/string_number_conversions.h"
- #include "base/strings/string_util.h"
--#include "base/threading/thread_task_runner_handle.h"
- #include "brightray/browser/media/media_device_id_salt.h"
- #include "chrome/browser/browser_process.h"
- #include "chrome/common/pref_names.h"
-@@ -46,8 +45,12 @@
- #include "net/dns/host_cache.h"
- #include "net/http/http_auth_handler_factory.h"
- #include "net/http/http_auth_preferences.h"
-+<<<<<<< .our
- #include "net/proxy_resolution/proxy_config_service_fixed.h"
- #include "net/proxy_resolution/proxy_service.h"
-+=======
-+#include "net/proxy/proxy_config_service_fixed.h"
-+>>>>>>> .their
- #include "net/url_request/static_http_user_agent_settings.h"
- #include "net/url_request/url_request_context.h"
- #include "net/url_request/url_request_context_getter.h"
-@@ -236,6 +239,7 @@
- // Referenced session objects.
- std::map<uint32_t, v8::Global<v8::Object>> g_sessions;
- 
-+<<<<<<< .our
- class ResolveProxyHelper {
-  public:
-   ResolveProxyHelper(AtomBrowserContext* browser_context,
-@@ -286,6 +290,8 @@
-   DISALLOW_COPY_AND_ASSIGN(ResolveProxyHelper);
- };
- 
-+=======
-+>>>>>>> .their
- // Runs the callback in UI thread.
- void RunCallbackInUI(const base::Callback<void()>& callback) {
-   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, callback);
-@@ -451,6 +457,7 @@
-   AtomNetworkDelegate* network_delegate =
-       static_cast<AtomNetworkDelegate*>(context->network_delegate());
-   network_delegate->SetDevToolsNetworkEmulationClientId(client_id);
-+<<<<<<< .our
- }
- 
- void DestroyGlobalHandle(v8::Isolate* isolate,
-@@ -468,6 +475,8 @@
-       object->SetAlignedPointerInInternalField(0, nullptr);
-     }
-   }
-+=======
-+>>>>>>> .their
- }
- 
- }  // namespace
-@@ -513,8 +522,10 @@
-   }
- }
- 
--void Session::ResolveProxy(const GURL& url, ResolveProxyCallback callback) {
--  new ResolveProxyHelper(browser_context(), url, callback);
-+void Session::ResolveProxy(
-+    const GURL& url,
-+    const ResolveProxyHelper::ResolveProxyCallback& callback) {
-+  browser_context_->GetResolveProxyHelper()->ResolveProxy(url, callback);
- }
- 
- template <Session::CacheAction action>
-changed in both
-  base   100644 d56c2400d4df9d197a03335c4e2b7e735065f301 atom/browser/api/atom_api_session.h
-  our    100644 6c8247c5c4a90e643712dd47d000d37d181a147b atom/browser/api/atom_api_session.h
-  their  100644 547f0e627b0ecf23e808b85cbd5173892479673f atom/browser/api/atom_api_session.h
-@@ -10,6 +10,7 @@
- 
- #include "atom/browser/api/trackable_object.h"
- #include "atom/browser/atom_blob_reader.h"
-+#include "atom/browser/net/resolve_proxy_helper.h"
- #include "base/values.h"
- #include "content/public/browser/download_manager.h"
- #include "native_mate/handle.h"
-@@ -39,8 +40,6 @@
- class Session : public mate::TrackableObject<Session>,
-                 public content::DownloadManager::Observer {
-  public:
--  using ResolveProxyCallback = base::Callback<void(std::string)>;
--
-   enum class CacheAction {
-     CLEAR,
-     STATS,
-@@ -63,8 +62,14 @@
-                              v8::Local<v8::FunctionTemplate> prototype);
- 
-   // Methods.
-+<<<<<<< .our
-   void ResolveProxy(const GURL& url, ResolveProxyCallback callback);
-   template <CacheAction action>
-+=======
-+  void ResolveProxy(const GURL& url,
-+                    const ResolveProxyHelper::ResolveProxyCallback& callback);
-+  template<CacheAction action>
-+>>>>>>> .their
-   void DoCacheAction(const net::CompletionCallback& callback);
-   void ClearStorageData(mate::Arguments* args);
-   void FlushStorageData();
-changed in both
-  base   100644 83adf62eee8301c49799b5397f2dcf6bfdbbd295 atom/browser/api/atom_api_web_contents.cc
-  our    100644 20a1ac2e672f08ffea528b6e094ba530ff8083d1 atom/browser/api/atom_api_web_contents.cc
-  their  100644 9a19b727a82229565ec37e6a436bdbec4e670925 atom/browser/api/atom_api_web_contents.cc
-@@ -124,6 +124,30 @@
- struct Converter<PrintSettings> {
-   static bool FromV8(v8::Isolate* isolate,
-                      v8::Local<v8::Value> val,
-+<<<<<<< .our
-+=======
-+                     atom::SetSizeParams* out) {
-+    mate::Dictionary params;
-+    if (!ConvertFromV8(isolate, val, &params))
-+      return false;
-+    bool autosize;
-+    if (params.Get("enableAutoSize", &autosize))
-+      out->enable_auto_size.reset(new bool(autosize));
-+    gfx::Size size;
-+    if (params.Get("min", &size))
-+      out->min_size.reset(new gfx::Size(size));
-+    if (params.Get("max", &size))
-+      out->max_size.reset(new gfx::Size(size));
-+    if (params.Get("normal", &size))
-+      out->normal_size.reset(new gfx::Size(size));
-+    return true;
-+  }
-+};
-+
-+template<>
-+struct Converter<PrintSettings> {
-+  static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
-+>>>>>>> .their
-                      PrintSettings* out) {
-     mate::Dictionary dict;
-     if (!ConvertFromV8(isolate, val, &dict))
-@@ -280,7 +304,12 @@
- 
- // Called when CapturePage is done.
- void OnCapturePageDone(const base::Callback<void(const gfx::Image&)>& callback,
-+<<<<<<< .our
-                        const SkBitmap& bitmap) {
-+=======
-+                       const SkBitmap& bitmap,
-+                       content::ReadbackResponse response) {
-+>>>>>>> .their
-   // Hack to enable transparency in captured image
-   // TODO(nitsakh) Remove hack once fixed in chromium
-   const_cast<SkBitmap&>(bitmap).setAlphaType(kPremul_SkAlphaType);
-@@ -1015,6 +1044,18 @@
-                                     content::RenderFrameHost* frame_host) {
-   bool handled = true;
-   FrameDispatchHelper helper = {this, frame_host};
-+<<<<<<< .our
-+=======
-+  auto relay = NativeWindowRelay::FromWebContents(web_contents());
-+  if (relay) {
-+    IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(NativeWindow, message, frame_host)
-+      IPC_MESSAGE_FORWARD(AtomAutofillFrameHostMsg_HidePopup,
-+                          relay->window.get(), NativeWindow::HideAutofillPopup)
-+      IPC_MESSAGE_UNHANDLED(handled = false)
-+    IPC_END_MESSAGE_MAP()
-+  }
-+
-+>>>>>>> .their
-   IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(WebContents, message, frame_host)
-     IPC_MESSAGE_HANDLER(AtomFrameHostMsg_Message, OnRendererMessage)
-     IPC_MESSAGE_FORWARD_DELAY_REPLY(AtomFrameHostMsg_Message_Sync, &helper,
-@@ -1024,10 +1065,14 @@
-         FrameDispatchHelper::OnSetTemporaryZoomLevel)
-     IPC_MESSAGE_FORWARD_DELAY_REPLY(AtomFrameHostMsg_GetZoomLevel, &helper,
-                                     FrameDispatchHelper::OnGetZoomLevel)
-+<<<<<<< .our
- #if defined(TOOLKIT_VIEWS) && !defined(OS_MACOSX)
-     IPC_MESSAGE_HANDLER(AtomAutofillFrameHostMsg_ShowPopup, ShowAutofillPopup)
-     IPC_MESSAGE_HANDLER(AtomAutofillFrameHostMsg_HidePopup, HideAutofillPopup)
- #endif
-+=======
-+    IPC_MESSAGE_HANDLER(AtomAutofillFrameHostMsg_ShowPopup, ShowAutofillPopup)
-+>>>>>>> .their
-     IPC_MESSAGE_UNHANDLED(handled = false)
-   IPC_END_MESSAGE_MAP()
- 
-@@ -1075,6 +1120,20 @@
-        details.is_same_document, details.did_replace_entry);
- }
- 
-+<<<<<<< .our
-+=======
-+int64_t WebContents::GetIDForContents(content::WebContents* web_contents) {
-+  int64_t process_id = web_contents->GetRenderProcessHost()->GetID();
-+  int64_t routing_id = web_contents->GetMainFrame()->GetRoutingID();
-+  int64_t rv = (process_id << 32) + routing_id;
-+  return rv;
-+}
-+
-+int64_t WebContents::GetID() const {
-+  return WebContents::GetIDForContents(web_contents());
-+}
-+
-+>>>>>>> .their
- int WebContents::GetProcessID() const {
-   return web_contents()->GetMainFrame()->GetProcess()->GetID();
- }
-@@ -1552,7 +1611,11 @@
- bool WebContents::SendIPCMessage(bool all_frames,
-                                  const base::string16& channel,
-                                  const base::ListValue& args) {
-+<<<<<<< .our
-   auto* frame_host = web_contents()->GetMainFrame();
-+=======
-+  auto frame_host = web_contents()->GetMainFrame();
-+>>>>>>> .their
-   if (frame_host) {
-     return frame_host->Send(new AtomFrameMsg_Message(
-         frame_host->GetRoutingID(), all_frames, channel, args));
-@@ -1853,6 +1916,7 @@
-   rfh->Send(reply_msg);
- }
- 
-+<<<<<<< .our
- v8::Local<v8::Value> WebContents::GetPreloadPath(v8::Isolate* isolate) const {
-   if (auto* web_preferences = WebContentsPreferences::From(web_contents())) {
-     base::FilePath::StringType preload;
-@@ -1880,6 +1944,25 @@
- }
- 
- v8::Local<v8::Value> WebContents::GetOwnerBrowserWindow() const {
-+=======
-+v8::Local<v8::Value> WebContents::GetWebPreferences(v8::Isolate* isolate) {
-+  WebContentsPreferences* web_preferences =
-+      WebContentsPreferences::FromWebContents(web_contents());
-+  if (!web_preferences)
-+    return v8::Null(isolate);
-+  return mate::ConvertToV8(isolate, *web_preferences->web_preferences());
-+}
-+
-+v8::Local<v8::Value> WebContents::GetLastWebPreferences(v8::Isolate* isolate) {
-+  WebContentsPreferences* web_preferences =
-+      WebContentsPreferences::FromWebContents(web_contents());
-+  if (!web_preferences)
-+    return v8::Null(isolate);
-+  return mate::ConvertToV8(isolate, *web_preferences->last_web_preferences());
-+}
-+
-+v8::Local<v8::Value> WebContents::GetOwnerBrowserWindow() {
-+>>>>>>> .their
-   if (owner_window())
-     return BrowserWindow::From(isolate(), owner_window());
-   else
-@@ -2013,7 +2096,10 @@
-       .SetMethod("endFrameSubscription", &WebContents::EndFrameSubscription)
-       .SetMethod("startDrag", &WebContents::StartDrag)
-       .SetMethod("isGuest", &WebContents::IsGuest)
-+<<<<<<< .our
-       .SetMethod("attachToIframe", &WebContents::AttachToIframe)
-+=======
-+>>>>>>> .their
-       .SetMethod("isOffscreen", &WebContents::IsOffScreen)
-       .SetMethod("startPainting", &WebContents::StartPainting)
-       .SetMethod("stopPainting", &WebContents::StopPainting)
-changed in both
-  base   100644 16f23210557ca816cdeadd50b9332447eca8815f atom/browser/api/atom_api_web_contents.h
-  our    100644 7939f8268aa8c3371623e0c15f3b6001d7f1efa4 atom/browser/api/atom_api_web_contents.h
-  their  100644 027332a3706d5ac43a4a769234d361304bdc0350 atom/browser/api/atom_api_web_contents.h
-@@ -97,6 +97,8 @@
-   static void BuildPrototype(v8::Isolate* isolate,
-                              v8::Local<v8::FunctionTemplate> prototype);
- 
-+  static int64_t GetIDForContents(content::WebContents* web_contents);
-+
-   // Notifies to destroy any guest web contents before destroying self.
-   void DestroyWebContents(bool async);
- 
-@@ -234,8 +236,13 @@
-   v8::Local<v8::Value> GetPreloadPath(v8::Isolate* isolate) const;
- 
-   // Returns the web preferences of current WebContents.
-+<<<<<<< .our
-   v8::Local<v8::Value> GetWebPreferences(v8::Isolate* isolate) const;
-   v8::Local<v8::Value> GetLastWebPreferences(v8::Isolate* isolate) const;
-+=======
-+  v8::Local<v8::Value> GetWebPreferences(v8::Isolate* isolate);
-+  v8::Local<v8::Value> GetLastWebPreferences(v8::Isolate* isolate);
-+>>>>>>> .their
- 
-   // Returns the owner window.
-   v8::Local<v8::Value> GetOwnerBrowserWindow() const;
-changed in both
-  base   100644 3f53f4d3d7204f59037ba80556a2c9896e23aae4 atom/browser/api/atom_api_web_request.cc
-  our    100644 c088196f833160ac964e67030fa083302dd090b0 atom/browser/api/atom_api_web_request.cc
-  their  100644 ac84ac196b69a121a54dc64b87b7c2c1d6df21b5 atom/browser/api/atom_api_web_request.cc
-@@ -40,7 +40,11 @@
- 
- namespace {
- 
-+<<<<<<< .our
- template <typename Method, typename Event, typename Listener>
-+=======
-+template<typename Method, typename Event, typename Listener>
-+>>>>>>> .their
- void CallNetworkDelegateMethod(
-     brightray::URLRequestContextGetter* url_request_context_getter,
-     Method method,
-@@ -95,14 +99,24 @@
-   }
- 
-   brightray::URLRequestContextGetter* url_request_context_getter =
-+<<<<<<< .our
-       browser_context_->GetRequestContext();
-+=======
-+      browser_context_->url_request_context_getter();
-+>>>>>>> .their
-   if (!url_request_context_getter)
-     return;
-   BrowserThread::PostTask(
-       BrowserThread::IO, FROM_HERE,
-+<<<<<<< .our
-       base::BindOnce(&CallNetworkDelegateMethod<Method, Event, Listener>,
-                      base::RetainedRef(url_request_context_getter), method,
-                      type, std::move(patterns), std::move(listener)));
-+=======
-+      base::Bind(&CallNetworkDelegateMethod<Method, Event, Listener>,
-+                 base::RetainedRef(url_request_context_getter),
-+                 method, type, std::move(patterns), std::move(listener)));
-+>>>>>>> .their
- }
- 
- // static
-removed in local
-  base   100644 993f9680ccb475f8870a2e3b4da2d20472531d91 atom/browser/api/atom_api_window.cc
-  their  100644 d177afb300f65ba14daa8c07042d4d768b00fd54 atom/browser/api/atom_api_window.cc
-removed in local
-  base   100644 f86c387a34afb15920738413c6819176081b5ee7 atom/browser/api/atom_api_window.h
-  their  100644 e07f34e23f060906942b5fce81081965ea792204 atom/browser/api/atom_api_window.h
-changed in both
-  base   100644 8810fed4b9aef78842fb65db93ed2efebabb6928 atom/browser/api/event.cc
-  our    100644 7b617034eca5a229fc9323bfd6d531ebded752d6 atom/browser/api/event.cc
-  their  100644 1ee0d57e36068c9b6427c278e9a7a5a66b7f8f79 atom/browser/api/event.cc
-@@ -6,7 +6,10 @@
- 
- #include "atom/common/api/api_messages.h"
- #include "atom/common/native_mate_converters/string16_converter.h"
-+<<<<<<< .our
- #include "atom/common/native_mate_converters/value_converter.h"
-+=======
-+>>>>>>> .their
- #include "content/public/browser/render_frame_host.h"
- #include "content/public/browser/web_contents.h"
- #include "native_mate/object_template_builder.h"
-@@ -27,6 +30,7 @@
-   message_ = message;
- 
-   Observe(content::WebContents::FromRenderFrameHost(sender));
-+<<<<<<< .our
- }
- 
- void Event::RenderFrameDeleted(content::RenderFrameHost* rfh) {
-@@ -42,6 +46,23 @@
-     sender_ = new_rfh;
- }
- 
-+=======
-+}
-+
-+void Event::RenderFrameDeleted(content::RenderFrameHost* rfh) {
-+  if (sender_ != rfh)
-+    return;
-+  sender_ = nullptr;
-+  message_ = nullptr;
-+}
-+
-+void Event::RenderFrameHostChanged(content::RenderFrameHost* old_rfh,
-+                                   content::RenderFrameHost* new_rfh) {
-+  if (sender_ && sender_ == old_rfh)
-+    sender_ = new_rfh;
-+}
-+
-+>>>>>>> .their
- void Event::FrameDeleted(content::RenderFrameHost* rfh) {
-   if (sender_ != rfh)
-     return;
-@@ -57,7 +78,11 @@
-   if (message_ == nullptr || sender_ == nullptr)
-     return false;
- 
-+<<<<<<< .our
-   AtomFrameHostMsg_Message_Sync::WriteReplyParams(message_, result);
-+=======
-+  AtomFrameHostMsg_Message_Sync::WriteReplyParams(message_, json);
-+>>>>>>> .their
-   bool success = sender_->Send(message_);
-   message_ = nullptr;
-   sender_ = nullptr;
-changed in both
-  base   100644 d73bd2f64b55b5eb0827f819805578559b947f46 atom/browser/api/event.h
-  our    100644 fbec8f27574691005d203adbafb50709f5c2d010 atom/browser/api/event.h
-  their  100644 05ad7daff8ac524294c1cacb66f876efc9716dd4 atom/browser/api/event.h
-@@ -44,8 +44,13 @@
- 
-  private:
-   // Replyer for the synchronous messages.
-+<<<<<<< .our
-   content::RenderFrameHost* sender_ = nullptr;
-   IPC::Message* message_ = nullptr;
-+=======
-+  content::RenderFrameHost* sender_;
-+  IPC::Message* message_;
-+>>>>>>> .their
- 
-   DISALLOW_COPY_AND_ASSIGN(Event);
- };
-changed in both
-  base   100644 3dbcd0601ef8a63cd6712b566cdc7f388c85e3ee atom/browser/api/event_emitter.cc
-  our    100644 c6e810b51225c8f89eaf53ac3e46381b52ba63b5 atom/browser/api/event_emitter.cc
-  their  100644 91769cbb94794a978732773612a3fec245acd750 atom/browser/api/event_emitter.cc
-changed in both
-  base   100644 8d9d2960df35a33a09dfc79c4c35d424738df43f atom/browser/api/event_emitter.h
-  our    100644 5e4ca3b4ffcb184583ef386100eabda7a9e00da0 atom/browser/api/event_emitter.h
-  their  100644 8145113084a9c0c34ea808e3712879f5f70737c9 atom/browser/api/event_emitter.h
-changed in both
-  base   100644 c83a99c2b38708ca296b4c9215e26cb58eb9a7d2 atom/browser/atom_browser_client.cc
-  our    100644 57c4ee582405e6d501ec23940ccb10689ecd64a1 atom/browser/atom_browser_client.cc
-  their  100644 5c442b32d70e1e1a51b79bfd2d093479ab518060 atom/browser/atom_browser_client.cc
-@@ -343,6 +343,11 @@
-       web_preferences->AppendCommandLineSwitches(command_line);
-     SessionPreferences::AppendExtraCommandLineSwitches(
-         web_contents->GetBrowserContext(), command_line);
-+
-+    auto context_id = atom::api::WebContents::GetIDForContents(
-+      web_contents);
-+    command_line->AppendSwitchASCII(switches::kContextId,
-+      base::IntToString(context_id));
-   }
- }
- 
-@@ -497,7 +502,6 @@
- 
- brightray::BrowserMainParts* AtomBrowserClient::OverrideCreateBrowserMainParts(
-     const content::MainFunctionParams&) {
--  v8::V8::Initialize();  // Init V8 before creating main parts.
-   return new AtomBrowserMainParts;
- }
- 
-changed in both
-  base   100644 07b351b551b609e8b7201753b8969ad9dc6f6a52 atom/browser/atom_browser_context.cc
-  our    100644 e036cbc8103f19a034ce386940462f8a23ea6807 atom/browser/atom_browser_context.cc
-  their  100644 f297fbef0a6e75cdb5ca00c86090eb27e44031a7 atom/browser/atom_browser_context.cc
-@@ -9,8 +9,18 @@
- #include "atom/browser/atom_download_manager_delegate.h"
- #include "atom/browser/atom_permission_manager.h"
- #include "atom/browser/browser.h"
-+<<<<<<< .our
- #include "atom/browser/request_context_delegate.h"
- #include "atom/browser/special_storage_policy.h"
-+=======
-+#include "atom/browser/net/about_protocol_handler.h"
-+#include "atom/browser/net/asar/asar_protocol_handler.h"
-+#include "atom/browser/net/atom_cert_verifier.h"
-+#include "atom/browser/net/atom_network_delegate.h"
-+#include "atom/browser/net/atom_url_request_job_factory.h"
-+#include "atom/browser/net/http_protocol_handler.h"
-+#include "atom/browser/net/resolve_proxy_helper.h"
-+>>>>>>> .their
- #include "atom/browser/web_view_manager.h"
- #include "atom/common/atom_version.h"
- #include "atom/common/chrome_version.h"
-@@ -133,6 +143,14 @@
-   return blob_reader_.get();
- }
- 
-+ResolveProxyHelper* AtomBrowserContext::GetResolveProxyHelper() {
-+  if (!resolve_proxy_helper_.get()) {
-+    resolve_proxy_helper_ =
-+        base::MakeRefCounted<ResolveProxyHelper>(url_request_context_getter());
-+  }
-+  return resolve_proxy_helper_.get();
-+}
-+
- // static
- scoped_refptr<AtomBrowserContext> AtomBrowserContext::From(
-     const std::string& partition,
-changed in both
-  base   100644 359d3d6b71a5ea1d606b59d7f9b158a15baf1942 atom/browser/atom_browser_context.h
-  our    100644 9e6a841ceb8d11069a1a094bf7dbbd3a788918b3 atom/browser/atom_browser_context.h
-  their  100644 77469254db0a598a714d5c9ac3abefbe41ed89af atom/browser/atom_browser_context.h
-@@ -20,8 +20,12 @@
- class AtomBlobReader;
- class AtomDownloadManagerDelegate;
- class AtomPermissionManager;
-+<<<<<<< .our
- class RequestContextDelegate;
- class SpecialStoragePolicy;
-+=======
-+class ResolveProxyHelper;
-+>>>>>>> .their
- class WebViewManager;
- 
- class AtomBrowserContext : public brightray::BrowserContext {
-@@ -49,8 +53,16 @@
-   void OnMainRequestContextCreated(
-       brightray::URLRequestContextGetter* getter) override;
- 
-+<<<<<<< .our
-   RequestContextDelegate* GetRequestContextDelegate() const {
-     return request_context_delegate_.get();
-+=======
-+  ResolveProxyHelper* GetResolveProxyHelper();
-+
-+  AtomBlobReader* GetBlobReader();
-+  AtomCookieDelegate* cookie_delegate() const {
-+    return cookie_delegate_.get();
-+>>>>>>> .their
-   }
- 
-  protected:
-@@ -60,8 +72,12 @@
-   ~AtomBrowserContext() override;
- 
-  private:
-+<<<<<<< .our
-   brightray::URLRequestContextGetter* url_request_context_getter_;
- 
-+=======
-+  scoped_refptr<ResolveProxyHelper> resolve_proxy_helper_;
-+>>>>>>> .their
-   std::unique_ptr<AtomDownloadManagerDelegate> download_manager_delegate_;
-   std::unique_ptr<WebViewManager> guest_manager_;
-   std::unique_ptr<AtomPermissionManager> permission_manager_;
-changed in both
-  base   100644 f16ee50158508565cc1e043d3257ad687cc69215 atom/browser/browser.cc
-  our    100644 ce35de64d60c6767ac52596c1b32e7bde5ceefa0 atom/browser/browser.cc
-  their  100644 3ba915f91eb3403df9630697e77cce9ed7fa3307 atom/browser/browser.cc
-changed in both
-  base   100644 0970b26b776b34f68e5f22776e74c19ddcc039ad atom/browser/browser.h
-  our    100644 aed7d25c37da59c0dd5e09940a064c329353a0b2 atom/browser/browser.h
-  their  100644 a8c1a8c5e7c4409e3a78279da46fb2ba6112f409 atom/browser/browser.h
-@@ -277,7 +277,11 @@
-   bool is_ready_ = false;
- 
-   // The browser is being shutdown.
-+<<<<<<< .our
-   bool is_shutdown_ = false;
-+=======
-+  bool is_shutdown_;
-+>>>>>>> .their
- 
-   int badge_count_ = 0;
- 
-changed in both
-  base   100644 0faeee36f9390b36bc5963b2f90d2063e3603109 atom/browser/browser_mac.mm
-  our    100644 27e347eccebf006336d5d110c81717ecc45af9c3 atom/browser/browser_mac.mm
-  their  100644 e47b8cb9d3c7fcf24279cd6e973a1b00a85ea25a atom/browser/browser_mac.mm
-changed in both
-  base   100644 7c154b60b00e25c42847ceefb98723b50ea03dd0 atom/browser/native_browser_view.h
-  our    100644 56937e4c8c69e3605d2b6cc71a0877b74ff4e83d atom/browser/native_browser_view.h
-  their  100644 cab6980fa2cf035c1a5ca6b4aee822a0ee604fd4 atom/browser/native_browser_view.h
-changed in both
-  base   100644 17b0a1ee9006dd70888165a9209076fd7065f3cc atom/browser/native_browser_view_mac.mm
-  our    100644 0416e26e89f1e0f37366ef1798b4359da0729225 atom/browser/native_browser_view_mac.mm
-  their  100644 86df632638ef7772270569824515b251470d0c08 atom/browser/native_browser_view_mac.mm
-changed in both
-  base   100644 78e788b3019c23bce13fdc8d94385d4a3937cf22 atom/browser/native_browser_view_views.cc
-  our    100644 6414005a1e40d80ae86102b12edee0255cab9adb atom/browser/native_browser_view_views.cc
-  their  100644 def64d12e3520fa15a2b6779147a819a6eaec2f8 atom/browser/native_browser_view_views.cc
-changed in both
-  base   100644 5dcda13447cde098fccaf8782fefb97d861d47f4 atom/browser/native_browser_view_views.h
-  our    100644 8f8e860292baddad1156c50ae7cfaa0fd6e87d99 atom/browser/native_browser_view_views.h
-  their  100644 abf47178302ad7527c1640a3f41492f871f137e5 atom/browser/native_browser_view_views.h
-changed in both
-  base   100644 34778fb6434707e6ae3c70ab55e48e87eb556448 atom/browser/native_window.cc
-  our    100644 4ff2bcfcabfd34d8563f9ed213c03655a99dd9c6 atom/browser/native_window.cc
-  their  100644 26ac44607ebceadcde1d4c038890d914c888a0d5 atom/browser/native_window.cc
-@@ -21,6 +21,11 @@
- #include "ui/display/win/screen_win.h"
- #endif
- 
-+#if defined(OS_WIN)
-+#include "ui/base/win/shell.h"
-+#include "ui/display/win/screen_win.h"
-+#endif
-+
- DEFINE_WEB_CONTENTS_USER_DATA_KEY(atom::NativeWindowRelay);
- 
- namespace atom {
-@@ -45,9 +50,29 @@
- 
- }  // namespace
- 
-+<<<<<<< .our
- NativeWindow::NativeWindow(const mate::Dictionary& options,
-                            NativeWindow* parent)
-     : widget_(new views::Widget), parent_(parent), weak_factory_(this) {
-+=======
-+NativeWindow::NativeWindow(
-+    brightray::InspectableWebContents* inspectable_web_contents,
-+    const mate::Dictionary& options,
-+    NativeWindow* parent)
-+    : content::WebContentsObserver(inspectable_web_contents->GetWebContents()),
-+      has_frame_(true),
-+      transparent_(false),
-+      enable_larger_than_screen_(false),
-+      is_closed_(false),
-+      sheet_offset_x_(0.0),
-+      sheet_offset_y_(0.0),
-+      aspect_ratio_(0.0),
-+      parent_(parent),
-+      is_modal_(false),
-+      is_osr_dummy_(false),
-+      inspectable_web_contents_(inspectable_web_contents),
-+      weak_factory_(this) {
-+>>>>>>> .their
-   options.Get(options::kFrame, &has_frame_);
-   options.Get(options::kTransparent, &transparent_);
-   options.Get(options::kEnableLargerThanScreen, &enable_larger_than_screen_);
-changed in both
-  base   100644 d1cfa7cc352971772689ecd60a110b48ef1a7eaa atom/browser/native_window.h
-  our    100644 35b67e2dd230692c415a32aae5f0a5e99ab74ac0 atom/browser/native_window.h
-  their  100644 61922aea78e3b61db614354e6a578fcda925096b atom/browser/native_window.h
-@@ -220,6 +220,17 @@
-   virtual void HandleKeyboardEvent(
-       content::WebContents*,
-       const content::NativeWebKeyboardEvent& event) {}
-+<<<<<<< .our
-+=======
-+  virtual void ShowAutofillPopup(content::RenderFrameHost* frame_host,
-+                                 content::WebContents* web_contents,
-+                                 const gfx::RectF& bounds,
-+                                 const std::vector<base::string16>& values,
-+                                 const std::vector<base::string16>& labels) {}
-+  virtual void HideAutofillPopup(content::RenderFrameHost* frame_host) {}
-+>>>>>>> .their
-+
-+  virtual void UpdateDraggableRegionViews() {}
- 
-   // Public API used by platform-dependent delegates and observers to send UI
-   // related notifications.
-@@ -340,8 +351,13 @@
- class NativeWindowRelay
-     : public content::WebContentsUserData<NativeWindowRelay> {
-  public:
-+<<<<<<< .our
-   explicit NativeWindowRelay(base::WeakPtr<NativeWindow> window);
-   ~NativeWindowRelay() override;
-+=======
-+  explicit NativeWindowRelay(base::WeakPtr<NativeWindow> window)
-+      : key(UserDataKey()), window(window) {}
-+>>>>>>> .their
- 
-   static void* UserDataKey() {
-     return content::WebContentsUserData<NativeWindowRelay>::UserDataKey();
-changed in both
-  base   100644 60d8fc23f59a842c100412b1c236b87d0815a7a0 atom/browser/native_window_mac.h
-  our    100644 44a78198f44cdba9875e3fb27c8e2c87eaa6f33b atom/browser/native_window_mac.h
-  their  100644 9e8c3aef87dd8d2d4a3260587b7013d260649b55 atom/browser/native_window_mac.h
-@@ -118,8 +118,11 @@
-   void MoveTabToNewWindow() override;
-   void ToggleTabBar() override;
-   bool AddTabbedWindow(NativeWindow* window) override;
-+<<<<<<< .our
- 
-   bool SetWindowButtonVisibility(bool visible) override;
-+=======
-+>>>>>>> .their
- 
-   void SetVibrancy(const std::string& type) override;
-   void SetTouchBar(
-@@ -130,8 +133,19 @@
-   gfx::Rect ContentBoundsToWindowBounds(const gfx::Rect& bounds) const override;
-   gfx::Rect WindowBoundsToContentBounds(const gfx::Rect& bounds) const override;
- 
-+<<<<<<< .our
-   // Use a custom content view instead of Chromium's BridgedContentView.
-   void OverrideNSWindowContentView();
-+=======
-+  // content::WebContentsObserver:
-+  void RenderViewHostChanged(content::RenderViewHost* old_host,
-+                             content::RenderViewHost* new_host) override;
-+
-+  // Refresh the DraggableRegion views.
-+  void UpdateDraggableRegionViews() override {
-+    UpdateDraggableRegionViews(draggable_regions_);
-+  }
-+>>>>>>> .their
- 
-   // Set the attribute of NSWindow while work around a bug of zoom button.
-   void SetStyleMask(bool on, NSUInteger flag);
-changed in both
-  base   100644 ad1713e401240dbc1c2054551d0caeb41aea2884 atom/browser/native_window_mac.mm
-  our    100644 004263ec127709067e903ffbf31003b8844226b4 atom/browser/native_window_mac.mm
-  their  100644 0397c62d8df94b3ce66482c0d9c4b3b87ac97a45 atom/browser/native_window_mac.mm
-@@ -28,9 +28,12 @@
- #include "skia/ext/skia_utils_mac.h"
- #include "ui/gfx/skia_util.h"
- #include "ui/gl/gpu_switching_manager.h"
-+<<<<<<< .our
- #include "ui/views/background.h"
- #include "ui/views/cocoa/bridged_native_widget.h"
- #include "ui/views/widget/widget.h"
-+=======
-+>>>>>>> .their
- 
- // This view always takes the size of its superview. It is intended to be used
- // as a NSWindow's contentView.  It is needed because NSWindow's implementation
-@@ -1144,10 +1147,17 @@
- }
- 
- bool NativeWindowMac::AddTabbedWindow(NativeWindow* window) {
-+<<<<<<< .our
-   if (window_ == window->GetNativeWindow()) {
-     return false;
-   } else {
-     if (@available(macOS 10.12, *))
-+=======
-+  if (window_.get() == window->GetNativeWindow()) {
-+    return false;
-+  } else {
-+    if ([window_ respondsToSelector:@selector(addTabbedWindow:ordered:)])
-+>>>>>>> .their
-       [window_ addTabbedWindow:window->GetNativeWindow() ordered:NSWindowAbove];
-   }
-   return true;
-@@ -1185,15 +1195,22 @@
-       return;
-     }
- 
-+<<<<<<< .our
-     background_color_before_vibrancy_.reset([[window_ backgroundColor] retain]);
-     transparency_before_vibrancy_ = [window_ titlebarAppearsTransparent];
-     ui::GpuSwitchingManager::SetTransparent(true);
-+=======
-+    [vibrant_view removeFromSuperview];
-+    [window_ setVibrantView:nil];
-+    ui::GpuSwitchingManager::SetTransparent(transparent());
-+>>>>>>> .their
- 
-     if (title_bar_style_ != NORMAL) {
-       [window_ setTitlebarAppearsTransparent:YES];
-       [window_ setBackgroundColor:[NSColor clearColor]];
-     }
- 
-+<<<<<<< .our
-     NSVisualEffectView* effect_view = (NSVisualEffectView*)vibrant_view;
-     if (effect_view == nil) {
-       effect_view = [[[NSVisualEffectView alloc]
-@@ -1208,6 +1225,31 @@
-                              positioned:NSWindowBelow
-                              relativeTo:nil];
-     }
-+=======
-+  SetRenderWidgetHostOpaque(false);
-+  background_color_before_vibrancy_.reset([window_ backgroundColor]);
-+  transparency_before_vibrancy_ = [window_ titlebarAppearsTransparent];
-+  ui::GpuSwitchingManager::SetTransparent(true);
-+
-+  if (title_bar_style_ != NORMAL) {
-+    [window_ setTitlebarAppearsTransparent:YES];
-+    [window_ setBackgroundColor:[NSColor clearColor]];
-+  }
-+
-+  NSVisualEffectView* effect_view = (NSVisualEffectView*)vibrant_view;
-+  if (effect_view == nil) {
-+    effect_view = [[[NSVisualEffectView alloc]
-+        initWithFrame: [[window_ contentView] bounds]] autorelease];
-+    [window_ setVibrantView:(NSView*)effect_view];
-+
-+    [effect_view setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
-+    [effect_view setBlendingMode:NSVisualEffectBlendingModeBehindWindow];
-+    [effect_view setState:NSVisualEffectStateActive];
-+    [[window_ contentView] addSubview:effect_view
-+                           positioned:NSWindowBelow
-+                           relativeTo:nil];
-+  }
-+>>>>>>> .their
- 
-     NSVisualEffectMaterial vibrancyType = NSVisualEffectMaterialLight;
- 
-@@ -1387,6 +1429,7 @@
-     [parent->GetNativeWindow() addChildWindow:window_ ordered:NSWindowAbove];
- }
- 
-+<<<<<<< .our
- void NativeWindowMac::ShowWindowButton(NSWindowButton button) {
-   auto view = [window_ standardWindowButton:button];
-   [view.superview addSubview:view positioned:NSWindowAbove relativeTo:nil];
-@@ -1395,6 +1438,35 @@
- void NativeWindowMac::SetForwardMouseMessages(bool forward) {
-   [window_ setAcceptsMouseMovedEvents:forward];
- }
-+=======
-+  // Remove all ControlRegionViews that are added last time.
-+  // Note that [webView subviews] returns the view's mutable internal array and
-+  // it should be copied to avoid mutating the original array while enumerating
-+  // it.
-+  base::scoped_nsobject<NSArray> subviews([[webView subviews] copy]);
-+  for (NSView* subview in subviews.get())
-+    if ([subview isKindOfClass:[ControlRegionView class]])
-+      [subview removeFromSuperview];
-+
-+  // Draggable regions is implemented by having the whole web view draggable
-+  // (mouseDownCanMoveWindow) and overlaying regions that are not draggable.
-+  std::vector<gfx::Rect> drag_exclude_rects =
-+      CalculateNonDraggableRegions(regions, webViewWidth, webViewHeight);
-+
-+  if (browser_view_) {
-+    browser_view_->UpdateDraggableRegions(drag_exclude_rects);
-+  }
-+
-+  // Create and add a ControlRegionView for each region that needs to be
-+  // excluded from the dragging.
-+  for (const auto& rect : drag_exclude_rects) {
-+    base::scoped_nsobject<NSView> controlRegion(
-+        [[ControlRegionView alloc] initWithFrame:NSZeroRect]);
-+    [controlRegion setFrame:NSMakeRect(rect.x(), webViewHeight - rect.bottom(),
-+                                       rect.width(), rect.height())];
-+    [webView addSubview:controlRegion];
-+  }
-+>>>>>>> .their
- 
- void NativeWindowMac::OverrideNSWindowContentView() {
-   // When using `views::Widget` to hold WebContents, Chromium would use
-changed in both
-  base   100644 008109970ec8d3c55a2028a173c3b941908d78a7 atom/browser/native_window_views.cc
-  our    100644 0dba39942f92d54ba34db7709b73012055680d94 atom/browser/native_window_views.cc
-  their  100644 f3e6fc09c5850cbc3d6989a2a94607b1f9a5d514 atom/browser/native_window_views.cc
-@@ -1115,7 +1115,11 @@
-   if (!active && IsMenuBarAutoHide() && IsMenuBarVisible())
-     SetMenuBarVisibility(false);
- 
-+<<<<<<< .our
-   root_view_->ResetAltState();
-+=======
-+  menu_bar_alt_pressed_ = false;
-+>>>>>>> .their
- }
- 
- void NativeWindowViews::OnWidgetBoundsChanged(views::Widget* changed_widget,
-@@ -1237,9 +1241,138 @@
- void NativeWindowViews::HandleKeyboardEvent(
-     content::WebContents*,
-     const content::NativeWebKeyboardEvent& event) {
-+<<<<<<< .our
-   keyboard_event_handler_->HandleKeyboardEvent(event,
-                                                root_view_->GetFocusManager());
-   root_view_->HandleKeyEvent(event);
-+=======
-+  keyboard_event_handler_->HandleKeyboardEvent(event, GetFocusManager());
-+
-+  if (!menu_bar_)
-+    return;
-+
-+  // Show accelerator when "Alt" is pressed.
-+  if (menu_bar_visible_ && IsAltKey(event))
-+    menu_bar_->SetAcceleratorVisibility(
-+        event.GetType() == blink::WebInputEvent::kRawKeyDown);
-+
-+  // Show the submenu when "Alt+Key" is pressed.
-+  if (event.GetType() == blink::WebInputEvent::kRawKeyDown &&
-+      !IsAltKey(event) && IsAltModifier(event)) {
-+    if (!menu_bar_visible_ &&
-+        (menu_bar_->HasAccelerator(event.windows_key_code)))
-+      SetMenuBarVisibility(true);
-+    menu_bar_->ActivateAccelerator(event.windows_key_code);
-+    return;
-+  }
-+
-+  if (!menu_bar_autohide_)
-+    return;
-+
-+  // Toggle the menu bar only when a single Alt is released.
-+  if (event.GetType() == blink::WebInputEvent::kRawKeyDown && IsAltKey(event)) {
-+    // When a single Alt is pressed:
-+    menu_bar_alt_pressed_ = true;
-+  } else if (event.GetType() == blink::WebInputEvent::kKeyUp &&
-+             IsAltKey(event) && menu_bar_alt_pressed_) {
-+    // When a single Alt is released right after a Alt is pressed:
-+    menu_bar_alt_pressed_ = false;
-+    SetMenuBarVisibility(!menu_bar_visible_);
-+  } else {
-+    // When any other keys except single Alt have been pressed/released:
-+    menu_bar_alt_pressed_ = false;
-+  }
-+}
-+
-+void NativeWindowViews::ShowAutofillPopup(
-+    content::RenderFrameHost* frame_host,
-+    content::WebContents* web_contents,
-+    const gfx::RectF& bounds,
-+    const std::vector<base::string16>& values,
-+    const std::vector<base::string16>& labels) {
-+  bool is_offsceen = false;
-+  bool is_embedder_offscreen = false;
-+
-+  auto* web_contents_preferences =
-+      WebContentsPreferences::FromWebContents(web_contents);
-+  if (web_contents_preferences) {
-+    const auto* web_preferences = web_contents_preferences->web_preferences();
-+
-+    web_preferences->GetBoolean("offscreen", &is_offsceen);
-+    int guest_instance_id = 0;
-+    web_preferences->GetInteger(options::kGuestInstanceID, &guest_instance_id);
-+
-+    if (guest_instance_id) {
-+      auto manager = WebViewManager::GetWebViewManager(web_contents);
-+      if (manager) {
-+        auto embedder = manager->GetEmbedder(guest_instance_id);
-+        if (embedder) {
-+          is_embedder_offscreen = WebContentsPreferences::IsPreferenceEnabled(
-+              "offscreen", embedder);
-+        }
-+      }
-+    }
-+  }
-+
-+  autofill_popup_->CreateView(
-+      frame_host,
-+      is_offsceen || is_embedder_offscreen,
-+      widget(),
-+      bounds);
-+  autofill_popup_->SetItems(values, labels);
-+  autofill_popup_->UpdatePopupBounds(menu_bar_visible_ ? 0 : kMenuBarHeight);
-+}
-+
-+void NativeWindowViews::HideAutofillPopup(
-+    content::RenderFrameHost* frame_host) {
-+  autofill_popup_->Hide();
-+}
-+
-+void NativeWindowViews::Layout() {
-+  const auto size = GetContentsBounds().size();
-+  const auto menu_bar_bounds =
-+      menu_bar_visible_ ? gfx::Rect(0, 0, size.width(), kMenuBarHeight)
-+                        : gfx::Rect();
-+  if (menu_bar_) {
-+    menu_bar_->SetBoundsRect(menu_bar_bounds);
-+  }
-+
-+  if (web_view_) {
-+    web_view_->SetBoundsRect(
-+        gfx::Rect(0, menu_bar_bounds.height(), size.width(),
-+                  size.height() - menu_bar_bounds.height()));
-+  }
-+
-+  if (autofill_popup_.get())
-+    autofill_popup_->UpdatePopupBounds(menu_bar_visible_ ? 0 : kMenuBarHeight);
-+}
-+
-+gfx::Size NativeWindowViews::GetMinimumSize() const {
-+  return NativeWindow::GetMinimumSize();
-+}
-+
-+gfx::Size NativeWindowViews::GetMaximumSize() const {
-+  return NativeWindow::GetMaximumSize();
-+}
-+
-+bool NativeWindowViews::AcceleratorPressed(const ui::Accelerator& accelerator) {
-+  return accelerator_util::TriggerAcceleratorTableCommand(
-+      &accelerator_table_, accelerator);
-+}
-+
-+void NativeWindowViews::RegisterAccelerators(AtomMenuModel* menu_model) {
-+  // Clear previous accelerators.
-+  views::FocusManager* focus_manager = GetFocusManager();
-+  accelerator_table_.clear();
-+  focus_manager->UnregisterAccelerators(this);
-+
-+  // Register accelerators with focus manager.
-+  accelerator_util::GenerateAcceleratorTable(&accelerator_table_, menu_model);
-+  for (const auto& iter : accelerator_table_) {
-+    focus_manager->RegisterAccelerator(
-+        iter.first, ui::AcceleratorManager::kNormalPriority, this);
-+  }
-+>>>>>>> .their
- }
- 
- ui::WindowShowState NativeWindowViews::GetRestoredState() {
-changed in both
-  base   100644 a39e84ce5b8d7b757233dab4bed646e08cb8c76a atom/browser/net/asar/url_request_asar_job.cc
-  our    100644 85eb2e1dd142b6d64aafb5350ae47603db989e8f atom/browser/net/asar/url_request_asar_job.cc
-  their  100644 a6fe5e26540c9533f16dcf56fc955d0025de3b4a atom/browser/net/asar/url_request_asar_job.cc
-changed in both
-  base   100644 9b0f3a98dc53b922c0d070244f8f7457f332d850 atom/browser/net/atom_network_delegate.cc
-  our    100644 e71ea74317b69f31a5aac8e723902748972fed8f atom/browser/net/atom_network_delegate.cc
-  their  100644 239a64016febb8f9d81206d7f2a7d100ccd1f293 atom/browser/net/atom_network_delegate.cc
-@@ -250,6 +250,7 @@
- 
- AtomNetworkDelegate::~AtomNetworkDelegate() {}
- 
-+<<<<<<< .our
- void AtomNetworkDelegate::SetSimpleListenerInIO(SimpleEvent type,
-                                                 URLPatterns patterns,
-                                                 SimpleListener callback) {
-@@ -266,6 +267,26 @@
-     response_listeners_.erase(type);
-   else
-     response_listeners_[type] = {std::move(patterns), std::move(callback)};
-+=======
-+void AtomNetworkDelegate::SetSimpleListenerInIO(
-+    SimpleEvent type,
-+    URLPatterns patterns,
-+    SimpleListener callback) {
-+  if (callback.is_null())
-+    simple_listeners_.erase(type);
-+  else
-+    simple_listeners_[type] = { std::move(patterns), std::move(callback) };
-+}
-+
-+void AtomNetworkDelegate::SetResponseListenerInIO(
-+    ResponseEvent type,
-+    URLPatterns patterns,
-+    ResponseListener callback) {
-+  if (callback.is_null())
-+    response_listeners_.erase(type);
-+  else
-+    response_listeners_[type] = { std::move(patterns), std::move(callback) };
-+>>>>>>> .their
- }
- 
- void AtomNetworkDelegate::SetDevToolsNetworkEmulationClientId(
-changed in both
-  base   100644 e00c26ff2cbc134b987b4361896971e48056951d atom/browser/net/atom_network_delegate.h
-  our    100644 39a7a8ddfcda17fd7d022331132b54485d07a279 atom/browser/net/atom_network_delegate.h
-  their  100644 ad37a926d4732d94526f74b2f927e35504d2efe3 atom/browser/net/atom_network_delegate.h
-added in remote
-  their  100644 fde8718f89c5d4d4a6dd0a9b08353832c07902c5 atom/browser/net/resolve_proxy_helper.cc
-@@ -0,0 +1,85 @@
-+// Copyright (c) 2018 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#include "atom/browser/net/resolve_proxy_helper.h"
-+
-+#include "base/threading/thread_task_runner_handle.h"
-+#include "net/url_request/url_request_context.h"
-+#include "net/url_request/url_request_context_getter.h"
-+
-+namespace atom {
-+
-+ResolveProxyHelper::ResolveProxyHelper(net::URLRequestContextGetter* getter)
-+    : context_getter_(getter),
-+      original_thread_(base::ThreadTaskRunnerHandle::Get()) {}
-+
-+ResolveProxyHelper::~ResolveProxyHelper() {
-+  // Clear all pending requests if the ProxyService is still alive.
-+  pending_requests_.clear();
-+}
-+
-+void ResolveProxyHelper::ResolveProxy(const GURL& url,
-+                                      const ResolveProxyCallback& callback) {
-+  // Enqueue the pending request.
-+  pending_requests_.push_back(PendingRequest(url, callback));
-+
-+  // If nothing is in progress, start.
-+  if (pending_requests_.size() == 1)
-+    StartPendingRequest();
-+}
-+
-+void ResolveProxyHelper::SendProxyResult(const std::string& proxy) {
-+  CHECK(!pending_requests_.empty());
-+
-+  const auto& completed_request = pending_requests_.front();
-+  if (!completed_request.callback.is_null())
-+    completed_request.callback.Run(proxy);
-+
-+  // Clear the current (completed) request.
-+  pending_requests_.pop_front();
-+
-+  // Start the next request.
-+  if (!pending_requests_.empty())
-+    StartPendingRequest();
-+}
-+
-+void ResolveProxyHelper::StartPendingRequest() {
-+  auto& request = pending_requests_.front();
-+  context_getter_->GetNetworkTaskRunner()->PostTask(
-+      FROM_HERE,
-+      base::BindOnce(&ResolveProxyHelper::StartPendingRequestInIO,
-+                     base::Unretained(this), request.url, request.pac_req));
-+}
-+
-+void ResolveProxyHelper::OnResolveProxyCompleted(int result) {
-+  std::string proxy;
-+  if (result == net::OK)
-+    proxy = proxy_info_.ToPacString();
-+
-+  original_thread_->PostTask(
-+      FROM_HERE, base::BindOnce(&ResolveProxyHelper::SendProxyResult,
-+                                base::Unretained(this), proxy));
-+}
-+
-+void ResolveProxyHelper::StartPendingRequestInIO(
-+    const GURL& url,
-+    net::ProxyService::PacRequest* pac_req) {
-+  // Verify the request wasn't started yet.
-+  DCHECK(nullptr == pac_req);
-+
-+  auto proxy_service = context_getter_->GetURLRequestContext()->proxy_service();
-+
-+  // Start the request.
-+  int result = proxy_service->ResolveProxy(
-+      url, std::string(), &proxy_info_,
-+      base::Bind(&ResolveProxyHelper::OnResolveProxyCompleted,
-+                 base::Unretained(this)),
-+      &pac_req, nullptr, net::NetLogWithSource());
-+
-+  // Completed synchronously.
-+  if (result != net::ERR_IO_PENDING)
-+    OnResolveProxyCompleted(result);
-+}
-+
-+}  // namespace atom
-added in remote
-  their  100644 cc85d4ff62ce753ff4ba1fc5979760b5e5d768a6 atom/browser/net/resolve_proxy_helper.h
-@@ -0,0 +1,59 @@
-+// Copyright (c) 2018 GitHub, Inc.
-+// Use of this source code is governed by the MIT license that can be
-+// found in the LICENSE file.
-+
-+#ifndef ATOM_BROWSER_NET_RESOLVE_PROXY_HELPER_H_
-+#define ATOM_BROWSER_NET_RESOLVE_PROXY_HELPER_H_
-+
-+#include <deque>
-+#include <string>
-+
-+#include "base/memory/ref_counted.h"
-+#include "net/proxy/proxy_service.h"
-+#include "url/gurl.h"
-+
-+namespace net {
-+class URLRequestContextGetter;
-+}
-+
-+namespace atom {
-+
-+class ResolveProxyHelper
-+    : public base::RefCountedThreadSafe<ResolveProxyHelper> {
-+ public:
-+  using ResolveProxyCallback = base::Callback<void(std::string)>;
-+  explicit ResolveProxyHelper(net::URLRequestContextGetter* getter);
-+
-+  void ResolveProxy(const GURL& url, const ResolveProxyCallback& callback);
-+
-+ private:
-+  friend class base::RefCountedThreadSafe<ResolveProxyHelper>;
-+  struct PendingRequest {
-+   public:
-+    PendingRequest(const GURL& url, const ResolveProxyCallback& callback)
-+        : url(url), callback(callback), pac_req(nullptr) {}
-+
-+    GURL url;
-+    ResolveProxyCallback callback;
-+    net::ProxyService::PacRequest* pac_req;
-+  };
-+
-+  ~ResolveProxyHelper();
-+
-+  void StartPendingRequest();
-+  void StartPendingRequestInIO(const GURL& request,
-+                               net::ProxyService::PacRequest* pac_req);
-+  void SendProxyResult(const std::string& proxy);
-+  void OnResolveProxyCompleted(int result);
-+
-+  net::ProxyInfo proxy_info_;
-+  std::deque<PendingRequest> pending_requests_;
-+  scoped_refptr<net::URLRequestContextGetter> context_getter_;
-+  scoped_refptr<base::SingleThreadTaskRunner> original_thread_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(ResolveProxyHelper);
-+};
-+
-+}  // namespace atom
-+
-+#endif  // ATOM_BROWSER_NET_RESOLVE_PROXY_HELPER_H_
-changed in both
-  base   100644 3313eba36bb903426778fac6cd18258a95fec677 atom/browser/resources/mac/Info.plist
-  our    100644 9094f0f7335edf833d51f688851e6a105de60433 atom/browser/resources/mac/Info.plist
-  their  100644 f94d160f917644ea3f3f508396c0d0e511f94974 atom/browser/resources/mac/Info.plist
-@@ -17,9 +17,15 @@
-   <key>CFBundleIconFile</key>
-   <string>electron.icns</string>
-   <key>CFBundleVersion</key>
-+<<<<<<< .our
-   <string>4.0.0</string>
-   <key>CFBundleShortVersionString</key>
-   <string>4.0.0</string>
-+=======
-+  <string>2.0.5</string>
-+  <key>CFBundleShortVersionString</key>
-+  <string>2.0.5</string>
-+>>>>>>> .their
-   <key>LSApplicationCategoryType</key>
-   <string>public.app-category.developer-tools</string>
-   <key>LSMinimumSystemVersion</key>
-changed in both
-  base   100644 c349f99d712ff69960d35b18587ddb6c417f7cd5 atom/browser/resources/win/atom.rc
-  our    100644 c0bd831e8bddf10180f75cd40694831e2e98622d atom/browser/resources/win/atom.rc
-  their  100644 9805b678c0cf811284e676c745feea9a268295e6 atom/browser/resources/win/atom.rc
-@@ -56,8 +56,13 @@
- //
- 
- VS_VERSION_INFO VERSIONINFO
-+<<<<<<< .our
-  FILEVERSION 4,0,0,20180821
-  PRODUCTVERSION 4,0,0,20180821
-+=======
-+ FILEVERSION 2,0,5,0
-+ PRODUCTVERSION 2,0,5,0
-+>>>>>>> .their
-  FILEFLAGSMASK 0x3fL
- #ifdef _DEBUG
-  FILEFLAGS 0x1L
-@@ -74,12 +79,20 @@
-         BEGIN
-             VALUE "CompanyName", "GitHub, Inc."
-             VALUE "FileDescription", "Electron"
-+<<<<<<< .our
-             VALUE "FileVersion", "4.0.0"
-+=======
-+            VALUE "FileVersion", "2.0.5"
-+>>>>>>> .their
-             VALUE "InternalName", "electron.exe"
-             VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
-             VALUE "OriginalFilename", "electron.exe"
-             VALUE "ProductName", "Electron"
-+<<<<<<< .our
-             VALUE "ProductVersion", "4.0.0"
-+=======
-+            VALUE "ProductVersion", "2.0.5"
-+>>>>>>> .their
-             VALUE "SquirrelAwareVersion", "1"
-         END
-     END
-changed in both
-  base   100644 8bdf4e0c2be32fc7d704bc989d7ccec5dd5db672 atom/browser/ui/cocoa/atom_menu_controller.mm
-  our    100644 cecf30ce1c88e007957a65427648941765a6067e atom/browser/ui/cocoa/atom_menu_controller.mm
-  their  100644 ea141b495e710222f12913f35625cf435b947e18 atom/browser/ui/cocoa/atom_menu_controller.mm
-@@ -334,8 +334,13 @@
-   if (isMenuOpen_) {
-     isMenuOpen_ = NO;
-     model_->MenuWillClose();
-+<<<<<<< .our
-     // Post async task so that itemSelected runs before the close callback
-     // deletes the controller from the map which deallocates it
-+=======
-+    // Post async task so that itemSelected runs before the close callback	
-+    // deletes the controller from the map which deallocates it	
-+>>>>>>> .their
-     if (!closeCallback.is_null()) {
-       BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, closeCallback);
-     }
-changed in both
-  base   100644 b26d472db131f7be9d5bfbbd1cebfc992743d312 atom/browser/ui/file_dialog_mac.mm
-  our    100644 18b18a8b240cda5512ae49e0afde5c749bdf75c0 atom/browser/ui/file_dialog_mac.mm
-  their  100644 89ecaf46ec7f32ca4f3a3a89de13efcbdad5619f atom/browser/ui/file_dialog_mac.mm
-@@ -27,9 +27,12 @@
- 
- @implementation PopUpButtonHandler
- 
-+<<<<<<< .our
- @synthesize savePanel;
- @synthesize fileTypesList;
- 
-+=======
-+>>>>>>> .their
- - (instancetype)initWithPanel:(NSSavePanel*)panel
-                  andTypesList:(NSArray*)typesList {
-   self = [super init];
-@@ -55,6 +58,7 @@
- }
- 
- @end
-+<<<<<<< .our
- 
- // Manages the PopUpButtonHandler.
- @interface AtomAccessoryView : NSView
-@@ -65,6 +69,17 @@
- - (void)dealloc {
-   auto* popupButton =
-       static_cast<NSPopUpButton*>([[self subviews] objectAtIndex:1]);
-+=======
-+
-+// Manages the PopUpButtonHandler.
-+@interface AtomAccessoryView : NSView
-+@end
-+
-+@implementation AtomAccessoryView
-+
-+- (void)dealloc {
-+  auto* popupButton = static_cast<NSPopUpButton*>([[self subviews] objectAtIndex: 1]);
-+>>>>>>> .their
-   [[popupButton target] release];
-   [super dealloc];
- }
-@@ -76,8 +91,11 @@
- DialogSettings::DialogSettings() = default;
- DialogSettings::~DialogSettings() = default;
- 
-+<<<<<<< .our
- namespace {
- 
-+=======
-+>>>>>>> .their
- void SetAllowedFileTypes(NSSavePanel* dialog, const Filters& filters) {
-   NSMutableArray* file_types_list = [NSMutableArray array];
-   NSMutableArray* filter_names = [NSMutableArray array];
-@@ -85,9 +103,18 @@
-   // Create array to keep file types and their name.
-   for (const Filter& filter : filters) {
-     NSMutableSet* file_type_set = [NSMutableSet set];
-+<<<<<<< .our
-     [filter_names addObject:@(filter.first.c_str())];
-     for (const std::string& ext : filter.second) {
-       [file_type_set addObject:@(ext.c_str())];
-+=======
-+    base::ScopedCFTypeRef<CFStringRef> name_cf(
-+        base::SysUTF8ToCFStringRef(filter.first));
-+    [filter_names addObject:base::mac::CFToNSCast(name_cf.get())];
-+    for (const std::string& ext : filter.second) {
-+      base::ScopedCFTypeRef<CFStringRef> ext_cf(base::SysUTF8ToCFStringRef(ext));
-+      [file_type_set addObject:base::mac::CFToNSCast(ext_cf.get())];
-+>>>>>>> .their
-     }
-     [file_types_list addObject:[file_type_set allObjects]];
-   }
-@@ -119,12 +146,19 @@
-   [label setBezeled:NO];
-   [label setDrawsBackground:NO];
- 
-+<<<<<<< .our
-   NSPopUpButton* popupButton =
-       [[NSPopUpButton alloc] initWithFrame:NSMakeRect(50.0, 2, 140, 22.0)
-                                  pullsDown:NO];
-   PopUpButtonHandler* popUpButtonHandler =
-       [[PopUpButtonHandler alloc] initWithPanel:dialog
-                                    andTypesList:file_types_list];
-+=======
-+  NSPopUpButton* popupButton = [[NSPopUpButton alloc] initWithFrame:NSMakeRect(50.0, 2, 140, 22.0)
-+                                                          pullsDown:NO];
-+  PopUpButtonHandler* popUpButtonHandler = [[PopUpButtonHandler alloc] initWithPanel:dialog
-+                                                                        andTypesList:file_types_list];
-+>>>>>>> .their
-   [popupButton addItemsWithTitles:filter_names];
-   [popupButton setTarget:popUpButtonHandler];
-   [popupButton setAction:@selector(selectFormat:)];
-changed in both
-  base   100644 a358f676a8c41d15bb9c3157cce4a62ef8356855 atom/browser/ui/tray_icon_cocoa.mm
-  our    100644 2c434d7a9e312adfb3802628a3d092a95d4ac49f atom/browser/ui/tray_icon_cocoa.mm
-  their  100644 aedce38f656eaab389502df98bb20b28e3e3619a atom/browser/ui/tray_icon_cocoa.mm
-@@ -240,13 +240,22 @@
-   }
- 
-   // check title_ being nil
-+<<<<<<< .our
-   NSString* title = @"";
-+=======
-+  NSString *title = @"";
-+>>>>>>> .their
-   if (title_)
-     title = title_;
- 
-   attributedTitle_.reset([[NSMutableAttributedString alloc]
-+<<<<<<< .our
-       initWithString:title
-           attributes:attributes]);
-+=======
-+                             initWithString:title
-+                                 attributes:attributes]);
-+>>>>>>> .their
- 
-   // NSFontAttributeName:[NSFont menuBarFontOfSize:0],
-   // NSForegroundColorAttributeName:[self colorWithHighlight: highlight]
-changed in both
-  base   100644 e1836ad68985f6068a5ea4be76d6f58682056d04 atom/browser/ui/tray_icon_gtk.cc
-  our    100644 4c780285c80a157afca74b0927175ba3b045def9 atom/browser/ui/tray_icon_gtk.cc
-  their  100644 eb7be1ed3b4345cf825075785c1c1708a7b69d30 atom/browser/ui/tray_icon_gtk.cc
-@@ -36,9 +36,16 @@
-   if (libgtkui::AppIndicatorIcon::CouldOpen()) {
-     ++indicators_count;
-     icon_.reset(new libgtkui::AppIndicatorIcon(
-+<<<<<<< .our
-         base::StringPrintf("%s%d", Browser::Get()->GetName().c_str(),
-                            indicators_count),
-         image.AsImageSkia(), toolTip));
-+=======
-+        base::StringPrintf(
-+            "%s%d", Browser::Get()->GetName().c_str(), indicators_count),
-+        image.AsImageSkia(),
-+        toolTip));
-+>>>>>>> .their
-   } else {
-     icon_.reset(new libgtkui::Gtk2StatusIcon(image.AsImageSkia(), toolTip));
-   }
-changed in both
-  base   100644 5182e1a0f7f141e8ddfa95fd8cca8771f2cabd9f atom/browser/ui/views/frameless_view.cc
-  our    100644 8959ee13612979d2819621acc14ebf641fb7f116 atom/browser/ui/views/frameless_view.cc
-  their  100644 b78e897b8f51747fbeb86cdf1e507ecf5be0bf9b atom/browser/ui/views/frameless_view.cc
-changed in both
-  base   100644 f2ab22f70a6fa08ff1315d197ff3ff3cb700733f atom/browser/ui/views/global_menu_bar_x11.cc
-  our    100644 656bd8f991f87c06a240cdc09a3bfcd500d1c1c8 atom/browser/ui/views/global_menu_bar_x11.cc
-  their  100644 eaeefbd1fb411fca13d6de5dbbc17806d271affd atom/browser/ui/views/global_menu_bar_x11.cc
-changed in both
-  base   100644 bf9801a1457740da391c75621214b8d91cb7467d atom/browser/ui/views/menu_bar.cc
-  our    100644 e838d3cc217b5ffdb77226beff0d7217539f23f9 atom/browser/ui/views/menu_bar.cc
-  their  100644 d963c121bbd29bf3f67b488666297c86b4fee225 atom/browser/ui/views/menu_bar.cc
-@@ -18,11 +18,17 @@
- 
- namespace {
- 
-+<<<<<<< .our
-+=======
-+const char kViewClassName[] = "ElectronMenuBar";
-+
-+>>>>>>> .their
- // Default color of the menu bar.
- const SkColor kDefaultColor = SkColorSetARGB(255, 233, 233, 233);
- 
- }  // namespace
- 
-+<<<<<<< .our
- const char MenuBar::kViewClassName[] = "ElectronMenuBar";
- 
- MenuBar::MenuBar(views::View* window)
-@@ -32,12 +38,35 @@
-   SetLayoutManager(
-       std::make_unique<views::BoxLayout>(views::BoxLayout::kHorizontal));
-   window_->GetFocusManager()->AddFocusChangeListener(this);
-+=======
-+MenuBar::MenuBar(NativeWindow* window)
-+    : background_color_(kDefaultColor), menu_model_(NULL), window_(window) {
-+  RefreshColorCache();
-+  UpdateViewColors();
-+  SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal));
-+>>>>>>> .their
- }
- 
- MenuBar::~MenuBar() {
-   window_->GetFocusManager()->RemoveFocusChangeListener(this);
- }
- 
-+<<<<<<< .our
-+=======
-+void MenuBar::AddedToWidget() {
-+  auto fm = GetFocusManager();
-+  fm->AddFocusChangeListener(this);
-+  // Note that we don't own fm -- this manages the _connection_
-+  focus_manager_.reset(fm, [this](views::FocusManager* fm) {
-+    fm->RemoveFocusChangeListener(this);
-+  });
-+}
-+
-+void MenuBar::RemovedFromWidget() {
-+  focus_manager_.reset();
-+}
-+
-+>>>>>>> .their
- void MenuBar::SetMenu(AtomMenuModel* model) {
-   menu_model_ = model;
-   RebuildChildren();
-@@ -61,7 +90,11 @@
- }
- 
- void MenuBar::ActivateAccelerator(base::char16 key) {
-+<<<<<<< .our
-   auto* child = FindAccelChild(key);
-+=======
-+  auto child = FindAccelChild(key);
-+>>>>>>> .their
-   if (child)
-     static_cast<SubmenuButton*>(child)->Activate(nullptr);
- }
-@@ -151,7 +184,11 @@
- void MenuBar::RebuildChildren() {
-   RemoveAllChildViews(true);
-   for (int i = 0, n = GetItemCount(); i < n; ++i) {
-+<<<<<<< .our
-     auto* button =
-+=======
-+    auto button =
-+>>>>>>> .their
-         new SubmenuButton(menu_model_->GetLabelAt(i), this, background_color_);
-     button->set_tag(i);
-     AddChildView(button);
-@@ -169,7 +206,11 @@
- #if defined(USE_X11)
-   const auto& textColor = has_focus_ ? enabled_color_ : disabled_color_;
-   for (auto* child : GetChildrenInZOrder()) {
-+<<<<<<< .our
-     auto* button = static_cast<SubmenuButton*>(child);
-+=======
-+    auto button = static_cast<SubmenuButton*>(child);
-+>>>>>>> .their
-     button->SetTextColor(views::Button::STATE_NORMAL, textColor);
-     button->SetTextColor(views::Button::STATE_DISABLED, disabled_color_);
-     button->SetTextColor(views::Button::STATE_PRESSED, enabled_color_);
-@@ -178,7 +219,11 @@
-   }
- #elif defined(OS_WIN)
-   for (auto* child : GetChildrenInZOrder()) {
-+<<<<<<< .our
-     auto* button = static_cast<SubmenuButton*>(child);
-+=======
-+    auto button = static_cast<SubmenuButton*>(child);
-+>>>>>>> .their
-     button->SetUnderlineColor(color_utils::GetSysSkColor(COLOR_MENUTEXT));
-   }
- #endif
-changed in both
-  base   100644 761e31b98ea75f44bcd016da3b34b7615f3b409f atom/browser/ui/views/menu_bar.h
-  our    100644 2b10ba3e3bf2ccfc0453fdb59ad022ef7da8ed5b atom/browser/ui/views/menu_bar.h
-  their  100644 13cfa32f3988881e3aa87cae6cae65656fa68d70 atom/browser/ui/views/menu_bar.h
-@@ -5,6 +5,12 @@
- #ifndef ATOM_BROWSER_UI_VIEWS_MENU_BAR_H_
- #define ATOM_BROWSER_UI_VIEWS_MENU_BAR_H_
- 
-+<<<<<<< .our
-+=======
-+#include <memory>
-+
-+#include "atom/browser/native_window.h"
-+>>>>>>> .their
- #include "atom/browser/ui/atom_menu_model.h"
- #include "ui/views/controls/button/menu_button_listener.h"
- #include "ui/views/focus/focus_manager.h"
-@@ -49,7 +55,9 @@
- 
-  protected:
-   // views::View:
-+  void AddedToWidget() override;
-   const char* GetClassName() const override;
-+  void RemovedFromWidget() override;
- 
-   // views::MenuButtonListener:
-   void OnMenuButtonClicked(views::MenuButton* source,
-@@ -79,6 +87,11 @@
- 
-   bool has_focus_ = true;
- 
-+  View* FindAccelChild(base::char16 key);
-+
-+  std::shared_ptr<views::FocusManager> focus_manager_;
-+  bool has_focus_ = true;
-+
-   DISALLOW_COPY_AND_ASSIGN(MenuBar);
- };
- 
-changed in both
-  base   100644 3c3cff3c65410f2e61bdade6e457a096ffba3a54 atom/browser/ui/views/submenu_button.cc
-  our    100644 1124d3d01471876fefa2757570ba3cff796a991c atom/browser/ui/views/submenu_button.cc
-  their  100644 baee28f2cd6931611e048ec46c83e602b95b4b59 atom/browser/ui/views/submenu_button.cc
-@@ -82,8 +82,12 @@
- 
- bool SubmenuButton::GetUnderlinePosition(const base::string16& text,
-                                          base::char16* accelerator,
-+<<<<<<< .our
-                                          int* start,
-                                          int* end) const {
-+=======
-+                                         int* start, int* end) const {
-+>>>>>>> .their
-   int pos, span;
-   base::string16 trimmed = gfx::RemoveAcceleratorChar(text, '&', &pos, &span);
-   if (pos > -1 && span != 0) {
-@@ -96,9 +100,14 @@
-   return false;
- }
- 
-+<<<<<<< .our
- void SubmenuButton::GetCharacterPosition(const base::string16& text,
-                                          int index,
-                                          int* pos) const {
-+=======
-+void SubmenuButton::GetCharacterPosition(
-+    const base::string16& text, int index, int* pos) const {
-+>>>>>>> .their
-   int height = 0;
-   gfx::Canvas::SizeStringInt(text.substr(0, index), gfx::FontList(), pos,
-                              &height, 0, 0);
-changed in both
-  base   100644 5c05481cbbfb85b5d77511cb91cc19cc8ef0e626 atom/browser/ui/views/submenu_button.h
-  our    100644 d8b7785da131271e88533879d090badfd6e49dd5 atom/browser/ui/views/submenu_button.h
-  their  100644 0f7eddf4c914790675f0c9bfab696b2a96b91f74 atom/browser/ui/views/submenu_button.h
-@@ -33,11 +33,17 @@
-  private:
-   bool GetUnderlinePosition(const base::string16& text,
-                             base::char16* accelerator,
-+<<<<<<< .our
-                             int* start,
-                             int* end) const;
-   void GetCharacterPosition(const base::string16& text,
-                             int index,
-                             int* pos) const;
-+=======
-+                            int* start, int* end) const;
-+  void GetCharacterPosition(
-+      const base::string16& text, int index, int* pos) const;
-+>>>>>>> .their
- 
-   base::char16 accelerator_ = 0;
- 
-changed in both
-  base   100644 84a6d9aa3e50ced33616fb4b78e124f39461cd0e atom/browser/ui/win/atom_desktop_window_tree_host_win.cc
-  our    100644 97857d6515aa5617cf8c1972690a1dcdfd645ac1 atom/browser/ui/win/atom_desktop_window_tree_host_win.cc
-  their  100644 3da0241a27a9d272c09db30db068939c1bc66d19 atom/browser/ui/win/atom_desktop_window_tree_host_win.cc
-changed in both
-  base   100644 47e4cb6aed2a962bfdd2a92edaca74b452d15c4d atom/browser/ui/win/atom_desktop_window_tree_host_win.h
-  our    100644 30af3cc162b4429cb3335c6864b801eac1d5f963 atom/browser/ui/win/atom_desktop_window_tree_host_win.h
-  their  100644 b0164f2ab6ca9580d11ae1aaff68d9caae314d54 atom/browser/ui/win/atom_desktop_window_tree_host_win.h
-@@ -25,10 +25,15 @@
-   ~AtomDesktopWindowTreeHostWin() override;
- 
-  protected:
-+<<<<<<< .our
-   bool PreHandleMSG(UINT message,
-                     WPARAM w_param,
-                     LPARAM l_param,
-                     LRESULT* result) override;
-+=======
-+  bool PreHandleMSG(
-+      UINT message, WPARAM w_param, LPARAM l_param, LRESULT* result) override;
-+>>>>>>> .their
-   bool HasNativeFrame() const override;
- 
-  private:
-changed in both
-  base   100644 2cbf07be86a812f07105846dc8caf8226a8595df atom/browser/web_contents_preferences.cc
-  our    100644 c21c93383155091a7481cdd4e741cefad90a4a55 atom/browser/web_contents_preferences.cc
-  their  100644 98b39fee234cb15ac0da99fd5639c7b8265d71b0 atom/browser/web_contents_preferences.cc
-@@ -97,6 +97,7 @@
-   instances_.push_back(this);
- 
-   // Set WebPreferences defaults onto the JS object
-+<<<<<<< .our
-   SetDefaultBoolIfUndefined(options::kPlugins, false);
-   SetDefaultBoolIfUndefined(options::kExperimentalFeatures, false);
-   bool node = SetDefaultBoolIfUndefined(options::kNodeIntegration, true);
-@@ -104,12 +105,23 @@
-   SetDefaultBoolIfUndefined(options::kWebviewTag, node);
-   SetDefaultBoolIfUndefined(options::kSandbox, false);
-   SetDefaultBoolIfUndefined(options::kNativeWindowOpen, false);
-+=======
-+  SetDefaultBoolIfUndefined("plugins", false);
-+  SetDefaultBoolIfUndefined(options::kExperimentalFeatures, false);
-+  SetDefaultBoolIfUndefined(options::kExperimentalCanvasFeatures, false);
-+  bool node = SetDefaultBoolIfUndefined(options::kNodeIntegration, true);
-+  SetDefaultBoolIfUndefined(options::kNodeIntegrationInWorker, false);
-+  SetDefaultBoolIfUndefined(options::kWebviewTag, node);
-+  SetDefaultBoolIfUndefined("sandbox", false);
-+  SetDefaultBoolIfUndefined("nativeWindowOpen", false);
-+>>>>>>> .their
-   SetDefaultBoolIfUndefined(options::kContextIsolation, false);
-   SetDefaultBoolIfUndefined("javascript", true);
-   SetDefaultBoolIfUndefined("images", true);
-   SetDefaultBoolIfUndefined("textAreasAreResizable", true);
-   SetDefaultBoolIfUndefined("webgl", true);
-   bool webSecurity = true;
-+<<<<<<< .our
-   SetDefaultBoolIfUndefined(options::kWebSecurity, webSecurity);
-   // If webSecurity was explicity set to false, let's inherit that into
-   // insecureContent
-@@ -125,6 +137,21 @@
-   SetDefaultBoolIfUndefined(options::kOffscreen, false);
- 
-   last_preference_ = preference_.Clone();
-+=======
-+  SetDefaultBoolIfUndefined("webSecurity", webSecurity);
-+  // If webSecurity was explicity set to false, let's inherit that into
-+  // insecureContent
-+  if (web_preferences.Get("webSecurity", &webSecurity) && !webSecurity) {
-+    SetDefaultBoolIfUndefined("allowRunningInsecureContent", true);
-+  } else {
-+    SetDefaultBoolIfUndefined("allowRunningInsecureContent", false);
-+  }
-+  #if defined(OS_MACOSX)
-+  SetDefaultBoolIfUndefined(options::kScrollBounce, false);
-+  #endif
-+  SetDefaultBoolIfUndefined("offscreen", false);
-+  last_web_preferences_.MergeDictionary(&web_preferences_);
-+>>>>>>> .their
- }
- 
- WebContentsPreferences::~WebContentsPreferences() {
-@@ -154,6 +181,16 @@
-   return default_value;
- }
- 
-+bool WebContentsPreferences::SetDefaultBoolIfUndefined(const std::string key,
-+                                                       bool val) {
-+  bool existing;
-+  if (!web_preferences_.GetBoolean(key, &existing)) {
-+    web_preferences_.SetBoolean(key, val);
-+    return val;
-+  }
-+  return existing;
-+}
-+
- void WebContentsPreferences::Merge(const base::DictionaryValue& extend) {
-   if (preference_.is_dict())
-     static_cast<base::DictionaryValue*>(&preference_)->MergeDictionary(&extend);
-@@ -212,8 +249,18 @@
-   return FromWebContents(web_contents);
- }
- 
-+<<<<<<< .our
- void WebContentsPreferences::AppendCommandLineSwitches(
-     base::CommandLine* command_line) {
-+=======
-+  // We are appending args to a webContents so let's save the current state
-+  // of our preferences object so that during the lifetime of the WebContents
-+  // we can fetch the options used to initally configure the WebContents
-+  self->last_web_preferences_.Clear();
-+  self->last_web_preferences_.MergeDictionary(&web_preferences);
-+
-+  bool b;
-+>>>>>>> .their
-   // Check if plugins are enabled.
-   if (IsEnabled(options::kPlugins))
-     command_line->AppendSwitch(switches::kEnablePlugins);
-changed in both
-  base   100644 94dd8dc598bef5cc35383d69d20ade8d644a7ef5 atom/browser/web_contents_preferences.h
-  our    100644 d835347afcd259f473f95271a2c19e42afcc6f2b atom/browser/web_contents_preferences.h
-  their  100644 28ee9a85485e26b33b8a7852a4a212b4c11b71a0 atom/browser/web_contents_preferences.h
-@@ -59,25 +59,45 @@
-   bool GetPreloadPath(base::FilePath::StringType* path) const;
- 
-   // Returns the web preferences.
-+<<<<<<< .our
-   base::Value* preference() { return &preference_; }
-   base::Value* last_preference() { return &last_preference_; }
-+=======
-+  base::DictionaryValue* web_preferences() { return &web_preferences_; }
-+  base::DictionaryValue* last_web_preferences() {
-+    return &last_web_preferences_;
-+  }
-+>>>>>>> .their
- 
-  private:
-   friend class content::WebContentsUserData<WebContentsPreferences>;
-   friend class AtomBrowserClient;
- 
-+<<<<<<< .our
-   // Get WebContents according to process ID.
-   static content::WebContents* GetWebContentsFromProcessID(int process_id);
- 
-   // Set preference value to given bool if user did not provide value
-   bool SetDefaultBoolIfUndefined(const base::StringPiece& key, bool val);
-+=======
-+  // Set preference value to given bool if user did not provide value
-+  bool SetDefaultBoolIfUndefined(const std::string key, bool val);
-+
-+  // Get preferences value as integer possibly coercing it from a string
-+  bool GetInteger(const std::string& attributeName, int* intValue);
-+>>>>>>> .their
- 
-   static std::vector<WebContentsPreferences*> instances_;
- 
-   content::WebContents* web_contents_;
-+<<<<<<< .our
- 
-   base::Value preference_ = base::Value(base::Value::Type::DICTIONARY);
-   base::Value last_preference_ = base::Value(base::Value::Type::DICTIONARY);
-+=======
-+  base::DictionaryValue web_preferences_;
-+  base::DictionaryValue last_web_preferences_;
-+>>>>>>> .their
- 
-   DISALLOW_COPY_AND_ASSIGN(WebContentsPreferences);
- };
-changed in both
-  base   100644 1dd479883d872dc6d76ef069782aad6dc4f731da atom/browser/web_dialog_helper.cc
-  our    100644 74c8573d13f15bcaa189abdc40fa0cd8e48f89be atom/browser/web_dialog_helper.cc
-  their  100644 c76b48a74b3629b9b8588983cb4563aada6d28b9 atom/browser/web_dialog_helper.cc
-changed in both
-  base   100644 ad8c1d49bbc049b89eb4c69224b42fb51906c726 atom/common/api/api_messages.h
-  our    100644 6131a7a473c68e31790fcd8697c8f380c65ad275 atom/common/api/api_messages.h
-  their  100644 46e6142260d67b6408060ccaf328ee1f74335fe4 atom/common/api/api_messages.h
-@@ -59,6 +59,7 @@
- 
- // Sent by renderer to set the temporary zoom level.
- IPC_SYNC_MESSAGE_ROUTED1_1(AtomFrameHostMsg_SetTemporaryZoomLevel,
-+<<<<<<< .our
-                            double /* zoom level */,
-                            double /* result */)
- 
-@@ -69,3 +70,10 @@
- IPC_MESSAGE_ROUTED2(AtomFrameHostMsg_PDFSaveURLAs,
-                     GURL /* url */,
-                     content::Referrer /* referrer */)
-+=======
-+                            double /* zoom level */,
-+                            double /* result */)
-+
-+// Sent by renderer to get the zoom level.
-+IPC_SYNC_MESSAGE_ROUTED0_1(AtomFrameHostMsg_GetZoomLevel, double /* result */)
-+>>>>>>> .their
-changed in both
-  base   100644 a01ca8f84d917f6402a2e8d0aa153c6f7be9a3c5 atom/common/api/atom_api_v8_util.cc
-  our    100644 3d80db0c0a4cdbb4c7a78fa7e4266fc6fc87193f atom/common/api/atom_api_v8_util.cc
-  their  100644 9fa0484b87978841e73a4ab081fae6091624b5e4 atom/common/api/atom_api_v8_util.cc
-@@ -12,10 +12,20 @@
- #include "atom/common/native_mate_converters/gurl_converter.h"
- #include "atom/common/node_includes.h"
- #include "base/hash.h"
-+#include "base/process/process_handle.h"
-+#include "base/strings/stringprintf.h"
- #include "native_mate/dictionary.h"
- #include "url/origin.h"
- #include "v8/include/v8-profiler.h"
- 
-+// This is defined in later versions of Chromium, remove this if you see
-+// compiler complaining duplicate defines.
-+#if defined(OS_WIN) || defined(OS_FUCHSIA)
-+#define CrPRIdPid "ld"
-+#else
-+#define CrPRIdPid "d"
-+#endif
-+
- namespace std {
- 
- // The hash function used by DoubleIDWeakMap.
-@@ -90,6 +100,16 @@
-   return object->GetIdentityHash();
- }
- 
-+std::string GetContextID(v8::Isolate* isolate) {
-+  // When a page is reloaded, V8 and blink may have optimizations that do not
-+  // free blink::WebLocalFrame and v8::Context and reuse them for the new page,
-+  // while we always recreate node::Environment when a page is loaded.
-+  // So the only reliable way to return an identity for a page, is to return the
-+  // address of the node::Environment instance.
-+  node::Environment* env = node::Environment::GetCurrent(isolate);
-+  return base::StringPrintf("%" CrPRIdPid "-%p", base::GetCurrentProcId(), env);
-+}
-+
- void TakeHeapSnapshot(v8::Isolate* isolate) {
-   isolate->GetHeapProfiler()->TakeHeapSnapshot();
- }
-@@ -112,6 +132,7 @@
-   dict.SetMethod("setHiddenValue", &SetHiddenValue);
-   dict.SetMethod("deleteHiddenValue", &DeleteHiddenValue);
-   dict.SetMethod("getObjectHash", &GetObjectHash);
-+  dict.SetMethod("getContextId", &GetContextID);
-   dict.SetMethod("takeHeapSnapshot", &TakeHeapSnapshot);
-   dict.SetMethod("setRemoteCallbackFreer", &atom::RemoteCallbackFreer::BindTo);
-   dict.SetMethod("setRemoteObjectFreer", &atom::RemoteObjectFreer::BindTo);
-changed in both
-  base   100644 d1a185d51f394b1828d66cbcf2a1d1cc278de23d atom/common/api/remote_callback_freer.cc
-  our    100644 eba828591353dae53d1b7cdaa60fee52166d7473 atom/common/api/remote_callback_freer.cc
-  their  100644 099e2160cc0d28322a60e4a9891a22b29ab841f9 atom/common/api/remote_callback_freer.cc
-@@ -29,7 +29,12 @@
-     : ObjectLifeMonitor(isolate, target),
-       content::WebContentsObserver(web_contents),
-       context_id_(context_id),
-+<<<<<<< .our
-       object_id_(object_id) {}
-+=======
-+      object_id_(object_id) {
-+}
-+>>>>>>> .their
- 
- RemoteCallbackFreer::~RemoteCallbackFreer() {}
- 
-@@ -39,7 +44,11 @@
-   base::ListValue args;
-   args.AppendString(context_id_);
-   args.AppendInteger(object_id_);
-+<<<<<<< .our
-   auto* frame_host = web_contents()->GetMainFrame();
-+=======
-+  auto frame_host = web_contents()->GetMainFrame();
-+>>>>>>> .their
-   if (frame_host) {
-     frame_host->Send(new AtomFrameMsg_Message(frame_host->GetRoutingID(), false,
-                                               channel, args));
-changed in both
-  base   100644 315127822d1709802abf317c4d8cf49ec7e2bfaa atom/common/api/remote_object_freer.cc
-  our    100644 8afe8b9a32bc4ba4d5cdfc66ecf7036b8553cb48 atom/common/api/remote_object_freer.cc
-  their  100644 6e9778994ff21fb3c6be3dd27dbf7cbe2c4c94d6 atom/common/api/remote_object_freer.cc
-changed in both
-  base   100644 5fa39680ca814675d344665b3b2a6ce5d94e625f atom/common/atom_version.h
-  our    100644 65e7d19911559a40b1b258319df5fe0fa180354f atom/common/atom_version.h
-  their  100644 098c9dac927ce4c2568830cff98abb80c68391a6 atom/common/atom_version.h
-@@ -5,10 +5,17 @@
- #ifndef ATOM_COMMON_ATOM_VERSION_H_
- #define ATOM_COMMON_ATOM_VERSION_H_
- 
-+<<<<<<< .our
- #define ATOM_MAJOR_VERSION 4
- #define ATOM_MINOR_VERSION 0
- #define ATOM_PATCH_VERSION 0
- #define ATOM_PRE_RELEASE_VERSION -nightly.20180821
-+=======
-+#define ATOM_MAJOR_VERSION 2
-+#define ATOM_MINOR_VERSION 0
-+#define ATOM_PATCH_VERSION 5
-+// #define ATOM_PRE_RELEASE_VERSION
-+>>>>>>> .their
- 
- #ifndef ATOM_STRINGIFY
- #define ATOM_STRINGIFY(n) ATOM_STRINGIFY_HELPER(n)
-changed in both
-  base   100644 a7908ef30c6bafc4aca1da9a870f7ae12703fe04 atom/common/crash_reporter/crash_reporter_win.cc
-  our    100644 c574da71c9de9bd8c7b7cad57d3a0f84708fb97c atom/common/crash_reporter/crash_reporter_win.cc
-  their  100644 49f90b7e6665727b697a243414544bae304fde6e atom/common/crash_reporter/crash_reporter_win.cc
-changed in both
-  base   100644 cff228ba49068a8a683257e9ac50778437a56c45 atom/common/linux/application_info.cc
-  our    100644 3354c73b8b60f77cf054f975ea713d96b7e7683e atom/common/linux/application_info.cc
-  their  100644 05bd7f6fc15015a4f570e36801aea622a8f0cb3a atom/common/linux/application_info.cc
-@@ -19,7 +19,11 @@
- namespace {
- 
- GDesktopAppInfo* get_desktop_app_info() {
-+<<<<<<< .our
-   GDesktopAppInfo* ret = nullptr;
-+=======
-+  GDesktopAppInfo * ret = nullptr;
-+>>>>>>> .their
- 
-   std::string desktop_id;
-   if (brightray::platform_util::GetDesktopName(&desktop_id))
-changed in both
-  base   100644 eed6e7bc092f84bd1bde673c27f5fe5363c7783c atom/common/options_switches.cc
-  our    100644 8b1836f80c583e4db68971ff1b00ca4f86356b45 atom/common/options_switches.cc
-  their  100644 c1cd185443c0fdbadeb7ba2e174d2048ab2d45d7 atom/common/options_switches.cc
-@@ -188,6 +188,9 @@
- // The application path
- const char kAppPath[] = "app-path";
- 
-+// The context ID for this process
-+const char kContextId[] = "context-id";
-+
- // The command line switch versions of the options.
- const char kBackgroundColor[] = "background-color";
- const char kPreloadScript[] = "preload";
-changed in both
-  base   100644 525301971c8a05c45e12aada7d0534b84307aebf atom/common/options_switches.h
-  our    100644 5f6d7e9d38120668ed06922ced2f8d6a6e27a52b atom/common/options_switches.h
-  their  100644 9d65bc376925906063c24a9a254b2c31c7e22c34 atom/common/options_switches.h
-@@ -92,6 +92,7 @@
- extern const char kSecureSchemes[];
- extern const char kAppUserModelId[];
- extern const char kAppPath[];
-+extern const char kContextId[];
- 
- extern const char kBackgroundColor[];
- extern const char kPreloadScript[];
-changed in both
-  base   100644 7bee1411ba1c2fbac516ff8b65bcbd89f6132819 atom/renderer/api/atom_api_renderer_ipc.cc
-  our    100644 3e48a4f7d0c11f40e6360b0acc2c83c38e671319 atom/renderer/api/atom_api_renderer_ipc.cc
-  their  100644 ad6a12b90d525e9c6a49fac7a5d122b8c2c295f9 atom/renderer/api/atom_api_renderer_ipc.cc
-@@ -12,8 +12,13 @@
- #include "native_mate/dictionary.h"
- #include "third_party/WebKit/public/web/WebLocalFrame.h"
- 
-+<<<<<<< .our
- using blink::WebLocalFrame;
- using content::RenderFrame;
-+=======
-+using content::RenderFrame;
-+using blink::WebLocalFrame;
-+>>>>>>> .their
- 
- namespace atom {
- 
-@@ -48,10 +53,17 @@
- 
-   RenderFrame* render_frame = GetCurrentRenderFrame();
-   if (render_frame == nullptr)
-+<<<<<<< .our
-     return result;
- 
-   IPC::SyncMessage* message = new AtomFrameHostMsg_Message_Sync(
-       render_frame->GetRoutingID(), channel, arguments, &result);
-+=======
-+    return json;
-+
-+  IPC::SyncMessage* message = new AtomFrameHostMsg_Message_Sync(
-+      render_frame->GetRoutingID(), channel, arguments, &json);
-+>>>>>>> .their
-   bool success = render_frame->Send(message);
- 
-   if (!success)
-changed in both
-  base   100644 d0164f44a0a523b26a919e02b5b7add25a0e7224 atom/renderer/api/atom_api_web_frame.cc
-  our    100644 f0f7ef249d73876f7107d3d3865e8fc71ee33945 atom/renderer/api/atom_api_web_frame.cc
-  their  100644 c36d1a06491994f126333c98796f6ff64cfc6506 atom/renderer/api/atom_api_web_frame.cc
-changed in both
-  base   100644 1971a26c1c5d4f5c5f5f029e6334f157a16b5394 atom/renderer/atom_render_frame_observer.cc
-  our    100644 ea2355fd968339600ae8093524f1c3dcfd2f4ff3 atom/renderer/atom_render_frame_observer.cc
-  their  100644 4ddf9186b723091ef91d69cfaedc4fbdd1ac09fa atom/renderer/atom_render_frame_observer.cc
-@@ -7,6 +7,8 @@
- #include <string>
- #include <vector>
- 
-+#include "atom/common/native_mate_converters/string16_converter.h"
-+
- #include "atom/common/api/api_messages.h"
- #include "atom/common/api/event_emitter_caller.h"
- #include "atom/common/native_mate_converters/value_converter.h"
-@@ -72,7 +74,12 @@
-     RendererClientBase* renderer_client)
-     : content::RenderFrameObserver(frame),
-       render_frame_(frame),
-+<<<<<<< .our
-       renderer_client_(renderer_client) {
-+=======
-+      renderer_client_(renderer_client),
-+      document_created_(false) {
-+>>>>>>> .their
-   // Initialise resource for directory listing.
-   net::NetModule::SetResourceProvider(NetResourceProvider);
- }
-@@ -195,8 +202,13 @@
- }
- 
- void AtomRenderFrameObserver::EmitIPCEvent(blink::WebLocalFrame* frame,
-+<<<<<<< .our
-                                            const base::string16& channel,
-                                            const base::ListValue& args) {
-+=======
-+                                          const base::string16& channel,
-+                                          const base::ListValue& args) {
-+>>>>>>> .their
-   if (!frame)
-     return;
- 
-changed in both
-  base   100644 248d5a68096dedea0f6ffb3c9df38ff3373e7c18 atom/renderer/atom_render_frame_observer.h
-  our    100644 e774741c019956a3bff00db2f6d2b133bf1be6de atom/renderer/atom_render_frame_observer.h
-  their  100644 d4f3d0c7d5c454bb65a190f59b26501137dd04e0 atom/renderer/atom_render_frame_observer.h
-@@ -56,7 +56,11 @@
- 
-   content::RenderFrame* render_frame_;
-   RendererClientBase* renderer_client_;
-+<<<<<<< .our
-   bool document_created_ = false;
-+=======
-+  bool document_created_;
-+>>>>>>> .their
- 
-   DISALLOW_COPY_AND_ASSIGN(AtomRenderFrameObserver);
- };
-changed in both
-  base   100644 4d3e7cba7a65330a45a5f2aebba90c257b206e35 atom/renderer/atom_render_view_observer.h
-  our    100644 097616e12369662473c12645a93e27cffcb55e3b atom/renderer/atom_render_view_observer.h
-  their  100644 ca9fb01288e3bd4788c7718f0feb8b37307383e6 atom/renderer/atom_render_view_observer.h
-@@ -14,7 +14,11 @@
-   explicit AtomRenderViewObserver(content::RenderView* render_view);
- 
-  protected:
-+<<<<<<< .our
-   ~AtomRenderViewObserver() override;
-+=======
-+  virtual ~AtomRenderViewObserver();
-+>>>>>>> .their
- 
-  private:
-   // content::RenderViewObserver implementation.
-changed in both
-  base   100644 82ba9d024350009ae86bc5406513c8086073990a atom/renderer/atom_renderer_client.cc
-  our    100644 204f17c2cf0d2d4ec4a71bdbecfcd1cbdc5fc8be atom/renderer/atom_renderer_client.cc
-  their  100644 12e8fa2603a1b533646b300efbf312b9cb2d8361 atom/renderer/atom_renderer_client.cc
-changed in both
-  base   100644 07d20bda8b00b1acdb823546f5e606154278cd4e atom/renderer/atom_sandboxed_renderer_client.cc
-  our    100644 6e29fe45a69f44856d7fca449ec1be4eaf6970a2 atom/renderer/atom_sandboxed_renderer_client.cc
-  their  100644 cad4b6d7b680da1407a912eb0f4228cf0fe88339 atom/renderer/atom_sandboxed_renderer_client.cc
-@@ -12,11 +12,16 @@
- #include "atom/common/options_switches.h"
- #include "atom/renderer/api/atom_api_renderer_ipc.h"
- #include "atom/renderer/atom_render_frame_observer.h"
-+<<<<<<< .our
- #include "base/base_paths.h"
- #include "base/command_line.h"
- #include "base/files/file_path.h"
- #include "base/path_service.h"
- #include "base/process/process_handle.h"
-+=======
-+#include "base/command_line.h"
-+#include "base/files/file_path.h"
-+>>>>>>> .their
- #include "chrome/renderer/printing/print_web_view_helper.h"
- #include "content/public/renderer/render_frame.h"
- #include "native_mate/dictionary.h"
-@@ -34,8 +39,13 @@
- const std::string kModuleCacheKey = "native-module-cache";
- 
- bool IsDevTools(content::RenderFrame* render_frame) {
-+<<<<<<< .our
-   return render_frame->GetWebFrame()->GetDocument().Url().ProtocolIs(
-       "chrome-devtools");
-+=======
-+  return render_frame->GetWebFrame()->GetDocument().Url()
-+        .ProtocolIs("chrome-devtools");
-+>>>>>>> .their
- }
- 
- v8::Local<v8::Object> GetModuleCache(v8::Isolate* isolate) {
-@@ -102,12 +112,19 @@
-   AtomSandboxedRenderFrameObserver(content::RenderFrame* render_frame,
-                                    AtomSandboxedRendererClient* renderer_client)
-       : AtomRenderFrameObserver(render_frame, renderer_client),
-+<<<<<<< .our
-         renderer_client_(renderer_client) {}
-+=======
-+        v8_converter_(new atom::V8ValueConverter),
-+        renderer_client_(renderer_client) {
-+    v8_converter_->SetDisableNode(true);
-+  }
-+>>>>>>> .their
- 
-  protected:
-   void EmitIPCEvent(blink::WebLocalFrame* frame,
-                     const base::string16& channel,
--                    const base::ListValue& args) override {
-+                    const base::ListValue& args) {
-     if (!frame)
-       return;
- 
-@@ -176,6 +193,7 @@
- }
- 
- void AtomSandboxedRendererClient::DidCreateScriptContext(
-+<<<<<<< .our
-     v8::Handle<v8::Context> context,
-     content::RenderFrame* render_frame) {
-   RendererClientBase::DidCreateScriptContext(context, render_frame);
-@@ -184,6 +202,18 @@
-   // For devtools we still want to run the preload_bundle script
-   if (!render_frame->IsMainFrame() && !IsDevTools(render_frame))
-     return;
-+=======
-+    v8::Handle<v8::Context> context, content::RenderFrame* render_frame) {
-+
-+  // Only allow preload for the main frame or
-+  // For devtools we still want to run the preload_bundle script
-+  if (!render_frame->IsMainFrame() && !IsDevTools(render_frame))
-+    return;
-+
-+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-+  base::FilePath preload_script_path = command_line->GetSwitchValuePath(
-+      switches::kPreloadScript);
-+>>>>>>> .their
- 
-   auto* isolate = context->GetIsolate();
-   v8::HandleScope handle_scope(isolate);
-@@ -203,7 +233,14 @@
-   auto binding = v8::Object::New(isolate);
-   InitializeBindings(binding, context);
-   AddRenderBindings(isolate, binding);
-+<<<<<<< .our
-   v8::Local<v8::Value> args[] = {binding};
-+=======
-+  v8::Local<v8::Value> args[] = {
-+    binding,
-+    mate::ConvertToV8(isolate, preload_script_path.value())
-+  };
-+>>>>>>> .their
-   // Execute the function with proper arguments
-   ignore_result(
-       func->Call(context, v8::Null(isolate), node::arraysize(args), args));
-changed in both
-  base   100644 89af0932d10a598f87dd28ec4b32ae3b2e0eadca atom/renderer/renderer_client_base.cc
-  our    100644 69490420ef5b8f87e7cb8fd97ebd5ec4509fa1ae atom/renderer/renderer_client_base.cc
-  their  100644 af9dfe39367ff1014e558afee2f0fe5ab0e7456e atom/renderer/renderer_client_base.cc
-@@ -161,7 +161,10 @@
- 
- void RendererClientBase::RenderFrameCreated(
-     content::RenderFrame* render_frame) {
-+<<<<<<< .our
- #if defined(TOOLKIT_VIEWS)
-+=======
-+>>>>>>> .their
-   new AutofillAgent(render_frame);
- #endif
- #if defined(ENABLE_PEPPER_FLASH)
-changed in both
-  base   100644 653aca2b86182a17d5a1a53aeda6d441bfd3652a atom/utility/atom_content_utility_client.cc
-  our    100644 e2a856d53ae243de988c43b0a3335b9391e54b4e atom/utility/atom_content_utility_client.cc
-  their  100644 91168f7fc2da98546864d12f03d1e0f75a7ca64f atom/utility/atom_content_utility_client.cc
-@@ -4,12 +4,29 @@
- 
- #include "atom/utility/atom_content_utility_client.h"
- 
-+#include "content/public/common/service_manager_connection.h"
-+#include "content/public/common/simple_connection_filter.h"
-+#include "content/public/utility/utility_thread.h"
-+#include "mojo/public/cpp/bindings/strong_binding.h"
-+#include "net/proxy/mojo_proxy_resolver_factory_impl.h"
-+#include "services/service_manager/public/cpp/binder_registry.h"
-+
- #if defined(OS_WIN)
- #include "chrome/utility/printing_handler_win.h"
- #endif
- 
- namespace atom {
- 
-+namespace {
-+
-+void CreateProxyResolverFactory(
-+    net::interfaces::ProxyResolverFactoryRequest request) {
-+  mojo::MakeStrongBinding(base::MakeUnique<net::MojoProxyResolverFactoryImpl>(),
-+                          std::move(request));
-+}
-+
-+}  // namespace
-+
- AtomContentUtilityClient::AtomContentUtilityClient() {
- #if defined(OS_WIN)
-   handlers_.push_back(std::make_unique<printing::PrintingHandlerWin>());
-@@ -18,7 +35,29 @@
- 
- AtomContentUtilityClient::~AtomContentUtilityClient() {}
- 
-+<<<<<<< .our
- bool AtomContentUtilityClient::OnMessageReceived(const IPC::Message& message) {
-+=======
-+void AtomContentUtilityClient::UtilityThreadStarted() {
-+  content::ServiceManagerConnection* connection =
-+      content::ChildThread::Get()->GetServiceManagerConnection();
-+
-+  // NOTE: Some utility process instances are not connected to the Service
-+  // Manager. Nothing left to do in that case.
-+  if (!connection)
-+    return;
-+
-+  auto registry = base::MakeUnique<service_manager::BinderRegistry>();
-+  registry->AddInterface<net::interfaces::ProxyResolverFactory>(
-+      base::Bind(CreateProxyResolverFactory),
-+      base::ThreadTaskRunnerHandle::Get());
-+  connection->AddConnectionFilter(
-+      base::MakeUnique<content::SimpleConnectionFilter>(std::move(registry)));
-+}
-+
-+bool AtomContentUtilityClient::OnMessageReceived(
-+    const IPC::Message& message) {
-+>>>>>>> .their
- #if defined(OS_WIN)
-   for (const auto& handler : handlers_) {
-     if (handler->OnMessageReceived(message))
-merged
-  result 100644 75359a2456129dd0caeb03a37eebf7bbfb9a2e21 atom/utility/atom_content_utility_client.h
-  our    100644 7694970457b745a84ecab24a2f0ec8eaefa8a1ad atom/utility/atom_content_utility_client.h
-@@ -20,6 +20,7 @@
-   AtomContentUtilityClient();
-   ~AtomContentUtilityClient() override;
- 
-+  void UtilityThreadStarted() override;
-   bool OnMessageReceived(const IPC::Message& message) override;
- 
-  private:
-changed in both
-  base   100644 065fe818a64586b6f786cdaa163c40b8a3aacabe brightray/brightray.gyp
-  our    100644 f233257e88bad8f0ff703034bea02e4715a5b5b9 brightray/brightray.gyp
-  their  100644 03d48ccef48fccb58bd39f9604e73b872f825d76 brightray/brightray.gyp
-@@ -127,6 +127,8 @@
-                   '<(libchromiumcontent_dir)/libviz_service.a',
-                   # services/device/wake_lock/power_save_blocker/
-                   '<(libchromiumcontent_dir)/libpower_save_blocker.a',
-+                  # net/proxy/mojo_*
-+                  '<(libchromiumcontent_dir)/libnet_proxy_service.a',
-                   # Friends of libpdf.a:
-                   # On Linux we have to use "--whole-archive" to include
-                   # all symbols, otherwise there will be plenty of
-@@ -178,6 +180,7 @@
-                 ],
-               },
-             }],
-+<<<<<<< .our
-             # Due to strange linker behavior, component build of arm needs to
-             # be linked with libjpeg.a explicitly.
-             ['target_arch=="arm" and libchromiumcontent_component==1', {
-@@ -187,6 +190,8 @@
-                 ],
-               },
-             }],
-+=======
-+>>>>>>> .their
-           ],
-         }],  # OS=="linux"
-         ['OS=="mac"', {
-@@ -221,6 +226,8 @@
-                   '<(libchromiumcontent_dir)/libviz_service.a',
-                   # services/device/wake_lock/power_save_blocker/
-                   '<(libchromiumcontent_dir)/libpower_save_blocker.a',
-+                  # net/proxy/mojo_*
-+                  '<(libchromiumcontent_dir)/libnet_proxy_service.a',
-                   # Friends of libpdf.a:
-                   '<(libchromiumcontent_dir)/libpdf.a',
-                   '<(libchromiumcontent_dir)/libppapi_cpp_objects.a',
-@@ -288,6 +295,20 @@
-                 ],
-               },
-             }],
-+            # In the OSX 10.10 SDK, CoreBluetooth became a top level framework.
-+            # Previously, it was nested in IOBluetooth. In order for Chrome to run on
-+            # OSes older than OSX 10.10, the top level CoreBluetooth framework must be
-+            # weakly linked.
-+            ['mac_sdk=="10.10" and libchromiumcontent_component==0', {
-+              'direct_dependent_settings': {
-+                'xcode_settings': {
-+                  'OTHER_LDFLAGS': [
-+                    '-weak_framework',
-+                    'CoreBluetooth',
-+                  ],
-+                },
-+              },
-+            }],
-           ]
-         }],  # OS=="mac"
-         ['OS=="win"', {
-@@ -359,6 +380,8 @@
-                   '<(libchromiumcontent_dir)/viz_service.lib',
-                   # services/device/wake_lock/power_save_blocker/
-                   '<(libchromiumcontent_dir)/power_save_blocker.lib',
-+                  # net/proxy/mojo_*
-+                  '<(libchromiumcontent_dir)/net_proxy_service.lib',
-                   # Friends of pdf.lib:
-                   '<(libchromiumcontent_dir)/pdf.lib',
-                   '<(libchromiumcontent_dir)/ppapi_cpp_objects.lib',
-changed in both
-  base   100644 d7a4c672926c03dcf4c1a4df1a9e5fa09b19d272 brightray/browser/browser_context.cc
-  our    100644 1eff7344e9aef78bb88720c38c0f75fb92e6bc09 brightray/browser/browser_context.cc
-  their  100644 241398ce96efbe0e4f2203acd86f224c910443e2 brightray/browser/browser_context.cc
-@@ -89,6 +89,7 @@
- }
- 
- void BrowserContext::InitPrefs() {
-+  base::ThreadRestrictions::ScopedAllowIO allow_io;
-   auto prefs_path = GetPath().Append(FILE_PATH_LITERAL("Preferences"));
-   base::ThreadRestrictions::ScopedAllowIO allow_io;
-   PrefServiceFactory prefs_factory;
-changed in both
-  base   100644 143a5fdea3eb6ad7709fa8383298029a24c1b407 brightray/browser/linux/libnotify_notification.cc
-  our    100644 0725ffded989d3c6bce753a210e464deca346ad1 brightray/browser/linux/libnotify_notification.cc
-  their  100644 7f9fb35e434f7cc85cf4145661e754ff4a0d84fc brightray/browser/linux/libnotify_notification.cc
-added in remote
-  their  100644 def1fc7f25e6fa60aa4a548d4ddbe9c2f5633289 brightray/browser/net/chrome_mojo_proxy_resolver_factory.cc
-@@ -0,0 +1,117 @@
-+// Copyright 2015 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "brightray/browser/net/chrome_mojo_proxy_resolver_factory.h"
-+
-+#include <utility>
-+
-+#include "base/logging.h"
-+#include "base/memory/ptr_util.h"
-+#include "base/memory/singleton.h"
-+#include "base/single_thread_task_runner.h"
-+#include "base/strings/utf_string_conversions.h"
-+#include "base/threading/thread_task_runner_handle.h"
-+#include "content/public/browser/browser_thread.h"
-+#include "content/public/browser/utility_process_host.h"
-+#include "content/public/browser/utility_process_host_client.h"
-+#include "services/service_manager/public/cpp/interface_provider.h"
-+
-+namespace {
-+const int kUtilityProcessIdleTimeoutSeconds = 5;
-+}
-+
-+// static
-+ChromeMojoProxyResolverFactory* ChromeMojoProxyResolverFactory::GetInstance() {
-+  DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-+  return base::Singleton<
-+      ChromeMojoProxyResolverFactory,
-+      base::LeakySingletonTraits<ChromeMojoProxyResolverFactory>>::get();
-+}
-+
-+ChromeMojoProxyResolverFactory::ChromeMojoProxyResolverFactory() {
-+  DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-+}
-+
-+ChromeMojoProxyResolverFactory::~ChromeMojoProxyResolverFactory() {
-+  DCHECK(thread_checker_.CalledOnValidThread());
-+}
-+
-+std::unique_ptr<base::ScopedClosureRunner>
-+ChromeMojoProxyResolverFactory::CreateResolver(
-+    const std::string& pac_script,
-+    mojo::InterfaceRequest<net::interfaces::ProxyResolver> req,
-+    net::interfaces::ProxyResolverFactoryRequestClientPtr client) {
-+  DCHECK(thread_checker_.CalledOnValidThread());
-+  if (!resolver_factory_)
-+    CreateFactory();
-+
-+  if (!resolver_factory_) {
-+    // If factory creation failed, close |req|'s message pipe, which should
-+    // cause a connection error.
-+    req = nullptr;
-+    return nullptr;
-+  }
-+  idle_timer_.Stop();
-+  num_proxy_resolvers_++;
-+  resolver_factory_->CreateResolver(pac_script, std::move(req),
-+                                    std::move(client));
-+  return base::MakeUnique<base::ScopedClosureRunner>(
-+      base::Bind(&ChromeMojoProxyResolverFactory::OnResolverDestroyed,
-+                 base::Unretained(this)));
-+}
-+
-+void ChromeMojoProxyResolverFactory::CreateFactory() {
-+  DCHECK(thread_checker_.CalledOnValidThread());
-+  DCHECK(!resolver_factory_);
-+  DCHECK(!weak_utility_process_host_);
-+
-+  DVLOG(1) << "Attempting to create utility process for proxy resolver";
-+  content::UtilityProcessHost* utility_process_host =
-+      content::UtilityProcessHost::Create(
-+          scoped_refptr<content::UtilityProcessHostClient>(),
-+          base::ThreadTaskRunnerHandle::Get());
-+  utility_process_host->SetName(base::ASCIIToUTF16("Electron Proxy Resolver"));
-+  bool process_started = utility_process_host->Start();
-+  if (process_started) {
-+    BindInterface(utility_process_host, &resolver_factory_);
-+    weak_utility_process_host_ = utility_process_host->AsWeakPtr();
-+  } else {
-+    LOG(ERROR) << "Unable to connect to utility process";
-+    return;
-+  }
-+
-+  resolver_factory_.set_connection_error_handler(base::Bind(
-+      &ChromeMojoProxyResolverFactory::DestroyFactory, base::Unretained(this)));
-+}
-+
-+void ChromeMojoProxyResolverFactory::DestroyFactory() {
-+  resolver_factory_.reset();
-+  delete weak_utility_process_host_.get();
-+  weak_utility_process_host_.reset();
-+}
-+
-+void ChromeMojoProxyResolverFactory::OnResolverDestroyed() {
-+  DCHECK(thread_checker_.CalledOnValidThread());
-+  DCHECK_GT(num_proxy_resolvers_, 0u);
-+  if (--num_proxy_resolvers_ == 0) {
-+    // When all proxy resolvers have been destroyed, the proxy resolver factory
-+    // is no longer needed. However, new proxy resolvers may be created
-+    // shortly after being destroyed (e.g. due to a network change).
-+    //
-+    // On desktop, where a utility process is used, if the utility process is
-+    // shut down immediately, this would cause unnecessary process churn, so
-+    // wait for an idle timeout before shutting down the proxy resolver utility
-+    // process.
-+    idle_timer_.Start(
-+        FROM_HERE,
-+        base::TimeDelta::FromSeconds(kUtilityProcessIdleTimeoutSeconds), this,
-+        &ChromeMojoProxyResolverFactory::OnIdleTimeout);
-+  }
-+}
-+
-+void ChromeMojoProxyResolverFactory::OnIdleTimeout() {
-+  DCHECK(thread_checker_.CalledOnValidThread());
-+  DCHECK_EQ(num_proxy_resolvers_, 0u);
-+  DestroyFactory();
-+}
-added in remote
-  their  100644 47e51efebf3285c981ab71ba344d27bcd89c52e6 brightray/browser/net/chrome_mojo_proxy_resolver_factory.h
-@@ -0,0 +1,73 @@
-+// Copyright 2015 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef BRIGHTRAY_BROWSER_NET_CHROME_MOJO_PROXY_RESOLVER_FACTORY_H_
-+#define BRIGHTRAY_BROWSER_NET_CHROME_MOJO_PROXY_RESOLVER_FACTORY_H_
-+
-+#include <stddef.h>
-+#include <string>
-+
-+#include "base/macros.h"
-+#include "base/memory/weak_ptr.h"
-+#include "base/threading/thread_checker.h"
-+#include "base/timer/timer.h"
-+#include "net/proxy/mojo_proxy_resolver_factory.h"
-+
-+namespace content {
-+class UtilityProcessHost;
-+}
-+
-+namespace base {
-+template <typename Type>
-+struct DefaultSingletonTraits;
-+}  // namespace base
-+
-+// A factory used to create connections to Mojo proxy resolver services.  On
-+// Android, the proxy resolvers will run in the browser process, and on other
-+// platforms, they'll all be run in the same utility process. Utility process
-+// crashes are detected and the utility process is automatically restarted.
-+class ChromeMojoProxyResolverFactory : public net::MojoProxyResolverFactory {
-+ public:
-+  static ChromeMojoProxyResolverFactory* GetInstance();
-+
-+  // Overridden from net::MojoProxyResolverFactory:
-+  std::unique_ptr<base::ScopedClosureRunner> CreateResolver(
-+      const std::string& pac_script,
-+      mojo::InterfaceRequest<net::interfaces::ProxyResolver> req,
-+      net::interfaces::ProxyResolverFactoryRequestClientPtr client) override;
-+
-+ private:
-+  friend struct base::DefaultSingletonTraits<ChromeMojoProxyResolverFactory>;
-+  ChromeMojoProxyResolverFactory();
-+  ~ChromeMojoProxyResolverFactory() override;
-+
-+  // Creates the proxy resolver factory. On desktop, creates a new utility
-+  // process before creating it out of process. On Android, creates it on the
-+  // current thread.
-+  void CreateFactory();
-+
-+  // Destroys |resolver_factory_|.
-+  void DestroyFactory();
-+
-+  // Invoked each time a proxy resolver is destroyed.
-+  void OnResolverDestroyed();
-+
-+  // Invoked once an idle timeout has elapsed after all proxy resolvers are
-+  // destroyed.
-+  void OnIdleTimeout();
-+
-+  net::interfaces::ProxyResolverFactoryPtr resolver_factory_;
-+
-+  base::WeakPtr<content::UtilityProcessHost> weak_utility_process_host_;
-+
-+  size_t num_proxy_resolvers_ = 0;
-+
-+  base::OneShotTimer idle_timer_;
-+
-+  base::ThreadChecker thread_checker_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(ChromeMojoProxyResolverFactory);
-+};
-+
-+#endif  // BRIGHTRAY_BROWSER_NET_CHROME_MOJO_PROXY_RESOLVER_FACTORY_H_
-changed in both
-  base   100644 7a798ae98e6c180c5a60e0a32ce6393532e83468 brightray/browser/net_log.cc
-  our    100644 fb443ea0b72b9659d98d1873fad1a714483bb13f brightray/browser/net_log.cc
-  their  100644 978667acb61b0330d6bf48bb7e814bbdef50b904 brightray/browser/net_log.cc
-@@ -45,11 +45,16 @@
-     return;
- 
-   base::FilePath log_path =
-+<<<<<<< .our
-       command_line->GetSwitchValuePath(network::switches::kLogNetLog);
-   if (log_path.empty())
-     return;
- 
-   std::unique_ptr<base::Value> constants(GetConstants());  // Net constants
-+=======
-+      command_line->GetSwitchValuePath(switches::kLogNetLog);
-+  std::unique_ptr<base::Value> constants(GetConstants());
-+>>>>>>> .their
-   net::NetLogCaptureMode capture_mode = net::NetLogCaptureMode::Default();
- 
-   file_net_log_observer_ =
-changed in both
-  base   100644 28e988f4b49cd35507e4972c19122bbe604f2690 brightray/browser/url_request_context_getter.cc
-  our    100644 c07ba80cbc522030af580adc5d8676ed31d592d1 brightray/browser/url_request_context_getter.cc
-  their  100644 972d8054221e95442456559ada46ba62e6f75b79 brightray/browser/url_request_context_getter.cc
-@@ -12,7 +12,13 @@
- #include "base/strings/string_util.h"
- #include "base/task_scheduler/post_task.h"
- #include "brightray/browser/browser_client.h"
-+<<<<<<< .our
- #include "brightray/browser/browser_context.h"
-+=======
-+#include "brightray/browser/net/chrome_mojo_proxy_resolver_factory.h"
-+#include "brightray/browser/net/devtools_network_controller_handle.h"
-+#include "brightray/browser/net/devtools_network_transaction_factory.h"
-+>>>>>>> .their
- #include "brightray/browser/net/require_ct_delegate.h"
- #include "brightray/browser/net_log.h"
- #include "brightray/common/switches.h"
-@@ -35,11 +41,20 @@
- #include "net/http/http_auth_preferences.h"
- #include "net/http/http_server_properties_impl.h"
- #include "net/log/net_log.h"
-+<<<<<<< .our
- #include "net/proxy_resolution/dhcp_pac_file_fetcher_factory.h"
- #include "net/proxy_resolution/pac_file_fetcher_impl.h"
- #include "net/proxy_resolution/proxy_config.h"
- #include "net/proxy_resolution/proxy_config_service.h"
- #include "net/proxy_resolution/proxy_service.h"
-+=======
-+#include "net/proxy/dhcp_proxy_script_fetcher_factory.h"
-+#include "net/proxy/proxy_config.h"
-+#include "net/proxy/proxy_config_service.h"
-+#include "net/proxy/proxy_script_fetcher_impl.h"
-+#include "net/proxy/proxy_service.h"
-+#include "net/proxy/proxy_service_mojo.h"
-+>>>>>>> .their
- #include "net/ssl/channel_id_service.h"
- #include "net/ssl/default_channel_id_store.h"
- #include "net/ssl/ssl_config_service_defaults.h"
-@@ -276,9 +291,18 @@
-       storage_->set_proxy_resolution_service(
-           net::ProxyResolutionService::CreateFixed(proxy_config));
-     } else {
-+<<<<<<< .our
-       storage_->set_proxy_resolution_service(
-           net::ProxyResolutionService::CreateUsingSystemProxyResolver(
-               std::move(proxy_config_service_), net_log_));
-+=======
-+      storage_->set_proxy_service(net::CreateProxyServiceUsingMojoFactory(
-+          ChromeMojoProxyResolverFactory::GetInstance(),
-+          std::move(proxy_config_service_),
-+          new net::ProxyScriptFetcherImpl(url_request_context_.get()),
-+          dhcp_factory.Create(url_request_context_.get()), host_resolver.get(),
-+          nullptr, url_request_context_->network_delegate()));
-+>>>>>>> .their
-     }
- 
-     std::vector<std::string> schemes;
-changed in both
-  base   100644 04033f451e045ee7211f0a7152d46c5010a55b72 brightray/browser/url_request_context_getter.h
-  our    100644 941a5782b14a941bb25a7a9ef6ca6d73f8bc3ec1 brightray/browser/url_request_context_getter.h
-  their  100644 1a26704d380ab7d113c4e2b0deb940a2d674f96b brightray/browser/url_request_context_getter.h
-@@ -76,11 +76,14 @@
-       const override;
- 
-   net::URLRequestJobFactory* job_factory() const { return job_factory_; }
-+<<<<<<< .our
-   void set_delegate(Delegate* delegate) { delegate_ = delegate; }
- 
-   // Discard reference to URLRequestContext and inform observers to
-   // shutdown. Must be called only on IO thread.
-   void NotifyContextShuttingDown(std::unique_ptr<ResourceContext>);
-+=======
-+>>>>>>> .their
- 
-  private:
-   friend class BrowserContext;
-changed in both
-  base   100644 08b203a23291ba0e2ba254873074178da4921123 brightray/common/application_info_win.cc
-  our    100644 a0256372bbdbbc1d77cb84885faab42a27f55c9f brightray/common/application_info_win.cc
-  their  100644 89ea0aceb6784119ad65783cfd1c019e7aedbf57 brightray/common/application_info_win.cc
-changed in both
-  base   100644 6a7d91f135c4b904e6d3172da91e7813793a2fba brightray/filenames.gypi
-  our    100644 b9e2d96175f8ee2d407db9c49b2e2b74756327de brightray/filenames.gypi
-  their  100644 e3f2aa5f5bc6f7443df50b88c1ab498d2de0a6f1 brightray/filenames.gypi
-@@ -47,6 +47,27 @@
-       'browser/media/media_device_id_salt.h',
-       'browser/media/media_stream_devices_controller.cc',
-       'browser/media/media_stream_devices_controller.h',
-+<<<<<<< .our
-+=======
-+      'browser/net/devtools_network_conditions.cc',
-+      'browser/net/devtools_network_conditions.h',
-+      'browser/net/devtools_network_controller.cc',
-+      'browser/net/devtools_network_controller.h',
-+      'browser/net/devtools_network_controller_handle.cc',
-+      'browser/net/devtools_network_controller_handle.h',
-+      'browser/net/devtools_network_interceptor.cc',
-+      'browser/net/devtools_network_interceptor.h',
-+      'browser/net/devtools_network_protocol_handler.cc',
-+      'browser/net/devtools_network_protocol_handler.h',
-+      'browser/net/devtools_network_transaction_factory.cc',
-+      'browser/net/devtools_network_transaction_factory.h',
-+      'browser/net/devtools_network_transaction.cc',
-+      'browser/net/devtools_network_transaction.h',
-+      'browser/net/devtools_network_upload_data_stream.cc',
-+      'browser/net/devtools_network_upload_data_stream.h',
-+      'browser/net/chrome_mojo_proxy_resolver_factory.cc',
-+      'browser/net/chrome_mojo_proxy_resolver_factory.h',
-+>>>>>>> .their
-       'browser/net/require_ct_delegate.cc',
-       'browser/net/require_ct_delegate.h',
-       'browser/net_log.cc',
-changed in both
-  base   100644 233e21047718c9bbbc9056f79aecf51657886b92 common.gypi
-  our    100644 676d1e904127066e4a3d313106f15406fcbed8b6 common.gypi
-  their  100644 acad39d991479147b9bc2ee2c5a51fbd8693a689 common.gypi
-changed in both
-  base   100644 e0e8b153ae51d917f37ba50967e2ef9e5b74254d docs/README.md
-  our    100644 f7b956e8feb95ceb64743ad260a1759e5a298afe docs/README.md
-  their  100644 436188887e5dad0a4ae291e5221e3eb8644bc56e docs/README.md
-@@ -16,6 +16,7 @@
- 
- * [Electron FAQ](faq.md)
- 
-+<<<<<<< .our
- ## Guides and Tutorials
- 
- * [Setting up the Development Environment](tutorial/development-environment.md)
-@@ -66,6 +67,12 @@
-   * [Mac App Store](tutorial/mac-app-store-submission-guide.md)
-   * [Windows Store](tutorial/windows-store-guide.md)
-   * [Snapcraft](tutorial/snapcraft.md)
-+=======
-+## Guides
-+
-+* [Glossary of Terms](glossary.md)
-+* [Support](tutorial/support.md)
-+>>>>>>> .their
- * [Security](tutorial/security.md)
-   * [Reporting Security Issues](tutorial/security.md#reporting-security-issues)
-   * [Chromium Security Issues and Upgrades](tutorial/security.md#chromium-security-issues-and-upgrades)
-changed in both
-  base   100644 926d1dde8ffc33d99c48cb55bbc2d0f9c2087ad4 docs/api/app.md
-  our    100644 14dc557e237404cbbd5bcebabb0e65486dc36926 docs/api/app.md
-  their  100644 40fdf2669442ca48fd1fc9a3b4aede6a199df4f1 docs/api/app.md
-changed in both
-  base   100644 2be2da597664c1913a665ad51de5becc42658d0f docs/api/browser-window.md
-  our    100644 dff61dd336f047cf2f6f06228b2df2b98ff2304d docs/api/browser-window.md
-  their  100644 96e3951db79478f51beb9c3f39c18f03a0c61a21 docs/api/browser-window.md
-changed in both
-  base   100644 f9aaaa90ddd7b8887c5ed3fea371bf175e28c2e7 docs/api/in-app-purchase.md
-  our    100644 6e612a72e27159602400f4efa30d5bc2f3aa668f docs/api/in-app-purchase.md
-  their  100644 67109dc0f92d8c537c9a2f1fa5fa2ce223137964 docs/api/in-app-purchase.md
-changed in both
-  base   100644 6aaa2bdd9b0ade84160b7449396d5ecd510f0e41 docs/api/web-contents.md
-  our    100644 8990fe2e97ab62eafdd3f7a4eb8ee782415124c5 docs/api/web-contents.md
-  their  100644 841acb4a506626c334004e28266ebed3845360d3 docs/api/web-contents.md
-@@ -1385,6 +1385,26 @@
- 
- Shows pop-up dictionary that searches the selected word on the page.
- 
-+<<<<<<< .our
-+=======
-+#### `contents.setSize(options)`
-+
-+Set the size of the page. This is only supported for `<webview>` guest contents.
-+
-+* `options` Object
-+  * `enableAutoSize` Boolean (optional) - true to make the webview container automatically
-+    resize within the bounds specified by the attributes normal, min and max.
-+  * `normal` [Size](structures/size.md) (optional) - Normal size of the page. This can be used in
-+    combination with the [`disableguestresize`](webview-tag.md#disableguestresize)
-+    attribute to manually resize the webview guest contents.
-+  * `min` [Size](structures/size.md) (optional) - Minimum size of the page. This can be used in
-+    combination with the [`disableguestresize`](webview-tag.md#disableguestresize)
-+    attribute to manually resize the webview guest contents.
-+  * `max` [Size](structures/size.md) (optional) - Maximium size of the page. This can be used in
-+    combination with the [`disableguestresize`](webview-tag.md#disableguestresize)
-+    attribute to manually resize the webview guest contents.
-+
-+>>>>>>> .their
- #### `contents.isOffscreen()`
- 
- Returns `Boolean` - Indicates whether *offscreen rendering* is enabled.
-changed in both
-  base   100644 afdff5615421e52b8750ea1de20b63941cbefb1f docs/development/releasing.md
-  our    100644 85a5fa0a935201521155dc60de45986db5829613 docs/development/releasing.md
-  their  100644 d27fb5022515cb80a829a80369fb6cb192003522 docs/development/releasing.md
-@@ -8,16 +8,25 @@
- information.
- 
- There are a handful of `*_TOKEN` environment variables needed by the release
-+<<<<<<< .our
- scripts:
- 
- * `ELECTRON_GITHUB_TOKEN`:
- Create this by visiting https://github.com/settings/tokens/new?scopes=repo
-+=======
-+scripts. Once you've generated these per-user tokens, you may want to keep
-+them in a local file that you can `source` when starting a release.
-+* `ELECTRON_GITHUB_TOKEN`:
-+Create as described at https://github.com/settings/tokens/new,
-+giving the token repo access scope.
-+>>>>>>> .their
- * `APPVEYOR_TOKEN`:
- Create a token from https://windows-ci.electronjs.org/api-token
- If you don't have an account, ask a team member to add you.
- * `CIRCLE_TOKEN`:
- Create a token from "Personal API Tokens" at https://circleci.com/account/api
- * `VSTS_TOKEN`:
-+<<<<<<< .our
- Create a Personal Access Token at https://github.visualstudio.com/_usersSettings/tokens or https://github.visualstudio.com/_details/security/tokens
- with the scope of `Build (read and execute)`.
- * `ELECTRON_S3_BUCKET`:
-@@ -29,6 +38,10 @@
- of the project. This file is gitignored, and will be loaded into the 
- environment by the release scripts.
- 
-+=======
-+Create a Personal Access Token at https://github.visualstudio.com/_usersSettings/tokens
-+with the scope of `Build (read and execute)`.
-+>>>>>>> .their
- 
- ## Determine which branch to release from
- 
-@@ -212,10 +225,13 @@
- ```sh
- $ npm run release -- --validateRelease
- ```
-+<<<<<<< .our
- Note, if you need to run `--validateRelease` more than once to check the assets,
- run it as above the first time, then `node ./script/release.js --validateRelease`
- for subsequent calls so that you don't have to rebuild each time you want to
- check the assets.
-+=======
-+>>>>>>> .their
- 
- ## Publish the release
- 
-@@ -258,6 +274,7 @@
- electron
- $ npm run publish-to-npm
- ```
-+<<<<<<< .our
- 
- After publishing, you can check the `latest` release:
- ```sh
-@@ -273,6 +290,8 @@
- ```sh
- $ npm dist-tag add electron@2.0.0 latest
- ```
-+=======
-+>>>>>>> .their
- 
- [the releases page]: https://github.com/electron/electron/releases
- [this bump commit]: https://github.com/electron/electron/commit/78ec1b8f89b3886b856377a1756a51617bc33f5a
-@@ -303,7 +322,11 @@
- ```
- 
- Additionally you can pass a job name to the script to run an individual job, eg:
-+<<<<<<< .our
- ```sh
-+=======
-+````sh
-+>>>>>>> .their
- node script/ci-release-build.js --ci=AppVeyor --ghRelease --job=electron-x64 TARGET_BRANCH
- ```
- 
-removed in local
-  base   100644 7dfc6084f5c94bfb924438e7efa50260d38b9144 docs/tutorial/planned-breaking-changes.md
-  their  100644 00e01f4f8c3a85f0e535a00c11e22f3595bff4b9 docs/tutorial/planned-breaking-changes.md
-added in both
-  our    100644 bdb3b8678485feabfad2ce23309f5bcac6050f31 docs/tutorial/support.md
-  their  100644 306876fee9314fbca1779a6c41ff8c6381753bda docs/tutorial/support.md
-@@ -91,4 +91,8 @@
- * Fedora 21
- * Debian 8
- 
-+<<<<<<< .our
- [arm-breaking-change]: https://github.com/electron/electron/blob/master/docs/api/breaking-changes.md#duplicate-arm-assets
-+=======
-+[arm-breaking-change]: https://github.com/electron/electron/blob/master/docs/tutorial/planned-breaking-changes.md#duplicate-arm-assets
-+>>>>>>> .their
-changed in both
-  base   100644 53ad35c63321e74a5023197ef2e075584e0f268b electron.gyp
-  our    100644 944ddab2a3fd879044e31677e4bac2843fffbdee electron.gyp
-  their  100644 188be9e6a50e1baedd5ef5d9e8de90e0d0ad83bc electron.gyp
-@@ -4,7 +4,11 @@
-     'product_name%': 'Electron',
-     'company_name%': 'GitHub, Inc',
-     'company_abbr%': 'github',
-+<<<<<<< .our
-     'version%': '4.0.0-nightly.20180821',
-+=======
-+    'version%': '2.0.5',
-+>>>>>>> .their
-     'js2c_input_dir': '<(SHARED_INTERMEDIATE_DIR)/js2c',
-   },
-   'includes': [
-changed in both
-  base   100644 ef3e8258584a5459b069e2006db44c0a8b66412d filenames.gypi
-  our    100644 f57860558f06b7e5d8a50f48cfc7e53044df0bc6 filenames.gypi
-  their  100644 acd43c97988952b9a2760b44d366bd87134a1d65 filenames.gypi
-@@ -292,6 +292,8 @@
-       'atom/browser/net/http_protocol_handler.h',
-       'atom/browser/net/js_asker.cc',
-       'atom/browser/net/js_asker.h',
-+      'atom/browser/net/resolve_proxy_helper.cc',
-+      'atom/browser/net/resolve_proxy_helper.h',
-       'atom/browser/net/url_request_about_job.cc',
-       'atom/browser/net/url_request_about_job.h',
-       'atom/browser/net/url_request_async_asar_job.cc',
-changed in both
-  base   100644 381a2a866372ebe06f374529c634af411c864ba0 lib/browser/api/app.js
-  our    100644 66f6ae651acf10fb19b8ec068fc5280850dd3d91 lib/browser/api/app.js
-  their  100644 1ea1daddca84dfeba57b7b7883ebb754b8508d2d lib/browser/api/app.js
-changed in both
-  base   100644 22565dcf9875b7f00acff192b10b05d27d6446a7 lib/browser/api/browser-window.js
-  our    100644 cb523496d65c7018c30054621cfdeb1281f9db6a lib/browser/api/browser-window.js
-  their  100644 c5faa0a2c131d633e7aea3a1850abab958d22a1d lib/browser/api/browser-window.js
-changed in both
-  base   100644 da5ff57a113f7a063d1409ff56003db4bd04e68a lib/browser/api/menu.js
-  our    100644 506e3525c10ce142cafe3fc1bf4de1c255e48503 lib/browser/api/menu.js
-  their  100644 a87e0cd0436da2899b6402a06d370e755c2aac47 lib/browser/api/menu.js
-@@ -47,7 +47,11 @@
-   this.delegate = delegate
- }
- 
-+<<<<<<< .our
- Menu.prototype.popup = function (options = {}) {
-+=======
-+Menu.prototype.popup = function (options) {
-+>>>>>>> .their
-   if (options == null || typeof options !== 'object') {
-     throw new TypeError('Options must be an object')
-   }
-@@ -156,7 +160,11 @@
- 
- Menu.buildFromTemplate = function (template) {
-   if (!Array.isArray(template)) {
-+<<<<<<< .our
-     throw new TypeError('Invalid template for Menu: Menu template must be an array')
-+=======
-+    throw new TypeError('Invalid template for Menu')
-+>>>>>>> .their
-   }
-   const menu = new Menu()
-   if (!areValidTemplateItems(template)) {
-merged
-  result 100644 bbbc1bbe1727dd30352c4836cea489145cd7ad7d lib/browser/api/screen.js
-  our    100644 8287bfa8bfdc6db322a05059fd5c8ba58e802db9 lib/browser/api/screen.js
-@@ -1,8 +1,17 @@
- const {EventEmitter} = require('events')
-+const {deprecate} = require('electron')
- const {screen, Screen} = process.atomBinding('screen')
- 
- // Screen is an EventEmitter.
- Object.setPrototypeOf(Screen.prototype, EventEmitter.prototype)
- EventEmitter.call(screen)
- 
-+const nativeFn = screen.getMenuBarHeight
-+screen.getMenuBarHeight = function () {
-+  if (!process.noDeprecations) {
-+    deprecate.warn('screen.getMenuBarHeight', 'screen.getPrimaryDisplay().workArea')
-+  }
-+  return nativeFn.call(this)
-+}
-+
- module.exports = screen
-changed in both
-  base   100644 0338b776f8938c1548ea9786385fe75db9db3403 lib/browser/guest-view-manager.js
-  our    100644 1e4029e39a981c85fb6ff18c5ccd52f81b3c56f2 lib/browser/guest-view-manager.js
-  their  100644 dd8e0ff1a9239e5c7a92f90a58da866c076011ca lib/browser/guest-view-manager.js
-changed in both
-  base   100644 50e890e225a315718d04a0028fb6bf2feb4092ce lib/browser/guest-window-manager.js
-  our    100644 7253c1942b0956ae6b9b0c80a23470fc26669b8a lib/browser/guest-window-manager.js
-  their  100644 ec77a7abdff1ba27e55da513c10d084d7978b7c0 lib/browser/guest-window-manager.js
-@@ -65,7 +65,11 @@
-   // Inherit certain option values from parent window
-   const webPreferences = embedder.getLastWebPreferences()
-   for (const [name, value] of inheritedWebPreferences) {
-+<<<<<<< .our
-     if (webPreferences[name] === value) {
-+=======
-+    if (embedder.getLastWebPreferences()[name] === value) {
-+>>>>>>> .their
-       options.webPreferences[name] = value
-     }
-   }
-changed in both
-  base   100644 24a86fdfee7b87cd8ad177363aec26b438fe79b7 lib/browser/init.js
-  our    100644 bed3d912ab8be3ca4f21de04e801bb42dc12a528 lib/browser/init.js
-  their  100644 344bcf16dceafc99dcc337a0d9113c8e764c6364 lib/browser/init.js
-changed in both
-  base   100644 bfb9091e6584c43a19bf6283a79027274053239b lib/browser/objects-registry.js
-  our    100644 f03a23d2f6910d6555bb9469180d1b60b94bc313 lib/browser/objects-registry.js
-  their  100644 b2667454152c271bfb088e50c29c096dd1f51c63 lib/browser/objects-registry.js
-@@ -26,10 +26,16 @@
-     const id = this.saveToStorage(obj)
- 
-     // Add object to the set of referenced objects.
-+<<<<<<< .our
-     const ownerKey = getOwnerKey(webContents, contextId)
-     let owner = this.owners[ownerKey]
-     if (!owner) {
-       owner = this.owners[ownerKey] = new Set()
-+=======
-+    let owner = this.owners[contextId]
-+    if (!owner) {
-+      owner = this.owners[contextId] = new Set()
-+>>>>>>> .their
-       this.registerDeleteListener(webContents, contextId)
-     }
-     if (!owner.has(id)) {
-@@ -49,9 +55,14 @@
-   // Dereference an object according to its ID.
-   // Note that an object may be double-freed (cleared when page is reloaded, and
-   // then garbage collected in old page).
-+<<<<<<< .our
-   remove (webContents, contextId, id) {
-     const ownerKey = getOwnerKey(webContents, contextId)
-     let owner = this.owners[ownerKey]
-+=======
-+  remove (contextId, id) {
-+    let owner = this.owners[contextId]
-+>>>>>>> .their
-     if (owner) {
-       // Remove the reference in owner.
-       owner.delete(id)
-@@ -61,14 +72,23 @@
-   }
- 
-   // Clear all references to objects refrenced by the WebContents.
-+<<<<<<< .our
-   clear (webContents, contextId) {
-     const ownerKey = getOwnerKey(webContents, contextId)
-     let owner = this.owners[ownerKey]
-+=======
-+  clear (contextId) {
-+    let owner = this.owners[contextId]
-+>>>>>>> .their
-     if (!owner) return
- 
-     for (let id of owner) this.dereference(id)
- 
-+<<<<<<< .our
-     delete this.owners[ownerKey]
-+=======
-+    delete this.owners[contextId]
-+>>>>>>> .their
-   }
- 
-   // Private: Saves the object into storage and assigns an ID for it.
-@@ -101,13 +121,21 @@
-     }
-   }
- 
-+<<<<<<< .our
-   // Private: Clear the storage when renderer process is destroyed.
-+=======
-+  // Private: Clear the storage when webContents is reloaded/navigated.
-+>>>>>>> .their
-   registerDeleteListener (webContents, contextId) {
-     const processId = webContents.getProcessId()
-     const listener = (event, deletedProcessId) => {
-       if (deletedProcessId === processId) {
-         webContents.removeListener('render-view-deleted', listener)
-+<<<<<<< .our
-         this.clear(webContents, contextId)
-+=======
-+        this.clear(contextId)
-+>>>>>>> .their
-       }
-     }
-     webContents.on('render-view-deleted', listener)
-changed in both
-  base   100644 c0cd09dea4273642aa780756985e9c90dbe164d3 lib/browser/rpc-server.js
-  our    100644 ff9f77321de3a4145946b67f3fe2a597f98e2510 lib/browser/rpc-server.js
-  their  100644 ea4f93fe5a877e35653c2c88d7a273936bf1d09d lib/browser/rpc-server.js
-@@ -84,7 +84,11 @@
- 
-   // Fill the meta object according to value's type.
-   if (meta.type === 'array') {
-+<<<<<<< .our
-     meta.members = value.map((el) => valueToMeta(sender, contextId, el, optimizeSimpleObject))
-+=======
-+    meta.members = value.map((el) => valueToMeta(sender, contextId, el))
-+>>>>>>> .their
-   } else if (meta.type === 'object' || meta.type === 'function') {
-     meta.name = value.constructor ? value.constructor.name : ''
- 
-@@ -210,9 +214,15 @@
-           return rendererFunctions.get(objectId)
-         }
- 
-+<<<<<<< .our
-         const processId = sender.getProcessId()
-         let callIntoRenderer = function (...args) {
-           if (!sender.isDestroyed() && processId === sender.getProcessId()) {
-+=======
-+        const webContentsId = sender.getId()
-+        let callIntoRenderer = function (...args) {
-+          if (!sender.isDestroyed() && webContentsId === sender.getId()) {
-+>>>>>>> .their
-             sender.send('ELECTRON_RENDERER_CALLBACK', contextId, meta.id, valueToMeta(sender, contextId, args))
-           } else {
-             removeRemoteListenersAndLogWarning(this, meta, callIntoRenderer)
-@@ -234,8 +244,14 @@
- // Call a function and send reply asynchronously if it's a an asynchronous
- // style function and the caller didn't pass a callback.
- const callFunction = function (event, contextId, func, caller, args) {
-+<<<<<<< .our
-   const funcMarkedAsync = v8Util.getHiddenValue(func, 'asynchronous')
-   const funcPassedCallback = typeof args[args.length - 1] === 'function'
-+=======
-+  let funcMarkedAsync, funcName, funcPassedCallback, ref, ret
-+  funcMarkedAsync = v8Util.getHiddenValue(func, 'asynchronous')
-+  funcPassedCallback = typeof args[args.length - 1] === 'function'
-+>>>>>>> .their
-   try {
-     if (funcMarkedAsync && !funcPassedCallback) {
-       args.push(function (ret) {
-@@ -243,7 +259,11 @@
-       })
-       func.apply(caller, args)
-     } else {
-+<<<<<<< .our
-       const ret = func.apply(caller, args)
-+=======
-+      ret = func.apply(caller, args)
-+>>>>>>> .their
-       event.returnValue = valueToMeta(event.sender, contextId, ret, true)
-     }
-   } catch (error) {
-@@ -302,7 +322,14 @@
-       throwRPCError(`Cannot call constructor on missing remote object ${id}`)
-     }
- 
-+<<<<<<< .our
-     event.returnValue = valueToMeta(event.sender, contextId, new constructor(...args))
-+=======
-+    // Call new with array of arguments.
-+    // http://stackoverflow.com/questions/1606797/use-of-apply-with-new-operator-is-this-possible
-+    let obj = new (Function.prototype.bind.apply(constructor, [null].concat(args)))()
-+    event.returnValue = valueToMeta(event.sender, contextId, obj)
-+>>>>>>> .their
-   } catch (error) {
-     event.returnValue = exceptionToMeta(event.sender, contextId, error)
-   }
-@@ -332,7 +359,14 @@
-       throwRPCError(`Cannot call constructor '${method}' on missing remote object ${id}`)
-     }
- 
-+<<<<<<< .our
-     event.returnValue = valueToMeta(event.sender, contextId, new object[method](...args))
-+=======
-+    // Call new with array of arguments.
-+    let constructor = object[method]
-+    let obj = new (Function.prototype.bind.apply(constructor, [null].concat(args)))()
-+    event.returnValue = valueToMeta(event.sender, contextId, obj)
-+>>>>>>> .their
-   } catch (error) {
-     event.returnValue = exceptionToMeta(event.sender, contextId, error)
-   }
-@@ -384,12 +418,21 @@
- })
- 
- ipcMain.on('ELECTRON_BROWSER_DEREFERENCE', function (event, contextId, id) {
-+<<<<<<< .our
-   objectsRegistry.remove(event.sender, contextId, id)
- })
- 
- ipcMain.on('ELECTRON_BROWSER_CONTEXT_RELEASE', (event, contextId) => {
-   objectsRegistry.clear(event.sender, contextId)
-   event.returnValue = null
-+=======
-+  objectsRegistry.remove(contextId, id)
-+})
-+
-+ipcMain.on('ELECTRON_BROWSER_CONTEXT_RELEASE', (e, contextId) => {
-+  objectsRegistry.clear(contextId)
-+  e.returnValue = null
-+>>>>>>> .their
- })
- 
- ipcMain.on('ELECTRON_BROWSER_GUEST_WEB_CONTENTS', function (event, contextId, guestInstanceId) {
-changed in both
-  base   100644 6dc774049def3acbd13b79dfd559c12d4eebd657 lib/common/api/crash-reporter.js
-  our    100644 1090d425e4c5cdf89a03d470718324ef16963472 lib/common/api/crash-reporter.js
-  their  100644 1b20fa52aab741e5dd34de7872f36798ec7c1c68 lib/common/api/crash-reporter.js
-changed in both
-  base   100644 a4f8072ed57642e1ca7d1066e132875da7ad3f46 lib/renderer/api/remote.js
-  our    100644 59117f8f2dd977fc1817a6b1d540b616ddcb0dae lib/renderer/api/remote.js
-  their  100644 4211201133db8cf2031cfb4180ff4e14a05794ed lib/renderer/api/remote.js
-@@ -10,7 +10,11 @@
- const remoteObjectCache = v8Util.createIDWeakMap()
- 
- // An unique ID that can represent current context.
-+<<<<<<< .our
- const contextId = v8Util.getHiddenValue(global, 'contextId')
-+=======
-+const contextId = v8Util.getContextId()
-+>>>>>>> .their
- 
- // Notify the main process when current context is going to be released.
- // Note that when the renderer process is destroyed, the message may not be
-changed in both
-  base   100644 1cb69436dd479baf54b9805c04c0c31b20f24fad lib/renderer/init.js
-  our    100644 2470a5e8be80e770b0c03f6a439a71e72ae12a1b lib/renderer/init.js
-  their  100644 93129849ae048c1c09f943b56e78562f46be04e8 lib/renderer/init.js
-changed in both
-  base   100644 d2da884f1d9caf3d633de25837cb2128f564f2fb lib/renderer/security-warnings.js
-  our    100644 b24f9e28b879154457be0342b9d4b44c0e651253 lib/renderer/security-warnings.js
-  their  100644 4f7d6ef9e596cdc3a5c7e1f2b89b24b9cd67de1d lib/renderer/security-warnings.js
-changed in both
-  base   100644 119391e79462bfa8bb1494039bcb3522d97acead lib/sandboxed_renderer/init.js
-  our    100644 30a3fa55216f6bf7588c3accc07b150a31163b7c lib/sandboxed_renderer/init.js
-  their  100644 b45a105091446f1b1c3afd2f4905ccf7c0ef67b5 lib/sandboxed_renderer/init.js
-@@ -35,10 +35,13 @@
-   ['url', require('url')]
- ])
- 
-+<<<<<<< .our
- const {
-   preloadSrc, preloadError, process: processProps
- } = electron.ipcRenderer.sendSync('ELECTRON_BROWSER_SANDBOX_LOAD')
- 
-+=======
-+>>>>>>> .their
- require('../renderer/web-frame-init')()
- 
- // Pass different process object to the preload script(which should not have
-@@ -78,6 +81,7 @@
-   require('../renderer/inspector')
- }
- 
-+<<<<<<< .our
- if (binding.guestInstanceId) {
-   process.guestInstanceId = parseInt(binding.guestInstanceId)
- }
-@@ -88,6 +92,8 @@
-   require('../renderer/web-view/web-view-attributes')
- }
- 
-+=======
-+>>>>>>> .their
- // Wrap the script into a function executed in global scope. It won't have
- // access to the current scope, so we'll expose a few objects as arguments:
- //
-@@ -107,6 +113,7 @@
- // and any `require('electron')` calls in `preload.js` will work as expected
- // since browserify won't try to include `electron` in the bundle, falling back
- // to the `preloadRequire` function above.
-+<<<<<<< .our
- if (preloadSrc) {
-   const preloadWrapperSrc = `(function(require, process, Buffer, global, setImmediate, clearImmediate) {
-   ${preloadSrc}
-@@ -118,4 +125,18 @@
-   preloadFn(preloadRequire, preloadProcess, Buffer, global, setImmediate, clearImmediate)
- } else if (preloadError) {
-   console.error(preloadError.stack)
-+=======
-+if (preloadPath) {
-+  const preloadSrc = fs.readFileSync(preloadPath).toString()
-+  const preloadWrapperSrc = `(function(require, process, Buffer, global, setImmediate) {
-+  ${preloadSrc}
-+  })`
-+
-+  // eval in window scope:
-+  // http://www.ecma-international.org/ecma-262/5.1/#sec-10.4.2
-+  const geval = eval
-+  const preloadFn = geval(preloadWrapperSrc)
-+  const {setImmediate} = require('timers')
-+  preloadFn(preloadRequire, preloadProcess, Buffer, global, setImmediate)
-+>>>>>>> .their
- }
-changed in both
-  base   100644 9d3b0da9c80b223e4a1188311a1121796eb9f7ae package.json
-  our    100644 c081cd89450cd50efba1ec280ff1349a96ea3ce0 package.json
-  their  100644 cf86809bf9e49ab808e2873a03b9c1f1607f20f0 package.json
-@@ -1,6 +1,10 @@
- {
-   "name": "electron",
-+<<<<<<< .our
-   "version": "4.0.0-nightly.20180821",
-+=======
-+  "version": "2.0.5",
-+>>>>>>> .their
-   "repository": "https://github.com/electron/electron",
-   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
-   "devDependencies": {
-@@ -13,7 +17,11 @@
-     "dugite": "^1.45.0",
-     "electabul": "~0.0.4",
-     "electron-docs-linter": "^2.3.4",
-+<<<<<<< .our
-     "electron-typescript-definitions": "^1.3.6",
-+=======
-+    "electron-typescript-definitions": "1.3.2",
-+>>>>>>> .their
-     "github": "^9.2.0",
-     "html-entities": "^1.2.1",
-     "husky": "^0.14.3",
-@@ -25,8 +33,12 @@
-     "remark-cli": "^4.0.0",
-     "remark-preset-lint-markdown-style-guide": "^2.1.1",
-     "request": "^2.68.0",
-+<<<<<<< .our
-     "semver": "^5.5.0",
-     "serve": "^6.5.8",
-+=======
-+    "serve": "^6.5.3",
-+>>>>>>> .their
-     "standard": "^10.0.0",
-     "standard-markdown": "^4.0.0",
-     "sumchecker": "^2.0.2",
-changed in both
-  base   100755 4465b85c135ddb55a673c5180e15f05f09dac57e script/bootstrap.py
-  our    100755 e4aaf89e216b0164f15882a3040e8cac70bf1fd9 script/bootstrap.py
-  their  100755 c6ebe4ef6975efd1f6184159cc3d9d079bf3628d script/bootstrap.py
-changed in both
-  base   100755 c97cd8336f7d7980911d0bdea93137e7bc95ba24 script/build.py
-  our    100755 fb2b95d3bb71a25ce1ca58acf596afdc0f2cc5bd script/build.py
-  their  100755 2a2231394207c28fcd2b86d3d9f9b079b08d637e script/build.py
-@@ -40,6 +40,12 @@
-   if is_verbose_mode():
-     ninja.append('-v')
- 
-+<<<<<<< .our
-+=======
-+  args = parse_args()
-+  if args.ninja_path:
-+    ninja = args.ninja_path
-+>>>>>>> .their
-   if args.libcc:
-     if ('D' not in args.configuration
-         or not os.path.exists(GCLIENT_DONE)
-@@ -93,12 +99,15 @@
-   parser.add_argument('--ninja-path',
-                       help='Path of ninja command to use.',
-                       required=False)
-+<<<<<<< .our
-   parser.add_argument('--compdb',
-                       help=(
-                         'Generate JSON compilation database. This will not '
-                         'trigger actual build. '
-                       ),
-                       action='store_true', default=False)
-+=======
-+>>>>>>> .their
-   return parser.parse_args()
- 
- 
-changed in both
-  base   100644 ec2459198bf254e7e380e4ae63097168041d0068 script/ci-release-build.js
-  our    100644 be9f9597387f5f8b7bfddc61c202f32ce4c6d478 script/ci-release-build.js
-  their  100644 1a15cd55b266363bea4394e970d274b2caa2d716 script/ci-release-build.js
-@@ -51,6 +51,10 @@
- }
- 
- async function circleCIcall (buildUrl, targetBranch, job, options) {
-+<<<<<<< .our
-+=======
-+  assert(process.env.CIRCLE_TOKEN, 'CIRCLE_TOKEN not found in environment')
-+>>>>>>> .their
-   console.log(`Triggering CircleCI to run build job: ${job} on branch: ${targetBranch} with release flag.`)
-   let buildRequest = {
-     'build_parameters': {
-@@ -80,6 +84,7 @@
-     console.log('Error calling CircleCI:', err)
-   })
-   console.log(`CircleCI release build request for ${job} successful.  Check ${circleResponse.build_url} for status.`)
-+<<<<<<< .our
- }
- 
- function buildAppVeyor (targetBranch, options) {
-@@ -92,6 +97,21 @@
-   }
- }
- 
-+=======
-+}
-+
-+function buildAppVeyor (targetBranch, options) {
-+  assert(process.env.APPVEYOR_TOKEN, 'APPVEYOR_TOKEN not found in environment')
-+  const validJobs = Object.keys(appVeyorJobs)
-+  if (options.job) {
-+    assert(validJobs.includes(options.job), `Unknown AppVeyor CI job name: ${options.job}.  Valid values are: ${validJobs}.`)
-+    callAppVeyor(targetBranch, options.job, options)
-+  } else {
-+    validJobs.forEach((job) => callAppVeyor(targetBranch, job, options))
-+  }
-+}
-+
-+>>>>>>> .their
- async function callAppVeyor (targetBranch, job, options) {
-   console.log(`Triggering AppVeyor to run build job: ${job} on branch: ${targetBranch} with release flag.`)
-   let environmentVariables = {}
-@@ -144,6 +164,10 @@
-     assert(vstsJobs.includes(options.job), `Unknown VSTS CI job name: ${options.job}. Valid values are: ${vstsJobs}.`)
-   }
-   console.log(`Triggering VSTS to run build on branch: ${targetBranch} with release flag.`)
-+<<<<<<< .our
-+=======
-+  assert(process.env.VSTS_TOKEN, 'VSTS_TOKEN not found in environment')
-+>>>>>>> .their
-   let environmentVariables = {}
- 
-   if (!options.ghRelease) {
-changed in both
-  base   100755 de3b9ffd48156379afd677b98c40c97532cb8367 script/create-dist.py
-  our    100755 4a6c0c7ce8f275175e48c4c380ff33627f7a5961 script/create-dist.py
-  their  100755 e8396a2e6d242b9deba3b6a7642060584cd1a605 script/create-dist.py
-@@ -147,7 +147,11 @@
- 
-   # Copy file and keep the executable bit.
-   shutil.copyfile(src, dest)
-+<<<<<<< .our
-   add_exec_bit(dest)
-+=======
-+  os.chmod(dest, os.stat(dest).st_mode | stat.S_IEXEC)
-+>>>>>>> .their
- 
- def copy_vcruntime_binaries():
-   arch = get_target_arch()
-@@ -302,7 +306,11 @@
-     dest = os.path.join(DIST_DIR, binary)
-     # Copy file and keep the executable bit.
-     shutil.copyfile(src, dest)
-+<<<<<<< .our
-     add_exec_bit(dest)
-+=======
-+    os.chmod(dest, os.stat(dest).st_mode | stat.S_IEXEC)
-+>>>>>>> .their
- 
-     dist_name = get_zip_name(binary, version)
-     zip_file = os.path.join(SOURCE_ROOT, 'dist', dist_name)
-added in both
-  our    100644 d8cfb2be8af17bc5536e521848c64b14b155015a script/find-release.js
-  their  100644 3cfd79aae1427c3b432076a869e6cf689d79871f script/find-release.js
-@@ -1,5 +1,8 @@
-+<<<<<<< .our
- if (!process.env.CI) require('dotenv-safe').load()
- 
-+=======
-+>>>>>>> .their
- const GitHub = require('github')
- const github = new GitHub()
- 
-@@ -14,7 +17,11 @@
-   github.authenticate({type: 'token', token: process.env.ELECTRON_GITHUB_TOKEN})
-   let releases = await github.repos.getReleases({
-     owner: 'electron',
-+<<<<<<< .our
-     repo: version.indexOf('nightly') > 0 ? 'nightlies' : 'electron'
-+=======
-+    repo: 'electron'
-+>>>>>>> .their
-   })
-   let targetRelease = releases.data.find(release => {
-     return release.tag_name === version
-changed in both
-  base   100644 76f39fc26973e01145f7758785778075ddbaa648 script/lib/dbus_mock.py
-  our    100644 9b9c8029cb75a9d84c632d04f234c2020542ca68 script/lib/dbus_mock.py
-  their  100644 00b1fd98d7837cfef60460f9d456a5cb8340761c script/lib/dbus_mock.py
-@@ -4,21 +4,29 @@
- import atexit
- import os
- import sys
-+<<<<<<< .our
-+=======
-+
-+>>>>>>> .their
- 
- 
- def stop():
-     DBusTestCase.stop_dbus(DBusTestCase.system_bus_pid)
-     DBusTestCase.stop_dbus(DBusTestCase.session_bus_pid)
-+<<<<<<< .our
- 
- def start():
-     dbusmock_log = sys.stdout if is_verbose_mode() else open(os.devnull, 'w')
- 
-     DBusTestCase.start_system_bus()
-     DBusTestCase.spawn_server_template('logind', None, dbusmock_log)
-+=======
-+>>>>>>> .their
- 
-     DBusTestCase.start_session_bus()
-     DBusTestCase.spawn_server_template('notification_daemon', None, dbusmock_log)
- 
-+<<<<<<< .our
- if __name__ == '__main__':
-     import subprocess
-     start()
-@@ -26,3 +34,14 @@
-         subprocess.check_call(sys.argv[1:])
-     finally:
-         stop()
-+=======
-+atexit.register(cleanup)
-+
-+dbusmock_log = sys.stdout if is_verbose_mode() else open(os.devnull, 'w')
-+
-+DBusTestCase.start_system_bus()
-+DBusTestCase.spawn_server_template('logind', None, dbusmock_log)
-+
-+DBusTestCase.start_session_bus()
-+DBusTestCase.spawn_server_template('notification_daemon', None, dbusmock_log)
-+>>>>>>> .their
-changed in both
-  base   100755 69882928765a56f50702a371af322710ef3ccf22 script/prepare-release.js
-  our    100755 72a28b719bf1ff7770692caef86c76746c4d8edf script/prepare-release.js
-  their  100755 8021fa331da3e8afd8810b8bb4a87eb39e859e75 script/prepare-release.js
-@@ -5,6 +5,10 @@
- const args = require('minimist')(process.argv.slice(2), {
-   boolean: ['automaticRelease', 'notesOnly', 'stable']
- })
-+<<<<<<< .our
-+=======
-+const assert = require('assert')
-+>>>>>>> .their
- const ciReleaseBuild = require('./ci-release-build')
- const { execSync } = require('child_process')
- const fail = '\u2717'.red
-@@ -21,7 +25,11 @@
- // via conventional-recommended-bump
- 
- if (!versionType && !args.notesOnly) {
-+<<<<<<< .our
-   console.log(`Usage: prepare-release versionType [stable | beta | nightly]` +
-+=======
-+  console.log(`Usage: prepare-release versionType [major | minor | patch | beta]` +
-+>>>>>>> .their
-      ` (--stable) (--notesOnly) (--automaticRelease) (--branch)`)
-   process.exit(1)
- }
-@@ -222,7 +230,11 @@
- }
- 
- async function verifyNewVersion () {
-+<<<<<<< .our
-   let newVersion = await getNewVersion(true)
-+=======
-+  let newVersion = getNewVersion(true)
-+>>>>>>> .their
-   let response
-   if (args.automaticRelease) {
-     response = 'y'
-@@ -258,6 +270,7 @@
- }
- 
- async function prepareRelease (isBeta, notesOnly) {
-+<<<<<<< .our
-   if (args.dryRun) {
-     let newVersion = await getNewVersion(true)
-     console.log(newVersion)
-@@ -278,6 +291,27 @@
-         process.exit(1)
-       }
-     }
-+=======
-+  if (args.automaticRelease && (pkg.version.indexOf('beta') === -1 ||
-+      versionType !== 'beta')) {
-+    console.log(`${fail} Automatic release is only supported for beta releases`)
-+    process.exit(1)
-+  }
-+  let currentBranch
-+  if (args.branch) {
-+    currentBranch = args.branch
-+  } else {
-+    currentBranch = await getCurrentBranch(gitDir)
-+  }
-+  if (notesOnly) {
-+    let releaseNotes = await getReleaseNotes(currentBranch)
-+    console.log(`Draft release notes are: \n${releaseNotes}`)
-+  } else {
-+    await verifyNewVersion()
-+    await createRelease(currentBranch, isBeta)
-+    await pushRelease(currentBranch)
-+    await runReleaseBuilds(currentBranch)
-+>>>>>>> .their
-   }
- }
- 
-changed in both
-  base   100755 9863ef912cd5a940428e9ac22e1993494b2b1828 script/release.js
-  our    100755 84e00ad4f309201f151c3f8fcbaf9ee536c9b6cb script/release.js
-  their  100755 5858caf215a38e09d98c342bd74252b3dbd7ee71 script/release.js
-@@ -95,6 +95,10 @@
-     `electron-${version}-linux-armv7l.zip`,
-     `electron-${version}-linux-ia32-symbols.zip`,
-     `electron-${version}-linux-ia32.zip`,
-+<<<<<<< .our
-+=======
-+//    `electron-${version}-linux-mips64el.zip`,
-+>>>>>>> .their
-     `electron-${version}-linux-x64-symbols.zip`,
-     `electron-${version}-linux-x64.zip`,
-     `electron-${version}-mas-x64-dsym.zip`,
-@@ -112,6 +116,10 @@
-     `ffmpeg-${version}-linux-arm64.zip`,
-     `ffmpeg-${version}-linux-armv7l.zip`,
-     `ffmpeg-${version}-linux-ia32.zip`,
-+<<<<<<< .our
-+=======
-+//    `ffmpeg-${version}-linux-mips64el.zip`,
-+>>>>>>> .their
-     `ffmpeg-${version}-linux-x64.zip`,
-     `ffmpeg-${version}-mas-x64.zip`,
-     `ffmpeg-${version}-win32-ia32.zip`,
-@@ -180,7 +188,15 @@
- function uploadIndexJson () {
-   console.log('Uploading index.json to S3.')
-   let scriptPath = path.join(__dirname, 'upload-index-json.py')
-+<<<<<<< .our
-   runScript(scriptPath, [pkgVersion])
-+=======
-+  let scriptArgs = []
-+  if (args.automaticRelease) {
-+    scriptArgs.push('-R')
-+  }
-+  runScript(scriptPath, scriptArgs)
-+>>>>>>> .their
-   console.log(`${pass} Done uploading index.json to S3.`)
- }
- 
-changed in both
-  base   100755 1f90ed795fcc3e739061cf4ae5c8ab9ea95a1236 script/test.py
-  our    100755 46cada435e1bd6ecaa2111cdf29e5aeb834b227e script/test.py
-  their  100755 cb17102557dca975208140b479168906100cfd74 script/test.py
-changed in both
-  base   100755 a35eb2f5b90272c8369bcfd511f976a4f64fa57f script/update-clang.sh
-  our    100755 0c7ab60533381e33152b8735aaccf41d5f0d6676 script/update-clang.sh
-  their  100755 6e4cf08216616a4b6a2ee896bba47b1ba5d469b5 script/update-clang.sh
-changed in both
-  base   100755 f5e5b3c7a6adcaf7005ad9242c1664ad2f243d1f script/upload-index-json.py
-  our    100755 55d0675d0707d34c806847f3a64aa77f20a4830d script/upload-index-json.py
-  their  100755 479e46bb811695482f5ea62060e4bef02af505f1 script/upload-index-json.py
-@@ -8,7 +8,6 @@
- from lib.util import s3put, scoped_cwd, safe_mkdir
- 
- SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
--OUT_DIR     = os.path.join(SOURCE_ROOT, 'out', 'D')
- 
- BASE_URL = 'https://electron-metadumper.herokuapp.com/?version='
- 
-@@ -35,6 +34,7 @@
-     raise Exception("Please set META_DUMPER_AUTH_HEADER")
-   # Upload the index.json.
-   with scoped_cwd(SOURCE_ROOT):
-+<<<<<<< .our
-     safe_mkdir(OUT_DIR)
-     index_json = os.path.relpath(os.path.join(OUT_DIR, 'index.json'))
- 
-@@ -42,9 +42,27 @@
- 
-     with open(index_json, "w") as f:
-       f.write(new_content)
-+=======
-+    if len(sys.argv) == 2 and sys.argv[1] == '-R':
-+      config = 'R'
-+    else:
-+      config = 'D'
-+    out_dir = os.path.join(SOURCE_ROOT, 'out', config)
-+    if sys.platform == 'darwin':
-+      electron = os.path.join(out_dir, '{0}.app'.format(PRODUCT_NAME),
-+                                'Contents', 'MacOS', PRODUCT_NAME)
-+    elif sys.platform == 'win32':
-+      electron = os.path.join(out_dir, '{0}.exe'.format(PROJECT_NAME))
-+    else:
-+      electron = os.path.join(out_dir, PROJECT_NAME)
-+    index_json = os.path.relpath(os.path.join(out_dir, 'index.json'))
-+    execute([electron,
-+             os.path.join('tools', 'dump-version-info.js'),
-+             index_json])
-+>>>>>>> .their
- 
-     bucket, access_key, secret_key = s3_config()
--    s3put(bucket, access_key, secret_key, OUT_DIR, 'atom-shell/dist',
-+    s3put(bucket, access_key, secret_key, out_dir, 'atom-shell/dist',
-           [index_json])
- 
- 
-changed in both
-  base   100755 4da630433812b51ff0ebbdf89f68c71d90ab8046 script/upload.py
-  our    100755 2d9eaa201265971ca01acaea6e84a440e5db0532 script/upload.py
-  their  100755 48f8d650eae7a9d46b45a353d68e0e7bef33d219 script/upload.py
-@@ -37,7 +37,11 @@
-   args = parse_args()
-   if  args.upload_to_s3:
-     utcnow = datetime.datetime.utcnow()
-+<<<<<<< .our
-     args.upload_timestamp = utcnow.strftime('%Y%m%d')
-+=======
-+    args.upload_timestamp = utcnow.strftime('%Y-%m-%d_%H:%M:%S')
-+>>>>>>> .their
- 
-   if not dist_newer_than_head():
-     run_python_script('create-dist.py')
-@@ -79,6 +83,14 @@
-   upload_electron(release, os.path.join(DIST_DIR, chromedriver), args)
-   mksnapshot = get_zip_name('mksnapshot', ELECTRON_VERSION)
-   upload_electron(release, os.path.join(DIST_DIR, mksnapshot), args)
-+<<<<<<< .our
-+=======
-+
-+  if get_target_arch().startswith('arm'):
-+    # Upload the x64 binary for arm/arm64 mksnapshot
-+    mksnapshot = get_zip_name('mksnapshot', ELECTRON_VERSION, 'x64')
-+    upload_electron(release, os.path.join(DIST_DIR, mksnapshot), args)
-+>>>>>>> .their
- 
-   if get_target_arch().startswith('arm'):
-     # Upload the x64 binary for arm/arm64 mksnapshot
-@@ -170,6 +182,16 @@
-   # Upload the checksum file.
-   upload_sha256_checksum(args.version, file_path)
- 
-+<<<<<<< .our
-+=======
-+  # Upload ARM assets without the v7l suffix for backwards compatibility
-+  # TODO Remove for 2.0
-+  if 'armv7l' in filename:
-+    arm_filename = filename.replace('armv7l', 'arm')
-+    arm_file_path = os.path.join(os.path.dirname(file_path), arm_filename)
-+    shutil.copy2(file_path, arm_file_path)
-+    upload_electron(release, arm_file_path, args)
-+>>>>>>> .their
- 
- def upload_io_to_github(release, filename, filepath, version):
-   print 'Uploading %s to Github' % \
-changed in both
-  base   100644 0eda951b15d6fff609b6612589e222adb4f0720e spec/api-app-spec.js
-  our    100644 d224eda2989332c18d655cef05a8bacc2eb6d4b8 spec/api-app-spec.js
-  their  100644 5c2e0a0c7e6184e780b7ec031f9788f1f54eaca9 spec/api-app-spec.js
-@@ -9,7 +9,10 @@
- const {ipcRenderer, remote} = require('electron')
- const {closeWindow} = require('./window-helpers')
- 
-+<<<<<<< .our
- const {expect} = chai
-+=======
-+>>>>>>> .their
- const {app, BrowserWindow, Menu, ipcMain} = remote
- 
- const isCI = remote.getGlobal('isCi')
-@@ -186,11 +189,19 @@
- 
-       // Singleton will send us greeting data to let us know it's running.
-       // After that, ask it to exit gracefully and confirm that it does.
-+<<<<<<< .our
-       appProcess.stdout.on('data', data => appProcess.kill())
-       appProcess.on('exit', (code, sig) => {
-         const message = `code:\n${code}\nsig:\n${sig}`
-         expect(code).to.equal(0, message)
-         expect(sig).to.be.null(message)
-+=======
-+      appProcess.stdout.on('data', (data) => appProcess.kill())
-+      appProcess.on('exit', (code, sig) => {
-+        let message = ['code:', code, 'sig:', sig].join('\n')
-+        assert.equal(code, 0, message)
-+        assert.equal(sig, null, message)
-+>>>>>>> .their
-         done()
-       })
-     })
-@@ -948,4 +959,18 @@
-       return expect(app.whenReady()).to.be.eventually.fulfilled
-     })
-   })
-+
-+  describe('dock.setMenu', () => {
-+    before(function () {
-+      if (process.platform !== 'darwin') {
-+        this.skip()
-+      }
-+    })
-+
-+    it('keeps references to the menu', () => {
-+      app.dock.setMenu(new Menu())
-+      const v8Util = process.atomBinding('v8_util')
-+      v8Util.requestGarbageCollectionForTesting()
-+    })
-+  })
- })
-changed in both
-  base   100644 ab96021ebf4c4360fa581b5a695249456a9afeda spec/api-browser-view-spec.js
-  our    100644 968912a4abf3d759a1363e2420d2c21b7923dbd6 spec/api-browser-view-spec.js
-  their  100644 df239a8914527a2d62f652b878c97a7791f63a9d spec/api-browser-view-spec.js
-@@ -44,9 +44,15 @@
-   describe('BrowserView.isDestroyed()', () => {
-     it('returns correct value', () => {
-       view = new BrowserView()
-+<<<<<<< .our
-       expect(view.isDestroyed()).to.be.false()
-       view.destroy()
-       expect(view.isDestroyed()).to.be.true()
-+=======
-+      assert.ok(!view.isDestroyed())
-+      view.destroy()
-+      assert.ok(view.isDestroyed())
-+>>>>>>> .their
-     })
-   })
- 
-changed in both
-  base   100644 3033eb6a1f6cca3cf4874a54dd217ec62d2d82cd spec/api-browser-window-spec.js
-  our    100644 f4cba12ec19d224bc46fca898db42a99baf4972e spec/api-browser-window-spec.js
-  their  100644 4807094095a591ca716d520aef51a25af6ff9687 spec/api-browser-window-spec.js
-@@ -409,12 +409,34 @@
-     })
-   })
- 
-+<<<<<<< .our
-   // TODO(alexeykuzmin): [Ch66] Enable the test. Passes locally.
-   xdescribe('BrowserWindow.getFocusedWindow()', (done) => {
-+=======
-+  describe('BrowserWindow.getFocusedWindow()', (done) => {
-+>>>>>>> .their
-     it('returns the opener window when dev tools window is focused', (done) => {
-       w.show()
-       w.webContents.once('devtools-focused', () => {
-         assert.deepEqual(BrowserWindow.getFocusedWindow(), w)
-+<<<<<<< .our
-+=======
-+        done()
-+      })
-+      w.webContents.openDevTools({mode: 'undocked'})
-+    })
-+  })
-+
-+  describe('BrowserWindow.capturePage(rect, callback)', () => {
-+    it('calls the callback with a Buffer', (done) => {
-+      w.capturePage({
-+        x: 0,
-+        y: 0,
-+        width: 100,
-+        height: 100
-+      }, (image) => {
-+        assert.equal(image.isEmpty(), true)
-+>>>>>>> .their
-         done()
-       })
-       w.webContents.openDevTools({mode: 'undocked'})
-@@ -453,6 +475,29 @@
-       // Values can be 0,2,3,4, or 6. We want 6, which is RGB + Alpha
-       expect(imgBuffer[25]).to.equal(6)
-     })
-+
-+    it('preserves transparency', (done) => {
-+      w.close()
-+      const width = 400
-+      const height = 400
-+      w = new BrowserWindow({
-+        show: false,
-+        width: width,
-+        height: height,
-+        transparent: true
-+      })
-+      w.loadURL('data:text/html,<html><body background-color: rgba(255,255,255,0)></body></html>')
-+      w.once('ready-to-show', () => {
-+        w.show()
-+        w.capturePage((image) => {
-+          let imgBuffer = image.toPNG()
-+          // Check 25th byte in the PNG
-+          // Values can be 0,2,3,4, or 6. We want 6, which is RGB + Alpha
-+          assert.equal(imgBuffer[25], 6)
-+          done()
-+        })
-+      })
-+    })
-   })
- 
-   describe('BrowserWindow.setSize(width, height)', () => {
-@@ -763,6 +808,7 @@
-         w.addTabbedWindow(w)
-       }, /AddTabbedWindow cannot be called by a window on itself./)
-     })
-+<<<<<<< .our
-   })
- 
-   describe('BrowserWindow.setWindowButtonVisibility()', () => {
-@@ -790,6 +836,8 @@
-         w.setWindowButtonVisibility(true)
-       }, /Not supported for this window/)
-     })
-+=======
-+>>>>>>> .their
-   })
- 
-   describe('BrowserWindow.setVibrancy(type)', () => {
-changed in both
-  base   100644 b4d55cd70b70b42d52a026ff7b4ff3c47d1671df spec/api-crash-reporter-spec.js
-  our    100644 dd31b91e1244785412b87db96bb141599e5ccb0f spec/api-crash-reporter-spec.js
-  their  100644 ffa3c0370595f32b0c7d476b82bea133d6a87000 spec/api-crash-reporter-spec.js
-@@ -266,6 +266,7 @@
-   describe('getLastCrashReport', () => {
-     it('correctly returns the most recent report', () => {
-       const reports = crashReporter.getUploadedReports()
-+<<<<<<< .our
-       expect(reports).to.be.an('array')
-       expect(reports).to.have.lengthOf.at.least(2,
-           'There are not enough reports for this test')
-@@ -275,16 +276,31 @@
- 
-       // Let's find the newest report.
-       const {report: newestReport} = reports.reduce((acc, cur) => {
-+=======
-+      const lastReport = crashReporter.getLastCrashReport()
-+
-+      // Let's find the newest report
-+      const newestReport = reports.reduce((acc, cur) => {
-+>>>>>>> .their
-         const timestamp = new Date(cur.date).getTime()
-         return (timestamp > acc.timestamp)
-           ? { report: cur, timestamp: timestamp }
-           : acc
-+<<<<<<< .our
-       }, { timestamp: -Infinity })
-       assert(newestReport, 'Hey!')
- 
-       expect(lastReport.date.getTime()).to.be.equal(
-           newestReport.date.getTime(),
-           'Last report is not the newest.')
-+=======
-+      }, { timestamp: 0 })
-+
-+      assert(reports.length > 1, 'has more than 1 report')
-+      assert(lastReport != null, 'found a last report')
-+      assert(lastReport.date.toString() === newestReport.report.date.toString(),
-+        'last report is correct')
-+>>>>>>> .their
-     })
-   })
- 
-changed in both
-  base   100644 667f098bc4b9974a142435e7d3ddb762ac0f54a2 spec/api-menu-spec.js
-  our    100644 ed2749700c6c8bf299f507d52606c1ae3f597e5c spec/api-menu-spec.js
-  their  100644 3efb6ed8745843bb7e221fe25b3c75761a085759 spec/api-menu-spec.js
-@@ -649,6 +649,7 @@
-     })
- 
-     it('throws an error if options is not an object', () => {
-+<<<<<<< .our
-       expect(() => {
-         menu.popup('this is a string, not an object')
-       }).to.throw(/Options must be an object/)
-@@ -658,6 +659,11 @@
-       expect(() => {
-         menu.popup({})
-       }).to.not.throw()
-+=======
-+      assert.throws(() => {
-+        menu.popup()
-+      }, /Options must be an object/)
-+>>>>>>> .their
-     })
- 
-     it('should emit menu-will-show event', (done) => {
-added in both
-  our    100644 9ab56d88e50ae5891364cb271362e5ec0c0edd26 spec/api-notification-dbus-spec.js
-  their  100644 81c1b68f31d0c9490742d3bd4b4227abaaf72ca3 spec/api-notification-dbus-spec.js
-@@ -6,7 +6,11 @@
- //
- // See https://pypi.python.org/pypi/python-dbusmock to read about dbusmock.
- 
-+<<<<<<< .our
- const {expect} = require('chai')
-+=======
-+const assert = require('assert')
-+>>>>>>> .their
- const dbus = require('dbus-native')
- const Promise = require('bluebird')
- 
-@@ -27,12 +31,20 @@
-   before(async () => {
-     // init app
-     app.setName(appName)
-+<<<<<<< .our
-     app.setDesktopName(`${appName}.desktop`)
-+=======
-+    app.setDesktopName(appName + '.desktop')
-+>>>>>>> .their
-     // init dbus
-     const path = '/org/freedesktop/Notifications'
-     const iface = 'org.freedesktop.DBus.Mock'
-     const bus = dbus.sessionBus()
-+<<<<<<< .our
-     console.log(`session bus: ${process.env.DBUS_SESSION_BUS_ADDRESS}`)
-+=======
-+    console.log('session bus: ' + process.env.DBUS_SESSION_BUS_ADDRESS)
-+>>>>>>> .their
-     const service = bus.getService(serviceName)
-     const getInterface = Promise.promisify(service.getInterface, {context: service})
-     mock = await getInterface(path, iface)
-@@ -48,10 +60,17 @@
-     app.setVersion(realAppVersion)
-   })
- 
-+<<<<<<< .our
-   describe(`Notification module using ${serviceName}`, () => {
-     function onMethodCalled (done) {
-       function cb (name) {
-         console.log(`onMethodCalled: ${name}`)
-+=======
-+  describe('Notification module using ' + serviceName, () => {
-+    function onMethodCalled (done) {
-+      function cb (name) {
-+        console.log('onMethodCalled: ' + name)
-+>>>>>>> .their
-         if (name === 'Notify') {
-           mock.removeListener('MethodCalled', cb)
-           console.log('done')
-@@ -83,7 +102,11 @@
-       }
-     }
- 
-+<<<<<<< .our
-     before(done => {
-+=======
-+    before((done) => {
-+>>>>>>> .their
-       mock.on('MethodCalled', onMethodCalled(done))
-       // lazy load Notification after we listen to MethodCalled mock signal
-       Notification = require('electron').remote.Notification
-@@ -98,6 +121,7 @@
-       n.show()
-     })
- 
-+<<<<<<< .our
-     it(`should call ${serviceName} to show notifications`, async () => {
-       const calls = await getCalls()
-       expect(calls).to.be.an('array').of.lengthOf.at.least(1)
-@@ -108,6 +132,16 @@
- 
-       let args = unmarshalDBusNotifyArgs(lastCall[2])
-       expect(args).to.deep.equal({
-+=======
-+    it('should call ' + serviceName + ' to show notifications', async () => {
-+      const calls = await getCalls()
-+      assert(calls.length >= 1)
-+      let lastCall = calls[calls.length - 1]
-+      let methodName = lastCall[1]
-+      assert.equal(methodName, 'Notify')
-+      let args = unmarshalDBusNotifyArgs(lastCall[2])
-+      assert.deepEqual(args, {
-+>>>>>>> .their
-         app_name: appName,
-         replaces_id: 0,
-         app_icon: '',
-changed in both
-  base   100644 122170292838e951ade4989669c87a7531e89ba7 spec/api-web-contents-spec.js
-  our    100644 be02cb3f84001a541d64b11fe6eda50fc32e8afd spec/api-web-contents-spec.js
-  their  100644 cbb45f5d84f1b11c8c27c56515d5daffa23d0c04 spec/api-web-contents-spec.js
-@@ -122,6 +122,7 @@
-     })
-   })
- 
-+<<<<<<< .our
-   // Disabled because flaky. See #13969
-   xdescribe('isCurrentlyAudible() API', () => {
-     it('returns whether audio is playing', async () => {
-@@ -138,6 +139,8 @@
-     })
-   })
- 
-+=======
-+>>>>>>> .their
-   describe('getWebPreferences() API', () => {
-     it('should not crash when called for devTools webContents', (done) => {
-       w.webContents.openDevTools()
-@@ -730,6 +733,7 @@
-     })
-   })
- 
-+<<<<<<< .our
-   describe('referrer', () => {
-     it('propagates referrer information to new target=_blank windows', (done) => {
-       const server = http.createServer((req, res) => {
-@@ -776,6 +780,8 @@
-     })
-   })
- 
-+=======
-+>>>>>>> .their
-   describe('webframe messages in sandboxed contents', () => {
-     it('responds to executeJavaScript', (done) => {
-       w.destroy()
-changed in both
-  base   100644 2d388ca3b5744ea69d96ef71da6ade70e3dd001b spec/chromium-spec.js
-  our    100644 d90269769d269e4054d25cba4b6c4ac8a1929aa6 spec/chromium-spec.js
-  their  100644 25bef2e689e5ecbcd1485a042e84691db9400659 spec/chromium-spec.js
-@@ -319,8 +319,12 @@
-       b = window.open(windowUrl, '', 'nodeIntegration=no,show=no')
-     })
- 
-+<<<<<<< .our
-     // TODO(codebytere): re-enable this test
-     xit('disables node integration when it is disabled on the parent window for chrome devtools URLs', (done) => {
-+=======
-+    it('disables node integration when it is disabled on the parent window for chrome devtools URLs', (done) => {
-+>>>>>>> .their
-       let b
-       app.once('web-contents-created', (event, contents) => {
-         contents.once('did-finish-load', () => {
-changed in both
-  base   100644 07176e0097efa17e8f8aea5bb059a2739b8c3336 spec/fixtures/api/singleton/main.js
-  our    100644 3202a7a180d6d48c70706d5ef244652872b24bbc spec/fixtures/api/singleton/main.js
-  their  100644 cbf3da1117d91eb8df1b1e6363737a210b7eae78 spec/fixtures/api/singleton/main.js
-@@ -3,8 +3,11 @@
- app.once('ready', () => {
-   console.log('started')  // ping parent
- })
-+<<<<<<< .our
- 
- const gotTheLock = app.requestSingleInstanceLock()
-+=======
-+>>>>>>> .their
- 
- app.on('second-instance', () => {
-   setImmediate(() => app.exit(0))
-changed in both
-  base   100644 cfe840ca0a44c5766509b2865034d98e375da1a1 spec/modules-spec.js
-  our    100644 b996b8f4839bff2160bffb69e55263b16a4178d7 spec/modules-spec.js
-  their  100644 28f2602acff67b2da9accd0574d64d386e0795a7 spec/modules-spec.js
-changed in both
-  base   100644 e2d7d001eb49a9b01edcf9590ccdcb7ac8cc669c spec/node-spec.js
-  our    100644 9bb03494a56ffacec075c40bebde39a3b57ac734 spec/node-spec.js
-  their  100644 f053aa4dbadbbc216d98f3a985f29069bb2e4786 spec/node-spec.js
-changed in both
-  base   100644 feac23db7e06d3e49f8d5be7e9b3f08a204f262f spec/security-warnings-spec.js
-  our    100644 6315a9420e01b5db19596f0dd5731d47ce02acf6 spec/security-warnings-spec.js
-  their  100644 85fd0973b60cd6e27becbeef75415560b4061d24 spec/security-warnings-spec.js
-@@ -142,7 +142,11 @@
-       }
-     })
-     w.webContents.once('console-message', (e, level, message) => {
-+<<<<<<< .our
-       assert(message.includes('enableBlinkFeatures'), message)
-+=======
-+      assert(message.includes('blinkFeatures'), message)
-+>>>>>>> .their
-       done()
-     })
- 
-changed in both
-  base   100644 ca5cc28d4f9f860947454dfc964208dd13ba1434 spec/static/index.html
-  our    100644 fc1e153c0af2908cf7ee4c3ea4f05522de04f0f8 spec/static/index.html
-  their  100644 e9d779f061cd5bdf00667d0b7942c6c30de81092 spec/static/index.html
-@@ -51,7 +51,11 @@
-   if (!process.env.MOCHA_REPORTER) {
-     mocha.ui('bdd').reporter(isCi ? 'tap' : 'html')
-   }
--  mocha.timeout(isCi ? 30000 : 10000)
-+  if (process.env.MOCHA_TIMEOUT && process.env.MOCHA_TIMEOUT > 0) {
-+    mocha.timeout(process.env.MOCHA_TIMEOUT)
-+  } else {
-+    mocha.timeout(isCi ? 30000 : 10000)
-+  }
- 
-   const query = Mocha.utils.parseQuery(window.location.search || '')
-   if (query.grep) mocha.grep(query.grep)
-changed in both
-  base   100644 6580f18a1ad9e53ab3f2ae88cb7ea023bcf9579c toolchain.gypi
-  our    100644 697add78e42191741cee1b015cdcf4f801c570e7 toolchain.gypi
-  their  100644 8ed945a57c8875bae06cef74dc5d44afcc586d1d toolchain.gypi
-changed in both
-  base   160000 db1b314c019f6acbd4d1be273b63521cc6051d3c vendor/libchromiumcontent
-  our    160000 c85470a1c379b1c4bedb372c146521bc4be9b75d vendor/libchromiumcontent
-  their  160000 0f50f5e3b3fff53d53f72eb39293e01083480311 vendor/libchromiumcontent
-removed in local
-  base   160000 99d9e262eb36cb9dc8e83f61e026d2a7ad1e96ab vendor/native_mate
-  their  160000 6a3d238b7e1e3742f2bb495336a84021d927a24f vendor/native_mate
-changed in both
-  base   160000 bf06b641574a6e2a8357ca4b44defac4a83f1dda vendor/node
-  our    160000 ece0a06ac8147efb5b5af431c21f312f1884616e vendor/node
-  their  160000 f2bcc6b58293287e2a6e592bd296aa55bb37b801 vendor/node
-added in both
-  our    100644 84bd69c2b2868ac23bc30061aa208ad38fbb9506 vsts.yml
-  their  100644 5209acdec2eb8557ea55ce5281b7999b974aa5b6 vsts.yml
-@@ -54,21 +54,32 @@
-       script/test.py --ci --rebuild_native_modules
-     fi
-   name: Test
-+<<<<<<< .our
-   condition: or(ne(variables['ELECTRON_RELEASE'], '1'), eq(variables['UPLOAD_TO_S3'], '1'))
-+=======
-+>>>>>>> .their
- 
- - bash: |
-     echo 'Verifying ffmpeg on build'
-     if [ "$ELECTRON_RELEASE" == "1" ]; then
-+<<<<<<< .our
-       script/verify-ffmpeg.py -c R
-+=======
-+      script/verify-ffmpeg.py -R
-+>>>>>>> .their
-     else
-       script/verify-ffmpeg.py
-     fi
-   name: Verify_FFmpeg
-+<<<<<<< .our
-   condition: or(ne(variables['ELECTRON_RELEASE'], '1'), eq(variables['UPLOAD_TO_S3'], '1'))
-+=======
-+>>>>>>> .their
- 
- - task: PublishTestResults@2
-   displayName: Publish Test Results
-   inputs:
-+<<<<<<< .our
-     testResultsFiles: '**/test-*.xml'
-   condition: and(always(), eq(variables['MOCHA_FILE'], 'test-results.xml'))
- 
-@@ -93,5 +104,18 @@
-   inputs:
-     PathtoPublish: '$(Build.SourcesDirectory)/out'
-     ArtifactName: out
-+=======
-+    testResultsFiles: 'test-results.xml'
-+    searchFolder: junit
-+  condition: and(always(), ne(variables['ELECTRON_RELEASE'], '1'))
-+
-+- task: kasunkodagoda.slack-notification.slack-notification-task.SlackNotification@3
-+  displayName: Post Slack Notification
-+  inputs:
-+    SlackApiToken: '$(slack_token)'
-+    Channel: '#bot-nightly-releases'
-+    Message: '$(Build.DefinitionName)-$(Build.BuildNumber) finished with a $(Agent.JobStatus) status.'
-+  condition: and(always(), eq(variables['Build.Reason'], 'Schedule'))
-+>>>>>>> .their
- 
- - task: mspremier.PostBuildCleanup.PostBuildCleanup-task.PostBuildCleanup@3
diff --git a/app/test/fixtures/merge-parser/electron/merge-test-context-id-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-test-context-id-into-master.txt
deleted file mode 100644
index ef5ad7ab8ae..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-test-context-id-into-master.txt
+++ /dev/null
@@ -1,173 +0,0 @@
-merged
-  result 100644 7eda0e667c90cdd23a50e05aaf0527fe39a0bc4e atom/common/api/atom_api_v8_util.cc
-  our    100644 3d80db0c0a4cdbb4c7a78fa7e4266fc6fc87193f atom/common/api/atom_api_v8_util.cc
-@@ -12,10 +12,20 @@
- #include "atom/common/native_mate_converters/gurl_converter.h"
- #include "atom/common/node_includes.h"
- #include "base/hash.h"
-+#include "base/process/process_handle.h"
-+#include "base/strings/stringprintf.h"
- #include "native_mate/dictionary.h"
- #include "url/origin.h"
- #include "v8/include/v8-profiler.h"
- 
-+// This is defined in later versions of Chromium, remove this if you see
-+// compiler complaining duplicate defines.
-+#if defined(OS_WIN) || defined(OS_FUCHSIA)
-+#define CrPRIdPid "ld"
-+#else
-+#define CrPRIdPid "d"
-+#endif
-+
- namespace std {
- 
- // The hash function used by DoubleIDWeakMap.
-@@ -90,6 +100,16 @@
-   return object->GetIdentityHash();
- }
- 
-+std::string GetContextID(v8::Isolate* isolate) {
-+  // When a page is reloaded, V8 and blink may have optimizations that do not
-+  // free blink::WebLocalFrame and v8::Context and reuse them for the new page,
-+  // while we always recreate node::Environment when a page is loaded.
-+  // So the only reliable way to return an identity for a page, is to return the
-+  // address of the node::Environment instance.
-+  node::Environment* env = node::Environment::GetCurrent(isolate);
-+  return base::StringPrintf("%" CrPRIdPid "-%p", base::GetCurrentProcId(), env);
-+}
-+
- void TakeHeapSnapshot(v8::Isolate* isolate) {
-   isolate->GetHeapProfiler()->TakeHeapSnapshot();
- }
-@@ -112,6 +132,7 @@
-   dict.SetMethod("setHiddenValue", &SetHiddenValue);
-   dict.SetMethod("deleteHiddenValue", &DeleteHiddenValue);
-   dict.SetMethod("getObjectHash", &GetObjectHash);
-+  dict.SetMethod("getContextId", &GetContextID);
-   dict.SetMethod("takeHeapSnapshot", &TakeHeapSnapshot);
-   dict.SetMethod("setRemoteCallbackFreer", &atom::RemoteCallbackFreer::BindTo);
-   dict.SetMethod("setRemoteObjectFreer", &atom::RemoteObjectFreer::BindTo);
-merged
-  result 100644 2794ce0ad92e082a1bfd97b77bfbf3b49ebe2dca atom/renderer/atom_renderer_client.cc
-  our    100644 204f17c2cf0d2d4ec4a71bdbecfcd1cbdc5fc8be atom/renderer/atom_renderer_client.cc
-@@ -79,8 +79,6 @@
- void AtomRendererClient::DidCreateScriptContext(
-     v8::Handle<v8::Context> context,
-     content::RenderFrame* render_frame) {
--  RendererClientBase::DidCreateScriptContext(context, render_frame);
--
-   // Only allow node integration for the main frame, unless it is a devtools
-   // extension page.
-   if (!render_frame->IsMainFrame() && !IsDevToolsExtension(render_frame))
-changed in both
-  base   100644 461d4e9f8166b86a4dd1202eb4eb5a59b41336a9 atom/renderer/atom_sandboxed_renderer_client.cc
-  our    100644 6e29fe45a69f44856d7fca449ec1be4eaf6970a2 atom/renderer/atom_sandboxed_renderer_client.cc
-  their  100644 b28d89236c00d8ad0b0da2ffaa6a9080a575bca7 atom/renderer/atom_sandboxed_renderer_client.cc
-@@ -178,8 +178,6 @@
- void AtomSandboxedRendererClient::DidCreateScriptContext(
-     v8::Handle<v8::Context> context,
-     content::RenderFrame* render_frame) {
--  RendererClientBase::DidCreateScriptContext(context, render_frame);
--
-   // Only allow preload for the main frame or
-   // For devtools we still want to run the preload_bundle script
-   if (!render_frame->IsMainFrame() && !IsDevTools(render_frame))
-changed in both
-  base   100644 6d444778bc1fc9c6445a98fa5a3f1cf155bab359 atom/renderer/renderer_client_base.cc
-  our    100644 69490420ef5b8f87e7cb8fd97ebd5ec4509fa1ae atom/renderer/renderer_client_base.cc
-  their  100644 eeac3ff276256d0b99e146e0699636638f959464 atom/renderer/renderer_client_base.cc
-@@ -16,9 +16,7 @@
- #include "atom/renderer/content_settings_observer.h"
- #include "atom/renderer/preferences_manager.h"
- #include "base/command_line.h"
--#include "base/process/process_handle.h"
- #include "base/strings/string_split.h"
--#include "base/strings/stringprintf.h"
- #include "chrome/renderer/media/chrome_key_systems.h"
- #include "chrome/renderer/printing/print_web_view_helper.h"
- #include "chrome/renderer/tts_dispatcher.h"
-@@ -50,14 +48,6 @@
- #include "chrome/renderer/pepper/pepper_helper.h"
- #endif  // defined(ENABLE_PEPPER_FLASH)
- 
--// This is defined in later versions of Chromium, remove this if you see
--// compiler complaining duplicate defines.
--#if defined(OS_WIN) || defined(OS_FUCHSIA)
--#define CrPRIdPid "ld"
--#else
--#define CrPRIdPid "d"
--#endif
--
- namespace atom {
- 
- namespace {
-@@ -92,6 +82,7 @@
- 
- RendererClientBase::~RendererClientBase() {}
- 
-+<<<<<<< .our
- void RendererClientBase::DidCreateScriptContext(
-     v8::Handle<v8::Context> context,
-     content::RenderFrame* render_frame) {
-@@ -105,6 +96,8 @@
-   context->Global()->SetPrivate(context, private_key, value);
- }
- 
-+=======
-+>>>>>>> .their
- void RendererClientBase::AddRenderBindings(
-     v8::Isolate* isolate,
-     v8::Local<v8::Object> binding_object) {
-changed in both
-  base   100644 c6f766ff939b2862b902bc9cbf34beb42f3677f0 atom/renderer/renderer_client_base.h
-  our    100644 f04be0a0fb555fce88aa006c6c6623cc8730d4ed atom/renderer/renderer_client_base.h
-  their  100644 3dea78cee775296dea358d9439421884387ff35d atom/renderer/renderer_client_base.h
-@@ -21,7 +21,7 @@
-   ~RendererClientBase() override;
- 
-   virtual void DidCreateScriptContext(v8::Handle<v8::Context> context,
--                                      content::RenderFrame* render_frame);
-+                                      content::RenderFrame* render_frame) = 0;
-   virtual void WillReleaseScriptContext(v8::Handle<v8::Context> context,
-                                         content::RenderFrame* render_frame) = 0;
-   virtual void DidClearWindowObject(content::RenderFrame* render_frame);
-merged
-  result 100644 19037b66f42db2ec66f74196a8cd11ba66ed46ee brightray/brightray.gypi
-  our    100644 8a945dc0219293d90e30162e4691a4d871071f4f brightray/brightray.gypi
-@@ -205,7 +205,6 @@
-           'SKIA_DLL',
-           'USING_V8_SHARED',
-           'WEBKIT_DLL',
--          'V8_ENABLE_CHECKS',
-         ],
-         'msvs_settings': {
-           'VCCLCompilerTool': {
-changed in both
-  base   100644 80bb4b7cac845516cb16ce2147ff2a252b61f8f6 filenames.gypi
-  our    100644 f57860558f06b7e5d8a50f48cfc7e53044df0bc6 filenames.gypi
-  their  100644 2215cb4f6d891962c20306d20fa2e0c646ceea80 filenames.gypi
-merged
-  result 100644 55359bad5c44e1e6ba51cf73c1b4cd6d41b03baf lib/renderer/api/remote.js
-  our    100644 59117f8f2dd977fc1817a6b1d540b616ddcb0dae lib/renderer/api/remote.js
-@@ -10,7 +10,7 @@
- const remoteObjectCache = v8Util.createIDWeakMap()
- 
- // An unique ID that can represent current context.
--const contextId = v8Util.getHiddenValue(global, 'contextId')
-+const contextId = v8Util.getContextId()
- 
- // Notify the main process when current context is going to be released.
- // Note that when the renderer process is destroyed, the message may not be
-changed in both
-  base   100644 9081eab5e283658c32b65b66f162e039634b45a3 lib/renderer/web-view/web-view.js
-  our    100644 574a2b545597f9d1c05ec9b7147585063e90ae89 lib/renderer/web-view/web-view.js
-  their  100644 8cebdf156d92e1e2efd56555a650cea8ca9185ca lib/renderer/web-view/web-view.js
-@@ -7,7 +7,7 @@
- const webViewConstants = require('./web-view-constants')
- 
- // An unique ID that can represent current context.
--const contextId = v8Util.getHiddenValue(global, 'contextId')
-+const contextId = v8Util.getContextId()
- 
- // ID generator.
- let nextId = 0
diff --git a/app/test/fixtures/merge-parser/electron/merge-test-skips-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-test-skips-into-master.txt
deleted file mode 100644
index 3c4dc30b33a..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-test-skips-into-master.txt
+++ /dev/null
@@ -1,106 +0,0 @@
-changed in both
-  base   100644 0eda951b15d6fff609b6612589e222adb4f0720e spec/api-app-spec.js
-  our    100644 d224eda2989332c18d655cef05a8bacc2eb6d4b8 spec/api-app-spec.js
-  their  100644 238db1a6a0164d7f61f12d947086230edaaa7b1f spec/api-app-spec.js
-@@ -491,11 +491,7 @@
-     })
- 
-     it('allows you to pass a custom executable and arguments', function () {
--      if (process.platform !== 'win32') {
--        // FIXME(alexeykuzmin): Skip the test.
--        // this.skip()
--        return
--      }
-+      if (process.platform !== 'win32') this.skip()
- 
-       app.setLoginItemSettings({openAtLogin: true, path: updateExe, args: processStartArgs})
- 
-@@ -732,9 +728,7 @@
-     // doesn't affect nested `describe`s.
-     beforeEach(function () {
-       // FIXME Get these specs running on Linux CI
--      if (process.platform === 'linux' && isCI) {
--        this.skip()
--      }
-+      if (isCI && process.platform === 'linux') this.skip()
-     })
- 
-     it('fetches a non-empty icon', done => {
-@@ -756,7 +750,12 @@
-       })
-     })
- 
--    describe('size option', () => {
-+    describe('size option', function () {
-+      beforeEach(function () {
-+        // FIXME Get these specs running on Linux CI
-+        if (isCI && process.platform === 'linux') this.skip()
-+      })
-+
-       it('fetches a small icon', (done) => {
-         app.getFileIcon(iconPath, { size: 'small' }, (err, icon) => {
-           const size = icon.getSize()
-@@ -779,11 +778,7 @@
- 
-       it('fetches a large icon', function (done) {
-         // macOS does not support large icons
--        if (process.platform === 'darwin') {
--          // FIXME(alexeykuzmin): Skip the test.
--          // this.skip()
--          return done()
--        }
-+        if (process.platform === 'darwin') this.skip()
- 
-         app.getFileIcon(iconPath, { size: 'large' }, (err, icon) => {
-           const size = icon.getSize()
-@@ -841,14 +836,7 @@
-     let server = null
-     const socketPath = process.platform === 'win32' ? '\\\\.\\pipe\\electron-mixed-sandbox' : '/tmp/electron-mixed-sandbox'
- 
--    beforeEach(function (done) {
--      // XXX(alexeykuzmin): Calling `.skip()` inside a `before` hook
--      // doesn't affect nested `describe`s.
--      // FIXME Get these specs running on Linux
--      if (process.platform === 'linux') {
--        this.skip()
--      }
--
-+    beforeEach((done) => {
-       fs.unlink(socketPath, () => {
-         server = net.createServer()
-         server.listen(socketPath)
-@@ -869,7 +857,16 @@
-     })
- 
-     describe('when app.enableMixedSandbox() is called', () => {
-+<<<<<<< .our
-       it('adds --enable-sandbox to render processes created with sandbox: true', done => {
-+=======
-+      beforeEach(function (done) {
-+        // FIXME Get these specs running on Linux
-+        if (process.platform === 'linux') this.skip()
-+      })
-+
-+      it('adds --enable-sandbox to render processes created with sandbox: true', (done) => {
-+>>>>>>> .their
-         const appPath = path.join(__dirname, 'fixtures', 'api', 'mixed-sandbox-app')
-         appProcess = ChildProcess.spawn(remote.process.execPath, [appPath])
- 
-@@ -895,10 +892,17 @@
-         const appPath = path.join(__dirname, 'fixtures', 'api', 'mixed-sandbox-app')
-         appProcess = ChildProcess.spawn(remote.process.execPath, [appPath, '--enable-mixed-sandbox'])
- 
-+<<<<<<< .our
-         server.once('error', error => { done(error) })
- 
-         server.on('connection', client => {
-           client.once('data', data => {
-+=======
-+        server.once('error', (error) => { done(error) })
-+
-+        server.on('connection', (client) => {
-+          client.once('data', (data) => {
-+>>>>>>> .their
-             const argv = JSON.parse(data)
-             expect(argv.sandbox).to.include('--enable-sandbox')
-             expect(argv.sandbox).to.not.include('--no-sandbox')
diff --git a/app/test/fixtures/merge-parser/electron/merge-test2-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-test2-into-master.txt
deleted file mode 100644
index a2bb49e27ad..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-test2-into-master.txt
+++ /dev/null
@@ -1,5462 +0,0 @@
-changed in both
-  base   100644 d4f98eab95b73b59018f170b09b9132d4d03477b .circleci/config.yml
-  our    100644 6d44d618aabcce04c60344f2274dec5b0c2a1f68 .circleci/config.yml
-  their  100644 8d065e3f257178d4706dcbd1340326be42b2e2e2 .circleci/config.yml
-@@ -19,6 +19,7 @@
-       fi
-     when: on_success
- 
-+<<<<<<< .our
- build-steps: &build-steps
-   steps:
-     - checkout
-@@ -92,6 +93,13 @@
-           fi
-     - run:
-         name: Test
-+=======
-+version: 2
-+jobs:
-+  electron-linux-arm:
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+>>>>>>> .their
-         environment:
-           MOCHA_FILE: junit/test-results.xml
-           MOCHA_REPORTER: mocha-junit-reporter
-@@ -110,6 +118,7 @@
-                 echo 'Skipping tests on GitHub release'
-               fi
-             fi
-+<<<<<<< .our
-           else
-            echo 'Skipping tests due to configuration'
-           fi
-@@ -117,6 +126,76 @@
-         name: Verify FFmpeg
-         command: |
-           if [ "$RUN_TESTS" == "true" ]; then
-+=======
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Optionally finish release
-+          shell: /bin/sh
-+          command: |
-+            if [ "$ELECTRON_RELEASE" == "1" ] && [ "$AUTO_RELEASE" == "true" ]; then
-+              echo 'Trying to finish release'
-+              node script/release.js --validateRelease --automaticRelease
-+              releaseExitCode=$?
-+              if [ $releaseExitCode -eq 0 ]; then
-+                echo 'Release is ready to go; releasing'
-+                node script/release.js--automaticRelease
-+                if [ $releaseExitCode -eq 0 ]; then
-+                  echo 'Release successful, now publishing to npm'
-+                  echo "//registry.npmjs.org/:_authToken=$ELECTRON_NPM_TOKEN" >> ~/.npmrc
-+                  npm run publish-to-npm
-+                  echo 'Release has been published to npm'
-+                fi
-+              else
-+                echo 'Release is not complete, skipping publish for now'
-+              fi
-+            else
-+              echo 'Skipping finishing release because build is not for release'
-+            fi
-+      - run:
-+          name: Zip out directory
-+          command: |
-+>>>>>>> .their
-             if [ "$ELECTRON_RELEASE" != "1" ]; then
-               echo 'Verifying ffmpeg on debug build'
-               script/verify-ffmpeg.py
-@@ -391,11 +470,105 @@
-     resource_class: 2xlarge
- 
-   electron-linux-arm64:
-+<<<<<<< .our
-     environment:
-       TARGET_ARCH: arm64
-     <<: *build-defaults
-     resource_class: 2xlarge
- 
-+=======
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: arm64
-+    resource_class: 2xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Optionally finish release
-+          shell: /bin/sh
-+          command: |
-+            if [ "$ELECTRON_RELEASE" == "1" ] && [ "$AUTO_RELEASE" == "true" ]; then
-+              echo 'Trying to finish release'
-+              node script/release.js --validateRelease --automaticRelease
-+              releaseExitCode=$?
-+              if [ $releaseExitCode -eq 0 ]; then
-+                echo 'Release is ready to go; releasing'
-+                node script/release.js--automaticRelease
-+                if [ $releaseExitCode -eq 0 ]; then
-+                  echo 'Release successful, now publishing to npm'
-+                  echo "//registry.npmjs.org/:_authToken=$ELECTRON_NPM_TOKEN" >> ~/.npmrc
-+                  npm run publish-to-npm
-+                  echo 'Release has been published to npm'
-+                fi
-+              else
-+                echo 'Release is not complete, skipping publish for now'
-+              fi
-+            else
-+              echo 'Skipping finishing release because build is not for release'
-+            fi
-+      - run:
-+          name: Zip out directory
-+          command: |
-+            if [ "$ELECTRON_RELEASE" != "1" ]; then
-+              zip -r electron.zip out/D
-+            fi
-+      - persist_to_workspace:
-+          root: /home/builduser
-+          paths:
-+            - project/out
-+      - store_artifacts:
-+          path: electron.zip
-+>>>>>>> .their
-   electron-linux-arm64-test:
-     machine: true
-     steps:
-@@ -430,6 +603,7 @@
-     resource_class: 2xlarge
- 
-   electron-linux-ia32:
-+<<<<<<< .our
-     environment:
-       TARGET_ARCH: ia32
-       DISPLAY: ':99.0'
-@@ -469,10 +643,317 @@
-       NIGHTLY_BUILD: true
-     <<: *build-defaults
-     resource_class: xlarge
-+=======
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: ia32
-+          DISPLAY: ':99.0'
-+    resource_class: xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Setup for headless testing
-+          command: sh -e /etc/init.d/xvfb start
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Optionally finish release
-+          shell: /bin/sh
-+          command: |
-+            if [ "$ELECTRON_RELEASE" == "1" ] && [ "$AUTO_RELEASE" == "true" ]; then
-+              echo 'Trying to finish release'
-+              node script/release.js --validateRelease --automaticRelease
-+              releaseExitCode=$?
-+              if [ $releaseExitCode -eq 0 ]; then
-+                echo 'Release is ready to go; releasing'
-+                node script/release.js--automaticRelease
-+                if [ $releaseExitCode -eq 0 ]; then
-+                  echo 'Release successful, now publishing to npm'
-+                  echo "//registry.npmjs.org/:_authToken=$ELECTRON_NPM_TOKEN" >> ~/.npmrc
-+                  npm run publish-to-npm
-+                  echo 'Release has been published to npm'
-+                fi
-+              else
-+                echo 'Release is not complete, skipping publish for now'
-+              fi
-+            else
-+              echo 'Skipping finishing release because build is not for release'
-+            fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                out/D/electron --version
-+                mkdir junit
-+                script/test.py --ci --rebuild_native_modules
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+  electron-linux-mips64el:
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: mips64el
-+    resource_class: xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Optionally finish release
-+          shell: /bin/sh
-+          command: |
-+            if [ "$ELECTRON_RELEASE" == "1" ] && [ "$AUTO_RELEASE" == "true" ]; then
-+              echo 'Trying to finish release'
-+              node script/release.js --validateRelease --automaticRelease
-+              releaseExitCode=$?
-+              if [ $releaseExitCode -eq 0 ]; then
-+                echo 'Release is ready to go; releasing'
-+                node script/release.js--automaticRelease
-+                if [ $releaseExitCode -eq 0 ]; then
-+                  echo 'Release successful, now publishing to npm'
-+                  echo "//registry.npmjs.org/:_authToken=$ELECTRON_NPM_TOKEN" >> ~/.npmrc
-+                  npm run publish-to-npm
-+                  echo 'Release has been published to npm'
-+                fi
-+              else
-+                echo 'Release is not complete, skipping publish for now'
-+              fi
-+            else
-+              echo 'Skipping finishing release because build is not for release'
-+            fi
-+
-+  electron-linux-x64:
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: x64
-+          DISPLAY: ':99.0'
-+    resource_class: xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Setup for headless testing
-+          command: sh -e /etc/init.d/xvfb start
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Optionally finish release
-+          shell: /bin/sh
-+          command: |
-+            if [ "$ELECTRON_RELEASE" == "1" ] && [ "$AUTO_RELEASE" == "true" ]; then
-+              echo 'Trying to finish release'
-+              node script/release.js --validateRelease --automaticRelease
-+              releaseExitCode=$?
-+              if [ $releaseExitCode -eq 0 ]; then
-+                echo 'Release is ready to go; releasing'
-+                node script/release.js--automaticRelease
-+                if [ $releaseExitCode -eq 0 ]; then
-+                  echo 'Release successful, now publishing to npm'
-+                  echo "//registry.npmjs.org/:_authToken=$ELECTRON_NPM_TOKEN" >> ~/.npmrc
-+                  npm run publish-to-npm
-+                  echo 'Release has been published to npm'
-+                fi
-+              else
-+                echo 'Release is not complete, skipping publish for now'
-+              fi
-+            else
-+              echo 'Skipping finishing release because build is not for release'
-+            fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                mkdir junit
-+                script/test.py --ci --rebuild_native_modules
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+      - run:
-+          name: Generate Typescript Definitions
-+          command: npm run create-typescript-definitions
-+      - store_test_results:
-+          path: junit
-+      - store_artifacts:
-+          path: junit
-+      - store_artifacts:
-+          path: out/electron.d.ts
-+      - store_artifacts:
-+          path: out/electron-api.json
-+>>>>>>> .their
- 
-   electron-osx-x64:
-     environment:
-       TARGET_ARCH: x64
-+<<<<<<< .our
-       RUN_TESTS: true
-       INSTALL_MACOS_NODE: true
-     macos:
-@@ -488,11 +969,107 @@
-     macos:
-       xcode: "8.3.3"
-     <<: *build-steps
-+=======
-+    macos:
-+        xcode: "9.0"
-+    steps:
-+      - checkout
-+      - run:
-+          name: Reclaim disk space
-+          command: |
-+            df -h
-+            sudo rm -rf /Library/Developer/CoreSimulator
-+            df -h
-+            sysctl -n hw.ncpu
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                mkdir junit
-+                script/test.py --ci --rebuild_native_modules
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+      - run:
-+          name: Generate Typescript Definitions
-+          command: npm run create-typescript-definitions
-+      - store_test_results:
-+          path: junit
-+      - store_artifacts:
-+          path: junit
-+      - store_artifacts:
-+          path: out/electron.d.ts
-+      - store_artifacts:
-+          path: out/electron-api.json
-+>>>>>>> .their
- 
-   electron-mas-x64:
-     environment:
-       TARGET_ARCH: x64
-       MAS_BUILD: 1
-+<<<<<<< .our
-       RUN_TESTS: true
-       INSTALL_MACOS_NODE: true
-     macos:
-@@ -668,6 +1245,101 @@
-       GN_EXTRA_ARGS: 'is_mas_build = true'
-     <<: *gn-mac-build-machine
-     <<: *gn-mac-build-steps
-+=======
-+    macos:
-+        xcode: "9.0"
-+    steps:
-+      - checkout
-+      - run:
-+          name: Reclaim disk space
-+          command: |
-+            df -h
-+            sudo rm -rf /Library/Developer/CoreSimulator
-+            df -h
-+            sysctl -n hw.ncpu
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                mkdir junit
-+                script/test.py --ci --rebuild_native_modules
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+      - run:
-+          name: Generate Typescript Definitions
-+          command: npm run create-typescript-definitions
-+      - store_test_results:
-+          path: junit
-+      - store_artifacts:
-+          path: junit
-+      - store_artifacts:
-+          path: out/electron.d.ts
-+      - store_artifacts:
-+          path: out/electron-api.json
-+>>>>>>> .their
- 
- workflows:
-   version: 2
-@@ -695,6 +1367,7 @@
-   build-mas-x64:
-     jobs:
-       - electron-mas-x64
-+<<<<<<< .our
-   build-gn-linux:
-     jobs:
-       - electron-gn-linux-x64-debug-fyi
-@@ -745,3 +1418,5 @@
-       - electron-gn-linux-arm64-release-fyi
-       - electron-gn-mas-release-fyi
-       - electron-gn-osx-release-fyi
-+=======
-+>>>>>>> .their
-changed in both
-  base   100644 8632e8e30869d32176552cd218560f5016a24300 .gitignore
-  our    100644 f393b1cdcef87b41bb3ed47ebae59757fed3a780 .gitignore
-  their  100644 f82d92052e4f7ac936637ac2c163633e02588f12 .gitignore
-changed in both
-  base   100644 5d04da05397c4c74ce00d6d6c8969ce370adb32d CONTRIBUTING.md
-  our    100644 414f83db905db904728facf3b40e70e7b7973193 CONTRIBUTING.md
-  their  100644 0955f68c4f2b1097e770398cf51d3af811f53050 CONTRIBUTING.md
-changed in both
-  base   100644 4cfea0e70f9af56ba746347b4cae410970f3d900 Dockerfile
-  our    100644 74e5eeedea9bea87cd7a98ac2cb63f4376275a2a Dockerfile
-  their  100644 2d74e16915d2e89e1e1e7f3ffd259cc448e1b864 Dockerfile
-@@ -7,8 +7,13 @@
- RUN chmod a+rwx /home
- 
- # Install node.js
-+<<<<<<< .our
- RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
- RUN apt-get install -y nodejs
-+=======
-+RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
-+RUN apt-get update && apt-get install -y nodejs
-+>>>>>>> .their
- 
- # Install wget used by crash reporter
- RUN apt-get install -y wget
-changed in both
-  base   100644 271947c56e39b91fc23bf10579f61cab50b0f4dc Dockerfile.circleci
-  our    100644 d369c8c640161fc3ba65935297aec7dd27eb1e9f Dockerfile.circleci
-  their  100644 0cdb1e88c24f01a5acdfd8ef348126819f593454 Dockerfile.circleci
-@@ -3,8 +3,13 @@
- USER root
- 
- # Install node.js
-+<<<<<<< .our
- RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
- RUN apt-get install -y nodejs
-+=======
-+RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
-+RUN apt-get update && apt-get install -y nodejs
-+>>>>>>> .their
- 
- # Install wget used by crash reporter
- RUN apt-get install -y wget
-added in remote
-  their  100644 c6d558f7f3518ea2924fa9075ed38ab48d70d204 Jenkinsfile.arm64
-@@ -0,0 +1,36 @@
-+pipeline {
-+  agent {
-+    docker {
-+      image 'electronbuilds/arm64v8:0.0.2'
-+      args '--privileged'
-+    }
-+  }
-+  environment {
-+    TARGET_ARCH='arm64'
-+    DISPLAY=':99.0'
-+    MOCHA_TIMEOUT='60000'
-+  }
-+  stages {
-+    stage('Bootstrap') {
-+      steps {
-+        sh 'script/bootstrap.py -v --dev --target_arch=$TARGET_ARCH'
-+      }
-+    }
-+    stage('Build') {
-+      steps {
-+        sh 'script/build.py -c D --ninja-path /usr/local/ninja/ninja'
-+      }
-+    }
-+    stage('Test') {
-+      steps {
-+        sh '/etc/init.d/xvfb start'
-+        sh 'script/test.py --ci'
-+      }
-+    }
-+  }
-+  post {
-+    always {
-+      cleanWs()
-+    }
-+  }
-+}
-changed in both
-  base   100644 160dae7908236105f8534f9448f4111da1bcb014 README.md
-  our    100644 ec09364417b767ac59b2d970fee5e2ab2db2173b README.md
-  their  100644 a7b4fa6ed40a6449245cfdbdace8bb38945284d2 README.md
-changed in both
-  base   100644 9472d1cb9fd76beca4047bb24db024b9c6378aae atom/app/command_line_args.cc
-  our    100644 23e870cf4a32aecfc246a81edad46971b4456a55 atom/app/command_line_args.cc
-  their  100644 be171457726a09cde9eb7a090ba1e2a67f4cb9cb atom/app/command_line_args.cc
-@@ -31,6 +31,1376 @@
-   return false;
- }
- 
-+<<<<<<< .our
-+=======
-+/*
-+ * The blacklist of command line switches, must be sorted.
-+ * Update the list by pasting the following command into bash
-+ * in libchromiumcontent/src/:
-+
-+   (find ./ \( -name "*switches.cc" -o -name "*switch_list.h" \) | \
-+      xargs grep -P --no-filename '"\S+"[);]$' | \
-+      perl -pe 's|^.*?"(\S+)"[);]$|  "$1",|'; \
-+      echo '  "inspect",'; \
-+      echo '  "inspect-brk",') | \
-+    LANG="C" sort | \
-+    uniq > blacklist-switches.txt
-+
-+ */
-+const char* kBlacklist[] = {
-+  "/prefetch:1",
-+  "/prefetch:2",
-+  "/prefetch:3",
-+  "/prefetch:4",
-+  "/prefetch:5",
-+  "/prefetch:6",
-+  "/prefetch:8",
-+  "0",
-+  "?",
-+  "BlacklistOnly",
-+  "ChromeOSMemoryPressureHandling",
-+  "Disabled",
-+  "OnlineCheckOnly",
-+  "SafeSites",
-+  "accept-resource-provider",
-+  "account-consistency",
-+  "adaboost",
-+  "aec-refined-adaptive-filter",
-+  "agc-startup-min-volume",
-+  "aggressive",
-+  "aggressive-cache-discard",
-+  "aggressive-tab-discard",
-+  "all-toolchains",
-+  "allarticles",
-+  "allow-cross-origin-auth-prompt",
-+  "allow-external-pages",
-+  "allow-failed-policy-fetch-for-test",
-+  "allow-file-access-from-files",
-+  "allow-hidden-media-playback",
-+  "allow-http-background-page",
-+  "allow-http-screen-capture",
-+  "allow-insecure-localhost",
-+  "allow-legacy-extension-manifests",
-+  "allow-loopback-in-peer-connection",
-+  "allow-nacl-crxfs-api",
-+  "allow-nacl-file-handle-api",
-+  "allow-nacl-socket-api",
-+  "allow-no-sandbox-job",
-+  "allow-outdated-plugins",
-+  "allow-ra-in-dev-mode",
-+  "allow-running-insecure-content",
-+  "allow-sandbox-debugging",
-+  "allow-silent-push",
-+  "alsa-check-close-timeout",
-+  "alsa-enable-upsampling",
-+  "alsa-fixed-output-sample-rate",
-+  "alsa-input-device",
-+  "alsa-mute-device-name",
-+  "alsa-mute-element-name",
-+  "alsa-output-avail-min",
-+  "alsa-output-buffer-size",
-+  "alsa-output-device",
-+  "alsa-output-period-size",
-+  "alsa-output-start-threshold",
-+  "alsa-volume-device-name",
-+  "alsa-volume-element-name",
-+  "also-emit-success-logs",
-+  "alternative",
-+  "always-authorize-plugins",
-+  "always-on",
-+  "always-use-complex-text",
-+  "alwaystrue",
-+  "android-fonts-path",
-+  "android-stderr-port",
-+  "android-stdin-port",
-+  "android-stdout-port",
-+  "angle",
-+  "app",
-+  "app-auto-launched",
-+  "app-id",
-+  "app-mode-auth-code",
-+  "app-mode-oauth-token",
-+  "app-mode-oem-manifest",
-+  "app-shell-allow-roaming",
-+  "app-shell-host-window-size",
-+  "app-shell-preferred-network",
-+  "app-shell-refresh-token",
-+  "app-shell-user",
-+  "apple",
-+  "apps-gallery-download-url",
-+  "apps-gallery-update-url",
-+  "apps-gallery-url",
-+  "apps-keep-chrome-alive-in-tests",
-+  "arc-availability",
-+  "arc-available",
-+  "arc-start-mode",
-+  "arc-transition-migration-required",
-+  "args",
-+  "artifacts-dir",
-+  "ash-animate-from-boot-splash-screen",
-+  "ash-constrain-pointer-to-root",
-+  "ash-copy-host-background-at-boot",
-+  "ash-debug-shortcuts",
-+  "ash-dev-shortcuts",
-+  "ash-disable-smooth-screen-rotation",
-+  "ash-disable-touch-exploration-mode",
-+  "ash-enable-magnifier-key-scroller",
-+  "ash-enable-mirrored-screen",
-+  "ash-enable-night-light",
-+  "ash-enable-palette-on-all-displays",
-+  "ash-enable-scale-settings-tray",
-+  "ash-enable-software-mirroring",
-+  "ash-enable-unified-desktop",
-+  "ash-estimated-presentation-delay",
-+  "ash-hide-notifications-for-factory",
-+  "ash-host-window-bounds",
-+  "ash-shelf-color",
-+  "ash-shelf-color-scheme",
-+  "ash-touch-hud",
-+  "ash-webui-init",
-+  "attestation-server",
-+  "audio-buffer-size",
-+  "audio-output-channels",
-+  "aura-legacy-power-button",
-+  "auth-ext-path",
-+  "auth-server-whitelist",
-+  "auth-spnego-account-type",
-+  "auto",
-+  "auto-open-devtools-for-tabs",
-+  "auto-select-desktop-capture-source",
-+  "autoplay-policy",
-+  "blink-settings",
-+  "bootstrap",
-+  "browser-subprocess-path",
-+  "browser-test",
-+  "bwsi",
-+  "bypass-app-banner-engagement-checks",
-+  "canvas-msaa-sample-count",
-+  "cast-initial-screen-height",
-+  "cast-initial-screen-width",
-+  "cc-layer-tree-test-long-timeout",
-+  "cc-layer-tree-test-no-timeout",
-+  "cc-rebaseline-pixeltests",
-+  "cellular-first",
-+  "cellular-only",
-+  "check-for-update-interval",
-+  "check-layout-test-sys-deps",
-+  "child-wallpaper-large",
-+  "child-wallpaper-small",
-+  "chrome-home-swipe-logic",
-+  "cipher-suite-blacklist",
-+  "clamshell",
-+  "class",
-+  "clear-token-service",
-+  "cloud-print-file",
-+  "cloud-print-file-type",
-+  "cloud-print-job-title",
-+  "cloud-print-print-ticket",
-+  "cloud-print-setup-proxy",
-+  "cloud-print-url",
-+  "cloud-print-xmpp-endpoint",
-+  "color",
-+  "compensate-for-unstable-pinch-zoom",
-+  "compile-shader-always-succeeds",
-+  "component-updater",
-+  "connectivity-check-url",
-+  "conservative",
-+  "content-image-texture-target",
-+  "content-shell-host-window-size",
-+  "controller",
-+  "crash-dumps-dir",
-+  "crash-on-failure",
-+  "crash-on-hang-threads",
-+  "crash-server-url",
-+  "crash-test",
-+  "crashpad-handler",
-+  "create-browser-on-startup-for-tests",
-+  "create-default-gl-context",
-+  "cros-gaia-api-v1",
-+  "cros-region",
-+  "cros-regions-mode",
-+  "crosh-command",
-+  "cryptauth-http-host",
-+  "custom-devtools-frontend",
-+  "custom-launcher-page",
-+  "custom_summary",
-+  "d3d11",
-+  "d3d9",
-+  "daemon",
-+  "dark_muted",
-+  "dark_vibrant",
-+  "data-path",
-+  "data-reduction-proxy-config-url",
-+  "data-reduction-proxy-experiment",
-+  "data-reduction-proxy-http-proxies",
-+  "data-reduction-proxy-lo-fi",
-+  "data-reduction-proxy-pingback-url",
-+  "data-reduction-proxy-secure-proxy-check-url",
-+  "data-reduction-proxy-server-experiments-disabled",
-+  "dbus-stub",
-+  "debug-devtools",
-+  "debug-enable-frame-toggle",
-+  "debug-packed-apps",
-+  "debug-print",
-+  "default",
-+  "default-background-color",
-+  "default-tile-height",
-+  "default-tile-width",
-+  "default-wallpaper-is-oem",
-+  "default-wallpaper-large",
-+  "default-wallpaper-small",
-+  "delay-reload-stop-button-change",
-+  "demo",
-+  "derelict-detection-timeout",
-+  "derelict-idle-timeout",
-+  "desktop",
-+  "desktop-window-1080p",
-+  "deterministic-fetch",
-+  "device-management-url",
-+  "device-scale-factor",
-+  "devtools-flags",
-+  "diagnostics",
-+  "diagnostics-format",
-+  "diagnostics-recovery",
-+  "dice",
-+  "disable",
-+  "disable-2d-canvas-clip-aa",
-+  "disable-2d-canvas-image-chromium",
-+  "disable-3d-apis",
-+  "disable-accelerated-2d-canvas",
-+  "disable-accelerated-jpeg-decoding",
-+  "disable-accelerated-mjpeg-decode",
-+  "disable-accelerated-video-decode",
-+  "disable-app-info-dialog-mac",
-+  "disable-app-list-dismiss-on-blur",
-+  "disable-app-window-cycling",
-+  "disable-appcontainer",
-+  "disable-arc-data-wipe",
-+  "disable-arc-opt-in-verification",
-+  "disable-audio-support-for-desktop-share",
-+  "disable-avfoundation-overlays",
-+  "disable-background-networking",
-+  "disable-background-timer-throttling",
-+  "disable-backgrounding-occluded-windows",
-+  "disable-backing-store-limit",
-+  "disable-blink-features",
-+  "disable-bookmark-reordering",
-+  "disable-boot-animation",
-+  "disable-breakpad",
-+  "disable-browser-task-scheduler",
-+  "disable-bundled-ppapi-flash",
-+  "disable-canvas-aa",
-+  "disable-captive-portal-bypass-proxy",
-+  "disable-cast-streaming-hw-encoding",
-+  "disable-checker-imaging",
-+  "disable-clear-browsing-data-counters",
-+  "disable-client-side-phishing-detection",
-+  "disable-cloud-import",
-+  "disable-component-cloud-policy",
-+  "disable-component-extensions-with-background-pages",
-+  "disable-component-update",
-+  "disable-composited-antialiasing",
-+  "disable-contextual-search",
-+  "disable-d3d11",
-+  "disable-databases",
-+  "disable-datasaver-prompt",
-+  "disable-default-apps",
-+  "disable-demo-mode",
-+  "disable-device-disabling",
-+  "disable-device-discovery-notifications",
-+  "disable-dinosaur-easter-egg",
-+  "disable-direct-composition",
-+  "disable-direct-composition-layers",
-+  "disable-directwrite-for-ui",
-+  "disable-display-color-calibration",
-+  "disable-display-list-2d-canvas",
-+  "disable-distance-field-text",
-+  "disable-domain-blocking-for-3d-apis",
-+  "disable-domain-reliability",
-+  "disable-drive-search-in-app-launcher",
-+  "disable-dwm-composition",
-+  "disable-encryption-migration",
-+  "disable-eol-notification",
-+  "disable-es3-apis",
-+  "disable-es3-gl-context",
-+  "disable-extensions",
-+  "disable-extensions-except",
-+  "disable-extensions-file-access-check",
-+  "disable-extensions-http-throttling",
-+  "disable-fast-web-scroll-view-insets",
-+  "disable-features",
-+  "disable-field-trial-config",
-+  "disable-file-manager-touch-mode",
-+  "disable-file-system",
-+  "disable-flash-3d",
-+  "disable-flash-stage3d",
-+  "disable-fullscreen-low-power-mode",
-+  "disable-fullscreen-tab-detaching",
-+  "disable-gaia-services",
-+  "disable-gesture-editing",
-+  "disable-gesture-requirement-for-presentation",
-+  "disable-gesture-typing",
-+  "disable-gl-drawing-for-tests",
-+  "disable-gl-error-limit",
-+  "disable-gl-extensions",
-+  "disable-glsl-translator",
-+  "disable-gpu",
-+  "disable-gpu-compositing",
-+  "disable-gpu-driver-bug-workarounds",
-+  "disable-gpu-early-init",
-+  "disable-gpu-memory-buffer-compositor-resources",
-+  "disable-gpu-memory-buffer-video-frames",
-+  "disable-gpu-process-crash-limit",
-+  "disable-gpu-program-cache",
-+  "disable-gpu-rasterization",
-+  "disable-gpu-sandbox",
-+  "disable-gpu-shader-disk-cache",
-+  "disable-gpu-vsync",
-+  "disable-gpu-watchdog",
-+  "disable-hang-monitor",
-+  "disable-hid-detection-on-oobe",
-+  "disable-histogram-customizer",
-+  "disable-hosted-app-shim-creation",
-+  "disable-hosted-apps-in-windows",
-+  "disable-http2",
-+  "disable-in-process-stack-traces",
-+  "disable-infobars",
-+  "disable-input-ime-api",
-+  "disable-input-view",
-+  "disable-ios-password-generation",
-+  "disable-ios-password-suggestions",
-+  "disable-ios-physical-web",
-+  "disable-javascript-harmony-shipping",
-+  "disable-kill-after-bad-ipc",
-+  "disable-lcd-text",
-+  "disable-legacy-window",
-+  "disable-local-storage",
-+  "disable-lock-screen-apps",
-+  "disable-logging",
-+  "disable-logging-redirect",
-+  "disable-login-animations",
-+  "disable-login-screen-apps",
-+  "disable-low-end-device-mode",
-+  "disable-low-latency-dxva",
-+  "disable-low-res-tiling",
-+  "disable-lru-snapshot-cache",
-+  "disable-mac-overlays",
-+  "disable-mac-views-native-app-windows",
-+  "disable-machine-cert-request",
-+  "disable-main-frame-before-activation",
-+  "disable-md-error-screen",
-+  "disable-md-oobe",
-+  "disable-media-session-api",
-+  "disable-media-suspend",
-+  "disable-merge-key-char-events",
-+  "disable-mojo-local-storage",
-+  "disable-mojo-renderer",
-+  "disable-mtp-write-support",
-+  "disable-multi-display-layout",
-+  "disable-namespace-sandbox",
-+  "disable-native-gpu-memory-buffers",
-+  "disable-network-portal-notification",
-+  "disable-new-channel-switcher-ui",
-+  "disable-new-korean-ime",
-+  "disable-new-virtual-keyboard-behavior",
-+  "disable-new-zip-unpacker",
-+  "disable-notifications",
-+  "disable-ntp-most-likely-favicons-from-server",
-+  "disable-ntp-popular-sites",
-+  "disable-nv12-dxgi-video",
-+  "disable-offer-store-unmasked-wallet-cards",
-+  "disable-offer-upload-credit-cards",
-+  "disable-office-editing-component-extension",
-+  "disable-offline-auto-reload",
-+  "disable-offline-auto-reload-visible-only",
-+  "disable-origin-trial-controlled-blink-features",
-+  "disable-overscroll-edge-effect",
-+  "disable-panel-fitting",
-+  "disable-partial-raster",
-+  "disable-password-generation",
-+  "disable-pepper-3d",
-+  "disable-pepper-3d-image-chromium",
-+  "disable-permission-action-reporting",
-+  "disable-permissions-api",
-+  "disable-physical-keyboard-autocorrect",
-+  "disable-pinch",
-+  "disable-pnacl-crash-throttling",
-+  "disable-popup-blocking",
-+  "disable-prefer-compositing-to-lcd-text",
-+  "disable-presentation-api",
-+  "disable-print-preview",
-+  "disable-prompt-on-repost",
-+  "disable-proximity-auth-bluetooth-low-energy-discovery",
-+  "disable-pull-to-refresh-effect",
-+  "disable-push-api-background-mode",
-+  "disable-quic",
-+  "disable-reading-from-canvas",
-+  "disable-remote-core-animation",
-+  "disable-remote-fonts",
-+  "disable-remote-playback-api",
-+  "disable-renderer-accessibility",
-+  "disable-renderer-backgrounding",
-+  "disable-renderer-priority-management",
-+  "disable-request-mobile-site",
-+  "disable-resize-lock",
-+  "disable-rgba-4444-textures",
-+  "disable-rollback-option",
-+  "disable-rtc-smoothness-algorithm",
-+  "disable-screen-orientation-lock",
-+  "disable-search-geolocation-disclosure",
-+  "disable-seccomp-filter-sandbox",
-+  "disable-settings-window",
-+  "disable-setuid-sandbox",
-+  "disable-shader-name-hashing",
-+  "disable-shared-workers",
-+  "disable-signin-promo",
-+  "disable-signin-scoped-device-id",
-+  "disable-single-click-autofill",
-+  "disable-skia-runtime-opts",
-+  "disable-slim-navigation-manager",
-+  "disable-slimming-paint-invalidation",
-+  "disable-smooth-scrolling",
-+  "disable-software-rasterizer",
-+  "disable-speech-api",
-+  "disable-suggestions-ui",
-+  "disable-sync",
-+  "disable-sync-app-list",
-+  "disable-sync-types",
-+  "disable-system-timezone-automatic-detection",
-+  "disable-tab-for-desktop-share",
-+  "disable-tab-strip-autoscroll-new-tabs",
-+  "disable-third-party-keyboard-workaround",
-+  "disable-threaded-animation",
-+  "disable-threaded-compositing",
-+  "disable-threaded-scrolling",
-+  "disable-touch-adjustment",
-+  "disable-touch-drag-drop",
-+  "disable-translate-new-ux",
-+  "disable-usb-keyboard-detect",
-+  "disable-v8-idle-tasks",
-+  "disable-vaapi-accelerated-video-encode",
-+  "disable-virtual-keyboard-overscroll",
-+  "disable-voice-input",
-+  "disable-volume-adjust-sound",
-+  "disable-wake-on-wifi",
-+  "disable-web-notification-custom-layouts",
-+  "disable-web-security",
-+  "disable-webgl",
-+  "disable-webgl-image-chromium",
-+  "disable-webrtc-encryption",
-+  "disable-webrtc-hw-decoding",
-+  "disable-webrtc-hw-encoding",
-+  "disable-win32k-lockdown",
-+  "disable-xss-auditor",
-+  "disable-zero-browsers-open-for-tests",
-+  "disable-zero-copy",
-+  "disable-zero-copy-dxgi-video",
-+  "disabled",
-+  "disabled-new-style-notification",
-+  "disallow-non-exact-resource-reuse",
-+  "disk-cache-dir",
-+  "disk-cache-size",
-+  "display",
-+  "dmg-device",
-+  "dns-log-details",
-+  "document-user-activation-required",
-+  "dom-automation",
-+  "dotfile",
-+  "draft",
-+  "draw-view-bounds-rects",
-+  "duck-flash",
-+  "dump-blink-runtime-call-stats",
-+  "dump-browser-histograms",
-+  "dump-dom",
-+  "eafe-path",
-+  "eafe-url",
-+  "easy-unlock-app-path",
-+  "edge-touch-filtering",
-+  "egl",
-+  "elevate",
-+  "embedded-extension-options",
-+  "emphasize-titles-in-omnibox-dropdown",
-+  "emulate-shader-precision",
-+  "enable-accelerated-2d-canvas",
-+  "enable-accelerated-vpx-decode",
-+  "enable-accessibility-tab-switcher",
-+  "enable-adaptive-selection-handle-orientation",
-+  "enable-aggressive-domstorage-flushing",
-+  "enable-android-wallpapers-app",
-+  "enable-app-info-dialog-mac",
-+  "enable-app-list",
-+  "enable-app-window-cycling",
-+  "enable-appcontainer",
-+  "enable-arc",
-+  "enable-arc-oobe-optin",
-+  "enable-audio-debug-recordings-from-extension",
-+  "enable-audio-focus",
-+  "enable-automation",
-+  "enable-benchmarking",
-+  "enable-ble-advertising-in-apps",
-+  "enable-blink-features",
-+  "enable-bookmark-reordering",
-+  "enable-bookmark-undo",
-+  "enable-browser-side-navigation",
-+  "enable-browser-task-scheduler",
-+  "enable-checker-imaging",
-+  "enable-chromevox-arc-support",
-+  "enable-clear-browsing-data-counters",
-+  "enable-cloud-print-proxy",
-+  "enable-cloud-print-xps",
-+  "enable-consumer-kiosk",
-+  "enable-contextual-search",
-+  "enable-crash-reporter",
-+  "enable-crash-reporter-for-testing",
-+  "enable-crx-hash-check",
-+  "enable-data-reduction-proxy-bypass-warning",
-+  "enable-data-reduction-proxy-force-pingback",
-+  "enable-data-reduction-proxy-lite-page",
-+  "enable-data-reduction-proxy-savings-promo",
-+  "enable-datasaver-prompt",
-+  "enable-device-discovery-notifications",
-+  "enable-devtools-experiments",
-+  "enable-direct-composition-layers",
-+  "enable-display-list-2d-canvas",
-+  "enable-distance-field-text",
-+  "enable-distillability-service",
-+  "enable-dom-distiller",
-+  "enable-domain-reliability",
-+  "enable-drive-search-in-app-launcher",
-+  "enable-drm-atomic",
-+  "enable-embedded-extension-options",
-+  "enable-encryption-migration",
-+  "enable-encryption-selection",
-+  "enable-es3-apis",
-+  "enable-exclusive-audio",
-+  "enable-experimental-accessibility-features",
-+  "enable-experimental-canvas-features",
-+  "enable-experimental-extension-apis",
-+  "enable-experimental-fullscreen-exit-ui",
-+  "enable-experimental-input-view-features",
-+  "enable-experimental-web-platform-features",
-+  "enable-extension-activity-log-testing",
-+  "enable-extension-activity-logging",
-+  "enable-extension-assets-sharing",
-+  "enable-fast-unload",
-+  "enable-fast-web-scroll-view-insets",
-+  "enable-features",
-+  "enable-file-manager-touch-mode",
-+  "enable-first-run-ui-transitions",
-+  "enable-floating-virtual-keyboard",
-+  "enable-font-antialiasing",
-+  "enable-fullscreen-tab-detaching",
-+  "enable-fullscreen-toolbar-reveal",
-+  "enable-google-branded-context-menu",
-+  "enable-gpu-async-worker-context",
-+  "enable-gpu-benchmarking",
-+  "enable-gpu-client-logging",
-+  "enable-gpu-client-tracing",
-+  "enable-gpu-command-logging",
-+  "enable-gpu-debugging",
-+  "enable-gpu-driver-debug-logging",
-+  "enable-gpu-memory-buffer-compositor-resources",
-+  "enable-gpu-memory-buffer-video-frames",
-+  "enable-gpu-rasterization",
-+  "enable-gpu-service-logging",
-+  "enable-gpu-service-tracing",
-+  "enable-hardware-overlays",
-+  "enable-harfbuzz-rendertext",
-+  "enable-hdr",
-+  "enable-heap-profiling",
-+  "enable-hosted-app-quit-notification",
-+  "enable-hosted-apps-in-windows",
-+  "enable-hotword-hardware",
-+  "enable-hung-renderer-infobar",
-+  "enable-inband-text-tracks",
-+  "enable-input-ime-api",
-+  "enable-internal-media-session",
-+  "enable-ios-handoff-to-other-devices",
-+  "enable-ios-password-generation",
-+  "enable-ios-physical-web",
-+  "enable-layer-lists",
-+  "enable-lcd-text",
-+  "enable-leak-detection",
-+  "enable-local-file-accesses",
-+  "enable-local-sync-backend",
-+  "enable-logging",
-+  "enable-longpress-drag-selection",
-+  "enable-low-end-device-mode",
-+  "enable-low-res-tiling",
-+  "enable-lru-snapshot-cache",
-+  "enable-mac-views-native-app-windows",
-+  "enable-main-frame-before-activation",
-+  "enable-md-feedback",
-+  "enable-md-policy-page",
-+  "enable-media-suspend",
-+  "enable-merge-key-char-events",
-+  "enable-message-center-always-scroll-up-upon-notification-removal",
-+  "enable-nacl",
-+  "enable-nacl-debug",
-+  "enable-nacl-nonsfi-mode",
-+  "enable-native-gpu-memory-buffers",
-+  "enable-natural-scroll-default",
-+  "enable-navigation-tracing",
-+  "enable-net-benchmarking",
-+  "enable-network-information-downlink-max",
-+  "enable-network-portal-notification",
-+  "enable-new-app-menu-icon",
-+  "enable-ntp-most-likely-favicons-from-server",
-+  "enable-ntp-popular-sites",
-+  "enable-ntp-search-engine-country-detection",
-+  "enable-offer-store-unmasked-wallet-cards",
-+  "enable-offer-upload-credit-cards",
-+  "enable-offline-auto-reload",
-+  "enable-offline-auto-reload-visible-only",
-+  "enable-osk-overscroll",
-+  "enable-override-bookmarks-ui",
-+  "enable-partial-raster",
-+  "enable-password-generation",
-+  "enable-pepper-testing",
-+  "enable-permission-action-reporting",
-+  "enable-physical-keyboard-autocorrect",
-+  "enable-picture-in-picture",
-+  "enable-pinch",
-+  "enable-pixel-output-in-tests",
-+  "enable-plugin-placeholder-testing",
-+  "enable-potentially-annoying-security-features",
-+  "enable-power-overlay",
-+  "enable-precise-memory-info",
-+  "enable-prefer-compositing-to-lcd-text",
-+  "enable-print-browser",
-+  "enable-print-preview-register-promos",
-+  "enable-profile-shortcut-manager",
-+  "enable-profiling",
-+  "enable-push-api-background-mode",
-+  "enable-quic",
-+  "enable-reader-mode-toolbar-icon",
-+  "enable-refresh-token-annotation-request",
-+  "enable-request-tablet-site",
-+  "enable-rgba-4444-textures",
-+  "enable-sandbox",
-+  "enable-sandbox-logging",
-+  "enable-screenshot-testing-with-mode",
-+  "enable-scripts-require-action",
-+  "enable-scroll-prediction",
-+  "enable-service-manager-tracing",
-+  "enable-settings-window",
-+  "enable-sgi-video-sync",
-+  "enable-signin-promo",
-+  "enable-single-click-autofill",
-+  "enable-site-settings",
-+  "enable-skia-benchmarking",
-+  "enable-slim-navigation-manager",
-+  "enable-slimming-paint-invalidation",
-+  "enable-slimming-paint-v2",
-+  "enable-smooth-scrolling",
-+  "enable-spatial-navigation",
-+  "enable-spdy-proxy-auth",
-+  "enable-speech-dispatcher",
-+  "enable-spelling-feedback-field-trial",
-+  "enable-spotlight-actions",
-+  "enable-stats-collection-bindings",
-+  "enable-stats-table",
-+  "enable-strict-mixed-content-checking",
-+  "enable-strict-powerful-feature-restrictions",
-+  "enable-suggestions-ui",
-+  "enable-suggestions-with-substring-match",
-+  "enable-supervised-user-managed-bookmarks-folder",
-+  "enable-surface-synchronization",
-+  "enable-swap-buffers-with-bounds",
-+  "enable-sync-app-list",
-+  "enable-sync-articles",
-+  "enable-tab-audio-muting",
-+  "enable-tablet-splitview",
-+  "enable-tcp-fastopen",
-+  "enable-third-party-keyboard-workaround",
-+  "enable-threaded-compositing",
-+  "enable-threaded-texture-mailboxes",
-+  "enable-tile-compression",
-+  "enable-touch-calibration-setting",
-+  "enable-touch-drag-drop",
-+  "enable-touchpad-three-finger-click",
-+  "enable-touchview",
-+  "enable-trace-app-source",
-+  "enable-tracing",
-+  "enable-tracing-output",
-+  "enable-translate-new-ux",
-+  "enable-ui-devtools",
-+  "enable-use-zoom-for-dsf",
-+  "enable-user-controlled-alternate-protocol-ports",
-+  "enable-user-metrics",
-+  "enable-usermedia-screen-capturing",
-+  "enable-video-player-chromecast-support",
-+  "enable-viewport",
-+  "enable-virtual-keyboard",
-+  "enable-voice-interaction",
-+  "enable-vtune-support",
-+  "enable-vulkan",
-+  "enable-wayland-server",
-+  "enable-web-notification-custom-layouts",
-+  "enable-webfonts-intervention-trigger",
-+  "enable-webfonts-intervention-v2",
-+  "enable-webgl-draft-extensions",
-+  "enable-webgl-image-chromium",
-+  "enable-webrtc-event-logging-from-extension",
-+  "enable-webrtc-srtp-aes-gcm",
-+  "enable-webrtc-stun-origin",
-+  "enable-webview-finch",
-+  "enable-webvr",
-+  "enable-wifi-credential-sync",
-+  "enable-win7-webrtc-hw-h264-decoding",
-+  "enable-zero-copy",
-+  "enable-zip-archiver-on-file-manager",
-+  "enabled",
-+  "enabled-2g",
-+  "enabled-3g",
-+  "enabled-new-style-notification",
-+  "enabled-slow2g",
-+  "encode-binary",
-+  "enforce",
-+  "enforce-gl-minimums",
-+  "enforce-webrtc-ip-permission-check",
-+  "enforce_strict",
-+  "enterprise-disable-arc",
-+  "enterprise-enable-forced-re-enrollment",
-+  "enterprise-enable-license-type-selection",
-+  "enterprise-enable-zero-touch-enrollment",
-+  "enterprise-enrollment-initial-modulus",
-+  "enterprise-enrollment-modulus-limit",
-+  "error-console",
-+  "experiment",
-+  "explicitly-allowed-ports",
-+  "expose-internals-for-testing",
-+  "extension-content-verification",
-+  "extension-process",
-+  "extensions-install-verification",
-+  "extensions-multi-account",
-+  "extensions-not-webstore",
-+  "extensions-on-chrome-urls",
-+  "extensions-update-frequency",
-+  "extra-search-query-params",
-+  "fail-on-unused-args",
-+  "fake-variations-channel",
-+  "false",
-+  "fast",
-+  "fast-start",
-+  "feedback-server",
-+  "field-trial-handle",
-+  "first-exec-after-boot",
-+  "flag-switches-begin",
-+  "flag-switches-end",
-+  "font-cache-shared-handle",
-+  "force-android-app-mode",
-+  "force-app-mode",
-+  "force-clamshell-power-button",
-+  "force-color-profile",
-+  "force-desktop-ios-promotion",
-+  "force-dev-mode-highlighting",
-+  "force-device-scale-factor",
-+  "force-display-list-2d-canvas",
-+  "force-effective-connection-type",
-+  "force-enable-metrics-reporting",
-+  "force-enable-stylus-tools",
-+  "force-fieldtrial-params",
-+  "force-fieldtrials",
-+  "force-first-run",
-+  "force-first-run-ui",
-+  "force-gpu-mem-available-mb",
-+  "force-gpu-rasterization",
-+  "force-happiness-tracking-system",
-+  "force-load-easy-unlock-app-in-tests",
-+  "force-local-ntp",
-+  "force-login-manager-in-tests",
-+  "force-mediafoundation",
-+  "force-overlay-fullscreen-video",
-+  "force-password-reauth",
-+  "force-pnacl-subzero",
-+  "force-renderer-accessibility",
-+  "force-show-update-menu-badge",
-+  "force-show-update-menu-item",
-+  "force-system-compositor-mode",
-+  "force-tablet-mode",
-+  "force-text-direction",
-+  "force-ui-direction",
-+  "force-variation-ids",
-+  "force-video-overlays",
-+  "force-wave-audio",
-+  "force-webrtc-ip-handling-policy",
-+  "full-memory-crash-report",
-+  "gaia-url",
-+  "gcm-checkin-url",
-+  "gcm-mcs-endpoint",
-+  "gcm-registration-url",
-+  "generate-accessibility-test-expectations",
-+  "gl",
-+  "gl-composited-overlay-candidate-quad-border",
-+  "gl-shader-interm-output",
-+  "gles",
-+  "golden-screenshots-dir",
-+  "google-apis-url",
-+  "google-base-url",
-+  "google-doodle-url",
-+  "google-url",
-+  "gpu-active-device-id",
-+  "gpu-active-vendor-id",
-+  "gpu-device-id",
-+  "gpu-driver-bug-workarounds",
-+  "gpu-driver-date",
-+  "gpu-driver-vendor",
-+  "gpu-driver-version",
-+  "gpu-launcher",
-+  "gpu-no-complete-info-collection",
-+  "gpu-no-context-lost",
-+  "gpu-process",
-+  "gpu-program-cache-size-kb",
-+  "gpu-rasterization-msaa-sample-count",
-+  "gpu-sandbox-allow-sysv-shm",
-+  "gpu-sandbox-failures-fatal",
-+  "gpu-sandbox-start-early",
-+  "gpu-secondary-device-ids",
-+  "gpu-secondary-vendor-ids",
-+  "gpu-startup-dialog",
-+  "gpu-testing-device-id",
-+  "gpu-testing-driver-date",
-+  "gpu-testing-gl-renderer",
-+  "gpu-testing-gl-vendor",
-+  "gpu-testing-gl-version",
-+  "gpu-testing-os-version",
-+  "gpu-testing-secondary-device-ids",
-+  "gpu-testing-secondary-vendor-ids",
-+  "gpu-testing-vendor-id",
-+  "gpu-vendor-id",
-+  "guest-wallpaper-large",
-+  "guest-wallpaper-small",
-+  "h",
-+  "has-chromeos-diamond-key",
-+  "has-chromeos-keyboard",
-+  "has-internal-stylus",
-+  "headless",
-+  "help",
-+  "hide",
-+  "hide-icons",
-+  "hide-scrollbars",
-+  "history-entry-requires-user-gesture",
-+  "homedir",
-+  "homepage",
-+  "host",
-+  "host-pairing-oobe",
-+  "host-resolver-rules",
-+  "host-rules",
-+  "icu-data-dir",
-+  "ignore-autocomplete-off-autofill",
-+  "ignore-autoplay-restrictions",
-+  "ignore-certificate-errors",
-+  "ignore-certificate-errors-spki-list",
-+  "ignore-gpu-blacklist",
-+  "ignore-urlfetcher-cert-requests",
-+  "ignore-user-profile-mapping-for-tests",
-+  "in-process-gpu",
-+  "incognito",
-+  "input",
-+  "inspect",
-+  "inspect-brk",
-+  "install-chrome-app",
-+  "install-supervised-user-whitelists",
-+  "instant-process",
-+  "invalidation-use-gcm-channel",
-+  "ipc-connection-timeout",
-+  "ipc-dump-directory",
-+  "ipc-fuzzer-testcase",
-+  "is-running-in-mash",
-+  "isolate-origins",
-+  "isolate-sites-for-testing",
-+  "javascript-harmony",
-+  "js-flags",
-+  "keep-alive-for-test",
-+  "kiosk",
-+  "kiosk-printing",
-+  "lang",
-+  "last-launched-app",
-+  "layer",
-+  "light_muted",
-+  "light_vibrant",
-+  "limit-fps",
-+  "load-and-launch-app",
-+  "load-apps",
-+  "load-extension",
-+  "load-media-router-component-extension",
-+  "local-heuristics-only-for-password-generation",
-+  "local-ntp-reload",
-+  "local-sync-backend-dir",
-+  "log-gpu-control-list-decisions",
-+  "log-level",
-+  "log-net-log",
-+  "login-manager",
-+  "login-profile",
-+  "login-user",
-+  "lso-url",
-+  "ltr",
-+  "main-frame-resizes-are-orientation-changes",
-+  "make-chrome-default",
-+  "make-default-browser",
-+  "managed-user-id",
-+  "managed-user-sync-token",
-+  "mark-non-secure-as",
-+  "markdown",
-+  "market-url-for-testing",
-+  "mash",
-+  "material",
-+  "material-design-ink-drop-animation-speed",
-+  "material-hybrid",
-+  "max-gum-fps",
-+  "max-output-volume-dba1m",
-+  "max-untiled-layer-height",
-+  "max-untiled-layer-width",
-+  "media-cache-size",
-+  "mem-pressure-system-reserved-kb",
-+  "memlog",
-+  "memlog-pipe",
-+  "memory-pressure-off",
-+  "memory-pressure-thresholds",
-+  "memory-pressure-thresholds-mb",
-+  "message-center-changes-while-open",
-+  "metrics-client-id",
-+  "metrics-recording-only",
-+  "mhtml-generator-option",
-+  "mirror",
-+  "mock",
-+  "mojo-local-storage",
-+  "mojo-pipe-token",
-+  "monitoring-destination-id",
-+  "mse-audio-buffer-size-limit",
-+  "mse-video-buffer-size-limit",
-+  "mus",
-+  "mus-config",
-+  "mute-audio",
-+  "nacl-broker",
-+  "nacl-dangerous-no-sandbox-nonsfi",
-+  "nacl-debug-mask",
-+  "nacl-gdb",
-+  "nacl-gdb-script",
-+  "nacl-loader",
-+  "nacl-loader-nonsfi",
-+  "native",
-+  "native-crx-bindings",
-+  "need-arc-migration-policy-check",
-+  "net-log-capture-mode",
-+  "netifs-to-ignore",
-+  "network-country-iso",
-+  "network-settings-config",
-+  "new-window",
-+  "no-default-browser-check",
-+  "no-experiments",
-+  "no-first-run",
-+  "no-managed-user-acknowledgment-check",
-+  "no-network-profile-warning",
-+  "no-pings",
-+  "no-proxy-server",
-+  "no-referrers",
-+  "no-sandbox",
-+  "no-service-autorun",
-+  "no-session-id",
-+  "no-startup-window",
-+  "no-user-gesture-required",
-+  "no-wifi",
-+  "no-zygote",
-+  "nocolor",
-+  "noerrdialogs",
-+  "non-material",
-+  "non-secure",
-+  "non-secure-after-editing",
-+  "non-secure-while-incognito",
-+  "non-secure-while-incognito-or-editing",
-+  "none",
-+  "normal_muted",
-+  "normal_vibrant",
-+  "note-taking-app-ids",
-+  "ntp-snippets-add-incomplete",
-+  "ntp-switch-to-existing-tab",
-+  "null",
-+  "num-raster-threads",
-+  "oauth2-client-id",
-+  "oauth2-client-secret",
-+  "off",
-+  "on",
-+  "oobe-bootstrapping-master",
-+  "oobe-force-show-screen",
-+  "oobe-guest-session",
-+  "oobe-skip-postlogin",
-+  "oobe-timer-interval",
-+  "open-ash",
-+  "opengraph",
-+  "origin-to-force-quic-on",
-+  "origin-trial-disabled-features",
-+  "origin-trial-disabled-tokens",
-+  "origin-trial-public-key",
-+  "original-process-start-time",
-+  "osmesa",
-+  "output",
-+  "override",
-+  "override-metrics-upload-url",
-+  "override-plugin-power-saver-for-testing",
-+  "override-use-software-gl-for-tests",
-+  "overscroll-history-navigation",
-+  "overscroll-start-threshold",
-+  "ozone-dump-file",
-+  "ozone-platform",
-+  "pack-extension",
-+  "pack-extension-key",
-+  "parent-profile",
-+  "parent-window",
-+  "passive-listeners-default",
-+  "password-store",
-+  "permission-request-api-scope",
-+  "permission-request-api-url",
-+  "ppapi",
-+  "ppapi-antialiased-text-enabled",
-+  "ppapi-broker",
-+  "ppapi-flash-args",
-+  "ppapi-flash-path",
-+  "ppapi-flash-version",
-+  "ppapi-in-process",
-+  "ppapi-plugin-launcher",
-+  "ppapi-startup-dialog",
-+  "ppapi-subpixel-rendering-setting",
-+  "prerender-from-omnibox",
-+  "previous-app",
-+  "primary",
-+  "print-to-pdf",
-+  "privet-ipv6-only",
-+  "process-per-site",
-+  "process-per-tab",
-+  "product-version",
-+  "profile-directory",
-+  "profiler-timing",
-+  "profiling",
-+  "profiling-at-start",
-+  "profiling-file",
-+  "profiling-flush",
-+  "progress-bar-animation",
-+  "progress-bar-completion",
-+  "prompt-for-external-extensions",
-+  "proxy-auto-detect",
-+  "proxy-bypass-list",
-+  "proxy-pac-url",
-+  "proxy-server",
-+  "q",
-+  "quic-connection-options",
-+  "quic-max-packet-length",
-+  "quic-version",
-+  "rdp_desktop_session",
-+  "reader-mode-feedback",
-+  "reader-mode-heuristics",
-+  "rebaseline-pixel-tests",
-+  "record-type",
-+  "reduce-security-for-testing",
-+  "reduced-referrer-granularity",
-+  "register-font-files",
-+  "register-pepper-plugins",
-+  "relauncher",
-+  "remote-debugging-address",
-+  "remote-debugging-port",
-+  "remote-debugging-socket-fd",
-+  "remote-debugging-socket-name",
-+  "remote-debugging-targets",
-+  "renderer",
-+  "renderer-client-id",
-+  "renderer-cmd-prefix",
-+  "renderer-process-limit",
-+  "renderer-startup-dialog",
-+  "renderer-wait-for-java-debugger",
-+  "renderpass",
-+  "repl",
-+  "report-vp9-as-an-unsupported-mime-type",
-+  "require-audio-hardware-for-testing",
-+  "reset-app-list-install-state",
-+  "reset-variation-state",
-+  "restore-last-session",
-+  "root",
-+  "root-layer-scrolls",
-+  "rtl",
-+  "run-layout-test",
-+  "runtime-deps-list-file",
-+  "safebrowsing-disable-auto-update",
-+  "safebrowsing-disable-download-protection",
-+  "safebrowsing-disable-extension-blacklist",
-+  "safebrowsing-manual-download-blacklist",
-+  "sandbox-ipc",
-+  "save-page-as-mhtml",
-+  "screen-config",
-+  "screenshot",
-+  "script-executable",
-+  "scripts-require-action",
-+  "scroll-end-effect",
-+  "search-provider-logo-url",
-+  "secondary",
-+  "secondary-display-layout",
-+  "secondary-ui-md",
-+  "service",
-+  "service-manager",
-+  "service-name",
-+  "service-pipe-token",
-+  "service-request-channel-token",
-+  "service-runner",
-+  "shared-files",
-+  "shill-stub",
-+  "show-app-list",
-+  "show-autofill-signatures",
-+  "show-autofill-type-predictions",
-+  "show-cert-link",
-+  "show-component-extension-options",
-+  "show-composited-layer-borders",
-+  "show-fps-counter",
-+  "show-icons",
-+  "show-layer-animation-bounds",
-+  "show-login-dev-overlay",
-+  "show-mac-overlay-borders",
-+  "show-md-login",
-+  "show-non-md-login",
-+  "show-overdraw-feedback",
-+  "show-paint-rects",
-+  "show-property-changed-rects",
-+  "show-saved-copy",
-+  "show-screenspace-rects",
-+  "show-surface-damage-rects",
-+  "silent-debugger-extension-api",
-+  "silent-launch",
-+  "simulate-critical-update",
-+  "simulate-elevated-recovery",
-+  "simulate-outdated",
-+  "simulate-outdated-no-au",
-+  "simulate-upgrade",
-+  "single-process",
-+  "site-per-process",
-+  "skip-gpu-data-loading",
-+  "skip-nostore-all",
-+  "skip-nostore-main",
-+  "skip-reencoding-on-skp-capture",
-+  "slow",
-+  "slow-connections-only",
-+  "slow-down-raster-scale-factor",
-+  "sms-test-messages",
-+  "spdy-proxy-auth-fallback",
-+  "spdy-proxy-auth-origin",
-+  "spdy-proxy-auth-value",
-+  "spelling-service-feedback-interval-seconds",
-+  "spelling-service-feedback-url",
-+  "spurious-power-button-accel-count",
-+  "spurious-power-button-keyboard-accel",
-+  "spurious-power-button-lid-angle-change",
-+  "spurious-power-button-screen-accel",
-+  "spurious-power-button-window",
-+  "ssl-key-log-file",
-+  "ssl-version-max",
-+  "ssl-version-min",
-+  "stable-release-mode",
-+  "start-fullscreen",
-+  "start-maximized",
-+  "start-stack-profiler",
-+  "started",
-+  "stub",
-+  "stub-cros-settings",
-+  "supports-dual-gpus",
-+  "surface",
-+  "swiftshader",
-+  "swiftshader-webgl",
-+  "sync-allow-insecure-xmpp-connection",
-+  "sync-deferred-startup-timeout-seconds",
-+  "sync-disable-deferred-startup",
-+  "sync-enable-get-update-avoidance",
-+  "sync-notification-host-port",
-+  "sync-on-draw-hardware",
-+  "sync-short-initial-retry-override",
-+  "sync-short-nudge-delay-for-test",
-+  "sync-url",
-+  "system-developer-mode",
-+  "system-log-upload-frequency",
-+  "tab-management-experiment-type-disabled",
-+  "tab-management-experiment-type-elderberry",
-+  "task-profiler",
-+  "team-drives",
-+  "test-auto-update-ui",
-+  "test-child-process",
-+  "test-cros-gaia-id-migration",
-+  "test-do-not-initialize-icu",
-+  "test-encryption-migration-ui",
-+  "test-gl-lib",
-+  "test-launcher-batch-limit",
-+  "test-launcher-bot-mode",
-+  "test-launcher-debug-launcher",
-+  "test-launcher-filter-file",
-+  "test-launcher-force-run-broken-tests",
-+  "test-launcher-jobs",
-+  "test-launcher-list-tests",
-+  "test-launcher-output",
-+  "test-launcher-print-test-stdio",
-+  "test-launcher-print-writable-path",
-+  "test-launcher-retry-limit",
-+  "test-launcher-shard-index",
-+  "test-launcher-summary-output",
-+  "test-launcher-test-part-results-limit",
-+  "test-launcher-timeout",
-+  "test-launcher-total-shards",
-+  "test-launcher-trace",
-+  "test-name",
-+  "test-tiny-timeout",
-+  "test-type",
-+  "testing-fixed-http-port",
-+  "testing-fixed-https-port",
-+  "tether-stub",
-+  "threads",
-+  "time",
-+  "timeout",
-+  "tls1",
-+  "tls1.1",
-+  "tls1.2",
-+  "tls1.3",
-+  "tls13-variant",
-+  "top-chrome-md",
-+  "top-controls-hide-threshold",
-+  "top-controls-show-threshold",
-+  "touch-calibration",
-+  "touch-devices",
-+  "touch-events",
-+  "touch-noise-filtering",
-+  "touch-selection-strategy",
-+  "touch_view",
-+  "trace-config-file",
-+  "trace-export-events-to-etw",
-+  "trace-shutdown",
-+  "trace-shutdown-file",
-+  "trace-startup",
-+  "trace-startup-duration",
-+  "trace-startup-file",
-+  "trace-to-console",
-+  "trace-to-file",
-+  "trace-to-file-name",
-+  "trace-upload-url",
-+  "tracelog",
-+  "translate-ranker-model-url",
-+  "translate-script-url",
-+  "translate-security-origin",
-+  "true",
-+  "trusted-download-sources",
-+  "try-chrome-again",
-+  "try-supported-channel-layouts",
-+  "type",
-+  "ui-disable-partial-swap",
-+  "ui-enable-layer-lists",
-+  "ui-enable-rgba-4444-textures",
-+  "ui-enable-zero-copy",
-+  "ui-prioritize-in-gpu-process",
-+  "ui-show-composited-layer-borders",
-+  "ui-show-fps-counter",
-+  "ui-show-layer-animation-bounds",
-+  "ui-show-paint-rects",
-+  "ui-show-property-changed-rects",
-+  "ui-show-screenspace-rects",
-+  "ui-show-surface-damage-rects",
-+  "ui-slow-animations",
-+  "ui-test-action-max-timeout",
-+  "ui-test-action-timeout",
-+  "uninstall",
-+  "unlimited-storage",
-+  "unsafe-pac-url",
-+  "unsafely-allow-protected-media-identifier-for-domain",
-+  "unsafely-treat-insecure-origin-as-secure",
-+  "use-angle",
-+  "use-cras",
-+  "use-double-buffering",
-+  "use-fake-device-for-media-stream",
-+  "use-fake-jpeg-decode-accelerator",
-+  "use-fake-ui-for-media-stream",
-+  "use-file-for-fake-audio-capture",
-+  "use-file-for-fake-video-capture",
-+  "use-first-display-as-internal",
-+  "use-gl",
-+  "use-gpu-in-tests",
-+  "use-ime-service",
-+  "use-mobile-user-agent",
-+  "use-mock-keychain",
-+  "use-passthrough-cmd-decoder",
-+  "use-simple-cache-backend",
-+  "use-system-default-printer",
-+  "use-test-config",
-+  "user-agent",
-+  "user-always-affiliated",
-+  "user-data-dir",
-+  "user-gesture-required",
-+  "user-gesture-required-for-cross-origin",
-+  "utility",
-+  "utility-allowed-dir",
-+  "utility-cmd-prefix",
-+  "utility-run-elevated",
-+  "v",
-+  "v2-sandbox",
-+  "v2-sandbox-enabled",
-+  "v8-cache-options",
-+  "v8-cache-strategies-for-cache-storage",
-+  "validate-crx",
-+  "validate-input-event-stream",
-+  "variations-override-country",
-+  "variations-server-url",
-+  "version",
-+  "video-image-texture-target",
-+  "video-threads",
-+  "video-underflow-threshold-ms",
-+  "virtual-time-budget",
-+  "vmodule",
-+  "voice-interaction-supported-locales",
-+  "wait-for-debugger",
-+  "wait-for-debugger-children",
-+  "wake-on-wifi-packet",
-+  "wallet-service-use-sandbox",
-+  "watcher",
-+  "waveout-buffers",
-+  "webapk-server-url",
-+  "webrtc-max-cpu-consumption-percentage",
-+  "webrtc-stun-probe-trial",
-+  "webview-enable-safebrowsing-support",
-+  "webview-sandboxed-renderer",
-+  "whitelisted-extension-id",
-+  "win-jumplist-action",
-+  "window-position",
-+  "window-size",
-+  "window-workspace",
-+  "windows10-custom-titlebar",
-+  "winhttp-proxy-resolver",
-+  "wm-window-animations-disabled",
-+  "yield-between-content-script-runs",
-+  "zygote",
-+  "zygote-cmd-prefix",
-+};
-+
-+bool IsBlacklistedArg(const base::CommandLine::CharType* arg) {
-+#if defined(OS_WIN)
-+  const auto converted = base::WideToUTF8(arg);
-+  const char* a = converted.c_str();
-+#else
-+  const char* a = arg;
-+#endif
-+
-+  static const char* prefixes[] = {"--", "-", "/"};
-+
-+  int prefix_length = 0;
-+  for (auto& prefix : prefixes) {
-+    if (base::StartsWith(a, prefix, base::CompareCase::SENSITIVE)) {
-+      prefix_length = strlen(prefix);
-+      break;
-+    }
-+  }
-+
-+  if (prefix_length > 0) {
-+    a += prefix_length;
-+    std::string switch_name =
-+        base::ToLowerASCII(base::StringPiece(a, strcspn(a, "=")));
-+    return std::binary_search(std::begin(kBlacklist), std::end(kBlacklist),
-+                              switch_name);
-+  }
-+
-+  return false;
-+}
-+
-+>>>>>>> .their
- }  // namespace
- 
- namespace atom {
-changed in both
-  base   100644 4bd88a5a43c03ceba308ec06fdf0cbadeddcaae3 atom/browser/api/atom_api_browser_view.cc
-  our    100644 bd83208694c61c4d7c43ce4be26939c2682b2a13 atom/browser/api/atom_api_browser_view.cc
-  their  100644 41f0e99cdd79bf1ad2c4c8c0db5aaa97ac5e1297 atom/browser/api/atom_api_browser_view.cc
-changed in both
-  base   100644 ced1cb31d8df7689f7652111720ba20fb029b1fe atom/browser/api/atom_api_menu_views.cc
-  our    100644 3da7dc2842fa4561e037aa67f290d0cc6ca71014 atom/browser/api/atom_api_menu_views.cc
-  their  100644 fa178e57d82413544b92172ae0ed4401ea5f178b atom/browser/api/atom_api_menu_views.cc
-@@ -49,8 +49,16 @@
-   menu_runners_[window_id] =
-       std::make_unique<MenuRunner>(model(), flags, close_callback);
-   menu_runners_[window_id]->RunMenuAt(
-+<<<<<<< .our
-       native_window->widget(), NULL, gfx::Rect(location, gfx::Size()),
-       views::MENU_ANCHOR_TOPLEFT, ui::MENU_SOURCE_MOUSE);
-+=======
-+      native_window->widget(),
-+      NULL,
-+      gfx::Rect(location, gfx::Size()),
-+      views::MENU_ANCHOR_TOPLEFT,
-+      ui::MENU_SOURCE_MOUSE);
-+>>>>>>> .their
- }
- 
- void MenuViews::ClosePopupAt(int32_t window_id) {
-removed in local
-  base   100644 0d22fad5b8b5e3ed7711d55aa763f930014a75d7 atom/browser/api/atom_api_screen_mac.mm
-  their  100644 056b775fdfc221cb0501ba5b7afd8de01f2d4d63 atom/browser/api/atom_api_screen_mac.mm
-changed in both
-  base   100644 6e5c4b9cbe77c1a4004bbc2bf7b0f0089ffb9004 atom/browser/api/atom_api_session.cc
-  our    100644 658f913bb60b66ae1bf3aae97d7d9158e56f7ee0 atom/browser/api/atom_api_session.cc
-  their  100644 373ef90c393af3921e1cbd2d6375e7b9d9b7ecb5 atom/browser/api/atom_api_session.cc
-@@ -451,6 +451,7 @@
-   AtomNetworkDelegate* network_delegate =
-       static_cast<AtomNetworkDelegate*>(context->network_delegate());
-   network_delegate->SetDevToolsNetworkEmulationClientId(client_id);
-+<<<<<<< .our
- }
- 
- void DestroyGlobalHandle(v8::Isolate* isolate,
-@@ -468,6 +469,8 @@
-       object->SetAlignedPointerInInternalField(0, nullptr);
-     }
-   }
-+=======
-+>>>>>>> .their
- }
- 
- }  // namespace
-changed in both
-  base   100644 83adf62eee8301c49799b5397f2dcf6bfdbbd295 atom/browser/api/atom_api_web_contents.cc
-  our    100644 20a1ac2e672f08ffea528b6e094ba530ff8083d1 atom/browser/api/atom_api_web_contents.cc
-  their  100644 9a19b727a82229565ec37e6a436bdbec4e670925 atom/browser/api/atom_api_web_contents.cc
-@@ -124,6 +124,30 @@
- struct Converter<PrintSettings> {
-   static bool FromV8(v8::Isolate* isolate,
-                      v8::Local<v8::Value> val,
-+<<<<<<< .our
-+=======
-+                     atom::SetSizeParams* out) {
-+    mate::Dictionary params;
-+    if (!ConvertFromV8(isolate, val, &params))
-+      return false;
-+    bool autosize;
-+    if (params.Get("enableAutoSize", &autosize))
-+      out->enable_auto_size.reset(new bool(autosize));
-+    gfx::Size size;
-+    if (params.Get("min", &size))
-+      out->min_size.reset(new gfx::Size(size));
-+    if (params.Get("max", &size))
-+      out->max_size.reset(new gfx::Size(size));
-+    if (params.Get("normal", &size))
-+      out->normal_size.reset(new gfx::Size(size));
-+    return true;
-+  }
-+};
-+
-+template<>
-+struct Converter<PrintSettings> {
-+  static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
-+>>>>>>> .their
-                      PrintSettings* out) {
-     mate::Dictionary dict;
-     if (!ConvertFromV8(isolate, val, &dict))
-@@ -280,7 +304,12 @@
- 
- // Called when CapturePage is done.
- void OnCapturePageDone(const base::Callback<void(const gfx::Image&)>& callback,
-+<<<<<<< .our
-                        const SkBitmap& bitmap) {
-+=======
-+                       const SkBitmap& bitmap,
-+                       content::ReadbackResponse response) {
-+>>>>>>> .their
-   // Hack to enable transparency in captured image
-   // TODO(nitsakh) Remove hack once fixed in chromium
-   const_cast<SkBitmap&>(bitmap).setAlphaType(kPremul_SkAlphaType);
-@@ -1015,6 +1044,18 @@
-                                     content::RenderFrameHost* frame_host) {
-   bool handled = true;
-   FrameDispatchHelper helper = {this, frame_host};
-+<<<<<<< .our
-+=======
-+  auto relay = NativeWindowRelay::FromWebContents(web_contents());
-+  if (relay) {
-+    IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(NativeWindow, message, frame_host)
-+      IPC_MESSAGE_FORWARD(AtomAutofillFrameHostMsg_HidePopup,
-+                          relay->window.get(), NativeWindow::HideAutofillPopup)
-+      IPC_MESSAGE_UNHANDLED(handled = false)
-+    IPC_END_MESSAGE_MAP()
-+  }
-+
-+>>>>>>> .their
-   IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(WebContents, message, frame_host)
-     IPC_MESSAGE_HANDLER(AtomFrameHostMsg_Message, OnRendererMessage)
-     IPC_MESSAGE_FORWARD_DELAY_REPLY(AtomFrameHostMsg_Message_Sync, &helper,
-@@ -1024,10 +1065,14 @@
-         FrameDispatchHelper::OnSetTemporaryZoomLevel)
-     IPC_MESSAGE_FORWARD_DELAY_REPLY(AtomFrameHostMsg_GetZoomLevel, &helper,
-                                     FrameDispatchHelper::OnGetZoomLevel)
-+<<<<<<< .our
- #if defined(TOOLKIT_VIEWS) && !defined(OS_MACOSX)
-     IPC_MESSAGE_HANDLER(AtomAutofillFrameHostMsg_ShowPopup, ShowAutofillPopup)
-     IPC_MESSAGE_HANDLER(AtomAutofillFrameHostMsg_HidePopup, HideAutofillPopup)
- #endif
-+=======
-+    IPC_MESSAGE_HANDLER(AtomAutofillFrameHostMsg_ShowPopup, ShowAutofillPopup)
-+>>>>>>> .their
-     IPC_MESSAGE_UNHANDLED(handled = false)
-   IPC_END_MESSAGE_MAP()
- 
-@@ -1075,6 +1120,20 @@
-        details.is_same_document, details.did_replace_entry);
- }
- 
-+<<<<<<< .our
-+=======
-+int64_t WebContents::GetIDForContents(content::WebContents* web_contents) {
-+  int64_t process_id = web_contents->GetRenderProcessHost()->GetID();
-+  int64_t routing_id = web_contents->GetMainFrame()->GetRoutingID();
-+  int64_t rv = (process_id << 32) + routing_id;
-+  return rv;
-+}
-+
-+int64_t WebContents::GetID() const {
-+  return WebContents::GetIDForContents(web_contents());
-+}
-+
-+>>>>>>> .their
- int WebContents::GetProcessID() const {
-   return web_contents()->GetMainFrame()->GetProcess()->GetID();
- }
-@@ -1552,7 +1611,11 @@
- bool WebContents::SendIPCMessage(bool all_frames,
-                                  const base::string16& channel,
-                                  const base::ListValue& args) {
-+<<<<<<< .our
-   auto* frame_host = web_contents()->GetMainFrame();
-+=======
-+  auto frame_host = web_contents()->GetMainFrame();
-+>>>>>>> .their
-   if (frame_host) {
-     return frame_host->Send(new AtomFrameMsg_Message(
-         frame_host->GetRoutingID(), all_frames, channel, args));
-@@ -1853,6 +1916,7 @@
-   rfh->Send(reply_msg);
- }
- 
-+<<<<<<< .our
- v8::Local<v8::Value> WebContents::GetPreloadPath(v8::Isolate* isolate) const {
-   if (auto* web_preferences = WebContentsPreferences::From(web_contents())) {
-     base::FilePath::StringType preload;
-@@ -1880,6 +1944,25 @@
- }
- 
- v8::Local<v8::Value> WebContents::GetOwnerBrowserWindow() const {
-+=======
-+v8::Local<v8::Value> WebContents::GetWebPreferences(v8::Isolate* isolate) {
-+  WebContentsPreferences* web_preferences =
-+      WebContentsPreferences::FromWebContents(web_contents());
-+  if (!web_preferences)
-+    return v8::Null(isolate);
-+  return mate::ConvertToV8(isolate, *web_preferences->web_preferences());
-+}
-+
-+v8::Local<v8::Value> WebContents::GetLastWebPreferences(v8::Isolate* isolate) {
-+  WebContentsPreferences* web_preferences =
-+      WebContentsPreferences::FromWebContents(web_contents());
-+  if (!web_preferences)
-+    return v8::Null(isolate);
-+  return mate::ConvertToV8(isolate, *web_preferences->last_web_preferences());
-+}
-+
-+v8::Local<v8::Value> WebContents::GetOwnerBrowserWindow() {
-+>>>>>>> .their
-   if (owner_window())
-     return BrowserWindow::From(isolate(), owner_window());
-   else
-@@ -2013,7 +2096,10 @@
-       .SetMethod("endFrameSubscription", &WebContents::EndFrameSubscription)
-       .SetMethod("startDrag", &WebContents::StartDrag)
-       .SetMethod("isGuest", &WebContents::IsGuest)
-+<<<<<<< .our
-       .SetMethod("attachToIframe", &WebContents::AttachToIframe)
-+=======
-+>>>>>>> .their
-       .SetMethod("isOffscreen", &WebContents::IsOffScreen)
-       .SetMethod("startPainting", &WebContents::StartPainting)
-       .SetMethod("stopPainting", &WebContents::StopPainting)
-changed in both
-  base   100644 16f23210557ca816cdeadd50b9332447eca8815f atom/browser/api/atom_api_web_contents.h
-  our    100644 7939f8268aa8c3371623e0c15f3b6001d7f1efa4 atom/browser/api/atom_api_web_contents.h
-  their  100644 027332a3706d5ac43a4a769234d361304bdc0350 atom/browser/api/atom_api_web_contents.h
-@@ -97,6 +97,8 @@
-   static void BuildPrototype(v8::Isolate* isolate,
-                              v8::Local<v8::FunctionTemplate> prototype);
- 
-+  static int64_t GetIDForContents(content::WebContents* web_contents);
-+
-   // Notifies to destroy any guest web contents before destroying self.
-   void DestroyWebContents(bool async);
- 
-@@ -234,8 +236,13 @@
-   v8::Local<v8::Value> GetPreloadPath(v8::Isolate* isolate) const;
- 
-   // Returns the web preferences of current WebContents.
-+<<<<<<< .our
-   v8::Local<v8::Value> GetWebPreferences(v8::Isolate* isolate) const;
-   v8::Local<v8::Value> GetLastWebPreferences(v8::Isolate* isolate) const;
-+=======
-+  v8::Local<v8::Value> GetWebPreferences(v8::Isolate* isolate);
-+  v8::Local<v8::Value> GetLastWebPreferences(v8::Isolate* isolate);
-+>>>>>>> .their
- 
-   // Returns the owner window.
-   v8::Local<v8::Value> GetOwnerBrowserWindow() const;
-changed in both
-  base   100644 3f53f4d3d7204f59037ba80556a2c9896e23aae4 atom/browser/api/atom_api_web_request.cc
-  our    100644 c088196f833160ac964e67030fa083302dd090b0 atom/browser/api/atom_api_web_request.cc
-  their  100644 ac84ac196b69a121a54dc64b87b7c2c1d6df21b5 atom/browser/api/atom_api_web_request.cc
-@@ -40,7 +40,11 @@
- 
- namespace {
- 
-+<<<<<<< .our
- template <typename Method, typename Event, typename Listener>
-+=======
-+template<typename Method, typename Event, typename Listener>
-+>>>>>>> .their
- void CallNetworkDelegateMethod(
-     brightray::URLRequestContextGetter* url_request_context_getter,
-     Method method,
-@@ -95,14 +99,24 @@
-   }
- 
-   brightray::URLRequestContextGetter* url_request_context_getter =
-+<<<<<<< .our
-       browser_context_->GetRequestContext();
-+=======
-+      browser_context_->url_request_context_getter();
-+>>>>>>> .their
-   if (!url_request_context_getter)
-     return;
-   BrowserThread::PostTask(
-       BrowserThread::IO, FROM_HERE,
-+<<<<<<< .our
-       base::BindOnce(&CallNetworkDelegateMethod<Method, Event, Listener>,
-                      base::RetainedRef(url_request_context_getter), method,
-                      type, std::move(patterns), std::move(listener)));
-+=======
-+      base::Bind(&CallNetworkDelegateMethod<Method, Event, Listener>,
-+                 base::RetainedRef(url_request_context_getter),
-+                 method, type, std::move(patterns), std::move(listener)));
-+>>>>>>> .their
- }
- 
- // static
-removed in local
-  base   100644 993f9680ccb475f8870a2e3b4da2d20472531d91 atom/browser/api/atom_api_window.cc
-  their  100644 d177afb300f65ba14daa8c07042d4d768b00fd54 atom/browser/api/atom_api_window.cc
-removed in local
-  base   100644 f86c387a34afb15920738413c6819176081b5ee7 atom/browser/api/atom_api_window.h
-  their  100644 e07f34e23f060906942b5fce81081965ea792204 atom/browser/api/atom_api_window.h
-changed in both
-  base   100644 8810fed4b9aef78842fb65db93ed2efebabb6928 atom/browser/api/event.cc
-  our    100644 7b617034eca5a229fc9323bfd6d531ebded752d6 atom/browser/api/event.cc
-  their  100644 1ee0d57e36068c9b6427c278e9a7a5a66b7f8f79 atom/browser/api/event.cc
-@@ -6,7 +6,10 @@
- 
- #include "atom/common/api/api_messages.h"
- #include "atom/common/native_mate_converters/string16_converter.h"
-+<<<<<<< .our
- #include "atom/common/native_mate_converters/value_converter.h"
-+=======
-+>>>>>>> .their
- #include "content/public/browser/render_frame_host.h"
- #include "content/public/browser/web_contents.h"
- #include "native_mate/object_template_builder.h"
-@@ -27,6 +30,7 @@
-   message_ = message;
- 
-   Observe(content::WebContents::FromRenderFrameHost(sender));
-+<<<<<<< .our
- }
- 
- void Event::RenderFrameDeleted(content::RenderFrameHost* rfh) {
-@@ -42,6 +46,23 @@
-     sender_ = new_rfh;
- }
- 
-+=======
-+}
-+
-+void Event::RenderFrameDeleted(content::RenderFrameHost* rfh) {
-+  if (sender_ != rfh)
-+    return;
-+  sender_ = nullptr;
-+  message_ = nullptr;
-+}
-+
-+void Event::RenderFrameHostChanged(content::RenderFrameHost* old_rfh,
-+                                   content::RenderFrameHost* new_rfh) {
-+  if (sender_ && sender_ == old_rfh)
-+    sender_ = new_rfh;
-+}
-+
-+>>>>>>> .their
- void Event::FrameDeleted(content::RenderFrameHost* rfh) {
-   if (sender_ != rfh)
-     return;
-@@ -57,7 +78,11 @@
-   if (message_ == nullptr || sender_ == nullptr)
-     return false;
- 
-+<<<<<<< .our
-   AtomFrameHostMsg_Message_Sync::WriteReplyParams(message_, result);
-+=======
-+  AtomFrameHostMsg_Message_Sync::WriteReplyParams(message_, json);
-+>>>>>>> .their
-   bool success = sender_->Send(message_);
-   message_ = nullptr;
-   sender_ = nullptr;
-changed in both
-  base   100644 d73bd2f64b55b5eb0827f819805578559b947f46 atom/browser/api/event.h
-  our    100644 fbec8f27574691005d203adbafb50709f5c2d010 atom/browser/api/event.h
-  their  100644 05ad7daff8ac524294c1cacb66f876efc9716dd4 atom/browser/api/event.h
-@@ -44,8 +44,13 @@
- 
-  private:
-   // Replyer for the synchronous messages.
-+<<<<<<< .our
-   content::RenderFrameHost* sender_ = nullptr;
-   IPC::Message* message_ = nullptr;
-+=======
-+  content::RenderFrameHost* sender_;
-+  IPC::Message* message_;
-+>>>>>>> .their
- 
-   DISALLOW_COPY_AND_ASSIGN(Event);
- };
-changed in both
-  base   100644 3dbcd0601ef8a63cd6712b566cdc7f388c85e3ee atom/browser/api/event_emitter.cc
-  our    100644 c6e810b51225c8f89eaf53ac3e46381b52ba63b5 atom/browser/api/event_emitter.cc
-  their  100644 91769cbb94794a978732773612a3fec245acd750 atom/browser/api/event_emitter.cc
-changed in both
-  base   100644 8d9d2960df35a33a09dfc79c4c35d424738df43f atom/browser/api/event_emitter.h
-  our    100644 5e4ca3b4ffcb184583ef386100eabda7a9e00da0 atom/browser/api/event_emitter.h
-  their  100644 8145113084a9c0c34ea808e3712879f5f70737c9 atom/browser/api/event_emitter.h
-changed in both
-  base   100644 c83a99c2b38708ca296b4c9215e26cb58eb9a7d2 atom/browser/atom_browser_client.cc
-  our    100644 57c4ee582405e6d501ec23940ccb10689ecd64a1 atom/browser/atom_browser_client.cc
-  their  100644 37dd43c49fc8056cf1a511d8c5895535a556cf9e atom/browser/atom_browser_client.cc
-@@ -343,6 +343,11 @@
-       web_preferences->AppendCommandLineSwitches(command_line);
-     SessionPreferences::AppendExtraCommandLineSwitches(
-         web_contents->GetBrowserContext(), command_line);
-+
-+    auto context_id = atom::api::WebContents::GetIDForContents(
-+      web_contents);
-+    command_line->AppendSwitchASCII(switches::kContextId,
-+      base::IntToString(context_id));
-   }
- }
- 
-changed in both
-  base   100644 f16ee50158508565cc1e043d3257ad687cc69215 atom/browser/browser.cc
-  our    100644 ce35de64d60c6767ac52596c1b32e7bde5ceefa0 atom/browser/browser.cc
-  their  100644 3ba915f91eb3403df9630697e77cce9ed7fa3307 atom/browser/browser.cc
-changed in both
-  base   100644 0970b26b776b34f68e5f22776e74c19ddcc039ad atom/browser/browser.h
-  our    100644 aed7d25c37da59c0dd5e09940a064c329353a0b2 atom/browser/browser.h
-  their  100644 a8c1a8c5e7c4409e3a78279da46fb2ba6112f409 atom/browser/browser.h
-@@ -277,7 +277,11 @@
-   bool is_ready_ = false;
- 
-   // The browser is being shutdown.
-+<<<<<<< .our
-   bool is_shutdown_ = false;
-+=======
-+  bool is_shutdown_;
-+>>>>>>> .their
- 
-   int badge_count_ = 0;
- 
-changed in both
-  base   100644 0faeee36f9390b36bc5963b2f90d2063e3603109 atom/browser/browser_mac.mm
-  our    100644 27e347eccebf006336d5d110c81717ecc45af9c3 atom/browser/browser_mac.mm
-  their  100644 e47b8cb9d3c7fcf24279cd6e973a1b00a85ea25a atom/browser/browser_mac.mm
-changed in both
-  base   100644 7c154b60b00e25c42847ceefb98723b50ea03dd0 atom/browser/native_browser_view.h
-  our    100644 56937e4c8c69e3605d2b6cc71a0877b74ff4e83d atom/browser/native_browser_view.h
-  their  100644 cab6980fa2cf035c1a5ca6b4aee822a0ee604fd4 atom/browser/native_browser_view.h
-changed in both
-  base   100644 17b0a1ee9006dd70888165a9209076fd7065f3cc atom/browser/native_browser_view_mac.mm
-  our    100644 0416e26e89f1e0f37366ef1798b4359da0729225 atom/browser/native_browser_view_mac.mm
-  their  100644 86df632638ef7772270569824515b251470d0c08 atom/browser/native_browser_view_mac.mm
-changed in both
-  base   100644 78e788b3019c23bce13fdc8d94385d4a3937cf22 atom/browser/native_browser_view_views.cc
-  our    100644 6414005a1e40d80ae86102b12edee0255cab9adb atom/browser/native_browser_view_views.cc
-  their  100644 def64d12e3520fa15a2b6779147a819a6eaec2f8 atom/browser/native_browser_view_views.cc
-changed in both
-  base   100644 5dcda13447cde098fccaf8782fefb97d861d47f4 atom/browser/native_browser_view_views.h
-  our    100644 8f8e860292baddad1156c50ae7cfaa0fd6e87d99 atom/browser/native_browser_view_views.h
-  their  100644 abf47178302ad7527c1640a3f41492f871f137e5 atom/browser/native_browser_view_views.h
-changed in both
-  base   100644 34778fb6434707e6ae3c70ab55e48e87eb556448 atom/browser/native_window.cc
-  our    100644 4ff2bcfcabfd34d8563f9ed213c03655a99dd9c6 atom/browser/native_window.cc
-  their  100644 26ac44607ebceadcde1d4c038890d914c888a0d5 atom/browser/native_window.cc
-@@ -21,6 +21,11 @@
- #include "ui/display/win/screen_win.h"
- #endif
- 
-+#if defined(OS_WIN)
-+#include "ui/base/win/shell.h"
-+#include "ui/display/win/screen_win.h"
-+#endif
-+
- DEFINE_WEB_CONTENTS_USER_DATA_KEY(atom::NativeWindowRelay);
- 
- namespace atom {
-@@ -45,9 +50,29 @@
- 
- }  // namespace
- 
-+<<<<<<< .our
- NativeWindow::NativeWindow(const mate::Dictionary& options,
-                            NativeWindow* parent)
-     : widget_(new views::Widget), parent_(parent), weak_factory_(this) {
-+=======
-+NativeWindow::NativeWindow(
-+    brightray::InspectableWebContents* inspectable_web_contents,
-+    const mate::Dictionary& options,
-+    NativeWindow* parent)
-+    : content::WebContentsObserver(inspectable_web_contents->GetWebContents()),
-+      has_frame_(true),
-+      transparent_(false),
-+      enable_larger_than_screen_(false),
-+      is_closed_(false),
-+      sheet_offset_x_(0.0),
-+      sheet_offset_y_(0.0),
-+      aspect_ratio_(0.0),
-+      parent_(parent),
-+      is_modal_(false),
-+      is_osr_dummy_(false),
-+      inspectable_web_contents_(inspectable_web_contents),
-+      weak_factory_(this) {
-+>>>>>>> .their
-   options.Get(options::kFrame, &has_frame_);
-   options.Get(options::kTransparent, &transparent_);
-   options.Get(options::kEnableLargerThanScreen, &enable_larger_than_screen_);
-changed in both
-  base   100644 d1cfa7cc352971772689ecd60a110b48ef1a7eaa atom/browser/native_window.h
-  our    100644 35b67e2dd230692c415a32aae5f0a5e99ab74ac0 atom/browser/native_window.h
-  their  100644 61922aea78e3b61db614354e6a578fcda925096b atom/browser/native_window.h
-@@ -220,6 +220,17 @@
-   virtual void HandleKeyboardEvent(
-       content::WebContents*,
-       const content::NativeWebKeyboardEvent& event) {}
-+<<<<<<< .our
-+=======
-+  virtual void ShowAutofillPopup(content::RenderFrameHost* frame_host,
-+                                 content::WebContents* web_contents,
-+                                 const gfx::RectF& bounds,
-+                                 const std::vector<base::string16>& values,
-+                                 const std::vector<base::string16>& labels) {}
-+  virtual void HideAutofillPopup(content::RenderFrameHost* frame_host) {}
-+>>>>>>> .their
-+
-+  virtual void UpdateDraggableRegionViews() {}
- 
-   // Public API used by platform-dependent delegates and observers to send UI
-   // related notifications.
-@@ -340,8 +351,13 @@
- class NativeWindowRelay
-     : public content::WebContentsUserData<NativeWindowRelay> {
-  public:
-+<<<<<<< .our
-   explicit NativeWindowRelay(base::WeakPtr<NativeWindow> window);
-   ~NativeWindowRelay() override;
-+=======
-+  explicit NativeWindowRelay(base::WeakPtr<NativeWindow> window)
-+      : key(UserDataKey()), window(window) {}
-+>>>>>>> .their
- 
-   static void* UserDataKey() {
-     return content::WebContentsUserData<NativeWindowRelay>::UserDataKey();
-changed in both
-  base   100644 60d8fc23f59a842c100412b1c236b87d0815a7a0 atom/browser/native_window_mac.h
-  our    100644 44a78198f44cdba9875e3fb27c8e2c87eaa6f33b atom/browser/native_window_mac.h
-  their  100644 9e8c3aef87dd8d2d4a3260587b7013d260649b55 atom/browser/native_window_mac.h
-@@ -118,8 +118,11 @@
-   void MoveTabToNewWindow() override;
-   void ToggleTabBar() override;
-   bool AddTabbedWindow(NativeWindow* window) override;
-+<<<<<<< .our
- 
-   bool SetWindowButtonVisibility(bool visible) override;
-+=======
-+>>>>>>> .their
- 
-   void SetVibrancy(const std::string& type) override;
-   void SetTouchBar(
-@@ -130,8 +133,19 @@
-   gfx::Rect ContentBoundsToWindowBounds(const gfx::Rect& bounds) const override;
-   gfx::Rect WindowBoundsToContentBounds(const gfx::Rect& bounds) const override;
- 
-+<<<<<<< .our
-   // Use a custom content view instead of Chromium's BridgedContentView.
-   void OverrideNSWindowContentView();
-+=======
-+  // content::WebContentsObserver:
-+  void RenderViewHostChanged(content::RenderViewHost* old_host,
-+                             content::RenderViewHost* new_host) override;
-+
-+  // Refresh the DraggableRegion views.
-+  void UpdateDraggableRegionViews() override {
-+    UpdateDraggableRegionViews(draggable_regions_);
-+  }
-+>>>>>>> .their
- 
-   // Set the attribute of NSWindow while work around a bug of zoom button.
-   void SetStyleMask(bool on, NSUInteger flag);
-changed in both
-  base   100644 ad1713e401240dbc1c2054551d0caeb41aea2884 atom/browser/native_window_mac.mm
-  our    100644 004263ec127709067e903ffbf31003b8844226b4 atom/browser/native_window_mac.mm
-  their  100644 0397c62d8df94b3ce66482c0d9c4b3b87ac97a45 atom/browser/native_window_mac.mm
-@@ -28,9 +28,12 @@
- #include "skia/ext/skia_utils_mac.h"
- #include "ui/gfx/skia_util.h"
- #include "ui/gl/gpu_switching_manager.h"
-+<<<<<<< .our
- #include "ui/views/background.h"
- #include "ui/views/cocoa/bridged_native_widget.h"
- #include "ui/views/widget/widget.h"
-+=======
-+>>>>>>> .their
- 
- // This view always takes the size of its superview. It is intended to be used
- // as a NSWindow's contentView.  It is needed because NSWindow's implementation
-@@ -1144,10 +1147,17 @@
- }
- 
- bool NativeWindowMac::AddTabbedWindow(NativeWindow* window) {
-+<<<<<<< .our
-   if (window_ == window->GetNativeWindow()) {
-     return false;
-   } else {
-     if (@available(macOS 10.12, *))
-+=======
-+  if (window_.get() == window->GetNativeWindow()) {
-+    return false;
-+  } else {
-+    if ([window_ respondsToSelector:@selector(addTabbedWindow:ordered:)])
-+>>>>>>> .their
-       [window_ addTabbedWindow:window->GetNativeWindow() ordered:NSWindowAbove];
-   }
-   return true;
-@@ -1185,15 +1195,22 @@
-       return;
-     }
- 
-+<<<<<<< .our
-     background_color_before_vibrancy_.reset([[window_ backgroundColor] retain]);
-     transparency_before_vibrancy_ = [window_ titlebarAppearsTransparent];
-     ui::GpuSwitchingManager::SetTransparent(true);
-+=======
-+    [vibrant_view removeFromSuperview];
-+    [window_ setVibrantView:nil];
-+    ui::GpuSwitchingManager::SetTransparent(transparent());
-+>>>>>>> .their
- 
-     if (title_bar_style_ != NORMAL) {
-       [window_ setTitlebarAppearsTransparent:YES];
-       [window_ setBackgroundColor:[NSColor clearColor]];
-     }
- 
-+<<<<<<< .our
-     NSVisualEffectView* effect_view = (NSVisualEffectView*)vibrant_view;
-     if (effect_view == nil) {
-       effect_view = [[[NSVisualEffectView alloc]
-@@ -1208,6 +1225,31 @@
-                              positioned:NSWindowBelow
-                              relativeTo:nil];
-     }
-+=======
-+  SetRenderWidgetHostOpaque(false);
-+  background_color_before_vibrancy_.reset([window_ backgroundColor]);
-+  transparency_before_vibrancy_ = [window_ titlebarAppearsTransparent];
-+  ui::GpuSwitchingManager::SetTransparent(true);
-+
-+  if (title_bar_style_ != NORMAL) {
-+    [window_ setTitlebarAppearsTransparent:YES];
-+    [window_ setBackgroundColor:[NSColor clearColor]];
-+  }
-+
-+  NSVisualEffectView* effect_view = (NSVisualEffectView*)vibrant_view;
-+  if (effect_view == nil) {
-+    effect_view = [[[NSVisualEffectView alloc]
-+        initWithFrame: [[window_ contentView] bounds]] autorelease];
-+    [window_ setVibrantView:(NSView*)effect_view];
-+
-+    [effect_view setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
-+    [effect_view setBlendingMode:NSVisualEffectBlendingModeBehindWindow];
-+    [effect_view setState:NSVisualEffectStateActive];
-+    [[window_ contentView] addSubview:effect_view
-+                           positioned:NSWindowBelow
-+                           relativeTo:nil];
-+  }
-+>>>>>>> .their
- 
-     NSVisualEffectMaterial vibrancyType = NSVisualEffectMaterialLight;
- 
-@@ -1387,6 +1429,7 @@
-     [parent->GetNativeWindow() addChildWindow:window_ ordered:NSWindowAbove];
- }
- 
-+<<<<<<< .our
- void NativeWindowMac::ShowWindowButton(NSWindowButton button) {
-   auto view = [window_ standardWindowButton:button];
-   [view.superview addSubview:view positioned:NSWindowAbove relativeTo:nil];
-@@ -1395,6 +1438,35 @@
- void NativeWindowMac::SetForwardMouseMessages(bool forward) {
-   [window_ setAcceptsMouseMovedEvents:forward];
- }
-+=======
-+  // Remove all ControlRegionViews that are added last time.
-+  // Note that [webView subviews] returns the view's mutable internal array and
-+  // it should be copied to avoid mutating the original array while enumerating
-+  // it.
-+  base::scoped_nsobject<NSArray> subviews([[webView subviews] copy]);
-+  for (NSView* subview in subviews.get())
-+    if ([subview isKindOfClass:[ControlRegionView class]])
-+      [subview removeFromSuperview];
-+
-+  // Draggable regions is implemented by having the whole web view draggable
-+  // (mouseDownCanMoveWindow) and overlaying regions that are not draggable.
-+  std::vector<gfx::Rect> drag_exclude_rects =
-+      CalculateNonDraggableRegions(regions, webViewWidth, webViewHeight);
-+
-+  if (browser_view_) {
-+    browser_view_->UpdateDraggableRegions(drag_exclude_rects);
-+  }
-+
-+  // Create and add a ControlRegionView for each region that needs to be
-+  // excluded from the dragging.
-+  for (const auto& rect : drag_exclude_rects) {
-+    base::scoped_nsobject<NSView> controlRegion(
-+        [[ControlRegionView alloc] initWithFrame:NSZeroRect]);
-+    [controlRegion setFrame:NSMakeRect(rect.x(), webViewHeight - rect.bottom(),
-+                                       rect.width(), rect.height())];
-+    [webView addSubview:controlRegion];
-+  }
-+>>>>>>> .their
- 
- void NativeWindowMac::OverrideNSWindowContentView() {
-   // When using `views::Widget` to hold WebContents, Chromium would use
-changed in both
-  base   100644 008109970ec8d3c55a2028a173c3b941908d78a7 atom/browser/native_window_views.cc
-  our    100644 0dba39942f92d54ba34db7709b73012055680d94 atom/browser/native_window_views.cc
-  their  100644 f3e6fc09c5850cbc3d6989a2a94607b1f9a5d514 atom/browser/native_window_views.cc
-@@ -1115,7 +1115,11 @@
-   if (!active && IsMenuBarAutoHide() && IsMenuBarVisible())
-     SetMenuBarVisibility(false);
- 
-+<<<<<<< .our
-   root_view_->ResetAltState();
-+=======
-+  menu_bar_alt_pressed_ = false;
-+>>>>>>> .their
- }
- 
- void NativeWindowViews::OnWidgetBoundsChanged(views::Widget* changed_widget,
-@@ -1237,9 +1241,138 @@
- void NativeWindowViews::HandleKeyboardEvent(
-     content::WebContents*,
-     const content::NativeWebKeyboardEvent& event) {
-+<<<<<<< .our
-   keyboard_event_handler_->HandleKeyboardEvent(event,
-                                                root_view_->GetFocusManager());
-   root_view_->HandleKeyEvent(event);
-+=======
-+  keyboard_event_handler_->HandleKeyboardEvent(event, GetFocusManager());
-+
-+  if (!menu_bar_)
-+    return;
-+
-+  // Show accelerator when "Alt" is pressed.
-+  if (menu_bar_visible_ && IsAltKey(event))
-+    menu_bar_->SetAcceleratorVisibility(
-+        event.GetType() == blink::WebInputEvent::kRawKeyDown);
-+
-+  // Show the submenu when "Alt+Key" is pressed.
-+  if (event.GetType() == blink::WebInputEvent::kRawKeyDown &&
-+      !IsAltKey(event) && IsAltModifier(event)) {
-+    if (!menu_bar_visible_ &&
-+        (menu_bar_->HasAccelerator(event.windows_key_code)))
-+      SetMenuBarVisibility(true);
-+    menu_bar_->ActivateAccelerator(event.windows_key_code);
-+    return;
-+  }
-+
-+  if (!menu_bar_autohide_)
-+    return;
-+
-+  // Toggle the menu bar only when a single Alt is released.
-+  if (event.GetType() == blink::WebInputEvent::kRawKeyDown && IsAltKey(event)) {
-+    // When a single Alt is pressed:
-+    menu_bar_alt_pressed_ = true;
-+  } else if (event.GetType() == blink::WebInputEvent::kKeyUp &&
-+             IsAltKey(event) && menu_bar_alt_pressed_) {
-+    // When a single Alt is released right after a Alt is pressed:
-+    menu_bar_alt_pressed_ = false;
-+    SetMenuBarVisibility(!menu_bar_visible_);
-+  } else {
-+    // When any other keys except single Alt have been pressed/released:
-+    menu_bar_alt_pressed_ = false;
-+  }
-+}
-+
-+void NativeWindowViews::ShowAutofillPopup(
-+    content::RenderFrameHost* frame_host,
-+    content::WebContents* web_contents,
-+    const gfx::RectF& bounds,
-+    const std::vector<base::string16>& values,
-+    const std::vector<base::string16>& labels) {
-+  bool is_offsceen = false;
-+  bool is_embedder_offscreen = false;
-+
-+  auto* web_contents_preferences =
-+      WebContentsPreferences::FromWebContents(web_contents);
-+  if (web_contents_preferences) {
-+    const auto* web_preferences = web_contents_preferences->web_preferences();
-+
-+    web_preferences->GetBoolean("offscreen", &is_offsceen);
-+    int guest_instance_id = 0;
-+    web_preferences->GetInteger(options::kGuestInstanceID, &guest_instance_id);
-+
-+    if (guest_instance_id) {
-+      auto manager = WebViewManager::GetWebViewManager(web_contents);
-+      if (manager) {
-+        auto embedder = manager->GetEmbedder(guest_instance_id);
-+        if (embedder) {
-+          is_embedder_offscreen = WebContentsPreferences::IsPreferenceEnabled(
-+              "offscreen", embedder);
-+        }
-+      }
-+    }
-+  }
-+
-+  autofill_popup_->CreateView(
-+      frame_host,
-+      is_offsceen || is_embedder_offscreen,
-+      widget(),
-+      bounds);
-+  autofill_popup_->SetItems(values, labels);
-+  autofill_popup_->UpdatePopupBounds(menu_bar_visible_ ? 0 : kMenuBarHeight);
-+}
-+
-+void NativeWindowViews::HideAutofillPopup(
-+    content::RenderFrameHost* frame_host) {
-+  autofill_popup_->Hide();
-+}
-+
-+void NativeWindowViews::Layout() {
-+  const auto size = GetContentsBounds().size();
-+  const auto menu_bar_bounds =
-+      menu_bar_visible_ ? gfx::Rect(0, 0, size.width(), kMenuBarHeight)
-+                        : gfx::Rect();
-+  if (menu_bar_) {
-+    menu_bar_->SetBoundsRect(menu_bar_bounds);
-+  }
-+
-+  if (web_view_) {
-+    web_view_->SetBoundsRect(
-+        gfx::Rect(0, menu_bar_bounds.height(), size.width(),
-+                  size.height() - menu_bar_bounds.height()));
-+  }
-+
-+  if (autofill_popup_.get())
-+    autofill_popup_->UpdatePopupBounds(menu_bar_visible_ ? 0 : kMenuBarHeight);
-+}
-+
-+gfx::Size NativeWindowViews::GetMinimumSize() const {
-+  return NativeWindow::GetMinimumSize();
-+}
-+
-+gfx::Size NativeWindowViews::GetMaximumSize() const {
-+  return NativeWindow::GetMaximumSize();
-+}
-+
-+bool NativeWindowViews::AcceleratorPressed(const ui::Accelerator& accelerator) {
-+  return accelerator_util::TriggerAcceleratorTableCommand(
-+      &accelerator_table_, accelerator);
-+}
-+
-+void NativeWindowViews::RegisterAccelerators(AtomMenuModel* menu_model) {
-+  // Clear previous accelerators.
-+  views::FocusManager* focus_manager = GetFocusManager();
-+  accelerator_table_.clear();
-+  focus_manager->UnregisterAccelerators(this);
-+
-+  // Register accelerators with focus manager.
-+  accelerator_util::GenerateAcceleratorTable(&accelerator_table_, menu_model);
-+  for (const auto& iter : accelerator_table_) {
-+    focus_manager->RegisterAccelerator(
-+        iter.first, ui::AcceleratorManager::kNormalPriority, this);
-+  }
-+>>>>>>> .their
- }
- 
- ui::WindowShowState NativeWindowViews::GetRestoredState() {
-changed in both
-  base   100644 a39e84ce5b8d7b757233dab4bed646e08cb8c76a atom/browser/net/asar/url_request_asar_job.cc
-  our    100644 85eb2e1dd142b6d64aafb5350ae47603db989e8f atom/browser/net/asar/url_request_asar_job.cc
-  their  100644 a6fe5e26540c9533f16dcf56fc955d0025de3b4a atom/browser/net/asar/url_request_asar_job.cc
-changed in both
-  base   100644 9b0f3a98dc53b922c0d070244f8f7457f332d850 atom/browser/net/atom_network_delegate.cc
-  our    100644 e71ea74317b69f31a5aac8e723902748972fed8f atom/browser/net/atom_network_delegate.cc
-  their  100644 239a64016febb8f9d81206d7f2a7d100ccd1f293 atom/browser/net/atom_network_delegate.cc
-@@ -250,6 +250,7 @@
- 
- AtomNetworkDelegate::~AtomNetworkDelegate() {}
- 
-+<<<<<<< .our
- void AtomNetworkDelegate::SetSimpleListenerInIO(SimpleEvent type,
-                                                 URLPatterns patterns,
-                                                 SimpleListener callback) {
-@@ -266,6 +267,26 @@
-     response_listeners_.erase(type);
-   else
-     response_listeners_[type] = {std::move(patterns), std::move(callback)};
-+=======
-+void AtomNetworkDelegate::SetSimpleListenerInIO(
-+    SimpleEvent type,
-+    URLPatterns patterns,
-+    SimpleListener callback) {
-+  if (callback.is_null())
-+    simple_listeners_.erase(type);
-+  else
-+    simple_listeners_[type] = { std::move(patterns), std::move(callback) };
-+}
-+
-+void AtomNetworkDelegate::SetResponseListenerInIO(
-+    ResponseEvent type,
-+    URLPatterns patterns,
-+    ResponseListener callback) {
-+  if (callback.is_null())
-+    response_listeners_.erase(type);
-+  else
-+    response_listeners_[type] = { std::move(patterns), std::move(callback) };
-+>>>>>>> .their
- }
- 
- void AtomNetworkDelegate::SetDevToolsNetworkEmulationClientId(
-changed in both
-  base   100644 e00c26ff2cbc134b987b4361896971e48056951d atom/browser/net/atom_network_delegate.h
-  our    100644 39a7a8ddfcda17fd7d022331132b54485d07a279 atom/browser/net/atom_network_delegate.h
-  their  100644 ad37a926d4732d94526f74b2f927e35504d2efe3 atom/browser/net/atom_network_delegate.h
-changed in both
-  base   100644 3313eba36bb903426778fac6cd18258a95fec677 atom/browser/resources/mac/Info.plist
-  our    100644 9094f0f7335edf833d51f688851e6a105de60433 atom/browser/resources/mac/Info.plist
-  their  100644 412d382f86312183bb93bb5c7d5f7ba55a3edc1e atom/browser/resources/mac/Info.plist
-@@ -17,9 +17,15 @@
-   <key>CFBundleIconFile</key>
-   <string>electron.icns</string>
-   <key>CFBundleVersion</key>
-+<<<<<<< .our
-   <string>4.0.0</string>
-   <key>CFBundleShortVersionString</key>
-   <string>4.0.0</string>
-+=======
-+  <string>2.0.4</string>
-+  <key>CFBundleShortVersionString</key>
-+  <string>2.0.4</string>
-+>>>>>>> .their
-   <key>LSApplicationCategoryType</key>
-   <string>public.app-category.developer-tools</string>
-   <key>LSMinimumSystemVersion</key>
-changed in both
-  base   100644 c349f99d712ff69960d35b18587ddb6c417f7cd5 atom/browser/resources/win/atom.rc
-  our    100644 c0bd831e8bddf10180f75cd40694831e2e98622d atom/browser/resources/win/atom.rc
-  their  100644 82b9e64e404c7ce6297eae82eaf6ebf862718565 atom/browser/resources/win/atom.rc
-@@ -56,8 +56,13 @@
- //
- 
- VS_VERSION_INFO VERSIONINFO
-+<<<<<<< .our
-  FILEVERSION 4,0,0,20180821
-  PRODUCTVERSION 4,0,0,20180821
-+=======
-+ FILEVERSION 2,0,4,0
-+ PRODUCTVERSION 2,0,4,0
-+>>>>>>> .their
-  FILEFLAGSMASK 0x3fL
- #ifdef _DEBUG
-  FILEFLAGS 0x1L
-@@ -74,12 +79,20 @@
-         BEGIN
-             VALUE "CompanyName", "GitHub, Inc."
-             VALUE "FileDescription", "Electron"
-+<<<<<<< .our
-             VALUE "FileVersion", "4.0.0"
-+=======
-+            VALUE "FileVersion", "2.0.4"
-+>>>>>>> .their
-             VALUE "InternalName", "electron.exe"
-             VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
-             VALUE "OriginalFilename", "electron.exe"
-             VALUE "ProductName", "Electron"
-+<<<<<<< .our
-             VALUE "ProductVersion", "4.0.0"
-+=======
-+            VALUE "ProductVersion", "2.0.4"
-+>>>>>>> .their
-             VALUE "SquirrelAwareVersion", "1"
-         END
-     END
-changed in both
-  base   100644 8bdf4e0c2be32fc7d704bc989d7ccec5dd5db672 atom/browser/ui/cocoa/atom_menu_controller.mm
-  our    100644 cecf30ce1c88e007957a65427648941765a6067e atom/browser/ui/cocoa/atom_menu_controller.mm
-  their  100644 ea141b495e710222f12913f35625cf435b947e18 atom/browser/ui/cocoa/atom_menu_controller.mm
-@@ -334,8 +334,13 @@
-   if (isMenuOpen_) {
-     isMenuOpen_ = NO;
-     model_->MenuWillClose();
-+<<<<<<< .our
-     // Post async task so that itemSelected runs before the close callback
-     // deletes the controller from the map which deallocates it
-+=======
-+    // Post async task so that itemSelected runs before the close callback	
-+    // deletes the controller from the map which deallocates it	
-+>>>>>>> .their
-     if (!closeCallback.is_null()) {
-       BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, closeCallback);
-     }
-changed in both
-  base   100644 b26d472db131f7be9d5bfbbd1cebfc992743d312 atom/browser/ui/file_dialog_mac.mm
-  our    100644 18b18a8b240cda5512ae49e0afde5c749bdf75c0 atom/browser/ui/file_dialog_mac.mm
-  their  100644 89ecaf46ec7f32ca4f3a3a89de13efcbdad5619f atom/browser/ui/file_dialog_mac.mm
-@@ -27,9 +27,12 @@
- 
- @implementation PopUpButtonHandler
- 
-+<<<<<<< .our
- @synthesize savePanel;
- @synthesize fileTypesList;
- 
-+=======
-+>>>>>>> .their
- - (instancetype)initWithPanel:(NSSavePanel*)panel
-                  andTypesList:(NSArray*)typesList {
-   self = [super init];
-@@ -55,6 +58,7 @@
- }
- 
- @end
-+<<<<<<< .our
- 
- // Manages the PopUpButtonHandler.
- @interface AtomAccessoryView : NSView
-@@ -65,6 +69,17 @@
- - (void)dealloc {
-   auto* popupButton =
-       static_cast<NSPopUpButton*>([[self subviews] objectAtIndex:1]);
-+=======
-+
-+// Manages the PopUpButtonHandler.
-+@interface AtomAccessoryView : NSView
-+@end
-+
-+@implementation AtomAccessoryView
-+
-+- (void)dealloc {
-+  auto* popupButton = static_cast<NSPopUpButton*>([[self subviews] objectAtIndex: 1]);
-+>>>>>>> .their
-   [[popupButton target] release];
-   [super dealloc];
- }
-@@ -76,8 +91,11 @@
- DialogSettings::DialogSettings() = default;
- DialogSettings::~DialogSettings() = default;
- 
-+<<<<<<< .our
- namespace {
- 
-+=======
-+>>>>>>> .their
- void SetAllowedFileTypes(NSSavePanel* dialog, const Filters& filters) {
-   NSMutableArray* file_types_list = [NSMutableArray array];
-   NSMutableArray* filter_names = [NSMutableArray array];
-@@ -85,9 +103,18 @@
-   // Create array to keep file types and their name.
-   for (const Filter& filter : filters) {
-     NSMutableSet* file_type_set = [NSMutableSet set];
-+<<<<<<< .our
-     [filter_names addObject:@(filter.first.c_str())];
-     for (const std::string& ext : filter.second) {
-       [file_type_set addObject:@(ext.c_str())];
-+=======
-+    base::ScopedCFTypeRef<CFStringRef> name_cf(
-+        base::SysUTF8ToCFStringRef(filter.first));
-+    [filter_names addObject:base::mac::CFToNSCast(name_cf.get())];
-+    for (const std::string& ext : filter.second) {
-+      base::ScopedCFTypeRef<CFStringRef> ext_cf(base::SysUTF8ToCFStringRef(ext));
-+      [file_type_set addObject:base::mac::CFToNSCast(ext_cf.get())];
-+>>>>>>> .their
-     }
-     [file_types_list addObject:[file_type_set allObjects]];
-   }
-@@ -119,12 +146,19 @@
-   [label setBezeled:NO];
-   [label setDrawsBackground:NO];
- 
-+<<<<<<< .our
-   NSPopUpButton* popupButton =
-       [[NSPopUpButton alloc] initWithFrame:NSMakeRect(50.0, 2, 140, 22.0)
-                                  pullsDown:NO];
-   PopUpButtonHandler* popUpButtonHandler =
-       [[PopUpButtonHandler alloc] initWithPanel:dialog
-                                    andTypesList:file_types_list];
-+=======
-+  NSPopUpButton* popupButton = [[NSPopUpButton alloc] initWithFrame:NSMakeRect(50.0, 2, 140, 22.0)
-+                                                          pullsDown:NO];
-+  PopUpButtonHandler* popUpButtonHandler = [[PopUpButtonHandler alloc] initWithPanel:dialog
-+                                                                        andTypesList:file_types_list];
-+>>>>>>> .their
-   [popupButton addItemsWithTitles:filter_names];
-   [popupButton setTarget:popUpButtonHandler];
-   [popupButton setAction:@selector(selectFormat:)];
-changed in both
-  base   100644 a358f676a8c41d15bb9c3157cce4a62ef8356855 atom/browser/ui/tray_icon_cocoa.mm
-  our    100644 2c434d7a9e312adfb3802628a3d092a95d4ac49f atom/browser/ui/tray_icon_cocoa.mm
-  their  100644 aedce38f656eaab389502df98bb20b28e3e3619a atom/browser/ui/tray_icon_cocoa.mm
-@@ -240,13 +240,22 @@
-   }
- 
-   // check title_ being nil
-+<<<<<<< .our
-   NSString* title = @"";
-+=======
-+  NSString *title = @"";
-+>>>>>>> .their
-   if (title_)
-     title = title_;
- 
-   attributedTitle_.reset([[NSMutableAttributedString alloc]
-+<<<<<<< .our
-       initWithString:title
-           attributes:attributes]);
-+=======
-+                             initWithString:title
-+                                 attributes:attributes]);
-+>>>>>>> .their
- 
-   // NSFontAttributeName:[NSFont menuBarFontOfSize:0],
-   // NSForegroundColorAttributeName:[self colorWithHighlight: highlight]
-changed in both
-  base   100644 e1836ad68985f6068a5ea4be76d6f58682056d04 atom/browser/ui/tray_icon_gtk.cc
-  our    100644 4c780285c80a157afca74b0927175ba3b045def9 atom/browser/ui/tray_icon_gtk.cc
-  their  100644 eb7be1ed3b4345cf825075785c1c1708a7b69d30 atom/browser/ui/tray_icon_gtk.cc
-@@ -36,9 +36,16 @@
-   if (libgtkui::AppIndicatorIcon::CouldOpen()) {
-     ++indicators_count;
-     icon_.reset(new libgtkui::AppIndicatorIcon(
-+<<<<<<< .our
-         base::StringPrintf("%s%d", Browser::Get()->GetName().c_str(),
-                            indicators_count),
-         image.AsImageSkia(), toolTip));
-+=======
-+        base::StringPrintf(
-+            "%s%d", Browser::Get()->GetName().c_str(), indicators_count),
-+        image.AsImageSkia(),
-+        toolTip));
-+>>>>>>> .their
-   } else {
-     icon_.reset(new libgtkui::Gtk2StatusIcon(image.AsImageSkia(), toolTip));
-   }
-changed in both
-  base   100644 5182e1a0f7f141e8ddfa95fd8cca8771f2cabd9f atom/browser/ui/views/frameless_view.cc
-  our    100644 8959ee13612979d2819621acc14ebf641fb7f116 atom/browser/ui/views/frameless_view.cc
-  their  100644 b78e897b8f51747fbeb86cdf1e507ecf5be0bf9b atom/browser/ui/views/frameless_view.cc
-changed in both
-  base   100644 f2ab22f70a6fa08ff1315d197ff3ff3cb700733f atom/browser/ui/views/global_menu_bar_x11.cc
-  our    100644 656bd8f991f87c06a240cdc09a3bfcd500d1c1c8 atom/browser/ui/views/global_menu_bar_x11.cc
-  their  100644 eaeefbd1fb411fca13d6de5dbbc17806d271affd atom/browser/ui/views/global_menu_bar_x11.cc
-changed in both
-  base   100644 bf9801a1457740da391c75621214b8d91cb7467d atom/browser/ui/views/menu_bar.cc
-  our    100644 e838d3cc217b5ffdb77226beff0d7217539f23f9 atom/browser/ui/views/menu_bar.cc
-  their  100644 d963c121bbd29bf3f67b488666297c86b4fee225 atom/browser/ui/views/menu_bar.cc
-@@ -18,11 +18,17 @@
- 
- namespace {
- 
-+<<<<<<< .our
-+=======
-+const char kViewClassName[] = "ElectronMenuBar";
-+
-+>>>>>>> .their
- // Default color of the menu bar.
- const SkColor kDefaultColor = SkColorSetARGB(255, 233, 233, 233);
- 
- }  // namespace
- 
-+<<<<<<< .our
- const char MenuBar::kViewClassName[] = "ElectronMenuBar";
- 
- MenuBar::MenuBar(views::View* window)
-@@ -32,12 +38,35 @@
-   SetLayoutManager(
-       std::make_unique<views::BoxLayout>(views::BoxLayout::kHorizontal));
-   window_->GetFocusManager()->AddFocusChangeListener(this);
-+=======
-+MenuBar::MenuBar(NativeWindow* window)
-+    : background_color_(kDefaultColor), menu_model_(NULL), window_(window) {
-+  RefreshColorCache();
-+  UpdateViewColors();
-+  SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal));
-+>>>>>>> .their
- }
- 
- MenuBar::~MenuBar() {
-   window_->GetFocusManager()->RemoveFocusChangeListener(this);
- }
- 
-+<<<<<<< .our
-+=======
-+void MenuBar::AddedToWidget() {
-+  auto fm = GetFocusManager();
-+  fm->AddFocusChangeListener(this);
-+  // Note that we don't own fm -- this manages the _connection_
-+  focus_manager_.reset(fm, [this](views::FocusManager* fm) {
-+    fm->RemoveFocusChangeListener(this);
-+  });
-+}
-+
-+void MenuBar::RemovedFromWidget() {
-+  focus_manager_.reset();
-+}
-+
-+>>>>>>> .their
- void MenuBar::SetMenu(AtomMenuModel* model) {
-   menu_model_ = model;
-   RebuildChildren();
-@@ -61,7 +90,11 @@
- }
- 
- void MenuBar::ActivateAccelerator(base::char16 key) {
-+<<<<<<< .our
-   auto* child = FindAccelChild(key);
-+=======
-+  auto child = FindAccelChild(key);
-+>>>>>>> .their
-   if (child)
-     static_cast<SubmenuButton*>(child)->Activate(nullptr);
- }
-@@ -151,7 +184,11 @@
- void MenuBar::RebuildChildren() {
-   RemoveAllChildViews(true);
-   for (int i = 0, n = GetItemCount(); i < n; ++i) {
-+<<<<<<< .our
-     auto* button =
-+=======
-+    auto button =
-+>>>>>>> .their
-         new SubmenuButton(menu_model_->GetLabelAt(i), this, background_color_);
-     button->set_tag(i);
-     AddChildView(button);
-@@ -169,7 +206,11 @@
- #if defined(USE_X11)
-   const auto& textColor = has_focus_ ? enabled_color_ : disabled_color_;
-   for (auto* child : GetChildrenInZOrder()) {
-+<<<<<<< .our
-     auto* button = static_cast<SubmenuButton*>(child);
-+=======
-+    auto button = static_cast<SubmenuButton*>(child);
-+>>>>>>> .their
-     button->SetTextColor(views::Button::STATE_NORMAL, textColor);
-     button->SetTextColor(views::Button::STATE_DISABLED, disabled_color_);
-     button->SetTextColor(views::Button::STATE_PRESSED, enabled_color_);
-@@ -178,7 +219,11 @@
-   }
- #elif defined(OS_WIN)
-   for (auto* child : GetChildrenInZOrder()) {
-+<<<<<<< .our
-     auto* button = static_cast<SubmenuButton*>(child);
-+=======
-+    auto button = static_cast<SubmenuButton*>(child);
-+>>>>>>> .their
-     button->SetUnderlineColor(color_utils::GetSysSkColor(COLOR_MENUTEXT));
-   }
- #endif
-changed in both
-  base   100644 761e31b98ea75f44bcd016da3b34b7615f3b409f atom/browser/ui/views/menu_bar.h
-  our    100644 2b10ba3e3bf2ccfc0453fdb59ad022ef7da8ed5b atom/browser/ui/views/menu_bar.h
-  their  100644 13cfa32f3988881e3aa87cae6cae65656fa68d70 atom/browser/ui/views/menu_bar.h
-@@ -5,6 +5,12 @@
- #ifndef ATOM_BROWSER_UI_VIEWS_MENU_BAR_H_
- #define ATOM_BROWSER_UI_VIEWS_MENU_BAR_H_
- 
-+<<<<<<< .our
-+=======
-+#include <memory>
-+
-+#include "atom/browser/native_window.h"
-+>>>>>>> .their
- #include "atom/browser/ui/atom_menu_model.h"
- #include "ui/views/controls/button/menu_button_listener.h"
- #include "ui/views/focus/focus_manager.h"
-@@ -49,7 +55,9 @@
- 
-  protected:
-   // views::View:
-+  void AddedToWidget() override;
-   const char* GetClassName() const override;
-+  void RemovedFromWidget() override;
- 
-   // views::MenuButtonListener:
-   void OnMenuButtonClicked(views::MenuButton* source,
-@@ -79,6 +87,11 @@
- 
-   bool has_focus_ = true;
- 
-+  View* FindAccelChild(base::char16 key);
-+
-+  std::shared_ptr<views::FocusManager> focus_manager_;
-+  bool has_focus_ = true;
-+
-   DISALLOW_COPY_AND_ASSIGN(MenuBar);
- };
- 
-changed in both
-  base   100644 3c3cff3c65410f2e61bdade6e457a096ffba3a54 atom/browser/ui/views/submenu_button.cc
-  our    100644 1124d3d01471876fefa2757570ba3cff796a991c atom/browser/ui/views/submenu_button.cc
-  their  100644 baee28f2cd6931611e048ec46c83e602b95b4b59 atom/browser/ui/views/submenu_button.cc
-@@ -82,8 +82,12 @@
- 
- bool SubmenuButton::GetUnderlinePosition(const base::string16& text,
-                                          base::char16* accelerator,
-+<<<<<<< .our
-                                          int* start,
-                                          int* end) const {
-+=======
-+                                         int* start, int* end) const {
-+>>>>>>> .their
-   int pos, span;
-   base::string16 trimmed = gfx::RemoveAcceleratorChar(text, '&', &pos, &span);
-   if (pos > -1 && span != 0) {
-@@ -96,9 +100,14 @@
-   return false;
- }
- 
-+<<<<<<< .our
- void SubmenuButton::GetCharacterPosition(const base::string16& text,
-                                          int index,
-                                          int* pos) const {
-+=======
-+void SubmenuButton::GetCharacterPosition(
-+    const base::string16& text, int index, int* pos) const {
-+>>>>>>> .their
-   int height = 0;
-   gfx::Canvas::SizeStringInt(text.substr(0, index), gfx::FontList(), pos,
-                              &height, 0, 0);
-changed in both
-  base   100644 5c05481cbbfb85b5d77511cb91cc19cc8ef0e626 atom/browser/ui/views/submenu_button.h
-  our    100644 d8b7785da131271e88533879d090badfd6e49dd5 atom/browser/ui/views/submenu_button.h
-  their  100644 0f7eddf4c914790675f0c9bfab696b2a96b91f74 atom/browser/ui/views/submenu_button.h
-@@ -33,11 +33,17 @@
-  private:
-   bool GetUnderlinePosition(const base::string16& text,
-                             base::char16* accelerator,
-+<<<<<<< .our
-                             int* start,
-                             int* end) const;
-   void GetCharacterPosition(const base::string16& text,
-                             int index,
-                             int* pos) const;
-+=======
-+                            int* start, int* end) const;
-+  void GetCharacterPosition(
-+      const base::string16& text, int index, int* pos) const;
-+>>>>>>> .their
- 
-   base::char16 accelerator_ = 0;
- 
-changed in both
-  base   100644 84a6d9aa3e50ced33616fb4b78e124f39461cd0e atom/browser/ui/win/atom_desktop_window_tree_host_win.cc
-  our    100644 97857d6515aa5617cf8c1972690a1dcdfd645ac1 atom/browser/ui/win/atom_desktop_window_tree_host_win.cc
-  their  100644 3da0241a27a9d272c09db30db068939c1bc66d19 atom/browser/ui/win/atom_desktop_window_tree_host_win.cc
-changed in both
-  base   100644 47e4cb6aed2a962bfdd2a92edaca74b452d15c4d atom/browser/ui/win/atom_desktop_window_tree_host_win.h
-  our    100644 30af3cc162b4429cb3335c6864b801eac1d5f963 atom/browser/ui/win/atom_desktop_window_tree_host_win.h
-  their  100644 b0164f2ab6ca9580d11ae1aaff68d9caae314d54 atom/browser/ui/win/atom_desktop_window_tree_host_win.h
-@@ -25,10 +25,15 @@
-   ~AtomDesktopWindowTreeHostWin() override;
- 
-  protected:
-+<<<<<<< .our
-   bool PreHandleMSG(UINT message,
-                     WPARAM w_param,
-                     LPARAM l_param,
-                     LRESULT* result) override;
-+=======
-+  bool PreHandleMSG(
-+      UINT message, WPARAM w_param, LPARAM l_param, LRESULT* result) override;
-+>>>>>>> .their
-   bool HasNativeFrame() const override;
- 
-  private:
-changed in both
-  base   100644 2cbf07be86a812f07105846dc8caf8226a8595df atom/browser/web_contents_preferences.cc
-  our    100644 c21c93383155091a7481cdd4e741cefad90a4a55 atom/browser/web_contents_preferences.cc
-  their  100644 98b39fee234cb15ac0da99fd5639c7b8265d71b0 atom/browser/web_contents_preferences.cc
-@@ -97,6 +97,7 @@
-   instances_.push_back(this);
- 
-   // Set WebPreferences defaults onto the JS object
-+<<<<<<< .our
-   SetDefaultBoolIfUndefined(options::kPlugins, false);
-   SetDefaultBoolIfUndefined(options::kExperimentalFeatures, false);
-   bool node = SetDefaultBoolIfUndefined(options::kNodeIntegration, true);
-@@ -104,12 +105,23 @@
-   SetDefaultBoolIfUndefined(options::kWebviewTag, node);
-   SetDefaultBoolIfUndefined(options::kSandbox, false);
-   SetDefaultBoolIfUndefined(options::kNativeWindowOpen, false);
-+=======
-+  SetDefaultBoolIfUndefined("plugins", false);
-+  SetDefaultBoolIfUndefined(options::kExperimentalFeatures, false);
-+  SetDefaultBoolIfUndefined(options::kExperimentalCanvasFeatures, false);
-+  bool node = SetDefaultBoolIfUndefined(options::kNodeIntegration, true);
-+  SetDefaultBoolIfUndefined(options::kNodeIntegrationInWorker, false);
-+  SetDefaultBoolIfUndefined(options::kWebviewTag, node);
-+  SetDefaultBoolIfUndefined("sandbox", false);
-+  SetDefaultBoolIfUndefined("nativeWindowOpen", false);
-+>>>>>>> .their
-   SetDefaultBoolIfUndefined(options::kContextIsolation, false);
-   SetDefaultBoolIfUndefined("javascript", true);
-   SetDefaultBoolIfUndefined("images", true);
-   SetDefaultBoolIfUndefined("textAreasAreResizable", true);
-   SetDefaultBoolIfUndefined("webgl", true);
-   bool webSecurity = true;
-+<<<<<<< .our
-   SetDefaultBoolIfUndefined(options::kWebSecurity, webSecurity);
-   // If webSecurity was explicity set to false, let's inherit that into
-   // insecureContent
-@@ -125,6 +137,21 @@
-   SetDefaultBoolIfUndefined(options::kOffscreen, false);
- 
-   last_preference_ = preference_.Clone();
-+=======
-+  SetDefaultBoolIfUndefined("webSecurity", webSecurity);
-+  // If webSecurity was explicity set to false, let's inherit that into
-+  // insecureContent
-+  if (web_preferences.Get("webSecurity", &webSecurity) && !webSecurity) {
-+    SetDefaultBoolIfUndefined("allowRunningInsecureContent", true);
-+  } else {
-+    SetDefaultBoolIfUndefined("allowRunningInsecureContent", false);
-+  }
-+  #if defined(OS_MACOSX)
-+  SetDefaultBoolIfUndefined(options::kScrollBounce, false);
-+  #endif
-+  SetDefaultBoolIfUndefined("offscreen", false);
-+  last_web_preferences_.MergeDictionary(&web_preferences_);
-+>>>>>>> .their
- }
- 
- WebContentsPreferences::~WebContentsPreferences() {
-@@ -154,6 +181,16 @@
-   return default_value;
- }
- 
-+bool WebContentsPreferences::SetDefaultBoolIfUndefined(const std::string key,
-+                                                       bool val) {
-+  bool existing;
-+  if (!web_preferences_.GetBoolean(key, &existing)) {
-+    web_preferences_.SetBoolean(key, val);
-+    return val;
-+  }
-+  return existing;
-+}
-+
- void WebContentsPreferences::Merge(const base::DictionaryValue& extend) {
-   if (preference_.is_dict())
-     static_cast<base::DictionaryValue*>(&preference_)->MergeDictionary(&extend);
-@@ -212,8 +249,18 @@
-   return FromWebContents(web_contents);
- }
- 
-+<<<<<<< .our
- void WebContentsPreferences::AppendCommandLineSwitches(
-     base::CommandLine* command_line) {
-+=======
-+  // We are appending args to a webContents so let's save the current state
-+  // of our preferences object so that during the lifetime of the WebContents
-+  // we can fetch the options used to initally configure the WebContents
-+  self->last_web_preferences_.Clear();
-+  self->last_web_preferences_.MergeDictionary(&web_preferences);
-+
-+  bool b;
-+>>>>>>> .their
-   // Check if plugins are enabled.
-   if (IsEnabled(options::kPlugins))
-     command_line->AppendSwitch(switches::kEnablePlugins);
-changed in both
-  base   100644 94dd8dc598bef5cc35383d69d20ade8d644a7ef5 atom/browser/web_contents_preferences.h
-  our    100644 d835347afcd259f473f95271a2c19e42afcc6f2b atom/browser/web_contents_preferences.h
-  their  100644 28ee9a85485e26b33b8a7852a4a212b4c11b71a0 atom/browser/web_contents_preferences.h
-@@ -59,25 +59,45 @@
-   bool GetPreloadPath(base::FilePath::StringType* path) const;
- 
-   // Returns the web preferences.
-+<<<<<<< .our
-   base::Value* preference() { return &preference_; }
-   base::Value* last_preference() { return &last_preference_; }
-+=======
-+  base::DictionaryValue* web_preferences() { return &web_preferences_; }
-+  base::DictionaryValue* last_web_preferences() {
-+    return &last_web_preferences_;
-+  }
-+>>>>>>> .their
- 
-  private:
-   friend class content::WebContentsUserData<WebContentsPreferences>;
-   friend class AtomBrowserClient;
- 
-+<<<<<<< .our
-   // Get WebContents according to process ID.
-   static content::WebContents* GetWebContentsFromProcessID(int process_id);
- 
-   // Set preference value to given bool if user did not provide value
-   bool SetDefaultBoolIfUndefined(const base::StringPiece& key, bool val);
-+=======
-+  // Set preference value to given bool if user did not provide value
-+  bool SetDefaultBoolIfUndefined(const std::string key, bool val);
-+
-+  // Get preferences value as integer possibly coercing it from a string
-+  bool GetInteger(const std::string& attributeName, int* intValue);
-+>>>>>>> .their
- 
-   static std::vector<WebContentsPreferences*> instances_;
- 
-   content::WebContents* web_contents_;
-+<<<<<<< .our
- 
-   base::Value preference_ = base::Value(base::Value::Type::DICTIONARY);
-   base::Value last_preference_ = base::Value(base::Value::Type::DICTIONARY);
-+=======
-+  base::DictionaryValue web_preferences_;
-+  base::DictionaryValue last_web_preferences_;
-+>>>>>>> .their
- 
-   DISALLOW_COPY_AND_ASSIGN(WebContentsPreferences);
- };
-changed in both
-  base   100644 1dd479883d872dc6d76ef069782aad6dc4f731da atom/browser/web_dialog_helper.cc
-  our    100644 74c8573d13f15bcaa189abdc40fa0cd8e48f89be atom/browser/web_dialog_helper.cc
-  their  100644 c76b48a74b3629b9b8588983cb4563aada6d28b9 atom/browser/web_dialog_helper.cc
-changed in both
-  base   100644 ad8c1d49bbc049b89eb4c69224b42fb51906c726 atom/common/api/api_messages.h
-  our    100644 6131a7a473c68e31790fcd8697c8f380c65ad275 atom/common/api/api_messages.h
-  their  100644 46e6142260d67b6408060ccaf328ee1f74335fe4 atom/common/api/api_messages.h
-@@ -59,6 +59,7 @@
- 
- // Sent by renderer to set the temporary zoom level.
- IPC_SYNC_MESSAGE_ROUTED1_1(AtomFrameHostMsg_SetTemporaryZoomLevel,
-+<<<<<<< .our
-                            double /* zoom level */,
-                            double /* result */)
- 
-@@ -69,3 +70,10 @@
- IPC_MESSAGE_ROUTED2(AtomFrameHostMsg_PDFSaveURLAs,
-                     GURL /* url */,
-                     content::Referrer /* referrer */)
-+=======
-+                            double /* zoom level */,
-+                            double /* result */)
-+
-+// Sent by renderer to get the zoom level.
-+IPC_SYNC_MESSAGE_ROUTED0_1(AtomFrameHostMsg_GetZoomLevel, double /* result */)
-+>>>>>>> .their
-changed in both
-  base   100644 a01ca8f84d917f6402a2e8d0aa153c6f7be9a3c5 atom/common/api/atom_api_v8_util.cc
-  our    100644 3d80db0c0a4cdbb4c7a78fa7e4266fc6fc87193f atom/common/api/atom_api_v8_util.cc
-  their  100644 f0875b17843fcaa61092321e5d68a4e338c56b77 atom/common/api/atom_api_v8_util.cc
-@@ -12,10 +12,20 @@
- #include "atom/common/native_mate_converters/gurl_converter.h"
- #include "atom/common/node_includes.h"
- #include "base/hash.h"
-+#include "base/process/process_handle.h"
-+#include "base/strings/stringprintf.h"
- #include "native_mate/dictionary.h"
- #include "url/origin.h"
- #include "v8/include/v8-profiler.h"
- 
-+// This is defined in later versions of Chromium, remove this if you see
-+// compiler complaining duplicate defines.
-+#if defined(OS_WIN) || defined(OS_FUCHSIA)
-+#define CrPRIdPid "ld"
-+#else
-+#define CrPRIdPid "d"
-+#endif
-+
- namespace std {
- 
- // The hash function used by DoubleIDWeakMap.
-@@ -90,6 +100,16 @@
-   return object->GetIdentityHash();
- }
- 
-+std::string GetContextID(v8::Isolate* isolate) {
-+  // When a page is reloaded, V8 and blink may have optimizations that do not
-+  // free blink::WebLocalFrame and v8::Context and reuse them for the new page,
-+  // while we always recreate node::Environment when a page is loaded.
-+  // So the only reliable way to return an identity for a page, is to return the
-+  // address of the node::Environment instance.
-+  node::Environment* env = node::Environment::GetCurrent(isolate);
-+  return base::StringPrintf("%" CrPRIdPid "-%p", base::GetCurrentProcId(), env);
-+}
-+
- void TakeHeapSnapshot(v8::Isolate* isolate) {
-   isolate->GetHeapProfiler()->TakeHeapSnapshot();
- }
-@@ -112,6 +132,7 @@
-   dict.SetMethod("setHiddenValue", &SetHiddenValue);
-   dict.SetMethod("deleteHiddenValue", &DeleteHiddenValue);
-   dict.SetMethod("getObjectHash", &GetObjectHash);
-+  dict.SetMethod("getContextId", &GetContextID);
-   dict.SetMethod("takeHeapSnapshot", &TakeHeapSnapshot);
-   dict.SetMethod("setRemoteCallbackFreer", &atom::RemoteCallbackFreer::BindTo);
-   dict.SetMethod("setRemoteObjectFreer", &atom::RemoteObjectFreer::BindTo);
-changed in both
-  base   100644 d1a185d51f394b1828d66cbcf2a1d1cc278de23d atom/common/api/remote_callback_freer.cc
-  our    100644 eba828591353dae53d1b7cdaa60fee52166d7473 atom/common/api/remote_callback_freer.cc
-  their  100644 c15d5389a2e99fa0f305a812860a3232a3ec069d atom/common/api/remote_callback_freer.cc
-@@ -39,7 +39,11 @@
-   base::ListValue args;
-   args.AppendString(context_id_);
-   args.AppendInteger(object_id_);
-+<<<<<<< .our
-   auto* frame_host = web_contents()->GetMainFrame();
-+=======
-+  auto frame_host = web_contents()->GetMainFrame();
-+>>>>>>> .their
-   if (frame_host) {
-     frame_host->Send(new AtomFrameMsg_Message(frame_host->GetRoutingID(), false,
-                                               channel, args));
-changed in both
-  base   100644 315127822d1709802abf317c4d8cf49ec7e2bfaa atom/common/api/remote_object_freer.cc
-  our    100644 8afe8b9a32bc4ba4d5cdfc66ecf7036b8553cb48 atom/common/api/remote_object_freer.cc
-  their  100644 ef028441e3da5c7d56f6bdba2f162814ff6b21f3 atom/common/api/remote_object_freer.cc
-changed in both
-  base   100644 5fa39680ca814675d344665b3b2a6ce5d94e625f atom/common/atom_version.h
-  our    100644 65e7d19911559a40b1b258319df5fe0fa180354f atom/common/atom_version.h
-  their  100644 6b78efeba87a33162cec320480ee4a50219a9ae5 atom/common/atom_version.h
-@@ -5,10 +5,17 @@
- #ifndef ATOM_COMMON_ATOM_VERSION_H_
- #define ATOM_COMMON_ATOM_VERSION_H_
- 
-+<<<<<<< .our
- #define ATOM_MAJOR_VERSION 4
- #define ATOM_MINOR_VERSION 0
- #define ATOM_PATCH_VERSION 0
- #define ATOM_PRE_RELEASE_VERSION -nightly.20180821
-+=======
-+#define ATOM_MAJOR_VERSION 2
-+#define ATOM_MINOR_VERSION 0
-+#define ATOM_PATCH_VERSION 4
-+// #define ATOM_PRE_RELEASE_VERSION
-+>>>>>>> .their
- 
- #ifndef ATOM_STRINGIFY
- #define ATOM_STRINGIFY(n) ATOM_STRINGIFY_HELPER(n)
-changed in both
-  base   100644 a7908ef30c6bafc4aca1da9a870f7ae12703fe04 atom/common/crash_reporter/crash_reporter_win.cc
-  our    100644 c574da71c9de9bd8c7b7cad57d3a0f84708fb97c atom/common/crash_reporter/crash_reporter_win.cc
-  their  100644 49f90b7e6665727b697a243414544bae304fde6e atom/common/crash_reporter/crash_reporter_win.cc
-changed in both
-  base   100644 cff228ba49068a8a683257e9ac50778437a56c45 atom/common/linux/application_info.cc
-  our    100644 3354c73b8b60f77cf054f975ea713d96b7e7683e atom/common/linux/application_info.cc
-  their  100644 05bd7f6fc15015a4f570e36801aea622a8f0cb3a atom/common/linux/application_info.cc
-@@ -19,7 +19,11 @@
- namespace {
- 
- GDesktopAppInfo* get_desktop_app_info() {
-+<<<<<<< .our
-   GDesktopAppInfo* ret = nullptr;
-+=======
-+  GDesktopAppInfo * ret = nullptr;
-+>>>>>>> .their
- 
-   std::string desktop_id;
-   if (brightray::platform_util::GetDesktopName(&desktop_id))
-changed in both
-  base   100644 eed6e7bc092f84bd1bde673c27f5fe5363c7783c atom/common/options_switches.cc
-  our    100644 8b1836f80c583e4db68971ff1b00ca4f86356b45 atom/common/options_switches.cc
-  their  100644 c1cd185443c0fdbadeb7ba2e174d2048ab2d45d7 atom/common/options_switches.cc
-@@ -188,6 +188,9 @@
- // The application path
- const char kAppPath[] = "app-path";
- 
-+// The context ID for this process
-+const char kContextId[] = "context-id";
-+
- // The command line switch versions of the options.
- const char kBackgroundColor[] = "background-color";
- const char kPreloadScript[] = "preload";
-changed in both
-  base   100644 525301971c8a05c45e12aada7d0534b84307aebf atom/common/options_switches.h
-  our    100644 5f6d7e9d38120668ed06922ced2f8d6a6e27a52b atom/common/options_switches.h
-  their  100644 9d65bc376925906063c24a9a254b2c31c7e22c34 atom/common/options_switches.h
-@@ -92,6 +92,7 @@
- extern const char kSecureSchemes[];
- extern const char kAppUserModelId[];
- extern const char kAppPath[];
-+extern const char kContextId[];
- 
- extern const char kBackgroundColor[];
- extern const char kPreloadScript[];
-changed in both
-  base   100644 7bee1411ba1c2fbac516ff8b65bcbd89f6132819 atom/renderer/api/atom_api_renderer_ipc.cc
-  our    100644 3e48a4f7d0c11f40e6360b0acc2c83c38e671319 atom/renderer/api/atom_api_renderer_ipc.cc
-  their  100644 ad6a12b90d525e9c6a49fac7a5d122b8c2c295f9 atom/renderer/api/atom_api_renderer_ipc.cc
-@@ -12,8 +12,13 @@
- #include "native_mate/dictionary.h"
- #include "third_party/WebKit/public/web/WebLocalFrame.h"
- 
-+<<<<<<< .our
- using blink::WebLocalFrame;
- using content::RenderFrame;
-+=======
-+using content::RenderFrame;
-+using blink::WebLocalFrame;
-+>>>>>>> .their
- 
- namespace atom {
- 
-@@ -48,10 +53,17 @@
- 
-   RenderFrame* render_frame = GetCurrentRenderFrame();
-   if (render_frame == nullptr)
-+<<<<<<< .our
-     return result;
- 
-   IPC::SyncMessage* message = new AtomFrameHostMsg_Message_Sync(
-       render_frame->GetRoutingID(), channel, arguments, &result);
-+=======
-+    return json;
-+
-+  IPC::SyncMessage* message = new AtomFrameHostMsg_Message_Sync(
-+      render_frame->GetRoutingID(), channel, arguments, &json);
-+>>>>>>> .their
-   bool success = render_frame->Send(message);
- 
-   if (!success)
-changed in both
-  base   100644 d0164f44a0a523b26a919e02b5b7add25a0e7224 atom/renderer/api/atom_api_web_frame.cc
-  our    100644 f0f7ef249d73876f7107d3d3865e8fc71ee33945 atom/renderer/api/atom_api_web_frame.cc
-  their  100644 c36d1a06491994f126333c98796f6ff64cfc6506 atom/renderer/api/atom_api_web_frame.cc
-changed in both
-  base   100644 1971a26c1c5d4f5c5f5f029e6334f157a16b5394 atom/renderer/atom_render_frame_observer.cc
-  our    100644 ea2355fd968339600ae8093524f1c3dcfd2f4ff3 atom/renderer/atom_render_frame_observer.cc
-  their  100644 4ddf9186b723091ef91d69cfaedc4fbdd1ac09fa atom/renderer/atom_render_frame_observer.cc
-@@ -7,6 +7,8 @@
- #include <string>
- #include <vector>
- 
-+#include "atom/common/native_mate_converters/string16_converter.h"
-+
- #include "atom/common/api/api_messages.h"
- #include "atom/common/api/event_emitter_caller.h"
- #include "atom/common/native_mate_converters/value_converter.h"
-@@ -72,7 +74,12 @@
-     RendererClientBase* renderer_client)
-     : content::RenderFrameObserver(frame),
-       render_frame_(frame),
-+<<<<<<< .our
-       renderer_client_(renderer_client) {
-+=======
-+      renderer_client_(renderer_client),
-+      document_created_(false) {
-+>>>>>>> .their
-   // Initialise resource for directory listing.
-   net::NetModule::SetResourceProvider(NetResourceProvider);
- }
-@@ -195,8 +202,13 @@
- }
- 
- void AtomRenderFrameObserver::EmitIPCEvent(blink::WebLocalFrame* frame,
-+<<<<<<< .our
-                                            const base::string16& channel,
-                                            const base::ListValue& args) {
-+=======
-+                                          const base::string16& channel,
-+                                          const base::ListValue& args) {
-+>>>>>>> .their
-   if (!frame)
-     return;
- 
-changed in both
-  base   100644 248d5a68096dedea0f6ffb3c9df38ff3373e7c18 atom/renderer/atom_render_frame_observer.h
-  our    100644 e774741c019956a3bff00db2f6d2b133bf1be6de atom/renderer/atom_render_frame_observer.h
-  their  100644 d4f3d0c7d5c454bb65a190f59b26501137dd04e0 atom/renderer/atom_render_frame_observer.h
-@@ -56,7 +56,11 @@
- 
-   content::RenderFrame* render_frame_;
-   RendererClientBase* renderer_client_;
-+<<<<<<< .our
-   bool document_created_ = false;
-+=======
-+  bool document_created_;
-+>>>>>>> .their
- 
-   DISALLOW_COPY_AND_ASSIGN(AtomRenderFrameObserver);
- };
-changed in both
-  base   100644 4d3e7cba7a65330a45a5f2aebba90c257b206e35 atom/renderer/atom_render_view_observer.h
-  our    100644 097616e12369662473c12645a93e27cffcb55e3b atom/renderer/atom_render_view_observer.h
-  their  100644 ca9fb01288e3bd4788c7718f0feb8b37307383e6 atom/renderer/atom_render_view_observer.h
-@@ -14,7 +14,11 @@
-   explicit AtomRenderViewObserver(content::RenderView* render_view);
- 
-  protected:
-+<<<<<<< .our
-   ~AtomRenderViewObserver() override;
-+=======
-+  virtual ~AtomRenderViewObserver();
-+>>>>>>> .their
- 
-  private:
-   // content::RenderViewObserver implementation.
-changed in both
-  base   100644 82ba9d024350009ae86bc5406513c8086073990a atom/renderer/atom_renderer_client.cc
-  our    100644 204f17c2cf0d2d4ec4a71bdbecfcd1cbdc5fc8be atom/renderer/atom_renderer_client.cc
-  their  100644 12e8fa2603a1b533646b300efbf312b9cb2d8361 atom/renderer/atom_renderer_client.cc
-changed in both
-  base   100644 07d20bda8b00b1acdb823546f5e606154278cd4e atom/renderer/atom_sandboxed_renderer_client.cc
-  our    100644 6e29fe45a69f44856d7fca449ec1be4eaf6970a2 atom/renderer/atom_sandboxed_renderer_client.cc
-  their  100644 cad4b6d7b680da1407a912eb0f4228cf0fe88339 atom/renderer/atom_sandboxed_renderer_client.cc
-@@ -12,11 +12,16 @@
- #include "atom/common/options_switches.h"
- #include "atom/renderer/api/atom_api_renderer_ipc.h"
- #include "atom/renderer/atom_render_frame_observer.h"
-+<<<<<<< .our
- #include "base/base_paths.h"
- #include "base/command_line.h"
- #include "base/files/file_path.h"
- #include "base/path_service.h"
- #include "base/process/process_handle.h"
-+=======
-+#include "base/command_line.h"
-+#include "base/files/file_path.h"
-+>>>>>>> .their
- #include "chrome/renderer/printing/print_web_view_helper.h"
- #include "content/public/renderer/render_frame.h"
- #include "native_mate/dictionary.h"
-@@ -34,8 +39,13 @@
- const std::string kModuleCacheKey = "native-module-cache";
- 
- bool IsDevTools(content::RenderFrame* render_frame) {
-+<<<<<<< .our
-   return render_frame->GetWebFrame()->GetDocument().Url().ProtocolIs(
-       "chrome-devtools");
-+=======
-+  return render_frame->GetWebFrame()->GetDocument().Url()
-+        .ProtocolIs("chrome-devtools");
-+>>>>>>> .their
- }
- 
- v8::Local<v8::Object> GetModuleCache(v8::Isolate* isolate) {
-@@ -102,12 +112,19 @@
-   AtomSandboxedRenderFrameObserver(content::RenderFrame* render_frame,
-                                    AtomSandboxedRendererClient* renderer_client)
-       : AtomRenderFrameObserver(render_frame, renderer_client),
-+<<<<<<< .our
-         renderer_client_(renderer_client) {}
-+=======
-+        v8_converter_(new atom::V8ValueConverter),
-+        renderer_client_(renderer_client) {
-+    v8_converter_->SetDisableNode(true);
-+  }
-+>>>>>>> .their
- 
-  protected:
-   void EmitIPCEvent(blink::WebLocalFrame* frame,
-                     const base::string16& channel,
--                    const base::ListValue& args) override {
-+                    const base::ListValue& args) {
-     if (!frame)
-       return;
- 
-@@ -176,6 +193,7 @@
- }
- 
- void AtomSandboxedRendererClient::DidCreateScriptContext(
-+<<<<<<< .our
-     v8::Handle<v8::Context> context,
-     content::RenderFrame* render_frame) {
-   RendererClientBase::DidCreateScriptContext(context, render_frame);
-@@ -184,6 +202,18 @@
-   // For devtools we still want to run the preload_bundle script
-   if (!render_frame->IsMainFrame() && !IsDevTools(render_frame))
-     return;
-+=======
-+    v8::Handle<v8::Context> context, content::RenderFrame* render_frame) {
-+
-+  // Only allow preload for the main frame or
-+  // For devtools we still want to run the preload_bundle script
-+  if (!render_frame->IsMainFrame() && !IsDevTools(render_frame))
-+    return;
-+
-+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-+  base::FilePath preload_script_path = command_line->GetSwitchValuePath(
-+      switches::kPreloadScript);
-+>>>>>>> .their
- 
-   auto* isolate = context->GetIsolate();
-   v8::HandleScope handle_scope(isolate);
-@@ -203,7 +233,14 @@
-   auto binding = v8::Object::New(isolate);
-   InitializeBindings(binding, context);
-   AddRenderBindings(isolate, binding);
-+<<<<<<< .our
-   v8::Local<v8::Value> args[] = {binding};
-+=======
-+  v8::Local<v8::Value> args[] = {
-+    binding,
-+    mate::ConvertToV8(isolate, preload_script_path.value())
-+  };
-+>>>>>>> .their
-   // Execute the function with proper arguments
-   ignore_result(
-       func->Call(context, v8::Null(isolate), node::arraysize(args), args));
-changed in both
-  base   100644 89af0932d10a598f87dd28ec4b32ae3b2e0eadca atom/renderer/renderer_client_base.cc
-  our    100644 69490420ef5b8f87e7cb8fd97ebd5ec4509fa1ae atom/renderer/renderer_client_base.cc
-  their  100644 af9dfe39367ff1014e558afee2f0fe5ab0e7456e atom/renderer/renderer_client_base.cc
-@@ -161,7 +161,10 @@
- 
- void RendererClientBase::RenderFrameCreated(
-     content::RenderFrame* render_frame) {
-+<<<<<<< .our
- #if defined(TOOLKIT_VIEWS)
-+=======
-+>>>>>>> .their
-   new AutofillAgent(render_frame);
- #endif
- #if defined(ENABLE_PEPPER_FLASH)
-changed in both
-  base   100644 065fe818a64586b6f786cdaa163c40b8a3aacabe brightray/brightray.gyp
-  our    100644 f233257e88bad8f0ff703034bea02e4715a5b5b9 brightray/brightray.gyp
-  their  100644 b90b23da088d4d8b22a8b4e312d5603908050b2c brightray/brightray.gyp
-@@ -178,6 +178,7 @@
-                 ],
-               },
-             }],
-+<<<<<<< .our
-             # Due to strange linker behavior, component build of arm needs to
-             # be linked with libjpeg.a explicitly.
-             ['target_arch=="arm" and libchromiumcontent_component==1', {
-@@ -187,6 +188,8 @@
-                 ],
-               },
-             }],
-+=======
-+>>>>>>> .their
-           ],
-         }],  # OS=="linux"
-         ['OS=="mac"', {
-@@ -288,6 +291,20 @@
-                 ],
-               },
-             }],
-+            # In the OSX 10.10 SDK, CoreBluetooth became a top level framework.
-+            # Previously, it was nested in IOBluetooth. In order for Chrome to run on
-+            # OSes older than OSX 10.10, the top level CoreBluetooth framework must be
-+            # weakly linked.
-+            ['mac_sdk=="10.10" and libchromiumcontent_component==0', {
-+              'direct_dependent_settings': {
-+                'xcode_settings': {
-+                  'OTHER_LDFLAGS': [
-+                    '-weak_framework',
-+                    'CoreBluetooth',
-+                  ],
-+                },
-+              },
-+            }],
-           ]
-         }],  # OS=="mac"
-         ['OS=="win"', {
-changed in both
-  base   100644 d7a4c672926c03dcf4c1a4df1a9e5fa09b19d272 brightray/browser/browser_context.cc
-  our    100644 1eff7344e9aef78bb88720c38c0f75fb92e6bc09 brightray/browser/browser_context.cc
-  their  100644 241398ce96efbe0e4f2203acd86f224c910443e2 brightray/browser/browser_context.cc
-@@ -89,6 +89,7 @@
- }
- 
- void BrowserContext::InitPrefs() {
-+  base::ThreadRestrictions::ScopedAllowIO allow_io;
-   auto prefs_path = GetPath().Append(FILE_PATH_LITERAL("Preferences"));
-   base::ThreadRestrictions::ScopedAllowIO allow_io;
-   PrefServiceFactory prefs_factory;
-changed in both
-  base   100644 143a5fdea3eb6ad7709fa8383298029a24c1b407 brightray/browser/linux/libnotify_notification.cc
-  our    100644 0725ffded989d3c6bce753a210e464deca346ad1 brightray/browser/linux/libnotify_notification.cc
-  their  100644 7f9fb35e434f7cc85cf4145661e754ff4a0d84fc brightray/browser/linux/libnotify_notification.cc
-changed in both
-  base   100644 7a798ae98e6c180c5a60e0a32ce6393532e83468 brightray/browser/net_log.cc
-  our    100644 fb443ea0b72b9659d98d1873fad1a714483bb13f brightray/browser/net_log.cc
-  their  100644 978667acb61b0330d6bf48bb7e814bbdef50b904 brightray/browser/net_log.cc
-@@ -45,11 +45,16 @@
-     return;
- 
-   base::FilePath log_path =
-+<<<<<<< .our
-       command_line->GetSwitchValuePath(network::switches::kLogNetLog);
-   if (log_path.empty())
-     return;
- 
-   std::unique_ptr<base::Value> constants(GetConstants());  // Net constants
-+=======
-+      command_line->GetSwitchValuePath(switches::kLogNetLog);
-+  std::unique_ptr<base::Value> constants(GetConstants());
-+>>>>>>> .their
-   net::NetLogCaptureMode capture_mode = net::NetLogCaptureMode::Default();
- 
-   file_net_log_observer_ =
-changed in both
-  base   100644 04033f451e045ee7211f0a7152d46c5010a55b72 brightray/browser/url_request_context_getter.h
-  our    100644 941a5782b14a941bb25a7a9ef6ca6d73f8bc3ec1 brightray/browser/url_request_context_getter.h
-  their  100644 1a26704d380ab7d113c4e2b0deb940a2d674f96b brightray/browser/url_request_context_getter.h
-@@ -76,11 +76,14 @@
-       const override;
- 
-   net::URLRequestJobFactory* job_factory() const { return job_factory_; }
-+<<<<<<< .our
-   void set_delegate(Delegate* delegate) { delegate_ = delegate; }
- 
-   // Discard reference to URLRequestContext and inform observers to
-   // shutdown. Must be called only on IO thread.
-   void NotifyContextShuttingDown(std::unique_ptr<ResourceContext>);
-+=======
-+>>>>>>> .their
- 
-  private:
-   friend class BrowserContext;
-changed in both
-  base   100644 08b203a23291ba0e2ba254873074178da4921123 brightray/common/application_info_win.cc
-  our    100644 a0256372bbdbbc1d77cb84885faab42a27f55c9f brightray/common/application_info_win.cc
-  their  100644 89ea0aceb6784119ad65783cfd1c019e7aedbf57 brightray/common/application_info_win.cc
-changed in both
-  base   100644 6a7d91f135c4b904e6d3172da91e7813793a2fba brightray/filenames.gypi
-  our    100644 b9e2d96175f8ee2d407db9c49b2e2b74756327de brightray/filenames.gypi
-  their  100644 9ddd990cfa52886ead940c428d1f355ef6234d9a brightray/filenames.gypi
-changed in both
-  base   100644 233e21047718c9bbbc9056f79aecf51657886b92 common.gypi
-  our    100644 676d1e904127066e4a3d313106f15406fcbed8b6 common.gypi
-  their  100644 acad39d991479147b9bc2ee2c5a51fbd8693a689 common.gypi
-changed in both
-  base   100644 e0e8b153ae51d917f37ba50967e2ef9e5b74254d docs/README.md
-  our    100644 f7b956e8feb95ceb64743ad260a1759e5a298afe docs/README.md
-  their  100644 436188887e5dad0a4ae291e5221e3eb8644bc56e docs/README.md
-@@ -16,6 +16,7 @@
- 
- * [Electron FAQ](faq.md)
- 
-+<<<<<<< .our
- ## Guides and Tutorials
- 
- * [Setting up the Development Environment](tutorial/development-environment.md)
-@@ -66,6 +67,12 @@
-   * [Mac App Store](tutorial/mac-app-store-submission-guide.md)
-   * [Windows Store](tutorial/windows-store-guide.md)
-   * [Snapcraft](tutorial/snapcraft.md)
-+=======
-+## Guides
-+
-+* [Glossary of Terms](glossary.md)
-+* [Support](tutorial/support.md)
-+>>>>>>> .their
- * [Security](tutorial/security.md)
-   * [Reporting Security Issues](tutorial/security.md#reporting-security-issues)
-   * [Chromium Security Issues and Upgrades](tutorial/security.md#chromium-security-issues-and-upgrades)
-changed in both
-  base   100644 926d1dde8ffc33d99c48cb55bbc2d0f9c2087ad4 docs/api/app.md
-  our    100644 14dc557e237404cbbd5bcebabb0e65486dc36926 docs/api/app.md
-  their  100644 40fdf2669442ca48fd1fc9a3b4aede6a199df4f1 docs/api/app.md
-changed in both
-  base   100644 2be2da597664c1913a665ad51de5becc42658d0f docs/api/browser-window.md
-  our    100644 dff61dd336f047cf2f6f06228b2df2b98ff2304d docs/api/browser-window.md
-  their  100644 96e3951db79478f51beb9c3f39c18f03a0c61a21 docs/api/browser-window.md
-changed in both
-  base   100644 f9aaaa90ddd7b8887c5ed3fea371bf175e28c2e7 docs/api/in-app-purchase.md
-  our    100644 6e612a72e27159602400f4efa30d5bc2f3aa668f docs/api/in-app-purchase.md
-  their  100644 67109dc0f92d8c537c9a2f1fa5fa2ce223137964 docs/api/in-app-purchase.md
-changed in both
-  base   100644 6aaa2bdd9b0ade84160b7449396d5ecd510f0e41 docs/api/web-contents.md
-  our    100644 8990fe2e97ab62eafdd3f7a4eb8ee782415124c5 docs/api/web-contents.md
-  their  100644 841acb4a506626c334004e28266ebed3845360d3 docs/api/web-contents.md
-@@ -1385,6 +1385,26 @@
- 
- Shows pop-up dictionary that searches the selected word on the page.
- 
-+<<<<<<< .our
-+=======
-+#### `contents.setSize(options)`
-+
-+Set the size of the page. This is only supported for `<webview>` guest contents.
-+
-+* `options` Object
-+  * `enableAutoSize` Boolean (optional) - true to make the webview container automatically
-+    resize within the bounds specified by the attributes normal, min and max.
-+  * `normal` [Size](structures/size.md) (optional) - Normal size of the page. This can be used in
-+    combination with the [`disableguestresize`](webview-tag.md#disableguestresize)
-+    attribute to manually resize the webview guest contents.
-+  * `min` [Size](structures/size.md) (optional) - Minimum size of the page. This can be used in
-+    combination with the [`disableguestresize`](webview-tag.md#disableguestresize)
-+    attribute to manually resize the webview guest contents.
-+  * `max` [Size](structures/size.md) (optional) - Maximium size of the page. This can be used in
-+    combination with the [`disableguestresize`](webview-tag.md#disableguestresize)
-+    attribute to manually resize the webview guest contents.
-+
-+>>>>>>> .their
- #### `contents.isOffscreen()`
- 
- Returns `Boolean` - Indicates whether *offscreen rendering* is enabled.
-removed in local
-  base   100644 7dfc6084f5c94bfb924438e7efa50260d38b9144 docs/tutorial/planned-breaking-changes.md
-  their  100644 00e01f4f8c3a85f0e535a00c11e22f3595bff4b9 docs/tutorial/planned-breaking-changes.md
-added in both
-  our    100644 bdb3b8678485feabfad2ce23309f5bcac6050f31 docs/tutorial/support.md
-  their  100644 306876fee9314fbca1779a6c41ff8c6381753bda docs/tutorial/support.md
-@@ -91,4 +91,8 @@
- * Fedora 21
- * Debian 8
- 
-+<<<<<<< .our
- [arm-breaking-change]: https://github.com/electron/electron/blob/master/docs/api/breaking-changes.md#duplicate-arm-assets
-+=======
-+[arm-breaking-change]: https://github.com/electron/electron/blob/master/docs/tutorial/planned-breaking-changes.md#duplicate-arm-assets
-+>>>>>>> .their
-changed in both
-  base   100644 53ad35c63321e74a5023197ef2e075584e0f268b electron.gyp
-  our    100644 944ddab2a3fd879044e31677e4bac2843fffbdee electron.gyp
-  their  100644 8a5effc5c21bef3b62300374ea49d89f4a4bae7e electron.gyp
-@@ -4,7 +4,11 @@
-     'product_name%': 'Electron',
-     'company_name%': 'GitHub, Inc',
-     'company_abbr%': 'github',
-+<<<<<<< .our
-     'version%': '4.0.0-nightly.20180821',
-+=======
-+    'version%': '2.0.4',
-+>>>>>>> .their
-     'js2c_input_dir': '<(SHARED_INTERMEDIATE_DIR)/js2c',
-   },
-   'includes': [
-changed in both
-  base   100644 ef3e8258584a5459b069e2006db44c0a8b66412d filenames.gypi
-  our    100644 f57860558f06b7e5d8a50f48cfc7e53044df0bc6 filenames.gypi
-  their  100644 f4e5e2df06eda1df8fc463b3b25589c708b00cd1 filenames.gypi
-changed in both
-  base   100644 381a2a866372ebe06f374529c634af411c864ba0 lib/browser/api/app.js
-  our    100644 66f6ae651acf10fb19b8ec068fc5280850dd3d91 lib/browser/api/app.js
-  their  100644 1ea1daddca84dfeba57b7b7883ebb754b8508d2d lib/browser/api/app.js
-changed in both
-  base   100644 22565dcf9875b7f00acff192b10b05d27d6446a7 lib/browser/api/browser-window.js
-  our    100644 cb523496d65c7018c30054621cfdeb1281f9db6a lib/browser/api/browser-window.js
-  their  100644 c5faa0a2c131d633e7aea3a1850abab958d22a1d lib/browser/api/browser-window.js
-changed in both
-  base   100644 da5ff57a113f7a063d1409ff56003db4bd04e68a lib/browser/api/menu.js
-  our    100644 506e3525c10ce142cafe3fc1bf4de1c255e48503 lib/browser/api/menu.js
-  their  100644 a87e0cd0436da2899b6402a06d370e755c2aac47 lib/browser/api/menu.js
-@@ -47,7 +47,11 @@
-   this.delegate = delegate
- }
- 
-+<<<<<<< .our
- Menu.prototype.popup = function (options = {}) {
-+=======
-+Menu.prototype.popup = function (options) {
-+>>>>>>> .their
-   if (options == null || typeof options !== 'object') {
-     throw new TypeError('Options must be an object')
-   }
-@@ -156,7 +160,11 @@
- 
- Menu.buildFromTemplate = function (template) {
-   if (!Array.isArray(template)) {
-+<<<<<<< .our
-     throw new TypeError('Invalid template for Menu: Menu template must be an array')
-+=======
-+    throw new TypeError('Invalid template for Menu')
-+>>>>>>> .their
-   }
-   const menu = new Menu()
-   if (!areValidTemplateItems(template)) {
-merged
-  result 100644 bbbc1bbe1727dd30352c4836cea489145cd7ad7d lib/browser/api/screen.js
-  our    100644 8287bfa8bfdc6db322a05059fd5c8ba58e802db9 lib/browser/api/screen.js
-@@ -1,8 +1,17 @@
- const {EventEmitter} = require('events')
-+const {deprecate} = require('electron')
- const {screen, Screen} = process.atomBinding('screen')
- 
- // Screen is an EventEmitter.
- Object.setPrototypeOf(Screen.prototype, EventEmitter.prototype)
- EventEmitter.call(screen)
- 
-+const nativeFn = screen.getMenuBarHeight
-+screen.getMenuBarHeight = function () {
-+  if (!process.noDeprecations) {
-+    deprecate.warn('screen.getMenuBarHeight', 'screen.getPrimaryDisplay().workArea')
-+  }
-+  return nativeFn.call(this)
-+}
-+
- module.exports = screen
-changed in both
-  base   100644 0338b776f8938c1548ea9786385fe75db9db3403 lib/browser/guest-view-manager.js
-  our    100644 1e4029e39a981c85fb6ff18c5ccd52f81b3c56f2 lib/browser/guest-view-manager.js
-  their  100644 dd8e0ff1a9239e5c7a92f90a58da866c076011ca lib/browser/guest-view-manager.js
-changed in both
-  base   100644 50e890e225a315718d04a0028fb6bf2feb4092ce lib/browser/guest-window-manager.js
-  our    100644 7253c1942b0956ae6b9b0c80a23470fc26669b8a lib/browser/guest-window-manager.js
-  their  100644 ec77a7abdff1ba27e55da513c10d084d7978b7c0 lib/browser/guest-window-manager.js
-@@ -65,7 +65,11 @@
-   // Inherit certain option values from parent window
-   const webPreferences = embedder.getLastWebPreferences()
-   for (const [name, value] of inheritedWebPreferences) {
-+<<<<<<< .our
-     if (webPreferences[name] === value) {
-+=======
-+    if (embedder.getLastWebPreferences()[name] === value) {
-+>>>>>>> .their
-       options.webPreferences[name] = value
-     }
-   }
-changed in both
-  base   100644 24a86fdfee7b87cd8ad177363aec26b438fe79b7 lib/browser/init.js
-  our    100644 bed3d912ab8be3ca4f21de04e801bb42dc12a528 lib/browser/init.js
-  their  100644 344bcf16dceafc99dcc337a0d9113c8e764c6364 lib/browser/init.js
-changed in both
-  base   100644 c0cd09dea4273642aa780756985e9c90dbe164d3 lib/browser/rpc-server.js
-  our    100644 ff9f77321de3a4145946b67f3fe2a597f98e2510 lib/browser/rpc-server.js
-  their  100644 6321c0526f25a99d80228bbd569cc000ec76dee2 lib/browser/rpc-server.js
-@@ -387,9 +387,15 @@
-   objectsRegistry.remove(event.sender, contextId, id)
- })
- 
-+<<<<<<< .our
- ipcMain.on('ELECTRON_BROWSER_CONTEXT_RELEASE', (event, contextId) => {
-   objectsRegistry.clear(event.sender, contextId)
-   event.returnValue = null
-+=======
-+ipcMain.on('ELECTRON_BROWSER_CONTEXT_RELEASE', (e, contextId) => {
-+  objectsRegistry.clear(contextId)
-+  e.returnValue = null
-+>>>>>>> .their
- })
- 
- ipcMain.on('ELECTRON_BROWSER_GUEST_WEB_CONTENTS', function (event, contextId, guestInstanceId) {
-changed in both
-  base   100644 6dc774049def3acbd13b79dfd559c12d4eebd657 lib/common/api/crash-reporter.js
-  our    100644 1090d425e4c5cdf89a03d470718324ef16963472 lib/common/api/crash-reporter.js
-  their  100644 1b20fa52aab741e5dd34de7872f36798ec7c1c68 lib/common/api/crash-reporter.js
-changed in both
-  base   100644 a4f8072ed57642e1ca7d1066e132875da7ad3f46 lib/renderer/api/remote.js
-  our    100644 59117f8f2dd977fc1817a6b1d540b616ddcb0dae lib/renderer/api/remote.js
-  their  100644 3de99ecab255308662a4b65c6b45b573d723f4da lib/renderer/api/remote.js
-@@ -293,6 +293,14 @@
-   callbacksRegistry.remove(id)
- })
- 
-+<<<<<<< .our
-+=======
-+process.on('exit', () => {
-+  const command = 'ELECTRON_BROWSER_CONTEXT_RELEASE'
-+  ipcRenderer.sendSync(command, initialContext)
-+})
-+
-+>>>>>>> .their
- exports.require = (module) => {
-   const command = 'ELECTRON_BROWSER_REQUIRE'
-   const meta = ipcRenderer.sendSync(command, contextId, module)
-@@ -317,6 +325,15 @@
-   return metaToValue(ipcRenderer.sendSync('ELECTRON_BROWSER_CURRENT_WEB_CONTENTS', contextId))
- }
- 
-+const CONTEXT_ARG = '--context-id='
-+let initialContext = process.argv.find(arg => arg.startsWith(CONTEXT_ARG))
-+if (initialContext) {
-+  initialContext = parseInt(initialContext.substr(CONTEXT_ARG.length), 10)
-+} else {
-+  // In sandbox we need to pull this from remote
-+  initialContext = exports.getCurrentWebContents().getId()
-+}
-+
- // Get a global object in browser.
- exports.getGlobal = (name) => {
-   const command = 'ELECTRON_BROWSER_GLOBAL'
-changed in both
-  base   100644 1cb69436dd479baf54b9805c04c0c31b20f24fad lib/renderer/init.js
-  our    100644 2470a5e8be80e770b0c03f6a439a71e72ae12a1b lib/renderer/init.js
-  their  100644 93129849ae048c1c09f943b56e78562f46be04e8 lib/renderer/init.js
-changed in both
-  base   100644 d2da884f1d9caf3d633de25837cb2128f564f2fb lib/renderer/security-warnings.js
-  our    100644 b24f9e28b879154457be0342b9d4b44c0e651253 lib/renderer/security-warnings.js
-  their  100644 4f7d6ef9e596cdc3a5c7e1f2b89b24b9cd67de1d lib/renderer/security-warnings.js
-changed in both
-  base   100644 119391e79462bfa8bb1494039bcb3522d97acead lib/sandboxed_renderer/init.js
-  our    100644 30a3fa55216f6bf7588c3accc07b150a31163b7c lib/sandboxed_renderer/init.js
-  their  100644 b45a105091446f1b1c3afd2f4905ccf7c0ef67b5 lib/sandboxed_renderer/init.js
-@@ -35,10 +35,13 @@
-   ['url', require('url')]
- ])
- 
-+<<<<<<< .our
- const {
-   preloadSrc, preloadError, process: processProps
- } = electron.ipcRenderer.sendSync('ELECTRON_BROWSER_SANDBOX_LOAD')
- 
-+=======
-+>>>>>>> .their
- require('../renderer/web-frame-init')()
- 
- // Pass different process object to the preload script(which should not have
-@@ -78,6 +81,7 @@
-   require('../renderer/inspector')
- }
- 
-+<<<<<<< .our
- if (binding.guestInstanceId) {
-   process.guestInstanceId = parseInt(binding.guestInstanceId)
- }
-@@ -88,6 +92,8 @@
-   require('../renderer/web-view/web-view-attributes')
- }
- 
-+=======
-+>>>>>>> .their
- // Wrap the script into a function executed in global scope. It won't have
- // access to the current scope, so we'll expose a few objects as arguments:
- //
-@@ -107,6 +113,7 @@
- // and any `require('electron')` calls in `preload.js` will work as expected
- // since browserify won't try to include `electron` in the bundle, falling back
- // to the `preloadRequire` function above.
-+<<<<<<< .our
- if (preloadSrc) {
-   const preloadWrapperSrc = `(function(require, process, Buffer, global, setImmediate, clearImmediate) {
-   ${preloadSrc}
-@@ -118,4 +125,18 @@
-   preloadFn(preloadRequire, preloadProcess, Buffer, global, setImmediate, clearImmediate)
- } else if (preloadError) {
-   console.error(preloadError.stack)
-+=======
-+if (preloadPath) {
-+  const preloadSrc = fs.readFileSync(preloadPath).toString()
-+  const preloadWrapperSrc = `(function(require, process, Buffer, global, setImmediate) {
-+  ${preloadSrc}
-+  })`
-+
-+  // eval in window scope:
-+  // http://www.ecma-international.org/ecma-262/5.1/#sec-10.4.2
-+  const geval = eval
-+  const preloadFn = geval(preloadWrapperSrc)
-+  const {setImmediate} = require('timers')
-+  preloadFn(preloadRequire, preloadProcess, Buffer, global, setImmediate)
-+>>>>>>> .their
- }
-changed in both
-  base   100644 9d3b0da9c80b223e4a1188311a1121796eb9f7ae package.json
-  our    100644 c081cd89450cd50efba1ec280ff1349a96ea3ce0 package.json
-  their  100644 c7232a56c6c9e223dbc24a83e028f9fdda119a4d package.json
-@@ -1,6 +1,10 @@
- {
-   "name": "electron",
-+<<<<<<< .our
-   "version": "4.0.0-nightly.20180821",
-+=======
-+  "version": "2.0.4",
-+>>>>>>> .their
-   "repository": "https://github.com/electron/electron",
-   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
-   "devDependencies": {
-@@ -13,7 +17,11 @@
-     "dugite": "^1.45.0",
-     "electabul": "~0.0.4",
-     "electron-docs-linter": "^2.3.4",
-+<<<<<<< .our
-     "electron-typescript-definitions": "^1.3.6",
-+=======
-+    "electron-typescript-definitions": "1.3.2",
-+>>>>>>> .their
-     "github": "^9.2.0",
-     "html-entities": "^1.2.1",
-     "husky": "^0.14.3",
-@@ -25,8 +33,12 @@
-     "remark-cli": "^4.0.0",
-     "remark-preset-lint-markdown-style-guide": "^2.1.1",
-     "request": "^2.68.0",
-+<<<<<<< .our
-     "semver": "^5.5.0",
-     "serve": "^6.5.8",
-+=======
-+    "serve": "^6.5.3",
-+>>>>>>> .their
-     "standard": "^10.0.0",
-     "standard-markdown": "^4.0.0",
-     "sumchecker": "^2.0.2",
-changed in both
-  base   100755 4465b85c135ddb55a673c5180e15f05f09dac57e script/bootstrap.py
-  our    100755 e4aaf89e216b0164f15882a3040e8cac70bf1fd9 script/bootstrap.py
-  their  100755 c6ebe4ef6975efd1f6184159cc3d9d079bf3628d script/bootstrap.py
-changed in both
-  base   100755 c97cd8336f7d7980911d0bdea93137e7bc95ba24 script/build.py
-  our    100755 fb2b95d3bb71a25ce1ca58acf596afdc0f2cc5bd script/build.py
-  their  100755 2a2231394207c28fcd2b86d3d9f9b079b08d637e script/build.py
-@@ -40,6 +40,12 @@
-   if is_verbose_mode():
-     ninja.append('-v')
- 
-+<<<<<<< .our
-+=======
-+  args = parse_args()
-+  if args.ninja_path:
-+    ninja = args.ninja_path
-+>>>>>>> .their
-   if args.libcc:
-     if ('D' not in args.configuration
-         or not os.path.exists(GCLIENT_DONE)
-@@ -93,12 +99,15 @@
-   parser.add_argument('--ninja-path',
-                       help='Path of ninja command to use.',
-                       required=False)
-+<<<<<<< .our
-   parser.add_argument('--compdb',
-                       help=(
-                         'Generate JSON compilation database. This will not '
-                         'trigger actual build. '
-                       ),
-                       action='store_true', default=False)
-+=======
-+>>>>>>> .their
-   return parser.parse_args()
- 
- 
-changed in both
-  base   100644 ec2459198bf254e7e380e4ae63097168041d0068 script/ci-release-build.js
-  our    100644 be9f9597387f5f8b7bfddc61c202f32ce4c6d478 script/ci-release-build.js
-  their  100644 d543c6d27f00cfb4ed171ba469e5c59a08faae8b script/ci-release-build.js
-@@ -4,11 +4,14 @@
- const request = require('request')
- const buildAppVeyorURL = 'https://windows-ci.electronjs.org/api/builds'
- const vstsURL = 'https://github.visualstudio.com/electron/_apis/build'
-+<<<<<<< .our
- 
- const appVeyorJobs = {
-   'electron-x64': 'electron',
-   'electron-ia32': 'electron-39ng6'
- }
-+=======
-+>>>>>>> .their
- 
- const circleCIJobs = [
-   'electron-linux-arm',
-@@ -51,6 +54,10 @@
- }
- 
- async function circleCIcall (buildUrl, targetBranch, job, options) {
-+<<<<<<< .our
-+=======
-+  assert(process.env.CIRCLE_TOKEN, 'CIRCLE_TOKEN not found in environment')
-+>>>>>>> .their
-   console.log(`Triggering CircleCI to run build job: ${job} on branch: ${targetBranch} with release flag.`)
-   let buildRequest = {
-     'build_parameters': {
-@@ -80,6 +87,7 @@
-     console.log('Error calling CircleCI:', err)
-   })
-   console.log(`CircleCI release build request for ${job} successful.  Check ${circleResponse.build_url} for status.`)
-+<<<<<<< .our
- }
- 
- function buildAppVeyor (targetBranch, options) {
-@@ -94,6 +102,13 @@
- 
- async function callAppVeyor (targetBranch, job, options) {
-   console.log(`Triggering AppVeyor to run build job: ${job} on branch: ${targetBranch} with release flag.`)
-+=======
-+}
-+
-+async function buildAppVeyor (targetBranch, options) {
-+  console.log(`Triggering AppVeyor to run build on branch: ${targetBranch} with release flag.`)
-+  assert(process.env.APPVEYOR_TOKEN, 'APPVEYOR_TOKEN not found in environment')
-+>>>>>>> .their
-   let environmentVariables = {}
- 
-   if (options.ghRelease) {
-@@ -132,7 +147,11 @@
- function buildCircleCI (targetBranch, options) {
-   const circleBuildUrl = `https://circleci.com/api/v1.1/project/github/electron/electron/tree/${targetBranch}?circle-token=${process.env.CIRCLE_TOKEN}`
-   if (options.job) {
-+<<<<<<< .our
-     assert(circleCIJobs.includes(options.job), `Unknown CircleCI job name: ${options.job}. Valid values are: ${circleCIJobs}.`)
-+=======
-+    assert(circleCIJobs.includes(options.job), `Unknown CI job name: ${options.job}.`)
-+>>>>>>> .their
-     circleCIcall(circleBuildUrl, targetBranch, options.job, options)
-   } else {
-     circleCIJobs.forEach((job) => circleCIcall(circleBuildUrl, targetBranch, job, options))
-@@ -141,9 +160,16 @@
- 
- async function buildVSTS (targetBranch, options) {
-   if (options.job) {
-+<<<<<<< .our
-     assert(vstsJobs.includes(options.job), `Unknown VSTS CI job name: ${options.job}. Valid values are: ${vstsJobs}.`)
-   }
-   console.log(`Triggering VSTS to run build on branch: ${targetBranch} with release flag.`)
-+=======
-+    assert(vstsJobs.includes(options.job), `Unknown CI job name: ${options.job}.`)
-+  }
-+  console.log(`Triggering VSTS to run build on branch: ${targetBranch} with release flag.`)
-+  assert(process.env.VSTS_TOKEN, 'VSTS_TOKEN not found in environment')
-+>>>>>>> .their
-   let environmentVariables = {}
- 
-   if (!options.ghRelease) {
-changed in both
-  base   100755 de3b9ffd48156379afd677b98c40c97532cb8367 script/create-dist.py
-  our    100755 4a6c0c7ce8f275175e48c4c380ff33627f7a5961 script/create-dist.py
-  their  100755 e8396a2e6d242b9deba3b6a7642060584cd1a605 script/create-dist.py
-@@ -147,7 +147,11 @@
- 
-   # Copy file and keep the executable bit.
-   shutil.copyfile(src, dest)
-+<<<<<<< .our
-   add_exec_bit(dest)
-+=======
-+  os.chmod(dest, os.stat(dest).st_mode | stat.S_IEXEC)
-+>>>>>>> .their
- 
- def copy_vcruntime_binaries():
-   arch = get_target_arch()
-@@ -302,7 +306,11 @@
-     dest = os.path.join(DIST_DIR, binary)
-     # Copy file and keep the executable bit.
-     shutil.copyfile(src, dest)
-+<<<<<<< .our
-     add_exec_bit(dest)
-+=======
-+    os.chmod(dest, os.stat(dest).st_mode | stat.S_IEXEC)
-+>>>>>>> .their
- 
-     dist_name = get_zip_name(binary, version)
-     zip_file = os.path.join(SOURCE_ROOT, 'dist', dist_name)
-changed in both
-  base   100644 76f39fc26973e01145f7758785778075ddbaa648 script/lib/dbus_mock.py
-  our    100644 9b9c8029cb75a9d84c632d04f234c2020542ca68 script/lib/dbus_mock.py
-  their  100644 00b1fd98d7837cfef60460f9d456a5cb8340761c script/lib/dbus_mock.py
-@@ -4,21 +4,29 @@
- import atexit
- import os
- import sys
-+<<<<<<< .our
-+=======
-+
-+>>>>>>> .their
- 
- 
- def stop():
-     DBusTestCase.stop_dbus(DBusTestCase.system_bus_pid)
-     DBusTestCase.stop_dbus(DBusTestCase.session_bus_pid)
-+<<<<<<< .our
- 
- def start():
-     dbusmock_log = sys.stdout if is_verbose_mode() else open(os.devnull, 'w')
- 
-     DBusTestCase.start_system_bus()
-     DBusTestCase.spawn_server_template('logind', None, dbusmock_log)
-+=======
-+>>>>>>> .their
- 
-     DBusTestCase.start_session_bus()
-     DBusTestCase.spawn_server_template('notification_daemon', None, dbusmock_log)
- 
-+<<<<<<< .our
- if __name__ == '__main__':
-     import subprocess
-     start()
-@@ -26,3 +34,14 @@
-         subprocess.check_call(sys.argv[1:])
-     finally:
-         stop()
-+=======
-+atexit.register(cleanup)
-+
-+dbusmock_log = sys.stdout if is_verbose_mode() else open(os.devnull, 'w')
-+
-+DBusTestCase.start_system_bus()
-+DBusTestCase.spawn_server_template('logind', None, dbusmock_log)
-+
-+DBusTestCase.start_session_bus()
-+DBusTestCase.spawn_server_template('notification_daemon', None, dbusmock_log)
-+>>>>>>> .their
-changed in both
-  base   100755 69882928765a56f50702a371af322710ef3ccf22 script/prepare-release.js
-  our    100755 72a28b719bf1ff7770692caef86c76746c4d8edf script/prepare-release.js
-  their  100755 8021fa331da3e8afd8810b8bb4a87eb39e859e75 script/prepare-release.js
-@@ -5,6 +5,10 @@
- const args = require('minimist')(process.argv.slice(2), {
-   boolean: ['automaticRelease', 'notesOnly', 'stable']
- })
-+<<<<<<< .our
-+=======
-+const assert = require('assert')
-+>>>>>>> .their
- const ciReleaseBuild = require('./ci-release-build')
- const { execSync } = require('child_process')
- const fail = '\u2717'.red
-@@ -21,7 +25,11 @@
- // via conventional-recommended-bump
- 
- if (!versionType && !args.notesOnly) {
-+<<<<<<< .our
-   console.log(`Usage: prepare-release versionType [stable | beta | nightly]` +
-+=======
-+  console.log(`Usage: prepare-release versionType [major | minor | patch | beta]` +
-+>>>>>>> .their
-      ` (--stable) (--notesOnly) (--automaticRelease) (--branch)`)
-   process.exit(1)
- }
-@@ -222,7 +230,11 @@
- }
- 
- async function verifyNewVersion () {
-+<<<<<<< .our
-   let newVersion = await getNewVersion(true)
-+=======
-+  let newVersion = getNewVersion(true)
-+>>>>>>> .their
-   let response
-   if (args.automaticRelease) {
-     response = 'y'
-@@ -258,6 +270,7 @@
- }
- 
- async function prepareRelease (isBeta, notesOnly) {
-+<<<<<<< .our
-   if (args.dryRun) {
-     let newVersion = await getNewVersion(true)
-     console.log(newVersion)
-@@ -278,6 +291,27 @@
-         process.exit(1)
-       }
-     }
-+=======
-+  if (args.automaticRelease && (pkg.version.indexOf('beta') === -1 ||
-+      versionType !== 'beta')) {
-+    console.log(`${fail} Automatic release is only supported for beta releases`)
-+    process.exit(1)
-+  }
-+  let currentBranch
-+  if (args.branch) {
-+    currentBranch = args.branch
-+  } else {
-+    currentBranch = await getCurrentBranch(gitDir)
-+  }
-+  if (notesOnly) {
-+    let releaseNotes = await getReleaseNotes(currentBranch)
-+    console.log(`Draft release notes are: \n${releaseNotes}`)
-+  } else {
-+    await verifyNewVersion()
-+    await createRelease(currentBranch, isBeta)
-+    await pushRelease(currentBranch)
-+    await runReleaseBuilds(currentBranch)
-+>>>>>>> .their
-   }
- }
- 
-changed in both
-  base   100755 9863ef912cd5a940428e9ac22e1993494b2b1828 script/release.js
-  our    100755 84e00ad4f309201f151c3f8fcbaf9ee536c9b6cb script/release.js
-  their  100755 5858caf215a38e09d98c342bd74252b3dbd7ee71 script/release.js
-@@ -95,6 +95,10 @@
-     `electron-${version}-linux-armv7l.zip`,
-     `electron-${version}-linux-ia32-symbols.zip`,
-     `electron-${version}-linux-ia32.zip`,
-+<<<<<<< .our
-+=======
-+//    `electron-${version}-linux-mips64el.zip`,
-+>>>>>>> .their
-     `electron-${version}-linux-x64-symbols.zip`,
-     `electron-${version}-linux-x64.zip`,
-     `electron-${version}-mas-x64-dsym.zip`,
-@@ -112,6 +116,10 @@
-     `ffmpeg-${version}-linux-arm64.zip`,
-     `ffmpeg-${version}-linux-armv7l.zip`,
-     `ffmpeg-${version}-linux-ia32.zip`,
-+<<<<<<< .our
-+=======
-+//    `ffmpeg-${version}-linux-mips64el.zip`,
-+>>>>>>> .their
-     `ffmpeg-${version}-linux-x64.zip`,
-     `ffmpeg-${version}-mas-x64.zip`,
-     `ffmpeg-${version}-win32-ia32.zip`,
-@@ -180,7 +188,15 @@
- function uploadIndexJson () {
-   console.log('Uploading index.json to S3.')
-   let scriptPath = path.join(__dirname, 'upload-index-json.py')
-+<<<<<<< .our
-   runScript(scriptPath, [pkgVersion])
-+=======
-+  let scriptArgs = []
-+  if (args.automaticRelease) {
-+    scriptArgs.push('-R')
-+  }
-+  runScript(scriptPath, scriptArgs)
-+>>>>>>> .their
-   console.log(`${pass} Done uploading index.json to S3.`)
- }
- 
-changed in both
-  base   100755 1f90ed795fcc3e739061cf4ae5c8ab9ea95a1236 script/test.py
-  our    100755 46cada435e1bd6ecaa2111cdf29e5aeb834b227e script/test.py
-  their  100755 cb17102557dca975208140b479168906100cfd74 script/test.py
-changed in both
-  base   100755 a35eb2f5b90272c8369bcfd511f976a4f64fa57f script/update-clang.sh
-  our    100755 0c7ab60533381e33152b8735aaccf41d5f0d6676 script/update-clang.sh
-  their  100755 6e4cf08216616a4b6a2ee896bba47b1ba5d469b5 script/update-clang.sh
-changed in both
-  base   100755 f5e5b3c7a6adcaf7005ad9242c1664ad2f243d1f script/upload-index-json.py
-  our    100755 55d0675d0707d34c806847f3a64aa77f20a4830d script/upload-index-json.py
-  their  100755 479e46bb811695482f5ea62060e4bef02af505f1 script/upload-index-json.py
-@@ -8,7 +8,6 @@
- from lib.util import s3put, scoped_cwd, safe_mkdir
- 
- SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
--OUT_DIR     = os.path.join(SOURCE_ROOT, 'out', 'D')
- 
- BASE_URL = 'https://electron-metadumper.herokuapp.com/?version='
- 
-@@ -35,6 +34,7 @@
-     raise Exception("Please set META_DUMPER_AUTH_HEADER")
-   # Upload the index.json.
-   with scoped_cwd(SOURCE_ROOT):
-+<<<<<<< .our
-     safe_mkdir(OUT_DIR)
-     index_json = os.path.relpath(os.path.join(OUT_DIR, 'index.json'))
- 
-@@ -42,9 +42,27 @@
- 
-     with open(index_json, "w") as f:
-       f.write(new_content)
-+=======
-+    if len(sys.argv) == 2 and sys.argv[1] == '-R':
-+      config = 'R'
-+    else:
-+      config = 'D'
-+    out_dir = os.path.join(SOURCE_ROOT, 'out', config)
-+    if sys.platform == 'darwin':
-+      electron = os.path.join(out_dir, '{0}.app'.format(PRODUCT_NAME),
-+                                'Contents', 'MacOS', PRODUCT_NAME)
-+    elif sys.platform == 'win32':
-+      electron = os.path.join(out_dir, '{0}.exe'.format(PROJECT_NAME))
-+    else:
-+      electron = os.path.join(out_dir, PROJECT_NAME)
-+    index_json = os.path.relpath(os.path.join(out_dir, 'index.json'))
-+    execute([electron,
-+             os.path.join('tools', 'dump-version-info.js'),
-+             index_json])
-+>>>>>>> .their
- 
-     bucket, access_key, secret_key = s3_config()
--    s3put(bucket, access_key, secret_key, OUT_DIR, 'atom-shell/dist',
-+    s3put(bucket, access_key, secret_key, out_dir, 'atom-shell/dist',
-           [index_json])
- 
- 
-changed in both
-  base   100755 4da630433812b51ff0ebbdf89f68c71d90ab8046 script/upload.py
-  our    100755 2d9eaa201265971ca01acaea6e84a440e5db0532 script/upload.py
-  their  100755 ee7a027af02274326ba06d84df031bb0d241ec47 script/upload.py
-@@ -76,9 +76,23 @@
-   upload_electron(release, os.path.join(DIST_DIR, ffmpeg), args)
- 
-   chromedriver = get_zip_name('chromedriver', ELECTRON_VERSION)
-+<<<<<<< .our
-   upload_electron(release, os.path.join(DIST_DIR, chromedriver), args)
-   mksnapshot = get_zip_name('mksnapshot', ELECTRON_VERSION)
-   upload_electron(release, os.path.join(DIST_DIR, mksnapshot), args)
-+=======
-+  upload_electron(github, release, os.path.join(DIST_DIR, chromedriver),
-+                  args.upload_to_s3)
-+  mksnapshot = get_zip_name('mksnapshot', ELECTRON_VERSION)
-+  upload_electron(github, release, os.path.join(DIST_DIR, mksnapshot),
-+                args.upload_to_s3)
-+
-+  if get_target_arch().startswith('arm'):
-+    # Upload the x64 binary for arm/arm64 mksnapshot
-+    mksnapshot = get_zip_name('mksnapshot', ELECTRON_VERSION, 'x64')
-+    upload_electron(github, release, os.path.join(DIST_DIR, mksnapshot),
-+                    args.upload_to_s3)
-+>>>>>>> .their
- 
-   if get_target_arch().startswith('arm'):
-     # Upload the x64 binary for arm/arm64 mksnapshot
-changed in both
-  base   100644 0eda951b15d6fff609b6612589e222adb4f0720e spec/api-app-spec.js
-  our    100644 d224eda2989332c18d655cef05a8bacc2eb6d4b8 spec/api-app-spec.js
-  their  100644 5c2e0a0c7e6184e780b7ec031f9788f1f54eaca9 spec/api-app-spec.js
-@@ -9,7 +9,10 @@
- const {ipcRenderer, remote} = require('electron')
- const {closeWindow} = require('./window-helpers')
- 
-+<<<<<<< .our
- const {expect} = chai
-+=======
-+>>>>>>> .their
- const {app, BrowserWindow, Menu, ipcMain} = remote
- 
- const isCI = remote.getGlobal('isCi')
-@@ -186,11 +189,19 @@
- 
-       // Singleton will send us greeting data to let us know it's running.
-       // After that, ask it to exit gracefully and confirm that it does.
-+<<<<<<< .our
-       appProcess.stdout.on('data', data => appProcess.kill())
-       appProcess.on('exit', (code, sig) => {
-         const message = `code:\n${code}\nsig:\n${sig}`
-         expect(code).to.equal(0, message)
-         expect(sig).to.be.null(message)
-+=======
-+      appProcess.stdout.on('data', (data) => appProcess.kill())
-+      appProcess.on('exit', (code, sig) => {
-+        let message = ['code:', code, 'sig:', sig].join('\n')
-+        assert.equal(code, 0, message)
-+        assert.equal(sig, null, message)
-+>>>>>>> .their
-         done()
-       })
-     })
-@@ -948,4 +959,18 @@
-       return expect(app.whenReady()).to.be.eventually.fulfilled
-     })
-   })
-+
-+  describe('dock.setMenu', () => {
-+    before(function () {
-+      if (process.platform !== 'darwin') {
-+        this.skip()
-+      }
-+    })
-+
-+    it('keeps references to the menu', () => {
-+      app.dock.setMenu(new Menu())
-+      const v8Util = process.atomBinding('v8_util')
-+      v8Util.requestGarbageCollectionForTesting()
-+    })
-+  })
- })
-changed in both
-  base   100644 ab96021ebf4c4360fa581b5a695249456a9afeda spec/api-browser-view-spec.js
-  our    100644 968912a4abf3d759a1363e2420d2c21b7923dbd6 spec/api-browser-view-spec.js
-  their  100644 df239a8914527a2d62f652b878c97a7791f63a9d spec/api-browser-view-spec.js
-@@ -44,9 +44,15 @@
-   describe('BrowserView.isDestroyed()', () => {
-     it('returns correct value', () => {
-       view = new BrowserView()
-+<<<<<<< .our
-       expect(view.isDestroyed()).to.be.false()
-       view.destroy()
-       expect(view.isDestroyed()).to.be.true()
-+=======
-+      assert.ok(!view.isDestroyed())
-+      view.destroy()
-+      assert.ok(view.isDestroyed())
-+>>>>>>> .their
-     })
-   })
- 
-changed in both
-  base   100644 3033eb6a1f6cca3cf4874a54dd217ec62d2d82cd spec/api-browser-window-spec.js
-  our    100644 f4cba12ec19d224bc46fca898db42a99baf4972e spec/api-browser-window-spec.js
-  their  100644 4807094095a591ca716d520aef51a25af6ff9687 spec/api-browser-window-spec.js
-@@ -409,12 +409,34 @@
-     })
-   })
- 
-+<<<<<<< .our
-   // TODO(alexeykuzmin): [Ch66] Enable the test. Passes locally.
-   xdescribe('BrowserWindow.getFocusedWindow()', (done) => {
-+=======
-+  describe('BrowserWindow.getFocusedWindow()', (done) => {
-+>>>>>>> .their
-     it('returns the opener window when dev tools window is focused', (done) => {
-       w.show()
-       w.webContents.once('devtools-focused', () => {
-         assert.deepEqual(BrowserWindow.getFocusedWindow(), w)
-+<<<<<<< .our
-+=======
-+        done()
-+      })
-+      w.webContents.openDevTools({mode: 'undocked'})
-+    })
-+  })
-+
-+  describe('BrowserWindow.capturePage(rect, callback)', () => {
-+    it('calls the callback with a Buffer', (done) => {
-+      w.capturePage({
-+        x: 0,
-+        y: 0,
-+        width: 100,
-+        height: 100
-+      }, (image) => {
-+        assert.equal(image.isEmpty(), true)
-+>>>>>>> .their
-         done()
-       })
-       w.webContents.openDevTools({mode: 'undocked'})
-@@ -453,6 +475,29 @@
-       // Values can be 0,2,3,4, or 6. We want 6, which is RGB + Alpha
-       expect(imgBuffer[25]).to.equal(6)
-     })
-+
-+    it('preserves transparency', (done) => {
-+      w.close()
-+      const width = 400
-+      const height = 400
-+      w = new BrowserWindow({
-+        show: false,
-+        width: width,
-+        height: height,
-+        transparent: true
-+      })
-+      w.loadURL('data:text/html,<html><body background-color: rgba(255,255,255,0)></body></html>')
-+      w.once('ready-to-show', () => {
-+        w.show()
-+        w.capturePage((image) => {
-+          let imgBuffer = image.toPNG()
-+          // Check 25th byte in the PNG
-+          // Values can be 0,2,3,4, or 6. We want 6, which is RGB + Alpha
-+          assert.equal(imgBuffer[25], 6)
-+          done()
-+        })
-+      })
-+    })
-   })
- 
-   describe('BrowserWindow.setSize(width, height)', () => {
-@@ -763,6 +808,7 @@
-         w.addTabbedWindow(w)
-       }, /AddTabbedWindow cannot be called by a window on itself./)
-     })
-+<<<<<<< .our
-   })
- 
-   describe('BrowserWindow.setWindowButtonVisibility()', () => {
-@@ -790,6 +836,8 @@
-         w.setWindowButtonVisibility(true)
-       }, /Not supported for this window/)
-     })
-+=======
-+>>>>>>> .their
-   })
- 
-   describe('BrowserWindow.setVibrancy(type)', () => {
-changed in both
-  base   100644 b4d55cd70b70b42d52a026ff7b4ff3c47d1671df spec/api-crash-reporter-spec.js
-  our    100644 dd31b91e1244785412b87db96bb141599e5ccb0f spec/api-crash-reporter-spec.js
-  their  100644 ffa3c0370595f32b0c7d476b82bea133d6a87000 spec/api-crash-reporter-spec.js
-@@ -266,6 +266,7 @@
-   describe('getLastCrashReport', () => {
-     it('correctly returns the most recent report', () => {
-       const reports = crashReporter.getUploadedReports()
-+<<<<<<< .our
-       expect(reports).to.be.an('array')
-       expect(reports).to.have.lengthOf.at.least(2,
-           'There are not enough reports for this test')
-@@ -275,16 +276,31 @@
- 
-       // Let's find the newest report.
-       const {report: newestReport} = reports.reduce((acc, cur) => {
-+=======
-+      const lastReport = crashReporter.getLastCrashReport()
-+
-+      // Let's find the newest report
-+      const newestReport = reports.reduce((acc, cur) => {
-+>>>>>>> .their
-         const timestamp = new Date(cur.date).getTime()
-         return (timestamp > acc.timestamp)
-           ? { report: cur, timestamp: timestamp }
-           : acc
-+<<<<<<< .our
-       }, { timestamp: -Infinity })
-       assert(newestReport, 'Hey!')
- 
-       expect(lastReport.date.getTime()).to.be.equal(
-           newestReport.date.getTime(),
-           'Last report is not the newest.')
-+=======
-+      }, { timestamp: 0 })
-+
-+      assert(reports.length > 1, 'has more than 1 report')
-+      assert(lastReport != null, 'found a last report')
-+      assert(lastReport.date.toString() === newestReport.report.date.toString(),
-+        'last report is correct')
-+>>>>>>> .their
-     })
-   })
- 
-changed in both
-  base   100644 667f098bc4b9974a142435e7d3ddb762ac0f54a2 spec/api-menu-spec.js
-  our    100644 ed2749700c6c8bf299f507d52606c1ae3f597e5c spec/api-menu-spec.js
-  their  100644 3efb6ed8745843bb7e221fe25b3c75761a085759 spec/api-menu-spec.js
-@@ -649,6 +649,7 @@
-     })
- 
-     it('throws an error if options is not an object', () => {
-+<<<<<<< .our
-       expect(() => {
-         menu.popup('this is a string, not an object')
-       }).to.throw(/Options must be an object/)
-@@ -658,6 +659,11 @@
-       expect(() => {
-         menu.popup({})
-       }).to.not.throw()
-+=======
-+      assert.throws(() => {
-+        menu.popup()
-+      }, /Options must be an object/)
-+>>>>>>> .their
-     })
- 
-     it('should emit menu-will-show event', (done) => {
-added in both
-  our    100644 9ab56d88e50ae5891364cb271362e5ec0c0edd26 spec/api-notification-dbus-spec.js
-  their  100644 81c1b68f31d0c9490742d3bd4b4227abaaf72ca3 spec/api-notification-dbus-spec.js
-@@ -6,7 +6,11 @@
- //
- // See https://pypi.python.org/pypi/python-dbusmock to read about dbusmock.
- 
-+<<<<<<< .our
- const {expect} = require('chai')
-+=======
-+const assert = require('assert')
-+>>>>>>> .their
- const dbus = require('dbus-native')
- const Promise = require('bluebird')
- 
-@@ -27,12 +31,20 @@
-   before(async () => {
-     // init app
-     app.setName(appName)
-+<<<<<<< .our
-     app.setDesktopName(`${appName}.desktop`)
-+=======
-+    app.setDesktopName(appName + '.desktop')
-+>>>>>>> .their
-     // init dbus
-     const path = '/org/freedesktop/Notifications'
-     const iface = 'org.freedesktop.DBus.Mock'
-     const bus = dbus.sessionBus()
-+<<<<<<< .our
-     console.log(`session bus: ${process.env.DBUS_SESSION_BUS_ADDRESS}`)
-+=======
-+    console.log('session bus: ' + process.env.DBUS_SESSION_BUS_ADDRESS)
-+>>>>>>> .their
-     const service = bus.getService(serviceName)
-     const getInterface = Promise.promisify(service.getInterface, {context: service})
-     mock = await getInterface(path, iface)
-@@ -48,10 +60,17 @@
-     app.setVersion(realAppVersion)
-   })
- 
-+<<<<<<< .our
-   describe(`Notification module using ${serviceName}`, () => {
-     function onMethodCalled (done) {
-       function cb (name) {
-         console.log(`onMethodCalled: ${name}`)
-+=======
-+  describe('Notification module using ' + serviceName, () => {
-+    function onMethodCalled (done) {
-+      function cb (name) {
-+        console.log('onMethodCalled: ' + name)
-+>>>>>>> .their
-         if (name === 'Notify') {
-           mock.removeListener('MethodCalled', cb)
-           console.log('done')
-@@ -83,7 +102,11 @@
-       }
-     }
- 
-+<<<<<<< .our
-     before(done => {
-+=======
-+    before((done) => {
-+>>>>>>> .their
-       mock.on('MethodCalled', onMethodCalled(done))
-       // lazy load Notification after we listen to MethodCalled mock signal
-       Notification = require('electron').remote.Notification
-@@ -98,6 +121,7 @@
-       n.show()
-     })
- 
-+<<<<<<< .our
-     it(`should call ${serviceName} to show notifications`, async () => {
-       const calls = await getCalls()
-       expect(calls).to.be.an('array').of.lengthOf.at.least(1)
-@@ -108,6 +132,16 @@
- 
-       let args = unmarshalDBusNotifyArgs(lastCall[2])
-       expect(args).to.deep.equal({
-+=======
-+    it('should call ' + serviceName + ' to show notifications', async () => {
-+      const calls = await getCalls()
-+      assert(calls.length >= 1)
-+      let lastCall = calls[calls.length - 1]
-+      let methodName = lastCall[1]
-+      assert.equal(methodName, 'Notify')
-+      let args = unmarshalDBusNotifyArgs(lastCall[2])
-+      assert.deepEqual(args, {
-+>>>>>>> .their
-         app_name: appName,
-         replaces_id: 0,
-         app_icon: '',
-changed in both
-  base   100644 122170292838e951ade4989669c87a7531e89ba7 spec/api-web-contents-spec.js
-  our    100644 be02cb3f84001a541d64b11fe6eda50fc32e8afd spec/api-web-contents-spec.js
-  their  100644 cbb45f5d84f1b11c8c27c56515d5daffa23d0c04 spec/api-web-contents-spec.js
-@@ -122,6 +122,7 @@
-     })
-   })
- 
-+<<<<<<< .our
-   // Disabled because flaky. See #13969
-   xdescribe('isCurrentlyAudible() API', () => {
-     it('returns whether audio is playing', async () => {
-@@ -138,6 +139,8 @@
-     })
-   })
- 
-+=======
-+>>>>>>> .their
-   describe('getWebPreferences() API', () => {
-     it('should not crash when called for devTools webContents', (done) => {
-       w.webContents.openDevTools()
-@@ -730,6 +733,7 @@
-     })
-   })
- 
-+<<<<<<< .our
-   describe('referrer', () => {
-     it('propagates referrer information to new target=_blank windows', (done) => {
-       const server = http.createServer((req, res) => {
-@@ -776,6 +780,8 @@
-     })
-   })
- 
-+=======
-+>>>>>>> .their
-   describe('webframe messages in sandboxed contents', () => {
-     it('responds to executeJavaScript', (done) => {
-       w.destroy()
-changed in both
-  base   100644 2d388ca3b5744ea69d96ef71da6ade70e3dd001b spec/chromium-spec.js
-  our    100644 d90269769d269e4054d25cba4b6c4ac8a1929aa6 spec/chromium-spec.js
-  their  100644 25bef2e689e5ecbcd1485a042e84691db9400659 spec/chromium-spec.js
-@@ -319,8 +319,12 @@
-       b = window.open(windowUrl, '', 'nodeIntegration=no,show=no')
-     })
- 
-+<<<<<<< .our
-     // TODO(codebytere): re-enable this test
-     xit('disables node integration when it is disabled on the parent window for chrome devtools URLs', (done) => {
-+=======
-+    it('disables node integration when it is disabled on the parent window for chrome devtools URLs', (done) => {
-+>>>>>>> .their
-       let b
-       app.once('web-contents-created', (event, contents) => {
-         contents.once('did-finish-load', () => {
-changed in both
-  base   100644 07176e0097efa17e8f8aea5bb059a2739b8c3336 spec/fixtures/api/singleton/main.js
-  our    100644 3202a7a180d6d48c70706d5ef244652872b24bbc spec/fixtures/api/singleton/main.js
-  their  100644 cbf3da1117d91eb8df1b1e6363737a210b7eae78 spec/fixtures/api/singleton/main.js
-@@ -3,8 +3,11 @@
- app.once('ready', () => {
-   console.log('started')  // ping parent
- })
-+<<<<<<< .our
- 
- const gotTheLock = app.requestSingleInstanceLock()
-+=======
-+>>>>>>> .their
- 
- app.on('second-instance', () => {
-   setImmediate(() => app.exit(0))
-changed in both
-  base   100644 cfe840ca0a44c5766509b2865034d98e375da1a1 spec/modules-spec.js
-  our    100644 b996b8f4839bff2160bffb69e55263b16a4178d7 spec/modules-spec.js
-  their  100644 28f2602acff67b2da9accd0574d64d386e0795a7 spec/modules-spec.js
-changed in both
-  base   100644 e2d7d001eb49a9b01edcf9590ccdcb7ac8cc669c spec/node-spec.js
-  our    100644 9bb03494a56ffacec075c40bebde39a3b57ac734 spec/node-spec.js
-  their  100644 f053aa4dbadbbc216d98f3a985f29069bb2e4786 spec/node-spec.js
-changed in both
-  base   100644 feac23db7e06d3e49f8d5be7e9b3f08a204f262f spec/security-warnings-spec.js
-  our    100644 6315a9420e01b5db19596f0dd5731d47ce02acf6 spec/security-warnings-spec.js
-  their  100644 85fd0973b60cd6e27becbeef75415560b4061d24 spec/security-warnings-spec.js
-@@ -142,7 +142,11 @@
-       }
-     })
-     w.webContents.once('console-message', (e, level, message) => {
-+<<<<<<< .our
-       assert(message.includes('enableBlinkFeatures'), message)
-+=======
-+      assert(message.includes('blinkFeatures'), message)
-+>>>>>>> .their
-       done()
-     })
- 
-changed in both
-  base   100644 ca5cc28d4f9f860947454dfc964208dd13ba1434 spec/static/index.html
-  our    100644 fc1e153c0af2908cf7ee4c3ea4f05522de04f0f8 spec/static/index.html
-  their  100644 e9d779f061cd5bdf00667d0b7942c6c30de81092 spec/static/index.html
-@@ -51,7 +51,11 @@
-   if (!process.env.MOCHA_REPORTER) {
-     mocha.ui('bdd').reporter(isCi ? 'tap' : 'html')
-   }
--  mocha.timeout(isCi ? 30000 : 10000)
-+  if (process.env.MOCHA_TIMEOUT && process.env.MOCHA_TIMEOUT > 0) {
-+    mocha.timeout(process.env.MOCHA_TIMEOUT)
-+  } else {
-+    mocha.timeout(isCi ? 30000 : 10000)
-+  }
- 
-   const query = Mocha.utils.parseQuery(window.location.search || '')
-   if (query.grep) mocha.grep(query.grep)
-changed in both
-  base   100644 6580f18a1ad9e53ab3f2ae88cb7ea023bcf9579c toolchain.gypi
-  our    100644 697add78e42191741cee1b015cdcf4f801c570e7 toolchain.gypi
-  their  100644 8ed945a57c8875bae06cef74dc5d44afcc586d1d toolchain.gypi
-changed in both
-  base   160000 db1b314c019f6acbd4d1be273b63521cc6051d3c vendor/libchromiumcontent
-  our    160000 c85470a1c379b1c4bedb372c146521bc4be9b75d vendor/libchromiumcontent
-  their  160000 7878d313798820d1539364ecb87da61e14d834d6 vendor/libchromiumcontent
-removed in local
-  base   160000 99d9e262eb36cb9dc8e83f61e026d2a7ad1e96ab vendor/native_mate
-  their  160000 6a3d238b7e1e3742f2bb495336a84021d927a24f vendor/native_mate
-changed in both
-  base   160000 bf06b641574a6e2a8357ca4b44defac4a83f1dda vendor/node
-  our    160000 ece0a06ac8147efb5b5af431c21f312f1884616e vendor/node
-  their  160000 f2bcc6b58293287e2a6e592bd296aa55bb37b801 vendor/node
-added in both
-  our    100644 84bd69c2b2868ac23bc30061aa208ad38fbb9506 vsts.yml
-  their  100644 5209acdec2eb8557ea55ce5281b7999b974aa5b6 vsts.yml
-@@ -54,21 +54,32 @@
-       script/test.py --ci --rebuild_native_modules
-     fi
-   name: Test
-+<<<<<<< .our
-   condition: or(ne(variables['ELECTRON_RELEASE'], '1'), eq(variables['UPLOAD_TO_S3'], '1'))
-+=======
-+>>>>>>> .their
- 
- - bash: |
-     echo 'Verifying ffmpeg on build'
-     if [ "$ELECTRON_RELEASE" == "1" ]; then
-+<<<<<<< .our
-       script/verify-ffmpeg.py -c R
-+=======
-+      script/verify-ffmpeg.py -R
-+>>>>>>> .their
-     else
-       script/verify-ffmpeg.py
-     fi
-   name: Verify_FFmpeg
-+<<<<<<< .our
-   condition: or(ne(variables['ELECTRON_RELEASE'], '1'), eq(variables['UPLOAD_TO_S3'], '1'))
-+=======
-+>>>>>>> .their
- 
- - task: PublishTestResults@2
-   displayName: Publish Test Results
-   inputs:
-+<<<<<<< .our
-     testResultsFiles: '**/test-*.xml'
-   condition: and(always(), eq(variables['MOCHA_FILE'], 'test-results.xml'))
- 
-@@ -93,5 +104,18 @@
-   inputs:
-     PathtoPublish: '$(Build.SourcesDirectory)/out'
-     ArtifactName: out
-+=======
-+    testResultsFiles: 'test-results.xml'
-+    searchFolder: junit
-+  condition: and(always(), ne(variables['ELECTRON_RELEASE'], '1'))
-+
-+- task: kasunkodagoda.slack-notification.slack-notification-task.SlackNotification@3
-+  displayName: Post Slack Notification
-+  inputs:
-+    SlackApiToken: '$(slack_token)'
-+    Channel: '#bot-nightly-releases'
-+    Message: '$(Build.DefinitionName)-$(Build.BuildNumber) finished with a $(Agent.JobStatus) status.'
-+  condition: and(always(), eq(variables['Build.Reason'], 'Schedule'))
-+>>>>>>> .their
- 
- - task: mspremier.PostBuildCleanup.PostBuildCleanup-task.PostBuildCleanup@3
diff --git a/app/test/fixtures/merge-parser/electron/merge-update-templates-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-update-templates-into-master.txt
deleted file mode 100644
index 905c9a13751..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-update-templates-into-master.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-added in both
-  our    100644 10cb69a7a8e4ca3b2e9ca08515eacced297bb277 .github/ISSUE_TEMPLATE/Bug_report.md
-  their  100644 a5cad57bfaef1e29296926448a251d1fe3e5419f .github/ISSUE_TEMPLATE/Bug_report.md
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- ---
- name: Bug report
- about: Create a report to help us improve Electron
-@@ -30,3 +31,37 @@
- 
- **Additional Information**
- Add any other context about the problem here.
-+=======
-+---
-+name: Bug report
-+about: Create a report to help us improve Electron
-+
-+---
-+
-+* Electron Version:
-+* Operating System (Platform and Version):
-+* Last known working Electron version: 
-+
-+**Expected Behavior**
-+A clear and concise description of what you expected to happen.
-+
-+**Actual behavior**
-+A clear and concise description of what actually happened.
-+
-+**To Reproduce**
-+Your best chance of getting this bug looked at quickly is to provide a REPOSITORY that can be cloned and run.
-+
-+You can fork [electron-quick-start](https://github.com/electron/electron-quick-start) and include a link to the branch with your changes.
-+
-+If you provide a URL, please list the commands required to clone/setup/run your repo e.g.
-+```sh
-+$ git clone $YOUR_URL -b $BRANCH
-+$ npm install
-+$ npm start || electron .
-+```
-+**Screenshots**
-+If applicable, add screenshots to help explain your problem.
-+
-+**Additional Information**
-+Add any other context about the problem here.
-+>>>>>>> .their
-added in both
-  our    100644 51c2e6c8d52c9343a0853d2d2ec5b205a3aca790 .github/ISSUE_TEMPLATE/Feature_request.md
-  their  100644 9f3aa9e21d7bf082f3d486f49603406bb10fd8f5 .github/ISSUE_TEMPLATE/Feature_request.md
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- ---
- name: Feature request
- about: Suggest an idea for Electron
-@@ -15,3 +16,22 @@
- 
- **Additional context**
- Add any other context or screenshots about the feature request here.
-+=======
-+---
-+name: Feature request
-+about: Suggest an idea for Electron
-+
-+---
-+
-+**Is your feature request related to a problem? Please describe.**
-+A clear and concise description of what the problem is.
-+
-+**Describe the solution you'd like**
-+A clear and concise description of what you want to happen.
-+
-+**Describe alternatives you've considered**
-+A clear and concise description of any alternative solutions or features you've considered.
-+
-+**Additional context**
-+Add any other context or screenshots about the feature request here.
-+>>>>>>> .their
diff --git a/app/test/fixtures/merge-parser/electron/merge-upload-syms-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-upload-syms-into-master.txt
deleted file mode 100644
index 9dba5b91ce4..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-upload-syms-into-master.txt
+++ /dev/null
@@ -1,5292 +0,0 @@
-changed in both
-  base   100644 d4f98eab95b73b59018f170b09b9132d4d03477b .circleci/config.yml
-  our    100644 6d44d618aabcce04c60344f2274dec5b0c2a1f68 .circleci/config.yml
-  their  100644 2e15ee803f6b6e207a21021beedde968e9aee37e .circleci/config.yml
-@@ -19,6 +19,7 @@
-       fi
-     when: on_success
- 
-+<<<<<<< .our
- build-steps: &build-steps
-   steps:
-     - checkout
-@@ -117,6 +118,94 @@
-         name: Verify FFmpeg
-         command: |
-           if [ "$RUN_TESTS" == "true" ]; then
-+=======
-+version: 2
-+jobs:
-+  electron-linux-arm:
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: arm
-+          RUN_RELEASE_BUILD: true
-+    resource_class: 2xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload-symbols.py
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Optionally finish release
-+          shell: /bin/sh
-+          command: |
-+            if [ "$ELECTRON_RELEASE" == "1" ] && [ "$AUTO_RELEASE" == "true" ]; then
-+              echo 'Trying to finish release'
-+              node script/release.js --validateRelease --automaticRelease
-+              releaseExitCode=$?
-+              if [ $releaseExitCode -eq 0 ]; then
-+                echo 'Release is ready to go; releasing'
-+                node script/release.js--automaticRelease
-+                if [ $releaseExitCode -eq 0 ]; then
-+                  echo 'Release successful, now publishing to npm'
-+                  echo "//registry.npmjs.org/:_authToken=$ELECTRON_NPM_TOKEN" >> ~/.npmrc
-+                  npm run publish-to-npm
-+                  echo 'Release has been published to npm'
-+                fi
-+              else
-+                echo 'Release is not complete, skipping publish for now'
-+              fi
-+            else
-+              echo 'Skipping finishing release because build is not for release'
-+            fi
-+      - run:
-+          name: Zip out directory
-+          command: |
-+>>>>>>> .their
-             if [ "$ELECTRON_RELEASE" != "1" ]; then
-               echo 'Verifying ffmpeg on debug build'
-               script/verify-ffmpeg.py
-@@ -391,11 +480,106 @@
-     resource_class: 2xlarge
- 
-   electron-linux-arm64:
-+<<<<<<< .our
-     environment:
-       TARGET_ARCH: arm64
-     <<: *build-defaults
-     resource_class: 2xlarge
- 
-+=======
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: arm64
-+          RUN_RELEASE_BUILD: true
-+    resource_class: 2xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload-symbols.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload-symbols.py
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Optionally finish release
-+          shell: /bin/sh
-+          command: |
-+            if [ "$ELECTRON_RELEASE" == "1" ] && [ "$AUTO_RELEASE" == "true" ]; then
-+              echo 'Trying to finish release'
-+              node script/release.js --validateRelease --automaticRelease
-+              releaseExitCode=$?
-+              if [ $releaseExitCode -eq 0 ]; then
-+                echo 'Release is ready to go; releasing'
-+                node script/release.js--automaticRelease
-+                if [ $releaseExitCode -eq 0 ]; then
-+                  echo 'Release successful, now publishing to npm'
-+                  echo "//registry.npmjs.org/:_authToken=$ELECTRON_NPM_TOKEN" >> ~/.npmrc
-+                  npm run publish-to-npm
-+                  echo 'Release has been published to npm'
-+                fi
-+              else
-+                echo 'Release is not complete, skipping publish for now'
-+              fi
-+            else
-+              echo 'Skipping finishing release because build is not for release'
-+            fi
-+      - run:
-+          name: Zip out directory
-+          command: |
-+            if [ "$ELECTRON_RELEASE" != "1" ]; then
-+              zip -r electron.zip out/D
-+            fi
-+      - persist_to_workspace:
-+          root: /home/builduser
-+          paths:
-+            - project/out
-+      - store_artifacts:
-+          path: electron.zip
-+>>>>>>> .their
-   electron-linux-arm64-test:
-     machine: true
-     steps:
-@@ -430,6 +614,7 @@
-     resource_class: 2xlarge
- 
-   electron-linux-ia32:
-+<<<<<<< .our
-     environment:
-       TARGET_ARCH: ia32
-       DISPLAY: ':99.0'
-@@ -469,10 +654,320 @@
-       NIGHTLY_BUILD: true
-     <<: *build-defaults
-     resource_class: xlarge
-+=======
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: ia32
-+          DISPLAY: ':99.0'
-+          RUN_RELEASE_BUILD: true
-+    resource_class: xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Setup for headless testing
-+          command: sh -e /etc/init.d/xvfb start
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload-symbols.py
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Optionally finish release
-+          shell: /bin/sh
-+          command: |
-+            if [ "$ELECTRON_RELEASE" == "1" ] && [ "$AUTO_RELEASE" == "true" ]; then
-+              echo 'Trying to finish release'
-+              node script/release.js --validateRelease --automaticRelease
-+              releaseExitCode=$?
-+              if [ $releaseExitCode -eq 0 ]; then
-+                echo 'Release is ready to go; releasing'
-+                node script/release.js--automaticRelease
-+                if [ $releaseExitCode -eq 0 ]; then
-+                  echo 'Release successful, now publishing to npm'
-+                  echo "//registry.npmjs.org/:_authToken=$ELECTRON_NPM_TOKEN" >> ~/.npmrc
-+                  npm run publish-to-npm
-+                  echo 'Release has been published to npm'
-+                fi
-+              else
-+                echo 'Release is not complete, skipping publish for now'
-+              fi
-+            else
-+              echo 'Skipping finishing release because build is not for release'
-+            fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                out/D/electron --version
-+                mkdir junit
-+                script/test.py --ci --rebuild_native_modules
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+  electron-linux-mips64el:
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: mips64el
-+          RUN_RELEASE_BUILD: true
-+    resource_class: xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload-symbols.py
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Optionally finish release
-+          shell: /bin/sh
-+          command: |
-+            if [ "$ELECTRON_RELEASE" == "1" ] && [ "$AUTO_RELEASE" == "true" ]; then
-+              echo 'Trying to finish release'
-+              node script/release.js --validateRelease --automaticRelease
-+              releaseExitCode=$?
-+              if [ $releaseExitCode -eq 0 ]; then
-+                echo 'Release is ready to go; releasing'
-+                node script/release.js--automaticRelease
-+                if [ $releaseExitCode -eq 0 ]; then
-+                  echo 'Release successful, now publishing to npm'
-+                  echo "//registry.npmjs.org/:_authToken=$ELECTRON_NPM_TOKEN" >> ~/.npmrc
-+                  npm run publish-to-npm
-+                  echo 'Release has been published to npm'
-+                fi
-+              else
-+                echo 'Release is not complete, skipping publish for now'
-+              fi
-+            else
-+              echo 'Skipping finishing release because build is not for release'
-+            fi
-+
-+  electron-linux-x64:
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: x64
-+          DISPLAY: ':99.0'
-+          RUN_RELEASE_BUILD: true
-+    resource_class: xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Setup for headless testing
-+          command: sh -e /etc/init.d/xvfb start
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload-symbols.py
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Optionally finish release
-+          shell: /bin/sh
-+          command: |
-+            if [ "$ELECTRON_RELEASE" == "1" ] && [ "$AUTO_RELEASE" == "true" ]; then
-+              echo 'Trying to finish release'
-+              node script/release.js --validateRelease --automaticRelease
-+              releaseExitCode=$?
-+              if [ $releaseExitCode -eq 0 ]; then
-+                echo 'Release is ready to go; releasing'
-+                node script/release.js--automaticRelease
-+                if [ $releaseExitCode -eq 0 ]; then
-+                  echo 'Release successful, now publishing to npm'
-+                  echo "//registry.npmjs.org/:_authToken=$ELECTRON_NPM_TOKEN" >> ~/.npmrc
-+                  npm run publish-to-npm
-+                  echo 'Release has been published to npm'
-+                fi
-+              else
-+                echo 'Release is not complete, skipping publish for now'
-+              fi
-+            else
-+              echo 'Skipping finishing release because build is not for release'
-+            fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                mkdir junit
-+                script/test.py --ci --rebuild_native_modules
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+      - run:
-+          name: Generate Typescript Definitions
-+          command: npm run create-typescript-definitions
-+      - store_test_results:
-+          path: junit
-+      - store_artifacts:
-+          path: junit
-+      - store_artifacts:
-+          path: out/electron.d.ts
-+      - store_artifacts:
-+          path: out/electron-api.json
-+>>>>>>> .their
- 
-   electron-osx-x64:
-     environment:
-       TARGET_ARCH: x64
-+<<<<<<< .our
-       RUN_TESTS: true
-       INSTALL_MACOS_NODE: true
-     macos:
-@@ -488,11 +983,109 @@
-     macos:
-       xcode: "8.3.3"
-     <<: *build-steps
-+=======
-+      RUN_RELEASE_BUILD: true
-+    macos:
-+        xcode: "9.0"
-+    resource_class: xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Reclaim disk space
-+          command: |
-+            df -h
-+            sudo rm -rf /Library/Developer/CoreSimulator
-+            df -h
-+            sysctl -n hw.ncpu
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload-symbols.py
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                mkdir junit
-+                script/test.py --ci --rebuild_native_modules
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+      - run:
-+          name: Generate Typescript Definitions
-+          command: npm run create-typescript-definitions
-+      - store_test_results:
-+          path: junit
-+      - store_artifacts:
-+          path: junit
-+      - store_artifacts:
-+          path: out/electron.d.ts
-+      - store_artifacts:
-+          path: out/electron-api.json
-+>>>>>>> .their
- 
-   electron-mas-x64:
-     environment:
-       TARGET_ARCH: x64
-       MAS_BUILD: 1
-+<<<<<<< .our
-       RUN_TESTS: true
-       INSTALL_MACOS_NODE: true
-     macos:
-@@ -668,6 +1261,103 @@
-       GN_EXTRA_ARGS: 'is_mas_build = true'
-     <<: *gn-mac-build-machine
-     <<: *gn-mac-build-steps
-+=======
-+      RUN_RELEASE_BUILD: true
-+    macos:
-+        xcode: "9.0"
-+    resource_class: xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Reclaim disk space
-+          command: |
-+            df -h
-+            sudo rm -rf /Library/Developer/CoreSimulator
-+            df -h
-+            sysctl -n hw.ncpu
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload-symbols.py
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                mkdir junit
-+                script/test.py --ci --rebuild_native_modules
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+      - run:
-+          name: Generate Typescript Definitions
-+          command: npm run create-typescript-definitions
-+      - store_test_results:
-+          path: junit
-+      - store_artifacts:
-+          path: junit
-+      - store_artifacts:
-+          path: out/electron.d.ts
-+      - store_artifacts:
-+          path: out/electron-api.json
-+>>>>>>> .their
- 
- workflows:
-   version: 2
-@@ -695,6 +1385,7 @@
-   build-mas-x64:
-     jobs:
-       - electron-mas-x64
-+<<<<<<< .our
-   build-gn-linux:
-     jobs:
-       - electron-gn-linux-x64-debug-fyi
-@@ -745,3 +1436,5 @@
-       - electron-gn-linux-arm64-release-fyi
-       - electron-gn-mas-release-fyi
-       - electron-gn-osx-release-fyi
-+=======
-+>>>>>>> .their
-changed in both
-  base   100644 8632e8e30869d32176552cd218560f5016a24300 .gitignore
-  our    100644 f393b1cdcef87b41bb3ed47ebae59757fed3a780 .gitignore
-  their  100644 f82d92052e4f7ac936637ac2c163633e02588f12 .gitignore
-changed in both
-  base   100644 5d04da05397c4c74ce00d6d6c8969ce370adb32d CONTRIBUTING.md
-  our    100644 414f83db905db904728facf3b40e70e7b7973193 CONTRIBUTING.md
-  their  100644 0955f68c4f2b1097e770398cf51d3af811f53050 CONTRIBUTING.md
-changed in both
-  base   100644 4cfea0e70f9af56ba746347b4cae410970f3d900 Dockerfile
-  our    100644 74e5eeedea9bea87cd7a98ac2cb63f4376275a2a Dockerfile
-  their  100644 2d74e16915d2e89e1e1e7f3ffd259cc448e1b864 Dockerfile
-@@ -7,8 +7,13 @@
- RUN chmod a+rwx /home
- 
- # Install node.js
-+<<<<<<< .our
- RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
- RUN apt-get install -y nodejs
-+=======
-+RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
-+RUN apt-get update && apt-get install -y nodejs
-+>>>>>>> .their
- 
- # Install wget used by crash reporter
- RUN apt-get install -y wget
-changed in both
-  base   100644 271947c56e39b91fc23bf10579f61cab50b0f4dc Dockerfile.circleci
-  our    100644 d369c8c640161fc3ba65935297aec7dd27eb1e9f Dockerfile.circleci
-  their  100644 0cdb1e88c24f01a5acdfd8ef348126819f593454 Dockerfile.circleci
-@@ -3,8 +3,13 @@
- USER root
- 
- # Install node.js
-+<<<<<<< .our
- RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
- RUN apt-get install -y nodejs
-+=======
-+RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
-+RUN apt-get update && apt-get install -y nodejs
-+>>>>>>> .their
- 
- # Install wget used by crash reporter
- RUN apt-get install -y wget
-added in remote
-  their  100644 c6d558f7f3518ea2924fa9075ed38ab48d70d204 Jenkinsfile.arm64
-@@ -0,0 +1,36 @@
-+pipeline {
-+  agent {
-+    docker {
-+      image 'electronbuilds/arm64v8:0.0.2'
-+      args '--privileged'
-+    }
-+  }
-+  environment {
-+    TARGET_ARCH='arm64'
-+    DISPLAY=':99.0'
-+    MOCHA_TIMEOUT='60000'
-+  }
-+  stages {
-+    stage('Bootstrap') {
-+      steps {
-+        sh 'script/bootstrap.py -v --dev --target_arch=$TARGET_ARCH'
-+      }
-+    }
-+    stage('Build') {
-+      steps {
-+        sh 'script/build.py -c D --ninja-path /usr/local/ninja/ninja'
-+      }
-+    }
-+    stage('Test') {
-+      steps {
-+        sh '/etc/init.d/xvfb start'
-+        sh 'script/test.py --ci'
-+      }
-+    }
-+  }
-+  post {
-+    always {
-+      cleanWs()
-+    }
-+  }
-+}
-changed in both
-  base   100644 160dae7908236105f8534f9448f4111da1bcb014 README.md
-  our    100644 ec09364417b767ac59b2d970fee5e2ab2db2173b README.md
-  their  100644 a7b4fa6ed40a6449245cfdbdace8bb38945284d2 README.md
-changed in both
-  base   100644 9472d1cb9fd76beca4047bb24db024b9c6378aae atom/app/command_line_args.cc
-  our    100644 23e870cf4a32aecfc246a81edad46971b4456a55 atom/app/command_line_args.cc
-  their  100644 be171457726a09cde9eb7a090ba1e2a67f4cb9cb atom/app/command_line_args.cc
-@@ -31,6 +31,1376 @@
-   return false;
- }
- 
-+<<<<<<< .our
-+=======
-+/*
-+ * The blacklist of command line switches, must be sorted.
-+ * Update the list by pasting the following command into bash
-+ * in libchromiumcontent/src/:
-+
-+   (find ./ \( -name "*switches.cc" -o -name "*switch_list.h" \) | \
-+      xargs grep -P --no-filename '"\S+"[);]$' | \
-+      perl -pe 's|^.*?"(\S+)"[);]$|  "$1",|'; \
-+      echo '  "inspect",'; \
-+      echo '  "inspect-brk",') | \
-+    LANG="C" sort | \
-+    uniq > blacklist-switches.txt
-+
-+ */
-+const char* kBlacklist[] = {
-+  "/prefetch:1",
-+  "/prefetch:2",
-+  "/prefetch:3",
-+  "/prefetch:4",
-+  "/prefetch:5",
-+  "/prefetch:6",
-+  "/prefetch:8",
-+  "0",
-+  "?",
-+  "BlacklistOnly",
-+  "ChromeOSMemoryPressureHandling",
-+  "Disabled",
-+  "OnlineCheckOnly",
-+  "SafeSites",
-+  "accept-resource-provider",
-+  "account-consistency",
-+  "adaboost",
-+  "aec-refined-adaptive-filter",
-+  "agc-startup-min-volume",
-+  "aggressive",
-+  "aggressive-cache-discard",
-+  "aggressive-tab-discard",
-+  "all-toolchains",
-+  "allarticles",
-+  "allow-cross-origin-auth-prompt",
-+  "allow-external-pages",
-+  "allow-failed-policy-fetch-for-test",
-+  "allow-file-access-from-files",
-+  "allow-hidden-media-playback",
-+  "allow-http-background-page",
-+  "allow-http-screen-capture",
-+  "allow-insecure-localhost",
-+  "allow-legacy-extension-manifests",
-+  "allow-loopback-in-peer-connection",
-+  "allow-nacl-crxfs-api",
-+  "allow-nacl-file-handle-api",
-+  "allow-nacl-socket-api",
-+  "allow-no-sandbox-job",
-+  "allow-outdated-plugins",
-+  "allow-ra-in-dev-mode",
-+  "allow-running-insecure-content",
-+  "allow-sandbox-debugging",
-+  "allow-silent-push",
-+  "alsa-check-close-timeout",
-+  "alsa-enable-upsampling",
-+  "alsa-fixed-output-sample-rate",
-+  "alsa-input-device",
-+  "alsa-mute-device-name",
-+  "alsa-mute-element-name",
-+  "alsa-output-avail-min",
-+  "alsa-output-buffer-size",
-+  "alsa-output-device",
-+  "alsa-output-period-size",
-+  "alsa-output-start-threshold",
-+  "alsa-volume-device-name",
-+  "alsa-volume-element-name",
-+  "also-emit-success-logs",
-+  "alternative",
-+  "always-authorize-plugins",
-+  "always-on",
-+  "always-use-complex-text",
-+  "alwaystrue",
-+  "android-fonts-path",
-+  "android-stderr-port",
-+  "android-stdin-port",
-+  "android-stdout-port",
-+  "angle",
-+  "app",
-+  "app-auto-launched",
-+  "app-id",
-+  "app-mode-auth-code",
-+  "app-mode-oauth-token",
-+  "app-mode-oem-manifest",
-+  "app-shell-allow-roaming",
-+  "app-shell-host-window-size",
-+  "app-shell-preferred-network",
-+  "app-shell-refresh-token",
-+  "app-shell-user",
-+  "apple",
-+  "apps-gallery-download-url",
-+  "apps-gallery-update-url",
-+  "apps-gallery-url",
-+  "apps-keep-chrome-alive-in-tests",
-+  "arc-availability",
-+  "arc-available",
-+  "arc-start-mode",
-+  "arc-transition-migration-required",
-+  "args",
-+  "artifacts-dir",
-+  "ash-animate-from-boot-splash-screen",
-+  "ash-constrain-pointer-to-root",
-+  "ash-copy-host-background-at-boot",
-+  "ash-debug-shortcuts",
-+  "ash-dev-shortcuts",
-+  "ash-disable-smooth-screen-rotation",
-+  "ash-disable-touch-exploration-mode",
-+  "ash-enable-magnifier-key-scroller",
-+  "ash-enable-mirrored-screen",
-+  "ash-enable-night-light",
-+  "ash-enable-palette-on-all-displays",
-+  "ash-enable-scale-settings-tray",
-+  "ash-enable-software-mirroring",
-+  "ash-enable-unified-desktop",
-+  "ash-estimated-presentation-delay",
-+  "ash-hide-notifications-for-factory",
-+  "ash-host-window-bounds",
-+  "ash-shelf-color",
-+  "ash-shelf-color-scheme",
-+  "ash-touch-hud",
-+  "ash-webui-init",
-+  "attestation-server",
-+  "audio-buffer-size",
-+  "audio-output-channels",
-+  "aura-legacy-power-button",
-+  "auth-ext-path",
-+  "auth-server-whitelist",
-+  "auth-spnego-account-type",
-+  "auto",
-+  "auto-open-devtools-for-tabs",
-+  "auto-select-desktop-capture-source",
-+  "autoplay-policy",
-+  "blink-settings",
-+  "bootstrap",
-+  "browser-subprocess-path",
-+  "browser-test",
-+  "bwsi",
-+  "bypass-app-banner-engagement-checks",
-+  "canvas-msaa-sample-count",
-+  "cast-initial-screen-height",
-+  "cast-initial-screen-width",
-+  "cc-layer-tree-test-long-timeout",
-+  "cc-layer-tree-test-no-timeout",
-+  "cc-rebaseline-pixeltests",
-+  "cellular-first",
-+  "cellular-only",
-+  "check-for-update-interval",
-+  "check-layout-test-sys-deps",
-+  "child-wallpaper-large",
-+  "child-wallpaper-small",
-+  "chrome-home-swipe-logic",
-+  "cipher-suite-blacklist",
-+  "clamshell",
-+  "class",
-+  "clear-token-service",
-+  "cloud-print-file",
-+  "cloud-print-file-type",
-+  "cloud-print-job-title",
-+  "cloud-print-print-ticket",
-+  "cloud-print-setup-proxy",
-+  "cloud-print-url",
-+  "cloud-print-xmpp-endpoint",
-+  "color",
-+  "compensate-for-unstable-pinch-zoom",
-+  "compile-shader-always-succeeds",
-+  "component-updater",
-+  "connectivity-check-url",
-+  "conservative",
-+  "content-image-texture-target",
-+  "content-shell-host-window-size",
-+  "controller",
-+  "crash-dumps-dir",
-+  "crash-on-failure",
-+  "crash-on-hang-threads",
-+  "crash-server-url",
-+  "crash-test",
-+  "crashpad-handler",
-+  "create-browser-on-startup-for-tests",
-+  "create-default-gl-context",
-+  "cros-gaia-api-v1",
-+  "cros-region",
-+  "cros-regions-mode",
-+  "crosh-command",
-+  "cryptauth-http-host",
-+  "custom-devtools-frontend",
-+  "custom-launcher-page",
-+  "custom_summary",
-+  "d3d11",
-+  "d3d9",
-+  "daemon",
-+  "dark_muted",
-+  "dark_vibrant",
-+  "data-path",
-+  "data-reduction-proxy-config-url",
-+  "data-reduction-proxy-experiment",
-+  "data-reduction-proxy-http-proxies",
-+  "data-reduction-proxy-lo-fi",
-+  "data-reduction-proxy-pingback-url",
-+  "data-reduction-proxy-secure-proxy-check-url",
-+  "data-reduction-proxy-server-experiments-disabled",
-+  "dbus-stub",
-+  "debug-devtools",
-+  "debug-enable-frame-toggle",
-+  "debug-packed-apps",
-+  "debug-print",
-+  "default",
-+  "default-background-color",
-+  "default-tile-height",
-+  "default-tile-width",
-+  "default-wallpaper-is-oem",
-+  "default-wallpaper-large",
-+  "default-wallpaper-small",
-+  "delay-reload-stop-button-change",
-+  "demo",
-+  "derelict-detection-timeout",
-+  "derelict-idle-timeout",
-+  "desktop",
-+  "desktop-window-1080p",
-+  "deterministic-fetch",
-+  "device-management-url",
-+  "device-scale-factor",
-+  "devtools-flags",
-+  "diagnostics",
-+  "diagnostics-format",
-+  "diagnostics-recovery",
-+  "dice",
-+  "disable",
-+  "disable-2d-canvas-clip-aa",
-+  "disable-2d-canvas-image-chromium",
-+  "disable-3d-apis",
-+  "disable-accelerated-2d-canvas",
-+  "disable-accelerated-jpeg-decoding",
-+  "disable-accelerated-mjpeg-decode",
-+  "disable-accelerated-video-decode",
-+  "disable-app-info-dialog-mac",
-+  "disable-app-list-dismiss-on-blur",
-+  "disable-app-window-cycling",
-+  "disable-appcontainer",
-+  "disable-arc-data-wipe",
-+  "disable-arc-opt-in-verification",
-+  "disable-audio-support-for-desktop-share",
-+  "disable-avfoundation-overlays",
-+  "disable-background-networking",
-+  "disable-background-timer-throttling",
-+  "disable-backgrounding-occluded-windows",
-+  "disable-backing-store-limit",
-+  "disable-blink-features",
-+  "disable-bookmark-reordering",
-+  "disable-boot-animation",
-+  "disable-breakpad",
-+  "disable-browser-task-scheduler",
-+  "disable-bundled-ppapi-flash",
-+  "disable-canvas-aa",
-+  "disable-captive-portal-bypass-proxy",
-+  "disable-cast-streaming-hw-encoding",
-+  "disable-checker-imaging",
-+  "disable-clear-browsing-data-counters",
-+  "disable-client-side-phishing-detection",
-+  "disable-cloud-import",
-+  "disable-component-cloud-policy",
-+  "disable-component-extensions-with-background-pages",
-+  "disable-component-update",
-+  "disable-composited-antialiasing",
-+  "disable-contextual-search",
-+  "disable-d3d11",
-+  "disable-databases",
-+  "disable-datasaver-prompt",
-+  "disable-default-apps",
-+  "disable-demo-mode",
-+  "disable-device-disabling",
-+  "disable-device-discovery-notifications",
-+  "disable-dinosaur-easter-egg",
-+  "disable-direct-composition",
-+  "disable-direct-composition-layers",
-+  "disable-directwrite-for-ui",
-+  "disable-display-color-calibration",
-+  "disable-display-list-2d-canvas",
-+  "disable-distance-field-text",
-+  "disable-domain-blocking-for-3d-apis",
-+  "disable-domain-reliability",
-+  "disable-drive-search-in-app-launcher",
-+  "disable-dwm-composition",
-+  "disable-encryption-migration",
-+  "disable-eol-notification",
-+  "disable-es3-apis",
-+  "disable-es3-gl-context",
-+  "disable-extensions",
-+  "disable-extensions-except",
-+  "disable-extensions-file-access-check",
-+  "disable-extensions-http-throttling",
-+  "disable-fast-web-scroll-view-insets",
-+  "disable-features",
-+  "disable-field-trial-config",
-+  "disable-file-manager-touch-mode",
-+  "disable-file-system",
-+  "disable-flash-3d",
-+  "disable-flash-stage3d",
-+  "disable-fullscreen-low-power-mode",
-+  "disable-fullscreen-tab-detaching",
-+  "disable-gaia-services",
-+  "disable-gesture-editing",
-+  "disable-gesture-requirement-for-presentation",
-+  "disable-gesture-typing",
-+  "disable-gl-drawing-for-tests",
-+  "disable-gl-error-limit",
-+  "disable-gl-extensions",
-+  "disable-glsl-translator",
-+  "disable-gpu",
-+  "disable-gpu-compositing",
-+  "disable-gpu-driver-bug-workarounds",
-+  "disable-gpu-early-init",
-+  "disable-gpu-memory-buffer-compositor-resources",
-+  "disable-gpu-memory-buffer-video-frames",
-+  "disable-gpu-process-crash-limit",
-+  "disable-gpu-program-cache",
-+  "disable-gpu-rasterization",
-+  "disable-gpu-sandbox",
-+  "disable-gpu-shader-disk-cache",
-+  "disable-gpu-vsync",
-+  "disable-gpu-watchdog",
-+  "disable-hang-monitor",
-+  "disable-hid-detection-on-oobe",
-+  "disable-histogram-customizer",
-+  "disable-hosted-app-shim-creation",
-+  "disable-hosted-apps-in-windows",
-+  "disable-http2",
-+  "disable-in-process-stack-traces",
-+  "disable-infobars",
-+  "disable-input-ime-api",
-+  "disable-input-view",
-+  "disable-ios-password-generation",
-+  "disable-ios-password-suggestions",
-+  "disable-ios-physical-web",
-+  "disable-javascript-harmony-shipping",
-+  "disable-kill-after-bad-ipc",
-+  "disable-lcd-text",
-+  "disable-legacy-window",
-+  "disable-local-storage",
-+  "disable-lock-screen-apps",
-+  "disable-logging",
-+  "disable-logging-redirect",
-+  "disable-login-animations",
-+  "disable-login-screen-apps",
-+  "disable-low-end-device-mode",
-+  "disable-low-latency-dxva",
-+  "disable-low-res-tiling",
-+  "disable-lru-snapshot-cache",
-+  "disable-mac-overlays",
-+  "disable-mac-views-native-app-windows",
-+  "disable-machine-cert-request",
-+  "disable-main-frame-before-activation",
-+  "disable-md-error-screen",
-+  "disable-md-oobe",
-+  "disable-media-session-api",
-+  "disable-media-suspend",
-+  "disable-merge-key-char-events",
-+  "disable-mojo-local-storage",
-+  "disable-mojo-renderer",
-+  "disable-mtp-write-support",
-+  "disable-multi-display-layout",
-+  "disable-namespace-sandbox",
-+  "disable-native-gpu-memory-buffers",
-+  "disable-network-portal-notification",
-+  "disable-new-channel-switcher-ui",
-+  "disable-new-korean-ime",
-+  "disable-new-virtual-keyboard-behavior",
-+  "disable-new-zip-unpacker",
-+  "disable-notifications",
-+  "disable-ntp-most-likely-favicons-from-server",
-+  "disable-ntp-popular-sites",
-+  "disable-nv12-dxgi-video",
-+  "disable-offer-store-unmasked-wallet-cards",
-+  "disable-offer-upload-credit-cards",
-+  "disable-office-editing-component-extension",
-+  "disable-offline-auto-reload",
-+  "disable-offline-auto-reload-visible-only",
-+  "disable-origin-trial-controlled-blink-features",
-+  "disable-overscroll-edge-effect",
-+  "disable-panel-fitting",
-+  "disable-partial-raster",
-+  "disable-password-generation",
-+  "disable-pepper-3d",
-+  "disable-pepper-3d-image-chromium",
-+  "disable-permission-action-reporting",
-+  "disable-permissions-api",
-+  "disable-physical-keyboard-autocorrect",
-+  "disable-pinch",
-+  "disable-pnacl-crash-throttling",
-+  "disable-popup-blocking",
-+  "disable-prefer-compositing-to-lcd-text",
-+  "disable-presentation-api",
-+  "disable-print-preview",
-+  "disable-prompt-on-repost",
-+  "disable-proximity-auth-bluetooth-low-energy-discovery",
-+  "disable-pull-to-refresh-effect",
-+  "disable-push-api-background-mode",
-+  "disable-quic",
-+  "disable-reading-from-canvas",
-+  "disable-remote-core-animation",
-+  "disable-remote-fonts",
-+  "disable-remote-playback-api",
-+  "disable-renderer-accessibility",
-+  "disable-renderer-backgrounding",
-+  "disable-renderer-priority-management",
-+  "disable-request-mobile-site",
-+  "disable-resize-lock",
-+  "disable-rgba-4444-textures",
-+  "disable-rollback-option",
-+  "disable-rtc-smoothness-algorithm",
-+  "disable-screen-orientation-lock",
-+  "disable-search-geolocation-disclosure",
-+  "disable-seccomp-filter-sandbox",
-+  "disable-settings-window",
-+  "disable-setuid-sandbox",
-+  "disable-shader-name-hashing",
-+  "disable-shared-workers",
-+  "disable-signin-promo",
-+  "disable-signin-scoped-device-id",
-+  "disable-single-click-autofill",
-+  "disable-skia-runtime-opts",
-+  "disable-slim-navigation-manager",
-+  "disable-slimming-paint-invalidation",
-+  "disable-smooth-scrolling",
-+  "disable-software-rasterizer",
-+  "disable-speech-api",
-+  "disable-suggestions-ui",
-+  "disable-sync",
-+  "disable-sync-app-list",
-+  "disable-sync-types",
-+  "disable-system-timezone-automatic-detection",
-+  "disable-tab-for-desktop-share",
-+  "disable-tab-strip-autoscroll-new-tabs",
-+  "disable-third-party-keyboard-workaround",
-+  "disable-threaded-animation",
-+  "disable-threaded-compositing",
-+  "disable-threaded-scrolling",
-+  "disable-touch-adjustment",
-+  "disable-touch-drag-drop",
-+  "disable-translate-new-ux",
-+  "disable-usb-keyboard-detect",
-+  "disable-v8-idle-tasks",
-+  "disable-vaapi-accelerated-video-encode",
-+  "disable-virtual-keyboard-overscroll",
-+  "disable-voice-input",
-+  "disable-volume-adjust-sound",
-+  "disable-wake-on-wifi",
-+  "disable-web-notification-custom-layouts",
-+  "disable-web-security",
-+  "disable-webgl",
-+  "disable-webgl-image-chromium",
-+  "disable-webrtc-encryption",
-+  "disable-webrtc-hw-decoding",
-+  "disable-webrtc-hw-encoding",
-+  "disable-win32k-lockdown",
-+  "disable-xss-auditor",
-+  "disable-zero-browsers-open-for-tests",
-+  "disable-zero-copy",
-+  "disable-zero-copy-dxgi-video",
-+  "disabled",
-+  "disabled-new-style-notification",
-+  "disallow-non-exact-resource-reuse",
-+  "disk-cache-dir",
-+  "disk-cache-size",
-+  "display",
-+  "dmg-device",
-+  "dns-log-details",
-+  "document-user-activation-required",
-+  "dom-automation",
-+  "dotfile",
-+  "draft",
-+  "draw-view-bounds-rects",
-+  "duck-flash",
-+  "dump-blink-runtime-call-stats",
-+  "dump-browser-histograms",
-+  "dump-dom",
-+  "eafe-path",
-+  "eafe-url",
-+  "easy-unlock-app-path",
-+  "edge-touch-filtering",
-+  "egl",
-+  "elevate",
-+  "embedded-extension-options",
-+  "emphasize-titles-in-omnibox-dropdown",
-+  "emulate-shader-precision",
-+  "enable-accelerated-2d-canvas",
-+  "enable-accelerated-vpx-decode",
-+  "enable-accessibility-tab-switcher",
-+  "enable-adaptive-selection-handle-orientation",
-+  "enable-aggressive-domstorage-flushing",
-+  "enable-android-wallpapers-app",
-+  "enable-app-info-dialog-mac",
-+  "enable-app-list",
-+  "enable-app-window-cycling",
-+  "enable-appcontainer",
-+  "enable-arc",
-+  "enable-arc-oobe-optin",
-+  "enable-audio-debug-recordings-from-extension",
-+  "enable-audio-focus",
-+  "enable-automation",
-+  "enable-benchmarking",
-+  "enable-ble-advertising-in-apps",
-+  "enable-blink-features",
-+  "enable-bookmark-reordering",
-+  "enable-bookmark-undo",
-+  "enable-browser-side-navigation",
-+  "enable-browser-task-scheduler",
-+  "enable-checker-imaging",
-+  "enable-chromevox-arc-support",
-+  "enable-clear-browsing-data-counters",
-+  "enable-cloud-print-proxy",
-+  "enable-cloud-print-xps",
-+  "enable-consumer-kiosk",
-+  "enable-contextual-search",
-+  "enable-crash-reporter",
-+  "enable-crash-reporter-for-testing",
-+  "enable-crx-hash-check",
-+  "enable-data-reduction-proxy-bypass-warning",
-+  "enable-data-reduction-proxy-force-pingback",
-+  "enable-data-reduction-proxy-lite-page",
-+  "enable-data-reduction-proxy-savings-promo",
-+  "enable-datasaver-prompt",
-+  "enable-device-discovery-notifications",
-+  "enable-devtools-experiments",
-+  "enable-direct-composition-layers",
-+  "enable-display-list-2d-canvas",
-+  "enable-distance-field-text",
-+  "enable-distillability-service",
-+  "enable-dom-distiller",
-+  "enable-domain-reliability",
-+  "enable-drive-search-in-app-launcher",
-+  "enable-drm-atomic",
-+  "enable-embedded-extension-options",
-+  "enable-encryption-migration",
-+  "enable-encryption-selection",
-+  "enable-es3-apis",
-+  "enable-exclusive-audio",
-+  "enable-experimental-accessibility-features",
-+  "enable-experimental-canvas-features",
-+  "enable-experimental-extension-apis",
-+  "enable-experimental-fullscreen-exit-ui",
-+  "enable-experimental-input-view-features",
-+  "enable-experimental-web-platform-features",
-+  "enable-extension-activity-log-testing",
-+  "enable-extension-activity-logging",
-+  "enable-extension-assets-sharing",
-+  "enable-fast-unload",
-+  "enable-fast-web-scroll-view-insets",
-+  "enable-features",
-+  "enable-file-manager-touch-mode",
-+  "enable-first-run-ui-transitions",
-+  "enable-floating-virtual-keyboard",
-+  "enable-font-antialiasing",
-+  "enable-fullscreen-tab-detaching",
-+  "enable-fullscreen-toolbar-reveal",
-+  "enable-google-branded-context-menu",
-+  "enable-gpu-async-worker-context",
-+  "enable-gpu-benchmarking",
-+  "enable-gpu-client-logging",
-+  "enable-gpu-client-tracing",
-+  "enable-gpu-command-logging",
-+  "enable-gpu-debugging",
-+  "enable-gpu-driver-debug-logging",
-+  "enable-gpu-memory-buffer-compositor-resources",
-+  "enable-gpu-memory-buffer-video-frames",
-+  "enable-gpu-rasterization",
-+  "enable-gpu-service-logging",
-+  "enable-gpu-service-tracing",
-+  "enable-hardware-overlays",
-+  "enable-harfbuzz-rendertext",
-+  "enable-hdr",
-+  "enable-heap-profiling",
-+  "enable-hosted-app-quit-notification",
-+  "enable-hosted-apps-in-windows",
-+  "enable-hotword-hardware",
-+  "enable-hung-renderer-infobar",
-+  "enable-inband-text-tracks",
-+  "enable-input-ime-api",
-+  "enable-internal-media-session",
-+  "enable-ios-handoff-to-other-devices",
-+  "enable-ios-password-generation",
-+  "enable-ios-physical-web",
-+  "enable-layer-lists",
-+  "enable-lcd-text",
-+  "enable-leak-detection",
-+  "enable-local-file-accesses",
-+  "enable-local-sync-backend",
-+  "enable-logging",
-+  "enable-longpress-drag-selection",
-+  "enable-low-end-device-mode",
-+  "enable-low-res-tiling",
-+  "enable-lru-snapshot-cache",
-+  "enable-mac-views-native-app-windows",
-+  "enable-main-frame-before-activation",
-+  "enable-md-feedback",
-+  "enable-md-policy-page",
-+  "enable-media-suspend",
-+  "enable-merge-key-char-events",
-+  "enable-message-center-always-scroll-up-upon-notification-removal",
-+  "enable-nacl",
-+  "enable-nacl-debug",
-+  "enable-nacl-nonsfi-mode",
-+  "enable-native-gpu-memory-buffers",
-+  "enable-natural-scroll-default",
-+  "enable-navigation-tracing",
-+  "enable-net-benchmarking",
-+  "enable-network-information-downlink-max",
-+  "enable-network-portal-notification",
-+  "enable-new-app-menu-icon",
-+  "enable-ntp-most-likely-favicons-from-server",
-+  "enable-ntp-popular-sites",
-+  "enable-ntp-search-engine-country-detection",
-+  "enable-offer-store-unmasked-wallet-cards",
-+  "enable-offer-upload-credit-cards",
-+  "enable-offline-auto-reload",
-+  "enable-offline-auto-reload-visible-only",
-+  "enable-osk-overscroll",
-+  "enable-override-bookmarks-ui",
-+  "enable-partial-raster",
-+  "enable-password-generation",
-+  "enable-pepper-testing",
-+  "enable-permission-action-reporting",
-+  "enable-physical-keyboard-autocorrect",
-+  "enable-picture-in-picture",
-+  "enable-pinch",
-+  "enable-pixel-output-in-tests",
-+  "enable-plugin-placeholder-testing",
-+  "enable-potentially-annoying-security-features",
-+  "enable-power-overlay",
-+  "enable-precise-memory-info",
-+  "enable-prefer-compositing-to-lcd-text",
-+  "enable-print-browser",
-+  "enable-print-preview-register-promos",
-+  "enable-profile-shortcut-manager",
-+  "enable-profiling",
-+  "enable-push-api-background-mode",
-+  "enable-quic",
-+  "enable-reader-mode-toolbar-icon",
-+  "enable-refresh-token-annotation-request",
-+  "enable-request-tablet-site",
-+  "enable-rgba-4444-textures",
-+  "enable-sandbox",
-+  "enable-sandbox-logging",
-+  "enable-screenshot-testing-with-mode",
-+  "enable-scripts-require-action",
-+  "enable-scroll-prediction",
-+  "enable-service-manager-tracing",
-+  "enable-settings-window",
-+  "enable-sgi-video-sync",
-+  "enable-signin-promo",
-+  "enable-single-click-autofill",
-+  "enable-site-settings",
-+  "enable-skia-benchmarking",
-+  "enable-slim-navigation-manager",
-+  "enable-slimming-paint-invalidation",
-+  "enable-slimming-paint-v2",
-+  "enable-smooth-scrolling",
-+  "enable-spatial-navigation",
-+  "enable-spdy-proxy-auth",
-+  "enable-speech-dispatcher",
-+  "enable-spelling-feedback-field-trial",
-+  "enable-spotlight-actions",
-+  "enable-stats-collection-bindings",
-+  "enable-stats-table",
-+  "enable-strict-mixed-content-checking",
-+  "enable-strict-powerful-feature-restrictions",
-+  "enable-suggestions-ui",
-+  "enable-suggestions-with-substring-match",
-+  "enable-supervised-user-managed-bookmarks-folder",
-+  "enable-surface-synchronization",
-+  "enable-swap-buffers-with-bounds",
-+  "enable-sync-app-list",
-+  "enable-sync-articles",
-+  "enable-tab-audio-muting",
-+  "enable-tablet-splitview",
-+  "enable-tcp-fastopen",
-+  "enable-third-party-keyboard-workaround",
-+  "enable-threaded-compositing",
-+  "enable-threaded-texture-mailboxes",
-+  "enable-tile-compression",
-+  "enable-touch-calibration-setting",
-+  "enable-touch-drag-drop",
-+  "enable-touchpad-three-finger-click",
-+  "enable-touchview",
-+  "enable-trace-app-source",
-+  "enable-tracing",
-+  "enable-tracing-output",
-+  "enable-translate-new-ux",
-+  "enable-ui-devtools",
-+  "enable-use-zoom-for-dsf",
-+  "enable-user-controlled-alternate-protocol-ports",
-+  "enable-user-metrics",
-+  "enable-usermedia-screen-capturing",
-+  "enable-video-player-chromecast-support",
-+  "enable-viewport",
-+  "enable-virtual-keyboard",
-+  "enable-voice-interaction",
-+  "enable-vtune-support",
-+  "enable-vulkan",
-+  "enable-wayland-server",
-+  "enable-web-notification-custom-layouts",
-+  "enable-webfonts-intervention-trigger",
-+  "enable-webfonts-intervention-v2",
-+  "enable-webgl-draft-extensions",
-+  "enable-webgl-image-chromium",
-+  "enable-webrtc-event-logging-from-extension",
-+  "enable-webrtc-srtp-aes-gcm",
-+  "enable-webrtc-stun-origin",
-+  "enable-webview-finch",
-+  "enable-webvr",
-+  "enable-wifi-credential-sync",
-+  "enable-win7-webrtc-hw-h264-decoding",
-+  "enable-zero-copy",
-+  "enable-zip-archiver-on-file-manager",
-+  "enabled",
-+  "enabled-2g",
-+  "enabled-3g",
-+  "enabled-new-style-notification",
-+  "enabled-slow2g",
-+  "encode-binary",
-+  "enforce",
-+  "enforce-gl-minimums",
-+  "enforce-webrtc-ip-permission-check",
-+  "enforce_strict",
-+  "enterprise-disable-arc",
-+  "enterprise-enable-forced-re-enrollment",
-+  "enterprise-enable-license-type-selection",
-+  "enterprise-enable-zero-touch-enrollment",
-+  "enterprise-enrollment-initial-modulus",
-+  "enterprise-enrollment-modulus-limit",
-+  "error-console",
-+  "experiment",
-+  "explicitly-allowed-ports",
-+  "expose-internals-for-testing",
-+  "extension-content-verification",
-+  "extension-process",
-+  "extensions-install-verification",
-+  "extensions-multi-account",
-+  "extensions-not-webstore",
-+  "extensions-on-chrome-urls",
-+  "extensions-update-frequency",
-+  "extra-search-query-params",
-+  "fail-on-unused-args",
-+  "fake-variations-channel",
-+  "false",
-+  "fast",
-+  "fast-start",
-+  "feedback-server",
-+  "field-trial-handle",
-+  "first-exec-after-boot",
-+  "flag-switches-begin",
-+  "flag-switches-end",
-+  "font-cache-shared-handle",
-+  "force-android-app-mode",
-+  "force-app-mode",
-+  "force-clamshell-power-button",
-+  "force-color-profile",
-+  "force-desktop-ios-promotion",
-+  "force-dev-mode-highlighting",
-+  "force-device-scale-factor",
-+  "force-display-list-2d-canvas",
-+  "force-effective-connection-type",
-+  "force-enable-metrics-reporting",
-+  "force-enable-stylus-tools",
-+  "force-fieldtrial-params",
-+  "force-fieldtrials",
-+  "force-first-run",
-+  "force-first-run-ui",
-+  "force-gpu-mem-available-mb",
-+  "force-gpu-rasterization",
-+  "force-happiness-tracking-system",
-+  "force-load-easy-unlock-app-in-tests",
-+  "force-local-ntp",
-+  "force-login-manager-in-tests",
-+  "force-mediafoundation",
-+  "force-overlay-fullscreen-video",
-+  "force-password-reauth",
-+  "force-pnacl-subzero",
-+  "force-renderer-accessibility",
-+  "force-show-update-menu-badge",
-+  "force-show-update-menu-item",
-+  "force-system-compositor-mode",
-+  "force-tablet-mode",
-+  "force-text-direction",
-+  "force-ui-direction",
-+  "force-variation-ids",
-+  "force-video-overlays",
-+  "force-wave-audio",
-+  "force-webrtc-ip-handling-policy",
-+  "full-memory-crash-report",
-+  "gaia-url",
-+  "gcm-checkin-url",
-+  "gcm-mcs-endpoint",
-+  "gcm-registration-url",
-+  "generate-accessibility-test-expectations",
-+  "gl",
-+  "gl-composited-overlay-candidate-quad-border",
-+  "gl-shader-interm-output",
-+  "gles",
-+  "golden-screenshots-dir",
-+  "google-apis-url",
-+  "google-base-url",
-+  "google-doodle-url",
-+  "google-url",
-+  "gpu-active-device-id",
-+  "gpu-active-vendor-id",
-+  "gpu-device-id",
-+  "gpu-driver-bug-workarounds",
-+  "gpu-driver-date",
-+  "gpu-driver-vendor",
-+  "gpu-driver-version",
-+  "gpu-launcher",
-+  "gpu-no-complete-info-collection",
-+  "gpu-no-context-lost",
-+  "gpu-process",
-+  "gpu-program-cache-size-kb",
-+  "gpu-rasterization-msaa-sample-count",
-+  "gpu-sandbox-allow-sysv-shm",
-+  "gpu-sandbox-failures-fatal",
-+  "gpu-sandbox-start-early",
-+  "gpu-secondary-device-ids",
-+  "gpu-secondary-vendor-ids",
-+  "gpu-startup-dialog",
-+  "gpu-testing-device-id",
-+  "gpu-testing-driver-date",
-+  "gpu-testing-gl-renderer",
-+  "gpu-testing-gl-vendor",
-+  "gpu-testing-gl-version",
-+  "gpu-testing-os-version",
-+  "gpu-testing-secondary-device-ids",
-+  "gpu-testing-secondary-vendor-ids",
-+  "gpu-testing-vendor-id",
-+  "gpu-vendor-id",
-+  "guest-wallpaper-large",
-+  "guest-wallpaper-small",
-+  "h",
-+  "has-chromeos-diamond-key",
-+  "has-chromeos-keyboard",
-+  "has-internal-stylus",
-+  "headless",
-+  "help",
-+  "hide",
-+  "hide-icons",
-+  "hide-scrollbars",
-+  "history-entry-requires-user-gesture",
-+  "homedir",
-+  "homepage",
-+  "host",
-+  "host-pairing-oobe",
-+  "host-resolver-rules",
-+  "host-rules",
-+  "icu-data-dir",
-+  "ignore-autocomplete-off-autofill",
-+  "ignore-autoplay-restrictions",
-+  "ignore-certificate-errors",
-+  "ignore-certificate-errors-spki-list",
-+  "ignore-gpu-blacklist",
-+  "ignore-urlfetcher-cert-requests",
-+  "ignore-user-profile-mapping-for-tests",
-+  "in-process-gpu",
-+  "incognito",
-+  "input",
-+  "inspect",
-+  "inspect-brk",
-+  "install-chrome-app",
-+  "install-supervised-user-whitelists",
-+  "instant-process",
-+  "invalidation-use-gcm-channel",
-+  "ipc-connection-timeout",
-+  "ipc-dump-directory",
-+  "ipc-fuzzer-testcase",
-+  "is-running-in-mash",
-+  "isolate-origins",
-+  "isolate-sites-for-testing",
-+  "javascript-harmony",
-+  "js-flags",
-+  "keep-alive-for-test",
-+  "kiosk",
-+  "kiosk-printing",
-+  "lang",
-+  "last-launched-app",
-+  "layer",
-+  "light_muted",
-+  "light_vibrant",
-+  "limit-fps",
-+  "load-and-launch-app",
-+  "load-apps",
-+  "load-extension",
-+  "load-media-router-component-extension",
-+  "local-heuristics-only-for-password-generation",
-+  "local-ntp-reload",
-+  "local-sync-backend-dir",
-+  "log-gpu-control-list-decisions",
-+  "log-level",
-+  "log-net-log",
-+  "login-manager",
-+  "login-profile",
-+  "login-user",
-+  "lso-url",
-+  "ltr",
-+  "main-frame-resizes-are-orientation-changes",
-+  "make-chrome-default",
-+  "make-default-browser",
-+  "managed-user-id",
-+  "managed-user-sync-token",
-+  "mark-non-secure-as",
-+  "markdown",
-+  "market-url-for-testing",
-+  "mash",
-+  "material",
-+  "material-design-ink-drop-animation-speed",
-+  "material-hybrid",
-+  "max-gum-fps",
-+  "max-output-volume-dba1m",
-+  "max-untiled-layer-height",
-+  "max-untiled-layer-width",
-+  "media-cache-size",
-+  "mem-pressure-system-reserved-kb",
-+  "memlog",
-+  "memlog-pipe",
-+  "memory-pressure-off",
-+  "memory-pressure-thresholds",
-+  "memory-pressure-thresholds-mb",
-+  "message-center-changes-while-open",
-+  "metrics-client-id",
-+  "metrics-recording-only",
-+  "mhtml-generator-option",
-+  "mirror",
-+  "mock",
-+  "mojo-local-storage",
-+  "mojo-pipe-token",
-+  "monitoring-destination-id",
-+  "mse-audio-buffer-size-limit",
-+  "mse-video-buffer-size-limit",
-+  "mus",
-+  "mus-config",
-+  "mute-audio",
-+  "nacl-broker",
-+  "nacl-dangerous-no-sandbox-nonsfi",
-+  "nacl-debug-mask",
-+  "nacl-gdb",
-+  "nacl-gdb-script",
-+  "nacl-loader",
-+  "nacl-loader-nonsfi",
-+  "native",
-+  "native-crx-bindings",
-+  "need-arc-migration-policy-check",
-+  "net-log-capture-mode",
-+  "netifs-to-ignore",
-+  "network-country-iso",
-+  "network-settings-config",
-+  "new-window",
-+  "no-default-browser-check",
-+  "no-experiments",
-+  "no-first-run",
-+  "no-managed-user-acknowledgment-check",
-+  "no-network-profile-warning",
-+  "no-pings",
-+  "no-proxy-server",
-+  "no-referrers",
-+  "no-sandbox",
-+  "no-service-autorun",
-+  "no-session-id",
-+  "no-startup-window",
-+  "no-user-gesture-required",
-+  "no-wifi",
-+  "no-zygote",
-+  "nocolor",
-+  "noerrdialogs",
-+  "non-material",
-+  "non-secure",
-+  "non-secure-after-editing",
-+  "non-secure-while-incognito",
-+  "non-secure-while-incognito-or-editing",
-+  "none",
-+  "normal_muted",
-+  "normal_vibrant",
-+  "note-taking-app-ids",
-+  "ntp-snippets-add-incomplete",
-+  "ntp-switch-to-existing-tab",
-+  "null",
-+  "num-raster-threads",
-+  "oauth2-client-id",
-+  "oauth2-client-secret",
-+  "off",
-+  "on",
-+  "oobe-bootstrapping-master",
-+  "oobe-force-show-screen",
-+  "oobe-guest-session",
-+  "oobe-skip-postlogin",
-+  "oobe-timer-interval",
-+  "open-ash",
-+  "opengraph",
-+  "origin-to-force-quic-on",
-+  "origin-trial-disabled-features",
-+  "origin-trial-disabled-tokens",
-+  "origin-trial-public-key",
-+  "original-process-start-time",
-+  "osmesa",
-+  "output",
-+  "override",
-+  "override-metrics-upload-url",
-+  "override-plugin-power-saver-for-testing",
-+  "override-use-software-gl-for-tests",
-+  "overscroll-history-navigation",
-+  "overscroll-start-threshold",
-+  "ozone-dump-file",
-+  "ozone-platform",
-+  "pack-extension",
-+  "pack-extension-key",
-+  "parent-profile",
-+  "parent-window",
-+  "passive-listeners-default",
-+  "password-store",
-+  "permission-request-api-scope",
-+  "permission-request-api-url",
-+  "ppapi",
-+  "ppapi-antialiased-text-enabled",
-+  "ppapi-broker",
-+  "ppapi-flash-args",
-+  "ppapi-flash-path",
-+  "ppapi-flash-version",
-+  "ppapi-in-process",
-+  "ppapi-plugin-launcher",
-+  "ppapi-startup-dialog",
-+  "ppapi-subpixel-rendering-setting",
-+  "prerender-from-omnibox",
-+  "previous-app",
-+  "primary",
-+  "print-to-pdf",
-+  "privet-ipv6-only",
-+  "process-per-site",
-+  "process-per-tab",
-+  "product-version",
-+  "profile-directory",
-+  "profiler-timing",
-+  "profiling",
-+  "profiling-at-start",
-+  "profiling-file",
-+  "profiling-flush",
-+  "progress-bar-animation",
-+  "progress-bar-completion",
-+  "prompt-for-external-extensions",
-+  "proxy-auto-detect",
-+  "proxy-bypass-list",
-+  "proxy-pac-url",
-+  "proxy-server",
-+  "q",
-+  "quic-connection-options",
-+  "quic-max-packet-length",
-+  "quic-version",
-+  "rdp_desktop_session",
-+  "reader-mode-feedback",
-+  "reader-mode-heuristics",
-+  "rebaseline-pixel-tests",
-+  "record-type",
-+  "reduce-security-for-testing",
-+  "reduced-referrer-granularity",
-+  "register-font-files",
-+  "register-pepper-plugins",
-+  "relauncher",
-+  "remote-debugging-address",
-+  "remote-debugging-port",
-+  "remote-debugging-socket-fd",
-+  "remote-debugging-socket-name",
-+  "remote-debugging-targets",
-+  "renderer",
-+  "renderer-client-id",
-+  "renderer-cmd-prefix",
-+  "renderer-process-limit",
-+  "renderer-startup-dialog",
-+  "renderer-wait-for-java-debugger",
-+  "renderpass",
-+  "repl",
-+  "report-vp9-as-an-unsupported-mime-type",
-+  "require-audio-hardware-for-testing",
-+  "reset-app-list-install-state",
-+  "reset-variation-state",
-+  "restore-last-session",
-+  "root",
-+  "root-layer-scrolls",
-+  "rtl",
-+  "run-layout-test",
-+  "runtime-deps-list-file",
-+  "safebrowsing-disable-auto-update",
-+  "safebrowsing-disable-download-protection",
-+  "safebrowsing-disable-extension-blacklist",
-+  "safebrowsing-manual-download-blacklist",
-+  "sandbox-ipc",
-+  "save-page-as-mhtml",
-+  "screen-config",
-+  "screenshot",
-+  "script-executable",
-+  "scripts-require-action",
-+  "scroll-end-effect",
-+  "search-provider-logo-url",
-+  "secondary",
-+  "secondary-display-layout",
-+  "secondary-ui-md",
-+  "service",
-+  "service-manager",
-+  "service-name",
-+  "service-pipe-token",
-+  "service-request-channel-token",
-+  "service-runner",
-+  "shared-files",
-+  "shill-stub",
-+  "show-app-list",
-+  "show-autofill-signatures",
-+  "show-autofill-type-predictions",
-+  "show-cert-link",
-+  "show-component-extension-options",
-+  "show-composited-layer-borders",
-+  "show-fps-counter",
-+  "show-icons",
-+  "show-layer-animation-bounds",
-+  "show-login-dev-overlay",
-+  "show-mac-overlay-borders",
-+  "show-md-login",
-+  "show-non-md-login",
-+  "show-overdraw-feedback",
-+  "show-paint-rects",
-+  "show-property-changed-rects",
-+  "show-saved-copy",
-+  "show-screenspace-rects",
-+  "show-surface-damage-rects",
-+  "silent-debugger-extension-api",
-+  "silent-launch",
-+  "simulate-critical-update",
-+  "simulate-elevated-recovery",
-+  "simulate-outdated",
-+  "simulate-outdated-no-au",
-+  "simulate-upgrade",
-+  "single-process",
-+  "site-per-process",
-+  "skip-gpu-data-loading",
-+  "skip-nostore-all",
-+  "skip-nostore-main",
-+  "skip-reencoding-on-skp-capture",
-+  "slow",
-+  "slow-connections-only",
-+  "slow-down-raster-scale-factor",
-+  "sms-test-messages",
-+  "spdy-proxy-auth-fallback",
-+  "spdy-proxy-auth-origin",
-+  "spdy-proxy-auth-value",
-+  "spelling-service-feedback-interval-seconds",
-+  "spelling-service-feedback-url",
-+  "spurious-power-button-accel-count",
-+  "spurious-power-button-keyboard-accel",
-+  "spurious-power-button-lid-angle-change",
-+  "spurious-power-button-screen-accel",
-+  "spurious-power-button-window",
-+  "ssl-key-log-file",
-+  "ssl-version-max",
-+  "ssl-version-min",
-+  "stable-release-mode",
-+  "start-fullscreen",
-+  "start-maximized",
-+  "start-stack-profiler",
-+  "started",
-+  "stub",
-+  "stub-cros-settings",
-+  "supports-dual-gpus",
-+  "surface",
-+  "swiftshader",
-+  "swiftshader-webgl",
-+  "sync-allow-insecure-xmpp-connection",
-+  "sync-deferred-startup-timeout-seconds",
-+  "sync-disable-deferred-startup",
-+  "sync-enable-get-update-avoidance",
-+  "sync-notification-host-port",
-+  "sync-on-draw-hardware",
-+  "sync-short-initial-retry-override",
-+  "sync-short-nudge-delay-for-test",
-+  "sync-url",
-+  "system-developer-mode",
-+  "system-log-upload-frequency",
-+  "tab-management-experiment-type-disabled",
-+  "tab-management-experiment-type-elderberry",
-+  "task-profiler",
-+  "team-drives",
-+  "test-auto-update-ui",
-+  "test-child-process",
-+  "test-cros-gaia-id-migration",
-+  "test-do-not-initialize-icu",
-+  "test-encryption-migration-ui",
-+  "test-gl-lib",
-+  "test-launcher-batch-limit",
-+  "test-launcher-bot-mode",
-+  "test-launcher-debug-launcher",
-+  "test-launcher-filter-file",
-+  "test-launcher-force-run-broken-tests",
-+  "test-launcher-jobs",
-+  "test-launcher-list-tests",
-+  "test-launcher-output",
-+  "test-launcher-print-test-stdio",
-+  "test-launcher-print-writable-path",
-+  "test-launcher-retry-limit",
-+  "test-launcher-shard-index",
-+  "test-launcher-summary-output",
-+  "test-launcher-test-part-results-limit",
-+  "test-launcher-timeout",
-+  "test-launcher-total-shards",
-+  "test-launcher-trace",
-+  "test-name",
-+  "test-tiny-timeout",
-+  "test-type",
-+  "testing-fixed-http-port",
-+  "testing-fixed-https-port",
-+  "tether-stub",
-+  "threads",
-+  "time",
-+  "timeout",
-+  "tls1",
-+  "tls1.1",
-+  "tls1.2",
-+  "tls1.3",
-+  "tls13-variant",
-+  "top-chrome-md",
-+  "top-controls-hide-threshold",
-+  "top-controls-show-threshold",
-+  "touch-calibration",
-+  "touch-devices",
-+  "touch-events",
-+  "touch-noise-filtering",
-+  "touch-selection-strategy",
-+  "touch_view",
-+  "trace-config-file",
-+  "trace-export-events-to-etw",
-+  "trace-shutdown",
-+  "trace-shutdown-file",
-+  "trace-startup",
-+  "trace-startup-duration",
-+  "trace-startup-file",
-+  "trace-to-console",
-+  "trace-to-file",
-+  "trace-to-file-name",
-+  "trace-upload-url",
-+  "tracelog",
-+  "translate-ranker-model-url",
-+  "translate-script-url",
-+  "translate-security-origin",
-+  "true",
-+  "trusted-download-sources",
-+  "try-chrome-again",
-+  "try-supported-channel-layouts",
-+  "type",
-+  "ui-disable-partial-swap",
-+  "ui-enable-layer-lists",
-+  "ui-enable-rgba-4444-textures",
-+  "ui-enable-zero-copy",
-+  "ui-prioritize-in-gpu-process",
-+  "ui-show-composited-layer-borders",
-+  "ui-show-fps-counter",
-+  "ui-show-layer-animation-bounds",
-+  "ui-show-paint-rects",
-+  "ui-show-property-changed-rects",
-+  "ui-show-screenspace-rects",
-+  "ui-show-surface-damage-rects",
-+  "ui-slow-animations",
-+  "ui-test-action-max-timeout",
-+  "ui-test-action-timeout",
-+  "uninstall",
-+  "unlimited-storage",
-+  "unsafe-pac-url",
-+  "unsafely-allow-protected-media-identifier-for-domain",
-+  "unsafely-treat-insecure-origin-as-secure",
-+  "use-angle",
-+  "use-cras",
-+  "use-double-buffering",
-+  "use-fake-device-for-media-stream",
-+  "use-fake-jpeg-decode-accelerator",
-+  "use-fake-ui-for-media-stream",
-+  "use-file-for-fake-audio-capture",
-+  "use-file-for-fake-video-capture",
-+  "use-first-display-as-internal",
-+  "use-gl",
-+  "use-gpu-in-tests",
-+  "use-ime-service",
-+  "use-mobile-user-agent",
-+  "use-mock-keychain",
-+  "use-passthrough-cmd-decoder",
-+  "use-simple-cache-backend",
-+  "use-system-default-printer",
-+  "use-test-config",
-+  "user-agent",
-+  "user-always-affiliated",
-+  "user-data-dir",
-+  "user-gesture-required",
-+  "user-gesture-required-for-cross-origin",
-+  "utility",
-+  "utility-allowed-dir",
-+  "utility-cmd-prefix",
-+  "utility-run-elevated",
-+  "v",
-+  "v2-sandbox",
-+  "v2-sandbox-enabled",
-+  "v8-cache-options",
-+  "v8-cache-strategies-for-cache-storage",
-+  "validate-crx",
-+  "validate-input-event-stream",
-+  "variations-override-country",
-+  "variations-server-url",
-+  "version",
-+  "video-image-texture-target",
-+  "video-threads",
-+  "video-underflow-threshold-ms",
-+  "virtual-time-budget",
-+  "vmodule",
-+  "voice-interaction-supported-locales",
-+  "wait-for-debugger",
-+  "wait-for-debugger-children",
-+  "wake-on-wifi-packet",
-+  "wallet-service-use-sandbox",
-+  "watcher",
-+  "waveout-buffers",
-+  "webapk-server-url",
-+  "webrtc-max-cpu-consumption-percentage",
-+  "webrtc-stun-probe-trial",
-+  "webview-enable-safebrowsing-support",
-+  "webview-sandboxed-renderer",
-+  "whitelisted-extension-id",
-+  "win-jumplist-action",
-+  "window-position",
-+  "window-size",
-+  "window-workspace",
-+  "windows10-custom-titlebar",
-+  "winhttp-proxy-resolver",
-+  "wm-window-animations-disabled",
-+  "yield-between-content-script-runs",
-+  "zygote",
-+  "zygote-cmd-prefix",
-+};
-+
-+bool IsBlacklistedArg(const base::CommandLine::CharType* arg) {
-+#if defined(OS_WIN)
-+  const auto converted = base::WideToUTF8(arg);
-+  const char* a = converted.c_str();
-+#else
-+  const char* a = arg;
-+#endif
-+
-+  static const char* prefixes[] = {"--", "-", "/"};
-+
-+  int prefix_length = 0;
-+  for (auto& prefix : prefixes) {
-+    if (base::StartsWith(a, prefix, base::CompareCase::SENSITIVE)) {
-+      prefix_length = strlen(prefix);
-+      break;
-+    }
-+  }
-+
-+  if (prefix_length > 0) {
-+    a += prefix_length;
-+    std::string switch_name =
-+        base::ToLowerASCII(base::StringPiece(a, strcspn(a, "=")));
-+    return std::binary_search(std::begin(kBlacklist), std::end(kBlacklist),
-+                              switch_name);
-+  }
-+
-+  return false;
-+}
-+
-+>>>>>>> .their
- }  // namespace
- 
- namespace atom {
-changed in both
-  base   100644 4bd88a5a43c03ceba308ec06fdf0cbadeddcaae3 atom/browser/api/atom_api_browser_view.cc
-  our    100644 bd83208694c61c4d7c43ce4be26939c2682b2a13 atom/browser/api/atom_api_browser_view.cc
-  their  100644 41f0e99cdd79bf1ad2c4c8c0db5aaa97ac5e1297 atom/browser/api/atom_api_browser_view.cc
-changed in both
-  base   100644 ced1cb31d8df7689f7652111720ba20fb029b1fe atom/browser/api/atom_api_menu_views.cc
-  our    100644 3da7dc2842fa4561e037aa67f290d0cc6ca71014 atom/browser/api/atom_api_menu_views.cc
-  their  100644 fa178e57d82413544b92172ae0ed4401ea5f178b atom/browser/api/atom_api_menu_views.cc
-@@ -49,8 +49,16 @@
-   menu_runners_[window_id] =
-       std::make_unique<MenuRunner>(model(), flags, close_callback);
-   menu_runners_[window_id]->RunMenuAt(
-+<<<<<<< .our
-       native_window->widget(), NULL, gfx::Rect(location, gfx::Size()),
-       views::MENU_ANCHOR_TOPLEFT, ui::MENU_SOURCE_MOUSE);
-+=======
-+      native_window->widget(),
-+      NULL,
-+      gfx::Rect(location, gfx::Size()),
-+      views::MENU_ANCHOR_TOPLEFT,
-+      ui::MENU_SOURCE_MOUSE);
-+>>>>>>> .their
- }
- 
- void MenuViews::ClosePopupAt(int32_t window_id) {
-removed in local
-  base   100644 0d22fad5b8b5e3ed7711d55aa763f930014a75d7 atom/browser/api/atom_api_screen_mac.mm
-  their  100644 056b775fdfc221cb0501ba5b7afd8de01f2d4d63 atom/browser/api/atom_api_screen_mac.mm
-changed in both
-  base   100644 6e5c4b9cbe77c1a4004bbc2bf7b0f0089ffb9004 atom/browser/api/atom_api_session.cc
-  our    100644 658f913bb60b66ae1bf3aae97d7d9158e56f7ee0 atom/browser/api/atom_api_session.cc
-  their  100644 373ef90c393af3921e1cbd2d6375e7b9d9b7ecb5 atom/browser/api/atom_api_session.cc
-@@ -451,6 +451,7 @@
-   AtomNetworkDelegate* network_delegate =
-       static_cast<AtomNetworkDelegate*>(context->network_delegate());
-   network_delegate->SetDevToolsNetworkEmulationClientId(client_id);
-+<<<<<<< .our
- }
- 
- void DestroyGlobalHandle(v8::Isolate* isolate,
-@@ -468,6 +469,8 @@
-       object->SetAlignedPointerInInternalField(0, nullptr);
-     }
-   }
-+=======
-+>>>>>>> .their
- }
- 
- }  // namespace
-changed in both
-  base   100644 83adf62eee8301c49799b5397f2dcf6bfdbbd295 atom/browser/api/atom_api_web_contents.cc
-  our    100644 20a1ac2e672f08ffea528b6e094ba530ff8083d1 atom/browser/api/atom_api_web_contents.cc
-  their  100644 f9d17119183a89fc1d757929acc00fe9caaa2bcd atom/browser/api/atom_api_web_contents.cc
-@@ -280,7 +280,12 @@
- 
- // Called when CapturePage is done.
- void OnCapturePageDone(const base::Callback<void(const gfx::Image&)>& callback,
-+<<<<<<< .our
-                        const SkBitmap& bitmap) {
-+=======
-+                       const SkBitmap& bitmap,
-+                       content::ReadbackResponse response) {
-+>>>>>>> .their
-   // Hack to enable transparency in captured image
-   // TODO(nitsakh) Remove hack once fixed in chromium
-   const_cast<SkBitmap&>(bitmap).setAlphaType(kPremul_SkAlphaType);
-@@ -327,8 +332,18 @@
-   }
- }
- 
-+<<<<<<< .our
- WebContents::WebContents(v8::Isolate* isolate,
-                          const mate::Dictionary& options) {
-+=======
-+WebContents::WebContents(v8::Isolate* isolate, const mate::Dictionary& options)
-+    : embedder_(nullptr),
-+      zoom_controller_(nullptr),
-+      type_(BROWSER_WINDOW),
-+      request_id_(0),
-+      background_throttling_(true),
-+      enable_devtools_(true) {
-+>>>>>>> .their
-   // Read options.
-   options.Get("backgroundThrottling", &background_throttling_);
- 
-@@ -1015,6 +1030,18 @@
-                                     content::RenderFrameHost* frame_host) {
-   bool handled = true;
-   FrameDispatchHelper helper = {this, frame_host};
-+<<<<<<< .our
-+=======
-+  auto relay = NativeWindowRelay::FromWebContents(web_contents());
-+  if (relay) {
-+    IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(NativeWindow, message, frame_host)
-+      IPC_MESSAGE_FORWARD(AtomAutofillFrameHostMsg_HidePopup,
-+                          relay->window.get(), NativeWindow::HideAutofillPopup)
-+      IPC_MESSAGE_UNHANDLED(handled = false)
-+    IPC_END_MESSAGE_MAP()
-+  }
-+
-+>>>>>>> .their
-   IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(WebContents, message, frame_host)
-     IPC_MESSAGE_HANDLER(AtomFrameHostMsg_Message, OnRendererMessage)
-     IPC_MESSAGE_FORWARD_DELAY_REPLY(AtomFrameHostMsg_Message_Sync, &helper,
-@@ -1024,10 +1051,14 @@
-         FrameDispatchHelper::OnSetTemporaryZoomLevel)
-     IPC_MESSAGE_FORWARD_DELAY_REPLY(AtomFrameHostMsg_GetZoomLevel, &helper,
-                                     FrameDispatchHelper::OnGetZoomLevel)
-+<<<<<<< .our
- #if defined(TOOLKIT_VIEWS) && !defined(OS_MACOSX)
-     IPC_MESSAGE_HANDLER(AtomAutofillFrameHostMsg_ShowPopup, ShowAutofillPopup)
-     IPC_MESSAGE_HANDLER(AtomAutofillFrameHostMsg_HidePopup, HideAutofillPopup)
- #endif
-+=======
-+    IPC_MESSAGE_HANDLER(AtomAutofillFrameHostMsg_ShowPopup, ShowAutofillPopup)
-+>>>>>>> .their
-     IPC_MESSAGE_UNHANDLED(handled = false)
-   IPC_END_MESSAGE_MAP()
- 
-@@ -1075,6 +1106,20 @@
-        details.is_same_document, details.did_replace_entry);
- }
- 
-+<<<<<<< .our
-+=======
-+int64_t WebContents::GetIDForContents(content::WebContents* web_contents) {
-+  int64_t process_id = web_contents->GetRenderProcessHost()->GetID();
-+  int64_t routing_id = web_contents->GetMainFrame()->GetRoutingID();
-+  int64_t rv = (process_id << 32) + routing_id;
-+  return rv;
-+}
-+
-+int64_t WebContents::GetID() const {
-+  return WebContents::GetIDForContents(web_contents());
-+}
-+
-+>>>>>>> .their
- int WebContents::GetProcessID() const {
-   return web_contents()->GetMainFrame()->GetProcess()->GetID();
- }
-@@ -1552,7 +1597,11 @@
- bool WebContents::SendIPCMessage(bool all_frames,
-                                  const base::string16& channel,
-                                  const base::ListValue& args) {
-+<<<<<<< .our
-   auto* frame_host = web_contents()->GetMainFrame();
-+=======
-+  auto frame_host = web_contents()->GetMainFrame();
-+>>>>>>> .their
-   if (frame_host) {
-     return frame_host->Send(new AtomFrameMsg_Message(
-         frame_host->GetRoutingID(), all_frames, channel, args));
-@@ -1853,6 +1902,7 @@
-   rfh->Send(reply_msg);
- }
- 
-+<<<<<<< .our
- v8::Local<v8::Value> WebContents::GetPreloadPath(v8::Isolate* isolate) const {
-   if (auto* web_preferences = WebContentsPreferences::From(web_contents())) {
-     base::FilePath::StringType preload;
-@@ -1880,6 +1930,25 @@
- }
- 
- v8::Local<v8::Value> WebContents::GetOwnerBrowserWindow() const {
-+=======
-+v8::Local<v8::Value> WebContents::GetWebPreferences(v8::Isolate* isolate) {
-+  WebContentsPreferences* web_preferences =
-+      WebContentsPreferences::FromWebContents(web_contents());
-+  if (!web_preferences)
-+    return v8::Null(isolate);
-+  return mate::ConvertToV8(isolate, *web_preferences->web_preferences());
-+}
-+
-+v8::Local<v8::Value> WebContents::GetLastWebPreferences(v8::Isolate* isolate) {
-+  WebContentsPreferences* web_preferences =
-+      WebContentsPreferences::FromWebContents(web_contents());
-+  if (!web_preferences)
-+    return v8::Null(isolate);
-+  return mate::ConvertToV8(isolate, *web_preferences->last_web_preferences());
-+}
-+
-+v8::Local<v8::Value> WebContents::GetOwnerBrowserWindow() {
-+>>>>>>> .their
-   if (owner_window())
-     return BrowserWindow::From(isolate(), owner_window());
-   else
-@@ -2013,7 +2082,10 @@
-       .SetMethod("endFrameSubscription", &WebContents::EndFrameSubscription)
-       .SetMethod("startDrag", &WebContents::StartDrag)
-       .SetMethod("isGuest", &WebContents::IsGuest)
-+<<<<<<< .our
-       .SetMethod("attachToIframe", &WebContents::AttachToIframe)
-+=======
-+>>>>>>> .their
-       .SetMethod("isOffscreen", &WebContents::IsOffScreen)
-       .SetMethod("startPainting", &WebContents::StartPainting)
-       .SetMethod("stopPainting", &WebContents::StopPainting)
-changed in both
-  base   100644 16f23210557ca816cdeadd50b9332447eca8815f atom/browser/api/atom_api_web_contents.h
-  our    100644 7939f8268aa8c3371623e0c15f3b6001d7f1efa4 atom/browser/api/atom_api_web_contents.h
-  their  100644 027332a3706d5ac43a4a769234d361304bdc0350 atom/browser/api/atom_api_web_contents.h
-@@ -97,6 +97,8 @@
-   static void BuildPrototype(v8::Isolate* isolate,
-                              v8::Local<v8::FunctionTemplate> prototype);
- 
-+  static int64_t GetIDForContents(content::WebContents* web_contents);
-+
-   // Notifies to destroy any guest web contents before destroying self.
-   void DestroyWebContents(bool async);
- 
-@@ -234,8 +236,13 @@
-   v8::Local<v8::Value> GetPreloadPath(v8::Isolate* isolate) const;
- 
-   // Returns the web preferences of current WebContents.
-+<<<<<<< .our
-   v8::Local<v8::Value> GetWebPreferences(v8::Isolate* isolate) const;
-   v8::Local<v8::Value> GetLastWebPreferences(v8::Isolate* isolate) const;
-+=======
-+  v8::Local<v8::Value> GetWebPreferences(v8::Isolate* isolate);
-+  v8::Local<v8::Value> GetLastWebPreferences(v8::Isolate* isolate);
-+>>>>>>> .their
- 
-   // Returns the owner window.
-   v8::Local<v8::Value> GetOwnerBrowserWindow() const;
-changed in both
-  base   100644 3f53f4d3d7204f59037ba80556a2c9896e23aae4 atom/browser/api/atom_api_web_request.cc
-  our    100644 c088196f833160ac964e67030fa083302dd090b0 atom/browser/api/atom_api_web_request.cc
-  their  100644 ac84ac196b69a121a54dc64b87b7c2c1d6df21b5 atom/browser/api/atom_api_web_request.cc
-@@ -40,7 +40,11 @@
- 
- namespace {
- 
-+<<<<<<< .our
- template <typename Method, typename Event, typename Listener>
-+=======
-+template<typename Method, typename Event, typename Listener>
-+>>>>>>> .their
- void CallNetworkDelegateMethod(
-     brightray::URLRequestContextGetter* url_request_context_getter,
-     Method method,
-@@ -95,14 +99,24 @@
-   }
- 
-   brightray::URLRequestContextGetter* url_request_context_getter =
-+<<<<<<< .our
-       browser_context_->GetRequestContext();
-+=======
-+      browser_context_->url_request_context_getter();
-+>>>>>>> .their
-   if (!url_request_context_getter)
-     return;
-   BrowserThread::PostTask(
-       BrowserThread::IO, FROM_HERE,
-+<<<<<<< .our
-       base::BindOnce(&CallNetworkDelegateMethod<Method, Event, Listener>,
-                      base::RetainedRef(url_request_context_getter), method,
-                      type, std::move(patterns), std::move(listener)));
-+=======
-+      base::Bind(&CallNetworkDelegateMethod<Method, Event, Listener>,
-+                 base::RetainedRef(url_request_context_getter),
-+                 method, type, std::move(patterns), std::move(listener)));
-+>>>>>>> .their
- }
- 
- // static
-removed in local
-  base   100644 993f9680ccb475f8870a2e3b4da2d20472531d91 atom/browser/api/atom_api_window.cc
-  their  100644 d177afb300f65ba14daa8c07042d4d768b00fd54 atom/browser/api/atom_api_window.cc
-removed in local
-  base   100644 f86c387a34afb15920738413c6819176081b5ee7 atom/browser/api/atom_api_window.h
-  their  100644 e07f34e23f060906942b5fce81081965ea792204 atom/browser/api/atom_api_window.h
-changed in both
-  base   100644 8810fed4b9aef78842fb65db93ed2efebabb6928 atom/browser/api/event.cc
-  our    100644 7b617034eca5a229fc9323bfd6d531ebded752d6 atom/browser/api/event.cc
-  their  100644 1ee0d57e36068c9b6427c278e9a7a5a66b7f8f79 atom/browser/api/event.cc
-@@ -6,7 +6,10 @@
- 
- #include "atom/common/api/api_messages.h"
- #include "atom/common/native_mate_converters/string16_converter.h"
-+<<<<<<< .our
- #include "atom/common/native_mate_converters/value_converter.h"
-+=======
-+>>>>>>> .their
- #include "content/public/browser/render_frame_host.h"
- #include "content/public/browser/web_contents.h"
- #include "native_mate/object_template_builder.h"
-@@ -27,6 +30,7 @@
-   message_ = message;
- 
-   Observe(content::WebContents::FromRenderFrameHost(sender));
-+<<<<<<< .our
- }
- 
- void Event::RenderFrameDeleted(content::RenderFrameHost* rfh) {
-@@ -42,6 +46,23 @@
-     sender_ = new_rfh;
- }
- 
-+=======
-+}
-+
-+void Event::RenderFrameDeleted(content::RenderFrameHost* rfh) {
-+  if (sender_ != rfh)
-+    return;
-+  sender_ = nullptr;
-+  message_ = nullptr;
-+}
-+
-+void Event::RenderFrameHostChanged(content::RenderFrameHost* old_rfh,
-+                                   content::RenderFrameHost* new_rfh) {
-+  if (sender_ && sender_ == old_rfh)
-+    sender_ = new_rfh;
-+}
-+
-+>>>>>>> .their
- void Event::FrameDeleted(content::RenderFrameHost* rfh) {
-   if (sender_ != rfh)
-     return;
-@@ -57,7 +78,11 @@
-   if (message_ == nullptr || sender_ == nullptr)
-     return false;
- 
-+<<<<<<< .our
-   AtomFrameHostMsg_Message_Sync::WriteReplyParams(message_, result);
-+=======
-+  AtomFrameHostMsg_Message_Sync::WriteReplyParams(message_, json);
-+>>>>>>> .their
-   bool success = sender_->Send(message_);
-   message_ = nullptr;
-   sender_ = nullptr;
-changed in both
-  base   100644 d73bd2f64b55b5eb0827f819805578559b947f46 atom/browser/api/event.h
-  our    100644 fbec8f27574691005d203adbafb50709f5c2d010 atom/browser/api/event.h
-  their  100644 05ad7daff8ac524294c1cacb66f876efc9716dd4 atom/browser/api/event.h
-@@ -44,8 +44,13 @@
- 
-  private:
-   // Replyer for the synchronous messages.
-+<<<<<<< .our
-   content::RenderFrameHost* sender_ = nullptr;
-   IPC::Message* message_ = nullptr;
-+=======
-+  content::RenderFrameHost* sender_;
-+  IPC::Message* message_;
-+>>>>>>> .their
- 
-   DISALLOW_COPY_AND_ASSIGN(Event);
- };
-changed in both
-  base   100644 3dbcd0601ef8a63cd6712b566cdc7f388c85e3ee atom/browser/api/event_emitter.cc
-  our    100644 c6e810b51225c8f89eaf53ac3e46381b52ba63b5 atom/browser/api/event_emitter.cc
-  their  100644 91769cbb94794a978732773612a3fec245acd750 atom/browser/api/event_emitter.cc
-changed in both
-  base   100644 8d9d2960df35a33a09dfc79c4c35d424738df43f atom/browser/api/event_emitter.h
-  our    100644 5e4ca3b4ffcb184583ef386100eabda7a9e00da0 atom/browser/api/event_emitter.h
-  their  100644 8145113084a9c0c34ea808e3712879f5f70737c9 atom/browser/api/event_emitter.h
-changed in both
-  base   100644 c83a99c2b38708ca296b4c9215e26cb58eb9a7d2 atom/browser/atom_browser_client.cc
-  our    100644 57c4ee582405e6d501ec23940ccb10689ecd64a1 atom/browser/atom_browser_client.cc
-  their  100644 37dd43c49fc8056cf1a511d8c5895535a556cf9e atom/browser/atom_browser_client.cc
-@@ -343,6 +343,11 @@
-       web_preferences->AppendCommandLineSwitches(command_line);
-     SessionPreferences::AppendExtraCommandLineSwitches(
-         web_contents->GetBrowserContext(), command_line);
-+
-+    auto context_id = atom::api::WebContents::GetIDForContents(
-+      web_contents);
-+    command_line->AppendSwitchASCII(switches::kContextId,
-+      base::IntToString(context_id));
-   }
- }
- 
-changed in both
-  base   100644 f16ee50158508565cc1e043d3257ad687cc69215 atom/browser/browser.cc
-  our    100644 ce35de64d60c6767ac52596c1b32e7bde5ceefa0 atom/browser/browser.cc
-  their  100644 3ba915f91eb3403df9630697e77cce9ed7fa3307 atom/browser/browser.cc
-changed in both
-  base   100644 0970b26b776b34f68e5f22776e74c19ddcc039ad atom/browser/browser.h
-  our    100644 aed7d25c37da59c0dd5e09940a064c329353a0b2 atom/browser/browser.h
-  their  100644 a8c1a8c5e7c4409e3a78279da46fb2ba6112f409 atom/browser/browser.h
-@@ -277,7 +277,11 @@
-   bool is_ready_ = false;
- 
-   // The browser is being shutdown.
-+<<<<<<< .our
-   bool is_shutdown_ = false;
-+=======
-+  bool is_shutdown_;
-+>>>>>>> .their
- 
-   int badge_count_ = 0;
- 
-changed in both
-  base   100644 7c154b60b00e25c42847ceefb98723b50ea03dd0 atom/browser/native_browser_view.h
-  our    100644 56937e4c8c69e3605d2b6cc71a0877b74ff4e83d atom/browser/native_browser_view.h
-  their  100644 cab6980fa2cf035c1a5ca6b4aee822a0ee604fd4 atom/browser/native_browser_view.h
-changed in both
-  base   100644 17b0a1ee9006dd70888165a9209076fd7065f3cc atom/browser/native_browser_view_mac.mm
-  our    100644 0416e26e89f1e0f37366ef1798b4359da0729225 atom/browser/native_browser_view_mac.mm
-  their  100644 86df632638ef7772270569824515b251470d0c08 atom/browser/native_browser_view_mac.mm
-changed in both
-  base   100644 78e788b3019c23bce13fdc8d94385d4a3937cf22 atom/browser/native_browser_view_views.cc
-  our    100644 6414005a1e40d80ae86102b12edee0255cab9adb atom/browser/native_browser_view_views.cc
-  their  100644 def64d12e3520fa15a2b6779147a819a6eaec2f8 atom/browser/native_browser_view_views.cc
-changed in both
-  base   100644 5dcda13447cde098fccaf8782fefb97d861d47f4 atom/browser/native_browser_view_views.h
-  our    100644 8f8e860292baddad1156c50ae7cfaa0fd6e87d99 atom/browser/native_browser_view_views.h
-  their  100644 abf47178302ad7527c1640a3f41492f871f137e5 atom/browser/native_browser_view_views.h
-changed in both
-  base   100644 34778fb6434707e6ae3c70ab55e48e87eb556448 atom/browser/native_window.cc
-  our    100644 4ff2bcfcabfd34d8563f9ed213c03655a99dd9c6 atom/browser/native_window.cc
-  their  100644 26ac44607ebceadcde1d4c038890d914c888a0d5 atom/browser/native_window.cc
-@@ -21,6 +21,11 @@
- #include "ui/display/win/screen_win.h"
- #endif
- 
-+#if defined(OS_WIN)
-+#include "ui/base/win/shell.h"
-+#include "ui/display/win/screen_win.h"
-+#endif
-+
- DEFINE_WEB_CONTENTS_USER_DATA_KEY(atom::NativeWindowRelay);
- 
- namespace atom {
-@@ -45,9 +50,29 @@
- 
- }  // namespace
- 
-+<<<<<<< .our
- NativeWindow::NativeWindow(const mate::Dictionary& options,
-                            NativeWindow* parent)
-     : widget_(new views::Widget), parent_(parent), weak_factory_(this) {
-+=======
-+NativeWindow::NativeWindow(
-+    brightray::InspectableWebContents* inspectable_web_contents,
-+    const mate::Dictionary& options,
-+    NativeWindow* parent)
-+    : content::WebContentsObserver(inspectable_web_contents->GetWebContents()),
-+      has_frame_(true),
-+      transparent_(false),
-+      enable_larger_than_screen_(false),
-+      is_closed_(false),
-+      sheet_offset_x_(0.0),
-+      sheet_offset_y_(0.0),
-+      aspect_ratio_(0.0),
-+      parent_(parent),
-+      is_modal_(false),
-+      is_osr_dummy_(false),
-+      inspectable_web_contents_(inspectable_web_contents),
-+      weak_factory_(this) {
-+>>>>>>> .their
-   options.Get(options::kFrame, &has_frame_);
-   options.Get(options::kTransparent, &transparent_);
-   options.Get(options::kEnableLargerThanScreen, &enable_larger_than_screen_);
-changed in both
-  base   100644 d1cfa7cc352971772689ecd60a110b48ef1a7eaa atom/browser/native_window.h
-  our    100644 35b67e2dd230692c415a32aae5f0a5e99ab74ac0 atom/browser/native_window.h
-  their  100644 61922aea78e3b61db614354e6a578fcda925096b atom/browser/native_window.h
-@@ -220,6 +220,17 @@
-   virtual void HandleKeyboardEvent(
-       content::WebContents*,
-       const content::NativeWebKeyboardEvent& event) {}
-+<<<<<<< .our
-+=======
-+  virtual void ShowAutofillPopup(content::RenderFrameHost* frame_host,
-+                                 content::WebContents* web_contents,
-+                                 const gfx::RectF& bounds,
-+                                 const std::vector<base::string16>& values,
-+                                 const std::vector<base::string16>& labels) {}
-+  virtual void HideAutofillPopup(content::RenderFrameHost* frame_host) {}
-+>>>>>>> .their
-+
-+  virtual void UpdateDraggableRegionViews() {}
- 
-   // Public API used by platform-dependent delegates and observers to send UI
-   // related notifications.
-@@ -340,8 +351,13 @@
- class NativeWindowRelay
-     : public content::WebContentsUserData<NativeWindowRelay> {
-  public:
-+<<<<<<< .our
-   explicit NativeWindowRelay(base::WeakPtr<NativeWindow> window);
-   ~NativeWindowRelay() override;
-+=======
-+  explicit NativeWindowRelay(base::WeakPtr<NativeWindow> window)
-+      : key(UserDataKey()), window(window) {}
-+>>>>>>> .their
- 
-   static void* UserDataKey() {
-     return content::WebContentsUserData<NativeWindowRelay>::UserDataKey();
-changed in both
-  base   100644 60d8fc23f59a842c100412b1c236b87d0815a7a0 atom/browser/native_window_mac.h
-  our    100644 44a78198f44cdba9875e3fb27c8e2c87eaa6f33b atom/browser/native_window_mac.h
-  their  100644 9e8c3aef87dd8d2d4a3260587b7013d260649b55 atom/browser/native_window_mac.h
-@@ -118,8 +118,11 @@
-   void MoveTabToNewWindow() override;
-   void ToggleTabBar() override;
-   bool AddTabbedWindow(NativeWindow* window) override;
-+<<<<<<< .our
- 
-   bool SetWindowButtonVisibility(bool visible) override;
-+=======
-+>>>>>>> .their
- 
-   void SetVibrancy(const std::string& type) override;
-   void SetTouchBar(
-@@ -130,8 +133,19 @@
-   gfx::Rect ContentBoundsToWindowBounds(const gfx::Rect& bounds) const override;
-   gfx::Rect WindowBoundsToContentBounds(const gfx::Rect& bounds) const override;
- 
-+<<<<<<< .our
-   // Use a custom content view instead of Chromium's BridgedContentView.
-   void OverrideNSWindowContentView();
-+=======
-+  // content::WebContentsObserver:
-+  void RenderViewHostChanged(content::RenderViewHost* old_host,
-+                             content::RenderViewHost* new_host) override;
-+
-+  // Refresh the DraggableRegion views.
-+  void UpdateDraggableRegionViews() override {
-+    UpdateDraggableRegionViews(draggable_regions_);
-+  }
-+>>>>>>> .their
- 
-   // Set the attribute of NSWindow while work around a bug of zoom button.
-   void SetStyleMask(bool on, NSUInteger flag);
-changed in both
-  base   100644 ad1713e401240dbc1c2054551d0caeb41aea2884 atom/browser/native_window_mac.mm
-  our    100644 004263ec127709067e903ffbf31003b8844226b4 atom/browser/native_window_mac.mm
-  their  100644 0397c62d8df94b3ce66482c0d9c4b3b87ac97a45 atom/browser/native_window_mac.mm
-@@ -28,9 +28,12 @@
- #include "skia/ext/skia_utils_mac.h"
- #include "ui/gfx/skia_util.h"
- #include "ui/gl/gpu_switching_manager.h"
-+<<<<<<< .our
- #include "ui/views/background.h"
- #include "ui/views/cocoa/bridged_native_widget.h"
- #include "ui/views/widget/widget.h"
-+=======
-+>>>>>>> .their
- 
- // This view always takes the size of its superview. It is intended to be used
- // as a NSWindow's contentView.  It is needed because NSWindow's implementation
-@@ -1144,10 +1147,17 @@
- }
- 
- bool NativeWindowMac::AddTabbedWindow(NativeWindow* window) {
-+<<<<<<< .our
-   if (window_ == window->GetNativeWindow()) {
-     return false;
-   } else {
-     if (@available(macOS 10.12, *))
-+=======
-+  if (window_.get() == window->GetNativeWindow()) {
-+    return false;
-+  } else {
-+    if ([window_ respondsToSelector:@selector(addTabbedWindow:ordered:)])
-+>>>>>>> .their
-       [window_ addTabbedWindow:window->GetNativeWindow() ordered:NSWindowAbove];
-   }
-   return true;
-@@ -1185,15 +1195,22 @@
-       return;
-     }
- 
-+<<<<<<< .our
-     background_color_before_vibrancy_.reset([[window_ backgroundColor] retain]);
-     transparency_before_vibrancy_ = [window_ titlebarAppearsTransparent];
-     ui::GpuSwitchingManager::SetTransparent(true);
-+=======
-+    [vibrant_view removeFromSuperview];
-+    [window_ setVibrantView:nil];
-+    ui::GpuSwitchingManager::SetTransparent(transparent());
-+>>>>>>> .their
- 
-     if (title_bar_style_ != NORMAL) {
-       [window_ setTitlebarAppearsTransparent:YES];
-       [window_ setBackgroundColor:[NSColor clearColor]];
-     }
- 
-+<<<<<<< .our
-     NSVisualEffectView* effect_view = (NSVisualEffectView*)vibrant_view;
-     if (effect_view == nil) {
-       effect_view = [[[NSVisualEffectView alloc]
-@@ -1208,6 +1225,31 @@
-                              positioned:NSWindowBelow
-                              relativeTo:nil];
-     }
-+=======
-+  SetRenderWidgetHostOpaque(false);
-+  background_color_before_vibrancy_.reset([window_ backgroundColor]);
-+  transparency_before_vibrancy_ = [window_ titlebarAppearsTransparent];
-+  ui::GpuSwitchingManager::SetTransparent(true);
-+
-+  if (title_bar_style_ != NORMAL) {
-+    [window_ setTitlebarAppearsTransparent:YES];
-+    [window_ setBackgroundColor:[NSColor clearColor]];
-+  }
-+
-+  NSVisualEffectView* effect_view = (NSVisualEffectView*)vibrant_view;
-+  if (effect_view == nil) {
-+    effect_view = [[[NSVisualEffectView alloc]
-+        initWithFrame: [[window_ contentView] bounds]] autorelease];
-+    [window_ setVibrantView:(NSView*)effect_view];
-+
-+    [effect_view setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
-+    [effect_view setBlendingMode:NSVisualEffectBlendingModeBehindWindow];
-+    [effect_view setState:NSVisualEffectStateActive];
-+    [[window_ contentView] addSubview:effect_view
-+                           positioned:NSWindowBelow
-+                           relativeTo:nil];
-+  }
-+>>>>>>> .their
- 
-     NSVisualEffectMaterial vibrancyType = NSVisualEffectMaterialLight;
- 
-@@ -1387,6 +1429,7 @@
-     [parent->GetNativeWindow() addChildWindow:window_ ordered:NSWindowAbove];
- }
- 
-+<<<<<<< .our
- void NativeWindowMac::ShowWindowButton(NSWindowButton button) {
-   auto view = [window_ standardWindowButton:button];
-   [view.superview addSubview:view positioned:NSWindowAbove relativeTo:nil];
-@@ -1395,6 +1438,35 @@
- void NativeWindowMac::SetForwardMouseMessages(bool forward) {
-   [window_ setAcceptsMouseMovedEvents:forward];
- }
-+=======
-+  // Remove all ControlRegionViews that are added last time.
-+  // Note that [webView subviews] returns the view's mutable internal array and
-+  // it should be copied to avoid mutating the original array while enumerating
-+  // it.
-+  base::scoped_nsobject<NSArray> subviews([[webView subviews] copy]);
-+  for (NSView* subview in subviews.get())
-+    if ([subview isKindOfClass:[ControlRegionView class]])
-+      [subview removeFromSuperview];
-+
-+  // Draggable regions is implemented by having the whole web view draggable
-+  // (mouseDownCanMoveWindow) and overlaying regions that are not draggable.
-+  std::vector<gfx::Rect> drag_exclude_rects =
-+      CalculateNonDraggableRegions(regions, webViewWidth, webViewHeight);
-+
-+  if (browser_view_) {
-+    browser_view_->UpdateDraggableRegions(drag_exclude_rects);
-+  }
-+
-+  // Create and add a ControlRegionView for each region that needs to be
-+  // excluded from the dragging.
-+  for (const auto& rect : drag_exclude_rects) {
-+    base::scoped_nsobject<NSView> controlRegion(
-+        [[ControlRegionView alloc] initWithFrame:NSZeroRect]);
-+    [controlRegion setFrame:NSMakeRect(rect.x(), webViewHeight - rect.bottom(),
-+                                       rect.width(), rect.height())];
-+    [webView addSubview:controlRegion];
-+  }
-+>>>>>>> .their
- 
- void NativeWindowMac::OverrideNSWindowContentView() {
-   // When using `views::Widget` to hold WebContents, Chromium would use
-changed in both
-  base   100644 008109970ec8d3c55a2028a173c3b941908d78a7 atom/browser/native_window_views.cc
-  our    100644 0dba39942f92d54ba34db7709b73012055680d94 atom/browser/native_window_views.cc
-  their  100644 f3e6fc09c5850cbc3d6989a2a94607b1f9a5d514 atom/browser/native_window_views.cc
-@@ -1115,7 +1115,11 @@
-   if (!active && IsMenuBarAutoHide() && IsMenuBarVisible())
-     SetMenuBarVisibility(false);
- 
-+<<<<<<< .our
-   root_view_->ResetAltState();
-+=======
-+  menu_bar_alt_pressed_ = false;
-+>>>>>>> .their
- }
- 
- void NativeWindowViews::OnWidgetBoundsChanged(views::Widget* changed_widget,
-@@ -1237,9 +1241,138 @@
- void NativeWindowViews::HandleKeyboardEvent(
-     content::WebContents*,
-     const content::NativeWebKeyboardEvent& event) {
-+<<<<<<< .our
-   keyboard_event_handler_->HandleKeyboardEvent(event,
-                                                root_view_->GetFocusManager());
-   root_view_->HandleKeyEvent(event);
-+=======
-+  keyboard_event_handler_->HandleKeyboardEvent(event, GetFocusManager());
-+
-+  if (!menu_bar_)
-+    return;
-+
-+  // Show accelerator when "Alt" is pressed.
-+  if (menu_bar_visible_ && IsAltKey(event))
-+    menu_bar_->SetAcceleratorVisibility(
-+        event.GetType() == blink::WebInputEvent::kRawKeyDown);
-+
-+  // Show the submenu when "Alt+Key" is pressed.
-+  if (event.GetType() == blink::WebInputEvent::kRawKeyDown &&
-+      !IsAltKey(event) && IsAltModifier(event)) {
-+    if (!menu_bar_visible_ &&
-+        (menu_bar_->HasAccelerator(event.windows_key_code)))
-+      SetMenuBarVisibility(true);
-+    menu_bar_->ActivateAccelerator(event.windows_key_code);
-+    return;
-+  }
-+
-+  if (!menu_bar_autohide_)
-+    return;
-+
-+  // Toggle the menu bar only when a single Alt is released.
-+  if (event.GetType() == blink::WebInputEvent::kRawKeyDown && IsAltKey(event)) {
-+    // When a single Alt is pressed:
-+    menu_bar_alt_pressed_ = true;
-+  } else if (event.GetType() == blink::WebInputEvent::kKeyUp &&
-+             IsAltKey(event) && menu_bar_alt_pressed_) {
-+    // When a single Alt is released right after a Alt is pressed:
-+    menu_bar_alt_pressed_ = false;
-+    SetMenuBarVisibility(!menu_bar_visible_);
-+  } else {
-+    // When any other keys except single Alt have been pressed/released:
-+    menu_bar_alt_pressed_ = false;
-+  }
-+}
-+
-+void NativeWindowViews::ShowAutofillPopup(
-+    content::RenderFrameHost* frame_host,
-+    content::WebContents* web_contents,
-+    const gfx::RectF& bounds,
-+    const std::vector<base::string16>& values,
-+    const std::vector<base::string16>& labels) {
-+  bool is_offsceen = false;
-+  bool is_embedder_offscreen = false;
-+
-+  auto* web_contents_preferences =
-+      WebContentsPreferences::FromWebContents(web_contents);
-+  if (web_contents_preferences) {
-+    const auto* web_preferences = web_contents_preferences->web_preferences();
-+
-+    web_preferences->GetBoolean("offscreen", &is_offsceen);
-+    int guest_instance_id = 0;
-+    web_preferences->GetInteger(options::kGuestInstanceID, &guest_instance_id);
-+
-+    if (guest_instance_id) {
-+      auto manager = WebViewManager::GetWebViewManager(web_contents);
-+      if (manager) {
-+        auto embedder = manager->GetEmbedder(guest_instance_id);
-+        if (embedder) {
-+          is_embedder_offscreen = WebContentsPreferences::IsPreferenceEnabled(
-+              "offscreen", embedder);
-+        }
-+      }
-+    }
-+  }
-+
-+  autofill_popup_->CreateView(
-+      frame_host,
-+      is_offsceen || is_embedder_offscreen,
-+      widget(),
-+      bounds);
-+  autofill_popup_->SetItems(values, labels);
-+  autofill_popup_->UpdatePopupBounds(menu_bar_visible_ ? 0 : kMenuBarHeight);
-+}
-+
-+void NativeWindowViews::HideAutofillPopup(
-+    content::RenderFrameHost* frame_host) {
-+  autofill_popup_->Hide();
-+}
-+
-+void NativeWindowViews::Layout() {
-+  const auto size = GetContentsBounds().size();
-+  const auto menu_bar_bounds =
-+      menu_bar_visible_ ? gfx::Rect(0, 0, size.width(), kMenuBarHeight)
-+                        : gfx::Rect();
-+  if (menu_bar_) {
-+    menu_bar_->SetBoundsRect(menu_bar_bounds);
-+  }
-+
-+  if (web_view_) {
-+    web_view_->SetBoundsRect(
-+        gfx::Rect(0, menu_bar_bounds.height(), size.width(),
-+                  size.height() - menu_bar_bounds.height()));
-+  }
-+
-+  if (autofill_popup_.get())
-+    autofill_popup_->UpdatePopupBounds(menu_bar_visible_ ? 0 : kMenuBarHeight);
-+}
-+
-+gfx::Size NativeWindowViews::GetMinimumSize() const {
-+  return NativeWindow::GetMinimumSize();
-+}
-+
-+gfx::Size NativeWindowViews::GetMaximumSize() const {
-+  return NativeWindow::GetMaximumSize();
-+}
-+
-+bool NativeWindowViews::AcceleratorPressed(const ui::Accelerator& accelerator) {
-+  return accelerator_util::TriggerAcceleratorTableCommand(
-+      &accelerator_table_, accelerator);
-+}
-+
-+void NativeWindowViews::RegisterAccelerators(AtomMenuModel* menu_model) {
-+  // Clear previous accelerators.
-+  views::FocusManager* focus_manager = GetFocusManager();
-+  accelerator_table_.clear();
-+  focus_manager->UnregisterAccelerators(this);
-+
-+  // Register accelerators with focus manager.
-+  accelerator_util::GenerateAcceleratorTable(&accelerator_table_, menu_model);
-+  for (const auto& iter : accelerator_table_) {
-+    focus_manager->RegisterAccelerator(
-+        iter.first, ui::AcceleratorManager::kNormalPriority, this);
-+  }
-+>>>>>>> .their
- }
- 
- ui::WindowShowState NativeWindowViews::GetRestoredState() {
-changed in both
-  base   100644 a39e84ce5b8d7b757233dab4bed646e08cb8c76a atom/browser/net/asar/url_request_asar_job.cc
-  our    100644 85eb2e1dd142b6d64aafb5350ae47603db989e8f atom/browser/net/asar/url_request_asar_job.cc
-  their  100644 a6fe5e26540c9533f16dcf56fc955d0025de3b4a atom/browser/net/asar/url_request_asar_job.cc
-changed in both
-  base   100644 9b0f3a98dc53b922c0d070244f8f7457f332d850 atom/browser/net/atom_network_delegate.cc
-  our    100644 e71ea74317b69f31a5aac8e723902748972fed8f atom/browser/net/atom_network_delegate.cc
-  their  100644 239a64016febb8f9d81206d7f2a7d100ccd1f293 atom/browser/net/atom_network_delegate.cc
-@@ -250,6 +250,7 @@
- 
- AtomNetworkDelegate::~AtomNetworkDelegate() {}
- 
-+<<<<<<< .our
- void AtomNetworkDelegate::SetSimpleListenerInIO(SimpleEvent type,
-                                                 URLPatterns patterns,
-                                                 SimpleListener callback) {
-@@ -266,6 +267,26 @@
-     response_listeners_.erase(type);
-   else
-     response_listeners_[type] = {std::move(patterns), std::move(callback)};
-+=======
-+void AtomNetworkDelegate::SetSimpleListenerInIO(
-+    SimpleEvent type,
-+    URLPatterns patterns,
-+    SimpleListener callback) {
-+  if (callback.is_null())
-+    simple_listeners_.erase(type);
-+  else
-+    simple_listeners_[type] = { std::move(patterns), std::move(callback) };
-+}
-+
-+void AtomNetworkDelegate::SetResponseListenerInIO(
-+    ResponseEvent type,
-+    URLPatterns patterns,
-+    ResponseListener callback) {
-+  if (callback.is_null())
-+    response_listeners_.erase(type);
-+  else
-+    response_listeners_[type] = { std::move(patterns), std::move(callback) };
-+>>>>>>> .their
- }
- 
- void AtomNetworkDelegate::SetDevToolsNetworkEmulationClientId(
-changed in both
-  base   100644 e00c26ff2cbc134b987b4361896971e48056951d atom/browser/net/atom_network_delegate.h
-  our    100644 39a7a8ddfcda17fd7d022331132b54485d07a279 atom/browser/net/atom_network_delegate.h
-  their  100644 ad37a926d4732d94526f74b2f927e35504d2efe3 atom/browser/net/atom_network_delegate.h
-changed in both
-  base   100644 3313eba36bb903426778fac6cd18258a95fec677 atom/browser/resources/mac/Info.plist
-  our    100644 9094f0f7335edf833d51f688851e6a105de60433 atom/browser/resources/mac/Info.plist
-  their  100644 5af4e2d1865d42cf17e2a1f535490911b48b21bf atom/browser/resources/mac/Info.plist
-@@ -17,9 +17,15 @@
-   <key>CFBundleIconFile</key>
-   <string>electron.icns</string>
-   <key>CFBundleVersion</key>
-+<<<<<<< .our
-   <string>4.0.0</string>
-   <key>CFBundleShortVersionString</key>
-   <string>4.0.0</string>
-+=======
-+  <string>2.0.2</string>
-+  <key>CFBundleShortVersionString</key>
-+  <string>2.0.2</string>
-+>>>>>>> .their
-   <key>LSApplicationCategoryType</key>
-   <string>public.app-category.developer-tools</string>
-   <key>LSMinimumSystemVersion</key>
-changed in both
-  base   100644 c349f99d712ff69960d35b18587ddb6c417f7cd5 atom/browser/resources/win/atom.rc
-  our    100644 c0bd831e8bddf10180f75cd40694831e2e98622d atom/browser/resources/win/atom.rc
-  their  100644 afa4cc747aa0d5411002c8cd6be2023ac51f67f8 atom/browser/resources/win/atom.rc
-@@ -56,8 +56,13 @@
- //
- 
- VS_VERSION_INFO VERSIONINFO
-+<<<<<<< .our
-  FILEVERSION 4,0,0,20180821
-  PRODUCTVERSION 4,0,0,20180821
-+=======
-+ FILEVERSION 2,0,2,0
-+ PRODUCTVERSION 2,0,2,0
-+>>>>>>> .their
-  FILEFLAGSMASK 0x3fL
- #ifdef _DEBUG
-  FILEFLAGS 0x1L
-@@ -74,12 +79,20 @@
-         BEGIN
-             VALUE "CompanyName", "GitHub, Inc."
-             VALUE "FileDescription", "Electron"
-+<<<<<<< .our
-             VALUE "FileVersion", "4.0.0"
-+=======
-+            VALUE "FileVersion", "2.0.2"
-+>>>>>>> .their
-             VALUE "InternalName", "electron.exe"
-             VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
-             VALUE "OriginalFilename", "electron.exe"
-             VALUE "ProductName", "Electron"
-+<<<<<<< .our
-             VALUE "ProductVersion", "4.0.0"
-+=======
-+            VALUE "ProductVersion", "2.0.2"
-+>>>>>>> .their
-             VALUE "SquirrelAwareVersion", "1"
-         END
-     END
-changed in both
-  base   100644 8bdf4e0c2be32fc7d704bc989d7ccec5dd5db672 atom/browser/ui/cocoa/atom_menu_controller.mm
-  our    100644 cecf30ce1c88e007957a65427648941765a6067e atom/browser/ui/cocoa/atom_menu_controller.mm
-  their  100644 a117a1f4fa4158cccb3d9b942e7aaa2e9960492b atom/browser/ui/cocoa/atom_menu_controller.mm
-@@ -334,8 +334,13 @@
-   if (isMenuOpen_) {
-     isMenuOpen_ = NO;
-     model_->MenuWillClose();
-+<<<<<<< .our
-     // Post async task so that itemSelected runs before the close callback
-     // deletes the controller from the map which deallocates it
-+=======
-+    // Post async task so that itemSelected runs before the close callback	
-+    // deletes the controller from the map which deallocates it	
-+>>>>>>> .their
-     if (!closeCallback.is_null()) {
-       BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, closeCallback);
-     }
-changed in both
-  base   100644 b26d472db131f7be9d5bfbbd1cebfc992743d312 atom/browser/ui/file_dialog_mac.mm
-  our    100644 18b18a8b240cda5512ae49e0afde5c749bdf75c0 atom/browser/ui/file_dialog_mac.mm
-  their  100644 89ecaf46ec7f32ca4f3a3a89de13efcbdad5619f atom/browser/ui/file_dialog_mac.mm
-@@ -27,9 +27,12 @@
- 
- @implementation PopUpButtonHandler
- 
-+<<<<<<< .our
- @synthesize savePanel;
- @synthesize fileTypesList;
- 
-+=======
-+>>>>>>> .their
- - (instancetype)initWithPanel:(NSSavePanel*)panel
-                  andTypesList:(NSArray*)typesList {
-   self = [super init];
-@@ -55,6 +58,7 @@
- }
- 
- @end
-+<<<<<<< .our
- 
- // Manages the PopUpButtonHandler.
- @interface AtomAccessoryView : NSView
-@@ -65,6 +69,17 @@
- - (void)dealloc {
-   auto* popupButton =
-       static_cast<NSPopUpButton*>([[self subviews] objectAtIndex:1]);
-+=======
-+
-+// Manages the PopUpButtonHandler.
-+@interface AtomAccessoryView : NSView
-+@end
-+
-+@implementation AtomAccessoryView
-+
-+- (void)dealloc {
-+  auto* popupButton = static_cast<NSPopUpButton*>([[self subviews] objectAtIndex: 1]);
-+>>>>>>> .their
-   [[popupButton target] release];
-   [super dealloc];
- }
-@@ -76,8 +91,11 @@
- DialogSettings::DialogSettings() = default;
- DialogSettings::~DialogSettings() = default;
- 
-+<<<<<<< .our
- namespace {
- 
-+=======
-+>>>>>>> .their
- void SetAllowedFileTypes(NSSavePanel* dialog, const Filters& filters) {
-   NSMutableArray* file_types_list = [NSMutableArray array];
-   NSMutableArray* filter_names = [NSMutableArray array];
-@@ -85,9 +103,18 @@
-   // Create array to keep file types and their name.
-   for (const Filter& filter : filters) {
-     NSMutableSet* file_type_set = [NSMutableSet set];
-+<<<<<<< .our
-     [filter_names addObject:@(filter.first.c_str())];
-     for (const std::string& ext : filter.second) {
-       [file_type_set addObject:@(ext.c_str())];
-+=======
-+    base::ScopedCFTypeRef<CFStringRef> name_cf(
-+        base::SysUTF8ToCFStringRef(filter.first));
-+    [filter_names addObject:base::mac::CFToNSCast(name_cf.get())];
-+    for (const std::string& ext : filter.second) {
-+      base::ScopedCFTypeRef<CFStringRef> ext_cf(base::SysUTF8ToCFStringRef(ext));
-+      [file_type_set addObject:base::mac::CFToNSCast(ext_cf.get())];
-+>>>>>>> .their
-     }
-     [file_types_list addObject:[file_type_set allObjects]];
-   }
-@@ -119,12 +146,19 @@
-   [label setBezeled:NO];
-   [label setDrawsBackground:NO];
- 
-+<<<<<<< .our
-   NSPopUpButton* popupButton =
-       [[NSPopUpButton alloc] initWithFrame:NSMakeRect(50.0, 2, 140, 22.0)
-                                  pullsDown:NO];
-   PopUpButtonHandler* popUpButtonHandler =
-       [[PopUpButtonHandler alloc] initWithPanel:dialog
-                                    andTypesList:file_types_list];
-+=======
-+  NSPopUpButton* popupButton = [[NSPopUpButton alloc] initWithFrame:NSMakeRect(50.0, 2, 140, 22.0)
-+                                                          pullsDown:NO];
-+  PopUpButtonHandler* popUpButtonHandler = [[PopUpButtonHandler alloc] initWithPanel:dialog
-+                                                                        andTypesList:file_types_list];
-+>>>>>>> .their
-   [popupButton addItemsWithTitles:filter_names];
-   [popupButton setTarget:popUpButtonHandler];
-   [popupButton setAction:@selector(selectFormat:)];
-changed in both
-  base   100644 a358f676a8c41d15bb9c3157cce4a62ef8356855 atom/browser/ui/tray_icon_cocoa.mm
-  our    100644 2c434d7a9e312adfb3802628a3d092a95d4ac49f atom/browser/ui/tray_icon_cocoa.mm
-  their  100644 46a1cc6bccb5dbb57a9cab3a1be19360cac5b537 atom/browser/ui/tray_icon_cocoa.mm
-@@ -240,13 +240,22 @@
-   }
- 
-   // check title_ being nil
-+<<<<<<< .our
-   NSString* title = @"";
-+=======
-+  NSString *title = @"";
-+>>>>>>> .their
-   if (title_)
-     title = title_;
- 
-   attributedTitle_.reset([[NSMutableAttributedString alloc]
-+<<<<<<< .our
-       initWithString:title
-           attributes:attributes]);
-+=======
-+                             initWithString:title
-+                                 attributes:attributes]);
-+>>>>>>> .their
- 
-   // NSFontAttributeName:[NSFont menuBarFontOfSize:0],
-   // NSForegroundColorAttributeName:[self colorWithHighlight: highlight]
-changed in both
-  base   100644 e1836ad68985f6068a5ea4be76d6f58682056d04 atom/browser/ui/tray_icon_gtk.cc
-  our    100644 4c780285c80a157afca74b0927175ba3b045def9 atom/browser/ui/tray_icon_gtk.cc
-  their  100644 eb7be1ed3b4345cf825075785c1c1708a7b69d30 atom/browser/ui/tray_icon_gtk.cc
-@@ -36,9 +36,16 @@
-   if (libgtkui::AppIndicatorIcon::CouldOpen()) {
-     ++indicators_count;
-     icon_.reset(new libgtkui::AppIndicatorIcon(
-+<<<<<<< .our
-         base::StringPrintf("%s%d", Browser::Get()->GetName().c_str(),
-                            indicators_count),
-         image.AsImageSkia(), toolTip));
-+=======
-+        base::StringPrintf(
-+            "%s%d", Browser::Get()->GetName().c_str(), indicators_count),
-+        image.AsImageSkia(),
-+        toolTip));
-+>>>>>>> .their
-   } else {
-     icon_.reset(new libgtkui::Gtk2StatusIcon(image.AsImageSkia(), toolTip));
-   }
-changed in both
-  base   100644 5182e1a0f7f141e8ddfa95fd8cca8771f2cabd9f atom/browser/ui/views/frameless_view.cc
-  our    100644 8959ee13612979d2819621acc14ebf641fb7f116 atom/browser/ui/views/frameless_view.cc
-  their  100644 b78e897b8f51747fbeb86cdf1e507ecf5be0bf9b atom/browser/ui/views/frameless_view.cc
-changed in both
-  base   100644 f2ab22f70a6fa08ff1315d197ff3ff3cb700733f atom/browser/ui/views/global_menu_bar_x11.cc
-  our    100644 656bd8f991f87c06a240cdc09a3bfcd500d1c1c8 atom/browser/ui/views/global_menu_bar_x11.cc
-  their  100644 eaeefbd1fb411fca13d6de5dbbc17806d271affd atom/browser/ui/views/global_menu_bar_x11.cc
-changed in both
-  base   100644 bf9801a1457740da391c75621214b8d91cb7467d atom/browser/ui/views/menu_bar.cc
-  our    100644 e838d3cc217b5ffdb77226beff0d7217539f23f9 atom/browser/ui/views/menu_bar.cc
-  their  100644 d963c121bbd29bf3f67b488666297c86b4fee225 atom/browser/ui/views/menu_bar.cc
-@@ -18,11 +18,17 @@
- 
- namespace {
- 
-+<<<<<<< .our
-+=======
-+const char kViewClassName[] = "ElectronMenuBar";
-+
-+>>>>>>> .their
- // Default color of the menu bar.
- const SkColor kDefaultColor = SkColorSetARGB(255, 233, 233, 233);
- 
- }  // namespace
- 
-+<<<<<<< .our
- const char MenuBar::kViewClassName[] = "ElectronMenuBar";
- 
- MenuBar::MenuBar(views::View* window)
-@@ -32,12 +38,35 @@
-   SetLayoutManager(
-       std::make_unique<views::BoxLayout>(views::BoxLayout::kHorizontal));
-   window_->GetFocusManager()->AddFocusChangeListener(this);
-+=======
-+MenuBar::MenuBar(NativeWindow* window)
-+    : background_color_(kDefaultColor), menu_model_(NULL), window_(window) {
-+  RefreshColorCache();
-+  UpdateViewColors();
-+  SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal));
-+>>>>>>> .their
- }
- 
- MenuBar::~MenuBar() {
-   window_->GetFocusManager()->RemoveFocusChangeListener(this);
- }
- 
-+<<<<<<< .our
-+=======
-+void MenuBar::AddedToWidget() {
-+  auto fm = GetFocusManager();
-+  fm->AddFocusChangeListener(this);
-+  // Note that we don't own fm -- this manages the _connection_
-+  focus_manager_.reset(fm, [this](views::FocusManager* fm) {
-+    fm->RemoveFocusChangeListener(this);
-+  });
-+}
-+
-+void MenuBar::RemovedFromWidget() {
-+  focus_manager_.reset();
-+}
-+
-+>>>>>>> .their
- void MenuBar::SetMenu(AtomMenuModel* model) {
-   menu_model_ = model;
-   RebuildChildren();
-@@ -61,7 +90,11 @@
- }
- 
- void MenuBar::ActivateAccelerator(base::char16 key) {
-+<<<<<<< .our
-   auto* child = FindAccelChild(key);
-+=======
-+  auto child = FindAccelChild(key);
-+>>>>>>> .their
-   if (child)
-     static_cast<SubmenuButton*>(child)->Activate(nullptr);
- }
-@@ -151,7 +184,11 @@
- void MenuBar::RebuildChildren() {
-   RemoveAllChildViews(true);
-   for (int i = 0, n = GetItemCount(); i < n; ++i) {
-+<<<<<<< .our
-     auto* button =
-+=======
-+    auto button =
-+>>>>>>> .their
-         new SubmenuButton(menu_model_->GetLabelAt(i), this, background_color_);
-     button->set_tag(i);
-     AddChildView(button);
-@@ -169,7 +206,11 @@
- #if defined(USE_X11)
-   const auto& textColor = has_focus_ ? enabled_color_ : disabled_color_;
-   for (auto* child : GetChildrenInZOrder()) {
-+<<<<<<< .our
-     auto* button = static_cast<SubmenuButton*>(child);
-+=======
-+    auto button = static_cast<SubmenuButton*>(child);
-+>>>>>>> .their
-     button->SetTextColor(views::Button::STATE_NORMAL, textColor);
-     button->SetTextColor(views::Button::STATE_DISABLED, disabled_color_);
-     button->SetTextColor(views::Button::STATE_PRESSED, enabled_color_);
-@@ -178,7 +219,11 @@
-   }
- #elif defined(OS_WIN)
-   for (auto* child : GetChildrenInZOrder()) {
-+<<<<<<< .our
-     auto* button = static_cast<SubmenuButton*>(child);
-+=======
-+    auto button = static_cast<SubmenuButton*>(child);
-+>>>>>>> .their
-     button->SetUnderlineColor(color_utils::GetSysSkColor(COLOR_MENUTEXT));
-   }
- #endif
-changed in both
-  base   100644 761e31b98ea75f44bcd016da3b34b7615f3b409f atom/browser/ui/views/menu_bar.h
-  our    100644 2b10ba3e3bf2ccfc0453fdb59ad022ef7da8ed5b atom/browser/ui/views/menu_bar.h
-  their  100644 13cfa32f3988881e3aa87cae6cae65656fa68d70 atom/browser/ui/views/menu_bar.h
-@@ -5,6 +5,12 @@
- #ifndef ATOM_BROWSER_UI_VIEWS_MENU_BAR_H_
- #define ATOM_BROWSER_UI_VIEWS_MENU_BAR_H_
- 
-+<<<<<<< .our
-+=======
-+#include <memory>
-+
-+#include "atom/browser/native_window.h"
-+>>>>>>> .their
- #include "atom/browser/ui/atom_menu_model.h"
- #include "ui/views/controls/button/menu_button_listener.h"
- #include "ui/views/focus/focus_manager.h"
-@@ -49,7 +55,9 @@
- 
-  protected:
-   // views::View:
-+  void AddedToWidget() override;
-   const char* GetClassName() const override;
-+  void RemovedFromWidget() override;
- 
-   // views::MenuButtonListener:
-   void OnMenuButtonClicked(views::MenuButton* source,
-@@ -79,6 +87,11 @@
- 
-   bool has_focus_ = true;
- 
-+  View* FindAccelChild(base::char16 key);
-+
-+  std::shared_ptr<views::FocusManager> focus_manager_;
-+  bool has_focus_ = true;
-+
-   DISALLOW_COPY_AND_ASSIGN(MenuBar);
- };
- 
-changed in both
-  base   100644 3c3cff3c65410f2e61bdade6e457a096ffba3a54 atom/browser/ui/views/submenu_button.cc
-  our    100644 1124d3d01471876fefa2757570ba3cff796a991c atom/browser/ui/views/submenu_button.cc
-  their  100644 baee28f2cd6931611e048ec46c83e602b95b4b59 atom/browser/ui/views/submenu_button.cc
-@@ -82,8 +82,12 @@
- 
- bool SubmenuButton::GetUnderlinePosition(const base::string16& text,
-                                          base::char16* accelerator,
-+<<<<<<< .our
-                                          int* start,
-                                          int* end) const {
-+=======
-+                                         int* start, int* end) const {
-+>>>>>>> .their
-   int pos, span;
-   base::string16 trimmed = gfx::RemoveAcceleratorChar(text, '&', &pos, &span);
-   if (pos > -1 && span != 0) {
-@@ -96,9 +100,14 @@
-   return false;
- }
- 
-+<<<<<<< .our
- void SubmenuButton::GetCharacterPosition(const base::string16& text,
-                                          int index,
-                                          int* pos) const {
-+=======
-+void SubmenuButton::GetCharacterPosition(
-+    const base::string16& text, int index, int* pos) const {
-+>>>>>>> .their
-   int height = 0;
-   gfx::Canvas::SizeStringInt(text.substr(0, index), gfx::FontList(), pos,
-                              &height, 0, 0);
-changed in both
-  base   100644 5c05481cbbfb85b5d77511cb91cc19cc8ef0e626 atom/browser/ui/views/submenu_button.h
-  our    100644 d8b7785da131271e88533879d090badfd6e49dd5 atom/browser/ui/views/submenu_button.h
-  their  100644 0f7eddf4c914790675f0c9bfab696b2a96b91f74 atom/browser/ui/views/submenu_button.h
-@@ -33,11 +33,17 @@
-  private:
-   bool GetUnderlinePosition(const base::string16& text,
-                             base::char16* accelerator,
-+<<<<<<< .our
-                             int* start,
-                             int* end) const;
-   void GetCharacterPosition(const base::string16& text,
-                             int index,
-                             int* pos) const;
-+=======
-+                            int* start, int* end) const;
-+  void GetCharacterPosition(
-+      const base::string16& text, int index, int* pos) const;
-+>>>>>>> .their
- 
-   base::char16 accelerator_ = 0;
- 
-changed in both
-  base   100644 2cbf07be86a812f07105846dc8caf8226a8595df atom/browser/web_contents_preferences.cc
-  our    100644 c21c93383155091a7481cdd4e741cefad90a4a55 atom/browser/web_contents_preferences.cc
-  their  100644 98b39fee234cb15ac0da99fd5639c7b8265d71b0 atom/browser/web_contents_preferences.cc
-@@ -97,6 +97,7 @@
-   instances_.push_back(this);
- 
-   // Set WebPreferences defaults onto the JS object
-+<<<<<<< .our
-   SetDefaultBoolIfUndefined(options::kPlugins, false);
-   SetDefaultBoolIfUndefined(options::kExperimentalFeatures, false);
-   bool node = SetDefaultBoolIfUndefined(options::kNodeIntegration, true);
-@@ -104,12 +105,23 @@
-   SetDefaultBoolIfUndefined(options::kWebviewTag, node);
-   SetDefaultBoolIfUndefined(options::kSandbox, false);
-   SetDefaultBoolIfUndefined(options::kNativeWindowOpen, false);
-+=======
-+  SetDefaultBoolIfUndefined("plugins", false);
-+  SetDefaultBoolIfUndefined(options::kExperimentalFeatures, false);
-+  SetDefaultBoolIfUndefined(options::kExperimentalCanvasFeatures, false);
-+  bool node = SetDefaultBoolIfUndefined(options::kNodeIntegration, true);
-+  SetDefaultBoolIfUndefined(options::kNodeIntegrationInWorker, false);
-+  SetDefaultBoolIfUndefined(options::kWebviewTag, node);
-+  SetDefaultBoolIfUndefined("sandbox", false);
-+  SetDefaultBoolIfUndefined("nativeWindowOpen", false);
-+>>>>>>> .their
-   SetDefaultBoolIfUndefined(options::kContextIsolation, false);
-   SetDefaultBoolIfUndefined("javascript", true);
-   SetDefaultBoolIfUndefined("images", true);
-   SetDefaultBoolIfUndefined("textAreasAreResizable", true);
-   SetDefaultBoolIfUndefined("webgl", true);
-   bool webSecurity = true;
-+<<<<<<< .our
-   SetDefaultBoolIfUndefined(options::kWebSecurity, webSecurity);
-   // If webSecurity was explicity set to false, let's inherit that into
-   // insecureContent
-@@ -125,6 +137,21 @@
-   SetDefaultBoolIfUndefined(options::kOffscreen, false);
- 
-   last_preference_ = preference_.Clone();
-+=======
-+  SetDefaultBoolIfUndefined("webSecurity", webSecurity);
-+  // If webSecurity was explicity set to false, let's inherit that into
-+  // insecureContent
-+  if (web_preferences.Get("webSecurity", &webSecurity) && !webSecurity) {
-+    SetDefaultBoolIfUndefined("allowRunningInsecureContent", true);
-+  } else {
-+    SetDefaultBoolIfUndefined("allowRunningInsecureContent", false);
-+  }
-+  #if defined(OS_MACOSX)
-+  SetDefaultBoolIfUndefined(options::kScrollBounce, false);
-+  #endif
-+  SetDefaultBoolIfUndefined("offscreen", false);
-+  last_web_preferences_.MergeDictionary(&web_preferences_);
-+>>>>>>> .their
- }
- 
- WebContentsPreferences::~WebContentsPreferences() {
-@@ -154,6 +181,16 @@
-   return default_value;
- }
- 
-+bool WebContentsPreferences::SetDefaultBoolIfUndefined(const std::string key,
-+                                                       bool val) {
-+  bool existing;
-+  if (!web_preferences_.GetBoolean(key, &existing)) {
-+    web_preferences_.SetBoolean(key, val);
-+    return val;
-+  }
-+  return existing;
-+}
-+
- void WebContentsPreferences::Merge(const base::DictionaryValue& extend) {
-   if (preference_.is_dict())
-     static_cast<base::DictionaryValue*>(&preference_)->MergeDictionary(&extend);
-@@ -212,8 +249,18 @@
-   return FromWebContents(web_contents);
- }
- 
-+<<<<<<< .our
- void WebContentsPreferences::AppendCommandLineSwitches(
-     base::CommandLine* command_line) {
-+=======
-+  // We are appending args to a webContents so let's save the current state
-+  // of our preferences object so that during the lifetime of the WebContents
-+  // we can fetch the options used to initally configure the WebContents
-+  self->last_web_preferences_.Clear();
-+  self->last_web_preferences_.MergeDictionary(&web_preferences);
-+
-+  bool b;
-+>>>>>>> .their
-   // Check if plugins are enabled.
-   if (IsEnabled(options::kPlugins))
-     command_line->AppendSwitch(switches::kEnablePlugins);
-changed in both
-  base   100644 94dd8dc598bef5cc35383d69d20ade8d644a7ef5 atom/browser/web_contents_preferences.h
-  our    100644 d835347afcd259f473f95271a2c19e42afcc6f2b atom/browser/web_contents_preferences.h
-  their  100644 28ee9a85485e26b33b8a7852a4a212b4c11b71a0 atom/browser/web_contents_preferences.h
-@@ -59,25 +59,45 @@
-   bool GetPreloadPath(base::FilePath::StringType* path) const;
- 
-   // Returns the web preferences.
-+<<<<<<< .our
-   base::Value* preference() { return &preference_; }
-   base::Value* last_preference() { return &last_preference_; }
-+=======
-+  base::DictionaryValue* web_preferences() { return &web_preferences_; }
-+  base::DictionaryValue* last_web_preferences() {
-+    return &last_web_preferences_;
-+  }
-+>>>>>>> .their
- 
-  private:
-   friend class content::WebContentsUserData<WebContentsPreferences>;
-   friend class AtomBrowserClient;
- 
-+<<<<<<< .our
-   // Get WebContents according to process ID.
-   static content::WebContents* GetWebContentsFromProcessID(int process_id);
- 
-   // Set preference value to given bool if user did not provide value
-   bool SetDefaultBoolIfUndefined(const base::StringPiece& key, bool val);
-+=======
-+  // Set preference value to given bool if user did not provide value
-+  bool SetDefaultBoolIfUndefined(const std::string key, bool val);
-+
-+  // Get preferences value as integer possibly coercing it from a string
-+  bool GetInteger(const std::string& attributeName, int* intValue);
-+>>>>>>> .their
- 
-   static std::vector<WebContentsPreferences*> instances_;
- 
-   content::WebContents* web_contents_;
-+<<<<<<< .our
- 
-   base::Value preference_ = base::Value(base::Value::Type::DICTIONARY);
-   base::Value last_preference_ = base::Value(base::Value::Type::DICTIONARY);
-+=======
-+  base::DictionaryValue web_preferences_;
-+  base::DictionaryValue last_web_preferences_;
-+>>>>>>> .their
- 
-   DISALLOW_COPY_AND_ASSIGN(WebContentsPreferences);
- };
-changed in both
-  base   100644 1dd479883d872dc6d76ef069782aad6dc4f731da atom/browser/web_dialog_helper.cc
-  our    100644 74c8573d13f15bcaa189abdc40fa0cd8e48f89be atom/browser/web_dialog_helper.cc
-  their  100644 1683cab4982e367609168288ec6b9d7c27621129 atom/browser/web_dialog_helper.cc
-changed in both
-  base   100644 ad8c1d49bbc049b89eb4c69224b42fb51906c726 atom/common/api/api_messages.h
-  our    100644 6131a7a473c68e31790fcd8697c8f380c65ad275 atom/common/api/api_messages.h
-  their  100644 46e6142260d67b6408060ccaf328ee1f74335fe4 atom/common/api/api_messages.h
-@@ -59,6 +59,7 @@
- 
- // Sent by renderer to set the temporary zoom level.
- IPC_SYNC_MESSAGE_ROUTED1_1(AtomFrameHostMsg_SetTemporaryZoomLevel,
-+<<<<<<< .our
-                            double /* zoom level */,
-                            double /* result */)
- 
-@@ -69,3 +70,10 @@
- IPC_MESSAGE_ROUTED2(AtomFrameHostMsg_PDFSaveURLAs,
-                     GURL /* url */,
-                     content::Referrer /* referrer */)
-+=======
-+                            double /* zoom level */,
-+                            double /* result */)
-+
-+// Sent by renderer to get the zoom level.
-+IPC_SYNC_MESSAGE_ROUTED0_1(AtomFrameHostMsg_GetZoomLevel, double /* result */)
-+>>>>>>> .their
-changed in both
-  base   100644 fe3ba33412bb277b80b192e26bb90ed0fe5feef1 atom/common/api/atom_api_native_image.cc
-  our    100644 09edfdaac9107386241505d2d5763b1b24aa73a4 atom/common/api/atom_api_native_image.cc
-  their  100644 1f38d210d824befb3bd10c10a14adce3bd1a127c atom/common/api/atom_api_native_image.cc
-changed in both
-  base   100644 d1a185d51f394b1828d66cbcf2a1d1cc278de23d atom/common/api/remote_callback_freer.cc
-  our    100644 eba828591353dae53d1b7cdaa60fee52166d7473 atom/common/api/remote_callback_freer.cc
-  their  100644 c15d5389a2e99fa0f305a812860a3232a3ec069d atom/common/api/remote_callback_freer.cc
-@@ -39,7 +39,11 @@
-   base::ListValue args;
-   args.AppendString(context_id_);
-   args.AppendInteger(object_id_);
-+<<<<<<< .our
-   auto* frame_host = web_contents()->GetMainFrame();
-+=======
-+  auto frame_host = web_contents()->GetMainFrame();
-+>>>>>>> .their
-   if (frame_host) {
-     frame_host->Send(new AtomFrameMsg_Message(frame_host->GetRoutingID(), false,
-                                               channel, args));
-changed in both
-  base   100644 315127822d1709802abf317c4d8cf49ec7e2bfaa atom/common/api/remote_object_freer.cc
-  our    100644 8afe8b9a32bc4ba4d5cdfc66ecf7036b8553cb48 atom/common/api/remote_object_freer.cc
-  their  100644 ef028441e3da5c7d56f6bdba2f162814ff6b21f3 atom/common/api/remote_object_freer.cc
-changed in both
-  base   100644 5fa39680ca814675d344665b3b2a6ce5d94e625f atom/common/atom_version.h
-  our    100644 65e7d19911559a40b1b258319df5fe0fa180354f atom/common/atom_version.h
-  their  100644 b000e254eb63ae90ba6adbd1defca6c3a2fccaae atom/common/atom_version.h
-@@ -5,10 +5,17 @@
- #ifndef ATOM_COMMON_ATOM_VERSION_H_
- #define ATOM_COMMON_ATOM_VERSION_H_
- 
-+<<<<<<< .our
- #define ATOM_MAJOR_VERSION 4
- #define ATOM_MINOR_VERSION 0
- #define ATOM_PATCH_VERSION 0
- #define ATOM_PRE_RELEASE_VERSION -nightly.20180821
-+=======
-+#define ATOM_MAJOR_VERSION 2
-+#define ATOM_MINOR_VERSION 0
-+#define ATOM_PATCH_VERSION 2
-+// #define ATOM_PRE_RELEASE_VERSION
-+>>>>>>> .their
- 
- #ifndef ATOM_STRINGIFY
- #define ATOM_STRINGIFY(n) ATOM_STRINGIFY_HELPER(n)
-changed in both
-  base   100644 a7908ef30c6bafc4aca1da9a870f7ae12703fe04 atom/common/crash_reporter/crash_reporter_win.cc
-  our    100644 c574da71c9de9bd8c7b7cad57d3a0f84708fb97c atom/common/crash_reporter/crash_reporter_win.cc
-  their  100644 49f90b7e6665727b697a243414544bae304fde6e atom/common/crash_reporter/crash_reporter_win.cc
-changed in both
-  base   100644 cff228ba49068a8a683257e9ac50778437a56c45 atom/common/linux/application_info.cc
-  our    100644 3354c73b8b60f77cf054f975ea713d96b7e7683e atom/common/linux/application_info.cc
-  their  100644 05bd7f6fc15015a4f570e36801aea622a8f0cb3a atom/common/linux/application_info.cc
-@@ -19,7 +19,11 @@
- namespace {
- 
- GDesktopAppInfo* get_desktop_app_info() {
-+<<<<<<< .our
-   GDesktopAppInfo* ret = nullptr;
-+=======
-+  GDesktopAppInfo * ret = nullptr;
-+>>>>>>> .their
- 
-   std::string desktop_id;
-   if (brightray::platform_util::GetDesktopName(&desktop_id))
-changed in both
-  base   100644 eed6e7bc092f84bd1bde673c27f5fe5363c7783c atom/common/options_switches.cc
-  our    100644 8b1836f80c583e4db68971ff1b00ca4f86356b45 atom/common/options_switches.cc
-  their  100644 c1cd185443c0fdbadeb7ba2e174d2048ab2d45d7 atom/common/options_switches.cc
-@@ -188,6 +188,9 @@
- // The application path
- const char kAppPath[] = "app-path";
- 
-+// The context ID for this process
-+const char kContextId[] = "context-id";
-+
- // The command line switch versions of the options.
- const char kBackgroundColor[] = "background-color";
- const char kPreloadScript[] = "preload";
-changed in both
-  base   100644 525301971c8a05c45e12aada7d0534b84307aebf atom/common/options_switches.h
-  our    100644 5f6d7e9d38120668ed06922ced2f8d6a6e27a52b atom/common/options_switches.h
-  their  100644 9d65bc376925906063c24a9a254b2c31c7e22c34 atom/common/options_switches.h
-@@ -92,6 +92,7 @@
- extern const char kSecureSchemes[];
- extern const char kAppUserModelId[];
- extern const char kAppPath[];
-+extern const char kContextId[];
- 
- extern const char kBackgroundColor[];
- extern const char kPreloadScript[];
-changed in both
-  base   100644 7bee1411ba1c2fbac516ff8b65bcbd89f6132819 atom/renderer/api/atom_api_renderer_ipc.cc
-  our    100644 3e48a4f7d0c11f40e6360b0acc2c83c38e671319 atom/renderer/api/atom_api_renderer_ipc.cc
-  their  100644 ad6a12b90d525e9c6a49fac7a5d122b8c2c295f9 atom/renderer/api/atom_api_renderer_ipc.cc
-@@ -12,8 +12,13 @@
- #include "native_mate/dictionary.h"
- #include "third_party/WebKit/public/web/WebLocalFrame.h"
- 
-+<<<<<<< .our
- using blink::WebLocalFrame;
- using content::RenderFrame;
-+=======
-+using content::RenderFrame;
-+using blink::WebLocalFrame;
-+>>>>>>> .their
- 
- namespace atom {
- 
-@@ -48,10 +53,17 @@
- 
-   RenderFrame* render_frame = GetCurrentRenderFrame();
-   if (render_frame == nullptr)
-+<<<<<<< .our
-     return result;
- 
-   IPC::SyncMessage* message = new AtomFrameHostMsg_Message_Sync(
-       render_frame->GetRoutingID(), channel, arguments, &result);
-+=======
-+    return json;
-+
-+  IPC::SyncMessage* message = new AtomFrameHostMsg_Message_Sync(
-+      render_frame->GetRoutingID(), channel, arguments, &json);
-+>>>>>>> .their
-   bool success = render_frame->Send(message);
- 
-   if (!success)
-changed in both
-  base   100644 d0164f44a0a523b26a919e02b5b7add25a0e7224 atom/renderer/api/atom_api_web_frame.cc
-  our    100644 f0f7ef249d73876f7107d3d3865e8fc71ee33945 atom/renderer/api/atom_api_web_frame.cc
-  their  100644 c36d1a06491994f126333c98796f6ff64cfc6506 atom/renderer/api/atom_api_web_frame.cc
-changed in both
-  base   100644 1971a26c1c5d4f5c5f5f029e6334f157a16b5394 atom/renderer/atom_render_frame_observer.cc
-  our    100644 ea2355fd968339600ae8093524f1c3dcfd2f4ff3 atom/renderer/atom_render_frame_observer.cc
-  their  100644 4ddf9186b723091ef91d69cfaedc4fbdd1ac09fa atom/renderer/atom_render_frame_observer.cc
-@@ -7,6 +7,8 @@
- #include <string>
- #include <vector>
- 
-+#include "atom/common/native_mate_converters/string16_converter.h"
-+
- #include "atom/common/api/api_messages.h"
- #include "atom/common/api/event_emitter_caller.h"
- #include "atom/common/native_mate_converters/value_converter.h"
-@@ -72,7 +74,12 @@
-     RendererClientBase* renderer_client)
-     : content::RenderFrameObserver(frame),
-       render_frame_(frame),
-+<<<<<<< .our
-       renderer_client_(renderer_client) {
-+=======
-+      renderer_client_(renderer_client),
-+      document_created_(false) {
-+>>>>>>> .their
-   // Initialise resource for directory listing.
-   net::NetModule::SetResourceProvider(NetResourceProvider);
- }
-@@ -195,8 +202,13 @@
- }
- 
- void AtomRenderFrameObserver::EmitIPCEvent(blink::WebLocalFrame* frame,
-+<<<<<<< .our
-                                            const base::string16& channel,
-                                            const base::ListValue& args) {
-+=======
-+                                          const base::string16& channel,
-+                                          const base::ListValue& args) {
-+>>>>>>> .their
-   if (!frame)
-     return;
- 
-changed in both
-  base   100644 248d5a68096dedea0f6ffb3c9df38ff3373e7c18 atom/renderer/atom_render_frame_observer.h
-  our    100644 e774741c019956a3bff00db2f6d2b133bf1be6de atom/renderer/atom_render_frame_observer.h
-  their  100644 d4f3d0c7d5c454bb65a190f59b26501137dd04e0 atom/renderer/atom_render_frame_observer.h
-@@ -56,7 +56,11 @@
- 
-   content::RenderFrame* render_frame_;
-   RendererClientBase* renderer_client_;
-+<<<<<<< .our
-   bool document_created_ = false;
-+=======
-+  bool document_created_;
-+>>>>>>> .their
- 
-   DISALLOW_COPY_AND_ASSIGN(AtomRenderFrameObserver);
- };
-changed in both
-  base   100644 4d3e7cba7a65330a45a5f2aebba90c257b206e35 atom/renderer/atom_render_view_observer.h
-  our    100644 097616e12369662473c12645a93e27cffcb55e3b atom/renderer/atom_render_view_observer.h
-  their  100644 ca9fb01288e3bd4788c7718f0feb8b37307383e6 atom/renderer/atom_render_view_observer.h
-@@ -14,7 +14,11 @@
-   explicit AtomRenderViewObserver(content::RenderView* render_view);
- 
-  protected:
-+<<<<<<< .our
-   ~AtomRenderViewObserver() override;
-+=======
-+  virtual ~AtomRenderViewObserver();
-+>>>>>>> .their
- 
-  private:
-   // content::RenderViewObserver implementation.
-changed in both
-  base   100644 82ba9d024350009ae86bc5406513c8086073990a atom/renderer/atom_renderer_client.cc
-  our    100644 204f17c2cf0d2d4ec4a71bdbecfcd1cbdc5fc8be atom/renderer/atom_renderer_client.cc
-  their  100644 12e8fa2603a1b533646b300efbf312b9cb2d8361 atom/renderer/atom_renderer_client.cc
-changed in both
-  base   100644 07d20bda8b00b1acdb823546f5e606154278cd4e atom/renderer/atom_sandboxed_renderer_client.cc
-  our    100644 6e29fe45a69f44856d7fca449ec1be4eaf6970a2 atom/renderer/atom_sandboxed_renderer_client.cc
-  their  100644 cad4b6d7b680da1407a912eb0f4228cf0fe88339 atom/renderer/atom_sandboxed_renderer_client.cc
-@@ -12,11 +12,16 @@
- #include "atom/common/options_switches.h"
- #include "atom/renderer/api/atom_api_renderer_ipc.h"
- #include "atom/renderer/atom_render_frame_observer.h"
-+<<<<<<< .our
- #include "base/base_paths.h"
- #include "base/command_line.h"
- #include "base/files/file_path.h"
- #include "base/path_service.h"
- #include "base/process/process_handle.h"
-+=======
-+#include "base/command_line.h"
-+#include "base/files/file_path.h"
-+>>>>>>> .their
- #include "chrome/renderer/printing/print_web_view_helper.h"
- #include "content/public/renderer/render_frame.h"
- #include "native_mate/dictionary.h"
-@@ -34,8 +39,13 @@
- const std::string kModuleCacheKey = "native-module-cache";
- 
- bool IsDevTools(content::RenderFrame* render_frame) {
-+<<<<<<< .our
-   return render_frame->GetWebFrame()->GetDocument().Url().ProtocolIs(
-       "chrome-devtools");
-+=======
-+  return render_frame->GetWebFrame()->GetDocument().Url()
-+        .ProtocolIs("chrome-devtools");
-+>>>>>>> .their
- }
- 
- v8::Local<v8::Object> GetModuleCache(v8::Isolate* isolate) {
-@@ -102,12 +112,19 @@
-   AtomSandboxedRenderFrameObserver(content::RenderFrame* render_frame,
-                                    AtomSandboxedRendererClient* renderer_client)
-       : AtomRenderFrameObserver(render_frame, renderer_client),
-+<<<<<<< .our
-         renderer_client_(renderer_client) {}
-+=======
-+        v8_converter_(new atom::V8ValueConverter),
-+        renderer_client_(renderer_client) {
-+    v8_converter_->SetDisableNode(true);
-+  }
-+>>>>>>> .their
- 
-  protected:
-   void EmitIPCEvent(blink::WebLocalFrame* frame,
-                     const base::string16& channel,
--                    const base::ListValue& args) override {
-+                    const base::ListValue& args) {
-     if (!frame)
-       return;
- 
-@@ -176,6 +193,7 @@
- }
- 
- void AtomSandboxedRendererClient::DidCreateScriptContext(
-+<<<<<<< .our
-     v8::Handle<v8::Context> context,
-     content::RenderFrame* render_frame) {
-   RendererClientBase::DidCreateScriptContext(context, render_frame);
-@@ -184,6 +202,18 @@
-   // For devtools we still want to run the preload_bundle script
-   if (!render_frame->IsMainFrame() && !IsDevTools(render_frame))
-     return;
-+=======
-+    v8::Handle<v8::Context> context, content::RenderFrame* render_frame) {
-+
-+  // Only allow preload for the main frame or
-+  // For devtools we still want to run the preload_bundle script
-+  if (!render_frame->IsMainFrame() && !IsDevTools(render_frame))
-+    return;
-+
-+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-+  base::FilePath preload_script_path = command_line->GetSwitchValuePath(
-+      switches::kPreloadScript);
-+>>>>>>> .their
- 
-   auto* isolate = context->GetIsolate();
-   v8::HandleScope handle_scope(isolate);
-@@ -203,7 +233,14 @@
-   auto binding = v8::Object::New(isolate);
-   InitializeBindings(binding, context);
-   AddRenderBindings(isolate, binding);
-+<<<<<<< .our
-   v8::Local<v8::Value> args[] = {binding};
-+=======
-+  v8::Local<v8::Value> args[] = {
-+    binding,
-+    mate::ConvertToV8(isolate, preload_script_path.value())
-+  };
-+>>>>>>> .their
-   // Execute the function with proper arguments
-   ignore_result(
-       func->Call(context, v8::Null(isolate), node::arraysize(args), args));
-changed in both
-  base   100644 89af0932d10a598f87dd28ec4b32ae3b2e0eadca atom/renderer/renderer_client_base.cc
-  our    100644 69490420ef5b8f87e7cb8fd97ebd5ec4509fa1ae atom/renderer/renderer_client_base.cc
-  their  100644 af9dfe39367ff1014e558afee2f0fe5ab0e7456e atom/renderer/renderer_client_base.cc
-@@ -161,7 +161,10 @@
- 
- void RendererClientBase::RenderFrameCreated(
-     content::RenderFrame* render_frame) {
-+<<<<<<< .our
- #if defined(TOOLKIT_VIEWS)
-+=======
-+>>>>>>> .their
-   new AutofillAgent(render_frame);
- #endif
- #if defined(ENABLE_PEPPER_FLASH)
-changed in both
-  base   100644 065fe818a64586b6f786cdaa163c40b8a3aacabe brightray/brightray.gyp
-  our    100644 f233257e88bad8f0ff703034bea02e4715a5b5b9 brightray/brightray.gyp
-  their  100644 e42bbce42ae24faed7267e50e8efa7be4b66d215 brightray/brightray.gyp
-@@ -178,6 +178,7 @@
-                 ],
-               },
-             }],
-+<<<<<<< .our
-             # Due to strange linker behavior, component build of arm needs to
-             # be linked with libjpeg.a explicitly.
-             ['target_arch=="arm" and libchromiumcontent_component==1', {
-@@ -187,6 +188,8 @@
-                 ],
-               },
-             }],
-+=======
-+>>>>>>> .their
-           ],
-         }],  # OS=="linux"
-         ['OS=="mac"', {
-changed in both
-  base   100644 143a5fdea3eb6ad7709fa8383298029a24c1b407 brightray/browser/linux/libnotify_notification.cc
-  our    100644 0725ffded989d3c6bce753a210e464deca346ad1 brightray/browser/linux/libnotify_notification.cc
-  their  100644 7f9fb35e434f7cc85cf4145661e754ff4a0d84fc brightray/browser/linux/libnotify_notification.cc
-changed in both
-  base   100644 04033f451e045ee7211f0a7152d46c5010a55b72 brightray/browser/url_request_context_getter.h
-  our    100644 941a5782b14a941bb25a7a9ef6ca6d73f8bc3ec1 brightray/browser/url_request_context_getter.h
-  their  100644 1a26704d380ab7d113c4e2b0deb940a2d674f96b brightray/browser/url_request_context_getter.h
-@@ -76,11 +76,14 @@
-       const override;
- 
-   net::URLRequestJobFactory* job_factory() const { return job_factory_; }
-+<<<<<<< .our
-   void set_delegate(Delegate* delegate) { delegate_ = delegate; }
- 
-   // Discard reference to URLRequestContext and inform observers to
-   // shutdown. Must be called only on IO thread.
-   void NotifyContextShuttingDown(std::unique_ptr<ResourceContext>);
-+=======
-+>>>>>>> .their
- 
-  private:
-   friend class BrowserContext;
-changed in both
-  base   100644 08b203a23291ba0e2ba254873074178da4921123 brightray/common/application_info_win.cc
-  our    100644 a0256372bbdbbc1d77cb84885faab42a27f55c9f brightray/common/application_info_win.cc
-  their  100644 89ea0aceb6784119ad65783cfd1c019e7aedbf57 brightray/common/application_info_win.cc
-changed in both
-  base   100644 6a7d91f135c4b904e6d3172da91e7813793a2fba brightray/filenames.gypi
-  our    100644 b9e2d96175f8ee2d407db9c49b2e2b74756327de brightray/filenames.gypi
-  their  100644 9ddd990cfa52886ead940c428d1f355ef6234d9a brightray/filenames.gypi
-changed in both
-  base   100644 e0e8b153ae51d917f37ba50967e2ef9e5b74254d docs/README.md
-  our    100644 f7b956e8feb95ceb64743ad260a1759e5a298afe docs/README.md
-  their  100644 436188887e5dad0a4ae291e5221e3eb8644bc56e docs/README.md
-@@ -16,6 +16,7 @@
- 
- * [Electron FAQ](faq.md)
- 
-+<<<<<<< .our
- ## Guides and Tutorials
- 
- * [Setting up the Development Environment](tutorial/development-environment.md)
-@@ -66,6 +67,12 @@
-   * [Mac App Store](tutorial/mac-app-store-submission-guide.md)
-   * [Windows Store](tutorial/windows-store-guide.md)
-   * [Snapcraft](tutorial/snapcraft.md)
-+=======
-+## Guides
-+
-+* [Glossary of Terms](glossary.md)
-+* [Support](tutorial/support.md)
-+>>>>>>> .their
- * [Security](tutorial/security.md)
-   * [Reporting Security Issues](tutorial/security.md#reporting-security-issues)
-   * [Chromium Security Issues and Upgrades](tutorial/security.md#chromium-security-issues-and-upgrades)
-changed in both
-  base   100644 926d1dde8ffc33d99c48cb55bbc2d0f9c2087ad4 docs/api/app.md
-  our    100644 14dc557e237404cbbd5bcebabb0e65486dc36926 docs/api/app.md
-  their  100644 40fdf2669442ca48fd1fc9a3b4aede6a199df4f1 docs/api/app.md
-changed in both
-  base   100644 2be2da597664c1913a665ad51de5becc42658d0f docs/api/browser-window.md
-  our    100644 dff61dd336f047cf2f6f06228b2df2b98ff2304d docs/api/browser-window.md
-  their  100644 68b7fe48861d1cefae9c454145f414d06cd69424 docs/api/browser-window.md
-changed in both
-  base   100644 f9aaaa90ddd7b8887c5ed3fea371bf175e28c2e7 docs/api/in-app-purchase.md
-  our    100644 6e612a72e27159602400f4efa30d5bc2f3aa668f docs/api/in-app-purchase.md
-  their  100644 67109dc0f92d8c537c9a2f1fa5fa2ce223137964 docs/api/in-app-purchase.md
-changed in both
-  base   100644 6aaa2bdd9b0ade84160b7449396d5ecd510f0e41 docs/api/web-contents.md
-  our    100644 8990fe2e97ab62eafdd3f7a4eb8ee782415124c5 docs/api/web-contents.md
-  their  100644 841acb4a506626c334004e28266ebed3845360d3 docs/api/web-contents.md
-@@ -1385,6 +1385,26 @@
- 
- Shows pop-up dictionary that searches the selected word on the page.
- 
-+<<<<<<< .our
-+=======
-+#### `contents.setSize(options)`
-+
-+Set the size of the page. This is only supported for `<webview>` guest contents.
-+
-+* `options` Object
-+  * `enableAutoSize` Boolean (optional) - true to make the webview container automatically
-+    resize within the bounds specified by the attributes normal, min and max.
-+  * `normal` [Size](structures/size.md) (optional) - Normal size of the page. This can be used in
-+    combination with the [`disableguestresize`](webview-tag.md#disableguestresize)
-+    attribute to manually resize the webview guest contents.
-+  * `min` [Size](structures/size.md) (optional) - Minimum size of the page. This can be used in
-+    combination with the [`disableguestresize`](webview-tag.md#disableguestresize)
-+    attribute to manually resize the webview guest contents.
-+  * `max` [Size](structures/size.md) (optional) - Maximium size of the page. This can be used in
-+    combination with the [`disableguestresize`](webview-tag.md#disableguestresize)
-+    attribute to manually resize the webview guest contents.
-+
-+>>>>>>> .their
- #### `contents.isOffscreen()`
- 
- Returns `Boolean` - Indicates whether *offscreen rendering* is enabled.
-removed in local
-  base   100644 7dfc6084f5c94bfb924438e7efa50260d38b9144 docs/tutorial/planned-breaking-changes.md
-  their  100644 00e01f4f8c3a85f0e535a00c11e22f3595bff4b9 docs/tutorial/planned-breaking-changes.md
-added in both
-  our    100644 bdb3b8678485feabfad2ce23309f5bcac6050f31 docs/tutorial/support.md
-  their  100644 306876fee9314fbca1779a6c41ff8c6381753bda docs/tutorial/support.md
-@@ -91,4 +91,8 @@
- * Fedora 21
- * Debian 8
- 
-+<<<<<<< .our
- [arm-breaking-change]: https://github.com/electron/electron/blob/master/docs/api/breaking-changes.md#duplicate-arm-assets
-+=======
-+[arm-breaking-change]: https://github.com/electron/electron/blob/master/docs/tutorial/planned-breaking-changes.md#duplicate-arm-assets
-+>>>>>>> .their
-changed in both
-  base   100644 53ad35c63321e74a5023197ef2e075584e0f268b electron.gyp
-  our    100644 944ddab2a3fd879044e31677e4bac2843fffbdee electron.gyp
-  their  100644 da23e6e2b4b086b54a9febc464f0d4e85f7c6275 electron.gyp
-@@ -4,7 +4,11 @@
-     'product_name%': 'Electron',
-     'company_name%': 'GitHub, Inc',
-     'company_abbr%': 'github',
-+<<<<<<< .our
-     'version%': '4.0.0-nightly.20180821',
-+=======
-+    'version%': '2.0.2',
-+>>>>>>> .their
-     'js2c_input_dir': '<(SHARED_INTERMEDIATE_DIR)/js2c',
-   },
-   'includes': [
-changed in both
-  base   100644 381a2a866372ebe06f374529c634af411c864ba0 lib/browser/api/app.js
-  our    100644 66f6ae651acf10fb19b8ec068fc5280850dd3d91 lib/browser/api/app.js
-  their  100644 1ea1daddca84dfeba57b7b7883ebb754b8508d2d lib/browser/api/app.js
-changed in both
-  base   100644 22565dcf9875b7f00acff192b10b05d27d6446a7 lib/browser/api/browser-window.js
-  our    100644 cb523496d65c7018c30054621cfdeb1281f9db6a lib/browser/api/browser-window.js
-  their  100644 c5faa0a2c131d633e7aea3a1850abab958d22a1d lib/browser/api/browser-window.js
-changed in both
-  base   100644 da5ff57a113f7a063d1409ff56003db4bd04e68a lib/browser/api/menu.js
-  our    100644 506e3525c10ce142cafe3fc1bf4de1c255e48503 lib/browser/api/menu.js
-  their  100644 a87e0cd0436da2899b6402a06d370e755c2aac47 lib/browser/api/menu.js
-@@ -47,7 +47,11 @@
-   this.delegate = delegate
- }
- 
-+<<<<<<< .our
- Menu.prototype.popup = function (options = {}) {
-+=======
-+Menu.prototype.popup = function (options) {
-+>>>>>>> .their
-   if (options == null || typeof options !== 'object') {
-     throw new TypeError('Options must be an object')
-   }
-@@ -156,7 +160,11 @@
- 
- Menu.buildFromTemplate = function (template) {
-   if (!Array.isArray(template)) {
-+<<<<<<< .our
-     throw new TypeError('Invalid template for Menu: Menu template must be an array')
-+=======
-+    throw new TypeError('Invalid template for Menu')
-+>>>>>>> .their
-   }
-   const menu = new Menu()
-   if (!areValidTemplateItems(template)) {
-merged
-  result 100644 bbbc1bbe1727dd30352c4836cea489145cd7ad7d lib/browser/api/screen.js
-  our    100644 8287bfa8bfdc6db322a05059fd5c8ba58e802db9 lib/browser/api/screen.js
-@@ -1,8 +1,17 @@
- const {EventEmitter} = require('events')
-+const {deprecate} = require('electron')
- const {screen, Screen} = process.atomBinding('screen')
- 
- // Screen is an EventEmitter.
- Object.setPrototypeOf(Screen.prototype, EventEmitter.prototype)
- EventEmitter.call(screen)
- 
-+const nativeFn = screen.getMenuBarHeight
-+screen.getMenuBarHeight = function () {
-+  if (!process.noDeprecations) {
-+    deprecate.warn('screen.getMenuBarHeight', 'screen.getPrimaryDisplay().workArea')
-+  }
-+  return nativeFn.call(this)
-+}
-+
- module.exports = screen
-changed in both
-  base   100644 0338b776f8938c1548ea9786385fe75db9db3403 lib/browser/guest-view-manager.js
-  our    100644 1e4029e39a981c85fb6ff18c5ccd52f81b3c56f2 lib/browser/guest-view-manager.js
-  their  100644 dd8e0ff1a9239e5c7a92f90a58da866c076011ca lib/browser/guest-view-manager.js
-changed in both
-  base   100644 50e890e225a315718d04a0028fb6bf2feb4092ce lib/browser/guest-window-manager.js
-  our    100644 7253c1942b0956ae6b9b0c80a23470fc26669b8a lib/browser/guest-window-manager.js
-  their  100644 ec77a7abdff1ba27e55da513c10d084d7978b7c0 lib/browser/guest-window-manager.js
-@@ -65,7 +65,11 @@
-   // Inherit certain option values from parent window
-   const webPreferences = embedder.getLastWebPreferences()
-   for (const [name, value] of inheritedWebPreferences) {
-+<<<<<<< .our
-     if (webPreferences[name] === value) {
-+=======
-+    if (embedder.getLastWebPreferences()[name] === value) {
-+>>>>>>> .their
-       options.webPreferences[name] = value
-     }
-   }
-changed in both
-  base   100644 24a86fdfee7b87cd8ad177363aec26b438fe79b7 lib/browser/init.js
-  our    100644 bed3d912ab8be3ca4f21de04e801bb42dc12a528 lib/browser/init.js
-  their  100644 344bcf16dceafc99dcc337a0d9113c8e764c6364 lib/browser/init.js
-changed in both
-  base   100644 c0cd09dea4273642aa780756985e9c90dbe164d3 lib/browser/rpc-server.js
-  our    100644 ff9f77321de3a4145946b67f3fe2a597f98e2510 lib/browser/rpc-server.js
-  their  100644 6321c0526f25a99d80228bbd569cc000ec76dee2 lib/browser/rpc-server.js
-@@ -387,9 +387,15 @@
-   objectsRegistry.remove(event.sender, contextId, id)
- })
- 
-+<<<<<<< .our
- ipcMain.on('ELECTRON_BROWSER_CONTEXT_RELEASE', (event, contextId) => {
-   objectsRegistry.clear(event.sender, contextId)
-   event.returnValue = null
-+=======
-+ipcMain.on('ELECTRON_BROWSER_CONTEXT_RELEASE', (e, contextId) => {
-+  objectsRegistry.clear(contextId)
-+  e.returnValue = null
-+>>>>>>> .their
- })
- 
- ipcMain.on('ELECTRON_BROWSER_GUEST_WEB_CONTENTS', function (event, contextId, guestInstanceId) {
-changed in both
-  base   100644 6dc774049def3acbd13b79dfd559c12d4eebd657 lib/common/api/crash-reporter.js
-  our    100644 1090d425e4c5cdf89a03d470718324ef16963472 lib/common/api/crash-reporter.js
-  their  100644 1b20fa52aab741e5dd34de7872f36798ec7c1c68 lib/common/api/crash-reporter.js
-changed in both
-  base   100644 a4f8072ed57642e1ca7d1066e132875da7ad3f46 lib/renderer/api/remote.js
-  our    100644 59117f8f2dd977fc1817a6b1d540b616ddcb0dae lib/renderer/api/remote.js
-  their  100644 3de99ecab255308662a4b65c6b45b573d723f4da lib/renderer/api/remote.js
-@@ -293,6 +293,14 @@
-   callbacksRegistry.remove(id)
- })
- 
-+<<<<<<< .our
-+=======
-+process.on('exit', () => {
-+  const command = 'ELECTRON_BROWSER_CONTEXT_RELEASE'
-+  ipcRenderer.sendSync(command, initialContext)
-+})
-+
-+>>>>>>> .their
- exports.require = (module) => {
-   const command = 'ELECTRON_BROWSER_REQUIRE'
-   const meta = ipcRenderer.sendSync(command, contextId, module)
-@@ -317,6 +325,15 @@
-   return metaToValue(ipcRenderer.sendSync('ELECTRON_BROWSER_CURRENT_WEB_CONTENTS', contextId))
- }
- 
-+const CONTEXT_ARG = '--context-id='
-+let initialContext = process.argv.find(arg => arg.startsWith(CONTEXT_ARG))
-+if (initialContext) {
-+  initialContext = parseInt(initialContext.substr(CONTEXT_ARG.length), 10)
-+} else {
-+  // In sandbox we need to pull this from remote
-+  initialContext = exports.getCurrentWebContents().getId()
-+}
-+
- // Get a global object in browser.
- exports.getGlobal = (name) => {
-   const command = 'ELECTRON_BROWSER_GLOBAL'
-changed in both
-  base   100644 1cb69436dd479baf54b9805c04c0c31b20f24fad lib/renderer/init.js
-  our    100644 2470a5e8be80e770b0c03f6a439a71e72ae12a1b lib/renderer/init.js
-  their  100644 795de06274030aaa1b3ad08a8dd6b259639b0e00 lib/renderer/init.js
-changed in both
-  base   100644 d2da884f1d9caf3d633de25837cb2128f564f2fb lib/renderer/security-warnings.js
-  our    100644 b24f9e28b879154457be0342b9d4b44c0e651253 lib/renderer/security-warnings.js
-  their  100644 4f7d6ef9e596cdc3a5c7e1f2b89b24b9cd67de1d lib/renderer/security-warnings.js
-changed in both
-  base   100644 119391e79462bfa8bb1494039bcb3522d97acead lib/sandboxed_renderer/init.js
-  our    100644 30a3fa55216f6bf7588c3accc07b150a31163b7c lib/sandboxed_renderer/init.js
-  their  100644 a1acbb2bdc26b33db4041e31cbb251b0399ac197 lib/sandboxed_renderer/init.js
-@@ -35,12 +35,15 @@
-   ['url', require('url')]
- ])
- 
-+<<<<<<< .our
- const {
-   preloadSrc, preloadError, process: processProps
- } = electron.ipcRenderer.sendSync('ELECTRON_BROWSER_SANDBOX_LOAD')
- 
- require('../renderer/web-frame-init')()
- 
-+=======
-+>>>>>>> .their
- // Pass different process object to the preload script(which should not have
- // access to things like `process.atomBinding`).
- const preloadProcess = new events.EventEmitter()
-@@ -78,6 +81,7 @@
-   require('../renderer/inspector')
- }
- 
-+<<<<<<< .our
- if (binding.guestInstanceId) {
-   process.guestInstanceId = parseInt(binding.guestInstanceId)
- }
-@@ -88,6 +92,8 @@
-   require('../renderer/web-view/web-view-attributes')
- }
- 
-+=======
-+>>>>>>> .their
- // Wrap the script into a function executed in global scope. It won't have
- // access to the current scope, so we'll expose a few objects as arguments:
- //
-@@ -107,6 +113,7 @@
- // and any `require('electron')` calls in `preload.js` will work as expected
- // since browserify won't try to include `electron` in the bundle, falling back
- // to the `preloadRequire` function above.
-+<<<<<<< .our
- if (preloadSrc) {
-   const preloadWrapperSrc = `(function(require, process, Buffer, global, setImmediate, clearImmediate) {
-   ${preloadSrc}
-@@ -118,4 +125,18 @@
-   preloadFn(preloadRequire, preloadProcess, Buffer, global, setImmediate, clearImmediate)
- } else if (preloadError) {
-   console.error(preloadError.stack)
-+=======
-+if (preloadPath) {
-+  const preloadSrc = fs.readFileSync(preloadPath).toString()
-+  const preloadWrapperSrc = `(function(require, process, Buffer, global, setImmediate) {
-+  ${preloadSrc}
-+  })`
-+
-+  // eval in window scope:
-+  // http://www.ecma-international.org/ecma-262/5.1/#sec-10.4.2
-+  const geval = eval
-+  const preloadFn = geval(preloadWrapperSrc)
-+  const {setImmediate} = require('timers')
-+  preloadFn(preloadRequire, preloadProcess, Buffer, global, setImmediate)
-+>>>>>>> .their
- }
-changed in both
-  base   100644 9d3b0da9c80b223e4a1188311a1121796eb9f7ae package.json
-  our    100644 c081cd89450cd50efba1ec280ff1349a96ea3ce0 package.json
-  their  100644 ae9d78bf2d01360032b2584cfac2c4a81e2f51e1 package.json
-@@ -1,6 +1,10 @@
- {
-   "name": "electron",
-+<<<<<<< .our
-   "version": "4.0.0-nightly.20180821",
-+=======
-+  "version": "2.0.2",
-+>>>>>>> .their
-   "repository": "https://github.com/electron/electron",
-   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
-   "devDependencies": {
-@@ -13,7 +17,11 @@
-     "dugite": "^1.45.0",
-     "electabul": "~0.0.4",
-     "electron-docs-linter": "^2.3.4",
-+<<<<<<< .our
-     "electron-typescript-definitions": "^1.3.6",
-+=======
-+    "electron-typescript-definitions": "1.3.2",
-+>>>>>>> .their
-     "github": "^9.2.0",
-     "html-entities": "^1.2.1",
-     "husky": "^0.14.3",
-@@ -25,8 +33,12 @@
-     "remark-cli": "^4.0.0",
-     "remark-preset-lint-markdown-style-guide": "^2.1.1",
-     "request": "^2.68.0",
-+<<<<<<< .our
-     "semver": "^5.5.0",
-     "serve": "^6.5.8",
-+=======
-+    "serve": "^6.5.3",
-+>>>>>>> .their
-     "standard": "^10.0.0",
-     "standard-markdown": "^4.0.0",
-     "sumchecker": "^2.0.2",
-changed in both
-  base   100755 4465b85c135ddb55a673c5180e15f05f09dac57e script/bootstrap.py
-  our    100755 e4aaf89e216b0164f15882a3040e8cac70bf1fd9 script/bootstrap.py
-  their  100755 c6ebe4ef6975efd1f6184159cc3d9d079bf3628d script/bootstrap.py
-changed in both
-  base   100755 c97cd8336f7d7980911d0bdea93137e7bc95ba24 script/build.py
-  our    100755 fb2b95d3bb71a25ce1ca58acf596afdc0f2cc5bd script/build.py
-  their  100755 2a2231394207c28fcd2b86d3d9f9b079b08d637e script/build.py
-@@ -40,6 +40,12 @@
-   if is_verbose_mode():
-     ninja.append('-v')
- 
-+<<<<<<< .our
-+=======
-+  args = parse_args()
-+  if args.ninja_path:
-+    ninja = args.ninja_path
-+>>>>>>> .their
-   if args.libcc:
-     if ('D' not in args.configuration
-         or not os.path.exists(GCLIENT_DONE)
-@@ -93,12 +99,15 @@
-   parser.add_argument('--ninja-path',
-                       help='Path of ninja command to use.',
-                       required=False)
-+<<<<<<< .our
-   parser.add_argument('--compdb',
-                       help=(
-                         'Generate JSON compilation database. This will not '
-                         'trigger actual build. '
-                       ),
-                       action='store_true', default=False)
-+=======
-+>>>>>>> .their
-   return parser.parse_args()
- 
- 
-changed in both
-  base   100644 ec2459198bf254e7e380e4ae63097168041d0068 script/ci-release-build.js
-  our    100644 be9f9597387f5f8b7bfddc61c202f32ce4c6d478 script/ci-release-build.js
-  their  100644 de4574ca1f1ef709ad1ba29d229f6f2b7f19f1f1 script/ci-release-build.js
-@@ -3,12 +3,15 @@
- const assert = require('assert')
- const request = require('request')
- const buildAppVeyorURL = 'https://windows-ci.electronjs.org/api/builds'
-+<<<<<<< .our
- const vstsURL = 'https://github.visualstudio.com/electron/_apis/build'
- 
- const appVeyorJobs = {
-   'electron-x64': 'electron',
-   'electron-ia32': 'electron-39ng6'
- }
-+=======
-+>>>>>>> .their
- 
- const circleCIJobs = [
-   'electron-linux-arm',
-@@ -18,11 +21,14 @@
-   'electron-linux-x64'
- ]
- 
-+<<<<<<< .our
- const vstsJobs = [
-   'electron-release-mas-x64',
-   'electron-release-osx-x64'
- ]
- 
-+=======
-+>>>>>>> .their
- async function makeRequest (requestOptions, parseResponse) {
-   return new Promise((resolve, reject) => {
-     request(requestOptions, (err, res, body) => {
-@@ -51,6 +57,10 @@
- }
- 
- async function circleCIcall (buildUrl, targetBranch, job, options) {
-+<<<<<<< .our
-+=======
-+  assert(process.env.CIRCLE_TOKEN, 'CIRCLE_TOKEN not found in environment')
-+>>>>>>> .their
-   console.log(`Triggering CircleCI to run build job: ${job} on branch: ${targetBranch} with release flag.`)
-   let buildRequest = {
-     'build_parameters': {
-@@ -92,8 +102,14 @@
-   }
- }
- 
-+<<<<<<< .our
- async function callAppVeyor (targetBranch, job, options) {
-   console.log(`Triggering AppVeyor to run build job: ${job} on branch: ${targetBranch} with release flag.`)
-+=======
-+async function buildAppVeyor (targetBranch, options) {
-+  console.log(`Triggering AppVeyor to run build on branch: ${targetBranch} with release flag.`)
-+  assert(process.env.APPVEYOR_TOKEN, 'APPVEYOR_TOKEN not found in environment')
-+>>>>>>> .their
-   let environmentVariables = {}
- 
-   if (options.ghRelease) {
-@@ -132,11 +148,16 @@
- function buildCircleCI (targetBranch, options) {
-   const circleBuildUrl = `https://circleci.com/api/v1.1/project/github/electron/electron/tree/${targetBranch}?circle-token=${process.env.CIRCLE_TOKEN}`
-   if (options.job) {
-+<<<<<<< .our
-     assert(circleCIJobs.includes(options.job), `Unknown CircleCI job name: ${options.job}. Valid values are: ${circleCIJobs}.`)
-+=======
-+    assert(circleCIJobs.includes(options.job), `Unknown CI job name: ${options.job}.`)
-+>>>>>>> .their
-     circleCIcall(circleBuildUrl, targetBranch, options.job, options)
-   } else {
-     circleCIJobs.forEach((job) => circleCIcall(circleBuildUrl, targetBranch, job, options))
-   }
-+<<<<<<< .our
- }
- 
- async function buildVSTS (targetBranch, options) {
-@@ -200,6 +221,8 @@
-     console.log(`Error calling VSTS for job ${build.name}`, err)
-   })
-   console.log(`VSTS release build request for ${build.name} successful. Check ${vstsResponse._links.web.href} for status.`)
-+=======
-+>>>>>>> .their
- }
- 
- function runRelease (targetBranch, options) {
-@@ -211,10 +234,13 @@
-       }
-       case 'AppVeyor': {
-         buildAppVeyor(targetBranch, options)
-+<<<<<<< .our
-         break
-       }
-       case 'VSTS': {
-         buildVSTS(targetBranch, options)
-+=======
-+>>>>>>> .their
-         break
-       }
-       default: {
-@@ -225,7 +251,10 @@
-   } else {
-     buildCircleCI(targetBranch, options)
-     buildAppVeyor(targetBranch, options)
-+<<<<<<< .our
-     buildVSTS(targetBranch, options)
-+=======
-+>>>>>>> .their
-   }
- }
- 
-@@ -238,7 +267,11 @@
-   const targetBranch = args._[0]
-   if (args._.length < 1) {
-     console.log(`Trigger CI to build release builds of electron.
-+<<<<<<< .our
-     Usage: ci-release-build.js [--job=CI_JOB_NAME] [--ci=CircleCI|AppVeyor|VSTS] [--ghRelease] [--automaticRelease] TARGET_BRANCH
-+=======
-+    Usage: ci-release-build.js [--job=CI_JOB_NAME] [--ci=CircleCI|AppVeyor] [--ghRelease] [--automaticRelease] TARGET_BRANCH
-+>>>>>>> .their
-     `)
-     process.exit(0)
-   }
-changed in both
-  base   100755 de3b9ffd48156379afd677b98c40c97532cb8367 script/create-dist.py
-  our    100755 4a6c0c7ce8f275175e48c4c380ff33627f7a5961 script/create-dist.py
-  their  100755 e8396a2e6d242b9deba3b6a7642060584cd1a605 script/create-dist.py
-@@ -147,7 +147,11 @@
- 
-   # Copy file and keep the executable bit.
-   shutil.copyfile(src, dest)
-+<<<<<<< .our
-   add_exec_bit(dest)
-+=======
-+  os.chmod(dest, os.stat(dest).st_mode | stat.S_IEXEC)
-+>>>>>>> .their
- 
- def copy_vcruntime_binaries():
-   arch = get_target_arch()
-@@ -302,7 +306,11 @@
-     dest = os.path.join(DIST_DIR, binary)
-     # Copy file and keep the executable bit.
-     shutil.copyfile(src, dest)
-+<<<<<<< .our
-     add_exec_bit(dest)
-+=======
-+    os.chmod(dest, os.stat(dest).st_mode | stat.S_IEXEC)
-+>>>>>>> .their
- 
-     dist_name = get_zip_name(binary, version)
-     zip_file = os.path.join(SOURCE_ROOT, 'dist', dist_name)
-changed in both
-  base   100644 76f39fc26973e01145f7758785778075ddbaa648 script/lib/dbus_mock.py
-  our    100644 9b9c8029cb75a9d84c632d04f234c2020542ca68 script/lib/dbus_mock.py
-  their  100644 00b1fd98d7837cfef60460f9d456a5cb8340761c script/lib/dbus_mock.py
-@@ -4,21 +4,29 @@
- import atexit
- import os
- import sys
-+<<<<<<< .our
-+=======
-+
-+>>>>>>> .their
- 
- 
- def stop():
-     DBusTestCase.stop_dbus(DBusTestCase.system_bus_pid)
-     DBusTestCase.stop_dbus(DBusTestCase.session_bus_pid)
-+<<<<<<< .our
- 
- def start():
-     dbusmock_log = sys.stdout if is_verbose_mode() else open(os.devnull, 'w')
- 
-     DBusTestCase.start_system_bus()
-     DBusTestCase.spawn_server_template('logind', None, dbusmock_log)
-+=======
-+>>>>>>> .their
- 
-     DBusTestCase.start_session_bus()
-     DBusTestCase.spawn_server_template('notification_daemon', None, dbusmock_log)
- 
-+<<<<<<< .our
- if __name__ == '__main__':
-     import subprocess
-     start()
-@@ -26,3 +34,14 @@
-         subprocess.check_call(sys.argv[1:])
-     finally:
-         stop()
-+=======
-+atexit.register(cleanup)
-+
-+dbusmock_log = sys.stdout if is_verbose_mode() else open(os.devnull, 'w')
-+
-+DBusTestCase.start_system_bus()
-+DBusTestCase.spawn_server_template('logind', None, dbusmock_log)
-+
-+DBusTestCase.start_session_bus()
-+DBusTestCase.spawn_server_template('notification_daemon', None, dbusmock_log)
-+>>>>>>> .their
-changed in both
-  base   100755 69882928765a56f50702a371af322710ef3ccf22 script/prepare-release.js
-  our    100755 72a28b719bf1ff7770692caef86c76746c4d8edf script/prepare-release.js
-  their  100755 8021fa331da3e8afd8810b8bb4a87eb39e859e75 script/prepare-release.js
-@@ -5,6 +5,10 @@
- const args = require('minimist')(process.argv.slice(2), {
-   boolean: ['automaticRelease', 'notesOnly', 'stable']
- })
-+<<<<<<< .our
-+=======
-+const assert = require('assert')
-+>>>>>>> .their
- const ciReleaseBuild = require('./ci-release-build')
- const { execSync } = require('child_process')
- const fail = '\u2717'.red
-@@ -21,7 +25,11 @@
- // via conventional-recommended-bump
- 
- if (!versionType && !args.notesOnly) {
-+<<<<<<< .our
-   console.log(`Usage: prepare-release versionType [stable | beta | nightly]` +
-+=======
-+  console.log(`Usage: prepare-release versionType [major | minor | patch | beta]` +
-+>>>>>>> .their
-      ` (--stable) (--notesOnly) (--automaticRelease) (--branch)`)
-   process.exit(1)
- }
-@@ -222,7 +230,11 @@
- }
- 
- async function verifyNewVersion () {
-+<<<<<<< .our
-   let newVersion = await getNewVersion(true)
-+=======
-+  let newVersion = getNewVersion(true)
-+>>>>>>> .their
-   let response
-   if (args.automaticRelease) {
-     response = 'y'
-@@ -258,6 +270,7 @@
- }
- 
- async function prepareRelease (isBeta, notesOnly) {
-+<<<<<<< .our
-   if (args.dryRun) {
-     let newVersion = await getNewVersion(true)
-     console.log(newVersion)
-@@ -278,6 +291,27 @@
-         process.exit(1)
-       }
-     }
-+=======
-+  if (args.automaticRelease && (pkg.version.indexOf('beta') === -1 ||
-+      versionType !== 'beta')) {
-+    console.log(`${fail} Automatic release is only supported for beta releases`)
-+    process.exit(1)
-+  }
-+  let currentBranch
-+  if (args.branch) {
-+    currentBranch = args.branch
-+  } else {
-+    currentBranch = await getCurrentBranch(gitDir)
-+  }
-+  if (notesOnly) {
-+    let releaseNotes = await getReleaseNotes(currentBranch)
-+    console.log(`Draft release notes are: \n${releaseNotes}`)
-+  } else {
-+    await verifyNewVersion()
-+    await createRelease(currentBranch, isBeta)
-+    await pushRelease(currentBranch)
-+    await runReleaseBuilds(currentBranch)
-+>>>>>>> .their
-   }
- }
- 
-changed in both
-  base   100755 9863ef912cd5a940428e9ac22e1993494b2b1828 script/release.js
-  our    100755 84e00ad4f309201f151c3f8fcbaf9ee536c9b6cb script/release.js
-  their  100755 5858caf215a38e09d98c342bd74252b3dbd7ee71 script/release.js
-@@ -95,6 +95,10 @@
-     `electron-${version}-linux-armv7l.zip`,
-     `electron-${version}-linux-ia32-symbols.zip`,
-     `electron-${version}-linux-ia32.zip`,
-+<<<<<<< .our
-+=======
-+//    `electron-${version}-linux-mips64el.zip`,
-+>>>>>>> .their
-     `electron-${version}-linux-x64-symbols.zip`,
-     `electron-${version}-linux-x64.zip`,
-     `electron-${version}-mas-x64-dsym.zip`,
-@@ -112,6 +116,10 @@
-     `ffmpeg-${version}-linux-arm64.zip`,
-     `ffmpeg-${version}-linux-armv7l.zip`,
-     `ffmpeg-${version}-linux-ia32.zip`,
-+<<<<<<< .our
-+=======
-+//    `ffmpeg-${version}-linux-mips64el.zip`,
-+>>>>>>> .their
-     `ffmpeg-${version}-linux-x64.zip`,
-     `ffmpeg-${version}-mas-x64.zip`,
-     `ffmpeg-${version}-win32-ia32.zip`,
-@@ -180,7 +188,15 @@
- function uploadIndexJson () {
-   console.log('Uploading index.json to S3.')
-   let scriptPath = path.join(__dirname, 'upload-index-json.py')
-+<<<<<<< .our
-   runScript(scriptPath, [pkgVersion])
-+=======
-+  let scriptArgs = []
-+  if (args.automaticRelease) {
-+    scriptArgs.push('-R')
-+  }
-+  runScript(scriptPath, scriptArgs)
-+>>>>>>> .their
-   console.log(`${pass} Done uploading index.json to S3.`)
- }
- 
-changed in both
-  base   100755 1f90ed795fcc3e739061cf4ae5c8ab9ea95a1236 script/test.py
-  our    100755 46cada435e1bd6ecaa2111cdf29e5aeb834b227e script/test.py
-  their  100755 cb17102557dca975208140b479168906100cfd74 script/test.py
-changed in both
-  base   100755 a35eb2f5b90272c8369bcfd511f976a4f64fa57f script/update-clang.sh
-  our    100755 0c7ab60533381e33152b8735aaccf41d5f0d6676 script/update-clang.sh
-  their  100755 6e4cf08216616a4b6a2ee896bba47b1ba5d469b5 script/update-clang.sh
-changed in both
-  base   100755 f5e5b3c7a6adcaf7005ad9242c1664ad2f243d1f script/upload-index-json.py
-  our    100755 55d0675d0707d34c806847f3a64aa77f20a4830d script/upload-index-json.py
-  their  100755 479e46bb811695482f5ea62060e4bef02af505f1 script/upload-index-json.py
-@@ -8,7 +8,6 @@
- from lib.util import s3put, scoped_cwd, safe_mkdir
- 
- SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
--OUT_DIR     = os.path.join(SOURCE_ROOT, 'out', 'D')
- 
- BASE_URL = 'https://electron-metadumper.herokuapp.com/?version='
- 
-@@ -35,6 +34,7 @@
-     raise Exception("Please set META_DUMPER_AUTH_HEADER")
-   # Upload the index.json.
-   with scoped_cwd(SOURCE_ROOT):
-+<<<<<<< .our
-     safe_mkdir(OUT_DIR)
-     index_json = os.path.relpath(os.path.join(OUT_DIR, 'index.json'))
- 
-@@ -42,9 +42,27 @@
- 
-     with open(index_json, "w") as f:
-       f.write(new_content)
-+=======
-+    if len(sys.argv) == 2 and sys.argv[1] == '-R':
-+      config = 'R'
-+    else:
-+      config = 'D'
-+    out_dir = os.path.join(SOURCE_ROOT, 'out', config)
-+    if sys.platform == 'darwin':
-+      electron = os.path.join(out_dir, '{0}.app'.format(PRODUCT_NAME),
-+                                'Contents', 'MacOS', PRODUCT_NAME)
-+    elif sys.platform == 'win32':
-+      electron = os.path.join(out_dir, '{0}.exe'.format(PROJECT_NAME))
-+    else:
-+      electron = os.path.join(out_dir, PROJECT_NAME)
-+    index_json = os.path.relpath(os.path.join(out_dir, 'index.json'))
-+    execute([electron,
-+             os.path.join('tools', 'dump-version-info.js'),
-+             index_json])
-+>>>>>>> .their
- 
-     bucket, access_key, secret_key = s3_config()
--    s3put(bucket, access_key, secret_key, OUT_DIR, 'atom-shell/dist',
-+    s3put(bucket, access_key, secret_key, out_dir, 'atom-shell/dist',
-           [index_json])
- 
- 
-changed in both
-  base   100755 4da630433812b51ff0ebbdf89f68c71d90ab8046 script/upload.py
-  our    100755 2d9eaa201265971ca01acaea6e84a440e5db0532 script/upload.py
-  their  100755 67dca0003f0cdf067777abe10ab6782451243c9a script/upload.py
-@@ -76,6 +76,7 @@
-   upload_electron(release, os.path.join(DIST_DIR, ffmpeg), args)
- 
-   chromedriver = get_zip_name('chromedriver', ELECTRON_VERSION)
-+<<<<<<< .our
-   upload_electron(release, os.path.join(DIST_DIR, chromedriver), args)
-   mksnapshot = get_zip_name('mksnapshot', ELECTRON_VERSION)
-   upload_electron(release, os.path.join(DIST_DIR, mksnapshot), args)
-@@ -85,6 +86,20 @@
-     mksnapshot = get_zip_name('mksnapshot', ELECTRON_VERSION, 'x64')
-     upload_electron(release, os.path.join(DIST_DIR, mksnapshot), args)
- 
-+=======
-+  upload_electron(github, release, os.path.join(DIST_DIR, chromedriver),
-+                  args.upload_to_s3)
-+  mksnapshot = get_zip_name('mksnapshot', ELECTRON_VERSION)
-+  upload_electron(github, release, os.path.join(DIST_DIR, mksnapshot),
-+                args.upload_to_s3)
-+
-+  if get_target_arch().startswith('arm'):
-+    # Upload the x64 binary for arm/arm64 mksnapshot
-+    mksnapshot = get_zip_name('mksnapshot', ELECTRON_VERSION, 'x64')
-+    upload_electron(github, release, os.path.join(DIST_DIR, mksnapshot),
-+                    args.upload_to_s3)
-+
-+>>>>>>> .their
-   if not tag_exists and not args.upload_to_s3:
-     # Upload symbols to symbol server.
-     run_python_script('upload-symbols.py')
-changed in both
-  base   100644 0eda951b15d6fff609b6612589e222adb4f0720e spec/api-app-spec.js
-  our    100644 d224eda2989332c18d655cef05a8bacc2eb6d4b8 spec/api-app-spec.js
-  their  100644 5c2e0a0c7e6184e780b7ec031f9788f1f54eaca9 spec/api-app-spec.js
-@@ -9,7 +9,10 @@
- const {ipcRenderer, remote} = require('electron')
- const {closeWindow} = require('./window-helpers')
- 
-+<<<<<<< .our
- const {expect} = chai
-+=======
-+>>>>>>> .their
- const {app, BrowserWindow, Menu, ipcMain} = remote
- 
- const isCI = remote.getGlobal('isCi')
-@@ -186,11 +189,19 @@
- 
-       // Singleton will send us greeting data to let us know it's running.
-       // After that, ask it to exit gracefully and confirm that it does.
-+<<<<<<< .our
-       appProcess.stdout.on('data', data => appProcess.kill())
-       appProcess.on('exit', (code, sig) => {
-         const message = `code:\n${code}\nsig:\n${sig}`
-         expect(code).to.equal(0, message)
-         expect(sig).to.be.null(message)
-+=======
-+      appProcess.stdout.on('data', (data) => appProcess.kill())
-+      appProcess.on('exit', (code, sig) => {
-+        let message = ['code:', code, 'sig:', sig].join('\n')
-+        assert.equal(code, 0, message)
-+        assert.equal(sig, null, message)
-+>>>>>>> .their
-         done()
-       })
-     })
-@@ -948,4 +959,18 @@
-       return expect(app.whenReady()).to.be.eventually.fulfilled
-     })
-   })
-+
-+  describe('dock.setMenu', () => {
-+    before(function () {
-+      if (process.platform !== 'darwin') {
-+        this.skip()
-+      }
-+    })
-+
-+    it('keeps references to the menu', () => {
-+      app.dock.setMenu(new Menu())
-+      const v8Util = process.atomBinding('v8_util')
-+      v8Util.requestGarbageCollectionForTesting()
-+    })
-+  })
- })
-changed in both
-  base   100644 ab96021ebf4c4360fa581b5a695249456a9afeda spec/api-browser-view-spec.js
-  our    100644 968912a4abf3d759a1363e2420d2c21b7923dbd6 spec/api-browser-view-spec.js
-  their  100644 df239a8914527a2d62f652b878c97a7791f63a9d spec/api-browser-view-spec.js
-@@ -44,9 +44,15 @@
-   describe('BrowserView.isDestroyed()', () => {
-     it('returns correct value', () => {
-       view = new BrowserView()
-+<<<<<<< .our
-       expect(view.isDestroyed()).to.be.false()
-       view.destroy()
-       expect(view.isDestroyed()).to.be.true()
-+=======
-+      assert.ok(!view.isDestroyed())
-+      view.destroy()
-+      assert.ok(view.isDestroyed())
-+>>>>>>> .their
-     })
-   })
- 
-changed in both
-  base   100644 3033eb6a1f6cca3cf4874a54dd217ec62d2d82cd spec/api-browser-window-spec.js
-  our    100644 f4cba12ec19d224bc46fca898db42a99baf4972e spec/api-browser-window-spec.js
-  their  100644 4807094095a591ca716d520aef51a25af6ff9687 spec/api-browser-window-spec.js
-@@ -409,12 +409,34 @@
-     })
-   })
- 
-+<<<<<<< .our
-   // TODO(alexeykuzmin): [Ch66] Enable the test. Passes locally.
-   xdescribe('BrowserWindow.getFocusedWindow()', (done) => {
-+=======
-+  describe('BrowserWindow.getFocusedWindow()', (done) => {
-+>>>>>>> .their
-     it('returns the opener window when dev tools window is focused', (done) => {
-       w.show()
-       w.webContents.once('devtools-focused', () => {
-         assert.deepEqual(BrowserWindow.getFocusedWindow(), w)
-+<<<<<<< .our
-+=======
-+        done()
-+      })
-+      w.webContents.openDevTools({mode: 'undocked'})
-+    })
-+  })
-+
-+  describe('BrowserWindow.capturePage(rect, callback)', () => {
-+    it('calls the callback with a Buffer', (done) => {
-+      w.capturePage({
-+        x: 0,
-+        y: 0,
-+        width: 100,
-+        height: 100
-+      }, (image) => {
-+        assert.equal(image.isEmpty(), true)
-+>>>>>>> .their
-         done()
-       })
-       w.webContents.openDevTools({mode: 'undocked'})
-@@ -453,6 +475,29 @@
-       // Values can be 0,2,3,4, or 6. We want 6, which is RGB + Alpha
-       expect(imgBuffer[25]).to.equal(6)
-     })
-+
-+    it('preserves transparency', (done) => {
-+      w.close()
-+      const width = 400
-+      const height = 400
-+      w = new BrowserWindow({
-+        show: false,
-+        width: width,
-+        height: height,
-+        transparent: true
-+      })
-+      w.loadURL('data:text/html,<html><body background-color: rgba(255,255,255,0)></body></html>')
-+      w.once('ready-to-show', () => {
-+        w.show()
-+        w.capturePage((image) => {
-+          let imgBuffer = image.toPNG()
-+          // Check 25th byte in the PNG
-+          // Values can be 0,2,3,4, or 6. We want 6, which is RGB + Alpha
-+          assert.equal(imgBuffer[25], 6)
-+          done()
-+        })
-+      })
-+    })
-   })
- 
-   describe('BrowserWindow.setSize(width, height)', () => {
-@@ -763,6 +808,7 @@
-         w.addTabbedWindow(w)
-       }, /AddTabbedWindow cannot be called by a window on itself./)
-     })
-+<<<<<<< .our
-   })
- 
-   describe('BrowserWindow.setWindowButtonVisibility()', () => {
-@@ -790,6 +836,8 @@
-         w.setWindowButtonVisibility(true)
-       }, /Not supported for this window/)
-     })
-+=======
-+>>>>>>> .their
-   })
- 
-   describe('BrowserWindow.setVibrancy(type)', () => {
-changed in both
-  base   100644 b4d55cd70b70b42d52a026ff7b4ff3c47d1671df spec/api-crash-reporter-spec.js
-  our    100644 dd31b91e1244785412b87db96bb141599e5ccb0f spec/api-crash-reporter-spec.js
-  their  100644 ffa3c0370595f32b0c7d476b82bea133d6a87000 spec/api-crash-reporter-spec.js
-@@ -266,6 +266,7 @@
-   describe('getLastCrashReport', () => {
-     it('correctly returns the most recent report', () => {
-       const reports = crashReporter.getUploadedReports()
-+<<<<<<< .our
-       expect(reports).to.be.an('array')
-       expect(reports).to.have.lengthOf.at.least(2,
-           'There are not enough reports for this test')
-@@ -275,16 +276,31 @@
- 
-       // Let's find the newest report.
-       const {report: newestReport} = reports.reduce((acc, cur) => {
-+=======
-+      const lastReport = crashReporter.getLastCrashReport()
-+
-+      // Let's find the newest report
-+      const newestReport = reports.reduce((acc, cur) => {
-+>>>>>>> .their
-         const timestamp = new Date(cur.date).getTime()
-         return (timestamp > acc.timestamp)
-           ? { report: cur, timestamp: timestamp }
-           : acc
-+<<<<<<< .our
-       }, { timestamp: -Infinity })
-       assert(newestReport, 'Hey!')
- 
-       expect(lastReport.date.getTime()).to.be.equal(
-           newestReport.date.getTime(),
-           'Last report is not the newest.')
-+=======
-+      }, { timestamp: 0 })
-+
-+      assert(reports.length > 1, 'has more than 1 report')
-+      assert(lastReport != null, 'found a last report')
-+      assert(lastReport.date.toString() === newestReport.report.date.toString(),
-+        'last report is correct')
-+>>>>>>> .their
-     })
-   })
- 
-changed in both
-  base   100644 667f098bc4b9974a142435e7d3ddb762ac0f54a2 spec/api-menu-spec.js
-  our    100644 ed2749700c6c8bf299f507d52606c1ae3f597e5c spec/api-menu-spec.js
-  their  100644 3efb6ed8745843bb7e221fe25b3c75761a085759 spec/api-menu-spec.js
-@@ -649,6 +649,7 @@
-     })
- 
-     it('throws an error if options is not an object', () => {
-+<<<<<<< .our
-       expect(() => {
-         menu.popup('this is a string, not an object')
-       }).to.throw(/Options must be an object/)
-@@ -658,6 +659,11 @@
-       expect(() => {
-         menu.popup({})
-       }).to.not.throw()
-+=======
-+      assert.throws(() => {
-+        menu.popup()
-+      }, /Options must be an object/)
-+>>>>>>> .their
-     })
- 
-     it('should emit menu-will-show event', (done) => {
-added in both
-  our    100644 9ab56d88e50ae5891364cb271362e5ec0c0edd26 spec/api-notification-dbus-spec.js
-  their  100644 81c1b68f31d0c9490742d3bd4b4227abaaf72ca3 spec/api-notification-dbus-spec.js
-@@ -6,7 +6,11 @@
- //
- // See https://pypi.python.org/pypi/python-dbusmock to read about dbusmock.
- 
-+<<<<<<< .our
- const {expect} = require('chai')
-+=======
-+const assert = require('assert')
-+>>>>>>> .their
- const dbus = require('dbus-native')
- const Promise = require('bluebird')
- 
-@@ -27,12 +31,20 @@
-   before(async () => {
-     // init app
-     app.setName(appName)
-+<<<<<<< .our
-     app.setDesktopName(`${appName}.desktop`)
-+=======
-+    app.setDesktopName(appName + '.desktop')
-+>>>>>>> .their
-     // init dbus
-     const path = '/org/freedesktop/Notifications'
-     const iface = 'org.freedesktop.DBus.Mock'
-     const bus = dbus.sessionBus()
-+<<<<<<< .our
-     console.log(`session bus: ${process.env.DBUS_SESSION_BUS_ADDRESS}`)
-+=======
-+    console.log('session bus: ' + process.env.DBUS_SESSION_BUS_ADDRESS)
-+>>>>>>> .their
-     const service = bus.getService(serviceName)
-     const getInterface = Promise.promisify(service.getInterface, {context: service})
-     mock = await getInterface(path, iface)
-@@ -48,10 +60,17 @@
-     app.setVersion(realAppVersion)
-   })
- 
-+<<<<<<< .our
-   describe(`Notification module using ${serviceName}`, () => {
-     function onMethodCalled (done) {
-       function cb (name) {
-         console.log(`onMethodCalled: ${name}`)
-+=======
-+  describe('Notification module using ' + serviceName, () => {
-+    function onMethodCalled (done) {
-+      function cb (name) {
-+        console.log('onMethodCalled: ' + name)
-+>>>>>>> .their
-         if (name === 'Notify') {
-           mock.removeListener('MethodCalled', cb)
-           console.log('done')
-@@ -83,7 +102,11 @@
-       }
-     }
- 
-+<<<<<<< .our
-     before(done => {
-+=======
-+    before((done) => {
-+>>>>>>> .their
-       mock.on('MethodCalled', onMethodCalled(done))
-       // lazy load Notification after we listen to MethodCalled mock signal
-       Notification = require('electron').remote.Notification
-@@ -98,6 +121,7 @@
-       n.show()
-     })
- 
-+<<<<<<< .our
-     it(`should call ${serviceName} to show notifications`, async () => {
-       const calls = await getCalls()
-       expect(calls).to.be.an('array').of.lengthOf.at.least(1)
-@@ -108,6 +132,16 @@
- 
-       let args = unmarshalDBusNotifyArgs(lastCall[2])
-       expect(args).to.deep.equal({
-+=======
-+    it('should call ' + serviceName + ' to show notifications', async () => {
-+      const calls = await getCalls()
-+      assert(calls.length >= 1)
-+      let lastCall = calls[calls.length - 1]
-+      let methodName = lastCall[1]
-+      assert.equal(methodName, 'Notify')
-+      let args = unmarshalDBusNotifyArgs(lastCall[2])
-+      assert.deepEqual(args, {
-+>>>>>>> .their
-         app_name: appName,
-         replaces_id: 0,
-         app_icon: '',
-changed in both
-  base   100644 122170292838e951ade4989669c87a7531e89ba7 spec/api-web-contents-spec.js
-  our    100644 be02cb3f84001a541d64b11fe6eda50fc32e8afd spec/api-web-contents-spec.js
-  their  100644 cf9025228994b80526e5b4ccb715b4cefba56b92 spec/api-web-contents-spec.js
-@@ -122,6 +122,7 @@
-     })
-   })
- 
-+<<<<<<< .our
-   // Disabled because flaky. See #13969
-   xdescribe('isCurrentlyAudible() API', () => {
-     it('returns whether audio is playing', async () => {
-@@ -138,6 +139,8 @@
-     })
-   })
- 
-+=======
-+>>>>>>> .their
-   describe('getWebPreferences() API', () => {
-     it('should not crash when called for devTools webContents', (done) => {
-       w.webContents.openDevTools()
-changed in both
-  base   100644 2d388ca3b5744ea69d96ef71da6ade70e3dd001b spec/chromium-spec.js
-  our    100644 d90269769d269e4054d25cba4b6c4ac8a1929aa6 spec/chromium-spec.js
-  their  100644 25bef2e689e5ecbcd1485a042e84691db9400659 spec/chromium-spec.js
-@@ -319,8 +319,12 @@
-       b = window.open(windowUrl, '', 'nodeIntegration=no,show=no')
-     })
- 
-+<<<<<<< .our
-     // TODO(codebytere): re-enable this test
-     xit('disables node integration when it is disabled on the parent window for chrome devtools URLs', (done) => {
-+=======
-+    it('disables node integration when it is disabled on the parent window for chrome devtools URLs', (done) => {
-+>>>>>>> .their
-       let b
-       app.once('web-contents-created', (event, contents) => {
-         contents.once('did-finish-load', () => {
-changed in both
-  base   100644 07176e0097efa17e8f8aea5bb059a2739b8c3336 spec/fixtures/api/singleton/main.js
-  our    100644 3202a7a180d6d48c70706d5ef244652872b24bbc spec/fixtures/api/singleton/main.js
-  their  100644 cbf3da1117d91eb8df1b1e6363737a210b7eae78 spec/fixtures/api/singleton/main.js
-@@ -3,8 +3,11 @@
- app.once('ready', () => {
-   console.log('started')  // ping parent
- })
-+<<<<<<< .our
- 
- const gotTheLock = app.requestSingleInstanceLock()
-+=======
-+>>>>>>> .their
- 
- app.on('second-instance', () => {
-   setImmediate(() => app.exit(0))
-changed in both
-  base   100644 cfe840ca0a44c5766509b2865034d98e375da1a1 spec/modules-spec.js
-  our    100644 b996b8f4839bff2160bffb69e55263b16a4178d7 spec/modules-spec.js
-  their  100644 28f2602acff67b2da9accd0574d64d386e0795a7 spec/modules-spec.js
-changed in both
-  base   100644 e2d7d001eb49a9b01edcf9590ccdcb7ac8cc669c spec/node-spec.js
-  our    100644 9bb03494a56ffacec075c40bebde39a3b57ac734 spec/node-spec.js
-  their  100644 f053aa4dbadbbc216d98f3a985f29069bb2e4786 spec/node-spec.js
-changed in both
-  base   100644 feac23db7e06d3e49f8d5be7e9b3f08a204f262f spec/security-warnings-spec.js
-  our    100644 6315a9420e01b5db19596f0dd5731d47ce02acf6 spec/security-warnings-spec.js
-  their  100644 85fd0973b60cd6e27becbeef75415560b4061d24 spec/security-warnings-spec.js
-@@ -142,7 +142,11 @@
-       }
-     })
-     w.webContents.once('console-message', (e, level, message) => {
-+<<<<<<< .our
-       assert(message.includes('enableBlinkFeatures'), message)
-+=======
-+      assert(message.includes('blinkFeatures'), message)
-+>>>>>>> .their
-       done()
-     })
- 
-changed in both
-  base   100644 ca5cc28d4f9f860947454dfc964208dd13ba1434 spec/static/index.html
-  our    100644 fc1e153c0af2908cf7ee4c3ea4f05522de04f0f8 spec/static/index.html
-  their  100644 e9d779f061cd5bdf00667d0b7942c6c30de81092 spec/static/index.html
-@@ -51,7 +51,11 @@
-   if (!process.env.MOCHA_REPORTER) {
-     mocha.ui('bdd').reporter(isCi ? 'tap' : 'html')
-   }
--  mocha.timeout(isCi ? 30000 : 10000)
-+  if (process.env.MOCHA_TIMEOUT && process.env.MOCHA_TIMEOUT > 0) {
-+    mocha.timeout(process.env.MOCHA_TIMEOUT)
-+  } else {
-+    mocha.timeout(isCi ? 30000 : 10000)
-+  }
- 
-   const query = Mocha.utils.parseQuery(window.location.search || '')
-   if (query.grep) mocha.grep(query.grep)
-changed in both
-  base   100644 6580f18a1ad9e53ab3f2ae88cb7ea023bcf9579c toolchain.gypi
-  our    100644 697add78e42191741cee1b015cdcf4f801c570e7 toolchain.gypi
-  their  100644 8ed945a57c8875bae06cef74dc5d44afcc586d1d toolchain.gypi
-changed in both
-  base   160000 db1b314c019f6acbd4d1be273b63521cc6051d3c vendor/libchromiumcontent
-  our    160000 c85470a1c379b1c4bedb372c146521bc4be9b75d vendor/libchromiumcontent
-  their  160000 663e747b6cff96c117f408ea99114dab2d66e93c vendor/libchromiumcontent
-removed in local
-  base   160000 99d9e262eb36cb9dc8e83f61e026d2a7ad1e96ab vendor/native_mate
-  their  160000 894c96f39fd0faafece86842e4b45a05727c483c vendor/native_mate
diff --git a/app/test/fixtures/merge-parser/electron/merge-webview-in-sandbox-renderer-into-master.txt b/app/test/fixtures/merge-parser/electron/merge-webview-in-sandbox-renderer-into-master.txt
deleted file mode 100644
index 0021d292496..00000000000
--- a/app/test/fixtures/merge-parser/electron/merge-webview-in-sandbox-renderer-into-master.txt
+++ /dev/null
@@ -1,5363 +0,0 @@
-changed in both
-  base   100644 d4f98eab95b73b59018f170b09b9132d4d03477b .circleci/config.yml
-  our    100644 6d44d618aabcce04c60344f2274dec5b0c2a1f68 .circleci/config.yml
-  their  100644 f9a96dcc5d3bc33976be9d56083153599db6951c .circleci/config.yml
-@@ -19,6 +19,7 @@
-       fi
-     when: on_success
- 
-+<<<<<<< .our
- build-steps: &build-steps
-   steps:
-     - checkout
-@@ -92,6 +93,13 @@
-           fi
-     - run:
-         name: Test
-+=======
-+version: 2
-+jobs:
-+  electron-linux-arm:
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+>>>>>>> .their
-         environment:
-           MOCHA_FILE: junit/test-results.xml
-           MOCHA_REPORTER: mocha-junit-reporter
-@@ -110,6 +118,7 @@
-                 echo 'Skipping tests on GitHub release'
-               fi
-             fi
-+<<<<<<< .our
-           else
-            echo 'Skipping tests due to configuration'
-           fi
-@@ -117,6 +126,76 @@
-         name: Verify FFmpeg
-         command: |
-           if [ "$RUN_TESTS" == "true" ]; then
-+=======
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Optionally finish release
-+          shell: /bin/sh
-+          command: |
-+            if [ "$ELECTRON_RELEASE" == "1" ] && [ "$AUTO_RELEASE" == "true" ]; then
-+              echo 'Trying to finish release'
-+              node script/release.js --validateRelease --automaticRelease
-+              releaseExitCode=$?
-+              if [ $releaseExitCode -eq 0 ]; then
-+                echo 'Release is ready to go; releasing'
-+                node script/release.js--automaticRelease
-+                if [ $releaseExitCode -eq 0 ]; then
-+                  echo 'Release successful, now publishing to npm'
-+                  echo "//registry.npmjs.org/:_authToken=$ELECTRON_NPM_TOKEN" >> ~/.npmrc
-+                  npm run publish-to-npm
-+                  echo 'Release has been published to npm'
-+                fi
-+              else
-+                echo 'Release is not complete, skipping publish for now'
-+              fi
-+            else
-+              echo 'Skipping finishing release because build is not for release'
-+            fi
-+      - run:
-+          name: Zip out directory
-+          command: |
-+>>>>>>> .their
-             if [ "$ELECTRON_RELEASE" != "1" ]; then
-               echo 'Verifying ffmpeg on debug build'
-               script/verify-ffmpeg.py
-@@ -391,11 +470,105 @@
-     resource_class: 2xlarge
- 
-   electron-linux-arm64:
-+<<<<<<< .our
-     environment:
-       TARGET_ARCH: arm64
-     <<: *build-defaults
-     resource_class: 2xlarge
- 
-+=======
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: arm64
-+    resource_class: 2xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Optionally finish release
-+          shell: /bin/sh
-+          command: |
-+            if [ "$ELECTRON_RELEASE" == "1" ] && [ "$AUTO_RELEASE" == "true" ]; then
-+              echo 'Trying to finish release'
-+              node script/release.js --validateRelease --automaticRelease
-+              releaseExitCode=$?
-+              if [ $releaseExitCode -eq 0 ]; then
-+                echo 'Release is ready to go; releasing'
-+                node script/release.js--automaticRelease
-+                if [ $releaseExitCode -eq 0 ]; then
-+                  echo 'Release successful, now publishing to npm'
-+                  echo "//registry.npmjs.org/:_authToken=$ELECTRON_NPM_TOKEN" >> ~/.npmrc
-+                  npm run publish-to-npm
-+                  echo 'Release has been published to npm'
-+                fi
-+              else
-+                echo 'Release is not complete, skipping publish for now'
-+              fi
-+            else
-+              echo 'Skipping finishing release because build is not for release'
-+            fi
-+      - run:
-+          name: Zip out directory
-+          command: |
-+            if [ "$ELECTRON_RELEASE" != "1" ]; then
-+              zip -r electron.zip out/D
-+            fi
-+      - persist_to_workspace:
-+          root: /home/builduser
-+          paths:
-+            - project/out
-+      - store_artifacts:
-+          path: electron.zip
-+>>>>>>> .their
-   electron-linux-arm64-test:
-     machine: true
-     steps:
-@@ -430,6 +603,7 @@
-     resource_class: 2xlarge
- 
-   electron-linux-ia32:
-+<<<<<<< .our
-     environment:
-       TARGET_ARCH: ia32
-       DISPLAY: ':99.0'
-@@ -469,10 +643,317 @@
-       NIGHTLY_BUILD: true
-     <<: *build-defaults
-     resource_class: xlarge
-+=======
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: ia32
-+          DISPLAY: ':99.0'
-+    resource_class: xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Setup for headless testing
-+          command: sh -e /etc/init.d/xvfb start
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Optionally finish release
-+          shell: /bin/sh
-+          command: |
-+            if [ "$ELECTRON_RELEASE" == "1" ] && [ "$AUTO_RELEASE" == "true" ]; then
-+              echo 'Trying to finish release'
-+              node script/release.js --validateRelease --automaticRelease
-+              releaseExitCode=$?
-+              if [ $releaseExitCode -eq 0 ]; then
-+                echo 'Release is ready to go; releasing'
-+                node script/release.js--automaticRelease
-+                if [ $releaseExitCode -eq 0 ]; then
-+                  echo 'Release successful, now publishing to npm'
-+                  echo "//registry.npmjs.org/:_authToken=$ELECTRON_NPM_TOKEN" >> ~/.npmrc
-+                  npm run publish-to-npm
-+                  echo 'Release has been published to npm'
-+                fi
-+              else
-+                echo 'Release is not complete, skipping publish for now'
-+              fi
-+            else
-+              echo 'Skipping finishing release because build is not for release'
-+            fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                out/D/electron --version
-+                mkdir junit
-+                script/test.py --ci --rebuild_native_modules
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+  electron-linux-mips64el:
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: mips64el
-+    resource_class: xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Optionally finish release
-+          shell: /bin/sh
-+          command: |
-+            if [ "$ELECTRON_RELEASE" == "1" ] && [ "$AUTO_RELEASE" == "true" ]; then
-+              echo 'Trying to finish release'
-+              node script/release.js --validateRelease --automaticRelease
-+              releaseExitCode=$?
-+              if [ $releaseExitCode -eq 0 ]; then
-+                echo 'Release is ready to go; releasing'
-+                node script/release.js--automaticRelease
-+                if [ $releaseExitCode -eq 0 ]; then
-+                  echo 'Release successful, now publishing to npm'
-+                  echo "//registry.npmjs.org/:_authToken=$ELECTRON_NPM_TOKEN" >> ~/.npmrc
-+                  npm run publish-to-npm
-+                  echo 'Release has been published to npm'
-+                fi
-+              else
-+                echo 'Release is not complete, skipping publish for now'
-+              fi
-+            else
-+              echo 'Skipping finishing release because build is not for release'
-+            fi
-+
-+  electron-linux-x64:
-+    docker:
-+      - image: electronbuilds/electron:0.0.7
-+        environment:
-+          TARGET_ARCH: x64
-+          DISPLAY: ':99.0'
-+    resource_class: xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Setup for headless testing
-+          command: sh -e /etc/init.d/xvfb start
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Optionally finish release
-+          shell: /bin/sh
-+          command: |
-+            if [ "$ELECTRON_RELEASE" == "1" ] && [ "$AUTO_RELEASE" == "true" ]; then
-+              echo 'Trying to finish release'
-+              node script/release.js --validateRelease --automaticRelease
-+              releaseExitCode=$?
-+              if [ $releaseExitCode -eq 0 ]; then
-+                echo 'Release is ready to go; releasing'
-+                node script/release.js--automaticRelease
-+                if [ $releaseExitCode -eq 0 ]; then
-+                  echo 'Release successful, now publishing to npm'
-+                  echo "//registry.npmjs.org/:_authToken=$ELECTRON_NPM_TOKEN" >> ~/.npmrc
-+                  npm run publish-to-npm
-+                  echo 'Release has been published to npm'
-+                fi
-+              else
-+                echo 'Release is not complete, skipping publish for now'
-+              fi
-+            else
-+              echo 'Skipping finishing release because build is not for release'
-+            fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                mkdir junit
-+                script/test.py --ci --rebuild_native_modules
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+      - run:
-+          name: Generate Typescript Definitions
-+          command: npm run create-typescript-definitions
-+      - store_test_results:
-+          path: junit
-+      - store_artifacts:
-+          path: junit
-+      - store_artifacts:
-+          path: out/electron.d.ts
-+      - store_artifacts:
-+          path: out/electron-api.json
-+>>>>>>> .their
- 
-   electron-osx-x64:
-     environment:
-       TARGET_ARCH: x64
-+<<<<<<< .our
-       RUN_TESTS: true
-       INSTALL_MACOS_NODE: true
-     macos:
-@@ -488,11 +969,108 @@
-     macos:
-       xcode: "8.3.3"
-     <<: *build-steps
-+=======
-+    macos:
-+        xcode: "9.0"
-+    resource_class: xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Reclaim disk space
-+          command: |
-+            df -h
-+            sudo rm -rf /Library/Developer/CoreSimulator
-+            df -h
-+            sysctl -n hw.ncpu
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                mkdir junit
-+                script/test.py --ci --rebuild_native_modules
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+      - run:
-+          name: Generate Typescript Definitions
-+          command: npm run create-typescript-definitions
-+      - store_test_results:
-+          path: junit
-+      - store_artifacts:
-+          path: junit
-+      - store_artifacts:
-+          path: out/electron.d.ts
-+      - store_artifacts:
-+          path: out/electron-api.json
-+>>>>>>> .their
- 
-   electron-mas-x64:
-     environment:
-       TARGET_ARCH: x64
-       MAS_BUILD: 1
-+<<<<<<< .our
-       RUN_TESTS: true
-       INSTALL_MACOS_NODE: true
-     macos:
-@@ -668,6 +1246,102 @@
-       GN_EXTRA_ARGS: 'is_mas_build = true'
-     <<: *gn-mac-build-machine
-     <<: *gn-mac-build-steps
-+=======
-+    macos:
-+        xcode: "9.0"
-+    resource_class: xlarge
-+    steps:
-+      - checkout
-+      - run:
-+          name: Reclaim disk space
-+          command: |
-+            df -h
-+            sudo rm -rf /Library/Developer/CoreSimulator
-+            df -h
-+            sysctl -n hw.ncpu
-+      - run:
-+          name: Check for release
-+          command: |
-+            if [ -n "${RUN_RELEASE_BUILD}" ]; then
-+              echo 'release build triggered from api'
-+              echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV
-+            fi
-+      - run:
-+         name: Bootstrap
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Bootstrapping Electron for release build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH
-+           else
-+              echo 'Bootstrapping Electron for debug build'
-+              script/bootstrap.py --target_arch=$TARGET_ARCH --dev
-+           fi
-+      - run: npm run lint
-+      - run:
-+         name: Build
-+         command: |
-+           if [ "$ELECTRON_RELEASE" == "1" ]; then
-+              echo 'Building Electron for release'
-+              script/build.py -c R
-+           else
-+              echo 'Building Electron for debug'
-+              script/build.py -c D
-+           fi
-+      - run:
-+          name: Create distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ]; then
-+                echo 'Creating Electron release distribution'
-+                script/create-dist.py
-+             else
-+                echo 'Skipping create distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Upload distribution
-+          command: |
-+             if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then
-+                echo 'Uploading Electron release distribution to github releases'
-+                script/upload.py
-+             elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then
-+                echo 'Uploading Electron release distribution to s3'
-+                script/upload.py --upload_to_s3
-+             else
-+                echo 'Skipping upload distribution because build is not for release'
-+             fi
-+      - run:
-+          name: Test
-+          environment:
-+            MOCHA_FILE: junit/test-results.xml
-+            MOCHA_REPORTER: mocha-junit-reporter
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Testing Electron debug build'
-+                mkdir junit
-+                script/test.py --ci --rebuild_native_modules
-+             else
-+                echo 'Skipping testing on release build'
-+             fi
-+      - run:
-+          name: Verify FFmpeg
-+          command: |
-+             if [ "$ELECTRON_RELEASE" != "1" ]; then
-+                echo 'Verifying ffmpeg on debug build'
-+                script/verify-ffmpeg.py
-+             else
-+                echo 'Skipping verify ffmpeg on release build'
-+             fi
-+      - run:
-+          name: Generate Typescript Definitions
-+          command: npm run create-typescript-definitions
-+      - store_test_results:
-+          path: junit
-+      - store_artifacts:
-+          path: junit
-+      - store_artifacts:
-+          path: out/electron.d.ts
-+      - store_artifacts:
-+          path: out/electron-api.json
-+>>>>>>> .their
- 
- workflows:
-   version: 2
-@@ -695,6 +1369,7 @@
-   build-mas-x64:
-     jobs:
-       - electron-mas-x64
-+<<<<<<< .our
-   build-gn-linux:
-     jobs:
-       - electron-gn-linux-x64-debug-fyi
-@@ -745,3 +1420,5 @@
-       - electron-gn-linux-arm64-release-fyi
-       - electron-gn-mas-release-fyi
-       - electron-gn-osx-release-fyi
-+=======
-+>>>>>>> .their
-changed in both
-  base   100644 8632e8e30869d32176552cd218560f5016a24300 .gitignore
-  our    100644 f393b1cdcef87b41bb3ed47ebae59757fed3a780 .gitignore
-  their  100644 f82d92052e4f7ac936637ac2c163633e02588f12 .gitignore
-changed in both
-  base   100644 5d04da05397c4c74ce00d6d6c8969ce370adb32d CONTRIBUTING.md
-  our    100644 414f83db905db904728facf3b40e70e7b7973193 CONTRIBUTING.md
-  their  100644 0955f68c4f2b1097e770398cf51d3af811f53050 CONTRIBUTING.md
-changed in both
-  base   100644 4cfea0e70f9af56ba746347b4cae410970f3d900 Dockerfile
-  our    100644 74e5eeedea9bea87cd7a98ac2cb63f4376275a2a Dockerfile
-  their  100644 2d74e16915d2e89e1e1e7f3ffd259cc448e1b864 Dockerfile
-@@ -7,8 +7,13 @@
- RUN chmod a+rwx /home
- 
- # Install node.js
-+<<<<<<< .our
- RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
- RUN apt-get install -y nodejs
-+=======
-+RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
-+RUN apt-get update && apt-get install -y nodejs
-+>>>>>>> .their
- 
- # Install wget used by crash reporter
- RUN apt-get install -y wget
-changed in both
-  base   100644 271947c56e39b91fc23bf10579f61cab50b0f4dc Dockerfile.circleci
-  our    100644 d369c8c640161fc3ba65935297aec7dd27eb1e9f Dockerfile.circleci
-  their  100644 0cdb1e88c24f01a5acdfd8ef348126819f593454 Dockerfile.circleci
-@@ -3,8 +3,13 @@
- USER root
- 
- # Install node.js
-+<<<<<<< .our
- RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
- RUN apt-get install -y nodejs
-+=======
-+RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
-+RUN apt-get update && apt-get install -y nodejs
-+>>>>>>> .their
- 
- # Install wget used by crash reporter
- RUN apt-get install -y wget
-added in remote
-  their  100644 c6d558f7f3518ea2924fa9075ed38ab48d70d204 Jenkinsfile.arm64
-@@ -0,0 +1,36 @@
-+pipeline {
-+  agent {
-+    docker {
-+      image 'electronbuilds/arm64v8:0.0.2'
-+      args '--privileged'
-+    }
-+  }
-+  environment {
-+    TARGET_ARCH='arm64'
-+    DISPLAY=':99.0'
-+    MOCHA_TIMEOUT='60000'
-+  }
-+  stages {
-+    stage('Bootstrap') {
-+      steps {
-+        sh 'script/bootstrap.py -v --dev --target_arch=$TARGET_ARCH'
-+      }
-+    }
-+    stage('Build') {
-+      steps {
-+        sh 'script/build.py -c D --ninja-path /usr/local/ninja/ninja'
-+      }
-+    }
-+    stage('Test') {
-+      steps {
-+        sh '/etc/init.d/xvfb start'
-+        sh 'script/test.py --ci'
-+      }
-+    }
-+  }
-+  post {
-+    always {
-+      cleanWs()
-+    }
-+  }
-+}
-changed in both
-  base   100644 160dae7908236105f8534f9448f4111da1bcb014 README.md
-  our    100644 ec09364417b767ac59b2d970fee5e2ab2db2173b README.md
-  their  100644 a7b4fa6ed40a6449245cfdbdace8bb38945284d2 README.md
-changed in both
-  base   100644 9472d1cb9fd76beca4047bb24db024b9c6378aae atom/app/command_line_args.cc
-  our    100644 23e870cf4a32aecfc246a81edad46971b4456a55 atom/app/command_line_args.cc
-  their  100644 be171457726a09cde9eb7a090ba1e2a67f4cb9cb atom/app/command_line_args.cc
-@@ -31,6 +31,1376 @@
-   return false;
- }
- 
-+<<<<<<< .our
-+=======
-+/*
-+ * The blacklist of command line switches, must be sorted.
-+ * Update the list by pasting the following command into bash
-+ * in libchromiumcontent/src/:
-+
-+   (find ./ \( -name "*switches.cc" -o -name "*switch_list.h" \) | \
-+      xargs grep -P --no-filename '"\S+"[);]$' | \
-+      perl -pe 's|^.*?"(\S+)"[);]$|  "$1",|'; \
-+      echo '  "inspect",'; \
-+      echo '  "inspect-brk",') | \
-+    LANG="C" sort | \
-+    uniq > blacklist-switches.txt
-+
-+ */
-+const char* kBlacklist[] = {
-+  "/prefetch:1",
-+  "/prefetch:2",
-+  "/prefetch:3",
-+  "/prefetch:4",
-+  "/prefetch:5",
-+  "/prefetch:6",
-+  "/prefetch:8",
-+  "0",
-+  "?",
-+  "BlacklistOnly",
-+  "ChromeOSMemoryPressureHandling",
-+  "Disabled",
-+  "OnlineCheckOnly",
-+  "SafeSites",
-+  "accept-resource-provider",
-+  "account-consistency",
-+  "adaboost",
-+  "aec-refined-adaptive-filter",
-+  "agc-startup-min-volume",
-+  "aggressive",
-+  "aggressive-cache-discard",
-+  "aggressive-tab-discard",
-+  "all-toolchains",
-+  "allarticles",
-+  "allow-cross-origin-auth-prompt",
-+  "allow-external-pages",
-+  "allow-failed-policy-fetch-for-test",
-+  "allow-file-access-from-files",
-+  "allow-hidden-media-playback",
-+  "allow-http-background-page",
-+  "allow-http-screen-capture",
-+  "allow-insecure-localhost",
-+  "allow-legacy-extension-manifests",
-+  "allow-loopback-in-peer-connection",
-+  "allow-nacl-crxfs-api",
-+  "allow-nacl-file-handle-api",
-+  "allow-nacl-socket-api",
-+  "allow-no-sandbox-job",
-+  "allow-outdated-plugins",
-+  "allow-ra-in-dev-mode",
-+  "allow-running-insecure-content",
-+  "allow-sandbox-debugging",
-+  "allow-silent-push",
-+  "alsa-check-close-timeout",
-+  "alsa-enable-upsampling",
-+  "alsa-fixed-output-sample-rate",
-+  "alsa-input-device",
-+  "alsa-mute-device-name",
-+  "alsa-mute-element-name",
-+  "alsa-output-avail-min",
-+  "alsa-output-buffer-size",
-+  "alsa-output-device",
-+  "alsa-output-period-size",
-+  "alsa-output-start-threshold",
-+  "alsa-volume-device-name",
-+  "alsa-volume-element-name",
-+  "also-emit-success-logs",
-+  "alternative",
-+  "always-authorize-plugins",
-+  "always-on",
-+  "always-use-complex-text",
-+  "alwaystrue",
-+  "android-fonts-path",
-+  "android-stderr-port",
-+  "android-stdin-port",
-+  "android-stdout-port",
-+  "angle",
-+  "app",
-+  "app-auto-launched",
-+  "app-id",
-+  "app-mode-auth-code",
-+  "app-mode-oauth-token",
-+  "app-mode-oem-manifest",
-+  "app-shell-allow-roaming",
-+  "app-shell-host-window-size",
-+  "app-shell-preferred-network",
-+  "app-shell-refresh-token",
-+  "app-shell-user",
-+  "apple",
-+  "apps-gallery-download-url",
-+  "apps-gallery-update-url",
-+  "apps-gallery-url",
-+  "apps-keep-chrome-alive-in-tests",
-+  "arc-availability",
-+  "arc-available",
-+  "arc-start-mode",
-+  "arc-transition-migration-required",
-+  "args",
-+  "artifacts-dir",
-+  "ash-animate-from-boot-splash-screen",
-+  "ash-constrain-pointer-to-root",
-+  "ash-copy-host-background-at-boot",
-+  "ash-debug-shortcuts",
-+  "ash-dev-shortcuts",
-+  "ash-disable-smooth-screen-rotation",
-+  "ash-disable-touch-exploration-mode",
-+  "ash-enable-magnifier-key-scroller",
-+  "ash-enable-mirrored-screen",
-+  "ash-enable-night-light",
-+  "ash-enable-palette-on-all-displays",
-+  "ash-enable-scale-settings-tray",
-+  "ash-enable-software-mirroring",
-+  "ash-enable-unified-desktop",
-+  "ash-estimated-presentation-delay",
-+  "ash-hide-notifications-for-factory",
-+  "ash-host-window-bounds",
-+  "ash-shelf-color",
-+  "ash-shelf-color-scheme",
-+  "ash-touch-hud",
-+  "ash-webui-init",
-+  "attestation-server",
-+  "audio-buffer-size",
-+  "audio-output-channels",
-+  "aura-legacy-power-button",
-+  "auth-ext-path",
-+  "auth-server-whitelist",
-+  "auth-spnego-account-type",
-+  "auto",
-+  "auto-open-devtools-for-tabs",
-+  "auto-select-desktop-capture-source",
-+  "autoplay-policy",
-+  "blink-settings",
-+  "bootstrap",
-+  "browser-subprocess-path",
-+  "browser-test",
-+  "bwsi",
-+  "bypass-app-banner-engagement-checks",
-+  "canvas-msaa-sample-count",
-+  "cast-initial-screen-height",
-+  "cast-initial-screen-width",
-+  "cc-layer-tree-test-long-timeout",
-+  "cc-layer-tree-test-no-timeout",
-+  "cc-rebaseline-pixeltests",
-+  "cellular-first",
-+  "cellular-only",
-+  "check-for-update-interval",
-+  "check-layout-test-sys-deps",
-+  "child-wallpaper-large",
-+  "child-wallpaper-small",
-+  "chrome-home-swipe-logic",
-+  "cipher-suite-blacklist",
-+  "clamshell",
-+  "class",
-+  "clear-token-service",
-+  "cloud-print-file",
-+  "cloud-print-file-type",
-+  "cloud-print-job-title",
-+  "cloud-print-print-ticket",
-+  "cloud-print-setup-proxy",
-+  "cloud-print-url",
-+  "cloud-print-xmpp-endpoint",
-+  "color",
-+  "compensate-for-unstable-pinch-zoom",
-+  "compile-shader-always-succeeds",
-+  "component-updater",
-+  "connectivity-check-url",
-+  "conservative",
-+  "content-image-texture-target",
-+  "content-shell-host-window-size",
-+  "controller",
-+  "crash-dumps-dir",
-+  "crash-on-failure",
-+  "crash-on-hang-threads",
-+  "crash-server-url",
-+  "crash-test",
-+  "crashpad-handler",
-+  "create-browser-on-startup-for-tests",
-+  "create-default-gl-context",
-+  "cros-gaia-api-v1",
-+  "cros-region",
-+  "cros-regions-mode",
-+  "crosh-command",
-+  "cryptauth-http-host",
-+  "custom-devtools-frontend",
-+  "custom-launcher-page",
-+  "custom_summary",
-+  "d3d11",
-+  "d3d9",
-+  "daemon",
-+  "dark_muted",
-+  "dark_vibrant",
-+  "data-path",
-+  "data-reduction-proxy-config-url",
-+  "data-reduction-proxy-experiment",
-+  "data-reduction-proxy-http-proxies",
-+  "data-reduction-proxy-lo-fi",
-+  "data-reduction-proxy-pingback-url",
-+  "data-reduction-proxy-secure-proxy-check-url",
-+  "data-reduction-proxy-server-experiments-disabled",
-+  "dbus-stub",
-+  "debug-devtools",
-+  "debug-enable-frame-toggle",
-+  "debug-packed-apps",
-+  "debug-print",
-+  "default",
-+  "default-background-color",
-+  "default-tile-height",
-+  "default-tile-width",
-+  "default-wallpaper-is-oem",
-+  "default-wallpaper-large",
-+  "default-wallpaper-small",
-+  "delay-reload-stop-button-change",
-+  "demo",
-+  "derelict-detection-timeout",
-+  "derelict-idle-timeout",
-+  "desktop",
-+  "desktop-window-1080p",
-+  "deterministic-fetch",
-+  "device-management-url",
-+  "device-scale-factor",
-+  "devtools-flags",
-+  "diagnostics",
-+  "diagnostics-format",
-+  "diagnostics-recovery",
-+  "dice",
-+  "disable",
-+  "disable-2d-canvas-clip-aa",
-+  "disable-2d-canvas-image-chromium",
-+  "disable-3d-apis",
-+  "disable-accelerated-2d-canvas",
-+  "disable-accelerated-jpeg-decoding",
-+  "disable-accelerated-mjpeg-decode",
-+  "disable-accelerated-video-decode",
-+  "disable-app-info-dialog-mac",
-+  "disable-app-list-dismiss-on-blur",
-+  "disable-app-window-cycling",
-+  "disable-appcontainer",
-+  "disable-arc-data-wipe",
-+  "disable-arc-opt-in-verification",
-+  "disable-audio-support-for-desktop-share",
-+  "disable-avfoundation-overlays",
-+  "disable-background-networking",
-+  "disable-background-timer-throttling",
-+  "disable-backgrounding-occluded-windows",
-+  "disable-backing-store-limit",
-+  "disable-blink-features",
-+  "disable-bookmark-reordering",
-+  "disable-boot-animation",
-+  "disable-breakpad",
-+  "disable-browser-task-scheduler",
-+  "disable-bundled-ppapi-flash",
-+  "disable-canvas-aa",
-+  "disable-captive-portal-bypass-proxy",
-+  "disable-cast-streaming-hw-encoding",
-+  "disable-checker-imaging",
-+  "disable-clear-browsing-data-counters",
-+  "disable-client-side-phishing-detection",
-+  "disable-cloud-import",
-+  "disable-component-cloud-policy",
-+  "disable-component-extensions-with-background-pages",
-+  "disable-component-update",
-+  "disable-composited-antialiasing",
-+  "disable-contextual-search",
-+  "disable-d3d11",
-+  "disable-databases",
-+  "disable-datasaver-prompt",
-+  "disable-default-apps",
-+  "disable-demo-mode",
-+  "disable-device-disabling",
-+  "disable-device-discovery-notifications",
-+  "disable-dinosaur-easter-egg",
-+  "disable-direct-composition",
-+  "disable-direct-composition-layers",
-+  "disable-directwrite-for-ui",
-+  "disable-display-color-calibration",
-+  "disable-display-list-2d-canvas",
-+  "disable-distance-field-text",
-+  "disable-domain-blocking-for-3d-apis",
-+  "disable-domain-reliability",
-+  "disable-drive-search-in-app-launcher",
-+  "disable-dwm-composition",
-+  "disable-encryption-migration",
-+  "disable-eol-notification",
-+  "disable-es3-apis",
-+  "disable-es3-gl-context",
-+  "disable-extensions",
-+  "disable-extensions-except",
-+  "disable-extensions-file-access-check",
-+  "disable-extensions-http-throttling",
-+  "disable-fast-web-scroll-view-insets",
-+  "disable-features",
-+  "disable-field-trial-config",
-+  "disable-file-manager-touch-mode",
-+  "disable-file-system",
-+  "disable-flash-3d",
-+  "disable-flash-stage3d",
-+  "disable-fullscreen-low-power-mode",
-+  "disable-fullscreen-tab-detaching",
-+  "disable-gaia-services",
-+  "disable-gesture-editing",
-+  "disable-gesture-requirement-for-presentation",
-+  "disable-gesture-typing",
-+  "disable-gl-drawing-for-tests",
-+  "disable-gl-error-limit",
-+  "disable-gl-extensions",
-+  "disable-glsl-translator",
-+  "disable-gpu",
-+  "disable-gpu-compositing",
-+  "disable-gpu-driver-bug-workarounds",
-+  "disable-gpu-early-init",
-+  "disable-gpu-memory-buffer-compositor-resources",
-+  "disable-gpu-memory-buffer-video-frames",
-+  "disable-gpu-process-crash-limit",
-+  "disable-gpu-program-cache",
-+  "disable-gpu-rasterization",
-+  "disable-gpu-sandbox",
-+  "disable-gpu-shader-disk-cache",
-+  "disable-gpu-vsync",
-+  "disable-gpu-watchdog",
-+  "disable-hang-monitor",
-+  "disable-hid-detection-on-oobe",
-+  "disable-histogram-customizer",
-+  "disable-hosted-app-shim-creation",
-+  "disable-hosted-apps-in-windows",
-+  "disable-http2",
-+  "disable-in-process-stack-traces",
-+  "disable-infobars",
-+  "disable-input-ime-api",
-+  "disable-input-view",
-+  "disable-ios-password-generation",
-+  "disable-ios-password-suggestions",
-+  "disable-ios-physical-web",
-+  "disable-javascript-harmony-shipping",
-+  "disable-kill-after-bad-ipc",
-+  "disable-lcd-text",
-+  "disable-legacy-window",
-+  "disable-local-storage",
-+  "disable-lock-screen-apps",
-+  "disable-logging",
-+  "disable-logging-redirect",
-+  "disable-login-animations",
-+  "disable-login-screen-apps",
-+  "disable-low-end-device-mode",
-+  "disable-low-latency-dxva",
-+  "disable-low-res-tiling",
-+  "disable-lru-snapshot-cache",
-+  "disable-mac-overlays",
-+  "disable-mac-views-native-app-windows",
-+  "disable-machine-cert-request",
-+  "disable-main-frame-before-activation",
-+  "disable-md-error-screen",
-+  "disable-md-oobe",
-+  "disable-media-session-api",
-+  "disable-media-suspend",
-+  "disable-merge-key-char-events",
-+  "disable-mojo-local-storage",
-+  "disable-mojo-renderer",
-+  "disable-mtp-write-support",
-+  "disable-multi-display-layout",
-+  "disable-namespace-sandbox",
-+  "disable-native-gpu-memory-buffers",
-+  "disable-network-portal-notification",
-+  "disable-new-channel-switcher-ui",
-+  "disable-new-korean-ime",
-+  "disable-new-virtual-keyboard-behavior",
-+  "disable-new-zip-unpacker",
-+  "disable-notifications",
-+  "disable-ntp-most-likely-favicons-from-server",
-+  "disable-ntp-popular-sites",
-+  "disable-nv12-dxgi-video",
-+  "disable-offer-store-unmasked-wallet-cards",
-+  "disable-offer-upload-credit-cards",
-+  "disable-office-editing-component-extension",
-+  "disable-offline-auto-reload",
-+  "disable-offline-auto-reload-visible-only",
-+  "disable-origin-trial-controlled-blink-features",
-+  "disable-overscroll-edge-effect",
-+  "disable-panel-fitting",
-+  "disable-partial-raster",
-+  "disable-password-generation",
-+  "disable-pepper-3d",
-+  "disable-pepper-3d-image-chromium",
-+  "disable-permission-action-reporting",
-+  "disable-permissions-api",
-+  "disable-physical-keyboard-autocorrect",
-+  "disable-pinch",
-+  "disable-pnacl-crash-throttling",
-+  "disable-popup-blocking",
-+  "disable-prefer-compositing-to-lcd-text",
-+  "disable-presentation-api",
-+  "disable-print-preview",
-+  "disable-prompt-on-repost",
-+  "disable-proximity-auth-bluetooth-low-energy-discovery",
-+  "disable-pull-to-refresh-effect",
-+  "disable-push-api-background-mode",
-+  "disable-quic",
-+  "disable-reading-from-canvas",
-+  "disable-remote-core-animation",
-+  "disable-remote-fonts",
-+  "disable-remote-playback-api",
-+  "disable-renderer-accessibility",
-+  "disable-renderer-backgrounding",
-+  "disable-renderer-priority-management",
-+  "disable-request-mobile-site",
-+  "disable-resize-lock",
-+  "disable-rgba-4444-textures",
-+  "disable-rollback-option",
-+  "disable-rtc-smoothness-algorithm",
-+  "disable-screen-orientation-lock",
-+  "disable-search-geolocation-disclosure",
-+  "disable-seccomp-filter-sandbox",
-+  "disable-settings-window",
-+  "disable-setuid-sandbox",
-+  "disable-shader-name-hashing",
-+  "disable-shared-workers",
-+  "disable-signin-promo",
-+  "disable-signin-scoped-device-id",
-+  "disable-single-click-autofill",
-+  "disable-skia-runtime-opts",
-+  "disable-slim-navigation-manager",
-+  "disable-slimming-paint-invalidation",
-+  "disable-smooth-scrolling",
-+  "disable-software-rasterizer",
-+  "disable-speech-api",
-+  "disable-suggestions-ui",
-+  "disable-sync",
-+  "disable-sync-app-list",
-+  "disable-sync-types",
-+  "disable-system-timezone-automatic-detection",
-+  "disable-tab-for-desktop-share",
-+  "disable-tab-strip-autoscroll-new-tabs",
-+  "disable-third-party-keyboard-workaround",
-+  "disable-threaded-animation",
-+  "disable-threaded-compositing",
-+  "disable-threaded-scrolling",
-+  "disable-touch-adjustment",
-+  "disable-touch-drag-drop",
-+  "disable-translate-new-ux",
-+  "disable-usb-keyboard-detect",
-+  "disable-v8-idle-tasks",
-+  "disable-vaapi-accelerated-video-encode",
-+  "disable-virtual-keyboard-overscroll",
-+  "disable-voice-input",
-+  "disable-volume-adjust-sound",
-+  "disable-wake-on-wifi",
-+  "disable-web-notification-custom-layouts",
-+  "disable-web-security",
-+  "disable-webgl",
-+  "disable-webgl-image-chromium",
-+  "disable-webrtc-encryption",
-+  "disable-webrtc-hw-decoding",
-+  "disable-webrtc-hw-encoding",
-+  "disable-win32k-lockdown",
-+  "disable-xss-auditor",
-+  "disable-zero-browsers-open-for-tests",
-+  "disable-zero-copy",
-+  "disable-zero-copy-dxgi-video",
-+  "disabled",
-+  "disabled-new-style-notification",
-+  "disallow-non-exact-resource-reuse",
-+  "disk-cache-dir",
-+  "disk-cache-size",
-+  "display",
-+  "dmg-device",
-+  "dns-log-details",
-+  "document-user-activation-required",
-+  "dom-automation",
-+  "dotfile",
-+  "draft",
-+  "draw-view-bounds-rects",
-+  "duck-flash",
-+  "dump-blink-runtime-call-stats",
-+  "dump-browser-histograms",
-+  "dump-dom",
-+  "eafe-path",
-+  "eafe-url",
-+  "easy-unlock-app-path",
-+  "edge-touch-filtering",
-+  "egl",
-+  "elevate",
-+  "embedded-extension-options",
-+  "emphasize-titles-in-omnibox-dropdown",
-+  "emulate-shader-precision",
-+  "enable-accelerated-2d-canvas",
-+  "enable-accelerated-vpx-decode",
-+  "enable-accessibility-tab-switcher",
-+  "enable-adaptive-selection-handle-orientation",
-+  "enable-aggressive-domstorage-flushing",
-+  "enable-android-wallpapers-app",
-+  "enable-app-info-dialog-mac",
-+  "enable-app-list",
-+  "enable-app-window-cycling",
-+  "enable-appcontainer",
-+  "enable-arc",
-+  "enable-arc-oobe-optin",
-+  "enable-audio-debug-recordings-from-extension",
-+  "enable-audio-focus",
-+  "enable-automation",
-+  "enable-benchmarking",
-+  "enable-ble-advertising-in-apps",
-+  "enable-blink-features",
-+  "enable-bookmark-reordering",
-+  "enable-bookmark-undo",
-+  "enable-browser-side-navigation",
-+  "enable-browser-task-scheduler",
-+  "enable-checker-imaging",
-+  "enable-chromevox-arc-support",
-+  "enable-clear-browsing-data-counters",
-+  "enable-cloud-print-proxy",
-+  "enable-cloud-print-xps",
-+  "enable-consumer-kiosk",
-+  "enable-contextual-search",
-+  "enable-crash-reporter",
-+  "enable-crash-reporter-for-testing",
-+  "enable-crx-hash-check",
-+  "enable-data-reduction-proxy-bypass-warning",
-+  "enable-data-reduction-proxy-force-pingback",
-+  "enable-data-reduction-proxy-lite-page",
-+  "enable-data-reduction-proxy-savings-promo",
-+  "enable-datasaver-prompt",
-+  "enable-device-discovery-notifications",
-+  "enable-devtools-experiments",
-+  "enable-direct-composition-layers",
-+  "enable-display-list-2d-canvas",
-+  "enable-distance-field-text",
-+  "enable-distillability-service",
-+  "enable-dom-distiller",
-+  "enable-domain-reliability",
-+  "enable-drive-search-in-app-launcher",
-+  "enable-drm-atomic",
-+  "enable-embedded-extension-options",
-+  "enable-encryption-migration",
-+  "enable-encryption-selection",
-+  "enable-es3-apis",
-+  "enable-exclusive-audio",
-+  "enable-experimental-accessibility-features",
-+  "enable-experimental-canvas-features",
-+  "enable-experimental-extension-apis",
-+  "enable-experimental-fullscreen-exit-ui",
-+  "enable-experimental-input-view-features",
-+  "enable-experimental-web-platform-features",
-+  "enable-extension-activity-log-testing",
-+  "enable-extension-activity-logging",
-+  "enable-extension-assets-sharing",
-+  "enable-fast-unload",
-+  "enable-fast-web-scroll-view-insets",
-+  "enable-features",
-+  "enable-file-manager-touch-mode",
-+  "enable-first-run-ui-transitions",
-+  "enable-floating-virtual-keyboard",
-+  "enable-font-antialiasing",
-+  "enable-fullscreen-tab-detaching",
-+  "enable-fullscreen-toolbar-reveal",
-+  "enable-google-branded-context-menu",
-+  "enable-gpu-async-worker-context",
-+  "enable-gpu-benchmarking",
-+  "enable-gpu-client-logging",
-+  "enable-gpu-client-tracing",
-+  "enable-gpu-command-logging",
-+  "enable-gpu-debugging",
-+  "enable-gpu-driver-debug-logging",
-+  "enable-gpu-memory-buffer-compositor-resources",
-+  "enable-gpu-memory-buffer-video-frames",
-+  "enable-gpu-rasterization",
-+  "enable-gpu-service-logging",
-+  "enable-gpu-service-tracing",
-+  "enable-hardware-overlays",
-+  "enable-harfbuzz-rendertext",
-+  "enable-hdr",
-+  "enable-heap-profiling",
-+  "enable-hosted-app-quit-notification",
-+  "enable-hosted-apps-in-windows",
-+  "enable-hotword-hardware",
-+  "enable-hung-renderer-infobar",
-+  "enable-inband-text-tracks",
-+  "enable-input-ime-api",
-+  "enable-internal-media-session",
-+  "enable-ios-handoff-to-other-devices",
-+  "enable-ios-password-generation",
-+  "enable-ios-physical-web",
-+  "enable-layer-lists",
-+  "enable-lcd-text",
-+  "enable-leak-detection",
-+  "enable-local-file-accesses",
-+  "enable-local-sync-backend",
-+  "enable-logging",
-+  "enable-longpress-drag-selection",
-+  "enable-low-end-device-mode",
-+  "enable-low-res-tiling",
-+  "enable-lru-snapshot-cache",
-+  "enable-mac-views-native-app-windows",
-+  "enable-main-frame-before-activation",
-+  "enable-md-feedback",
-+  "enable-md-policy-page",
-+  "enable-media-suspend",
-+  "enable-merge-key-char-events",
-+  "enable-message-center-always-scroll-up-upon-notification-removal",
-+  "enable-nacl",
-+  "enable-nacl-debug",
-+  "enable-nacl-nonsfi-mode",
-+  "enable-native-gpu-memory-buffers",
-+  "enable-natural-scroll-default",
-+  "enable-navigation-tracing",
-+  "enable-net-benchmarking",
-+  "enable-network-information-downlink-max",
-+  "enable-network-portal-notification",
-+  "enable-new-app-menu-icon",
-+  "enable-ntp-most-likely-favicons-from-server",
-+  "enable-ntp-popular-sites",
-+  "enable-ntp-search-engine-country-detection",
-+  "enable-offer-store-unmasked-wallet-cards",
-+  "enable-offer-upload-credit-cards",
-+  "enable-offline-auto-reload",
-+  "enable-offline-auto-reload-visible-only",
-+  "enable-osk-overscroll",
-+  "enable-override-bookmarks-ui",
-+  "enable-partial-raster",
-+  "enable-password-generation",
-+  "enable-pepper-testing",
-+  "enable-permission-action-reporting",
-+  "enable-physical-keyboard-autocorrect",
-+  "enable-picture-in-picture",
-+  "enable-pinch",
-+  "enable-pixel-output-in-tests",
-+  "enable-plugin-placeholder-testing",
-+  "enable-potentially-annoying-security-features",
-+  "enable-power-overlay",
-+  "enable-precise-memory-info",
-+  "enable-prefer-compositing-to-lcd-text",
-+  "enable-print-browser",
-+  "enable-print-preview-register-promos",
-+  "enable-profile-shortcut-manager",
-+  "enable-profiling",
-+  "enable-push-api-background-mode",
-+  "enable-quic",
-+  "enable-reader-mode-toolbar-icon",
-+  "enable-refresh-token-annotation-request",
-+  "enable-request-tablet-site",
-+  "enable-rgba-4444-textures",
-+  "enable-sandbox",
-+  "enable-sandbox-logging",
-+  "enable-screenshot-testing-with-mode",
-+  "enable-scripts-require-action",
-+  "enable-scroll-prediction",
-+  "enable-service-manager-tracing",
-+  "enable-settings-window",
-+  "enable-sgi-video-sync",
-+  "enable-signin-promo",
-+  "enable-single-click-autofill",
-+  "enable-site-settings",
-+  "enable-skia-benchmarking",
-+  "enable-slim-navigation-manager",
-+  "enable-slimming-paint-invalidation",
-+  "enable-slimming-paint-v2",
-+  "enable-smooth-scrolling",
-+  "enable-spatial-navigation",
-+  "enable-spdy-proxy-auth",
-+  "enable-speech-dispatcher",
-+  "enable-spelling-feedback-field-trial",
-+  "enable-spotlight-actions",
-+  "enable-stats-collection-bindings",
-+  "enable-stats-table",
-+  "enable-strict-mixed-content-checking",
-+  "enable-strict-powerful-feature-restrictions",
-+  "enable-suggestions-ui",
-+  "enable-suggestions-with-substring-match",
-+  "enable-supervised-user-managed-bookmarks-folder",
-+  "enable-surface-synchronization",
-+  "enable-swap-buffers-with-bounds",
-+  "enable-sync-app-list",
-+  "enable-sync-articles",
-+  "enable-tab-audio-muting",
-+  "enable-tablet-splitview",
-+  "enable-tcp-fastopen",
-+  "enable-third-party-keyboard-workaround",
-+  "enable-threaded-compositing",
-+  "enable-threaded-texture-mailboxes",
-+  "enable-tile-compression",
-+  "enable-touch-calibration-setting",
-+  "enable-touch-drag-drop",
-+  "enable-touchpad-three-finger-click",
-+  "enable-touchview",
-+  "enable-trace-app-source",
-+  "enable-tracing",
-+  "enable-tracing-output",
-+  "enable-translate-new-ux",
-+  "enable-ui-devtools",
-+  "enable-use-zoom-for-dsf",
-+  "enable-user-controlled-alternate-protocol-ports",
-+  "enable-user-metrics",
-+  "enable-usermedia-screen-capturing",
-+  "enable-video-player-chromecast-support",
-+  "enable-viewport",
-+  "enable-virtual-keyboard",
-+  "enable-voice-interaction",
-+  "enable-vtune-support",
-+  "enable-vulkan",
-+  "enable-wayland-server",
-+  "enable-web-notification-custom-layouts",
-+  "enable-webfonts-intervention-trigger",
-+  "enable-webfonts-intervention-v2",
-+  "enable-webgl-draft-extensions",
-+  "enable-webgl-image-chromium",
-+  "enable-webrtc-event-logging-from-extension",
-+  "enable-webrtc-srtp-aes-gcm",
-+  "enable-webrtc-stun-origin",
-+  "enable-webview-finch",
-+  "enable-webvr",
-+  "enable-wifi-credential-sync",
-+  "enable-win7-webrtc-hw-h264-decoding",
-+  "enable-zero-copy",
-+  "enable-zip-archiver-on-file-manager",
-+  "enabled",
-+  "enabled-2g",
-+  "enabled-3g",
-+  "enabled-new-style-notification",
-+  "enabled-slow2g",
-+  "encode-binary",
-+  "enforce",
-+  "enforce-gl-minimums",
-+  "enforce-webrtc-ip-permission-check",
-+  "enforce_strict",
-+  "enterprise-disable-arc",
-+  "enterprise-enable-forced-re-enrollment",
-+  "enterprise-enable-license-type-selection",
-+  "enterprise-enable-zero-touch-enrollment",
-+  "enterprise-enrollment-initial-modulus",
-+  "enterprise-enrollment-modulus-limit",
-+  "error-console",
-+  "experiment",
-+  "explicitly-allowed-ports",
-+  "expose-internals-for-testing",
-+  "extension-content-verification",
-+  "extension-process",
-+  "extensions-install-verification",
-+  "extensions-multi-account",
-+  "extensions-not-webstore",
-+  "extensions-on-chrome-urls",
-+  "extensions-update-frequency",
-+  "extra-search-query-params",
-+  "fail-on-unused-args",
-+  "fake-variations-channel",
-+  "false",
-+  "fast",
-+  "fast-start",
-+  "feedback-server",
-+  "field-trial-handle",
-+  "first-exec-after-boot",
-+  "flag-switches-begin",
-+  "flag-switches-end",
-+  "font-cache-shared-handle",
-+  "force-android-app-mode",
-+  "force-app-mode",
-+  "force-clamshell-power-button",
-+  "force-color-profile",
-+  "force-desktop-ios-promotion",
-+  "force-dev-mode-highlighting",
-+  "force-device-scale-factor",
-+  "force-display-list-2d-canvas",
-+  "force-effective-connection-type",
-+  "force-enable-metrics-reporting",
-+  "force-enable-stylus-tools",
-+  "force-fieldtrial-params",
-+  "force-fieldtrials",
-+  "force-first-run",
-+  "force-first-run-ui",
-+  "force-gpu-mem-available-mb",
-+  "force-gpu-rasterization",
-+  "force-happiness-tracking-system",
-+  "force-load-easy-unlock-app-in-tests",
-+  "force-local-ntp",
-+  "force-login-manager-in-tests",
-+  "force-mediafoundation",
-+  "force-overlay-fullscreen-video",
-+  "force-password-reauth",
-+  "force-pnacl-subzero",
-+  "force-renderer-accessibility",
-+  "force-show-update-menu-badge",
-+  "force-show-update-menu-item",
-+  "force-system-compositor-mode",
-+  "force-tablet-mode",
-+  "force-text-direction",
-+  "force-ui-direction",
-+  "force-variation-ids",
-+  "force-video-overlays",
-+  "force-wave-audio",
-+  "force-webrtc-ip-handling-policy",
-+  "full-memory-crash-report",
-+  "gaia-url",
-+  "gcm-checkin-url",
-+  "gcm-mcs-endpoint",
-+  "gcm-registration-url",
-+  "generate-accessibility-test-expectations",
-+  "gl",
-+  "gl-composited-overlay-candidate-quad-border",
-+  "gl-shader-interm-output",
-+  "gles",
-+  "golden-screenshots-dir",
-+  "google-apis-url",
-+  "google-base-url",
-+  "google-doodle-url",
-+  "google-url",
-+  "gpu-active-device-id",
-+  "gpu-active-vendor-id",
-+  "gpu-device-id",
-+  "gpu-driver-bug-workarounds",
-+  "gpu-driver-date",
-+  "gpu-driver-vendor",
-+  "gpu-driver-version",
-+  "gpu-launcher",
-+  "gpu-no-complete-info-collection",
-+  "gpu-no-context-lost",
-+  "gpu-process",
-+  "gpu-program-cache-size-kb",
-+  "gpu-rasterization-msaa-sample-count",
-+  "gpu-sandbox-allow-sysv-shm",
-+  "gpu-sandbox-failures-fatal",
-+  "gpu-sandbox-start-early",
-+  "gpu-secondary-device-ids",
-+  "gpu-secondary-vendor-ids",
-+  "gpu-startup-dialog",
-+  "gpu-testing-device-id",
-+  "gpu-testing-driver-date",
-+  "gpu-testing-gl-renderer",
-+  "gpu-testing-gl-vendor",
-+  "gpu-testing-gl-version",
-+  "gpu-testing-os-version",
-+  "gpu-testing-secondary-device-ids",
-+  "gpu-testing-secondary-vendor-ids",
-+  "gpu-testing-vendor-id",
-+  "gpu-vendor-id",
-+  "guest-wallpaper-large",
-+  "guest-wallpaper-small",
-+  "h",
-+  "has-chromeos-diamond-key",
-+  "has-chromeos-keyboard",
-+  "has-internal-stylus",
-+  "headless",
-+  "help",
-+  "hide",
-+  "hide-icons",
-+  "hide-scrollbars",
-+  "history-entry-requires-user-gesture",
-+  "homedir",
-+  "homepage",
-+  "host",
-+  "host-pairing-oobe",
-+  "host-resolver-rules",
-+  "host-rules",
-+  "icu-data-dir",
-+  "ignore-autocomplete-off-autofill",
-+  "ignore-autoplay-restrictions",
-+  "ignore-certificate-errors",
-+  "ignore-certificate-errors-spki-list",
-+  "ignore-gpu-blacklist",
-+  "ignore-urlfetcher-cert-requests",
-+  "ignore-user-profile-mapping-for-tests",
-+  "in-process-gpu",
-+  "incognito",
-+  "input",
-+  "inspect",
-+  "inspect-brk",
-+  "install-chrome-app",
-+  "install-supervised-user-whitelists",
-+  "instant-process",
-+  "invalidation-use-gcm-channel",
-+  "ipc-connection-timeout",
-+  "ipc-dump-directory",
-+  "ipc-fuzzer-testcase",
-+  "is-running-in-mash",
-+  "isolate-origins",
-+  "isolate-sites-for-testing",
-+  "javascript-harmony",
-+  "js-flags",
-+  "keep-alive-for-test",
-+  "kiosk",
-+  "kiosk-printing",
-+  "lang",
-+  "last-launched-app",
-+  "layer",
-+  "light_muted",
-+  "light_vibrant",
-+  "limit-fps",
-+  "load-and-launch-app",
-+  "load-apps",
-+  "load-extension",
-+  "load-media-router-component-extension",
-+  "local-heuristics-only-for-password-generation",
-+  "local-ntp-reload",
-+  "local-sync-backend-dir",
-+  "log-gpu-control-list-decisions",
-+  "log-level",
-+  "log-net-log",
-+  "login-manager",
-+  "login-profile",
-+  "login-user",
-+  "lso-url",
-+  "ltr",
-+  "main-frame-resizes-are-orientation-changes",
-+  "make-chrome-default",
-+  "make-default-browser",
-+  "managed-user-id",
-+  "managed-user-sync-token",
-+  "mark-non-secure-as",
-+  "markdown",
-+  "market-url-for-testing",
-+  "mash",
-+  "material",
-+  "material-design-ink-drop-animation-speed",
-+  "material-hybrid",
-+  "max-gum-fps",
-+  "max-output-volume-dba1m",
-+  "max-untiled-layer-height",
-+  "max-untiled-layer-width",
-+  "media-cache-size",
-+  "mem-pressure-system-reserved-kb",
-+  "memlog",
-+  "memlog-pipe",
-+  "memory-pressure-off",
-+  "memory-pressure-thresholds",
-+  "memory-pressure-thresholds-mb",
-+  "message-center-changes-while-open",
-+  "metrics-client-id",
-+  "metrics-recording-only",
-+  "mhtml-generator-option",
-+  "mirror",
-+  "mock",
-+  "mojo-local-storage",
-+  "mojo-pipe-token",
-+  "monitoring-destination-id",
-+  "mse-audio-buffer-size-limit",
-+  "mse-video-buffer-size-limit",
-+  "mus",
-+  "mus-config",
-+  "mute-audio",
-+  "nacl-broker",
-+  "nacl-dangerous-no-sandbox-nonsfi",
-+  "nacl-debug-mask",
-+  "nacl-gdb",
-+  "nacl-gdb-script",
-+  "nacl-loader",
-+  "nacl-loader-nonsfi",
-+  "native",
-+  "native-crx-bindings",
-+  "need-arc-migration-policy-check",
-+  "net-log-capture-mode",
-+  "netifs-to-ignore",
-+  "network-country-iso",
-+  "network-settings-config",
-+  "new-window",
-+  "no-default-browser-check",
-+  "no-experiments",
-+  "no-first-run",
-+  "no-managed-user-acknowledgment-check",
-+  "no-network-profile-warning",
-+  "no-pings",
-+  "no-proxy-server",
-+  "no-referrers",
-+  "no-sandbox",
-+  "no-service-autorun",
-+  "no-session-id",
-+  "no-startup-window",
-+  "no-user-gesture-required",
-+  "no-wifi",
-+  "no-zygote",
-+  "nocolor",
-+  "noerrdialogs",
-+  "non-material",
-+  "non-secure",
-+  "non-secure-after-editing",
-+  "non-secure-while-incognito",
-+  "non-secure-while-incognito-or-editing",
-+  "none",
-+  "normal_muted",
-+  "normal_vibrant",
-+  "note-taking-app-ids",
-+  "ntp-snippets-add-incomplete",
-+  "ntp-switch-to-existing-tab",
-+  "null",
-+  "num-raster-threads",
-+  "oauth2-client-id",
-+  "oauth2-client-secret",
-+  "off",
-+  "on",
-+  "oobe-bootstrapping-master",
-+  "oobe-force-show-screen",
-+  "oobe-guest-session",
-+  "oobe-skip-postlogin",
-+  "oobe-timer-interval",
-+  "open-ash",
-+  "opengraph",
-+  "origin-to-force-quic-on",
-+  "origin-trial-disabled-features",
-+  "origin-trial-disabled-tokens",
-+  "origin-trial-public-key",
-+  "original-process-start-time",
-+  "osmesa",
-+  "output",
-+  "override",
-+  "override-metrics-upload-url",
-+  "override-plugin-power-saver-for-testing",
-+  "override-use-software-gl-for-tests",
-+  "overscroll-history-navigation",
-+  "overscroll-start-threshold",
-+  "ozone-dump-file",
-+  "ozone-platform",
-+  "pack-extension",
-+  "pack-extension-key",
-+  "parent-profile",
-+  "parent-window",
-+  "passive-listeners-default",
-+  "password-store",
-+  "permission-request-api-scope",
-+  "permission-request-api-url",
-+  "ppapi",
-+  "ppapi-antialiased-text-enabled",
-+  "ppapi-broker",
-+  "ppapi-flash-args",
-+  "ppapi-flash-path",
-+  "ppapi-flash-version",
-+  "ppapi-in-process",
-+  "ppapi-plugin-launcher",
-+  "ppapi-startup-dialog",
-+  "ppapi-subpixel-rendering-setting",
-+  "prerender-from-omnibox",
-+  "previous-app",
-+  "primary",
-+  "print-to-pdf",
-+  "privet-ipv6-only",
-+  "process-per-site",
-+  "process-per-tab",
-+  "product-version",
-+  "profile-directory",
-+  "profiler-timing",
-+  "profiling",
-+  "profiling-at-start",
-+  "profiling-file",
-+  "profiling-flush",
-+  "progress-bar-animation",
-+  "progress-bar-completion",
-+  "prompt-for-external-extensions",
-+  "proxy-auto-detect",
-+  "proxy-bypass-list",
-+  "proxy-pac-url",
-+  "proxy-server",
-+  "q",
-+  "quic-connection-options",
-+  "quic-max-packet-length",
-+  "quic-version",
-+  "rdp_desktop_session",
-+  "reader-mode-feedback",
-+  "reader-mode-heuristics",
-+  "rebaseline-pixel-tests",
-+  "record-type",
-+  "reduce-security-for-testing",
-+  "reduced-referrer-granularity",
-+  "register-font-files",
-+  "register-pepper-plugins",
-+  "relauncher",
-+  "remote-debugging-address",
-+  "remote-debugging-port",
-+  "remote-debugging-socket-fd",
-+  "remote-debugging-socket-name",
-+  "remote-debugging-targets",
-+  "renderer",
-+  "renderer-client-id",
-+  "renderer-cmd-prefix",
-+  "renderer-process-limit",
-+  "renderer-startup-dialog",
-+  "renderer-wait-for-java-debugger",
-+  "renderpass",
-+  "repl",
-+  "report-vp9-as-an-unsupported-mime-type",
-+  "require-audio-hardware-for-testing",
-+  "reset-app-list-install-state",
-+  "reset-variation-state",
-+  "restore-last-session",
-+  "root",
-+  "root-layer-scrolls",
-+  "rtl",
-+  "run-layout-test",
-+  "runtime-deps-list-file",
-+  "safebrowsing-disable-auto-update",
-+  "safebrowsing-disable-download-protection",
-+  "safebrowsing-disable-extension-blacklist",
-+  "safebrowsing-manual-download-blacklist",
-+  "sandbox-ipc",
-+  "save-page-as-mhtml",
-+  "screen-config",
-+  "screenshot",
-+  "script-executable",
-+  "scripts-require-action",
-+  "scroll-end-effect",
-+  "search-provider-logo-url",
-+  "secondary",
-+  "secondary-display-layout",
-+  "secondary-ui-md",
-+  "service",
-+  "service-manager",
-+  "service-name",
-+  "service-pipe-token",
-+  "service-request-channel-token",
-+  "service-runner",
-+  "shared-files",
-+  "shill-stub",
-+  "show-app-list",
-+  "show-autofill-signatures",
-+  "show-autofill-type-predictions",
-+  "show-cert-link",
-+  "show-component-extension-options",
-+  "show-composited-layer-borders",
-+  "show-fps-counter",
-+  "show-icons",
-+  "show-layer-animation-bounds",
-+  "show-login-dev-overlay",
-+  "show-mac-overlay-borders",
-+  "show-md-login",
-+  "show-non-md-login",
-+  "show-overdraw-feedback",
-+  "show-paint-rects",
-+  "show-property-changed-rects",
-+  "show-saved-copy",
-+  "show-screenspace-rects",
-+  "show-surface-damage-rects",
-+  "silent-debugger-extension-api",
-+  "silent-launch",
-+  "simulate-critical-update",
-+  "simulate-elevated-recovery",
-+  "simulate-outdated",
-+  "simulate-outdated-no-au",
-+  "simulate-upgrade",
-+  "single-process",
-+  "site-per-process",
-+  "skip-gpu-data-loading",
-+  "skip-nostore-all",
-+  "skip-nostore-main",
-+  "skip-reencoding-on-skp-capture",
-+  "slow",
-+  "slow-connections-only",
-+  "slow-down-raster-scale-factor",
-+  "sms-test-messages",
-+  "spdy-proxy-auth-fallback",
-+  "spdy-proxy-auth-origin",
-+  "spdy-proxy-auth-value",
-+  "spelling-service-feedback-interval-seconds",
-+  "spelling-service-feedback-url",
-+  "spurious-power-button-accel-count",
-+  "spurious-power-button-keyboard-accel",
-+  "spurious-power-button-lid-angle-change",
-+  "spurious-power-button-screen-accel",
-+  "spurious-power-button-window",
-+  "ssl-key-log-file",
-+  "ssl-version-max",
-+  "ssl-version-min",
-+  "stable-release-mode",
-+  "start-fullscreen",
-+  "start-maximized",
-+  "start-stack-profiler",
-+  "started",
-+  "stub",
-+  "stub-cros-settings",
-+  "supports-dual-gpus",
-+  "surface",
-+  "swiftshader",
-+  "swiftshader-webgl",
-+  "sync-allow-insecure-xmpp-connection",
-+  "sync-deferred-startup-timeout-seconds",
-+  "sync-disable-deferred-startup",
-+  "sync-enable-get-update-avoidance",
-+  "sync-notification-host-port",
-+  "sync-on-draw-hardware",
-+  "sync-short-initial-retry-override",
-+  "sync-short-nudge-delay-for-test",
-+  "sync-url",
-+  "system-developer-mode",
-+  "system-log-upload-frequency",
-+  "tab-management-experiment-type-disabled",
-+  "tab-management-experiment-type-elderberry",
-+  "task-profiler",
-+  "team-drives",
-+  "test-auto-update-ui",
-+  "test-child-process",
-+  "test-cros-gaia-id-migration",
-+  "test-do-not-initialize-icu",
-+  "test-encryption-migration-ui",
-+  "test-gl-lib",
-+  "test-launcher-batch-limit",
-+  "test-launcher-bot-mode",
-+  "test-launcher-debug-launcher",
-+  "test-launcher-filter-file",
-+  "test-launcher-force-run-broken-tests",
-+  "test-launcher-jobs",
-+  "test-launcher-list-tests",
-+  "test-launcher-output",
-+  "test-launcher-print-test-stdio",
-+  "test-launcher-print-writable-path",
-+  "test-launcher-retry-limit",
-+  "test-launcher-shard-index",
-+  "test-launcher-summary-output",
-+  "test-launcher-test-part-results-limit",
-+  "test-launcher-timeout",
-+  "test-launcher-total-shards",
-+  "test-launcher-trace",
-+  "test-name",
-+  "test-tiny-timeout",
-+  "test-type",
-+  "testing-fixed-http-port",
-+  "testing-fixed-https-port",
-+  "tether-stub",
-+  "threads",
-+  "time",
-+  "timeout",
-+  "tls1",
-+  "tls1.1",
-+  "tls1.2",
-+  "tls1.3",
-+  "tls13-variant",
-+  "top-chrome-md",
-+  "top-controls-hide-threshold",
-+  "top-controls-show-threshold",
-+  "touch-calibration",
-+  "touch-devices",
-+  "touch-events",
-+  "touch-noise-filtering",
-+  "touch-selection-strategy",
-+  "touch_view",
-+  "trace-config-file",
-+  "trace-export-events-to-etw",
-+  "trace-shutdown",
-+  "trace-shutdown-file",
-+  "trace-startup",
-+  "trace-startup-duration",
-+  "trace-startup-file",
-+  "trace-to-console",
-+  "trace-to-file",
-+  "trace-to-file-name",
-+  "trace-upload-url",
-+  "tracelog",
-+  "translate-ranker-model-url",
-+  "translate-script-url",
-+  "translate-security-origin",
-+  "true",
-+  "trusted-download-sources",
-+  "try-chrome-again",
-+  "try-supported-channel-layouts",
-+  "type",
-+  "ui-disable-partial-swap",
-+  "ui-enable-layer-lists",
-+  "ui-enable-rgba-4444-textures",
-+  "ui-enable-zero-copy",
-+  "ui-prioritize-in-gpu-process",
-+  "ui-show-composited-layer-borders",
-+  "ui-show-fps-counter",
-+  "ui-show-layer-animation-bounds",
-+  "ui-show-paint-rects",
-+  "ui-show-property-changed-rects",
-+  "ui-show-screenspace-rects",
-+  "ui-show-surface-damage-rects",
-+  "ui-slow-animations",
-+  "ui-test-action-max-timeout",
-+  "ui-test-action-timeout",
-+  "uninstall",
-+  "unlimited-storage",
-+  "unsafe-pac-url",
-+  "unsafely-allow-protected-media-identifier-for-domain",
-+  "unsafely-treat-insecure-origin-as-secure",
-+  "use-angle",
-+  "use-cras",
-+  "use-double-buffering",
-+  "use-fake-device-for-media-stream",
-+  "use-fake-jpeg-decode-accelerator",
-+  "use-fake-ui-for-media-stream",
-+  "use-file-for-fake-audio-capture",
-+  "use-file-for-fake-video-capture",
-+  "use-first-display-as-internal",
-+  "use-gl",
-+  "use-gpu-in-tests",
-+  "use-ime-service",
-+  "use-mobile-user-agent",
-+  "use-mock-keychain",
-+  "use-passthrough-cmd-decoder",
-+  "use-simple-cache-backend",
-+  "use-system-default-printer",
-+  "use-test-config",
-+  "user-agent",
-+  "user-always-affiliated",
-+  "user-data-dir",
-+  "user-gesture-required",
-+  "user-gesture-required-for-cross-origin",
-+  "utility",
-+  "utility-allowed-dir",
-+  "utility-cmd-prefix",
-+  "utility-run-elevated",
-+  "v",
-+  "v2-sandbox",
-+  "v2-sandbox-enabled",
-+  "v8-cache-options",
-+  "v8-cache-strategies-for-cache-storage",
-+  "validate-crx",
-+  "validate-input-event-stream",
-+  "variations-override-country",
-+  "variations-server-url",
-+  "version",
-+  "video-image-texture-target",
-+  "video-threads",
-+  "video-underflow-threshold-ms",
-+  "virtual-time-budget",
-+  "vmodule",
-+  "voice-interaction-supported-locales",
-+  "wait-for-debugger",
-+  "wait-for-debugger-children",
-+  "wake-on-wifi-packet",
-+  "wallet-service-use-sandbox",
-+  "watcher",
-+  "waveout-buffers",
-+  "webapk-server-url",
-+  "webrtc-max-cpu-consumption-percentage",
-+  "webrtc-stun-probe-trial",
-+  "webview-enable-safebrowsing-support",
-+  "webview-sandboxed-renderer",
-+  "whitelisted-extension-id",
-+  "win-jumplist-action",
-+  "window-position",
-+  "window-size",
-+  "window-workspace",
-+  "windows10-custom-titlebar",
-+  "winhttp-proxy-resolver",
-+  "wm-window-animations-disabled",
-+  "yield-between-content-script-runs",
-+  "zygote",
-+  "zygote-cmd-prefix",
-+};
-+
-+bool IsBlacklistedArg(const base::CommandLine::CharType* arg) {
-+#if defined(OS_WIN)
-+  const auto converted = base::WideToUTF8(arg);
-+  const char* a = converted.c_str();
-+#else
-+  const char* a = arg;
-+#endif
-+
-+  static const char* prefixes[] = {"--", "-", "/"};
-+
-+  int prefix_length = 0;
-+  for (auto& prefix : prefixes) {
-+    if (base::StartsWith(a, prefix, base::CompareCase::SENSITIVE)) {
-+      prefix_length = strlen(prefix);
-+      break;
-+    }
-+  }
-+
-+  if (prefix_length > 0) {
-+    a += prefix_length;
-+    std::string switch_name =
-+        base::ToLowerASCII(base::StringPiece(a, strcspn(a, "=")));
-+    return std::binary_search(std::begin(kBlacklist), std::end(kBlacklist),
-+                              switch_name);
-+  }
-+
-+  return false;
-+}
-+
-+>>>>>>> .their
- }  // namespace
- 
- namespace atom {
-changed in both
-  base   100644 4bd88a5a43c03ceba308ec06fdf0cbadeddcaae3 atom/browser/api/atom_api_browser_view.cc
-  our    100644 bd83208694c61c4d7c43ce4be26939c2682b2a13 atom/browser/api/atom_api_browser_view.cc
-  their  100644 41f0e99cdd79bf1ad2c4c8c0db5aaa97ac5e1297 atom/browser/api/atom_api_browser_view.cc
-changed in both
-  base   100644 ced1cb31d8df7689f7652111720ba20fb029b1fe atom/browser/api/atom_api_menu_views.cc
-  our    100644 3da7dc2842fa4561e037aa67f290d0cc6ca71014 atom/browser/api/atom_api_menu_views.cc
-  their  100644 fa178e57d82413544b92172ae0ed4401ea5f178b atom/browser/api/atom_api_menu_views.cc
-@@ -49,8 +49,16 @@
-   menu_runners_[window_id] =
-       std::make_unique<MenuRunner>(model(), flags, close_callback);
-   menu_runners_[window_id]->RunMenuAt(
-+<<<<<<< .our
-       native_window->widget(), NULL, gfx::Rect(location, gfx::Size()),
-       views::MENU_ANCHOR_TOPLEFT, ui::MENU_SOURCE_MOUSE);
-+=======
-+      native_window->widget(),
-+      NULL,
-+      gfx::Rect(location, gfx::Size()),
-+      views::MENU_ANCHOR_TOPLEFT,
-+      ui::MENU_SOURCE_MOUSE);
-+>>>>>>> .their
- }
- 
- void MenuViews::ClosePopupAt(int32_t window_id) {
-removed in local
-  base   100644 0d22fad5b8b5e3ed7711d55aa763f930014a75d7 atom/browser/api/atom_api_screen_mac.mm
-  their  100644 056b775fdfc221cb0501ba5b7afd8de01f2d4d63 atom/browser/api/atom_api_screen_mac.mm
-changed in both
-  base   100644 6e5c4b9cbe77c1a4004bbc2bf7b0f0089ffb9004 atom/browser/api/atom_api_session.cc
-  our    100644 658f913bb60b66ae1bf3aae97d7d9158e56f7ee0 atom/browser/api/atom_api_session.cc
-  their  100644 373ef90c393af3921e1cbd2d6375e7b9d9b7ecb5 atom/browser/api/atom_api_session.cc
-@@ -451,6 +451,7 @@
-   AtomNetworkDelegate* network_delegate =
-       static_cast<AtomNetworkDelegate*>(context->network_delegate());
-   network_delegate->SetDevToolsNetworkEmulationClientId(client_id);
-+<<<<<<< .our
- }
- 
- void DestroyGlobalHandle(v8::Isolate* isolate,
-@@ -468,6 +469,8 @@
-       object->SetAlignedPointerInInternalField(0, nullptr);
-     }
-   }
-+=======
-+>>>>>>> .their
- }
- 
- }  // namespace
-changed in both
-  base   100644 83adf62eee8301c49799b5397f2dcf6bfdbbd295 atom/browser/api/atom_api_web_contents.cc
-  our    100644 20a1ac2e672f08ffea528b6e094ba530ff8083d1 atom/browser/api/atom_api_web_contents.cc
-  their  100644 f9297fa0533103d940b9fb4eea56fda5ee28cc1c atom/browser/api/atom_api_web_contents.cc
-@@ -124,6 +124,30 @@
- struct Converter<PrintSettings> {
-   static bool FromV8(v8::Isolate* isolate,
-                      v8::Local<v8::Value> val,
-+<<<<<<< .our
-+=======
-+                     atom::SetSizeParams* out) {
-+    mate::Dictionary params;
-+    if (!ConvertFromV8(isolate, val, &params))
-+      return false;
-+    bool autosize;
-+    if (params.Get("enableAutoSize", &autosize))
-+      out->enable_auto_size.reset(new bool(autosize));
-+    gfx::Size size;
-+    if (params.Get("min", &size))
-+      out->min_size.reset(new gfx::Size(size));
-+    if (params.Get("max", &size))
-+      out->max_size.reset(new gfx::Size(size));
-+    if (params.Get("normal", &size))
-+      out->normal_size.reset(new gfx::Size(size));
-+    return true;
-+  }
-+};
-+
-+template<>
-+struct Converter<PrintSettings> {
-+  static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
-+>>>>>>> .their
-                      PrintSettings* out) {
-     mate::Dictionary dict;
-     if (!ConvertFromV8(isolate, val, &dict))
-@@ -280,7 +304,12 @@
- 
- // Called when CapturePage is done.
- void OnCapturePageDone(const base::Callback<void(const gfx::Image&)>& callback,
-+<<<<<<< .our
-                        const SkBitmap& bitmap) {
-+=======
-+                       const SkBitmap& bitmap,
-+                       content::ReadbackResponse response) {
-+>>>>>>> .their
-   // Hack to enable transparency in captured image
-   // TODO(nitsakh) Remove hack once fixed in chromium
-   const_cast<SkBitmap&>(bitmap).setAlphaType(kPremul_SkAlphaType);
-@@ -327,8 +356,18 @@
-   }
- }
- 
-+<<<<<<< .our
- WebContents::WebContents(v8::Isolate* isolate,
-                          const mate::Dictionary& options) {
-+=======
-+WebContents::WebContents(v8::Isolate* isolate, const mate::Dictionary& options)
-+    : embedder_(nullptr),
-+      zoom_controller_(nullptr),
-+      type_(BROWSER_WINDOW),
-+      request_id_(0),
-+      background_throttling_(true),
-+      enable_devtools_(true) {
-+>>>>>>> .their
-   // Read options.
-   options.Get("backgroundThrottling", &background_throttling_);
- 
-@@ -1015,6 +1054,18 @@
-                                     content::RenderFrameHost* frame_host) {
-   bool handled = true;
-   FrameDispatchHelper helper = {this, frame_host};
-+<<<<<<< .our
-+=======
-+  auto relay = NativeWindowRelay::FromWebContents(web_contents());
-+  if (relay) {
-+    IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(NativeWindow, message, frame_host)
-+      IPC_MESSAGE_FORWARD(AtomAutofillFrameHostMsg_HidePopup,
-+                          relay->window.get(), NativeWindow::HideAutofillPopup)
-+      IPC_MESSAGE_UNHANDLED(handled = false)
-+    IPC_END_MESSAGE_MAP()
-+  }
-+
-+>>>>>>> .their
-   IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(WebContents, message, frame_host)
-     IPC_MESSAGE_HANDLER(AtomFrameHostMsg_Message, OnRendererMessage)
-     IPC_MESSAGE_FORWARD_DELAY_REPLY(AtomFrameHostMsg_Message_Sync, &helper,
-@@ -1024,10 +1075,14 @@
-         FrameDispatchHelper::OnSetTemporaryZoomLevel)
-     IPC_MESSAGE_FORWARD_DELAY_REPLY(AtomFrameHostMsg_GetZoomLevel, &helper,
-                                     FrameDispatchHelper::OnGetZoomLevel)
-+<<<<<<< .our
- #if defined(TOOLKIT_VIEWS) && !defined(OS_MACOSX)
-     IPC_MESSAGE_HANDLER(AtomAutofillFrameHostMsg_ShowPopup, ShowAutofillPopup)
-     IPC_MESSAGE_HANDLER(AtomAutofillFrameHostMsg_HidePopup, HideAutofillPopup)
- #endif
-+=======
-+    IPC_MESSAGE_HANDLER(AtomAutofillFrameHostMsg_ShowPopup, ShowAutofillPopup)
-+>>>>>>> .their
-     IPC_MESSAGE_UNHANDLED(handled = false)
-   IPC_END_MESSAGE_MAP()
- 
-@@ -1075,6 +1130,20 @@
-        details.is_same_document, details.did_replace_entry);
- }
- 
-+<<<<<<< .our
-+=======
-+int64_t WebContents::GetIDForContents(content::WebContents* web_contents) {
-+  int64_t process_id = web_contents->GetRenderProcessHost()->GetID();
-+  int64_t routing_id = web_contents->GetMainFrame()->GetRoutingID();
-+  int64_t rv = (process_id << 32) + routing_id;
-+  return rv;
-+}
-+
-+int64_t WebContents::GetID() const {
-+  return WebContents::GetIDForContents(web_contents());
-+}
-+
-+>>>>>>> .their
- int WebContents::GetProcessID() const {
-   return web_contents()->GetMainFrame()->GetProcess()->GetID();
- }
-@@ -1552,7 +1621,11 @@
- bool WebContents::SendIPCMessage(bool all_frames,
-                                  const base::string16& channel,
-                                  const base::ListValue& args) {
-+<<<<<<< .our
-   auto* frame_host = web_contents()->GetMainFrame();
-+=======
-+  auto frame_host = web_contents()->GetMainFrame();
-+>>>>>>> .their
-   if (frame_host) {
-     return frame_host->Send(new AtomFrameMsg_Message(
-         frame_host->GetRoutingID(), all_frames, channel, args));
-@@ -1853,6 +1926,7 @@
-   rfh->Send(reply_msg);
- }
- 
-+<<<<<<< .our
- v8::Local<v8::Value> WebContents::GetPreloadPath(v8::Isolate* isolate) const {
-   if (auto* web_preferences = WebContentsPreferences::From(web_contents())) {
-     base::FilePath::StringType preload;
-@@ -1880,6 +1954,25 @@
- }
- 
- v8::Local<v8::Value> WebContents::GetOwnerBrowserWindow() const {
-+=======
-+v8::Local<v8::Value> WebContents::GetWebPreferences(v8::Isolate* isolate) {
-+  WebContentsPreferences* web_preferences =
-+      WebContentsPreferences::FromWebContents(web_contents());
-+  if (!web_preferences)
-+    return v8::Null(isolate);
-+  return mate::ConvertToV8(isolate, *web_preferences->web_preferences());
-+}
-+
-+v8::Local<v8::Value> WebContents::GetLastWebPreferences(v8::Isolate* isolate) {
-+  WebContentsPreferences* web_preferences =
-+      WebContentsPreferences::FromWebContents(web_contents());
-+  if (!web_preferences)
-+    return v8::Null(isolate);
-+  return mate::ConvertToV8(isolate, *web_preferences->last_web_preferences());
-+}
-+
-+v8::Local<v8::Value> WebContents::GetOwnerBrowserWindow() {
-+>>>>>>> .their
-   if (owner_window())
-     return BrowserWindow::From(isolate(), owner_window());
-   else
-@@ -2013,7 +2106,10 @@
-       .SetMethod("endFrameSubscription", &WebContents::EndFrameSubscription)
-       .SetMethod("startDrag", &WebContents::StartDrag)
-       .SetMethod("isGuest", &WebContents::IsGuest)
-+<<<<<<< .our
-       .SetMethod("attachToIframe", &WebContents::AttachToIframe)
-+=======
-+>>>>>>> .their
-       .SetMethod("isOffscreen", &WebContents::IsOffScreen)
-       .SetMethod("startPainting", &WebContents::StartPainting)
-       .SetMethod("stopPainting", &WebContents::StopPainting)
-changed in both
-  base   100644 16f23210557ca816cdeadd50b9332447eca8815f atom/browser/api/atom_api_web_contents.h
-  our    100644 7939f8268aa8c3371623e0c15f3b6001d7f1efa4 atom/browser/api/atom_api_web_contents.h
-  their  100644 027332a3706d5ac43a4a769234d361304bdc0350 atom/browser/api/atom_api_web_contents.h
-@@ -97,6 +97,8 @@
-   static void BuildPrototype(v8::Isolate* isolate,
-                              v8::Local<v8::FunctionTemplate> prototype);
- 
-+  static int64_t GetIDForContents(content::WebContents* web_contents);
-+
-   // Notifies to destroy any guest web contents before destroying self.
-   void DestroyWebContents(bool async);
- 
-@@ -234,8 +236,13 @@
-   v8::Local<v8::Value> GetPreloadPath(v8::Isolate* isolate) const;
- 
-   // Returns the web preferences of current WebContents.
-+<<<<<<< .our
-   v8::Local<v8::Value> GetWebPreferences(v8::Isolate* isolate) const;
-   v8::Local<v8::Value> GetLastWebPreferences(v8::Isolate* isolate) const;
-+=======
-+  v8::Local<v8::Value> GetWebPreferences(v8::Isolate* isolate);
-+  v8::Local<v8::Value> GetLastWebPreferences(v8::Isolate* isolate);
-+>>>>>>> .their
- 
-   // Returns the owner window.
-   v8::Local<v8::Value> GetOwnerBrowserWindow() const;
-changed in both
-  base   100644 3f53f4d3d7204f59037ba80556a2c9896e23aae4 atom/browser/api/atom_api_web_request.cc
-  our    100644 c088196f833160ac964e67030fa083302dd090b0 atom/browser/api/atom_api_web_request.cc
-  their  100644 ac84ac196b69a121a54dc64b87b7c2c1d6df21b5 atom/browser/api/atom_api_web_request.cc
-@@ -40,7 +40,11 @@
- 
- namespace {
- 
-+<<<<<<< .our
- template <typename Method, typename Event, typename Listener>
-+=======
-+template<typename Method, typename Event, typename Listener>
-+>>>>>>> .their
- void CallNetworkDelegateMethod(
-     brightray::URLRequestContextGetter* url_request_context_getter,
-     Method method,
-@@ -95,14 +99,24 @@
-   }
- 
-   brightray::URLRequestContextGetter* url_request_context_getter =
-+<<<<<<< .our
-       browser_context_->GetRequestContext();
-+=======
-+      browser_context_->url_request_context_getter();
-+>>>>>>> .their
-   if (!url_request_context_getter)
-     return;
-   BrowserThread::PostTask(
-       BrowserThread::IO, FROM_HERE,
-+<<<<<<< .our
-       base::BindOnce(&CallNetworkDelegateMethod<Method, Event, Listener>,
-                      base::RetainedRef(url_request_context_getter), method,
-                      type, std::move(patterns), std::move(listener)));
-+=======
-+      base::Bind(&CallNetworkDelegateMethod<Method, Event, Listener>,
-+                 base::RetainedRef(url_request_context_getter),
-+                 method, type, std::move(patterns), std::move(listener)));
-+>>>>>>> .their
- }
- 
- // static
-removed in local
-  base   100644 993f9680ccb475f8870a2e3b4da2d20472531d91 atom/browser/api/atom_api_window.cc
-  their  100644 d177afb300f65ba14daa8c07042d4d768b00fd54 atom/browser/api/atom_api_window.cc
-removed in local
-  base   100644 f86c387a34afb15920738413c6819176081b5ee7 atom/browser/api/atom_api_window.h
-  their  100644 e07f34e23f060906942b5fce81081965ea792204 atom/browser/api/atom_api_window.h
-changed in both
-  base   100644 8810fed4b9aef78842fb65db93ed2efebabb6928 atom/browser/api/event.cc
-  our    100644 7b617034eca5a229fc9323bfd6d531ebded752d6 atom/browser/api/event.cc
-  their  100644 1ee0d57e36068c9b6427c278e9a7a5a66b7f8f79 atom/browser/api/event.cc
-@@ -6,7 +6,10 @@
- 
- #include "atom/common/api/api_messages.h"
- #include "atom/common/native_mate_converters/string16_converter.h"
-+<<<<<<< .our
- #include "atom/common/native_mate_converters/value_converter.h"
-+=======
-+>>>>>>> .their
- #include "content/public/browser/render_frame_host.h"
- #include "content/public/browser/web_contents.h"
- #include "native_mate/object_template_builder.h"
-@@ -27,6 +30,7 @@
-   message_ = message;
- 
-   Observe(content::WebContents::FromRenderFrameHost(sender));
-+<<<<<<< .our
- }
- 
- void Event::RenderFrameDeleted(content::RenderFrameHost* rfh) {
-@@ -42,6 +46,23 @@
-     sender_ = new_rfh;
- }
- 
-+=======
-+}
-+
-+void Event::RenderFrameDeleted(content::RenderFrameHost* rfh) {
-+  if (sender_ != rfh)
-+    return;
-+  sender_ = nullptr;
-+  message_ = nullptr;
-+}
-+
-+void Event::RenderFrameHostChanged(content::RenderFrameHost* old_rfh,
-+                                   content::RenderFrameHost* new_rfh) {
-+  if (sender_ && sender_ == old_rfh)
-+    sender_ = new_rfh;
-+}
-+
-+>>>>>>> .their
- void Event::FrameDeleted(content::RenderFrameHost* rfh) {
-   if (sender_ != rfh)
-     return;
-@@ -57,7 +78,11 @@
-   if (message_ == nullptr || sender_ == nullptr)
-     return false;
- 
-+<<<<<<< .our
-   AtomFrameHostMsg_Message_Sync::WriteReplyParams(message_, result);
-+=======
-+  AtomFrameHostMsg_Message_Sync::WriteReplyParams(message_, json);
-+>>>>>>> .their
-   bool success = sender_->Send(message_);
-   message_ = nullptr;
-   sender_ = nullptr;
-changed in both
-  base   100644 d73bd2f64b55b5eb0827f819805578559b947f46 atom/browser/api/event.h
-  our    100644 fbec8f27574691005d203adbafb50709f5c2d010 atom/browser/api/event.h
-  their  100644 05ad7daff8ac524294c1cacb66f876efc9716dd4 atom/browser/api/event.h
-@@ -44,8 +44,13 @@
- 
-  private:
-   // Replyer for the synchronous messages.
-+<<<<<<< .our
-   content::RenderFrameHost* sender_ = nullptr;
-   IPC::Message* message_ = nullptr;
-+=======
-+  content::RenderFrameHost* sender_;
-+  IPC::Message* message_;
-+>>>>>>> .their
- 
-   DISALLOW_COPY_AND_ASSIGN(Event);
- };
-changed in both
-  base   100644 3dbcd0601ef8a63cd6712b566cdc7f388c85e3ee atom/browser/api/event_emitter.cc
-  our    100644 c6e810b51225c8f89eaf53ac3e46381b52ba63b5 atom/browser/api/event_emitter.cc
-  their  100644 91769cbb94794a978732773612a3fec245acd750 atom/browser/api/event_emitter.cc
-changed in both
-  base   100644 8d9d2960df35a33a09dfc79c4c35d424738df43f atom/browser/api/event_emitter.h
-  our    100644 5e4ca3b4ffcb184583ef386100eabda7a9e00da0 atom/browser/api/event_emitter.h
-  their  100644 8145113084a9c0c34ea808e3712879f5f70737c9 atom/browser/api/event_emitter.h
-changed in both
-  base   100644 c83a99c2b38708ca296b4c9215e26cb58eb9a7d2 atom/browser/atom_browser_client.cc
-  our    100644 57c4ee582405e6d501ec23940ccb10689ecd64a1 atom/browser/atom_browser_client.cc
-  their  100644 37dd43c49fc8056cf1a511d8c5895535a556cf9e atom/browser/atom_browser_client.cc
-@@ -343,6 +343,11 @@
-       web_preferences->AppendCommandLineSwitches(command_line);
-     SessionPreferences::AppendExtraCommandLineSwitches(
-         web_contents->GetBrowserContext(), command_line);
-+
-+    auto context_id = atom::api::WebContents::GetIDForContents(
-+      web_contents);
-+    command_line->AppendSwitchASCII(switches::kContextId,
-+      base::IntToString(context_id));
-   }
- }
- 
-changed in both
-  base   100644 f16ee50158508565cc1e043d3257ad687cc69215 atom/browser/browser.cc
-  our    100644 ce35de64d60c6767ac52596c1b32e7bde5ceefa0 atom/browser/browser.cc
-  their  100644 3ba915f91eb3403df9630697e77cce9ed7fa3307 atom/browser/browser.cc
-changed in both
-  base   100644 0970b26b776b34f68e5f22776e74c19ddcc039ad atom/browser/browser.h
-  our    100644 aed7d25c37da59c0dd5e09940a064c329353a0b2 atom/browser/browser.h
-  their  100644 a8c1a8c5e7c4409e3a78279da46fb2ba6112f409 atom/browser/browser.h
-@@ -277,7 +277,11 @@
-   bool is_ready_ = false;
- 
-   // The browser is being shutdown.
-+<<<<<<< .our
-   bool is_shutdown_ = false;
-+=======
-+  bool is_shutdown_;
-+>>>>>>> .their
- 
-   int badge_count_ = 0;
- 
-changed in both
-  base   100644 0faeee36f9390b36bc5963b2f90d2063e3603109 atom/browser/browser_mac.mm
-  our    100644 27e347eccebf006336d5d110c81717ecc45af9c3 atom/browser/browser_mac.mm
-  their  100644 e47b8cb9d3c7fcf24279cd6e973a1b00a85ea25a atom/browser/browser_mac.mm
-changed in both
-  base   100644 7c154b60b00e25c42847ceefb98723b50ea03dd0 atom/browser/native_browser_view.h
-  our    100644 56937e4c8c69e3605d2b6cc71a0877b74ff4e83d atom/browser/native_browser_view.h
-  their  100644 cab6980fa2cf035c1a5ca6b4aee822a0ee604fd4 atom/browser/native_browser_view.h
-changed in both
-  base   100644 17b0a1ee9006dd70888165a9209076fd7065f3cc atom/browser/native_browser_view_mac.mm
-  our    100644 0416e26e89f1e0f37366ef1798b4359da0729225 atom/browser/native_browser_view_mac.mm
-  their  100644 86df632638ef7772270569824515b251470d0c08 atom/browser/native_browser_view_mac.mm
-changed in both
-  base   100644 78e788b3019c23bce13fdc8d94385d4a3937cf22 atom/browser/native_browser_view_views.cc
-  our    100644 6414005a1e40d80ae86102b12edee0255cab9adb atom/browser/native_browser_view_views.cc
-  their  100644 def64d12e3520fa15a2b6779147a819a6eaec2f8 atom/browser/native_browser_view_views.cc
-changed in both
-  base   100644 5dcda13447cde098fccaf8782fefb97d861d47f4 atom/browser/native_browser_view_views.h
-  our    100644 8f8e860292baddad1156c50ae7cfaa0fd6e87d99 atom/browser/native_browser_view_views.h
-  their  100644 abf47178302ad7527c1640a3f41492f871f137e5 atom/browser/native_browser_view_views.h
-changed in both
-  base   100644 34778fb6434707e6ae3c70ab55e48e87eb556448 atom/browser/native_window.cc
-  our    100644 4ff2bcfcabfd34d8563f9ed213c03655a99dd9c6 atom/browser/native_window.cc
-  their  100644 26ac44607ebceadcde1d4c038890d914c888a0d5 atom/browser/native_window.cc
-@@ -21,6 +21,11 @@
- #include "ui/display/win/screen_win.h"
- #endif
- 
-+#if defined(OS_WIN)
-+#include "ui/base/win/shell.h"
-+#include "ui/display/win/screen_win.h"
-+#endif
-+
- DEFINE_WEB_CONTENTS_USER_DATA_KEY(atom::NativeWindowRelay);
- 
- namespace atom {
-@@ -45,9 +50,29 @@
- 
- }  // namespace
- 
-+<<<<<<< .our
- NativeWindow::NativeWindow(const mate::Dictionary& options,
-                            NativeWindow* parent)
-     : widget_(new views::Widget), parent_(parent), weak_factory_(this) {
-+=======
-+NativeWindow::NativeWindow(
-+    brightray::InspectableWebContents* inspectable_web_contents,
-+    const mate::Dictionary& options,
-+    NativeWindow* parent)
-+    : content::WebContentsObserver(inspectable_web_contents->GetWebContents()),
-+      has_frame_(true),
-+      transparent_(false),
-+      enable_larger_than_screen_(false),
-+      is_closed_(false),
-+      sheet_offset_x_(0.0),
-+      sheet_offset_y_(0.0),
-+      aspect_ratio_(0.0),
-+      parent_(parent),
-+      is_modal_(false),
-+      is_osr_dummy_(false),
-+      inspectable_web_contents_(inspectable_web_contents),
-+      weak_factory_(this) {
-+>>>>>>> .their
-   options.Get(options::kFrame, &has_frame_);
-   options.Get(options::kTransparent, &transparent_);
-   options.Get(options::kEnableLargerThanScreen, &enable_larger_than_screen_);
-changed in both
-  base   100644 d1cfa7cc352971772689ecd60a110b48ef1a7eaa atom/browser/native_window.h
-  our    100644 35b67e2dd230692c415a32aae5f0a5e99ab74ac0 atom/browser/native_window.h
-  their  100644 61922aea78e3b61db614354e6a578fcda925096b atom/browser/native_window.h
-@@ -220,6 +220,17 @@
-   virtual void HandleKeyboardEvent(
-       content::WebContents*,
-       const content::NativeWebKeyboardEvent& event) {}
-+<<<<<<< .our
-+=======
-+  virtual void ShowAutofillPopup(content::RenderFrameHost* frame_host,
-+                                 content::WebContents* web_contents,
-+                                 const gfx::RectF& bounds,
-+                                 const std::vector<base::string16>& values,
-+                                 const std::vector<base::string16>& labels) {}
-+  virtual void HideAutofillPopup(content::RenderFrameHost* frame_host) {}
-+>>>>>>> .their
-+
-+  virtual void UpdateDraggableRegionViews() {}
- 
-   // Public API used by platform-dependent delegates and observers to send UI
-   // related notifications.
-@@ -340,8 +351,13 @@
- class NativeWindowRelay
-     : public content::WebContentsUserData<NativeWindowRelay> {
-  public:
-+<<<<<<< .our
-   explicit NativeWindowRelay(base::WeakPtr<NativeWindow> window);
-   ~NativeWindowRelay() override;
-+=======
-+  explicit NativeWindowRelay(base::WeakPtr<NativeWindow> window)
-+      : key(UserDataKey()), window(window) {}
-+>>>>>>> .their
- 
-   static void* UserDataKey() {
-     return content::WebContentsUserData<NativeWindowRelay>::UserDataKey();
-changed in both
-  base   100644 60d8fc23f59a842c100412b1c236b87d0815a7a0 atom/browser/native_window_mac.h
-  our    100644 44a78198f44cdba9875e3fb27c8e2c87eaa6f33b atom/browser/native_window_mac.h
-  their  100644 9e8c3aef87dd8d2d4a3260587b7013d260649b55 atom/browser/native_window_mac.h
-@@ -118,8 +118,11 @@
-   void MoveTabToNewWindow() override;
-   void ToggleTabBar() override;
-   bool AddTabbedWindow(NativeWindow* window) override;
-+<<<<<<< .our
- 
-   bool SetWindowButtonVisibility(bool visible) override;
-+=======
-+>>>>>>> .their
- 
-   void SetVibrancy(const std::string& type) override;
-   void SetTouchBar(
-@@ -130,8 +133,19 @@
-   gfx::Rect ContentBoundsToWindowBounds(const gfx::Rect& bounds) const override;
-   gfx::Rect WindowBoundsToContentBounds(const gfx::Rect& bounds) const override;
- 
-+<<<<<<< .our
-   // Use a custom content view instead of Chromium's BridgedContentView.
-   void OverrideNSWindowContentView();
-+=======
-+  // content::WebContentsObserver:
-+  void RenderViewHostChanged(content::RenderViewHost* old_host,
-+                             content::RenderViewHost* new_host) override;
-+
-+  // Refresh the DraggableRegion views.
-+  void UpdateDraggableRegionViews() override {
-+    UpdateDraggableRegionViews(draggable_regions_);
-+  }
-+>>>>>>> .their
- 
-   // Set the attribute of NSWindow while work around a bug of zoom button.
-   void SetStyleMask(bool on, NSUInteger flag);
-changed in both
-  base   100644 ad1713e401240dbc1c2054551d0caeb41aea2884 atom/browser/native_window_mac.mm
-  our    100644 004263ec127709067e903ffbf31003b8844226b4 atom/browser/native_window_mac.mm
-  their  100644 0397c62d8df94b3ce66482c0d9c4b3b87ac97a45 atom/browser/native_window_mac.mm
-@@ -28,9 +28,12 @@
- #include "skia/ext/skia_utils_mac.h"
- #include "ui/gfx/skia_util.h"
- #include "ui/gl/gpu_switching_manager.h"
-+<<<<<<< .our
- #include "ui/views/background.h"
- #include "ui/views/cocoa/bridged_native_widget.h"
- #include "ui/views/widget/widget.h"
-+=======
-+>>>>>>> .their
- 
- // This view always takes the size of its superview. It is intended to be used
- // as a NSWindow's contentView.  It is needed because NSWindow's implementation
-@@ -1144,10 +1147,17 @@
- }
- 
- bool NativeWindowMac::AddTabbedWindow(NativeWindow* window) {
-+<<<<<<< .our
-   if (window_ == window->GetNativeWindow()) {
-     return false;
-   } else {
-     if (@available(macOS 10.12, *))
-+=======
-+  if (window_.get() == window->GetNativeWindow()) {
-+    return false;
-+  } else {
-+    if ([window_ respondsToSelector:@selector(addTabbedWindow:ordered:)])
-+>>>>>>> .their
-       [window_ addTabbedWindow:window->GetNativeWindow() ordered:NSWindowAbove];
-   }
-   return true;
-@@ -1185,15 +1195,22 @@
-       return;
-     }
- 
-+<<<<<<< .our
-     background_color_before_vibrancy_.reset([[window_ backgroundColor] retain]);
-     transparency_before_vibrancy_ = [window_ titlebarAppearsTransparent];
-     ui::GpuSwitchingManager::SetTransparent(true);
-+=======
-+    [vibrant_view removeFromSuperview];
-+    [window_ setVibrantView:nil];
-+    ui::GpuSwitchingManager::SetTransparent(transparent());
-+>>>>>>> .their
- 
-     if (title_bar_style_ != NORMAL) {
-       [window_ setTitlebarAppearsTransparent:YES];
-       [window_ setBackgroundColor:[NSColor clearColor]];
-     }
- 
-+<<<<<<< .our
-     NSVisualEffectView* effect_view = (NSVisualEffectView*)vibrant_view;
-     if (effect_view == nil) {
-       effect_view = [[[NSVisualEffectView alloc]
-@@ -1208,6 +1225,31 @@
-                              positioned:NSWindowBelow
-                              relativeTo:nil];
-     }
-+=======
-+  SetRenderWidgetHostOpaque(false);
-+  background_color_before_vibrancy_.reset([window_ backgroundColor]);
-+  transparency_before_vibrancy_ = [window_ titlebarAppearsTransparent];
-+  ui::GpuSwitchingManager::SetTransparent(true);
-+
-+  if (title_bar_style_ != NORMAL) {
-+    [window_ setTitlebarAppearsTransparent:YES];
-+    [window_ setBackgroundColor:[NSColor clearColor]];
-+  }
-+
-+  NSVisualEffectView* effect_view = (NSVisualEffectView*)vibrant_view;
-+  if (effect_view == nil) {
-+    effect_view = [[[NSVisualEffectView alloc]
-+        initWithFrame: [[window_ contentView] bounds]] autorelease];
-+    [window_ setVibrantView:(NSView*)effect_view];
-+
-+    [effect_view setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
-+    [effect_view setBlendingMode:NSVisualEffectBlendingModeBehindWindow];
-+    [effect_view setState:NSVisualEffectStateActive];
-+    [[window_ contentView] addSubview:effect_view
-+                           positioned:NSWindowBelow
-+                           relativeTo:nil];
-+  }
-+>>>>>>> .their
- 
-     NSVisualEffectMaterial vibrancyType = NSVisualEffectMaterialLight;
- 
-@@ -1387,6 +1429,7 @@
-     [parent->GetNativeWindow() addChildWindow:window_ ordered:NSWindowAbove];
- }
- 
-+<<<<<<< .our
- void NativeWindowMac::ShowWindowButton(NSWindowButton button) {
-   auto view = [window_ standardWindowButton:button];
-   [view.superview addSubview:view positioned:NSWindowAbove relativeTo:nil];
-@@ -1395,6 +1438,35 @@
- void NativeWindowMac::SetForwardMouseMessages(bool forward) {
-   [window_ setAcceptsMouseMovedEvents:forward];
- }
-+=======
-+  // Remove all ControlRegionViews that are added last time.
-+  // Note that [webView subviews] returns the view's mutable internal array and
-+  // it should be copied to avoid mutating the original array while enumerating
-+  // it.
-+  base::scoped_nsobject<NSArray> subviews([[webView subviews] copy]);
-+  for (NSView* subview in subviews.get())
-+    if ([subview isKindOfClass:[ControlRegionView class]])
-+      [subview removeFromSuperview];
-+
-+  // Draggable regions is implemented by having the whole web view draggable
-+  // (mouseDownCanMoveWindow) and overlaying regions that are not draggable.
-+  std::vector<gfx::Rect> drag_exclude_rects =
-+      CalculateNonDraggableRegions(regions, webViewWidth, webViewHeight);
-+
-+  if (browser_view_) {
-+    browser_view_->UpdateDraggableRegions(drag_exclude_rects);
-+  }
-+
-+  // Create and add a ControlRegionView for each region that needs to be
-+  // excluded from the dragging.
-+  for (const auto& rect : drag_exclude_rects) {
-+    base::scoped_nsobject<NSView> controlRegion(
-+        [[ControlRegionView alloc] initWithFrame:NSZeroRect]);
-+    [controlRegion setFrame:NSMakeRect(rect.x(), webViewHeight - rect.bottom(),
-+                                       rect.width(), rect.height())];
-+    [webView addSubview:controlRegion];
-+  }
-+>>>>>>> .their
- 
- void NativeWindowMac::OverrideNSWindowContentView() {
-   // When using `views::Widget` to hold WebContents, Chromium would use
-changed in both
-  base   100644 008109970ec8d3c55a2028a173c3b941908d78a7 atom/browser/native_window_views.cc
-  our    100644 0dba39942f92d54ba34db7709b73012055680d94 atom/browser/native_window_views.cc
-  their  100644 f3e6fc09c5850cbc3d6989a2a94607b1f9a5d514 atom/browser/native_window_views.cc
-@@ -1115,7 +1115,11 @@
-   if (!active && IsMenuBarAutoHide() && IsMenuBarVisible())
-     SetMenuBarVisibility(false);
- 
-+<<<<<<< .our
-   root_view_->ResetAltState();
-+=======
-+  menu_bar_alt_pressed_ = false;
-+>>>>>>> .their
- }
- 
- void NativeWindowViews::OnWidgetBoundsChanged(views::Widget* changed_widget,
-@@ -1237,9 +1241,138 @@
- void NativeWindowViews::HandleKeyboardEvent(
-     content::WebContents*,
-     const content::NativeWebKeyboardEvent& event) {
-+<<<<<<< .our
-   keyboard_event_handler_->HandleKeyboardEvent(event,
-                                                root_view_->GetFocusManager());
-   root_view_->HandleKeyEvent(event);
-+=======
-+  keyboard_event_handler_->HandleKeyboardEvent(event, GetFocusManager());
-+
-+  if (!menu_bar_)
-+    return;
-+
-+  // Show accelerator when "Alt" is pressed.
-+  if (menu_bar_visible_ && IsAltKey(event))
-+    menu_bar_->SetAcceleratorVisibility(
-+        event.GetType() == blink::WebInputEvent::kRawKeyDown);
-+
-+  // Show the submenu when "Alt+Key" is pressed.
-+  if (event.GetType() == blink::WebInputEvent::kRawKeyDown &&
-+      !IsAltKey(event) && IsAltModifier(event)) {
-+    if (!menu_bar_visible_ &&
-+        (menu_bar_->HasAccelerator(event.windows_key_code)))
-+      SetMenuBarVisibility(true);
-+    menu_bar_->ActivateAccelerator(event.windows_key_code);
-+    return;
-+  }
-+
-+  if (!menu_bar_autohide_)
-+    return;
-+
-+  // Toggle the menu bar only when a single Alt is released.
-+  if (event.GetType() == blink::WebInputEvent::kRawKeyDown && IsAltKey(event)) {
-+    // When a single Alt is pressed:
-+    menu_bar_alt_pressed_ = true;
-+  } else if (event.GetType() == blink::WebInputEvent::kKeyUp &&
-+             IsAltKey(event) && menu_bar_alt_pressed_) {
-+    // When a single Alt is released right after a Alt is pressed:
-+    menu_bar_alt_pressed_ = false;
-+    SetMenuBarVisibility(!menu_bar_visible_);
-+  } else {
-+    // When any other keys except single Alt have been pressed/released:
-+    menu_bar_alt_pressed_ = false;
-+  }
-+}
-+
-+void NativeWindowViews::ShowAutofillPopup(
-+    content::RenderFrameHost* frame_host,
-+    content::WebContents* web_contents,
-+    const gfx::RectF& bounds,
-+    const std::vector<base::string16>& values,
-+    const std::vector<base::string16>& labels) {
-+  bool is_offsceen = false;
-+  bool is_embedder_offscreen = false;
-+
-+  auto* web_contents_preferences =
-+      WebContentsPreferences::FromWebContents(web_contents);
-+  if (web_contents_preferences) {
-+    const auto* web_preferences = web_contents_preferences->web_preferences();
-+
-+    web_preferences->GetBoolean("offscreen", &is_offsceen);
-+    int guest_instance_id = 0;
-+    web_preferences->GetInteger(options::kGuestInstanceID, &guest_instance_id);
-+
-+    if (guest_instance_id) {
-+      auto manager = WebViewManager::GetWebViewManager(web_contents);
-+      if (manager) {
-+        auto embedder = manager->GetEmbedder(guest_instance_id);
-+        if (embedder) {
-+          is_embedder_offscreen = WebContentsPreferences::IsPreferenceEnabled(
-+              "offscreen", embedder);
-+        }
-+      }
-+    }
-+  }
-+
-+  autofill_popup_->CreateView(
-+      frame_host,
-+      is_offsceen || is_embedder_offscreen,
-+      widget(),
-+      bounds);
-+  autofill_popup_->SetItems(values, labels);
-+  autofill_popup_->UpdatePopupBounds(menu_bar_visible_ ? 0 : kMenuBarHeight);
-+}
-+
-+void NativeWindowViews::HideAutofillPopup(
-+    content::RenderFrameHost* frame_host) {
-+  autofill_popup_->Hide();
-+}
-+
-+void NativeWindowViews::Layout() {
-+  const auto size = GetContentsBounds().size();
-+  const auto menu_bar_bounds =
-+      menu_bar_visible_ ? gfx::Rect(0, 0, size.width(), kMenuBarHeight)
-+                        : gfx::Rect();
-+  if (menu_bar_) {
-+    menu_bar_->SetBoundsRect(menu_bar_bounds);
-+  }
-+
-+  if (web_view_) {
-+    web_view_->SetBoundsRect(
-+        gfx::Rect(0, menu_bar_bounds.height(), size.width(),
-+                  size.height() - menu_bar_bounds.height()));
-+  }
-+
-+  if (autofill_popup_.get())
-+    autofill_popup_->UpdatePopupBounds(menu_bar_visible_ ? 0 : kMenuBarHeight);
-+}
-+
-+gfx::Size NativeWindowViews::GetMinimumSize() const {
-+  return NativeWindow::GetMinimumSize();
-+}
-+
-+gfx::Size NativeWindowViews::GetMaximumSize() const {
-+  return NativeWindow::GetMaximumSize();
-+}
-+
-+bool NativeWindowViews::AcceleratorPressed(const ui::Accelerator& accelerator) {
-+  return accelerator_util::TriggerAcceleratorTableCommand(
-+      &accelerator_table_, accelerator);
-+}
-+
-+void NativeWindowViews::RegisterAccelerators(AtomMenuModel* menu_model) {
-+  // Clear previous accelerators.
-+  views::FocusManager* focus_manager = GetFocusManager();
-+  accelerator_table_.clear();
-+  focus_manager->UnregisterAccelerators(this);
-+
-+  // Register accelerators with focus manager.
-+  accelerator_util::GenerateAcceleratorTable(&accelerator_table_, menu_model);
-+  for (const auto& iter : accelerator_table_) {
-+    focus_manager->RegisterAccelerator(
-+        iter.first, ui::AcceleratorManager::kNormalPriority, this);
-+  }
-+>>>>>>> .their
- }
- 
- ui::WindowShowState NativeWindowViews::GetRestoredState() {
-changed in both
-  base   100644 a39e84ce5b8d7b757233dab4bed646e08cb8c76a atom/browser/net/asar/url_request_asar_job.cc
-  our    100644 85eb2e1dd142b6d64aafb5350ae47603db989e8f atom/browser/net/asar/url_request_asar_job.cc
-  their  100644 a6fe5e26540c9533f16dcf56fc955d0025de3b4a atom/browser/net/asar/url_request_asar_job.cc
-changed in both
-  base   100644 9b0f3a98dc53b922c0d070244f8f7457f332d850 atom/browser/net/atom_network_delegate.cc
-  our    100644 e71ea74317b69f31a5aac8e723902748972fed8f atom/browser/net/atom_network_delegate.cc
-  their  100644 239a64016febb8f9d81206d7f2a7d100ccd1f293 atom/browser/net/atom_network_delegate.cc
-@@ -250,6 +250,7 @@
- 
- AtomNetworkDelegate::~AtomNetworkDelegate() {}
- 
-+<<<<<<< .our
- void AtomNetworkDelegate::SetSimpleListenerInIO(SimpleEvent type,
-                                                 URLPatterns patterns,
-                                                 SimpleListener callback) {
-@@ -266,6 +267,26 @@
-     response_listeners_.erase(type);
-   else
-     response_listeners_[type] = {std::move(patterns), std::move(callback)};
-+=======
-+void AtomNetworkDelegate::SetSimpleListenerInIO(
-+    SimpleEvent type,
-+    URLPatterns patterns,
-+    SimpleListener callback) {
-+  if (callback.is_null())
-+    simple_listeners_.erase(type);
-+  else
-+    simple_listeners_[type] = { std::move(patterns), std::move(callback) };
-+}
-+
-+void AtomNetworkDelegate::SetResponseListenerInIO(
-+    ResponseEvent type,
-+    URLPatterns patterns,
-+    ResponseListener callback) {
-+  if (callback.is_null())
-+    response_listeners_.erase(type);
-+  else
-+    response_listeners_[type] = { std::move(patterns), std::move(callback) };
-+>>>>>>> .their
- }
- 
- void AtomNetworkDelegate::SetDevToolsNetworkEmulationClientId(
-changed in both
-  base   100644 e00c26ff2cbc134b987b4361896971e48056951d atom/browser/net/atom_network_delegate.h
-  our    100644 39a7a8ddfcda17fd7d022331132b54485d07a279 atom/browser/net/atom_network_delegate.h
-  their  100644 ad37a926d4732d94526f74b2f927e35504d2efe3 atom/browser/net/atom_network_delegate.h
-changed in both
-  base   100644 3313eba36bb903426778fac6cd18258a95fec677 atom/browser/resources/mac/Info.plist
-  our    100644 9094f0f7335edf833d51f688851e6a105de60433 atom/browser/resources/mac/Info.plist
-  their  100644 c95d92f883537ac180776781637ba8ccdd049900 atom/browser/resources/mac/Info.plist
-@@ -17,9 +17,15 @@
-   <key>CFBundleIconFile</key>
-   <string>electron.icns</string>
-   <key>CFBundleVersion</key>
-+<<<<<<< .our
-   <string>4.0.0</string>
-   <key>CFBundleShortVersionString</key>
-   <string>4.0.0</string>
-+=======
-+  <string>2.0.3</string>
-+  <key>CFBundleShortVersionString</key>
-+  <string>2.0.3</string>
-+>>>>>>> .their
-   <key>LSApplicationCategoryType</key>
-   <string>public.app-category.developer-tools</string>
-   <key>LSMinimumSystemVersion</key>
-changed in both
-  base   100644 c349f99d712ff69960d35b18587ddb6c417f7cd5 atom/browser/resources/win/atom.rc
-  our    100644 c0bd831e8bddf10180f75cd40694831e2e98622d atom/browser/resources/win/atom.rc
-  their  100644 5f83b4d392434036cf351157f96b891d62e16b09 atom/browser/resources/win/atom.rc
-@@ -56,8 +56,13 @@
- //
- 
- VS_VERSION_INFO VERSIONINFO
-+<<<<<<< .our
-  FILEVERSION 4,0,0,20180821
-  PRODUCTVERSION 4,0,0,20180821
-+=======
-+ FILEVERSION 2,0,3,0
-+ PRODUCTVERSION 2,0,3,0
-+>>>>>>> .their
-  FILEFLAGSMASK 0x3fL
- #ifdef _DEBUG
-  FILEFLAGS 0x1L
-@@ -74,12 +79,20 @@
-         BEGIN
-             VALUE "CompanyName", "GitHub, Inc."
-             VALUE "FileDescription", "Electron"
-+<<<<<<< .our
-             VALUE "FileVersion", "4.0.0"
-+=======
-+            VALUE "FileVersion", "2.0.3"
-+>>>>>>> .their
-             VALUE "InternalName", "electron.exe"
-             VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
-             VALUE "OriginalFilename", "electron.exe"
-             VALUE "ProductName", "Electron"
-+<<<<<<< .our
-             VALUE "ProductVersion", "4.0.0"
-+=======
-+            VALUE "ProductVersion", "2.0.3"
-+>>>>>>> .their
-             VALUE "SquirrelAwareVersion", "1"
-         END
-     END
-changed in both
-  base   100644 8bdf4e0c2be32fc7d704bc989d7ccec5dd5db672 atom/browser/ui/cocoa/atom_menu_controller.mm
-  our    100644 cecf30ce1c88e007957a65427648941765a6067e atom/browser/ui/cocoa/atom_menu_controller.mm
-  their  100644 a117a1f4fa4158cccb3d9b942e7aaa2e9960492b atom/browser/ui/cocoa/atom_menu_controller.mm
-@@ -334,8 +334,13 @@
-   if (isMenuOpen_) {
-     isMenuOpen_ = NO;
-     model_->MenuWillClose();
-+<<<<<<< .our
-     // Post async task so that itemSelected runs before the close callback
-     // deletes the controller from the map which deallocates it
-+=======
-+    // Post async task so that itemSelected runs before the close callback	
-+    // deletes the controller from the map which deallocates it	
-+>>>>>>> .their
-     if (!closeCallback.is_null()) {
-       BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, closeCallback);
-     }
-changed in both
-  base   100644 b26d472db131f7be9d5bfbbd1cebfc992743d312 atom/browser/ui/file_dialog_mac.mm
-  our    100644 18b18a8b240cda5512ae49e0afde5c749bdf75c0 atom/browser/ui/file_dialog_mac.mm
-  their  100644 89ecaf46ec7f32ca4f3a3a89de13efcbdad5619f atom/browser/ui/file_dialog_mac.mm
-@@ -27,9 +27,12 @@
- 
- @implementation PopUpButtonHandler
- 
-+<<<<<<< .our
- @synthesize savePanel;
- @synthesize fileTypesList;
- 
-+=======
-+>>>>>>> .their
- - (instancetype)initWithPanel:(NSSavePanel*)panel
-                  andTypesList:(NSArray*)typesList {
-   self = [super init];
-@@ -55,6 +58,7 @@
- }
- 
- @end
-+<<<<<<< .our
- 
- // Manages the PopUpButtonHandler.
- @interface AtomAccessoryView : NSView
-@@ -65,6 +69,17 @@
- - (void)dealloc {
-   auto* popupButton =
-       static_cast<NSPopUpButton*>([[self subviews] objectAtIndex:1]);
-+=======
-+
-+// Manages the PopUpButtonHandler.
-+@interface AtomAccessoryView : NSView
-+@end
-+
-+@implementation AtomAccessoryView
-+
-+- (void)dealloc {
-+  auto* popupButton = static_cast<NSPopUpButton*>([[self subviews] objectAtIndex: 1]);
-+>>>>>>> .their
-   [[popupButton target] release];
-   [super dealloc];
- }
-@@ -76,8 +91,11 @@
- DialogSettings::DialogSettings() = default;
- DialogSettings::~DialogSettings() = default;
- 
-+<<<<<<< .our
- namespace {
- 
-+=======
-+>>>>>>> .their
- void SetAllowedFileTypes(NSSavePanel* dialog, const Filters& filters) {
-   NSMutableArray* file_types_list = [NSMutableArray array];
-   NSMutableArray* filter_names = [NSMutableArray array];
-@@ -85,9 +103,18 @@
-   // Create array to keep file types and their name.
-   for (const Filter& filter : filters) {
-     NSMutableSet* file_type_set = [NSMutableSet set];
-+<<<<<<< .our
-     [filter_names addObject:@(filter.first.c_str())];
-     for (const std::string& ext : filter.second) {
-       [file_type_set addObject:@(ext.c_str())];
-+=======
-+    base::ScopedCFTypeRef<CFStringRef> name_cf(
-+        base::SysUTF8ToCFStringRef(filter.first));
-+    [filter_names addObject:base::mac::CFToNSCast(name_cf.get())];
-+    for (const std::string& ext : filter.second) {
-+      base::ScopedCFTypeRef<CFStringRef> ext_cf(base::SysUTF8ToCFStringRef(ext));
-+      [file_type_set addObject:base::mac::CFToNSCast(ext_cf.get())];
-+>>>>>>> .their
-     }
-     [file_types_list addObject:[file_type_set allObjects]];
-   }
-@@ -119,12 +146,19 @@
-   [label setBezeled:NO];
-   [label setDrawsBackground:NO];
- 
-+<<<<<<< .our
-   NSPopUpButton* popupButton =
-       [[NSPopUpButton alloc] initWithFrame:NSMakeRect(50.0, 2, 140, 22.0)
-                                  pullsDown:NO];
-   PopUpButtonHandler* popUpButtonHandler =
-       [[PopUpButtonHandler alloc] initWithPanel:dialog
-                                    andTypesList:file_types_list];
-+=======
-+  NSPopUpButton* popupButton = [[NSPopUpButton alloc] initWithFrame:NSMakeRect(50.0, 2, 140, 22.0)
-+                                                          pullsDown:NO];
-+  PopUpButtonHandler* popUpButtonHandler = [[PopUpButtonHandler alloc] initWithPanel:dialog
-+                                                                        andTypesList:file_types_list];
-+>>>>>>> .their
-   [popupButton addItemsWithTitles:filter_names];
-   [popupButton setTarget:popUpButtonHandler];
-   [popupButton setAction:@selector(selectFormat:)];
-changed in both
-  base   100644 a358f676a8c41d15bb9c3157cce4a62ef8356855 atom/browser/ui/tray_icon_cocoa.mm
-  our    100644 2c434d7a9e312adfb3802628a3d092a95d4ac49f atom/browser/ui/tray_icon_cocoa.mm
-  their  100644 aedce38f656eaab389502df98bb20b28e3e3619a atom/browser/ui/tray_icon_cocoa.mm
-@@ -240,13 +240,22 @@
-   }
- 
-   // check title_ being nil
-+<<<<<<< .our
-   NSString* title = @"";
-+=======
-+  NSString *title = @"";
-+>>>>>>> .their
-   if (title_)
-     title = title_;
- 
-   attributedTitle_.reset([[NSMutableAttributedString alloc]
-+<<<<<<< .our
-       initWithString:title
-           attributes:attributes]);
-+=======
-+                             initWithString:title
-+                                 attributes:attributes]);
-+>>>>>>> .their
- 
-   // NSFontAttributeName:[NSFont menuBarFontOfSize:0],
-   // NSForegroundColorAttributeName:[self colorWithHighlight: highlight]
-changed in both
-  base   100644 e1836ad68985f6068a5ea4be76d6f58682056d04 atom/browser/ui/tray_icon_gtk.cc
-  our    100644 4c780285c80a157afca74b0927175ba3b045def9 atom/browser/ui/tray_icon_gtk.cc
-  their  100644 eb7be1ed3b4345cf825075785c1c1708a7b69d30 atom/browser/ui/tray_icon_gtk.cc
-@@ -36,9 +36,16 @@
-   if (libgtkui::AppIndicatorIcon::CouldOpen()) {
-     ++indicators_count;
-     icon_.reset(new libgtkui::AppIndicatorIcon(
-+<<<<<<< .our
-         base::StringPrintf("%s%d", Browser::Get()->GetName().c_str(),
-                            indicators_count),
-         image.AsImageSkia(), toolTip));
-+=======
-+        base::StringPrintf(
-+            "%s%d", Browser::Get()->GetName().c_str(), indicators_count),
-+        image.AsImageSkia(),
-+        toolTip));
-+>>>>>>> .their
-   } else {
-     icon_.reset(new libgtkui::Gtk2StatusIcon(image.AsImageSkia(), toolTip));
-   }
-changed in both
-  base   100644 5182e1a0f7f141e8ddfa95fd8cca8771f2cabd9f atom/browser/ui/views/frameless_view.cc
-  our    100644 8959ee13612979d2819621acc14ebf641fb7f116 atom/browser/ui/views/frameless_view.cc
-  their  100644 b78e897b8f51747fbeb86cdf1e507ecf5be0bf9b atom/browser/ui/views/frameless_view.cc
-changed in both
-  base   100644 f2ab22f70a6fa08ff1315d197ff3ff3cb700733f atom/browser/ui/views/global_menu_bar_x11.cc
-  our    100644 656bd8f991f87c06a240cdc09a3bfcd500d1c1c8 atom/browser/ui/views/global_menu_bar_x11.cc
-  their  100644 eaeefbd1fb411fca13d6de5dbbc17806d271affd atom/browser/ui/views/global_menu_bar_x11.cc
-changed in both
-  base   100644 bf9801a1457740da391c75621214b8d91cb7467d atom/browser/ui/views/menu_bar.cc
-  our    100644 e838d3cc217b5ffdb77226beff0d7217539f23f9 atom/browser/ui/views/menu_bar.cc
-  their  100644 d963c121bbd29bf3f67b488666297c86b4fee225 atom/browser/ui/views/menu_bar.cc
-@@ -18,11 +18,17 @@
- 
- namespace {
- 
-+<<<<<<< .our
-+=======
-+const char kViewClassName[] = "ElectronMenuBar";
-+
-+>>>>>>> .their
- // Default color of the menu bar.
- const SkColor kDefaultColor = SkColorSetARGB(255, 233, 233, 233);
- 
- }  // namespace
- 
-+<<<<<<< .our
- const char MenuBar::kViewClassName[] = "ElectronMenuBar";
- 
- MenuBar::MenuBar(views::View* window)
-@@ -32,12 +38,35 @@
-   SetLayoutManager(
-       std::make_unique<views::BoxLayout>(views::BoxLayout::kHorizontal));
-   window_->GetFocusManager()->AddFocusChangeListener(this);
-+=======
-+MenuBar::MenuBar(NativeWindow* window)
-+    : background_color_(kDefaultColor), menu_model_(NULL), window_(window) {
-+  RefreshColorCache();
-+  UpdateViewColors();
-+  SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal));
-+>>>>>>> .their
- }
- 
- MenuBar::~MenuBar() {
-   window_->GetFocusManager()->RemoveFocusChangeListener(this);
- }
- 
-+<<<<<<< .our
-+=======
-+void MenuBar::AddedToWidget() {
-+  auto fm = GetFocusManager();
-+  fm->AddFocusChangeListener(this);
-+  // Note that we don't own fm -- this manages the _connection_
-+  focus_manager_.reset(fm, [this](views::FocusManager* fm) {
-+    fm->RemoveFocusChangeListener(this);
-+  });
-+}
-+
-+void MenuBar::RemovedFromWidget() {
-+  focus_manager_.reset();
-+}
-+
-+>>>>>>> .their
- void MenuBar::SetMenu(AtomMenuModel* model) {
-   menu_model_ = model;
-   RebuildChildren();
-@@ -61,7 +90,11 @@
- }
- 
- void MenuBar::ActivateAccelerator(base::char16 key) {
-+<<<<<<< .our
-   auto* child = FindAccelChild(key);
-+=======
-+  auto child = FindAccelChild(key);
-+>>>>>>> .their
-   if (child)
-     static_cast<SubmenuButton*>(child)->Activate(nullptr);
- }
-@@ -151,7 +184,11 @@
- void MenuBar::RebuildChildren() {
-   RemoveAllChildViews(true);
-   for (int i = 0, n = GetItemCount(); i < n; ++i) {
-+<<<<<<< .our
-     auto* button =
-+=======
-+    auto button =
-+>>>>>>> .their
-         new SubmenuButton(menu_model_->GetLabelAt(i), this, background_color_);
-     button->set_tag(i);
-     AddChildView(button);
-@@ -169,7 +206,11 @@
- #if defined(USE_X11)
-   const auto& textColor = has_focus_ ? enabled_color_ : disabled_color_;
-   for (auto* child : GetChildrenInZOrder()) {
-+<<<<<<< .our
-     auto* button = static_cast<SubmenuButton*>(child);
-+=======
-+    auto button = static_cast<SubmenuButton*>(child);
-+>>>>>>> .their
-     button->SetTextColor(views::Button::STATE_NORMAL, textColor);
-     button->SetTextColor(views::Button::STATE_DISABLED, disabled_color_);
-     button->SetTextColor(views::Button::STATE_PRESSED, enabled_color_);
-@@ -178,7 +219,11 @@
-   }
- #elif defined(OS_WIN)
-   for (auto* child : GetChildrenInZOrder()) {
-+<<<<<<< .our
-     auto* button = static_cast<SubmenuButton*>(child);
-+=======
-+    auto button = static_cast<SubmenuButton*>(child);
-+>>>>>>> .their
-     button->SetUnderlineColor(color_utils::GetSysSkColor(COLOR_MENUTEXT));
-   }
- #endif
-changed in both
-  base   100644 761e31b98ea75f44bcd016da3b34b7615f3b409f atom/browser/ui/views/menu_bar.h
-  our    100644 2b10ba3e3bf2ccfc0453fdb59ad022ef7da8ed5b atom/browser/ui/views/menu_bar.h
-  their  100644 13cfa32f3988881e3aa87cae6cae65656fa68d70 atom/browser/ui/views/menu_bar.h
-@@ -5,6 +5,12 @@
- #ifndef ATOM_BROWSER_UI_VIEWS_MENU_BAR_H_
- #define ATOM_BROWSER_UI_VIEWS_MENU_BAR_H_
- 
-+<<<<<<< .our
-+=======
-+#include <memory>
-+
-+#include "atom/browser/native_window.h"
-+>>>>>>> .their
- #include "atom/browser/ui/atom_menu_model.h"
- #include "ui/views/controls/button/menu_button_listener.h"
- #include "ui/views/focus/focus_manager.h"
-@@ -49,7 +55,9 @@
- 
-  protected:
-   // views::View:
-+  void AddedToWidget() override;
-   const char* GetClassName() const override;
-+  void RemovedFromWidget() override;
- 
-   // views::MenuButtonListener:
-   void OnMenuButtonClicked(views::MenuButton* source,
-@@ -79,6 +87,11 @@
- 
-   bool has_focus_ = true;
- 
-+  View* FindAccelChild(base::char16 key);
-+
-+  std::shared_ptr<views::FocusManager> focus_manager_;
-+  bool has_focus_ = true;
-+
-   DISALLOW_COPY_AND_ASSIGN(MenuBar);
- };
- 
-changed in both
-  base   100644 3c3cff3c65410f2e61bdade6e457a096ffba3a54 atom/browser/ui/views/submenu_button.cc
-  our    100644 1124d3d01471876fefa2757570ba3cff796a991c atom/browser/ui/views/submenu_button.cc
-  their  100644 baee28f2cd6931611e048ec46c83e602b95b4b59 atom/browser/ui/views/submenu_button.cc
-@@ -82,8 +82,12 @@
- 
- bool SubmenuButton::GetUnderlinePosition(const base::string16& text,
-                                          base::char16* accelerator,
-+<<<<<<< .our
-                                          int* start,
-                                          int* end) const {
-+=======
-+                                         int* start, int* end) const {
-+>>>>>>> .their
-   int pos, span;
-   base::string16 trimmed = gfx::RemoveAcceleratorChar(text, '&', &pos, &span);
-   if (pos > -1 && span != 0) {
-@@ -96,9 +100,14 @@
-   return false;
- }
- 
-+<<<<<<< .our
- void SubmenuButton::GetCharacterPosition(const base::string16& text,
-                                          int index,
-                                          int* pos) const {
-+=======
-+void SubmenuButton::GetCharacterPosition(
-+    const base::string16& text, int index, int* pos) const {
-+>>>>>>> .their
-   int height = 0;
-   gfx::Canvas::SizeStringInt(text.substr(0, index), gfx::FontList(), pos,
-                              &height, 0, 0);
-changed in both
-  base   100644 5c05481cbbfb85b5d77511cb91cc19cc8ef0e626 atom/browser/ui/views/submenu_button.h
-  our    100644 d8b7785da131271e88533879d090badfd6e49dd5 atom/browser/ui/views/submenu_button.h
-  their  100644 0f7eddf4c914790675f0c9bfab696b2a96b91f74 atom/browser/ui/views/submenu_button.h
-@@ -33,11 +33,17 @@
-  private:
-   bool GetUnderlinePosition(const base::string16& text,
-                             base::char16* accelerator,
-+<<<<<<< .our
-                             int* start,
-                             int* end) const;
-   void GetCharacterPosition(const base::string16& text,
-                             int index,
-                             int* pos) const;
-+=======
-+                            int* start, int* end) const;
-+  void GetCharacterPosition(
-+      const base::string16& text, int index, int* pos) const;
-+>>>>>>> .their
- 
-   base::char16 accelerator_ = 0;
- 
-changed in both
-  base   100644 2cbf07be86a812f07105846dc8caf8226a8595df atom/browser/web_contents_preferences.cc
-  our    100644 c21c93383155091a7481cdd4e741cefad90a4a55 atom/browser/web_contents_preferences.cc
-  their  100644 98b39fee234cb15ac0da99fd5639c7b8265d71b0 atom/browser/web_contents_preferences.cc
-@@ -97,6 +97,7 @@
-   instances_.push_back(this);
- 
-   // Set WebPreferences defaults onto the JS object
-+<<<<<<< .our
-   SetDefaultBoolIfUndefined(options::kPlugins, false);
-   SetDefaultBoolIfUndefined(options::kExperimentalFeatures, false);
-   bool node = SetDefaultBoolIfUndefined(options::kNodeIntegration, true);
-@@ -104,12 +105,23 @@
-   SetDefaultBoolIfUndefined(options::kWebviewTag, node);
-   SetDefaultBoolIfUndefined(options::kSandbox, false);
-   SetDefaultBoolIfUndefined(options::kNativeWindowOpen, false);
-+=======
-+  SetDefaultBoolIfUndefined("plugins", false);
-+  SetDefaultBoolIfUndefined(options::kExperimentalFeatures, false);
-+  SetDefaultBoolIfUndefined(options::kExperimentalCanvasFeatures, false);
-+  bool node = SetDefaultBoolIfUndefined(options::kNodeIntegration, true);
-+  SetDefaultBoolIfUndefined(options::kNodeIntegrationInWorker, false);
-+  SetDefaultBoolIfUndefined(options::kWebviewTag, node);
-+  SetDefaultBoolIfUndefined("sandbox", false);
-+  SetDefaultBoolIfUndefined("nativeWindowOpen", false);
-+>>>>>>> .their
-   SetDefaultBoolIfUndefined(options::kContextIsolation, false);
-   SetDefaultBoolIfUndefined("javascript", true);
-   SetDefaultBoolIfUndefined("images", true);
-   SetDefaultBoolIfUndefined("textAreasAreResizable", true);
-   SetDefaultBoolIfUndefined("webgl", true);
-   bool webSecurity = true;
-+<<<<<<< .our
-   SetDefaultBoolIfUndefined(options::kWebSecurity, webSecurity);
-   // If webSecurity was explicity set to false, let's inherit that into
-   // insecureContent
-@@ -125,6 +137,21 @@
-   SetDefaultBoolIfUndefined(options::kOffscreen, false);
- 
-   last_preference_ = preference_.Clone();
-+=======
-+  SetDefaultBoolIfUndefined("webSecurity", webSecurity);
-+  // If webSecurity was explicity set to false, let's inherit that into
-+  // insecureContent
-+  if (web_preferences.Get("webSecurity", &webSecurity) && !webSecurity) {
-+    SetDefaultBoolIfUndefined("allowRunningInsecureContent", true);
-+  } else {
-+    SetDefaultBoolIfUndefined("allowRunningInsecureContent", false);
-+  }
-+  #if defined(OS_MACOSX)
-+  SetDefaultBoolIfUndefined(options::kScrollBounce, false);
-+  #endif
-+  SetDefaultBoolIfUndefined("offscreen", false);
-+  last_web_preferences_.MergeDictionary(&web_preferences_);
-+>>>>>>> .their
- }
- 
- WebContentsPreferences::~WebContentsPreferences() {
-@@ -154,6 +181,16 @@
-   return default_value;
- }
- 
-+bool WebContentsPreferences::SetDefaultBoolIfUndefined(const std::string key,
-+                                                       bool val) {
-+  bool existing;
-+  if (!web_preferences_.GetBoolean(key, &existing)) {
-+    web_preferences_.SetBoolean(key, val);
-+    return val;
-+  }
-+  return existing;
-+}
-+
- void WebContentsPreferences::Merge(const base::DictionaryValue& extend) {
-   if (preference_.is_dict())
-     static_cast<base::DictionaryValue*>(&preference_)->MergeDictionary(&extend);
-@@ -212,8 +249,18 @@
-   return FromWebContents(web_contents);
- }
- 
-+<<<<<<< .our
- void WebContentsPreferences::AppendCommandLineSwitches(
-     base::CommandLine* command_line) {
-+=======
-+  // We are appending args to a webContents so let's save the current state
-+  // of our preferences object so that during the lifetime of the WebContents
-+  // we can fetch the options used to initally configure the WebContents
-+  self->last_web_preferences_.Clear();
-+  self->last_web_preferences_.MergeDictionary(&web_preferences);
-+
-+  bool b;
-+>>>>>>> .their
-   // Check if plugins are enabled.
-   if (IsEnabled(options::kPlugins))
-     command_line->AppendSwitch(switches::kEnablePlugins);
-changed in both
-  base   100644 94dd8dc598bef5cc35383d69d20ade8d644a7ef5 atom/browser/web_contents_preferences.h
-  our    100644 d835347afcd259f473f95271a2c19e42afcc6f2b atom/browser/web_contents_preferences.h
-  their  100644 28ee9a85485e26b33b8a7852a4a212b4c11b71a0 atom/browser/web_contents_preferences.h
-@@ -59,25 +59,45 @@
-   bool GetPreloadPath(base::FilePath::StringType* path) const;
- 
-   // Returns the web preferences.
-+<<<<<<< .our
-   base::Value* preference() { return &preference_; }
-   base::Value* last_preference() { return &last_preference_; }
-+=======
-+  base::DictionaryValue* web_preferences() { return &web_preferences_; }
-+  base::DictionaryValue* last_web_preferences() {
-+    return &last_web_preferences_;
-+  }
-+>>>>>>> .their
- 
-  private:
-   friend class content::WebContentsUserData<WebContentsPreferences>;
-   friend class AtomBrowserClient;
- 
-+<<<<<<< .our
-   // Get WebContents according to process ID.
-   static content::WebContents* GetWebContentsFromProcessID(int process_id);
- 
-   // Set preference value to given bool if user did not provide value
-   bool SetDefaultBoolIfUndefined(const base::StringPiece& key, bool val);
-+=======
-+  // Set preference value to given bool if user did not provide value
-+  bool SetDefaultBoolIfUndefined(const std::string key, bool val);
-+
-+  // Get preferences value as integer possibly coercing it from a string
-+  bool GetInteger(const std::string& attributeName, int* intValue);
-+>>>>>>> .their
- 
-   static std::vector<WebContentsPreferences*> instances_;
- 
-   content::WebContents* web_contents_;
-+<<<<<<< .our
- 
-   base::Value preference_ = base::Value(base::Value::Type::DICTIONARY);
-   base::Value last_preference_ = base::Value(base::Value::Type::DICTIONARY);
-+=======
-+  base::DictionaryValue web_preferences_;
-+  base::DictionaryValue last_web_preferences_;
-+>>>>>>> .their
- 
-   DISALLOW_COPY_AND_ASSIGN(WebContentsPreferences);
- };
-changed in both
-  base   100644 1dd479883d872dc6d76ef069782aad6dc4f731da atom/browser/web_dialog_helper.cc
-  our    100644 74c8573d13f15bcaa189abdc40fa0cd8e48f89be atom/browser/web_dialog_helper.cc
-  their  100644 c76b48a74b3629b9b8588983cb4563aada6d28b9 atom/browser/web_dialog_helper.cc
-changed in both
-  base   100644 ad8c1d49bbc049b89eb4c69224b42fb51906c726 atom/common/api/api_messages.h
-  our    100644 6131a7a473c68e31790fcd8697c8f380c65ad275 atom/common/api/api_messages.h
-  their  100644 46e6142260d67b6408060ccaf328ee1f74335fe4 atom/common/api/api_messages.h
-@@ -59,6 +59,7 @@
- 
- // Sent by renderer to set the temporary zoom level.
- IPC_SYNC_MESSAGE_ROUTED1_1(AtomFrameHostMsg_SetTemporaryZoomLevel,
-+<<<<<<< .our
-                            double /* zoom level */,
-                            double /* result */)
- 
-@@ -69,3 +70,10 @@
- IPC_MESSAGE_ROUTED2(AtomFrameHostMsg_PDFSaveURLAs,
-                     GURL /* url */,
-                     content::Referrer /* referrer */)
-+=======
-+                            double /* zoom level */,
-+                            double /* result */)
-+
-+// Sent by renderer to get the zoom level.
-+IPC_SYNC_MESSAGE_ROUTED0_1(AtomFrameHostMsg_GetZoomLevel, double /* result */)
-+>>>>>>> .their
-changed in both
-  base   100644 fe3ba33412bb277b80b192e26bb90ed0fe5feef1 atom/common/api/atom_api_native_image.cc
-  our    100644 09edfdaac9107386241505d2d5763b1b24aa73a4 atom/common/api/atom_api_native_image.cc
-  their  100644 1f38d210d824befb3bd10c10a14adce3bd1a127c atom/common/api/atom_api_native_image.cc
-changed in both
-  base   100644 d1a185d51f394b1828d66cbcf2a1d1cc278de23d atom/common/api/remote_callback_freer.cc
-  our    100644 eba828591353dae53d1b7cdaa60fee52166d7473 atom/common/api/remote_callback_freer.cc
-  their  100644 c15d5389a2e99fa0f305a812860a3232a3ec069d atom/common/api/remote_callback_freer.cc
-@@ -39,7 +39,11 @@
-   base::ListValue args;
-   args.AppendString(context_id_);
-   args.AppendInteger(object_id_);
-+<<<<<<< .our
-   auto* frame_host = web_contents()->GetMainFrame();
-+=======
-+  auto frame_host = web_contents()->GetMainFrame();
-+>>>>>>> .their
-   if (frame_host) {
-     frame_host->Send(new AtomFrameMsg_Message(frame_host->GetRoutingID(), false,
-                                               channel, args));
-changed in both
-  base   100644 315127822d1709802abf317c4d8cf49ec7e2bfaa atom/common/api/remote_object_freer.cc
-  our    100644 8afe8b9a32bc4ba4d5cdfc66ecf7036b8553cb48 atom/common/api/remote_object_freer.cc
-  their  100644 ef028441e3da5c7d56f6bdba2f162814ff6b21f3 atom/common/api/remote_object_freer.cc
-changed in both
-  base   100644 5fa39680ca814675d344665b3b2a6ce5d94e625f atom/common/atom_version.h
-  our    100644 65e7d19911559a40b1b258319df5fe0fa180354f atom/common/atom_version.h
-  their  100644 ea9e6ff8aa1c57913647ad1f4b9e82a5c9ef7a01 atom/common/atom_version.h
-@@ -5,10 +5,17 @@
- #ifndef ATOM_COMMON_ATOM_VERSION_H_
- #define ATOM_COMMON_ATOM_VERSION_H_
- 
-+<<<<<<< .our
- #define ATOM_MAJOR_VERSION 4
- #define ATOM_MINOR_VERSION 0
- #define ATOM_PATCH_VERSION 0
- #define ATOM_PRE_RELEASE_VERSION -nightly.20180821
-+=======
-+#define ATOM_MAJOR_VERSION 2
-+#define ATOM_MINOR_VERSION 0
-+#define ATOM_PATCH_VERSION 3
-+// #define ATOM_PRE_RELEASE_VERSION
-+>>>>>>> .their
- 
- #ifndef ATOM_STRINGIFY
- #define ATOM_STRINGIFY(n) ATOM_STRINGIFY_HELPER(n)
-changed in both
-  base   100644 a7908ef30c6bafc4aca1da9a870f7ae12703fe04 atom/common/crash_reporter/crash_reporter_win.cc
-  our    100644 c574da71c9de9bd8c7b7cad57d3a0f84708fb97c atom/common/crash_reporter/crash_reporter_win.cc
-  their  100644 49f90b7e6665727b697a243414544bae304fde6e atom/common/crash_reporter/crash_reporter_win.cc
-changed in both
-  base   100644 cff228ba49068a8a683257e9ac50778437a56c45 atom/common/linux/application_info.cc
-  our    100644 3354c73b8b60f77cf054f975ea713d96b7e7683e atom/common/linux/application_info.cc
-  their  100644 05bd7f6fc15015a4f570e36801aea622a8f0cb3a atom/common/linux/application_info.cc
-@@ -19,7 +19,11 @@
- namespace {
- 
- GDesktopAppInfo* get_desktop_app_info() {
-+<<<<<<< .our
-   GDesktopAppInfo* ret = nullptr;
-+=======
-+  GDesktopAppInfo * ret = nullptr;
-+>>>>>>> .their
- 
-   std::string desktop_id;
-   if (brightray::platform_util::GetDesktopName(&desktop_id))
-changed in both
-  base   100644 eed6e7bc092f84bd1bde673c27f5fe5363c7783c atom/common/options_switches.cc
-  our    100644 8b1836f80c583e4db68971ff1b00ca4f86356b45 atom/common/options_switches.cc
-  their  100644 c1cd185443c0fdbadeb7ba2e174d2048ab2d45d7 atom/common/options_switches.cc
-@@ -188,6 +188,9 @@
- // The application path
- const char kAppPath[] = "app-path";
- 
-+// The context ID for this process
-+const char kContextId[] = "context-id";
-+
- // The command line switch versions of the options.
- const char kBackgroundColor[] = "background-color";
- const char kPreloadScript[] = "preload";
-changed in both
-  base   100644 525301971c8a05c45e12aada7d0534b84307aebf atom/common/options_switches.h
-  our    100644 5f6d7e9d38120668ed06922ced2f8d6a6e27a52b atom/common/options_switches.h
-  their  100644 9d65bc376925906063c24a9a254b2c31c7e22c34 atom/common/options_switches.h
-@@ -92,6 +92,7 @@
- extern const char kSecureSchemes[];
- extern const char kAppUserModelId[];
- extern const char kAppPath[];
-+extern const char kContextId[];
- 
- extern const char kBackgroundColor[];
- extern const char kPreloadScript[];
-changed in both
-  base   100644 7bee1411ba1c2fbac516ff8b65bcbd89f6132819 atom/renderer/api/atom_api_renderer_ipc.cc
-  our    100644 3e48a4f7d0c11f40e6360b0acc2c83c38e671319 atom/renderer/api/atom_api_renderer_ipc.cc
-  their  100644 ad6a12b90d525e9c6a49fac7a5d122b8c2c295f9 atom/renderer/api/atom_api_renderer_ipc.cc
-@@ -12,8 +12,13 @@
- #include "native_mate/dictionary.h"
- #include "third_party/WebKit/public/web/WebLocalFrame.h"
- 
-+<<<<<<< .our
- using blink::WebLocalFrame;
- using content::RenderFrame;
-+=======
-+using content::RenderFrame;
-+using blink::WebLocalFrame;
-+>>>>>>> .their
- 
- namespace atom {
- 
-@@ -48,10 +53,17 @@
- 
-   RenderFrame* render_frame = GetCurrentRenderFrame();
-   if (render_frame == nullptr)
-+<<<<<<< .our
-     return result;
- 
-   IPC::SyncMessage* message = new AtomFrameHostMsg_Message_Sync(
-       render_frame->GetRoutingID(), channel, arguments, &result);
-+=======
-+    return json;
-+
-+  IPC::SyncMessage* message = new AtomFrameHostMsg_Message_Sync(
-+      render_frame->GetRoutingID(), channel, arguments, &json);
-+>>>>>>> .their
-   bool success = render_frame->Send(message);
- 
-   if (!success)
-changed in both
-  base   100644 d0164f44a0a523b26a919e02b5b7add25a0e7224 atom/renderer/api/atom_api_web_frame.cc
-  our    100644 f0f7ef249d73876f7107d3d3865e8fc71ee33945 atom/renderer/api/atom_api_web_frame.cc
-  their  100644 c36d1a06491994f126333c98796f6ff64cfc6506 atom/renderer/api/atom_api_web_frame.cc
-changed in both
-  base   100644 1971a26c1c5d4f5c5f5f029e6334f157a16b5394 atom/renderer/atom_render_frame_observer.cc
-  our    100644 ea2355fd968339600ae8093524f1c3dcfd2f4ff3 atom/renderer/atom_render_frame_observer.cc
-  their  100644 4ddf9186b723091ef91d69cfaedc4fbdd1ac09fa atom/renderer/atom_render_frame_observer.cc
-@@ -7,6 +7,8 @@
- #include <string>
- #include <vector>
- 
-+#include "atom/common/native_mate_converters/string16_converter.h"
-+
- #include "atom/common/api/api_messages.h"
- #include "atom/common/api/event_emitter_caller.h"
- #include "atom/common/native_mate_converters/value_converter.h"
-@@ -72,7 +74,12 @@
-     RendererClientBase* renderer_client)
-     : content::RenderFrameObserver(frame),
-       render_frame_(frame),
-+<<<<<<< .our
-       renderer_client_(renderer_client) {
-+=======
-+      renderer_client_(renderer_client),
-+      document_created_(false) {
-+>>>>>>> .their
-   // Initialise resource for directory listing.
-   net::NetModule::SetResourceProvider(NetResourceProvider);
- }
-@@ -195,8 +202,13 @@
- }
- 
- void AtomRenderFrameObserver::EmitIPCEvent(blink::WebLocalFrame* frame,
-+<<<<<<< .our
-                                            const base::string16& channel,
-                                            const base::ListValue& args) {
-+=======
-+                                          const base::string16& channel,
-+                                          const base::ListValue& args) {
-+>>>>>>> .their
-   if (!frame)
-     return;
- 
-changed in both
-  base   100644 248d5a68096dedea0f6ffb3c9df38ff3373e7c18 atom/renderer/atom_render_frame_observer.h
-  our    100644 e774741c019956a3bff00db2f6d2b133bf1be6de atom/renderer/atom_render_frame_observer.h
-  their  100644 d4f3d0c7d5c454bb65a190f59b26501137dd04e0 atom/renderer/atom_render_frame_observer.h
-@@ -56,7 +56,11 @@
- 
-   content::RenderFrame* render_frame_;
-   RendererClientBase* renderer_client_;
-+<<<<<<< .our
-   bool document_created_ = false;
-+=======
-+  bool document_created_;
-+>>>>>>> .their
- 
-   DISALLOW_COPY_AND_ASSIGN(AtomRenderFrameObserver);
- };
-changed in both
-  base   100644 4d3e7cba7a65330a45a5f2aebba90c257b206e35 atom/renderer/atom_render_view_observer.h
-  our    100644 097616e12369662473c12645a93e27cffcb55e3b atom/renderer/atom_render_view_observer.h
-  their  100644 ca9fb01288e3bd4788c7718f0feb8b37307383e6 atom/renderer/atom_render_view_observer.h
-@@ -14,7 +14,11 @@
-   explicit AtomRenderViewObserver(content::RenderView* render_view);
- 
-  protected:
-+<<<<<<< .our
-   ~AtomRenderViewObserver() override;
-+=======
-+  virtual ~AtomRenderViewObserver();
-+>>>>>>> .their
- 
-  private:
-   // content::RenderViewObserver implementation.
-changed in both
-  base   100644 82ba9d024350009ae86bc5406513c8086073990a atom/renderer/atom_renderer_client.cc
-  our    100644 204f17c2cf0d2d4ec4a71bdbecfcd1cbdc5fc8be atom/renderer/atom_renderer_client.cc
-  their  100644 12e8fa2603a1b533646b300efbf312b9cb2d8361 atom/renderer/atom_renderer_client.cc
-changed in both
-  base   100644 07d20bda8b00b1acdb823546f5e606154278cd4e atom/renderer/atom_sandboxed_renderer_client.cc
-  our    100644 6e29fe45a69f44856d7fca449ec1be4eaf6970a2 atom/renderer/atom_sandboxed_renderer_client.cc
-  their  100644 cf272da91184fcccd484d25a48914897e68ad7e5 atom/renderer/atom_sandboxed_renderer_client.cc
-@@ -12,11 +12,16 @@
- #include "atom/common/options_switches.h"
- #include "atom/renderer/api/atom_api_renderer_ipc.h"
- #include "atom/renderer/atom_render_frame_observer.h"
-+<<<<<<< .our
- #include "base/base_paths.h"
- #include "base/command_line.h"
- #include "base/files/file_path.h"
- #include "base/path_service.h"
- #include "base/process/process_handle.h"
-+=======
-+#include "base/command_line.h"
-+#include "base/files/file_path.h"
-+>>>>>>> .their
- #include "chrome/renderer/printing/print_web_view_helper.h"
- #include "content/public/renderer/render_frame.h"
- #include "native_mate/dictionary.h"
-@@ -34,8 +39,13 @@
- const std::string kModuleCacheKey = "native-module-cache";
- 
- bool IsDevTools(content::RenderFrame* render_frame) {
-+<<<<<<< .our
-   return render_frame->GetWebFrame()->GetDocument().Url().ProtocolIs(
-       "chrome-devtools");
-+=======
-+  return render_frame->GetWebFrame()->GetDocument().Url()
-+        .ProtocolIs("chrome-devtools");
-+>>>>>>> .their
- }
- 
- v8::Local<v8::Object> GetModuleCache(v8::Isolate* isolate) {
-@@ -84,6 +94,7 @@
-   return base::CommandLine::ForCurrentProcess()->argv();
- }
- 
-+<<<<<<< .our
- base::FilePath::StringType GetExecPath() {
-   base::FilePath path;
-   PathService::Get(base::FILE_EXE, &path);
-@@ -95,6 +106,24 @@
-   auto script = v8::Script::Compile(preloadSrc);
-   auto func = script->Run();
-   return func;
-+=======
-+void InitializeBindings(v8::Local<v8::Object> binding,
-+                        v8::Local<v8::Context> context) {
-+  auto isolate = context->GetIsolate();
-+  mate::Dictionary b(isolate, binding);
-+  b.SetMethod("get", GetBinding);
-+  b.SetMethod("crash", AtomBindings::Crash);
-+  b.SetMethod("hang", AtomBindings::Hang);
-+  b.SetMethod("getArgv", GetArgv);
-+  b.SetMethod("getProcessMemoryInfo", &AtomBindings::GetProcessMemoryInfo);
-+  b.SetMethod("getSystemMemoryInfo", &AtomBindings::GetSystemMemoryInfo);
-+
-+  // Pass in CLI flags needed to setup the renderer
-+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-+  if (command_line->HasSwitch(switches::kGuestInstanceID))
-+    b.Set(options::kGuestInstanceID,
-+        command_line->GetSwitchValueASCII(switches::kGuestInstanceID));
-+>>>>>>> .their
- }
- 
- class AtomSandboxedRenderFrameObserver : public AtomRenderFrameObserver {
-@@ -102,12 +131,19 @@
-   AtomSandboxedRenderFrameObserver(content::RenderFrame* render_frame,
-                                    AtomSandboxedRendererClient* renderer_client)
-       : AtomRenderFrameObserver(render_frame, renderer_client),
-+<<<<<<< .our
-         renderer_client_(renderer_client) {}
-+=======
-+        v8_converter_(new atom::V8ValueConverter),
-+        renderer_client_(renderer_client) {
-+    v8_converter_->SetDisableNode(true);
-+  }
-+>>>>>>> .their
- 
-  protected:
-   void EmitIPCEvent(blink::WebLocalFrame* frame,
-                     const base::string16& channel,
--                    const base::ListValue& args) override {
-+                    const base::ListValue& args) {
-     if (!frame)
-       return;
- 
-@@ -176,6 +212,7 @@
- }
- 
- void AtomSandboxedRendererClient::DidCreateScriptContext(
-+<<<<<<< .our
-     v8::Handle<v8::Context> context,
-     content::RenderFrame* render_frame) {
-   RendererClientBase::DidCreateScriptContext(context, render_frame);
-@@ -184,6 +221,18 @@
-   // For devtools we still want to run the preload_bundle script
-   if (!render_frame->IsMainFrame() && !IsDevTools(render_frame))
-     return;
-+=======
-+    v8::Handle<v8::Context> context, content::RenderFrame* render_frame) {
-+
-+  // Only allow preload for the main frame or
-+  // For devtools we still want to run the preload_bundle script
-+  if (!render_frame->IsMainFrame() && !IsDevTools(render_frame))
-+    return;
-+
-+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-+  base::FilePath preload_script_path = command_line->GetSwitchValuePath(
-+      switches::kPreloadScript);
-+>>>>>>> .their
- 
-   auto* isolate = context->GetIsolate();
-   v8::HandleScope handle_scope(isolate);
-@@ -203,7 +252,14 @@
-   auto binding = v8::Object::New(isolate);
-   InitializeBindings(binding, context);
-   AddRenderBindings(isolate, binding);
-+<<<<<<< .our
-   v8::Local<v8::Value> args[] = {binding};
-+=======
-+  v8::Local<v8::Value> args[] = {
-+    binding,
-+    mate::ConvertToV8(isolate, preload_script_path.value())
-+  };
-+>>>>>>> .their
-   // Execute the function with proper arguments
-   ignore_result(
-       func->Call(context, v8::Null(isolate), node::arraysize(args), args));
-changed in both
-  base   100644 89af0932d10a598f87dd28ec4b32ae3b2e0eadca atom/renderer/renderer_client_base.cc
-  our    100644 69490420ef5b8f87e7cb8fd97ebd5ec4509fa1ae atom/renderer/renderer_client_base.cc
-  their  100644 af9dfe39367ff1014e558afee2f0fe5ab0e7456e atom/renderer/renderer_client_base.cc
-@@ -161,7 +161,10 @@
- 
- void RendererClientBase::RenderFrameCreated(
-     content::RenderFrame* render_frame) {
-+<<<<<<< .our
- #if defined(TOOLKIT_VIEWS)
-+=======
-+>>>>>>> .their
-   new AutofillAgent(render_frame);
- #endif
- #if defined(ENABLE_PEPPER_FLASH)
-changed in both
-  base   100644 065fe818a64586b6f786cdaa163c40b8a3aacabe brightray/brightray.gyp
-  our    100644 f233257e88bad8f0ff703034bea02e4715a5b5b9 brightray/brightray.gyp
-  their  100644 e42bbce42ae24faed7267e50e8efa7be4b66d215 brightray/brightray.gyp
-@@ -178,6 +178,7 @@
-                 ],
-               },
-             }],
-+<<<<<<< .our
-             # Due to strange linker behavior, component build of arm needs to
-             # be linked with libjpeg.a explicitly.
-             ['target_arch=="arm" and libchromiumcontent_component==1', {
-@@ -187,6 +188,8 @@
-                 ],
-               },
-             }],
-+=======
-+>>>>>>> .their
-           ],
-         }],  # OS=="linux"
-         ['OS=="mac"', {
-changed in both
-  base   100644 143a5fdea3eb6ad7709fa8383298029a24c1b407 brightray/browser/linux/libnotify_notification.cc
-  our    100644 0725ffded989d3c6bce753a210e464deca346ad1 brightray/browser/linux/libnotify_notification.cc
-  their  100644 7f9fb35e434f7cc85cf4145661e754ff4a0d84fc brightray/browser/linux/libnotify_notification.cc
-changed in both
-  base   100644 04033f451e045ee7211f0a7152d46c5010a55b72 brightray/browser/url_request_context_getter.h
-  our    100644 941a5782b14a941bb25a7a9ef6ca6d73f8bc3ec1 brightray/browser/url_request_context_getter.h
-  their  100644 1a26704d380ab7d113c4e2b0deb940a2d674f96b brightray/browser/url_request_context_getter.h
-@@ -76,11 +76,14 @@
-       const override;
- 
-   net::URLRequestJobFactory* job_factory() const { return job_factory_; }
-+<<<<<<< .our
-   void set_delegate(Delegate* delegate) { delegate_ = delegate; }
- 
-   // Discard reference to URLRequestContext and inform observers to
-   // shutdown. Must be called only on IO thread.
-   void NotifyContextShuttingDown(std::unique_ptr<ResourceContext>);
-+=======
-+>>>>>>> .their
- 
-  private:
-   friend class BrowserContext;
-changed in both
-  base   100644 08b203a23291ba0e2ba254873074178da4921123 brightray/common/application_info_win.cc
-  our    100644 a0256372bbdbbc1d77cb84885faab42a27f55c9f brightray/common/application_info_win.cc
-  their  100644 89ea0aceb6784119ad65783cfd1c019e7aedbf57 brightray/common/application_info_win.cc
-changed in both
-  base   100644 6a7d91f135c4b904e6d3172da91e7813793a2fba brightray/filenames.gypi
-  our    100644 b9e2d96175f8ee2d407db9c49b2e2b74756327de brightray/filenames.gypi
-  their  100644 9ddd990cfa52886ead940c428d1f355ef6234d9a brightray/filenames.gypi
-changed in both
-  base   100644 233e21047718c9bbbc9056f79aecf51657886b92 common.gypi
-  our    100644 676d1e904127066e4a3d313106f15406fcbed8b6 common.gypi
-  their  100644 acad39d991479147b9bc2ee2c5a51fbd8693a689 common.gypi
-changed in both
-  base   100644 e0e8b153ae51d917f37ba50967e2ef9e5b74254d docs/README.md
-  our    100644 f7b956e8feb95ceb64743ad260a1759e5a298afe docs/README.md
-  their  100644 436188887e5dad0a4ae291e5221e3eb8644bc56e docs/README.md
-@@ -16,6 +16,7 @@
- 
- * [Electron FAQ](faq.md)
- 
-+<<<<<<< .our
- ## Guides and Tutorials
- 
- * [Setting up the Development Environment](tutorial/development-environment.md)
-@@ -66,6 +67,12 @@
-   * [Mac App Store](tutorial/mac-app-store-submission-guide.md)
-   * [Windows Store](tutorial/windows-store-guide.md)
-   * [Snapcraft](tutorial/snapcraft.md)
-+=======
-+## Guides
-+
-+* [Glossary of Terms](glossary.md)
-+* [Support](tutorial/support.md)
-+>>>>>>> .their
- * [Security](tutorial/security.md)
-   * [Reporting Security Issues](tutorial/security.md#reporting-security-issues)
-   * [Chromium Security Issues and Upgrades](tutorial/security.md#chromium-security-issues-and-upgrades)
-changed in both
-  base   100644 926d1dde8ffc33d99c48cb55bbc2d0f9c2087ad4 docs/api/app.md
-  our    100644 14dc557e237404cbbd5bcebabb0e65486dc36926 docs/api/app.md
-  their  100644 40fdf2669442ca48fd1fc9a3b4aede6a199df4f1 docs/api/app.md
-changed in both
-  base   100644 2be2da597664c1913a665ad51de5becc42658d0f docs/api/browser-window.md
-  our    100644 dff61dd336f047cf2f6f06228b2df2b98ff2304d docs/api/browser-window.md
-  their  100644 96e3951db79478f51beb9c3f39c18f03a0c61a21 docs/api/browser-window.md
-changed in both
-  base   100644 f9aaaa90ddd7b8887c5ed3fea371bf175e28c2e7 docs/api/in-app-purchase.md
-  our    100644 6e612a72e27159602400f4efa30d5bc2f3aa668f docs/api/in-app-purchase.md
-  their  100644 67109dc0f92d8c537c9a2f1fa5fa2ce223137964 docs/api/in-app-purchase.md
-changed in both
-  base   100644 6aaa2bdd9b0ade84160b7449396d5ecd510f0e41 docs/api/web-contents.md
-  our    100644 8990fe2e97ab62eafdd3f7a4eb8ee782415124c5 docs/api/web-contents.md
-  their  100644 841acb4a506626c334004e28266ebed3845360d3 docs/api/web-contents.md
-@@ -1385,6 +1385,26 @@
- 
- Shows pop-up dictionary that searches the selected word on the page.
- 
-+<<<<<<< .our
-+=======
-+#### `contents.setSize(options)`
-+
-+Set the size of the page. This is only supported for `<webview>` guest contents.
-+
-+* `options` Object
-+  * `enableAutoSize` Boolean (optional) - true to make the webview container automatically
-+    resize within the bounds specified by the attributes normal, min and max.
-+  * `normal` [Size](structures/size.md) (optional) - Normal size of the page. This can be used in
-+    combination with the [`disableguestresize`](webview-tag.md#disableguestresize)
-+    attribute to manually resize the webview guest contents.
-+  * `min` [Size](structures/size.md) (optional) - Minimum size of the page. This can be used in
-+    combination with the [`disableguestresize`](webview-tag.md#disableguestresize)
-+    attribute to manually resize the webview guest contents.
-+  * `max` [Size](structures/size.md) (optional) - Maximium size of the page. This can be used in
-+    combination with the [`disableguestresize`](webview-tag.md#disableguestresize)
-+    attribute to manually resize the webview guest contents.
-+
-+>>>>>>> .their
- #### `contents.isOffscreen()`
- 
- Returns `Boolean` - Indicates whether *offscreen rendering* is enabled.
-removed in local
-  base   100644 7dfc6084f5c94bfb924438e7efa50260d38b9144 docs/tutorial/planned-breaking-changes.md
-  their  100644 00e01f4f8c3a85f0e535a00c11e22f3595bff4b9 docs/tutorial/planned-breaking-changes.md
-added in both
-  our    100644 bdb3b8678485feabfad2ce23309f5bcac6050f31 docs/tutorial/support.md
-  their  100644 306876fee9314fbca1779a6c41ff8c6381753bda docs/tutorial/support.md
-@@ -91,4 +91,8 @@
- * Fedora 21
- * Debian 8
- 
-+<<<<<<< .our
- [arm-breaking-change]: https://github.com/electron/electron/blob/master/docs/api/breaking-changes.md#duplicate-arm-assets
-+=======
-+[arm-breaking-change]: https://github.com/electron/electron/blob/master/docs/tutorial/planned-breaking-changes.md#duplicate-arm-assets
-+>>>>>>> .their
-changed in both
-  base   100644 53ad35c63321e74a5023197ef2e075584e0f268b electron.gyp
-  our    100644 944ddab2a3fd879044e31677e4bac2843fffbdee electron.gyp
-  their  100644 dc6fabd21c38f6fbf01905fc653b0b8f647123ce electron.gyp
-@@ -4,7 +4,11 @@
-     'product_name%': 'Electron',
-     'company_name%': 'GitHub, Inc',
-     'company_abbr%': 'github',
-+<<<<<<< .our
-     'version%': '4.0.0-nightly.20180821',
-+=======
-+    'version%': '2.0.3',
-+>>>>>>> .their
-     'js2c_input_dir': '<(SHARED_INTERMEDIATE_DIR)/js2c',
-   },
-   'includes': [
-changed in both
-  base   100644 ef3e8258584a5459b069e2006db44c0a8b66412d filenames.gypi
-  our    100644 f57860558f06b7e5d8a50f48cfc7e53044df0bc6 filenames.gypi
-  their  100644 f4e5e2df06eda1df8fc463b3b25589c708b00cd1 filenames.gypi
-changed in both
-  base   100644 381a2a866372ebe06f374529c634af411c864ba0 lib/browser/api/app.js
-  our    100644 66f6ae651acf10fb19b8ec068fc5280850dd3d91 lib/browser/api/app.js
-  their  100644 1ea1daddca84dfeba57b7b7883ebb754b8508d2d lib/browser/api/app.js
-changed in both
-  base   100644 22565dcf9875b7f00acff192b10b05d27d6446a7 lib/browser/api/browser-window.js
-  our    100644 cb523496d65c7018c30054621cfdeb1281f9db6a lib/browser/api/browser-window.js
-  their  100644 c5faa0a2c131d633e7aea3a1850abab958d22a1d lib/browser/api/browser-window.js
-changed in both
-  base   100644 da5ff57a113f7a063d1409ff56003db4bd04e68a lib/browser/api/menu.js
-  our    100644 506e3525c10ce142cafe3fc1bf4de1c255e48503 lib/browser/api/menu.js
-  their  100644 a87e0cd0436da2899b6402a06d370e755c2aac47 lib/browser/api/menu.js
-@@ -47,7 +47,11 @@
-   this.delegate = delegate
- }
- 
-+<<<<<<< .our
- Menu.prototype.popup = function (options = {}) {
-+=======
-+Menu.prototype.popup = function (options) {
-+>>>>>>> .their
-   if (options == null || typeof options !== 'object') {
-     throw new TypeError('Options must be an object')
-   }
-@@ -156,7 +160,11 @@
- 
- Menu.buildFromTemplate = function (template) {
-   if (!Array.isArray(template)) {
-+<<<<<<< .our
-     throw new TypeError('Invalid template for Menu: Menu template must be an array')
-+=======
-+    throw new TypeError('Invalid template for Menu')
-+>>>>>>> .their
-   }
-   const menu = new Menu()
-   if (!areValidTemplateItems(template)) {
-merged
-  result 100644 bbbc1bbe1727dd30352c4836cea489145cd7ad7d lib/browser/api/screen.js
-  our    100644 8287bfa8bfdc6db322a05059fd5c8ba58e802db9 lib/browser/api/screen.js
-@@ -1,8 +1,17 @@
- const {EventEmitter} = require('events')
-+const {deprecate} = require('electron')
- const {screen, Screen} = process.atomBinding('screen')
- 
- // Screen is an EventEmitter.
- Object.setPrototypeOf(Screen.prototype, EventEmitter.prototype)
- EventEmitter.call(screen)
- 
-+const nativeFn = screen.getMenuBarHeight
-+screen.getMenuBarHeight = function () {
-+  if (!process.noDeprecations) {
-+    deprecate.warn('screen.getMenuBarHeight', 'screen.getPrimaryDisplay().workArea')
-+  }
-+  return nativeFn.call(this)
-+}
-+
- module.exports = screen
-changed in both
-  base   100644 0338b776f8938c1548ea9786385fe75db9db3403 lib/browser/guest-view-manager.js
-  our    100644 1e4029e39a981c85fb6ff18c5ccd52f81b3c56f2 lib/browser/guest-view-manager.js
-  their  100644 dd8e0ff1a9239e5c7a92f90a58da866c076011ca lib/browser/guest-view-manager.js
-changed in both
-  base   100644 50e890e225a315718d04a0028fb6bf2feb4092ce lib/browser/guest-window-manager.js
-  our    100644 7253c1942b0956ae6b9b0c80a23470fc26669b8a lib/browser/guest-window-manager.js
-  their  100644 ec77a7abdff1ba27e55da513c10d084d7978b7c0 lib/browser/guest-window-manager.js
-@@ -65,7 +65,11 @@
-   // Inherit certain option values from parent window
-   const webPreferences = embedder.getLastWebPreferences()
-   for (const [name, value] of inheritedWebPreferences) {
-+<<<<<<< .our
-     if (webPreferences[name] === value) {
-+=======
-+    if (embedder.getLastWebPreferences()[name] === value) {
-+>>>>>>> .their
-       options.webPreferences[name] = value
-     }
-   }
-changed in both
-  base   100644 24a86fdfee7b87cd8ad177363aec26b438fe79b7 lib/browser/init.js
-  our    100644 bed3d912ab8be3ca4f21de04e801bb42dc12a528 lib/browser/init.js
-  their  100644 344bcf16dceafc99dcc337a0d9113c8e764c6364 lib/browser/init.js
-changed in both
-  base   100644 c0cd09dea4273642aa780756985e9c90dbe164d3 lib/browser/rpc-server.js
-  our    100644 ff9f77321de3a4145946b67f3fe2a597f98e2510 lib/browser/rpc-server.js
-  their  100644 6321c0526f25a99d80228bbd569cc000ec76dee2 lib/browser/rpc-server.js
-@@ -387,9 +387,15 @@
-   objectsRegistry.remove(event.sender, contextId, id)
- })
- 
-+<<<<<<< .our
- ipcMain.on('ELECTRON_BROWSER_CONTEXT_RELEASE', (event, contextId) => {
-   objectsRegistry.clear(event.sender, contextId)
-   event.returnValue = null
-+=======
-+ipcMain.on('ELECTRON_BROWSER_CONTEXT_RELEASE', (e, contextId) => {
-+  objectsRegistry.clear(contextId)
-+  e.returnValue = null
-+>>>>>>> .their
- })
- 
- ipcMain.on('ELECTRON_BROWSER_GUEST_WEB_CONTENTS', function (event, contextId, guestInstanceId) {
-changed in both
-  base   100644 6dc774049def3acbd13b79dfd559c12d4eebd657 lib/common/api/crash-reporter.js
-  our    100644 1090d425e4c5cdf89a03d470718324ef16963472 lib/common/api/crash-reporter.js
-  their  100644 1b20fa52aab741e5dd34de7872f36798ec7c1c68 lib/common/api/crash-reporter.js
-changed in both
-  base   100644 a4f8072ed57642e1ca7d1066e132875da7ad3f46 lib/renderer/api/remote.js
-  our    100644 59117f8f2dd977fc1817a6b1d540b616ddcb0dae lib/renderer/api/remote.js
-  their  100644 3de99ecab255308662a4b65c6b45b573d723f4da lib/renderer/api/remote.js
-@@ -293,6 +293,14 @@
-   callbacksRegistry.remove(id)
- })
- 
-+<<<<<<< .our
-+=======
-+process.on('exit', () => {
-+  const command = 'ELECTRON_BROWSER_CONTEXT_RELEASE'
-+  ipcRenderer.sendSync(command, initialContext)
-+})
-+
-+>>>>>>> .their
- exports.require = (module) => {
-   const command = 'ELECTRON_BROWSER_REQUIRE'
-   const meta = ipcRenderer.sendSync(command, contextId, module)
-@@ -317,6 +325,15 @@
-   return metaToValue(ipcRenderer.sendSync('ELECTRON_BROWSER_CURRENT_WEB_CONTENTS', contextId))
- }
- 
-+const CONTEXT_ARG = '--context-id='
-+let initialContext = process.argv.find(arg => arg.startsWith(CONTEXT_ARG))
-+if (initialContext) {
-+  initialContext = parseInt(initialContext.substr(CONTEXT_ARG.length), 10)
-+} else {
-+  // In sandbox we need to pull this from remote
-+  initialContext = exports.getCurrentWebContents().getId()
-+}
-+
- // Get a global object in browser.
- exports.getGlobal = (name) => {
-   const command = 'ELECTRON_BROWSER_GLOBAL'
-changed in both
-  base   100644 1cb69436dd479baf54b9805c04c0c31b20f24fad lib/renderer/init.js
-  our    100644 2470a5e8be80e770b0c03f6a439a71e72ae12a1b lib/renderer/init.js
-  their  100644 93129849ae048c1c09f943b56e78562f46be04e8 lib/renderer/init.js
-changed in both
-  base   100644 d2da884f1d9caf3d633de25837cb2128f564f2fb lib/renderer/security-warnings.js
-  our    100644 b24f9e28b879154457be0342b9d4b44c0e651253 lib/renderer/security-warnings.js
-  their  100644 4f7d6ef9e596cdc3a5c7e1f2b89b24b9cd67de1d lib/renderer/security-warnings.js
-changed in both
-  base   100644 119391e79462bfa8bb1494039bcb3522d97acead lib/sandboxed_renderer/init.js
-  our    100644 30a3fa55216f6bf7588c3accc07b150a31163b7c lib/sandboxed_renderer/init.js
-  their  100644 fd9ab6c3bb2b3374fc750b8be3044a49249477b1 lib/sandboxed_renderer/init.js
-@@ -35,10 +35,13 @@
-   ['url', require('url')]
- ])
- 
-+<<<<<<< .our
- const {
-   preloadSrc, preloadError, process: processProps
- } = electron.ipcRenderer.sendSync('ELECTRON_BROWSER_SANDBOX_LOAD')
- 
-+=======
-+>>>>>>> .their
- require('../renderer/web-frame-init')()
- 
- // Pass different process object to the preload script(which should not have
-@@ -107,6 +110,7 @@
- // and any `require('electron')` calls in `preload.js` will work as expected
- // since browserify won't try to include `electron` in the bundle, falling back
- // to the `preloadRequire` function above.
-+<<<<<<< .our
- if (preloadSrc) {
-   const preloadWrapperSrc = `(function(require, process, Buffer, global, setImmediate, clearImmediate) {
-   ${preloadSrc}
-@@ -118,4 +122,18 @@
-   preloadFn(preloadRequire, preloadProcess, Buffer, global, setImmediate, clearImmediate)
- } else if (preloadError) {
-   console.error(preloadError.stack)
-+=======
-+if (preloadPath) {
-+  const preloadSrc = fs.readFileSync(preloadPath).toString()
-+  const preloadWrapperSrc = `(function(require, process, Buffer, global, setImmediate) {
-+  ${preloadSrc}
-+  })`
-+
-+  // eval in window scope:
-+  // http://www.ecma-international.org/ecma-262/5.1/#sec-10.4.2
-+  const geval = eval
-+  const preloadFn = geval(preloadWrapperSrc)
-+  const { setImmediate } = require('timers')
-+  preloadFn(preloadRequire, preloadProcess, Buffer, global, setImmediate)
-+>>>>>>> .their
- }
-changed in both
-  base   100644 9d3b0da9c80b223e4a1188311a1121796eb9f7ae package.json
-  our    100644 c081cd89450cd50efba1ec280ff1349a96ea3ce0 package.json
-  their  100644 e97a784d23cfc2efd34394e2cdc6f3b573d573cc package.json
-@@ -1,6 +1,10 @@
- {
-   "name": "electron",
-+<<<<<<< .our
-   "version": "4.0.0-nightly.20180821",
-+=======
-+  "version": "2.0.3",
-+>>>>>>> .their
-   "repository": "https://github.com/electron/electron",
-   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
-   "devDependencies": {
-@@ -13,7 +17,11 @@
-     "dugite": "^1.45.0",
-     "electabul": "~0.0.4",
-     "electron-docs-linter": "^2.3.4",
-+<<<<<<< .our
-     "electron-typescript-definitions": "^1.3.6",
-+=======
-+    "electron-typescript-definitions": "1.3.2",
-+>>>>>>> .their
-     "github": "^9.2.0",
-     "html-entities": "^1.2.1",
-     "husky": "^0.14.3",
-@@ -25,8 +33,12 @@
-     "remark-cli": "^4.0.0",
-     "remark-preset-lint-markdown-style-guide": "^2.1.1",
-     "request": "^2.68.0",
-+<<<<<<< .our
-     "semver": "^5.5.0",
-     "serve": "^6.5.8",
-+=======
-+    "serve": "^6.5.3",
-+>>>>>>> .their
-     "standard": "^10.0.0",
-     "standard-markdown": "^4.0.0",
-     "sumchecker": "^2.0.2",
-changed in both
-  base   100755 4465b85c135ddb55a673c5180e15f05f09dac57e script/bootstrap.py
-  our    100755 e4aaf89e216b0164f15882a3040e8cac70bf1fd9 script/bootstrap.py
-  their  100755 c6ebe4ef6975efd1f6184159cc3d9d079bf3628d script/bootstrap.py
-changed in both
-  base   100755 c97cd8336f7d7980911d0bdea93137e7bc95ba24 script/build.py
-  our    100755 fb2b95d3bb71a25ce1ca58acf596afdc0f2cc5bd script/build.py
-  their  100755 2a2231394207c28fcd2b86d3d9f9b079b08d637e script/build.py
-@@ -40,6 +40,12 @@
-   if is_verbose_mode():
-     ninja.append('-v')
- 
-+<<<<<<< .our
-+=======
-+  args = parse_args()
-+  if args.ninja_path:
-+    ninja = args.ninja_path
-+>>>>>>> .their
-   if args.libcc:
-     if ('D' not in args.configuration
-         or not os.path.exists(GCLIENT_DONE)
-@@ -93,12 +99,15 @@
-   parser.add_argument('--ninja-path',
-                       help='Path of ninja command to use.',
-                       required=False)
-+<<<<<<< .our
-   parser.add_argument('--compdb',
-                       help=(
-                         'Generate JSON compilation database. This will not '
-                         'trigger actual build. '
-                       ),
-                       action='store_true', default=False)
-+=======
-+>>>>>>> .their
-   return parser.parse_args()
- 
- 
-changed in both
-  base   100644 ec2459198bf254e7e380e4ae63097168041d0068 script/ci-release-build.js
-  our    100644 be9f9597387f5f8b7bfddc61c202f32ce4c6d478 script/ci-release-build.js
-  their  100644 de4574ca1f1ef709ad1ba29d229f6f2b7f19f1f1 script/ci-release-build.js
-@@ -3,12 +3,15 @@
- const assert = require('assert')
- const request = require('request')
- const buildAppVeyorURL = 'https://windows-ci.electronjs.org/api/builds'
-+<<<<<<< .our
- const vstsURL = 'https://github.visualstudio.com/electron/_apis/build'
- 
- const appVeyorJobs = {
-   'electron-x64': 'electron',
-   'electron-ia32': 'electron-39ng6'
- }
-+=======
-+>>>>>>> .their
- 
- const circleCIJobs = [
-   'electron-linux-arm',
-@@ -18,11 +21,14 @@
-   'electron-linux-x64'
- ]
- 
-+<<<<<<< .our
- const vstsJobs = [
-   'electron-release-mas-x64',
-   'electron-release-osx-x64'
- ]
- 
-+=======
-+>>>>>>> .their
- async function makeRequest (requestOptions, parseResponse) {
-   return new Promise((resolve, reject) => {
-     request(requestOptions, (err, res, body) => {
-@@ -51,6 +57,10 @@
- }
- 
- async function circleCIcall (buildUrl, targetBranch, job, options) {
-+<<<<<<< .our
-+=======
-+  assert(process.env.CIRCLE_TOKEN, 'CIRCLE_TOKEN not found in environment')
-+>>>>>>> .their
-   console.log(`Triggering CircleCI to run build job: ${job} on branch: ${targetBranch} with release flag.`)
-   let buildRequest = {
-     'build_parameters': {
-@@ -92,8 +102,14 @@
-   }
- }
- 
-+<<<<<<< .our
- async function callAppVeyor (targetBranch, job, options) {
-   console.log(`Triggering AppVeyor to run build job: ${job} on branch: ${targetBranch} with release flag.`)
-+=======
-+async function buildAppVeyor (targetBranch, options) {
-+  console.log(`Triggering AppVeyor to run build on branch: ${targetBranch} with release flag.`)
-+  assert(process.env.APPVEYOR_TOKEN, 'APPVEYOR_TOKEN not found in environment')
-+>>>>>>> .their
-   let environmentVariables = {}
- 
-   if (options.ghRelease) {
-@@ -132,11 +148,16 @@
- function buildCircleCI (targetBranch, options) {
-   const circleBuildUrl = `https://circleci.com/api/v1.1/project/github/electron/electron/tree/${targetBranch}?circle-token=${process.env.CIRCLE_TOKEN}`
-   if (options.job) {
-+<<<<<<< .our
-     assert(circleCIJobs.includes(options.job), `Unknown CircleCI job name: ${options.job}. Valid values are: ${circleCIJobs}.`)
-+=======
-+    assert(circleCIJobs.includes(options.job), `Unknown CI job name: ${options.job}.`)
-+>>>>>>> .their
-     circleCIcall(circleBuildUrl, targetBranch, options.job, options)
-   } else {
-     circleCIJobs.forEach((job) => circleCIcall(circleBuildUrl, targetBranch, job, options))
-   }
-+<<<<<<< .our
- }
- 
- async function buildVSTS (targetBranch, options) {
-@@ -200,6 +221,8 @@
-     console.log(`Error calling VSTS for job ${build.name}`, err)
-   })
-   console.log(`VSTS release build request for ${build.name} successful. Check ${vstsResponse._links.web.href} for status.`)
-+=======
-+>>>>>>> .their
- }
- 
- function runRelease (targetBranch, options) {
-@@ -211,10 +234,13 @@
-       }
-       case 'AppVeyor': {
-         buildAppVeyor(targetBranch, options)
-+<<<<<<< .our
-         break
-       }
-       case 'VSTS': {
-         buildVSTS(targetBranch, options)
-+=======
-+>>>>>>> .their
-         break
-       }
-       default: {
-@@ -225,7 +251,10 @@
-   } else {
-     buildCircleCI(targetBranch, options)
-     buildAppVeyor(targetBranch, options)
-+<<<<<<< .our
-     buildVSTS(targetBranch, options)
-+=======
-+>>>>>>> .their
-   }
- }
- 
-@@ -238,7 +267,11 @@
-   const targetBranch = args._[0]
-   if (args._.length < 1) {
-     console.log(`Trigger CI to build release builds of electron.
-+<<<<<<< .our
-     Usage: ci-release-build.js [--job=CI_JOB_NAME] [--ci=CircleCI|AppVeyor|VSTS] [--ghRelease] [--automaticRelease] TARGET_BRANCH
-+=======
-+    Usage: ci-release-build.js [--job=CI_JOB_NAME] [--ci=CircleCI|AppVeyor] [--ghRelease] [--automaticRelease] TARGET_BRANCH
-+>>>>>>> .their
-     `)
-     process.exit(0)
-   }
-changed in both
-  base   100755 de3b9ffd48156379afd677b98c40c97532cb8367 script/create-dist.py
-  our    100755 4a6c0c7ce8f275175e48c4c380ff33627f7a5961 script/create-dist.py
-  their  100755 e8396a2e6d242b9deba3b6a7642060584cd1a605 script/create-dist.py
-@@ -147,7 +147,11 @@
- 
-   # Copy file and keep the executable bit.
-   shutil.copyfile(src, dest)
-+<<<<<<< .our
-   add_exec_bit(dest)
-+=======
-+  os.chmod(dest, os.stat(dest).st_mode | stat.S_IEXEC)
-+>>>>>>> .their
- 
- def copy_vcruntime_binaries():
-   arch = get_target_arch()
-@@ -302,7 +306,11 @@
-     dest = os.path.join(DIST_DIR, binary)
-     # Copy file and keep the executable bit.
-     shutil.copyfile(src, dest)
-+<<<<<<< .our
-     add_exec_bit(dest)
-+=======
-+    os.chmod(dest, os.stat(dest).st_mode | stat.S_IEXEC)
-+>>>>>>> .their
- 
-     dist_name = get_zip_name(binary, version)
-     zip_file = os.path.join(SOURCE_ROOT, 'dist', dist_name)
-changed in both
-  base   100644 76f39fc26973e01145f7758785778075ddbaa648 script/lib/dbus_mock.py
-  our    100644 9b9c8029cb75a9d84c632d04f234c2020542ca68 script/lib/dbus_mock.py
-  their  100644 00b1fd98d7837cfef60460f9d456a5cb8340761c script/lib/dbus_mock.py
-@@ -4,21 +4,29 @@
- import atexit
- import os
- import sys
-+<<<<<<< .our
-+=======
-+
-+>>>>>>> .their
- 
- 
- def stop():
-     DBusTestCase.stop_dbus(DBusTestCase.system_bus_pid)
-     DBusTestCase.stop_dbus(DBusTestCase.session_bus_pid)
-+<<<<<<< .our
- 
- def start():
-     dbusmock_log = sys.stdout if is_verbose_mode() else open(os.devnull, 'w')
- 
-     DBusTestCase.start_system_bus()
-     DBusTestCase.spawn_server_template('logind', None, dbusmock_log)
-+=======
-+>>>>>>> .their
- 
-     DBusTestCase.start_session_bus()
-     DBusTestCase.spawn_server_template('notification_daemon', None, dbusmock_log)
- 
-+<<<<<<< .our
- if __name__ == '__main__':
-     import subprocess
-     start()
-@@ -26,3 +34,14 @@
-         subprocess.check_call(sys.argv[1:])
-     finally:
-         stop()
-+=======
-+atexit.register(cleanup)
-+
-+dbusmock_log = sys.stdout if is_verbose_mode() else open(os.devnull, 'w')
-+
-+DBusTestCase.start_system_bus()
-+DBusTestCase.spawn_server_template('logind', None, dbusmock_log)
-+
-+DBusTestCase.start_session_bus()
-+DBusTestCase.spawn_server_template('notification_daemon', None, dbusmock_log)
-+>>>>>>> .their
-changed in both
-  base   100755 69882928765a56f50702a371af322710ef3ccf22 script/prepare-release.js
-  our    100755 72a28b719bf1ff7770692caef86c76746c4d8edf script/prepare-release.js
-  their  100755 8021fa331da3e8afd8810b8bb4a87eb39e859e75 script/prepare-release.js
-@@ -5,6 +5,10 @@
- const args = require('minimist')(process.argv.slice(2), {
-   boolean: ['automaticRelease', 'notesOnly', 'stable']
- })
-+<<<<<<< .our
-+=======
-+const assert = require('assert')
-+>>>>>>> .their
- const ciReleaseBuild = require('./ci-release-build')
- const { execSync } = require('child_process')
- const fail = '\u2717'.red
-@@ -21,7 +25,11 @@
- // via conventional-recommended-bump
- 
- if (!versionType && !args.notesOnly) {
-+<<<<<<< .our
-   console.log(`Usage: prepare-release versionType [stable | beta | nightly]` +
-+=======
-+  console.log(`Usage: prepare-release versionType [major | minor | patch | beta]` +
-+>>>>>>> .their
-      ` (--stable) (--notesOnly) (--automaticRelease) (--branch)`)
-   process.exit(1)
- }
-@@ -222,7 +230,11 @@
- }
- 
- async function verifyNewVersion () {
-+<<<<<<< .our
-   let newVersion = await getNewVersion(true)
-+=======
-+  let newVersion = getNewVersion(true)
-+>>>>>>> .their
-   let response
-   if (args.automaticRelease) {
-     response = 'y'
-@@ -258,6 +270,7 @@
- }
- 
- async function prepareRelease (isBeta, notesOnly) {
-+<<<<<<< .our
-   if (args.dryRun) {
-     let newVersion = await getNewVersion(true)
-     console.log(newVersion)
-@@ -278,6 +291,27 @@
-         process.exit(1)
-       }
-     }
-+=======
-+  if (args.automaticRelease && (pkg.version.indexOf('beta') === -1 ||
-+      versionType !== 'beta')) {
-+    console.log(`${fail} Automatic release is only supported for beta releases`)
-+    process.exit(1)
-+  }
-+  let currentBranch
-+  if (args.branch) {
-+    currentBranch = args.branch
-+  } else {
-+    currentBranch = await getCurrentBranch(gitDir)
-+  }
-+  if (notesOnly) {
-+    let releaseNotes = await getReleaseNotes(currentBranch)
-+    console.log(`Draft release notes are: \n${releaseNotes}`)
-+  } else {
-+    await verifyNewVersion()
-+    await createRelease(currentBranch, isBeta)
-+    await pushRelease(currentBranch)
-+    await runReleaseBuilds(currentBranch)
-+>>>>>>> .their
-   }
- }
- 
-changed in both
-  base   100755 9863ef912cd5a940428e9ac22e1993494b2b1828 script/release.js
-  our    100755 84e00ad4f309201f151c3f8fcbaf9ee536c9b6cb script/release.js
-  their  100755 5858caf215a38e09d98c342bd74252b3dbd7ee71 script/release.js
-@@ -95,6 +95,10 @@
-     `electron-${version}-linux-armv7l.zip`,
-     `electron-${version}-linux-ia32-symbols.zip`,
-     `electron-${version}-linux-ia32.zip`,
-+<<<<<<< .our
-+=======
-+//    `electron-${version}-linux-mips64el.zip`,
-+>>>>>>> .their
-     `electron-${version}-linux-x64-symbols.zip`,
-     `electron-${version}-linux-x64.zip`,
-     `electron-${version}-mas-x64-dsym.zip`,
-@@ -112,6 +116,10 @@
-     `ffmpeg-${version}-linux-arm64.zip`,
-     `ffmpeg-${version}-linux-armv7l.zip`,
-     `ffmpeg-${version}-linux-ia32.zip`,
-+<<<<<<< .our
-+=======
-+//    `ffmpeg-${version}-linux-mips64el.zip`,
-+>>>>>>> .their
-     `ffmpeg-${version}-linux-x64.zip`,
-     `ffmpeg-${version}-mas-x64.zip`,
-     `ffmpeg-${version}-win32-ia32.zip`,
-@@ -180,7 +188,15 @@
- function uploadIndexJson () {
-   console.log('Uploading index.json to S3.')
-   let scriptPath = path.join(__dirname, 'upload-index-json.py')
-+<<<<<<< .our
-   runScript(scriptPath, [pkgVersion])
-+=======
-+  let scriptArgs = []
-+  if (args.automaticRelease) {
-+    scriptArgs.push('-R')
-+  }
-+  runScript(scriptPath, scriptArgs)
-+>>>>>>> .their
-   console.log(`${pass} Done uploading index.json to S3.`)
- }
- 
-changed in both
-  base   100755 1f90ed795fcc3e739061cf4ae5c8ab9ea95a1236 script/test.py
-  our    100755 46cada435e1bd6ecaa2111cdf29e5aeb834b227e script/test.py
-  their  100755 cb17102557dca975208140b479168906100cfd74 script/test.py
-changed in both
-  base   100755 a35eb2f5b90272c8369bcfd511f976a4f64fa57f script/update-clang.sh
-  our    100755 0c7ab60533381e33152b8735aaccf41d5f0d6676 script/update-clang.sh
-  their  100755 6e4cf08216616a4b6a2ee896bba47b1ba5d469b5 script/update-clang.sh
-changed in both
-  base   100755 f5e5b3c7a6adcaf7005ad9242c1664ad2f243d1f script/upload-index-json.py
-  our    100755 55d0675d0707d34c806847f3a64aa77f20a4830d script/upload-index-json.py
-  their  100755 479e46bb811695482f5ea62060e4bef02af505f1 script/upload-index-json.py
-@@ -8,7 +8,6 @@
- from lib.util import s3put, scoped_cwd, safe_mkdir
- 
- SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
--OUT_DIR     = os.path.join(SOURCE_ROOT, 'out', 'D')
- 
- BASE_URL = 'https://electron-metadumper.herokuapp.com/?version='
- 
-@@ -35,6 +34,7 @@
-     raise Exception("Please set META_DUMPER_AUTH_HEADER")
-   # Upload the index.json.
-   with scoped_cwd(SOURCE_ROOT):
-+<<<<<<< .our
-     safe_mkdir(OUT_DIR)
-     index_json = os.path.relpath(os.path.join(OUT_DIR, 'index.json'))
- 
-@@ -42,9 +42,27 @@
- 
-     with open(index_json, "w") as f:
-       f.write(new_content)
-+=======
-+    if len(sys.argv) == 2 and sys.argv[1] == '-R':
-+      config = 'R'
-+    else:
-+      config = 'D'
-+    out_dir = os.path.join(SOURCE_ROOT, 'out', config)
-+    if sys.platform == 'darwin':
-+      electron = os.path.join(out_dir, '{0}.app'.format(PRODUCT_NAME),
-+                                'Contents', 'MacOS', PRODUCT_NAME)
-+    elif sys.platform == 'win32':
-+      electron = os.path.join(out_dir, '{0}.exe'.format(PROJECT_NAME))
-+    else:
-+      electron = os.path.join(out_dir, PROJECT_NAME)
-+    index_json = os.path.relpath(os.path.join(out_dir, 'index.json'))
-+    execute([electron,
-+             os.path.join('tools', 'dump-version-info.js'),
-+             index_json])
-+>>>>>>> .their
- 
-     bucket, access_key, secret_key = s3_config()
--    s3put(bucket, access_key, secret_key, OUT_DIR, 'atom-shell/dist',
-+    s3put(bucket, access_key, secret_key, out_dir, 'atom-shell/dist',
-           [index_json])
- 
- 
-changed in both
-  base   100755 4da630433812b51ff0ebbdf89f68c71d90ab8046 script/upload.py
-  our    100755 2d9eaa201265971ca01acaea6e84a440e5db0532 script/upload.py
-  their  100755 ee7a027af02274326ba06d84df031bb0d241ec47 script/upload.py
-@@ -76,9 +76,23 @@
-   upload_electron(release, os.path.join(DIST_DIR, ffmpeg), args)
- 
-   chromedriver = get_zip_name('chromedriver', ELECTRON_VERSION)
-+<<<<<<< .our
-   upload_electron(release, os.path.join(DIST_DIR, chromedriver), args)
-   mksnapshot = get_zip_name('mksnapshot', ELECTRON_VERSION)
-   upload_electron(release, os.path.join(DIST_DIR, mksnapshot), args)
-+=======
-+  upload_electron(github, release, os.path.join(DIST_DIR, chromedriver),
-+                  args.upload_to_s3)
-+  mksnapshot = get_zip_name('mksnapshot', ELECTRON_VERSION)
-+  upload_electron(github, release, os.path.join(DIST_DIR, mksnapshot),
-+                args.upload_to_s3)
-+
-+  if get_target_arch().startswith('arm'):
-+    # Upload the x64 binary for arm/arm64 mksnapshot
-+    mksnapshot = get_zip_name('mksnapshot', ELECTRON_VERSION, 'x64')
-+    upload_electron(github, release, os.path.join(DIST_DIR, mksnapshot),
-+                    args.upload_to_s3)
-+>>>>>>> .their
- 
-   if get_target_arch().startswith('arm'):
-     # Upload the x64 binary for arm/arm64 mksnapshot
-changed in both
-  base   100644 0eda951b15d6fff609b6612589e222adb4f0720e spec/api-app-spec.js
-  our    100644 d224eda2989332c18d655cef05a8bacc2eb6d4b8 spec/api-app-spec.js
-  their  100644 5c2e0a0c7e6184e780b7ec031f9788f1f54eaca9 spec/api-app-spec.js
-@@ -9,7 +9,10 @@
- const {ipcRenderer, remote} = require('electron')
- const {closeWindow} = require('./window-helpers')
- 
-+<<<<<<< .our
- const {expect} = chai
-+=======
-+>>>>>>> .their
- const {app, BrowserWindow, Menu, ipcMain} = remote
- 
- const isCI = remote.getGlobal('isCi')
-@@ -186,11 +189,19 @@
- 
-       // Singleton will send us greeting data to let us know it's running.
-       // After that, ask it to exit gracefully and confirm that it does.
-+<<<<<<< .our
-       appProcess.stdout.on('data', data => appProcess.kill())
-       appProcess.on('exit', (code, sig) => {
-         const message = `code:\n${code}\nsig:\n${sig}`
-         expect(code).to.equal(0, message)
-         expect(sig).to.be.null(message)
-+=======
-+      appProcess.stdout.on('data', (data) => appProcess.kill())
-+      appProcess.on('exit', (code, sig) => {
-+        let message = ['code:', code, 'sig:', sig].join('\n')
-+        assert.equal(code, 0, message)
-+        assert.equal(sig, null, message)
-+>>>>>>> .their
-         done()
-       })
-     })
-@@ -948,4 +959,18 @@
-       return expect(app.whenReady()).to.be.eventually.fulfilled
-     })
-   })
-+
-+  describe('dock.setMenu', () => {
-+    before(function () {
-+      if (process.platform !== 'darwin') {
-+        this.skip()
-+      }
-+    })
-+
-+    it('keeps references to the menu', () => {
-+      app.dock.setMenu(new Menu())
-+      const v8Util = process.atomBinding('v8_util')
-+      v8Util.requestGarbageCollectionForTesting()
-+    })
-+  })
- })
-changed in both
-  base   100644 ab96021ebf4c4360fa581b5a695249456a9afeda spec/api-browser-view-spec.js
-  our    100644 968912a4abf3d759a1363e2420d2c21b7923dbd6 spec/api-browser-view-spec.js
-  their  100644 df239a8914527a2d62f652b878c97a7791f63a9d spec/api-browser-view-spec.js
-@@ -44,9 +44,15 @@
-   describe('BrowserView.isDestroyed()', () => {
-     it('returns correct value', () => {
-       view = new BrowserView()
-+<<<<<<< .our
-       expect(view.isDestroyed()).to.be.false()
-       view.destroy()
-       expect(view.isDestroyed()).to.be.true()
-+=======
-+      assert.ok(!view.isDestroyed())
-+      view.destroy()
-+      assert.ok(view.isDestroyed())
-+>>>>>>> .their
-     })
-   })
- 
-changed in both
-  base   100644 3033eb6a1f6cca3cf4874a54dd217ec62d2d82cd spec/api-browser-window-spec.js
-  our    100644 f4cba12ec19d224bc46fca898db42a99baf4972e spec/api-browser-window-spec.js
-  their  100644 4807094095a591ca716d520aef51a25af6ff9687 spec/api-browser-window-spec.js
-@@ -409,12 +409,34 @@
-     })
-   })
- 
-+<<<<<<< .our
-   // TODO(alexeykuzmin): [Ch66] Enable the test. Passes locally.
-   xdescribe('BrowserWindow.getFocusedWindow()', (done) => {
-+=======
-+  describe('BrowserWindow.getFocusedWindow()', (done) => {
-+>>>>>>> .their
-     it('returns the opener window when dev tools window is focused', (done) => {
-       w.show()
-       w.webContents.once('devtools-focused', () => {
-         assert.deepEqual(BrowserWindow.getFocusedWindow(), w)
-+<<<<<<< .our
-+=======
-+        done()
-+      })
-+      w.webContents.openDevTools({mode: 'undocked'})
-+    })
-+  })
-+
-+  describe('BrowserWindow.capturePage(rect, callback)', () => {
-+    it('calls the callback with a Buffer', (done) => {
-+      w.capturePage({
-+        x: 0,
-+        y: 0,
-+        width: 100,
-+        height: 100
-+      }, (image) => {
-+        assert.equal(image.isEmpty(), true)
-+>>>>>>> .their
-         done()
-       })
-       w.webContents.openDevTools({mode: 'undocked'})
-@@ -453,6 +475,29 @@
-       // Values can be 0,2,3,4, or 6. We want 6, which is RGB + Alpha
-       expect(imgBuffer[25]).to.equal(6)
-     })
-+
-+    it('preserves transparency', (done) => {
-+      w.close()
-+      const width = 400
-+      const height = 400
-+      w = new BrowserWindow({
-+        show: false,
-+        width: width,
-+        height: height,
-+        transparent: true
-+      })
-+      w.loadURL('data:text/html,<html><body background-color: rgba(255,255,255,0)></body></html>')
-+      w.once('ready-to-show', () => {
-+        w.show()
-+        w.capturePage((image) => {
-+          let imgBuffer = image.toPNG()
-+          // Check 25th byte in the PNG
-+          // Values can be 0,2,3,4, or 6. We want 6, which is RGB + Alpha
-+          assert.equal(imgBuffer[25], 6)
-+          done()
-+        })
-+      })
-+    })
-   })
- 
-   describe('BrowserWindow.setSize(width, height)', () => {
-@@ -763,6 +808,7 @@
-         w.addTabbedWindow(w)
-       }, /AddTabbedWindow cannot be called by a window on itself./)
-     })
-+<<<<<<< .our
-   })
- 
-   describe('BrowserWindow.setWindowButtonVisibility()', () => {
-@@ -790,6 +836,8 @@
-         w.setWindowButtonVisibility(true)
-       }, /Not supported for this window/)
-     })
-+=======
-+>>>>>>> .their
-   })
- 
-   describe('BrowserWindow.setVibrancy(type)', () => {
-changed in both
-  base   100644 b4d55cd70b70b42d52a026ff7b4ff3c47d1671df spec/api-crash-reporter-spec.js
-  our    100644 dd31b91e1244785412b87db96bb141599e5ccb0f spec/api-crash-reporter-spec.js
-  their  100644 ffa3c0370595f32b0c7d476b82bea133d6a87000 spec/api-crash-reporter-spec.js
-@@ -266,6 +266,7 @@
-   describe('getLastCrashReport', () => {
-     it('correctly returns the most recent report', () => {
-       const reports = crashReporter.getUploadedReports()
-+<<<<<<< .our
-       expect(reports).to.be.an('array')
-       expect(reports).to.have.lengthOf.at.least(2,
-           'There are not enough reports for this test')
-@@ -275,16 +276,31 @@
- 
-       // Let's find the newest report.
-       const {report: newestReport} = reports.reduce((acc, cur) => {
-+=======
-+      const lastReport = crashReporter.getLastCrashReport()
-+
-+      // Let's find the newest report
-+      const newestReport = reports.reduce((acc, cur) => {
-+>>>>>>> .their
-         const timestamp = new Date(cur.date).getTime()
-         return (timestamp > acc.timestamp)
-           ? { report: cur, timestamp: timestamp }
-           : acc
-+<<<<<<< .our
-       }, { timestamp: -Infinity })
-       assert(newestReport, 'Hey!')
- 
-       expect(lastReport.date.getTime()).to.be.equal(
-           newestReport.date.getTime(),
-           'Last report is not the newest.')
-+=======
-+      }, { timestamp: 0 })
-+
-+      assert(reports.length > 1, 'has more than 1 report')
-+      assert(lastReport != null, 'found a last report')
-+      assert(lastReport.date.toString() === newestReport.report.date.toString(),
-+        'last report is correct')
-+>>>>>>> .their
-     })
-   })
- 
-changed in both
-  base   100644 667f098bc4b9974a142435e7d3ddb762ac0f54a2 spec/api-menu-spec.js
-  our    100644 ed2749700c6c8bf299f507d52606c1ae3f597e5c spec/api-menu-spec.js
-  their  100644 3efb6ed8745843bb7e221fe25b3c75761a085759 spec/api-menu-spec.js
-@@ -649,6 +649,7 @@
-     })
- 
-     it('throws an error if options is not an object', () => {
-+<<<<<<< .our
-       expect(() => {
-         menu.popup('this is a string, not an object')
-       }).to.throw(/Options must be an object/)
-@@ -658,6 +659,11 @@
-       expect(() => {
-         menu.popup({})
-       }).to.not.throw()
-+=======
-+      assert.throws(() => {
-+        menu.popup()
-+      }, /Options must be an object/)
-+>>>>>>> .their
-     })
- 
-     it('should emit menu-will-show event', (done) => {
-added in both
-  our    100644 9ab56d88e50ae5891364cb271362e5ec0c0edd26 spec/api-notification-dbus-spec.js
-  their  100644 81c1b68f31d0c9490742d3bd4b4227abaaf72ca3 spec/api-notification-dbus-spec.js
-@@ -6,7 +6,11 @@
- //
- // See https://pypi.python.org/pypi/python-dbusmock to read about dbusmock.
- 
-+<<<<<<< .our
- const {expect} = require('chai')
-+=======
-+const assert = require('assert')
-+>>>>>>> .their
- const dbus = require('dbus-native')
- const Promise = require('bluebird')
- 
-@@ -27,12 +31,20 @@
-   before(async () => {
-     // init app
-     app.setName(appName)
-+<<<<<<< .our
-     app.setDesktopName(`${appName}.desktop`)
-+=======
-+    app.setDesktopName(appName + '.desktop')
-+>>>>>>> .their
-     // init dbus
-     const path = '/org/freedesktop/Notifications'
-     const iface = 'org.freedesktop.DBus.Mock'
-     const bus = dbus.sessionBus()
-+<<<<<<< .our
-     console.log(`session bus: ${process.env.DBUS_SESSION_BUS_ADDRESS}`)
-+=======
-+    console.log('session bus: ' + process.env.DBUS_SESSION_BUS_ADDRESS)
-+>>>>>>> .their
-     const service = bus.getService(serviceName)
-     const getInterface = Promise.promisify(service.getInterface, {context: service})
-     mock = await getInterface(path, iface)
-@@ -48,10 +60,17 @@
-     app.setVersion(realAppVersion)
-   })
- 
-+<<<<<<< .our
-   describe(`Notification module using ${serviceName}`, () => {
-     function onMethodCalled (done) {
-       function cb (name) {
-         console.log(`onMethodCalled: ${name}`)
-+=======
-+  describe('Notification module using ' + serviceName, () => {
-+    function onMethodCalled (done) {
-+      function cb (name) {
-+        console.log('onMethodCalled: ' + name)
-+>>>>>>> .their
-         if (name === 'Notify') {
-           mock.removeListener('MethodCalled', cb)
-           console.log('done')
-@@ -83,7 +102,11 @@
-       }
-     }
- 
-+<<<<<<< .our
-     before(done => {
-+=======
-+    before((done) => {
-+>>>>>>> .their
-       mock.on('MethodCalled', onMethodCalled(done))
-       // lazy load Notification after we listen to MethodCalled mock signal
-       Notification = require('electron').remote.Notification
-@@ -98,6 +121,7 @@
-       n.show()
-     })
- 
-+<<<<<<< .our
-     it(`should call ${serviceName} to show notifications`, async () => {
-       const calls = await getCalls()
-       expect(calls).to.be.an('array').of.lengthOf.at.least(1)
-@@ -108,6 +132,16 @@
- 
-       let args = unmarshalDBusNotifyArgs(lastCall[2])
-       expect(args).to.deep.equal({
-+=======
-+    it('should call ' + serviceName + ' to show notifications', async () => {
-+      const calls = await getCalls()
-+      assert(calls.length >= 1)
-+      let lastCall = calls[calls.length - 1]
-+      let methodName = lastCall[1]
-+      assert.equal(methodName, 'Notify')
-+      let args = unmarshalDBusNotifyArgs(lastCall[2])
-+      assert.deepEqual(args, {
-+>>>>>>> .their
-         app_name: appName,
-         replaces_id: 0,
-         app_icon: '',
-changed in both
-  base   100644 122170292838e951ade4989669c87a7531e89ba7 spec/api-web-contents-spec.js
-  our    100644 be02cb3f84001a541d64b11fe6eda50fc32e8afd spec/api-web-contents-spec.js
-  their  100644 cbb45f5d84f1b11c8c27c56515d5daffa23d0c04 spec/api-web-contents-spec.js
-@@ -122,6 +122,7 @@
-     })
-   })
- 
-+<<<<<<< .our
-   // Disabled because flaky. See #13969
-   xdescribe('isCurrentlyAudible() API', () => {
-     it('returns whether audio is playing', async () => {
-@@ -138,6 +139,8 @@
-     })
-   })
- 
-+=======
-+>>>>>>> .their
-   describe('getWebPreferences() API', () => {
-     it('should not crash when called for devTools webContents', (done) => {
-       w.webContents.openDevTools()
-@@ -730,6 +733,7 @@
-     })
-   })
- 
-+<<<<<<< .our
-   describe('referrer', () => {
-     it('propagates referrer information to new target=_blank windows', (done) => {
-       const server = http.createServer((req, res) => {
-@@ -776,6 +780,8 @@
-     })
-   })
- 
-+=======
-+>>>>>>> .their
-   describe('webframe messages in sandboxed contents', () => {
-     it('responds to executeJavaScript', (done) => {
-       w.destroy()
-changed in both
-  base   100644 2d388ca3b5744ea69d96ef71da6ade70e3dd001b spec/chromium-spec.js
-  our    100644 d90269769d269e4054d25cba4b6c4ac8a1929aa6 spec/chromium-spec.js
-  their  100644 25bef2e689e5ecbcd1485a042e84691db9400659 spec/chromium-spec.js
-@@ -319,8 +319,12 @@
-       b = window.open(windowUrl, '', 'nodeIntegration=no,show=no')
-     })
- 
-+<<<<<<< .our
-     // TODO(codebytere): re-enable this test
-     xit('disables node integration when it is disabled on the parent window for chrome devtools URLs', (done) => {
-+=======
-+    it('disables node integration when it is disabled on the parent window for chrome devtools URLs', (done) => {
-+>>>>>>> .their
-       let b
-       app.once('web-contents-created', (event, contents) => {
-         contents.once('did-finish-load', () => {
-changed in both
-  base   100644 07176e0097efa17e8f8aea5bb059a2739b8c3336 spec/fixtures/api/singleton/main.js
-  our    100644 3202a7a180d6d48c70706d5ef244652872b24bbc spec/fixtures/api/singleton/main.js
-  their  100644 cbf3da1117d91eb8df1b1e6363737a210b7eae78 spec/fixtures/api/singleton/main.js
-@@ -3,8 +3,11 @@
- app.once('ready', () => {
-   console.log('started')  // ping parent
- })
-+<<<<<<< .our
- 
- const gotTheLock = app.requestSingleInstanceLock()
-+=======
-+>>>>>>> .their
- 
- app.on('second-instance', () => {
-   setImmediate(() => app.exit(0))
-changed in both
-  base   100644 cfe840ca0a44c5766509b2865034d98e375da1a1 spec/modules-spec.js
-  our    100644 b996b8f4839bff2160bffb69e55263b16a4178d7 spec/modules-spec.js
-  their  100644 28f2602acff67b2da9accd0574d64d386e0795a7 spec/modules-spec.js
-changed in both
-  base   100644 e2d7d001eb49a9b01edcf9590ccdcb7ac8cc669c spec/node-spec.js
-  our    100644 9bb03494a56ffacec075c40bebde39a3b57ac734 spec/node-spec.js
-  their  100644 f053aa4dbadbbc216d98f3a985f29069bb2e4786 spec/node-spec.js
-changed in both
-  base   100644 feac23db7e06d3e49f8d5be7e9b3f08a204f262f spec/security-warnings-spec.js
-  our    100644 6315a9420e01b5db19596f0dd5731d47ce02acf6 spec/security-warnings-spec.js
-  their  100644 85fd0973b60cd6e27becbeef75415560b4061d24 spec/security-warnings-spec.js
-@@ -142,7 +142,11 @@
-       }
-     })
-     w.webContents.once('console-message', (e, level, message) => {
-+<<<<<<< .our
-       assert(message.includes('enableBlinkFeatures'), message)
-+=======
-+      assert(message.includes('blinkFeatures'), message)
-+>>>>>>> .their
-       done()
-     })
- 
-changed in both
-  base   100644 ca5cc28d4f9f860947454dfc964208dd13ba1434 spec/static/index.html
-  our    100644 fc1e153c0af2908cf7ee4c3ea4f05522de04f0f8 spec/static/index.html
-  their  100644 e9d779f061cd5bdf00667d0b7942c6c30de81092 spec/static/index.html
-@@ -51,7 +51,11 @@
-   if (!process.env.MOCHA_REPORTER) {
-     mocha.ui('bdd').reporter(isCi ? 'tap' : 'html')
-   }
--  mocha.timeout(isCi ? 30000 : 10000)
-+  if (process.env.MOCHA_TIMEOUT && process.env.MOCHA_TIMEOUT > 0) {
-+    mocha.timeout(process.env.MOCHA_TIMEOUT)
-+  } else {
-+    mocha.timeout(isCi ? 30000 : 10000)
-+  }
- 
-   const query = Mocha.utils.parseQuery(window.location.search || '')
-   if (query.grep) mocha.grep(query.grep)
-changed in both
-  base   100644 6580f18a1ad9e53ab3f2ae88cb7ea023bcf9579c toolchain.gypi
-  our    100644 697add78e42191741cee1b015cdcf4f801c570e7 toolchain.gypi
-  their  100644 8ed945a57c8875bae06cef74dc5d44afcc586d1d toolchain.gypi
-changed in both
-  base   160000 db1b314c019f6acbd4d1be273b63521cc6051d3c vendor/libchromiumcontent
-  our    160000 c85470a1c379b1c4bedb372c146521bc4be9b75d vendor/libchromiumcontent
-  their  160000 85a8281f0546d9de58aa1b50386451061827fccd vendor/libchromiumcontent
-removed in local
-  base   160000 99d9e262eb36cb9dc8e83f61e026d2a7ad1e96ab vendor/native_mate
-  their  160000 894c96f39fd0faafece86842e4b45a05727c483c vendor/native_mate
-changed in both
-  base   160000 bf06b641574a6e2a8357ca4b44defac4a83f1dda vendor/node
-  our    160000 ece0a06ac8147efb5b5af431c21f312f1884616e vendor/node
-  their  160000 f2bcc6b58293287e2a6e592bd296aa55bb37b801 vendor/node
diff --git a/app/test/fixtures/merge-parser/failed-merge-master-into-stale-branch-really.txt b/app/test/fixtures/merge-parser/failed-merge-master-into-stale-branch-really.txt
deleted file mode 100644
index 24827c3c4f4..00000000000
--- a/app/test/fixtures/merge-parser/failed-merge-master-into-stale-branch-really.txt
+++ /dev/null
@@ -1,27968 +0,0 @@
-added in remote
-  their  100644 796fcffcd129e9594b5d578f18893807a5dfd4e8 .babelrc
-@@ -0,0 +1,3 @@
-+{
-+  "plugins": ["syntax-dynamic-import"]
-+}
-merged
-  result 100644 1ec8067f831c1ed1de768f65d3f2df91c43b29ae .eslintrc.yml
-  our    100644 f724d1b1129c863e41f4e78d2b1a200c0aea07e7 .eslintrc.yml
-@@ -66,6 +66,9 @@
-   eqeqeq:
-     - error
-     - smart
-+  strict:
-+    - error
-+    - global
-
-   ###########
-   # SPECIAL #
-@@ -79,7 +82,15 @@
-     - selector: ExportDefaultDeclaration
-       message: Use of default exports is forbidden
-
-+overrides:
-+  - files: '*.d.ts'
-+    rules:
-+      strict:
-+        - error
-+        - never
-+
- parserOptions:
-   sourceType: module
-   ecmaFeatures:
-     jsx: true
-+
-merged
-  result 100644 59072918c96565e2427754f755ca662d7b067423 .github/CONTRIBUTING.md
-  our    100644 9d5b8dd9584adfcadfca0e70c747b3519a315309 .github/CONTRIBUTING.md
-@@ -72,15 +72,15 @@
-
- Bugs are tracked as [GitHub issues](https://guides.github.com/features/issues/).
-
--Simply create an issue on the [GitHub Desktop issue tracker](https://github.com/desktop/desktop/issues)
--and fill out the provided [issue template](ISSUE_TEMPLATE.md).
-+Simply create an issue on the [GitHub Desktop issue tracker](https://github.com/desktop/desktop/issues/new?template=bug_report.md)
-+and fill out the provided issue template.
-
- The information we are interested in includes:
-
-  - details about your environment - which build, which operating system
-  - details about reproducing the issue - what steps to take, what happens, how
-    often it happens
-- - other relevant information - log files, screenshots, etc.
-+ - other relevant information - log files, screenshots, etc
-
- ### Suggesting Enhancements
-
-@@ -107,20 +107,21 @@
-
- Enhancement suggestions are tracked as [GitHub issues](https://guides.github.com/features/issues/).
-
--Simply create an issue on the [GitHub Desktop issue tracker](https://github.com/desktop/desktop/issues)
--and provide the following information:
-+Simply create an issue on the [GitHub Desktop issue tracker](https://github.com/desktop/desktop/issues/new?template=feature_request.md)
-+and fill out the provided issue template.
-
--* **Use a clear and descriptive title** for the issue to identify the
--  suggestion.
--* **Provide a step-by-step description of the suggested enhancement** in as
--  much detail as possible. This additional context helps the maintainers to
--  understand the enhancement from your perspective
--* **Explain why this enhancement would be useful** to GitHub Desktop users.
-+Some additional advice:
-+
-+* **Use a clear and descriptive title** for the feature request
-+* **Provide a step-by-step description of the suggested enhancement**
-+  This additional context helps the maintainers understand the enhancement from
-+  your perspective
-+* **Explain why this enhancement would be useful** to GitHub Desktop users
- * **Include screenshots and animated GIFs** if relevant to help you demonstrate
-   the steps or point out the part of GitHub Desktop which the suggestion is
-   related to. You can use [this tool](http://www.cockos.com/licecap/) to record
--  GIFs on macOS and Windows.
--* **List some other applications where this enhancement exists, if applicable.**
-+  GIFs on macOS and Windows
-+* **List some other applications where this enhancement exists, if applicable**
-
- ### Help Wanted
-
-@@ -148,27 +149,30 @@
-
- | Label name | :mag_right: | Description |
- | --- | --- | --- |
--| `enhancement` | [search](https://github.com/desktop/desktop/labels/enhancement) | Feature requests. |
--| `bug` | [search](https://github.com/desktop/desktop/labels/bug)  | Confirmed bugs or reports that are very likely to be bugs. |
--| `more-information-needed` | [search](https://github.com/desktop/desktop/labels/more-information-needed) | More information needs to be collected about these problems or feature requests (e.g. steps to reproduce). |
--| `reviewer-needs-to-reproduce` | [search](https://github.com/desktop/desktop/labels/reviewer-needs-to-reproduce)  | Likely bugs, but haven't been reliably reproduced by a reviewer. |
--| `stale` | [search](https://github.com/desktop/desktop/labels/stale) | Issues that are inactive and marked to be closed. |
--| `macOS` | [search](https://github.com/desktop/desktop/labels/macOS)  | Issues specific to macOS users. |
--| `Windows` | [search](https://github.com/desktop/desktop/labels/Windows)  | Issues specific to Windows users. |
--| `codemirror` | [search](https://github.com/desktop/desktop/labels/codemirror)  | Issues related to our use of [CodeMirror](https://codemirror.net/) that may require upstream fixes. |
--| `electron` | [search](https://github.com/desktop/desktop/labels/electron) | Issues related to our use of [Electron](https://electron.atom.io) that may require upstream fixes. |
-+| `enhancement` | [search](https://github.com/desktop/desktop/labels/enhancement) | Feature requests |
-+| `bug` | [search](https://github.com/desktop/desktop/labels/bug)  | Confirmed bugs or reports that are very likely to be bugs |
-+| `more-information-needed` | [search](https://github.com/desktop/desktop/labels/more-information-needed) | More information needs to be collected about these problems or feature requests (e.g. steps to reproduce) |
-+| `reviewer-needs-to-reproduce` | [search](https://github.com/desktop/desktop/labels/reviewer-needs-to-reproduce)  | Potential bugs that still need to be reliably reproduced by a reviewer |
-+| `stale` | [search](https://github.com/desktop/desktop/labels/stale) | Issues that are inactive and marked to be closed |
-+| `macOS` | [search](https://github.com/desktop/desktop/labels/macOS)  | Issues specific to macOS users |
-+| `Windows` | [search](https://github.com/desktop/desktop/labels/Windows)  | Issues specific to Windows users |
-+| `codemirror` | [search](https://github.com/desktop/desktop/labels/codemirror)  | Issues related to our use of [CodeMirror](https://codemirror.net/) that may require upstream fixes |
-+| `electron` | [search](https://github.com/desktop/desktop/labels/electron) | Issues related to our use of [Electron](https://electron.atom.io) that may require upstream fixes |
-+| `themes` | [search](https://github.com/desktop/desktop/labels/themes) | Issues related the light or dark themes that ship in Desktop |
-+| `user-research` | [search](https://github.com/desktop/desktop/labels/user-research) | Issues that might benefit from user interviews, validations, and/or usability testing |
-+| `integrations` | [search](https://github.com/desktop/desktop/labels/integrations) | Issues related to editor and shell integrations that ship in Desktop |
-
- #### Topics
-
- | Label name | :mag_right: | Description |
- | --- | --- | --- |
--| `help wanted` | [search](https://github.com/desktop/desktop/labels/help%20wanted)  | Issues marked as ideal for external contributors. |
--| `tech-debt` | [search](https://github.com/desktop/desktop/labels/tech-debt) | Issues related to code or architecture decisions. |
--| `needs-design-input` | [search](https://github.com/desktop/desktop/labels/needs-design-input)  | Issues that require design input from the core team before the work can be started. |
-+| `help wanted` | [search](https://github.com/desktop/desktop/labels/help%20wanted)  | Issues marked as ideal for external contributors |
-+| `tech-debt` | [search](https://github.com/desktop/desktop/labels/tech-debt) | Issues related to code or architecture decisions |
-+| `needs-design-input` | [search](https://github.com/desktop/desktop/labels/needs-design-input)  | Issues that require design input from the core team before the work can be started |
-
- #### Workflow
-
- | Label name | :mag_right: | Description |
- | --- | --- | --- |
--| `infrastructure` | [search](https://github.com/desktop/desktop/labels/infrastructure) | Pull requests not related to the core application - documentation, dependencies, tooling, etc. |
--| `ready-for-review` | [search](https://github.com/desktop/desktop/labels/ready-for-review)  | Pull Requests that are ready to be reviewed by the maintainers. |
-+| `infrastructure` | [search](https://github.com/desktop/desktop/labels/infrastructure) | Pull requests not related to the core application - documentation, dependencies, tooling, etc |
-+| `ready-for-review` | [search](https://github.com/desktop/desktop/labels/ready-for-review)  | Pull Requests that are ready to be reviewed by the maintainers |
-added in remote
-  their  100644 56219510678c2797ba48167a1e1d912ccf843eac .github/ISSUE_TEMPLATE/bug_report.md
-@@ -0,0 +1,71 @@
-+---
-+name: 🐛 Bug report
-+about: Report a problem encountered while using GitHub Desktop
-+
-+---
-+
-+<!--
-+First and foremost, we’d like to thank you for taking the time to contribute to our project. Before submitting your issue, please follow these steps:
-+
-+1. Familiarize yourself with our contributing guide:
-+	* https://github.com/desktop/desktop/blob/master/.github/CONTRIBUTING.md#contributing-to-github-desktop
-+2. Check if your issue (and sometimes workaround) is in the known-issues doc:
-+	* https://github.com/desktop/desktop/blob/master/docs/known-issues.md
-+3. Make sure your issue isn’t a duplicate of another issue
-+4. If you have made it to this step, go ahead and fill out the template below
-+-->
-+
-+## Description
-+<!--
-+Provide a detailed description of the behavior you're seeing or the behavior you'd like to see **below** this comment.
-+-->
-+
-+
-+## Version
-+<!--
-+Place the version of GitHub Desktop you have installed **below** this comment. This is displayed under the 'About GitHub Desktop' menu item. If you are running from source, include the commit by running `git rev-parse HEAD` from the local repository.
-+-->
-+* GitHub Desktop:
-+<!--
-+Place the version of your operating system **below** this comment. The operating system you are running on may also help with reproducing the issue. If you are on macOS, launch 'About This Mac' and write down the OS version listed. If you are on Windows, open 'Command Prompt' and attach the output of this command: 'cmd /c ver'
-+-->
-+* Operating system:
-+
-+
-+## Steps to Reproduce
-+<!--
-+List the steps to reproduce your issue **below** this comment
-+ex,
-+1. `step 1`
-+2. `step 2`
-+3. `and so on…`
-+-->
-+
-+### Expected Behavior
-+<!-- What you expected to happen -->
-+
-+### Actual Behavior
-+<!-- What actually happens -->
-+
-+
-+## Additional Information
-+<!--
-+Place any additional information, configuration, or data that might be necessary to reproduce the issue **below** this comment.
-+
-+If you have screen shots or gifs that demonstrate the issue, please include them.
-+
-+If the issue involves a specific public repository, including the information about it will make it easier to recreate the issue.
-+
-+If you are dealing with a performance issue or regression, attaching a Timeline profile of the task will help the developers understand the runtime behavior of the application on your machine.
-+https://github.com/desktop/desktop/blob/master/docs/contributing/timeline-profile.md
-+-->
-+
-+### Logs
-+<!--
-+Attach your log file (You can simply drag your file here to insert it) to this issue. Please make sure the generated link to your log file is **below** this comment section otherwise it will not appear when you submit your issue.
-+
-+macOS logs location: `~/Library/Application Support/GitHub Desktop/logs/*.desktop.production.log`
-+Windows logs location: `%APPDATA%\GitHub Desktop\logs\*.desktop.production.log`
-+
-+The log files are organized by date, so see if anything was generated for today's date.
-+-->
-added in remote
-  their  100644 7c297531a2dd774e2b066ddc50384a12f5e8e034 .github/ISSUE_TEMPLATE/feature_request.md
-@@ -0,0 +1,17 @@
-+---
-+name: 🎉 Feature request
-+about: Suggest an idea to improve GitHub Desktop
-+---
-+
-+**Is your feature request related to a problem? Please describe.**
-+A clear and concise description of what the problem is. Ex. I have an issue when [...]
-+
-+**Describe the solution you'd like**
-+A clear and concise description of what you want to happen. Add any considered drawbacks.
-+
-+**Describe alternatives you've considered**
-+A clear and concise description of any alternative solutions or features you've considered.
-+
-+**Teachability, Documentation, Adoption, Migration Strategy**
-+If you can, explain how users will be able to use this. This will help the core team understand how the feature would work, and assist with future work like documentation.
-+Screenshots or mockups here are a great help!
-\ No newline at end of file
-removed in remote
-  base   100644 65c8c0a5f5c37299d369ce4811128ae829368d2d .github/ISSUE_TEMPLATE.md
-  our    100644 65c8c0a5f5c37299d369ce4811128ae829368d2d .github/ISSUE_TEMPLATE.md
-@@ -1,65 +0,0 @@
--<!--
--First and foremost, we’d like to thank you for taking the time to contribute to our project. Before submitting your issue, please follow these steps:
--
--1. Familiarize yourself with our contributing guide:
--	* https://github.com/desktop/desktop/blob/master/CONTRIBUTING.md#contributing-to-github-desktop
--2. Check if your issue (and sometimes workaround) is in the known-issues doc:
--	* https://github.com/desktop/desktop/blob/master/docs/known-issues.md
--3. Make sure your issue isn’t a duplicate of another issue
--4. If you have made it to this step, go ahead and fill out the template below
---->
--
--## Description
--<!--
--Provide a detailed description of the behavior you're seeing or the behavior you'd like to see **below** this comment.
---->
--
--
--## Version
--<!--
--Place the version of GitHub Desktop you have installed **below** this comment. This is displayed under the 'About GitHub Desktop' menu item. If you are running from source, include the commit by running `git rev-parse HEAD` from the local repository.
---->
--* GitHub Desktop:
--<!--
--Place the version of your operating system **below** this comment. The operating system you are running on may also help with reproducing the issue. If you are on macOS, launch 'About This Mac' and write down the OS version listed. If you are on Windows, open 'Command Prompt' and attach the output of this command: 'cmd /c ver'
---->
--* Operating system:
--
--
--## Steps to Reproduce
--<!--
--List the steps to reproduce your issue **below** this comment
--ex,
--1. `step 1`
--2. `step 2`
--3. `and so on…`
---->
--
--### Expected Behavior
--<!-- What you expected to happen -->
--
--### Actual Behavior
--<!-- What actually happens -->
--
--
--## Additional Information
--<!--
--Place any additional information, configuration, or data that might be necessary to reproduce the issue **below** this comment.
--
--If you have screen shots or gifs that demonstrate the issue, please include them.
--
--If the issue involves a specific public repository, including the information about it will make it easier to recreate the issue.
--
--If you are dealing with a performance issue or regression, attaching a Timeline profile of the task will help the developers understand the runtime behavior of the application on your machine.
--https://github.com/desktop/desktop/blob/master/docs/contributing/timeline-profile.md
---->
--
--### Logs
--<!--
--Attach your log file (You can simply drag your file here to insert it) to this issue. Please make sure the generated link to your log file is **below** this comment section otherwise it will not appear when you submit your issue.
--
--macOS logs location: `~/Library/Application Support/GitHub Desktop/logs/*.desktop.production.log`
--Windows logs location: `%APPDATA%\GitHub Desktop\logs\*.desktop.production.log`
--
--The log files are organized by date, so see if anything was generated for today's date.
---->
-merged
-  result 100644 63a2cc1a341c354faf7c4979d2fffb86d5e93501 .gitignore
-  our    100644 de84018cf2395164cee116bb3a01759e6cf3c41a .gitignore
-@@ -9,3 +9,4 @@
- .idea/
- .vs/
- .eslintcache
-+*.iml
-merged
-  result 100644 dba04c1e1786b2c5f953ebf2c24c6fcc615c2d9a .node-version
-  our    100644 32c861f970d80180ef7668a04d5e3ce61bbd706e .node-version
-@@ -1 +1 @@
--8.9.2
-+8.11.3
-merged
-  result 100644 ab983e8df0a9388373270ef9d669c8806ec4ccf9 .prettierrc.yml
-  our    100644 a99d2fbed4d8d42c708293ed1a1d310b3ff27c5a .prettierrc.yml
-@@ -2,3 +2,8 @@
- trailingComma: es5
- semi: false
- proseWrap: always
-+
-+overrides:
-+- files: "*.scss"
-+  options:
-+    printWidth: 200
-\ No newline at end of file
-merged
-  result 100644 fde223649b6eef6edf60d8726f22ddd799873819 .travis.yml
-  our    100644 15b264ab77bd3f42b71b4f5f9072b455a964ca95 .travis.yml
-@@ -38,7 +38,7 @@
-
- language: node_js
- node_js:
--  - "8.9.0"
-+  - "8.11.0"
-
- cache:
-   yarn: true
-@@ -50,7 +50,7 @@
-     - $HOME/.cache/electron-builder
-
- before_install:
--  - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.3.2
-+  - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.5.1
-   - export PATH=$HOME/.yarn/bin:$PATH
-
- install:
-merged
-  result 100644 2de5029d6613dc9f507cd891b707d66e78b68851 README.md
-  our    100644 574e4d56ae5ca7982571359a903164b85027cf81 README.md
-@@ -3,6 +3,7 @@
- [![Travis](https://img.shields.io/travis/desktop/desktop.svg?style=flat-square&label=Travis+CI)](https://travis-ci.org/desktop/desktop)
- [![CircleCI](https://img.shields.io/circleci/project/github/desktop/desktop.svg?style=flat-square&label=CircleCI)](https://circleci.com/gh/desktop/desktop)
- [![AppVeyor Build Status](https://img.shields.io/appveyor/ci/github-windows/desktop/master.svg?style=flat-square&label=AppVeyor&logo=appveyor)](https://ci.appveyor.com/project/github-windows/desktop/branch/master)
-+[![VSTS Build Status](https://github.visualstudio.com/_apis/public/build/definitions/845028c2-21f3-4eb1-80b9-215d3e9b1d08/3/badge)](https://github.visualstudio.com/Desktop/_build/index?definitionId=3)
- [![license](https://img.shields.io/github/license/desktop/desktop.svg?style=flat-square)](https://github.com/desktop/desktop/blob/master/LICENSE)
- ![90+% TypeScript](https://img.shields.io/github/languages/top/desktop/desktop.svg?style=flat-square&colorB=green)
-
-@@ -51,8 +52,8 @@
- There is also a list of [known issues](https://github.com/desktop/desktop/blob/master/docs/known-issues.md)
- that are being tracked against Desktop, and some of these issues have workarounds.
-
--If you can't find an issue that matches what you're seeing, open a [new issue](https://github.com/desktop/desktop/issues/new)
--and fill out the template to provide us with enough information to investigate
-+If you can't find an issue that matches what you're seeing, open a [new issue](https://github.com/desktop/desktop/issues/new/choose),
-+choose the right template and provide us with enough information to investigate
- further.
-
- ## How can I contribute to GitHub Desktop?
-merged
-  result 100644 f7a365459e5cee710b2f3156119a6a2b2ff65a7d app/.npmrc
-  our    100644 3b80cccbdce21610474a65dcdc28c309d819e278 app/.npmrc
-@@ -1,4 +1,4 @@
- runtime = electron
- disturl = https://atom.io/download/electron
--target = 1.8.3
-+target = 1.8.7
- arch = x64
-removed in remote
-  base   100644 996444dc72a75f727b5f5e62cac72e4fe4a21302 app/app-info.d.ts
-  our    100644 996444dc72a75f727b5f5e62cac72e4fe4a21302 app/app-info.d.ts
-@@ -1,2 +0,0 @@
--export function getReplacements(): {}
--export function getCLICommands(): string[]
-removed in remote
-  base   100644 53ac0bb5d571c6f678ac4794df6004fed9c17cd7 app/app-info.js
-  our    100644 53ac0bb5d571c6f678ac4794df6004fed9c17cd7 app/app-info.js
-@@ -1,50 +0,0 @@
--'use strict'
--
--const fs = require('fs')
--const path = require('path')
--
--const gitInfo = require('./git-info')
--const distInfo = require('../script/dist-info')
--
--const projectRoot = path.join(__dirname, '..')
--
--const devClientId = '3a723b10ac5575cc5bb9'
--const devClientSecret = '22c34d87789a365981ed921352a7b9a8c3f69d54'
--
--const channel = distInfo.getReleaseChannel()
--
--function getCLICommands() {
--  return (
--    // eslint-disable-next-line no-sync
--    fs
--      .readdirSync(path.resolve(projectRoot, 'app', 'src', 'cli', 'commands'))
--      .filter(name => name.endsWith('.ts'))
--      .map(name => name.replace(/\.ts$/, ''))
--  )
--}
--
--function s(text) {
--  return JSON.stringify(text)
--}
--
--function getReplacements() {
--  return {
--    __OAUTH_CLIENT_ID__: s(process.env.DESKTOP_OAUTH_CLIENT_ID || devClientId),
--    __OAUTH_SECRET__: s(
--      process.env.DESKTOP_OAUTH_CLIENT_SECRET || devClientSecret
--    ),
--    __DARWIN__: process.platform === 'darwin',
--    __WIN32__: process.platform === 'win32',
--    __LINUX__: process.platform === 'linux',
--    __DEV__: channel === 'development',
--    __RELEASE_CHANNEL__: s(channel),
--    __UPDATES_URL__: s(distInfo.getUpdatesURL()),
--    __SHA__: s(gitInfo.getSHA()),
--    __CLI_COMMANDS__: s(getCLICommands()),
--    'process.platform': s(process.platform),
--    'process.env.NODE_ENV': s(process.env.NODE_ENV || 'development'),
--    'process.env.TEST_ENV': s(process.env.TEST_ENV),
--  }
--}
--
--module.exports = { getReplacements, getCLICommands }
-added in remote
-  their  100644 bb6679dfc6714a548b27c030dd653216c7e19833 app/app-info.ts
-@@ -0,0 +1,44 @@
-+import * as fs from 'fs'
-+import * as Path from 'path'
-+
-+import { getSHA } from './git-info'
-+import { getUpdatesURL, getReleaseChannel } from '../script/dist-info'
-+
-+const projectRoot = Path.dirname(__dirname)
-+
-+const devClientId = '3a723b10ac5575cc5bb9'
-+const devClientSecret = '22c34d87789a365981ed921352a7b9a8c3f69d54'
-+
-+const channel = getReleaseChannel()
-+
-+export function getCLICommands() {
-+  return (
-+    // eslint-disable-next-line no-sync
-+    fs
-+      .readdirSync(Path.resolve(projectRoot, 'app', 'src', 'cli', 'commands'))
-+      .filter(name => name.endsWith('.ts'))
-+      .map(name => name.replace(/\.ts$/, ''))
-+  )
-+}
-+
-+const s = JSON.stringify
-+
-+export function getReplacements() {
-+  return {
-+    __OAUTH_CLIENT_ID__: s(process.env.DESKTOP_OAUTH_CLIENT_ID || devClientId),
-+    __OAUTH_SECRET__: s(
-+      process.env.DESKTOP_OAUTH_CLIENT_SECRET || devClientSecret
-+    ),
-+    __DARWIN__: process.platform === 'darwin',
-+    __WIN32__: process.platform === 'win32',
-+    __LINUX__: process.platform === 'linux',
-+    __DEV__: channel === 'development',
-+    __RELEASE_CHANNEL__: s(channel),
-+    __UPDATES_URL__: s(getUpdatesURL()),
-+    __SHA__: s(getSHA()),
-+    __CLI_COMMANDS__: s(getCLICommands()),
-+    'process.platform': s(process.platform),
-+    'process.env.NODE_ENV': s(process.env.NODE_ENV || 'development'),
-+    'process.env.TEST_ENV': s(process.env.TEST_ENV),
-+  }
-+}
-removed in remote
-  base   100644 db784cfd0f0a6592eb885f2049f8afc835d6e910 app/git-info.d.ts
-  our    100644 db784cfd0f0a6592eb885f2049f8afc835d6e910 app/git-info.d.ts
-@@ -1 +0,0 @@
--export function getSHA(): string
-removed in remote
-  base   100644 4e9e8240c199c8ad4b02c7453d746c07e9e77502 app/git-info.js
-  our    100644 4e9e8240c199c8ad4b02c7453d746c07e9e77502 app/git-info.js
-@@ -1,93 +0,0 @@
--'use strict'
--
--const fs = require('fs')
--const path = require('path')
--
--/**
-- * Attempt to find a ref in the .git/packed-refs file, which is often
-- * created by Git as part of cleaning up loose refs in the repository.
-- *
-- * Will return null if the packed-refs file is missing.
-- * Will throw an error if the entry is not found in the packed-refs file
-- *
-- * @param {string} gitDir The path to the Git repository's .git directory
-- * @param {string} ref    A qualified git ref such as 'refs/heads/master'
-- */
--function readPackedRefsFile(gitDir, ref) {
--  const packedRefsPath = path.join(gitDir, 'packed-refs')
--
--  try {
--    // eslint-disable-next-line no-sync
--    fs.statSync(packedRefsPath)
--  } catch (err) {
--    // fail quietly if packed-refs not found
--    return null
--  }
--
--  // eslint-disable-next-line no-sync
--  const packedRefsContents = fs.readFileSync(packedRefsPath)
--
--  // we need to build up the regex on the fly using the ref
--  const refRe = new RegExp('([a-f0-9]{40}) ' + ref)
--  const packedRefMatch = refRe.exec(packedRefsContents)
--
--  if (!packedRefMatch) {
--    throw new Error(`Could not find ref entry in .git/packed-refs file: ${ref}`)
--  }
--  return packedRefMatch[1]
--}
--
--/**
-- * Attempt to dereference the given ref without requiring a Git environment
-- * to be present. Note that this method will not be able to dereference packed
-- * refs but should suffice for simple refs like 'HEAD'.
-- *
-- * Will throw an error for unborn HEAD.
-- *
-- * @param {string} gitDir The path to the Git repository's .git directory
-- * @param {string} ref    A qualified git ref such as 'HEAD' or 'refs/heads/master'
-- */
--function revParse(gitDir, ref) {
--  const refPath = path.join(gitDir, ref)
--
--  try {
--    // eslint-disable-next-line no-sync
--    fs.statSync(refPath)
--  } catch (err) {
--    const packedRefMatch = readPackedRefsFile(gitDir, ref)
--    if (packedRefMatch) {
--      return packedRefMatch
--    }
--
--    throw new Error(
--      `Could not de-reference HEAD to SHA, ref does not exist on disk: ${refPath}`
--    )
--  }
--  // eslint-disable-next-line no-sync
--  const refContents = fs.readFileSync(refPath)
--  const refRe = /^([a-f0-9]{40})|(?:ref: (refs\/.*))$/m
--  const refMatch = refRe.exec(refContents)
--
--  if (!refMatch) {
--    throw new Error(
--      `Could not de-reference HEAD to SHA, invalid ref in ${refPath}: ${refContents}`
--    )
--  }
--
--  return refMatch[1] || revParse(gitDir, refMatch[2])
--}
--
--function getSHA() {
--  // CircleCI does some funny stuff where HEAD points to an packed ref, but
--  // luckily it gives us the SHA we want in the environment.
--  const circleSHA = process.env.CIRCLE_SHA1
--  if (circleSHA) {
--    return circleSHA
--  }
--
--  return revParse(path.resolve(__dirname, '../.git'), 'HEAD')
--}
--
--module.exports = {
--  getSHA,
--}
-added in remote
-  their  100644 1bf399b381dab7c260c1dc4126025c7ab1a437af app/git-info.ts
-@@ -0,0 +1,88 @@
-+import * as Fs from 'fs'
-+import * as Path from 'path'
-+
-+/**
-+ * Attempt to find a ref in the .git/packed-refs file, which is often
-+ * created by Git as part of cleaning up loose refs in the repository.
-+ *
-+ * Will return null if the packed-refs file is missing.
-+ * Will throw an error if the entry is not found in the packed-refs file
-+ *
-+ * @param gitDir The path to the Git repository's .git directory
-+ * @param ref    A qualified git ref such as 'refs/heads/master'
-+ */
-+function readPackedRefsFile(gitDir: string, ref: string) {
-+  const packedRefsPath = Path.join(gitDir, 'packed-refs')
-+
-+  try {
-+    // eslint-disable-next-line no-sync
-+    Fs.statSync(packedRefsPath)
-+  } catch (err) {
-+    // fail quietly if packed-refs not found
-+    return null
-+  }
-+
-+  // eslint-disable-next-line no-sync
-+  const packedRefsContents = Fs.readFileSync(packedRefsPath, 'utf8')
-+
-+  // we need to build up the regex on the fly using the ref
-+  const refRe = new RegExp('([a-f0-9]{40}) ' + ref)
-+  const packedRefMatch = refRe.exec(packedRefsContents)
-+
-+  if (!packedRefMatch) {
-+    throw new Error(`Could not find ref entry in .git/packed-refs file: ${ref}`)
-+  }
-+  return packedRefMatch[1]
-+}
-+
-+/**
-+ * Attempt to dereference the given ref without requiring a Git environment
-+ * to be present. Note that this method will not be able to dereference packed
-+ * refs but should suffice for simple refs like 'HEAD'.
-+ *
-+ * Will throw an error for unborn HEAD.
-+ *
-+ * @param   gitDir The path to the Git repository's .git directory
-+ * @param   ref    A qualified git ref such as 'HEAD' or 'refs/heads/master'
-+ * @returns        The ref SHA
-+ */
-+function revParse(gitDir: string, ref: string): string {
-+  const refPath = Path.join(gitDir, ref)
-+
-+  try {
-+    // eslint-disable-next-line no-sync
-+    Fs.statSync(refPath)
-+  } catch (err) {
-+    const packedRefMatch = readPackedRefsFile(gitDir, ref)
-+    if (packedRefMatch) {
-+      return packedRefMatch
-+    }
-+
-+    throw new Error(
-+      `Could not de-reference HEAD to SHA, ref does not exist on disk: ${refPath}`
-+    )
-+  }
-+  // eslint-disable-next-line no-sync
-+  const refContents = Fs.readFileSync(refPath, 'utf8')
-+  const refRe = /^([a-f0-9]{40})|(?:ref: (refs\/.*))$/m
-+  const refMatch = refRe.exec(refContents)
-+
-+  if (!refMatch) {
-+    throw new Error(
-+      `Could not de-reference HEAD to SHA, invalid ref in ${refPath}: ${refContents}`
-+    )
-+  }
-+
-+  return refMatch[1] || revParse(gitDir, refMatch[2])
-+}
-+
-+export function getSHA() {
-+  // CircleCI does some funny stuff where HEAD points to an packed ref, but
-+  // luckily it gives us the SHA we want in the environment.
-+  const circleSHA = process.env.CIRCLE_SHA1
-+  if (circleSHA != null) {
-+    return circleSHA
-+  }
-+
-+  return revParse(Path.resolve(__dirname, '../.git'), 'HEAD')
-+}
-removed in remote
-  base   100644 5f169d7f8e0a82168c2c13ea3ba71b5b101f0c73 app/package-info.d.ts
-  our    100644 5f169d7f8e0a82168c2c13ea3ba71b5b101f0c73 app/package-info.d.ts
-@@ -1,4 +0,0 @@
--export function getProductName(): string
--export function getCompanyName(): string
--export function getVersion(): string
--export function getBundleID(): string
-removed in remote
-  base   100644 b63ebe090392d9f6829519ac340cbba3901300cb app/package-info.js
-  our    100644 b63ebe090392d9f6829519ac340cbba3901300cb app/package-info.js
-@@ -1,33 +0,0 @@
--'use strict'
--
--const path = require('path')
--
--const projectRoot = __dirname
--// eslint-disable-next-line import/no-dynamic-require
--const appPackage = require(path.join(projectRoot, 'package.json'))
--
--function getProductName() {
--  const productName = appPackage.productName
--  return process.env.NODE_ENV === 'development'
--    ? `${productName}-dev`
--    : productName
--}
--
--function getCompanyName() {
--  return appPackage.companyName
--}
--
--function getVersion() {
--  return appPackage.version
--}
--
--function getBundleID() {
--  return appPackage.bundleID
--}
--
--module.exports = {
--  getProductName,
--  getCompanyName,
--  getVersion,
--  getBundleID,
--}
-added in remote
-  their  100644 ec6e40fb46f6554d62823e5f27a8743de594acff app/package-info.ts
-@@ -0,0 +1,20 @@
-+const appPackage: Record<string, string> = require('./package.json')
-+
-+export function getProductName() {
-+  const productName = appPackage.productName
-+  return process.env.NODE_ENV === 'development'
-+    ? `${productName}-dev`
-+    : productName
-+}
-+
-+export function getCompanyName() {
-+  return appPackage.companyName
-+}
-+
-+export function getVersion() {
-+  return appPackage.version
-+}
-+
-+export function getBundleID() {
-+  return appPackage.bundleID
-+}
-merged
-  result 100644 8a1178e723ae9609c53f3bcc8b0d06771b3de809 app/package.json
-  our    100644 0ec1aae7a11244ccf59f08de5e97e1824f63fc85 app/package.json
-@@ -3,7 +3,7 @@
-   "productName": "GitHub Desktop",
-   "bundleID": "com.github.GitHubClient",
-   "companyName": "GitHub, Inc.",
--  "version": "1.1.2-beta1",
-+  "version": "1.2.7-test1",
-   "main": "./main.js",
-   "repository": {
-     "type": "git",
-@@ -25,23 +25,23 @@
-     "codemirror-mode-elixir": "1.1.1",
-     "deep-equal": "^1.0.1",
-     "dexie": "^2.0.0",
--    "dugite": "1.61.0",
-+    "dugite": "^1.67.0",
-     "electron-window-state": "^4.0.2",
-     "event-kit": "^2.0.0",
-     "file-uri-to-path": "0.0.2",
-     "file-url": "^2.0.2",
--    "front-matter": "^2.1.2",
--    "fs-extra": "^2.1.2",
-+    "fs-extra": "^6.0.0",
-     "fuzzaldrin-plus": "^0.6.0",
-     "keytar": "^4.0.4",
-     "moment": "^2.17.1",
-     "mri": "^1.1.0",
-     "primer-support": "^4.0.0",
--    "react": "^16.2.0",
-+    "queue": "^4.4.2",
-+    "react": "^16.3.2",
-     "react-addons-shallow-compare": "^15.6.2",
--    "react-dom": "^16.2.0",
-+    "react-dom": "^16.3.2",
-     "react-transition-group": "^1.2.0",
--    "react-virtualized": "^9.18.5",
-+    "react-virtualized": "^9.20.0",
-     "registry-js": "^1.0.7",
-     "runas": "^3.1.1",
-     "source-map-support": "^0.4.15",
-@@ -59,7 +59,6 @@
-     "devtron": "^1.4.0",
-     "electron-debug": "^1.1.0",
-     "electron-devtools-installer": "^2.2.3",
--    "style-loader": "^0.13.2",
-     "temp": "^0.8.3",
-     "webpack-hot-middleware": "^2.10.0"
-   }
-merged
-  result 100644 e427588f02a3f1fd3d89705d05dedc0fe2ccfbfb app/src/ask-pass/ask-pass.ts
-  our    100644 537e5a421b8fac3f1bc529212cd0bd1ad86330b6 app/src/ask-pass/ask-pass.ts
-@@ -5,16 +5,16 @@
- export async function responseForPrompt(
-   prompt: string
- ): Promise<string | null> {
--  const username: string | null = process.env.DESKTOP_USERNAME
--  if (!username || !username.length) {
-+  const username = process.env.DESKTOP_USERNAME
-+  if (username == null || username.length === 0) {
-     return null
-   }
-
-   if (prompt.startsWith('Username')) {
-     return username
-   } else if (prompt.startsWith('Password')) {
--    const endpoint: string | null = process.env.DESKTOP_ENDPOINT
--    if (!endpoint || !endpoint.length) {
-+    const endpoint = process.env.DESKTOP_ENDPOINT
-+    if (endpoint == null || endpoint.length === 0) {
-       return null
-     }
-
-removed in remote
-  base   100644 66965ffb5ca93dbeaa3562652443adc8c8dd4715 app/src/cli/dev-commands-global.js
-  our    100644 66965ffb5ca93dbeaa3562652443adc8c8dd4715 app/src/cli/dev-commands-global.js
-@@ -1,3 +0,0 @@
--const appInfo = require('../../../app/app-info')
--
--global.__CLI_COMMANDS__ = appInfo.getCLICommands()
-added in remote
-  their  100644 2199e5e0c456edb57048a02298f9925eb4953327 app/src/cli/dev-commands-global.ts
-@@ -0,0 +1,4 @@
-+import { getCLICommands } from '../../../app/app-info'
-+
-+const g: any = global
-+g.__CLI_COMMANDS__ = getCLICommands()
-merged
-  result 100644 d6887c4c182d239a574563f5a552b6c44bab229d app/src/highlighter/globals.d.ts
-  our    100644 a639311f88f661769bc71af8d6a36e20b314709d app/src/highlighter/globals.d.ts
-@@ -251,3 +251,128 @@
- declare module 'codemirror/addon/runmode/runmode.node.js' {
-   export = CodeMirror
- }
-+
-+declare module 'codemirror-mode-elixir'
-+
-+// find app/node_modules/codemirror/mode -iname *.js | cut -d '/' -f 3- | cut -d '.' -f 1 | sed -e "s/^/declare module '/" | sed -e "s/$/'/"
-+declare module 'codemirror/mode/scheme/scheme'
-+declare module 'codemirror/mode/modelica/modelica'
-+declare module 'codemirror/mode/idl/idl'
-+declare module 'codemirror/mode/pascal/pascal'
-+declare module 'codemirror/mode/nsis/nsis'
-+declare module 'codemirror/mode/haml/haml'
-+declare module 'codemirror/mode/toml/toml'
-+declare module 'codemirror/mode/pig/pig'
-+declare module 'codemirror/mode/gas/gas'
-+declare module 'codemirror/mode/go/go'
-+declare module 'codemirror/mode/apl/apl'
-+declare module 'codemirror/mode/textile/textile'
-+declare module 'codemirror/mode/turtle/turtle'
-+declare module 'codemirror/mode/sparql/sparql'
-+declare module 'codemirror/mode/troff/troff'
-+declare module 'codemirror/mode/cmake/cmake'
-+declare module 'codemirror/mode/htmlembedded/htmlembedded'
-+declare module 'codemirror/mode/xquery/xquery'
-+declare module 'codemirror/mode/python/python'
-+declare module 'codemirror/mode/css/css'
-+declare module 'codemirror/mode/clojure/clojure'
-+declare module 'codemirror/mode/spreadsheet/spreadsheet'
-+declare module 'codemirror/mode/asn.1/asn.1'
-+declare module 'codemirror/mode/z80/z80'
-+declare module 'codemirror/mode/jinja2/jinja2'
-+declare module 'codemirror/mode/gherkin/gherkin'
-+declare module 'codemirror/mode/asterisk/asterisk'
-+declare module 'codemirror/mode/dockerfile/dockerfile'
-+declare module 'codemirror/mode/dart/dart'
-+declare module 'codemirror/mode/shell/shell'
-+declare module 'codemirror/mode/yacas/yacas'
-+declare module 'codemirror/mode/markdown/markdown'
-+declare module 'codemirror/mode/haxe/haxe'
-+declare module 'codemirror/mode/soy/soy'
-+declare module 'codemirror/mode/perl/perl'
-+declare module 'codemirror/mode/smalltalk/smalltalk'
-+declare module 'codemirror/mode/dylan/dylan'
-+declare module 'codemirror/mode/stylus/stylus'
-+declare module 'codemirror/mode/vue/vue'
-+declare module 'codemirror/mode/rust/rust'
-+declare module 'codemirror/mode/rst/rst'
-+declare module 'codemirror/mode/tiddlywiki/tiddlywiki'
-+declare module 'codemirror/mode/pug/pug'
-+declare module 'codemirror/mode/erlang/erlang'
-+declare module 'codemirror/mode/r/r'
-+declare module 'codemirror/mode/mathematica/mathematica'
-+declare module 'codemirror/mode/yaml-frontmatter/yaml-frontmatter'
-+declare module 'codemirror/mode/diff/diff'
-+declare module 'codemirror/mode/elm/elm'
-+declare module 'codemirror/mode/crystal/crystal'
-+declare module 'codemirror/mode/cypher/cypher'
-+declare module 'codemirror/mode/htmlmixed/htmlmixed'
-+declare module 'codemirror/mode/ebnf/ebnf'
-+declare module 'codemirror/mode/webidl/webidl'
-+declare module 'codemirror/mode/smarty/smarty'
-+declare module 'codemirror/mode/stex/stex'
-+declare module 'codemirror/mode/haskell/haskell'
-+declare module 'codemirror/mode/factor/factor'
-+declare module 'codemirror/mode/php/php'
-+declare module 'codemirror/mode/pegjs/pegjs'
-+declare module 'codemirror/mode/lua/lua'
-+declare module 'codemirror/mode/velocity/velocity'
-+declare module 'codemirror/mode/xml/xml'
-+declare module 'codemirror/mode/solr/solr'
-+declare module 'codemirror/mode/mbox/mbox'
-+declare module 'codemirror/mode/mllike/mllike'
-+declare module 'codemirror/mode/vb/vb'
-+declare module 'codemirror/mode/powershell/powershell'
-+declare module 'codemirror/mode/tornado/tornado'
-+declare module 'codemirror/mode/vhdl/vhdl'
-+declare module 'codemirror/mode/tiki/tiki'
-+declare module 'codemirror/mode/clike/clike'
-+declare module 'codemirror/mode/tcl/tcl'
-+declare module 'codemirror/mode/brainfuck/brainfuck'
-+declare module 'codemirror/mode/ttcn/ttcn'
-+declare module 'codemirror/mode/dtd/dtd'
-+declare module 'codemirror/mode/octave/octave'
-+declare module 'codemirror/mode/properties/properties'
-+declare module 'codemirror/mode/verilog/verilog'
-+declare module 'codemirror/mode/handlebars/handlebars'
-+declare module 'codemirror/mode/nginx/nginx'
-+declare module 'codemirror/mode/http/http'
-+declare module 'codemirror/mode/asciiarmor/asciiarmor'
-+declare module 'codemirror/mode/swift/swift'
-+declare module 'codemirror/mode/meta'
-+declare module 'codemirror/mode/sas/sas'
-+declare module 'codemirror/mode/sieve/sieve'
-+declare module 'codemirror/mode/livescript/livescript'
-+declare module 'codemirror/mode/commonlisp/commonlisp'
-+declare module 'codemirror/mode/fcl/fcl'
-+declare module 'codemirror/mode/yaml/yaml'
-+declare module 'codemirror/mode/fortran/fortran'
-+declare module 'codemirror/mode/julia/julia'
-+declare module 'codemirror/mode/oz/oz'
-+declare module 'codemirror/mode/groovy/groovy'
-+declare module 'codemirror/mode/coffeescript/coffeescript'
-+declare module 'codemirror/mode/slim/slim'
-+declare module 'codemirror/mode/javascript/javascript'
-+declare module 'codemirror/mode/mscgen/mscgen'
-+declare module 'codemirror/mode/twig/twig'
-+declare module 'codemirror/mode/eiffel/eiffel'
-+declare module 'codemirror/mode/cobol/cobol'
-+declare module 'codemirror/mode/sass/sass'
-+declare module 'codemirror/mode/rpm/rpm'
-+declare module 'codemirror/mode/mumps/mumps'
-+declare module 'codemirror/mode/vbscript/vbscript'
-+declare module 'codemirror/mode/ttcn-cfg/ttcn-cfg'
-+declare module 'codemirror/mode/forth/forth'
-+declare module 'codemirror/mode/puppet/puppet'
-+declare module 'codemirror/mode/django/django'
-+declare module 'codemirror/mode/d/d'
-+declare module 'codemirror/mode/q/q'
-+declare module 'codemirror/mode/jsx/jsx'
-+declare module 'codemirror/mode/protobuf/protobuf'
-+declare module 'codemirror/mode/gfm/gfm'
-+declare module 'codemirror/mode/ecl/ecl'
-+declare module 'codemirror/mode/ruby/ruby'
-+declare module 'codemirror/mode/mirc/mirc'
-+declare module 'codemirror/mode/haskell-literate/haskell-literate'
-+declare module 'codemirror/mode/ntriples/ntriples'
-+declare module 'codemirror/mode/sql/sql'
-merged
-  result 100644 cb77ca464e7d706ddd17c526debdac45e670cf4f app/src/highlighter/index.ts
-  our    100644 998448323560f91d6522bad31da1dc4317501f5d app/src/highlighter/index.ts
-@@ -11,106 +11,250 @@
-
- import { ITokens, IHighlightRequest } from '../lib/highlighter/types'
-
-+/**
-+ * A mode definition object is used to map a certain file
-+ * extension to a mode loader (see the documentation for
-+ * the install property).
-+ */
-+interface IModeDefinition {
-+  /**
-+   * A function that, when called, will attempt to asynchronously
-+   * load the required modules for a particular mode. This function
-+   * is idempotent and can be called multiple times with no adverse
-+   * effect.
-+   */
-+  readonly install: () => Promise<void>
-+
-+  /**
-+   * A map between file extensions (including the leading dot, i.e.
-+   * ".jpeg") and the selected mime type to use when highlighting
-+   * that extension as specified in the CodeMirror mode itself.
-+   */
-+  readonly extensions: {
-+    readonly [key: string]: string
-+  }
-+}
-+
-+/**
-+ * Array describing all currently supported modes and the file extensions
-+ * that they cover.
-+ */
-+const modes: ReadonlyArray<IModeDefinition> = [
-+  {
-+    install: () => import('codemirror/mode/javascript/javascript'),
-+    extensions: {
-+      '.ts': 'text/typescript',
-+      '.js': 'text/javascript',
-+      '.json': 'application/json',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/coffeescript/coffeescript'),
-+    extensions: {
-+      '.coffee': 'text/x-coffeescript',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/jsx/jsx'),
-+    extensions: {
-+      '.tsx': 'text/typescript-jsx',
-+      '.jsx': 'text/jsx',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/htmlmixed/htmlmixed'),
-+    extensions: {
-+      '.html': 'text/html',
-+      '.htm': 'text/html',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/htmlembedded/htmlembedded'),
-+    extensions: {
-+      '.jsp': 'application/x-jsp',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/css/css'),
-+    extensions: {
-+      '.css': 'text/css',
-+      '.scss': 'text/x-scss',
-+      '.less': 'text/x-less',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/vue/vue'),
-+    extensions: {
-+      '.vue': 'text/x-vue',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/markdown/markdown'),
-+    extensions: {
-+      '.markdown': 'text/x-markdown',
-+      '.md': 'text/x-markdown',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/yaml/yaml'),
-+    extensions: {
-+      '.yaml': 'text/yaml',
-+      '.yml': 'text/yaml',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/xml/xml'),
-+    extensions: {
-+      '.xml': 'text/xml',
-+      '.xaml': 'text/xml',
-+      '.csproj': 'text/xml',
-+      '.fsproj': 'text/xml',
-+      '.vcxproj': 'text/xml',
-+      '.vbproj': 'text/xml',
-+      '.svg': 'text/xml',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/clike/clike'),
-+    extensions: {
-+      '.m': 'text/x-objectivec',
-+      '.scala': 'text/x-scala',
-+      '.sc': 'text/x-scala',
-+      '.cs': 'text/x-csharp',
-+      '.cake': 'text/x-csharp',
-+      '.java': 'text/x-java',
-+      '.c': 'text/x-c',
-+      '.h': 'text/x-c',
-+      '.cpp': 'text/x-c++src',
-+      '.hpp': 'text/x-c++src',
-+      '.kt': 'text/x-kotlin',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/mllike/mllike'),
-+    extensions: {
-+      '.ml': 'text/x-ocaml',
-+      '.fs': 'text/x-fsharp',
-+      '.fsx': 'text/x-fsharp',
-+      '.fsi': 'text/x-fsharp',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/swift/swift'),
-+    extensions: {
-+      '.swift': 'text/x-swift',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/shell/shell'),
-+    extensions: {
-+      '.sh': 'text/x-sh',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/sql/sql'),
-+    extensions: {
-+      '.sql': 'text/x-sql',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/cypher/cypher'),
-+    extensions: {
-+      '.cql': 'application/x-cypher-query',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/go/go'),
-+    extensions: {
-+      '.go': 'text/x-go',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/perl/perl'),
-+    extensions: {
-+      '.pl': 'text/x-perl',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/php/php'),
-+    extensions: {
-+      '.php': 'application/x-httpd-php',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/python/python'),
-+    extensions: {
-+      '.py': 'text/x-python',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/ruby/ruby'),
-+    extensions: {
-+      '.rb': 'text/x-ruby',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/clojure/clojure'),
-+    extensions: {
-+      '.clj': 'text/x-clojure',
-+      '.cljc': 'text/x-clojure',
-+      '.cljs': 'text/x-clojure',
-+      '.edn': 'text/x-clojure',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/rust/rust'),
-+    extensions: {
-+      '.rs': 'text/x-rustsrc',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror-mode-elixir'),
-+    extensions: {
-+      '.ex': 'text/x-elixir',
-+      '.exs': 'text/x-elixir',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/haxe/haxe'),
-+    extensions: {
-+      '.hx': 'text/x-haxe',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/r/r'),
-+    extensions: {
-+      '.r': 'text/x-rsrc',
-+    },
-+  },
-+  {
-+    install: () => import('codemirror/mode/powershell/powershell'),
-+    extensions: {
-+      '.ps1': 'application/x-powershell',
-+    },
-+  },
-+]
-+
-+/**
-+ * A map between file extensions and mime types, see
-+ * the 'extensions' property on the IModeDefinition interface
-+ * for more information
-+ */
- const extensionMIMEMap = new Map<string, string>()
-
--import 'codemirror/mode/javascript/javascript'
--extensionMIMEMap.set('.ts', 'text/typescript')
--extensionMIMEMap.set('.js', 'text/javascript')
--extensionMIMEMap.set('.json', 'application/json')
--
--import 'codemirror/mode/coffeescript/coffeescript'
--extensionMIMEMap.set('.coffee', 'text/x-coffeescript')
--
--import 'codemirror/mode/jsx/jsx'
--extensionMIMEMap.set('.tsx', 'text/typescript-jsx')
--extensionMIMEMap.set('.jsx', 'text/jsx')
--
--import 'codemirror/mode/htmlmixed/htmlmixed'
--extensionMIMEMap.set('.html', 'text/html')
--extensionMIMEMap.set('.htm', 'text/html')
--
--import 'codemirror/mode/css/css'
--extensionMIMEMap.set('.css', 'text/css')
--extensionMIMEMap.set('.scss', 'text/x-scss')
--extensionMIMEMap.set('.less', 'text/x-less')
--
--import 'codemirror/mode/vue/vue'
--extensionMIMEMap.set('.vue', 'text/x-vue')
--
--import 'codemirror/mode/markdown/markdown'
--extensionMIMEMap.set('.markdown', 'text/x-markdown')
--extensionMIMEMap.set('.md', 'text/x-markdown')
--
--import 'codemirror/mode/yaml/yaml'
--extensionMIMEMap.set('.yaml', 'text/yaml')
--extensionMIMEMap.set('.yml', 'text/yaml')
--
--import 'codemirror/mode/xml/xml'
--extensionMIMEMap.set('.xml', 'text/xml')
--extensionMIMEMap.set('.xaml', 'text/xml')
--extensionMIMEMap.set('.csproj', 'text/xml')
--extensionMIMEMap.set('.fsproj', 'text/xml')
--extensionMIMEMap.set('.vcxproj', 'text/xml')
--extensionMIMEMap.set('.vbproj', 'text/xml')
--extensionMIMEMap.set('.svg', 'text/xml')
--
--import 'codemirror/mode/clike/clike'
--extensionMIMEMap.set('.m', 'text/x-objectivec')
--extensionMIMEMap.set('.scala', 'text/x-scala')
--extensionMIMEMap.set('.sc', 'text/x-scala')
--extensionMIMEMap.set('.cs', 'text/x-csharp')
--extensionMIMEMap.set('.java', 'text/x-java')
--extensionMIMEMap.set('.c', 'text/x-c')
--extensionMIMEMap.set('.h', 'text/x-c')
--extensionMIMEMap.set('.cpp', 'text/x-c++src')
--extensionMIMEMap.set('.hpp', 'text/x-c++src')
--extensionMIMEMap.set('.kt', 'text/x-kotlin')
--
--import 'codemirror/mode/mllike/mllike'
--extensionMIMEMap.set('.ml', 'text/x-ocaml')
--extensionMIMEMap.set('.fs', 'text/x-fsharp')
--extensionMIMEMap.set('.fsx', 'text/x-fsharp')
--extensionMIMEMap.set('.fsi', 'text/x-fsharp')
--
--import 'codemirror/mode/swift/swift'
--extensionMIMEMap.set('.swift', 'text/x-swift')
--
--import 'codemirror/mode/shell/shell'
--extensionMIMEMap.set('.sh', 'text/x-sh')
--
--import 'codemirror/mode/sql/sql'
--extensionMIMEMap.set('.sql', 'text/x-sql')
--
--import 'codemirror/mode/cypher/cypher'
--extensionMIMEMap.set('.cql', 'application/x-cypher-query')
--
--import 'codemirror/mode/go/go'
--extensionMIMEMap.set('.go', 'text/x-go')
--
--import 'codemirror/mode/perl/perl'
--extensionMIMEMap.set('.pl', 'text/x-perl')
--
--import 'codemirror/mode/php/php'
--extensionMIMEMap.set('.php', 'application/x-httpd-php')
--
--import 'codemirror/mode/python/python'
--extensionMIMEMap.set('.py', 'text/x-python')
--
--import 'codemirror/mode/ruby/ruby'
--extensionMIMEMap.set('.rb', 'text/x-ruby')
--
--import 'codemirror/mode/clojure/clojure'
--extensionMIMEMap.set('.clj', 'text/x-clojure')
--extensionMIMEMap.set('.cljc', 'text/x-clojure')
--extensionMIMEMap.set('.cljs', 'text/x-clojure')
--extensionMIMEMap.set('.edn', 'text/x-clojure')
--
--import 'codemirror/mode/rust/rust'
--extensionMIMEMap.set('.rs', 'text/x-rustsrc')
--
--import 'codemirror-mode-elixir'
--extensionMIMEMap.set('.ex', 'text/x-elixir')
--extensionMIMEMap.set('.exs', 'text/x-elixir')
-+/**
-+ * A map between mime types and mode definitions. See the
-+ * documentation for the IModeDefinition interface
-+ * for more information
-+ */
-+const mimeModeMap = new Map<string, IModeDefinition>()
-+
-+for (const mode of modes) {
-+  for (const [extension, mimeType] of Object.entries(mode.extensions)) {
-+    extensionMIMEMap.set(extension, mimeType)
-+    mimeModeMap.set(mimeType, mode)
-+  }
-+}
-
- function guessMimeType(contents: string) {
-   if (contents.startsWith('<?xml')) {
-@@ -144,14 +288,25 @@
-   return null
- }
-
--function detectMode(request: IHighlightRequest): CodeMirror.Mode<{}> | null {
-+async function detectMode(
-+  request: IHighlightRequest
-+): Promise<CodeMirror.Mode<{}> | null> {
-   const mimeType =
--    extensionMIMEMap.get(request.extension) || guessMimeType(request.contents)
-+    extensionMIMEMap.get(request.extension.toLowerCase()) ||
-+    guessMimeType(request.contents)
-
-   if (!mimeType) {
-     return null
-   }
-
-+  const modeDefinition = mimeModeMap.get(mimeType)
-+
-+  if (modeDefinition === undefined) {
-+    return null
-+  }
-+
-+  await modeDefinition.install()
-+
-   return getMode({}, mimeType) || null
- }
-
-@@ -213,14 +368,14 @@
-   throw new Error(`Mode ${getModeName(mode)} failed to advance stream.`)
- }
-
--onmessage = (ev: MessageEvent) => {
-+onmessage = async (ev: MessageEvent) => {
-   const request = ev.data as IHighlightRequest
-
-   const tabSize = request.tabSize || 4
-   const contents = request.contents
-   const addModeClass = request.addModeClass === true
-
--  const mode = detectMode(request)
-+  const mode = await detectMode(request)
-
-   if (!mode) {
-     postMessage({})
-merged
-  result 100644 28bceee1eb85ee67e5615f600cd692fd1286c44b app/src/highlighter/tsconfig.json
-  our    100644 ac72a2f6877ed0b4f8a01b2e6cdf721c2ad59ccf app/src/highlighter/tsconfig.json
-@@ -1,6 +1,6 @@
- {
-   "compilerOptions": {
--    "module": "commonjs",
-+    "module": "esnext",
-     "moduleResolution": "node",
-     "target": "es2017",
-     "noImplicitReturns": true,
-merged
-  result 100644 e315e51baf72a2f8735ae86ea485b0e6d5bebeed app/src/lib/app-shell.ts
-  our    100644 1fd1d56b84996afc63dce165e2dda4f5b8e20d94 app/src/lib/app-shell.ts
-@@ -1,4 +1,7 @@
- import { shell as electronShell, ipcRenderer } from 'electron'
-+import * as Path from 'path'
-+
-+import { Repository } from '../models/repository'
-
- export interface IAppShell {
-   readonly moveItemToTrash: (path: string) => boolean
-@@ -28,3 +31,14 @@
-   },
-   openItem: electronShell.openItem,
- }
-+
-+/**
-+ * Reveals a file from a repository in the native file manager.
-+ *
-+ * @param repository The currently active repository instance
-+ * @param path The path of the file relative to the root of the repository
-+ */
-+export function revealInFileManager(repository: Repository, path: string) {
-+  const fullyQualifiedFilePath = Path.join(repository.path, path)
-+  return shell.showItemInFolder(fullyQualifiedFilePath)
-+}
-merged
-  result 100644 711a4f16bab17ee49c4dd510d5a575cf149f5a5c app/src/lib/app-state.ts
-  our    100644 c329944f04e7a0db1cdd5851028416024f3c5c16 app/src/lib/app-state.ts
-@@ -1,9 +1,9 @@
- import { Account } from '../models/account'
- import { CommitIdentity } from '../models/commit-identity'
- import { IDiff } from '../models/diff'
--import { Repository } from '../models/repository'
--import { IAheadBehind } from './git'
--import { Branch } from '../models/branch'
-+import { Repository, ILocalRepositoryState } from '../models/repository'
-+
-+import { Branch, IAheadBehind } from '../models/branch'
- import { Tip } from '../models/tip'
- import { Commit } from '../models/commit'
- import {
-@@ -26,9 +26,10 @@
- import { BranchesTab } from '../models/branches-tab'
- import { PullRequest } from '../models/pull-request'
- import { IAuthor } from '../models/author'
-+import { ComparisonCache } from './comparison-cache'
-+import { ApplicationTheme } from '../ui/lib/application-theme'
-
- export { ICommitMessage }
--export { IAheadBehind }
-
- export enum SelectionType {
-   Repository,
-@@ -67,8 +68,16 @@
- /** All of the shared app state. */
- export interface IAppState {
-   readonly accounts: ReadonlyArray<Account>
-+  /**
-+   * The current list of repositories tracked in the application
-+   */
-   readonly repositories: ReadonlyArray<Repository | CloningRepository>
-
-+  /**
-+   * A cache of the latest repository state values, keyed by the repository id
-+   */
-+  readonly localRepositoryStateLookup: Map<number, ILocalRepositoryState>
-+
-   readonly selectedState: PossibleSelections | null
-
-   /**
-@@ -178,6 +187,11 @@
-
-   /** The currently selected tab for the Branches foldout. */
-   readonly selectedBranchesTab: BranchesTab
-+
-+  /** Show the diverging notification banner */
-+  readonly isDivergingBranchBannerVisible: boolean
-+  /** The currently selected appearance (aka theme) */
-+  readonly selectedTheme: ApplicationTheme
- }
-
- export enum PopupType {
-@@ -208,6 +222,7 @@
-   LFSAttributeMismatch,
-   UpstreamAlreadyExists,
-   DeletePullRequest,
-+  MergeConflicts,
- }
-
- export type Popup =
-@@ -222,9 +237,14 @@
-       type: PopupType.ConfirmDiscardChanges
-       repository: Repository
-       files: ReadonlyArray<WorkingDirectoryFileChange>
-+      showDiscardChangesSetting?: boolean
-     }
-   | { type: PopupType.Preferences; initialSelectedTab?: PreferencesTab }
--  | { type: PopupType.MergeBranch; repository: Repository }
-+  | {
-+      type: PopupType.MergeBranch
-+      repository: Repository
-+      branch?: Branch
-+    }
-   | { type: PopupType.RepositorySettings; repository: Repository }
-   | { type: PopupType.AddRepository; path?: string }
-   | { type: PopupType.CreateRepository; path?: string }
-@@ -281,6 +301,7 @@
-       branch: Branch
-       pullRequest: PullRequest
-     }
-+  | { type: PopupType.MergeConflicts; repository: Repository }
-
- export enum FoldoutType {
-   Repository,
-@@ -315,7 +336,7 @@
-   | { type: FoldoutType.AddMenu }
-   | AppMenuFoldout
-
--export enum RepositorySection {
-+export enum RepositorySectionTab {
-   Changes,
-   History,
- }
-@@ -323,7 +344,8 @@
- export interface IRepositoryState {
-   readonly historyState: IHistoryState
-   readonly changesState: IChangesState
--  readonly selectedSection: RepositorySection
-+  readonly compareState: ICompareState
-+  readonly selectedSection: RepositorySectionTab
-
-   /**
-    * The name and email that will be used for the author info
-@@ -559,10 +581,10 @@
-   readonly workingDirectory: WorkingDirectoryStatus
-
-   /**
--   * The ID of the selected file. The file itself can be looked up in
-+   * The ID of the selected files. The files themselves can be looked up in
-    * `workingDirectory`.
-    */
--  readonly selectedFileID: string | null
-+  readonly selectedFileIDs: string[]
-
-   readonly diff: IDiff | null
-
-@@ -590,3 +612,105 @@
-    */
-   readonly coAuthors: ReadonlyArray<IAuthor>
- }
-+
-+export enum ComparisonView {
-+  None = 'none',
-+  Ahead = 'ahead',
-+  Behind = 'behind',
-+}
-+
-+/**
-+ * The default comparison state is to display the history for the current
-+ * branch.
-+ */
-+export interface IDisplayHistory {
-+  readonly kind: ComparisonView.None
-+}
-+
-+/**
-+ * When the user has chosen another branch to compare, using their current
-+ * branch as the base branch.
-+ */
-+export interface ICompareBranch {
-+  /** The chosen comparison mode determines which commits to show */
-+  readonly kind: ComparisonView.Ahead | ComparisonView.Behind
-+
-+  /** The branch to compare against the base branch */
-+  readonly comparisonBranch: Branch
-+
-+  /** The number of commits the selected branch is ahead/behind the current branch */
-+  readonly aheadBehind: IAheadBehind
-+}
-+
-+export interface ICompareState {
-+  /** The current state of the compare form, based on user input */
-+  readonly formState: IDisplayHistory | ICompareBranch
-+
-+  /** Whether the branch list should be expanded or hidden */
-+  readonly showBranchList: boolean
-+
-+  /** The text entered into the compare branch filter text box */
-+  readonly filterText: string
-+
-+  /** The SHAs of commits to render in the compare list */
-+  readonly commitSHAs: ReadonlyArray<string>
-+
-+  /** A list of all branches (remote and local) currently in the repository. */
-+  readonly allBranches: ReadonlyArray<Branch>
-+
-+  /**
-+   * A list of zero to a few (at time of writing 5 but check loadRecentBranches
-+   * in git-store for definitive answer) branches that have been checked out
-+   * recently. This list is compiled by reading the reflog and tracking branch
-+   * switches over the last couple of thousand reflog entries.
-+   */
-+  readonly recentBranches: ReadonlyArray<Branch>
-+
-+  /**
-+   * The default branch for a given repository. Most commonly this
-+   * will be the 'master' branch but GitHub users are able to change
-+   * their default branch in the web UI.
-+   */
-+  readonly defaultBranch: Branch | null
-+
-+  /**
-+   * A local cache of ahead/behind computations to compare other refs to the current branch
-+   */
-+  readonly aheadBehindCache: ComparisonCache
-+
-+  /**
-+   * The best candidate branch to compare the current branch to.
-+   * Also includes the ahead/behind info for the inferred branch
-+   * relative to the current branch.
-+   */
-+  readonly inferredComparisonBranch: {
-+    branch: Branch | null
-+    aheadBehind: IAheadBehind | null
-+  }
-+}
-+
-+export interface ICompareFormUpdate {
-+  /** The updated filter text to set */
-+  readonly filterText: string
-+
-+  /** Thew new state of the branches list */
-+  readonly showBranchList: boolean
-+}
-+
-+export enum CompareActionKind {
-+  History = 'History',
-+  Branch = 'Branch',
-+}
-+
-+/**
-+ * An action to send to the application store to update the compare state
-+ */
-+export type CompareAction =
-+  | {
-+      readonly kind: CompareActionKind.History
-+    }
-+  | {
-+      readonly kind: CompareActionKind.Branch
-+      readonly branch: Branch
-+      readonly mode: ComparisonView.Ahead | ComparisonView.Behind
-+    }
-added in remote
-  their  100644 9745def3e5a5e6046e8f8ea32a90a530172dd312 app/src/lib/comparison-cache.ts
-@@ -0,0 +1,29 @@
-+import { IAheadBehind } from '../models/branch'
-+import { revSymmetricDifference } from '../lib/git'
-+
-+export class ComparisonCache {
-+  private backingStore = new Map<string, IAheadBehind>()
-+
-+  public set(from: string, to: string, value: IAheadBehind) {
-+    const key = revSymmetricDifference(from, to)
-+    this.backingStore.set(key, value)
-+  }
-+
-+  public get(from: string, to: string) {
-+    const key = revSymmetricDifference(from, to)
-+    return this.backingStore.get(key) || null
-+  }
-+
-+  public has(from: string, to: string) {
-+    const key = revSymmetricDifference(from, to)
-+    return this.backingStore.has(key)
-+  }
-+
-+  public get size() {
-+    return this.backingStore.size
-+  }
-+
-+  public clear() {
-+    this.backingStore.clear()
-+  }
-+}
-merged
-  result 100644 6989ac27cc613156ffcb3cf61e2e33863a75d3cd app/src/lib/dispatcher/dispatcher.ts
-  our    100644 bd55d7427357a36ac24db03b82d32fa9cebe5ac7 app/src/lib/dispatcher/dispatcher.ts
-@@ -11,12 +11,14 @@
- } from '../../models/status'
- import { DiffSelection } from '../../models/diff'
- import {
--  RepositorySection,
-+  RepositorySectionTab,
-   Popup,
-   PopupType,
-   Foldout,
-   FoldoutType,
-   ImageDiffType,
-+  CompareAction,
-+  ICompareFormUpdate,
- } from '../app-state'
- import { AppStore } from '../stores/app-store'
- import { CloningRepository } from '../../models/cloning-repository'
-@@ -54,6 +56,8 @@
- import { PullRequest } from '../../models/pull-request'
- import { IAuthor } from '../../models/author'
- import { ITrailer } from '../git/interpret-trailers'
-+import { isGitRepository } from '../git'
-+import { ApplicationTheme } from '../../ui/lib/application-theme'
-
- /**
-  * An error handler function.
-@@ -109,11 +113,6 @@
-     return this.appStore._updateRepositoryMissing(repository, missing)
-   }
-
--  /** Load the history for the repository. */
--  public loadHistory(repository: Repository): Promise<void> {
--    return this.appStore._loadHistory(repository)
--  }
--
-   /** Load the next batch of history for the repository. */
-   public loadNextHistoryBatch(repository: Repository): Promise<void> {
-     return this.appStore._loadNextHistoryBatch(repository)
-@@ -177,7 +176,7 @@
-   /** Change the selected section in the repository. */
-   public changeRepositorySection(
-     repository: Repository,
--    section: RepositorySection
-+    section: RepositorySectionTab
-   ): Promise<void> {
-     return this.appStore._changeRepositorySection(repository, section)
-   }
-@@ -185,9 +184,9 @@
-   /** Change the currently selected file in Changes. */
-   public changeChangesSelection(
-     repository: Repository,
--    selectedFile: WorkingDirectoryFileChange
-+    selectedFiles: WorkingDirectoryFileChange[]
-   ): Promise<void> {
--    return this.appStore._changeChangesSelection(repository, selectedFile)
-+    return this.appStore._changeChangesSelection(repository, selectedFiles)
-   }
-
-   /**
-@@ -460,6 +459,13 @@
-   }
-
-   /**
-+   * Set the divering branch notification banner's visibility
-+   */
-+  public setDivergingBranchBannerVisibility(isVisible: boolean) {
-+    return this.appStore._setDivergingBranchBannerVisibility(isVisible)
-+  }
-+
-+  /**
-    * Reset the width of the repository sidebar to its default
-    * value. This affects the changes and history sidebar
-    * as well as the first toolbar section which contains
-@@ -585,7 +591,10 @@
-   }
-
-   /** Add the pattern to the repository's gitignore. */
--  public ignore(repository: Repository, pattern: string): Promise<void> {
-+  public ignore(
-+    repository: Repository,
-+    pattern: string | string[]
-+  ): Promise<void> {
-     return this.appStore._ignore(repository, pattern)
-   }
-
-@@ -602,9 +611,11 @@
-     }
-   }
-
--  /** Opens a Git repository in the user provided program */
--  public async openInExternalEditor(path: string): Promise<void> {
--    return this.appStore._openInExternalEditor(path)
-+  /**
-+   * Opens a path in the external editor selected by the user.
-+   */
-+  public async openInExternalEditor(fullPath: string): Promise<void> {
-+    return this.appStore._openInExternalEditor(fullPath)
-   }
-
-   /**
-@@ -843,13 +854,22 @@
-         // this ensures we use the repository root, if it is actually a repository
-         // otherwise we consider it an untracked repository
-         const path = (await validatedRepositoryPath(action.path)) || action.path
--
-         const state = this.appStore.getState()
--        const existingRepository = matchExistingRepository(
-+        let existingRepository = matchExistingRepository(
-           state.repositories,
-           path
-         )
-
-+        // in case this is valid git repository, there is no need to ask
-+        // user for confirmation and it can be added automatically
-+        if (existingRepository == null) {
-+          const isRepository = await isGitRepository(path)
-+          if (isRepository) {
-+            const addedRepositories = await this.addRepositories([path])
-+            existingRepository = addedRepositories[0]
-+          }
-+        }
-+
-         if (existingRepository) {
-           await this.selectRepository(existingRepository)
-         } else {
-@@ -879,10 +899,6 @@
-
-   /**
-    * Sets the user's preference so that confirmation to discard changes is not asked
--   *
--   * @param {boolean} value
--   * @returns {Promise<void>}
--   * @memberof Dispatcher
-    */
-   public setConfirmDiscardChangesSetting(value: boolean): Promise<void> {
-     return this.appStore._setConfirmDiscardChangesSetting(value)
-@@ -902,32 +918,38 @@
-     return this.appStore._setShell(shell)
-   }
-
--  /**
--   * Reveals a file from a repository in the native file manager.
--   * @param repository The currently active repository instance
--   * @param path The path of the file relative to the root of the repository
--   */
--  public revealInFileManager(repository: Repository, path: string) {
--    const normalized = Path.join(repository.path, path)
--    return shell.showItemInFolder(normalized)
--  }
--
-   private async handleCloneInDesktopOptions(
-     repository: Repository,
-     action: IOpenRepositoryFromURLAction
-   ): Promise<void> {
-     const { filepath, pr, branch } = action
-
--    if (pr && branch) {
-+    if (pr != null && branch != null) {
-       // we need to refetch for a forked PR and check that out
-       await this.fetchRefspec(repository, `pull/${pr}/head:${branch}`)
-     }
-
--    if (branch) {
-+    if (pr == null && branch != null) {
-+      const state = this.appStore.getRepositoryState(repository)
-+      const branches = state.branchesState.allBranches
-+
-+      // I don't want to invoke Git functionality from the dispatcher, which
-+      // would help by using getDefaultRemote here to get the definitive ref,
-+      // so this falls back to finding any remote branch matching the name
-+      // received from the "Clone in Desktop" action
-+      const localBranch =
-+        branches.find(b => b.upstreamWithoutRemote === branch) || null
-+
-+      if (localBranch == null) {
-+        await this.fetch(repository, FetchType.BackgroundTask)
-+      }
-+    }
-+
-+    if (branch != null) {
-       await this.checkoutBranch(repository, branch)
-     }
-
--    if (filepath) {
-+    if (filepath != null) {
-       const fullPath = Path.join(repository.path, filepath)
-       // because Windows uses different path separators here
-       const normalized = Path.normalize(fullPath)
-@@ -1148,4 +1170,93 @@
-   ) {
-     return this.appStore._setCoAuthors(repository, coAuthors)
-   }
-+
-+  /**
-+   * Initialze the compare state for the current repository.
-+   */
-+  public initializeCompare(
-+    repository: Repository,
-+    initialAction?: CompareAction
-+  ) {
-+    return this.appStore._initializeCompare(repository, initialAction)
-+  }
-+
-+  /**
-+   * Update the compare state for the current repository
-+   */
-+  public executeCompare(repository: Repository, action: CompareAction) {
-+    return this.appStore._executeCompare(repository, action)
-+  }
-+
-+  /** Update the compare form state for the current repository */
-+  public updateCompareForm<K extends keyof ICompareFormUpdate>(
-+    repository: Repository,
-+    newState: Pick<ICompareFormUpdate, K>
-+  ) {
-+    return this.appStore._updateCompareForm(repository, newState)
-+  }
-+
-+  /**
-+   * Increments the `mergeIntoCurrentBranchMenuCount` metric
-+   */
-+  public recordMenuInitiatedMerge() {
-+    return this.appStore._recordMenuInitiatedMerge()
-+  }
-+
-+  /**
-+   * Increments the `updateFromDefaultBranchMenuCount` metric
-+   */
-+  public recordMenuInitiatedUpdate() {
-+    return this.appStore._recordMenuInitiatedUpdate()
-+  }
-+
-+  /**
-+   * Increments the `mergesInitiatedFromComparison` metric
-+   */
-+  public recordCompareInitiatedMerge() {
-+    return this.appStore._recordCompareInitiatedMerge()
-+  }
-+
-+  /**
-+   * Set the application-wide theme
-+   */
-+  public setSelectedTheme(theme: ApplicationTheme) {
-+    return this.appStore._setSelectedTheme(theme)
-+  }
-+
-+  /**
-+   * Increments either the `repoWithIndicatorClicked` or
-+   * the `repoWithoutIndicatorClicked` metric
-+   */
-+  public recordRepoClicked(repoHasIndicator: boolean) {
-+    return this.appStore._recordRepoClicked(repoHasIndicator)
-+  }
-+
-+  /** The number of times the user dismisses the diverged branch notification
-+   * Increments the `divergingBranchBannerDismissal` metric
-+   */
-+  public recordDivergingBranchBannerDismissal() {
-+    return this.appStore._recordDivergingBranchBannerDismissal()
-+  }
-+
-+  /**
-+   * Increments the `divergingBranchBannerInitiatedCompare` metric
-+   */
-+  public recordDivergingBranchBannerInitiatedCompare() {
-+    return this.appStore._recordDivergingBranchBannerInitiatedCompare()
-+  }
-+
-+  /**
-+   * Increments the `divergingBranchBannerInfluencedMerge` metric
-+   */
-+  public recordDivergingBranchBannerInfluencedMerge() {
-+    return this.appStore._recordDivergingBranchBannerInfluencedMerge()
-+  }
-+
-+  /**
-+   * Increments the `divergingBranchBannerInitatedMerge` metric
-+   */
-+  public recordDivergingBranchBannerInitatedMerge() {
-+    return this.appStore._recordDivergingBranchBannerInitatedMerge()
-+  }
- }
-merged
-  result 100644 ad71f6491a65fc7927e53f0b9d61a0e8c53ed070 app/src/lib/dispatcher/error-handlers.ts
-  our    100644 e4bcde44c63c77e4be9175742b2312202cb79018 app/src/lib/dispatcher/error-handlers.ts
-@@ -246,6 +246,50 @@
- }
-
- /**
-+ * Handler for detecting when a merge conflict is reported to direct the user
-+ * to a different dialog than the generic Git error dialog.
-+ */
-+export async function mergeConflictHandler(
-+  error: Error,
-+  dispatcher: Dispatcher
-+): Promise<Error | null> {
-+  const e = asErrorWithMetadata(error)
-+  if (!e) {
-+    return error
-+  }
-+
-+  const gitError = asGitError(e.underlyingError)
-+  if (!gitError) {
-+    return error
-+  }
-+
-+  const dugiteError = gitError.result.gitError
-+  if (!dugiteError) {
-+    return error
-+  }
-+
-+  if (dugiteError !== DugiteError.MergeConflicts) {
-+    return error
-+  }
-+
-+  const repository = e.metadata.repository
-+  if (!repository) {
-+    return error
-+  }
-+
-+  if (!(repository instanceof Repository)) {
-+    return error
-+  }
-+
-+  dispatcher.showPopup({
-+    type: PopupType.MergeConflicts,
-+    repository,
-+  })
-+
-+  return null
-+}
-+
-+/**
-  * Handler for when we attempt to install the global LFS filters and LFS throws
-  * an error.
-  */
-merged
-  result 100644 396f15cea083d101fb676c2b851376917b67b1a8 app/src/lib/editors/darwin.ts
-  our    100644 830d42cfa11aea16cec5fa79dbc8b87e4ffb56aa app/src/lib/editors/darwin.ts
-@@ -1,10 +1,11 @@
- import * as Path from 'path'
--import { pathExists } from '../file-system'
-+import { pathExists } from 'fs-extra'
- import { IFoundEditor } from './found-editor'
- import { assertNever } from '../fatal-error'
-
- export enum ExternalEditor {
-   Atom = 'Atom',
-+  MacVim = 'MacVim',
-   VisualStudioCode = 'Visual Studio Code',
-   VisualStudioCodeInsiders = 'Visual Studio Code (Insiders)',
-   SublimeText = 'Sublime Text',
-@@ -12,12 +13,17 @@
-   PhpStorm = 'PhpStorm',
-   RubyMine = 'RubyMine',
-   TextMate = 'TextMate',
-+  Brackets = 'Brackets',
-+  WebStorm = 'WebStorm',
- }
-
- export function parse(label: string): ExternalEditor | null {
-   if (label === ExternalEditor.Atom) {
-     return ExternalEditor.Atom
-   }
-+  if (label === ExternalEditor.MacVim) {
-+    return ExternalEditor.MacVim
-+  }
-   if (label === ExternalEditor.VisualStudioCode) {
-     return ExternalEditor.VisualStudioCode
-   }
-@@ -39,6 +45,12 @@
-   if (label === ExternalEditor.TextMate) {
-     return ExternalEditor.TextMate
-   }
-+  if (label === ExternalEditor.Brackets) {
-+    return ExternalEditor.Brackets
-+  }
-+  if (label === ExternalEditor.WebStorm) {
-+    return ExternalEditor.WebStorm
-+  }
-   return null
- }
-
-@@ -51,6 +63,8 @@
-   switch (editor) {
-     case ExternalEditor.Atom:
-       return ['com.github.atom']
-+    case ExternalEditor.MacVim:
-+      return ['org.vim.MacVim']
-     case ExternalEditor.VisualStudioCode:
-       return ['com.microsoft.VSCode']
-     case ExternalEditor.VisualStudioCodeInsiders:
-@@ -65,6 +79,10 @@
-       return ['com.jetbrains.RubyMine']
-     case ExternalEditor.TextMate:
-       return ['com.macromates.TextMate']
-+    case ExternalEditor.Brackets:
-+      return ['io.brackets.appshell']
-+    case ExternalEditor.WebStorm:
-+      return ['com.jetbrains.WebStorm']
-     default:
-       return assertNever(editor, `Unknown external editor: ${editor}`)
-   }
-@@ -87,6 +105,8 @@
-         'bin',
-         'code'
-       )
-+    case ExternalEditor.MacVim:
-+      return Path.join(installPath, 'Contents', 'MacOS', 'MacVim')
-     case ExternalEditor.SublimeText:
-       return Path.join(installPath, 'Contents', 'SharedSupport', 'bin', 'subl')
-     case ExternalEditor.BBEdit:
-@@ -97,6 +117,10 @@
-       return Path.join(installPath, 'Contents', 'MacOS', 'rubymine')
-     case ExternalEditor.TextMate:
-       return Path.join(installPath, 'Contents', 'Resources', 'mate')
-+    case ExternalEditor.Brackets:
-+      return Path.join(installPath, 'Contents', 'MacOS', 'Brackets')
-+    case ExternalEditor.WebStorm:
-+      return Path.join(installPath, 'Contents', 'MacOS', 'WebStorm')
-     default:
-       return assertNever(editor, `Unknown external editor: ${editor}`)
-   }
-@@ -133,6 +157,7 @@
-
-   const [
-     atomPath,
-+    macVimPath,
-     codePath,
-     codeInsidersPath,
-     sublimePath,
-@@ -140,8 +165,11 @@
-     phpStormPath,
-     rubyMinePath,
-     textMatePath,
-+    bracketsPath,
-+    webStormPath,
-   ] = await Promise.all([
-     findApplication(ExternalEditor.Atom),
-+    findApplication(ExternalEditor.MacVim),
-     findApplication(ExternalEditor.VisualStudioCode),
-     findApplication(ExternalEditor.VisualStudioCodeInsiders),
-     findApplication(ExternalEditor.SublimeText),
-@@ -149,12 +177,18 @@
-     findApplication(ExternalEditor.PhpStorm),
-     findApplication(ExternalEditor.RubyMine),
-     findApplication(ExternalEditor.TextMate),
-+    findApplication(ExternalEditor.Brackets),
-+    findApplication(ExternalEditor.WebStorm),
-   ])
-
-   if (atomPath) {
-     results.push({ editor: ExternalEditor.Atom, path: atomPath })
-   }
-
-+  if (macVimPath) {
-+    results.push({ editor: ExternalEditor.MacVim, path: macVimPath })
-+  }
-+
-   if (codePath) {
-     results.push({ editor: ExternalEditor.VisualStudioCode, path: codePath })
-   }
-@@ -186,5 +220,13 @@
-     results.push({ editor: ExternalEditor.TextMate, path: textMatePath })
-   }
-
-+  if (bracketsPath) {
-+    results.push({ editor: ExternalEditor.Brackets, path: bracketsPath })
-+  }
-+
-+  if (webStormPath) {
-+    results.push({ editor: ExternalEditor.WebStorm, path: webStormPath })
-+  }
-+
-   return results
- }
-merged
-  result 100644 14fcc4b0ea50c3d49e60a2f61796f87d9edaaec4 app/src/lib/editors/launch.ts
-  our    100644 71e53504e0c9701cec78d2c5fd6dbefed636537e app/src/lib/editors/launch.ts
-@@ -1,15 +1,15 @@
- import { spawn } from 'child_process'
--import { pathExists } from '../file-system'
-+import { pathExists } from 'fs-extra'
- import { ExternalEditorError, FoundEditor } from './shared'
-
- /**
-- * Open a given folder in the desired external editor.
-+ * Open a given file or folder in the desired external editor.
-  *
-- * @param path The folder to pass as an argument when launching the editor.
-+ * @param fullPath A folder or file path to pass as an argument when launching the editor.
-  * @param editor The external editor to launch.
-  */
- export async function launchExternalEditor(
--  path: string,
-+  fullPath: string,
-   editor: FoundEditor
- ): Promise<void> {
-   const editorPath = editor.path
-@@ -24,5 +24,5 @@
-     )
-   }
-
--  spawn(editorPath, [path])
-+  spawn(editorPath, [fullPath])
- }
-merged
-  result 100644 61446be3534a72d03d35e5f535726b1d369508ed app/src/lib/editors/linux.ts
-  our    100644 a338bd034876cad8e313ca505f0764220e4b3600 app/src/lib/editors/linux.ts
-@@ -1,5 +1,6 @@
-+import { pathExists } from 'fs-extra'
-+
- import { IFoundEditor } from './found-editor'
--import { pathExists } from '../file-system'
- import { assertNever } from '../fatal-error'
-
- export enum ExternalEditor {
-merged
-  result 100644 fbc6a4cc3563a6085b030129507ee04749354b37 app/src/lib/editors/win32.ts
-  our    100644 06c6ea78811e4a48e1f82201e7b7826ea48dd564 app/src/lib/editors/win32.ts
-@@ -7,7 +7,7 @@
-   RegistryValueType,
- } from 'registry-js'
-
--import { pathExists } from '../file-system'
-+import { pathExists } from 'fs-extra'
- import { IFoundEditor } from './found-editor'
-
- import { assertNever } from '../fatal-error'
-merged
-  result 100644 be95c011127ed3931f5b6fe25a4afe37f46c593e app/src/lib/fatal-error.ts
-  our    100644 a54e675b9e3ce44b64e2a17668c095e9d903770e app/src/lib/fatal-error.ts
-@@ -9,11 +9,11 @@
-  * If the type system is bypassed or this method will throw an exception
-  * using the second parameter as the message.
-  *
-- * @param {x}       Placeholder parameter in order to leverage the type
-+ * @param x         Placeholder parameter in order to leverage the type
-  *                  system. Pass the variable which has been type narrowed
-  *                  in an exhaustive check.
-  *
-- * @param {message} The message to be used in the runtime exception.
-+ * @param message   The message to be used in the runtime exception.
-  *
-  */
- export function assertNever(x: never, message: string): never {
-merged
-  result 100644 a709cc9f974b35dc9a357b3b8ca94677b01d1092 app/src/lib/feature-flag.ts
-  our    100644 64f061a69053457ba9ad6ca62c78bc534f3b6d57 app/src/lib/feature-flag.ts
-@@ -14,7 +14,7 @@
-     return true
-   }
-
--  if (process.env.GITHUB_DESKTOP_PREVIEW_FEATURES) {
-+  if (process.env.GITHUB_DESKTOP_PREVIEW_FEATURES === '1') {
-     return true
-   }
-
-@@ -22,16 +22,22 @@
- }
-
- /** Should the app enable beta features? */
-+//@ts-ignore: this will be used again in the future
- function enableBetaFeatures(): boolean {
-   return enableDevelopmentFeatures() || __RELEASE_CHANNEL__ === 'beta'
- }
-
--/** Should the new Compare view be enabled? */
--export function enableCompareBranch(): boolean {
-+/** Should merge tool integration be enabled? */
-+export function enableMergeTool(): boolean {
-+  return enableDevelopmentFeatures()
-+}
-+
-+/** Should the Notification of Diverging From Default Branch (NDDB) feature be enabled? */
-+export function enableNotificationOfBranchUpdates(): boolean {
-   return enableBetaFeatures()
- }
-
--/** Should merge tool integration be enabled? */
--export function enableMergeTool(): boolean {
-+/** Should the repository list display info indicators? */
-+export function enableRepoInfoIndicators(): boolean {
-   return enableDevelopmentFeatures()
- }
-merged
-  result 100644 a696107c681c84a8da5190495b8d23ee51f935e9 app/src/lib/file-system.ts
-  our    100644 185776306e2fc257862b11ad55f92cadb113eb66 app/src/lib/file-system.ts
-@@ -1,4 +1,4 @@
--import * as Fs from 'fs-extra'
-+import * as FSE from 'fs-extra'
- import * as Os from 'os'
- import * as Path from 'path'
- import { Disposable } from 'event-kit'
-@@ -6,63 +6,14 @@
-
- const byline = require('byline')
-
--/** Create directory using basic Fs.mkdir but ignores
-- * the error thrown when directory already exists.
-- * All other errors must be handled by caller.
-- *
-- * @param directoryPath the path of the directory the caller wants to create.
-- */
--export function mkdirIfNeeded(directoryPath: string): Promise<void> {
--  return new Promise<void>((resolve, reject) => {
--    Fs.mkdir(directoryPath, err => {
--      if (err && err.code !== 'EEXIST') {
--        reject(err)
--        return
--      }
--      resolve()
--    })
--  })
--}
--
--/*
-- * Write a file using the standard fs.writeFile API, but wrapped in a promise.
-- *
-- * @param path the path to the file on disk
-- * @param data the contents of the file to write
-- * @param options the default Fs.writeFile options
-- */
--export function writeFile(
--  path: string,
--  data: any,
--  options: { encoding?: string; mode?: number; flag?: string } = {}
--): Promise<void> {
--  return new Promise<void>((resolve, reject) => {
--    Fs.writeFile(path, data, options, err => {
--      if (err) {
--        reject(err)
--      } else {
--        resolve()
--      }
--    })
--  })
--}
--
- /**
-  * Get a path to a temp file using the given name. Note that the file itself
-  * will not be created.
-  */
--export function getTempFilePath(name: string): Promise<string> {
--  return new Promise<string>((resolve, reject) => {
--    const tempDir = Path.join(Os.tmpdir(), `${name}-`)
--    Fs.mkdtemp(tempDir, (err, directory) => {
--      if (err) {
--        reject(err)
--      } else {
--        const fullPath = Path.join(directory, name)
--        resolve(fullPath)
--      }
--    })
--  })
-+export async function getTempFilePath(name: string): Promise<string> {
-+  const tempDir = Path.join(Os.tmpdir(), `${name}-`)
-+  const directory = await FSE.mkdtemp(tempDir)
-+  return Path.join(directory, name)
- }
-
- /**
-@@ -101,23 +52,6 @@
-   })
- }
-
--/*
-- * Helper function to promisify and simplify fs.stat.
-- *
-- * @param path Path to check for existence.
-- */
--export function pathExists(path: string): Promise<boolean> {
--  return new Promise<boolean>((resolve, reject) => {
--    Fs.stat(path, (error, stats) => {
--      if (error) {
--        resolve(false)
--      } else {
--        resolve(true)
--      }
--    })
--  })
--}
--
- /**
-  * Asynchronous readFile - Asynchronously reads the entire contents of a file.
-  *
-@@ -141,7 +75,7 @@
- ): Promise<Buffer | string> {
-   return new Promise<string | Buffer>((resolve, reject) => {
-     options = options || { flag: 'r' }
--    Fs.readFile(filename, options, (err, data) => {
-+    FSE.readFile(filename, options, (err, data) => {
-       if (err) {
-         reject(err)
-       } else {
-@@ -169,7 +103,7 @@
-     const chunks = new Array<Buffer>()
-     let total = 0
-
--    Fs.createReadStream(path, { start, end })
-+    FSE.createReadStream(path, { start, end })
-       .on('data', (chunk: Buffer) => {
-         chunks.push(chunk)
-         total += chunk.length
-merged
-  result 100644 7ade1dfc6be6bbfd8149dfb41a77caded99e26c0 app/src/lib/fuzzy-find.ts
-  our    100644 0eaf1391d7ca722e5bc57bd57cccecc35f68e126 app/src/lib/fuzzy-find.ts
-@@ -12,36 +12,48 @@
-   return fuzzAldrin.score(str, query, undefined, options) / maxScore
- }
-
-+export interface IMatches {
-+  readonly title: ReadonlyArray<number>
-+  readonly subtitle: ReadonlyArray<number>
-+}
-+
- export interface IMatch<T> {
-   /** `0 <= score <= 1` */
-   score: number
-   item: T
--  matches: ReadonlyArray<number>
-+  matches: IMatches
- }
-
--export type KeyFunction<T> = (item: T) => string
-+export type KeyFunction<T> = (item: T) => ReadonlyArray<string>
-
- export function match<T, _K extends keyof T>(
-   query: string,
-   items: ReadonlyArray<T>,
--  getKey: _K | KeyFunction<T>
-+  getKey: KeyFunction<T>
- ): ReadonlyArray<IMatch<T>> {
-   // matching `query` against itself is a perfect match.
-   const maxScore = score(query, query, 1)
-   const result = items
-     .map((item): IMatch<T> => {
--      const key: string =
--        typeof getKey === 'function'
--          ? (getKey as KeyFunction<T>)(item)
--          : String(item[getKey])
-+      const matches: Array<ReadonlyArray<number>> = []
-+      const itemTextArray = getKey(item)
-+      itemTextArray.forEach(text => {
-+        matches.push(fuzzAldrin.match(text, query, undefined, options))
-+      })
-
-       return {
--        score: score(key, query, maxScore),
-+        score: score(itemTextArray.join(''), query, maxScore),
-         item,
--        matches: fuzzAldrin.match(key, query, undefined, options),
-+        matches: {
-+          title: matches[0],
-+          subtitle: matches.length > 1 ? matches[1] : [],
-+        },
-       }
-     })
--    .filter(({ matches }) => matches.length > 0)
-+    .filter(
-+      ({ matches }) => matches.title.length > 0 || matches.subtitle.length > 0
-+    )
-     .sort(({ score: left }, { score: right }) => compareDescending(left, right))
-+
-   return result
- }
-merged
-  result 100644 35f7c40e561385a93aea0741a57c129bf257a68d app/src/lib/git/core.ts
-  our    100644 37970522f470e82f498549b87c8d69c886bf8675 app/src/lib/git/core.ts
-@@ -81,17 +81,17 @@
- /**
-  * Shell out to git with the given arguments, at the given path.
-  *
-- * @param {args}             The arguments to pass to `git`.
-+ * @param args             The arguments to pass to `git`.
-  *
-- * @param {path}             The working directory path for the execution of the
-- *                           command.
-+ * @param path             The working directory path for the execution of the
-+ *                         command.
-  *
-- * @param {name}             The name for the command based on its caller's
-- *                           context. This will be used for performance
-- *                           measurements and debugging.
-+ * @param name             The name for the command based on its caller's
-+ *                         context. This will be used for performance
-+ *                         measurements and debugging.
-  *
-- * @param {options}          Configuration options for the execution of git,
-- *                           see IGitExecutionOptions for more information.
-+ * @param options          Configuration options for the execution of git,
-+ *                         see IGitExecutionOptions for more information.
-  *
-  * Returns the result. If the command exits with a code not in
-  * `successExitCodes` or an error not in `expectedErrors`, a `GitError` will be
-@@ -247,6 +247,14 @@
-       return 'The push was rejected by the remote server because a required status check has not been satisfied.'
-     case DugiteError.BranchRenameFailed:
-       return 'The branch could not be renamed.'
-+    case DugiteError.PathDoesNotExist:
-+      return 'The path does not exist on disk.'
-+    case DugiteError.InvalidObjectName:
-+      return 'The object was not found in the Git repository.'
-+    case DugiteError.OutsideRepository:
-+      return 'This path is not a valid path inside the repository.'
-+    case DugiteError.LockFileAlreadyExists:
-+      return 'A lock file already exists in the repository, which blocks this operation from completing.'
-     default:
-       return assertNever(error, `Unknown error: ${error}`)
-   }
-merged
-  result 100644 9f960230f3855e6a05f0ae2024a119e6bf720a88 app/src/lib/git/description.ts
-  our    100644 0468f171d5553c74bc9196bbd89c240ac253b3d1 app/src/lib/git/description.ts
-@@ -1,5 +1,5 @@
- import * as Path from 'path'
--import * as Fs from 'fs'
-+import * as FSE from 'fs-extra'
-
- const GitDescriptionPath = '.git/description'
-
-@@ -12,22 +12,15 @@
- ): Promise<string> {
-   const path = Path.join(repositoryPath, GitDescriptionPath)
-
--  return new Promise<string>((resolve, reject) => {
--    Fs.readFile(path, 'utf8', (err, data) => {
--      if (err) {
--        /** No .git/description file existed, just return an empty one. */
--        resolve('')
--        return
--      }
--
--      if (data === DefaultGitDescription) {
--        resolve('')
--        return
--      }
--
--      resolve(data)
--    })
--  })
-+  try {
-+    const data = await FSE.readFile(path, 'utf8')
-+    if (data === DefaultGitDescription) {
-+      return ''
-+    }
-+    return data
-+  } catch (err) {
-+    return ''
-+  }
- }
-
- /** Write a .git/description file to the repository. */
-@@ -36,14 +29,5 @@
-   description: string
- ): Promise<void> {
-   const fullPath = Path.join(repositoryPath, GitDescriptionPath)
--
--  return new Promise<void>((resolve, reject) => {
--    Fs.writeFile(fullPath, description, err => {
--      if (err) {
--        reject(err)
--      } else {
--        resolve()
--      }
--    })
--  })
-+  await FSE.writeFile(fullPath, description)
- }
-merged
-  result 100644 c7b70925514f334e2076ddb67f208c2f3f12672f app/src/lib/git/diff.ts
-  our    100644 be540d047988bd54344edfed49aa5e5ad2a4ae52 app/src/lib/git/diff.ts
-@@ -44,7 +44,7 @@
-  * The longest line length we should try to display. If a diff has a line longer
-  * than this, we probably shouldn't attempt it
-  */
--const MaxLineLength = 500000
-+const MaxCharactersPerLine = 5000
-
- /**
-  * Utility function to check whether parsing this buffer is going to cause
-@@ -65,7 +65,7 @@
- function isDiffTooLarge(diff: IRawDiff) {
-   for (const hunk of diff.hunks) {
-     for (const line of hunk.lines) {
--      if (line.text.length > MaxLineLength) {
-+      if (line.text.length > MaxCharactersPerLine) {
-         return true
-       }
-     }
-@@ -84,6 +84,7 @@
-   '.gif',
-   '.ico',
-   '.webp',
-+  '.bmp',
- ])
-
- /**
-@@ -267,9 +268,9 @@
-   commitish: string,
-   lineEndingsChange?: LineEndingsChange
- ): Promise<IDiff> {
--  if (diff.isBinary) {
--    const extension = Path.extname(file.path)
-+  const extension = Path.extname(file.path).toLowerCase()
-
-+  if (diff.isBinary) {
-     // some extension we don't know how to parse, never mind
-     if (!imageFileExtensions.has(extension)) {
-       return {
-@@ -307,6 +308,9 @@
-   if (extension === '.webp') {
-     return 'image/webp'
-   }
-+  if (extension === '.bmp') {
-+    return 'image/bmp'
-+  }
-
-   // fallback value as per the spec
-   return 'text/plain'
-@@ -405,7 +409,11 @@
- ): Promise<Image> {
-   const extension = Path.extname(path)
-   const contents = await getBlobContents(repository, commitish, path)
--  return new Image(contents.toString('base64'), getMediaType(extension))
-+  return new Image(
-+    contents.toString('base64'),
-+    getMediaType(extension),
-+    contents.length
-+  )
- }
- /**
-  * Retrieve the binary contents of a blob from the working directory
-@@ -425,6 +433,7 @@
-   )
-   return new Image(
-     contents.toString('base64'),
--    getMediaType(Path.extname(file.path))
-+    getMediaType(Path.extname(file.path)),
-+    contents.length
-   )
- }
-merged
-  result 100644 fe76c1c138388cc995fcb26283c9619d2c47cdf2 app/src/lib/git/index.ts
-  our    100644 e5cb2e11f5be7e44292fa768f1971cca56b88440 app/src/lib/git/index.ts
-@@ -5,6 +5,7 @@
- export * from './commit'
- export * from './config'
- export * from './core'
-+export * from './description'
- export * from './diff'
- export * from './fetch'
- export * from './for-each-ref'
-merged
-  result 100644 b5ff0aa56eda967e9740dce0effc2d759c248634 app/src/lib/git/refs.ts
-  our    100644 4227634cb2503fed378f64d1e28ff7f41216f944 app/src/lib/git/refs.ts
-@@ -1,3 +1,6 @@
-+import { git } from './core'
-+import { Repository } from '../../models/repository'
-+
- /**
-  * Format a local branch in the ref syntax, ensuring situations when the branch
-  * is ambiguous are handled.
-@@ -19,3 +22,37 @@
-     return `refs/heads/${name}`
-   }
- }
-+
-+/**
-+ * Read a symbolic ref from the repository.
-+ *
-+ * Symbolic refs are used to point to other refs, similar to how symlinks work
-+ * for files. Because refs can be removed easily from a Git repository,
-+ * symbolic refs should only be used when absolutely necessary.
-+ *
-+ * @param repository The repository to lookup
-+ * @param ref The symbolic ref to resolve
-+ *
-+ * @returns the canonical ref, if found, or `null` if `ref` cannot be found or
-+ *          is not a symbolic ref
-+ */
-+export async function getSymbolicRef(
-+  repository: Repository,
-+  ref: string
-+): Promise<string | null> {
-+  const result = await git(
-+    ['symbolic-ref', '-q', ref],
-+    repository.path,
-+    'getSymbolicRef',
-+    {
-+      successExitCodes: new Set([0, 128]),
-+    }
-+  )
-+
-+  if (result.exitCode === 128) {
-+    // ref was not a symbolic ref or ref does not exist
-+    return null
-+  }
-+
-+  return result.stdout.trim()
-+}
-merged
-  result 100644 3f1e4abe01f964c4aa4b46ec41185ef132ec2c8a app/src/lib/git/rev-list.ts
-  our    100644 ce2b9ab3f38d37bcf3a74d6bb159ef3ab0257083 app/src/lib/git/rev-list.ts
-@@ -1,12 +1,36 @@
- import { GitError } from 'dugite'
- import { git } from './core'
- import { Repository } from '../../models/repository'
--import { Branch, BranchType } from '../../models/branch'
-+import { Branch, BranchType, IAheadBehind } from '../../models/branch'
-
--/** The number of commits a revision range is ahead/behind. */
--export interface IAheadBehind {
--  readonly ahead: number
--  readonly behind: number
-+/**
-+ * Convert two refs into the Git range syntax representing the set of commits
-+ * that are reachable from `to` but excluding those that are reachable from
-+ * `from`.
-+ *
-+ * Each parameter can be the commit SHA or a ref name, or specify an empty
-+ * string to represent HEAD.
-+ *
-+ * @param from The start of the range
-+ * @param to The end of the range
-+ */
-+export function revRange(from: string, to: string) {
-+  return `${from}..${to}`
-+}
-+
-+/**
-+ * Convert two refs into the Git symmetric difference syntax, which represents
-+ * the set of commits that are reachable from either `from` or `to` but not
-+ * from both.
-+ *
-+ * Each parameter can be the commit SHA or a ref name, or you can use an empty
-+ * string to represent HEAD.
-+ *
-+ * @param from The start of the range
-+ * @param to The end of the range
-+ */
-+export function revSymmetricDifference(from: string, to: string) {
-+  return `${from}...${to}`
- }
-
- /** Calculate the number of commits the range is ahead and behind. */
-@@ -64,6 +88,6 @@
-   // NB: The three dot form means we'll go all the way back to the merge base
-   // of the branch and its upstream. Practically this is important for seeing
-   // "through" merges.
--  const range = `${branch.name}...${upstream}`
-+  const range = revSymmetricDifference(branch.name, upstream)
-   return getAheadBehind(repository, range)
- }
-merged
-  result 100644 bc5a94f3cc8efd6c3f497b96d1379064021f0ced app/src/lib/git/status.ts
-  our    100644 886824ef09bccde31746939b3ad97e2d993918d7 app/src/lib/git/status.ts
-@@ -9,7 +9,7 @@
- import { parsePorcelainStatus, mapStatus } from '../status-parser'
- import { DiffSelectionType, DiffSelection } from '../../models/diff'
- import { Repository } from '../../models/repository'
--import { IAheadBehind } from './rev-list'
-+import { IAheadBehind } from '../../models/branch'
- import { fatalError } from '../../lib/fatal-error'
-
- /** The encapsulation of the result from 'git status' */
-@@ -62,7 +62,9 @@
-     'getStatus'
-   )
-
--  const files = new Array<WorkingDirectoryFileChange>()
-+  // Map of files keyed on their paths.
-+  // Note, map maintains insertion order
-+  const files = new Map<string, WorkingDirectoryFileChange>()
-
-   let currentBranch: string | undefined = undefined
-   let currentUpstreamBranch: string | undefined = undefined
-@@ -90,10 +92,7 @@
-         // same path, we should ensure that we only draw one entry in the
-         // changes list - see if an entry already exists for this path and
-         // remove it if found
--        const existingEntry = files.findIndex(p => p.path === entry.path)
--        if (existingEntry > -1) {
--          files.splice(existingEntry, 1)
--        }
-+        files.delete(entry.path)
-       }
-
-       // for now we just poke at the existing summary
-@@ -102,7 +101,8 @@
-         DiffSelectionType.All
-       )
-
--      files.push(
-+      files.set(
-+        entry.path,
-         new WorkingDirectoryFileChange(
-           entry.path,
-           summary,
-@@ -134,7 +134,7 @@
-     }
-   }
-
--  const workingDirectory = WorkingDirectoryStatus.fromFiles(files)
-+  const workingDirectory = WorkingDirectoryStatus.fromFiles([...files.values()])
-
-   return {
-     currentBranch,
-merged
-  result 100644 497889aae05c2de60409b2354678563f32994314 app/src/lib/git/submodule.ts
-  our    100644 964fa04fb165bbe2e1bd2628840922ade9b86fd6 app/src/lib/git/submodule.ts
-@@ -1,8 +1,9 @@
-+import * as Path from 'path'
-+import { pathExists } from 'fs-extra'
-+
- import { git } from './core'
- import { Repository } from '../../models/repository'
- import { SubmoduleEntry } from '../../models/submodule'
--import { pathExists } from '../file-system'
--import * as Path from 'path'
-
- export async function listSubmodules(
-   repository: Repository
-merged
-  result 100644 efb13fb0c1c8db7af2da3feffa6157cdfcffc386 app/src/lib/is-git-on-path.ts
-  our    100644 25f5e58c8ceb7199146a603c42fbb7d88e6c431c app/src/lib/is-git-on-path.ts
-@@ -5,14 +5,13 @@
-   // Modern versions of macOS ship with a Git shim that guides you through
-   // the process of setting everything up. We trust this is available, so
-   // don't worry about looking for it here.
--  // I decide linux user have git too :)
--  if (__DARWIN__ || __LINUX__) {
-+  if (__DARWIN__) {
-     return Promise.resolve(true)
-   }
-
-   // adapted from http://stackoverflow.com/a/34953561/1363815
--  return new Promise<boolean>((resolve, reject) => {
--    if (__WIN32__) {
-+  if (__WIN32__) {
-+    return new Promise<boolean>((resolve, reject) => {
-       const windowsRoot = process.env.SystemRoot || 'C:\\Windows'
-       const wherePath = Path.join(windowsRoot, 'System32', 'where.exe')
-
-@@ -29,9 +28,20 @@
-         resolve(code === 0)
-       })
-       return
--    }
-+    })
-+  }
-+
-+  if (__LINUX__) {
-+    return new Promise<boolean>((resolve, reject) => {
-+      const process = spawn('which', ['git'])
-+
-+      // `which` will return 0 when the executable
-+      // is found under PATH, or 1 if it cannot be found
-+      process.on('close', function(code) {
-+        resolve(code === 0)
-+      })
-+    })
-+  }
-
--    // in case you're on a non-Windows/non-macOS platform
--    resolve(false)
--  })
-+  return Promise.resolve(false)
- }
-merged
-  result 100644 d50be352ff1adc2c799a3f53fd983a2cdcbaa735 app/src/lib/menu-update.ts
-  our    100644 a12e7bdd46fd140f6b2b7ad6b947c9f93f2450b8 app/src/lib/menu-update.ts
-@@ -104,7 +104,7 @@
-   'update-branch',
-   'merge-branch',
-   'view-repository-on-github',
--  'compare-branch',
-+  'compare-on-github',
-   'open-in-shell',
-   'push',
-   'pull',
-@@ -200,6 +200,7 @@
-     'show-history',
-     'show-branches-list',
-     'open-external-editor',
-+    'compare-to-branch',
-   ]
-
-   const menuStateBuilder = new MenuStateBuilder()
-@@ -227,7 +228,7 @@
-     )
-     menuStateBuilder.setEnabled('merge-branch', onBranch)
-     menuStateBuilder.setEnabled(
--      'compare-branch',
-+      'compare-on-github',
-       isHostedOnGitHub && hasPublishedBranch
-     )
-
-@@ -278,10 +279,10 @@
-     menuStateBuilder.disable('delete-branch')
-     menuStateBuilder.disable('update-branch')
-     menuStateBuilder.disable('merge-branch')
--    menuStateBuilder.disable('compare-branch')
-
-     menuStateBuilder.disable('push')
-     menuStateBuilder.disable('pull')
-+    menuStateBuilder.disable('compare-to-branch')
-   }
-   return menuStateBuilder
- }
-merged
-  result 100644 b9e38022ccb3b75ba35fc496a1e77a8857d825f6 app/src/lib/parse-app-url.ts
-  our    100644 e01d63715d1d361dacd2f6a1fa3c1ff44ff12eb4 app/src/lib/parse-app-url.ts
-@@ -13,13 +13,13 @@
-   readonly url: string
-
-   /** the optional branch name which should be checked out. use the default branch otherwise. */
--  readonly branch?: string
-+  readonly branch: string | null
-
-   /** the pull request number, if pull request originates from a fork of the repository */
--  readonly pr?: string
-+  readonly pr: string | null
-
-   /** the file to open after cloning the repository */
--  readonly filepath?: string
-+  readonly filepath: string | null
- }
-
- export interface IOpenRepositoryFromPathAction {
-@@ -40,6 +40,36 @@
-   | IOpenRepositoryFromPathAction
-   | IUnknownAction
-
-+// eslint-disable-next-line typescript/interface-name-prefix
-+interface ParsedUrlQueryWithUndefined {
-+  // `undefined` is added here to ensure we handle the missing querystring key
-+  // See https://github.com/Microsoft/TypeScript/issues/13778 for discussion about
-+  // why this isn't supported natively in TypeScript
-+  [key: string]: string | string[] | undefined
-+}
-+
-+/**
-+ * Parse the URL to find a given key in the querystring text.
-+ *
-+ * @param url The source URL containing querystring key-value pairs
-+ * @param key The key to look for in the querystring
-+ */
-+function getQueryStringValue(
-+  query: ParsedUrlQueryWithUndefined,
-+  key: string
-+): string | null {
-+  const value = query[key]
-+  if (value == null) {
-+    return null
-+  }
-+
-+  if (Array.isArray(value)) {
-+    return value[0]
-+  }
-+
-+  return value
-+}
-+
- export function parseAppURL(url: string): URLActionType {
-   const parsedURL = URL.parse(url, true)
-   const hostname = parsedURL.hostname
-@@ -48,9 +78,16 @@
-     return unknown
-   }
-
-+  const query = parsedURL.query
-+
-   const actionName = hostname.toLowerCase()
-   if (actionName === 'oauth') {
--    return { name: 'oauth', code: parsedURL.query.code }
-+    const code = getQueryStringValue(query, 'code')
-+    if (code != null) {
-+      return { name: 'oauth', code }
-+    } else {
-+      return unknown
-+    }
-   }
-
-   // we require something resembling a URL first
-@@ -70,28 +107,23 @@
-     // suffix the remote URL with `.git`, for backwards compatibility
-     const url = `${probablyAURL}.git`
-
--    const queryString = parsedURL.query
-+    const pr = getQueryStringValue(query, 'pr')
-+    const branch = getQueryStringValue(query, 'branch')
-+    const filepath = getQueryStringValue(query, 'filepath')
-
--    const pr = queryString.pr
--    const branch = queryString.branch
--    const filepath = queryString.filepath
--
--    if (pr) {
--      // if anything other than a number is used for the PR value, exit
-+    if (pr != null) {
-       if (!/^\d+$/.test(pr)) {
-         return unknown
-       }
-
-       // we also expect the branch for a forked PR to be a given ref format
--      if (!/^pr\/\d+$/.test(branch)) {
-+      if (branch != null && !/^pr\/\d+$/.test(branch)) {
-         return unknown
-       }
-     }
-
--    if (branch) {
--      if (testForInvalidChars(branch)) {
--        return unknown
--      }
-+    if (branch != null && testForInvalidChars(branch)) {
-+      return unknown
-     }
-
-     return {
-added in remote
-  their  100644 e53daf16a90439aa5a1aa9c6a1c5736f39274eda app/src/lib/process/win32.ts
-@@ -0,0 +1,90 @@
-+import { spawn as spawnInternal } from 'child_process'
-+import * as Path from 'path'
-+
-+/** Get the path segments in the user's `Path`. */
-+export async function getPathSegments(): Promise<ReadonlyArray<string>> {
-+  let powershellPath: string
-+  const systemRoot = process.env.SystemRoot
-+  if (systemRoot != null) {
-+    const system32Path = Path.join(systemRoot, 'System32')
-+    powershellPath = Path.join(
-+      system32Path,
-+      'WindowsPowerShell',
-+      'v1.0',
-+      'powershell.exe'
-+    )
-+  } else {
-+    powershellPath = 'powershell.exe'
-+  }
-+
-+  const args = [
-+    '-noprofile',
-+    '-ExecutionPolicy',
-+    'RemoteSigned',
-+    '-command',
-+    // Set encoding and execute the command, capture the output, and return it
-+    // via .NET's console in order to have consistent UTF-8 encoding.
-+    // See http://stackoverflow.com/questions/22349139/utf-8-output-from-powershell
-+    // to address https://github.com/atom/atom/issues/5063
-+    `
-+      [Console]::OutputEncoding=[System.Text.Encoding]::UTF8
-+      $output=[environment]::GetEnvironmentVariable('Path', 'User')
-+      [Console]::WriteLine($output)
-+    `,
-+  ]
-+
-+  const stdout = await spawn(powershellPath, args)
-+  const pathOutput = stdout.replace(/^\s+|\s+$/g, '')
-+  return pathOutput.split(/;+/).filter(segment => segment.length)
-+}
-+
-+/** Set the user's `Path`. */
-+export async function setPathSegments(
-+  paths: ReadonlyArray<string>
-+): Promise<void> {
-+  let setxPath: string
-+  const systemRoot = process.env['SystemRoot']
-+  if (systemRoot) {
-+    const system32Path = Path.join(systemRoot, 'System32')
-+    setxPath = Path.join(system32Path, 'setx.exe')
-+  } else {
-+    setxPath = 'setx.exe'
-+  }
-+
-+  await spawn(setxPath, ['Path', paths.join(';')])
-+}
-+
-+/** Spawn a command with arguments and capture its output. */
-+export function spawn(
-+  command: string,
-+  args: ReadonlyArray<string>
-+): Promise<string> {
-+  try {
-+    const child = spawnInternal(command, args as string[])
-+    return new Promise<string>((resolve, reject) => {
-+      let stdout = ''
-+      child.stdout.on('data', data => {
-+        stdout += data
-+      })
-+
-+      child.on('close', code => {
-+        if (code === 0) {
-+          resolve(stdout)
-+        } else {
-+          reject(new Error(`Command "${command} ${args}" failed: "${stdout}"`))
-+        }
-+      })
-+
-+      child.on('error', (err: Error) => {
-+        reject(err)
-+      })
-+
-+      // This is necessary if using Powershell 2 on Windows 7 to get the events
-+      // to raise.
-+      // See http://stackoverflow.com/questions/9155289/calling-powershell-from-nodejs
-+      child.stdin.end()
-+    })
-+  } catch (error) {
-+    return Promise.reject(error)
-+  }
-+}
-merged
-  result 100644 f3e30a75fd83483f4729f3239ffd2bf3b780a7fd app/src/lib/progress/from-process.ts
-  our    100644 574666eff35b9d7681971fbb405c2bac00c106a0 app/src/lib/progress/from-process.ts
-@@ -1,5 +1,6 @@
- import { ChildProcess } from 'child_process'
- import * as Fs from 'fs'
-+import * as Path from 'path'
- import * as byline from 'byline'
-
- import { GitProgressParser, IGitProgress, IGitOutput } from './git'
-@@ -23,8 +24,13 @@
-   let lfsProgressPath = null
-   let env = {}
-   if (options.trackLFSProgress) {
--    lfsProgressPath = await createLFSProgressFile()
--    env = { GIT_LFS_PROGRESS: lfsProgressPath }
-+    try {
-+      lfsProgressPath = await createLFSProgressFile()
-+      env = { GIT_LFS_PROGRESS: lfsProgressPath }
-+    } catch (e) {
-+      log.error('Error writing LFS progress file', e)
-+      env = { GIT_LFS_PROGRESS: null }
-+    }
-   }
-
-   return merge(options, {
-@@ -57,9 +63,17 @@
-
-       process.on('close', () => {
-         disposable.dispose()
--        // NB: We don't really care about errors deleting the file, but Node
--        // gets kinda bothered if we don't provide a callback.
--        Fs.unlink(lfsProgressPath, () => {})
-+        // the order of these callbacks is important because
-+        //  - unlink can only be done on files
-+        //  - rmdir can only be done when the directory is empty
-+        //  - we don't want to surface errors to the user if something goes
-+        //    wrong (these files can stay in TEMP and be cleaned up eventually)
-+        Fs.unlink(lfsProgressPath, err => {
-+          if (err == null) {
-+            const directory = Path.dirname(lfsProgressPath)
-+            Fs.rmdir(directory, () => {})
-+          }
-+        })
-       })
-     }
-
-merged
-  result 100644 466a25723137239fd49be2906d25e300ad5fa913 app/src/lib/progress/lfs.ts
-  our    100644 3b054c35fb65185af0628abc0d445ae6a1296b30 app/src/lib/progress/lfs.ts
-@@ -1,19 +1,12 @@
--import * as Fs from 'fs'
-+import * as FSE from 'fs-extra'
- import { getTempFilePath } from '../file-system'
- import { IGitProgress, IGitProgressInfo, IGitOutput } from './git'
-
- /** Create the Git LFS progress reporting file and return the path. */
- export async function createLFSProgressFile(): Promise<string> {
-   const path = await getTempFilePath('GitHubDesktop-lfs-progress')
--  return new Promise<string>((resolve, reject) => {
--    Fs.writeFile(path, '', err => {
--      if (err) {
--        reject(err)
--      } else {
--        resolve(path)
--      }
--    })
--  })
-+  await FSE.ensureFile(path)
-+  return path
- }
-
- // The regex for parsing LFS progress lines. See
-merged
-  result 100644 df0a7f7ff234a7c89d0b2480c70661b30e5d90bd app/src/lib/remote-parsing.ts
-  our    100644 21114f701d33070680ccedbfcbd4b563dd3117cc app/src/lib/remote-parsing.ts
-@@ -1,4 +1,8 @@
-+type Protocol = 'ssh' | 'https'
-+
- interface IGitRemoteURL {
-+  readonly protocol: Protocol
-+
-   /** The hostname of the remote. */
-   readonly hostname: string
-
-@@ -15,21 +19,33 @@
-   readonly name: string | null
- }
-
-+// Examples:
-+// https://github.com/octocat/Hello-World.git
-+// https://github.com/octocat/Hello-World.git/
-+// git@github.com:octocat/Hello-World.git
-+// git:github.com/octocat/Hello-World.git
-+const remoteRegexes: ReadonlyArray<{ protocol: Protocol; regex: RegExp }> = [
-+  {
-+    protocol: 'https',
-+    regex: new RegExp('^https?://(?:.+@)?(.+)/(.+)/(.+?)(?:/|.git/?)?$'),
-+  },
-+  {
-+    protocol: 'ssh',
-+    regex: new RegExp('^git@(.+):(.+)/(.+?)(?:/|.git)?$'),
-+  },
-+  {
-+    protocol: 'ssh',
-+    regex: new RegExp('^git:(.+)/(.+)/(.+?)(?:/|.git)?$'),
-+  },
-+  {
-+    protocol: 'ssh',
-+    regex: new RegExp('^ssh://git@(.+)/(.+)/(.+?)(?:/|.git)?$'),
-+  },
-+]
-+
- /** Parse the remote information from URL. */
- export function parseRemote(url: string): IGitRemoteURL | null {
--  // Examples:
--  // https://github.com/octocat/Hello-World.git
--  // https://github.com/octocat/Hello-World.git/
--  // git@github.com:octocat/Hello-World.git
--  // git:github.com/octocat/Hello-World.git
--  const regexes = [
--    new RegExp('^https?://(?:.+@)?(.+)/(.+)/(.+?)(?:/|.git/?)?$'),
--    new RegExp('^git@(.+):(.+)/(.+?)(?:/|.git)?$'),
--    new RegExp('^git:(.+)/(.+)/(.+?)(?:/|.git)?$'),
--    new RegExp('^ssh://git@(.+)/(.+)/(.+?)(?:/|.git)?$'),
--  ]
--
--  for (const regex of regexes) {
-+  for (const { protocol, regex } of remoteRegexes) {
-     const result = url.match(regex)
-     if (!result) {
-       continue
-@@ -39,7 +55,7 @@
-     const owner = result[2]
-     const name = result[3]
-     if (hostname) {
--      return { hostname, owner, name }
-+      return { protocol, hostname, owner, name }
-     }
-   }
-
-merged
-  result 100644 63d2fe120af3eaaafc7fe69f833f40cd5e6b477e app/src/lib/shells/darwin.ts
-  our    100644 00a9aa293632a29b5bd02d296907bf9cdb3ffde5 app/src/lib/shells/darwin.ts
-@@ -8,6 +8,7 @@
-   Terminal = 'Terminal',
-   Hyper = 'Hyper',
-   iTerm2 = 'iTerm2',
-+  PowerShellCore = 'PowerShell Core',
- }
-
- export const Default = Shell.Terminal
-@@ -25,6 +26,10 @@
-     return Shell.iTerm2
-   }
-
-+  if (label === Shell.PowerShellCore) {
-+    return Shell.PowerShellCore
-+  }
-+
-   return Default
- }
-
-@@ -36,6 +41,8 @@
-       return 'com.googlecode.iterm2'
-     case Shell.Hyper:
-       return 'co.zeit.hyper'
-+    case Shell.PowerShellCore:
-+      return 'com.microsoft.powershell'
-     default:
-       return assertNever(shell, `Unknown shell: ${shell}`)
-   }
-@@ -54,10 +61,16 @@
- export async function getAvailableShells(): Promise<
-   ReadonlyArray<IFoundShell<Shell>>
- > {
--  const [terminalPath, hyperPath, iTermPath] = await Promise.all([
-+  const [
-+    terminalPath,
-+    hyperPath,
-+    iTermPath,
-+    powerShellCorePath,
-+  ] = await Promise.all([
-     getShellPath(Shell.Terminal),
-     getShellPath(Shell.Hyper),
-     getShellPath(Shell.iTerm2),
-+    getShellPath(Shell.PowerShellCore),
-   ])
-
-   const shells: Array<IFoundShell<Shell>> = []
-@@ -73,6 +86,10 @@
-     shells.push({ shell: Shell.iTerm2, path: iTermPath })
-   }
-
-+  if (powerShellCorePath) {
-+    shells.push({ shell: Shell.PowerShellCore, path: powerShellCorePath })
-+  }
-+
-   return shells
- }
-
-merged
-  result 100644 afc28e5ff68afd9388d5e17690d30eccc4ac1b75 app/src/lib/shells/linux.ts
-  our    100644 d1effa798ba21a6f706771f25cd9dfb957f0c7d0 app/src/lib/shells/linux.ts
-@@ -1,5 +1,5 @@
- import { spawn, ChildProcess } from 'child_process'
--import { pathExists } from '../file-system'
-+import { pathExists } from 'fs-extra'
- import { assertNever } from '../fatal-error'
- import { IFoundShell } from './found-shell'
-
-merged
-  result 100644 0fef473ed40b7b043f025d9677ebb724939d0a8f app/src/lib/shells/shared.ts
-  our    100644 bc82735e7a7928d8280b488af550e97acbe8ab65 app/src/lib/shells/shared.ts
-@@ -1,9 +1,9 @@
- import { ChildProcess } from 'child_process'
-+import { pathExists } from 'fs-extra'
-
- import * as Darwin from './darwin'
- import * as Win32 from './win32'
- import * as Linux from './linux'
--import { pathExists } from '../file-system'
- import { IFoundShell } from './found-shell'
- import { ShellError } from './error'
-
-merged
-  result 100644 9bfcb28a39ebb3d774a2995d510e3a4ece676b3a app/src/lib/shells/win32.ts
-  our    100644 94056bbd3c70887c371b620f95e77efeafb04518 app/src/lib/shells/win32.ts
-@@ -1,14 +1,15 @@
- import { spawn, ChildProcess } from 'child_process'
- import * as Path from 'path'
- import { enumerateValues, HKEY, RegistryValueType } from 'registry-js'
-+import { pathExists } from 'fs-extra'
-
--import { pathExists } from '../file-system'
- import { assertNever } from '../fatal-error'
- import { IFoundShell } from './found-shell'
-
- export enum Shell {
-   Cmd = 'Command Prompt',
-   PowerShell = 'PowerShell',
-+  PowerShellCore = 'PowerShell Core',
-   Hyper = 'Hyper',
-   GitBash = 'Git Bash',
- }
-@@ -24,6 +25,10 @@
-     return Shell.PowerShell
-   }
-
-+  if (label === Shell.PowerShellCore) {
-+    return Shell.PowerShellCore
-+  }
-+
-   if (label === Shell.Hyper) {
-     return Shell.Hyper
-   }
-@@ -53,6 +58,14 @@
-     })
-   }
-
-+  const powerShellCorePath = await findPowerShellCore()
-+  if (powerShellCorePath != null) {
-+    shells.push({
-+      shell: Shell.PowerShellCore,
-+      path: powerShellCorePath,
-+    })
-+  }
-+
-   const hyperPath = await findHyper()
-   if (hyperPath != null) {
-     shells.push({
-@@ -111,6 +124,32 @@
-   return null
- }
-
-+async function findPowerShellCore(): Promise<string | null> {
-+  const powerShellCore = enumerateValues(
-+    HKEY.HKEY_LOCAL_MACHINE,
-+    'Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\pwsh.exe'
-+  )
-+
-+  if (powerShellCore.length === 0) {
-+    return null
-+  }
-+
-+  const first = powerShellCore[0]
-+  if (first.type === RegistryValueType.REG_SZ) {
-+    const path = first.data
-+
-+    if (await pathExists(path)) {
-+      return path
-+    } else {
-+      log.debug(
-+        `[PowerShellCore] registry entry found but does not exist at '${path}'`
-+      )
-+    }
-+  }
-+
-+  return null
-+}
-+
- async function findHyper(): Promise<string | null> {
-   const hyper = enumerateValues(
-     HKEY.HKEY_CURRENT_USER,
-@@ -128,11 +167,19 @@
-     // This regex is designed to get the path to the version-specific Hyper.
-     // commandPieces = ['"{installationPath}\app-x.x.x\Hyper.exe"', '"', '{installationPath}\app-x.x.x\Hyper.exe', ...]
-     const commandPieces = first.data.match(/(["'])(.*?)\1/)
-+    const localAppData = process.env.LocalAppData
-+
-     const path = commandPieces
-       ? commandPieces[2]
--      : process.env.LocalAppData.concat('\\hyper\\Hyper.exe') // fall back to the launcher in install root
-+      : localAppData != null
-+        ? localAppData.concat('\\hyper\\Hyper.exe')
-+        : null // fall back to the launcher in install root
-
--    if (await pathExists(path)) {
-+    if (path == null) {
-+      log.debug(
-+        `[Hyper] LOCALAPPDATA environment variable is unset, aborting fallback behavior`
-+      )
-+    } else if (await pathExists(path)) {
-       return path
-     } else {
-       log.debug(`[Hyper] registry entry found but does not exist at '${path}'`)
-@@ -181,6 +228,12 @@
-         shell: true,
-         cwd: path,
-       })
-+    case Shell.PowerShellCore:
-+      const psCoreCommand = `"Set-Location -LiteralPath '${path}'"`
-+      return spawn('START', ['pwsh', '-NoExit', '-Command', psCoreCommand], {
-+        shell: true,
-+        cwd: path,
-+      })
-     case Shell.Hyper:
-       const hyperPath = `"${foundShell.path}"`
-       log.info(`launching ${shell} at path: ${hyperPath}`)
-merged
-  result 100644 1a92eadda10120ed9ba6bec97c2fc0a752509fc2 app/src/lib/stats/stats-database.ts
-  our    100644 7911de79718900503165ac9ef13670da8c71cdc5 app/src/lib/stats/stats-database.ts
-@@ -40,6 +40,47 @@
-
-   /** The number of commits created with one or more co-authors. */
-   readonly coAuthoredCommits: number
-+
-+  /** The number of times a branch is compared to an arbitrary branch */
-+  readonly branchComparisons: number
-+
-+  /** The number of times a branch is compared to `master` */
-+  readonly defaultBranchComparisons: number
-+
-+  /** The number of times a merge is initiated in the `compare` sidebar */
-+  readonly mergesInitiatedFromComparison: number
-+
-+  /** The number of times the `Branch -> Update From Default Branch` menu item is used */
-+  readonly updateFromDefaultBranchMenuCount: number
-+
-+  /** The number of times the `Branch -> Merge Into Current Branch` menu item is used */
-+  readonly mergeIntoCurrentBranchMenuCount: number
-+
-+  /** The number of times the user checks out a branch using the PR menu */
-+  readonly prBranchCheckouts: number
-+
-+  /** The numbers of times a repo with indicators is clicked on repo list view */
-+  readonly repoWithIndicatorClicked: number
-+  /** The numbers of times a repo without indicators is clicked on repo list view */
-+  readonly repoWithoutIndicatorClicked: number
-+
-+  /** The number of times the user dismisses the diverged branch notification */
-+  readonly divergingBranchBannerDismissal: number
-+
-+  /** The number of times the user merges from the diverged branch notification merge CTA button */
-+  readonly divergingBranchBannerInitatedMerge: number
-+
-+  /** The number of times the user compares from the diverged branch notification compare CTA button */
-+  readonly divergingBranchBannerInitiatedCompare: number
-+
-+  /**
-+   * The number of times the user merges from the compare view after getting to that state
-+   * from the diverged branch notification compare CTA button
-+   */
-+  readonly divergingBranchBannerInfluencedMerge: number
-+
-+  /** The number of times the diverged branch notification is displayed */
-+  readonly divergingBranchBannerDisplayed: number
- }
-
- export class StatsDatabase extends Dexie {
-merged
-  result 100644 3866dcb7f85658b385e8d34e610a3f2321d9fbd8 app/src/lib/stats/stats-store.ts
-  our    100644 10e9a39560a0f09260217f2d9e598e9bbaf63613 app/src/lib/stats/stats-store.ts
-@@ -7,6 +7,7 @@
- import { getGUID } from './get-guid'
- import { Repository } from '../../models/repository'
- import { merge } from '../../lib/merge'
-+import { getPersistedThemeName } from '../../ui/lib/application-theme'
-
- const StatsEndpoint = 'https://central.github.com/api/usage/desktop'
-
-@@ -29,6 +30,19 @@
-   partialCommits: 0,
-   openShellCount: 0,
-   coAuthoredCommits: 0,
-+  branchComparisons: 0,
-+  defaultBranchComparisons: 0,
-+  mergesInitiatedFromComparison: 0,
-+  updateFromDefaultBranchMenuCount: 0,
-+  mergeIntoCurrentBranchMenuCount: 0,
-+  prBranchCheckouts: 0,
-+  repoWithIndicatorClicked: 0,
-+  repoWithoutIndicatorClicked: 0,
-+  divergingBranchBannerDismissal: 0,
-+  divergingBranchBannerInitatedMerge: 0,
-+  divergingBranchBannerInitiatedCompare: 0,
-+  divergingBranchBannerInfluencedMerge: 0,
-+  divergingBranchBannerDisplayed: 0,
- }
-
- interface ICalculatedStats {
-@@ -56,6 +70,12 @@
-   /** Is the user logged in with an Enterprise account? */
-   readonly enterpriseAccount: boolean
-
-+  /**
-+   * The name of the currently selected theme/application
-+   * appearance as set at time of stats submission.
-+   */
-+  readonly theme: string
-+
-   readonly eventType: 'usage'
- }
-
-@@ -171,6 +191,7 @@
-       version: getVersion(),
-       osVersion: getOS(),
-       platform: process.platform,
-+      theme: getPersistedThemeName(),
-       ...launchStats,
-       ...dailyMeasures,
-       ...userType,
-@@ -294,6 +315,59 @@
-     }))
-   }
-
-+  /** Record that a branch comparison has been made */
-+  public recordBranchComparison(): Promise<void> {
-+    return this.updateDailyMeasures(m => ({
-+      branchComparisons: m.branchComparisons + 1,
-+    }))
-+  }
-+
-+  /** Record that a branch comparison has been made to the `master` branch */
-+  public recordDefaultBranchComparison(): Promise<void> {
-+    return this.updateDailyMeasures(m => ({
-+      defaultBranchComparisons: m.defaultBranchComparisons + 1,
-+    }))
-+  }
-+
-+  /** Record that a merge has been initiated from the `compare` sidebar */
-+  public recordCompareInitiatedMerge(): Promise<void> {
-+    return this.updateDailyMeasures(m => ({
-+      mergesInitiatedFromComparison: m.mergesInitiatedFromComparison + 1,
-+    }))
-+  }
-+
-+  /** Record that a merge has been initiated from the `Branch -> Update From Default Branch` menu item */
-+  public recordMenuInitiatedUpdate(): Promise<void> {
-+    return this.updateDailyMeasures(m => ({
-+      updateFromDefaultBranchMenuCount: m.updateFromDefaultBranchMenuCount + 1,
-+    }))
-+  }
-+
-+  /** Record that a merge has been initiated from the `Branch -> Merge Into Current Branch` menu item */
-+  public recordMenuInitiatedMerge(): Promise<void> {
-+    return this.updateDailyMeasures(m => ({
-+      mergeIntoCurrentBranchMenuCount: m.mergeIntoCurrentBranchMenuCount + 1,
-+    }))
-+  }
-+
-+  /** Record that the user checked out a PR branch */
-+  public recordPRBranchCheckout(): Promise<void> {
-+    return this.updateDailyMeasures(m => ({
-+      prBranchCheckouts: m.prBranchCheckouts + 1,
-+    }))
-+  }
-+
-+  public recordRepoClicked(repoHasIndicator: boolean): Promise<void> {
-+    if (repoHasIndicator) {
-+      return this.updateDailyMeasures(m => ({
-+        repoWithIndicatorClicked: m.repoWithIndicatorClicked + 1,
-+      }))
-+    }
-+    return this.updateDailyMeasures(m => ({
-+      repoWithoutIndicatorClicked: m.repoWithoutIndicatorClicked + 1,
-+    }))
-+  }
-+
-   /** Set whether the user has opted out of stats reporting. */
-   public async setOptOut(optOut: boolean): Promise<void> {
-     const changed = this.optOut !== optOut
-@@ -312,6 +386,47 @@
-     return this.optOut
-   }
-
-+  /** Record that user dismissed diverging branch notification */
-+  public async recordDivergingBranchBannerDismissal(): Promise<void> {
-+    return this.updateDailyMeasures(m => ({
-+      divergingBranchBannerDismissal: m.divergingBranchBannerDismissal + 1,
-+    }))
-+  }
-+
-+  /** Record that user initiated a merge from within the notification banner */
-+  public async recordDivergingBranchBannerInitatedMerge(): Promise<void> {
-+    return this.updateDailyMeasures(m => ({
-+      divergingBranchBannerInitatedMerge:
-+        m.divergingBranchBannerInitatedMerge + 1,
-+    }))
-+  }
-+
-+  /** Record that user initiated a compare from within the notification banner */
-+  public async recordDivergingBranchBannerInitiatedCompare(): Promise<void> {
-+    return this.updateDailyMeasures(m => ({
-+      divergingBranchBannerInitiatedCompare:
-+        m.divergingBranchBannerInitiatedCompare + 1,
-+    }))
-+  }
-+
-+  /**
-+   * Record that user initiated a merge after getting to compare view
-+   * from within notificatio banner
-+   */
-+  public async recordDivergingBranchBannerInfluencedMerge(): Promise<void> {
-+    return this.updateDailyMeasures(m => ({
-+      divergingBranchBannerInfluencedMerge:
-+        m.divergingBranchBannerInfluencedMerge + 1,
-+    }))
-+  }
-+
-+  /** Record that the user was shown the notification banner */
-+  public async recordDivergingBranchBannerDisplayed(): Promise<void> {
-+    return this.updateDailyMeasures(m => ({
-+      divergingBranchBannerDisplayed: m.divergingBranchBannerDisplayed + 1,
-+    }))
-+  }
-+
-   /** Post some data to our stats endpoint. */
-   private post(body: object): Promise<Response> {
-     const options: RequestInit = {
-merged
-  result 100644 f11d691b980015ca4a257c25f28433f4a7514376 app/src/lib/stores/accounts-store.ts
-  our    100644 7b2bcf64296d13ab933c90d71368479c79c92e69 app/src/lib/stores/accounts-store.ts
-@@ -213,7 +213,7 @@
- async function updatedAccount(account: Account): Promise<Account> {
-   if (!account.token) {
-     return fatalError(
--      `Cannot update an account which doesn't have a token: ${account}`
-+      `Cannot update an account which doesn't have a token: ${account.login}`
-     )
-   }
-
-merged
-  result 100644 ee571b467f678151f67ef1ea677ecd440ff28df8 app/src/lib/stores/app-store.ts
-  our    100644 9f98922eb0685739d0e3a1ca94059e260529c827 app/src/lib/stores/app-store.ts
-@@ -3,7 +3,7 @@
-   IRepositoryState,
-   IHistoryState,
-   IAppState,
--  RepositorySection,
-+  RepositorySectionTab,
-   IChangesState,
-   Popup,
-   PopupType,
-@@ -17,9 +17,16 @@
-   ImageDiffType,
-   IRevertProgress,
-   IFetchProgress,
-+  ICompareState,
-+  ComparisonView,
-+  CompareAction,
-+  CompareActionKind,
-+  IDisplayHistory,
-+  ICompareBranch,
-+  ICompareFormUpdate,
- } from '../app-state'
- import { Account } from '../../models/account'
--import { Repository } from '../../models/repository'
-+import { Repository, ILocalRepositoryState } from '../../models/repository'
- import { GitHubRepository } from '../../models/github-repository'
- import {
-   CommittedFileChange,
-@@ -34,7 +41,11 @@
- } from '../../lib/repository-matching'
- import { API, getAccountForEndpoint, IAPIUser } from '../../lib/api'
- import { caseInsensitiveCompare } from '../compare'
--import { Branch, BranchType } from '../../models/branch'
-+import {
-+  Branch,
-+  eligibleForFastForward,
-+  IAheadBehind,
-+} from '../../models/branch'
- import { TipState } from '../../models/tip'
- import { CloningRepository } from '../../models/cloning-repository'
- import { Commit } from '../../models/commit'
-@@ -121,6 +132,15 @@
- import * as QueryString from 'querystring'
- import { IRemote, ForkedRemotePrefix } from '../../models/remote'
- import { IAuthor } from '../../models/author'
-+import { ComparisonCache } from '../comparison-cache'
-+import { AheadBehindUpdater } from './helpers/ahead-behind-updater'
-+import { enableRepoInfoIndicators } from '../feature-flag'
-+import { inferComparisonBranch } from './helpers/infer-comparison-branch'
-+import {
-+  ApplicationTheme,
-+  getPersistedTheme,
-+  setPersistedTheme,
-+} from '../../ui/lib/application-theme'
-
- /**
-  * Enum used by fetch to determine if
-@@ -131,6 +151,13 @@
-   UserInitiatedTask,
- }
-
-+/**
-+ * As fast-forwarding local branches is proportional to the number of local
-+ * branches, and is run after every fetch/push/pull, this is skipped when the
-+ * number of eligible branches is greater than a given threshold.
-+ */
-+const FastForwardBranchesThreshold = 20
-+
- const LastSelectedRepositoryIDKey = 'last-selected-repository-id'
-
- const defaultSidebarWidth: number = 250
-@@ -166,6 +193,9 @@
-   /** The pull request updater for the currently selected repository */
-   private currentPullRequestUpdater: PullRequestUpdater | null = null
-
-+  /** The ahead/behind updater or the currently selected repository */
-+  private currentAheadBehindUpdater: AheadBehindUpdater | null = null
-+
-   private repositoryState = new Map<string, IRepositoryState>()
-   private showWelcomeFlow = false
-   private currentPopup: Popup | null = null
-@@ -179,6 +209,11 @@
-     string,
-     RepositorySettingsStore
-   >()
-+
-+  private readonly localRepositoryStateLookup = new Map<
-+    number,
-+    ILocalRepositoryState
-+  >()
-   public readonly gitHubUserStore: GitHubUserStore
-   private readonly cloningRepositoriesStore: CloningRepositoriesStore
-   private readonly emojiStore: EmojiStore
-@@ -235,9 +270,11 @@
-     | ((repository: Repository | null) => void)
-     | null = null
-
--  private selectedCloneRepositoryTab: CloneRepositoryTab = CloneRepositoryTab.DotCom
-+  private selectedCloneRepositoryTab = CloneRepositoryTab.DotCom
-
-   private selectedBranchesTab = BranchesTab.Branches
-+  private selectedTheme = ApplicationTheme.Light
-+  private isDivergingBranchBannerVisible = false
-
-   public constructor(
-     gitHubUserStore: GitHubUserStore,
-@@ -319,8 +356,7 @@
-     this.accountsStore.onDidError(error => this.emitError(error))
-
-     this.repositoriesStore.onDidUpdate(async () => {
--      const repositories = await this.repositoriesStore.getAll()
--      this.repositories = repositories
-+      this.repositories = await this.repositoriesStore.getAll()
-       this.updateRepositorySelectionAfterRepositoriesChanged()
-       this.emitUpdate()
-     })
-@@ -395,14 +431,14 @@
-         workingDirectory: WorkingDirectoryStatus.fromFiles(
-           new Array<WorkingDirectoryFileChange>()
-         ),
--        selectedFileID: null,
-+        selectedFileIDs: [],
-         diff: null,
-         contextualCommitMessage: null,
-         commitMessage: null,
-         coAuthors: [],
-         showCoAuthoredBy: false,
-       },
--      selectedSection: RepositorySection.Changes,
-+      selectedSection: RepositorySectionTab.Changes,
-       branchesState: {
-         tip: { kind: TipState.Unknown },
-         defaultBranch: null,
-@@ -412,6 +448,17 @@
-         currentPullRequest: null,
-         isLoadingPullRequests: false,
-       },
-+      compareState: {
-+        formState: { kind: ComparisonView.None },
-+        showBranchList: false,
-+        filterText: '',
-+        commitSHAs: [],
-+        aheadBehindCache: new ComparisonCache(),
-+        allBranches: new Array<Branch>(),
-+        recentBranches: new Array<Branch>(),
-+        defaultBranch: null,
-+        inferredComparisonBranch: { branch: null, aheadBehind: null },
-+      },
-       commitAuthor: null,
-       gitHubUsers: new Map<string, IGitHubUser>(),
-       commitLookup: new Map<string, Commit>(),
-@@ -462,6 +509,18 @@
-     })
-   }
-
-+  private updateCompareState<K extends keyof ICompareState>(
-+    repository: Repository,
-+    fn: (state: ICompareState) => Pick<ICompareState, K>
-+  ) {
-+    this.updateRepositoryState(repository, state => {
-+      const compareState = state.compareState
-+      const newValues = fn(compareState)
-+
-+      return { compareState: merge(compareState, newValues) }
-+    })
-+  }
-+
-   private updateChangesState<K extends keyof IChangesState>(
-     repository: Repository,
-     fn: (changesState: IChangesState) => Pick<IChangesState, K>
-@@ -526,6 +585,7 @@
-         ...this.repositories,
-         ...this.cloningRepositoriesStore.repositories,
-       ],
-+      localRepositoryStateLookup: this.localRepositoryStateLookup,
-       windowState: this.windowState,
-       windowZoomFactor: this.windowZoomFactor,
-       appIsFocused: this.appIsFocused,
-@@ -550,6 +610,8 @@
-       repositoryFilterText: this.repositoryFilterText,
-       selectedCloneRepositoryTab: this.selectedCloneRepositoryTab,
-       selectedBranchesTab: this.selectedBranchesTab,
-+      isDivergingBranchBannerVisible: this.isDivergingBranchBannerVisible,
-+      selectedTheme: this.selectedTheme,
-     }
-   }
-
-@@ -629,8 +691,12 @@
-     return store
-   }
-
--  /** This shouldn't be called directly. See `Dispatcher`. */
--  public async _loadHistory(repository: Repository): Promise<void> {
-+  /**
-+   * TODO:
-+   * This is some legacy code that no longer works with the new Compare tab.
-+   * Need to investigate porting this to "refresh" the Compare tab state.
-+   */
-+  private async _loadHistory(repository: Repository): Promise<void> {
-     const gitStore = this.getGitStore(repository)
-     await gitStore.loadHistory()
-
-@@ -657,10 +723,247 @@
-     this.emitUpdate()
-   }
-
-+  private startAheadBehindUpdater(repository: Repository) {
-+    if (this.currentAheadBehindUpdater != null) {
-+      fatalError(
-+        `An ahead/behind updater is already active and cannot start updating on ${
-+          repository.name
-+        }`
-+      )
-+
-+      return
-+    }
-+
-+    const updater = new AheadBehindUpdater(repository, aheadBehindCache => {
-+      this.updateCompareState(repository, state => ({
-+        aheadBehindCache,
-+      }))
-+      this.emitUpdate()
-+    })
-+
-+    this.currentAheadBehindUpdater = updater
-+
-+    this.currentAheadBehindUpdater.start()
-+  }
-+
-+  private stopAheadBehindUpdate() {
-+    const updater = this.currentAheadBehindUpdater
-+
-+    if (updater != null) {
-+      updater.stop()
-+      this.currentAheadBehindUpdater = null
-+    }
-+  }
-+
-+  /** This shouldn't be called directly. See `Dispatcher`. */
-+  public async _initializeCompare(
-+    repository: Repository,
-+    initialAction?: CompareAction
-+  ) {
-+    log.debug('[AppStore] initializing compare state')
-+
-+    const state = this.getRepositoryState(repository)
-+
-+    const { branchesState, compareState } = state
-+    const { tip, currentPullRequest } = branchesState
-+    const currentBranch = tip.kind === TipState.Valid ? tip.branch : null
-+
-+    const allBranches =
-+      currentBranch != null
-+        ? branchesState.allBranches.filter(b => b.name !== currentBranch.name)
-+        : branchesState.allBranches
-+    const recentBranches = currentBranch
-+      ? branchesState.recentBranches.filter(b => b.name !== currentBranch.name)
-+      : branchesState.recentBranches
-+
-+    const cachedDefaultBranch = branchesState.defaultBranch
-+
-+    // only include the default branch when comparing if the user is not on the default branch
-+    // and it also exists in the repository
-+    const defaultBranch =
-+      currentBranch != null &&
-+      cachedDefaultBranch != null &&
-+      currentBranch.name !== cachedDefaultBranch.name
-+        ? cachedDefaultBranch
-+        : null
-+
-+    let inferredBranch: Branch | null = null
-+    let aheadBehindOfInferredBranch: IAheadBehind | null = null
-+    if (tip.kind === TipState.Valid && compareState.aheadBehindCache !== null) {
-+      inferredBranch = await inferComparisonBranch(
-+        repository,
-+        allBranches,
-+        currentPullRequest,
-+        tip.branch,
-+        getRemotes,
-+        compareState.aheadBehindCache
-+      )
-+
-+      if (inferredBranch !== null) {
-+        aheadBehindOfInferredBranch = compareState.aheadBehindCache.get(
-+          tip.branch.tip.sha,
-+          inferredBranch.tip.sha
-+        )
-+      }
-+    }
-+
-+    this.updateCompareState(repository, state => ({
-+      allBranches,
-+      recentBranches,
-+      defaultBranch,
-+      inferredComparisonBranch: {
-+        branch: inferredBranch,
-+        aheadBehind: aheadBehindOfInferredBranch,
-+      },
-+    }))
-+
-+    // we only want to show the banner when the the number
-+    // commits behind has changed since the last it was visible
-+    if (
-+      inferredBranch !== null &&
-+      aheadBehindOfInferredBranch !== null &&
-+      aheadBehindOfInferredBranch.behind > 0
-+    ) {
-+      const prevInferredBranchState =
-+        state.compareState.inferredComparisonBranch
-+      if (
-+        prevInferredBranchState.aheadBehind === null ||
-+        prevInferredBranchState.aheadBehind.behind !==
-+          aheadBehindOfInferredBranch.behind
-+      ) {
-+        this._setDivergingBranchBannerVisibility(true)
-+      }
-+    } else if (
-+      inferComparisonBranch !== null ||
-+      aheadBehindOfInferredBranch === null
-+    ) {
-+      this._setDivergingBranchBannerVisibility(false)
-+    }
-+
-+    const cachedState = compareState.formState
-+    const action =
-+      initialAction != null ? initialAction : getInitialAction(cachedState)
-+    this._executeCompare(repository, action)
-+
-+    if (currentBranch != null && this.currentAheadBehindUpdater != null) {
-+      this.currentAheadBehindUpdater.schedule(currentBranch, allBranches)
-+    }
-+  }
-+
-+  /** This shouldn't be called directly. See `Dispatcher`. */
-+  public async _executeCompare(
-+    repository: Repository,
-+    action: CompareAction
-+  ): Promise<void> {
-+    const gitStore = this.getGitStore(repository)
-+    const kind = action.kind
-+
-+    if (action.kind === CompareActionKind.History) {
-+      await gitStore.loadHistory()
-+
-+      const repoState = this.getRepositoryState(repository).historyState
-+      const commits = repoState.history
-+
-+      this.updateCompareState(repository, state => ({
-+        formState: {
-+          kind: ComparisonView.None,
-+        },
-+        commitSHAs: commits,
-+      }))
-+      return this.emitUpdate()
-+    } else if (action.kind === CompareActionKind.Branch) {
-+      const comparisonBranch = action.branch
-+      const compare = await gitStore.getCompareCommits(
-+        comparisonBranch,
-+        action.mode
-+      )
-+
-+      this.statsStore.recordBranchComparison()
-+      const { branchesState } = this.getRepositoryState(repository)
-+
-+      if (
-+        branchesState.defaultBranch !== null &&
-+        comparisonBranch.name === branchesState.defaultBranch.name
-+      ) {
-+        this.statsStore.recordDefaultBranchComparison()
-+      }
-+
-+      if (compare !== null) {
-+        const { ahead, behind } = compare
-+        const aheadBehind = { ahead, behind }
-+
-+        this.updateCompareState(repository, s => ({
-+          formState: {
-+            comparisonBranch,
-+            kind: action.mode,
-+            aheadBehind,
-+          },
-+          commitSHAs: compare.commits.map(commit => commit.sha),
-+          filterText: comparisonBranch.name,
-+        }))
-+
-+        const tip = gitStore.tip
-+
-+        let currentSha: string | null = null
-+
-+        if (tip.kind === TipState.Valid) {
-+          currentSha = tip.branch.tip.sha
-+        } else if (tip.kind === TipState.Detached) {
-+          currentSha = tip.currentSha
-+        }
-+
-+        if (this.currentAheadBehindUpdater != null && currentSha != null) {
-+          const from =
-+            action.mode === ComparisonView.Ahead
-+              ? comparisonBranch.tip.sha
-+              : currentSha
-+          const to =
-+            action.mode === ComparisonView.Ahead
-+              ? currentSha
-+              : comparisonBranch.tip.sha
-+
-+          this.currentAheadBehindUpdater.insert(from, to, aheadBehind)
-+        }
-+
-+        return this.emitUpdate()
-+      }
-+    } else {
-+      return assertNever(action, `Unknown action: ${kind}`)
-+    }
-+  }
-+
-+  /** This shouldn't be called directly. See `Dispatcher`. */
-+  public _updateCompareForm<K extends keyof ICompareFormUpdate>(
-+    repository: Repository,
-+    newState: Pick<ICompareFormUpdate, K>
-+  ) {
-+    this.updateCompareState(repository, state => {
-+      return merge(state, newState)
-+    })
-+
-+    this.emitUpdate()
-+  }
-+
-   /** This shouldn't be called directly. See `Dispatcher`. */
--  public _loadNextHistoryBatch(repository: Repository): Promise<void> {
-+  public async _loadNextHistoryBatch(repository: Repository): Promise<void> {
-     const gitStore = this.getGitStore(repository)
--    return gitStore.loadNextHistoryBatch()
-+
-+    const state = this.getRepositoryState(repository)
-+    const { formState } = state.compareState
-+    if (formState.kind === ComparisonView.None) {
-+      const commits = state.compareState.commitSHAs
-+      const lastCommitSha = commits[commits.length - 1]
-+
-+      const newCommits = await gitStore.loadCommitBatch(lastCommitSha)
-+      if (newCommits == null) {
-+        return
-+      }
-+
-+      this.updateCompareState(repository, state => ({
-+        commitSHAs: commits.concat(newCommits),
-+      }))
-+      this.emitUpdate()
-+    }
-   }
-
-   /** This shouldn't be called directly. See `Dispatcher`. */
-@@ -860,10 +1163,12 @@
-     // ensures we clean up the existing background fetcher correctly (if set)
-     this.stopBackgroundFetching()
-     this.stopPullRequestUpdater()
-+    this.stopAheadBehindUpdate()
-
-     this.startBackgroundFetching(repository, !previouslySelectedRepository)
-     this.startPullRequestUpdater(repository)
-
-+    this.startAheadBehindUpdater(repository)
-     this.refreshMentionables(repository)
-
-     this.addUpstreamRemoteIfNeeded(repository)
-@@ -1081,9 +1386,12 @@
-         ? imageDiffTypeDefault
-         : parseInt(imageDiffTypeValue)
-
-+    this.selectedTheme = getPersistedTheme()
-+
-     this.emitUpdateNow()
-
-     this.accountsStore.refresh()
-+    this.refreshAllRepositories()
-   }
-
-   private async getSelectedExternalEditor(): Promise<ExternalEditor | null> {
-@@ -1231,24 +1539,39 @@
-         })
-         .sort((x, y) => caseInsensitiveCompare(x.path, y.path))
-
--      const workingDirectory = WorkingDirectoryStatus.fromFiles(mergedFiles)
-+      // Collect all the currently available file ids into a set to avoid O(N)
-+      // lookups using .find on the mergedFiles array.
-+      const mergedFileIds = new Set(mergedFiles.map(x => x.id))
-
--      let selectedFileID = state.selectedFileID
--      const matchedFile = mergedFiles.find(x => x.id === selectedFileID)
-+      // The previously selected files might not be available in the working
-+      // directory any more due to having been committed or discarded so we'll
-+      // do a pass over and filter out any selected files that aren't available.
-+      let selectedFileIDs = state.selectedFileIDs.filter(id =>
-+        mergedFileIds.has(id)
-+      )
-
--      // Select the first file if we don't have anything selected.
--      if ((!selectedFileID || !matchedFile) && mergedFiles.length) {
--        selectedFileID = mergedFiles[0].id || null
-+      // Select the first file if we don't have anything selected and we
-+      // have something to select.
-+      if (selectedFileIDs.length === 0 && mergedFiles.length > 0) {
-+        selectedFileIDs = [mergedFiles[0].id]
-       }
-
--      // The file selection could have changed if the previously selected file
--      // is no longer selectable (it was reverted or committed) but if it hasn't
--      // changed we can reuse the diff.
--      const sameSelectedFileExists = state.selectedFileID
--        ? workingDirectory.findFileWithID(state.selectedFileID)
--        : null
--      const diff = sameSelectedFileExists ? state.diff : null
--      return { workingDirectory, selectedFileID, diff }
-+      // The file selection could have changed if the previously selected files
-+      // are no longer selectable (they were discarded or committed) but if they
-+      // were not changed we can reuse the diff. Note, however that we only render
-+      // a diff when a single file is selected. If the previous selection was
-+      // a single file with the same id as the current selection we can keep the
-+      // diff we had, if not we'll clear it.
-+      const workingDirectory = WorkingDirectoryStatus.fromFiles(mergedFiles)
-+
-+      const diff =
-+        selectedFileIDs.length === 1 &&
-+        state.selectedFileIDs.length === 1 &&
-+        state.selectedFileIDs[0] === selectedFileIDs[0]
-+          ? state.diff
-+          : null
-+
-+      return { workingDirectory, selectedFileIDs, diff }
-     })
-     this.emitUpdate()
-
-@@ -1258,14 +1581,14 @@
-   /** This shouldn't be called directly. See `Dispatcher`. */
-   public async _changeRepositorySection(
-     repository: Repository,
--    selectedSection: RepositorySection
-+    selectedSection: RepositorySectionTab
-   ): Promise<void> {
-     this.updateRepositoryState(repository, state => ({ selectedSection }))
-     this.emitUpdate()
-
--    if (selectedSection === RepositorySection.History) {
-+    if (selectedSection === RepositorySectionTab.History) {
-       return this.refreshHistorySection(repository)
--    } else if (selectedSection === RepositorySection.Changes) {
-+    } else if (selectedSection === RepositorySectionTab.Changes) {
-       return this.refreshChangesSection(repository, {
-         includingStatus: true,
-         clearPartialState: false,
-@@ -1276,10 +1599,10 @@
-   /** This shouldn't be called directly. See `Dispatcher`. */
-   public async _changeChangesSelection(
-     repository: Repository,
--    selectedFile: WorkingDirectoryFileChange | null
-+    selectedFiles: WorkingDirectoryFileChange[]
-   ): Promise<void> {
-     this.updateChangesState(repository, state => ({
--      selectedFileID: selectedFile ? selectedFile.id : null,
-+      selectedFileIDs: selectedFiles.map(file => file.id),
-       diff: null,
-     }))
-     this.emitUpdate()
-@@ -1297,15 +1620,23 @@
-   ): Promise<void> {
-     const stateBeforeLoad = this.getRepositoryState(repository)
-     const changesStateBeforeLoad = stateBeforeLoad.changesState
--    const selectedFileIDBeforeLoad = changesStateBeforeLoad.selectedFileID
--    if (!selectedFileIDBeforeLoad) {
-+    const selectedFileIDsBeforeLoad = changesStateBeforeLoad.selectedFileIDs
-+
-+    // We only render diffs when a single file is selected.
-+    if (selectedFileIDsBeforeLoad.length !== 1) {
-+      if (changesStateBeforeLoad.diff !== null) {
-+        this.updateChangesState(repository, state => ({ diff: null }))
-+        this.emitUpdate()
-+      }
-       return
-     }
-
-+    const selectedFileIdBeforeLoad = selectedFileIDsBeforeLoad[0]
-     const selectedFileBeforeLoad = changesStateBeforeLoad.workingDirectory.findFileWithID(
--      selectedFileIDBeforeLoad
-+      selectedFileIdBeforeLoad
-     )
--    if (!selectedFileBeforeLoad) {
-+
-+    if (selectedFileBeforeLoad === null) {
-       return
-     }
-
-@@ -1316,21 +1647,24 @@
-
-     const stateAfterLoad = this.getRepositoryState(repository)
-     const changesState = stateAfterLoad.changesState
--    const selectedFileID = changesState.selectedFileID
-
--    // A different file could have been selected while we were loading the diff
--    // in which case we no longer care about the diff we just loaded.
--    if (!selectedFileID) {
-+    // A different file (or files) could have been selected while we were
-+    // loading the diff in which case we no longer care about the diff we
-+    // just loaded.
-+    if (changesState.selectedFileIDs.length !== 1) {
-       return
-     }
--    if (selectedFileID !== selectedFileIDBeforeLoad) {
-+
-+    const selectedFileID = changesState.selectedFileIDs[0]
-+
-+    if (selectedFileID !== selectedFileIdBeforeLoad) {
-       return
-     }
-
-     const currentlySelectedFile = changesState.workingDirectory.findFileWithID(
-       selectedFileID
-     )
--    if (!currentlySelectedFile) {
-+    if (currentlySelectedFile === null) {
-       return
-     }
-
-@@ -1453,8 +1787,8 @@
-       )
-
-       const workingDirectory = WorkingDirectoryStatus.fromFiles(newFiles)
--      const diff = state.selectedFileID ? state.diff : null
--      return { workingDirectory, diff }
-+
-+      return { workingDirectory }
-     })
-
-     this.emitUpdate()
-@@ -1494,9 +1828,9 @@
-     const section = state.selectedSection
-     let refreshSectionPromise: Promise<void>
-
--    if (section === RepositorySection.History) {
-+    if (section === RepositorySectionTab.History) {
-       refreshSectionPromise = this.refreshHistorySection(repository)
--    } else if (section === RepositorySection.Changes) {
-+    } else if (section === RepositorySectionTab.Changes) {
-       refreshSectionPromise = this.refreshChangesSection(repository, {
-         includingStatus: false,
-         clearPartialState: false,
-@@ -1515,6 +1849,46 @@
-
-     this._updateCurrentPullRequest(repository)
-     this.updateMenuItemLabels(repository)
-+    this._initializeCompare(repository)
-+    this.refreshRepositoryState([repository])
-+  }
-+
-+  public refreshAllRepositories() {
-+    return this.refreshRepositoryState(this.repositories)
-+  }
-+
-+  private async refreshRepositoryState(
-+    repositories: ReadonlyArray<Repository>
-+  ): Promise<void> {
-+    if (!enableRepoInfoIndicators()) {
-+      return
-+    }
-+
-+    const promises = []
-+
-+    for (const repo of repositories) {
-+      promises.push(
-+        this.withAuthenticatingUser(repo, async (repo, account) => {
-+          const gitStore = this.getGitStore(repo)
-+          const lookup = this.localRepositoryStateLookup
-+          if (this.shouldBackgroundFetch(repo)) {
-+            await gitStore.fetch(account, true)
-+          }
-+
-+          const status = await gitStore.loadStatus()
-+          if (status !== null) {
-+            lookup.set(repo.id, {
-+              aheadBehind: gitStore.aheadBehind,
-+              changedFilesCount: status.workingDirectory.files.length,
-+            })
-+          }
-+        })
-+      )
-+    }
-+
-+    await Promise.all(promises)
-+
-+    this.emitUpdate()
-   }
-
-   /**
-@@ -1703,6 +2077,7 @@
-       await this._refreshRepository(repository)
-     } finally {
-       this.updateCheckoutProgress(repository, null)
-+      this._initializeCompare(repository, { kind: CompareActionKind.History })
-     }
-
-     return repository
-@@ -1919,7 +2294,7 @@
-         const refreshWeight = 0.1
-
-         // Scale pull and fetch weights to be between 0 and 0.9.
--        const scale = 1 / (pushWeight + fetchWeight) * (1 - refreshWeight)
-+        const scale = (1 / (pushWeight + fetchWeight)) * (1 - refreshWeight)
-
-         pushWeight *= scale
-         fetchWeight *= scale
-@@ -2103,7 +2478,7 @@
-           const refreshWeight = 0.1
-
-           // Scale pull and fetch weights to be between 0 and 0.9.
--          const scale = 1 / (pullWeight + fetchWeight) * (1 - refreshWeight)
-+          const scale = (1 / (pullWeight + fetchWeight)) * (1 - refreshWeight)
-
-           pullWeight *= scale
-           fetchWeight *= scale
-@@ -2163,18 +2538,24 @@
-     const currentBranchName =
-       tip.kind === TipState.Valid ? tip.branch.name : null
-
--    // A branch is only eligible for being fast forwarded if:
--    //  1. It's local.
--    //  2. It's not the current branch.
--    //  3. It has an upstream.
--    //  4. It's not ahead of its upstream.
--    const eligibleBranches = branches.filter(b => {
--      return (
--        b.type === BranchType.Local &&
--        b.name !== currentBranchName &&
--        b.upstream
-+    let eligibleBranches = branches.filter(b =>
-+      eligibleForFastForward(b, currentBranchName)
-+    )
-+
-+    if (eligibleBranches.length >= FastForwardBranchesThreshold) {
-+      log.info(
-+        `skipping fast-forward for all branches as there are ${
-+          eligibleBranches.length
-+        } local branches - this will run again when there are less than ${FastForwardBranchesThreshold} local branches tracking remotes`
-       )
--    })
-+
-+      const defaultBranch = state.branchesState.defaultBranch
-+      eligibleBranches =
-+        defaultBranch != null &&
-+        eligibleForFastForward(defaultBranch, currentBranchName)
-+          ? [defaultBranch]
-+          : []
-+    }
-
-     for (const branch of eligibleBranches) {
-       const aheadBehind = await getBranchAheadBehind(repository, branch)
-@@ -2183,6 +2564,8 @@
-       }
-
-       const { ahead, behind } = aheadBehind
-+      // Only perform the fast forward if the branch is behind it's upstream
-+      // branch and has no local commits.
-       if (ahead === 0 && behind > 0) {
-         // At this point we're guaranteed this is non-null since we've filtered
-         // out any branches will null upstreams above when creating
-@@ -2575,14 +2958,14 @@
-     return shell.openExternal(url)
-   }
-
--  /** Takes a repository path and opens it using the user's configured editor */
--  public async _openInExternalEditor(path: string): Promise<void> {
-+  /** Open a path to a repository or file using the user's configured editor */
-+  public async _openInExternalEditor(fullPath: string): Promise<void> {
-     const selectedExternalEditor =
-       this.getState().selectedExternalEditor || null
-
-     try {
-       const match = await findEditorOrDefault(selectedExternalEditor)
--      await launchExternalEditor(path, match)
-+      await launchExternalEditor(fullPath, match)
-     } catch (error) {
-       this.emitError(error)
-     }
-@@ -2668,6 +3051,18 @@
-     this.emitUpdate()
-   }
-
-+  public _setDivergingBranchBannerVisibility(visible: boolean) {
-+    if (this.isDivergingBranchBannerVisible !== visible) {
-+      this.isDivergingBranchBannerVisible = visible
-+
-+      if (visible) {
-+        this._recordDivergingBranchBannerDisplayed()
-+      }
-+
-+      this.emitUpdate()
-+    }
-+  }
-+
-   public _reportStats() {
-     return this.statsStore.reportStats(this.accounts, this.repositories)
-   }
-@@ -2676,7 +3071,10 @@
-     return this.statsStore.recordLaunchStats(stats)
-   }
-
--  public async _ignore(repository: Repository, pattern: string): Promise<void> {
-+  public async _ignore(
-+    repository: Repository,
-+    pattern: string | string[]
-+  ): Promise<void> {
-     const repoSettingsStore = this.getRepositorySettingsStore(repository)
-
-     await repoSettingsStore.ignore(pattern)
-@@ -3283,16 +3681,25 @@
-       head.gitHubRepository.cloneURL === gitHubRepository.cloneURL
-
-     if (isRefInThisRepo) {
--      // We need to fetch FIRST because someone may have created a PR since the last fetch
-       const defaultRemote = await getDefaultRemote(repository)
--      // TODO: I think we could skip this fetch if we know that we have the branch locally
--      // already. That way we'd match the behavior of checking out a branch.
--      if (defaultRemote) {
--        await this._fetchRemote(
--          repository,
--          defaultRemote,
--          FetchType.UserInitiatedTask
--        )
-+      // if we don't have a default remote here, it's probably going
-+      // to just crash and burn on checkout, but that's okay
-+      if (defaultRemote != null) {
-+        // the remote ref will be something like `origin/my-cool-branch`
-+        const remoteRef = `${defaultRemote.name}/${head.ref}`
-+        const gitStore = this.getGitStore(repository)
-+
-+        const remoteRefExists =
-+          gitStore.allBranches.find(branch => branch.name === remoteRef) != null
-+
-+        // only try a fetch here if we can't find the ref
-+        if (!remoteRefExists) {
-+          await this._fetchRemote(
-+            repository,
-+            defaultRemote,
-+            FetchType.UserInitiatedTask
-+          )
-+        }
-       }
-       await this._checkoutBranch(repository, head.ref)
-     } else if (head.gitHubRepository != null) {
-@@ -3316,7 +3723,7 @@
-         )
-
-         log.error(error.message)
--        this.emitError(error)
-+        return this.emitError(error)
-       }
-
-       await this._fetchRemote(repository, remote, FetchType.UserInitiatedTask)
-@@ -3338,6 +3745,8 @@
-
-       await this._checkoutBranch(repository, localBranchName)
-     }
-+
-+    this.statsStore.recordPRBranchCheckout()
-   }
-
-   /**
-@@ -3365,8 +3774,104 @@
-     this.getGitStore(repository).setCoAuthors(coAuthors)
-     return Promise.resolve()
-   }
-+
-+  /**
-+   * Increments the `mergeIntoCurrentBranchMenuCount` metric
-+   */
-+  public _recordMenuInitiatedMerge() {
-+    this.statsStore.recordMenuInitiatedMerge()
-+  }
-+
-+  /**
-+   * Increments the `updateFromDefaultBranchMenuCount` metric
-+   */
-+  public _recordMenuInitiatedUpdate() {
-+    this.statsStore.recordMenuInitiatedUpdate()
-+  }
-+
-+  /**
-+   * Increments the `mergesInitiatedFromComparison` metric
-+   */
-+  public _recordCompareInitiatedMerge() {
-+    this.statsStore.recordCompareInitiatedMerge()
-+  }
-+
-+  /**
-+   * Set the application-wide theme
-+   */
-+  public _setSelectedTheme(theme: ApplicationTheme) {
-+    setPersistedTheme(theme)
-+    this.selectedTheme = theme
-+    this.emitUpdate()
-+
-+    return Promise.resolve()
-+  }
-+
-+  /**
-+   * Increments either the `repoWithIndicatorClicked` or
-+   * the `repoWithoutIndicatorClicked` metric
-+   */
-+  public _recordRepoClicked(repoHasIndicator: boolean) {
-+    this.statsStore.recordRepoClicked(repoHasIndicator)
-+  }
-+
-+  /** The number of times the user dismisses the diverged branch notification
-+   * Increments the `divergingBranchBannerDismissal` metric
-+   */
-+  public _recordDivergingBranchBannerDismissal() {
-+    this.statsStore.recordDivergingBranchBannerDismissal()
-+  }
-+
-+  /**
-+   * Increments the `divergingBranchBannerDisplayed` metric
-+   */
-+  public _recordDivergingBranchBannerDisplayed() {
-+    this.statsStore.recordDivergingBranchBannerDisplayed()
-+  }
-+
-+  /**
-+   * Increments the `divergingBranchBannerInitiatedCompare` metric
-+   */
-+  public _recordDivergingBranchBannerInitiatedCompare() {
-+    this.statsStore.recordDivergingBranchBannerInitiatedCompare()
-+  }
-+
-+  /**
-+   * Increments the `divergingBranchBannerInfluencedMerge` metric
-+   */
-+  public _recordDivergingBranchBannerInfluencedMerge() {
-+    this.statsStore.recordDivergingBranchBannerInfluencedMerge()
-+  }
-+
-+  /**
-+   * Increments the `divergingBranchBannerInitatedMerge` metric
-+   */
-+  public _recordDivergingBranchBannerInitatedMerge() {
-+    this.statsStore.recordDivergingBranchBannerInitatedMerge()
-+  }
- }
-
- function forkPullRequestRemoteName(remoteName: string) {
-   return `${ForkedRemotePrefix}${remoteName}`
- }
-+
-+/**
-+ * Map the cached state of the compare view to an action
-+ * to perform which is then used to compute the compare
-+ * view contents.
-+ */
-+function getInitialAction(
-+  cachedState: IDisplayHistory | ICompareBranch
-+): CompareAction {
-+  if (cachedState.kind === ComparisonView.None) {
-+    return {
-+      kind: CompareActionKind.History,
-+    }
-+  }
-+
-+  return {
-+    kind: CompareActionKind.Branch,
-+    branch: cachedState.comparisonBranch,
-+    mode: cachedState.kind,
-+  }
-+}
-merged
-  result 100644 f448ce132d5fa114bc19fbf191a3c0026b4e202a app/src/lib/stores/git-store.ts
-  our    100644 d3b2a0b254bf08c1768c0f56d4b7602873766d56 app/src/lib/stores/git-store.ts
-@@ -3,11 +3,16 @@
- import { Disposable } from 'event-kit'
- import { Repository } from '../../models/repository'
- import { WorkingDirectoryFileChange, AppFileStatus } from '../../models/status'
--import { Branch, BranchType } from '../../models/branch'
-+import {
-+  Branch,
-+  BranchType,
-+  IAheadBehind,
-+  ICompareResult,
-+} from '../../models/branch'
- import { Tip, TipState } from '../../models/tip'
- import { Commit } from '../../models/commit'
- import { IRemote } from '../../models/remote'
--import { IFetchProgress, IRevertProgress } from '../app-state'
-+import { IFetchProgress, IRevertProgress, ComparisonView } from '../app-state'
-
- import { IAppShell } from '../app-shell'
- import { ErrorWithMetadata, IErrorMetadata } from '../error-with-metadata'
-@@ -24,7 +29,6 @@
-   getRecentBranches,
-   getBranches,
-   deleteRef,
--  IAheadBehind,
-   getCommits,
-   merge,
-   setRemoteURL,
-@@ -47,6 +51,10 @@
-   getTrailerSeparatorCharacters,
-   parseSingleUnfoldedTrailer,
-   isCoAuthoredByTrailer,
-+  getAheadBehind,
-+  revRange,
-+  revSymmetricDifference,
-+  getSymbolicRef,
- } from '../git'
- import { IGitAccount } from '../git/authentication'
- import { RetryAction, RetryActionType } from '../retry-actions'
-@@ -150,8 +158,10 @@
-
-     this.requestsInFight.add(LoadingHistoryRequestKey)
-
-+    const range = revRange('HEAD', mergeBase)
-+
-     const commits = await this.performFailableOperation(() =>
--      getCommits(this.repository, `HEAD..${mergeBase}`, CommitBatchSize)
-+      getCommits(this.repository, range, CommitBatchSize)
-     )
-     if (commits == null) {
-       return
-@@ -173,11 +183,8 @@
-       this._history = [...commits.map(c => c.sha), ...remainingHistory]
-     }
-
--    this.storeCommits(commits)
--
-+    this.storeCommits(commits, true)
-     this.requestsInFight.delete(LoadingHistoryRequestKey)
--
--    this.emitNewCommitsLoaded(commits)
-     this.emitUpdate()
-   }
-
-@@ -214,11 +221,8 @@
-     }
-
-     this._history = [...commits.map(c => c.sha), ...existingHistory]
--    this.storeCommits(commits)
--
-+    this.storeCommits(commits, true)
-     this.requestsInFight.delete(LoadingHistoryRequestKey)
--
--    this.emitNewCommitsLoaded(commits)
-     this.emitUpdate()
-   }
-
-@@ -248,12 +252,35 @@
-     }
-
-     this._history = this._history.concat(commits.map(c => c.sha))
--    this.storeCommits(commits)
-+    this.storeCommits(commits, true)
-+    this.requestsInFight.delete(requestKey)
-+    this.emitUpdate()
-+  }
-+
-+  /** Load a batch of commits from the repository, using the last known commit in the list. */
-+  public async loadCommitBatch(lastSHA: string) {
-+    if (this.requestsInFight.has(LoadingHistoryRequestKey)) {
-+      return null
-+    }
-+
-+    const requestKey = `history/compare/${lastSHA}`
-+    if (this.requestsInFight.has(requestKey)) {
-+      return null
-+    }
-+
-+    this.requestsInFight.add(requestKey)
-+
-+    const commits = await this.performFailableOperation(() =>
-+      getCommits(this.repository, `${lastSHA}^`, CommitBatchSize)
-+    )
-
-     this.requestsInFight.delete(requestKey)
-+    if (!commits) {
-+      return null
-+    }
-
--    this.emitNewCommitsLoaded(commits)
--    this.emitUpdate()
-+    this.storeCommits(commits, false)
-+    return commits.map(c => c.sha)
-   }
-
-   /** The list of ordered SHAs. */
-@@ -332,24 +359,51 @@
-     return allBranchesWithUpstream
-   }
-
--  private refreshDefaultBranch() {
--    let defaultBranchName: string | null = 'master'
--    const gitHubRepository = this.repository.gitHubRepository
--    if (gitHubRepository && gitHubRepository.defaultBranch) {
--      defaultBranchName = gitHubRepository.defaultBranch
-+  private async refreshDefaultBranch() {
-+    const defaultBranchName = await this.resolveDefaultBranch()
-+
-+    // Find the default branch among all of our branches, giving
-+    // priority to local branches by sorting them before remotes
-+    this._defaultBranch =
-+      this._allBranches
-+        .filter(b => b.name === defaultBranchName)
-+        .sort((x, y) => compare(x.type, y.type))
-+        .shift() || null
-+  }
-+
-+  /**
-+   * Resolve the default branch name for the current repository,
-+   * using the available API data, remote information or branch
-+   * name conventionns.
-+   */
-+  private async resolveDefaultBranch(): Promise<string> {
-+    const { gitHubRepository } = this.repository
-+    if (gitHubRepository && gitHubRepository.defaultBranch != null) {
-+      return gitHubRepository.defaultBranch
-     }
-
--    if (defaultBranchName) {
--      // Find the default branch among all of our branches, giving
--      // priority to local branches by sorting them before remotes
--      this._defaultBranch =
--        this._allBranches
--          .filter(b => b.name === defaultBranchName)
--          .sort((x, y) => compare(x.type, y.type))
--          .shift() || null
--    } else {
--      this._defaultBranch = null
-+    if (this.remote != null) {
-+      // the Git server should use [remote]/HEAD to advertise
-+      // it's default branch, so see if it exists and matches
-+      // a valid branch on the remote and attempt to use that
-+      const remoteNamespace = `refs/remotes/${this.remote.name}/`
-+      const match = await getSymbolicRef(
-+        this.repository,
-+        `${remoteNamespace}HEAD`
-+      )
-+      if (
-+        match != null &&
-+        match.length > remoteNamespace.length &&
-+        match.startsWith(remoteNamespace)
-+      ) {
-+        // strip out everything related to the remote because this
-+        // is likely to be a tracked branch locally
-+        // e.g. `master`, `develop`, etc
-+        return match.substr(remoteNamespace.length)
-+      }
-     }
-+
-+    return 'master'
-   }
-
-   private refreshRecentBranches(
-@@ -416,9 +470,9 @@
-
-     let localCommits: ReadonlyArray<Commit> | undefined
-     if (branch.upstream) {
--      const revRange = `${branch.upstream}..${branch.name}`
-+      const range = revRange(branch.upstream, branch.name)
-       localCommits = await this.performFailableOperation(() =>
--        getCommits(this.repository, revRange, CommitBatchSize)
-+        getCommits(this.repository, range, CommitBatchSize)
-       )
-     } else {
-       localCommits = await this.performFailableOperation(() =>
-@@ -447,10 +501,17 @@
-   }
-
-   /** Store the given commits. */
--  private storeCommits(commits: ReadonlyArray<Commit>) {
-+  private storeCommits(
-+    commits: ReadonlyArray<Commit>,
-+    emitUpdate: boolean = false
-+  ) {
-     for (const commit of commits) {
-       this.commitLookup.set(commit.sha, commit)
-     }
-+
-+    if (emitUpdate) {
-+      this.emitNewCommitsLoaded(commits)
-+    }
-   }
-
-   private async undoFirstCommit(
-@@ -1238,4 +1299,50 @@
-       setRemoteURL(this.repository, UpstreamRemoteName, url)
-     )
-   }
-+
-+  /**
-+   * Returns the commits associated with `branch` and ahead/behind info;
-+   */
-+  public async getCompareCommits(
-+    branch: Branch,
-+    compareType: ComparisonView.Ahead | ComparisonView.Behind
-+  ): Promise<ICompareResult | null> {
-+    if (this.tip.kind !== TipState.Valid) {
-+      return null
-+    }
-+
-+    const base = this.tip.branch
-+    const aheadBehind = await getAheadBehind(
-+      this.repository,
-+      revSymmetricDifference(base.name, branch.name)
-+    )
-+
-+    if (aheadBehind == null) {
-+      return null
-+    }
-+
-+    const revisionRange =
-+      compareType === ComparisonView.Ahead
-+        ? revRange(branch.name, base.name)
-+        : revRange(base.name, branch.name)
-+    const commitsToLoad =
-+      compareType === ComparisonView.Ahead
-+        ? aheadBehind.ahead
-+        : aheadBehind.behind
-+    const commits = await getCommits(
-+      this.repository,
-+      revisionRange,
-+      commitsToLoad
-+    )
-+
-+    if (commits.length > 0) {
-+      this.storeCommits(commits, true)
-+    }
-+
-+    return {
-+      commits,
-+      ahead: aheadBehind.ahead,
-+      behind: aheadBehind.behind,
-+    }
-+  }
- }
-added in remote
-  their  100644 2f4ef7dade5922f6825e9c4d3b0dd19216a44bb3 app/src/lib/stores/helpers/ahead-behind-updater.ts
-@@ -0,0 +1,125 @@
-+const queue: (config: QueueConfig) => Queue = require('queue')
-+import { revSymmetricDifference } from '../../../lib/git'
-+
-+// eslint-disable-next-line typescript/interface-name-prefix
-+interface QueueConfig {
-+  // Max number of jobs the queue should process concurrently, defaults to Infinity.
-+  readonly concurrency: number
-+  // Ensures the queue is always running if jobs are available.
-+  // Useful in situations where you are using a queue only for concurrency control.
-+  readonly autostart: boolean
-+}
-+
-+// eslint-disable-next-line typescript/interface-name-prefix
-+interface Queue extends NodeJS.EventEmitter {
-+  readonly length: number
-+
-+  start(): void
-+  end(): void
-+  push<T>(
-+    func: (callback: (error: Error | null, result: T) => void) => void
-+  ): void
-+}
-+
-+import { Repository } from '../../../models/repository'
-+import { getAheadBehind } from '../../../lib/git'
-+import { Branch, IAheadBehind } from '../../../models/branch'
-+import { ComparisonCache } from '../../comparison-cache'
-+
-+export class AheadBehindUpdater {
-+  private comparisonCache = new ComparisonCache()
-+
-+  private aheadBehindQueue = queue({
-+    concurrency: 1,
-+    autostart: true,
-+  })
-+
-+  public constructor(
-+    private repository: Repository,
-+    private onCacheUpdate: (cache: ComparisonCache) => void
-+  ) {}
-+
-+  public start() {
-+    this.aheadBehindQueue.on('success', (result: IAheadBehind | null) => {
-+      if (result != null) {
-+        this.onCacheUpdate(this.comparisonCache)
-+      }
-+    })
-+
-+    this.aheadBehindQueue.on('error', (err: Error) => {
-+      log.debug(
-+        '[AheadBehindUpdater] an error with the queue was reported',
-+        err
-+      )
-+    })
-+
-+    this.aheadBehindQueue.on('end', (err?: Error) => {
-+      if (err != null) {
-+        log.debug(`[AheadBehindUpdater] ended with an error`, err)
-+      }
-+    })
-+
-+    this.aheadBehindQueue.start()
-+  }
-+
-+  public stop() {
-+    this.aheadBehindQueue.end()
-+  }
-+
-+  private executeTask = (
-+    from: string,
-+    to: string,
-+    callback: (error: Error | null, result: IAheadBehind | null) => void
-+  ) => {
-+    if (this.comparisonCache.has(from, to)) {
-+      return
-+    }
-+
-+    const range = revSymmetricDifference(from, to)
-+    getAheadBehind(this.repository, range).then(result => {
-+      if (result != null) {
-+        this.comparisonCache.set(from, to, result)
-+      } else {
-+        log.debug(
-+          `[AheadBehindUpdater] unable to cache '${range}' as no result returned`
-+        )
-+      }
-+      callback(null, result)
-+    })
-+  }
-+
-+  public insert(from: string, to: string, value: IAheadBehind) {
-+    if (this.comparisonCache.has(from, to)) {
-+      return
-+    }
-+
-+    this.comparisonCache.set(from, to, value)
-+  }
-+
-+  public schedule(currentBranch: Branch, branches: ReadonlyArray<Branch>) {
-+    // remove any queued work to prioritize this new set of tasks
-+    this.aheadBehindQueue.end()
-+
-+    const from = currentBranch.tip.sha
-+
-+    const branchesNotInCache = branches
-+      .map(b => b.tip.sha)
-+      .filter(to => !this.comparisonCache.has(from, to))
-+
-+    const newRefsToCompare = new Set<string>(branchesNotInCache)
-+
-+    log.debug(
-+      `[AheadBehindUpdater] - found ${
-+        newRefsToCompare.size
-+      } comparisons to perform`
-+    )
-+
-+    for (const sha of newRefsToCompare) {
-+      this.aheadBehindQueue.push<IAheadBehind | null>(callback =>
-+        requestIdleCallback(() => {
-+          this.executeTask(from, sha, callback)
-+        })
-+      )
-+    }
-+  }
-+}
-added in remote
-  their  100644 6209dbef0a2ebc954b665597db7311541fdd197c app/src/lib/stores/helpers/infer-comparison-branch.ts
-@@ -0,0 +1,149 @@
-+import { Branch } from '../../../models/branch'
-+import { PullRequest } from '../../../models/pull-request'
-+import { GitHubRepository } from '../../../models/github-repository'
-+import { IRemote } from '../../../models/remote'
-+import { Repository } from '../../../models/repository'
-+import { ComparisonCache } from '../../comparison-cache'
-+
-+type RemotesGetter = (repository: Repository) => Promise<ReadonlyArray<IRemote>>
-+
-+/**
-+ * Infers which branch to use as the comparison branch
-+ *
-+ * The branch returned is determined by the following conditions:
-+ * 1. Given a pull request -> target branch of PR
-+ * 2. Given a forked repository -> default branch on `upstream`
-+ * 3. Given a hosted repository -> default branch on `origin`
-+ * 4. Fallback -> `master` branch
-+ *
-+ * @param repository The repository the branch belongs to
-+ * @param branches The list of all branches for the repository
-+ * @param currentPullRequest The pull request to use for finding the branch
-+ * @param currentBranch The branch we want the parent of
-+ * @param getRemotes callback used to get all remotes for the current repository
-+ * @param comparisonCache cache used to get the number of commits ahead/behind the current branch is from another branch
-+ */
-+export async function inferComparisonBranch(
-+  repository: Repository,
-+  branches: ReadonlyArray<Branch>,
-+  currentPullRequest: PullRequest | null,
-+  currentBranch: Branch | null,
-+  getRemotes: RemotesGetter,
-+  comparisonCache: ComparisonCache
-+): Promise<Branch | null> {
-+  if (currentPullRequest !== null) {
-+    return getTargetBranchOfPullRequest(branches, currentPullRequest)
-+  }
-+
-+  const ghRepo = repository.gitHubRepository
-+  if (ghRepo !== null) {
-+    return ghRepo.fork === true && currentBranch !== null
-+      ? getDefaultBranchOfFork(
-+          repository,
-+          branches,
-+          currentBranch,
-+          getRemotes,
-+          comparisonCache
-+        )
-+      : getDefaultBranchOfGitHubRepo(branches, ghRepo)
-+  }
-+
-+  return getMasterBranch(branches)
-+}
-+
-+function getMasterBranch(branches: ReadonlyArray<Branch>): Branch | null {
-+  return findBranch(branches, 'master')
-+}
-+
-+function getDefaultBranchOfGitHubRepo(
-+  branches: ReadonlyArray<Branch>,
-+  ghRepository: GitHubRepository
-+): Branch | null {
-+  if (ghRepository.defaultBranch === null) {
-+    return null
-+  }
-+
-+  return findBranch(branches, ghRepository.defaultBranch)
-+}
-+
-+function getTargetBranchOfPullRequest(
-+  branches: ReadonlyArray<Branch>,
-+  pr: PullRequest
-+): Branch | null {
-+  return findBranch(branches, pr.base.ref)
-+}
-+
-+/**
-+ * For `inferComparisonBranch` case where inferring for a forked repository
-+ *
-+ * Returns the default branch of the fork if it's ahead of `currentBranch`.
-+ * Otherwise, the default branch of the parent is returned.
-+ */
-+async function getDefaultBranchOfFork(
-+  repository: Repository,
-+  branches: ReadonlyArray<Branch>,
-+  currentBranch: Branch,
-+  getRemotes: RemotesGetter,
-+  comparisonCache: ComparisonCache
-+): Promise<Branch | null> {
-+  // this is guaranteed to exist since this function
-+  // is only called if the ghRepo is not null
-+  const ghRepo = repository.gitHubRepository!
-+  const defaultBranch = getDefaultBranchOfGitHubRepo(branches, ghRepo)
-+  if (defaultBranch === null) {
-+    return getMasterBranch(branches)
-+  }
-+
-+  const aheadBehind = comparisonCache.get(
-+    currentBranch.tip.sha,
-+    defaultBranch.tip.sha
-+  )
-+
-+  // we want to return the default branch of the fork if it's ahead
-+  // of the current branch; see https://github.com/desktop/desktop/issues/4766#issue-325764371
-+  if (aheadBehind !== null && aheadBehind.ahead > 0) {
-+    return defaultBranch
-+  }
-+
-+  const potentialDefault = await getDefaultBranchOfForkedGitHubRepo(
-+    repository,
-+    branches,
-+    getRemotes
-+  )
-+
-+  return potentialDefault
-+}
-+
-+async function getDefaultBranchOfForkedGitHubRepo(
-+  repository: Repository,
-+  branches: ReadonlyArray<Branch>,
-+  getRemotes: RemotesGetter
-+): Promise<Branch | null> {
-+  const parentRepo =
-+    repository.gitHubRepository !== null
-+      ? repository.gitHubRepository.parent
-+      : null
-+
-+  if (parentRepo === null) {
-+    return null
-+  }
-+
-+  const remotes = await getRemotes(repository)
-+  const remote = remotes.find(r => r.url === parentRepo.cloneURL)
-+
-+  if (remote === undefined) {
-+    log.warn(`Could not find remote with URL ${parentRepo.cloneURL}.`)
-+    return null
-+  }
-+
-+  const branchToFind = `${remote.name}/${parentRepo.defaultBranch}`
-+
-+  return findBranch(branches, branchToFind)
-+}
-+
-+function findBranch(
-+  branches: ReadonlyArray<Branch>,
-+  name: string
-+): Branch | null {
-+  return branches.find(b => b.name === name) || null
-+}
-merged
-  result 100644 d9edf0247ea7c33ae2b508f876aa977d8a81d6d4 app/src/lib/stores/pull-request-store.ts
-  our    100644 1feeeb2600084a5b31ad70f91d96038d1c405539 app/src/lib/stores/pull-request-store.ts
-@@ -67,7 +67,6 @@
-       this.emitUpdate(githubRepo)
-     } catch (error) {
-       log.warn(`Error refreshing pull requests for '${repository.name}'`, error)
--      this.emitError(error)
-     } finally {
-       this.updateActiveFetchCount(githubRepo, Decrement)
-     }
-@@ -104,7 +103,11 @@
-   ): Promise<void> {
-     const prs = await this.fetchPullRequestsFromCache(repository)
-
--    await this.fetchAndCachePullRequestStatus(prs, repository, account)
-+    try {
-+      await this.fetchAndCachePullRequestStatus(prs, repository, account)
-+    } catch (e) {
-+      log.warn('Error updating pull request statuses', e)
-+    }
-   }
-
-   /** Gets the pull requests against the given repository. */
-@@ -293,6 +296,7 @@
-       return {
-         id: x.id,
-         state: x.state,
-+        description: x.description,
-       }
-     })
-
-merged
-  result 100644 9eb2eaebe8b63f5219a301f0c68eb2d0a96d2fea app/src/lib/stores/repository-settings-store.ts
-  our    100644 ce2118f6066face1e430be4ad265a220a669fcf8 app/src/lib/stores/repository-settings-store.ts
-@@ -75,12 +75,15 @@
-   }
-
-   /** Ignore the given path or pattern. */
--  public async ignore(pattern: string): Promise<void> {
-+  public async ignore(patterns: string | string[]): Promise<void> {
-     const text = (await this.readGitIgnore()) || ''
-     const repository = this._repository
-     const currentContents = await formatGitIgnoreContents(text, repository)
-+
-+    const newPatternText =
-+      patterns instanceof Array ? patterns.join('\n') : patterns
-     const newText = await formatGitIgnoreContents(
--      `${currentContents}${pattern}`,
-+      `${currentContents}${newPatternText}`,
-       repository
-     )
-
-merged
-  result 100644 f05a774461b4caac6f3ad908b6090078f0de8419 app/src/lib/tailer.ts
-  our    100644 08d5dbe9e54073674bb101a4c8c7c331eb5d1105 app/src/lib/tailer.ts
-@@ -1,4 +1,4 @@
--import * as Fs from 'fs-extra'
-+import * as Fs from 'fs'
- import { Emitter, Disposable } from 'event-kit'
-
- interface ICurrentFileTailState {
-merged
-  result 100644 d2fd1a247c9132a86ae1a23a948c51adff797eca app/src/main-process/log.ts
-  our    100644 74719f439d29c061cd698d7b7dc9b46127a6b326 app/src/main-process/log.ts
-@@ -3,7 +3,7 @@
-
- import { getLogDirectoryPath } from '../lib/logging/get-log-path'
- import { LogLevel } from '../lib/logging/log-level'
--import { mkdirIfNeeded } from '../lib/file-system'
-+import { ensureDir } from 'fs-extra'
-
- require('winston-daily-rotate-file')
-
-@@ -73,7 +73,7 @@
-   loggerPromise = new Promise<winston.LogMethod>((resolve, reject) => {
-     const logDirectory = getLogDirectoryPath()
-
--    mkdirIfNeeded(logDirectory)
-+    ensureDir(logDirectory)
-       .then(() => {
-         try {
-           const logger = initializeWinston(getLogFilePath(logDirectory))
-merged
-  result 100644 946271baeebe98fdf6b79d970b68d6255fc40289 app/src/main-process/main.ts
-  our    100644 c5def55874da156c018edb81e03c9fc2e1ddbe90 app/src/main-process/main.ts
-@@ -170,6 +170,13 @@
-   }
- }
-
-+if (process.env.GITHUB_DESKTOP_DISABLE_HARDWARE_ACCELERATION) {
-+  log.info(
-+    `GITHUB_DESKTOP_DISABLE_HARDWARE_ACCELERATION environment variable set, disabling hardware acceleration`
-+  )
-+  app.disableHardwareAcceleration()
-+}
-+
- app.on('ready', () => {
-   if (isDuplicateInstance || handlingSquirrelEvent) {
-     return
-@@ -400,14 +407,24 @@
-   const window = new AppWindow()
-
-   if (__DEV__) {
--    const installer = require('electron-devtools-installer')
-+    const {
-+      default: installExtension,
-+      REACT_DEVELOPER_TOOLS,
-+      REACT_PERF,
-+    } = require('electron-devtools-installer')
-+
-     require('electron-debug')({ showDevTools: true })
-
--    const extensions = ['REACT_DEVELOPER_TOOLS', 'REACT_PERF']
-+    const ChromeLens = {
-+      id: 'idikgljglpfilbhaboonnpnnincjhjkd',
-+      electron: '>=1.2.1',
-+    }
-+
-+    const extensions = [REACT_DEVELOPER_TOOLS, REACT_PERF, ChromeLens]
-
--    for (const name of extensions) {
-+    for (const extension of extensions) {
-       try {
--        installer.default(installer[name])
-+        installExtension(extension)
-       } catch (e) {}
-     }
-   }
-merged
-  result 100644 7ec8c001136d655a2ecce3d56b9a6804762172fa app/src/main-process/menu/build-default-menu.ts
-  our    100644 e23a8e9a3b6cd377b7be7cc89ec15dae2d4c6da2 app/src/main-process/menu/build-default-menu.ts
-@@ -2,7 +2,7 @@
- import { ensureItemIds } from './ensure-item-ids'
- import { MenuEvent } from './menu-event'
- import { getLogDirectoryPath } from '../../lib/logging/get-log-path'
--import { mkdirIfNeeded } from '../../lib/file-system'
-+import { ensureDir } from 'fs-extra'
-
- import { log } from '../log'
- import { openDirectorySafe } from '../shell'
-@@ -114,7 +114,11 @@
-       { role: 'cut', label: __DARWIN__ ? 'Cut' : 'Cu&t' },
-       { role: 'copy', label: __DARWIN__ ? 'Copy' : '&Copy' },
-       { role: 'paste', label: __DARWIN__ ? 'Paste' : '&Paste' },
--      { role: 'selectall', label: __DARWIN__ ? 'Select All' : 'Select &all' },
-+      {
-+        label: __DARWIN__ ? 'Select All' : 'Select &all',
-+        accelerator: 'CmdOrCtrl+A',
-+        click: emit('select-all'),
-+      },
-     ],
-   })
-
-@@ -125,13 +129,13 @@
-         label: __DARWIN__ ? 'Show Changes' : '&Changes',
-         id: 'show-changes',
-         accelerator: 'CmdOrCtrl+1',
--        click: emit('select-changes'),
-+        click: emit('show-changes'),
-       },
-       {
-         label: __DARWIN__ ? 'Show History' : '&History',
-         id: 'show-history',
-         accelerator: 'CmdOrCtrl+2',
--        click: emit('select-history'),
-+        click: emit('show-history'),
-       },
-       {
-         label: __DARWIN__ ? 'Show Repository List' : 'Repository &list',
-@@ -285,6 +289,12 @@
-         click: emit('update-branch'),
-       },
-       {
-+        label: __DARWIN__ ? 'Compare to Branch' : '&Compare to branch',
-+        id: 'compare-to-branch',
-+        accelerator: 'CmdOrCtrl+Shift+B',
-+        click: emit('compare-to-branch'),
-+      },
-+      {
-         label: __DARWIN__
-           ? 'Merge Into Current Branch…'
-           : '&Merge into current branch…',
-@@ -294,10 +304,10 @@
-       },
-       separator,
-       {
--        label: __DARWIN__ ? 'Compare on GitHub' : '&Compare on GitHub',
--        id: 'compare-branch',
-+        label: __DARWIN__ ? 'Compare on GitHub' : 'Compare on &GitHub',
-+        id: 'compare-on-github',
-         accelerator: 'CmdOrCtrl+Shift+C',
--        click: emit('compare-branch'),
-+        click: emit('compare-on-github'),
-       },
-       {
-         label: pullRequestLabel,
-@@ -324,7 +334,7 @@
-   const submitIssueItem: Electron.MenuItemConstructorOptions = {
-     label: __DARWIN__ ? 'Report Issue…' : 'Report issue…',
-     click() {
--      shell.openExternal('https://github.com/desktop/desktop/issues/new')
-+      shell.openExternal('https://github.com/desktop/desktop/issues/new/choose')
-     },
-   }
-
-@@ -346,13 +356,15 @@
-
-   const showLogsLabel = __DARWIN__
-     ? 'Show Logs in Finder'
--    : __WIN32__ ? 'S&how logs in Explorer' : 'S&how logs in your File Manager'
-+    : __WIN32__
-+      ? 'S&how logs in Explorer'
-+      : 'S&how logs in your File Manager'
-
-   const showLogsItem: Electron.MenuItemConstructorOptions = {
-     label: showLogsLabel,
-     click() {
-       const logPath = getLogDirectoryPath()
--      mkdirIfNeeded(logPath)
-+      ensureDir(logPath)
-         .then(() => {
-           openDirectorySafe(logPath)
-         })
-merged
-  result 100644 a0568e66362057b90a91743f0aa68d083d286744 app/src/main-process/menu/menu-event.ts
-  our    100644 530863955062bb7a426d8f4cb55b7ba2890f4294 app/src/main-process/menu/menu-event.ts
-@@ -1,8 +1,8 @@
- export type MenuEvent =
-   | 'push'
-   | 'pull'
--  | 'select-changes'
--  | 'select-history'
-+  | 'show-changes'
-+  | 'show-history'
-   | 'add-local-repository'
-   | 'create-branch'
-   | 'show-branches'
-@@ -14,10 +14,11 @@
-   | 'choose-repository'
-   | 'open-working-directory'
-   | 'update-branch'
-+  | 'compare-to-branch'
-   | 'merge-branch'
-   | 'show-repository-settings'
-   | 'open-in-shell'
--  | 'compare-branch'
-+  | 'compare-on-github'
-   | 'view-repository-on-github'
-   | 'clone-repository'
-   | 'show-about'
-@@ -25,3 +26,4 @@
-   | 'open-pull-request'
-   | 'install-cli'
-   | 'open-external-editor'
-+  | 'select-all'
-merged
-  result 100644 3435bb2d1a982289132aabf4d0bbfea55730c644 app/src/main-process/menu/menu-ids.ts
-  our    100644 016034d30cd14a867effcf1b5142c320e786aab6 app/src/main-process/menu/menu-ids.ts
-@@ -5,7 +5,7 @@
-   | 'update-branch'
-   | 'merge-branch'
-   | 'view-repository-on-github'
--  | 'compare-branch'
-+  | 'compare-on-github'
-   | 'open-in-shell'
-   | 'push'
-   | 'pull'
-@@ -25,3 +25,4 @@
-   | 'clone-repository'
-   | 'about'
-   | 'create-pull-request'
-+  | 'compare-to-branch'
-merged
-  result 100644 5f8bcfd5aa2b2f30f81fe1cd9a2973bcc9b9f14f app/src/main-process/squirrel-updater.ts
-  our    100644 d91124b5c21b55938e5e07f48cbf194bf6ba5df6 app/src/main-process/squirrel-updater.ts
-@@ -1,7 +1,8 @@
--import * as ChildProcess from 'child_process'
- import * as Path from 'path'
- import * as Os from 'os'
--import { pathExists, mkdirIfNeeded, writeFile } from '../lib/file-system'
-+
-+import { pathExists, ensureDir, writeFile } from 'fs-extra'
-+import { spawn, getPathSegments, setPathSegments } from '../lib/process/win32'
-
- const appFolder = Path.resolve(process.execPath, '..')
- const rootAppDir = Path.resolve(appFolder, '..')
-@@ -46,7 +47,7 @@
-
- async function installCLI(): Promise<void> {
-   const binPath = getBinPath()
--  await mkdirIfNeeded(binPath)
-+  await ensureDir(binPath)
-   await writeBatchScriptCLITrampoline(binPath)
-   await writeShellScriptCLITrampoline(binPath)
-   const paths = await getPathSegments()
-@@ -79,7 +80,7 @@
-  * rewrite the trampoline to point to the new, version-specific path. Bingo
-  * bango Bob's your uncle.
-  */
--async function writeBatchScriptCLITrampoline(binPath: string): Promise<void> {
-+function writeBatchScriptCLITrampoline(binPath: string): Promise<void> {
-   const versionedPath = resolveVersionedPath(
-     binPath,
-     'resources/app/static/github.bat'
-@@ -91,7 +92,7 @@
-   return writeFile(trampolinePath, trampoline)
- }
-
--async function writeShellScriptCLITrampoline(binPath: string): Promise<void> {
-+function writeShellScriptCLITrampoline(binPath: string): Promise<void> {
-   const versionedPath = resolveVersionedPath(
-     binPath,
-     'resources/app/static/github.sh'
-@@ -153,86 +154,3 @@
-     return createShortcut(['StartMenu', 'Desktop'])
-   }
- }
--
--/** Get the path segments in the user's `Path`. */
--async function getPathSegments(): Promise<ReadonlyArray<string>> {
--  let powershellPath: string
--  const systemRoot = process.env['SystemRoot']
--  if (systemRoot) {
--    const system32Path = Path.join(process.env.SystemRoot, 'System32')
--    powershellPath = Path.join(
--      system32Path,
--      'WindowsPowerShell',
--      'v1.0',
--      'powershell.exe'
--    )
--  } else {
--    powershellPath = 'powershell.exe'
--  }
--
--  const args = [
--    '-noprofile',
--    '-ExecutionPolicy',
--    'RemoteSigned',
--    '-command',
--    // Set encoding and execute the command, capture the output, and return it
--    // via .NET's console in order to have consistent UTF-8 encoding.
--    // See http://stackoverflow.com/questions/22349139/utf-8-output-from-powershell
--    // to address https://github.com/atom/atom/issues/5063
--    `
--      [Console]::OutputEncoding=[System.Text.Encoding]::UTF8
--      $output=[environment]::GetEnvironmentVariable('Path', 'User')
--      [Console]::WriteLine($output)
--    `,
--  ]
--
--  const stdout = await spawn(powershellPath, args)
--  const pathOutput = stdout.replace(/^\s+|\s+$/g, '')
--  return pathOutput.split(/;+/).filter(segment => segment.length)
--}
--
--/** Set the user's `Path`. */
--async function setPathSegments(paths: ReadonlyArray<string>): Promise<void> {
--  let setxPath: string
--  const systemRoot = process.env['SystemRoot']
--  if (systemRoot) {
--    const system32Path = Path.join(systemRoot, 'System32')
--    setxPath = Path.join(system32Path, 'setx.exe')
--  } else {
--    setxPath = 'setx.exe'
--  }
--
--  await spawn(setxPath, ['Path', paths.join(';')])
--}
--
--/** Spawn a command with arguments and capture its output. */
--function spawn(command: string, args: ReadonlyArray<string>): Promise<string> {
--  try {
--    const child = ChildProcess.spawn(command, args as string[])
--    return new Promise<string>((resolve, reject) => {
--      let stdout = ''
--      child.stdout.on('data', data => {
--        stdout += data
--      })
--
--      child.on('close', code => {
--        if (code === 0) {
--          resolve(stdout)
--        } else {
--          reject(new Error(`Command "${command} ${args}" failed: "${stdout}"`))
--        }
--      })
--
--      child.on('error', (err: Error) => {
--        reject(err)
--      })
--
--      // This is necessary if using Powershell 2 on Windows 7 to get the events
--      // to raise.
--      // See http://stackoverflow.com/questions/9155289/calling-powershell-from-nodejs
--      child.stdin.end()
--    })
--  } catch (error) {
--    return Promise.reject(error)
--  }
--}
-merged
-  result 100644 f7e88ccf95c03ecb3df22ba8bbcd817652a83fe0 app/src/models/branch.ts
-  our    100644 1a16bdd23db314c080802efa3f454878ac0eae63 app/src/models/branch.ts
-@@ -8,6 +8,39 @@
-   Remote = 1,
- }
-
-+/** The number of commits a revision range is ahead/behind. */
-+export interface IAheadBehind {
-+  readonly ahead: number
-+  readonly behind: number
-+}
-+
-+/** The result of comparing two refs in a repository. */
-+export interface ICompareResult extends IAheadBehind {
-+  readonly commits: ReadonlyArray<Commit>
-+}
-+
-+/**
-+ * Check if a branch is eligible for beign fast forarded.
-+ *
-+ * Requirements:
-+ *   1. It's local.
-+ *   2. It's not the current branch.
-+ *   3. It has an upstream.
-+ *
-+ * @param branch The branch to validate
-+ * @param currentBranchName The current branch in the repository
-+ */
-+export function eligibleForFastForward(
-+  branch: Branch,
-+  currentBranchName: string | null
-+): boolean {
-+  return (
-+    branch.type === BranchType.Local &&
-+    branch.name !== currentBranchName &&
-+    branch.upstream != null
-+  )
-+}
-+
- /** A branch as loaded from Git. */
- export class Branch {
-   /** The short name of the branch. E.g., `master`. */
-merged
-  result 100644 09b508aa3d46107e1f7bfdb7d23ec7e572146082 app/src/models/commit.ts
-  our    100644 a6eb444fb8650f5e8e351782b02aced729e4933b app/src/models/commit.ts
-@@ -118,7 +118,7 @@
-
-     if (this.committer.name === 'GitHub Enterprise') {
-       const host = new URL(endpoint).host.toLowerCase()
--      return email === `noreply@${host}`
-+      return email.endsWith(`@${host}`)
-     }
-
-     return false
-added in remote
-  their  100644 25149364d06e0118a724af12a46e1d9e39fa94d6 app/src/models/diff/diff-data.ts
-@@ -0,0 +1,100 @@
-+import { DiffHunk } from './raw-diff'
-+import { Image } from './image'
-+/**
-+ * V8 has a limit on the size of string it can create, and unless we want to
-+ * trigger an unhandled exception we need to do the encoding conversion by hand
-+ */
-+export const maximumDiffStringSize = 268435441
-+
-+export enum DiffType {
-+  /** Changes to a text file, which may be partially selected for commit */
-+  Text,
-+  /** Changes to a file with a known extension, which can be viewed in the app */
-+  Image,
-+  /** Changes to an unknown file format, which Git is unable to present in a human-friendly format */
-+  Binary,
-+  /** Change to a repository which is included as a submodule of this repository */
-+  Submodule,
-+  /** Diff is large enough to degrade ux if rendered */
-+  LargeText,
-+  /** Diff that will not be rendered */
-+  Unrenderable,
-+}
-+
-+type LineEnding = 'CR' | 'LF' | 'CRLF'
-+
-+export type LineEndingsChange = {
-+  from: LineEnding
-+  to: LineEnding
-+}
-+
-+/** Parse the line ending string into an enum value (or `null` if unknown) */
-+export function parseLineEndingText(text: string): LineEnding | null {
-+  const input = text.trim()
-+  switch (input) {
-+    case 'CR':
-+      return 'CR'
-+    case 'LF':
-+      return 'LF'
-+    case 'CRLF':
-+      return 'CRLF'
-+    default:
-+      return null
-+  }
-+}
-+
-+/**
-+ * Data returned as part of a textual diff from Desktop
-+ */
-+interface ITextDiffData {
-+  /** The unified text diff - including headers and context */
-+  readonly text: string
-+  /** The diff contents organized by hunk - how the git CLI outputs to the caller */
-+  readonly hunks: ReadonlyArray<DiffHunk>
-+  /** A warning from Git that the line endings have changed in this file and will affect the commit */
-+  readonly lineEndingsChange?: LineEndingsChange
-+}
-+
-+export interface ITextDiff extends ITextDiffData {
-+  readonly kind: DiffType.Text
-+}
-+
-+/**
-+ * Data returned as part of an image diff in Desktop
-+ */
-+export interface IImageDiff {
-+  readonly kind: DiffType.Image
-+
-+  /**
-+   * The previous image, if the file was modified or deleted
-+   *
-+   * Will be undefined for an added image
-+   */
-+  readonly previous?: Image
-+  /**
-+   * The current image, if the file was added or modified
-+   *
-+   * Will be undefined for a deleted image
-+   */
-+  readonly current?: Image
-+}
-+
-+export interface IBinaryDiff {
-+  readonly kind: DiffType.Binary
-+}
-+
-+export interface ILargeTextDiff extends ITextDiffData {
-+  readonly kind: DiffType.LargeText
-+}
-+
-+export interface IUnrenderableDiff {
-+  readonly kind: DiffType.Unrenderable
-+}
-+
-+/** The union of diff types that can be rendered in Desktop */
-+export type IDiff =
-+  | ITextDiff
-+  | IImageDiff
-+  | IBinaryDiff
-+  | ILargeTextDiff
-+  | IUnrenderableDiff
-added in remote
-  their  100644 c67a37739d99c6a375e9f4e5675a3b48eb8031ea app/src/models/diff/diff-line.ts
-@@ -0,0 +1,49 @@
-+/** indicate what a line in the diff represents */
-+export enum DiffLineType {
-+  Context,
-+  Add,
-+  Delete,
-+  Hunk,
-+}
-+
-+/** track details related to each line in the diff */
-+export class DiffLine {
-+  public readonly text: string
-+  public readonly type: DiffLineType
-+  public readonly oldLineNumber: number | null
-+  public readonly newLineNumber: number | null
-+  public readonly noTrailingNewLine: boolean
-+
-+  public constructor(
-+    text: string,
-+    type: DiffLineType,
-+    oldLineNumber: number | null,
-+    newLineNuber: number | null,
-+    noTrailingNewLine: boolean = false
-+  ) {
-+    this.text = text
-+    this.type = type
-+    this.oldLineNumber = oldLineNumber
-+    this.newLineNumber = newLineNuber
-+    this.noTrailingNewLine = noTrailingNewLine
-+  }
-+
-+  public withNoTrailingNewLine(noTrailingNewLine: boolean): DiffLine {
-+    return new DiffLine(
-+      this.text,
-+      this.type,
-+      this.oldLineNumber,
-+      this.newLineNumber,
-+      noTrailingNewLine
-+    )
-+  }
-+
-+  public isIncludeableLine() {
-+    return this.type === DiffLineType.Add || this.type === DiffLineType.Delete
-+  }
-+
-+  /** The content of the line, i.e., without the line type marker. */
-+  public get content(): string {
-+    return this.text.substr(1)
-+  }
-+}
-added in remote
-  their  100644 e93f04b45de5a0329772d8ff16c2b5a33afedc3f app/src/models/diff/diff-selection.ts
-@@ -0,0 +1,291 @@
-+import { assertNever } from '../../lib/fatal-error'
-+
-+/**
-+ * The state of a file's diff selection
-+ */
-+export enum DiffSelectionType {
-+  /** The entire file should be committed */
-+  All,
-+  /** A subset of lines in the file have been selected for committing */
-+  Partial,
-+  /** The file should be excluded from committing */
-+  None,
-+}
-+
-+/**
-+ * Utility function which determines whether a boolean selection state
-+ * matches the given DiffSelectionType. A true selection state matches
-+ * DiffSelectionType.All, a false selection state matches
-+ * DiffSelectionType.None and if the selection type is partial there's
-+ * never a match.
-+ */
-+function typeMatchesSelection(
-+  selectionType: DiffSelectionType,
-+  selected: boolean
-+): boolean {
-+  switch (selectionType) {
-+    case DiffSelectionType.All:
-+      return selected
-+    case DiffSelectionType.None:
-+      return !selected
-+    case DiffSelectionType.Partial:
-+      return false
-+    default:
-+      return assertNever(
-+        selectionType,
-+        `Unknown selection type ${selectionType}`
-+      )
-+  }
-+}
-+
-+/**
-+ * An immutable, efficient, storage object for tracking selections of indexable
-+ * lines. While general purpose by design this is currently used exclusively for
-+ * tracking selected lines in modified files in the working directory.
-+ *
-+ * This class starts out with an initial (or default) selection state, ie
-+ * either all lines are selected by default or no lines are selected by default.
-+ *
-+ * The selection can then be transformed by marking a line or a range of lines
-+ * as selected or not selected. Internally the class maintains a list of lines
-+ * whose selection state has diverged from the default selection state.
-+ */
-+export class DiffSelection {
-+  private readonly defaultSelectionType:
-+    | DiffSelectionType.All
-+    | DiffSelectionType.None
-+
-+  /* Any line numbers where the selection differs from the default state. */
-+  private readonly divergingLines: Set<number> | null
-+
-+  /* Optional set of line numbers which can be selected. */
-+  private readonly selectableLines: Set<number> | null
-+
-+  /**
-+   * Initialize a new selection instance where either all lines are selected by default
-+   * or not lines are selected by default.
-+   */
-+  public static fromInitialSelection(
-+    initialSelection: DiffSelectionType.All | DiffSelectionType.None
-+  ): DiffSelection {
-+    if (
-+      initialSelection !== DiffSelectionType.All &&
-+      initialSelection !== DiffSelectionType.None
-+    ) {
-+      return assertNever(
-+        initialSelection,
-+        'Can only instantiate a DiffSelection with All or None as the initial selection'
-+      )
-+    }
-+
-+    return new DiffSelection(initialSelection, null, null)
-+  }
-+
-+  private constructor(
-+    defaultSelectionType: DiffSelectionType.All | DiffSelectionType.None,
-+    divergingLines: Set<number> | null,
-+    selectableLines: Set<number> | null
-+  ) {
-+    this.defaultSelectionType = defaultSelectionType
-+    this.divergingLines = divergingLines || null
-+    this.selectableLines = selectableLines || null
-+  }
-+
-+  /** Returns a value indicating the computed overall state of the selection */
-+  public getSelectionType(): DiffSelectionType {
-+    const divergingLines = this.divergingLines
-+    const selectableLines = this.selectableLines
-+
-+    // No diverging lines, happy path. Either all lines are selected or none are.
-+    if (!divergingLines) {
-+      return this.defaultSelectionType
-+    }
-+    if (divergingLines.size === 0) {
-+      return this.defaultSelectionType
-+    }
-+
-+    // If we know which lines are selectable we need to check that
-+    // all lines are divergent and return the inverse of default selection.
-+    // To avoid loopting through the set that often our happy path is
-+    // if there's a size mismatch.
-+    if (selectableLines && selectableLines.size === divergingLines.size) {
-+      const allSelectableLinesAreDivergent = [...selectableLines].every(i =>
-+        divergingLines.has(i)
-+      )
-+
-+      if (allSelectableLinesAreDivergent) {
-+        return this.defaultSelectionType === DiffSelectionType.All
-+          ? DiffSelectionType.None
-+          : DiffSelectionType.All
-+      }
-+    }
-+
-+    // Note that without any selectable lines we'll report partial selection
-+    // as long as we have any diverging lines since we have no way of knowing
-+    // if _all_ lines are divergent or not
-+    return DiffSelectionType.Partial
-+  }
-+
-+  /** Returns a value indicating wether the given line number is selected or not */
-+  public isSelected(lineIndex: number): boolean {
-+    const lineIsDivergent =
-+      !!this.divergingLines && this.divergingLines.has(lineIndex)
-+
-+    if (this.defaultSelectionType === DiffSelectionType.All) {
-+      return !lineIsDivergent
-+    } else if (this.defaultSelectionType === DiffSelectionType.None) {
-+      return lineIsDivergent
-+    } else {
-+      return assertNever(
-+        this.defaultSelectionType,
-+        `Unknown base selection type ${this.defaultSelectionType}`
-+      )
-+    }
-+  }
-+
-+  /**
-+   * Returns a value indicating wether the given line number is selectable.
-+   * A line not being selectable usually means it's a hunk header or a context
-+   * line.
-+   */
-+  public isSelectable(lineIndex: number): boolean {
-+    return this.selectableLines ? this.selectableLines.has(lineIndex) : true
-+  }
-+
-+  /**
-+   * Returns a copy of this selection instance with the provided
-+   * line selection update.
-+   *
-+   * @param lineIndex The index (line number) of the line which should
-+   *                 be selected or unselected.
-+   *
-+   * @param selected Whether the given line number should be marked
-+   *                 as selected or not.
-+   */
-+  public withLineSelection(
-+    lineIndex: number,
-+    selected: boolean
-+  ): DiffSelection {
-+    return this.withRangeSelection(lineIndex, 1, selected)
-+  }
-+
-+  /**
-+   * Returns a copy of this selection instance with the provided
-+   * line selection update. This is similar to the withLineSelection
-+   * method except that it allows updating the selection state of
-+   * a range of lines at once. Use this if you ever need to modify
-+   * the selection state of more than one line at a time as it's
-+   * more efficient.
-+   *
-+   * @param from     The line index (inclusive) from where to start
-+   *                 updating the line selection state.
-+   *
-+   * @param to       The number of lines for which to update the
-+   *                 selection state. A value of zero means no lines
-+   *                 are updated and a value of 1 means only the
-+   *                 line given by lineIndex will be updated.
-+   *
-+   * @param selected Whether the lines should be marked as selected
-+   *                 or not.
-+   */
-+  // Lower inclusive, upper exclusive. Same as substring
-+  public withRangeSelection(
-+    from: number,
-+    length: number,
-+    selected: boolean
-+  ): DiffSelection {
-+    const computedSelectionType = this.getSelectionType()
-+    const to = from + length
-+
-+    // Nothing for us to do here. This state is when all lines are already
-+    // selected and we're being asked to select more or when no lines are
-+    // selected and we're being asked to unselect something.
-+    if (typeMatchesSelection(computedSelectionType, selected)) {
-+      return this
-+    }
-+
-+    if (computedSelectionType === DiffSelectionType.Partial) {
-+      const newDivergingLines = new Set<number>(this.divergingLines!)
-+
-+      if (typeMatchesSelection(this.defaultSelectionType, selected)) {
-+        for (let i = from; i < to; i++) {
-+          newDivergingLines.delete(i)
-+        }
-+      } else {
-+        for (let i = from; i < to; i++) {
-+          // Ensure it's selectable
-+          if (this.isSelectable(i)) {
-+            newDivergingLines.add(i)
-+          }
-+        }
-+      }
-+
-+      return new DiffSelection(
-+        this.defaultSelectionType,
-+        newDivergingLines.size === 0 ? null : newDivergingLines,
-+        this.selectableLines
-+      )
-+    } else {
-+      const newDivergingLines = new Set<number>()
-+      for (let i = from; i < to; i++) {
-+        if (this.isSelectable(i)) {
-+          newDivergingLines.add(i)
-+        }
-+      }
-+
-+      return new DiffSelection(
-+        computedSelectionType,
-+        newDivergingLines,
-+        this.selectableLines
-+      )
-+    }
-+  }
-+
-+  /**
-+   * Returns a copy of this selection instance where the selection state
-+   * of the specified line has been toggled (inverted).
-+   *
-+   * @param lineIndex The index (line number) of the line which should
-+   *                 be selected or unselected.
-+   */
-+  public withToggleLineSelection(lineIndex: number): DiffSelection {
-+    return this.withLineSelection(lineIndex, !this.isSelected(lineIndex))
-+  }
-+
-+  /**
-+   * Returns a copy of this selection instance with all lines selected.
-+   */
-+  public withSelectAll(): DiffSelection {
-+    return new DiffSelection(DiffSelectionType.All, null, this.selectableLines)
-+  }
-+
-+  /**
-+   * Returns a copy of this selection instance with no lines selected.
-+   */
-+  public withSelectNone(): DiffSelection {
-+    return new DiffSelection(DiffSelectionType.None, null, this.selectableLines)
-+  }
-+
-+  /**
-+   * Returns a copy of this selection instance with a specified set of
-+   * selecable lines. By default a DiffSelection instance allows selecting
-+   * all lines (in fact, it has no notion of how many lines exists or what
-+   * it is that is being selected).
-+   *
-+   * If the selection instance lacks a set of selectable lines it can not
-+   * supply an accurate value from getSelectionType when the selection of
-+   * all lines have diverged from the default state (since it doesn't know
-+   * what all lines mean).
-+   */
-+  public withSelectableLines(selectableLines: Set<number>) {
-+    const divergingLines = this.divergingLines
-+      ? new Set([...this.divergingLines].filter(x => selectableLines.has(x)))
-+      : null
-+
-+    return new DiffSelection(
-+      this.defaultSelectionType,
-+      divergingLines,
-+      selectableLines
-+    )
-+  }
-+}
-added in remote
-  their  100644 ec1f951bc9326443ec440600c4c2edcf51e5f4f5 app/src/models/diff/image.ts
-@@ -0,0 +1,25 @@
-+/**
-+ * A container for holding an image for display in the application
-+ */
-+export class Image {
-+  /**
-+   * The base64 encoded contents of the image
-+   */
-+  public readonly contents: string
-+
-+  /**
-+   * The data URI media type, so the browser can render the image correctly
-+   */
-+  public readonly mediaType: string
-+
-+  /**
-+   * Size of the file in bytes
-+   */
-+  public readonly bytes: number
-+
-+  public constructor(contents: string, mediaType: string, bytes: number) {
-+    this.contents = contents
-+    this.mediaType = mediaType
-+    this.bytes = bytes
-+  }
-+}
-added in remote
-  their  100644 ff04279f640811cae78963c899aa24f987d2bd30 app/src/models/diff/index.ts
-@@ -0,0 +1,5 @@
-+export * from './diff-data'
-+export * from './diff-line'
-+export * from './diff-selection'
-+export * from './image'
-+export * from './raw-diff'
-added in remote
-  their  100644 3182bf4a9cd153fa9d0a33937c7001a783ed140f app/src/models/diff/raw-diff.ts
-@@ -0,0 +1,87 @@
-+import { DiffLine } from './diff-line'
-+
-+/** each diff is made up of a number of hunks */
-+export class DiffHunk {
-+  /** details from the diff hunk header about the line start and patch length */
-+  public readonly header: DiffHunkHeader
-+  /** the contents - context and changes - of the diff setion */
-+  public readonly lines: ReadonlyArray<DiffLine>
-+  /** the diff hunk's start position in the overall file diff */
-+  public readonly unifiedDiffStart: number
-+  /** the diff hunk's end position in the overall file diff */
-+  public readonly unifiedDiffEnd: number
-+
-+  public constructor(
-+    header: DiffHunkHeader,
-+    lines: ReadonlyArray<DiffLine>,
-+    unifiedDiffStart: number,
-+    unifiedDiffEnd: number
-+  ) {
-+    this.header = header
-+    this.unifiedDiffStart = unifiedDiffStart
-+    this.unifiedDiffEnd = unifiedDiffEnd
-+    this.lines = lines
-+  }
-+}
-+
-+/** details about the start and end of a diff hunk */
-+export class DiffHunkHeader {
-+  /** The line in the old (or original) file where this diff hunk starts */
-+  public readonly oldStartLine: number
-+
-+  /** The number of lines in the old (or original) file that this diff hunk covers */
-+  public readonly oldLineCount: number
-+
-+  /** The line in the new file where this diff hunk starts */
-+  public readonly newStartLine: number
-+
-+  /** The number of lines in the new file that this diff hunk covers */
-+  public readonly newLineCount: number
-+
-+  public constructor(
-+    oldStartLine: number,
-+    oldLineCount: number,
-+    newStartLine: number,
-+    newLineCount: number,
-+    sectionHeading?: string | null
-+  ) {
-+    this.oldStartLine = oldStartLine
-+    this.oldLineCount = oldLineCount
-+    this.newStartLine = newStartLine
-+    this.newLineCount = newLineCount
-+  }
-+}
-+
-+/** the contents of a diff generated by Git */
-+export interface IRawDiff {
-+  /**
-+   * The plain text contents of the diff header. This contains
-+   * everything from the start of the diff up until the first
-+   * hunk header starts. Note that this does not include a trailing
-+   * newline.
-+   */
-+  readonly header: string
-+
-+  /**
-+   * The plain text contents of the diff. This contains everything
-+   * after the diff header until the last character in the diff.
-+   *
-+   * Note that this does not include a trailing newline nor does
-+   * it include diff 'no newline at end of file' comments. For
-+   * no-newline information, consult the DiffLine noTrailingNewLine
-+   * property.
-+   */
-+  readonly contents: string
-+
-+  /**
-+   * Each hunk in the diff with information about start, and end
-+   * positions, lines and line statuses.
-+   */
-+  readonly hunks: ReadonlyArray<DiffHunk>
-+
-+  /**
-+   * Whether or not the unified diff indicates that the contents
-+   * could not be diffed due to one of the versions being binary.
-+   */
-+  readonly isBinary: boolean
-+}
-removed in remote
-  base   100644 a87d16ff4a97dc592dfabe66a69a340629d70ea8 app/src/models/diff.ts
-  our    100644 a87d16ff4a97dc592dfabe66a69a340629d70ea8 app/src/models/diff.ts
-@@ -1,571 +0,0 @@
--import { assertNever } from '../lib/fatal-error'
--
--/**
-- * V8 has a limit on the size of string it can create, and unless we want to
-- * trigger an unhandled exception we need to do the encoding conversion by hand
-- */
--export const maximumDiffStringSize = 268435441
--
--/**
-- * A container for holding an image for display in the application
-- */
--export class Image {
--  /**
--   * The base64 encoded contents of the image
--   */
--  public readonly contents: string
--
--  /**
--   * The data URI media type, so the browser can render the image correctly
--   */
--  public readonly mediaType: string
--
--  public constructor(contents: string, mediaType: string) {
--    this.contents = contents
--    this.mediaType = mediaType
--  }
--}
--
--/** each diff is made up of a number of hunks */
--export class DiffHunk {
--  /** details from the diff hunk header about the line start and patch length */
--  public readonly header: DiffHunkHeader
--  /** the contents - context and changes - of the diff setion */
--  public readonly lines: ReadonlyArray<DiffLine>
--  /** the diff hunk's start position in the overall file diff */
--  public readonly unifiedDiffStart: number
--  /** the diff hunk's end position in the overall file diff */
--  public readonly unifiedDiffEnd: number
--
--  public constructor(
--    header: DiffHunkHeader,
--    lines: ReadonlyArray<DiffLine>,
--    unifiedDiffStart: number,
--    unifiedDiffEnd: number
--  ) {
--    this.header = header
--    this.unifiedDiffStart = unifiedDiffStart
--    this.unifiedDiffEnd = unifiedDiffEnd
--    this.lines = lines
--  }
--}
--
--export enum DiffType {
--  /** Changes to a text file, which may be partially selected for commit */
--  Text,
--  /** Changes to files of a known format, which can be viewed in the app */
--  Image,
--  /** Changes to an unknown file format, which Git is unable to present in a human-friendly format */
--  Binary,
--  /** Change to a repository which is included as a submodule of this repository */
--  Submodule,
--  /** Diff is large enough to degrade ux if rendered */
--  LargeText,
--  /** Diff that will not be rendered */
--  Unrenderable,
--}
--
--/** indicate what a line in the diff represents */
--export enum DiffLineType {
--  Context,
--  Add,
--  Delete,
--  Hunk,
--}
--
--type LineEnding = 'CR' | 'LF' | 'CRLF'
--
--export type LineEndingsChange = {
--  from: LineEnding
--  to: LineEnding
--}
--
--/** Parse the line ending string into an enum value (or `null` if unknown) */
--export function parseLineEndingText(text: string): LineEnding | null {
--  const input = text.trim()
--  switch (input) {
--    case 'CR':
--      return 'CR'
--    case 'LF':
--      return 'LF'
--    case 'CRLF':
--      return 'CRLF'
--    default:
--      return null
--  }
--}
--
--export interface ITextDiff {
--  readonly kind: DiffType.Text
--  /** The unified text diff - including headers and context */
--  readonly text: string
--  /** The diff contents organized by hunk - how the git CLI outputs to the caller */
--  readonly hunks: ReadonlyArray<DiffHunk>
--  /** A warning from Git that the line endings have changed in this file and will affect the commit */
--  readonly lineEndingsChange?: LineEndingsChange
--}
--
--export interface IImageDiff {
--  readonly kind: DiffType.Image
--  /**
--   * The previous image, if the file was modified or deleted
--   *
--   * Will be undefined for an added image
--   */
--  readonly previous?: Image
--  /**
--   * The current image, if the file was added or modified
--   *
--   * Will be undefined for a deleted image
--   */
--  readonly current?: Image
--}
--
--export interface IBinaryDiff {
--  readonly kind: DiffType.Binary
--}
--
--export interface ILargeTextDiff {
--  readonly kind: DiffType.LargeText
--  /** The unified text diff - including headers and context */
--  readonly text: string
--  /** The diff contents organized by hunk - how the git CLI outputs to the caller */
--  readonly hunks: ReadonlyArray<DiffHunk>
--  /** A warning from Git that the line endings have changed in this file and will affect the commit */
--  readonly lineEndingsChange?: LineEndingsChange
--}
--
--export interface IUnrenderableDiff {
--  readonly kind: DiffType.Unrenderable
--}
--
--/** The union of diff types that can be rendered in Desktop */
--export type IDiff =
--  | ITextDiff
--  | IImageDiff
--  | IBinaryDiff
--  | ILargeTextDiff
--  | IUnrenderableDiff
--
--/** track details related to each line in the diff */
--export class DiffLine {
--  public readonly text: string
--  public readonly type: DiffLineType
--  public readonly oldLineNumber: number | null
--  public readonly newLineNumber: number | null
--  public readonly noTrailingNewLine: boolean
--
--  public constructor(
--    text: string,
--    type: DiffLineType,
--    oldLineNumber: number | null,
--    newLineNuber: number | null,
--    noTrailingNewLine: boolean = false
--  ) {
--    this.text = text
--    this.type = type
--    this.oldLineNumber = oldLineNumber
--    this.newLineNumber = newLineNuber
--    this.noTrailingNewLine = noTrailingNewLine
--  }
--
--  public withNoTrailingNewLine(noTrailingNewLine: boolean): DiffLine {
--    return new DiffLine(
--      this.text,
--      this.type,
--      this.oldLineNumber,
--      this.newLineNumber,
--      noTrailingNewLine
--    )
--  }
--
--  public isIncludeableLine() {
--    return this.type === DiffLineType.Add || this.type === DiffLineType.Delete
--  }
--
--  /** The content of the line, i.e., without the line type marker. */
--  public get content(): string {
--    return this.text.substr(1)
--  }
--}
--
--/** details about the start and end of a diff hunk */
--export class DiffHunkHeader {
--  /** The line in the old (or original) file where this diff hunk starts */
--  public readonly oldStartLine: number
--
--  /** The number of lines in the old (or original) file that this diff hunk covers */
--  public readonly oldLineCount: number
--
--  /** The line in the new file where this diff hunk starts */
--  public readonly newStartLine: number
--
--  /** The number of lines in the new file that this diff hunk covers */
--  public readonly newLineCount: number
--
--  public constructor(
--    oldStartLine: number,
--    oldLineCount: number,
--    newStartLine: number,
--    newLineCount: number,
--    sectionHeading?: string | null
--  ) {
--    this.oldStartLine = oldStartLine
--    this.oldLineCount = oldLineCount
--    this.newStartLine = newStartLine
--    this.newLineCount = newLineCount
--  }
--}
--
--export class FileSummary {
--  /**
--   * The number of lines added as part of this change.
--   *
--   * If the file is a binary change, this value is undefined.
--   */
--  public readonly added?: number
--  /**
--   * The number of lines removed as part of this change.
--   *
--   * If the file is a binary change, this value is undefined.
--   */
--  public readonly removed?: number
--
--  /**
--   * The path to this change, relative to the submodule root
--   */
--  public readonly path: string
--
--  public constructor(
--    path: string,
--    added: number | undefined,
--    removed: number | undefined
--  ) {
--    this.path = path
--    this.added = added
--    this.removed = removed
--  }
--
--  /** An ID for the file change. */
--  public get id(): string {
--    return `${this.added}+${this.removed}+${this.path}`
--  }
--}
--
--/** the contents of a diff generated by Git */
--export interface IRawDiff {
--  /**
--   * The plain text contents of the diff header. This contains
--   * everything from the start of the diff up until the first
--   * hunk header starts. Note that this does not include a trailing
--   * newline.
--   */
--  readonly header: string
--
--  /**
--   * The plain text contents of the diff. This contains everything
--   * after the diff header until the last character in the diff.
--   *
--   * Note that this does not include a trailing newline nor does
--   * it include diff 'no newline at end of file' comments. For
--   * no-newline information, consult the DiffLine noTrailingNewLine
--   * property.
--   */
--  readonly contents: string
--
--  /**
--   * Each hunk in the diff with information about start, and end
--   * positions, lines and line statuses.
--   */
--  readonly hunks: ReadonlyArray<DiffHunk>
--
--  /**
--   * Whether or not the unified diff indicates that the contents
--   * could not be diffed due to one of the versions being binary.
--   */
--  readonly isBinary: boolean
--}
--
--export enum DiffSelectionType {
--  All,
--  Partial,
--  None,
--}
--
--/**
-- * Utility function which determines whether a boolean selection state
-- * matches the given DiffSelectionType. A true selection state matches
-- * DiffSelectionType.All, a false selection state matches
-- * DiffSelectionType.None and if the selection type is partial there's
-- * never a match.
-- */
--function typeMatchesSelection(
--  selectionType: DiffSelectionType,
--  selected: boolean
--): boolean {
--  switch (selectionType) {
--    case DiffSelectionType.All:
--      return selected
--    case DiffSelectionType.None:
--      return !selected
--    case DiffSelectionType.Partial:
--      return false
--    default:
--      return assertNever(
--        selectionType,
--        `Unknown selection type ${selectionType}`
--      )
--  }
--}
--
--/**
-- * An immutable, efficient, storage object for tracking selections of indexable
-- * lines. While general purpose by design this is currently used exclusively for
-- * tracking selected lines in modified files in the working directory.
-- *
-- * This class starts out with an initial (or default) selection state, ie
-- * either all lines are selected by default or no lines are selected by default.
-- *
-- * The selection can then be transformed by marking a line or a range of lines
-- * as selected or not selected. Internally the class maintains a list of lines
-- * whose selection state has diverged from the default selection state.
-- */
--export class DiffSelection {
--  private readonly defaultSelectionType:
--    | DiffSelectionType.All
--    | DiffSelectionType.None
--
--  /* Any line numbers where the selection differs from the default state. */
--  private readonly divergingLines: Set<number> | null
--
--  /* Optional set of line numbers which can be selected. */
--  private readonly selectableLines: Set<number> | null
--
--  /**
--   * Initialize a new selection instance where either all lines are selected by default
--   * or not lines are selected by default.
--   */
--  public static fromInitialSelection(
--    initialSelection: DiffSelectionType.All | DiffSelectionType.None
--  ): DiffSelection {
--    if (
--      initialSelection !== DiffSelectionType.All &&
--      initialSelection !== DiffSelectionType.None
--    ) {
--      return assertNever(
--        initialSelection,
--        'Can only instantiate a DiffSelection with All or None as the initial selection'
--      )
--    }
--
--    return new DiffSelection(initialSelection, null, null)
--  }
--
--  private constructor(
--    defaultSelectionType: DiffSelectionType.All | DiffSelectionType.None,
--    divergingLines: Set<number> | null,
--    selectableLines: Set<number> | null
--  ) {
--    this.defaultSelectionType = defaultSelectionType
--    this.divergingLines = divergingLines || null
--    this.selectableLines = selectableLines || null
--  }
--
--  /** Returns a value indicating the computed overall state of the selection */
--  public getSelectionType(): DiffSelectionType {
--    const divergingLines = this.divergingLines
--    const selectableLines = this.selectableLines
--
--    // No diverging lines, happy path. Either all lines are selected or none are.
--    if (!divergingLines) {
--      return this.defaultSelectionType
--    }
--    if (divergingLines.size === 0) {
--      return this.defaultSelectionType
--    }
--
--    // If we know which lines are selectable we need to check that
--    // all lines are divergent and return the inverse of default selection.
--    // To avoid loopting through the set that often our happy path is
--    // if there's a size mismatch.
--    if (selectableLines && selectableLines.size === divergingLines.size) {
--      const allSelectableLinesAreDivergent = [...selectableLines].every(i =>
--        divergingLines.has(i)
--      )
--
--      if (allSelectableLinesAreDivergent) {
--        return this.defaultSelectionType === DiffSelectionType.All
--          ? DiffSelectionType.None
--          : DiffSelectionType.All
--      }
--    }
--
--    // Note that without any selectable lines we'll report partial selection
--    // as long as we have any diverging lines since we have no way of knowing
--    // if _all_ lines are divergent or not
--    return DiffSelectionType.Partial
--  }
--
--  /** Returns a value indicating wether the given line number is selected or not */
--  public isSelected(lineIndex: number): boolean {
--    const lineIsDivergent =
--      !!this.divergingLines && this.divergingLines.has(lineIndex)
--
--    if (this.defaultSelectionType === DiffSelectionType.All) {
--      return !lineIsDivergent
--    } else if (this.defaultSelectionType === DiffSelectionType.None) {
--      return lineIsDivergent
--    } else {
--      return assertNever(
--        this.defaultSelectionType,
--        `Unknown base selection type ${this.defaultSelectionType}`
--      )
--    }
--  }
--
--  /**
--   * Returns a value indicating wether the given line number is selectable.
--   * A line not being selectable usually means it's a hunk header or a context
--   * line.
--   */
--  public isSelectable(lineIndex: number): boolean {
--    return this.selectableLines ? this.selectableLines.has(lineIndex) : true
--  }
--
--  /**
--   * Returns a copy of this selection instance with the provided
--   * line selection update.
--   *
--   * @param lineIndex The index (line number) of the line which should
--   *                 be selected or unselected.
--   *
--   * @param selected Whether the given line number should be marked
--   *                 as selected or not.
--   */
--  public withLineSelection(
--    lineIndex: number,
--    selected: boolean
--  ): DiffSelection {
--    return this.withRangeSelection(lineIndex, 1, selected)
--  }
--
--  /**
--   * Returns a copy of this selection instance with the provided
--   * line selection update. This is similar to the withLineSelection
--   * method except that it allows updating the selection state of
--   * a range of lines at once. Use this if you ever need to modify
--   * the selection state of more than one line at a time as it's
--   * more efficient.
--   *
--   * @param from     The line index (inclusive) from where to start
--   *                 updating the line selection state.
--   *
--   * @param to       The number of lines for which to update the
--   *                 selection state. A value of zero means no lines
--   *                 are updated and a value of 1 means only the
--   *                 line given by lineIndex will be updated.
--   *
--   * @param selected Whether the lines should be marked as selected
--   *                 or not.
--   */
--  // Lower inclusive, upper exclusive. Same as substring
--  public withRangeSelection(
--    from: number,
--    length: number,
--    selected: boolean
--  ): DiffSelection {
--    const computedSelectionType = this.getSelectionType()
--    const to = from + length
--
--    // Nothing for us to do here. This state is when all lines are already
--    // selected and we're being asked to select more or when no lines are
--    // selected and we're being asked to unselect something.
--    if (typeMatchesSelection(computedSelectionType, selected)) {
--      return this
--    }
--
--    if (computedSelectionType === DiffSelectionType.Partial) {
--      const newDivergingLines = new Set<number>(this.divergingLines!)
--
--      if (typeMatchesSelection(this.defaultSelectionType, selected)) {
--        for (let i = from; i < to; i++) {
--          newDivergingLines.delete(i)
--        }
--      } else {
--        for (let i = from; i < to; i++) {
--          // Ensure it's selectable
--          if (this.isSelectable(i)) {
--            newDivergingLines.add(i)
--          }
--        }
--      }
--
--      return new DiffSelection(
--        this.defaultSelectionType,
--        newDivergingLines.size === 0 ? null : newDivergingLines,
--        this.selectableLines
--      )
--    } else {
--      const newDivergingLines = new Set<number>()
--      for (let i = from; i < to; i++) {
--        if (this.isSelectable(i)) {
--          newDivergingLines.add(i)
--        }
--      }
--
--      return new DiffSelection(
--        computedSelectionType,
--        newDivergingLines,
--        this.selectableLines
--      )
--    }
--  }
--
--  /**
--   * Returns a copy of this selection instance where the selection state
--   * of the specified line has been toggled (inverted).
--   *
--   * @param lineIndex The index (line number) of the line which should
--   *                 be selected or unselected.
--   */
--  public withToggleLineSelection(lineIndex: number): DiffSelection {
--    return this.withLineSelection(lineIndex, !this.isSelected(lineIndex))
--  }
--
--  /**
--   * Returns a copy of this selection instance with all lines selected.
--   */
--  public withSelectAll(): DiffSelection {
--    return new DiffSelection(DiffSelectionType.All, null, this.selectableLines)
--  }
--
--  /**
--   * Returns a copy of this selection instance with no lines selected.
--   */
--  public withSelectNone(): DiffSelection {
--    return new DiffSelection(DiffSelectionType.None, null, this.selectableLines)
--  }
--
--  /**
--   * Returns a copy of this selection instance with a specified set of
--   * selecable lines. By default a DiffSelection instance allows selecting
--   * all lines (in fact, it has no notion of how many lines exists or what
--   * it is that is being selected).
--   *
--   * If the selection instance lacks a set of selectable lines it can not
--   * supply an accurate value from getSelectionType when the selection of
--   * all lines have diverged from the default state (since it doesn't know
--   * what all lines mean).
--   */
--  public withSelectableLines(selectableLines: Set<number>) {
--    const divergingLines = this.divergingLines
--      ? new Set([...this.divergingLines].filter(x => selectableLines.has(x)))
--      : null
--
--    return new DiffSelection(
--      this.defaultSelectionType,
--      divergingLines,
--      selectableLines
--    )
--  }
--}
-merged
-  result 100644 60eb2b935fefe06923b8c583082cb80e3d1ab546 app/src/models/preferences.ts
-  our    100644 1e6d2e9845d5a06be700bd1a32d3c3d9f9624450 app/src/models/preferences.ts
-@@ -1,5 +1,6 @@
- export enum PreferencesTab {
-   Accounts = 0,
--  Git,
--  Advanced,
-+  Git = 1,
-+  Appearance = 2,
-+  Advanced = 3,
- }
-merged
-  result 100644 45aab006e858dbd9f456c01363c261af3c19e3d1 app/src/models/pull-request.ts
-  our    100644 a9a31a307d1ff252471481ad1b74adc64164f566 app/src/models/pull-request.ts
-@@ -29,6 +29,7 @@
- export interface ICommitStatus {
-   readonly id: number
-   readonly state: APIRefState
-+  readonly description: string
- }
-
- export class PullRequestStatus {
-merged
-  result 100644 6a4b61f9fe2be4768d09c5ba220b92bac6e36e4a app/src/models/repository.ts
-  our    100644 0602a86788419c4d0be13a0de4f8c5ac6b37a368 app/src/models/repository.ts
-@@ -1,6 +1,19 @@
- import * as Path from 'path'
-
- import { GitHubRepository } from './github-repository'
-+import { IAheadBehind } from './branch'
-+
-+function getBaseName(path: string): string {
-+  const baseName = Path.basename(path)
-+
-+  if (baseName.length === 0) {
-+    // the repository is at the root of the drive
-+    // -> show the full path here to show _something_
-+    return path
-+  }
-+
-+  return baseName
-+}
-
- /** A local repository. */
- export class Repository {
-@@ -21,8 +34,7 @@
-   ) {
-     this.path = path
-     this.gitHubRepository = gitHubRepository
--    this.name =
--      (gitHubRepository && gitHubRepository.name) || Path.basename(path)
-+    this.name = (gitHubRepository && gitHubRepository.name) || getBaseName(path)
-     this.id = id
-     this.missing = missing
-   }
-@@ -40,3 +52,18 @@
-       ${this.name}`
-   }
- }
-+
-+/**
-+ * A snapshot for the local state for a given repository
-+ */
-+export interface ILocalRepositoryState {
-+  /**
-+   * The ahead/behind count for the current branch, or `null` if no tracking
-+   * branch found.
-+   */
-+  readonly aheadBehind: IAheadBehind | null
-+  /**
-+   * The number of uncommitted changes currently in the repository.
-+   */
-+  readonly changedFilesCount: number
-+}
-merged
-  result 100644 54aa27904efa1f49453cd0037982138833b7f1cb app/src/models/status.ts
-  our    100644 c3c2f71e62048e24ae2152ec5bb51a37b4ec08b7 app/src/models/status.ts
-@@ -144,15 +144,14 @@
-   /** the status of the change to the file */
-   public readonly status: AppFileStatus
-
-+  /** An ID for the file change. */
-+  public readonly id: string
-+
-   public constructor(path: string, status: AppFileStatus, oldPath?: string) {
-     this.path = path
-     this.status = status
-     this.oldPath = oldPath
--  }
--
--  /** An ID for the file change. */
--  public get id(): string {
--    return `${this.status}+${this.path}`
-+    this.id = `${this.status}+${this.path}`
-   }
- }
-
-@@ -222,9 +221,9 @@
-   /**
-    * The list of changes in the repository's working directory
-    */
--  public readonly files: ReadonlyArray<WorkingDirectoryFileChange> = new Array<
--    WorkingDirectoryFileChange
--  >()
-+  public readonly files: ReadonlyArray<WorkingDirectoryFileChange> = []
-+
-+  private readonly fileIxById = new Map<string, number>()
-
-   /**
-    * Update the include checkbox state of the form
-@@ -245,6 +244,8 @@
-     includeAll: boolean | null
-   ) {
-     this.files = files
-+    files.forEach((f, ix) => this.fileIxById.set(f.id, ix))
-+
-     this.includeAll = includeAll
-   }
-
-@@ -258,7 +259,14 @@
-
-   /** Find the file with the given ID. */
-   public findFileWithID(id: string): WorkingDirectoryFileChange | null {
--    return this.files.find(f => f.id === id) || null
-+    const ix = this.fileIxById.get(id)
-+    return ix !== undefined ? this.files[ix] || null : null
-+  }
-+
-+  /** Find the index of the file with the given ID. Returns -1 if not found */
-+  public findFileIndexByID(id: string): number {
-+    const ix = this.fileIxById.get(id)
-+    return ix !== undefined ? ix : -1
-   }
- }
-
-merged
-  result 100644 0211c0b5855afc22280ee81441d290e4daf89f0e app/src/ui/add-repository/create-repository.tsx
-  our    100644 3d86dfd7278adf32d3ce543d8f78f9c4f6933522 app/src/ui/add-repository/create-repository.tsx
-@@ -28,7 +28,6 @@
- import { Octicon, OcticonSymbol } from '../octicons'
- import { LinkButton } from '../lib/link-button'
- import { PopupType } from '../../lib/app-state'
--import { pathExists } from '../../lib/file-system'
-
- /** The sentinel value used to indicate no gitignore should be used. */
- const NoGitIgnoreValue = 'None'
-@@ -150,25 +149,13 @@
-     this.setState({ isRepository, path })
-   }
-
--  private ensureDirectory(directory: string): Promise<void> {
--    return new Promise<void>((resolve, reject) => {
--      FSE.ensureDir(directory, err => {
--        if (err) {
--          return reject(err)
--        }
--
--        return resolve()
--      })
--    })
--  }
--
-   private resolveRepositoryRoot = async (): Promise<string> => {
-     const currentPath = this.state.path
-     if (this.props.initialPath && this.props.initialPath === currentPath) {
-       // if the user provided an initial path and didn't change it, we should
-       // validate it is an existing path and use that for the repository
-       try {
--        await this.ensureDirectory(currentPath)
-+        await FSE.ensureDir(currentPath)
-         return currentPath
-       } catch {}
-     }
-@@ -180,7 +167,7 @@
-     const fullPath = await this.resolveRepositoryRoot()
-
-     try {
--      await this.ensureDirectory(fullPath)
-+      await FSE.ensureDir(fullPath)
-       this.setState({ isValidPath: true })
-     } catch (e) {
-       if (e.code === 'EACCES' && e.errno === -13) {
-@@ -274,7 +261,7 @@
-
-     try {
-       const gitAttributes = Path.join(fullPath, '.gitattributes')
--      const gitAttributesExists = await pathExists(gitAttributes)
-+      const gitAttributesExists = await FSE.pathExists(gitAttributes)
-       if (!gitAttributesExists) {
-         await writeGitAttributes(fullPath)
-       }
-merged
-  result 100644 b273f0970ff626d4e8860c494a658b879c78503a app/src/ui/add-repository/git-attributes.ts
-  our    100644 d7e6abfb0bd7eeaaa62ff68f64385814404a2cf4 app/src/ui/add-repository/git-attributes.ts
-@@ -1,21 +1,12 @@
--import * as FS from 'fs'
--import * as Path from 'path'
-+import { writeFile } from 'fs-extra'
-+import { join } from 'path'
-
- /**
-  * Write the .gitAttributes file to the given repository
-  */
--export function writeGitAttributes(path: string): Promise<void> {
--  return new Promise<void>((resolve, reject) => {
--    const fullPath = Path.join(path, '.gitattributes')
--    const contents =
--      '# Auto detect text files and perform LF normalization\n* text=auto\n'
--
--    FS.writeFile(fullPath, contents, err => {
--      if (err) {
--        reject(err)
--      } else {
--        resolve()
--      }
--    })
--  })
-+export async function writeGitAttributes(path: string): Promise<void> {
-+  const fullPath = join(path, '.gitattributes')
-+  const contents =
-+    '# Auto detect text files and perform LF normalization\n* text=auto\n'
-+  await writeFile(fullPath, contents)
- }
-merged
-  result 100644 50809884f9200b94ab3e33a7b9ca96211cb72a25 app/src/ui/add-repository/gitignores.ts
-  our    100644 14b5e0408ca2ae8146e03d585d52e9f963963607 app/src/ui/add-repository/gitignores.ts
-@@ -1,5 +1,5 @@
- import * as Path from 'path'
--import * as Fs from 'fs'
-+import { readdir, writeFile, readFile } from 'fs-extra'
-
- const GitIgnoreExtension = '.gitignore'
-
-@@ -7,31 +7,22 @@
-
- let cachedGitIgnores: Map<string, string> | null = null
-
--function getCachedGitIgnores(): Promise<Map<string, string>> {
--  if (cachedGitIgnores) {
--    return Promise.resolve(cachedGitIgnores)
-+async function getCachedGitIgnores(): Promise<Map<string, string>> {
-+  if (cachedGitIgnores != null) {
-+    return cachedGitIgnores
-   } else {
--    return new Promise((resolve, reject) => {
--      Fs.readdir(root, (err, files) => {
--        if (err) {
--          reject(err)
--        } else {
--          const ignoreFiles = files.filter(file =>
--            file.endsWith(GitIgnoreExtension)
--          )
--
--          cachedGitIgnores = new Map()
--          for (const file of ignoreFiles) {
--            cachedGitIgnores.set(
--              Path.basename(file, GitIgnoreExtension),
--              Path.join(root, file)
--            )
--          }
-+    const files = await readdir(root)
-+    const ignoreFiles = files.filter(file => file.endsWith(GitIgnoreExtension))
-+
-+    cachedGitIgnores = new Map()
-+    for (const file of ignoreFiles) {
-+      cachedGitIgnores.set(
-+        Path.basename(file, GitIgnoreExtension),
-+        Path.join(root, file)
-+      )
-+    }
-
--          resolve(cachedGitIgnores)
--        }
--      })
--    })
-+    return cachedGitIgnores
-   }
- }
-
-@@ -45,25 +36,14 @@
- async function getGitIgnoreText(name: string): Promise<string> {
-   const gitIgnores = await getCachedGitIgnores()
-
--  return new Promise<string>((resolve, reject) => {
--    const path = gitIgnores.get(name)
--    if (!path) {
--      reject(
--        new Error(
--          `Unknown gitignore: ${name}. Only names returned from getGitIgnoreNames() can be used.`
--        )
--      )
--      return
--    }
-+  const path = gitIgnores.get(name)
-+  if (!path) {
-+    throw new Error(
-+      `Unknown gitignore: ${name}. Only names returned from getGitIgnoreNames() can be used.`
-+    )
-+  }
-
--    Fs.readFile(path, 'utf8', (err, data) => {
--      if (err) {
--        reject(err)
--      } else {
--        resolve(data)
--      }
--    })
--  })
-+  return await readFile(path, 'utf8')
- }
-
- /** Write the named gitignore to the repository. */
-@@ -72,16 +52,6 @@
-   name: string
- ): Promise<void> {
-   const fullPath = Path.join(repositoryPath, '.gitignore')
--
-   const text = await getGitIgnoreText(name)
--
--  return new Promise<void>((resolve, reject) => {
--    Fs.writeFile(fullPath, text, err => {
--      if (err) {
--        reject(err)
--      } else {
--        resolve()
--      }
--    })
--  })
-+  await writeFile(fullPath, text)
- }
-merged
-  result 100644 5bde560824e8c0b373e32c78a53dbc59473a8bdf app/src/ui/add-repository/licenses.ts
-  our    100644 faaef147afa4701451223362977b28ce2faa385f app/src/ui/add-repository/licenses.ts
-@@ -1,32 +1,13 @@
- import * as Path from 'path'
--import * as Fs from 'fs'
--
--interface IFrontMatterResult<T> {
--  readonly attributes: T
--  readonly body: string
--}
--
--const frontMatter: <T>(
--  path: string
--) => IFrontMatterResult<T> = require('front-matter')
--
--interface IChooseALicense {
--  readonly title: string
--  readonly nickname?: string
--  readonly featured?: boolean
--  readonly hidden?: boolean
--}
-+import { writeFile, readFile } from 'fs-extra'
-
- export interface ILicense {
-   /** The human-readable name. */
-   readonly name: string
--
-   /** Is the license featured? */
-   readonly featured: boolean
--
-   /** The actual text of the license. */
-   readonly body: string
--
-   /** Whether to hide the license from the standard list */
-   readonly hidden: boolean
- }
-@@ -39,65 +20,32 @@
-   readonly year: string
- }
-
--const root = Path.join(__dirname, 'static', 'choosealicense.com', '_licenses')
--
- let cachedLicenses: ReadonlyArray<ILicense> | null = null
-
--function readFileAsync(path: string): Promise<string> {
--  return new Promise((resolve, reject) => {
--    Fs.readFile(path, 'utf8', (err, data) => {
--      if (err) {
--        reject(err)
--      } else {
--        resolve(data)
--      }
--    })
--  })
--}
--
- /** Get the available licenses. */
--export function getLicenses(): Promise<ReadonlyArray<ILicense>> {
--  if (cachedLicenses) {
--    return Promise.resolve(cachedLicenses)
-+export async function getLicenses(): Promise<ReadonlyArray<ILicense>> {
-+  if (cachedLicenses != null) {
-+    return cachedLicenses
-   } else {
--    return new Promise((resolve, reject) => {
--      Fs.readdir(root, async (err, files) => {
--        if (err) {
--          reject(err)
--        } else {
--          const licenses = new Array<ILicense>()
--          for (const file of files) {
--            const fullPath = Path.join(root, file)
--            const contents = await readFileAsync(fullPath)
--            const result = frontMatter<IChooseALicense>(contents)
--            const license: ILicense = {
--              name: result.attributes.nickname || result.attributes.title,
--              featured: result.attributes.featured || false,
--              hidden:
--                result.attributes.hidden === undefined ||
--                result.attributes.hidden,
--              body: result.body.trim(),
--            }
--
--            if (!license.hidden) {
--              licenses.push(license)
--            }
--          }
--
--          cachedLicenses = licenses.sort((a, b) => {
--            if (a.featured) {
--              return -1
--            }
--            if (b.featured) {
--              return 1
--            }
--            return a.name.localeCompare(b.name)
--          })
--
--          resolve(cachedLicenses)
--        }
--      })
-+    const licensesMetadataPath = Path.join(
-+      __dirname,
-+      'static',
-+      'available-licenses.json'
-+    )
-+    const json = await readFile(licensesMetadataPath, 'utf8')
-+    const licenses: Array<ILicense> = JSON.parse(json)
-+
-+    cachedLicenses = licenses.sort((a, b) => {
-+      if (a.featured) {
-+        return -1
-+      }
-+      if (b.featured) {
-+        return 1
-+      }
-+      return a.name.localeCompare(b.name)
-     })
-+
-+    return cachedLicenses
-   }
- }
-
-@@ -127,29 +75,21 @@
- }
-
- /** Write the license to the the repository at the given path. */
--export function writeLicense(
-+export async function writeLicense(
-   repositoryPath: string,
-   license: ILicense,
-   fields: ILicenseFields
- ): Promise<void> {
-   const fullPath = Path.join(repositoryPath, 'LICENSE')
-
--  return new Promise<void>((resolve, reject) => {
--    const tokens: ReadonlyArray<keyof ILicenseFields> = [
--      'fullname',
--      'email',
--      'project',
--      'description',
--      'year',
--    ]
--    const body = replaceTokens(license.body, tokens, fields)
-+  const tokens: ReadonlyArray<keyof ILicenseFields> = [
-+    'fullname',
-+    'email',
-+    'project',
-+    'description',
-+    'year',
-+  ]
-
--    Fs.writeFile(fullPath, body, err => {
--      if (err) {
--        reject(err)
--      } else {
--        resolve()
--      }
--    })
--  })
-+  const body = replaceTokens(license.body, tokens, fields)
-+  await writeFile(fullPath, body)
- }
-merged
-  result 100644 f05ce45411eea70997e13c55b77d039e2aa1aa8a app/src/ui/add-repository/write-default-readme.ts
-  our    100644 a9ee5d9ef7fc5782a321218da5ad12f8d34d00d3 app/src/ui/add-repository/write-default-readme.ts
-@@ -1,4 +1,4 @@
--import * as FS from 'fs'
-+import { writeFile } from 'fs-extra'
- import * as Path from 'path'
-
- const DefaultReadmeName = 'README.md'
-@@ -10,16 +10,11 @@
- /**
-  * Write the default README to the repository with the given name at the path.
-  */
--export function writeDefaultReadme(path: string, name: string): Promise<void> {
--  return new Promise<void>((resolve, reject) => {
--    const fullPath = Path.join(path, DefaultReadmeName)
--    const contents = defaultReadmeContents(name)
--    FS.writeFile(fullPath, contents, err => {
--      if (err) {
--        reject(err)
--      } else {
--        resolve()
--      }
--    })
--  })
-+export async function writeDefaultReadme(
-+  path: string,
-+  name: string
-+): Promise<void> {
-+  const fullPath = Path.join(path, DefaultReadmeName)
-+  const contents = defaultReadmeContents(name)
-+  await writeFile(fullPath, contents)
- }
-merged
-  result 100644 6a7921a17b2a7c87f83e400e06329fc525ad046e app/src/ui/app-menu/menu-pane.tsx
-  our    100644 d7e43d00cd07bd5561699a12da541ef471cb3b55 app/src/ui/app-menu/menu-pane.tsx
-@@ -180,7 +180,7 @@
-     }
-   }
-
--  private onSelectionChanged = (row: number, source: SelectionSource) => {
-+  private onSelectedRowChanged = (row: number, source: SelectionSource) => {
-     const item = this.state.items[row]
-     this.props.onSelectionChanged(this.props.depth, item, source)
-   }
-@@ -276,9 +276,9 @@
-           rowCount={this.state.items.length}
-           rowHeight={this.rowHeight}
-           rowRenderer={this.renderMenuItem}
--          selectedRow={this.state.selectedIndex}
-+          selectedRows={[this.state.selectedIndex]}
-           onRowClick={this.onRowClick}
--          onSelectionChanged={this.onSelectionChanged}
-+          onSelectedRowChanged={this.onSelectedRowChanged}
-           canSelectRow={this.canSelectRow}
-           onRowKeyDown={this.onRowKeyDown}
-           invalidationProps={this.state.items}
-added in remote
-  their  100644 eab8b92d267a41b8ab8c40c65e3237393641ccfc app/src/ui/app-theme.tsx
-@@ -0,0 +1,59 @@
-+import * as React from 'react'
-+import { ApplicationTheme, getThemeName } from './lib/application-theme'
-+
-+interface IAppThemeProps {
-+  readonly theme: ApplicationTheme
-+}
-+
-+/**
-+ * A pseudo-component responsible for adding the applicable CSS
-+ * class names to the body tag in order to apply the currently
-+ * selected theme.
-+ *
-+ * This component is a PureComponent, meaning that it'll only
-+ * render when its props changes (shallow comparison).
-+ *
-+ * This component does not render anything into the DOM, it's
-+ * purely (a)busing the component lifecycle to manipulate the
-+ * body class list.
-+ */
-+export class AppTheme extends React.PureComponent<IAppThemeProps> {
-+  public componentDidMount() {
-+    this.ensureTheme()
-+  }
-+
-+  public componentDidUpdate() {
-+    this.ensureTheme()
-+  }
-+
-+  public componentWillUnmount() {
-+    this.clearThemes()
-+  }
-+
-+  private ensureTheme() {
-+    const newThemeClassName = `theme-${getThemeName(this.props.theme)}`
-+    const body = document.body
-+
-+    if (body.classList.contains(newThemeClassName)) {
-+      return
-+    }
-+
-+    this.clearThemes()
-+
-+    body.classList.add(newThemeClassName)
-+  }
-+
-+  private clearThemes() {
-+    const body = document.body
-+
-+    for (const className of body.classList) {
-+      if (className.startsWith('theme-')) {
-+        body.classList.remove(className)
-+      }
-+    }
-+  }
-+
-+  public render() {
-+    return null
-+  }
-+}
-merged
-  result 100644 7355227d8f5b8d4c7153b94c7da59781e776bd0d app/src/ui/app.tsx
-  our    100644 0349874c603d03e5db59f73672f53d9b9f74f464 app/src/ui/app.tsx
-@@ -1,14 +1,15 @@
- import * as React from 'react'
--import { ipcRenderer } from 'electron'
-+import { ipcRenderer, remote } from 'electron'
- import { CSSTransitionGroup } from 'react-transition-group'
-
- import {
-   IAppState,
--  RepositorySection,
-+  RepositorySectionTab,
-   Popup,
-   PopupType,
-   FoldoutType,
-   SelectionType,
-+  CompareActionKind,
- } from '../lib/app-state'
- import { Dispatcher } from '../lib/dispatcher'
- import { AppStore } from '../lib/stores'
-@@ -85,12 +86,17 @@
- import { InitializeLFS, AttributeMismatch } from './lfs'
- import { UpstreamAlreadyExists } from './upstream-already-exists'
- import { DeletePullRequest } from './delete-branch/delete-pull-request-dialog'
-+import { MergeConflictsWarning } from './merge-conflicts'
-+import { AppTheme } from './app-theme'
-+import { ApplicationTheme } from './lib/application-theme'
-
- /** The interval at which we should check for updates. */
- const UpdateCheckInterval = 1000 * 60 * 60 * 4
-
- const SendStatsInterval = 1000 * 60 * 60 * 4
-
-+const updateRepoInfoInterval = 1000 * 60 * 5
-+
- interface IAppProps {
-   readonly dispatcher: Dispatcher
-   readonly appStore: AppStore
-@@ -145,6 +151,10 @@
-         },
-         { timeout: ReadyDelay }
-       )
-+
-+      window.setInterval(() => {
-+        this.props.appStore.refreshAllRepositories()
-+      }, updateRepoInfoInterval)
-     })
-
-     this.state = props.appStore.getState()
-@@ -241,10 +251,10 @@
-         return this.push()
-       case 'pull':
-         return this.pull()
--      case 'select-changes':
--        return this.selectChanges()
--      case 'select-history':
--        return this.selectHistory()
-+      case 'show-changes':
-+        return this.showChanges()
-+      case 'show-history':
-+        return this.showHistory()
-       case 'choose-repository':
-         return this.chooseRepository()
-       case 'add-local-repository':
-@@ -265,16 +275,23 @@
-         return this.props.dispatcher.showPopup({ type: PopupType.Preferences })
-       case 'open-working-directory':
-         return this.openCurrentRepositoryWorkingDirectory()
--      case 'update-branch':
-+      case 'update-branch': {
-+        this.props.dispatcher.recordMenuInitiatedUpdate()
-         return this.updateBranch()
--      case 'merge-branch':
-+      }
-+      case 'compare-to-branch': {
-+        return this.showHistory(true)
-+      }
-+      case 'merge-branch': {
-+        this.props.dispatcher.recordMenuInitiatedMerge()
-         return this.mergeBranch()
-+      }
-       case 'show-repository-settings':
-         return this.showRepositorySettings()
-       case 'view-repository-on-github':
-         return this.viewRepositoryOnGitHub()
--      case 'compare-branch':
--        return this.compareBranch()
-+      case 'compare-on-github':
-+        return this.compareBranchOnDotcom()
-       case 'open-in-shell':
-         return this.openCurrentRepositoryInShell()
-       case 'clone-repository':
-@@ -290,11 +307,31 @@
-         return this.props.dispatcher.installCLI()
-       case 'open-external-editor':
-         return this.openCurrentRepositoryInExternalEditor()
-+      case 'select-all':
-+        return this.selectAll()
-     }
-
-     return assertNever(name, `Unknown menu event name: ${name}`)
-   }
-
-+  /**
-+   * Handler for the 'select-all' menu event, dispatches
-+   * a custom DOM event originating from the element which
-+   * currently has keyboard focus. Components have a chance
-+   * to intercept this event and implement their own 'select
-+   * all' logic.
-+   */
-+  private selectAll() {
-+    const event = new CustomEvent('select-all', {
-+      bubbles: true,
-+      cancelable: true,
-+    })
-+
-+    if (document.activeElement.dispatchEvent(event)) {
-+      remote.getCurrentWebContents().selectAll()
-+    }
-+  }
-+
-   private boomtown() {
-     setImmediate(() => {
-       throw new Error('Boomtown!')
-@@ -360,7 +397,7 @@
-     })
-   }
-
--  private compareBranch() {
-+  private compareBranchOnDotcom() {
-     const htmlURL = this.getCurrentRepositoryGitHubURL()
-     if (!htmlURL) {
-       return
-@@ -461,20 +498,30 @@
-     this.props.dispatcher.showPopup({ type: PopupType.About })
-   }
-
--  private selectChanges() {
-+  private async showHistory(showBranchList: boolean = false) {
-     const state = this.state.selectedState
-     if (state == null || state.type !== SelectionType.Repository) {
-       return
-     }
-
--    this.props.dispatcher.closeCurrentFoldout()
--    this.props.dispatcher.changeRepositorySection(
-+    await this.props.dispatcher.closeCurrentFoldout()
-+
-+    await this.props.dispatcher.initializeCompare(state.repository, {
-+      kind: CompareActionKind.History,
-+    })
-+
-+    await this.props.dispatcher.changeRepositorySection(
-       state.repository,
--      RepositorySection.Changes
-+      RepositorySectionTab.History
-     )
-+
-+    await this.props.dispatcher.updateCompareForm(state.repository, {
-+      filterText: '',
-+      showBranchList,
-+    })
-   }
-
--  private selectHistory() {
-+  private showChanges() {
-     const state = this.state.selectedState
-     if (state == null || state.type !== SelectionType.Repository) {
-       return
-@@ -483,7 +530,7 @@
-     this.props.dispatcher.closeCurrentFoldout()
-     this.props.dispatcher.changeRepositorySection(
-       state.repository,
--      RepositorySection.History
-+      RepositorySectionTab.Changes
-     )
-   }
-
-@@ -934,6 +981,11 @@
-           />
-         )
-       case PopupType.ConfirmDiscardChanges:
-+        const showSetting =
-+          popup.showDiscardChangesSetting === undefined
-+            ? true
-+            : popup.showDiscardChangesSetting
-+
-         return (
-           <DiscardChanges
-             key="discard-changes"
-@@ -943,6 +995,7 @@
-             confirmDiscardChanges={
-               this.state.askForConfirmationOnDiscardChanges
-             }
-+            showDiscardChangesSetting={showSetting}
-             onDismissed={this.onPopupDismissed}
-             onConfirmDiscardChangesChanged={this.onConfirmDiscardChangesChanged}
-           />
-@@ -965,10 +1018,11 @@
-             enterpriseAccount={this.getEnterpriseAccount()}
-             onDismissed={this.onPopupDismissed}
-             selectedShell={this.state.selectedShell}
-+            selectedTheme={this.state.selectedTheme}
-           />
-         )
-       case PopupType.MergeBranch: {
--        const repository = popup.repository
-+        const { repository, branch } = popup
-         const state = this.props.appStore.getRepositoryState(repository)
-
-         const tip = state.branchesState.tip
-@@ -983,6 +1037,7 @@
-             defaultBranch={state.branchesState.defaultBranch}
-             recentBranches={state.branchesState.recentBranches}
-             currentBranch={currentBranch}
-+            initialBranch={branch}
-             onDismissed={this.onPopupDismissed}
-           />
-         )
-@@ -1204,6 +1259,14 @@
-             pullRequest={popup.pullRequest}
-           />
-         )
-+      case PopupType.MergeConflicts:
-+        return (
-+          <MergeConflictsWarning
-+            dispatcher={this.props.dispatcher}
-+            repository={popup.repository}
-+            onDismissed={this.onPopupDismissed}
-+          />
-+        )
-       default:
-         return assertNever(popup, `Unknown popup type: ${popup}`)
-     }
-@@ -1337,12 +1400,17 @@
-         selectedRepository={selectedRepository}
-         onSelectionChanged={this.onSelectionChanged}
-         repositories={this.state.repositories}
-+        localRepositoryStateLookup={this.state.localRepositoryStateLookup}
-+        askForConfirmationOnRemoveRepository={
-+          this.state.askForConfirmationOnRepositoryRemoval
-+        }
-         onRemoveRepository={this.removeRepository}
-         onOpenInShell={this.openInShell}
-         onShowRepository={this.showRepository}
-         onOpenInExternalEditor={this.openInExternalEditor}
-         externalEditorLabel={externalEditorLabel}
-         shellLabel={shellLabel}
-+        dispatcher={this.props.dispatcher}
-       />
-     )
-   }
-@@ -1355,8 +1423,8 @@
-     this.props.dispatcher.openShell(repository.path)
-   }
-
--  private openFileInExternalEditor = (path: string) => {
--    this.props.dispatcher.openInExternalEditor(path)
-+  private openFileInExternalEditor = (fullPath: string) => {
-+    this.props.dispatcher.openInExternalEditor(fullPath)
-   }
-
-   private openInExternalEditor = (
-@@ -1409,6 +1477,8 @@
-
-     const currentState: DropdownState = isOpen ? 'open' : 'closed'
-
-+    const tooltip = repository && !isOpen ? repository.path : undefined
-+
-     const foldoutStyle: React.CSSProperties = {
-       position: 'absolute',
-       marginLeft: 0,
-@@ -1422,6 +1492,7 @@
-         icon={icon}
-         title={title}
-         description={__DARWIN__ ? 'Current Repository' : 'Current repository'}
-+        tooltip={tooltip}
-         foldoutStyle={foldoutStyle}
-         onDropdownStateChanged={this.onRepositoryDropdownStateChanged}
-         dropdownContentRenderer={this.renderRepositoryList}
-@@ -1594,26 +1665,27 @@
-     }
-
-     if (selectedState.type === SelectionType.Repository) {
--      const externalEditorLabel = this.state.selectedExternalEditor
-+      const externalEditorLabel = state.selectedExternalEditor
-
-       return (
-         <RepositoryView
-           repository={selectedState.repository}
-           state={selectedState.state}
-           dispatcher={this.props.dispatcher}
--          emoji={this.state.emoji}
--          sidebarWidth={this.state.sidebarWidth}
--          commitSummaryWidth={this.state.commitSummaryWidth}
-+          emoji={state.emoji}
-+          sidebarWidth={state.sidebarWidth}
-+          commitSummaryWidth={state.commitSummaryWidth}
-           issuesStore={this.props.appStore.issuesStore}
-           gitHubUserStore={this.props.appStore.gitHubUserStore}
-           onViewCommitOnGitHub={this.onViewCommitOnGitHub}
--          imageDiffType={this.state.imageDiffType}
-+          imageDiffType={state.imageDiffType}
-           askForConfirmationOnDiscardChanges={
--            this.state.askForConfirmationOnDiscardChanges
-+            state.askForConfirmationOnDiscardChanges
-           }
--          accounts={this.state.accounts}
-+          accounts={state.accounts}
-           externalEditorLabel={externalEditorLabel}
-           onOpenInExternalEditor={this.openFileInExternalEditor}
-+          isDivergingBranchBannerVisible={state.isDivergingBranchBannerVisible}
-         />
-       )
-     } else if (selectedState.type === SelectionType.CloningRepository) {
-@@ -1652,8 +1724,13 @@
-
-     const className = this.state.appIsFocused ? 'focused' : 'blurred'
-
-+    const currentTheme = this.state.showWelcomeFlow
-+      ? ApplicationTheme.Light
-+      : this.state.selectedTheme
-+
-     return (
-       <div id="desktop-app-chrome" className={className}>
-+        <AppTheme theme={currentTheme} />
-         {this.renderTitlebar()}
-         {this.state.showWelcomeFlow
-           ? this.renderWelcomeFlow()
-merged
-  result 100644 ffb19e643f39201e7668941e3125223f6319fdd7 app/src/ui/autocompletion/autocompleting-text-input.tsx
-  our    100644 fa4fe8265157ad6e485388bac030717e2e634543 app/src/ui/autocompletion/autocompleting-text-input.tsx
-@@ -1,5 +1,10 @@
- import * as React from 'react'
--import { List, SelectionSource } from '../lib/list'
-+import {
-+  List,
-+  SelectionSource,
-+  findNextSelectableRow,
-+  SelectionDirection,
-+} from '../lib/list'
- import { IAutocompletionProvider } from './index'
- import { fatalError } from '../../lib/fatal-error'
- import * as classNames from 'classnames'
-@@ -28,6 +33,9 @@
-   /** Disabled state for input field. */
-   readonly disabled?: boolean
-
-+  /** Indicates if input field should be required */
-+  readonly isRequired?: boolean
-+
-   /**
-    * Called when the user changes the value in the input field.
-    */
-@@ -96,7 +104,6 @@
-   IAutocompletingTextInputState<Object>
- > {
-   private element: ElementType | null = null
--  private autocompletionList: List | null = null
-
-   /** The identifier for each autocompletion request. */
-   private autocompletionRequestID = 0
-@@ -122,10 +129,6 @@
-     )
-   }
-
--  private storeAutocompletionListRef = (ref: List | null) => {
--    this.autocompletionList = ref
--  }
--
-   private renderAutocompletions() {
-     const state = this.state.autocompletionState
-     if (!state) {
-@@ -180,17 +183,16 @@
-     return (
-       <div className={className} style={{ top, left, height }}>
-         <List
--          ref={this.storeAutocompletionListRef}
-           rowCount={items.length}
-           rowHeight={RowHeight}
--          selectedRow={selectedRow}
-+          selectedRows={[selectedRow]}
-           rowRenderer={this.renderItem}
-           scrollToRow={selectedRow}
-           selectOnHover={true}
-           focusOnHover={false}
-           onRowMouseDown={this.onRowMouseDown}
-           onRowClick={this.insertCompletionOnClick}
--          onSelectionChanged={this.onSelectionChanged}
-+          onSelectedRowChanged={this.onSelectedRowChanged}
-           invalidationProps={searchText}
-         />
-       </div>
-@@ -211,7 +213,7 @@
-     }
-   }
-
--  private onSelectionChanged = (row: number, source: SelectionSource) => {
-+  private onSelectedRowChanged = (row: number, source: SelectionSource) => {
-     const currentAutoCompletionState = this.state.autocompletionState
-
-     if (!currentAutoCompletionState) {
-@@ -270,6 +272,7 @@
-       onBlur: this.onBlur,
-       onContextMenu: this.onContextMenu,
-       disabled: this.props.disabled,
-+      'aria-required': this.props.isRequired ? true : false,
-     }
-
-     return React.createElement<React.HTMLAttributes<ElementType>, ElementType>(
-@@ -363,7 +366,7 @@
-
-   private getMovementDirection(
-     event: React.KeyboardEvent<any>
--  ): 'up' | 'down' | null {
-+  ): SelectionDirection | null {
-     switch (event.key) {
-       case 'ArrowUp':
-         return 'up'
-@@ -401,11 +404,12 @@
-     const direction = this.getMovementDirection(event)
-     if (direction) {
-       event.preventDefault()
-+      const rowCount = currentAutoCompletionState.items.length
-
--      const nextRow = this.autocompletionList!.nextSelectableRow(
-+      const nextRow = findNextSelectableRow(rowCount, {
-         direction,
--        selectedRow
--      )
-+        row: selectedRow,
-+      })
-
-       if (nextRow !== null) {
-         const newSelectedItem = currentAutoCompletionState.items[nextRow]
-added in remote
-  their  100644 474f18ccb67239743953eda7f33488769a615c05 app/src/ui/branches/branch-list-item.tsx
-@@ -0,0 +1,49 @@
-+import * as React from 'react'
-+import * as moment from 'moment'
-+
-+import { IMatches } from '../../lib/fuzzy-find'
-+
-+import { Octicon, OcticonSymbol } from '../octicons'
-+import { HighlightText } from '../lib/highlight-text'
-+
-+interface IBranchListItemProps {
-+  /** The name of the branch */
-+  readonly name: string
-+
-+  /** Specifies whether this item is currently selected */
-+  readonly isCurrentBranch: boolean
-+
-+  /** The date may be null if we haven't loaded the tip commit yet. */
-+  readonly lastCommitDate: Date | null
-+
-+  /** The characters in the branch name to highlight */
-+  readonly matches: IMatches
-+}
-+
-+/** The branch component. */
-+export class BranchListItem extends React.Component<IBranchListItemProps, {}> {
-+  public render() {
-+    const lastCommitDate = this.props.lastCommitDate
-+    const isCurrentBranch = this.props.isCurrentBranch
-+    const name = this.props.name
-+
-+    const date = lastCommitDate ? moment(lastCommitDate).fromNow() : ''
-+    const icon = isCurrentBranch ? OcticonSymbol.check : OcticonSymbol.gitBranch
-+    const infoTitle = isCurrentBranch
-+      ? 'Current branch'
-+      : lastCommitDate
-+        ? lastCommitDate.toString()
-+        : ''
-+    return (
-+      <div className="branches-list-item">
-+        <Octicon className="icon" symbol={icon} />
-+        <div className="name" title={name}>
-+          <HighlightText text={name} highlight={this.props.matches.title} />
-+        </div>
-+        <div className="description" title={infoTitle}>
-+          {date}
-+        </div>
-+      </div>
-+    )
-+  }
-+}
-merged
-  result 100644 d64fb68c7b730c7a0bbccfb64e4a8acf364fd5e9 app/src/ui/branches/branch-list.tsx
-  our    100644 32bcadc42b0cd4c81a0fadc6da4c43b862a2c902 app/src/ui/branches/branch-list.tsx
-@@ -1,27 +1,24 @@
- import * as React from 'react'
-+
- import { Branch } from '../../models/branch'
--import {
--  groupBranches,
--  IBranchListItem,
--  BranchGroupIdentifier,
--} from './group-branches'
--import { BranchListItem } from './branch'
-+
-+import { assertNever } from '../../lib/fatal-error'
-+
- import {
-   FilterList,
-   IFilterListGroup,
-   SelectionSource,
- } from '../lib/filter-list'
--import { assertNever } from '../../lib/fatal-error'
-+import { IMatches } from '../../lib/fuzzy-find'
- import { Button } from '../lib/button'
--import { NoBranches } from './no-branches'
-+import { TextBox } from '../lib/text-box'
-
--/**
-- * TS can't parse generic specialization in JSX, so we have to alias it here
-- * with the generic type. See https://github.com/Microsoft/TypeScript/issues/6395.
-- */
--const BranchesFilterList: new () => FilterList<
--  IBranchListItem
--> = FilterList as any
-+import {
-+  groupBranches,
-+  IBranchListItem,
-+  BranchGroupIdentifier,
-+} from './group-branches'
-+import { NoBranches } from './no-branches'
-
- const RowHeight = 30
-
-@@ -91,6 +88,16 @@
-    * to prepopulate the new branch name field.
-    */
-   readonly onCreateNewBranch?: (name: string) => void
-+
-+  readonly textbox?: TextBox
-+
-+  /**
-+   * Render function to apply to each branch in the list
-+   */
-+  readonly renderBranch: (
-+    item: IBranchListItem,
-+    matches: IMatches
-+  ) => JSX.Element
- }
-
- interface IBranchListState {
-@@ -138,30 +145,77 @@
-   IBranchListProps,
-   IBranchListState
- > {
-+  private branchFilterList: FilterList<IBranchListItem> | null = null
-+
-   public constructor(props: IBranchListProps) {
-     super(props)
-     this.state = createState(props)
-   }
-
--  private renderItem = (
--    item: IBranchListItem,
--    matches: ReadonlyArray<number>
--  ) => {
--    const branch = item.branch
--    const commit = branch.tip
--    const currentBranchName = this.props.currentBranch
--      ? this.props.currentBranch.name
--      : null
-+  public componentWillReceiveProps(nextProps: IBranchListProps) {
-+    this.setState(createState(nextProps))
-+  }
-+
-+  public selectFirstItem(focus: boolean = false) {
-+    if (this.branchFilterList !== null) {
-+      this.branchFilterList.selectFirstItem(focus)
-+    }
-+  }
-+
-+  public render() {
-     return (
--      <BranchListItem
--        name={branch.name}
--        isCurrentBranch={branch.name === currentBranchName}
--        lastCommitDate={commit ? commit.author.date : null}
--        matches={matches}
-+      <FilterList<IBranchListItem>
-+        ref={this.onBranchesFilterListRef}
-+        className="branches-list"
-+        rowHeight={RowHeight}
-+        filterText={this.props.filterText}
-+        onFilterTextChanged={this.props.onFilterTextChanged}
-+        onFilterKeyDown={this.props.onFilterKeyDown}
-+        selectedItem={this.state.selectedItem}
-+        renderItem={this.renderItem}
-+        renderGroupHeader={this.renderGroupHeader}
-+        onItemClick={this.onItemClick}
-+        onSelectionChanged={this.onSelectionChanged}
-+        groups={this.state.groups}
-+        invalidationProps={this.props.allBranches}
-+        renderPostFilter={this.onRenderNewButton}
-+        renderNoItems={this.onRenderNoItems}
-+        filterTextBox={this.props.textbox}
-       />
-     )
-   }
-
-+  private onBranchesFilterListRef = (
-+    filterList: FilterList<IBranchListItem> | null
-+  ) => {
-+    this.branchFilterList = filterList
-+  }
-+
-+  private renderItem = (item: IBranchListItem, matches: IMatches) => {
-+    return this.props.renderBranch(item, matches)
-+  }
-+
-+  private parseHeader(label: string): BranchGroupIdentifier | null {
-+    switch (label) {
-+      case 'default':
-+      case 'recent':
-+      case 'other':
-+        return label
-+      default:
-+        return null
-+    }
-+  }
-+
-+  private renderGroupHeader = (label: string) => {
-+    const identifier = this.parseHeader(label)
-+
-+    return identifier !== null ? (
-+      <div className="branches-list-content filter-list-group-header">
-+        {this.getGroupLabel(identifier)}
-+      </div>
-+    ) : null
-+  }
-+
-   private getGroupLabel(identifier: BranchGroupIdentifier) {
-     if (identifier === 'default') {
-       return __DARWIN__ ? 'Default Branch' : 'Default branch'
-@@ -174,15 +228,23 @@
-     }
-   }
-
--  private renderGroupHeader = (id: string) => {
--    const identifier = id as BranchGroupIdentifier
-+  private onRenderNoItems = () => {
-     return (
--      <div className="branches-list-content filter-list-group-header">
--        {this.getGroupLabel(identifier)}
--      </div>
-+      <NoBranches
-+        onCreateNewBranch={this.onCreateNewBranch}
-+        canCreateNewBranch={this.props.canCreateNewBranch}
-+      />
-     )
-   }
-
-+  private onRenderNewButton = () => {
-+    return this.props.canCreateNewBranch ? (
-+      <Button className="new-branch-button" onClick={this.onCreateNewBranch}>
-+        {__DARWIN__ ? 'New Branch' : 'New branch'}
-+      </Button>
-+    ) : null
-+  }
-+
-   private onItemClick = (item: IBranchListItem) => {
-     if (this.props.onItemClick) {
-       this.props.onItemClick(item.branch)
-@@ -201,52 +263,6 @@
-     }
-   }
-
--  public componentWillReceiveProps(nextProps: IBranchListProps) {
--    this.setState(createState(nextProps))
--  }
--
--  public render() {
--    return (
--      <BranchesFilterList
--        className="branches-list"
--        rowHeight={RowHeight}
--        filterText={this.props.filterText}
--        onFilterTextChanged={this.props.onFilterTextChanged}
--        onFilterKeyDown={this.props.onFilterKeyDown}
--        selectedItem={this.state.selectedItem}
--        renderItem={this.renderItem}
--        renderGroupHeader={this.renderGroupHeader}
--        onItemClick={this.onItemClick}
--        onSelectionChanged={this.onSelectionChanged}
--        groups={this.state.groups}
--        invalidationProps={this.props.allBranches}
--        renderPostFilter={this.renderNewButton}
--        renderNoItems={this.renderNoItems}
--      />
--    )
--  }
--
--  private renderNoItems = () => {
--    return (
--      <NoBranches
--        onCreateNewBranch={this.onCreateNewBranch}
--        canCreateNewBranch={this.props.canCreateNewBranch}
--      />
--    )
--  }
--
--  private renderNewButton = () => {
--    if (this.props.canCreateNewBranch) {
--      return (
--        <Button className="new-branch-button" onClick={this.onCreateNewBranch}>
--          {__DARWIN__ ? 'New Branch' : 'New branch'}
--        </Button>
--      )
--    } else {
--      return null
--    }
--  }
--
-   private onCreateNewBranch = () => {
-     if (this.props.onCreateNewBranch) {
-       this.props.onCreateNewBranch(this.props.filterText)
-added in remote
-  their  100644 dd27f7b0f40a3be55aa8a51cd83f116cf289c7e6 app/src/ui/branches/branch-renderer.tsx
-@@ -0,0 +1,25 @@
-+import * as React from 'react'
-+
-+import { Branch } from '../../models/branch'
-+
-+import { IBranchListItem } from './group-branches'
-+import { BranchListItem } from './branch-list-item'
-+import { IMatches } from '../../lib/fuzzy-find'
-+
-+export function renderDefaultBranch(
-+  item: IBranchListItem,
-+  matches: IMatches,
-+  currentBranch: Branch | null
-+): JSX.Element {
-+  const branch = item.branch
-+  const commit = branch.tip
-+  const currentBranchName = currentBranch ? currentBranch.name : null
-+  return (
-+    <BranchListItem
-+      name={branch.name}
-+      isCurrentBranch={branch.name === currentBranchName}
-+      lastCommitDate={commit ? commit.author.date : null}
-+      matches={matches}
-+    />
-+  )
-+}
-removed in remote
-  base   100644 a0b819ee744d244551744b38bdf6cc5ab5cfd9bf app/src/ui/branches/branch.tsx
-  our    100644 a0b819ee744d244551744b38bdf6cc5ab5cfd9bf app/src/ui/branches/branch.tsx
-@@ -1,42 +0,0 @@
--import * as React from 'react'
--import * as moment from 'moment'
--
--import { Octicon, OcticonSymbol } from '../octicons'
--import { HighlightText } from '../lib/highlight-text'
--
--interface IBranchProps {
--  readonly name: string
--  readonly isCurrentBranch: boolean
--
--  /** The date may be null if we haven't loaded the tip commit yet. */
--  readonly lastCommitDate: Date | null
--
--  /** The characters in the branch name to highlight */
--  readonly matches: ReadonlyArray<number>
--}
--
--/** The branch component. */
--export class BranchListItem extends React.Component<IBranchProps, {}> {
--  public render() {
--    const lastCommitDate = this.props.lastCommitDate
--    const isCurrentBranch = this.props.isCurrentBranch
--    const name = this.props.name
--
--    const date = lastCommitDate ? moment(lastCommitDate).fromNow() : ''
--    const icon = isCurrentBranch ? OcticonSymbol.check : OcticonSymbol.gitBranch
--    const infoTitle = isCurrentBranch
--      ? 'Current branch'
--      : lastCommitDate ? lastCommitDate.toString() : ''
--    return (
--      <div className="branches-list-item">
--        <Octicon className="icon" symbol={icon} />
--        <div className="name" title={name}>
--          <HighlightText text={name} highlight={this.props.matches} />
--        </div>
--        <div className="description" title={infoTitle}>
--          {date}
--        </div>
--      </div>
--    )
--  }
--}
-merged
-  result 100644 13f691705648f0b7a0f7303372de8f2db79f3d76 app/src/ui/branches/branches-container.tsx
-  our    100644 2f69f46fba8a6dfaa8628742c9c00631c32b24c3 app/src/ui/branches/branches-container.tsx
-@@ -1,16 +1,23 @@
- import * as React from 'react'
--import { Dispatcher } from '../../lib/dispatcher'
--import { FoldoutType, PopupType } from '../../lib/app-state'
-+import { CSSTransitionGroup } from 'react-transition-group'
-+
-+import { PullRequest } from '../../models/pull-request'
- import { Repository } from '../../models/repository'
- import { Branch } from '../../models/branch'
--import { BranchList } from './branch-list'
--import { TabBar } from '../tab-bar'
- import { BranchesTab } from '../../models/branches-tab'
-+
-+import { Dispatcher } from '../../lib/dispatcher'
-+import { FoldoutType, PopupType } from '../../lib/app-state'
- import { assertNever } from '../../lib/fatal-error'
-+
-+import { TabBar } from '../tab-bar'
-+
-+import { BranchList } from './branch-list'
- import { PullRequestList } from './pull-request-list'
- import { PullRequestsLoading } from './pull-requests-loading'
--import { PullRequest } from '../../models/pull-request'
--import { CSSTransitionGroup } from 'react-transition-group'
-+import { IBranchListItem } from './group-branches'
-+import { renderDefaultBranch } from './branch-renderer'
-+import { IMatches } from '../../lib/fuzzy-find'
-
- const PullRequestsLoadingCrossFadeInTimeout = 300
- const PullRequestsLoadingCrossFadeOutTimeout = 200
-@@ -91,6 +98,10 @@
-     )
-   }
-
-+  private renderBranch = (item: IBranchListItem, matches: IMatches) => {
-+    return renderDefaultBranch(item, matches, this.props.currentBranch)
-+  }
-+
-   private renderSelectedTab() {
-     let tab = this.props.selectedTab
-     if (!this.props.repository.gitHubRepository) {
-@@ -112,6 +123,7 @@
-             onSelectionChanged={this.onBranchSelectionChanged}
-             canCreateNewBranch={true}
-             onCreateNewBranch={this.onCreateBranchWithName}
-+            renderBranch={this.renderBranch}
-           />
-         )
-
-merged
-  result 100644 7451fb01e997e0bfbc31e57c3e69d5f34ae179ea app/src/ui/branches/ci-status.tsx
-  our    100644 1f7ff2736a141923c6fb9112cfd5f398896acf1e app/src/ui/branches/ci-status.tsx
-@@ -4,6 +4,7 @@
- import { assertNever } from '../../lib/fatal-error'
- import * as classNames from 'classnames'
- import { PullRequestStatus } from '../../models/pull-request'
-+import { getPRStatusSummary } from './pull-request-status'
-
- interface ICIStatusProps {
-   /** The classname for the underlying element. */
-@@ -17,7 +18,7 @@
- export class CIStatus extends React.Component<ICIStatusProps, {}> {
-   public render() {
-     const status = this.props.status
--    const ciTitle = generateStatusHistory(status)
-+    const title = getPRStatusSummary(status)
-     const state = status.state
-
-     return (
-@@ -28,25 +29,12 @@
-           this.props.className
-         )}
-         symbol={getSymbolForState(state)}
--        title={ciTitle}
-+        title={title}
-       />
-     )
-   }
- }
-
--function generateStatusHistory(prStatus: PullRequestStatus): string {
--  const statusCount = prStatus.statuses.length || 0
--
--  if (statusCount === 0) {
--    return prStatus.state.toUpperCase()
--  } else {
--    const successCount = prStatus.statuses.filter(x => x.state === 'success')
--      .length
--
--    return `${successCount}/${statusCount} checks OK`
--  }
--}
--
- function getSymbolForState(state: APIRefState): OcticonSymbol {
-   switch (state) {
-     case 'pending':
-merged
-  result 100644 f4953500cb984957451e61da094929c0254c811d app/src/ui/branches/group-branches.ts
-  our    100644 2fd74251410406f3439b9e4e709abb36b13b8dd8 app/src/ui/branches/group-branches.ts
-@@ -4,7 +4,7 @@
- export type BranchGroupIdentifier = 'default' | 'recent' | 'other'
-
- export interface IBranchListItem extends IFilterListItem {
--  readonly text: string
-+  readonly text: ReadonlyArray<string>
-   readonly id: string
-   readonly branch: Branch
- }
-@@ -22,7 +22,7 @@
-       identifier: 'default',
-       items: [
-         {
--          text: defaultBranch.name,
-+          text: [defaultBranch.name],
-           id: defaultBranch.name,
-           branch: defaultBranch,
-         },
-@@ -40,7 +40,7 @@
-
-     for (const branch of recentBranchesWithoutDefault) {
-       recentBranches.push({
--        text: branch.name,
-+        text: [branch.name],
-         id: branch.name,
-         branch,
-       })
-@@ -57,7 +57,7 @@
-     b => b.name !== defaultBranchName && !recentBranchNames.has(b.name)
-   )
-   const remainingItems = remainingBranches.map(b => ({
--    text: b.name,
-+    text: [b.name],
-     id: b.name,
-     branch: b,
-   }))
-merged
-  result 100644 bcb647c13a47252579f1da58a3632ba021373dd8 app/src/ui/branches/index.ts
-  our    100644 a62107b46da20b86867baa54600fa7cbc8f9eb41 app/src/ui/branches/index.ts
-@@ -2,4 +2,6 @@
- export { BranchList } from './branch-list'
- export { BranchesContainer } from './branches-container'
- export { PullRequestBadge } from './pull-request-badge'
--export { groupBranches } from './group-branches'
-+export { groupBranches, IBranchListItem } from './group-branches'
-+export { BranchListItem } from './branch-list-item'
-+export { renderDefaultBranch } from './branch-renderer'
-merged
-  result 100644 65a3baac5401a65b19efd6017970323efc6fc8fa app/src/ui/branches/no-branches.tsx
-  our    100644 b6f86111727f7f6fb160bb9f2a6ed052d339dca8 app/src/ui/branches/no-branches.tsx
-@@ -43,13 +43,7 @@
-       )
-     }
-
--    return (
--      <div className="no-branches">
--        <img src={BlankSlateImage} className="blankslate-image" />
--
--        <div className="title">Sorry, I can't find that branch</div>
--      </div>
--    )
-+    return <div className="no-branches">Sorry, I can't find that branch</div>
-   }
-
-   private renderShortcut() {
-merged
-  result 100644 075b2904f501296734519cbb19ed658a9f168a05 app/src/ui/branches/pull-request-list-item.tsx
-  our    100644 b89deea91855c4909ea7801c74d3978b0e398d1a app/src/ui/branches/pull-request-list-item.tsx
-@@ -5,6 +5,7 @@
- import { CIStatus } from './ci-status'
- import { PullRequestStatus } from '../../models/pull-request'
- import { HighlightText } from '../lib/highlight-text'
-+import { IMatches } from '../../lib/fuzzy-find'
-
- export interface IPullRequestListItemProps {
-   /** The title. */
-@@ -32,7 +33,7 @@
-   readonly loading?: boolean
-
-   /** The characters in the PR title to highlight */
--  readonly matches: ReadonlyArray<number>
-+  readonly matches: IMatches
- }
-
- /** Pull requests as rendered in the Pull Requests list. */
-@@ -51,7 +52,7 @@
-   public render() {
-     const title = this.props.loading === true ? undefined : this.props.title
-     const subtitle = this.getSubtitle()
--
-+    const matches = this.props.matches
-     const className = classNames('pull-request-item', {
-       loading: this.props.loading === true,
-     })
-@@ -61,10 +62,10 @@
-         <Octicon className="icon" symbol={OcticonSymbol.gitPullRequest} />
-         <div className="info">
-           <div className="title" title={title}>
--            <HighlightText text={title || ''} highlight={this.props.matches} />
-+            <HighlightText text={title || ''} highlight={matches.title} />
-           </div>
-           <div className="subtitle" title={subtitle}>
--            {subtitle}
-+            <HighlightText text={subtitle || ''} highlight={matches.subtitle} />
-           </div>
-         </div>
-         {this.renderPullRequestStatus()}
-merged
-  result 100644 484112784b83cd0d9be46284b3a1fb1b877894b2 app/src/ui/branches/pull-request-list.tsx
-  our    100644 1f9009ad85604378e350167422ee4056fad94c1c app/src/ui/branches/pull-request-list.tsx
-@@ -1,4 +1,5 @@
- import * as React from 'react'
-+import * as moment from 'moment'
- import {
-   FilterList,
-   IFilterListGroup,
-@@ -8,21 +9,14 @@
- import { PullRequestListItem } from './pull-request-list-item'
- import { PullRequest, PullRequestStatus } from '../../models/pull-request'
- import { NoPullRequests } from './no-pull-requests'
-+import { IMatches } from '../../lib/fuzzy-find'
-
- interface IPullRequestListItem extends IFilterListItem {
-   readonly id: string
--  readonly text: string
-+  readonly text: ReadonlyArray<string>
-   readonly pullRequest: PullRequest
- }
-
--/**
-- * TS can't parse generic specialization in JSX, so we have to alias it here
-- * with the generic type. See https://github.com/Microsoft/TypeScript/issues/6395.
-- */
--const PullRequestFilterList: new () => FilterList<
--  IPullRequestListItem
--> = FilterList as any
--
- export const RowHeight = 47
-
- interface IPullRequestListProps {
-@@ -126,7 +120,7 @@
-
-   public render() {
-     return (
--      <PullRequestFilterList
-+      <FilterList<IPullRequestListItem>
-         className="pull-request-list"
-         rowHeight={RowHeight}
-         groups={this.state.groupedItems}
-@@ -157,7 +151,7 @@
-
-   private renderPullRequest = (
-     item: IPullRequestListItem,
--    matches: ReadonlyArray<number>
-+    matches: IMatches
-   ) => {
-     const pr = item.pullRequest
-     const refStatuses = pr.status != null ? pr.status.statuses : []
-@@ -203,11 +197,16 @@
-   }
- }
-
-+function getSubtitle(pr: PullRequest) {
-+  const timeAgo = moment(pr.created).fromNow()
-+  return `#${pr.number} opened ${timeAgo} by ${pr.author}`
-+}
-+
- function createListItems(
-   pullRequests: ReadonlyArray<PullRequest>
- ): IFilterListGroup<IPullRequestListItem> {
-   const items = pullRequests.map(pr => ({
--    text: pr.title,
-+    text: [pr.title, getSubtitle(pr)],
-     id: pr.number.toString(),
-     pullRequest: pr,
-   }))
-added in remote
-  their  100644 54db06f6493895ecd48deef8273b206d613d60e2 app/src/ui/branches/pull-request-status.ts
-@@ -0,0 +1,48 @@
-+import { PullRequestStatus, ICommitStatus } from '../../models/pull-request'
-+import { APIRefState } from '../../lib/api'
-+import { assertNever } from '../../lib/fatal-error'
-+
-+function formatState(state: APIRefState): string {
-+  switch (state) {
-+    case 'failure':
-+      return 'Commit status: failed'
-+    case 'pending':
-+    case 'success':
-+      return `Commit status: ${state}`
-+
-+    default:
-+      return assertNever(state, `Unknown APIRefState value: ${state}`)
-+  }
-+}
-+
-+function formatSingleStatus(status: ICommitStatus) {
-+  const word = status.state
-+  const sentenceCaseWord =
-+    word.charAt(0).toUpperCase() + word.substring(1, word.length)
-+
-+  return `${sentenceCaseWord}: ${status.description}`
-+}
-+
-+/**
-+ * Convert the Pull Request status to an app-friendly string.
-+ *
-+ * If the pull request contains commit statuses, this method will compute
-+ * the number of successful statuses. Oteherwise, it will fall back
-+ * to the `state` value reported by the GitHub API.
-+ */
-+export function getPRStatusSummary(prStatus: PullRequestStatus): string {
-+  const statusCount = prStatus.statuses.length || 0
-+
-+  if (statusCount === 0) {
-+    return formatState(prStatus.state)
-+  }
-+
-+  if (statusCount === 1) {
-+    return formatSingleStatus(prStatus.statuses[0])
-+  }
-+
-+  const successCount = prStatus.statuses.filter(x => x.state === 'success')
-+    .length
-+
-+  return `${successCount}/${statusCount} checks OK`
-+}
-merged
-  result 100644 6965fcba858e40dc9bebce9bd3f18f369bde8ae3 app/src/ui/branches/pull-requests-loading.tsx
-  our    100644 55f55e50c3c466ac8f51c62622a11dae48b16ea1 app/src/ui/branches/pull-requests-loading.tsx
-@@ -8,21 +8,13 @@
-
- const FacadeCount = 6
-
--/**
-- * TS can't parse generic specialization in JSX, so we have to alias it here
-- * with the generic type. See https://github.com/Microsoft/TypeScript/issues/6395.
-- */
--const PullRequestsLoadingList: new () => FilterList<
--  IFilterListItem
--> = FilterList as any
--
- const prLoadingItemProps: IPullRequestListItemProps = {
-   loading: true,
-   author: '',
-   created: new Date(0),
-   number: 0,
-   title: '',
--  matches: [],
-+  matches: { title: [], subtitle: [] },
-   status: {
-     sha: '4b825dc642cb6eb9a060e54bf8d69288fbee4904',
-     totalCount: 1,
-@@ -38,7 +30,7 @@
-     const items: Array<IFilterListItem> = []
-     for (let i = 0; i < FacadeCount; i++) {
-       items.push({
--        text: '',
-+        text: [''],
-         id: i.toString(),
-       })
-     }
-@@ -51,7 +43,7 @@
-     ]
-
-     return (
--      <PullRequestsLoadingList
-+      <FilterList<IFilterListItem>
-         className="pull-request-list"
-         rowHeight={RowHeight}
-         groups={groups}
-merged
-  result 100644 5e20b50a00f1033a845d4faf66cd584088157811 app/src/ui/changes/changed-file.tsx
-  our    100644 3bb750a806ac20d6733638b383d80bd8dc9719b6 app/src/ui/changes/changed-file.tsx
-@@ -17,7 +17,7 @@
-   readonly onContextMenu: (
-     path: string,
-     status: AppFileStatus,
--    event: React.MouseEvent<any>
-+    event: React.MouseEvent<HTMLDivElement>
-   ) => void
- }
-
-merged
-  result 100644 e92f60ef1e0ceb5edca52df2ec9a0ba4f404eee8 app/src/ui/changes/changes-list.tsx
-  our    100644 0519a49d3e52c4ce4be705f752ca036f6160faf6 app/src/ui/changes/changes-list.tsx
-@@ -1,39 +1,44 @@
- import * as React from 'react'
- import * as Path from 'path'
-
--import { CommitMessage } from './commit-message'
--import { ChangedFile } from './changed-file'
--import { List, ClickSource } from '../lib/list'
-+import { ICommitMessage } from '../../lib/app-state'
-+import { IGitHubUser } from '../../lib/databases'
-+import { Dispatcher } from '../../lib/dispatcher'
-+import { ITrailer } from '../../lib/git/interpret-trailers'
-+import { IMenuItem } from '../../lib/menu-item'
-+import { revealInFileManager } from '../../lib/app-shell'
- import {
-+  AppFileStatus,
-   WorkingDirectoryStatus,
-   WorkingDirectoryFileChange,
--  AppFileStatus,
- } from '../../models/status'
- import { DiffSelectionType } from '../../models/diff'
- import { CommitIdentity } from '../../models/commit-identity'
-+import { Repository } from '../../models/repository'
-+import { IAuthor } from '../../models/author'
-+import { List, ClickSource } from '../lib/list'
- import { Checkbox, CheckboxValue } from '../lib/checkbox'
--import { ICommitMessage } from '../../lib/app-state'
--import { IGitHubUser } from '../../lib/databases'
--import { Dispatcher } from '../../lib/dispatcher'
-+import {
-+  isSafeFileExtension,
-+  DefaultEditorLabel,
-+  RevealInFileManagerLabel,
-+  OpenWithDefaultProgramLabel,
-+} from '../lib/context-menu'
-+import { CommitMessage } from './commit-message'
-+import { ChangedFile } from './changed-file'
- import { IAutocompletionProvider } from '../autocompletion'
--import { Repository } from '../../models/repository'
- import { showContextualMenu } from '../main-process-proxy'
--import { IAuthor } from '../../models/author'
--import { ITrailer } from '../../lib/git/interpret-trailers'
--import { IMenuItem } from '../../lib/menu-item'
-+import { arrayEquals } from '../../lib/equality'
-
- const RowHeight = 29
--const RestrictedFileExtensions = ['.cmd', '.exe', '.bat', '.sh']
--const defaultEditorLabel = __DARWIN__
--  ? 'Open in External Editor'
--  : 'Open in external editor'
-+
- const GitIgnoreFileName = '.gitignore'
-
- interface IChangesListProps {
-   readonly repository: Repository
-   readonly workingDirectory: WorkingDirectoryStatus
--  readonly selectedFileID: string | null
--  readonly onFileSelectionChanged: (row: number) => void
-+  readonly selectedFileIDs: string[]
-+  readonly onFileSelectionChanged: (rows: ReadonlyArray<number>) => void
-   readonly onIncludeChanged: (path: string, include: boolean) => void
-   readonly onSelectAll: (selectAll: boolean) => void
-   readonly onCreateCommit: (
-@@ -42,17 +47,12 @@
-     trailers?: ReadonlyArray<ITrailer>
-   ) => Promise<boolean>
-   readonly onDiscardChanges: (file: WorkingDirectoryFileChange) => void
-+  readonly askForConfirmationOnDiscardChanges: boolean
-   readonly onDiscardAllChanges: (
-     files: ReadonlyArray<WorkingDirectoryFileChange>
-   ) => void
-
-   /**
--   * Called to reveal a file in the native file manager.
--   * @param path The path of the file relative to the root of the repository
--   */
--  readonly onRevealInFileManager: (path: string) => void
--
--  /**
-    * Called to open a file it its default application
-    * @param path The path of the file relative to the root of the repository
-    */
-@@ -69,7 +69,6 @@
-    * List Props for documentation.
-    */
-   readonly onRowClick?: (row: number, source: ClickSource) => void
--
-   readonly commitMessage: ICommitMessage | null
-   readonly contextualCommitMessage: ICommitMessage | null
-
-@@ -77,7 +76,7 @@
-   readonly autocompletionProviders: ReadonlyArray<IAutocompletionProvider<any>>
-
-   /** Called when the given pattern should be ignored. */
--  readonly onIgnore: (pattern: string) => void
-+  readonly onIgnore: (pattern: string | string[]) => void
-
-   /**
-    * Whether or not to show a field for adding co-authors to
-@@ -98,13 +97,58 @@
-   readonly externalEditorLabel?: string
-
-   /**
--   * Called to open a file using the user's configured applications
--   * @param path The path of the file relative to the root of the repository
-+   * Callback to open a selected file using the configured external editor
-+   *
-+   * @param fullPath The full path to the file on disk
-    */
--  readonly onOpenInExternalEditor: (path: string) => void
-+  readonly onOpenInExternalEditor: (fullPath: string) => void
- }
-
--export class ChangesList extends React.Component<IChangesListProps, {}> {
-+interface IChangesState {
-+  readonly selectedRows: ReadonlyArray<number>
-+}
-+
-+function getSelectedRowsFromProps(
-+  props: IChangesListProps
-+): ReadonlyArray<number> {
-+  const selectedFileIDs = props.selectedFileIDs
-+  const selectedRows = []
-+
-+  for (const id of selectedFileIDs) {
-+    const ix = props.workingDirectory.findFileIndexByID(id)
-+    if (ix !== -1) {
-+      selectedRows.push(ix)
-+    }
-+  }
-+
-+  return selectedRows
-+}
-+
-+export class ChangesList extends React.Component<
-+  IChangesListProps,
-+  IChangesState
-+> {
-+  public constructor(props: IChangesListProps) {
-+    super(props)
-+    this.state = {
-+      selectedRows: getSelectedRowsFromProps(props),
-+    }
-+  }
-+
-+  public componentWillReceiveProps(nextProps: IChangesListProps) {
-+    // No need to update state unless we haven't done it yet or the
-+    // selected file id list has changed.
-+    if (
-+      !arrayEquals(nextProps.selectedFileIDs, this.props.selectedFileIDs) ||
-+      !arrayEquals(
-+        nextProps.workingDirectory.files,
-+        this.props.workingDirectory.files
-+      )
-+    ) {
-+      this.setState({ selectedRows: getSelectedRowsFromProps(nextProps) })
-+    }
-+  }
-+
-   private onIncludeAllChanged = (event: React.FormEvent<HTMLInputElement>) => {
-     const include = event.currentTarget.checked
-     this.props.onSelectAll(include)
-@@ -117,7 +161,9 @@
-     const includeAll =
-       selection === DiffSelectionType.All
-         ? true
--        : selection === DiffSelectionType.None ? false : null
-+        : selection === DiffSelectionType.None
-+          ? false
-+          : null
-
-     return (
-       <ChangedFile
-@@ -126,9 +172,9 @@
-         oldPath={file.oldPath}
-         include={includeAll}
-         key={file.id}
-+        onContextMenu={this.onItemContextMenu}
-         onIncludeChanged={this.props.onIncludeChanged}
-         availableWidth={this.props.availableWidth}
--        onContextMenu={this.onItemContextMenu}
-       />
-     )
-   }
-@@ -148,14 +194,43 @@
-     this.props.onDiscardAllChanges(this.props.workingDirectory.files)
-   }
-
--  private onDiscardChanges = (path: string) => {
-+  private onDiscardChanges = (files: ReadonlyArray<string>) => {
-     const workingDirectory = this.props.workingDirectory
--    const file = workingDirectory.files.find(f => f.path === path)
--    if (!file) {
--      return
-+
-+    if (files.length === 1) {
-+      const modifiedFile = workingDirectory.files.find(f => f.path === files[0])
-+
-+      if (modifiedFile != null) {
-+        this.props.onDiscardChanges(modifiedFile)
-+      }
-+    } else {
-+      const modifiedFiles = new Array<WorkingDirectoryFileChange>()
-+
-+      files.forEach(file => {
-+        const modifiedFile = workingDirectory.files.find(f => f.path === file)
-+
-+        if (modifiedFile != null) {
-+          modifiedFiles.push(modifiedFile)
-+        }
-+      })
-+
-+      if (modifiedFiles.length > 0) {
-+        this.props.onDiscardAllChanges(modifiedFiles)
-+      }
-     }
-+  }
-
--    this.props.onDiscardChanges(file)
-+  private getDiscardChangesMenuItemLabel = (files: ReadonlyArray<string>) => {
-+    const label =
-+      files.length === 1
-+        ? __DARWIN__
-+          ? `Discard Changes`
-+          : `Discard changes`
-+        : __DARWIN__
-+          ? `Discard ${files.length} Selected Changes`
-+          : `Discard ${files.length} selected changes`
-+
-+    return this.props.askForConfirmationOnDiscardChanges ? `${label}…` : label
-   }
-
-   private onContextMenu = (event: React.MouseEvent<any>) => {
-@@ -175,64 +250,97 @@
-   private onItemContextMenu = (
-     path: string,
-     status: AppFileStatus,
--    event: React.MouseEvent<any>
-+    event: React.MouseEvent<HTMLDivElement>
-   ) => {
-     event.preventDefault()
-
-     const extension = Path.extname(path)
--    const fileName = Path.basename(path)
--    const isSafeExtension = __WIN32__
--      ? RestrictedFileExtensions.indexOf(extension.toLowerCase()) === -1
--      : true
--    const revealInFileManagerLabel = __DARWIN__
--      ? 'Reveal in Finder'
--      : __WIN32__ ? 'Show in Explorer' : 'Show in your File Manager'
-+    const isSafeExtension = isSafeFileExtension(extension)
-     const openInExternalEditor = this.props.externalEditorLabel
-       ? `Open in ${this.props.externalEditorLabel}`
--      : defaultEditorLabel
-+      : DefaultEditorLabel
-+
-+    const wd = this.props.workingDirectory
-+    const selectedFiles = new Array<WorkingDirectoryFileChange>()
-+    const paths = new Array<string>()
-+    const extensions = new Set<string>()
-+
-+    this.props.selectedFileIDs.forEach(fileID => {
-+      const newFile = wd.findFileWithID(fileID)
-+      if (newFile) {
-+        selectedFiles.push(newFile)
-+        paths.push(newFile.path)
-+
-+        const extension = Path.extname(newFile.path)
-+        if (extension.length) {
-+          extensions.add(extension)
-+        }
-+      }
-+    })
-+
-     const items: IMenuItem[] = [
-       {
--        label: __DARWIN__ ? 'Discard Changes…' : 'Discard changes…',
--        action: () => this.onDiscardChanges(path),
-+        label: this.getDiscardChangesMenuItemLabel(paths),
-+        action: () => this.onDiscardChanges(paths),
-       },
-       {
-         label: __DARWIN__ ? 'Discard All Changes…' : 'Discard all changes…',
-         action: () => this.onDiscardAllChanges(),
-       },
-       { type: 'separator' },
--      {
--        label: 'Ignore',
--        action: () => this.props.onIgnore(path),
--        enabled: fileName !== GitIgnoreFileName,
--      },
-     ]
-
--    if (extension.length) {
-+    if (paths.length === 1) {
-+      items.push({
-+        label: __DARWIN__ ? 'Ignore File' : 'Ignore file',
-+        action: () => this.props.onIgnore(path),
-+        enabled: Path.basename(path) !== GitIgnoreFileName,
-+      })
-+    } else if (paths.length > 1) {
-       items.push({
--        label: __DARWIN__
--          ? `Ignore All ${extension} Files`
--          : `Ignore all ${extension} files`,
--        action: () => this.props.onIgnore(`*${extension}`),
--        enabled: fileName !== GitIgnoreFileName,
-+        label: `Ignore ${paths.length} selected files`,
-+        action: () => {
-+          // Filter out any .gitignores that happens to be selected, ignoring
-+          // those doesn't make sense.
-+          this.props.onIgnore(
-+            paths.filter(path => Path.basename(path) !== GitIgnoreFileName)
-+          )
-+        },
-+        // Enable this action as long as there's something selected which isn't
-+        // a .gitignore file.
-+        enabled: paths.some(path => Path.basename(path) !== GitIgnoreFileName),
-       })
-     }
-
-+    // Five menu items should be enough for everyone
-+    Array.from(extensions)
-+      .slice(0, 5)
-+      .forEach(extension => {
-+        items.push({
-+          label: __DARWIN__
-+            ? `Ignore All ${extension} Files`
-+            : `Ignore all ${extension} files`,
-+          action: () => this.props.onIgnore(`*${extension}`),
-+        })
-+      })
-+
-     items.push(
-       { type: 'separator' },
-       {
--        label: revealInFileManagerLabel,
--        action: () => this.props.onRevealInFileManager(path),
-+        label: RevealInFileManagerLabel,
-+        action: () => revealInFileManager(this.props.repository, path),
-         enabled: status !== AppFileStatus.Deleted,
-       },
-       {
-         label: openInExternalEditor,
--        action: () => this.props.onOpenInExternalEditor(path),
-+        action: () => {
-+          const fullPath = Path.join(this.props.repository.path, path)
-+          this.props.onOpenInExternalEditor(fullPath)
-+        },
-         enabled: isSafeExtension && status !== AppFileStatus.Deleted,
-       },
-       {
--        label: __DARWIN__
--          ? 'Open with Default Program'
--          : 'Open with default program',
-+        label: OpenWithDefaultProgramLabel,
-         action: () => this.props.onOpenItem(path),
-         enabled: isSafeExtension && status !== AppFileStatus.Deleted,
-       }
-@@ -243,9 +351,6 @@
-
-   public render() {
-     const fileList = this.props.workingDirectory.files
--    const selectedRow = fileList.findIndex(
--      file => file.id === this.props.selectedFileID
--    )
-     const fileCount = fileList.length
-     const filesPlural = fileCount === 1 ? 'file' : 'files'
-     const filesDescription = `${fileCount} changed ${filesPlural}`
-@@ -268,7 +373,8 @@
-           rowCount={this.props.workingDirectory.files.length}
-           rowHeight={RowHeight}
-           rowRenderer={this.renderRow}
--          selectedRow={selectedRow}
-+          selectedRows={this.state.selectedRows}
-+          selectionMode="multi"
-           onSelectionChanged={this.props.onFileSelectionChanged}
-           invalidationProps={this.props.workingDirectory}
-           onRowClick={this.props.onRowClick}
-merged
-  result 100644 0a0e18fc9f4c8956a648726827dc496f3d5f98db app/src/ui/changes/commit-message.tsx
-  our    100644 5ea583fb1898ce0a5637a81c7d29dfcf835f8309 app/src/ui/changes/commit-message.tsx
-@@ -343,8 +343,12 @@
-
-   private get toggleCoAuthorsText(): string {
-     return this.props.showCoAuthoredBy
--      ? __DARWIN__ ? 'Remove Co-Authors' : 'Remove co-authors'
--      : __DARWIN__ ? 'Add Co-Authors' : 'Add co-authors'
-+      ? __DARWIN__
-+        ? 'Remove Co-Authors'
-+        : 'Remove co-authors'
-+      : __DARWIN__
-+        ? 'Add Co-Authors'
-+        : 'Add co-authors'
-   }
-
-   private getAddRemoveCoAuthorsMenuItem(): IMenuItem {
-@@ -491,8 +495,9 @@
-           {this.renderAvatar()}
-
-           <AutocompletingInput
-+            isRequired={true}
-             className="summary-field"
--            placeholder="Summary"
-+            placeholder="Summary (required)"
-             value={this.state.summary}
-             onValueChanged={this.onSummaryChanged}
-             autocompletionProviders={this.props.autocompletionProviders}
-added in remote
-  their  100644 cb84fdd59ab575c56de3c3411ba9c9fc989bf26d app/src/ui/changes/files-changed-badge.tsx
-@@ -0,0 +1,24 @@
-+import * as React from 'react'
-+
-+interface IFilesChangedBadgeProps {
-+  readonly filesChangedCount: number
-+}
-+
-+/** The number that can be displayed as a specific value */
-+const MaximumChangesCount = 300
-+
-+/** Displays number of files that have changed */
-+export class FilesChangedBadge extends React.Component<
-+  IFilesChangedBadgeProps,
-+  {}
-+> {
-+  public render() {
-+    const filesChangedCount = this.props.filesChangedCount
-+    const badgeCount =
-+      filesChangedCount > MaximumChangesCount
-+        ? `${MaximumChangesCount}+`
-+        : filesChangedCount
-+
-+    return <span className="counter">{badgeCount}</span>
-+  }
-+}
-added in remote
-  their  100644 185bc1b81106f809ad63e79d4b3adf97946f68ce app/src/ui/changes/multiple-selection.tsx
-@@ -0,0 +1,26 @@
-+import * as React from 'react'
-+import { encodePathAsUrl } from '../../lib/path'
-+
-+const BlankSlateImage = encodePathAsUrl(
-+  __dirname,
-+  'static/multiple-files-selected.svg'
-+)
-+
-+interface IMultipleSelectionProps {
-+  /** Called when the user chooses to open the repository. */
-+  readonly count: number
-+}
-+/** The component to display when there are no local changes. */
-+export class MultipleSelection extends React.Component<
-+  IMultipleSelectionProps,
-+  {}
-+> {
-+  public render() {
-+    return (
-+      <div className="panel blankslate" id="no-changes">
-+        <img src={BlankSlateImage} className="blankslate-image" />
-+        <div>{this.props.count} files selected</div>
-+      </div>
-+    )
-+  }
-+}
-merged
-  result 100644 090ffa423a170c926a8b7fdcd04748ff3bd2d416 app/src/ui/changes/no-changes.tsx
-  our    100644 0184f2d912257317c527a0b019d070ee191f17c4 app/src/ui/changes/no-changes.tsx
-@@ -1,6 +1,9 @@
- import * as React from 'react'
--import { LinkButton } from '../lib/link-button'
-+
- import { encodePathAsUrl } from '../../lib/path'
-+import { revealInFileManager } from '../../lib/app-shell'
-+import { Repository } from '../../models/repository'
-+import { LinkButton } from '../lib/link-button'
-
- const BlankSlateImage = encodePathAsUrl(
-   __dirname,
-@@ -8,8 +11,7 @@
- )
-
- interface INoChangesProps {
--  /** Called when the user chooses to open the repository. */
--  readonly onOpenRepository: () => void
-+  readonly repository: Repository
- }
-
- /** The component to display when there are no local changes. */
-@@ -17,7 +19,9 @@
-   public render() {
-     const opener = __DARWIN__
-       ? 'Finder'
--      : __WIN32__ ? 'Explorer' : 'your File Manager'
-+      : __WIN32__
-+        ? 'Explorer'
-+        : 'your File Manager'
-     return (
-       <div className="panel blankslate" id="no-changes">
-         <img src={BlankSlateImage} className="blankslate-image" />
-@@ -33,6 +37,6 @@
-   }
-
-   private open = () => {
--    this.props.onOpenRepository()
-+    revealInFileManager(this.props.repository, '')
-   }
- }
-merged
-  result 100644 ff1760bbd4b1a3d5ea8ac084b1282e99b2ea288b app/src/ui/changes/sidebar.tsx
-  our    100644 c6fc23660a5320772101aa310315dc9bca822d5c app/src/ui/changes/sidebar.tsx
-@@ -52,10 +52,11 @@
-   readonly externalEditorLabel?: string
-
-   /**
--   * Called to open a file using the user's configured applications
--   * @param path The path of the file relative to the root of the repository
-+   * Callback to open a selected file using the configured external editor
-+   *
-+   * @param fullPath The full path to the file on disk
-    */
--  readonly onOpenInExternalEditor: (path: string) => void
-+  readonly onOpenInExternalEditor: (fullPath: string) => void
- }
-
- export class ChangesSidebar extends React.Component<IChangesSidebarProps, {}> {
-@@ -124,9 +125,9 @@
-     )
-   }
-
--  private onFileSelectionChanged = (row: number) => {
--    const file = this.props.changes.workingDirectory.files[row]
--    this.props.dispatcher.changeChangesSelection(this.props.repository, file)
-+  private onFileSelectionChanged = (rows: ReadonlyArray<number>) => {
-+    const files = rows.map(i => this.props.changes.workingDirectory.files[i])
-+    this.props.dispatcher.changeChangesSelection(this.props.repository, files)
-   }
-
-   private onIncludeChanged = (path: string, include: boolean) => {
-@@ -169,30 +170,19 @@
-   private onDiscardAllChanges = (
-     files: ReadonlyArray<WorkingDirectoryFileChange>
-   ) => {
--    if (!this.props.askForConfirmationOnDiscardChanges) {
--      this.props.dispatcher.discardChanges(this.props.repository, files)
--    } else {
--      this.props.dispatcher.showPopup({
--        type: PopupType.ConfirmDiscardChanges,
--        repository: this.props.repository,
--        files,
--      })
--    }
-+    this.props.dispatcher.showPopup({
-+      type: PopupType.ConfirmDiscardChanges,
-+      repository: this.props.repository,
-+      showDiscardChangesSetting: false,
-+      files,
-+    })
-   }
-
--  private onIgnore = (pattern: string) => {
-+  private onIgnore = (pattern: string | string[]) => {
-     this.props.dispatcher.ignore(this.props.repository, pattern)
-   }
-
-   /**
--   * Reveals a file from a repository in the native file manager.
--   * @param path The path of the file relative to the root of the repository
--   */
--  private onRevealInFileManager = (path: string) => {
--    this.props.dispatcher.revealInFileManager(this.props.repository, path)
--  }
--
--  /**
-    * Open file with default application.
-    * @param path The path of the file relative to the root of the repository
-    */
-@@ -229,11 +219,18 @@
-    * Handles click events from the List item container, note that this is
-    * Not the same thing as the element returned by the row renderer in ChangesList
-    */
--  private onChangedItemClick = (row: number, source: ClickSource) => {
-+  private onChangedItemClick = (
-+    rows: number | number[],
-+    source: ClickSource
-+  ) => {
-     // Toggle selection when user presses the spacebar or enter while focused
--    // on a list item
-+    // on a list item or on the list's container
-     if (source.kind === 'keyboard') {
--      this.onToggleInclude(row)
-+      if (rows instanceof Array) {
-+        rows.forEach(row => this.onToggleInclude(row))
-+      } else {
-+        this.onToggleInclude(rows)
-+      }
-     }
-   }
-
-@@ -274,7 +271,7 @@
-
-   public render() {
-     const changesState = this.props.changes
--    const selectedFileID = changesState.selectedFileID
-+    const selectedFileIDs = changesState.selectedFileIDs
-
-     // TODO: I think user will expect the avatar to match that which
-     // they have configured in GitHub.com as well as GHE so when we add
-@@ -292,14 +289,16 @@
-           dispatcher={this.props.dispatcher}
-           repository={this.props.repository}
-           workingDirectory={changesState.workingDirectory}
--          selectedFileID={selectedFileID}
-+          selectedFileIDs={selectedFileIDs}
-           onFileSelectionChanged={this.onFileSelectionChanged}
-           onCreateCommit={this.onCreateCommit}
-           onIncludeChanged={this.onIncludeChanged}
-           onSelectAll={this.onSelectAll}
-           onDiscardChanges={this.onDiscardChanges}
-+          askForConfirmationOnDiscardChanges={
-+            this.props.askForConfirmationOnDiscardChanges
-+          }
-           onDiscardAllChanges={this.onDiscardAllChanges}
--          onRevealInFileManager={this.onRevealInFileManager}
-           onOpenItem={this.onOpenItem}
-           onRowClick={this.onChangedItemClick}
-           commitAuthor={this.props.commitAuthor}
-merged
-  result 100644 81bb2d3dc71f42c419af98460238b7063d80badd app/src/ui/clone-repository/clone-github-repository.tsx
-  our    100644 e546634cdd499994bb68f6f3ed1d56e956b4bc45 app/src/ui/clone-repository/clone-github-repository.tsx
-@@ -10,6 +10,7 @@
- import { FilterList } from '../lib/filter-list'
- import { API } from '../../lib/api'
- import { IFilterListGroup } from '../lib/filter-list'
-+import { IMatches } from '../../lib/fuzzy-find'
- import {
-   ICloneableRepositoryListItem,
-   groupRepositories,
-@@ -204,13 +205,13 @@
-
-   private renderItem = (
-     item: ICloneableRepositoryListItem,
--    matches: ReadonlyArray<number>
-+    matches: IMatches
-   ) => {
-     return (
-       <div className="clone-repository-list-item">
-         <Octicon className="icon" symbol={item.icon} />
--        <div className="name" title={item.text}>
--          <HighlightText text={item.text} highlight={matches} />
-+        <div className="name" title={item.text[0]}>
-+          <HighlightText text={item.text[0]} highlight={matches.title} />
-         </div>
-       </div>
-     )
-merged
-  result 100644 e8132c67eee073fe0faec333fa15a273e811d960 app/src/ui/clone-repository/clone-repository.tsx
-  our    100644 b4e9cbd7caed04fee894293ace81b6f332f1b6ea app/src/ui/clone-repository/clone-repository.tsx
-@@ -1,6 +1,8 @@
- import * as Path from 'path'
- import * as React from 'react'
- import { remote } from 'electron'
-+import { pathExists } from 'fs-extra'
-+
- import { Button } from '../lib/button'
- import { ButtonGroup } from '../lib/button-group'
- import { Dispatcher } from '../../lib/dispatcher'
-@@ -17,7 +19,7 @@
- import { CloneRepositoryTab } from '../../models/clone-repository-tab'
- import { CloneGenericRepository } from './clone-generic-repository'
- import { CloneGithubRepository } from './clone-github-repository'
--import { pathExists } from '../../lib/file-system'
-+
- import { assertNever } from '../../lib/fatal-error'
- import { CallToAction } from '../lib/call-to-action'
-
-merged
-  result 100644 b7412f2d5dd94cba15f7a987e719915969a75f6e app/src/ui/clone-repository/group-repositories.ts
-  our    100644 d14189ae128a22845dc39ec28b62ae2e108a42ba app/src/ui/clone-repository/group-repositories.ts
-@@ -11,7 +11,7 @@
-   readonly id: string
-
-   /** The search text. */
--  readonly text: string
-+  readonly text: ReadonlyArray<string>
-
-   /** The name of the repository. */
-   readonly name: string
-@@ -43,7 +43,7 @@
-
-       return {
-         id: repo.html_url,
--        text: `${repo.owner.login}/${repo.name}`,
-+        text: [`${repo.owner.login}/${repo.name}`],
-         url: repo.clone_url,
-         name: repo.name,
-         icon,
-merged
-  result 100644 9f7be035e77bad03025c737279092ba7598a0816 app/src/ui/diff/binary-file.tsx
-  our    100644 81c0dcd6e5fe3e4fd3fec3e5a8dcdff5b3167656 app/src/ui/diff/binary-file.tsx
-@@ -5,6 +5,8 @@
- import { openFile } from '../../lib/open-file'
- import { Dispatcher } from '../../lib/dispatcher/dispatcher'
-
-+import { LinkButton } from '../lib/link-button'
-+
- interface IBinaryFileProps {
-   readonly repository: Repository
-   readonly path: string
-@@ -13,7 +15,7 @@
-
- /** represents the default view for a file that we cannot render a diff for */
- export class BinaryFile extends React.Component<IBinaryFileProps, {}> {
--  private handleClick = (e: React.MouseEvent<HTMLAnchorElement>) => {
-+  private open = () => {
-     const fullPath = Path.join(this.props.repository.path, this.props.path)
-     openFile(fullPath, this.props.dispatcher)
-   }
-@@ -23,9 +25,9 @@
-       <div className="panel binary" id="diff">
-         <div className="image-header">This binary file has changed.</div>
-         <div className="image-header">
--          <a href="#" onClick={this.handleClick}>
-+          <LinkButton onClick={this.open}>
-             Open file in external program.
--          </a>
-+          </LinkButton>
-         </div>
-       </div>
-     )
-merged
-  result 100644 dc40c8309be3d5fb88ce7c549d18e0a218138062 app/src/ui/diff/diff-explorer.ts
-  our    100644 3ee24b252827ef7e376d781a6925ef1d1bf00a40 app/src/ui/diff/diff-explorer.ts
-@@ -1,13 +1,13 @@
--import { DiffLine, DiffHunk, ITextDiff } from '../../models/diff'
-+import { DiffLine, DiffHunk } from '../../models/diff'
-
- /**
-  * Locate the diff hunk for the given (absolute) line number in the diff.
-  */
- export function diffHunkForIndex(
--  diff: ITextDiff,
-+  hunks: ReadonlyArray<DiffHunk>,
-   index: number
- ): DiffHunk | null {
--  const hunk = diff.hunks.find(h => {
-+  const hunk = hunks.find(h => {
-     return index >= h.unifiedDiffStart && index <= h.unifiedDiffEnd
-   })
-   return hunk || null
-@@ -17,10 +17,10 @@
-  * Locate the diff line for the given (absolute) line number in the diff.
-  */
- export function diffLineForIndex(
--  diff: ITextDiff,
-+  hunks: ReadonlyArray<DiffHunk>,
-   index: number
- ): DiffLine | null {
--  const hunk = diffHunkForIndex(diff, index)
-+  const hunk = diffHunkForIndex(hunks, index)
-   if (!hunk) {
-     return null
-   }
-@@ -31,10 +31,10 @@
- /** Get the line number as represented in the diff text itself. */
- export function lineNumberForDiffLine(
-   diffLine: DiffLine,
--  diff: ITextDiff
-+  hunks: ReadonlyArray<DiffHunk>
- ): number {
-   let lineOffset = 0
--  for (const hunk of diff.hunks) {
-+  for (const hunk of hunks) {
-     const index = hunk.lines.indexOf(diffLine)
-     if (index > -1) {
-       return index + lineOffset
-@@ -51,10 +51,10 @@
-  * should be displayed as interactive, as a hunk is not granular enough
-  */
- export function findInteractiveDiffRange(
--  diff: ITextDiff,
-+  hunks: ReadonlyArray<DiffHunk>,
-   index: number
- ): { start: number; end: number } | null {
--  const hunk = diffHunkForIndex(diff, index)
-+  const hunk = diffHunkForIndex(hunks, index)
-   if (!hunk) {
-     return null
-   }
-merged
-  result 100644 fc770e214454b6980005a0f84ae50a9a1ca5d322 app/src/ui/diff/diff-line-gutter.tsx
-  our    100644 352915a1f60aafefce6fe604e3b32b325148ae69 app/src/ui/diff/diff-line-gutter.tsx
-@@ -1,5 +1,5 @@
- import * as React from 'react'
--import { ITextDiff, DiffLine, DiffLineType } from '../../models/diff'
-+import { DiffHunk, DiffLine, DiffLineType } from '../../models/diff'
- import { diffHunkForIndex, findInteractiveDiffRange } from './diff-explorer'
- import { hoverCssClass, selectedLineClass } from './selection/selection'
- import { assertNever } from '../../lib/fatal-error'
-@@ -30,7 +30,7 @@
-   /**
-    * The diff currently displayed in the app
-    */
--  readonly diff: ITextDiff
-+  readonly hunks: ReadonlyArray<DiffHunk>
-
-   /**
-    * Callback to apply hover effect to specific lines in the diff
-@@ -55,7 +55,7 @@
-    */
-   readonly onMouseDown: (
-     index: number,
--    diff: ITextDiff,
-+    hunks: ReadonlyArray<DiffHunk>,
-     isRangeSelection: boolean
-   ) => void
-
-@@ -183,7 +183,7 @@
-
-   private updateHoverState(isRangeSelection: boolean, isActive: boolean) {
-     if (isRangeSelection) {
--      const range = findInteractiveDiffRange(this.props.diff, this.props.index)
-+      const range = findInteractiveDiffRange(this.props.hunks, this.props.index)
-       if (!range) {
-         console.error('unable to find range for given index in diff')
-         return
-@@ -210,7 +210,7 @@
-   private mouseMoveHandler = (ev: MouseEvent) => {
-     ev.preventDefault()
-
--    const hunk = diffHunkForIndex(this.props.diff, this.props.index)
-+    const hunk = diffHunkForIndex(this.props.hunks, this.props.index)
-     if (!hunk) {
-       console.error('unable to find hunk for given line in diff')
-       return
-@@ -219,7 +219,7 @@
-     const isRangeSelection = isMouseCursorNearEdge(ev)
-     const isSelectionActive = this.props.isSelectionEnabled()
-
--    const range = findInteractiveDiffRange(this.props.diff, this.props.index)
-+    const range = findInteractiveDiffRange(this.props.hunks, this.props.index)
-     if (!range) {
-       console.error('unable to find range for given index in diff')
-       return
-@@ -241,7 +241,7 @@
-   private mouseDownHandler = (ev: MouseEvent) => {
-     ev.preventDefault()
-     const isRangeSelection = isMouseCursorNearEdge(ev)
--    this.props.onMouseDown(this.props.index, this.props.diff, isRangeSelection)
-+    this.props.onMouseDown(this.props.index, this.props.hunks, isRangeSelection)
-   }
-
-   private applyEventHandlers = (elem: HTMLSpanElement | null) => {
-merged
-  result 100644 f36e0e4c22d67391c497dcea94021c47fbbc6a61 app/src/ui/diff/diff-syntax-mode.ts
-  our    100644 d4f02e6c2ed4f9295eef2dbf64aba1c0ec9cfc74 app/src/ui/diff/diff-syntax-mode.ts
-@@ -1,4 +1,4 @@
--import { ITextDiff, DiffLine } from '../../models/diff'
-+import { DiffHunk, DiffLine } from '../../models/diff'
- import * as CodeMirror from 'codemirror'
- import { diffLineForIndex } from './diff-explorer'
- import { ITokens } from '../../lib/highlighter/types'
-@@ -9,7 +9,7 @@
-   /**
-    * The unified diff representing the change
-    */
--  readonly diff: ITextDiff
-+  readonly hunks: ReadonlyArray<DiffHunk>
-
-   /**
-    * Tokens returned from the highlighter for the 'before'
-@@ -80,16 +80,16 @@
- export class DiffSyntaxMode {
-   public static readonly ModeName = 'github-diff-syntax'
-
--  private readonly diff?: ITextDiff
-+  private readonly hunks?: ReadonlyArray<DiffHunk>
-   private readonly oldTokens?: ITokens
-   private readonly newTokens?: ITokens
-
-   public constructor(
--    diff?: ITextDiff,
-+    hunks?: ReadonlyArray<DiffHunk>,
-     oldTokens?: ITokens,
-     newTokens?: ITokens
-   ) {
--    this.diff = diff
-+    this.hunks = hunks
-     this.oldTokens = oldTokens
-     this.newTokens = newTokens
-   }
-@@ -125,11 +125,11 @@
-     // This happens when the mode is running without tokens, in this
-     // case there's really nothing more for us to do than what we've
-     // already done above to deal with the diff line marker.
--    if (!this.diff) {
-+    if (this.hunks == null) {
-       return skipLine(stream, state)
-     }
-
--    const diffLine = diffLineForIndex(this.diff, state.diffLineIndex)
-+    const diffLine = diffLineForIndex(this.hunks, state.diffLineIndex)
-
-     if (!diffLine) {
-       return skipLine(stream, state)
-@@ -181,7 +181,7 @@
-   }
-
-   return new DiffSyntaxMode(
--    modeOptions.diff,
-+    modeOptions.hunks,
-     modeOptions.oldTokens,
-     modeOptions.newTokens
-   )
-merged
-  result 100644 7c53bfbb331587afae9c40fa77ad4a1849862f53 app/src/ui/diff/image-diffs/deleted-image-diff.tsx
-  our    100644 100c204b222ee1c211c495cf5774d61af6e9a9f1 app/src/ui/diff/image-diffs/deleted-image-diff.tsx
-@@ -1,7 +1,7 @@
- import * as React from 'react'
-
- import { Image } from '../../../models/diff'
--import { DiffImage } from './diff-image'
-+import { ImageContainer } from './image-container'
-
- interface IDeletedImageDiffProps {
-   readonly previous: Image
-@@ -17,7 +17,7 @@
-       <div className="panel image" id="diff">
-         <div className="image-diff-previous">
-           <div className="image-diff-header">Deleted</div>
--          <DiffImage image={this.props.previous} />
-+          <ImageContainer image={this.props.previous} />
-         </div>
-       </div>
-     )
-removed in remote
-  base   100644 67ff04efa95b3fe39f2e6d791501325575a01dda app/src/ui/diff/image-diffs/diff-image.tsx
-  our    100644 67ff04efa95b3fe39f2e6d791501325575a01dda app/src/ui/diff/image-diffs/diff-image.tsx
-@@ -1,28 +0,0 @@
--import * as React from 'react'
--
--import { Image } from '../../../models/diff'
--
--interface IImageProps {
--  readonly image: Image
--
--  readonly style?: React.CSSProperties
--
--  readonly onElementLoad?: (img: HTMLImageElement) => void
--}
--
--export class DiffImage extends React.Component<IImageProps, {}> {
--  public render() {
--    const image = this.props.image
--    const imageSource = `data:${image.mediaType};base64,${image.contents}`
--
--    return (
--      <img src={imageSource} style={this.props.style} onLoad={this.onLoad} />
--    )
--  }
--
--  private onLoad = (e: React.SyntheticEvent<HTMLImageElement>) => {
--    if (this.props.onElementLoad) {
--      this.props.onElementLoad(e.currentTarget)
--    }
--  }
--}
-merged
-  result 100644 a5bf0078cc777a1299e2fd0a994ea22e7f4e2ee4 app/src/ui/diff/image-diffs/difference-blend.tsx
-  our    100644 a2e1e7a2bd40cd3103502b06e735ac8d0e05be7a app/src/ui/diff/image-diffs/difference-blend.tsx
-@@ -1,5 +1,5 @@
- import * as React from 'react'
--import { DiffImage } from './diff-image'
-+import { ImageContainer } from './image-container'
- import { ICommonImageDiffProperties } from './modified-image-diff'
-
- export class DifferenceBlend extends React.Component<
-@@ -22,7 +22,7 @@
-         <div className="sizing-container">
-           <div className="image-container" style={style}>
-             <div className="image-diff-previous">
--              <DiffImage
-+              <ImageContainer
-                 image={this.props.previous}
-                 onElementLoad={this.props.onPreviousImageLoad}
-                 style={maxSize}
-@@ -30,7 +30,7 @@
-             </div>
-
-             <div className="image-diff-current">
--              <DiffImage
-+              <ImageContainer
-                 image={this.props.current}
-                 onElementLoad={this.props.onCurrentImageLoad}
-                 style={{
-added in remote
-  their  100644 f386dd026ea4d48ee9269f19f2a14971ff443bcd app/src/ui/diff/image-diffs/image-container.tsx
-@@ -0,0 +1,31 @@
-+import * as React from 'react'
-+
-+import { Image } from '../../../models/diff'
-+
-+interface IImageProps {
-+  /** The image contents to render */
-+  readonly image: Image
-+
-+  /** Optional styles to apply to the image container */
-+  readonly style?: React.CSSProperties
-+
-+  /** callback to fire after the image has been loaded */
-+  readonly onElementLoad?: (img: HTMLImageElement) => void
-+}
-+
-+export class ImageContainer extends React.Component<IImageProps, {}> {
-+  public render() {
-+    const image = this.props.image
-+    const imageSource = `data:${image.mediaType};base64,${image.contents}`
-+
-+    return (
-+      <img src={imageSource} style={this.props.style} onLoad={this.onLoad} />
-+    )
-+  }
-+
-+  private onLoad = (e: React.SyntheticEvent<HTMLImageElement>) => {
-+    if (this.props.onElementLoad) {
-+      this.props.onElementLoad(e.currentTarget)
-+    }
-+  }
-+}
-merged
-  result 100644 72df75e401ac62f8a6dd1db8febe5c703e2719f4 app/src/ui/diff/image-diffs/new-image-diff.tsx
-  our    100644 2f089e3cea9dc0357a79e44e705e11b5f56ff5b3 app/src/ui/diff/image-diffs/new-image-diff.tsx
-@@ -1,7 +1,7 @@
- import * as React from 'react'
-
- import { Image } from '../../../models/diff'
--import { DiffImage } from './diff-image'
-+import { ImageContainer } from './image-container'
-
- interface INewImageDiffProps {
-   readonly current: Image
-@@ -14,7 +14,7 @@
-       <div className="panel image" id="diff">
-         <div className="image-diff-current">
-           <div className="image-diff-header">Added</div>
--          <DiffImage image={this.props.current} />
-+          <ImageContainer image={this.props.current} />
-         </div>
-       </div>
-     )
-merged
-  result 100644 4e23bc6c3f0c1317cb751c3767325753b2e108ba app/src/ui/diff/image-diffs/onion-skin.tsx
-  our    100644 fd55c2e19b5edb2849cf28c270f109f2c5e29b6a app/src/ui/diff/image-diffs/onion-skin.tsx
-@@ -1,6 +1,6 @@
- import * as React from 'react'
- import { ICommonImageDiffProperties } from './modified-image-diff'
--import { DiffImage } from './diff-image'
-+import { ImageContainer } from './image-container'
-
- interface IOnionSkinState {
-   readonly crossfade: number
-@@ -32,7 +32,7 @@
-         <div className="sizing-container" ref={this.props.onContainerRef}>
-           <div className="image-container" style={style}>
-             <div className="image-diff-previous" style={style}>
--              <DiffImage
-+              <ImageContainer
-                 image={this.props.previous}
-                 onElementLoad={this.props.onPreviousImageLoad}
-                 style={maxSize}
-@@ -46,7 +46,7 @@
-                 opacity: this.state.crossfade,
-               }}
-             >
--              <DiffImage
-+              <ImageContainer
-                 image={this.props.current}
-                 onElementLoad={this.props.onCurrentImageLoad}
-                 style={maxSize}
-merged
-  result 100644 15f3635eca7dc317535634f3b6a2425108039574 app/src/ui/diff/image-diffs/swipe.tsx
-  our    100644 3521bfb7f464e480630b10b9f2a49b947501b436 app/src/ui/diff/image-diffs/swipe.tsx
-@@ -1,6 +1,6 @@
- import * as React from 'react'
- import { ICommonImageDiffProperties } from './modified-image-diff'
--import { DiffImage } from './diff-image'
-+import { ImageContainer } from './image-container'
-
- /** How much bigger the slider should be than the images. */
- const SliderOverflow = 14
-@@ -35,7 +35,7 @@
-         <div className="sizing-container" ref={this.props.onContainerRef}>
-           <div className="image-container" style={style}>
-             <div className="image-diff-current" style={style}>
--              <DiffImage
-+              <ImageContainer
-                 image={this.props.current}
-                 onElementLoad={this.props.onCurrentImageLoad}
-                 style={maxSize}
-@@ -49,7 +49,7 @@
-               }}
-             >
-               <div className="image-diff-previous" style={style}>
--                <DiffImage
-+                <ImageContainer
-                   image={this.props.previous}
-                   onElementLoad={this.props.onPreviousImageLoad}
-                   style={maxSize}
-merged
-  result 100644 8120d22a6487dd73d1da4fa2b4bb7515593c24cb app/src/ui/diff/image-diffs/two-up.tsx
-  our    100644 b7ddc388ed938aabd72200af704a3aefccdf7ba6 app/src/ui/diff/image-diffs/two-up.tsx
-@@ -1,7 +1,9 @@
- import * as React from 'react'
--import { DiffImage } from './diff-image'
-+import { ImageContainer } from './image-container'
- import { ICommonImageDiffProperties } from './modified-image-diff'
- import { ISize } from './sizing'
-+import { formatBytes, Sign } from '../../lib/bytes'
-+import * as classNames from 'classnames'
-
- /**
-  * The height of the Deleted/Added labels at the top and the image dimension
-@@ -27,40 +29,69 @@
-       ),
-       maxHeight: this.props.maxSize.height - ControlsHeight,
-     }
-+    const percentDiff = (previous: number, current: number) => {
-+      const diff = Math.round((100 * (current - previous)) / previous)
-+      const sign = diff > 0 ? '+' : ''
-+      return sign + diff + '%'
-+    }
-
-     const zeroSize = { width: 0, height: 0 }
-     const previousImageSize = this.props.previousImageSize || zeroSize
-     const currentImageSize = this.props.currentImageSize || zeroSize
-+    const diffPercent = percentDiff(
-+      this.props.previous.bytes,
-+      this.props.current.bytes
-+    )
-+    const diffBytes = this.props.current.bytes - this.props.previous.bytes
-
-     return (
--      <div className="image-diff-two-up" ref={this.props.onContainerRef}>
--        <div className="image-diff-previous">
--          <div className="image-diff-header">Deleted</div>
--          <DiffImage
--            image={this.props.previous}
--            onElementLoad={this.props.onPreviousImageLoad}
--            style={style}
--          />
-+      <div className="image-diff-container" ref={this.props.onContainerRef}>
-+        <div className="image-diff-two-up">
-+          <div className="image-diff-previous">
-+            <div className="image-diff-header">Deleted</div>
-+            <ImageContainer
-+              image={this.props.previous}
-+              onElementLoad={this.props.onPreviousImageLoad}
-+              style={style}
-+            />
-
--          <div className="image-diff-footer">
--            <span className="strong">W:</span> {previousImageSize.width}px |{' '}
--            <span className="strong">H:</span> {previousImageSize.height}px
-+            <div className="image-diff-footer">
-+              <span className="strong">W:</span> {previousImageSize.width}px |{' '}
-+              <span className="strong">H:</span> {previousImageSize.height}px |{' '}
-+              <span className="strong">Size:</span>{' '}
-+              {formatBytes(this.props.previous.bytes)}
-+            </div>
-           </div>
--        </div>
-
--        <div className="image-diff-current">
--          <div className="image-diff-header">Added</div>
--          <DiffImage
--            image={this.props.current}
--            onElementLoad={this.props.onCurrentImageLoad}
--            style={style}
--          />
-+          <div className="image-diff-current">
-+            <div className="image-diff-header">Added</div>
-+            <ImageContainer
-+              image={this.props.current}
-+              onElementLoad={this.props.onCurrentImageLoad}
-+              style={style}
-+            />
-
--          <div className="image-diff-footer">
--            <span className="strong">W:</span> {currentImageSize.width}px |{' '}
--            <span className="strong">H:</span> {currentImageSize.height}px
-+            <div className="image-diff-footer">
-+              <span className="strong">W:</span> {currentImageSize.width}px |{' '}
-+              <span className="strong">H:</span> {currentImageSize.height}px |{' '}
-+              <span className="strong">Size:</span>{' '}
-+              {formatBytes(this.props.current.bytes)}
-+            </div>
-           </div>
-         </div>
-+        <div className="image-diff-summary">
-+          Diff:{' '}
-+          <span
-+            className={classNames({
-+              added: diffBytes > 0,
-+              removed: diffBytes < 0,
-+            })}
-+          >
-+            {diffBytes !== 0
-+              ? `${formatBytes(diffBytes, Sign.Forced)} (${diffPercent})`
-+              : 'No size difference'}
-+          </span>
-+        </div>
-       </div>
-     )
-   }
-merged
-  result 100644 8695c640dc0a5184c74a112f131a2e2a07ef572d app/src/ui/diff/index.tsx
-  our    100644 4c035cd8232f41eb5911c3407db12ac26112844d app/src/ui/diff/index.tsx
-@@ -1,22 +1,12 @@
--import { clipboard } from 'electron'
- import * as React from 'react'
--import * as ReactDOM from 'react-dom'
--import * as Path from 'path'
--import { Disposable } from 'event-kit'
-+import { Editor } from 'codemirror'
-
- import { assertNever } from '../../lib/fatal-error'
--import {
--  NewImageDiff,
--  ModifiedImageDiff,
--  DeletedImageDiff,
--} from './image-diffs'
--import { BinaryFile } from './binary-file'
--
--import { Editor } from 'codemirror'
--import { CodeMirrorHost } from './code-mirror-host'
--import { Repository } from '../../models/repository'
- import { encodePathAsUrl } from '../../lib/path'
- import { ImageDiffType } from '../../lib/app-state'
-+import { Dispatcher } from '../../lib/dispatcher/dispatcher'
-+
-+import { Repository } from '../../models/repository'
- import {
-   CommittedFileChange,
-   WorkingDirectoryFileChange,
-@@ -28,257 +18,29 @@
-   IDiff,
-   IImageDiff,
-   ITextDiff,
--  DiffLine,
--  DiffLineType,
-   ILargeTextDiff,
- } from '../../models/diff'
--import { Dispatcher } from '../../lib/dispatcher/dispatcher'
--
--import {
--  diffLineForIndex,
--  diffHunkForIndex,
--  findInteractiveDiffRange,
--  lineNumberForDiffLine,
--} from './diff-explorer'
--import { DiffLineGutter } from './diff-line-gutter'
--import { IEditorConfigurationExtra } from './editor-configuration-extra'
--import { ISelectionStrategy } from './selection/selection-strategy'
--import { DragDropSelection } from './selection/drag-drop-selection-strategy'
--import { RangeSelection } from './selection/range-selection-strategy'
--import { Octicon, OcticonSymbol } from '../octicons'
--
--import { fatalError } from '../../lib/fatal-error'
-
--import { RangeSelectionSizePixels } from './edge-detection'
--import { relativeChanges } from './changed-range'
--import { getPartialBlobContents } from '../../lib/git/show'
--import { readPartialFile } from '../../lib/file-system'
--
--import { DiffSyntaxMode, IDiffSyntaxModeSpec } from './diff-syntax-mode'
--import { highlight } from '../../lib/highlighter/worker'
--import { ITokens } from '../../lib/highlighter/types'
- import { Button } from '../lib/button'
-
--/** The longest line for which we'd try to calculate a line diff. */
--const MaxIntraLineDiffStringLength = 4096
--
--/** The maximum number of bytes we'll process for highlighting. */
--const MaxHighlightContentLength = 256 * 1024
-+import {
-+  NewImageDiff,
-+  ModifiedImageDiff,
-+  DeletedImageDiff,
-+} from './image-diffs'
-+import { BinaryFile } from './binary-file'
-+import { diffLineForIndex } from './diff-explorer'
-+import { DiffLineGutter } from './diff-line-gutter'
-+import { DiffSyntaxMode } from './diff-syntax-mode'
-
--// This is a custom version of the no-newline octicon that's exactly as
--// tall as it needs to be (8px) which helps with aligning it on the line.
--const narrowNoNewlineSymbol = new OcticonSymbol(
--  16,
--  8,
--  'm 16,1 0,3 c 0,0.55 -0.45,1 -1,1 l -3,0 0,2 -3,-3 3,-3 0,2 2,0 0,-2 2,0 z M 8,4 C 8,6.2 6.2,8 4,8 1.8,8 0,6.2 0,4 0,1.8 1.8,0 4,0 6.2,0 8,1.8 8,4 Z M 1.5,5.66 5.66,1.5 C 5.18,1.19 4.61,1 4,1 2.34,1 1,2.34 1,4 1,4.61 1.19,5.17 1.5,5.66 Z M 7,4 C 7,3.39 6.81,2.83 6.5,2.34 L 2.34,6.5 C 2.82,6.81 3.39,7 4,7 5.66,7 7,5.66 7,4 Z'
--)
-+import { ISelectionStrategy } from './selection/selection-strategy'
-+import { TextDiff } from './text-diff'
-
- // image used when no diff is displayed
- const NoDiffImage = encodePathAsUrl(__dirname, 'static/ufo-alert.svg')
-
- type ChangedFile = WorkingDirectoryFileChange | CommittedFileChange
-
--interface ILineFilters {
--  readonly oldLineFilter: Array<number>
--  readonly newLineFilter: Array<number>
--}
--
--interface IFileContents {
--  readonly file: ChangedFile
--  readonly oldContents: Buffer
--  readonly newContents: Buffer
--}
--
--interface IFileTokens {
--  readonly oldTokens: ITokens
--  readonly newTokens: ITokens
--}
--
--async function getOldFileContent(
--  repository: Repository,
--  file: ChangedFile
--): Promise<Buffer> {
--  if (file.status === AppFileStatus.New) {
--    return new Buffer(0)
--  }
--
--  let commitish
--
--  if (file instanceof WorkingDirectoryFileChange) {
--    // If we pass an empty string here we get the contents
--    // that are in the index. But since we call diff with
--    // --no-index (see diff.ts) we need to look at what's
--    // actually committed to get the appropriate content.
--    commitish = 'HEAD'
--  } else if (file instanceof CommittedFileChange) {
--    commitish = `${file.commitish}^`
--  } else {
--    return assertNever(file, 'Unknown file change type')
--  }
--
--  return getPartialBlobContents(
--    repository,
--    commitish,
--    file.oldPath || file.path,
--    MaxHighlightContentLength
--  )
--}
--
--async function getNewFileContent(
--  repository: Repository,
--  file: ChangedFile
--): Promise<Buffer> {
--  if (file.status === AppFileStatus.Deleted) {
--    return new Buffer(0)
--  }
--
--  if (file instanceof WorkingDirectoryFileChange) {
--    return readPartialFile(
--      Path.join(repository.path, file.path),
--      0,
--      MaxHighlightContentLength - 1
--    )
--  } else if (file instanceof CommittedFileChange) {
--    return getPartialBlobContents(
--      repository,
--      file.commitish,
--      file.path,
--      MaxHighlightContentLength
--    )
--  }
--
--  return assertNever(file, 'Unknown file change type')
--}
--
--async function getFileContents(
--  repo: Repository,
--  file: ChangedFile,
--  lineFilters: ILineFilters
--): Promise<IFileContents> {
--  const oldContentsPromise = lineFilters.oldLineFilter.length
--    ? getOldFileContent(repo, file)
--    : Promise.resolve(new Buffer(0))
--
--  const newContentsPromise = lineFilters.newLineFilter.length
--    ? getNewFileContent(repo, file)
--    : Promise.resolve(new Buffer(0))
--
--  const [oldContents, newContents] = await Promise.all([
--    oldContentsPromise.catch(e => {
--      log.error('Could not load old contents for syntax highlighting', e)
--      return new Buffer(0)
--    }),
--    newContentsPromise.catch(e => {
--      log.error('Could not load new contents for syntax highlighting', e)
--      return new Buffer(0)
--    }),
--  ])
--
--  return { file, oldContents, newContents }
--}
--
--/**
-- * Figure out which lines we need to have tokenized in
-- * both the old and new version of the file.
-- */
--function getLineFilters(diff: ITextDiff): ILineFilters {
--  const oldLineFilter = new Array<number>()
--  const newLineFilter = new Array<number>()
--
--  const diffLines = new Array<DiffLine>()
--
--  let anyAdded = false
--  let anyDeleted = false
--
--  for (const hunk of diff.hunks) {
--    for (const line of hunk.lines) {
--      anyAdded = anyAdded || line.type === DiffLineType.Add
--      anyDeleted = anyDeleted || line.type === DiffLineType.Delete
--      diffLines.push(line)
--    }
--  }
--
--  for (const line of diffLines) {
--    // So this might need a little explaining. What we're trying
--    // to achieve here is if the diff contains only additions or
--    // only deletions we'll source all the highlighted lines from
--    // either the before or after file. That way we can completely
--    // disregard loading, and highlighting, the other version.
--    if (line.oldLineNumber !== null && line.newLineNumber !== null) {
--      if (anyAdded && !anyDeleted) {
--        newLineFilter.push(line.newLineNumber - 1)
--      } else {
--        oldLineFilter.push(line.oldLineNumber - 1)
--      }
--    } else {
--      // If there's a mix (meaning we'll have to read from both
--      // anyway) we'll prioritize the old version since
--      // that's immutable and less likely to be the subject of a
--      // race condition when someone rapidly modifies the file on
--      // disk.
--      if (line.oldLineNumber !== null) {
--        oldLineFilter.push(line.oldLineNumber - 1)
--      } else if (line.newLineNumber !== null) {
--        newLineFilter.push(line.newLineNumber - 1)
--      }
--    }
--  }
--
--  return { oldLineFilter, newLineFilter }
--}
--
--async function highlightContents(
--  contents: IFileContents,
--  tabSize: number,
--  lineFilters: ILineFilters
--): Promise<IFileTokens> {
--  const { file, oldContents, newContents } = contents
--
--  const [oldTokens, newTokens] = await Promise.all([
--    highlight(
--      oldContents.toString('utf8'),
--      Path.extname(file.oldPath || file.path),
--      tabSize,
--      lineFilters.oldLineFilter
--    ).catch(e => {
--      log.error('Highlighter worked failed for old contents', e)
--      return {}
--    }),
--    highlight(
--      newContents.toString('utf8'),
--      Path.extname(file.path),
--      tabSize,
--      lineFilters.newLineFilter
--    ).catch(e => {
--      log.error('Highlighter worked failed for new contents', e)
--      return {}
--    }),
--  ])
--
--  return { oldTokens, newTokens }
--}
--
--/**
-- * Checks to see if any key parameters in the props object that are used
-- * when performing highlighting has changed. This is used to determine
-- * whether highlighting should abort in between asynchronous operations
-- * due to some factor (like which file is currently selected) have changed
-- * and thus rendering the in-flight highlighting data useless.
-- */
--function highlightParametersEqual(newProps: IDiffProps, prevProps: IDiffProps) {
--  if (newProps === prevProps) {
--    return true
--  }
--
--  return (
--    newProps.file.path === prevProps.file.path &&
--    newProps.file.oldPath === prevProps.file.oldPath &&
--    newProps.diff.kind === DiffType.Text &&
--    prevProps.diff.kind === DiffType.Text &&
--    newProps.diff.text === prevProps.diff.text
--  )
--}
--
- /** The props for the Diff component. */
- interface IDiffProps {
-   readonly repository: Repository
-@@ -313,21 +75,6 @@
- /** A component which renders a diff for a file. */
- export class Diff extends React.Component<IDiffProps, IDiffState> {
-   private codeMirror: Editor | null = null
--  private gutterWidth: number | null = null
--
--  /**
--   * We store the scroll position before reloading the same diff so that we can
--   * restore it when we're done. If we're not reloading the same diff, this'll
--   * be null.
--   */
--  private scrollPositionToRestore: { left: number; top: number } | null = null
--
--  /**
--   * A mapping from CodeMirror line handles to disposables which, when disposed
--   * cleans up any line gutter components and events associated with that line.
--   * See renderLine for more information.
--   */
--  private readonly lineCleanup = new Map<any, Disposable>()
-
-   /**
-    * Maintain the current state of the user interacting with the diff gutter
-@@ -348,27 +95,7 @@
-   }
-
-   public componentWillReceiveProps(nextProps: IDiffProps) {
--    // If we're reloading the same file, we want to save the current scroll
--    // position and restore it after the diff's been updated.
--    const sameFile =
--      nextProps.file &&
--      this.props.file &&
--      nextProps.file.id === this.props.file.id
--
--    // Happy path, if the text hasn't changed we won't re-render
--    // and subsequently won't have to restore the scroll position.
--    const textHasChanged = nextProps.diff !== this.props.diff
--
-     const codeMirror = this.codeMirror
--    if (codeMirror && sameFile && textHasChanged) {
--      const scrollInfo = codeMirror.getScrollInfo()
--      this.scrollPositionToRestore = {
--        left: scrollInfo.left,
--        top: scrollInfo.top,
--      }
--    } else {
--      this.scrollPositionToRestore = null
--    }
-
-     if (
-       codeMirror &&
-@@ -394,8 +121,6 @@
-         return
-       }
-
--      this.gutterWidth = null
--
-       const diff = nextProps.diff
-       this.cachedGutterElements.forEach((element, index) => {
-         if (!element) {
-@@ -404,7 +129,7 @@
-         }
-
-         if (diff.kind === DiffType.Text) {
--          const line = diffLineForIndex(diff, index)
-+          const line = diffLineForIndex(diff.hunks, index)
-           const isIncludable = line ? line.isIncludeableLine() : false
-           const isSelected = selection.isSelected(index) && isIncludable
-           element.setSelected(isSelected)
-@@ -413,179 +138,26 @@
-     }
-   }
-
--  public componentWillUnmount() {
--    this.dispose()
--  }
--
--  public componentDidUpdate(prevProps: IDiffProps) {
--    const diff = this.props.diff
--    if (diff === prevProps.diff) {
--      return
--    }
--
--    if (
--      prevProps.diff.kind === DiffType.Text &&
--      diff.kind === DiffType.Text &&
--      diff.text === prevProps.diff.text
--    ) {
--      return
--    }
--
--    if (diff.kind === DiffType.Text && this.codeMirror) {
--      this.codeMirror.setOption('mode', { name: DiffSyntaxMode.ModeName })
--    }
--
--    this.initDiffSyntaxMode()
--  }
--
--  public componentDidMount() {
--    if (this.props.diff.kind === DiffType.Text) {
--      this.initDiffSyntaxMode()
--    }
--  }
--
-   public render() {
--    return this.renderDiff(this.props.diff)
--  }
--
--  public async initDiffSyntaxMode() {
--    const cm = this.codeMirror
--    const file = this.props.file
-     const diff = this.props.diff
--    const repo = this.props.repository
--
--    if (!cm || diff.kind !== DiffType.Text) {
--      return
--    }
--
--    // Store the current props to that we can see if anything
--    // changes from underneath us as we're making asynchronous
--    // operations that makes our data stale or useless.
--    const propsSnapshot = this.props
--
--    const lineFilters = getLineFilters(diff)
--    const contents = await getFileContents(repo, file, lineFilters)
--
--    if (!highlightParametersEqual(this.props, propsSnapshot)) {
--      return
--    }
--
--    const tsOpt = cm.getOption('tabSize')
--    const tabSize = typeof tsOpt === 'number' ? tsOpt : 4
--
--    const tokens = await highlightContents(contents, tabSize, lineFilters)
--
--    if (!highlightParametersEqual(this.props, propsSnapshot)) {
--      return
--    }
-
--    const spec: IDiffSyntaxModeSpec = {
--      name: DiffSyntaxMode.ModeName,
--      diff,
--      oldTokens: tokens.oldTokens,
--      newTokens: tokens.newTokens,
--    }
--
--    cm.setOption('mode', spec)
--  }
--
--  private dispose() {
--    this.codeMirror = null
--
--    this.lineCleanup.forEach(disposable => disposable.dispose())
--    this.lineCleanup.clear()
--
--    document.removeEventListener('mouseup', this.onDocumentMouseUp)
--  }
--
--  /**
--   * compute the diff gutter width based on what's been rendered in the browser
--   */
--  private getAndCacheGutterWidth = (): number | null => {
--    if (this.gutterWidth) {
--      return this.gutterWidth
--    }
--
--    if (this.codeMirror) {
--      // as getWidth will return 0 for elements that are offscreen, this code
--      // will look for the first row of the current viewport, which should be
--      // onscreen
--      const viewport = this.codeMirror.getScrollInfo()
--      const top = viewport.top
--
--      const row = this.codeMirror.lineAtHeight(top, 'local')
--      const element = this.cachedGutterElements.get(row)
--
--      if (!element) {
--        console.error(
--          `unable to find element at ${row}, should probably look into that`
--        )
--        return null
--      }
--
--      this.gutterWidth = element.getWidth()
--
--      if (this.gutterWidth === 0) {
--        console.error(
--          `element at row ${row} does not have a width, should probably look into that`
--        )
--      }
--    }
--
--    return this.gutterWidth
--  }
--
--  private updateRangeHoverState = (
--    start: number,
--    end: number,
--    show: boolean
--  ) => {
--    for (let i = start; i <= end; i++) {
--      this.hoverLine(i, show)
--    }
--  }
--
--  private hoverLine = (row: number, include: boolean) => {
--    const element = this.cachedGutterElements.get(row)
--
--    // element may not be drawn by the editor, so updating it isn't necessary
--    if (element) {
--      element.setHover(include)
--    }
--  }
--
--  /**
--   * start a selection gesture based on the current interation
--   */
--  private startSelection = (
--    file: WorkingDirectoryFileChange,
--    diff: ITextDiff,
--    index: number,
--    isRangeSelection: boolean
--  ) => {
--    const snapshot = file.selection
--    const selected = snapshot.isSelected(index)
--    const desiredSelection = !selected
--
--    if (isRangeSelection) {
--      const range = findInteractiveDiffRange(diff, index)
--      if (!range) {
--        console.error('unable to find range for given line in diff')
--        return
-+    switch (diff.kind) {
-+      case DiffType.Text:
-+        return this.renderText(diff)
-+      case DiffType.Binary:
-+        return this.renderBinaryFile()
-+      case DiffType.Image:
-+        return this.renderImage(diff)
-+      case DiffType.LargeText: {
-+        return this.state.forceShowLargeDiff
-+          ? this.renderLargeText(diff)
-+          : this.renderLargeTextDiff()
-       }
--
--      this.selection = new RangeSelection(
--        range.start,
--        range.end,
--        desiredSelection,
--        snapshot
--      )
--    } else {
--      this.selection = new DragDropSelection(index, desiredSelection, snapshot)
-+      case DiffType.Unrenderable:
-+        return this.renderUnrenderableDiff()
-+      default:
-+        return assertNever(diff, `Unsupported diff type: ${diff}`)
-     }
--
--    this.selection.paint(this.cachedGutterElements)
--    document.addEventListener('mouseup', this.onDocumentMouseUp)
-   }
-
-   /**
-@@ -618,332 +190,6 @@
-     this.selection = null
-   }
-
--  private onGutterMouseDown = (
--    index: number,
--    diff: ITextDiff,
--    isRangeSelection: boolean
--  ) => {
--    if (!(this.props.file instanceof WorkingDirectoryFileChange)) {
--      fatalError(
--        'must not start selection when selected file is not a WorkingDirectoryFileChange'
--      )
--      return
--    }
--
--    if (isRangeSelection) {
--      const hunk = diffHunkForIndex(diff, index)
--      if (!hunk) {
--        console.error('unable to find hunk for given line in diff')
--      }
--    }
--    this.startSelection(this.props.file, diff, index, isRangeSelection)
--  }
--
--  private onGutterMouseMove = (index: number) => {
--    if (!this.selection) {
--      return
--    }
--
--    this.selection.update(index)
--    this.selection.paint(this.cachedGutterElements)
--  }
--
--  private onDiffTextMouseMove = (
--    ev: MouseEvent,
--    diff: ITextDiff,
--    index: number
--  ) => {
--    const isActive = this.isMouseCursorNearGutter(ev)
--    if (isActive === null) {
--      return
--    }
--
--    const diffLine = diffLineForIndex(diff, index)
--    if (!diffLine) {
--      return
--    }
--
--    if (!diffLine.isIncludeableLine()) {
--      return
--    }
--
--    const range = findInteractiveDiffRange(diff, index)
--    if (!range) {
--      console.error('unable to find range for given index in diff')
--      return
--    }
--
--    this.updateRangeHoverState(range.start, range.end, isActive)
--  }
--
--  private onDiffTextMouseDown = (
--    ev: MouseEvent,
--    diff: ITextDiff,
--    index: number
--  ) => {
--    const isActive = this.isMouseCursorNearGutter(ev)
--
--    if (isActive) {
--      // this line is important because it prevents the codemirror editor
--      // from handling the event and resetting the scroll position.
--      // it doesn't do this when you click on elements in the gutter,
--      // which is an amazing joke to have placed upon me right now
--      ev.preventDefault()
--
--      if (!(this.props.file instanceof WorkingDirectoryFileChange)) {
--        fatalError(
--          'must not start selection when selected file is not a WorkingDirectoryFileChange'
--        )
--        return
--      }
--
--      this.startSelection(this.props.file, diff, index, true)
--    }
--  }
--
--  private onDiffTextMouseLeave = (
--    ev: MouseEvent,
--    diff: ITextDiff,
--    index: number
--  ) => {
--    const range = findInteractiveDiffRange(diff, index)
--    if (!range) {
--      console.error('unable to find range for given index in diff')
--      return
--    }
--
--    this.updateRangeHoverState(range.start, range.end, false)
--  }
--
--  private isMouseCursorNearGutter = (ev: MouseEvent): boolean | null => {
--    const width = this.getAndCacheGutterWidth()
--
--    if (!width) {
--      // should fail earlier than this with a helpful error message
--      return null
--    }
--
--    const deltaX = ev.layerX - width
--    return deltaX >= 0 && deltaX <= RangeSelectionSizePixels
--  }
--
--  private renderLine = (instance: any, line: any, element: HTMLElement) => {
--    const existingLineDisposable = this.lineCleanup.get(line)
--
--    // If we can find the line in our cleanup list that means the line is
--    // being re-rendered. Agains, CodeMirror doesn't fire the 'delete' event
--    // when this happens.
--    if (existingLineDisposable) {
--      existingLineDisposable.dispose()
--      this.lineCleanup.delete(line)
--    }
--
--    const diff = this.props.diff
--    if (diff.kind !== DiffType.Text) {
--      return
--    }
--
--    const index = instance.getLineNumber(line) as number
--
--    const diffLine = diffLineForIndex(diff, index)
--    if (diffLine) {
--      const diffLineElement = element.children[0] as HTMLSpanElement
--
--      let noNewlineReactContainer: HTMLSpanElement | null = null
--
--      if (diffLine.noTrailingNewLine) {
--        noNewlineReactContainer = document.createElement('span')
--        noNewlineReactContainer.setAttribute(
--          'title',
--          'No newline at end of file'
--        )
--        ReactDOM.render(
--          <Octicon symbol={narrowNoNewlineSymbol} className="no-newline" />,
--          noNewlineReactContainer
--        )
--        diffLineElement.appendChild(noNewlineReactContainer)
--      }
--
--      const gutterReactContainer = document.createElement('span')
--
--      let isIncluded = false
--      if (this.props.file instanceof WorkingDirectoryFileChange) {
--        isIncluded = this.props.file.selection.isSelected(index)
--      }
--
--      const cache = this.cachedGutterElements
--
--      ReactDOM.render(
--        <DiffLineGutter
--          line={diffLine}
--          isIncluded={isIncluded}
--          index={index}
--          readOnly={this.props.readOnly}
--          diff={diff}
--          updateRangeHoverState={this.updateRangeHoverState}
--          isSelectionEnabled={this.isSelectionEnabled}
--          onMouseDown={this.onGutterMouseDown}
--          onMouseMove={this.onGutterMouseMove}
--        />,
--        gutterReactContainer,
--        function(this: DiffLineGutter) {
--          if (this !== undefined) {
--            cache.set(index, this)
--          }
--        }
--      )
--
--      const onMouseMoveLine: (ev: MouseEvent) => void = ev => {
--        this.onDiffTextMouseMove(ev, diff, index)
--      }
--
--      const onMouseDownLine: (ev: MouseEvent) => void = ev => {
--        this.onDiffTextMouseDown(ev, diff, index)
--      }
--
--      const onMouseLeaveLine: (ev: MouseEvent) => void = ev => {
--        this.onDiffTextMouseLeave(ev, diff, index)
--      }
--
--      if (!this.props.readOnly) {
--        diffLineElement.addEventListener('mousemove', onMouseMoveLine)
--        diffLineElement.addEventListener('mousedown', onMouseDownLine)
--        diffLineElement.addEventListener('mouseleave', onMouseLeaveLine)
--      }
--
--      element.insertBefore(gutterReactContainer, diffLineElement)
--
--      // Hack(ish?). In order to be a real good citizen we need to unsubscribe from
--      // the line delete event once we've been called once or the component has been
--      // unmounted. In the latter case it's _probably_ not strictly necessary since
--      // the only thing gc rooted by the event should be isolated and eligble for
--      // collection. But let's be extra cautious I guess.
--      //
--      // The only way to unsubscribe is to pass the exact same function given to the
--      // 'on' function to the 'off' so we need a reference to ourselves, basically.
--      let deleteHandler: () => void // eslint-disable-line prefer-const
--
--      // Since we manually render a react component we have to take care of unmounting
--      // it or else we'll leak memory. This disposable will unmount the component.
--      //
--      // See https://facebook.github.io/react/blog/2015/10/01/react-render-and-top-level-api.html
--      const gutterCleanup = new Disposable(() => {
--        this.cachedGutterElements.delete(index)
--
--        ReactDOM.unmountComponentAtNode(gutterReactContainer)
--
--        if (noNewlineReactContainer) {
--          ReactDOM.unmountComponentAtNode(noNewlineReactContainer)
--        }
--
--        if (!this.props.readOnly) {
--          diffLineElement.removeEventListener('mousemove', onMouseMoveLine)
--          diffLineElement.removeEventListener('mousedown', onMouseDownLine)
--          diffLineElement.removeEventListener('mouseleave', onMouseLeaveLine)
--        }
--
--        line.off('delete', deleteHandler)
--      })
--
--      // Add the cleanup disposable to our list of disposables so that we clean up when
--      // this component is unmounted or when the line is re-rendered. When either of that
--      // happens the line 'delete' event doesn't  fire.
--      this.lineCleanup.set(line, gutterCleanup)
--
--      // If the line delete event fires we dispose of the disposable (disposing is
--      // idempotent)
--      deleteHandler = () => {
--        const disp = this.lineCleanup.get(line)
--        if (disp) {
--          this.lineCleanup.delete(line)
--          disp.dispose()
--        }
--      }
--      line.on('delete', deleteHandler)
--    }
--  }
--
--  private isSelectionEnabled = () => {
--    return this.selection == null
--  }
--
--  private restoreScrollPosition(cm: Editor) {
--    const scrollPosition = this.scrollPositionToRestore
--    if (cm && scrollPosition) {
--      cm.scrollTo(scrollPosition.left, scrollPosition.top)
--    }
--  }
--
--  private markIntraLineChanges(codeMirror: Editor, diff: ITextDiff) {
--    for (const hunk of diff.hunks) {
--      const additions = hunk.lines.filter(l => l.type === DiffLineType.Add)
--      const deletions = hunk.lines.filter(l => l.type === DiffLineType.Delete)
--      if (additions.length !== deletions.length) {
--        continue
--      }
--
--      for (let i = 0; i < additions.length; i++) {
--        const addLine = additions[i]
--        const deleteLine = deletions[i]
--        if (
--          addLine.text.length > MaxIntraLineDiffStringLength ||
--          deleteLine.text.length > MaxIntraLineDiffStringLength
--        ) {
--          continue
--        }
--
--        const changeRanges = relativeChanges(
--          addLine.content,
--          deleteLine.content
--        )
--        const addRange = changeRanges.stringARange
--        if (addRange.length > 0) {
--          const addLineNumber = lineNumberForDiffLine(addLine, diff)
--          if (addLineNumber > -1) {
--            const addFrom = {
--              line: addLineNumber,
--              ch: addRange.location + 1,
--            }
--            const addTo = {
--              line: addLineNumber,
--              ch: addRange.location + addRange.length + 1,
--            }
--            codeMirror
--              .getDoc()
--              .markText(addFrom, addTo, { className: 'cm-diff-add-inner' })
--          }
--        }
--
--        const deleteRange = changeRanges.stringBRange
--        if (deleteRange.length > 0) {
--          const deleteLineNumber = lineNumberForDiffLine(deleteLine, diff)
--          if (deleteLineNumber > -1) {
--            const deleteFrom = {
--              line: deleteLineNumber,
--              ch: deleteRange.location + 1,
--            }
--            const deleteTo = {
--              line: deleteLineNumber,
--              ch: deleteRange.location + deleteRange.length + 1,
--            }
--            codeMirror.getDoc().markText(deleteFrom, deleteTo, {
--              className: 'cm-diff-delete-inner',
--            })
--          }
--        }
--      }
--    }
--  }
--
--  private onChanges = (cm: Editor) => {
--    this.restoreScrollPosition(cm)
--
--    const diff = this.props.diff
--    if (diff.kind === DiffType.Text) {
--      this.markIntraLineChanges(cm, diff)
--    }
--  }
--
-   private onChangeImageDiffType = (type: ImageDiffType) => {
-     this.props.dispatcher.changeImageDiffType(type)
-   }
-@@ -977,7 +223,7 @@
-   private renderLargeTextDiff() {
-     return (
-       <div className="panel empty large-diff">
--        <img src={NoDiffImage} />
-+        <img src={NoDiffImage} className="blankslate-image" />
-         <p>
-           The diff is too large to be displayed by default.
-           <br />
-@@ -1003,8 +249,8 @@
-   private renderLargeText(diff: ILargeTextDiff) {
-     // guaranteed to be set since this function won't be called if text or hunks are null
-     const textDiff: ITextDiff = {
--      text: diff.text!,
--      hunks: diff.hunks!,
-+      text: diff.text,
-+      hunks: diff.hunks,
-       kind: DiffType.Text,
-       lineEndingsChange: diff.lineEndingsChange,
-     }
-@@ -1043,107 +289,18 @@
-   }
-
-   private renderTextDiff(diff: ITextDiff) {
--    const options: IEditorConfigurationExtra = {
--      lineNumbers: false,
--      readOnly: true,
--      showCursorWhenSelecting: false,
--      cursorBlinkRate: -1,
--      lineWrapping: true,
--      mode: { name: DiffSyntaxMode.ModeName },
--      // Make sure CodeMirror doesn't capture Tab and thus destroy tab navigation
--      extraKeys: { Tab: false },
--      scrollbarStyle: __DARWIN__ ? 'simple' : 'native',
--      styleSelectedText: true,
--      lineSeparator: '\n',
--      specialChars: /[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b-\u200f\u2028\u2029\ufeff]/,
--    }
--
--    // If the text looks like it could have been formatted using Windows
--    // line endings (\r\n) we need to massage it a bit before we hand it
--    // off to CodeMirror. That's because CodeMirror has two ways of splitting
--    // lines, one is the built in which splits on \n, \r\n and \r. The last
--    // one is important because that will match carriage return characters
--    // inside a diff line. The other way is when consumers supply the
--    // lineSeparator option. That option only takes a string meaning we can
--    // either make it split on '\r\n', '\n' or '\r' but not what we would like
--    // to do, namely '\r?\n'. We want to keep CR characters inside of a diff
--    // line so that we can mark them using the specialChars attribute so
--    // we convert all \r\n to \n and remove any trailing \r character.
--    const text =
--      diff.text.indexOf('\r') !== -1
--        ? diff.text
--            // Capture the \r if followed by (positive lookahead) a \n or
--            // the end of the string. Note that this does not capture the \n.
--            .replace(/\r(?=\n|$)/g, '')
--        : diff.text
--
-     return (
--      <CodeMirrorHost
--        className="diff-code-mirror"
--        value={text}
--        options={options}
--        isSelectionEnabled={this.isSelectionEnabled}
--        onChanges={this.onChanges}
--        onRenderLine={this.renderLine}
--        ref={this.getAndStoreCodeMirrorInstance}
--        onCopy={this.onCopy}
-+      <TextDiff
-+        repository={this.props.repository}
-+        file={this.props.file}
-+        readOnly={this.props.readOnly}
-+        onIncludeChanged={this.props.onIncludeChanged}
-+        text={diff.text}
-+        hunks={diff.hunks}
-       />
-     )
-   }
-
--  private onCopy = (editor: CodeMirror.Editor, event: Event) => {
--    event.preventDefault()
--
--    // Remove the diff line markers from the copied text. The beginning of the
--    // selection might start within a line, in which case we don't have to trim
--    // the diff type marker. But for selections that span multiple lines, we'll
--    // trim it.
--    const doc = editor.getDoc()
--    const lines = doc.getSelections()
--    const selectionRanges = doc.listSelections()
--    const lineContent: Array<string> = []
--
--    for (let i = 0; i < lines.length; i++) {
--      const range = selectionRanges[i]
--      const content = lines[i]
--      const contentLines = content.split('\n')
--      for (const [i, line] of contentLines.entries()) {
--        if (i === 0 && range.head.ch > 0) {
--          lineContent.push(line)
--        } else {
--          lineContent.push(line.substr(1))
--        }
--      }
--
--      const textWithoutMarkers = lineContent.join('\n')
--      clipboard.writeText(textWithoutMarkers)
--    }
--  }
--
--  private getAndStoreCodeMirrorInstance = (cmh: CodeMirrorHost | null) => {
--    this.codeMirror = cmh === null ? null : cmh.getEditor()
--  }
--
--  private renderDiff(diff: IDiff): JSX.Element | null {
--    switch (diff.kind) {
--      case DiffType.Text:
--        return this.renderText(diff)
--      case DiffType.Binary:
--        return this.renderBinaryFile()
--      case DiffType.Image:
--        return this.renderImage(diff)
--      case DiffType.LargeText: {
--        return this.state.forceShowLargeDiff
--          ? this.renderLargeText(diff)
--          : this.renderLargeTextDiff()
--      }
--      case DiffType.Unrenderable:
--        return this.renderUnrenderableDiff()
--      default:
--        return assertNever(diff, `Unsupported diff type: ${diff}`)
--    }
--  }
--
-   private showLargeDiff = () => {
-     this.setState({ forceShowLargeDiff: true })
-   }
-added in remote
-  their  100644 1ece0b9f0ed9655b30e1319e0b541d63d81d049c app/src/ui/diff/syntax-highlighting/index.ts
-@@ -0,0 +1,201 @@
-+import * as Path from 'path'
-+
-+import { assertNever } from '../../../lib/fatal-error'
-+
-+import { getPartialBlobContents } from '../../../lib/git/show'
-+import { readPartialFile } from '../../../lib/file-system'
-+import { highlight } from '../../../lib/highlighter/worker'
-+import { ITokens } from '../../../lib/highlighter/types'
-+
-+import {
-+  CommittedFileChange,
-+  WorkingDirectoryFileChange,
-+  AppFileStatus,
-+} from '../../../models/status'
-+import { Repository } from '../../../models/repository'
-+import { DiffHunk, DiffLineType, DiffLine } from '../../../models/diff'
-+
-+/** The maximum number of bytes we'll process for highlighting. */
-+const MaxHighlightContentLength = 256 * 1024
-+
-+type ChangedFile = WorkingDirectoryFileChange | CommittedFileChange
-+
-+interface ILineFilters {
-+  readonly oldLineFilter: Array<number>
-+  readonly newLineFilter: Array<number>
-+}
-+
-+interface IFileContents {
-+  readonly file: ChangedFile
-+  readonly oldContents: Buffer
-+  readonly newContents: Buffer
-+}
-+
-+interface IFileTokens {
-+  readonly oldTokens: ITokens
-+  readonly newTokens: ITokens
-+}
-+
-+async function getOldFileContent(
-+  repository: Repository,
-+  file: ChangedFile
-+): Promise<Buffer> {
-+  if (file.status === AppFileStatus.New) {
-+    return new Buffer(0)
-+  }
-+
-+  let commitish
-+
-+  if (file instanceof WorkingDirectoryFileChange) {
-+    // If we pass an empty string here we get the contents
-+    // that are in the index. But since we call diff with
-+    // --no-index (see diff.ts) we need to look at what's
-+    // actually committed to get the appropriate content.
-+    commitish = 'HEAD'
-+  } else if (file instanceof CommittedFileChange) {
-+    commitish = `${file.commitish}^`
-+  } else {
-+    return assertNever(file, 'Unknown file change type')
-+  }
-+
-+  return getPartialBlobContents(
-+    repository,
-+    commitish,
-+    file.oldPath || file.path,
-+    MaxHighlightContentLength
-+  )
-+}
-+
-+async function getNewFileContent(
-+  repository: Repository,
-+  file: ChangedFile
-+): Promise<Buffer> {
-+  if (file.status === AppFileStatus.Deleted) {
-+    return new Buffer(0)
-+  }
-+
-+  if (file instanceof WorkingDirectoryFileChange) {
-+    return readPartialFile(
-+      Path.join(repository.path, file.path),
-+      0,
-+      MaxHighlightContentLength - 1
-+    )
-+  } else if (file instanceof CommittedFileChange) {
-+    return getPartialBlobContents(
-+      repository,
-+      file.commitish,
-+      file.path,
-+      MaxHighlightContentLength
-+    )
-+  }
-+
-+  return assertNever(file, 'Unknown file change type')
-+}
-+
-+export async function getFileContents(
-+  repo: Repository,
-+  file: ChangedFile,
-+  lineFilters: ILineFilters
-+): Promise<IFileContents> {
-+  const oldContentsPromise = lineFilters.oldLineFilter.length
-+    ? getOldFileContent(repo, file)
-+    : Promise.resolve(new Buffer(0))
-+
-+  const newContentsPromise = lineFilters.newLineFilter.length
-+    ? getNewFileContent(repo, file)
-+    : Promise.resolve(new Buffer(0))
-+
-+  const [oldContents, newContents] = await Promise.all([
-+    oldContentsPromise.catch(e => {
-+      log.error('Could not load old contents for syntax highlighting', e)
-+      return new Buffer(0)
-+    }),
-+    newContentsPromise.catch(e => {
-+      log.error('Could not load new contents for syntax highlighting', e)
-+      return new Buffer(0)
-+    }),
-+  ])
-+
-+  return { file, oldContents, newContents }
-+}
-+
-+/**
-+ * Figure out which lines we need to have tokenized in
-+ * both the old and new version of the file.
-+ */
-+export function getLineFilters(hunks: ReadonlyArray<DiffHunk>): ILineFilters {
-+  const oldLineFilter = new Array<number>()
-+  const newLineFilter = new Array<number>()
-+
-+  const diffLines = new Array<DiffLine>()
-+
-+  let anyAdded = false
-+  let anyDeleted = false
-+
-+  for (const hunk of hunks) {
-+    for (const line of hunk.lines) {
-+      anyAdded = anyAdded || line.type === DiffLineType.Add
-+      anyDeleted = anyDeleted || line.type === DiffLineType.Delete
-+      diffLines.push(line)
-+    }
-+  }
-+
-+  for (const line of diffLines) {
-+    // So this might need a little explaining. What we're trying
-+    // to achieve here is if the diff contains only additions or
-+    // only deletions we'll source all the highlighted lines from
-+    // either the before or after file. That way we can completely
-+    // disregard loading, and highlighting, the other version.
-+    if (line.oldLineNumber !== null && line.newLineNumber !== null) {
-+      if (anyAdded && !anyDeleted) {
-+        newLineFilter.push(line.newLineNumber - 1)
-+      } else {
-+        oldLineFilter.push(line.oldLineNumber - 1)
-+      }
-+    } else {
-+      // If there's a mix (meaning we'll have to read from both
-+      // anyway) we'll prioritize the old version since
-+      // that's immutable and less likely to be the subject of a
-+      // race condition when someone rapidly modifies the file on
-+      // disk.
-+      if (line.oldLineNumber !== null) {
-+        oldLineFilter.push(line.oldLineNumber - 1)
-+      } else if (line.newLineNumber !== null) {
-+        newLineFilter.push(line.newLineNumber - 1)
-+      }
-+    }
-+  }
-+
-+  return { oldLineFilter, newLineFilter }
-+}
-+
-+export async function highlightContents(
-+  contents: IFileContents,
-+  tabSize: number,
-+  lineFilters: ILineFilters
-+): Promise<IFileTokens> {
-+  const { file, oldContents, newContents } = contents
-+
-+  const [oldTokens, newTokens] = await Promise.all([
-+    highlight(
-+      oldContents.toString('utf8'),
-+      Path.extname(file.oldPath || file.path),
-+      tabSize,
-+      lineFilters.oldLineFilter
-+    ).catch(e => {
-+      log.error('Highlighter worked failed for old contents', e)
-+      return {}
-+    }),
-+    highlight(
-+      newContents.toString('utf8'),
-+      Path.extname(file.path),
-+      tabSize,
-+      lineFilters.newLineFilter
-+    ).catch(e => {
-+      log.error('Highlighter worked failed for new contents', e)
-+      return {}
-+    }),
-+  ])
-+
-+  return { oldTokens, newTokens }
-+}
-added in remote
-  their  100644 6fec151426449ef33b9603d5c070b906db0d39ce app/src/ui/diff/text-diff.tsx
-@@ -0,0 +1,767 @@
-+import * as React from 'react'
-+import * as ReactDOM from 'react-dom'
-+import { clipboard } from 'electron'
-+import { Editor } from 'codemirror'
-+import { Disposable } from 'event-kit'
-+
-+import { fatalError } from '../../lib/fatal-error'
-+
-+import { DiffHunk, DiffLineType, DiffSelection } from '../../models/diff'
-+import {
-+  WorkingDirectoryFileChange,
-+  CommittedFileChange,
-+} from '../../models/status'
-+
-+import { Octicon, OcticonSymbol } from '../octicons'
-+
-+import { IEditorConfigurationExtra } from './editor-configuration-extra'
-+import { DiffSyntaxMode, IDiffSyntaxModeSpec } from './diff-syntax-mode'
-+import { CodeMirrorHost } from './code-mirror-host'
-+import { DiffLineGutter } from './diff-line-gutter'
-+import {
-+  diffLineForIndex,
-+  diffHunkForIndex,
-+  findInteractiveDiffRange,
-+  lineNumberForDiffLine,
-+} from './diff-explorer'
-+import { RangeSelectionSizePixels } from './edge-detection'
-+
-+import { ISelectionStrategy } from './selection/selection-strategy'
-+import { RangeSelection } from './selection/range-selection-strategy'
-+import { DragDropSelection } from './selection/drag-drop-selection-strategy'
-+
-+import {
-+  getLineFilters,
-+  getFileContents,
-+  highlightContents,
-+} from './syntax-highlighting'
-+import { relativeChanges } from './changed-range'
-+import { Repository } from '../../models/repository'
-+
-+/** The longest line for which we'd try to calculate a line diff. */
-+const MaxIntraLineDiffStringLength = 4096
-+
-+// This is a custom version of the no-newline octicon that's exactly as
-+// tall as it needs to be (8px) which helps with aligning it on the line.
-+const narrowNoNewlineSymbol = new OcticonSymbol(
-+  16,
-+  8,
-+  'm 16,1 0,3 c 0,0.55 -0.45,1 -1,1 l -3,0 0,2 -3,-3 3,-3 0,2 2,0 0,-2 2,0 z M 8,4 C 8,6.2 6.2,8 4,8 1.8,8 0,6.2 0,4 0,1.8 1.8,0 4,0 6.2,0 8,1.8 8,4 Z M 1.5,5.66 5.66,1.5 C 5.18,1.19 4.61,1 4,1 2.34,1 1,2.34 1,4 1,4.61 1.19,5.17 1.5,5.66 Z M 7,4 C 7,3.39 6.81,2.83 6.5,2.34 L 2.34,6.5 C 2.82,6.81 3.39,7 4,7 5.66,7 7,5.66 7,4 Z'
-+)
-+
-+type ChangedFile = WorkingDirectoryFileChange | CommittedFileChange
-+
-+/**
-+ * Checks to see if any key parameters in the props object that are used
-+ * when performing highlighting has changed. This is used to determine
-+ * whether highlighting should abort in between asynchronous operations
-+ * due to some factor (like which file is currently selected) have changed
-+ * and thus rendering the in-flight highlighting data useless.
-+ */
-+function highlightParametersEqual(
-+  newProps: ITextDiffProps,
-+  prevProps: ITextDiffProps
-+) {
-+  if (newProps === prevProps) {
-+    return true
-+  }
-+
-+  return (
-+    newProps.file.path === prevProps.file.path &&
-+    newProps.file.oldPath === prevProps.file.oldPath &&
-+    newProps.text === prevProps.text
-+  )
-+}
-+
-+interface ITextDiffProps {
-+  readonly repository: Repository
-+  readonly file: ChangedFile
-+  readonly readOnly: boolean
-+  readonly onIncludeChanged?: (diffSelection: DiffSelection) => void
-+  readonly text: string
-+  readonly hunks: ReadonlyArray<DiffHunk>
-+}
-+
-+export class TextDiff extends React.Component<ITextDiffProps, {}> {
-+  private codeMirror: Editor | null = null
-+
-+  private gutterWidth: number | null = null
-+
-+  /**
-+   * We store the scroll position before reloading the same diff so that we can
-+   * restore it when we're done. If we're not reloading the same diff, this'll
-+   * be null.
-+   */
-+  private scrollPositionToRestore: { left: number; top: number } | null = null
-+
-+  /**
-+   * A mapping from CodeMirror line handles to disposables which, when disposed
-+   * cleans up any line gutter components and events associated with that line.
-+   * See renderLine for more information.
-+   */
-+  private readonly lineCleanup = new Map<any, Disposable>()
-+
-+  /**
-+   *  a local cache of gutter elements, keyed by the row in the diff
-+   */
-+  private cachedGutterElements = new Map<number, DiffLineGutter>()
-+
-+  /**
-+   * Maintain the current state of the user interacting with the diff gutter
-+   */
-+  private selection: ISelectionStrategy | null = null
-+
-+  private async initDiffSyntaxMode() {
-+    const cm = this.codeMirror
-+    const file = this.props.file
-+    const hunks = this.props.hunks
-+    const repo = this.props.repository
-+
-+    if (!cm) {
-+      return
-+    }
-+
-+    // Store the current props to that we can see if anything
-+    // changes from underneath us as we're making asynchronous
-+    // operations that makes our data stale or useless.
-+    const propsSnapshot = this.props
-+
-+    const lineFilters = getLineFilters(hunks)
-+    const contents = await getFileContents(repo, file, lineFilters)
-+
-+    if (!highlightParametersEqual(this.props, propsSnapshot)) {
-+      return
-+    }
-+
-+    const tsOpt = cm.getOption('tabSize')
-+    const tabSize = typeof tsOpt === 'number' ? tsOpt : 4
-+
-+    const tokens = await highlightContents(contents, tabSize, lineFilters)
-+
-+    if (!highlightParametersEqual(this.props, propsSnapshot)) {
-+      return
-+    }
-+
-+    const spec: IDiffSyntaxModeSpec = {
-+      name: DiffSyntaxMode.ModeName,
-+      hunks: this.props.hunks,
-+      oldTokens: tokens.oldTokens,
-+      newTokens: tokens.newTokens,
-+    }
-+
-+    cm.setOption('mode', spec)
-+  }
-+
-+  private dispose() {
-+    this.codeMirror = null
-+
-+    this.lineCleanup.forEach(disposable => disposable.dispose())
-+    this.lineCleanup.clear()
-+
-+    document.removeEventListener('mouseup', this.onDocumentMouseUp)
-+  }
-+
-+  /**
-+   * compute the diff gutter width based on what's been rendered in the browser
-+   */
-+  private getAndCacheGutterWidth = (): number | null => {
-+    if (this.gutterWidth) {
-+      return this.gutterWidth
-+    }
-+
-+    if (this.codeMirror) {
-+      // as getWidth will return 0 for elements that are offscreen, this code
-+      // will look for the first row of the current viewport, which should be
-+      // onscreen
-+      const viewport = this.codeMirror.getScrollInfo()
-+      const top = viewport.top
-+
-+      const row = this.codeMirror.lineAtHeight(top, 'local')
-+      const element = this.cachedGutterElements.get(row)
-+
-+      if (!element) {
-+        console.error(
-+          `unable to find element at ${row}, should probably look into that`
-+        )
-+        return null
-+      }
-+
-+      this.gutterWidth = element.getWidth()
-+
-+      if (this.gutterWidth === 0) {
-+        console.error(
-+          `element at row ${row} does not have a width, should probably look into that`
-+        )
-+      }
-+    }
-+
-+    return this.gutterWidth
-+  }
-+
-+  private updateRangeHoverState = (
-+    start: number,
-+    end: number,
-+    show: boolean
-+  ) => {
-+    for (let i = start; i <= end; i++) {
-+      this.hoverLine(i, show)
-+    }
-+  }
-+
-+  private hoverLine = (row: number, include: boolean) => {
-+    const element = this.cachedGutterElements.get(row)
-+
-+    // element may not be drawn by the editor, so updating it isn't necessary
-+    if (element) {
-+      element.setHover(include)
-+    }
-+  }
-+
-+  /**
-+   * start a selection gesture based on the current interation
-+   */
-+  private startSelection = (
-+    file: WorkingDirectoryFileChange,
-+    hunks: ReadonlyArray<DiffHunk>,
-+    index: number,
-+    isRangeSelection: boolean
-+  ) => {
-+    const snapshot = file.selection
-+    const selected = snapshot.isSelected(index)
-+    const desiredSelection = !selected
-+
-+    if (isRangeSelection) {
-+      const range = findInteractiveDiffRange(hunks, index)
-+      if (!range) {
-+        console.error('unable to find range for given line in diff')
-+        return
-+      }
-+
-+      this.selection = new RangeSelection(
-+        range.start,
-+        range.end,
-+        desiredSelection,
-+        snapshot
-+      )
-+    } else {
-+      this.selection = new DragDropSelection(index, desiredSelection, snapshot)
-+    }
-+
-+    this.selection.paint(this.cachedGutterElements)
-+    document.addEventListener('mouseup', this.onDocumentMouseUp)
-+  }
-+
-+  /**
-+   * Helper event listener, registered when starting a selection by
-+   * clicking anywhere on or near the gutter. Immediately removes itself
-+   * from the mouseup event on the document element and ends any current
-+   * selection.
-+   *
-+   * TODO: Once Electron upgrades to Chrome 55 we can drop this in favor
-+   * of the 'once' option in addEventListener, see
-+   * https://developer.mozilla.org/en-US/docs/Web/API/EventTarget/addEventListener
-+   */
-+  private onDocumentMouseUp = (ev: MouseEvent) => {
-+    ev.preventDefault()
-+    document.removeEventListener('mouseup', this.onDocumentMouseUp)
-+    this.endSelection()
-+  }
-+
-+  /**
-+   * complete the selection gesture and apply the change to the diff
-+   */
-+  private endSelection = () => {
-+    if (!this.props.onIncludeChanged || !this.selection) {
-+      return
-+    }
-+
-+    this.props.onIncludeChanged(this.selection.done())
-+
-+    // operation is completed, clean this up
-+    this.selection = null
-+  }
-+
-+  private onGutterMouseDown = (
-+    index: number,
-+    hunks: ReadonlyArray<DiffHunk>,
-+    isRangeSelection: boolean
-+  ) => {
-+    if (!(this.props.file instanceof WorkingDirectoryFileChange)) {
-+      fatalError(
-+        'must not start selection when selected file is not a WorkingDirectoryFileChange'
-+      )
-+      return
-+    }
-+
-+    if (isRangeSelection) {
-+      const hunk = diffHunkForIndex(hunks, index)
-+      if (!hunk) {
-+        console.error('unable to find hunk for given line in diff')
-+      }
-+    }
-+    this.startSelection(this.props.file, hunks, index, isRangeSelection)
-+  }
-+
-+  private onGutterMouseMove = (index: number) => {
-+    if (!this.selection) {
-+      return
-+    }
-+
-+    this.selection.update(index)
-+    this.selection.paint(this.cachedGutterElements)
-+  }
-+
-+  private onDiffTextMouseMove = (
-+    ev: MouseEvent,
-+    hunks: ReadonlyArray<DiffHunk>,
-+    index: number
-+  ) => {
-+    const isActive = this.isMouseCursorNearGutter(ev)
-+    if (isActive === null) {
-+      return
-+    }
-+
-+    const diffLine = diffLineForIndex(hunks, index)
-+    if (!diffLine) {
-+      return
-+    }
-+
-+    if (!diffLine.isIncludeableLine()) {
-+      return
-+    }
-+
-+    const range = findInteractiveDiffRange(hunks, index)
-+    if (!range) {
-+      console.error('unable to find range for given index in diff')
-+      return
-+    }
-+
-+    this.updateRangeHoverState(range.start, range.end, isActive)
-+  }
-+
-+  private onDiffTextMouseDown = (
-+    ev: MouseEvent,
-+    hunks: ReadonlyArray<DiffHunk>,
-+    index: number
-+  ) => {
-+    const isActive = this.isMouseCursorNearGutter(ev)
-+
-+    if (isActive) {
-+      // this line is important because it prevents the codemirror editor
-+      // from handling the event and resetting the scroll position.
-+      // it doesn't do this when you click on elements in the gutter,
-+      // which is an amazing joke to have placed upon me right now
-+      ev.preventDefault()
-+
-+      if (!(this.props.file instanceof WorkingDirectoryFileChange)) {
-+        fatalError(
-+          'must not start selection when selected file is not a WorkingDirectoryFileChange'
-+        )
-+        return
-+      }
-+
-+      this.startSelection(this.props.file, hunks, index, true)
-+    }
-+  }
-+
-+  private onDiffTextMouseLeave = (
-+    ev: MouseEvent,
-+    hunks: ReadonlyArray<DiffHunk>,
-+    index: number
-+  ) => {
-+    const range = findInteractiveDiffRange(hunks, index)
-+    if (!range) {
-+      console.error('unable to find range for given index in diff')
-+      return
-+    }
-+
-+    this.updateRangeHoverState(range.start, range.end, false)
-+  }
-+
-+  private isMouseCursorNearGutter = (ev: MouseEvent): boolean | null => {
-+    const width = this.getAndCacheGutterWidth()
-+
-+    if (!width) {
-+      // should fail earlier than this with a helpful error message
-+      return null
-+    }
-+
-+    const deltaX = ev.layerX - width
-+    return deltaX >= 0 && deltaX <= RangeSelectionSizePixels
-+  }
-+
-+  private isSelectionEnabled = () => {
-+    return this.selection == null
-+  }
-+
-+  private restoreScrollPosition(cm: Editor) {
-+    const scrollPosition = this.scrollPositionToRestore
-+    if (cm && scrollPosition) {
-+      cm.scrollTo(scrollPosition.left, scrollPosition.top)
-+    }
-+  }
-+
-+  private renderLine = (instance: any, line: any, element: HTMLElement) => {
-+    const existingLineDisposable = this.lineCleanup.get(line)
-+
-+    // If we can find the line in our cleanup list that means the line is
-+    // being re-rendered. Agains, CodeMirror doesn't fire the 'delete' event
-+    // when this happens.
-+    if (existingLineDisposable) {
-+      existingLineDisposable.dispose()
-+      this.lineCleanup.delete(line)
-+    }
-+
-+    const index = instance.getLineNumber(line) as number
-+
-+    const diffLine = diffLineForIndex(this.props.hunks, index)
-+    if (diffLine) {
-+      const diffLineElement = element.children[0] as HTMLSpanElement
-+
-+      let noNewlineReactContainer: HTMLSpanElement | null = null
-+
-+      if (diffLine.noTrailingNewLine) {
-+        noNewlineReactContainer = document.createElement('span')
-+        noNewlineReactContainer.setAttribute(
-+          'title',
-+          'No newline at end of file'
-+        )
-+        ReactDOM.render(
-+          <Octicon symbol={narrowNoNewlineSymbol} className="no-newline" />,
-+          noNewlineReactContainer
-+        )
-+        diffLineElement.appendChild(noNewlineReactContainer)
-+      }
-+
-+      const gutterReactContainer = document.createElement('span')
-+
-+      let isIncluded = false
-+      if (this.props.file instanceof WorkingDirectoryFileChange) {
-+        isIncluded = this.props.file.selection.isSelected(index)
-+      }
-+
-+      const cache = this.cachedGutterElements
-+
-+      const hunks = this.props.hunks
-+
-+      ReactDOM.render(
-+        <DiffLineGutter
-+          line={diffLine}
-+          isIncluded={isIncluded}
-+          index={index}
-+          readOnly={this.props.readOnly}
-+          hunks={hunks}
-+          updateRangeHoverState={this.updateRangeHoverState}
-+          isSelectionEnabled={this.isSelectionEnabled}
-+          onMouseDown={this.onGutterMouseDown}
-+          onMouseMove={this.onGutterMouseMove}
-+        />,
-+        gutterReactContainer,
-+        function(this: DiffLineGutter) {
-+          if (this !== undefined) {
-+            cache.set(index, this)
-+          }
-+        }
-+      )
-+
-+      const onMouseMoveLine: (ev: MouseEvent) => void = ev => {
-+        this.onDiffTextMouseMove(ev, hunks, index)
-+      }
-+
-+      const onMouseDownLine: (ev: MouseEvent) => void = ev => {
-+        this.onDiffTextMouseDown(ev, hunks, index)
-+      }
-+
-+      const onMouseLeaveLine: (ev: MouseEvent) => void = ev => {
-+        this.onDiffTextMouseLeave(ev, hunks, index)
-+      }
-+
-+      if (!this.props.readOnly) {
-+        diffLineElement.addEventListener('mousemove', onMouseMoveLine)
-+        diffLineElement.addEventListener('mousedown', onMouseDownLine)
-+        diffLineElement.addEventListener('mouseleave', onMouseLeaveLine)
-+      }
-+
-+      element.insertBefore(gutterReactContainer, diffLineElement)
-+
-+      // Hack(ish?). In order to be a real good citizen we need to unsubscribe from
-+      // the line delete event once we've been called once or the component has been
-+      // unmounted. In the latter case it's _probably_ not strictly necessary since
-+      // the only thing gc rooted by the event should be isolated and eligble for
-+      // collection. But let's be extra cautious I guess.
-+      //
-+      // The only way to unsubscribe is to pass the exact same function given to the
-+      // 'on' function to the 'off' so we need a reference to ourselves, basically.
-+      let deleteHandler: () => void // eslint-disable-line prefer-const
-+
-+      // Since we manually render a react component we have to take care of unmounting
-+      // it or else we'll leak memory. This disposable will unmount the component.
-+      //
-+      // See https://facebook.github.io/react/blog/2015/10/01/react-render-and-top-level-api.html
-+      const gutterCleanup = new Disposable(() => {
-+        this.cachedGutterElements.delete(index)
-+
-+        ReactDOM.unmountComponentAtNode(gutterReactContainer)
-+
-+        if (noNewlineReactContainer) {
-+          ReactDOM.unmountComponentAtNode(noNewlineReactContainer)
-+        }
-+
-+        if (!this.props.readOnly) {
-+          diffLineElement.removeEventListener('mousemove', onMouseMoveLine)
-+          diffLineElement.removeEventListener('mousedown', onMouseDownLine)
-+          diffLineElement.removeEventListener('mouseleave', onMouseLeaveLine)
-+        }
-+
-+        line.off('delete', deleteHandler)
-+      })
-+
-+      // Add the cleanup disposable to our list of disposables so that we clean up when
-+      // this component is unmounted or when the line is re-rendered. When either of that
-+      // happens the line 'delete' event doesn't  fire.
-+      this.lineCleanup.set(line, gutterCleanup)
-+
-+      // If the line delete event fires we dispose of the disposable (disposing is
-+      // idempotent)
-+      deleteHandler = () => {
-+        const disp = this.lineCleanup.get(line)
-+        if (disp) {
-+          this.lineCleanup.delete(line)
-+          disp.dispose()
-+        }
-+      }
-+      line.on('delete', deleteHandler)
-+    }
-+  }
-+
-+  private getAndStoreCodeMirrorInstance = (cmh: CodeMirrorHost | null) => {
-+    this.codeMirror = cmh === null ? null : cmh.getEditor()
-+  }
-+
-+  private onCopy = (editor: Editor, event: Event) => {
-+    event.preventDefault()
-+
-+    // Remove the diff line markers from the copied text. The beginning of the
-+    // selection might start within a line, in which case we don't have to trim
-+    // the diff type marker. But for selections that span multiple lines, we'll
-+    // trim it.
-+    const doc = editor.getDoc()
-+    const lines = doc.getSelections()
-+    const selectionRanges = doc.listSelections()
-+    const lineContent: Array<string> = []
-+
-+    for (let i = 0; i < lines.length; i++) {
-+      const range = selectionRanges[i]
-+      const content = lines[i]
-+      const contentLines = content.split('\n')
-+      for (const [i, line] of contentLines.entries()) {
-+        if (i === 0 && range.head.ch > 0) {
-+          lineContent.push(line)
-+        } else {
-+          lineContent.push(line.substr(1))
-+        }
-+      }
-+
-+      const textWithoutMarkers = lineContent.join('\n')
-+      clipboard.writeText(textWithoutMarkers)
-+    }
-+  }
-+
-+  private markIntraLineChanges(
-+    codeMirror: Editor,
-+    hunks: ReadonlyArray<DiffHunk>
-+  ) {
-+    for (const hunk of hunks) {
-+      const additions = hunk.lines.filter(l => l.type === DiffLineType.Add)
-+      const deletions = hunk.lines.filter(l => l.type === DiffLineType.Delete)
-+      if (additions.length !== deletions.length) {
-+        continue
-+      }
-+
-+      for (let i = 0; i < additions.length; i++) {
-+        const addLine = additions[i]
-+        const deleteLine = deletions[i]
-+        if (
-+          addLine.text.length > MaxIntraLineDiffStringLength ||
-+          deleteLine.text.length > MaxIntraLineDiffStringLength
-+        ) {
-+          continue
-+        }
-+
-+        const changeRanges = relativeChanges(
-+          addLine.content,
-+          deleteLine.content
-+        )
-+        const addRange = changeRanges.stringARange
-+        if (addRange.length > 0) {
-+          const addLineNumber = lineNumberForDiffLine(addLine, hunks)
-+          if (addLineNumber > -1) {
-+            const addFrom = {
-+              line: addLineNumber,
-+              ch: addRange.location + 1,
-+            }
-+            const addTo = {
-+              line: addLineNumber,
-+              ch: addRange.location + addRange.length + 1,
-+            }
-+            codeMirror
-+              .getDoc()
-+              .markText(addFrom, addTo, { className: 'cm-diff-add-inner' })
-+          }
-+        }
-+
-+        const deleteRange = changeRanges.stringBRange
-+        if (deleteRange.length > 0) {
-+          const deleteLineNumber = lineNumberForDiffLine(deleteLine, hunks)
-+          if (deleteLineNumber > -1) {
-+            const deleteFrom = {
-+              line: deleteLineNumber,
-+              ch: deleteRange.location + 1,
-+            }
-+            const deleteTo = {
-+              line: deleteLineNumber,
-+              ch: deleteRange.location + deleteRange.length + 1,
-+            }
-+            codeMirror.getDoc().markText(deleteFrom, deleteTo, {
-+              className: 'cm-diff-delete-inner',
-+            })
-+          }
-+        }
-+      }
-+    }
-+  }
-+
-+  private onChanges = (cm: Editor) => {
-+    this.restoreScrollPosition(cm)
-+
-+    this.markIntraLineChanges(cm, this.props.hunks)
-+  }
-+
-+  public componentWillReceiveProps(nextProps: ITextDiffProps) {
-+    // If we're reloading the same file, we want to save the current scroll
-+    // position and restore it after the diff's been updated.
-+    const sameFile =
-+      nextProps.file &&
-+      this.props.file &&
-+      nextProps.file.id === this.props.file.id
-+
-+    // Happy path, if the text hasn't changed we won't re-render
-+    // and subsequently won't have to restore the scroll position.
-+    const textHasChanged = nextProps.text !== this.props.text
-+
-+    const codeMirror = this.codeMirror
-+    if (codeMirror && sameFile && textHasChanged) {
-+      const scrollInfo = codeMirror.getScrollInfo()
-+      this.scrollPositionToRestore = {
-+        left: scrollInfo.left,
-+        top: scrollInfo.top,
-+      }
-+    } else {
-+      this.scrollPositionToRestore = null
-+    }
-+
-+    if (codeMirror && this.props.text !== nextProps.text) {
-+      codeMirror.setOption('mode', { name: DiffSyntaxMode.ModeName })
-+    }
-+
-+    // HACK: This entire section is a hack. Whenever we receive
-+    // props we update all currently visible gutter elements with
-+    // the selection state from the file.
-+    if (nextProps.file instanceof WorkingDirectoryFileChange) {
-+      const selection = nextProps.file.selection
-+      const oldSelection =
-+        this.props.file instanceof WorkingDirectoryFileChange
-+          ? this.props.file.selection
-+          : null
-+
-+      // Nothing has changed
-+      if (oldSelection === selection) {
-+        return
-+      }
-+
-+      this.gutterWidth = null
-+
-+      const hunks = nextProps.hunks
-+      this.cachedGutterElements.forEach((element, index) => {
-+        if (!element) {
-+          console.error('expected DOM element for diff gutter not found')
-+          return
-+        }
-+
-+        const line = diffLineForIndex(hunks, index)
-+        const isIncludable = line ? line.isIncludeableLine() : false
-+        const isSelected = selection.isSelected(index) && isIncludable
-+        element.setSelected(isSelected)
-+      })
-+    }
-+  }
-+
-+  public componentWillUnmount() {
-+    this.dispose()
-+  }
-+
-+  public componentDidUpdate(prevProps: ITextDiffProps) {
-+    if (this.props.text === prevProps.text) {
-+      return
-+    }
-+
-+    if (this.codeMirror) {
-+      this.codeMirror.setOption('mode', { name: DiffSyntaxMode.ModeName })
-+    }
-+
-+    this.initDiffSyntaxMode()
-+  }
-+
-+  public componentDidMount() {
-+    this.initDiffSyntaxMode()
-+  }
-+
-+  public render() {
-+    const options: IEditorConfigurationExtra = {
-+      lineNumbers: false,
-+      readOnly: true,
-+      showCursorWhenSelecting: false,
-+      cursorBlinkRate: -1,
-+      lineWrapping: true,
-+      mode: { name: DiffSyntaxMode.ModeName },
-+      // Make sure CodeMirror doesn't capture Tab and thus destroy tab navigation
-+      extraKeys: { Tab: false },
-+      scrollbarStyle: __DARWIN__ ? 'simple' : 'native',
-+      styleSelectedText: true,
-+      lineSeparator: '\n',
-+      specialChars: /[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b-\u200f\u2028\u2029\ufeff]/,
-+    }
-+
-+    // If the text looks like it could have been formatted using Windows
-+    // line endings (\r\n) we need to massage it a bit before we hand it
-+    // off to CodeMirror. That's because CodeMirror has two ways of splitting
-+    // lines, one is the built in which splits on \n, \r\n and \r. The last
-+    // one is important because that will match carriage return characters
-+    // inside a diff line. The other way is when consumers supply the
-+    // lineSeparator option. That option only takes a string meaning we can
-+    // either make it split on '\r\n', '\n' or '\r' but not what we would like
-+    // to do, namely '\r?\n'. We want to keep CR characters inside of a diff
-+    // line so that we can mark them using the specialChars attribute so
-+    // we convert all \r\n to \n and remove any trailing \r character.
-+    const text =
-+      this.props.text.indexOf('\r') !== -1
-+        ? this.props.text
-+            // Capture the \r if followed by (positive lookahead) a \n or
-+            // the end of the string. Note that this does not capture the \n.
-+            .replace(/\r(?=\n|$)/g, '')
-+        : this.props.text
-+
-+    return (
-+      <CodeMirrorHost
-+        className="diff-code-mirror"
-+        value={text}
-+        options={options}
-+        isSelectionEnabled={this.isSelectionEnabled}
-+        onChanges={this.onChanges}
-+        onRenderLine={this.renderLine}
-+        ref={this.getAndStoreCodeMirrorInstance}
-+        onCopy={this.onCopy}
-+      />
-+    )
-+  }
-+}
-merged
-  result 100644 2554a2b18a26273423e0c5b405f02cfc870a00e4 app/src/ui/discard-changes/discard-changes-dialog.tsx
-  our    100644 78b4d51f4ee8816a057066d15e425e65833d4ef1 app/src/ui/discard-changes/discard-changes-dialog.tsx
-@@ -15,6 +15,12 @@
-   readonly dispatcher: Dispatcher
-   readonly files: ReadonlyArray<WorkingDirectoryFileChange>
-   readonly confirmDiscardChanges: boolean
-+  /**
-+   * Determines whether to show the option
-+   * to ask for confirmation when discarding
-+   * changes
-+   */
-+  readonly showDiscardChangesSetting: boolean
-   readonly onDismissed: () => void
-   readonly onConfirmDiscardChangesChanged: (optOut: boolean) => void
- }
-@@ -65,15 +71,7 @@
-           <p>
-             Changes can be restored by retrieving them from the {trashName}.
-           </p>
--          <Checkbox
--            label="Do not show this message again"
--            value={
--              this.state.confirmDiscardChanges
--                ? CheckboxValue.Off
--                : CheckboxValue.On
--            }
--            onChange={this.onCheckboxChanged}
--          />
-+          {this.renderConfirmDiscardChanges()}
-         </DialogContent>
-
-         <DialogFooter>
-@@ -88,6 +86,27 @@
-     )
-   }
-
-+  private renderConfirmDiscardChanges() {
-+    if (this.props.showDiscardChangesSetting) {
-+      return (
-+        <Checkbox
-+          label="Do not show this message again"
-+          value={
-+            this.state.confirmDiscardChanges
-+              ? CheckboxValue.Off
-+              : CheckboxValue.On
-+          }
-+          onChange={this.onConfirmDiscardChangesChanged}
-+        />
-+      )
-+    } else {
-+      // since we ignore the users option to not show
-+      // confirmation, we don't want to show a checkbox
-+      // that will have no effect
-+      return null
-+    }
-+  }
-+
-   private renderFileList() {
-     if (this.props.files.length > MaxFilesToList) {
-       return (
-@@ -126,7 +145,9 @@
-     this.props.onDismissed()
-   }
-
--  private onCheckboxChanged = (event: React.FormEvent<HTMLInputElement>) => {
-+  private onConfirmDiscardChangesChanged = (
-+    event: React.FormEvent<HTMLInputElement>
-+  ) => {
-     const value = !event.currentTarget.checked
-
-     this.setState({ confirmDiscardChanges: value })
-merged
-  result 100644 3e0e90eccd5a8894b7cce153c15009fe732a39cc app/src/ui/history/commit-list.tsx
-  our    100644 a440227b4ebc22b52f57595a0c3e68129de6bfdf app/src/ui/history/commit-list.tsx
-@@ -12,7 +12,7 @@
-   readonly gitHubRepository: GitHubRepository | null
-
-   /** The list of commits SHAs to display, in order. */
--  readonly commits: ReadonlyArray<string>
-+  readonly commitSHAs: ReadonlyArray<string>
-
-   /** The commits loaded, keyed by their full SHA. */
-   readonly commitLookup: Map<string, Commit>
-@@ -29,6 +29,9 @@
-   /** The list of known local commits for the current branch */
-   readonly localCommitSHAs: ReadonlyArray<string>
-
-+  /** The message to display inside the list when no results are displayed */
-+  readonly emptyListMessage: JSX.Element | string
-+
-   /** Callback which fires when a commit has been selected in the list */
-   readonly onCommitSelected: (commit: Commit) => void
-
-@@ -45,7 +48,7 @@
- /** A component which displays the list of commits. */
- export class CommitList extends React.Component<ICommitListProps, {}> {
-   private renderCommit = (row: number) => {
--    const sha = this.props.commits[row]
-+    const sha = this.props.commitSHAs[row]
-     const commit = this.props.commitLookup.get(sha)
-
-     if (commit == null) {
-@@ -73,8 +76,8 @@
-     )
-   }
-
--  private onRowChanged = (row: number) => {
--    const sha = this.props.commits[row]
-+  private onSelectedRowChanged = (row: number) => {
-+    const sha = this.props.commitSHAs[row]
-     const commit = this.props.commitLookup.get(sha)
-     if (commit) {
-       this.props.onCommitSelected(commit)
-@@ -94,25 +97,27 @@
-       return -1
-     }
-
--    return this.props.commits.findIndex(s => s === sha)
-+    return this.props.commitSHAs.findIndex(s => s === sha)
-   }
-
-   public render() {
--    if (this.props.commits.length === 0) {
--      return <div className="panel blankslate">No history</div>
-+    if (this.props.commitSHAs.length === 0) {
-+      return (
-+        <div className="panel blankslate">{this.props.emptyListMessage}</div>
-+      )
-     }
-
-     return (
-       <div id="commit-list">
-         <List
--          rowCount={this.props.commits.length}
-+          rowCount={this.props.commitSHAs.length}
-           rowHeight={RowHeight}
--          selectedRow={this.rowForSHA(this.props.selectedSHA)}
-+          selectedRows={[this.rowForSHA(this.props.selectedSHA)]}
-           rowRenderer={this.renderCommit}
--          onSelectionChanged={this.onRowChanged}
-+          onSelectedRowChanged={this.onSelectedRowChanged}
-           onScroll={this.onScroll}
-           invalidationProps={{
--            commits: this.props.commits,
-+            commits: this.props.commitSHAs,
-             gitHubUsers: this.props.gitHubUsers,
-           }}
-         />
-added in remote
-  their  100644 16d4efb540d90ba9514f7b5da356f9fa5372e2f6 app/src/ui/history/compare-branch-list-item.tsx
-@@ -0,0 +1,58 @@
-+import * as React from 'react'
-+
-+import { Octicon, OcticonSymbol } from '../octicons'
-+import { HighlightText } from '../lib/highlight-text'
-+import { Branch, IAheadBehind } from '../../models/branch'
-+import { IMatches } from '../../lib/fuzzy-find'
-+
-+interface ICompareBranchListItemProps {
-+  readonly branch: Branch
-+
-+  /** Specifies whether this item is currently selected */
-+  readonly isCurrentBranch: boolean
-+
-+  /** The characters in the branch name to highlight */
-+  readonly matches: IMatches
-+
-+  readonly aheadBehind: IAheadBehind | null
-+}
-+
-+export class CompareBranchListItem extends React.Component<
-+  ICompareBranchListItemProps,
-+  {}
-+> {
-+  public render() {
-+    const isCurrentBranch = this.props.isCurrentBranch
-+    const branch = this.props.branch
-+    const icon = isCurrentBranch ? OcticonSymbol.check : OcticonSymbol.gitBranch
-+
-+    const aheadBehind = this.props.aheadBehind
-+
-+    const aheadBehindElement = aheadBehind ? (
-+      <div className="branch-commit-counter">
-+        <span className="branch-commit-counter-item">
-+          {aheadBehind.behind}
-+          <Octicon className="icon" symbol={OcticonSymbol.arrowDown} />
-+        </span>
-+
-+        <span className="branch-commit-counter-item">
-+          {aheadBehind.ahead}
-+          <Octicon className="icon" symbol={OcticonSymbol.arrowUp} />
-+        </span>
-+      </div>
-+    ) : null
-+
-+    return (
-+      <div className="branches-list-item">
-+        <Octicon className="icon" symbol={icon} />
-+        <div className="name" title={branch.name}>
-+          <HighlightText
-+            text={branch.name}
-+            highlight={this.props.matches.title}
-+          />
-+        </div>
-+        {aheadBehindElement}
-+      </div>
-+    )
-+  }
-+}
-added in remote
-  their  100644 bcdf27db5507a5d1393fd75a4a3d177d41a3e81c app/src/ui/history/compare.tsx
-@@ -0,0 +1,576 @@
-+import * as React from 'react'
-+import { CSSTransitionGroup } from 'react-transition-group'
-+
-+import { IGitHubUser } from '../../lib/databases'
-+import { Commit } from '../../models/commit'
-+import {
-+  ComparisonView,
-+  ICompareState,
-+  CompareActionKind,
-+  ICompareBranch,
-+} from '../../lib/app-state'
-+import { CommitList } from './commit-list'
-+import { Repository } from '../../models/repository'
-+import { Branch } from '../../models/branch'
-+import { Dispatcher } from '../../lib/dispatcher'
-+import { ThrottledScheduler } from '../lib/throttled-scheduler'
-+import { BranchList } from '../branches'
-+import { TextBox } from '../lib/text-box'
-+import { IBranchListItem } from '../branches/group-branches'
-+import { TabBar } from '../tab-bar'
-+import { CompareBranchListItem } from './compare-branch-list-item'
-+import { FancyTextBox } from '../lib/fancy-text-box'
-+import { OcticonSymbol } from '../octicons'
-+import { SelectionSource } from '../lib/filter-list'
-+import { IMatches } from '../../lib/fuzzy-find'
-+import { Ref } from '../lib/ref'
-+import {
-+  NewCommitsBanner,
-+  DismissalReason,
-+} from '../notification/new-commits-banner'
-+import { enableNotificationOfBranchUpdates } from '../../lib/feature-flag'
-+import { MergeCallToAction } from './merge-call-to-action'
-+
-+interface ICompareSidebarProps {
-+  readonly repository: Repository
-+  readonly compareState: ICompareState
-+  readonly gitHubUsers: Map<string, IGitHubUser>
-+  readonly emoji: Map<string, string>
-+  readonly commitLookup: Map<string, Commit>
-+  readonly localCommitSHAs: ReadonlyArray<string>
-+  readonly dispatcher: Dispatcher
-+  readonly currentBranch: Branch | null
-+  readonly isDivergingBranchBannerVisible: boolean
-+  readonly onRevertCommit: (commit: Commit) => void
-+  readonly onViewCommitOnGitHub: (sha: string) => void
-+}
-+
-+interface ICompareSidebarState {
-+  /**
-+   * This branch should only be used when tracking interactions that the user is performing.
-+   *
-+   * For all other cases, use the prop
-+   */
-+  readonly focusedBranch: Branch | null
-+  readonly selectedCommit: Commit | null
-+
-+  /**
-+   * Flag that tracks whether the user interacted with one of the notification's
-+   * "call to action" buttons
-+   */
-+  readonly hasConsumedNotification: boolean
-+}
-+
-+/** If we're within this many rows from the bottom, load the next history batch. */
-+const CloseToBottomThreshold = 10
-+
-+export class CompareSidebar extends React.Component<
-+  ICompareSidebarProps,
-+  ICompareSidebarState
-+> {
-+  private textbox: TextBox | null = null
-+  private readonly loadChangedFilesScheduler = new ThrottledScheduler(200)
-+  private branchList: BranchList | null = null
-+  private loadingMoreCommitsPromise: Promise<void> | null = null
-+
-+  public constructor(props: ICompareSidebarProps) {
-+    super(props)
-+
-+    this.state = {
-+      focusedBranch: null,
-+      selectedCommit: null,
-+      hasConsumedNotification: false,
-+    }
-+  }
-+
-+  public componentWillReceiveProps(nextProps: ICompareSidebarProps) {
-+    const newFormState = nextProps.compareState.formState
-+    const oldFormState = this.props.compareState.formState
-+
-+    if (this.textbox !== null) {
-+      if (
-+        !this.props.compareState.showBranchList &&
-+        nextProps.compareState.showBranchList
-+      ) {
-+        // showBranchList changes from false -> true
-+        //  -> ensure the textbox has focus
-+        this.textbox.focus()
-+      } else if (
-+        this.props.compareState.showBranchList &&
-+        !nextProps.compareState.showBranchList
-+      ) {
-+        // showBranchList changes from true -> false
-+        //  -> ensure the textbox no longer has focus
-+        this.textbox.blur()
-+      }
-+    }
-+
-+    if (
-+      newFormState.kind !== oldFormState.kind &&
-+      newFormState.kind === ComparisonView.None
-+    ) {
-+      this.setState({
-+        focusedBranch: null,
-+      })
-+      return
-+    }
-+
-+    if (
-+      newFormState.kind !== ComparisonView.None &&
-+      oldFormState.kind !== ComparisonView.None
-+    ) {
-+      const oldBranch = oldFormState.comparisonBranch
-+      const newBranch = newFormState.comparisonBranch
-+
-+      if (oldBranch.name !== newBranch.name) {
-+        // ensure the focused branch is in sync with the chosen branch
-+        this.setState({
-+          focusedBranch: newBranch,
-+        })
-+      }
-+    }
-+  }
-+
-+  public componentWillMount() {
-+    this.props.dispatcher.initializeCompare(this.props.repository)
-+  }
-+
-+  public componentWillUnmount() {
-+    this.textbox = null
-+  }
-+
-+  public render() {
-+    const { allBranches, filterText, showBranchList } = this.props.compareState
-+    const placeholderText = getPlaceholderText(this.props.compareState)
-+    const DivergingBannerAnimationTimeout = 300
-+
-+    return (
-+      <div id="compare-view">
-+        <CSSTransitionGroup
-+          transitionName="diverge-banner"
-+          transitionAppear={true}
-+          transitionAppearTimeout={DivergingBannerAnimationTimeout}
-+          transitionEnterTimeout={DivergingBannerAnimationTimeout}
-+          transitionLeaveTimeout={DivergingBannerAnimationTimeout}
-+        >
-+          {this.renderNotificationBanner()}
-+        </CSSTransitionGroup>
-+
-+        <div className="compare-form">
-+          <FancyTextBox
-+            symbol={OcticonSymbol.gitBranch}
-+            type="search"
-+            placeholder={placeholderText}
-+            onFocus={this.onTextBoxFocused}
-+            value={filterText}
-+            disabled={allBranches.length === 0}
-+            onRef={this.onTextBoxRef}
-+            onValueChanged={this.onBranchFilterTextChanged}
-+            onKeyDown={this.onBranchFilterKeyDown}
-+            onSearchCleared={this.handleEscape}
-+          />
-+        </div>
-+
-+        {showBranchList ? this.renderFilterList() : this.renderCommits()}
-+      </div>
-+    )
-+  }
-+
-+  private onBranchesListRef = (branchList: BranchList | null) => {
-+    this.branchList = branchList
-+  }
-+
-+  private renderNotificationBanner() {
-+    if (!enableNotificationOfBranchUpdates()) {
-+      return null
-+    }
-+
-+    if (!this.props.isDivergingBranchBannerVisible) {
-+      return null
-+    }
-+
-+    const { inferredComparisonBranch } = this.props.compareState
-+
-+    return inferredComparisonBranch.branch !== null &&
-+      inferredComparisonBranch.aheadBehind !== null &&
-+      inferredComparisonBranch.aheadBehind.behind > 0 ? (
-+      <div className="diverge-banner-wrapper">
-+        <NewCommitsBanner
-+          dispatcher={this.props.dispatcher}
-+          repository={this.props.repository}
-+          commitsBehindBaseBranch={inferredComparisonBranch.aheadBehind.behind}
-+          baseBranch={inferredComparisonBranch.branch}
-+          onDismiss={this.onNotificationBannerDismissed}
-+        />
-+      </div>
-+    ) : null
-+  }
-+
-+  private renderCommits() {
-+    const formState = this.props.compareState.formState
-+    return (
-+      <div className="compare-commit-list">
-+        {formState.kind === ComparisonView.None
-+          ? this.renderCommitList()
-+          : this.renderTabBar(formState)}
-+      </div>
-+    )
-+  }
-+
-+  private viewHistoryForBranch = () => {
-+    this.props.dispatcher.executeCompare(this.props.repository, {
-+      kind: CompareActionKind.History,
-+    })
-+
-+    this.props.dispatcher.updateCompareForm(this.props.repository, {
-+      showBranchList: false,
-+    })
-+  }
-+
-+  private renderCommitList() {
-+    const { formState, commitSHAs } = this.props.compareState
-+    const selectedCommit = this.state.selectedCommit
-+
-+    let emptyListMessage: string | JSX.Element
-+    if (formState.kind === ComparisonView.None) {
-+      emptyListMessage = 'No history'
-+    } else {
-+      const currentlyComparedBranchName = formState.comparisonBranch.name
-+
-+      emptyListMessage =
-+        formState.kind === ComparisonView.Ahead ? (
-+          <p>
-+            The compared branch (<Ref>{currentlyComparedBranchName}</Ref>) is up
-+            to date with your branch
-+          </p>
-+        ) : (
-+          <p>
-+            Your branch is up to date with the compared branch (<Ref>
-+              {currentlyComparedBranchName}
-+            </Ref>)
-+          </p>
-+        )
-+    }
-+
-+    return (
-+      <CommitList
-+        gitHubRepository={this.props.repository.gitHubRepository}
-+        commitLookup={this.props.commitLookup}
-+        commitSHAs={commitSHAs}
-+        selectedSHA={selectedCommit !== null ? selectedCommit.sha : null}
-+        gitHubUsers={this.props.gitHubUsers}
-+        localCommitSHAs={this.props.localCommitSHAs}
-+        emoji={this.props.emoji}
-+        onViewCommitOnGitHub={this.props.onViewCommitOnGitHub}
-+        onRevertCommit={this.props.onRevertCommit}
-+        onCommitSelected={this.onCommitSelected}
-+        onScroll={this.onScroll}
-+        emptyListMessage={emptyListMessage}
-+      />
-+    )
-+  }
-+
-+  private renderActiveTab() {
-+    const formState = this.props.compareState.formState
-+    return (
-+      <div className="compare-commit-list">
-+        {this.renderCommitList()}
-+        {formState.kind === ComparisonView.Behind
-+          ? this.renderMergeCallToAction(formState)
-+          : null}
-+      </div>
-+    )
-+  }
-+
-+  private renderFilterList() {
-+    const {
-+      defaultBranch,
-+      allBranches,
-+      recentBranches,
-+      filterText,
-+    } = this.props.compareState
-+
-+    return (
-+      <BranchList
-+        ref={this.onBranchesListRef}
-+        defaultBranch={defaultBranch}
-+        currentBranch={this.props.currentBranch}
-+        allBranches={allBranches}
-+        recentBranches={recentBranches}
-+        filterText={filterText}
-+        textbox={this.textbox!}
-+        selectedBranch={this.state.focusedBranch}
-+        canCreateNewBranch={false}
-+        onSelectionChanged={this.onSelectionChanged}
-+        onItemClick={this.onBranchItemClicked}
-+        onFilterTextChanged={this.onBranchFilterTextChanged}
-+        renderBranch={this.renderCompareBranchListItem}
-+      />
-+    )
-+  }
-+
-+  private renderMergeCallToAction(formState: ICompareBranch) {
-+    if (this.props.currentBranch == null) {
-+      return null
-+    }
-+
-+    return (
-+      <MergeCallToAction
-+        repository={this.props.repository}
-+        dispatcher={this.props.dispatcher}
-+        currentBranch={this.props.currentBranch}
-+        formState={formState}
-+        onMerged={this.onMerge}
-+      />
-+    )
-+  }
-+
-+  private onTabClicked = (index: number) => {
-+    const formState = this.props.compareState.formState
-+
-+    if (formState.kind === ComparisonView.None) {
-+      return
-+    }
-+
-+    const mode = index === 0 ? ComparisonView.Behind : ComparisonView.Ahead
-+    const branch = formState.comparisonBranch
-+
-+    this.props.dispatcher.executeCompare(this.props.repository, {
-+      kind: CompareActionKind.Branch,
-+      branch,
-+      mode,
-+    })
-+  }
-+
-+  private renderTabBar(formState: ICompareBranch) {
-+    const selectedTab = formState.kind === ComparisonView.Behind ? 0 : 1
-+
-+    return (
-+      <div className="compare-content">
-+        <TabBar selectedIndex={selectedTab} onTabClicked={this.onTabClicked}>
-+          <span>{`Behind (${formState.aheadBehind.behind})`}</span>
-+          <span>{`Ahead (${formState.aheadBehind.ahead})`}</span>
-+        </TabBar>
-+        {this.renderActiveTab()}
-+      </div>
-+    )
-+  }
-+
-+  private renderCompareBranchListItem = (
-+    item: IBranchListItem,
-+    matches: IMatches
-+  ) => {
-+    const currentBranch = this.props.currentBranch
-+
-+    const currentBranchName = currentBranch != null ? currentBranch.name : null
-+    const branch = item.branch
-+
-+    const aheadBehind = currentBranch
-+      ? this.props.compareState.aheadBehindCache.get(
-+          currentBranch.tip.sha,
-+          branch.tip.sha
-+        )
-+      : null
-+
-+    return (
-+      <CompareBranchListItem
-+        branch={branch}
-+        isCurrentBranch={branch.name === currentBranchName}
-+        matches={matches}
-+        aheadBehind={aheadBehind}
-+      />
-+    )
-+  }
-+
-+  private onBranchFilterKeyDown = (
-+    event: React.KeyboardEvent<HTMLInputElement>
-+  ) => {
-+    const key = event.key
-+
-+    if (key === 'Enter') {
-+      if (this.props.compareState.filterText.length === 0) {
-+        this.handleEscape()
-+      } else {
-+        if (this.state.focusedBranch == null) {
-+          this.viewHistoryForBranch()
-+        } else {
-+          const branch = this.state.focusedBranch
-+
-+          this.props.dispatcher.executeCompare(this.props.repository, {
-+            kind: CompareActionKind.Branch,
-+            branch,
-+            mode: ComparisonView.Behind,
-+          })
-+
-+          this.props.dispatcher.updateCompareForm(this.props.repository, {
-+            filterText: branch.name,
-+          })
-+        }
-+
-+        if (this.textbox) {
-+          this.textbox.blur()
-+        }
-+      }
-+    } else if (key === 'Escape') {
-+      this.handleEscape()
-+    } else if (key === 'ArrowDown') {
-+      if (this.branchList !== null) {
-+        this.branchList.selectFirstItem(true)
-+      }
-+    }
-+  }
-+
-+  private handleEscape = () => {
-+    this.clearFilterState()
-+    if (this.textbox) {
-+      this.textbox.blur()
-+    }
-+  }
-+
-+  private onCommitSelected = (commit: Commit) => {
-+    this.props.dispatcher.changeHistoryCommitSelection(
-+      this.props.repository,
-+      commit.sha
-+    )
-+
-+    this.loadChangedFilesScheduler.queue(() => {
-+      this.props.dispatcher.loadChangedFilesForCurrentSelection(
-+        this.props.repository
-+      )
-+    })
-+
-+    this.setState({ selectedCommit: commit })
-+  }
-+
-+  private onScroll = (start: number, end: number) => {
-+    const compareState = this.props.compareState
-+    const formState = compareState.formState
-+
-+    if (formState.kind !== ComparisonView.None) {
-+      // as the app is currently comparing the current branch to some other
-+      // branch, everything needed should be loaded
-+      return
-+    }
-+
-+    const commits = compareState.commitSHAs
-+    if (commits.length - end <= CloseToBottomThreshold) {
-+      if (this.loadingMoreCommitsPromise != null) {
-+        // as this callback fires for any scroll event we need to guard
-+        // against re-entrant calls to loadNextHistoryBatch
-+        return
-+      }
-+
-+      this.loadingMoreCommitsPromise = this.props.dispatcher
-+        .loadNextHistoryBatch(this.props.repository)
-+        .then(() => {
-+          // deferring unsetting this flag to some time _after_ the commits
-+          // have been appended to prevent eagerly adding more commits due
-+          // to scroll events (which fire indiscriminately)
-+          window.setTimeout(() => {
-+            this.loadingMoreCommitsPromise = null
-+          }, 500)
-+        })
-+    }
-+  }
-+
-+  private onBranchFilterTextChanged = (filterText: string) => {
-+    if (filterText.length === 0) {
-+      this.setState({ focusedBranch: null })
-+    }
-+
-+    this.props.dispatcher.updateCompareForm(this.props.repository, {
-+      filterText,
-+    })
-+  }
-+
-+  private clearFilterState = () => {
-+    this.setState({
-+      focusedBranch: null,
-+    })
-+
-+    this.props.dispatcher.updateCompareForm(this.props.repository, {
-+      filterText: '',
-+    })
-+
-+    this.viewHistoryForBranch()
-+  }
-+
-+  private onBranchItemClicked = (branch: Branch) => {
-+    this.props.dispatcher.executeCompare(this.props.repository, {
-+      branch,
-+      kind: CompareActionKind.Branch,
-+      mode: ComparisonView.Behind,
-+    })
-+
-+    this.setState({
-+      focusedBranch: null,
-+    })
-+
-+    this.props.dispatcher.updateCompareForm(this.props.repository, {
-+      filterText: branch.name,
-+      showBranchList: false,
-+    })
-+  }
-+
-+  private onSelectionChanged = (
-+    branch: Branch | null,
-+    source: SelectionSource
-+  ) => {
-+    if (source.kind === 'mouseclick' && branch != null) {
-+      this.props.dispatcher.executeCompare(this.props.repository, {
-+        branch,
-+        kind: CompareActionKind.Branch,
-+        mode: ComparisonView.Behind,
-+      })
-+    }
-+
-+    this.setState({
-+      focusedBranch: branch,
-+    })
-+  }
-+
-+  private onTextBoxFocused = () => {
-+    this.props.dispatcher.updateCompareForm(this.props.repository, {
-+      showBranchList: true,
-+    })
-+  }
-+
-+  private onTextBoxRef = (textbox: TextBox) => {
-+    this.textbox = textbox
-+  }
-+
-+  private onNotificationBannerDismissed = (reason: DismissalReason) => {
-+    this.props.dispatcher.setDivergingBranchBannerVisibility(false)
-+    this.props.dispatcher.recordDivergingBranchBannerDismissal()
-+
-+    switch (reason) {
-+      case 'close':
-+        this.setState({ hasConsumedNotification: false })
-+        break
-+      case 'compare':
-+      case 'merge':
-+        this.setState({ hasConsumedNotification: true })
-+        break
-+    }
-+  }
-+
-+  private onMerge = () => {
-+    if (this.state.hasConsumedNotification) {
-+      this.props.dispatcher.recordDivergingBranchBannerInfluencedMerge()
-+    }
-+  }
-+}
-+
-+function getPlaceholderText(state: ICompareState) {
-+  const { allBranches, formState } = state
-+
-+  if (allBranches.length === 0) {
-+    return __DARWIN__ ? 'No Branches to Compare' : 'No branches to compare'
-+  } else if (formState.kind === ComparisonView.None) {
-+    return __DARWIN__
-+      ? 'Select Branch to Compare...'
-+      : 'Select branch to compare...'
-+  } else {
-+    return undefined
-+  }
-+}
-merged
-  result 100644 1089df377346334f2f773b466948b625f3c4cab3 app/src/ui/history/file-list.tsx
-  our    100644 458d1749d658b33d17f3dfc497271a59131f9345 app/src/ui/history/file-list.tsx
-@@ -1,18 +1,53 @@
- import * as React from 'react'
-+import * as Path from 'path'
-+import { pathExists } from 'fs-extra'
-+import { revealInFileManager } from '../../lib/app-shell'
-+
- import { FileChange, mapStatus, iconForStatus } from '../../models/status'
-+import { Repository } from '../../models/repository'
-+
- import { PathLabel } from '../lib/path-label'
--import { Octicon } from '../octicons'
-+import {
-+  isSafeFileExtension,
-+  DefaultEditorLabel,
-+  RevealInFileManagerLabel,
-+  OpenWithDefaultProgramLabel,
-+} from '../lib/context-menu'
- import { List } from '../lib/list'
-
-+import { Octicon } from '../octicons'
-+import { showContextualMenu } from '../main-process-proxy'
-+
- interface IFileListProps {
-   readonly files: ReadonlyArray<FileChange>
-   readonly selectedFile: FileChange | null
-   readonly onSelectedFileChanged: (file: FileChange) => void
-   readonly availableWidth: number
-+
-+  /**
-+   * Called to open a file with its default application
-+   * @param path The path of the file relative to the root of the repository
-+   */
-+  readonly onOpenItem: (path: string) => void
-+
-+  /** The name of the currently selected external editor */
-+  readonly externalEditorLabel?: string
-+
-+  /**
-+   * Called to open a file using the user's configured applications
-+   * @param path The path of the file relative to the root of the repository
-+   */
-+  readonly onOpenInExternalEditor: (path: string) => void
-+
-+  /**
-+   * Repository that we use to get the base path and build
-+   * full path for the file in commit to check for file existence
-+   */
-+  readonly repository: Repository
- }
-
- export class FileList extends React.Component<IFileListProps, {}> {
--  private onSelectionChanged = (row: number) => {
-+  private onSelectedRowChanged = (row: number) => {
-     const file = this.props.files[row]
-     this.props.onSelectedFileChanged(file)
-   }
-@@ -32,7 +67,7 @@
-       statusWidth
-
-     return (
--      <div className="file">
-+      <div className="file" onContextMenu={this.onContextMenu}>
-         <PathLabel
-           path={file.path}
-           oldPath={file.oldPath}
-@@ -60,10 +95,59 @@
-           rowRenderer={this.renderFile}
-           rowCount={this.props.files.length}
-           rowHeight={29}
--          selectedRow={this.rowForFile(this.props.selectedFile)}
--          onSelectionChanged={this.onSelectionChanged}
-+          selectedRows={[this.rowForFile(this.props.selectedFile)]}
-+          onSelectedRowChanged={this.onSelectedRowChanged}
-         />
-       </div>
-     )
-   }
-+
-+  private onContextMenu = async (event: React.MouseEvent<HTMLDivElement>) => {
-+    event.preventDefault()
-+
-+    if (this.props.selectedFile == null) {
-+      return
-+    }
-+
-+    const filePath = this.props.selectedFile.path
-+    const fullPath = Path.join(this.props.repository.path, filePath)
-+    const fileExistsOnDisk = await pathExists(fullPath)
-+    if (!fileExistsOnDisk) {
-+      showContextualMenu([
-+        {
-+          label: __DARWIN__
-+            ? 'File Does Not Exist on Disk'
-+            : 'File does not exist on disk',
-+          enabled: false,
-+        },
-+      ])
-+      return
-+    }
-+
-+    const extension = Path.extname(filePath)
-+
-+    const isSafeExtension = isSafeFileExtension(extension)
-+    const openInExternalEditor = this.props.externalEditorLabel
-+      ? `Open in ${this.props.externalEditorLabel}`
-+      : DefaultEditorLabel
-+
-+    const items = [
-+      {
-+        label: RevealInFileManagerLabel,
-+        action: () => revealInFileManager(this.props.repository, filePath),
-+        enabled: fileExistsOnDisk,
-+      },
-+      {
-+        label: openInExternalEditor,
-+        action: () => this.props.onOpenInExternalEditor(fullPath),
-+        enabled: isSafeExtension && fileExistsOnDisk,
-+      },
-+      {
-+        label: OpenWithDefaultProgramLabel,
-+        action: () => this.props.onOpenItem(filePath),
-+        enabled: isSafeExtension && fileExistsOnDisk,
-+      },
-+    ]
-+    showContextualMenu(items)
-+  }
- }
-removed in remote
-  base   100644 7d1e09aa5b1ea18dda23f94daadcfe54a2491b42 app/src/ui/history/history.tsx
-  our    100644 7d1e09aa5b1ea18dda23f94daadcfe54a2491b42 app/src/ui/history/history.tsx
-@@ -1,178 +0,0 @@
--import * as React from 'react'
--import { CommitSummary } from './commit-summary'
--import { Diff } from '../diff'
--import { FileList } from './file-list'
--import { Repository } from '../../models/repository'
--import { CommittedFileChange, FileChange } from '../../models/status'
--import { Commit } from '../../models/commit'
--import { Dispatcher } from '../../lib/dispatcher'
--import {
--  IHistoryState as IAppHistoryState,
--  ImageDiffType,
--} from '../../lib/app-state'
--import { encodePathAsUrl } from '../../lib/path'
--import { ThrottledScheduler } from '../lib/throttled-scheduler'
--import { IGitHubUser } from '../../lib/databases'
--import { Resizable } from '../resizable'
--
--interface IHistoryProps {
--  readonly repository: Repository
--  readonly dispatcher: Dispatcher
--  readonly history: IAppHistoryState
--  readonly emoji: Map<string, string>
--  readonly commits: Map<string, Commit>
--  readonly commitSummaryWidth: number
--  readonly gitHubUsers: Map<string, IGitHubUser>
--  readonly imageDiffType: ImageDiffType
--}
--
--interface IHistoryState {
--  readonly isExpanded: boolean
--}
--
--/** The History component. Contains the commit list, commit summary, and diff. */
--export class History extends React.Component<IHistoryProps, IHistoryState> {
--  private readonly loadChangedFilesScheduler = new ThrottledScheduler(200)
--
--  public constructor(props: IHistoryProps) {
--    super(props)
--
--    this.state = {
--      isExpanded: false,
--    }
--  }
--
--  private onFileSelected = (file: FileChange) => {
--    this.props.dispatcher.changeHistoryFileSelection(
--      this.props.repository,
--      file as CommittedFileChange
--    )
--  }
--
--  public componentWillUpdate(nextProps: IHistoryProps) {
--    // Reset isExpanded if we're switching commits.
--    if (nextProps.history.selection.sha !== this.props.history.selection.sha) {
--      if (this.state.isExpanded) {
--        this.setState({ isExpanded: false })
--      }
--    }
--  }
--
--  public componentWillUnmount() {
--    this.loadChangedFilesScheduler.clear()
--  }
--
--  private renderDiff(commit: Commit | null) {
--    const files = this.props.history.changedFiles
--    const file = this.props.history.selection.file
--    const diff = this.props.history.diff
--
--    if (!diff || !file) {
--      // don't show both 'empty' messages
--      const message = files.length === 0 ? '' : 'No file selected'
--
--      return (
--        <div className="panel blankslate" id="diff">
--          {message}
--        </div>
--      )
--    }
--
--    return (
--      <Diff
--        repository={this.props.repository}
--        imageDiffType={this.props.imageDiffType}
--        file={file}
--        diff={diff}
--        readOnly={true}
--        dispatcher={this.props.dispatcher}
--      />
--    )
--  }
--
--  private renderCommitSummary(commit: Commit) {
--    return (
--      <CommitSummary
--        commit={commit}
--        files={this.props.history.changedFiles}
--        emoji={this.props.emoji}
--        repository={this.props.repository}
--        gitHubUsers={this.props.gitHubUsers}
--        onExpandChanged={this.onExpandChanged}
--        isExpanded={this.state.isExpanded}
--      />
--    )
--  }
--
--  private onExpandChanged = (isExpanded: boolean) => {
--    this.setState({ isExpanded })
--  }
--
--  private onCommitSummaryReset = () => {
--    this.props.dispatcher.resetCommitSummaryWidth()
--  }
--
--  private onCommitSummaryResize = (width: number) => {
--    this.props.dispatcher.setCommitSummaryWidth(width)
--  }
--
--  private renderFileList() {
--    const files = this.props.history.changedFiles
--    if (files.length === 0) {
--      return <div className="fill-window">No files in commit</div>
--    }
--
--    // -1 for right hand side border
--    const availableWidth = this.props.commitSummaryWidth - 1
--
--    return (
--      <FileList
--        files={files}
--        onSelectedFileChanged={this.onFileSelected}
--        selectedFile={this.props.history.selection.file}
--        availableWidth={availableWidth}
--      />
--    )
--  }
--
--  public render() {
--    const sha = this.props.history.selection.sha
--    const commit = sha ? this.props.commits.get(sha) || null : null
--
--    if (!sha || !commit) {
--      return <NoCommitSelected />
--    }
--
--    const className = this.state.isExpanded ? 'expanded' : 'collapsed'
--
--    return (
--      <div id="history" className={className}>
--        {this.renderCommitSummary(commit)}
--        <div id="commit-details">
--          <Resizable
--            width={this.props.commitSummaryWidth}
--            onResize={this.onCommitSummaryResize}
--            onReset={this.onCommitSummaryReset}
--          >
--            {this.renderFileList()}
--          </Resizable>
--          {this.renderDiff(commit)}
--        </div>
--      </div>
--    )
--  }
--}
--
--function NoCommitSelected() {
--  const BlankSlateImage = encodePathAsUrl(
--    __dirname,
--    'static/empty-no-commit.svg'
--  )
--
--  return (
--    <div className="panel blankslate">
--      <img src={BlankSlateImage} className="blankslate-image" />
--      No commit selected
--    </div>
--  )
--}
-merged
-  result 100644 5314aa21a17e6eaad7f73ab8e92c99e6e83f2108 app/src/ui/history/index.ts
-  our    100644 caa18019759a791f9a4e2b42c02a348a0cf36a0d app/src/ui/history/index.ts
-@@ -1,2 +1,2 @@
--export { HistorySidebar } from './sidebar'
--export { History } from './history'
-+export { SelectedCommit } from './selected-commit'
-+export { CompareSidebar } from './compare'
-added in remote
-  their  100644 f43d04c4253b198fd579a2e189a03c4aa13ce472 app/src/ui/history/merge-call-to-action.tsx
-@@ -0,0 +1,87 @@
-+import * as React from 'react'
-+
-+import { CompareActionKind, ICompareBranch } from '../../lib/app-state'
-+import { Repository } from '../../models/repository'
-+import { Branch } from '../../models/branch'
-+import { Dispatcher } from '../../lib/dispatcher'
-+import { Button } from '../lib/button'
-+
-+interface IMergeCallToActionProps {
-+  readonly repository: Repository
-+  readonly dispatcher: Dispatcher
-+  readonly currentBranch: Branch
-+  readonly formState: ICompareBranch
-+
-+  /**
-+   * Callback to execute after a merge has been performed
-+   */
-+  readonly onMerged: () => void
-+}
-+
-+export class MergeCallToAction extends React.Component<
-+  IMergeCallToActionProps,
-+  {}
-+> {
-+  public render() {
-+    const count = this.props.formState.aheadBehind.behind
-+
-+    return (
-+      <div className="merge-cta">
-+        <Button
-+          type="submit"
-+          disabled={count <= 0}
-+          onClick={this.onMergeClicked}
-+        >
-+          Merge into <strong>{this.props.currentBranch.name}</strong>
-+        </Button>
-+
-+        {this.renderMergeDetails(
-+          this.props.formState,
-+          this.props.currentBranch
-+        )}
-+      </div>
-+    )
-+  }
-+
-+  private renderMergeDetails(formState: ICompareBranch, currentBranch: Branch) {
-+    const branch = formState.comparisonBranch
-+    const count = formState.aheadBehind.behind
-+
-+    if (count > 0) {
-+      const pluralized = count === 1 ? 'commit' : 'commits'
-+      return (
-+        <div className="merge-message">
-+          This will merge
-+          <strong>{` ${count} ${pluralized}`}</strong>
-+          {` `}from{` `}
-+          <strong>{branch.name}</strong>
-+          {` `}into{` `}
-+          <strong>{currentBranch.name}</strong>
-+        </div>
-+      )
-+    }
-+
-+    return null
-+  }
-+
-+  private onMergeClicked = async (event: React.MouseEvent<any>) => {
-+    const formState = this.props.formState
-+
-+    this.props.dispatcher.recordCompareInitiatedMerge()
-+
-+    await this.props.dispatcher.mergeBranch(
-+      this.props.repository,
-+      formState.comparisonBranch.name
-+    )
-+
-+    this.props.dispatcher.executeCompare(this.props.repository, {
-+      kind: CompareActionKind.History,
-+    })
-+
-+    this.props.dispatcher.updateCompareForm(this.props.repository, {
-+      showBranchList: false,
-+      filterText: '',
-+    })
-+    this.props.onMerged()
-+  }
-+}
-added in remote
-  their  100644 70a7fdc0fff924c282d71feffe17b638f50a18fd app/src/ui/history/selected-commit.tsx
-@@ -0,0 +1,211 @@
-+import * as React from 'react'
-+import * as Path from 'path'
-+
-+import { CommitSummary } from './commit-summary'
-+import { Diff } from '../diff'
-+import { FileList } from './file-list'
-+import { Repository } from '../../models/repository'
-+import { CommittedFileChange, FileChange } from '../../models/status'
-+import { Commit } from '../../models/commit'
-+import { Dispatcher } from '../../lib/dispatcher'
-+import { ImageDiffType } from '../../lib/app-state'
-+import { encodePathAsUrl } from '../../lib/path'
-+import { ThrottledScheduler } from '../lib/throttled-scheduler'
-+import { IGitHubUser } from '../../lib/databases'
-+import { Resizable } from '../resizable'
-+import { openFile } from '../../lib/open-file'
-+import { IDiff } from '../../models/diff'
-+
-+interface ISelectedCommitProps {
-+  readonly repository: Repository
-+  readonly dispatcher: Dispatcher
-+  readonly emoji: Map<string, string>
-+  readonly selectedCommit: Commit | null
-+  readonly changedFiles: ReadonlyArray<CommittedFileChange>
-+  readonly selectedFile: CommittedFileChange | null
-+  readonly currentDiff: IDiff | null
-+  readonly commitSummaryWidth: number
-+  readonly gitHubUsers: Map<string, IGitHubUser>
-+  readonly selectedDiffType: ImageDiffType
-+  /** The name of the currently selected external editor */
-+  readonly externalEditorLabel?: string
-+
-+  /**
-+   * Called to open a file using the user's configured applications
-+   * @param path The path of the file relative to the root of the repository
-+   */
-+  readonly onOpenInExternalEditor: (path: string) => void
-+}
-+
-+interface ISelectedCommitState {
-+  readonly isExpanded: boolean
-+}
-+
-+/** The History component. Contains the commit list, commit summary, and diff. */
-+export class SelectedCommit extends React.Component<
-+  ISelectedCommitProps,
-+  ISelectedCommitState
-+> {
-+  private readonly loadChangedFilesScheduler = new ThrottledScheduler(200)
-+
-+  public constructor(props: ISelectedCommitProps) {
-+    super(props)
-+
-+    this.state = {
-+      isExpanded: false,
-+    }
-+  }
-+
-+  private onFileSelected = (file: FileChange) => {
-+    this.props.dispatcher.changeHistoryFileSelection(
-+      this.props.repository,
-+      file as CommittedFileChange
-+    )
-+  }
-+
-+  public componentWillUpdate(nextProps: ISelectedCommitProps) {
-+    // reset isExpanded if we're switching commits.
-+    const currentValue = this.props.selectedCommit
-+      ? this.props.selectedCommit.sha
-+      : undefined
-+    const nextValue = nextProps.selectedCommit
-+      ? nextProps.selectedCommit.sha
-+      : undefined
-+
-+    if ((currentValue || nextValue) && currentValue !== nextValue) {
-+      if (this.state.isExpanded) {
-+        this.setState({ isExpanded: false })
-+      }
-+    }
-+  }
-+
-+  public componentWillUnmount() {
-+    this.loadChangedFilesScheduler.clear()
-+  }
-+
-+  private renderDiff() {
-+    const file = this.props.selectedFile
-+    const diff = this.props.currentDiff
-+
-+    if (file == null || diff == null) {
-+      // don't show both 'empty' messages
-+      const message =
-+        this.props.changedFiles.length === 0 ? '' : 'No file selected'
-+
-+      return (
-+        <div className="panel blankslate" id="diff">
-+          {message}
-+        </div>
-+      )
-+    }
-+
-+    return (
-+      <Diff
-+        repository={this.props.repository}
-+        imageDiffType={this.props.selectedDiffType}
-+        file={file}
-+        diff={diff}
-+        readOnly={true}
-+        dispatcher={this.props.dispatcher}
-+      />
-+    )
-+  }
-+
-+  private renderCommitSummary(commit: Commit) {
-+    return (
-+      <CommitSummary
-+        commit={commit}
-+        files={this.props.changedFiles}
-+        emoji={this.props.emoji}
-+        repository={this.props.repository}
-+        gitHubUsers={this.props.gitHubUsers}
-+        onExpandChanged={this.onExpandChanged}
-+        isExpanded={this.state.isExpanded}
-+      />
-+    )
-+  }
-+
-+  private onExpandChanged = (isExpanded: boolean) => {
-+    this.setState({ isExpanded })
-+  }
-+
-+  private onCommitSummaryReset = () => {
-+    this.props.dispatcher.resetCommitSummaryWidth()
-+  }
-+
-+  private onCommitSummaryResize = (width: number) => {
-+    this.props.dispatcher.setCommitSummaryWidth(width)
-+  }
-+
-+  private renderFileList() {
-+    const files = this.props.changedFiles
-+    if (files.length === 0) {
-+      return <div className="fill-window">No files in commit</div>
-+    }
-+
-+    // -1 for right hand side border
-+    const availableWidth = this.props.commitSummaryWidth - 1
-+
-+    return (
-+      <FileList
-+        files={files}
-+        onSelectedFileChanged={this.onFileSelected}
-+        selectedFile={this.props.selectedFile}
-+        availableWidth={availableWidth}
-+        onOpenItem={this.onOpenItem}
-+        externalEditorLabel={this.props.externalEditorLabel}
-+        onOpenInExternalEditor={this.props.onOpenInExternalEditor}
-+        repository={this.props.repository}
-+      />
-+    )
-+  }
-+
-+  /**
-+   * Open file with default application.
-+   * @param path The path of the file relative to the root of the repository
-+   */
-+  private onOpenItem = (path: string) => {
-+    const fullPath = Path.join(this.props.repository.path, path)
-+    openFile(fullPath, this.props.dispatcher)
-+  }
-+
-+  public render() {
-+    const commit = this.props.selectedCommit
-+
-+    if (commit == null) {
-+      return <NoCommitSelected />
-+    }
-+
-+    const className = this.state.isExpanded ? 'expanded' : 'collapsed'
-+
-+    return (
-+      <div id="history" className={className}>
-+        {this.renderCommitSummary(commit)}
-+        <div id="commit-details">
-+          <Resizable
-+            width={this.props.commitSummaryWidth}
-+            onResize={this.onCommitSummaryResize}
-+            onReset={this.onCommitSummaryReset}
-+          >
-+            {this.renderFileList()}
-+          </Resizable>
-+          {this.renderDiff()}
-+        </div>
-+      </div>
-+    )
-+  }
-+}
-+
-+function NoCommitSelected() {
-+  const BlankSlateImage = encodePathAsUrl(
-+    __dirname,
-+    'static/empty-no-commit.svg'
-+  )
-+
-+  return (
-+    <div className="panel blankslate">
-+      <img src={BlankSlateImage} className="blankslate-image" />
-+      No commit selected
-+    </div>
-+  )
-+}
-removed in remote
-  base   100644 5c5a20826435e372f8786d01a203be39bc2046cb app/src/ui/history/sidebar.tsx
-  our    100644 5c5a20826435e372f8786d01a203be39bc2046cb app/src/ui/history/sidebar.tsx
-@@ -1,70 +0,0 @@
--import * as React from 'react'
--import { CommitList } from './commit-list'
--import { Repository } from '../../models/repository'
--import { Commit } from '../../models/commit'
--import { Dispatcher } from '../../lib/dispatcher'
--import { IGitHubUser } from '../../lib/databases'
--import { IHistoryState } from '../../lib/app-state'
--import { ThrottledScheduler } from '../lib/throttled-scheduler'
--
--/** If we're within this many rows from the bottom, load the next history batch. */
--const CloseToBottomThreshold = 10
--
--interface IHistorySidebarProps {
--  readonly repository: Repository
--  readonly dispatcher: Dispatcher
--  readonly history: IHistoryState
--  readonly gitHubUsers: Map<string, IGitHubUser>
--  readonly emoji: Map<string, string>
--  readonly commitLookup: Map<string, Commit>
--  readonly localCommitSHAs: ReadonlyArray<string>
--  readonly onRevertCommit: (commit: Commit) => void
--  readonly onViewCommitOnGitHub: (sha: string) => void
--}
--
--/** The History component. Contains the commit list, commit summary, and diff. */
--export class HistorySidebar extends React.Component<IHistorySidebarProps, {}> {
--  private readonly loadChangedFilesScheduler = new ThrottledScheduler(200)
--
--  private onCommitSelected = (commit: Commit) => {
--    this.props.dispatcher.changeHistoryCommitSelection(
--      this.props.repository,
--      commit.sha
--    )
--
--    this.loadChangedFilesScheduler.queue(() => {
--      this.props.dispatcher.loadChangedFilesForCurrentSelection(
--        this.props.repository
--      )
--    })
--  }
--
--  private onScroll = (start: number, end: number) => {
--    const history = this.props.history.history
--    if (history.length - end <= CloseToBottomThreshold) {
--      this.props.dispatcher.loadNextHistoryBatch(this.props.repository)
--    }
--  }
--
--  public componentWillUnmount() {
--    this.loadChangedFilesScheduler.clear()
--  }
--
--  public render() {
--    return (
--      <CommitList
--        gitHubRepository={this.props.repository.gitHubRepository}
--        commitLookup={this.props.commitLookup}
--        commits={this.props.history.history}
--        selectedSHA={this.props.history.selection.sha}
--        onCommitSelected={this.onCommitSelected}
--        onScroll={this.onScroll}
--        gitHubUsers={this.props.gitHubUsers}
--        emoji={this.props.emoji}
--        localCommitSHAs={this.props.localCommitSHAs}
--        onRevertCommit={this.props.onRevertCommit}
--        onViewCommitOnGitHub={this.props.onViewCommitOnGitHub}
--      />
--    )
--  }
--}
-merged
-  result 100644 e09719d3d34c3169bd68c26a84f6b7040c4d34a1 app/src/ui/index.tsx
-  our    100644 68dedd34f265a41733b16e76f0ce3b07e05f865e app/src/ui/index.tsx
-@@ -12,6 +12,7 @@
-   gitAuthenticationErrorHandler,
-   externalEditorErrorHandler,
-   openShellErrorHandler,
-+  mergeConflictHandler,
-   lfsAttributeMismatchHandler,
-   defaultErrorHandler,
-   missingRepositoryHandler,
-@@ -138,6 +139,7 @@
- dispatcher.registerErrorHandler(upstreamAlreadyExistsHandler)
- dispatcher.registerErrorHandler(externalEditorErrorHandler)
- dispatcher.registerErrorHandler(openShellErrorHandler)
-+dispatcher.registerErrorHandler(mergeConflictHandler)
- dispatcher.registerErrorHandler(lfsAttributeMismatchHandler)
- dispatcher.registerErrorHandler(gitAuthenticationErrorHandler)
- dispatcher.registerErrorHandler(pushNeedsPullHandler)
-added in remote
-  their  100644 ea7e335764dce50a5697270ad74ac61d4df250d3 app/src/ui/lib/application-theme.ts
-@@ -0,0 +1,56 @@
-+import { assertNever } from '../../lib/fatal-error'
-+
-+/**
-+ * A set of the user-selectable appearances (aka themes)
-+ */
-+export enum ApplicationTheme {
-+  Light,
-+  Dark,
-+}
-+
-+/**
-+ * Gets the friendly name of an application theme for use
-+ * in persisting to storage and/or calculating the required
-+ * body class name to set in order to apply the theme.
-+ */
-+export function getThemeName(theme: ApplicationTheme): string {
-+  switch (theme) {
-+    case ApplicationTheme.Light:
-+      return 'light'
-+    case ApplicationTheme.Dark:
-+      return 'dark'
-+    default:
-+      return assertNever(theme, `Unknown theme ${theme}`)
-+  }
-+}
-+
-+// The key under which the currently selected theme is persisted
-+// in localStorage.
-+const applicationThemeKey = 'theme'
-+
-+/**
-+ * Load the currently selected theme from the persistent
-+ * store (localStorage). If no theme is selected the default
-+ * theme will be returned.
-+ */
-+export function getPersistedTheme(): ApplicationTheme {
-+  return localStorage.getItem(applicationThemeKey) === 'dark'
-+    ? ApplicationTheme.Dark
-+    : ApplicationTheme.Light
-+}
-+
-+/**
-+ * Load the name of the currently selected theme from the persistent
-+ * store (localStorage). If no theme is selected the default
-+ * theme name will be returned.
-+ */
-+export function getPersistedThemeName(): string {
-+  return getThemeName(getPersistedTheme())
-+}
-+
-+/**
-+ * Store the given theme in the persistent store (localStorage).
-+ */
-+export function setPersistedTheme(theme: ApplicationTheme) {
-+  localStorage.setItem(applicationThemeKey, getThemeName(theme))
-+}
-merged
-  result 100644 fc57454845110cf3f68a914d768fbd7c0fcb7334 app/src/ui/lib/author-input.tsx
-  our    100644 ce2ac281f54bee2dd43287b02559765a97896d98 app/src/ui/lib/author-input.tsx
-@@ -174,17 +174,6 @@
-   return scanWhile(doc, start, (doc, pos) => !predicate(doc, pos), iter)
- }
-
--/**
-- * Given a cursor position, expand it into a range covering as
-- * long of an autocompletable string as possible.
-- */
--function getHintRangeFromCursor(doc: Doc, cursor: Position) {
--  return {
--    from: scanUntil(doc, cursor, isMarkOrWhitespace, prevPosition),
--    to: scanUntil(doc, cursor, isMarkOrWhitespace, nextPosition),
--  }
--}
--
- function appendTextMarker(
-   cm: Editor,
-   text: string,
-@@ -635,7 +624,10 @@
-     const doc = cm.getDoc()
-     const cursor = doc.getCursor() as Readonly<Position>
-
--    const { from, to } = getHintRangeFromCursor(doc, cursor)
-+    // expand the current cursor position into a range covering as
-+    // long of an autocompletable string as possible.
-+    const from = scanUntil(doc, cursor, isMarkOrWhitespace, prevPosition)
-+    const to = scanUntil(doc, cursor, isMarkOrWhitespace, nextPosition)
-
-     const word = doc.getRange(from, to)
-
-merged
-  result 100644 e67fec4d040e5e4975cb0ae8992ec28f6683df0e app/src/ui/lib/branch-name-warnings.tsx
-  our    100644 f5d37c46294aebe893fe8c432c70b78e9297a20b app/src/ui/lib/branch-name-warnings.tsx
-@@ -1,4 +1,5 @@
- import * as React from 'react'
-+import { Branch } from '../../models/branch'
-
- import { Row } from './row'
- import { Octicon, OcticonSymbol } from '../octicons'
-@@ -30,3 +31,18 @@
-     return null
-   }
- }
-+export function renderBranchHasRemoteWarning(branch: Branch) {
-+  if (branch.upstream != null) {
-+    return (
-+      <Row className="warning-helper-text">
-+        <Octicon symbol={OcticonSymbol.alert} />
-+        <p>
-+          This branch is tracking <Ref>{branch.upstream}</Ref> and renaming this
-+          branch will not change the branch name on the remote.
-+        </p>
-+      </Row>
-+    )
-+  } else {
-+    return null
-+  }
-+}
-added in remote
-  their  100644 3700c8d5f94db7df3f64d2b73d4da9ae0dcad379 app/src/ui/lib/bytes.ts
-@@ -0,0 +1,27 @@
-+/**
-+ * Number sign display mode
-+ */
-+export const enum Sign {
-+  Normal,
-+  Forced,
-+}
-+
-+/**
-+ * Display bytes in human readable format like:
-+ *    23GB
-+ *   -43B
-+ * It's also possible to force sign in order to get the
-+ * plus sign in case of positive numbers like:
-+ *   +23GB
-+ *   -43B
-+ */
-+export const formatBytes = (bytes: number, signType: Sign = Sign.Normal) => {
-+  if (!Number.isFinite(bytes)) {
-+    return 'Unknown'
-+  }
-+  const sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB']
-+  const sizeIndex = Math.floor(Math.log(Math.abs(bytes)) / Math.log(1024))
-+  const sign = signType === Sign.Forced && bytes > 0 ? '+' : ''
-+  const value = Math.round(bytes / Math.pow(1024, sizeIndex))
-+  return `${sign}${value}${sizes[sizeIndex]}`
-+}
-added in remote
-  their  100644 8e64852c77aab8327ec82aee0e7504fd934abe7b app/src/ui/lib/context-menu.ts
-@@ -0,0 +1,21 @@
-+const RestrictedFileExtensions = ['.cmd', '.exe', '.bat', '.sh']
-+export const DefaultEditorLabel = __DARWIN__
-+  ? 'Open in External Editor'
-+  : 'Open in external editor'
-+
-+export const RevealInFileManagerLabel = __DARWIN__
-+  ? 'Reveal in Finder'
-+  : __WIN32__
-+    ? 'Show in Explorer'
-+    : 'Show in your File Manager'
-+
-+export const OpenWithDefaultProgramLabel = __DARWIN__
-+  ? 'Open with Default Program'
-+  : 'Open with default program'
-+
-+export function isSafeFileExtension(extension: string): boolean {
-+  if (__WIN32__) {
-+    return RestrictedFileExtensions.indexOf(extension.toLowerCase()) === -1
-+  }
-+  return true
-+}
-added in remote
-  their  100644 7e0e709f0e2c042f8e122480dc6f4a05460633d4 app/src/ui/lib/fancy-text-box.tsx
-@@ -0,0 +1,73 @@
-+import * as React from 'react'
-+import { Octicon, OcticonSymbol } from '../octicons'
-+import { TextBox, ITextBoxProps } from './text-box'
-+import * as classNames from 'classnames'
-+
-+interface IFancyTextBoxProps extends ITextBoxProps {
-+  /** Icon to render */
-+  readonly symbol: OcticonSymbol
-+
-+  /** Callback used to get a reference to internal TextBox */
-+  readonly onRef: (textbox: TextBox) => void
-+}
-+
-+interface IFancyTextBoxState {
-+  readonly isFocused: boolean
-+}
-+
-+export class FancyTextBox extends React.Component<
-+  IFancyTextBoxProps,
-+  IFancyTextBoxState
-+> {
-+  public constructor(props: IFancyTextBoxProps) {
-+    super(props)
-+
-+    this.state = { isFocused: false }
-+  }
-+
-+  public render() {
-+    const componentCSS = classNames(
-+      'fancy-text-box-component',
-+      this.props.className,
-+      { disabled: this.props.disabled },
-+      { focused: this.state.isFocused }
-+    )
-+    const octiconCSS = classNames('fancy-octicon')
-+
-+    return (
-+      <div className={componentCSS}>
-+        <Octicon className={octiconCSS} symbol={this.props.symbol} />
-+        <TextBox
-+          value={this.props.value}
-+          onFocus={this.onFocus}
-+          onBlur={this.onBlur}
-+          autoFocus={this.props.autoFocus}
-+          disabled={this.props.disabled}
-+          type={this.props.type}
-+          placeholder={this.props.placeholder}
-+          onKeyDown={this.props.onKeyDown}
-+          onValueChanged={this.props.onValueChanged}
-+          onSearchCleared={this.props.onSearchCleared}
-+          tabIndex={this.props.tabIndex}
-+          ref={this.props.onRef}
-+        />
-+      </div>
-+    )
-+  }
-+
-+  private onFocus = () => {
-+    if (this.props.onFocus !== undefined) {
-+      this.props.onFocus()
-+    }
-+
-+    this.setState({ isFocused: true })
-+  }
-+
-+  private onBlur = () => {
-+    if (this.props.onBlur !== undefined) {
-+      this.props.onBlur()
-+    }
-+
-+    this.setState({ isFocused: false })
-+  }
-+}
-merged
-  result 100644 c845440dc0449aaf6b81f86a7a77eb0d3d8d1a8f app/src/ui/lib/filter-list.tsx
-  our    100644 b9bb01a8b42988979f70713fba1d5035438fda4d app/src/ui/lib/filter-list.tsx
-@@ -1,16 +1,20 @@
- import * as React from 'react'
- import * as classnames from 'classnames'
-
--import { List, SelectionSource as ListSelectionSource } from '../lib/list'
-+import {
-+  List,
-+  SelectionSource as ListSelectionSource,
-+  findNextSelectableRow,
-+} from '../lib/list'
- import { TextBox } from '../lib/text-box'
- import { Row } from '../lib/row'
-
--import { match, IMatch } from '../../lib/fuzzy-find'
-+import { match, IMatch, IMatches } from '../../lib/fuzzy-find'
-
- /** An item in the filter list. */
- export interface IFilterListItem {
-   /** The text which represents the item. This is used for filtering. */
--  readonly text: string
-+  readonly text: ReadonlyArray<string>
-
-   /** A unique identifier for the item. */
-   readonly id: string
-@@ -34,7 +38,7 @@
-   readonly kind: 'item'
-   readonly item: T
-   /** Array of indexes in `item.text` that should be highlighted */
--  readonly matches: ReadonlyArray<number>
-+  readonly matches: IMatches
- }
-
- /**
-@@ -59,10 +63,7 @@
-   readonly selectedItem: T | null
-
-   /** Called to render each visible item. */
--  readonly renderItem: (
--    item: T,
--    matches: ReadonlyArray<number>
--  ) => JSX.Element | null
-+  readonly renderItem: (item: T, matches: IMatches) => JSX.Element | null
-
-   /** Called to render header for the group with the given identifier. */
-   readonly renderGroupHeader?: (identifier: string) => JSX.Element | null
-@@ -117,6 +118,14 @@
-
-   /** Called when there are no items to render.  */
-   readonly renderNoItems?: () => JSX.Element | null
-+
-+  /**
-+   * A reference to a TextBox that will be used to control this component.
-+   *
-+   * See https://github.com/desktop/desktop/issues/4317 for refactoring work to
-+   * make this more composable which should make this unnecessary.
-+   */
-+  readonly filterTextBox?: TextBox
- }
-
- interface IFilterListState<T extends IFilterListItem> {
-@@ -151,6 +160,12 @@
-     this.state = createStateUpdate(props)
-   }
-
-+  public componentWillMount() {
-+    if (this.props.filterTextBox !== undefined) {
-+      this.filterTextBox = this.props.filterTextBox
-+    }
-+  }
-+
-   public componentWillReceiveProps(nextProps: IFilterListProps<T>) {
-     this.setState(createStateUpdate(nextProps))
-   }
-@@ -189,29 +204,34 @@
-   }
-
-   public componentDidMount() {
--    if (this.filterTextBox != null) {
-+    if (this.filterTextBox !== null) {
-       this.filterTextBox.selectAll()
-     }
-   }
-
-+  public renderTextBox() {
-+    return (
-+      <TextBox
-+        ref={this.onTextBoxRef}
-+        type="search"
-+        autoFocus={true}
-+        placeholder="Filter"
-+        className="filter-list-filter-field"
-+        onValueChanged={this.onFilterValueChanged}
-+        onKeyDown={this.onKeyDown}
-+        value={this.props.filterText}
-+        disabled={this.props.disabled}
-+      />
-+    )
-+  }
-+
-   public render() {
-     return (
-       <div className={classnames('filter-list', this.props.className)}>
-         {this.props.renderPreList ? this.props.renderPreList() : null}
-
-         <Row className="filter-field-row">
--          <TextBox
--            ref={this.onTextBoxRef}
--            type="search"
--            autoFocus={true}
--            placeholder="Filter"
--            className="filter-list-filter-field"
--            onValueChanged={this.onFilterValueChanged}
--            onKeyDown={this.onKeyDown}
--            value={this.props.filterText}
--            disabled={this.props.disabled}
--          />
--
-+          {this.props.filterTextBox === undefined ? this.renderTextBox() : null}
-           {this.props.renderPostFilter ? this.props.renderPostFilter() : null}
-         </Row>
-
-@@ -220,6 +240,29 @@
-     )
-   }
-
-+  public selectFirstItem(focus: boolean = false) {
-+    if (this.list === null) {
-+      return
-+    }
-+
-+    const next = findNextSelectableRow(
-+      this.state.rows.length,
-+      {
-+        direction: 'down',
-+        row: -1,
-+      },
-+      this.canSelectRow
-+    )
-+
-+    if (next !== null) {
-+      this.setState({ selectedRow: next }, () => {
-+        if (focus && this.list !== null) {
-+          this.list.focus()
-+        }
-+      })
-+    }
-+  }
-+
-   private renderContent() {
-     if (this.state.rows.length === 0 && this.props.renderNoItems) {
-       return this.props.renderNoItems()
-@@ -230,8 +273,8 @@
-           rowCount={this.state.rows.length}
-           rowRenderer={this.renderRow}
-           rowHeight={this.props.rowHeight}
--          selectedRow={this.state.selectedRow}
--          onSelectionChanged={this.onSelectionChanged}
-+          selectedRows={[this.state.selectedRow]}
-+          onSelectedRowChanged={this.onSelectedRowChanged}
-           onRowClick={this.onRowClick}
-           onRowKeyDown={this.onRowKeyDown}
-           canSelectRow={this.canSelectRow}
-@@ -269,7 +312,7 @@
-     }
-   }
-
--  private onSelectionChanged = (index: number, source: SelectionSource) => {
-+  private onSelectedRowChanged = (index: number, source: SelectionSource) => {
-     this.setState({ selectedRow: index })
-
-     if (this.props.onSelectionChanged) {
-@@ -305,8 +348,19 @@
-       return
-     }
-
--    const firstSelectableRow = list.nextSelectableRow('down', -1)
--    const lastSelectableRow = list.nextSelectableRow('up', 0)
-+    const rowCount = this.state.rows.length
-+
-+    const firstSelectableRow = findNextSelectableRow(
-+      rowCount,
-+      { direction: 'down', row: -1 },
-+      this.canSelectRow
-+    )
-+    const lastSelectableRow = findNextSelectableRow(
-+      rowCount,
-+      { direction: 'up', row: 0 },
-+      this.canSelectRow
-+    )
-+
-     let shouldFocus = false
-
-     if (event.key === 'ArrowUp' && row === firstSelectableRow) {
-@@ -341,9 +395,15 @@
-       return
-     }
-
-+    const rowCount = this.state.rows.length
-+
-     if (key === 'ArrowDown') {
--      if (this.state.rows.length > 0) {
--        const selectedRow = list.nextSelectableRow('down', -1)
-+      if (rowCount > 0) {
-+        const selectedRow = findNextSelectableRow(
-+          rowCount,
-+          { direction: 'down', row: -1 },
-+          this.canSelectRow
-+        )
-         if (selectedRow != null) {
-           this.setState({ selectedRow }, () => {
-             list.focus()
-@@ -353,8 +413,12 @@
-
-       event.preventDefault()
-     } else if (key === 'ArrowUp') {
--      if (this.state.rows.length > 0) {
--        const selectedRow = list.nextSelectableRow('up', 0)
-+      if (rowCount > 0) {
-+        const selectedRow = findNextSelectableRow(
-+          rowCount,
-+          { direction: 'up', row: 0 },
-+          this.canSelectRow
-+        )
-         if (selectedRow != null) {
-           this.setState({ selectedRow }, () => {
-             list.focus()
-@@ -365,7 +429,7 @@
-       event.preventDefault()
-     } else if (key === 'Enter') {
-       // no repositories currently displayed, bail out
--      if (!this.state.rows.length) {
-+      if (rowCount === 0) {
-         return event.preventDefault()
-       }
-
-@@ -375,15 +439,25 @@
-         return event.preventDefault()
-       }
-
--      const row = list.nextSelectableRow('down', -1)
-+      const row = findNextSelectableRow(
-+        rowCount,
-+        { direction: 'down', row: -1 },
-+        this.canSelectRow
-+      )
-
--      if (row) {
-+      if (row != null) {
-         this.onRowClick(row)
-       }
-     }
-   }
- }
-
-+export function getText<T extends IFilterListItem>(
-+  item: T
-+): ReadonlyArray<string> {
-+  return item['text']
-+}
-+
- function createStateUpdate<T extends IFilterListItem>(
-   props: IFilterListProps<T>
- ) {
-@@ -392,8 +466,12 @@
-
-   for (const group of props.groups) {
-     const items: ReadonlyArray<IMatch<T>> = filter
--      ? match(filter, group.items, 'text')
--      : group.items.map(item => ({ score: 1, matches: [], item }))
-+      ? match(filter, group.items, getText)
-+      : group.items.map(item => ({
-+          score: 1,
-+          matches: { title: [], subtitle: [] },
-+          item,
-+        }))
-
-     if (!items.length) {
-       continue
-merged
-  result 100644 709940e3ff06be4683e739ccf2696ae16823aaa8 app/src/ui/lib/focus-container.tsx
-  our    100644 8b8d3c828c4c092d1c07ade684131afd70e763a0 app/src/ui/lib/focus-container.tsx
-@@ -4,6 +4,10 @@
- interface IFocusContainerProps {
-   readonly className?: string
-   readonly onClick?: (event: React.MouseEvent<HTMLDivElement>) => void
-+  readonly onKeyDown?: (event: React.KeyboardEvent<HTMLDivElement>) => void
-+
-+  /** Callback used when focus is within container */
-+  readonly onFocusWithinChanged?: (focusWithin: boolean) => void
- }
-
- interface IFocusContainerState {
-@@ -26,20 +30,43 @@
-   IFocusContainerState
- > {
-   private wrapperRef: HTMLDivElement | null = null
-+  private focusWithinChangedTimeoutId: number | null = null
-
-   public constructor(props: IFocusContainerProps) {
-     super(props)
-     this.state = { focusWithin: false }
-   }
-
-+  /**
-+   * Update the focus state of the container, aborting any in-flight animation
-+   *
-+   * @param focusWithin the new focus state of the control
-+   */
-+  private onFocusWithinChanged(focusWithin: boolean) {
-+    this.setState({ focusWithin })
-+
-+    if (this.focusWithinChangedTimeoutId !== null) {
-+      cancelAnimationFrame(this.focusWithinChangedTimeoutId)
-+      this.focusWithinChangedTimeoutId = null
-+    }
-+
-+    this.focusWithinChangedTimeoutId = requestAnimationFrame(() => {
-+      if (this.props.onFocusWithinChanged) {
-+        this.props.onFocusWithinChanged(focusWithin)
-+      }
-+
-+      this.focusWithinChangedTimeoutId = null
-+    })
-+  }
-+
-   private onWrapperRef = (elem: HTMLDivElement) => {
-     if (elem) {
-       elem.addEventListener('focusin', () => {
--        this.setState({ focusWithin: true })
-+        this.onFocusWithinChanged(true)
-       })
-
-       elem.addEventListener('focusout', () => {
--        this.setState({ focusWithin: false })
-+        this.onFocusWithinChanged(false)
-       })
-     }
-
-@@ -52,6 +79,12 @@
-     }
-   }
-
-+  private onKeyDown = (e: React.KeyboardEvent<HTMLDivElement>) => {
-+    if (this.props.onKeyDown) {
-+      this.props.onKeyDown(e)
-+    }
-+  }
-+
-   private onMouseDown = (e: React.MouseEvent<HTMLDivElement>) => {
-     // If someone is clicking on the focuscontainer itself we'll
-     // cancel it, that saves us from having a focusout/in cycle
-@@ -72,6 +105,7 @@
-         ref={this.onWrapperRef}
-         onClick={this.onClick}
-         onMouseDown={this.onMouseDown}
-+        onKeyDown={this.onKeyDown}
-       >
-         {this.props.children}
-       </div>
-merged
-  result 100644 861d4a732ccab52dda47589ad6904afbdd204d56 app/src/ui/lib/list/index.ts
-  our    100644 c1edf1e2d209c6b876ba5deb92af9d75fa5be1a6 app/src/ui/lib/list/index.ts
-@@ -1 +1,2 @@
- export * from './list'
-+export * from './selection'
-merged
-  result 100644 e534ebfd72eb9026d47bcdcd9e3077b295db520a app/src/ui/lib/list/list.tsx
-  our    100644 b802d39f208620ff995e34fe62a149883b81c618 app/src/ui/lib/list/list.tsx
-@@ -1,9 +1,19 @@
- import * as React from 'react'
- import * as ReactDOM from 'react-dom'
- import { Grid, AutoSizer } from 'react-virtualized'
--import { shallowEquals } from '../../../lib/equality'
-+import { shallowEquals, arrayEquals } from '../../../lib/equality'
-+import { FocusContainer } from '../../lib/focus-container'
- import { ListRow } from './list-row'
-+import {
-+  findNextSelectableRow,
-+  SelectionSource,
-+  SelectionDirection,
-+  IMouseClickSource,
-+  IKeyboardSource,
-+  ISelectAllSource,
-+} from './selection'
- import { createUniqueId, releaseUniqueId } from '../../lib/id-pool'
-+import { range } from '../../../lib/range'
-
- /**
-  * Describe the first argument given to the cellRenderer,
-@@ -28,37 +38,6 @@
-   readonly style: React.CSSProperties
- }
-
--/**
-- * Interface describing a user initiated selection change event
-- * originating from a pointer device clicking or pressing on an item.
-- */
--export interface IMouseClickSource {
--  readonly kind: 'mouseclick'
--  readonly event: React.MouseEvent<any>
--}
--
--/**
-- * Interface describing a user initiated selection change event
-- * originating from a pointer device hovering over an item.
-- * Only applicable when selectedOnHover is set.
-- */
--export interface IHoverSource {
--  readonly kind: 'hover'
--  readonly event: React.MouseEvent<any>
--}
--
--/**
-- * Interface describing a user initiated selection change event
-- * originating from a keyboard
-- */
--export interface IKeyboardSource {
--  readonly kind: 'keyboard'
--  readonly event: React.KeyboardEvent<any>
--}
--
--/** A type union of possible sources of a selection changed event */
--export type SelectionSource = IMouseClickSource | IHoverSource | IKeyboardSource
--
- export type ClickSource = IMouseClickSource | IKeyboardSource
-
- interface IListProps {
-@@ -89,11 +68,11 @@
-   readonly rowHeight: number | ((info: { index: number }) => number)
-
-   /**
--   * The currently selected row index. Used to attach a special
--   * selection class on that row container as well as being used
-+   * The currently selected rows indexes. Used to attach a special
-+   * selection class on those row's containers as well as being used
-    * for keyboard selection.
-    */
--  readonly selectedRow: number
-+  readonly selectedRows: ReadonlyArray<number>
-
-   /**
-    * This function will be called when a pointer device is pressed and then
-@@ -111,16 +90,68 @@
-   readonly onRowClick?: (row: number, soure: ClickSource) => void
-
-   /**
-+   * This prop defines the behaviour of the selection of items whithin this list.
-+   *  - 'single' : (default) single list-item selection. [shift] and [ctrl] have
-+   * no effect. Use in combination with one of:
-+   *             onSelectedRowChanged(row: number)
-+   *             onSelectionChanged(rows: number[])
-+   *  - 'range' : allows for selecting continuous ranges. [shift] can be used.
-+   * [ctrl] has no effect. Use in combination with one of:
-+   *             onSelectedRangeChanged(start: number, end: number)
-+   *             onSelectionChanged(rows: number[])
-+   *  - 'multi' : allows range and/or arbitrary selection. [shift] and [ctrl]
-+   * can be used. Use in combination with:
-+   *             onSelectionChanged(rows: number[])
-+   */
-+  readonly selectionMode?: 'single' | 'range' | 'multi'
-+
-+  /**
-    * This function will be called when the selection changes as a result of a
-    * user keyboard or mouse action (i.e. not when props change). This function
-    * will not be invoked when an already selected row is clicked on.
-+   * Use this function when the selectionMode is 'single'
-    *
-    * @param row    - The index of the row that was just selected
-    * @param source - The kind of user action that provoked the change, either
-    *                 a pointer device press, hover (if selectOnHover is set) or
-    *                 a keyboard event (arrow up/down)
-    */
--  readonly onSelectionChanged?: (row: number, source: SelectionSource) => void
-+  readonly onSelectedRowChanged?: (row: number, source: SelectionSource) => void
-+
-+  /**
-+   * This function will be called when the selection changes as a result of a
-+   * user keyboard or mouse action (i.e. not when props change). This function
-+   * will not be invoked when an already selected row is clicked on.
-+   * Index parameters are inclusive
-+   * Use this function when the selectionMode is 'range'
-+   *
-+   * @param start  - The index of the first selected row
-+   * @param end    - The index of the last selected row
-+   * @param source - The kind of user action that provoked the change, either
-+   *                 a pointer device press, hover (if selectOnHover is set) or
-+   *                 a keyboard event (arrow up/down)
-+   */
-+  readonly onSelectedRangeChanged?: (
-+    start: number,
-+    end: number,
-+    source: SelectionSource
-+  ) => void
-+
-+  /**
-+   * This function will be called when the selection changes as a result of a
-+   * user keyboard or mouse action (i.e. not when props change). This function
-+   * will not be invoked when an already selected row is clicked on.
-+   * Use this function for any selectionMode
-+   *
-+   * @param rows   - The indexes of the row(s) that are part of the selection
-+   * @param source - The kind of user action that provoked the change, either
-+   *                 a pointer device press, hover (if selectOnHover is set) or
-+   *                 a keyboard event (arrow up/down)
-+   */
-+  readonly onSelectionChanged?: (
-+    rows: ReadonlyArray<number>,
-+    source: SelectionSource
-+  ) => void
-
-   /**
-    * A handler called whenever a key down event is received on the
-@@ -185,6 +216,21 @@
-   readonly rowIdPrefix?: string
- }
-
-+/**
-+ * Create an array with row indices between firstRow and lastRow (inclusive).
-+ *
-+ * This is essentially a range function with the explicit behavior of
-+ * inclusive upper and lower bound.
-+ */
-+function createSelectionBetween(
-+  firstRow: number,
-+  lastRow: number
-+): ReadonlyArray<number> {
-+  // range is upper bound exclusive
-+  const end = lastRow > firstRow ? lastRow + 1 : lastRow - 1
-+  return range(firstRow, end)
-+}
-+
- export class List extends React.Component<IListProps, IListState> {
-   private focusItem: HTMLDivElement | null = null
-   private fakeScroll: HTMLDivElement | null = null
-@@ -254,13 +300,53 @@
-     }
-   }
-
-+  private onSelectAll = (event: Event) => {
-+    const selectionMode = this.props.selectionMode
-+
-+    if (selectionMode !== 'range' && selectionMode !== 'multi') {
-+      return
-+    }
-+
-+    event.preventDefault()
-+
-+    if (this.props.rowCount <= 0) {
-+      return
-+    }
-+
-+    const source: ISelectAllSource = { kind: 'select-all' }
-+    const firstRow = 0
-+    const lastRow = this.props.rowCount - 1
-+
-+    if (this.props.onSelectionChanged) {
-+      const newSelection = createSelectionBetween(firstRow, lastRow)
-+      this.props.onSelectionChanged(newSelection, source)
-+    }
-+
-+    if (selectionMode === 'range' && this.props.onSelectedRangeChanged) {
-+      this.props.onSelectedRangeChanged(firstRow, lastRow, source)
-+    }
-+  }
-+
-   private onRef = (element: HTMLDivElement | null) => {
-+    if (element === null && this.list !== null) {
-+      this.list.removeEventListener('select-all', this.onSelectAll)
-+    }
-+
-     this.list = element
-
-+    if (element !== null) {
-+      // This is a custom event that desktop emits through <App />
-+      // when the user selects the Edit > Select all menu item. We
-+      // hijack it and select all list items rather than let it bubble
-+      // to electron's default behavior which is to select all selectable
-+      // text in the renderer.
-+      element.addEventListener('select-all', this.onSelectAll)
-+    }
-+
-     if (this.resizeObserver) {
-       this.resizeObserver.disconnect()
-
--      if (element) {
-+      if (element !== null) {
-         this.resizeObserver.observe(element)
-       } else {
-         this.setState({ width: undefined, height: undefined })
-@@ -269,10 +355,11 @@
-   }
-
-   private handleKeyDown = (event: React.KeyboardEvent<any>) => {
--    const row = this.props.selectedRow
--    if (row >= 0 && this.props.onRowKeyDown) {
--      this.props.onRowKeyDown(row, event)
--    }
-+    this.props.selectedRows.forEach(row => {
-+      if (this.props.onRowKeyDown) {
-+        this.props.onRowKeyDown(row, event)
-+      }
-+    })
-
-     // The consumer is given a change to prevent the default behavior for
-     // keyboard navigation so that they can customize its behavior as needed.
-@@ -281,10 +368,26 @@
-     }
-
-     if (event.key === 'ArrowDown') {
--      this.moveSelection('down', event)
-+      if (
-+        event.shiftKey &&
-+        this.props.selectionMode &&
-+        this.props.selectionMode !== 'single'
-+      ) {
-+        this.addSelection('down', event)
-+      } else {
-+        this.moveSelection('down', event)
-+      }
-       event.preventDefault()
-     } else if (event.key === 'ArrowUp') {
--      this.moveSelection('up', event)
-+      if (
-+        event.shiftKey &&
-+        this.props.selectionMode &&
-+        this.props.selectionMode !== 'single'
-+      ) {
-+        this.addSelection('up', event)
-+      } else {
-+        this.moveSelection('up', event)
-+      }
-       event.preventDefault()
-     }
-   }
-@@ -300,18 +403,37 @@
-     // We give consumers the power to prevent the onRowClick event by subscribing
-     // to the onRowKeyDown event and calling event.preventDefault. This lets
-     // consumers add their own semantics for keyboard presses.
--    if (!event.defaultPrevented && this.props.onRowClick) {
--      if (event.key === 'Enter' || event.key === ' ') {
--        this.props.onRowClick(rowIndex, { kind: 'keyboard', event })
--        event.preventDefault()
--      }
-+    if (
-+      !event.defaultPrevented &&
-+      (event.key === 'Enter' || event.key === ' ')
-+    ) {
-+      this.toggleSelection(event)
-+      event.preventDefault()
-+    }
-+  }
-+
-+  private onKeyDown = (event: React.KeyboardEvent<any>) => {
-+    if (event.key === 'Enter' || event.key === ' ') {
-+      this.toggleSelection(event)
-+      event.preventDefault()
-     }
-   }
-
-+  private toggleSelection = (event: React.KeyboardEvent<any>) => {
-+    this.props.selectedRows.forEach(row => {
-+      if (this.props.onRowClick) {
-+        this.props.onRowClick(row, { kind: 'keyboard', event })
-+      }
-+    })
-+  }
-+
-   private onRowMouseOver = (row: number, event: React.MouseEvent<any>) => {
-     if (this.props.selectOnHover && this.canSelectRow(row)) {
--      if (row !== this.props.selectedRow && this.props.onSelectionChanged) {
--        this.props.onSelectionChanged(row, { kind: 'hover', event })
-+      if (
-+        this.props.selectedRows.includes(row) &&
-+        this.props.onSelectionChanged
-+      ) {
-+        this.props.onSelectionChanged([row], { kind: 'hover', event })
-         // By calling scrollRowToVisible we ensure that hovering over a partially
-         // visible item at the top or bottom of the list scrolls it into view but
-         // more importantly `scrollRowToVisible` automatically manages focus so
-@@ -322,54 +444,76 @@
-     }
-   }
-
--  /**
--   * Determine the next selectable row, given the direction and row. This will
--   * take `canSelectRow` into account.
--   *
--   * Returns null if no row can be selected.
--   */
--  public nextSelectableRow(
--    direction: 'up' | 'down',
--    row: number
--  ): number | null {
--    // If the row we're starting from is outside our list, make sure we start
--    // walking from _just_ outside the list. We'll also need to walk one more
--    // row than we normally would since the first step is just getting us into
--    // the list.
--    const baseRow = Math.min(Math.max(row, -1), this.props.rowCount)
--    const startOutsideList = row < 0 || row >= this.props.rowCount
--    const rowDelta = startOutsideList
--      ? this.props.rowCount + 1
--      : this.props.rowCount
--
--    for (let i = 1; i < rowDelta; i++) {
--      const delta = direction === 'up' ? i * -1 : i
--      // Modulo accounting for negative values, see https://stackoverflow.com/a/4467559
--      const nextRow =
--        (baseRow + delta + this.props.rowCount) % this.props.rowCount
--
--      if (this.canSelectRow(nextRow)) {
--        return nextRow
--      }
-+  /** Convenience method for invoking canSelectRow callback when it exists */
-+  private canSelectRow = (rowIndex: number) => {
-+    return this.props.canSelectRow ? this.props.canSelectRow(rowIndex) : true
-+  }
-+
-+  private addSelection(
-+    direction: SelectionDirection,
-+    event: React.KeyboardEvent<any>
-+  ) {
-+    if (this.props.selectedRows.length === 0) {
-+      return this.moveSelection(direction, event)
-     }
-
--    return null
--  }
-+    const lastSelection = this.props.selectedRows[
-+      this.props.selectedRows.length - 1
-+    ]
-
--  /** Convenience method for invoking canSelectRow callback when it exists */
--  private canSelectRow(rowIndex: number) {
--    return this.props.canSelectRow ? this.props.canSelectRow(rowIndex) : true
-+    const selectionOrigin = this.props.selectedRows[0]
-+
-+    const newRow = findNextSelectableRow(
-+      this.props.rowCount,
-+      { direction, row: lastSelection, wrap: false },
-+      this.canSelectRow
-+    )
-+
-+    if (newRow != null) {
-+      if (this.props.onSelectionChanged) {
-+        const newSelection = createSelectionBetween(selectionOrigin, newRow)
-+        this.props.onSelectionChanged(newSelection, { kind: 'keyboard', event })
-+      }
-+
-+      if (
-+        this.props.selectionMode === 'range' &&
-+        this.props.onSelectedRangeChanged
-+      ) {
-+        this.props.onSelectedRangeChanged(selectionOrigin, newRow, {
-+          kind: 'keyboard',
-+          event,
-+        })
-+      }
-+
-+      this.scrollRowToVisible(newRow)
-+    }
-   }
-
-   private moveSelection(
--    direction: 'up' | 'down',
-+    direction: SelectionDirection,
-     event: React.KeyboardEvent<any>
-   ) {
--    const newRow = this.nextSelectableRow(direction, this.props.selectedRow)
-+    const lastSelection =
-+      this.props.selectedRows.length > 0
-+        ? this.props.selectedRows[this.props.selectedRows.length - 1]
-+        : -1
-+
-+    const newRow = findNextSelectableRow(
-+      this.props.rowCount,
-+      { direction, row: lastSelection },
-+      this.canSelectRow
-+    )
-
-     if (newRow != null) {
-       if (this.props.onSelectionChanged) {
--        this.props.onSelectionChanged(newRow, { kind: 'keyboard', event })
-+        this.props.onSelectionChanged([newRow], { kind: 'keyboard', event })
-+      }
-+
-+      if (this.props.onSelectedRowChanged) {
-+        this.props.onSelectedRowChanged(newRow, {
-+          kind: 'keyboard',
-+          event,
-+        })
-       }
-
-       this.scrollRowToVisible(newRow)
-@@ -407,8 +551,11 @@
-         this.state.height !== prevState.height
-
-       if (!gridHasUpdatedAlready) {
--        const selectedRowChanged =
--          prevProps.selectedRow !== this.props.selectedRow
-+        const selectedRowChanged = !arrayEquals(
-+          prevProps.selectedRows,
-+          this.props.selectedRows
-+        )
-+
-         const invalidationPropsChanged = !shallowEquals(
-           prevProps.invalidationProps,
-           this.props.invalidationProps
-@@ -452,13 +599,13 @@
-   private renderRow = (params: IRowRendererParams) => {
-     const rowIndex = params.rowIndex
-     const selectable = this.canSelectRow(rowIndex)
--    const selected = rowIndex === this.props.selectedRow
-+    const selected = this.props.selectedRows.indexOf(rowIndex) !== -1
-     const focused = rowIndex === this.focusRow
-
-     // An unselectable row shouldn't be focusable
-     let tabIndex: number | undefined = undefined
-     if (selectable) {
--      tabIndex = selected ? 0 : -1
-+      tabIndex = selected && this.props.selectedRows[0] === rowIndex ? 0 : -1
-     }
-
-     // We only need to keep a reference to the focused element
-@@ -509,9 +656,12 @@
-       )
-     }
-
-+    // we select the last item from the selection array for this prop
-     const activeDescendant =
--      this.props.selectedRow !== -1 && this.state.rowIdPrefix
--        ? `${this.state.rowIdPrefix}-${this.props.selectedRow}`
-+      this.props.selectedRows.length && this.state.rowIdPrefix
-+        ? `${this.state.rowIdPrefix}-${
-+            this.props.selectedRows[this.props.selectedRows.length - 1]
-+          }`
-         : undefined
-
-     const role = this.props.ariaMode === 'menu' ? 'menu' : 'listbox'
-@@ -534,13 +684,18 @@
-    * Renders the react-virtualized Grid component and optionally
-    * a fake scroll bar component if running on Windows.
-    *
--   * @param {width} - The width of the Grid as given by AutoSizer
--   * @param {height} - The height of the Grid as given by AutoSizer
-+   * @param width - The width of the Grid as given by AutoSizer
-+   * @param height - The height of the Grid as given by AutoSizer
-    *
-    */
-   private renderContents(width: number, height: number) {
-     if (__WIN32__) {
--      return [this.renderGrid(width, height), this.renderFakeScroll(height)]
-+      return (
-+        <>
-+          {this.renderGrid(width, height)}
-+          {this.renderFakeScroll(height)}
-+        </>
-+      )
-     }
-
-     return this.renderGrid(width, height)
-@@ -557,8 +712,8 @@
-   /**
-    * Renders the react-virtualized Grid component
-    *
--   * @param {width} - The width of the Grid as given by AutoSizer
--   * @param {height} - The height of the Grid as given by AutoSizer
-+   * @param width - The width of the Grid as given by AutoSizer
-+   * @param height - The height of the Grid as given by AutoSizer
-    */
-   private renderGrid(width: number, height: number) {
-     let scrollToRow = this.props.scrollToRow
-@@ -572,28 +727,32 @@
-     // the list itself needs to be focusable so that you can reach
-     // it with keyboard navigation and select an item.
-     const tabIndex =
--      this.props.selectedRow < 0 && this.props.rowCount > 0 ? 0 : -1
-+      this.props.selectedRows.length < 1 && this.props.rowCount > 0 ? 0 : -1
-
-     return (
--      <Grid
--        aria-label={''}
--        key="grid"
--        role={''}
--        ref={this.onGridRef}
--        autoContainerWidth={true}
--        width={width}
--        height={height}
--        columnWidth={width}
--        columnCount={1}
--        rowCount={this.props.rowCount}
--        rowHeight={this.props.rowHeight}
--        cellRenderer={this.renderRow}
--        onScroll={this.onScroll}
--        scrollToRow={scrollToRow}
--        overscanRowCount={4}
--        style={this.gridStyle}
--        tabIndex={tabIndex}
--      />
-+      <FocusContainer
-+        className="list-focus-container"
-+        onKeyDown={this.onKeyDown}
-+      >
-+        <Grid
-+          aria-label={''}
-+          role={''}
-+          ref={this.onGridRef}
-+          autoContainerWidth={true}
-+          width={width}
-+          height={height}
-+          columnWidth={width}
-+          columnCount={1}
-+          rowCount={this.props.rowCount}
-+          rowHeight={this.props.rowHeight}
-+          cellRenderer={this.renderRow}
-+          onScroll={this.onScroll}
-+          scrollToRow={scrollToRow}
-+          overscanRowCount={4}
-+          style={this.gridStyle}
-+          tabIndex={tabIndex}
-+        />
-+      </FocusContainer>
-     )
-   }
-
-@@ -608,7 +767,7 @@
-    * be coupled with styling that hides scroll bars on Grid
-    * and accurately positions the fake scroll bar.
-    *
--   * @param {height} - The height of the Grid as given by AutoSizer
-+   * @param height The height of the Grid as given by AutoSizer
-    *
-    */
-   private renderFakeScroll(height: number) {
-@@ -624,7 +783,6 @@
-
-     return (
-       <div
--        key="fake-scroll"
-         className="fake-scroll"
-         ref={this.onFakeScrollRef}
-         style={{ height }}
-@@ -652,7 +810,7 @@
-
-     if (this.grid) {
-       const element = ReactDOM.findDOMNode(this.grid)
--      if (element) {
-+      if (element instanceof Element) {
-         element.scrollTop = e.currentTarget.scrollTop
-       }
-     }
-@@ -664,8 +822,90 @@
-         this.props.onRowMouseDown(row, event)
-       }
-
--      if (row !== this.props.selectedRow && this.props.onSelectionChanged) {
--        this.props.onSelectionChanged(row, { kind: 'mouseclick', event })
-+      // macOS allow emulating a right click by holding down the ctrl key while
-+      // performing a "normal" click.
-+      const isRightClick =
-+        event.button === 2 ||
-+        (__DARWIN__ && event.button === 0 && event.ctrlKey)
-+
-+      // prevent the right-click event from changing the selection if not necessary
-+      if (isRightClick && this.props.selectedRows.includes(row)) {
-+        return
-+      }
-+
-+      const multiSelectKey = __DARWIN__ ? event.metaKey : event.ctrlKey
-+
-+      if (
-+        event.shiftKey &&
-+        this.props.selectedRows.length &&
-+        this.props.selectionMode &&
-+        this.props.selectionMode !== 'single'
-+      ) {
-+        /*
-+         * if [shift] is pressed and selectionMode is different than 'single',
-+         * select all in-between first selection and current row
-+         */
-+        const selectionOrigin = this.props.selectedRows[0]
-+
-+        if (this.props.onSelectionChanged) {
-+          const newSelection = createSelectionBetween(selectionOrigin, row)
-+          this.props.onSelectionChanged(newSelection, {
-+            kind: 'mouseclick',
-+            event,
-+          })
-+        }
-+        if (
-+          this.props.selectionMode === 'range' &&
-+          this.props.onSelectedRangeChanged
-+        ) {
-+          this.props.onSelectedRangeChanged(selectionOrigin, row, {
-+            kind: 'mouseclick',
-+            event,
-+          })
-+        }
-+      } else if (multiSelectKey && this.props.selectionMode === 'multi') {
-+        /*
-+         * if [ctrl] is pressed and selectionMode is 'multi',
-+         * toggle selection of the targeted row
-+         */
-+        if (this.props.onSelectionChanged) {
-+          let newSelection: ReadonlyArray<number>
-+          if (this.props.selectedRows.includes(row)) {
-+            // remove the ability to deselect the last item
-+            if (this.props.selectedRows.length === 1) {
-+              return
-+            }
-+            newSelection = this.props.selectedRows.filter(ix => ix !== row)
-+          } else {
-+            newSelection = [...this.props.selectedRows, row]
-+          }
-+
-+          this.props.onSelectionChanged(newSelection, {
-+            kind: 'mouseclick',
-+            event,
-+          })
-+        }
-+      } else if (
-+        this.props.selectedRows.length !== 1 ||
-+        (this.props.selectedRows.length === 1 &&
-+          row !== this.props.selectedRows[0])
-+      ) {
-+        /*
-+         * if no special key is pressed, and that the selection is different,
-+         * single selection occurs
-+         */
-+        if (this.props.onSelectionChanged) {
-+          this.props.onSelectionChanged([row], { kind: 'mouseclick', event })
-+        }
-+        if (this.props.onSelectedRangeChanged) {
-+          this.props.onSelectedRangeChanged(row, row, {
-+            kind: 'mouseclick',
-+            event,
-+          })
-+        }
-+        if (this.props.onSelectedRowChanged) {
-+          this.props.onSelectedRowChanged(row, { kind: 'mouseclick', event })
-+        }
-       }
-     }
-   }
-@@ -717,10 +957,13 @@
-    */
-   public focus() {
-     if (
--      this.props.selectedRow >= 0 &&
--      this.props.selectedRow < this.props.rowCount
-+      this.props.selectedRows.length > 0 &&
-+      this.props.selectedRows[this.props.selectedRows.length - 1] <
-+        this.props.rowCount
-     ) {
--      this.scrollRowToVisible(this.props.selectedRow)
-+      this.scrollRowToVisible(
-+        this.props.selectedRows[this.props.selectedRows.length - 1]
-+      )
-     } else {
-       if (this.grid) {
-         const element = ReactDOM.findDOMNode(this.grid) as HTMLDivElement
-added in remote
-  their  100644 e508ad7bd721169b3f96558a76f7e5a32bcf8a71 app/src/ui/lib/list/selection.ts
-@@ -0,0 +1,142 @@
-+import * as React from 'react'
-+
-+export type SelectionDirection = 'up' | 'down'
-+
-+interface ISelectRowAction {
-+  /**
-+   * The vertical direction use when searching for a selectable row.
-+   */
-+  readonly direction: SelectionDirection
-+
-+  /**
-+   * The starting row index to search from.
-+   */
-+  readonly row: number
-+
-+  /**
-+   * A flag to indicate or not to look beyond the last or first
-+   * row (depending on direction) such that given the last row and
-+   * a downward direction will consider the first row as a
-+   * candidate or given the first row and an upward direction
-+   * will consider the last row as a candidate.
-+   *
-+   * Defaults to true if not set.
-+   */
-+  readonly wrap?: boolean
-+}
-+
-+/**
-+ * Interface describing a user initiated selection change event
-+ * originating from a pointer device clicking or pressing on an item.
-+ */
-+export interface IMouseClickSource {
-+  readonly kind: 'mouseclick'
-+  readonly event: React.MouseEvent<any>
-+}
-+
-+/**
-+ * Interface describing a user initiated selection change event
-+ * originating from a pointer device hovering over an item.
-+ * Only applicable when selectedOnHover is set.
-+ */
-+export interface IHoverSource {
-+  readonly kind: 'hover'
-+  readonly event: React.MouseEvent<any>
-+}
-+
-+/**
-+ * Interface describing a user initiated selection change event
-+ * originating from a keyboard
-+ */
-+export interface IKeyboardSource {
-+  readonly kind: 'keyboard'
-+  readonly event: React.KeyboardEvent<any>
-+}
-+
-+/**
-+ * Interface describing a user initiated selection of all list
-+ * items (usually by clicking the Edit > Select all menu item in
-+ * the application window). This is highly specific to GitHub Desktop
-+ */
-+export interface ISelectAllSource {
-+  readonly kind: 'select-all'
-+}
-+
-+/** A type union of possible sources of a selection changed event */
-+export type SelectionSource =
-+  | IMouseClickSource
-+  | IHoverSource
-+  | IKeyboardSource
-+  | ISelectAllSource
-+
-+/**
-+ * Determine the next selectable row, given the direction and a starting
-+ * row index. Whether a row is selectable or not is determined using
-+ * the `canSelectRow` function, which defaults to true if not provided.
-+ *
-+ * Returns null if no row can be selected or if the only selectable row is
-+ * identical to the given row parameter.
-+ */
-+export function findNextSelectableRow(
-+  rowCount: number,
-+  action: ISelectRowAction,
-+  canSelectRow: (row: number) => boolean = row => true
-+): number | null {
-+  if (rowCount === 0) {
-+    return null
-+  }
-+
-+  const { direction, row } = action
-+  const wrap = action.wrap === undefined ? true : action.wrap
-+
-+  // Ensure the row value is in the range between 0 and rowCount - 1
-+  //
-+  // If the row falls outside this range, use the direction
-+  // given to choose a suitable value:
-+  //
-+  //  - move in an upward direction -> select last row
-+  //  - move in a downward direction -> select first row
-+  //
-+  let currentRow =
-+    row < 0 || row >= rowCount ? (direction === 'up' ? rowCount - 1 : 0) : row
-+
-+  // handle specific case from switching from filter text to list
-+  //
-+  // locking currentRow to [0,rowCount) above means that the below loops
-+  // will skip over the first entry
-+  if (direction === 'down' && row === -1) {
-+    currentRow = -1
-+  }
-+
-+  const delta = direction === 'up' ? -1 : 1
-+
-+  // Iterate through all rows (starting offset from the
-+  // given row and ending on and including the given row)
-+  for (let i = 0; i < rowCount; i++) {
-+    currentRow += delta
-+
-+    if (currentRow >= rowCount) {
-+      // We've hit rock bottom, wrap around to the top
-+      // if we're allowed to or give up.
-+      if (wrap) {
-+        currentRow = 0
-+      } else {
-+        break
-+      }
-+    } else if (currentRow < 0) {
-+      // We've reached the top, wrap around to the bottom
-+      // if we're allowed to or give up
-+      if (wrap) {
-+        currentRow = rowCount - 1
-+      } else {
-+        break
-+      }
-+    }
-+
-+    if (row !== currentRow && canSelectRow(currentRow)) {
-+      return currentRow
-+    }
-+  }
-+
-+  return null
-+}
-merged
-  result 100644 d99f339f0d967a2ba0f2d644345ead21bc38e5ba app/src/ui/lib/text-box.tsx
-  our    100644 eb0d0735615b2dfce3311a6dae577bdf93ba84cb app/src/ui/lib/text-box.tsx
-@@ -4,7 +4,7 @@
- import { LinkButton } from './link-button'
- import { showContextualMenu } from '../main-process-proxy'
-
--interface ITextBoxProps {
-+export interface ITextBoxProps {
-   /** The label for the input field. */
-   readonly label?: string | JSX.Element
-
-@@ -74,6 +74,21 @@
-
-   /** The tab index of the input element. */
-   readonly tabIndex?: number
-+
-+  /**
-+   * Callback used when the component is focused.
-+   */
-+  readonly onFocus?: () => void
-+
-+  /**
-+   * Callback used when the component loses focus.
-+   */
-+  readonly onBlur?: () => void
-+
-+  /**
-+   * Callback used when the user has cleared the search text.
-+   */
-+  readonly onSearchCleared?: () => void
- }
-
- interface ITextBoxState {
-@@ -128,11 +143,18 @@
-    * (i.e. if it's not disabled explicitly or implicitly through for example a fieldset).
-    */
-   public focus() {
--    if (this.inputElement === null) {
--      return
-+    if (this.inputElement !== null) {
-+      this.inputElement.focus()
-     }
-+  }
-
--    this.inputElement.focus()
-+  /**
-+   * Programmatically removes keyboard focus from the inner text input element
-+   */
-+  public blur() {
-+    if (this.inputElement !== null) {
-+      this.inputElement.blur()
-+    }
-   }
-
-   private onChange = (event: React.FormEvent<HTMLInputElement>) => {
-@@ -145,8 +167,33 @@
-     })
-   }
-
-+  private onSearchTextCleared = () => {
-+    if (this.props.onSearchCleared != null) {
-+      this.props.onSearchCleared()
-+    }
-+  }
-+
-+  /**
-+   * The search event here is a Chrome and Safari specific event that is
-+   * only reported for input[type=search] elements.
-+   *
-+   * Source: http://help.dottoro.com/ljdvxmhr.php
-+   *
-+   * TODO: can we hook into the warning API of React to report on incorrect usage
-+   * when you set a `onSearchCleared` callback prop but don't use a `type=search`
-+   * input - because this won't set an event handler.
-+   *
-+   */
-   private onInputRef = (element: HTMLInputElement | null) => {
-+    if (this.inputElement != null && this.props.type === 'search') {
-+      this.inputElement.removeEventListener('search', this.onSearchTextCleared)
-+    }
-+
-     this.inputElement = element
-+
-+    if (this.inputElement != null && this.props.type === 'search') {
-+      this.inputElement.addEventListener('search', this.onSearchTextCleared)
-+    }
-   }
-
-   private renderLabelLink() {
-@@ -184,8 +231,10 @@
-   }
-
-   private onKeyDown = (event: React.KeyboardEvent<HTMLInputElement>) => {
-+    const value = this.state.value
-+
-     if (
--      this.state.value !== '' &&
-+      value !== '' &&
-       this.props.type === 'search' &&
-       event.key === 'Escape'
-     ) {
-@@ -197,6 +246,17 @@
-       if (this.props.onValueChanged) {
-         this.props.onValueChanged(value)
-       }
-+    } else if (
-+      this.props.type === 'search' &&
-+      event.key === 'Escape' &&
-+      value === ''
-+    ) {
-+      if (this.props.onBlur) {
-+        this.props.onBlur()
-+        if (this.inputElement !== null) {
-+          this.inputElement.blur()
-+        }
-+      }
-     }
-
-     if (this.props.onKeyDown !== undefined) {
-@@ -215,6 +275,8 @@
-         <input
-           id={inputId}
-           ref={this.onInputRef}
-+          onFocus={this.onFocus}
-+          onBlur={this.onBlur}
-           autoFocus={this.props.autoFocus}
-           disabled={this.props.disabled}
-           type={this.props.type}
-@@ -228,4 +290,16 @@
-       </div>
-     )
-   }
-+
-+  private onFocus = (event: React.FocusEvent<HTMLInputElement>) => {
-+    if (!this.props.autoFocus && this.props.onFocus !== undefined) {
-+      this.props.onFocus()
-+    }
-+  }
-+
-+  private onBlur = (event: React.FocusEvent<HTMLInputElement>) => {
-+    if (this.props.onBlur !== undefined) {
-+      this.props.onBlur()
-+    }
-+  }
- }
-merged
-  result 100644 eb960cbb3550362276de8faca04b1ee76ceeeb7d app/src/ui/lib/throttled-scheduler.ts
-  our    100644 51483eacd05ac47e8e0f0294f02716133e190a78 app/src/ui/lib/throttled-scheduler.ts
-@@ -6,7 +6,7 @@
-   /**
-    * Initialize a new instance of the ThrottledScheduler class
-    *
--   * @param {delay} - The minimum interval between invocations
-+   * @param delay The minimum interval between invocations
-    *                  of callbacks.
-    */
-   public constructor(delay: number) {
-merged
-  result 100644 6a7e6976257ec16e58a7331db61b40096a9bde08 app/src/ui/merge-branch/merge.tsx
-  our    100644 ccf9cd14a0406216b970ab0f7e5a98bec880171d app/src/ui/merge-branch/merge.tsx
-@@ -1,12 +1,18 @@
- import * as React from 'react'
--import { Button } from '../lib/button'
-+
-+import { getAheadBehind } from '../../lib/git'
- import { Dispatcher } from '../../lib/dispatcher'
-+
- import { Branch } from '../../models/branch'
- import { Repository } from '../../models/repository'
--import { getAheadBehind } from '../../lib/git'
-+
-+import { Button } from '../lib/button'
- import { ButtonGroup } from '../lib/button-group'
-+
- import { Dialog, DialogContent, DialogFooter } from '../dialog'
--import { BranchList } from '../branches'
-+import { BranchList, IBranchListItem, renderDefaultBranch } from '../branches'
-+import { revSymmetricDifference } from '../../lib/git'
-+import { IMatches } from '../../lib/fuzzy-find'
-
- interface IMergeProps {
-   readonly dispatcher: Dispatcher
-@@ -33,6 +39,11 @@
-   readonly recentBranches: ReadonlyArray<Branch>
-
-   /**
-+   * The branch to select when the merge dialog is opened
-+   */
-+  readonly initialBranch?: Branch
-+
-+  /**
-    * A function that's called when the dialog is dismissed by the user in the
-    * ways described in the Dialog component's dismissable prop.
-    */
-@@ -59,12 +70,10 @@
-   public constructor(props: IMergeProps) {
-     super(props)
-
--    const currentBranch = props.currentBranch
--    const defaultBranch = props.defaultBranch
-+    const selectedBranch = this.resolveSelectedBranch()
-
-     this.state = {
--      // Select the default branch unless that's currently checked out
--      selectedBranch: currentBranch === defaultBranch ? null : defaultBranch,
-+      selectedBranch,
-       commitCount: undefined,
-       filterText: '',
-     }
-@@ -128,6 +137,10 @@
-     )
-   }
-
-+  private renderBranch = (item: IBranchListItem, matches: IMatches) => {
-+    return renderDefaultBranch(item, matches, this.props.currentBranch)
-+  }
-+
-   public render() {
-     const selectedBranch = this.state.selectedBranch
-     const currentBranch = this.props.currentBranch
-@@ -156,6 +169,7 @@
-             selectedBranch={selectedBranch}
-             onSelectionChanged={this.onSelectionChanged}
-             canCreateNewBranch={false}
-+            renderBranch={this.renderBranch}
-           />
-         </DialogContent>
-         <DialogFooter>
-@@ -172,7 +186,7 @@
-   }
-
-   private async updateCommitCount(branch: Branch) {
--    const range = `...${branch.name}`
-+    const range = revSymmetricDifference('', branch.name)
-     const aheadBehind = await getAheadBehind(this.props.repository, range)
-     const commitCount = aheadBehind ? aheadBehind.behind : 0
-
-@@ -193,4 +207,21 @@
-     this.props.dispatcher.mergeBranch(this.props.repository, branch.name)
-     this.props.dispatcher.closePopup()
-   }
-+
-+  /**
-+   * Returns the branch to use as the selected branch
-+   *
-+   * The initial branch is used if passed
-+   * otherwise, the default branch will be used iff it's
-+   * not the currently checked out branch
-+   */
-+  private resolveSelectedBranch() {
-+    const { currentBranch, defaultBranch, initialBranch } = this.props
-+
-+    if (initialBranch !== undefined) {
-+      return initialBranch
-+    }
-+
-+    return currentBranch === defaultBranch ? null : defaultBranch
-+  }
- }
-added in remote
-  their  100644 994e1b5f87e28b721ae596a604deb0ff02f5e377 app/src/ui/merge-conflicts/index.ts
-@@ -0,0 +1 @@
-+export * from './merge-conflicts-warning'
-added in remote
-  their  100644 866251dcc5479cdce56345e42689d894ad96e243 app/src/ui/merge-conflicts/merge-conflicts-warning.tsx
-@@ -0,0 +1,54 @@
-+import * as React from 'react'
-+import { Button } from '../lib/button'
-+import { ButtonGroup } from '../lib/button-group'
-+import { Dialog, DialogContent, DialogFooter } from '../dialog'
-+import { Dispatcher } from '../../lib/dispatcher'
-+import { RepositorySectionTab } from '../../lib/app-state'
-+import { Repository } from '../../models/repository'
-+
-+interface IMergeConflictsWarningProps {
-+  readonly dispatcher: Dispatcher
-+  readonly repository: Repository
-+  readonly onDismissed: () => void
-+}
-+
-+export class MergeConflictsWarning extends React.Component<
-+  IMergeConflictsWarningProps,
-+  {}
-+> {
-+  private onSubmit = () => {
-+    this.props.dispatcher.changeRepositorySection(
-+      this.props.repository,
-+      RepositorySectionTab.Changes
-+    )
-+    this.props.onDismissed()
-+  }
-+
-+  public render() {
-+    return (
-+      <Dialog
-+        id="merge-conflicts-warning"
-+        title={__DARWIN__ ? 'Merge Conflicts Found' : 'Merge conflicts found'}
-+        onDismissed={this.props.onDismissed}
-+        onSubmit={this.onSubmit}
-+      >
-+        <DialogContent>
-+          <p>Conflicts were detected as part of the last merge operation.</p>
-+          <p>
-+            You will need to view and resolve these conflicts via your editor or
-+            shell before finishing and creating the merge commit.
-+          </p>
-+        </DialogContent>
-+
-+        <DialogFooter>
-+          <ButtonGroup>
-+            <Button type="submit">
-+              {__DARWIN__ ? 'View Conflicts' : 'View conflicts'}
-+            </Button>
-+            <Button onClick={this.props.onDismissed}>Close</Button>
-+          </ButtonGroup>
-+        </DialogFooter>
-+      </Dialog>
-+    )
-+  }
-+}
-added in remote
-  their  100644 292e9594562025347221742f225faa4c5188009d app/src/ui/notification/new-commits-banner.tsx
-@@ -0,0 +1,119 @@
-+import * as React from 'react'
-+import { Ref } from '../lib/ref'
-+import { Octicon, OcticonSymbol } from '../octicons'
-+import { Branch } from '../../models/branch'
-+import { Button } from '../lib/button'
-+import { Dispatcher } from '../../lib/dispatcher'
-+import { Repository } from '../../models/repository'
-+import {
-+  CompareActionKind,
-+  ComparisonView,
-+  PopupType,
-+} from '../../lib/app-state'
-+
-+export type DismissalReason = 'close' | 'compare' | 'merge'
-+
-+interface INewCommitsBannerProps {
-+  readonly dispatcher: Dispatcher
-+
-+  readonly repository: Repository
-+
-+  /**
-+   * The number of commits behind base branch
-+   */
-+  readonly commitsBehindBaseBranch: number
-+
-+  /**
-+   * The target branch that will accept commits
-+   * from the current branch
-+   */
-+  readonly baseBranch: Branch
-+
-+  /**
-+   * Callback used to dismiss the banner
-+   */
-+  readonly onDismiss: (reason: DismissalReason) => void
-+}
-+
-+/**
-+ * Banner used to notify user that their branch is a number of commits behind the base branch
-+ */
-+export class NewCommitsBanner extends React.Component<
-+  INewCommitsBannerProps,
-+  {}
-+> {
-+  public render() {
-+    const pluralize = this.props.commitsBehindBaseBranch > 1
-+
-+    return (
-+      <div className="notification-banner diverge-banner">
-+        <Octicon
-+          symbol={OcticonSymbol.lightBulb}
-+          className="notification-icon"
-+        />
-+
-+        <div className="notification-banner-content">
-+          <div className="notification-banner-content-body">
-+            <p>
-+              We have noticed that your branch is{' '}
-+              <strong>
-+                {this.props.commitsBehindBaseBranch} commit{pluralize
-+                  ? 's'
-+                  : ''}
-+              </strong>{' '}
-+              behind <Ref>{this.props.baseBranch.name}</Ref>.
-+            </p>
-+          </div>
-+          <div>
-+            <Button className="small-button" onClick={this.onComparedClicked}>
-+              View commits
-+            </Button>
-+            <Button
-+              className="small-button"
-+              type="submit"
-+              onClick={this.onMergeClicked}
-+            >
-+              Merge...
-+            </Button>
-+          </div>
-+        </div>
-+
-+        <a
-+          className="close"
-+          aria-label="Dismiss banner"
-+          onClick={this.onDismissed}
-+        >
-+          <Octicon symbol={OcticonSymbol.x} />
-+        </a>
-+      </div>
-+    )
-+  }
-+
-+  private onDismissed = () => {
-+    this.props.onDismiss('close')
-+  }
-+
-+  private onComparedClicked = () => {
-+    const { repository, dispatcher } = this.props
-+
-+    dispatcher.executeCompare(repository, {
-+      kind: CompareActionKind.Branch,
-+      branch: this.props.baseBranch,
-+      mode: ComparisonView.Behind,
-+    })
-+    dispatcher.recordDivergingBranchBannerInitiatedCompare()
-+    this.props.onDismiss('compare')
-+  }
-+
-+  private onMergeClicked = () => {
-+    const { repository, dispatcher } = this.props
-+
-+    dispatcher.showPopup({
-+      type: PopupType.MergeBranch,
-+      branch: this.props.baseBranch,
-+      repository,
-+    })
-+    dispatcher.recordDivergingBranchBannerInitatedMerge()
-+    this.props.onDismiss('merge')
-+  }
-+}
-added in remote
-  their  100644 461f079df545b3f64329fb9b73d8484c1ad0792d app/src/ui/preferences/appearance.tsx
-@@ -0,0 +1,49 @@
-+import * as React from 'react'
-+import { DialogContent } from '../dialog'
-+import {
-+  VerticalSegmentedControl,
-+  ISegmentedItem,
-+} from '../lib/vertical-segmented-control'
-+import { ApplicationTheme } from '../lib/application-theme'
-+import { fatalError } from '../../lib/fatal-error'
-+
-+interface IAppearanceProps {
-+  readonly selectedTheme: ApplicationTheme
-+  readonly onSelectedThemeChanged: (theme: ApplicationTheme) => void
-+}
-+
-+const themes: ReadonlyArray<ISegmentedItem> = [
-+  { title: 'Light', description: 'The default theme of GitHub Desktop' },
-+  {
-+    title: 'Dark (beta)',
-+    description:
-+      'A beta version of our dark theme. Still under development. Please report any issues you may find to our issue tracker.',
-+  },
-+]
-+
-+export class Appearance extends React.Component<IAppearanceProps, {}> {
-+  private onSelectedThemeChanged = (index: number) => {
-+    if (index === 0) {
-+      this.props.onSelectedThemeChanged(ApplicationTheme.Light)
-+    } else if (index === 1) {
-+      this.props.onSelectedThemeChanged(ApplicationTheme.Dark)
-+    } else {
-+      fatalError(`Unknown theme index ${index}`)
-+    }
-+  }
-+
-+  public render() {
-+    const selectedIndex =
-+      this.props.selectedTheme === ApplicationTheme.Dark ? 1 : 0
-+
-+    return (
-+      <DialogContent>
-+        <VerticalSegmentedControl
-+          items={themes}
-+          selectedIndex={selectedIndex}
-+          onSelectionChanged={this.onSelectedThemeChanged}
-+        />
-+      </DialogContent>
-+    )
-+  }
-+}
-merged
-  result 100644 95db24f350ede1c020f0629457aa6ff90b2b6d90 app/src/ui/preferences/preferences.tsx
-  our    100644 e26aab501de9210761f4d41ed2f05f1f7c516da8 app/src/ui/preferences/preferences.tsx
-@@ -21,6 +21,8 @@
- import { Shell, getAvailableShells } from '../../lib/shells'
- import { getAvailableEditors } from '../../lib/editors/lookup'
- import { disallowedCharacters } from './identifier-rules'
-+import { Appearance } from './appearance'
-+import { ApplicationTheme } from '../lib/application-theme'
-
- interface IPreferencesProps {
-   readonly dispatcher: Dispatcher
-@@ -33,6 +35,7 @@
-   readonly confirmDiscardChanges: boolean
-   readonly selectedExternalEditor?: ExternalEditor
-   readonly selectedShell: Shell
-+  readonly selectedTheme: ApplicationTheme
- }
-
- interface IPreferencesState {
-@@ -134,6 +137,7 @@
-         >
-           <span>Accounts</span>
-           <span>Git</span>
-+          <span>Appearance</span>
-           <span>Advanced</span>
-         </TabBar>
-
-@@ -203,6 +207,13 @@
-           />
-         )
-       }
-+      case PreferencesTab.Appearance:
-+        return (
-+          <Appearance
-+            selectedTheme={this.props.selectedTheme}
-+            onSelectedThemeChanged={this.onSelectedThemeChanged}
-+          />
-+        )
-       case PreferencesTab.Advanced: {
-         return (
-           <Advanced
-@@ -269,12 +280,17 @@
-     this.setState({ selectedShell: shell })
-   }
-
-+  private onSelectedThemeChanged = (theme: ApplicationTheme) => {
-+    this.props.dispatcher.setSelectedTheme(theme)
-+  }
-+
-   private renderFooter() {
-     const hasDisabledError = this.state.disallowedCharactersMessage != null
-
-     const index = this.state.selectedIndex
-     switch (index) {
-       case PreferencesTab.Accounts:
-+      case PreferencesTab.Appearance:
-         return null
-       case PreferencesTab.Advanced:
-       case PreferencesTab.Git: {
-merged
-  result 100644 ffbdef89f9f0f16e966a7d27c2db06bd897c3db6 app/src/ui/publish-repository/publish.tsx
-  our    100644 dbb16e8d0667b3c7f6a9514dda9d6ec8354fe75d app/src/ui/publish-repository/publish.tsx
-@@ -13,7 +13,7 @@
- import { getDotComAPIEndpoint } from '../../lib/api'
- import { assertNever, fatalError } from '../../lib/fatal-error'
- import { CallToAction } from '../lib/call-to-action'
--import { getGitDescription } from '../../lib/git/description'
-+import { getGitDescription } from '../../lib/git'
-
- enum PublishTab {
-   DotCom = 0,
-merged
-  result 100644 036558085db62e6798f39f0d0f7fdd38b7fca5f1 app/src/ui/rename-branch/rename-branch-dialog.tsx
-  our    100644 30deb34b0cdc3ac313cbdde5418abcc33bb4a22c app/src/ui/rename-branch/rename-branch-dialog.tsx
-@@ -9,7 +9,10 @@
- import { Button } from '../lib/button'
- import { ButtonGroup } from '../lib/button-group'
- import { Dialog, DialogContent, DialogFooter } from '../dialog'
--import { renderBranchNameWarning } from '../lib/branch-name-warnings'
-+import {
-+  renderBranchNameWarning,
-+  renderBranchHasRemoteWarning,
-+} from '../lib/branch-name-warnings'
-
- interface IRenameBranchProps {
-   readonly dispatcher: Dispatcher
-@@ -54,6 +57,7 @@
-             this.state.newName,
-             sanitizedBranchName(this.state.newName)
-           )}
-+          {renderBranchHasRemoteWarning(this.props.branch)}
-         </DialogContent>
-
-         <DialogFooter>
-merged
-  result 100644 9e6e38681ef352ce76fa65fea817492a6aef088f app/src/ui/repositories-list/group-repositories.ts
-  our    100644 18baeebd67753abfd4d4547921f30c8bef878511 app/src/ui/repositories-list/group-repositories.ts
-@@ -1,22 +1,31 @@
--import { Repository } from '../../models/repository'
-+import { Repository, ILocalRepositoryState } from '../../models/repository'
- import { CloningRepository } from '../../models/cloning-repository'
- import { getDotComAPIEndpoint } from '../../lib/api'
- import { caseInsensitiveCompare } from '../../lib/compare'
- import { IFilterListGroup, IFilterListItem } from '../lib/filter-list'
-+import { IAheadBehind } from '../../models/branch'
-
- export type RepositoryGroupIdentifier = 'github' | 'enterprise' | 'other'
-
- export type Repositoryish = Repository | CloningRepository
-
- export interface IRepositoryListItem extends IFilterListItem {
--  readonly text: string
-+  readonly text: ReadonlyArray<string>
-   readonly id: string
-   readonly repository: Repositoryish
-   readonly needsDisambiguation: boolean
-+  readonly aheadBehind: IAheadBehind | null
-+  readonly changedFilesCount: number
-+}
-+
-+const fallbackValue = {
-+  changedFilesCount: 0,
-+  aheadBehind: null,
- }
-
- export function groupRepositories(
--  repositories: ReadonlyArray<Repositoryish>
-+  repositories: ReadonlyArray<Repositoryish>,
-+  localRepositoryStateLookup: Map<number, ILocalRepositoryState>
- ): ReadonlyArray<IFilterListGroup<IRepositoryListItem>> {
-   const grouped = new Map<RepositoryGroupIdentifier, Repositoryish[]>()
-   for (const repository of repositories) {
-@@ -59,11 +68,15 @@
-     repositories.sort((x, y) => caseInsensitiveCompare(x.name, y.name))
-     const items: ReadonlyArray<IRepositoryListItem> = repositories.map(r => {
-       const nameCount = names.get(r.name) || 0
-+      const { aheadBehind, changedFilesCount } =
-+        localRepositoryStateLookup.get(r.id) || fallbackValue
-       return {
--        text: r.name,
-+        text: [r.name],
-         id: r.id.toString(),
-         repository: r,
-         needsDisambiguation: nameCount > 1,
-+        aheadBehind,
-+        changedFilesCount,
-       }
-     })
-
-merged
-  result 100644 e4ca588b503842ff6df4517d209f5fc5537d4a11 app/src/ui/repositories-list/repositories-list.tsx
-  our    100644 07ff55df057daaa50bdeec7aaaaafce35d03d1a2 app/src/ui/repositories-list/repositories-list.tsx
-@@ -8,23 +8,25 @@
-   RepositoryGroupIdentifier,
- } from './group-repositories'
- import { FilterList } from '../lib/filter-list'
-+import { IMatches } from '../../lib/fuzzy-find'
- import { assertNever } from '../../lib/fatal-error'
--
--/**
-- * TS can't parse generic specialization in JSX, so we have to alias it here
-- * with the generic type. See https://github.com/Microsoft/TypeScript/issues/6395.
-- */
--const RepositoryFilterList: new () => FilterList<
--  IRepositoryListItem
--> = FilterList as any
-+import { ILocalRepositoryState } from '../../models/repository'
-+import { enableRepoInfoIndicators } from '../../lib/feature-flag'
-+import { Dispatcher } from '../../lib/dispatcher'
-
- interface IRepositoriesListProps {
-   readonly selectedRepository: Repositoryish | null
-   readonly repositories: ReadonlyArray<Repositoryish>
-
-+  /** A cache of the latest repository state values, keyed by the repository id */
-+  readonly localRepositoryStateLookup: Map<number, ILocalRepositoryState>
-+
-   /** Called when a repository has been selected. */
-   readonly onSelectionChanged: (repository: Repositoryish) => void
-
-+  /** Whether the user has enabled the setting to confirm removing a repository from the app */
-+  readonly askForConfirmationOnRemoveRepository: boolean
-+
-   /** Called when the repository should be removed. */
-   readonly onRemoveRepository: (repository: Repositoryish) => void
-
-@@ -48,6 +50,8 @@
-
-   /** The text entered by the user to filter their repository list */
-   readonly filterText: string
-+
-+  readonly dispatcher: Dispatcher
- }
-
- const RowHeight = 29
-@@ -57,16 +61,16 @@
-   IRepositoriesListProps,
-   {}
- > {
--  private renderItem = (
--    item: IRepositoryListItem,
--    matches: ReadonlyArray<number>
--  ) => {
-+  private renderItem = (item: IRepositoryListItem, matches: IMatches) => {
-     const repository = item.repository
-     return (
-       <RepositoryListItem
-         key={repository.id}
-         repository={repository}
-         needsDisambiguation={item.needsDisambiguation}
-+        askForConfirmationOnRemoveRepository={
-+          this.props.askForConfirmationOnRemoveRepository
-+        }
-         onRemoveRepository={this.props.onRemoveRepository}
-         onShowRepository={this.props.onShowRepository}
-         onOpenInShell={this.props.onOpenInShell}
-@@ -74,6 +78,8 @@
-         externalEditorLabel={this.props.externalEditorLabel}
-         shellLabel={this.props.shellLabel}
-         matches={matches}
-+        aheadBehind={item.aheadBehind}
-+        changedFilesCount={item.changedFilesCount}
-       />
-     )
-   }
-@@ -101,6 +107,14 @@
-   }
-
-   private onItemClick = (item: IRepositoryListItem) => {
-+    if (enableRepoInfoIndicators()) {
-+      const hasIndicator =
-+        item.changedFilesCount > 0 ||
-+        (item.aheadBehind !== null
-+          ? item.aheadBehind.ahead > 0 || item.aheadBehind.behind > 0
-+          : false)
-+      this.props.dispatcher.recordRepoClicked(hasIndicator)
-+    }
-     this.props.onSelectionChanged(item.repository)
-   }
-
-@@ -109,7 +123,10 @@
-       return this.noRepositories()
-     }
-
--    const groups = groupRepositories(this.props.repositories)
-+    const groups = groupRepositories(
-+      this.props.repositories,
-+      this.props.localRepositoryStateLookup
-+    )
-
-     let selectedItem: IRepositoryListItem | null = null
-     const selectedRepository = this.props.selectedRepository
-@@ -129,7 +146,7 @@
-
-     return (
-       <div className="repository-list">
--        <RepositoryFilterList
-+        <FilterList<IRepositoryListItem>
-           rowHeight={RowHeight}
-           selectedItem={selectedItem}
-           filterText={this.props.filterText}
-merged
-  result 100644 6ca3c771c795eba242cc4b795e3a3b0bbb4c7488 app/src/ui/repositories-list/repository-list-item.tsx
-  our    100644 8a3459beeeb3be1978c9c1f3a4aefe8f497007fb app/src/ui/repositories-list/repository-list-item.tsx
-@@ -1,10 +1,12 @@
- import * as React from 'react'
- import { Repository } from '../../models/repository'
--import { Octicon, iconForRepository } from '../octicons'
-+import { Octicon, iconForRepository, OcticonSymbol } from '../octicons'
- import { showContextualMenu } from '../main-process-proxy'
- import { Repositoryish } from './group-repositories'
- import { IMenuItem } from '../../lib/menu-item'
- import { HighlightText } from '../lib/highlight-text'
-+import { IMatches } from '../../lib/fuzzy-find'
-+import { IAheadBehind } from '../../models/branch'
-
- const defaultEditorLabel = __DARWIN__
-   ? 'Open in External Editor'
-@@ -13,6 +15,9 @@
- interface IRepositoryListItemProps {
-   readonly repository: Repositoryish
-
-+  /** Whether the user has enabled the setting to confirm removing a repository from the app */
-+  readonly askForConfirmationOnRemoveRepository: boolean
-+
-   /** Called when the repository should be removed. */
-   readonly onRemoveRepository: (repository: Repositoryish) => void
-
-@@ -35,7 +40,13 @@
-   readonly shellLabel: string
-
-   /** The characters in the repository name to highlight */
--  readonly matches: ReadonlyArray<number>
-+  readonly matches: IMatches
-+
-+  /** Number of commits this local repo branch is behind or ahead of its remote brance */
-+  readonly aheadBehind: IAheadBehind | null
-+
-+  /** Number of uncommitted changes */
-+  readonly changedFilesCount: number
- }
-
- /** A repository item. */
-@@ -48,7 +59,37 @@
-     const path = repository.path
-     const gitHubRepo =
-       repository instanceof Repository ? repository.gitHubRepository : null
--    const tooltip = gitHubRepo
-+    const hasChanges = this.props.changedFilesCount > 0
-+    const renderAheadBehindIndicator = () => {
-+      if (
-+        !(repository instanceof Repository) ||
-+        this.props.aheadBehind === null
-+      ) {
-+        return null
-+      }
-+      const { ahead, behind } = this.props.aheadBehind
-+      if (ahead === 0 && behind === 0) {
-+        return null
-+      }
-+      const commitGrammar = (commitNum: number) =>
-+        `${commitNum} commit${commitNum > 1 ? 's' : ''}` // english is hard
-+      const aheadBehindTooltip =
-+        'The currently checked out branch is' +
-+        (behind ? ` ${commitGrammar(behind)} behind ` : '') +
-+        (behind && ahead ? 'and' : '') +
-+        (ahead ? ` ${commitGrammar(ahead)} ahead of ` : '') +
-+        'its tracked branch.'
-+
-+      return (
-+        <div className="ahead-behind" title={aheadBehindTooltip}>
-+          {ahead > 0 ? <Octicon symbol={OcticonSymbol.arrowSmallUp} /> : null}
-+          {behind > 0 ? (
-+            <Octicon symbol={OcticonSymbol.arrowSmallDown} />
-+          ) : null}
-+        </div>
-+      )
-+    }
-+    const repoTooltip = gitHubRepo
-       ? gitHubRepo.fullName + '\n' + gitHubRepo.htmlURL + '\n' + path
-       : path
-
-@@ -58,20 +99,30 @@
-     }
-
-     return (
--      <div
--        onContextMenu={this.onContextMenu}
--        className="repository-list-item"
--        title={tooltip}
--      >
-+      <div onContextMenu={this.onContextMenu} className="repository-list-item">
-+        <div
-+          className="change-indicator-wrapper"
-+          title={
-+            hasChanges ? 'There are uncommitted changes in this repository' : ''
-+          }
-+        >
-+          {hasChanges ? (
-+            <Octicon
-+              className="change-indicator"
-+              symbol={OcticonSymbol.primitiveDot}
-+            />
-+          ) : null}
-+        </div>
-         <Octicon symbol={iconForRepository(repository)} />
--
--        <div className="name">
-+        <div className="name" title={repoTooltip}>
-           {prefix ? <span className="prefix">{prefix}</span> : null}
-           <HighlightText
-             text={repository.name}
--            highlight={this.props.matches}
-+            highlight={this.props.matches.title}
-           />
-         </div>
-+
-+        {renderAheadBehindIndicator()}
-       </div>
-     )
-   }
-@@ -101,7 +152,9 @@
-
-     const showRepositoryLabel = __DARWIN__
-       ? 'Show in Finder'
--      : __WIN32__ ? 'Show in Explorer' : 'Show in your File Manager'
-+      : __WIN32__
-+        ? 'Show in Explorer'
-+        : 'Show in your File Manager'
-
-     const items: ReadonlyArray<IMenuItem> = [
-       {
-@@ -121,7 +174,9 @@
-       },
-       { type: 'separator' },
-       {
--        label: 'Remove',
-+        label: this.props.askForConfirmationOnRemoveRepository
-+          ? 'Remove…'
-+          : 'Remove',
-         action: this.removeRepository,
-       },
-     ]
-merged
-  result 100644 e58c21864cb0ef80f8d9edc3a5f278674a560cdd app/src/ui/repository.tsx
-  our    100644 a96947579eba87694e2e84bfba57b1e4814b9ad6 app/src/ui/repository.tsx
-@@ -5,26 +5,30 @@
- import { UiView } from './ui-view'
- import { Changes, ChangesSidebar } from './changes'
- import { NoChanges } from './changes/no-changes'
--import { History, HistorySidebar } from './history'
-+import { MultipleSelection } from './changes/multiple-selection'
-+import { FilesChangedBadge } from './changes/files-changed-badge'
-+import { SelectedCommit, CompareSidebar } from './history'
- import { Resizable } from './resizable'
- import { TabBar } from './tab-bar'
- import {
--  IRepositoryState as IRepositoryModelState,
--  RepositorySection,
-+  IRepositoryState,
-+  RepositorySectionTab,
-   ImageDiffType,
- } from '../lib/app-state'
- import { Dispatcher } from '../lib/dispatcher'
- import { IssuesStore, GitHubUserStore } from '../lib/stores'
- import { assertNever } from '../lib/fatal-error'
--import { Octicon, OcticonSymbol } from './octicons'
- import { Account } from '../models/account'
-+import { enableNotificationOfBranchUpdates } from '../lib/feature-flag'
-+import { FocusContainer } from './lib/focus-container'
-+import { OcticonSymbol, Octicon } from './octicons'
-
- /** The widest the sidebar can be with the minimum window size. */
- const MaxSidebarWidth = 495
-
--interface IRepositoryProps {
-+interface IRepositoryViewProps {
-   readonly repository: Repo
--  readonly state: IRepositoryModelState
-+  readonly state: IRepositoryState
-   readonly dispatcher: Dispatcher
-   readonly emoji: Map<string, string>
-   readonly sidebarWidth: number
-@@ -40,10 +44,21 @@
-   readonly externalEditorLabel?: string
-
-   /**
--   * Called to open a file using the user's configured applications
--   * @param path The path of the file relative to the root of the repository
-+   * Callback to open a selected file using the configured external editor
-+   *
-+   * @param fullPath The full path to the file on disk
-    */
--  readonly onOpenInExternalEditor: (path: string) => void
-+  readonly onOpenInExternalEditor: (fullPath: string) => void
-+
-+  /**
-+   * Determines if the notification banner and associated dot
-+   * on this history tab will be rendered
-+   */
-+  readonly isDivergingBranchBannerVisible: boolean
-+}
-+
-+interface IRepositoryViewState {
-+  readonly sidebarHasFocusWithin: boolean
- }
-
- const enum Tab {
-@@ -51,12 +66,32 @@
-   History = 1,
- }
-
--export class RepositoryView extends React.Component<IRepositoryProps, {}> {
-+export class RepositoryView extends React.Component<
-+  IRepositoryViewProps,
-+  IRepositoryViewState
-+> {
-+  public constructor(props: IRepositoryViewProps) {
-+    super(props)
-+
-+    this.state = {
-+      sidebarHasFocusWithin: false,
-+    }
-+  }
-+
-+  private renderChangesBadge(): JSX.Element | null {
-+    const filesChangedCount = this.props.state.changesState.workingDirectory
-+      .files.length
-+
-+    if (filesChangedCount <= 0) {
-+      return null
-+    }
-+
-+    return <FilesChangedBadge filesChangedCount={filesChangedCount} />
-+  }
-+
-   private renderTabs(): JSX.Element {
--    const hasChanges =
--      this.props.state.changesState.workingDirectory.files.length > 0
-     const selectedTab =
--      this.props.state.selectedSection === RepositorySection.Changes
-+      this.props.state.selectedSection === RepositorySectionTab.Changes
-         ? Tab.Changes
-         : Tab.History
-
-@@ -64,14 +99,19 @@
-       <TabBar selectedIndex={selectedTab} onTabClicked={this.onTabClicked}>
-         <span className="with-indicator">
-           <span>Changes</span>
--          {hasChanges ? (
-+          {this.renderChangesBadge()}
-+        </span>
-+
-+        <div className="with-indicator">
-+          <span>History</span>
-+          {enableNotificationOfBranchUpdates() &&
-+          this.props.isDivergingBranchBannerVisible ? (
-             <Octicon
-               className="indicator"
-               symbol={OcticonSymbol.primitiveDot}
-             />
-           ) : null}
--        </span>
--        <span>History</span>
-+        </div>
-       </TabBar>
-     )
-   }
-@@ -116,18 +156,25 @@
-     )
-   }
-
--  private renderHistorySidebar(): JSX.Element {
-+  private renderCompareSidebar(): JSX.Element {
-+    const tip = this.props.state.branchesState.tip
-+    const currentBranch = tip.kind === TipState.Valid ? tip.branch : null
-+
-     return (
--      <HistorySidebar
-+      <CompareSidebar
-         repository={this.props.repository}
--        dispatcher={this.props.dispatcher}
--        history={this.props.state.historyState}
-+        compareState={this.props.state.compareState}
-+        currentBranch={currentBranch}
-         gitHubUsers={this.props.state.gitHubUsers}
-         emoji={this.props.emoji}
-         commitLookup={this.props.state.commitLookup}
-         localCommitSHAs={this.props.state.localCommitSHAs}
-+        dispatcher={this.props.dispatcher}
-         onRevertCommit={this.onRevertCommit}
-         onViewCommitOnGitHub={this.props.onViewCommitOnGitHub}
-+        isDivergingBranchBannerVisible={
-+          this.props.isDivergingBranchBannerVisible
-+        }
-       />
-     )
-   }
-@@ -135,10 +182,10 @@
-   private renderSidebarContents(): JSX.Element {
-     const selectedSection = this.props.state.selectedSection
-
--    if (selectedSection === RepositorySection.Changes) {
-+    if (selectedSection === RepositorySectionTab.Changes) {
-       return this.renderChangesSidebar()
--    } else if (selectedSection === RepositorySection.History) {
--      return this.renderHistorySidebar()
-+    } else if (selectedSection === RepositorySectionTab.History) {
-+      return this.renderCompareSidebar()
-     } else {
-       return assertNever(selectedSection, 'Unknown repository section')
-     }
-@@ -154,57 +201,92 @@
-
-   private renderSidebar(): JSX.Element {
-     return (
--      <Resizable
--        id="repository-sidebar"
--        width={this.props.sidebarWidth}
--        onReset={this.handleSidebarWidthReset}
--        onResize={this.handleSidebarResize}
--        maximumWidth={MaxSidebarWidth}
--      >
--        {this.renderTabs()}
--        {this.renderSidebarContents()}
--      </Resizable>
-+      <FocusContainer onFocusWithinChanged={this.onSidebarFocusWithinChanged}>
-+        <Resizable
-+          id="repository-sidebar"
-+          width={this.props.sidebarWidth}
-+          onReset={this.handleSidebarWidthReset}
-+          onResize={this.handleSidebarResize}
-+          maximumWidth={MaxSidebarWidth}
-+        >
-+          {this.renderTabs()}
-+          {this.renderSidebarContents()}
-+        </Resizable>
-+      </FocusContainer>
-     )
-   }
-
--  private renderContent(): JSX.Element {
-+  private onSidebarFocusWithinChanged = (sidebarHasFocusWithin: boolean) => {
-+    // this lets us know that focus is somewhere within the sidebar
-+    this.setState({ sidebarHasFocusWithin })
-+
-+    if (
-+      sidebarHasFocusWithin === false &&
-+      this.props.state.selectedSection === RepositorySectionTab.History
-+    ) {
-+      this.props.dispatcher.updateCompareForm(this.props.repository, {
-+        showBranchList: false,
-+      })
-+    }
-+  }
-+
-+  private renderContent(): JSX.Element | null {
-     const selectedSection = this.props.state.selectedSection
-
--    if (selectedSection === RepositorySection.Changes) {
-+    if (selectedSection === RepositorySectionTab.Changes) {
-       const changesState = this.props.state.changesState
--      const selectedFileID = changesState.selectedFileID
--      const selectedFile = selectedFileID
--        ? changesState.workingDirectory.findFileWithID(selectedFileID)
--        : null
--      const diff = changesState.diff
-+      const selectedFileIDs = changesState.selectedFileIDs
-+
-+      if (selectedFileIDs.length > 1) {
-+        return <MultipleSelection count={selectedFileIDs.length} />
-+      }
-+
-       if (
--        !changesState.workingDirectory.files.length ||
--        !selectedFile ||
--        !diff
-+        changesState.workingDirectory.files.length === 0 ||
-+        selectedFileIDs.length === 0 ||
-+        changesState.diff === null
-       ) {
--        return <NoChanges onOpenRepository={this.openRepository} />
-+        return <NoChanges repository={this.props.repository} />
-       } else {
-+        const workingDirectory = changesState.workingDirectory
-+        const selectedFile = workingDirectory.findFileWithID(selectedFileIDs[0])
-+
-+        if (!selectedFile) {
-+          return null
-+        }
-+
-         return (
-           <Changes
-             repository={this.props.repository}
-             dispatcher={this.props.dispatcher}
-             file={selectedFile}
--            diff={diff}
-+            diff={changesState.diff}
-             imageDiffType={this.props.imageDiffType}
-           />
-         )
-       }
--    } else if (selectedSection === RepositorySection.History) {
-+    } else if (selectedSection === RepositorySectionTab.History) {
-+      const { historyState } = this.props.state
-+
-+      const sha = historyState.selection.sha
-+
-+      const selectedCommit =
-+        sha != null ? this.props.state.commitLookup.get(sha) || null : null
-+
-       return (
--        <History
-+        <SelectedCommit
-           repository={this.props.repository}
-           dispatcher={this.props.dispatcher}
--          history={this.props.state.historyState}
-+          selectedCommit={selectedCommit}
-+          changedFiles={historyState.changedFiles}
-+          selectedFile={historyState.selection.file}
-+          currentDiff={historyState.diff}
-           emoji={this.props.emoji}
--          commits={this.props.state.commitLookup}
-           commitSummaryWidth={this.props.commitSummaryWidth}
-           gitHubUsers={this.props.state.gitHubUsers}
--          imageDiffType={this.props.imageDiffType}
-+          selectedDiffType={this.props.imageDiffType}
-+          externalEditorLabel={this.props.externalEditorLabel}
-+          onOpenInExternalEditor={this.props.onOpenInExternalEditor}
-         />
-       )
-     } else {
-@@ -221,10 +303,6 @@
-     )
-   }
-
--  private openRepository = () => {
--    this.props.dispatcher.revealInFileManager(this.props.repository, '')
--  }
--
-   private onRevertCommit = (commit: Commit) => {
-     this.props.dispatcher.revertCommit(this.props.repository, commit)
-   }
-@@ -235,9 +313,9 @@
-     // as there's only two tabs.
-     if (e.ctrlKey && e.key === 'Tab') {
-       const section =
--        this.props.state.selectedSection === RepositorySection.History
--          ? RepositorySection.Changes
--          : RepositorySection.History
-+        this.props.state.selectedSection === RepositorySectionTab.History
-+          ? RepositorySectionTab.Changes
-+          : RepositorySectionTab.History
-
-       this.props.dispatcher.changeRepositorySection(
-         this.props.repository,
-@@ -250,8 +328,9 @@
-   private onTabClicked = (tab: Tab) => {
-     const section =
-       tab === Tab.History
--        ? RepositorySection.History
--        : RepositorySection.Changes
-+        ? RepositorySectionTab.History
-+        : RepositorySectionTab.Changes
-+
-     this.props.dispatcher.changeRepositorySection(
-       this.props.repository,
-       section
-merged
-  result 100644 598a0cabc7864df6db50781101811dedf580a766 app/src/ui/resizable/resizable.tsx
-  our    100644 e565705f992ba7d7bd86bdcb4a577dec86ca0714 app/src/ui/resizable/resizable.tsx
-@@ -9,8 +9,8 @@
- export class Resizable extends React.Component<IResizableProps, {}> {
-   public static defaultProps: IResizableProps = {
-     width: 250,
--    minimumWidth: 150,
-     maximumWidth: 350,
-+    minimumWidth: 200,
-   }
-
-   private startWidth: number | null = null
-@@ -96,8 +96,8 @@
-   public render() {
-     const style: React.CSSProperties = {
-       width: this.getCurrentWidth(),
--      maximumWidth: this.props.maximumWidth,
--      minimumWidth: this.props.minimumWidth,
-+      maxWidth: this.props.maximumWidth,
-+      minWidth: this.props.minimumWidth,
-     }
-
-     return (
-merged
-  result 100644 ac499b9891bcd8714b42b66a5d2ff2a003a09a8f app/src/ui/toolbar/push-pull-button.tsx
-  our    100644 b2e039b53887ee7cc2d3325232edcfb08a70ed7e app/src/ui/toolbar/push-pull-button.tsx
-@@ -1,9 +1,10 @@
- import * as React from 'react'
- import { ToolbarButton, ToolbarButtonStyle } from './button'
--import { IAheadBehind, Progress } from '../../lib/app-state'
-+import { Progress } from '../../lib/app-state'
- import { Dispatcher } from '../../lib/dispatcher'
- import { Octicon, OcticonSymbol } from '../octicons'
- import { Repository } from '../../models/repository'
-+import { IAheadBehind } from '../../models/branch'
- import { TipState } from '../../models/tip'
- import { RelativeTime } from '../relative-time'
- import { FetchType } from '../../lib/stores/index'
-merged
-  result 100644 82f0e853181e3bf4cab092bd28785970c4c492d9 app/src/ui/updates/update-available.tsx
-  our    100644 3054daf31cb24e5c2f9804c31515163e7bbaad76 app/src/ui/updates/update-available.tsx
-@@ -25,7 +25,10 @@
-           An updated version of GitHub Desktop is available and will be
-           installed at the next launch. See{' '}
-           <LinkButton uri={this.props.releaseNotesLink}>what's new</LinkButton>{' '}
--          or <LinkButton onClick={this.updateNow}>restart now</LinkButton>.
-+          or{' '}
-+          <LinkButton onClick={this.updateNow}>
-+            restart GitHub Desktop
-+          </LinkButton>.
-         </span>
-
-         <a className="close" onClick={this.dismiss}>
-merged
-  result 160000 d247be923e48ba4d02cf76dba79f0460d2f1a9a8 app/static/common/choosealicense.com
-  our    160000 fe965f16f6f690d40a738e75a46fad3f41f5daa3 app/static/common/choosealicense.com
-merged
-  result 160000 18e28746b0862059dbee8694fd366a679cb812fb app/static/common/gitignore
-  our    160000 690a433b668348c33087d34fafe2155ebe8bb4cf app/static/common/gitignore
-added in remote
-  their  100644 b78f57622a54a50d820cb145c0f9a61a66bb9a39 app/static/common/multiple-files-selected.svg
-@@ -0,0 +1 @@
-+<svg width="379" height="177" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path d="M197.32 102.94c-4.942-3.055-6.222-9.461-6.222-9.461s-1.508 4.63-6.239 5.955l.82 2.576 5.972 1.53 5.67-.6z" fill="#F7F8F9"/><path d="M197.32 102.94c-4.942-3.055-6.222-9.461-6.222-9.461s-1.508 4.63-6.239 5.955l.82 2.576 5.972 1.53 5.67-.6z" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/><path d="M180.128 100.758s-2.555-2.233-1.364-7.111c0 0 7.512 10.492 18.556 9.294 0 0-6.758 3.825-17.192-2.183" fill="#F7F8F9"/><path d="M180.128 100.758s-2.555-2.233-1.364-7.111c0 0 7.512 10.492 18.556 9.294 0 0-6.758 3.825-17.192-2.183z" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/><path d="M151.694 125.297c4.3-.344 7.773 3.36 7.773 3.36s.84-4.515-2.6-5.733l-6.436-.798 1.263 3.17z" fill="#F7F8F9"/><path d="M151.694 125.297c4.3-.344 7.773 3.36 7.773 3.36s.84-4.515-2.6-5.733l-6.436-.798 1.263 3.17z" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/><path d="M140.158 124.575s5.554.012 9.503 3.883c0 0 2.866-6.41 7.206-5.534 0 0-13.92-6.12-16.709 1.65" fill="#F7F8F9"/><path d="M140.158 124.575s5.554.012 9.503 3.883c0 0 2.866-6.41 7.206-5.534 0 0-13.92-6.12-16.709 1.65z" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/><path d="M219.598 172.051c0 2.566-17.221 4.644-38.463 4.644-21.243 0-38.464-2.078-38.464-4.644 0-2.566 17.22-4.646 38.464-4.646 21.242 0 38.463 2.08 38.463 4.646" fill="#EBF1F9"/><path d="M206.767 165.495l-4.4 1.912" fill="#F7F8F9"/><path d="M206.767 165.495l-4.4 1.912M160.369 166.06l1.084.39s2.663-1.184 4.693-1.263" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/><path d="M153.726 166.45s2.851 1.195 4.942 1.989" fill="#F7F8F9"/><path d="M153.726 166.45s2.851 1.195 4.942 1.989M178.012 167.444s3.319-.037 5.367.994c0 0 1.27-1.115 4.157-2.064" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/><path d="M189.255 169.08s-2.344.943-3.359 1.974" fill="#F7F8F9"/><path d="M189.255 169.08s-2.344.943-3.359 1.974" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/><path d="M170.982 169.08s1.41.006 3.048.593" fill="#F7F8F9"/><path d="M170.982 169.08s1.41.006 3.048.593" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/><path d="M171.024 169.99c-3.018.657-9.34 3.284-9.34 3.284l-7.757-3.794c-.359-6.275-2.012-25.022-2.012-25.022s12.428 2.772 18.103.657c0 0 4.598 2.406 10.128 2.48 0 0-1.005 2.553-.933 3.502 0 0 2.155.655 3.232.655l-.719-7.804.72-.44-1.366-.363s5.316-1.751 8.333-4.889c0 0 8.692-.73 18.749-5.69 0 0-1.222 3.43-4.454 6.711l4.814 1.096-2.156 30.858-7.4 3.21s-5.314-2.335-9.913-3.21l-5.961 3.575s-3.951-1.969-12.068-3.502v-1.313z" fill="#F7F8F9"/><path d="M171.024 169.99c-3.018.657-9.34 3.284-9.34 3.284l-7.757-3.794c-.359-6.275-2.012-25.022-2.012-25.022s12.428 2.772 18.103.657c0 0 4.598 2.406 10.128 2.48 0 0-1.005 2.553-.933 3.502 0 0 2.155.655 3.232.655l-.719-7.804.72-.44-1.366-.363s5.316-1.751 8.333-4.889c0 0 8.692-.73 18.749-5.69 0 0-1.222 3.43-4.454 6.711l4.814 1.096-2.156 30.858-7.4 3.21s-5.314-2.335-9.913-3.21l-5.961 3.575s-3.951-1.969-12.068-3.502v-1.313z" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/><path d="M151.916 144.457s4.885 5.472 9.41 6.93c0 0 10.846.804 18.82-3.792" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/><path d="M161.685 173.274l-.359-10.58-1.077.732s-2.946-1.606-4.598-5.618c0 0 2.946 2.116 5.315 2.188l.36-8.608" fill="#F7F8F9"/><path d="M161.685 173.274l-.359-10.58-1.077.732s-2.946-1.606-4.598-5.618c0 0 2.946 2.116 5.315 2.188l.36-8.608" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/><path fill="#F7F8F9" d="M208.521 140.373l-8.573 4.757-9.99-1.398"/><path stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round" d="M208.521 140.373l-8.573 4.757-9.99-1.398"/><path d="M198.967 174.44s.825-18.21.981-29.31" fill="#F7F8F9"/><path d="M198.967 174.44s.825-18.21.981-29.31M192.298 147.587c3.826-.158 7.579 1.348 7.579 1.348s3.35-3.012 5.536-3.012" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/><path d="M207.685 152.344l-3.13 1.342" fill="#F7F8F9"/><path d="M207.685 152.344l-3.13 1.342M192.298 162.33s5.03 1.43 7.16 2.382l1.115-.476M189.054 171.231l1.604-17.143-6.79 3.568-.777 17.15" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/><path d="M174.445 153.686l-4.864 3.335s4.996-.395 14.286.635" fill="#F7F8F9"/><path d="M174.445 153.686l-4.864 3.335s4.996-.395 14.286.635" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/><path d="M190.658 154.088l-1.332-.402" fill="#F7F8F9"/><path d="M190.658 154.088l-1.332-.402" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/><path d="M171.024 169.99s-.351-9.084-1.443-12.969" fill="#F7F8F9"/><path d="M171.024 169.99s-.351-9.084-1.443-12.969" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/><path d="M161.326 162.695s4.718-2.922 8.711-3.545c0 0-5.27-.46-9.07.847" fill="#F7F8F9"/><path d="M161.326 162.695s4.718-2.922 8.711-3.545c0 0-5.27-.46-9.07.847M154.748 152.344s5.07 1.897 6.399 3.327c0 0 4.062-1.503 6.716-1.583" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/><g><path d="M152.875 154.441s1.873.4 3.512 1.35" fill="#F7F8F9"/><path d="M152.875 154.441s1.873.4 3.512 1.35" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/></g><g><path d="M170.302 160.955s3.338-.049 5.915.427" fill="#F7F8F9"/><path d="M170.302 160.955s3.338-.049 5.915.427" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/></g><g><path d="M190.066 160.418s-1.203.726-2.374 1.438" fill="#F7F8F9"/><path d="M190.066 160.418s-1.203.726-2.374 1.438" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/></g><path d="M192.298 155.671s5.778.4 8.275 3.016c0 0 1.508-2.141 2.745-3.57l-3.65 1.23s-3.78-1.076-7.37-.676" fill="#F7F8F9"/><path d="M192.298 155.671s5.778.4 8.275 3.016c0 0 1.508-2.141 2.745-3.57l-3.65 1.23s-3.78-1.076-7.37-.676zM179.213 151.097s-4.09.236-7.603.345c0 0 3.525 3.993 11.481 5.58 0 0 3.664-2.067 7.567-4.006 0 0-3.857-.268-8.213-1.264" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/><g><path d="M203.708 139.278s-1.34 1.65-1.652 1.889c0 0-9.01 3.734-19.611 2.342" fill="#F7F8F9"/><path d="M203.708 139.278s-1.34 1.65-1.652 1.889c0 0-9.01 3.734-19.611 2.342" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/></g><g stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"><path d="M136.408 165.104v-96.18" stroke-dasharray="2.519,3.358"/><path d="M136.408 65.77v-2.365M158.914 54.606l1.616 1.715"/><path d="M164.822 60.874l103.005 109.28" stroke-dasharray="2.505,3.34"/><path d="M136.408 173.775v-2.364M269.974 172.431l1.618 1.717"/></g><g stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"><path d="M154.625 26.459l-33.393 12.697-5.629-14.138c-3.588-9.011.978-19.16 10.2-22.666 9.22-3.508 19.603.957 23.193 9.968l5.629 14.139zM121.488 25.577c-4-8.257-.22-16.892 8.623-19.166M162 32.48l-42.04 15.987-3.052-7.665 42.04-15.986zM156.973 29.979l-18.86 7.17M154.706 40.656l-23.716 9.02-3.085-4.23 26.15-9.943zM139.27 54.494c.284 1.396-.642 2.75-2.069 3.028-1.427.277-2.813-.626-3.099-2.022-.283-1.395.643-2.75 2.07-3.029 1.427-.277 2.815.629 3.099 2.023zM136.172 52.472l-.902-4.425M156.44 47.007c.756 1.214.36 2.798-.884 3.536s-2.865.351-3.62-.865c-.755-1.216-.358-2.798.886-3.538 1.242-.736 2.865-.349 3.618.867zM152.822 46.14l-2.395-3.855"/></g><path d="M74.118 40.066l-.847-2.758a.686.686 0 0 1 0-.406l.847-2.76a.692.692 0 0 0-.863-.865l-2.751.85a.68.68 0 0 1-.406 0l-2.749-.85a.692.692 0 0 0-.864.866l.846 2.759a.686.686 0 0 1 0 .406l-.846 2.758a.693.693 0 0 0 .864.867l2.75-.85a.68.68 0 0 1 .405 0l2.75.85a.692.692 0 0 0 .864-.867z" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/><g stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"><path d="M196.115 16.524l6.092 6.11M196.115 22.634l6.092-6.11"/></g><path d="M336.838.97c.887 0 1.604.72 1.604 1.61 0 .887-.717 1.608-1.604 1.608a1.606 1.606 0 0 1-1.604-1.608c0-.89.718-1.61 1.604-1.61zM276.908 103.22l-1.347-2.55a.687.687 0 0 0-.287-.289l-2.543-1.349a.693.693 0 0 1 0-1.224l2.543-1.35a.684.684 0 0 0 .287-.288l1.347-2.55a.69.69 0 0 1 1.221 0l1.346 2.55a.692.692 0 0 0 .286.288l2.544 1.35c.49.26.49.963 0 1.224l-2.544 1.35a.695.695 0 0 0-.286.288l-1.346 2.55a.69.69 0 0 1-1.221 0zM318.571 154.413v8.64M322.88 158.733h-8.617" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/><g stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"><path d="M87.815 67.417l-2.337 2.344M94.316 60.897L91.98 63.24M87.815 67.417a2.94 2.94 0 0 0 4.164 0 2.959 2.959 0 0 0 0-4.176 2.938 2.938 0 0 0-4.164 0 2.959 2.959 0 0 0 0 4.176z"/></g><path d="M35.913 19.09c0 1.031-.833 1.869-1.864 1.869a1.866 1.866 0 0 1-1.863-1.87c0-1.03.834-1.868 1.863-1.868 1.03 0 1.864.838 1.864 1.868zM264.036 2.58c0 1.03-.833 1.868-1.864 1.868a1.867 1.867 0 0 1-1.862-1.868c0-1.033.835-1.87 1.862-1.87 1.03 0 1.864.837 1.864 1.87zM346.306 107.981l-.995-1.887-1.882-.998 1.882-.998.995-1.888.996 1.888 1.881.998-1.881.998zM242.525 60.162c-.887 0-1.604.72-1.604 1.609 0 .888.718 1.609 1.604 1.609.886 0 1.604-.721 1.604-1.609 0-.89-.718-1.609-1.604-1.609zM83.826 96.327v4.186M85.912 98.42H81.74M5.168 120.64a2.22 2.22 0 0 1-2.217 2.224 2.22 2.22 0 0 1-2.217-2.223c0-1.227.994-2.224 2.217-2.224a2.22 2.22 0 0 1 2.217 2.224zM36.927 154.445l-.996-1.887-1.881-.998 1.881-1 .996-1.886.995 1.886 1.882 1-1.882.998zM45.862 84.256l1.355-.419 1.357.42-.418-1.362.418-1.36-1.357.418-1.355-.417.417 1.36zM10.5 61.149l3.604 1.977-3.604 1.977-1.972 3.615-1.971-3.615-3.605-1.977 3.605-1.977 1.971-3.616zM377.062 61.77l1.154 3.955-3.942-1.159-3.944 1.16 1.156-3.955-1.156-3.956 3.944 1.16 3.942-1.16zM303.997 23.625c10.875 0 19.693 8.842 19.693 19.752 0 10.906-8.818 19.749-19.693 19.749-10.876 0-19.692-8.843-19.692-19.75 0-10.909 8.816-19.751 19.692-19.751zM315.852 34.503a32.8 32.8 0 0 0 1.44-5.697" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/><path d="M303.523 50.936c3.38-2.371 6.283-5.409 8.563-8.853a34.853 34.853 0 0 0 1.801-3.05M296.332 54.827c.76-.29 1.508-.613 2.243-.962M289.47 56.71a33.651 33.651 0 0 0 3.078-.65M291.072 52.983c7.25-2.203 13.647-7.11 18.055-13.364M285.813 36.545a33.538 33.538 0 0 0 5.268-3.959M292.922 36.295a33.407 33.407 0 0 0 8.112-10.005M307.19 62.737c4.283-1.988 8.072-4.98 11.14-8.567M319.426 41.837c.122-.273.243-.544.358-.818M301.33 59.432c5.65-2.29 10.552-6.276 14.222-11.133a36.555 36.555 0 0 0 2.816-4.33M295.37 61.134a28.366 28.366 0 0 0 3.61-.862M318.523 49.072c2.11-3.096 3.659-6.521 4.666-10.13M299.576 62.623a33.442 33.442 0 0 0 9.83-4.497M305.86 35.41a33.723 33.723 0 0 0 4.573-10.704M300.735 41.56a32.647 32.647 0 0 0 1.948-2.014M285.382 49.831a33.477 33.477 0 0 0 4.05-1.231M305.96 26.367c.328-.832.624-1.678.887-2.535M298.23 38.03c2.394-2.26 4.543-4.841 5.941-7.846M294.652 41.102a68.23 68.23 0 0 0 1.6-1.313M284.512 46.233a33.515 33.515 0 0 0 7.747-3.508M288.219 39.775a30.348 30.348 0 0 1-3.843 1.936" stroke="#C9DEF2" stroke-linecap="round" stroke-linejoin="round"/></g></svg>
-\ No newline at end of file
-merged
-  result 100644 b1af174b6d02934b6e9b5f29051ccc89c28454ad app/styles/_globals.scss
-  our    100644 bd56fae88ff49ce2925253e0e5444f48d93a6c5b app/styles/_globals.scss
-@@ -115,6 +115,7 @@
-   align-items: center;
-   justify-content: center;
-   text-align: center;
-+  padding: var(--spacing);
- }
-
- // Stretches an element to fill the entire window (such as an overlay)
-merged
-  result 100644 2547663981e9047637d8e4edf9b40db74c9d5c51 app/styles/_mixins.scss
-  our    100644 2c54d4b7728a6487ddd3f6fd4ac7d7c641b10459 app/styles/_mixins.scss
-@@ -3,3 +3,4 @@
- @import 'mixins/octicon-status';
- @import 'mixins/textboxish';
- @import 'mixins/checkboard-background';
-+@import 'mixins/close-button';
-merged
-  result 100644 fe75df3631a5a6b0a4f5c1fc08ec016a19917524 app/styles/_ui.scss
-  our    100644 bc30cbb3646a0a92d2c552e53b0bca7865ccd9f7 app/styles/_ui.scss
-@@ -64,3 +64,5 @@
- @import 'ui/author-input';
- @import 'ui/avatar-stack';
- @import 'ui/commit-attribution';
-+@import 'ui/fancy-text-box';
-+@import 'ui/notification-banner';
-merged
-  result 100644 e9cb993ff22775125bb8a2e21a27d8b596619870 app/styles/_variables.scss
-  our    100644 120c6de98e0e7f66eb9d0d0fced3c8fcfbb627ea app/styles/_variables.scss
-@@ -5,6 +5,12 @@
- // Primer colors, see https://github.com/primer/primer-css/blob/master/modules/primer-support/lib/variables/color-system.scss
- @import '~primer-support/lib/variables/color-system.scss';
-
-+// Extracted as a SCSS variable so that we can define the --overlay-background-color
-+// on both the :root and the ::backdrop scope. The ::backdrop pseudo-element
-+// doesn't inherit :root, see
-+// https://bugs.chromium.org/p/chromium/issues/detail?id=594096
-+$overlay-background-color: rgba(0, 0, 0, 0.4);
-+
- :root {
-   --color-new: $green;
-   --color-deleted: $red;
-@@ -14,7 +20,6 @@
-
-   --text-color: $gray-900;
-   --text-secondary-color: $gray-500;
--  --text-tertiary-color: $gray-400;
-   --background-color: $white;
-
-   --button-height: 25px;
-@@ -26,6 +31,7 @@
-   --button-focus-border-color: $blue-600;
-
-   --link-button-color: $blue;
-+  --link-button-hover-color: $blue-600;
-
-   --secondary-button-background: $gray-000;
-   --secondary-button-hover-background: $white;
-@@ -36,11 +42,8 @@
-   // Typography
-   //
-   // Font, line-height, and color for body text, headings, and more.
--  --font-family-sans-serif: -apple-system, BlinkMacSystemFont, 'Segoe UI',
--    'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans',
--    'Helvetica Neue', Arial, sans-serif;
--  --font-family-monospace: Menlo, Monaco, Consolas, 'Liberation Mono',
--    'Courier New', monospace;
-+  --font-family-sans-serif: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', Arial, sans-serif;
-+  --font-family-monospace: Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New', monospace;
-
-   /**
-    * Font weight to use for semibold text
-@@ -86,12 +89,14 @@
-   // or an item in a tab control header. It's up to each implementation
-   // to decide what states to support (active selection, selection, etc).
-
-+  --box-background-color: var(--background-color);
-   --box-alt-background-color: $gray-100;
-
-   /**
-    * Background color for skeleton or "loading" boxes
-    */
-   --box-skeleton-background-color: $gray-200;
-+  --skeleton-background-gradient: -webkit-linear-gradient(left, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.5) 50%, rgba(255, 255, 255, 0) 100%);
-
-   /**
-    * Border color for boxes.
-@@ -145,6 +150,19 @@
-   --box-selected-active-border-color: $gray-400;
-
-   /**
-+   * Gradient used to indicate that content is overflowing, intended
-+   * for use when content can be expanded through other means than
-+   * scrolling.
-+   */
-+  --box-overflow-shadow-background: linear-gradient(180deg, rgba($white, 0) 0%, rgba($white, 1) 90%, rgba($white, 1) 100%);
-+
-+  /**
-+   * Author input (co-authors)
-+   */
-+  --co-author-tag-background-color: $blue-000;
-+  --co-author-tag-border-color: $blue-200;
-+
-+  /**
-    * The height of the title bar area on Win32 platforms
-    * If changed, update titleBarHeight in 'app/src/ui/dialog/dialog.tsx'
-   */
-@@ -173,6 +191,7 @@
-   --toolbar-height: 50px;
-
-   --toolbar-background-color: $gray-900;
-+  --toolbar-border-color: $gray-900;
-   --toolbar-text-color: $white;
-   --toolbar-text-secondary-color: $gray-300;
-
-@@ -196,10 +215,48 @@
-   --toolbar-button-hover-progress-color: $gray-700;
-   --toolbar-dropdown-open-progress-color: $gray-200;
-
-+  /**
-+   * App menu bar colors (Windows/Linux only)
-+   */
-+  --app-menu-button-color: var(--toolbar-text-color);
-+  --app-menu-button-hover-color: var(--toolbar-button-hover-color);
-+  --app-menu-button-hover-background-color: var(--toolbar-button-hover-background-color);
-+  --app-menu-button-active-color: var(--toolbar-button-active-color);
-+  --app-menu-button-active-background-color: var(--toolbar-button-active-background-color);
-+  --app-menu-pane-color: var(--text-color);
-+  --app-menu-pane-secondary-color: var(--text-secondary-color);
-+  --app-menu-pane-background-color: var(--toolbar-button-active-background-color);
-+  --app-menu-divider-color: var(--box-border-color);
-+
-+  /**
-+    * Background color for badges inside of toolbar buttons.
-+    * Examples of badges are the ahead/behind bubble in the
-+    * push/pull button and the PR badge in the branch drop
-+    * down button.
-+    */
-+  --toolbar-badge-background-color: $gray-600;
-+  --toolbar-badge-active-background-color: $gray-200;
-+
-   --tab-bar-height: 29px;
-   --tab-bar-active-color: $blue;
-   --tab-bar-background-color: $white;
-
-+  /** Count bubble colors when used inside of a tab bar item */
-+  --tab-bar-count-color: var(--text-color);
-+  --tab-bar-count-background-color: $gray-200;
-+
-+  /**
-+    * Badge colors when used inside of list items.
-+    * Example of this is the change indicators inside
-+    * of the repository list.
-+    */
-+  --list-item-badge-color: $gray-800;
-+  --list-item-badge-background-color: $gray-200;
-+  --list-item-selected-badge-color: $gray-900;
-+  --list-item-selected-badge-background-color: $gray-300;
-+  --list-item-selected-active-badge-color: $gray-900;
-+  --list-item-selected-active-badge-background-color: $white;
-+
-   /** Win32 has custom scrol bars, see _scroll.scss */
-   --win32-scroll-bar-size: 10px;
-
-@@ -215,6 +272,14 @@
-   --popup-overlay-z-index: calc(var(--popup-z-index) - 1);
-   --foldout-z-index: calc(var(--popup-z-index) - 2);
-
-+  /**
-+   * Toast notifications are shown temporarily for things like the zoom
-+   * percentage changing or the app toggling between full screen and normal
-+   * window mode.
-+   */
-+  --toast-notification-color: $gray-000;
-+  --toast-notification-background-color: rgba($gray-900, 0.6);
-+
-   /** The highlight color used for focus rings and focus box shadows */
-   --focus-color: $blue;
-
-@@ -233,6 +298,7 @@
-   --diff-text-color: $gray-900;
-   --diff-border-color: $gray-200;
-   --diff-gutter-color: $gray-200;
-+  --diff-gutter-background-color: var(--background-color);
-
-   --diff-line-number-color: $gray-700;
-   --diff-line-number-column-width: 50px;
-@@ -277,30 +343,45 @@
-   --diff-delete-hover-gutter-color: $red-300;
-   --diff-delete-hover-text-color: var(--text-color);
-
-+  // Syntax highlighting text colors
-+  --syntax-variable-color: #6f42c1;
-+  --syntax-alt-variable-color: #24292e;
-+  --syntax-keyword-color: #d73a49;
-+  --syntax-atom-color: #005cc5;
-+  --syntax-string-color: #032f62;
-+  --syntax-qualifier-color: #6f42c1;
-+  --syntax-type-color: #d73a49;
-+  --syntax-comment-color: $gray-500;
-+  --syntax-tag-color: #22863a;
-+  --syntax-attribute-color: #6f42c1;
-+  --syntax-link-color: #032f62;
-+
-   // Note that this duration *must* match the `UndoCommitAnimationTimeout`
-   // specified in `changes/index.tsx`.
-   --undo-animation-duration: 500ms;
-
--  /**
--   * Ahead/behind view
--   */
--  --ahead-behind-background-color: $gray-500;
--
-   // Colors for form errors
-   --error-color: $red;
-   --form-error-background: $red-100;
-   --form-error-border-color: $red-200;
-   --form-error-text-color: $red-800;
-
-+  /** Overlay is used as a background for both modals and foldouts */
-+  --overlay-background-color: $overlay-background-color;
-+
-   /** Dialog */
-   --dialog-warning-color: $yellow-600;
--  --dialog-warning-text-color: $yellow-800;
-   --dialog-error-color: $red;
-
-   /** Inline paths and code */
-   --path-segment-background: $blue-000;
-   --path-segment-padding: var(--spacing-third);
-
-+  /** Diverging notification banner colors */
-+  --notification-banner-background: $blue-000;
-+  --notification-banner-border-color: $blue-200;
-+  --notification-ref-background: rgba(255, 255, 255, 0.75);
-+
-   // http://easings.net/#easeOutBack
-   --easing-ease-out-back: cubic-bezier(0.175, 0.885, 0.32, 1.275);
-
-@@ -310,3 +391,7 @@
-   // http://easings.net/#easeOutQuint
-   --easing-ease-out-quint: cubic-bezier(0.23, 1, 0.32, 1);
- }
-+
-+::backdrop {
-+  --overlay-background-color: $overlay-background-color;
-+}
-merged
-  result 100644 3a8c3b0ce9abb4b883fdc4f28ada9ac3a70b2f2e app/styles/desktop.scss
-  our    100644 4a9623e6216173633dc9aa838abbce73b361f6bb app/styles/desktop.scss
-@@ -1,6 +1,8 @@
- @import 'vendor';
-
- @import 'variables';
-+@import 'themes/dark';
-+
- @import 'mixins';
-
- @import 'globals';
-added in remote
-  their  100644 e0bf14cbb8dd2a3366da0ad586f3b2bbb7cb1165 app/styles/mixins/_close-button.scss
-@@ -0,0 +1,35 @@
-+@mixin close-button {
-+  .close {
-+    flex-shrink: 0;
-+
-+    border: 0;
-+    height: 16px;
-+    width: 16px;
-+
-+    // Set the left margin to auto so that flexbox positions the button
-+    // on the right hand side of the dialog and add a -10px right hand
-+    // side margin to put the button where it should be (we use a double
-+    // margin for the header itself).
-+    margin: 0 calc(var(--spacing) * -1) 0 auto;
-+    padding: 0;
-+    background: transparent;
-+
-+    color: var(--text-secondary-color);
-+    cursor: pointer;
-+
-+    // Let the button deal with all mouse events.
-+    // Without this the octicon resets the cursor when
-+    // hovering over the <path>.
-+    .octicon {
-+      pointer-events: none;
-+    }
-+
-+    &:hover {
-+      color: var(--text-color);
-+    }
-+
-+    &:focus {
-+      outline: 0;
-+    }
-+  }
-+}
-merged
-  result 100644 f470c0de0fc68ce5dbe838698274008bdd827ff1 app/styles/mixins/_textboxish.scss
-  our    100644 37764480c283ce673dca3c64fa4e317a88804cfc app/styles/mixins/_textboxish.scss
-@@ -7,6 +7,7 @@
- @mixin textboxish {
-   border: 1px solid var(--box-border-color);
-   border-radius: var(--border-radius);
-+  background: var(--box-background-color);
-   color: currentColor;
-   font-size: var(--font-size);
-   font-family: var(--font-family-sans-serif);
-added in remote
-  their  100644 e26d91d058178a03378c4c4761703355f1aaff81 app/styles/themes/_dark.scss
-@@ -0,0 +1,305 @@
-+// Variables
-+//
-+// This files contains CSS variables accessible to all selectors
-+
-+// Primer colors, see https://github.com/primer/primer-css/blob/master/modules/primer-support/lib/variables/color-system.scss
-+@import '~primer-support/lib/variables/color-system.scss';
-+
-+body.theme-dark {
-+  --color-new: $green;
-+  --color-deleted: $red;
-+  --color-modified: $yellow-700;
-+  --color-renamed: $blue;
-+  --color-conflicted: $orange;
-+
-+  --text-color: $gray-300;
-+  --text-secondary-color: $gray-400;
-+  --background-color: $gray-900;
-+
-+  --button-background: $blue;
-+  --button-hover-background: lighten($blue, 5%);
-+  --button-text-color: $white;
-+  --button-focus-border-color: $blue-600;
-+
-+  --link-button-color: lighten($blue-400, 3%);
-+  --link-button-hover-color: $blue-400;
-+
-+  --secondary-button-background: $gray-800;
-+  --secondary-button-hover-background: var(--secondary-button-background);
-+  --secondary-button-text-color: var(--text-color);
-+  --secondary-button-focus-shadow-color: rgba($gray-200, 0.75);
-+  --secondary-button-focus-border-color: $gray-300;
-+
-+  /**
-+   * Background color for custom scroll bars.
-+   * The color is applied to the thumb part of the scrollbar.
-+   *
-+   * Note: Only applies to win32 platforms
-+   */
-+  --scroll-bar-thumb-background-color: rgba(0, 0, 0, 0.7);
-+
-+  /**
-+   * Background color for custom scroll bars in their active state.
-+   * The color is applied to the thumb part of the scrollbar.
-+   *
-+   * Note: Only applies to win32 platforms
-+   */
-+  --scroll-bar-thumb-background-color-active: rgba(0, 0, 0, 0.8);
-+
-+  // Box
-+  //
-+  // We use the term 'box' here to refer to a very high-level generic
-+  // component that fits many use cases. A 'box' might be a list item
-+  // or an item in a tab control header. It's up to each implementation
-+  // to decide what states to support (active selection, selection, etc).
-+
-+  --box-background-color: darken($gray-900, 3%);
-+  --box-alt-background-color: $gray-800;
-+
-+  /**
-+   * Background color for skeleton or "loading" boxes
-+   */
-+  --box-skeleton-background-color: $gray-700;
-+  --skeleton-background-gradient: -webkit-linear-gradient(left, rgba(36, 41, 46, 0) 0%, rgba(36, 41, 46, 0.5) 50%, rgba(36, 41, 46, 0) 100%);
-+
-+  /**
-+   * Border color for boxes.
-+   */
-+  --box-border-color: #141414;
-+  --box-border-accent-color: $blue;
-+
-+  /**
-+   * Background color for selected boxes without keyboard focus
-+   */
-+  --box-selected-background-color: $gray-700;
-+
-+  /**
-+   * Text color for when a user hovers over a boxe with a
-+   * pointing device. Should not be used by boxes that doesn't
-+   * implement a hover state since this will conflict with
-+   * selection and active selection
-+   */
-+  --box-hover-text-color: var(--text-color);
-+
-+  /**
-+   * Background color for when a user hovers over a boxe with a
-+   * pointing device. Should not be used by boxes that doesn't
-+   * implement a hover state since this will conflict with
-+   * selection and active selection
-+   */
-+
-+  /**
-+   * Text color for selected boxes without keyboard focus
-+   */
-+  --box-selected-text-color: var(--text-color);
-+
-+  /**
-+   * Border color for selected boxes without keyboard focus
-+   */
-+  --box-selected-border-color: $gray-400;
-+
-+  /**
-+   * Background color for selected boxes with active keyboard focus
-+   */
-+  --box-selected-active-background-color: $blue;
-+
-+  /**
-+   * Text color for selected boxes with active keyboard focus
-+   */
-+  --box-selected-active-text-color: $white;
-+
-+  /**
-+   * Border color for selected boxes with active keyboard focus
-+   */
-+  --box-selected-active-border-color: $gray-400;
-+
-+  /**
-+   * Gradient used to indicate that content is overflowing, intended
-+   * for use when content can be expanded through other means than
-+   * scrolling.
-+   */
-+  --box-overflow-shadow-background: linear-gradient(180deg, rgba($gray-900, 0) 0%, rgba($gray-900, 1) 90%, rgba($gray-900, 1) 100%);
-+
-+  /**
-+   * Author input (co-authors)
-+   */
-+  --co-author-tag-background-color: $blue-800;
-+  --co-author-tag-border-color: $blue-700;
-+
-+  --base-border: 1px solid var(--box-border-color);
-+
-+  --shadow-color: rgba(black, 0.5);
-+  --base-box-shadow: 0 2px 7px var(--shadow-color);
-+
-+  --toolbar-background-color: darken($gray-900, 3%);
-+  --toolbar-border-color: var(--box-border-color);
-+  --toolbar-text-color: var(--text-color);
-+  --toolbar-text-secondary-color: var(--text-secondary-color);
-+
-+  --toolbar-button-color: var(--toolbar-text-color);
-+  --toolbar-button-background-color: transparent;
-+  --toolbar-button-border-color: var(--box-border-color);
-+  --toolbar-button-secondary-color: var(--toolbar-text-secondary-color);
-+
-+  --toolbar-button-hover-color: $white;
-+  --toolbar-button-hover-background-color: $gray-800;
-+  --toolbar-button-hover-border-color: var(--toolbar-button-border-color);
-+
-+  --toolbar-button-focus-background-color: $gray-800;
-+
-+  --toolbar-button-active-color: var(--text-color);
-+  --toolbar-button-active-background-color: var(--background-color);
-+  --toolbar-button-active-border-color: var(--box-border-color);
-+
-+  --toolbar-button-progress-color: $gray-800;
-+  --toolbar-button-focus-progress-color: $gray-700;
-+  --toolbar-button-hover-progress-color: $gray-700;
-+  --toolbar-dropdown-open-progress-color: $gray-200;
-+
-+  /**
-+    * App menu bar colors (Windows/Linux only)
-+    */
-+  --app-menu-button-color: var(--toolbar-text-color);
-+  --app-menu-button-hover-color: var(--toolbar-button-hover-color);
-+  --app-menu-button-hover-background-color: var(--toolbar-button-hover-background-color);
-+  --app-menu-button-active-color: var(--text-color);
-+  --app-menu-button-active-background-color: $gray-800;
-+  --app-menu-pane-color: var(--text-color);
-+  --app-menu-pane-secondary-color: var(--text-secondary-color);
-+  --app-menu-pane-background-color: $gray-800;
-+  --app-menu-divider-color: $gray-600;
-+
-+  /**
-+   * Background color for badges inside of toolbar buttons.
-+   * Examples of badges are the ahead/behind bubble in the
-+   * push/pull button and the PR badge in the branch drop
-+   * down button.
-+   */
-+  --toolbar-badge-background-color: $gray-700;
-+  --toolbar-badge-active-background-color: $gray-700;
-+
-+  --tab-bar-active-color: $blue;
-+  --tab-bar-background-color: var(--box-background-color);
-+
-+  /** Count bubble colors when used inside of a tab bar item */
-+  --tab-bar-count-color: var(--text-color);
-+  --tab-bar-count-background-color: $gray-700;
-+
-+  /**
-+    * Badge colors when used inside of list items.
-+    * Example of this is the ahead/behind indicators inside
-+    * of the repository list.
-+    */
-+  --list-item-badge-color: var(--text-color);
-+  --list-item-badge-background-color: $gray-600;
-+  --list-item-selected-badge-color: $white;
-+  --list-item-selected-badge-background-color: $gray-500;
-+  --list-item-selected-active-badge-color: $gray-900;
-+  --list-item-selected-active-badge-background-color: $white;
-+
-+  /**
-+   * Toast notifications are shown temporarily for things like the zoom
-+   * percentage changing or the app toggling between full screen and normal
-+   * window mode.
-+   */
-+  --toast-notification-color: var(--text-color);
-+  --toast-notification-background-color: rgba(black, 0.8);
-+
-+  /** The highlight color used for focus rings and focus box shadows */
-+  --focus-color: $blue;
-+
-+  /**
-+   * Variables for form elements
-+   */
-+  --text-field-focus-shadow-color: rgba($blue, 0.25);
-+
-+  /**
-+   * Diff view
-+   */
-+
-+  --diff-text-color: var(--text-color);
-+  --diff-border-color: $gray-800;
-+  --diff-gutter-color: $gray-800;
-+  --diff-gutter-background-color: darken($gray-900, 3%);
-+
-+  --diff-line-number-color: var(--text-secondary-color);
-+  --diff-line-number-column-width: 50px;
-+
-+  --diff-selected-background-color: $blue-700;
-+  --diff-selected-border-color: $blue-600;
-+  --diff-selected-gutter-color: $blue-600;
-+  --diff-selected-text-color: var(--text-color);
-+
-+  --diff-add-background-color: darken($green-900, 10%);
-+  --diff-add-border-color: darken($green-900, 10%);
-+  --diff-add-gutter-color: darken($green-900, 10%);
-+  --diff-add-gutter-background-color: darken($green-900, 13%);
-+  --diff-add-inner-background-color: $green-900;
-+  --diff-add-text-color: var(--diff-text-color);
-+
-+  --diff-delete-background-color: darken($red-900, 15%);
-+  --diff-delete-border-color: darken($red-900, 10%);
-+  --diff-delete-gutter-color: darken($red-900, 10%);
-+  --diff-delete-gutter-background-color: darken($red-900, 20%);
-+  --diff-delete-inner-background-color: $red-700;
-+  --diff-delete-text-color: $red-100;
-+
-+  --diff-hunk-background-color: darken($gray-900, 3%);
-+  --diff-hunk-border-color: lighten($gray-900, 3%);
-+  --diff-hunk-gutter-color: lighten($gray-900, 3%);
-+  --diff-hunk-gutter-background-color: darken($gray-900, 6%);
-+  --diff-hunk-text-color: var(--text-secondary-color);
-+
-+  --diff-hover-background-color: $blue-500;
-+  --diff-hover-border-color: $blue-400;
-+  --diff-hover-gutter-color: $blue-400;
-+  --diff-hover-text-color: var(--diff-text-color);
-+
-+  --diff-add-hover-background-color: $green-900;
-+  --diff-add-hover-border-color: $green-700;
-+  --diff-add-hover-gutter-color: $green-700;
-+  --diff-add-hover-text-color: var(--text-color);
-+
-+  --diff-delete-hover-background-color: $red-800;
-+  --diff-delete-hover-border-color: $red-700;
-+  --diff-delete-hover-gutter-color: $red-700;
-+  --diff-delete-hover-text-color: var(--text-color);
-+
-+  // Syntax highlighting text colors
-+  --syntax-variable-color: $purple-300;
-+  --syntax-alt-variable-color: $blue-300;
-+  --syntax-keyword-color: $red-300;
-+  --syntax-atom-color: $blue-300;
-+  --syntax-string-color: $orange-300;
-+  --syntax-qualifier-color: $purple-300;
-+  --syntax-type-color: $red-300;
-+  --syntax-comment-color: $gray-400;
-+  --syntax-tag-color: $green-400;
-+  --syntax-attribute-color: $purple-300;
-+  --syntax-link-color: $blue-300;
-+
-+  // Colors for form errors
-+  --error-color: $red;
-+  --form-error-background: darken($red-900, 3%);
-+  --form-error-border-color: $red-900;
-+  --form-error-text-color: var(--text-color);
-+
-+  /** Overlay is used as a background for both modals and foldouts */
-+  --overlay-background-color: rgba(0, 0, 0, 0.5);
-+
-+  /** Dialog */
-+  --dialog-warning-color: $yellow-600;
-+  --dialog-error-color: $red-600;
-+
-+  /** Inline paths and code */
-+  --path-segment-background: $gray-700;
-+
-+  .blankslate-image {
-+    filter: #{'invert()'} grayscale(1) brightness(8) contrast(0.6);
-+  }
-+
-+  /** Diverging notification banner colors */
-+  --notification-banner-background: $gray-800;
-+  --notification-banner-border-color: $gray-700;
-+  --notification-ref-background: $gray-700;
-+}
-merged
-  result 100644 118f40d4344ca7c4768e080dc7c5efb558a6e508 app/styles/ui/_app-menu.scss
-  our    100644 3e0f853f19041341b3f99da4a54a9198c68956ba app/styles/ui/_app-menu.scss
-@@ -116,6 +116,6 @@
-     width: 100%;
-     border: none;
-     height: 1px;
--    border-bottom: var(--base-border);
-+    border-bottom: 1px solid var(--app-menu-divider-color);
-   }
- }
-merged
-  result 100644 c1acae40fa98cefd4b9acd874bc3f9564610a6b3 app/styles/ui/_author-input.scss
-  our    100644 7f410ba422cc224a1bf1a644770a555b04eacd29 app/styles/ui/_author-input.scss
-@@ -24,8 +24,8 @@
-
-     .handle {
-       border-radius: 3px;
--      border: 1px solid #c3e1ff;
--      background: #f0f8ff;
-+      border: 1px solid var(--co-author-tag-border-color);
-+      background: var(--co-author-tag-background-color);
-       padding: 1px 1px;
-       margin: 0px 2px;
-
-merged
-  result 100644 b9a9ae211132ba7784f37322c2cb317e9c2aa871 app/styles/ui/_branches.scss
-  our    100644 8b437422d7971232a5209b075f6a7a4aac650780 app/styles/ui/_branches.scss
-@@ -24,8 +24,8 @@
-   .count {
-     display: flex;
-
--    background: $gray-200;
--    color: var(--text-color);
-+    background: var(--tab-bar-count-background-color);
-+    color: var(--tab-bar-count-color);
-
-     margin-left: var(--spacing-half);
-
-@@ -162,12 +162,7 @@
-       }
-
-       &::after {
--        background: -webkit-linear-gradient(
--          left,
--          rgba(255, 255, 255, 0) 0%,
--          rgba(255, 255, 255, 0.5) 50%,
--          rgba(255, 255, 255, 0) 100%
--        );
-+        background: var(--skeleton-background-gradient);
-         content: '';
-         display: block;
-         height: 100%;
-merged
-  result 100644 97ca39a21b639ebe4d0b8aa70608843319f304fb app/styles/ui/_button.scss
-  our    100644 584328bba42bf1267b5fc2b72da5863699ebe8e3 app/styles/ui/_button.scss
-@@ -1,4 +1,7 @@
-+@import '../mixins';
-+
- .button-component {
-+  @include ellipsis;
-   // Chrome on Windows ignores the body element
-   // font-family and uses Arial so we redefine
-   // it here
-merged
-  result 100644 64c4ffecb0394f2d298707dc3791dd719539172b app/styles/ui/_codemirror.scss
-  our    100644 aa9c9bb39f6132a7a359f95ab612ed96c6442e09 app/styles/ui/_codemirror.scss
-@@ -25,6 +25,15 @@
-   background: inherit;
- }
-
-+.CodeMirror-simplescroll-horizontal,
-+.CodeMirror-simplescroll-vertical {
-+  background: var(--box-alt-background-color);
-+  div {
-+    background: var(--scroll-bar-thumb-background-color);
-+    border: none;
-+  }
-+}
-+
- // Windows has custom scroll bars, see _scroll.scss
- @include win32-context {
-   .CodeMirror {
-merged
-  result 100644 94b86d54fb9b0314deb1ef48cc9e1466578ed390 app/styles/ui/_dialog.scss
-  our    100644 e496a16bd915366f9b11d9d0e63a21a8732099f4 app/styles/ui/_dialog.scss
-@@ -53,7 +53,7 @@
-       transition: transform 250ms var(--easing-ease-out-back);
-
-       &::backdrop {
--        opacity: 0.4;
-+        opacity: 1;
-         transition: opacity 100ms ease-in;
-       }
-     }
-@@ -64,15 +64,14 @@
-       pointer-events: none;
-
-       &::backdrop {
--        opacity: 0.4;
-+        opacity: 1;
-       }
-     }
-
-     &-leave-active {
-       opacity: 0.01;
-       transform: scale(0.25);
--      transition: opacity 100ms ease-in,
--        transform 100ms var(--easing-ease-in-back);
-+      transition: opacity 100ms ease-in, transform 100ms var(--easing-ease-in-back);
-
-       &::backdrop {
-         opacity: 0.01;
-@@ -82,8 +81,8 @@
-   }
-
-   &::backdrop {
--    background: #000;
--    opacity: 0.4;
-+    background: var(--overlay-background-color);
-+    opacity: 1;
-   }
-
-   // The dialog embeds a fieldset as the first child of the form element
-@@ -120,39 +119,7 @@
-       @include ellipsis;
-     }
-
--    .close {
--      flex-shrink: 0;
--
--      border: 0;
--      height: 16px;
--      width: 16px;
--
--      // Set the left margin to auto so that flexbox positions the button
--      // on the right hand side of the dialog and add a -10px right hand
--      // side margin to put the button where it should be (we use a double
--      // margin for the header itself).
--      margin: 0 calc(var(--spacing) * -1) 0 auto;
--      padding: 0;
--      background: transparent;
--
--      color: var(--text-secondary-color);
--      cursor: pointer;
--
--      // Let the button deal with all mouse events.
--      // Without this the octicon resets the cursor when
--      // hovering over the <path>.
--      .octicon {
--        pointer-events: none;
--      }
--
--      &:hover {
--        color: var(--text-color);
--      }
--
--      &:focus {
--        outline: 0;
--      }
--    }
-+    @include close-button;
-   }
-
-   &.warning,
-@@ -168,10 +135,7 @@
-       // Ensure that the dialog contents always have room for the icon,
-       // account for two double spacers at top and bottom plus the 5px
-       // icon offset (margin-top) and the size of the icon itself.
--      min-height: calc(
--        var(--spacing-double) * 2 + var(--spacing-half) +
--          var(--dialog-icon-size)
--      );
-+      min-height: calc(var(--spacing-double) * 2 + var(--spacing-half) + var(--dialog-icon-size));
-
-       // We're creating an opaque 24 by 24px div with the background color
-       // that we want the icon to appear in and then apply the icon path
-merged
-  result 100644 8b9383b267f661b394b29143bae31d8f6d73aa73 app/styles/ui/_diff.scss
-  our    100644 3dca4de7170d06beb799c8fa23c07c350ca0afa9 app/styles/ui/_diff.scss
-@@ -9,6 +9,7 @@
- .diff-code-mirror .CodeMirror {
-   height: 100%;
-   color: var(--diff-text-color);
-+  background: var(--background-color);
-   font-size: var(--font-size-sm);
-   font-family: var(--font-family-monospace);
-
-@@ -61,6 +62,7 @@
- .diff-line-gutter {
-   display: flex;
-   height: 100%;
-+  background: var(--diff-gutter-background-color);
-
-   &.diff-add {
-     background: var(--diff-add-gutter-background-color);
-@@ -95,8 +97,25 @@
-   text-align: right;
- }
-
--.diff-add {
--  background: var(--diff-add-background-color);
-+.CodeMirror-linebackground {
-+  &.diff-add {
-+    background: var(--diff-add-background-color);
-+  }
-+
-+  &.diff-delete {
-+    background: var(--diff-delete-background-color);
-+  }
-+
-+  &.diff-context {
-+    background: var(--background-color);
-+  }
-+
-+  &.diff-hunk {
-+    background: var(--diff-hunk-background-color);
-+  }
-+}
-+
-+.CodeMirror pre.diff-add {
-   color: var(--diff-add-text-color);
-   padding: 0;
-
-@@ -109,8 +128,7 @@
-   }
- }
-
--.diff-delete {
--  background: var(--diff-delete-background-color);
-+.CodeMirror pre.diff-delete {
-   color: var(--diff-delete-text-color);
-   padding: 0;
-
-@@ -123,9 +141,8 @@
-   }
- }
-
--.diff-context {
--  background: var(--background-color);
--  color: var(--diff-context-text-color);
-+.CodeMirror pre.diff-context {
-+  color: var(--diff-text-color);
-   padding: 0;
-
-   .diff-line-number {
-@@ -159,11 +176,10 @@
- }
-
- .cm-diff-context {
--  color: var(--diff-context-text-color);
-+  color: var(--diff-text-color);
- }
-
--.diff-hunk {
--  background: var(--diff-hunk-background-color);
-+.CodeMirror pre.diff-hunk {
-   color: var(--diff-hunk-text-color);
-   padding: 0;
-
-@@ -176,7 +192,7 @@
-   }
- }
-
--.diff-line-selected {
-+.CodeMirror pre.CodeMirror-line .diff-line-selected {
-   .diff-line-number {
-     background: var(--diff-selected-background-color);
-     border-color: var(--diff-selected-border-color);
-@@ -188,7 +204,7 @@
-   }
- }
-
--.diff-line-hover {
-+.CodeMirror pre.CodeMirror-line .diff-line-hover {
-   .diff-line-number {
-     background: var(--diff-hover-background-color);
-     border-color: var(--diff-hover-border-color);
-@@ -246,15 +262,6 @@
-   padding: 0;
- }
- // ***************************************************************************************************************************
--#diff a {
--  text-decoration: none;
--  margin-left: var(--spacing-half);
--}
--
--#diff a:link {
--  color: (orange);
--}
--
- .panel.image {
-   display: flex;
-   flex: 1;
-@@ -295,17 +302,36 @@
-   }
- }
-
--.image-diff-two-up {
-+.image-diff-container {
-   display: flex;
-   flex: 1;
-   justify-content: center;
-   align-items: center;
-+  flex-direction: column;
-
--  .image-diff-previous {
--    margin-right: 7.5px;
-+  .image-diff-two-up {
-+    display: flex;
-+    align-items: center;
-+
-+    .image-diff-previous {
-+      margin-right: var(--spacing-half);
-+      margin-bottom: var(--spacing-half);
-+    }
-+    .image-diff-current {
-+      margin-left: var(--spacing-half);
-+      margin-bottom: var(--spacing-half);
-+    }
-   }
--  .image-diff-current {
--    margin-left: 7.5px;
-+
-+  .image-diff-summary {
-+    color: var(--text-secondary-color);
-+    font-weight: var(--font-weight-semibold);
-+    .added {
-+      color: var(--color-new);
-+    }
-+    .removed {
-+      color: var(--color-deleted);
-+    }
-   }
- }
-
-@@ -436,15 +462,15 @@
- // https://github.com/primer/github-syntax-light/blob/5aeffad2559647286080328436156c4904a9785b/lib/github-light.css
- .cm-s-default {
-   .cm-variable {
--    color: #6f42c1;
-+    color: var(--syntax-variable-color);
-   }
-
-   .cm-keyword {
--    color: #d73a49;
-+    color: var(--syntax-keyword-color);
-   }
-
-   .cm-atom {
--    color: #005cc5;
-+    color: var(--syntax-atom-color);
-   }
-   .cm-number {
-     color: inherit;
-@@ -456,25 +482,25 @@
-
-   .cm-variable-2,
-   .cm-variable-3 {
--    color: #24292e;
-+    color: var(--syntax-alt-variable-color);
-   }
-   .cm-comment,
-   .cm-meta {
--    color: $gray-500;
-+    color: var(--syntax-comment-color);
-   }
-   .cm-string,
-   .cm-string-2 {
--    color: #032f62;
-+    color: var(--syntax-string-color);
-
-     &.cm-property {
-       color: inherit;
-     }
-   }
-   .cm-qualifier {
--    color: #6f42c1;
-+    color: var(--syntax-qualifier-color);
-   }
-   .cm-type {
--    color: #d73a49;
-+    color: var(--syntax-type-color);
-   }
-   .cm-builtin {
-     color: inherit;
-@@ -483,17 +509,17 @@
-     color: inherit;
-   }
-   .cm-tag {
--    color: #22863a;
-+    color: var(--syntax-tag-color);
-   }
-   .cm-attribute {
--    color: #6f42c1;
-+    color: var(--syntax-attribute-color);
-   }
-   .cm-hr {
-     color: inherit;
-   }
-   .cm-link {
-     text-decoration: underline;
--    color: #032f62;
-+    color: var(--syntax-link-color);
-   }
-
-   // Intra line markings takes precedence over syntax highlighting.
-@@ -507,19 +533,19 @@
-
-   .cm-m-css {
-     &.cm-property {
--      color: #005cc5;
-+      color: var(--syntax-atom-color);
-     }
-   }
-
-   .cm-m-shell {
-     &.cm-builtin {
--      color: #005cc5;
-+      color: var(--syntax-atom-color);
-     }
-   }
-
-   .cm-m-javascript {
-     &.cm-type {
--      color: #6f42c1;
-+      color: var(--syntax-variable-color);
-     }
-   }
- }
-added in remote
-  their  100644 479e9f6732ddc2b29c19b24585f4bb315001226a app/styles/ui/_fancy-text-box.scss
-@@ -0,0 +1,41 @@
-+@import '../mixins';
-+
-+.fancy-text-box-component {
-+  background: var(--box-background-color);
-+  display: flex;
-+  align-items: center;
-+  border: var(--base-border);
-+  border-radius: var(--border-radius);
-+
-+  .fancy-octicon {
-+    height: var(--text-field-height);
-+    padding: var(--spacing-half) 0 var(--spacing-half) 7px;
-+    border-right: none;
-+    border-radius: var(--border-radius) 0 0 var(--border-radius);
-+    opacity: 0.5;
-+    transition: opacity 0.2s ease;
-+  }
-+
-+  &.focused {
-+    @include textboxish-focus-styles;
-+
-+    .fancy-octicon {
-+      opacity: 1;
-+    }
-+  }
-+
-+  input {
-+    border-left: none;
-+    border-radius: 0 var(--border-radius) var(--border-radius) 0;
-+    border: none;
-+    box-shadow: none;
-+
-+    &:focus {
-+      box-shadow: none;
-+    }
-+  }
-+
-+  &.disabled {
-+    background: var(--box-alt-background-color);
-+  }
-+}
-merged
-  result 100644 8d0a73f26a35a260372d33c7dfe4ff8b5d1339a8 app/styles/ui/_file-list.scss
-  our    100644 e144976834ba00ee6d0a7f0840de601c6361830e app/styles/ui/_file-list.scss
-@@ -11,12 +11,15 @@
-     border-bottom: var(--base-border);
-   }
-
--  // Only use special colors for the change type icons when
--  // the list item doesn't have active focus. If it does we
--  // fall back to using the ambient foreground color of the
--  // list item.
--  .list-item:not(:focus) {
--    @include octicon-status;
-+  .list-focus-container {
-+    // Default to using status aware colors for the change type
-+    // octicons (i.e. green for added, yellowish for modified etc)
-+    // but fall back to picking up the ambient text color when the
-+    // list item is both focused and selected.
-+    &.focus-within .list-item:not(.selected),
-+    &:not(.focus-within) .list-item {
-+      @include octicon-status;
-+    }
-   }
-
-   .file {
-merged
-  result 100644 6d566f094b0851eb8e5875fc9b74a6ec847985e2 app/styles/ui/_foldout.scss
-  our    100644 862730a600bd4c8f8550cc85c363796164440dfa app/styles/ui/_foldout.scss
-@@ -12,8 +12,7 @@
-       box-shadow: none;
-     }
-
--    background: black;
--    opacity: 0.4;
-+    background: var(--overlay-background-color);
-     height: 100%;
-   }
-
-merged
-  result 100644 7b3fc84057d9f29f2c281fa3e52cb7eb6e066501 app/styles/ui/_list.scss
-  our    100644 1caa93d31e19fb970d33836afcdb72aebca4aad6 app/styles/ui/_list.scss
-@@ -62,6 +62,17 @@
-   }
- }
-
-+.list-focus-container {
-+  // The selected items must act as the focused element when inside
-+  &.focus-within .list-item.selected {
-+    --text-color: var(--box-selected-active-text-color);
-+    --text-secondary-color: var(--box-selected-active-text-color);
-+
-+    color: var(--text-color);
-+    background-color: var(--box-selected-active-background-color);
-+  }
-+}
-+
- .list-item {
-   display: flex;
-   flex-direction: row;
-@@ -76,14 +87,6 @@
-
-     color: var(--text-color);
-     background-color: var(--box-selected-background-color);
--
--    &:focus {
--      --text-color: var(--box-selected-active-text-color);
--      --text-secondary-color: var(--box-selected-active-text-color);
--
--      color: var(--text-color);
--      background-color: var(--box-selected-active-background-color);
--    }
-   }
-
-   &:focus {
-added in remote
-  their  100644 ec2aae86b8d44d23f35f56cb9684489301016d6b app/styles/ui/_notification-banner.scss
-@@ -0,0 +1,102 @@
-+@import '../mixins';
-+
-+.notification-banner + .compare-form {
-+  border-top: var(--base-border);
-+}
-+
-+.notification-banner {
-+  background: var(--notification-banner-background);
-+  border: var(--base-border);
-+  border-color: var(--notification-banner-border-color);
-+  border-radius: var(--border-radius);
-+  display: flex;
-+  padding: var(--spacing);
-+  position: relative;
-+
-+  .notification-icon {
-+    margin-right: var(--spacing-half);
-+  }
-+
-+  &-content {
-+    display: flex;
-+    flex-wrap: wrap;
-+
-+    p {
-+      flex-grow: 1;
-+      font-size: var(--font-size-sm);
-+      margin: 0;
-+      padding-right: var(--spacing-double); // Extra space for the close button
-+
-+      & + p {
-+        margin-top: var(--spacing-half);
-+      }
-+    }
-+  }
-+
-+  @include close-button;
-+
-+  .ref-component {
-+    background: var(--notification-ref-background);
-+    word-break: normal;
-+  }
-+
-+  .close {
-+    position: absolute;
-+    margin: 0;
-+    top: var(--spacing);
-+    right: var(--spacing);
-+    text-align: center;
-+
-+    .octicon {
-+      height: 12px;
-+    }
-+  }
-+}
-+
-+.diverge-banner {
-+  margin: var(--spacing-half);
-+  overflow: hidden;
-+
-+  &-enter {
-+    max-height: 0;
-+    opacity: 0;
-+
-+    &-active {
-+      max-height: 200px;
-+      opacity: 1;
-+      transition: all var(--undo-animation-duration) cubic-bezier(0, 0, 0.2, 1);
-+    }
-+  }
-+
-+  &-leave {
-+    max-height: 200px;
-+
-+    &-active {
-+      max-height: 0;
-+      opacity: 1;
-+      transition: max-height 300ms cubic-bezier(0.4, 0, 0.2, 1);
-+
-+      .diverge-banner {
-+        transform: translateX(-102%);
-+        opacity: 0;
-+        transition: all 180ms cubic-bezier(0.4, 0, 1, 1);
-+      }
-+    }
-+  }
-+
-+  &-wrapper {
-+    overflow: hidden;
-+    box-shadow: inset 0 -1px var(--box-border-color);
-+  }
-+}
-+
-+.notification-banner-content-body {
-+  margin-bottom: var(--spacing-half);
-+}
-+
-+.notification-banner-content {
-+  .button-component {
-+    margin-top: var(--spacing-half);
-+    margin-right: var(--spacing-half);
-+  }
-+}
-merged
-  result 100644 8f546e403848d75eee71d9c9cfadf10861721ea0 app/styles/ui/_octicons.scss
-  our    100644 215063877dc976dfb22c47f98829eb38c20d9bd1 app/styles/ui/_octicons.scss
-@@ -6,4 +6,6 @@
-   Forcing a width of 16px would result in some blurry icons showing up.
-   Instead, let's imply width: auto; instead. */
-   height: 16px;
-+
-+  flex-shrink: 0;
- }
-merged
-  result 100644 7a372fc2ba926c3532af77143dd008fa32fb4d3a app/styles/ui/_progress.scss
-  our    100644 0f1d4611ca18a0222d8408f2fba2f066fc73e2a5 app/styles/ui/_progress.scss
-@@ -12,13 +12,7 @@
-   }
-
-   &:indeterminate {
--    background-image: -webkit-linear-gradient(
--      -45deg,
--      transparent 33%,
--      var(--text-color) 33%,
--      var(--text-color) 66%,
--      transparent 66%
--    );
-+    background-image: -webkit-linear-gradient(-45deg, transparent 33%, var(--text-color) 33%, var(--text-color) 66%, transparent 66%);
-     background-size: 25px 10px, 100% 100%, 100% 100%;
-
-     -webkit-animation: progress-indeterminate-animation 5s linear infinite;
-merged
-  result 100644 babfdd92b2ced6ebdff2052231e4dea8a3d3b576 app/styles/ui/_pull-request-badge.scss
-  our    100644 479c5dc5f32bef83b9e68e7b8f2739733f4da45f app/styles/ui/_pull-request-badge.scss
-@@ -1,9 +1,9 @@
- .toolbar-dropdown.open .pr-badge {
--  background: $gray-200;
-+  background: var(--toolbar-badge-active-background-color);
- }
-
- .toolbar-dropdown:not(.open) .pr-badge {
--  background: $gray-700;
-+  background: var(--toolbar-badge-background-color);
- }
-
- .pr-badge {
-merged
-  result 100644 eddec3b4d0f749f111f14d559b64cb6d06e2a97f app/styles/ui/_ref.scss
-  our    100644 6c6ae06ccf808f2fbe03949d3ac21f696563a97d app/styles/ui/_ref.scss
-@@ -5,4 +5,5 @@
-   border: var(--path-segment-background);
-   border-radius: var(--border-radius);
-   padding: var(--path-segment-padding);
-+  word-break: break-all;
- }
-merged
-  result 100644 157e36f8a6d1951007c2c6c8f17b69d30f96b0c7 app/styles/ui/_repository-list.scss
-  our    100644 14dc39f723c7e6750bd1aeb7eca236863e48a320 app/styles/ui/_repository-list.scss
-@@ -50,7 +50,7 @@
-       @include ellipsis;
-
-       .prefix {
--        color: var(--text-tertiary-color);
-+        color: var(--text-secondary-color);
-       }
-
-       /* Used to highlight substring matches in filtered lists */
-@@ -61,6 +61,43 @@
-         color: currentColor;
-       }
-     }
-+
-+    .change-indicator {
-+      color: var(--tab-bar-active-color);
-+      margin-right: 0;
-+      width: auto;
-+    }
-+
-+    .change-indicator-wrapper {
-+      display: flex;
-+      min-width: 12px;
-+    }
-+
-+    .ahead-behind {
-+      height: 16px;
-+      background: var(--list-item-badge-background-color);
-+      color: var(--list-item-badge-color);
-+      align-items: center;
-+      margin-left: auto;
-+
-+      // Perfectly round semi circle ends with real tight
-+      // padding on either side. Now in two flavors!
-+      @include darwin {
-+        height: 12px;
-+        line-height: 12px;
-+      }
-+
-+      @include win32 {
-+        height: 13px;
-+        line-height: 13px;
-+      }
-+
-+      .octicon {
-+        margin: 0;
-+        height: 20px;
-+        width: 12px;
-+      }
-+    }
-   }
-
-   .sidebar-message {
-@@ -71,3 +108,31 @@
-     text-align: center;
-   }
- }
-+
-+.list-focus-container {
-+  /** Ahead/behind badge colors when list item is selected but not focused */
-+  .list-item.selected {
-+    .repository-list-item {
-+      .ahead-behind {
-+        background: var(--list-item-selected-badge-background-color);
-+        color: var(--list-item-selected-badge-color);
-+      }
-+    }
-+  }
-+
-+  &.focus-within {
-+    /** Ahead/behind badge colors when list item is selected and focused */
-+    .list-item.selected {
-+      .repository-list-item {
-+        .ahead-behind {
-+          background: var(--list-item-selected-active-badge-background-color);
-+          color: var(--list-item-selected-active-badge-color);
-+        }
-+      }
-+    }
-+
-+    .change-indicator {
-+      color: var(--text-color);
-+    }
-+  }
-+}
-merged
-  result 100644 19452e95365b7649095eb5dec6929dfbcf0a56ed app/styles/ui/_repository.scss
-  our    100644 7bc7ca7f0af55bf92b7abef8be065dadcfe5e06e app/styles/ui/_repository.scss
-@@ -6,6 +6,10 @@
-   flex-direction: row;
-   flex: 1;
-
-+  > .focus-container {
-+    display: flex;
-+  }
-+
-   &-sidebar {
-     display: flex;
-     flex-direction: column;
-merged
-  result 100644 d03e102280205b3d5932443b87f86ae495b967c8 app/styles/ui/_select.scss
-  our    100644 49aaeff05480031aef8493b66d05c59ae970ecc0 app/styles/ui/_select.scss
-@@ -10,27 +10,16 @@
-     margin-bottom: var(--spacing-third);
-   }
-
--  // Select boxes look absolutely horrible on Windows so we'll make them
--  // look as good as we possibly can. There's nothing we can do about the
--  // drop down itself but at least we can style the base element a bit.
--  @include win32 {
--    select {
--      // Get rid of all default UA styling, we can do better
--      -webkit-appearance: none;
-+  // Custom styles for select components because a) they look horrible
-+  // on Windows and b) because we need them to inherit colors and other
-+  // appearance from our global variables. Therefore we treat them more
-+  // or less exactly as a text box.
-+  select {
-+    // Make the select look like a text box.
-+    @include textboxish;
-+    @include textboxish-disabled;
-
--      // Make the select look like a text box.
--      @include textboxish;
--      @include textboxish-disabled;
--
--      // Add back the arrow that got removed with appearance: none.
--      // This is a custom version of the triangle-down octicon that was
--      // adapted to be 8 by 5px. The gif is in 2x and the background-size
--      // scales it back down so that we can have crisp arrows on high-dpi
--      // displays. The path is M 0,0 4,5 8,0 Z and the color is #6a737d.
--      background-image: url('data:image/gif;base64,R0lGODlhEAAKAMQAAGpzff///8PHy6arsXqCi46UnN7g4vHy8/v7+253gYuSmm12gO/w8dve4Pz8/KassniAicfLzwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAAAAAAALAAAAAAQAAoAAAUw4ACMZFk+TmGugIIEB8GSEBPcRjIvze1HM4FvKDI9hsNUyYUcxka1JjLHkzYFwmYIADs=');
--      background-size: 8px 5px;
--      background-repeat: no-repeat;
--      background-position: right var(--spacing-half) center;
--    }
-+    // Don't include the default padding from textboxish, it's too much
-+    padding: 0;
-   }
- }
-merged
-  result 100644 43d02373aff313ef9b39f22eb06c69042edeae78 app/styles/ui/_tab-bar.scss
-  our    100644 1bffcaff9a286153de4d40b1384bc42499839078 app/styles/ui/_tab-bar.scss
-@@ -51,6 +51,17 @@
-       margin-left: 4px;
-       margin-top: 1px;
-     }
-+
-+    .counter {
-+      color: var(--tab-bar-count-color);
-+      background-color: var(--tab-bar-count-background-color);
-+      margin-left: 4px;
-+      padding: 2px 5px;
-+      font-size: var(--font-size-xs);
-+      font-weight: var(--font-weight-semibold);
-+      border-radius: 20px;
-+      line-height: 1;
-+    }
-   }
-
-   &.switch &-item {
-merged
-  result 100644 94ed12c8ef668212eaa0f41d6f741a8cc444b2da app/styles/ui/changes/_changes-view.scss
-  our    100644 65c5af2ea88cf23e747e2b83a4de02734e02ec5a app/styles/ui/changes/_changes-view.scss
-@@ -59,6 +59,10 @@
-       margin: var(--spacing-double);
-       text-align: center;
-       justify-content: initial;
-+
-+      .blankslate-image {
-+        max-height: 150px;
-+      }
-     }
-   }
- }
-merged
-  result 100644 44b4d80ba3b31ba74550bd24a221b8b5a30b162c app/styles/ui/changes/_commit-message.scss
-  our    100644 68a0917a3d144cf8e5d26609b5abc54013f7d66e app/styles/ui/changes/_commit-message.scss
-@@ -45,18 +45,18 @@
-   }
-
-   .co-authors-toggle {
--    color: $gray-500;
-+    color: var(--text-secondary-color);
-
-     &:hover {
--      color: $gray-900;
-+      color: var(--text-color);
-     }
-   }
-
-   &.with-co-authors .co-authors-toggle {
--    color: $blue-400;
-+    color: var(--link-button-color);
-
-     &:hover {
--      color: $blue-600;
-+      color: var(--link-button-hover-color);
-     }
-   }
-
-@@ -91,11 +91,7 @@
-         width: 100%;
-         bottom: 0px;
-         height: 5px;
--        background: linear-gradient(
--          to bottom,
--          rgba(0, 0, 0, 0) 0%,
--          rgba(0, 0, 0, 0.1) 100%
--        );
-+        background: linear-gradient(to bottom, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0.1) 100%);
-         border-bottom: var(--base-border);
-       }
-     }
-@@ -119,6 +115,7 @@
-
-     .action-bar {
-       padding: var(--spacing-half);
-+      background: var(--box-background-color);
-
-       // We're not faking being a textbox any more
-       cursor: default;
-merged
-  result 100644 afc47457356923945b1b56e34a7eb176b19e7adb app/styles/ui/history/_commit-summary.scss
-  our    100644 da6d9942c041f863fd8e5aa0dc74a2e8a8788277 app/styles/ui/history/_commit-summary.scss
-@@ -41,6 +41,21 @@
-     .commit-summary-description {
-       padding-right: 100px;
-     }
-+
-+    // When the description area can be, but isn't yet, expanded
-+    // we'll add a small shadow towards the bottom to hint that
-+    // there's more content available.
-+    &:not(.expanded) {
-+      .commit-summary-description:before {
-+        content: '';
-+        background: var(--box-overflow-shadow-background);
-+        position: absolute;
-+        height: 30px;
-+        bottom: 0px;
-+        width: 100%;
-+        pointer-events: none;
-+      }
-+    }
-   }
- }
-
-@@ -76,21 +91,6 @@
-     // The extra pixel makes the space align up with the commit list.
-     max-height: 61px;
-     flex: 1;
--
--    &:before {
--      content: '';
--      background: linear-gradient(
--        180deg,
--        rgba(255, 255, 255, 0) 0px,
--        rgba(255, 255, 255, 0) 40px,
--        rgba(255, 255, 255, 0.5) 40px,
--        white 60px
--      );
--      position: absolute;
--      height: 100%;
--      width: 100%;
--      pointer-events: none;
--    }
-   }
-
-   // Enable text selection inside the title and description elements.
-merged
-  result 100644 58cea508b02182fa4f45daf88643d33c3b2dd020 app/styles/ui/history/_history.scss
-  our    100644 4e36c11fb44d43f2f8a8cb661820f2143f0f513c app/styles/ui/history/_history.scss
-@@ -46,6 +46,114 @@
-       margin: var(--spacing-double);
-       text-align: center;
-       justify-content: initial;
-+
-+      .blankslate-image {
-+        max-height: 150px;
-+      }
-+    }
-+  }
-+}
-+
-+#compare-view {
-+  display: flex;
-+  flex-direction: column;
-+  flex: 1;
-+
-+  .compare-form {
-+    background: var(--box-alt-background-color);
-+    flex: initial;
-+    padding: var(--spacing-half);
-+    border-bottom: var(--base-border);
-+  }
-+
-+  .compare-commit-list {
-+    flex: 1;
-+    display: flex;
-+    flex-direction: column;
-+  }
-+
-+  .merge-cta {
-+    border-top: var(--base-border);
-+    display: flex;
-+    flex-direction: column;
-+    font-size: var(--font-size-sm);
-+    text-align: center;
-+    padding: var(--spacing);
-+  }
-+
-+  .merge-message {
-+    margin-top: var(--spacing);
-+  }
-+
-+  .no-branches {
-+    color: var(--text-secondary-color);
-+    margin-top: var(--spacing-double);
-+  }
-+
-+  .branch-commit-counter {
-+    color: var(--text-secondary-color);
-+    display: flex;
-+    justify-content: flex-end;
-+    flex: 1;
-+    font-size: var(--font-size-sm);
-+
-+    &-item {
-+      display: flex;
-+      align-items: center;
-+
-+      &:first-child {
-+        margin-right: var(--spacing-half);
-+      }
-+    }
-+
-+    .octicon {
-+      fill: var(--text-secondary-color);
-+      width: 8px;
-+      margin-left: 1px;
-+
-+      &:last-child {
-+        margin-right: 0;
-+      }
-+    }
-+  }
-+
-+  .tab-bar {
-+    padding: var(--spacing-half);
-+    border-bottom: var(--base-border);
-+    height: initial;
-+
-+    &-item {
-+      box-shadow: none;
-+      background: var(--tab-bar-background-color);
-+      border: var(--base-border);
-+
-+      &:first-of-type {
-+        border-radius: var(--border-radius) 0 0 var(--border-radius);
-+      }
-+
-+      &:last-of-type {
-+        border-radius: 0 var(--border-radius) var(--border-radius) 0;
-+      }
-+
-+      &.selected {
-+        background: var(--box-selected-active-background-color);
-+        border-color: var(--box-border-accent-color);
-+        color: var(--box-selected-active-text-color);
-+      }
-+    }
-+  }
-+
-+  .select-component {
-+    flex-grow: 0;
-+  }
-+
-+  .compare-content {
-+    display: flex;
-+    height: 100%;
-+    flex-direction: column;
-+
-+    .ref-component {
-+      word-break: break-word;
-     }
-   }
- }
-merged
-  result 100644 5cf34011a143e1112e833a2ba33f5d35a182088a app/styles/ui/toolbar/_toolbar.scss
-  our    100644 15433dbad68211b728ccfe0accfc3dc90955c1cf app/styles/ui/toolbar/_toolbar.scss
-@@ -3,6 +3,7 @@
- /** A React component holding the main application toolbar component. */
- #desktop-app-toolbar {
-   height: var(--toolbar-height);
-+  border-bottom: 1px solid var(--toolbar-border-color);
-
-   display: flex;
-   flex-direction: row;
-@@ -63,7 +64,7 @@
- .ahead-behind {
-   display: flex;
-
--  background: var(--ahead-behind-background-color);
-+  background: var(--toolbar-badge-background-color);
-
-   // Perfectly round semi circle ends with real tight
-   // padding on either side. Now in two flavors!
-merged
-  result 100644 419ec0bccd48a36eeace41e2a86c10861ebb2943 app/styles/ui/window/_app-menu-bar.scss
-  our    100644 dee56f6f0fff77036d78caa38bafeb385e572bf4 app/styles/ui/window/_app-menu-bar.scss
-@@ -10,12 +10,19 @@
-     }
-   }
-
-+  .toolbar-dropdown.open > .toolbar-button > button {
-+    background-color: var(--app-menu-button-active-background-color);
-+    color: var(--app-menu-button-active-color);
-+  }
-+
-   .toolbar-dropdown:not(.open) > .toolbar-button > button {
--    color: var(--toolbar-text-color);
-+    color: var(--app-menu-button-color);
-+    background: transparent;
-
-     &:hover,
-     &:focus {
--      color: var(--toolbar-button-color);
-+      color: var(--app-menu-button-hover-color);
-+      background: var(--app-menu-button-hover-background-color);
-     }
-   }
-
-@@ -39,8 +46,25 @@
-     pointer-events: none;
-
-     .menu-pane {
-+      --background-color: var(--app-menu-pane-background-color);
-       background: var(--background-color);
-+
-+      --text-color: var(--app-menu-pane-color);
-+      color: var(--text-color);
-+
-+      --text-secondary-color: var(--app-menu-pane-secondary-color);
-+
-       pointer-events: all;
-     }
-+
-+    .menu-item:hover {
-+      &:not(.disabled) {
-+        --text-color: var(--box-selected-active-text-color);
-+        --text-secondary-color: var(--box-selected-active-text-color);
-+
-+        color: var(--text-color);
-+        background-color: var(--box-selected-active-background-color);
-+      }
-+    }
-   }
- }
-merged
-  result 100644 69f1e178d8523dc79986e345766ace7b3aa278c2 app/styles/ui/window/_toast-notification.scss
-  our    100644 965026fe769810b727cc768025c568ede86e918b app/styles/ui/window/_toast-notification.scss
-@@ -14,8 +14,8 @@
-   .toast-notification {
-     padding: var(--spacing) var(--spacing-double);
-     min-width: 100px;
--    background: rgba($gray-900, 0.6);
--    color: $gray-000;
-+    background: var(--toast-notification-background-color);
-+    color: var(--toast-notification-color);
-     text-align: center;
-     border-radius: 100px;
-     font-size: var(--font-size-md);
-merged
-  result 100644 0e9a54a357e4abc1b90c957b3f2b5b9d770d63a9 app/styles/ui/window/_zoom-info.scss
-  our    100644 0c6db84cbb5f535dedef4192e2e914f5ab4ce20d app/styles/ui/window/_zoom-info.scss
-@@ -14,8 +14,8 @@
-   & > div {
-     padding: var(--spacing);
-     min-width: 100px;
--    background: rgba($gray-900, 0.6);
--    color: $gray-000;
-+    background: var(--toast-notification-background-color);
-+    color: var(--toast-notification-color);
-     text-align: center;
-     border-radius: 100px;
-     font-size: var(--font-size-md);
-removed in remote
-  base   100755 a5d7b84a673458d14d9aab082183a1968c2c7492 app/test/fixtures/submodule-basic-setup/_git/modules/foo/submodule/hooks/applypatch-msg.sample
-  our    100755 a5d7b84a673458d14d9aab082183a1968c2c7492 app/test/fixtures/submodule-basic-setup/_git/modules/foo/submodule/hooks/applypatch-msg.sample
-@@ -1,15 +0,0 @@
--#!/bin/sh
--#
--# An example hook script to check the commit log message taken by
--# applypatch from an e-mail message.
--#
--# The hook should exit with non-zero status after issuing an
--# appropriate message if it wants to stop the commit.  The hook is
--# allowed to edit the commit message file.
--#
--# To enable this hook, rename this file to "applypatch-msg".
--
--. git-sh-setup
--commitmsg="$(git rev-parse --git-path hooks/commit-msg)"
--test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"}
--:
-removed in remote
-  base   100755 b58d1184a9d43a39c0d95f32453efc78581877d6 app/test/fixtures/submodule-basic-setup/_git/modules/foo/submodule/hooks/commit-msg.sample
-  our    100755 b58d1184a9d43a39c0d95f32453efc78581877d6 app/test/fixtures/submodule-basic-setup/_git/modules/foo/submodule/hooks/commit-msg.sample
-@@ -1,24 +0,0 @@
--#!/bin/sh
--#
--# An example hook script to check the commit log message.
--# Called by "git commit" with one argument, the name of the file
--# that has the commit message.  The hook should exit with non-zero
--# status after issuing an appropriate message if it wants to stop the
--# commit.  The hook is allowed to edit the commit message file.
--#
--# To enable this hook, rename this file to "commit-msg".
--
--# Uncomment the below to add a Signed-off-by line to the message.
--# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
--# hook is more suited to it.
--#
--# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
--# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
--
--# This example catches duplicate Signed-off-by lines.
--
--test "" = "$(grep '^Signed-off-by: ' "$1" |
--	 sort | uniq -c | sed -e '/^[ 	]*1[ 	]/d')" || {
--	echo >&2 Duplicate Signed-off-by lines.
--	exit 1
--}
-removed in remote
-  base   100755 ec17ec1939b7c3e86b7cb6c0c4de6b0818a7e75e app/test/fixtures/submodule-basic-setup/_git/modules/foo/submodule/hooks/post-update.sample
-  our    100755 ec17ec1939b7c3e86b7cb6c0c4de6b0818a7e75e app/test/fixtures/submodule-basic-setup/_git/modules/foo/submodule/hooks/post-update.sample
-@@ -1,8 +0,0 @@
--#!/bin/sh
--#
--# An example hook script to prepare a packed repository for use over
--# dumb transports.
--#
--# To enable this hook, rename this file to "post-update".
--
--exec git update-server-info
-removed in remote
-  base   100755 4142082bcb939bbc17985a69ba748491ac6b62a5 app/test/fixtures/submodule-basic-setup/_git/modules/foo/submodule/hooks/pre-applypatch.sample
-  our    100755 4142082bcb939bbc17985a69ba748491ac6b62a5 app/test/fixtures/submodule-basic-setup/_git/modules/foo/submodule/hooks/pre-applypatch.sample
-@@ -1,14 +0,0 @@
--#!/bin/sh
--#
--# An example hook script to verify what is about to be committed
--# by applypatch from an e-mail message.
--#
--# The hook should exit with non-zero status after issuing an
--# appropriate message if it wants to stop the commit.
--#
--# To enable this hook, rename this file to "pre-applypatch".
--
--. git-sh-setup
--precommit="$(git rev-parse --git-path hooks/pre-commit)"
--test -x "$precommit" && exec "$precommit" ${1+"$@"}
--:
-removed in remote
-  base   100755 68d62d5446d963dc69006ad9a83907c6690f92c1 app/test/fixtures/submodule-basic-setup/_git/modules/foo/submodule/hooks/pre-commit.sample
-  our    100755 68d62d5446d963dc69006ad9a83907c6690f92c1 app/test/fixtures/submodule-basic-setup/_git/modules/foo/submodule/hooks/pre-commit.sample
-@@ -1,49 +0,0 @@
--#!/bin/sh
--#
--# An example hook script to verify what is about to be committed.
--# Called by "git commit" with no arguments.  The hook should
--# exit with non-zero status after issuing an appropriate message if
--# it wants to stop the commit.
--#
--# To enable this hook, rename this file to "pre-commit".
--
--if git rev-parse --verify HEAD >/dev/null 2>&1
--then
--	against=HEAD
--else
--	# Initial commit: diff against an empty tree object
--	against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
--fi
--
--# If you want to allow non-ASCII filenames set this variable to true.
--allownonascii=$(git config --bool hooks.allownonascii)
--
--# Redirect output to stderr.
--exec 1>&2
--
--# Cross platform projects tend to avoid non-ASCII filenames; prevent
--# them from being added to the repository. We exploit the fact that the
--# printable range starts at the space character and ends with tilde.
--if [ "$allownonascii" != "true" ] &&
--	# Note that the use of brackets around a tr range is ok here, (it's
--	# even required, for portability to Solaris 10's /usr/bin/tr), since
--	# the square bracket bytes happen to fall in the designated range.
--	test $(git diff --cached --name-only --diff-filter=A -z $against |
--	  LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
--then
--	cat <<\EOF
--Error: Attempt to add a non-ASCII file name.
--
--This can cause problems if you want to work with people on other platforms.
--
--To be portable it is advisable to rename the file.
--
--If you know what you are doing you can disable this check using:
--
--  git config hooks.allownonascii true
--EOF
--	exit 1
--fi
--
--# If there are whitespace errors, print the offending file names and fail.
--exec git diff-index --check --cached $against --
-removed in remote
-  base   100755 6187dbf4390fc6e28445dd3d988aefb9d1111988 app/test/fixtures/submodule-basic-setup/_git/modules/foo/submodule/hooks/pre-push.sample
-  our    100755 6187dbf4390fc6e28445dd3d988aefb9d1111988 app/test/fixtures/submodule-basic-setup/_git/modules/foo/submodule/hooks/pre-push.sample
-@@ -1,53 +0,0 @@
--#!/bin/sh
--
--# An example hook script to verify what is about to be pushed.  Called by "git
--# push" after it has checked the remote status, but before anything has been
--# pushed.  If this script exits with a non-zero status nothing will be pushed.
--#
--# This hook is called with the following parameters:
--#
--# $1 -- Name of the remote to which the push is being done
--# $2 -- URL to which the push is being done
--#
--# If pushing without using a named remote those arguments will be equal.
--#
--# Information about the commits which are being pushed is supplied as lines to
--# the standard input in the form:
--#
--#   <local ref> <local sha1> <remote ref> <remote sha1>
--#
--# This sample shows how to prevent push of commits where the log message starts
--# with "WIP" (work in progress).
--
--remote="$1"
--url="$2"
--
--z40=0000000000000000000000000000000000000000
--
--while read local_ref local_sha remote_ref remote_sha
--do
--	if [ "$local_sha" = $z40 ]
--	then
--		# Handle delete
--		:
--	else
--		if [ "$remote_sha" = $z40 ]
--		then
--			# New branch, examine all commits
--			range="$local_sha"
--		else
--			# Update to existing branch, examine new commits
--			range="$remote_sha..$local_sha"
--		fi
--
--		# Check for WIP commit
--		commit=`git rev-list -n 1 --grep '^WIP' "$range"`
--		if [ -n "$commit" ]
--		then
--			echo >&2 "Found WIP commit in $local_ref, not pushing"
--			exit 1
--		fi
--	fi
--done
--
--exit 0
-removed in remote
-  base   100755 6cbef5c370d8c3486ca85423dd70440c5e0a2aa2 app/test/fixtures/submodule-basic-setup/_git/modules/foo/submodule/hooks/pre-rebase.sample
-  our    100755 6cbef5c370d8c3486ca85423dd70440c5e0a2aa2 app/test/fixtures/submodule-basic-setup/_git/modules/foo/submodule/hooks/pre-rebase.sample
-@@ -1,169 +0,0 @@
--#!/bin/sh
--#
--# Copyright (c) 2006, 2008 Junio C Hamano
--#
--# The "pre-rebase" hook is run just before "git rebase" starts doing
--# its job, and can prevent the command from running by exiting with
--# non-zero status.
--#
--# The hook is called with the following parameters:
--#
--# $1 -- the upstream the series was forked from.
--# $2 -- the branch being rebased (or empty when rebasing the current branch).
--#
--# This sample shows how to prevent topic branches that are already
--# merged to 'next' branch from getting rebased, because allowing it
--# would result in rebasing already published history.
--
--publish=next
--basebranch="$1"
--if test "$#" = 2
--then
--	topic="refs/heads/$2"
--else
--	topic=`git symbolic-ref HEAD` ||
--	exit 0 ;# we do not interrupt rebasing detached HEAD
--fi
--
--case "$topic" in
--refs/heads/??/*)
--	;;
--*)
--	exit 0 ;# we do not interrupt others.
--	;;
--esac
--
--# Now we are dealing with a topic branch being rebased
--# on top of master.  Is it OK to rebase it?
--
--# Does the topic really exist?
--git show-ref -q "$topic" || {
--	echo >&2 "No such branch $topic"
--	exit 1
--}
--
--# Is topic fully merged to master?
--not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
--if test -z "$not_in_master"
--then
--	echo >&2 "$topic is fully merged to master; better remove it."
--	exit 1 ;# we could allow it, but there is no point.
--fi
--
--# Is topic ever merged to next?  If so you should not be rebasing it.
--only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
--only_next_2=`git rev-list ^master           ${publish} | sort`
--if test "$only_next_1" = "$only_next_2"
--then
--	not_in_topic=`git rev-list "^$topic" master`
--	if test -z "$not_in_topic"
--	then
--		echo >&2 "$topic is already up to date with master"
--		exit 1 ;# we could allow it, but there is no point.
--	else
--		exit 0
--	fi
--else
--	not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
--	/usr/bin/perl -e '
--		my $topic = $ARGV[0];
--		my $msg = "* $topic has commits already merged to public branch:\n";
--		my (%not_in_next) = map {
--			/^([0-9a-f]+) /;
--			($1 => 1);
--		} split(/\n/, $ARGV[1]);
--		for my $elem (map {
--				/^([0-9a-f]+) (.*)$/;
--				[$1 => $2];
--			} split(/\n/, $ARGV[2])) {
--			if (!exists $not_in_next{$elem->[0]}) {
--				if ($msg) {
--					print STDERR $msg;
--					undef $msg;
--				}
--				print STDERR " $elem->[1]\n";
--			}
--		}
--	' "$topic" "$not_in_next" "$not_in_master"
--	exit 1
--fi
--
--<<\DOC_END
--
--This sample hook safeguards topic branches that have been
--published from being rewound.
--
--The workflow assumed here is:
--
-- * Once a topic branch forks from "master", "master" is never
--   merged into it again (either directly or indirectly).
--
-- * Once a topic branch is fully cooked and merged into "master",
--   it is deleted.  If you need to build on top of it to correct
--   earlier mistakes, a new topic branch is created by forking at
--   the tip of the "master".  This is not strictly necessary, but
--   it makes it easier to keep your history simple.
--
-- * Whenever you need to test or publish your changes to topic
--   branches, merge them into "next" branch.
--
--The script, being an example, hardcodes the publish branch name
--to be "next", but it is trivial to make it configurable via
--$GIT_DIR/config mechanism.
--
--With this workflow, you would want to know:
--
--(1) ... if a topic branch has ever been merged to "next".  Young
--    topic branches can have stupid mistakes you would rather
--    clean up before publishing, and things that have not been
--    merged into other branches can be easily rebased without
--    affecting other people.  But once it is published, you would
--    not want to rewind it.
--
--(2) ... if a topic branch has been fully merged to "master".
--    Then you can delete it.  More importantly, you should not
--    build on top of it -- other people may already want to
--    change things related to the topic as patches against your
--    "master", so if you need further changes, it is better to
--    fork the topic (perhaps with the same name) afresh from the
--    tip of "master".
--
--Let's look at this example:
--
--		   o---o---o---o---o---o---o---o---o---o "next"
--		  /       /           /           /
--		 /   a---a---b A     /           /
--		/   /               /           /
--	       /   /   c---c---c---c B         /
--	      /   /   /             \         /
--	     /   /   /   b---b C     \       /
--	    /   /   /   /             \     /
--    ---o---o---o---o---o---o---o---o---o---o---o "master"
--
--
--A, B and C are topic branches.
--
-- * A has one fix since it was merged up to "next".
--
-- * B has finished.  It has been fully merged up to "master" and "next",
--   and is ready to be deleted.
--
-- * C has not merged to "next" at all.
--
--We would want to allow C to be rebased, refuse A, and encourage
--B to be deleted.
--
--To compute (1):
--
--	git rev-list ^master ^topic next
--	git rev-list ^master        next
--
--	if these match, topic has not merged in next at all.
--
--To compute (2):
--
--	git rev-list master..topic
--
--	if this is empty, it is fully merged to "master".
--
--DOC_END
-removed in remote
-  base   100755 a1fd29ec14823d8bc4a8d1a2cfe35451580f5118 app/test/fixtures/submodule-basic-setup/_git/modules/foo/submodule/hooks/pre-receive.sample
-  our    100755 a1fd29ec14823d8bc4a8d1a2cfe35451580f5118 app/test/fixtures/submodule-basic-setup/_git/modules/foo/submodule/hooks/pre-receive.sample
-@@ -1,24 +0,0 @@
--#!/bin/sh
--#
--# An example hook script to make use of push options.
--# The example simply echoes all push options that start with 'echoback='
--# and rejects all pushes when the "reject" push option is used.
--#
--# To enable this hook, rename this file to "pre-receive".
--
--if test -n "$GIT_PUSH_OPTION_COUNT"
--then
--	i=0
--	while test "$i" -lt "$GIT_PUSH_OPTION_COUNT"
--	do
--		eval "value=\$GIT_PUSH_OPTION_$i"
--		case "$value" in
--		echoback=*)
--			echo "echo from the pre-receive-hook: ${value#*=}" >&2
--			;;
--		reject)
--			exit 1
--		esac
--		i=$((i + 1))
--	done
--fi
-removed in remote
-  base   100755 10fa14c5ab0134436e2ae435138bf921eb477c60 app/test/fixtures/submodule-basic-setup/_git/modules/foo/submodule/hooks/prepare-commit-msg.sample
-  our    100755 10fa14c5ab0134436e2ae435138bf921eb477c60 app/test/fixtures/submodule-basic-setup/_git/modules/foo/submodule/hooks/prepare-commit-msg.sample
-@@ -1,42 +0,0 @@
--#!/bin/sh
--#
--# An example hook script to prepare the commit log message.
--# Called by "git commit" with the name of the file that has the
--# commit message, followed by the description of the commit
--# message's source.  The hook's purpose is to edit the commit
--# message file.  If the hook fails with a non-zero status,
--# the commit is aborted.
--#
--# To enable this hook, rename this file to "prepare-commit-msg".
--
--# This hook includes three examples. The first one removes the
--# "# Please enter the commit message..." help message.
--#
--# The second includes the output of "git diff --name-status -r"
--# into the message, just before the "git status" output.  It is
--# commented because it doesn't cope with --amend or with squashed
--# commits.
--#
--# The third example adds a Signed-off-by line to the message, that can
--# still be edited.  This is rarely a good idea.
--
--COMMIT_MSG_FILE=$1
--COMMIT_SOURCE=$2
--SHA1=$3
--
--/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE"
--
--# case "$COMMIT_SOURCE,$SHA1" in
--#  ,|template,)
--#    /usr/bin/perl -i.bak -pe '
--#       print "\n" . `git diff --cached --name-status -r`
--# 	 if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;;
--#  *) ;;
--# esac
--
--# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
--# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE"
--# if test -z "$COMMIT_SOURCE"
--# then
--#   /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE"
--# fi
-removed in remote
-  base   100755 80ba94135cc378364af9d3cb2450df48e51faf2c app/test/fixtures/submodule-basic-setup/_git/modules/foo/submodule/hooks/update.sample
-  our    100755 80ba94135cc378364af9d3cb2450df48e51faf2c app/test/fixtures/submodule-basic-setup/_git/modules/foo/submodule/hooks/update.sample
-@@ -1,128 +0,0 @@
--#!/bin/sh
--#
--# An example hook script to block unannotated tags from entering.
--# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
--#
--# To enable this hook, rename this file to "update".
--#
--# Config
--# ------
--# hooks.allowunannotated
--#   This boolean sets whether unannotated tags will be allowed into the
--#   repository.  By default they won't be.
--# hooks.allowdeletetag
--#   This boolean sets whether deleting tags will be allowed in the
--#   repository.  By default they won't be.
--# hooks.allowmodifytag
--#   This boolean sets whether a tag may be modified after creation. By default
--#   it won't be.
--# hooks.allowdeletebranch
--#   This boolean sets whether deleting branches will be allowed in the
--#   repository.  By default they won't be.
--# hooks.denycreatebranch
--#   This boolean sets whether remotely creating branches will be denied
--#   in the repository.  By default this is allowed.
--#
--
--# --- Command line
--refname="$1"
--oldrev="$2"
--newrev="$3"
--
--# --- Safety check
--if [ -z "$GIT_DIR" ]; then
--	echo "Don't run this script from the command line." >&2
--	echo " (if you want, you could supply GIT_DIR then run" >&2
--	echo "  $0 <ref> <oldrev> <newrev>)" >&2
--	exit 1
--fi
--
--if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
--	echo "usage: $0 <ref> <oldrev> <newrev>" >&2
--	exit 1
--fi
--
--# --- Config
--allowunannotated=$(git config --bool hooks.allowunannotated)
--allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
--denycreatebranch=$(git config --bool hooks.denycreatebranch)
--allowdeletetag=$(git config --bool hooks.allowdeletetag)
--allowmodifytag=$(git config --bool hooks.allowmodifytag)
--
--# check for no description
--projectdesc=$(sed -e '1q' "$GIT_DIR/description")
--case "$projectdesc" in
--"Unnamed repository"* | "")
--	echo "*** Project description file hasn't been set" >&2
--	exit 1
--	;;
--esac
--
--# --- Check types
--# if $newrev is 0000...0000, it's a commit to delete a ref.
--zero="0000000000000000000000000000000000000000"
--if [ "$newrev" = "$zero" ]; then
--	newrev_type=delete
--else
--	newrev_type=$(git cat-file -t $newrev)
--fi
--
--case "$refname","$newrev_type" in
--	refs/tags/*,commit)
--		# un-annotated tag
--		short_refname=${refname##refs/tags/}
--		if [ "$allowunannotated" != "true" ]; then
--			echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
--			echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
--			exit 1
--		fi
--		;;
--	refs/tags/*,delete)
--		# delete tag
--		if [ "$allowdeletetag" != "true" ]; then
--			echo "*** Deleting a tag is not allowed in this repository" >&2
--			exit 1
--		fi
--		;;
--	refs/tags/*,tag)
--		# annotated tag
--		if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
--		then
--			echo "*** Tag '$refname' already exists." >&2
--			echo "*** Modifying a tag is not allowed in this repository." >&2
--			exit 1
--		fi
--		;;
--	refs/heads/*,commit)
--		# branch
--		if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
--			echo "*** Creating a branch is not allowed in this repository" >&2
--			exit 1
--		fi
--		;;
--	refs/heads/*,delete)
--		# delete branch
--		if [ "$allowdeletebranch" != "true" ]; then
--			echo "*** Deleting a branch is not allowed in this repository" >&2
--			exit 1
--		fi
--		;;
--	refs/remotes/*,commit)
--		# tracking branch
--		;;
--	refs/remotes/*,delete)
--		# delete tracking branch
--		if [ "$allowdeletebranch" != "true" ]; then
--			echo "*** Deleting a tracking branch is not allowed in this repository" >&2
--			exit 1
--		fi
--		;;
--	*)
--		# Anything else (is there anything else?)
--		echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
--		exit 1
--		;;
--esac
--
--# --- Finished
--exit 0
-merged
-  result 100644 c6c9857c1f579b979bb63020edfeee5cd8c1c3b2 app/test/helpers/repositories.ts
-  our    100644 684c5668ef4b431203378ee88185530b2bb7cf6f app/test/helpers/repositories.ts
-@@ -23,7 +23,9 @@
-  *
-  * @returns The path to the set up fixture repository.
-  */
--export function setupFixtureRepository(repositoryName: string): string {
-+export async function setupFixtureRepository(
-+  repositoryName: string
-+): Promise<string> {
-   const testRepoFixturePath = Path.join(
-     __dirname,
-     '..',
-@@ -31,9 +33,9 @@
-     repositoryName
-   )
-   const testRepoPath = _temp.mkdirSync('desktop-git-test-')
--  FSE.copySync(testRepoFixturePath, testRepoPath)
-+  await FSE.copy(testRepoFixturePath, testRepoPath)
-
--  FSE.renameSync(
-+  await FSE.rename(
-     Path.join(testRepoPath, '_git'),
-     Path.join(testRepoPath, '.git')
-   )
-@@ -49,11 +51,11 @@
-     entry => Path.basename(entry.path) === '_git'
-   )
-
--  submodules.forEach(entry => {
--    const directory = Path.dirname(entry.path)
-+  for (const submodule of submodules) {
-+    const directory = Path.dirname(submodule.path)
-     const newPath = Path.join(directory, '.git')
--    FSE.renameSync(entry.path, newPath)
--  })
-+    await FSE.rename(submodule.path, newPath)
-+  }
-
-   return testRepoPath
- }
-@@ -84,19 +86,19 @@
-   const repo = await setupEmptyRepository()
-   const filePath = Path.join(repo.path, 'foo')
-
--  FSE.writeFileSync(filePath, '')
-+  await FSE.writeFile(filePath, '')
-   await GitProcess.exec(['add', 'foo'], repo.path)
-   await GitProcess.exec(['commit', '-m', 'Commit'], repo.path)
-
-   await GitProcess.exec(['branch', 'other-branch'], repo.path)
-
--  FSE.writeFileSync(filePath, 'b1')
-+  await FSE.writeFile(filePath, 'b1')
-   await GitProcess.exec(['add', 'foo'], repo.path)
-   await GitProcess.exec(['commit', '-m', 'Commit'], repo.path)
-
-   await GitProcess.exec(['checkout', 'other-branch'], repo.path)
-
--  FSE.writeFileSync(filePath, 'b2')
-+  await FSE.writeFile(filePath, 'b2')
-   await GitProcess.exec(['add', 'foo'], repo.path)
-   await GitProcess.exec(['commit', '-m', 'Commit'], repo.path)
-
-merged
-  result 100644 32e6cc0b6bac7d1adf6b538418ecc086354b1b67 app/test/unit/app-store-test.ts
-  our    100644 bd8253abfa8404e42377b4b26ffe52f11269f273 app/test/unit/app-store-test.ts
-@@ -1,9 +1,7 @@
--/* eslint-disable no-sync */
--
--import { expect } from 'chai'
-+import { expect, AssertionError } from 'chai'
-
- import * as Path from 'path'
--import * as Fs from 'fs'
-+import * as FSE from 'fs-extra'
- import { GitProcess } from 'dugite'
-
- import {
-@@ -30,7 +28,7 @@
- import { StatsStore } from '../../src/lib/stats'
-
- import {
--  RepositorySection,
-+  RepositorySectionTab,
-   SelectionType,
-   IRepositoryState,
- } from '../../src/lib/app-state'
-@@ -91,15 +89,15 @@
-   describe('undo first commit', () => {
-     function getAppState(appStore: AppStore): IRepositoryState {
-       const selectedState = appStore.getState().selectedState
--      if (!selectedState) {
--        throw new chai.AssertionError('No selected state for AppStore')
-+      if (selectedState == null) {
-+        throw new AssertionError('No selected state for AppStore')
-       }
-
-       switch (selectedState.type) {
-         case SelectionType.Repository:
-           return selectedState.state
-         default:
--          throw new chai.AssertionError(
-+          throw new AssertionError(
-             `Got selected state of type ${
-               selectedState.type
-             } which is not supported.`
-@@ -116,7 +114,7 @@
-       const file = 'README.md'
-       const filePath = Path.join(repo.path, file)
-
--      Fs.writeFileSync(filePath, 'SOME WORDS GO HERE\n')
-+      await FSE.writeFile(filePath, 'SOME WORDS GO HERE\n')
-
-       await GitProcess.exec(['add', file], repo.path)
-       await GitProcess.exec(['commit', '-m', 'added file'], repo.path)
-@@ -135,7 +133,7 @@
-       await appStore._selectRepository(repository)
-       await appStore._changeRepositorySection(
-         repository,
--        RepositorySection.Changes
-+        RepositorySectionTab.Changes
-       )
-
-       let state = getAppState(appStore)
-added in remote
-  their  100644 3b6e1598c0431836c3eb4416278702dcfb36fc7a app/test/unit/fuzzy-find-test.ts
-@@ -0,0 +1,47 @@
-+import { expect } from 'chai'
-+
-+import { match } from '../../src/lib/fuzzy-find'
-+import { getText } from '../../src/ui/lib/filter-list'
-+describe('fuzzy find', () => {
-+  const items = [
-+    {
-+      id: '300',
-+      text: ['add fix for ...', 'opened 5 days ago by bob'],
-+    },
-+    {
-+      id: '500',
-+      text: ['add support', '#4653 opened 3 days ago by damaneice '],
-+    },
-+    {
-+      id: '500',
-+      text: ['add an awesome feature', '#7564 opened 10 days ago by ... '],
-+    },
-+  ]
-+
-+  it('should find matching item when searching by pull request number', () => {
-+    const results = match('4653', items, getText)
-+
-+    expect(results.length).to.equal(1)
-+    expect(results[0].item['text'].join('')).to.include('4653')
-+  })
-+
-+  it('should find matching item when searching by author', () => {
-+    const results = match('damaneice', items, getText)
-+
-+    expect(results.length).to.equal(1)
-+    expect(results[0].item['text'].join('')).to.include('damaneice')
-+  })
-+
-+  it('should find matching item when by title', () => {
-+    const results = match('awesome feature', items, getText)
-+
-+    expect(results.length).to.equal(1)
-+    expect(results[0].item['text'].join('')).to.include('awesome feature')
-+  })
-+
-+  it('should find nothing', () => {
-+    const results = match('$%^', items, getText)
-+
-+    expect(results.length).to.equal(0)
-+  })
-+})
-merged
-  result 100644 e02161f0a2678543f55f2c71f1a61103faa56c1b app/test/unit/git-store-test.ts
-  our    100644 b69dfb902e2537440f7b72b9537c1de1aaf8b113 app/test/unit/git-store-test.ts
-@@ -1,7 +1,5 @@
--/* eslint-disable no-sync */
--
- import { expect } from 'chai'
--import * as Fs from 'fs'
-+import * as FSE from 'fs-extra'
- import * as Path from 'path'
- import { GitProcess } from 'dugite'
-
-@@ -26,18 +24,18 @@
-     const readmeFile = 'README.md'
-     const readmeFilePath = Path.join(repo.path, readmeFile)
-
--    Fs.writeFileSync(readmeFilePath, 'SOME WORDS GO HERE\n')
-+    await FSE.writeFile(readmeFilePath, 'SOME WORDS GO HERE\n')
-
-     const licenseFile = 'LICENSE.md'
-     const licenseFilePath = Path.join(repo.path, licenseFile)
-
--    Fs.writeFileSync(licenseFilePath, 'SOME WORDS GO HERE\n')
-+    await FSE.writeFile(licenseFilePath, 'SOME WORDS GO HERE\n')
-
-     // commit the readme file but leave the license
-     await GitProcess.exec(['add', readmeFile], repo.path)
-     await GitProcess.exec(['commit', '-m', 'added readme file'], repo.path)
-
--    Fs.writeFileSync(readmeFilePath, 'WRITING SOME NEW WORDS\n')
-+    await FSE.writeFile(readmeFilePath, 'WRITING SOME NEW WORDS\n')
-     // setup requires knowing about the current tip
-     await gitStore.loadStatus()
-
-@@ -65,7 +63,7 @@
-     const renamedFile = 'NEW-README.md'
-     const filePath = Path.join(repo.path, file)
-
--    Fs.writeFileSync(filePath, 'SOME WORDS GO HERE\n')
-+    await FSE.writeFile(filePath, 'SOME WORDS GO HERE\n')
-
-     // commit the file, and then rename it
-     await GitProcess.exec(['add', file], repo.path)
-@@ -96,7 +94,7 @@
-       const file = 'README.md'
-       const filePath = Path.join(repo.path, file)
-
--      Fs.writeFileSync(filePath, 'SOME WORDS GO HERE\n')
-+      await FSE.writeFile(filePath, 'SOME WORDS GO HERE\n')
-
-       await GitProcess.exec(['add', file], repo.path)
-       await GitProcess.exec(['commit', '-m', commitMessage], repo.path)
-@@ -199,7 +197,7 @@
-       const file = 'README.md'
-       const filePath = Path.join(repo.path, file)
-
--      Fs.writeFileSync(filePath, 'SOME WORDS GO HERE\n')
-+      await FSE.writeFile(filePath, 'SOME WORDS GO HERE\n')
-
-       let status = await getStatus(repo!)
-       let files = status.workingDirectory.files
-merged
-  result 100644 b8af7e5f1bcd0c13b909dfa237c7d3378bcc683f app/test/unit/git/commit-test.ts
-  our    100644 b5ac688e52bb47f381388bb2ae97547c3766deb5 app/test/unit/git/commit-test.ts
-@@ -1,6 +1,6 @@
--/* eslint-disable no-sync */
--
- import * as path from 'path'
-+import * as FSE from 'fs-extra'
-+
- import { expect } from 'chai'
-
- import { Repository } from '../../../src/models/repository'
-@@ -31,8 +31,6 @@
-   DiffType,
- } from '../../../src/models/diff'
-
--import * as fs from 'fs-extra'
--
- async function getTextDiff(
-   repo: Repository,
-   file: WorkingDirectoryFileChange
-@@ -46,13 +44,16 @@
-   let repository: Repository | null = null
-
-   beforeEach(async () => {
--    const testRepoPath = setupFixtureRepository('test-repo')
-+    const testRepoPath = await setupFixtureRepository('test-repo')
-     repository = new Repository(testRepoPath, -1, null, false)
-   })
-
-   describe('createCommit normal', () => {
-     it('commits the given files', async () => {
--      fs.writeFileSync(path.join(repository!.path, 'README.md'), 'Hi world\n')
-+      await FSE.writeFile(
-+        path.join(repository!.path, 'README.md'),
-+        'Hi world\n'
-+      )
-
-       let status = await getStatus(repository!)
-       let files = status.workingDirectory.files
-@@ -70,7 +71,10 @@
-     })
-
-     it('commit does not strip commentary by default', async () => {
--      fs.writeFileSync(path.join(repository!.path, 'README.md'), 'Hi world\n')
-+      await FSE.writeFile(
-+        path.join(repository!.path, 'README.md'),
-+        'Hi world\n'
-+      )
-
-       const status = await getStatus(repository!)
-       const files = status.workingDirectory.files
-@@ -91,8 +95,8 @@
-     it('can commit for empty repository', async () => {
-       const repo = await setupEmptyRepository()
-
--      fs.writeFileSync(path.join(repo.path, 'foo'), 'foo\n')
--      fs.writeFileSync(path.join(repo.path, 'bar'), 'bar\n')
-+      await FSE.writeFile(path.join(repo.path, 'foo'), 'foo\n')
-+      await FSE.writeFile(path.join(repo.path, 'bar'), 'bar\n')
-
-       const status = await getStatus(repo)
-       const files = status.workingDirectory.files
-@@ -124,7 +128,7 @@
-     it('can commit renames', async () => {
-       const repo = await setupEmptyRepository()
-
--      fs.writeFileSync(path.join(repo.path, 'foo'), 'foo\n')
-+      await FSE.writeFile(path.join(repo.path, 'foo'), 'foo\n')
-
-       await GitProcess.exec(['add', 'foo'], repo.path)
-       await GitProcess.exec(['commit', '-m', 'Initial commit'], repo.path)
-@@ -147,7 +151,7 @@
-
-   describe('createCommit partials', () => {
-     beforeEach(async () => {
--      const testRepoPath = setupFixtureRepository('repo-with-changes')
-+      const testRepoPath = await setupFixtureRepository('repo-with-changes')
-       repository = new Repository(testRepoPath, -1, null, false)
-     })
-
-@@ -383,13 +387,13 @@
-     it('can commit renames with modifications', async () => {
-       const repo = await setupEmptyRepository()
-
--      fs.writeFileSync(path.join(repo.path, 'foo'), 'foo\n')
-+      await FSE.writeFile(path.join(repo.path, 'foo'), 'foo\n')
-
-       await GitProcess.exec(['add', 'foo'], repo.path)
-       await GitProcess.exec(['commit', '-m', 'Initial commit'], repo.path)
-       await GitProcess.exec(['mv', 'foo', 'bar'], repo.path)
-
--      fs.writeFileSync(path.join(repo.path, 'bar'), 'bar\n')
-+      await FSE.writeFile(path.join(repo.path, 'bar'), 'bar\n')
-
-       const status = await getStatus(repo)
-       const files = status.workingDirectory.files
-@@ -411,13 +415,13 @@
-     it('can commit renames with partially selected modifications', async () => {
-       const repo = await setupEmptyRepository()
-
--      fs.writeFileSync(path.join(repo.path, 'foo'), 'line1\n')
-+      await FSE.writeFile(path.join(repo.path, 'foo'), 'line1\n')
-
-       await GitProcess.exec(['add', 'foo'], repo.path)
-       await GitProcess.exec(['commit', '-m', 'Initial commit'], repo.path)
-       await GitProcess.exec(['mv', 'foo', 'bar'], repo.path)
-
--      fs.writeFileSync(path.join(repo.path, 'bar'), 'line1\nline2\nline3\n')
-+      await FSE.writeFile(path.join(repo.path, 'bar'), 'line1\nline2\nline3\n')
-
-       const status = await getStatus(repo)
-       const files = status.workingDirectory.files
-@@ -454,10 +458,12 @@
-       const repo = await setupConflictedRepo()
-       const filePath = path.join(repo.path, 'foo')
-
--      const inMerge = fs.existsSync(path.join(repo.path, '.git', 'MERGE_HEAD'))
-+      const inMerge = await FSE.pathExists(
-+        path.join(repo.path, '.git', 'MERGE_HEAD')
-+      )
-       expect(inMerge).to.equal(true)
-
--      fs.writeFileSync(filePath, 'b1b2')
-+      await FSE.writeFile(filePath, 'b1b2')
-
-       const status = await getStatus(repo)
-       const files = status.workingDirectory.files
-@@ -485,12 +491,12 @@
-       const firstPath = path.join(repo.path, 'first')
-       const secondPath = path.join(repo.path, 'second')
-
--      fs.writeFileSync(firstPath, 'line1\n')
--      fs.writeFileSync(secondPath, 'line2\n')
-+      await FSE.writeFile(firstPath, 'line1\n')
-+      await FSE.writeFile(secondPath, 'line2\n')
-
-       await GitProcess.exec(['add', '.'], repo.path)
-
--      fs.unlinkSync(firstPath)
-+      await FSE.unlink(firstPath)
-
-       status = await getStatus(repo)
-       files = status.workingDirectory.files
-@@ -519,14 +525,14 @@
-       const repo = await setupEmptyRepository()
-
-       const firstPath = path.join(repo.path, 'first')
--      fs.writeFileSync(firstPath, 'line1\n')
-+      await FSE.writeFile(firstPath, 'line1\n')
-
-       await GitProcess.exec(['add', 'first'], repo.path)
-       await GitProcess.exec(['commit', '-am', 'commit first file'], repo.path)
-       await GitProcess.exec(['rm', '--cached', 'first'], repo.path)
-
-       // if the text is now different, everything is fine
--      fs.writeFileSync(firstPath, 'line2\n')
-+      await FSE.writeFile(firstPath, 'line2\n')
-
-       status = await getStatus(repo)
-       files = status.workingDirectory.files
-merged
-  result 100644 d72e598b34da70f1894844dffc261776e7134a67 app/test/unit/git/config-test.ts
-  our    100644 15317f86c3ba7276aff4b60a3953977a2faeb366 app/test/unit/git/config-test.ts
-@@ -1,5 +1,3 @@
--/* eslint-disable no-sync */
--
- import { expect } from 'chai'
-
- import { Repository } from '../../../src/models/repository'
-@@ -15,8 +13,8 @@
- describe('git/config', () => {
-   let repository: Repository | null = null
-
--  beforeEach(() => {
--    const testRepoPath = setupFixtureRepository('test-repo')
-+  beforeEach(async () => {
-+    const testRepoPath = await setupFixtureRepository('test-repo')
-     repository = new Repository(testRepoPath, -1, null, false)
-   })
-
-merged
-  result 100644 9102d54e4ff407253f9f43fc45f7947c8e9bd28f app/test/unit/git/core-test.ts
-  our    100644 31f49752ce15852eb636a19c18f289d48fa9e745 app/test/unit/git/core-test.ts
-@@ -1,5 +1,3 @@
--/* eslint-disable no-sync */
--
- import { expect } from 'chai'
- import { GitError } from 'dugite'
-
-@@ -10,8 +8,8 @@
- describe('git/core', () => {
-   let repository: Repository | null = null
-
--  beforeEach(() => {
--    const testRepoPath = setupFixtureRepository('test-repo')
-+  beforeEach(async () => {
-+    const testRepoPath = await setupFixtureRepository('test-repo')
-     repository = new Repository(testRepoPath, -1, null, false)
-   })
-
-added in remote
-  their  100644 1ed66bd68f5c8720ca2034726118003654d19391 app/test/unit/git/description-test.ts
-@@ -0,0 +1,35 @@
-+import { expect } from 'chai'
-+import * as FSE from 'fs-extra'
-+import * as Path from 'path'
-+
-+import { getGitDescription } from '../../../src/lib/git'
-+import { setupEmptyRepository } from '../../helpers/repositories'
-+
-+describe('git/description', () => {
-+  describe('getGitDescription', () => {
-+    it('returns empty for an initialized repository', async () => {
-+      const repo = await setupEmptyRepository()
-+      const actual = await getGitDescription(repo.path)
-+      expect(actual).equals('')
-+    })
-+
-+    it('returns empty when path is missing', async () => {
-+      const repo = await setupEmptyRepository()
-+      const path = Path.join(repo.path, '.git', 'description')
-+      await FSE.unlink(path)
-+
-+      const actual = await getGitDescription(repo.path)
-+      expect(actual).equals('')
-+    })
-+
-+    it('reads the custom text', async () => {
-+      const expected = 'this is a repository description'
-+      const repo = await setupEmptyRepository()
-+      const path = Path.join(repo.path, '.git', 'description')
-+      await FSE.writeFile(path, expected)
-+
-+      const actual = await getGitDescription(repo.path)
-+      expect(actual).equals(expected)
-+    })
-+  })
-+})
-merged
-  result 100644 70828b75f4fb7701c613f210cfcd5a077c1e6160 app/test/unit/git/diff-test.ts
-  our    100644 e51e778ec9c2cf88a9eeed5a4b7201e8ddbca64f app/test/unit/git/diff-test.ts
-@@ -1,9 +1,7 @@
--/* eslint-disable no-sync */
--
- import { expect } from 'chai'
-
- import * as path from 'path'
--import * as fs from 'fs-extra'
-+import * as FSE from 'fs-extra'
-
- import { Repository } from '../../../src/models/repository'
- import {
-@@ -43,8 +41,8 @@
- describe('git/diff', () => {
-   let repository: Repository | null = null
-
--  beforeEach(() => {
--    const testRepoPath = setupFixtureRepository('repo-with-image-changes')
-+  beforeEach(async () => {
-+    const testRepoPath = await setupFixtureRepository('repo-with-image-changes')
-     repository = new Repository(testRepoPath, -1, null, false)
-   })
-
-@@ -135,7 +133,7 @@
-     })
-
-     it('changes for text are not set', async () => {
--      const testRepoPath = setupFixtureRepository('repo-with-changes')
-+      const testRepoPath = await setupFixtureRepository('repo-with-changes')
-       repository = new Repository(testRepoPath, -1, null, false)
-
-       const diffSelection = DiffSelection.fromInitialSelection(
-@@ -153,8 +151,8 @@
-   })
-
-   describe('getWorkingDirectoryDiff', () => {
--    beforeEach(() => {
--      const testRepoPath = setupFixtureRepository('repo-with-changes')
-+    beforeEach(async () => {
-+      const testRepoPath = await setupFixtureRepository('repo-with-changes')
-       repository = new Repository(testRepoPath, -1, null, false)
-     })
-
-@@ -260,7 +258,7 @@
-     it('is empty for a renamed file', async () => {
-       const repo = await setupEmptyRepository()
-
--      fs.writeFileSync(path.join(repo.path, 'foo'), 'foo\n')
-+      await FSE.writeFile(path.join(repo.path, 'foo'), 'foo\n')
-
-       await GitProcess.exec(['add', 'foo'], repo.path)
-       await GitProcess.exec(['commit', '-m', 'Initial commit'], repo.path)
-@@ -283,13 +281,13 @@
-     it('only shows modifications after move for a renamed and modified file', async () => {
-       const repo = await setupEmptyRepository()
-
--      fs.writeFileSync(path.join(repo.path, 'foo'), 'foo\n')
-+      await FSE.writeFile(path.join(repo.path, 'foo'), 'foo\n')
-
-       await GitProcess.exec(['add', 'foo'], repo.path)
-       await GitProcess.exec(['commit', '-m', 'Initial commit'], repo.path)
-       await GitProcess.exec(['mv', 'foo', 'bar'], repo.path)
-
--      fs.writeFileSync(path.join(repo.path, 'bar'), 'bar\n')
-+      await FSE.writeFile(path.join(repo.path, 'bar'), 'bar\n')
-
-       const status = await getStatus(repo)
-       const files = status.workingDirectory.files
-@@ -309,11 +307,14 @@
-     it('handles unborn repository with mixed state', async () => {
-       const repo = await setupEmptyRepository()
-
--      fs.writeFileSync(path.join(repo.path, 'foo'), 'WRITING THE FIRST LINE\n')
-+      await FSE.writeFile(
-+        path.join(repo.path, 'foo'),
-+        'WRITING THE FIRST LINE\n'
-+      )
-
-       await GitProcess.exec(['add', 'foo'], repo.path)
-
--      fs.writeFileSync(path.join(repo.path, 'foo'), 'WRITING OVER THE TOP\n')
-+      await FSE.writeFile(path.join(repo.path, 'foo'), 'WRITING OVER THE TOP\n')
-
-       const status = await getStatus(repo)
-       const files = status.workingDirectory.files
-@@ -337,7 +338,7 @@
-
-       let lineEnding = '\r\n'
-
--      fs.writeFileSync(
-+      await FSE.writeFile(
-         filePath,
-         `WRITING MANY LINES ${lineEnding} USING THIS LINE ENDING ${lineEnding} TO SHOW THAT GIT${lineEnding} WILL INSERT IT WITHOUT CHANGING THING ${lineEnding} HA HA BUSINESS`
-       )
-@@ -351,7 +352,7 @@
-       await GitProcess.exec(['config', 'core.autocrlf', 'true'], repo.path)
-       lineEnding = '\n\n'
-
--      fs.writeFileSync(
-+      await FSE.writeFile(
-         filePath,
-         `WRITING MANY LINES ${lineEnding} USING THIS LINE ENDING ${lineEnding} TO SHOW THAT GIT${lineEnding} WILL INSERT IT WITHOUT CHANGING THING ${lineEnding} HA HA BUSINESS`
-       )
-@@ -375,7 +376,7 @@
-       const filePath = path.join(repo.path, 'foo')
-
-       const testString = 'here are some cool characters: • é  漢字'
--      fs.writeFileSync(filePath, testString)
-+      await FSE.writeFile(filePath, testString)
-
-       const status = await getStatus(repo)
-       const files = status.workingDirectory.files
-merged
-  result 100644 49b5c229ff03e3bb85d45773693b29bcf664cfa0 app/test/unit/git/for-each-ref-test.ts
-  our    100644 489ff8c45295f4effd89131fe26c32b9caeb4686 app/test/unit/git/for-each-ref-test.ts
-@@ -10,8 +10,8 @@
- describe('git/for-each-ref', () => {
-   let repository: Repository | null = null
-
--  beforeEach(() => {
--    const testRepoPath = setupFixtureRepository('repo-with-many-refs')
-+  beforeEach(async () => {
-+    const testRepoPath = await setupFixtureRepository('repo-with-many-refs')
-     repository = new Repository(testRepoPath, -1, null, false)
-   })
-
-added in remote
-  their  100644 efa84e67645f24f1b4905d9815b78c84b1debcb5 app/test/unit/git/git-attributes-test.ts
-@@ -0,0 +1,18 @@
-+import { expect } from 'chai'
-+import * as FSE from 'fs-extra'
-+import * as Path from 'path'
-+
-+import { setupEmptyRepository } from '../../helpers/repositories'
-+import { writeGitAttributes } from '../../../src/ui/add-repository/git-attributes'
-+
-+describe('git/git-attributes', () => {
-+  describe('writeGitAttributes', () => {
-+    it('initializes a .gitattributes file', async () => {
-+      const repo = await setupEmptyRepository()
-+      await writeGitAttributes(repo.path)
-+      const expectedPath = Path.join(repo.path, '.gitattributes')
-+      const contents = await FSE.readFile(expectedPath, 'utf8')
-+      expect(contents).to.contain('* text=auto')
-+    })
-+  })
-+})
-merged
-  result 100644 4b5b3f160a0264cf66886c0aa339b1fad38181b1 app/test/unit/git/log-test.ts
-  our    100644 ad903fd317c8097f5cb62d13f559c282be3f0e55 app/test/unit/git/log-test.ts
-@@ -1,5 +1,3 @@
--/* eslint-disable no-sync */
--
- import { expect } from 'chai'
-
- import { Repository } from '../../../src/models/repository'
-@@ -11,8 +9,8 @@
- describe('git/log', () => {
-   let repository: Repository | null = null
-
--  beforeEach(() => {
--    const testRepoPath = setupFixtureRepository('test-repo')
-+  beforeEach(async () => {
-+    const testRepoPath = await setupFixtureRepository('test-repo')
-     repository = new Repository(testRepoPath, -1, null, false)
-   })
-
-@@ -48,7 +46,9 @@
-     })
-
-     it('detects renames', async () => {
--      const testRepoPath = setupFixtureRepository('rename-history-detection')
-+      const testRepoPath = await setupFixtureRepository(
-+        'rename-history-detection'
-+      )
-       repository = new Repository(testRepoPath, -1, null, false)
-
-       const first = await getChangedFiles(repository, '55bdecb')
-@@ -65,7 +65,9 @@
-     })
-
-     it('detect copies', async () => {
--      const testRepoPath = setupFixtureRepository('copies-history-detection')
-+      const testRepoPath = await setupFixtureRepository(
-+        'copies-history-detection'
-+      )
-       repository = new Repository(testRepoPath, -1, null, false)
-
-       // ensure the test repository is configured to detect copies
-merged
-  result 100644 26ef5a516cc51061106a84706a4b53aba7a4bae5 app/test/unit/git/reflog-test.ts
-  our    100644 753f89bdff58df67c59ada62fd5318e25de1f0c9 app/test/unit/git/reflog-test.ts
-@@ -1,5 +1,3 @@
--/* eslint-disable no-sync */
--
- import { expect } from 'chai'
-
- import { Repository } from '../../../src/models/repository'
-@@ -28,8 +26,8 @@
- describe('git/reflog', () => {
-   let repository: Repository | null = null
-
--  beforeEach(() => {
--    const testRepoPath = setupFixtureRepository('test-repo')
-+  beforeEach(async () => {
-+    const testRepoPath = await setupFixtureRepository('test-repo')
-     repository = new Repository(testRepoPath, -1, null, false)
-   })
-
-merged
-  result 100644 ec4c2f0abae62b3b2e24b3d1f8d4c026202866ae app/test/unit/git/remote-test.ts
-  our    100644 0c31a4654bc26c2af1888154faf1ed1c5b074f9e app/test/unit/git/remote-test.ts
-@@ -1,5 +1,3 @@
--/* eslint-disable no-sync */
--
- import { expect } from 'chai'
-
- import { Repository } from '../../../src/models/repository'
-@@ -17,7 +15,9 @@
- describe('git/remote', () => {
-   describe('getRemotes', () => {
-     it('should return both remotes', async () => {
--      const testRepoPath = setupFixtureRepository('repo-with-multiple-remotes')
-+      const testRepoPath = await setupFixtureRepository(
-+        'repo-with-multiple-remotes'
-+      )
-       const repository = new Repository(testRepoPath, -1, null, false)
-
-       // NB: We don't check for exact URL equality because CircleCI's git config
-@@ -36,7 +36,9 @@
-
-   describe('getDefaultRemote', () => {
-     it('returns origin when multiple remotes found', async () => {
--      const testRepoPath = setupFixtureRepository('repo-with-multiple-remotes')
-+      const testRepoPath = await setupFixtureRepository(
-+        'repo-with-multiple-remotes'
-+      )
-       const repository = new Repository(testRepoPath, -1, null, false)
-
-       const result = await getDefaultRemote(repository)
-@@ -45,7 +47,9 @@
-     })
-
-     it('returns something when origin removed', async () => {
--      const testRepoPath = setupFixtureRepository('repo-with-multiple-remotes')
-+      const testRepoPath = await setupFixtureRepository(
-+        'repo-with-multiple-remotes'
-+      )
-       const repository = new Repository(testRepoPath, -1, null, false)
-       await removeRemote(repository, 'origin')
-
-merged
-  result 100644 ae434a7ebf90e34582704265a7bee208e3ee30e1 app/test/unit/git/reset-test.ts
-  our    100644 de0b8ecb1767d94f933eb81fdb46f8030e0ed0d1 app/test/unit/git/reset-test.ts
-@@ -1,5 +1,3 @@
--/* eslint-disable no-sync */
--
- import * as path from 'path'
- import { expect } from 'chai'
-
-@@ -9,13 +7,13 @@
- import { setupFixtureRepository } from '../../helpers/repositories'
- import { GitProcess } from 'dugite'
-
--import * as fs from 'fs-extra'
-+import * as FSE from 'fs-extra'
-
- describe('git/reset', () => {
-   let repository: Repository | null = null
-
--  beforeEach(() => {
--    const testRepoPath = setupFixtureRepository('test-repo')
-+  beforeEach(async () => {
-+    const testRepoPath = await setupFixtureRepository('test-repo')
-     repository = new Repository(testRepoPath, -1, null, false)
-   })
-
-@@ -25,7 +23,7 @@
-       const fileName = 'README.md'
-       const filePath = path.join(repoPath, fileName)
-
--      fs.writeFileSync(filePath, 'Hi world\n')
-+      await FSE.writeFile(filePath, 'Hi world\n')
-
-       await reset(repository!, GitResetMode.Hard, 'HEAD')
-
-@@ -35,17 +33,17 @@
-   })
-
-   describe('resetPaths', () => {
--    it('resets discarded staged file', async () => {
-+    it.skip('resets discarded staged file', async () => {
-       const repoPath = repository!.path
-       const fileName = 'README.md'
-       const filePath = path.join(repoPath, fileName)
-
-       // modify the file
--      fs.writeFileSync(filePath, 'Hi world\n')
-+      await FSE.writeFile(filePath, 'Hi world\n')
-
-       // stage the file, then delete it to mimic discarding
-       GitProcess.exec(['add', fileName], repoPath)
--      fs.unlinkSync(filePath)
-+      await FSE.unlink(filePath)
-
-       await resetPaths(repository!, GitResetMode.Mixed, 'HEAD', [filePath])
-
-merged
-  result 100644 9f59f8eafa96145f5a0182713ae312a61d5633c6 app/test/unit/git/rev-parse-test.ts
-  our    100644 2fe66109a93a488e1d52f361aa11b5fd03ab6c4d app/test/unit/git/rev-parse-test.ts
-@@ -1,7 +1,5 @@
--/* eslint-disable no-sync */
--
- import * as path from 'path'
--import * as Fs from 'fs'
-+import * as FSE from 'fs-extra'
- import * as os from 'os'
- import { expect } from 'chai'
-
-@@ -16,8 +14,8 @@
- describe('git/rev-parse', () => {
-   let repository: Repository | null = null
-
--  beforeEach(() => {
--    const testRepoPath = setupFixtureRepository('test-repo')
-+  beforeEach(async () => {
-+    const testRepoPath = await setupFixtureRepository('test-repo')
-     repository = new Repository(testRepoPath, -1, null, false)
-   })
-
-@@ -39,10 +37,7 @@
-       expect(result).to.equal(repository!.path)
-
-       const subdirPath = path.join(repository!.path, 'subdir')
--
--      await new Promise<void>((resolve, reject) => {
--        Fs.mkdir(subdirPath, e => (e ? reject(e) : resolve()))
--      })
-+      await FSE.mkdir(subdirPath)
-
-       const subDirResult = await getTopLevelWorkingDirectory(repository!.path)
-       expect(subDirResult).to.equal(repository!.path)
-merged
-  result 100644 b70094de837ed6cb2305e65414cd7c4c3403edc0 app/test/unit/git/status-test.ts
-  our    100644 59e49a131e79925c8b8307125053a59d2970ba4e app/test/unit/git/status-test.ts
-@@ -1,7 +1,7 @@
--/* eslint-disable no-sync */
--
- import * as path from 'path'
- import { expect } from 'chai'
-+import * as FSE from 'fs-extra'
-+import { GitProcess } from 'dugite'
-
- import { Repository } from '../../../src/models/repository'
- import { getStatus } from '../../../src/lib/git/status'
-@@ -10,21 +10,21 @@
-   setupEmptyRepository,
- } from '../../helpers/repositories'
- import { AppFileStatus } from '../../../src/models/status'
--import { GitProcess } from 'dugite'
--
--import * as fs from 'fs-extra'
-
- describe('git/status', () => {
-   let repository: Repository | null = null
-
--  beforeEach(() => {
--    const testRepoPath = setupFixtureRepository('test-repo')
-+  beforeEach(async () => {
-+    const testRepoPath = await setupFixtureRepository('test-repo')
-     repository = new Repository(testRepoPath, -1, null, false)
-   })
-
-   describe('getStatus', () => {
-     it('parses changed files', async () => {
--      fs.writeFileSync(path.join(repository!.path, 'README.md'), 'Hi world\n')
-+      await FSE.writeFile(
-+        path.join(repository!.path, 'README.md'),
-+        'Hi world\n'
-+      )
-
-       const status = await getStatus(repository!)
-       const files = status.workingDirectory.files
-@@ -44,7 +44,7 @@
-     it('reflects renames', async () => {
-       const repo = await setupEmptyRepository()
-
--      fs.writeFileSync(path.join(repo.path, 'foo'), 'foo\n')
-+      await FSE.writeFile(path.join(repo.path, 'foo'), 'foo\n')
-
-       await GitProcess.exec(['add', 'foo'], repo.path)
-       await GitProcess.exec(['commit', '-m', 'Initial commit'], repo.path)
-merged
-  result 100644 458f70ab3e9d3c2a72710726ed0ccf67f9644e7c app/test/unit/git/submodule-test.ts
-  our    100644 c03c4406fbdfec1ca3d327273d6fa3bf9fe4c17d app/test/unit/git/submodule-test.ts
-@@ -12,7 +12,7 @@
- describe('git/submodule', () => {
-   describe('listSubmodules', () => {
-     it('returns the submodule entry', async () => {
--      const testRepoPath = setupFixtureRepository('submodule-basic-setup')
-+      const testRepoPath = await setupFixtureRepository('submodule-basic-setup')
-       const repository = new Repository(testRepoPath, -1, null, false)
-       const result = await listSubmodules(repository)
-       expect(result.length).to.equal(1)
-@@ -22,7 +22,7 @@
-     })
-
-     it('returns the expected tag', async () => {
--      const testRepoPath = setupFixtureRepository('submodule-basic-setup')
-+      const testRepoPath = await setupFixtureRepository('submodule-basic-setup')
-       const repository = new Repository(testRepoPath, -1, null, false)
-
-       const submodulePath = path.join(testRepoPath, 'foo', 'submodule')
-@@ -49,7 +49,7 @@
-
-   describe('resetSubmodulePaths', () => {
-     it('update submodule to original commit', async () => {
--      const testRepoPath = setupFixtureRepository('submodule-basic-setup')
-+      const testRepoPath = await setupFixtureRepository('submodule-basic-setup')
-       const repository = new Repository(testRepoPath, -1, null, false)
-
-       const submodulePath = path.join(testRepoPath, 'foo', 'submodule')
-added in remote
-  their  100644 b4f8bad4223c7ca09f796baa5b5bcc5da2d75cac app/test/unit/infer-comparison-branch-test.ts
-@@ -0,0 +1,205 @@
-+import { expect } from 'chai'
-+import { inferComparisonBranch } from '../../src/lib/stores/helpers/infer-comparison-branch'
-+import { Branch, BranchType } from '../../src/models/branch'
-+import { Commit } from '../../src/models/commit'
-+import { CommitIdentity } from '../../src/models/commit-identity'
-+import { GitHubRepository } from '../../src/models/github-repository'
-+import { Owner } from '../../src/models/owner'
-+import { PullRequest, PullRequestRef } from '../../src/models/pull-request'
-+import { Repository } from '../../src/models/repository'
-+import { IRemote } from '../../src/models/remote'
-+import { ComparisonCache } from '../../src/lib/comparison-cache'
-+
-+function createTestCommit(sha: string) {
-+  return new Commit(
-+    sha,
-+    '',
-+    '',
-+    new CommitIdentity('tester', 'tester@test.com', new Date()),
-+    new CommitIdentity('tester', 'tester@test.com', new Date()),
-+    [],
-+    []
-+  )
-+}
-+
-+function createTestBranch(
-+  name: string,
-+  sha: string,
-+  remote: string | null = null
-+) {
-+  return new Branch(name, remote, createTestCommit(sha), BranchType.Local)
-+}
-+
-+function createTestGhRepo(
-+  name: string,
-+  defaultBranch: string | null = null,
-+  parent: GitHubRepository | null = null
-+) {
-+  return new GitHubRepository(
-+    name,
-+    new Owner('', '', null),
-+    null,
-+    false,
-+    '',
-+    `${
-+      defaultBranch !== null && defaultBranch.indexOf('/') !== -1
-+        ? defaultBranch.split('/')[1]
-+        : defaultBranch
-+    }`,
-+    `${name.indexOf('/') !== -1 ? name.split('/')[1] : name}.git`,
-+    parent
-+  )
-+}
-+
-+function createTestPrRef(
-+  branch: Branch,
-+  ghRepo: GitHubRepository | null = null
-+) {
-+  return new PullRequestRef(branch.name, branch.tip.sha, ghRepo)
-+}
-+
-+function createTestPr(head: PullRequestRef, base: PullRequestRef) {
-+  return new PullRequest(-1, new Date(), null, '', 1, head, base, '')
-+}
-+
-+function createTestRepo(ghRepo: GitHubRepository | null = null) {
-+  return new Repository('', -1, ghRepo, false)
-+}
-+
-+function mockGetRemotes(repo: Repository): Promise<ReadonlyArray<IRemote>> {
-+  return Promise.resolve([])
-+}
-+
-+describe('inferComparisonBranch', () => {
-+  const branches = [
-+    createTestBranch('master', '0', 'origin'),
-+    createTestBranch('dev', '1', 'origin'),
-+    createTestBranch('staging', '2', 'origin'),
-+    createTestBranch('default', '3', 'origin'),
-+    createTestBranch('head', '4', 'origin'),
-+    createTestBranch('upstream/base', '5', 'upstream'),
-+    createTestBranch('fork', '6', 'origin'),
-+  ]
-+  const comparisonCache = new ComparisonCache()
-+
-+  beforeEach(() => {
-+    comparisonCache.clear()
-+  })
-+
-+  it('Returns the master branch when given unhosted repo', async () => {
-+    const repo = createTestRepo()
-+    const branch = await inferComparisonBranch(
-+      repo,
-+      branches,
-+      null,
-+      null,
-+      mockGetRemotes,
-+      comparisonCache
-+    )
-+
-+    expect(branch).is.not.null
-+    expect(branch!.tip.sha).to.equal('0')
-+  })
-+
-+  it('Returns the default branch of a GitHub repository', async () => {
-+    const ghRepo: GitHubRepository = createTestGhRepo('test', 'default')
-+    const repo = createTestRepo(ghRepo)
-+
-+    const branch = await inferComparisonBranch(
-+      repo,
-+      branches,
-+      null,
-+      null,
-+      mockGetRemotes,
-+      comparisonCache
-+    )
-+
-+    expect(branch).is.not.null
-+    expect(branch!.name).to.equal('default')
-+  })
-+
-+  it('Returns the branch associated with the PR', async () => {
-+    const ghRepo: GitHubRepository = createTestGhRepo('test', 'default')
-+    const repo = createTestRepo(ghRepo)
-+    const head = createTestPrRef(branches[4])
-+    const base = createTestPrRef(branches[5])
-+    const pr: PullRequest = createTestPr(head, base)
-+
-+    const branch = await inferComparisonBranch(
-+      repo,
-+      branches,
-+      pr,
-+      null,
-+      mockGetRemotes,
-+      comparisonCache
-+    )
-+
-+    expect(branch).is.not.null
-+    expect(branch!.upstream).to.equal(branches[5].upstream)
-+  })
-+
-+  it('Returns the default branch of the fork if it is ahead of the current branch', async () => {
-+    const currentBranch = branches[3]
-+    const defaultBranch = branches[6]
-+    const parent = createTestGhRepo('parent', 'parent')
-+    const fork = createTestGhRepo('fork', 'fork', parent)
-+    const repo = createTestRepo(fork)
-+
-+    comparisonCache.set(currentBranch.tip.sha, defaultBranch.tip.sha, {
-+      ahead: 1,
-+      behind: 0,
-+    })
-+
-+    const branch = await inferComparisonBranch(
-+      repo,
-+      branches,
-+      null,
-+      currentBranch,
-+      mockGetRemotes,
-+      comparisonCache
-+    )
-+
-+    expect(branch).is.not.null
-+    expect(branch!.name).to.equal(defaultBranch.name)
-+  })
-+
-+  it("Returns the default branch of the fork's parent branch if the fork is not ahead of the current branch", async () => {
-+    const defaultBranchOfParent = branches[5]
-+    const defaultBranchOfFork = branches[4]
-+    const parent = createTestGhRepo(
-+      'parent',
-+      defaultBranchOfParent.nameWithoutRemote
-+    )
-+    const fork = createTestGhRepo('fork', defaultBranchOfFork.name, parent)
-+    const repo = createTestRepo(fork)
-+    const mockGetRemotes = (repo: Repository) => {
-+      const remotes: ReadonlyArray<IRemote> = [
-+        { name: 'origin', url: fork.cloneURL! },
-+        { name: 'upstream', url: parent.cloneURL! },
-+      ]
-+
-+      return Promise.resolve(remotes)
-+    }
-+
-+    comparisonCache.set(
-+      defaultBranchOfParent.tip.sha,
-+      defaultBranchOfFork.tip.sha,
-+      {
-+        ahead: 0,
-+        behind: 0,
-+      }
-+    )
-+
-+    const branch = await inferComparisonBranch(
-+      repo,
-+      branches,
-+      null,
-+      defaultBranchOfParent,
-+      mockGetRemotes,
-+      comparisonCache
-+    )
-+
-+    expect(branch).is.not.null
-+    expect(branch!.upstream).to.equal(defaultBranchOfParent.upstream)
-+  })
-+})
-added in remote
-  their  100644 dcebafa9c3051466b9d3347eb6ae9d827c796b0d app/test/unit/list-selection-test.ts
-@@ -0,0 +1,52 @@
-+import { expect } from 'chai'
-+
-+import { findNextSelectableRow } from '../../src/ui/lib/list/selection'
-+
-+describe('list-selection', () => {
-+  describe('findNextSelectableRow', () => {
-+    const rowCount = 5
-+
-+    it('returns first row when selecting down outside list (filter text)', () => {
-+      const selectedRow = findNextSelectableRow(rowCount, {
-+        direction: 'down',
-+        row: -1,
-+      })
-+      expect(selectedRow).to.equal(0)
-+    })
-+
-+    it('returns first selectable row when header is first', () => {
-+      const selectedRow = findNextSelectableRow(
-+        rowCount,
-+        {
-+          direction: 'down',
-+          row: -1,
-+        },
-+        row => {
-+          if (row === 0) {
-+            return false
-+          } else {
-+            return true
-+          }
-+        }
-+      )
-+      expect(selectedRow).to.equal(1)
-+    })
-+
-+    it('returns first row when selecting down from last row', () => {
-+      const lastRow = rowCount - 1
-+      const selectedRow = findNextSelectableRow(rowCount, {
-+        direction: 'down',
-+        row: lastRow,
-+      })
-+      expect(selectedRow).to.equal(0)
-+    })
-+
-+    it('returns last row when selecting up from top row', () => {
-+      const selectedRow = findNextSelectableRow(rowCount, {
-+        direction: 'up',
-+        row: 0,
-+      })
-+      expect(selectedRow).to.equal(4)
-+    })
-+  })
-+})
-merged
-  result 100644 c0b463a119f370007a15b53596eef661434e881a app/test/unit/patch-formatter-test.ts
-  our    100644 6a71395ab06843a86f54daca408878c6e8c603c6 app/test/unit/patch-formatter-test.ts
-@@ -1,9 +1,7 @@
--/* eslint-disable no-sync */
--
- import { expect } from 'chai'
-
- import * as Path from 'path'
--import * as FS from 'fs'
-+import * as FSE from 'fs-extra'
-
- import { Repository } from '../../src/models/repository'
- import {
-@@ -36,8 +34,8 @@
-   let repository: Repository | null = null
-
-   describe('formatPatchesForModifiedFile', () => {
--    beforeEach(() => {
--      const testRepoPath = setupFixtureRepository('repo-with-changes')
-+    beforeEach(async () => {
-+      const testRepoPath = await setupFixtureRepository('repo-with-changes')
-       repository = new Repository(testRepoPath, -1, null, false)
-     })
-
-@@ -161,7 +159,7 @@
-
-     it(`creates the right patch when an addition is selected but preceding deletions aren't`, async () => {
-       const modifiedFile = 'modified-file.md'
--      FS.writeFileSync(Path.join(repository!.path, modifiedFile), 'line 1\n')
-+      await FSE.writeFile(Path.join(repository!.path, modifiedFile), 'line 1\n')
-
-       const unselectedFile = DiffSelection.fromInitialSelection(
-         DiffSelectionType.None
-merged
-  result 100644 9cbf74cc7f09f42177a0ffa21b8dadf6a5cb408e app/test/unit/progress/clone-test.ts
-  our    100644 7c54590d069085e654f33a1d2d57765c2bf0cf0a app/test/unit/progress/clone-test.ts
-@@ -36,21 +36,21 @@
-         'remote: Compressing objects:  45% (10/22)'
-       )
-       expect(compressing.kind).to.equal('progress')
--      expect(compressing.percent).to.be.closeTo(10 / 22 * 0.1, 0.01)
-+      expect(compressing.percent).to.be.closeTo((10 / 22) * 0.1, 0.01)
-
-       const receiving = parser.parse(
-         'Receiving objects:  17% (4808/28282), 3.30 MiB | 1.29 MiB/s'
-       )
-       expect(receiving.kind).to.equal('progress')
--      expect(receiving.percent).to.be.closeTo(0.1 + 4808 / 28282 * 0.6, 0.01)
-+      expect(receiving.percent).to.be.closeTo(0.1 + (4808 / 28282) * 0.6, 0.01)
-
-       const resolving = parser.parse('Resolving deltas:  89% (18063/20263)')
-       expect(resolving.kind).to.equal('progress')
--      expect(resolving.percent).to.be.closeTo(0.7 + 18063 / 20263 * 0.1, 0.01)
-+      expect(resolving.percent).to.be.closeTo(0.7 + (18063 / 20263) * 0.1, 0.01)
-
-       const checkingOut = parser.parse('Checking out files: 100% (579/579)')
-       expect(checkingOut.kind).to.equal('progress')
--      expect(checkingOut.percent).to.be.closeTo(0.8 + 579 / 579 * 0.2, 0.01)
-+      expect(checkingOut.percent).to.be.closeTo(0.8 + (579 / 579) * 0.2, 0.01)
-     })
-
-     it('ignores wrong order', () => {
-added in remote
-  their  100644 1e72cf509cf524cdf0acea77b04f2bd6298fc33e app/test/unit/pull-request-status-test.ts
-@@ -0,0 +1,91 @@
-+import { expect } from 'chai'
-+
-+import { APIRefState } from '../../src/lib/api'
-+import { getPRStatusSummary } from '../../src/ui/branches/pull-request-status'
-+
-+const failure: APIRefState = 'failure'
-+const pending: APIRefState = 'pending'
-+const success: APIRefState = 'success'
-+
-+describe('pull request status', () => {
-+  it('uses the state when no statuses found', () => {
-+    const prStatus = {
-+      pullRequestNumber: 23,
-+      state: success,
-+      totalCount: 0,
-+      sha: '',
-+      statuses: [],
-+    }
-+    expect(getPRStatusSummary(prStatus)).to.equal('Commit status: success')
-+  })
-+
-+  it('changes the failure message to something more friendly', () => {
-+    const prStatus = {
-+      pullRequestNumber: 23,
-+      state: failure,
-+      totalCount: 0,
-+      sha: '',
-+      statuses: [],
-+    }
-+    expect(getPRStatusSummary(prStatus)).to.equal('Commit status: failed')
-+  })
-+
-+  it('reads the statuses when they are populated', () => {
-+    const prStatus = {
-+      pullRequestNumber: 23,
-+      state: success,
-+      totalCount: 2,
-+      sha: '',
-+      statuses: [
-+        { id: 1, state: success, description: 'first' },
-+        { id: 2, state: success, description: 'second' },
-+      ],
-+    }
-+    expect(getPRStatusSummary(prStatus)).to.equal('2/2 checks OK')
-+  })
-+
-+  it('a successful status shows the description', () => {
-+    const prStatus = {
-+      pullRequestNumber: 23,
-+      state: success,
-+      totalCount: 2,
-+      sha: '',
-+      statuses: [
-+        { id: 1, state: success, description: 'The Travis CI build passed' },
-+      ],
-+    }
-+    expect(getPRStatusSummary(prStatus)).to.equal(
-+      'Success: The Travis CI build passed'
-+    )
-+  })
-+
-+  it('an error status shows the description', () => {
-+    const prStatus = {
-+      pullRequestNumber: 23,
-+      state: success,
-+      totalCount: 2,
-+      sha: '',
-+      statuses: [
-+        { id: 1, state: failure, description: 'The Travis CI build failed' },
-+      ],
-+    }
-+    expect(getPRStatusSummary(prStatus)).to.equal(
-+      'Failure: The Travis CI build failed'
-+    )
-+  })
-+
-+  it('only counts the successful statuses', () => {
-+    const prStatus = {
-+      pullRequestNumber: 23,
-+      state: success,
-+      totalCount: 3,
-+      sha: '',
-+      statuses: [
-+        { id: 1, state: success, description: 'first' },
-+        { id: 2, state: pending, description: 'second' },
-+        { id: 2, state: pending, description: 'third' },
-+      ],
-+    }
-+    expect(getPRStatusSummary(prStatus)).to.equal('1/3 checks OK')
-+  })
-+})
-merged
-  result 100644 8c3c9ac4c1b7875569c8d7d44dec79ca7047423d app/test/unit/repositories-list-grouping-test.ts
-  our    100644 8c87f50afeab077a2eec435baab02e4db2417b4f app/test/unit/repositories-list-grouping-test.ts
-@@ -1,7 +1,7 @@
- import { expect } from 'chai'
-
- import { groupRepositories } from '../../src/ui/repositories-list/group-repositories'
--import { Repository } from '../../src/models/repository'
-+import { Repository, ILocalRepositoryState } from '../../src/models/repository'
- import { GitHubRepository } from '../../src/models/github-repository'
- import { Owner } from '../../src/models/owner'
- import { getDotComAPIEndpoint } from '../../src/lib/api'
-@@ -28,8 +28,10 @@
-     ),
-   ]
-
-+  const cache = new Map<number, ILocalRepositoryState>()
-+
-   it('groups repositories by GitHub/Enterprise/Other', () => {
--    const grouped = groupRepositories(repositories)
-+    const grouped = groupRepositories(repositories, cache)
-     expect(grouped.length).to.equal(3)
-
-     expect(grouped[0].identifier).to.equal('github')
-@@ -68,7 +70,10 @@
-     )
-     const repoZ = new Repository('z', 3, null, false)
-
--    const grouped = groupRepositories([repoC, repoB, repoZ, repoD, repoA])
-+    const grouped = groupRepositories(
-+      [repoC, repoB, repoZ, repoD, repoA],
-+      cache
-+    )
-     expect(grouped.length).to.equal(2)
-
-     expect(grouped[0].identifier).to.equal('github')
-@@ -119,20 +124,20 @@
-       false
-     )
-
--    const grouped = groupRepositories([repoA, repoB, repoC])
-+    const grouped = groupRepositories([repoA, repoB, repoC], cache)
-     expect(grouped.length).to.equal(1)
-
-     expect(grouped[0].identifier).to.equal('github')
-     expect(grouped[0].items.length).to.equal(3)
-
-     const items = grouped[0].items
--    expect(items[0].text).to.equal('cool-repo')
-+    expect(items[0].text[0]).to.equal('cool-repo')
-     expect(items[0].needsDisambiguation).to.equal(false)
-
--    expect(items[1].text).to.equal('repo')
-+    expect(items[1].text[0]).to.equal('repo')
-     expect(items[1].needsDisambiguation).to.equal(true)
-
--    expect(items[2].text).to.equal('repo')
-+    expect(items[2].text[0]).to.equal('repo')
-     expect(items[2].needsDisambiguation).to.equal(true)
-   })
- })
-merged
-  result 100644 2500924fc3357ff64eb65408ada24ec216b734ef app/test/unit/repository-settings-store-test.ts
-  our    100644 a0af361ddcda5e966fcae87cfe23274833ff3095 app/test/unit/repository-settings-store-test.ts
-@@ -1,6 +1,4 @@
--/* eslint-disable no-sync */
--
--import * as FS from 'fs'
-+import * as FSE from 'fs-extra'
- import * as Path from 'path'
- import { GitProcess } from 'dugite'
- import { expect } from 'chai'
-@@ -8,7 +6,6 @@
- import { RepositorySettingsStore } from '../../src/lib/stores'
- import { setupEmptyRepository } from '../helpers/repositories'
- import { getStatus } from '../../src/lib/git'
--import { pathExists } from '../../src/lib/file-system'
-
- describe('RepositorySettingsStore', () => {
-   it('can create a gitignore file', async () => {
-@@ -20,7 +17,7 @@
-     await sut.saveGitIgnore('node_modules\n')
-
-     // Make sure file exists on FS
--    const exists = await pathExists(`${path}/.gitignore`)
-+    const exists = await FSE.pathExists(`${path}/.gitignore`)
-
-     expect(exists).is.true
-   })
-@@ -30,14 +27,14 @@
-     const path = repo.path
-
-     const ignoreFile = `${path}/.gitignore`
--    FS.writeFileSync(ignoreFile, 'node_modules\n')
-+    await FSE.writeFile(ignoreFile, 'node_modules\n')
-
-     const sut = new RepositorySettingsStore(repo)
-
-     // update gitignore file to be empty
-     await sut.saveGitIgnore('')
-
--    const exists = await pathExists(ignoreFile)
-+    const exists = await FSE.pathExists(ignoreFile)
-     expect(exists).is.false
-   })
-
-@@ -54,7 +51,7 @@
-     // Create a txt file
-     const file = Path.join(repo.path, 'a.txt')
-
--    FS.writeFileSync(file, 'thrvbnmerkl;,iuw')
-+    await FSE.writeFile(file, 'thrvbnmerkl;,iuw')
-
-     // Check status of repo
-     const status = await getStatus(repo)
-merged
-  result 100644 133e5af7e5501c236aeb4c8601f36046ad052609 app/test/unit/repository-test.ts
-  our    100644 1d0e7171ba217432250ae87d691596276db579e9 app/test/unit/repository-test.ts
-@@ -9,5 +9,11 @@
-       const repository = new Repository(repoPath, -1, null, false)
-       expect(repository.name).to.equal('path')
-     })
-+
-+    it('handles repository at root of the drive', async () => {
-+      const repoPath = 'T:\\'
-+      const repository = new Repository(repoPath, -1, null, false)
-+      expect(repository.name).to.equal('T:\\')
-+    })
-   })
- })
-merged
-  result 100644 bbcf0ab0fd2e7a0f0528335e7a18a965fb1a464b app/test/unit/validated-repository-path-test.ts
-  our    100644 a8625f261275cbe39f142f52e51de14e1b1619fb app/test/unit/validated-repository-path-test.ts
-@@ -7,7 +7,7 @@
-
- describe('validatedRepositoryPath', () => {
-   it('returns the path to the repository', async () => {
--    const testRepoPath = setupFixtureRepository('test-repo')
-+    const testRepoPath = await setupFixtureRepository('test-repo')
-     const result = await validatedRepositoryPath(testRepoPath)
-     expect(result).to.equal(testRepoPath)
-   })
-removed in remote
-  base   100644 20da10ea8edc60b7201685b8ce2659593bc0dc0a app/webpack.common.js
-  our    100644 20da10ea8edc60b7201685b8ce2659593bc0dc0a app/webpack.common.js
-@@ -1,205 +0,0 @@
--'use strict'
--
--const path = require('path')
--const Fs = require('fs')
--const HtmlWebpackPlugin = require('html-webpack-plugin')
--const CleanWebpackPlugin = require('clean-webpack-plugin')
--const webpack = require('webpack')
--const merge = require('webpack-merge')
--const appInfo = require('./app-info')
--const packageInfo = require('./package-info')
--const distInfo = require('../script/dist-info')
--
--const channel = distInfo.getReleaseChannel()
--
--const externals = ['7zip']
--if (channel === 'development') {
--  externals.push('devtron')
--}
--
--const outputDir = 'out'
--const replacements = appInfo.getReplacements()
--
--const commonConfig = {
--  externals: externals,
--  output: {
--    filename: '[name].js',
--    path: path.resolve(__dirname, '..', outputDir),
--    libraryTarget: 'commonjs2',
--  },
--  module: {
--    rules: [
--      {
--        test: /\.tsx?$/,
--        include: path.resolve(__dirname, 'src'),
--        use: [
--          {
--            loader: 'awesome-typescript-loader',
--            options: {
--              useBabel: true,
--              useCache: true,
--            },
--          },
--        ],
--        exclude: /node_modules/,
--      },
--      {
--        test: /\.node$/,
--        use: [
--          { loader: 'node-native-loader', options: { name: '[name].[ext]' } },
--        ],
--      },
--    ],
--  },
--  plugins: [
--    new CleanWebpackPlugin([outputDir], { verbose: false }),
--    // This saves us a bunch of bytes by pruning locales (which we don't use)
--    // from moment.
--    new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
--    new webpack.NoEmitOnErrorsPlugin(),
--  ],
--  resolve: {
--    extensions: ['.js', '.ts', '.tsx'],
--    modules: [path.resolve(__dirname, 'node_modules/')],
--  },
--  node: {
--    __dirname: false,
--    __filename: false,
--  },
--}
--
--const mainConfig = merge({}, commonConfig, {
--  entry: { main: path.resolve(__dirname, 'src/main-process/main') },
--  target: 'electron-main',
--  plugins: [
--    new webpack.DefinePlugin(
--      Object.assign({}, replacements, {
--        __PROCESS_KIND__: JSON.stringify('main'),
--      })
--    ),
--  ],
--})
--
--const rendererConfig = merge({}, commonConfig, {
--  entry: { renderer: path.resolve(__dirname, 'src/ui/index') },
--  target: 'electron-renderer',
--  module: {
--    rules: [
--      {
--        test: /\.(jpe?g|png|gif|ico)$/,
--        use: ['file?name=[path][name].[ext]'],
--      },
--    ],
--  },
--  plugins: [
--    new HtmlWebpackPlugin({
--      template: path.join(__dirname, 'static', 'index.html'),
--      chunks: ['renderer'],
--    }),
--    new webpack.DefinePlugin(
--      Object.assign({}, replacements, {
--        __PROCESS_KIND__: JSON.stringify('ui'),
--      })
--    ),
--  ],
--})
--
--const askPassConfig = merge({}, commonConfig, {
--  entry: { 'ask-pass': path.resolve(__dirname, 'src/ask-pass/main') },
--  target: 'node',
--  plugins: [
--    new webpack.DefinePlugin(
--      Object.assign({}, replacements, {
--        __PROCESS_KIND__: JSON.stringify('askpass'),
--      })
--    ),
--  ],
--})
--
--const crashConfig = merge({}, commonConfig, {
--  entry: { crash: path.resolve(__dirname, 'src/crash/index') },
--  target: 'electron-renderer',
--  plugins: [
--    new HtmlWebpackPlugin({
--      title: 'GitHub Desktop',
--      filename: 'crash.html',
--      chunks: ['crash'],
--    }),
--    new webpack.DefinePlugin(
--      Object.assign({}, replacements, {
--        __PROCESS_KIND__: JSON.stringify('crash'),
--      })
--    ),
--  ],
--})
--
--const cliConfig = merge({}, commonConfig, {
--  entry: { cli: path.resolve(__dirname, 'src/cli/main') },
--  target: 'node',
--  plugins: [
--    new webpack.DefinePlugin(
--      Object.assign({}, replacements, {
--        __PROCESS_KIND__: JSON.stringify('cli'),
--      })
--    ),
--  ],
--})
--
--const highlighterConfig = merge({}, commonConfig, {
--  entry: { highlighter: path.resolve(__dirname, 'src/highlighter/index') },
--  output: { libraryTarget: 'var' },
--  target: 'webworker',
--  plugins: [
--    new webpack.DefinePlugin(
--      Object.assign({}, replacements, {
--        __PROCESS_KIND__: JSON.stringify('highlighter'),
--      })
--    ),
--  ],
--  resolve: {
--    // We don't want to bundle all of CodeMirror in the highlighter. A web
--    // worker doesn't have access to the DOM and most of CodeMirror's core
--    // code is useless to us in that context. So instead we use this super
--    // nifty subset of codemirror that defines the minimal context needed
--    // to run a mode inside of node. Now, we're not running in node
--    // but CodeMirror doesn't have to know about that.
--    alias: {
--      codemirror$: 'codemirror/addon/runmode/runmode.node.js',
--      '../lib/codemirror$': '../addon/runmode/runmode.node.js',
--      '../../lib/codemirror$': '../../addon/runmode/runmode.node.js',
--      '../../addon/runmode/runmode$': '../../addon/runmode/runmode.node.js',
--    },
--  },
--})
--
--highlighterConfig.module.rules = [
--  {
--    test: /\.ts$/,
--    include: path.resolve(__dirname, 'src/highlighter'),
--    use: [
--      {
--        loader: 'awesome-typescript-loader',
--        options: {
--          useBabel: true,
--          useCache: true,
--          configFileName: path.resolve(
--            __dirname,
--            'src/highlighter/tsconfig.json'
--          ),
--        },
--      },
--    ],
--    exclude: /node_modules/,
--  },
--]
--
--module.exports = {
--  main: mainConfig,
--  renderer: rendererConfig,
--  askPass: askPassConfig,
--  crash: crashConfig,
--  cli: cliConfig,
--  highlighter: highlighterConfig,
--  replacements: replacements,
--  externals: commonConfig.externals,
--}
-added in remote
-  their  100644 1022f36fa215969400d025fd13ce117793d98ddd app/webpack.common.ts
-@@ -0,0 +1,219 @@
-+import * as path from 'path'
-+import * as HtmlWebpackPlugin from 'html-webpack-plugin'
-+import * as CleanWebpackPlugin from 'clean-webpack-plugin'
-+import * as webpack from 'webpack'
-+import * as merge from 'webpack-merge'
-+import { getReleaseChannel } from '../script/dist-info'
-+import { getReplacements } from './app-info'
-+
-+const channel = getReleaseChannel()
-+
-+export const externals = ['7zip']
-+if (channel === 'development') {
-+  externals.push('devtron')
-+}
-+
-+const outputDir = 'out'
-+export const replacements = getReplacements()
-+
-+const commonConfig: webpack.Configuration = {
-+  externals: externals,
-+  output: {
-+    filename: '[name].js',
-+    path: path.resolve(__dirname, '..', outputDir),
-+    libraryTarget: 'commonjs2',
-+  },
-+  module: {
-+    rules: [
-+      {
-+        test: /\.tsx?$/,
-+        include: path.resolve(__dirname, 'src'),
-+        use: [
-+          {
-+            loader: 'awesome-typescript-loader',
-+            options: {
-+              useBabel: true,
-+              useCache: true,
-+            },
-+          },
-+        ],
-+        exclude: /node_modules/,
-+      },
-+      {
-+        test: /\.node$/,
-+        loader: 'awesome-node-loader',
-+        options: {
-+          name: '[name].[ext]',
-+        },
-+      },
-+    ],
-+  },
-+  plugins: [
-+    new CleanWebpackPlugin([outputDir], { verbose: false }),
-+    // This saves us a bunch of bytes by pruning locales (which we don't use)
-+    // from moment.
-+    new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
-+    new webpack.NoEmitOnErrorsPlugin(),
-+  ],
-+  resolve: {
-+    extensions: ['.js', '.ts', '.tsx'],
-+    modules: [path.resolve(__dirname, 'node_modules/')],
-+  },
-+  node: {
-+    __dirname: false,
-+    __filename: false,
-+  },
-+}
-+
-+export const main = merge({}, commonConfig, {
-+  entry: { main: path.resolve(__dirname, 'src/main-process/main') },
-+  target: 'electron-main',
-+  plugins: [
-+    new webpack.DefinePlugin(
-+      Object.assign({}, replacements, {
-+        __PROCESS_KIND__: JSON.stringify('main'),
-+      })
-+    ),
-+  ],
-+})
-+
-+export const renderer = merge({}, commonConfig, {
-+  entry: { renderer: path.resolve(__dirname, 'src/ui/index') },
-+  target: 'electron-renderer',
-+  module: {
-+    rules: [
-+      {
-+        test: /\.(jpe?g|png|gif|ico)$/,
-+        use: ['file?name=[path][name].[ext]'],
-+      },
-+    ],
-+  },
-+  plugins: [
-+    new HtmlWebpackPlugin({
-+      template: path.join(__dirname, 'static', 'index.html'),
-+      chunks: ['renderer'],
-+    }),
-+    new webpack.DefinePlugin(
-+      Object.assign({}, replacements, {
-+        __PROCESS_KIND__: JSON.stringify('ui'),
-+      })
-+    ),
-+  ],
-+})
-+
-+export const askPass = merge({}, commonConfig, {
-+  entry: { 'ask-pass': path.resolve(__dirname, 'src/ask-pass/main') },
-+  target: 'node',
-+  plugins: [
-+    new webpack.DefinePlugin(
-+      Object.assign({}, replacements, {
-+        __PROCESS_KIND__: JSON.stringify('askpass'),
-+      })
-+    ),
-+  ],
-+})
-+
-+export const crash = merge({}, commonConfig, {
-+  entry: { crash: path.resolve(__dirname, 'src/crash/index') },
-+  target: 'electron-renderer',
-+  plugins: [
-+    new HtmlWebpackPlugin({
-+      title: 'GitHub Desktop',
-+      filename: 'crash.html',
-+      chunks: ['crash'],
-+    }),
-+    new webpack.DefinePlugin(
-+      Object.assign({}, replacements, {
-+        __PROCESS_KIND__: JSON.stringify('crash'),
-+      })
-+    ),
-+  ],
-+})
-+
-+export const cli = merge({}, commonConfig, {
-+  entry: { cli: path.resolve(__dirname, 'src/cli/main') },
-+  target: 'node',
-+  plugins: [
-+    new webpack.DefinePlugin(
-+      Object.assign({}, replacements, {
-+        __PROCESS_KIND__: JSON.stringify('cli'),
-+      })
-+    ),
-+  ],
-+})
-+
-+export const highlighter = merge({}, commonConfig, {
-+  entry: { highlighter: path.resolve(__dirname, 'src/highlighter/index') },
-+  output: {
-+    libraryTarget: 'var',
-+    chunkFilename: 'highlighter/[name].js',
-+  },
-+  optimization: {
-+    namedChunks: true,
-+    splitChunks: {
-+      cacheGroups: {
-+        modes: {
-+          enforce: true,
-+          name: (mod, chunks) => {
-+            const builtInMode = /node_modules\/codemirror\/mode\/(\w+)\//.exec(
-+              mod.resource
-+            )
-+            if (builtInMode) {
-+              return `mode/${builtInMode[1]}`
-+            }
-+            const external = /node_modules\/codemirror-mode-(\w+)\//.exec(
-+              mod.resource
-+            )
-+            if (external) {
-+              return `ext/${external[1]}`
-+            }
-+            return 'common'
-+          },
-+        },
-+      },
-+    },
-+  },
-+  target: 'webworker',
-+  plugins: [
-+    new webpack.DefinePlugin(
-+      Object.assign({}, replacements, {
-+        __PROCESS_KIND__: JSON.stringify('highlighter'),
-+      })
-+    ),
-+  ],
-+  resolve: {
-+    // We don't want to bundle all of CodeMirror in the highlighter. A web
-+    // worker doesn't have access to the DOM and most of CodeMirror's core
-+    // code is useless to us in that context. So instead we use this super
-+    // nifty subset of codemirror that defines the minimal context needed
-+    // to run a mode inside of node. Now, we're not running in node
-+    // but CodeMirror doesn't have to know about that.
-+    alias: {
-+      codemirror$: 'codemirror/addon/runmode/runmode.node.js',
-+      '../lib/codemirror$': '../addon/runmode/runmode.node.js',
-+      '../../lib/codemirror$': '../../addon/runmode/runmode.node.js',
-+      '../../addon/runmode/runmode$': '../../addon/runmode/runmode.node.js',
-+    },
-+  },
-+})
-+
-+highlighter.module!.rules = [
-+  {
-+    test: /\.ts$/,
-+    include: path.resolve(__dirname, 'src/highlighter'),
-+    use: [
-+      {
-+        loader: 'awesome-typescript-loader',
-+        options: {
-+          useBabel: true,
-+          useCache: true,
-+          configFileName: path.resolve(
-+            __dirname,
-+            'src/highlighter/tsconfig.json'
-+          ),
-+        },
-+      },
-+    ],
-+    exclude: /node_modules/,
-+  },
-+]
-removed in remote
-  base   100644 aab57ac31250a9a96cd3297a5df761e08ec7c180 app/webpack.development.js
-  our    100644 aab57ac31250a9a96cd3297a5df761e08ec7c180 app/webpack.development.js
-@@ -1,62 +0,0 @@
--'use strict'
--
--const common = require('./webpack.common')
--
--const webpack = require('webpack')
--const merge = require('webpack-merge')
--
--const config = {
--  devtool: 'source-map',
--}
--
--const mainConfig = merge({}, common.main, config)
--const askPassConfig = merge({}, common.askPass, config)
--const cliConfig = merge({}, common.cli, config)
--const highlighterConfig = merge({}, common.highlighter, config)
--
--const rendererConfig = merge({}, common.renderer, config, {
--  entry: {
--    renderer: [
--      'webpack-hot-middleware/client?path=http://localhost:3000/__webpack_hmr',
--      common.renderer.entry.renderer,
--    ],
--  },
--  output: {
--    publicPath: 'http://localhost:3000/build/',
--  },
--  module: {
--    rules: [
--      // This will cause the compiled CSS (and sourceMap) to be
--      // embedded within the compiled javascript bundle and added
--      // as a blob:// uri at runtime.
--      {
--        test: /\.(scss|css)$/,
--        use: ['style-loader', 'css-loader?sourceMap', 'sass-loader?sourceMap'],
--      },
--    ],
--  },
--  plugins: [new webpack.HotModuleReplacementPlugin()],
--})
--
--const crashConfig = merge({}, common.crash, config, {
--  module: {
--    rules: [
--      // This will cause the compiled CSS (and sourceMap) to be
--      // embedded within the compiled javascript bundle and added
--      // as a blob:// uri at runtime.
--      {
--        test: /\.(scss|css)$/,
--        use: ['style-loader', 'css-loader?sourceMap', 'sass-loader?sourceMap'],
--      },
--    ],
--  },
--})
--
--module.exports = [
--  mainConfig,
--  rendererConfig,
--  askPassConfig,
--  crashConfig,
--  cliConfig,
--  highlighterConfig,
--]
-added in remote
-  their  100644 85601e4b9f45f7a6177f1598e7e42f8f9f2563d8 app/webpack.development.ts
-@@ -0,0 +1,77 @@
-+import * as common from './webpack.common'
-+
-+import * as webpack from 'webpack'
-+import * as merge from 'webpack-merge'
-+
-+const config: webpack.Configuration = {
-+  mode: 'development',
-+  devtool: 'source-map',
-+}
-+
-+const mainConfig = merge({}, common.main, config)
-+const askPassConfig = merge({}, common.askPass, config)
-+const cliConfig = merge({}, common.cli, config)
-+const highlighterConfig = merge({}, common.highlighter, config)
-+
-+// TODO:
-+// if we have a PORT environment variable set and running `yarn start` we also
-+// need to update this script to use the same port when building because this
-+// is currently hard-coded.
-+
-+const webpackHotModuleReloadUrl =
-+  'webpack-hot-middleware/client?path=http://localhost:3000/__webpack_hmr'
-+
-+const getRendererEntryPoint = () => {
-+  const entry = common.renderer.entry as webpack.Entry
-+  if (entry == null) {
-+    throw new Error(
-+      `Unable to resolve entry point. Check webpack.common.ts and try again`
-+    )
-+  }
-+
-+  return entry.renderer as string
-+}
-+
-+const rendererConfig = merge({}, common.renderer, config, {
-+  entry: {
-+    renderer: [webpackHotModuleReloadUrl, getRendererEntryPoint()],
-+  },
-+  output: {
-+    publicPath: 'http://localhost:3000/build/',
-+  },
-+  module: {
-+    rules: [
-+      // This will cause the compiled CSS (and sourceMap) to be
-+      // embedded within the compiled javascript bundle and added
-+      // as a blob:// uri at runtime.
-+      {
-+        test: /\.(scss|css)$/,
-+        use: ['style-loader', 'css-loader?sourceMap', 'sass-loader?sourceMap'],
-+      },
-+    ],
-+  },
-+  plugins: [new webpack.HotModuleReplacementPlugin()],
-+})
-+
-+const crashConfig = merge({}, common.crash, config, {
-+  module: {
-+    rules: [
-+      // This will cause the compiled CSS (and sourceMap) to be
-+      // embedded within the compiled javascript bundle and added
-+      // as a blob:// uri at runtime.
-+      {
-+        test: /\.(scss|css)$/,
-+        use: ['style-loader', 'css-loader?sourceMap', 'sass-loader?sourceMap'],
-+      },
-+    ],
-+  },
-+})
-+
-+export = [
-+  mainConfig,
-+  rendererConfig,
-+  askPassConfig,
-+  crashConfig,
-+  cliConfig,
-+  highlighterConfig,
-+]
-removed in remote
-  base   100644 1d053b4165d86beb66a65a0cc983e3c6433e6096 app/webpack.production.js
-  our    100644 1d053b4165d86beb66a65a0cc983e3c6433e6096 app/webpack.production.js
-@@ -1,86 +0,0 @@
--'use strict'
--
--const common = require('./webpack.common')
--
--const webpack = require('webpack')
--const merge = require('webpack-merge')
--const ExtractTextPlugin = require('extract-text-webpack-plugin')
--const BabelPlugin = require('babel-webpack-plugin')
--
--const config = {
--  devtool: 'source-map',
--  plugins: [
--    new BabelPlugin({
--      test: /\.js$/,
--      sourceMaps: true,
--      compact: true,
--      minified: true,
--      comments: false,
--      presets: [
--        [
--          'minify',
--          {
--            evaluate: false,
--          },
--        ],
--      ],
--    }),
--    new webpack.optimize.ModuleConcatenationPlugin(),
--  ],
--}
--
--const mainConfig = merge({}, common.main, config)
--const askPassConfig = merge({}, common.askPass, config)
--const cliConfig = merge({}, common.cli, config)
--const highlighterConfig = merge({}, common.highlighter, config)
--
--const rendererConfig = merge({}, common.renderer, config, {
--  module: {
--    rules: [
--      // This will cause the compiled CSS to be output to a
--      // styles.css and a <link rel="stylesheet"> tag to be
--      // appended to the index.html HEAD at compile time
--      {
--        test: /\.(scss|css)$/,
--        use: ExtractTextPlugin.extract({
--          fallback: 'style-loader',
--          use: ['css-loader', 'sass-loader'],
--        }),
--      },
--    ],
--  },
--  plugins: [
--    // Necessary to be able to use ExtractTextPlugin as a loader.
--    new ExtractTextPlugin('ui.css'),
--  ],
--})
--
--const crashConfig = merge({}, common.crash, config, {
--  module: {
--    rules: [
--      // This will cause the compiled CSS to be output to a
--      // styles.css and a <link rel="stylesheet"> tag to be
--      // appended to the index.html HEAD at compile time
--      {
--        test: /\.(scss|css)$/,
--        use: ExtractTextPlugin.extract({
--          fallback: 'style-loader',
--          use: ['css-loader', 'sass-loader'],
--        }),
--      },
--    ],
--  },
--  plugins: [
--    // Necessary to be able to use ExtractTextPlugin as a loader.
--    new ExtractTextPlugin('crash.css'),
--  ],
--})
--
--module.exports = [
--  mainConfig,
--  rendererConfig,
--  askPassConfig,
--  crashConfig,
--  cliConfig,
--  highlighterConfig,
--]
-added in remote
-  their  100644 5ceca0028e592b33b03c18605f4eb67a3c69ecaf app/webpack.production.ts
-@@ -0,0 +1,75 @@
-+import * as common from './webpack.common'
-+
-+import * as webpack from 'webpack'
-+import * as merge from 'webpack-merge'
-+import * as MiniCssExtractPlugin from 'mini-css-extract-plugin'
-+import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer'
-+const MinifyPlugin = require('babel-minify-webpack-plugin')
-+
-+const config: webpack.Configuration = {
-+  mode: 'production',
-+  devtool: 'source-map',
-+  optimization: {
-+    minimizer: [new MinifyPlugin()],
-+  },
-+}
-+
-+const mainConfig = merge({}, common.main, config)
-+const askPassConfig = merge({}, common.askPass, config)
-+const cliConfig = merge({}, common.cli, config)
-+const highlighterConfig = merge({}, common.highlighter, config)
-+
-+const rendererConfig = merge({}, common.renderer, config, {
-+  module: {
-+    rules: [
-+      // This will cause the compiled CSS to be output to a
-+      // styles.css and a <link rel="stylesheet"> tag to be
-+      // appended to the index.html HEAD at compile time
-+      {
-+        test: /\.(scss|css)$/,
-+        use: [MiniCssExtractPlugin.loader, 'css-loader', 'sass-loader'],
-+      },
-+    ],
-+  },
-+  plugins: [
-+    // Necessary to be able to use MiniCssExtractPlugin as a loader.
-+    new MiniCssExtractPlugin({ filename: 'renderer.css' }),
-+    new BundleAnalyzerPlugin({
-+      // this generates the static HTML file to view afterwards, rather
-+      // than disrupting the user
-+      analyzerMode: 'static',
-+      openAnalyzer: false,
-+      // we can't emit this directly to the dist directory because the
-+      // build script immediately blows away dist after webpack is done
-+      // compiling the source into bundles
-+      reportFilename: 'renderer.report.html',
-+    }),
-+  ],
-+})
-+
-+const crashConfig = merge({}, common.crash, config, {
-+  module: {
-+    rules: [
-+      // This will cause the compiled CSS to be output to a
-+      // styles.css and a <link rel="stylesheet"> tag to be
-+      // appended to the index.html HEAD at compile time
-+      {
-+        test: /\.(scss|css)$/,
-+        use: [MiniCssExtractPlugin.loader, 'css-loader', 'sass-loader'],
-+      },
-+    ],
-+  },
-+  plugins: [
-+    // Necessary to be able to use MiniCssExtractPlugin as a loader.
-+    new MiniCssExtractPlugin({ filename: 'crash.css' }),
-+  ],
-+})
-+
-+export = [
-+  mainConfig,
-+  rendererConfig,
-+  askPassConfig,
-+  crashConfig,
-+  cliConfig,
-+  highlighterConfig,
-+]
-merged
-  result 100644 1bfea3d3a8c831597a2bba1db9d15bdf1f470765 app/yarn.lock
-  our    100644 32c446515d5906010e9d52842742a9a913e42c16 app/yarn.lock
-@@ -43,12 +43,6 @@
-   dependencies:
-     execa "^0.4.0"
-
--argparse@^1.0.7:
--  version "1.0.9"
--  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
--  dependencies:
--    sprintf-js "~1.0.2"
--
- asap@~2.0.3:
-   version "2.0.6"
-   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
-@@ -94,22 +88,6 @@
-   dependencies:
-     tweetnacl "^0.14.3"
-
--big.js@^3.1.3:
--  version "3.2.0"
--  resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
--
--boom@4.x.x:
--  version "4.3.1"
--  resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31"
--  dependencies:
--    hoek "4.x.x"
--
--boom@5.x.x:
--  version "5.2.0"
--  resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02"
--  dependencies:
--    hoek "4.x.x"
--
- brace-expansion@^1.1.7:
-   version "1.1.8"
-   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
-@@ -212,12 +190,6 @@
-   version "0.0.2"
-   resolved "https://registry.yarnpkg.com/cross-unzip/-/cross-unzip-0.0.2.tgz#5183bc47a09559befcf98cc4657964999359372f"
-
--cryptiles@3.x.x:
--  version "3.1.2"
--  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"
--  dependencies:
--    boom "5.x.x"
--
- cycle@1.0.x:
-   version "1.0.3"
-   resolved "https://registry.yarnpkg.com/cycle/-/cycle-1.0.3.tgz#21e80b2be8580f98b468f379430662b046c34ad2"
-@@ -266,14 +238,14 @@
-   version "2.0.0"
-   resolved "https://registry.yarnpkg.com/dom-matches/-/dom-matches-2.0.0.tgz#d2728b416a87533980eb089b848d253cf23a758c"
-
--dugite@1.61.0:
--  version "1.61.0"
--  resolved "https://registry.yarnpkg.com/dugite/-/dugite-1.61.0.tgz#d5dad047af478c1312f8b791eb56d9935e6fc47d"
-+dugite@^1.67.0:
-+  version "1.67.0"
-+  resolved "https://registry.yarnpkg.com/dugite/-/dugite-1.67.0.tgz#389f95051aa1fb2bc78dcee4294f913ae3438c47"
-   dependencies:
-     checksum "^0.1.1"
-     mkdirp "^0.5.1"
-     progress "^2.0.0"
--    request "^2.83.0"
-+    request "^2.86.0"
-     rimraf "^2.5.4"
-     tar "^4.0.2"
-
-@@ -324,10 +296,6 @@
-     jsonfile "^2.2.3"
-     mkdirp "^0.5.1"
-
--emojis-list@^2.0.0:
--  version "2.1.0"
--  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
--
- encoding@^0.1.11:
-   version "0.1.12"
-   resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
-@@ -338,10 +306,6 @@
-   version "1.0.5"
-   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-
--esprima@^4.0.0:
--  version "4.0.0"
--  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
--
- event-kit@^2.0.0:
-   version "2.4.0"
-   resolved "https://registry.yarnpkg.com/event-kit/-/event-kit-2.4.0.tgz#718aaf22df76670024ad66922483e1bba0544f33"
-@@ -409,18 +373,13 @@
-     combined-stream "^1.0.5"
-     mime-types "^2.1.12"
-
--front-matter@^2.1.2:
--  version "2.2.0"
--  resolved "https://registry.yarnpkg.com/front-matter/-/front-matter-2.2.0.tgz#35205f67522430b1213ef26149ecb068579fe38a"
--  dependencies:
--    js-yaml "^3.4.6"
--
--fs-extra@^2.1.2:
--  version "2.1.2"
--  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-2.1.2.tgz#046c70163cef9aad46b0e4a7fa467fb22d71de35"
-+fs-extra@^6.0.0:
-+  version "6.0.0"
-+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-6.0.0.tgz#0f0afb290bb3deb87978da816fcd3c7797f3a817"
-   dependencies:
-     graceful-fs "^4.1.2"
--    jsonfile "^2.1.0"
-+    jsonfile "^4.0.0"
-+    universalify "^0.1.0"
-
- fs-minipass@^1.2.3:
-   version "1.2.3"
-@@ -472,23 +431,10 @@
-   version "2.0.0"
-   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
-
--hawk@~6.0.2:
--  version "6.0.2"
--  resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038"
--  dependencies:
--    boom "4.x.x"
--    cryptiles "3.x.x"
--    hoek "4.x.x"
--    sntp "2.x.x"
--
- highlight.js@^9.3.0:
-   version "9.12.0"
-   resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.12.0.tgz#e6d9dbe57cbefe60751f02af336195870c90c01e"
-
--hoek@4.x.x:
--  version "4.2.0"
--  resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d"
--
- html-entities@^1.2.0:
-   version "1.2.1"
-   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
-@@ -516,7 +462,7 @@
-     once "^1.3.0"
-     wrappy "1"
-
--inherits@2:
-+inherits@2, inherits@~2.0.0:
-   version "2.0.3"
-   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-
-@@ -547,13 +493,6 @@
-   version "3.0.2"
-   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
-
--js-yaml@^3.4.6:
--  version "3.10.0"
--  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc"
--  dependencies:
--    argparse "^1.0.7"
--    esprima "^4.0.0"
--
- jsbn@~0.1.0:
-   version "0.1.1"
-   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-@@ -570,16 +509,18 @@
-   version "5.0.1"
-   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-
--json5@^0.5.0:
--  version "0.5.1"
--  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
--
--jsonfile@^2.1.0, jsonfile@^2.2.3:
-+jsonfile@^2.2.3:
-   version "2.4.0"
-   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
-   optionalDependencies:
-     graceful-fs "^4.1.6"
-
-+jsonfile@^4.0.0:
-+  version "4.0.0"
-+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
-+  optionalDependencies:
-+    graceful-fs "^4.1.6"
-+
- jsprim@^1.2.2:
-   version "1.4.1"
-   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
-@@ -603,14 +544,6 @@
-   dependencies:
-     nan "2.5.1"
-
--loader-utils@^1.0.2:
--  version "1.1.0"
--  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
--  dependencies:
--    big.js "^3.1.3"
--    emojis-list "^2.0.0"
--    json5 "^0.5.0"
--
- loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.0, loose-envify@^1.3.1:
-   version "1.3.1"
-   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
-@@ -777,6 +710,12 @@
-   version "0.2.0"
-   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
-
-+queue@^4.4.2:
-+  version "4.4.2"
-+  resolved "https://registry.yarnpkg.com/queue/-/queue-4.4.2.tgz#5a9733d9a8b8bd1b36e934bc9c55ab89b28e29c7"
-+  dependencies:
-+    inherits "~2.0.0"
-+
- react-addons-shallow-compare@^15.6.2:
-   version "15.6.2"
-   resolved "https://registry.yarnpkg.com/react-addons-shallow-compare/-/react-addons-shallow-compare-15.6.2.tgz#198a00b91fc37623db64a28fd17b596ba362702f"
-@@ -784,15 +723,19 @@
-     fbjs "^0.8.4"
-     object-assign "^4.1.0"
-
--react-dom@^16.2.0:
--  version "16.2.0"
--  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.2.0.tgz#69003178601c0ca19b709b33a83369fe6124c044"
-+react-dom@^16.3.2:
-+  version "16.3.2"
-+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.3.2.tgz#cb90f107e09536d683d84ed5d4888e9640e0e4df"
-   dependencies:
-     fbjs "^0.8.16"
-     loose-envify "^1.1.0"
-     object-assign "^4.1.1"
-     prop-types "^15.6.0"
-
-+react-lifecycles-compat@^3.0.4:
-+  version "3.0.4"
-+  resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
-+
- react-transition-group@^1.2.0:
-   version "1.2.1"
-   resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-1.2.1.tgz#e11f72b257f921b213229a774df46612346c7ca6"
-@@ -803,19 +746,20 @@
-     prop-types "^15.5.6"
-     warning "^3.0.0"
-
--react-virtualized@^9.18.5:
--  version "9.18.5"
--  resolved "https://registry.yarnpkg.com/react-virtualized/-/react-virtualized-9.18.5.tgz#42dd390ebaa7ea809bfcaf775d39872641679b89"
-+react-virtualized@^9.20.0:
-+  version "9.20.0"
-+  resolved "https://registry.yarnpkg.com/react-virtualized/-/react-virtualized-9.20.0.tgz#b024992cc857c1a1b2884a019ac52ed686cd690b"
-   dependencies:
-     babel-runtime "^6.26.0"
-     classnames "^2.2.3"
-     dom-helpers "^2.4.0 || ^3.0.0"
-     loose-envify "^1.3.0"
-     prop-types "^15.6.0"
-+    react-lifecycles-compat "^3.0.4"
-
--react@^16.2.0:
--  version "16.2.0"
--  resolved "https://registry.yarnpkg.com/react/-/react-16.2.0.tgz#a31bd2dab89bff65d42134fa187f24d054c273ba"
-+react@^16.3.2:
-+  version "16.3.2"
-+  resolved "https://registry.yarnpkg.com/react/-/react-16.3.2.tgz#fdc8420398533a1e58872f59091b272ce2f91ea9"
-   dependencies:
-     fbjs "^0.8.16"
-     loose-envify "^1.1.0"
-@@ -832,9 +776,9 @@
-   dependencies:
-     nan "^2.8.0"
-
--request@^2.83.0:
--  version "2.83.0"
--  resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
-+request@^2.86.0:
-+  version "2.87.0"
-+  resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e"
-   dependencies:
-     aws-sign2 "~0.7.0"
-     aws4 "^1.6.0"
-@@ -844,7 +788,6 @@
-     forever-agent "~0.6.1"
-     form-data "~2.3.1"
-     har-validator "~5.0.3"
--    hawk "~6.0.2"
-     http-signature "~1.2.0"
-     is-typedarray "~1.0.0"
-     isstream "~0.1.2"
-@@ -854,7 +797,6 @@
-     performance-now "^2.1.0"
-     qs "~6.5.1"
-     safe-buffer "^5.1.1"
--    stringstream "~0.0.5"
-     tough-cookie "~2.3.3"
-     tunnel-agent "^0.6.0"
-     uuid "^3.1.0"
-@@ -887,12 +829,6 @@
-   version "1.0.5"
-   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
-
--sntp@2.x.x:
--  version "2.1.0"
--  resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8"
--  dependencies:
--    hoek "4.x.x"
--
- source-map-support@^0.4.15:
-   version "0.4.18"
-   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
-@@ -903,10 +839,6 @@
-   version "0.5.7"
-   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-
--sprintf-js@~1.0.2:
--  version "1.0.3"
--  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
--
- sshpk@^1.7.0:
-   version "1.13.1"
-   resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3"
-@@ -925,10 +857,6 @@
-   version "0.0.10"
-   resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
-
--stringstream@~0.0.5:
--  version "0.0.5"
--  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
--
- strip-ansi@^3.0.0:
-   version "3.0.1"
-   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-@@ -945,12 +873,6 @@
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
-
--style-loader@^0.13.2:
--  version "0.13.2"
--  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.13.2.tgz#74533384cf698c7104c7951150b49717adc2f3bb"
--  dependencies:
--    loader-utils "^1.0.2"
--
- supports-color@^4.0.0:
-   version "4.4.0"
-   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.4.0.tgz#883f7ddabc165142b2a61427f3352ded195d1a3e"
-@@ -999,6 +921,10 @@
-   version "0.7.14"
-   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.14.tgz#110d53fa4c3f326c121292bbeac904d2e03387ca"
-
-+universalify@^0.1.0:
-+  version "0.1.1"
-+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.1.tgz#fa71badd4437af4c148841e3b3b165f9e9e590b7"
-+
- untildify@^3.0.2:
-   version "3.0.2"
-   resolved "https://registry.yarnpkg.com/untildify/-/untildify-3.0.2.tgz#7f1f302055b3fea0f3e81dc78eb36766cb65e3f1"
-merged
-  result 100644 5185c7d6e7e86cafdb3aec94115c1120c9e776a2 appveyor.yml
-  our    100644 e9a9426356bf8465dbdc277c0ee9a2fb876e5e67 appveyor.yml
-@@ -4,7 +4,7 @@
-   - x64
-
- environment:
--  nodejs_version: "8.9.0"
-+  nodejs_version: "8.11"
-
- cache:
-   - .eslintcache
-merged
-  result 100644 6e0feab6683b3ff164dfee68d69eb6fdd5478b53 changelog.json
-  our    100644 061dd96a1d5f2e461c954e4a3e42398dfd8fc837 changelog.json
-@@ -1,5 +1,194 @@
- {
-   "releases": {
-+    "1.2.7-test1": [
-+      "Sanity check deployment for refactored scripts"
-+    ],
-+    "1.2.7-beta0": [
-+      "[Fixed] Visual indicator for upcoming feature should not be shown - #5026"
-+    ],
-+    "1.2.6": [
-+      "[Fixed] Visual indicator for upcoming feature should not be shown - #5026"
-+    ],
-+    "1.2.6-beta0": [
-+      "[Fixed] Feature flag for upcoming feature not applied correctly - #5024"
-+    ],
-+    "1.2.5": [
-+      "[Fixed] Feature flag for upcoming feature not applied correctly - #5024"
-+    ],
-+    "1.2.4": [
-+      "[New] Dark Theme preview - #4849",
-+      "[Added] Syntax highlighting for Cake files - #4935. Thanks @say25!",
-+      "[Added] WebStorm support for macOS - #4841. Thanks @mrsimonfletcher!",
-+      "[Fixed] Compare tab appends older commits when scrolling to bottom of list - #4964",
-+      "[Fixed] Remove temporary directory after Git LFS operation completes - #4414",
-+      "[Fixed] Unable to compare when two branches exist - #4947 #4730",
-+      "[Fixed] Unhandled errors when refreshing pull requests fails - #4844 #4866",
-+      "[Improved] Remove context menu needs to hint if a dialog will be shown - #4975",
-+      "[Improved] Upgrade embedded Git LFS - #4602 #4745",
-+      "[Improved] Update banner message clarifies that only Desktop needs to be restarted - #4891. Thanks @KennethSweezy!",
-+      "[Improved] Discard Changes context menu entry should contain ellipses when user needs to confirm - #4846. Thanks @yongdamsh!",
-+      "[Improved] Initializing syntax highlighting components - #4764",
-+      "[Improved] Only show overflow shadow when description overflows - #4898",
-+      "[Improved] Changes tab displays number of changed files instead of dot - #4772. Thanks @yongdamsh!"
-+    ],
-+    "1.2.4-beta5": [
-+
-+    ],
-+    "1.2.4-beta4": [
-+      "[Fixed] Compare tab appends older commits when scrolling to bottom of list - #4964",
-+      "[Fixed] Remove temporary directory after Git LFS operation completes - #4414",
-+      "[Improved] Remove context menu needs to hint if a dialog will be shown - #4975",
-+      "[Improved] Upgrade embedded Git LFS - #4602 #4745"
-+    ],
-+    "1.2.4-test1": [
-+      "Confirming latest Git LFS version addresses reported issues"
-+    ],
-+    "1.2.4-beta3": [
-+      "[Added] WebStorm support for macOS - #4841. Thanks @mrsimonfletcher!",
-+      "[Improved] Update banner message clarifies that only Desktop needs to be restarted - #4891. Thanks @KennethSweezy!"
-+    ],
-+    "1.2.4-beta2": [
-+    ],
-+    "1.2.4-beta1": [
-+      "[New] Dark Theme preview - #4849",
-+      "[Added] Syntax highlighting for Cake files - #4935. Thanks @say25!",
-+      "[Fixed] Unable to compare when two branches exist - #4947 #4730",
-+      "[Fixed] Unhandled errors when refreshing pull requests fails - #4844 #4866",
-+      "[Improved] Discard Changes context menu entry should contain ellipses when user needs to confirm - #4846. Thanks @yongdamsh!",
-+      "[Improved] Initializing syntax highlighting components - #4764",
-+      "[Improved] Only show overflow shadow when description overflows - #4898",
-+      "[Improved] Changes tab displays number of changed files instead of dot - #4772. Thanks @yongdamsh!"
-+    ],
-+    "1.2.3": [
-+      "[Fixed] No autocomplete when searching for co-authors - #4847",
-+      "[Fixed] Error when checking out a PR from a fork - #4842"
-+    ],
-+    "1.2.3-beta1": [
-+      "[Fixed] No autocomplete when searching for co-authors - #4847",
-+      "[Fixed] Error when checking out a PR from a fork - #4842"
-+    ],
-+    "1.2.3-test1": [
-+      "Confirming switch from uglify-es to babel-minify addresses minification issue - #4871"
-+    ],
-+    "1.2.2": [
-+      "[Fixed] Make cURL/schannel default to using the Windows certificate store - #4817",
-+      "[Fixed] Restore text selection highlighting in diffs - #4818"
-+    ],
-+    "1.2.2-beta1": [
-+      "[Fixed] Make cURL/schannel default to using the Windows certificate store - #4817",
-+      "[Fixed] Text selection highlighting in diffs is back - #4818"
-+    ],
-+    "1.2.1": [
-+      "[Added] Brackets support for macOS - #4608. Thanks @3raxton!",
-+      "[Added] Pull request number and author are included in fuzzy-find filtering - #4653. Thanks @damaneice!",
-+      "[Fixed] Decreased the max line length limit - #3740. Thanks @sagaragarwal94!",
-+      "[Fixed] Updated embedded Git to 2.17.1 to address upstream security issue - #4791",
-+      "[Improved] Display the difference in file size of an image in the diff view - #4380. Thanks @ggajos!"
-+    ],
-+    "1.2.1-test1": [
-+      "Upgraded embedded Git to 2.17.0"
-+    ],
-+    "1.2.1-beta1": [
-+      "[Added] Brackets support for macOS - #4608. Thanks @3raxton!",
-+      "[Added] Pull request number and author are included in fuzzy-find filtering - #4653. Thanks @damaneice!",
-+      "[Fixed] Decreased the max line length limit - #3740. Thanks @sagaragarwal94!",
-+      "[Fixed] Updated embedded Git to 2.17.1 to address upstream security issue - #4791",
-+      "[Improved] Display the difference in file size of an image in the diff view - #4380. Thanks @ggajos!"
-+    ],
-+    "1.2.1-beta0": [
-+
-+    ],
-+    "1.1.2-test6": [
-+      "Testing the Webpack v4 output from the project"
-+    ],
-+    "1.2.0": [
-+      "[New] History now has ability to compare to another branch and merge outstanding commits",
-+      "[New] Support for selecting more than one file in the changes list - #1712. Thanks @icosamuel!",
-+      "[New] Render bitmap images in diffs - #4367. Thanks @MagicMarvMan!",
-+      "[Added] Add PowerShell Core support for Windows and macOS - #3791. Thanks @saschanaz!",
-+      "[Added] Add MacVim support for macOS - #4532. Thanks @johnelliott!",
-+      "[Added] Syntax highlighting for JavaServer Pages (JSP) - #4470. Thanks @damaneice!",
-+      "[Added] Syntax highlighting for Haxe files - #4445. Thanks @Gama11!",
-+      "[Added] Syntax highlighting for R files - #4455. Thanks @say25!",
-+      "[Fixed] 'Open in Shell' on Linux ensures Git is on PATH - #4619. Thanks @ziggy42!",
-+      "[Fixed] Pressing 'Enter' on filtered Pull Request does not checkout - #4673",
-+      "[Fixed] Alert icon shrinks in rename dialog when branch name is long - #4566",
-+      "[Fixed] 'Open in Desktop' performs fetch to ensure branch exists before checkout - #3006",
-+      "[Fixed] 'Open in Default Program' on Windows changes the window title - #4446",
-+      "[Fixed] Skip fast-forwarding when there are many eligible local branches - #4392",
-+      "[Fixed] Image diffs not working for files with upper-case file extension - #4466",
-+      "[Fixed] Syntax highlighting not working for files with upper-case file extension - #4462. Thanks @say25!",
-+      "[Fixed] Error when creating Git LFS progress causes clone to fail - #4307. Thanks @MagicMarvMan!",
-+      "[Fixed] 'Open File in External Editor' always opens a new instance - #4381",
-+      "[Fixed] 'Select All' shortcut now works for changes list - #3821",
-+      "[Improved] Automatically add valid repository when using command line interface - #4513. Thanks @ggajos!",
-+      "[Improved] Always fast-forward the default branch - #4506",
-+      "[Improved] Warn when trying to rename a published branch - #4035. Thanks @agisilaos!",
-+      "[Improved] Added context menu for files in commit history - #2845. Thanks @crea7or",
-+      "[Improved] Discarding all changes always prompts for confirmation - #4459",
-+      "[Improved] Getting list of changed files is now more efficient when dealing with thousands of files - #4443",
-+      "[Improved] Checking out a Pull Request may skip unnecessary fetch - #4068. Thanks @agisilaos!",
-+      "[Improved] Commit summary now has a hint to indicate why committing is disabled - #4429.",
-+      "[Improved] Pull request status text now matches format on GitHub - #3521",
-+      "[Improved] Add escape hatch to disable hardware acceleration when launching - #3921"
-+    ],
-+    "1.1.2-beta7": [
-+    ],
-+    "1.1.2-beta6": [
-+      "[Added] Add MacVim support for macOS - #4532. Thanks @johnelliott!",
-+      "[Fixed] Open in Shell on Linux ensures Git is available on the user's PATH - #4619. Thanks @ziggy42!",
-+      "[Fixed] Keyboard focus issues when navigating Pull Request list - #4673",
-+      "[Improved] Automatically add valid repository when using command line interface - #4513. Thanks @ggajos!"
-+    ],
-+    "1.1.2-test5": [
-+      "Actually upgrading fs-extra to v6 in the app"
-+    ],
-+    "1.1.2-test4": [
-+      "Upgrading fs-extra to v6"
-+    ],
-+    "1.1.2-beta5": [
-+      "[Added] Syntax highlighting for JavaServer Pages (JSP) - #4470. Thanks @damaneice!",
-+      "[Fixed] Prevent icon from shrinking in rename dialog - #4566"
-+    ],
-+    "1.1.2-beta4": [
-+      "[New] New Compare tab allowing visualization of the relationship between branches",
-+      "[New] Support for selecting more than one file in the changes list - #1712. Thanks @icosamuel!",
-+      "[Fixed] 'Select All' shortcut now works for changes list - #3821",
-+      "[Improved] Always fast-forward the default branch - #4506",
-+      "[Improved] Warn when trying to rename a published branch - #4035. Thanks @agisilaos!",
-+      "[Improved] Added context menu for files in commit history - #2845. Thanks @crea7or",
-+      "[Improved] Discarding all changes always prompts for confirmation - #4459"
-+    ],
-+    "1.1.2-beta3": [
-+      "[Added] Syntax highlighting for Haxe files - #4445. Thanks @Gama11!",
-+      "[Added] Syntax highlighting for R files - #4455. Thanks @say25!",
-+      "[Fixed] Fetch to ensure \"Open in Desktop\" has a branch to checkout - #3006",
-+      "[Fixed] Handle the click event when opening a binary file - #4446",
-+      "[Fixed] Skip fast-forwarding when there are a lot of eligible local branches - #4392",
-+      "[Fixed] Image diffs not working for files with upper-case file extension - #4466",
-+      "[Fixed] Syntax highlighting not working for files with upper-case file extension - #4462. Thanks @say25!",
-+      "[Improved] Getting list of changed files is now more efficient when dealing with thousands of files - #4443",
-+      "[Improved] Checking out a Pull Request may skip unnecessary fetch - #4068. Thanks @agisilaos!",
-+      "[Improved] Commit summary now has a hint to indicate why committing is disabled - #4429."
-+    ],
-+    "1.1.2-test3": [
-+      "[New] Comparison Branch demo build"
-+    ],
-+    "1.1.2-test2": [
-+      "Refactoring the diff internals to potentially land some SVG improvements"
-+    ],
-+    "1.1.2-test1": [
-+      "Refactoring the diff internals to potentially land some SVG improvements"
-+    ],
-+    "1.1.2-beta2": [
-+      "[New] Render bitmap images in diffs - #4367. Thanks @MagicMarvMan!",
-+      "[New] Add PowerShell Core support for Windows and macOS - #3791. Thanks @saschanaz!",
-+      "[Fixed] Error when creating Git LFS progress causes clone to fail - #4307. Thanks @MagicMarvMan!",
-+      "[Fixed] 'Open File in External Editor' does not use existing window - #4381",
-+      "[Fixed] Always ask for confirmation when discarding all changes - #4423",
-+      "[Improved] Pull request status text now matches format on GitHub - #3521",
-+      "[Improved] Add escape hatch to disable hardware acceleration when launching - #3921"
-+    ],
-     "1.1.2-beta1": [
-
-     ],
-merged
-  result 100644 19865d13f3ab50d13c233da23115035bf423212e circle.yml
-  our    100644 6dc532103b44f2896468ac6d61f4b4db4d2394f7 circle.yml
-@@ -20,12 +20,12 @@
-     - brew update
-     # uninstall Node 6 which is shipped by default on Circle
-     - brew uninstall node
--    # install latest Node LTS (8.9.3 as of writing)
-+    # install latest Node LTS (8.11.* as of writing)
-     - brew install node@8 --force
-     # everything is terrible, but we must march on
-     - brew link --overwrite node@8 --force
-     # workaround for yarn installation issue
--    - curl -o- -L https://yarnpkg.com/install.sh | TERM=xterm bash
-+    - curl -o- -L https://yarnpkg.com/install.sh | TERM=xterm bash -s -- --version 1.5.1
-
-   override:
-     - yarn install --force
-merged
-  result 100644 85f2237dba6b5f8296b3fe7c9214125fb1ab8291 docs/README.md
-  our    100644 1b5837911492e094338cbe0808ba278c35d4ed08 docs/README.md
-@@ -28,7 +28,7 @@
-     releases
-  - **[Issue Triage](process/issue-triage.md)** - how we address issues reported
-     by users
-- - **[Review Process](process/reviews.md)** - how we review contributions
-+ - **[Pull Request Triage](process/pull-request-triage.md)** - how contributions are reviewed
-  - **[Releasing Updates](process/releasing-updates.md)** - how we deploy things
-
- ## Technical
-merged
-  result 100644 e6d7547da4874c319f72d7264d11e060f2270d41 docs/contributing/setup.md
-  our    100644 5b9cda4685280976fbfceb7265cab922d7b508b3 docs/contributing/setup.md
-@@ -6,13 +6,13 @@
-
- ### macOS
-
-- - [Node.js v8.9.0](https://nodejs.org/dist/v8.9.0/)
-+ - [Node.js v8.11.2](https://nodejs.org/dist/v8.11.2/)
-  - [Python 2.7](https://www.python.org/downloads/mac-osx/)
-  - Xcode and Xcode Command Line Tools (Xcode -> Preferences -> Downloads)
-
- ### Windows
-
-- - [Node.js v8.9.0](https://nodejs.org/dist/v8.9.0/)
-+ - [Node.js v8.11.2](https://nodejs.org/dist/v8.11.2/)
-     - *Make sure you allow the Node.js installer to add node to the PATH.*
-  - [Python 2.7](https://www.python.org/downloads/windows/)
-     - *Let Python install into the default suggested path (`c:\Python27`), otherwise you'll have
-@@ -32,7 +32,7 @@
-
- ### Fedora 26
-
--First, add the NodeJS package repository.
-+First, add the NodeJS package repository for 8.x.
-
- ```shellsession
- $ curl --silent --location https://rpm.nodesource.com/setup_8.x | sudo bash -
-@@ -67,7 +67,7 @@
- $ sudo apt install curl
- ```
-
--Then add the NodeJS package repository:
-+Then add the NodeJS package repository for 8.x:
-
- ```shellsession
- $ curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash -
-@@ -95,35 +95,45 @@
- on setup there.
- * Instead of running `yarn` to get all required dependencies on your machine, you will
- instead need to run `script/install-arm64-deps.sh`.
-+* Before building with `yarn build:dev` or `yarn build:prod`, you will need to
-+set the environment variable `TARGET_ARCH` to `arm64` eg:
-+```shellsession
-+export TARGET_ARCH=arm64
-+```
-
--## Verification
-+## Install Yarn
-
--With these things installed, open a shell and install `yarn` (you might need
--to `sudo` here depending on how Node was installed):
-+After doing this setup, you also need to install `yarn` as Desktop uses
-+this for managing packages instead of NPM. **Do not install `yarn` through
-+NPM**. Refer to the [install instructions](https://yarnpkg.com/en/docs/install)
-+for your OS.
-
--```shellsession
--$ npm install -g yarn@1.3.2
--```
-+This is important because `yarn` uses lock files to pin dependencies. If you
-+find yourself changing packages, this will prevent mismatches in versions
-+between machines.
-+
-+If you're not familiar with `yarn`, please read [this document](./working-with-packages.md)
-+to help familiarize yourself with how to do the common package tasks that are
-+relevant to Desktop.
-
--This is important because yarn uses lock files to pin dependencies. If you find
--yourself changing packages, this will prevent mismatches in versions between machines.
-+## Verification
-
--Then validate you have these commands available and that the versions look similar:
-+Then verify you have these commands available in your shell and that the found
-+versions look similar to the below output:
-
- ```shellsession
- $ node -v
--v7.8.0
-+v8.11.2
-
- $ yarn -v
--1.2.0
-+1.5.1
-
- $ python --version
- Python 2.7.13
- ```
-
--There are also [additional resources](tooling.md) to
--configure your favorite editor to work nicely with the GitHub Desktop
--repository.
-+There are also [additional resources](tooling.md) to configure your favorite
-+editor to work nicely with the GitHub Desktop repository.
-
- ## Building Desktop
-
-@@ -133,7 +143,7 @@
- * Run `yarn` to get all required dependencies on your machine.
- * Run `yarn build:dev` to create a development build of the app.
- * Run `yarn start` to launch the application. Changes will be compiled in the
--  background. The app can then be reloaded to see the changes (Ctrl/Command+R).
-+  background. The app can then be reloaded to see the changes (<kbd>Ctrl/Command+Alt+R</kbd>).
-
- **Optional Tip**: On macOS and Linux, you can use `screen` to avoid filling your terminal with logging output:
-
-@@ -156,25 +166,15 @@
- ## Running tests
-
- - `yarn test` - Runs all unit and integration tests
--- `yarn test:unit` - Runs all unit tests
-+- `yarn test:unit` - Runs all unit tests (add `--debug` to open Chrome Dev Tools while running tests)
- - `yarn test:integration` - Runs all integration tests
-
--**Pro Tip:** If you're only interested in the results of a single test and don't
--wish to run the entire test suite to see it you can pass along a search string
--in order to only run the tests that match that string.
--
--```shellsession
--$ yarn test:unit -- --grep CloneProgressParser
--```
--
--This example will run all test names containing `CloneProgressParser`.
--
- ## Debugging
-
- Electron ships with Chrome Dev Tools to assist with debugging, profiling and
- other measurement tools.
-
--1. Run the command `npm start` to launch the app
-+1. Run the command `yarn start` to launch the app
- 2. Under the **View** menu, select **Toggle Developer Tools**
-
- When running the app in development mode,
-@@ -193,7 +193,7 @@
-
- You're almost there! Here's a couple of things we recommend you read next:
-
-- - [Help Wanted](../../.github/CONTRIBUTING.md#help-wanted) - we've marked some tasks in
--   the backlog that are ideal for external contributors
-- - [Code Reviews](../process/reviews.md) - some notes on how the team does
--   code reviews
-+ - [Help Wanted](../../.github/CONTRIBUTING.md#help-wanted) - we've marked some
-+   tasks in the backlog that are ideal for external contributors
-+ - [Notes for Contributors](../process/notes-for-contributors.md) - some notes
-+   for new contributors getting started
-merged
-  result 100644 68616f214de0f1dfb283dee8a0d503eabf3374f2 docs/contributing/styleguide.md
-  our    100644 3dd9587dfcc10f13be634b635aa26bee01b894ea docs/contributing/styleguide.md
-@@ -41,7 +41,7 @@
-
- The [`Dispatcher`](https://github.com/desktop/desktop/blob/master/app/src/lib/dispatcher/dispatcher.ts)
- is the entry point for most interactions with the application which update state,
--and for most usages this work is then delegated to the [`AppStore`](https://github.com/desktop/desktop/blob/master/app/src/lib/dispatcher/app-store.ts).
-+and for most usages this work is then delegated to the [`AppStore`](https://github.com/desktop/desktop/blob/master/app/src/lib/stores/app-store.ts).
- Due to this coupling, we need to discourage callers directly manipulating
- specific methods in the `AppStore` unless there's a compelling reason.
-
-merged
-  result 100644 265fc7e708fdeb51902542f01f6dc5ab7fcf1272 docs/known-issues.md
-  our    100644 6260d6cfcc30bb19e986dc534dd64471b05506a3 docs/known-issues.md
-@@ -14,7 +14,7 @@
-
- ### My issue is not listed here?
-
--Please check the [open](https://github.com/desktop/desktop/labels/bug) and [closed](https://github.com/desktop/desktop/issues?q=is%3Aclosed+label%3Abug) bugs in the issue tracker for the details of your bug. If you can't find it, or if you're not sure, open a [new issue](https://github.com/desktop/desktop/issues/new).
-+Please check the [open](https://github.com/desktop/desktop/labels/bug) and [closed](https://github.com/desktop/desktop/issues?q=is%3Aclosed+label%3Abug) bugs in the issue tracker for the details of your bug. If you can't find it, or if you're not sure, open a [new issue](https://github.com/desktop/desktop/issues/new?template=bug_report.md).
-
- ## macOS
-
-@@ -118,3 +118,9 @@
- Enabling Mandatory ASLR affects the MSYS2 core library, which is relied upon by Git for Windows to emulate process forking.
-
- **Not supported:** this is an upstream limitation of MSYS2, and it is recommend that you either disable Mandatory ASLR or whitelist all executables under `<Git>\usr\bin` which depend on MSYS2.
-+
-+### I get a black screen when launching Desktop
-+
-+Electron enables hardware accelerated graphics by default, but some graphics cards have issues with hardware acceleration which means the application will launch successfully but it will be a black screen.
-+
-+**Workaround:** if you set the `GITHUB_DESKTOP_DISABLE_HARDWARE_ACCELERATION` environment variable to any value and launch Desktop again it will disable hardware acceleration on launch, so the application is usable.
-\ No newline at end of file
-added in remote
-  their  100644 1fd166574ae526e79f25a6163285059d9f837946 docs/process/notes-for-contributors.md
-@@ -0,0 +1,37 @@
-+## Notes for Contributors
-+
-+### Work-in-Progress
-+
-+We recommend open pull requests early - ideally as soon as you have something to
-+show. This is especially helpful for large pieces of work, as continuous
-+integration tests are run earlier on, and regressions can be caught before
-+humans get involved.
-+
-+Until the code is ready for review, you can prefix the PR title with [WIP] to
-+indicate that it's under development.
-+
-+### Use Task Lists
-+
-+If you are working through a list of tasks as part of a pull request, listing
-+those tasks and indicating when they have been completed helps reviewers to
-+understand quickly what's changed.
-+
-+### Keep The Commit History Tidy
-+
-+We're not that fussy about the history, but to make reviewing easier here's
-+some general tips:
-+
-+ - make small, meaningful and logical commits - these make the review process easier
-+ - [write good commit messages](https://chris.beams.io/posts/git-commit/) -
-+   these help the reviewer to understand the changes
-+ - keep up to date with `master` - not only does this address potential merge
-+   conflicts, it ensures you're integrating with the latest code
-+
-+When merging, we prefer you merge `master` into your branch, but for small
-+PRs a rebase is fine.
-+
-+### These Things Take Time
-+
-+Our team is distributed around the world, and often we like to get their
-+feedback for specific areas of the codebase. And even with minor changes, we often like to let
-+them sit for a while and give everyone a chance to provide their input.
-added in remote
-  their  100644 4c2d1f5be688335f169fe3e3b466e96883b2913f docs/process/pull-request-triage.md
-@@ -0,0 +1,100 @@
-+# Pull Request Triage
-+
-+This document outlines how the Desktop team handles pull requests, to ensure
-+a consistent process for contributions from the core team and the community.
-+
-+## The Review Process
-+
-+1. **Contributor** opens pull request.
-+1. When it's ready for review, add a comment to the pull request.
-+1. A member of the reviewer team will give it a quick look over and
-+   add the `ready-for-review` label.
-+1. A **reviewer** with bandwidth will appear.
-+1. **Reviewer** assigns the PR to themselves.
-+1. **Reviewer** leaves line comments with suggestions or questions.
-+1. When the **reviewer** is done they comment on the PR with an emoji, meme,
-+   pokémon, or words to that effect.
-+1. The **contributor** responds to feedback, makes changes, etc.
-+1. When the **contributor** is ready for the **reviewer** to re-review, they
-+   comment on the PR with an emoji, meme, pokémon or words to that effect.
-+1. Goto 6 until both parties are happy with the PR.
-+1. The **reviewer** hits the big green merge button and deletes the branch (if
-+    applicable).
-+
-+Merged contributions are first published to the beta channel (we aim to publish
-+new versions weekly if contributions are availlable) before then being
-+published to the production channel (we aim to publish new versions on a monthly
-+cadence).
-+
-+### When The Review Is Done
-+
-+We're using GitHub's review tools to co-ordinate feedback, and we like to be
-+methodical with our reviews, so you'll probably end up with one of two results:
-+
-+ - **Approved**: nothing else to do; the contribution is great! :gem:
-+ - **Request Changes**: there are things to address; reviewer provides details :memo:
-+
-+Reviews can take a few iterations, especially for large contributions. Don't
-+be disheartened if you feel it takes time - we just want to ensure each
-+contribution is high-quality and that any outstanding questions are resolved,
-+captured or documented for posterity.
-+
-+### Assignees
-+
-+The reviewers team uses the **Assignee** field to indicate who "owns" the review
-+process for a contribution. While others can add their reviews to a pull request -
-+and large features will likely have multiple reviewers - it's up to the assignee
-+to take charge of the process and see it through to the end.
-+
-+If a reviewer is feeling overloaded, or if a review has stalled, the reviewer may
-+remove themselves from a pull request. This helps others know where they can help
-+out to share the load.
-+
-+### Everyone Reviews
-+
-+While everyone has their own domain expertise around the codebase, we encourage
-+people to share the load of reviews and reviewing areas of the codebase that
-+aren't as familiar. This spreads knowledge across the team
-+
-+### 24 Hours Cooling Off
-+
-+After being approved, most contributions will remain in this state for at least
-+24 hours before merging. The review team does this to ensure everyone on the team,
-+who are normally spread around the world, has a chance to provide feedback about
-+the changes.
-+
-+### No Self-Merges
-+
-+We encourage a strong review culture, and contributors should not merge their
-+own PRs unless there are exceptional reasons.
-+
-+Examples of exceptional situations:
-+
-+- [#2733](https://github.com/desktop/desktop/pull/2733) was pinning a dependency
-+  that affected our continuous integration tests by installing the incorrect
-+  version
-+
-+- [#4319](https://github.com/desktop/desktop/pull/4319) was a minor packaging
-+  change introduced unexpectedly on `master` but would affect everyone when they
-+  updated their local repositories.
-+
-+These should be called out by the merging person with a `#jolo` - "Josh Only
-+Lives Once" - to acknowledge to everyone that they're bypassing the review
-+process, and the reasons for doing that.
-+
-+### Stale Pull Requests
-+
-+A reviewer will return to an **open and reviewed** pull request if, after 14
-+days:
-+
-+ - no response has been received from the contributor, or
-+ - no new commits have been made to the pull request
-+
-+This is done to ensure we keep the number of reviews under control.
-+
-+The reviewer should ask if the contributor is still interested in working on
-+this, and indicate that they are welcome to open a fresh pull request later if
-+they lack the time currently to continue on.
-+
-+If it's agreed to put this contribution on hold, or if no feedback is
-+received after 3 days, the pull request will be closed.
-merged
-  result 100644 268eeb03374d21788fd404ce2b1398f8fafd53a2 docs/process/releasing-updates.md
-  our    100644 bf564284a648d40cfd836cff85fe41a788edd31a docs/process/releasing-updates.md
-@@ -135,7 +135,7 @@
-
- We're using `.release` with a bang so that we don't have to wait for any current CI on the branch to finish. This might feel a little wrong, but it's OK since making the release itself will also run CI.
-
--If you're releasing a `production` update, release a `beta` update for the next version too, so that beta users are on the latest release.
-+If you're releasing a `production` update, release a `beta` update for the next version too, so that beta users are on the latest release. For example, if the version just released to production is `1.2.0` then the beta release should be `1.2.1-beta0` to indicate there are no new changes on top of what's currently on `production`.
-
- ### 4. Check for Completed Release
-
-removed in remote
-  base   100644 bac857303b48b6efb4fd0ddf4c8b07d6d3b64477 docs/process/reviews.md
-  our    100644 bac857303b48b6efb4fd0ddf4c8b07d6d3b64477 docs/process/reviews.md
-@@ -1,93 +0,0 @@
--# The Review Process
--
--This is the typical flow:
--
--1. **Contributor** opens pull request.
--1. When it's ready for review, they comment on it saying so.
--1. A member of the maintainer team will give it a quick look over and
--   add the `ready-for-review` label.
--1. Suddenly a wild **reviewer** appears!
--1. **Reviewer** assigns the PR to themselves.
--1. **Reviewer** leaves line comments with suggestions or questions.
--1. When the **reviewer** is done they comment on the PR with an emoji, meme,
--   pokémon, or words to that effect.
--1. The **contributor** responds to feedback, makes changes, etc.
--1. When the **contributor** is ready for the **reviewer** to re-review, they
--   comment on the PR with an emoji, meme, pokémon or words to that effect.
--1. Goto 6 until both parties are happy with the PR.
--1. The **reviewer** hits the big green merge button and deletes the branch (if
--    applicable).
--
--The rest of this document goes into more details around this flow.
--
--## Notes for Contributors
--
--### Work-in-Progress
--
--We recommend open pull requests early - ideally as soon as you have something to
--show. This is especially helpful for large pieces of work, as continuous
--integration tests are run earlier on, and regressions can be caught before
--humans get involved.
--
--Until the code is ready for review, you can prefix the PR title with [WIP] to
--indicate that it's under development.
--
--### Use Task Lists
--
--If you are working through a list of tasks as part of a pull request, listing
--those tasks and indicating when they have been completed helps reviewers to
--understand quickly what's changed.
--
--### Keep The Commit History Tidy
--
--We're not that fussy about the history, but to make reviewing easier here's
--some general tips:
--
-- - make small, meaningful and logical commits - these make the review process easier
-- - [write good commit messages](https://chris.beams.io/posts/git-commit/) -
--   these help the reviewer to understand the changes
-- - keep up to date with `master` - not only does this address potential merge
--   conflicts, it ensures you're integrating with the latest code
--
--When merging, we prefer you merge `master` into your branch, but for small
--PRs a rebase is fine.
--
--### At Least One Assignee
--
--While many people can be involved with a review, there's generally one person
--who eventually approves the pull request and merges. They'll be assigned to the
--pull request early on, so we can easily verify every active pull request has a
--reviewer.
--
--### When The Review Is Done
--
--We're using GitHub's review tools to co-ordinate feedback, and we like to be
--methodical with our reviews, so you'll probably end up with one of two results:
--
-- - **Approved**: nothing else to do; the reviewer merges
-- - **Request Changes**: there are things to address; reviewer provides details
--
--Reviews can take a few iterations, especially for large contributions. Don't
--be disheartened if you feel it takes time - we just want to ensure each
--contribution is high-quality and that any outstanding questions are resolved,
--captured or documented for posterity.
--
--### These Things Take Time
--
--Our team is distributed around the world, and often we like to get their
--feedback for specific areas. And even with minor changes, we often like to let
--them sit for a while and give everyone a chance to provide their input.
--
--## Other Rules
--
--## No Self-Merges
--
--Even for minor changes, we discourage people from merging their own pull
--requests.
--
--## Everyone Reviews
--
--While everyone has their own domain expertise around the codebase, we encourage
--people to share the load of reviews and reviewing areas of the codebase that
--aren't as familiar. This spreads knowledge across the team
--
-merged
-  result 100644 8e82f6aa314a7abf83144610e658942287d27eb4 docs/process/testing.md
-  our    100644 28e3af154f93357a29a5f0e0321ef13332ca957b docs/process/testing.md
-@@ -215,6 +215,8 @@
-     - [ ] `Cancel` button closes modal
-     - [ ] Protected branches cannot be deleted
-   - [ ] Update from Default Branch (cannot be master; Mac: `⇧⌘U`; Windows: `Ctrl+Shift+U`)
-+  - [ ] Compare to Branch (Mac: `⇧⌘B`; Windows: `Ctrl+Shift+B`)
-+    - [ ] Takes you to the history tab with the input selected so you can directly choose a branch
-   - [ ] Merge into Current Branch (Mac: `⇧⌘M`; Windows: `Ctrl+Shift+M`)
-     - [ ] Use can filter existing branches
-     - [ ] User can select branch, other than current
-@@ -272,8 +274,8 @@
-   - [ ] Panes can be resized horizontally, and contents resize to take the full width
-     - [ ] Quitting Desktop and relaunching remembers sizes
-
--### Compare tab
--  - [ ] Compare (was History) tab shows commits on your current branch by default
-+### History tab
-+  - [ ] History tab shows commits on your current branch by default
-     - [ ] All commits listed in chronological order, with avatar, date and name; list is scrollable with arrow keys enabled
-       - [ ] Right clicking any commit shows options: Revert, Copy SHA, View on GitHub
-       - [ ] Hover shows file name in tooltip
-@@ -285,6 +287,20 @@
-         - [ ] After successful merge, tab counts update and merge button is disabled
-         - [ ] Merge conflict results in dialog shown directing user to commit view
-
-+### Relationship between branches
-+  - [ ] Clicking in field with placeholder text `Select Branch to Compare…` shows a list of all branches and their number of commits ahead and behind the currently checked out branch
-+  - [ ] Pressing `esc` key clears the current filter
-+  - [ ] Filtering for branch name that doesn't exist shows "Sorry, I can't find that branch"
-+  - [ ] Selecting a branch from the list populates the tab with that branch comparison data
-+    - [ ] Behind tab is shown by default
-+      - [ ] See number of commits behind in tab header
-+      - [ ] If more than 0 commits behind, a list of commits are shown in reverse chronological order
-+      - [ ] See button to merge into current branch (button disabled if 0 commits behind)
-+      - [ ] Clicking the merge button shows merge conflicts if any, or successfully merges the commit(s)
-+      - [ ] After merging, the comparison branch is 0 commits behind
-+    - [ ] Ahead tab is on the right-hand side
-+      - [ ] If more than 0 commits ahead, a list of commits are shown in reverse chronological order
-+
- ### Diffs tab
-   - [ ] All commits have avatar, selectable SHA, # of files changed, commit message, commit description (optional)
-     - [ ] Long commit descriptions can be toggled with expand/collapse icon
-@@ -310,7 +326,8 @@
-     - [ ] `Push` with number of commits badge is decremented or reverts to `Fetch origin`
-   - [ ] `Undo` button disabled if user is pushing commit
-   - [ ] User can publish a new repo with no commits (aka unborn repo/branch)
--  - [ ] User can make new branch the default branch, by making the intial commit on the new branch.
-+  - [ ] User can make new branch the default branch, by making the intial commit on the new branch.
-+  - [ ] User can select individual files to commit at a time
-
- ### Co-authoring
-   - [ ] clicking co-author icon toggles co-author field; or right-click within commit area
-@@ -373,7 +390,7 @@
- ### Github.com
-   - [ ] If Desktop linked to .com (/settings/applications), the Desktop icon should show on File Revisions tab for all Pull Requests.
-     - [ ] Clicking the "computer icon" opens from a Pull Request page opens the branch on Desktop
--  - [ ] `Open is Desktop` button under a repo's `Clone and Download` button should open repo in Desktop
-+  - [ ] `Open in Desktop` button under a repo's `Clone and Download` button should open repo in Desktop
-   - [ ] If private email is enabled (http://github.com/settings/emails), user is blocked from pushing to all associated repositories on Desktop?
-   - [ ] If user updates name in Settings, change should reflect in Preferences
-
-@@ -393,17 +410,9 @@
- ### Security
-  - [ ] `Untrusted server` warning surfaced if GitHub cannot verify the identity of `api.github.com`; user can `Cancel` or `Continue`
-
-+
- ### TBD placeholder (WIP)
--- Merge tool for conflicted files
--- Conflicted files vs changed files
--- Relationship between branches
--  - Commit/Compare tabs now occupy left pane
--    - Compare tab shows branch dropdown
--      - Choose a branch from the list (same order as branch list? current branch present?) or user filter; `ESC` clears filter
--       - Once branch selected, quantity of commits behind surfaced; matches commits shown
--         - `Merge X commits` button is activated
--           - Merge conflict count surfaced below button if relevant
--           - Clicking `Merge` button merges all shown commits
--    - Commit history present, chronological order, descending
--- Show Git LFS (Cloning, Committing, Checking out, Reverting, Switching branches)
--- Report Git LFS (Cloning, Pushing, Pulling, Switching branches, Reverting)
-+  - Merge tool for conflicted files
-+  - Conflicted files vs changed files
-+  - Show Git LFS (Cloning, Committing, Checking out, Reverting, Switching branches)
-+  - Report Git LFS (Cloning, Pushing, Pulling, Switching branches, Reverting)
-added in remote
-  their  100644 10459559490b110ff84127440cbbc8070a71f320 docs/technical/discard-changes.md
-@@ -0,0 +1,41 @@
-+# Discard Changes
-+
-+The `Discard Changes` feature allows users to clean up uncommitted changes from
-+a repository, and has evolved over time to support different workflows.
-+
-+## Implementation
-+
-+As the implementation details of this may change over time, this section will
-+instead describe the high-level flow of the implementation.
-+
-+You can view a reference of this function [here](https://github.com/desktop/desktop/blob/2b111155914cb44824b39ee197deed23bb825a1a/app/src/lib/stores/git-store.ts#L1066).
-+
-+The `Discard Changes` flow is composed of multiple steps.
-+
-+### Moving Files to Trash
-+
-+Electron provides the [`shell.moveItemToTrash(fullPath)`](https://electronjs.org/docs/api/shell#shellmoveitemtotrashfullpath)
-+API to manage moving files into the OS-specific trash.
-+
-+Desktop uses this API to move _all new or modified files_ out from the
-+repository as a way to preserve changes, in case the user wishes to recover
-+them later. Files moved to the Trash are moved over as-is, so ensure you have
-+the ability to view hidden files if you wish to recover files that are prefixed
-+with `.`.
-+
-+### Reset Paths
-+
-+The next step is identifying any files that have been listed for discard that
-+are also staged in the index. While Desktop doesn't stage files itself, a user
-+might be using other tools alongside Desktop, so this is a sanity check before
-+proceeding to the next stage.
-+
-+**Git CLI equivalent**: `git reset HEAD -- [path]`
-+
-+### Checkout Paths
-+
-+The last step is to replace the modified files in the working directory with
-+whatever is currently in the index - this ensures that Desktop only replaces
-+files that the user has chosen to discard.
-+
-+**Git CLI equivalent**: `git checkout-index -f -u -- [path]`
-merged
-  result 100644 29e7d36057950d884bd046bbe958c6329d2bf877 docs/technical/editor-integration.md
-  our    100644 7eae1dc4e64282e2f51e3012da408314bb28d269 docs/technical/editor-integration.md
-@@ -1,7 +1,7 @@
- # "Open External Editor" integration
-
- GitHub Desktop supports the user choosing an external program to open their
--local repositories, and this is available from the top-level **Repository** menu
-+local repositories, and this is available from the top-level **Repository** menu
- or when right-clicking on a repository in the sidebar.
-
- ### My favourite editor XYZ isn't supported!
-@@ -205,12 +205,17 @@
- These editors are currently supported:
-
-  - [Atom](https://atom.io/)
-+ - [MacVim](https://macvim-dev.github.io/macvim/)
-  - [Visual Studio Code](https://code.visualstudio.com/) - both stable and Insiders channel
-  - [Sublime Text](https://www.sublimetext.com/)
-  - [BBEdit](http://www.barebones.com/products/bbedit/)
-  - [PhpStorm](https://www.jetbrains.com/phpstorm/)
-  - [RubyMine](https://www.jetbrains.com/rubymine/)
-  - [TextMate](https://macromates.com)
-+ - [Brackets](http://brackets.io/)
-+     - To use Brackets the Command Line shortcut must be installed.
-+       - This can be done by opening Brackets, choosing File > Install Command Line Shortcut
-+ - [WebStorm](https://www.jetbrains.com/webstorm/)
-
- These are defined in an enum at the top of the file:
-
-@@ -218,6 +223,7 @@
-
- export enum ExternalEditor {
-   Atom = 'Atom',
-+  MacVim = 'MacVim',
-   VisualStudioCode = 'Visual Studio Code',
-   VisualStudioCodeInsiders = 'Visual Studio Code (Insiders)',
-   SublimeText = 'Sublime Text',
-@@ -225,6 +231,8 @@
-   PhpStorm = 'PhpStorm',
-   RubyMine = 'RubyMine',
-   TextMate = 'TextMate',
-+  Brackets = 'Brackets',
-+  WebStorm = 'WebStorm',
- }
- ```
-
-merged
-  result 100644 7d8f4be31c11ad21552dbebfde4c9e7fe02c50c9 docs/technical/feature-flagging.md
-  our    100644 3528b827f8657b3ef30659605b96356d36362ced docs/technical/feature-flagging.md
-@@ -50,10 +50,10 @@
- ## How to test
-
- **Opting-in for preview features**
--1. Set the `GITHUB_DESKTOP_PREVIEW_FEATURES` environment variable to any value
-+1. Set the `GITHUB_DESKTOP_PREVIEW_FEATURES` environment variable to `1`
- 1. Restart GitHub Desktop
-
--Don't have that environment variable?
-+Don't have that environment variable?
- No worries, simply create it. (here's a [handy guide](https://www.schrodinger.com/kb/1842) for doing that on most major OSs).
-
- **Opting-out for preview features**
-merged
-  result 100644 348333d12c84aba9cf5ec7404d91e9a8c2816d07 docs/technical/placeholders.md
-  our    100644 3264bc826adeac79be5573e87f2765c1dd8a4f60 docs/technical/placeholders.md
-@@ -29,7 +29,7 @@
-
- ### Replacements
-
--The replacements defined for Desktop are found in [`app/app-info.js`](https://github.com/desktop/desktop/blob/master/app/app-info.js)
-+The replacements defined for Desktop are found in [`app/app-info.ts`](https://github.com/desktop/desktop/blob/master/app/app-info.ts)
- as a hash of key-value pairs.
-
- ```ts
-merged
-  result 100644 ec1f940bd847054000a5e38f06e6b665799e8c10 docs/technical/shell-integration.md
-  our    100644 9ddeb7ae5be00a841b49590b1966b84660000a77 docs/technical/shell-integration.md
-@@ -25,6 +25,7 @@
-
-  - Command Prompt (cmd)
-  - PowerShell
-+ - [PowerShell Core](https://github.com/powershell/powershell/)
-  - [Hyper](https://hyper.sh/)
-  - Git Bash (from [Git for Windows](https://git-for-windows.github.io/))
-
-@@ -34,6 +35,7 @@
- export enum Shell {
-   Cmd = 'Command Prompt',
-   PowerShell = 'PowerShell',
-+  PowerShellCore = 'PowerShell Core',
-   Hyper = 'Hyper',
-   GitBash = 'Git Bash',
- }
-@@ -117,13 +119,14 @@
-
- ## macOS
-
--The source for the macOS shell integration is found in [`app/src/lib/shells/darwin.ts`](https://github.com/desktop/desktop/blob/master/app/src/lib/shell/darwin.ts).
-+The source for the macOS shell integration is found in [`app/src/lib/shells/darwin.ts`](https://github.com/desktop/desktop/blob/master/app/src/lib/shells/darwin.ts).
-
- These shells are currently supported:
-
-  - Terminal
-  - [Hyper](https://hyper.sh/)
-  - [iTerm2](https://www.iterm2.com/)
-+ - [PowerShell Core](https://github.com/powershell/powershell/)
-
- These are defined in an enum at the top of the file:
-
-@@ -132,6 +135,7 @@
-   Terminal = 'Terminal',
-   Hyper = 'Hyper',
-   iTerm2 = 'iTerm2',
-+  PowerShellCore = 'PowerShell Core',
- }
- ```
-
-@@ -159,10 +163,16 @@
- export async function getAvailableShells(): Promise<
-   ReadonlyArray<IFoundShell<Shell>>
- > {
--  const [terminalPath, hyperPath, iTermPath] = await Promise.all([
-+  const [
-+    terminalPath,
-+    hyperPath,
-+    iTermPath,
-+    powerShellCorePath,
-+  ] = await Promise.all([
-     getShellPath(Shell.Terminal),
-     getShellPath(Shell.Hyper),
-     getShellPath(Shell.iTerm2),
-+    getShellPath(Shell.PowerShellCore),
-   ])
-
-   // other code
-@@ -194,7 +204,7 @@
-
- ## Linux
-
--The source for the Linux shell integration is found in [`app/src/lib/shells/linux.ts`](https://github.com/desktop/desktop/blob/master/app/src/lib/shell/linux.ts).
-+The source for the Linux shell integration is found in [`app/src/lib/shells/linux.ts`](https://github.com/desktop/desktop/blob/master/app/src/lib/shells/linux.ts).
-
- These shells are currently supported:
-
-@@ -238,7 +248,13 @@
- export async function getAvailableShells(): Promise<
-   ReadonlyArray<IFoundShell<Shell>>
- > {
--  const [gnomeTerminalPath, tilixPath] = await Promise.all([
-+  const [
-+    gnomeTerminalPath,
-+    tilixPath,
-+    urxvtPath,
-+    konsolePath,
-+    xtermPath,
-+  ] = await Promise.all([
-     getShellPath(Shell.Gnome),
-     getShellPath(Shell.Tilix),
-     getShellPath(Shell.Urxvt),
-merged
-  result 100644 51b1541b7f0f67eef996aa5e53e8cc204767184f docs/technical/syntax-highlighting.md
-  our    100644 35f4bc1d7dc42db2bcfe7ba638f3b5eaa4a7ec1f docs/technical/syntax-highlighting.md
-@@ -8,7 +8,7 @@
-
- We currently support syntax highlighting for the following languages.
-
--JavaScript, JSON, TypeScript, Coffeescript, HTML, CSS, SCSS, LESS, VUE, Markdown, Yaml, XML, Objective-C, Scala, C#, Java, C, C++, Kotlin, Ocaml, F#, sh/bash, Swift, SQL, CYPHER, Go, Perl, PHP, Python, Ruby, Clojure, Rust, Elixir
-+JavaScript, JSON, TypeScript, Coffeescript, HTML, CSS, SCSS, LESS, VUE, Markdown, Yaml, XML, Objective-C, Scala, C#, Java, C, C++, Kotlin, Ocaml, F#, sh/bash, Swift, SQL, CYPHER, Go, Perl, PHP, Python, Ruby, Clojure, Rust, Elixir, Haxe, R, JavaServer Pages, PowerShell
-
- This list was never meant to be exhaustive, we expect to add more languages going forward but this seemed like a good first step.
-
-merged
-  result 100644 24218535cd0fa338ea3b7a8a32e7b458b6811b44 eslint-rules/insecure-random.js
-  our    100644 710ff6f58b2b9abf091c4353b1264456baeb1fb3 eslint-rules/insecure-random.js
-@@ -1,5 +1,6 @@
--// strings from https://github.com/Microsoft/tslint-microsoft-contrib/blob/b720cd9/src/insecureRandomRule.ts
-+'use strict'
-
-+// strings from https://github.com/Microsoft/tslint-microsoft-contrib/blob/b720cd9/src/insecureRandomRule.ts
- const MATH_FAIL_STRING =
-   'Math.random produces insecure random numbers. ' +
-   'Use crypto.randomBytes() or window.crypto.getRandomValues() instead'
-changed in both
-  base   100644 dc892d10739ef87c70391aedcfdc3241753eebbb package.json
-  our    100644 a230a49de70c920a24d34b1af9952a17b72e7a1c package.json
-  their  100644 461f60af798d32097510dcd519c5cdd4b860771e package.json
-@@ -5,11 +5,12 @@
-   },
-   "description": "GitHub Desktop build dependencies",
-   "scripts": {
--    "cli": "ts-node --require ./app/test/globals.ts --require ./app/src/cli/dev-commands-global.js app/src/cli/main.ts",
--    "test:integration": "cross-env TEST_ENV=1 ELECTRON_NO_ATTACH_CONSOLE=1 xvfb-maybe mocha -t 30000 --require ts-node/register app/test/integration/*.ts",
--    "test:unit": "cross-env GIT_AUTHOR_NAME=\"Joe Bloggs\" GIT_AUTHOR_EMAIL=\"joe.bloggs@somewhere.com\" GIT_COMMITTER_NAME=\"Joe Bloggs\" GIT_COMMITTER_EMAIL=\"joe.bloggs@somewhere.com\" TEST_ENV=1 ELECTRON_NO_ATTACH_CONSOLE=1 xvfb-maybe electron-mocha -t 10000 --renderer --require ts-node/register --require ./app/test/globals.ts app/test/unit/*.{ts,tsx} app/test/unit/**/*.{ts,tsx}",
-+    "cli": "ts-node --require ./app/test/globals.ts --require ./app/src/cli/dev-commands-global.ts app/src/cli/main.ts",
-+    "test:integration": "cross-env TEST_ENV=1 ELECTRON_NO_ATTACH_CONSOLE=1 xvfb-maybe --auto-servernum -- mocha -t 30000 --require ts-node/register app/test/integration/*.ts",
-+    "test:unit": "ts-node script/unit-tests.ts",
-     "test:script": "mocha -t 10000 --require ts-node/register script/changelog/test/*.ts",
-     "test": "yarn test:unit && yarn test:script && yarn test:integration",
-+<<<<<<< .our
-     "test:setup": "ts-node script/test-setup.ts",
-     "test:review": "ts-node script/test-review.ts",
-     "postinstall": "yarn install-app && yarn install-changelog && yarn update-submodules && yarn compile:tslint",
-@@ -23,20 +24,31 @@
-     "compile:prod": "cross-env NODE_ENV=production parallel-webpack --config app/webpack.production.js",
-     "build:dev": "yarn compile:dev && cross-env NODE_ENV=development ts-node script/build.ts",
-     "build:prod": "yarn compile:prod && cross-env NODE_ENV=production ts-node script/build.ts",
-+=======
-+    "test:setup": "ts-node -P script/tsconfig.json script/test-setup.ts",
-+    "test:review": "ts-node  -P script/tsconfig.json script/test-review.ts",
-+    "postinstall": "cd app && yarn install --force && cd .. && git submodule update --recursive --init && yarn compile:tslint && yarn compile:script",
-+    "start": "cross-env NODE_ENV=development ts-node -P script/tsconfig.json script/start.ts",
-+    "start:prod": "cross-env NODE_ENV=production ts-node -P script/tsconfig.json script/start.ts",
-+    "compile:dev": "cross-env NODE_ENV=development parallel-webpack --config app/webpack.development.ts",
-+    "compile:prod": "cross-env NODE_ENV=production parallel-webpack --config app/webpack.production.ts",
-+    "build:dev": "yarn compile:dev && cross-env NODE_ENV=development ts-node -P script/tsconfig.json script/build.ts",
-+    "build:prod": "yarn compile:prod && cross-env NODE_ENV=production ts-node -P script/tsconfig.json script/build.ts",
-+>>>>>>> .their
-     "package": "ts-node -P script/tsconfig.json script/package.ts",
--    "generate-octicons": "ts-node script/generate-octicons.ts",
-+    "generate-octicons": "ts-node -P script/tsconfig.json script/generate-octicons.ts",
-     "clean:tslint": "rimraf tslint-rules/*.js",
--    "compile:tslint": "tsc -p tslint-rules",
--    "compile:script": "tsc -p script",
-+    "compile:tslint": "tsc -P tslint-rules",
-+    "compile:script": "tsc -P script/tsconfig.json",
-     "lint": "yarn lint:src && yarn lint:prettier",
-     "lint:fix": "yarn lint:src:fix && yarn lint:prettier --fix",
-     "lint:prettier": "ts-node script/prettier.ts",
-     "lint:src": "yarn tslint && yarn eslint-check && yarn eslint",
-     "lint:src:fix": "yarn tslint --fix && yarn eslint --fix",
--    "tslint": "tslint ./{script,tslint-rules}/*.ts ./app/{src,typings,test}/**/*.{ts,tsx}",
--    "eslint": "ts-node script/eslint.ts",
-+    "tslint": "tslint -p .",
-+    "eslint": "ts-node -P script/tsconfig.json script/eslint.ts",
-     "eslint-check": "eslint --print-config .eslintrc.* | eslint-config-prettier-check",
--    "publish": "node script/publish",
-+    "publish": "ts-node -P script/tsconfig.json script/publish.ts",
-     "clean-slate": "rimraf out node_modules app/node_modules && yarn",
-     "rebuild-hard:dev": "yarn clean-slate && yarn build:dev",
-     "rebuild-hard:prod": "yarn clean-slate && yarn build:prod",
-@@ -51,61 +63,63 @@
-   },
-   "license": "MIT",
-   "engines": {
--    "node": ">= 7",
--    "yarn": ">= 1.2.0"
-+    "node": ">= 8.10",
-+    "yarn": ">= 1.5.0"
-   },
-   "dependencies": {
-     "ajv": "^6.4.0",
--    "awesome-typescript-loader": "^3.4.0",
-+    "awesome-node-loader": "^1.1.0",
-+    "awesome-typescript-loader": "^5.0.0",
-     "aws-sdk": "^2.23.0",
--    "babel-core": "^6.24.1",
--    "babel-minify": "^0.2.0",
--    "babel-webpack-plugin": "^0.1.1",
-+    "babel-core": "^6.26.3",
-+    "babel-minify-webpack-plugin": "^0.3.1",
-+    "babel-plugin-syntax-dynamic-import": "^6.18.0",
-     "chai": "^4.1.1",
-     "chai-as-promised": "^7.1.1",
-     "chai-datetime": "^1.4.1",
-     "chalk": "^2.2.0",
--    "clean-webpack-plugin": "^0.1.16",
-+    "clean-webpack-plugin": "^0.1.19",
-     "cross-env": "^5.0.5",
--    "css-loader": "^0.28.5",
-+    "css-loader": "^0.28.11",
-     "eslint": "^4.19.1",
-     "eslint-config-prettier": "^2.9.0",
-     "eslint-plugin-babel": "^4.1.2",
-     "eslint-plugin-json": "^1.2.0",
-     "eslint-plugin-prettier": "^2.6.0",
-     "eslint-plugin-react": "^7.7.0",
--    "eslint-plugin-typescript": "^0.10.0",
-+    "eslint-plugin-typescript": "^0.12.0",
-     "express": "^4.15.0",
--    "extract-text-webpack-plugin": "^3.0.0",
--    "fs-extra": "^2.1.2",
--    "html-webpack-plugin": "^2.30.1",
-+    "front-matter": "^2.3.0",
-+    "fs-extra": "^6.0.0",
-+    "html-webpack-plugin": "^3.2.0",
-     "json-pretty": "^0.0.1",
-     "klaw-sync": "^3.0.0",
-     "legal-eagle": "0.15.0",
-+    "mini-css-extract-plugin": "^0.4.0",
-     "mocha": "^5.0.4",
--    "node-native-loader": "^1.1.1",
-     "node-sass": "^4.7.2",
-     "octicons": "^7.0.1",
--    "parallel-webpack": "^2.1.0",
--    "prettier": "1.11.1",
-+    "parallel-webpack": "^2.3.0",
-+    "prettier": "1.13.0",
-     "request": "^2.72.0",
-     "rimraf": "^2.5.2",
--    "sass-loader": "^6.0.6",
-+    "sass-loader": "^7.0.1",
-     "semver": "^5.5.0",
-     "spectron": "^3.8.0",
--    "style-loader": "^0.19.1",
-+    "style-loader": "^0.21.0",
-     "to-camel-case": "^1.0.0",
-     "ts-node": "^5.0.1",
-     "tslint": "^5.9.1",
-     "tslint-config-prettier": "^1.10.0",
-     "tslint-microsoft-contrib": "^5.0.3",
-     "tslint-react": "^3.5.1",
--    "typescript": "^2.8.1",
--    "typescript-eslint-parser": "^14.0.0",
--    "webpack": "^3.10.0",
--    "webpack-dev-middleware": "^2.0.3",
--    "webpack-hot-middleware": "^2.21.0",
--    "webpack-merge": "^4.1.0",
-+    "typescript": "^2.9.1",
-+    "typescript-eslint-parser": "^16.0.0",
-+    "webpack": "^4.8.3",
-+    "webpack-bundle-analyzer": "^2.13.0",
-+    "webpack-dev-middleware": "^3.1.3",
-+    "webpack-hot-middleware": "^2.22.2",
-+    "webpack-merge": "^4.1.2",
-     "xml2js": "^0.4.16",
-     "xvfb-maybe": "^0.2.1"
-   },
-@@ -114,21 +128,28 @@
-     "@types/chai": "^4.1.2",
-     "@types/chai-datetime": "^0.0.31",
-     "@types/classnames": "^2.2.2",
-+    "@types/clean-webpack-plugin": "^0.1.2",
-     "@types/codemirror": "0.0.55",
-     "@types/electron-packager": "^10.1.0",
-     "@types/electron-winstaller": "^2.6.0",
-     "@types/event-kit": "^1.2.28",
-+    "@types/express": "^4.11.0",
-+    "@types/extract-text-webpack-plugin": "^3.0.3",
-     "@types/file-url": "^2.0.0",
--    "@types/fs-extra": "2.1.0",
-+    "@types/fs-extra": "^5.0.2",
-     "@types/fuzzaldrin-plus": "^0.0.1",
-+    "@types/html-webpack-plugin": "^2.30.3",
-     "@types/keytar": "^4.0.0",
-+    "@types/legal-eagle": "^0.15.0",
-+    "@types/mini-css-extract-plugin": "^0.2.0",
-     "@types/mocha": "^2.2.48",
-     "@types/mri": "^1.1.0",
--    "@types/node": "^7.0.18",
--    "@types/react": "^16.0.40",
--    "@types/react-dom": "^16.0.4",
-+    "@types/node": "^8.10.4",
-+    "@types/react": "^16.3.16",
-+    "@types/react-dom": "^16.0.5",
-     "@types/react-transition-group": "1.1.1",
-     "@types/react-virtualized": "^9.7.12",
-+    "@types/request": "^2.0.9",
-     "@types/semver": "^5.5.0",
-     "@types/strip-ansi": "^3.0.0",
-     "@types/temp": "^0.8.29",
-@@ -137,9 +158,14 @@
-     "@types/ua-parser-js": "^0.7.30",
-     "@types/untildify": "^3.0.0",
-     "@types/uuid": "^3.4.0",
-+    "@types/webpack": "^4.4.0",
-+    "@types/webpack-bundle-analyzer": "^2.9.2",
-+    "@types/webpack-dev-middleware": "^2.0.1",
-+    "@types/webpack-hot-middleware": "^2.16.3",
-+    "@types/webpack-merge": "^4.1.3",
-     "@types/winston": "^2.2.0",
-     "@types/xml2js": "^0.4.0",
--    "electron": "1.8.3",
-+    "electron": "1.8.7",
-     "electron-builder": "20.2.0",
-     "electron-mocha": "^6.0.1",
-     "electron-packager": "^11.0.0",
-merged
-  result 100644 793329336d0e4e7086d8a4856cc3e404b6d33528 script/.eslintrc.yml
-  our    100644 cb8912301f224a449793498cd95802cb6161ee31 script/.eslintrc.yml
-@@ -1,4 +1,3 @@
- rules:
-   unicorn/no-process-exit: off
-   import/no-commonjs: off
--  no-sync: off
-merged
-  result 100755 a76c37cc7ddbf18efa4c1cbbd3e5aba7f4ce6678 script/build.ts
-  our    100755 c1e7dfd7e04705645c003fc4d315617e68abc846 script/build.ts
-@@ -1,4 +1,3 @@
--/* tslint:disable:no-sync-functions */
- /* eslint-disable no-sync */
- /// <reference path="./globals.d.ts" />
-
-@@ -7,7 +6,34 @@
- import * as fs from 'fs-extra'
- import * as packager from 'electron-packager'
-
--const legalEagle: LegalEagle = require('legal-eagle')
-+import { licenseOverrides } from './license-overrides'
-+
-+import { externals } from '../app/webpack.common'
-+
-+import * as legalEagle from 'legal-eagle'
-+
-+interface IFrontMatterResult<T> {
-+  readonly attributes: T
-+  readonly body: string
-+}
-+
-+interface IChooseALicense {
-+  readonly title: string
-+  readonly nickname?: string
-+  readonly featured?: boolean
-+  readonly hidden?: boolean
-+}
-+
-+export interface ILicense {
-+  readonly name: string
-+  readonly featured: boolean
-+  readonly body: string
-+  readonly hidden: boolean
-+}
-+
-+const frontMatter: <T>(
-+  path: string
-+) => IFrontMatterResult<T> = require('front-matter')
-
- import {
-   getBundleID,
-@@ -37,6 +63,11 @@
- console.log('Copying static resources…')
- copyStaticResources()
-
-+console.log('Parsing license metadata…')
-+generateLicenseMetadata(outRoot)
-+
-+moveAnalysisFiles()
-+
- const isFork = process.env.CIRCLE_PR_USERNAME
- if (process.platform === 'darwin' && process.env.CIRCLECI && !isFork) {
-   console.log('Setting up keychain…')
-@@ -95,10 +126,24 @@
-     )
-   }
-
-+  const toPackageArch = (targetArch: string | undefined): packager.arch => {
-+    if (targetArch === undefined) {
-+      return 'x64'
-+    }
-+
-+    if (targetArch === 'arm64' || targetArch === 'x64') {
-+      return targetArch
-+    }
-+
-+    throw new Error(
-+      `Building Desktop for architecture '${targetArch}'  is not supported`
-+    )
-+  }
-+
-   const options: packager.Options & IPackageAdditionalOptions = {
-     name: getExecutableName(),
-     platform: toPackagePlatform(process.platform),
--    arch: process.env.TARGET_ARCH || 'x64',
-+    arch: toPackageArch(process.env.TARGET_ARCH),
-     asar: false, // TODO: Probably wanna enable this down the road.
-     out: getDistRoot(),
-     icon: path.join(projectRoot, 'app', 'static', 'logos', 'icon-logo'),
-@@ -175,7 +220,23 @@
-   if (fs.existsSync(platformSpecific)) {
-     fs.copySync(platformSpecific, destination)
-   }
--  fs.copySync(common, destination, { clobber: false })
-+  fs.copySync(common, destination, { overwrite: false })
-+}
-+
-+function moveAnalysisFiles() {
-+  const rendererReport = 'renderer.report.html'
-+  const analysisSource = path.join(outRoot, rendererReport)
-+  if (fs.existsSync(analysisSource)) {
-+    const distRoot = getDistRoot()
-+    const destination = path.join(distRoot, rendererReport)
-+    fs.mkdirpSync(distRoot)
-+    // there's no moveSync API here, so let's do it the old fashioned way
-+    //
-+    // unlinkSync below ensures that the analysis file isn't bundled into
-+    // the app by accident
-+    fs.copySync(analysisSource, destination, { overwrite: true })
-+    fs.unlinkSync(analysisSource)
-+  }
- }
-
- function copyDependencies() {
-@@ -186,9 +247,6 @@
-     'package.json'
-   ))
-
--  // eslint-disable-next-line import/no-dynamic-require
--  const commonConfig = require(path.resolve(__dirname, '../app/webpack.common'))
--  const externals = commonConfig.externals
-   const oldDependencies = originalPackage.dependencies
-   const newDependencies: PackageLookup = {}
-
-@@ -296,7 +354,6 @@
- function updateLicenseDump(callback: (err: Error | null) => void) {
-   const appRoot = path.join(projectRoot, 'app')
-   const outPath = path.join(outRoot, 'static', 'licenses.json')
--  const licenseOverrides: LicenseLookup = require('./license-overrides')
-
-   legalEagle(
-     { path: appRoot, overrides: licenseOverrides, omitPermissive: true },
-@@ -353,3 +410,54 @@
-     }
-   )
- }
-+
-+function generateLicenseMetadata(outRoot: string) {
-+  const chooseALicense = path.join(outRoot, 'static', 'choosealicense.com')
-+  const licensesDir = path.join(chooseALicense, '_licenses')
-+
-+  const files = fs.readdirSync(licensesDir)
-+
-+  const licenses = new Array<ILicense>()
-+  for (const file of files) {
-+    const fullPath = path.join(licensesDir, file)
-+    const contents = fs.readFileSync(fullPath, 'utf8')
-+    const result = frontMatter<IChooseALicense>(contents)
-+    const license: ILicense = {
-+      name: result.attributes.nickname || result.attributes.title,
-+      featured: result.attributes.featured || false,
-+      hidden:
-+        result.attributes.hidden === undefined || result.attributes.hidden,
-+      body: result.body.trim(),
-+    }
-+
-+    if (!license.hidden) {
-+      licenses.push(license)
-+    }
-+  }
-+
-+  const licensePayload = path.join(outRoot, 'static', 'available-licenses.json')
-+  const text = JSON.stringify(licenses)
-+  fs.writeFileSync(licensePayload, text, 'utf8')
-+
-+  // embed the license alongside the generated license payload
-+  const chooseALicenseLicense = path.join(chooseALicense, 'LICENSE.md')
-+  const licenseDestination = path.join(
-+    outRoot,
-+    'static',
-+    'LICENSE.choosealicense.md'
-+  )
-+
-+  const licenseText = fs.readFileSync(chooseALicenseLicense, 'utf8')
-+  const licenseWithHeader = `GitHub Desktop uses licensing information provided by choosealicense.com.
-+
-+The bundle in available-licenses.json has been generated from a source list provided at https://github.com/github/choosealicense.com, which is made available under the below license:
-+
-+------------
-+
-+${licenseText}`
-+
-+  fs.writeFileSync(licenseDestination, licenseWithHeader, 'utf8')
-+
-+  // sweep up the choosealicense directory as the important bits have been bundled in the app
-+  fs.removeSync(chooseALicense)
-+}
-changed in both
-  base   100644 b0a88cf77391d915e28566a1695cbf31c2ab7bbb script/changelog/parser.ts
-  our    100644 ff08e0ef253ffb980b0ed57114f9fefea05d7fc1 script/changelog/parser.ts
-  their  100644 aad3c838c2d7931127adbc843bdd83ccda5968a1 script/changelog/parser.ts
-@@ -116,6 +116,7 @@
-   const root = Path.dirname(Path.dirname(__dirname))
-   const changelogPath = Path.join(root, 'changelog.json')
-
-+  // eslint-disable-next-line no-sync
-   const buffer = Fs.readFileSync(changelogPath)
-   const changelogText = buffer.toString()
-
-removed in remote
-  base   100644 ad4855567fb5e193b74292af394786561793577f script/debug
-  our    100644 ad4855567fb5e193b74292af394786561793577f script/debug
-@@ -1,29 +0,0 @@
--#!/usr/bin/env node
--
--'use strict'
--
--const express = require('express')
--const webpack = require('webpack')
--const config = require('../app/webpack.development')
--const server = express()
--const compiler = webpack(config)
--const port = process.env.PORT || 3000
--
--server.use(
--  require('webpack-dev-middleware')(compiler, {
--    publicPath: config.output.publicPath,
--    noInfo: true,
--  })
--)
--
--server.use(require('webpack-hot-middleware')(compiler))
--
--server.listen(port, 'localhost', err => {
--  if (err) {
--    console.log(err)
--    process.exit(1)
--    return
--  }
--
--  console.log(`Server running at http://localhost:${port}`)
--})
-removed in remote
-  base   100644 761dea8563e41854304fb72b473ef14d0ead525f script/dist-info.d.ts
-  our    100644 761dea8563e41854304fb72b473ef14d0ead525f script/dist-info.d.ts
-@@ -1,20 +0,0 @@
--export function getDistRoot(): string
--export function getDistPath(): string
--export function getOSXZipName(): string
--export function getOSXZipPath(): string
--export function getWindowsInstallerName(): string
--export function getWindowsInstallerPath(): string
--export function getWindowsStandaloneName(): string
--export function getWindowsStandalonePath(): string
--export function getWindowsFullNugetPackageName(): string
--export function getWindowsFullNugetPackagePath(): string
--export function getWindowsIdentifierName(): string
--export function getBundleSizes(): { rendererSize: number; mainSize: number }
--export function getReleaseChannel(): string | null
--export function getReleaseSHA(): string | null
--export function getUpdatesURL(): string
--export function getWindowsDeltaNugetPackageName(): string
--export function getWindowsDeltaNugetPackagePath(): string
--export function shouldMakeDelta(): boolean
--export function getReleaseBranchName(): string
--export function getExecutableName(): string
-removed in remote
-  base   100644 b516179431c4275fa3a02610faa699fab1241710 script/dist-info.js
-  our    100644 b516179431c4275fa3a02610faa699fab1241710 script/dist-info.js
-@@ -1,163 +0,0 @@
--'use strict'
--
--const path = require('path')
--const fs = require('fs')
--const os = require('os')
--
--const packageInfo = require('../app/package-info')
--const productName = packageInfo.getProductName()
--const version = packageInfo.getVersion()
--
--const projectRoot = path.join(__dirname, '..')
--
--function getDistRoot() {
--  return path.join(projectRoot, 'dist')
--}
--
--function getDistPath() {
--  return path.join(
--    getDistRoot(),
--    `${getExecutableName()}-${process.platform}-${os.arch()}`
--  )
--}
--
--function getExecutableName() {
--  const suffix = process.env.NODE_ENV === 'development' ? '-dev' : ''
--
--  if (process.platform === 'win32') {
--    return `${getWindowsIdentifierName()}${suffix}`
--  } else if (process.platform === 'linux') {
--    return 'desktop'
--  } else {
--    return productName
--  }
--}
--
--function getOSXZipName() {
--  return `${productName}.zip`
--}
--
--function getOSXZipPath() {
--  return path.join(getDistPath(), '..', getOSXZipName())
--}
--
--function getWindowsInstallerName() {
--  const productName = getExecutableName()
--  return `${productName}Setup.msi`
--}
--
--function getWindowsInstallerPath() {
--  return path.join(getDistPath(), '..', 'installer', getWindowsInstallerName())
--}
--
--function getWindowsStandaloneName() {
--  const productName = getExecutableName()
--  return `${productName}Setup.exe`
--}
--
--function getWindowsStandalonePath() {
--  return path.join(getDistPath(), '..', 'installer', getWindowsStandaloneName())
--}
--
--function getWindowsFullNugetPackageName() {
--  return `${getWindowsIdentifierName()}-${version}-full.nupkg`
--}
--
--function getWindowsFullNugetPackagePath() {
--  return path.join(
--    getDistPath(),
--    '..',
--    'installer',
--    getWindowsFullNugetPackageName()
--  )
--}
--
--function getWindowsDeltaNugetPackageName() {
--  return `${getWindowsIdentifierName()}-${version}-delta.nupkg`
--}
--
--function getWindowsDeltaNugetPackagePath() {
--  return path.join(
--    getDistPath(),
--    '..',
--    'installer',
--    getWindowsDeltaNugetPackageName()
--  )
--}
--
--function getWindowsIdentifierName() {
--  return 'GitHubDesktop'
--}
--
--function getBundleSizes() {
--  const rendererStats = fs.statSync(
--    path.join(projectRoot, 'out', 'renderer.js')
--  )
--  const mainStats = fs.statSync(path.join(projectRoot, 'out', 'main.js'))
--  return { rendererSize: rendererStats.size, mainSize: mainStats.size }
--}
--
--function getReleaseBranchName() {
--  let branchName
--  if (process.platform === 'darwin') {
--    branchName = process.env.CIRCLE_BRANCH
--  } else if (process.platform === 'win32') {
--    branchName = process.env.APPVEYOR_REPO_BRANCH
--  }
--
--  return branchName || ''
--}
--
--function getReleaseChannel() {
--  // Branch name format: __release-CHANNEL-DEPLOY_ID
--  const pieces = getReleaseBranchName().split('-')
--  if (pieces.length < 3 || pieces[0] !== '__release') {
--    return process.env.NODE_ENV || 'development'
--  }
--
--  return pieces[1]
--}
--
--function getReleaseSHA() {
--  // Branch name format: __release-CHANNEL-DEPLOY_ID
--  const pieces = getReleaseBranchName().split('-')
--  if (pieces.length < 3 || pieces[0] !== '__release') {
--    return null
--  }
--
--  return pieces[2]
--}
--
--function getUpdatesURL() {
--  return `https://central.github.com/api/deployments/desktop/desktop/latest?version=${version}&env=${getReleaseChannel()}`
--}
--
--function shouldMakeDelta() {
--  // Only production and beta channels include deltas. Test releases aren't
--  // necessarily sequential so deltas wouldn't make sense.
--  const channelsWithDeltas = ['production', 'beta']
--  return channelsWithDeltas.indexOf(getReleaseChannel()) > -1
--}
--
--module.exports = {
--  getDistRoot,
--  getDistPath,
--  getOSXZipName,
--  getOSXZipPath,
--  getWindowsInstallerName,
--  getWindowsInstallerPath,
--  getWindowsStandaloneName,
--  getWindowsStandalonePath,
--  getWindowsFullNugetPackageName,
--  getWindowsFullNugetPackagePath,
--  getWindowsIdentifierName,
--  getBundleSizes,
--  getReleaseChannel,
--  getReleaseSHA,
--  getUpdatesURL,
--  getWindowsDeltaNugetPackageName,
--  getWindowsDeltaNugetPackagePath,
--  shouldMakeDelta,
--  getReleaseBranchName,
--  getExecutableName,
--}
-added in remote
-  their  100644 8661aa1a9becdd6f0f77dc9101c6eb665295544d script/dist-info.ts
-@@ -0,0 +1,137 @@
-+import * as Path from 'path'
-+import * as Fs from 'fs'
-+
-+import { getProductName, getVersion } from '../app/package-info'
-+
-+const productName = getProductName()
-+const version = getVersion()
-+
-+const projectRoot = Path.join(__dirname, '..')
-+
-+export function getDistRoot() {
-+  return Path.join(projectRoot, 'dist')
-+}
-+
-+export function getDistPath() {
-+  return Path.join(
-+    getDistRoot(),
-+    `${getExecutableName()}-${process.platform}-x64`
-+  )
-+}
-+
-+export function getExecutableName() {
-+  const suffix = process.env.NODE_ENV === 'development' ? '-dev' : ''
-+
-+  if (process.platform === 'win32') {
-+    return `${getWindowsIdentifierName()}${suffix}`
-+  } else if (process.platform === 'linux') {
-+    return 'desktop'
-+  } else {
-+    return productName
-+  }
-+}
-+
-+export function getOSXZipName() {
-+  return `${productName}.zip`
-+}
-+
-+export function getOSXZipPath() {
-+  return Path.join(getDistPath(), '..', getOSXZipName())
-+}
-+
-+export function getWindowsInstallerName() {
-+  const productName = getExecutableName()
-+  return `${productName}Setup.msi`
-+}
-+
-+export function getWindowsInstallerPath() {
-+  return Path.join(getDistPath(), '..', 'installer', getWindowsInstallerName())
-+}
-+
-+export function getWindowsStandaloneName() {
-+  const productName = getExecutableName()
-+  return `${productName}Setup.exe`
-+}
-+
-+export function getWindowsStandalonePath() {
-+  return Path.join(getDistPath(), '..', 'installer', getWindowsStandaloneName())
-+}
-+
-+export function getWindowsFullNugetPackageName() {
-+  return `${getWindowsIdentifierName()}-${version}-full.nupkg`
-+}
-+
-+export function getWindowsFullNugetPackagePath() {
-+  return Path.join(
-+    getDistPath(),
-+    '..',
-+    'installer',
-+    getWindowsFullNugetPackageName()
-+  )
-+}
-+
-+export function getWindowsDeltaNugetPackageName() {
-+  return `${getWindowsIdentifierName()}-${version}-delta.nupkg`
-+}
-+
-+export function getWindowsDeltaNugetPackagePath() {
-+  return Path.join(
-+    getDistPath(),
-+    '..',
-+    'installer',
-+    getWindowsDeltaNugetPackageName()
-+  )
-+}
-+
-+export function getWindowsIdentifierName() {
-+  return 'GitHubDesktop'
-+}
-+
-+export function getBundleSizes() {
-+  // eslint-disable-next-line no-sync
-+  const rendererStats = Fs.statSync(
-+    Path.join(projectRoot, 'out', 'renderer.js')
-+  )
-+  // eslint-disable-next-line no-sync
-+  const mainStats = Fs.statSync(Path.join(projectRoot, 'out', 'main.js'))
-+  return { rendererSize: rendererStats.size, mainSize: mainStats.size }
-+}
-+
-+export function getReleaseBranchName(): string {
-+  return (
-+    process.env.CIRCLE_BRANCH || // macOS
-+    process.env.APPVEYOR_REPO_BRANCH || // Windows
-+    ''
-+  )
-+}
-+
-+export function getReleaseChannel() {
-+  // Branch name format: __release-CHANNEL-DEPLOY_ID
-+  const pieces = getReleaseBranchName().split('-')
-+  if (pieces.length < 3 || pieces[0] !== '__release') {
-+    return process.env.NODE_ENV || 'development'
-+  }
-+
-+  return pieces[1]
-+}
-+
-+export function getReleaseSHA() {
-+  // Branch name format: __release-CHANNEL-DEPLOY_ID
-+  const pieces = getReleaseBranchName().split('-')
-+  if (pieces.length < 3 || pieces[0] !== '__release') {
-+    return null
-+  }
-+
-+  return pieces[2]
-+}
-+
-+export function getUpdatesURL() {
-+  return `https://central.github.com/api/deployments/desktop/desktop/latest?version=${version}&env=${getReleaseChannel()}`
-+}
-+
-+export function shouldMakeDelta() {
-+  // Only production and beta channels include deltas. Test releases aren't
-+  // necessarily sequential so deltas wouldn't make sense.
-+  const channelsWithDeltas = ['production', 'beta']
-+  return channelsWithDeltas.indexOf(getReleaseChannel()) > -1
-+}
-merged
-  result 100644 c71f2850346b76957d6eb4312308b15714d08361 script/eslint.ts
-  our    100644 953deb6d112573e32a78fd54bc428c723508a788 script/eslint.ts
-@@ -16,7 +16,7 @@
- const report = eslint.executeOnFiles([
-   './{script,eslint-rules}/**/*.{j,t}s?(x)',
-   './tslint-rules/**/*.ts',
--  './app/*.js',
-+  './app/*.ts',
-   './app/{src,typings,test}/**/*.{j,t}s?(x)',
-   './changelog.json',
- ])
-merged
-  result 100644 bb3b7645eac13fe68f14a1e2b6b95e522d234648 script/globals.d.ts
-  our    100644 d9ee18180f09bbb636b084a49eac223aa170eb71 script/globals.d.ts
-@@ -6,63 +6,6 @@
-   devDependencies: PackageLookup
- }
-
--// type declarations for legal-eagle
--type LicenseLookup = {
--  [key: string]: LicenseEntry
--}
--
--type LegalEagleOptions = {
--  path: string
--  overrides: LicenseLookup
--  omitPermissive?: boolean
--}
--
--type LicenseEntry = {
--  license: string
--  source: string
--  repository: string
--  sourceText: string
--}
--
--type LegalEagle = (
--  options: LegalEagleOptions,
--  callback: (error: Error | null, summary: LicenseLookup) => void
--) => void
--
--// type declarations for electron-installer-redhat
--type RedhatOptions = {
--  src: string
--  dest: string
--  arch: string
--}
--
--type ElectronInstallerRedhat = (
--  options: RedhatOptions,
--  callback: (error: Error | null) => void
--) => void
--
--// type declarations for electron-installer-debian
--type DebianOptions = {
--  src: string
--  dest: string
--  arch: string
--}
--
--type ElectronInstallerDebian = (
--  options: DebianOptions,
--  callback: (error: Error | null) => void
--) => void
--
--// type declarations for electron-installer-appimage
--type AppImageOptions = {
--  dir: string
--  targetArch: string
--}
--
--type ElectronInstallerAppImage = {
--  default: (options: AppImageOptions) => Promise<void>
--}
--
- declare namespace NodeJS {
-   // eslint-disable-next-line typescript/interface-name-prefix
-   interface Process extends EventEmitter {
-removed in remote
-  base   100644 92a4128288d1d86d9eca15d695a8cb8d846bcb58 script/license-overrides.js
-  our    100644 92a4128288d1d86d9eca15d695a8cb8d846bcb58 script/license-overrides.js
-@@ -1,45 +0,0 @@
--module.exports = {
--  'cycle@1.0.3': {
--    repository: 'git+ssh://git@github.com/dscape/cycle',
--    license: 'Public Domain',
--    source:
--      'cycle.js header comment at https://github.com/dscape/cycle/blob/ab67ce90e8fa2efdb8f21074661366ec56f6a724/cycle.js',
--    sourceText:
--      'Public Domain.\n\nNO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.',
--  },
--
--  'json-schema@0.2.3': {
--    repository: 'git+ssh://git@github.com/kriszyp/json-schema',
--    license: 'BSD',
--    source:
--      'README.md at https://github.com/kriszyp/json-schema/tree/24c4ed1b2359ab457a00e90606a777c2962ecd3b',
--    sourceText:
--      'Code is licensed under the AFL or BSD 3-Clause license as part of the Persevere project which is administered under the Dojo foundation, and all contributions require a Dojo CLA.',
--  },
--
--  'wicg-focus-ring@1.0.1': {
--    repository: 'git+https://github.com/WICG/focus-ring',
--    license: 'MIT',
--    source:
--      'https://github.com/WICG/focus-ring/blob/4df78f379e4c7dbaa1a5e4ff25cf1b56700b24ee/LICENSE.md',
--    sourceText: `This work is being provided by the copyright holders under the following license.
--
--License
--
--By obtaining and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions.
--
--Permission to copy, modify, and distribute this work, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the work or portions thereof, including modifications:
--
--* The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.
--* Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, the W3C Software and Document Short Notice should be included.
--* Notice of any changes or modifications, through a copyright statement on the new code or document such as "This software or document includes material copied from or derived from [title and URI of the W3C document]. Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
--
--Disclaimers
--
--THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
--
--COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
--
--The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the work without specific, written prior permission. Title to copyright in this work will at all times remain with copyright holders.`,
--  },
--}
-added in remote
-  their  100644 03fdf69fd8b91f2bd0d89f4f124473a4f2affff5 script/license-overrides.ts
-@@ -0,0 +1,47 @@
-+import { LicenseLookup } from 'legal-eagle'
-+
-+export const licenseOverrides: LicenseLookup = {
-+  'cycle@1.0.3': {
-+    repository: 'git+ssh://git@github.com/dscape/cycle',
-+    license: 'Public Domain',
-+    source:
-+      'cycle.js header comment at https://github.com/dscape/cycle/blob/ab67ce90e8fa2efdb8f21074661366ec56f6a724/cycle.js',
-+    sourceText:
-+      'Public Domain.\n\nNO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.',
-+  },
-+
-+  'json-schema@0.2.3': {
-+    repository: 'git+ssh://git@github.com/kriszyp/json-schema',
-+    license: 'BSD',
-+    source:
-+      'README.md at https://github.com/kriszyp/json-schema/tree/24c4ed1b2359ab457a00e90606a777c2962ecd3b',
-+    sourceText:
-+      'Code is licensed under the AFL or BSD 3-Clause license as part of the Persevere project which is administered under the Dojo foundation, and all contributions require a Dojo CLA.',
-+  },
-+
-+  'wicg-focus-ring@1.0.1': {
-+    repository: 'git+https://github.com/WICG/focus-ring',
-+    license: 'MIT',
-+    source:
-+      'https://github.com/WICG/focus-ring/blob/4df78f379e4c7dbaa1a5e4ff25cf1b56700b24ee/LICENSE.md',
-+    sourceText: `This work is being provided by the copyright holders under the following license.
-+
-+License
-+
-+By obtaining and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions.
-+
-+Permission to copy, modify, and distribute this work, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the work or portions thereof, including modifications:
-+
-+* The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.
-+* Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, the W3C Software and Document Short Notice should be included.
-+* Notice of any changes or modifications, through a copyright statement on the new code or document such as "This software or document includes material copied from or derived from [title and URI of the W3C document]. Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
-+
-+Disclaimers
-+
-+THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-+
-+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
-+
-+The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the work without specific, written prior permission. Title to copyright in this work will at all times remain with copyright holders.`,
-+  },
-+}
-merged
-  result 100644 4f340bd02953a3f1dbcadde80836e441a1d4c69c script/prettier.ts
-  our    100644 146c1fcc48a0541fe8d79bf5245d94c06b3b832e script/prettier.ts
-@@ -11,7 +11,12 @@
- const prettier = process.platform === 'win32' ? 'prettier.cmd' : 'prettier'
- const prettierPath = Path.join(root, 'node_modules', '.bin', prettier)
-
--const args = ['**/*.scss', '--list-different']
-+const args = [
-+  '**/*.scss',
-+  'app/**/*.{ts,tsx}',
-+  'script/**/*.ts',
-+  '--list-different',
-+]
-
- if (shouldFix) {
-   args.push('--write')
-removed in remote
-  base   100644 68800a13155c68afc965da100c263aad461916a8 script/publish
-  our    100644 68800a13155c68afc965da100c263aad461916a8 script/publish
-@@ -1,200 +0,0 @@
--#!/usr/bin/env node
--
--'use strict'
--
--const TEST_PUBLISH = false
--const PUBLISH_CHANNELS = ['production', 'test', 'beta']
--const distInfo = require('./dist-info')
--const gitInfo = require('../app/git-info')
--const packageInfo = require('../app/package-info')
--
--if (PUBLISH_CHANNELS.indexOf(distInfo.getReleaseChannel()) < 0) {
--  console.log('Not a publishable build. Skipping publish.')
--  process.exit(0)
--}
--
--const releaseSHA = distInfo.getReleaseSHA()
--if (!releaseSHA) {
--  console.log(`No release SHA found for build. Skipping publish.`)
--  process.exit(0)
--}
--
--const currentTipSHA = gitInfo.getSHA()
--if (
--  !currentTipSHA ||
--  !currentTipSHA.toUpperCase().startsWith(releaseSHA.toUpperCase())
--) {
--  console.log(
--    `Current tip '${currentTipSHA}' does not match release SHA '${releaseSHA}'. Skipping publish.`
--  )
--  process.exit(0)
--}
--
--const fs = require('fs')
--const cp = require('child_process')
--const AWS = require('aws-sdk')
--const crypto = require('crypto')
--const request = require('request')
--
--console.log('Packaging…')
--cp.execSync('yarn package')
--
--let sha = ''
--if (process.platform === 'darwin') {
--  sha = process.env.CIRCLE_SHA1
--} else if (process.platform === 'win32') {
--  sha = process.env.APPVEYOR_REPO_COMMIT
--}
--
--sha = sha.substr(0, 8)
--
--console.log('Uploading…')
--
--let uploadPromise = null
--if (process.platform === 'darwin') {
--  uploadPromise = uploadOSXAssets()
--} else if (process.platform === 'win32') {
--  uploadPromise = uploadWindowsAssets()
--} else {
--  console.error(`I dunno how to publish a release for ${process.platform} :(`)
--  process.exit(1)
--}
--
--uploadPromise
--  .then(artifacts => {
--    const names = artifacts.map(function(item, index) {
--      return item.name
--    })
--    console.log(`Uploaded artifacts: ${names}`)
--    return updateDeploy(artifacts)
--  })
--  .catch(e => {
--    console.error(`Publishing failed: ${e}`)
--    process.exit(1)
--  })
--
--function uploadOSXAssets() {
--  const uploads = [upload(distInfo.getOSXZipName(), distInfo.getOSXZipPath())]
--  return Promise.all(uploads)
--}
--
--function uploadWindowsAssets() {
--  const uploads = [
--    upload(
--      distInfo.getWindowsInstallerName(),
--      distInfo.getWindowsInstallerPath()
--    ),
--    upload(
--      distInfo.getWindowsStandaloneName(),
--      distInfo.getWindowsStandalonePath()
--    ),
--    upload(
--      distInfo.getWindowsFullNugetPackageName(),
--      distInfo.getWindowsFullNugetPackagePath()
--    ),
--  ]
--
--  if (distInfo.shouldMakeDelta()) {
--    uploads.push(
--      upload(
--        distInfo.getWindowsDeltaNugetPackageName(),
--        distInfo.getWindowsDeltaNugetPackagePath()
--      )
--    )
--  }
--
--  return Promise.all(uploads)
--}
--
--function upload(assetName, assetPath) {
--  const s3Info = {
--    accessKeyId: process.env.S3_KEY,
--    secretAccessKey: process.env.S3_SECRET,
--  }
--  const s3 = new AWS.S3(s3Info)
--
--  const bucket = process.env.S3_BUCKET
--  const key = `releases/${packageInfo.getVersion()}-${sha}/${assetName.replace(
--    / /g,
--    ''
--  )}`
--  const url = `https://s3.amazonaws.com/${bucket}/${key}`
--
--  const uploadParams = {
--    Bucket: bucket,
--    ACL: 'public-read',
--    Key: key,
--    Body: fs.createReadStream(assetPath),
--  }
--
--  return new Promise((resolve, reject) => {
--    s3.upload(uploadParams, (error, data) => {
--      if (error) {
--        reject(error)
--      } else {
--        const stats = fs.statSync(assetPath)
--        const hash = crypto.createHash('sha1')
--        const input = fs.createReadStream(assetPath)
--
--        hash.on('finish', () => {
--          const sha = hash.read().toString('hex')
--          resolve({ name: assetName, url, size: stats['size'], sha })
--        })
--
--        input.pipe(hash)
--      }
--    })
--  })
--}
--
--function createSignature(body) {
--  const hmac = crypto.createHmac('sha1', process.env.DEPLOYMENT_SECRET)
--  hmac.update(JSON.stringify(body))
--  return `sha1=${hmac.digest('hex')}`
--}
--
--function updateDeploy(artifacts) {
--  const { rendererSize, mainSize } = distInfo.getBundleSizes()
--  const body = {
--    context: process.platform,
--    branch_name: distInfo.getReleaseBranchName(),
--    artifacts,
--    stats: {
--      platform: process.platform,
--      rendererBundleSize: rendererSize,
--      mainBundleSize: mainSize,
--    },
--  }
--  const signature = createSignature(body)
--  const options = {
--    method: 'POST',
--    url: 'https://central.github.com/api/deploy_built',
--    headers: {
--      'X-Hub-Signature': signature,
--    },
--    json: true,
--    body,
--  }
--
--  return new Promise((resolve, reject) => {
--    request(options, (error, response, body) => {
--      if (error) {
--        reject(error)
--        return
--      }
--
--      if (response.statusCode !== 200) {
--        reject(
--          new Error(
--            `Received a non-200 response (${response.statusCode}): ${JSON.stringify(
--              body
--            )}`
--          )
--        )
--        return
--      }
--
--      resolve()
--    })
--  })
--}
-added in remote
-  their  100644 4d6fbd455197c1eaf2b4279aa43467b07e669937 script/publish.ts
-@@ -0,0 +1,222 @@
-+const PUBLISH_CHANNELS = ['production', 'test', 'beta']
-+import * as distInfo from './dist-info'
-+import * as gitInfo from '../app/git-info'
-+import * as packageInfo from '../app/package-info'
-+
-+if (PUBLISH_CHANNELS.indexOf(distInfo.getReleaseChannel()) < 0) {
-+  console.log('Not a publishable build. Skipping publish.')
-+  process.exit(0)
-+}
-+
-+const releaseSHA = distInfo.getReleaseSHA()
-+if (releaseSHA == null) {
-+  console.log(`No release SHA found for build. Skipping publish.`)
-+  process.exit(0)
-+}
-+
-+const currentTipSHA = gitInfo.getSHA()
-+if (!currentTipSHA.toUpperCase().startsWith(releaseSHA!.toUpperCase())) {
-+  console.log(
-+    `Current tip '${currentTipSHA}' does not match release SHA '${releaseSHA}'. Skipping publish.`
-+  )
-+  process.exit(0)
-+}
-+
-+import * as Fs from 'fs'
-+import { execSync } from 'child_process'
-+import * as AWS from 'aws-sdk'
-+import * as Crypto from 'crypto'
-+import * as request from 'request'
-+
-+console.log('Packaging…')
-+execSync('yarn package')
-+
-+function getSha() {
-+  if (process.platform === 'darwin' && process.env.CIRCLE_SHA1 != null) {
-+    return process.env.CIRCLE_SHA1
-+  } else if (
-+    process.platform === 'win32' &&
-+    process.env.APPVEYOR_REPO_COMMIT != null
-+  ) {
-+    return process.env.APPVEYOR_REPO_COMMIT
-+  }
-+
-+  throw new Error(
-+    `Unable to get the SHA for the current platform. Check the vendor docs for the desired environment variables.`
-+  )
-+}
-+
-+const sha = getSha().substr(0, 8)
-+
-+function getSecret() {
-+  if (process.env.DEPLOYMENT_SECRET != null) {
-+    return process.env.DEPLOYMENT_SECRET
-+  }
-+
-+  throw new Error(
-+    `Unable to get deployment seret environment variable. Deployment aborting...`
-+  )
-+}
-+
-+console.log('Uploading…')
-+
-+let uploadPromise = null
-+if (process.platform === 'darwin') {
-+  uploadPromise = uploadOSXAssets()
-+} else if (process.platform === 'win32') {
-+  uploadPromise = uploadWindowsAssets()
-+} else {
-+  console.error(`I dunno how to publish a release for ${process.platform} :(`)
-+  process.exit(1)
-+}
-+
-+uploadPromise!
-+  .then(artifacts => {
-+    const names = artifacts.map(function(item, index) {
-+      return item.name
-+    })
-+    console.log(`Uploaded artifacts: ${names}`)
-+    return updateDeploy(artifacts, getSecret())
-+  })
-+  .catch(e => {
-+    console.error(`Publishing failed: ${e}`)
-+    process.exit(1)
-+  })
-+
-+function uploadOSXAssets() {
-+  const uploads = [upload(distInfo.getOSXZipName(), distInfo.getOSXZipPath())]
-+  return Promise.all(uploads)
-+}
-+
-+function uploadWindowsAssets() {
-+  const uploads = [
-+    upload(
-+      distInfo.getWindowsInstallerName(),
-+      distInfo.getWindowsInstallerPath()
-+    ),
-+    upload(
-+      distInfo.getWindowsStandaloneName(),
-+      distInfo.getWindowsStandalonePath()
-+    ),
-+    upload(
-+      distInfo.getWindowsFullNugetPackageName(),
-+      distInfo.getWindowsFullNugetPackagePath()
-+    ),
-+  ]
-+
-+  if (distInfo.shouldMakeDelta()) {
-+    uploads.push(
-+      upload(
-+        distInfo.getWindowsDeltaNugetPackageName(),
-+        distInfo.getWindowsDeltaNugetPackagePath()
-+      )
-+    )
-+  }
-+
-+  return Promise.all(uploads)
-+}
-+
-+interface IUploadResult {
-+  name: string
-+  url: string
-+  size: number
-+  sha: string
-+}
-+
-+function upload(assetName: string, assetPath: string) {
-+  const s3Info = {
-+    accessKeyId: process.env.S3_KEY,
-+    secretAccessKey: process.env.S3_SECRET,
-+  }
-+  const s3 = new AWS.S3(s3Info)
-+
-+  const bucket = process.env.S3_BUCKET || ''
-+  const key = `releases/${packageInfo.getVersion()}-${sha}/${assetName.replace(
-+    / /g,
-+    ''
-+  )}`
-+  const url = `https://s3.amazonaws.com/${bucket}/${key}`
-+
-+  const uploadParams = {
-+    Bucket: bucket,
-+    ACL: 'public-read',
-+    Key: key,
-+    Body: Fs.createReadStream(assetPath),
-+  }
-+
-+  return new Promise<IUploadResult>((resolve, reject) => {
-+    s3.upload(
-+      uploadParams,
-+      (error: Error, data: AWS.S3.ManagedUpload.SendData) => {
-+        if (error != null) {
-+          reject(error)
-+        } else {
-+          // eslint-disable-next-line no-sync
-+          const stats = Fs.statSync(assetPath)
-+          const hash = Crypto.createHash('sha1')
-+          hash.setEncoding('hex')
-+          const input = Fs.createReadStream(assetPath)
-+
-+          hash.on('finish', () => {
-+            const sha = hash.read() as string
-+            resolve({ name: assetName, url, size: stats['size'], sha })
-+          })
-+
-+          input.pipe(hash)
-+        }
-+      }
-+    )
-+  })
-+}
-+
-+function createSignature(body: any, secret: string) {
-+  const hmac = Crypto.createHmac('sha1', secret)
-+  hmac.update(JSON.stringify(body))
-+  return `sha1=${hmac.digest('hex')}`
-+}
-+
-+function updateDeploy(artifacts: ReadonlyArray<IUploadResult>, secret: string) {
-+  const { rendererSize, mainSize } = distInfo.getBundleSizes()
-+  const body = {
-+    context: process.platform,
-+    branch_name: distInfo.getReleaseBranchName(),
-+    artifacts,
-+    stats: {
-+      platform: process.platform,
-+      rendererBundleSize: rendererSize,
-+      mainBundleSize: mainSize,
-+    },
-+  }
-+  const signature = createSignature(body, secret)
-+  const options = {
-+    method: 'POST',
-+    url: 'https://central.github.com/api/deploy_built',
-+    headers: {
-+      'X-Hub-Signature': signature,
-+    },
-+    json: true,
-+    body,
-+  }
-+
-+  return new Promise((resolve, reject) => {
-+    request(options, (error, response, body) => {
-+      if (error) {
-+        reject(error)
-+        return
-+      }
-+
-+      if (response.statusCode !== 200) {
-+        reject(
-+          new Error(
-+            `Received a non-200 response (${
-+              response.statusCode
-+            }): ${JSON.stringify(body)}`
-+          )
-+        )
-+        return
-+      }
-+
-+      resolve()
-+    })
-+  })
-+}
-merged
-  result 100644 903faa6e50dc2fafc46924b0438baa3b9e6f634b script/review-logs.ts
-  our    100644 68ca321f41b2e29ff3393e3d9a6abd62c560c699 script/review-logs.ts
-@@ -8,7 +8,13 @@
-
- function getUserDataPath() {
-   if (process.platform === 'win32') {
--    return path.join(process.env.APPDATA, getExecutableName())
-+    if (process.env.APPDATA) {
-+      return path.join(process.env.APPDATA, getExecutableName())
-+    } else {
-+      throw new Error(
-+        `Unable to find the application data directory on Windows :(`
-+      )
-+    }
-   } else if (process.platform === 'darwin') {
-     const home = os.homedir()
-     return path.join(home, 'Library', 'Application Support', getProductName())
-removed in remote
-  base   100644 77bf79b8ff282fb277c0f780772d8f30eca82e7d script/run.js
-  our    100644 77bf79b8ff282fb277c0f780772d8f30eca82e7d script/run.js
-@@ -1,46 +0,0 @@
--'use strict'
--
--const path = require('path')
--const cp = require('child_process')
--const fs = require('fs')
--const distInfo = require('./dist-info')
--
--const distPath = distInfo.getDistPath()
--const productName = distInfo.getExecutableName()
--
--let binaryPath = ''
--if (process.platform === 'darwin') {
--  binaryPath = path.join(
--    distPath,
--    `${productName}.app`,
--    'Contents',
--    'MacOS',
--    `${productName}`
--  )
--} else if (process.platform === 'win32') {
--  binaryPath = path.join(distPath, `${productName}.exe`)
--} else if (process.platform === 'linux') {
--  binaryPath = path.join(distPath, productName)
--} else {
--  console.error(`I dunno how to run on ${process.platform} ${process.arch} :(`)
--  process.exit(1)
--}
--
--module.exports = function(spawnOptions) {
--  try {
--    const stats = fs.statSync(binaryPath)
--    if (!stats.isFile()) {
--      return null
--    }
--  } catch (e) {
--    return null
--  }
--
--  const opts = Object.assign({}, spawnOptions)
--
--  opts.env = Object.assign(opts.env || {}, process.env, {
--    NODE_ENV: 'development',
--  })
--
--  return cp.spawn(binaryPath, [], opts)
--}
-added in remote
-  their  100644 6551aefb22d8539c0c733a0a3dbd436b4e88fa51 script/run.ts
-@@ -0,0 +1,45 @@
-+import { join } from 'path'
-+import { spawn, SpawnOptions } from 'child_process'
-+import * as Fs from 'fs'
-+import { getDistPath, getExecutableName } from './dist-info'
-+
-+const distPath = getDistPath()
-+const productName = getExecutableName()
-+
-+let binaryPath = ''
-+if (process.platform === 'darwin') {
-+  binaryPath = join(
-+    distPath,
-+    `${productName}.app`,
-+    'Contents',
-+    'MacOS',
-+    `${productName}`
-+  )
-+} else if (process.platform === 'win32') {
-+  binaryPath = join(distPath, `${productName}.exe`)
-+} else if (process.platform === 'linux') {
-+  binaryPath = join(distPath, productName)
-+} else {
-+  console.error(`I dunno how to run on ${process.platform} ${process.arch} :(`)
-+  process.exit(1)
-+}
-+
-+export function run(spawnOptions: SpawnOptions) {
-+  try {
-+    // eslint-disable-next-line no-sync
-+    const stats = Fs.statSync(binaryPath)
-+    if (!stats.isFile()) {
-+      return null
-+    }
-+  } catch (e) {
-+    return null
-+  }
-+
-+  const opts = Object.assign({}, spawnOptions)
-+
-+  opts.env = Object.assign(opts.env || {}, process.env, {
-+    NODE_ENV: 'development',
-+  })
-+
-+  return spawn(binaryPath, [], opts)
-+}
-removed in remote
-  base   100644 e2fdac76cfc9f9f60ad2e6163a08a7da7cc6a336 script/start
-  our    100644 e2fdac76cfc9f9f60ad2e6163a08a7da7cc6a336 script/start
-@@ -1,53 +0,0 @@
--#!/usr/bin/env node
--
--'use strict'
--
--const run = require('./run')
--const express = require('express')
--const webpack = require('webpack')
--const configs = require('../app/webpack.development')
--
--function startApp() {
--  const runningApp = run({ stdio: 'inherit' })
--  if (!runningApp) {
--    console.error(
--      "Couldn't launch the app. You probably need to build it first. Run `yarn build:dev`."
--    )
--    process.exit(1)
--  }
--
--  runningApp.on('close', () => {
--    process.exit(0)
--  })
--}
--
--if (process.env.NODE_ENV === 'production') {
--  startApp()
--  return
--}
--
--const [mainConfig, rendererConfig, askPassConfig] = configs
--
--const server = express()
--const compiler = webpack(rendererConfig)
--const port = process.env.PORT || 3000
--
--server.use(
--  require('webpack-dev-middleware')(compiler, {
--    publicPath: rendererConfig.output.publicPath,
--    noInfo: true,
--  })
--)
--
--server.use(require('webpack-hot-middleware')(compiler))
--
--server.listen(port, 'localhost', err => {
--  if (err) {
--    console.log(err)
--    process.exit(1)
--    return
--  }
--
--  console.log(`Server running at http://localhost:${port}`)
--  startApp()
--})
-added in remote
-  their  100644 96fdc173cf1566aef93aff0b05bdbe08daa597ef script/start.ts
-@@ -0,0 +1,72 @@
-+import * as express from 'express'
-+import * as webpack from 'webpack'
-+import * as devMiddleware from 'webpack-dev-middleware'
-+import * as hotMiddleware from 'webpack-hot-middleware'
-+
-+import { forceUnwrap as u } from '../app/src/lib/fatal-error'
-+
-+import configs = require('../app/webpack.development')
-+
-+import { run } from './run'
-+
-+function getPortOrDefault() {
-+  const port = process.env.PORT
-+  if (port != null) {
-+    const result = parseInt(port)
-+    if (isNaN(result)) {
-+      throw new Error(`Unable to parse '${port}' into valid number`)
-+    }
-+    return result
-+  }
-+
-+  return 3000
-+}
-+
-+function startApp() {
-+  const runningApp = run({ stdio: 'inherit' })
-+  if (runningApp == null) {
-+    console.error(
-+      "Couldn't launch the app. You probably need to build it first. Run `yarn build:dev`."
-+    )
-+    process.exit(1)
-+    return
-+  }
-+
-+  runningApp.on('close', () => {
-+    process.exit(0)
-+  })
-+}
-+
-+if (process.env.NODE_ENV === 'production') {
-+  startApp()
-+} else {
-+  const rendererConfig = configs[1]
-+
-+  const server = express()
-+  const compiler = webpack(rendererConfig)
-+  const port = getPortOrDefault()
-+
-+  const message = 'Could not find public path from configuration'
-+  server.use(
-+    devMiddleware(compiler, {
-+      publicPath: u(
-+        message,
-+        u(message, u(message, rendererConfig).output).publicPath
-+      ),
-+      logLevel: 'error',
-+    })
-+  )
-+
-+  server.use(hotMiddleware(compiler))
-+
-+  server.listen(port, 'localhost', (err: Error | null) => {
-+    if (err) {
-+      console.log(err)
-+      process.exit(1)
-+      return
-+    }
-+
-+    console.log(`Server running at http://localhost:${port}`)
-+    startApp()
-+  })
-+}
-merged
-  result 100644 5542fdd0d59adecb94be7f9b26f60659a899a77f script/tsconfig.json
-  our    100644 14dd9e3066f9076b88a5096328332f218696513d script/tsconfig.json
-@@ -3,14 +3,12 @@
-     "module": "commonjs",
-     "moduleResolution": "node",
-     "target": "es6",
--    "noImplicitAny": true,
-     "noImplicitReturns": true,
--    "noImplicitThis": true,
-     "noFallthroughCasesInSwitch": true,
-     "noUnusedLocals": true,
--    "strictNullChecks": true,
-     "sourceMap": false,
--    "noEmit": true
-+    "noEmit": true,
-+    "strict": true,
-   },
-   "compileOnSave": false
- }
-added in remote
-  their  100644 67afebf6479af930fa36dc6216880f9810e08abe script/unit-tests.ts
-@@ -0,0 +1,98 @@
-+#!/usr/bin/env ts-node
-+
-+import * as Path from 'path'
-+import { spawnSync, SpawnSyncOptions } from 'child_process'
-+
-+const environmentVariables = {
-+  // setting commit information so that tests don't need to rely on global config
-+  GIT_AUTHOR_NAME: 'Joe Bloggs',
-+  GIT_AUTHOR_EMAIL: 'joe.bloggs@somewhere.com',
-+  GIT_COMMITTER_NAME: 'Joe Bloggs',
-+  GIT_COMMITTER_EMAIL: 'joe.bloggs@somewhere.com',
-+  // signalling to dugite to use the bundled Git environment
-+  TEST_ENV: '1',
-+  // ensuring Electron doesn't attach to the current console session (Windows only)
-+  ELECTRON_NO_ATTACH_CONSOLE: '1',
-+}
-+
-+const env = { ...process.env, ...environmentVariables }
-+
-+// ensure commands are executed from the root of the repository
-+const repositoryRoot = Path.dirname(__dirname)
-+
-+const options: SpawnSyncOptions = {
-+  cwd: repositoryRoot,
-+  env,
-+  // ensure stdout/stderr is propagated to the parent process so the test results
-+  // are displayed to the user
-+  stdio: 'inherit',
-+}
-+
-+const electronMocha =
-+  process.platform === 'win32' ? 'electron-mocha.cmd' : 'electron-mocha'
-+
-+const electronMochaPath = Path.join(
-+  repositoryRoot,
-+  'node_modules',
-+  '.bin',
-+  electronMocha
-+)
-+
-+const electronMochaArgs = [
-+  // timeout for 10s
-+  '-t',
-+  '10000',
-+  // ensure tests are run within a renderer process
-+  '--renderer',
-+  '--require',
-+  'ts-node/register',
-+  '--require',
-+  './app/test/globals.ts',
-+  'app/test/unit/*.{ts,tsx}',
-+  'app/test/unit/**/*.{ts,tsx}',
-+]
-+
-+const shouldDebug = process.argv.indexOf('--debug') > -1
-+
-+if (shouldDebug) {
-+  electronMochaArgs.push('--debug')
-+}
-+
-+let exitCode = -1
-+
-+if (process.platform === 'linux') {
-+  // xvfb-maybe wraps xvfb-run to ensure Electron tests are run within the
-+  // context where the DISPLAY environment variable is set. It only runs on
-+  // Linux and is designed for CI scenarios, but this is making the whole
-+  // thing more explicit than the previous inline usage in package.json
-+  const xvfbMaybe = Path.join(
-+    repositoryRoot,
-+    'node_modules',
-+    '.bin',
-+    'xvfb-maybe'
-+  )
-+
-+  const args = [
-+    // on Travis there may be a problem with the default display being
-+    // unavailable -  this ensures we use a free server number
-+    '--auto-servernum',
-+    '--',
-+    // and then we pass through the test runner commands
-+    electronMochaPath,
-+    ...electronMochaArgs,
-+  ]
-+
-+  console.log(`spawing xvfb-maybe with args: ${args.join(' ')}`)
-+
-+  const { status } = spawnSync(xvfbMaybe, args, options)
-+  exitCode = status
-+} else {
-+  console.log(
-+    `spawing electron-mocha with args: ${electronMochaArgs.join(' ')}`
-+  )
-+
-+  const { status } = spawnSync(electronMochaPath, electronMochaArgs, options)
-+  exitCode = status
-+}
-+
-+process.exitCode = exitCode
-merged
-  result 100644 d9481a63e89bd672307df8f1048caa69ee6276a9 script/validate-changelog.ts
-  our    100644 99d3cf95c36c9a4c5fa58f5c5e2138fb7c281dec script/validate-changelog.ts
-@@ -36,6 +36,7 @@
- const repositoryRoot = Path.dirname(__dirname)
- const changelogPath = Path.join(repositoryRoot, 'changelog.json')
-
-+// eslint-disable-next-line no-sync
- const changelog = Fs.readFileSync(changelogPath, 'utf8')
-
- let changelogObj = null
-merged
-  result 100644 3162be12e327f202d1aab8c198ad93c33ff738c9 tsconfig.json
-  our    100644 277ed46c185a8c539e2c44a06c4c539a248d2577 tsconfig.json
-@@ -9,9 +9,14 @@
-     "sourceMap": true,
-     "jsx": "react",
-     "strict": true,
-+    "noEmit": true,
-     "outDir": "./out"
-   },
--  "include": ["app/**/*.ts", "app/**/*.tsx", "app/**/*.d.tsx"],
-+  "include": [
-+    "app/**/*.ts",
-+    "app/**/*.tsx",
-+    "app/**/*.d.tsx"
-+  ],
-   "exclude": [
-     "node_modules",
-     "app/node_modules",
-added in remote
-  their  100644 cea9476153ecf2e440e28d7b84dc334a433fd12d vsts.yml
-@@ -0,0 +1,62 @@
-+phases:
-+- phase: Windows
-+  queue: Hosted VS2017
-+  steps:
-+  - task: NodeTool@0
-+    inputs:
-+      versionSpec: "8.11.1"
-+  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-+    inputs:
-+      versionSpec: "1.5.1"
-+  - script: |
-+       yarn install --force
-+    name: Install
-+  - script: |
-+      yarn lint && yarn build:prod
-+    name: Build
-+  - script: |
-+      yarn test:setup && yarn test
-+    name: Test
-+
-+- phase: Linux
-+  queue: Hosted Linux Preview
-+  steps:
-+  - script: |
-+      apt-get update
-+      apt-get install -y --no-install-recommends libsecret-1-dev xvfb fakeroot dpkg rpm xz-utils xorriso zsync libxss1 libgconf2-4
-+  - task: NodeTool@0
-+    inputs:
-+      versionSpec: "8.11.1"
-+  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-+    inputs:
-+      versionSpec: "1.5.1"
-+  - script: |
-+       yarn install --force
-+    name: Install
-+  - script: |
-+       yarn lint && yarn build:prod
-+    name: Build
-+  - script: |
-+       export DISPLAY=':99.0'
-+       Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
-+       yarn test:setup && yarn test
-+    name: Test
-+
-+- phase: macOS
-+  queue: Hosted macOS Preview
-+  steps:
-+  - task: NodeTool@0
-+    inputs:
-+      versionSpec: "8.11.1"
-+  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-+    inputs:
-+      versionSpec: "1.5.1"
-+  - script: |
-+      yarn install --force
-+    name: Install
-+  - script: |
-+       yarn lint && yarn build:prod
-+    name: Build
-+  - script: |
-+      yarn test:setup && yarn test
-+    name: Test
-merged
-  result 100644 518ebd962c3152899bf04a5ae668a826085179c5 yarn.lock
-  our    100644 b62b02a9d580648aaf19776890ce70c967670310 yarn.lock
-@@ -22,6 +22,13 @@
-     "7zip-bin-mac" "~1.0.1"
-     "7zip-bin-win" "~2.2.0"
-
-+"@types/body-parser@*":
-+  version "1.16.8"
-+  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.16.8.tgz#687ec34140624a3bec2b1a8ea9268478ae8f3be3"
-+  dependencies:
-+    "@types/express" "*"
-+    "@types/node" "*"
-+
- "@types/byline@^4.2.31":
-   version "4.2.31"
-   resolved "https://registry.yarnpkg.com/@types/byline/-/byline-4.2.31.tgz#0e61fcb9c03e047d21c4496554c7116297ab60cd"
-@@ -46,10 +53,26 @@
-   version "2.2.3"
-   resolved "https://registry.yarnpkg.com/@types/classnames/-/classnames-2.2.3.tgz#3f0ff6873da793870e20a260cada55982f38a9e5"
-
-+"@types/clean-css@*":
-+  version "3.4.30"
-+  resolved "https://registry.yarnpkg.com/@types/clean-css/-/clean-css-3.4.30.tgz#0052c136f5248002428e3638b37de4a39818641d"
-+
-+"@types/clean-webpack-plugin@^0.1.2":
-+  version "0.1.2"
-+  resolved "https://registry.yarnpkg.com/@types/clean-webpack-plugin/-/clean-webpack-plugin-0.1.2.tgz#f3c9d97dd397a9db86ba6b9b245ca0eedf88f3b2"
-+  dependencies:
-+    "@types/webpack" "*"
-+
- "@types/codemirror@0.0.55":
-   version "0.0.55"
-   resolved "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-0.0.55.tgz#f4292b7a5f33b2aab509501c3db7e45d19a7c057"
-
-+"@types/connect@*":
-+  version "3.4.31"
-+  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.31.tgz#1f92d6b117ecc05076c49ecd024f7976e528bad9"
-+  dependencies:
-+    "@types/node" "*"
-+
- "@types/electron-packager@^10.1.0":
-   version "10.1.0"
-   resolved "https://registry.yarnpkg.com/@types/electron-packager/-/electron-packager-10.1.0.tgz#8d61ef76a2676936c59d14392a9c0c1853405953"
-@@ -64,13 +87,39 @@
-   version "1.2.32"
-   resolved "https://registry.yarnpkg.com/@types/event-kit/-/event-kit-1.2.32.tgz#068cbdc69e8c969afae8c9f6e3a51ea4b1b5522e"
-
-+"@types/express-serve-static-core@*":
-+  version "4.11.0"
-+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.11.0.tgz#aaaf472777191c3e56ec7aa160034c6b55ebdd59"
-+  dependencies:
-+    "@types/node" "*"
-+
-+"@types/express@*", "@types/express@^4.11.0":
-+  version "4.11.0"
-+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.11.0.tgz#234d65280af917cb290634b7a8d6bcac24aecbad"
-+  dependencies:
-+    "@types/body-parser" "*"
-+    "@types/express-serve-static-core" "*"
-+    "@types/serve-static" "*"
-+
-+"@types/extract-text-webpack-plugin@^3.0.3":
-+  version "3.0.3"
-+  resolved "https://registry.yarnpkg.com/@types/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.3.tgz#b4ef831c7ea7bc0585ccabc61e8b0d6cd69fccc3"
-+  dependencies:
-+    "@types/webpack" "*"
-+
- "@types/file-url@^2.0.0":
-   version "2.0.0"
-   resolved "https://registry.yarnpkg.com/@types/file-url/-/file-url-2.0.0.tgz#23d00a219b5064d903d4baa0cf7558692ea0eeb6"
-
--"@types/fs-extra@2.1.0":
--  version "2.1.0"
--  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-2.1.0.tgz#8b350239c0455d92b8d3c626edac193860ff395f"
-+"@types/form-data@*":
-+  version "2.2.1"
-+  resolved "https://registry.yarnpkg.com/@types/form-data/-/form-data-2.2.1.tgz#ee2b3b8eaa11c0938289953606b745b738c54b1e"
-+  dependencies:
-+    "@types/node" "*"
-+
-+"@types/fs-extra@^5.0.2":
-+  version "5.0.2"
-+  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-5.0.2.tgz#235a7e2b56452cc0a6a4809b53e1d1eaffff9c96"
-   dependencies:
-     "@types/node" "*"
-
-@@ -78,10 +127,49 @@
-   version "0.0.1"
-   resolved "https://registry.yarnpkg.com/@types/fuzzaldrin-plus/-/fuzzaldrin-plus-0.0.1.tgz#bfe5e25bc5b4066848171baf7a8aaf30e267d30a"
-
-+"@types/html-minifier@*":
-+  version "1.1.30"
-+  resolved "https://registry.yarnpkg.com/@types/html-minifier/-/html-minifier-1.1.30.tgz#3b3817c27df23922f7b5aa87eff45b3ab934aec9"
-+  dependencies:
-+    "@types/clean-css" "*"
-+    "@types/relateurl" "*"
-+    "@types/uglify-js" "*"
-+
-+"@types/html-webpack-plugin@^2.30.3":
-+  version "2.30.3"
-+  resolved "https://registry.yarnpkg.com/@types/html-webpack-plugin/-/html-webpack-plugin-2.30.3.tgz#848baba8e35010c6ef6d36b04174820b9d884583"
-+  dependencies:
-+    "@types/html-minifier" "*"
-+    "@types/webpack" "*"
-+
- "@types/keytar@^4.0.0":
-   version "4.0.1"
-   resolved "https://registry.yarnpkg.com/@types/keytar/-/keytar-4.0.1.tgz#e2cf6405dc33861424e59b67516c66d2cf7bc21b"
-
-+"@types/legal-eagle@^0.15.0":
-+  version "0.15.0"
-+  resolved "https://registry.yarnpkg.com/@types/legal-eagle/-/legal-eagle-0.15.0.tgz#3a3cf08edca425ffaf9518304c4f1efddea36e42"
-+
-+"@types/loglevel@*":
-+  version "1.5.3"
-+  resolved "https://registry.yarnpkg.com/@types/loglevel/-/loglevel-1.5.3.tgz#adfce55383edc5998a2170ad581b3e23d6adb5b8"
-+
-+"@types/memory-fs@*":
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/@types/memory-fs/-/memory-fs-0.3.0.tgz#847596a94f9a9688a2e342f4017fcc0050e8e2da"
-+  dependencies:
-+    "@types/node" "*"
-+
-+"@types/mime@*":
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.0.tgz#5a7306e367c539b9f6543499de8dd519fac37a8b"
-+
-+"@types/mini-css-extract-plugin@^0.2.0":
-+  version "0.2.0"
-+  resolved "https://registry.yarnpkg.com/@types/mini-css-extract-plugin/-/mini-css-extract-plugin-0.2.0.tgz#afb037dbbd76f6c13803927c2751d194188b5d47"
-+  dependencies:
-+    "@types/webpack" "*"
-+
- "@types/mocha@^2.2.48":
-   version "2.2.48"
-   resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.48.tgz#3523b126a0b049482e1c3c11877460f76622ffab"
-@@ -94,21 +182,21 @@
-   version "8.0.47"
-   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.47.tgz#968e596f91acd59069054558a00708c445ca30c2"
-
--"@types/node@^7.0.18":
--  version "7.0.46"
--  resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.46.tgz#c3dedd25558c676b3d6303e51799abb9c3f8f314"
--
- "@types/node@^8.0.24":
--  version "8.5.10"
--  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.5.10.tgz#49bd3637125dea5f55d7d1e8f51efd6cb835e1f7"
-+  version "8.10.1"
-+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.1.tgz#aac98b810c50568054486f2bb8c486d824713be8"
-+
-+"@types/node@^8.10.4":
-+  version "8.10.4"
-+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.4.tgz#d3ca40ee884c853e2b786ee73096726ec59a5b31"
-
- "@types/prop-types@*":
-   version "15.5.2"
-   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.5.2.tgz#3c6b8dceb2906cc87fe4358e809f9d20c8d59be1"
-
--"@types/react-dom@^16.0.4":
--  version "16.0.4"
--  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.0.4.tgz#2e8fd45f5443780ed49bf2cdd9809e6091177a7d"
-+"@types/react-dom@^16.0.5":
-+  version "16.0.6"
-+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.0.6.tgz#f1a65a4e7be8ed5d123f8b3b9eacc913e35a1a3c"
-   dependencies:
-     "@types/node" "*"
-     "@types/react" "*"
-@@ -120,24 +208,52 @@
-     "@types/react" "*"
-
- "@types/react-virtualized@^9.7.12":
--  version "9.7.12"
--  resolved "https://registry.yarnpkg.com/@types/react-virtualized/-/react-virtualized-9.7.12.tgz#3dc212c0f94c9e9eab2fe7cb5a23db18ba2d1ee1"
-+  version "9.7.14"
-+  resolved "https://registry.yarnpkg.com/@types/react-virtualized/-/react-virtualized-9.7.14.tgz#4ce4b1f4a8d242edf317c7f798852788150a0040"
-   dependencies:
-     "@types/prop-types" "*"
-     "@types/react" "*"
-
--"@types/react@*", "@types/react@^16.0.40":
--  version "16.0.40"
--  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.0.40.tgz#caabc2296886f40b67f6fc80f0f3464476461df9"
-+"@types/react@*", "@types/react@^16.3.16":
-+  version "16.3.16"
-+  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.3.16.tgz#78fc44a90b45701f50c8a7008f733680ba51fc86"
-+  dependencies:
-+    csstype "^2.2.0"
-+
-+"@types/relateurl@*":
-+  version "0.2.28"
-+  resolved "https://registry.yarnpkg.com/@types/relateurl/-/relateurl-0.2.28.tgz#6bda7db8653fa62643f5ee69e9f69c11a392e3a6"
-+
-+"@types/request@^2.0.9":
-+  version "2.0.9"
-+  resolved "https://registry.yarnpkg.com/@types/request/-/request-2.0.9.tgz#125b8a60d8a439e8d87e6d1335c61cccdc18343a"
-+  dependencies:
-+    "@types/form-data" "*"
-+    "@types/node" "*"
-
- "@types/semver@^5.5.0":
-   version "5.5.0"
-   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45"
-
-+"@types/serve-static@*":
-+  version "1.13.1"
-+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.1.tgz#1d2801fa635d274cd97d4ec07e26b21b44127492"
-+  dependencies:
-+    "@types/express-serve-static-core" "*"
-+    "@types/mime" "*"
-+
-+"@types/source-map@*":
-+  version "0.5.1"
-+  resolved "https://registry.yarnpkg.com/@types/source-map/-/source-map-0.5.1.tgz#7e74db5d06ab373a712356eebfaea2fad0ea2367"
-+
- "@types/strip-ansi@^3.0.0":
-   version "3.0.0"
-   resolved "https://registry.yarnpkg.com/@types/strip-ansi/-/strip-ansi-3.0.0.tgz#9b63d453a6b54aa849182207711a08be8eea48ae"
-
-+"@types/tapable@*":
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.2.tgz#e13182e1b69871a422d7863e11a4a6f5b814a4bd"
-+
- "@types/temp@^0.8.29":
-   version "0.8.31"
-   resolved "https://registry.yarnpkg.com/@types/temp/-/temp-0.8.31.tgz#8518b6fb4c7d7cf106c78e5d88d3cff88d508f97"
-@@ -156,6 +272,12 @@
-   version "0.7.32"
-   resolved "https://registry.yarnpkg.com/@types/ua-parser-js/-/ua-parser-js-0.7.32.tgz#8827d451d6702307248073b5d98aa9293d02b5e5"
-
-+"@types/uglify-js@*":
-+  version "2.6.29"
-+  resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-2.6.29.tgz#521347f69e20201d218f5991ae66e10878afcf1a"
-+  dependencies:
-+    "@types/source-map" "*"
-+
- "@types/untildify@^3.0.0":
-   version "3.0.0"
-   resolved "https://registry.yarnpkg.com/@types/untildify/-/untildify-3.0.0.tgz#cd3e6624e46ccf292d3823fb48fa90dda0deaec0"
-@@ -166,6 +288,43 @@
-   dependencies:
-     "@types/node" "*"
-
-+"@types/webpack-bundle-analyzer@^2.9.2":
-+  version "2.9.2"
-+  resolved "https://registry.yarnpkg.com/@types/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.9.2.tgz#a3f9f4dd8bc3025550001a1704cfd31125773f40"
-+  dependencies:
-+    "@types/webpack" "*"
-+
-+"@types/webpack-dev-middleware@^2.0.1":
-+  version "2.0.1"
-+  resolved "https://registry.yarnpkg.com/@types/webpack-dev-middleware/-/webpack-dev-middleware-2.0.1.tgz#516d953602d9e8ac72ca1196969969d580d4b0a6"
-+  dependencies:
-+    "@types/connect" "*"
-+    "@types/loglevel" "*"
-+    "@types/memory-fs" "*"
-+    "@types/webpack" "*"
-+
-+"@types/webpack-hot-middleware@^2.16.3":
-+  version "2.16.3"
-+  resolved "https://registry.yarnpkg.com/@types/webpack-hot-middleware/-/webpack-hot-middleware-2.16.3.tgz#c262ab826afae16030c15049e3c997849f9c8461"
-+  dependencies:
-+    "@types/connect" "*"
-+    "@types/webpack" "*"
-+
-+"@types/webpack-merge@^4.1.3":
-+  version "4.1.3"
-+  resolved "https://registry.yarnpkg.com/@types/webpack-merge/-/webpack-merge-4.1.3.tgz#e6af0f2a0f20a86ac83d7da84a2e454063121ad4"
-+  dependencies:
-+    "@types/webpack" "*"
-+
-+"@types/webpack@*", "@types/webpack@^4.4.0":
-+  version "4.4.0"
-+  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.4.0.tgz#c0551b772be241d786c0548812dd75a932f8efb4"
-+  dependencies:
-+    "@types/node" "*"
-+    "@types/tapable" "*"
-+    "@types/uglify-js" "*"
-+    source-map "^0.6.0"
-+
- "@types/winston@^2.2.0":
-   version "2.3.7"
-   resolved "https://registry.yarnpkg.com/@types/winston/-/winston-2.3.7.tgz#2ea18b2dc772d459b6af0f587447704df31afec2"
-@@ -178,6 +337,122 @@
-   dependencies:
-     "@types/node" "*"
-
-+"@webassemblyjs/ast@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.4.3.tgz#3b3f6fced944d8660273347533e6d4d315b5934a"
-+  dependencies:
-+    "@webassemblyjs/helper-wasm-bytecode" "1.4.3"
-+    "@webassemblyjs/wast-parser" "1.4.3"
-+    debug "^3.1.0"
-+    webassemblyjs "1.4.3"
-+
-+"@webassemblyjs/floating-point-hex-parser@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.4.3.tgz#f5aee4c376a717c74264d7bacada981e7e44faad"
-+
-+"@webassemblyjs/helper-buffer@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.4.3.tgz#0434b55958519bf503697d3824857b1dea80b729"
-+  dependencies:
-+    debug "^3.1.0"
-+
-+"@webassemblyjs/helper-code-frame@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.4.3.tgz#f1349ca3e01a8e29ee2098c770773ef97af43641"
-+  dependencies:
-+    "@webassemblyjs/wast-printer" "1.4.3"
-+
-+"@webassemblyjs/helper-fsm@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.4.3.tgz#65a921db48fb43e868f17b27497870bdcae22b79"
-+
-+"@webassemblyjs/helper-wasm-bytecode@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.4.3.tgz#0e5b4b5418e33f8a26e940b7809862828c3721a5"
-+
-+"@webassemblyjs/helper-wasm-section@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.4.3.tgz#9ceedd53a3f152c3412e072887ade668d0b1acbf"
-+  dependencies:
-+    "@webassemblyjs/ast" "1.4.3"
-+    "@webassemblyjs/helper-buffer" "1.4.3"
-+    "@webassemblyjs/helper-wasm-bytecode" "1.4.3"
-+    "@webassemblyjs/wasm-gen" "1.4.3"
-+    debug "^3.1.0"
-+
-+"@webassemblyjs/leb128@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.4.3.tgz#5a5e5949dbb5adfe3ae95664d0439927ac557fb8"
-+  dependencies:
-+    leb "^0.3.0"
-+
-+"@webassemblyjs/validation@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/validation/-/validation-1.4.3.tgz#9e66c9b3079d7bbcf2070c1bf52a54af2a09aac9"
-+  dependencies:
-+    "@webassemblyjs/ast" "1.4.3"
-+
-+"@webassemblyjs/wasm-edit@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.4.3.tgz#87febd565e0ffb5ae25f6495bb3958d17aa0a779"
-+  dependencies:
-+    "@webassemblyjs/ast" "1.4.3"
-+    "@webassemblyjs/helper-buffer" "1.4.3"
-+    "@webassemblyjs/helper-wasm-bytecode" "1.4.3"
-+    "@webassemblyjs/helper-wasm-section" "1.4.3"
-+    "@webassemblyjs/wasm-gen" "1.4.3"
-+    "@webassemblyjs/wasm-opt" "1.4.3"
-+    "@webassemblyjs/wasm-parser" "1.4.3"
-+    "@webassemblyjs/wast-printer" "1.4.3"
-+    debug "^3.1.0"
-+
-+"@webassemblyjs/wasm-gen@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.4.3.tgz#8553164d0154a6be8f74d653d7ab355f73240aa4"
-+  dependencies:
-+    "@webassemblyjs/ast" "1.4.3"
-+    "@webassemblyjs/helper-wasm-bytecode" "1.4.3"
-+    "@webassemblyjs/leb128" "1.4.3"
-+
-+"@webassemblyjs/wasm-opt@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.4.3.tgz#26c7a23bfb136aa405b1d3410e63408ec60894b8"
-+  dependencies:
-+    "@webassemblyjs/ast" "1.4.3"
-+    "@webassemblyjs/helper-buffer" "1.4.3"
-+    "@webassemblyjs/wasm-gen" "1.4.3"
-+    "@webassemblyjs/wasm-parser" "1.4.3"
-+    debug "^3.1.0"
-+
-+"@webassemblyjs/wasm-parser@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.4.3.tgz#7ddd3e408f8542647ed612019cfb780830993698"
-+  dependencies:
-+    "@webassemblyjs/ast" "1.4.3"
-+    "@webassemblyjs/helper-wasm-bytecode" "1.4.3"
-+    "@webassemblyjs/leb128" "1.4.3"
-+    "@webassemblyjs/wasm-parser" "1.4.3"
-+    webassemblyjs "1.4.3"
-+
-+"@webassemblyjs/wast-parser@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.4.3.tgz#3250402e2c5ed53dbe2233c9de1fe1f9f0d51745"
-+  dependencies:
-+    "@webassemblyjs/ast" "1.4.3"
-+    "@webassemblyjs/floating-point-hex-parser" "1.4.3"
-+    "@webassemblyjs/helper-code-frame" "1.4.3"
-+    "@webassemblyjs/helper-fsm" "1.4.3"
-+    long "^3.2.0"
-+    webassemblyjs "1.4.3"
-+
-+"@webassemblyjs/wast-printer@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.4.3.tgz#3d59aa8d0252d6814a3ef4e6d2a34c9ded3904e0"
-+  dependencies:
-+    "@webassemblyjs/ast" "1.4.3"
-+    "@webassemblyjs/wast-parser" "1.4.3"
-+    long "^3.2.0"
-+
- abbrev@1:
-   version "1.1.1"
-   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-@@ -189,11 +464,18 @@
-     mime-types "~2.1.16"
-     negotiator "0.6.1"
-
--acorn-dynamic-import@^2.0.0:
--  version "2.0.2"
--  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4"
-+accepts@~1.3.5:
-+  version "1.3.5"
-+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
-+  dependencies:
-+    mime-types "~2.1.18"
-+    negotiator "0.6.1"
-+
-+acorn-dynamic-import@^3.0.0:
-+  version "3.0.0"
-+  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz#901ceee4c7faaef7e07ad2a47e890675da50a278"
-   dependencies:
--    acorn "^4.0.3"
-+    acorn "^5.0.0"
-
- acorn-jsx@^3.0.0:
-   version "3.0.1"
-@@ -205,23 +487,15 @@
-   version "3.3.0"
-   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
-
--acorn@^4.0.3:
--  version "4.0.13"
--  resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
--
- acorn@^5.0.0:
-   version "5.2.1"
-   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.2.1.tgz#317ac7821826c22c702d66189ab8359675f135d7"
-
--acorn@^5.5.0:
-+acorn@^5.3.0, acorn@^5.5.0:
-   version "5.5.3"
-   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.3.tgz#f473dd47e0277a08e28e9bec5aeeb04751f0b8c9"
-
--ajv-keywords@^1.1.1:
--  version "1.5.1"
--  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
--
--ajv-keywords@^2.0.0, ajv-keywords@^2.1.0:
-+ajv-keywords@^2.1.0:
-   version "2.1.1"
-   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
-
-@@ -229,14 +503,14 @@
-   version "3.1.0"
-   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.1.0.tgz#ac2b27939c543e95d2c06e7f7f5c27be4aa543be"
-
--ajv@^4.7.0, ajv@^4.9.1, ajv@^4.9.2:
-+ajv@^4.9.1, ajv@^4.9.2:
-   version "4.11.8"
-   resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
-   dependencies:
-     co "^4.6.0"
-     json-stable-stringify "^1.0.1"
-
--ajv@^5.0.0, ajv@^5.1.0, ajv@^5.1.5, ajv@^5.2.3:
-+ajv@^5.1.0, ajv@^5.2.3:
-   version "5.3.0"
-   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.3.0.tgz#4414ff74a50879c208ee5fdc826e32c303549eda"
-   dependencies:
-@@ -254,6 +528,15 @@
-     fast-json-stable-stringify "^2.0.0"
-     json-schema-traverse "^0.3.0"
-
-+ajv@^6.1.0:
-+  version "6.5.0"
-+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.0.tgz#4c8affdf80887d8f132c9c52ab8a2dc4d0b7b24c"
-+  dependencies:
-+    fast-deep-equal "^2.0.1"
-+    fast-json-stable-stringify "^2.0.0"
-+    json-schema-traverse "^0.3.0"
-+    uri-js "^4.2.1"
-+
- ajv@^6.1.1:
-   version "6.2.0"
-   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.2.0.tgz#afac295bbaa0152449e522742e4547c1ae9328d2"
-@@ -271,14 +554,6 @@
-     json-schema-traverse "^0.3.0"
-     uri-js "^3.0.2"
-
--align-text@^0.1.1, align-text@^0.1.3:
--  version "0.1.4"
--  resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
--  dependencies:
--    kind-of "^3.0.2"
--    longest "^1.0.1"
--    repeat-string "^1.5.2"
--
- alphanum-sort@^1.0.1, alphanum-sort@^1.0.2:
-   version "1.0.2"
-   resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
-@@ -323,29 +598,59 @@
-   dependencies:
-     color-convert "^1.9.0"
-
-+ansi-styles@^3.2.1:
-+  version "3.2.1"
-+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-+  dependencies:
-+    color-convert "^1.9.0"
-+
- any-promise@^1.0.0:
-   version "1.3.0"
-   resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
-
--anymatch@^1.3.0:
--  version "1.3.2"
--  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
-+anymatch@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
-   dependencies:
--    micromatch "^2.1.5"
--    normalize-path "^2.0.0"
-+    micromatch "^3.1.4"
-+    normalize-path "^2.1.1"
-
- app-builder-bin-linux@1.5.0:
-   version "1.5.0"
-   resolved "https://registry.yarnpkg.com/app-builder-bin-linux/-/app-builder-bin-linux-1.5.0.tgz#c22df1ab9ee7fb0270ec27a3c8a6993966ea4220"
-
-+app-builder-bin-linux@1.6.0:
-+  version "1.6.0"
-+  resolved "https://registry.yarnpkg.com/app-builder-bin-linux/-/app-builder-bin-linux-1.6.0.tgz#d7731d7988b8a740e74d591cbd565f168a266111"
-+
-+app-builder-bin-linux@1.8.4:
-+  version "1.8.4"
-+  resolved "https://registry.yarnpkg.com/app-builder-bin-linux/-/app-builder-bin-linux-1.8.4.tgz#9fa4f4f6af21f147cdedc69279940134c77d297f"
-+
- app-builder-bin-mac@1.5.0:
-   version "1.5.0"
-   resolved "https://registry.yarnpkg.com/app-builder-bin-mac/-/app-builder-bin-mac-1.5.0.tgz#40821128a1f20e0559f1fca71a59ecab81bb59b5"
-
-+app-builder-bin-mac@1.6.0:
-+  version "1.6.0"
-+  resolved "https://registry.yarnpkg.com/app-builder-bin-mac/-/app-builder-bin-mac-1.6.0.tgz#c976da70796d67aeb7134a57899636f2581d1c67"
-+
-+app-builder-bin-mac@1.8.4:
-+  version "1.8.4"
-+  resolved "https://registry.yarnpkg.com/app-builder-bin-mac/-/app-builder-bin-mac-1.8.4.tgz#abd35353167b037a15353fe44c84b0b17045d12f"
-+
- app-builder-bin-win@1.5.0:
-   version "1.5.0"
-   resolved "https://registry.yarnpkg.com/app-builder-bin-win/-/app-builder-bin-win-1.5.0.tgz#0a12437d825ac89fc2357e8be0ba855f54c083e9"
-
-+app-builder-bin-win@1.6.0:
-+  version "1.6.0"
-+  resolved "https://registry.yarnpkg.com/app-builder-bin-win/-/app-builder-bin-win-1.6.0.tgz#528ef96430d519c270b4de260bea0ddc70df1733"
-+
-+app-builder-bin-win@1.8.4:
-+  version "1.8.4"
-+  resolved "https://registry.yarnpkg.com/app-builder-bin-win/-/app-builder-bin-win-1.8.4.tgz#ba5f7a7d8ae48d32c400691b3c45f6f746c27748"
-+
- app-builder-bin@1.5.0:
-   version "1.5.0"
-   resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.5.0.tgz#dc768af9704876959c68af5456ef31f67a4663fe"
-@@ -354,7 +659,23 @@
-     app-builder-bin-mac "1.5.0"
-     app-builder-bin-win "1.5.0"
-
--aproba@^1.0.3:
-+app-builder-bin@1.6.0:
-+  version "1.6.0"
-+  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.6.0.tgz#c0e88a488d4c23c2e7fe0bbfb70c1d61165be206"
-+  optionalDependencies:
-+    app-builder-bin-linux "1.6.0"
-+    app-builder-bin-mac "1.6.0"
-+    app-builder-bin-win "1.6.0"
-+
-+app-builder-bin@1.8.4:
-+  version "1.8.4"
-+  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.8.4.tgz#ca8fd02209c2e0681de97fdb4c559d93381cc812"
-+  optionalDependencies:
-+    app-builder-bin-linux "1.8.4"
-+    app-builder-bin-mac "1.8.4"
-+    app-builder-bin-win "1.8.4"
-+
-+aproba@^1.0.3, aproba@^1.1.1:
-   version "1.2.0"
-   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
-
-@@ -396,17 +717,11 @@
-   dependencies:
-     sprintf-js "~1.0.2"
-
--arr-diff@^2.0.0:
--  version "2.0.0"
--  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
--  dependencies:
--    arr-flatten "^1.0.1"
--
- arr-diff@^4.0.0:
-   version "4.0.0"
-   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
-
--arr-flatten@^1.0.1, arr-flatten@^1.1.0:
-+arr-flatten@^1.1.0:
-   version "1.1.0"
-   resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
-
-@@ -439,10 +754,6 @@
-   version "1.0.3"
-   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-
--array-unique@^0.2.1:
--  version "0.2.1"
--  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
--
- array-unique@^0.3.2:
-   version "0.3.2"
-   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
-@@ -510,6 +821,10 @@
-   version "1.0.2"
-   resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.0.2.tgz#13ca515d86206da0bac66e834dd397d87581094c"
-
-+assign-symbols@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
-+
- async-each@^1.0.0:
-   version "1.0.1"
-   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
-@@ -522,7 +837,11 @@
-   version "0.1.3"
-   resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
-
--async@^2.0.0, async@^2.1.2, async@^2.1.5, async@^2.4.1:
-+async-limiter@~1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
-+
-+async@^2.0.0:
-   version "2.5.0"
-   resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d"
-   dependencies:
-@@ -555,18 +874,23 @@
-     postcss "^5.2.16"
-     postcss-value-parser "^3.2.3"
-
--awesome-typescript-loader@^3.4.0:
--  version "3.4.0"
--  resolved "https://registry.yarnpkg.com/awesome-typescript-loader/-/awesome-typescript-loader-3.4.0.tgz#aed2c83af614d617d11e3ec368ac3befb55d002f"
-+awesome-node-loader@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/awesome-node-loader/-/awesome-node-loader-1.1.0.tgz#95cf054ec2fa233c38f29ce18cc59b0ef0c002db"
-   dependencies:
--    colors "^1.1.2"
--    enhanced-resolve "3.3.0"
-     loader-utils "^1.1.0"
--    lodash "^4.17.4"
--    micromatch "^3.0.3"
-+
-+awesome-typescript-loader@^5.0.0:
-+  version "5.0.0"
-+  resolved "https://registry.yarnpkg.com/awesome-typescript-loader/-/awesome-typescript-loader-5.0.0.tgz#130c304ae52a60933f15d93f7629003b483fa8b1"
-+  dependencies:
-+    chalk "^2.3.1"
-+    enhanced-resolve "^4.0.0"
-+    loader-utils "^1.1.0"
-+    lodash "^4.17.5"
-+    micromatch "^3.1.9"
-     mkdirp "^0.5.1"
--    object-assign "^4.1.1"
--    source-map-support "^0.4.15"
-+    source-map-support "^0.5.3"
-
- aws-sdk@^2.23.0:
-   version "2.142.0"
-@@ -595,7 +919,7 @@
-   version "1.6.0"
-   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
-
--babel-code-frame@^6.11.0, babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
-+babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
-   version "6.26.0"
-   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
-   dependencies:
-@@ -603,7 +927,7 @@
-     esutils "^2.0.2"
-     js-tokens "^3.0.2"
-
--babel-core@^6.22.1, babel-core@^6.24.1, babel-core@^6.26.0:
-+babel-core@^6.26.0:
-   version "6.26.0"
-   resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.0.tgz#af32f78b31a6fcef119c87b0fd8d9753f03a0bb8"
-   dependencies:
-@@ -627,6 +951,30 @@
-     slash "^1.0.0"
-     source-map "^0.5.6"
-
-+babel-core@^6.26.3:
-+  version "6.26.3"
-+  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207"
-+  dependencies:
-+    babel-code-frame "^6.26.0"
-+    babel-generator "^6.26.0"
-+    babel-helpers "^6.24.1"
-+    babel-messages "^6.23.0"
-+    babel-register "^6.26.0"
-+    babel-runtime "^6.26.0"
-+    babel-template "^6.26.0"
-+    babel-traverse "^6.26.0"
-+    babel-types "^6.26.0"
-+    babylon "^6.18.0"
-+    convert-source-map "^1.5.1"
-+    debug "^2.6.9"
-+    json5 "^0.5.1"
-+    lodash "^4.17.4"
-+    minimatch "^3.0.4"
-+    path-is-absolute "^1.0.1"
-+    private "^0.1.8"
-+    slash "^1.0.0"
-+    source-map "^0.5.7"
-+
- babel-generator@^6.26.0:
-   version "6.26.0"
-   resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.0.tgz#ac1ae20070b79f6e3ca1d3269613053774f20dc5"
-@@ -640,33 +988,33 @@
-     source-map "^0.5.6"
-     trim-right "^1.0.1"
-
--babel-helper-evaluate-path@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-helper-evaluate-path/-/babel-helper-evaluate-path-0.2.0.tgz#0bb2eb01996c0cef53c5e8405e999fe4a0244c08"
-+babel-helper-evaluate-path@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/babel-helper-evaluate-path/-/babel-helper-evaluate-path-0.3.0.tgz#2439545e0b6eae5b7f49b790acbebd6b9a73df20"
-
--babel-helper-flip-expressions@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-helper-flip-expressions/-/babel-helper-flip-expressions-0.2.0.tgz#160d2090a3d9f9c64a750905321a0bc218f884ec"
-+babel-helper-flip-expressions@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/babel-helper-flip-expressions/-/babel-helper-flip-expressions-0.3.0.tgz#f5b6394bd5219b43cf8f7b201535ed540c6e7fa2"
-
- babel-helper-is-nodes-equiv@^0.0.1:
-   version "0.0.1"
-   resolved "https://registry.yarnpkg.com/babel-helper-is-nodes-equiv/-/babel-helper-is-nodes-equiv-0.0.1.tgz#34e9b300b1479ddd98ec77ea0bbe9342dfe39684"
-
--babel-helper-is-void-0@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-helper-is-void-0/-/babel-helper-is-void-0-0.2.0.tgz#6ed0ada8a9b1c5b6e88af6b47c1b3b5c080860eb"
-+babel-helper-is-void-0@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/babel-helper-is-void-0/-/babel-helper-is-void-0-0.3.0.tgz#95570d20bd27b2206f68083ae9980ee7003d8fe7"
-
--babel-helper-mark-eval-scopes@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-helper-mark-eval-scopes/-/babel-helper-mark-eval-scopes-0.2.0.tgz#7648aaf2ec92aae9b09a20ad91e8df5e1fcc94b2"
-+babel-helper-mark-eval-scopes@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/babel-helper-mark-eval-scopes/-/babel-helper-mark-eval-scopes-0.3.0.tgz#b4731314fdd7a89091271a5213b4e12d236e29e8"
-
--babel-helper-remove-or-void@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-helper-remove-or-void/-/babel-helper-remove-or-void-0.2.0.tgz#8e46ad5b30560d57d7510b3fd93f332ee7c67386"
-+babel-helper-remove-or-void@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/babel-helper-remove-or-void/-/babel-helper-remove-or-void-0.3.0.tgz#f43c86147c8fcc395a9528cbb31e7ff49d7e16e3"
-
--babel-helper-to-multiple-sequence-expressions@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-helper-to-multiple-sequence-expressions/-/babel-helper-to-multiple-sequence-expressions-0.2.0.tgz#d1a419634c6cb301f27858c659167cfee0a9d318"
-+babel-helper-to-multiple-sequence-expressions@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/babel-helper-to-multiple-sequence-expressions/-/babel-helper-to-multiple-sequence-expressions-0.3.0.tgz#8da2275ccc26995566118f7213abfd9af7214427"
-
- babel-helpers@^6.24.1:
-   version "6.24.1"
-@@ -681,156 +1029,157 @@
-   dependencies:
-     babel-runtime "^6.22.0"
-
--babel-minify@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-minify/-/babel-minify-0.2.0.tgz#36d381fee4002d7949dd5d796e74800336057d67"
-+babel-minify-webpack-plugin@^0.3.1:
-+  version "0.3.1"
-+  resolved "https://registry.yarnpkg.com/babel-minify-webpack-plugin/-/babel-minify-webpack-plugin-0.3.1.tgz#292aa240af190e2dcadf4f684d6d84d179b6d5a4"
-   dependencies:
--    babel-core "^6.24.1"
--    babel-preset-minify "^0.2.0"
--    fs-readdir-recursive "^1.0.0"
--    mkdirp "^0.5.1"
--    util.promisify "^1.0.0"
--    yargs-parser "^5.0.0"
-+    babel-core "^6.26.0"
-+    babel-preset-minify "^0.3.0"
-+    webpack-sources "^1.0.1"
-
--babel-plugin-minify-builtins@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-plugin-minify-builtins/-/babel-plugin-minify-builtins-0.2.0.tgz#317f824b0907210b6348671bb040ca072e2e0c82"
-+babel-plugin-minify-builtins@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-builtins/-/babel-plugin-minify-builtins-0.3.0.tgz#4740117a6a784063aaf8f092989cf9e4bd484860"
-   dependencies:
--    babel-helper-evaluate-path "^0.2.0"
-+    babel-helper-evaluate-path "^0.3.0"
-
--babel-plugin-minify-constant-folding@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-plugin-minify-constant-folding/-/babel-plugin-minify-constant-folding-0.2.0.tgz#8c70b528b2eb7c13e94d95c8789077d4cdbc3970"
-+babel-plugin-minify-constant-folding@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-constant-folding/-/babel-plugin-minify-constant-folding-0.3.0.tgz#687e40336bd4ddd921e0e197f0006235ac184bb9"
-   dependencies:
--    babel-helper-evaluate-path "^0.2.0"
-+    babel-helper-evaluate-path "^0.3.0"
-
--babel-plugin-minify-dead-code-elimination@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-plugin-minify-dead-code-elimination/-/babel-plugin-minify-dead-code-elimination-0.2.0.tgz#e8025ee10a1e5e4f202633a6928ce892c33747e3"
-+babel-plugin-minify-dead-code-elimination@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-dead-code-elimination/-/babel-plugin-minify-dead-code-elimination-0.3.0.tgz#a323f686c404b824186ba5583cf7996cac81719e"
-   dependencies:
--    babel-helper-evaluate-path "^0.2.0"
--    babel-helper-mark-eval-scopes "^0.2.0"
--    babel-helper-remove-or-void "^0.2.0"
-+    babel-helper-evaluate-path "^0.3.0"
-+    babel-helper-mark-eval-scopes "^0.3.0"
-+    babel-helper-remove-or-void "^0.3.0"
-     lodash.some "^4.6.0"
-
--babel-plugin-minify-flip-comparisons@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-plugin-minify-flip-comparisons/-/babel-plugin-minify-flip-comparisons-0.2.0.tgz#0c9c8e93155c8f09dedad8118b634c259f709ef5"
-+babel-plugin-minify-flip-comparisons@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-flip-comparisons/-/babel-plugin-minify-flip-comparisons-0.3.0.tgz#6627893a409c9f30ef7f2c89e0c6eea7ee97ddc4"
-   dependencies:
--    babel-helper-is-void-0 "^0.2.0"
-+    babel-helper-is-void-0 "^0.3.0"
-
--babel-plugin-minify-guarded-expressions@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-plugin-minify-guarded-expressions/-/babel-plugin-minify-guarded-expressions-0.2.0.tgz#8a8c950040fce3e258a12e6eb21eab94ad7235ab"
-+babel-plugin-minify-guarded-expressions@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-guarded-expressions/-/babel-plugin-minify-guarded-expressions-0.3.0.tgz#2552d96189ef45d9a463f1a6b5e4fa110703ac8d"
-   dependencies:
--    babel-helper-flip-expressions "^0.2.0"
-+    babel-helper-flip-expressions "^0.3.0"
-
--babel-plugin-minify-infinity@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-plugin-minify-infinity/-/babel-plugin-minify-infinity-0.2.0.tgz#30960c615ddbc657c045bb00a1d8eb4af257cf03"
-+babel-plugin-minify-infinity@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-infinity/-/babel-plugin-minify-infinity-0.3.0.tgz#c5ec0edd433517cf31b3af17077c202beb48bbe7"
-
--babel-plugin-minify-mangle-names@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-plugin-minify-mangle-names/-/babel-plugin-minify-mangle-names-0.2.0.tgz#719892297ff0106a6ec1a4b0fc062f1f8b6a8529"
-+babel-plugin-minify-mangle-names@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-mangle-names/-/babel-plugin-minify-mangle-names-0.3.0.tgz#f28561bad0dd2f0380816816bb946e219b3b6135"
-   dependencies:
--    babel-helper-mark-eval-scopes "^0.2.0"
-+    babel-helper-mark-eval-scopes "^0.3.0"
-
--babel-plugin-minify-numeric-literals@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-plugin-minify-numeric-literals/-/babel-plugin-minify-numeric-literals-0.2.0.tgz#5746e851700167a380c05e93f289a7070459a0d1"
-+babel-plugin-minify-numeric-literals@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-numeric-literals/-/babel-plugin-minify-numeric-literals-0.3.0.tgz#b57734a612e8a592005407323c321119f27d4b40"
-
--babel-plugin-minify-replace@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-plugin-minify-replace/-/babel-plugin-minify-replace-0.2.0.tgz#3c1f06bc4e6d3e301eacb763edc1be611efc39b0"
-+babel-plugin-minify-replace@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-replace/-/babel-plugin-minify-replace-0.3.0.tgz#980125bbf7cbb5a637439de9d0b1b030a4693893"
-
--babel-plugin-minify-simplify@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-plugin-minify-simplify/-/babel-plugin-minify-simplify-0.2.0.tgz#21ceec4857100c5476d7cef121f351156e5c9bc0"
-+babel-plugin-minify-simplify@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-simplify/-/babel-plugin-minify-simplify-0.3.0.tgz#14574cc74d21c81d3060fafa041010028189f11b"
-   dependencies:
--    babel-helper-flip-expressions "^0.2.0"
-+    babel-helper-flip-expressions "^0.3.0"
-     babel-helper-is-nodes-equiv "^0.0.1"
--    babel-helper-to-multiple-sequence-expressions "^0.2.0"
-+    babel-helper-to-multiple-sequence-expressions "^0.3.0"
-
--babel-plugin-minify-type-constructors@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-plugin-minify-type-constructors/-/babel-plugin-minify-type-constructors-0.2.0.tgz#7f3b6458be0863cfd59e9985bed6d134aa7a2e17"
-+babel-plugin-minify-type-constructors@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-type-constructors/-/babel-plugin-minify-type-constructors-0.3.0.tgz#7f5a86ef322c4746364e3c591b8514eeafea6ad4"
-   dependencies:
--    babel-helper-is-void-0 "^0.2.0"
-+    babel-helper-is-void-0 "^0.3.0"
-
--babel-plugin-transform-inline-consecutive-adds@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-plugin-transform-inline-consecutive-adds/-/babel-plugin-transform-inline-consecutive-adds-0.2.0.tgz#15dae78921057f4004f8eafd79e15ddc5f12f426"
-+babel-plugin-syntax-dynamic-import@^6.18.0:
-+  version "6.18.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz#8d6a26229c83745a9982a441051572caa179b1da"
-
--babel-plugin-transform-member-expression-literals@^6.8.5:
--  version "6.8.5"
--  resolved "https://registry.yarnpkg.com/babel-plugin-transform-member-expression-literals/-/babel-plugin-transform-member-expression-literals-6.8.5.tgz#e06ae305cf48d819822e93a70d79269f04d89eec"
-+babel-plugin-transform-inline-consecutive-adds@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-inline-consecutive-adds/-/babel-plugin-transform-inline-consecutive-adds-0.3.0.tgz#f07d93689c0002ed2b2b62969bdd99f734e03f57"
-+
-+babel-plugin-transform-member-expression-literals@^6.9.0:
-+  version "6.9.4"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-member-expression-literals/-/babel-plugin-transform-member-expression-literals-6.9.4.tgz#37039c9a0c3313a39495faac2ff3a6b5b9d038bf"
-
--babel-plugin-transform-merge-sibling-variables@^6.8.6:
--  version "6.8.6"
--  resolved "https://registry.yarnpkg.com/babel-plugin-transform-merge-sibling-variables/-/babel-plugin-transform-merge-sibling-variables-6.8.6.tgz#6d21efa5ee4981f71657fae716f9594bb2622aef"
-+babel-plugin-transform-merge-sibling-variables@^6.9.0:
-+  version "6.9.4"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-merge-sibling-variables/-/babel-plugin-transform-merge-sibling-variables-6.9.4.tgz#85b422fc3377b449c9d1cde44087203532401dae"
-
--babel-plugin-transform-minify-booleans@^6.8.3:
--  version "6.8.3"
--  resolved "https://registry.yarnpkg.com/babel-plugin-transform-minify-booleans/-/babel-plugin-transform-minify-booleans-6.8.3.tgz#5906ed776d3718250519abf1bace44b0b613ddf9"
-+babel-plugin-transform-minify-booleans@^6.9.0:
-+  version "6.9.4"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-minify-booleans/-/babel-plugin-transform-minify-booleans-6.9.4.tgz#acbb3e56a3555dd23928e4b582d285162dd2b198"
-
--babel-plugin-transform-property-literals@^6.8.5:
--  version "6.8.5"
--  resolved "https://registry.yarnpkg.com/babel-plugin-transform-property-literals/-/babel-plugin-transform-property-literals-6.8.5.tgz#67ed5930b34805443452c8b9690c7ebe1e206c40"
-+babel-plugin-transform-property-literals@^6.9.0:
-+  version "6.9.4"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-property-literals/-/babel-plugin-transform-property-literals-6.9.4.tgz#98c1d21e255736573f93ece54459f6ce24985d39"
-   dependencies:
-     esutils "^2.0.2"
-
--babel-plugin-transform-regexp-constructors@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regexp-constructors/-/babel-plugin-transform-regexp-constructors-0.2.0.tgz#6aa5dd0acc515db4be929bbcec4ed4c946c534a3"
-+babel-plugin-transform-regexp-constructors@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regexp-constructors/-/babel-plugin-transform-regexp-constructors-0.3.0.tgz#9bb2c8dd082271a5cb1b3a441a7c52e8fd07e0f5"
-
--babel-plugin-transform-remove-console@^6.8.5:
--  version "6.8.5"
--  resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.8.5.tgz#fde9d2d3d725530b0fadd8d31078402410386810"
-+babel-plugin-transform-remove-console@^6.9.0:
-+  version "6.9.4"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.9.4.tgz#b980360c067384e24b357a588d807d3c83527780"
-
--babel-plugin-transform-remove-debugger@^6.8.5:
--  version "6.8.5"
--  resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-debugger/-/babel-plugin-transform-remove-debugger-6.8.5.tgz#809584d412bf918f071fdf41e1fdb15ea89cdcd5"
-+babel-plugin-transform-remove-debugger@^6.9.0:
-+  version "6.9.4"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-debugger/-/babel-plugin-transform-remove-debugger-6.9.4.tgz#42b727631c97978e1eb2d199a7aec84a18339ef2"
-
--babel-plugin-transform-remove-undefined@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-undefined/-/babel-plugin-transform-remove-undefined-0.2.0.tgz#94f052062054c707e8d094acefe79416b63452b1"
-+babel-plugin-transform-remove-undefined@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-undefined/-/babel-plugin-transform-remove-undefined-0.3.0.tgz#03f5f0071867781e9beabbc7b77bf8095fd3f3ec"
-   dependencies:
--    babel-helper-evaluate-path "^0.2.0"
-+    babel-helper-evaluate-path "^0.3.0"
-
--babel-plugin-transform-simplify-comparison-operators@^6.8.5:
--  version "6.8.5"
--  resolved "https://registry.yarnpkg.com/babel-plugin-transform-simplify-comparison-operators/-/babel-plugin-transform-simplify-comparison-operators-6.8.5.tgz#a838786baf40cc33a93b95ae09e05591227e43bf"
-+babel-plugin-transform-simplify-comparison-operators@^6.9.0:
-+  version "6.9.4"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-simplify-comparison-operators/-/babel-plugin-transform-simplify-comparison-operators-6.9.4.tgz#f62afe096cab0e1f68a2d753fdf283888471ceb9"
-
--babel-plugin-transform-undefined-to-void@^6.8.3:
--  version "6.8.3"
--  resolved "https://registry.yarnpkg.com/babel-plugin-transform-undefined-to-void/-/babel-plugin-transform-undefined-to-void-6.8.3.tgz#fc52707f6ee1ddc71bb91b0d314fbefdeef9beb4"
-+babel-plugin-transform-undefined-to-void@^6.9.0:
-+  version "6.9.4"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-undefined-to-void/-/babel-plugin-transform-undefined-to-void-6.9.4.tgz#be241ca81404030678b748717322b89d0c8fe280"
-
--babel-preset-minify@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/babel-preset-minify/-/babel-preset-minify-0.2.0.tgz#006566552d9b83834472273f306c0131062a0acc"
--  dependencies:
--    babel-plugin-minify-builtins "^0.2.0"
--    babel-plugin-minify-constant-folding "^0.2.0"
--    babel-plugin-minify-dead-code-elimination "^0.2.0"
--    babel-plugin-minify-flip-comparisons "^0.2.0"
--    babel-plugin-minify-guarded-expressions "^0.2.0"
--    babel-plugin-minify-infinity "^0.2.0"
--    babel-plugin-minify-mangle-names "^0.2.0"
--    babel-plugin-minify-numeric-literals "^0.2.0"
--    babel-plugin-minify-replace "^0.2.0"
--    babel-plugin-minify-simplify "^0.2.0"
--    babel-plugin-minify-type-constructors "^0.2.0"
--    babel-plugin-transform-inline-consecutive-adds "^0.2.0"
--    babel-plugin-transform-member-expression-literals "^6.8.5"
--    babel-plugin-transform-merge-sibling-variables "^6.8.6"
--    babel-plugin-transform-minify-booleans "^6.8.3"
--    babel-plugin-transform-property-literals "^6.8.5"
--    babel-plugin-transform-regexp-constructors "^0.2.0"
--    babel-plugin-transform-remove-console "^6.8.5"
--    babel-plugin-transform-remove-debugger "^6.8.5"
--    babel-plugin-transform-remove-undefined "^0.2.0"
--    babel-plugin-transform-simplify-comparison-operators "^6.8.5"
--    babel-plugin-transform-undefined-to-void "^6.8.3"
-+babel-preset-minify@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/babel-preset-minify/-/babel-preset-minify-0.3.0.tgz#7db64afa75f16f6e06c0aa5f25195f6f36784d77"
-+  dependencies:
-+    babel-plugin-minify-builtins "^0.3.0"
-+    babel-plugin-minify-constant-folding "^0.3.0"
-+    babel-plugin-minify-dead-code-elimination "^0.3.0"
-+    babel-plugin-minify-flip-comparisons "^0.3.0"
-+    babel-plugin-minify-guarded-expressions "^0.3.0"
-+    babel-plugin-minify-infinity "^0.3.0"
-+    babel-plugin-minify-mangle-names "^0.3.0"
-+    babel-plugin-minify-numeric-literals "^0.3.0"
-+    babel-plugin-minify-replace "^0.3.0"
-+    babel-plugin-minify-simplify "^0.3.0"
-+    babel-plugin-minify-type-constructors "^0.3.0"
-+    babel-plugin-transform-inline-consecutive-adds "^0.3.0"
-+    babel-plugin-transform-member-expression-literals "^6.9.0"
-+    babel-plugin-transform-merge-sibling-variables "^6.9.0"
-+    babel-plugin-transform-minify-booleans "^6.9.0"
-+    babel-plugin-transform-property-literals "^6.9.0"
-+    babel-plugin-transform-regexp-constructors "^0.3.0"
-+    babel-plugin-transform-remove-console "^6.9.0"
-+    babel-plugin-transform-remove-debugger "^6.9.0"
-+    babel-plugin-transform-remove-undefined "^0.3.0"
-+    babel-plugin-transform-simplify-comparison-operators "^6.9.0"
-+    babel-plugin-transform-undefined-to-void "^6.9.0"
-     lodash.isplainobject "^4.0.6"
-
- babel-register@^6.26.0:
-@@ -892,15 +1241,6 @@
-     lodash "^4.17.4"
-     to-fast-properties "^1.0.3"
-
--babel-webpack-plugin@^0.1.1:
--  version "0.1.1"
--  resolved "https://registry.yarnpkg.com/babel-webpack-plugin/-/babel-webpack-plugin-0.1.1.tgz#ab9f3c427d1574456caa33024f1bdb7b2848460c"
--  dependencies:
--    babel-core "^6.22.1"
--    source-map "^0.5.6"
--    webpack "^2.2.0"
--    webpack-sources "^0.1.4"
--
- babylon@^6.18.0:
-   version "6.18.0"
-   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
-@@ -939,6 +1279,14 @@
-   dependencies:
-     tweetnacl "^0.14.3"
-
-+bfj-node4@^5.2.0:
-+  version "5.3.1"
-+  resolved "https://registry.yarnpkg.com/bfj-node4/-/bfj-node4-5.3.1.tgz#e23d8b27057f1d0214fc561142ad9db998f26830"
-+  dependencies:
-+    bluebird "^3.5.1"
-+    check-types "^7.3.0"
-+    tryer "^1.0.0"
-+
- big.js@^3.1.3:
-   version "3.2.0"
-   resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
-@@ -972,7 +1320,7 @@
-   dependencies:
-     bluebird "^3.5.1"
-
--bluebird@^3.0.6, bluebird@^3.1.1, bluebird@^3.3.4, bluebird@^3.4.7, bluebird@^3.5.0, bluebird@^3.5.1:
-+bluebird@^3.0.6, bluebird@^3.1.1, bluebird@^3.3.4, bluebird@^3.5.0, bluebird@^3.5.1:
-   version "3.5.1"
-   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
-
-@@ -1036,14 +1384,6 @@
-     balanced-match "^1.0.0"
-     concat-map "0.0.1"
-
--braces@^1.8.2:
--  version "1.8.5"
--  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
--  dependencies:
--    expand-range "^1.8.1"
--    preserve "^0.2.0"
--    repeat-element "^1.1.2"
--
- braces@^2.3.0:
-   version "2.3.0"
-   resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.0.tgz#a46941cb5fb492156b3d6a656e06c35364e3e66e"
-@@ -1060,6 +1400,21 @@
-     split-string "^3.0.2"
-     to-regex "^3.0.1"
-
-+braces@^2.3.1:
-+  version "2.3.2"
-+  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
-+  dependencies:
-+    arr-flatten "^1.1.0"
-+    array-unique "^0.3.2"
-+    extend-shallow "^2.0.1"
-+    fill-range "^4.0.0"
-+    isobject "^3.0.1"
-+    repeat-element "^1.1.2"
-+    snapdragon "^0.8.1"
-+    snapdragon-node "^2.0.1"
-+    split-string "^3.0.2"
-+    to-regex "^3.0.1"
-+
- brorand@^1.0.1:
-   version "1.1.0"
-   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
-@@ -1131,6 +1486,10 @@
-   version "0.2.13"
-   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
-
-+buffer-from@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.0.0.tgz#4cb8832d23612589b0406e9e2956c17f06fdf531"
-+
- buffer-xor@^1.0.3:
-   version "1.0.3"
-   resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
-@@ -1147,7 +1506,7 @@
-   version "0.1.1"
-   resolved "https://registry.yarnpkg.com/buffers/-/buffers-0.1.1.tgz#b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb"
-
--builder-util-runtime@4.0.5, builder-util-runtime@^4.0.5:
-+builder-util-runtime@4.0.5:
-   version "4.0.5"
-   resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-4.0.5.tgz#5340cf9886b9283ea6e5b20dc09b5e3e461aef62"
-   dependencies:
-@@ -1156,7 +1515,16 @@
-     fs-extra-p "^4.5.0"
-     sax "^1.2.4"
-
--builder-util@5.6.0, builder-util@^5.6.0:
-+builder-util-runtime@^4.0.5, builder-util-runtime@^4.2.0:
-+  version "4.2.0"
-+  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-4.2.0.tgz#c56aa18d34390143da031c418c9d3a055fbd3522"
-+  dependencies:
-+    bluebird-lst "^1.0.5"
-+    debug "^3.1.0"
-+    fs-extra-p "^4.5.2"
-+    sax "^1.2.4"
-+
-+builder-util@5.6.0:
-   version "5.6.0"
-   resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-5.6.0.tgz#c37c5207cd818531bda819ac836b6d51dfbccd4a"
-   dependencies:
-@@ -1175,6 +1543,44 @@
-     stat-mode "^0.2.2"
-     temp-file "^3.1.1"
-
-+builder-util@5.6.1:
-+  version "5.6.1"
-+  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-5.6.1.tgz#ab90845cb8949ea4ac81da0ce87b8ec3424cdbf9"
-+  dependencies:
-+    "7zip-bin" "~3.1.0"
-+    app-builder-bin "1.6.0"
-+    bluebird-lst "^1.0.5"
-+    builder-util-runtime "^4.0.5"
-+    chalk "^2.3.2"
-+    debug "^3.1.0"
-+    fs-extra-p "^4.5.2"
-+    is-ci "^1.1.0"
-+    js-yaml "^3.10.0"
-+    lazy-val "^1.0.3"
-+    semver "^5.5.0"
-+    source-map-support "^0.5.3"
-+    stat-mode "^0.2.2"
-+    temp-file "^3.1.1"
-+
-+builder-util@^5.6.0:
-+  version "5.7.5"
-+  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-5.7.5.tgz#58f8d2b7a35445c5fb45bff50b39bbed554c9863"
-+  dependencies:
-+    "7zip-bin" "~3.1.0"
-+    app-builder-bin "1.8.4"
-+    bluebird-lst "^1.0.5"
-+    builder-util-runtime "^4.2.0"
-+    chalk "^2.3.2"
-+    debug "^3.1.0"
-+    fs-extra-p "^4.5.2"
-+    is-ci "^1.1.0"
-+    js-yaml "^3.11.0"
-+    lazy-val "^1.0.3"
-+    semver "^5.5.0"
-+    source-map-support "^0.5.4"
-+    stat-mode "^0.2.2"
-+    temp-file "^3.1.1"
-+
- builtin-modules@^1.0.0, builtin-modules@^1.1.1:
-   version "1.1.1"
-   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
-@@ -1187,6 +1593,24 @@
-   version "3.0.0"
-   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
-
-+cacache@^10.0.4:
-+  version "10.0.4"
-+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460"
-+  dependencies:
-+    bluebird "^3.5.1"
-+    chownr "^1.0.1"
-+    glob "^7.1.2"
-+    graceful-fs "^4.1.11"
-+    lru-cache "^4.1.1"
-+    mississippi "^2.0.0"
-+    mkdirp "^0.5.1"
-+    move-concurrently "^1.0.1"
-+    promise-inflight "^1.0.1"
-+    rimraf "^2.6.2"
-+    ssri "^5.2.4"
-+    unique-filename "^1.1.0"
-+    y18n "^4.0.0"
-+
- cache-base@^1.0.1:
-   version "1.0.1"
-   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
-@@ -1225,10 +1649,6 @@
-     camelcase "^2.0.0"
-     map-obj "^1.0.0"
-
--camelcase@^1.0.2:
--  version "1.2.1"
--  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
--
- camelcase@^2.0.0:
-   version "2.1.1"
-   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
-@@ -1266,13 +1686,6 @@
-   version "0.12.0"
-   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-
--center-align@^0.1.1:
--  version "0.1.3"
--  resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
--  dependencies:
--    align-text "^0.1.3"
--    lazy-cache "^1.0.3"
--
- chai-as-promised@^7.1.1:
-   version "7.1.1"
-   resolved "https://registry.yarnpkg.com/chai-as-promised/-/chai-as-promised-7.1.1.tgz#08645d825deb8696ee61725dbf590c012eb00ca0"
-@@ -1320,24 +1733,55 @@
-     escape-string-regexp "^1.0.5"
-     supports-color "^4.0.0"
-
-+chalk@^2.3.1:
-+  version "2.4.1"
-+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
-+  dependencies:
-+    ansi-styles "^3.2.1"
-+    escape-string-regexp "^1.0.5"
-+    supports-color "^5.3.0"
-+
-+chalk@^2.3.2:
-+  version "2.3.2"
-+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65"
-+  dependencies:
-+    ansi-styles "^3.2.1"
-+    escape-string-regexp "^1.0.5"
-+    supports-color "^5.3.0"
-+
- check-error@^1.0.1, check-error@^1.0.2:
-   version "1.0.2"
-   resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
-
--chokidar@^1.7.0:
--  version "1.7.0"
--  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
-+check-types@^7.3.0:
-+  version "7.3.0"
-+  resolved "https://registry.yarnpkg.com/check-types/-/check-types-7.3.0.tgz#468f571a4435c24248f5fd0cb0e8d87c3c341e7d"
-+
-+chokidar@^2.0.2:
-+  version "2.0.3"
-+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.3.tgz#dcbd4f6cbb2a55b4799ba8a840ac527e5f4b1176"
-   dependencies:
--    anymatch "^1.3.0"
-+    anymatch "^2.0.0"
-     async-each "^1.0.0"
--    glob-parent "^2.0.0"
-+    braces "^2.3.0"
-+    glob-parent "^3.1.0"
-     inherits "^2.0.1"
-     is-binary-path "^1.0.0"
--    is-glob "^2.0.0"
-+    is-glob "^4.0.0"
-+    normalize-path "^2.1.1"
-     path-is-absolute "^1.0.0"
-     readdirp "^2.0.0"
-+    upath "^1.0.0"
-   optionalDependencies:
--    fsevents "^1.0.0"
-+    fsevents "^1.1.2"
-+
-+chownr@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
-+
-+chrome-trace-event@^0.1.1:
-+  version "0.1.3"
-+  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-0.1.3.tgz#d395af2d31c87b90a716c831fe326f69768ec084"
-
- chromium-pickle-js@^0.1.0:
-   version "0.1.0"
-@@ -1384,9 +1828,9 @@
-   dependencies:
-     source-map "0.5.x"
-
--clean-webpack-plugin@^0.1.16:
--  version "0.1.17"
--  resolved "https://registry.yarnpkg.com/clean-webpack-plugin/-/clean-webpack-plugin-0.1.17.tgz#71c57242e6d47204d46f809413176e7bed28ec49"
-+clean-webpack-plugin@^0.1.19:
-+  version "0.1.19"
-+  resolved "https://registry.yarnpkg.com/clean-webpack-plugin/-/clean-webpack-plugin-0.1.19.tgz#ceda8bb96b00fe168e9b080272960d20fdcadd6d"
-   dependencies:
-     rimraf "^2.6.1"
-
-@@ -1411,14 +1855,6 @@
-     exit "0.1.2"
-     glob "^7.1.1"
-
--cliui@^2.1.0:
--  version "2.1.0"
--  resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
--  dependencies:
--    center-align "^0.1.1"
--    right-align "^0.1.1"
--    wordwrap "0.0.2"
--
- cliui@^3.2.0:
-   version "3.2.0"
-   resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
-@@ -1435,14 +1871,14 @@
-     strip-ansi "^4.0.0"
-     wrap-ansi "^2.0.0"
-
--clone-deep@^0.3.0:
--  version "0.3.0"
--  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-0.3.0.tgz#348c61ae9cdbe0edfe053d91ff4cc521d790ede8"
-+clone-deep@^2.0.1:
-+  version "2.0.2"
-+  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-2.0.2.tgz#00db3a1e173656730d1188c3d6aced6d7ea97713"
-   dependencies:
-     for-own "^1.0.0"
--    is-plain-object "^2.0.1"
--    kind-of "^3.2.2"
--    shallow-clone "^0.1.2"
-+    is-plain-object "^2.0.4"
-+    kind-of "^6.0.0"
-+    shallow-clone "^1.0.0"
-
- clone@^1.0.2:
-   version "1.0.2"
-@@ -1505,7 +1941,7 @@
-     css-color-names "0.0.4"
-     has "^1.0.1"
-
--colors@^1.1.2, colors@~1.1.2:
-+colors@~1.1.2:
-   version "1.1.2"
-   resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
-
-@@ -1519,10 +1955,18 @@
-   version "2.11.0"
-   resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
-
--commander@^2.12.1, commander@^2.14.1:
-+commander@^2.12.1, commander@^2.13.0, commander@^2.14.1:
-   version "2.15.1"
-   resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
-
-+commander@~2.13.0:
-+  version "2.13.0"
-+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
-+
-+commondir@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
-+
- compare-version@^0.1.2:
-   version "0.1.2"
-   resolved "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz#0162ec2d9351f5ddd59a9202cba935366a725080"
-@@ -1552,6 +1996,15 @@
-     readable-stream "^2.2.2"
-     typedarray "^0.0.6"
-
-+concat-stream@^1.5.0:
-+  version "1.6.2"
-+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
-+  dependencies:
-+    buffer-from "^1.0.0"
-+    inherits "^2.0.3"
-+    readable-stream "^2.2.2"
-+    typedarray "^0.0.6"
-+
- configstore@^3.0.0:
-   version "3.1.1"
-   resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.1.tgz#094ee662ab83fad9917678de114faaea8fcdca90"
-@@ -1589,6 +2042,10 @@
-   version "1.5.0"
-   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
-
-+convert-source-map@^1.5.1:
-+  version "1.5.1"
-+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
-+
- cookie-signature@1.0.6:
-   version "1.0.6"
-   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
-@@ -1597,6 +2054,17 @@
-   version "0.3.1"
-   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
-
-+copy-concurrently@^1.0.0:
-+  version "1.0.5"
-+  resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
-+  dependencies:
-+    aproba "^1.1.1"
-+    fs-write-stream-atomic "^1.0.8"
-+    iferr "^0.1.5"
-+    mkdirp "^0.5.1"
-+    rimraf "^2.5.4"
-+    run-queue "^1.0.0"
-+
- copy-descriptor@^0.1.0:
-   version "0.1.1"
-   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
-@@ -1718,22 +2186,22 @@
-   version "0.0.4"
-   resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
-
--css-loader@^0.28.5:
--  version "0.28.7"
--  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.7.tgz#5f2ee989dd32edd907717f953317656160999c1b"
-+css-loader@^0.28.11:
-+  version "0.28.11"
-+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.11.tgz#c3f9864a700be2711bb5a2462b2389b1a392dab7"
-   dependencies:
--    babel-code-frame "^6.11.0"
-+    babel-code-frame "^6.26.0"
-     css-selector-tokenizer "^0.7.0"
--    cssnano ">=2.6.1 <4"
-+    cssnano "^3.10.0"
-     icss-utils "^2.1.0"
-     loader-utils "^1.0.2"
-     lodash.camelcase "^4.3.0"
--    object-assign "^4.0.1"
-+    object-assign "^4.1.1"
-     postcss "^5.0.6"
--    postcss-modules-extract-imports "^1.0.0"
--    postcss-modules-local-by-default "^1.0.1"
--    postcss-modules-scope "^1.0.0"
--    postcss-modules-values "^1.1.0"
-+    postcss-modules-extract-imports "^1.2.0"
-+    postcss-modules-local-by-default "^1.2.0"
-+    postcss-modules-scope "^1.1.0"
-+    postcss-modules-values "^1.3.0"
-     postcss-value-parser "^3.3.0"
-     source-list-map "^2.0.0"
-
-@@ -1781,7 +2249,7 @@
-   version "0.1.0"
-   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
-
--"cssnano@>=2.6.1 <4":
-+cssnano@^3.10.0:
-   version "3.10.0"
-   resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38"
-   dependencies:
-@@ -1825,6 +2293,10 @@
-     clap "^1.0.9"
-     source-map "^0.5.3"
-
-+csstype@^2.2.0:
-+  version "2.3.0"
-+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.3.0.tgz#062e141c78345cf814da0e0b716ad777931b08af"
-+
- cuint@^0.2.1:
-   version "0.2.2"
-   resolved "https://registry.yarnpkg.com/cuint/-/cuint-0.2.2.tgz#408086d409550c2631155619e9fa7bcadc3b991b"
-@@ -1835,11 +2307,9 @@
-   dependencies:
-     array-find-index "^1.0.1"
-
--d@1:
--  version "1.0.0"
--  resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
--  dependencies:
--    es5-ext "^0.10.9"
-+cyclist@~0.2.2:
-+  version "0.2.2"
-+  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
-
- dashdash@^1.12.0:
-   version "1.14.1"
-@@ -1851,7 +2321,7 @@
-   version "0.1.4"
-   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
-
--debug@2.6.9, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8:
-+debug@2.6.9, debug@^2.1.2, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
-   version "2.6.9"
-   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-   dependencies:
-@@ -1867,7 +2337,7 @@
-   version "1.0.1"
-   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
-
--decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
-+decamelize@^1.1.1, decamelize@^1.1.2:
-   version "1.2.0"
-   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-
-@@ -1924,6 +2394,13 @@
-   dependencies:
-     is-descriptor "^1.0.0"
-
-+define-property@^2.0.2:
-+  version "2.0.2"
-+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
-+  dependencies:
-+    is-descriptor "^1.0.2"
-+    isobject "^3.0.1"
-+
- defined@^1.0.0:
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
-@@ -1952,6 +2429,10 @@
-   version "1.1.1"
-   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359"
-
-+depd@~1.1.2:
-+  version "1.1.2"
-+  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
-+
- des.js@^1.0.0:
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
-@@ -1969,6 +2450,10 @@
-   dependencies:
-     repeating "^2.0.0"
-
-+detect-libc@^1.0.2:
-+  version "1.0.3"
-+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
-+
- dev-null@^0.1.1:
-   version "0.1.1"
-   resolved "https://registry.yarnpkg.com/dev-null/-/dev-null-0.1.1.tgz#5a205ce3c2b2ef77b6238d6ba179eb74c6a0e818"
-@@ -2009,7 +2494,13 @@
-     parse-color "^1.0.0"
-     sanitize-filename "^1.6.1"
-
--doctrine@^2.0.2, doctrine@^2.1.0:
-+doctrine@^2.0.2:
-+  version "2.0.2"
-+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.2.tgz#68f96ce8efc56cc42651f1faadb4f175273b0075"
-+  dependencies:
-+    esutils "^2.0.2"
-+
-+doctrine@^2.1.0:
-   version "2.1.0"
-   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
-   dependencies:
-@@ -2083,6 +2574,19 @@
-   version "0.1.4"
-   resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
-
-+duplexer@^0.1.1:
-+  version "0.1.1"
-+  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
-+
-+duplexify@^3.4.2, duplexify@^3.5.3:
-+  version "3.5.4"
-+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.4.tgz#4bb46c1796eabebeec4ca9a2e66b808cb7a3d8b4"
-+  dependencies:
-+    end-of-stream "^1.0.0"
-+    inherits "^2.0.1"
-+    readable-stream "^2.0.0"
-+    stream-shift "^1.0.0"
-+
- easy-stack@^1.0.0:
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/easy-stack/-/easy-stack-1.0.0.tgz#12c91b3085a37f0baa336e9486eac4bf94e3e788"
-@@ -2101,7 +2605,7 @@
-   version "2.5.7"
-   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.7.tgz#cc872c168880ae3c7189762fd5ffc00896c9518a"
-
--electron-builder-lib@20.2.0, electron-builder-lib@~20.2.0:
-+electron-builder-lib@20.2.0:
-   version "20.2.0"
-   resolved "https://registry.yarnpkg.com/electron-builder-lib/-/electron-builder-lib-20.2.0.tgz#e8dba288cf26858803eb1800da870d7312837bfa"
-   dependencies:
-@@ -2130,6 +2634,35 @@
-     semver "^5.5.0"
-     temp-file "^3.1.1"
-
-+electron-builder-lib@~20.2.0:
-+  version "20.2.1"
-+  resolved "https://registry.yarnpkg.com/electron-builder-lib/-/electron-builder-lib-20.2.1.tgz#ff8dc6ac7f6f3c676fc370ddafb2aba464a17672"
-+  dependencies:
-+    "7zip-bin" "~3.1.0"
-+    app-builder-bin "1.6.0"
-+    async-exit-hook "^2.0.1"
-+    bluebird-lst "^1.0.5"
-+    builder-util "5.6.1"
-+    builder-util-runtime "4.0.5"
-+    chromium-pickle-js "^0.2.0"
-+    debug "^3.1.0"
-+    ejs "^2.5.7"
-+    electron-osx-sign "0.4.8"
-+    electron-publish "20.2.0"
-+    fs-extra-p "^4.5.2"
-+    hosted-git-info "^2.5.0"
-+    is-ci "^1.1.0"
-+    isbinaryfile "^3.0.2"
-+    js-yaml "^3.10.0"
-+    lazy-val "^1.0.3"
-+    minimatch "^3.0.4"
-+    normalize-package-data "^2.4.0"
-+    plist "^2.1.0"
-+    read-config-file "3.0.0"
-+    sanitize-filename "^1.6.1"
-+    semver "^5.5.0"
-+    temp-file "^3.1.1"
-+
- electron-builder@20.2.0:
-   version "20.2.0"
-   resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.2.0.tgz#aaeaa439cb96c9a3d7ffda25b28130327c982982"
-@@ -2231,8 +2764,8 @@
-     plist "^2.1.0"
-
- electron-packager@^11.0.0:
--  version "11.0.0"
--  resolved "https://registry.yarnpkg.com/electron-packager/-/electron-packager-11.0.0.tgz#3150e0efb831b41df40b28186d9baa64bbb2cc52"
-+  version "11.2.0"
-+  resolved "https://registry.yarnpkg.com/electron-packager/-/electron-packager-11.2.0.tgz#facc17d2b92c10da1bfa1d7c5f58f13774571839"
-   dependencies:
-     asar "^0.14.0"
-     debug "^3.0.0"
-@@ -2247,11 +2780,11 @@
-     pify "^3.0.0"
-     plist "^2.0.0"
-     pruner "^0.0.7"
--    rcedit "^0.9.0"
-+    rcedit "^1.0.0"
-     resolve "^1.1.6"
-     sanitize-filename "^1.6.0"
-     semver "^5.3.0"
--    yargs-parser "^8.0.0"
-+    yargs-parser "^9.0.2"
-
- electron-publish@20.2.0:
-   version "20.2.0"
-@@ -2286,9 +2819,9 @@
-     lodash.template "^4.2.2"
-     temp "^0.8.3"
-
--electron@1.8.3:
--  version "1.8.3"
--  resolved "https://registry.yarnpkg.com/electron/-/electron-1.8.3.tgz#001416ea3a25ce594e317cb5531bc41eadd22f7f"
-+electron@1.8.7:
-+  version "1.8.7"
-+  resolved "https://registry.yarnpkg.com/electron/-/electron-1.8.7.tgz#373c1dc4589d7ab4acd49aff8db4a1c0a6c3bcc1"
-   dependencies:
-     "@types/node" "^8.0.24"
-     electron-download "^3.0.1"
-@@ -2314,6 +2847,10 @@
-   version "1.0.1"
-   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.1.tgz#79e3d58655346909fe6f0f45a5de68103b294d20"
-
-+encodeurl@~1.0.2:
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
-+
- encoding@^0.1.11:
-   version "0.1.12"
-   resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
-@@ -2326,23 +2863,19 @@
-   dependencies:
-     once "^1.4.0"
-
--enhanced-resolve@3.3.0:
--  version "3.3.0"
--  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.3.0.tgz#950964ecc7f0332a42321b673b38dc8ff15535b3"
-+end-of-stream@^1.1.0:
-+  version "1.4.1"
-+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
-   dependencies:
--    graceful-fs "^4.1.2"
--    memory-fs "^0.4.0"
--    object-assign "^4.0.1"
--    tapable "^0.2.5"
-+    once "^1.4.0"
-
--enhanced-resolve@^3.3.0, enhanced-resolve@^3.4.0:
--  version "3.4.1"
--  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz#0421e339fd71419b3da13d129b3979040230476e"
-+enhanced-resolve@^4.0.0:
-+  version "4.0.0"
-+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.0.0.tgz#e34a6eaa790f62fccd71d93959f56b2b432db10a"
-   dependencies:
-     graceful-fs "^4.1.2"
-     memory-fs "^0.4.0"
--    object-assign "^4.0.1"
--    tapable "^0.2.7"
-+    tapable "^1.0.0"
-
- entities@1.0:
-   version "1.0.0"
-@@ -2362,6 +2895,12 @@
-   dependencies:
-     prr "~0.0.0"
-
-+errno@~0.1.7:
-+  version "0.1.7"
-+  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
-+  dependencies:
-+    prr "~1.0.1"
-+
- error-ex@^1.2.0:
-   version "1.3.1"
-   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
-@@ -2386,62 +2925,10 @@
-     is-date-object "^1.0.1"
-     is-symbol "^1.0.1"
-
--es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
--  version "0.10.35"
--  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.35.tgz#18ee858ce6a3c45c7d79e91c15fcca9ec568494f"
--  dependencies:
--    es6-iterator "~2.0.1"
--    es6-symbol "~3.1.1"
--
--es6-iterator@^2.0.1, es6-iterator@~2.0.1:
--  version "2.0.3"
--  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
--  dependencies:
--    d "1"
--    es5-ext "^0.10.35"
--    es6-symbol "^3.1.1"
--
--es6-map@^0.1.3:
--  version "0.1.5"
--  resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0"
--  dependencies:
--    d "1"
--    es5-ext "~0.10.14"
--    es6-iterator "~2.0.1"
--    es6-set "~0.1.5"
--    es6-symbol "~3.1.1"
--    event-emitter "~0.3.5"
--
- es6-promise@^4.0.5:
-   version "4.1.1"
-   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.1.1.tgz#8811e90915d9a0dba36274f0b242dbda78f9c92a"
-
--es6-set@~0.1.5:
--  version "0.1.5"
--  resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
--  dependencies:
--    d "1"
--    es5-ext "~0.10.14"
--    es6-iterator "~2.0.1"
--    es6-symbol "3.1.1"
--    event-emitter "~0.3.5"
--
--es6-symbol@3.1.1, es6-symbol@^3.1.1, es6-symbol@~3.1.1:
--  version "3.1.1"
--  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
--  dependencies:
--    d "1"
--    es5-ext "~0.10.14"
--
--es6-weak-map@^2.0.1:
--  version "2.0.2"
--  resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"
--  dependencies:
--    d "1"
--    es5-ext "^0.10.14"
--    es6-iterator "^2.0.1"
--    es6-symbol "^3.1.1"
--
- escape-html@~1.0.3:
-   version "1.0.3"
-   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
-@@ -2450,15 +2937,6 @@
-   version "1.0.5"
-   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-
--escope@^3.6.0:
--  version "3.6.0"
--  resolved "https://registry.yarnpkg.com/escope/-/escope-3.6.0.tgz#e01975e812781a163a6dadfdd80398dc64c889c3"
--  dependencies:
--    es6-map "^0.1.3"
--    es6-weak-map "^2.0.1"
--    esrecurse "^4.1.0"
--    estraverse "^4.1.1"
--
- eslint-config-prettier@^2.9.0:
-   version "2.9.0"
-   resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-2.9.0.tgz#5ecd65174d486c22dff389fe036febf502d468a3"
-@@ -2491,9 +2969,9 @@
-     jsx-ast-utils "^2.0.1"
-     prop-types "^15.6.0"
-
--eslint-plugin-typescript@^0.10.0:
--  version "0.10.0"
--  resolved "https://registry.yarnpkg.com/eslint-plugin-typescript/-/eslint-plugin-typescript-0.10.0.tgz#009a8fcaf0ec7bf68f6fb71576df0d84ebd0b114"
-+eslint-plugin-typescript@^0.12.0:
-+  version "0.12.0"
-+  resolved "https://registry.yarnpkg.com/eslint-plugin-typescript/-/eslint-plugin-typescript-0.12.0.tgz#e23d58cb27fe28e89fc641a1f20e8d862cb99aef"
-   dependencies:
-     requireindex "~1.1.0"
-
-@@ -2591,13 +3069,6 @@
-   version "1.8.1"
-   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
-
--event-emitter@~0.3.5:
--  version "0.3.5"
--  resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
--  dependencies:
--    d "1"
--    es5-ext "~0.10.14"
--
- event-pubsub@4.3.0:
-   version "4.3.0"
-   resolved "https://registry.yarnpkg.com/event-pubsub/-/event-pubsub-4.3.0.tgz#f68d816bc29f1ec02c539dc58c8dd40ce72cb36e"
-@@ -2629,12 +3100,6 @@
-   version "0.1.2"
-   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
-
--expand-brackets@^0.1.4:
--  version "0.1.5"
--  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
--  dependencies:
--    is-posix-bracket "^0.1.0"
--
- expand-brackets@^2.1.4:
-   version "2.1.4"
-   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
-@@ -2647,17 +3112,46 @@
-     snapdragon "^0.8.1"
-     to-regex "^3.0.1"
-
--expand-range@^1.8.1:
--  version "1.8.2"
--  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
-+express@^4.15.0:
-+  version "4.16.2"
-+  resolved "https://registry.yarnpkg.com/express/-/express-4.16.2.tgz#e35c6dfe2d64b7dca0a5cd4f21781be3299e076c"
-   dependencies:
--    fill-range "^2.1.0"
-+    accepts "~1.3.4"
-+    array-flatten "1.1.1"
-+    body-parser "1.18.2"
-+    content-disposition "0.5.2"
-+    content-type "~1.0.4"
-+    cookie "0.3.1"
-+    cookie-signature "1.0.6"
-+    debug "2.6.9"
-+    depd "~1.1.1"
-+    encodeurl "~1.0.1"
-+    escape-html "~1.0.3"
-+    etag "~1.8.1"
-+    finalhandler "1.1.0"
-+    fresh "0.5.2"
-+    merge-descriptors "1.0.1"
-+    methods "~1.1.2"
-+    on-finished "~2.3.0"
-+    parseurl "~1.3.2"
-+    path-to-regexp "0.1.7"
-+    proxy-addr "~2.0.2"
-+    qs "6.5.1"
-+    range-parser "~1.2.0"
-+    safe-buffer "5.1.1"
-+    send "0.16.1"
-+    serve-static "1.13.1"
-+    setprototypeof "1.1.0"
-+    statuses "~1.3.1"
-+    type-is "~1.6.15"
-+    utils-merge "1.0.1"
-+    vary "~1.1.2"
-
--express@^4.15.0:
--  version "4.16.2"
--  resolved "https://registry.yarnpkg.com/express/-/express-4.16.2.tgz#e35c6dfe2d64b7dca0a5cd4f21781be3299e076c"
-+express@^4.16.2:
-+  version "4.16.3"
-+  resolved "https://registry.yarnpkg.com/express/-/express-4.16.3.tgz#6af8a502350db3246ecc4becf6b5a34d22f7ed53"
-   dependencies:
--    accepts "~1.3.4"
-+    accepts "~1.3.5"
-     array-flatten "1.1.1"
-     body-parser "1.18.2"
-     content-disposition "0.5.2"
-@@ -2665,26 +3159,26 @@
-     cookie "0.3.1"
-     cookie-signature "1.0.6"
-     debug "2.6.9"
--    depd "~1.1.1"
--    encodeurl "~1.0.1"
-+    depd "~1.1.2"
-+    encodeurl "~1.0.2"
-     escape-html "~1.0.3"
-     etag "~1.8.1"
--    finalhandler "1.1.0"
-+    finalhandler "1.1.1"
-     fresh "0.5.2"
-     merge-descriptors "1.0.1"
-     methods "~1.1.2"
-     on-finished "~2.3.0"
-     parseurl "~1.3.2"
-     path-to-regexp "0.1.7"
--    proxy-addr "~2.0.2"
-+    proxy-addr "~2.0.3"
-     qs "6.5.1"
-     range-parser "~1.2.0"
-     safe-buffer "5.1.1"
--    send "0.16.1"
--    serve-static "1.13.1"
-+    send "0.16.2"
-+    serve-static "1.13.2"
-     setprototypeof "1.1.0"
--    statuses "~1.3.1"
--    type-is "~1.6.15"
-+    statuses "~1.4.0"
-+    type-is "~1.6.16"
-     utils-merge "1.0.1"
-     vary "~1.1.2"
-
-@@ -2694,6 +3188,13 @@
-   dependencies:
-     is-extendable "^0.1.0"
-
-+extend-shallow@^3.0.2:
-+  version "3.0.2"
-+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
-+  dependencies:
-+    assign-symbols "^1.0.0"
-+    is-extendable "^1.0.1"
-+
- extend@~3.0.0, extend@~3.0.1:
-   version "3.0.1"
-   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
-@@ -2706,15 +3207,9 @@
-     jschardet "^1.4.2"
-     tmp "^0.0.33"
-
--extglob@^0.3.1:
--  version "0.3.2"
--  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
--  dependencies:
--    is-extglob "^1.0.0"
--
--extglob@^2.0.2:
--  version "2.0.2"
--  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.2.tgz#3290f46208db1b2e8eb8be0c94ed9e6ad80edbe2"
-+extglob@^2.0.4:
-+  version "2.0.4"
-+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
-   dependencies:
-     array-unique "^0.3.2"
-     define-property "^1.0.0"
-@@ -2725,15 +3220,6 @@
-     snapdragon "^0.8.1"
-     to-regex "^3.0.1"
-
--extract-text-webpack-plugin@^3.0.0:
--  version "3.0.2"
--  resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.2.tgz#5f043eaa02f9750a9258b78c0a6e0dc1408fb2f7"
--  dependencies:
--    async "^2.4.1"
--    loader-utils "^1.1.0"
--    schema-utils "^0.3.0"
--    webpack-sources "^1.0.1"
--
- extract-zip@^1.0.3, extract-zip@^1.6.5:
-   version "1.6.6"
-   resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.6.tgz#1290ede8d20d0872b429fd3f351ca128ec5ef85c"
-@@ -2751,6 +3237,10 @@
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff"
-
-+fast-deep-equal@^2.0.1:
-+  version "2.0.1"
-+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
-+
- fast-diff@^1.1.1:
-   version "1.1.2"
-   resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.1.2.tgz#4b62c42b8e03de3f848460b639079920695d0154"
-@@ -2798,19 +3288,9 @@
-     flat-cache "^1.2.1"
-     object-assign "^4.0.1"
-
--filename-regex@^2.0.0:
--  version "2.0.1"
--  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
--
--fill-range@^2.1.0:
--  version "2.2.3"
--  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
--  dependencies:
--    is-number "^2.1.0"
--    isobject "^2.0.0"
--    randomatic "^1.1.3"
--    repeat-element "^1.1.2"
--    repeat-string "^1.5.2"
-+filesize@^3.5.11:
-+  version "3.6.1"
-+  resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317"
-
- fill-range@^4.0.0:
-   version "4.0.0"
-@@ -2833,6 +3313,26 @@
-     statuses "~1.3.1"
-     unpipe "~1.0.0"
-
-+finalhandler@1.1.1:
-+  version "1.1.1"
-+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
-+  dependencies:
-+    debug "2.6.9"
-+    encodeurl "~1.0.2"
-+    escape-html "~1.0.3"
-+    on-finished "~2.3.0"
-+    parseurl "~1.3.2"
-+    statuses "~1.4.0"
-+    unpipe "~1.0.0"
-+
-+find-cache-dir@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
-+  dependencies:
-+    commondir "^1.0.1"
-+    make-dir "^1.0.0"
-+    pkg-dir "^2.0.0"
-+
- find-up@^1.0.0:
-   version "1.1.2"
-   resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
-@@ -2859,6 +3359,13 @@
-   version "1.0.2"
-   resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
-
-+flush-write-stream@^1.0.0:
-+  version "1.0.3"
-+  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.3.tgz#c5d586ef38af6097650b49bc41b55fabb19f35bd"
-+  dependencies:
-+    inherits "^2.0.1"
-+    readable-stream "^2.0.4"
-+
- for-in@^0.1.3:
-   version "0.1.8"
-   resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"
-@@ -2867,12 +3374,6 @@
-   version "1.0.2"
-   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-
--for-own@^0.1.4:
--  version "0.1.5"
--  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
--  dependencies:
--    for-in "^1.0.1"
--
- for-own@^1.0.0:
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
-@@ -2917,6 +3418,19 @@
-   version "0.5.2"
-   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
-
-+from2@^2.1.0:
-+  version "2.3.0"
-+  resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
-+  dependencies:
-+    inherits "^2.0.1"
-+    readable-stream "^2.0.0"
-+
-+front-matter@^2.3.0:
-+  version "2.3.0"
-+  resolved "https://registry.yarnpkg.com/front-matter/-/front-matter-2.3.0.tgz#7203af896ce357ee04e2aa45169ea91ed7f67504"
-+  dependencies:
-+    js-yaml "^3.10.0"
-+
- fs-extra-p@^4.5.0:
-   version "4.5.0"
-   resolved "https://registry.yarnpkg.com/fs-extra-p/-/fs-extra-p-4.5.0.tgz#b79f3f3fcc0b5e57b7e7caeb06159f958ef15fe8"
-@@ -2951,7 +3465,7 @@
-     path-is-absolute "^1.0.0"
-     rimraf "^2.2.8"
-
--fs-extra@^2.0.0, fs-extra@^2.1.2:
-+fs-extra@^2.0.0:
-   version "2.1.2"
-   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-2.1.2.tgz#046c70163cef9aad46b0e4a7fa467fb22d71de35"
-   dependencies:
-@@ -2982,30 +3496,41 @@
-     jsonfile "^4.0.0"
-     universalify "^0.1.0"
-
--fs-readdir-recursive@^1.0.0:
--  version "1.0.0"
--  resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.0.0.tgz#8cd1745c8b4f8a29c8caec392476921ba195f560"
-+fs-extra@^6.0.0:
-+  version "6.0.0"
-+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-6.0.0.tgz#0f0afb290bb3deb87978da816fcd3c7797f3a817"
-+  dependencies:
-+    graceful-fs "^4.1.2"
-+    jsonfile "^4.0.0"
-+    universalify "^0.1.0"
-+
-+fs-minipass@^1.2.5:
-+  version "1.2.5"
-+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
-+  dependencies:
-+    minipass "^2.2.1"
-+
-+fs-write-stream-atomic@^1.0.8:
-+  version "1.0.10"
-+  resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
-+  dependencies:
-+    graceful-fs "^4.1.2"
-+    iferr "^0.1.5"
-+    imurmurhash "^0.1.4"
-+    readable-stream "1 || 2"
-
- fs.realpath@^1.0.0:
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-
--fsevents@^1.0.0:
--  version "1.1.2"
--  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.2.tgz#3282b713fb3ad80ede0e9fcf4611b5aa6fc033f4"
--  dependencies:
--    nan "^2.3.0"
--    node-pre-gyp "^0.6.36"
--
--fstream-ignore@^1.0.5:
--  version "1.0.5"
--  resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105"
-+fsevents@^1.1.2:
-+  version "1.2.3"
-+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.3.tgz#08292982e7059f6674c93d8b829c1e8604979ac0"
-   dependencies:
--    fstream "^1.0.0"
--    inherits "2"
--    minimatch "^3.0.0"
-+    nan "^2.9.2"
-+    node-pre-gyp "^0.9.0"
-
--fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2:
-+fstream@^1.0.0, fstream@^1.0.2:
-   version "1.0.11"
-   resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
-   dependencies:
-@@ -3098,18 +3623,12 @@
-   version "1.0.2"
-   resolved "https://registry.yarnpkg.com/github-url-from-username-repo/-/github-url-from-username-repo-1.0.2.tgz#7dd79330d2abe69c10c2cef79714c97215791dfa"
-
--glob-base@^0.3.0:
--  version "0.3.0"
--  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
--  dependencies:
--    glob-parent "^2.0.0"
--    is-glob "^2.0.0"
--
--glob-parent@^2.0.0:
--  version "2.0.0"
--  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
-+glob-parent@^3.1.0:
-+  version "3.1.0"
-+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
-   dependencies:
--    is-glob "^2.0.0"
-+    is-glob "^3.1.0"
-+    path-dirname "^1.0.0"
-
- glob@7.1.2, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1:
-   version "7.1.2"
-@@ -3205,6 +3724,13 @@
-   version "1.10.3"
-   resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.3.tgz#1926ba90cf3edfe2adb4927f5880bc22c66c790f"
-
-+gzip-size@^4.1.0:
-+  version "4.1.0"
-+  resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-4.1.0.tgz#8ae096257eabe7d69c45be2b67c448124ffb517c"
-+  dependencies:
-+    duplexer "^0.1.1"
-+    pify "^3.0.0"
-+
- har-schema@^1.0.5:
-   version "1.0.5"
-   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
-@@ -3250,6 +3776,10 @@
-   version "2.0.0"
-   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
-
-+has-flag@^3.0.0:
-+  version "3.0.0"
-+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-+
- has-unicode@^2.0.0:
-   version "2.0.1"
-   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-@@ -3307,7 +3837,7 @@
-     inherits "^2.0.3"
-     minimalistic-assert "^1.0.0"
-
--hawk@3.1.3, hawk@~3.1.3:
-+hawk@~3.1.3:
-   version "3.1.3"
-   resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
-   dependencies:
-@@ -3381,16 +3911,17 @@
-     relateurl "0.2.x"
-     uglify-js "3.1.x"
-
--html-webpack-plugin@^2.30.1:
--  version "2.30.1"
--  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-2.30.1.tgz#7f9c421b7ea91ec460f56527d78df484ee7537d5"
-+html-webpack-plugin@^3.2.0:
-+  version "3.2.0"
-+  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz#b01abbd723acaaa7b37b6af4492ebda03d9dd37b"
-   dependencies:
--    bluebird "^3.4.7"
-     html-minifier "^3.2.3"
-     loader-utils "^0.2.16"
-     lodash "^4.17.3"
-     pretty-error "^2.0.2"
-+    tapable "^1.0.0"
-     toposort "^1.0.0"
-+    util.promisify "1.0.0"
-
- htmlparser2@3.8.x:
-   version "3.8.3"
-@@ -3444,6 +3975,12 @@
-   version "0.4.19"
-   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
-
-+iconv-lite@^0.4.4:
-+  version "0.4.21"
-+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.21.tgz#c47f8733d02171189ebc4a400f3218d348094798"
-+  dependencies:
-+    safer-buffer "^2.1.0"
-+
- icss-replace-symbols@^1.1.0:
-   version "1.1.0"
-   resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
-@@ -3458,6 +3995,16 @@
-   version "1.1.8"
-   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
-
-+iferr@^0.1.5:
-+  version "0.1.5"
-+  resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
-+
-+ignore-walk@^3.0.1:
-+  version "3.0.1"
-+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
-+  dependencies:
-+    minimatch "^3.0.4"
-+
- ignore@^3.3.3:
-   version "3.3.7"
-   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
-@@ -3544,7 +4091,7 @@
-     strip-ansi "^3.0.0"
-     through "^2.3.6"
-
--interpret@^1.0.0, interpret@^1.0.1:
-+interpret@^1.0.1:
-   version "1.0.4"
-   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.4.tgz#820cdd588b868ffb191a809506d6c9c8f212b1b0"
-
-@@ -3562,6 +4109,10 @@
-   version "1.5.2"
-   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.5.2.tgz#d4b505bde9946987ccf0fc58d9010ff9607e3fa0"
-
-+ipaddr.js@1.6.0:
-+  version "1.6.0"
-+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.6.0.tgz#e3fa357b773da619f26e95f049d055c72796f86b"
-+
- is-absolute-url@^2.0.0:
-   version "2.1.0"
-   resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
-@@ -3572,6 +4123,12 @@
-   dependencies:
-     kind-of "^3.0.2"
-
-+is-accessor-descriptor@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
-+  dependencies:
-+    kind-of "^6.0.0"
-+
- is-arrayish@^0.2.1:
-   version "0.2.1"
-   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-@@ -3582,7 +4139,7 @@
-   dependencies:
-     binary-extensions "^1.0.0"
-
--is-buffer@^1.0.2, is-buffer@^1.1.5:
-+is-buffer@^1.1.5:
-   version "1.1.6"
-   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-
-@@ -3608,6 +4165,12 @@
-   dependencies:
-     kind-of "^3.0.2"
-
-+is-data-descriptor@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
-+  dependencies:
-+    kind-of "^6.0.0"
-+
- is-date-object@^1.0.1:
-   version "1.0.1"
-   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
-@@ -3628,27 +4191,31 @@
-     is-data-descriptor "^0.1.4"
-     kind-of "^5.0.0"
-
--is-dotfile@^1.0.0:
--  version "1.0.3"
--  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
-+is-descriptor@^1.0.2:
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
-+  dependencies:
-+    is-accessor-descriptor "^1.0.0"
-+    is-data-descriptor "^1.0.0"
-+    kind-of "^6.0.2"
-
- is-electron-renderer@^2.0.0:
-   version "2.0.1"
-   resolved "https://registry.yarnpkg.com/is-electron-renderer/-/is-electron-renderer-2.0.1.tgz#a469d056f975697c58c98c6023eb0aa79af895a2"
-
--is-equal-shallow@^0.1.3:
--  version "0.1.3"
--  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
--  dependencies:
--    is-primitive "^2.0.0"
--
- is-extendable@^0.1.0, is-extendable@^0.1.1:
-   version "0.1.1"
-   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
-
--is-extglob@^1.0.0:
--  version "1.0.0"
--  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
-+is-extendable@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
-+  dependencies:
-+    is-plain-object "^2.0.4"
-+
-+is-extglob@^2.1.0, is-extglob@^2.1.1:
-+  version "2.1.1"
-+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-
- is-finite@^1.0.0:
-   version "1.0.2"
-@@ -3666,11 +4233,17 @@
-   version "2.0.0"
-   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-
--is-glob@^2.0.0, is-glob@^2.0.1:
--  version "2.0.1"
--  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
-+is-glob@^3.1.0:
-+  version "3.1.0"
-+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
-   dependencies:
--    is-extglob "^1.0.0"
-+    is-extglob "^2.1.0"
-+
-+is-glob@^4.0.0:
-+  version "4.0.0"
-+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0"
-+  dependencies:
-+    is-extglob "^2.1.1"
-
- is-installed-globally@^0.1.0:
-   version "0.1.0"
-@@ -3692,27 +4265,25 @@
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4"
-
--is-number@^2.1.0:
--  version "2.1.0"
--  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
--  dependencies:
--    kind-of "^3.0.2"
--
- is-number@^3.0.0:
-   version "3.0.0"
-   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
-   dependencies:
-     kind-of "^3.0.2"
-
-+is-number@^4.0.0:
-+  version "4.0.0"
-+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
-+
- is-obj@^1.0.0:
-   version "1.0.1"
-   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
-
--is-odd@^1.0.0:
--  version "1.0.0"
--  resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-1.0.0.tgz#3b8a932eb028b3775c39bb09e91767accdb69088"
-+is-odd@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-2.0.0.tgz#7646624671fd7ea558ccd9a2795182f2958f1b24"
-   dependencies:
--    is-number "^3.0.0"
-+    is-number "^4.0.0"
-
- is-path-cwd@^1.0.0:
-   version "1.0.0"
-@@ -3734,20 +4305,12 @@
-   version "1.1.0"
-   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
-
--is-plain-object@^2.0.1, is-plain-object@^2.0.3:
-+is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
-   version "2.0.4"
-   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
-   dependencies:
-     isobject "^3.0.1"
-
--is-posix-bracket@^0.1.0:
--  version "0.1.1"
--  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
--
--is-primitive@^2.0.0:
--  version "2.0.0"
--  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
--
- is-promise@^2.1.0:
-   version "2.1.0"
-   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
-@@ -3806,6 +4369,10 @@
-   version "1.0.1"
-   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.1.tgz#310db70f742d259a16a369202b51af84233310d9"
-
-+is-windows@^1.0.2:
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
-+
- isarray@0.0.1:
-   version "0.0.1"
-   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-@@ -3880,7 +4447,7 @@
-     argparse "^1.0.7"
-     esprima "^4.0.0"
-
--js-yaml@^3.7.0:
-+js-yaml@^3.11.0, js-yaml@^3.7.0:
-   version "3.11.0"
-   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.11.0.tgz#597c1a8bd57152f26d622ce4117851a51f5ebaef"
-   dependencies:
-@@ -3923,10 +4490,6 @@
-     shelljs "0.3.x"
-     strip-json-comments "1.0.x"
-
--json-loader@^0.5.4:
--  version "0.5.7"
--  resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d"
--
- json-parse-helpfulerror@^1.0.2:
-   version "1.0.3"
-   resolved "https://registry.yarnpkg.com/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz#13f14ce02eed4e981297b64eb9e3b932e2dd13dc"
-@@ -3998,13 +4561,7 @@
-   dependencies:
-     array-includes "^3.0.3"
-
--kind-of@^2.0.1:
--  version "2.0.1"
--  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-2.0.1.tgz#018ec7a4ce7e3a86cb9141be519d24c8faa981b5"
--  dependencies:
--    is-buffer "^1.0.2"
--
--kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0, kind-of@^3.2.2:
-+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
-   version "3.2.2"
-   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
-   dependencies:
-@@ -4016,7 +4573,7 @@
-   dependencies:
-     is-buffer "^1.1.5"
-
--kind-of@^5.0.0, kind-of@^5.0.2:
-+kind-of@^5.0.0:
-   version "5.1.0"
-   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
-
-@@ -4024,6 +4581,10 @@
-   version "6.0.0"
-   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.0.tgz#3606e9e2fa960e7ddaa8898c03804e47e5d66644"
-
-+kind-of@^6.0.2:
-+  version "6.0.2"
-+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
-+
- klaw-sync@^3.0.0:
-   version "3.0.2"
-   resolved "https://registry.yarnpkg.com/klaw-sync/-/klaw-sync-3.0.2.tgz#bf3a5ca463af5aec007201dbe8be7088ef29d067"
-@@ -4042,14 +4603,6 @@
-   dependencies:
-     package-json "^4.0.0"
-
--lazy-cache@^0.2.3:
--  version "0.2.7"
--  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-0.2.7.tgz#7feddf2dcb6edb77d11ef1d117ab5ffdf0ab1b65"
--
--lazy-cache@^1.0.3:
--  version "1.0.4"
--  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
--
- lazy-cache@^2.0.2:
-   version "2.0.2"
-   resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-2.0.2.tgz#b9190a4f913354694840859f8a8f7084d8822264"
-@@ -4072,6 +4625,10 @@
-   dependencies:
-     invert-kv "^1.0.0"
-
-+leb@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/leb/-/leb-0.3.0.tgz#32bee9fad168328d6aea8522d833f4180eed1da3"
-+
- legal-eagle@0.15.0:
-   version "0.15.0"
-   resolved "https://registry.yarnpkg.com/legal-eagle/-/legal-eagle-0.15.0.tgz#826b47475c948543b803a82baa2907a350449e04"
-@@ -4118,7 +4675,7 @@
-     json5 "^0.5.0"
-     object-assign "^4.0.1"
-
--loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.0.3, loader-utils@^1.1.0:
-+loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
-   version "1.1.0"
-   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
-   dependencies:
-@@ -4210,6 +4767,10 @@
-   version "4.17.4"
-   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
-
-+lodash@^4.17.5:
-+  version "4.17.10"
-+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
-+
- log-symbols@^2.1.0:
-   version "2.1.0"
-   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.1.0.tgz#f35fa60e278832b538dc4dddcbb478a45d3e3be6"
-@@ -4220,9 +4781,9 @@
-   version "1.0.1"
-   resolved "https://registry.yarnpkg.com/loglevelnext/-/loglevelnext-1.0.1.tgz#8b17b5a43395338a96c67911a962c44af466d1c8"
-
--longest@^1.0.1:
--  version "1.0.1"
--  resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
-+long@^3.2.0:
-+  version "3.2.0"
-+  resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b"
-
- loose-envify@^1.0.0, loose-envify@^1.3.1:
-   version "1.3.1"
-@@ -4252,6 +4813,13 @@
-     pseudomap "^1.0.2"
-     yallist "^2.1.2"
-
-+lru-cache@^4.1.1:
-+  version "4.1.2"
-+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.2.tgz#45234b2e6e2f2b33da125624c4664929a0224c3f"
-+  dependencies:
-+    pseudomap "^1.0.2"
-+    yallist "^2.1.2"
-+
- macaddress@^0.2.8:
-   version "0.2.8"
-   resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12"
-@@ -4331,41 +4899,23 @@
-   version "1.1.2"
-   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
-
--micromatch@^2.1.5:
--  version "2.3.11"
--  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
--  dependencies:
--    arr-diff "^2.0.0"
--    array-unique "^0.2.1"
--    braces "^1.8.2"
--    expand-brackets "^0.1.4"
--    extglob "^0.3.1"
--    filename-regex "^2.0.0"
--    is-extglob "^1.0.0"
--    is-glob "^2.0.1"
--    kind-of "^3.0.2"
--    normalize-path "^2.0.1"
--    object.omit "^2.0.0"
--    parse-glob "^3.0.4"
--    regex-cache "^0.4.2"
--
--micromatch@^3.0.3:
--  version "3.1.4"
--  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.4.tgz#bb812e741a41f982c854e42b421a7eac458796f4"
-+micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9:
-+  version "3.1.10"
-+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
-   dependencies:
-     arr-diff "^4.0.0"
-     array-unique "^0.3.2"
--    braces "^2.3.0"
--    define-property "^1.0.0"
--    extend-shallow "^2.0.1"
--    extglob "^2.0.2"
-+    braces "^2.3.1"
-+    define-property "^2.0.2"
-+    extend-shallow "^3.0.2"
-+    extglob "^2.0.4"
-     fragment-cache "^0.2.1"
--    kind-of "^6.0.0"
--    nanomatch "^1.2.5"
-+    kind-of "^6.0.2"
-+    nanomatch "^1.2.9"
-     object.pick "^1.3.0"
-     regex-not "^1.0.0"
-     snapdragon "^0.8.1"
--    to-regex "^3.0.1"
-+    to-regex "^3.0.2"
-
- miller-rabin@^4.0.0:
-   version "4.0.1"
-@@ -4378,12 +4928,22 @@
-   version "1.30.0"
-   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
-
-+mime-db@~1.33.0:
-+  version "1.33.0"
-+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
-+
- mime-types@^2.1.12, mime-types@~2.1.15, mime-types@~2.1.16, mime-types@~2.1.17, mime-types@~2.1.7:
-   version "2.1.17"
-   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
-   dependencies:
-     mime-db "~1.30.0"
-
-+mime-types@~2.1.18:
-+  version "2.1.18"
-+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
-+  dependencies:
-+    mime-db "~1.33.0"
-+
- mime@1.4.1:
-   version "1.4.1"
-   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
-@@ -4393,13 +4953,20 @@
-   resolved "https://registry.yarnpkg.com/mime/-/mime-2.1.0.tgz#1022a5ada445aa30686e4059abaea83d0b4e8f9c"
-
- mime@^2.2.0:
--  version "2.2.0"
--  resolved "https://registry.yarnpkg.com/mime/-/mime-2.2.0.tgz#161e541965551d3b549fa1114391e3a3d55b923b"
-+  version "2.2.2"
-+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.2.2.tgz#6b4c109d88031d7b5c23635f5b923da336d79121"
-
- mimic-fn@^1.0.0:
-   version "1.1.0"
-   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
-
-+mini-css-extract-plugin@^0.4.0:
-+  version "0.4.0"
-+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.0.tgz#ff3bf08bee96e618e177c16ca6131bfecef707f9"
-+  dependencies:
-+    loader-utils "^1.1.0"
-+    webpack-sources "^1.1.0"
-+
- minimalistic-assert@^1.0.0:
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3"
-@@ -4426,6 +4993,34 @@
-   version "0.0.10"
-   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
-
-+minipass@^2.2.1, minipass@^2.2.4:
-+  version "2.2.4"
-+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.2.4.tgz#03c824d84551ec38a8d1bb5bc350a5a30a354a40"
-+  dependencies:
-+    safe-buffer "^5.1.1"
-+    yallist "^3.0.0"
-+
-+minizlib@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb"
-+  dependencies:
-+    minipass "^2.2.1"
-+
-+mississippi@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
-+  dependencies:
-+    concat-stream "^1.5.0"
-+    duplexify "^3.4.2"
-+    end-of-stream "^1.1.0"
-+    flush-write-stream "^1.0.0"
-+    from2 "^2.1.0"
-+    parallel-transform "^1.1.0"
-+    pump "^2.0.1"
-+    pumpify "^1.3.3"
-+    stream-each "^1.1.0"
-+    through2 "^2.0.0"
-+
- mixin-deep@^1.2.0:
-   version "1.2.0"
-   resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.2.0.tgz#d02b8c6f8b6d4b8f5982d3fd009c4919851c3fe2"
-@@ -4465,8 +5060,8 @@
-     request "^2.79.0"
-
- mocha@^5.0.1, mocha@^5.0.4:
--  version "5.0.4"
--  resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.0.4.tgz#6b7aa328472da1088e69d47e75925fd3a3bb63c6"
-+  version "5.0.5"
-+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.0.5.tgz#e228e3386b9387a4710007a641f127b00be44b52"
-   dependencies:
-     browser-stdout "1.3.1"
-     commander "2.11.0"
-@@ -4479,6 +5074,17 @@
-     mkdirp "0.5.1"
-     supports-color "4.4.0"
-
-+move-concurrently@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
-+  dependencies:
-+    aproba "^1.1.1"
-+    copy-concurrently "^1.0.0"
-+    fs-write-stream-atomic "^1.0.8"
-+    mkdirp "^0.5.1"
-+    rimraf "^2.5.4"
-+    run-queue "^1.0.3"
-+
- ms@2.0.0:
-   version "2.0.0"
-   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-@@ -4495,21 +5101,26 @@
-     object-assign "^4.0.1"
-     thenify-all "^1.0.0"
-
--nan@^2.3.0, nan@^2.3.2:
-+nan@^2.3.2:
-   version "2.7.0"
-   resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46"
-
--nanomatch@^1.2.5:
--  version "1.2.5"
--  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.5.tgz#5c9ab02475c76676275731b0bf0a7395c624a9c4"
-+nan@^2.9.2:
-+  version "2.10.0"
-+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
-+
-+nanomatch@^1.2.9:
-+  version "1.2.9"
-+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.9.tgz#879f7150cb2dab7a471259066c104eee6e0fa7c2"
-   dependencies:
-     arr-diff "^4.0.0"
-     array-unique "^0.3.2"
--    define-property "^1.0.0"
--    extend-shallow "^2.0.1"
-+    define-property "^2.0.2"
-+    extend-shallow "^3.0.2"
-     fragment-cache "^0.2.1"
--    is-odd "^1.0.0"
--    kind-of "^5.0.2"
-+    is-odd "^2.0.0"
-+    is-windows "^1.0.2"
-+    kind-of "^6.0.2"
-     object.pick "^1.3.0"
-     regex-not "^1.0.0"
-     snapdragon "^0.8.1"
-@@ -4529,10 +5140,22 @@
-   dependencies:
-     xml-char-classes "^1.0.0"
-
-+needle@^2.2.0:
-+  version "2.2.1"
-+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.1.tgz#b5e325bd3aae8c2678902fa296f729455d1d3a7d"
-+  dependencies:
-+    debug "^2.1.2"
-+    iconv-lite "^0.4.4"
-+    sax "^1.2.4"
-+
- negotiator@0.6.1:
-   version "0.6.1"
-   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
-
-+neo-async@^2.5.0:
-+  version "2.5.1"
-+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.1.tgz#acb909e327b1e87ec9ef15f41b8a269512ad41ee"
-+
- no-case@^2.2.0:
-   version "2.3.2"
-   resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac"
-@@ -4600,26 +5223,20 @@
-     util "^0.10.3"
-     vm-browserify "0.0.4"
-
--node-native-loader@^1.1.1:
--  version "1.1.1"
--  resolved "https://registry.yarnpkg.com/node-native-loader/-/node-native-loader-1.1.1.tgz#ff1c2072f795947b3dde1da2f5412451ef564337"
--  dependencies:
--    loader-utils "^1.0.3"
--
--node-pre-gyp@^0.6.36:
--  version "0.6.38"
--  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.38.tgz#e92a20f83416415bb4086f6d1fb78b3da73d113d"
-+node-pre-gyp@^0.9.0:
-+  version "0.9.1"
-+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.9.1.tgz#f11c07516dd92f87199dbc7e1838eab7cd56c9e0"
-   dependencies:
--    hawk "3.1.3"
-+    detect-libc "^1.0.2"
-     mkdirp "^0.5.1"
-+    needle "^2.2.0"
-     nopt "^4.0.1"
-+    npm-packlist "^1.1.6"
-     npmlog "^4.0.2"
-     rc "^1.1.7"
--    request "2.81.0"
-     rimraf "^2.6.1"
-     semver "^5.3.0"
--    tar "^2.2.1"
--    tar-pack "^3.4.0"
-+    tar "^4"
-
- node-sass@^4.7.2:
-   version "4.7.2"
-@@ -4688,7 +5305,7 @@
-     semver "2 || 3 || 4 || 5"
-     validate-npm-package-license "^3.0.1"
-
--normalize-path@^2.0.0, normalize-path@^2.0.1:
-+normalize-path@^2.0.0, normalize-path@^2.1.1:
-   version "2.1.1"
-   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
-   dependencies:
-@@ -4707,10 +5324,21 @@
-     query-string "^4.1.0"
-     sort-keys "^1.0.0"
-
-+npm-bundled@^1.0.1:
-+  version "1.0.3"
-+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.3.tgz#7e71703d973af3370a9591bafe3a63aca0be2308"
-+
- npm-install-package@~2.1.0:
-   version "2.1.0"
-   resolved "https://registry.yarnpkg.com/npm-install-package/-/npm-install-package-2.1.0.tgz#d7efe3cfcd7ab00614b896ea53119dc9ab259125"
-
-+npm-packlist@^1.1.6:
-+  version "1.1.10"
-+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.10.tgz#1039db9e985727e464df066f4cf0ab6ef85c398a"
-+  dependencies:
-+    ignore-walk "^3.0.1"
-+    npm-bundled "^1.0.1"
-+
- npm-run-path@^2.0.0:
-   version "2.0.2"
-   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
-@@ -4789,13 +5417,6 @@
-     define-properties "^1.1.2"
-     es-abstract "^1.5.1"
-
--object.omit@^2.0.0:
--  version "2.0.1"
--  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
--  dependencies:
--    for-own "^0.1.4"
--    is-extendable "^0.1.1"
--
- object.pick@^1.3.0:
-   version "1.3.0"
-   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
-@@ -4814,7 +5435,7 @@
-   dependencies:
-     ee-first "1.1.1"
-
--once@^1.3.0, once@^1.3.3, once@^1.4.0:
-+once@^1.3.0, once@^1.3.1, once@^1.4.0:
-   version "1.4.0"
-   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-   dependencies:
-@@ -4826,6 +5447,10 @@
-   dependencies:
-     mimic-fn "^1.0.0"
-
-+opener@^1.4.3:
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/opener/-/opener-1.4.3.tgz#5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"
-+
- optimist@~0.6.1:
-   version "0.6.1"
-   resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
-@@ -4904,9 +5529,17 @@
-   version "0.2.9"
-   resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
-
--parallel-webpack@^2.1.0:
--  version "2.2.0"
--  resolved "https://registry.yarnpkg.com/parallel-webpack/-/parallel-webpack-2.2.0.tgz#7171440b684444610ba890d32439a33666ab46cb"
-+parallel-transform@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz#d410f065b05da23081fcd10f28854c29bda33b06"
-+  dependencies:
-+    cyclist "~0.2.2"
-+    inherits "^2.0.3"
-+    readable-stream "^2.1.5"
-+
-+parallel-webpack@^2.3.0:
-+  version "2.3.0"
-+  resolved "https://registry.yarnpkg.com/parallel-webpack/-/parallel-webpack-2.3.0.tgz#a614625e25647cea9655918cb80cf829fa674ff8"
-   dependencies:
-     ajv "^4.9.2"
-     bluebird "^3.0.6"
-@@ -4949,15 +5582,6 @@
-   dependencies:
-     color-convert "~0.5.0"
-
--parse-glob@^3.0.4:
--  version "3.0.4"
--  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
--  dependencies:
--    glob-base "^0.3.0"
--    is-dotfile "^1.0.0"
--    is-extglob "^1.0.0"
--    is-glob "^2.0.0"
--
- parse-json@^2.2.0:
-   version "2.2.0"
-   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
-@@ -4976,6 +5600,10 @@
-   version "0.0.0"
-   resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
-
-+path-dirname@^1.0.0:
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
-+
- path-exists@^2.0.0, path-exists@^2.1.0:
-   version "2.1.0"
-   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
-@@ -5064,6 +5692,12 @@
-   version "2.0.4"
-   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-
-+pkg-dir@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
-+  dependencies:
-+    find-up "^2.1.0"
-+
- plist@^2.0.0, plist@^2.1.0:
-   version "2.1.0"
-   resolved "https://registry.yarnpkg.com/plist/-/plist-2.1.0.tgz#57ccdb7a0821df21831217a3cad54e3e146a1025"
-@@ -5206,27 +5840,27 @@
-     postcss "^5.0.14"
-     postcss-selector-parser "^2.0.0"
-
--postcss-modules-extract-imports@^1.0.0:
-+postcss-modules-extract-imports@^1.2.0:
-   version "1.2.0"
-   resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.0.tgz#66140ecece38ef06bf0d3e355d69bf59d141ea85"
-   dependencies:
-     postcss "^6.0.1"
-
--postcss-modules-local-by-default@^1.0.1:
-+postcss-modules-local-by-default@^1.2.0:
-   version "1.2.0"
-   resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069"
-   dependencies:
-     css-selector-tokenizer "^0.7.0"
-     postcss "^6.0.1"
-
--postcss-modules-scope@^1.0.0:
-+postcss-modules-scope@^1.1.0:
-   version "1.1.0"
-   resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90"
-   dependencies:
-     css-selector-tokenizer "^0.7.0"
-     postcss "^6.0.1"
-
--postcss-modules-values@^1.1.0:
-+postcss-modules-values@^1.3.0:
-   version "1.3.0"
-   resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20"
-   dependencies:
-@@ -5338,13 +5972,9 @@
-   version "1.0.4"
-   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
-
--preserve@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
--
--prettier@1.11.1:
--  version "1.11.1"
--  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.11.1.tgz#61e43fc4cd44e68f2b0dfc2c38cd4bb0fccdcc75"
-+prettier@1.13.0:
-+  version "1.13.0"
-+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.0.tgz#054de8d5fb1a4405c845d16183f58a2c301f6f16"
-
- pretty-bytes@^1.0.2:
-   version "1.0.4"
-@@ -5360,7 +5990,7 @@
-     renderkid "^2.0.1"
-     utila "~0.4"
-
--private@^0.1.7:
-+private@^0.1.7, private@^0.1.8:
-   version "0.1.8"
-   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
-
-@@ -5368,6 +5998,10 @@
-   version "1.0.7"
-   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
-
-+process-nextick-args@~2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
-+
- process@^0.11.0:
-   version "0.11.10"
-   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
-@@ -5383,6 +6017,10 @@
-   version "2.0.0"
-   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz#8a1be366bf8fc23db2bd23f10c6fe920b4389d1f"
-
-+promise-inflight@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
-+
- promise@^7.1.1:
-   version "7.3.1"
-   resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
-@@ -5410,10 +6048,21 @@
-     forwarded "~0.1.2"
-     ipaddr.js "1.5.2"
-
-+proxy-addr@~2.0.3:
-+  version "2.0.3"
-+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.3.tgz#355f262505a621646b3130a728eb647e22055341"
-+  dependencies:
-+    forwarded "~0.1.2"
-+    ipaddr.js "1.6.0"
-+
- prr@~0.0.0:
-   version "0.0.0"
-   resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"
-
-+prr@~1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
-+
- pruner@^0.0.7:
-   version "0.0.7"
-   resolved "https://registry.yarnpkg.com/pruner/-/pruner-0.0.7.tgz#345fbcb3e80701163a1d7adf56bac229a5a1e4c1"
-@@ -5434,6 +6083,21 @@
-     parse-asn1 "^5.0.0"
-     randombytes "^2.0.1"
-
-+pump@^2.0.0, pump@^2.0.1:
-+  version "2.0.1"
-+  resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
-+  dependencies:
-+    end-of-stream "^1.1.0"
-+    once "^1.3.1"
-+
-+pumpify@^1.3.3:
-+  version "1.4.0"
-+  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.4.0.tgz#80b7c5df7e24153d03f0e7ac8a05a5d068bd07fb"
-+  dependencies:
-+    duplexify "^3.5.3"
-+    inherits "^2.0.3"
-+    pump "^2.0.0"
-+
- punycode@1.3.2:
-   version "1.3.2"
-   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
-@@ -5477,13 +6141,6 @@
-   version "0.2.0"
-   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
-
--randomatic@^1.1.3:
--  version "1.1.7"
--  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c"
--  dependencies:
--    is-number "^3.0.0"
--    kind-of "^4.0.0"
--
- randombytes@^2.0.0, randombytes@^2.0.1:
-   version "2.0.5"
-   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.5.tgz#dc009a246b8d09a177b4b7a0ae77bc570f4b1b79"
-@@ -5512,9 +6169,9 @@
-     minimist "^1.2.0"
-     strip-json-comments "~2.0.1"
-
--rcedit@^0.9.0:
--  version "0.9.0"
--  resolved "https://registry.yarnpkg.com/rcedit/-/rcedit-0.9.0.tgz#3910df57345399e2b0325f4a519007f89e55ef1c"
-+rcedit@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/rcedit/-/rcedit-1.0.0.tgz#43309ecbc8814f3582fca6b751748cfad66a16a2"
-
- read-config-file@3.0.0:
-   version "3.0.0"
-@@ -5583,6 +6240,18 @@
-     normalize-package-data "^2.3.2"
-     path-type "^2.0.0"
-
-+"readable-stream@1 || 2", readable-stream@^2.0.4, readable-stream@^2.1.5:
-+  version "2.3.6"
-+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
-+  dependencies:
-+    core-util-is "~1.0.0"
-+    inherits "~2.0.3"
-+    isarray "~1.0.0"
-+    process-nextick-args "~2.0.0"
-+    safe-buffer "~5.1.1"
-+    string_decoder "~1.1.1"
-+    util-deprecate "~1.0.1"
-+
- readable-stream@1.0:
-   version "1.0.34"
-   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
-@@ -5610,7 +6279,7 @@
-     isarray "0.0.1"
-     string_decoder "~0.10.x"
-
--readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.2.2, readable-stream@^2.2.6:
-+readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.2.6:
-   version "2.3.3"
-   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
-   dependencies:
-@@ -5673,21 +6342,22 @@
-   version "0.11.0"
-   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz#7e54fe5b5ccd5d6624ea6255c3473be090b802e1"
-
--regex-cache@^0.4.2:
--  version "0.4.4"
--  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
--  dependencies:
--    is-equal-shallow "^0.1.3"
--
- regex-not@^1.0.0:
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.0.tgz#42f83e39771622df826b02af176525d6a5f157f9"
-   dependencies:
-     extend-shallow "^2.0.1"
-
-+regex-not@^1.0.2:
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
-+  dependencies:
-+    extend-shallow "^3.0.2"
-+    safe-regex "^1.1.0"
-+
- regexpp@^1.0.1:
--  version "1.0.1"
--  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-1.0.1.tgz#d857c3a741dce075c2848dcb019a0a975b190d43"
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-1.1.0.tgz#0e3516dd0b7904f413d2d4193dce4618c3a689ab"
-
- regexpu-core@^1.0.0:
-   version "1.0.0"
-@@ -5742,7 +6412,7 @@
-   version "1.1.2"
-   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
-
--repeat-string@^1.5.2, repeat-string@^1.6.1:
-+repeat-string@^1.6.1:
-   version "1.6.1"
-   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-
-@@ -5779,18 +6449,18 @@
-     tunnel-agent "^0.6.0"
-     uuid "^3.1.0"
-
--request@2.81.0, request@~2.81.0:
--  version "2.81.0"
--  resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
-+request@~2.79.0:
-+  version "2.79.0"
-+  resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
-   dependencies:
-     aws-sign2 "~0.6.0"
-     aws4 "^1.2.1"
--    caseless "~0.12.0"
-+    caseless "~0.11.0"
-     combined-stream "~1.0.5"
-     extend "~3.0.0"
-     forever-agent "~0.6.1"
-     form-data "~2.1.1"
--    har-validator "~4.2.1"
-+    har-validator "~2.0.6"
-     hawk "~3.1.3"
-     http-signature "~1.1.0"
-     is-typedarray "~1.0.0"
-@@ -5798,26 +6468,24 @@
-     json-stringify-safe "~5.0.1"
-     mime-types "~2.1.7"
-     oauth-sign "~0.8.1"
--    performance-now "^0.2.0"
--    qs "~6.4.0"
--    safe-buffer "^5.0.1"
-+    qs "~6.3.0"
-     stringstream "~0.0.4"
-     tough-cookie "~2.3.0"
--    tunnel-agent "^0.6.0"
-+    tunnel-agent "~0.4.1"
-     uuid "^3.0.0"
-
--request@~2.79.0:
--  version "2.79.0"
--  resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
-+request@~2.81.0:
-+  version "2.81.0"
-+  resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
-   dependencies:
-     aws-sign2 "~0.6.0"
-     aws4 "^1.2.1"
--    caseless "~0.11.0"
-+    caseless "~0.12.0"
-     combined-stream "~1.0.5"
-     extend "~3.0.0"
-     forever-agent "~0.6.1"
-     form-data "~2.1.1"
--    har-validator "~2.0.6"
-+    har-validator "~4.2.1"
-     hawk "~3.1.3"
-     http-signature "~1.1.0"
-     is-typedarray "~1.0.0"
-@@ -5825,10 +6493,12 @@
-     json-stringify-safe "~5.0.1"
-     mime-types "~2.1.7"
-     oauth-sign "~0.8.1"
--    qs "~6.3.0"
-+    performance-now "^0.2.0"
-+    qs "~6.4.0"
-+    safe-buffer "^5.0.1"
-     stringstream "~0.0.4"
-     tough-cookie "~2.3.0"
--    tunnel-agent "~0.4.1"
-+    tunnel-agent "^0.6.0"
-     uuid "^3.0.0"
-
- require-directory@^2.1.1:
-@@ -5871,17 +6541,15 @@
-     onetime "^2.0.0"
-     signal-exit "^3.0.2"
-
-+ret@~0.1.10:
-+  version "0.1.15"
-+  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
-+
- rgb2hex@~0.1.0:
-   version "0.1.0"
-   resolved "https://registry.yarnpkg.com/rgb2hex/-/rgb2hex-0.1.0.tgz#ccd55f860ae0c5c4ea37504b958e442d8d12325b"
-
--right-align@^0.1.1:
--  version "0.1.3"
--  resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
--  dependencies:
--    align-text "^0.1.1"
--
--rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.5.2, rimraf@^2.6.1:
-+rimraf@2, rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
-   version "2.6.2"
-   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
-   dependencies:
-@@ -5904,6 +6572,12 @@
-   dependencies:
-     is-promise "^2.1.0"
-
-+run-queue@^1.0.0, run-queue@^1.0.3:
-+  version "1.0.3"
-+  resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
-+  dependencies:
-+    aproba "^1.1.1"
-+
- rx-lite-aggregates@^4.0.8:
-   version "4.0.8"
-   resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be"
-@@ -5922,10 +6596,24 @@
-   version "5.1.1"
-   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
-
-+safe-buffer@^5.1.2:
-+  version "5.1.2"
-+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-+
- safe-buffer@~5.0.1:
-   version "5.0.1"
-   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7"
-
-+safe-regex@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
-+  dependencies:
-+    ret "~0.1.10"
-+
-+safer-buffer@^2.1.0:
-+  version "2.1.2"
-+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-+
- sanitize-filename@^1.6.0, sanitize-filename@^1.6.1:
-   version "1.6.1"
-   resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.1.tgz#612da1c96473fa02dccda92dcd5b4ab164a6772a"
-@@ -5941,14 +6629,14 @@
-     scss-tokenizer "^0.2.3"
-     yargs "^7.0.0"
-
--sass-loader@^6.0.6:
--  version "6.0.6"
--  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-6.0.6.tgz#e9d5e6c1f155faa32a4b26d7a9b7107c225e40f9"
-+sass-loader@^7.0.1:
-+  version "7.0.1"
-+  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.0.1.tgz#fd937259ccba3a9cfe0d5f8a98746d48adfcc261"
-   dependencies:
--    async "^2.1.5"
--    clone-deep "^0.3.0"
-+    clone-deep "^2.0.1"
-     loader-utils "^1.0.1"
-     lodash.tail "^4.1.1"
-+    neo-async "^2.5.0"
-     pify "^3.0.0"
-
- sax@1.2.1:
-@@ -5959,11 +6647,12 @@
-   version "1.2.4"
-   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
-
--schema-utils@^0.3.0:
--  version "0.3.0"
--  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf"
-+schema-utils@^0.4.4, schema-utils@^0.4.5:
-+  version "0.4.5"
-+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.5.tgz#21836f0608aac17b78f9e3e24daff14a5ca13a3e"
-   dependencies:
--    ajv "^5.0.0"
-+    ajv "^6.1.0"
-+    ajv-keywords "^3.1.0"
-
- scss-tokenizer@^0.2.3:
-   version "0.2.3"
-@@ -6012,6 +6701,28 @@
-     range-parser "~1.2.0"
-     statuses "~1.3.1"
-
-+send@0.16.2:
-+  version "0.16.2"
-+  resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
-+  dependencies:
-+    debug "2.6.9"
-+    depd "~1.1.2"
-+    destroy "~1.0.4"
-+    encodeurl "~1.0.2"
-+    escape-html "~1.0.3"
-+    etag "~1.8.1"
-+    fresh "0.5.2"
-+    http-errors "~1.6.2"
-+    mime "1.4.1"
-+    ms "2.0.0"
-+    on-finished "~2.3.0"
-+    range-parser "~1.2.0"
-+    statuses "~1.4.0"
-+
-+serialize-javascript@^1.4.0:
-+  version "1.5.0"
-+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.5.0.tgz#1aa336162c88a890ddad5384baebc93a655161fe"
-+
- serve-static@1.13.1:
-   version "1.13.1"
-   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.1.tgz#4c57d53404a761d8f2e7c1e8a18a47dbf278a719"
-@@ -6021,6 +6732,15 @@
-     parseurl "~1.3.2"
-     send "0.16.1"
-
-+serve-static@1.13.2:
-+  version "1.13.2"
-+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
-+  dependencies:
-+    encodeurl "~1.0.2"
-+    escape-html "~1.0.3"
-+    parseurl "~1.3.2"
-+    send "0.16.2"
-+
- set-blocking@^2.0.0, set-blocking@~2.0.0:
-   version "2.0.0"
-   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-@@ -6072,13 +6792,12 @@
-     inherits "^2.0.1"
-     safe-buffer "^5.0.1"
-
--shallow-clone@^0.1.2:
--  version "0.1.2"
--  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-0.1.2.tgz#5909e874ba77106d73ac414cfec1ffca87d97060"
-+shallow-clone@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-1.0.0.tgz#4480cd06e882ef68b2ad88a3ea54832e2c48b571"
-   dependencies:
-     is-extendable "^0.1.1"
--    kind-of "^2.0.1"
--    lazy-cache "^0.2.3"
-+    kind-of "^5.0.0"
-     mixin-object "^2.0.1"
-
- shebang-command@^1.2.0:
-@@ -6168,10 +6887,6 @@
-   version "2.0.0"
-   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
-
--source-list-map@~0.1.7:
--  version "0.1.8"
--  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
--
- source-map-resolve@^0.3.0:
-   version "0.3.1"
-   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.3.1.tgz#610f6122a445b8dd51535a2a71b783dfc1248761"
-@@ -6197,9 +6912,9 @@
-   dependencies:
-     source-map "^0.5.6"
-
--source-map-support@^0.5.3:
--  version "0.5.3"
--  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.3.tgz#2b3d5fff298cfa4d1afd7d4352d569e9a0158e76"
-+source-map-support@^0.5.3, source-map-support@^0.5.4:
-+  version "0.5.4"
-+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.4.tgz#54456efa89caa9270af7cd624cc2f123e51fbae8"
-   dependencies:
-     source-map "^0.6.0"
-
-@@ -6211,7 +6926,7 @@
-   version "0.3.0"
-   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.3.0.tgz#7ecaf13b57bcd09da8a40c5d269db33799d4aaf9"
-
--source-map@0.5.x, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3:
-+source-map@0.5.x, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.3:
-   version "0.5.7"
-   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-
-@@ -6289,6 +7004,12 @@
-     jsbn "~0.1.0"
-     tweetnacl "~0.14.0"
-
-+ssri@^5.2.4:
-+  version "5.3.0"
-+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.3.0.tgz#ba3872c9c6d33a0704a7d71ff045e5ec48999d06"
-+  dependencies:
-+    safe-buffer "^5.1.1"
-+
- stat-mode@^0.2.2:
-   version "0.2.2"
-   resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-0.2.2.tgz#e6c80b623123d7d80cf132ce538f346289072502"
-@@ -6300,7 +7021,7 @@
-     define-property "^0.2.5"
-     object-copy "^0.1.0"
-
--"statuses@>= 1.3.1 < 2":
-+"statuses@>= 1.3.1 < 2", statuses@~1.4.0:
-   version "1.4.0"
-   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
-
-@@ -6321,6 +7042,13 @@
-     inherits "~2.0.1"
-     readable-stream "^2.0.2"
-
-+stream-each@^1.1.0:
-+  version "1.2.2"
-+  resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.2.tgz#8e8c463f91da8991778765873fe4d960d8f616bd"
-+  dependencies:
-+    end-of-stream "^1.1.0"
-+    stream-shift "^1.0.0"
-+
- stream-http@^2.3.1:
-   version "2.7.2"
-   resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.7.2.tgz#40a050ec8dc3b53b33d9909415c02c0bf1abfbad"
-@@ -6331,6 +7059,10 @@
-     to-arraybuffer "^1.0.0"
-     xtend "^4.0.0"
-
-+stream-shift@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
-+
- strict-uri-encode@^1.0.0:
-   version "1.1.0"
-   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
-@@ -6360,6 +7092,12 @@
-   dependencies:
-     safe-buffer "~5.1.0"
-
-+string_decoder@~1.1.1:
-+  version "1.1.1"
-+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-+  dependencies:
-+    safe-buffer "~5.1.0"
-+
- stringstream@~0.0.4, stringstream@~0.0.5:
-   version "0.0.5"
-   resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
-@@ -6404,12 +7142,12 @@
-   version "2.0.1"
-   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-
--style-loader@^0.19.1:
--  version "0.19.1"
--  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.19.1.tgz#591ffc80bcefe268b77c5d9ebc0505d772619f85"
-+style-loader@^0.21.0:
-+  version "0.21.0"
-+  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.21.0.tgz#68c52e5eb2afc9ca92b6274be277ee59aea3a852"
-   dependencies:
--    loader-utils "^1.0.2"
--    schema-utils "^0.3.0"
-+    loader-utils "^1.1.0"
-+    schema-utils "^0.4.5"
-
- sumchecker@^1.2.0:
-   version "1.3.1"
-@@ -6434,18 +7172,24 @@
-   version "2.0.0"
-   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-
--supports-color@^3.1.0, supports-color@^3.1.2, supports-color@^3.2.3, supports-color@~3.2.3:
-+supports-color@^3.1.2, supports-color@^3.2.3, supports-color@~3.2.3:
-   version "3.2.3"
-   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
-   dependencies:
-     has-flag "^1.0.0"
-
--supports-color@^4.0.0, supports-color@^4.2.1, supports-color@^4.4.0:
-+supports-color@^4.0.0, supports-color@^4.4.0:
-   version "4.5.0"
-   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
-   dependencies:
-     has-flag "^2.0.0"
-
-+supports-color@^5.3.0:
-+  version "5.4.0"
-+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
-+  dependencies:
-+    has-flag "^3.0.0"
-+
- svgo@^0.7.0:
-   version "0.7.2"
-   resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
-@@ -6469,22 +7213,9 @@
-     slice-ansi "1.0.0"
-     string-width "^2.1.1"
-
--tapable@^0.2.5, tapable@^0.2.7, tapable@~0.2.5:
--  version "0.2.8"
--  resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.8.tgz#99372a5c999bf2df160afc0d74bed4f47948cd22"
--
--tar-pack@^3.4.0:
--  version "3.4.1"
--  resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f"
--  dependencies:
--    debug "^2.2.0"
--    fstream "^1.0.10"
--    fstream-ignore "^1.0.5"
--    once "^1.3.3"
--    readable-stream "^2.1.4"
--    rimraf "^2.5.1"
--    tar "^2.2.1"
--    uid-number "^0.0.6"
-+tapable@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.0.0.tgz#cbb639d9002eed9c6b5975eb20598d7936f1f9f2"
-
- tar-stream@^1.5.0:
-   version "1.5.4"
-@@ -6495,7 +7226,7 @@
-     readable-stream "^2.0.0"
-     xtend "^4.0.0"
-
--tar@^2.0.0, tar@^2.2.1:
-+tar@^2.0.0:
-   version "2.2.1"
-   resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
-   dependencies:
-@@ -6503,6 +7234,18 @@
-     fstream "^1.0.2"
-     inherits "2"
-
-+tar@^4:
-+  version "4.4.2"
-+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.2.tgz#60685211ba46b38847b1ae7ee1a24d744a2cd462"
-+  dependencies:
-+    chownr "^1.0.1"
-+    fs-minipass "^1.2.5"
-+    minipass "^2.2.4"
-+    minizlib "^1.1.0"
-+    mkdirp "^0.5.0"
-+    safe-buffer "^5.1.2"
-+    yallist "^3.0.2"
-+
- temp-file@^3.1.1:
-   version "3.1.1"
-   resolved "https://registry.yarnpkg.com/temp-file/-/temp-file-3.1.1.tgz#8823649aa4e8a6e419eb71b601a2e4d472b0f24f"
-@@ -6545,6 +7288,13 @@
-   version "0.0.2"
-   resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-0.0.2.tgz#cfedf88e60c00dd9697b61fdd2a8343a9b680eaf"
-
-+through2@^2.0.0:
-+  version "2.0.3"
-+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
-+  dependencies:
-+    readable-stream "^2.1.5"
-+    xtend "~4.0.1"
-+
- through2@~0.2.3:
-   version "0.2.3"
-   resolved "https://registry.yarnpkg.com/through2/-/through2-0.2.3.tgz#eb3284da4ea311b6cc8ace3653748a52abf25a3f"
-@@ -6617,6 +7367,15 @@
-     extend-shallow "^2.0.1"
-     regex-not "^1.0.0"
-
-+to-regex@^3.0.2:
-+  version "3.0.2"
-+  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
-+  dependencies:
-+    define-property "^2.0.2"
-+    extend-shallow "^3.0.2"
-+    regex-not "^1.0.2"
-+    safe-regex "^1.1.0"
-+
- to-space-case@^1.0.0:
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/to-space-case/-/to-space-case-1.0.0.tgz#b052daafb1b2b29dc770cea0163e5ec0ebc9fc17"
-@@ -6663,6 +7422,10 @@
-   dependencies:
-     utf8-byte-length "^1.0.1"
-
-+tryer@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.0.tgz#027b69fa823225e551cace3ef03b11f6ab37c1d7"
-+
- tryit@^1.0.1:
-   version "1.0.3"
-   resolved "https://registry.yarnpkg.com/tryit/-/tryit-1.0.3.tgz#393be730a9446fd1ead6da59a014308f36c289cb"
-@@ -6728,8 +7491,8 @@
-     tslib "^1.7.1"
-
- tsutils@^2.13.1:
--  version "2.22.2"
--  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.22.2.tgz#0b9f3d87aa3eb95bd32d26ce2b88aa329a657951"
-+  version "2.25.1"
-+  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.25.1.tgz#24a46342ab8b174a3fbde632e60dcd11b64982f9"
-   dependencies:
-     tslib "^1.8.1"
-
-@@ -6768,25 +7531,39 @@
-     media-typer "0.3.0"
-     mime-types "~2.1.15"
-
-+type-is@~1.6.16:
-+  version "1.6.16"
-+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
-+  dependencies:
-+    media-typer "0.3.0"
-+    mime-types "~2.1.18"
-+
- typedarray@^0.0.6:
-   version "0.0.6"
-   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
-
--typescript-eslint-parser@^14.0.0:
--  version "14.0.0"
--  resolved "https://registry.yarnpkg.com/typescript-eslint-parser/-/typescript-eslint-parser-14.0.0.tgz#c90a8f541c1d96e5c55e2807c61d154e788520f9"
-+typescript-eslint-parser@^16.0.0:
-+  version "16.0.0"
-+  resolved "https://registry.yarnpkg.com/typescript-eslint-parser/-/typescript-eslint-parser-16.0.0.tgz#14a9ab75932b15af919602faef553c6f0487f352"
-   dependencies:
-     lodash.unescape "4.0.1"
-     semver "5.5.0"
-
--typescript@^2.8.1:
--  version "2.8.1"
--  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.8.1.tgz#6160e4f8f195d5ba81d4876f9c0cc1fbc0820624"
-+typescript@^2.9.1:
-+  version "2.9.1"
-+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.1.tgz#fdb19d2c67a15d11995fd15640e373e09ab09961"
-
- ua-parser-js@^0.7.9:
-   version "0.7.17"
-   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.17.tgz#e9ec5f9498b9ec910e7ae3ac626a805c4d09ecac"
-
-+uglify-es@^3.3.4:
-+  version "3.3.9"
-+  resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677"
-+  dependencies:
-+    commander "~2.13.0"
-+    source-map "~0.6.1"
-+
- uglify-js@3.1.x:
-   version "3.1.6"
-   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.1.6.tgz#918832602036e95d2318e11f27ee8461a8592c5d"
-@@ -6794,30 +7571,18 @@
-     commander "~2.11.0"
-     source-map "~0.6.1"
-
--uglify-js@^2.8.27, uglify-js@^2.8.29:
--  version "2.8.29"
--  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
--  dependencies:
--    source-map "~0.5.1"
--    yargs "~3.10.0"
--  optionalDependencies:
--    uglify-to-browserify "~1.0.0"
--
--uglify-to-browserify@~1.0.0:
--  version "1.0.2"
--  resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
--
--uglifyjs-webpack-plugin@^0.4.6:
--  version "0.4.6"
--  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz#b951f4abb6bd617e66f63eb891498e391763e309"
-+uglifyjs-webpack-plugin@^1.2.4:
-+  version "1.2.5"
-+  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.5.tgz#2ef8387c8f1a903ec5e44fa36f9f3cbdcea67641"
-   dependencies:
--    source-map "^0.5.6"
--    uglify-js "^2.8.29"
--    webpack-sources "^1.0.1"
--
--uid-number@^0.0.6:
--  version "0.0.6"
--  resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
-+    cacache "^10.0.4"
-+    find-cache-dir "^1.0.0"
-+    schema-utils "^0.4.5"
-+    serialize-javascript "^1.4.0"
-+    source-map "^0.6.1"
-+    uglify-es "^3.3.4"
-+    webpack-sources "^1.1.0"
-+    worker-farm "^1.5.2"
-
- underscore@~1.6.0:
-   version "1.6.0"
-@@ -6846,6 +7611,18 @@
-   version "2.0.0"
-   resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
-
-+unique-filename@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.0.tgz#d05f2fe4032560871f30e93cbe735eea201514f3"
-+  dependencies:
-+    unique-slug "^2.0.0"
-+
-+unique-slug@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.0.tgz#db6676e7c7cc0629878ff196097c78855ae9f4ab"
-+  dependencies:
-+    imurmurhash "^0.1.4"
-+
- unique-string@^1.0.0:
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a"
-@@ -6871,6 +7648,10 @@
-   version "2.0.1"
-   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
-
-+upath@^1.0.0:
-+  version "1.0.5"
-+  resolved "https://registry.yarnpkg.com/upath/-/upath-1.0.5.tgz#02cab9ecebe95bbec6d5fc2566325725ab6d1a73"
-+
- update-notifier@^2.3.0:
-   version "2.3.0"
-   resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.3.0.tgz#4e8827a6bb915140ab093559d7014e3ebb837451"
-@@ -6895,13 +7676,19 @@
-   dependencies:
-     punycode "^2.1.0"
-
-+uri-js@^4.2.1:
-+  version "4.2.1"
-+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.1.tgz#4595a80a51f356164e22970df64c7abd6ade9850"
-+  dependencies:
-+    punycode "^2.1.0"
-+
- urix@^0.1.0, urix@~0.1.0:
-   version "0.1.0"
-   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
-
--url-join@^2.0.2:
--  version "2.0.2"
--  resolved "https://registry.yarnpkg.com/url-join/-/url-join-2.0.2.tgz#c072756967ad24b8b59e5741551caac78f50b8b7"
-+url-join@^4.0.0:
-+  version "4.0.0"
-+  resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.0.tgz#4d3340e807d3773bda9991f8305acdcc2a665d2a"
-
- url-parse-lax@^1.0.0:
-   version "1.0.0"
-@@ -6943,7 +7730,7 @@
-   version "1.0.3"
-   resolved "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz#a7c216d267545169637b3b6edc6ca9119e2ff93f"
-
--util.promisify@^1.0.0:
-+util.promisify@1.0.0:
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030"
-   dependencies:
-@@ -7009,18 +7796,28 @@
-   version "0.0.11"
-   resolved "https://registry.yarnpkg.com/walkdir/-/walkdir-0.0.11.tgz#a16d025eb931bd03b52f308caed0f40fcebe9532"
-
--watchpack@^1.3.1, watchpack@^1.4.0:
--  version "1.4.0"
--  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.4.0.tgz#4a1472bcbb952bd0a9bb4036801f954dfb39faac"
-+watchpack@^1.5.0:
-+  version "1.6.0"
-+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
-   dependencies:
--    async "^2.1.2"
--    chokidar "^1.7.0"
-+    chokidar "^2.0.2"
-     graceful-fs "^4.1.2"
-+    neo-async "^2.5.0"
-
- wdio-dot-reporter@~0.0.8:
-   version "0.0.9"
-   resolved "https://registry.yarnpkg.com/wdio-dot-reporter/-/wdio-dot-reporter-0.0.9.tgz#929b2adafd49d6b0534fda068e87319b47e38fe5"
-
-+webassemblyjs@1.4.3:
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/webassemblyjs/-/webassemblyjs-1.4.3.tgz#0591893efb8fbde74498251cbe4b2d83df9239cb"
-+  dependencies:
-+    "@webassemblyjs/ast" "1.4.3"
-+    "@webassemblyjs/validation" "1.4.3"
-+    "@webassemblyjs/wasm-parser" "1.4.3"
-+    "@webassemblyjs/wast-parser" "1.4.3"
-+    long "^3.2.0"
-+
- webdriverio@^4.8.0:
-   version "4.8.0"
-   resolved "https://registry.yarnpkg.com/webdriverio/-/webdriverio-4.8.0.tgz#d52929b749080f89967f6e1614051cbc8172d132"
-@@ -7048,21 +7845,38 @@
-     wdio-dot-reporter "~0.0.8"
-     wgxpath "~1.0.0"
-
--webpack-dev-middleware@^2.0.3:
--  version "2.0.3"
--  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-2.0.3.tgz#44e15480ec58d275417ac4d93a0126c7b72450bd"
-+webpack-bundle-analyzer@^2.13.0:
-+  version "2.13.0"
-+  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.13.0.tgz#8d7db44c3d4844bc911890998e1110514cf12264"
-+  dependencies:
-+    acorn "^5.3.0"
-+    bfj-node4 "^5.2.0"
-+    chalk "^2.3.0"
-+    commander "^2.13.0"
-+    ejs "^2.5.7"
-+    express "^4.16.2"
-+    filesize "^3.5.11"
-+    gzip-size "^4.1.0"
-+    lodash "^4.17.4"
-+    mkdirp "^0.5.1"
-+    opener "^1.4.3"
-+    ws "^4.0.0"
-+
-+webpack-dev-middleware@^3.1.3:
-+  version "3.1.3"
-+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.1.3.tgz#8b32aa43da9ae79368c1bf1183f2b6cf5e1f39ed"
-   dependencies:
-     loud-rejection "^1.6.0"
-     memory-fs "~0.4.1"
-     mime "^2.1.0"
-     path-is-absolute "^1.0.0"
-     range-parser "^1.0.3"
--    url-join "^2.0.2"
-+    url-join "^4.0.0"
-     webpack-log "^1.0.1"
-
--webpack-hot-middleware@^2.21.0:
--  version "2.21.0"
--  resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.21.0.tgz#7b3c113a7a4b301c91e0749573c7aab28b414b52"
-+webpack-hot-middleware@^2.22.2:
-+  version "2.22.2"
-+  resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.22.2.tgz#623b77ce591fcd4e1fb99f18167781443e50afac"
-   dependencies:
-     ansi-html "0.0.7"
-     html-entities "^1.2.0"
-@@ -7078,18 +7892,11 @@
-     loglevelnext "^1.0.1"
-     uuid "^3.1.0"
-
--webpack-merge@^4.1.0:
--  version "4.1.1"
--  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.1.1.tgz#f1197a0a973e69c6fbeeb6d658219aa8c0c13555"
--  dependencies:
--    lodash "^4.17.4"
--
--webpack-sources@^0.1.4:
--  version "0.1.5"
--  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.1.5.tgz#aa1f3abf0f0d74db7111c40e500b84f966640750"
-+webpack-merge@^4.1.2:
-+  version "4.1.2"
-+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.1.2.tgz#5d372dddd3e1e5f8874f5bf5a8e929db09feb216"
-   dependencies:
--    source-list-map "~0.1.7"
--    source-map "~0.5.3"
-+    lodash "^4.17.5"
-
- webpack-sources@^1.0.1:
-   version "1.0.1"
-@@ -7098,58 +7905,39 @@
-     source-list-map "^2.0.0"
-     source-map "~0.5.3"
-
--webpack@^2.2.0:
--  version "2.7.0"
--  resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.7.0.tgz#b2a1226804373ffd3d03ea9c6bd525067034f6b1"
-+webpack-sources@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.1.0.tgz#a101ebae59d6507354d71d8013950a3a8b7a5a54"
-   dependencies:
--    acorn "^5.0.0"
--    acorn-dynamic-import "^2.0.0"
--    ajv "^4.7.0"
--    ajv-keywords "^1.1.1"
--    async "^2.1.2"
--    enhanced-resolve "^3.3.0"
--    interpret "^1.0.0"
--    json-loader "^0.5.4"
--    json5 "^0.5.1"
--    loader-runner "^2.3.0"
--    loader-utils "^0.2.16"
--    memory-fs "~0.4.1"
--    mkdirp "~0.5.0"
--    node-libs-browser "^2.0.0"
--    source-map "^0.5.3"
--    supports-color "^3.1.0"
--    tapable "~0.2.5"
--    uglify-js "^2.8.27"
--    watchpack "^1.3.1"
--    webpack-sources "^1.0.1"
--    yargs "^6.0.0"
-+    source-list-map "^2.0.0"
-+    source-map "~0.6.1"
-
--webpack@^3.10.0:
--  version "3.10.0"
--  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.10.0.tgz#5291b875078cf2abf42bdd23afe3f8f96c17d725"
-+webpack@^4.8.3:
-+  version "4.8.3"
-+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.8.3.tgz#957c8e80000f9e5cc03d775e78b472d8954f4eeb"
-   dependencies:
-+    "@webassemblyjs/ast" "1.4.3"
-+    "@webassemblyjs/wasm-edit" "1.4.3"
-+    "@webassemblyjs/wasm-parser" "1.4.3"
-     acorn "^5.0.0"
--    acorn-dynamic-import "^2.0.0"
--    ajv "^5.1.5"
--    ajv-keywords "^2.0.0"
--    async "^2.1.2"
--    enhanced-resolve "^3.4.0"
--    escope "^3.6.0"
--    interpret "^1.0.0"
--    json-loader "^0.5.4"
--    json5 "^0.5.1"
-+    acorn-dynamic-import "^3.0.0"
-+    ajv "^6.1.0"
-+    ajv-keywords "^3.1.0"
-+    chrome-trace-event "^0.1.1"
-+    enhanced-resolve "^4.0.0"
-+    eslint-scope "^3.7.1"
-     loader-runner "^2.3.0"
-     loader-utils "^1.1.0"
-     memory-fs "~0.4.1"
-+    micromatch "^3.1.8"
-     mkdirp "~0.5.0"
-+    neo-async "^2.5.0"
-     node-libs-browser "^2.0.0"
--    source-map "^0.5.3"
--    supports-color "^4.2.1"
--    tapable "^0.2.7"
--    uglifyjs-webpack-plugin "^0.4.6"
--    watchpack "^1.4.0"
-+    schema-utils "^0.4.4"
-+    tapable "^1.0.0"
-+    uglifyjs-webpack-plugin "^1.2.4"
-+    watchpack "^1.5.0"
-     webpack-sources "^1.0.1"
--    yargs "^8.0.2"
-
- wgxpath@~1.0.0:
-   version "1.0.0"
-@@ -7189,14 +7977,6 @@
-   dependencies:
-     string-width "^1.0.1"
-
--window-size@0.1.0:
--  version "0.1.0"
--  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
--
--wordwrap@0.0.2:
--  version "0.0.2"
--  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
--
- wordwrap@~0.0.2:
-   version "0.0.3"
-   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
-@@ -7212,6 +7992,12 @@
-     errno "^0.1.4"
-     xtend "^4.0.1"
-
-+worker-farm@^1.5.2:
-+  version "1.6.0"
-+  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0"
-+  dependencies:
-+    errno "~0.1.7"
-+
- wrap-ansi@^2.0.0:
-   version "2.1.0"
-   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
-@@ -7237,6 +8023,13 @@
-   dependencies:
-     mkdirp "^0.5.1"
-
-+ws@^4.0.0:
-+  version "4.1.0"
-+  resolved "https://registry.yarnpkg.com/ws/-/ws-4.1.0.tgz#a979b5d7d4da68bf54efe0408967c324869a7289"
-+  dependencies:
-+    async-limiter "~1.0.0"
-+    safe-buffer "~5.1.0"
-+
- xdg-basedir@^3.0.0:
-   version "3.0.0"
-   resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"
-@@ -7277,7 +8070,7 @@
-   version "0.1.27"
-   resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
-
--xtend@^4.0.0, xtend@^4.0.1:
-+xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
-   version "4.0.1"
-   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
-
-@@ -7298,15 +8091,17 @@
-   version "3.2.1"
-   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
-
-+y18n@^4.0.0:
-+  version "4.0.0"
-+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
-+
- yallist@^2.1.2:
-   version "2.1.2"
-   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
-
--yargs-parser@^4.2.0:
--  version "4.2.1"
--  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"
--  dependencies:
--    camelcase "^3.0.0"
-+yallist@^3.0.0, yallist@^3.0.2:
-+  version "3.0.2"
-+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
-
- yargs-parser@^5.0.0:
-   version "5.0.0"
-@@ -7314,18 +8109,6 @@
-   dependencies:
-     camelcase "^3.0.0"
-
--yargs-parser@^7.0.0:
--  version "7.0.0"
--  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
--  dependencies:
--    camelcase "^4.1.0"
--
--yargs-parser@^8.0.0:
--  version "8.0.0"
--  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-8.0.0.tgz#21d476330e5a82279a4b881345bf066102e219c6"
--  dependencies:
--    camelcase "^4.1.0"
--
- yargs-parser@^9.0.2:
-   version "9.0.2"
-   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"
-@@ -7349,24 +8132,6 @@
-     y18n "^3.2.1"
-     yargs-parser "^9.0.2"
-
--yargs@^6.0.0:
--  version "6.6.0"
--  resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
--  dependencies:
--    camelcase "^3.0.0"
--    cliui "^3.2.0"
--    decamelize "^1.1.1"
--    get-caller-file "^1.0.1"
--    os-locale "^1.4.0"
--    read-pkg-up "^1.0.1"
--    require-directory "^2.1.1"
--    require-main-filename "^1.0.1"
--    set-blocking "^2.0.0"
--    string-width "^1.0.2"
--    which-module "^1.0.0"
--    y18n "^3.2.1"
--    yargs-parser "^4.2.0"
--
- yargs@^7.0.0:
-   version "7.1.0"
-   resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
-@@ -7385,33 +8150,6 @@
-     y18n "^3.2.1"
-     yargs-parser "^5.0.0"
-
--yargs@^8.0.2:
--  version "8.0.2"
--  resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360"
--  dependencies:
--    camelcase "^4.1.0"
--    cliui "^3.2.0"
--    decamelize "^1.1.1"
--    get-caller-file "^1.0.1"
--    os-locale "^2.0.0"
--    read-pkg-up "^2.0.0"
--    require-directory "^2.1.1"
--    require-main-filename "^1.0.1"
--    set-blocking "^2.0.0"
--    string-width "^2.0.0"
--    which-module "^2.0.0"
--    y18n "^3.2.1"
--    yargs-parser "^7.0.0"
--
--yargs@~3.10.0:
--  version "3.10.0"
--  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
--  dependencies:
--    camelcase "^1.0.2"
--    cliui "^2.1.0"
--    decamelize "^1.0.0"
--    window-size "0.1.0"
--
- yauzl@2.4.1:
-   version "2.4.1"
-   resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz#9528f442dab1b2284e58b4379bb194e22e0c4005"
diff --git a/app/test/fixtures/merge-parser/failed-merge-stale-branch-into-master.txt b/app/test/fixtures/merge-parser/failed-merge-stale-branch-into-master.txt
deleted file mode 100644
index 4143e782258..00000000000
--- a/app/test/fixtures/merge-parser/failed-merge-stale-branch-into-master.txt
+++ /dev/null
@@ -1,434 +0,0 @@
-added in remote
-  their  100644 a309d474e0ebfbd83ab04a460c27dd2b8906c4e8 .eslintignore
-@@ -0,0 +1,3 @@
-+node_modules
-+app/node_modules/
-+script/changelog/node_modules
-\ No newline at end of file
-merged
-  result 100644 22724fb6c88b57702fe40d191883a455f70b01a1 .prettierignore
-  our    100644 d247d9a68070ec5848c5feb83bddbfab02adbb6c .prettierignore
-@@ -1,16 +1,17 @@
--out/
-+app/static/common
-+app/test/fixtures
- dist/
-+gemoji
- node_modules/
-+out/
-+
- npm-debug.log
- yarn-error.log
--app/node_modules/
-+
- .DS_Store
- .awcache
- .idea/
- .eslintcache
-
--app/static/common
--app/test/fixtures
--gemoji
- *.json
- *.md
-changed in both
-  base   100644 dc892d10739ef87c70391aedcfdc3241753eebbb package.json
-  our    100644 461f60af798d32097510dcd519c5cdd4b860771e package.json
-  their  100644 a230a49de70c920a24d34b1af9952a17b72e7a1c package.json
-@@ -10,6 +10,7 @@
-     "test:unit": "ts-node script/unit-tests.ts",
-     "test:script": "mocha -t 10000 --require ts-node/register script/changelog/test/*.ts",
-     "test": "yarn test:unit && yarn test:script && yarn test:integration",
-+<<<<<<< .our
-     "test:setup": "ts-node -P script/tsconfig.json script/test-setup.ts",
-     "test:review": "ts-node  -P script/tsconfig.json script/test-review.ts",
-     "postinstall": "cd app && yarn install --force && cd .. && git submodule update --recursive --init && yarn compile:tslint && yarn compile:script",
-@@ -19,6 +20,21 @@
-     "compile:prod": "cross-env NODE_ENV=production parallel-webpack --config app/webpack.production.ts",
-     "build:dev": "yarn compile:dev && cross-env NODE_ENV=development ts-node -P script/tsconfig.json script/build.ts",
-     "build:prod": "yarn compile:prod && cross-env NODE_ENV=production ts-node -P script/tsconfig.json script/build.ts",
-+=======
-+    "test:setup": "ts-node script/test-setup.ts",
-+    "test:review": "ts-node script/test-review.ts",
-+    "postinstall": "yarn install-app && yarn install-changelog && yarn update-submodules && yarn compile:tslint",
-+    "install-app": "cd app && yarn install --force && cd ..",
-+    "install-changelog": "cd script/changelog && yarn install && cd ../..",
-+    "update-submodules": "git submodule update --recursive --init",
-+    "start": "cross-env NODE_ENV=development node script/start",
-+    "start:prod": "cross-env NODE_ENV=production node script/start",
-+    "debug": "cross-env NODE_ENV=development node script/debug",
-+    "compile:dev": "cross-env NODE_ENV=development parallel-webpack --config app/webpack.development.js",
-+    "compile:prod": "cross-env NODE_ENV=production parallel-webpack --config app/webpack.production.js",
-+    "build:dev": "yarn compile:dev && cross-env NODE_ENV=development ts-node script/build.ts",
-+    "build:prod": "yarn compile:prod && cross-env NODE_ENV=production ts-node script/build.ts",
-+>>>>>>> .their
-     "package": "ts-node -P script/tsconfig.json script/package.ts",
-     "generate-octicons": "ts-node -P script/tsconfig.json script/generate-octicons.ts",
-     "clean:tslint": "rimraf tslint-rules/*.js",
-merged
-  result 100644 f723edfaa45b088c09cc8feef59b701e163fe639 script/changelog/api.ts
-  our    100644 9cd75d75226643dd9d12c9e42de23c33fdd44a8b script/changelog/api.ts
-@@ -1,60 +1,129 @@
--import * as HTTPS from 'https'
-+const octokit = require('@octokit/rest')({
-+  timeout: 0,
-+  requestMedia: 'application/vnd.github.v3+json',
-+  headers: {
-+    'User-Agent': 'what-the-changelog',
-+  },
-+})
-
--export interface IAPIPR {
-+export interface IDesktopPullRequest {
-   readonly title: string
-   readonly body: string
-+  readonly collaborators: ReadonlySet<string>
-+  readonly commits: ReadonlyArray<string>
- }
-
--type GraphQLResponse = {
--  readonly data: {
--    readonly repository: {
--      readonly pullRequest: IAPIPR
--    }
--  }
-+interface IAPIUser {
-+  readonly login: string
- }
-
--export function fetchPR(id: number): Promise<IAPIPR | null> {
--  return new Promise((resolve, reject) => {
--    const options: HTTPS.RequestOptions = {
--      host: 'api.github.com',
--      protocol: 'https:',
--      path: '/graphql',
--      method: 'POST',
--      headers: {
--        Authorization: `bearer ${process.env.GITHUB_ACCESS_TOKEN}`,
--        'User-Agent': 'what-the-changelog',
--      },
--    }
-+interface IAPIPullRequest {
-+  readonly title: string
-+  readonly body: string
-+  readonly user: IAPIUser
-+}
-+
-+interface IAPICommit {
-+  readonly sha: string
-+  readonly author?: IAPIUser
-+  readonly committer?: IAPIUser
-+}
-
--    const request = HTTPS.request(options, response => {
--      let received = ''
--      response.on('data', chunk => {
--        received += chunk
--      })
--
--      response.on('end', () => {
--        try {
--          const json: GraphQLResponse = JSON.parse(received)
--          const pr = json.data.repository.pullRequest
--          resolve(pr)
--        } catch (e) {
--          resolve(null)
--        }
--      })
-+interface IAPITeam {
-+  readonly name: string
-+  readonly id: number
-+}
-+
-+interface IAPITeamMember {
-+  readonly login: string
-+}
-+
-+// this account is assigned by GitHub as the committer for merged pull requests
-+// and should be excluded from being considered an external contributor
-+const webflowAccount = ['web-flow']
-+
-+export function initialize(token: string) {
-+  octokit.authenticate({
-+    type: 'token',
-+    token,
-+  })
-+}
-+
-+export async function getCoreTeamMembers(): Promise<ReadonlySet<string>> {
-+  try {
-+    let response = await octokit.orgs.getTeams({
-+      org: 'desktop',
-+      per_page: 100,
-     })
-+    const teams: ReadonlyArray<IAPITeam> = response.data
-+    const coreTeam = teams.find(t => t.name === 'Core') || null
-
--    const graphql = `
--{
--  repository(owner: "desktop", name: "desktop") {
--    pullRequest(number: ${id}) {
--      title
--      body
-+    if (coreTeam == null) {
-+      console.error('Unable to find core team on API')
-+      return new Set<string>()
-     }
-+
-+    const id = coreTeam.id
-+
-+    response = await octokit.orgs.getTeamMembers({
-+      id,
-+      role: 'all',
-+      per_page: 100,
-+    })
-+    const members: ReadonlyArray<IAPITeamMember> = response.data
-+
-+    return new Set(members.map(m => m.login).concat(webflowAccount))
-+  } catch (err) {
-+    console.error('API lookup failed for getCoreTeamMembers', err)
-+    return new Set<string>()
-   }
- }
--`
--    request.write(JSON.stringify({ query: graphql }))
-
--    request.end()
--  })
-+export async function fetchPR(id: number): Promise<IDesktopPullRequest | null> {
-+  try {
-+    const pullRequestResponse = await octokit.pullRequests.get({
-+      owner: 'desktop',
-+      repo: 'desktop',
-+      number: id,
-+    })
-+    const { title, body } = pullRequestResponse.data as IAPIPullRequest
-+
-+    let commitsResponse = await octokit.pullRequests.getCommits({
-+      owner: 'desktop',
-+      repo: 'desktop',
-+      number: id,
-+      per_page: 100,
-+    })
-+
-+    let data: Array<IAPICommit> = commitsResponse.data
-+    while (octokit.hasNextPage(commitsResponse)) {
-+      commitsResponse = await octokit.getNextPage(commitsResponse)
-+      data = data.concat(commitsResponse.data)
-+    }
-+
-+    const collaborators = new Set<string>()
-+    const commits = new Array<string>()
-+
-+    for (const commit of data) {
-+      const { sha, author, committer } = commit
-+
-+      commits.push(sha)
-+      if (author != null && !collaborators.has(author.login)) {
-+        collaborators.add(author.login)
-+      }
-+      if (committer != null && !collaborators.has(committer.login)) {
-+        collaborators.add(committer.login)
-+      }
-+    }
-+
-+    return {
-+      title: title,
-+      body: body,
-+      collaborators,
-+      commits,
-+    }
-+  } catch (err) {
-+    console.error('API lookup failed for fetchPR', err)
-+    return null
-+  }
- }
-added in remote
-  their  100644 2b223d9eca4c82f03969d8ca5d9d8a80a270a041 script/changelog/package.json
-@@ -0,0 +1,24 @@
-+{
-+  "name": "changelog",
-+  "repository": {
-+    "type": "git",
-+    "url": "https://github.com/desktop/desktop.git"
-+  },
-+  "description": "GitHub Desktop changelog dependencies",
-+  "author": {
-+    "name": "GitHub, Inc.",
-+    "email": "opensource+desktop@github.com",
-+    "url": "https://desktop.github.com/"
-+  },
-+  "license": "MIT",
-+  "engines": {
-+    "node": ">= 7",
-+    "yarn": ">= 1.2.0"
-+  },
-+  "dependencies": {
-+    "@octokit/rest": "^14.0.8",
-+    "listify": "^1.0.0"
-+  },
-+  "devDependencies": {
-+  }
-+}
-changed in both
-  base   100644 b0a88cf77391d915e28566a1695cbf31c2ab7bbb script/changelog/parser.ts
-  our    100644 aad3c838c2d7931127adbc843bdd83ccda5968a1 script/changelog/parser.ts
-  their  100644 ff08e0ef253ffb980b0ed57114f9fefea05d7fc1 script/changelog/parser.ts
-@@ -2,10 +2,11 @@
- import * as Fs from 'fs'
- import { gt as greaterThan } from 'semver'
-
--import { fetchPR, IAPIPR } from './api'
-+import { fetchPR, IDesktopPullRequest } from './api'
-+
-+const listify: (values: Array<any>) => string = require('listify')
-
- const PlaceholderChangeType = '???'
--const OfficialOwner = 'desktop'
-
- interface IParsedCommit {
-   readonly prID: number
-@@ -53,7 +54,11 @@
-   return issueRef
- }
-
--function getChangelogEntry(commit: IParsedCommit, pr: IAPIPR): string {
-+function getChangelogEntry(
-+  commit: IParsedCommit,
-+  pr: IDesktopPullRequest,
-+  externalContributors: ReadonlySet<string>
-+): string {
-   let type = PlaceholderChangeType
-   const description = capitalized(pr.title)
-
-@@ -66,15 +71,19 @@
-   }
-
-   let attribution = ''
--  if (commit.owner !== OfficialOwner) {
--    attribution = `. Thanks @${commit.owner}!`
-+
-+  if (externalContributors.size > 0) {
-+    const mentions = [...externalContributors].map(c => `@${c}`)
-+    const combinedMentions = listify(mentions)
-+    attribution = `. Thanks ${combinedMentions}!`
-   }
-
-   return `[${type}] ${description} -${issueRef}${attribution}`
- }
-
- export async function convertToChangelogFormat(
--  lines: ReadonlyArray<string>
-+  lines: ReadonlyArray<string>,
-+  coreMembers: ReadonlySet<string>
- ): Promise<ReadonlyArray<string>> {
-   const entries = []
-   for (const line of lines) {
-@@ -85,7 +94,13 @@
-         throw new Error(`Unable to get PR from API: ${commit.prID}`)
-       }
-
--      const entry = getChangelogEntry(commit, pr)
-+      const collaborators = pr.collaborators
-+
-+      const externalContributors = new Set(
-+        [...collaborators].filter(c => !coreMembers.has(c))
-+      )
-+
-+      const entry = getChangelogEntry(commit, pr, externalContributors)
-       entries.push(entry)
-     } catch (e) {
-       console.warn('Unable to parse line, using the full message.', e)
-merged
-  result 100644 8259a4c42f949aa6b07249546bddad9e5a341816 script/changelog/run.ts
-  our    100644 d324476ff6f0b766693c2b4c2aa8656852a3a4f8 script/changelog/run.ts
-@@ -1,4 +1,5 @@
- import { spawn } from './spawn'
-+import { getCoreTeamMembers } from './api'
- import { getLogLines } from './git'
- import { convertToChangelogFormat } from './parser'
- import { sort as semverSort } from 'semver'
-@@ -47,7 +48,8 @@
-     )
-   }
-
-+  const coreMembers = await getCoreTeamMembers()
-   const lines = await getLogLines(previousVersion)
--  const changelogEntries = await convertToChangelogFormat(lines)
-+  const changelogEntries = await convertToChangelogFormat(lines, coreMembers)
-   console.log(jsonStringify(changelogEntries))
- }
-added in remote
-  their  100644 05d54aba4df2a44bee37177eebc9e559e391e602 script/changelog/yarn.lock
-@@ -0,0 +1,48 @@
-+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-+# yarn lockfile v1
-+
-+
-+"@octokit/rest@^14.0.8":
-+  version "14.0.9"
-+  resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-14.0.9.tgz#d5e0a00dcb78901dd7b2ef852acfc0aea7c479ef"
-+  dependencies:
-+    before-after-hook "^1.1.0"
-+    debug "^3.1.0"
-+    is-array-buffer "^1.0.0"
-+    is-stream "^1.1.0"
-+    lodash "^4.17.4"
-+    url-template "^2.0.8"
-+
-+before-after-hook@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-1.1.0.tgz#83165e15a59460d13702cb8febd6a1807896db5a"
-+
-+debug@^3.1.0:
-+  version "3.1.0"
-+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-+  dependencies:
-+    ms "2.0.0"
-+
-+is-array-buffer@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-1.0.0.tgz#f32497a0509d109423f472003f98bab6a8ea34cb"
-+
-+is-stream@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-+
-+listify@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/listify/-/listify-1.0.0.tgz#03ca7ba2d150d4267773f74e57558d1053d2bee3"
-+
-+lodash@^4.17.4:
-+  version "4.17.5"
-+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
-+
-+ms@2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-+
-+url-template@^2.0.8:
-+  version "2.0.8"
-+  resolved "https://registry.yarnpkg.com/url-template/-/url-template-2.0.8.tgz#fc565a3cccbff7730c775f5641f9555791439f21"
-merged
-  result 100644 bcb2b3c76a15cdcae1cdb7f5d26d02e9e8ce9935 script/draft-release/run.ts
-  our    100644 c017ace71061eb0f6db7f42290cb63cca40ab5cb script/draft-release/run.ts
-@@ -6,6 +6,7 @@
-   convertToChangelogFormat,
-   getChangelogEntriesSince,
- } from '../changelog/parser'
-+import { getCoreTeamMembers, initialize } from '../changelog/api'
-
- import { Channel } from './channel'
- import { getNextVersionNumber } from './version'
-@@ -88,7 +89,10 @@
-   if (noChangesFound) {
-     printInstructions(nextVersion, [])
-   } else {
--    const changelogEntries = await convertToChangelogFormat(lines)
-+    initialize(process.env.GITHUB_ACCESS_TOKEN)
-+
-+    const coreMembers = await getCoreTeamMembers()
-+    const changelogEntries = await convertToChangelogFormat(lines, coreMembers)
-
-     console.log("Here's what you should do next:\n")
-
diff --git a/app/test/fixtures/merge-parser/valid-merge-master-into-script-upgrade.txt b/app/test/fixtures/merge-parser/valid-merge-master-into-script-upgrade.txt
deleted file mode 100644
index 682e9872f4f..00000000000
--- a/app/test/fixtures/merge-parser/valid-merge-master-into-script-upgrade.txt
+++ /dev/null
@@ -1,903 +0,0 @@
-merged
-  result 100644 b5349c7c5e60dd396af3a4977b0684bcd69d7cfe app/package.json
-  our    100644 530138f765a7c89ac3e0b31cc78047926364323a app/package.json
-@@ -3,7 +3,7 @@
-   "productName": "GitHub Desktop",
-   "bundleID": "com.github.GitHubClient",
-   "companyName": "GitHub, Inc.",
--  "version": "1.1.2-beta6",
-+  "version": "1.1.2-beta7",
-   "main": "./main.js",
-   "repository": {
-     "type": "git",
-merged
-  result 100644 2f9cf6d58beb7abf74b241c52c4deed1155c7e98 app/src/lib/app-state.ts
-  our    100644 5382e869682845ac92aee17c4ebcb0609749ab88 app/src/lib/app-state.ts
-@@ -318,11 +318,18 @@
-   | { type: FoldoutType.AddMenu }
-   | AppMenuFoldout
- 
--export enum RepositorySection {
-+export enum RepositorySectionTab {
-   Changes,
-   History,
- }
- 
-+export type RepositorySection =
-+  | { selectedTab: RepositorySectionTab.Changes }
-+  | {
-+      selectedTab: RepositorySectionTab.History
-+      shouldFocusBranchList?: boolean
-+    }
-+
- export interface IRepositoryState {
-   readonly historyState: IHistoryState
-   readonly changesState: IChangesState
-merged
-  result 100644 22b6ea7eef95cb48385e88add7643839925d07c4 app/src/lib/menu-update.ts
-  our    100644 3db472be9c029edd019dbe29d8dfebda25fdb6e3 app/src/lib/menu-update.ts
-@@ -104,7 +104,7 @@
-   'update-branch',
-   'merge-branch',
-   'view-repository-on-github',
--  'compare-branch',
-+  'compare-on-github',
-   'open-in-shell',
-   'push',
-   'pull',
-@@ -200,6 +200,7 @@
-     'show-history',
-     'show-branches-list',
-     'open-external-editor',
-+    'compare-to-branch',
-   ]
- 
-   const menuStateBuilder = new MenuStateBuilder()
-@@ -227,7 +228,7 @@
-     )
-     menuStateBuilder.setEnabled('merge-branch', onBranch)
-     menuStateBuilder.setEnabled(
--      'compare-branch',
-+      'compare-on-github',
-       isHostedOnGitHub && hasPublishedBranch
-     )
- 
-@@ -278,10 +279,10 @@
-     menuStateBuilder.disable('delete-branch')
-     menuStateBuilder.disable('update-branch')
-     menuStateBuilder.disable('merge-branch')
--    menuStateBuilder.disable('compare-branch')
- 
-     menuStateBuilder.disable('push')
-     menuStateBuilder.disable('pull')
-+    menuStateBuilder.disable('compare-to-branch')
-   }
-   return menuStateBuilder
- }
-merged
-  result 100644 4cee841bc4c314fa326fcd00d2a037b661073822 app/src/lib/stores/app-store.ts
-  our    100644 3664497681402ef660531130f999ac3e39892b4d app/src/lib/stores/app-store.ts
-@@ -3,7 +3,7 @@
-   IRepositoryState,
-   IHistoryState,
-   IAppState,
--  RepositorySection,
-+  RepositorySectionTab,
-   IChangesState,
-   Popup,
-   PopupType,
-@@ -23,6 +23,7 @@
-   CompareActionKind,
-   IDisplayHistory,
-   ICompareBranch,
-+  RepositorySection,
- } from '../app-state'
- import { Account } from '../../models/account'
- import { Repository } from '../../models/repository'
-@@ -421,7 +422,7 @@
-         coAuthors: [],
-         showCoAuthoredBy: false,
-       },
--      selectedSection: RepositorySection.Changes,
-+      selectedSection: { selectedTab: RepositorySectionTab.Changes },
-       branchesState: {
-         tip: { kind: TipState.Unknown },
-         defaultBranch: null,
-@@ -1486,9 +1487,9 @@
-     this.updateRepositoryState(repository, state => ({ selectedSection }))
-     this.emitUpdate()
- 
--    if (selectedSection === RepositorySection.History) {
-+    if (selectedSection.selectedTab === RepositorySectionTab.History) {
-       return this.refreshHistorySection(repository)
--    } else if (selectedSection === RepositorySection.Changes) {
-+    } else if (selectedSection.selectedTab === RepositorySectionTab.Changes) {
-       return this.refreshChangesSection(repository, {
-         includingStatus: true,
-         clearPartialState: false,
-@@ -1728,9 +1729,9 @@
-     const section = state.selectedSection
-     let refreshSectionPromise: Promise<void>
- 
--    if (section === RepositorySection.History) {
-+    if (section.selectedTab === RepositorySectionTab.History) {
-       refreshSectionPromise = this.refreshHistorySection(repository)
--    } else if (section === RepositorySection.Changes) {
-+    } else if (section.selectedTab === RepositorySectionTab.Changes) {
-       refreshSectionPromise = this.refreshChangesSection(repository, {
-         includingStatus: false,
-         clearPartialState: false,
-merged
-  result 100644 dff54e1df436eca06f803e56a2c700192a68c1cf app/src/main-process/menu/build-default-menu.ts
-  our    100644 f73c46b1ab5a571eba85dca0885ad2caf0d05e0d app/src/main-process/menu/build-default-menu.ts
-@@ -6,6 +6,7 @@
- 
- import { log } from '../log'
- import { openDirectorySafe } from '../shell'
-+import { enableCompareSidebar } from '../../lib/feature-flag'
- 
- const defaultEditorLabel = __DARWIN__
-   ? 'Open in External Editor'
-@@ -289,6 +290,13 @@
-         click: emit('update-branch'),
-       },
-       {
-+        label: __DARWIN__ ? 'Compare to Branch' : '&Compare to branch',
-+        id: 'compare-to-branch',
-+        accelerator: 'CmdOrCtrl+Shift+B',
-+        click: emit('compare-to-branch'),
-+        visible: enableCompareSidebar(),
-+      },
-+      {
-         label: __DARWIN__
-           ? 'Merge Into Current Branch…'
-           : '&Merge into current branch…',
-@@ -298,10 +306,10 @@
-       },
-       separator,
-       {
--        label: __DARWIN__ ? 'Compare on GitHub' : '&Compare on GitHub',
--        id: 'compare-branch',
-+        label: __DARWIN__ ? 'Compare on GitHub' : 'Compare on &GitHub',
-+        id: 'compare-on-github',
-         accelerator: 'CmdOrCtrl+Shift+C',
--        click: emit('compare-branch'),
-+        click: emit('compare-on-github'),
-       },
-       {
-         label: pullRequestLabel,
-merged
-  result 100644 8cc13deea5f3f8d74873101c9081ecbe276096a8 app/src/main-process/menu/menu-event.ts
-  our    100644 8e175de4d092b861c197b0cc4ac15be0e32a406f app/src/main-process/menu/menu-event.ts
-@@ -14,10 +14,11 @@
-   | 'choose-repository'
-   | 'open-working-directory'
-   | 'update-branch'
-+  | 'compare-to-branch'
-   | 'merge-branch'
-   | 'show-repository-settings'
-   | 'open-in-shell'
--  | 'compare-branch'
-+  | 'compare-on-github'
-   | 'view-repository-on-github'
-   | 'clone-repository'
-   | 'show-about'
-merged
-  result 100644 b920b03154f5bd06aee18172e0dcdb18d5bfe473 app/src/main-process/menu/menu-ids.ts
-  our    100644 5b579fb99a93d40f063d3a027effd7171e24584d app/src/main-process/menu/menu-ids.ts
-@@ -5,7 +5,7 @@
-   | 'update-branch'
-   | 'merge-branch'
-   | 'view-repository-on-github'
--  | 'compare-branch'
-+  | 'compare-on-github'
-   | 'open-in-shell'
-   | 'push'
-   | 'pull'
-@@ -25,3 +25,4 @@
-   | 'clone-repository'
-   | 'about'
-   | 'create-pull-request'
-+  | 'compare-to-branch'
-merged
-  result 100644 f16d51fe525218882768fff0889dc5f8079e04b3 app/src/ui/app.tsx
-  our    100644 c80c3d7daa71f7643b743afb65e5d6fa4297adfe app/src/ui/app.tsx
-@@ -4,7 +4,7 @@
- 
- import {
-   IAppState,
--  RepositorySection,
-+  RepositorySectionTab,
-   Popup,
-   PopupType,
-   FoldoutType,
-@@ -270,6 +270,9 @@
-         this.props.dispatcher.recordMenuInitiatedUpdate()
-         return this.updateBranch()
-       }
-+      case 'compare-to-branch': {
-+        return this.showHistory(true)
-+      }
-       case 'merge-branch': {
-         this.props.dispatcher.recordMenuInitiatedMerge()
-         return this.mergeBranch()
-@@ -278,8 +281,8 @@
-         return this.showRepositorySettings()
-       case 'view-repository-on-github':
-         return this.viewRepositoryOnGitHub()
--      case 'compare-branch':
--        return this.compareBranch()
-+      case 'compare-on-github':
-+        return this.compareBranchOnDotcom()
-       case 'open-in-shell':
-         return this.openCurrentRepositoryInShell()
-       case 'clone-repository':
-@@ -385,7 +388,7 @@
-     })
-   }
- 
--  private compareBranch() {
-+  private compareBranchOnDotcom() {
-     const htmlURL = this.getCurrentRepositoryGitHubURL()
-     if (!htmlURL) {
-       return
-@@ -486,30 +489,30 @@
-     this.props.dispatcher.showPopup({ type: PopupType.About })
-   }
- 
--  private createCommit() {
-+  private showHistory(shouldFocusBranchList: boolean = false) {
-     const state = this.state.selectedState
-     if (state == null || state.type !== SelectionType.Repository) {
-       return
-     }
- 
-     this.props.dispatcher.closeCurrentFoldout()
--    this.props.dispatcher.changeRepositorySection(
--      state.repository,
--      RepositorySection.Changes
--    )
-+
-+    this.props.dispatcher.changeRepositorySection(state.repository, {
-+      selectedTab: RepositorySectionTab.History,
-+      shouldFocusBranchList,
-+    })
-   }
- 
--  private showHistory() {
-+  private createCommit() {
-     const state = this.state.selectedState
-     if (state == null || state.type !== SelectionType.Repository) {
-       return
-     }
- 
-     this.props.dispatcher.closeCurrentFoldout()
--    this.props.dispatcher.changeRepositorySection(
--      state.repository,
--      RepositorySection.History
--    )
-+    this.props.dispatcher.changeRepositorySection(state.repository, {
-+      selectedTab: RepositorySectionTab.Changes,
-+    })
-   }
- 
-   private chooseRepository() {
-merged
-  result 100644 5767695ddcbb64acdff6868a158f8ee6f1ae7795 app/src/ui/branches/branch-list-item.tsx
-  our    100644 5ce11ddd900487909cec10cb7abff7d498a3ecac app/src/ui/branches/branch-list-item.tsx
-@@ -1,12 +1,19 @@
- import * as React from 'react'
- import * as moment from 'moment'
-+import * as classNames from 'classnames'
- 
--import { Octicon, OcticonSymbol } from '../octicons'
-+import { Branch } from '../../models/branch'
-+
-+import { IMenuItem } from '../../lib/menu-item'
- import { HighlightText } from '../lib/highlight-text'
- 
-+import { showContextualMenu } from '../main-process-proxy'
-+import { Octicon, OcticonSymbol } from '../octicons'
-+import { enableCompareSidebar } from '../../lib/feature-flag'
-+
- interface IBranchListItemProps {
-   /** The name of the branch */
--  readonly name: string
-+  readonly branch: Branch
- 
-   /** Specifies whether this item is currently selected */
-   readonly isCurrentBranch: boolean
-@@ -16,29 +23,84 @@
- 
-   /** The characters in the branch name to highlight */
-   readonly matches: ReadonlyArray<number>
--}
- 
-+  /**
-+   * Callback to fire when the user wants to compare to this branch.
-+   *
-+   * If this is not specified, kebab element will not be rendered.
-+   */
-+  readonly onCompareToBranch?: (branch: Branch) => void
-+}
- /** The branch component. */
- export class BranchListItem extends React.Component<IBranchListItemProps, {}> {
-+  private onContextMenu = (event: React.MouseEvent<any>) => {
-+    event.preventDefault()
-+    event.stopPropagation()
-+
-+    const items: IMenuItem[] = [
-+      {
-+        label: 'Compare to this branch',
-+        action: () => {
-+          if (this.props.onCompareToBranch) {
-+            this.props.onCompareToBranch(this.props.branch)
-+          }
-+        },
-+      },
-+    ]
-+
-+    showContextualMenu(items)
-+  }
-+
-+  private renderKebab = (lastCommitDate: Date | null, infoTitle: string) => {
-+    if (this.props.onCompareToBranch == null) {
-+      return null
-+    }
-+
-+    if (!enableCompareSidebar()) {
-+      return null
-+    }
-+
-+    return (
-+      <div className="branches-list-item-menu" title={infoTitle}>
-+        <div className="branch-menu-wrapper" onClick={this.onContextMenu}>
-+          <Octicon symbol={OcticonSymbol.kebabHorizontal} />
-+        </div>
-+      </div>
-+    )
-+  }
-+
-   public render() {
-     const lastCommitDate = this.props.lastCommitDate
-     const isCurrentBranch = this.props.isCurrentBranch
--    const name = this.props.name
-+    const name = this.props.branch.name
- 
-     const date = lastCommitDate ? moment(lastCommitDate).fromNow() : ''
-     const icon = isCurrentBranch ? OcticonSymbol.check : OcticonSymbol.gitBranch
-     const infoTitle = isCurrentBranch
-       ? 'Current branch'
-       : lastCommitDate ? lastCommitDate.toString() : ''
-+
-+    const enableKebabEffect =
-+      enableCompareSidebar() &&
-+      !isCurrentBranch &&
-+      this.props.onCompareToBranch != null
-+
-+    const className = classNames('branches-list-item', {
-+      'kebab-effect': enableKebabEffect,
-+    })
-+
-     return (
--      <div className="branches-list-item">
-+      <div className={className}>
-         <Octicon className="icon" symbol={icon} />
-         <div className="name" title={name}>
-           <HighlightText text={name} highlight={this.props.matches} />
-         </div>
-+
-         <div className="description" title={infoTitle}>
-           {date}
-         </div>
-+
-+        {this.renderKebab(lastCommitDate, infoTitle)}
-       </div>
-     )
-   }
-merged
-  result 100644 292ba973e860f3355a07d5e065c48375de1c310b app/src/ui/branches/branch-renderer.tsx
-  our    100644 f42659ed79888d2c70f22251464d169c46333d83 app/src/ui/branches/branch-renderer.tsx
-@@ -8,17 +8,19 @@
- export function renderDefaultBranch(
-   item: IBranchListItem,
-   matches: ReadonlyArray<number>,
--  currentBranch: Branch | null
-+  currentBranch: Branch | null,
-+  onCompareToBranch?: (branch: Branch) => void
- ): JSX.Element {
-   const branch = item.branch
-   const commit = branch.tip
-   const currentBranchName = currentBranch ? currentBranch.name : null
-   return (
-     <BranchListItem
--      name={branch.name}
-+      branch={branch}
-       isCurrentBranch={branch.name === currentBranchName}
-       lastCommitDate={commit ? commit.author.date : null}
-       matches={matches}
-+      onCompareToBranch={onCompareToBranch}
-     />
-   )
- }
-merged
-  result 100644 5d911045738fda18f7ba387bee8506a1636956bc app/src/ui/branches/branches-container.tsx
-  our    100644 f08de18102ffb24add928e0ce726b0a8fdd7457b app/src/ui/branches/branches-container.tsx
-@@ -7,7 +7,13 @@
- import { BranchesTab } from '../../models/branches-tab'
- 
- import { Dispatcher } from '../../lib/dispatcher'
--import { FoldoutType, PopupType } from '../../lib/app-state'
-+import {
-+  FoldoutType,
-+  PopupType,
-+  CompareActionKind,
-+  ComparisonView,
-+  RepositorySectionTab,
-+} from '../../lib/app-state'
- import { assertNever } from '../../lib/fatal-error'
- 
- import { TabBar } from '../tab-bar'
-@@ -97,11 +103,28 @@
-     )
-   }
- 
-+  private onCompareToBranch = async (branch: Branch) => {
-+    await this.props.dispatcher.initializeCompare(this.props.repository, {
-+      kind: CompareActionKind.Branch,
-+      branch,
-+      mode: ComparisonView.Behind,
-+    })
-+    await this.props.dispatcher.changeRepositorySection(this.props.repository, {
-+      selectedTab: RepositorySectionTab.History,
-+    })
-+    await this.props.dispatcher.closeFoldout(FoldoutType.Branch)
-+  }
-+
-   private renderBranch = (
-     item: IBranchListItem,
-     matches: ReadonlyArray<number>
-   ) => {
--    return renderDefaultBranch(item, matches, this.props.currentBranch)
-+    return renderDefaultBranch(
-+      item,
-+      matches,
-+      this.props.currentBranch,
-+      this.onCompareToBranch
-+    )
-   }
- 
-   private renderSelectedTab() {
-merged
-  result 100644 7847e0708feff2e0a3104e0f98840da2944919df app/src/ui/history/compare.tsx
-  our    100644 353aec44fd01563221794684d9c30fa54019686d app/src/ui/history/compare.tsx
-@@ -33,6 +33,11 @@
-   readonly dispatcher: Dispatcher
-   readonly currentBranch: Branch | null
-   readonly sidebarHasFocusWithin: boolean
-+
-+  /**
-+   * Shows the branch list when the component is loaded
-+   */
-+  readonly initialShowBranchList: boolean
-   readonly onRevertCommit: (commit: Commit) => void
-   readonly onViewCommitOnGitHub: (sha: string) => void
- }
-@@ -63,10 +68,17 @@
-   public constructor(props: ICompareSidebarProps) {
-     super(props)
- 
-+    const formState = props.compareState.formState
-+
-+    const filterText =
-+      formState.kind === ComparisonView.None
-+        ? ''
-+        : formState.comparisonBranch.name
-+
-     this.state = {
-       focusedBranch: null,
--      filterText: '',
--      showBranchList: false,
-+      filterText,
-+      showBranchList: props.initialShowBranchList,
-       selectedCommit: null,
-     }
-   }
-@@ -84,7 +96,7 @@
-       return
-     }
- 
--    if (!hasFormStateChanged && newFormState.kind !== ComparisonView.None) {
-+    if (newFormState.kind !== ComparisonView.None) {
-       // ensure the filter text is in sync with the comparison branch
-       const branch = newFormState.comparisonBranch
- 
-@@ -132,6 +144,7 @@
-             onRef={this.onTextBoxRef}
-             onValueChanged={this.onBranchFilterTextChanged}
-             onKeyDown={this.onBranchFilterKeyDown}
-+            onSearchCleared={this.onSearchCleared}
-           />
-         </div>
- 
-@@ -142,6 +155,10 @@
-     )
-   }
- 
-+  private onSearchCleared = () => {
-+    this.handleEscape()
-+  }
-+
-   private onBranchesListRef = (branchList: BranchList | null) => {
-     this.branchList = branchList
-   }
-@@ -273,7 +290,8 @@
-         <div className="merge-message">
-           This will merge
-           <strong>{` ${count} ${pluralized}`}</strong>
--          {` `}from{` `}
-+          <br />
-+          from{` `}
-           <strong>{branch.name}</strong>
-           {` `}into{` `}
-           <strong>{currentBranch.name}</strong>
-merged
-  result 100644 ad88a9b7996ea014994a13b187e2752d883ef61a app/src/ui/index.tsx
-  our    100644 e09719d3d34c3169bd68c26a84f6b7040c4d34a1 app/src/ui/index.tsx
-@@ -50,6 +50,7 @@
-   enableSourceMaps,
-   withSourceMappedStack,
- } from '../lib/source-map-support'
-+import { enableCompareSidebar } from '../lib/feature-flag'
- 
- if (__DEV__) {
-   installDevGlobals()
-@@ -139,7 +140,9 @@
- dispatcher.registerErrorHandler(upstreamAlreadyExistsHandler)
- dispatcher.registerErrorHandler(externalEditorErrorHandler)
- dispatcher.registerErrorHandler(openShellErrorHandler)
--dispatcher.registerErrorHandler(mergeConflictHandler)
-+if (enableCompareSidebar()) {
-+  dispatcher.registerErrorHandler(mergeConflictHandler)
-+}
- dispatcher.registerErrorHandler(lfsAttributeMismatchHandler)
- dispatcher.registerErrorHandler(gitAuthenticationErrorHandler)
- dispatcher.registerErrorHandler(pushNeedsPullHandler)
-merged
-  result 100644 7e0e709f0e2c042f8e122480dc6f4a05460633d4 app/src/ui/lib/fancy-text-box.tsx
-  our    100644 6df9115db9a0aeacd505b2fb8240433391229e3c app/src/ui/lib/fancy-text-box.tsx
-@@ -47,6 +47,7 @@
-           placeholder={this.props.placeholder}
-           onKeyDown={this.props.onKeyDown}
-           onValueChanged={this.props.onValueChanged}
-+          onSearchCleared={this.props.onSearchCleared}
-           tabIndex={this.props.tabIndex}
-           ref={this.props.onRef}
-         />
-merged
-  result 100644 a7340d5ff2ec3d5eb79dfe531a6dbce60eb7ab03 app/src/ui/lib/filter-list.tsx
-  our    100644 77cee6a28a6f7a75649844e1af52c5598547e633 app/src/ui/lib/filter-list.tsx
-@@ -244,19 +244,25 @@
-   }
- 
-   public selectFirstItem(focus: boolean = false) {
--    if (this.list !== null) {
--      const next = findNextSelectableRow(this.state.rows.length, {
-+    if (this.list === null) {
-+      return
-+    }
-+
-+    const next = findNextSelectableRow(
-+      this.state.rows.length,
-+      {
-         direction: 'down',
-         row: -1,
--      })
--
--      if (next !== null) {
--        this.setState({ selectedRow: next })
--      }
-+      },
-+      this.canSelectRow
-+    )
- 
--      if (focus) {
--        this.list.focus()
--      }
-+    if (next !== null) {
-+      this.setState({ selectedRow: next }, () => {
-+        if (focus && this.list !== null) {
-+          this.list.focus()
-+        }
-+      })
-     }
-   }
- 
-merged
-  result 100644 d99f339f0d967a2ba0f2d644345ead21bc38e5ba app/src/ui/lib/text-box.tsx
-  our    100644 66bfac13bd43aaa38cac461cd0a48bd47c66fa29 app/src/ui/lib/text-box.tsx
-@@ -84,6 +84,11 @@
-    * Callback used when the component loses focus.
-    */
-   readonly onBlur?: () => void
-+
-+  /**
-+   * Callback used when the user has cleared the search text.
-+   */
-+  readonly onSearchCleared?: () => void
- }
- 
- interface ITextBoxState {
-@@ -162,8 +167,33 @@
-     })
-   }
- 
-+  private onSearchTextCleared = () => {
-+    if (this.props.onSearchCleared != null) {
-+      this.props.onSearchCleared()
-+    }
-+  }
-+
-+  /**
-+   * The search event here is a Chrome and Safari specific event that is
-+   * only reported for input[type=search] elements.
-+   *
-+   * Source: http://help.dottoro.com/ljdvxmhr.php
-+   *
-+   * TODO: can we hook into the warning API of React to report on incorrect usage
-+   * when you set a `onSearchCleared` callback prop but don't use a `type=search`
-+   * input - because this won't set an event handler.
-+   *
-+   */
-   private onInputRef = (element: HTMLInputElement | null) => {
-+    if (this.inputElement != null && this.props.type === 'search') {
-+      this.inputElement.removeEventListener('search', this.onSearchTextCleared)
-+    }
-+
-     this.inputElement = element
-+
-+    if (this.inputElement != null && this.props.type === 'search') {
-+      this.inputElement.addEventListener('search', this.onSearchTextCleared)
-+    }
-   }
- 
-   private renderLabelLink() {
-merged
-  result 100644 a3b6556013c00f4521932e03bf32044fc404eb9c app/src/ui/merge-conflicts/merge-conflicts-warning.tsx
-  our    100644 fc7cf8351657a4d7be73ce9248306c414d5ddbb3 app/src/ui/merge-conflicts/merge-conflicts-warning.tsx
-@@ -3,7 +3,7 @@
- import { ButtonGroup } from '../lib/button-group'
- import { Dialog, DialogContent, DialogFooter } from '../dialog'
- import { Dispatcher } from '../../lib/dispatcher'
--import { RepositorySection } from '../../lib/app-state'
-+import { RepositorySectionTab } from '../../lib/app-state'
- import { Repository } from '../../models/repository'
- 
- interface IMergeConflictsWarningProps {
-@@ -17,10 +17,9 @@
-   {}
- > {
-   private onSubmit = () => {
--    this.props.dispatcher.changeRepositorySection(
--      this.props.repository,
--      RepositorySection.Changes
--    )
-+    this.props.dispatcher.changeRepositorySection(this.props.repository, {
-+      selectedTab: RepositorySectionTab.Changes,
-+    })
-     this.props.onDismissed()
-   }
- 
-merged
-  result 100644 530e5ec3069faa47bceabedc36bce50656b2c4d3 app/src/ui/repository.tsx
-  our    100644 0148c3c16e7f2c3b26a1e7b674f3ceb6d438a34b app/src/ui/repository.tsx
-@@ -11,8 +11,9 @@
- import { TabBar } from './tab-bar'
- import {
-   IRepositoryState,
--  RepositorySection,
-+  RepositorySectionTab,
-   ImageDiffType,
-+  RepositorySection,
- } from '../lib/app-state'
- import { Dispatcher } from '../lib/dispatcher'
- import { IssuesStore, GitHubUserStore } from '../lib/stores'
-@@ -76,7 +77,8 @@
-     const hasChanges =
-       this.props.state.changesState.workingDirectory.files.length > 0
-     const selectedTab =
--      this.props.state.selectedSection === RepositorySection.Changes
-+      this.props.state.selectedSection.selectedTab ===
-+      RepositorySectionTab.Changes
-         ? Tab.Changes
-         : Tab.History
- 
-@@ -155,6 +157,11 @@
-   private renderCompareSidebar(): JSX.Element {
-     const tip = this.props.state.branchesState.tip
-     const currentBranch = tip.kind === TipState.Valid ? tip.branch : null
-+    const selectedSection = this.props.state.selectedSection
-+    const focusBranchSelector =
-+      selectedSection.selectedTab === RepositorySectionTab.History
-+        ? selectedSection.shouldFocusBranchList || false
-+        : false
- 
-     return (
-       <CompareSidebar
-@@ -169,6 +176,7 @@
-         onRevertCommit={this.onRevertCommit}
-         onViewCommitOnGitHub={this.props.onViewCommitOnGitHub}
-         sidebarHasFocusWithin={this.state.sidebarHasFocusWithin}
-+        initialShowBranchList={focusBranchSelector}
-       />
-     )
-   }
-@@ -176,9 +184,9 @@
-   private renderSidebarContents(): JSX.Element {
-     const selectedSection = this.props.state.selectedSection
- 
--    if (selectedSection === RepositorySection.Changes) {
-+    if (selectedSection.selectedTab === RepositorySectionTab.Changes) {
-       return this.renderChangesSidebar()
--    } else if (selectedSection === RepositorySection.History) {
-+    } else if (selectedSection.selectedTab === RepositorySectionTab.History) {
-       return enableCompareSidebar()
-         ? this.renderCompareSidebar()
-         : this.renderHistorySidebar()
-@@ -220,7 +228,7 @@
-   private renderContent(): JSX.Element | null {
-     const selectedSection = this.props.state.selectedSection
- 
--    if (selectedSection === RepositorySection.Changes) {
-+    if (selectedSection.selectedTab === RepositorySectionTab.Changes) {
-       const changesState = this.props.state.changesState
-       const selectedFileIDs = changesState.selectedFileIDs
- 
-@@ -252,7 +260,7 @@
-           />
-         )
-       }
--    } else if (selectedSection === RepositorySection.History) {
-+    } else if (selectedSection.selectedTab === RepositorySectionTab.History) {
-       return (
-         <History
-           repository={this.props.repository}
-@@ -290,10 +298,14 @@
-     // about the shift key here, we can get away with that as long
-     // as there's only two tabs.
-     if (e.ctrlKey && e.key === 'Tab') {
--      const section =
--        this.props.state.selectedSection === RepositorySection.History
--          ? RepositorySection.Changes
--          : RepositorySection.History
-+      const section: RepositorySection =
-+        this.props.state.selectedSection.selectedTab ===
-+        RepositorySectionTab.History
-+          ? { selectedTab: RepositorySectionTab.Changes }
-+          : {
-+              selectedTab: RepositorySectionTab.History,
-+              shouldFocusBranchList: false,
-+            }
- 
-       this.props.dispatcher.changeRepositorySection(
-         this.props.repository,
-@@ -304,10 +316,14 @@
-   }
- 
-   private onTabClicked = (tab: Tab) => {
--    const section =
-+    const section: RepositorySection =
-       tab === Tab.History
--        ? RepositorySection.History
--        : RepositorySection.Changes
-+        ? {
-+            selectedTab: RepositorySectionTab.History,
-+            shouldFocusBranchList: false,
-+          }
-+        : { selectedTab: RepositorySectionTab.Changes }
-+
-     this.props.dispatcher.changeRepositorySection(
-       this.props.repository,
-       section
-merged
-  result 100644 aa55a4afe2dbcf81388d5d4a68bbcef237edf516 app/styles/ui/_branches.scss
-  our    100644 8b437422d7971232a5209b075f6a7a4aac650780 app/styles/ui/_branches.scss
-@@ -190,15 +190,12 @@
- 
- .branches-list {
-   &-item {
--    padding: 0 var(--spacing);
--  }
--
--  &-item {
-     display: flex;
-     flex-direction: row;
-     min-width: 0;
-     flex-grow: 1;
-     align-items: center;
-+    padding: 0 var(--spacing);
- 
-     .icon {
-       margin-right: var(--spacing-half);
-@@ -221,6 +218,44 @@
-       }
-     }
- 
-+    .branches-list-item-menu {
-+      display: none;
-+    }
-+
-+    &.kebab-effect:hover {
-+      .description {
-+        display: none;
-+      }
-+
-+      .branches-list-item-menu {
-+        display: flex;
-+        flex-grow: 1;
-+        justify-content: flex-end;
-+      }
-+
-+      .branch-menu-wrapper {
-+        display: flex;
-+        margin: var(--spacing);
-+        margin-right: 0;
-+        padding: 0 var(--spacing);
-+        border-radius: var(--border-radius);
-+        transition: background 0.15s;
-+
-+        .octicon {
-+          fill: var(--text-secondary-color);
-+          transition: fill 0.15s;
-+        }
-+
-+        &:hover {
-+          background: rgba($gray-500, 0.2);
-+
-+          .octicon {
-+            fill: var(--text-color);
-+          }
-+        }
-+      }
-+    }
-+
-     .description {
-       margin-right: var(--spacing-half);
-       color: var(--text-secondary-color);
-merged
-  result 100644 ef1599638c6d327a99a8043a83e57cd9d102d41b app/test/unit/app-store-test.ts
-  our    100644 11161765e2eda88e549efb9ec50be911f6c76442 app/test/unit/app-store-test.ts
-@@ -28,7 +28,7 @@
- import { StatsStore } from '../../src/lib/stats'
- 
- import {
--  RepositorySection,
-+  RepositorySectionTab,
-   SelectionType,
-   IRepositoryState,
- } from '../../src/lib/app-state'
-@@ -131,10 +131,9 @@
- 
-       // select the repository and show the changes view
-       await appStore._selectRepository(repository)
--      await appStore._changeRepositorySection(
--        repository,
--        RepositorySection.Changes
--      )
-+      await appStore._changeRepositorySection(repository, {
-+        selectedTab: RepositorySectionTab.Changes,
-+      })
- 
-       let state = getAppState(appStore)
-       expect(state.localCommitSHAs.length).to.equal(1)
-merged
-  result 100644 c93e0568e69be37dc41420115d61f995f91b61ea changelog.json
-  our    100644 26d03c2e5abb64530a6274d877b1db7e9313236d changelog.json
-@@ -1,5 +1,7 @@
- {
-   "releases": {
-+    "1.1.2-beta7": [
-+    ],
-     "1.1.2-beta6": [
-       "[Added] Add MacVim support for macOS - #4532. Thanks @johnelliott!",
-       "[Fixed] Open in Shell on Linux ensures Git is available on the user's PATH - #4619. Thanks @ziggy42!",
diff --git a/app/test/fixtures/merge-parser/vscode/merge-1.11-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-1.11-into-master.txt
deleted file mode 100644
index 262226fa9d8..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-1.11-into-master.txt
+++ /dev/null
@@ -1,10771 +0,0 @@
-changed in both
-  base   100644 8b48f00fd70491dced3d7628745723082d9eea92 .vscode/launch.json
-  our    100644 2a12dea7bde0011caa8e1cf3c995f13114d674d4 .vscode/launch.json
-  their  100644 a0fdb4b99287060590dc7bf8ae1db5931b067798 .vscode/launch.json
-@@ -16,8 +16,14 @@
- 			"type": "node",
- 			"request": "attach",
- 			"name": "Attach to Extension Host",
-+<<<<<<< .our
- 			"protocol": "inspector",
- 			"port": 5870,
-+=======
-+			"protocol": "legacy",
-+			"port": 2999,
-+			"sourceMaps": true,
-+>>>>>>> .their
- 			"restart": true,
- 			"outFiles": [
- 				"${workspaceFolder}/out/**/*.js"
-changed in both
-  base   100644 0496b106ae89f84296fcda7d70bd8271f5e033d6 ThirdPartyNotices.txt
-  our    100644 80e9fd6e80876df7d8a3a735f4afc2e3a0084651 ThirdPartyNotices.txt
-  their  100644 8990f0c25fc20447841a5964359a772da07646a9 ThirdPartyNotices.txt
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- microsoft-vscode
- 
- THIRD-PARTY SOFTWARE NOTICES AND INFORMATION
-@@ -2564,4 +2565,2149 @@
-    See the License for the specific language governing permissions and
-    limitations under the License.
- =========================================
--END OF Web Background Synchronization NOTICES AND INFORMATION
-\ No newline at end of file
-+END OF Web Background Synchronization NOTICES AND INFORMATION
-+=======
-+microsoft-vscode
-+
-+THIRD-PARTY SOFTWARE NOTICES AND INFORMATION
-+Do Not Translate or Localize
-+
-+This project incorporates components from the projects listed below. The original copyright notices and the licenses under which Microsoft received such components are set forth below. Microsoft reserves all rights not expressly granted herein, whether by implication, estoppel or otherwise.
-+
-+1.	atom/language-c version 0.51.3 (https://github.com/atom/language-c)
-+2.	atom/language-coffee-script (https://github.com/atom/language-coffee-script)
-+3.	atom/language-css (https://github.com/atom/language-css)
-+4.	atom/language-sass version 0.52.0 (https://github.com/atom/language-sass)
-+5.	atom/language-xml (https://github.com/atom/language-xml)
-+6.	Benvie/JavaScriptNext.tmLanguage (https://github.com/Benvie/JavaScriptNext.tmLanguage)
-+7.	chjj-marked version 0.3.2 (https://github.com/npmcomponent/chjj-marked)
-+8.	chriskempson/tomorrow-theme (https://github.com/chriskempson/tomorrow-theme)
-+9.	Colorsublime-Themes version 0.1.0 (https://github.com/Colorsublime/Colorsublime-Themes)
-+10.	daaain/Handlebars (https://github.com/daaain/Handlebars)
-+11.	davidrios/jade-tmbundle (https://github.com/davidrios/jade-tmbundle)
-+12.	definitelytyped (https://github.com/DefinitelyTyped/DefinitelyTyped)
-+13.	demyte/language-cshtml (https://github.com/demyte/language-cshtml)
-+14.	dotnet/csharp-tmLanguage version 0.1.0 (https://github.com/dotnet/csharp-tmLanguage)
-+15.	freebroccolo/atom-language-swift (https://github.com/freebroccolo/atom-language-swift)
-+16.	HTML 5.1 W3C Working Draft version 08 October 2015 (http://www.w3.org/TR/2015/WD-html51-20151008/)
-+17.	Ionic documentation version 1.2.4 (https://github.com/driftyco/ionic-site)
-+18.	ionide/ionide-fsgrammar (https://github.com/ionide/ionide-fsgrammar)
-+19.	js-beautify version 1.6.8 (https://github.com/beautify-web/js-beautify)
-+20.	Jxck/assert version 1.0.0 (https://github.com/Jxck/assert)
-+21.	language-docker (https://github.com/docker/docker)
-+22.	language-go version 0.39.0 (https://github.com/atom/language-go)
-+23.	language-less (https://github.com/atom/language-less)
-+24.	language-php (https://github.com/atom/language-php)
-+25.	language-rust version 0.4.9 (https://github.com/zargony/atom-language-rust)
-+26.	MagicStack/MagicPython (https://github.com/MagicStack/MagicPython)
-+27.	Microsoft/TypeScript-TmLanguage version 0.0.1 (https://github.com/Microsoft/TypeScript-TmLanguage)
-+28.	mmcgrana/textmate-clojure (https://github.com/mmcgrana/textmate-clojure)
-+29.	octicons-code version 3.1.0 (https://octicons.github.com)
-+30.	octicons-font version 3.1.0 (https://octicons.github.com)
-+31.	seti-ui version 0.1.0 (https://github.com/jesseweed/seti-ui)
-+32.	shaders-tmLanguage version 0.1.0 (https://github.com/tgjones/shaders-tmLanguage)
-+33.	string_scorer version 0.1.20 (https://github.com/joshaven/string_score)
-+34.	sublimehq/Packages (https://github.com/sublimehq/Packages)
-+35.	SublimeText/PowerShell (https://github.com/SublimeText/PowerShell)
-+36.	textmate/asp.vb.net.tmbundle (https://github.com/textmate/asp.vb.net.tmbundle)
-+37.	textmate/c.tmbundle (https://github.com/textmate/c.tmbundle)
-+38.	textmate/diff.tmbundle (https://github.com/textmate/diff.tmbundle)
-+39.	textmate/git.tmbundle (https://github.com/textmate/git.tmbundle)
-+40.	textmate/groovy.tmbundle (https://github.com/textmate/groovy.tmbundle)
-+41.	textmate/html.tmbundle (https://github.com/textmate/html.tmbundle)
-+42.	textmate/ini.tmbundle (https://github.com/textmate/ini.tmbundle)
-+43.	textmate/java.tmbundle (https://github.com/textmate/java.tmbundle)
-+44.	textmate/javadoc.tmbundle (https://github.com/textmate/javadoc.tmbundle)
-+45.	textmate/javascript.tmbundle (https://github.com/textmate/javascript.tmbundle)
-+46.	textmate/lua.tmbundle (https://github.com/textmate/lua.tmbundle)
-+47.	textmate/make.tmbundle (https://github.com/textmate/make.tmbundle)
-+48.	textmate/markdown.tmbundle (https://github.com/textmate/markdown.tmbundle)
-+49.	textmate/objective-c.tmbundle (https://github.com/textmate/objective-c.tmbundle)
-+50.	textmate/perl.tmbundle (https://github.com/textmate/perl.tmbundle)
-+51.	textmate/r.tmbundle (https://github.com/textmate/r.tmbundle)
-+52.	textmate/ruby.tmbundle (https://github.com/textmate/ruby.tmbundle)
-+53.	textmate/shellscript.tmbundle (https://github.com/textmate/shellscript.tmbundle)
-+54.	textmate/sql.tmbundle (https://github.com/textmate/sql.tmbundle)
-+55.	textmate/yaml.tmbundle (https://github.com/textmate/yaml.tmbundle)
-+56.	typescript-legacy version 1.5 (https://github.com/Microsoft/TypeScript)
-+57.	TypeScript-TmLanguage version 0.1.8 (https://github.com/Microsoft/TypeScript-TmLanguage)
-+58.	vscode-swift version 0.0.1 (https://github.com/owensd/vscode-swift)
-+
-+
-+%% atom/language-c NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+The MIT License (MIT)
-+
-+Copyright (c) 2014 GitHub Inc.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+
-+
-+This package was derived from a TextMate bundle located at
-+https://github.com/textmate/c.tmbundle and distributed under the following
-+license, located in `README.mdown`:
-+
-+Permission to copy, use, modify, sell and distribute this
-+software is granted. This software is provided "as is" without
-+express or implied warranty, and with no claim as to its
-+suitability for any purpose.
-+=========================================
-+END OF atom/language-c NOTICES AND INFORMATION
-+
-+%% atom/language-coffee-script NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+The MIT License (MIT)
-+
-+Copyright (c) 2014 GitHub Inc.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+
-+
-+This package was derived from a TextMate bundle located at
-+https://github.com/jashkenas/coffee-script-tmbundle and distributed under the
-+following license, located in `LICENSE`:
-+
-+Copyright (c) 2009-2014 Jeremy Ashkenas
-+
-+Permission is hereby granted, free of charge, to any person
-+obtaining a copy of this software and associated documentation
-+files (the "Software"), to deal in the Software without
-+restriction, including without limitation the rights to use,
-+copy, modify, merge, publish, distribute, sublicense, and/or sell
-+copies of the Software, and to permit persons to whom the
-+Software is furnished to do so, subject to the following
-+conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+OTHER DEALINGS IN THE SOFTWARE.
-+=========================================
-+END OF atom/language-coffee-script NOTICES AND INFORMATION
-+
-+%% atom/language-css NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+The MIT License (MIT)
-+
-+Copyright (c) 2014 GitHub Inc.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+
-+
-+This package was derived from a TextMate bundle located at
-+https://github.com/textmate/css.tmbundle and distributed under the following
-+license, located in `README.mdown`:
-+
-+Permission to copy, use, modify, sell and distribute this
-+software is granted. This software is provided "as is" without
-+express or implied warranty, and with no claim as to its
-+suitability for any purpose.
-+=========================================
-+END OF atom/language-css NOTICES AND INFORMATION
-+
-+%% atom/language-sass NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+The MIT License (MIT)
-+
-+Copyright (c) 2014 GitHub Inc.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+
-+
-+This package was derived from a TextMate bundle located at
-+https://github.com/alexsancho/Sass.tmbundle and distributed under the following
-+license, located in `LICENSE.md`:
-+
-+Copyright (c) 2012 Alex Sancho, http://alexsancho.name/
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+=========================================
-+END OF atom/language-sass NOTICES AND INFORMATION
-+
-+%% atom/language-xml NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+The MIT License (MIT)
-+
-+Copyright (c) 2014 GitHub Inc.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+
-+
-+This package was derived from a TextMate bundle located at
-+https://github.com/textmate/xml.tmbundle and distributed under the following
-+license, located in `README.mdown`:
-+
-+Permission to copy, use, modify, sell and distribute this
-+software is granted. This software is provided "as is" without
-+express or implied warranty, and with no claim as to its
-+suitability for any purpose.
-+=========================================
-+END OF atom/language-xml NOTICES AND INFORMATION
-+
-+%% Benvie/JavaScriptNext.tmLanguage NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+The MIT License (MIT)
-+
-+Copyright (c) 2015 simonzack, zertosh, benvie
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy
-+of this software and associated documentation files (the "Software"), to deal
-+in the Software without restriction, including without limitation the rights
-+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+copies of the Software, and to permit persons to whom the Software is
-+furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in all
-+copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-+SOFTWARE.
-+=========================================
-+END OF Benvie/JavaScriptNext.tmLanguage NOTICES AND INFORMATION
-+
-+%% chjj-marked NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+The MIT License (MIT)
-+
-+Copyright (c) 2011-2014, Christopher Jeffrey (https://github.com/chjj/)
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy
-+of this software and associated documentation files (the "Software"), to deal
-+in the Software without restriction, including without limitation the rights
-+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+copies of the Software, and to permit persons to whom the Software is
-+furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in
-+all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-+THE SOFTWARE.
-+=========================================
-+END OF chjj-marked NOTICES AND INFORMATION
-+
-+%% chriskempson/tomorrow-theme NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+The MIT License (MIT)
-+
-+Copyright (C) 2013 Chris Kempson
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+=========================================
-+END OF chriskempson/tomorrow-theme NOTICES AND INFORMATION
-+
-+%% Colorsublime-Themes NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+Copyright (c) 2015 Colorsublime.com
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy
-+of this software and associated documentation files (the "Software"), to deal
-+in the Software without restriction, including without limitation the rights
-+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+copies of the Software, and to permit persons to whom the Software is
-+furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in
-+all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-+THE SOFTWARE.
-+=========================================
-+END OF Colorsublime-Themes NOTICES AND INFORMATION
-+
-+%% daaain/Handlebars NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+-- Credits
-+
-+Adapted from the great sublime-text-handlebars package by Nicholas Westlake.
-+
-+Thanks a lot to all the generous contributors (in alphabetical order): @bittersweetryan, @bradcliffe, @calumbrodie, @duncanbeevers, @hlvnst, @jonschlinkert, @Krutius, @samselikoff, @utkarshkukreti, @zeppelin
-+
-+-- License
-+
-+(The MIT License)
-+
-+Copyright (c) daaain/Handlebars project authors
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+=========================================
-+END OF daaain/Handlebars NOTICES AND INFORMATION
-+
-+%% davidrios/jade-tmbundle NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+The MIT License (MIT)
-+
-+Copyright (c) 2014 David Rios
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
-+documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to
-+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to
-+whom the Software is furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
-+=========================================
-+END OF davidrios/jade-tmbundle NOTICES AND INFORMATION
-+
-+%% definitelytyped NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+This project is licensed under the MIT license.
-+Copyrights are respective of each contributor listed at the beginning of each definition file.
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+=========================================
-+END OF definitelytyped NOTICES AND INFORMATION
-+
-+%% demyte/language-cshtml NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+The MIT License (MIT)
-+
-+Copyright (c) 2014 James Summerton
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+=========================================
-+END OF demyte/language-cshtml NOTICES AND INFORMATION
-+
-+%% dotnet/csharp-tmLanguage NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+MIT License
-+
-+Copyright (c) 2016 .NET Foundation
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy
-+of this software and associated documentation files (the "Software"), to deal
-+in the Software without restriction, including without limitation the rights
-+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+copies of the Software, and to permit persons to whom the Software is
-+furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in all
-+copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-+SOFTWARE.
-+=========================================
-+END OF dotnet/csharp-tmLanguage NOTICES AND INFORMATION
-+
-+%% freebroccolo/atom-language-swift NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+The MIT License (MIT)
-+
-+Copyright (c) 2014 Darin Morrison
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy
-+of this software and associated documentation files (the "Software"), to deal
-+in the Software without restriction, including without limitation the rights
-+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+copies of the Software, and to permit persons to whom the Software is
-+furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in all
-+copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+=========================================
-+END OF freebroccolo/atom-language-swift NOTICES AND INFORMATION
-+
-+%% HTML 5.1 W3C Working Draft NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+Copyright © 2015 W3C® (MIT, ERCIM, Keio, Beihang). This software or document includes material copied
-+from or derived from HTML 5.1 W3C Working Draft (http://www.w3.org/TR/2015/WD-html51-20151008/.)
-+
-+THIS DOCUMENT IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT
-+NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF
-+THE DOCUMENT ARE SUITABLE FOR ANY PURPOSE; NOR THAT THE IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY
-+PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-+
-+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE
-+DOCUMENT OR THE PERFORMANCE OR IMPLEMENTATION OF THE CONTENTS THEREOF.
-+
-+The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to this document or its contents
-+without specific, written prior permission. Title to copyright in this document will at all times remain with copyright holders.
-+=========================================
-+END OF HTML 5.1 W3C Working Draft NOTICES AND INFORMATION
-+
-+%% Ionic documentation NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+Copyright Drifty Co. http://drifty.com/.
-+
-+Apache License
-+
-+Version 2.0, January 2004
-+
-+http://www.apache.org/licenses/
-+
-+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-+
-+1. Definitions.
-+
-+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
-+
-+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
-+
-+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-+
-+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
-+
-+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
-+
-+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
-+
-+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
-+
-+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
-+
-+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
-+
-+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
-+
-+2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
-+
-+3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
-+
-+4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
-+
-+You must give any other recipients of the Work or Derivative Works a copy of this License; and
-+
-+You must cause any modified files to carry prominent notices stating that You changed the files; and
-+
-+You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
-+
-+If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
-+
-+5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
-+
-+6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
-+
-+7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
-+
-+8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
-+
-+9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
-+
-+END OF TERMS AND CONDITIONS
-+=========================================
-+END OF Ionic documentation NOTICES AND INFORMATION
-+
-+%% ionide/ionide-fsgrammar NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+The MIT License (MIT)
-+
-+Copyright (c) 2015 Krzysztof Cieslak
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy
-+of this software and associated documentation files (the "Software"), to deal
-+in the Software without restriction, including without limitation the rights
-+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+copies of the Software, and to permit persons to whom the Software is
-+furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in
-+all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-+THE SOFTWARE.
-+=========================================
-+END OF ionide/ionide-fsgrammar NOTICES AND INFORMATION
-+
-+%% js-beautify NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+The MIT License (MIT)
-+
-+Copyright (c) 2007-2017 Einar Lielmanis, Liam Newman, and contributors.
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+=========================================
-+END OF js-beautify NOTICES AND INFORMATION
-+
-+%% Jxck/assert NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+The MIT License (MIT)
-+
-+Copyright (c) 2011 Jxck
-+
-+Originally from node.js (http://nodejs.org)
-+Copyright Joyent, Inc.
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy
-+of this software and associated documentation files (the "Software"), to deal
-+in the Software without restriction, including without limitation the rights
-+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+copies of the Software, and to permit persons to whom the Software is
-+furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in all
-+copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+=========================================
-+END OF Jxck/assert NOTICES AND INFORMATION
-+
-+%% language-docker NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+Apache License
-+                           Version 2.0, January 2004
-+                        https://www.apache.org/licenses/
-+
-+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-+
-+   1. Definitions.
-+
-+      "License" shall mean the terms and conditions for use, reproduction,
-+      and distribution as defined by Sections 1 through 9 of this document.
-+
-+      "Licensor" shall mean the copyright owner or entity authorized by
-+      the copyright owner that is granting the License.
-+
-+      "Legal Entity" shall mean the union of the acting entity and all
-+      other entities that control, are controlled by, or are under common
-+      control with that entity. For the purposes of this definition,
-+      "control" means (i) the power, direct or indirect, to cause the
-+      direction or management of such entity, whether by contract or
-+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-+      outstanding shares, or (iii) beneficial ownership of such entity.
-+
-+      "You" (or "Your") shall mean an individual or Legal Entity
-+      exercising permissions granted by this License.
-+
-+      "Source" form shall mean the preferred form for making modifications,
-+      including but not limited to software source code, documentation
-+      source, and configuration files.
-+
-+      "Object" form shall mean any form resulting from mechanical
-+      transformation or translation of a Source form, including but
-+      not limited to compiled object code, generated documentation,
-+      and conversions to other media types.
-+
-+      "Work" shall mean the work of authorship, whether in Source or
-+      Object form, made available under the License, as indicated by a
-+      copyright notice that is included in or attached to the work
-+      (an example is provided in the Appendix below).
-+
-+      "Derivative Works" shall mean any work, whether in Source or Object
-+      form, that is based on (or derived from) the Work and for which the
-+      editorial revisions, annotations, elaborations, or other modifications
-+      represent, as a whole, an original work of authorship. For the purposes
-+      of this License, Derivative Works shall not include works that remain
-+      separable from, or merely link (or bind by name) to the interfaces of,
-+      the Work and Derivative Works thereof.
-+
-+      "Contribution" shall mean any work of authorship, including
-+      the original version of the Work and any modifications or additions
-+      to that Work or Derivative Works thereof, that is intentionally
-+      submitted to Licensor for inclusion in the Work by the copyright owner
-+      or by an individual or Legal Entity authorized to submit on behalf of
-+      the copyright owner. For the purposes of this definition, "submitted"
-+      means any form of electronic, verbal, or written communication sent
-+      to the Licensor or its representatives, including but not limited to
-+      communication on electronic mailing lists, source code control systems,
-+      and issue tracking systems that are managed by, or on behalf of, the
-+      Licensor for the purpose of discussing and improving the Work, but
-+      excluding communication that is conspicuously marked or otherwise
-+      designated in writing by the copyright owner as "Not a Contribution."
-+
-+      "Contributor" shall mean Licensor and any individual or Legal Entity
-+      on behalf of whom a Contribution has been received by Licensor and
-+      subsequently incorporated within the Work.
-+
-+   2. Grant of Copyright License. Subject to the terms and conditions of
-+      this License, each Contributor hereby grants to You a perpetual,
-+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-+      copyright license to reproduce, prepare Derivative Works of,
-+      publicly display, publicly perform, sublicense, and distribute the
-+      Work and such Derivative Works in Source or Object form.
-+
-+   3. Grant of Patent License. Subject to the terms and conditions of
-+      this License, each Contributor hereby grants to You a perpetual,
-+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-+      (except as stated in this section) patent license to make, have made,
-+      use, offer to sell, sell, import, and otherwise transfer the Work,
-+      where such license applies only to those patent claims licensable
-+      by such Contributor that are necessarily infringed by their
-+      Contribution(s) alone or by combination of their Contribution(s)
-+      with the Work to which such Contribution(s) was submitted. If You
-+      institute patent litigation against any entity (including a
-+      cross-claim or counterclaim in a lawsuit) alleging that the Work
-+      or a Contribution incorporated within the Work constitutes direct
-+      or contributory patent infringement, then any patent licenses
-+      granted to You under this License for that Work shall terminate
-+      as of the date such litigation is filed.
-+
-+   4. Redistribution. You may reproduce and distribute copies of the
-+      Work or Derivative Works thereof in any medium, with or without
-+      modifications, and in Source or Object form, provided that You
-+      meet the following conditions:
-+
-+      (a) You must give any other recipients of the Work or
-+          Derivative Works a copy of this License; and
-+
-+      (b) You must cause any modified files to carry prominent notices
-+          stating that You changed the files; and
-+
-+      (c) You must retain, in the Source form of any Derivative Works
-+          that You distribute, all copyright, patent, trademark, and
-+          attribution notices from the Source form of the Work,
-+          excluding those notices that do not pertain to any part of
-+          the Derivative Works; and
-+
-+      (d) If the Work includes a "NOTICE" text file as part of its
-+          distribution, then any Derivative Works that You distribute must
-+          include a readable copy of the attribution notices contained
-+          within such NOTICE file, excluding those notices that do not
-+          pertain to any part of the Derivative Works, in at least one
-+          of the following places: within a NOTICE text file distributed
-+          as part of the Derivative Works; within the Source form or
-+          documentation, if provided along with the Derivative Works; or,
-+          within a display generated by the Derivative Works, if and
-+          wherever such third-party notices normally appear. The contents
-+          of the NOTICE file are for informational purposes only and
-+          do not modify the License. You may add Your own attribution
-+          notices within Derivative Works that You distribute, alongside
-+          or as an addendum to the NOTICE text from the Work, provided
-+          that such additional attribution notices cannot be construed
-+          as modifying the License.
-+
-+      You may add Your own copyright statement to Your modifications and
-+      may provide additional or different license terms and conditions
-+      for use, reproduction, or distribution of Your modifications, or
-+      for any such Derivative Works as a whole, provided Your use,
-+      reproduction, and distribution of the Work otherwise complies with
-+      the conditions stated in this License.
-+
-+   5. Submission of Contributions. Unless You explicitly state otherwise,
-+      any Contribution intentionally submitted for inclusion in the Work
-+      by You to the Licensor shall be under the terms and conditions of
-+      this License, without any additional terms or conditions.
-+      Notwithstanding the above, nothing herein shall supersede or modify
-+      the terms of any separate license agreement you may have executed
-+      with Licensor regarding such Contributions.
-+
-+   6. Trademarks. This License does not grant permission to use the trade
-+      names, trademarks, service marks, or product names of the Licensor,
-+      except as required for reasonable and customary use in describing the
-+      origin of the Work and reproducing the content of the NOTICE file.
-+
-+   7. Disclaimer of Warranty. Unless required by applicable law or
-+      agreed to in writing, Licensor provides the Work (and each
-+      Contributor provides its Contributions) on an "AS IS" BASIS,
-+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-+      implied, including, without limitation, any warranties or conditions
-+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-+      PARTICULAR PURPOSE. You are solely responsible for determining the
-+      appropriateness of using or redistributing the Work and assume any
-+      risks associated with Your exercise of permissions under this License.
-+
-+   8. Limitation of Liability. In no event and under no legal theory,
-+      whether in tort (including negligence), contract, or otherwise,
-+      unless required by applicable law (such as deliberate and grossly
-+      negligent acts) or agreed to in writing, shall any Contributor be
-+      liable to You for damages, including any direct, indirect, special,
-+      incidental, or consequential damages of any character arising as a
-+      result of this License or out of the use or inability to use the
-+      Work (including but not limited to damages for loss of goodwill,
-+      work stoppage, computer failure or malfunction, or any and all
-+      other commercial damages or losses), even if such Contributor
-+      has been advised of the possibility of such damages.
-+
-+   9. Accepting Warranty or Additional Liability. While redistributing
-+      the Work or Derivative Works thereof, You may choose to offer,
-+      and charge a fee for, acceptance of support, warranty, indemnity,
-+      or other liability obligations and/or rights consistent with this
-+      License. However, in accepting such obligations, You may act only
-+      on Your own behalf and on Your sole responsibility, not on behalf
-+      of any other Contributor, and only if You agree to indemnify,
-+      defend, and hold each Contributor harmless for any liability
-+      incurred by, or claims asserted against, such Contributor by reason
-+      of your accepting any such warranty or additional liability.
-+
-+   END OF TERMS AND CONDITIONS
-+
-+   Copyright 2013-2017 Docker, Inc.
-+
-+   Licensed under the Apache License, Version 2.0 (the "License");
-+   you may not use this file except in compliance with the License.
-+   You may obtain a copy of the License at
-+
-+       https://www.apache.org/licenses/LICENSE-2.0
-+
-+   Unless required by applicable law or agreed to in writing, software
-+   distributed under the License is distributed on an "AS IS" BASIS,
-+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+   See the License for the specific language governing permissions and
-+   limitations under the License.
-+=========================================
-+END OF language-docker NOTICES AND INFORMATION
-+
-+%% language-go NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+The MIT License (MIT)
-+
-+Copyright (c) 2014 GitHub Inc.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+
-+
-+This package was derived from a TextMate bundle located at
-+https://github.com/rsms/Go.tmbundle and distributed under the following
-+license, located in `LICENSE`:
-+
-+Copyright (c) 2009 Rasmus Andersson
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy
-+of this software and associated documentation files (the "Software"), to deal
-+in the Software without restriction, including without limitation the rights
-+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+copies of the Software, and to permit persons to whom the Software is
-+furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in
-+all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-+THE SOFTWARE.
-+
-+
-+The Go Template grammar was derived from GoSublime located at
-+https://github.com/DisposaBoy/GoSublime and distributed under the following
-+license, located in `LICENSE.md`:
-+
-+Copyright (c) 2012 The GoSublime Authors
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy
-+of this software and associated documentation files (the "Software"), to deal
-+in the Software without restriction, including without limitation the rights
-+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+copies of the Software, and to permit persons to whom the Software is
-+furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in
-+all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-+THE SOFTWARE.
-+=========================================
-+END OF language-go NOTICES AND INFORMATION
-+
-+%% language-less NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+The MIT License (MIT)
-+
-+Copyright (c) 2014 GitHub Inc.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+
-+
-+This package was derived from a TextMate bundle located at
-+https://github.com/textmate/less.tmbundle and distributed under the following
-+license, located in `LICENSE.md`:
-+
-+Copyright (c) 2010 Scott Kyle and Rasmus Andersson
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy
-+of this software and associated documentation files (the "Software"), to deal
-+in the Software without restriction, including without limitation the rights
-+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+copies of the Software, and to permit persons to whom the Software is
-+furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in
-+all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-+THE SOFTWARE.
-+=========================================
-+END OF language-less NOTICES AND INFORMATION
-+
-+%% language-php NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+The MIT License (MIT)
-+
-+Copyright (c) 2014 GitHub Inc.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+
-+
-+This package was derived from a TextMate bundle located at
-+https://github.com/textmate/php.tmbundle and distributed under the following
-+license, located in `README.mdown`:
-+
-+Permission to copy, use, modify, sell and distribute this
-+software is granted. This software is provided "as is" without
-+express or implied warranty, and with no claim as to its
-+suitability for any purpose.
-+=========================================
-+END OF language-php NOTICES AND INFORMATION
-+
-+%% language-rust NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+The MIT License (MIT)
-+
-+Copyright © `2013` `Andreas Neuhaus` `http://zargony.com/`
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy of
-+this software and associated documentation files (the "Software"), to deal in
-+the Software without restriction, including without limitation the rights to
-+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-+the Software, and to permit persons to whom the Software is furnished to do so,
-+subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in all
-+copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+=========================================
-+END OF language-rust NOTICES AND INFORMATION
-+
-+%% MagicStack/MagicPython NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+The MIT License
-+
-+Copyright (c) 2015 MagicStack Inc.  http://magic.io
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy
-+of this software and associated documentation files (the "Software"), to deal
-+in the Software without restriction, including without limitation the rights
-+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+copies of the Software, and to permit persons to whom the Software is
-+furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in
-+all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-+THE SOFTWARE.
-+=========================================
-+END OF MagicStack/MagicPython NOTICES AND INFORMATION
-+
-+%% Microsoft/TypeScript-TmLanguage NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+Copyright (c) Microsoft Corporation.  All rights reserved.
-+
-+                                Apache License
-+                           Version 2.0, January 2004
-+                        http://www.apache.org/licenses/
-+
-+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-+
-+   1. Definitions.
-+
-+      "License" shall mean the terms and conditions for use, reproduction,
-+      and distribution as defined by Sections 1 through 9 of this document.
-+
-+      "Licensor" shall mean the copyright owner or entity authorized by
-+      the copyright owner that is granting the License.
-+
-+      "Legal Entity" shall mean the union of the acting entity and all
-+      other entities that control, are controlled by, or are under common
-+      control with that entity. For the purposes of this definition,
-+      "control" means (i) the power, direct or indirect, to cause the
-+      direction or management of such entity, whether by contract or
-+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-+      outstanding shares, or (iii) beneficial ownership of such entity.
-+
-+      "You" (or "Your") shall mean an individual or Legal Entity
-+      exercising permissions granted by this License.
-+
-+      "Source" form shall mean the preferred form for making modifications,
-+      including but not limited to software source code, documentation
-+      source, and configuration files.
-+
-+      "Object" form shall mean any form resulting from mechanical
-+      transformation or translation of a Source form, including but
-+      not limited to compiled object code, generated documentation,
-+      and conversions to other media types.
-+
-+      "Work" shall mean the work of authorship, whether in Source or
-+      Object form, made available under the License, as indicated by a
-+      copyright notice that is included in or attached to the work
-+      (an example is provided in the Appendix below).
-+
-+      "Derivative Works" shall mean any work, whether in Source or Object
-+      form, that is based on (or derived from) the Work and for which the
-+      editorial revisions, annotations, elaborations, or other modifications
-+      represent, as a whole, an original work of authorship. For the purposes
-+      of this License, Derivative Works shall not include works that remain
-+      separable from, or merely link (or bind by name) to the interfaces of,
-+      the Work and Derivative Works thereof.
-+
-+      "Contribution" shall mean any work of authorship, including
-+      the original version of the Work and any modifications or additions
-+      to that Work or Derivative Works thereof, that is intentionally
-+      submitted to Licensor for inclusion in the Work by the copyright owner
-+      or by an individual or Legal Entity authorized to submit on behalf of
-+      the copyright owner. For the purposes of this definition, "submitted"
-+      means any form of electronic, verbal, or written communication sent
-+      to the Licensor or its representatives, including but not limited to
-+      communication on electronic mailing lists, source code control systems,
-+      and issue tracking systems that are managed by, or on behalf of, the
-+      Licensor for the purpose of discussing and improving the Work, but
-+      excluding communication that is conspicuously marked or otherwise
-+      designated in writing by the copyright owner as "Not a Contribution."
-+
-+      "Contributor" shall mean Licensor and any individual or Legal Entity
-+      on behalf of whom a Contribution has been received by Licensor and
-+      subsequently incorporated within the Work.
-+
-+   2. Grant of Copyright License. Subject to the terms and conditions of
-+      this License, each Contributor hereby grants to You a perpetual,
-+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-+      copyright license to reproduce, prepare Derivative Works of,
-+      publicly display, publicly perform, sublicense, and distribute the
-+      Work and such Derivative Works in Source or Object form.
-+
-+   3. Grant of Patent License. Subject to the terms and conditions of
-+      this License, each Contributor hereby grants to You a perpetual,
-+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-+      (except as stated in this section) patent license to make, have made,
-+      use, offer to sell, sell, import, and otherwise transfer the Work,
-+      where such license applies only to those patent claims licensable
-+      by such Contributor that are necessarily infringed by their
-+      Contribution(s) alone or by combination of their Contribution(s)
-+      with the Work to which such Contribution(s) was submitted. If You
-+      institute patent litigation against any entity (including a
-+      cross-claim or counterclaim in a lawsuit) alleging that the Work
-+      or a Contribution incorporated within the Work constitutes direct
-+      or contributory patent infringement, then any patent licenses
-+      granted to You under this License for that Work shall terminate
-+      as of the date such litigation is filed.
-+
-+   4. Redistribution. You may reproduce and distribute copies of the
-+      Work or Derivative Works thereof in any medium, with or without
-+      modifications, and in Source or Object form, provided that You
-+      meet the following conditions:
-+
-+      (a) You must give any other recipients of the Work or
-+          Derivative Works a copy of this License; and
-+
-+      (b) You must cause any modified files to carry prominent notices
-+          stating that You changed the files; and
-+
-+      (c) You must retain, in the Source form of any Derivative Works
-+          that You distribute, all copyright, patent, trademark, and
-+          attribution notices from the Source form of the Work,
-+          excluding those notices that do not pertain to any part of
-+          the Derivative Works; and
-+
-+      (d) If the Work includes a "NOTICE" text file as part of its
-+          distribution, then any Derivative Works that You distribute must
-+          include a readable copy of the attribution notices contained
-+          within such NOTICE file, excluding those notices that do not
-+          pertain to any part of the Derivative Works, in at least one
-+          of the following places: within a NOTICE text file distributed
-+          as part of the Derivative Works; within the Source form or
-+          documentation, if provided along with the Derivative Works; or,
-+          within a display generated by the Derivative Works, if and
-+          wherever such third-party notices normally appear. The contents
-+          of the NOTICE file are for informational purposes only and
-+          do not modify the License. You may add Your own attribution
-+          notices within Derivative Works that You distribute, alongside
-+          or as an addendum to the NOTICE text from the Work, provided
-+          that such additional attribution notices cannot be construed
-+          as modifying the License.
-+
-+      You may add Your own copyright statement to Your modifications and
-+      may provide additional or different license terms and conditions
-+      for use, reproduction, or distribution of Your modifications, or
-+      for any such Derivative Works as a whole, provided Your use,
-+      reproduction, and distribution of the Work otherwise complies with
-+      the conditions stated in this License.
-+
-+   5. Submission of Contributions. Unless You explicitly state otherwise,
-+      any Contribution intentionally submitted for inclusion in the Work
-+      by You to the Licensor shall be under the terms and conditions of
-+      this License, without any additional terms or conditions.
-+      Notwithstanding the above, nothing herein shall supersede or modify
-+      the terms of any separate license agreement you may have executed
-+      with Licensor regarding such Contributions.
-+
-+   6. Trademarks. This License does not grant permission to use the trade
-+      names, trademarks, service marks, or product names of the Licensor,
-+      except as required for reasonable and customary use in describing the
-+      origin of the Work and reproducing the content of the NOTICE file.
-+
-+   7. Disclaimer of Warranty. Unless required by applicable law or
-+      agreed to in writing, Licensor provides the Work (and each
-+      Contributor provides its Contributions) on an "AS IS" BASIS,
-+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-+      implied, including, without limitation, any warranties or conditions
-+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-+      PARTICULAR PURPOSE. You are solely responsible for determining the
-+      appropriateness of using or redistributing the Work and assume any
-+      risks associated with Your exercise of permissions under this License.
-+
-+   8. Limitation of Liability. In no event and under no legal theory,
-+      whether in tort (including negligence), contract, or otherwise,
-+      unless required by applicable law (such as deliberate and grossly
-+      negligent acts) or agreed to in writing, shall any Contributor be
-+      liable to You for damages, including any direct, indirect, special,
-+      incidental, or consequential damages of any character arising as a
-+      result of this License or out of the use or inability to use the
-+      Work (including but not limited to damages for loss of goodwill,
-+      work stoppage, computer failure or malfunction, or any and all
-+      other commercial damages or losses), even if such Contributor
-+      has been advised of the possibility of such damages.
-+
-+   9. Accepting Warranty or Additional Liability. While redistributing
-+      the Work or Derivative Works thereof, You may choose to offer,
-+      and charge a fee for, acceptance of support, warranty, indemnity,
-+      or other liability obligations and/or rights consistent with this
-+      License. However, in accepting such obligations, You may act only
-+      on Your own behalf and on Your sole responsibility, not on behalf
-+      of any other Contributor, and only if You agree to indemnify,
-+      defend, and hold each Contributor harmless for any liability
-+      incurred by, or claims asserted against, such Contributor by reason
-+      of your accepting any such warranty or additional liability.
-+
-+   END OF TERMS AND CONDITIONS
-+=========================================
-+END OF Microsoft/TypeScript-TmLanguage NOTICES AND INFORMATION
-+
-+%% mmcgrana/textmate-clojure NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+The MIT License (MIT)
-+
-+Copyright (c) 2010- Mark McGranaghan
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy
-+of this software and associated documentation files (the "Software"), to deal
-+in the Software without restriction, including without limitation the rights
-+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+copies of the Software, and to permit persons to whom the Software is
-+furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in all
-+copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-+SOFTWARE.
-+=========================================
-+END OF mmcgrana/textmate-clojure NOTICES AND INFORMATION
-+
-+%% octicons-code NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+The MIT License (MIT)
-+
-+(c) 2012-2015 GitHub
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy
-+of this software and associated documentation files (the "Software"), to deal
-+in the Software without restriction, including without limitation the rights
-+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+copies of the Software, and to permit persons to whom the Software is
-+furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in
-+all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-+THE SOFTWARE.
-+=========================================
-+END OF octicons-code NOTICES AND INFORMATION
-+
-+%% octicons-font NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+(c) 2012-2015 GitHub
-+
-+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-+
-+PREAMBLE
-+The goals of the Open Font License (OFL) are to stimulate worldwide
-+development of collaborative font projects, to support the font creation
-+efforts of academic and linguistic communities, and to provide a free and
-+open framework in which fonts may be shared and improved in partnership
-+with others.
-+
-+The OFL allows the licensed fonts to be used, studied, modified and
-+redistributed freely as long as they are not sold by themselves. The
-+fonts, including any derivative works, can be bundled, embedded,
-+redistributed and/or sold with any software provided that any reserved
-+names are not used by derivative works. The fonts and derivatives,
-+however, cannot be released under any other type of license. The
-+requirement for fonts to remain under this license does not apply
-+to any document created using the fonts or their derivatives.
-+
-+DEFINITIONS
-+"Font Software" refers to the set of files released by the Copyright
-+Holder(s) under this license and clearly marked as such. This may
-+include source files, build scripts and documentation.
-+
-+"Reserved Font Name" refers to any names specified as such after the
-+copyright statement(s).
-+
-+"Original Version" refers to the collection of Font Software components as
-+distributed by the Copyright Holder(s).
-+
-+"Modified Version" refers to any derivative made by adding to, deleting,
-+or substituting -- in part or in whole -- any of the components of the
-+Original Version, by changing formats or by porting the Font Software to a
-+new environment.
-+
-+"Author" refers to any designer, engineer, programmer, technical
-+writer or other person who contributed to the Font Software.
-+
-+PERMISSION & CONDITIONS
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of the Font Software, to use, study, copy, merge, embed, modify,
-+redistribute, and sell modified and unmodified copies of the Font
-+Software, subject to the following conditions:
-+
-+1) Neither the Font Software nor any of its individual components,
-+in Original or Modified Versions, may be sold by itself.
-+
-+2) Original or Modified Versions of the Font Software may be bundled,
-+redistributed and/or sold with any software, provided that each copy
-+contains the above copyright notice and this license. These can be
-+included either as stand-alone text files, human-readable headers or
-+in the appropriate machine-readable metadata fields within text or
-+binary files as long as those fields can be easily viewed by the user.
-+
-+3) No Modified Version of the Font Software may use the Reserved Font
-+Name(s) unless explicit written permission is granted by the corresponding
-+Copyright Holder. This restriction only applies to the primary font name as
-+presented to the users.
-+
-+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-+Software shall not be used to promote, endorse or advertise any
-+Modified Version, except to acknowledge the contribution(s) of the
-+Copyright Holder(s) and the Author(s) or with their explicit written
-+permission.
-+
-+5) The Font Software, modified or unmodified, in part or in whole,
-+must be distributed entirely under this license, and must not be
-+distributed under any other license. The requirement for fonts to
-+remain under this license does not apply to any document created
-+using the Font Software.
-+
-+TERMINATION
-+This license becomes null and void if any of the above conditions are
-+not met.
-+
-+DISCLAIMER
-+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-+OTHER DEALINGS IN THE FONT SOFTWARE.
-+=========================================
-+END OF octicons-font NOTICES AND INFORMATION
-+
-+%% seti-ui NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+Copyright (c) 2014 Jesse Weed
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+=========================================
-+END OF seti-ui NOTICES AND INFORMATION
-+
-+%% shaders-tmLanguage NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+MIT License
-+
-+Copyright (c) 2017 Tim Jones
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy
-+of this software and associated documentation files (the "Software"), to deal
-+in the Software without restriction, including without limitation the rights
-+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+copies of the Software, and to permit persons to whom the Software is
-+furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in all
-+copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-+SOFTWARE.
-+=========================================
-+END OF shaders-tmLanguage NOTICES AND INFORMATION
-+
-+%% string_scorer NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+This software is released under the MIT license:
-+
-+Copyright (c) Joshaven Potter
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy of
-+this software and associated documentation files (the "Software"), to deal in
-+the Software without restriction, including without limitation the rights to
-+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-+the Software, and to permit persons to whom the Software is furnished to do so,
-+subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in all
-+copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+=========================================
-+END OF string_scorer NOTICES AND INFORMATION
-+
-+%% sublimehq/Packages NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+Copyright (c) Sublime Packages project authors
-+
-+If not otherwise specified (see below), files in this folder fall under the following license:
-+
-+Permission to copy, use, modify, sell and distribute this
-+software is granted. This software is provided "as is" without
-+express or implied warranty, and with no claim as to its
-+suitability for any purpose.
-+
-+An exception is made for files in readable text which contain their own license information,
-+or files where an accompanying file exists (in the same directory) with a "-license" suffix added
-+to the base-name name of the original file, and an extension of txt, html, or similar. For example
-+"tidy" is accompanied by "tidy-license.txt".
-+=========================================
-+END OF sublimehq/Packages NOTICES AND INFORMATION
-+
-+%% SublimeText/PowerShell NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+The MIT License (MIT)
-+
-+Copyright (c) 2011 Guillermo López-Anglada
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+=========================================
-+END OF SublimeText/PowerShell NOTICES AND INFORMATION
-+
-+%% textmate/asp.vb.net.tmbundle NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+Copyright (c) textmate-asp.vb.net.tmbundle project authors
-+
-+If not otherwise specified (see below), files in this folder fall under the following license:
-+
-+Permission to copy, use, modify, sell and distribute this
-+software is granted. This software is provided "as is" without
-+express or implied warranty, and with no claim as to its
-+suitability for any purpose.
-+
-+An exception is made for files in readable text which contain their own license information,
-+or files where an accompanying file exists (in the same directory) with a "-license" suffix added
-+to the base-name name of the original file, and an extension of txt, html, or similar. For example
-+"tidy" is accompanied by "tidy-license.txt".
-+=========================================
-+END OF textmate/asp.vb.net.tmbundle NOTICES AND INFORMATION
-+
-+%% textmate/c.tmbundle NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+Copyright (c) textmate-c.tmbundle authors
-+
-+If not otherwise specified (see below), files in this repository fall under the following license:
-+
-+Permission to copy, use, modify, sell and distribute this
-+software is granted. This software is provided "as is" without
-+express or implied warranty, and with no claim as to its
-+suitability for any purpose.
-+
-+An exception is made for files in readable text which contain their own license information,
-+or files where an accompanying file exists (in the same directory) with a "-license" suffix added
-+to the base-name name of the original file, and an extension of txt, html, or similar. For example
-+"tidy" is accompanied by "tidy-license.txt".
-+=========================================
-+END OF textmate/c.tmbundle NOTICES AND INFORMATION
-+
-+%% textmate/diff.tmbundle NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+Copyright (c) textmate-diff.tmbundle project authors
-+
-+If not otherwise specified (see below), files in this repository fall under the following license:
-+
-+Permission to copy, use, modify, sell and distribute this
-+software is granted. This software is provided "as is" without
-+express or implied warranty, and with no claim as to its
-+suitability for any purpose.
-+
-+An exception is made for files in readable text which contain their own license information,
-+or files where an accompanying file exists (in the same directory) with a "-license" suffix added
-+to the base-name name of the original file, and an extension of txt, html, or similar. For example
-+"tidy" is accompanied by "tidy-license.txt".
-+=========================================
-+END OF textmate/diff.tmbundle NOTICES AND INFORMATION
-+
-+%% textmate/git.tmbundle NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+The MIT License (MIT)
-+
-+Copyright (c) 2008 Tim Harper
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the"
-+Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+=========================================
-+END OF textmate/git.tmbundle NOTICES AND INFORMATION
-+
-+%% textmate/groovy.tmbundle NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+Copyright (c) textmate-groovy.tmbundle project authors
-+
-+If not otherwise specified (see below), files in this repository fall under the following license:
-+
-+Permission to copy, use, modify, sell and distribute this
-+software is granted. This software is provided "as is" without
-+express or implied warranty, and with no claim as to its
-+suitability for any purpose.
-+
-+An exception is made for files in readable text which contain their own license information,
-+or files where an accompanying file exists (in the same directory) with a "-license" suffix added
-+to the base-name name of the original file, and an extension of txt, html, or similar. For example
-+"tidy" is accompanied by "tidy-license.txt".
-+=========================================
-+END OF textmate/groovy.tmbundle NOTICES AND INFORMATION
-+
-+%% textmate/html.tmbundle NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+Copyright (c) textmate-html.tmbundle project authors
-+
-+If not otherwise specified (see below), files in this repository fall under the following license:
-+
-+Permission to copy, use, modify, sell and distribute this
-+software is granted. This software is provided "as is" without
-+express or implied warranty, and with no claim as to its
-+suitability for any purpose.
-+
-+An exception is made for files in readable text which contain their own license information,
-+or files where an accompanying file exists (in the same directory) with a "-license" suffix added
-+to the base-name name of the original file, and an extension of txt, html, or similar. For example
-+"tidy" is accompanied by "tidy-license.txt".
-+=========================================
-+END OF textmate/html.tmbundle NOTICES AND INFORMATION
-+
-+%% textmate/ini.tmbundle NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+Copyright (c) textmate-ini.tmbundle project authors
-+
-+If not otherwise specified (see below), files in this folder fall under the following license:
-+
-+Permission to copy, use, modify, sell and distribute this
-+software is granted. This software is provided "as is" without
-+express or implied warranty, and with no claim as to its
-+suitability for any purpose.
-+
-+An exception is made for files in readable text which contain their own license information,
-+or files where an accompanying file exists (in the same directory) with a "-license" suffix added
-+to the base-name name of the original file, and an extension of txt, html, or similar. For example
-+"tidy" is accompanied by "tidy-license.txt".
-+=========================================
-+END OF textmate/ini.tmbundle NOTICES AND INFORMATION
-+
-+%% textmate/java.tmbundle NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+Copyright (c) textmate-java.tmbundle project authors
-+
-+If not otherwise specified (see below), files in this repository fall under the following license:
-+
-+Permission to copy, use, modify, sell and distribute this
-+software is granted. This software is provided "as is" without
-+express or implied warranty, and with no claim as to its
-+suitability for any purpose.
-+
-+An exception is made for files in readable text which contain their own license information,
-+or files where an accompanying file exists (in the same directory) with a "-license" suffix added
-+to the base-name name of the original file, and an extension of txt, html, or similar. For example
-+"tidy" is accompanied by "tidy-license.txt".
-+=========================================
-+END OF textmate/java.tmbundle NOTICES AND INFORMATION
-+
-+%% textmate/javadoc.tmbundle NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+Copyright (c) textmate-javadoc.tmbundle project authors
-+
-+If not otherwise specified (see below), files in this repository fall under the following license:
-+
-+Permission to copy, use, modify, sell and distribute this
-+software is granted. This software is provided "as is" without
-+express or implied warranty, and with no claim as to its
-+suitability for any purpose.
-+
-+An exception is made for files in readable text which contain their own license information,
-+or files where an accompanying file exists (in the same directory) with a "-license" suffix added
-+to the base-name name of the original file, and an extension of txt, html, or similar. For example
-+"tidy" is accompanied by "tidy-license.txt".
-+=========================================
-+END OF textmate/javadoc.tmbundle NOTICES AND INFORMATION
-+
-+%% textmate/javascript.tmbundle NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+Copyright (c) textmate-javascript.tmbundle project authors
-+
-+If not otherwise specified (see below), files in this repository fall under the following license:
-+
-+Permission to copy, use, modify, sell and distribute this
-+software is granted. This software is provided "as is" without
-+express or implied warranty, and with no claim as to its
-+suitability for any purpose.
-+
-+An exception is made for files in readable text which contain their own license information,
-+or files where an accompanying file exists (in the same directory) with a "-license" suffix added
-+to the base-name name of the original file, and an extension of txt, html, or similar. For example
-+"tidy" is accompanied by "tidy-license.txt".
-+=========================================
-+END OF textmate/javascript.tmbundle NOTICES AND INFORMATION
-+
-+%% textmate/lua.tmbundle NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+Copyright (c) textmate-lua.tmbundle project authors
-+
-+If not otherwise specified (see below), files in this repository fall under the following license:
-+
-+Permission to copy, use, modify, sell and distribute this
-+software is granted. This software is provided "as is" without
-+express or implied warranty, and with no claim as to its
-+suitability for any purpose.
-+
-+An exception is made for files in readable text which contain their own license information,
-+or files where an accompanying file exists (in the same directory) with a "-license" suffix added
-+to the base-name name of the original file, and an extension of txt, html, or similar. For example
-+"tidy" is accompanied by "tidy-license.txt".
-+=========================================
-+END OF textmate/lua.tmbundle NOTICES AND INFORMATION
-+
-+%% textmate/make.tmbundle NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+Copyright (c) textmate-make.tmbundle project authors
-+
-+If not otherwise specified (see below), files in this repository fall under the following license:
-+
-+Permission to copy, use, modify, sell and distribute this
-+software is granted. This software is provided "as is" without
-+express or implied warranty, and with no claim as to its
-+suitability for any purpose.
-+
-+An exception is made for files in readable text which contain their own license information,
-+or files where an accompanying file exists (in the same directory) with a "-license" suffix added
-+to the base-name name of the original file, and an extension of txt, html, or similar. For example
-+"tidy" is accompanied by "tidy-license.txt".
-+=========================================
-+END OF textmate/make.tmbundle NOTICES AND INFORMATION
-+
-+%% textmate/markdown.tmbundle NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+Copyright (c) markdown.tmbundle authors
-+
-+If not otherwise specified (see below), files in this repository fall under the following license:
-+
-+Permission to copy, use, modify, sell and distribute this
-+software is granted. This software is provided "as is" without
-+express or implied warranty, and with no claim as to its
-+suitability for any purpose.
-+
-+An exception is made for files in readable text which contain their own license information,
-+or files where an accompanying file exists (in the same directory) with a "-license" suffix added
-+to the base-name name of the original file, and an extension of txt, html, or similar. For example
-+"tidy" is accompanied by "tidy-license.txt".
-+=========================================
-+END OF textmate/markdown.tmbundle NOTICES AND INFORMATION
-+
-+%% textmate/objective-c.tmbundle NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+Copyright (c) textmate-objective-c.tmbundle project authors
-+
-+If not otherwise specified (see below), files in this repository fall under the following license:
-+
-+Permission to copy, use, modify, sell and distribute this
-+software is granted. This software is provided "as is" without
-+express or implied warranty, and with no claim as to its
-+suitability for any purpose.
-+
-+An exception is made for files in readable text which contain their own license information,
-+or files where an accompanying file exists (in the same directory) with a "-license" suffix added
-+to the base-name name of the original file, and an extension of txt, html, or similar. For example
-+"tidy" is accompanied by "tidy-license.txt".
-+=========================================
-+END OF textmate/objective-c.tmbundle NOTICES AND INFORMATION
-+
-+%% textmate/perl.tmbundle NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+Copyright (c) textmate-perl.tmbundle project authors
-+
-+If not otherwise specified (see below), files in this repository fall under the following license:
-+
-+Permission to copy, use, modify, sell and distribute this
-+software is granted. This software is provided "as is" without
-+express or implied warranty, and with no claim as to its
-+suitability for any purpose.
-+
-+An exception is made for files in readable text which contain their own license information,
-+or files where an accompanying file exists (in the same directory) with a "-license" suffix added
-+to the base-name name of the original file, and an extension of txt, html, or similar. For example
-+"tidy" is accompanied by "tidy-license.txt".
-+=========================================
-+END OF textmate/perl.tmbundle NOTICES AND INFORMATION
-+
-+%% textmate/r.tmbundle NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+Copyright (c) textmate-r.tmbundle project authors
-+
-+If not otherwise specified (see below), files in this folder fall under the following license:
-+
-+Permission to copy, use, modify, sell and distribute this
-+software is granted. This software is provided "as is" without
-+express or implied warranty, and with no claim as to its
-+suitability for any purpose.
-+=========================================
-+END OF textmate/r.tmbundle NOTICES AND INFORMATION
-+
-+%% textmate/ruby.tmbundle NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+Copyright (c) textmate-ruby.tmbundle project authors
-+
-+If not otherwise specified (see below), files in this folder fall under the following license:
-+
-+Permission to copy, use, modify, sell and distribute this
-+software is granted. This software is provided "as is" without
-+express or implied warranty, and with no claim as to its
-+suitability for any purpose.
-+
-+An exception is made for files in readable text which contain their own license information,
-+or files where an accompanying file exists (in the same directory) with a "-license" suffix added
-+to the base-name name of the original file, and an extension of txt, html, or similar. For example
-+"tidy" is accompanied by "tidy-license.txt".
-+=========================================
-+END OF textmate/ruby.tmbundle NOTICES AND INFORMATION
-+
-+%% textmate/shellscript.tmbundle NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+Copyright (c) textmate-shellscript.tmbundle project authors
-+
-+If not otherwise specified (see below), files in this repository fall under the following license:
-+
-+Permission to copy, use, modify, sell and distribute this
-+software is granted. This software is provided "as is" without
-+express or implied warranty, and with no claim as to its
-+suitability for any purpose.
-+
-+An exception is made for files in readable text which contain their own license information,
-+or files where an accompanying file exists (in the same directory) with a "-license" suffix added
-+to the base-name name of the original file, and an extension of txt, html, or similar. For example
-+"tidy" is accompanied by "tidy-license.txt".
-+=========================================
-+END OF textmate/shellscript.tmbundle NOTICES AND INFORMATION
-+
-+%% textmate/sql.tmbundle NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+Copyright (c) textmate-sql.tmbundle project authors
-+
-+If not otherwise specified (see below), files in this folder fall under the following license:
-+
-+Permission to copy, use, modify, sell and distribute this
-+software is granted. This software is provided "as is" without
-+express or implied warranty, and with no claim as to its
-+suitability for any purpose.
-+
-+An exception is made for files in readable text which contain their own license information,
-+or files where an accompanying file exists (in the same directory) with a "-license" suffix added
-+to the base-name name of the original file, and an extension of txt, html, or similar. For example
-+"tidy" is accompanied by "tidy-license.txt".
-+=========================================
-+END OF textmate/sql.tmbundle NOTICES AND INFORMATION
-+
-+%% textmate/yaml.tmbundle NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+Copyright (c) 2015 FichteFoll <fichtefoll2@googlemail.com>
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy
-+of this software and associated documentation files (the "Software"), to deal
-+in the Software without restriction, including without limitation the rights
-+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+copies of the Software, and to permit persons to whom the Software is
-+furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in all
-+copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+=========================================
-+END OF textmate/yaml.tmbundle NOTICES AND INFORMATION
-+
-+%% typescript-legacy NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+Copyright (c) Microsoft Corporation. All rights reserved.
-+
-+Apache License
-+
-+Version 2.0, January 2004
-+
-+http://www.apache.org/licenses/
-+
-+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-+
-+1. Definitions.
-+
-+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
-+
-+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
-+
-+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-+
-+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
-+
-+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
-+
-+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
-+
-+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
-+
-+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
-+
-+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
-+
-+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
-+
-+2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
-+
-+3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
-+
-+4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
-+
-+You must give any other recipients of the Work or Derivative Works a copy of this License; and
-+
-+You must cause any modified files to carry prominent notices stating that You changed the files; and
-+
-+You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
-+
-+If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
-+
-+5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
-+
-+6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
-+
-+7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
-+
-+8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
-+
-+9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
-+
-+END OF TERMS AND CONDITIONS
-+=========================================
-+END OF typescript-legacy NOTICES AND INFORMATION
-+
-+%% TypeScript-TmLanguage NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+Copyright (c) Microsoft Corporation.  All rights reserved.
-+
-+                                Apache License
-+                           Version 2.0, January 2004
-+                        http://www.apache.org/licenses/
-+
-+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-+
-+   1. Definitions.
-+
-+      "License" shall mean the terms and conditions for use, reproduction,
-+      and distribution as defined by Sections 1 through 9 of this document.
-+
-+      "Licensor" shall mean the copyright owner or entity authorized by
-+      the copyright owner that is granting the License.
-+
-+      "Legal Entity" shall mean the union of the acting entity and all
-+      other entities that control, are controlled by, or are under common
-+      control with that entity. For the purposes of this definition,
-+      "control" means (i) the power, direct or indirect, to cause the
-+      direction or management of such entity, whether by contract or
-+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-+      outstanding shares, or (iii) beneficial ownership of such entity.
-+
-+      "You" (or "Your") shall mean an individual or Legal Entity
-+      exercising permissions granted by this License.
-+
-+      "Source" form shall mean the preferred form for making modifications,
-+      including but not limited to software source code, documentation
-+      source, and configuration files.
-+
-+      "Object" form shall mean any form resulting from mechanical
-+      transformation or translation of a Source form, including but
-+      not limited to compiled object code, generated documentation,
-+      and conversions to other media types.
-+
-+      "Work" shall mean the work of authorship, whether in Source or
-+      Object form, made available under the License, as indicated by a
-+      copyright notice that is included in or attached to the work
-+      (an example is provided in the Appendix below).
-+
-+      "Derivative Works" shall mean any work, whether in Source or Object
-+      form, that is based on (or derived from) the Work and for which the
-+      editorial revisions, annotations, elaborations, or other modifications
-+      represent, as a whole, an original work of authorship. For the purposes
-+      of this License, Derivative Works shall not include works that remain
-+      separable from, or merely link (or bind by name) to the interfaces of,
-+      the Work and Derivative Works thereof.
-+
-+      "Contribution" shall mean any work of authorship, including
-+      the original version of the Work and any modifications or additions
-+      to that Work or Derivative Works thereof, that is intentionally
-+      submitted to Licensor for inclusion in the Work by the copyright owner
-+      or by an individual or Legal Entity authorized to submit on behalf of
-+      the copyright owner. For the purposes of this definition, "submitted"
-+      means any form of electronic, verbal, or written communication sent
-+      to the Licensor or its representatives, including but not limited to
-+      communication on electronic mailing lists, source code control systems,
-+      and issue tracking systems that are managed by, or on behalf of, the
-+      Licensor for the purpose of discussing and improving the Work, but
-+      excluding communication that is conspicuously marked or otherwise
-+      designated in writing by the copyright owner as "Not a Contribution."
-+
-+      "Contributor" shall mean Licensor and any individual or Legal Entity
-+      on behalf of whom a Contribution has been received by Licensor and
-+      subsequently incorporated within the Work.
-+
-+   2. Grant of Copyright License. Subject to the terms and conditions of
-+      this License, each Contributor hereby grants to You a perpetual,
-+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-+      copyright license to reproduce, prepare Derivative Works of,
-+      publicly display, publicly perform, sublicense, and distribute the
-+      Work and such Derivative Works in Source or Object form.
-+
-+   3. Grant of Patent License. Subject to the terms and conditions of
-+      this License, each Contributor hereby grants to You a perpetual,
-+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-+      (except as stated in this section) patent license to make, have made,
-+      use, offer to sell, sell, import, and otherwise transfer the Work,
-+      where such license applies only to those patent claims licensable
-+      by such Contributor that are necessarily infringed by their
-+      Contribution(s) alone or by combination of their Contribution(s)
-+      with the Work to which such Contribution(s) was submitted. If You
-+      institute patent litigation against any entity (including a
-+      cross-claim or counterclaim in a lawsuit) alleging that the Work
-+      or a Contribution incorporated within the Work constitutes direct
-+      or contributory patent infringement, then any patent licenses
-+      granted to You under this License for that Work shall terminate
-+      as of the date such litigation is filed.
-+
-+   4. Redistribution. You may reproduce and distribute copies of the
-+      Work or Derivative Works thereof in any medium, with or without
-+      modifications, and in Source or Object form, provided that You
-+      meet the following conditions:
-+
-+      (a) You must give any other recipients of the Work or
-+          Derivative Works a copy of this License; and
-+
-+      (b) You must cause any modified files to carry prominent notices
-+          stating that You changed the files; and
-+
-+      (c) You must retain, in the Source form of any Derivative Works
-+          that You distribute, all copyright, patent, trademark, and
-+          attribution notices from the Source form of the Work,
-+          excluding those notices that do not pertain to any part of
-+          the Derivative Works; and
-+
-+      (d) If the Work includes a "NOTICE" text file as part of its
-+          distribution, then any Derivative Works that You distribute must
-+          include a readable copy of the attribution notices contained
-+          within such NOTICE file, excluding those notices that do not
-+          pertain to any part of the Derivative Works, in at least one
-+          of the following places: within a NOTICE text file distributed
-+          as part of the Derivative Works; within the Source form or
-+          documentation, if provided along with the Derivative Works; or,
-+          within a display generated by the Derivative Works, if and
-+          wherever such third-party notices normally appear. The contents
-+          of the NOTICE file are for informational purposes only and
-+          do not modify the License. You may add Your own attribution
-+          notices within Derivative Works that You distribute, alongside
-+          or as an addendum to the NOTICE text from the Work, provided
-+          that such additional attribution notices cannot be construed
-+          as modifying the License.
-+
-+      You may add Your own copyright statement to Your modifications and
-+      may provide additional or different license terms and conditions
-+      for use, reproduction, or distribution of Your modifications, or
-+      for any such Derivative Works as a whole, provided Your use,
-+      reproduction, and distribution of the Work otherwise complies with
-+      the conditions stated in this License.
-+
-+   5. Submission of Contributions. Unless You explicitly state otherwise,
-+      any Contribution intentionally submitted for inclusion in the Work
-+      by You to the Licensor shall be under the terms and conditions of
-+      this License, without any additional terms or conditions.
-+      Notwithstanding the above, nothing herein shall supersede or modify
-+      the terms of any separate license agreement you may have executed
-+      with Licensor regarding such Contributions.
-+
-+   6. Trademarks. This License does not grant permission to use the trade
-+      names, trademarks, service marks, or product names of the Licensor,
-+      except as required for reasonable and customary use in describing the
-+      origin of the Work and reproducing the content of the NOTICE file.
-+
-+   7. Disclaimer of Warranty. Unless required by applicable law or
-+      agreed to in writing, Licensor provides the Work (and each
-+      Contributor provides its Contributions) on an "AS IS" BASIS,
-+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-+      implied, including, without limitation, any warranties or conditions
-+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-+      PARTICULAR PURPOSE. You are solely responsible for determining the
-+      appropriateness of using or redistributing the Work and assume any
-+      risks associated with Your exercise of permissions under this License.
-+
-+   8. Limitation of Liability. In no event and under no legal theory,
-+      whether in tort (including negligence), contract, or otherwise,
-+      unless required by applicable law (such as deliberate and grossly
-+      negligent acts) or agreed to in writing, shall any Contributor be
-+      liable to You for damages, including any direct, indirect, special,
-+      incidental, or consequential damages of any character arising as a
-+      result of this License or out of the use or inability to use the
-+      Work (including but not limited to damages for loss of goodwill,
-+      work stoppage, computer failure or malfunction, or any and all
-+      other commercial damages or losses), even if such Contributor
-+      has been advised of the possibility of such damages.
-+
-+   9. Accepting Warranty or Additional Liability. While redistributing
-+      the Work or Derivative Works thereof, You may choose to offer,
-+      and charge a fee for, acceptance of support, warranty, indemnity,
-+      or other liability obligations and/or rights consistent with this
-+      License. However, in accepting such obligations, You may act only
-+      on Your own behalf and on Your sole responsibility, not on behalf
-+      of any other Contributor, and only if You agree to indemnify,
-+      defend, and hold each Contributor harmless for any liability
-+      incurred by, or claims asserted against, such Contributor by reason
-+      of your accepting any such warranty or additional liability.
-+
-+   END OF TERMS AND CONDITIONS
-+=========================================
-+END OF TypeScript-TmLanguage NOTICES AND INFORMATION
-+
-+%% vscode-swift NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+The MIT License (MIT)
-+
-+Copyright (c) 2015 David Owens II
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy
-+of this software and associated documentation files (the "Software"), to deal
-+in the Software without restriction, including without limitation the rights
-+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+copies of the Software, and to permit persons to whom the Software is
-+furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in all
-+copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+=========================================
-+END OF vscode-swift NOTICES AND INFORMATION
-+>>>>>>> .their
-changed in both
-  base   100644 f1f94f729ed51fcafc7c1ce9b26b392b1c36c0b1 build/gulpfile.vscode.js
-  our    100644 d79071e56bcfc53b3448052cc08bd7247bd7e789 build/gulpfile.vscode.js
-  their  100644 6d53b8c19f021452ab16b0b450563f34c29b79d1 build/gulpfile.vscode.js
-@@ -46,11 +46,17 @@
- // Build
- const builtInExtensions = require('./builtInExtensions.json');
- 
-+<<<<<<< .our
- const excludedExtensions = [
- 	'vscode-api-tests',
- 	'vscode-colorize-tests',
- 	'ms-vscode.node-debug',
- 	'ms-vscode.node-debug2',
-+=======
-+const builtInExtensions = [
-+	{ name: 'ms-vscode.node-debug', version: '1.10.21' },
-+	{ name: 'ms-vscode.node-debug2', version: '1.10.0' }
-+>>>>>>> .their
- ];
- 
- const vscodeEntryPoints = _.flatten([
-removed in local
-  base   100644 f0a0b4ffd9d4e24284a52a5b768ff636addbc808 extensions/html/server/npm-shrinkwrap.json
-  their  100644 775f46c0b479af4137d04352ec6dd7439f786b4c extensions/html/server/npm-shrinkwrap.json
-removed in local
-  base   100644 e832be455869138aefc4e15771df749f316c871c extensions/html/server/package.json
-  their  100644 e8c38a75bcef8c8095259220348a57a99673e4d0 extensions/html/server/package.json
-added in remote
-  their  100644 f43b14c8d77b25664fb94017ddccbb3a9ca31b3e extensions/markdown/media/csp.js
-@@ -0,0 +1,32 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+'use strict';
-+
-+(function () {
-+	const settings = JSON.parse(document.getElementById('vscode-markdown-preview-data').getAttribute('data-settings'));
-+	const strings = JSON.parse(document.getElementById('vscode-markdown-preview-data').getAttribute('data-strings'));
-+
-+	let didShow = false;
-+
-+	document.addEventListener('securitypolicyviolation', () => {
-+		if (didShow) {
-+			return;
-+		}
-+		didShow = true;
-+		const args = [settings.previewUri];
-+
-+		const notification = document.createElement('a');
-+		notification.innerText = strings.cspAlertMessageText;
-+		notification.setAttribute('id', 'code-csp-warning');
-+		notification.setAttribute('title', strings.cspAlertMessageTitle);
-+
-+		notification.setAttribute('role', 'button');
-+		notification.setAttribute('aria-label',  strings.cspAlertMessageLabel);
-+		notification.setAttribute('href', `command:markdown.showPreviewSecuritySelector?${encodeURIComponent(JSON.stringify(args))}`);
-+
-+		document.body.appendChild(notification);
-+	});
-+}());
-\ No newline at end of file
-removed in local
-  base   100644 c4614d853aa2f63e9473f5558fae5de4c88d1a77 extensions/markdown/media/main.js
-  their  100644 f927c0fa90f4a04281d19da1a53adf38282bc0db extensions/markdown/media/main.js
-removed in local
-  base   100644 7cefe421dc67afdb0bbed4b9810285538104eb8f extensions/markdown/media/markdown.css
-  their  100644 dfb4666bd194a42fe49225492b575e7f53fb0633 extensions/markdown/media/markdown.css
-removed in local
-  base   100644 0f93176c5558515fed800fb4da3b2d8c7c5819db extensions/markdown/npm-shrinkwrap.json
-  their  100644 de14b48e12d8439a92359f75d224151b933a12b4 extensions/markdown/npm-shrinkwrap.json
-removed in local
-  base   100644 593c213056bd42cf069bc3e7845c32ad4a3b232b extensions/markdown/package.json
-  their  100644 713e53b873dc660182becf26d2fd7e201663c55c extensions/markdown/package.json
-removed in local
-  base   100644 253ab8910ef122f0cd9ea7f1f81a3015c2a3ab52 extensions/markdown/package.nls.json
-  their  100644 c79bb2952a9704841014cb67f2e46aab53ae5444 extensions/markdown/package.nls.json
-removed in local
-  base   100644 354d380c7fb6cda68a877f1248cd738db7c30e1c extensions/markdown/src/extension.ts
-  their  100644 1220ffe9f0cb8fc40429a8149caa31b45af99b38 extensions/markdown/src/extension.ts
-removed in local
-  base   100644 6a65997b19f3618d38a55f3632d8ed58c20075e0 extensions/markdown/src/previewContentProvider.ts
-  their  100644 dd6b91e9ade1bf2a5d0d14259ae2b7eeccb67a8a extensions/markdown/src/previewContentProvider.ts
-removed in local
-  base   100644 7e8097e8fb437921d0a4e2cd8261ffbab40299c1 extensions/markdown/tsconfig.json
-  their  100644 e877d8142f07d5898f25aae9e8d3eac6383d297a extensions/markdown/tsconfig.json
-removed in local
-  base   100644 7aae00d5e34941c75e41ffbb0732b8d529ed4a73 extensions/typescript/src/typescriptServiceClient.ts
-  their  100644 8e9608405b11d474290db073433de54015e8a0cb extensions/typescript/src/typescriptServiceClient.ts
-changed in both
-  base   100644 a43fc96b5f089465788f2ea4fa21f07d2c61cedf i18n/chs/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
-  our    100644 740dec3dd6baf682907b9a1ae3c43d4130709b5b i18n/chs/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
-  their  100644 128118eee78a8f33cc28d6c425b3954873f15113 i18n/chs/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,6 +14,11 @@
- 	"rootPath": "工作区路径 (例如 /Users/Development/myWorkspace)",
- 	"folderName": "文件所在工作区文件夹的名称 (例如 myFolder)",
- 	"folderPath": "文件所在工作区文件夹的路径 (例如 /Users/Development/myFolder)",
-+=======
-+	"activeEditorLong": "e.g. /Users/Development/myProject/myFolder/myFile.txt",
-+	"activeEditorMedium": "e.g. myFolder/myFile.txt",
-+	"activeEditorShort": "例如 myFile.txt",
-+>>>>>>> .their
- 	"appName": "例如 VS Code",
- 	"dirty": "一个更新的指示器，指示活动编辑器是否更新",
- 	"separator": "一个条件分隔符(\"-\")，仅在左右是具有值的变量时才显示",
-changed in both
-  base   100644 307714c97a532de1811e1f2dc3f8c7b6122dff77 i18n/chs/extensions/css/package.i18n.json
-  our    100644 52369e22e58426a42b55c9ff7f02f2eb23faa940 i18n/chs/extensions/css/package.i18n.json
-  their  100644 4d50df86f6599d35291d5b131b90ce849cb96e93 i18n/chs/extensions/css/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,66 @@
- 	],
- 	"displayName": "CSS 语言基础功能",
- 	"description": "为 CSS、LESS 和 SCSS 文件中提供语法高亮和括号匹配功能。"
-+=======
-+	"css.colorDecorators.enable.desc": "启用或禁用颜色修饰器",
-+	"css.lint.argumentsInColorFunction.desc": "参数数量无效",
-+	"css.lint.boxModel.desc": "使用边距或边框时，不要使用宽度或高度",
-+	"css.lint.compatibleVendorPrefixes.desc": "使用供应商特定前缀时，确保同时包括所有其他供应商特定属性",
-+	"css.lint.duplicateProperties.desc": "不要使用重复的样式定义",
-+	"css.lint.emptyRules.desc": "不要使用空规则集",
-+	"css.lint.float.desc": "避免使用“float”。浮动会带来脆弱的 CSS，如果布局的某一方面更改，将很容易破坏 CSS。",
-+	"css.lint.fontFaceProperties.desc": "@font-face 规则必须定义 \"src\" 和 \"font-family\" 属性",
-+	"css.lint.hexColorLength.desc": "十六进制颜色必须由三个或六个十六进制数字组成",
-+	"css.lint.idSelector.desc": "选择器不应包含 ID，因为这些规则与 HTML 的耦合过于紧密。",
-+	"css.lint.ieHack.desc": "仅当支持 IE7 及更低版本时，才需要 IE hack",
-+	"css.lint.importStatement.desc": "Import 语句不会并行加载",
-+	"css.lint.important.desc": "避免使用 !important。它表明整个 CSS 的特异性已经失去控制且需要重构。",
-+	"css.lint.propertyIgnoredDueToDisplay.desc": "因显示而忽略属性。例如，使用 \"display: inline\"时，宽度、高度、上边距、下边距和 float 属性将不起作用",
-+	"css.lint.universalSelector.desc": "已知通配选择符 (*) 慢",
-+	"css.lint.unknownProperties.desc": "未知的属性。",
-+	"css.lint.unknownVendorSpecificProperties.desc": "未知的供应商特定属性。",
-+	"css.lint.vendorPrefix.desc": "使用供应商特定前缀时，还应包括标准属性",
-+	"css.lint.zeroUnits.desc": "零不需要单位",
-+	"css.validate.desc": "启用或禁用所有验证",
-+	"less.colorDecorators.enable.desc": "启用或禁用颜色修饰器",
-+	"less.lint.argumentsInColorFunction.desc": "参数数量无效",
-+	"less.lint.boxModel.desc": "使用边距或边框时，不要使用宽度或高度",
-+	"less.lint.compatibleVendorPrefixes.desc": "使用供应商特定前缀时，确保同时包括所有其他供应商特定属性",
-+	"less.lint.duplicateProperties.desc": "不要使用重复的样式定义",
-+	"less.lint.emptyRules.desc": "不要使用空规则集",
-+	"less.lint.float.desc": "避免使用“float”。浮动会带来脆弱的 CSS，如果布局的某一方面更改，将很容易破坏 CSS。",
-+	"less.lint.fontFaceProperties.desc": "@font-face 规则必须定义 \"src\" 和 \"font-family\" 属性",
-+	"less.lint.hexColorLength.desc": "十六进制颜色必须由三个或六个十六进制数字组成",
-+	"less.lint.idSelector.desc": "选择器不应包含 ID，因为这些规则与 HTML 的耦合过于紧密。",
-+	"less.lint.ieHack.desc": "仅当支持 IE7 及更低版本时，才需要 IE hack",
-+	"less.lint.importStatement.desc": "Import 语句不会并行加载",
-+	"less.lint.important.desc": "避免使用 !important。它表明整个 CSS 的特异性已经失去控制且需要重构。",
-+	"less.lint.propertyIgnoredDueToDisplay.desc": "因显示而忽略属性。例如，使用 \"display: inline\"时，宽度、高度、上边距、下边距和 float 属性将不起作用",
-+	"less.lint.universalSelector.desc": "已知通配选择符 (*) 慢",
-+	"less.lint.unknownProperties.desc": "未知的属性。",
-+	"less.lint.unknownVendorSpecificProperties.desc": "未知的供应商特定属性。",
-+	"less.lint.vendorPrefix.desc": "使用供应商特定前缀时，还应包括标准属性",
-+	"less.lint.zeroUnits.desc": "零不需要单位",
-+	"less.validate.desc": "启用或禁用所有验证",
-+	"scss.colorDecorators.enable.desc": "启用或禁用颜色修饰器",
-+	"scss.lint.argumentsInColorFunction.desc": "参数数量无效",
-+	"scss.lint.boxModel.desc": "使用边距或边框时，不要使用宽度或高度",
-+	"scss.lint.compatibleVendorPrefixes.desc": "使用供应商特定前缀时，确保同时包括所有其他供应商特定属性",
-+	"scss.lint.duplicateProperties.desc": "不要使用重复的样式定义",
-+	"scss.lint.emptyRules.desc": "不要使用空规则集",
-+	"scss.lint.float.desc": "避免使用“float”。浮动会带来脆弱的 CSS，如果布局的某一方面更改，将很容易破坏 CSS。",
-+	"scss.lint.fontFaceProperties.desc": "@font-face 规则必须定义 \"src\" 和 \"font-family\" 属性",
-+	"scss.lint.hexColorLength.desc": "十六进制颜色必须由三个或六个十六进制数字组成",
-+	"scss.lint.idSelector.desc": "选择器不应包含 ID，因为这些规则与 HTML 的耦合过于紧密。",
-+	"scss.lint.ieHack.desc": "仅当支持 IE7 及更低版本时，才需要 IE hack",
-+	"scss.lint.importStatement.desc": "Import 语句不会并行加载",
-+	"scss.lint.important.desc": "避免使用 !important。它表明整个 CSS 的特异性已经失去控制且需要重构。",
-+	"scss.lint.propertyIgnoredDueToDisplay.desc": "因显示而忽略属性。例如，使用 \"display: inline\"时，宽度、高度、上边距、下边距和 float 属性将不起作用",
-+	"scss.lint.universalSelector.desc": "已知通配选择符 (*) 慢",
-+	"scss.lint.unknownProperties.desc": "未知的属性。",
-+	"scss.lint.unknownVendorSpecificProperties.desc": "未知的供应商特定属性。",
-+	"scss.lint.vendorPrefix.desc": "使用供应商特定前缀时，还应包括标准属性",
-+	"scss.lint.zeroUnits.desc": "零不需要单位",
-+	"scss.validate.desc": "启用或禁用所有验证"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 fc1422d53774b88b11458dba1b2ae0c2dd76f6b4 i18n/chs/extensions/git/out/askpass-main.i18n.json
-  their  100644 cd8bc885e08a505f0906b820e8b6e624012d1db7 i18n/chs/extensions/git/out/askpass-main.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"missOrInvalid": "凭据丢失或无效。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 a6aac279617213ecac229b548d43ead3deded22f i18n/chs/extensions/git/out/commands.i18n.json
-  our    100644 04fae89946b4fff2a3f253e57b9b96d137dedd28 i18n/chs/extensions/git/out/commands.i18n.json
-  their  100644 28ab3fa0670c5d6b4409f36815862ebe7d9a199b i18n/chs/extensions/git/out/commands.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -49,6 +50,18 @@
- 	"commit": "仍要提交",
- 	"no staged changes": "现在没有暂存的更改以供提交\n\n是否要直接自动暂存所有更改并提交？",
- 	"always": "始终",
-+=======
-+	"branch name": "分支名称",
-+	"clean": "清理更改",
-+	"clean repo": "在签出前，请清理存储库工作树。",
-+	"cloning": "正在克隆 GIT 存储库...",
-+	"commit message": "提交消息",
-+	"confirm clean": "是否确定要清理“{0}”中的更改?",
-+	"confirm clean all": "是否确定要清理所有更改?",
-+	"confirm revert": "是否确实要还原 {0} 中的已选更改?",
-+	"disabled": "此工作区已禁用或不支持 GIT",
-+	"never again": "好，永不再显示",
-+>>>>>>> .their
- 	"no changes": "没有要提交的更改。",
- 	"commit message": "提交消息",
- 	"provide commit message": "请提供提交消息",
-@@ -73,6 +86,7 @@
- 	"nobranch": "请签出一个分支以推送到远程。",
- 	"confirm publish branch": "分支“{0}”没有上游分支。您要发布此分支吗?",
- 	"ok": "确定",
-+<<<<<<< .our
- 	"push with tags success": "已成功带标签进行推送。",
- 	"pick remote": "选取要将分支“{0}”发布到的远程:",
- 	"sync is unpredictable": "此操作将推送提交至“{0}/{1}”，并从中拉取提交。",
-@@ -88,4 +102,18 @@
- 	"git error details": "Git: {0}",
- 	"git error": "Git 错误",
- 	"open git log": "打开 Git 日志"
-+=======
-+	"open git log": "打开 GIT 日志",
-+	"openrepo": "打开存储库",
-+	"parent": "父目录",
-+	"pick remote": "选取要将分支“{0}”发布到的远程:",
-+	"proposeopen": "是否要打开已克隆存储库?",
-+	"provide branch name": "请提供分支名称",
-+	"provide commit message": "请提供提交消息",
-+	"remote branch at": "{0} 处的远程分支",
-+	"repourl": "存储库 URL",
-+	"revert": "还原更改",
-+	"sync is unpredictable": "此操作从“{0}”推送和拉取提交。",
-+	"tag at": "{0} 处的标记"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 b2050835c0e46881afad752e4edf97dfab05f2f2 i18n/chs/extensions/git/out/main.i18n.json
-  our    100644 3af01415f05ae75fb174e6a205b809fd4906163a i18n/chs/extensions/git/out/main.i18n.json
-  their  100644 cf04f8a5c0fbbb492abdca2ca3380b1e993c4a8d i18n/chs/extensions/git/out/main.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,4 +14,9 @@
- 	"notfound": "未找到 Git。请安装 Git，或在 \"git.path\" 设置中配置。",
- 	"updateGit": "更新 Git",
- 	"git20": "你似乎已安装 Git {0}。Code 和 Git 版本 >=2 一起工作最佳"
-+=======
-+	"git20": "似乎已安装 GIT {0}。Code 非常适合 GIT >= 2",
-+	"updateGit": "更新 GIT",
-+	"using git": "使用 {1} 中的 GIT {0}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 992c769b08a92b25b31efa7d951da2bef9672672 i18n/chs/extensions/git/package.i18n.json
-  our    100644 7c2a3b49c9f848f60d2957657294486b061a17aa i18n/chs/extensions/git/package.i18n.json
-  their  100644 01d4690506054f58948f3d88caed50c507850243 i18n/chs/extensions/git/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,19 @@
- 	"command.init": "初始化存储库",
- 	"command.close": "关闭存储库",
- 	"command.refresh": "刷新",
-+=======
-+	"command.branch": "创建分支...",
-+	"command.checkout": "签出到...",
-+	"command.clean": "清理文件",
-+	"command.cleanAll": "清理所有文件",
-+	"command.clone": "克隆",
-+	"command.commit": "提交",
-+	"command.commitAll": "全部提交",
-+	"command.commitAllSigned": "全部提交(已注销)",
-+	"command.commitStaged": "提交已暂存文件",
-+	"command.commitStagedSigned": "提交已暂存文件(已注销)",
-+	"command.init": "初始化存储库",
-+>>>>>>> .their
- 	"command.openChange": "打开更改",
- 	"command.openFile": "打开文件",
- 	"command.openHEADFile": "打开文件 (HEAD)",
-@@ -46,6 +60,7 @@
- 	"command.pullFrom": "拉取自...",
- 	"command.push": "推送",
- 	"command.pushTo": "推送到...",
-+<<<<<<< .our
- 	"command.pushWithTags": "带标签推送",
- 	"command.sync": "同步",
- 	"command.syncRebase": "同步(变基)",
-@@ -84,4 +99,25 @@
- 	"colors.ignored": "已忽略资源的颜色。",
- 	"colors.conflict": "存在冲突的资源的颜色。",
- 	"colors.submodule": "子模块资源的颜色。"
-+=======
-+	"command.refresh": "刷新",
-+	"command.revertSelectedRanges": "还原所选更改",
-+	"command.showOutput": "显示 GIT 输出",
-+	"command.stage": "暂存文件",
-+	"command.stageAll": "暂存所有文件",
-+	"command.stageSelectedRanges": "暂存所选范围",
-+	"command.sync": "同步",
-+	"command.undoCommit": "撤消上次提交",
-+	"command.unstage": "取消暂存文件",
-+	"command.unstageAll": "取消暂存所有文件",
-+	"command.unstageSelectedRanges": "取消暂存所选范围",
-+	"config.autofetch": "是否启用了自动提取",
-+	"config.autorefresh": "是否已启用自动刷新",
-+	"config.checkoutType": "控制列出哪些分支类型",
-+	"config.confirmSync": "同步 GIT 存储库前请先进行确认",
-+	"config.countBadge": "控制 GIT 徽章计数器",
-+	"config.enableLongCommitWarning": "是否应警告提交长段消息",
-+	"config.enabled": "是否已启用 GIT",
-+	"config.path": "可执行 GIT 的路径"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 1d385873b115ef823a6a19ab6050a6ba74fbfd9e i18n/chs/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
-  their  100644 1b777756992f28aa4ff0ede59e6730023fc3044e i18n/chs/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"typescript.jsDocCompletionItem.documentation": "JSDoc 注释"
- }
-\ No newline at end of file
-changed in both
-  base   100644 f2b0b6664a95f41de03d22871704e935ff5372f9 i18n/chs/extensions/typescript/out/utils/projectStatus.i18n.json
-  our    100644 cd5096356f34e726e0561aaa535c414ec977b920 i18n/chs/extensions/typescript/out/utils/projectStatus.i18n.json
-  their  100644 d2e24dc3773fbb6e84c3641849fc8d4262871c47 i18n/chs/extensions/typescript/out/utils/projectStatus.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,11 @@
- 	],
- 	"hintExclude": "若要启用项目范围内的 JavaScript/TypeScript 语言功能，请排除包含多个文件的文件夹，例如: {0}",
- 	"hintExclude.generic": "若要启用项目范围内的 JavaScript/TypeScript 语言功能，请排除包含不需要处理的源文件的大型文件夹。",
-+=======
-+	"hintExclude": "若要启用项目范围内的 JavaScript/TypeScript 语言功能，请排除包含多个文件的文件夹，例如: {0}",
-+	"hintExclude.generic": "若要启用项目范围内的 JavaScript/TypeScript 语言功能，请排除包含不需要处理的源文件的大型文件夹。",
-+	"hintExclude.tooltip": "若要启用项目范围内的 JavaScript/TypeScript 语言功能，请排除包含不需要处理的源文件的大型文件夹。",
-+>>>>>>> .their
- 	"large.label": "配置排除",
- 	"hintExclude.tooltip": "若要启用项目范围内的 JavaScript/TypeScript 语言功能，请排除包含不需要处理的源文件的大型文件夹。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 c26c184ee9bf5d2822e894a6f083a68f07e5a017 i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 e4c993e2df857650110681bbfaaa48507f4e2ec6 i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 cd714b45c5a92290667093976d463fe1b6b7d47e i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,11 +7,22 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"acceptSuggestionOnCommitCharacter": "控制是否应接受建议的提交字符。例如，在 JavaScript 中，分号(\";\")可以为提交字符，可接受建议并键入该字符。",
-+	"acceptSuggestionOnEnter": "控制除了 \"Tab\" 键以外，是否还应接受建议的 \"Enter\" 键。帮助避免“插入新行”或“接受建议”之间出现歧义。",
-+	"autoClosingBrackets": "控制编辑器是否应该在左括号后自动插入右括号",
-+	"codeLens": "控制编辑器是否显示代码滤镜",
-+	"cursorBlinking": "控制光标动画样式，可能的值为 \"blink\"、\"smooth\"、\"phase\"、\"expand\" 和 \"solid\"",
-+	"cursorStyle": "控制光标样式，接受的值为 \"block\"、\"block-outline\"、\"line\"、\"line-thin\" 、\"underline\" 和 \"underline-thin\"",
-+	"detectIndentation": "当打开文件时，将基于文件内容检测 \"editor.tabSize\" 和 \"editor.insertSpaces\"。",
-+	"dragAndDrop": "控制编辑器是否应该允许通过拖放移动所选项。",
-+>>>>>>> .their
- 	"editorConfigurationTitle": "编辑器",
- 	"fontFamily": "控制字体系列。",
- 	"fontWeight": "控制字体粗细。",
- 	"fontSize": "以像素为单位控制字号。",
- 	"lineHeight": "控制行高。使用 0 通过字号计算行高。",
-+<<<<<<< .our
- 	"letterSpacing": "以像素为单位控制字符间距。",
- 	"lineNumbers.off": "不显示行号。",
- 	"lineNumbers.on": "将行号显示为绝对行数。",
-@@ -43,6 +55,13 @@
- 	"wordWrap": "控制折行方式。可以选择:\n - \"off\" (禁用折行)，\n - \"on\" (根据视区宽度折行)，\n - \"wordWrapColumn\" (在 \"editor.wordWrapColumn\" 处换行)\n - \"bounded\" (在视区宽度和 \"editor.wordWrapColumn\" 两者的较小者处换行)。",
- 	"wordWrapColumn": "在 \"editor.wordWrap\" 为 \"wordWrapColumn\" 或 \"bounded\" 时控制编辑器列的换行。",
- 	"wrappingIndent": "控制折行的缩进。可为 \"none\"、\"same\" 或 \"indent\" 或 \"deepIndent\"。",
-+=======
-+	"lineNumbers": "控制行号的显示。可能的值为“开”、“关”和“相对”。“相对”将显示从当前光标位置开始计数的行数。",
-+	"matchBrackets": "当选择其中一项时，将突出显示匹配的括号。",
-+	"minimap.enabled": "控制是否显示 minimap",
-+	"minimap.maxColumn": "限制最小映射的宽度，尽量多地呈现特定数量的列",
-+	"minimap.renderCharacters": "呈现某行上的实际字符(与颜色块相反)",
-+>>>>>>> .their
- 	"mouseWheelScrollSensitivity": "要对鼠标滚轮滚动事件的 \"deltaX\" 和 \"deltaY\" 使用的乘数 ",
- 	"multiCursorModifier.ctrlCmd": "映射为 \"Ctrl\" (Windows 和 Linux) 或 \"Command\" (macOS)",
- 	"multiCursorModifier.alt": "映射为 \"Alt\" (Windows 和 Linux) 或 \"Option\" (macOS)",
-@@ -112,7 +131,28 @@
- 	"codeActionsOnSaveTimeout": "在保存时运行的代码操作的超时时间。",
- 	"selectionClipboard": "控制是否支持 Linux 主剪贴板。",
- 	"sideBySide": "控制 Diff 编辑器以并排或内联形式显示差异",
-+<<<<<<< .our
- 	"ignoreTrimWhitespace": "控制差异编辑器是否将对前导空格或尾随空格的更改显示为差异",
- 	"largeFileOptimizations": "对大型文件进行特殊处理，禁用某些内存密集型功能。",
- 	"renderIndicators": "控制差异编辑器是否为已添加/删除的更改显示 +/- 指示符号"
-+=======
-+	"snippetSuggestions": "控制是否将代码段与其他建议一起显示以及它们的排序方式。",
-+	"stablePeek": "即使在双击编辑器内容或按 Esc 键时，也要保持速览编辑器的打开状态。",
-+	"suggestFontSize": "建议小组件的字号",
-+	"suggestLineHeight": "建议小组件的行高",
-+	"suggestOnTriggerCharacters": "控制键入触发器字符时是否应自动显示建议",
-+	"tabSize": "一个制表符等于的空格数。该设置在 `editor.detectIndentation` 启用时根据文件内容进行重写。",
-+	"tabSize.errorMessage": "应为 \"number\"。注意，值\"auto\"已由 \"editor.detectIndentation\" 设置替换。",
-+	"trimAutoWhitespace": "删除尾随自动插入的空格",
-+	"useTabStops": "在制表位后插入和删除空格",
-+	"wordBasedSuggestions": "启用基于字的建议。",
-+	"wordSeparators": "执行文字相关的导航或操作时将用作文字分隔符的字符",
-+	"wordWrap": "控制换行方式。可以选择:\n - \"off\" (禁用换行)，\n - \"on\" (视区换行)，\n - \"wordWrapColumn\" (在 \"editor.wordWrapColumn\" 处换行)或\n - \"bounded\" (在最小视区和 \"editor.wordWrapColumn\" 处换行)。",
-+	"wordWrap.bounded": "将在最小视区和 \"editor.wordWrapColumn\" 处换行。",
-+	"wordWrap.off": "永不换行。",
-+	"wordWrap.on": "将在视区宽度处换行。",
-+	"wordWrap.wordWrapColumn": "将在 \"editor.wordWrapColumn\" 处换行。",
-+	"wordWrapColumn": "在 \"editor.wordWrap\" 为 \"wordWrapColumn\" 或 \"bounded\" 时控制编辑器列的换行。",
-+	"wrappingIndent": "控制换行的行的缩进。可以是\"none\"、 \"same\" 或 \"indent\"。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 2351fad08aa267ad4164677f56c78f5ae55df696 i18n/chs/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
-  our    100644 43e19c32c0c39799dbcecdd695214f1db39fd964 i18n/chs/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
-  their  100644 9ee8cbb4ef15cf30a88dc17081c0a04e2aba3b35 i18n/chs/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
-@@ -20,5 +20,13 @@
- 	"meta.typeDefinitions.title": " – {0} 个类型定义",
- 	"actions.goToTypeDefinition.label": "转到类型定义",
- 	"actions.peekTypeDefinition.label": "快速查看类型定义",
-+<<<<<<< .our
- 	"multipleResults": "单击显示 {0} 个定义。"
-+=======
-+	"actions.previewDecl.label": "查看定义",
-+	"generic.noResults": "找不到定义",
-+	"meta.title": " – {0} 定义",
-+	"multipleResults": "单击显示 {0} 个定义。",
-+	"noResultWord": "未找到“{0}”的任何定义"
-+>>>>>>> .their
- }
-\ No newline at end of file
-removed in local
-  base   100644 da0d158cb77a9a8e437584d094e4c3fdaf3debec i18n/chs/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
-  their  100644 738c5faf321e22fa01b418c53d80553ecf880517 i18n/chs/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/chs/src/vs/workbench/electron-browser/commands.i18n.json
-  our    100644 983899514ca518324d9e85f57712db39d3040bbe i18n/chs/src/vs/workbench/electron-browser/commands.i18n.json
-  their  100644 3a1051dcfdad7ec7db70524f0a31f277885230df i18n/chs/src/vs/workbench/electron-browser/commands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"diffLeftRightLabel": "{0} ⟷ {1}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 1cdffaa72b00d203c06e480c0d655615b11c798d i18n/chs/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 eb24c55b636f82951f7ddca06c62ab11e05e6e73 i18n/chs/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 9bffe4874fb88dcaa1ef6be2a0373b929f82497e i18n/chs/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -34,6 +34,7 @@
- 	"sideBarLocation": "控制边栏的位置。它可显示在工作台的左侧或右侧。",
- 	"panelDefaultLocation": "控制此面板的默认位置。可显示在工作台的底部或右侧。",
- 	"statusBarVisibility": "控制工作台底部状态栏的可见性。",
-+<<<<<<< .our
- 	"activityBarVisibility": "控制工作台中活动栏的可见性。",
- 	"viewVisibility": "控制是否显示视图头部的操作项。视图头部操作项可以一直，或是仅当聚焦到和悬停在视图上时显示。",
- 	"fontAliasing": "控制工作台中字体的渲染方式\n- default: 次像素平滑字体。将在大多数非 retina 显示器上显示最清晰的文字\n- antialiased: 进行像素而不是次像素级别的字体平滑。可能会导致字体整体显示得更细\n- none: 禁用字体平滑。将显示边缘粗糙、有锯齿的文字\n- auto: 根据显示器 DPI 自动应用 \"default\" 或 \"antialiased\" 选项。",
-@@ -42,6 +43,28 @@
- 	"workbench.fontAliasing.none": "禁用字体平滑。将显示边缘粗糙、有锯齿的文字。",
- 	"workbench.fontAliasing.auto": "根据显示器 DPI 自动应用 \"default\" 或 \"antialiased\" 选项。",
- 	"enableNaturalLanguageSettingsSearch": "控制是否在设置中启用自然语言搜索模式。",
-+=======
-+	"title": "基于活动编辑器控制窗口标题。基于上下文替换变量:\n${activeEditorShort}: 例如 myFile.txt\n${activeEditorMedium}: 例如 myFolder/myFile.txt\n${activeEditorLong}:  例如 /Users/Development/myProject/myFile.txt\n${rootName}: 例如 myProject\n${rootPath}: 例如 /Users/Development/myProject\n${appName}: 例如 VS Code\n${dirty}: 一个更新指示器，指示活动编辑器是否更新\n${separator}: 一个条件分隔符(\"-\")，仅在左右是具有值的变量时才显示",
-+	"titleBarStyle": "调整窗口标题栏的外观。更改需要在完全重启后才能应用。",
-+	"view": "查看",
-+	"window.menuBarVisibility.default": "菜单仅在全屏模式下隐藏。",
-+	"window.menuBarVisibility.hidden": "菜单始终隐藏。",
-+	"window.menuBarVisibility.toggle": "菜单隐藏，但可以通过 Alt 键显示。",
-+	"window.menuBarVisibility.visible": "菜单始终可见，即使处于全屏模式下。",
-+	"window.newWindowDimensions.default": "在屏幕中心打开新窗口。",
-+	"window.newWindowDimensions.fullscreen": "在全屏模式下打开新窗口。",
-+	"window.newWindowDimensions.inherit": "以与上一个活动窗口相同的尺寸打开新窗口。",
-+	"window.newWindowDimensions.maximized": "打开最大化的新窗口。",
-+	"window.openFilesInNewWindow.default": "文件将在该文件的文件夹打开的窗口中打开，或在上一个活动窗口中打开，除非通过平台或从查找程序(仅限 macOS)打开",
-+	"window.openFilesInNewWindow.off": "文件将在该文件的文件夹打开的窗口中打开，或在上一个活动窗口中打开",
-+	"window.openFilesInNewWindow.on": "文件将在新窗口中打开",
-+	"window.openFoldersInNewWindow.default": "文件夹在新窗口中打开，除非从应用程序内选取一个文件夹(例如，通过“文件”菜单)",
-+	"window.openFoldersInNewWindow.off": "文件夹将替换上一个活动窗口",
-+	"window.openFoldersInNewWindow.on": "文件夹将在新窗口中打开",
-+	"window.reopenFolders.all": "重新打开上一个会话的所有文件夹。",
-+	"window.reopenFolders.none": "永不重新打开文件夹。",
-+	"window.reopenFolders.one": "重新打开上一个活动文件夹。",
-+>>>>>>> .their
- 	"windowConfigurationTitle": "窗口",
- 	"window.openFilesInNewWindow.on": "文件将在新窗口中打开",
- 	"window.openFilesInNewWindow.off": "文件将在该文件的文件夹打开的窗口中打开，或在上一个活动窗口中打开",
-added in both
-  our    100644 4c61437ec3b04fa88f6804dcec327824f954950c i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
-  their  100644 8d31f3e0901324c7c1de106d1f6b8f46c78d900f i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,6 +9,16 @@
- 	],
- 	"wordWrapMigration.ok": "确定",
- 	"wordWrapMigration.dontShowAgain": "不再显示",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"wordWrapMigration.dontShowAgain": "不再显示",
-+	"wordWrapMigration.ok": "确定",
-+>>>>>>> .their
- 	"wordWrapMigration.openSettings": "打开设置",
- 	"wordWrapMigration.prompt": "已弃用设置 \"editor.wrappingColumn\"，改用 \"editor.wordWrap\"。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 45ebe99ffb569d1b3acc6f177a54ab7673b2d990 i18n/chs/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-  our    100644 fbf479d82e25dae9ebd46805de2da5d08b48b0ab i18n/chs/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-  their  100644 4ef166e941f5940b00f5513cfbb57d096c63b560 i18n/chs/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-@@ -41,7 +41,34 @@
- 	"debugConsoleAction": "调试控制台",
- 	"unreadOutput": "调试控制台中的新输出",
- 	"debugFocusConsole": "焦点调试控制台",
-+<<<<<<< .our
- 	"focusSession": "聚焦于“会话”视图",
-+=======
-+	"disableAllBreakpoints": "禁用所有断点",
-+	"disableBreakpoint": "禁用断点",
-+	"disconnectDebug": "断开连接",
-+	"editConditionalBreakpoint": "编辑断点...",
-+	"enableAllBreakpoints": "启用所有断点",
-+	"enableBreakpoint": "启用断点",
-+	"focusProcess": "焦点过程",
-+	"launchJsonNeedsConfigurtion": "配置或修复 \"launch.json\"",
-+	"openLaunchJson": "打开 {0}",
-+	"pauseDebug": "暂停",
-+	"reapplyAllBreakpoints": "重新应用所有断点",
-+	"reconnectDebug": "重新连接",
-+	"removeAllBreakpoints": "删除所有断点",
-+	"removeAllWatchExpressions": "删除所有表达式",
-+	"removeBreakpoint": "删除断点",
-+	"removeWatchExpression": "删除表达式",
-+	"renameFunctionBreakpoint": "重命名函数断点",
-+	"restartDebug": "重启",
-+	"restartFrame": "重新启动框架",
-+	"reverseContinue": "反向",
-+	"selectAndStartDebugging": "选择并开始调试",
-+	"setValue": "设置值",
-+	"startDebug": "开始调试",
-+	"startWithoutDebugging": "开始执行(不调试)",
-+>>>>>>> .their
- 	"stepBackDebug": "后退",
- 	"reverseContinue": "反向"
- }
-\ No newline at end of file
-added in both
-  our    100644 e7916ba4c3b52bb179a7ac1936481116748af3a7 i18n/chs/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
-  their  100644 73fb4cb069d1ae01b5d2e0508850d3029ac3a937 i18n/chs/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -12,4 +13,16 @@
- 	"addConfiguration": "添加配置...",
- 	"noConfigurationsMatching": "无任何调试配置匹配",
- 	"noConfigurationsFound": "找不到任何调试配置。请创建一个 \"launch.json\" 文件。"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"debugAriaLabel": "键入启动配置的名称以运行。",
-+	"entryAriaLabel": "{0}，调试",
-+	"noConfigurationsFound": "找不到任何调试配置。请创建一个 \"launch.json\" 文件。",
-+	"noConfigurationsMatching": "无任何调试配置匹配"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 de6e884bef1f90491bf32599c2ba9abbf7e2fefa i18n/chs/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
-  their  100644 da85704372cb89855d395ab301c7ba6483fd4c18 i18n/chs/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,4 +11,13 @@
- 	"debugExceptionWidgetBackground": "异常小组件背景颜色。",
- 	"exceptionThrownWithId": "发生异常: {0}",
- 	"exceptionThrown": "出现异常。"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"exceptionThrown": "出现异常"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 73b9bd7ac99f2b80dcd28fac0aa3d9c2345f4213 i18n/chs/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  our    100644 2544cb87789add6dc4a60372e1fc63d1ab090b36 i18n/chs/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  their  100644 3f5fa3d7ab9ab50eae28d2c9971b13f8edab40c4 i18n/chs/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-changed in both
-  base   100644 93dfcc2a4e03137647279b39f6bcddf2b0df2eaf i18n/chs/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  our    100644 cd5c87160d63c424e94fd5828b9bb9bbcdf71805 i18n/chs/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  their  100644 af0ddb8f124a61169123a1a030aac34621f38479 i18n/chs/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-@@ -8,6 +8,20 @@
- 	],
- 	"debugAdapterBinNotFound": "调试适配器可执行的“{0}”不存在。",
- 	"debugAdapterCannotDetermineExecutable": "无法确定调试适配器“{0}”的可执行文件。",
-+<<<<<<< .our
- 	"unableToLaunchDebugAdapter": "无法从“{0}”启动调试适配器。",
- 	"unableToLaunchDebugAdapterNoArgs": "无法启动调试适配器。"
-+=======
-+	"debugLinuxConfiguration": "特定于 Linux 的启动配置属性。",
-+	"debugName": "配置名称；在启动配置下拉菜单中显示。",
-+	"debugOSXConfiguration": "特定于 OS X 的启动配置属性。",
-+	"debugPrelaunchTask": "调试会话开始前要运行的任务。",
-+	"debugRequest": "请求配置类型。可以是“启动”或“附加”。",
-+	"debugServer": "仅用于调试扩展开发: 如果已指定端口，VS 代码会尝试连接到在服务器模式中运行的调试适配器",
-+	"debugType": "配置类型。",
-+	"debugWindowsConfiguration": "特定于 Windows 的启动配置属性。",
-+	"deprecatedVariables": "已弃用 \"env.\"、\"config.\" 和 \"command.\"，改用 \"env:\"、\"config:\" 和 \"command:\"。",
-+	"internalConsoleOptions": "内部调试控制台的控制行为。",
-+	"node2NotSupported": "不再支持 \"node2\"，改用 \"node\"，并将“协议”属性设为“检查器”。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 0b9e03f060b57ac7ca4318dce75fb0f4c0943b1f i18n/chs/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 63427668f5f3315bd1b2d497574a17d7eb4d0258 i18n/chs/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 c224d552669e50c5b30fef23417270ad9da76128 i18n/chs/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-@@ -4,6 +4,7 @@
-  *--------------------------------------------------------------------------------------------*/
- // Do not edit this file. It is machine generated.
- {
-+<<<<<<< .our
- 	"showExplorerViewlet": "显示资源管理器",
- 	"explore": "资源管理器",
- 	"view": "查看",
-@@ -11,6 +12,25 @@
- 	"binaryFileEditor": "二进制文件编辑器",
- 	"filesConfigurationTitle": "文件",
- 	"exclude": "配置 glob 模式以在搜索中排除文件和文件夹。例如，文件资源管理器根据此设置决定文件或文件夹的显示和隐藏。",
-+=======
-+	"associations": "将文件关联配置为语言(如: \"*.extension\": \"html\")。这些关联的优先级高于已安装语言的默认关联。",
-+	"autoReveal": "控制资源管理器是否应在打开文件时自动显示并选择它们。",
-+	"autoSave": "控制已更新文件的自动保存。接受的值:“{0}”、\"{1}”、“{2}”(编辑器失去焦点)、“{3}”(窗口失去焦点)。如果设置为“{4}”，则可在 \"files.autoSaveDelay\" 中配置延迟。",
-+	"autoSaveDelay": "控制延迟(以秒为单位)，在该延迟后将自动保存更新后的文件。仅在 \"files.autoSave'\" 设置为“{0}”时适用。",
-+	"binaryFileEditor": "二进制文件编辑器",
-+	"dynamicHeight": "控制打开的编辑器部分的高度是否应动态适应元素数量。",
-+	"editorConfigurationTitle": "编辑器",
-+	"enableDragAndDrop": "控制资源管理器是否应该允许通过拖放移动文件和文件夹。",
-+	"encoding": "读取和编写文件时将使用的默认字符集编码。",
-+	"eol": "默认行尾字符。",
-+	"exclude": "配置 glob 模式以排除文件和文件夹。",
-+	"explore": "资源管理器",
-+	"explorerConfigurationTitle": "文件资源管理器",
-+	"files.autoSave.afterDelay": "配置 \"files.autoSaveDelay\" 后自动保存更新后的文件。",
-+	"files.autoSave.off": "永不自动保存更新后的文件。",
-+	"files.autoSave.onFocusChange": "编辑器失去焦点时自动保存更新后的文件。",
-+	"files.autoSave.onWindowChange": "窗口失去焦点时自动保存更新后的文件。",
-+>>>>>>> .their
- 	"files.exclude.boolean": "匹配文件路径所依据的 glob 模式。设置为 true 或 false 可启用或禁用该模式。",
- 	"files.exclude.when": "对匹配文件的同级文件的其他检查。使用 $(basename) 作为匹配文件名的变量。",
- 	"associations": "配置语言的文件关联(如: \"*.extension\": \"html\")。这些关联的优先级高于已安装语言的默认关联。",
-added in both
-  our    100644 a667d902bfed10abfc830be44b5c48d303f4a131 i18n/chs/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/chs/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
-@@ -3,6 +3,7 @@
-  *  Licensed under the MIT License. See License.txt in the project root for license information.
-  *--------------------------------------------------------------------------------------------*/
- // Do not edit this file. It is machine generated.
-+<<<<<<< .our
- {
- 	"vscode.extension.contributes.snippets": "添加代码段。",
- 	"vscode.extension.contributes.snippets-language": "此代码片段参与的语言标识符。",
-@@ -11,4 +12,7 @@
- 	"invalid.path.0": "“contributes.{0}.path”中应为字符串。提供的值: {1}",
- 	"invalid.path.1": "“contributes.{0}.path”({1})应包含在扩展的文件夹({2})内。这可能会使扩展不可移植。",
- 	"badVariableUse": "“{0}”代码片段很可能混淆了片段变量和片段占位符。有关详细信息，请访问 https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax。"
--}
-\ No newline at end of file
-+}
-+=======
-+{}
-+>>>>>>> .their
-added in both
-  our    100644 007913532b9c295d2a9c134927e05f11ef7a1bef i18n/chs/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
-  their  100644 421ed1cedbaae5e8bb7cf10f0a8fad37685c93d5 i18n/chs/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,4 +10,13 @@
- 	"snippet.suggestions.label": "插入代码片段",
- 	"sep.userSnippet": "用户代码片段",
- 	"sep.extSnippet": "扩展代码片段"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"snippet.suggestions.label": "插入代码片段"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 d0caabc81b4c752c13714f95e565498af6ee0254 i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 58235d9d592fcd58f82ba3ce68d9daa94c4b4c39 i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -16,5 +17,13 @@
- 	"badVariableUse": "扩展“{0}”中的一个或多个代码片段很可能混淆了片段变量和片段占位符 (有关详细信息，请访问 https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax )",
- 	"badFile": "无法读取代码片段文件“{0}”。",
- 	"detail.snippet": "{0} ({1})",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"snippetSuggest.longLabel": "{0}，{1}"
- }
-\ No newline at end of file
-added in both
-  our    100644 36d6e0407ee5d53ea8e541d512be592cb0fde061 i18n/chs/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
-  their  100644 46f43eca7766b6f24ae0daf0362e1a3244175ce7 i18n/chs/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"tabCompletion": "当其前缀匹配时插入代码段。当 \"quickSuggestions\" 未启用时，效果最佳。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 6a325423c0a05b2ac7865667ef1673d69f153eb3 i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 1becbfa0f08ad931e9c32c280588da0196edc807 i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 13c1459f063eb8e38aef08d126cb455c83f24781 i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -7,6 +8,14 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"workbench.action.terminal.toggleTerminal": "切换集成终端",
-+=======
-+	"workbench.action.terminal.clear": "清除",
-+	"workbench.action.terminal.copySelection": "复制所选内容",
-+	"workbench.action.terminal.focus": "聚焦于终端",
-+	"workbench.action.terminal.focusAtIndex": "焦点终端 {0}",
-+	"workbench.action.terminal.focusNext": "聚焦于下一终端",
-+	"workbench.action.terminal.focusPrevious": "聚焦于上一终端",
-+>>>>>>> .their
- 	"workbench.action.terminal.kill": "终止活动终端实例",
- 	"workbench.action.terminal.kill.short": "终止终端",
- 	"workbench.action.terminal.quickKill": "终止终端实例",
-added in both
-  our    100644 e799257937ad32ea075b25e0a6d3255fc5c1a826 i18n/chs/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  their  100644 adb3d1d576a6d7d1e290e457596415cc1e91e825 i18n/chs/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -39,4 +40,48 @@
- 	"welcomePage.interfaceOverviewDescription": "查看突出显示主要 UI 组件的叠加图",
- 	"welcomePage.interactivePlayground": "交互式演练场",
- 	"welcomePage.interactivePlaygroundDescription": "在简短演练中试用编辑器的基本功能"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"welcomePage.atom": "Atom",
-+	"welcomePage.atomCurrent": "Atom (当前)",
-+	"welcomePage.cloneGitRepository": "克隆 GIT 存储库...",
-+	"welcomePage.colorTheme": "颜色主题",
-+	"welcomePage.colorThemeDescription": "使编辑器和代码呈现你喜欢的外观",
-+	"welcomePage.configureSettings": "配置设置",
-+	"welcomePage.configureSettingsDescription": "通过调整设置来解锁 VS Code 的全部功能",
-+	"welcomePage.editingEvolved": "编辑演变",
-+	"welcomePage.gitHubRepository": "GitHub 存储库",
-+	"welcomePage.help": "帮助",
-+	"welcomePage.installKeymap": "安装 {0}、{1}、{2} 和 {3} 的键盘快捷方式",
-+	"welcomePage.installKeymapDescription": "安装键盘快捷方式",
-+	"welcomePage.interactivePlayground": "交互式运动场",
-+	"welcomePage.interactivePlaygroundDescription": "请在简短演练中试用编辑器的基本功能",
-+	"welcomePage.interfaceOverview": "接口概述",
-+	"welcomePage.interfaceOverviewDescription": "获取突出显示 UI 主要组件的视觉覆盖",
-+	"welcomePage.introductoryVideos": "介绍性视频",
-+	"welcomePage.keybindingsReference": "键盘快捷方式引用",
-+	"welcomePage.keybindingsReferenceDescription": "包含常见键盘快捷方式的可打印 PDF 文件",
-+	"welcomePage.newFile": "新建文件",
-+	"welcomePage.noRecentFolders": "无最近使用文件夹",
-+	"welcomePage.openFolder": "打开文件夹...",
-+	"welcomePage.others": "其他",
-+	"welcomePage.productDocumentation": "产品文档",
-+	"welcomePage.quickLinks": "快速链接",
-+	"welcomePage.recent": "最近",
-+	"welcomePage.showCommands": "查找并运行所有命令",
-+	"welcomePage.showCommandsDescription": "从控制面板快速访问并搜索命令({0})",
-+	"welcomePage.showOnStartup": "启动时显示欢迎页",
-+	"welcomePage.stackOverflow": "堆栈溢出",
-+	"welcomePage.start": "开始",
-+	"welcomePage.sublime": "Sublime",
-+	"welcomePage.sublimeCurrent": "Sublime (当前)",
-+	"welcomePage.vim": "Vim",
-+	"welcomePage.vimCurrent": "Vim (当前)",
-+	"welcomePage.vscode": "Visual Studio Code"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/chs/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-  our    100644 a4d5faf62868939331e99041f87d0f1f3c39a627 i18n/chs/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-  their  100644 8166a4d61f9d9dec94eff329dc5ab89e754d6b8f i18n/chs/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -36,4 +37,20 @@
- 	"details": "详细信息",
- 	"welcomePage.buttonBackground": "欢迎页按钮的背景色。",
- 	"welcomePage.buttonHoverBackground": "欢迎页按钮被悬停时的背景色。"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"cancel": "取消",
-+	"ok": "确定",
-+	"welcome.title": "欢迎使用",
-+	"welcomePage": "欢迎使用",
-+	"welcomePage.installingKeymap": "正在安装 {0} 键盘快捷方式...",
-+	"welcomePage.keymapAlreadyInstalled": "已安装 {0} 键盘快捷方式。",
-+	"welcomePage.keymapNotFound": "找不到 ID 为 {1} 的 {0} 键盘快捷方式。",
-+	"welcomePage.willReloadAfterInstallingKeymap": "安装 {0} 键盘快捷方式后，将重载窗口。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 44f0de178b541d80ffa90962bdfd2bb31bffc766 i18n/cht/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
-  our    100644 1bb81e3f679241a9a013d54500d8e10fdea8f3ed i18n/cht/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
-  their  100644 f4ce8098a135887d6d5afb0978165cfea05c1e13 i18n/cht/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,6 +14,11 @@
- 	"rootPath": "工作區檔案路徑 (例如 /Users/Development/myWorkspace)",
- 	"folderName": "包含在工作區內的檔案名稱 (例如 myFolder)",
- 	"folderPath": "包含在工作區內的檔案路徑 (例如 /Users/Development/myFolder)",
-+=======
-+	"activeEditorLong": "例如 /Users/Development/myProject/myFolder/myFile.txt",
-+	"activeEditorMedium": "例如 myFolder/myFile.txt",
-+	"activeEditorShort": "例如 myFile.txt",
-+>>>>>>> .their
- 	"appName": "例如 VS Code",
- 	"dirty": "若使用中的編輯器已變更，即為已變更的指示區",
- 	"separator": "條件式分隔符號 (' - ')，只會在前後為具有值的變數時顯示",
-changed in both
-  base   100644 24cef669a74842f0f4ec0177a2ba38749f64ca31 i18n/cht/extensions/css/package.i18n.json
-  our    100644 3b83a3b860e5429d1bd45acf5cd49a91b96746b6 i18n/cht/extensions/css/package.i18n.json
-  their  100644 93b1954f2f9bacf04b3791fa59af993fa5c28d47 i18n/cht/extensions/css/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,66 @@
- 	],
- 	"displayName": "CSS 語言基礎知識",
- 	"description": "為 CSS、LESS 與 SCSS 檔案提供語法醒目提示與括弧對應功能。"
-+=======
-+	"css.colorDecorators.enable.desc": "啟用或停用彩色裝飾項目",
-+	"css.lint.argumentsInColorFunction.desc": "參數數目無效",
-+	"css.lint.boxModel.desc": "使用填補或框線時不要使用寬度或高度。",
-+	"css.lint.compatibleVendorPrefixes.desc": "在使用廠商專屬的前置詞時，請確定也包括其他所有的廠商特定屬性。",
-+	"css.lint.duplicateProperties.desc": "請勿使用重複的樣式定義",
-+	"css.lint.emptyRules.desc": "請勿使用空白規則集",
-+	"css.lint.float.desc": "避免使用 'float'。浮動會使 CSS 脆弱，在版面配置的任一層面改變時容易中斷。",
-+	"css.lint.fontFaceProperties.desc": "@font-face 規則必須定義 'src' 和 'font-family' 屬性",
-+	"css.lint.hexColorLength.desc": "十六進位色彩必須由三個或六個十六進位數字組成",
-+	"css.lint.idSelector.desc": "選取器不應包含 ID，因為這些規則與 HTML 結合過於緊密。",
-+	"css.lint.ieHack.desc": "只有在支援 IE7 及更舊的版本時才需要 IE Hack",
-+	"css.lint.importStatement.desc": "匯入陳述式不會平行載入",
-+	"css.lint.important.desc": "避免使用 !important。這表示整個 CSS 的明確性皆失控，需要重構。",
-+	"css.lint.propertyIgnoredDueToDisplay.desc": "屬性因顯示而忽略。例如，若為 'display: inline'，則 width、height、margin-top、margin-bottom 以及 float 屬性就不會有任何作用。",
-+	"css.lint.universalSelector.desc": "已知通用選取器 (*) 速度緩慢",
-+	"css.lint.unknownProperties.desc": "未知的屬性。",
-+	"css.lint.unknownVendorSpecificProperties.desc": "未知的廠商特定屬性。",
-+	"css.lint.vendorPrefix.desc": "在使用廠商專屬的前置詞時，也包括標準屬性。",
-+	"css.lint.zeroUnits.desc": "零不需要任何單位",
-+	"css.validate.desc": "啟用或停用所有驗證",
-+	"less.colorDecorators.enable.desc": "啟用或停用彩色裝飾項目",
-+	"less.lint.argumentsInColorFunction.desc": "參數數目無效",
-+	"less.lint.boxModel.desc": "使用填補或框線時不要使用寬度或高度。",
-+	"less.lint.compatibleVendorPrefixes.desc": "在使用廠商專屬的前置詞時，請確定也包括其他所有的廠商特定屬性。",
-+	"less.lint.duplicateProperties.desc": "請勿使用重複的樣式定義",
-+	"less.lint.emptyRules.desc": "請勿使用空白規則集",
-+	"less.lint.float.desc": "避免使用 'float'。浮動會使 CSS 脆弱，在版面配置的任一層面改變時容易中斷。",
-+	"less.lint.fontFaceProperties.desc": "@font-face 規則必須定義 'src' 和 'font-family' 屬性",
-+	"less.lint.hexColorLength.desc": "十六進位色彩必須由三個或六個十六進位數字組成",
-+	"less.lint.idSelector.desc": "選取器不應包含 ID，因為這些規則與 HTML 結合過於緊密。",
-+	"less.lint.ieHack.desc": "只有在支援 IE7 及更舊的版本時才需要 IE Hack",
-+	"less.lint.importStatement.desc": "匯入陳述式不會平行載入",
-+	"less.lint.important.desc": "避免使用 !important。這表示整個 CSS 的明確性皆失控，需要重構。",
-+	"less.lint.propertyIgnoredDueToDisplay.desc": "屬性因顯示而忽略。例如，若為 'display: inline'，則 width、height、margin-top、margin-bottom 以及 float 屬性就不會有任何作用。",
-+	"less.lint.universalSelector.desc": "已知通用選取器 (*) 速度緩慢",
-+	"less.lint.unknownProperties.desc": "未知的屬性。",
-+	"less.lint.unknownVendorSpecificProperties.desc": "未知的廠商特定屬性。",
-+	"less.lint.vendorPrefix.desc": "在使用廠商專屬的前置詞時，也包括標準屬性。",
-+	"less.lint.zeroUnits.desc": "零不需要任何單位",
-+	"less.validate.desc": "啟用或停用所有驗證",
-+	"scss.colorDecorators.enable.desc": "啟用或停用彩色裝飾項目",
-+	"scss.lint.argumentsInColorFunction.desc": "參數數目無效",
-+	"scss.lint.boxModel.desc": "使用填補或框線時不要使用寬度或高度。",
-+	"scss.lint.compatibleVendorPrefixes.desc": "在使用廠商專屬的前置詞時，請確定也包括其他所有的廠商特定屬性。",
-+	"scss.lint.duplicateProperties.desc": "請勿使用重複的樣式定義",
-+	"scss.lint.emptyRules.desc": "請勿使用空白規則集",
-+	"scss.lint.float.desc": "避免使用 'float'。浮動會使 CSS 脆弱，在版面配置的任一層面改變時容易中斷。",
-+	"scss.lint.fontFaceProperties.desc": "@font-face 規則必須定義 'src' 和 'font-family' 屬性",
-+	"scss.lint.hexColorLength.desc": "十六進位色彩必須由三個或六個十六進位數字組成",
-+	"scss.lint.idSelector.desc": "選取器不應包含 ID，因為這些規則與 HTML 結合過於緊密。",
-+	"scss.lint.ieHack.desc": "只有在支援 IE7 及更舊的版本時才需要 IE Hack",
-+	"scss.lint.importStatement.desc": "匯入陳述式不會平行載入",
-+	"scss.lint.important.desc": "避免使用 !important。這表示整個 CSS 的明確性皆失控，需要重構。",
-+	"scss.lint.propertyIgnoredDueToDisplay.desc": "屬性因顯示而忽略。例如，若為 'display: inline'，則 width、height、margin-top、margin-bottom 以及 float 屬性就不會有任何作用。",
-+	"scss.lint.universalSelector.desc": "已知通用選取器 (*) 速度緩慢",
-+	"scss.lint.unknownProperties.desc": "未知的屬性。",
-+	"scss.lint.unknownVendorSpecificProperties.desc": "未知的廠商特定屬性。",
-+	"scss.lint.vendorPrefix.desc": "在使用廠商專屬的前置詞時，也包括標準屬性。",
-+	"scss.lint.zeroUnits.desc": "零不需要任何單位",
-+	"scss.validate.desc": "啟用或停用所有驗證"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 e205315d1018d986ad405f598166a2214a71775e i18n/cht/extensions/git/out/askpass-main.i18n.json
-  their  100644 779b8a5ed3f8f484f47ccceaaafda98a40480e25 i18n/cht/extensions/git/out/askpass-main.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"missOrInvalid": "缺少認證或其無效。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 62af81597a9d5680d39494b70d27970c37cd5584 i18n/cht/extensions/git/out/commands.i18n.json
-  our    100644 f99c465da1ed922e8de7f8c6dfd9a26e886bdd66 i18n/cht/extensions/git/out/commands.i18n.json
-  their  100644 977895ef1f41a78b52ad02972b7a475bdf827ec5 i18n/cht/extensions/git/out/commands.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -49,6 +50,18 @@
- 	"commit": "無論如何仍認可",
- 	"no staged changes": "沒有暫存變更進行提交\n\n您希望自動暫存您所有變更並直接提交?",
- 	"always": "永遠",
-+=======
-+	"branch name": "分支名稱",
-+	"clean": "清除變更",
-+	"clean repo": "請先清除您的存放庫工作樹狀再簽出。",
-+	"cloning": "正在複製 Git 存放庫...",
-+	"commit message": "認可訊息",
-+	"confirm clean": "確定要清除 {0} 中的變更嗎?",
-+	"confirm clean all": "確定要清除所有變更嗎?",
-+	"confirm revert": "確定要還原您在 {0} 中選取的變更嗎?",
-+	"disabled": "Git 已停用，或在此工作區不受支援",
-+	"never again": "確定，不要再顯示",
-+>>>>>>> .their
- 	"no changes": "沒有任何變更要認可。",
- 	"commit message": "認可訊息",
- 	"provide commit message": "請提供認可訊息",
-@@ -73,6 +86,7 @@
- 	"nobranch": "請簽出分支以推送到遠端。",
- 	"confirm publish branch": "分支 '{0}' 沒有任何上游分支。 您仍想發布這個分支嗎？",
- 	"ok": "確定",
-+<<<<<<< .our
- 	"push with tags success": "已成功使用標籤推送。",
- 	"pick remote": "挑選要發行分支 '{0}' 的目標遠端:",
- 	"sync is unpredictable": "此動作會推送認可至`{0}/{1}`並從中提取認可。",
-@@ -88,4 +102,18 @@
- 	"git error details": "Git: {0}",
- 	"git error": "Git 錯誤",
- 	"open git log": "開啟 Git 記錄"
-+=======
-+	"open git log": "開啟 Git 記錄",
-+	"openrepo": "開啟存放庫",
-+	"parent": "父目錄",
-+	"pick remote": "挑選要發行分支 '{0}' 的目標遠端:",
-+	"proposeopen": "要開啟複製的存放庫嗎?",
-+	"provide branch name": "請提供分支名稱",
-+	"provide commit message": "請提供認可訊息",
-+	"remote branch at": "位於 {0} 的遠端分支",
-+	"repourl": "存放庫 URL",
-+	"revert": "還原變更",
-+	"sync is unpredictable": "此動作會將認可發送至 '{0}' 及從中提取認可。",
-+	"tag at": "位於 {0} 的標記"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 cae9b19f6f2dc92ad963461844b5bd1c6edd68c0 i18n/cht/extensions/git/out/main.i18n.json
-  our    100644 ca5e23909a4b0ec334cae0052b8bde03b7e6fce3 i18n/cht/extensions/git/out/main.i18n.json
-  their  100644 712457a7adf97e47a1ffeb9caa221491740e2b74 i18n/cht/extensions/git/out/main.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,4 +14,9 @@
- 	"notfound": "找不到 Git。安裝它或使用 \"git. path\" 設置。",
- 	"updateGit": "更新 Git",
- 	"git20": "您似乎已安裝 Git {0}。Code 搭配 Git >= 2 的執行效果最佳"
-+=======
-+	"git20": "您似乎已有安裝 Git {0}。Code 搭配 Git >= 2 的執行效果最佳",
-+	"updateGit": "更新 Git",
-+	"using git": "正在使用來自 {1} 的 git {0}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6b42d87a6c11e143635b3503a696ad8cf3729fb5 i18n/cht/extensions/git/package.i18n.json
-  our    100644 bc042cb15d8c15d6c5568f5c08f9df112417a23c i18n/cht/extensions/git/package.i18n.json
-  their  100644 b67cc695512cbc9a3855bc407028e1f290986158 i18n/cht/extensions/git/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,19 @@
- 	"command.init": "初始化儲存庫",
- 	"command.close": "關閉存放庫",
- 	"command.refresh": "重新整理",
-+=======
-+	"command.branch": "建立分支...",
-+	"command.checkout": "簽出至...",
-+	"command.clean": "清除檔案",
-+	"command.cleanAll": "清除所有檔案",
-+	"command.clone": "複製",
-+	"command.commit": "認可",
-+	"command.commitAll": "全部認可",
-+	"command.commitAllSigned": "全部認可 (已登出)",
-+	"command.commitStaged": "認可暫存",
-+	"command.commitStagedSigned": "認可暫存 (已登出)",
-+	"command.init": "初始化存放庫",
-+>>>>>>> .their
- 	"command.openChange": "開啟變更",
- 	"command.openFile": "開啟檔案",
- 	"command.openHEADFile": "開啟檔案 (HEAD)",
-@@ -46,6 +60,7 @@
- 	"command.pullFrom": "從...提取",
- 	"command.push": "推送",
- 	"command.pushTo": "推送至...",
-+<<<<<<< .our
- 	"command.pushWithTags": "使用標籤推送",
- 	"command.sync": "同步處理",
- 	"command.syncRebase": "同步 (重定基底)",
-@@ -59,6 +74,20 @@
- 	"config.enabled": "是否啟用 GIT",
- 	"config.path": "Git 可執行檔的路徑",
- 	"config.autoRepositoryDetection": "是否自動偵測儲存庫",
-+=======
-+	"command.refresh": "重新整理",
-+	"command.revertSelectedRanges": "還原選取的範圍",
-+	"command.showOutput": "顯示 Git 輸出",
-+	"command.stage": "暫存檔案",
-+	"command.stageAll": "暫存所有檔案",
-+	"command.stageSelectedRanges": "暫存選取的範圍",
-+	"command.sync": "同步處理",
-+	"command.undoCommit": "復原上次認可",
-+	"command.unstage": "取消暫存檔案",
-+	"command.unstageAll": "取消暫存所有檔案",
-+	"command.unstageSelectedRanges": "取消暫存選取的範圍",
-+	"config.autofetch": "是否啟用自動擷取",
-+>>>>>>> .their
- 	"config.autorefresh": "是否啟用自動重新整理",
- 	"config.autofetch": "是否啟用自動擷取",
- 	"config.enableLongCommitWarning": "是否發出長認可訊息的警告",
-added in both
-  our    100644 2851c131eab479bfc86856abfa78d7a539bbb56f i18n/cht/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
-  their  100644 5d4bf2d5fa52a390e660468649239cc88756650e i18n/cht/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"typescript.jsDocCompletionItem.documentation": "JSDoc 註解"
- }
-\ No newline at end of file
-changed in both
-  base   100644 549f205b78c2158ba8fa937f65f03e5da3647c9e i18n/cht/extensions/typescript/out/utils/projectStatus.i18n.json
-  our    100644 5d6e558a98818f7136e89a6ead3b42d2452cdddf i18n/cht/extensions/typescript/out/utils/projectStatus.i18n.json
-  their  100644 e4621ae50d6bef5a7661eb1cfc46af9537f46068 i18n/cht/extensions/typescript/out/utils/projectStatus.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,11 @@
- 	],
- 	"hintExclude": "若要讓整個專案都能使用 JavaScript/TypeScript 語言功能，請排除內含許多檔案的資料夾，例如: {0}",
- 	"hintExclude.generic": "若要讓整個專案都能使用 JavaScript/TypeScript 語言功能，請排除內含您未使用之來源檔案的大型資料夾。",
-+=======
-+	"hintExclude": "若要讓整個專案都能使用 JavaScript/TypeScript 語言功能，請排除內含許多檔案的資料夾，例如: {0}",
-+	"hintExclude.generic": "若要讓整個專案都能使用 JavaScript/TypeScript 語言功能，請排除內含您未使用之來源檔案的大型資料夾。",
-+	"hintExclude.tooltip": "若要讓整個專案都能使用 JavaScript/TypeScript 語言功能，請排除內含您未使用之來源檔案的大型資料夾。",
-+>>>>>>> .their
- 	"large.label": "設定排除項目",
- 	"hintExclude.tooltip": "若要讓整個專案都能使用 JavaScript/TypeScript 語言功能，請排除內含您未使用之來源檔案的大型資料夾。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8d6755586f53d8e1d544b28981d851913899d90c i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 15a1cfb1f061b73d70aaaf6b56b29fe87aab2b5a i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 5f71ebfbf8b93d712ca932d7c3d3dec67363b4cb i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,11 +7,22 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"acceptSuggestionOnCommitCharacter": "控制認可字元是否應接受建議。例如在 JavaScript 中，分號 (';') 可以是接受建議並鍵入該字元的認可字元。",
-+	"acceptSuggestionOnEnter": "控制除了 'Tab' 外，是否也藉由按下 'Enter' 接受建議。如此可避免混淆要插入新行或接受建議。",
-+	"autoClosingBrackets": "控制編輯器是否應在左括號後自動插入右括號",
-+	"codeLens": "控制編輯器是否顯示程式碼濾鏡",
-+	"cursorBlinking": "控制游標動畫樣式，可能的值為 'blink'、'smooth'、'phase'、'expand' 和 'solid'",
-+	"cursorStyle": "控制游標樣式。接受的值為 'block'、'block-outline'、'line'、'line-thin'、'underline' 及 'underline-thin'",
-+	"detectIndentation": "開啟檔案時，會依據檔案內容來偵測 `editor.tabSize` 及 `editor.insertSpaces`。",
-+	"dragAndDrop": "控制編輯器是否允許透過拖放動作移動選取範圍。",
-+>>>>>>> .their
- 	"editorConfigurationTitle": "編輯器",
- 	"fontFamily": "控制字型家族。",
- 	"fontWeight": "控制字型寬度。",
- 	"fontSize": "控制字型大小 (以像素為單位)。",
- 	"lineHeight": "控制行高。使用 0 會從 fontSize 計算 lineHeight。",
-+<<<<<<< .our
- 	"letterSpacing": "控制字元間距 (以像素為單位)",
- 	"lineNumbers.off": "不顯示行號。",
- 	"lineNumbers.on": "行號以絕對值顯示。",
-@@ -43,6 +55,13 @@
- 	"wordWrap": "控制是否自動換行。可以是:\n - 'off' (停用換行),\n - 'on' (檢視區換行),\n - 'wordWrapColumn' (於 'editor.wordWrapColumn' 換行`) 或\n - 'bounded' (當檢視區縮至最小並設定 'editor.wordWrapColumn' 時換行).",
- 	"wordWrapColumn": "當 `editor.wordWrap` 為 [wordWrapColumn] 或 [bounded] 時，控制編輯器中的資料行換行。",
- 	"wrappingIndent": "控制換行的縮排。可以是 'none'、'same' 或 'deepIndent'。",
-+=======
-+	"lineNumbers": "控制行號顯示。可能的值有 'on'、'off' 及 'relative'。'relative' 會從目前的資料指標位置顯示行數。",
-+	"matchBrackets": "當選取某側的括號時，強調顯示另一側的配對括號。",
-+	"minimap.enabled": "控制是否會顯示迷你地圖",
-+	"minimap.maxColumn": "限制迷你地圖的寬度，以呈現最多的資料行",
-+	"minimap.renderCharacters": "呈現行內的實際字元 (而不是彩色區塊)",
-+>>>>>>> .their
- 	"mouseWheelScrollSensitivity": "滑鼠滾輪捲動事件的 'deltaX' 與 'deltaY' 所使用的乘數",
- 	"multiCursorModifier.ctrlCmd": "對應 Windows 和 Linux 的 `Control` 與對應 macOS 的 `Command`",
- 	"multiCursorModifier.alt": "對應 Windows 和 Linux 的 `Alt` 與對應 macOS 的 `Option`",
-@@ -112,7 +131,28 @@
- 	"codeActionsOnSaveTimeout": "儲存時執行的程式碼動作逾時。",
- 	"selectionClipboard": "控制是否應支援 Linux 主要剪貼簿。",
- 	"sideBySide": "控制 Diff 編輯器要並排或內嵌顯示差異",
-+<<<<<<< .our
- 	"ignoreTrimWhitespace": "控制 Diff 編輯器是否將開頭或尾端空白字元的變更顯示為差異",
- 	"largeFileOptimizations": "針對大型檔案停用部分高記憶體需求功能的特殊處理方式。",
- 	"renderIndicators": "控制 Diff 編輯器是否要為新增的/移除的變更顯示 +/- 標記"
-+=======
-+	"snippetSuggestions": "控制程式碼片段是否隨其他建議顯示，以及其排序方式。",
-+	"stablePeek": "讓預覽編輯器在使用者按兩下其內容或點擊 Escape 時保持開啟。",
-+	"suggestFontSize": "建議小工具的字型大小",
-+	"suggestLineHeight": "建議小工具的行高",
-+	"suggestOnTriggerCharacters": "控制輸入觸發字元時，是否應自動顯示建議",
-+	"tabSize": "與 Tab 相等的空格數量。當 `editor.detectIndentation` 已開啟時，會根據檔案內容覆寫此設定。",
-+	"tabSize.errorMessage": "必須是 'number'。請注意，值 \"auto\" 已由 `editor.detectIndentation` 設定取代。",
-+	"trimAutoWhitespace": "移除尾端自動插入的空白字元",
-+	"useTabStops": "插入和刪除接在定位停駐點後的空白字元",
-+	"wordBasedSuggestions": "啟用字組式建議。",
-+	"wordSeparators": "執行文字相關導覽或作業時將作為文字分隔符號的字元",
-+	"wordWrap": "控制是否自動換行。可以是: :\n - [off] (停用換行)、\n - [on] (檢視區換行)、\n - [wordWrapColumn] (於  'editor.wordWrapColumn' 換行) 或\n - [bounded] (當檢視區縮至最小並設定 'editor.wordWrapColumn' 時換行)。\n",
-+	"wordWrap.bounded": "當檢視區縮至最小並設定 'editor.wordWrapColumn' 時換行。",
-+	"wordWrap.off": "一律不換行。",
-+	"wordWrap.on": "依檢視區寬度換行。",
-+	"wordWrap.wordWrapColumn": "於 'editor.wordWrapColumn' 換行。",
-+	"wordWrapColumn": "當 `editor.wordWrap` 為 [wordWrapColumn] 或 [bounded] 時，控制編輯器中的資料行換行。",
-+	"wrappingIndent": "控制換行的縮排。可以是 [無]、[相同] 或 [縮排]。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 647c08404ccd55cee6923f94d91e06d4cfc83450 i18n/cht/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
-  our    100644 9af28821a92482e3b91b1a8d54b69b37256e93b1 i18n/cht/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
-  their  100644 afd6e50836d80c7ecdcc45c5a1f56ed513b75044 i18n/cht/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
-@@ -20,5 +20,13 @@
- 	"meta.typeDefinitions.title": " – {0} 個定義",
- 	"actions.goToTypeDefinition.label": "移至類型定義",
- 	"actions.peekTypeDefinition.label": "預覽類型定義",
-+<<<<<<< .our
- 	"multipleResults": "按一下以顯示 {0} 項定義。"
-+=======
-+	"actions.previewDecl.label": "預覽定義",
-+	"generic.noResults": "找不到任何定義",
-+	"meta.title": " - {0} 個定義",
-+	"multipleResults": "按一下以顯示 {0} 項定義。",
-+	"noResultWord": "找不到 '{0}' 的定義"
-+>>>>>>> .their
- }
-\ No newline at end of file
-removed in local
-  base   100644 6b4ca30dab6c74a6f9d0d272b5d3c319408e5b69 i18n/cht/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
-  their  100644 a800bf99160905d32dff14e20daa44a0d306112c i18n/cht/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/cht/src/vs/workbench/electron-browser/commands.i18n.json
-  our    100644 983899514ca518324d9e85f57712db39d3040bbe i18n/cht/src/vs/workbench/electron-browser/commands.i18n.json
-  their  100644 3a1051dcfdad7ec7db70524f0a31f277885230df i18n/cht/src/vs/workbench/electron-browser/commands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"diffLeftRightLabel": "{0} ⟷ {1}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 b4f6e45d52fa459da0cebc534ff71d66d2140eeb i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 bf339c91e8587ec53fe81a294c54ddc0f5aad010 i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 d42ccccfaf7ca01a7a9fda2dda6843a0823de9a6 i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -34,6 +34,7 @@
- 	"sideBarLocation": "控制項資訊看板的位置。可顯示於 Workbench 的左方或右方。",
- 	"panelDefaultLocation": "控制面板的預設位置。可顯示在 Workbench 的底部或是右方。",
- 	"statusBarVisibility": "控制 Workbench 底端狀態列的可視性。",
-+<<<<<<< .our
- 	"activityBarVisibility": "控制活動列在 workbench 中的可見度。",
- 	"viewVisibility": "控制檢視標頭動作的可見度。檢視標頭動作可為總是可見，或在檢視為焦點或暫留時才可見。",
- 	"fontAliasing": "控制工作台中的字型鋸齒化方法。\n- default: 子像素字型平滑化。在多數非 Retina 的顯示器上，這會使文字變得最鮮明\n- antialiased: 在像素層級上使字型平滑化，與子像素相對。能夠使字型整體顯示較亮\n- none: 停用字型平滑化。顯示的文字會帶有鋸齒狀銳利邊緣\n- auto: 根據顯示器的 DPI 自動套用 `default` 或 `antialiased`。",
-@@ -42,6 +43,28 @@
- 	"workbench.fontAliasing.none": "禁用字體平滑.文字將會顯示鋸齒狀與鋒利的邊緣.",
- 	"workbench.fontAliasing.auto": "根據顯示器的 DPI 自動套用 `default` 或 `antialiased`。",
- 	"enableNaturalLanguageSettingsSearch": "控制是否啟用自然語言搜尋模式。",
-+=======
-+	"title": "控制使用中之編輯器上的視窗標題。變數會依內容替換: \n${activeEditorShort}: 例如 myFile.txt\n${activeEditorMedium}: 例如 myFolder/myFile.txt\n${activeEditorLong}: 例如 /Users/Development/myProject/myFolder/myFile.txt\n${rootName}: 例如 myProject\n${rootPath}: 例如 /Users/Development/myProject\n${appName}: 例如 VS Code\n${dirty}: 若使用中的編輯器已變更，即為已變更的指標\n${separator}: 條件式分隔符號 (\" - \")，只會在前後有包含值的變數時顯示\n\n",
-+	"titleBarStyle": "調整視窗標題列的外觀。變更需要完整重新啟動才會套用。",
-+	"view": "檢視",
-+	"window.menuBarVisibility.default": "只在全螢幕模式時隱藏功能表。",
-+	"window.menuBarVisibility.hidden": "一律隱藏功能表。",
-+	"window.menuBarVisibility.toggle": "隱藏功能表，但可經由 Alt 鍵加以顯示。",
-+	"window.menuBarVisibility.visible": "一律顯示功能表，即使在全螢幕模式時亦然。",
-+	"window.newWindowDimensions.default": "在螢幕中央開啟新視窗。",
-+	"window.newWindowDimensions.fullscreen": "在全螢幕模式下開啟新視窗。",
-+	"window.newWindowDimensions.inherit": "以相同於上一個使用中之視窗的維度開啟新視窗。",
-+	"window.newWindowDimensions.maximized": "開啟並最大化新視窗。",
-+	"window.openFilesInNewWindow.default": "除非從擴充座或 Finder 中開啟，否則檔案會在開啟了檔案資料夾的視窗，或在上一個使用中的視窗中開啟 (僅限 macOS)",
-+	"window.openFilesInNewWindow.off": "檔案會在開啟了檔案資料夾的視窗，或在上一個使用中的視窗中開啟",
-+	"window.openFilesInNewWindow.on": "檔案會在新視窗中開啟",
-+	"window.openFoldersInNewWindow.default": "除非已從應用程式內挑選了資料夾 (例如透過 [檔案] 功能表)，否則資料夾會在新視窗中開啟",
-+	"window.openFoldersInNewWindow.off": "資料夾會取代上一個使用中的視窗",
-+	"window.openFoldersInNewWindow.on": "資料夾會在新視窗中開啟",
-+	"window.reopenFolders.all": "重新開啟上一個工作階段的所有資料夾。",
-+	"window.reopenFolders.none": "一律不重新開啟資料夾。",
-+	"window.reopenFolders.one": "重新開啟上一個使用中的資料夾。",
-+>>>>>>> .their
- 	"windowConfigurationTitle": "視窗",
- 	"window.openFilesInNewWindow.on": "檔案會在新視窗中開啟",
- 	"window.openFilesInNewWindow.off": "檔案會在開啟了檔案資料夾的視窗，或在上一個使用中的視窗中開啟",
-added in both
-  our    100644 964671851a26ea7d2e031298e75baf3766c1f641 i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
-  their  100644 a0225aac9714759c58d6126d38a1055a4c7f5bc4 i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,6 +9,16 @@
- 	],
- 	"wordWrapMigration.ok": "確定",
- 	"wordWrapMigration.dontShowAgain": "不要再顯示",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"wordWrapMigration.dontShowAgain": "不要再顯示",
-+	"wordWrapMigration.ok": "確定",
-+>>>>>>> .their
- 	"wordWrapMigration.openSettings": "開啟設定",
- 	"wordWrapMigration.prompt": "設定 [editor.wrappingColumn] 已標示為即將淘汰，將改為 [editor.wordWrap]。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 7712e2b026afa672c0cb52ad9c6259f921170722 i18n/cht/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-  our    100644 621e10c3c70a8697b7132e223b79bc286b37c258 i18n/cht/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-  their  100644 6d265dea20d1dae974d415877f47adbff0f743ad i18n/cht/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-@@ -41,7 +41,34 @@
- 	"debugConsoleAction": "偵錯主控台",
- 	"unreadOutput": "偵錯主控台中的新輸出",
- 	"debugFocusConsole": "焦點偵錯主控台",
-+<<<<<<< .our
- 	"focusSession": "焦點工作階段",
-+=======
-+	"disableAllBreakpoints": "停用所有中斷點",
-+	"disableBreakpoint": "停用中斷點",
-+	"disconnectDebug": "中斷連接",
-+	"editConditionalBreakpoint": "編輯中斷點...",
-+	"enableAllBreakpoints": "啟用所有中斷點",
-+	"enableBreakpoint": "啟用中斷點",
-+	"focusProcess": "焦點處理序",
-+	"launchJsonNeedsConfigurtion": "設定或修正 'launch.json'",
-+	"openLaunchJson": "開啟 {0}",
-+	"pauseDebug": "暫停",
-+	"reapplyAllBreakpoints": "重新套用所有中斷點",
-+	"reconnectDebug": "重新連接",
-+	"removeAllBreakpoints": "移除所有中斷點",
-+	"removeAllWatchExpressions": "移除所有運算式",
-+	"removeBreakpoint": "移除中斷點",
-+	"removeWatchExpression": "移除運算式",
-+	"renameFunctionBreakpoint": "重新命名函式中斷點",
-+	"restartDebug": "重新啟動",
-+	"restartFrame": "重新啟動框架",
-+	"reverseContinue": "反向",
-+	"selectAndStartDebugging": "選取並開始偵錯",
-+	"setValue": "設定值",
-+	"startDebug": "開始偵錯",
-+	"startWithoutDebugging": "開始但不偵錯",
-+>>>>>>> .their
- 	"stepBackDebug": "倒退",
- 	"reverseContinue": "反向"
- }
-\ No newline at end of file
-added in both
-  our    100644 3ac79e1e6bcf9cf617a3373924e18583255c3ee4 i18n/cht/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
-  their  100644 b41721acf979f4cc390ba9b4b78a35f94301a22a i18n/cht/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -12,4 +13,16 @@
- 	"addConfiguration": "新增組態...",
- 	"noConfigurationsMatching": "沒有任何相符的偵錯組態",
- 	"noConfigurationsFound": "找不到任何偵錯組態。請建立'launch.json' 檔案。"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"debugAriaLabel": "輸入要執行之啟動組態的名稱。",
-+	"entryAriaLabel": "{0}，偵錯",
-+	"noConfigurationsFound": "找不到任何偵錯組態。請建立'launch.json' 檔案。",
-+	"noConfigurationsMatching": "沒有任何相符的偵錯組態"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 8bcc17f62e12347e299d7503718b6d262e858ee6 i18n/cht/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
-  their  100644 ce024d32721beb22e96f2068d0edc12364dd4908 i18n/cht/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,4 +11,13 @@
- 	"debugExceptionWidgetBackground": "例外狀況小工具的背景色彩。",
- 	"exceptionThrownWithId": "發生例外狀況: {0}",
- 	"exceptionThrown": "發生了例外狀況"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"exceptionThrown": "發生例外狀況"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 59cea8bb7486e6185d4b32f4f31eb5da88f902f9 i18n/cht/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  our    100644 f3039d0a00bdbfdd171e2596b342a43ed854983d i18n/cht/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  their  100644 c9f35236f3d1526409e0908bd433daadf217f4ca i18n/cht/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-changed in both
-  base   100644 797f240fecd7d147079dc504149261230b92903a i18n/cht/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  our    100644 b15f9a6ac6a8909de8d8f39d7c994b78fdd0957c i18n/cht/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  their  100644 0ec826eb5648cef77deb3d73b0b6df167638c582 i18n/cht/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-@@ -8,6 +8,20 @@
- 	],
- 	"debugAdapterBinNotFound": "偵錯配接器可執行檔 '{0}' 不存在。",
- 	"debugAdapterCannotDetermineExecutable": "無法判斷偵錯配接器 '{0}' 的可執行檔。",
-+<<<<<<< .our
- 	"unableToLaunchDebugAdapter": "無法從 '{0}' 啟動偵錯配接器。",
- 	"unableToLaunchDebugAdapterNoArgs": "無法啟動偵錯配接器。"
-+=======
-+	"debugLinuxConfiguration": "Linux 特定的啟動設定屬性。",
-+	"debugName": "組態的名稱; 出現在啟動組態下拉式功能表中。",
-+	"debugOSXConfiguration": "OS X 特定的啟動設定屬性。",
-+	"debugPrelaunchTask": "偵錯工作階段啟動前要執行的工作。",
-+	"debugRequest": "要求組態的類型。可以是 [啟動] 或 [附加]。",
-+	"debugServer": "僅限偵錯延伸模組開發: 如果指定了連接埠，VS Code 會嘗試連線至以伺服器模式執行的偵錯配接器",
-+	"debugType": "組態的類型。",
-+	"debugWindowsConfiguration": "Windows 特定的啟動設定屬性。",
-+	"deprecatedVariables": "'env.'、'config.' 及 'command.' 已標示為即將淘汰，請改用 'env:'、'config:' 及 'command:'。",
-+	"internalConsoleOptions": "內部偵錯主控台的控制項行為。",
-+	"node2NotSupported": "\"node2\" 已不再支援，請改用 \"node\"，並將 \"protocol\" 屬性設為 \"inspector\"。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f928238f5d366b4339998a1af332ba3a90593331 i18n/cht/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 867d603ca5633a190dd294a861b5733b06da3c8c i18n/cht/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 b74a9b1e25f0b70ae1f031ce11f401a8ee4a27f3 i18n/cht/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-@@ -4,6 +4,7 @@
-  *--------------------------------------------------------------------------------------------*/
- // Do not edit this file. It is machine generated.
- {
-+<<<<<<< .our
- 	"showExplorerViewlet": "顯示檔案總管",
- 	"explore": "檔案總管",
- 	"view": "檢視",
-@@ -11,6 +12,25 @@
- 	"binaryFileEditor": "二進位檔案編輯器",
- 	"filesConfigurationTitle": "檔案",
- 	"exclude": "設定 Glob 模式，以排除檔案及資料夾。例如，檔案總管會根據此項設定，判斷何種檔案和資料夾該顯示或隱藏。",
-+=======
-+	"associations": "將檔案關聯設定為語言 (例如 \"*.extension\": \"html\")。這些語言優先於已經安裝之語言的關聯 (預設值)。",
-+	"autoReveal": "控制總管是否在開啟檔案時自動加以顯示及選取。",
-+	"autoSave": "控制已變更之檔案的自動儲存。接受的值: '{0}'、'{1}、'{2}' (編輯器失去焦點)、'{3}' (視窗失去焦點)。若設為 '{4}'，可以在 \"files.autoSaveDelay\" 中設定延遲。",
-+	"autoSaveDelay": "控制要自動儲存已變更之檔案前必須經過的延遲時間 (毫秒)。僅當 'files.autoSave' 設為 \"{0}\" 時才適用。",
-+	"binaryFileEditor": "二進位檔案編輯器",
-+	"dynamicHeight": "控制 [開放式編輯器] 區段的高度是否應依元素數目動態調整。",
-+	"editorConfigurationTitle": "編輯器",
-+	"enableDragAndDrop": "控制總管是否應該允許透過拖放功能移動檔案和資料夾。",
-+	"encoding": "讀取與寫入檔案時要使用的預設字元集編碼。",
-+	"eol": "預設行尾字元。",
-+	"exclude": "設定 Glob 模式可包含檔案及資料夾。",
-+	"explore": "檔案總管",
-+	"explorerConfigurationTitle": "檔案總管",
-+	"files.autoSave.afterDelay": "已變更的檔案會在設定的 'files.autoSaveDelay' 之後自動儲存。",
-+	"files.autoSave.off": "已變更的檔案一律不會自動儲存。",
-+	"files.autoSave.onFocusChange": "已變更的檔案會在編輯器失去焦點時自動儲存。",
-+	"files.autoSave.onWindowChange": "已變更的檔案會在視窗失去焦點時自動儲存。",
-+>>>>>>> .their
- 	"files.exclude.boolean": "要符合檔案路徑的 Glob 模式。設為 True 或 False 可啟用或停用模式。",
- 	"files.exclude.when": "在相符檔案同層級上額外的檢查。請使用 $(basename) 作為相符檔案名稱的變數。",
- 	"associations": "將檔案關聯設定為語言 (例如 \"*.extension\": \"html\")。這些語言優先於已安裝語言的預設關聯。",
-added in both
-  our    100644 2789a5e845e9d12a28cdf49f04ae44d20b75dea7 i18n/cht/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/cht/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
-@@ -3,6 +3,7 @@
-  *  Licensed under the MIT License. See License.txt in the project root for license information.
-  *--------------------------------------------------------------------------------------------*/
- // Do not edit this file. It is machine generated.
-+<<<<<<< .our
- {
- 	"vscode.extension.contributes.snippets": "提供程式碼片段。",
- 	"vscode.extension.contributes.snippets-language": "要予以提供此程式碼片段的語言識別碼。",
-@@ -11,4 +12,7 @@
- 	"invalid.path.0": "`contributes.{0}.path` 中的預期字串。提供的值: {1}",
- 	"invalid.path.1": "要包含在擴充功能資料夾 ({2}) 中的預期 `contributes.{0}.path` ({1})。這可能會使擴充功能無法移植。",
- 	"badVariableUse": "程式碼片段 \"{0}\" 很可能會混淆 snippet-variables 及 snippet-placeholders。如需詳細資料，請參閱 https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax。"
--}
-\ No newline at end of file
-+}
-+=======
-+{}
-+>>>>>>> .their
-added in both
-  our    100644 6a89d5934fffd7aa44365a5107d9f346b06c695b i18n/cht/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
-  their  100644 de9b42f6aced8bc02f00559701e3e31b591c3b14 i18n/cht/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,4 +10,13 @@
- 	"snippet.suggestions.label": "插入程式碼片段",
- 	"sep.userSnippet": "使用者程式碼片段",
- 	"sep.extSnippet": "延伸模組程式碼片段"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"snippet.suggestions.label": "插入程式碼片段"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 763c92b7367ac35034e9498d362e409a1ce2c7f1 i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 58235d9d592fcd58f82ba3ce68d9daa94c4b4c39 i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -16,5 +17,13 @@
- 	"badVariableUse": "來自延伸模組 '{0}' 的一或多個程式碼片段很可能會混淆程式碼片段變數和程式碼片段預留位置 (如需更多詳細資料，請參閱 https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax)",
- 	"badFile": "無法讀取程式碼片段檔案 \"{0}\"。",
- 	"detail.snippet": "{0} ({1})",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"snippetSuggest.longLabel": "{0}，{1}"
- }
-\ No newline at end of file
-added in both
-  our    100644 040ef0a44eb98aaabcd87bcca36d2500a00f9e3a i18n/cht/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
-  their  100644 a4037ced43245a9780f3ffe81dfdf6f5c0fbd499 i18n/cht/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"tabCompletion": "在前置詞相符時插入程式碼片段。最適用於未啟用 'quickSuggestions' 時。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 9e3d51c11d56c9f40d03842b951df611f090a1e4 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 b65af1ec7222f34f85465a0e272b45818ced6ea4 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 3f4e412e68beff97c48e2c2bb3a4de9e17af044c i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -7,6 +8,14 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"workbench.action.terminal.toggleTerminal": "切換整合式終端機",
-+=======
-+	"workbench.action.terminal.clear": "清除",
-+	"workbench.action.terminal.copySelection": "複製選取項目",
-+	"workbench.action.terminal.focus": "聚焦終端機",
-+	"workbench.action.terminal.focusAtIndex": "聚焦終端機 {0}",
-+	"workbench.action.terminal.focusNext": "聚焦下一個終端機",
-+	"workbench.action.terminal.focusPrevious": "聚焦上一個終端機",
-+>>>>>>> .their
- 	"workbench.action.terminal.kill": "終止使用中的終端機執行個體",
- 	"workbench.action.terminal.kill.short": "終止終端機",
- 	"workbench.action.terminal.quickKill": "終止終端機執行個體",
-added in both
-  our    100644 bdcaab4106d8bcccb7ceace49106967eaf858fab i18n/cht/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  their  100644 be5d5087ea038fe5adb405e4720264dc8504c96d i18n/cht/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -39,4 +40,48 @@
- 	"welcomePage.interfaceOverviewDescription": "使用視覺覆疊效果強調顯示 UI 的主要元件",
- 	"welcomePage.interactivePlayground": "Interactive Playground",
- 	"welcomePage.interactivePlaygroundDescription": "嘗試使用逐步解說短片中的一些基本編輯器功能"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"welcomePage.atom": "Atom",
-+	"welcomePage.atomCurrent": "Atom (目前)",
-+	"welcomePage.cloneGitRepository": "複製 Git 存放庫...",
-+	"welcomePage.colorTheme": "彩色佈景主題",
-+	"welcomePage.colorThemeDescription": "將編輯器及您的程式碼設定成您喜愛的外觀",
-+	"welcomePage.configureSettings": "組態設定",
-+	"welcomePage.configureSettingsDescription": "微調設定就能發揮 VS Code 的所有功能",
-+	"welcomePage.editingEvolved": "編輯進化了",
-+	"welcomePage.gitHubRepository": "GitHub 存放庫",
-+	"welcomePage.help": "說明",
-+	"welcomePage.installKeymap": "安裝鍵盤快速鍵 {0}、{1}、{2} 及 {3}",
-+	"welcomePage.installKeymapDescription": "安裝鍵盤快速鍵",
-+	"welcomePage.interactivePlayground": "Interactive Playground",
-+	"welcomePage.interactivePlaygroundDescription": "嘗試使用逐步解說短片中的一些基本編輯器功能",
-+	"welcomePage.interfaceOverview": "介面概觀",
-+	"welcomePage.interfaceOverviewDescription": "使用視覺覆疊效果強調顯示 UI 的主要元件",
-+	"welcomePage.introductoryVideos": "簡介影片",
-+	"welcomePage.keybindingsReference": "鍵盤快速鍵參考",
-+	"welcomePage.keybindingsReferenceDescription": "可列印的 PDF，附有最常用的鍵盤快速鍵",
-+	"welcomePage.newFile": "新增檔案",
-+	"welcomePage.noRecentFolders": "沒有最近使用的資料夾",
-+	"welcomePage.openFolder": "開啟資料夾...",
-+	"welcomePage.others": "其他",
-+	"welcomePage.productDocumentation": "產品文件",
-+	"welcomePage.quickLinks": "快速連結",
-+	"welcomePage.recent": "最近使用",
-+	"welcomePage.showCommands": "尋找並執行所有命令",
-+	"welcomePage.showCommandsDescription": "從控制台快速存取及搜尋命令 ({0})",
-+	"welcomePage.showOnStartup": "啟動時顯示歡迎頁面",
-+	"welcomePage.stackOverflow": "堆疊溢位",
-+	"welcomePage.start": "開始",
-+	"welcomePage.sublime": "壯麗",
-+	"welcomePage.sublimeCurrent": "壯麗 (目前)",
-+	"welcomePage.vim": "活力",
-+	"welcomePage.vimCurrent": "活力 (目前)",
-+	"welcomePage.vscode": "Visual Studio Code"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 faf8fee1511a758d44d4935f5e5991a0162c9da1 i18n/cht/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-  our    100644 b19266dd080091d564b1457f642570d2d3bdec41 i18n/cht/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-  their  100644 a54e9323e55309faa23ee89f9befbf1c61ecca02 i18n/cht/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -21,10 +22,18 @@
- 	"welcomePage.willReloadAfterInstallingExtensionPack": "{0} 的其他支援安裝完成後，將會重新載入此視窗。",
- 	"welcomePage.installingExtensionPack": "正在安裝 {0} 的其他支援...",
- 	"welcomePage.extensionPackNotFound": "找不到ID為{1}的{0}支援功能.",
-+=======
-+	"cancel": "取消",
-+	"ok": "確定",
-+	"welcome.title": "歡迎使用",
-+	"welcomePage": "歡迎使用",
-+	"welcomePage.installingKeymap": "正在安裝 {0} 鍵盤快速鍵...",
-+>>>>>>> .their
- 	"welcomePage.keymapAlreadyInstalled": "已安裝 {0} 鍵盤快速鍵。",
- 	"welcomePage.willReloadAfterInstallingKeymap": "{0} 鍵盤快速鍵安裝完成後，將會重新載入此視窗。",
- 	"welcomePage.installingKeymap": "正在安裝 {0} 鍵盤快速鍵...",
- 	"welcomePage.keymapNotFound": "找不到識別碼為 {1} 的 {0} 鍵盤快速鍵。",
-+<<<<<<< .our
- 	"welcome.title": "歡迎使用",
- 	"welcomePage.openFolderWithPath": "透過路徑 {1} 開啟資料夾 {0}",
- 	"welcomePage.extensionListSeparator": ",",
-@@ -36,4 +45,7 @@
- 	"details": "詳細資料",
- 	"welcomePage.buttonBackground": "起始頁面按鈕的背景色彩.",
- 	"welcomePage.buttonHoverBackground": "起始頁面暫留於按鈕的背景色彩"
-+=======
-+	"welcomePage.willReloadAfterInstallingKeymap": "{0} 鍵盤快速鍵安裝完成後，將會重新載入此視窗。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 02bca4e9dd8fb28408edcf27a137a7d9c5a3eab4 i18n/deu/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
-  our    100644 e156208991d6bed9911d6937f6d11c4f359764fe i18n/deu/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
-  their  100644 c4ed16ff7b2ae6e017970ee1e6d6bbc9f2bd370c i18n/deu/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,6 +14,9 @@
- 	"rootPath": "Dateipfad des Arbeitsbereichs (z.B. /Benutzer/Entwicklung/meinArbeitsbereich)",
- 	"folderName": "Name des Workspace-Ordners, der die Datei enthält (z.B. MeinOrdner)",
- 	"folderPath": "Dateipfad des Workspace-Ordners, der die Datei enthält (z.B. /Benutzer/Entwicklung/MeinOrdner)",
-+=======
-+	"activeEditorShort": "z. B. myFile.txt",
-+>>>>>>> .their
- 	"appName": "z. B. VS Code",
- 	"dirty": "Ein geänderter Indikator, wenn der aktive Editor geändert wurde",
- 	"separator": "Ein bedingtes Trennzeichen (' - '), das nur in der Umgebung von Variablen mit Werten angezeigt wird",
-changed in both
-  base   100644 30e9e6a85208038c073a55c4a0a26cf1c2111659 i18n/deu/extensions/css/package.i18n.json
-  our    100644 aed34432417b4bd351906eac6b6682221f298dc0 i18n/deu/extensions/css/package.i18n.json
-  their  100644 1cf636cabe43ab950ef5ebdadd142a515c7a4719 i18n/deu/extensions/css/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,66 @@
- 	],
- 	"displayName": "CSS-Sprachgrundlagen",
- 	"description": "Bietet Syntax-Highlighting und Bracket-Matching für CSS, LESS und SCSS Dateien."
-+=======
-+	"css.colorDecorators.enable.desc": "Aktiviert oder deaktiviert Farb-Decorators",
-+	"css.lint.argumentsInColorFunction.desc": "Ungültige Parameteranzahl.",
-+	"css.lint.boxModel.desc": "Verwenden Sie width oder height nicht beim Festlegen von padding oder border",
-+	"css.lint.compatibleVendorPrefixes.desc": "Stellen Sie beim Verwenden vom anbieterspezifischen Präfix sicher, dass alle anderen anbieterspezifischen Eigenschaften miteinbezogen werden",
-+	"css.lint.duplicateProperties.desc": "Keine doppelten Formatvorlagendefinitionen verwenden",
-+	"css.lint.emptyRules.desc": "Keine leeren Regelsätze verwenden",
-+	"css.lint.float.desc": "Die Verwendung von \"float\" vermeiden. float-Eigenschaften führen zu anfälligem CSS, das schnell nicht mehr funktioniert, wenn sich ein Aspekt des Layouts ändert.",
-+	"css.lint.fontFaceProperties.desc": "@font-face-Regel muss die Eigenschaften \"src\" und \"font-family\" definieren.",
-+	"css.lint.hexColorLength.desc": "Hexfarben müssen aus drei oder sechs Hexzahlen bestehen",
-+	"css.lint.idSelector.desc": "Selektoren sollten keine IDs enthalten, da diese Regeln zu eng mit HTML verknüpft sind.",
-+	"css.lint.ieHack.desc": "IE-Hacks sind nur für die Unterstützung von IE7 und älter erforderlich",
-+	"css.lint.importStatement.desc": "Importanweisungen können nicht parallel geladen werden.",
-+	"css.lint.important.desc": "Verwendung von „!important“ vermeiden. Damit wird angegeben, dass die Spezifität vom gesamten CSS außer Kontrolle geraten ist und umgestaltet werden muss.",
-+	"css.lint.propertyIgnoredDueToDisplay.desc": "Die Eigenschaft wird aufgrund der Anzeige ignoriert. Mit \"display: inline\" besitzen die width-, height-, margin-top-, margin-bottom- und float-Eigenschaften z. B. keine Auswirkung.",
-+	"css.lint.universalSelector.desc": "Es ist bekannt, dass der Universalselektor (*) langsam ist.",
-+	"css.lint.unknownProperties.desc": "Unbekannte Eigenschaft.",
-+	"css.lint.unknownVendorSpecificProperties.desc": "Unbekannte anbieterspezifische Eigenschaft.",
-+	"css.lint.vendorPrefix.desc": "Beim Verwenden von anbieterspezifischen Präfix auch die Standardeigenschaft miteinbeziehen",
-+	"css.lint.zeroUnits.desc": "Keine Einheit für Null erforderlich",
-+	"css.validate.desc": "Aktiviert oder deaktiviert alle Überprüfungen.",
-+	"less.colorDecorators.enable.desc": "Aktiviert oder deaktiviert Farb-Decorators",
-+	"less.lint.argumentsInColorFunction.desc": "Ungültige Parameteranzahl.",
-+	"less.lint.boxModel.desc": "Verwenden Sie width oder height nicht beim Festlegen von padding oder border",
-+	"less.lint.compatibleVendorPrefixes.desc": "Stellen Sie beim Verwenden vom anbieterspezifischen Präfix sicher, dass alle anderen anbieterspezifischen Eigenschaften miteinbezogen werden",
-+	"less.lint.duplicateProperties.desc": "Keine doppelten Formatvorlagendefinitionen verwenden",
-+	"less.lint.emptyRules.desc": "Keine leeren Regelsätze verwenden",
-+	"less.lint.float.desc": "Die Verwendung von \"float\" vermeiden. float-Eigenschaften führen zu anfälligem CSS, das schnell nicht mehr funktioniert, wenn sich ein Aspekt des Layouts ändert.",
-+	"less.lint.fontFaceProperties.desc": "@font-face-Regel muss die Eigenschaften \"src\" und \"font-family\" definieren.",
-+	"less.lint.hexColorLength.desc": "Hexfarben müssen aus drei oder sechs Hexzahlen bestehen",
-+	"less.lint.idSelector.desc": "Selektoren sollten keine IDs enthalten, da diese Regeln zu eng mit HTML verknüpft sind.",
-+	"less.lint.ieHack.desc": "IE-Hacks sind nur für die Unterstützung von IE7 und älter erforderlich",
-+	"less.lint.importStatement.desc": "Importanweisungen können nicht parallel geladen werden.",
-+	"less.lint.important.desc": "Verwendung von „!important“ vermeiden. Damit wird angegeben, dass die Spezifität vom gesamten CSS außer Kontrolle geraten ist und umgestaltet werden muss.",
-+	"less.lint.propertyIgnoredDueToDisplay.desc": "Die Eigenschaft wird aufgrund der Anzeige ignoriert. Mit \"display: inline\" besitzen die width-, height-, margin-top-, margin-bottom- und float-Eigenschaften z. B. keine Auswirkung.",
-+	"less.lint.universalSelector.desc": "Es ist bekannt, dass der Universalselektor (*) langsam ist.",
-+	"less.lint.unknownProperties.desc": "Unbekannte Eigenschaft.",
-+	"less.lint.unknownVendorSpecificProperties.desc": "Unbekannte anbieterspezifische Eigenschaft.",
-+	"less.lint.vendorPrefix.desc": "Beim Verwenden von anbieterspezifischen Präfix auch die Standardeigenschaft miteinbeziehen",
-+	"less.lint.zeroUnits.desc": "Keine Einheit für Null erforderlich",
-+	"less.validate.desc": "Aktiviert oder deaktiviert alle Überprüfungen.",
-+	"scss.colorDecorators.enable.desc": "Aktiviert oder deaktiviert Farb-Decorators",
-+	"scss.lint.argumentsInColorFunction.desc": "Ungültige Parameteranzahl.",
-+	"scss.lint.boxModel.desc": "Verwenden Sie width oder height nicht beim Festlegen von padding oder border",
-+	"scss.lint.compatibleVendorPrefixes.desc": "Stellen Sie beim Verwenden vom anbieterspezifischen Präfix sicher, dass alle anderen anbieterspezifischen Eigenschaften miteinbezogen werden",
-+	"scss.lint.duplicateProperties.desc": "Keine doppelten Formatvorlagendefinitionen verwenden",
-+	"scss.lint.emptyRules.desc": "Keine leeren Regelsätze verwenden",
-+	"scss.lint.float.desc": "Die Verwendung von \"float\" vermeiden. float-Eigenschaften führen zu anfälligem CSS, das schnell nicht mehr funktioniert, wenn sich ein Aspekt des Layouts ändert.",
-+	"scss.lint.fontFaceProperties.desc": "@font-face-Regel muss die Eigenschaften \"src\" und \"font-family\" definieren.",
-+	"scss.lint.hexColorLength.desc": "Hexfarben müssen aus drei oder sechs Hexzahlen bestehen",
-+	"scss.lint.idSelector.desc": "Selektoren sollten keine IDs enthalten, da diese Regeln zu eng mit HTML verknüpft sind.",
-+	"scss.lint.ieHack.desc": "IE-Hacks sind nur für die Unterstützung von IE7 und älter erforderlich",
-+	"scss.lint.importStatement.desc": "Importanweisungen können nicht parallel geladen werden.",
-+	"scss.lint.important.desc": "Verwendung von „!important“ vermeiden. Damit wird angegeben, dass die Spezifität vom gesamten CSS außer Kontrolle geraten ist und umgestaltet werden muss.",
-+	"scss.lint.propertyIgnoredDueToDisplay.desc": "Die Eigenschaft wird aufgrund der Anzeige ignoriert. Mit \"display: inline\" besitzen die width-, height-, margin-top-, margin-bottom- und float-Eigenschaften z. B. keine Auswirkung.",
-+	"scss.lint.universalSelector.desc": "Es ist bekannt, dass der Universalselektor (*) langsam ist.",
-+	"scss.lint.unknownProperties.desc": "Unbekannte Eigenschaft.",
-+	"scss.lint.unknownVendorSpecificProperties.desc": "Unbekannte anbieterspezifische Eigenschaft.",
-+	"scss.lint.vendorPrefix.desc": "Beim Verwenden von anbieterspezifischen Präfix auch die Standardeigenschaft miteinbeziehen",
-+	"scss.lint.zeroUnits.desc": "Keine Einheit für Null erforderlich",
-+	"scss.validate.desc": "Aktiviert oder deaktiviert alle Überprüfungen."
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 c8a3e8f056cfd187eed8c4df15ee9d2c7465e094 i18n/deu/extensions/git/out/askpass-main.i18n.json
-  their  100644 a682f91ed9186b86c7ae316c6fce135eb741d791 i18n/deu/extensions/git/out/askpass-main.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"missOrInvalid": "Fehlende oder ungültige Anmeldeinformationen."
- }
-\ No newline at end of file
-changed in both
-  base   100644 d03a9560350b4a0d20b210d654627e62da48b94f i18n/deu/extensions/git/out/commands.i18n.json
-  our    100644 1abad5f86ec11c777f2319fc1588d47f5ea1c8f5 i18n/deu/extensions/git/out/commands.i18n.json
-  their  100644 df8ee13b6b721909a1679507c10e5600966db2cc i18n/deu/extensions/git/out/commands.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -49,6 +50,18 @@
- 	"commit": "Trotzdem committen",
- 	"no staged changes": "Es sind keine Änderungen bereitgestellt.\n\nMöchten Sie alle Ihre Änderungen automatisch bereitstellen und direkt committen?",
- 	"always": "Immer",
-+=======
-+	"branch name": "Branchname",
-+	"clean": "Änderungen bereinigen",
-+	"clean repo": "Bereinigen Sie Ihre Repository-Arbeitsstruktur vor Auftragsabschluss.",
-+	"cloning": "Git-Repository wird geklont...",
-+	"commit message": "Commit-Nachricht",
-+	"confirm clean": "Sollen die Änderungen in {0} bereinigt werden?",
-+	"confirm clean all": "Möchten Sie alle Änderungen bereinigen?",
-+	"confirm revert": "Möchten Sie ausgewählten Änderungen in {0} wirklich zurücksetzen?",
-+	"disabled": "Git ist deaktiviert oder wird in diesem Arbeitsbereich nicht unterstützt.",
-+	"never again": "OK, nicht mehr anzeigen",
-+>>>>>>> .their
- 	"no changes": "Keine Änderungen zum Speichern vorhanden.",
- 	"commit message": "Commit-Nachricht",
- 	"provide commit message": "Geben Sie eine Commit-Nachricht ein.",
-@@ -73,6 +86,7 @@
- 	"nobranch": "Wählen Sie ein Branch für den Push zu einem Remoteelement aus.",
- 	"confirm publish branch": "Der Branch \"{0}\" verfügt über keinen Upstreambranch. Möchten Sie diesen Branch veröffentlichen?",
- 	"ok": "OK",
-+<<<<<<< .our
- 	"push with tags success": "Push mit Tags erfolgreich ausgeführt.",
- 	"pick remote": "Remotespeicherort auswählen, an dem der Branch \"{0}\" veröffentlicht wird:",
- 	"sync is unpredictable": "Mit dieser Aktion werden Commits per Push und Pull an und von \"{0}/{1}\" übertragen.",
-@@ -88,4 +102,17 @@
- 	"git error details": "Git: {0}",
- 	"git error": "Git-Fehler",
- 	"open git log": "Git-Protokoll öffnen"
-+=======
-+	"open git log": "Git-Protokoll öffnen",
-+	"parent": "Übergeordnetes Verzeichnis",
-+	"pick remote": "Remotespeicherort auswählen, an dem der Branch \"{0}\" veröffentlicht wird:",
-+	"proposeopen": "Möchten Sie das geklonte Repository öffnen?",
-+	"provide branch name": "Geben Sie einen Branchnamen an.",
-+	"provide commit message": "Geben Sie eine Commit-Nachrichte ein.",
-+	"remote branch at": "Remotebranch unter {0}",
-+	"repourl": "Repository-URL",
-+	"revert": "Änderungen zurücksetzen",
-+	"sync is unpredictable": "Mit dieser Aktion werden Commits per Push und Pull an und von \"{0}\" übertragen.",
-+	"tag at": "Tag bei {0}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 fa7b011c8afcf4cd4d08647ddaf60ba10acbfb16 i18n/deu/extensions/git/out/main.i18n.json
-  our    100644 f9fdc4a621206c9b83e9f0ee9ba40c30e70df076 i18n/deu/extensions/git/out/main.i18n.json
-  their  100644 afc015dd9bb5c3f85ff3126a5b834e58b2de554c i18n/deu/extensions/git/out/main.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,4 +14,9 @@
- 	"notfound": "Git nicht gefunden. Installieren Sie es, oder konfigurieren Sie es mithilfe der Einstellung \"git.path\".",
- 	"updateGit": "Git aktualisieren",
- 	"git20": "Sie haben anscheinend Git {0} installiert. Code funktioniert am besten mit Git 2 oder neuer"
-+=======
-+	"git20": "Sie haben anscheinend Git {0} installiert. Der Code funktioniert am besten mit Git >= 2",
-+	"updateGit": "Git aktualisieren",
-+	"using git": "Verwenden von Git {0} von {1}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 9306bbd4aef686af4fe0d13550747f50ea1f5645 i18n/deu/extensions/git/package.i18n.json
-  our    100644 70e0819e8ad95e53d1958520356a5b59f85a5e7c i18n/deu/extensions/git/package.i18n.json
-  their  100644 7cb955bb8ca72ae265b70bdce8d18288cf85368d i18n/deu/extensions/git/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,6 +14,20 @@
- 	"command.close": "Repository schließen",
- 	"command.refresh": "Aktualisieren",
- 	"command.openChange": "Änderungen öffnen",
-+=======
-+	"command.branch": "Branch wird erstellt...",
-+	"command.checkout": "Auschecken an...",
-+	"command.clean": "Datei bereinigen",
-+	"command.cleanAll": "Alle Dateien bereinigen",
-+	"command.clone": "Klonen",
-+	"command.commit": "Commit",
-+	"command.commitAll": "Alle committen",
-+	"command.commitAllSigned": "Alle committen (abgemeldet)",
-+	"command.commitStaged": "Gestaffelt committen",
-+	"command.commitStagedSigned": "Gestaffelt committen (abgemeldet)",
-+	"command.init": "Repository initialisieren",
-+	"command.openChange": "Änderung öffnen",
-+>>>>>>> .their
- 	"command.openFile": "Datei öffnen",
- 	"command.openHEADFile": "Datei öffnen (HEAD)",
- 	"command.stage": "Änderungen bereitstellen",
-@@ -46,6 +61,7 @@
- 	"command.pullFrom": "Pullen von...",
- 	"command.push": "Push",
- 	"command.pushTo": "Push zu...",
-+<<<<<<< .our
- 	"command.pushWithTags": "Push mit Tags ausführen",
- 	"command.sync": "Synchronisierung",
- 	"command.syncRebase": "Sync (Rebase)",
-@@ -59,6 +75,20 @@
- 	"config.enabled": "Gibt an, ob Git aktiviert ist.",
- 	"config.path": "Der Pfad zur ausführbaren Git-Datei.",
- 	"config.autoRepositoryDetection": "Ob Repositorien automatisch erkannt werden sollen",
-+=======
-+	"command.refresh": "Aktualisieren",
-+	"command.revertSelectedRanges": "Ausgewählte Bereiche zurücksetzen",
-+	"command.showOutput": "Git-Ausgabe anzeigen",
-+	"command.stage": "Datei bereitstellen",
-+	"command.stageAll": "Alle Dateien bereitstellen",
-+	"command.stageSelectedRanges": "Gewählte Bereiche staffeln",
-+	"command.sync": "Synchronisierung",
-+	"command.undoCommit": "Letzten Commit rückgängig machen",
-+	"command.unstage": "Bereitstellung der Datei aufheben",
-+	"command.unstageAll": "Bereitstellung für alle Dateien aufheben",
-+	"command.unstageSelectedRanges": "Staffelung gewählter Bereiche aufheben",
-+	"config.autofetch": "Gibt an, ob automatischer Abruf aktiviert ist.",
-+>>>>>>> .their
- 	"config.autorefresh": "Gibt an, ob die automatische Aktualisierung aktiviert ist.",
- 	"config.autofetch": "Gibt an, ob automatischer Abruf aktiviert ist.",
- 	"config.enableLongCommitWarning": "Gibt an, ob Warnungen zu langen Commitnachrichten erfolgen sollen.",
-added in both
-  our    100644 e5e06fc03c8e5a6dc6419efcfef9a4edcce3e410 i18n/deu/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
-  their  100644 908d279da790efaa65d427b2a679f8580b862e59 i18n/deu/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"typescript.jsDocCompletionItem.documentation": "JSDoc-Kommentar"
- }
-\ No newline at end of file
-changed in both
-  base   100644 24ec88f8e7020ea08c4b0eeb6aabbcb94a3145f1 i18n/deu/extensions/typescript/out/utils/projectStatus.i18n.json
-  our    100644 b36d5e0aec6f1a75633b409b664010ea342d8b68 i18n/deu/extensions/typescript/out/utils/projectStatus.i18n.json
-  their  100644 41d1cfdfbb451c0ef18b4b8a9348ff45e99eb541 i18n/deu/extensions/typescript/out/utils/projectStatus.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,11 @@
- 	],
- 	"hintExclude": "Um die JavaScript/TypeScript-Sprachfunktionen für das gesamte Projekt zu aktivieren, schließen Sie Ordner mit vielen Dateien aus. Beispiel: {0}",
- 	"hintExclude.generic": "Um JavaScript/TypeScript-Sprachfunktionen für das gesamte Projekt zu aktivieren, schließen Sie große Ordner mit Quelldateien aus, an denen Sie nicht arbeiten.",
-+=======
-+	"hintExclude": "Um die JavaScript/TypeScript-Sprachfunktionen für das gesamte Projekt zu aktivieren, schließen Sie Ordner mit vielen Dateien aus. Beispiel: {0}",
-+	"hintExclude.generic": "Um JavaScript/TypeScript-Sprachfunktionen für das gesamte Projekt zu aktivieren, schließen Sie große Ordner mit Quelldateien aus, an denen Sie nicht arbeiten.",
-+	"hintExclude.tooltip": "Um JavaScript/TypeScript-Sprachfunktionen für das gesamte Projekt zu aktivieren, schließen Sie große Ordner mit Quelldateien aus, an denen Sie nicht arbeiten.",
-+>>>>>>> .their
- 	"large.label": "Auszuschließende Elemente konfigurieren",
- 	"hintExclude.tooltip": "Um JavaScript/TypeScript-Sprachfunktionen für das gesamte Projekt zu aktivieren, schließen Sie große Ordner mit Quelldateien aus, an denen Sie nicht arbeiten."
- }
-\ No newline at end of file
-changed in both
-  base   100644 846bc2dafd29649fb02c45f85786866798dd3bf2 i18n/deu/src/vs/code/electron-main/menus.i18n.json
-  our    100644 2c62aec3f2252906a0cfb94c2bac025ecf6adbb0 i18n/deu/src/vs/code/electron-main/menus.i18n.json
-  their  100644 ac4d72ce9f4de023164b48af280b9913b34e9f40 i18n/deu/src/vs/code/electron-main/menus.i18n.json
-@@ -21,7 +21,60 @@
- 	"mHide": "{0} ausblenden",
- 	"mHideOthers": "Andere ausblenden",
- 	"mShowAll": "Alle anzeigen",
-+<<<<<<< .our
- 	"miQuit": "{0} beenden",
-+=======
-+	"mView": "&&Anzeigen",
-+	"mWindow": "Fenster",
-+	"miAbout": "&&Info",
-+	"miAccessibilityOptions": "&&Optionen für erleichterte Bedienung",
-+	"miAddSelectionToNextFindMatch": "&&Nächstes Vorkommen hinzufügen",
-+	"miAddSelectionToPreviousFindMatch": "Vo&&rheriges Vorkommen hinzufügen",
-+	"miAdditionalViews": "Z&&usätzliche Ansichten",
-+	"miAutoSave": "Automatisch speichern",
-+	"miBack": "&&Zurück",
-+	"miCheckForUpdates": "Auf Updates überprüfen...",
-+	"miCheckingForUpdates": "Überprüfen auf Updates...",
-+	"miClearItems": "&&Elemente löschen",
-+	"miCloseEditor": "Editor s&&chließen",
-+	"miCloseFolder": "&&Ordner schließen",
-+	"miCloseWindow": "&&Fenster schließen",
-+	"miCommandPalette": "&&Befehlspalette...",
-+	"miCopy": "&&Kopieren",
-+	"miCopyLinesDown": "Zeile nach unten ko&&pieren",
-+	"miCopyLinesUp": "Zeile nach oben &&kopieren",
-+	"miCut": "&&Ausschneiden",
-+	"miDocumentation": "&&Dokumentation",
-+	"miDownloadUpdate": "Verfügbares Update herunterladen",
-+	"miDownloadingUpdate": "Das Update wird heruntergeladen...",
-+	"miEmmetExpandAbbreviation": "Emmet: Abkür&&zung erweitern",
-+	"miExit": "&&Beenden",
-+	"miFind": "&&Suchen",
-+	"miFindInFiles": "&&In Dateien suchen",
-+	"miFocusFirstGroup": "&&Erste Gruppe",
-+	"miFocusSecondGroup": "&&Zweite Gruppe",
-+	"miFocusThirdGroup": "&&Dritte Gruppe",
-+	"miForward": "&&Weiterleiten",
-+	"miGotoDefinition": "Gehe &&zu Definition",
-+	"miGotoFile": "Gehe zu &&Datei...",
-+	"miGotoLine": "Gehe zu Zei&&le...",
-+	"miGotoSymbolInFile": "Gehe zu &&Symbol in Datei...",
-+	"miGotoSymbolInWorkspace": "Zu Symbol im &&Arbeitsbereich wechseln...",
-+	"miHideActivityBar": "&&Aktivitätsleiste ausblenden",
-+	"miHideStatusbar": "&&Statusleiste ausblenden",
-+	"miInsertCursorAbove": "Cursor oberh&&alb hinzufügen",
-+	"miInsertCursorAtEndOfEachLineSelected": "C&&ursor an Zeilenenden hinzufügen",
-+	"miInsertCursorBelow": "Cursor unterhal&&b hinzufügen",
-+	"miInstallingUpdate": "Update wird installiert...",
-+	"miIntroductoryVideos": "&&Einführungsvideos",
-+	"miKeyboardShortcuts": "&&Referenz für Tastenkombinationen",
-+	"miLicense": "&&Lizenz anzeigen",
-+	"miMarker": "&&Probleme",
-+	"miMoveLinesDown": "Zeile nach &&unten verschieben",
-+	"miMoveLinesUp": "Zeile nach oben &&verschieben",
-+	"miMoveSidebarLeft": "&&Seitenleiste nach links verschieben",
-+	"miMoveSidebarRight": "&&Seitenleiste nach rechts verschieben",
-+>>>>>>> .their
- 	"miNewFile": "&&Neue Datei",
- 	"miOpen": "&&Öffnen...",
- 	"miOpenWorkspace": "Ar&&beitsbereich öffnen...",
-changed in both
-  base   100644 4916c1a75cba6910195120186bc73ed0b2c5333e i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 0cb95fccc47d309d94aacd1e25b0718fd455d527 i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 4643dcacdaa991440cd6cf4a5e5b8c3d1e11fda6 i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,16 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"acceptSuggestionOnCommitCharacter": "Steuert, ob Vorschläge über Commitzeichen angenommen werden sollen. In JavaScript kann ein Semikolon (\";\") beispielsweise ein Commitzeichen sein, das einen Vorschlag annimmt und dieses Zeichen eingibt.",
-+	"acceptSuggestionOnEnter": "Steuert, ob Vorschläge über die Eingabetaste (zusätzlich zur TAB-Taste) angenommen werden sollen. Vermeidet Mehrdeutigkeit zwischen dem Einfügen neuer Zeilen oder dem Annehmen von Vorschlägen.",
-+	"autoClosingBrackets": "Steuert, ob der Editor Klammern automatisch nach dem Öffnen schließt.",
-+	"codeLens": "Steuert, ob der Editor CodeLenses anzeigt.",
-+	"cursorBlinking": "Steuert den Cursoranimationsstil. Gültige Werte sind \"blink\", \"smooth\", \"phase\", \"expand\" und \"solid\".",
-+	"cursorStyle": "Steuert den Cursorstil. Gültige Werte sind  \"block\", \"block-outline\", \"line\", \"line-thin\", \"underline\" und \"underline-thin\".",
-+	"detectIndentation": "Beim Öffnen einer Datei werden \"editor.tabSize\" und \"editor.insertSpaces\" basierend auf den Dateiinhalten erkannt.",
-+	"dragAndDrop": "Steuert, ob der Editor das Verschieben einer Auswahl per Drag and Drop zulässt.",
-+>>>>>>> .their
- 	"editorConfigurationTitle": "Editor",
- 	"fontFamily": "Steuert die Schriftfamilie.",
- 	"fontWeight": "Steuert die Schriftbreite.",
-@@ -23,6 +34,7 @@
- 	"tabSize.errorMessage": "\"number\" wurde erwartet. Beachten Sie, dass der Wert \"auto\" durch die Einstellung \"editor.detectIndentation\" ersetzt wurde.",
- 	"insertSpaces": "Fügt beim Drücken der TAB-TASTE Leerzeichen ein. Diese Einstellung wird basierend auf dem Inhalt der Datei überschrieben, wenn \"editor.detectIndentation\" aktiviert ist.",
- 	"insertSpaces.errorMessage": "\"boolean\" wurde erwartet. Beachten Sie, dass der Wert \"auto\" durch die Einstellung \"editor.detectIndentation\" ersetzt wurde.",
-+<<<<<<< .our
- 	"detectIndentation": "Beim Öffnen einer Datei werden \"editor.tabSize\" und \"editor.insertSpaces\" basierend auf den Dateiinhalten erkannt.",
- 	"roundedSelection": "Steuert, ob die Auswahl runde Ecken aufweist.",
- 	"scrollBeyondLastLine": "Legt fest, ob der Editor Bildläufe über die letzte Zeile hinaus ausführt.",
-@@ -43,6 +55,14 @@
- 	"wordWrap": "Steuert den Zeilenumbruch. Mögliche Einstellungen sind:\n - \"off\" (Umbruch deaktivieren),\n - \"on\" (Anzeigebereichsumbruch),\n - \"wordWrapColumn\" (Umbruch bei \"editor.wordWrapColumn\") oder\n - \"bounded\" (der Zeilenumbruch erfolgt beim Mindestanzeigebereich und \"editor.wordWrapColumn\").",
- 	"wordWrapColumn": "Steuert die Umbruchspalte des Editors, wenn für \"editor.wordWrap\" die Option \"wordWrapColumn\" oder \"bounded\" festgelegt ist.",
- 	"wrappingIndent": "Steuert den Einzug umbrochener Zeilen. Der Wert kann „none“, „same“, „indent“ oder „deepIndent“ sein.",
-+=======
-+	"lineHeight": "Steuert die Zeilenhöhe. Verwenden Sie 0, um LineHeight aus der FontSize-Angabe zu berechnen.",
-+	"lineNumbers": "Steuert die Anzeige von Zeilennummern. Mögliche Werte sind \"Ein\", \"Aus\" und \"Relativ\". \"Relativ\" zeigt die Zeilenanzahl ab der aktuellen Cursorposition.",
-+	"matchBrackets": "Übereinstimmende Klammern hervorheben, wenn eine davon ausgewählt wird.",
-+	"minimap.enabled": "Steuert, ob die Minikarte angezeigt wird",
-+	"minimap.maxColumn": "Breite der Minikarte beschränken, um höchstens eine bestimmte Anzahl von Spalten zu rendern",
-+	"minimap.renderCharacters": "Die tatsächlichen Zeichen in einer Zeile rendern (im Gegensatz zu Farbblöcken)",
-+>>>>>>> .their
- 	"mouseWheelScrollSensitivity": "Ein Multiplikator, der für die Mausrad-Bildlaufereignisse \"deltaX\" und \"deltaY\" verwendet werden soll.",
- 	"multiCursorModifier.ctrlCmd": "Ist unter Windows und Linux der Taste \"STRG\" und unter macOSX der Befehlstaste zugeordnet.",
- 	"multiCursorModifier.alt": "Ist unter Windows und Linux der Taste \"Alt\" und unter macOSX der Wahltaste zugeordnet. ",
-@@ -112,7 +132,28 @@
- 	"codeActionsOnSaveTimeout": "Timeout für Codeaktionen, die beim Speichern ausgeführt werden.",
- 	"selectionClipboard": "Steuert, ob die primäre Linux-Zwischenablage unterstützt werden soll.",
- 	"sideBySide": "Steuert, ob der Diff-Editor das Diff nebeneinander oder inline anzeigt.",
-+<<<<<<< .our
- 	"ignoreTrimWhitespace": "Steuert, ob der Diff-Editor Änderungen in führenden oder nachgestellten Leerzeichen als Diffs anzeigt.",
- 	"largeFileOptimizations": "Spezielle Behandlung für große Dateien zum Deaktivieren bestimmter speicherintensiver Funktionen.",
- 	"renderIndicators": "Steuert, ob der Diff-Editor die Indikatoren \"+\" und \"-\" für hinzugefügte/entfernte Änderungen anzeigt."
-+=======
-+	"snippetSuggestions": "Steuert, ob Codeausschnitte mit anderen Vorschlägen angezeigt und wie diese sortiert werden.",
-+	"stablePeek": "Peek-Editoren geöffnet lassen, auch wenn auf ihren Inhalt doppelgeklickt oder die ESC-TASTE gedrückt wird.",
-+	"suggestFontSize": "Schriftgröße für Vorschlagswidget",
-+	"suggestLineHeight": "Zeilenhöhe für Vorschlagswidget",
-+	"suggestOnTriggerCharacters": "Steuert, ob Vorschläge automatisch bei der Eingabe von Triggerzeichen angezeigt werden.",
-+	"tabSize": "Die Anzahl der Leerzeichen, denen ein Tabstopp entspricht. Diese Einstellung wird basierend auf dem Inhalt der Datei überschrieben, wenn \"editor.detectIndentation\" aktiviert ist.",
-+	"tabSize.errorMessage": "\"number\" wurde erwartet. Beachten Sie, dass der Wert \"auto\" durch die Einstellung \"editor.detectIndentation\" ersetzt wurde.",
-+	"trimAutoWhitespace": "Nachfolgendes automatisch eingefügtes Leerzeichen entfernen",
-+	"useTabStops": "Das Einfügen und Löschen von Leerzeichen folgt auf Tabstopps.",
-+	"wordBasedSuggestions": "Wortbasierte Vorschläge aktivieren.",
-+	"wordSeparators": "Zeichen, die als Worttrennzeichen verwendet werden, wenn wortbezogene Navigationen oder Vorgänge ausgeführt werden.",
-+	"wordWrap": "Steuert den Zeilenumbruch. Mögliche Einstellungen sind:\n - \"off\" (Umbruch deaktivieren),\n - \"on\" (Anzeigebereichsumbruch),\n - \"wordWrapColumn\" (Umbruch bei \"editor.wordWrapColumn\") oder \n - \"bounded\" (der Zeilenumbruch erfolgt beim Mindestanzeigebereich und \"editor.wordWrapColumn\").",
-+	"wordWrap.bounded": "Der Zeilenumbruch erfolgt beim Mindestanzeigebereich und \"editor.wordWrapColumn\".",
-+	"wordWrap.off": "Zeilenumbrüche erfolgen nie.",
-+	"wordWrap.on": "Der Zeilenumbruch erfolgt an der Breite des Anzeigebereichs.",
-+	"wordWrap.wordWrapColumn": "Der Zeilenbereich erfolgt bei \"editor.wordWrapColumn\".",
-+	"wordWrapColumn": "Steuert die Umbruchspalte des Editors, wenn für \"editor.wordWrap\" die Option \"wordWrapColumn\" oder \"bounded\" festgelegt ist.",
-+	"wrappingIndent": "Steuert den Einzug der umbrochenen Zeilen. Der Wert kann \"none\", \"same\" oder \"indent\" sein."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 65fd2aa27f3a1ee960791240abafc083950d90b1 i18n/deu/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
-  our    100644 a884dc5b4b15f03414e92ccf29b5150680c9ab3b i18n/deu/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
-  their  100644 79090a115a65ab5d0da56dd50844da47e4f5e923 i18n/deu/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
-@@ -20,5 +20,13 @@
- 	"meta.typeDefinitions.title": "{0} Typdefinitionen",
- 	"actions.goToTypeDefinition.label": "Zur Typdefinition wechseln",
- 	"actions.peekTypeDefinition.label": "Vorschau der Typdefinition anzeigen",
-+<<<<<<< .our
- 	"multipleResults": "Klicken Sie, um {0} Definitionen anzuzeigen."
-+=======
-+	"actions.previewDecl.label": "Peek-Definition",
-+	"generic.noResults": "Keine Definition gefunden",
-+	"meta.title": " – {0} Definitionen",
-+	"multipleResults": "Klicken Sie, um {0} Definitionen anzuzeigen.",
-+	"noResultWord": "Keine Definition gefunden für \"{0}\"."
-+>>>>>>> .their
- }
-\ No newline at end of file
-removed in local
-  base   100644 a4480c1b9c6f582d09d4ebe98e5097c255b14d30 i18n/deu/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
-  their  100644 1f1c93562bfa51eec86becde8e7542e02894a060 i18n/deu/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/deu/src/vs/workbench/electron-browser/commands.i18n.json
-  our    100644 983899514ca518324d9e85f57712db39d3040bbe i18n/deu/src/vs/workbench/electron-browser/commands.i18n.json
-  their  100644 3a1051dcfdad7ec7db70524f0a31f277885230df i18n/deu/src/vs/workbench/electron-browser/commands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"diffLeftRightLabel": "{0} ⟷ {1}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 2213253a996424534148cc4b565869ad7a21473d i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 fc92fd392259fb9b2d1dec1cecdbc3c76bdc7440 i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 eb1c197bd8a3de9038db371db4d5033e2896a7b9 i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -34,6 +34,7 @@
- 	"sideBarLocation": "Steuert die Position der Seitenleiste. Diese kann entweder links oder rechts von der Workbench angezeigt werden.",
- 	"panelDefaultLocation": "Steuert die Standardposition des Panels. Dieses kann entweder unterhalb oder rechts von der Workbench angezeigt werden.",
- 	"statusBarVisibility": "Steuert die Sichtbarkeit der Statusleiste im unteren Bereich der Workbench.",
-+<<<<<<< .our
- 	"activityBarVisibility": "Steuert die Sichtbarkeit der Aktivitätsleiste in der Workbench.",
- 	"viewVisibility": "Steuert die Sichtbarkeit von Headeraktionen. Headeraktionen können immer sichtbar sein oder nur sichtbar sein, wenn diese Ansicht fokussiert ist oder mit der Maus darauf gezeigt wird.",
- 	"fontAliasing": "Steuert die Schriftartaliasingmethode in der Workbench.\n - default: Subpixel-Schriftartglättung. Auf den meisten Nicht-Retina-Displays wird Text bei dieser Einstellung am schärfsten dargestellt. \n- antialiased: Glättet die Schriftart auf der Pixelebene (im Gegensatz zur Subpixelebene). Bei dieser Einstellung kann die Schriftart insgesamt heller wirken.\n- none: Deaktiviert die Schriftartglättung. Text wird mit gezackten scharfen Kanten dargestellt.\n- auto: Wendet ausgehend vom DPI der Anzeige automatisch \"default\" oder \"antialiased\" an.",
-@@ -42,6 +43,28 @@
- 	"workbench.fontAliasing.none": "Deaktiviert die Schriftartglättung. Text wird mit gezackten scharfen Kanten dargestellt.",
- 	"workbench.fontAliasing.auto": "Wendet ausgehend vom DPI der Anzeige automatisch \"default\" oder \"antialiased\" an.",
- 	"enableNaturalLanguageSettingsSearch": "Steuert, ob der Suchmodus mit natürlicher Sprache für die Einstellungen aktiviert werden soll.",
-+=======
-+	"title": "Steuert den Fenstertitel abhängig vom aktiven Editor. Variablen werden abhängig vom Kontext ersetzt:\n${activeEditorShort}: z. B. myFile.txt\n${activeEditorMedium}: z. B. myFolder/myFile.txt\n${activeEditorLong}: z. B. /Users/Development/myProject/myFolder/myFile.txt\n${rootName}: z. B. myProject\n${rootPath}: z. B. /Users/Development/myProject\n${appName}: z. B. VS Code\n${dirty}: ein geänderter Indikator, wenn der aktive Editor geändert wurde\n${separator}: ein bedingtes Trennzeichen (\" - \"), das nur in der Umgebung von Variablen mit Werten angezeigt wird",
-+	"titleBarStyle": "Passt das Aussehen der Titelleiste des Fensters an. Zum Anwenden der Änderungen ist ein vollständiger Neustart erforderlich.",
-+	"view": "Anzeigen",
-+	"window.menuBarVisibility.default": "Das Menü ist nur im Vollbildmodus ausgeblendet.",
-+	"window.menuBarVisibility.hidden": "Das Menü ist immer ausgeblendet.",
-+	"window.menuBarVisibility.toggle": "Das Menu ist ausgeblendet, kann aber mit der Alt-Taste angezeigt werden.",
-+	"window.menuBarVisibility.visible": "Das Menu wird immer angezeigt, auch im Vollbildmodus.",
-+	"window.newWindowDimensions.default": "Öffnet neue Fenster in der Mitte des Bildschirms.",
-+	"window.newWindowDimensions.fullscreen": "Öffnet neue Fenster im Vollbildmodus.",
-+	"window.newWindowDimensions.inherit": "Öffnet neue Fenster mit den gleichen Abmessungen wie das letzte aktive Fenster.",
-+	"window.newWindowDimensions.maximized": "Öffnet neue Fenster maximiert.",
-+	"window.openFilesInNewWindow.default": "Dateien werden im Fenster mit dem geöffneten Dateiordner oder im letzten aktiven Fenster geöffnet, sofern sie nicht über das Dock oder den Finder geöffnet werden (nur MacOS).",
-+	"window.openFilesInNewWindow.off": "Dateien werden im Fenster mit dem geöffneten Dateiordner oder im letzten aktiven Fenster geöffnet.",
-+	"window.openFilesInNewWindow.on": "Dateien werden in einem neuen Fenster geöffnet.",
-+	"window.openFoldersInNewWindow.default": "Ordner werden in einem neuen Fenster geöffnet, sofern kein Ordner innerhalb der Anwendung ausgewählt wird (z. B. über das Dateimenü).",
-+	"window.openFoldersInNewWindow.off": "Ordner ersetzen das letzte aktive Fenster.",
-+	"window.openFoldersInNewWindow.on": "Ordner werden in einem neuen Fenster geöffnet.",
-+	"window.reopenFolders.all": "Alle Ordner der letzten Sitzung erneut öffnen.",
-+	"window.reopenFolders.none": "Ordner nie erneut öffnen.",
-+	"window.reopenFolders.one": "Den letzten aktiven Ordner erneut öffnen.",
-+>>>>>>> .their
- 	"windowConfigurationTitle": "Fenster",
- 	"window.openFilesInNewWindow.on": "Dateien werden in einem neuen Fenster geöffnet.",
- 	"window.openFilesInNewWindow.off": "Dateien werden im Fenster mit dem geöffneten Dateiordner oder im letzten aktiven Fenster geöffnet.",
-added in both
-  our    100644 fb282a87bf904a095a8cd2a228168cb9c1a81c62 i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
-  their  100644 fb18887eeb14649b37a5534ec4d45b0c1ce3ecf5 i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,6 +9,16 @@
- 	],
- 	"wordWrapMigration.ok": "OK",
- 	"wordWrapMigration.dontShowAgain": "Nicht mehr anzeigen",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"wordWrapMigration.dontShowAgain": "Nicht mehr anzeigen",
-+	"wordWrapMigration.ok": "OK",
-+>>>>>>> .their
- 	"wordWrapMigration.openSettings": "Einstellungen öffnen",
- 	"wordWrapMigration.prompt": "Die Einstellung \"editor.wrappingColumn\" ist veraltet und wurde durch \"editor.wordWrap\" ersetzt."
- }
-\ No newline at end of file
-changed in both
-  base   100644 0b444924931c1a223459e5b495c19a8bc1379b98 i18n/deu/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-  our    100644 b11a3acca259795aed91745ee15e51fc17845d23 i18n/deu/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-  their  100644 f2fe13484519cb806a2cee983dfea9c300e2ddfa i18n/deu/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-@@ -41,7 +41,34 @@
- 	"debugConsoleAction": "Debugging-Konsole",
- 	"unreadOutput": "Neue Ausgabe in Debugging-Konsole",
- 	"debugFocusConsole": "Focus-Debugging-Konsole",
-+<<<<<<< .our
- 	"focusSession": "Fokus auf Sitzung",
-+=======
-+	"disableAllBreakpoints": "Alle Haltepunkte deaktivieren",
-+	"disableBreakpoint": "Haltepunkt deaktivieren",
-+	"disconnectDebug": "Trennen",
-+	"editConditionalBreakpoint": "Haltepunkt bearbeiten...",
-+	"enableAllBreakpoints": "Alle Haltepunkte aktivieren",
-+	"enableBreakpoint": "Haltepunkt aktivieren",
-+	"focusProcess": "Fokus auf Prozess",
-+	"launchJsonNeedsConfigurtion": "Konfigurieren oder reparieren Sie \"launch.json\".",
-+	"openLaunchJson": "{0} öffnen",
-+	"pauseDebug": "Anhalten",
-+	"reapplyAllBreakpoints": "Alle Haltepunkte erneut anwenden",
-+	"reconnectDebug": "Erneut verbinden",
-+	"removeAllBreakpoints": "Alle Haltepunkte entfernen",
-+	"removeAllWatchExpressions": "Alle Ausdrücke entfernen",
-+	"removeBreakpoint": "Haltepunkt entfernen",
-+	"removeWatchExpression": "Ausdruck entfernen",
-+	"renameFunctionBreakpoint": "Funktionshaltepunkt umbenennen",
-+	"restartDebug": "Neu starten",
-+	"restartFrame": "Frame neu starten",
-+	"reverseContinue": "Umkehren",
-+	"selectAndStartDebugging": "Debugging auswählen und starten",
-+	"setValue": "Wert festlegen",
-+	"startDebug": "Debuggen starten",
-+	"startWithoutDebugging": "Ohne Debuggen starten",
-+>>>>>>> .their
- 	"stepBackDebug": "Schritt zurück",
- 	"reverseContinue": "Umkehren"
- }
-\ No newline at end of file
-added in both
-  our    100644 50aa489c19aa14356fed5e058e392f63e0cf7867 i18n/deu/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
-  their  100644 16fc66f8458cbd4c0ceee8af6c21713973841059 i18n/deu/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -12,4 +13,16 @@
- 	"addConfiguration": "Konfiguration hinzufügen...",
- 	"noConfigurationsMatching": "Keine übereinstimmenden Debugkonfigurationen",
- 	"noConfigurationsFound": "Keine Debugkonfiguration gefunden. Erstellen Sie die Datei \"launch.json\"."
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"debugAriaLabel": "Geben Sie den Namen einer auszuführenden Startkonfiguration ein.",
-+	"entryAriaLabel": "{0}, Debugging",
-+	"noConfigurationsFound": "Keine Debugkonfiguration gefunden. Erstellen Sie die Datei \"launch.json\".",
-+	"noConfigurationsMatching": "Keine übereinstimmenden Debugkonfigurationen"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 0cfeae39b2e0ab0744049dda1d61006947556d67 i18n/deu/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
-  their  100644 59f30de23004f7be49b696667fbbaac3d7ca1a8d i18n/deu/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,4 +11,13 @@
- 	"debugExceptionWidgetBackground": "Widget-Hintergrundfarbe bei einer Ausnahme. ",
- 	"exceptionThrownWithId": "Ausnahme: {0}",
- 	"exceptionThrown": "Ausnahme aufgetreten."
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"exceptionThrown": "Ausnahme aufgetreten"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 baa100cd1b6fb5cdfbfe37c9ea0dbebd78621a54 i18n/deu/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  our    100644 72a2c9e811a52bded399b60826b044c598a0ead6 i18n/deu/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  their  100644 595a96b041a25ff8f44848b4c244ed3fc99d80e4 i18n/deu/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-changed in both
-  base   100644 722adeebb2a956636c22e6c5ed092c5da4ca0e79 i18n/deu/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  our    100644 9b039afb7e7129891b940975939709ed5db6f52c i18n/deu/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  their  100644 4cfd59fbcbcdec32f7f8923bea6ebc47fa2a7028 i18n/deu/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-@@ -8,6 +8,20 @@
- 	],
- 	"debugAdapterBinNotFound": "Die ausführbare Datei \"{0}\" des Debugadapters ist nicht vorhanden.",
- 	"debugAdapterCannotDetermineExecutable": "Die ausführbare Datei \"{0}\" des Debugadapters kann nicht bestimmt werden.",
-+<<<<<<< .our
- 	"unableToLaunchDebugAdapter": "Der Debugadapter kann nicht aus {0} gestartet werden.",
- 	"unableToLaunchDebugAdapterNoArgs": "Debugadapter kann nicht gestartet werden."
-+=======
-+	"debugLinuxConfiguration": "Linux-spezifische Startkonfigurationsattribute.",
-+	"debugName": "Der Name der Konfiguration. Er wird im Dropdownmenü der Startkonfiguration angezeigt.",
-+	"debugOSXConfiguration": "OS X-spezifische Startkonfigurationsattribute.",
-+	"debugPrelaunchTask": "Ein Task, der ausgeführt werden soll, bevor die Debugsitzung beginnt.",
-+	"debugRequest": "Der Anforderungstyp der Konfiguration. Der Wert kann \"launch\" oder \"attach\" sein.",
-+	"debugServer": "Nur für die Entwicklung von Debugerweiterungen: Wenn ein Port angegeben ist, versucht der VS-Code, eine Verbindung mit einem Debugadapter herzustellen, der im Servermodus ausgeführt wird.",
-+	"debugType": "Der Typ der Konfiguration.",
-+	"debugWindowsConfiguration": "Windows-spezifische Startkonfigurationsattribute.",
-+	"deprecatedVariables": "\"env.\", \"config.\" und \"command.\" sind veraltet, verwenden Sie stattdessen \"env:\", \"config:\" und \"command:\".",
-+	"internalConsoleOptions": "Steuert das Verhalten der internen Debugging-Konsole.",
-+	"node2NotSupported": "\"node2\" wird nicht mehr unterstützt, verwenden Sie stattdessen \"node\", und legen Sie das Attribut \"protocol\" auf \"inspector\" fest."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7a861e1327fb740c9986366de94a0134cd432441 i18n/deu/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 00a2164ceaa6feb9c7573ae407355c84d09fbc3c i18n/deu/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 a954d8ac2850b0bd3dc0ffd7970e7fc5b47cce7a i18n/deu/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-@@ -6,11 +6,19 @@
- {
- 	"showExplorerViewlet": "Explorer anzeigen",
- 	"explore": "Explorer",
-+<<<<<<< .our
- 	"view": "Anzeigen",
- 	"textFileEditor": "Textdatei-Editor",
- 	"binaryFileEditor": "Binärdatei-Editor",
- 	"filesConfigurationTitle": "Dateien",
- 	"exclude": "Konfigurieren Sie Globmuster zum Ausschließen von Dateien und Ordnern. Zum Beispiel entscheidet Explorer welche Dateien und Ordner gezeigt oder ausgeblendet werden anhand dieser Einstellung.",
-+=======
-+	"explorerConfigurationTitle": "Datei-Explorer",
-+	"files.autoSave.afterDelay": "Eine geänderte Datei wird automatisch nach der konfigurierten \"files.autoSaveDelay\" gespeichert.",
-+	"files.autoSave.off": "Eine geänderte Datei wird nie automatisch gespeichert.",
-+	"files.autoSave.onFocusChange": "Eine geänderte Datei wird automatisch gespeichert, wenn der Editor den Fokus verliert.",
-+	"files.autoSave.onWindowChange": "Eine geänderte Datei wird automatisch gespeichert, wenn das Fenster den Fokus verliert.",
-+>>>>>>> .their
- 	"files.exclude.boolean": "Das Globmuster, mit dem Dateipfade verglichen werden sollen. Legen Sie diesen Wert auf \"true\" oder \"false\" fest, um das Muster zu aktivieren bzw. zu deaktivieren.",
- 	"files.exclude.when": "Zusätzliche Überprüfung der gleichgeordneten Elemente einer entsprechenden Datei. Verwenden Sie \"$(basename)\" als Variable für den entsprechenden Dateinamen.",
- 	"associations": "Konfigurieren Sie Dateizuordnungen zu Sprachen (beispielsweise \"*.extension\": \"html\"). Diese besitzen Vorrang vor den Standardzuordnungen der installierten Sprachen.",
-added in both
-  our    100644 18717d8b12c17be38474a9b29f98ab11bb3d33c9 i18n/deu/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/deu/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
-@@ -3,6 +3,7 @@
-  *  Licensed under the MIT License. See License.txt in the project root for license information.
-  *--------------------------------------------------------------------------------------------*/
- // Do not edit this file. It is machine generated.
-+<<<<<<< .our
- {
- 	"vscode.extension.contributes.snippets": "Trägt Codeausschnitte bei.",
- 	"vscode.extension.contributes.snippets-language": "Der Sprachbezeichner, für den dieser Codeausschnitt beigetragen wird.",
-@@ -11,4 +12,7 @@
- 	"invalid.path.0": "In \"contributes.{0}.path\" wurde eine Zeichenfolge erwartet. Bereitgestellter Wert: {1}",
- 	"invalid.path.1": "Es wurde erwartet, dass \"contributes.{0}.path\" ({1}) im Ordner ({2}) der Erweiterung enthalten ist. Dies führt ggf. dazu, dass die Erweiterung nicht portierbar ist.",
- 	"badVariableUse": "Das \"{0}\"-Snippet verwirrt wahrscheinlich Snippet-Variablen und Snippet-Paltzhalter. Schaue https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax für weitere Informationen."
--}
-\ No newline at end of file
-+}
-+=======
-+{}
-+>>>>>>> .their
-added in both
-  our    100644 0b1aa06f3842fd24888e1492a99cfa868ee5846e i18n/deu/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
-  their  100644 1fb6b0285076f57ddf70ae22b7c7e6d825c5a599 i18n/deu/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,4 +10,13 @@
- 	"snippet.suggestions.label": "Codeausschnitt einfügen",
- 	"sep.userSnippet": "Benutzercodeausschnitte",
- 	"sep.extSnippet": "Erweiterungscodeausschnitte"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"snippet.suggestions.label": "Codeausschnitt einfügen"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 da21c5deaa2fffc31211d74e9a379224211f67e5 i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 eefed0e4d58d81161889f00697ee64b3ab90a942 i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -16,5 +17,13 @@
- 	"badVariableUse": "Bei mindestens einem Ausschnitt von der Erweiterung \"{0}\" sind Ausschnittsvariablen und Ausschnittsplatzhalter vertauscht (weitere Informationen finden Sie unter https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax).",
- 	"badFile": "Die Ausschnittsdatei \"{0}\" konnte nicht gelesen werden.",
- 	"detail.snippet": "{0} ({1})",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"snippetSuggest.longLabel": "{0}, {1}"
- }
-\ No newline at end of file
-added in both
-  our    100644 f6f359f47ad00355482c06f5311dd39416137da0 i18n/deu/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
-  their  100644 55da29eee949ef87197f51bdc13551d27d9a29eb i18n/deu/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"tabCompletion": "Fügt Codeausschnitte ein, wenn ihr Präfix übereinstimmt. Funktioniert am besten, wenn \"quickSuggestions\" nicht aktiviert sind."
- }
-\ No newline at end of file
-added in both
-  our    100644 32b9b62035bd1682e803803a438bf61ea5ca8408 i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  their  100644 3139090e1843b36114461d964de63f8a1476fa3c i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -39,4 +40,47 @@
- 	"welcomePage.interfaceOverviewDescription": "Erhalten Sie eine visuelle Überlagerung, die die wichtigsten Komponenten der Benutzeroberfläche hervorhebt.",
- 	"welcomePage.interactivePlayground": "Interaktiver Playground",
- 	"welcomePage.interactivePlaygroundDescription": "Testen Sie die wichtigsten Editorfunktionen in einer kurzen exemplarischen Vorgehensweise."
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"welcomePage.atom": "Atom",
-+	"welcomePage.atomCurrent": "Atom (aktuell)",
-+	"welcomePage.cloneGitRepository": "Git-Repository klonen...",
-+	"welcomePage.colorTheme": "Farbdesign",
-+	"welcomePage.colorThemeDescription": "Passen Sie das Aussehen des Editors und Ihres Codes an Ihre Wünsche an.",
-+	"welcomePage.configureSettings": "Einstellungen konfigurieren",
-+	"welcomePage.configureSettingsDescription": "Optimieren Sie die Einstellungen, um VS Code bestmöglich zu nutzen.",
-+	"welcomePage.editingEvolved": "Fortschrittliche Bearbeitung",
-+	"welcomePage.gitHubRepository": "GitHub-Repository",
-+	"welcomePage.help": "Hilfe",
-+	"welcomePage.installKeymapDescription": "Tastenkombinationen installieren",
-+	"welcomePage.interactivePlayground": "Interaktiver Playground",
-+	"welcomePage.interactivePlaygroundDescription": "Testen Sie die wichtigsten Editorfunktionen in einer kurzen exemplarischen Vorgehensweise.",
-+	"welcomePage.interfaceOverview": "Überblick über die Schnittstelle",
-+	"welcomePage.interfaceOverviewDescription": "Erhalten Sie eine visuelle Überlagerung, die die wichtigsten Komponenten der Benutzeroberfläche hervorhebt.",
-+	"welcomePage.introductoryVideos": "Einführungsvideos",
-+	"welcomePage.keybindingsReference": "Referenz für Tastenkombinationen",
-+	"welcomePage.keybindingsReferenceDescription": "Eine druckbare PDF mit den wichtigsten Tastenkombinationen",
-+	"welcomePage.newFile": "Neue Datei",
-+	"welcomePage.noRecentFolders": "Keine kürzlich verwendeten Ordner",
-+	"welcomePage.openFolder": "Ordner öffnen...",
-+	"welcomePage.others": "Andere",
-+	"welcomePage.productDocumentation": "Produktdokumentation",
-+	"welcomePage.quickLinks": "Direktlinks",
-+	"welcomePage.recent": "Zuletzt verwendet",
-+	"welcomePage.showCommands": "Alle Befehle suchen und ausführen",
-+	"welcomePage.showCommandsDescription": "Über die Einstellungen ({0}) können Sie Befehle schnell suchen und darauf zugreifen.",
-+	"welcomePage.showOnStartup": "Willkommensseite beim Start anzeigen",
-+	"welcomePage.stackOverflow": "Stapelüberlauf",
-+	"welcomePage.start": "Starten",
-+	"welcomePage.sublime": "Sublime",
-+	"welcomePage.sublimeCurrent": "Sublime (aktuell)",
-+	"welcomePage.vim": "Vim",
-+	"welcomePage.vimCurrent": "Vim (aktuell)",
-+	"welcomePage.vscode": "Visual Studio-Code"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6fbc1952ab3bc8c78f62463b05ba60928704fc8a i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-  our    100644 35d2fc1d012f9e475869a6fc62ef95b886e25984 i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-  their  100644 710962d7c8b649e4e0c3c05d6127f882f0ff3307 i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,11 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"cancel": "Abbrechen",
-+	"ok": "OK",
-+	"welcome.title": "Willkommen",
-+>>>>>>> .their
- 	"welcomePage": "Willkommen",
- 	"welcomePage.javaScript": "JavaScript",
- 	"welcomePage.typeScript": "TypeScript",
-@@ -25,6 +31,7 @@
- 	"welcomePage.willReloadAfterInstallingKeymap": "Das Fenster wird nach der Installation der {0}-Tastaturbefehle neu geladen.",
- 	"welcomePage.installingKeymap": "Die {0}-Tastenkombinationen werden installiert...",
- 	"welcomePage.keymapNotFound": "Die {0} Tastenkombinationen mit der ID {1} wurden nicht gefunden.",
-+<<<<<<< .our
- 	"welcome.title": "Willkommen",
- 	"welcomePage.openFolderWithPath": "Ordner {0}  mit Pfad {1} öffnen",
- 	"welcomePage.extensionListSeparator": ",",
-@@ -36,4 +43,7 @@
- 	"details": "Details",
- 	"welcomePage.buttonBackground": "Hintergrundfarbe für die Schaltflächen auf der Willkommensseite.",
- 	"welcomePage.buttonHoverBackground": "Hoverhintergrundfarbe für die Schaltflächen auf der Willkommensseite."
-+=======
-+	"welcomePage.willReloadAfterInstallingKeymap": "Das Fenster wird nach der Installation der {0}-Tastaturbefehle neu geladen."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 bf6c56d9f239b2e5546cec1a9a6081786e83efb4 i18n/esn/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
-  our    100644 7b5e909f1c4c5f8cc5a9aa38504340e166c7784b i18n/esn/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
-  their  100644 19e11429a02e7ceaec371950d39ee64d833b1184 i18n/esn/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,6 +14,9 @@
- 	"rootPath": "ruta del archivo del área de trabajo (p. ej. /Users/Development/myWorkspace)",
- 	"folderName": "nombre de la carpeta del área de trabajo en la que el archivo está contenido (p. ej. myFolder)",
- 	"folderPath": "ruta de acceso de archivo de la carpeta del área de trabajo en la que el archivo está contenido (p. ej. /Users/Development/myFolder)",
-+=======
-+	"activeEditorShort": "p. ej. myFile.txt",
-+>>>>>>> .their
- 	"appName": "p. ej. VS Code",
- 	"dirty": "un indicador con modificaciones si el editor activo tiene modificaciones",
- 	"separator": "un separador condicional (\"-\") que aparece solo cuando está rodeado de variables con valores",
-changed in both
-  base   100644 b7ad252e0db05e9de38d3315b75a845e0eacbe42 i18n/esn/extensions/css/package.i18n.json
-  our    100644 8b817c2ddd4baf1446176685b552b49f6711e9ba i18n/esn/extensions/css/package.i18n.json
-  their  100644 98a57854bcc7a571ff659c6282fdb4d54262ef48 i18n/esn/extensions/css/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,66 @@
- 	],
- 	"displayName": "Básicos de CSS",
- 	"description": "Proporciona resaltado de sintaxis y correspondencia de corchetes en archivos CSS, LESS y SCSS."
-+=======
-+	"css.colorDecorators.enable.desc": "Habilita o deshabilita decoradores de color",
-+	"css.lint.argumentsInColorFunction.desc": "Número de parámetros no válido",
-+	"css.lint.boxModel.desc": "No use ancho o alto con el relleno o los bordes.",
-+	"css.lint.compatibleVendorPrefixes.desc": "Cuando use un prefijo específico del proveedor, compruebe que también haya incluido el resto de propiedades específicas del proveedor.",
-+	"css.lint.duplicateProperties.desc": "No use definiciones de estilo duplicadas",
-+	"css.lint.emptyRules.desc": "No use conjuntos de reglas vacíos",
-+	"css.lint.float.desc": "Le recomendamos no usar 'float'. Los floats producen CSS frágiles, fáciles de corromper si cambia cualquier aspecto del diseño.",
-+	"css.lint.fontFaceProperties.desc": "La regla @font-face debe definir las propiedades \"src\" y \"font-family\"",
-+	"css.lint.hexColorLength.desc": "Los colores hexadecimales deben estar formados por tres o seis números hexadecimales.",
-+	"css.lint.idSelector.desc": "Los selectores no deben contener identificadores porque estas reglas están estrechamente ligadas a HTML.",
-+	"css.lint.ieHack.desc": "Las modificaciones de IE solo son necesarias cuando admiten IE7 y anteriores",
-+	"css.lint.importStatement.desc": "Las instrucciones Import no se cargan en paralelo",
-+	"css.lint.important.desc": "Le recomendamos no usar !important. Esto indica que la especificidad de todo el CSS está fuera de control y que debe refactorizarse.",
-+	"css.lint.propertyIgnoredDueToDisplay.desc": "La propiedad se ignora a causa de la pantalla. Por ejemplo, con 'display: inline', el ancho, el alto, el margen superior e inferior y las propiedades de float no tienen efecto.",
-+	"css.lint.universalSelector.desc": "Se sabe que el selector universal (*) es lento",
-+	"css.lint.unknownProperties.desc": "Propiedad desconocida.",
-+	"css.lint.unknownVendorSpecificProperties.desc": "Propiedad específica del proveedor desconocida.",
-+	"css.lint.vendorPrefix.desc": "Cuando use un prefijo específico del proveedor, incluya también la propiedad estándar.",
-+	"css.lint.zeroUnits.desc": "No se necesita una unidad para cero",
-+	"css.validate.desc": "Habilita o deshabilita todas las validaciones",
-+	"less.colorDecorators.enable.desc": "Habilita o deshabilita decoradores de color",
-+	"less.lint.argumentsInColorFunction.desc": "Número de parámetros no válido",
-+	"less.lint.boxModel.desc": "No use ancho o alto con el relleno o los bordes.",
-+	"less.lint.compatibleVendorPrefixes.desc": "Cuando use un prefijo específico del proveedor, compruebe que también haya incluido el resto de propiedades específicas del proveedor.",
-+	"less.lint.duplicateProperties.desc": "No use definiciones de estilo duplicadas",
-+	"less.lint.emptyRules.desc": "No use conjuntos de reglas vacíos",
-+	"less.lint.float.desc": "Le recomendamos no usar 'float'. Los floats producen CSS frágiles, fáciles de corromper si cambia cualquier aspecto del diseño.",
-+	"less.lint.fontFaceProperties.desc": "La regla @font-face debe definir las propiedades \"src\" y \"font-family\"",
-+	"less.lint.hexColorLength.desc": "Los colores hexadecimales deben estar formados por tres o seis números hexadecimales.",
-+	"less.lint.idSelector.desc": "Los selectores no deben contener identificadores porque estas reglas están estrechamente ligadas a HTML.",
-+	"less.lint.ieHack.desc": "Las modificaciones de IE solo son necesarias cuando admiten IE7 y anteriores",
-+	"less.lint.importStatement.desc": "Las instrucciones Import no se cargan en paralelo",
-+	"less.lint.important.desc": "Le recomendamos no usar !important. Esto indica que la especificidad de todo el CSS está fuera de control y que debe refactorizarse.",
-+	"less.lint.propertyIgnoredDueToDisplay.desc": "La propiedad se ignora a causa de la pantalla. Por ejemplo, con 'display: inline', el ancho, el alto, el margen superior e inferior y las propiedades de float no tienen efecto.",
-+	"less.lint.universalSelector.desc": "Se sabe que el selector universal (*) es lento",
-+	"less.lint.unknownProperties.desc": "Propiedad desconocida.",
-+	"less.lint.unknownVendorSpecificProperties.desc": "Propiedad específica del proveedor desconocida.",
-+	"less.lint.vendorPrefix.desc": "Cuando use un prefijo específico del proveedor, incluya también la propiedad estándar.",
-+	"less.lint.zeroUnits.desc": "No se necesita una unidad para cero",
-+	"less.validate.desc": "Habilita o deshabilita todas las validaciones",
-+	"scss.colorDecorators.enable.desc": "Habilita o deshabilita decoradores de color",
-+	"scss.lint.argumentsInColorFunction.desc": "Número de parámetros no válido",
-+	"scss.lint.boxModel.desc": "No use ancho o alto con el relleno o los bordes.",
-+	"scss.lint.compatibleVendorPrefixes.desc": "Cuando use un prefijo específico del proveedor, compruebe que también haya incluido el resto de propiedades específicas del proveedor.",
-+	"scss.lint.duplicateProperties.desc": "No use definiciones de estilo duplicadas",
-+	"scss.lint.emptyRules.desc": "No use conjuntos de reglas vacíos",
-+	"scss.lint.float.desc": "Le recomendamos no usar 'float'. Los floats producen CSS frágiles, fáciles de corromper si cambia cualquier aspecto del diseño.",
-+	"scss.lint.fontFaceProperties.desc": "La regla @font-face debe definir las propiedades \"src\" y \"font-family\"",
-+	"scss.lint.hexColorLength.desc": "Los colores hexadecimales deben estar formados por tres o seis números hexadecimales.",
-+	"scss.lint.idSelector.desc": "Los selectores no deben contener identificadores porque estas reglas están estrechamente ligadas a HTML.",
-+	"scss.lint.ieHack.desc": "Las modificaciones de IE solo son necesarias cuando admiten IE7 y anteriores",
-+	"scss.lint.importStatement.desc": "Las instrucciones Import no se cargan en paralelo",
-+	"scss.lint.important.desc": "Le recomendamos no usar !important. Esto indica que la especificidad de todo el CSS está fuera de control y que debe refactorizarse.",
-+	"scss.lint.propertyIgnoredDueToDisplay.desc": "La propiedad se ignora a causa de la pantalla. Por ejemplo, con 'display: inline', el ancho, el alto, el margen superior e inferior y las propiedades de float no tienen efecto.",
-+	"scss.lint.universalSelector.desc": "Se sabe que el selector universal (*) es lento",
-+	"scss.lint.unknownProperties.desc": "Propiedad desconocida.",
-+	"scss.lint.unknownVendorSpecificProperties.desc": "Propiedad específica del proveedor desconocida.",
-+	"scss.lint.vendorPrefix.desc": "Cuando use un prefijo específico del proveedor, incluya también la propiedad estándar.",
-+	"scss.lint.zeroUnits.desc": "No se necesita una unidad para cero",
-+	"scss.validate.desc": "Habilita o deshabilita todas las validaciones"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 8a54a52011ad5685cf932508761e86d491659f6a i18n/esn/extensions/git/out/askpass-main.i18n.json
-  their  100644 1c3a1d90636cdbf4aa502197ee9ab23ce7087d18 i18n/esn/extensions/git/out/askpass-main.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"missOrInvalid": "Faltan las credenciales o no son válidas."
- }
-\ No newline at end of file
-changed in both
-  base   100644 c232e0b9e0b871b12dff4b2447c1ab1322f4bc27 i18n/esn/extensions/git/out/commands.i18n.json
-  our    100644 022bf20d57e92a28a5ced5a2d0998bc8b0dfe335 i18n/esn/extensions/git/out/commands.i18n.json
-  their  100644 3655227eb48a93470fbdf6095aa2db8e409397ba i18n/esn/extensions/git/out/commands.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -49,6 +50,18 @@
- 	"commit": "Confirmar de todas formas",
- 	"no staged changes": "No hay elementos almacenados provisionalmente.\n\n¿Desea almacenar de forma provisional todos sus cambios y confirmarlos directamente?",
- 	"always": "Siempre",
-+=======
-+	"branch name": "Nombre de rama",
-+	"clean": "Limpiar cambios",
-+	"clean repo": "Limpie el árbol de trabajo del repositorio antes de la desprotección.",
-+	"cloning": "Clonando el repositorio GIT...",
-+	"commit message": "Mensaje de confirmación",
-+	"confirm clean": "¿Seguro que quiere limpiar los cambios de \"{0}\"?",
-+	"confirm clean all": "¿Seguro que quiere limpiar todos los cambios?",
-+	"confirm revert": "¿Está seguro de que desea revertir los cambios seleccionados en {0}?",
-+	"disabled": "GIT está deshabilitado o no se admite en esta área de trabajo",
-+	"never again": "De acuerdo, no volver a mostrar este mensaje",
-+>>>>>>> .their
- 	"no changes": "No hay cambios para confirmar.",
- 	"commit message": "Mensaje de confirmación",
- 	"provide commit message": "Proporcione un mensaje de confirmación",
-@@ -73,6 +86,7 @@
- 	"nobranch": "Extraiga del repositorio una rama para insertar un remoto.",
- 	"confirm publish branch": "La rama ' {0} ' no tiene ninguna rama ascendente. ¿desea publicar esta rama?",
- 	"ok": "Aceptar",
-+<<<<<<< .our
- 	"push with tags success": "Insertado con etiquetas correctamente.",
- 	"pick remote": "Seleccionar un elemento remoto para publicar la rama '{0}':",
- 	"sync is unpredictable": "Esta acción insertará e incorporará cambios en y desde '{0}/{1}'.",
-@@ -88,4 +102,17 @@
- 	"git error details": "GIT: {0}",
- 	"git error": "Error de GIT",
- 	"open git log": "Abrir registro de GIT"
-+=======
-+	"open git log": "Abrir registro de GIT",
-+	"parent": "Directorio principal",
-+	"pick remote": "Seleccione un elemento remoto para publicar la rama \"{0}\" en:",
-+	"proposeopen": "¿Desea abrir el repositorio clonado?",
-+	"provide branch name": "Especifique un nombre para la rama",
-+	"provide commit message": "Proporcione un mensaje de confirmación",
-+	"remote branch at": "Rama remota en {0}",
-+	"repourl": "URL del repositorio",
-+	"revert": "Revertir cambios",
-+	"sync is unpredictable": "Esta acción insertará y extraerá confirmaciones en '{0}'.",
-+	"tag at": "Etiqueta en {0}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 bc89ad95d3858d14a259db4453f33061811850c4 i18n/esn/extensions/git/out/main.i18n.json
-  our    100644 43b001246df3969529c07d61e8f8b25b0e7ba906 i18n/esn/extensions/git/out/main.i18n.json
-  their  100644 e8f184f6370e94d01b5c9ffcd8f3d805d4444b55 i18n/esn/extensions/git/out/main.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,4 +14,8 @@
- 	"notfound": "Git no encontrado. Instálalo o configúralo usando la configuración 'git.path'.",
- 	"updateGit": "Actualizar GIT",
- 	"git20": "Parece que tiene instalado GIT {0}. El código funciona mejor con GIT >= 2"
-+=======
-+	"updateGit": "Actualizar GIT",
-+	"using git": "Usando GIT {0} desde {1}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ba54359d5f1d58a171a26e138653b5ad7baf8ef7 i18n/esn/extensions/git/package.i18n.json
-  our    100644 87a73cba8a7c7a490f6aba897a9a18d1a57dfc4c i18n/esn/extensions/git/package.i18n.json
-  their  100644 f1d0fed8f2e2d373f1c6073a006b90869a5cefa4 i18n/esn/extensions/git/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -26,12 +27,20 @@
- 	"command.unstageSelectedRanges": "Cancelar almacenamiento provisional de los intervalos seleccionados",
- 	"command.clean": "Descartar cambios",
- 	"command.cleanAll": "Descartar todos los cambios",
-+=======
-+	"command.branch": "Crear rama...",
-+	"command.checkout": "Desproteger en...",
-+	"command.clean": "Limpiar archivo",
-+	"command.cleanAll": "Limpiar todos los archivos",
-+	"command.clone": "Clonar",
-+>>>>>>> .their
- 	"command.commit": "Confirmar",
- 	"command.commitStaged": "Confirmar almacenados provisionalmente",
- 	"command.commitStagedSigned": "Confirmar por etapas (Aprobado)",
- 	"command.commitStagedAmend": "Confirmar almacenados provisionalmente (modificar)",
- 	"command.commitAll": "Confirmar todo",
- 	"command.commitAllSigned": "Confirmar todo (aprobado)",
-+<<<<<<< .our
- 	"command.commitAllAmend": "Confirmar todo (modificar)",
- 	"command.undoCommit": "Deshacer última confirmación",
- 	"command.checkout": "Desproteger en...",
-@@ -41,11 +50,20 @@
- 	"command.merge": "Fusionar rama...",
- 	"command.createTag": "Crear etiqueta",
- 	"command.fetch": "Buscar",
-+=======
-+	"command.commitStaged": "Confirmar almacenados provisionalmente",
-+	"command.commitStagedSigned": "Confirmar archivos almacenados provisionalmente (aprobados)",
-+	"command.init": "Inicializar el repositorio",
-+	"command.openChange": "Abrir cambio",
-+	"command.openFile": "Abrir archivo",
-+	"command.publish": "Publicar",
-+>>>>>>> .their
- 	"command.pull": "Incorporación de cambios",
- 	"command.pullRebase": "Incorporación de cambios (fusionar mediante cambio de base)",
- 	"command.pullFrom": "Extraer de...",
- 	"command.push": "Insertar",
- 	"command.pushTo": "Insertar en...",
-+<<<<<<< .our
- 	"command.pushWithTags": "Insertar con etiquetas",
- 	"command.sync": "Sincronizar",
- 	"command.syncRebase": "Sincronizar (Rebase)",
-@@ -60,6 +78,19 @@
- 	"config.path": "Ruta de acceso del ejecutable de GIT",
- 	"config.autoRepositoryDetection": "Si se deben detectar automáticamente los repositories ",
- 	"config.autorefresh": "Indica si la actualización automática está habilitada",
-+=======
-+	"command.refresh": "Actualizar",
-+	"command.revertSelectedRanges": "Revertir los intervalos seleccionados",
-+	"command.showOutput": "Mostrar salida de GIT",
-+	"command.stage": "Almacenar archivo provisionalmente",
-+	"command.stageAll": "Almacenar todos los archivos provisionalmente",
-+	"command.stageSelectedRanges": "Realizar copia intermedia de los intervalos seleccionados",
-+	"command.sync": "Sincronizar",
-+	"command.undoCommit": "Deshacer última confirmación",
-+	"command.unstage": "Cancelar almacenamiento provisional del archivo",
-+	"command.unstageAll": "Cancelar almacenamiento provisional de todos los archivos",
-+	"command.unstageSelectedRanges": "Cancelar almacenamiento provisional de los intervalos seleccionados",
-+>>>>>>> .their
- 	"config.autofetch": "Si la búsqueda automática está habilitada",
- 	"config.enableLongCommitWarning": "Si se debe advertir sobre los mensajes de confirmación largos",
- 	"config.confirmSync": "Confirmar antes de sincronizar repositorios GIT",
-added in both
-  our    100644 7579ba46bb36b8f3eaf007fec503faebab3481cb i18n/esn/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
-  their  100644 d095fa6eb337933e18378577e067f5a2df3bf372 i18n/esn/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"typescript.jsDocCompletionItem.documentation": "Comentario de JSDoc"
- }
-\ No newline at end of file
-changed in both
-  base   100644 73c59ecf78991f31f8a7e87c5989512dc5ec3bdc i18n/esn/extensions/typescript/out/utils/projectStatus.i18n.json
-  our    100644 6b1caf7be01d0a405add4f101ce7a4361fc83ab9 i18n/esn/extensions/typescript/out/utils/projectStatus.i18n.json
-  their  100644 3b3c008edd472eee1f19ef534183e531604edebc i18n/esn/extensions/typescript/out/utils/projectStatus.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,11 @@
- 	],
- 	"hintExclude": "Para habilitar las características de lenguaje de JavaScript/TypeScript en todo el proyecto, excluya las carpetas con muchos archivos, como: {0}",
- 	"hintExclude.generic": "Para habilitar las características de idioma de JavaScript/TypeScript IntelliSense en todo el proyecto, excluya las carpetas de tamaño grande con archivos de origen en los que no trabaje.",
-+=======
-+	"hintExclude": "Para habilitar las características de lenguaje de JavaScript/TypeScript en todo el proyecto, excluya las carpetas con muchos archivos, como: {0}",
-+	"hintExclude.generic": "Para habilitar las características de idioma de JavaScript/TypeScript IntelliSense en todo el proyecto, excluya las carpetas de tamaño grande con archivos de origen en los que no trabaje.",
-+	"hintExclude.tooltip": "Para habilitar las características de idioma de JavaScript/TypeScript IntelliSense en todo el proyecto, excluya las carpetas de tamaño grande con archivos de origen en los que no trabaje.",
-+>>>>>>> .their
- 	"large.label": "Configurar exclusiones",
- 	"hintExclude.tooltip": "Para habilitar las características de idioma de JavaScript/TypeScript IntelliSense en todo el proyecto, excluya las carpetas de tamaño grande con archivos de origen en los que no trabaje."
- }
-\ No newline at end of file
-changed in both
-  base   100644 6a7bf3775c4a6540aee77a9d5264439dc794365f i18n/esn/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 6ad3e3ebd5e87cf26a1b950237c8c58f3d92b674 i18n/esn/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 7da1034ee0114779fb9703b9bd965ac737457bab i18n/esn/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,16 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"acceptSuggestionOnCommitCharacter": "Controla si se deben aceptar sugerencias en los caracteres de confirmación. Por ejemplo, en Javascript, el punto y coma (\";\") puede ser un carácter de confirmación que acepta una sugerencia y escribe ese carácter.",
-+	"acceptSuggestionOnEnter": "Controla si las sugerencias deben aceptarse en \"Entrar\" (además de \"TAB\"). Ayuda a evitar la ambigüedad entre insertar nuevas líneas o aceptar sugerencias.",
-+	"autoClosingBrackets": "Controla si el editor debe cerrar automáticamente los corchetes después de abrirlos",
-+	"codeLens": "Controla si el editor muestra lentes de código",
-+	"cursorBlinking": "Controlar el estilo de animación del cursor. Los valores posibles son \"blink\", \"smooth\", \"phase\", \"expand\" y \"solid\".",
-+	"cursorStyle": "Controla el estilo del cursor. Los valores aceptados son \"block\", \"block-outline\", \"line\", \"line-thin\", \"underline\" y \"underline-thin\"",
-+	"detectIndentation": "Al abrir un archivo, se detectarán `editor.tabSize` y `editor.insertSpaces` en función del contenido del archivo.",
-+	"dragAndDrop": "Controla si el editor debe permitir mover selecciones mediante arrastrar y colocar.",
-+>>>>>>> .their
- 	"editorConfigurationTitle": "Editor",
- 	"fontFamily": "Controla la familia de fuentes.",
- 	"fontWeight": "Controla el grosor de la fuente.",
-@@ -23,6 +34,7 @@
- 	"tabSize.errorMessage": "Se esperaba \"number\". Tenga en cuenta que el ajuste \"editor.detectIndentation\" ha reemplazado al valor \"auto\".",
- 	"insertSpaces": "Insertar espacios al presionar TAB. Este valor se invalida en función del contenido del archivo cuando \"editor.detectIndentation\" está activado.",
- 	"insertSpaces.errorMessage": "Se esperaba \"boolean\". Tenga en cuenta que el ajuste \"editor.detectIndentation\" ha reemplazado al valor \"auto\".",
-+<<<<<<< .our
- 	"detectIndentation": "Al abrir un archivo, se detectarán `editor.tabSize` y `editor.insertSpaces` en función del contenido del archivo.",
- 	"roundedSelection": "Controla si las selecciones tienen esquinas redondeadas",
- 	"scrollBeyondLastLine": "Controla si el editor se seguirá desplazando después de la última línea",
-@@ -43,6 +55,14 @@
- 	"wordWrap": "Controla cómo se deben ajustar las líneas. Pueden ser:\n - \"off\" (deshabilitar ajuste),\n - \"on\" (ajuste de ventanilla),\n - \"wordWrapColumn\" (ajustar en \"editor.wordWrapColumn\") o\n - \"bounded\" (ajustar en la parte mínima de la ventanilla y \"editor.wordWrapColumn\").",
- 	"wordWrapColumn": "Controls the wrapping column of the editor when `editor.wordWrap` is 'wordWrapColumn' or 'bounded'.",
- 	"wrappingIndent": "Controla el sangrado de las líneas ajustadas. Puede ser uno de 'none', ' same ', ' indent' o ' deepIndent '.",
-+=======
-+	"lineHeight": "Controla la altura de línea. Utilice 0 para calcular el valor de lineHeight a partir de fontSize.",
-+	"lineNumbers": "Controla la presentación de los números de línea. Los valores posibles son \"on\", \"off\" y \"relative\". \"relative\" muestra el número de líneas desde la posición actual del cursor.",
-+	"matchBrackets": "Resaltar corchetes coincidentes cuando se seleccione uno de ellos.",
-+	"minimap.enabled": "Controla si se muestra el minimapa",
-+	"minimap.maxColumn": "Limitar el ancho del minimapa para presentar como mucho un número de columnas determinado",
-+	"minimap.renderCharacters": "Presentar los caracteres reales en una línea (por oposición a bloques de color)",
-+>>>>>>> .their
- 	"mouseWheelScrollSensitivity": "Se utilizará un multiplicador en los eventos de desplazamiento de la rueda del mouse `deltaX` y `deltaY`",
- 	"multiCursorModifier.ctrlCmd": "Se asigna a \"Control\" en Windows y Linux y a \"Comando\" en macOS.",
- 	"multiCursorModifier.alt": "Se asigna a \"Alt\" en Windows y Linux y a \"Opción\" en macOS.",
-@@ -112,7 +132,26 @@
- 	"codeActionsOnSaveTimeout": "Tiempo de espera para ejecutar acciones de código en guardar.",
- 	"selectionClipboard": "Controla si el portapapeles principal de Linux debe admitirse.",
- 	"sideBySide": "Controla si el editor de diferencias muestra las diferencias en paralelo o alineadas.",
-+<<<<<<< .our
- 	"ignoreTrimWhitespace": "Controla si el editor de diferencias muestra los cambios de espacio inicial o espacio final como diferencias.",
- 	"largeFileOptimizations": "Manejo especial para archivos grandes para desactivar ciertas funciones de memoria intensiva.",
- 	"renderIndicators": "Controla si el editor de diff muestra indicadores +/- para cambios agregados/quitados"
-+=======
-+	"snippetSuggestions": "Controla si se muestran los fragmentos de código con otras sugerencias y cómo se ordenan.",
-+	"stablePeek": "Mantiene abierto el editor interactivo incluso al hacer doble clic en su contenido o presionar Escape.",
-+	"suggestFontSize": "Tamaño de fuente para el widget de sugerencias",
-+	"suggestLineHeight": "Alto de línea para el widget de sugerencias",
-+	"suggestOnTriggerCharacters": "Controla si las sugerencias deben aparecer de forma automática al escribir caracteres desencadenadores",
-+	"tabSize": "El número de espacios a los que equivale una tabulación. Este valor se invalida según el contenido del archivo cuando `editor.detectIndentation` está activado.",
-+	"tabSize.errorMessage": "Se esperaba \"number\". Tenga en cuenta que el ajuste \"editor.detectIndentation\" ha reemplazado al valor \"auto\".",
-+	"trimAutoWhitespace": "Quitar espacio en blanco final autoinsertado",
-+	"useTabStops": "La inserción y eliminación del espacio en blanco sigue a las tabulaciones.",
-+	"wordBasedSuggestions": "Habilita sugerencias basadas en palabras.",
-+	"wordSeparators": "Caracteres que se usarán como separadores de palabras al realizar operaciones o navegaciones relacionadas con palabras.",
-+	"wordWrap": "Controla cómo se deben ajustar las líneas. Pueden ser:\n - \"off\" (deshabilitar ajuste),\n - \"on\" (ajuste de ventanilla),\n - \"wordWrapColumn\" (ajustar en \"editor.wordWrapColumn\") o\n - 'bounded' (ajustar en la parte mínima de la ventanilla y \"editor.wordWrapColumn\").",
-+	"wordWrap.off": "Las líneas no se ajustarán nunca.",
-+	"wordWrap.on": "Las líneas se ajustarán en el ancho de la ventanilla.",
-+	"wordWrap.wordWrapColumn": "Las líneas se ajustarán en \"editor.wordWrapColumn\".",
-+	"wrappingIndent": "Controla el sangrado de las líneas ajustadas. Puede ser uno los valores 'none', 'same' o 'indent'."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 42248309e5c7a0c85be0f4cda64af8670bb6873a i18n/esn/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
-  our    100644 da10467643cd360e61b1194f56619c49eb9a747d i18n/esn/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
-  their  100644 6d344bec8eeaf2f4a3e62c3a2dd122a4786d9533 i18n/esn/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
-@@ -20,5 +20,13 @@
- 	"meta.typeDefinitions.title": " – {0} definiciones de tipo",
- 	"actions.goToTypeDefinition.label": "Ir a la definición de tipo",
- 	"actions.peekTypeDefinition.label": "Inspeccionar definición de tipo",
-+<<<<<<< .our
- 	"multipleResults": "Haga clic para mostrar {0} definiciones."
-+=======
-+	"actions.previewDecl.label": "Ver la definición",
-+	"generic.noResults": "No se encontró ninguna definición",
-+	"meta.title": " – {0} definiciones",
-+	"multipleResults": "Haga clic para mostrar {0} definiciones.",
-+	"noResultWord": "No se encontró ninguna definición para \"{0}\""
-+>>>>>>> .their
- }
-\ No newline at end of file
-removed in local
-  base   100644 87286a5e3cdb44d00150bb1573b18b0a6c46f866 i18n/esn/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
-  their  100644 eb8ef5b2cafdf28213df7a946ae3dfa254b5fd33 i18n/esn/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/esn/src/vs/workbench/electron-browser/commands.i18n.json
-  our    100644 983899514ca518324d9e85f57712db39d3040bbe i18n/esn/src/vs/workbench/electron-browser/commands.i18n.json
-  their  100644 3a1051dcfdad7ec7db70524f0a31f277885230df i18n/esn/src/vs/workbench/electron-browser/commands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"diffLeftRightLabel": "{0} ⟷ {1}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 09ab9f531929d57424645f1568f9a99265e4bae9 i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 57d447a0a0b664b859bc321a1781f6980e63b0fd i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 08905d9318aee9e7826fad4cebded59c2a1d0d4d i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -34,6 +34,7 @@
- 	"sideBarLocation": "Controla la ubicación de la barra lateral. Puede mostrarse a la izquierda o a la derecha del área de trabajo.",
- 	"panelDefaultLocation": "Controla la ubicación predeterminada del panel. Puede mostrarse en la parte inferior o a la derecha de la mesa de banco.",
- 	"statusBarVisibility": "Controla la visibilidad de la barra de estado en la parte inferior del área de trabajo.",
-+<<<<<<< .our
- 	"activityBarVisibility": "Controla la visibilidad de la barra de actividades en el área de trabajo.",
- 	"viewVisibility": "Controla la visibilidad de las acciones en el encabezado de la vista. Las acciones en el encabezado de la vista pueden ser siempre visibles, o solo cuando la vista es enfocada o apuntada.",
- 	"fontAliasing": "Controla el método de suavizado de fuentes en la mesa de trabajo.\n-por defecto: subpíxel suavizado de fuentes. En la mayoría las pantallas retina no dará el texto más agudo - alisado: suavizar la fuente a nivel del píxel, a diferencia de los subpíxeles. Puede hacer que la fuente aparezca más general - ninguno: desactiva el suavizado de fuentes. Texto se mostrará con dentados filos - auto: se aplica el 'default' o 'antialiasing' automáticamente en función de la DPI de la muestra.",
-@@ -42,6 +43,28 @@
- 	"workbench.fontAliasing.none": "Deshabilita el suavizado de fuentes. El texto se muestra con bordes nítidos irregulares.",
- 	"workbench.fontAliasing.auto": "Aplica ' default ' o ' antialiased ' automáticamente basándose en la DPI de las pantallas.",
- 	"enableNaturalLanguageSettingsSearch": "Controla si habilita el modo de búsqueda de lenguaje natural para la configuración.",
-+=======
-+	"title": "Controla el título de la ventana según el editor activo. Las variables se sustituyen según el contexto:\n${activeEditorShort}: por ejemplo, myFile.txt\n${activeEditorMedium}: por ejemplo, myFolder/myFile.txt\n${activeEditorLong}: por ejemplo, /Users/Development/myProject/myFolder/myFile.txt\n${rootName}: por ejemplo, myProject\n${rootPath}: por ejemplo, /Users/Development/myProject\n${appName}: por ejemplo, VS Code\n${dirty}: un indicador con modificaciones si el editor activo está desfasado\n${separator}: un separador condicional (\" - \") que solo se muestra cuando está rodeado por variables con valores",
-+	"titleBarStyle": "Ajuste la apariencia de la barra de título de la ventana. Se debe realizar un reinicio completo para aplicar los cambios.",
-+	"view": "Ver",
-+	"window.menuBarVisibility.default": "El menú solo está oculto en modo de pantalla completa.",
-+	"window.menuBarVisibility.hidden": "El menú está siempre oculto.",
-+	"window.menuBarVisibility.toggle": "El menú está oculto pero se puede mostrar mediante la tecla Alt.",
-+	"window.menuBarVisibility.visible": "El menú está siempre visible incluso en modo de pantalla completa.",
-+	"window.newWindowDimensions.default": "Abrir las nuevas ventanas en el centro de la pantalla.",
-+	"window.newWindowDimensions.fullscreen": "Abrir las nuevas ventanas en modo de pantalla completa.",
-+	"window.newWindowDimensions.inherit": "Abrir las nuevas ventanas con la misma dimensión que la última activa.",
-+	"window.newWindowDimensions.maximized": "Abrir las nuevas ventanas maximizadas.",
-+	"window.openFilesInNewWindow.default": "Los archivos se abrirán en la ventana con la carpeta de los archivos abierta o en la última ventana activa a menos que se abran mediante el Dock o el Finder (solo macOS)",
-+	"window.openFilesInNewWindow.off": "Los archivos se abrirán en la ventana con la carpeta de archivos abierta o en la última ventana activa",
-+	"window.openFilesInNewWindow.on": "Los archivos se abrirán en una nueva ventana",
-+	"window.openFoldersInNewWindow.default": "Las carpetas se abrirán en una nueva ventana a menos que se seleccione una carpeta desde la aplicación (p. ej. mediante el menú Archivo)",
-+	"window.openFoldersInNewWindow.off": "Las carpetas reemplazarán la ventana activa más reciente",
-+	"window.openFoldersInNewWindow.on": "Las carpetas se abrirán en una nueva ventana",
-+	"window.reopenFolders.all": "Volver a abrir todas las carpetas de la sesión más reciente.",
-+	"window.reopenFolders.none": "No volver a abrir nunca una carpeta.",
-+	"window.reopenFolders.one": "Volver a abrir la carpeta activa más reciente.",
-+>>>>>>> .their
- 	"windowConfigurationTitle": "Ventana",
- 	"window.openFilesInNewWindow.on": "Los archivos se abrirán en una nueva ventana",
- 	"window.openFilesInNewWindow.off": "Los archivos se abrirán en la ventana con la carpeta de archivos abierta o en la última ventana activa",
-added in both
-  our    100644 a679d3a2e8384de8f1814797ad1a91adbc3760f4 i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
-  their  100644 2497ccbedc2a637c6c53399dc982b17384cd91ff i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,6 +9,16 @@
- 	],
- 	"wordWrapMigration.ok": "Aceptar",
- 	"wordWrapMigration.dontShowAgain": "No volver a mostrar",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"wordWrapMigration.dontShowAgain": "No volver a mostrar",
-+	"wordWrapMigration.ok": "Aceptar",
-+>>>>>>> .their
- 	"wordWrapMigration.openSettings": "Abrir configuración",
- 	"wordWrapMigration.prompt": "El valor de configuración \"editor.wrappingColumn\" se ha dejado de usar en favor de \"editor.wordWrap\"."
- }
-\ No newline at end of file
-changed in both
-  base   100644 a6c9ef17484592148f710b1167198a21e14e3482 i18n/esn/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-  our    100644 101c6add1430ec2f9df78a28aa3f82645b37ab89 i18n/esn/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-  their  100644 d7c74389d2329d1750721558b7de694d92fc15e7 i18n/esn/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-@@ -41,7 +41,34 @@
- 	"debugConsoleAction": "Consola de depuración",
- 	"unreadOutput": "Nueva salida en la consola de depuración",
- 	"debugFocusConsole": "Enfocar consola de depuración",
-+<<<<<<< .our
- 	"focusSession": "Sesión de foco",
-+=======
-+	"disableAllBreakpoints": "Deshabilitar todos los puntos de interrupción",
-+	"disableBreakpoint": "Deshabilitar punto de interrupción",
-+	"disconnectDebug": "Desconectar",
-+	"editConditionalBreakpoint": "Editar punto de interrupción...",
-+	"enableAllBreakpoints": "Habilitar todos los puntos de interrupción",
-+	"enableBreakpoint": "Habilitar punto de interrupción",
-+	"focusProcess": "Proceso Foco",
-+	"launchJsonNeedsConfigurtion": "Configurar o reparar 'launch.json'",
-+	"openLaunchJson": "Abrir {0}",
-+	"pauseDebug": "Pausar",
-+	"reapplyAllBreakpoints": "Volver a aplicar todos los puntos de interrupción",
-+	"reconnectDebug": "Volver a conectar",
-+	"removeAllBreakpoints": "Quitar todos los puntos de interrupción",
-+	"removeAllWatchExpressions": "Quitar todas las expresiones",
-+	"removeBreakpoint": "Quitar punto de interrupción",
-+	"removeWatchExpression": "Quitar expresión",
-+	"renameFunctionBreakpoint": "Cambiar nombre de punto de interrupción de función",
-+	"restartDebug": "Reiniciar",
-+	"restartFrame": "Reiniciar marco",
-+	"reverseContinue": "Invertir",
-+	"selectAndStartDebugging": "Seleccionar e iniciar la depuración",
-+	"setValue": "Establecer valor",
-+	"startDebug": "Iniciar depuración",
-+	"startWithoutDebugging": "Iniciar sin depurar",
-+>>>>>>> .their
- 	"stepBackDebug": "Retroceder",
- 	"reverseContinue": "Invertir"
- }
-\ No newline at end of file
-added in both
-  our    100644 22f564913b12ba0d384368e90c425f684e3fa6ce i18n/esn/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
-  their  100644 b64e95b377875e9d31b611f1bc37cc7b78a95e6e i18n/esn/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -12,4 +13,15 @@
- 	"addConfiguration": "Agregar configuración...",
- 	"noConfigurationsMatching": "No hay ninguna configuración de depuración coincidente",
- 	"noConfigurationsFound": "No se encontró ninguna configuración de inicio. Cree un archivo \"launch.json\"."
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"debugAriaLabel": "Escriba un nombre de una configuración de inicio para ejecutar.",
-+	"noConfigurationsFound": "No se encontró ninguna configuración de inicio. Cree un archivo \"launch.json\".",
-+	"noConfigurationsMatching": "No hay ninguna configuración de depuración coincidente"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 59dee8db3e71b6f9e1adcca866cebb40516820f8 i18n/esn/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
-  their  100644 a0a8c10a0780ff8ee0b241f9055a86130375b395 i18n/esn/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,4 +11,13 @@
- 	"debugExceptionWidgetBackground": "Color de fondo del widget de excepciones.",
- 	"exceptionThrownWithId": "Se produjo una excepción: {0}",
- 	"exceptionThrown": "Se produjo una excepción."
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"exceptionThrown": "Se produjo una excepción"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 4d64960ccff00a36f174a1f2aab6ec211f1a4d84 i18n/esn/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  our    100644 876a90b705cdc75dc8baec9a2e11041916a82d83 i18n/esn/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  their  100644 6e74943ed2515d37458507c146ac09083ea224bf i18n/esn/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-changed in both
-  base   100644 e63c1324156dad49a03d5f58482b2c4b706b7aa8 i18n/esn/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  our    100644 3055932755fc85e2cfe5115465d1c1970923bac0 i18n/esn/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  their  100644 795336f65a8800ced0dcb9cf48fa8ac59fb709c6 i18n/esn/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-@@ -8,6 +8,20 @@
- 	],
- 	"debugAdapterBinNotFound": "El ejecutable del adaptador de depuración \"{0}\" no existe.",
- 	"debugAdapterCannotDetermineExecutable": "No se puede determinar el ejecutable para el adaptador de depuración \"{0}\".",
-+<<<<<<< .our
- 	"unableToLaunchDebugAdapter": "No se puede iniciar el adaptador de depuración desde '{0}'.",
- 	"unableToLaunchDebugAdapterNoArgs": "No se puede iniciar el adaptador de depuración."
-+=======
-+	"debugLinuxConfiguration": "Atributos de configuración de inicio específicos de Linux.",
-+	"debugName": "Nombre de la configuración. Aparece en el menú desplegable de la configuración de inicio.",
-+	"debugOSXConfiguration": "Atributos de configuración de inicio específicos de OS X.",
-+	"debugPrelaunchTask": "Tarea que se va a ejecutar antes de iniciarse la sesión de depuración.",
-+	"debugRequest": "Tipo de solicitud de la configuración. Puede ser \"launch\" o \"attach\".",
-+	"debugServer": "Solo para el desarrollo de extensiones de depuración: si se especifica un puerto, VS Code intenta conectarse a un adaptador de depuración que se ejecuta en modo servidor",
-+	"debugType": "Tipo de configuración.",
-+	"debugWindowsConfiguration": "Atributos de configuración de inicio específicos de Windows.",
-+	"deprecatedVariables": "\"env.\", \"config.\" y \"command.\" están en desuso, utilice en su lugar \"env:\", \"config:\" y \"command:\".",
-+	"internalConsoleOptions": "Controla el comportamiento de la consola de depuración interna.",
-+	"node2NotSupported": "\"node2\" ya no se admite; use \"node\" en su lugar y establezca el atributo \"protocol\" en \"inspector\"."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 edc323c9c4ad6eaf380b462e6abbbdcf75dfefc7 i18n/esn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 6b7926d2bf7039c9fedbd3b89b2c9e98ee891b0d i18n/esn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 b4a153aed7151372bdcc8147e8f09e8fd2cf2402 i18n/esn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-@@ -4,6 +4,7 @@
-  *--------------------------------------------------------------------------------------------*/
- // Do not edit this file. It is machine generated.
- {
-+<<<<<<< .our
- 	"showExplorerViewlet": "Mostrar explorador",
- 	"explore": "Explorador",
- 	"view": "Ver",
-@@ -11,6 +12,25 @@
- 	"binaryFileEditor": "Editor de archivos binarios",
- 	"filesConfigurationTitle": "Archivos",
- 	"exclude": "Configurar los patrones globales para excluir archivos y carpetas. Por ejemplo, el explorador de archivos decide que archivos y carpetas mostrar u ocultar según esta configuración.",
-+=======
-+	"associations": "Configure asociaciones de archivo para los lenguajes (por ejemplo, \"*.extension\": \"html\"). Estas asociaciones tienen prioridad sobre las asociaciones predeterminadas de los lenguajes instalados.",
-+	"autoReveal": "Controla si el explorador debe mostrar y seleccionar automáticamente los archivos al abrirlos.",
-+	"autoSave": "Controla el guardado automático de los archivos modificados. Valores aceptados: \"{0}\", \"{1}\", \"{2}\" (el editor pierde el foco), \"{3}\" (la ventana pierde el foco) . Si se establece en \"{4}\", puede configurar el retraso en \"files.autoSaveDelay\".",
-+	"autoSaveDelay": "Controla el retraso en MS tras el cual un archivo con modificaciones se guarda automáticamente. Solo se aplica si \"files.autoSave\" está establecido en \"{0}\"",
-+	"binaryFileEditor": "Editor de archivos binarios",
-+	"dynamicHeight": "Controla si la altura de la sección de editores abiertos debería adaptarse o no de forma dinámica al número de elementos.",
-+	"editorConfigurationTitle": "Editor",
-+	"enableDragAndDrop": "Controla si el explorador debe permitir mover archivos y carpetas mediante la función arrastrar y colocar.",
-+	"encoding": "La codificación del juego de caracteres predeterminada que debe utilizarse al leer y escribir archivos.",
-+	"eol": "Carácter predeterminado de final de línea.",
-+	"exclude": "Configurar patrones globales para excluir archivos y carpetas.",
-+	"explore": "Explorador",
-+	"explorerConfigurationTitle": "Explorador de archivos",
-+	"files.autoSave.afterDelay": "Un archivo con modificaciones se guarda automáticamente tras la propiedad \"files.autoSaveDelay\" configurada.",
-+	"files.autoSave.off": "\"off\": un archivo con modificaciones no se guarda nunca automáticamente.",
-+	"files.autoSave.onFocusChange": "Un archivo con modificaciones se guarda automáticamente cuando el editor deja de fijarse en él.",
-+	"files.autoSave.onWindowChange": "Un archivo con modificaciones se guarda automáticamente cuando la ventana deja de fijarse en él.",
-+>>>>>>> .their
- 	"files.exclude.boolean": "El patrón global con el que se harán coincidir las rutas de acceso de los archivos. Establézcalo en true o false para habilitarlo o deshabilitarlo.",
- 	"files.exclude.when": "Comprobación adicional de los elementos del mismo nivel de un archivo coincidente. Use $(nombreBase) como variable para el nombre de archivo que coincide.",
- 	"associations": "Configure asociaciones de archivo para los lenguajes (por ejemplo, \"*.extension\": \"html\"). Estas asociaciones tienen prioridad sobre las asociaciones predeterminadas de los lenguajes instalados.",
-added in both
-  our    100644 08084e884982f3d7eef03d55be365cf557fb3e91 i18n/esn/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/esn/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
-@@ -3,6 +3,7 @@
-  *  Licensed under the MIT License. See License.txt in the project root for license information.
-  *--------------------------------------------------------------------------------------------*/
- // Do not edit this file. It is machine generated.
-+<<<<<<< .our
- {
- 	"vscode.extension.contributes.snippets": "Aporta fragmentos de código.",
- 	"vscode.extension.contributes.snippets-language": "Identificador del lenguaje al que se aporta este fragmento de código.",
-@@ -11,4 +12,7 @@
- 	"invalid.path.0": "Se esperaba una cadena en \"contributes.{0}.path\". Valor proporcionado: {1}",
- 	"invalid.path.1": "Se esperaba que \"contributes.{0}.path\" ({1}) se incluyera en la carpeta de la extensión ({2}). Esto puede hacer que la extensión no sea portátil.",
- 	"badVariableUse": "Es muy probable que el fragmento de código \"{0}\" confunda las variables de fragmento de código y los marcadores de posición de fragmento de código. Consulte https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax para más informacion."
--}
-\ No newline at end of file
-+}
-+=======
-+{}
-+>>>>>>> .their
-added in both
-  our    100644 2a1dbd9b60e639005fcd38e656cafae607dc3269 i18n/esn/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
-  their  100644 ef56f7f84bd493d6822383b2ba07386a9f01bcca i18n/esn/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,4 +10,13 @@
- 	"snippet.suggestions.label": "Insertar fragmento de código",
- 	"sep.userSnippet": "Fragmentos de código de usuario",
- 	"sep.extSnippet": "Fragmentos de código de extensión"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"snippet.suggestions.label": "Insertar fragmento de código"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 336485742eb7e33ce1559e1ea1a94d2bd2070216 i18n/esn/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 eefed0e4d58d81161889f00697ee64b3ab90a942 i18n/esn/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -16,5 +17,13 @@
- 	"badVariableUse": "Uno o más fragmentos de la extensión '{0}' muy probable confunden variables de fragmento y fragmento-marcadores de posición (véase https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax para más detalles)",
- 	"badFile": "No se pudo leer el archivo del fragmento \"{0}\".",
- 	"detail.snippet": "{0} ({1})",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"snippetSuggest.longLabel": "{0}, {1}"
- }
-\ No newline at end of file
-added in both
-  our    100644 bd730e8a79605bd56e863456cd982cdad1fa20b8 i18n/esn/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
-  their  100644 98d6e882b756d4433d26ac3cc97d8b484f9e2189 i18n/esn/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"tabCompletion": "Inserta fragmentos de código cuando el prefijo coincide. Funciona mejor si la opción 'quickSuggestions' no está habilitada."
- }
-\ No newline at end of file
-added in both
-  our    100644 6b8a32ca0b9fbfb7b96cd4e7f9890b9f8d3db2d1 i18n/esn/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  their  100644 615870fefe5e1b395297103924d1fbe8a4bdaaca i18n/esn/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -39,4 +40,47 @@
- 	"welcomePage.interfaceOverviewDescription": "Obtenga una superposición que resalta los componentes principales de la interfaz de usuario",
- 	"welcomePage.interactivePlayground": "Área de juegos interactiva",
- 	"welcomePage.interactivePlaygroundDescription": "Pruebe las características esenciales del editor en un tutorial corto"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"welcomePage.atom": "Atom",
-+	"welcomePage.atomCurrent": "Atom (actual)",
-+	"welcomePage.cloneGitRepository": "Clonar el repositorio GIT...",
-+	"welcomePage.colorTheme": "Tema de color",
-+	"welcomePage.colorThemeDescription": "Modifique a su gusto la apariencia del editor y el código",
-+	"welcomePage.configureSettings": "Definir la configuración",
-+	"welcomePage.configureSettingsDescription": "Revele el poder total de VS Code cambiando la configuración",
-+	"welcomePage.editingEvolved": "Edición mejorada",
-+	"welcomePage.gitHubRepository": "Repositorio de GitHub",
-+	"welcomePage.help": "Ayuda",
-+	"welcomePage.installKeymapDescription": "Instalar los métodos abreviados de teclado",
-+	"welcomePage.interactivePlayground": "Área de juegos interactiva",
-+	"welcomePage.interactivePlaygroundDescription": "Pruebe las características esenciales del editor en un tutorial corto",
-+	"welcomePage.interfaceOverview": "Introducción a la interfaz",
-+	"welcomePage.interfaceOverviewDescription": "Obtenga una superposición que resalta los componentes principales de la interfaz de usuario",
-+	"welcomePage.introductoryVideos": "Vídeos de introducción",
-+	"welcomePage.keybindingsReference": "Referencia de métodos abreviados de teclado",
-+	"welcomePage.keybindingsReferenceDescription": "Un PDF imprimible con los métodos abreviados de teclado más comunes",
-+	"welcomePage.newFile": "Nuevo archivo",
-+	"welcomePage.noRecentFolders": "No hay ninguna carpeta reciente",
-+	"welcomePage.openFolder": "Abrir carpeta...",
-+	"welcomePage.others": "otros",
-+	"welcomePage.productDocumentation": "Documentación del producto",
-+	"welcomePage.quickLinks": "Vínculos rápidos",
-+	"welcomePage.recent": "Reciente",
-+	"welcomePage.showCommands": "Buscar y ejecutar todos los comandos",
-+	"welcomePage.showCommandsDescription": "Acceda rápidamente y busque comandos desde el panel de control ({0})",
-+	"welcomePage.showOnStartup": "Mostrar página principal al inicio",
-+	"welcomePage.stackOverflow": "Desbordamiento de la pila",
-+	"welcomePage.start": "3Iniciar",
-+	"welcomePage.sublime": "Sublime",
-+	"welcomePage.sublimeCurrent": "Sublime (actual)",
-+	"welcomePage.vim": "Vim",
-+	"welcomePage.vimCurrent": "Vim (actual)",
-+	"welcomePage.vscode": "Visual Studio Code"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f0736edf5eae0261f3cd498280b8e93c0ad8256f i18n/esn/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-  our    100644 cafbdb24ad7d28494af288481fb40eeac9df1106 i18n/esn/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-  their  100644 13de56fa050e8f8fd93dedc4a1facd4916a8e4ad i18n/esn/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,11 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"cancel": "Cancelar",
-+	"ok": "Aceptar",
-+	"welcome.title": "Bienvenido",
-+>>>>>>> .their
- 	"welcomePage": "Bienvenido",
- 	"welcomePage.javaScript": "JavaScript",
- 	"welcomePage.typeScript": "TypeScript",
-@@ -25,6 +31,7 @@
- 	"welcomePage.willReloadAfterInstallingKeymap": "La ventana se volverá a cargar después de instalar los métodos abreviados de teclado {0}.",
- 	"welcomePage.installingKeymap": "Instalando los métodos abreviados de teclado de {0}...",
- 	"welcomePage.keymapNotFound": "No se pudieron encontrar los métodos abreviados de teclado {0} con el identificador {1}.",
-+<<<<<<< .our
- 	"welcome.title": "Bienvenido",
- 	"welcomePage.openFolderWithPath": "Abrir la carpeta {0} con la ruta de acceso {1}",
- 	"welcomePage.extensionListSeparator": ", ",
-@@ -36,4 +43,7 @@
- 	"details": "Detalles",
- 	"welcomePage.buttonBackground": "Color de fondo de los botones en la página principal.",
- 	"welcomePage.buttonHoverBackground": "Color de fondo al mantener el mouse en los botones de la página principal."
-+=======
-+	"welcomePage.willReloadAfterInstallingKeymap": "La ventana se volverá a cargar después de instalar los métodos abreviados de teclado {0}."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 385789234f8648736a2d344ff244108d7e4f1f1b i18n/fra/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
-  our    100644 5d2e240f3afa2c6bcbb857fbc6e3d2a307c7b2f7 i18n/fra/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
-  their  100644 fd6dfb453076c8a900eb3c07bcd6788c927f3562 i18n/fra/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,6 +14,11 @@
- 	"rootPath": "chemin d’accès de l’espace de travail (ex: /Users/Development/myWorkspace)",
- 	"folderName": "nom du dossier de l'espace de travail auquel le fichier appartient (ex: monDossier)",
- 	"folderPath": "chemin d’accès du dossier de l'espace de travail auquel le fichier appartient (ex: /Users/Development/myFolder)",
-+=======
-+	"activeEditorLong": "exemple : /Users/Development/myProject/myFolder/myFile.txt",
-+	"activeEditorMedium": "exemple : myFolder/myFile.txt",
-+	"activeEditorShort": "exemple : myFile.txt",
-+>>>>>>> .their
- 	"appName": "exemple : VS Code",
- 	"dirty": "indicateur d'intégrité si l'intégrité de l'éditeur actif est compromise",
- 	"separator": "séparateur conditionnel (' - ') qui s'affiche uniquement quand il est entouré de variables avec des valeurs",
-changed in both
-  base   100644 165d51126159aa34c190a03e1d494e6ad055d8c3 i18n/fra/extensions/css/package.i18n.json
-  our    100644 f80d3cb8bfc3b84dafb557eea5e52f174b639db6 i18n/fra/extensions/css/package.i18n.json
-  their  100644 c4786a573bc7fe22c1adb9df4e01a2317315351b i18n/fra/extensions/css/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,66 @@
- 	],
- 	"displayName": "Bases du langage CSS",
- 	"description": "Fournit la coloration syntaxique et la correspondance des parenthèses dans les fichiers CSS, LESS et SCSS."
-+=======
-+	"css.colorDecorators.enable.desc": "Active ou désactive les éléments décoratifs de couleurs",
-+	"css.lint.argumentsInColorFunction.desc": "Nombre de paramètres non valide",
-+	"css.lint.boxModel.desc": "Ne pas utiliser la largeur ou la hauteur avec une marge intérieure ou une bordure",
-+	"css.lint.compatibleVendorPrefixes.desc": "Lors de l'utilisation d'un préfixe spécifique à un fabricant, toujours inclure également toutes les propriétés spécifiques au fabricant",
-+	"css.lint.duplicateProperties.desc": "Ne pas utiliser de définitions de style en double",
-+	"css.lint.emptyRules.desc": "Ne pas utiliser d'ensembles de règles vides",
-+	"css.lint.float.desc": "N'utilisez pas 'float'. Les éléments Float peuvent fragiliser le code CSS qui est ainsi plus vulnérable si un aspect de la disposition change.",
-+	"css.lint.fontFaceProperties.desc": "la règle @font-face doit définir les propriétés 'src' et 'font-family'",
-+	"css.lint.hexColorLength.desc": "Les couleurs Hex doivent contenir trois ou six chiffres hex",
-+	"css.lint.idSelector.desc": "Les sélecteurs ne doivent pas contenir d'ID, car ces règles sont trop fortement couplées au code HTML.",
-+	"css.lint.ieHack.desc": "Les hacks IE ne sont nécessaires que si IE7 et versions antérieures sont pris en charge",
-+	"css.lint.importStatement.desc": "Les instructions d'importation ne sont pas chargées en parallèle",
-+	"css.lint.important.desc": "N'utilisez pas !important. Cela indique que la spécificité de l'intégralité du code CSS est incorrecte et qu'il doit être refactorisé.",
-+	"css.lint.propertyIgnoredDueToDisplay.desc": "Propriété ignorée en raison de l'affichage. Par exemple, avec 'display: inline', les propriétés width, height, margin-top, margin-bottom et float sont sans effet",
-+	"css.lint.universalSelector.desc": "Le sélecteur universel (*) est connu pour sa lenteur",
-+	"css.lint.unknownProperties.desc": "Propriété inconnue.",
-+	"css.lint.unknownVendorSpecificProperties.desc": "Propriété spécifique à un fournisseur inconnue.",
-+	"css.lint.vendorPrefix.desc": "Lors de l'utilisation d'un préfixe spécifique à un fournisseur, ajouter également la propriété standard",
-+	"css.lint.zeroUnits.desc": "Aucune unité nécessaire pour zéro",
-+	"css.validate.desc": "Active ou désactive toutes les validations",
-+	"less.colorDecorators.enable.desc": "Active ou désactive les éléments décoratifs de couleurs",
-+	"less.lint.argumentsInColorFunction.desc": "Nombre de paramètres non valide",
-+	"less.lint.boxModel.desc": "Ne pas utiliser la largeur ou la hauteur avec une marge intérieure ou une bordure",
-+	"less.lint.compatibleVendorPrefixes.desc": "Lors de l'utilisation d'un préfixe spécifique à un fabricant, toujours inclure également toutes les propriétés spécifiques au fabricant",
-+	"less.lint.duplicateProperties.desc": "Ne pas utiliser de définitions de style en double",
-+	"less.lint.emptyRules.desc": "Ne pas utiliser d'ensembles de règles vides",
-+	"less.lint.float.desc": "N'utilisez pas 'float'. Les éléments Float peuvent fragiliser le code CSS qui est ainsi plus vulnérable si un aspect de la disposition change.",
-+	"less.lint.fontFaceProperties.desc": "la règle @font-face doit définir les propriétés 'src' et 'font-family'",
-+	"less.lint.hexColorLength.desc": "Les couleurs Hex doivent contenir trois ou six chiffres hex",
-+	"less.lint.idSelector.desc": "Les sélecteurs ne doivent pas contenir d'ID, car ces règles sont trop fortement couplées au code HTML.",
-+	"less.lint.ieHack.desc": "Les hacks IE ne sont nécessaires que si IE7 et versions antérieures sont pris en charge",
-+	"less.lint.importStatement.desc": "Les instructions d'importation ne sont pas chargées en parallèle",
-+	"less.lint.important.desc": "N'utilisez pas !important. Cela indique que la spécificité de l'intégralité du code CSS est incorrecte et qu'il doit être refactorisé.",
-+	"less.lint.propertyIgnoredDueToDisplay.desc": "Propriété ignorée en raison de l'affichage. Par exemple, avec 'display: inline', les propriétés width, height, margin-top, margin-bottom et float sont sans effet",
-+	"less.lint.universalSelector.desc": "Le sélecteur universel (*) est connu pour sa lenteur",
-+	"less.lint.unknownProperties.desc": "Propriété inconnue.",
-+	"less.lint.unknownVendorSpecificProperties.desc": "Propriété spécifique à un fournisseur inconnue.",
-+	"less.lint.vendorPrefix.desc": "Lors de l'utilisation d'un préfixe spécifique à un fournisseur, ajouter également la propriété standard",
-+	"less.lint.zeroUnits.desc": "Aucune unité nécessaire pour zéro",
-+	"less.validate.desc": "Active ou désactive toutes les validations",
-+	"scss.colorDecorators.enable.desc": "Active ou désactive les éléments décoratifs de couleurs",
-+	"scss.lint.argumentsInColorFunction.desc": "Nombre de paramètres non valide",
-+	"scss.lint.boxModel.desc": "Ne pas utiliser la largeur ou la hauteur avec une marge intérieure ou une bordure",
-+	"scss.lint.compatibleVendorPrefixes.desc": "Lors de l'utilisation d'un préfixe spécifique à un fabricant, toujours inclure également toutes les propriétés spécifiques au fabricant",
-+	"scss.lint.duplicateProperties.desc": "Ne pas utiliser de définitions de style en double",
-+	"scss.lint.emptyRules.desc": "Ne pas utiliser d'ensembles de règles vides",
-+	"scss.lint.float.desc": "N'utilisez pas 'float'. Les éléments Float peuvent fragiliser le code CSS qui est ainsi plus vulnérable si un aspect de la disposition change.",
-+	"scss.lint.fontFaceProperties.desc": "la règle @font-face doit définir les propriétés 'src' et 'font-family'",
-+	"scss.lint.hexColorLength.desc": "Les couleurs Hex doivent contenir trois ou six chiffres hex",
-+	"scss.lint.idSelector.desc": "Les sélecteurs ne doivent pas contenir d'ID, car ces règles sont trop fortement couplées au code HTML.",
-+	"scss.lint.ieHack.desc": "Les hacks IE ne sont nécessaires que si IE7 et versions antérieures sont pris en charge",
-+	"scss.lint.importStatement.desc": "Les instructions d'importation ne sont pas chargées en parallèle",
-+	"scss.lint.important.desc": "N'utilisez pas !important. Cela indique que la spécificité de l'intégralité du code CSS est incorrecte et qu'il doit être refactorisé.",
-+	"scss.lint.propertyIgnoredDueToDisplay.desc": "Propriété ignorée en raison de l'affichage. Par exemple, avec 'display: inline', les propriétés width, height, margin-top, margin-bottom et float sont sans effet",
-+	"scss.lint.universalSelector.desc": "Le sélecteur universel (*) est connu pour sa lenteur",
-+	"scss.lint.unknownProperties.desc": "Propriété inconnue.",
-+	"scss.lint.unknownVendorSpecificProperties.desc": "Propriété spécifique à un fournisseur inconnue.",
-+	"scss.lint.vendorPrefix.desc": "Lors de l'utilisation d'un préfixe spécifique à un fournisseur, ajouter également la propriété standard",
-+	"scss.lint.zeroUnits.desc": "Aucune unité nécessaire pour zéro",
-+	"scss.validate.desc": "Active ou désactive toutes les validations"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 4aa1850e846959108a8499e9ce7cf6fd5998e4bb i18n/fra/extensions/git/out/askpass-main.i18n.json
-  their  100644 c06e0fff3068b93a89f2a97f8adce463ec31ed5e i18n/fra/extensions/git/out/askpass-main.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"missOrInvalid": "Informations d'identification manquantes ou non valides."
- }
-\ No newline at end of file
-changed in both
-  base   100644 7227100d355728d902186dcccae37442c34ceb6f i18n/fra/extensions/git/out/commands.i18n.json
-  our    100644 95b33e9cb37384a542e0f0621ed506addc05f3b9 i18n/fra/extensions/git/out/commands.i18n.json
-  their  100644 723f51d0997b4c30309a0fbbe0d6836bcc919b00 i18n/fra/extensions/git/out/commands.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -49,6 +50,18 @@
- 	"commit": "Effectuer le commit quand même",
- 	"no staged changes": "Aucune modification en attente à valider.\n\nVoulez-vous automatiquement mettre en attente toutes vos modifications et les valider directement ?",
- 	"always": "Toujours",
-+=======
-+	"branch name": "Nom de la branche",
-+	"clean": "Nettoyer les modifications",
-+	"clean repo": "Nettoyez l'arborescence de travail de votre dépôt avant l'extraction.",
-+	"cloning": "Clonage du dépôt git...",
-+	"commit message": "Message de validation",
-+	"confirm clean": "Voulez-vous vraiment supprimer les modifications apportées à {0} ?",
-+	"confirm clean all": "Voulez-vous vraiment supprimer toutes les modifications ?",
-+	"confirm revert": "Voulez-vous vraiment restaurer les changements sélectionnés dans {0} ?",
-+	"disabled": "Git est désactivé ou non pris en charge dans cet espace de travail",
-+	"never again": "OK, ne plus afficher",
-+>>>>>>> .their
- 	"no changes": "Il n'existe aucun changement à valider.",
- 	"commit message": "Message de validation",
- 	"provide commit message": "Indiquez un message de validation",
-@@ -73,6 +86,7 @@
- 	"nobranch": "Vous devez extraire une branche dont vous souhaitez effectuer le Push vers un emplacement distant.",
- 	"confirm publish branch": "La branche '{0}' n'a pas de branche en amont. Voulez-vous publier cette branche ?",
- 	"ok": "OK",
-+<<<<<<< .our
- 	"push with tags success": "Envoyé (push) avec des balises.",
- 	"pick remote": "Choisissez un dépôt distant où publier la branche '{0}' :",
- 	"sync is unpredictable": "Cette action va effectuer un transfert (Push) et une récupération (Pull) des commits à destination et en provenance de '{0}/{1}'.",
-@@ -88,4 +102,18 @@
- 	"git error details": "Git : {0}",
- 	"git error": "Erreur Git",
- 	"open git log": "Ouvrir le journal Git"
-+=======
-+	"open git log": "Ouvrir le journal Git",
-+	"openrepo": "Ouvrir le dépôt",
-+	"parent": "Répertoire parent",
-+	"pick remote": "Choisissez un dépôt distant où publier la branche '{0}' :",
-+	"proposeopen": "Voulez-vous ouvrir le dépôt cloné ?",
-+	"provide branch name": "Fournissez un nom de branche",
-+	"provide commit message": "Indiquez un message de validation",
-+	"remote branch at": "Branche distante à {0}",
-+	"repourl": "URL du dépôt",
-+	"revert": "Restaurer les modifications",
-+	"sync is unpredictable": "Cette action effectue un transfert (Push) et un tirage (Pull) des validations à destination et en provenance de '{0}'.",
-+	"tag at": "Étiquette à {0}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 df53544a5c1e810864f0c8fde94e8c488dcc6dcb i18n/fra/extensions/git/out/main.i18n.json
-  our    100644 36a1131640b7d318eacffccf8cb8a43d0105f1e3 i18n/fra/extensions/git/out/main.i18n.json
-  their  100644 3ccf0c3936c093de3316c4a2b3c8835a6042c0fa i18n/fra/extensions/git/out/main.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,4 +14,9 @@
- 	"notfound": "Git non trouvé. Installez-le et configurez-le en utilisant le paramètre 'git.path'.",
- 	"updateGit": "Mettre à jour Git",
- 	"git20": "Git {0} semble installé. Le code fonctionne mieux avec git >= 2"
-+=======
-+	"git20": "Il semble que git {0} soit installé. Code fonctionne mieux avec git >= 2",
-+	"updateGit": "Mettre à jour Git",
-+	"using git": "Utilisation de git {0} à partir de {1}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ca9cfc0bdc3e5e1f9c05412f2a67c514aabd1455 i18n/fra/extensions/git/package.i18n.json
-  our    100644 6b9b77f8287566561f58c3376d7d8aaba2171809 i18n/fra/extensions/git/package.i18n.json
-  their  100644 15f2f220555591277e2c386edb2d737ca8966739 i18n/fra/extensions/git/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -41,11 +42,28 @@
- 	"command.merge": "Fusionner la branche...",
- 	"command.createTag": "Créer une étiquette",
- 	"command.fetch": "Rappatrier",
-+=======
-+	"command.branch": "Créer une branche...",
-+	"command.checkout": "Extraire vers...",
-+	"command.clean": "Nettoyer le fichier",
-+	"command.cleanAll": "Nettoyer tous les fichiers",
-+	"command.clone": "Cloner",
-+	"command.commit": "Valider",
-+	"command.commitAll": "Valider tout",
-+	"command.commitAllSigned": "Valider tout (signé)",
-+	"command.commitStaged": "Valider les modifications en attente",
-+	"command.commitStagedSigned": "Valider les modifications en attente (signé)",
-+	"command.init": "Initialiser le dépôt",
-+	"command.openChange": "Ouvrir la modification",
-+	"command.openFile": "Ouvrir le fichier",
-+	"command.publish": "Publier",
-+>>>>>>> .their
- 	"command.pull": "Pull",
- 	"command.pullRebase": "Pull (rebaser)",
- 	"command.pullFrom": "Extraire de...",
- 	"command.push": "Push",
- 	"command.pushTo": "Transfert (Push) vers...",
-+<<<<<<< .our
- 	"command.pushWithTags": "Envoyer avec les Tags",
- 	"command.sync": "Synchroniser",
- 	"command.syncRebase": "Synchroniser (Rebase)",
-@@ -59,6 +77,20 @@
- 	"config.enabled": "Indique si git est activé",
- 	"config.path": "Chemin d'accès à l'exécutable git",
- 	"config.autoRepositoryDetection": "Si les dépôts doivent être détectés automatiquement",
-+=======
-+	"command.refresh": "Actualiser",
-+	"command.revertSelectedRanges": "Restaurer les portées sélectionnées",
-+	"command.showOutput": "Afficher la sortie Git",
-+	"command.stage": "Mettre en attente le fichier",
-+	"command.stageAll": "Mettre en attente tous les fichiers",
-+	"command.stageSelectedRanges": "Mettre en attente les plages sélectionnées",
-+	"command.sync": "Synchroniser",
-+	"command.undoCommit": "Annuler la dernière validation",
-+	"command.unstage": "Annuler la mise en attente du fichier",
-+	"command.unstageAll": "Annuler la mise en attente des fichiers",
-+	"command.unstageSelectedRanges": "Annuler la mise en attente des plages sélectionnées",
-+	"config.autofetch": "Indique si la récupération automatique est activée",
-+>>>>>>> .their
- 	"config.autorefresh": "Indique si l'actualisation automatique est activée",
- 	"config.autofetch": "Indique si la récupération automatique est activée",
- 	"config.enableLongCommitWarning": "Indique si les longs messages de validation doivent faire l'objet d'un avertissement",
-added in both
-  our    100644 7915d99dbd81f19e967ab958936eb28dab11cf97 i18n/fra/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
-  their  100644 78f45a7023441f90bba848712f4a254cd003c8c8 i18n/fra/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"typescript.jsDocCompletionItem.documentation": "Commentaire JSDoc"
- }
-\ No newline at end of file
-changed in both
-  base   100644 6c52b1d802e5bdc7d28648175e1f177105afa808 i18n/fra/extensions/typescript/out/utils/projectStatus.i18n.json
-  our    100644 b39c51e947e23466bc1ccfd16835d0f518f9db58 i18n/fra/extensions/typescript/out/utils/projectStatus.i18n.json
-  their  100644 2398ef98161dbc2b8c43778be4f83bad49f104a1 i18n/fra/extensions/typescript/out/utils/projectStatus.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,11 @@
- 	],
- 	"hintExclude": "Pour activer les fonctionnalités de langage JavaScript/TypeScript à l'échelle du projet, excluez les dossiers contenant de nombreux fichiers, par exemple : {0}",
- 	"hintExclude.generic": "Pour activer les fonctionnalités de langage JavaScript/TypeScript à l'échelle du projet, excluez les dossiers volumineux contenant des fichiers sources inutilisés.",
-+=======
-+	"hintExclude": "Pour activer les fonctionnalités de langage JavaScript/TypeScript à l'échelle du projet, excluez les dossiers contenant de nombreux fichiers, par exemple : {0}",
-+	"hintExclude.generic": "Pour activer les fonctionnalités de langage JavaScript/TypeScript à l'échelle du projet, excluez les dossiers volumineux contenant des fichiers sources inutilisés.",
-+	"hintExclude.tooltip": "Pour activer les fonctionnalités de langage JavaScript/TypeScript à l'échelle du projet, excluez les dossiers volumineux contenant des fichiers sources inutilisés.",
-+>>>>>>> .their
- 	"large.label": "Configurer les exclusions",
- 	"hintExclude.tooltip": "Pour activer les fonctionnalités de langage JavaScript/TypeScript à l'échelle du projet, excluez les dossiers volumineux contenant des fichiers sources inutilisés."
- }
-\ No newline at end of file
-changed in both
-  base   100644 a53637e8b1673910b6670e633b5843d0057e60c6 i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 1ad1b4ad7ba3d841a13ddfeab561381b182d7f45 i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 6797b0346b2e5a0fc9945a13e80447d22d20250c i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,11 +7,22 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"acceptSuggestionOnCommitCharacter": "Contrôle si les suggestions doivent être acceptées avec des caractères de validation. Par exemple, en JavaScript, le point-virgule (';') peut être un caractère de validation qui permet d'accepter une suggestion et de taper ce caractère.",
-+	"acceptSuggestionOnEnter": "Contrôle si les suggestions peuvent être acceptées avec Entrée (en plus de Tab). Cela permet d'éviter toute ambiguïté entre l'insertion de nouvelles lignes et l'acceptation de suggestions.",
-+	"autoClosingBrackets": "Contrôle si l'éditeur doit automatiquement fermer les crochets après les avoir ouverts",
-+	"codeLens": "Contrôle si l'éditeur affiche les indicateurs CodeLens",
-+	"cursorBlinking": "Contrôle le style d'animation du curseur. Valeurs possibles : 'blink', 'smooth', 'phase', 'expand' et 'solid'",
-+	"cursorStyle": "Contrôle le style du curseur. Les valeurs acceptées sont 'block', 'block-outline', 'line', 'line-thin', 'underline' et 'underline-thin'",
-+	"detectIndentation": "Quand vous ouvrez un fichier, 'editor.tabSize' et 'editor.insertSpaces' sont détectés en fonction du contenu du fichier.",
-+	"dragAndDrop": "Contrôle si l'éditeur autorise le déplacement des sélections par glisser-déplacer.",
-+>>>>>>> .their
- 	"editorConfigurationTitle": "Éditeur",
- 	"fontFamily": "Contrôle la famille de polices.",
- 	"fontWeight": "Contrôle l'épaisseur de police.",
- 	"fontSize": "Contrôle la taille de police en pixels.",
- 	"lineHeight": "Contrôle la hauteur de ligne. Utilisez 0 pour calculer lineHeight à partir de fontSize.",
-+<<<<<<< .our
- 	"letterSpacing": "Définit l'espacement des caractères en pixels.",
- 	"lineNumbers.off": "Les numéros de ligne ne sont pas affichés.",
- 	"lineNumbers.on": "Les numéros de ligne sont affichés en nombre absolu.",
-@@ -43,6 +55,13 @@
- 	"wordWrap": "Contrôle le retour automatique à la ligne. Valeurs possibles :\n - 'off' (désactive le retour automatique à la ligne) ;\n - 'on' (retour automatique à la ligne dans la fenêtre d'affichage) ;\n - 'wordWrapColumn' (retour automatique à la ligne en fonction de 'editor.wordWrapColumn') ou ;\n - 'bounded' (retour automatique à la ligne au minimum en fonction de la fenêtre d'affichage et de 'editor.wordWrapColumn').",
- 	"wordWrapColumn": "Contrôle la colonne de retour automatique à la ligne de l'éditeur quand 'editor.wordWrap' a la valeur 'wordWrapColumn' ou 'bounded'.",
- 	"wrappingIndent": "Contrôle la mise en retrait des lignes enveloppées. Il peut s’agir de 'none', 'same', 'indent' ou 'deepIndent'.",
-+=======
-+	"lineNumbers": "Contrôle l'affichage des numéros de ligne. Les valeurs possibles sont 'activé', 'désactivé' et 'relatif'. La valeur 'relatif' indique le numéro de ligne à partir de la position actuelle du curseur.",
-+	"matchBrackets": "Met en surbrillance les crochets correspondants quand l'un d'eux est sélectionné.",
-+	"minimap.enabled": "Contrôle si la minicarte est affichée",
-+	"minimap.maxColumn": "Limiter la largeur de la minicarte pour afficher au maximum un certain nombre de colonnes",
-+	"minimap.renderCharacters": "Afficher les caractères réels sur une ligne (par opposition aux blocs de couleurs)",
-+>>>>>>> .their
- 	"mouseWheelScrollSensitivity": "Multiplicateur à utiliser pour le 'deltaX' et le 'deltaY' des événements de défilement de la roulette de la souris",
- 	"multiCursorModifier.ctrlCmd": "Mappe vers 'Contrôle' dans Windows et Linux, et vers 'Commande' dans macOS.",
- 	"multiCursorModifier.alt": "Mappe vers 'Alt' dans Windows et Linux, et vers 'Option' dans macOS.",
-@@ -112,7 +131,28 @@
- 	"codeActionsOnSaveTimeout": "Délai d'attente pour les actions de code exécutées lors de l'enregistrement.",
- 	"selectionClipboard": "Contrôle si le presse-papiers primaire Linux doit être pris en charge.",
- 	"sideBySide": "Contrôle si l'éditeur de différences affiche les différences en mode côte à côte ou inline",
-+<<<<<<< .our
- 	"ignoreTrimWhitespace": "Contrôle si l'éditeur de différences affiche les changements liés aux espaces blancs de début ou de fin comme des différences",
- 	"largeFileOptimizations": "Traitement spécial des fichiers volumineux pour désactiver certaines fonctionnalités utilisant beaucoup de mémoire.",
- 	"renderIndicators": "Contrôle si l'éditeur de différences affiche les indicateurs +/- pour les modifications ajoutées/supprimées"
-+=======
-+	"snippetSuggestions": "Contrôle si les extraits de code s'affichent en même temps que d'autres suggestions, ainsi que leur mode de tri.",
-+	"stablePeek": "Garder les éditeurs d'aperçu ouverts même si l'utilisateur double-clique sur son contenu ou appuie sur la touche Échap.",
-+	"suggestFontSize": "Taille de police du widget de suggestion",
-+	"suggestLineHeight": "Hauteur de ligne du widget de suggestion",
-+	"suggestOnTriggerCharacters": "Contrôle si les suggestions doivent s'afficher automatiquement durant la saisie de caractères de déclenchement",
-+	"tabSize": "Nombre d'espaces correspondant à une tabulation. Ce paramètre est remplacé en fonction du contenu du fichier quand 'editor.detectIndentation' est activé.",
-+	"tabSize.errorMessage": "'number' attendu. Notez que la valeur \"auto\" a été remplacée par le paramètre 'editor.detectIndentation'.",
-+	"trimAutoWhitespace": "Supprimer l'espace blanc de fin inséré automatiquement",
-+	"useTabStops": "L'insertion et la suppression d'un espace blanc suit les taquets de tabulation",
-+	"wordBasedSuggestions": "Activez les suggestions basées sur les mots.",
-+	"wordSeparators": "Caractères utilisés comme séparateurs de mots durant la navigation ou les opérations basées sur les mots",
-+	"wordWrap": "Contrôle le retour automatique à la ligne. Valeurs possibles :\n - 'off' (désactive le retour automatique à la ligne) ;\n - 'on' (retour automatique à la ligne dans la fenêtre d'affichage) ;\n - 'wordWrapColumn' (retour automatique à la ligne en fonction de 'editor.wordWrapColumn') ou ;\n - 'bounded' (retour automatique à la ligne au minimum en fonction de la fenêtre d'affichage et de 'editor.wordWrapColumn').",
-+	"wordWrap.bounded": "Retour automatique à la ligne au minimum en fonction de la fenêtre d'affichage et de 'editor.wordWrapColumn'.",
-+	"wordWrap.off": "Le retour automatique à la ligne n'est jamais effectué.",
-+	"wordWrap.on": "Le retour automatique à la ligne s'effectue en fonction de la largeur de la fenêtre d'affichage.",
-+	"wordWrap.wordWrapColumn": "Le retour automatique à la ligne s'effectue en fonction de 'editor.wordWrapColumn'.",
-+	"wordWrapColumn": "Contrôle la colonne de retour automatique à la ligne de l'éditeur quand 'editor.wordWrap' a la valeur 'wordWrapColumn' ou 'bounded'.",
-+	"wrappingIndent": "Contrôle le retrait des lignes renvoyées. La valeur peut être 'none', 'same' ou 'indent'."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 fe11365a49b6232f49f2c12af41c7ae3aea642f8 i18n/fra/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
-  our    100644 5fee5001dd06d20e3faf05349c9aec36c66b42ff i18n/fra/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
-  their  100644 7cc1c6bd334ba5eda5e66ea8a8d191eccc6ef7ec i18n/fra/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
-@@ -20,5 +20,13 @@
- 	"meta.typeDefinitions.title": " – Définitions de type {0}",
- 	"actions.goToTypeDefinition.label": "Atteindre la définition de type",
- 	"actions.peekTypeDefinition.label": "Aperçu de la définition du type",
-+<<<<<<< .our
- 	"multipleResults": "Cliquez pour afficher {0} définitions."
-+=======
-+	"actions.previewDecl.label": "Apercu de définition",
-+	"generic.noResults": "Définition introuvable",
-+	"meta.title": " – {0} définitions",
-+	"multipleResults": "Cliquez pour afficher {0} définitions.",
-+	"noResultWord": "Définition introuvable pour '{0}'"
-+>>>>>>> .their
- }
-\ No newline at end of file
-removed in local
-  base   100644 fdd6b9b5ddeeb4dfaf6e4cd81bcf23fdc1d97456 i18n/fra/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
-  their  100644 8999bb1b0f2694ac970f29948edca4c8ce738a0f i18n/fra/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/fra/src/vs/workbench/electron-browser/commands.i18n.json
-  our    100644 983899514ca518324d9e85f57712db39d3040bbe i18n/fra/src/vs/workbench/electron-browser/commands.i18n.json
-  their  100644 3a1051dcfdad7ec7db70524f0a31f277885230df i18n/fra/src/vs/workbench/electron-browser/commands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"diffLeftRightLabel": "{0} ⟷ {1}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 f4ad9b60c490579e824134aba086d50517819b48 i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 1a663cb4405d0c8f86ec154a57cdd2b613d93195 i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 f6f7a655c230843151f4fa1256ae478ee07a372f i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -34,6 +34,7 @@
- 	"sideBarLocation": "Contrôle l'emplacement de la barre latérale. Elle peut s'afficher à gauche ou à droite du banc d'essai.",
- 	"panelDefaultLocation": "Contrôle l’emplacement par défaut du panneau. Il peut être affiché soit en bas ou à droite du banc d'essai.",
- 	"statusBarVisibility": "Contrôle la visibilité de la barre d'état au bas du banc d'essai.",
-+<<<<<<< .our
- 	"activityBarVisibility": "Contrôle la visibilité de la barre d'activités dans le banc d'essai.",
- 	"viewVisibility": "Contrôle la visibilité des actions d'en-tête de vue. Les actions d'en-tête de vue peuvent être soit toujours visibles, ou uniquement visibles quand cette vue a le focus ou est survolée.",
- 	"fontAliasing": "Contrôle la méthode de font aliasing dans le workbench.\n- default : Lissage des polices de sous-pixel. Sur la plupart des affichages non-ratina, cela vous donnera le texte le plus vif\n- antialiased : Lisse les polices au niveau du pixel, plutôt que les sous-pixels. Peut faire en sorte que la police apparaisse plus fine dans l’ensemble \n- none : Désactive le lissage des polices. Le texte s'affichera avec des bordures dentelées\n- auto: Applique `default` ou `antialiased` automatiquement en se basant sur la résolution de l'affichage.",
-@@ -42,6 +43,28 @@
- 	"workbench.fontAliasing.none": "Désactive le lissage des polices. Le texte s'affichera avec des bordures dentelées.",
- 	"workbench.fontAliasing.auto": "Applique `default` ou `antialiased`automatiquement en se basant sur la résolution de l'affichage.",
- 	"enableNaturalLanguageSettingsSearch": "Contrôle s’il faut activer le mode de recherche en langage naturel pour les paramètres.",
-+=======
-+	"title": "Contrôle le titre de la fenêtre en fonction de l'éditeur actif. Les variables sont remplacées en fonction du contexte :\n${activeEditorShort} : exemple : myFile.txt\n${activeEditorMedium} : exemple : myFolder/myFile.txt\n${activeEditorLong} : exemple : /Users/Development/myProject/myFolder/myFile.txt\n${rootName} : exemple : myProject\n${rootPath} : exemple : /Users/Development/myProject\n${appName} : exemple : VS Code\n${dirty} : indicateur d'intégrité si l'intégrité de l'éditeur actif est compromise\n${separator} : séparateur conditionnel (\" - \") qui s'affiche uniquement quand il est entouré de variables avec des valeurs",
-+	"titleBarStyle": "Ajustez l'apparence de la barre de titre de la fenêtre. Vous devez effectuer un redémarrage complet pour que les changements soient appliqués.",
-+	"view": "Affichage",
-+	"window.menuBarVisibility.default": "Le menu n'est masqué qu'en mode plein écran.",
-+	"window.menuBarVisibility.hidden": "Le menu est toujours masqué.",
-+	"window.menuBarVisibility.toggle": "Le menu est masqué mais il peut être affiché via la touche Alt.",
-+	"window.menuBarVisibility.visible": "Le menu est toujours visible même en mode plein écran.",
-+	"window.newWindowDimensions.default": "Permet d'ouvrir les nouvelles fenêtres au centre de l'écran.",
-+	"window.newWindowDimensions.fullscreen": "Permet d'ouvrir les nouvelles fenêtres en mode plein écran.",
-+	"window.newWindowDimensions.inherit": "Permet d'ouvrir les nouvelles fenêtres avec la même dimension que la dernière fenêtre active.",
-+	"window.newWindowDimensions.maximized": "Permet d'ouvrir les nouvelles fenêtres de manière agrandie.",
-+	"window.openFilesInNewWindow.default": "Les fichiers s'ouvrent dans la fenêtre du dossier conteneur ouvert ou dans la dernière fenêtre active, sauf s'ils sont ouverts via le Dock ou depuis le Finder (macOS uniquement)",
-+	"window.openFilesInNewWindow.off": "Les fichiers s'ouvrent dans la fenêtre du dossier conteneur ouvert ou dans la dernière fenêtre active",
-+	"window.openFilesInNewWindow.on": "Les fichiers s'ouvrent dans une nouvelle fenêtre",
-+	"window.openFoldersInNewWindow.default": "Les dossiers s'ouvrent dans une nouvelle fenêtre, sauf si un dossier est sélectionné depuis l'application (par exemple, via le menu Fichier)",
-+	"window.openFoldersInNewWindow.off": "Les dossiers remplacent la dernière fenêtre active",
-+	"window.openFoldersInNewWindow.on": "Les dossiers s'ouvrent dans une nouvelle fenêtre",
-+	"window.reopenFolders.all": "Permet de rouvrir tous les dossiers de la dernière session.",
-+	"window.reopenFolders.none": "Permet de ne jamais rouvrir un dossier.",
-+	"window.reopenFolders.one": "Permet de rouvrir le dernier dossier actif.",
-+>>>>>>> .their
- 	"windowConfigurationTitle": "Fenêtre",
- 	"window.openFilesInNewWindow.on": "Les fichiers s'ouvrent dans une nouvelle fenêtre",
- 	"window.openFilesInNewWindow.off": "Les fichiers s'ouvrent dans la fenêtre du dossier conteneur ouvert ou dans la dernière fenêtre active",
-added in both
-  our    100644 10b510b8f5094e389683507c435d87fca5a88eac i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
-  their  100644 251568ee12046fd30271f66f966cb7f40797423f i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,6 +9,16 @@
- 	],
- 	"wordWrapMigration.ok": "OK",
- 	"wordWrapMigration.dontShowAgain": "Ne plus afficher",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"wordWrapMigration.dontShowAgain": "Ne plus afficher",
-+	"wordWrapMigration.ok": "OK",
-+>>>>>>> .their
- 	"wordWrapMigration.openSettings": "Ouvrir les paramètres",
- 	"wordWrapMigration.prompt": "Le paramètre 'editor.wrappingColumn' est déconseillé et doit être remplacé par 'editor.wordWrap'."
- }
-\ No newline at end of file
-changed in both
-  base   100644 aecc3dc1423218f71487a60f6d96d4fd908d980c i18n/fra/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-  our    100644 dc968d239807c7c10dd41cd7a92db15f2c376793 i18n/fra/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-  their  100644 99652aa5fd7e68d20dc2076cd2d37bb6879e7365 i18n/fra/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-@@ -41,7 +41,34 @@
- 	"debugConsoleAction": "Console de débogage",
- 	"unreadOutput": "Nouvelle sortie dans la console de débogage",
- 	"debugFocusConsole": "Focus sur la console de débogage",
-+<<<<<<< .our
- 	"focusSession": "Focus Session",
-+=======
-+	"disableAllBreakpoints": "Désactiver tous les points d'arrêt",
-+	"disableBreakpoint": "Désactiver le point d'arrêt",
-+	"disconnectDebug": "Déconnecter",
-+	"editConditionalBreakpoint": "Modifier un point d'arrêt...",
-+	"enableAllBreakpoints": "Activer tous les points d'arrêt",
-+	"enableBreakpoint": "Activer le point d'arrêt",
-+	"focusProcess": "Focus du processus",
-+	"launchJsonNeedsConfigurtion": "Configurer ou corriger 'launch.json'",
-+	"openLaunchJson": "Ouvrir {0}",
-+	"pauseDebug": "Suspendre",
-+	"reapplyAllBreakpoints": "Réappliquer tous les points d'arrêt",
-+	"reconnectDebug": "Se reconnecter",
-+	"removeAllBreakpoints": "Supprimer tous les points d'arrêt",
-+	"removeAllWatchExpressions": "Supprimer toutes les expressions",
-+	"removeBreakpoint": "Supprimer un point d'arrêt",
-+	"removeWatchExpression": "Supprimer une expression",
-+	"renameFunctionBreakpoint": "Renommer un point d'arrêt sur fonction",
-+	"restartDebug": "Redémarrer",
-+	"restartFrame": "Redémarrer le frame",
-+	"reverseContinue": "Inverser",
-+	"selectAndStartDebugging": "Sélectionner et démarrer le débogage",
-+	"setValue": "Définir la valeur",
-+	"startDebug": "Démarrer le débogage",
-+	"startWithoutDebugging": "Exécuter sans débogage",
-+>>>>>>> .their
- 	"stepBackDebug": "Revenir en arrière",
- 	"reverseContinue": "Inverser"
- }
-\ No newline at end of file
-added in both
-  our    100644 30908bd7437466825d57e6aca6b64f3223bd5179 i18n/fra/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
-  their  100644 dbe91328fddc39a3f467063dd8c3b094590fd8eb i18n/fra/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -12,4 +13,16 @@
- 	"addConfiguration": "Ajouter une configuration...",
- 	"noConfigurationsMatching": "Aucune configuration de débogage correspondante",
- 	"noConfigurationsFound": "Configurations de débogage introuvables. Créez un fichier 'launch.json'."
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"debugAriaLabel": "Tapez le nom d'une configuration de lancement à exécuter.",
-+	"entryAriaLabel": "{0}, débogage",
-+	"noConfigurationsFound": "Configurations de débogage introuvables. Créez un fichier 'launch.json'.",
-+	"noConfigurationsMatching": "Aucune configuration de débogage correspondante"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 bb9c485a9f10f6276b0cfe008e1e793e881da22c i18n/fra/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
-  their  100644 1f6ec23605ab514445b5be26bdb308adab62ec72 i18n/fra/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,5 +10,13 @@
- 	"debugExceptionWidgetBorder": "Couleur de bordure du widget d'exception.",
- 	"debugExceptionWidgetBackground": "Couleur d'arrière-plan du widget d'exception.",
- 	"exceptionThrownWithId": "Une exception s'est produite : {0}",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"exceptionThrown": "Une exception s'est produite"
- }
-\ No newline at end of file
-changed in both
-  base   100644 e979351ae3dd28ef0facea32c8a02dff326b3383 i18n/fra/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  our    100644 7ccd41c32f9d398f60c5c910829d189e80ab1865 i18n/fra/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  their  100644 68b603a249a69418bbf4f5e728647b36a37c80a4 i18n/fra/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-changed in both
-  base   100644 54a1d6b40acc36ce813446c3ca35218281e41bd9 i18n/fra/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  our    100644 11c71d149dcd965919372e9b079e7b0ec31fc966 i18n/fra/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  their  100644 e15c7e67f74d6fa1db098034fafcf14d333f9c36 i18n/fra/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-@@ -8,6 +8,20 @@
- 	],
- 	"debugAdapterBinNotFound": "L'exécutable d'adaptateur de débogage '{0}' n'existe pas.",
- 	"debugAdapterCannotDetermineExecutable": "Impossible de déterminer l'exécutable pour l'adaptateur de débogage '{0}'.",
-+<<<<<<< .our
- 	"unableToLaunchDebugAdapter": "Impossible de lancer l'adaptateur de débogage à partir de '{0}'.",
- 	"unableToLaunchDebugAdapterNoArgs": "Impossible de lancer l'adaptateur de débogage."
-+=======
-+	"debugLinuxConfiguration": "Attributs de configuration de lancement spécifiques à Linux.",
-+	"debugName": "Le nom de la configuration s'affiche dans le menu déroulant de la configuration de lancement.",
-+	"debugOSXConfiguration": "Attributs de configuration de lancement spécifiques à OS X.",
-+	"debugPrelaunchTask": "Tâche à exécuter avant le démarrage de la session de débogage.",
-+	"debugRequest": "Type de requête de configuration. Il peut s'agir de \"launch\" ou \"attach\".",
-+	"debugServer": "Pour le développement d'une extension de débogage uniquement : si un port est spécifié, VS Code tente de se connecter à un adaptateur de débogage s'exécutant en mode serveur",
-+	"debugType": "Type de configuration.",
-+	"debugWindowsConfiguration": "Attributs de configuration de lancement spécifiques à Windows.",
-+	"deprecatedVariables": "env.', 'config.' et 'command.' sont déconseillés. Utilisez 'env:', 'config:' et 'command:' à la place.",
-+	"internalConsoleOptions": "Contrôle le comportement de la console de débogage interne.",
-+	"node2NotSupported": "\"node2\" n'est plus pris en charge. Utilisez \"node\" à la place, et affectez la valeur \"inspector\" à l'attribut \"protocol\"."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 b29845955db1cd0406dad53a0e013590970f8487 i18n/fra/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 9693ca31c50911feab4d02a16763cfd2142313b0 i18n/fra/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 484484e9a5b6ec1a7bb79eff164443d6524f357c i18n/fra/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-@@ -4,6 +4,7 @@
-  *--------------------------------------------------------------------------------------------*/
- // Do not edit this file. It is machine generated.
- {
-+<<<<<<< .our
- 	"showExplorerViewlet": "Afficher l'Explorateur",
- 	"explore": "Explorateur",
- 	"view": "Affichage",
-@@ -11,6 +12,25 @@
- 	"binaryFileEditor": "Éditeur de fichier binaire",
- 	"filesConfigurationTitle": "Fichiers",
- 	"exclude": "Configurer des modèles glob pour exclure des fichiers et dossiers. Par exemple, l’explorateur de fichiers décide quels fichiers et dossiers afficher ou masquer en fonction de ce paramètre.",
-+=======
-+	"associations": "Configurez les associations entre les fichiers et les langages (exemple : '*.extension' : 'html'). Celles-ci sont prioritaires sur les associations par défaut des langages installés.",
-+	"autoReveal": "Contrôle si l'Explorateur doit automatiquement afficher et sélectionner les fichiers à l'ouverture.",
-+	"autoSave": "Contrôle l'enregistrement automatique des fichiers dont l'intégrité est compromise. Valeurs acceptées : '{0}', '{1}', '{2}' (l'éditeur perd le focus), '{3}' (la fenêtre perd le focus). Si la valeur est '{4}', vous pouvez configurer le délai dans 'files.autoSaveDelay'.",
-+	"autoSaveDelay": "Contrôle le délai en ms au bout duquel un fichier à l'intégrité compromise est enregistré automatiquement. S'applique uniquement quand 'files.autoSave' a la valeur '{0}'",
-+	"binaryFileEditor": "Éditeur de fichier binaire",
-+	"dynamicHeight": "Contrôle si la hauteur de la section des éditeurs ouverts doit s'adapter dynamiquement ou non au nombre d'éléments.",
-+	"editorConfigurationTitle": "Éditeur",
-+	"enableDragAndDrop": "Contrôle si l'explorateur doit autoriser le déplacement de fichiers et de dossiers par glisser-déplacer.",
-+	"encoding": "Encodage du jeu de caractères par défaut à utiliser durant la lecture et l'écriture des fichiers.",
-+	"eol": "Caractère de fin de ligne par défaut.",
-+	"exclude": "Configurez les modèles Glob pour l'exclusion des fichiers et des dossiers.",
-+	"explore": "Explorateur",
-+	"explorerConfigurationTitle": "Explorateur de fichiers",
-+	"files.autoSave.afterDelay": "Un fichier dont l'intégrité est compromise est automatiquement enregistré après la configuration de 'files.autoSaveDelay'.",
-+	"files.autoSave.off": "Un fichier dont l'intégrité est compromise n'est jamais enregistré automatiquement.",
-+	"files.autoSave.onFocusChange": "Un fichier dont l'intégrité est compromise est automatiquement enregistré quand l'éditeur perd le focus.",
-+	"files.autoSave.onWindowChange": "Un fichier dont l'intégrité est compromise est automatiquement enregistré quand la fenêtre perd le focus.",
-+>>>>>>> .their
- 	"files.exclude.boolean": "Modèle Glob auquel les chemins de fichiers doivent correspondre. Affectez la valeur true ou false pour activer ou désactiver le modèle.",
- 	"files.exclude.when": "Vérification supplémentaire des frères d'un fichier correspondant. Utilisez $(basename) comme variable pour le nom de fichier correspondant.",
- 	"associations": "Configurez les associations entre les fichiers et les langages (par exemple, \"*.extension\": \"html\"). Celles-ci ont priorité sur les associations par défaut des langages installés.",
-added in both
-  our    100644 ce5cfc948495ddb35c92c4fb56f512ed6dfbbe32 i18n/fra/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/fra/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
-@@ -3,6 +3,7 @@
-  *  Licensed under the MIT License. See License.txt in the project root for license information.
-  *--------------------------------------------------------------------------------------------*/
- // Do not edit this file. It is machine generated.
-+<<<<<<< .our
- {
- 	"vscode.extension.contributes.snippets": "Ajoute des extraits de code.",
- 	"vscode.extension.contributes.snippets-language": "Identificateur de langage pour lequel cet extrait de code est ajouté.",
-@@ -11,4 +12,7 @@
- 	"invalid.path.0": "Chaîne attendue dans 'contributes.{0}.path'. Valeur fournie : {1}",
- 	"invalid.path.1": "'contributes.{0}.path' ({1}) est censé être inclus dans le dossier ({2}) de l'extension. Cela risque de rendre l'extension non portable.",
- 	"badVariableUse": "L'extrait de code \"{0}\" confond très probablement les variables et les espaces réservés d'extrait de code. Consultez https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax pour plus d'informations."
--}
-\ No newline at end of file
-+}
-+=======
-+{}
-+>>>>>>> .their
-added in both
-  our    100644 3c9e6afc0efcf0567314c1a67d41f58d55f2fc8c i18n/fra/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
-  their  100644 27c0397de0309b45d299beae6a89b1397c4c1376 i18n/fra/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,4 +10,13 @@
- 	"snippet.suggestions.label": "Insérer un extrait de code",
- 	"sep.userSnippet": "Extraits de code de l'utilisateur",
- 	"sep.extSnippet": "Extraits de code d’extension"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"snippet.suggestions.label": "Insérer un extrait de code"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 6aff63f3b8ed86c22e3db3f7b4b70ba36b0a5d67 i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 eefed0e4d58d81161889f00697ee64b3ab90a942 i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -16,5 +17,13 @@
- 	"badVariableUse": "Un ou plusieurs extraits de l’extension '{0}' confondent très probablement des snippet-variables et des snippet-placeholders (Voir https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax pour plus de détails)",
- 	"badFile": "Le fichier d’extrait \"{0}\" n’a pas pu être lu.",
- 	"detail.snippet": "{0} ({1})",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"snippetSuggest.longLabel": "{0}, {1}"
- }
-\ No newline at end of file
-added in both
-  our    100644 1c95657d6a5061c425cbc87bbec7217d167f15d7 i18n/fra/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
-  their  100644 b20280d600083b47de8ab89c8a782180999c6bec i18n/fra/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"tabCompletion": "Insérez les extraits de code quand leurs préfixes correspondent. Fonctionne mieux quand la fonctionnalité 'quickSuggestions' n'est pas activée."
- }
-\ No newline at end of file
-changed in both
-  base   100644 0d5743f209f2407a029b0314c1be08ebdc4a119b i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 8f10773d1a2d0f2302f3cb3b7d0dac64b3d63462 i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 45c79c51f984bc241a13add34cd410282eeac5cc i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -7,6 +8,14 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"workbench.action.terminal.toggleTerminal": "Activer/désactiver le terminal intégré",
-+=======
-+	"workbench.action.terminal.clear": "Effacer",
-+	"workbench.action.terminal.copySelection": "Copier la sélection",
-+	"workbench.action.terminal.focus": "Focus sur le terminal",
-+	"workbench.action.terminal.focusAtIndex": "Focus sur le terminal {0}",
-+	"workbench.action.terminal.focusNext": "Focus sur le terminal suivant",
-+	"workbench.action.terminal.focusPrevious": "Focus sur le terminal précédent",
-+>>>>>>> .their
- 	"workbench.action.terminal.kill": "Tuer l'instance active du terminal",
- 	"workbench.action.terminal.kill.short": "Tuer le terminal",
- 	"workbench.action.terminal.quickKill": "Tuer l'instance de terminal",
-added in both
-  our    100644 25e95767831db176f3ab81c120b1f484fac43ea4 i18n/fra/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  their  100644 5838f1b85c35344d946cea0b179ef0dbdbed64fd i18n/fra/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -39,4 +40,48 @@
- 	"welcomePage.interfaceOverviewDescription": "Obtenez une superposition visuelle mettant en évidence les principaux composants de l'IU",
- 	"welcomePage.interactivePlayground": "Terrain de jeu interactif",
- 	"welcomePage.interactivePlaygroundDescription": "Essayez les fonctionnalités essentielles de l'éditeur en suivant une brève procédure pas à pas"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"welcomePage.atom": "Atom",
-+	"welcomePage.atomCurrent": "Atom (actuel)",
-+	"welcomePage.cloneGitRepository": "Cloner le dépôt Git...",
-+	"welcomePage.colorTheme": "Thème de couleur",
-+	"welcomePage.colorThemeDescription": "Personnalisez l'apparence de l'éditeur et de votre code",
-+	"welcomePage.configureSettings": "Configurer les paramètres",
-+	"welcomePage.configureSettingsDescription": "Déverrouillez toute la puissance de VS Code en adaptant les paramètres",
-+	"welcomePage.editingEvolved": "Édition évoluée",
-+	"welcomePage.gitHubRepository": "Dépôt GitHub",
-+	"welcomePage.help": "Aide",
-+	"welcomePage.installKeymap": "Installez les raccourcis clavier de {0}, {1}, {2} et {3}",
-+	"welcomePage.installKeymapDescription": "Installer les raccourcis clavier",
-+	"welcomePage.interactivePlayground": "Terrain de jeu interactif",
-+	"welcomePage.interactivePlaygroundDescription": "Essayez les fonctionnalités essentielles de l'éditeur en suivant une brève procédure pas à pas",
-+	"welcomePage.interfaceOverview": "Vue d'ensemble de l'interface",
-+	"welcomePage.interfaceOverviewDescription": "Obtenez une superposition visuelle mettant en évidence les principaux composants de l'IU",
-+	"welcomePage.introductoryVideos": "Vidéos d'introduction",
-+	"welcomePage.keybindingsReference": "Référence des raccourcis clavier",
-+	"welcomePage.keybindingsReferenceDescription": "Fichier PDF imprimable avec les raccourcis clavier les plus usuels",
-+	"welcomePage.newFile": "Nouveau fichier",
-+	"welcomePage.noRecentFolders": "Aucun dossier récent",
-+	"welcomePage.openFolder": "Ouvrir un dossier...",
-+	"welcomePage.others": "autres",
-+	"welcomePage.productDocumentation": "Documentation du produit",
-+	"welcomePage.quickLinks": "Liens rapides",
-+	"welcomePage.recent": "Récent",
-+	"welcomePage.showCommands": "Rechercher et exécuter toutes les commandes",
-+	"welcomePage.showCommandsDescription": "Utilisez et recherchez rapidement des commandes dans le Panneau de configuration ({0})",
-+	"welcomePage.showOnStartup": "Afficher la page d'accueil au démarrage",
-+	"welcomePage.stackOverflow": "Dépassement de la capacité de la pile",
-+	"welcomePage.start": "Démarrer",
-+	"welcomePage.sublime": "Sublime",
-+	"welcomePage.sublimeCurrent": "Sublime (actuel)",
-+	"welcomePage.vim": "Vim",
-+	"welcomePage.vimCurrent": "Vim (actuel)",
-+	"welcomePage.vscode": "Visual Studio Code"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 16f4398fb3dbf53855cdd34faf7455587508c74e i18n/fra/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-  our    100644 ea5c592e201b82ea53c73f6acedfd92e4353f522 i18n/fra/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-  their  100644 303a3f6b574dbbb5652d654e83e60eac4db76366 i18n/fra/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -21,10 +22,18 @@
- 	"welcomePage.willReloadAfterInstallingExtensionPack": "La fenêtre se recharge après l'installation d'un support supplémentaire pour {0}.",
- 	"welcomePage.installingExtensionPack": "Installation d'un support supplémentaire pour {0}...",
- 	"welcomePage.extensionPackNotFound": "Le support pour {0} avec l'ID {1} est introuvable.",
-+=======
-+	"cancel": "Annuler",
-+	"ok": "OK",
-+	"welcome.title": "Bienvenue",
-+	"welcomePage": "Bienvenue",
-+	"welcomePage.installingKeymap": "Installation des {0} raccourcis clavier...",
-+>>>>>>> .their
- 	"welcomePage.keymapAlreadyInstalled": "Les raccourcis clavier {0} sont déjà installés.",
- 	"welcomePage.willReloadAfterInstallingKeymap": "La fenêtre se recharge après l'installation des raccourcis clavier {0}.",
- 	"welcomePage.installingKeymap": "Installation des raccourcis clavier de {0}...",
- 	"welcomePage.keymapNotFound": "Les raccourcis clavier {0} ayant l'ID {1} sont introuvables.",
-+<<<<<<< .our
- 	"welcome.title": "Bienvenue",
- 	"welcomePage.openFolderWithPath": "Ouvrir le dossier {0} avec le chemin {1}",
- 	"welcomePage.extensionListSeparator": ", ",
-@@ -36,4 +45,7 @@
- 	"details": "Détails",
- 	"welcomePage.buttonBackground": "Couleur d'arrière-plan des boutons de la page d'accueil.",
- 	"welcomePage.buttonHoverBackground": "Couleur d'arrière-plan du pointage des boutons de la page d'accueil."
-+=======
-+	"welcomePage.willReloadAfterInstallingKeymap": "La fenêtre se recharge après l'installation des raccourcis clavier {0}."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 aeca7d4a14df8b68ccc29ba0e77bf60623301fca i18n/ita/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
-  our    100644 1417314d6a2bdc2bf3ef010ac841b6380706b3b8 i18n/ita/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
-  their  100644 e3b56af7c75157941ecd097ce894411bb063d584 i18n/ita/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,6 +14,11 @@
- 	"rootPath": "percorso dell'Area di lavoro (ad es. /Users/Development/myWorkspace)",
- 	"folderName": "nome della cartella dell'area di lavoro in cui è contenuto il file (ad es. myFolder)",
- 	"folderPath": "percorso della cartella dell'area di lavoro in cui è contenuto il file (ad es. /Users/Development/myFolder)",
-+=======
-+	"activeEditorLong": "ad esempio /Users/Development/myProject/myFolder/myFile.txt",
-+	"activeEditorMedium": "ad esempio myFolder/myFile.txt",
-+	"activeEditorShort": "ad esempio myFile.txt",
-+>>>>>>> .their
- 	"appName": "ad esempio VS Code",
- 	"dirty": "un indicatore dirty se l'editor attivo è dirty",
- 	"separator": "un separatore condizionale (' - ') visualizzato solo se circondato da variabili con valori",
-changed in both
-  base   100644 272c95c954d811b82c48ee24ebbd1999a87c8741 i18n/ita/extensions/css/package.i18n.json
-  our    100644 5f1a325b6dad6c5a147db0e935fbba1c1aca9afa i18n/ita/extensions/css/package.i18n.json
-  their  100644 2148be667291b8a95b8a3a939e3c3aac69b3adfd i18n/ita/extensions/css/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,66 @@
- 	],
- 	"displayName": "Nozioni di base del linguaggio CSS",
- 	"description": "Offre l'evidenziazione della sintassi e la corrispondenza delle parentesi nei file CSS, LESS e SCSS."
-+=======
-+	"css.colorDecorators.enable.desc": "Abilita o disabilita gli elementi Decorator di tipo colore",
-+	"css.lint.argumentsInColorFunction.desc": "Numero di parametri non valido",
-+	"css.lint.boxModel.desc": "Non usare width o height con padding o border",
-+	"css.lint.compatibleVendorPrefixes.desc": "Quando si usa un prefisso specifico del fornitore, assicurarsi di includere anche tutte le altre proprietà specifiche del fornitore",
-+	"css.lint.duplicateProperties.desc": "Non usare definizioni di stile duplicate",
-+	"css.lint.emptyRules.desc": "Non usare set di regole vuoti",
-+	"css.lint.float.desc": "Evitare di usare 'float'. Con gli elementi float si ottiene codice CSS che causa facilmente interruzioni in caso di modifica di un aspetto del layout.",
-+	"css.lint.fontFaceProperties.desc": "La regola @font-face deve definire le proprietà 'src' e 'font-family'",
-+	"css.lint.hexColorLength.desc": "I colori esadecimali devono essere composti da tre o sei numeri esadecimali",
-+	"css.lint.idSelector.desc": "I selettori non devono contenere ID perché queste regole sono strettamente accoppiate al codice HTML.",
-+	"css.lint.ieHack.desc": "Gli hack IE sono necessari solo per il supporto di IE7 e versioni precedenti",
-+	"css.lint.importStatement.desc": "Le istruzioni Import non vengono caricate in parallelo",
-+	"css.lint.important.desc": "Evitare di usare !important perché indica che la specificità dell'intero codice CSS non è più controllabile ed è necessario effettuarne il refactoring.",
-+	"css.lint.propertyIgnoredDueToDisplay.desc": "La proprietà viene ignorata a causa della visualizzazione. Ad esempio, con 'display: inline', le proprietà width, height, margin-top, margin-bottom e float non hanno effetto",
-+	"css.lint.universalSelector.desc": "Il selettore universale (*) è notoriamente lento",
-+	"css.lint.unknownProperties.desc": "Proprietà sconosciuta.",
-+	"css.lint.unknownVendorSpecificProperties.desc": "Proprietà specifica del fornitore sconosciuta.",
-+	"css.lint.vendorPrefix.desc": "Quando si usa un prefisso specifico del fornitore, includere anche la proprietà standard",
-+	"css.lint.zeroUnits.desc": "Non è necessaria alcuna unità per lo zero",
-+	"css.validate.desc": "Abilita o disabilita tutte le convalide",
-+	"less.colorDecorators.enable.desc": "Abilita o disabilita gli elementi Decorator di tipo colore",
-+	"less.lint.argumentsInColorFunction.desc": "Numero di parametri non valido",
-+	"less.lint.boxModel.desc": "Non usare width o height con padding o border",
-+	"less.lint.compatibleVendorPrefixes.desc": "Quando si usa un prefisso specifico del fornitore, assicurarsi di includere anche tutte le altre proprietà specifiche del fornitore",
-+	"less.lint.duplicateProperties.desc": "Non usare definizioni di stile duplicate",
-+	"less.lint.emptyRules.desc": "Non usare set di regole vuoti",
-+	"less.lint.float.desc": "Evitare di usare 'float'. Con gli elementi float si ottiene codice CSS che causa facilmente interruzioni in caso di modifica di un aspetto del layout.",
-+	"less.lint.fontFaceProperties.desc": "La regola @font-face deve definire le proprietà 'src' e 'font-family'",
-+	"less.lint.hexColorLength.desc": "I colori esadecimali devono essere composti da tre o sei numeri esadecimali",
-+	"less.lint.idSelector.desc": "I selettori non devono contenere ID perché queste regole sono strettamente accoppiate al codice HTML.",
-+	"less.lint.ieHack.desc": "Gli hack IE sono necessari solo per il supporto di IE7 e versioni precedenti",
-+	"less.lint.importStatement.desc": "Le istruzioni Import non vengono caricate in parallelo",
-+	"less.lint.important.desc": "Evitare di usare !important perché indica che la specificità dell'intero codice CSS non è più controllabile ed è necessario effettuarne il refactoring.",
-+	"less.lint.propertyIgnoredDueToDisplay.desc": "La proprietà viene ignorata a causa della visualizzazione. Ad esempio, con 'display: inline', le proprietà width, height, margin-top, margin-bottom e float non hanno effetto",
-+	"less.lint.universalSelector.desc": "Il selettore universale (*) è notoriamente lento",
-+	"less.lint.unknownProperties.desc": "Proprietà sconosciuta.",
-+	"less.lint.unknownVendorSpecificProperties.desc": "Proprietà specifica del fornitore sconosciuta.",
-+	"less.lint.vendorPrefix.desc": "Quando si usa un prefisso specifico del fornitore, includere anche la proprietà standard",
-+	"less.lint.zeroUnits.desc": "Non è necessaria alcuna unità per lo zero",
-+	"less.validate.desc": "Abilita o disabilita tutte le convalide",
-+	"scss.colorDecorators.enable.desc": "Abilita o disabilita gli elementi Decorator di tipo colore",
-+	"scss.lint.argumentsInColorFunction.desc": "Numero di parametri non valido",
-+	"scss.lint.boxModel.desc": "Non usare width o height con padding o border",
-+	"scss.lint.compatibleVendorPrefixes.desc": "Quando si usa un prefisso specifico del fornitore, assicurarsi di includere anche tutte le altre proprietà specifiche del fornitore",
-+	"scss.lint.duplicateProperties.desc": "Non usare definizioni di stile duplicate",
-+	"scss.lint.emptyRules.desc": "Non usare set di regole vuoti",
-+	"scss.lint.float.desc": "Evitare di usare 'float'. Con gli elementi float si ottiene codice CSS che causa facilmente interruzioni in caso di modifica di un aspetto del layout.",
-+	"scss.lint.fontFaceProperties.desc": "La regola @font-face deve definire le proprietà 'src' e 'font-family'",
-+	"scss.lint.hexColorLength.desc": "I colori esadecimali devono essere composti da tre o sei numeri esadecimali",
-+	"scss.lint.idSelector.desc": "I selettori non devono contenere ID perché queste regole sono strettamente accoppiate al codice HTML.",
-+	"scss.lint.ieHack.desc": "Gli hack IE sono necessari solo per il supporto di IE7 e versioni precedenti",
-+	"scss.lint.importStatement.desc": "Le istruzioni Import non vengono caricate in parallelo",
-+	"scss.lint.important.desc": "Evitare di usare !important perché indica che la specificità dell'intero codice CSS non è più controllabile ed è necessario effettuarne il refactoring.",
-+	"scss.lint.propertyIgnoredDueToDisplay.desc": "La proprietà viene ignorata a causa della visualizzazione. Ad esempio, con 'display: inline', le proprietà width, height, margin-top, margin-bottom e float non hanno effetto",
-+	"scss.lint.universalSelector.desc": "Il selettore universale (*) è notoriamente lento",
-+	"scss.lint.unknownProperties.desc": "Proprietà sconosciuta.",
-+	"scss.lint.unknownVendorSpecificProperties.desc": "Proprietà specifica del fornitore sconosciuta.",
-+	"scss.lint.vendorPrefix.desc": "Quando si usa un prefisso specifico del fornitore, includere anche la proprietà standard",
-+	"scss.lint.zeroUnits.desc": "Non è necessaria alcuna unità per lo zero",
-+	"scss.validate.desc": "Abilita o disabilita tutte le convalide"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 02f004177e6de5ea5f20eb8a75779ab36ffa84d6 i18n/ita/extensions/git/out/askpass-main.i18n.json
-  their  100644 4160c1353c3c0c7ce9c39c028a2ff38f6b3d4f02 i18n/ita/extensions/git/out/askpass-main.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"missOrInvalid": "Credenziali mancanti o non valide."
- }
-\ No newline at end of file
-changed in both
-  base   100644 6920e2f5cbd9fcae0780f825ab29a1c21884bfc6 i18n/ita/extensions/git/out/commands.i18n.json
-  our    100644 b8b9f0490197b0e5904f4f035caca3a7f04c7df9 i18n/ita/extensions/git/out/commands.i18n.json
-  their  100644 6ff7beff9908ceacc00a5296a03f0ad843e5d43f i18n/ita/extensions/git/out/commands.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -49,6 +50,18 @@
- 	"commit": "Esegui il Commit comunque",
- 	"no staged changes": "Non ci sono modifiche in stage di cui eseguire il commit.\n\nSI desidera mettere in stage automaticamente tutte le modifiche ed eseguirne il commit direttamente?",
- 	"always": "Sempre",
-+=======
-+	"branch name": "Nome ramo",
-+	"clean": "Pulisci modifiche",
-+	"clean repo": "Pulire l'albero di lavoro del repository prima dell'estrazione.",
-+	"cloning": "Clonazione del repository GIT...",
-+	"commit message": "Messaggio di commit",
-+	"confirm clean": "Pulire le modifiche in {0}?",
-+	"confirm clean all": "Pulire tutte le modifiche?",
-+	"confirm revert": "Ripristinare le modifiche selezionate in {0}?",
-+	"disabled": "GIT è disabilitato oppure non supportato in quest'area di lavoro",
-+	"never again": "OK, non visualizzare più",
-+>>>>>>> .their
- 	"no changes": "Non ci sono modifiche di cui eseguire il commit.",
- 	"commit message": "Messaggio di commit",
- 	"provide commit message": "Specificare un messaggio di commit",
-@@ -73,6 +86,7 @@
- 	"nobranch": "Estrarre un ramo per eseguire il push in un elemento remoto.",
- 	"confirm publish branch": "La branch '{0}' non ha una branch corrispondente a monte. Desideri pubblicarla?",
- 	"ok": "OK",
-+<<<<<<< .our
- 	"push with tags success": "Il push con tag è riuscito.",
- 	"pick remote": "Selezionare un repository remoto in cui pubblicare il ramo '{0}':",
- 	"sync is unpredictable": "Questa azione consentirà di effettuare il push e il pull di commit da e verso '{0}/[1]'.",
-@@ -88,4 +102,18 @@
- 	"git error details": "GIT: {0}",
- 	"git error": "Errore GIT",
- 	"open git log": "Apri log GIT"
-+=======
-+	"open git log": "Apri log GIT",
-+	"openrepo": "Apri repository",
-+	"parent": "Directory padre",
-+	"pick remote": "Selezionare un repository remoto in cui pubblicare il ramo '{0}':",
-+	"proposeopen": "Aprire il repository clonato?",
-+	"provide branch name": "Specificare un nome di ramo",
-+	"provide commit message": "Specificare un messaggio di commit",
-+	"remote branch at": "Ramo remoto in {0}",
-+	"repourl": "URL del repository",
-+	"revert": "Annulla modifiche",
-+	"sync is unpredictable": "Questa azione consentirà di effettuare il push e il pull di commit da e verso '{0}'.",
-+	"tag at": "Tag in {0}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 3f14966ad88b44a91da1f933fb6e7a459c2c3f0a i18n/ita/extensions/git/out/main.i18n.json
-  our    100644 528e87d5fde6f184e54d8250c4f6f9245b1f97db i18n/ita/extensions/git/out/main.i18n.json
-  their  100644 fbc3060d6c44a74ae3db7cdebd90a27ccf9dd62f i18n/ita/extensions/git/out/main.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,4 +14,9 @@
- 	"notfound": "Git non trovato. Installarlo o configurarlo utilizzando l'impostazione 'git.path'.",
- 	"updateGit": "Aggiorna GIT",
- 	"git20": "La versione installata di GIT è la {0}. Per il corretto funzionamento di Code è consigliabile usare una versione di GIT non inferiore alla 2."
-+=======
-+	"git20": "La versione installata di GIT è la {0}. Per il corretto funzionamento di Code è consigliabile usare una versione di GIT non inferiore alla 2.",
-+	"updateGit": "Aggiorna GIT",
-+	"using git": "Uso di GIT {0} da {1}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d24293dc90deb9508a4ac7ac97ee6bee986e312d i18n/ita/extensions/git/package.i18n.json
-  our    100644 3e99eceff18f0bd1805288644f15d41ccf24de7a i18n/ita/extensions/git/package.i18n.json
-  their  100644 9a0acb845eb76ba63f0248b519a5f81e6adface3 i18n/ita/extensions/git/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -26,9 +27,17 @@
- 	"command.unstageSelectedRanges": "Annulla preparazione per il commit di intervalli selezionati",
- 	"command.clean": "Rimuovi modifiche",
- 	"command.cleanAll": "Rimuovi tutte le modifiche",
-+=======
-+	"command.branch": "Crea ramo...",
-+	"command.checkout": "Estrai in...",
-+	"command.clean": "Pulisci file",
-+	"command.cleanAll": "Pulisci tutti i file",
-+	"command.clone": "Clona",
-+>>>>>>> .their
- 	"command.commit": "Commit",
- 	"command.commitStaged": "Esegui commit dei file preparati",
- 	"command.commitStagedSigned": "Esegui commit dei file preparati (approvazione)",
-+<<<<<<< .our
- 	"command.commitStagedAmend": "Esegui commit dei file preparati (modifica)",
- 	"command.commitAll": "Esegui commit di tutto",
- 	"command.commitAllSigned": "Esegui commit di tutto (approvazione)",
-@@ -41,11 +50,18 @@
- 	"command.merge": "Merge ramo...",
- 	"command.createTag": "Crea tag",
- 	"command.fetch": "Fetch",
-+=======
-+	"command.init": "Inizializza repository",
-+	"command.openChange": "Apri modifica",
-+	"command.openFile": "Apri file",
-+	"command.publish": "Pubblica",
-+>>>>>>> .their
- 	"command.pull": "Esegui pull",
- 	"command.pullRebase": "Esegui pull (Riassegna)",
- 	"command.pullFrom": "Pull da...",
- 	"command.push": "Esegui push",
- 	"command.pushTo": "Esegui push in...",
-+<<<<<<< .our
- 	"command.pushWithTags": "Esegui push con tag",
- 	"command.sync": "Sincronizza",
- 	"command.syncRebase": "Sincronizza (Rebase)",
-@@ -59,6 +75,20 @@
- 	"config.enabled": "Indica se GIT è abilitato",
- 	"config.path": "Percorso dell'eseguibile di GIT",
- 	"config.autoRepositoryDetection": "Se i repository devono essere rilevati automaticamente",
-+=======
-+	"command.refresh": "Aggiorna",
-+	"command.revertSelectedRanges": "Ripristina intervalli selezionati",
-+	"command.showOutput": "Mostra output GIT",
-+	"command.stage": "Prepara file per commit",
-+	"command.stageAll": "Prepara tutti i file per commit",
-+	"command.stageSelectedRanges": "Prepara per il commit intervalli selezionati",
-+	"command.sync": "Sincronizza",
-+	"command.undoCommit": "Annulla ultimo commit",
-+	"command.unstage": "Annulla preparazione file per commit",
-+	"command.unstageAll": "Annulla preparazione di tutti i file per commit",
-+	"command.unstageSelectedRanges": "Annulla preparazione per il commit di intervalli selezionati",
-+	"config.autofetch": "Indica se il recupero automatico è abilitato",
-+>>>>>>> .their
- 	"config.autorefresh": "Indica se l'aggiornamento automatico è abilitato",
- 	"config.autofetch": "Indica se il recupero automatico è abilitato",
- 	"config.enableLongCommitWarning": "Indica se visualizzare un avviso in caso di messaggi di commit lunghi",
-added in both
-  our    100644 2e98125f88d268c311b2c433206611efd22caa15 i18n/ita/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
-  their  100644 a7f4367cff3adeb0f7c3a772d00ee235c30e0483 i18n/ita/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"typescript.jsDocCompletionItem.documentation": "Commento JSDoc"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8aef4f5870f1b931b728110db1b84f9e2cef9da9 i18n/ita/extensions/typescript/out/utils/projectStatus.i18n.json
-  our    100644 ad1ac2efcc745c35a0ab6d2007e54f599b762970 i18n/ita/extensions/typescript/out/utils/projectStatus.i18n.json
-  their  100644 83ffc0b5d59061bf3c44d80848d35d901e65c927 i18n/ita/extensions/typescript/out/utils/projectStatus.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,11 @@
- 	],
- 	"hintExclude": "Per abilitare le funzionalità del linguaggio JavaScript/TypeScript a livello di progetto, escludere le cartelle che contengono molti file, come {0}",
- 	"hintExclude.generic": "Per abilitare le funzionalità del linguaggio JavaScript/TypeScript a livello di progetto, escludere le cartelle di grandi dimensioni che contengono file di origine su cui non si lavora.",
-+=======
-+	"hintExclude": "Per abilitare le funzionalità del linguaggio JavaScript/TypeScript a livello di progetto, escludere le cartelle che contengono molti file, come {0}",
-+	"hintExclude.generic": "Per abilitare le funzionalità del linguaggio JavaScript/TypeScript a livello di progetto, escludere le cartelle di grandi dimensioni che contengono file di origine su cui non si lavora.",
-+	"hintExclude.tooltip": "Per abilitare le funzionalità del linguaggio JavaScript/TypeScript a livello di progetto, escludere le cartelle di grandi dimensioni che contengono file di origine su cui non si lavora.",
-+>>>>>>> .their
- 	"large.label": "Configura esclusioni",
- 	"hintExclude.tooltip": "Per abilitare le funzionalità del linguaggio JavaScript/TypeScript a livello di progetto, escludere le cartelle di grandi dimensioni che contengono file di origine su cui non si lavora."
- }
-\ No newline at end of file
-changed in both
-  base   100644 0d71b067b63c3ca33e41aaffd7e6a4599008901a i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 f91d8d15e9f7c53e3b2a0166aab270c9bf1f772e i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 3d7e7dc0f055a0e49afc42b4f1bccdcc4e01ab46 i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,11 +7,22 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"acceptSuggestionOnCommitCharacter": "Controlla se accettare i suggerimenti con i caratteri di commit. Ad esempio, in JavaScript il punto e virgola (';') può essere un carattere di commit che accetta un suggerimento e digita tale carattere.",
-+	"acceptSuggestionOnEnter": "Controlla se i suggerimenti devono essere accettati con 'INVIO' in aggiunta a 'TAB'. In questo modo è possibile evitare ambiguità tra l'inserimento di nuove righe e l'accettazione di suggerimenti.",
-+	"autoClosingBrackets": "Controlla se l'editor deve chiudere automaticamente le parentesi quadre dopo che sono state aperte",
-+	"codeLens": "Controlla se nell'editor sono visualizzate le finestre di CodeLens",
-+	"cursorBlinking": "Controlla lo stile di animazione del cursore. I valori possibili sono: 'blink', 'smooth', 'phase', 'expand' e 'solid'",
-+	"cursorStyle": "Controlla lo stile del cursore. I valori accettati sono 'block', 'block-outline', 'line', 'line-thin', 'underline' e 'underline-thin'",
-+	"detectIndentation": "All'apertura di un file, `editor.tabSize` e `editor.insertSpaces` verranno rilevati in base al contenuto del file.",
-+	"dragAndDrop": "Controlla se l'editor consentire lo spostamento di selezioni tramite trascinamento della selezione.",
-+>>>>>>> .their
- 	"editorConfigurationTitle": "Editor",
- 	"fontFamily": "Controlla la famiglia di caratteri.",
- 	"fontWeight": "Controlla lo spessore del carattere.",
- 	"fontSize": "Controlla le dimensioni del carattere in pixel.",
- 	"lineHeight": "Controlla l'altezza della riga. Usare 0 per calcolare l'altezza della riga dalle dimensioni del carattere.",
-+<<<<<<< .our
- 	"letterSpacing": "Controlla la spaziatura tra le lettere in pixel.",
- 	"lineNumbers.off": "I numeri di riga non vengono visualizzati.",
- 	"lineNumbers.on": "I numeri di riga vengono visualizzati come numeri assoluti.",
-@@ -43,6 +55,13 @@
- 	"wordWrap": "Controlla il wrapping delle righe. Valori possibili:\n - 'off' (disabilita il wrapping),\n - 'on' (wrapping del viewport),\n - 'wordWrapColumn' (esegue il wrapping alla posizione corrispondente a `editor.wordWrapColumn`) o\n - 'bounded' (esegue il wrapping alla posizione minima del viewport e di `editor.wordWrapColumn`).",
- 	"wordWrapColumn": "Controlla la colonna di wrapping dell'editor quando il valore di `editor.wordWrap` è 'wordWrapColumn' o 'bounded'.",
- 	"wrappingIndent": "Controlla il rientro delle righe con ritorno a capo. Può essere uno dei valori seguenti: 'none', 'same', 'indent' o 'deepIndent'.",
-+=======
-+	"lineNumbers": "Consente di controllare la visualizzazione dei numeri di riga. I valori possibili sono 'on', 'off' e 'relative'. Con 'relative' viene visualizzato il conteggio delle righe a partire dalla posizione corrente del cursore.",
-+	"matchBrackets": "Evidenzia le parentesi corrispondenti quando se ne seleziona una.",
-+	"minimap.enabled": "Controlla se la mini mappa è visualizzata",
-+	"minimap.maxColumn": "Limita la larghezza della mini mappa in modo da eseguire il rendering al massimo di un certo numero di colonne",
-+	"minimap.renderCharacters": "Esegue il rendering dei caratteri effettivi di una riga (in contrapposizione ai blocchi colore)",
-+>>>>>>> .their
- 	"mouseWheelScrollSensitivity": "Moltiplicatore da usare sui valori `deltaX` e `deltaY` degli eventi di scorrimento della rotellina del mouse",
- 	"multiCursorModifier.ctrlCmd": "Rappresenta il tasto 'Control' (ctrl) su Windows e Linux e il tasto 'Comando' (cmd) su OSX.",
- 	"multiCursorModifier.alt": "Rappresenta il tasto 'Alt' su Windows e Linux e il tasto 'Opzione' su OSX.",
-@@ -112,7 +131,28 @@
- 	"codeActionsOnSaveTimeout": "Timeout per le azioni codice eseguite durante il salvataggio.",
- 	"selectionClipboard": "Controlla se gli appunti primari di Linux devono essere supportati.",
- 	"sideBySide": "Controlla se l'editor diff mostra le differenze affiancate o incorporate",
-+<<<<<<< .our
- 	"ignoreTrimWhitespace": "Controlla se l'editor diff mostra come differenze le modifiche relative a spazi vuoti iniziali e finali",
- 	"largeFileOptimizations": "Gestione speciale dei file di grandi dimensioni per disabilitare alcune funzionalità che fanno un uso intensivo della memoria.",
- 	"renderIndicators": "Consente di controllare se l'editor diff mostra gli indicatori +/- per le modifiche aggiunte/rimosse"
-+=======
-+	"snippetSuggestions": "Controlla se i frammenti di codice sono visualizzati con altri suggerimenti e il modo in cui sono ordinati.",
-+	"stablePeek": "Mantiene aperti gli editor rapidi anche quando si fa doppio clic sul contenuto o si preme ESC.",
-+	"suggestFontSize": "Dimensioni del carattere per il widget dei suggerimenti",
-+	"suggestLineHeight": "Altezza della riga per il widget dei suggerimenti",
-+	"suggestOnTriggerCharacters": "Controlla se i suggerimenti devono essere visualizzati automaticamente durante la digitazione dei caratteri trigger",
-+	"tabSize": "Numero di spazi a cui equivale una tabulazione. Quando `editor.detectIndentation` è attivo, questa impostazione viene sostituita in base al contenuto del file.",
-+	"tabSize.errorMessage": "È previsto 'number'. Nota: il valore \"auto\" è stato sostituito dall'impostazione `editor.detectIndentation`.",
-+	"trimAutoWhitespace": "Rimuovi lo spazio vuoto finale inserito automaticamente",
-+	"useTabStops": "Inserimento ed eliminazione dello spazio vuoto dopo le tabulazioni",
-+	"wordBasedSuggestions": "Abilita i suggerimenti basati su parole.",
-+	"wordSeparators": "Caratteri che verranno usati come separatori di parola quando si eseguono operazioni o spostamenti correlati a parole",
-+	"wordWrap": "Controlla il wrapping delle righe. Valori possibili:\n - 'off' (disabilita il wrapping),\n - 'on' (wrapping del viewport),\n - 'wordWrapColumn' (esegue il wrapping alla posizione corrispondente a `editor.wordWrapColumn`) o\n - 'bounded' (esegue il wrapping alla posizione minima del viewport e di `editor.wordWrapColumn`).",
-+	"wordWrap.bounded": "Verrà eseguito il wrapping delle righe alla posizione minima del viewport e di `editor.wordWrapColumn`.",
-+	"wordWrap.off": "Il wrapping delle righe non viene eseguito.",
-+	"wordWrap.on": "Verrà eseguito il wrapping delle righe in base alla larghezza del viewport.",
-+	"wordWrap.wordWrapColumn": "Verrà eseguito il wrapping delle righe alla posizione corrispondente a `editor.wordWrapColumn`.",
-+	"wordWrapColumn": "Controlla la colonna di wrapping dell'editor quando il valore di `editor.wordWrap` è 'wordWrapColumn' o 'bounded'.",
-+	"wrappingIndent": "Controlla il rientro delle righe con ritorno a capo. Può essere uno dei valori seguenti: 'none', 'same' o 'indent'."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6ca7a2392b7d9122910b73f535fef226b41c5cbb i18n/ita/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
-  our    100644 13ee2830e0bf97e9df24e9b593e2108a9d648760 i18n/ita/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
-  their  100644 903542366b3ff06550ad7cff69dd42b24d8ce41e i18n/ita/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
-@@ -20,5 +20,13 @@
- 	"meta.typeDefinitions.title": " - {0} definizioni di tipo",
- 	"actions.goToTypeDefinition.label": "Vai alla definizione di tipo",
- 	"actions.peekTypeDefinition.label": "Anteprima definizione di tipo",
-+<<<<<<< .our
- 	"multipleResults": "Fare clic per visualizzare {0} definizioni."
-+=======
-+	"actions.previewDecl.label": "Visualizza la definizione",
-+	"generic.noResults": "Non è stata trovata alcuna definizione",
-+	"meta.title": " - Definizioni di {0}",
-+	"multipleResults": "Fare clic per visualizzare {0} definizioni.",
-+	"noResultWord": "Non è stata trovata alcuna definizione per '{0}'"
-+>>>>>>> .their
- }
-\ No newline at end of file
-removed in local
-  base   100644 1374817fc56e42b08f50ef49fa1adf3c56e4517b i18n/ita/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
-  their  100644 5f62ecddd4ee4ae3cbb28d7424cfdc7c034685f1 i18n/ita/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/ita/src/vs/workbench/electron-browser/commands.i18n.json
-  our    100644 983899514ca518324d9e85f57712db39d3040bbe i18n/ita/src/vs/workbench/electron-browser/commands.i18n.json
-  their  100644 3a1051dcfdad7ec7db70524f0a31f277885230df i18n/ita/src/vs/workbench/electron-browser/commands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"diffLeftRightLabel": "{0} ⟷ {1}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 61a3cdb3670ebf5654786b78e6d0f5852b4af002 i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 16fec1a5d98f225249a95297ad06c45ba75efafc i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 dc7b14ad027bc255231bb6f35153ffbd7679fc37 i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -34,6 +34,7 @@
- 	"sideBarLocation": "Controlla la posizione della barra laterale. Può essere visualizzata a sinistra o a destra del workbench.",
- 	"panelDefaultLocation": "Controlla la posizione predefinita del pannello. Può essere mostrato nella parte inferiore o a destra del banco di lavoro.",
- 	"statusBarVisibility": "Controlla la visibilità della barra di stato nella parte inferiore del workbench.",
-+<<<<<<< .our
- 	"activityBarVisibility": "Controlla la visibilità della barra attività nel workbench.",
- 	"viewVisibility": "Controlla la visibilità delle azioni dell'intestazione della visualizzazione. Le azioni dell'intestazione della visualizzazione possono essere sempre visibili oppure visibili solo quando lo stato attivo è spostato sulla visualizzazione o si passa con il puntatore sulla visualizzazione.",
- 	"fontAliasing": "Controlla il metodo di aliasing dei caratteri nell'area di lavoro.\n- default: anti-aliasing dei caratteri a livello di sub-pixel. Nella maggior parte delle visualizzazioni non retina consentirà di ottenere un testo con il massimo contrasto.\n- antialiased: anti-aliasing dei caratteri a livello di pixel, invece che a livello di sub-pixel. Consente di visualizzare i caratteri più chiari.\n- none: disabilita l'anti-aliasing dei caratteri. Il testo verrà visualizzato con contorni irregolari.\n- auto: applica automaticamente `default` o `antialiased` in base al valore DPI degli schermi.",
-@@ -42,6 +43,28 @@
- 	"workbench.fontAliasing.none": "Disabilita l'anti-aliasing dei caratteri. Il testo verrà visualizzato con contorni irregolari. ",
- 	"workbench.fontAliasing.auto": "Applica automaticamente `default` o `antialiased` in base al valore DPI degli schermi.",
- 	"enableNaturalLanguageSettingsSearch": "Controlla se abilitare la modalità di ricerca in linguaggio naturale per le impostazioni.",
-+=======
-+	"title": "Controlla il titolo della finestra in base all'editor attivo. Le variabili vengono sostituite a seconda del contesto:\n${activeEditorShort}: ad esempio myFile.txt\n${activeEditorMedium}: ad esempio myFolder/myFile.txt\n${activeEditorLong}: ad esempio /Users/Development/myProject/myFolder/myFile.txt\n${rootName}: ad esempio myProject\n${rootPath}: ad esempio /Users/Development/myProject\n${appName}: ad esempio VS Code\n${dirty}: un indicatore dirty se l'editor attivo è dirty\n${separator}: un separatore condizionale (\" - \") visualizzato solo se circondato da variabili con valori",
-+	"titleBarStyle": "Consente di modificare l'aspetto della barra del titolo della finestra. Per applicare le modifiche, è necessario un riavvio completo.",
-+	"view": "Visualizza",
-+	"window.menuBarVisibility.default": "Il menu è nascosto solo nella modalità a schermo intero.",
-+	"window.menuBarVisibility.hidden": "Il menu è sempre nascosto.",
-+	"window.menuBarVisibility.toggle": "Il menu è nascosto ma può essere visualizzato premendo ALT.",
-+	"window.menuBarVisibility.visible": "Il menu è sempre visibile, anche nella modalità a schermo intero.",
-+	"window.newWindowDimensions.default": "Apre nuove finestre al centro della schermata.",
-+	"window.newWindowDimensions.fullscreen": "Apre nuove finestre nella modalità a schermo intero.",
-+	"window.newWindowDimensions.inherit": "Apre nuove finestre le cui dimensioni sono uguali a quelle dell'ultima finestra attiva.",
-+	"window.newWindowDimensions.maximized": "Apre nuove finestre ingrandite a schermo intero.",
-+	"window.openFilesInNewWindow.default": "I file verranno aperti nella finestra con la cartella dei file aperta o nell'ultima finestra attiva a meno che non vengano aperti tramite il pannello Dock o da Finder (solo MacOS)",
-+	"window.openFilesInNewWindow.off": "I file verranno aperti nella finestra con la cartella dei file aperta o nell'ultima finestra attiva",
-+	"window.openFilesInNewWindow.on": "I file verranno aperti in una nuova finestra",
-+	"window.openFoldersInNewWindow.default": "Le cartelle verranno aperte in una nuova finestra a meno che non si selezioni una cartella dall'interno dell'applicazione, ad esempio tramite il menu File",
-+	"window.openFoldersInNewWindow.off": "Le cartelle sostituiranno l'ultima finestra attiva",
-+	"window.openFoldersInNewWindow.on": "Le cartelle verranno aperte in una nuova finestra",
-+	"window.reopenFolders.all": "Riapre tutte le cartelle dell'ultima sessione.",
-+	"window.reopenFolders.none": "Non apre nessuna cartella.",
-+	"window.reopenFolders.one": "Riapre l'ultima cartella attiva.",
-+>>>>>>> .their
- 	"windowConfigurationTitle": "Finestra",
- 	"window.openFilesInNewWindow.on": "I file verranno aperti in una nuova finestra",
- 	"window.openFilesInNewWindow.off": "I file verranno aperti nella finestra con la cartella dei file aperta o nell'ultima finestra attiva",
-added in both
-  our    100644 175428dc84821e3b7c3c4498ea86d17d4923f072 i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
-  their  100644 8ab960273a9f5832485b1e907a61f165b21db963 i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,6 +9,16 @@
- 	],
- 	"wordWrapMigration.ok": "OK",
- 	"wordWrapMigration.dontShowAgain": "Non visualizzare più questo messaggio",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"wordWrapMigration.dontShowAgain": "Non visualizzare più questo messaggio",
-+	"wordWrapMigration.ok": "OK",
-+>>>>>>> .their
- 	"wordWrapMigration.openSettings": "Apri impostazioni",
- 	"wordWrapMigration.prompt": "L'impostazione `editor.wrappingColumn` è stata deprecata e sostituita da `editor.wordWrap`."
- }
-\ No newline at end of file
-changed in both
-  base   100644 b9774c799ab1ed8476a069d50dd157f23ffe9440 i18n/ita/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-  our    100644 f7b613949dc94479b22404933032cfe5dd1f13c4 i18n/ita/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-  their  100644 8c029608d1466d4fd5398b641b9467db03edbc49 i18n/ita/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-@@ -41,7 +41,34 @@
- 	"debugConsoleAction": "Console di debug",
- 	"unreadOutput": "Nuovo output nella console di debug",
- 	"debugFocusConsole": "Console di debug stato attivo",
-+<<<<<<< .our
- 	"focusSession": "Sposta stato attivo su sessione",
-+=======
-+	"disableAllBreakpoints": "Disabilita tutti i punti di interruzione",
-+	"disableBreakpoint": "Disabilita punto di interruzione",
-+	"disconnectDebug": "Disconnetti",
-+	"editConditionalBreakpoint": "Modifica punto di interruzione...",
-+	"enableAllBreakpoints": "Abilita tutti i punti di interruzione",
-+	"enableBreakpoint": "Abilita punto di interruzione",
-+	"focusProcess": "Sposta stato attivo su processo",
-+	"launchJsonNeedsConfigurtion": "Configurare o correggere 'launch.json'",
-+	"openLaunchJson": "Apri {0}",
-+	"pauseDebug": "Sospendi",
-+	"reapplyAllBreakpoints": "Riapplica tutti i punti di interruzione",
-+	"reconnectDebug": "Riconnetti",
-+	"removeAllBreakpoints": "Rimuovi tutti i punti di interruzione",
-+	"removeAllWatchExpressions": "Rimuovi tutte le espressioni",
-+	"removeBreakpoint": "Rimuovi punto di interruzione",
-+	"removeWatchExpression": "Rimuovi espressione",
-+	"renameFunctionBreakpoint": "Rinomina punto di interruzione della funzione",
-+	"restartDebug": "Riavvia",
-+	"restartFrame": "Riavvia frame",
-+	"reverseContinue": "Inverti",
-+	"selectAndStartDebugging": "Seleziona e avvia il debug",
-+	"setValue": "Imposta valore",
-+	"startDebug": "Avvia debug",
-+	"startWithoutDebugging": "Avvia senza eseguire debug",
-+>>>>>>> .their
- 	"stepBackDebug": "Torna indietro",
- 	"reverseContinue": "Inverti"
- }
-\ No newline at end of file
-added in both
-  our    100644 6adb78a2250de336a3c87f1e313651415ada1de6 i18n/ita/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
-  their  100644 e944499eb9c4674e1b66b395a9c3203cd57700e1 i18n/ita/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -12,4 +13,16 @@
- 	"addConfiguration": "Aggiungi configurazione...",
- 	"noConfigurationsMatching": "Non esistono configurazioni di debug corrispondenti",
- 	"noConfigurationsFound": "Non è stata trovata alcuna configurazione di debug. Creare un file 'launch.json'."
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"debugAriaLabel": "Digitare il nome di una configurazione di avvio da eseguire.",
-+	"entryAriaLabel": "{0}, debug",
-+	"noConfigurationsFound": "Non è stata trovata alcuna configurazione di debug. Creare un file 'launch.json'.",
-+	"noConfigurationsMatching": "Non esistono configurazioni di debug corrispondenti"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 8ce4aa5db1390f1bb9ec69cb0a6816a852ddfa61 i18n/ita/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
-  their  100644 e10aea771267cfc3d4994072d3839974fb5f7d83 i18n/ita/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,5 +10,13 @@
- 	"debugExceptionWidgetBorder": "Colore del bordo del widget Eccezione.",
- 	"debugExceptionWidgetBackground": "Colore di sfondo del widget Eccezione.",
- 	"exceptionThrownWithId": "Si è verificata un'eccezione: {0}",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"exceptionThrown": "Si è verificata un'eccezione"
- }
-\ No newline at end of file
-changed in both
-  base   100644 ce8b07347a2209797e5348d5479e179888b54d6e i18n/ita/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  our    100644 6b44ed029fe95ee65797c44b98a611e088a91461 i18n/ita/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  their  100644 be4ec0ee9a7482433d161bd9e57bbfcb0dd463b7 i18n/ita/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-changed in both
-  base   100644 d836b1daaad188378e642f922cd2d624fc287387 i18n/ita/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  our    100644 3a9023e46622e84a42ee4a7ab34aa864b1ec0e8e i18n/ita/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  their  100644 a0cdd73da98ca715f743c830ab9a006c0657ae65 i18n/ita/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-@@ -8,6 +8,20 @@
- 	],
- 	"debugAdapterBinNotFound": "Il file eseguibile '{0}' dell'adattatore di debug non esiste.",
- 	"debugAdapterCannotDetermineExecutable": "Non è possibile determinare il file eseguibile per l'adattatore di debug '{0}'.",
-+<<<<<<< .our
- 	"unableToLaunchDebugAdapter": "Non è possibile avviare l'adattatore di debug da '{0}'.",
- 	"unableToLaunchDebugAdapterNoArgs": "Non è possibile avviare l'adattatore di debug."
-+=======
-+	"debugLinuxConfiguration": "Attributi della configurazione di avvio specifici di Linux.",
-+	"debugName": "Nome della configurazione. Viene visualizzato nel menu a discesa della configurazione di avvio.",
-+	"debugOSXConfiguration": "Attributi della configurazione di avvio specifici di OS X.",
-+	"debugPrelaunchTask": "Attività da eseguire prima dell'avvio della sessione di debug.",
-+	"debugRequest": "Tipo della richiesta di configurazione. Può essere \"launch\" o \"attach\".",
-+	"debugServer": "Solo per lo sviluppo dell'estensione di debug: se si specifica una porta, Visual Studio Code prova a connettersi a un adattatore di debug in esecuzione in modalità server",
-+	"debugType": "Tipo di configurazione.",
-+	"debugWindowsConfiguration": "Attributi della configurazione di avvio specifici di Windows.",
-+	"deprecatedVariables": "'env.', 'config.' e 'command.' sono deprecati. In alternativa, usare 'env:', 'config:' e 'command:'.",
-+	"internalConsoleOptions": "Controlla il comportamento della console di debug interna.",
-+	"node2NotSupported": "\"node2\" non è più supportato. In alternativa, usare \"node\" e impostare l'attributo \"protocol\" su \"inspector\"."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 03acbba49a0e67917bf904988d9b06fb31633ff5 i18n/ita/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 1f2167be7be1086956a1ada80d0c4b23b8cc1195 i18n/ita/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 eb2b8c585fb2c26ea51de8953c56fdd360f529e8 i18n/ita/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-@@ -4,6 +4,7 @@
-  *--------------------------------------------------------------------------------------------*/
- // Do not edit this file. It is machine generated.
- {
-+<<<<<<< .our
- 	"showExplorerViewlet": "Mostra Esplora risorse",
- 	"explore": "Esplora risorse",
- 	"view": "Visualizza",
-@@ -11,6 +12,25 @@
- 	"binaryFileEditor": "Editor file binari",
- 	"filesConfigurationTitle": "File",
- 	"exclude": "Consente di configurare i criteri GLOB per escludere file e cartelle. Ad esempio, la funzionalità Esplora file stabilisce quali file e cartelle mostrare o nascondere in base a questa impostazione.",
-+=======
-+	"associations": "Consente di configurare le associazioni tra file e linguaggi, ad esempio '*.extension': 'html'. Queste hanno la precedenza sulle associazioni predefinite dei linguaggi installate.",
-+	"autoReveal": "Controlla se Esplora risorse deve rivelare automaticamente e selezionare i file durante l'apertura.",
-+	"autoSave": "Controlla il salvataggio automatico dei file dirty. Valori accettati: '{0}', '{1}', '{2}' (l'editor perde lo stato attivo), '{3}' (la finestra perde lo stato attivo). Se è impostato su '{4}', è possibile configurare il ritardo in 'files.autoSaveDelay'.",
-+	"autoSaveDelay": "Controlla il ritardo in ms dopo il quale un file dirty viene salvato automaticamente. Si applica solo quando 'files.autoSave' è impostato su '{0}'",
-+	"binaryFileEditor": "Editor file binari",
-+	"dynamicHeight": "Controlla se l'altezza della sezione degli editor aperti deve essere adattata o meno dinamicamente al numero di elementi.",
-+	"editorConfigurationTitle": "Editor",
-+	"enableDragAndDrop": "Controlla se Esplora risorse deve consentire lo spostamento di file e cartelle tramite trascinamento della selezione.",
-+	"encoding": "Codifica del set di caratteri predefinita da usare durante la lettura e la scrittura di file.",
-+	"eol": "Carattere di fine riga predefinito.",
-+	"exclude": "Consente di configurare i criteri di ricerca GLOB per escludere file e cartelle.",
-+	"explore": "Esplora risorse",
-+	"explorerConfigurationTitle": "Esplora file",
-+	"files.autoSave.afterDelay": "Un file dirty viene salvato automaticamente in base al valore configurato di 'files.autoSaveDelay'.",
-+	"files.autoSave.off": "Un file dirty non viene mai salvato automaticamente.",
-+	"files.autoSave.onFocusChange": "Un file dirty viene salvato automaticamente quando l'editor perde lo stato attivo.",
-+	"files.autoSave.onWindowChange": "Un file dirty viene salvato automaticamente quando la finestra perde lo stato attivo.",
-+>>>>>>> .their
- 	"files.exclude.boolean": "Criterio GLOB da usare per trovare percorsi file. Impostare su True o False per abilitare o disabilitare il criterio.",
- 	"files.exclude.when": "Controllo aggiuntivo sugli elementi di pari livello di un file corrispondente. Usare $(basename) come variabile del nome file corrispondente.",
- 	"associations": "Consente di configurare le associazioni tra file e linguaggi, ad esempio \"*.extension\": \"html\". Queste hanno la precedenza sulle associazioni predefinite dei linguaggi installate.",
-added in both
-  our    100644 cd9b550b98abaa3fe7d5a9ca74c5a45596046b3e i18n/ita/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/ita/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
-@@ -3,6 +3,7 @@
-  *  Licensed under the MIT License. See License.txt in the project root for license information.
-  *--------------------------------------------------------------------------------------------*/
- // Do not edit this file. It is machine generated.
-+<<<<<<< .our
- {
- 	"vscode.extension.contributes.snippets": "Frammenti per contributes.",
- 	"vscode.extension.contributes.snippets-language": "Identificatore di linguaggio per cui si aggiunge come contributo questo frammento.",
-@@ -11,4 +12,7 @@
- 	"invalid.path.0": "È previsto un valore stringa in `contributes.{0}.path`. Valore specificato: {1}",
- 	"invalid.path.1": "Valore previsto di `contributes.{0}.path` ({1}) da includere nella cartella dell'estensione ({2}). L'estensione potrebbe non essere più portatile.",
- 	"badVariableUse": "Il frammento \"{0}\" molto probabilmente confonde variabili-frammento con segnaposti-frammento. Vedere https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax per ulteriori dettagli."
--}
-\ No newline at end of file
-+}
-+=======
-+{}
-+>>>>>>> .their
-added in both
-  our    100644 edd900079157f5d78c939b7b97126a7a1148d0e9 i18n/ita/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
-  their  100644 f501a03d135673e4e6f45658a82296e4650ce63e i18n/ita/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,4 +10,13 @@
- 	"snippet.suggestions.label": "Inserisci frammento",
- 	"sep.userSnippet": "Frammenti utente",
- 	"sep.extSnippet": "Frammenti estensione"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"snippet.suggestions.label": "Inserisci frammento"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 c878d5c9380cb8bf8f1d7f22ef4111b700bf8888 i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 eefed0e4d58d81161889f00697ee64b3ab90a942 i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -16,5 +17,13 @@
- 	"badVariableUse": "Uno o più frammenti dall'estensione '{0}' confondono molto probabilmente variabili-frammento e segnaposto-frammento (Vedere https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax per maggiori dettagli)",
- 	"badFile": "Non è stato possibile leggere il file di frammento \"{0}\".",
- 	"detail.snippet": "{0} ({1})",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"snippetSuggest.longLabel": "{0}, {1}"
- }
-\ No newline at end of file
-added in both
-  our    100644 7965a1ffcd8b63eb79eb92690da4b35b98d667fe i18n/ita/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
-  their  100644 5ebb0b85ade97f7ef40cfc7cffaa82e7f897834f i18n/ita/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"tabCompletion": "Inserisce frammenti di codice quando il prefisso corrisponde. Funziona in modo ottimale quando non sono abilitati i suggerimenti rapidi."
- }
-\ No newline at end of file
-changed in both
-  base   100644 5be35d178919666bb155056afe2378140d93626f i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 9af26b9889eaa5fa492c1556e3e5203a1ebacbf4 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 72d75851e9e00ca294c7221f8c3357465893b191 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -7,6 +8,14 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"workbench.action.terminal.toggleTerminal": "Attiva/Disattiva terminale integrato",
-+=======
-+	"workbench.action.terminal.clear": "Cancella",
-+	"workbench.action.terminal.copySelection": "Copia selezione",
-+	"workbench.action.terminal.focus": "Sposta stato attivo su terminale",
-+	"workbench.action.terminal.focusAtIndex": "Sposta stato attivo su terminale {0}",
-+	"workbench.action.terminal.focusNext": "Sposta stato attivo su terminale successivo",
-+	"workbench.action.terminal.focusPrevious": "Sposta stato attivo su terminale precedente",
-+>>>>>>> .their
- 	"workbench.action.terminal.kill": "Termina istanza attiva del terminale",
- 	"workbench.action.terminal.kill.short": "Termina il terminale",
- 	"workbench.action.terminal.quickKill": "Termina istanza del terminale",
-added in both
-  our    100644 4042bb544ec621f03590cdd507b7e33f55392950 i18n/ita/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  their  100644 d1b977c3f8f9d6aa8a4126b71fe22b25eabb63dc i18n/ita/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -39,4 +40,48 @@
- 	"welcomePage.interfaceOverviewDescription": "Immagine in sovrimpressione che evidenzia i principali componenti dell'interfaccia utente",
- 	"welcomePage.interactivePlayground": "Playground interattivo",
- 	"welcomePage.interactivePlaygroundDescription": "Breve panoramica delle funzionalità essenziali dell'editor"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"welcomePage.atom": "Atom",
-+	"welcomePage.atomCurrent": "Atom (corrente)",
-+	"welcomePage.cloneGitRepository": "Clona repository GIT...",
-+	"welcomePage.colorTheme": "Tema colori",
-+	"welcomePage.colorThemeDescription": "Tutto quel che serve per configurare editor e codice nel modo desiderato",
-+	"welcomePage.configureSettings": "Configura le impostazioni",
-+	"welcomePage.configureSettingsDescription": "Perfeziona le impostazioni per sfruttare appieno tutta la potenza di Visual Studio Code",
-+	"welcomePage.editingEvolved": "Evoluzione dell'editor",
-+	"welcomePage.gitHubRepository": "Repository GitHub",
-+	"welcomePage.help": "Guida",
-+	"welcomePage.installKeymap": "Installa i tasti di scelta rapida di {0}, {1}, {2} e {3}",
-+	"welcomePage.installKeymapDescription": "Installa i tasti di scelta rapida",
-+	"welcomePage.interactivePlayground": "Playground interattivo",
-+	"welcomePage.interactivePlaygroundDescription": "Breve panoramica delle funzionalità essenziali dell'editor",
-+	"welcomePage.interfaceOverview": "Panoramica dell'interfaccia",
-+	"welcomePage.interfaceOverviewDescription": "Immagine in sovrimpressione che evidenzia i principali componenti dell'interfaccia utente",
-+	"welcomePage.introductoryVideos": "Video introduttivi",
-+	"welcomePage.keybindingsReference": "Riferimento per tasti di scelta rapida",
-+	"welcomePage.keybindingsReferenceDescription": "PDF stampabile con i tasti di scelta rapida più comuni",
-+	"welcomePage.newFile": "Nuovo file",
-+	"welcomePage.noRecentFolders": "Non ci sono cartelle recenti",
-+	"welcomePage.openFolder": "Apri cartella...",
-+	"welcomePage.others": "altri",
-+	"welcomePage.productDocumentation": "Documentazione del prodotto",
-+	"welcomePage.quickLinks": "Collegamenti rapidi",
-+	"welcomePage.recent": "Recenti",
-+	"welcomePage.showCommands": "Trova ed esegui tutti i comandi",
-+	"welcomePage.showCommandsDescription": "Accesso e ricerca rapida di comandi dal pannello di controllo ({0})",
-+	"welcomePage.showOnStartup": "Mostra la pagina iniziale all'avvio",
-+	"welcomePage.stackOverflow": "Overflow dello stack",
-+	"welcomePage.start": "Avvia",
-+	"welcomePage.sublime": "Sublime",
-+	"welcomePage.sublimeCurrent": "Sublime (corrente)",
-+	"welcomePage.vim": "Vim",
-+	"welcomePage.vimCurrent": "Vim (corrente)",
-+	"welcomePage.vscode": "Visual Studio Code"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 fb7db53b2d00a01e25ebbb496cd1442ab651c639 i18n/ita/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-  our    100644 b638ceb72cd3fb4123e52da2c2b721506664c117 i18n/ita/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-  their  100644 5bbdd1e0a41b908e66e2d875eee09714acde31dc i18n/ita/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -21,10 +22,18 @@
- 	"welcomePage.willReloadAfterInstallingExtensionPack": "La finestra verrà ricaricata dopo l'installazione di supporto aggiuntivo per {0}.",
- 	"welcomePage.installingExtensionPack": "Installazione di supporto aggiuntivo per {0} in corso...",
- 	"welcomePage.extensionPackNotFound": "Il supporto per {0} con ID {1} non è stato trovato.",
-+=======
-+	"cancel": "Annulla",
-+	"ok": "OK",
-+	"welcome.title": "Benvenuti",
-+	"welcomePage": "Benvenuti",
-+	"welcomePage.installingKeymap": "Installazione dei tasti di scelta rapida di {0}...",
-+>>>>>>> .their
- 	"welcomePage.keymapAlreadyInstalled": "I tasti di scelta rapida di {0} sono già installati.",
- 	"welcomePage.willReloadAfterInstallingKeymap": "La finestra verrà ricaricata dopo l'installazione dei tasti di scelta rapida di {0}.",
- 	"welcomePage.installingKeymap": "Installazione dei tasti di scelta rapida di {0}...",
- 	"welcomePage.keymapNotFound": "I tasti di scelta rapida di {0} con ID {1} non sono stati trovati.",
-+<<<<<<< .our
- 	"welcome.title": "Benvenuti",
- 	"welcomePage.openFolderWithPath": "Apri la cartella {0} con percorso {1}",
- 	"welcomePage.extensionListSeparator": ",",
-@@ -36,4 +45,7 @@
- 	"details": "Dettagli",
- 	"welcomePage.buttonBackground": "Colore di sfondo dei pulsanti nella pagina di benvenuto.",
- 	"welcomePage.buttonHoverBackground": "Colore di sfondo al passaggio del mouse dei pulsanti nella pagina di benvenuto."
-+=======
-+	"welcomePage.willReloadAfterInstallingKeymap": "La finestra verrà ricaricata dopo l'installazione dei tasti di scelta rapida di {0}."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 99f22556fa85b70bf453a17ef9a5eeaa0a7b04b1 i18n/jpn/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
-  our    100644 e71ba067641ea2202f8bbf4473a591865dfa618b i18n/jpn/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
-  their  100644 8d08dd55da20b1a2e2d5afacbb43b87c9e0e8d28 i18n/jpn/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,6 +14,11 @@
- 	"rootPath": "ワークスペースのファイル パス (例: /Users/Development/myWorkspace)",
- 	"folderName": "ファイルが含まれているワークスペース フォルダーの名前 (例: myFolder)",
- 	"folderPath": "ファイルが含まれているワークスペース フォルダーのファイル パス (例: /Users/Development/myFolder)",
-+=======
-+	"activeEditorLong": "例: /Users/Development/myProject/myFolder/myFile.txt",
-+	"activeEditorMedium": "例: myFolder/myFile.txt",
-+	"activeEditorShort": "例: myFile.txt",
-+>>>>>>> .their
- 	"appName": "例: VS Code",
- 	"dirty": "アクティブなエディターがダーティである場合のダーティ インジケーター",
- 	"separator": "値のある変数で囲まれた場合にのみ表示される条件付き区切り記号 (' - ')",
-changed in both
-  base   100644 c5ad6cddd1302cb14f7663bf72bc1c52df20f3f9 i18n/jpn/extensions/css/package.i18n.json
-  our    100644 afbe11a31b688e3d20e90f7c0034dcf3b0256eba i18n/jpn/extensions/css/package.i18n.json
-  their  100644 05720c99de81ef871af4a31559d852b00d6f60f0 i18n/jpn/extensions/css/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,66 @@
- 	],
- 	"displayName": "CSS の基本言語サポート",
- 	"description": "CSS、LESS、SCSS ファイル内で構文ハイライト、かっこ一致を提供します。"
-+=======
-+	"css.colorDecorators.enable.desc": "カラー デコレーターを有効または無効にします",
-+	"css.lint.argumentsInColorFunction.desc": "正しくないパラメーターの数",
-+	"css.lint.boxModel.desc": "パディングまたは枠線を使用する場合は幅または高さを使用しないでください",
-+	"css.lint.compatibleVendorPrefixes.desc": "ベンダー固有のプレフィックスを使用する場合は、他のすべてのベンダー固有のプロパティも必ず含めてください",
-+	"css.lint.duplicateProperties.desc": "重複するスタイル定義を使用しないでください",
-+	"css.lint.emptyRules.desc": "空の規則セットを使用しないでください",
-+	"css.lint.float.desc": "'float' は使用しないでください。float を使用すると、レイアウトの一部が変更されたときに CSS が破損しやすくなります。",
-+	"css.lint.fontFaceProperties.desc": "@font-face 規則で 'src' プロパティと 'font-family' プロパティを定義する必要があります",
-+	"css.lint.hexColorLength.desc": "16 進数の色には、3 つまたは 6 つの 16 進数が含まれる必要があります",
-+	"css.lint.idSelector.desc": "セレクターには ID を含めないでください。これらの規則と HTML の結合が密接すぎます。",
-+	"css.lint.ieHack.desc": "IE ハックは、IE7 以前をサポートする場合にのみ必要です",
-+	"css.lint.importStatement.desc": "複数の Import ステートメントを同時に読み込むことはできません",
-+	"css.lint.important.desc": "!important は使用しないでください。これは CSS 全体の特定性が制御不能になり、リファクタリングが必要なことを示しています。",
-+	"css.lint.propertyIgnoredDueToDisplay.desc": "表示によりプロパティが無視されます。たとえば、'display: inline' の場合、width、height、margin-top、margin-bottom、および float のプロパティには効果がありません",
-+	"css.lint.universalSelector.desc": "ユニバーサル セレクター (*) を使用すると処理速度が低下することが分かっています",
-+	"css.lint.unknownProperties.desc": "不明なプロパティ。",
-+	"css.lint.unknownVendorSpecificProperties.desc": "不明なベンダー固有のプロパティ。",
-+	"css.lint.vendorPrefix.desc": "ベンダー固有のプレフィックスを使用する場合は、標準のプロパティも含めます",
-+	"css.lint.zeroUnits.desc": "0 の単位は必要ありません",
-+	"css.validate.desc": "すべての検証を有効または無効にします",
-+	"less.colorDecorators.enable.desc": "カラー デコレーターを有効または無効にします",
-+	"less.lint.argumentsInColorFunction.desc": "正しくないパラメーターの数",
-+	"less.lint.boxModel.desc": "パディングまたは枠線を使用する場合は幅または高さを使用しないでください",
-+	"less.lint.compatibleVendorPrefixes.desc": "ベンダー固有のプレフィックスを使用する場合は、他のすべてのベンダー固有のプロパティも必ず含めてください",
-+	"less.lint.duplicateProperties.desc": "重複するスタイル定義を使用しないでください",
-+	"less.lint.emptyRules.desc": "空の規則セットを使用しないでください",
-+	"less.lint.float.desc": "'float' は使用しないでください。float を使用すると、レイアウトの一部が変更されたときに CSS が破損しやすくなります。",
-+	"less.lint.fontFaceProperties.desc": "@font-face 規則で 'src' プロパティと 'font-family' プロパティを定義する必要があります",
-+	"less.lint.hexColorLength.desc": "16 進数の色には、3 つまたは 6 つの 16 進数が含まれる必要があります",
-+	"less.lint.idSelector.desc": "セレクターには ID を含めないでください。これらの規則と HTML の結合が密接すぎます。",
-+	"less.lint.ieHack.desc": "IE ハックは、IE7 以前をサポートする場合にのみ必要です",
-+	"less.lint.importStatement.desc": "複数の Import ステートメントを同時に読み込むことはできません",
-+	"less.lint.important.desc": "!important は使用しないでください。これは CSS 全体の特定性が制御不能になり、リファクタリングが必要なことを示しています。",
-+	"less.lint.propertyIgnoredDueToDisplay.desc": "表示によりプロパティが無視されます。たとえば、'display: inline' の場合、width、height、margin-top、margin-bottom、および float のプロパティには効果がありません",
-+	"less.lint.universalSelector.desc": "ユニバーサル セレクター (*) を使用すると処理速度が低下することが分かっています",
-+	"less.lint.unknownProperties.desc": "不明なプロパティ。",
-+	"less.lint.unknownVendorSpecificProperties.desc": "不明なベンダー固有のプロパティ。",
-+	"less.lint.vendorPrefix.desc": "ベンダー固有のプレフィックスを使用する場合は、標準のプロパティも含めます",
-+	"less.lint.zeroUnits.desc": "0 の単位は必要ありません",
-+	"less.validate.desc": "すべての検証を有効または無効にします",
-+	"scss.colorDecorators.enable.desc": "カラー デコレーターを有効または無効にします",
-+	"scss.lint.argumentsInColorFunction.desc": "正しくないパラメーターの数",
-+	"scss.lint.boxModel.desc": "パディングまたは枠線を使用する場合は幅または高さを使用しないでください",
-+	"scss.lint.compatibleVendorPrefixes.desc": "ベンダー固有のプレフィックスを使用する場合は、他のすべてのベンダー固有のプロパティも必ず含めてください",
-+	"scss.lint.duplicateProperties.desc": "重複するスタイル定義を使用しないでください",
-+	"scss.lint.emptyRules.desc": "空の規則セットを使用しないでください",
-+	"scss.lint.float.desc": "'float' は使用しないでください。float を使用すると、レイアウトの一部が変更されたときに CSS が破損しやすくなります。",
-+	"scss.lint.fontFaceProperties.desc": "@font-face 規則で 'src' プロパティと 'font-family' プロパティを定義する必要があります",
-+	"scss.lint.hexColorLength.desc": "16 進数の色には、3 つまたは 6 つの 16 進数が含まれる必要があります",
-+	"scss.lint.idSelector.desc": "セレクターには ID を含めないでください。これらの規則と HTML の結合が密接すぎます。",
-+	"scss.lint.ieHack.desc": "IE ハックは、IE7 以前をサポートする場合にのみ必要です",
-+	"scss.lint.importStatement.desc": "複数の Import ステートメントを同時に読み込むことはできません",
-+	"scss.lint.important.desc": "!important は使用しないでください。これは CSS 全体の特定性が制御不能になり、リファクタリングが必要なことを示しています。",
-+	"scss.lint.propertyIgnoredDueToDisplay.desc": "表示によりプロパティが無視されます。たとえば、'display: inline' の場合、width、height、margin-top、margin-bottom、および float のプロパティには効果がありません",
-+	"scss.lint.universalSelector.desc": "ユニバーサル セレクター (*) を使用すると処理速度が低下することが分かっています",
-+	"scss.lint.unknownProperties.desc": "不明なプロパティ。",
-+	"scss.lint.unknownVendorSpecificProperties.desc": "不明なベンダー固有のプロパティ。",
-+	"scss.lint.vendorPrefix.desc": "ベンダー固有のプレフィックスを使用する場合は、標準のプロパティも含めます",
-+	"scss.lint.zeroUnits.desc": "0 の単位は必要ありません",
-+	"scss.validate.desc": "すべての検証を有効または無効にします"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 c13f979d5aec40c0821c29f551cdc5c0fb2af750 i18n/jpn/extensions/git/out/askpass-main.i18n.json
-  their  100644 fbc0d0f2c5b9b44ec884ff6f4730966f85a518bc i18n/jpn/extensions/git/out/askpass-main.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"missOrInvalid": "資格情報が見つからないか、無効です。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 0e7d9d4140f358dd09117ca7ccd3453746addfc6 i18n/jpn/extensions/git/out/commands.i18n.json
-  our    100644 9e38217888fdc2db31af2a431341d645d8b6b16d i18n/jpn/extensions/git/out/commands.i18n.json
-  their  100644 ceb0c5f68c9bce830ab86a39842f84ee9987b229 i18n/jpn/extensions/git/out/commands.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -49,6 +50,18 @@
- 	"commit": "とにかくコミットする",
- 	"no staged changes": "コミットするステージされた変更がありません。\n\nすべての変更を自動的にステージして、直接コミットしますか?",
- 	"always": "常に行う",
-+=======
-+	"branch name": "ブランチ名",
-+	"clean": "変更を取り除く",
-+	"clean repo": "チェックアウトの前に、リポジトリの作業ツリーを消去してください。",
-+	"cloning": "Git リポジトリを複製しています...",
-+	"commit message": "コミット メッセージ",
-+	"confirm clean": "{0} の変更を消去しますか?",
-+	"confirm clean all": "変更をすべて消去しますか?",
-+	"confirm revert": "{0} で選択した変更を元に戻しますか?",
-+	"disabled": "このワークスペースでは、Git が無効になっているか、サポートされていません",
-+	"never again": "OK、今後は表示しない",
-+>>>>>>> .their
- 	"no changes": "コミットする必要のある変更はありません。",
- 	"commit message": "コミット メッセージ",
- 	"provide commit message": "コミット メッセージを入力してください",
-@@ -73,6 +86,7 @@
- 	"nobranch": "リモートにプッシュするブランチをチェックアウトしてください。",
- 	"confirm publish branch": "'{0}' ブランチに上流ブランチはありません。このブランチを公開しますか?",
- 	"ok": "OK",
-+<<<<<<< .our
- 	"push with tags success": "タグが正常にプッシュされました。",
- 	"pick remote": "リモートを選んで、ブランチ '{0}' を次に公開します:",
- 	"sync is unpredictable": "このアクションはコミットを '{0}/{1}' との間でプッシュしたりプルしたりします。",
-@@ -88,4 +102,18 @@
- 	"git error details": "Git: {0}",
- 	"git error": "Git エラー",
- 	"open git log": "Git ログを開く"
-+=======
-+	"open git log": "Git ログを開く",
-+	"openrepo": "リポジトリを開く",
-+	"parent": "親ディレクトリ",
-+	"pick remote": "リモートを選んで、ブランチ '{0}' を次に公開します:",
-+	"proposeopen": "複製したリポジトリを開きますか?",
-+	"provide branch name": "ブランチ名を指定してください",
-+	"provide commit message": "コミット メッセージを入力してください",
-+	"remote branch at": "{0} でのリモート ブランチ",
-+	"repourl": "リポジトリ URL",
-+	"revert": "変更を元に戻す",
-+	"sync is unpredictable": "このアクションはコミットを '{0}' との間でプッシュしたりプルしたりします。",
-+	"tag at": "{0} のタグ"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 748e51709b05638546cb7b507e3c872c51c8cc24 i18n/jpn/extensions/git/out/main.i18n.json
-  our    100644 0fab781f4ca1f5499f9c86a0f1d2e872eb1fb324 i18n/jpn/extensions/git/out/main.i18n.json
-  their  100644 45c7902ff12de81ba3fd8855181e7f90849b36f9 i18n/jpn/extensions/git/out/main.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,4 +14,9 @@
- 	"notfound": "Git が見つかりません。Git をインストールするか 'git.path' 設定でパスを構成してください。",
- 	"updateGit": "Git の更新",
- 	"git20": "git {0} がインストールされているようです。Code は Git 2 以上で最適に動作します"
-+=======
-+	"git20": "Git {0} がインストールされているようです。Code は Git 2 以上で最適に動作します",
-+	"updateGit": "Git の更新",
-+	"using git": "{1} から Git {0} を使用しています"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 b3e0caede4c642cfcb3e138a7eec0cefd4e3ac99 i18n/jpn/extensions/git/package.i18n.json
-  our    100644 5f3a79c480024cb95bcb777b25dc5a51987c0ee1 i18n/jpn/extensions/git/package.i18n.json
-  their  100644 e7e1386c07dcad8992d66b46d8f1d1da4d94dffa i18n/jpn/extensions/git/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,19 @@
- 	"command.init": "リポジトリの初期化",
- 	"command.close": "リポジトリを閉じる",
- 	"command.refresh": "最新の情報に更新",
-+=======
-+	"command.branch": "分岐の作成...",
-+	"command.checkout": "チェックアウト先...",
-+	"command.clean": "ファイルのクリーン",
-+	"command.cleanAll": "すべてのファイルのクリーン",
-+	"command.clone": "複製",
-+	"command.commit": "コミット",
-+	"command.commitAll": "すべてコミット",
-+	"command.commitAllSigned": "すべてコミット (サインオフ)",
-+	"command.commitStaged": "ステージング済みをコミット",
-+	"command.commitStagedSigned": "ステージング済みをコミット (サインオフ)",
-+	"command.init": "リポジトリの初期化",
-+>>>>>>> .their
- 	"command.openChange": "変更を開く",
- 	"command.openFile": "ファイルを開く",
- 	"command.openHEADFile": "HEAD のファイルを開く",
-@@ -46,6 +60,7 @@
- 	"command.pullFrom": "指定元からプル...",
- 	"command.push": "プッシュ",
- 	"command.pushTo": "プッシュ先...",
-+<<<<<<< .our
- 	"command.pushWithTags": "タグをつけてプッシュ",
- 	"command.sync": "同期",
- 	"command.syncRebase": "同期 (リベース)",
-@@ -59,6 +74,20 @@
- 	"config.enabled": "Git を有効にするかどうか",
- 	"config.path": "Git 実行可能ファイルのパス",
- 	"config.autoRepositoryDetection": "レポジトリを自動的に検出するかどうか",
-+=======
-+	"command.refresh": "最新の情報に更新",
-+	"command.revertSelectedRanges": "選択範囲を元に戻す",
-+	"command.showOutput": "Git 出力の表示",
-+	"command.stage": "ファイルのステージング",
-+	"command.stageAll": "すべてのファイルのステージング",
-+	"command.stageSelectedRanges": "選択した範囲をステージする",
-+	"command.sync": "同期",
-+	"command.undoCommit": "前回のコミットを元に戻す",
-+	"command.unstage": "ファイルのステージング解除",
-+	"command.unstageAll": "すべてのファイルのステージング解除",
-+	"command.unstageSelectedRanges": "選択した範囲をアンステージする",
-+	"config.autofetch": "自動フェッチが有効かどうか",
-+>>>>>>> .their
- 	"config.autorefresh": "自動更新が有効かどうか",
- 	"config.autofetch": "自動フェッチが有効かどうか",
- 	"config.enableLongCommitWarning": "長いコミット メッセージについて警告するかどうか",
-added in both
-  our    100644 26a29c2851ab420e40053cbd0a0aeda969793501 i18n/jpn/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
-  their  100644 ddf54ae6ac9e4931af0dfd89d1af44d3393dd6ce i18n/jpn/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"typescript.jsDocCompletionItem.documentation": "JSDoc コメント"
- }
-\ No newline at end of file
-changed in both
-  base   100644 aa52e2e404923f24fbaea93bf3c6394d90d83a1e i18n/jpn/extensions/typescript/out/utils/projectStatus.i18n.json
-  our    100644 d4f07accea4b8d6917196db1ecb3d97d1ca9e4fd i18n/jpn/extensions/typescript/out/utils/projectStatus.i18n.json
-  their  100644 173d4bf5b4a964e2e3ba21dc715345066a43df72 i18n/jpn/extensions/typescript/out/utils/projectStatus.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,11 @@
- 	],
- 	"hintExclude": "プロジェクト全体の JavaScript/TypeScript 言語機能を有効にするには、多数のファイルが含まれるフォルダーを除外します。例: {0}",
- 	"hintExclude.generic": "プロジェクト全体の JavaScript/TypeScript 言語機能を有効にするには、作業していないソース ファイルが含まれるサイズの大きなフォルダーを除外します。",
-+=======
-+	"hintExclude": "プロジェクト全体の JavaScript/TypeScript 言語機能を有効にするには、多数のファイルが含まれるフォルダーを除外します。例: {0}",
-+	"hintExclude.generic": "プロジェクト全体の JavaScript/TypeScript 言語機能を有効にするには、作業していないソース ファイルが含まれるサイズの大きなフォルダーを除外します。",
-+	"hintExclude.tooltip": "プロジェクト全体の JavaScript/TypeScript 言語機能を有効にするには、作業していないソース ファイルが含まれるサイズの大きなフォルダーを除外します。",
-+>>>>>>> .their
- 	"large.label": "除外の構成",
- 	"hintExclude.tooltip": "プロジェクト全体の JavaScript/TypeScript 言語機能を有効にするには、作業していないソース ファイルが含まれるサイズの大きなフォルダーを除外します。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 120074e372f133030f29f5a8833da2eadfca961d i18n/jpn/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 8a524167aa36e1a9cb85f51526bd76d90fd343d7 i18n/jpn/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 7f5d6055665139a22956710ac1c32e80371b1252 i18n/jpn/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,16 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"acceptSuggestionOnCommitCharacter": "コミット文字で候補を受け入れるかどうかを制御します。たとえば、JavaScript ではセミコロン (';') をコミット文字にして、候補を受け入れてその文字を入力することができます。",
-+	"acceptSuggestionOnEnter": "'Tab' キーに加えて 'Enter' キーで候補を受け入れるかどうかを制御します。改行の挿入や候補の反映の間であいまいさを解消するのに役立ちます。",
-+	"autoClosingBrackets": "エディターで左角かっこの後に自動的に右角かっこを挿入するかどうかを制御します",
-+	"codeLens": "エディターでコード レンズを表示するかをどうかを制御する",
-+	"cursorBlinking": "カーソルのアニメーション スタイルを制御します。指定できる値は 'blink'、'smooth'、'phase'、'expand'、'solid' です",
-+	"cursorStyle": "カーソルのスタイルを制御します。指定できる値は 'block'、'block-outline'、'line'、'line-thin'、'underline'、'underline-thin' です",
-+	"detectIndentation": "ファイルを開くと、そのファイルの内容に基づいて `editor.tabSize` と `editor.insertSpaces` が検出されます。",
-+	"dragAndDrop": "ドラッグ アンド ドロップによる選択範囲の移動をエディターが許可する必要があるかどうかを制御します。",
-+>>>>>>> .their
- 	"editorConfigurationTitle": "エディター",
- 	"fontFamily": "フォント ファミリを制御します。",
- 	"fontWeight": "フォントの太さを制御します。",
-@@ -23,6 +34,7 @@
- 	"tabSize.errorMessage": "'number' が必要です。`editor.detectIndentation` 設定によって値 \"auto\" が置き換えられていることに注意してください。",
- 	"insertSpaces": "Tab キーを押すとスペースが挿入されます。`editor.detectIndentation` がオンの場合、この設定はファイル コンテンツに基づいて上書きされます。",
- 	"insertSpaces.errorMessage": "'boolean' が必要です。`editor.detectIndentation` 設定によって値 \"auto\" が置き換えられていることに注意してください。",
-+<<<<<<< .our
- 	"detectIndentation": "ファイルを開くと、そのファイルの内容に基づいて `editor.tabSize` と `editor.insertSpaces` が検出されます。",
- 	"roundedSelection": "選択範囲の角を丸くするかどうかを制御します",
- 	"scrollBeyondLastLine": "エディターで最後の行を越えてスクロールするかどうかを制御します",
-@@ -43,6 +55,14 @@
- 	"wordWrap": "行の折り返し方法を制御します。次の値を指定できます。\n - 'off' (折り返さない),\n - 'on' (ビューポート折り返し),\n - 'wordWrapColumn' ('editor.wordWrapColumn' で折り返し) or\n - 'bounded' (ビューポートと 'editor.wordWrapColumn' の最小値で折り返し).",
- 	"wordWrapColumn": "'editor.wordWrap' が 'wordWrapColumn' または 'bounded' の場合に、エディターの折り返し桁を制御します。",
- 	"wrappingIndent": "折り返し行のインデントを制御します。'none'、'same'、'indent' または 'deepIndent' のいずれかを指定できます。",
-+=======
-+	"lineHeight": "行の高さを制御します。fontSize に基づいて lineHeight を計算する場合には、0 を使用します。",
-+	"lineNumbers": "行番号の表示を制御します。使用可能な値は、'on'、'off'、および 'relative' です。'relative' は現在のカーソル位置からの行数を示します。",
-+	"matchBrackets": "かっこを選択すると、対応するかっこを強調表示します。",
-+	"minimap.enabled": "ミニマップを表示するかどうかを制御します",
-+	"minimap.maxColumn": "表示するミニマップの最大幅を特定の桁数に制限します",
-+	"minimap.renderCharacters": "行に (カラー ブロックではなく) 実際の文字を表示します",
-+>>>>>>> .their
- 	"mouseWheelScrollSensitivity": "マウス ホイール スクロール イベントの `deltaX` と `deltaY` で使用される乗数",
- 	"multiCursorModifier.ctrlCmd": "Windows および Linux 上の `Control` キーと macOS 上の `Command` キーに割り当てます。",
- 	"multiCursorModifier.alt": "Windows および Linux 上の `Alt` キーと macOS 上の `Option` キーに割り当てます。",
-@@ -74,6 +94,7 @@
- 	"suggestSelection": "候補リストを表示するときに候補を事前に選択する方法を制御します。",
- 	"suggestFontSize": "候補のウィジェットのフォント サイズ",
- 	"suggestLineHeight": "候補のウィジェットの行の高さ",
-+<<<<<<< .our
- 	"selectionHighlight": "エディターで選択範囲に類似する一致箇所を強調表示するかどうかを制御します",
- 	"occurrencesHighlight": "エディターでセマンティック シンボルの出現箇所を強調表示するかどうかを制御します",
- 	"overviewRulerLanes": "概要ルーラーの同じ位置に表示できる装飾の数を制御します",
-@@ -115,4 +136,20 @@
- 	"ignoreTrimWhitespace": "差分エディターが、先頭または末尾の空白の変更を差分として表示するかどうかを制御します。",
- 	"largeFileOptimizations": "大きなファイルでメモリが集中する特定の機能を無効にするための特別な処理。",
- 	"renderIndicators": "差分エディターが追加/削除された変更に +/- インジケーターを示すかどうかを制御します"
-+=======
-+	"suggestOnTriggerCharacters": "トリガー文字の入力時に候補が自動的に表示されるようにするかどうかを制御します",
-+	"tabSize": "1 つのタブに相当するスペースの数。`editor.detectIndentation` がオンの場合、この設定はファイル コンテンツに基づいて上書きされます。",
-+	"tabSize.errorMessage": "'number' が必要です。`editor.detectIndentation` 設定によって値 \"auto\" が置き換えられていることに注意してください。",
-+	"trimAutoWhitespace": "自動挿入された末尾の空白を削除する",
-+	"useTabStops": "空白の挿入や削除はタブ位置に従って行われます",
-+	"wordBasedSuggestions": "単語ベースの修正候補を有効にします。",
-+	"wordSeparators": "単語に関連したナビゲーションまたは操作を実行するときに、単語の区切り文字として使用される文字",
-+	"wordWrap": "行の折り返し方法を制御します。次の値を指定できます。\n - 'off' (折り返さない)\n - 'on' (ビューポート折り返し)\n - 'wordWrapColumn' ('editor.wordWrapColumn' で折り返し)\n - 'bounded' (ビューポートと 'editor.wordWrapColumn' の最小値で折り返し)。",
-+	"wordWrap.bounded": "ビューポートと 'editor.wordWrapColumn' の最小値で行を折り返します。",
-+	"wordWrap.off": "行を折り返しません。",
-+	"wordWrap.on": "行をビューポートの幅で折り返します。",
-+	"wordWrap.wordWrapColumn": "行を 'editor.wordWrapColumn' で折り返します。",
-+	"wordWrapColumn": "'editor.wordWrap' が 'wordWrapColumn' または 'bounded' の場合に、エディターの折り返し桁を制御します。",
-+	"wrappingIndent": "折り返し行のインデントを制御します。'none'、'same'、または 'indent' のいずれかを指定できます。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 89a78a92bd014bbc84d4766b4be68f1184e1da6d i18n/jpn/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
-  our    100644 23f407e894b256ff3110210a43c33ad8bc40309c i18n/jpn/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
-  their  100644 10d3fcec8d60700079ccd7eac4fee4e78233e553 i18n/jpn/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
-@@ -20,5 +20,13 @@
- 	"meta.typeDefinitions.title": " – {0} 個の型定義",
- 	"actions.goToTypeDefinition.label": "型定義へ移動",
- 	"actions.peekTypeDefinition.label": "型定義を表示",
-+<<<<<<< .our
- 	"multipleResults": "クリックして、{0} の定義を表示します。"
-+=======
-+	"actions.previewDecl.label": "定義をここに表示",
-+	"generic.noResults": "定義が見つかりません",
-+	"meta.title": " - {0} の定義",
-+	"multipleResults": "クリックして、{0} の定義を表示します。",
-+	"noResultWord": "'{0}' の定義は見つかりません"
-+>>>>>>> .their
- }
-\ No newline at end of file
-removed in local
-  base   100644 c84a780b8ace16a4ccd8cdc84ad3b01b254a1686 i18n/jpn/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
-  their  100644 b32fb37bcc819c109086debe98ffb8fa3e16f7b5 i18n/jpn/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/jpn/src/vs/workbench/electron-browser/commands.i18n.json
-  our    100644 983899514ca518324d9e85f57712db39d3040bbe i18n/jpn/src/vs/workbench/electron-browser/commands.i18n.json
-  their  100644 3a1051dcfdad7ec7db70524f0a31f277885230df i18n/jpn/src/vs/workbench/electron-browser/commands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"diffLeftRightLabel": "{0} ⟷ {1}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 997a4dbac83b72ae42b32b369d53724e13eca9e5 i18n/jpn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 3b03f30557674ed7892d9127c78ab05070c860e0 i18n/jpn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 1c652d170cc45bacf74956609d06c5d1ce15aa9b i18n/jpn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -34,6 +34,7 @@
- 	"sideBarLocation": "サイド バーの位置を制御します。ワークベンチの左右のいずれかに表示できます。",
- 	"panelDefaultLocation": "パネルの既定の位置を制御します。ワークベンチの下部または右のいずれかに表示できます。",
- 	"statusBarVisibility": "ワークベンチの下部にステータス バーを表示するかどうかを制御します。",
-+<<<<<<< .our
- 	"activityBarVisibility": "ワークベンチでのアクティビティ バーの表示をコントロールします。",
- 	"viewVisibility": "ビュー ヘッダー アクションを表示するかどうかを制御します。ビュー ヘッダー アクションは常に表示されるか、パネルをフォーカスやホバーしたときのみ表示のいずれかです。",
- 	"fontAliasing": "ワークベンチのフォント エイリアシング方法を制御します。\n- default: サブピクセル方式でフォントを滑らかにします。ほとんどの非 Retina ディスプレイでもっとも鮮明なテキストを提供します\n- antialiased: サブピクセルとは対照的に、ピクセルのレベルでフォントを滑らかにします。フォント全体がより細く見えます\n- none: フォントのスムージングを無効にします。テキストをぎざぎざな尖ったエッジで表示します\n- auto: ディスプレイの DPI に基づいて自動的に `default` か `antialiased` を適用します",
-@@ -42,6 +43,28 @@
- 	"workbench.fontAliasing.none": "フォントのスムージングを無効にします。テキストをぎざぎざな尖ったエッジで表示します。",
- 	"workbench.fontAliasing.auto": "ディスプレイの DPI に基づいて自動的に `default` か `antialiased` を適用します。",
- 	"enableNaturalLanguageSettingsSearch": "設定で自然文検索モードを有効にするかどうかを制御します。",
-+=======
-+	"title": "アクティブなエディターに基づいてウィンドウのタイトルを制御します。変数は、コンテキストに基づいて置換されます:\n${activeEditorShort}: 例: myFile.txt\n${activeEditorMedium}: 例: myFolder/myFile.txt\n${activeEditorLong}: 例: /Users/Development/myProject/myFolder/myFile.txt\n${rootName}: 例: myProject\n${rootPath}: 例: /Users/Development/myProject\n${appName}: 例: VS Code\n${dirty}: アクティブなエディターがダーティである場合のダーティ インジケーター\n${separator}: 値のある変数で囲まれた場合にのみ表示される条件付き区切り記号 (\" - \")",
-+	"titleBarStyle": "ウィンドウのタイトル バーの外観を調整します。変更を適用するには、完全に再起動する必要があります。",
-+	"view": "表示",
-+	"window.menuBarVisibility.default": "メニューは全画面表示モードの場合にのみ非表示です。",
-+	"window.menuBarVisibility.hidden": "メニューは常に非表示です。",
-+	"window.menuBarVisibility.toggle": "メニューは非表示ですが、Alt キーを押すと表示できます。",
-+	"window.menuBarVisibility.visible": "全画面表示モードの場合も含めて、常にメニューが表示されます。",
-+	"window.newWindowDimensions.default": "新しいウィンドウを画面の中央に開きます。",
-+	"window.newWindowDimensions.fullscreen": "新しいウィンドウを全画面表示モードで開きます。",
-+	"window.newWindowDimensions.inherit": "新しいウィンドウを、最後にアクティブだったウィンドウと同じサイズで開きます。",
-+	"window.newWindowDimensions.maximized": "新しいウィンドウを最大化した状態で開きます。",
-+	"window.openFilesInNewWindow.default": "ファイルのフォルダーが開かれていたウィンドウでファイルを開くか、Dock または Finder を使用して開く場合以外は最後のアクティブ ウィンドウでファイルを開きます (macOS のみ)",
-+	"window.openFilesInNewWindow.off": "ファイルのフォルダーが開かれていたウィンドウまたは最後のアクティブ ウィンドウでファイルを開きます",
-+	"window.openFilesInNewWindow.on": "新しいウィンドウでファイルを開きます",
-+	"window.openFoldersInNewWindow.default": "フォルダーがアプリケーション内から (たとえば、[ファイル] メニューから) 選択された場合を除いて、新しいウィンドウでフォルダーを開きます",
-+	"window.openFoldersInNewWindow.off": "フォルダーは、最後のアクティブ ウィンドウで開きます",
-+	"window.openFoldersInNewWindow.on": "新しいウィンドウでフォルダーを開きます",
-+	"window.reopenFolders.all": "最後のセッションの全フォルダーを再び開きます。",
-+	"window.reopenFolders.none": "フォルダーを再度開きません。",
-+	"window.reopenFolders.one": "最後にアクティブだったフォルダーを再び開きます。",
-+>>>>>>> .their
- 	"windowConfigurationTitle": "ウィンドウ",
- 	"window.openFilesInNewWindow.on": "新しいウィンドウでファイルを開きます",
- 	"window.openFilesInNewWindow.off": "ファイルのフォルダーが開かれていたウィンドウまたは最後のアクティブ ウィンドウでファイルを開きます",
-added in both
-  our    100644 9ce40f5a86ae498ceea299b83ccd9c24248735ed i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
-  their  100644 161d12ad247006a3316cef5fe1ee17d276b789ac i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,6 +9,16 @@
- 	],
- 	"wordWrapMigration.ok": "OK",
- 	"wordWrapMigration.dontShowAgain": "今後は表示しない",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"wordWrapMigration.dontShowAgain": "今後は表示しない",
-+	"wordWrapMigration.ok": "OK",
-+>>>>>>> .their
- 	"wordWrapMigration.openSettings": "設定を開く",
- 	"wordWrapMigration.prompt": "設定 'editor.wrappingColumn' は使用されなくなりました。'editor.wordWrap' を使用してください。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 0ea68516fe5efe03551aa727709c906028a94721 i18n/jpn/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-  our    100644 f154d6f46bc66710819bc962ae3fe874f33b5b39 i18n/jpn/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-  their  100644 2620509f341272dc1f717b0a91fd5f66144d8da5 i18n/jpn/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-@@ -41,7 +41,34 @@
- 	"debugConsoleAction": "デバッグ コンソール",
- 	"unreadOutput": "デバッグ コンソールでの新しい出力",
- 	"debugFocusConsole": "デバッグ コンソールにフォーカスを移動",
-+<<<<<<< .our
- 	"focusSession": "セッションにフォーカス",
-+=======
-+	"disableAllBreakpoints": "すべてのブレークポイントを無効にする",
-+	"disableBreakpoint": "ブレークポイントの無効化",
-+	"disconnectDebug": "切断",
-+	"editConditionalBreakpoint": "ブレークポイントの編集...",
-+	"enableAllBreakpoints": "すべてのブレークポイントを有効にする",
-+	"enableBreakpoint": "ブレークポイントの有効化",
-+	"focusProcess": "フォーカスのプロセス",
-+	"launchJsonNeedsConfigurtion": "'launch.json' を構成または修正してください",
-+	"openLaunchJson": "{0} を開く",
-+	"pauseDebug": "一時停止",
-+	"reapplyAllBreakpoints": "すべてのブレークポイントを再適用する",
-+	"reconnectDebug": "再接続",
-+	"removeAllBreakpoints": "すべてのブレークポイントを削除する",
-+	"removeAllWatchExpressions": "すべての式を削除する",
-+	"removeBreakpoint": "ブレークポイントの削除",
-+	"removeWatchExpression": "式の削除",
-+	"renameFunctionBreakpoint": "関数ブレークポイントの名前変更",
-+	"restartDebug": "再起動",
-+	"restartFrame": "フレームの再起動",
-+	"reverseContinue": "反転",
-+	"selectAndStartDebugging": "選択してデバッグを開始",
-+	"setValue": "値の設定",
-+	"startDebug": "デバッグの開始",
-+	"startWithoutDebugging": "デバッグなしで開始",
-+>>>>>>> .their
- 	"stepBackDebug": "1 つ戻る",
- 	"reverseContinue": "反転"
- }
-\ No newline at end of file
-added in both
-  our    100644 39b690741dbbc33fef29e4c5a7002a685f6648df i18n/jpn/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
-  their  100644 0e8b2cb411ca64f2a1f05134391445b8335c6657 i18n/jpn/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -12,4 +13,16 @@
- 	"addConfiguration": "構成の追加...",
- 	"noConfigurationsMatching": "一致するデバッグ構成はありません",
- 	"noConfigurationsFound": "デバッグ構成が見つかりません。'launch.json' ファイルを作成してください。"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"debugAriaLabel": "実行する起動構成の名前を入力してください。",
-+	"entryAriaLabel": "{0}、デバッグ",
-+	"noConfigurationsFound": "デバッグ構成が見つかりません。'launch.json' ファイルを作成してください。",
-+	"noConfigurationsMatching": "一致するデバッグ構成はありません"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 cd85a698278dac8a5ecbbaf208ea886910ef7a18 i18n/jpn/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
-  their  100644 620f6347732b6b013080e6718f19ea4e04c23387 i18n/jpn/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,5 +10,13 @@
- 	"debugExceptionWidgetBorder": "例外ウィジェットの境界線の色。",
- 	"debugExceptionWidgetBackground": "例外ウィジェットの背景色。",
- 	"exceptionThrownWithId": "例外が発生しました: {0}",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"exceptionThrown": "例外が発生しました"
- }
-\ No newline at end of file
-changed in both
-  base   100644 423147e358e280490adca43d57cee562cec0558b i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  our    100644 d168fc00cabeef774dd62a25d5a22dff669da924 i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  their  100644 7a4fcf4bf9b1f3a07a1e637898e87ae0fb35ccd4 i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-changed in both
-  base   100644 3bdeceb3ae203edd879c479ef0c4827cae395ef0 i18n/jpn/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  our    100644 152d9f1c423ce54f49fe4ae6d0188ae9e99338d8 i18n/jpn/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  their  100644 e4ff59c07c56a2ec1c25a98777f0fae40ba798c1 i18n/jpn/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-@@ -8,6 +8,20 @@
- 	],
- 	"debugAdapterBinNotFound": "デバッグ アダプターの実行可能ファイル '{0}' がありません。",
- 	"debugAdapterCannotDetermineExecutable": "デバッグ アダプター '{0}' の実行可能ファイルを判別できません。",
-+<<<<<<< .our
- 	"unableToLaunchDebugAdapter": "デバッグ アダプターを {0} から起動できません。",
- 	"unableToLaunchDebugAdapterNoArgs": "デバッグ アダプターを起動できません。"
-+=======
-+	"debugLinuxConfiguration": "Linux 固有の起動構成の属性。",
-+	"debugName": "構成の名前。起動構成のドロップダウン メニューに表示されます。",
-+	"debugOSXConfiguration": "OS X 固有の起動構成の属性。",
-+	"debugPrelaunchTask": "デバッグ セッションの開始前に実行するタスク。",
-+	"debugRequest": "構成の要求の種類。\"launch\" または \"attach\" です。",
-+	"debugServer": "デバッグ拡張機能の開発のみ。ポートが指定の VS Code の場合、サーバー モードで実行中のデバッグ アダプターへの接続が試行されます。",
-+	"debugType": "構成の種類。",
-+	"debugWindowsConfiguration": "Windows 固有の起動構成の属性。",
-+	"deprecatedVariables": "'env.'、'config.'、'command.' は使用されていません。代わりに、'env:'、'config:'、'command:' を使用してください。",
-+	"internalConsoleOptions": "内部デバッグ コンソールの動作を制御します。",
-+	"node2NotSupported": "\"node2\" はサポートされていません。代わりに \"node\" を使用し、\"protocol\" 属性を \"inspector\" に設定してください。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 aa0545246f0b78d3d597c90bf578d72dbbcbc2d5 i18n/jpn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 5461c0b3fa9062516c7b3d179dc36d861ad4f80d i18n/jpn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 b405bf8daa6b144e6471bf27ce083ce9ccfb4c28 i18n/jpn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-@@ -4,6 +4,7 @@
-  *--------------------------------------------------------------------------------------------*/
- // Do not edit this file. It is machine generated.
- {
-+<<<<<<< .our
- 	"showExplorerViewlet": "エクスプローラーを表示",
- 	"explore": "エクスプローラー",
- 	"view": "表示",
-@@ -11,6 +12,25 @@
- 	"binaryFileEditor": "バイナリ ファイル エディター",
- 	"filesConfigurationTitle": "ファイル",
- 	"exclude": "ファイルとフォルダーを除外するための glob パターンを構成します。たとえば、ファイル エクスプローラーではこの設定に基づいてファイルとフォルダーの表示や非表示を決定します。",
-+=======
-+	"associations": "言語に対するファイルの関連付けを構成します (例: '*.extension': 'html')。これらの関連付けは、インストールされている言語の既定の関連付けより優先されます。",
-+	"autoReveal": "エクスプローラーでファイルを開くとき、自動的にファイルの内容を表示して選択するかどうかを制御します。",
-+	"autoSave": "ダーティ ファイルの自動保存を制御します。有効な値: '{0}'、'{1}'、'{2}' (エディターがフォーカスを失います)、'{3}' (ウィンドウがフォーカスを失います)。'{4}' に設定すると、'files.autoSaveDelay' で遅延を構成できます。",
-+	"autoSaveDelay": "ダーティ ファイルの自動保存の遅延をミリ秒単位で制御します。'files.autoSave' が '{0}' に設定されている場合のみ適用されます",
-+	"binaryFileEditor": "バイナリ ファイル エディター",
-+	"dynamicHeight": "開いているエディターのセクションの高さを要素の数に合わせて動的に調整するかどうかを制御します。",
-+	"editorConfigurationTitle": "エディター",
-+	"enableDragAndDrop": "ドラッグ アンド ドロップを使用したファイルとフォルダーの移動をエクスプローラーが許可するかどうかを制御します。",
-+	"encoding": "ファイルの読み取り/書き込みで使用する既定の文字セット エンコーディング。",
-+	"eol": "既定の改行文字。",
-+	"exclude": "ファイルとフォルダーを除外するための glob パターンを構成します。",
-+	"explore": "エクスプローラー",
-+	"explorerConfigurationTitle": "エクスプローラー",
-+	"files.autoSave.afterDelay": "'files.autoSaveDelay' で構成された時間の経過後に、ダーティ ファイルを自動的に保存します。",
-+	"files.autoSave.off": "ダーティ ファイルを自動的に保存することはしません。",
-+	"files.autoSave.onFocusChange": "エディターがフォーカスを失った時点で、ダーティ ファイルを自動的に保存します。",
-+	"files.autoSave.onWindowChange": "ウィンドウがフォーカスを失った時点で、ダーティ ファイルを自動的に保存します。",
-+>>>>>>> .their
- 	"files.exclude.boolean": "ファイル パスの照合基準となる glob パターン。これを true または false に設定すると、パターンがそれぞれ有効/無効になります。",
- 	"files.exclude.when": "一致するファイルの兄弟をさらにチェックします。一致するファイル名の変数として $(basename) を使用します。",
- 	"associations": "言語に対するファイルの関連付け (例 \"*.extension\": \"html\") を構成します。これらの関連付けは、インストールされている言語の既定の関連付けより優先されます。",
-added in both
-  our    100644 98112fb116446302855c4dc10ab2102118dd8c84 i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
-@@ -3,6 +3,7 @@
-  *  Licensed under the MIT License. See License.txt in the project root for license information.
-  *--------------------------------------------------------------------------------------------*/
- // Do not edit this file. It is machine generated.
-+<<<<<<< .our
- {
- 	"vscode.extension.contributes.snippets": "スニペットを提供します。",
- 	"vscode.extension.contributes.snippets-language": "このスニペットの提供先の言語識別子です。",
-@@ -11,4 +12,7 @@
- 	"invalid.path.0": "`contributes.{0}.path` に文字列が必要です。提供された値: {1}",
- 	"invalid.path.1": "拡張機能のフォルダー ({2}) の中に `contributes.{0}.path` ({1}) が含まれている必要があります。これにより拡張を移植できなくなる可能性があります。",
- 	"badVariableUse": "スニペット \"{0}\" は、スニペット変数とスニペット プレースホルダーを混乱させる可能性が非常にあります。詳細については https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax をご覧ください。"
--}
-\ No newline at end of file
-+}
-+=======
-+{}
-+>>>>>>> .their
-added in both
-  our    100644 af5e539af6236b3f2edaf51cca94f10e220a1ed3 i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
-  their  100644 c3de7d0fb344a1520f1c09d868ecac5138a7fa9e i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,4 +10,13 @@
- 	"snippet.suggestions.label": "スニペットの挿入",
- 	"sep.userSnippet": "ユーザー スニペット",
- 	"sep.extSnippet": "拡張機能のスニペット"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"snippet.suggestions.label": "スニペットの挿入"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 21441eaa2729bf554391d89816b61bd2454648a6 i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 eefed0e4d58d81161889f00697ee64b3ab90a942 i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -16,5 +17,13 @@
- 	"badVariableUse": "拡張機能 '{0}' の 1 つまたは複数のスニペットは、スニペット変数とスニペット プレース ホルダーを混乱させる可能性が非常にあります。 (詳細については、 https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax を参照してください)",
- 	"badFile": "スニペット ファイル \"{0}\" を読み込むことができませんでした。",
- 	"detail.snippet": "{0} ({1})",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"snippetSuggest.longLabel": "{0}, {1}"
- }
-\ No newline at end of file
-added in both
-  our    100644 d7c3cd5548446ac7670683f5a5bbd938a6712e52 i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
-  their  100644 d9cf695f161a403fcd29bcf886217b0de3f85b68 i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"tabCompletion": "プレフィックスが一致する場合にスニペットを挿入します。'quickSuggestions' が無効な場合に最適です。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 53eb0b678421bb2f76c2a420bb6dce91ee84ea3b i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 bd0ce9939936ef31eabab48bc5a42980b19e29b3 i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 07a404ae900cdb673ab18f226abdc80fac156da7 i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -29,6 +29,7 @@
- 	"workbench.action.terminal.resizePaneUp": "ペインを上にリサイズ",
- 	"workbench.action.terminal.resizePaneDown": "ペインを下にリサイズ",
- 	"workbench.action.terminal.focus": "端末にフォーカス",
-+	"workbench.action.terminal.focusAtIndex": "ターミナル {0} にフォーカス",
- 	"workbench.action.terminal.focusNext": "次の端末にフォーカス",
- 	"workbench.action.terminal.focusPrevious": "前のターミナルにフォーカス",
- 	"workbench.action.terminal.paste": "アクティブなターミナルに貼り付け",
-added in both
-  our    100644 946723a67128023eb3e9fb6c646c3cf967e21f00 i18n/jpn/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  their  100644 80be3aff22b2e8a4d3882c56cbcee445eddd323f i18n/jpn/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -39,4 +40,48 @@
- 	"welcomePage.interfaceOverviewDescription": "UI の主要コンポーネントを解説した視覚オーバーレイを表示します",
- 	"welcomePage.interactivePlayground": "対話型プレイグラウンド",
- 	"welcomePage.interactivePlaygroundDescription": "エディターの基本機能を簡潔なチュートリアルで体験します"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"welcomePage.atom": "Atom",
-+	"welcomePage.atomCurrent": "Atom (最新)",
-+	"welcomePage.cloneGitRepository": "Git リポジトリを複製...",
-+	"welcomePage.colorTheme": "配色テーマ",
-+	"welcomePage.colorThemeDescription": "エディターとコードの外観を自由に設定します",
-+	"welcomePage.configureSettings": "設定を構成する",
-+	"welcomePage.configureSettingsDescription": "VS Code の全機能を活用するために設定を微調整します",
-+	"welcomePage.editingEvolved": "進化した編集",
-+	"welcomePage.gitHubRepository": "GitHub リポジトリ",
-+	"welcomePage.help": "ヘルプ",
-+	"welcomePage.installKeymap": "{0}、{1}、{2}、{3} のキーボード ショートカットをインストール",
-+	"welcomePage.installKeymapDescription": "キーボード ショートカットをインストールします",
-+	"welcomePage.interactivePlayground": "対話型プレイグラウンド",
-+	"welcomePage.interactivePlaygroundDescription": "エディターの基本機能を簡潔なチュートリアルで体験します",
-+	"welcomePage.interfaceOverview": "インターフェイスの概要",
-+	"welcomePage.interfaceOverviewDescription": "UI の主要コンポーネントを解説した視覚オーバーレイを表示します",
-+	"welcomePage.introductoryVideos": "紹介ビデオ",
-+	"welcomePage.keybindingsReference": "キーボード ショートカットの参照資料",
-+	"welcomePage.keybindingsReferenceDescription": "最も一般的なキーボード ショートカットを掲載した印刷可能な PDF です",
-+	"welcomePage.newFile": "新しいファイル",
-+	"welcomePage.noRecentFolders": "最近使用したフォルダーなし",
-+	"welcomePage.openFolder": "フォルダーを開く...",
-+	"welcomePage.others": "その他",
-+	"welcomePage.productDocumentation": "製品ドキュメント",
-+	"welcomePage.quickLinks": "クイック リンク",
-+	"welcomePage.recent": "最近",
-+	"welcomePage.showCommands": "すべてのコマンドの検索と実行",
-+	"welcomePage.showCommandsDescription": "コントロール パネルからコマンドを検索してすばやくアクセスします ({0})",
-+	"welcomePage.showOnStartup": "起動時にウェルカム ページを表示",
-+	"welcomePage.stackOverflow": "Stack Overflow",
-+	"welcomePage.start": "開始",
-+	"welcomePage.sublime": "Sublime",
-+	"welcomePage.sublimeCurrent": "Sublime (最新)",
-+	"welcomePage.vim": "Vim",
-+	"welcomePage.vimCurrent": "Vim (最新)",
-+	"welcomePage.vscode": "Visual Studio Code"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 649e9e879fe386d33d73da7f4d6d5e2fbfce394d i18n/jpn/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-  our    100644 07da445924359806714c48eda402680117e0b913 i18n/jpn/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-  their  100644 649bf12156ba8c7f893136928b5bca3d40503424 i18n/jpn/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -21,10 +22,18 @@
- 	"welcomePage.willReloadAfterInstallingExtensionPack": "{0} に追加のサポートをインストールしたあと、ウィンドウが再度読み込まれます。",
- 	"welcomePage.installingExtensionPack": "{0} に追加のサポートをインストールしています...",
- 	"welcomePage.extensionPackNotFound": "ID {1} のサポート {0} は見つかりませんでした。",
-+=======
-+	"cancel": "キャンセル",
-+	"ok": "OK",
-+	"welcome.title": "ようこそ",
-+	"welcomePage": "ようこそ",
-+	"welcomePage.installingKeymap": "{0} のキーボード ショートカットをインストールしています...",
-+>>>>>>> .their
- 	"welcomePage.keymapAlreadyInstalled": "キーボード ショートカット {0} は既にインストールされています。",
- 	"welcomePage.willReloadAfterInstallingKeymap": "キーボード ショートカット {0} をインストールした後、ウィンドウが再度読み込まれます。",
- 	"welcomePage.installingKeymap": "{0} のキーボード ショートカットをインストールしています...",
- 	"welcomePage.keymapNotFound": "ID {1} のキーボード ショートカット {0} は見つかりませんでした。",
-+<<<<<<< .our
- 	"welcome.title": "ようこそ",
- 	"welcomePage.openFolderWithPath": "パス {1} のフォルダー {0} を開く",
- 	"welcomePage.extensionListSeparator": ",",
-@@ -36,4 +45,7 @@
- 	"details": "詳細",
- 	"welcomePage.buttonBackground": "ウェルカム ページのボタンの背景色。",
- 	"welcomePage.buttonHoverBackground": "ウェルカム ページのボタンのホバー背景色。"
-+=======
-+	"welcomePage.willReloadAfterInstallingKeymap": "キーボード ショートカット {0} をインストールした後、ウィンドウが再度読み込まれます。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 5e80739ecc3dfd2f0786971ab3755c4df6f1264c i18n/kor/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
-  our    100644 fec46f39171242b0a7ea9842a9a0972266bd7c28 i18n/kor/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
-  their  100644 20c5e0777c408b2975a5b8546ac88e1055f155bc i18n/kor/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,6 +14,11 @@
- 	"rootPath": "작업 영역 (예: /Users/Development/myWorkspace)의 파일 경로",
- 	"folderName": "작업 영역 폴더는 파일의 이름 (예를 들어 myFolder)에 포함 되어",
- 	"folderPath": "작업 영역 폴더는 파일의 파일 경로 (예: /Users/Development/myFolder)에 포함 되어",
-+=======
-+	"activeEditorLong": "예: /Users/Development/myProject/myFolder/myFile.txt",
-+	"activeEditorMedium": "예: myFolder/myFile.txt",
-+	"activeEditorShort": "예: myFile.txt",
-+>>>>>>> .their
- 	"appName": "예: VS Code",
- 	"dirty": "활성 편집기가 더티인 경우 더티 표시기",
- 	"separator": "값이 있는 변수로 둘러싸인 경우에만 표시되는 조건부 구분 기호 (' - ')",
-changed in both
-  base   100644 7a6e3d10873b25301b8d17d5d1b7511bb0b32a9d i18n/kor/extensions/css/package.i18n.json
-  our    100644 2d4d9da9391916e94d45c5f0a1fe31764372d347 i18n/kor/extensions/css/package.i18n.json
-  their  100644 6fe604b40287b3c182b4971f0951cefcb9ac9204 i18n/kor/extensions/css/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,66 @@
- 	],
- 	"displayName": "CSS 언어 기본",
- 	"description": "CSS,LESS,SCSS 파일에서 구문 강조 표시와 괄호 일치를 제공합니다."
-+=======
-+	"css.colorDecorators.enable.desc": "색 데코레이터 사용 또는 사용 안 함",
-+	"css.lint.argumentsInColorFunction.desc": "잘못된 매개 변수 수",
-+	"css.lint.boxModel.desc": "패딩 또는 테두리를 사용하는 경우 너비 또는 높이를 사용하지 마세요.",
-+	"css.lint.compatibleVendorPrefixes.desc": "공급업체 관련 접두사를 사용할 경우 다른 모든 공급업체 관련 속성도 포함합니다.",
-+	"css.lint.duplicateProperties.desc": "중복된 스타일 정의를 사용하지 마세요.",
-+	"css.lint.emptyRules.desc": "빈 규칙 집합을 사용하지 마세요.",
-+	"css.lint.float.desc": "'float'를 사용하지 않도록 합니다. Float를 사용하면 레이아웃의 한쪽이 바뀔 경우 CSS가 쉽게 깨질 수 있습니다.",
-+	"css.lint.fontFaceProperties.desc": "@font-face 규칙에서 'src' 및 'font-family' 속성을 정의해야 합니다.",
-+	"css.lint.hexColorLength.desc": "16진수 색은 3개 또는 6개의 16진수로 구성되어야 합니다.",
-+	"css.lint.idSelector.desc": "이러한 규칙은 HTML과 긴밀하게 결합되므로 선택기에 ID를 포함하면 안 됩니다.",
-+	"css.lint.ieHack.desc": "IE 핵(Hack)은 IE7 이상을 지원할 때만 필요합니다.",
-+	"css.lint.importStatement.desc": "Import 문은 병렬로 로드되지 않습니다.",
-+	"css.lint.important.desc": "!important는 사용하지 않도록 합니다. 이것은 전체 CSS의 특정성에 문제가 있어서 리팩터링해야 함을 나타냅니다.",
-+	"css.lint.propertyIgnoredDueToDisplay.desc": "display 때문에 속성이 무시됩니다. 예를 들어 'display: inline'을 사용할 경우 width, height, margin-top, margin-bottom 및 float 속성은 적용되지 않습니다.",
-+	"css.lint.universalSelector.desc": "범용 선택기 (*)는 느린 것으로 알려져 있습니다.",
-+	"css.lint.unknownProperties.desc": "알 수 없는 속성입니다.",
-+	"css.lint.unknownVendorSpecificProperties.desc": "알 수 없는 공급업체 관련 속성입니다.",
-+	"css.lint.vendorPrefix.desc": "공급업체 관련 접두사를 사용할 때 표준 속성도 포함합니다.",
-+	"css.lint.zeroUnits.desc": "0에는 단위가 필요하지 않습니다.",
-+	"css.validate.desc": "모든 유효성 검사 사용 또는 사용 안 함",
-+	"less.colorDecorators.enable.desc": "색 데코레이터 사용 또는 사용 안 함",
-+	"less.lint.argumentsInColorFunction.desc": "잘못된 매개 변수 수",
-+	"less.lint.boxModel.desc": "패딩 또는 테두리를 사용하는 경우 너비 또는 높이를 사용하지 마세요.",
-+	"less.lint.compatibleVendorPrefixes.desc": "공급업체 관련 접두사를 사용할 경우 다른 모든 공급업체 관련 속성도 포함합니다.",
-+	"less.lint.duplicateProperties.desc": "중복된 스타일 정의를 사용하지 마세요.",
-+	"less.lint.emptyRules.desc": "빈 규칙 집합을 사용하지 마세요.",
-+	"less.lint.float.desc": "'float'를 사용하지 않도록 합니다. Float를 사용하면 레이아웃의 한쪽이 바뀔 경우 CSS가 쉽게 깨질 수 있습니다.",
-+	"less.lint.fontFaceProperties.desc": "@font-face 규칙에서 'src' 및 'font-family' 속성을 정의해야 합니다.",
-+	"less.lint.hexColorLength.desc": "16진수 색은 3개 또는 6개의 16진수로 구성되어야 합니다.",
-+	"less.lint.idSelector.desc": "이러한 규칙은 HTML과 긴밀하게 결합되므로 선택기에 ID를 포함하면 안 됩니다.",
-+	"less.lint.ieHack.desc": "IE 핵(Hack)은 IE7 이상을 지원할 때만 필요합니다.",
-+	"less.lint.importStatement.desc": "Import 문은 병렬로 로드되지 않습니다.",
-+	"less.lint.important.desc": "!important는 사용하지 않도록 합니다. 이것은 전체 CSS의 특정성에 문제가 있어서 리팩터링해야 함을 나타냅니다.",
-+	"less.lint.propertyIgnoredDueToDisplay.desc": "display 때문에 속성이 무시됩니다. 예를 들어 'display: inline'을 사용할 경우 width, height, margin-top, margin-bottom 및 float 속성은 적용되지 않습니다.",
-+	"less.lint.universalSelector.desc": "범용 선택기 (*)는 느린 것으로 알려져 있습니다.",
-+	"less.lint.unknownProperties.desc": "알 수 없는 속성입니다.",
-+	"less.lint.unknownVendorSpecificProperties.desc": "알 수 없는 공급업체 관련 속성입니다.",
-+	"less.lint.vendorPrefix.desc": "공급업체 관련 접두사를 사용할 때 표준 속성도 포함합니다.",
-+	"less.lint.zeroUnits.desc": "0에는 단위가 필요하지 않습니다.",
-+	"less.validate.desc": "모든 유효성 검사 사용 또는 사용 안 함",
-+	"scss.colorDecorators.enable.desc": "색 데코레이터 사용 또는 사용 안 함",
-+	"scss.lint.argumentsInColorFunction.desc": "잘못된 매개 변수 수",
-+	"scss.lint.boxModel.desc": "패딩 또는 테두리를 사용하는 경우 너비 또는 높이를 사용하지 마세요.",
-+	"scss.lint.compatibleVendorPrefixes.desc": "공급업체 관련 접두사를 사용할 경우 다른 모든 공급업체 관련 속성도 포함합니다.",
-+	"scss.lint.duplicateProperties.desc": "중복된 스타일 정의를 사용하지 마세요.",
-+	"scss.lint.emptyRules.desc": "빈 규칙 집합을 사용하지 마세요.",
-+	"scss.lint.float.desc": "'float'를 사용하지 않도록 합니다. Float를 사용하면 레이아웃의 한쪽이 바뀔 경우 CSS가 쉽게 깨질 수 있습니다.",
-+	"scss.lint.fontFaceProperties.desc": "@font-face 규칙에서 'src' 및 'font-family' 속성을 정의해야 합니다.",
-+	"scss.lint.hexColorLength.desc": "16진수 색은 3개 또는 6개의 16진수로 구성되어야 합니다.",
-+	"scss.lint.idSelector.desc": "이러한 규칙은 HTML과 긴밀하게 결합되므로 선택기에 ID를 포함하면 안 됩니다.",
-+	"scss.lint.ieHack.desc": "IE 핵(Hack)은 IE7 이상을 지원할 때만 필요합니다.",
-+	"scss.lint.importStatement.desc": "Import 문은 병렬로 로드되지 않습니다.",
-+	"scss.lint.important.desc": "!important는 사용하지 않도록 합니다. 이것은 전체 CSS의 특정성에 문제가 있어서 리팩터링해야 함을 나타냅니다.",
-+	"scss.lint.propertyIgnoredDueToDisplay.desc": "display 때문에 속성이 무시됩니다. 예를 들어 'display: inline'을 사용할 경우 width, height, margin-top, margin-bottom 및 float 속성은 적용되지 않습니다.",
-+	"scss.lint.universalSelector.desc": "범용 선택기 (*)는 느린 것으로 알려져 있습니다.",
-+	"scss.lint.unknownProperties.desc": "알 수 없는 속성입니다.",
-+	"scss.lint.unknownVendorSpecificProperties.desc": "알 수 없는 공급업체 관련 속성입니다.",
-+	"scss.lint.vendorPrefix.desc": "공급업체 관련 접두사를 사용할 때 표준 속성도 포함합니다.",
-+	"scss.lint.zeroUnits.desc": "0에는 단위가 필요하지 않습니다.",
-+	"scss.validate.desc": "모든 유효성 검사 사용 또는 사용 안 함"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 24a0710bfc17d5df7544ec12288f02f088680b14 i18n/kor/extensions/git/out/askpass-main.i18n.json
-  their  100644 445155ebb536af5593ed8aed6cf71ff599aa8478 i18n/kor/extensions/git/out/askpass-main.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"missOrInvalid": "자격 증명이 없거나 잘못되었습니다."
- }
-\ No newline at end of file
-changed in both
-  base   100644 71b018dbb2c1d84795b8b16ed0cf8a04e9653745 i18n/kor/extensions/git/out/commands.i18n.json
-  our    100644 5c881abd459fc945dcc1b911f43b518f709ac538 i18n/kor/extensions/git/out/commands.i18n.json
-  their  100644 8dec8fe1c5ec3136b83c88a16639eba275229b5d i18n/kor/extensions/git/out/commands.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -49,6 +50,18 @@
- 	"commit": "그냥 제출",
- 	"no staged changes": "저장할 단계적 변경 사항이 없습니다.\n\n모든 변경 사항을 자동으로 스테이징하고 직접 저장하시겠습니까?",
- 	"always": "항상",
-+=======
-+	"branch name": "분기 이름",
-+	"clean": "변경 내용 정리",
-+	"clean repo": "체크 아웃하기 전에 리포지토리 작업 트리를 정리하세요.",
-+	"cloning": "Git 리포지토리를 복제하는 중...",
-+	"commit message": "커밋 메시지",
-+	"confirm clean": "{0}의 변경 내용을 정리하시겠습니까?",
-+	"confirm clean all": "모든 변경 내용을 정리하시겠습니까?",
-+	"confirm revert": "{0}에서 선택한 변경 내용을 되돌리시겠습니까?",
-+	"disabled": "Git은 이 작업 영역에서 사용하지 않도록 설정되어 있거나 지원되지 않습니다.",
-+	"never again": "다시 표시 안 함",
-+>>>>>>> .their
- 	"no changes": "커밋할 변경 내용이 없습니다.",
- 	"commit message": "커밋 메시지",
- 	"provide commit message": "커밋 메시지를 제공하세요.",
-@@ -73,6 +86,7 @@
- 	"nobranch": "원격에 푸시할 분기를 체크 아웃하세요.",
- 	"confirm publish branch": "'{0}' 분기에는 상향 분기가 없습니다. 이 분기를 게시하시겠습니까?",
- 	"ok": "확인",
-+<<<<<<< .our
- 	"push with tags success": "태그와 함께 푸시되었습니다.",
- 	"pick remote": "'{0}' 분기를 다음에 게시하려면 원격을 선택하세요.",
- 	"sync is unpredictable": "이 작업은 '{0}/{1}' 간에 커밋을 푸시하고 풀합니다. ",
-@@ -88,4 +102,18 @@
- 	"git error details": "Git: {0}",
- 	"git error": "Git 오류",
- 	"open git log": "Git 로그 열기"
-+=======
-+	"open git log": "Git 로그 열기",
-+	"openrepo": "리포지토리 열기",
-+	"parent": "부모 디렉터리",
-+	"pick remote": "'{0}' 분기를 다음에 게시하려면 원격을 선택하세요.",
-+	"proposeopen": "복제된 리포지토리를 여시겠습니까?",
-+	"provide branch name": "분기 이름을 입력하세요.",
-+	"provide commit message": "커밋 메시지를 제공하세요.",
-+	"remote branch at": "{0}에서 원격 분기",
-+	"repourl": "리포지토리 URL",
-+	"revert": "변경 내용 되돌리기",
-+	"sync is unpredictable": "이 작업은 '{0}' 간에 커밋을 푸시하고 풀합니다.",
-+	"tag at": "{0}의 태그"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 0b7dced80e4c0295ef84e5ec792de1bf182d5f1d i18n/kor/extensions/git/out/main.i18n.json
-  our    100644 d456beffb80631ce9efe3133a035173b4aa4e2b1 i18n/kor/extensions/git/out/main.i18n.json
-  their  100644 5797c2736c95fbfb229e40693301446aba55b9b5 i18n/kor/extensions/git/out/main.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,4 +14,9 @@
- 	"notfound": "Git을 찾을 수 없습니다. 'git.path'를 사용하여 Git을 설치하거나 구성합니다.",
- 	"updateGit": "Git 업데이트",
- 	"git20": "Git {0}이(가) 설치된 것 같습니다. 코드는 2 이하의 Git에서 최적으로 작동합니다."
-+=======
-+	"git20": "Git {0}이(가) 설치된 것 같습니다. 코드는 2 이하의 Git에서 최적으로 작동합니다.",
-+	"updateGit": "Git 업데이트",
-+	"using git": "{1}에서 git {0}을(를) 사용하는 중"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 316688ba2a1a33d5a1afea8cf16fe31d57488408 i18n/kor/extensions/git/package.i18n.json
-  our    100644 3703ac48f99d1ed061418ae09d45c9f7e6e3d128 i18n/kor/extensions/git/package.i18n.json
-  their  100644 e7ddc474486d6364101ba7b9d383a8562de56c92 i18n/kor/extensions/git/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,19 @@
- 	"command.init": "리포지토리 초기화",
- 	"command.close": "리포지토리 닫기",
- 	"command.refresh": "새로 고침",
-+=======
-+	"command.branch": "분기 만들기...",
-+	"command.checkout": "다음으로 체크 아웃...",
-+	"command.clean": "파일 정리",
-+	"command.cleanAll": "모든 파일 정리",
-+	"command.clone": "복제",
-+	"command.commit": "커밋",
-+	"command.commitAll": "모두 커밋",
-+	"command.commitAllSigned": "모두 커밋(로그오프됨)",
-+	"command.commitStaged": "스테이징된 항목 커밋",
-+	"command.commitStagedSigned": "스테이징된 항목 커밋(로그오프됨)",
-+	"command.init": "리포지토리 초기화",
-+>>>>>>> .their
- 	"command.openChange": "변경 내용 열기",
- 	"command.openFile": "파일 열기",
- 	"command.openHEADFile": "파일 열기(HEAD)",
-@@ -46,6 +60,7 @@
- 	"command.pullFrom": "가져올 위치...",
- 	"command.push": "푸시",
- 	"command.pushTo": "다음으로 푸시...",
-+<<<<<<< .our
- 	"command.pushWithTags": "태그로 푸시",
- 	"command.sync": "동기화",
- 	"command.syncRebase": "동기화(다시 지정)",
-@@ -59,6 +74,20 @@
- 	"config.enabled": "Git 사용 여부",
- 	"config.path": "Git 실행 파일의 경로",
- 	"config.autoRepositoryDetection": "리포지토리가 자동 감지되어야 하는지 여부",
-+=======
-+	"command.refresh": "새로 고침",
-+	"command.revertSelectedRanges": "선택한 범위 되돌리기",
-+	"command.showOutput": "Git 출력 표시",
-+	"command.stage": "파일 스테이징",
-+	"command.stageAll": "모든 파일 스테이징",
-+	"command.stageSelectedRanges": "선택한 범위 스테이징",
-+	"command.sync": "동기화",
-+	"command.undoCommit": "마지막 커밋 실행 취소",
-+	"command.unstage": "파일 스테이징 취소",
-+	"command.unstageAll": "모든 파일 스테이징 취소",
-+	"command.unstageSelectedRanges": "선택한 범위 스테이징 취소",
-+	"config.autofetch": "자동 가져오기 사용 여부",
-+>>>>>>> .their
- 	"config.autorefresh": "자동 새로 고침 사용 여부",
- 	"config.autofetch": "자동 가져오기 사용 여부",
- 	"config.enableLongCommitWarning": "긴 커밋 메시지에 대해 경고할지 여부입니다.",
-added in both
-  our    100644 de5777d4c7a338b315bf466ae3f24f018fa10b3e i18n/kor/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
-  their  100644 cf25d73230cfbdca434d801e4152e2bfdb2b5b84 i18n/kor/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"typescript.jsDocCompletionItem.documentation": "JSDoc 주석"
- }
-\ No newline at end of file
-changed in both
-  base   100644 3239c9dc3610d7de5cd626f3862ef4dc71f9acef i18n/kor/extensions/typescript/out/utils/projectStatus.i18n.json
-  our    100644 49fa81ab46e51e4ed1b194f156882dc415f625d2 i18n/kor/extensions/typescript/out/utils/projectStatus.i18n.json
-  their  100644 630d98d5028f674ff39be21d4b84c000a4a75966 i18n/kor/extensions/typescript/out/utils/projectStatus.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,11 @@
- 	],
- 	"hintExclude": "프로젝트 전체에서 JavaScript/TypeScript 언어 기능을 사용하도록 설정하려면 {0}과(와) 같이 파일이 많은 폴더를 제외하세요.",
- 	"hintExclude.generic": "프로젝트 전체에서 JavaScript/TypeScript 언어 기능을 사용하도록 설정하려면 사용하지 않는 소스 파일이 포함된 큰 폴더를 제외하세요.",
-+=======
-+	"hintExclude": "프로젝트 전체에서 JavaScript/TypeScript 언어 기능을 사용하도록 설정하려면 {0}과(와) 같이 파일이 많은 폴더를 제외하세요.",
-+	"hintExclude.generic": "프로젝트 전체에서 JavaScript/TypeScript 언어 기능을 사용하도록 설정하려면 사용하지 않는 소스 파일이 포함된 큰 폴더를 제외하세요.",
-+	"hintExclude.tooltip": "프로젝트 전체에서 JavaScript/TypeScript 언어 기능을 사용하도록 설정하려면 사용하지 않는 소스 파일이 포함된 큰 폴더를 제외하세요.",
-+>>>>>>> .their
- 	"large.label": "제외 구성",
- 	"hintExclude.tooltip": "프로젝트 전체에서 JavaScript/TypeScript 언어 기능을 사용하도록 설정하려면 사용하지 않는 소스 파일이 포함된 큰 폴더를 제외하세요."
- }
-\ No newline at end of file
-changed in both
-  base   100644 7fde3af1e85c174a615fcbcbc9491791b318726c i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 c96c0fe1469ce78842b73db686d63d6305f28dfb i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 fee11a8488c76d4d469ad94a8c7fe5596cdb280d i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,11 +7,22 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"acceptSuggestionOnCommitCharacter": "커밋 문자에 대한 제안을 허용할지를 제어합니다. 예를 들어 JavaScript에서는 세미콜론(';')이 제안을 허용하고 해당 문자를 입력하는 커밋 문자일 수 있습니다.",
-+	"acceptSuggestionOnEnter": "'Tab' 키 외에 'Enter' 키에 대한 제안도 허용할지를 제어합니다. 새 줄을 삽입하는 동작과 제안을 허용하는 동작 간의 모호함을 없앨 수 있습니다.",
-+	"autoClosingBrackets": "괄호를 연 다음에 편집기에서 괄호를 자동으로 닫을지 여부를 제어합니다.",
-+	"codeLens": "편집기에서 코드 필터를 표시하는지 여부를 제어합니다.",
-+	"cursorBlinking": "커서 애니메이션 스타일을 제어합니다. 가능한 값은 'blink', 'smooth', 'phase', 'expand' 및 'solid'입니다.",
-+	"cursorStyle": "커서 스타일을 제어합니다. 허용되는 값은 '블록', '블록-윤곽', '줄', '줄-가늘게', '밑줄' 및 '밑줄-가늘게'입니다.",
-+	"detectIndentation": "파일을 열면 파일 콘텐츠를 기반으로 하여 'editor.tabSize'와 'editor.insertSpaces'가 검색됩니다.",
-+	"dragAndDrop": "편집기에서 끌어서 놓기로 선택 영역을 이동할 수 있는지 여부를 제어합니다.",
-+>>>>>>> .their
- 	"editorConfigurationTitle": "편집기",
- 	"fontFamily": "글꼴 패밀리를 제어합니다.",
- 	"fontWeight": "글꼴 두께를 제어합니다.",
- 	"fontSize": "글꼴 크기(픽셀)를 제어합니다.",
- 	"lineHeight": "줄 높이를 제어합니다. fontSize의 lineHeight를 계산하려면 0을 사용합니다.",
-+<<<<<<< .our
- 	"letterSpacing": "글자 간격을 픽셀 단위로 조정합니다.",
- 	"lineNumbers.off": "줄 번호는 렌더링 되지 않습니다.",
- 	"lineNumbers.on": "줄 번호는 절대값으로 렌더링 됩니다.",
-@@ -43,6 +55,13 @@
- 	"wordWrap": "줄 바꿈 여부를 제어합니다. 다음 중 하나일 수 있습니다.\n - 'off' (줄 바꿈 사용 안 함),\n - 'on' (뷰포트 줄 바꿈),\n - 'wordWrapColumn' (`editor.wordWrapColumn`에서 줄 바꿈) 또는\n - 'bounded' (뷰포트의 최소값 및 `editor.wordWrapColumn`에서 줄 바꿈).",
- 	"wordWrapColumn": "`editor.wordWrap`이 'wordWrapColumn' 또는 'bounded'인 경우 편집기의 열 줄 바꿈을 제어합니다.",
- 	"wrappingIndent": "줄 바꿈 행의 들여쓰기를 제어합니다. 'none', 'same', 'indent' 또는 'deepIndent' 중 하나일 수 있습니다.",
-+=======
-+	"lineNumbers": "줄 번호의 표시 여부를 제어합니다. 가능한 값은 'on', 'off', 'relative'입니다. 'relative'는 현재 커서 위치에서 줄 수를 표시합니다.",
-+	"matchBrackets": "대괄호 중 하나를 선택할 때 일치하는 대괄호를 강조 표시합니다.",
-+	"minimap.enabled": "미니맵 표시 여부를 제어합니다.",
-+	"minimap.maxColumn": "최대 특정 수의 열을 렌더링하도록 미니맵의 너비를 제한합니다.",
-+	"minimap.renderCharacters": "줄의 실제 문자(색 블록 아님) 렌더링",
-+>>>>>>> .their
- 	"mouseWheelScrollSensitivity": "마우스 휠 스크롤 이벤트의 `deltaX` 및 `deltaY`에서 사용할 승수",
- 	"multiCursorModifier.ctrlCmd": "Windows와 Linux의 'Control'을 macOS의 'Command'로 매핑합니다.",
- 	"multiCursorModifier.alt": "Windows와 Linux의 'Alt'를 macOS의 'Option'으로 매핑합니다.",
-@@ -112,7 +131,28 @@
- 	"codeActionsOnSaveTimeout": "저장할 때 실행되는 코드 동작에 대한 시간 제한입니다.",
- 	"selectionClipboard": "Linux 주 클립보드의 지원 여부를 제어합니다.",
- 	"sideBySide": "diff 편집기에서 diff를 나란히 표시할지 인라인으로 표시할지 여부를 제어합니다.",
-+<<<<<<< .our
- 	"ignoreTrimWhitespace": "diff 편집기에서 선행 공백 또는 후행 공백 변경을 diffs로 표시할지 여부를 제어합니다.",
- 	"largeFileOptimizations": "큰 파일에 대한 특수 처리로, 메모리를 많이 사용하는 특정 기능을 사용하지 않도록 설정합니다.",
- 	"renderIndicators": "diff 편집기에서 추가/제거된 변경 내용에 대해 +/- 표시기를 표시하는지 여부를 제어합니다."
-+=======
-+	"snippetSuggestions": "코드 조각이 다른 추천과 함께 표시되는지 여부 및 정렬 방법을 제어합니다.",
-+	"stablePeek": "해당 콘텐츠를 두 번 클릭하거나 <Esc> 키를 누르더라도 Peek 편집기를 열린 상태로 유지합니다.",
-+	"suggestFontSize": "제안 위젯의 글꼴 크기",
-+	"suggestLineHeight": "제안 위젯의 줄 높이",
-+	"suggestOnTriggerCharacters": "트리거 문자를 입력할 때 제안을 자동으로 표시할지 여부를 제어합니다.",
-+	"tabSize": "탭 한 개에 해당하는 공백 수입니다. `editor.detectIndentation`이 켜져 있는 경우 이 설정은 파일 콘텐츠에 따라 재정의됩니다.",
-+	"tabSize.errorMessage": "'number'가 필요합니다. 값 \"auto\"는 `editor.detectIndentation` 설정에 의해 바뀌었습니다.",
-+	"trimAutoWhitespace": "끝에 자동 삽입된 공백 제거",
-+	"useTabStops": "탭 정지 뒤에 공백 삽입 및 삭제",
-+	"wordBasedSuggestions": "단어 기반 추천을 사용합니다.",
-+	"wordSeparators": "단어 관련 탐색 또는 작업을 수행할 때 단어 구분 기호로 사용되는 문자입니다.",
-+	"wordWrap": "줄 바꿈 여부를 제어합니다. 다음 중 하나일 수 있습니다.\n - 'off'(줄 바꿈 사용 안 함),\n - 'on'(뷰포트 줄 바꿈),\n - 'wordWrapColumn'(`editor.wordWrapColumn`에서 줄 바꿈) 또는\n - 'bounded'(뷰포트의 최소값 및 `editor.wordWrapColumn`에서 줄 바꿈)",
-+	"wordWrap.bounded": "뷰포트의 최소값 및 `editor.wordWrapColumn`에서 줄이 바뀝니다.",
-+	"wordWrap.off": "줄이 바뀌지 않습니다.",
-+	"wordWrap.on": "뷰포트 너비에서 줄이 바뀝니다.",
-+	"wordWrap.wordWrapColumn": "`editor.wordWrapColumn`에서 줄이 바뀝니다.",
-+	"wordWrapColumn": "`editor.wordWrap`이 'wordWrapColumn' 또는 'bounded'인 경우 편집기의 열 줄 바꿈을 제어합니다.",
-+	"wrappingIndent": "줄 바꿈 행의 들여쓰기를 제어합니다. 'none', 'same' 또는 'indent' 중 하나일 수 있습니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 aaa8a4e22233703c289acf96543e5aef275344aa i18n/kor/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
-  our    100644 6180413fbf30e1113c39e0ba13da5a45669f1dff i18n/kor/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
-  their  100644 756cb263eca905d89c2b303bb186612be842954a i18n/kor/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
-@@ -20,5 +20,13 @@
- 	"meta.typeDefinitions.title": "– {0} 형식 정의",
- 	"actions.goToTypeDefinition.label": "형식 정의로 이동",
- 	"actions.peekTypeDefinition.label": "형식 정의 미리 보기",
-+<<<<<<< .our
- 	"multipleResults": "{0}개 정의를 표시하려면 클릭하세요."
-+=======
-+	"actions.previewDecl.label": "정의 피킹(Peeking)",
-+	"generic.noResults": "정의를 찾을 수 없음",
-+	"meta.title": " – 정의 {0}개",
-+	"multipleResults": "{0}개 정의를 표시하려면 클릭하세요.",
-+	"noResultWord": "'{0}'에 대한 정의를 찾을 수 없습니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-removed in local
-  base   100644 ee860687c51b023b551665f3f722bedc73f7e533 i18n/kor/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
-  their  100644 39f69d64552aa790c18ec2fdc28552ce0463a275 i18n/kor/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/src/vs/workbench/electron-browser/commands.i18n.json
-  our    100644 983899514ca518324d9e85f57712db39d3040bbe i18n/kor/src/vs/workbench/electron-browser/commands.i18n.json
-  their  100644 3a1051dcfdad7ec7db70524f0a31f277885230df i18n/kor/src/vs/workbench/electron-browser/commands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"diffLeftRightLabel": "{0} ⟷ {1}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 ceff939e9b2b4db9db3787248c6638e4d2acaf4d i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 faff44b17686fcb835995d2bfd92efcfdcc183b1 i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 c94c16d6e3def436547afdaf6a856ea733a8eddd i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -34,6 +34,7 @@
- 	"sideBarLocation": "사이드바의 위치를 제어합니다. 워크벤치의 왼쪽이나 오른쪽에 표시될 수 있습니다.",
- 	"panelDefaultLocation": "패널의 기본 위치를 제어합니다. 워크벤치의 아래 또는 오른쪽에 표시될 수 있습니다.",
- 	"statusBarVisibility": "워크벤치 아래쪽에서 상태 표시줄의 표시 유형을 제어합니다.",
-+<<<<<<< .our
- 	"activityBarVisibility": "워크벤치에서 작업 막대의 표시 유형을 제어합니다.",
- 	"viewVisibility": "보기 머리글 작업의 표시 여부를 제어합니다. 보기 머리글 작업은 항상 표시할 수도 있고 보기에 포커스가 있거나 보기를 마우스로 가리킬 때만 표시할 수도 있습니다.",
- 	"fontAliasing": "워크벤치에서 글꼴 앨리어싱 방식을 제어합니다.\n- 기본: 서브 픽셀 글꼴 다듬기. 대부분의 일반 디스플레이에서 가장 선명한 글꼴 제공\n- 안티앨리어싱: 서브 픽셀이 아닌 픽셀 단위에서 글꼴 다듬기. 전반적으로 더 밝은 느낌을 줄 수 있음\n- 없음: 글꼴 다듬기 사용 안 함. 텍스트 모서리가 각지게 표시됨\n- 자동: 디스플레이의 DPI에 따라 `기본` 또는 `안티앨리어싱`을 자동으로 적용합니다.",
-@@ -42,6 +43,28 @@
- 	"workbench.fontAliasing.none": "글꼴 다듬기를 사용하지 않습니다. 텍스트 가장자리가 각지게 표시됩니다.",
- 	"workbench.fontAliasing.auto": "디스플레이의 DPI에 따라 `기본` 또는 `안티앨리어싱`을 자동으로 적용합니다.",
- 	"enableNaturalLanguageSettingsSearch": "설정에 대한 자연어 검색 모드를 사용할지 여부를 제어합니다.",
-+=======
-+	"title": "활성 편집기를 기반으로 창 제목을 제어합니다. 변수는 컨텍스트를 기반으로 대체됩니다.\n${activeEditorShort}: 예: myFile.txt\n${activeEditorMedium}, 예: myFolder/myFile.txt\n${activeEditorLong}, 예: /Users/Development/myProject/myFolder/myFile.txt\n${rootName}, 예: myProject\n${rootPath}, 예: /Users/Development/myProject\n${appName}, 예: VS Code\n${dirty}(활성 편집기가 더티인 경우 더티 표시기)\n${separator}(값이 있는 변수로 둘러싸인 경우에만 표시되는 조건부 구분 기호(\" - \"))",
-+	"titleBarStyle": "창 제목 표시줄의 모양을 조정합니다. 변경 내용을 적용하려면 전체 다시 시작해야 합니다.",
-+	"view": "보기",
-+	"window.menuBarVisibility.default": "메뉴가 전체 화면 모드에서만 숨겨집니다.",
-+	"window.menuBarVisibility.hidden": "메뉴가 항상 숨겨집니다.",
-+	"window.menuBarVisibility.toggle": "\"메뉴가 숨겨져 있지만 <Alt> 키를 통해 메뉴를 표시할 수 있습니다.",
-+	"window.menuBarVisibility.visible": "메뉴가 전체 화면 모드에서도 항상 표시됩니다.",
-+	"window.newWindowDimensions.default": "화면 가운데에서 새 창을 엽니다.",
-+	"window.newWindowDimensions.fullscreen": "전체 화면 모드에서 새 창을 엽니다.",
-+	"window.newWindowDimensions.inherit": "마지막 활성 창과 동일한 크기로 새 창을 엽니다.",
-+	"window.newWindowDimensions.maximized": "최대화된 새 창을 엽니다.",
-+	"window.openFilesInNewWindow.default": "Dock 또는 Finder(macOS 전용)를 통해 파일을 연 경우를 제외하고 파일이 파일의 폴더가 열린 창 또는 마지막 활성 창에서 열립니다.",
-+	"window.openFilesInNewWindow.off": "파일이 파일의 폴더가 열려 있는 창 또는 마지막 활성 창에서 열립니다.",
-+	"window.openFilesInNewWindow.on": "파일이 새 창에서 열립니다.",
-+	"window.openFoldersInNewWindow.default": "폴더를 응용 프로그램 내에서 선택(예: 파일 메뉴를 통해)하는 경우를 제외하고 폴더가 새 창에서 열립니다.",
-+	"window.openFoldersInNewWindow.off": "폴더가 마지막 활성 창을 바꿉니다.",
-+	"window.openFoldersInNewWindow.on": "폴더가 새 창에서 열립니다.",
-+	"window.reopenFolders.all": "마지막 세션의 모든 폴더를 다시 엽니다.",
-+	"window.reopenFolders.none": "폴더를 다시 열지 않습니다.",
-+	"window.reopenFolders.one": "마지막 활성 폴더를 다시 엽니다.",
-+>>>>>>> .their
- 	"windowConfigurationTitle": "창",
- 	"window.openFilesInNewWindow.on": "파일이 새 창에서 열립니다.",
- 	"window.openFilesInNewWindow.off": "파일이 파일의 폴더가 열려 있는 창 또는 마지막 활성 창에서 열립니다.",
-added in both
-  our    100644 de7f5c56db0787c1fdbab23fb79f22bd36cd2a16 i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
-  their  100644 27bed4f90e7d4c06639f234ab63b2d05ded3a90a i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,6 +9,16 @@
- 	],
- 	"wordWrapMigration.ok": "확인",
- 	"wordWrapMigration.dontShowAgain": "다시 표시 안 함",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"wordWrapMigration.dontShowAgain": "다시 표시 안 함",
-+	"wordWrapMigration.ok": "확인",
-+>>>>>>> .their
- 	"wordWrapMigration.openSettings": "설정 열기",
- 	"wordWrapMigration.prompt": "`editor.wrappingColumn` 설정은 `editor.wordWrap`을 위해 사용되지 않습니다."
- }
-\ No newline at end of file
-changed in both
-  base   100644 0ede5c9b8c62d3ee686883f08b9b56031554a995 i18n/kor/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-  our    100644 d1d8a2f6ed3974f592b71cc06f7743b0360b0d40 i18n/kor/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-  their  100644 61e3b5d4dc70603a95b422339baaf5cedb24e2bf i18n/kor/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-@@ -41,7 +41,34 @@
- 	"debugConsoleAction": "디버그 콘솔",
- 	"unreadOutput": "디버그 콘솔의 새 출력",
- 	"debugFocusConsole": "디버그 콘솔에 포커스",
-+<<<<<<< .our
- 	"focusSession": "세션에 포커스 설정",
-+=======
-+	"disableAllBreakpoints": "모든 중단점 해제",
-+	"disableBreakpoint": "중단점 사용 안 함",
-+	"disconnectDebug": "연결 끊기",
-+	"editConditionalBreakpoint": "중단점 편집...",
-+	"enableAllBreakpoints": "모든 중단점 설정",
-+	"enableBreakpoint": "중단점 사용",
-+	"focusProcess": "프로세스에 포커스",
-+	"launchJsonNeedsConfigurtion": "'launch.json' 구성 또는 수정",
-+	"openLaunchJson": "{0} 열기",
-+	"pauseDebug": "일시 중지",
-+	"reapplyAllBreakpoints": "모든 중단점 다시 적용",
-+	"reconnectDebug": "다시 연결",
-+	"removeAllBreakpoints": "모든 중단점 제거",
-+	"removeAllWatchExpressions": "모든 식 제거",
-+	"removeBreakpoint": "중단점 제거",
-+	"removeWatchExpression": "식 제거",
-+	"renameFunctionBreakpoint": "함수 중단점 이름 바꾸기",
-+	"restartDebug": "다시 시작",
-+	"restartFrame": "프레임 다시 시작",
-+	"reverseContinue": "반전",
-+	"selectAndStartDebugging": "디버깅 선택 및 시작",
-+	"setValue": "값 설정",
-+	"startDebug": "디버깅 시작",
-+	"startWithoutDebugging": "디버깅하지 않고 시작",
-+>>>>>>> .their
- 	"stepBackDebug": "뒤로 이동",
- 	"reverseContinue": "반전"
- }
-\ No newline at end of file
-added in both
-  our    100644 ffa51bf68f415d5664436b04957dc4d289b3292d i18n/kor/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
-  their  100644 2d54b7fca89076c3cb19ff1b7f56b9a8caf7ae6d i18n/kor/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -12,4 +13,16 @@
- 	"addConfiguration": "구성 추가...",
- 	"noConfigurationsMatching": "일치하는 디버그 구성 없음",
- 	"noConfigurationsFound": "디버그 구성을 찾을 수 없습니다. 'launch.json' 파일을 만드세요."
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"debugAriaLabel": "실행할 시작 구성의 이름을 입력하세요.",
-+	"entryAriaLabel": "{0}, 디버그",
-+	"noConfigurationsFound": "디버그 구성을 찾을 수 없습니다. 'launch.json' 파일을 만드세요.",
-+	"noConfigurationsMatching": "일치하는 디버그 구성 없음"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 ab384c942862ab29cd194d272a5fc278c032b151 i18n/kor/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
-  their  100644 44cea43570a66bc35aa99782e68eda3d8defaa26 i18n/kor/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,4 +11,13 @@
- 	"debugExceptionWidgetBackground": "예외 위젯 배경색입니다.",
- 	"exceptionThrownWithId": "예외가 발생했습니다. {0}",
- 	"exceptionThrown": "예외가 발생했습니다."
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"exceptionThrown": "예외가 발생함"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 91e9f16e71aa5280a4c762cd545de8e1c7592e21 i18n/kor/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  our    100644 383c5e7a51dcf49e07c095068c906ca99489d2d6 i18n/kor/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  their  100644 ae12ae262968e3ff40fa5bbc15c5b49c29c4880d i18n/kor/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-changed in both
-  base   100644 87aa04051c75e67e7fc9946e50b2c72e01a4579c i18n/kor/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  our    100644 e49f8a732d537adaf418b41491fe7b363cf6da78 i18n/kor/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  their  100644 f3719fa52911cd8020d236bcc459e08e89f6fbc0 i18n/kor/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-@@ -8,6 +8,20 @@
- 	],
- 	"debugAdapterBinNotFound": "디버그 어댑터 실행 파일 '{0}'이(가) 없습니다.",
- 	"debugAdapterCannotDetermineExecutable": "디버그 어댑터 '{0}'에 대한 실행 파일을 확인할 수 없습니다.",
-+<<<<<<< .our
- 	"unableToLaunchDebugAdapter": "'{0}'에서 디버그 어댑터를 시작할 수 없습니다.",
- 	"unableToLaunchDebugAdapterNoArgs": "디버그 어댑터를 시작할 수 없습니다."
-+=======
-+	"debugLinuxConfiguration": "Linux 특정 시작 구성 특성입니다.",
-+	"debugName": "구성 이름이며, 구성 시작 드롭다운 메뉴에 표시됩니다.",
-+	"debugOSXConfiguration": "OS X 특정 시작 구성 특성입니다.",
-+	"debugPrelaunchTask": "디버그 세션이 시작되기 이전에 실행할 작업입니다.",
-+	"debugRequest": "구성 형식을 요청합니다. \"시작\" 또는 \"연결\"일 수 있습니다.",
-+	"debugServer": "디버그 확장 배포 전용입니다. 포트가 지정된 경우 VS Code에서는 서버 모드로 실행하는 디버그 어댑터에 연결을 시도합니다.",
-+	"debugType": "구성의 형식입니다.",
-+	"debugWindowsConfiguration": "Windows 특정 시작 구성 특성입니다.",
-+	"deprecatedVariables": "'env.', 'config.' 및 'command.'는 사용되지 않습니다. 대신 'env:', 'config:' 및 'command:'를 사용하세요.",
-+	"internalConsoleOptions": "내부 디버그 콘솔의 동작을 제어합니다.",
-+	"node2NotSupported": "\"node2\"는 더 이상 지원되지 않습니다. 대신 \"node\"를 사용하고 \"protocol\" 특성을 \"inspector\"로 설정하세요."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 b5f64c4c8a3bb04482c23c2130fd6aa9c438a843 i18n/kor/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 64e3a748c1d30ddcf3658546af6b8c004e841f1b i18n/kor/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 673449b25e8baac06a58f01567070255b2de49f9 i18n/kor/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-@@ -4,6 +4,7 @@
-  *--------------------------------------------------------------------------------------------*/
- // Do not edit this file. It is machine generated.
- {
-+<<<<<<< .our
- 	"showExplorerViewlet": "탐색기 표시",
- 	"explore": "탐색기",
- 	"view": "보기",
-@@ -11,6 +12,25 @@
- 	"binaryFileEditor": "이진 파일 편집기",
- 	"filesConfigurationTitle": "파일",
- 	"exclude": "파일 및 폴더를 제외하도록 GLOB 패턴을 구성합니다. 예를 들어 파일 탐색기는 이 설정에 따라 표시하거나 숨길 파일 및 폴더를 결정합니다.",
-+=======
-+	"associations": "파일과 언어의 연결을 구성하세요(예: '*.extension': 'html'). 이러한 구성은 설치된 언어의 기본 연결보다 우선 순위가 높습니다.",
-+	"autoReveal": "탐색기에서 파일을 열 때 자동으로 표시하고 선택할지를 제어합니다.",
-+	"autoSave": "더티 파일 자동 저장을 제어합니다. 허용되는 값은 '{0}', '{1}', '{2}'(편집기가 포커스를 잃음), '{3}'(창이 포커스를 잃음)입니다. '{4}'(으)로 설정하는 경우 'files.autoSaveDelay'에서 지연을 구성할 수 있습니다.",
-+	"autoSaveDelay": "더티 파일을 자동으로 저장할 때까지의 지연(밀리초)을 제어합니다. 'files.autoSave'를 '{0}'(으)로 설정한 경우에만 적용됩니다.",
-+	"binaryFileEditor": "이진 파일 편집기",
-+	"dynamicHeight": "열려 있는 편집기 섹션의 높이가 요소 수에 따라 동적으로 조정되는지 여부를 제어합니다.",
-+	"editorConfigurationTitle": "편집기",
-+	"enableDragAndDrop": "탐색기에서 끌어서 놓기를 통한 파일 및 폴더 이동을 허용하는지를 제어합니다.",
-+	"encoding": "파일을 읽고 쓸 때 사용할 기본 문자 집합 인코딩입니다.",
-+	"eol": "줄 바꿈 문자의 기본 끝입니다.",
-+	"exclude": "파일과 폴더를 제외하기 위한 GLOB 패턴을 구성합니다.",
-+	"explore": "탐색기",
-+	"explorerConfigurationTitle": "파일 탐색기",
-+	"files.autoSave.afterDelay": "'files.autoSaveDelay' 구성 후 더티 파일이 자동으로 저장됩니다.",
-+	"files.autoSave.off": "더티 파일이 자동으로 저장되지 않습니다.",
-+	"files.autoSave.onFocusChange": "편집기가 포커스를 잃으면 더티 파일이 자동으로 저장됩니다.",
-+	"files.autoSave.onWindowChange": "창이 포커스를 잃으면 더티 파일이 자동으로 저장됩니다.",
-+>>>>>>> .their
- 	"files.exclude.boolean": "파일 경로를 일치시킬 GLOB 패턴입니다. 패턴을 사용하거나 사용하지 않도록 설정하려면 true 또는 false로 설정하세요.",
- 	"files.exclude.when": "일치하는 파일의 형제에 대한 추가 검사입니다. $(basename)을 일치하는 파일 이름에 대한 변수로 사용하세요.",
- 	"associations": "파일과 언어의 연결을 구성하세요(예: \"*.extension\": \"html\"). 이러한 구성은 설치된 언어의 기본 연결보다 우선 순위가 높습니다.",
-added in both
-  our    100644 c9ce2ccb5f32a19d65968604dbba1a387e2c36e0 i18n/kor/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
-@@ -3,6 +3,7 @@
-  *  Licensed under the MIT License. See License.txt in the project root for license information.
-  *--------------------------------------------------------------------------------------------*/
- // Do not edit this file. It is machine generated.
-+<<<<<<< .our
- {
- 	"vscode.extension.contributes.snippets": "코드 조각을 적용합니다.",
- 	"vscode.extension.contributes.snippets-language": "이 코드 조각이 적용되는 언어 식별자입니다.",
-@@ -11,4 +12,7 @@
- 	"invalid.path.0": "`contributes.{0}.path`에 문자열이 필요합니다. 제공된 값: {1}",
- 	"invalid.path.1": "확장 폴더({2})에 포함할 `contributes.{0}.path`({1})가 필요합니다. 확장이 이식 불가능해질 수 있습니다.",
- 	"badVariableUse": "\"{0}\"-snippet은 snippet-variables 및 snippet-placeholders와 혼동하기 쉽습니다. 자세한 내용은\n https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax를 참조하세요."
--}
-\ No newline at end of file
-+}
-+=======
-+{}
-+>>>>>>> .their
-added in both
-  our    100644 528ca95cbc966fb1629b4f122e4fa54aa88cd4cc i18n/kor/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
-  their  100644 7fd318c3ac3ad37607695361f136ae8bc67ad381 i18n/kor/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,4 +10,13 @@
- 	"snippet.suggestions.label": "코드 조각 삽입",
- 	"sep.userSnippet": "사용자 코드 조각",
- 	"sep.extSnippet": "확장 코드 조각"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"snippet.suggestions.label": "코드 조각 삽입"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 4bb4deec5c3699ac48cd50b00a644c268e111a10 i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 eefed0e4d58d81161889f00697ee64b3ab90a942 i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -16,5 +17,13 @@
- 	"badVariableUse": "'{0}' 확장의 1개 이상의 코드 조각은 snippet-variables 및 snippet-placeholders와 혼동하기 쉽습니다(자세한 내용은 https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax를 참조하세요).",
- 	"badFile": "코드 조각 파일 \"{0}\"을(를) 읽을 수 없습니다.",
- 	"detail.snippet": "{0}({1})",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"snippetSuggest.longLabel": "{0}, {1}"
- }
-\ No newline at end of file
-added in both
-  our    100644 d4dba2ce351d3106843a8bf6bfe9a46932d4337d i18n/kor/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
-  their  100644 40160128bd8fd76ba8e312fd8f1d8298f23c54b3 i18n/kor/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"tabCompletion": "접두사가 일치하는 경우 코드 조각을 삽입합니다. 'quickSuggestions'를 사용하지 않을 때 가장 잘 작동합니다."
- }
-\ No newline at end of file
-changed in both
-  base   100644 52abb53fbebd961683e0c858dd6d0e9901b14df4 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 0c53998d6e084853fcbcba0b56050a6d820a2b6f i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 e56a4e13e75cec65671d50796cb86da91fffcf9a i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -7,6 +8,14 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"workbench.action.terminal.toggleTerminal": "통합 터미널 설정/해제",
-+=======
-+	"workbench.action.terminal.clear": "지우기",
-+	"workbench.action.terminal.copySelection": "선택 영역 복사",
-+	"workbench.action.terminal.focus": "터미널에 포커스",
-+	"workbench.action.terminal.focusAtIndex": "{0} 터미널로 포커스 이동",
-+	"workbench.action.terminal.focusNext": "다음 터미널에 포커스",
-+	"workbench.action.terminal.focusPrevious": "이전 터미널에 포커스",
-+>>>>>>> .their
- 	"workbench.action.terminal.kill": "활성 터미널 인스턴스 종료",
- 	"workbench.action.terminal.kill.short": "터미널 종료",
- 	"workbench.action.terminal.quickKill": "터미널 인스턴스 종료",
-added in both
-  our    100644 41ca426ace31e84127ef6bca48017cabc9916033 i18n/kor/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  their  100644 7fa8a91e4769778b62547bd25f8ea312e1568f84 i18n/kor/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -39,4 +40,48 @@
- 	"welcomePage.interfaceOverviewDescription": "UI의 주요 구성 요소를 강조 표시하는 시각적 오버레이 가져오기",
- 	"welcomePage.interactivePlayground": "대화형 실습",
- 	"welcomePage.interactivePlaygroundDescription": "짧은 연습에서 기본 편집기 기능 사용해 보기"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"welcomePage.atom": "Atom",
-+	"welcomePage.atomCurrent": "Atom(현재)",
-+	"welcomePage.cloneGitRepository": "Git 리포지토리 복제...",
-+	"welcomePage.colorTheme": "색 테마",
-+	"welcomePage.colorThemeDescription": "편집기 및 코드가 좋아하는 방식으로 표시되게 만들기",
-+	"welcomePage.configureSettings": "설정 구성",
-+	"welcomePage.configureSettingsDescription": "설정을 조정하여 VS Code 의 전체 기능 잠금 해제",
-+	"welcomePage.editingEvolved": "편집 향상됨",
-+	"welcomePage.gitHubRepository": "GitHub 리포지토리",
-+	"welcomePage.help": "도움말",
-+	"welcomePage.installKeymap": "{0}, {1}, {2} 및 {3}의 바로 가기 키 설치",
-+	"welcomePage.installKeymapDescription": "바로 가기 키 설치",
-+	"welcomePage.interactivePlayground": "대화형 실습",
-+	"welcomePage.interactivePlaygroundDescription": "짧은 연습에서 기본 편집기 기능 사용해 보기",
-+	"welcomePage.interfaceOverview": "인터페이스 개요",
-+	"welcomePage.interfaceOverviewDescription": "UI의 주요 구성 요소를 강조 표시하는 시각적 오버레이 가져오기",
-+	"welcomePage.introductoryVideos": "소개 비디오",
-+	"welcomePage.keybindingsReference": "바로 가기 키 참조",
-+	"welcomePage.keybindingsReferenceDescription": "가장 일반적인 바로 가기 키가 포함된 인쇄 가능한 PDF",
-+	"welcomePage.newFile": "새 파일",
-+	"welcomePage.noRecentFolders": "최근 폴더 없음",
-+	"welcomePage.openFolder": "폴더 열기...",
-+	"welcomePage.others": "기타",
-+	"welcomePage.productDocumentation": "제품 설명서",
-+	"welcomePage.quickLinks": "빠른 링크",
-+	"welcomePage.recent": "최근 항목",
-+	"welcomePage.showCommands": "모든 명령 찾기 및 실행",
-+	"welcomePage.showCommandsDescription": "제어판에서 명령을 빠르게 검색 및 액세스({0})",
-+	"welcomePage.showOnStartup": "시작 시 시작 페이지 표시",
-+	"welcomePage.stackOverflow": "스택 오버플로",
-+	"welcomePage.start": "시작",
-+	"welcomePage.sublime": "Sublime",
-+	"welcomePage.sublimeCurrent": "Sublime(현재)",
-+	"welcomePage.vim": "Vim",
-+	"welcomePage.vimCurrent": "Vim(현재)",
-+	"welcomePage.vscode": "Visual Studio Code"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 1d4d83ceee6a2a719a51dd3d7e070d4dca22560f i18n/kor/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-  our    100644 1591b991e17d0824d0970a0892f8ff07452a2cd5 i18n/kor/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-  their  100644 15e765a854f1317afc68598056b518ab5519e31e i18n/kor/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -21,10 +22,18 @@
- 	"welcomePage.willReloadAfterInstallingExtensionPack": "{0}에 대한 추가 지원을 설치한 후 창이 다시 로드됩니다.",
- 	"welcomePage.installingExtensionPack": "{0}에 대한 추가 지원을 설치하는 중...",
- 	"welcomePage.extensionPackNotFound": "ID가 {1}인 {0}에 대한 지원을 찾을 수 없습니다.",
-+=======
-+	"cancel": "취소",
-+	"ok": "확인",
-+	"welcome.title": "시작",
-+	"welcomePage": "시작",
-+	"welcomePage.installingKeymap": "{0} 바로 가기 키를 설치하는 중...",
-+>>>>>>> .their
- 	"welcomePage.keymapAlreadyInstalled": "{0} 바로 가기 키가 이미 설치되어 있습니다.",
- 	"welcomePage.willReloadAfterInstallingKeymap": "{0} 바로 가기 키를 설치한 후 창이 다시 로드됩니다.",
- 	"welcomePage.installingKeymap": "{0} 바로 가기 키를 설치하는 중...",
- 	"welcomePage.keymapNotFound": "ID가 {1}인 {0} 바로 가기 키를 찾을 수 없습니다.",
-+<<<<<<< .our
- 	"welcome.title": "시작",
- 	"welcomePage.openFolderWithPath": "경로가 {1}인 {0} 폴더 열기",
- 	"welcomePage.extensionListSeparator": ", ",
-@@ -36,4 +45,7 @@
- 	"details": "세부 정보",
- 	"welcomePage.buttonBackground": "시작 페이지에서 단추의 배경색입니다.",
- 	"welcomePage.buttonHoverBackground": "시작 페이지에서 단추의 커서 올리기 배경색입니다."
-+=======
-+	"welcomePage.willReloadAfterInstallingKeymap": "{0} 바로 가기 키를 설치한 후 창이 다시 로드됩니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 692270456244623f36484edbba71c62ef2e117c2 i18n/rus/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
-  our    100644 e34b2279c4b7fca0b48e03c80622e6f54c4360dc i18n/rus/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
-  their  100644 d57f7a25c004d1207755514090a84d13050c0d6e i18n/rus/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,6 +14,11 @@
- 	"rootPath": "путь к рабочей области (например, /Users/Development/myWorkspace)",
- 	"folderName": "имя папки рабочей области, в которой содержится файл (например, myFolder)",
- 	"folderPath": "путь к папке рабочей области, в которой содержится файл (например, /Users/Development/myFolder)",
-+=======
-+	"activeEditorLong": "например, /Users/Development/myProject/myFolder/myFile.txt",
-+	"activeEditorMedium": "например, myFolder/myFile.txt",
-+	"activeEditorShort": "например, myFile.txt",
-+>>>>>>> .their
- 	"appName": "например, VS Code",
- 	"dirty": "индикатор dirty, если активный редактор является \"грязным\"",
- 	"separator": "условный разделитель (-), который отображается, только если окружен переменными со значениями",
-changed in both
-  base   100644 019c0cb4a12f05619889400ee10bdd46b744c480 i18n/rus/extensions/css/package.i18n.json
-  our    100644 f94884afe4ab08854717ecf9bfcce904b5da5115 i18n/rus/extensions/css/package.i18n.json
-  their  100644 7ef7e9bb3d46d92252f6c72aeb8a837248a74ddc i18n/rus/extensions/css/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,66 @@
- 	],
- 	"displayName": "Основы языка CSS",
- 	"description": "Предоставляет подсветку синтаксиса и выделение парных скобок в файлах CSS, LESS и SCSS."
-+=======
-+	"css.colorDecorators.enable.desc": "Включает или отключает декораторы цвета.",
-+	"css.lint.argumentsInColorFunction.desc": "Недопустимое число параметров",
-+	"css.lint.boxModel.desc": "Не использовать ширину или высоту при использовании поля или границы",
-+	"css.lint.compatibleVendorPrefixes.desc": "При использовании зависящего от поставщика префикса также указывайте все остальные свойства поставщика",
-+	"css.lint.duplicateProperties.desc": "Не использовать дублирующиеся определения стилей",
-+	"css.lint.emptyRules.desc": "Не использовать пустые наборы правил",
-+	"css.lint.float.desc": "Старайтесь не использовать \"float\". Из-за элементов \"float\" работа кода CSS может легко нарушиться, если изменить один из аспектов разметки.",
-+	"css.lint.fontFaceProperties.desc": "Правило @font-face должно определять свойства src и font-family",
-+	"css.lint.hexColorLength.desc": "Цвета в шестнадцатеричном формате должны содержать три или шесть шестнадцатеричных чисел",
-+	"css.lint.idSelector.desc": "Селекторы не должны содержать идентификаторов, потому что эти правила слишком тесно связаны с HTML.",
-+	"css.lint.ieHack.desc": "Полезные советы для Internet Explorer требуются только при поддержке Internet Explorer 7 и более ранних версий",
-+	"css.lint.importStatement.desc": "Операторы импорта не загружаются параллельно",
-+	"css.lint.important.desc": "Старайтесь не использовать !important, так как это признак того, что весь код CSS стал неуправляемым и его надо переработать.",
-+	"css.lint.propertyIgnoredDueToDisplay.desc": "Свойство проигнорировано из-за значения свойства display. Например, при \"display: inline\" свойства width, height, margin-top, margin-bottom и float не работают",
-+	"css.lint.universalSelector.desc": "Универсальный селектор (*) работает медленно",
-+	"css.lint.unknownProperties.desc": "Неизвестное свойство.",
-+	"css.lint.unknownVendorSpecificProperties.desc": "Неизвестное свойство поставщика.",
-+	"css.lint.vendorPrefix.desc": "При использовании зависящего от поставщика префикса также указывайте стандартное свойство",
-+	"css.lint.zeroUnits.desc": "Для нуля не требуется единица измерения",
-+	"css.validate.desc": "Включает или отключает все проверки",
-+	"less.colorDecorators.enable.desc": "Включает или отключает декораторы цвета.",
-+	"less.lint.argumentsInColorFunction.desc": "Недопустимое число параметров",
-+	"less.lint.boxModel.desc": "Не использовать ширину или высоту при использовании поля или границы",
-+	"less.lint.compatibleVendorPrefixes.desc": "При использовании зависящего от поставщика префикса также указывайте все остальные свойства поставщика",
-+	"less.lint.duplicateProperties.desc": "Не использовать дублирующиеся определения стилей",
-+	"less.lint.emptyRules.desc": "Не использовать пустые наборы правил",
-+	"less.lint.float.desc": "Старайтесь не использовать \"float\". Из-за элементов \"float\" работа кода CSS может легко нарушиться, если изменить один из аспектов разметки.",
-+	"less.lint.fontFaceProperties.desc": "Правило @font-face должно определять свойства src и font-family",
-+	"less.lint.hexColorLength.desc": "Цвета в шестнадцатеричном формате должны содержать три или шесть шестнадцатеричных чисел",
-+	"less.lint.idSelector.desc": "Селекторы не должны содержать идентификаторов, потому что эти правила слишком тесно связаны с HTML.",
-+	"less.lint.ieHack.desc": "Полезные советы для Internet Explorer требуются только при поддержке Internet Explorer 7 и более ранних версий",
-+	"less.lint.importStatement.desc": "Операторы импорта не загружаются параллельно",
-+	"less.lint.important.desc": "Старайтесь не использовать !important, так как это признак того, что весь код CSS стал неуправляемым и его надо переработать.",
-+	"less.lint.propertyIgnoredDueToDisplay.desc": "Свойство проигнорировано из-за значения свойства display. Например, при \"display: inline\" свойства width, height, margin-top, margin-bottom и float не работают",
-+	"less.lint.universalSelector.desc": "Универсальный селектор (*) работает медленно",
-+	"less.lint.unknownProperties.desc": "Неизвестное свойство.",
-+	"less.lint.unknownVendorSpecificProperties.desc": "Неизвестное свойство поставщика.",
-+	"less.lint.vendorPrefix.desc": "При использовании зависящего от поставщика префикса также указывайте стандартное свойство",
-+	"less.lint.zeroUnits.desc": "Для нуля не требуется единица измерения",
-+	"less.validate.desc": "Включает или отключает все проверки",
-+	"scss.colorDecorators.enable.desc": "Включает или отключает декораторы цвета.",
-+	"scss.lint.argumentsInColorFunction.desc": "Недопустимое число параметров",
-+	"scss.lint.boxModel.desc": "Не использовать ширину или высоту при использовании поля или границы",
-+	"scss.lint.compatibleVendorPrefixes.desc": "При использовании зависящего от поставщика префикса также указывайте все остальные свойства поставщика",
-+	"scss.lint.duplicateProperties.desc": "Не использовать дублирующиеся определения стилей",
-+	"scss.lint.emptyRules.desc": "Не использовать пустые наборы правил",
-+	"scss.lint.float.desc": "Старайтесь не использовать \"float\". Из-за элементов \"float\" работа кода CSS может легко нарушиться, если изменить один из аспектов разметки.",
-+	"scss.lint.fontFaceProperties.desc": "Правило @font-face должно определять свойства src и font-family",
-+	"scss.lint.hexColorLength.desc": "Цвета в шестнадцатеричном формате должны содержать три или шесть шестнадцатеричных чисел",
-+	"scss.lint.idSelector.desc": "Селекторы не должны содержать идентификаторов, потому что эти правила слишком тесно связаны с HTML.",
-+	"scss.lint.ieHack.desc": "Полезные советы для Internet Explorer требуются только при поддержке Internet Explorer 7 и более ранних версий",
-+	"scss.lint.importStatement.desc": "Операторы импорта не загружаются параллельно",
-+	"scss.lint.important.desc": "Старайтесь не использовать !important, так как это признак того, что весь код CSS стал неуправляемым и его надо переработать.",
-+	"scss.lint.propertyIgnoredDueToDisplay.desc": "Свойство проигнорировано из-за значения свойства display. Например, при \"display: inline\" свойства width, height, margin-top, margin-bottom и float не работают",
-+	"scss.lint.universalSelector.desc": "Универсальный селектор (*) работает медленно",
-+	"scss.lint.unknownProperties.desc": "Неизвестное свойство.",
-+	"scss.lint.unknownVendorSpecificProperties.desc": "Неизвестное свойство поставщика.",
-+	"scss.lint.vendorPrefix.desc": "При использовании зависящего от поставщика префикса также указывайте стандартное свойство",
-+	"scss.lint.zeroUnits.desc": "Для нуля не требуется единица измерения",
-+	"scss.validate.desc": "Включает или отключает все проверки"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 a9f991ebfb6444d2066c23a4f77579dee091fd4e i18n/rus/extensions/git/out/askpass-main.i18n.json
-  their  100644 024ac9fb55a52421becffbad8cdbdf69aaee3f23 i18n/rus/extensions/git/out/askpass-main.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"missOrInvalid": "Учетные данные отсутствуют или недопустимы."
- }
-\ No newline at end of file
-changed in both
-  base   100644 934de25675f7d83e12d958fadb5f0456e1b6dc29 i18n/rus/extensions/git/out/commands.i18n.json
-  our    100644 bdd7adadfadc50db48d014178fb19ce838d13900 i18n/rus/extensions/git/out/commands.i18n.json
-  their  100644 d8c8134d3ae29b85558c549262f143c9b54aeb74 i18n/rus/extensions/git/out/commands.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -49,6 +50,18 @@
- 	"commit": "Все равно зафиксировать",
- 	"no staged changes": "Отсутствуют промежуточные изменения для фиксации.\n\nВы хотите сделать все изменения промежуточными и зафиксировать их напрямую?",
- 	"always": "Всегда",
-+=======
-+	"branch name": "Имя ветви",
-+	"clean": "Отменить изменения",
-+	"clean repo": "Очистите рабочее дерево репозитория перед извлечением.",
-+	"cloning": "Клонируется репозиторий Git...",
-+	"commit message": "Сообщение о фиксации",
-+	"confirm clean": "Действительно отменить изменения в {0}?",
-+	"confirm clean all": "Действительно отменить все изменения?",
-+	"confirm revert": "Вы действительно хотите отменить выбранные изменения в {0}?",
-+	"disabled": "GIT отключен или не поддерживается в этой рабочей области",
-+	"never again": "ОК. Больше не показывать",
-+>>>>>>> .their
- 	"no changes": "Нет изменений для фиксации.",
- 	"commit message": "Сообщение о фиксации",
- 	"provide commit message": "Введите сообщение фиксации.",
-@@ -73,6 +86,7 @@
- 	"nobranch": "Извлеките ветвь, чтобы передать данные в удаленный репозиторий.",
- 	"confirm publish branch": "В ветви '{0}' отсутствует восходящая ветвь. Вы хотите опубликовать эту ветвь?",
- 	"ok": "ОК",
-+<<<<<<< .our
- 	"push with tags success": "Файлы с тегами успешно отправлены.",
- 	"pick remote": "Выберите удаленный сервер, на котором нужно опубликовать ветвь \"{0}\":",
- 	"sync is unpredictable": "Это действие отправляет фиксации в \"{0}/{1}\" и извлекает их из этого расположения.",
-@@ -88,4 +102,18 @@
- 	"git error details": "Git: {0}",
- 	"git error": "Ошибка Git",
- 	"open git log": "Открыть журнал GIT"
-+=======
-+	"open git log": "Открыть журнал GIT",
-+	"openrepo": "Открыть репозиторий",
-+	"parent": "Родительский каталог",
-+	"pick remote": "Выберите удаленный сервер, на котором нужно опубликовать ветвь \"{0}\":",
-+	"proposeopen": "Вы хотите открыть клонированный репозиторий?",
-+	"provide branch name": "Укажите имя ветви.",
-+	"provide commit message": "Введите сообщение фиксации.",
-+	"remote branch at": "Удаленная ветвь в {0}",
-+	"repourl": "URL-адрес репозитория",
-+	"revert": "Отменить изменения",
-+	"sync is unpredictable": "Это действие отправляет фиксации в \"{0}\" и извлекает их из этого расположения.",
-+	"tag at": "Тег в {0}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 b928d15d657ac6aeecca256ec2f073310f773b10 i18n/rus/extensions/git/out/main.i18n.json
-  our    100644 3d91096bb1a71d2e03304d644d4e7ee2d4b09ac4 i18n/rus/extensions/git/out/main.i18n.json
-  their  100644 1a5f4788a2db3d29b91dd99918d41ed43cfe6612 i18n/rus/extensions/git/out/main.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,4 +14,9 @@
- 	"notfound": "Git не найден. Установите Git или укажите путь к нему в параметре 'git.path'.",
- 	"updateGit": "Обновить Git",
- 	"git20": "У вас установлен Git {0}. Код лучше всего работает с Git >= 2."
-+=======
-+	"git20": "У вас установлен Git {0}. Код лучше всего работает с Git >= 2.",
-+	"updateGit": "Обновить Git",
-+	"using git": "Использование GIT {0} из {1}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 569d98ab338b47ee0224a11d876cb1c87b6029c4 i18n/rus/extensions/git/package.i18n.json
-  our    100644 f033330e3d5aad5041c41da260339bd159e31636 i18n/rus/extensions/git/package.i18n.json
-  their  100644 17035d6a302da9e883366f1f53a8bb99d08466fc i18n/rus/extensions/git/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -41,10 +42,27 @@
- 	"command.merge": "Объединить ветвь...",
- 	"command.createTag": "Создать тег",
- 	"command.fetch": "Получить",
-+=======
-+	"command.branch": "Создать ветвь...",
-+	"command.checkout": "Извлечь в...",
-+	"command.clean": "Очистить файл",
-+	"command.cleanAll": "Очистить все файлы",
-+	"command.clone": "Клонировать",
-+	"command.commit": "Зафиксировать",
-+	"command.commitAll": "Зафиксировать все",
-+	"command.commitAllSigned": "Зафиксировать все (завершено)",
-+	"command.commitStaged": "Зафиксировать промежуточные",
-+	"command.commitStagedSigned": "Зафиксировать промежуточные (завершено)",
-+	"command.init": "Инициализировать репозиторий",
-+	"command.openChange": "Открыть изменение",
-+	"command.openFile": "Открыть файл",
-+	"command.publish": "Опубликовать",
-+>>>>>>> .their
- 	"command.pull": "Получить",
- 	"command.pullRebase": "Получить (переместить изменения из одной ветви в другую)",
- 	"command.pullFrom": "Загрузить с...",
- 	"command.push": "Отправить",
-+<<<<<<< .our
- 	"command.pushTo": "Отправить в:",
- 	"command.pushWithTags": "Отправить с тегами",
- 	"command.sync": "Синхронизация",
-@@ -59,6 +77,21 @@
- 	"config.enabled": "Включен ли GIT",
- 	"config.path": "Путь к исполняемому файлу GIT",
- 	"config.autoRepositoryDetection": "Следует ли обнаруживать репозитории автоматически",
-+=======
-+	"command.pushTo": "Отправить в...",
-+	"command.refresh": "Обновить",
-+	"command.revertSelectedRanges": "Отменить выбранные диапазоны",
-+	"command.showOutput": "Показать выходные данные GIT",
-+	"command.stage": "Промежуточно хранить файл",
-+	"command.stageAll": "Промежуточно хранить все файлы",
-+	"command.stageSelectedRanges": "Разместить выбранные диапазоны",
-+	"command.sync": "Синхронизация",
-+	"command.undoCommit": "Отменить последнюю фиксацию",
-+	"command.unstage": "Отменить промежуточное хранение файла",
-+	"command.unstageAll": "Отменить промежуточное хранение всех файлов",
-+	"command.unstageSelectedRanges": "Отменить размещение выбранных диапазонов",
-+	"config.autofetch": "Включено ли автоматическое получение",
-+>>>>>>> .their
- 	"config.autorefresh": "Включено ли автоматическое обновление",
- 	"config.autofetch": "Включено ли автоматическое получение",
- 	"config.enableLongCommitWarning": "Следует ли предупреждать о длинных сообщениях о фиксации",
-added in both
-  our    100644 b4cad43043f8ef72c8657e0f8f70b131caed4f5a i18n/rus/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
-  their  100644 b7c9fb342de8f2d83a364c1f5c2a276e96ef8af8 i18n/rus/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"typescript.jsDocCompletionItem.documentation": "Комментарий JSDoc"
- }
-\ No newline at end of file
-changed in both
-  base   100644 6314518f0eec7ff50bd74e756bb58d2636db15e5 i18n/rus/extensions/typescript/out/utils/projectStatus.i18n.json
-  our    100644 54d1199165ba020b3f2a007cb43db5aa66a134d8 i18n/rus/extensions/typescript/out/utils/projectStatus.i18n.json
-  their  100644 9f6687c1202db2b68e0179f11a49cf1a2f95ab1e i18n/rus/extensions/typescript/out/utils/projectStatus.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,11 @@
- 	],
- 	"hintExclude": "Чтобы включить языковые функции JavaScript/TypeScript IntelliSense во всем проекте, исключите папки с большим числом файлов, например: {0}.",
- 	"hintExclude.generic": "Чтобы включить языковые функции JavaScript/TypeScript IntelliSense во всем проекте, исключите большие папки с исходными файлами, с которыми вы не работаете.",
-+=======
-+	"hintExclude": "Чтобы включить языковые функции JavaScript/TypeScript IntelliSense во всем проекте, исключите папки с большим числом файлов, например: {0}.",
-+	"hintExclude.generic": "Чтобы включить языковые функции JavaScript/TypeScript IntelliSense во всем проекте, исключите большие папки с исходными файлами, с которыми вы не работаете.",
-+	"hintExclude.tooltip": "Чтобы включить языковые функции JavaScript/TypeScript IntelliSense во всем проекте, исключите большие папки с исходными файлами, с которыми вы не работаете.",
-+>>>>>>> .their
- 	"large.label": "Настройка исключений",
- 	"hintExclude.tooltip": "Чтобы включить языковые функции JavaScript/TypeScript IntelliSense во всем проекте, исключите большие папки с исходными файлами, с которыми вы не работаете."
- }
-\ No newline at end of file
-changed in both
-  base   100644 db88fca8ecad655ed3328f3f183071366e3c6b48 i18n/rus/src/vs/code/electron-main/menus.i18n.json
-  our    100644 6c6420ff3fff2721736f81d703d8eb2e0907f38c i18n/rus/src/vs/code/electron-main/menus.i18n.json
-  their  100644 7309a83be974c336071b83da51ad5985ad006dfc i18n/rus/src/vs/code/electron-main/menus.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,6 +14,15 @@
- 	"mGoto": "Перей&&ти",
- 	"mDebug": "&&Отладка",
- 	"mWindow": "Окно",
-+=======
-+	"aboutDetail": "\nВерсия {0}\nФиксация {1}\nДата {2}\nОболочка {3}\nОбработчик {4}\nNode {5}",
-+	"mAbout": "О программе {0}",
-+	"mBringToFront": "Переместить все на передний план",
-+	"mClose": "Закрыть",
-+	"mEdit": "&&Правка",
-+	"mFile": "&&Файл",
-+	"mGoto": "&&Переход",
-+>>>>>>> .their
- 	"mHelp": "&&Справка",
- 	"mTask": "&&Задачи",
- 	"miNewWindow": "&&Новое окно",
-@@ -21,6 +31,7 @@
- 	"mHide": "Скрыть {0}",
- 	"mHideOthers": "Скрыть другие",
- 	"mShowAll": "Показать все",
-+<<<<<<< .our
- 	"miQuit": "Выйти из {0}",
- 	"miNewFile": "&&Новый файл",
- 	"miOpen": "Открыть...",
-@@ -33,6 +44,15 @@
- 	"miSave": "Сохранить",
- 	"miSaveAs": "Сохранить &&как...",
- 	"miSaveAll": "Сохранить &&все",
-+=======
-+	"mView": "&&Вид",
-+	"mWindow": "Окно",
-+	"miAbout": "&&О программе",
-+	"miAccessibilityOptions": "Специальные &&возможности",
-+	"miAddSelectionToNextFindMatch": "Добавить &&следующее вхождение",
-+	"miAddSelectionToPreviousFindMatch": "Добавить &&предыдущее вхождение",
-+	"miAdditionalViews": "Дополнительные &&представления",
-+>>>>>>> .their
- 	"miAutoSave": "Автосохранение",
- 	"miRevert": "Отменить &&изменения в файле",
- 	"miCloseWindow": "Закрыть &&окно",
-@@ -43,7 +63,32 @@
- 	"miOpenSettings": "&&Параметры",
- 	"miOpenKeymap": "&&Сочетания клавиш",
- 	"miOpenKeymapExtensions": "&&Расширения раскладки клавиатуры",
-+<<<<<<< .our
-+	"miOpenSnippets": "&&Фрагменты кода пользователя",
-+=======
-+	"miOpenRecent": "Открыть &&последние",
-+	"miOpenSettings": "&&Параметры",
- 	"miOpenSnippets": "&&Фрагменты кода пользователя",
-+	"miPaste": "&&Вставить",
-+	"miPreferences": "&&Параметры",
-+	"miPreviousEditor": "&&Предыдущий редактор",
-+	"miPreviousEditorInGroup": "&&Предыдущий используемый редактор в группе",
-+	"miPreviousGroup": "&&Предыдущая группа",
-+	"miPrivacyStatement": "&&Заявление о конфиденциальности",
-+	"miQuit": "Выйти из {0}",
-+	"miRedo": "&&Повторить",
-+	"miReleaseNotes": "&&Заметки о выпуске",
-+	"miReopenClosedEditor": "&&Повторно открыть закрытый редактор",
-+	"miReplace": "&&Заменить",
-+	"miReplaceInFiles": "Заменить &&в файлах",
-+	"miReportIssues": "&&Сообщить о проблемах",
-+	"miRestartToUpdate": "Перезапустить для обновления...",
-+	"miRevert": "Отменить &&изменения в файле",
-+	"miSave": "&&Сохранить",
-+	"miSaveAll": "Сохранить &&все",
-+	"miSaveAs": "Сохранить &&как...",
-+	"miSelectAll": "&&Выделить все",
-+>>>>>>> .their
- 	"miSelectColorTheme": "Цветовая &&тема",
- 	"miSelectIconTheme": "Тема значка &&файла",
- 	"miPreferences": "Параметры",
-changed in both
-  base   100644 b3e5ee15895be34451fd8b0d534a61b081bca8b9 i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 66cf48db0f575d6b4f93e4e908a24029fed35a72 i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 7e3d03f643da3f82123f9a12ed8a4c71b6365456 i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,11 +7,22 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"acceptSuggestionOnCommitCharacter": "Определяет, будут ли предложения приниматься символами фиксации. Например, в JavaScript точка с запятой (\";\") может быть символом фиксации, принимающим предложение и вводящим данный символ.",
-+	"acceptSuggestionOnEnter": "Определяет, будут ли предложения приниматься клавишей ВВОД в дополнение к клавише TAB. Это помогает избежать неоднозначности между вставкой новых строк и принятием предложений.",
-+	"autoClosingBrackets": "Определяет, должен ли редактор автоматически закрывать скобки после открытия.",
-+	"codeLens": "Управляет показом групп связанных элементов кода в редакторе",
-+	"cursorBlinking": "Управляет стилем анимации курсора. Допустимые значения: \"blink\", \"smooth\", \"phase\", \"expand\" и \"solid\"",
-+	"cursorStyle": "Определяет стиль курсора. Допустимые значения: \"block\", \"block-outline\", \"line\", \"line-thin\", \"underline\" и \"underline-thin\"",
-+	"detectIndentation": "При открытии файла editor.tabSize и editor.insertSpaces будут определяться на основе содержимого файла.",
-+	"dragAndDrop": "Определяет, следует ли редактору разрешить перемещение выделенных элементов с помощью перетаскивания.",
-+>>>>>>> .their
- 	"editorConfigurationTitle": "Редактор",
- 	"fontFamily": "Определяет семейство шрифтов.",
- 	"fontWeight": "Управляет насыщенностью шрифта.",
- 	"fontSize": "Управляет размером шрифта в пикселях.",
- 	"lineHeight": "Управляет высотой строк. Укажите 0 для вычисления высоты строки по размеру шрифта.",
-+<<<<<<< .our
- 	"letterSpacing": "Управляет интервалом между буквами в пикселях.",
- 	"lineNumbers.off": "Номера строк не отображаются.",
- 	"lineNumbers.on": "Отображаются абсолютные номера строк.",
-@@ -43,6 +55,13 @@
- 	"wordWrap": "Определяет, как должны переноситься строки. Допустимые значения:\n - \"off\" (отключить перенос);\n - \"on\" (перенос окна просмотра);\n - \"wordWrapColumn\" (перенос в \"editor.wordWrapColumn\");\n - \"bounded\" (перенос при минимальной ширине окна просмотра и \"editor.wordWrapColumn\").",
- 	"wordWrapColumn": "Определяет столбец переноса редактора, если значение \"editor.wordWrap\" — \"wordWrapColumn\" или \"bounded\".",
- 	"wrappingIndent": "Управляет отступом строк с переносом по словам. Допустимые значения: 'none', 'same', 'indent' и 'deepIndent'.",
-+=======
-+	"lineNumbers": "Управляет видимостью номеров строк. Возможные значения: \"on\", \"off\" и \"relative\". Значение \"relative\" показывает количество строк, начиная с текущего положения курсора.",
-+	"matchBrackets": "Выделяет соответствующие скобки при выборе одной из них.",
-+	"minimap.enabled": "Определяет, отображается ли мини-карта",
-+	"minimap.maxColumn": "Ограничивает ширину мини-карты для отображения числа столбцов не больше определенного.",
-+	"minimap.renderCharacters": "Отображает фактические символы в строке вместо цветных блоков.",
-+>>>>>>> .their
- 	"mouseWheelScrollSensitivity": "Множитель, используемый для параметров deltaX и deltaY событий прокрутки колесика мыши.",
- 	"multiCursorModifier.ctrlCmd": "Соответствует клавише CTRL в Windows и Linux и клавише COMMAND в macOS.",
- 	"multiCursorModifier.alt": "Соответствует клавише ALT в Windows и Linux и клавише OPTION в macOS.",
-@@ -112,7 +131,28 @@
- 	"codeActionsOnSaveTimeout": "Время ожидания для действий кода, которые будут выполнены при сохранении.",
- 	"selectionClipboard": "Контролирует, следует ли поддерживать первичный буфер обмена Linux.",
- 	"sideBySide": "Определяет, как редактор несовпадений отображает отличия: рядом или в тексте.",
-+<<<<<<< .our
- 	"ignoreTrimWhitespace": "Определяет, должен ли редактор несовпадений трактовать несовпадения символов-разделителей как различия.",
- 	"largeFileOptimizations": "Специальная обработка для больших файлов с отключением некоторых функций, которые интенсивно используют память.",
- 	"renderIndicators": "Определяет отображение редактором несовпадений индикаторов +/- для добавленных или удаленных изменений"
-+=======
-+	"snippetSuggestions": "Управляет отображением фрагментов вместе с другими предложениями и их сортировкой.",
-+	"stablePeek": "Оставлять быстрые редакторы открытыми, даже если дважды щелкнуто их содержимое или нажата клавиша ESC.",
-+	"suggestFontSize": "Размер шрифта мини-приложения предложений",
-+	"suggestLineHeight": "Высота строки мини-приложения с предложениями",
-+	"suggestOnTriggerCharacters": "Определяет, должны ли при вводе триггерных символов автоматически отображаться предложения.",
-+	"tabSize": "Число пробелов в табуляции. Эта настройка переопределяется на основании содержимого файла, когда включен параметр \"editor.detectIndentation\".",
-+	"tabSize.errorMessage": "Ожидается число. Обратите внимание, что значение auto заменено параметром editor.detectIndentation.",
-+	"trimAutoWhitespace": "Удалить автоматически вставляемый конечный пробел",
-+	"useTabStops": "Вставка и удаление пробелов после позиции табуляции",
-+	"wordBasedSuggestions": "Включите предложения на основе слов.",
-+	"wordSeparators": "Символы, которые будут использоваться как разделители слов при выполнении навигации или других операций, связанных со словами.",
-+	"wordWrap": "Определяет, как должны переноситься строки. Допустимые значения:\n — \"off\" (отключить перенос);\n — \"on\" (перенос окна просмотра);\n — \"wordWrapColumn\" (перенос в \"editor.wordWrapColumn\");\n — \"bounded\" (перенос при минимальной ширине окна просмотра и \"editor.wordWrapColumn\").",
-+	"wordWrap.bounded": "Строки будут перенесены по минимальному значению из двух: ширина окна просмотра и \"editor.wordWrapColumn\".",
-+	"wordWrap.off": "Строки не будут переноситься никогда.",
-+	"wordWrap.on": "Строки будут переноситься по ширине окна просмотра.",
-+	"wordWrap.wordWrapColumn": "Строки будут переноситься по \"editor.wordWrapColumn\".",
-+	"wordWrapColumn": "Определяет столбец переноса редактора, если значение \"editor.wordWrap\" — \"wordWrapColumn\" или \"bounded\".",
-+	"wrappingIndent": "Управляет отступом строк с переносом по словам. Допустимые значения: \"none\", \"same\" или \"indent\"."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 48cd58e421d24eabfbb0926eaeeaaec338fdc47c i18n/rus/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
-  our    100644 39e4e0a5e2e08f233c1b6bced17e7fb3578961b0 i18n/rus/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
-  their  100644 9540824eaf5e546c6a2c67b20364776df292a0df i18n/rus/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
-@@ -20,5 +20,13 @@
- 	"meta.typeDefinitions.title": "— {0} определений типов",
- 	"actions.goToTypeDefinition.label": "Перейти к определению типа",
- 	"actions.peekTypeDefinition.label": "Показать определение типа",
-+<<<<<<< .our
- 	"multipleResults": "Щелкните, чтобы отобразить определения ({0})."
-+=======
-+	"actions.previewDecl.label": "Показать определение",
-+	"generic.noResults": "Определения не найдены.",
-+	"meta.title": " — определения {0}",
-+	"multipleResults": "Щелкните, чтобы отобразить определения ({0}).",
-+	"noResultWord": "Определение для \"{0}\" не найдено."
-+>>>>>>> .their
- }
-\ No newline at end of file
-removed in local
-  base   100644 485caa87c1c65c6d5db82a29e993057b591f2a89 i18n/rus/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
-  their  100644 c8cca95f2207f0f00b1a78d78956e32209387b35 i18n/rus/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/src/vs/workbench/electron-browser/commands.i18n.json
-  our    100644 983899514ca518324d9e85f57712db39d3040bbe i18n/rus/src/vs/workbench/electron-browser/commands.i18n.json
-  their  100644 3a1051dcfdad7ec7db70524f0a31f277885230df i18n/rus/src/vs/workbench/electron-browser/commands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"diffLeftRightLabel": "{0} ⟷ {1}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 dd9ba516a2ee79b14558d0442e69077f35f0fb85 i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 bdb5e10a72aa6a97a13c01acd6d5626456147e68 i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 081f4679aeefcdd7fd723eae53ee7a329d887327 i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -34,6 +34,7 @@
- 	"sideBarLocation": "Определяет расположение боковой панели: слева или справа от рабочего места.",
- 	"panelDefaultLocation": "Определяет расположение панели по умолчанию. Она может находиться снизу или справа от рабочего места.",
- 	"statusBarVisibility": "Управляет видимостью строки состояния в нижней части рабочего места.",
-+<<<<<<< .our
- 	"activityBarVisibility": "Управляет видимостью панели действий на рабочем месте.",
- 	"viewVisibility": "Управляет видимостью действий в заголовке представления. Действия в заголовке представления могут быть видимы всегда или видимы только тогда, когда представление получает фокус или на него наводится курсор мыши.",
- 	"fontAliasing": "Управляет методом сглаживания шрифтов в рабочей области.\n- default: субпиксельное сглаживание шрифтов; позволит добиться максимальной четкости текста на большинстве дисплеев за исключением Retina\n- antialiased: сглаживание шрифтов на уровне пикселей, в отличие от субпиксельного сглаживания; позволит сделать шрифт более светлым в целом\n- none: сглаживание шрифтов отключено; текст будет отображаться с неровными острыми краями\n- auto: автоматически применяется режим \"default\" или \"antialiased\" в зависимости от разрешения дисплея (количество точек на дюйм).",
-@@ -42,6 +43,28 @@
- 	"workbench.fontAliasing.none": "Отключает сглаживание шрифтов; текст будет отображаться с неровными острыми краями.",
- 	"workbench.fontAliasing.auto": "Автоматически применяется режим \"default\" или \"antialiased\" в зависимости от разрешения дисплея (количество точек на дюйм).",
- 	"enableNaturalLanguageSettingsSearch": "Определяет, следует ли включить режим поиска естественного языка для параметров.",
-+=======
-+	"title": "Определяет заголовок окна в зависимости от активного редактора. Переменные заменяются на основании контекста.\n${activeEditorShort}: например, myFile.txt\n${activeEditorMedium}: например, myFolder/myFile.txt\n${activeEditorLong}: например, /Users/Development/myProject/myFolder/myFile.txt\n${rootName}: например, myProject\n${rootPath}: например, /Users/Development/myProject\n${appName}: например, VS Code\n${dirty}: индикатор \"грязного\", если активный редактор является \"грязным\"\n${separator}: условный разделитель (\" - \"), который отображается, только если окружен переменными со значениями.",
-+	"titleBarStyle": "Настройка внешнего вида заголовка окна. Чтобы применить изменения, потребуется полный перезапуск.",
-+	"view": "Просмотреть",
-+	"window.menuBarVisibility.default": "Меню скрыто только в полноэкранном режиме.",
-+	"window.menuBarVisibility.hidden": "Меню всегда скрыто.",
-+	"window.menuBarVisibility.toggle": "Меню скрыто, но его можно вывести с помощью клавиши ALT.",
-+	"window.menuBarVisibility.visible": "Меню всегда видимо, даже в полноэкранном режиме.",
-+	"window.newWindowDimensions.default": "Открывать новые окна в центре экрана.",
-+	"window.newWindowDimensions.fullscreen": "Открывать новые окна в полноэкранном режиме.",
-+	"window.newWindowDimensions.inherit": "Открывать новые окна того же размера, что и последнее активное окно.",
-+	"window.newWindowDimensions.maximized": "Открывать новые окна в развернутом состоянии.",
-+	"window.openFilesInNewWindow.default": "Файлы будут открываться в окне с открытой папкой файлов или последнем активном окне, если они не открываются из панели Dock или системы поиска (только macOS).",
-+	"window.openFilesInNewWindow.off": "Файлы будут открываться в окне с открытой папкой файлов или последнем активном окне.",
-+	"window.openFilesInNewWindow.on": "Файлы будут открываться в новом окне.",
-+	"window.openFoldersInNewWindow.default": "Папки будут открываться в новом окне, если папка не выбрана в приложении (например, в меню \"Файл\").",
-+	"window.openFoldersInNewWindow.off": "Папки будут заменять последнее активное окно.",
-+	"window.openFoldersInNewWindow.on": "Папки будут открываться в новом окне.",
-+	"window.reopenFolders.all": "Повторное открытие всех папок последнего сеанса.",
-+	"window.reopenFolders.none": "Запрет повторного открытия папки.",
-+	"window.reopenFolders.one": "Повторное открытие последней активной папки.",
-+>>>>>>> .their
- 	"windowConfigurationTitle": "Окно",
- 	"window.openFilesInNewWindow.on": "Файлы будут открываться в новом окне.",
- 	"window.openFilesInNewWindow.off": "Файлы будут открываться в окне с открытой папкой файлов или последнем активном окне.",
-added in both
-  our    100644 6087a179298ebb0f604e6ce87a37194f88f97921 i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
-  their  100644 a596e42d2027b5c7b900235a43d37b3a4d8c5136 i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,6 +9,16 @@
- 	],
- 	"wordWrapMigration.ok": "ОК",
- 	"wordWrapMigration.dontShowAgain": "Больше не показывать",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"wordWrapMigration.dontShowAgain": "Больше не показывать",
-+	"wordWrapMigration.ok": "ОК",
-+>>>>>>> .their
- 	"wordWrapMigration.openSettings": "Открыть параметры",
- 	"wordWrapMigration.prompt": "Параметр \"editor.wrappingColumn\" устарел и заменен на \"editor.wordWrap\"."
- }
-\ No newline at end of file
-changed in both
-  base   100644 e6ae136434c031696746230292daad3256bd150e i18n/rus/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-  our    100644 0b8d433c4e50d4d4decc158fdf8055636c428d1b i18n/rus/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-  their  100644 92151a89c5840ceea49cd6a213e00416056f6ce0 i18n/rus/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-@@ -41,7 +41,34 @@
- 	"debugConsoleAction": "Консоль отладки",
- 	"unreadOutput": "Новые выходные данные в консоли отладки",
- 	"debugFocusConsole": "Фокус консоли отладки",
-+<<<<<<< .our
- 	"focusSession": "Перевести фокус на сеанс",
-+=======
-+	"disableAllBreakpoints": "Отключить все точки останова",
-+	"disableBreakpoint": "Выключить точку останова",
-+	"disconnectDebug": "Отключить",
-+	"editConditionalBreakpoint": "Изменить точку останова…",
-+	"enableAllBreakpoints": "Включить все точки останова",
-+	"enableBreakpoint": "Включить точку останова",
-+	"focusProcess": "Обработка фокуса",
-+	"launchJsonNeedsConfigurtion": "Настройте или исправьте \"launch.json\"",
-+	"openLaunchJson": "Открыть {0}",
-+	"pauseDebug": "Приостановить",
-+	"reapplyAllBreakpoints": "Повторно применить все точки останова",
-+	"reconnectDebug": "Повторно подключить",
-+	"removeAllBreakpoints": "Удалить все точки останова",
-+	"removeAllWatchExpressions": "Удалить все выражения",
-+	"removeBreakpoint": "Удалить точку останова",
-+	"removeWatchExpression": "Удалить выражение",
-+	"renameFunctionBreakpoint": "Переименовать точку останова в функции",
-+	"restartDebug": "Перезапустить",
-+	"restartFrame": "Перезапустить кадр",
-+	"reverseContinue": "Обратно",
-+	"selectAndStartDebugging": "Выбрать и начать отладку",
-+	"setValue": "Задать значение",
-+	"startDebug": "Начать отладку",
-+	"startWithoutDebugging": "Начать без отладки",
-+>>>>>>> .their
- 	"stepBackDebug": "На шаг назад",
- 	"reverseContinue": "Обратно"
- }
-\ No newline at end of file
-added in both
-  our    100644 c7284ee93b10f2076711321aef59cb7f5613611f i18n/rus/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
-  their  100644 a2190a88a0a09dab36162fbc1ae670dce8929a4d i18n/rus/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -12,4 +13,16 @@
- 	"addConfiguration": "Добавить конфигурацию...",
- 	"noConfigurationsMatching": "Нет соответствующих конфигураций отладки.",
- 	"noConfigurationsFound": "Конфигурации отладки не найдены. Создайте файл \"launch.json\"."
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"debugAriaLabel": "Введите имя используемой конфигурации запуска.",
-+	"entryAriaLabel": "Отладка: {0}",
-+	"noConfigurationsFound": "Конфигурации отладки не найдены. Создайте файл \"launch.json\".",
-+	"noConfigurationsMatching": "Нет соответствующих конфигураций отладки."
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 3138a3aa6e7138d89eba01ed68b156a8d6f6c9ed i18n/rus/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
-  their  100644 1dc57409136d5368af65868a006e344ceb4bdfab i18n/rus/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,5 +10,13 @@
- 	"debugExceptionWidgetBorder": "Цвет границ мини-приложения исключений.",
- 	"debugExceptionWidgetBackground": "Цвет фона мини-приложения исключений.",
- 	"exceptionThrownWithId": "Возникло исключение: {0}",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"exceptionThrown": "Произошло исключение."
- }
-\ No newline at end of file
-changed in both
-  base   100644 828fa59d73e8517a8089e01ccf7f1edb325c8b24 i18n/rus/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  our    100644 c40c0450d63a0a1ac9b7545e7ca88c35a304bd16 i18n/rus/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  their  100644 30089dcc0f85a99f1115958e9a8ccd24e5af88b0 i18n/rus/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-changed in both
-  base   100644 b9025207020aa5f1048fe0ab7e52d745d03646e8 i18n/rus/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  our    100644 4d4a7ed83f0f21185a7b07658c2021e06bcfa0df i18n/rus/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  their  100644 b60a452e4aee318b3cd23a7f6993e8189e6f1897 i18n/rus/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-@@ -8,6 +8,20 @@
- 	],
- 	"debugAdapterBinNotFound": "Исполняемый файл адаптера отладки \"{0}\" не существует.",
- 	"debugAdapterCannotDetermineExecutable": "Невозможно определить исполняемый файл для адаптера отладки \"{0}\".",
-+<<<<<<< .our
- 	"unableToLaunchDebugAdapter": "Не удается запустить адаптер отладки из \"{0}\".",
- 	"unableToLaunchDebugAdapterNoArgs": "Не удается запустить адаптер отладки."
-+=======
-+	"debugLinuxConfiguration": "Атрибуты конфигурации запуска для Linux.",
-+	"debugName": "Имя конфигурации; отображается в раскрывающемся меню конфигурации запуска.",
-+	"debugOSXConfiguration": "Атрибуты конфигурации запуска для OS X.",
-+	"debugPrelaunchTask": "Задача, выполняемая перед началом сеанса отладки.",
-+	"debugRequest": "Запросите тип конфигурации. Возможные типы: \"запуск\" и \"подключение\".",
-+	"debugServer": "Только для разработки расширений отладки: если указан порт, VS Code пытается подключиться к адаптеру отладки, запущенному в режиме сервера.",
-+	"debugType": "Тип конфигурации.",
-+	"debugWindowsConfiguration": "Атрибуты конфигурации запуска для Windows.",
-+	"deprecatedVariables": "\"env.\", \"config.\" и \"command.\" устарели, используйте \"env:\", \"config:\" и \"command:\".",
-+	"internalConsoleOptions": "Управляет поведением внутренней консоли отладки.",
-+	"node2NotSupported": "Значение \"node2\" больше не поддерживается; используйте \"node\" и задайте для атрибута \"protocol\" значение \"inspector\"."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8e3fe41052aff734bf85ecf277ef1a4142b7ee91 i18n/rus/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 a4725d2faef4b5a6c23ee7c2ecc46a16530b3341 i18n/rus/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 be1005e3cce7803f1a44ff0f85a2bcd6124c437a i18n/rus/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-@@ -4,6 +4,7 @@
-  *--------------------------------------------------------------------------------------------*/
- // Do not edit this file. It is machine generated.
- {
-+<<<<<<< .our
- 	"showExplorerViewlet": "Показать проводник",
- 	"explore": "Проводник",
- 	"view": "Просмотреть",
-@@ -11,6 +12,25 @@
- 	"binaryFileEditor": "Редактор двоичных файлов",
- 	"filesConfigurationTitle": "Файлы",
- 	"exclude": "Настройте стандартные маски для исключения файлов и папок. Этот параметр влияет, например, на скрытые и отображаемые файлы в проводнике.",
-+=======
-+	"associations": "Настройте сопоставления файлов с языками (например, \"*.extension\": \"html\"). У них будет приоритет перед заданными по умолчанию сопоставлениями установленных языков.",
-+	"autoReveal": "Определяет, будет ли проводник автоматически отображать и выбирать файлы при их открытии.",
-+	"autoSave": "Управляет автоматическим сохранением \"грязных\" файлов. Допустимые значения: \"{0}\", \"{1}\", \"{2}\" (редактор теряет фокус) и \"{3}\" (окно теряет фокус). Если задано значение \"{4}\", можно настроить задержку в \"files.autoSaveDelay\".",
-+	"autoSaveDelay": "Определяет задержку в мс, после которой измененный файл сохраняется автоматически. Действует, только если параметр \"files.autoSave\" имеет значение \"{0}\".",
-+	"binaryFileEditor": "Редактор двоичных файлов",
-+	"dynamicHeight": "Определяет, будет ли высота раздела открытых редакторов динамически адаптироваться к количеству элементов.",
-+	"editorConfigurationTitle": "Редактор",
-+	"enableDragAndDrop": "Определяет, разрешено ли перемещение файлов и папок перетаскиванием в проводнике.",
-+	"encoding": "Кодировка набора символов по умолчанию, используемая при чтении и записи файлов",
-+	"eol": "Символ конца строки по умолчанию.",
-+	"exclude": "Настройка стандартных масок для исключения файлов и папок.",
-+	"explore": "Проводник",
-+	"explorerConfigurationTitle": "Проводник",
-+	"files.autoSave.afterDelay": "\"Грязный\" файл автоматически сохраняется по истечении срока \"files.autoSaveDelay\".",
-+	"files.autoSave.off": "\"Грязный\" файл не сохраняется автоматически.",
-+	"files.autoSave.onFocusChange": "\"Грязный\" файл автоматически сохраняется при потере фокуса редактором.",
-+	"files.autoSave.onWindowChange": "\"Грязный\" файл автоматически сохраняется при потере фокуса окном.",
-+>>>>>>> .their
- 	"files.exclude.boolean": "Стандартная маска, соответствующая путям к файлам. Задайте значение true или false, чтобы включить или отключить маску.",
- 	"files.exclude.when": "Дополнительная проверка элементов того же уровня соответствующего файла. Используйте $(basename) в качестве переменной для соответствующего имени файла.",
- 	"associations": "Настройте сопоставления файлов с языками (например, \"*.extension\": \"html\"). У них будет приоритет перед заданными по умолчанию сопоставлениями установленных языков.",
-changed in both
-  base   100644 e4561ea1aa0c82b4c6b9ebc43d350b161c6a3fbb i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  our    100644 73f5287abade720146d5385f06b5e028d614a772 i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  their  100644 dee882a01efbd93f87cc6a8ab847c0dbef1fbb16 i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -9,6 +10,11 @@
- 	"openRawDefaultSettings": "Открыть исходные параметры по умолчанию",
- 	"openSettings2": "Открыть параметры (предварительная версия)",
- 	"openSettings": "Открыть параметры",
-+=======
-+	"configureLanguageBasedSettings": "Настроить параметры языка...",
-+	"languageDescriptionConfigured": "({0})",
-+	"openGlobalKeybindings": "Открыть сочетания клавиш",
-+>>>>>>> .their
- 	"openGlobalSettings": "Открыть пользовательские параметры",
- 	"openGlobalKeybindings": "Открыть сочетания клавиш",
- 	"openGlobalKeybindingsFile": "Открыть файл сочетаний клавиш",
-added in both
-  our    100644 1ed22c6e056cd18363fa8badf44dd6757d74d03d i18n/rus/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
-@@ -3,6 +3,7 @@
-  *  Licensed under the MIT License. See License.txt in the project root for license information.
-  *--------------------------------------------------------------------------------------------*/
- // Do not edit this file. It is machine generated.
-+<<<<<<< .our
- {
- 	"vscode.extension.contributes.snippets": "Добавляет фрагменты.",
- 	"vscode.extension.contributes.snippets-language": "Идентификатор языка, для которого добавляется этот фрагмент.",
-@@ -11,4 +12,7 @@
- 	"invalid.path.0": "В contributes.{0}.path требуется строка. Указанное значение: {1}",
- 	"invalid.path.1": "contributes.{0}.path ({1}) должен был быть включен в папку расширения ({2}). Это может сделать расширение непереносимым.",
- 	"badVariableUse": "Похоже, во фрагменте \"{0}\" перепутаны переменные и заполнители. Дополнительные сведения см. на странице https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax."
--}
-\ No newline at end of file
-+}
-+=======
-+{}
-+>>>>>>> .their
-added in both
-  our    100644 e024fba5eea27faef8520f42bdcb15ef40bb3982 i18n/rus/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
-  their  100644 8c220bbce30b2d13576aca5f10f23271cd10f882 i18n/rus/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,4 +10,13 @@
- 	"snippet.suggestions.label": "Вставить фрагмент кода",
- 	"sep.userSnippet": "Фрагменты кода пользователя",
- 	"sep.extSnippet": "Фрагменты кода расширения"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"snippet.suggestions.label": "Вставить фрагмент кода"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 bbb3eac74ad70a90d8af5ac8624eb5c8f0bcb0b5 i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  our    100644 4a2946695c164a4a0f1eb0ce1f03d90cce755916 i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  their  100644 0b1f01a36a94cf9855e1c65e4e5272bc9c3485be i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"openSnippet.errorOnCreate": "Не удалось создать {0}.",
-+	"openSnippet.label": "Открыть пользовательские фрагменты",
-+	"openSnippet.pickLanguage": "Выберите язык для фрагментов кода",
-+	"preferences": "Параметры",
-+	"snippetSchema.json": "Настройка фрагмента пользователя",
-+	"snippetSchema.json.body": "Содержимое фрагмента. Используйте \"${id}\", \"${id:label}\", \"${1:label}\" для переменных и \"$0\", \"$1\" для положений курсора",
-+>>>>>>> .their
- 	"snippetSchema.json.default": "Пустой фрагмент",
- 	"snippetSchema.json": "Настройка фрагмента пользователя",
- 	"snippetSchema.json.prefix": "Префикс, используемый при выборе фрагмента в Intellisense.",
-added in both
-  our    100644 6a37d94b67d26daf129e538d4e91992157d2b014 i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 eefed0e4d58d81161889f00697ee64b3ab90a942 i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -16,5 +17,13 @@
- 	"badVariableUse": "Похоже, что в одном или нескольких фрагментах расширения \"{0}\" перепутаны переменные и заполнители. Дополнительные сведения см. на странице https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax.",
- 	"badFile": "Не удалось прочитать файл фрагмента \"{0}\".",
- 	"detail.snippet": "{0} ({1})",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"snippetSuggest.longLabel": "{0}, {1}"
- }
-\ No newline at end of file
-added in both
-  our    100644 12064636028b37536d119e950d02416a4389b1c7 i18n/rus/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
-  their  100644 7d237682df52b1ce680a466c8b468739dd5b1eeb i18n/rus/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"tabCompletion": "Вставка фрагментов при совпадении их префиксов. Функция работает оптимально, если параметр \"quickSuggestions\" отключен."
- }
-\ No newline at end of file
-changed in both
-  base   100644 70a4c6a5f7dc74463a80c81accd9905dfa6d391e i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 ea0d455fc7f4fc786ef2ef083f3b437a535a441a i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 2ee18b6d6a59546443ddfa7f08799e641c96e57b i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -7,6 +8,14 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"workbench.action.terminal.toggleTerminal": "Переключить интегрированный терминал",
-+=======
-+	"workbench.action.terminal.clear": "Очистить",
-+	"workbench.action.terminal.copySelection": "Скопировать выделение",
-+	"workbench.action.terminal.focus": "Фокус на терминале",
-+	"workbench.action.terminal.focusAtIndex": "Фокус на терминале {0}",
-+	"workbench.action.terminal.focusNext": "Фокус на следующем терминале",
-+	"workbench.action.terminal.focusPrevious": "Фокус на предыдущем терминале",
-+>>>>>>> .their
- 	"workbench.action.terminal.kill": "Завершить активный экземпляр терминала",
- 	"workbench.action.terminal.kill.short": "Завершить работу терминала",
- 	"workbench.action.terminal.quickKill": "Завершить работу экземпляра терминала",
-changed in both
-  base   100644 fc526f330445b350c4d976a3ca96ba9f2d4dcd1f i18n/rus/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
-  our    100644 d000914c9552303fbad6984b724bb4eeea317681 i18n/rus/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
-  their  100644 8fc1802f29c654dbd49f0cf9746d8327a0a2ad01 i18n/rus/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,15 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"findMore": "Подробнее на Marketplace...",
-+	"noIconThemeDesc": "Отключить значки файлов",
-+	"noIconThemeLabel": "Нет",
-+	"preferences": "Параметры",
-+	"problemChangingIconTheme": "Проблема при задании темы значка: {0}",
-+	"problemChangingTheme": "Проблема при задании темы: {0}",
-+	"selectIconTheme.label": "Тема значков файлов",
-+>>>>>>> .their
- 	"selectTheme.label": "Цветовая тема",
- 	"themes.category.light": "светлые темы",
- 	"themes.category.dark": "темные темы",
-added in both
-  our    100644 7ec1bcab6e599251e71e94e275c4cb230b6f85ec i18n/rus/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  their  100644 335265710b05d834d0978e1e3054a0f8b5ec52e3 i18n/rus/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -39,4 +40,48 @@
- 	"welcomePage.interfaceOverviewDescription": "Используйте визуальное наложение с выделением основных компонентов пользовательского интерфейса.",
- 	"welcomePage.interactivePlayground": "Интерактивная площадка",
- 	"welcomePage.interactivePlaygroundDescription": "Опробуйте основные функции редактора в ходе краткого пошагового руководства."
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"welcomePage.atom": "Atom",
-+	"welcomePage.atomCurrent": "Atom (текущий)",
-+	"welcomePage.cloneGitRepository": "Клонировать репозиторий Git...",
-+	"welcomePage.colorTheme": "Цветовая тема",
-+	"welcomePage.colorThemeDescription": "Настройте редактор и код удобным образом.",
-+	"welcomePage.configureSettings": "Настройка параметров",
-+	"welcomePage.configureSettingsDescription": "Используйте все возможности VS Code, подобрав нужные параметры.",
-+	"welcomePage.editingEvolved": "Улучшенное редактирование",
-+	"welcomePage.gitHubRepository": "Репозиторий GitHub",
-+	"welcomePage.help": "Справка",
-+	"welcomePage.installKeymap": "Установите сочетания клавиш {0}, {1}, {2} и {3}.",
-+	"welcomePage.installKeymapDescription": "Установка сочетаний клавиш",
-+	"welcomePage.interactivePlayground": "Интерактивная площадка",
-+	"welcomePage.interactivePlaygroundDescription": "Опробуйте основные функции редактора в ходе краткого пошагового руководства.",
-+	"welcomePage.interfaceOverview": "Общие сведения об интерфейсе",
-+	"welcomePage.interfaceOverviewDescription": "Используйте визуальное наложение с выделением основных компонентов пользовательского интерфейса.",
-+	"welcomePage.introductoryVideos": "Вступительные видео",
-+	"welcomePage.keybindingsReference": "Справочник по сочетаниям клавиш",
-+	"welcomePage.keybindingsReferenceDescription": "Подготовленный к печати PDF-файл с самыми частыми сочетаниями клавиш",
-+	"welcomePage.newFile": "Создать файл",
-+	"welcomePage.noRecentFolders": "Нет последних папок.",
-+	"welcomePage.openFolder": "Открыть папку...",
-+	"welcomePage.others": "Другие",
-+	"welcomePage.productDocumentation": "Документация по продукту",
-+	"welcomePage.quickLinks": "Быстрые ссылки",
-+	"welcomePage.recent": "Последние",
-+	"welcomePage.showCommands": "Найти и выполнить все команды",
-+	"welcomePage.showCommandsDescription": "Быстрый доступ и поиск команд на панели управления ({0})",
-+	"welcomePage.showOnStartup": "Отображать страницу приветствия при запуске",
-+	"welcomePage.stackOverflow": "Переполнение стека",
-+	"welcomePage.start": "Запустить",
-+	"welcomePage.sublime": "Sublime",
-+	"welcomePage.sublimeCurrent": "Sublime (текущий)",
-+	"welcomePage.vim": "Vim",
-+	"welcomePage.vimCurrent": "Vim (текущий)",
-+	"welcomePage.vscode": "Visual Studio Code"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-  our    100644 196b7c7b83cc8489602f5816dbabf281005e498a i18n/rus/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-  their  100644 9e0ab6a0b2c4b4b21eb922dd653cfd2bb7cf6879 i18n/rus/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -36,4 +37,20 @@
- 	"details": "Подробности",
- 	"welcomePage.buttonBackground": "Цвет фона кнопок на странице приветствия.",
- 	"welcomePage.buttonHoverBackground": "Цвет фона при наведении указателя для кнопок на странице приветствия."
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"cancel": "Отмена",
-+	"ok": "ОК",
-+	"welcome.title": "Добро пожаловать",
-+	"welcomePage": "Добро пожаловать",
-+	"welcomePage.installingKeymap": "Устанавливаются сочетания клавиш {0}...",
-+	"welcomePage.keymapAlreadyInstalled": "Сочетания клавиш {0} уже установлены.",
-+	"welcomePage.keymapNotFound": "Не удалось найти сочетания клавиш {0} с идентификатором {1}.",
-+	"welcomePage.willReloadAfterInstallingKeymap": "Окно перезагрузится после установки сочетаний клавиш {0}."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 72e3c89c71937cb58b2cd759fa153ad0f541e833 package.json
-  our    100644 d0e982ce0b76c5b1b5eb02b673e459e47f3353a4 package.json
-  their  100644 a09e94eb7490817b6580315e4a2cfd1a45b93b08 package.json
-@@ -1,7 +1,13 @@
- {
-   "name": "code-oss-dev",
-+<<<<<<< .our
-   "version": "1.27.0",
-   "distro": "a4155d9780fbbc94ead6cb3017dd0fc3806c57b8",
-+=======
-+  "version": "1.10.2",
-+  "electronVersion": "1.4.6",
-+  "distro": "64f6f295b56a3512bf34dfb643f770160fd33ee8",
-+>>>>>>> .their
-   "author": {
-     "name": "Microsoft Corporation"
-   },
-changed in both
-  base   100644 8d37d1013a0849068531caa0a5d6925dd32c3998 src/vs/base/common/color.ts
-  our    100644 6dc7eb65aef2515b5ac3da55a60f77ffdabf036a src/vs/base/common/color.ts
-  their  100644 e8d59e2c4ef9ad79862d41bce83439dbe0dbeb97 src/vs/base/common/color.ts
-@@ -158,6 +158,7 @@
- 	}
- }
- 
-+<<<<<<< .our
- export class HSVA {
- 
- 	_hsvaBrand: void;
-@@ -176,6 +177,39 @@
- 	 * Value: float in [0, 1]
- 	 */
- 	readonly v: number;
-+=======
-+export function isValidHexColor(hex: string): boolean {
-+	return /^#[0-9a-f]{6}([0-9a-f]{2})?$/i.test(hex);
-+}
-+
-+function _parseHexDigit(charCode: CharCode): number {
-+	switch (charCode) {
-+		case CharCode.Digit0: return 0;
-+		case CharCode.Digit1: return 1;
-+		case CharCode.Digit2: return 2;
-+		case CharCode.Digit3: return 3;
-+		case CharCode.Digit4: return 4;
-+		case CharCode.Digit5: return 5;
-+		case CharCode.Digit6: return 6;
-+		case CharCode.Digit7: return 7;
-+		case CharCode.Digit8: return 8;
-+		case CharCode.Digit9: return 9;
-+		case CharCode.a: return 10;
-+		case CharCode.A: return 10;
-+		case CharCode.b: return 11;
-+		case CharCode.B: return 11;
-+		case CharCode.c: return 12;
-+		case CharCode.C: return 12;
-+		case CharCode.d: return 13;
-+		case CharCode.D: return 13;
-+		case CharCode.e: return 14;
-+		case CharCode.E: return 14;
-+		case CharCode.f: return 15;
-+		case CharCode.F: return 15;
-+	}
-+	return 0;
-+}
-+>>>>>>> .their
- 
- 	/**
- 	 * Alpha: float in [0, 1]
-changed in both
-  base   100644 15e7366b946067b54428c21da8a29e582a6286f6 src/vs/base/parts/ipc/node/ipc.net.ts
-  our    100644 e82503e1eb08784cc52d3aeb34c3ad451ae71609 src/vs/base/parts/ipc/node/ipc.net.ts
-  their  100644 c34d263e869bed177576cf33ef748edb8e2d6533 src/vs/base/parts/ipc/node/ipc.net.ts
-@@ -12,8 +12,11 @@
- import { join } from 'path';
- import { tmpdir } from 'os';
- import { generateUuid } from 'vs/base/common/uuid';
-+<<<<<<< .our
- import { IDisposable } from 'vs/base/common/lifecycle';
- import { TimeoutTimer } from 'vs/base/common/async';
-+=======
-+>>>>>>> .their
- 
- export function generateRandomPipeName(): string {
- 	const randomSuffix = generateUuid();
-changed in both
-  base   100644 0800d92bdd57724170bffe86428681351ebe8e3a src/vs/base/test/common/color.test.ts
-  our    100644 359bc6c398e1afaf1e68f9388d28c438336e89cc src/vs/base/test/common/color.test.ts
-  their  100644 1395f596ebdff77aec81252fcf689d220532688d src/vs/base/test/common/color.test.ts
-@@ -6,10 +6,143 @@
- 'use strict';
- 
- import * as assert from 'assert';
-+<<<<<<< .our
- import { Color, RGBA, HSLA, HSVA } from 'vs/base/common/color';
- 
- suite('Color', () => {
- 
-+=======
-+import { Color, RGBA, HSLA, isValidHexColor } from 'vs/base/common/color';
-+
-+suite('Color', () => {
-+
-+	test('rgba2hsla', function () {
-+		assert.deepEqual(new HSLA(0, 0, 0, 1), Color.fromRGBA(new RGBA(0, 0, 0, 255)).toHSLA());
-+		assert.deepEqual(new HSLA(0, 0, 1, 1), Color.fromRGBA(new RGBA(255, 255, 255, 255)).toHSLA());
-+
-+		assert.deepEqual(new HSLA(0, 1, 0.5, 1), Color.fromRGBA(new RGBA(255, 0, 0, 255)).toHSLA());
-+		assert.deepEqual(new HSLA(120, 1, 0.5, 1), Color.fromRGBA(new RGBA(0, 255, 0, 255)).toHSLA());
-+		assert.deepEqual(new HSLA(240, 1, 0.5, 1), Color.fromRGBA(new RGBA(0, 0, 255, 255)).toHSLA());
-+
-+		assert.deepEqual(new HSLA(60, 1, 0.5, 1), Color.fromRGBA(new RGBA(255, 255, 0, 255)).toHSLA());
-+		assert.deepEqual(new HSLA(180, 1, 0.5, 1), Color.fromRGBA(new RGBA(0, 255, 255, 255)).toHSLA());
-+		assert.deepEqual(new HSLA(300, 1, 0.5, 1), Color.fromRGBA(new RGBA(255, 0, 255, 255)).toHSLA());
-+
-+		assert.deepEqual(new HSLA(0, 0, 0.753, 1), Color.fromRGBA(new RGBA(192, 192, 192, 255)).toHSLA());
-+
-+		assert.deepEqual(new HSLA(0, 0, 0.502, 1), Color.fromRGBA(new RGBA(128, 128, 128, 255)).toHSLA());
-+		assert.deepEqual(new HSLA(0, 1, 0.251, 1), Color.fromRGBA(new RGBA(128, 0, 0, 255)).toHSLA());
-+		assert.deepEqual(new HSLA(60, 1, 0.251, 1), Color.fromRGBA(new RGBA(128, 128, 0, 255)).toHSLA());
-+		assert.deepEqual(new HSLA(120, 1, 0.251, 1), Color.fromRGBA(new RGBA(0, 128, 0, 255)).toHSLA());
-+		assert.deepEqual(new HSLA(300, 1, 0.251, 1), Color.fromRGBA(new RGBA(128, 0, 128, 255)).toHSLA());
-+		assert.deepEqual(new HSLA(180, 1, 0.251, 1), Color.fromRGBA(new RGBA(0, 128, 128, 255)).toHSLA());
-+		assert.deepEqual(new HSLA(240, 1, 0.251, 1), Color.fromRGBA(new RGBA(0, 0, 128, 255)).toHSLA());
-+	});
-+
-+	test('hsla2rgba', function () {
-+		assert.deepEqual(new RGBA(0, 0, 0, 255), Color.fromHSLA(new HSLA(0, 0, 0, 1)).toRGBA());
-+		assert.deepEqual(new RGBA(255, 255, 255, 255), Color.fromHSLA(new HSLA(0, 0, 1, 1)).toRGBA());
-+
-+		assert.deepEqual(new RGBA(255, 0, 0, 255), Color.fromHSLA(new HSLA(0, 1, 0.5, 1)).toRGBA());
-+		assert.deepEqual(new RGBA(0, 255, 0, 255), Color.fromHSLA(new HSLA(120, 1, 0.5, 1)).toRGBA());
-+		assert.deepEqual(new RGBA(0, 0, 255, 255), Color.fromHSLA(new HSLA(240, 1, 0.5, 1)).toRGBA());
-+
-+		assert.deepEqual(new RGBA(255, 255, 0, 255), Color.fromHSLA(new HSLA(60, 1, 0.5, 1)).toRGBA());
-+		assert.deepEqual(new RGBA(0, 255, 255, 255), Color.fromHSLA(new HSLA(180, 1, 0.5, 1)).toRGBA());
-+		assert.deepEqual(new RGBA(255, 0, 255, 255), Color.fromHSLA(new HSLA(300, 1, 0.5, 1)).toRGBA());
-+
-+		assert.deepEqual(new RGBA(192, 192, 192, 255), Color.fromHSLA(new HSLA(0, 0, 0.753, 1)).toRGBA());
-+
-+		assert.deepEqual(new RGBA(128, 128, 128, 255), Color.fromHSLA(new HSLA(0, 0, 0.502, 1)).toRGBA());
-+		assert.deepEqual(new RGBA(128, 0, 0, 255), Color.fromHSLA(new HSLA(0, 1, 0.251, 1)).toRGBA());
-+		assert.deepEqual(new RGBA(128, 128, 0, 255), Color.fromHSLA(new HSLA(60, 1, 0.251, 1)).toRGBA());
-+		assert.deepEqual(new RGBA(0, 128, 0, 255), Color.fromHSLA(new HSLA(120, 1, 0.251, 1)).toRGBA());
-+		assert.deepEqual(new RGBA(128, 0, 128, 255), Color.fromHSLA(new HSLA(300, 1, 0.251, 1)).toRGBA());
-+		assert.deepEqual(new RGBA(0, 128, 128, 255), Color.fromHSLA(new HSLA(180, 1, 0.251, 1)).toRGBA());
-+		assert.deepEqual(new RGBA(0, 0, 128, 255), Color.fromHSLA(new HSLA(240, 1, 0.251, 1)).toRGBA());
-+	});
-+
-+	test('hex2rgba', function () {
-+		assert.deepEqual(new RGBA(0, 0, 0, 255), Color.fromHex('#000000').toRGBA());
-+		assert.deepEqual(new RGBA(255, 255, 255, 255), Color.fromHex('#FFFFFF').toRGBA());
-+
-+		assert.deepEqual(new RGBA(255, 0, 0, 255), Color.fromHex('#FF0000').toRGBA());
-+		assert.deepEqual(new RGBA(0, 255, 0, 255), Color.fromHex('#00FF00').toRGBA());
-+		assert.deepEqual(new RGBA(0, 0, 255, 255), Color.fromHex('#0000FF').toRGBA());
-+
-+		assert.deepEqual(new RGBA(255, 255, 0, 255), Color.fromHex('#FFFF00').toRGBA());
-+		assert.deepEqual(new RGBA(0, 255, 255, 255), Color.fromHex('#00FFFF').toRGBA());
-+		assert.deepEqual(new RGBA(255, 0, 255, 255), Color.fromHex('#FF00FF').toRGBA());
-+
-+		assert.deepEqual(new RGBA(192, 192, 192, 255), Color.fromHex('#C0C0C0').toRGBA());
-+
-+		assert.deepEqual(new RGBA(128, 128, 128, 255), Color.fromHex('#808080').toRGBA());
-+		assert.deepEqual(new RGBA(128, 0, 0, 255), Color.fromHex('#800000').toRGBA());
-+		assert.deepEqual(new RGBA(128, 128, 0, 255), Color.fromHex('#808000').toRGBA());
-+		assert.deepEqual(new RGBA(0, 128, 0, 255), Color.fromHex('#008000').toRGBA());
-+		assert.deepEqual(new RGBA(128, 0, 128, 255), Color.fromHex('#800080').toRGBA());
-+		assert.deepEqual(new RGBA(0, 128, 128, 255), Color.fromHex('#008080').toRGBA());
-+		assert.deepEqual(new RGBA(0, 0, 128, 255), Color.fromHex('#000080').toRGBA());
-+
-+		function assertParseColor(input: string, expected: RGBA): void {
-+			let actual = Color.fromHex(input).toRGBA();
-+			assert.deepEqual(actual, expected, input);
-+		}
-+
-+		// invalid
-+		assertParseColor(null, new RGBA(255, 0, 0, 255));
-+		assertParseColor('', new RGBA(255, 0, 0, 255));
-+		assertParseColor('#', new RGBA(255, 0, 0, 255));
-+		assertParseColor('#0102030', new RGBA(255, 0, 0, 255));
-+
-+		// somewhat valid
-+		assertParseColor('#FFFFG0', new RGBA(255, 255, 0, 255));
-+		assertParseColor('#FFFFg0', new RGBA(255, 255, 0, 255));
-+		assertParseColor('#-FFF00', new RGBA(15, 255, 0, 255));
-+
-+		// valid
-+		assertParseColor('#000000', new RGBA(0, 0, 0, 255));
-+		assertParseColor('#010203', new RGBA(1, 2, 3, 255));
-+		assertParseColor('#040506', new RGBA(4, 5, 6, 255));
-+		assertParseColor('#070809', new RGBA(7, 8, 9, 255));
-+		assertParseColor('#0a0A0a', new RGBA(10, 10, 10, 255));
-+		assertParseColor('#0b0B0b', new RGBA(11, 11, 11, 255));
-+		assertParseColor('#0c0C0c', new RGBA(12, 12, 12, 255));
-+		assertParseColor('#0d0D0d', new RGBA(13, 13, 13, 255));
-+		assertParseColor('#0e0E0e', new RGBA(14, 14, 14, 255));
-+		assertParseColor('#0f0F0f', new RGBA(15, 15, 15, 255));
-+		assertParseColor('#a0A0a0', new RGBA(160, 160, 160, 255));
-+		assertParseColor('#FFFFFF', new RGBA(255, 255, 255, 255));
-+	});
-+
-+	test('isValidHexColor', function () {
-+		// invalid
-+		assert.equal(isValidHexColor(null), false);
-+		assert.equal(isValidHexColor(''), false);
-+		assert.equal(isValidHexColor('#'), false);
-+		assert.equal(isValidHexColor('#0102030'), false);
-+
-+		// somewhat valid
-+		assert.equal(isValidHexColor('#FFFFG0'), false);
-+		assert.equal(isValidHexColor('#FFFFg0'), false);
-+		assert.equal(isValidHexColor('#-FFF00'), false);
-+
-+		// valid
-+		assert.equal(isValidHexColor('#000000'), true);
-+		assert.equal(isValidHexColor('#010203'), true);
-+		assert.equal(isValidHexColor('#040506'), true);
-+		assert.equal(isValidHexColor('#070809'), true);
-+		assert.equal(isValidHexColor('#0a0A0a'), true);
-+		assert.equal(isValidHexColor('#0b0B0b'), true);
-+		assert.equal(isValidHexColor('#0c0C0c'), true);
-+		assert.equal(isValidHexColor('#0d0D0d'), true);
-+		assert.equal(isValidHexColor('#0e0E0e'), true);
-+		assert.equal(isValidHexColor('#0f0F0f'), true);
-+		assert.equal(isValidHexColor('#a0A0a0'), true);
-+		assert.equal(isValidHexColor('#FFFFFF'), true);
-+	});
-+
-+>>>>>>> .their
- 	test('isLighterColor', function () {
- 		let color1 = new Color(new HSLA(60, 1, 0.5, 1)), color2 = new Color(new HSLA(0, 0, 0.753, 1));
- 
-changed in both
-  base   100644 57ac6405e1a8838c8445cf221a65cf7d5a06fda4 src/vs/editor/browser/view/viewImpl.ts
-  our    100644 f619f1adef4f12e7f3e990d008867ec5f137fb73 src/vs/editor/browser/view/viewImpl.ts
-  their  100644 18dba00167c1e4942060754089790be1b0e58a2c src/vs/editor/browser/view/viewImpl.ts
-@@ -333,8 +333,21 @@
- 		this.outgoingEvents.emitScrollChanged(e);
- 		return false;
- 	}
-+<<<<<<< .our
- 	public onThemeChanged(e: viewEvents.ViewThemeChangedEvent): boolean {
- 		this.domNode.setClassName(this.getEditorClassName());
-+=======
-+	public onScrollRequest(e: viewEvents.ViewScrollRequestEvent): boolean {
-+		let currentScrollTop = this.layoutProvider.getScrollTop();
-+		let newScrollTop = currentScrollTop + e.deltaLines * this._context.configuration.editor.lineHeight;
-+		this.layoutProvider.setScrollPosition({
-+			scrollTop: newScrollTop
-+		});
-+		return e.revealCursor ? this.revealCursor() : false;
-+	}
-+	private revealCursor(): boolean {
-+		this.triggerCursorHandler('revealCursor', editorCommon.Handler.CursorMove, { to: editorCommon.CursorMovePosition.ViewPortIfOutside });
-+>>>>>>> .their
- 		return false;
- 	}
- 
-changed in both
-  base   100644 27639a375e5503d66352b29af6d4012bd517b91a src/vs/editor/browser/viewParts/lines/viewLines.ts
-  our    100644 ed037cd20922c63c38d154834d2b9fdba29ffd08 src/vs/editor/browser/viewParts/lines/viewLines.ts
-  their  100644 5091618303145228d9243587a03fc01079f7d7a0 src/vs/editor/browser/viewParts/lines/viewLines.ts
-@@ -264,6 +264,7 @@
- 			}
- 		}
- 		this.domNode.setWidth(e.scrollWidth);
-+<<<<<<< .our
- 		return this._visibleLines.onScrollChanged(e) || true;
- 	}
- 
-@@ -276,6 +277,9 @@
- 	}
- 	public onThemeChanged(e: viewEvents.ViewThemeChangedEvent): boolean {
- 		return this._onOptionsMaybeChanged();
-+=======
-+		return super.onScrollChanged(e) || true;
-+>>>>>>> .their
- 	}
- 
- 	// ---- end view event handlers
-removed in local
-  base   100644 418e82a8afd5244ac6b627b24dfe272f2520012d src/vs/editor/electron-browser/textMate/TMSyntax.ts
-  their  100644 f85ac4d1860b320d29b29fccaf862ceb158625f2 src/vs/editor/electron-browser/textMate/TMSyntax.ts
-changed in both
-  base   100644 2c42f58c64cdb74383942aa858d72e93162b664a src/vs/platform/telemetry/node/commonProperties.ts
-  our    100644 e997435d9c1863ab21772c3faaeb6af61f5bea4e src/vs/platform/telemetry/node/commonProperties.ts
-  their  100644 731ee19b0ea2c9cecf4a1018f24a527d0fee5b0c src/vs/platform/telemetry/node/commonProperties.ts
-@@ -23,10 +23,14 @@
- 	result['common.platformVersion'] = (os.release() || '').replace(/^(\d+)(\.\d+)?(\.\d+)?(.*)/, '$1$2$3');
- 	// __GDPR__COMMON__ "common.platform" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
- 	result['common.platform'] = Platform.Platform[Platform.platform];
-+<<<<<<< .our
- 	// __GDPR__COMMON__ "common.nodePlatform" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
- 	result['common.nodePlatform'] = process.platform;
- 	// __GDPR__COMMON__ "common.nodeArch" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
- 	result['common.nodeArch'] = process.arch;
-+=======
-+	const promise = getStableMachineId().then(value => result['common.mainProcess.machineId'] = value);
-+>>>>>>> .their
- 
- 	// dynamic properties which value differs on each call
- 	let seq = 0;
-changed in both
-  base   100644 2525949ec9710dbfb0088bec9a0308d608ee2936 src/vs/platform/telemetry/test/electron-browser/commonProperties.test.ts
-  our    100644 1c5e341b12b55b02ec5f55ebf1a5a0da66a6ca66 src/vs/platform/telemetry/test/electron-browser/commonProperties.test.ts
-  their  100644 681049d1a148ffb089ac4f70241568b75ff293c6 src/vs/platform/telemetry/test/electron-browser/commonProperties.test.ts
-@@ -32,6 +32,7 @@
- 		del(parentDir, os.tmpdir(), done);
- 	});
- 
-+<<<<<<< .our
- 	test('default', function () {
- 		return mkdirp(parentDir).then(() => {
- 			fs.writeFileSync(installSource, 'my.install.source');
-@@ -66,6 +67,35 @@
- 					assert.ok(!('common.source' in props));
- 				});
- 			});
-+=======
-+		return resolveWorkbenchCommonProperties(storageService, commit, version).then(props => {
-+
-+			assert.ok('commitHash' in props);
-+			assert.ok('sessionID' in props);
-+			assert.ok('timestamp' in props);
-+			assert.ok('common.platform' in props);
-+			assert.ok('common.timesincesessionstart' in props);
-+			assert.ok('common.sequence' in props);
-+
-+			// assert.ok('common.version.shell' in first.data); // only when running on electron
-+			// assert.ok('common.version.renderer' in first.data);
-+			assert.ok('common.osVersion' in props, 'osVersion');
-+			assert.ok('version' in props);
-+
-+			assert.ok('common.firstSessionDate' in props, 'firstSessionDate');
-+			assert.ok('common.lastSessionDate' in props, 'lastSessionDate'); // conditional, see below, 'lastSessionDate'ow
-+			assert.ok('common.isNewSession' in props, 'isNewSession');
-+
-+			// machine id et al
-+			assert.ok('common.instanceId' in props, 'instanceId');
-+			assert.ok('common.machineId' in props, 'machineId');
-+			if (process.platform === 'win32') { // SQM only on windows
-+				assert.ok('common.sqm.userid' in props, 'userid');
-+				assert.ok('common.sqm.machineid' in props, 'machineid');
-+			}
-+
-+			assert.equal(Object.keys(props).length, process.platform === 'win32' ? 19 : 17);
-+>>>>>>> .their
- 		});
- 	});
- 
-changed in both
-  base   100644 b093867248362b02df3a0fe8012dbe865b07f1eb src/vs/workbench/parts/debug/browser/debugActions.ts
-  our    100644 04fd4058642849c3a89c905da3e5d4de2c76cac4 src/vs/workbench/parts/debug/browser/debugActions.ts
-  their  100644 77e597371e7ba39bd7502a9917ff04fa3343e0d5 src/vs/workbench/parts/debug/browser/debugActions.ts
-@@ -14,7 +14,12 @@
- import { IFileService } from 'vs/platform/files/common/files';
- import { IDebugService, State, ISession, IThread, IEnablement, IBreakpoint, IStackFrame, REPL_ID, SessionState }
- 	from 'vs/workbench/parts/debug/common/debug';
-+<<<<<<< .our
- import { Variable, Expression, Thread, Breakpoint, Session } from 'vs/workbench/parts/debug/common/debugModel';
-+=======
-+import { Variable, Expression, Thread, Breakpoint, Process } from 'vs/workbench/parts/debug/common/debugModel';
-+import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-+>>>>>>> .their
- import { IPartService } from 'vs/workbench/services/part/common/partService';
- import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
- import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-@@ -125,7 +130,12 @@
- 		@IDebugService debugService: IDebugService,
- 		@IKeybindingService keybindingService: IKeybindingService,
- 		@IWorkspaceContextService private contextService: IWorkspaceContextService,
-+<<<<<<< .our
- 		@IHistoryService private historyService: IHistoryService
-+=======
-+		@IFileService private fileService: IFileService,
-+		@ITextFileService private textFileService: ITextFileService
-+>>>>>>> .their
- 	) {
- 		super(id, label, 'debug-action start', debugService, keybindingService);
- 
-@@ -135,6 +145,7 @@
- 	}
- 
- 	public run(): TPromise<any> {
-+<<<<<<< .our
- 		const configurationManager = this.debugService.getConfigurationManager();
- 		let launch = configurationManager.selectedConfiguration.launch;
- 		if (!launch || launch.getConfigurationNames().length === 0) {
-@@ -143,6 +154,17 @@
- 			if (!launch || launch.getConfigurationNames().length === 0) {
- 				const launches = configurationManager.getLaunches();
- 				launch = first(launches, l => !!l.getConfigurationNames().length, launch);
-+=======
-+		return this.textFileService.saveAll().then(() => {
-+			if (this.debugService.getModel().getProcesses().length === 0) {
-+				this.debugService.removeReplExpressions();
-+			}
-+			const manager = this.debugService.getConfigurationManager();
-+			const configName = this.debugService.getViewModel().selectedConfigurationName;
-+			const compound = manager.getCompound(configName);
-+			if (compound) {
-+				return this.commandService.executeCommand('_workbench.startDebug', configName);
-+>>>>>>> .their
- 			}
- 
- 			configurationManager.selectConfiguration(launch);
-@@ -178,8 +200,32 @@
- 	static readonly ID = 'workbench.action.debug.run';
- 	static LABEL = nls.localize('startWithoutDebugging', "Start Without Debugging");
- 
-+<<<<<<< .our
- 	protected isNoDebug(): boolean {
- 		return true;
-+=======
-+	constructor(id: string, label: string,
-+		@IDebugService debugService: IDebugService,
-+		@IKeybindingService keybindingService: IKeybindingService,
-+		@ICommandService commandService: ICommandService,
-+		@IWorkspaceContextService contextService: IWorkspaceContextService,
-+		@IFileService fileService: IFileService,
-+		@ITextFileService textFileService: ITextFileService
-+	) {
-+		super(id, label, debugService, keybindingService, commandService, contextService, fileService, textFileService);
-+	}
-+
-+	protected getDefaultConfiguration(): any {
-+		return { noDebug: true };
-+	}
-+
-+	protected massageConfiguartion(config: IConfig): IConfig {
-+		if (config) {
-+			config.noDebug = true;
-+		}
-+
-+		return config;
-+>>>>>>> .their
- 	}
- }
- 
-removed in local
-  base   100644 c42a5f17439c28135ab3b67f7c202e02a78128f3 src/vs/workbench/parts/extensions/browser/extensionEditor.ts
-  their  100644 d4f76a8aa2dfb8aab44e30b766e965ce6fea370c src/vs/workbench/parts/extensions/browser/extensionEditor.ts
-removed in local
-  base   100644 bc3c86d0e5b875931484942fdc9db5d6385d46b1 src/vs/workbench/parts/files/browser/fileActions.contribution.ts
-  their  100644 cd79eb2de5863e4cefea76bd45855e0177021361 src/vs/workbench/parts/files/browser/fileActions.contribution.ts
-removed in local
-  base   100644 f354dc54322184745778b20eb567d452ad71789a src/vs/workbench/parts/html/browser/webview-pre.js
-  their  100644 17073283f84e6997c61158ca3d8479e81330260b src/vs/workbench/parts/html/browser/webview-pre.js
-changed in both
-  base   100644 85f19d8c247cfeb57549c867741fe6326eca2d10 src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
-  our    100644 c3c0cf180a612dfd0808a2c895eadf00aadfc391 src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
-  their  100644 87028d9ce7bcb479aa3bac7b483f77fc44cee431 src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
-@@ -14,6 +14,7 @@
- import { IMode, TokenizationRegistry } from 'vs/editor/common/modes';
- import { generateTokensCSSForColorMap } from 'vs/editor/common/modes/supports/tokenization';
- import { tokenizeToString } from 'vs/editor/common/modes/textToHtmlTokenizer';
-+<<<<<<< .our
- import { IModeService } from 'vs/editor/common/services/modeService';
- import * as nls from 'vs/nls';
- import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-@@ -33,14 +34,24 @@
- 	css: string
- ): string {
- 	const styleSheetPath = require.toUrl('./media/markdown.css').replace('file://', 'vscode-core-resource://');
-+=======
-+
-+function renderBody(body: string): string {
-+	const nonce = new Date().getTime() + '' + new Date().getMilliseconds();
-+>>>>>>> .their
- 	return `<!DOCTYPE html>
- 		<html>
- 			<head>
- 				<base href="https://code.visualstudio.com/raw/">
- 				<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
-+<<<<<<< .our
- 				<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src https: data:; media-src https:; script-src 'none'; style-src vscode-core-resource: https: 'unsafe-inline'; child-src 'none'; frame-src 'none';">
- 				<link rel="stylesheet" type="text/css" href="${styleSheetPath}">
- 				<style>${css}</style>
-+=======
-+				<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src http: https: data:; media-src http: https: data:; script-src 'none'; style-src 'nonce-${nonce}'; child-src 'none'; frame-src 'none';">
-+				<link rel="stylesheet" type="text/css" href="${require.toUrl('./media/markdown.css')}" nonce="${nonce}" >
-+>>>>>>> .their
- 			</head>
- 			<body>${body}</body>
- 		</html>`;
-changed in both
-  base   100644 d68c803db5cf02d8050bbf76c007ab5fc3318d70 src/vs/workbench/services/configuration/node/configurationEditingService.ts
-  our    100644 cc274bdbdb25bf946127119893260e4ef694746f src/vs/workbench/services/configuration/node/configurationEditingService.ts
-  their  100644 32c98278f4fc2073cba81f58d9cee3edad18fee2 src/vs/workbench/services/configuration/node/configurationEditingService.ts
-@@ -179,6 +179,7 @@
- 		return false;
- 	}
- 
-+<<<<<<< .our
- 	private onError(error: ConfigurationEditingError, operation: IConfigurationEditOperation, scopes: IConfigurationOverrides): void {
- 		switch (error.code) {
- 			case ConfigurationEditingErrorCode.ERROR_INVALID_CONFIGURATION:
-@@ -263,6 +264,12 @@
- 				break;
- 		}
- 	}
-+=======
-+	private writeToDisk(contents: string, operation: IConfigurationEditOperation, resource: URI): TPromise<void> {
-+		// Apply all edits to the configuration file
-+		const result = this.applyEdits(contents, operation);
-+		return this.fileService.updateContent(resource, result, { encoding: encoding.UTF8 }).then(() => {
-+>>>>>>> .their
- 
- 	private openFile(resource: URI): void {
- 		this.editorService.openEditor({ resource });
-@@ -326,6 +333,7 @@
- 		}
- 	}
- 
-+<<<<<<< .our
- 	private stringifyTarget(target: ConfigurationTarget): string {
- 		switch (target) {
- 			case ConfigurationTarget.USER:
-@@ -334,6 +342,14 @@
- 				return nls.localize('workspaceTarget', "Workspace Settings");
- 			case ConfigurationTarget.WORKSPACE_FOLDER:
- 				return nls.localize('folderTarget', "Folder Settings");
-+=======
-+	private applyEdits(content: string, edit: IConfigurationEditOperation): string {
-+		const { tabSize, insertSpaces } = this.configurationService.getConfiguration<{ tabSize: number; insertSpaces: boolean }>('editor');
-+		const { key, value } = edit;
-+		// Without key, the entire settings file is being replaced, so we just use JSON.stringify
-+		if (!key) {
-+			return JSON.stringify(value, null, insertSpaces ? strings.repeat(' ', tabSize) : '\t');
-+>>>>>>> .their
- 		}
- 		return '';
- 	}
-@@ -356,6 +372,7 @@
- 		return setProperty(model.getValue(), jsonPath, value, { tabSize, insertSpaces, eol });
- 	}
- 
-+<<<<<<< .our
- 	private resolveModelReference(resource: URI): TPromise<IReference<ITextEditorModel>> {
- 		return this.fileService.existsFile(resource)
- 			.then(exists => {
-@@ -373,6 +390,14 @@
- 		const parseErrors: json.ParseError[] = [];
- 		json.parse(model.getValue(), parseErrors);
- 		return parseErrors.length > 0;
-+=======
-+	private getEdits(content: string, edit: IConfigurationEditOperation): Edit[] {
-+		const { tabSize, insertSpaces } = this.configurationService.getConfiguration<{ tabSize: number; insertSpaces: boolean }>('editor');
-+		const { eol } = this.configurationService.getConfiguration<{ eol: string }>('files');
-+
-+		const { key, value, overrideIdentifier } = edit;
-+		return setProperty(content, overrideIdentifier ? [keyFromOverrideIdentifier(overrideIdentifier), key] : [key], value, { tabSize, insertSpaces, eol });
-+>>>>>>> .their
- 	}
- 
- 	private resolveAndValidate(target: ConfigurationTarget, operation: IConfigurationEditOperation, checkDirty: boolean, overrides: IConfigurationOverrides): TPromise<IReference<ITextEditorModel>> {
-removed in local
-  base   100644 88cb19b2cc82d545741052f678ee21fa92e8f8be src/vs/workbench/services/configurationResolver/node/configurationResolverService.ts
-  their  100644 b156102bfa40473887e34cae4ed4170d86097588 src/vs/workbench/services/configurationResolver/node/configurationResolverService.ts
-removed in local
-  base   100644 e677f84814b02615633253c34c97a40e947949f5 src/vs/workbench/services/themes/electron-browser/themeService.ts
-  their  100644 65fc82929be2ccbaef78cbd030184c684767c4c0 src/vs/workbench/services/themes/electron-browser/themeService.ts
diff --git a/app/test/fixtures/merge-parser/vscode/merge-aeschli-monaco-tokenizer2-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-aeschli-monaco-tokenizer2-into-master.txt
deleted file mode 100644
index cd8a75711e8..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-aeschli-monaco-tokenizer2-into-master.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-changed in both
-  base   100644 533087ed7b0032921a9c8a930bf38e25b1e470af src/vs/editor/standalone/browser/standaloneLanguages.ts
-  our    100644 b0287953b31b42b550a9fccdb465b02666dae70f src/vs/editor/standalone/browser/standaloneLanguages.ts
-  their  100644 592e1705796b822d7888df6e2deb64da2756ecd7 src/vs/editor/standalone/browser/standaloneLanguages.ts
-changed in both
-  base   100644 7f4f3612fc64738565ab9aae3adb590738268bda src/vs/editor/standalone/browser/standaloneThemeServiceImpl.ts
-  our    100644 f72758ff75e54bf76df4e4b62045f41b25b82d15 src/vs/editor/standalone/browser/standaloneThemeServiceImpl.ts
-  their  100644 61e358dc4a0a6c85fec9b68cd431f39c66140a40 src/vs/editor/standalone/browser/standaloneThemeServiceImpl.ts
-@@ -100,7 +100,11 @@
- 	}
- 
- 	public defines(colorId: ColorIdentifier): boolean {
-+<<<<<<< .our
- 		return Object.prototype.hasOwnProperty.call(this.getColors(), colorId);
-+=======
-+		return this.getColors().hasOwnProperty(colorId);
-+>>>>>>> .their
- 	}
- 
- 	public get type() {
-changed in both
-  base   100644 05aad76b9ef9a5b0d3f8c9bd2a57d67f6fa8baba src/vs/monaco.d.ts
-  our    100644 76dcf491ff9c1973ad61bf5d423713bb1a3b4e44 src/vs/monaco.d.ts
-  their  100644 dbf4d12daacc186ac1f01c7165f289a8cdfc5b79 src/vs/monaco.d.ts
diff --git a/app/test/fixtures/merge-parser/vscode/merge-aeschli-nls-orig-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-aeschli-nls-orig-into-master.txt
deleted file mode 100644
index 7cfa0a8ddb5..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-aeschli-nls-orig-into-master.txt
+++ /dev/null
@@ -1,16042 +0,0 @@
-changed in both
-  base   100644 1be9709523fcd7669a359faa9dbf2da5c88e39eb build/lib/i18n.js
-  our    100644 61893ed8b1d64d1d9d09eea63a22779c7dfee56b build/lib/i18n.js
-  their  100644 1358c7dfdda24d54c2ab66cfbe72dc03432afaf3 build/lib/i18n.js
-@@ -15,7 +15,11 @@
- var gulp = require("gulp");
- var util = require('gulp-util');
- var iconv = require('iconv-lite');
-+<<<<<<< .our
- var NUMBER_OF_CONCURRENT_DOWNLOADS = 4;
-+=======
-+var NUMBER_OF_CONCURRENT_DOWNLOADS = 1;
-+>>>>>>> .their
- function log(message) {
-     var rest = [];
-     for (var _i = 1; _i < arguments.length; _i++) {
-@@ -290,6 +294,77 @@
-             var promise = iLimitedTask.factory();
-             promise.then(iLimitedTask.c).catch(iLimitedTask.e);
-             promise.then(function () { return _this.consumed(); }).catch(function () { return _this.consumed(); });
-+<<<<<<< .our
-+=======
-+        }
-+    };
-+    Limiter.prototype.consumed = function () {
-+        this.runningPromises--;
-+        this.consume();
-+    };
-+    return Limiter;
-+}());
-+exports.Limiter = Limiter;
-+var iso639_3_to_2 = {
-+    'chs': 'zh-cn',
-+    'cht': 'zh-tw',
-+    'csy': 'cs-cz',
-+    'deu': 'de',
-+    'enu': 'en',
-+    'esn': 'es',
-+    'fra': 'fr',
-+    'hun': 'hu',
-+    'ita': 'it',
-+    'jpn': 'ja',
-+    'kor': 'ko',
-+    'nld': 'nl',
-+    'plk': 'pl',
-+    'ptb': 'pt-br',
-+    'ptg': 'pt',
-+    'rus': 'ru',
-+    'sve': 'sv-se',
-+    'trk': 'tr'
-+};
-+/**
-+ * Used to map Transifex to VS Code language code representation.
-+ */
-+var iso639_2_to_3 = {
-+    'zh-hans': 'chs',
-+    'zh-hant': 'cht',
-+    'cs-cz': 'csy',
-+    'de': 'deu',
-+    'en': 'enu',
-+    'es': 'esn',
-+    'fr': 'fra',
-+    'hu': 'hun',
-+    'it': 'ita',
-+    'ja': 'jpn',
-+    'ko': 'kor',
-+    'nl': 'nld',
-+    'pl': 'plk',
-+    'pt-br': 'ptb',
-+    'pt': 'ptg',
-+    'ru': 'rus',
-+    'sv-se': 'sve',
-+    'tr': 'trk'
-+};
-+function sortLanguages(directoryNames) {
-+    return directoryNames.map(function (dirName) {
-+        var lower = dirName.toLowerCase();
-+        return {
-+            name: lower,
-+            iso639_2: iso639_3_to_2[lower]
-+        };
-+    }).sort(function (a, b) {
-+        if (!a.iso639_2 && !b.iso639_2) {
-+            return 0;
-+        }
-+        if (!a.iso639_2) {
-+            return -1;
-+        }
-+        if (!b.iso639_2) {
-+            return 1;
-+>>>>>>> .their
-         }
-     };
-     Limiter.prototype.consumed = function () {
-@@ -977,6 +1052,10 @@
-         callback();
-     });
- }
-+<<<<<<< .our
-+=======
-+exports.pullXlfFiles = pullXlfFiles;
-+>>>>>>> .their
- var limiter = new Limiter(NUMBER_OF_CONCURRENT_DOWNLOADS);
- function retrieveResource(language, resource, apiHostname, credentials) {
-     return limiter.queue(function () { return new Promise(function (resolve, reject) {
-@@ -996,6 +1075,7 @@
-             res.on('data', function (chunk) { return xlfBuffer.push(chunk); });
-             res.on('end', function () {
-                 if (res.statusCode === 200) {
-+<<<<<<< .our
-                     resolve(new File({ contents: Buffer.concat(xlfBuffer), path: project + "/" + slug + ".xlf" }));
-                 }
-                 else if (res.statusCode === 404) {
-@@ -1004,6 +1084,10 @@
-                 }
-                 else {
-                     reject(slug + " in " + project + " returned no data. Response code: " + res.statusCode + ".");
-+=======
-+                    console.log('success: ' + options.path);
-+                    resolve(new File({ contents: Buffer.concat(xlfBuffer), path: project + "/" + iso639_2_to_3[language] + "/" + slug + ".xlf" }));
-+>>>>>>> .their
-                 }
-             });
-         });
-@@ -1011,6 +1095,10 @@
-             reject("Failed to query resource " + slug + " with the following error: " + err + ". " + options.path);
-         });
-         request.end();
-+<<<<<<< .our
-+=======
-+        console.log('started: ' + options.path);
-+>>>>>>> .their
-     }); });
- }
- function prepareI18nFiles() {
-changed in both
-  base   100644 db67ffc3812675b6b05478130e9d1afcbf68a717 build/lib/i18n.ts
-  our    100644 06b51be8767fddebbb1c08372f644ab15c648478 build/lib/i18n.ts
-  their  100644 223b61ce91169ec3d52bc18d283189b21f196640 build/lib/i18n.ts
-@@ -17,7 +17,11 @@
- var util = require('gulp-util');
- var iconv = require('iconv-lite');
- 
-+<<<<<<< .our
- const NUMBER_OF_CONCURRENT_DOWNLOADS = 4;
-+=======
-+const NUMBER_OF_CONCURRENT_DOWNLOADS = 1;
-+>>>>>>> .their
- 
- function log(message: any, ...rest: any[]): void {
- 	util.log(util.colors.green('[i18n]'), message, ...rest);
-@@ -366,6 +370,93 @@
- export interface ITask<T> {
- 	(): T;
- }
-+<<<<<<< .our
-+=======
-+
-+interface ILimitedTaskFactory<T> {
-+	factory: ITask<Promise<T>>;
-+	c: (value?: T | Thenable<T>) => void;
-+	e: (error?: any) => void;
-+}
-+
-+export class Limiter<T> {
-+	private runningPromises: number;
-+	private outstandingPromises: ILimitedTaskFactory<any>[];
-+
-+	constructor(private maxDegreeOfParalellism: number) {
-+		this.outstandingPromises = [];
-+		this.runningPromises = 0;
-+	}
-+
-+	queue(factory: ITask<Promise<T>>): Promise<T> {
-+		return new Promise<T>((c, e) => {
-+			this.outstandingPromises.push({factory, c, e});
-+			this.consume();
-+		});
-+	}
-+
-+	private consume(): void {
-+		while (this.outstandingPromises.length && this.runningPromises < this.maxDegreeOfParalellism) {
-+			const iLimitedTask = this.outstandingPromises.shift();
-+			this.runningPromises++;
-+
-+			const promise = iLimitedTask.factory();
-+			promise.then(iLimitedTask.c).catch(iLimitedTask.e);
-+			promise.then(() => this.consumed()).catch(() => this.consumed());
-+		}
-+	}
-+
-+	private consumed(): void {
-+		this.runningPromises--;
-+		this.consume();
-+	}
-+}
-+
-+const iso639_3_to_2: Map<string> = {
-+	'chs': 'zh-cn',
-+	'cht': 'zh-tw',
-+	'csy': 'cs-cz',
-+	'deu': 'de',
-+	'enu': 'en',
-+	'esn': 'es',
-+	'fra': 'fr',
-+	'hun': 'hu',
-+	'ita': 'it',
-+	'jpn': 'ja',
-+	'kor': 'ko',
-+	'nld': 'nl',
-+	'plk': 'pl',
-+	'ptb': 'pt-br',
-+	'ptg': 'pt',
-+	'rus': 'ru',
-+	'sve': 'sv-se',
-+	'trk': 'tr'
-+};
-+
-+/**
-+ * Used to map Transifex to VS Code language code representation.
-+ */
-+const iso639_2_to_3: Map<string> = {
-+	'zh-hans': 'chs',
-+	'zh-hant': 'cht',
-+	'cs-cz': 'csy',
-+	'de': 'deu',
-+	'en': 'enu',
-+	'es': 'esn',
-+	'fr': 'fra',
-+	'hu': 'hun',
-+	'it': 'ita',
-+	'ja': 'jpn',
-+	'ko': 'kor',
-+	'nl': 'nld',
-+	'pl': 'plk',
-+	'pt-br': 'ptb',
-+	'pt': 'ptg',
-+	'ru': 'rus',
-+	'sv-se': 'sve',
-+	'tr': 'trk'
-+};
-+>>>>>>> .their
- 
- interface ILimitedTaskFactory<T> {
- 	factory: ITask<Promise<T>>;
-@@ -1101,7 +1192,11 @@
- }
- const limiter = new Limiter<File>(NUMBER_OF_CONCURRENT_DOWNLOADS);
- 
-+<<<<<<< .our
- function retrieveResource(language: Language, resource: Resource, apiHostname, credentials): Promise<File> {
-+=======
-+function retrieveResource(language: string, resource: Resource, apiHostname, credentials): Promise<File> {
-+>>>>>>> .their
- 	return limiter.queue(() => new Promise<File>((resolve, reject) => {
- 		const slug = resource.name.replace(/\//g, '_');
- 		const project = resource.project;
-@@ -1120,12 +1215,17 @@
- 			res.on('data', (chunk: Buffer) => xlfBuffer.push(chunk));
- 			res.on('end', () => {
- 				if (res.statusCode === 200) {
-+<<<<<<< .our
- 					resolve(new File({ contents: Buffer.concat(xlfBuffer), path: `${project}/${slug}.xlf` }));
- 				} else if (res.statusCode === 404) {
- 					console.log(`[transifex] ${slug} in ${project} returned no data.`);
- 					resolve(null);
- 				} else {
- 					reject(`${slug} in ${project} returned no data. Response code: ${res.statusCode}.`);
-+=======
-+					console.log('success: ' + options.path);
-+					resolve(new File({ contents: Buffer.concat(xlfBuffer), path: `${project}/${iso639_2_to_3[language]}/${slug}.xlf` }));
-+>>>>>>> .their
- 				}
- 			});
- 		});
-@@ -1133,6 +1233,10 @@
- 			reject(`Failed to query resource ${slug} with the following error: ${err}. ${options.path}`);
- 		});
- 		request.end();
-+<<<<<<< .our
-+=======
-+		console.log('started: ' + options.path);
-+>>>>>>> .their
- 	}));
- }
- 
-changed in both
-  base   100644 6df74592845c82212cede74b7190e028a2ae69b3 i18n/chs/extensions/git/out/autofetch.i18n.json
-  our    100644 1b09e9c6bd8b812e46758456cd483ea4739537f6 i18n/chs/extensions/git/out/autofetch.i18n.json
-  their  100644 823bb93043fd6924820d2ab9e8443c022cafded6 i18n/chs/extensions/git/out/autofetch.i18n.json
-@@ -7,7 +7,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"yes": "是",
-+	"read more": "了解详细信息",
- 	"no": "否",
- 	"not now": "稍后询问",
-+<<<<<<< .our
- 	"suggest auto fetch": "您希望 Code [定期运行 \"git fetch\"]({0}) 吗?"
-+=======
-+	"suggest auto fetch": "您希望 Code 定期运行 \"git fetch\" 吗?"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8f5f2a83f793b721a04539cf46eadfc8f5fa1ec5 i18n/chs/extensions/git/out/commands.i18n.json
-  our    100644 04fae89946b4fff2a3f253e57b9b96d137dedd28 i18n/chs/extensions/git/out/commands.i18n.json
-  their  100644 dcd0b9e0ae9e29e14655917740f030434d0734cd i18n/chs/extensions/git/out/commands.i18n.json
-@@ -75,8 +75,12 @@
- 	"ok": "确定",
- 	"push with tags success": "已成功带标签进行推送。",
- 	"pick remote": "选取要将分支“{0}”发布到的远程:",
-+<<<<<<< .our
- 	"sync is unpredictable": "此操作将推送提交至“{0}/{1}”，并从中拉取提交。",
- 	"never again": "确定，且不再显示",
-+=======
-+	"sync is unpredictable": "此操作将推送提交至“{0}”，并从中拉取提交。",
-+>>>>>>> .their
- 	"no remotes to publish": "存储库未配置任何要发布到的远程存储库。",
- 	"no changes stash": "没有要储藏的更改。",
- 	"provide stash message": "提供储藏消息(可选)",
-changed in both
-  base   100644 cb8443b7aecb74a6659f99fc88dc857dc7b6853c i18n/chs/extensions/git/package.i18n.json
-  our    100644 7c2a3b49c9f848f60d2957657294486b061a17aa i18n/chs/extensions/git/package.i18n.json
-  their  100644 33772606c95496123209b39400f92841756cf22d i18n/chs/extensions/git/package.i18n.json
-added in both
-  our    100644 71f03151b6fecd58c9a8721067f26bc58ad33734 i18n/chs/extensions/typescript/out/commands.i18n.json
-  their  100644 36b3b2d5f6ba3680fe26093fc105449a9293a487 i18n/chs/extensions/typescript/out/commands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -13,4 +14,20 @@
- 	"typescript.noJavaScriptProjectConfig": "文件不属于 JavaScript 项目。点击[这里]({0})了解更多。",
- 	"typescript.configureTsconfigQuickPick": "配置 tsconfig.json",
- 	"typescript.configureJsconfigQuickPick": "配置 jsconfig.json"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"typescript.projectConfigNoWorkspace": "请在 VS Code 中打开一个文件夹，以使用 TypeScript 或 JavaScript 项目",
-+	"typescript.projectConfigUnsupportedFile": "无法确定 TypeScript 或 JavaScript 项目。不受支持的文件类型",
-+	"typescript.projectConfigCouldNotGetInfo": "无法确定 TypeScript 或 JavaScript 项目",
-+	"typescript.noTypeScriptProjectConfig": "文件不属于 TypeScript 项目",
-+	"typescript.noJavaScriptProjectConfig": "文件不属于 JavaScript 项目",
-+	"typescript.configureTsconfigQuickPick": "配置 tsconfig.json",
-+	"typescript.configureJsconfigQuickPick": "配置 jsconfig.json",
-+	"typescript.projectConfigLearnMore": "了解详细信息"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 750d811d866eaa3d43818bd1d8e28c9898acf514 i18n/chs/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-  their  100644 ed15423097d5cbb03aeb8c474db3877ca0d1584f i18n/chs/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"selectAriaOption": "{0}"
- }
-\ No newline at end of file
-added in both
-  our    100644 4b6a11e30ab2010ef07b79ec8f1cd51920718289 i18n/chs/src/vs/base/node/ps.i18n.json
-  their  100644 da69e94cccc4b9e1f6bd36e963f7e0f7c4c57a57 i18n/chs/src/vs/base/node/ps.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"collecting": "正在收集 CPU 与内存信息。这可能需要几秒钟的时间。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 9c145d8c4d96ed4d4ed34fe0011175c2a7f1e61c i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 e4c993e2df857650110681bbfaaa48507f4e2ec6 i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 b2f32f3d15bb587157f73cfef6a3d91e500ce421 i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -16,7 +16,11 @@
- 	"lineNumbers.on": "将行号显示为绝对行数。",
- 	"lineNumbers.relative": "将行号显示为与光标相隔的行数。",
- 	"lineNumbers.interval": "每 10 行显示一次行号。",
-+<<<<<<< .our
- 	"lineNumbers": "控制行号的显示。",
-+=======
-+	"lineNumbers": "控制行号的显示。可选值为 \"on\"、\"off\"、\"relative\" 和 \"interval\"。",
-+>>>>>>> .their
- 	"rulers": "在一定数量的等宽字符后显示垂直标尺。输入多个值，显示多个标尺。若数组为空，则不绘制标尺。",
- 	"wordSeparators": "执行文字相关的导航或操作时将用作文字分隔符的字符",
- 	"tabSize": "一个制表符等于的空格数。该设置在 \"editor.detectIndentation\" 启用时根据文件内容可能会被覆盖。",
-@@ -81,7 +85,11 @@
- 	"cursorBlinking": "控制光标的动画样式。",
- 	"mouseWheelZoom": "按住 Ctrl 键并滚动鼠标滚轮可缩放编辑器字体大小",
- 	"cursorStyle": "控制光标样式，接受的值为 \"block\"、\"block-outline\"、\"line\"、\"line-thin\" 、\"underline\" 和 \"underline-thin\"",
-+<<<<<<< .our
- 	"cursorWidth": "当 editor.cursorStyle 设置为 \"line\" 时控制光标的宽度。",
-+=======
-+	"lineCursorWidth": "当 editor.cursorStyle 设置为 \"line\" 时控制光标的宽度。",
-+>>>>>>> .their
- 	"fontLigatures": "启用字体连字",
- 	"hideCursorInOverviewRuler": "控制光标是否应隐藏在概述标尺中。",
- 	"renderWhitespace": "控制编辑器在空白字符上显示特殊符号的方式。可选值为 \"none\"(无)、\"boundary\"(边界) 或 \"all\"(所有)。选择 \"boundary\" 选项，则不会在单词之间的单个空格上显示特殊符号。",
-changed in both
-  base   100644 168dd2fb958ae830c3931ca87f2d3b51f2177c19 i18n/chs/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 264f0668a4da9659a58613193f24657a9dfbbc79 i18n/chs/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 6d1dfc8be232f5b57f9e41b60d0f29e3dc2c6313 i18n/chs/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -8,8 +8,12 @@
- 	],
- 	"lineHighlight": "光标所在行高亮内容的背景颜色。",
- 	"lineHighlightBorderBox": "光标所在行四周边框的背景颜色。",
-+<<<<<<< .our
- 	"rangeHighlight": "高亮范围的背景色，像是由 \"Quick Open\" 和“查找”功能高亮的范围。颜色必须透明，使其不会挡住下方的其他元素。",
- 	"rangeHighlightBorder": "高亮区域边框的背景颜色。",
-+=======
-+	"rangeHighlight": "高亮范围的背景色，例如由 \"Quick Open\" 和“查找”功能高亮的范围。颜色必须透明，这样不会挡住其下的其他元素。",
-+>>>>>>> .their
- 	"caret": "编辑器光标颜色。",
- 	"editorCursorBackground": "编辑器光标的背景色。可以自定义块型光标覆盖字符的颜色。",
- 	"editorWhitespaces": "编辑器中空白字符的颜色。",
-changed in both
-  base   100644 8dc6ee58760895e0ce0231d59214f863bdbf9e42 i18n/chs/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  our    100644 07ca5b151407128f5c67abeabd325c94baa546d7 i18n/chs/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  their  100644 1613d026f4c2506d7dc1e0a7559c213185dd4257 i18n/chs/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -10,4 +11,11 @@
- 	"markerAction.previous.label": "转到上一个问题 (错误、警告、信息)",
- 	"markerAction.nextInFiles.label": "转到文件中的下一个问题 (错误、警告、信息)",
- 	"markerAction.previousInFiles.label": "转到文件中的上一个问题 (错误、警告、信息)"
-+=======
-+	"title.wo_source": "({0}/{1})",
-+	"editorMarkerNavigationError": "编辑器标记导航小组件错误颜色。",
-+	"editorMarkerNavigationWarning": "编辑器标记导航小组件警告颜色。",
-+	"editorMarkerNavigationInfo": "编辑器标记导航小组件信息颜色。",
-+	"editorMarkerNavigationBackground": "编辑器标记导航小组件背景色。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7926047995cd2085bb787739e9fc392f79b6f9fb i18n/chs/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  our    100644 1340c8a0009aff7341c597272cd8012da0f8ba44 i18n/chs/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  their  100644 185a3d3162017d13d575cf1d85c8514990de7a64 i18n/chs/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,12 @@
- 	"wordHighlightStrongBorder": "符号在进行写入访问操作时的边框颜色，例如写入变量。",
- 	"overviewRulerWordHighlightForeground": "概览标尺中符号高亮的标记颜色。颜色必须透明，使其不会挡住下方的其他元素。",
- 	"overviewRulerWordHighlightStrongForeground": "概览标尺中写入访问符号高亮的标记颜色。颜色必须透明，使其不会挡住下方的其他元素。",
-+=======
-+	"wordHighlight": "进行读取访问操作时符号的背景颜色，例如读取变量时。颜色必须透明，这样不会挡住其下的其他元素。",
-+	"wordHighlightStrong": "进行写入访问操作时符号的背景颜色，例如写入变量时。颜色必须透明，这样不会挡住其下的其他元素。",
-+	"overviewRulerWordHighlightForeground": "概述符号突出显示的标尺标记颜色。",
-+	"overviewRulerWordHighlightStrongForeground": "概述写访问符号突出显示的标尺标记颜色。",
-+>>>>>>> .their
- 	"wordHighlight.next.label": "转到下一个突出显示的符号",
- 	"wordHighlight.previous.label": "转到上一个突出显示的符号"
- }
-\ No newline at end of file
-changed in both
-  base   100644 d14243882a7e041eb7326c95dffaca2dd93b0761 i18n/chs/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  our    100644 d23732f8ae4a1f9b08239592f29e3466b2c23adf i18n/chs/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  their  100644 dd181ef9f459c13e4ff6322f75ff4653c16087b1 i18n/chs/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 9a1faa5d9834a9baf000967abbf2ad5cd872c29e i18n/chs/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 9b8e352f2e01c71634dfc189a8ddc9dc7485da94 i18n/chs/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 30d7fd225a23bd396022f1e66ac73228123bbd55 i18n/chs/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,11 +10,19 @@
- 	"diff": "将两个文件相互比较。",
- 	"add": "将文件夹添加到上一个活动窗口。",
- 	"goto": "打开路径下的文件并定位到特定行和特定列。",
-+<<<<<<< .our
- 	"newWindow": "强制打开新窗口。",
- 	"reuseWindow": "强制打开上一个活动窗口中的文件或文件夹。",
- 	"wait": "等文件关闭后再返回。",
- 	"locale": "要使用的区域设置(例如 en-US 或 zh-TW)。",
- 	"userDataDir": "指定保存用户数据的目录。可用于打开多个不同的 Code 实例。",
-+=======
-+	"newWindow": "强制创建一个新的 Code 实例。",
-+	"reuseWindow": "在上一活动窗口中强制打开文件或文件夹。",
-+	"wait": "等文件关闭后再返回。",
-+	"locale": "要使用的区域设置(例如 en-US 或 zh-TW)。",
-+	"userDataDir": "指定存放用户数据的目录。此目录在以 root 身份运行时十分有用。",
-+>>>>>>> .their
- 	"version": "打印版本。",
- 	"help": "打印使用情况。",
- 	"extensionHomePath": "设置扩展的根路径。",
-@@ -22,13 +30,18 @@
- 	"showVersions": "使用 --list-extension 时，显示已安装扩展的版本。",
- 	"installExtension": "安装扩展。",
- 	"uninstallExtension": "卸载扩展。",
-+<<<<<<< .our
- 	"experimentalApis": "为扩展启用实验性 API 功能。",
-+=======
-+	"experimentalApis": "启用扩展程序实验性 api 功能。",
-+>>>>>>> .their
- 	"verbose": "打印详细输出(隐含 --wait 参数)。",
- 	"log": "使用的日志级别。默认值为 \"info\"。允许的值为 \"critical\" (关键)、\"error\" (错误)、\"warn\" (警告)、\"info\" (信息)、\"debug\" (调试)、\"trace\" (跟踪) 和 \"off\" (关闭)。",
- 	"status": "打印进程使用情况和诊断信息。",
- 	"performance": "通过启用 \"Developer: Startup Performance\" 命令开始。",
- 	"prof-startup": "启动期间运行 CPU 探查器",
- 	"disableExtensions": "禁用所有已安装的扩展。",
-+<<<<<<< .our
- 	"inspect-extensions": "允许调试和分析扩展。您可以在开发人员工具中找到连接 URI。",
- 	"inspect-brk-extensions": "允许扩展宿主在启动后暂停时进行扩展的调试和分析。您可以在开发人员工具中找到连接 URI。",
- 	"disableGPU": "禁用 GPU 硬件加速。",
-@@ -38,6 +51,16 @@
- 	"options": "选项",
- 	"paths": "路径",
- 	"stdinWindows": "要读取其他程序的输出，请追加 \"-\" (例如 \"echo Hello World | {0} -')",
-+=======
-+	"inspect-extensions": "允许进行扩展的调试与分析。检查开发人员工具可获取连接 URI。",
-+	"inspect-brk-extensions": "允许在扩展主机在启动后暂停时进行扩展的调试与分析。检查开发人员工具可获取连接 URI。",
-+	"disableGPU": "禁用 GPU 硬件加速。",
-+	"uploadLogs": "将当前会话的日志上传到安全端点。",
-+	"usage": "使用情况",
-+	"options": "选项",
-+	"paths": "路径",
-+	"stdinWindows": "要读取其他程序的输出，请追加 \"-\" (例如 \"echo Hello World\" | {0} -')",
-+>>>>>>> .their
- 	"stdinUnix": "要从 stdin 中读取，请追加 \"-\" (例如 \"ps aux | grep code | {0} -')",
- 	"optionsUpperCase": "选项",
- 	"extensionsManagement": "扩展管理",
-changed in both
-  base   100644 a6e3a8ea7bc9a06e9c6c887aa44c0473b27cb057 i18n/chs/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 7fee73e8505eefc794b34e899f5cfb2204f92225 i18n/chs/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 c72b93d1de938768477baeb2a28cbd24aedc32eb i18n/chs/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -7,12 +7,16 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"invalidManifest": "扩展无效: package.json 不是 JSON 文件。",
-+<<<<<<< .our
- 	"incompatible": "无法安装扩展“{0}”，它与 Code “{1}”不兼容。",
-+=======
-+>>>>>>> .their
- 	"restartCode": "请先重启 Code 再重新安装 {0}。",
- 	"installingOutdatedExtension": "您已安装此扩展的新版程序。是否要使用旧版覆盖？",
- 	"override": "覆盖",
- 	"cancel": "取消",
- 	"errorInstallingDependencies": "安装依赖项时出错。{0}",
-+<<<<<<< .our
- 	"MarketPlaceDisabled": "商店未启用",
- 	"removeError": "删除扩展时出错: {0}。请重启 VS Code，然后重试。",
- 	"Not a Marketplace extension": "只能重新安装商店中的扩展",
-@@ -25,6 +29,17 @@
- 	"uninstallDependeciesConfirmation": "是仅卸载“{0}”还是与其依赖项一起卸载?",
- 	"uninstallOnly": "仅此扩展",
- 	"uninstallAll": "全部卸载",
-+=======
-+	"notFoundCompatible": "无法安装“{0}”；没有可用的版本与 VS Code “{1}”兼容。",
-+	"notFoundCompatibleDependency": "无法安装。找不到与 VS Code 当前版本 ({1}) 兼容的依赖扩展“{0}”。",
-+	"quitCode": "无法安装扩展。请在重启 VS Code 后重新安装。",
-+	"exitCode": "无法安装扩展。请在重启 VS Code 后重新安装。",
-+	"uninstallDependeciesConfirmation": "要仅卸载“{0}”或者其依赖项也一起卸载?",
-+	"uninstallOnly": "仅",
-+	"uninstallAll": "全部",
-+	"uninstallConfirmation": "是否确定要卸载“{0}”?",
-+	"ok": "确定",
-+>>>>>>> .their
- 	"singleDependentError": "无法卸载扩展程序“{0}”。扩展程序“{1}”依赖于此。",
- 	"twoDependentsError": "无法卸载扩展程序“{0}”。扩展程序“{1}”、“{2}”依赖于此。",
- 	"multipleDependentsError": "无法卸载扩展程序“{0}”。扩展程序“{1}”、“{2}”以及其他扩展程序都依赖于此。",
-changed in both
-  base   100644 864f82423ea1aefaf453829ded69186ccf90e1e1 i18n/chs/src/vs/platform/message/common/message.i18n.json
-  our    100644 db08df116eef5fe3a9bdcfdb3c527899324b8959 i18n/chs/src/vs/platform/message/common/message.i18n.json
-  their  100644 6ab699b790e6cb991fbccac8c96a921a9d0f6a2e i18n/chs/src/vs/platform/message/common/message.i18n.json
-changed in both
-  base   100644 7c3d96dd488d30cbdad11c18b72d481ffd24e5b3 i18n/chs/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 c983e4e827a53b4bffaaa1c1c11e806845efcb6b i18n/chs/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 0e3e7d546d396f0d12ec42de6ca670df52c86bd3 i18n/chs/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -68,6 +68,7 @@
- 	"editorWidgetBorder": "编辑器小部件的边框颜色。此颜色仅在小部件有边框且不被小部件重写时适用。",
- 	"editorSelectionBackground": "编辑器所选内容的颜色。",
- 	"editorSelectionForeground": "用以彰显高对比度的所选文本的颜色。",
-+<<<<<<< .our
- 	"editorInactiveSelection": "非活动编辑器内已选内容的颜色。颜色必须透明，使其不会挡住下方的其他元素。",
- 	"editorSelectionHighlight": "与所选项内容相同的区域的颜色。颜色必须透明，使其不会挡住下方的其他元素。",
- 	"editorSelectionHighlightBorder": "与所选项内容相同的区域的边框颜色。",
-@@ -79,6 +80,14 @@
- 	"findRangeHighlightBorder": "搜索限制范围的边框颜色。颜色必须透明，使其不会挡住下方的其他元素。",
- 	"findWidgetResizeBorder": "“查找”小部件中大小调整条的边框颜色。",
- 	"hoverHighlight": "文本在悬停提示显示时的高亮颜色。颜色必须透明，使其不会挡住下方的其他元素。",
-+=======
-+	"editorInactiveSelection": "非活动编辑器选择内容的颜色。颜色必须透明，这样不会挡住其下的其他元素。",
-+	"editorSelectionHighlight": "与已选项内容相同区域的颜色。颜色必须透明，这样不会挡住其下的其他元素。",
-+	"editorFindMatch": "当前搜索匹配项的颜色。",
-+	"findMatchHighlight": "其他搜索匹配项的颜色。颜色必须透明，这样不会挡住其下的其他元素。",
-+	"findRangeHighlight": "搜索限制范围的颜色。颜色必须透明，这样不会挡住其下的其他元素。",
-+	"hoverHighlight": "悬停提示显示时文本的高亮颜色。颜色必须透明，这样不会挡住其下的其他元素。",
-+>>>>>>> .their
- 	"hoverBackground": "编辑器悬停提示的背景颜色。",
- 	"hoverBorder": "光标悬停时编辑器的边框颜色。",
- 	"activeLinkForeground": "活动链接颜色。",
-@@ -86,12 +95,21 @@
- 	"diffEditorRemoved": "移除文本的背景色。颜色必须透明，使其不会挡住下方的其他元素。",
- 	"diffEditorInsertedOutline": "插入的文本的轮廓颜色。",
- 	"diffEditorRemovedOutline": "被删除文本的轮廓颜色。",
-+<<<<<<< .our
- 	"mergeCurrentHeaderBackground": "内嵌的合并冲突处理器中当前版本区域头部的背景色。颜色必须透明，使其不会挡住下方的其他元素。",
- 	"mergeCurrentContentBackground": "内嵌的合并冲突处理器中当前版本区域内容的背景色。颜色必须透明，使其不会挡住下方的其他元素。",
- 	"mergeIncomingHeaderBackground": "内嵌的合并冲突处理器中传入版本区域头部的背景色。颜色必须透明，使其不会挡住下方的其他元素。",
- 	"mergeIncomingContentBackground": "内嵌的合并冲突处理器中传入版本区域内容的背景色。颜色必须透明，使其不会挡住下方的其他元素。",
- 	"mergeCommonHeaderBackground": "内嵌的合并冲突处理器中共同上级区域头部的背景色。颜色必须透明，使其不会挡住下方的其他元素。",
- 	"mergeCommonContentBackground": "内嵌的合并冲突处理器中共同上级区域内容的背景色。颜色必须透明，使其不会挡住下方的其他元素。",
-+=======
-+	"mergeCurrentHeaderBackground": "内联合并冲突中当前版本区域头部的背景色。颜色必须透明，这样不会挡住其下的其他元素。",
-+	"mergeCurrentContentBackground": "内联合并冲突中当前版本区域内容的背景色。颜色必须透明，这样不会挡住其下的其他元素。",
-+	"mergeIncomingHeaderBackground": "内联合并冲突中传入版本区域头部的背景色。颜色必须透明，这样不会挡住其下的其他元素。",
-+	"mergeIncomingContentBackground": "内联合并冲突中传入版本区域内容的背景色。颜色必须透明，这样不会挡住其下的其他元素。",
-+	"mergeCommonHeaderBackground": "内联合并冲突中共同上级区域头部的背景色。颜色必须透明，这样不会挡住其下的其他元素。",
-+	"mergeCommonContentBackground": "内联合并冲突中共同上级区域内容的背景色。颜色必须透明，这样不会挡住其下的其他元素。",
-+>>>>>>> .their
- 	"mergeBorder": "内联合并冲突中标头和分割线的边框颜色。",
- 	"overviewRulerCurrentContentForeground": "内联合并冲突中当前版本区域的概览标尺前景色。",
- 	"overviewRulerIncomingContentForeground": "内联合并冲突中传入的版本区域的概览标尺前景色。",
-added in both
-  our    100644 8117f5f86ff11ff7ea3fc98cdad68c3984b0dd2e i18n/chs/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 519a8e806a76fcb6e0d3e48ce315f684950e8fca i18n/chs/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,5 +10,13 @@
- 	"timeout.formatOnSave": "在 {0}ms 后终止了保存时进行的格式设置",
- 	"codeActionsOnSave.didTimeout": "在 {0}ms 后终止了 codeActionsOnSave ",
- 	"timeout.onWillSave": "在 1750ms 后终止了 onWillSaveTextDocument 事件",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"saveParticipants": "正在运行保存参与程序..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 7bfb0b886ded6448e92465cb63ab0ee172a110f9 i18n/chs/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  our    100644 468408a29dd30fc7bc139b6e7dd756255644e1a3 i18n/chs/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  their  100644 903f7203bbbf1a0a8b36327b824a43e0e7f88af3 i18n/chs/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,7 @@
- 	],
- 	"treeView.notRegistered": "没有注册 ID 为“{0}”的树形图。",
- 	"treeView.duplicateElement": "ID 为 {0} 的元素已被注册"
-+=======
-+	"treeView.notRegistered": "没有注册 ID 为“{0}”的树形图。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 b282efac3d09db774d38d17d7066a0bc0562cc83 i18n/chs/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 1be88d0e515057ba8dbf0bcd7cef8fa6af9d6bf5 i18n/chs/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 0ac87020d7bd2829721b96f209bea20515e22523 i18n/chs/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -15,5 +15,9 @@
- 	"saveWorkspace": "保存工作区",
- 	"openWorkspaceAction": "打开工作区...",
- 	"openWorkspaceConfigFile": "打开工作区配置文件",
-+<<<<<<< .our
- 	"duplicateWorkspaceInNewWindow": "复制此工作区并在新窗口打开"
-+=======
-+	"openFolderAsWorkspaceInNewWindow": "在新窗口中将文件夹作为工作区打开"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 4edf839a663bb84d07b5c6498969aedf9eac1cad i18n/chs/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-  their  100644 ff43d2fcbf7daa358ffcebce9525104b0e5633b2 i18n/chs/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"addFolderToWorkspace": "将文件夹添加到工作区...",
- 	"add": "添加(&&A)",
- 	"addFolderToWorkspaceTitle": "将文件夹添加到工作区",
-changed in both
-  base   100644 a2f0727f5791c87ae5b382d91952287a660ca64f i18n/chs/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  our    100644 0afdcb03a407d7395c5dfda27f1e82a5fbc03461 i18n/chs/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  their  100644 d2749a6922270c0432b40f38d1eebacfd61ad972 i18n/chs/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-@@ -18,15 +18,24 @@
- 	"file": "文件",
- 	"close": "关闭",
- 	"closeOthers": "关闭其他",
-+<<<<<<< .our
- 	"closeRight": "关闭右侧",
- 	"closeAllSaved": "关闭已保存",
-+=======
-+	"closeRight": "关闭到右侧",
-+	"closeAllUnmodified": "关闭未更改",
-+>>>>>>> .their
- 	"closeAll": "全部关闭",
- 	"keepOpen": "保持打开状态",
- 	"toggleInlineView": "切换内联视图",
- 	"showOpenedEditors": "显示打开的编辑器",
- 	"keepEditor": "保留编辑器",
- 	"closeEditorsInGroup": "关闭组中的所有编辑器",
-+<<<<<<< .our
- 	"closeSavedEditors": "关闭组中已保存的编辑器",
-+=======
-+	"closeUnmodifiedEditors": "关闭组中未作更改的编辑器",
-+>>>>>>> .their
- 	"closeOtherEditors": "关闭其他编辑器",
- 	"closeRightEditors": "关闭右侧编辑器"
- }
-\ No newline at end of file
-changed in both
-  base   100644 dd3e01e846c5a40d153653a4da14320970f14556 i18n/chs/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 d88886a35383d5f41237ade41887aa92519da9a1 i18n/chs/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 1d48cf8bccc26acb5b7a728135ff71c154c8e270 i18n/chs/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 9c9da616c68f199130fded466cf33bb3f9b52fab i18n/chs/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  our    100644 7288c1715223c1a48b55b4c38eeb19d83aa23eff i18n/chs/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  their  100644 94ef2c116b8697213febb9db68bf7d5bb36fb62f i18n/chs/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-changed in both
-  base   100644 9d821488d27392b57c99662107bfbc69473d7770 i18n/chs/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  our    100644 f99f129b03cb22c3e0ba8d5b9a5ccd3c7bc7f680 i18n/chs/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  their  100644 d5044cab6608083bc628894c1a26bf366c64f905 i18n/chs/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-changed in both
-  base   100644 90dedb611faac865cd269b429974f7fd3c21df3d i18n/chs/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  our    100644 928aff21e4992e87ab9bef7c409760daf942c7a2 i18n/chs/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  their  100644 d7a330cd5e2160410d539205323179d9646a3fab i18n/chs/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"close": "关闭",
-+>>>>>>> .their
- 	"araLabelEditorActions": "编辑器操作"
- }
-\ No newline at end of file
-changed in both
-  base   100644 452ee0335c551c8b3368096c7a75b79910fa6bbb i18n/chs/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
-  our    100644 4a2dece6b8d0c2c926cfb8b8bb507e016c3a2fbb i18n/chs/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
-  their  100644 1b911dc529631f9925b1f50ee36daeb94b3dea6f i18n/chs/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
-changed in both
-  base   100644 8ebf8f723db31c43b8eb24f67501b3d72999f545 i18n/chs/src/vs/workbench/common/theme.i18n.json
-  our    100644 9dff140c48c8d58d62f0adab067f1886bd30d318 i18n/chs/src/vs/workbench/common/theme.i18n.json
-  their  100644 1b50f1b309f55d9430ab087eb735b14ddf0f205d i18n/chs/src/vs/workbench/common/theme.i18n.json
-@@ -11,10 +11,15 @@
- 	"tabHoverBackground": "选项卡被悬停时的背景色。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以有多个编辑器组。",
- 	"tabUnfocusedHoverBackground": "非焦点组选项卡被悬停时的背景色。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以有多个编辑器组。",
- 	"tabBorder": "用于将选项卡彼此分隔开的边框。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以存在多个编辑器组。",
-+<<<<<<< .our
- 	"tabActiveBorder": "活动选项卡底部的边框。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以存在多个编辑器组。",
- 	"tabActiveBorderTop": "活动选项卡顶部的边框。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以存在多个编辑器组。",
- 	"tabActiveUnfocusedBorder": "在失去焦点的编辑器组中的活动选项卡底部的边框。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以存在多个编辑器组。",
- 	"tabActiveUnfocusedBorderTop": "在失去焦点的编辑器组中的活动选项卡顶部的边框。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以存在多个编辑器组。",
-+=======
-+	"tabActiveBorder": "用于高亮活动的选项卡的边框。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以存在多个编辑器组。",
-+	"tabActiveUnfocusedBorder": "用于高亮一个失去焦点的编辑器组中的活动选项卡的边框。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以存在多个编辑器组。",
-+>>>>>>> .their
- 	"tabHoverBorder": "选项卡被悬停时用于突出显示的边框。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以有多个编辑器组。",
- 	"tabUnfocusedHoverBorder": "非焦点组选项卡被悬停时用于突出显示的边框。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以有多个编辑器组。",
- 	"tabActiveForeground": "活动组中活动选项卡的前景色。在编辑器区域，选项卡是编辑器的容器。可在一个编辑器组中打开多个选项卡。可以有多个编辑器组。",
-added in both
-  our    100644 bb6a3e28cb1ceaccd929d0fbcc922bb49545d934 i18n/chs/src/vs/workbench/common/views.i18n.json
-  their  100644 85f57daaba0619c567a165965d11bba39939db10 i18n/chs/src/vs/workbench/common/views.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"duplicateId": "ID 为 {0} 的视图在位置“{1}”已被注册"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"duplicateId": "ID 为“{0}”的视图在位置“{1}”已被注册"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 24ec2fcb7bd484dfd433484d28404685cb08eba2 i18n/chs/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 c8466983eb9f265f121ef57d4bfbd3223d7f8d81 i18n/chs/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 f941d8a0956c6c5c56ea171736d348f42ba5c3d7 i18n/chs/src/vs/workbench/electron-browser/actions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"closeWindow": "关闭窗口",
- 	"closeWorkspace": "关闭工作区",
- 	"noWorkspaceOpened": "此实例当前没有打开工作区，无法关闭。",
-@@ -50,6 +53,14 @@
- 	"moveWindowTabToNewWindow": "将窗口选项卡移动到新窗口",
- 	"mergeAllWindowTabs": "合并所有窗口",
- 	"toggleWindowTabsBar": "切换窗口选项卡栏",
-+<<<<<<< .our
- 	"about": "关于 {0}",
- 	"inspect context keys": "检查上下文键值"
-+=======
-+	"configureLocale": "配置语言",
-+	"displayLanguage": "定义 VSCode 的显示语言。",
-+	"doc": "请参阅 {0}，了解支持的语言列表。",
-+	"restart": "更改此值需要重启 VSCode。",
-+	"fail.createSettings": "无法创建“{0}”({1})。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e93318a00b839cd8e3377f7b6ab94731b16d5dbf i18n/chs/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 eb24c55b636f82951f7ddca06c62ab11e05e6e73 i18n/chs/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 62b6aada113ef4231d6d2b6ece783c385a393bd0 i18n/chs/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,12 +35,19 @@
- 	"panelDefaultLocation": "控制此面板的默认位置。可显示在工作台的底部或右侧。",
- 	"statusBarVisibility": "控制工作台底部状态栏的可见性。",
- 	"activityBarVisibility": "控制工作台中活动栏的可见性。",
-+<<<<<<< .our
- 	"viewVisibility": "控制是否显示视图头部的操作项。视图头部操作项可以一直，或是仅当聚焦到和悬停在视图上时显示。",
- 	"fontAliasing": "控制工作台中字体的渲染方式\n- default: 次像素平滑字体。将在大多数非 retina 显示器上显示最清晰的文字\n- antialiased: 进行像素而不是次像素级别的字体平滑。可能会导致字体整体显示得更细\n- none: 禁用字体平滑。将显示边缘粗糙、有锯齿的文字\n- auto: 根据显示器 DPI 自动应用 \"default\" 或 \"antialiased\" 选项。",
- 	"workbench.fontAliasing.default": "次像素平滑字体。将在大多数非 retina 显示器上显示最清晰的文字。",
- 	"workbench.fontAliasing.antialiased": "进行像素而不是次像素级别的字体平滑。可能会导致字体整体显示得更细。",
- 	"workbench.fontAliasing.none": "禁用字体平滑。将显示边缘粗糙、有锯齿的文字。",
- 	"workbench.fontAliasing.auto": "根据显示器 DPI 自动应用 \"default\" 或 \"antialiased\" 选项。",
-+=======
-+	"fontAliasing": "控制工作台中字体的渲染方式\n- default: 次像素平滑字体。将在大多数非 retina 显示器上显示最清晰的文字\n- antialiased: 进行像素而不是次像素级别的字体平滑。可能会导致字体整体显示得更细\n- none: 禁用字体平滑。将显示边缘粗糙、有锯齿的文字",
-+	"workbench.fontAliasing.default": "次像素平滑字体。将在大多数非 retina 显示器上显示最清晰的文字。",
-+	"workbench.fontAliasing.antialiased": "进行像素而不是次像素级别的字体平滑。可能会导致字体整体显示得更细。",
-+	"workbench.fontAliasing.none": "禁用字体平滑。将显示边缘粗糙、有锯齿的文字。",
-+>>>>>>> .their
- 	"enableNaturalLanguageSettingsSearch": "控制是否在设置中启用自然语言搜索模式。",
- 	"windowConfigurationTitle": "窗口",
- 	"window.openFilesInNewWindow.on": "文件将在新窗口中打开",
-changed in both
-  base   100644 b2c1d0e6763a13d5f4c50d21fd3a2cc1d555c72c i18n/chs/src/vs/workbench/electron-browser/window.i18n.json
-  our    100644 b437f51e7f989125bf762fd5e4c708b7a064f39e i18n/chs/src/vs/workbench/electron-browser/window.i18n.json
-  their  100644 a2e4b30b59e96319184e568888dd7ffbd71fe451 i18n/chs/src/vs/workbench/electron-browser/window.i18n.json
-changed in both
-  base   100644 3fee2b4ab4747b0452b1121dc21d5a4cc0ffa07d i18n/chs/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  our    100644 728adbd6b66f04d35493e4d519f09b04541a9764 i18n/chs/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  their  100644 0fa0e030ff25376903329ca5ef27570eedf64516 i18n/chs/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"debug.terminal.title": "调试对象"
- }
-\ No newline at end of file
-changed in both
-  base   100644 f54abac52da1ea0c7f0f166022a8376c900e01ce i18n/chs/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  our    100644 d453e14482f3f3302ee38720c42d66708f224382 i18n/chs/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  their  100644 2db5cdad108402332c07fa87d399e6aab2e120aa i18n/chs/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-changed in both
-  base   100644 efe5507494d6e4d4f3a59014a1d7f14840521a24 i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 6d06818b00cbd9cc446af3ed0c5d32bc725f9a34 i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 5d553a4d9cdd269db70f64e29e7b76ed078db35f i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,11 @@
- 	"exeBasedRecommendation": "根据你安装的 {0}，向你推荐此扩展。",
- 	"fileBasedRecommendation": "根据您最近打开的文件推荐此扩展。",
- 	"workspaceRecommendation": "当前工作区的用户推荐此扩展。",
-+=======
-+	"workspaceRecommendation": "当前工作区的用户推荐此扩展。",
-+	"fileBasedRecommendation": "根据您最近打开的文件推荐此扩展。",
-+	"exeBasedRecommendation": "根据你安装的 {0}，向你推荐此扩展。",
-+>>>>>>> .their
- 	"reallyRecommended2": "建议对这种类型的文件使用“{0}”扩展。",
- 	"reallyRecommendedExtensionPack": "建议对这种类型的文件使用“{0}”扩展包。",
- 	"install": "安装",
-added in both
-  our    100644 aa5a46d3109a70c21f1ef31af92edb21d696a0f4 i18n/chs/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-  their  100644 475d836e696aa54c6f008d040e96b8886e9d8d05 i18n/chs/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"workbenchConfigurationTitle": "工作台",
- 	"feedbackVisibility": "控制是否显示工作台底部状态栏中的 Twitter 反馈 (笑脸图标)。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 a2b15babb5f5ec49f69d6118338a875381e70756 i18n/chs/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
-  our    100644 c98e15157a96a135b2cfe82bb4116edb377fe627 i18n/chs/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
-  their  100644 84925c604c17aa22b2456f8ec1451fca22d0742a i18n/chs/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
-added in both
-  our    100644 c800714c60bd47d3f5367f812c0fbffa567d4739 i18n/chs/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-  their  100644 c5b0fd0e5a5598bf13969daefd23ffb3480429a3 i18n/chs/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"hide": "隐藏"
- }
-\ No newline at end of file
-changed in both
-  base   100644 30c68b4c7adb739a8ec61165b42a5ce9b8282eb8 i18n/chs/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  our    100644 f82464e44918dc13a9709b800a0f2a4b4d3bbd77 i18n/chs/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  their  100644 2854354d6af14fd176c3a9234ccd60b72fc96875 i18n/chs/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-@@ -12,12 +12,19 @@
- 	"revertLocalChanges": "放弃你的更改并还原为磁盘上的内容",
- 	"copyPathOfActive": "复制活动文件的路径",
- 	"saveAllInGroup": "保存组中的全部内容",
-+<<<<<<< .our
- 	"saveFiles": "保存所有文件",
-+=======
-+>>>>>>> .their
- 	"revert": "还原文件",
- 	"compareActiveWithSaved": "比较活动与已保存的文件",
- 	"closeEditor": "关闭编辑器",
- 	"view": "查看",
-+<<<<<<< .our
- 	"openToSide": "在侧边打开",
-+=======
-+	"openToSide": "打开到侧边",
-+>>>>>>> .their
- 	"revealInWindows": "在资源管理器中显示",
- 	"revealInMac": "在 Finder 中显示",
- 	"openContainer": "打开所在的文件夹",
-@@ -25,11 +32,19 @@
- 	"saveAll": "全部保存",
- 	"compareWithSaved": "与已保存文件比较",
- 	"compareWithSelected": "与已选项目进行比较",
-+<<<<<<< .our
- 	"compareSource": "选择进行比较",
- 	"compareSelected": "将已选项进行比较",
- 	"close": "关闭",
- 	"closeOthers": "关闭其他",
- 	"closeSaved": "关闭已保存",
-+=======
-+	"compareSource": "选择以进行比较",
-+	"compareSelected": "将已选项进行比较",
-+	"close": "关闭",
-+	"closeOthers": "关闭其他",
-+	"closeUnmodified": "关闭未更改",
-+>>>>>>> .their
- 	"closeAll": "全部关闭",
- 	"deleteFile": "永久删除"
- }
-\ No newline at end of file
-changed in both
-  base   100644 f9208415003c3fca3ac10a6b4dad634318b1cef7 i18n/chs/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 1da53727f33c4b77a3b37c4cffac28b954a12332 i18n/chs/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 513e4e1f0d76cc46a85ef43e169c2d2ccf529dd1 i18n/chs/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"newFile": "新建文件",
- 	"newFolder": "新建文件夹",
- 	"rename": "重命名",
-@@ -13,7 +16,11 @@
- 	"copyFile": "复制",
- 	"pasteFile": "粘贴",
- 	"retry": "重试",
-+<<<<<<< .our
- 	"renameWhenSourcePathIsParentOfTargetError": "请使用“新建文件夹”或“新建文件”命令来向已有文件夹添加子项",
-+=======
-+	"openFolderFirst": "先打开一个文件夹，以在其中创建文件或文件夹。",
-+>>>>>>> .their
- 	"newUntitledFile": "新的无标题文件",
- 	"createNewFile": "新建文件",
- 	"createNewFolder": "新建文件夹",
-@@ -25,9 +32,16 @@
- 	"dirtyMessageFolderDelete": "你正在删除的文件夹有 {0} 个文件具有未保存的更改。是否继续?",
- 	"dirtyMessageFileDelete": "你正在删除的文件具有未保存的更改。是否继续?",
- 	"dirtyWarning": "如果不保存，更改将丢失。",
-+<<<<<<< .our
-+=======
-+	"confirmMoveTrashMessageMultiple": "是否确定要删除以下 {0} 个文件?",
-+	"confirmMoveTrashMessageFolder": "是否确实要删除“{0}”及其内容?",
-+	"confirmMoveTrashMessageFile": "是否确实要删除“{0}”?",
-+>>>>>>> .their
- 	"undoBin": "可以从回收站还原。",
- 	"undoTrash": "可以从废纸篓还原。",
- 	"doNotAskAgain": "不再询问",
-+<<<<<<< .our
- 	"irreversible": "此操作不可逆!",
- 	"binFailed": "无法删除到回收站。是否永久删除？",
- 	"trashFailed": "无法删除到废纸篓。是否永久删除？",
-@@ -48,6 +62,18 @@
- 	"replaceButtonLabel": "替换(&&R)",
- 	"fileIsAncestor": "粘贴的项目是目标文件夹的上级",
- 	"fileDeleted": "粘贴的文件已被删除或移动",
-+=======
-+	"confirmDeleteMessageMultiple": "是否确定要永久删除以下 {0} 个文件?",
-+	"confirmDeleteMessageFolder": "是否确定要永久删除“{0}”及其内容?",
-+	"confirmDeleteMessageFile": "是否确定要永久删除“{0}”?",
-+	"irreversible": "此操作不可逆!",
-+	"permDelete": "永久删除",
-+	"importFiles": "导入文件",
-+	"confirmOverwrite": "目标文件夹中已存在具有相同名称的文件或文件夹。是否要替换它?",
-+	"replaceButtonLabel": "替换(&&R)",
-+	"fileDeleted": "文件已被删除或移动",
-+	"fileIsAncestor": "复制的项目是目标文件夹的上级",
-+>>>>>>> .their
- 	"duplicateFile": "重复",
- 	"globalCompareFile": "比较活动文件与...",
- 	"openFileToCompare": "首先打开文件以将其与另外一个文件比较。",
-changed in both
-  base   100644 702c021c5f321621dd09b3c087cc0836817001fb i18n/chs/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  our    100644 10c5b3be19adb07dcaa678018210987dcd3f7fb4 i18n/chs/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  their  100644 5687f75d023d874ea76222a31d34160b4efbdd9c i18n/chs/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,12 +7,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"revealInWindows": "在资源管理器中显示",
- 	"revealInMac": "在 Finder 中显示",
- 	"openContainer": "打开所在的文件夹",
- 	"saveAs": "另存为...",
- 	"save": "保存",
- 	"saveAll": "全部保存",
-+<<<<<<< .our
-+=======
-+	"saveFiles": "保存所有文件",
-+>>>>>>> .their
- 	"removeFolderFromWorkspace": "将文件夹从工作区删除",
- 	"genericRevertError": "未能还原“{0}”: {1}",
- 	"modifiedLabel": "{0} (磁盘上) ↔ {1}",
-changed in both
-  base   100644 63427668f5f3315bd1b2d497574a17d7eb4d0258 i18n/chs/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 4067aaffcecae16961ab77b1a2fdc98050b339ec i18n/chs/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 da879d0ffddf597bd426561df66dfe291690c14d i18n/chs/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-@@ -40,7 +40,10 @@
- 	"formatOnSave": "保存时设置文件的格式。格式化程序必须可用，不能自动保存文件，并且不能关闭编辑器。",
- 	"formatOnSaveTimeout": "在保存时格式化操作的超时时间。为 formatOnSave 命令指定时间限制 (单位: 毫秒)。运行超过设定时间的命令将被取消。",
- 	"explorerConfigurationTitle": "文件资源管理器",
-+<<<<<<< .our
- 	"openEditorsVisible": "在“打开的编辑器”窗格中显示的编辑器数量。",
-+=======
-+>>>>>>> .their
- 	"autoReveal": "控制资源管理器是否应在打开文件时自动显示并选择它们。",
- 	"enableDragAndDrop": "控制资源管理器是否应该允许通过拖放移动文件和文件夹。",
- 	"confirmDragAndDrop": "控制在资源管理器内拖放移动文件或文件夹时是否进行确认。",
-changed in both
-  base   100644 8ebee88ce98514139e584e769bb79856d04e3ed1 i18n/chs/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  our    100644 253dcd9399aed798381061a169d7db7e656ea079 i18n/chs/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  their  100644 4911cddc49b8b610c6834d6a89f169eaa6f086a5 i18n/chs/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,12 @@
- 	],
- 	"userGuide": "使用编辑器工具栏中的操作撤消更改或覆盖磁盘上的内容",
- 	"staleSaveError": "无法保存“{0}”: 磁盘上的内容较新。请将您的版本和磁盘上的版本进行比较。",
-+=======
-+	"userGuide": "使用右侧编辑器工具栏的操作来**撤消**你的更改或用你的更改来**覆盖**磁盘上的内容",
-+	"overwriteElevated": "以管理员身份覆盖...",
-+	"saveElevated": "以管理员身份重试...",
-+	"overwrite": "覆盖",
-+>>>>>>> .their
- 	"retry": "重试",
- 	"discard": "放弃",
- 	"readonlySaveErrorAdmin": "无法保存“{0}”: 文件写保护。选择“以管理员身份覆盖”可作为管理员重试。 ",
-changed in both
-  base   100644 d97098d02f75c7878aa7990a2af3993ce04c3448 i18n/chs/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  our    100644 feb8a37af6b21eb233b78ad5de0f56245b4c0162 i18n/chs/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  their  100644 0be09e758627e6bdbe1ffe15c9f3de004f56ad6f i18n/chs/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-@@ -15,9 +15,13 @@
- 	"dropFolder": "你是否要将文件夹添加到工作区?",
- 	"addFolders": "添加文件夹(&&A)",
- 	"addFolder": "添加文件夹(&&A)",
-+<<<<<<< .our
- 	"confirmRootsMove": "是否确定要更改工作区中多个根文件夹的顺序?",
- 	"confirmMultiMove": "是否确定要移动以下 {0} 个文件?",
- 	"confirmRootMove": "是否确定要更改工作区中根文件夹“{0}”的顺序?",
-+=======
-+	"confirmMultiMove": "是否确定要移动以下 {0} 个文件?",
-+>>>>>>> .their
- 	"confirmMove": "是否确实要移动“{0}”?",
- 	"doNotAskAgain": "不再询问",
- 	"moveButtonLabel": "移动(&&M)",
-changed in both
-  base   100644 0c93f41d44d0715ff7b7f636c5386091754fa1aa i18n/chs/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  our    100644 eb40d6687d9ca4b4c349f4f4b0c0adba2bdfb0b7 i18n/chs/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  their  100644 f501bedc60f6ef88a16b47e02bf89d6c3046e80b i18n/chs/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-added in both
-  our    100644 3aaa4125fd26071dce0a93643b0ac03f07ddf861 i18n/chs/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-  their  100644 c1b32a5c26c246d37ac0f55e2d0656d921099e6e i18n/chs/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,5 +11,13 @@
- 	"sharedLog": "日志(共享进程)",
- 	"rendererLog": "日志(窗口进程)",
- 	"extensionsLog": "日志(扩展主机)",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"developer": "开发者"
- }
-\ No newline at end of file
-added in both
-  our    100644 6d8451561beae9b6de9d16f8e428c5a1d25661fb i18n/chs/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  their  100644 98d55d28fe6eb9edaadb54db5a28f67e0c6a625e i18n/chs/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -17,14 +18,32 @@
- 	"openLogFile": "打开日志文件...",
- 	"setLogLevel": "设置日志级别...",
- 	"trace": "跟踪",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"openLogsFolder": "打开日志文件夹",
-+	"showLogs": "显示日志...",
-+	"mainProcess": "主进程",
-+	"sharedProcess": "共享进程",
-+	"rendererProcess": "窗口",
-+	"selectProcess": "选择进程",
-+>>>>>>> .their
- 	"debug": "调试",
- 	"info": "信息",
- 	"warn": "警告",
- 	"err": "错误",
-+<<<<<<< .our
- 	"critical": "严重",
- 	"off": "关闭",
- 	"selectLogLevel": "选择日志级别",
- 	"default and current": "默认 当前",
- 	"default": "默认",
- 	"current": "当前"
-+=======
-+	"off": "关闭"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 3e34c78c26aa95f47180585167bacc0395872e10 i18n/chs/src/vs/workbench/parts/markers/common/messages.i18n.json
-  our    100644 fd25b458d39eb773f340d2389c6ac2c7295fed55 i18n/chs/src/vs/workbench/parts/markers/common/messages.i18n.json
-  their  100644 7e174f3cfafe87c1ec839ab93697f3926cfd415e i18n/chs/src/vs/workbench/parts/markers/common/messages.i18n.json
-@@ -7,8 +7,11 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"viewCategory": "查看",
-+<<<<<<< .our
- 	"problems.view.toggle.label": "切换问题 (错误、警告、信息) 视图",
- 	"problems.view.focus.label": "聚焦于问题 (错误、警告、信息) 视图",
-+=======
-+>>>>>>> .their
- 	"problems.panel.configuration.title": "问题预览",
- 	"problems.panel.configuration.autoreveal": "控制问题预览是否应在打开文件时自动显示它们。",
- 	"markers.panel.title.problems": "问题",
-added in both
-  our    100644 3a4c87eda4fd45f8c39cf34234b1dd0feb221b60 i18n/chs/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-  their  100644 a96772cdf43790d5a37c660761258bcf5585e357 i18n/chs/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -11,4 +12,15 @@
- 	"viewCategory": "查看",
- 	"clearOutput.label": "清除输出",
- 	"openActiveLogOutputFile": "查看: 打开活动日志输出文件"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"output": "输出",
-+	"viewCategory": "查看",
-+	"clearOutput.label": "清除输出"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 fa3bf1243ba7208adbcc1a99b90dc9e88cd58cd9 i18n/chs/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/chs/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,12 @@
- 	],
- 	"output": "{0} - 输出",
- 	"channel": "“{0}”的输出通道"
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 5c28c560886bedfc3babae822dd572c6201154c2 i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 8970ed17aa11152cc3e1fcdaae0d242f4d3682a2 i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 10c2fc221a5d746ae67028d16b221888ed610a10 i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"defaultSettings": "将您的设置放入右侧编辑器以覆盖。",
- 	"noSettingsFound": "未找到设置。",
- 	"settingsSwitcherBarAriaLabel": "设置转换器",
-changed in both
-  base   100644 26f355bb38254d12a1baead93d91ca21c4a410ce i18n/chs/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  our    100644 4c83144fd6cb6c2fbf429568b9c9118e209bb6b4 i18n/chs/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  their  100644 ef307afdfbd268446ac1a9025fdc54b26089dc6d i18n/chs/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-changed in both
-  base   100644 4fff98737e809779e7fa546bb4ac26a3c82247ba i18n/chs/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  our    100644 8e121198c82cd4074271a0906c87b6adbb82ed78 i18n/chs/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  their  100644 0f609a3500014142e0bc25605e31b7504aebe7f3 i18n/chs/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"view": "查看",
- 	"commandsHandlerDescriptionDefault": "显示并运行命令",
- 	"gotoLineDescriptionMac": "转到行",
-changed in both
-  base   100644 cc08da73602c84cf0f3684de91336c89c1be3ed8 i18n/chs/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  our    100644 8c0bab20637f95dcd55c856707e386b397840a9c i18n/chs/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  their  100644 ebf378aac8546f5f10da26e5036ae6bbeecca9ff i18n/chs/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-@@ -13,5 +13,9 @@
- 	"scmConfigurationTitle": "源代码管理",
- 	"alwaysShowProviders": "是否总是显示源代码管理提供程序部分。",
- 	"diffDecorations": "控制编辑器中差异的显示效果。",
-+<<<<<<< .our
- 	"diffGutterWidth": "控制导航线上已添加和已修改差异图标的宽度 (px)。"
-+=======
-+	"inputCounter": "控制何时显示输入计数。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 eb08e1a30308e03cbdfa8f61f3334074a7bbf867 i18n/chs/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  our    100644 72a33d59853b6a03462fb33cc281f9024f7e12dd i18n/chs/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  their  100644 dc3530badc80b2be6ffa845a18c97ef60526e958 i18n/chs/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-@@ -8,6 +8,9 @@
- 	],
- 	"scm providers": "源代码管理提供程序",
- 	"hideRepository": "隐藏",
-+	"commitMessageInfo": "当前行有 {0} 个字符",
-+	"commitMessageCountdown": "当前行剩余 {0} 个字符",
-+	"commitMessageWarning": "当前行比 {1} 超出 {0} 个字符",
- 	"installAdditionalSCMProviders": "安装其他源代码管理提供程序...",
- 	"no open repo": "没有活动的源代码管理提供程序。",
- 	"source control": "源代码管理",
-changed in both
-  base   100644 ebf392aa07de19ef42b3ca9ed3e22a7b63947842 i18n/chs/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 db5d7a07f49a26b2f7df503221d63078c01a6dc6 i18n/chs/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 65d9e1b855d29d852cd8e28dee1010be19796b1e i18n/chs/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-changed in both
-  base   100644 971f3dddcce66938820acc384a9bf40f7989b8fb i18n/chs/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 61397c437f22149a7bd941ec158bc6fa9182474a i18n/chs/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 d457d977632f3a61eb4c7a68d2d8f09125950cc2 i18n/chs/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,11 +13,18 @@
- 	"copyAllLabel": "全部复制",
- 	"clearSearchHistoryLabel": "清除搜索历史记录",
- 	"toggleSearchViewPositionLabel": "切换搜索视图位置",
-+=======
-+>>>>>>> .their
- 	"findInFolder": "在文件夹中查找...",
- 	"findInWorkspace": "在工作区中查找...",
- 	"showTriggerActions": "转到工作区中的符号...",
- 	"name": "搜索",
-+<<<<<<< .our
- 	"showSearchViewl": "显示搜索",
-+=======
-+	"search": "搜索",
-+	"showSearchViewlet": "显示搜索",
-+>>>>>>> .their
- 	"view": "查看",
- 	"findInFiles": "在文件中查找",
- 	"openAnythingHandlerDescription": "转到文件",
-added in both
-  our    100644 779254ef8e6759aa065ad11aed4d5e7867992d02 i18n/chs/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-  their  100644 b6d24a6f92198ddcf29b66a212241f491eb5180b i18n/chs/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"global.scope": "(全局)",
- 	"global.1": "({0})",
- 	"new.global": "新建全局代码片段文件...",
-changed in both
-  base   100644 6023eaf614ff3151b4495d5db802ed432250ec5b i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  our    100644 0b17c6271c329c8da7909c7c4ebbcd83c84f3588 i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  their  100644 84c29334b8164c35ace813f2c6b4dffd5dc7d14e i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"snippetSchema.json.default": "空代码片段",
- 	"snippetSchema.json": "用户代码片段配置",
- 	"snippetSchema.json.prefix": "在 Intellisense 中选择代码片段时将使用的前缀",
-added in both
-  our    100644 f62e870f672eca0be0cb5b754d681d68cc91570a i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-  their  100644 bfcf4616bc8101dfb0157b7ed2ac96f5740ab5b8 i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,5 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"source.snippetGlobal": "全局用户代码片段",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"source.snippet": "用户代码片段"
- }
-\ No newline at end of file
-changed in both
-  base   100644 e4e7302f24649f0332b4060f6160799515387265 i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  our    100644 d0caabc81b4c752c13714f95e565498af6ee0254 i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 7c00034a89a7b005d82de70df917969696cb3ab5 i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"invalid.path.0": "“contributes.{0}.path”中应为字符串。提供的值: {1}",
- 	"invalid.language.0": "省略语言时，\"contributes.{0}.path\" 的值必须为一个 \".code-snippets\" 文件。提供的值: {1}",
- 	"invalid.language": "“contributes.{0}.language”中存在未知的语言。提供的值: {1}",
-changed in both
-  base   100644 75d151b4bb59e2f8f6d2d998482d307cc44b3fac i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 c2fbe4fef10dc5236ff5c8da48376f2ca681d709 i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 199139684a9431456f0b1f76dca8458dcf5cad53 i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -15,7 +15,11 @@
- 	"terminal.integrated.shellArgs.osx": "在 OS X 终端上时要使用的命令行参数。",
- 	"terminal.integrated.shell.windows": "终端在 Windows 使用的 shell 路径。使用随 Windows 一起提供的 shell (cmd、PowerShell 或 Bash on Ubuntu) 时。",
- 	"terminal.integrated.shellArgs.windows": "在 Windows 终端上时使用的命令行参数。",
-+<<<<<<< .our
- 	"terminal.integrated.macOptionIsMeta": "在终端中，使用 Option 键作为 Meta 键。(macOS)",
-+=======
-+	"terminal.integrated.rightClickCopyPaste": "设置后，在终端内右键单击时，这将阻止显示上下文菜单，相反，它将在有选项时进行复制，并且在没有选项时进行粘贴。",
-+>>>>>>> .their
- 	"terminal.integrated.copyOnSelection": "设置后，终端中选中的文字将被复制到剪贴板。",
- 	"terminal.integrated.fontFamily": "控制终端的字体系列，这在编辑器中是默认的。fontFamily 的值。",
- 	"terminal.integrated.fontSize": "控制终端的字号(以像素为单位)。",
-@@ -37,7 +41,10 @@
- 	"terminal.integrated.env.linux": "要添加到 VS Code 进程中的带有环境变量的对象，其会被 Linux 终端使用。",
- 	"terminal.integrated.env.windows": "要添加到 VS Code 进程中的带有环境变量的对象，其会被 Windows 终端使用。",
- 	"terminal.integrated.showExitAlert": "当退出代码非零时，显示“终端进程以某退出代码终止”的警告。",
-+<<<<<<< .our
- 	"terminal.integrated.experimentalRestore": "启动 VS Code 时，是否自动恢复工作区的终端会话。这是一项实验性设置，可能会出现问题，将来也可能会有变化。",
-+=======
-+>>>>>>> .their
- 	"terminalCategory": "终端",
- 	"viewCategory": "查看"
- }
-\ No newline at end of file
-changed in both
-  base   100644 d96d23dca0e928587a9845011037f6c40aeb93e0 i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 1becbfa0f08ad931e9c32c280588da0196edc807 i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 ca6d8ab62f9d9ed77ec55c2c3ebad38ce98757e1 i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -20,6 +20,7 @@
- 	"workbench.action.terminal.new.short": "新的终端",
- 	"workbench.action.terminal.newWorkspacePlaceholder": "选择当前工作目录新建终端",
- 	"workbench.action.terminal.newInActiveWorkspace": "新建集成终端 (活动工作区)",
-+<<<<<<< .our
- 	"workbench.action.terminal.split": "拆分终端",
- 	"workbench.action.terminal.splitInActiveWorkspace": "拆分终端 (活动工作区)",
- 	"workbench.action.terminal.focusPreviousPane": "聚焦于上一个窗格",
-@@ -28,6 +29,8 @@
- 	"workbench.action.terminal.resizePaneRight": "向右调整窗格大小",
- 	"workbench.action.terminal.resizePaneUp": "向上调整窗格大小",
- 	"workbench.action.terminal.resizePaneDown": "向下调整窗格大小",
-+=======
-+>>>>>>> .their
- 	"workbench.action.terminal.focus": "聚焦于终端",
- 	"workbench.action.terminal.focusNext": "聚焦于下一终端",
- 	"workbench.action.terminal.focusPrevious": "聚焦于上一终端",
-changed in both
-  base   100644 25d612371f7288bbfb9feffd3492713fa6ff1bc6 i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  our    100644 226ce4dc16f358fb511aaf000b7fbdf565995bce i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  their  100644 d0a2a31bbb9f92d68c9d8e49cec8b6141ac666de i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-@@ -8,7 +8,11 @@
- 	],
- 	"terminal.integrated.chooseWindowsShellInfo": "你可以按下“自定义”按钮并更换默认终端 Shell。",
- 	"customize": "自定义",
-+<<<<<<< .our
- 	"never again": "不再显示",
-+=======
-+	"cancel": "取消",
-+>>>>>>> .their
- 	"terminal.integrated.chooseWindowsShell": "选择首选的终端 shell，你可稍后在设置中进行更改",
- 	"terminalService.terminalCloseConfirmationSingular": "存在一个活动的终端会话，是否要终止此会话?",
- 	"terminalService.terminalCloseConfirmationPlural": "存在 {0} 个活动的终端会话，是否要终止这些会话?"
-changed in both
-  base   100644 d43fc9ca29b2221e63e144fe4130ed4103353809 i18n/chs/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 34456c16f6384eecbdba1d3ed14696eac3704dab i18n/chs/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 9460987e42b532e0b64803a7e1cf984cc4b9b776 i18n/chs/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -26,7 +26,10 @@
- 	"commandPalette": "命令面板...",
- 	"settings": "设置",
- 	"keyboardShortcuts": "键盘快捷方式",
-+<<<<<<< .our
- 	"showExtensions": "管理扩展",
-+=======
-+>>>>>>> .their
- 	"userSnippets": "用户代码片段",
- 	"selectTheme.label": "颜色主题",
- 	"themes.selectIconTheme.label": "文件图标主题",
-changed in both
-  base   100644 80b697be3d34deecad3bc9e3e7c958001a29ef06 i18n/chs/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  our    100644 8d343959d4318fc5914175bbc666001176d1ca2b i18n/chs/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  their  100644 fdbcd8bad77a3439142c1ddfa78c84ac45baef25 i18n/chs/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,4 +14,9 @@
- 	"fileBinaryError": "文件似乎是二进制文件，无法作为文档打开",
- 	"err.create": "未能创建文件 {0}",
- 	"fileMoveConflict": "无法移动/复制。文件已存在于目标位置。"
-+=======
-+	"fileIsDirectoryError": "文件是目录",
-+	"fileNotModifiedError": "自以下时间未修改的文件:",
-+	"fileBinaryError": "文件似乎是二进制文件，无法作为文档打开"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6bee43183975780bcdebd06a4b9811797a042ff6 i18n/chs/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  our    100644 bfa6e5440fbabd08e7a20d6c476163896e7e6ffa i18n/chs/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  their  100644 ba2101635d060218d07c0d3af65c411742553735 i18n/chs/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-changed in both
-  base   100644 af35cdf722be09f7871f1513dc9fe8c8c17dc12f i18n/chs/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 b8184384917ecac19f65cc6ad82a6fa2b4f59292 i18n/chs/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 fbf48931d61404454f75ba5d7ccdf5e517cbd90e i18n/chs/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-changed in both
-  base   100644 11ecec6e1ac18a67f0b2005aba6d1ff78bed0563 i18n/chs/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  our    100644 6495d3ab4d4499f0b00c6e5971a8830daaaeb4e7 i18n/chs/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  their  100644 b9142ec415a1e4fca252b2edacd1be3471dd8e3e i18n/chs/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-@@ -8,5 +8,10 @@
- 	],
- 	"errorInvalidTaskConfiguration": "无法写入工作区配置文件。请打开文件以更正错误或警告，然后重试。",
- 	"errorWorkspaceConfigurationFileDirty": "文件已变更，因此无法写入工作区配置文件。请先保存此文件，然后重试。",
-+<<<<<<< .our
- 	"openWorkspaceConfigurationFile": "打开工作区配置"
-+=======
-+	"openWorkspaceConfigurationFile": "打开工作区配置文件",
-+	"close": "关闭"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 78cd65caa1f2df6d3c1ef580c197e00b304c866b i18n/cht/extensions/git/out/autofetch.i18n.json
-  our    100644 15e10683f3186e8a5874bd157f3e207ae6f6fd89 i18n/cht/extensions/git/out/autofetch.i18n.json
-  their  100644 a9b802babec3476b912277e91d35399b0a917c33 i18n/cht/extensions/git/out/autofetch.i18n.json
-@@ -7,7 +7,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"yes": "是",
-+	"read more": "閱讀其他資訊",
- 	"no": "否",
- 	"not now": "稍後詢問我",
-+<<<<<<< .our
- 	"suggest auto fetch": "您希望 Code [定期執行 'git fetch']({0}) 嗎?"
-+=======
-+	"suggest auto fetch": "您想要 Code 定期的執行  `git fetch` 嗎？"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 1ace18f1610a2558d62519881c68284f5a1519a1 i18n/cht/extensions/git/out/commands.i18n.json
-  our    100644 f99c465da1ed922e8de7f8c6dfd9a26e886bdd66 i18n/cht/extensions/git/out/commands.i18n.json
-  their  100644 3b5fb4974c39a926359ffde2264ffeabb7b4ee9a i18n/cht/extensions/git/out/commands.i18n.json
-@@ -44,7 +44,10 @@
- 	"yes discard tracked": "捨棄 1 個追蹤的檔案",
- 	"yes discard tracked multiple": "捨棄 {0} 個追蹤的檔案",
- 	"unsaved files single": "下列檔案尚未儲存： {0}。\n\n您要在認可之前進行儲存嗎？",
-+<<<<<<< .our
- 	"unsaved files": "有 {0} 個未儲存檔案。\n\n您要在認可之前進行儲存嗎？",
-+=======
-+>>>>>>> .their
- 	"save and commit": "儲存全部且認可",
- 	"commit": "無論如何仍認可",
- 	"no staged changes": "沒有暫存變更進行提交\n\n您希望自動暫存您所有變更並直接提交?",
-@@ -75,8 +78,12 @@
- 	"ok": "確定",
- 	"push with tags success": "已成功使用標籤推送。",
- 	"pick remote": "挑選要發行分支 '{0}' 的目標遠端:",
-+<<<<<<< .our
- 	"sync is unpredictable": "此動作會推送認可至`{0}/{1}`並從中提取認可。",
- 	"never again": "確定，不要再顯示",
-+=======
-+	"sync is unpredictable": "此動作會將認可發送至 '{0}' 及從中提取認可。",
-+>>>>>>> .their
- 	"no remotes to publish": "您的儲存庫未設定要發行的遠端目標。",
- 	"no changes stash": "沒有變更可供隱藏。",
- 	"provide stash message": "可選擇提供隱藏訊息",
-added in both
-  our    100644 90f4f953b408a26e9487a134c7058ac5721f794b i18n/cht/extensions/typescript/out/commands.i18n.json
-  their  100644 628429984fc9b1c0224f83ff325efa5bd7ae9765 i18n/cht/extensions/typescript/out/commands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -13,4 +14,20 @@
- 	"typescript.noJavaScriptProjectConfig": "檔案不屬於 JavaScript 專案。若要深入了解，請按一下[這裡]({0})。",
- 	"typescript.configureTsconfigQuickPick": "設定 tsconfig.json",
- 	"typescript.configureJsconfigQuickPick": "設定 jsconfig.json"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"typescript.projectConfigNoWorkspace": "請在 VS Code 中開啟資料夾，以使用 TypeScript 或 JavaScript 專案",
-+	"typescript.projectConfigUnsupportedFile": "無法判斷 TypeScript 或 JavaScript 專案。不支援的檔案類型",
-+	"typescript.projectConfigCouldNotGetInfo": "無法判斷 TypeScript 或 JavaScript 專案",
-+	"typescript.noTypeScriptProjectConfig": "檔案不是 TypeScript 專案的一部份",
-+	"typescript.noJavaScriptProjectConfig": "檔案不是 JavaScript 專案的一部份",
-+	"typescript.configureTsconfigQuickPick": "設定 tsconfig.json",
-+	"typescript.configureJsconfigQuickPick": "設定 jsconfig.json",
-+	"typescript.projectConfigLearnMore": "深入了解"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 750d811d866eaa3d43818bd1d8e28c9898acf514 i18n/cht/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-  their  100644 ed15423097d5cbb03aeb8c474db3877ca0d1584f i18n/cht/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"selectAriaOption": "{0}"
- }
-\ No newline at end of file
-added in both
-  our    100644 832371dc96044f6cf12101b96265daa3e7176c82 i18n/cht/src/vs/base/node/ps.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/cht/src/vs/base/node/ps.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"collecting": "收集 CPU 與記憶體資訊中，可能需要幾秒鐘的時間。"
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 71be40322db097c5d8f26877c3ff83baae54bc42 i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 15a1cfb1f061b73d70aaaf6b56b29fe87aab2b5a i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 e45ee33a6937d350c1d03f2b5d136af64efbc760 i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -16,7 +16,11 @@
- 	"lineNumbers.on": "行號以絕對值顯示。",
- 	"lineNumbers.relative": "行號以目前游標的相對值顯示。",
- 	"lineNumbers.interval": "每 10 行顯示行號。",
-+<<<<<<< .our
- 	"lineNumbers": "控制行號的顯示。",
-+=======
-+	"lineNumbers": "控制行號的顯示方式。允許的設定值為 'on'、 'off'、'relative' 及 'interval'",
-+>>>>>>> .their
- 	"rulers": "在特定的等寬字元數之後轉譯垂直尺規。有多個尺規就使用多個值。若陣列為空，則不繪製任何尺規。",
- 	"wordSeparators": "執行文字相關導覽或作業時將作為文字分隔符號的字元",
- 	"tabSize": "與 Tab 相等的空格數量。當 `editor.detectIndentation` 已開啟時，會根據檔案內容覆寫此設定。",
-changed in both
-  base   100644 85ff9ee951ef36906b8a41504f07634e0b2791ef i18n/cht/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 66736a4e736cf7b9a66b648bff264434bc450d4c i18n/cht/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 4513171b5a07c5893b352541e7a2a91c9c7ee677 i18n/cht/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -8,8 +8,11 @@
- 	],
- 	"lineHighlight": "目前游標位置行的反白顯示背景色彩。",
- 	"lineHighlightBorderBox": "目前游標位置行之周圍框線的背景色彩。",
-+<<<<<<< .our
- 	"rangeHighlight": "突顯顯示範圍的背景顏色，例如快速開啟和尋找功能。不能使用非透明的顏色來隱藏底層的樣式。",
- 	"rangeHighlightBorder": "反白顯示範圍周圍邊框的背景顏色。",
-+=======
-+>>>>>>> .their
- 	"caret": "編輯器游標的色彩。",
- 	"editorCursorBackground": "編輯器游標的背景色彩。允許自訂區塊游標重疊的字元色彩。",
- 	"editorWhitespaces": "編輯器中空白字元的色彩。",
-changed in both
-  base   100644 9fbf329131ba8e36be00e706850b0ebbd9d65678 i18n/cht/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  our    100644 36aedfc24d5bd9bde31a7c30cfbf43349d24c117 i18n/cht/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  their  100644 c569d86bd1a23d8a1140e1b5a2c62cc3e5186924 i18n/cht/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -10,4 +11,11 @@
- 	"markerAction.previous.label": "移至上一個問題 (錯誤, 警告, 資訊)",
- 	"markerAction.nextInFiles.label": "移至檔案裡面的下一個問題 (錯誤, 警告, 資訊)",
- 	"markerAction.previousInFiles.label": "移至檔案裡面的上一個問題 (錯誤, 警告, 資訊)"
-+=======
-+	"title.wo_source": "({0}/{1})",
-+	"editorMarkerNavigationError": "編輯器標記導覽小工具錯誤的色彩。",
-+	"editorMarkerNavigationWarning": "編輯器標記導覽小工具警告的色彩。",
-+	"editorMarkerNavigationInfo": "編輯器標記導覽小工具資訊的色彩",
-+	"editorMarkerNavigationBackground": "編輯器標記導覽小工具的背景。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 97c113d82f04c657f7c081d1b902007e0beca10b i18n/cht/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  our    100644 1018aa75dc78a5f5fcd1bfb9b36a3da6fe5373f3 i18n/cht/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  their  100644 6dedbdd9c9673814a6fa751ec44d3502fb794187 i18n/cht/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,10 @@
- 	"wordHighlightStrongBorder": "寫入存取期間 (例如寫入變數時) 符號的邊框顏色。 ",
- 	"overviewRulerWordHighlightForeground": "概述反白符號的尺規標記顏色。不能使用非透明的顏色來隱藏底層的樣式。",
- 	"overviewRulerWordHighlightStrongForeground": "概述反白寫入權限符號的尺規標記顏色。不能使用非透明的顏色來隱藏底層的樣式。",
-+=======
-+	"overviewRulerWordHighlightForeground": "符號醒目提示的概觀尺規標記色彩。",
-+	"overviewRulerWordHighlightStrongForeground": "寫入權限符號醒目提示的概觀尺規標記色彩。",
-+>>>>>>> .their
- 	"wordHighlight.next.label": "移至下一個反白符號",
- 	"wordHighlight.previous.label": "移至上一個反白符號"
- }
-\ No newline at end of file
-changed in both
-  base   100644 3484e0af5e72c3161ac13f116359799eb03b9296 i18n/cht/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  our    100644 16528bb0fea69d7b1f4ce878596d45af316d6a07 i18n/cht/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  their  100644 f1ab5b8686afa490fb8d599c967a04fbc574095e i18n/cht/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 0874564b4c90f40b96b0ab41970b164eed784770 i18n/cht/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 d84006726480d7b55e5c9363c0ac7b4dbb203a6d i18n/cht/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 b57662f507d15279b847b5b00fa77a1d6c397d4b i18n/cht/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,11 +10,19 @@
- 	"diff": "互相比較兩個檔案。",
- 	"add": "將資料夾新增至上一個使用中的視窗。",
- 	"goto": "在路徑上的指定行與字元位置開啟檔案。",
-+<<<<<<< .our
- 	"newWindow": "強制開啟新視窗。",
- 	"reuseWindow": "強制在上一個使用中的視窗開啟檔案或資料夾。",
- 	"wait": "等候檔案在傳回前關閉。",
- 	"locale": "要使用的地區設定 (例如 en-US 或 zh-TW)。",
- 	"userDataDir": "指定用於保存使用者資料的目錄。可用於開啟多個相異的 Code 執行個體。",
-+=======
-+	"newWindow": "強制執行 Code 的新執行個體。",
-+	"reuseWindow": "強制在最近使用的視窗中開啟檔案或資料夾。",
-+	"wait": "等候檔案在傳回前關閉。",
-+	"locale": "要使用的地區設定 (例如 en-US 或 zh-TW)。",
-+	"userDataDir": "指定保留使用者資料的目錄，這在以根目錄身分執行時有用。",
-+>>>>>>> .their
- 	"version": "列印版本。",
- 	"help": "列印使用方式。",
- 	"extensionHomePath": "設定擴充功能的根路徑。",
-@@ -22,18 +30,28 @@
- 	"showVersions": "使用 --list-extension 時，顯示安裝的擴充功能版本。",
- 	"installExtension": "安裝擴充功能。",
- 	"uninstallExtension": "解除安裝擴充功能。",
-+<<<<<<< .our
- 	"experimentalApis": "啟用延伸模組的建議 API 功能。",
-+=======
-+	"experimentalApis": "為延伸模組啟用建議的 API 功能。",
-+>>>>>>> .their
- 	"verbose": "列印詳細資訊輸出 (表示 --wait)。",
- 	"log": "使用的日誌級別。預設為\"訊息\"。允許的值是 \"關鍵\"、\"錯誤\"、\"警告\"、\"訊息\"、\"偵錯\"、\"追蹤\"、\"關閉\"。",
- 	"status": "列印進程使用方式和診斷資訊。",
- 	"performance": "在已啟用 'Developer: Startup Performance' 命令的情況下開始。",
- 	"prof-startup": "啟動時執行 CPU 分析工具",
- 	"disableExtensions": "停用所有已安裝的擴充功能。",
-+<<<<<<< .our
- 	"inspect-extensions": "允許延伸模組的偵錯與分析。如需連線 URI，請查看開發人員工具。",
- 	"inspect-brk-extensions": "允許對延伸主機在啟動後暫停擴充功能進行偵錯和分析。如需連線 URI，請查看開發人員工具。",
- 	"disableGPU": "停用 GPU 硬體加速。",
- 	"uploadLogs": "上傳目前的工作階段紀錄至安全的端點。",
- 	"maxMemory": "視窗的最大記憶體大小 (以 MB 為單位)。",
-+=======
-+	"inspect-extensions": "允許對擴充功能進行除錯和分析。檢查開發工具的連接 uri。",
-+	"inspect-brk-extensions": "允許對擴展主機在啟動後暫停擴充功能進行除錯和分析。檢查開發工具中的連接 uri。",
-+	"disableGPU": "停用 GPU 硬體加速。",
-+>>>>>>> .their
- 	"usage": "使用方式",
- 	"options": "選項",
- 	"paths": "路徑",
-changed in both
-  base   100644 bdd6cf5331230b3a429d893ebcbb8b3a9fdee8de i18n/cht/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 a2cc538e14e2cfd1305228b36fae8794fa7c56f9 i18n/cht/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 29b7e86d734e1473b576d855e3ea5c964139aff0 i18n/cht/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -7,11 +7,15 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"invalidManifest": "擴充功能無效: package.json 不是 JSON 檔案。",
-+<<<<<<< .our
- 	"incompatible": "因為延伸模組 '{0}' 與程式碼 '{1}' 不相容，所以無法安裝。",
-+=======
-+>>>>>>> .their
- 	"restartCode": "請先重新啟動 Code，再重新安裝 {0}。",
- 	"installingOutdatedExtension": "已安裝此擴充功能的較新版本。是否要使用舊版本覆蓋此項？",
- 	"override": "覆寫",
- 	"cancel": "取消",
-+<<<<<<< .our
- 	"errorInstallingDependencies": "安裝相依套件時發生錯誤。{0}",
- 	"MarketPlaceDisabled": "未啟用市集",
- 	"removeError": "移除擴充功能: {0} 時發生錯誤。重新嘗試前請離開並再次啟動 VS Code。",
-@@ -22,6 +26,12 @@
- 	"quitCode": "無法安裝擴充功能。重新安裝以前請重啟 VS Code。",
- 	"exitCode": "無法安裝擴充功能。重新安裝以前請離開並再次啟動 VS Code。",
- 	"renameError": "將 {0} 重新命名為 {1} 時發生未知錯誤",
-+=======
-+	"notFoundCompatible": "無法安裝 '{0}'；沒有任何與 VS Code 相容的可用版本 '{1}'。",
-+	"notFoundCompatibleDependency": "無法安裝，因為找不到相容於 VS Code 目前版本 '{1}' 的相依擴充功能 '{0}'。",
-+	"quitCode": "無法安裝擴充功能。重新安裝以前請重啟 VS Code。",
-+	"exitCode": "無法安裝擴充功能。重新安裝以前請離開並再次啟動 VS Code。",
-+>>>>>>> .their
- 	"uninstallDependeciesConfirmation": "只要將 '{0}' 解除安裝，或要包含其相依性?",
- 	"uninstallOnly": "僅擴充功能",
- 	"uninstallAll": "全部解除安裝",
-changed in both
-  base   100644 7a9cbb1bf06c323d637eef20a41c068766d46c65 i18n/cht/src/vs/platform/message/common/message.i18n.json
-  our    100644 34830e4a0c176436899e522878f1cb20ff4ceba2 i18n/cht/src/vs/platform/message/common/message.i18n.json
-  their  100644 f23fb38d41815438114f898b119b8e10e20c0e3e i18n/cht/src/vs/platform/message/common/message.i18n.json
-changed in both
-  base   100644 4868c4bbc6c4e5500d0edede4ad2f376ac897420 i18n/cht/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 790929bd611f6dd14a59e2ff8a6640378fde30cb i18n/cht/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 03e619b672cbadffc41f9e9f3eb812c6cf334d00 i18n/cht/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -68,6 +68,7 @@
- 	"editorWidgetBorder": "編輯器小工具的邊界色彩。小工具選擇擁有邊界或色彩未被小工具覆寫時，才會使用色彩。",
- 	"editorSelectionBackground": "編輯器選取範圍的色彩。",
- 	"editorSelectionForeground": "為選取的文字顏色高對比化",
-+<<<<<<< .our
- 	"editorInactiveSelection": "在非使用中的編輯器的選取項目顏色。不能使用非透明的顏色來隱藏底層的樣式。",
- 	"editorSelectionHighlight": "與選取項目相同的區域顏色。不能使用非透明的顏色來隱藏底層的樣式。",
- 	"editorSelectionHighlightBorder": "選取時，內容相同之區域的框線色彩。",
-@@ -79,6 +80,9 @@
- 	"findRangeHighlightBorder": "限制搜尋範圍的邊框色彩。不能使用非透明的色彩來隱藏基礎樣式。",
- 	"findWidgetResizeBorder": "尋找小工具的調整列的邊框顏色。",
- 	"hoverHighlight": "突顯懸停顯示的文字。不能使用非透明的顏色來隱藏底層的樣式。",
-+=======
-+	"editorFindMatch": "符合目前搜尋的色彩。",
-+>>>>>>> .their
- 	"hoverBackground": "編輯器動態顯示的背景色彩。",
- 	"hoverBorder": "編輯器動態顯示的框線色彩。",
- 	"activeLinkForeground": "使用中之連結的色彩。",
-@@ -86,12 +90,15 @@
- 	"diffEditorRemoved": "移除文字的背景顏色。不能使用非透明的顏色來隱藏底層的樣式。 ",
- 	"diffEditorInsertedOutline": "插入的文字外框色彩。",
- 	"diffEditorRemovedOutline": "移除的文字外框色彩。",
-+<<<<<<< .our
- 	"mergeCurrentHeaderBackground": "目前內嵌合併衝突中的深色標題背景。不能使用非透明的顏色來隱藏底層的樣式。",
- 	"mergeCurrentContentBackground": "目前內嵌合併衝突中的內容背景。不能使用非透明的顏色來隱藏底層的樣式。",
- 	"mergeIncomingHeaderBackground": "傳入內嵌合併衝突中的深色標題背景。不能使用非透明的顏色來隱藏底層的樣式。",
- 	"mergeIncomingContentBackground": "傳入內嵌合併衝突中的內容背景。不能使用非透明的顏色來隱藏底層的樣式。",
- 	"mergeCommonHeaderBackground": "內嵌合併衝突中的共同始祖標題背景。不能使用非透明的顏色來隱藏底層的樣式。",
- 	"mergeCommonContentBackground": "內嵌合併衝突中的共同始祖內容背景。不能使用非透明的顏色來隱藏基礎樣式。",
-+=======
-+>>>>>>> .their
- 	"mergeBorder": "內嵌合併衝突中標頭及分隔器的邊界色彩。",
- 	"overviewRulerCurrentContentForeground": "目前內嵌合併衝突的概觀尺規前景。",
- 	"overviewRulerIncomingContentForeground": "傳入內嵌合併衝突的概觀尺規前景。",
-added in both
-  our    100644 074f6b2402f4fe019ee3d9c00f5e2c58606d8173 i18n/cht/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/cht/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,4 +11,12 @@
- 	"codeActionsOnSave.didTimeout": "在 {0} 毫秒後中止了 codeActionsOnSave",
- 	"timeout.onWillSave": "在 1750 亳秒後中止 onWillSaveTextDocument 事件",
- 	"saveParticipants": "執行儲存參與者..."
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 edc32bace6e95d2cbba253f02f7ddcd5e5ed3e24 i18n/cht/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  our    100644 abe4ed1d76a55705946e1a1d5c0bb771605939cd i18n/cht/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  their  100644 2df7e9c33f5b5017875be52d51d368ffe7343f52 i18n/cht/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,7 @@
- 	],
- 	"treeView.notRegistered": "未註冊識別碼為 '{0}' 的樹狀檢視。",
- 	"treeView.duplicateElement": "識別碼為 {0} 的元件已被註冊"
-+=======
-+	"treeView.notRegistered": "未註冊識別碼為 '{0}' 的樹狀檢視。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 abe1e77c79707384ddb4e23a233c59c1fb5e4e4e i18n/cht/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 fb350c87bdc732a5022e5d51b20bc738ad941987 i18n/cht/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 f5c23870560285795913ccce5187ff77875ff207 i18n/cht/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -15,5 +15,9 @@
- 	"saveWorkspace": "儲存工作區",
- 	"openWorkspaceAction": "開啟工作區...",
- 	"openWorkspaceConfigFile": "開啟工作區組態檔",
-+<<<<<<< .our
- 	"duplicateWorkspaceInNewWindow": "新視窗中的重覆工作區"
-+=======
-+	"openFolderAsWorkspaceInNewWindow": "在新視窗中開啟資料夾作為工作區"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 6d82e2865dfe76c63f5f1fba50cdcdb823f720b1 i18n/cht/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-  their  100644 19777945aa7127f146b39eabd45dd7379fd2d6a2 i18n/cht/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"addFolderToWorkspace": "將資料夾新增到工作區...",
- 	"add": "新增",
- 	"addFolderToWorkspaceTitle": "將資料夾新增到工作區",
-changed in both
-  base   100644 fc25ce13ad0bfeb0d5832f5875c28a21ea2377bc i18n/cht/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  our    100644 57210caa274005f47f9e79a24ece0188fe40d93b i18n/cht/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  their  100644 9dbae940daf1322aad98d5d9e82abbe5113205c7 i18n/cht/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-@@ -19,6 +19,7 @@
- 	"close": "關閉",
- 	"closeOthers": "關閉其他",
- 	"closeRight": "關到右側",
-+<<<<<<< .our
- 	"closeAllSaved": "關閉已儲存項目",
- 	"closeAll": "全部關閉",
- 	"keepOpen": "保持開啟",
-@@ -27,6 +28,15 @@
- 	"keepEditor": "保留編輯器",
- 	"closeEditorsInGroup": "關閉群組中的所有編輯器",
- 	"closeSavedEditors": "關閉群組中的已儲存編輯器",
-+=======
-+	"closeAllUnmodified": "關閉未變更的檔案",
-+	"closeAll": "全部關閉",
-+	"keepOpen": "保持開啟",
-+	"showOpenedEditors": "顯示開啟的編輯器",
-+	"keepEditor": "保留編輯器",
-+	"closeEditorsInGroup": "關閉群組中的所有編輯器",
-+	"closeUnmodifiedEditors": "在群組中關閉未修改的編輯器",
-+>>>>>>> .their
- 	"closeOtherEditors": "關閉其他編輯器",
- 	"closeRightEditors": "將編輯器關到右側"
- }
-\ No newline at end of file
-changed in both
-  base   100644 6f4e3589f00b78ffff200239c271e9748368b385 i18n/cht/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 9af81e350d69047f6d84eaf0bd191dc1d54db2a0 i18n/cht/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 b0ae21a8fc3d7a9622a035ea3849d2b94bf886a2 i18n/cht/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 f93bcde4036126fee7dc69568528e596b4828fb2 i18n/cht/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  our    100644 70182509e578a9143d95039dd3772171f13ad836 i18n/cht/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  their  100644 043d904547ff4cee81c5eb3b127b0a9712ed27b0 i18n/cht/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-changed in both
-  base   100644 7071905be9d1464fb90bf10c52527f7e442398af i18n/cht/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  our    100644 98279e8e6e328b48d46b8daa5bdb4dddd0effc3b i18n/cht/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  their  100644 71cfbf7358591bf1974c0f8c9c1203380f5cd4f8 i18n/cht/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-@@ -12,6 +12,10 @@
- 	"editableEditorWithInputAriaLabel": "{0}。文字檔案比較編輯器。",
- 	"editableEditorAriaLabel": "文字檔比較編輯器。",
- 	"navigate.next.label": "下一個變更",
-+<<<<<<< .our
- 	"navigate.prev.label": "上一個變更",
- 	"toggleIgnoreTrimWhitespace.label": "忽略修剪空白字元"
-+=======
-+	"navigate.prev.label": "上一個變更"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 bfffed93b029eadb9ad51eebc2680d385c49e18a i18n/cht/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  our    100644 47f703cf2f9fbc98afcbcef5d5db808a65fd9a6f i18n/cht/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  their  100644 b9bd84d74099300d5c59979bc15eed36eefde8eb i18n/cht/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"close": "關閉",
-+>>>>>>> .their
- 	"araLabelEditorActions": "編輯器動作"
- }
-\ No newline at end of file
-changed in both
-  base   100644 6be57ab281c6524fe9f41d9e4d4bfc88fbeb25c2 i18n/cht/src/vs/workbench/common/theme.i18n.json
-  our    100644 41a6d8c801b131296a56223489edd198cc2bf33b i18n/cht/src/vs/workbench/common/theme.i18n.json
-  their  100644 0ca701a7da981740372be47f006f49b29dc2df9d i18n/cht/src/vs/workbench/common/theme.i18n.json
-@@ -24,7 +24,10 @@
- 	"editorGroupBackground": "編輯器群組的背景色彩。編輯器群組是編輯器的容器。當拖曳編輯器群組時會顯示背景色彩。",
- 	"tabsContainerBackground": "當索引標籤啟用的時候編輯器群組標題的背景色彩。編輯器群組是編輯器的容器。",
- 	"tabsContainerBorder": "當索引標籤啟用時，編輯器群組標題的框線色彩。編輯器群組是編輯器的容器。",
-+<<<<<<< .our
- 	"editorGroupHeaderBackground": "當索引標籤禁用的時候編輯器群組標題的背景顏色 (`\"workbench.editor.showTabs\": false`)。編輯器群組是編輯器的容器。",
-+=======
-+>>>>>>> .their
- 	"editorGroupBorder": "用以分隔多個編輯器群組彼此的色彩。編輯器群組是編輯器的容器。",
- 	"editorDragAndDropBackground": "拖拉編輯器時的背景顏色,可設置透明度讓內容穿透顯示.",
- 	"panelBackground": "面板的前景色彩。面板會顯示在編輯器區域的下方，其中包含諸如輸出與整合式終端機等檢視。",
-@@ -41,8 +44,11 @@
- 	"statusBarNoFolderBorder": "未開啟資料夾時，用以分隔資訊看板與編輯器的狀態列框線色彩。狀態列會顯示在視窗的底部。 ",
- 	"statusBarItemActiveBackground": "按下滑鼠按鈕時，狀態列項目的背景色彩。狀態列會顯示在視窗的底部。",
- 	"statusBarItemHoverBackground": "動態顯示時，狀態列項目的背景色彩。狀態列會顯示在視窗的底部。",
-+<<<<<<< .our
- 	"statusBarProminentItemBackground": "狀態列突出項目的背景顏色。突出項目比狀態列的其他項目更顯眼，用於表示重要性更高。從命令選擇區變更模式 `切換 Tab 鍵移動焦點` 來檢視範例。狀態列會顯示在視窗的底部。",
- 	"statusBarProminentItemHoverBackground": "當暫留狀態列突出項目的背景顏色。突出項目比狀態列的其他項目更顯眼，用於表示重要性更高。從命令選擇區變更模式 `切換 Tab 鍵移動焦點` 來檢視範例。狀態列會顯示在視窗的底部。",
-+=======
-+>>>>>>> .their
- 	"activityBarBackground": "活動列背景的色彩。活動列會顯示在最左側或最右側，並可切換不同的提要欄位檢視。",
- 	"activityBarForeground": "活動列的前背景色彩(例如用於圖示)。此活動列會顯示在最左側或最右側，讓您可以切換提要欄位的不同檢視。",
- 	"activityBarBorder": "用以分隔提要欄位的活動列框線色彩。此活動列會顯示在最左側或最右側，讓您可以切換提要欄位的不同檢視。",
-added in both
-  our    100644 fd56bed834966709f195244249e53963d1d8486d i18n/cht/src/vs/workbench/common/views.i18n.json
-  their  100644 b6fbcb12ae35381939fe87ed3fa6453b8ccbc39a i18n/cht/src/vs/workbench/common/views.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"duplicateId": "識別碼為 '{0}' 的檢視已在位置 '{1}' 註冊"
- }
-\ No newline at end of file
-changed in both
-  base   100644 daf7e22d21e520f6d3f111d84ce8ecbf63d29995 i18n/cht/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 8c04c44fd8aa84aafd673c4f7e7c350b8ac52c3b i18n/cht/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 c6e5b092bd1ede4f855f73cb760186660ec53e35 i18n/cht/src/vs/workbench/electron-browser/actions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"closeWindow": "關閉視窗",
- 	"closeWorkspace": "關閉工作區",
- 	"noWorkspaceOpened": "此執行個體中目前沒有開啟的工作區可以關閉。",
-@@ -50,6 +53,14 @@
- 	"moveWindowTabToNewWindow": "將視窗索引標籤移至新的視窗",
- 	"mergeAllWindowTabs": "合併所有視窗",
- 	"toggleWindowTabsBar": "切換視窗索引標籤列",
-+<<<<<<< .our
- 	"about": "關於 {0}",
- 	"inspect context keys": "檢查功能表內容"
-+=======
-+	"configureLocale": "設定語言",
-+	"displayLanguage": "定義 VSCode 的顯示語言。",
-+	"doc": "如需支援的語言清單，請參閱 {0}。",
-+	"restart": "改變設定值後需要重新啟動 VSCode.",
-+	"fail.createSettings": "無法建立 '{0}' ({1})。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 33e2c22230a0dd4f4c910e9234080655668a9c6b i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 bf339c91e8587ec53fe81a294c54ddc0f5aad010 i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 c719faa3f8f8322b412c3a99680cc8e77b11e1b4 i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,12 +35,19 @@
- 	"panelDefaultLocation": "控制面板的預設位置。可顯示在 Workbench 的底部或是右方。",
- 	"statusBarVisibility": "控制 Workbench 底端狀態列的可視性。",
- 	"activityBarVisibility": "控制活動列在 workbench 中的可見度。",
-+<<<<<<< .our
- 	"viewVisibility": "控制檢視標頭動作的可見度。檢視標頭動作可為總是可見，或在檢視為焦點或暫留時才可見。",
- 	"fontAliasing": "控制工作台中的字型鋸齒化方法。\n- default: 子像素字型平滑化。在多數非 Retina 的顯示器上，這會使文字變得最鮮明\n- antialiased: 在像素層級上使字型平滑化，與子像素相對。能夠使字型整體顯示較亮\n- none: 停用字型平滑化。顯示的文字會帶有鋸齒狀銳利邊緣\n- auto: 根據顯示器的 DPI 自動套用 `default` 或 `antialiased`。",
- 	"workbench.fontAliasing.default": "子像素字型平滑處理。在大部分非 Retina 顯示器上會顯示出最銳利的文字。",
- 	"workbench.fontAliasing.antialiased": "相對於子像素，根據像素層級平滑字型。可以讓字型整體顯得較細。",
- 	"workbench.fontAliasing.none": "禁用字體平滑.文字將會顯示鋸齒狀與鋒利的邊緣.",
- 	"workbench.fontAliasing.auto": "根據顯示器的 DPI 自動套用 `default` 或 `antialiased`。",
-+=======
-+	"fontAliasing": "在 Workbench 中控制字型鋸齒化的方法。- 預設: 子像素字型平滑處理。在大部分非 Retina 顯示器上會顯示出最銳利的文字- 已消除鋸齒: 相對於子像素，根據像素層級平滑字型。可讓字型整體顯得較細- 無: 停用字型平滑處理。文字會以鋸齒狀的銳邊顯示 ",
-+	"workbench.fontAliasing.default": "子像素字型平滑處理。在大部分非 Retina 顯示器上會顯示出最銳利的文字。",
-+	"workbench.fontAliasing.antialiased": "相對於子像素，根據像素層級平滑字型。可以讓字型整體顯得較細。",
-+	"workbench.fontAliasing.none": "禁用字體平滑.文字將會顯示鋸齒狀與鋒利的邊緣.",
-+>>>>>>> .their
- 	"enableNaturalLanguageSettingsSearch": "控制是否啟用自然語言搜尋模式。",
- 	"windowConfigurationTitle": "視窗",
- 	"window.openFilesInNewWindow.on": "檔案會在新視窗中開啟",
-changed in both
-  base   100644 8bd875c749d3c08b1b912a5fd5fb9b119c3e6988 i18n/cht/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
-  our    100644 649599cad385fe860287b9d1f1b6e0699ce6e478 i18n/cht/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
-  their  100644 33b7f3d44675768252eb39160033325d67975cdf i18n/cht/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"debugToolBarBackground": "偵錯工具列背景色彩。",
- 	"debugToolBarBorder": "偵錯工具列的邊框色彩"
- }
-\ No newline at end of file
-changed in both
-  base   100644 c16e8f409d63bde9c51c8cf037069cf2f3ee7498 i18n/cht/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  our    100644 0c85b37c8f146a183b27bdbacba854cd89eab6d5 i18n/cht/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  their  100644 c127cd12e93ac4cbd2b849be5d898a1a216b4d4f i18n/cht/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"debug.terminal.title": "偵錯項目"
- }
-\ No newline at end of file
-changed in both
-  base   100644 cebab2d329a2be9074bc396a357fba1301da9a40 i18n/cht/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  our    100644 74bcaae504a4a54801ebc152e9c1eb5f67cdf659 i18n/cht/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  their  100644 370fe5dd9482d211dbd3cc62841bbdb2e5251a7a i18n/cht/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-changed in both
-  base   100644 89b01309fa3551db55acdecd525dbbe3e36cb497 i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 68a719930ef86e9c0443de55d9783ccfe2efafc4 i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 0f331df92b84cbfd8d3ba04d0b7cd7bf0c449488 i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,11 @@
- 	"exeBasedRecommendation": "因為您已安裝 {0}，所以建議您使用此延伸模組。",
- 	"fileBasedRecommendation": "根據您最近開啟的檔案，建議您使用此延伸模組。",
- 	"workspaceRecommendation": "根據目前工作區的使用者，建議您使用此延伸模組。",
-+=======
-+	"workspaceRecommendation": "根據目前工作區的使用者，建議您使用此延伸模組。",
-+	"fileBasedRecommendation": "根據您最近開啟的檔案，建議您使用此延伸模組。",
-+	"exeBasedRecommendation": "因為您已安裝 {0}，所以建議您使用此延伸模組。",
-+>>>>>>> .their
- 	"reallyRecommended2": "建議對此檔案類型使用 '{0}' 延伸模組。",
- 	"reallyRecommendedExtensionPack": "建議對此檔案類型使用 '{0}' 延伸模組套件。",
- 	"install": "安裝",
-added in both
-  our    100644 f5a2db16545b0bc0375ab5309f1665e2cc4cb8f5 i18n/cht/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-  their  100644 37b9d5384a5d805a2e73f89815075c787883f868 i18n/cht/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,13 @@
- 	],
- 	"workbenchConfigurationTitle": "工作台",
- 	"feedbackVisibility": "控制工作台底部狀態列中的 Twitter 回饋 (笑臉) 的可見度。"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"workbenchConfigurationTitle": "工作台"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 570b71dc6f4715db1dc4fdf2ef9a82ddc5649b30 i18n/cht/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-  their  100644 e8a6eb4e02cf8268484f0a642b7b3404b1e5df64 i18n/cht/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"hide": "隱藏"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8edf80232253478b27e2c990d82b50ff4df4bdb6 i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  our    100644 7db983f67d10cddebe8cba0535ddc6aaff11c9ea i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  their  100644 0203e579bac3ebaef869dc141ed17d6107286c79 i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-@@ -12,7 +12,10 @@
- 	"revertLocalChanges": "捨棄您的變更並還原成磁碟上的內容",
- 	"copyPathOfActive": "複製使用中檔案的路徑",
- 	"saveAllInGroup": "全部儲存在群組中",
-+<<<<<<< .our
- 	"saveFiles": "儲存所有檔案",
-+=======
-+>>>>>>> .their
- 	"revert": "還原檔案",
- 	"compareActiveWithSaved": "比較使用中的檔案和已儲存的檔案",
- 	"closeEditor": "關閉編輯器",
-@@ -24,12 +27,19 @@
- 	"copyPath": "複製路徑",
- 	"saveAll": "全部儲存",
- 	"compareWithSaved": "與已儲存的檔案比較",
-+<<<<<<< .our
- 	"compareWithSelected": "與選取的比較",
- 	"compareSource": "選取用以比較",
- 	"compareSelected": "比較已選取",
- 	"close": "關閉",
- 	"closeOthers": "關閉其他",
- 	"closeSaved": "關閉已儲存項目",
-+=======
-+	"compareSource": "選取用以比較",
-+	"close": "關閉",
-+	"closeOthers": "關閉其他",
-+	"closeUnmodified": "關閉未變更的檔案",
-+>>>>>>> .their
- 	"closeAll": "全部關閉",
- 	"deleteFile": "永久刪除"
- }
-\ No newline at end of file
-changed in both
-  base   100644 c32641ccebc8fbed926c69242f64a9fbc36d13e0 i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 17eb85d0cba4bf089ef8b48577e75838680e330d i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 033e57751ec6c094519046c4b9f21e15e8cea426 i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"newFile": "新增檔案",
- 	"newFolder": "新增資料夾",
- 	"rename": "重新命名",
-@@ -13,7 +16,11 @@
- 	"copyFile": "複製",
- 	"pasteFile": "貼上",
- 	"retry": "重試",
-+<<<<<<< .our
- 	"renameWhenSourcePathIsParentOfTargetError": "請使用 'New Folder' 或 'New File' 命令將子系新增至現有的資料夾",
-+=======
-+	"openFolderFirst": "先開啟資料夾，以在其中建立檔案或資料夾。",
-+>>>>>>> .their
- 	"newUntitledFile": "新增未命名檔案",
- 	"createNewFile": "新增檔案",
- 	"createNewFolder": "新增資料夾",
-@@ -43,11 +50,19 @@
- 	"confirmDeleteMessageMultiple": "確定要永久地刪除以下 {0} 個檔案嗎？",
- 	"confirmDeleteMessageFolder": "您確定要永久刪除 '{0}' 和其中的內容嗎?",
- 	"confirmDeleteMessageFile": "您確定要永久刪除 '{0}' 嗎?",
-+<<<<<<< .our
- 	"addFiles": "新增檔案",
- 	"confirmOverwrite": "目的資料夾中已有同名的檔案或資料夾。要取代它嗎?",
- 	"replaceButtonLabel": "取代(&&R)",
- 	"fileIsAncestor": "要貼上的檔案是在目地資料夾的上層 ",
- 	"fileDeleted": "要貼上的檔案被刪除或移動",
-+=======
-+	"irreversible": "此動作無法回復!",
-+	"permDelete": "永久刪除",
-+	"importFiles": "匯入檔案",
-+	"confirmOverwrite": "目的資料夾中已有同名的檔案或資料夾。要取代它嗎?",
-+	"replaceButtonLabel": "取代(&&R)",
-+>>>>>>> .their
- 	"duplicateFile": "複製",
- 	"globalCompareFile": "使用中檔案的比較對象...",
- 	"openFileToCompare": "先開啟檔案以與其他檔案進行比較",
-changed in both
-  base   100644 75bdd951541007bdd0b8f91851760b6d8e726732 i18n/cht/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  our    100644 4f037a1090495f08486b17df05200026e15e83c9 i18n/cht/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  their  100644 4a3f606e9a71cb89a6474c23f0e78951c3c6134e i18n/cht/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,12 +7,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"revealInWindows": "在檔案總管中顯示",
- 	"revealInMac": "在 Finder 中顯示",
- 	"openContainer": "開啟收納資料夾",
- 	"saveAs": "另存新檔...",
- 	"save": "儲存",
- 	"saveAll": "全部儲存",
-+<<<<<<< .our
-+=======
-+	"saveFiles": "儲存所有檔案",
-+>>>>>>> .their
- 	"removeFolderFromWorkspace": "將資料夾從工作區移除",
- 	"genericRevertError": "無法還原 '{0}': {1}",
- 	"modifiedLabel": "{0} (在磁碟上) ↔ {1}",
-changed in both
-  base   100644 867d603ca5633a190dd294a861b5733b06da3c8c i18n/cht/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 be3fbea1a573a3ae7e9cb55afbd7c2737b3d71f0 i18n/cht/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 28e38af66ab4a7ca841438751197196900429c65 i18n/cht/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-@@ -40,7 +40,10 @@
- 	"formatOnSave": "在儲存時設定檔案格式。格式器必須處於可用狀態、檔案不得自動儲存，且編輯器不得關機。",
- 	"formatOnSaveTimeout": "儲存時格式化超時。指定 formatOnSave 命令的時間限制 (以毫秒為單位)。超過指定超時時間的命令將被取消。",
- 	"explorerConfigurationTitle": "檔案總管",
-+<<<<<<< .our
- 	"openEditorsVisible": "[開放式編輯器] 窗格中顯示的編輯器數目。",
-+=======
-+>>>>>>> .their
- 	"autoReveal": "控制總管是否在開啟檔案時自動加以顯示及選取。",
- 	"enableDragAndDrop": "控制總管是否應該允許透過拖放功能移動檔案和資料夾。",
- 	"confirmDragAndDrop": "控制總管是否須要求確認，以透過拖放來移動檔案和資料夾。",
-changed in both
-  base   100644 7a6f0b075f74848503c85069b40013f41dc423f4 i18n/cht/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  our    100644 eef73b3e6bc035b5c2b5b170f3146f31c7abcee8 i18n/cht/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  their  100644 6f482834b344badd7e33e67dc9899439b9cea27a i18n/cht/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,6 +14,14 @@
- 	"readonlySaveErrorAdmin": "無法儲存 '{0}': 檔案有防寫保護。請選取 [以系統管理者身分覆寫] 來做為系統管理者身分重試。 ",
- 	"readonlySaveError": "無法儲存 '{0}': 檔案有防寫保護。請選取 [覆寫] 以嚐試移除保護。 ",
- 	"permissionDeniedSaveError": "無法儲存 '{0}': 權限不足。請選取 [以系統管理者身分重試] 做為系統管理者身分重試。 ",
-+=======
-+	"userGuide": "在右方使用編輯器工具列中的動作來 **復原** 您的變更，或以您的變更 **覆寫** 磁碟上的內容",
-+	"overwriteElevated": "以系統管理者身分覆寫...",
-+	"saveElevated": "以系統管理者身分重試",
-+	"overwrite": "覆寫",
-+	"retry": "重試",
-+	"discard": "捨棄",
-+>>>>>>> .their
- 	"genericSaveError": "無法儲存 '{0}': {1}",
- 	"learnMore": "深入了解",
- 	"dontShowAgain": "不要再顯示",
-changed in both
-  base   100644 b48ed12d51855b12f5079b2ba6ccbf5bd5f20d47 i18n/cht/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  our    100644 35ea5e6b125818531a84cf5f3ecaaca77128b961 i18n/cht/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  their  100644 bc39c809e3de74122b4578e5fca38234e4ead479 i18n/cht/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-added in both
-  our    100644 6437a50222a0fcf7edb1151253eed3b35a74133c i18n/cht/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-  their  100644 801a62c062aab71774689d06cb71739e00066e94 i18n/cht/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,5 +11,13 @@
- 	"sharedLog": "紀錄 (共享) ",
- 	"rendererLog": "紀錄 (視窗)",
- 	"extensionsLog": "紀錄 (延伸主機) ",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"developer": "開發人員"
- }
-\ No newline at end of file
-added in both
-  our    100644 5ba4662a59600e7cc718255220a16ebea20d28b1 i18n/cht/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  their  100644 ddfff57509fec37578e10bc0f429803973011ab6 i18n/cht/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -16,15 +17,34 @@
- 	"selectProcess": "選取程序的記錄",
- 	"openLogFile": "開啟紀錄檔案...",
- 	"setLogLevel": "設定紀錄層級",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"openLogsFolder": "開啟紀錄資料夾",
-+	"showLogs": "顯示紀錄...。",
-+	"rendererProcess": "視窗",
-+	"extensionHost": "延伸主機",
-+	"selectProcess": "選取程序",
-+	"setLogLevel": "設定記錄層級",
-+>>>>>>> .their
- 	"trace": "追蹤",
- 	"debug": "偵錯",
- 	"info": "資訊",
- 	"warn": "警告",
- 	"err": "錯誤",
-+<<<<<<< .our
- 	"critical": "嚴重",
- 	"off": "關閉",
- 	"selectLogLevel": "選擇紀錄層級",
- 	"default and current": "預設與目前",
- 	"default": "預設",
- 	"current": "目前"
-+=======
-+	"off": "關閉",
-+	"selectLogLevel": "選擇紀錄層級"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7fd5ffaf852bbf00495cf764f9c33e0de548897a i18n/cht/src/vs/workbench/parts/markers/common/messages.i18n.json
-  our    100644 277304218a05614a88d10d3dfa976833dcf8b63a i18n/cht/src/vs/workbench/parts/markers/common/messages.i18n.json
-  their  100644 c754d02f8731022e67c633f1b10793e3890f192e i18n/cht/src/vs/workbench/parts/markers/common/messages.i18n.json
-@@ -7,8 +7,11 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"viewCategory": "檢視",
-+<<<<<<< .our
- 	"problems.view.toggle.label": "切換至問題(錯誤, 警告, 資訊)",
- 	"problems.view.focus.label": "聚焦於問題(錯誤, 警告, 資訊)",
-+=======
-+>>>>>>> .their
- 	"problems.panel.configuration.title": "[問題] 檢視",
- 	"problems.panel.configuration.autoreveal": "控制 [問題] 檢視是否應自動在開啟檔案時加以顯示",
- 	"markers.panel.title.problems": "問題",
-added in both
-  our    100644 d1554edfa0acf2920b90a909dcd24f6940d242a7 i18n/cht/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-  their  100644 223611af94e7f474bfa685f4e40e651a8ab6647e i18n/cht/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -11,4 +12,15 @@
- 	"viewCategory": "檢視",
- 	"clearOutput.label": "清除輸出",
- 	"openActiveLogOutputFile": "檢視: 開啟活動日誌輸出檔案"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"output": "輸出",
-+	"viewCategory": "檢視",
-+	"clearOutput.label": "清除輸出"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 650a7d283969cd39e172f31623aa27f163ca725c i18n/cht/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/cht/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,12 @@
- 	],
- 	"output": "{0} - 輸出",
- 	"channel": "'{0}' 的輸出通道"
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 480c3d2dbc2429466eae73efdf10836ba24348cb i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 17bda120dbd77f09aaae9b33d7a0fd346cfe2603 i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 5c3acf7c7d64621384457e83b84b68b723891289 i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"defaultSettings": "將您的設定放置於右方編輯器中以覆寫。",
- 	"noSettingsFound": "找不到任何設定。",
- 	"settingsSwitcherBarAriaLabel": "設定切換器",
-changed in both
-  base   100644 3aed58520858912cd1bb672948bfa8d19d71ffdf i18n/cht/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  our    100644 8733c537f59df2fc8c00e76d49613ca2252a3d72 i18n/cht/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  their  100644 4a5625894bd6dacc5f486e4c24636132474ae2ec i18n/cht/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-changed in both
-  base   100644 238b60d70077764c93852c2ac5217b9e6ae52ed5 i18n/cht/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  our    100644 ec7b2f0037cdd44476f6c632907da49a58637baa i18n/cht/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  their  100644 6a7eae1ed19269002f0a6c5e3cf423b201b789be i18n/cht/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"view": "檢視",
- 	"commandsHandlerDescriptionDefault": "顯示並執行命令",
- 	"gotoLineDescriptionMac": "移至行",
-changed in both
-  base   100644 c0bccd6864ce28dcfdecff56da124d7a48f07b0b i18n/cht/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  our    100644 a47e720b85b124ad8277e1dd5180192fef41e422 i18n/cht/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  their  100644 813fb7021bf2a52dd967f16ada8f5d8e063f305e i18n/cht/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-@@ -10,8 +10,13 @@
- 	"source control": "原始檔控制",
- 	"toggleSCMViewlet": "顯示 SCM",
- 	"view": "檢視",
-+<<<<<<< .our
- 	"scmConfigurationTitle": "原始碼管理 (SCM)",
- 	"alwaysShowProviders": "是否總是顯示原始檔控制提供者區段",
- 	"diffDecorations": "控制差異裝飾於編輯器中",
- 	"diffGutterWidth": "控制邊框中差異裝飾的寬度 (px) (增加和修改)。"
-+=======
-+	"alwaysShowProviders": "是否總是顯示原始檔控制提供者區段",
-+	"inputCounter": "控制何時顯示輸入計數器"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 72f9807aa29260fb51db6a1706a9fb685cb9707b i18n/cht/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  our    100644 4bf0fb57a82a100d4c5b072e1a13f960c4e14c31 i18n/cht/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  their  100644 29439ddb2cf3c79607587f5025d52dd962dec0b0 i18n/cht/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-@@ -8,6 +8,7 @@
- 	],
- 	"scm providers": "原始檔控制提供者",
- 	"hideRepository": "隱藏",
-+	"commitMessageInfo": "在目前行數有 {0} 個字元",
- 	"installAdditionalSCMProviders": "安裝額外SCM提供者...",
- 	"no open repo": "沒有使用中的原始檔控制提供者。",
- 	"source control": "原始檔控制",
-changed in both
-  base   100644 551008efc7893399c0221873de05b323f9c2b7c1 i18n/cht/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 ba1fd77bc20f96eb0056aa05843bd1bb7818c0eb i18n/cht/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 e52a383a212b6ec13896414aeda0899108eb6a7b i18n/cht/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-changed in both
-  base   100644 2737e83ab4e2d72307285d25741cd8198fec0007 i18n/cht/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 ebc27f353b31e6e9c7c072ddd7a5d4a8a93dc07d i18n/cht/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 1244f50ad8cfe7d8cef62d92d94a515cff364e74 i18n/cht/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,11 +13,18 @@
- 	"copyAllLabel": "全部複製",
- 	"clearSearchHistoryLabel": "清除搜尋歷程記錄",
- 	"toggleSearchViewPositionLabel": "切換搜尋檢視位置",
-+=======
-+>>>>>>> .their
- 	"findInFolder": "在資料夾中尋找...",
- 	"findInWorkspace": "在工作區中尋找...",
- 	"showTriggerActions": "前往工作區中的符號...",
- 	"name": "搜尋",
-+<<<<<<< .our
- 	"showSearchViewl": "顯示搜尋",
-+=======
-+	"search": "搜尋",
-+	"showSearchViewlet": "顯示搜尋",
-+>>>>>>> .their
- 	"view": "檢視",
- 	"findInFiles": "在檔案中尋找",
- 	"openAnythingHandlerDescription": "前往檔案",
-added in both
-  our    100644 eee83ac59d306906e966b7a1fd22be00a3fc38a2 i18n/cht/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-  their  100644 8c1786823ea517774c1c191d8b394423976b590b i18n/cht/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -13,5 +14,15 @@
- 	"new.global.sep": "新增程式碼片段",
- 	"openSnippet.pickLanguage": "選取程式碼片段檔案或建立程式碼片段",
- 	"openSnippet.label": "設定使用者程式碼片段",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"global.scope": "(全域)",
-+	"global.1": "({0})",
-+>>>>>>> .their
- 	"preferences": "喜好設定"
- }
-\ No newline at end of file
-changed in both
-  base   100644 10abf9bdd4dee37b35d418c5088f12fe4ce635cf i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  our    100644 179e7258b664148a5ba38b4e024fbd706aee0cb7 i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  their  100644 115f5980d39013977ba7c3f359fd2a7014cb8a91 i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"snippetSchema.json.default": "空白程式碼片段",
- 	"snippetSchema.json": "使用者程式碼片段組態",
- 	"snippetSchema.json.prefix": "在 Intellisense 中選取程式碼片段時要使用的前置詞",
-added in both
-  our    100644 41c38916afd896b61492589c5f2dd9668e4bf74a i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-  their  100644 4a43b9b0daf355d6ea9e712605f44b652f28a4e7 i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,5 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"source.snippetGlobal": "全域使用者程式碼片段",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"source.snippet": "使用者程式碼片段"
- }
-\ No newline at end of file
-changed in both
-  base   100644 e7261d392fd61f6d6e84e036a1d31a2661b64366 i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  our    100644 763c92b7367ac35034e9498d362e409a1ce2c7f1 i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 bcbd784bf1c57f1f349a9faf93450ee1eb78bf56 i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,9 @@
- 	],
- 	"invalid.path.0": "'contributes.{0}.path' 中應有字串。提供的值: {1}",
- 	"invalid.language.0": "省略語言時，`contributes.{0}.path` 的值必須是 `.code-snippets`-file。您目前提供的值：{1}",
-+=======
-+	"invalid.path.0": "'contributes.{0}.path' 中應有字串。提供的值: {1}",
-+>>>>>>> .their
- 	"invalid.language": "`contributes.{0}.language` 中的不明語言。提供的值: {1}",
- 	"invalid.path.1": "擴充功能資料夾 ({2}) 應包含 'contributes.{0}.path' ({1})。這可能會導致擴充功能無法移植。",
- 	"vscode.extension.contributes.snippets": "提供程式碼片段。",
-changed in both
-  base   100644 80abe8bb59c2d8ae4b753b7631b622d1b57645e7 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 dc4a98ed7869a7cc55922d5bc3bb8ecb137f6a4d i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 d824ac236e9f4d77c996e9ba90ec028e900b5a9a i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -15,7 +15,11 @@
- 	"terminal.integrated.shellArgs.osx": "在 OS X 終端機要使用的命令列引數。",
- 	"terminal.integrated.shell.windows": "終端機在 Windows 上使用的殼層路徑。使用隨附於 Windows 的殼層 (cmd、PowerShell 或 Bash on Ubuntu) 時。",
- 	"terminal.integrated.shellArgs.windows": "在 Windows 終端機上時要使用的命令列引數。",
-+<<<<<<< .our
- 	"terminal.integrated.macOptionIsMeta": "將選項鍵視為 macOS 終端機中的 meta 鍵。",
-+=======
-+	"terminal.integrated.rightClickCopyPaste": "如有設定，這會防止在終端機內按滑鼠右鍵時顯示操作功能表，而是在有選取項目時複製、沒有選取項目時貼上。",
-+>>>>>>> .their
- 	"terminal.integrated.copyOnSelection": "當設定時，在終端機中選擇的文字將會被複製至剪貼簿",
- 	"terminal.integrated.fontFamily": "控制終端機的字型家族，預設為 editor.fontFamily 的值。",
- 	"terminal.integrated.fontSize": "控制終端機的字型大小 (以像素為單位)。",
-changed in both
-  base   100644 4034245817950e0bafe49e25a55f31d69cafbc3c i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 b65af1ec7222f34f85465a0e272b45818ced6ea4 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 5adfeb27fedb082946776a84cbc017dc3d31a120 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -19,6 +19,7 @@
- 	"workbench.action.terminal.new": "建立新的整合式終端機",
- 	"workbench.action.terminal.new.short": "新增終端機",
- 	"workbench.action.terminal.newWorkspacePlaceholder": "為新的終端機選擇目前的工作目錄",
-+<<<<<<< .our
- 	"workbench.action.terminal.newInActiveWorkspace": "建立新的整合式終端機 (於目前工作區)",
- 	"workbench.action.terminal.split": "分割終端機",
- 	"workbench.action.terminal.splitInActiveWorkspace": "分割終端機 (於使用中的工作區)",
-@@ -28,6 +29,8 @@
- 	"workbench.action.terminal.resizePaneRight": "調整窗格右側",
- 	"workbench.action.terminal.resizePaneUp": "調整窗格上方",
- 	"workbench.action.terminal.resizePaneDown": "調整窗格下方",
-+=======
-+>>>>>>> .their
- 	"workbench.action.terminal.focus": "聚焦終端機",
- 	"workbench.action.terminal.focusNext": "聚焦下一個終端機",
- 	"workbench.action.terminal.focusPrevious": "聚焦上一個終端機",
-changed in both
-  base   100644 3c4cccada80ab6272079756f801b41915d757acb i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 2657899133e07b49fde3b011113a300d729b30b8 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 3effe14e672e13014de0a1e61a8ed9999f074242 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -10,7 +10,11 @@
- 	"terminal.foreground": "終端機的前景色彩。",
- 	"terminalCursor.foreground": "終端機游標的前景色彩。",
- 	"terminalCursor.background": "終端機游標的背景色彩。允許區塊游標重疊於自訂字元色彩。",
-+<<<<<<< .our
- 	"terminal.selectionBackground": "終端機的選取項目背景色彩。",
- 	"terminal.border": "在終端機內將窗格分割之邊界的色彩。預設為 panel.border。",
- 	"terminal.ansiColor": "終端機中的 '{0}' ANSI 色彩。"
-+=======
-+	"terminal.selectionBackground": "終端機的選取項目背景色彩。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 fc6b0624a086866da0e905e5276f239252ef8963 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  our    100644 55ce4576943b4064c238335449bd2f01b7cfc32d i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  their  100644 331a28ddaf2c2df3af8caec873d010121aa0eb3b i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-@@ -8,7 +8,11 @@
- 	],
- 	"terminal.integrated.chooseWindowsShellInfo": "您可以選取 [自訂] 按鈕變更預設的終端機殼層。",
- 	"customize": "自訂",
-+<<<<<<< .our
- 	"never again": "不要再顯示",
-+=======
-+	"cancel": "取消",
-+>>>>>>> .their
- 	"terminal.integrated.chooseWindowsShell": "請選取所需的終端機殼層。您之後可以在設定中變更此選擇",
- 	"terminalService.terminalCloseConfirmationSingular": "仍有一個使用中的終端機工作階段。要予以終止嗎?",
- 	"terminalService.terminalCloseConfirmationPlural": "目前共有 {0} 個使用中的終端機工作階段。要予以終止嗎?"
-changed in both
-  base   100644 e043af15328ee3940be29307d54ad6c128a488d4 i18n/cht/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 3fdd15bb8f2f2cfb1dd6d7b789581c43681e05de i18n/cht/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 0090723f9a2daea55fbc4fa46f8aa608d33fc741 i18n/cht/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -26,7 +26,10 @@
- 	"commandPalette": "命令選擇區...",
- 	"settings": "設定",
- 	"keyboardShortcuts": "鍵盤快速鍵(&&K)",
-+<<<<<<< .our
- 	"showExtensions": "管理擴充功能",
-+=======
-+>>>>>>> .their
- 	"userSnippets": "使用者程式碼片段",
- 	"selectTheme.label": "色彩佈景主題",
- 	"themes.selectIconTheme.label": "檔案圖示佈景主題",
-changed in both
-  base   100644 067f2923a48309193cd28fa6fb886049ddae521d i18n/cht/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  our    100644 7d5350b520b4d67111b7f41cf915db16407871b6 i18n/cht/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  their  100644 106253b1f0cd21b5879ab6abea7ab78ddd0e573b i18n/cht/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,4 +14,9 @@
- 	"fileBinaryError": "檔案似乎是二進位檔，因此無法當做文字開啟",
- 	"err.create": "無法建立檔案 {0}",
- 	"fileMoveConflict": "無法移動/複製。目的地已存在檔案。"
-+=======
-+	"fileIsDirectoryError": "檔案是目錄",
-+	"fileNotModifiedError": "未修改檔案的時間",
-+	"fileBinaryError": "檔案似乎是二進位檔，因此無法當做文字開啟"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 5fb9fd9998bac3aad993a60cd8b0e874756dfd7e i18n/cht/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  our    100644 cc9ac892518cde73d902e325d06f8149dd79c06c i18n/cht/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  their  100644 fe4c04e35cd0e415ea1de05739efbcddbf395a19 i18n/cht/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-changed in both
-  base   100644 939ead9df9c71727207d82585424fde289b02903 i18n/cht/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 80a488e2a3e2c61dc5b117e10596d1fd5524e484 i18n/cht/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 8096baf29535b730056e2ec35f12d3dde02cecb1 i18n/cht/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-changed in both
-  base   100644 283d3809ddb10d028c96aed1895e6717e7489153 i18n/cht/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  our    100644 4d4e5f4f69d10620c3c84b07885a16c64b735010 i18n/cht/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  their  100644 e0710f14e3f8b69f252fb20afac94eaf50310d9a i18n/cht/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-@@ -8,5 +8,10 @@
- 	],
- 	"errorInvalidTaskConfiguration": "無法寫入工作區組態檔。請開啟檔案更正其中的錯誤/警告，然後再試一次。 ",
- 	"errorWorkspaceConfigurationFileDirty": "因為檔案已變更，所以無法寫入工作區組態檔。請將其儲存，然後再試一次。",
-+<<<<<<< .our
- 	"openWorkspaceConfigurationFile": "開啟工作區組態設定"
-+=======
-+	"openWorkspaceConfigurationFile": "開啟工作區組態檔",
-+	"close": "關閉"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e1242008fcfe02d7588828e7ab2667e41a98f385 i18n/deu/extensions/git/out/autofetch.i18n.json
-  our    100644 57d1be570fcceb0c9d422fc4552c950a9b3239ce i18n/deu/extensions/git/out/autofetch.i18n.json
-  their  100644 5a1bb589fb2c67f7ba11c705a32336a2b8044edc i18n/deu/extensions/git/out/autofetch.i18n.json
-@@ -7,7 +7,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"yes": "Ja",
-+	"read more": "Weitere Informationen",
- 	"no": "Nein",
- 	"not now": "Erneut nachfragen",
-+<<<<<<< .our
- 	"suggest auto fetch": "Möchten Sie Code [regelmäßig \"git fetch\" ausführen lassen] ({0})?"
-+=======
-+	"suggest auto fetch": "Möchten Sie Code regelmäßig `git fetch` ausführen lassen?"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 27787e3b3d420f2a46e6300d31a08177fb527d00 i18n/deu/extensions/git/out/commands.i18n.json
-  our    100644 1abad5f86ec11c777f2319fc1588d47f5ea1c8f5 i18n/deu/extensions/git/out/commands.i18n.json
-  their  100644 e26a7235e02a5fb6cdb11ab58c45c8718cabc756 i18n/deu/extensions/git/out/commands.i18n.json
-@@ -45,7 +45,10 @@
- 	"yes discard tracked multiple": "{0} verfolgte Dateien verwerfen",
- 	"unsaved files single": "Die folgende Datei ist nicht gespeichert: {0}.\n\nMöchten Sie diese vor dem Committen speichern?",
- 	"unsaved files": "{0} Dateien sind nicht gespeichert.\n\nMöchten Sie diese vor dem Committen speichern?",
-+<<<<<<< .our
- 	"save and commit": "Alles speichern und committen",
-+=======
-+>>>>>>> .their
- 	"commit": "Trotzdem committen",
- 	"no staged changes": "Es sind keine Änderungen bereitgestellt.\n\nMöchten Sie alle Ihre Änderungen automatisch bereitstellen und direkt committen?",
- 	"always": "Immer",
-@@ -71,12 +74,19 @@
- 	"pick remote pull repo": "Remoteelement zum Pullen des Branch auswählen",
- 	"no remotes to push": "In Ihrem Repository wurden keine Remoteelemente für den Push konfiguriert.",
- 	"nobranch": "Wählen Sie ein Branch für den Push zu einem Remoteelement aus.",
-+<<<<<<< .our
- 	"confirm publish branch": "Der Branch \"{0}\" verfügt über keinen Upstreambranch. Möchten Sie diesen Branch veröffentlichen?",
- 	"ok": "OK",
- 	"push with tags success": "Push mit Tags erfolgreich ausgeführt.",
- 	"pick remote": "Remotespeicherort auswählen, an dem der Branch \"{0}\" veröffentlicht wird:",
- 	"sync is unpredictable": "Mit dieser Aktion werden Commits per Push und Pull an und von \"{0}/{1}\" übertragen.",
- 	"never again": "OK, nicht mehr anzeigen",
-+=======
-+	"ok": "OK",
-+	"push with tags success": "Push mit Tags erfolgreich ausgeführt.",
-+	"pick remote": "Remotespeicherort auswählen, an dem der Branch \"{0}\" veröffentlicht wird:",
-+	"sync is unpredictable": "Mit dieser Aktion werden Commits per Push und Pull an und von \"{0}\" übertragen.",
-+>>>>>>> .their
- 	"no remotes to publish": "In Ihrem Repository wurden keine Remoteelemente für die Veröffentlichung konfiguriert.",
- 	"no changes stash": "Es sind keine Änderungen vorhanden, für die ein Stash ausgeführt werden kann.",
- 	"provide stash message": "Geben Sie optional eine Stash-Nachricht ein.",
-changed in both
-  base   100644 9c6af561332b3614cc176ac11385b5e7ed3c419f i18n/deu/extensions/git/out/repository.i18n.json
-  our    100644 19de752d1259c61a02eef63529268457137c8f97 i18n/deu/extensions/git/out/repository.i18n.json
-  their  100644 cb3c5c9809f00b45ccc5447a012894e9762398fa i18n/deu/extensions/git/out/repository.i18n.json
-@@ -28,8 +28,12 @@
- 	"merge changes": "Änderungen zusammenführen",
- 	"staged changes": "Bereitgestellte Änderungen",
- 	"changes": "Änderungen",
-+<<<<<<< .our
- 	"commitMessageCountdown": "{0} Zeichen in der aktuellen Zeile verbleibend",
- 	"commitMessageWarning": "{0} Zeichen über {1} in der aktuellen Zeile",
-+=======
-+	"ok": "OK",
-+>>>>>>> .their
- 	"neveragain": "Nicht mehr anzeigen",
- 	"huge": "Das Git-Repository unter {0} umfasst zu viele aktive Änderungen. Nur ein Teil der Git-Features wird aktiviert."
- }
-\ No newline at end of file
-changed in both
-  base   100644 de4d841dd213285f434ae56f6ed42a2d3e3eeed7 i18n/deu/extensions/git/package.i18n.json
-  our    100644 70e0819e8ad95e53d1958520356a5b59f85a5e7c i18n/deu/extensions/git/package.i18n.json
-  their  100644 f2ecf9579370ca60e3fd970aee942cfce87cf477 i18n/deu/extensions/git/package.i18n.json
-added in both
-  our    100644 cdebacc88dbcf9d9afaa3a97d1e65074370aba3b i18n/deu/extensions/typescript/out/commands.i18n.json
-  their  100644 abb5c164718f4e5685e81d8bd48e588149556961 i18n/deu/extensions/typescript/out/commands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -13,4 +14,20 @@
- 	"typescript.noJavaScriptProjectConfig": "Datei ist nicht Teil eines JavaScript-Projekt. Klicken Sie [hier]({0}), um mehr zu erfahren.",
- 	"typescript.configureTsconfigQuickPick": "tsconfig.json konfigurieren",
- 	"typescript.configureJsconfigQuickPick": "jsconfig.json konfigurieren"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"typescript.projectConfigNoWorkspace": "Öffnen Sie einen Ordner in VS Code, um ein TypeScript- oder JavaScript-Projekt zu verwenden.",
-+	"typescript.projectConfigUnsupportedFile": "TypeScript- oder JavaScript-Projekt konnte nicht ermittelt werden. Nicht unterstützter Dateityp.",
-+	"typescript.projectConfigCouldNotGetInfo": "TypeScript- oder JavaScript-Projekt konnte nicht ermittelt werden.",
-+	"typescript.noTypeScriptProjectConfig": "Datei ist nicht Teil eines TypeScript-Projekts.",
-+	"typescript.noJavaScriptProjectConfig": "Datei ist nicht Teil eines JavaScript-Projekts.",
-+	"typescript.configureTsconfigQuickPick": "tsconfig.json konfigurieren",
-+	"typescript.configureJsconfigQuickPick": "jsconfig.json konfigurieren",
-+	"typescript.projectConfigLearnMore": "Weitere Informationen"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 750d811d866eaa3d43818bd1d8e28c9898acf514 i18n/deu/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-  their  100644 ed15423097d5cbb03aeb8c474db3877ca0d1584f i18n/deu/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"selectAriaOption": "{0}"
- }
-\ No newline at end of file
-added in both
-  our    100644 6cb929906482e56a542bad412001991e4554c641 i18n/deu/src/vs/base/node/ps.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/deu/src/vs/base/node/ps.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"collecting": "Sammeln von CPU- und Speicherinformationen. Dies kann einige Sekunden dauern."
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 42d65e250ff2d0d7ecb26879d1548e9dd2a4fbd0 i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 0cb95fccc47d309d94aacd1e25b0718fd455d527 i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 3bd907833f1a18864b55fd7d0409f427ef543676 i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -16,7 +16,11 @@
- 	"lineNumbers.on": "Zeilennummern werden als absolute Zahl dargestellt.",
- 	"lineNumbers.relative": "Zeilennummern werden als Abstand in Zeilen an Cursorposition dargestellt.",
- 	"lineNumbers.interval": "Zeilennummern werden alle 10 Zeilen dargestellt.",
-+<<<<<<< .our
- 	"lineNumbers": "Steuert die Anzeige von Zeilennummern.",
-+=======
-+	"lineNumbers": "Steuert die Anzeige von Zeilennummern. Mögliche Werte sind \"on\", \"off\", \"relative\" und \"interval\".",
-+>>>>>>> .their
- 	"rulers": "Vertikale Linien nach einer bestimmten Anzahl von Monospace Zeichen zeichnen. Verwenden Sie mehrere Werte für mehrere Linien. Keine Linie wird gezeichnet, wenn das Array leer ist.",
- 	"wordSeparators": "Zeichen, die als Worttrennzeichen verwendet werden, wenn wortbezogene Navigationen oder Vorgänge ausgeführt werden.",
- 	"tabSize": "Die Anzahl der Leerzeichen, denen ein Tabstopp entspricht. Diese Einstellung wird basierend auf dem Inhalt der Datei überschrieben, wenn \"editor.detectIndentation\" aktiviert ist.",
-changed in both
-  base   100644 fa37f670425bf1fa26d424baca2aa885fd889088 i18n/deu/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 7bcd160f251f75f4318d89da439565bbd4c696e5 i18n/deu/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 512b68939183ef1357f32a2d4fc55535aeea45f6 i18n/deu/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -8,8 +8,11 @@
- 	],
- 	"lineHighlight": "Hintergrundfarbe zur Hervorhebung der Zeile an der Cursorposition.",
- 	"lineHighlightBorderBox": "Hintergrundfarbe für den Rahmen um die Zeile an der Cursorposition.",
-+<<<<<<< .our
- 	"rangeHighlight": "Hintergrundfarbe hervorgehobener Bereiche, beispielsweise durch Features wie Quick Open und Suche. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen. ",
- 	"rangeHighlightBorder": "Hintergrundfarbe für den Rahmen um hervorgehobene Bereiche.",
-+=======
-+>>>>>>> .their
- 	"caret": "Farbe des Cursors im Editor.",
- 	"editorCursorBackground": "Hintergrundfarbe vom Editor-Cursor. Erlaubt die Anpassung der Farbe von einem Zeichen, welches von einem Block-Cursor überdeckt wird.",
- 	"editorWhitespaces": "Farbe der Leerzeichen im Editor.",
-changed in both
-  base   100644 02553773e89a405c3313536c028171aefb241d53 i18n/deu/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  our    100644 1bf59098e6bb675310a58bc407214801197d5f27 i18n/deu/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  their  100644 cc799cdb63a2a13e72c96b26bea3db59e7eac659 i18n/deu/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -10,4 +11,11 @@
- 	"markerAction.previous.label": "Gehe zu vorigem Problem (Fehler, Warnung, Information)",
- 	"markerAction.nextInFiles.label": "Gehe zu dem nächsten Problem in den Dateien (Fehler, Warnung, Info) ",
- 	"markerAction.previousInFiles.label": "Gehe zu dem vorherigen Problem in den Dateien (Fehler, Warnung, Info) "
-+=======
-+	"title.wo_source": "({0}/{1})",
-+	"editorMarkerNavigationError": "Editormarkierung: Farbe bei Fehler des Navigationswidgets.",
-+	"editorMarkerNavigationWarning": "Editormarkierung: Farbe bei Warnung des Navigationswidgets.",
-+	"editorMarkerNavigationInfo": "Editormarkierung: Farbe bei Warnung des Navigationswidgets.",
-+	"editorMarkerNavigationBackground": "Editormarkierung: Hintergrund des Navigationswidgets."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d706ff2e9b2d0d291ab89967a844b41798e381a1 i18n/deu/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  our    100644 d79e05a3c241c5572a0749df3f61a43a014dac07 i18n/deu/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  their  100644 f6176a5826f065dcf365fdb84143e934ffa33dbc i18n/deu/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,10 @@
- 	"wordHighlightStrongBorder": "Randfarbe eines Symbols beim Schreibzugriff, wie etwa beim Schreiben einer Variablen.",
- 	"overviewRulerWordHighlightForeground": "Übersichtslineal-Markierungsfarbe für Symbolhervorhebungen. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen.",
- 	"overviewRulerWordHighlightStrongForeground": "Übersichtslineal-Markierungsfarbe für Schreibzugriffs-Symbolhervorhebungen. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen.",
-+=======
-+	"overviewRulerWordHighlightForeground": "Übersichtslineal-Markierungsfarbe für Symbolhervorhebungen.",
-+	"overviewRulerWordHighlightStrongForeground": "Übersichtslineal-Markierungsfarbe für Schreibzugriffs-Symbolhervorhebungen.",
-+>>>>>>> .their
- 	"wordHighlight.next.label": "Gehe zur nächsten Symbolhervorhebungen",
- 	"wordHighlight.previous.label": "Gehe zur vorherigen Symbolhervorhebungen"
- }
-\ No newline at end of file
-changed in both
-  base   100644 5cd50df300ac1d988c35e6b77263b3e60c6bd44a i18n/deu/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  our    100644 5dc1bba0ffa0332aada387afdb06b43754a7fefe i18n/deu/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  their  100644 30e3fed7ba6288d01c3c98f0722023352fbd6653 i18n/deu/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 e990ea9bf1ec2df4a4d7c3a0db611fe7436aa236 i18n/deu/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 f6bdb0310262230d9fd3311d63fcfc0ae9c687d8 i18n/deu/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 973f6daca81c52d8e267d1ce880900e8bfa61263 i18n/deu/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,11 +10,19 @@
- 	"diff": "Vergleicht zwei Dateien.",
- 	"add": "Fügt einen oder mehrere Ordner zum letzten aktiven Fenster hinzu.",
- 	"goto": "Öffnet eine Datei im Pfad in der angegebenen Zeile und an der Zeichenposition.",
-+<<<<<<< .our
- 	"newWindow": "Öffnen eines neuen Fensters erzwingen.",
- 	"reuseWindow": "Öffnen einer Datei oder eines Ordners im letzten aktiven Fenster erzwingen.",
- 	"wait": "Warten Sie, bis die Dateien geschlossen sind, bevor Sie zurück gehen können.",
- 	"locale": "Das zu verwendende Gebietsschema (z. B. en-US oder zh-TW).",
- 	"userDataDir": "Gibt das Verzeichnis an, in dem Benutzerdaten gespeichert werden. Kann zum Öffnen mehrerer verschiedener Codeinstanzen verwendet werden.",
-+=======
-+	"newWindow": "Erzwingt eine neue Instanz des Codes.",
-+	"reuseWindow": "Erzwingt das Öffnen einer Datei oder eines Ordners im letzten aktiven Fenster.",
-+	"wait": "Warten Sie, bis die Dateien geschlossen sind, bevor Sie zurück gehen können.",
-+	"locale": "Das zu verwendende Gebietsschema (z. B. en-US oder zh-TW).",
-+	"userDataDir": "Gibt das Verzeichnis an, in dem Benutzerdaten gespeichert werden. Nützlich, wenn die Ausführung als \"root\" erfolgt.",
-+>>>>>>> .their
- 	"version": "Gibt die Version aus.",
- 	"help": "Gibt die Syntax aus.",
- 	"extensionHomePath": "Legen Sie den Stammpfad für Extensions fest.",
-@@ -29,11 +37,17 @@
- 	"performance": "Startet mit aktiviertem Befehl \"Developer: Startup Performance\".",
- 	"prof-startup": "CPU-Profiler beim Start ausführen",
- 	"disableExtensions": "Deaktiviert alle installierten Extensions.",
-+<<<<<<< .our
- 	"inspect-extensions": "Erlaubt Debuggen und Profilerstellung für Erweiterungen. Überprüfen Sie die Entwicklertools für die Verbindungs-URI.",
- 	"inspect-brk-extensions": "Erlaubt Debuggen und Profilerstellung für Erweiterungen, wobei der Erweiterungs-Host nach dem Start angehalten wird. Überprüfen Sie die Entwicklertools für die Verbindungs-URI.",
- 	"disableGPU": "Deaktiviert die GPU-Hardwarebeschleunigung.",
- 	"uploadLogs": "Lädt die Logs der aktuellen Sitzung an einem sicheren Endpunkt hoch.",
- 	"maxMemory": "Maximale Speichergröße für ein Fenster (in Mbyte).",
-+=======
-+	"inspect-extensions": "Erlaubt Debugging und Profiling für Erweiterungen. Überprüfen Sie die Entwicklertools für die Verbindungs-URI.",
-+	"inspect-brk-extensions": "Erlaubt Debugging und Profiling für Erweiterungen, wobei der Erweiterungs-Host nach dem Starten pausiert wird. Überprüfen Sie die Entwicklertools für die Verbindungs-URI.",
-+	"disableGPU": "Deaktiviert die GPU-Hardwarebeschleunigung.",
-+>>>>>>> .their
- 	"usage": "Verwendung",
- 	"options": "Optionen",
- 	"paths": "Pfade",
-changed in both
-  base   100644 256756a3fdd26e6ea0b4cb814e8b8026cff0adc7 i18n/deu/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 efdaa6c50b1a7075eb309307a09334b8e64087d3 i18n/deu/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 503ec4aa8a3fdf7a6ab3bfaaf2395b1f9cb3a24a i18n/deu/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -7,11 +7,15 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"invalidManifest": "Die Erweiterung ist ungültig: \"package.json\" ist keine JSON-Datei.",
-+<<<<<<< .our
- 	"incompatible": "Die Erweiterung \"{0}\" kann nicht installiert werden, die sie nicht mit dem Code \"{1}\" kompatibel ist.",
-+=======
-+>>>>>>> .their
- 	"restartCode": "Bitte starten Sie Code vor der Neuinstallation von {0} neu.",
- 	"installingOutdatedExtension": "Eine neuere Version dieser Erweiterung ist bereits installiert. Möchten Sie diese mit der älteren Version überschreiben?",
- 	"override": "Überschreiben",
- 	"cancel": "Abbrechen",
-+<<<<<<< .our
- 	"errorInstallingDependencies": "Fehler während Installation der Abhängigkeiten. {0}",
- 	"MarketPlaceDisabled": "Marketplace ist nicht aktiviert.",
- 	"removeError": "Fehler beim Entfernen der Erweiterung: {0}. Bitte beenden Sie und starten Sie VS Code neu bevor Sie erneut versuchen die Erweiterung zu installieren.",
-@@ -22,6 +26,12 @@
- 	"quitCode": "Fehler bei der Installation der Erweiterung. Beenden und starten Sie VS Code vor der erneuten Installation neu.",
- 	"exitCode": "Fehler bei der Installation der Erweiterung. Beenden und starten Sie VS Code vor der erneuten Installation neu.",
- 	"renameError": "Unbekannter Fehler beim Umbenennen von {0} in {1}",
-+=======
-+	"notFoundCompatible": "'{0}' kann nicht installiert werden: Es gibt keine mit VS Code '{1}' kompatible Version.",
-+	"notFoundCompatibleDependency": "Kann nicht installiert werden, da die abhängige Erweiterung '{0}', die mit der aktuellen VS Code Version '{1}' kompatibel ist, nicht gefunden werden kann. ",
-+	"quitCode": "Fehler bei der Installation der Erweiterung. Beenden und starten Sie VS Code vor der erneuten Installation neu.",
-+	"exitCode": "Fehler bei der Installation der Erweiterung. Beenden und starten Sie VS Code vor der erneuten Installation neu.",
-+>>>>>>> .their
- 	"uninstallDependeciesConfirmation": "Möchten Sie nur \"{0}\" oder auch die zugehörigen Abhängigkeiten deinstallieren?",
- 	"uninstallOnly": "Nur Erweiterung",
- 	"uninstallAll": "Alle deinstallieren",
-changed in both
-  base   100644 f4286f9eb7869d09d49755b2fdeaace2a172da5a i18n/deu/src/vs/platform/message/common/message.i18n.json
-  our    100644 f09fe4a631bf21973c3d242d650d3131ae314755 i18n/deu/src/vs/platform/message/common/message.i18n.json
-  their  100644 774ad662835630d27b879b1848bf72cd90c19201 i18n/deu/src/vs/platform/message/common/message.i18n.json
-changed in both
-  base   100644 937855710852497edd351ef5072275dfd928a600 i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 b32f03c31fd5ffcb9742f2b1188daade81a7b028 i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 38654cc79857a94beb2dc0dc1fa17bdf0c013413 i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -68,6 +68,7 @@
- 	"editorWidgetBorder": "Rahmenfarbe von Editorwigdets. Die Farbe wird nur verwendet, wenn für das Widget ein Rahmen verwendet wird und die Farbe nicht von einem Widget überschrieben wird.",
- 	"editorSelectionBackground": "Farbe der Editor-Auswahl.",
- 	"editorSelectionForeground": "Farbe des gewählten Text für einen hohen Kontrast",
-+<<<<<<< .our
- 	"editorInactiveSelection": "Farbe der Auswahl in einem inaktiven Editor. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen. ",
- 	"editorSelectionHighlight": "Farbe für Bereiche, deren Inhalt der Auswahl entspricht. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen.",
- 	"editorSelectionHighlightBorder": "Randfarbe für Bereiche, deren Inhalt der Auswahl entspricht.",
-@@ -79,6 +80,9 @@
- 	"findRangeHighlightBorder": "Rahmenfarbe des Bereichs zur Einschränkung der Suche. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen.",
- 	"findWidgetResizeBorder": "Rahmenfarbe der Größenänderungsleiste im Suchwidget.",
- 	"hoverHighlight": "Hervorhebung eines Worts, unter dem ein Mauszeiger angezeigt wird. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen. ",
-+=======
-+	"editorFindMatch": "Farbe des aktuellen Suchergebnisses.",
-+>>>>>>> .their
- 	"hoverBackground": "Background color of the editor hover.",
- 	"hoverBorder": "Rahmenfarbe des Editor-Mauszeigers.",
- 	"activeLinkForeground": "Farbe der aktiven Links.",
-@@ -86,12 +90,15 @@
- 	"diffEditorRemoved": "Hintergrundfarbe für entfernten Text. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen. ",
- 	"diffEditorInsertedOutline": "Konturfarbe für eingefügten Text.",
- 	"diffEditorRemovedOutline": "Konturfarbe für entfernten Text.",
-+<<<<<<< .our
- 	"mergeCurrentHeaderBackground": "Aktueller Kopfzeilenhintergrund in Inline-Mergingkonflikten. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen.",
- 	"mergeCurrentContentBackground": "Aktueller Inhaltshintergrund in Inline-Mergingkonflikten. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen. ",
- 	"mergeIncomingHeaderBackground": "Hintergrund für eingehende Kopfzeile in Inline-Mergingkonflikten. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen. ",
- 	"mergeIncomingContentBackground": "Hintergrund für eingehenden Inhalt in Inline-Mergingkonflikten. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen. ",
- 	"mergeCommonHeaderBackground": "Inhaltshintergrund des gemeinsamen übergeordneten Elements bei Inline-Mergingkonflikten. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen.",
- 	"mergeCommonContentBackground": "Inhaltshintergrund des gemeinsamen übergeordneten Elements bei Inline-Mergingkonflikten. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen.",
-+=======
-+>>>>>>> .their
- 	"mergeBorder": "Rahmenfarbe für Kopfzeilen und die Aufteilung in Inline-Mergingkonflikten.",
- 	"overviewRulerCurrentContentForeground": "Aktueller Übersichtslineal-Vordergrund für Inline-Mergingkonflikte.",
- 	"overviewRulerIncomingContentForeground": "Eingehender Übersichtslineal-Vordergrund für Inline-Mergingkonflikte. ",
-added in both
-  our    100644 75b2994052291390999698977515572a80141a18 i18n/deu/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/deu/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,4 +11,12 @@
- 	"codeActionsOnSave.didTimeout": "codeActionsOnSave nach {0} ms abgebrochen",
- 	"timeout.onWillSave": "Bei onWillSaveTextDocument-Ereignis nach 1750 ms abgebrochen",
- 	"saveParticipants": "Speichern von Teilnehmern wird ausgeführt …"
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 76a366889135ebe861e46bed9044b6cbf74a402c i18n/deu/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  our    100644 411898837318f5e7088a5861f163c76ed4ae6164 i18n/deu/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  their  100644 d76ac6f164225adb657cd9ec520b46b15b30aa6e i18n/deu/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,7 @@
- 	],
- 	"treeView.notRegistered": "Kein Treeviw mit der id '{0}' registriert.",
- 	"treeView.duplicateElement": "Das Element mit der ID {0} ist bereits registriert"
-+=======
-+	"treeView.notRegistered": "Kein Treeviw mit der id '{0}' registriert."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 174408464b67a407711ee70819030ddfca4e3f16 i18n/deu/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 108a8fac6be8b55e95f04920e7eb7dd21d592b50 i18n/deu/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 79911f9a8b9ee1c996abcffe5dc791404280d776 i18n/deu/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -15,5 +15,9 @@
- 	"saveWorkspace": "Arbeitsbereich speichern",
- 	"openWorkspaceAction": "Arbeitsbereich öffnen...",
- 	"openWorkspaceConfigFile": "Konfigurationsdatei des Arbeitsbereichs öffnen",
-+<<<<<<< .our
- 	"duplicateWorkspaceInNewWindow": "Duplikat des Arbeitsbereichs in neuem Fenster erstellen"
-+=======
-+	"openFolderAsWorkspaceInNewWindow": "Ordner als Arbeitsbereich in neuem Fenster öffnen"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 09731afa67ad9ee74f589e136aaa2f159c6d7e92 i18n/deu/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-  their  100644 60a543c8bbac1628418f8eebce1a2cd6e75442e2 i18n/deu/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"addFolderToWorkspace": "Ordner zum Arbeitsbereich hinzufügen...",
- 	"add": "&&Hinzufügen",
- 	"addFolderToWorkspaceTitle": "Ordner zum Arbeitsbereich hinzufügen",
-changed in both
-  base   100644 0812b9299a43455786b39be7b02c2ddbea206893 i18n/deu/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  our    100644 12e4c96abba0bc9f3237a988e8c2b28fd6bc23a7 i18n/deu/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  their  100644 95de712113ef0e23b7d39e569416e4fa9ccb81d0 i18n/deu/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-@@ -19,6 +19,7 @@
- 	"close": "Schließen",
- 	"closeOthers": "Andere schließen",
- 	"closeRight": "Rechts schließen",
-+<<<<<<< .our
- 	"closeAllSaved": "Gespeicherte schließen",
- 	"closeAll": "Alle schließen",
- 	"keepOpen": "Geöffnet lassen",
-@@ -27,6 +28,15 @@
- 	"keepEditor": "Editor beibehalten",
- 	"closeEditorsInGroup": "Alle Editoren in der Gruppe schließen",
- 	"closeSavedEditors": "Gespeicherte Editoren in Gruppe schließen",
-+=======
-+	"closeAllUnmodified": "Nicht geänderte schließen",
-+	"closeAll": "Alle schließen",
-+	"keepOpen": "Geöffnet lassen",
-+	"showOpenedEditors": "Geöffnete Editoren anzeigen",
-+	"keepEditor": "Editor beibehalten",
-+	"closeEditorsInGroup": "Alle Editoren in der Gruppe schließen",
-+	"closeUnmodifiedEditors": "Nicht geänderte Editoren in der Gruppe schließen",
-+>>>>>>> .their
- 	"closeOtherEditors": "Andere Editoren schließen",
- 	"closeRightEditors": "Editoren rechts schließen"
- }
-\ No newline at end of file
-changed in both
-  base   100644 eea7eefe298809c96a2e0fdf585166c2c427a0bd i18n/deu/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 bfd72770d07a936659f4d75458f1721e0e96ed8a i18n/deu/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 f94ad3ec09a068198b31cc459d02c48a9cb56268 i18n/deu/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 2b4ef55801bd9bec491371c61147fb773e0b36d2 i18n/deu/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  our    100644 ad42a8f37c9ae280a7cad2c863b690a8d39222a1 i18n/deu/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  their  100644 9080d3ad0fbaf717291fb87c00904012ca17b9e2 i18n/deu/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-changed in both
-  base   100644 f5bb0f973969973c267c026a7099104710b90242 i18n/deu/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  our    100644 66a620287b3ee4b1a14687e084425f394a8e24cf i18n/deu/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  their  100644 c46090d74198329a772e41f10e29044d90300a43 i18n/deu/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-changed in both
-  base   100644 33a0388a6478433a7033bb97b4ab59c52e4111a2 i18n/deu/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  our    100644 6054596bd29084288d548fe3228ad8b8077164e4 i18n/deu/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  their  100644 4b868884b773a0500e57a510c453dd1c68bb43b7 i18n/deu/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"close": "Schließen",
-+>>>>>>> .their
- 	"araLabelEditorActions": "Editor-Aktionen"
- }
-\ No newline at end of file
-changed in both
-  base   100644 5618ae8213a77ab8ef13c4fbea5b7bad40ddd12e i18n/deu/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
-  our    100644 f4bb553343ecdf29a6f6cc1bab49b2620fd1a1b3 i18n/deu/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
-  their  100644 4697a7de886b4e7b622b78c456d02605b65a925e i18n/deu/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
-changed in both
-  base   100644 4336f732bee2d7e45a60d66f703e0d7095b9626a i18n/deu/src/vs/workbench/common/theme.i18n.json
-  our    100644 7230e04365d13635c1ebe9cad1ed0f92866146cc i18n/deu/src/vs/workbench/common/theme.i18n.json
-  their  100644 56819e7b1df16ba1e42a1243bb6b021a88be5a88 i18n/deu/src/vs/workbench/common/theme.i18n.json
-@@ -11,10 +11,15 @@
- 	"tabHoverBackground": "Hintergrundfarbe der Registerkarte beim Daraufzeigen. Registerkarten sind die Container für Editoren im Editorbereich. In einer Editorgruppe können mehrere Registerkarten geöffnet werden. Mehrere Editorgruppen können vorhanden sein.",
- 	"tabUnfocusedHoverBackground": "Hintergrundfarbe für Registerkarten in einer unfokussierten Gruppe beim Daraufzeigen. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.",
- 	"tabBorder": "Rahmen zum Trennen von Registerkarten. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.",
-+<<<<<<< .our
- 	"tabActiveBorder": "Rahmen am unteren Rand einer aktiven Registerkarte. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.",
- 	"tabActiveBorderTop": "Rahmen am oberen Rand einer aktiven Registerkarte. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.",
- 	"tabActiveUnfocusedBorder": "Rahmen am unteren Rand einer aktiven Registerkarte in einer unfokussierten Gruppe. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.",
- 	"tabActiveUnfocusedBorderTop": "Rahmen am oberen Rand einer aktiven Registerkarte in einer unfokussierten Gruppe. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.",
-+=======
-+	"tabActiveBorder": "Rahmen zum Hervorheben aktiver Registerkarten. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.",
-+	"tabActiveUnfocusedBorder": "Rahmen zum Hervorheben aktiver Registerkarten in einer unfokussierten Gruppe. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.",
-+>>>>>>> .their
- 	"tabHoverBorder": "Rahmen zum Hervorheben von Registerkarten beim Daraufzeigen. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.",
- 	"tabUnfocusedHoverBorder": "Rahmen zum Hervorheben von Registerkarten in einer unfokussierten Gruppe beim Daraufzeigen. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.",
- 	"tabActiveForeground": "Vordergrundfarbe der aktiven Registerkarte in einer aktiven Gruppe. Registerkarten sind die Container für Editors im Editorbereich. In einer Editorgruppe können mehrere Registerkarten geöffnet werden. Mehrere Editorgruppen können vorhanden sein.",
-@@ -41,8 +46,11 @@
- 	"statusBarNoFolderBorder": "Rahmenfarbe der Statusleiste zur Abtrennung von der Randleiste und dem Editor, wenn kein Ordner geöffnet ist. Die Statusleiste wird unten im Fenster angezeigt.",
- 	"statusBarItemActiveBackground": "Hintergrundfarbe für Statusleistenelemente beim Klicken. Die Statusleiste wird am unteren Rand des Fensters angezeigt.",
- 	"statusBarItemHoverBackground": "Hintergrundfarbe der Statusleistenelemente beim Daraufzeigen. Die Statusleiste wird am unteren Seitenrand angezeigt.",
-+<<<<<<< .our
- 	"statusBarProminentItemBackground": "Hintergrundfarbe für markante Elemente der Statusleiste. Markante Elemente sind im Vergleich zu anderen Statusleisteneinträgen hervorgehoben, um auf ihre Bedeutung hinzuweisen. Ändern Sie den Modus mithilfe von \"TAB-Umschalttaste verschiebt Fokus\" auf der Befehlspalette, um ein Beispiel anzuzeigen. Die Statusleiste wird unten im Fenster angezeigt.",
- 	"statusBarProminentItemHoverBackground": "Hintergrundfarbe für markante Elemente der Statusleiste, wenn auf diese gezeigt wird. Markante Elemente sind im Vergleich zu anderen Statusleisteneinträgen hervorgehoben, um auf ihre Bedeutung hinzuweisen. Ändern Sie den Modus mithilfe von \"TAB-Umschalttaste verschiebt Fokus\" auf der Befehlspalette, um ein Beispiel anzuzeigen. Die Statusleiste wird unten im Fenster angezeigt.",
-+=======
-+>>>>>>> .their
- 	"activityBarBackground": "Hintergrundfarbe der Aktivitätsleiste. Die Aktivitätsleiste wird ganz links oder rechts angezeigt und ermöglicht das Wechseln zwischen verschiedenen Ansichten der Seitenleiste.",
- 	"activityBarForeground": "Vordergrundfarbe der Aktivitätsleiste (z. B. für Symbole). Die Aktivitätsleiste wird ganz links oder rechts angezeigt und ermöglicht das Wechseln zwischen verschiedenen Ansichten der Seitenleiste.",
- 	"activityBarBorder": "Rahmenfarbe der Aktivitätsleiste für die Abtrennung von der Seitenleiste. Die Aktivitätsleiste wird ganz links oder rechts angezeigt und ermöglicht das Wechseln zwischen verschiedenen Ansichten der Seitenleiste.",
-added in both
-  our    100644 53cde5ce48767baccff87423ee7d359da429d7e8 i18n/deu/src/vs/workbench/common/views.i18n.json
-  their  100644 a36d97eb0e0703c97ad14755ae71577eaf5e6789 i18n/deu/src/vs/workbench/common/views.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"duplicateId": "Eine Ansicht mit der ID \"{0}\" ist bereits am Speicherort \"{1}\" registriert."
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"duplicateId": "Eine Ansicht mit der ID \"{0}\" ist am Speicherort \"{1}\" bereits registriert."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7331216a594d4acf61cbf610077b089d1f6fe5e2 i18n/deu/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 1609e7c92719c7aa89402c8bf0018971f9a1043e i18n/deu/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 4f7255a9d9157dd3852b225b3f473bfbf618f435 i18n/deu/src/vs/workbench/electron-browser/actions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"closeWindow": "Fenster schließen",
- 	"closeWorkspace": "Arbeitsbereich schließen",
- 	"noWorkspaceOpened": "Zurzeit ist kein Arbeitsbereich in dieser Instanz geöffnet, der geschlossen werden kann.",
-@@ -50,6 +53,14 @@
- 	"moveWindowTabToNewWindow": "Fensterregisterkarte in neues Fenster verschieben",
- 	"mergeAllWindowTabs": "Alle Fenster zusammenführen",
- 	"toggleWindowTabsBar": "Fensterregisterkarten-Leiste umschalten",
-+<<<<<<< .our
- 	"about": "Informationen zu {0}",
- 	"inspect context keys": "Kontextschlüssel prüfen"
-+=======
-+	"configureLocale": "Sprache konfigurieren",
-+	"displayLanguage": "Definiert die Anzeigesprache von VSCode.",
-+	"doc": "Unter {0} finden Sie eine Liste der unterstützten Sprachen.",
-+	"restart": "Das Ändern dieses Wertes erfordert einen Neustart von VSCode.",
-+	"fail.createSettings": "{0} ({1}) kann nicht erstellt werden."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 2a2af0f320b0f5411da37030fef16436d5a0c6f6 i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 fc92fd392259fb9b2d1dec1cecdbc3c76bdc7440 i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 aba53ab9214081804a7d45f78cf889841be349f3 i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,12 +35,19 @@
- 	"panelDefaultLocation": "Steuert die Standardposition des Panels. Dieses kann entweder unterhalb oder rechts von der Workbench angezeigt werden.",
- 	"statusBarVisibility": "Steuert die Sichtbarkeit der Statusleiste im unteren Bereich der Workbench.",
- 	"activityBarVisibility": "Steuert die Sichtbarkeit der Aktivitätsleiste in der Workbench.",
-+<<<<<<< .our
- 	"viewVisibility": "Steuert die Sichtbarkeit von Headeraktionen. Headeraktionen können immer sichtbar sein oder nur sichtbar sein, wenn diese Ansicht fokussiert ist oder mit der Maus darauf gezeigt wird.",
- 	"fontAliasing": "Steuert die Schriftartaliasingmethode in der Workbench.\n - default: Subpixel-Schriftartglättung. Auf den meisten Nicht-Retina-Displays wird Text bei dieser Einstellung am schärfsten dargestellt. \n- antialiased: Glättet die Schriftart auf der Pixelebene (im Gegensatz zur Subpixelebene). Bei dieser Einstellung kann die Schriftart insgesamt heller wirken.\n- none: Deaktiviert die Schriftartglättung. Text wird mit gezackten scharfen Kanten dargestellt.\n- auto: Wendet ausgehend vom DPI der Anzeige automatisch \"default\" oder \"antialiased\" an.",
- 	"workbench.fontAliasing.default": "Subpixel-Schriftartglättung. Auf den meisten Nicht-Retina-Displays wird Text bei dieser Einstellung am schärfsten dargestellt.",
- 	"workbench.fontAliasing.antialiased": "Glättet die Schriftart auf der Pixelebene (im Gegensatz zur Subpixelebene). Bei dieser Einstellung kann die Schriftart insgesamt heller wirken.",
- 	"workbench.fontAliasing.none": "Deaktiviert die Schriftartglättung. Text wird mit gezackten scharfen Kanten dargestellt.",
- 	"workbench.fontAliasing.auto": "Wendet ausgehend vom DPI der Anzeige automatisch \"default\" oder \"antialiased\" an.",
-+=======
-+	"fontAliasing": "Steuert die Schriftartaliasingmethode in der Workbench.\n- default: Subpixel-Schriftartglättung. Auf den meisten Nicht-Retina-Displays wird Text bei dieser Einstellung am schärfsten dargestellt.\n- antialiased: Glättet die Schriftart auf der Pixelebene (im Gegensatz zur Subpixelebene). Bei dieser Einstellung kann die Schriftart insgesamt heller wirken.\n- none: Deaktiviert die Schriftartglättung. Text wird mit gezackten scharfen Kanten dargestellt.\n",
-+	"workbench.fontAliasing.default": "Subpixel-Schriftartglättung. Auf den meisten Nicht-Retina-Displays wird Text bei dieser Einstellung am schärfsten dargestellt.",
-+	"workbench.fontAliasing.antialiased": "Glättet die Schriftart auf der Pixelebene (im Gegensatz zur Subpixelebene). Bei dieser Einstellung kann die Schriftart insgesamt heller wirken.",
-+	"workbench.fontAliasing.none": "Deaktiviert die Schriftartglättung. Text wird mit gezackten scharfen Kanten dargestellt.",
-+>>>>>>> .their
- 	"enableNaturalLanguageSettingsSearch": "Steuert, ob der Suchmodus mit natürlicher Sprache für die Einstellungen aktiviert werden soll.",
- 	"windowConfigurationTitle": "Fenster",
- 	"window.openFilesInNewWindow.on": "Dateien werden in einem neuen Fenster geöffnet.",
-changed in both
-  base   100644 dac54eb81af521a636bd69231e013783a6901dbf i18n/deu/src/vs/workbench/electron-browser/window.i18n.json
-  our    100644 4c4d3d858c118a5c816610f7b78e3f49ca6d0d66 i18n/deu/src/vs/workbench/electron-browser/window.i18n.json
-  their  100644 ea9b198df1d9f06916293a2e80b74806176a900e i18n/deu/src/vs/workbench/electron-browser/window.i18n.json
-changed in both
-  base   100644 e3b17702d867e09ffd60ef890b7f3269e684a5b9 i18n/deu/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
-  our    100644 8ec09261787690fad6c9e403fa27279193845448 i18n/deu/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
-  their  100644 adbe0beedd641f0a86e8a0398fcf959d19dbd85c i18n/deu/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"debugToolBarBackground": "Hintergrundfarbe der Debug-Symbolleiste.",
- 	"debugToolBarBorder": "Rahmenfarbe der Debug-Symbolleiste."
- }
-\ No newline at end of file
-changed in both
-  base   100644 3352485c42bc53f3de895daab547f0617fd3fdee i18n/deu/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  our    100644 6d4ddb2489811e2ef60298e7cf30a51a4d1d0b3f i18n/deu/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  their  100644 23af77e5fa7953dba64babcbb70111ced4c4a8e8 i18n/deu/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"debug.terminal.title": "Zu debuggende Komponente"
- }
-\ No newline at end of file
-changed in both
-  base   100644 0b10a0310640832c8a3915fac3d07fdb8efec6d2 i18n/deu/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  our    100644 ffcb91c35c3b84aa761f9cf48403d04cda0e5ae4 i18n/deu/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  their  100644 6e06fdbca612b0de6995f15ee04f685e2b977289 i18n/deu/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-changed in both
-  base   100644 9cde3634e7645260427694be43e17b2a038481a7 i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 5272d4afb1fdf32991cbacee03058c69d41ba9c7 i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 5da27da0751687f8c169b73268fead0283e1498f i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,11 @@
- 	"exeBasedRecommendation": "Diese Erweiterung wird empfohlen, da Sie {0} installiert haben.",
- 	"fileBasedRecommendation": "Ausgehend von den kürzlich geöffneten Dateien wird diese Erweiterung empfohlen.",
- 	"workspaceRecommendation": "Diese Erweiterung wird von Benutzern des aktuellen Arbeitsbereichs empfohlen.",
-+=======
-+	"workspaceRecommendation": "Diese Erweiterung wird von Benutzern des aktuellen Arbeitsbereichs empfohlen.",
-+	"fileBasedRecommendation": "Ausgehend von den kürzlich geöffneten Dateien wird diese Erweiterung empfohlen.",
-+	"exeBasedRecommendation": "Diese Erweiterung wird empfohlen, da Sie {0} installiert haben.",
-+>>>>>>> .their
- 	"reallyRecommended2": "Für diesen Dateityp wird die Erweiterung \"{0}\" empfohlen.",
- 	"reallyRecommendedExtensionPack": "Für diesen Dateityp wird das Erweiterungspaket \"{0}\" empfohlen.",
- 	"install": "Installieren",
-added in both
-  our    100644 9164d64820a6b949c16fe909991fa91b471f16c6 i18n/deu/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-  their  100644 b9d7e353c742f68c29783490f94e117bd8aca160 i18n/deu/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,13 @@
- 	],
- 	"workbenchConfigurationTitle": "Workbench",
- 	"feedbackVisibility": "Steuert die Sichtbarkeit des Twitter-Feedbacks (Smiley) in der Statusleiste am unteren Rand der Workbench."
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"workbenchConfigurationTitle": "Workbench"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 c4df282604643006e40a305e7c2305b303345b91 i18n/deu/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/deu/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"hide": "Ausblenden"
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 46de1e8541a805d4182b71abb75b9857226854c4 i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  our    100644 da62e80408d3ad02f6eb7c71f4a32236b4605b89 i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  their  100644 e8abcac28b77d4c425e180d1a4f6d7746a9cf392 i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-@@ -12,7 +12,10 @@
- 	"revertLocalChanges": "Änderungen verwerfen und Datenträgerinhalte wiederherstellen",
- 	"copyPathOfActive": "Pfad der aktiven Datei kopieren",
- 	"saveAllInGroup": "Alle in der Gruppe speichern",
-+<<<<<<< .our
- 	"saveFiles": "Alle Dateien speichern",
-+=======
-+>>>>>>> .their
- 	"revert": "Datei wiederherstellen",
- 	"compareActiveWithSaved": "Aktive Datei mit gespeicherter Datei vergleichen",
- 	"closeEditor": "Editor schließen",
-@@ -24,12 +27,19 @@
- 	"copyPath": "Pfad kopieren",
- 	"saveAll": "Alle speichern",
- 	"compareWithSaved": "Mit gespeicherter Datei vergleichen",
-+<<<<<<< .our
- 	"compareWithSelected": "Mit Auswahl vergleichen",
- 	"compareSource": "Für Vergleich auswählen",
- 	"compareSelected": "Auswahl vergleichen",
- 	"close": "Schließen",
- 	"closeOthers": "Andere schließen",
- 	"closeSaved": "Gespeicherte schließen",
-+=======
-+	"compareSource": "Für Vergleich auswählen",
-+	"close": "Schließen",
-+	"closeOthers": "Andere schließen",
-+	"closeUnmodified": "Nicht geänderte schließen",
-+>>>>>>> .their
- 	"closeAll": "Alle schließen",
- 	"deleteFile": "Endgültig löschen"
- }
-\ No newline at end of file
-changed in both
-  base   100644 4d300a15634e7f7f35e201fb8aa4decb601ebc72 i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 e5540f790640626d6989cde6c94da0327b708bbf i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 3e34e541dce56ab693f943bad8ae77844041321d i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"newFile": "Neue Datei",
- 	"newFolder": "Neuer Ordner",
- 	"rename": "Umbenennen",
-@@ -13,7 +16,11 @@
- 	"copyFile": "Kopieren",
- 	"pasteFile": "Einfügen",
- 	"retry": "Wiederholen",
-+<<<<<<< .our
- 	"renameWhenSourcePathIsParentOfTargetError": "Verwenden Sie den Befehl \"Neuer Ordner\" oder \"Neue Datei\", um untergeordnete Elemente zu einem vorhandenen Ordner hinzuzufügen",
-+=======
-+	"openFolderFirst": "Öffnet zuerst einen Ordner, in dem Dateien oder Ordner erstellt werden.",
-+>>>>>>> .their
- 	"newUntitledFile": "Neue unbenannte Datei",
- 	"createNewFile": "Neue Datei",
- 	"createNewFolder": "Neuer Ordner",
-@@ -43,11 +50,19 @@
- 	"confirmDeleteMessageMultiple": "Möchten Sie die folgenden {0} Dateien endgültig löschen?",
- 	"confirmDeleteMessageFolder": "Möchten Sie \"{0}\" samt Inhalt wirklich endgültig löschen?",
- 	"confirmDeleteMessageFile": "Möchten Sie \"{0}\" wirklich endgültig löschen?",
-+<<<<<<< .our
- 	"addFiles": "Dateien hinzufügen",
- 	"confirmOverwrite": "Im Zielordner ist bereits eine Datei oder ein Ordner mit dem gleichen Namen vorhanden. Möchten Sie sie bzw. ihn ersetzen?",
- 	"replaceButtonLabel": "&&Ersetzen",
- 	"fileIsAncestor": "Die einzufügende Datei ist ein Vorgänger des Zielordners",
- 	"fileDeleted": "Die einzufügende Datei wurde zwischenzeitlich gelöscht oder verschoben.",
-+=======
-+	"irreversible": "Diese Aktion kann nicht rückgängig gemacht werden.",
-+	"permDelete": "Endgültig löschen",
-+	"importFiles": "Dateien importieren",
-+	"confirmOverwrite": "Im Zielordner ist bereits eine Datei oder ein Ordner mit dem gleichen Namen vorhanden. Möchten Sie sie bzw. ihn ersetzen?",
-+	"replaceButtonLabel": "&&Ersetzen",
-+>>>>>>> .their
- 	"duplicateFile": "Duplikat",
- 	"globalCompareFile": "Aktive Datei vergleichen mit...",
- 	"openFileToCompare": "Zuerst eine Datei öffnen, um diese mit einer anderen Datei zu vergleichen",
-changed in both
-  base   100644 c248ffc568212a8ea0830b0b61cb393bcaab50e5 i18n/deu/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  our    100644 129fede53cc56e72cfb3d746b13864af45afebad i18n/deu/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  their  100644 216d652c91acca8c87253a5845c6f83f9343fa7a i18n/deu/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,12 +7,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"revealInWindows": "Im Explorer anzeigen",
- 	"revealInMac": "Im Finder anzeigen",
- 	"openContainer": "Enthaltenden Ordner öffnen",
- 	"saveAs": "Speichern unter...",
- 	"save": "Speichern",
- 	"saveAll": "Alle speichern",
-+<<<<<<< .our
-+=======
-+	"saveFiles": "Alle Dateien speichern",
-+>>>>>>> .their
- 	"removeFolderFromWorkspace": "Ordner aus dem Arbeitsbereich entfernen",
- 	"genericRevertError": "Fehler beim Zurücksetzen von '{0}': {1}",
- 	"modifiedLabel": "{0} (auf Datenträger) ↔ {1}",
-changed in both
-  base   100644 00a2164ceaa6feb9c7573ae407355c84d09fbc3c i18n/deu/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 99f2be77fbb56221d4c3c1cc8f45e6884be7fd7a i18n/deu/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 2ddf50e3ffccf3b546c44b4c3b88f8f6cb9d54df i18n/deu/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-@@ -40,7 +40,10 @@
- 	"formatOnSave": "Hiermit wird eine Datei beim Speichern formatiert. Es muss ein Formatierer vorhanden sein, die Datei darf nicht automatisch gespeichert werden, und der Editor darf nicht geschlossen werden.",
- 	"formatOnSaveTimeout": "Zeitüberschreitung beim Formatieren während des Speicherns. Legt eine Zeitbegrenzung in Millisekunden für formatOnSave-Befehle fest. Befehle, die länger dauern als die festgelegte Zeitüberschreitung, werden abgebrochen. ",
- 	"explorerConfigurationTitle": "Datei-Explorer",
-+<<<<<<< .our
- 	"openEditorsVisible": "Die Anzahl der Editoren, die im Bereich \"Geöffnete Editoren\" angezeigt werden.",
-+=======
-+>>>>>>> .their
- 	"autoReveal": "Steuert, ob der Explorer Dateien beim Öffnen automatisch anzeigen und auswählen soll.",
- 	"enableDragAndDrop": "Steuert, ob der Explorer das Verschieben von Dateien und Ordnern mithilfe von Drag  Drop zulassen soll.",
- 	"confirmDragAndDrop": "Steuert, ob der Explorer um Bestätigung bittet, um Dateien und Ordner per Drag & Drop zu verschieben.",
-changed in both
-  base   100644 55ed6344bee5a16153879a922530a6ec8eac9933 i18n/deu/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  our    100644 fa18bc6bf78042dea5f4d857217818cf336d6a91 i18n/deu/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  their  100644 25a34e50d398b34c9becb4982c1bce6d481e51a1 i18n/deu/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,12 @@
- 	],
- 	"userGuide": "Verwenden Sie die Aktionen in der Editor-Symbolleiste, um Ihre Änderungen rückgängig zu machen oder den Inhalt auf dem Datenträger mit Ihren Änderungen zu überschreiben.",
- 	"staleSaveError": "Fehler beim Speichern von \"{0}\": Der Inhalt auf dem Datenträger ist neuer. Vergleichen Sie Ihre Version mit der Version auf dem Datenträger.",
-+=======
-+	"userGuide": "Verwenden Sie die Aktionen auf der Editor-Symbolleiste auf der rechten Seite, um Ihre Änderungen **rückgängig zu machen** oder den Inhalt auf dem Datenträger mit Ihren Änderungen zu **überschreiben**.",
-+	"overwriteElevated": "Als Admin überschreiben...",
-+	"saveElevated": "Als Admin wiederholen...",
-+	"overwrite": "Überschreiben",
-+>>>>>>> .their
- 	"retry": "Wiederholen",
- 	"discard": "Verwerfen",
- 	"readonlySaveErrorAdmin": "Fehler beim Speichern von '{0}': Datei ist schreibgeschützt. 'Als Admin überschreiben' auswählen, um den Vorgang als Administrator zu wiederholen. ",
-changed in both
-  base   100644 a5003c845394b5745e0956c505a3677728728e20 i18n/deu/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  our    100644 518f83fa0bd4f8b0e33a01da12419f514179482f i18n/deu/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  their  100644 41368e44e5a42bdebd82602e8236861631b461c2 i18n/deu/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-added in both
-  our    100644 2d9f1d89efacb8c3aefeaa7692f2b0216d3be115 i18n/deu/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-  their  100644 9ef6f12276ae7e638cc215bba851e294670b96a7 i18n/deu/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,5 +11,13 @@
- 	"sharedLog": "Protokoll (freigegeben)",
- 	"rendererLog": "Protokoll (Fenster)",
- 	"extensionsLog": "Protokoll (Erweiterungshost)",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"developer": "Entwickler"
- }
-\ No newline at end of file
-added in both
-  our    100644 0b0f4d7c9c60baa558aea30524b31e8a72e10f84 i18n/deu/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  their  100644 2a19c259b0dcc5cb6a2b7ef3223d82dae1f7c02e i18n/deu/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -17,14 +18,31 @@
- 	"openLogFile": "Protokolldatei öffnen …",
- 	"setLogLevel": "Protokollstufe festlegen…",
- 	"trace": "Nachverfolgen",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"openLogsFolder": "Protokollordner öffnen",
-+	"showLogs": "Protokolle anzeigen...",
-+	"rendererProcess": "Fenster",
-+	"extensionHost": "Erweiterungshost",
-+	"setLogLevel": "Protokollstufe festlegen",
-+>>>>>>> .their
- 	"debug": "Debuggen",
- 	"info": "Info",
- 	"warn": "Warnung",
- 	"err": "Fehler",
- 	"critical": "Kritisch",
- 	"off": "Aus",
-+<<<<<<< .our
- 	"selectLogLevel": "Protokollstufe auswählen",
- 	"default and current": "Standard und aktuell",
- 	"default": "Standard",
- 	"current": "Aktuell"
-+=======
-+	"selectLogLevel": "Protokollstufe auswählen"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f9df98f6f178305e236dc1b54073ea78a66afc75 i18n/deu/src/vs/workbench/parts/markers/common/messages.i18n.json
-  our    100644 08feefc0086392fcd6f986e3c1116e070a102b03 i18n/deu/src/vs/workbench/parts/markers/common/messages.i18n.json
-  their  100644 4fe33d4fdf687cd10b21d61dd8ae6de3a0895e46 i18n/deu/src/vs/workbench/parts/markers/common/messages.i18n.json
-@@ -7,8 +7,11 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"viewCategory": "Anzeigen",
-+<<<<<<< .our
- 	"problems.view.toggle.label": "Probleme umschalten (Fehler, Warnungen, Informationen)",
- 	"problems.view.focus.label": "Probleme fokussieren (Fehler, Warnungen, Informationen)",
-+=======
-+>>>>>>> .their
- 	"problems.panel.configuration.title": "Ansicht \"Probleme\"",
- 	"problems.panel.configuration.autoreveal": "Steuert, ob die Ansicht \"Probleme\" automatisch Dateien anzeigen sollte, wenn diese geöffnet werden.",
- 	"markers.panel.title.problems": "Probleme",
-added in both
-  our    100644 900a7f7ac3b7b4eec58da0278aaf74958ffe4b28 i18n/deu/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-  their  100644 a49f4a37242fa9082d3846d1e50fe8c1fe7db741 i18n/deu/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -11,4 +12,15 @@
- 	"viewCategory": "Anzeigen",
- 	"clearOutput.label": "Ausgabe löschen",
- 	"openActiveLogOutputFile": "Ansicht: Aktive Protokollausgabedatei öffnen"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"output": "Ausgabe",
-+	"viewCategory": "Anzeigen",
-+	"clearOutput.label": "Ausgabe löschen"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 69740f1779c65b50c80daa9cad3a7d57a25e9024 i18n/deu/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-  their  100644 95b7cc617b7765b9506eb33296b2cf8adb8f6c74 i18n/deu/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"output": "{0} - Ausgabe",
- 	"channel": "Ausgabekanal für '{0}'"
- }
-\ No newline at end of file
-changed in both
-  base   100644 26e5d28d6589aaf879b25cc42b85d9ccbad216ea i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 cfd3784b25185836bda1d8d6784b3e81792155f0 i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 fb9b2bd366ab4e8cc3462f0d9da92849435a18ac i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"defaultSettings": "Platzieren Sie Ihre Einstellungen zum Überschreiben im Editor auf der rechten Seite.",
- 	"noSettingsFound": "Keine Einstellungen gefunden.",
- 	"settingsSwitcherBarAriaLabel": "Einstellungsumschaltung",
-changed in both
-  base   100644 74ffcdff9a140bf095b6da331c25c6511a62896c i18n/deu/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  our    100644 db93b66f34fda877ff44d1ba11f1c28d8148660f i18n/deu/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  their  100644 f93cea2858c08890f1fed79d7457f04649df8add i18n/deu/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-changed in both
-  base   100644 f5e2daabe29a2847d5e10cf5c6436432dd248846 i18n/deu/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  our    100644 fef34355ad78a01fbe48c872905d3bee3d212c27 i18n/deu/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  their  100644 2ca5c08b0a999e2311929e4b18e8080d37de41a4 i18n/deu/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"view": "Anzeigen",
- 	"commandsHandlerDescriptionDefault": "Befehle anzeigen und ausführen",
- 	"gotoLineDescriptionMac": "Gehe zu Zeile",
-changed in both
-  base   100644 cfb59dde79057dfcf687c79f87274defaa585187 i18n/deu/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  our    100644 eb263d7ae8b832d5edd4a36de00889ae94057caa i18n/deu/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  their  100644 114466fcfbfe869b6454b253a7718316e1f1bad5 i18n/deu/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-@@ -12,6 +12,10 @@
- 	"view": "Anzeigen",
- 	"scmConfigurationTitle": "SCM",
- 	"alwaysShowProviders": "Ob der Quellcodeverwaltungsanbieter-Abschnitt immer angezeigt wird.",
-+<<<<<<< .our
- 	"diffDecorations": "Steuert die Diff-Dekorationen im Editor.",
- 	"diffGutterWidth": "Steuert die Breite (px) der Diff-Dekorationen in der Liste (hinzugefügt und verändert)."
-+=======
-+	"inputCounter": "Steuert die Anzeige des Eingabezählers."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6119d2359c65eea80efd0aaf02b621b2d0b0f537 i18n/deu/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  our    100644 c287ce1399d3a4cbf5ee2cf49ae6344e62eac3a2 i18n/deu/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  their  100644 faa904ce1ab1b4ccfc2dcda5fd2075e7c37c30fa i18n/deu/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-@@ -8,6 +8,8 @@
- 	],
- 	"scm providers": "Quellcodeanbieter",
- 	"hideRepository": "Ausblenden",
-+	"commitMessageInfo": "{0} Zeichen in aktueller Zeile",
-+	"commitMessageCountdown": "{0} Zeichen in der aktuellen Zeile verbleibend",
- 	"installAdditionalSCMProviders": "Installiere weiter SCM Provider...",
- 	"no open repo": "Es gibt keine aktiven Quellcodeanbieter.",
- 	"source control": "Quellcodeverwaltung",
-changed in both
-  base   100644 f4671bfc3a89be1507a7ce128ab11235dd9744b9 i18n/deu/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 1dcdaff92772bd253ab87cb0ce46920ce5c5e6bc i18n/deu/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 365328f012662c857cadba948e8ee08c958eb6c6 i18n/deu/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-changed in both
-  base   100644 a765a1ac06fcdb16377300be0c54f9d277dca20d i18n/deu/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 24b953a60a63d0739209f04cdbf2997fcdde9b37 i18n/deu/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 e32b687f050c5ce762822614d0296709eae61321 i18n/deu/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,11 +13,18 @@
- 	"copyAllLabel": "Alles kopieren",
- 	"clearSearchHistoryLabel": "Suchverlauf löschen",
- 	"toggleSearchViewPositionLabel": "Position der Suchansicht umschalten",
-+=======
-+>>>>>>> .their
- 	"findInFolder": "In Ordner suchen...",
- 	"findInWorkspace": "In Arbeitsbereich suchen...",
- 	"showTriggerActions": "Zu Symbol im Arbeitsbereich wechseln...",
- 	"name": "Suchen",
-+<<<<<<< .our
- 	"showSearchViewl": "Suche anzeigen",
-+=======
-+	"search": "Suchen",
-+	"showSearchViewlet": "Suche anzeigen",
-+>>>>>>> .their
- 	"view": "Anzeigen",
- 	"findInFiles": "In Dateien suchen",
- 	"openAnythingHandlerDescription": "Zu Datei wechseln",
-added in both
-  our    100644 e92da46ec508ef7cccb1d0ab9d66d2cf76d05f91 i18n/deu/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-  their  100644 fa89fddbd1a3487aaf37aa27fe72098ace6e5156 i18n/deu/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -13,5 +14,14 @@
- 	"new.global.sep": "Neue Codeausschnitte",
- 	"openSnippet.pickLanguage": "Codeausschnittsdatei auswählen oder Codeausschnitte erstellen",
- 	"openSnippet.label": "Benutzercodeausschnitte konfigurieren",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"global.1": "({0})",
-+>>>>>>> .their
- 	"preferences": "Einstellungen"
- }
-\ No newline at end of file
-changed in both
-  base   100644 7a1c949566eddcfcdec1a0a0da414045e7aa1db7 i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  our    100644 a09996ad1397a284296d725c6ca90498d1c125e2 i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  their  100644 6d4c86fa94fef1e983f1d2af3fefb46c8dd84bf3 i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"snippetSchema.json.default": "Leerer Codeausschnitt",
- 	"snippetSchema.json": "Benutzerkonfiguration des Codeausschnitts",
- 	"snippetSchema.json.prefix": "Das Präfix, das beim Auswählen des Codeausschnitts in IntelliSense verwendet werden soll.",
-added in both
-  our    100644 ddf2fdf01abb8305fb6c689e6a2d14fbad5ba7ab i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-  their  100644 3daae2bbcbd6a14c122b93647c7f94af9ccd6b8e i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,5 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"source.snippetGlobal": "Globaler Benutzercodeausschnitt",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"source.snippet": "Benutzercodeausschnitt"
- }
-\ No newline at end of file
-changed in both
-  base   100644 e67d5f89a93412d3a93540146db0afb274b86bc9 i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  our    100644 da21c5deaa2fffc31211d74e9a379224211f67e5 i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 f989f6698dcbf373b390346e52b04592369347ab i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,9 @@
- 	],
- 	"invalid.path.0": "Expected string in `contributes.{0}.path`. Provided value: {1}",
- 	"invalid.language.0": "Beim Auslassen der Sprache muss der Wert von \"contributes.{0}.path\" eine \".code-snippets\"-Datei sein. Angegebener Wert: {1}",
-+=======
-+	"invalid.path.0": "Expected string in `contributes.{0}.path`. Provided value: {1}",
-+>>>>>>> .their
- 	"invalid.language": "Unbekannte Sprache in \"contributes.{0}.language\". Bereitgestellter Wert: {1}",
- 	"invalid.path.1": "Es wurde erwartet, dass \"contributes.{0}.path\" ({1}) im Ordner ({2}) der Erweiterung enthalten ist. Dies führt ggf. dazu, dass die Erweiterung nicht portierbar ist.",
- 	"vscode.extension.contributes.snippets": "Trägt Codeausschnitte bei.",
-changed in both
-  base   100644 bc6dee18ad00b1f89b8fe4ba9ffad8ea4e5ec37c i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 e7e17f13a867ab30a0455dba8cfbc4967b92e2a0 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 e6464f3ff186da5f0d84d4c60d6e3133d8ca7ad3 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -15,7 +15,11 @@
- 	"terminal.integrated.shellArgs.osx": "Die Befehlszeilenargumente, die für das OS X-Terminal verwendet werden sollen.",
- 	"terminal.integrated.shell.windows": "Der Pfad der Shell, den das Terminal unter Windows verwendet, wenn in Windows enthaltene Terminals verwendet werden  (cmd, PowerShell oder Bash unter Ubuntu).",
- 	"terminal.integrated.shellArgs.windows": "Die Befehlszeilenargumente, die im Windows-Terminal verwendet werden sollen.",
-+<<<<<<< .our
- 	"terminal.integrated.macOptionIsMeta": "Optionsschlüssel als Metaschlüssel im Terminal auf macOS behandeln.",
-+=======
-+	"terminal.integrated.rightClickCopyPaste": "Wenn dies festgelegt ist, erscheint das Kontextmenü bei einem Rechtsklick im Terminal nicht mehr. Stattdessen erfolgen die Vorgänge Kopieren, wenn eine Auswahl vorgenommen wurde, sowie Einfügen, wenn keine Auswahl vorgenommen wurde.",
-+>>>>>>> .their
- 	"terminal.integrated.copyOnSelection": "Wenn gesetzt, wird der im Terminal ausgewählte Text in die Zwischenablage kopiert.",
- 	"terminal.integrated.fontFamily": "Steuert die Schriftartfamilie des Terminals. Der Standardwert ist \"editor.fontFamily\".",
- 	"terminal.integrated.fontSize": "Steuert den Schriftgrad des Terminals in Pixeln.",
-changed in both
-  base   100644 93a8b04286a39968cd485c4529ed5308424eaf80 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 17f468b874b715481031f72251583765b50e478f i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 edacb0183b5a58060e129f5d8181ab9017549fb4 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -20,6 +20,7 @@
- 	"workbench.action.terminal.new.short": "Neues Terminal",
- 	"workbench.action.terminal.newWorkspacePlaceholder": "Aktuelles Arbeitsverzeichnis für neues Terminal auswählen",
- 	"workbench.action.terminal.newInActiveWorkspace": "Neues integriertes Terminal erstellen (in aktivem Arbeitsbereich)",
-+<<<<<<< .our
- 	"workbench.action.terminal.split": "Terminal verdoppeln",
- 	"workbench.action.terminal.splitInActiveWorkspace": "Terminal teilen (in aktivem Arbeitsbereich)",
- 	"workbench.action.terminal.focusPreviousPane": "Fokus in vorherigem Bereich",
-@@ -28,6 +29,8 @@
- 	"workbench.action.terminal.resizePaneRight": "Größe des rechten Bereichs ändern",
- 	"workbench.action.terminal.resizePaneUp": "Größe des oberen Bereichs ändern",
- 	"workbench.action.terminal.resizePaneDown": "Größe des unteren Bereichs ändern",
-+=======
-+>>>>>>> .their
- 	"workbench.action.terminal.focus": "Fokus im Terminal",
- 	"workbench.action.terminal.focusNext": "Fokus im nächsten Terminal",
- 	"workbench.action.terminal.focusPrevious": "Fokus im vorherigen Terminal",
-changed in both
-  base   100644 76d17079ae8593f6abcc2da12d7db4ec963105fb i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 84fc7fe0d67567c48c4b669c0d3d08c7386267cc i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 35f0add77c1465e033a1bf3882249064d9d9dfe6 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -10,7 +10,11 @@
- 	"terminal.foreground": "Die Vordergrundfarbe des Terminal.",
- 	"terminalCursor.foreground": "Die Vordergrundfarbe des Terminalcursors.",
- 	"terminalCursor.background": "Die Hintergrundfarbe des Terminalcursors. Ermöglicht das Anpassen der Farbe eines Zeichens, das von einem Blockcursor überdeckt wird.",
-+<<<<<<< .our
- 	"terminal.selectionBackground": "Die Auswahlvordergrundfarbe des Terminals.",
- 	"terminal.border": "Die Farbe des Rahmens, der Bereiche innerhalb des Terminals teilt. Der Standardwert ist panel.border.",
- 	"terminal.ansiColor": "\"{0}\" ANSI-Farbe im Terminal"
-+=======
-+	"terminal.selectionBackground": "Die Auswahlvordergrundfarbe des Terminals."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ac6f1dfc78c798a7231e5d0622a55069b6a4d6ba i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  our    100644 19d7340468676889919217f01b6462b1b0b9da96 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  their  100644 a768c43ba81e34675a5bb2d9f0924b7ba79831fe i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-@@ -8,7 +8,11 @@
- 	],
- 	"terminal.integrated.chooseWindowsShellInfo": "Sie können die Standardterminalshell über die Schaltfläche \"Anpassen\" ändern.",
- 	"customize": "Anpassen",
-+<<<<<<< .our
- 	"never again": "Nicht mehr anzeigen",
-+=======
-+	"cancel": "Abbrechen",
-+>>>>>>> .their
- 	"terminal.integrated.chooseWindowsShell": "Wählen Sie Ihre bevorzugte Terminalshell. Sie können diese später in Ihren Einstellungen ändern.",
- 	"terminalService.terminalCloseConfirmationSingular": "Eine aktive Terminalsitzung ist vorhanden. Möchten Sie sie beenden?",
- 	"terminalService.terminalCloseConfirmationPlural": "{0} aktive Terminalsitzungen sind vorhanden. Möchten Sie sie beenden?"
-changed in both
-  base   100644 7c24ef226ba5ac868abd398b492b1ed58f0fc93a i18n/deu/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 dca9f59735754d2304f7bca4be1c8c6b2470923f i18n/deu/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 58c22d0ae125e2befe42a186bcf8ba17274f989c i18n/deu/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -9,9 +9,17 @@
- 	"releaseNotes": "Anmerkungen zu dieser Version",
- 	"showReleaseNotes": "Anmerkungen zu dieser Version anzeigen",
- 	"read the release notes": "Willkommen bei {0} v{1}! Möchten Sie die Hinweise zu dieser Version lesen?",
-+<<<<<<< .our
- 	"licenseChanged": "Unsere Lizenzbedingungen haben sich geändert. Bitte klicken Sie [hier]({0}), um die neuen Bedingungen zu lesen.",
- 	"neveragain": "Nicht mehr anzeigen",
- 	"64bitisavailable": "{0} für 64-Bit-Windows ist jetzt verfügbar! Klicken Sie [hier]({1}), um mehr zu erfahren.",
-+=======
-+	"licenseChanged": "Unsere Lizenzbedingungen haben sich geändert. Bitte lesen Sie die neuen Bedingungen.",
-+	"license": "Lizenz lesen",
-+	"neveragain": "Nicht mehr anzeigen",
-+	"64bitisavailable": "{0} für 64-Bit-Windows ist jetzt verfügbar!",
-+	"learn more": "Weitere Informationen",
-+>>>>>>> .their
- 	"updateIsReady": "Neues {0}-Update verfügbar.",
- 	"noUpdatesAvailable": "Zurzeit sind keine Updates verfügbar.",
- 	"ok": "OK",
-@@ -26,7 +34,10 @@
- 	"commandPalette": "Befehlspalette...",
- 	"settings": "Einstellungen",
- 	"keyboardShortcuts": "Tastenkombinationen",
-+<<<<<<< .our
- 	"showExtensions": "Erweiterungen verwalten",
-+=======
-+>>>>>>> .their
- 	"userSnippets": "Benutzercodeausschnitte",
- 	"selectTheme.label": "Farbdesign",
- 	"themes.selectIconTheme.label": "Dateisymboldesign",
-changed in both
-  base   100644 ed6cda9de2ae565cc8d095e31765b9afd114f185 i18n/deu/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  our    100644 f971f5bb684d0a7cf682d2a34acf06f1a81459bf i18n/deu/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  their  100644 bf366f305f3783e9e4e4f44ff815fba145df9513 i18n/deu/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,4 +14,9 @@
- 	"fileBinaryError": "Die Datei scheint eine Binärdatei zu sein und kann nicht als Text geöffnet werden.",
- 	"err.create": "Fehler beim Erstellen der Datei {0}.",
- 	"fileMoveConflict": "Verschieben/Kopieren kann nicht ausgeführt werden. Die Datei ist am Ziel bereits vorhanden."
-+=======
-+	"fileIsDirectoryError": "Die Datei ist ein Verzeichnis",
-+	"fileNotModifiedError": "Datei nicht geändert seit",
-+	"fileBinaryError": "Die Datei scheint eine Binärdatei zu sein und kann nicht als Text geöffnet werden."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c16b29bce92f30aeeaaaa9315f1ffa4b1c765f5c i18n/deu/src/vs/workbench/services/files/node/fileService.i18n.json
-  our    100644 a2229be0ceef3b429bbc28d1dcb6e2f94145d317 i18n/deu/src/vs/workbench/services/files/node/fileService.i18n.json
-  their  100644 7f863867abd9e59252ef40c066eee7f240011dc3 i18n/deu/src/vs/workbench/services/files/node/fileService.i18n.json
-changed in both
-  base   100644 32304e03cea139fe4f815f9abc553bd82baea500 i18n/deu/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
-  our    100644 a6064ca5ef859e51cac23754703b911bd531d048 i18n/deu/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
-  their  100644 2fb3a8af23778ba84e2a9dba9cf542f6a0a3d610 i18n/deu/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
-changed in both
-  base   100644 1e2d38883dcb78e06179e762b9e7dcdc090c5f19 i18n/deu/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  our    100644 829895898c41ae2ef8b39b082fa121dd8657445a i18n/deu/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  their  100644 f953949ef0045c9eaf82d2e5f7fcab58099b6e01 i18n/deu/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-changed in both
-  base   100644 7d1b7fccbe0dedb57b7188cd1356022c591dfb91 i18n/deu/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 66c124a9d5a7fdc4a4f5dd03bfbddf459d3761cb i18n/deu/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 957e24486647e6e8b2f818469a0721403477d4e8 i18n/deu/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-changed in both
-  base   100644 67d01f0f0d412e9d74ae8f7651ba59886dd37e70 i18n/deu/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  our    100644 e86a18877a777946dc953d1135a4123abedf75f6 i18n/deu/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  their  100644 ded36282a855ba131e6e99c7e7d8dbcdfd0c14cc i18n/deu/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-@@ -8,5 +8,10 @@
- 	],
- 	"errorInvalidTaskConfiguration": "In die Konfigurationsdatei des Arbeitsbereichs kann nicht geschrieben werden. Öffnen Sie die Datei, um Fehler/Warnungen darin zu beheben, und versuchen Sie es noch mal.",
- 	"errorWorkspaceConfigurationFileDirty": "In die Konfigurationsdatei des Arbeitsbereichs kann nicht geschrieben werden, weil sie geändert wurde. Speichern Sie die Datei, und versuchen Sie es noch mal.",
-+<<<<<<< .our
- 	"openWorkspaceConfigurationFile": "Konfiguration des Arbeitsbereichs öffnen"
-+=======
-+	"openWorkspaceConfigurationFile": "Konfigurationsdatei des Arbeitsbereichs öffnen",
-+	"close": "Schließen"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 270030fe345b04bff448196f870ea4ed68a49ebe i18n/esn/extensions/git/out/autofetch.i18n.json
-  our    100644 8ad760617c8d7633e49b3f5d82115f7d1966094c i18n/esn/extensions/git/out/autofetch.i18n.json
-  their  100644 98972c6f0a2502caebde3d6a369d80adc01d9aa3 i18n/esn/extensions/git/out/autofetch.i18n.json
-@@ -7,7 +7,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"yes": "Sí",
-+<<<<<<< .our
- 	"no": "No",
- 	"not now": "Preguntarme luego",
- 	"suggest auto fetch": "¿Te gustaría que Code [ejecute 'git fetch' periódicamente]({0})?"
-+=======
-+	"read more": "Leer más",
-+	"no": "No"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 2258e1755477bba20f2a5fd41776e6156ae11b1e i18n/esn/extensions/git/out/commands.i18n.json
-  our    100644 022bf20d57e92a28a5ced5a2d0998bc8b0dfe335 i18n/esn/extensions/git/out/commands.i18n.json
-  their  100644 3be82274dd3b757250f3321733622a4e51ee045e i18n/esn/extensions/git/out/commands.i18n.json
-@@ -71,12 +71,19 @@
- 	"pick remote pull repo": "Seleccione un origen remoto desde el que extraer la rama",
- 	"no remotes to push": "El repositorio no tiene remotos configurados en los que insertar.",
- 	"nobranch": "Extraiga del repositorio una rama para insertar un remoto.",
-+<<<<<<< .our
- 	"confirm publish branch": "La rama ' {0} ' no tiene ninguna rama ascendente. ¿desea publicar esta rama?",
- 	"ok": "Aceptar",
- 	"push with tags success": "Insertado con etiquetas correctamente.",
- 	"pick remote": "Seleccionar un elemento remoto para publicar la rama '{0}':",
- 	"sync is unpredictable": "Esta acción insertará e incorporará cambios en y desde '{0}/{1}'.",
- 	"never again": "No volver a mostrar ",
-+=======
-+	"ok": "Aceptar",
-+	"push with tags success": "Insertado con etiquetas correctamente.",
-+	"pick remote": "Seleccionar un elemento remoto para publicar la rama '{0}':",
-+	"sync is unpredictable": "Esta acción insertará y extraerá confirmaciones en '{0}'.",
-+>>>>>>> .their
- 	"no remotes to publish": "El repositorio no tiene remotos configurados en los que publicar.",
- 	"no changes stash": "No existen cambios para el guardado provisional.",
- 	"provide stash message": "Opcionalmente, proporcionar un mensaje para el guardado provisional",
-added in both
-  our    100644 0406f029ae527b55c40f2e37e24799d52680f037 i18n/esn/extensions/typescript/out/commands.i18n.json
-  their  100644 cfccf2b7bf9ea2e62c6ca391df975cc13111910f i18n/esn/extensions/typescript/out/commands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -13,4 +14,20 @@
- 	"typescript.noJavaScriptProjectConfig": "El archivo no forma parte de un proyecto de JavaScript. Haga clic [aquí]({0}) para obtener más información.",
- 	"typescript.configureTsconfigQuickPick": "Configurar tsconfig.json",
- 	"typescript.configureJsconfigQuickPick": "Configurar jsconfig.json"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"typescript.projectConfigNoWorkspace": "Abra una carpeta en VS Code para usar un proyecto de TypeScript o JavaScript",
-+	"typescript.projectConfigUnsupportedFile": "No se pudo determinar el proyecto de TypeScript o JavaScript. Tipo de archivo no compatible",
-+	"typescript.projectConfigCouldNotGetInfo": "No se pudo determinar el proyecto de TypeScript o JavaScript",
-+	"typescript.noTypeScriptProjectConfig": "El archivo no forma parte de un proyecto de TypeScript",
-+	"typescript.noJavaScriptProjectConfig": "El archivo no forma parte de un proyecto de JavaScript",
-+	"typescript.configureTsconfigQuickPick": "Configurar tsconfig.json",
-+	"typescript.configureJsconfigQuickPick": "Configurar jsconfig.json",
-+	"typescript.projectConfigLearnMore": "Más información"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 750d811d866eaa3d43818bd1d8e28c9898acf514 i18n/esn/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/esn/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"selectAriaOption": "{0}"
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-added in both
-  our    100644 d646706d4418daa32fa8efee56ac8fc54b049183 i18n/esn/src/vs/base/node/ps.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/esn/src/vs/base/node/ps.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"collecting": "Recopilando información de memoria y CPU. Esto puede tardar unos segundos. "
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 582dfe7c78ff3f9e1e74ab5530c86c597d062bc6 i18n/esn/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 6ad3e3ebd5e87cf26a1b950237c8c58f3d92b674 i18n/esn/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 b156efc4162ee9527f59a38e590217f7486a08ac i18n/esn/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -16,7 +16,10 @@
- 	"lineNumbers.on": "Los números de línea se muestran como un número absoluto.",
- 	"lineNumbers.relative": "Los números de línea se muestran como distancia en líneas a la posición del cursor.",
- 	"lineNumbers.interval": "Los números de línea se muestran cada 10 líneas.",
-+<<<<<<< .our
- 	"lineNumbers": "Controla la visualización de los números de línea.",
-+=======
-+>>>>>>> .their
- 	"rulers": "Representar reglas verticales después de un cierto número de caracteres monoespacio. Usar multiples valores para multiples reglas. No se dibuja ninguna regla si la matriz esta vacía.",
- 	"wordSeparators": "Caracteres que se usarán como separadores de palabras al realizar operaciones o navegaciones relacionadas con palabras.",
- 	"tabSize": "El número de espacios a los que equivale una tabulación. Este valor se invalida según el contenido del archivo cuando `editor.detectIndentation` está activado.",
-changed in both
-  base   100644 9cd43302e16aafe48d28d96c44766e331b35b343 i18n/esn/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 e90f2798b359468ab2a777af9b7d68417b46fdb4 i18n/esn/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 e60652a0dd4b51231c6d4e1561577b89dcf74d45 i18n/esn/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -8,8 +8,11 @@
- 	],
- 	"lineHighlight": "Color de fondo para la línea resaltada en la posición del cursor.",
- 	"lineHighlightBorderBox": "Color de fondo del borde alrededor de la línea en la posición del cursor.",
-+<<<<<<< .our
- 	"rangeHighlight": "Color de fondo de los rangos resaltados, como por ejemplo las características de abrir rápidamente y encontrar. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
- 	"rangeHighlightBorder": "Color de fondo del borde alrededor de los intervalos resaltados.",
-+=======
-+>>>>>>> .their
- 	"caret": "Color del cursor del editor.",
- 	"editorCursorBackground": "Color de fondo del cursor de edición. Permite personalizar el color del caracter solapado por el bloque del cursor.",
- 	"editorWhitespaces": "Color de los caracteres de espacio en blanco del editor.",
-changed in both
-  base   100644 a46ce2aad760840ea75f16672c2236ca62ca3d12 i18n/esn/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  our    100644 5c079ae0936aa1d85c9383de57cec1e0ac4d0539 i18n/esn/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  their  100644 3320bca40f6f0b631ddf762d5c1194a9c5f0c243 i18n/esn/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -10,4 +11,11 @@
- 	"markerAction.previous.label": "Ir al problema anterior (Error, Advertencia, Información)",
- 	"markerAction.nextInFiles.label": "Ir al siguiente problema en Archivos (Error, Advertencia, Información)",
- 	"markerAction.previousInFiles.label": "Ir al problema anterior en Archivos (Error, Advertencia, Información)"
-+=======
-+	"title.wo_source": "({0}/{1})",
-+	"editorMarkerNavigationError": "Color de los errores del widget de navegación de marcadores del editor.",
-+	"editorMarkerNavigationWarning": "Color de las advertencias del widget de navegación de marcadores del editor.",
-+	"editorMarkerNavigationInfo": "Color del widget informativo marcador de navegación en el editor.",
-+	"editorMarkerNavigationBackground": "Fondo del widget de navegación de marcadores del editor."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ce1db0c57f28706e8cb649ba2cef27d66109e621 i18n/esn/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  our    100644 502886a6ec82fbe73ff74225015c8197467ab037 i18n/esn/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  their  100644 22f02c804871062bdf0474340f3ba5218c7548f7 i18n/esn/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,10 @@
- 	"wordHighlightStrongBorder": "Color de fondo de un símbolo durante el acceso de escritura; por ejemplo, cuando se escribe una variable.",
- 	"overviewRulerWordHighlightForeground": "Destaca el color del marcador para los puntos del símbolo. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
- 	"overviewRulerWordHighlightStrongForeground": "Destaca el color del marcador de acceso de escritura. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
-+=======
-+	"overviewRulerWordHighlightForeground": "Color de marcador de regla de información general para símbolos resaltados.",
-+	"overviewRulerWordHighlightStrongForeground": "Color de marcador de regla de información general para símbolos de acceso de escritura resaltados. ",
-+>>>>>>> .their
- 	"wordHighlight.next.label": "Ir al siguiente símbolo destacado",
- 	"wordHighlight.previous.label": "Ir al símbolo destacado anterior"
- }
-\ No newline at end of file
-changed in both
-  base   100644 fc4e80ef3e405b39e4f68f91aa909f57ab374ff5 i18n/esn/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  our    100644 ebca59c681c79c71e23dedb1815f394e6a16a4e3 i18n/esn/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  their  100644 660d6b834cb4c2cdb032cc69605c206aaa83f94a i18n/esn/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 37027504432c32285d2a3cdf76345ec0ffcb0222 i18n/esn/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 b4899e15c5b89e537d227799bd60ed681404b6ca i18n/esn/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 7e6ced9e2f1009f81577308388b7d10b8a251d26 i18n/esn/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,11 +10,19 @@
- 	"diff": "Comparar dos archivos entre sí.",
- 	"add": "Agregar carpetas a la última ventana activa.",
- 	"goto": "Abrir un archivo en la ruta de acceso de la línea y posición de carácter especificadas.",
-+<<<<<<< .our
- 	"newWindow": "Fuerza para abrir una nueva ventana.",
- 	"reuseWindow": "Forzar para abrir un archivo o carpeta en la última ventana activa.",
- 	"wait": "Espere a que los archivos sean cerrados antes de volver.",
- 	"locale": "La configuración regional que se usará (por ejemplo, en-US o zh-TW).",
- 	"userDataDir": "Especifica el directorio donde se guardan los datos del usuario. Se puede utilizar para abrir varias instancias de código distintas.",
-+=======
-+	"newWindow": "Fuerce una nueva instancia de Code.",
-+	"reuseWindow": "Fuerce la apertura de un archivo o carpeta en la última ventana activa.",
-+	"wait": "Espere a que los archivos sean cerrados antes de volver.",
-+	"locale": "La configuración regional que se usará (por ejemplo, en-US o zh-TW).",
-+	"userDataDir": "Especifica el directorio en que se conservan los datos de usuario; es útil cuando se ejecuta como raíz.",
-+>>>>>>> .their
- 	"version": "Versión de impresión.",
- 	"help": "Imprima el uso.",
- 	"extensionHomePath": "Establezca la ruta de acceso raíz para las extensiones.",
-@@ -22,18 +30,28 @@
- 	"showVersions": "Muestra las versiones de las extensiones instaladas cuando se usa --list-extension.",
- 	"installExtension": "Instala una extensión.",
- 	"uninstallExtension": "Desinstala una extensión.",
-+<<<<<<< .our
- 	"experimentalApis": "Permite las funciones de API propuestas para una extensión.",
-+=======
-+	"experimentalApis": "Habilita características de API propuestas para una extensión.",
-+>>>>>>> .their
- 	"verbose": "Imprima salidas detalladas (implica --wait).",
- 	"log": "Nivel de registro a utilizar. Por defecto es 'info'. Los valores permitidos son 'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off'.",
- 	"status": "Imprimir el uso del proceso y la información de diagnóstico.",
- 	"performance": "Comience con el comando 'Developer: Startup Performance' habilitado.",
- 	"prof-startup": "Ejecutar generador de perfiles de CPU durante el inicio",
- 	"disableExtensions": "Deshabilite todas las extensiones instaladas.",
-+<<<<<<< .our
- 	"inspect-extensions": "Permite perfilar y depurar las extensiones. Revise las herramientas de desarrollador para la conexión URI.",
- 	"inspect-brk-extensions": "Permite perfilar y depurar las extensiones con el host de la extensión pausado después de iniciar. Revise las herramientas de desarrollador para la conexión URI. ",
- 	"disableGPU": "Deshabilita la aceleración de hardware de GPU.",
- 	"uploadLogs": "Carga los registros de la sesión actual a un extremo.",
- 	"maxMemory": "Tamaño máximo de memoria para una ventana (en Mbytes).",
-+=======
-+	"inspect-extensions": "Permitir la depuración y el perfil de las extensiones. Revisar las herramientas de desarrollador para la conexión uri.",
-+	"inspect-brk-extensions": "Permitir la depuración y el perfil de las extensiones con el host de la extensión pausado después del inicio. Revisar las herramientas de desarrollador para la conexión uri.",
-+	"disableGPU": "Deshabilita la aceleración de hardware de GPU.",
-+>>>>>>> .their
- 	"usage": "Uso",
- 	"options": "opciones",
- 	"paths": "rutas de acceso",
-changed in both
-  base   100644 645d8566a96a045756ed7fdfce9f9d3a5819338e i18n/esn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 862953cea1ced6aa68869023b06a401296a0b72c i18n/esn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 d1ce3f10c5f81c47851a56564ec52a97f996f443 i18n/esn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -7,17 +7,23 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"invalidManifest": "Extensión no válida: package.json no es un archivo JSON.",
-+<<<<<<< .our
- 	"incompatible": "No se puede instalar la extensión ' {0} ', ya que no es compatible con el código ' {1} '.",
-+=======
-+>>>>>>> .their
- 	"restartCode": "Reinicie Code antes de volver a instalar {0}.",
- 	"installingOutdatedExtension": "Una versión más nueva de esta extensión ya está instalada. ¿Desea anular esto con la versión anterior?",
- 	"override": "Anular",
- 	"cancel": "Cancelar",
-+<<<<<<< .our
- 	"errorInstallingDependencies": "Error instalando dependencias. {0}",
- 	"MarketPlaceDisabled": "Marketplace no está habilitado",
- 	"removeError": "Error al quitar la extensión: {0}. Salga e inicie VS Code antes de intentarlo de nuevo.",
- 	"Not a Marketplace extension": "Sólo se pueden reinstalar Extensiones del Marketplace",
- 	"notFoundCompatible": "No se pueden instalar '{0}'; no hay ninguna versión disponible compatible con VS Code '{1}'. ",
- 	"malicious extension": "No se puede instalar la extensión ya que se informó que era problemático.",
-+=======
-+>>>>>>> .their
- 	"notFoundCompatibleDependency": "No se puede instalar porque no se encuentra la extensión dependiente '{0}' compatible con la versión actual '{1}' del VS Code.",
- 	"quitCode": "No se puede instalar la extensión. Por favor, salga e inicie VS Code antes de reinstalarlo. ",
- 	"exitCode": "No se puede instalar la extensión. Por favor, salga e inicie VS Code antes de reinstalarlo. ",
-changed in both
-  base   100644 9058cce900d3483eca62d4ddbbb14aa4f716d2f0 i18n/esn/src/vs/platform/message/common/message.i18n.json
-  our    100644 0d10d99e27623da352d5edf7f0d58dfbc3e6a68b i18n/esn/src/vs/platform/message/common/message.i18n.json
-  their  100644 8e3765bff6ee5e8f4ebf19c3bc3d966093751639 i18n/esn/src/vs/platform/message/common/message.i18n.json
-changed in both
-  base   100644 9f8669717f04d38404ff98307351e2a564bd9c61 i18n/esn/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 df47f2d2522b992756f57ce29b59bc070792254f i18n/esn/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 d2e9d5e7292b422571131739b83179981e65ae6e i18n/esn/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -68,6 +68,7 @@
- 	"editorWidgetBorder": "Color de borde de los widgets del editor. El color solo se usa si el widget elige tener un borde y no invalida el color.",
- 	"editorSelectionBackground": "Color de la selección del editor.",
- 	"editorSelectionForeground": "Color del texto seleccionado para alto contraste.",
-+<<<<<<< .our
- 	"editorInactiveSelection": "Color de la selección en un editor inactivo. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
- 	"editorSelectionHighlight": "Color para regiones con el mismo contenido que la selección. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
- 	"editorSelectionHighlightBorder": "Color de borde de las regiones con el mismo contenido que la selección.",
-@@ -79,6 +80,9 @@
- 	"findRangeHighlightBorder": "Color de borde de la gama que limita la búsqueda. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
- 	"findWidgetResizeBorder": "Color del borde de la barra de tamaño del widget de búsqueda.",
- 	"hoverHighlight": "Resalte debajo de la palabra para la cual se muestra un Hover. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
-+=======
-+	"editorFindMatch": "Color de la coincidencia de búsqueda actual.",
-+>>>>>>> .their
- 	"hoverBackground": "Color de fondo al mantener el puntero en el editor.",
- 	"hoverBorder": "Color del borde al mantener el puntero en el editor.",
- 	"activeLinkForeground": "Color de los vínculos activos.",
-@@ -86,12 +90,15 @@
- 	"diffEditorRemoved": "Color de fondo del texto que se eliminó. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
- 	"diffEditorInsertedOutline": "Color de contorno para el texto insertado.",
- 	"diffEditorRemovedOutline": "Color de contorno para el texto quitado.",
-+<<<<<<< .our
- 	"mergeCurrentHeaderBackground": "Fondo de encabezado actual en conflictos de fusión en línea. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
- 	"mergeCurrentContentBackground": "Fondo de contenido actual en conflictos de fusión en línea. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
- 	"mergeIncomingHeaderBackground": "Fondo de encabezado entrante en conflictos de fusión en línea. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
- 	"mergeIncomingContentBackground": "Fondo de contenido entrante en conflictos de fusión en línea. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
- 	"mergeCommonHeaderBackground": "Fondo de encabezado de ancestro común en conflictos de fusión en línea. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
- 	"mergeCommonContentBackground": "Fondo de contenido común de ancestro en conflictos de fusión en línea. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
-+=======
-+>>>>>>> .their
- 	"mergeBorder": "Color del borde en los encabezados y el divisor en conflictos de combinación alineados.",
- 	"overviewRulerCurrentContentForeground": "Primer plano de la regla de visión general actual para conflictos de combinación alineados.",
- 	"overviewRulerIncomingContentForeground": "Primer plano de regla de visión general de entrada para conflictos de combinación alineados.",
-added in both
-  our    100644 40e2044209fec4e5b919e2e5e83378e9f6815093 i18n/esn/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/esn/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,4 +11,12 @@
- 	"codeActionsOnSave.didTimeout": "codeActionsOnSave anulado después de {0} ms",
- 	"timeout.onWillSave": "Se anuló onWillSaveTextDocument-event después de 1750 ms",
- 	"saveParticipants": "Ejecutando Guardar Participantes..."
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 1127a4ec4f832993371655e52fc17e5b4cc59dff i18n/esn/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  our    100644 a3395d69a3eb29f7d81d045d6273164f407ffcc0 i18n/esn/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  their  100644 e897d06ac348cf0ebb4494e7cdd0feb862725b8f i18n/esn/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,7 @@
- 	],
- 	"treeView.notRegistered": "No se ha registrado ninga vista del árbol con id '{0}'.",
- 	"treeView.duplicateElement": "El elemento con id {0} está ya registrado"
-+=======
-+	"treeView.notRegistered": "No se ha registrado ninga vista del árbol con id '{0}'."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 1e2b99a187010f3fc708c8e7d1f0a552ed144c10 i18n/esn/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 c48bc5883853a0c6c279c545c6c1c9d024a6241b i18n/esn/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 9f92beb9392ac000af3ad81b7acf9e8ff393487e i18n/esn/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -15,5 +15,9 @@
- 	"saveWorkspace": "Guardar área de trabajo",
- 	"openWorkspaceAction": "Abrir área de trabajo...",
- 	"openWorkspaceConfigFile": "Abrir archivo de configuración del área de trabajo",
-+<<<<<<< .our
- 	"duplicateWorkspaceInNewWindow": "Duplicar el área de trabajo en una ventana nueva"
-+=======
-+	"openFolderAsWorkspaceInNewWindow": "Abrir carpeta como Área de trabajo en una Nueva Ventana"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 1375d8b899c23d4e939a50148edb6d270cfdae42 i18n/esn/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-  their  100644 832cb0abb68fff04475d658c3d6b687675c6a986 i18n/esn/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,6 +9,15 @@
- 	],
- 	"addFolderToWorkspace": "Agregar carpeta al área de trabajo...",
- 	"add": "&&Añadir",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"addFolderToWorkspace": "Agregar carpeta al área de trabajo...",
-+>>>>>>> .their
- 	"addFolderToWorkspaceTitle": "Agregar carpeta al área de trabajo",
- 	"workspaceFolderPickerPlaceholder": "Seleccionar la carpeta del área de trabajo"
- }
-\ No newline at end of file
-changed in both
-  base   100644 ae6d0079e4ca41ccb58d842d72b28aa7faed3415 i18n/esn/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  our    100644 0c66b08e50d23c7fe17d4450febaeb2a1c46e5cc i18n/esn/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  their  100644 0e9cbb0a9e2da036405297f65651630ca89d2538 i18n/esn/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-@@ -19,6 +19,7 @@
- 	"close": "Cerrar",
- 	"closeOthers": "Cerrar otros",
- 	"closeRight": "Cerrar a la derecha",
-+<<<<<<< .our
- 	"closeAllSaved": "Cerrar guardados",
- 	"closeAll": "Cerrar todo",
- 	"keepOpen": "Mantener abierto",
-@@ -27,6 +28,15 @@
- 	"keepEditor": "Mantener editor",
- 	"closeEditorsInGroup": "Cerrar todos los editores del grupo",
- 	"closeSavedEditors": "Cerrar los editores guardados del grupo",
-+=======
-+	"closeAllUnmodified": "Cerrar los que no se han modificado",
-+	"closeAll": "Cerrar todo",
-+	"keepOpen": "Mantener abierto",
-+	"showOpenedEditors": "Mostrar editores abiertos",
-+	"keepEditor": "Mantener editor",
-+	"closeEditorsInGroup": "Cerrar todos los editores del grupo",
-+	"closeUnmodifiedEditors": "Cerrar los editores en el grupo sin modificar",
-+>>>>>>> .their
- 	"closeOtherEditors": "Cerrar otros editores",
- 	"closeRightEditors": "Cerrar los editores a la derecha"
- }
-\ No newline at end of file
-changed in both
-  base   100644 f88c82cd9dfd8d1f723ae0f9ccacaeadadc90dff i18n/esn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 e35e95658e0757a0dd58a01697234694ea4f0954 i18n/esn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 93badc7f42aae66191b592e2fda1232048404581 i18n/esn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 a44acd1dea7c10c9fa41ec216cc0896d042a4aa4 i18n/esn/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  our    100644 41dbe6869149b754d7d02273f8302ea1a662cfeb i18n/esn/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  their  100644 441fc68d0e67b5808ed41ce6426d097f4d894130 i18n/esn/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-changed in both
-  base   100644 d1ec23e2db6cc292f5ea6ef8037055acf3ef7885 i18n/esn/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  our    100644 bdfe340e0584db3b3e9be2779c08147211eb5f9c i18n/esn/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  their  100644 8fda63005496a55b62f1a077be6bfc1768c94486 i18n/esn/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-@@ -12,6 +12,10 @@
- 	"editableEditorWithInputAriaLabel": "{0}. Editor de comparación de archivos de texto.",
- 	"editableEditorAriaLabel": "Editor de comparación de archivos de texto.",
- 	"navigate.next.label": "Cambio siguiente",
-+<<<<<<< .our
- 	"navigate.prev.label": "Cambio anterior",
- 	"toggleIgnoreTrimWhitespace.label": "Ignorar espacios en blanco al principio y final"
-+=======
-+	"navigate.prev.label": "Cambio anterior"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 49c85dbc052576ab06514b9d25b9ea02829256aa i18n/esn/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  our    100644 9310ecec99739a11969e16199e5b70e1dba3f377 i18n/esn/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  their  100644 d7236689da90464e87303fbf3d53d20704f46bd4 i18n/esn/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"close": "Cerrar",
-+>>>>>>> .their
- 	"araLabelEditorActions": "Acciones del editor"
- }
-\ No newline at end of file
-changed in both
-  base   100644 323cb6d934f7c3835c359bf3db166f03461d42ba i18n/esn/src/vs/workbench/common/theme.i18n.json
-  our    100644 a12ae1a7d50911472b1c450409ccd4fd8e4aba33 i18n/esn/src/vs/workbench/common/theme.i18n.json
-  their  100644 1f48fa2867dd731ced45b198d547a46b3f2b238c i18n/esn/src/vs/workbench/common/theme.i18n.json
-@@ -24,7 +24,10 @@
- 	"editorGroupBackground": "Color de fondo de un grupo de editores. Los grupos de editores son los contenedores de los editores. El color de fondo se ve cuando se mueven arrastrando los grupos de editores.",
- 	"tabsContainerBackground": "Color de fondo del encabezado del título del grupo de editores cuando las fichas están habilitadas. Los grupos de editores son contenedores de editores.",
- 	"tabsContainerBorder": "Color de borde del encabezado del título del grupo de editores cuando las fichas están habilitadas. Los grupos de editores son contenedores de editores.",
-+<<<<<<< .our
- 	"editorGroupHeaderBackground": "Color de fondo del encabezado de título del grupo editor cuando las tabulaciones están deshabilitadas (' \"Workbench. Editor. showTabs \": false '). Los grupos editor son los contenedores de los editores.",
-+=======
-+>>>>>>> .their
- 	"editorGroupBorder": "Color para separar varios grupos de editores entre sí. Los grupos de editores son los contenedores de los editores.",
- 	"editorDragAndDropBackground": "Color de fondo cuando se arrastran los editores. El color debería tener transparencia para que el contenido del editor pueda brillar a su través.",
- 	"panelBackground": "Color de fondo del panel. Los paneles se muestran debajo del área de editores y contienen vistas, como Salida y Terminal integrado.",
-@@ -41,8 +44,11 @@
- 	"statusBarNoFolderBorder": "Color de borde de la barra de estado que separa la barra lateral y el editor cuando no hay ninguna carpeta abierta. La barra de estado se muestra en la parte inferior de la ventana.",
- 	"statusBarItemActiveBackground": "Color de fondo de un elemento de la barra de estado al hacer clic. La barra de estado se muestra en la parte inferior de la ventana.",
- 	"statusBarItemHoverBackground": "Color de fondo de un elemento de la barra de estado al mantener el puntero. La barra de estado se muestra en la parte inferior de la ventana.",
-+<<<<<<< .our
- 	"statusBarProminentItemBackground": "Barra de estado elementos prominentes color de fondo. Los artículos prominentes se destacan de otras entradas de la barra de estado para indicar importancia, Cambiar el modo de  'Toggle Tab Key Moves Focus' de la paleta de comandos para ver un ejemplo. La barra de estado se muestra en la parte inferior de la ventana.",
- 	"statusBarProminentItemHoverBackground": "Barra de estado elementos prominentes color de fondo cuando se activa. Los artículos prominentes se destacan de otras entradas de la barra de estado para indicar importancia. Cambiar el modo de 'Toggle Tab Key Moves Focus' de la paleta de comandos para ver un ejemplo. La barra de estado se muestra en la parte inferior de la ventana.",
-+=======
-+>>>>>>> .their
- 	"activityBarBackground": "Color de fondo de la barra de actividad, que se muestra en el lado izquierdo o derecho y que permite cambiar entre diferentes vistas de la barra lateral.",
- 	"activityBarForeground": "Color de fondo de la barra de actividad (por ejemplo utilizado por los iconos). La barra de actividad muestra en el lado izquierdo o derecho y permite cambiar entre diferentes vistas de la barra lateral.",
- 	"activityBarBorder": "Color de borde de la barra de actividad que separa la barra lateral. La barra de actividad se muestra en el extremo derecho o izquierdo y permite cambiar entre las vistas de la barra lateral.",
-added in both
-  our    100644 9bb6104842d89b413c500800affec815c7e87827 i18n/esn/src/vs/workbench/common/views.i18n.json
-  their  100644 f22e31a7e4501ed4bba7c269b73d899d1c2e0ece i18n/esn/src/vs/workbench/common/views.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"duplicateId": "La vista con id '{0}' ya se encuentra registrada en la ubicación '{1}' "
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"duplicateId": "Ya existe una vista registrada con el identificador '{0}' en la ubicación '{1}'"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 81432663720a6a4eb93f9b7fae88edbba3a3eaac i18n/esn/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 89fe344b57b1d619a163cac9c32cff2261374fbd i18n/esn/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 c875a388e0395fd6c6818617dafef68c36c2a3cd i18n/esn/src/vs/workbench/electron-browser/actions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"closeWindow": "Cerrar ventana",
- 	"closeWorkspace": "Cerrar área de trabajo",
- 	"noWorkspaceOpened": "No hay ninguna área de trabajo abierta en esta instancia para cerrarla.",
-@@ -50,6 +53,14 @@
- 	"moveWindowTabToNewWindow": "Mover pestaña de ventana a una nueva ventana",
- 	"mergeAllWindowTabs": "Fusionar todas las ventanas",
- 	"toggleWindowTabsBar": "Alternar barra de pestañas de ventana",
-+<<<<<<< .our
- 	"about": "Acerca de {0}",
- 	"inspect context keys": "Inspeccionar claves de contexto"
-+=======
-+	"configureLocale": "Configurar idioma",
-+	"displayLanguage": "Define el lenguaje para mostrar de VSCode.",
-+	"doc": "Consulte {0} para obtener una lista de idiomas compatibles.",
-+	"restart": "Al cambiar el valor se requiere reiniciar VSCode.",
-+	"fail.createSettings": "No se puede crear '{0}' ({1})."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f2abdd8deafb9f03832ecba56880fac8af664758 i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 57d447a0a0b664b859bc321a1781f6980e63b0fd i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 dd5456c4e0f07be8abb74f0b7227b3b9cf2e50cf i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,12 +35,19 @@
- 	"panelDefaultLocation": "Controla la ubicación predeterminada del panel. Puede mostrarse en la parte inferior o a la derecha de la mesa de banco.",
- 	"statusBarVisibility": "Controla la visibilidad de la barra de estado en la parte inferior del área de trabajo.",
- 	"activityBarVisibility": "Controla la visibilidad de la barra de actividades en el área de trabajo.",
-+<<<<<<< .our
- 	"viewVisibility": "Controla la visibilidad de las acciones en el encabezado de la vista. Las acciones en el encabezado de la vista pueden ser siempre visibles, o solo cuando la vista es enfocada o apuntada.",
- 	"fontAliasing": "Controla el método de suavizado de fuentes en la mesa de trabajo.\n-por defecto: subpíxel suavizado de fuentes. En la mayoría las pantallas retina no dará el texto más agudo - alisado: suavizar la fuente a nivel del píxel, a diferencia de los subpíxeles. Puede hacer que la fuente aparezca más general - ninguno: desactiva el suavizado de fuentes. Texto se mostrará con dentados filos - auto: se aplica el 'default' o 'antialiasing' automáticamente en función de la DPI de la muestra.",
- 	"workbench.fontAliasing.default": "Suavizado de fuentes en subpíxeles. En la mayoría de las pantallas que no son Retina, esta opción muestra el texto más nítido.",
- 	"workbench.fontAliasing.antialiased": "Suaviza las fuentes en píxeles, en lugar de subpíxeles. Puede hacer que las fuentes se vean más claras en general.",
- 	"workbench.fontAliasing.none": "Deshabilita el suavizado de fuentes. El texto se muestra con bordes nítidos irregulares.",
- 	"workbench.fontAliasing.auto": "Aplica ' default ' o ' antialiased ' automáticamente basándose en la DPI de las pantallas.",
-+=======
-+	"fontAliasing": "Controla el método de suavizado de fuentes en el área de trabajo.\n- default: suavizado de fuentes en subpíxeles. En la mayoría de las pantallas que no son Retina, esta opción muestra el texto más nítido.\n- antialiased: suaviza las fuentes en píxeles, en lugar de subpíxeles. Puede hacer que las fuentes se vean más claras en general\n- none: deshabilita el suavizado de fuentes. El texto se muestra con bordes nítidos irregulares.",
-+	"workbench.fontAliasing.default": "Suavizado de fuentes en subpíxeles. En la mayoría de las pantallas que no son Retina, esta opción muestra el texto más nítido.",
-+	"workbench.fontAliasing.antialiased": "Suaviza las fuentes en píxeles, en lugar de subpíxeles. Puede hacer que las fuentes se vean más claras en general.",
-+	"workbench.fontAliasing.none": "Deshabilita el suavizado de fuentes. El texto se muestra con bordes nítidos irregulares.",
-+>>>>>>> .their
- 	"enableNaturalLanguageSettingsSearch": "Controla si habilita el modo de búsqueda de lenguaje natural para la configuración.",
- 	"windowConfigurationTitle": "Ventana",
- 	"window.openFilesInNewWindow.on": "Los archivos se abrirán en una nueva ventana",
-changed in both
-  base   100644 0f8291c057285c9438640a7cb6752223c9c667f4 i18n/esn/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  our    100644 53b616809b4df15fc5f76746da24f19a323e0ef3 i18n/esn/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  their  100644 68ea94e5a20f7f2c52acee807a6d7d7df1fa120e i18n/esn/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"debug.terminal.title": "depurado"
- }
-\ No newline at end of file
-changed in both
-  base   100644 1ba4ecd59bfc07c63a473d7ae6f7babb9e6398aa i18n/esn/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  our    100644 e802eea53ea3a73df02c2279784bba5d97b51e1e i18n/esn/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  their  100644 c01e0004e658acd2d3dbfd414c3bfb294cefe913 i18n/esn/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-changed in both
-  base   100644 3335907cc3ec704fac6ce4cc7ac138ac4b7b21f9 i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 99cc3686e6501d7b489d9fd1df7919d3f52f53bb i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 a0c3a72ce3f5c59798c7cf6a53acc84f41525f5f i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,11 @@
- 	"exeBasedRecommendation": "Se recomienda esta extensión porque tiene instalado {0} . ",
- 	"fileBasedRecommendation": "Esta extensión se recomienda basado en los archivos que abrió recientemente.",
- 	"workspaceRecommendation": "Esta extensión es recomendada por los usuarios del espacio de trabajo actual.",
-+=======
-+	"workspaceRecommendation": "Esta extensión es recomendada por los usuarios del espacio de trabajo actual.",
-+	"fileBasedRecommendation": "Esta extensión se recomienda basado en los archivos que abrió recientemente.",
-+	"exeBasedRecommendation": "Se recomienda esta extensión porque tiene instalado {0} . ",
-+>>>>>>> .their
- 	"reallyRecommended2": "La extension recomendada para este tipo de archivo es {0}",
- 	"reallyRecommendedExtensionPack": "Para este tipo de fichero, se recomienda el paquete de extensión '{0}'.",
- 	"install": "Instalar",
-added in both
-  our    100644 435b23b45a195a35cafd6efbf416e4143f9ada87 i18n/esn/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-  their  100644 eff0be207f1523cbe6f854eab3747ba5db7b51c3 i18n/esn/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,13 @@
- 	],
- 	"workbenchConfigurationTitle": "Área de trabajo",
- 	"feedbackVisibility": "Controla la visibilidad de los comentarios de Twitter (smiley) en la barra de estado en la parte inferior del área de trabajo."
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"workbenchConfigurationTitle": "Área de trabajo"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 ad2caa896d3e0225c45812b0baff3ede0c7a94fc i18n/esn/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/esn/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"hide": "Ocultar"
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 5b4f1d9a867259ee397b0ce30c196d0e0e92f66c i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  our    100644 1dbea27e4536b6f350db236a658aa477ded299b1 i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  their  100644 619e931bff18f0074492cfaf0afc59758beb6ae3 i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-@@ -12,7 +12,10 @@
- 	"revertLocalChanges": "Descartar los cambios y volver al contenido del disco",
- 	"copyPathOfActive": "Copiar ruta del archivo activo",
- 	"saveAllInGroup": "Guardar todo en el grupo",
-+<<<<<<< .our
- 	"saveFiles": "Guardar todos los archivos",
-+=======
-+>>>>>>> .their
- 	"revert": "Revertir archivo",
- 	"compareActiveWithSaved": "Comparar el archivo activo con el guardado",
- 	"closeEditor": "Cerrar editor",
-@@ -24,12 +27,19 @@
- 	"copyPath": "Copiar ruta de acceso",
- 	"saveAll": "Guardar todos",
- 	"compareWithSaved": "Comparar con el guardado",
-+<<<<<<< .our
- 	"compareWithSelected": "Comparar con seleccionados",
- 	"compareSource": "Seleccionar para comparar",
- 	"compareSelected": "Comparar seleccionados",
- 	"close": "Cerrar",
- 	"closeOthers": "Cerrar otros",
- 	"closeSaved": "Cerrar guardados",
-+=======
-+	"compareSource": "Seleccionar para comparar",
-+	"close": "Cerrar",
-+	"closeOthers": "Cerrar otros",
-+	"closeUnmodified": "Cerrar los que no se han modificado",
-+>>>>>>> .their
- 	"closeAll": "Cerrar todo",
- 	"deleteFile": "Eliminar permanentemente"
- }
-\ No newline at end of file
-changed in both
-  base   100644 849c94fa0c7e35ab449c4fc3119e299ffdce94ab i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 1e23db714d120943226391e3c5ce27170460d94d i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 a96cb97676ffa634304afac30a02a0f35df8afc1 i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"newFile": "Nuevo archivo",
- 	"newFolder": "Nueva carpeta",
- 	"rename": "Cambiar nombre",
-@@ -13,7 +16,11 @@
- 	"copyFile": "Copiar",
- 	"pasteFile": "Pegar",
- 	"retry": "Reintentar",
-+<<<<<<< .our
- 	"renameWhenSourcePathIsParentOfTargetError": "Utilice el comando 'Nueva carpeta' o 'Nuevo archivo' para agregar elementos a una carpeta existente ",
-+=======
-+	"openFolderFirst": "Abra primero una carpeta para crear archivos o carpetas en ella.",
-+>>>>>>> .their
- 	"newUntitledFile": "Nuevo archivo sin título",
- 	"createNewFile": "Nuevo archivo",
- 	"createNewFolder": "Nueva carpeta",
-@@ -43,11 +50,19 @@
- 	"confirmDeleteMessageMultiple": "¿Está seguro de que desea eliminar de forma permanente los siguientes archivos {0}?",
- 	"confirmDeleteMessageFolder": "¿Está seguro de que desea eliminar '{0}' y su contenido de forma permanente?",
- 	"confirmDeleteMessageFile": "¿Está seguro de que desea eliminar '{0}' de forma permanente?",
-+<<<<<<< .our
- 	"addFiles": "Agregar archivos",
- 	"confirmOverwrite": "Ya existe un archivo o carpeta con el mismo nombre en la carpeta de destino. ¿Quiere reemplazarlo?",
- 	"replaceButtonLabel": "&&Reemplazar",
- 	"fileIsAncestor": "El archivo que se va a pegar es un antecesor de la carpeta de destino",
- 	"fileDeleted": "El archivo que se iba a pegar se ha eliminado o movido mientras tanto",
-+=======
-+	"irreversible": "Esta acción es irreversible.",
-+	"permDelete": "Eliminar permanentemente",
-+	"importFiles": "Importar archivos",
-+	"confirmOverwrite": "Ya existe un archivo o carpeta con el mismo nombre en la carpeta de destino. ¿Quiere reemplazarlo?",
-+	"replaceButtonLabel": "&&Reemplazar",
-+>>>>>>> .their
- 	"duplicateFile": "Duplicado",
- 	"globalCompareFile": "Comparar archivo activo con...",
- 	"openFileToCompare": "Abrir un archivo antes para compararlo con otro archivo.",
-changed in both
-  base   100644 f417c4b11aaeae4178ccd7c01777f554f3dd838a i18n/esn/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  our    100644 c49256b3f498d54fd8e17479701ff2178d372675 i18n/esn/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  their  100644 41e7bc8dcafb70b3ede33e55a3c6184c4856c1e6 i18n/esn/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,14 +7,21 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"revealInWindows": "Mostrar en el Explorador",
- 	"revealInMac": "Mostrar en Finder",
- 	"openContainer": "Abrir carpeta contenedora",
- 	"saveAs": "Guardar como...",
- 	"save": "Guardar",
- 	"saveAll": "Guardar todos",
-+<<<<<<< .our
- 	"removeFolderFromWorkspace": "Quitar carpeta del área de trabajo",
- 	"genericRevertError": "No se pudo revertir ' {0} ': {1}",
-+=======
-+	"saveFiles": "Guardar todos los archivos",
-+	"removeFolderFromWorkspace": "Quitar carpeta del área de trabajo",
-+>>>>>>> .their
- 	"modifiedLabel": "{0} (en el disco) ↔ {1}",
- 	"openFileToReveal": "Abrir un archivo antes para mostrarlo",
- 	"openFileToCopy": "Abrir un archivo antes para copiar su ruta de acceso"
-changed in both
-  base   100644 6b7926d2bf7039c9fedbd3b89b2c9e98ee891b0d i18n/esn/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 530360de300c015c0e1de9b17dd26ccddaf04e46 i18n/esn/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 34df999607beee7ceb3dd186b892826c19a33c5e i18n/esn/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-@@ -40,7 +40,10 @@
- 	"formatOnSave": "Formatea un archivo al guardarlo. Debe haber un formateador disponible, el archivo no debe guardarse automáticamente y el editor no debe estar cerrándose.",
- 	"formatOnSaveTimeout": "Tiempo de espera de aplicación de formato al guardar. Especifica un límite de tiempo en milisegundos para los comandos formatOnSave. Los comandos que tarden más del tiempo de espera especificado se cancelarán.",
- 	"explorerConfigurationTitle": "Explorador de archivos",
-+<<<<<<< .our
- 	"openEditorsVisible": "Número de editores mostrados en el panel de editores abiertos.",
-+=======
-+>>>>>>> .their
- 	"autoReveal": "Controla si el explorador debe mostrar y seleccionar automáticamente los archivos al abrirlos.",
- 	"enableDragAndDrop": "Controla si el explorador debe permitir mover archivos y carpetas mediante la función arrastrar y colocar.",
- 	"confirmDragAndDrop": "Controla si el explorador debe pedir la confirmación al reubicar archivos o carpetas a través de arrastrar y soltar.",
-changed in both
-  base   100644 186f5cdaa427312a38cea816fd6aefcbf2dffeee i18n/esn/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  our    100644 c8225196607251b5e80d30b5cb856d0580528d43 i18n/esn/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  their  100644 85b5734142ed89efdd39e71bc3d6358f9b5ff0f7 i18n/esn/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,6 +14,12 @@
- 	"readonlySaveErrorAdmin": "No se pudo guardar '{0}': El archivo está protegido contra escritura. Seleccione 'Sobrescribir como Admin' para volverlo a intentar como administrador.",
- 	"readonlySaveError": "No se pudo guardar '{0}': El archivo está protegido contra escritura. Seleccione 'Sobrescribir' para intentar quitar la protección.",
- 	"permissionDeniedSaveError": "No se pudo guardar '{0}': Permisos insuficientes. Seleccione 'Reintentar como Admin' para volverlo a intentar como administrador.",
-+=======
-+	"userGuide": "Use las acciones de la barra de herramientas del editor situada a la derecha para **deshacer** los cambios o **sobrescribir** el contenido del disco con sus cambios",
-+	"overwrite": "Sobrescribir",
-+	"retry": "Reintentar",
-+	"discard": "Descartar",
-+>>>>>>> .their
- 	"genericSaveError": "No se pudo guardar '{0}': {1}",
- 	"learnMore": "Más información",
- 	"dontShowAgain": "No volver a mostrar",
-changed in both
-  base   100644 b4bad361098c6b698b532b3104154851075ba621 i18n/esn/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  our    100644 5fbf86be80c868954306037ae08ea885b5396dcf i18n/esn/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  their  100644 f5060aef05b2a77caad343c683ddc2a6d8eb8101 i18n/esn/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-added in both
-  our    100644 aed691191cb06f4b2844db758a0a68d4ea03c112 i18n/esn/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-  their  100644 68e35e56b163c1bbb124959749646d8eb2764f69 i18n/esn/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,5 +11,13 @@
- 	"sharedLog": "Log (Compartido)",
- 	"rendererLog": "Log (Ventana)",
- 	"extensionsLog": "Log (Extensión del Host)",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"developer": "Desarrollador"
- }
-\ No newline at end of file
-added in both
-  our    100644 6d6dfbb8c770fb0e507d7b4d7b666813db7a2504 i18n/esn/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  their  100644 80e723dfda2eca4385e346201afd0109e929d186 i18n/esn/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -16,15 +17,35 @@
- 	"selectProcess": "Seleccionar un registro para procesar",
- 	"openLogFile": "Abrir archivo de log...",
- 	"setLogLevel": "Establecer nivel de registro...",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"openLogsFolder": "Abrir carpeta de registros",
-+	"showLogs": "Mostrar registros...",
-+	"mainProcess": "Principal",
-+	"sharedProcess": "Compartido",
-+	"rendererProcess": "Ventana",
-+	"extensionHost": "Host de extensión",
-+	"selectProcess": "Seleccionar proceso",
-+	"setLogLevel": "Establecer nivel de registro",
-+>>>>>>> .their
- 	"trace": "Seguimiento",
- 	"debug": "Depurar",
- 	"info": "Información",
- 	"warn": "Advertencia",
- 	"err": "Error",
- 	"critical": "Crítico",
-+<<<<<<< .our
- 	"off": "Apagado",
- 	"selectLogLevel": "Seleccionar nivel de log",
- 	"default and current": "Predeterminado y actual ",
- 	"default": "Predeterminado",
- 	"current": "Actual\n"
-+=======
-+	"off": "Apagado"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a028050eafbc7240b9d3feb32eb7cba0d745377b i18n/esn/src/vs/workbench/parts/markers/common/messages.i18n.json
-  our    100644 b9a7c1d4a8655de528c4e8a8c59413fe51aea89e i18n/esn/src/vs/workbench/parts/markers/common/messages.i18n.json
-  their  100644 b28c9ca334272d634234979721c470b87f49b613 i18n/esn/src/vs/workbench/parts/markers/common/messages.i18n.json
-@@ -7,8 +7,11 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"viewCategory": "Ver",
-+<<<<<<< .our
- 	"problems.view.toggle.label": "Alternar problemas (errores, advertencias, información)",
- 	"problems.view.focus.label": "Problemas de enfoque (errores, advertencias, información)",
-+=======
-+>>>>>>> .their
- 	"problems.panel.configuration.title": "Vista Problemas",
- 	"problems.panel.configuration.autoreveal": "Controla si la vista Problemas debe revelar automáticamente los archivos cuando los abre",
- 	"markers.panel.title.problems": "Problemas",
-added in both
-  our    100644 1ce77e76c3fe1ef57f1b3d147bb4e4d2c90985dc i18n/esn/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-  their  100644 c75638715f922570d102dc714c608db8ff735b6d i18n/esn/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -11,4 +12,15 @@
- 	"viewCategory": "Ver",
- 	"clearOutput.label": "Borrar salida",
- 	"openActiveLogOutputFile": "Ver: abrir el archivo de salida del registro activo"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"output": "Salida",
-+	"viewCategory": "Ver",
-+	"clearOutput.label": "Borrar salida"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 49cc23858561615b313b90ea5575f4fcab086a03 i18n/esn/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/esn/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,12 @@
- 	],
- 	"output": "{0} - Output",
- 	"channel": "Canal de output para '{0}' "
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 b720c2b8a5720c8e6aeab62ad792fadbe7c31519 i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 ab7d78224458e031f0d5873434caefe0111f3854 i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 7f4ed8494b70511298bc515478b6363a200b8c47 i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"defaultSettings": "Colocar la configuración en el editor de lado de mano derecha para anular.",
- 	"noSettingsFound": "No se encontró ninguna configuración.",
- 	"settingsSwitcherBarAriaLabel": "Conmutador de configuración",
-changed in both
-  base   100644 575bc61fdb44c04e4bc6df49a5c23a0b03c70826 i18n/esn/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  our    100644 38c1319f3c18210eb148df6e618f8acb25d84c62 i18n/esn/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  their  100644 2ae85dc2ac18da574504382d4fc94ba8b9f47537 i18n/esn/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-changed in both
-  base   100644 3a50ec52260a1cfb23ff26fd945816a32fb6aaed i18n/esn/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  our    100644 09eabb344398908e0c8f2f2df9597c1873d32a81 i18n/esn/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  their  100644 6e19797b529d15e80e1ccdf9306947ec87f3fe64 i18n/esn/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"view": "Ver",
- 	"commandsHandlerDescriptionDefault": "Mostrar y ejecutar comandos",
- 	"gotoLineDescriptionMac": "Ir a la línea",
-changed in both
-  base   100644 2d44f58d5145a7f19318557e6b24393b0a4bea4c i18n/esn/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  our    100644 dcde42ae5b9e9263b1e8523db6c8f5fea75da510 i18n/esn/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  their  100644 c5061e853b0d544066fbea469f51de1f48f43e2f i18n/esn/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-@@ -10,8 +10,12 @@
- 	"source control": "Control de código fuente",
- 	"toggleSCMViewlet": "Mostrar SCM",
- 	"view": "Ver",
-+<<<<<<< .our
- 	"scmConfigurationTitle": "SCM",
- 	"alwaysShowProviders": "Si desea mostrar siempre la sección proveedor de control de código fuente.",
- 	"diffDecorations": "Controla las decoraciones de diff en el editor.",
- 	"diffGutterWidth": "Controla el ancho (px) de las decoraciones de diferencias en el medianil (agregadas y modificadas)."
-+=======
-+	"scmConfigurationTitle": "SCM"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 bcfc62d1906034ad2de3cf999de8e6f1f816060a i18n/esn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 08f95963fe8efaa9640a8368bea5bd91b3e1ccb0 i18n/esn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 5357b8b610a47599a4ec9ac16d9cc0401252bcec i18n/esn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-changed in both
-  base   100644 fe7e74dbe3347b3193953e09f1f3134f38f031f2 i18n/esn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 d7550e4cd76b5e1079a00c63a6ae28b84fca74d3 i18n/esn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 a0aba2b8419960038690fe853d75ac51a2ec64be i18n/esn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,11 +13,18 @@
- 	"copyAllLabel": "Copiar todo",
- 	"clearSearchHistoryLabel": "Borrar historial de búsqueda",
- 	"toggleSearchViewPositionLabel": "Alternar la posición de vista de búsqueda",
-+=======
-+>>>>>>> .their
- 	"findInFolder": "Buscar en carpeta...",
- 	"findInWorkspace": "Buscar en área de trabajo...",
- 	"showTriggerActions": "Ir al símbolo en el área de trabajo...",
- 	"name": "Buscar",
-+<<<<<<< .our
- 	"showSearchViewl": "Mostrar búsqueda",
-+=======
-+	"search": "Buscar",
-+	"showSearchViewlet": "Mostrar búsqueda",
-+>>>>>>> .their
- 	"view": "Ver",
- 	"findInFiles": "Buscar en archivos",
- 	"openAnythingHandlerDescription": "Ir al archivo",
-added in both
-  our    100644 b2b344c8a846e36292a8956d98d0de9827e2109b i18n/esn/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-  their  100644 9675a4f182c260697a0657f2df233ce6fd0c0cd2 i18n/esn/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -13,5 +14,14 @@
- 	"new.global.sep": "Nuevos fragmentos de código",
- 	"openSnippet.pickLanguage": "Seleccione Archivo de fragmentos o Crear fragmentos de código",
- 	"openSnippet.label": "Configurar fragmentos de usuario ",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"global.1": "({0})",
-+>>>>>>> .their
- 	"preferences": "Preferencias"
- }
-\ No newline at end of file
-changed in both
-  base   100644 c49e1beb60b7114849f6666bc9a7245fb56b2854 i18n/esn/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  our    100644 c162d3a865814ba204996b9b8c83e0a5a11dc0ef i18n/esn/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  their  100644 5fb6638f35be5d2308588ccc1c3a19405d5df73a i18n/esn/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"snippetSchema.json.default": "Fragmento de código vacío",
- 	"snippetSchema.json": "Configuración de fragmento de código del usuario",
- 	"snippetSchema.json.prefix": "El prefijo que se debe usar al seleccionar el fragmento de código en Intellisense",
-added in both
-  our    100644 4e9dde048d3554df0b3c9ad9eb45e9a57e1ae767 i18n/esn/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-  their  100644 8c806f2935a012b6df0aacb8d136405e86d62f23 i18n/esn/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,5 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"source.snippetGlobal": "Fragmento del usuario global",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"source.snippet": "Fragmento de código del usuario"
- }
-\ No newline at end of file
-changed in both
-  base   100644 ecf3b81fb81f80fbc859664dd185fb4800869794 i18n/esn/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  our    100644 336485742eb7e33ce1559e1ea1a94d2bd2070216 i18n/esn/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 34d3cff577c3035e0bfe679a5e2adeadc56ca579 i18n/esn/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,9 @@
- 	],
- 	"invalid.path.0": "Se esperaba una cadena en \"contributes.{0}.path\". Valor proporcionado: {1}",
- 	"invalid.language.0": "Al omitir el lenguaje, el valor de 'contributes. {0}. Path' debe ser un archivo '. Code-snippets'. Valor proporcionado: {1}",
-+=======
-+	"invalid.path.0": "Se esperaba una cadena en \"contributes.{0}.path\". Valor proporcionado: {1}",
-+>>>>>>> .their
- 	"invalid.language": "Lenguaje desconocido en \"contributes.{0}.language\". Valor proporcionado: {1}",
- 	"invalid.path.1": "Se esperaba que \"contributes.{0}.path\" ({1}) se incluyera en la carpeta de la extensión ({2}). Esto puede hacer que la extensión no sea portátil.",
- 	"vscode.extension.contributes.snippets": "Aporta fragmentos de código.",
-changed in both
-  base   100644 b41adfc8dd9501e20adcfddf83682fff38019c8e i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 452c57e69431420c6bcfb59a898fee8e18810b50 i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 f8bbe6f41b9fe6df040339754d4ce508336db19f i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -10,7 +10,11 @@
- 	"terminal.foreground": "El color de primer plano del terminal.",
- 	"terminalCursor.foreground": "Color de primer plano del cursor del terminal.",
- 	"terminalCursor.background": "Color de fondo del cursor del terminal. Permite personalizar el color de un carácter solapado por un cursor de bloque.",
-+<<<<<<< .our
- 	"terminal.selectionBackground": "Color de fondo de selección del terminal.",
- 	"terminal.border": "Color del borde que separa paneles divididos en el terminal. El valor predeterminado es panel.border.",
- 	"terminal.ansiColor": "color ANSI ' {0} ' en el terminal."
-+=======
-+	"terminal.selectionBackground": "Color de fondo de selección del terminal."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 1a5374df014415b68f0f6986ac389717c605e88c i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  our    100644 689cce2491f015781c9b24c814852e6d003b5f99 i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  their  100644 d5f5c068b5f16e1fe921bd9a429cea361aa7bef2 i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-@@ -8,7 +8,11 @@
- 	],
- 	"terminal.integrated.chooseWindowsShellInfo": "Para cambiar el shell de terminal predeterminado, seleccione el botón Personalizar.",
- 	"customize": "Personalizar",
-+<<<<<<< .our
- 	"never again": "No volver a mostrar",
-+=======
-+	"cancel": "Cancelar",
-+>>>>>>> .their
- 	"terminal.integrated.chooseWindowsShell": "Seleccione el shell de terminal que desee, puede cambiarlo más adelante en la configuración",
- 	"terminalService.terminalCloseConfirmationSingular": "Hay una sesión de terminal activa, ¿quiere terminarla?",
- 	"terminalService.terminalCloseConfirmationPlural": "Hay {0} sesiones de terminal activas, ¿quiere terminarlas?"
-changed in both
-  base   100644 1d8632efe35f2ff3166aa0263f593a2d23533d30 i18n/esn/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  our    100644 4b86e7ab2775952921d67856af54454ce0ec3d5d i18n/esn/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  their  100644 45b01f6989760ad38e8c70c68e70e9d0961743be i18n/esn/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,4 +14,8 @@
- 	"fileBinaryError": "El archivo parece ser binario y no se puede abrir como texto",
- 	"err.create": "No se pudo crear el archivo {0}",
- 	"fileMoveConflict": "No se puede mover o copiar. El archivo ya existe en la ubicación de destino. "
-+=======
-+	"fileNotModifiedError": "Archivo no modificado desde",
-+	"fileBinaryError": "El archivo parece ser binario y no se puede abrir como texto"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e49927e3bdf91eb08ced657429584d077de52228 i18n/esn/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  our    100644 fed00bd32680a81ef2272a7f7f5db25e0b1f5c94 i18n/esn/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  their  100644 caa8ce6bf0013b31e5ccb2ed5aee668636d3d35e i18n/esn/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-changed in both
-  base   100644 302c7ed170b67df7c7253f5a7dade850bdcbcbca i18n/esn/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 5a34a01efe3be981f2f79fe82b2b70f00f7de801 i18n/esn/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 410c2efcbcbb1115a7d34e1054b4785a0243686a i18n/esn/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-changed in both
-  base   100644 83604230ec4d9b0f30399254ca5e2f6cc31dea0b i18n/esn/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  our    100644 3fc80146a13ac4d0fb26444f689ade8ddc44a010 i18n/esn/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  their  100644 e7f9d116f0184a7add12c292ea49766fcc201be0 i18n/esn/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-@@ -8,5 +8,10 @@
- 	],
- 	"errorInvalidTaskConfiguration": "No se puede escribir en el archivo de configuración del espacio de trabajo. Por favor, abra el archivo para corregir sus errores/advertencias e inténtelo de nuevo.",
- 	"errorWorkspaceConfigurationFileDirty": "No se puede escribir en el archivo de configuración de espacio de trabajo porque el archivo ha sido modificado. Por favor, guárdelo y vuelva a intentarlo.",
-+<<<<<<< .our
- 	"openWorkspaceConfigurationFile": "Configuración del espacio de trabajo abierta"
-+=======
-+	"openWorkspaceConfigurationFile": "Abrir archivo de configuración del área de trabajo",
-+	"close": "Cerrar"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c7e1b61f3ec5ed59936e065e9abf976b7d27c45e i18n/fra/extensions/git/out/autofetch.i18n.json
-  our    100644 3f1feec0c843445e5da3bdcdbe026cb81413d634 i18n/fra/extensions/git/out/autofetch.i18n.json
-  their  100644 54fcbb321ef6d280cfe5004e6709b442fbb41609 i18n/fra/extensions/git/out/autofetch.i18n.json
-@@ -7,7 +7,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"yes": "Oui",
-+<<<<<<< .our
- 	"no": "Non",
- 	"not now": "Me demander plus tard",
- 	"suggest auto fetch": "Voulez-vous que Code exécute [périodiquement 'git fetch']({0}) ?"
-+=======
-+	"read more": "Lire la suite",
-+	"no": "Non"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ec8efb3f0d7c9db3de2b430fa5b890ce09d681b1 i18n/fra/extensions/git/out/commands.i18n.json
-  our    100644 95b33e9cb37384a542e0f0621ed506addc05f3b9 i18n/fra/extensions/git/out/commands.i18n.json
-  their  100644 cc941a646ad841569c88ce288085911a8e533c0a i18n/fra/extensions/git/out/commands.i18n.json
-@@ -71,12 +71,19 @@
- 	"pick remote pull repo": "Choisir un dépôt distant duquel extraire la branche",
- 	"no remotes to push": "Votre dépôt n'a aucun dépôt distant configuré pour un Push.",
- 	"nobranch": "Vous devez extraire une branche dont vous souhaitez effectuer le Push vers un emplacement distant.",
-+<<<<<<< .our
- 	"confirm publish branch": "La branche '{0}' n'a pas de branche en amont. Voulez-vous publier cette branche ?",
- 	"ok": "OK",
- 	"push with tags success": "Envoyé (push) avec des balises.",
- 	"pick remote": "Choisissez un dépôt distant où publier la branche '{0}' :",
- 	"sync is unpredictable": "Cette action va effectuer un transfert (Push) et une récupération (Pull) des commits à destination et en provenance de '{0}/{1}'.",
- 	"never again": "OK, Ne plus afficher",
-+=======
-+	"ok": "OK",
-+	"push with tags success": "Envoyé (push) avec des balises.",
-+	"pick remote": "Choisissez un dépôt distant où publier la branche '{0}' :",
-+	"sync is unpredictable": "Cette action effectue un transfert (Push) et un tirage (Pull) des validations à destination et en provenance de '{0}'.",
-+>>>>>>> .their
- 	"no remotes to publish": "Votre dépôt n'a aucun dépôt distant configuré pour une publication.",
- 	"no changes stash": "Aucune modification à remiser (stash).",
- 	"provide stash message": "Spécifier éventuellement un message pour la remise (stash)",
-added in both
-  our    100644 1738a01dc86a6b278c846837e519b86be98cd86b i18n/fra/extensions/typescript/out/commands.i18n.json
-  their  100644 6c1e268636a398598dc2d0ca2dce2b7023c1f0e9 i18n/fra/extensions/typescript/out/commands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -13,4 +14,20 @@
- 	"typescript.noJavaScriptProjectConfig": "Le fichier ne fait pas partie d'un projet JavaScript. Cliquer [ici]({0}) pour en savoir plus.",
- 	"typescript.configureTsconfigQuickPick": "Configurer tsconfig.json",
- 	"typescript.configureJsconfigQuickPick": "Configurer jsconfig.json"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"typescript.projectConfigNoWorkspace": "Ouvrez un dossier dans VS Code pour utiliser un projet TypeScript ou JavaScript",
-+	"typescript.projectConfigUnsupportedFile": "Impossible de déterminer le projet TypeScript ou JavaScript. Type de fichier non pris en charge",
-+	"typescript.projectConfigCouldNotGetInfo": "Impossible de déterminer le projet TypeScript ou JavaScript",
-+	"typescript.noTypeScriptProjectConfig": "Le fichier ne fait pas partie d'un projet TypeScript",
-+	"typescript.noJavaScriptProjectConfig": "Le fichier ne fait pas partie d'un projet JavaScript",
-+	"typescript.configureTsconfigQuickPick": "Configurer tsconfig.json",
-+	"typescript.configureJsconfigQuickPick": "Configurer jsconfig.json",
-+	"typescript.projectConfigLearnMore": "En savoir plus"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 750d811d866eaa3d43818bd1d8e28c9898acf514 i18n/fra/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/fra/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"selectAriaOption": "{0}"
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-added in both
-  our    100644 35e988ef51fde8c623e4c8b67918761cbfe7d329 i18n/fra/src/vs/base/node/ps.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/fra/src/vs/base/node/ps.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"collecting": "Récupération des informations processeur et mémoire. Cela peut prendre quelques secondes."
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 dd19016cb459a92b6c18acdc20e0d80133be0e99 i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 1ad1b4ad7ba3d841a13ddfeab561381b182d7f45 i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 406f474987ef89483ce600f8d8386660291e1abe i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -16,7 +16,10 @@
- 	"lineNumbers.on": "Les numéros de ligne sont affichés en nombre absolu.",
- 	"lineNumbers.relative": "Les numéros de ligne sont affichés sous la forme de distance en lignes à la position du curseur.",
- 	"lineNumbers.interval": "Les numéros de ligne sont affichés toutes les 10 lignes.",
-+<<<<<<< .our
- 	"lineNumbers": "Contrôle l’affichage des numéros de ligne.",
-+=======
-+>>>>>>> .their
- 	"rulers": "Afficher les règles verticales après un certain nombre de caractères à espacement fixe. Utiliser plusieurs valeurs pour plusieurs règles. Aucune règle n'est dessinée si le tableau est vide",
- 	"wordSeparators": "Caractères utilisés comme séparateurs de mots durant la navigation ou les opérations basées sur les mots",
- 	"tabSize": "Le nombre d'espaces correspondant à une tabulation. Ce paramètre est remplacé en fonction du contenu du fichier quand 'editor.detectIndentation' est activé.",
-changed in both
-  base   100644 4bea17a181e6f3c8bf610dfeee088c6a024707f0 i18n/fra/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 e3b7be89c4680bacecf118915da9495bb164163d i18n/fra/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 f2cc0b4325a89c44451e40b4607bf44c8fe527e9 i18n/fra/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -8,8 +8,11 @@
- 	],
- 	"lineHighlight": "Couleur d'arrière-plan de la mise en surbrillance de la ligne à la position du curseur.",
- 	"lineHighlightBorderBox": "Couleur d'arrière-plan de la bordure autour de la ligne à la position du curseur.",
-+<<<<<<< .our
- 	"rangeHighlight": "Couleur d'arrière-plan des plages mises en surbrillance, par exemple par les fonctionnalités d'ouverture rapide et de recherche. La couleur ne doit pas être opaque pour ne pas masquer les décorations sous-jacentes.",
- 	"rangeHighlightBorder": "Couleur d'arrière-plan de la bordure autour des plages mises en surbrillance.",
-+=======
-+>>>>>>> .their
- 	"caret": "Couleur du curseur de l'éditeur.",
- 	"editorCursorBackground": "La couleur de fond du curseur de l'éditeur. Permet de personnaliser la couleur d'un caractère survolé par un curseur de bloc.",
- 	"editorWhitespaces": "Couleur des espaces blancs dans l'éditeur.",
-changed in both
-  base   100644 2e7dbc5e1ee03a2dfa6f52125f1f97d9f87ec6ef i18n/fra/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  our    100644 ea5476700aaf3baa2b1d9f2182980ee09877e07b i18n/fra/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  their  100644 e09d1ef1ebe9833a5ffa9f7c8fbb832813b3ec47 i18n/fra/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -10,4 +11,11 @@
- 	"markerAction.previous.label": "Aller au problème précédent (Erreur, Avertissement, Info)",
- 	"markerAction.nextInFiles.label": "Aller au problème suivant dans Fichiers (Erreur, Avertissement, Info)",
- 	"markerAction.previousInFiles.label": "Aller au problème précédent dans Fichiers (Erreur, Avertissement, Info)"
-+=======
-+	"title.wo_source": "({0}/{1})",
-+	"editorMarkerNavigationError": "Couleur d'erreur du widget de navigation dans les marqueurs de l'éditeur.",
-+	"editorMarkerNavigationWarning": "Couleur d'avertissement du widget de navigation dans les marqueurs de l'éditeur.",
-+	"editorMarkerNavigationInfo": "Couleur d’information du widget de navigation du marqueur de l'éditeur.",
-+	"editorMarkerNavigationBackground": "Arrière-plan du widget de navigation dans les marqueurs de l'éditeur."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 45974daea0a3b23575493224f878de50cb38f733 i18n/fra/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  our    100644 0eab06eb685f4758358cca5f7016ccbea93a5376 i18n/fra/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  their  100644 9b718f920086f343eae9c3decae9933ee46d7aac i18n/fra/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,10 @@
- 	"wordHighlightStrongBorder": "Couleur de bordure d'un symbole durant l'accès en écriture, par exemple l'écriture dans une variable.",
- 	"overviewRulerWordHighlightForeground": "Couleur du marqueur de la règle d'aperçu pour les mises en surbrillance de symbole. La couleur doit ne pas être opaque pour ne pas masquer les décorations du dessous.",
- 	"overviewRulerWordHighlightStrongForeground": "Couleur du marqueur de la règle d'aperçu pour les mises en surbrillance de symbole d'accès en écriture. La couleur doit ne pas être opaque pour ne pas masquer les décorations du dessous.",
-+=======
-+	"overviewRulerWordHighlightForeground": "Couleur du marqueur de la règle d'aperçu pour la mise en évidence de symbole.",
-+	"overviewRulerWordHighlightStrongForeground": "Couleur du marqueur de la règle d'aperçu la mise en évidence de symbole d’accès en écriture.",
-+>>>>>>> .their
- 	"wordHighlight.next.label": "Aller à la prochaine mise en évidence de symbole",
- 	"wordHighlight.previous.label": "Aller à la mise en évidence de symbole précédente"
- }
-\ No newline at end of file
-changed in both
-  base   100644 ed0024d2710056b6d6aa2cc7085850607a7ec970 i18n/fra/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  our    100644 8224c04d14f4b9a2a9f4bfece560cc047b4d9b4d i18n/fra/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  their  100644 f13a4bbc9e9acb8a343321c0ceb324931c583f8e i18n/fra/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 f676e6c787f3387989d02061946c3167f2b6852a i18n/fra/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 3a6ec15a4d0b2f141967d5aa037637bcdca560c3 i18n/fra/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 7b909d1fca4c04119fc6bee39d2c48c934a4df4c i18n/fra/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,11 +10,19 @@
- 	"diff": "Comparez deux fichiers entre eux.",
- 	"add": "Ajoutez un ou plusieurs dossiers à la dernière fenêtre active.",
- 	"goto": "Ouvrez un fichier dans le chemin, à la ligne et la position de caractère spécifiées.",
-+<<<<<<< .our
- 	"newWindow": "Force à ouvrir une nouvelle fenêtre.",
- 	"reuseWindow": "Force à ouvrir un fichier ou un dossier dans la dernière fenêtre active.",
- 	"wait": "Attendre que les fichiers soient fermés avant de retourner.",
- 	"locale": "Paramètres régionaux à utiliser (exemple : fr-FR ou en-US).",
- 	"userDataDir": "Spécifie le répertoire de l’utilisateur dans lequel les données sont conservées. Peut être utilisé pour ouvrir plusieurs instances distinctes du Code.",
-+=======
-+	"newWindow": "Forcez l'utilisation d'une nouvelle instance de Code.",
-+	"reuseWindow": "Forcez l'ouverture d'un fichier ou dossier dans la dernière fenêtre active.",
-+	"wait": "Attendre que les fichiers soient fermés avant de retourner.",
-+	"locale": "Paramètres régionaux à utiliser (exemple : fr-FR ou en-US).",
-+	"userDataDir": "Spécifie le répertoire où sont conservées les données des utilisateurs. S'avère utile pour une exécution en tant que root.",
-+>>>>>>> .their
- 	"version": "Affichez la version.",
- 	"help": "Affichez le mode d'utilisation.",
- 	"extensionHomePath": "Définissez le chemin racine des extensions.",
-@@ -22,18 +30,28 @@
- 	"showVersions": "Affichez les versions des extensions installées, quand --list-extension est utilisé.",
- 	"installExtension": "Installe une extension.",
- 	"uninstallExtension": "Désinstalle une extension.",
-+<<<<<<< .our
- 	"experimentalApis": "Active les fonctionnalités de l’API proposées pour une extension.",
-+=======
-+	"experimentalApis": "Active les fonctionnalités d'API proposées pour une extension.",
-+>>>>>>> .their
- 	"verbose": "Affichez la sortie détaillée (implique --wait).",
- 	"log": "Niveau de journalisation à utiliser. La valeur par défaut est 'info'. Les valeurs autorisées sont 'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off.",
- 	"status": "Imprimer l'utilisation de processus et l'information des diagnostics.",
- 	"performance": "Démarrez avec la commande 'Développeur : performance de démarrage' activée.",
- 	"prof-startup": "Exécuter le profileur d'UC au démarrage",
- 	"disableExtensions": "Désactivez toutes les extensions installées.",
-+<<<<<<< .our
- 	"inspect-extensions": "Permettre le débogage et le profilage d’extensions. Vérifier les outils de développement pour l'URI de connexion.",
- 	"inspect-brk-extensions": "Permettre le débogage et le profilage d’extensions avec l’hôte de l’extension étant suspendu après le démarrage. Vérifier les outils de développement pour l'URI de connexion.",
- 	"disableGPU": "Désactivez l'accélération matérielle du GPU.",
- 	"uploadLogs": "Upload les logs depuis la session actuelle vers le endpoint sécurisé.",
- 	"maxMemory": "Taille mémoire maximale pour une fenêtre (En Megaoctêts)",
-+=======
-+	"inspect-extensions": "Autorise le débogage et le profilage des extensions. Vérifier les outils de développements pour l'uri de connexion.",
-+	"inspect-brk-extensions": "Autorise le débogage et le profilage des extensions avec l'hôte d'extensions en pause après le démarrage. Vérifier les outils de développement pour l'uri de connexion.",
-+	"disableGPU": "Désactivez l'accélération matérielle du GPU.",
-+>>>>>>> .their
- 	"usage": "Utilisation",
- 	"options": "options",
- 	"paths": "chemins",
-changed in both
-  base   100644 620e2694e2a1d0a6da7943187ec6d8c18e8a6159 i18n/fra/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 6d87da3180e1228e72028373cd528db86fbc5793 i18n/fra/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 40c901eec8fb8f08acc2cb2af69dfb6a29aa1774 i18n/fra/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -7,17 +7,23 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"invalidManifest": "Extension non valide : package.json n'est pas un fichier JSON.",
-+<<<<<<< .our
- 	"incompatible": "Impossible d’installer l’Extension '{0}' car elle n’est pas compatible avec VS Code '{1}'.",
-+=======
-+>>>>>>> .their
- 	"restartCode": "Redémarrez Code avant de réinstaller {0}.",
- 	"installingOutdatedExtension": "Une version plus récente de cette extension est déjà installée. Voulez-vous remplacer celle-ci avec l'ancienne version ?",
- 	"override": "Remplacer",
- 	"cancel": "Annuler",
-+<<<<<<< .our
- 	"errorInstallingDependencies": "Erreur lors de l'installation des dépendances. {0}",
- 	"MarketPlaceDisabled": "Le marketplace n’est pas activé",
- 	"removeError": "Erreur lors de la suppression de l’extension : {0}. Veuillez quitter et relancer VS Code avant de réessayer.",
- 	"Not a Marketplace extension": "Seules les Extensions de Marketplace peuvent être réinstallées",
- 	"notFoundCompatible": "Impossible d’installer '{0}'; Il n’y a pas de version disponible compatible avec VS Code '{1}'.",
- 	"malicious extension": "Impossible d’installer l'extension car elle a été signalée comme problématique.",
-+=======
-+>>>>>>> .their
- 	"notFoundCompatibleDependency": "Installation impossible car l'extension dépendante '{0}' compatible avec la version actuelle '{1}' de VS Code est introuvable.",
- 	"quitCode": "Impossible d’installer l’extension. Veuillez s’il vous plaît quitter et redémarrer VS Code avant de le réinstaller.",
- 	"exitCode": "Impossible d’installer l’extension. Veuillez s’il vous plaît sortir et redémarrer VS Code avant de le réinstaller.",
-changed in both
-  base   100644 93ee2acf35baf432241e2bcfe97de0760b10a71b i18n/fra/src/vs/platform/message/common/message.i18n.json
-  our    100644 c755d6892fe621e543d3e26012e16cb326775c48 i18n/fra/src/vs/platform/message/common/message.i18n.json
-  their  100644 227d6123d7a19d1e20bbf61ce8249d086f9cd07f i18n/fra/src/vs/platform/message/common/message.i18n.json
-changed in both
-  base   100644 64fc37335ec6239b5488584e47e510ccf3900e95 i18n/fra/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 30e1e919ce20ea7d38be72764392ce906b3ac7c0 i18n/fra/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 2d46ac2791e91c1c03e66a90426ae54a2eac5cfe i18n/fra/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -68,6 +68,7 @@
- 	"editorWidgetBorder": "Couleur de bordure des widgets de l'éditeur. La couleur est utilisée uniquement si le widget choisit d'avoir une bordure et si la couleur n'est pas remplacée par un widget.",
- 	"editorSelectionBackground": "Couleur de la sélection de l'éditeur.",
- 	"editorSelectionForeground": "Couleur du texte sélectionné pour le contraste élevé.",
-+<<<<<<< .our
- 	"editorInactiveSelection": "Couleur de sélection dans un éditeur inactif. La couleur doit ne pas être opaque afin de ne pas masquer les décorations sous-jacentes.",
- 	"editorSelectionHighlight": "Couleur des régions avec le même contenu que la sélection. La couleur doit ne pas être opaque afin de ne pas masquer les décorations sous-jacentes.",
- 	"editorSelectionHighlightBorder": "Couleur de bordure des régions dont le contenu est identique à la sélection.",
-@@ -79,6 +80,9 @@
- 	"findRangeHighlightBorder": "Couleur de la bordure limitant la recherche. La couleur ne doit pas être opaque pour ne pas masquer les décorations sous-jacentes. ",
- 	"findWidgetResizeBorder": "Couleur de la bordure de la barre de redimensionnement du widget de recherche.",
- 	"hoverHighlight": "Mettre en surbrillance ci-dessous le mot pour lequel un survol est affiché. La couleur doit ne pas être opaque afin de ne pas masquer les décorations sous-jacentes.",
-+=======
-+	"editorFindMatch": "Couleur du résultat de recherche actif.",
-+>>>>>>> .their
- 	"hoverBackground": "Couleur d'arrière-plan du pointage de l'éditeur.",
- 	"hoverBorder": "Couleur de bordure du pointage de l'éditeur.",
- 	"activeLinkForeground": "Couleur des liens actifs.",
-@@ -86,12 +90,15 @@
- 	"diffEditorRemoved": "Couleur de fond pour le texte qui est retiré. La couleur doit ne pas être opaque pour ne pas masquer les décorations du dessous. ",
- 	"diffEditorInsertedOutline": "Couleur de contour du texte inséré.",
- 	"diffEditorRemovedOutline": "Couleur de contour du texte supprimé.",
-+<<<<<<< .our
- 	"mergeCurrentHeaderBackground": "Arrière-plan de l'en-tête en cours dans les conflits de fusion inline. La couleur doit ne pas être opaque afin de ne pas masquer les décorations sous-jacentes.",
- 	"mergeCurrentContentBackground": "Arrière-plan du contenu en cours dans les conflits de fusion inline. La couleur doit ne pas être opaque afin de ne pas masquer les décorations sous-jacentes.",
- 	"mergeIncomingHeaderBackground": "Arrière-plan de l'en-tête qui arrive dans les conflits de fusion inline. La couleur doit ne pas être opaque afin de ne pas masquer les décorations sous-jacentes.",
- 	"mergeIncomingContentBackground": "Arrière-plan du contenu qui arrive dans les conflits de fusion inline. La couleur doit ne pas être opaque afin de ne pas masquer les décorations sous-jacentes.",
- 	"mergeCommonHeaderBackground": "Arrière-plan de l'en-tête de l'ancêtre commun dans les conflits de fusion inline. La couleur doit ne pas être opaque afin de ne pas masquer les décorations sous-jacentes.",
- 	"mergeCommonContentBackground": "Arrière-plan du contenu de l'ancêtre commun dans les conflits de fusion inline. La couleur ne doit pas être opaque pour ne pas masquer les décorations sous-jacentes.",
-+=======
-+>>>>>>> .their
- 	"mergeBorder": "Couleur de bordure des en-têtes et du séparateur dans les conflits de fusion inline.",
- 	"overviewRulerCurrentContentForeground": "Premier plan de la règle d'aperçu actuelle pour les conflits de fusion inline.",
- 	"overviewRulerIncomingContentForeground": "Premier plan de la règle d'aperçu entrante pour les conflits de fusion inline.",
-added in both
-  our    100644 8e1c626a771393d667c7b3c11b9837bda978f030 i18n/fra/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/fra/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,4 +11,12 @@
- 	"codeActionsOnSave.didTimeout": "codeActionsOnSave abandonné au bout de {0} ms",
- 	"timeout.onWillSave": "OnWillSaveTextDocument-event avorté après 1750 ms",
- 	"saveParticipants": "Exécution de la sauvegarde des participants..."
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 2c25d01eeb19c95193f0492c7f1fc02377b2fcda i18n/fra/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  our    100644 103c4bd542cf3db7d39d94ae35fdf26541c9c1f7 i18n/fra/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  their  100644 42b1301caed28cd8568a1e1a0799f9e09c11b59a i18n/fra/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,7 @@
- 	],
- 	"treeView.notRegistered": "Aucune arborescence avec l'ID '{0}' n'est inscrite.",
- 	"treeView.duplicateElement": "L'élément avec l'id {0} est déjà inscrit"
-+=======
-+	"treeView.notRegistered": "Aucune arborescence avec l'ID '{0}' n'est inscrite."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6158fd5950f60d0fb321999752337ae839d70eca i18n/fra/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 4522e0fd127e1bcf08d6748e14cb70d5513ca327 i18n/fra/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 3bffd603d63ad73618ba9aaf32d17eedaed6a9d5 i18n/fra/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -15,5 +15,9 @@
- 	"saveWorkspace": "Enregistrer l’espace de travail",
- 	"openWorkspaceAction": "Ouvrir un espace de travail...",
- 	"openWorkspaceConfigFile": "Ouvrir le Fichier de Configuration d’espace de travail",
-+<<<<<<< .our
- 	"duplicateWorkspaceInNewWindow": "Dupliquer l'espace de travail dans une Nouvelle fenêtre"
-+=======
-+	"openFolderAsWorkspaceInNewWindow": "Ouvrir le dossier en tant qu'espace de travail dans une nouvelle fenêtre"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 2128948d9da5493ae61953e282e5a735987d700e i18n/fra/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-  their  100644 b644d1c957219a02841597400a272aa3809511c3 i18n/fra/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"addFolderToWorkspace": "Ajouter un dossier à l'espace de travail...",
- 	"add": "&&Ajouter",
- 	"addFolderToWorkspaceTitle": "Ajouter un dossier à l'espace de travail",
-changed in both
-  base   100644 4326e29e9e49ede05fc9a84a852a08c1d90f0166 i18n/fra/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  our    100644 c9bb8bcfa2ee1a86019d6b2302e1485e65aabd3f i18n/fra/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  their  100644 0db82346ee1c50c6f7718b3202404266f4839ffb i18n/fra/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-@@ -19,6 +19,7 @@
- 	"close": "Fermer",
- 	"closeOthers": "Fermer les autres",
- 	"closeRight": "Fermer à droite",
-+<<<<<<< .our
- 	"closeAllSaved": "Fermer la version sauvegardée",
- 	"closeAll": "Tout fermer",
- 	"keepOpen": "Garder ouvert",
-@@ -27,6 +28,15 @@
- 	"keepEditor": "Conserver l'éditeur",
- 	"closeEditorsInGroup": "Fermer tous les éditeurs du groupe",
- 	"closeSavedEditors": "Fermer les éditeurs sauvegardés dans le groupe",
-+=======
-+	"closeAllUnmodified": "Fermer les éléments non modifiés",
-+	"closeAll": "Tout fermer",
-+	"keepOpen": "Garder ouvert",
-+	"showOpenedEditors": "Afficher les éditeurs ouverts",
-+	"keepEditor": "Conserver l'éditeur",
-+	"closeEditorsInGroup": "Fermer tous les éditeurs du groupe",
-+	"closeUnmodifiedEditors": "Fermer les éditeurs non modifiés du groupe",
-+>>>>>>> .their
- 	"closeOtherEditors": "Fermer les autres éditeurs",
- 	"closeRightEditors": "Fermer les éditeurs situés à droite"
- }
-\ No newline at end of file
-changed in both
-  base   100644 19586632ac858e36172c4be96e6a80966d8ff6c4 i18n/fra/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 1cdd98b12a70baa1c905f59b19493e7b2e495bea i18n/fra/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 e7febec4edac2daca7b011b0c49b83ad81caf631 i18n/fra/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 be96f08df0d60445d3a3ca3daec4ba2b561cd205 i18n/fra/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  our    100644 fd29dc9390d1c5bacd1f28330b66131ba6f6a44b i18n/fra/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  their  100644 5dc335cf48b5fb68aacd964d41a1f8bb9c80182a i18n/fra/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-changed in both
-  base   100644 92e9eaf8779ac8dbccad9621efae7579ea536f08 i18n/fra/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  our    100644 19f6bbbcc307571a9164ed53bc3f4813b55da8ce i18n/fra/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  their  100644 c8b5ce11fb1b9506d2dcce0c3040a35f77a5bf03 i18n/fra/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-@@ -12,6 +12,10 @@
- 	"editableEditorWithInputAriaLabel": "{0}. Éditeur de comparaison de fichier texte.",
- 	"editableEditorAriaLabel": "Éditeur de comparaison de fichier texte.",
- 	"navigate.next.label": "Modification suivante",
-+<<<<<<< .our
- 	"navigate.prev.label": "Modification précédente",
- 	"toggleIgnoreTrimWhitespace.label": "Ignorer la suppression des espaces"
-+=======
-+	"navigate.prev.label": "Modification précédente"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 99c0ec41f617e9310dcaf188f3e054eef17590eb i18n/fra/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  our    100644 628561d4d2ce7df0d246ee2b11ec756535486af1 i18n/fra/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  their  100644 a0384c94b7a7caa63e42bf054dee2a64324d0d9b i18n/fra/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"close": "Fermer",
-+>>>>>>> .their
- 	"araLabelEditorActions": "Actions de l'éditeur"
- }
-\ No newline at end of file
-changed in both
-  base   100644 0082e6d4ec103ec09a23bd56ca76408ee4620ddc i18n/fra/src/vs/workbench/common/theme.i18n.json
-  our    100644 67b5e93740c6b4696aa15e5da68929b00e585c36 i18n/fra/src/vs/workbench/common/theme.i18n.json
-  their  100644 d89c104a156a95d3258ebcc5666faea1ebb9cc0d i18n/fra/src/vs/workbench/common/theme.i18n.json
-@@ -24,7 +24,10 @@
- 	"editorGroupBackground": "Couleur d'arrière-plan d'un groupe d'éditeurs. Les groupes d'éditeurs sont les conteneurs des éditeurs. La couleur d'arrière-plan s'affiche pendant le glissement de groupes d'éditeurs.",
- 	"tabsContainerBackground": "Couleur d'arrière-plan de l'en-tête du titre du groupe d'éditeurs quand les onglets sont activés. Les groupes d'éditeurs sont les conteneurs des éditeurs.",
- 	"tabsContainerBorder": "Couleur de bordure de l'en-tête du titre du groupe d'éditeurs quand les onglets sont activés. Les groupes d'éditeurs sont les conteneurs des éditeurs.",
-+<<<<<<< .our
- 	"editorGroupHeaderBackground": "Couleur d'arrière-plan de l'en-tête du titre du groupe d'éditeurs quand les onglets sont désactivés (`\"workbench.editor.showTabs\": false`). Les groupes d'éditeurs sont les conteneurs des éditeurs.",
-+=======
-+>>>>>>> .their
- 	"editorGroupBorder": "Couleur séparant plusieurs groupes d'éditeurs les uns des autres. Les groupes d'éditeurs sont les conteneurs des éditeurs.",
- 	"editorDragAndDropBackground": "Couleur d'arrière-plan lors du déplacement des éditeurs par glissement. La couleur doit avoir une transparence pour que le contenu de l'éditeur soit visible à travers.",
- 	"panelBackground": "Couleur d'arrière-plan du panneau. Les panneaux s'affichent sous la zone d'éditeurs et contiennent des affichages tels que la sortie et le terminal intégré.",
-@@ -41,8 +44,11 @@
- 	"statusBarNoFolderBorder": "Couleur de la bordure qui sépare la barre latérale et l’éditeur lorsque aucun dossier ne s’ouvre la barre d’état. La barre d’état s’affiche en bas de la fenêtre.",
- 	"statusBarItemActiveBackground": "Couleur d'arrière-plan de l'élément de la barre d'état durant un clic. La barre d'état est affichée en bas de la fenêtre.",
- 	"statusBarItemHoverBackground": "Couleur d'arrière-plan de l'élément de la barre d'état durant un pointage. La barre d'état est affichée en bas de la fenêtre.",
-+<<<<<<< .our
- 	"statusBarProminentItemBackground": "Couleur d'arrière-plan des éléments importants de la barre d'état. Les éléments importants se différencient des autres entrées de la barre d'état pour indiquer l'importance. Changer le mode `Appuyer sur la touche tabulation déplace le focus` depuis la palette de commandes pour voir un exemple. La barre d'état est affichée en bas de la fenêtre.",
- 	"statusBarProminentItemHoverBackground": "Couleur d'arrière-plan des éléments importants de la barre d'état lors du survol. Les éléments importants se différencient des autres entrées de la barre d'état pour indiquer l'importance. Changer le mode `Appuyer sur la touche tabulation déplace le focus` depuis la palette de commandes pour voir un exemple. La barre d'état est affichée en bas de la fenêtre.",
-+=======
-+>>>>>>> .their
- 	"activityBarBackground": "Couleur d'arrière-plan de la barre d'activités. La barre d'activités s'affiche complètement à gauche ou à droite, et permet de naviguer entre les affichages de la barre latérale.",
- 	"activityBarForeground": "Couleur de premier plan de la barre d'activités (par ex., utilisée pour les icônes). La barre d'activités s'affiche complètement à gauche ou à droite, et permet de parcourir les vues de la barre latérale.",
- 	"activityBarBorder": "Couleur de bordure de la barre d'activités faisant la séparation avec la barre latérale. La barre d'activités, située à l'extrême droite ou gauche, permet de parcourir les vues de la barre latérale.",
-added in both
-  our    100644 f67d84f0a4de973e8d50c2dc122c6c2b23ad157d i18n/fra/src/vs/workbench/common/views.i18n.json
-  their  100644 e7ba8e9e54b2d05bb081b7d561fbfffe91a93e59 i18n/fra/src/vs/workbench/common/views.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"duplicateId": "Une vue avec l’id `{0}` est déjà enregistrée à l’emplacement `{1}`"
- }
-\ No newline at end of file
-changed in both
-  base   100644 541429a54086804cccb221a94137634a9048efc9 i18n/fra/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 8f9f7eb339d47d55df577bac8ccf306bd77eb0fa i18n/fra/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 93919d9a8514e2ca94a94b83d74c2c85bce322eb i18n/fra/src/vs/workbench/electron-browser/actions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"closeWindow": "Fermer la fenêtre",
- 	"closeWorkspace": "Fermer l’espace de travail",
- 	"noWorkspaceOpened": "Il n’y a actuellement aucun espace de travail ouvert dans cette instance à fermer.",
-@@ -50,6 +53,14 @@
- 	"moveWindowTabToNewWindow": "Déplacer l’onglet de la fenêtre vers la nouvelle fenêtre",
- 	"mergeAllWindowTabs": "Fusionner toutes les fenêtres",
- 	"toggleWindowTabsBar": "Activer/désactiver la barre de fenêtres d’onglets",
-+<<<<<<< .our
- 	"about": "À propos de {0}",
- 	"inspect context keys": "Inspecter les clés de contexte"
-+=======
-+	"configureLocale": "Configurer la langue",
-+	"displayLanguage": "Définit le langage affiché par VSCode.",
-+	"doc": "Consultez {0} pour connaître la liste des langues prises en charge.",
-+	"restart": "Le changement de la valeur nécessite le redémarrage de VS Code.",
-+	"fail.createSettings": "Impossible de créer '{0}' ({1})."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7c7573087ca85319c16384f5f8cf3c56ced0b16b i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 1a663cb4405d0c8f86ec154a57cdd2b613d93195 i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 ad524f220e9ae3754cd192832fd587164dead852 i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,12 +35,19 @@
- 	"panelDefaultLocation": "Contrôle l’emplacement par défaut du panneau. Il peut être affiché soit en bas ou à droite du banc d'essai.",
- 	"statusBarVisibility": "Contrôle la visibilité de la barre d'état au bas du banc d'essai.",
- 	"activityBarVisibility": "Contrôle la visibilité de la barre d'activités dans le banc d'essai.",
-+<<<<<<< .our
- 	"viewVisibility": "Contrôle la visibilité des actions d'en-tête de vue. Les actions d'en-tête de vue peuvent être soit toujours visibles, ou uniquement visibles quand cette vue a le focus ou est survolée.",
- 	"fontAliasing": "Contrôle la méthode de font aliasing dans le workbench.\n- default : Lissage des polices de sous-pixel. Sur la plupart des affichages non-ratina, cela vous donnera le texte le plus vif\n- antialiased : Lisse les polices au niveau du pixel, plutôt que les sous-pixels. Peut faire en sorte que la police apparaisse plus fine dans l’ensemble \n- none : Désactive le lissage des polices. Le texte s'affichera avec des bordures dentelées\n- auto: Applique `default` ou `antialiased` automatiquement en se basant sur la résolution de l'affichage.",
- 	"workbench.fontAliasing.default": "Lissage de sous-pixel des polices. Sur la plupart des affichages non-retina, cela vous donnera le texte le plus vif.",
- 	"workbench.fontAliasing.antialiased": "Lisser les polices au niveau du pixel, plutôt que les sous-pixels. Peut faire en sorte que la police apparaisse plus légère dans l’ensemble.",
- 	"workbench.fontAliasing.none": "Désactive le lissage des polices. Le texte s'affichera avec des bordures dentelées.",
- 	"workbench.fontAliasing.auto": "Applique `default` ou `antialiased`automatiquement en se basant sur la résolution de l'affichage.",
-+=======
-+	"fontAliasing": "Contrôle la méthode de font aliasing dans le workbench.\n- par défaut : Lissage des polices de sous-pixel. Sur la plupart des affichages non-ratina, cela vous donnera le texte le plus vif\n- crénelées : Lisse les polices au niveau du pixel, plutôt que les sous-pixels. Peut faire en sorte que la police apparaisse plus légère dans l’ensemble \n- none : désactive le lissage des polices. Le texte s'affichera avec des bordures dentelées",
-+	"workbench.fontAliasing.default": "Lissage de sous-pixel des polices. Sur la plupart des affichages non-retina, cela vous donnera le texte le plus vif.",
-+	"workbench.fontAliasing.antialiased": "Lisser les polices au niveau du pixel, plutôt que les sous-pixels. Peut faire en sorte que la police apparaisse plus légère dans l’ensemble.",
-+	"workbench.fontAliasing.none": "Désactive le lissage des polices. Le texte s'affichera avec des bordures dentelées.",
-+>>>>>>> .their
- 	"enableNaturalLanguageSettingsSearch": "Contrôle s’il faut activer le mode de recherche en langage naturel pour les paramètres.",
- 	"windowConfigurationTitle": "Fenêtre",
- 	"window.openFilesInNewWindow.on": "Les fichiers s'ouvrent dans une nouvelle fenêtre",
-changed in both
-  base   100644 6740cff8f8e6f7e8f1a7088c19f237f174194b36 i18n/fra/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  our    100644 d0bcb578d2b9d02993bd911e832231746bf9f3a3 i18n/fra/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  their  100644 c08a897c7ff95221728d0781b37f2bf40f89822c i18n/fra/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"debug.terminal.title": "élément débogué"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8fadf8b958bad5b0f9ead536beda02b61da7f096 i18n/fra/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  our    100644 3551b5e036401750ea0c8346808de61f5309a6a0 i18n/fra/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  their  100644 f5bf621cde95c62f04cc51bef66ba5cace65d680 i18n/fra/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-changed in both
-  base   100644 32c0006fd6719b621f6db26f320d872d5575dab1 i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 3c10fdb84d0f8c069b4d8fe6dac7e8ac54606d34 i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 deaa7b6f4229c86a40c6b1806ce8288565b321f1 i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,11 @@
- 	"exeBasedRecommendation": "Cette extension est recommandée parce que {0} est installé.",
- 	"fileBasedRecommendation": "Cette extension est recommandée basé sur les fichiers que vous avez ouverts récemment.",
- 	"workspaceRecommendation": "Cette extension est recommandée par les utilisateurs de l’espace de travail actuel.",
-+=======
-+	"workspaceRecommendation": "Cette extension est recommandée par les utilisateurs de l’espace de travail actuel.",
-+	"fileBasedRecommendation": "Cette extension est recommandée basé sur les fichiers que vous avez ouverts récemment.",
-+	"exeBasedRecommendation": "Cette extension est recommandée parce que {0} est installé.",
-+>>>>>>> .their
- 	"reallyRecommended2": "L'extension '{0}' est recommandée pour ce type de fichier.",
- 	"reallyRecommendedExtensionPack": "Le pack d’extensions '{0}' est recommandé pour ce type de fichier.",
- 	"install": "Installer",
-added in both
-  our    100644 8906c9a19860e81f0b3f75d9e867cf511e34d43d i18n/fra/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-  their  100644 92f8f5bfde6c159dbe207ca7a068419e2e63f8be i18n/fra/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,13 @@
- 	],
- 	"workbenchConfigurationTitle": "Banc d'essai",
- 	"feedbackVisibility": "Contrôle la visibilité du feedback Twitter (smiley) dans la barre d'état au bas du banc d'essai."
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"workbenchConfigurationTitle": "Banc d'essai"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 b737c209cdb7633db0d3e2bd2d7f214f7a292000 i18n/fra/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/fra/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"hide": "Masquer"
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 54a25f75ec00386fd9ea6fad3d9def717ce63fbd i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  our    100644 722fad1246b7935d1c18bb1776f817604a55c3ac i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  their  100644 6b95908d9abaf0f2ddaeff16117a41d9eb9b5e7f i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-@@ -12,7 +12,10 @@
- 	"revertLocalChanges": "Ignorer les modifications locales et restaurer le contenu sur disque",
- 	"copyPathOfActive": "Copier le chemin du fichier actif",
- 	"saveAllInGroup": "Enregistrer tout dans le groupe",
-+<<<<<<< .our
- 	"saveFiles": "Enregistrer tous les fichiers",
-+=======
-+>>>>>>> .their
- 	"revert": "Rétablir le fichier",
- 	"compareActiveWithSaved": "Compare le fichier actif avec celui enregistré",
- 	"closeEditor": "Fermer l'éditeur",
-@@ -24,12 +27,19 @@
- 	"copyPath": "Copier le chemin",
- 	"saveAll": "Enregistrer tout",
- 	"compareWithSaved": "Comparer avec celui enregistré",
-+<<<<<<< .our
- 	"compareWithSelected": "Comparer avec ce qui est sélectionné",
- 	"compareSource": "Sélectionner pour comparer",
- 	"compareSelected": "Comparer le sélectionné",
- 	"close": "Fermer",
- 	"closeOthers": "Fermer les autres",
- 	"closeSaved": "Fermer la version sauvegardée",
-+=======
-+	"compareSource": "Sélectionner pour comparer",
-+	"close": "Fermer",
-+	"closeOthers": "Fermer les autres",
-+	"closeUnmodified": "Fermer les éléments non modifiés",
-+>>>>>>> .their
- 	"closeAll": "Tout fermer",
- 	"deleteFile": "Supprimer définitivement"
- }
-\ No newline at end of file
-changed in both
-  base   100644 002c86e7daa11ee8e4cb8e14c577629400ceb3ea i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 fa117de3746fd117674712532fb1af257c3eacf4 i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 c54a8d0847c17c130e10f0304f8a2a8162a2fd8b i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"newFile": "Nouveau fichier",
- 	"newFolder": "Nouveau dossier",
- 	"rename": "Renommer",
-@@ -13,7 +16,11 @@
- 	"copyFile": "Copier",
- 	"pasteFile": "Coller",
- 	"retry": "Réessayer",
-+<<<<<<< .our
- 	"renameWhenSourcePathIsParentOfTargetError": "Veuillez utiliser la commande 'Nouveau dossier' ou 'Nouveau fichier\" pour ajouter des enfants à un dossier existant",
-+=======
-+	"openFolderFirst": "Ouvrez d'abord un dossier pour y créer des fichiers ou des dossiers.",
-+>>>>>>> .their
- 	"newUntitledFile": "Nouveau fichier sans titre",
- 	"createNewFile": "Nouveau fichier",
- 	"createNewFolder": "Nouveau dossier",
-@@ -43,11 +50,19 @@
- 	"confirmDeleteMessageMultiple": "Êtes-vous sûr de vouloir supprimer définitivement les fichiers {0} suivants ?",
- 	"confirmDeleteMessageFolder": "Voulez-vous vraiment supprimer définitivement '{0}' et son contenu ?",
- 	"confirmDeleteMessageFile": "Voulez-vous vraiment supprimer définitivement '{0}' ?",
-+<<<<<<< .our
- 	"addFiles": "Ajouter des fichiers",
- 	"confirmOverwrite": "Un fichier ou dossier portant le même nom existe déjà dans le dossier de destination. Voulez-vous le remplacer ?",
- 	"replaceButtonLabel": "&&Remplacer",
- 	"fileIsAncestor": "Le fichier à copier est un ancêtre du dossier de destination",
- 	"fileDeleted": "Le fichier à coller a été supprimé ou déplacé pendant ce temps",
-+=======
-+	"irreversible": "Cette action est irréversible !",
-+	"permDelete": "Supprimer définitivement",
-+	"importFiles": "Importer des fichiers",
-+	"confirmOverwrite": "Un fichier ou dossier portant le même nom existe déjà dans le dossier de destination. Voulez-vous le remplacer ?",
-+	"replaceButtonLabel": "&&Remplacer",
-+>>>>>>> .their
- 	"duplicateFile": "Doublon",
- 	"globalCompareFile": "Comparer le fichier actif à...",
- 	"openFileToCompare": "Ouvrez d'abord un fichier pour le comparer à un autre fichier.",
-changed in both
-  base   100644 ee5d441071a6cd936fce7f8abe031a76dad156a7 i18n/fra/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  our    100644 a0333b3b922295d2ae3b0a9c2995ea463fc0a7ce i18n/fra/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  their  100644 01118df61d26032e877dcdf9979c75f0db7af697 i18n/fra/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,14 +7,21 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"revealInWindows": "Révéler dans l'Explorateur",
- 	"revealInMac": "Révéler dans le Finder",
- 	"openContainer": "Ouvrir le dossier contenant",
- 	"saveAs": "Enregistrer sous...",
- 	"save": "Enregistrer",
- 	"saveAll": "Enregistrer tout",
-+<<<<<<< .our
- 	"removeFolderFromWorkspace": "Supprimer le dossier de l'espace de travail",
- 	"genericRevertError": "Échec pour faire revenir '{0}' : {1}",
-+=======
-+	"saveFiles": "Enregistrer tous les fichiers",
-+	"removeFolderFromWorkspace": "Supprimer le dossier de l'espace de travail",
-+>>>>>>> .their
- 	"modifiedLabel": "{0} (sur le disque) ↔ {1}",
- 	"openFileToReveal": "Ouvrir d'abord un fichier à révéler",
- 	"openFileToCopy": "Ouvrir d'abord un fichier pour copier son chemin"
-changed in both
-  base   100644 9693ca31c50911feab4d02a16763cfd2142313b0 i18n/fra/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 a75d38efac11add868250527f11214dd6ff75d12 i18n/fra/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 906663f100ad125ebf75d72043d1de73855bc293 i18n/fra/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-@@ -40,7 +40,10 @@
- 	"formatOnSave": "Met en forme un fichier au moment de l'enregistrement. Un formateur doit être disponible, le fichier ne doit pas être enregistré automatiquement, et l'éditeur ne doit pas être en cours d'arrêt.",
- 	"formatOnSaveTimeout": "Délai d’attente pour formater lors de l'enregistrement. Spécifie le délai en millisecondes pour les commandes formatOnSave. Les commandes prenant plus de temps que le délai d’attente spécifié seront annulées.",
- 	"explorerConfigurationTitle": "Explorateur de fichiers",
-+<<<<<<< .our
- 	"openEditorsVisible": "Nombre d'éditeurs affichés dans le volet Éditeurs ouverts.",
-+=======
-+>>>>>>> .their
- 	"autoReveal": "Contrôle si l'Explorateur doit automatiquement afficher et sélectionner les fichiers à l'ouverture.",
- 	"enableDragAndDrop": "Contrôle si l'explorateur doit autoriser le déplacement de fichiers et de dossiers par glisser-déplacer.",
- 	"confirmDragAndDrop": "Contrôle si l’Explorateur doit demander confirmation lors du déplacement de fichiers ou de dossiers via glisser-déposer.",
-changed in both
-  base   100644 f944e7fc14ff13265af3f6fef112a7a5de5ca326 i18n/fra/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  our    100644 ad930cf9e96c6c6f2bb1e3ed666446143bea2fa8 i18n/fra/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  their  100644 e1888e6d1c25b75f2363abb418c422bf10282952 i18n/fra/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,6 +14,12 @@
- 	"readonlySaveErrorAdmin": "Échec de l'enregistrement de '{0}' : le fichier est protégé en écriture. Sélectionnez 'Remplacer' pour réessayer en tant qu'administrateur.",
- 	"readonlySaveError": "Échec de l'enregistrement de '{0}' : le fichier est protégé en écriture. Sélectionnez 'Remplacer' pour essayer de supprimer la protection.",
- 	"permissionDeniedSaveError": "Échec de l'enregistrement de '{0}' : Permissions insuffisantes. Sélectionnez 'Remplacer en tant qu'Admin' pour réessayer en tant qu'administrator.",
-+=======
-+	"userGuide": "Utiliser les actions dans la barre d’outils de l’éditeur vers la droite pour soit **annuler** vos modifications ou **écraser** le contenu sur le disque avec vos modifications",
-+	"overwrite": "Remplacer",
-+	"retry": "Réessayer",
-+	"discard": "Abandonner",
-+>>>>>>> .their
- 	"genericSaveError": "Échec d'enregistrement de '{0}' ({1}).",
- 	"learnMore": "En savoir plus",
- 	"dontShowAgain": "Ne plus afficher",
-changed in both
-  base   100644 c536ea46a5d8ef428d43213b1ece8372a0089a5f i18n/fra/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  our    100644 68bdf7d5c3ba2abd16609dec619663b60cc7e427 i18n/fra/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  their  100644 620260dc73ab3534bc1bbd1bfc9b585e054c29f4 i18n/fra/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-added in both
-  our    100644 78c2e49a0fa262e7ff38912f66b47037d874a25b i18n/fra/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-  their  100644 9af3f02e1b1bcf540fa84508b6c3fd25db4a3481 i18n/fra/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,5 +11,13 @@
- 	"sharedLog": "Journal (Partagé)",
- 	"rendererLog": "Journal (Fenêtre)",
- 	"extensionsLog": "Journal (Hôte d'extension)",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"developer": "Développeur"
- }
-\ No newline at end of file
-added in both
-  our    100644 a4b260b7b1424820b72d256857339774c04df50f i18n/fra/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  their  100644 53a40630054e60be59b43d818644a29e7f1bcca6 i18n/fra/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -17,14 +18,31 @@
- 	"openLogFile": "Ouvrir le fichier de log...",
- 	"setLogLevel": "Définir le niveau de journalisation (log) ...",
- 	"trace": "Trace",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"openLogsFolder": "Ouvrir le dossier des journaux",
-+	"rendererProcess": "Fenêtre",
-+	"selectProcess": "Sélectionner le processus",
-+	"setLogLevel": "Définir le niveau de journalisation (log)",
-+>>>>>>> .their
- 	"debug": "Déboguer",
- 	"info": "Informations",
- 	"warn": "Avertissement",
- 	"err": "Erreur",
-+<<<<<<< .our
- 	"critical": "Critique",
- 	"off": "Désactivé",
- 	"selectLogLevel": "Sélectionner le niveau de journalisation (log)",
- 	"default and current": "Par défaut & actuel",
- 	"default": "Par défaut",
- 	"current": "Actuel"
-+=======
-+	"off": "Désactivé",
-+	"selectLogLevel": "Sélectionner le niveau de journalisation (log)"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 de7f944af4932846fbdac737c099aed33f4ecede i18n/fra/src/vs/workbench/parts/markers/common/messages.i18n.json
-  our    100644 26c532d9d00dc046cc7b45dadce5acdcd1c029b0 i18n/fra/src/vs/workbench/parts/markers/common/messages.i18n.json
-  their  100644 2b60a006c266a47829aabd32cd357bacd8fac641 i18n/fra/src/vs/workbench/parts/markers/common/messages.i18n.json
-@@ -7,8 +7,11 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"viewCategory": "Affichage",
-+<<<<<<< .our
- 	"problems.view.toggle.label": "Activer/désactiver les problèmes (Erreurs, Avertissements, Infos)",
- 	"problems.view.focus.label": " Focus sur les problèmes (Erreurs, Avertissements, Infos)",
-+=======
-+>>>>>>> .their
- 	"problems.panel.configuration.title": "Affichage des problèmes",
- 	"problems.panel.configuration.autoreveal": "Contrôle si l'affichage des problèmes doit automatiquement montrer les fichiers quand il les ouvre",
- 	"markers.panel.title.problems": "Problèmes",
-added in both
-  our    100644 25674d1f3059db8688302e2e91efe68cdd721332 i18n/fra/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-  their  100644 1298d315d6c4a47c600e16979cced930359d3f87 i18n/fra/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -11,4 +12,15 @@
- 	"viewCategory": "Affichage",
- 	"clearOutput.label": "Effacer la sortie",
- 	"openActiveLogOutputFile": "Affichage: Ouvrir le fichier de log de sortie actif"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"output": "Sortie",
-+	"viewCategory": "Affichage",
-+	"clearOutput.label": "Effacer la sortie"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 c3e117dc72cf6c63eb673fd37d3a4f3314624c1d i18n/fra/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/fra/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,12 @@
- 	],
- 	"output": "{0} - Sortie",
- 	"channel": "Canal de sortie pour '{0}'"
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 89aaca94b7b03f4e1f4ba9ef4338ee2344243212 i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 40cb14d81b25931ed98c99ed64c659dbe62e387d i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 d5cd0fe71d7cc2c34ec9616465c980cafd6457cb i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"defaultSettings": "Placez vos paramètres dans l’éditeur du côté droit pour substituer.",
- 	"noSettingsFound": "Aucun paramètre.",
- 	"settingsSwitcherBarAriaLabel": "Sélecteur de paramètres",
-changed in both
-  base   100644 42c1698dcd39da6eade370fde166980fb99e02db i18n/fra/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  our    100644 e65303731cdbdd387dbb5d282fd9835d35690414 i18n/fra/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  their  100644 5800126a7771248ee2458b4ee86434a0525ac0b1 i18n/fra/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-changed in both
-  base   100644 923695e6fb46126c969f586e150a356c244c419f i18n/fra/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  our    100644 0dd64fdd2e25eac3f307caeeb24a3e07990d7b2d i18n/fra/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  their  100644 561c8b8fcd3de6626d2eb8799774f77e229ec428 i18n/fra/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"view": "Affichage",
- 	"commandsHandlerDescriptionDefault": "Commandes d'affichage et d'exécution",
- 	"gotoLineDescriptionMac": "Atteindre la ligne",
-changed in both
-  base   100644 015c5898f64a1906ae042e551610af6e1eb3b070 i18n/fra/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  our    100644 cff66834ecd9a182ea692c3558e8fa31ebfdf5cb i18n/fra/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  their  100644 48bc93f989d908cf0355b00ba95d796523692c1e i18n/fra/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-@@ -10,8 +10,12 @@
- 	"source control": "Contrôle de code source",
- 	"toggleSCMViewlet": "Afficher SCM",
- 	"view": "Afficher",
-+<<<<<<< .our
- 	"scmConfigurationTitle": "SCM",
- 	"alwaysShowProviders": "S'il faut toujours afficher la section Fournisseur de contrôle de code source.",
- 	"diffDecorations": "Contrôle les décorations diff dans l'éditeur",
- 	"diffGutterWidth": "Contrôle la largeur (px) des décorations diff dans la gouttière (ajoutées et modifiées)"
-+=======
-+	"scmConfigurationTitle": "SCM"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 72ef3e89f83b046c2a066afb8e686819adeba96c i18n/fra/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 7927ac428c9397051edb023d925d6ab74f6c0189 i18n/fra/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 c87f37c878ca7d69c4630e1ea273a246798d6cd5 i18n/fra/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-changed in both
-  base   100644 727436ac8ed32d6cc6548751c4fcda56b1f00c6a i18n/fra/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 043fb92d98d510a0c65a09cbbe5e12feb8f611fa i18n/fra/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 578f575ae02713a5cc6602e12b62470b01ebb4e8 i18n/fra/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,11 +13,18 @@
- 	"copyAllLabel": "Copier tout",
- 	"clearSearchHistoryLabel": "Effacer l'historique de recherche",
- 	"toggleSearchViewPositionLabel": "Basculer la position de la vue de Recherche",
-+=======
-+>>>>>>> .their
- 	"findInFolder": "Rechercher dans le dossier...",
- 	"findInWorkspace": "Trouver dans l’espace de travail...",
- 	"showTriggerActions": "Atteindre le symbole dans l'espace de travail...",
- 	"name": "Rechercher",
-+<<<<<<< .our
- 	"showSearchViewl": "Afficher la zone de recherche",
-+=======
-+	"search": "Rechercher",
-+	"showSearchViewlet": "Afficher la zone de recherche",
-+>>>>>>> .their
- 	"view": "Affichage",
- 	"findInFiles": "Chercher dans les fichiers",
- 	"openAnythingHandlerDescription": "Accéder au fichier",
-added in both
-  our    100644 c6029c79c7a57a5c629447893e6fed6dd5f01d87 i18n/fra/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-  their  100644 7b7ad15376c18c01df197ab1a3f0c1d29099d45a i18n/fra/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -13,5 +14,14 @@
- 	"new.global.sep": "Nouveaux extraits",
- 	"openSnippet.pickLanguage": "Sélectionner le fichier d'extraits ou créer des extraits",
- 	"openSnippet.label": "Configurer les extraits de l’utilisateur",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"global.1": "({0})",
-+>>>>>>> .their
- 	"preferences": "Préférences"
- }
-\ No newline at end of file
-changed in both
-  base   100644 96366bc3eb52948c0cce6a37f8cc23ca93cb8564 i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  our    100644 41b673caee35ba5599ed55d34f9115a33ee09e5b i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  their  100644 b30a97f875d4fea836f050427a8b3d62577695c4 i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"snippetSchema.json.default": "Extrait de code vide",
- 	"snippetSchema.json": "Configuration de l'extrait de code utilisateur",
- 	"snippetSchema.json.prefix": "Préfixe à utiliser durant la sélection de l'extrait de code dans IntelliSense",
-added in both
-  our    100644 6d8d447dfa2fd2d0a93aaf03c20bac52fa92d5c0 i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-  their  100644 c12c73b0de8d6456419dce2557a6d6362a9f7ea5 i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,5 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"source.snippetGlobal": "Extrait de code global de l’utilisateur",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"source.snippet": "Extrait de code utilisateur"
- }
-\ No newline at end of file
-changed in both
-  base   100644 0c67783e02add356224816add6e645edca0a51bf i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  our    100644 6aff63f3b8ed86c22e3db3f7b4b70ba36b0a5d67 i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 a5340df30928fb26ec148d9efa045266c2e8a7ff i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,9 @@
- 	],
- 	"invalid.path.0": "Chaîne attendue dans 'contributes.{0}.path'. Valeur fournie : {1}",
- 	"invalid.language.0": "Si le langage est omis, la valeur de 'contributes.{0}.path' doit être un fichier `.code-snippets`. Valeur fournie : {1}",
-+=======
-+	"invalid.path.0": "Chaîne attendue dans 'contributes.{0}.path'. Valeur fournie : {1}",
-+>>>>>>> .their
- 	"invalid.language": "Langage inconnu dans 'contributes.{0}.language'. Valeur fournie : {1}",
- 	"invalid.path.1": "'contributes.{0}.path' ({1}) est censé être inclus dans le dossier ({2}) de l'extension. Cela risque de rendre l'extension non portable.",
- 	"vscode.extension.contributes.snippets": "Ajoute des extraits de code.",
-changed in both
-  base   100644 89f1b8269952be2124739d6d636080f0525343fb i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 e89604d819428678dc7ff9b330667ccb471d786a i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 4908dd97c81b0154b72e73335738b445c3608c73 i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -10,7 +10,11 @@
- 	"terminal.foreground": "Couleur de premier plan du terminal.",
- 	"terminalCursor.foreground": "La couleur de premier plan du curseur du terminal.",
- 	"terminalCursor.background": "La couleur d’arrière-plan du curseur terminal. Permet de personnaliser la couleur d’un caractère recouvert par un curseur de bloc.",
-+<<<<<<< .our
- 	"terminal.selectionBackground": "La couleur d’arrière-plan de sélection du terminal.",
- 	"terminal.border": "Couleur de bordure qui sépare les volets de fractionnement dans le terminal. La valeur par défaut est panel.border.",
- 	"terminal.ansiColor": "Couleur ansi '{0}' dans le terminal."
-+=======
-+	"terminal.selectionBackground": "La couleur d’arrière-plan de sélection du terminal."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d636f6886f808c9a144c44e3e494a870aa3d59c7 i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  our    100644 866daa5d73fe70c822cf9cd59398b1a220df5355 i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  their  100644 531697fe3da266ef23df55e60b7223fb6831a8ad i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-@@ -8,7 +8,11 @@
- 	],
- 	"terminal.integrated.chooseWindowsShellInfo": "Vous pouvez changer l'interpréteur de commandes par défaut du terminal en sélectionnant le bouton Personnaliser.",
- 	"customize": "Personnaliser",
-+<<<<<<< .our
- 	"never again": "Ne plus afficher",
-+=======
-+	"cancel": "Annuler",
-+>>>>>>> .their
- 	"terminal.integrated.chooseWindowsShell": "Sélectionnez votre interpréteur de commandes de terminal favori. Vous pouvez le changer plus tard dans vos paramètres",
- 	"terminalService.terminalCloseConfirmationSingular": "Il existe une session de terminal active. Voulez-vous la tuer ?",
- 	"terminalService.terminalCloseConfirmationPlural": "Il existe {0} sessions de terminal actives. Voulez-vous les tuer ?"
-changed in both
-  base   100644 12b4156b835781ca1de4186f3756ef0f9112212f i18n/fra/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 7338692978cc41a3c9963a6eada047d9ffbf7ca9 i18n/fra/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 1e7c69d38aae32d6f49a84d3fd1e0a5ca8205440 i18n/fra/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -26,7 +26,10 @@
- 	"commandPalette": "Palette de commandes...",
- 	"settings": "Paramètres",
- 	"keyboardShortcuts": "Raccourcis clavier",
-+<<<<<<< .our
- 	"showExtensions": "Gérer les extensions",
-+=======
-+>>>>>>> .their
- 	"userSnippets": "Extraits de code de l'utilisateur",
- 	"selectTheme.label": "Thème de couleur",
- 	"themes.selectIconTheme.label": "Thème d'icône de fichier",
-changed in both
-  base   100644 8ca568a2f4015dd7ebbc73a406355daae9858969 i18n/fra/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  our    100644 765129d9a5321e8f52031cdb135764c97f338133 i18n/fra/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  their  100644 865514aec03632520bfd541850119cfeeadc313b i18n/fra/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,4 +14,9 @@
- 	"fileBinaryError": "Il semble que le fichier soit binaire. Impossible de l'ouvrir en tant que texte",
- 	"err.create": "Impossible de créer le fichier {0}",
- 	"fileMoveConflict": "Déplacement/copie impossible. Le fichier existe déjà dans la destination."
-+=======
-+	"fileIsDirectoryError": "Le fichier est un répertoire",
-+	"fileNotModifiedError": "Fichier non modifié depuis",
-+	"fileBinaryError": "Il semble que le fichier soit binaire. Impossible de l'ouvrir en tant que texte"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 4d90040dd20e484ff33c0bbc4586caac5b4704d2 i18n/fra/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  our    100644 ce3bee795d96c88f25dab19286972a170c3fad44 i18n/fra/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  their  100644 a5d794a742eeccfd5ebcc916668c97b9fcc4d5c8 i18n/fra/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-changed in both
-  base   100644 46a345fad2d7573ee6be186851f5a1b533755ca1 i18n/fra/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 7050924f08d64059ea7847ed31aea3e00de2d358 i18n/fra/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 e40e5326149d7f66aff9851a241559490e0d7a3b i18n/fra/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-changed in both
-  base   100644 079d530ab03a5fb017d1dcbfbc96d116d4f84e7d i18n/fra/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  our    100644 dcd91092d2562a6bf45acc7079eed26ac5f049a8 i18n/fra/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  their  100644 f4f2e4991549a7e51c02e6eb5c679f2eb6a8f8c5 i18n/fra/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-@@ -8,5 +8,10 @@
- 	],
- 	"errorInvalidTaskConfiguration": "Impossible d’écrire dans le fichier de configuration de l’espace de travail. Veuillez ouvrir le fichier pour y corriger les erreurs/avertissements et essayez à nouveau.",
- 	"errorWorkspaceConfigurationFileDirty": "Impossible d’écrire dans le fichier de configuration de l’espace de travail, car le fichier a été modifié. Veuillez, s’il vous plaît, l'enregistrez et réessayez.",
-+<<<<<<< .our
- 	"openWorkspaceConfigurationFile": "Ouvrir la Configuration de l’espace de travail"
-+=======
-+	"openWorkspaceConfigurationFile": "Ouvrir le Fichier de Configuration d’espace de travail",
-+	"close": "Fermer"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 fe69406ef37c2acc56509a1a45b73bc21fcea89e i18n/hun/extensions/git/out/autofetch.i18n.json
-  our    100644 7645777b08ab0f3eae0f87656a210f6ae20a2881 i18n/hun/extensions/git/out/autofetch.i18n.json
-  their  100644 83092572a2a1ce50df8fcff09a5f29a38318e6bf i18n/hun/extensions/git/out/autofetch.i18n.json
-@@ -7,7 +7,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"yes": "Igen",
-+	"read more": "További információk",
- 	"no": "Nem",
- 	"not now": "Kérdezzen rá később",
-+<<<<<<< .our
- 	"suggest auto fetch": "Szeretné, hogy a Code [időszakosan futtassa a 'git fetch' parancsot]({0})?"
-+=======
-+	"suggest auto fetch": "Szeretné, hogy a Code időszakosan futtasson `git fetch`-t?"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d2dfa251e5d25cb8285a926f608ff708bb006a41 i18n/hun/extensions/git/out/commands.i18n.json
-  our    100644 affdd78fc14682c19c792c8ead9202e7167f2315 i18n/hun/extensions/git/out/commands.i18n.json
-  their  100644 712e3b40563322edad55dca8b2758070ef2658dd i18n/hun/extensions/git/out/commands.i18n.json
-@@ -75,8 +75,12 @@
- 	"ok": "OK",
- 	"push with tags success": "A címkékkel együtt történő pusholás sikeresen befejeződött.",
- 	"pick remote": "Válassza ki a távoli szervert, ahová publikálni szeretné a(z) '{0}' ágat:",
-+<<<<<<< .our
- 	"sync is unpredictable": "Ez a művelet pusholja és pullozza a commitokat a következő helyről: '{0}/{1}'.",
- 	"never again": "Rendben, ne jelenjen meg újra",
-+=======
-+	"sync is unpredictable": "Ez a művelet pusholja és pullozza a commitokat a következő helyről: '{0}'.",
-+>>>>>>> .their
- 	"no remotes to publish": "A forráskódtárhoz nincsenek távoli szerverek konfigurálva, ahová publikálni lehetne.",
- 	"no changes stash": "Nincs elrakandó módosítás.",
- 	"provide stash message": "Adja meg a stash-hez tartozó üzenet (nem kötelező)",
-changed in both
-  base   100644 ab59b50cfc784146306d84f601f03ad0a7f31a6d i18n/hun/extensions/git/out/main.i18n.json
-  our    100644 34ef76e258ca1851c9a5efe9b01c0ac0109e7b83 i18n/hun/extensions/git/out/main.i18n.json
-  their  100644 19742ee7152041f294039a21e4e7f74966e0898a i18n/hun/extensions/git/out/main.i18n.json
-changed in both
-  base   100644 234abfc4470a1ad3f066bef954abbfbd9cee42bd i18n/hun/extensions/git/out/repository.i18n.json
-  our    100644 cbcda0cc8b4d1780f1b5648ec0e6c19e36877abc i18n/hun/extensions/git/out/repository.i18n.json
-  their  100644 b2654e062b72fbb1a17176b789b23de4477a64b4 i18n/hun/extensions/git/out/repository.i18n.json
-@@ -28,8 +28,12 @@
- 	"merge changes": "Módosítások összeolvasztása",
- 	"staged changes": "Beadásra előjegyzett módosítások",
- 	"changes": "Módosítások",
-+<<<<<<< .our
- 	"commitMessageCountdown": "{0} karakter maradt az aktuális sorban",
- 	"commitMessageWarning": " {0} karakterrel több, mint {1} az aktuális sorban",
-+=======
-+	"ok": "OK",
-+>>>>>>> .their
- 	"neveragain": "Ne jelenítse meg újra",
- 	"huge": "A(z) '{0}' forráskódtárban túl sok aktív módosítás van. A Git-funkciók csak egy része lesz engedélyezve."
- }
-\ No newline at end of file
-changed in both
-  base   100644 150ac02318b8ffb83a2d7af343ac105b348156d8 i18n/hun/extensions/git/package.i18n.json
-  our    100644 d2831b61da52e95d0526dd36ac91c937df6fc33e i18n/hun/extensions/git/package.i18n.json
-  their  100644 87388db14f4ece24aa8aa6ee5cfbc6837ac8c1a2 i18n/hun/extensions/git/package.i18n.json
-added in both
-  our    100644 2d667c10166cd725addba9a06f9512737a1ce4c9 i18n/hun/extensions/typescript/out/commands.i18n.json
-  their  100644 c521fb331a6d229b7ae06a62b562681dd79fcb75 i18n/hun/extensions/typescript/out/commands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -13,4 +14,20 @@
- 	"typescript.noJavaScriptProjectConfig": "A fájl nem egy JavaScript-projekt része. További információkat [ide]({0}) kattintva tudhat meg.",
- 	"typescript.configureTsconfigQuickPick": "tsconfig.json konfigurálása",
- 	"typescript.configureJsconfigQuickPick": "jsconfig.json konfigurálása"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"typescript.projectConfigNoWorkspace": "Nyisson meg egy mappát a VS Code-ban typescriptes vagy javascriptes projekt használatához!",
-+	"typescript.projectConfigUnsupportedFile": "Nem sikerült meghatározni a TypeScript- vagy JavaScript-projektet. Nem támogatott fájltípus",
-+	"typescript.projectConfigCouldNotGetInfo": "Nem sikerült meghatározni a TypeScript- vagy JavaScript-projektet",
-+	"typescript.noTypeScriptProjectConfig": "A fájl nem része egy TypeScript-projektnek",
-+	"typescript.noJavaScriptProjectConfig": "A fájl nem része egy JavaScript-projektnek",
-+	"typescript.configureTsconfigQuickPick": "tsconfig.json konfigurálása",
-+	"typescript.configureJsconfigQuickPick": "jsconfig.json konfigurálása",
-+	"typescript.projectConfigLearnMore": "További információ"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 750d811d866eaa3d43818bd1d8e28c9898acf514 i18n/hun/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-  their  100644 ed15423097d5cbb03aeb8c474db3877ca0d1584f i18n/hun/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"selectAriaOption": "{0}"
- }
-\ No newline at end of file
-added in both
-  our    100644 8f727d4bf0445b589905c6044d27a94553f3a015 i18n/hun/src/vs/base/node/ps.i18n.json
-  their  100644 688e86b7228c7f67981b485e08f175828d7e6b3d i18n/hun/src/vs/base/node/ps.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"collecting": "Processzor- és memóriahasználattal kapcsolatos információk gyűjtése. A folyamat eltarthat néhány másodpercig."
- }
-\ No newline at end of file
-changed in both
-  base   100644 48b15939e90bd455b4e48ccb22e9241d8ec84e23 i18n/hun/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 2379691d68b1bb47b875192927c6b81fe486ec04 i18n/hun/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 7f137c6fbffdc3cb8e488aee937e8d7ae878db1d i18n/hun/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -16,7 +16,11 @@
- 	"lineNumbers.on": "A sorszámok abszolút értékként jelennek meg.",
- 	"lineNumbers.relative": "A sorszámok a kurzortól való távolságuk alapján jelennek meg.",
- 	"lineNumbers.interval": "A sorszámok minden 10. sorban jelennek meg.",
-+<<<<<<< .our
- 	"lineNumbers": "Meghatározza a sorszámok megjelenítési módját.",
-+=======
-+	"lineNumbers": "Meghatározza a sorszámok megjelenését. A lehetséges értékek: 'on', 'off', 'relative' és 'interval'.",
-+>>>>>>> .their
- 	"rulers": "Függőleges vonalzók kirajzolása bizonyos számú fix szélességű karakter után. Több vonalzó használatához adjon meg több értéket. Nincs kirajzolva semmi, ha a tömb üres.",
- 	"wordSeparators": "Azon karakterek listája, amelyek szóelválasztónak vannak tekintve szavakkal kapcsolatos navigáció vagy műveletek során.",
- 	"tabSize": "Egy tabulátor hány szóköznek felel meg. Ez a beállítás felülírásra kerül a fájl tartalma alapján, ha az `editor.detectIndentation` beállítás aktív.",
-@@ -81,7 +85,11 @@
- 	"cursorBlinking": "Meghatározza a kurzor animációjának stílusát.",
- 	"mouseWheelZoom": "A szerkesztőablak betűtípusának nagyítása vagy kicsinyítése az egérgörgő Ctrl lenyomása mellett történő használata esetén",
- 	"cursorStyle": "Meghatározza a kurzor stílusát. Lehetséges értékek: 'block', 'block-outline', 'line', 'line-thin', 'underline' vagy 'underline-thin'",
-+<<<<<<< .our
- 	"cursorWidth": "Meghatározza a kurzor szélességét, ha az editor.cursorStyle értéke 'line'.",
-+=======
-+	"lineCursorWidth": "Meghatározza a kurzor szélességét, ha az editor.cursorStyle értéke 'line'.",
-+>>>>>>> .their
- 	"fontLigatures": "Engedélyezi a betűtípusban található ligatúrák használatát",
- 	"hideCursorInOverviewRuler": "Meghatározza, hogy a kurzor pozíciója el legyen-e rejtve az áttekintő sávon.",
- 	"renderWhitespace": "Meghatározza, hogy a szerkesztőablakban hogyan legyenek kirajzolva a szóköz karakterek. Lehetséges értékek: 'none', 'boundary', vagy 'all'. A 'boundary' beállítás esetén, ha szavak között egyetlen szóköz található, akkor az nem lesz kirajzolva.",
-changed in both
-  base   100644 ca5c75eaa9372228d57d97f25ee673f349358823 i18n/hun/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 4128ea8ed8c31eaff6f326d9803f8603753a32a5 i18n/hun/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 5238b0d9399bc52a65065a984ef6a407b439dce8 i18n/hun/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -8,8 +8,11 @@
- 	],
- 	"lineHighlight": "A kurzor pozícióján található sor kiemelési háttérszíne.",
- 	"lineHighlightBorderBox": "A kurzor pozícióján található sor keretszíne.",
-+<<<<<<< .our
- 	"rangeHighlight": "A kiemelt területek háttérszíne, pl. a gyors megnyitás és keresés funkcióknál. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
- 	"rangeHighlightBorder": "A kiemelt területek körüli keret háttérszíne.",
-+=======
-+>>>>>>> .their
- 	"caret": "A szerkesztőablak kurzorának színe.",
- 	"editorCursorBackground": "A szerkesztőablak kurzorának háttérszíne. Lehetővé teszik az olyan karakterek színének módosítását, amelyek fölött egy blokk-típusú kurzor áll.",
- 	"editorWhitespaces": "A szerkesztőablakban található szóköz karakterek színe.",
-changed in both
-  base   100644 e3ec625549ef5021b6b60bb463d4c286c69ff860 i18n/hun/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  our    100644 5f21b0406da880d778293e255ba11e7f7a24268f i18n/hun/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  their  100644 6689a8e1f95cce9cb55ed55f44bd3d7331afc4d5 i18n/hun/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -10,4 +11,11 @@
- 	"markerAction.previous.label": "Előző probléma (hiba, figyelmeztetés, információ)",
- 	"markerAction.nextInFiles.label": "Következő probléma a fájlokban (hiba, figyelmeztetés, információ)",
- 	"markerAction.previousInFiles.label": "Előző probléma a fájlokban (hiba, figyelmeztetés, információ)"
-+=======
-+	"title.wo_source": "({0}/{1})",
-+	"editorMarkerNavigationError": "A szerkesztőablak jelzőnavigációs moduljának színe hiba esetén.",
-+	"editorMarkerNavigationWarning": "A szerkesztőablak jelzőnavigációs moduljának színe figyelmeztetés esetén.",
-+	"editorMarkerNavigationInfo": "A szerkesztőablak jelzőnavigációs moduljának színe információ esetén.",
-+	"editorMarkerNavigationBackground": "A szerkesztőablak jelzőnavigációs moduljának háttérszíne."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 dc4360652cbf419fea7b2bfe6f6e90184410262b i18n/hun/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json
-  our    100644 6ff7a9e10f69f5074a234aff3db906c9c6d18877 i18n/hun/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json
-  their  100644 96f61fa990d0959ca50f9f738e9a8280d4060e00 i18n/hun/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"toggle.tabMovesFocus": "Tabulátor billentyűvel mozgatott fókusz ki- és bekapcsolása"
- }
-\ No newline at end of file
-changed in both
-  base   100644 fa7c3359075157c0a146e8ae8c803e06a1fb1a60 i18n/hun/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  our    100644 e66f795b53cfca6fe629f2b5534cfa72d14dc9fe i18n/hun/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  their  100644 92c1811fa1eadd4561935ff265b19d2ad1a0ae13 i18n/hun/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,10 @@
- 	"wordHighlightStrongBorder": "Szimbólumok háttérszíne írási hozzáférés, például változó írása esetén.",
- 	"overviewRulerWordHighlightForeground": "A kiemelt szimbólumokat jelölő jelzések színe az áttekintősávon. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
- 	"overviewRulerWordHighlightStrongForeground": "Az írási hozzáféréssel rendelkező szimbólumokat jelölő jelzések színe az áttekintősávon. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
-+=======
-+	"overviewRulerWordHighlightForeground": "A kiemelt szimbólumokat jelölő jelzések színe az áttekintősávon.",
-+	"overviewRulerWordHighlightStrongForeground": "A kiemelt, írási hozzáférésű szimbólumokat jelölő jelzések színe az áttekintősávon.",
-+>>>>>>> .their
- 	"wordHighlight.next.label": "Ugrás a következő kiemelt szimbólumhoz",
- 	"wordHighlight.previous.label": "Ugrás az előző kiemelt szimbólumhoz"
- }
-\ No newline at end of file
-changed in both
-  base   100644 27181140f4be7f30cedc1692ab424fddcbb2df73 i18n/hun/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  our    100644 e50c39417bf314b45d74cbd848fd7794fab13bae i18n/hun/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  their  100644 9ef8de88790f6f7938838355e0b2608d33895d3c i18n/hun/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 acbe400a835f132893c2b46d80667e338e47014e i18n/hun/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 77c071af2b9d55c9f89889f4eaba840c5ab42297 i18n/hun/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 400ec23c073960d0fb36d89c146beccae672da88 i18n/hun/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,11 +10,19 @@
- 	"diff": "Két fájl összehasonlítása egymással.",
- 	"add": "Mappá(k) hozzáadása a legutolsó aktív ablakhoz.",
- 	"goto": "Megnyitja a megadott elérési úton található fájlt a megadott sornál és oszlopnál.",
-+<<<<<<< .our
- 	"newWindow": "Mindenképp új ablakban nyíljon meg",
- 	"reuseWindow": "Fájl vagy mappa a legutolsó aktív ablakban nyíljon meg.",
- 	"wait": "Várjon a fájlok bezárására a visszatérés előtt.",
- 	"locale": "A használt lokalizáció (pl. en-US vagy zh-TW)",
- 	"userDataDir": "Meghatározza azt a mappát, ahol a felhasználói adatok vannak tárolva. Egyszerre több megnyitott Code-példány is használhatja.",
-+=======
-+	"newWindow": "Mindenképp induljon új példány a Code-ból.",
-+	"reuseWindow": "Fájl vagy mappa megnyitása a legutoljára aktív ablakban.",
-+	"wait": "Várjon a fájlok bezárására a visszatérés előtt.",
-+	"locale": "A használt lokalizáció (pl. en-US vagy zh-TW)",
-+	"userDataDir": "Meghatározza a könyvtárat, ahol a felhasználói adatok vannak tárolva. Hasznás, ha rootként van futtatva.",
-+>>>>>>> .their
- 	"version": "Verzió kiírása.",
- 	"help": "Használati útmutató kiírása.",
- 	"extensionHomePath": "A kiegészítők gyökérkönyvtárának beállítása.",
-@@ -22,18 +30,28 @@
- 	"showVersions": "Telepített kiegészítők verziójának megjelenítése a --list-extension kapcsoló használata esetén.",
- 	"installExtension": "Kiegészítő telepítése.",
- 	"uninstallExtension": "Kiegészítő eltávolítása.",
-+<<<<<<< .our
- 	"experimentalApis": "Tervezett API-funkciók engedélyezése a kiegészítők számára.",
-+=======
-+	"experimentalApis": "Tervezett API-funkciók engedélyezése egy kiegészítő számára.",
-+>>>>>>> .their
- 	"verbose": "Részletes kimenet kiírása (magába foglalja a --wait kapcsolót)",
- 	"log": "A naplózott események szintje.Az 'info' az alapértelmezett értéke. Lehetséges értékek: 'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off'.",
- 	"status": "Folyamatok erőforrás-használati és diagnosztikai adatinak kiíratása.",
- 	"performance": "Indítás a 'Developer: Startup Performance' parancs engedélyezésével.",
- 	"prof-startup": "Processzorhasználat profilozása induláskor",
- 	"disableExtensions": "Összes telepített kiegészítő letiltása.",
-+<<<<<<< .our
- 	"inspect-extensions": "Hibakeresés és profilozás engedélyezése a kiegészítőkben. A csatlakozási URI-t a fejlesztői eszközöknél találja meg.",
- 	"inspect-brk-extensions": "Hibakeresés és profilozás engedélyezése a kiegészítőkben, úgy, hogy a kiegészítő gazdafolyamata szüneteltetve lesz az indítás után. A csatlakozási URI-t a fejlesztői eszközöknél találja meg.",
- 	"disableGPU": "Hardveres gyorsítás letiltása.",
- 	"uploadLogs": "Az aktuális munkamenet naplóinak feltöltése egy biztonságos végpontra.",
- 	"maxMemory": "Egy ablak maximális memóriamérete (megabájtban).",
-+=======
-+	"inspect-extensions": "Hibakeresés és profilozás engedélyezése a kiegészítőkben. Ellenőrizze a fejlesztői eszközöket a csatlakozási URI-hoz.",
-+	"inspect-brk-extensions": "Hibakeresés és profilozás engedélyezése a kiegészítőkben, úgy, hogy a kiegészítő gazdafolyamata szüneteltetve lesz az indítás után. Ellenőrizze a fejlesztői eszközöket a csatlakozási URI-hoz. ",
-+	"disableGPU": "Hardveres gyorsítás letiltása.",
-+>>>>>>> .their
- 	"usage": "Használat",
- 	"options": "beállítások",
- 	"paths": "elérési utak",
-changed in both
-  base   100644 8788d40a469b3b8ecd64e644a614eefa1c60c177 i18n/hun/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 4e39213a98716ec8731af717bd7eabd7943bfb73 i18n/hun/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 b5c8c712977e570afe3a68115f9998ed0bee9f95 i18n/hun/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -7,12 +7,16 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"invalidManifest": "A kiegészítő érvénytelen: a package.json nem egy JSON-fájl.",
-+<<<<<<< .our
- 	"incompatible": "A(z) '{0}' kiegészítő nem telepíthető, mivel nem kompatibilis a Code '{1}' verziójával.",
-+=======
-+>>>>>>> .their
- 	"restartCode": "Indítsa újra a Code-ot a(z) {0} újratelepítése előtt.",
- 	"installingOutdatedExtension": "A kiegészítő egy újabb verziója már telepítve van. Szeretné felülírni a régebbi verzióval?",
- 	"override": "Felülírás",
- 	"cancel": "Mégse",
- 	"errorInstallingDependencies": "Hiba a függőségek telepítése közben. {0}",
-+<<<<<<< .our
- 	"MarketPlaceDisabled": "A piactér nincs engedélyezve",
- 	"removeError": "Hiba történt a kiegészítő eltávolítása közben: {0}. Lépjen ki és indítsa el a VS Code-ot mielőtt újrapróbálná!",
- 	"Not a Marketplace extension": "Csak a piactérről származó kiegészítőket lehet újratelepíteni",
-@@ -22,6 +26,12 @@
- 	"quitCode": "A kiegészítő telepítése nem sikerült. Lépjen ki és indítsa el a VS Code-ot az újratelepítés előtt!",
- 	"exitCode": "A kiegészítő telepítése nem sikerült. Lépjen ki és indítsa el a VS Code-ot az újratelepítés előtt!",
- 	"renameError": "Ismeretlen hiba történt a(z) {0} {1} névre való átnevezése közben",
-+=======
-+	"notFoundCompatible": "A(z) '{0}' nem telepíthető: nincs a VS Code '{1}' verziójával kompatibilis változat.",
-+	"notFoundCompatibleDependency": "A telepítés nem sikerült, mert a(z) '{0}' kiegészítő függőség VS Code '{1}' verziójával kompatibilis változata nem található. ",
-+	"quitCode": "A kiegészítő telepítése nem sikerült. Lépjen ki és indítsa el a VS Code-ot az újratelepítés előtt!",
-+	"exitCode": "A kiegészítő telepítése nem sikerült. Lépjen ki és indítsa el a VS Code-ot az újratelepítés előtt!",
-+>>>>>>> .their
- 	"uninstallDependeciesConfirmation": "Csak a(z) '{0}' kiegészítőt szeretné eltávolítani vagy annak függőségeit is?",
- 	"uninstallOnly": "Csak a kiegészítőt",
- 	"uninstallAll": "Az összes eltávolítása",
-changed in both
-  base   100644 a4f556eb01c230e361a1f99208d3fb06f0a954af i18n/hun/src/vs/platform/message/common/message.i18n.json
-  our    100644 edfa6c97087c28db068688d4c7e69b180d9a7695 i18n/hun/src/vs/platform/message/common/message.i18n.json
-  their  100644 ee6d194b8dd57d5ccd047d89c9a20d3ac6fb60d7 i18n/hun/src/vs/platform/message/common/message.i18n.json
-changed in both
-  base   100644 a024837c58333387fb06c4c570530d4bc65c76c5 i18n/hun/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 b9f948caca15d9f0853c29c47b30338822af7bb9 i18n/hun/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 dce5fb0ac3dec43ea2ca7c5134010bb5daf4c8e9 i18n/hun/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -68,6 +68,7 @@
- 	"editorWidgetBorder": "A szerkesztőablak-modulok keretszíne. A szín csak akkor van használva, ha a modul beállítása alapján rendelkezik kerettel, és a színt nem írja felül a modul.",
- 	"editorSelectionBackground": "A szerkesztőablak-szakasz színe.",
- 	"editorSelectionForeground": "A kijelölt szöveg színe nagy kontrasztú téma esetén.",
-+<<<<<<< .our
- 	"editorInactiveSelection": "Az inaktív szerkesztőablakban található kijelölések színe. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
- 	"editorSelectionHighlight": "A kijelöléssel megegyező tartalmú területek színe. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
- 	"editorSelectionHighlightBorder": "A kijelöléssel megegyező tartalmú területek keretszíne.",
-@@ -79,6 +80,9 @@
- 	"findRangeHighlightBorder": "A keresést korlátozó terület keretszíne. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
- 	"findWidgetResizeBorder": "A keresőmodul átméretezősávjának keretszíne.",
- 	"hoverHighlight": "Kiemelés azon szó alatt, amely fölött lebegő elem jelenik meg. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
-+=======
-+	"editorFindMatch": "A keresés jelenlegi találatának színe.",
-+>>>>>>> .their
- 	"hoverBackground": "A szerkesztőablakban lebegő elemek háttérszíne.",
- 	"hoverBorder": "A szerkesztőablakban lebegő elemek keretszíne.",
- 	"activeLinkForeground": "Az aktív hivatkozások háttérszíne.",
-@@ -86,12 +90,15 @@
- 	"diffEditorRemoved": "Az eltávolított szöveg háttérszíne. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
- 	"diffEditorInsertedOutline": "A beillesztett szövegek körvonalának színe.",
- 	"diffEditorRemovedOutline": "Az eltávolított szövegek körvonalának színe.",
-+<<<<<<< .our
- 	"mergeCurrentHeaderBackground": "A helyi tartalom fejlécének háttérszíne sorok között megjelenített összeolvasztási konfliktusok esetén. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
- 	"mergeCurrentContentBackground": "A helyi tartalom háttérszíne sorok között megjelenített összeolvasztási konfliktusok esetén. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
- 	"mergeIncomingHeaderBackground": "A beérkező tartalom fejlécének háttérszíne sorok között megjelenített összeolvasztási konfliktusok esetén. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
- 	"mergeIncomingContentBackground": "A beérkező tartalom háttérszíne sorok között megjelenített összeolvasztási konfliktusok esetén. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
- 	"mergeCommonHeaderBackground": "A közös ős tartalom fejlécének háttérszíne sorok között megjelenített összeolvasztási konfliktusok esetén. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
- 	"mergeCommonContentBackground": "A közös ős tartalmának háttérszíne sorok között megjelenített összeolvasztási konfliktusok esetén. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
-+=======
-+>>>>>>> .their
- 	"mergeBorder": "A fejlécek és az elválasztó sáv keretszíne a sorok között megjelenített összeolvasztási konfliktusok esetén.",
- 	"overviewRulerCurrentContentForeground": "A helyi tartalom előtérszíne az áttekintő sávon összeolvasztási konfliktusok esetén.",
- 	"overviewRulerIncomingContentForeground": "A beérkező tartalom előtérszíne az áttekintő sávon összeolvasztási konfliktusok esetén.",
-added in both
-  our    100644 d0aa3c15e349efa447f405e1304fad51f64459cc i18n/hun/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 753cc84e856416f15f0a04a26340734c911f6121 i18n/hun/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,5 +10,13 @@
- 	"timeout.formatOnSave": "Mentéskor végzett formázás megszakítva {0}ms után",
- 	"codeActionsOnSave.didTimeout": "codeActionsOnSave megszakítva {0}ms után",
- 	"timeout.onWillSave": "OnWillSaveTextDocument-esemény megszakítva 1750ms után",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"saveParticipants": "Mentési események futtatása..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 ad630367cbae501c824f2c6b3391f7d446b345ea i18n/hun/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  our    100644 ea4c6c999845b97aef472a29ea0fcf97207605d2 i18n/hun/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  their  100644 adbae4c28f45c140088189b6669175a4c232b316 i18n/hun/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,7 @@
- 	],
- 	"treeView.notRegistered": "Nincs '{0}' azonosítóval regisztrált fanézet.",
- 	"treeView.duplicateElement": "Már van {0} azonosítójú elem regisztrálva"
-+=======
-+	"treeView.notRegistered": "Nincs '{0}' azonosítóval regisztrált fanézet."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 586bbb9d5a1791c83cabf4ea122c38732721d86d i18n/hun/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 123987f7d72edfd6ce2f5a4dafa7e92b866ab98d i18n/hun/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 5b05c77fb5d0d7fc9830ffdd25e3774ef20750f2 i18n/hun/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -15,5 +15,9 @@
- 	"saveWorkspace": "Munkaterület mentése",
- 	"openWorkspaceAction": "Munkaterület megnyitása...",
- 	"openWorkspaceConfigFile": "Munkaterület konfigurációs fájljának megnyitása",
-+<<<<<<< .our
- 	"duplicateWorkspaceInNewWindow": "Munkaterület megnyitása egy új ablakban"
-+=======
-+	"openFolderAsWorkspaceInNewWindow": "Mappa megnyitása munkaterületként egy új ablakban"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 3ce627556d81fdfa94602adee0d29b810ecfba85 i18n/hun/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-  their  100644 080898a7ed6b2833730a053cc6c9bb63f54df611 i18n/hun/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"addFolderToWorkspace": "Mappa hozzáadása a munkaterülethez...",
- 	"add": "&&Hozzáadás",
- 	"addFolderToWorkspaceTitle": "Mappa hozzáadása a munkaterülethez",
-changed in both
-  base   100644 05a3be821614f3df3158b0c5ab2bf909aa844c7a i18n/hun/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  our    100644 1aa06197ac876e8d6242ea2be7341080d6c6f7fd i18n/hun/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  their  100644 5d48accc6b6ac2a31943ea8485de30848358ee47 i18n/hun/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-@@ -19,14 +19,22 @@
- 	"close": "Bezárás",
- 	"closeOthers": "Többi bezárása",
- 	"closeRight": "Jobbra lévők bezárása",
-+<<<<<<< .our
- 	"closeAllSaved": "Mentettek bezárása",
-+=======
-+	"closeAllUnmodified": "Nem módosultak bezárása",
-+>>>>>>> .their
- 	"closeAll": "Összes bezárása",
- 	"keepOpen": "Maradjon nyitva",
- 	"toggleInlineView": "Sorok közötti nézet be- és kikapcsolása",
- 	"showOpenedEditors": "Megnyitott szerkesztőablak megjelenítése",
- 	"keepEditor": "Szerkesztőablak nyitva tartása",
- 	"closeEditorsInGroup": "A csoportban lévő összes szerkesztőablak bezárása",
-+<<<<<<< .our
- 	"closeSavedEditors": "A csoportban lévő mentett szerkesztőablakok bezárása",
-+=======
-+	"closeUnmodifiedEditors": "Nem módosult szerkesztőablakok bezárása a csoportban",
-+>>>>>>> .their
- 	"closeOtherEditors": "Többi szerkesztőablak bezárása",
- 	"closeRightEditors": "Jobbra lévő szerkesztőablakok bezárása"
- }
-\ No newline at end of file
-changed in both
-  base   100644 c82ab6ff2a23f28ebea61b6b7a53c71f4cdae1bd i18n/hun/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 2de10454592751643d624e3a92df2a9575809a4b i18n/hun/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 52fa76d91e72060d2bc049d9c61b5719e8e4ff90 i18n/hun/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 b15ee093f22c841f442aa3a3e878d51eeb0a97aa i18n/hun/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  our    100644 b85e766a1db851d76d4002b436880c6bb7ed7759 i18n/hun/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  their  100644 37f4933240bc2bc4c46602997769fbfd474298a5 i18n/hun/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-changed in both
-  base   100644 0cb7c46cb05e4fabb9aa9c72f0406ad3a9b3f2a6 i18n/hun/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  our    100644 749328c186d97fd976d4f31d1b2d7b979fa92d15 i18n/hun/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  their  100644 5d020bd339d91b797c77692b50152dbe6eeec356 i18n/hun/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-changed in both
-  base   100644 0ef6405cab271d74fa57e086b7af25565adef1d2 i18n/hun/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  our    100644 d823f6837d977fa8c4af575fecfec0bd88c0c6ad i18n/hun/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  their  100644 11d4a655ad1b4c0e9b0344f9902c5f33117594dd i18n/hun/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"close": "Bezárás",
-+>>>>>>> .their
- 	"araLabelEditorActions": "Szerkesztőablak-műveletek"
- }
-\ No newline at end of file
-changed in both
-  base   100644 6ed546539cf83653779af2df1324a1ff40ab0c37 i18n/hun/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
-  our    100644 e551ece9506badbb40e8b19c970a08c2c618f72d i18n/hun/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
-  their  100644 9fd111df3c0ccc2925a8edeba1a3aa1dc613dac2 i18n/hun/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
-changed in both
-  base   100644 b30bec0d2458b102c5da1ad21589cce6ecef6f52 i18n/hun/src/vs/workbench/common/theme.i18n.json
-  our    100644 3406c795c4b8de9d50192c0ba339b8532a562f5d i18n/hun/src/vs/workbench/common/theme.i18n.json
-  their  100644 634a2ddeccc13ee3aa0fcaf094bf0653eae03df9 i18n/hun/src/vs/workbench/common/theme.i18n.json
-@@ -11,10 +11,15 @@
- 	"tabHoverBackground": "A fülek háttérszíne amikor az egérkurzor fölöttük van. A fülek tartalmazzák a szerkesztőterületen lévő szerkesztőablakokat. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
- 	"tabUnfocusedHoverBackground": "A fülek háttérszíne egy fókusz nélküli csoportban, amikor az egérkurzor fölötte van. A fülek tartalmazzák a szerkesztőterületen lévő szerkesztőablakokat. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
- 	"tabBorder": "A füleket egymástól elválasztó keret színe. A fülek tartalmazzák a szerkesztőterületen lévő szerkesztőablakokat. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
-+<<<<<<< .our
- 	"tabActiveBorder": "Az aktív fülek aljának keretszíne. A fülek tartalmazzák a szerkesztőablakokat a szerkesztőterületen. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
- 	"tabActiveBorderTop": "Az aktív fülek tetejének keretszíne. A fülek tartalmazzák a szerkesztőablakokat a szerkesztőterületen. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
- 	"tabActiveUnfocusedBorder": "Az aktív fülek aljának keretszíne egy fókusz nélküli csoportban. A fülek tartalmazzák a szerkesztőablakokat a szerkesztőterületen. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni. ",
- 	"tabActiveUnfocusedBorderTop": "Az aktív fülek tetejének keretszíne egy fókusz nélküli csoportban. A fülek tartalmazzák a szerkesztőablakokat a szerkesztőterületen. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
-+=======
-+	"tabActiveBorder": "Az aktív fülek kiemelésére használt keret színe. A fülek tartalmazzák a szerkesztőterületen lévő szerkesztőablakokat. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
-+	"tabActiveUnfocusedBorder": "Az aktív fülek kiemelésére használt keret színe egy fókusz nélküli csoportban. A fülek tartalmazzák a szerkesztőterületen lévő szerkesztőablakokat. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
-+>>>>>>> .their
- 	"tabHoverBorder": "A fülek kiemelésére használt keret színe amikor az egérkurzor fölöttük van. A fülek tartalmazzák a szerkesztőterületen lévő szerkesztőablakokat. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
- 	"tabUnfocusedHoverBorder": "A fülek kiemelésére használt keret színe egy fókusz nélküli csoportban, amikor az egérkurzor fölöttük van. A fülek tartalmazzák a szerkesztőterületen lévő szerkesztőablakokat. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
- 	"tabActiveForeground": "Az aktív fül előtérszíne az aktív csoportban. A fülek tartalmazzák a szerkesztőterületen lévő szerkesztőablakokat. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
-added in both
-  our    100644 0b45e8b69a77cf5a968a8274c4f8cc930b908390 i18n/hun/src/vs/workbench/common/views.i18n.json
-  their  100644 52cc050953f8f727972673febedba5e5edb099ab i18n/hun/src/vs/workbench/common/views.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"duplicateId": "Már van '{0}' azonosítójú nézet regisztrálva a következő helyen: '{1}'"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"duplicateId": "Már van `{0}` azonosítójú nézet regisztrálva a következő helyen: `{1}`"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8fa88c8859b2857c7b6ebe2dd8a86d0c4df0d2af i18n/hun/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 37d0d2519062540d66345cd2a09ec42cdf189245 i18n/hun/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 2e7a5636a3de332e1df8c42dea1d1b431ed8cd16 i18n/hun/src/vs/workbench/electron-browser/actions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"closeWindow": "Ablak bezárása",
- 	"closeWorkspace": "Munkaterület bezárása",
- 	"noWorkspaceOpened": "Az aktuális példányban nincs egyetlen munkaterület sem nyitva, amit be lehetne zárni.",
-@@ -50,6 +53,14 @@
- 	"moveWindowTabToNewWindow": "Ablakfül átmozgatása új ablakba",
- 	"mergeAllWindowTabs": "Összes ablak összeolvasztása",
- 	"toggleWindowTabsBar": "Ablakfülsáv be- és kikapcsolása",
-+<<<<<<< .our
- 	"about": "A(z) {0} névjegye",
- 	"inspect context keys": "Kontextuskulcsok vizsgálata"
-+=======
-+	"configureLocale": "Nyelv beállítása",
-+	"displayLanguage": "Meghatározza a VSCode felületének nyelvét.",
-+	"doc": "Az elérhető nyelvek listája a következő címen tekinthető meg: {0}",
-+	"restart": "Az érték módosítása után újra kell indítani a VSCode-ot.",
-+	"fail.createSettings": "Nem sikerült a(z) '{0}' létrehozás ({1})."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ffdce8089b56bb92a1044bd7761cd34b7d6ed32b i18n/hun/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 cc21f47e7a5add72269e1dcc252497e79ab58b6b i18n/hun/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 e6f6299231ed743d6f35c08e245910c8834d343f i18n/hun/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,12 +35,19 @@
- 	"panelDefaultLocation": "Meghatározza a panel alapértelmezett pozícióját. A panel a munkaterület alján vagy jobb oldalán jelenhet meg.",
- 	"statusBarVisibility": "Meghatározza, hogy megjelenjen-e az állapotsor a munkaterület alján.",
- 	"activityBarVisibility": "Meghatározza, hogy megjelenjen-e a tevékenységsáv a munkaterületen.",
-+<<<<<<< .our
- 	"viewVisibility": "Meghatározza a nézetek fejlécén található műveletek láthatóságát. A műveletek vagy mindig láthatók, vagy csak akkor jelennek meg, ha a nézeten van a fókusz vagy az egérkurzor fölötte van.",
- 	"fontAliasing": "Meghatározza a munkaterületen megjelenő betűtípusok élsimítási módszerét.\n- default: Szubpixeles betűsimítás. A legtöbb nem-retina típusú kijelzőn ez adja a legélesebb szöveget.\n- antialiased: A betűket pixelek, és nem szubpixelek szintjén simítja. A betűtípus vékonyabbnak tűnhet összességében.\n- none: Letiltja a betűtípusok élsimítését. A szövegek egyenetlen, éles szélekkel jelennek meg.\n- auto: A `default` vagy `antialiased` beállítások automatikus alkalmazása a kijelzők DPI-je alapján.",
- 	"workbench.fontAliasing.default": "Szubpixeles betűsimítás. A legtöbb nem-retina típusú kijelzőn ez adja a legélesebb szöveget.",
- 	"workbench.fontAliasing.antialiased": "A betűket pixelek, és nem szubpixelek szintjén simítja. A betűtípus vékonyabbnak tűnhet összességében.",
- 	"workbench.fontAliasing.none": "Letiltja a betűtípusok élsimítését. A szövegek egyenetlen, éles szélekkel jelennek meg.",
- 	"workbench.fontAliasing.auto": " A `default` vagy `antialiased` beállítások automatikus alkalmazása a kijelzők DPI-je alapján.",
-+=======
-+	"fontAliasing": "Meghatározza a munkaterületen megjelenő betűtípusok élsimítási módszerét.\n- default: Szubpixeles betűsimítás. A legtöbb nem-retina típusú kijelzőn ez adja a legélesebb szöveget.\n- antialiased: A betűket pixelek, és nem szubpixelek szintjén simítja. A betűtípus vékonyabbnak tűnhet összességében.\n- none: Letiltja a betűtípusok élsimítését. A szövegek egyenetlen, éles szélekkel jelennek meg.",
-+	"workbench.fontAliasing.default": "Szubpixeles betűsimítás. A legtöbb nem-retina típusú kijelzőn ez adja a legélesebb szöveget.",
-+	"workbench.fontAliasing.antialiased": "A betűket pixelek, és nem szubpixelek szintjén simítja. A betűtípus vékonyabbnak tűnhet összességében.",
-+	"workbench.fontAliasing.none": "Letiltja a betűtípusok élsimítését. A szövegek egyenetlen, éles szélekkel jelennek meg.",
-+>>>>>>> .their
- 	"enableNaturalLanguageSettingsSearch": "Meghatározza, hogy engedélyezve van-e a természetes nyelvi keresési mód a beállításoknál.",
- 	"windowConfigurationTitle": "Ablak",
- 	"window.openFilesInNewWindow.on": "A fájlok új ablakban nyílnak meg",
-changed in both
-  base   100644 3f8ae5cf9ddff63b8beb040265845f413c95dc4b i18n/hun/src/vs/workbench/electron-browser/window.i18n.json
-  our    100644 0da8bd6c434595c584e7d6a578513ca7f171e8fe i18n/hun/src/vs/workbench/electron-browser/window.i18n.json
-  their  100644 59e05312870b3866252807fc499f342f5bcc08db i18n/hun/src/vs/workbench/electron-browser/window.i18n.json
-changed in both
-  base   100644 1631851aee5fc1d1a3752c92515e59275b59bacf i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
-  our    100644 325146a60013b6a6cf71673d67d0125f22bb9420 i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
-  their  100644 ef8b1ac13ebabadda7ec353f0ed5292f9e2eb304 i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
-changed in both
-  base   100644 fa1bc4e164b69e736e9af17c81da7b8222f52b7c i18n/hun/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
-  our    100644 b12fa835fc27d4b6a915acfad161f1ffd542d5de i18n/hun/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
-  their  100644 c02cc939c66520687f045901dca3c9147b16331c i18n/hun/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"debugToolBarBackground": "A hibakeresési eszköztár háttérszíne.",
- 	"debugToolBarBorder": "A hibakeresési eszköztár keretszíne."
- }
-\ No newline at end of file
-changed in both
-  base   100644 8e82d560ff02743e1db814ac8ccca057ba3eba35 i18n/hun/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  our    100644 ff69b90fbc577aa860166719588e6f2942a832ed i18n/hun/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  their  100644 9708ac70e9bb642e3ecf27f0372f7c47fd315ef7 i18n/hun/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"debug.terminal.title": "hibakereső"
- }
-\ No newline at end of file
-changed in both
-  base   100644 a33718b8e732d0ae3ae712a9f173a4c65dddf3bd i18n/hun/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  our    100644 11a68ca775fd4f5f784c2f0bafd2d0cdcc46c728 i18n/hun/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  their  100644 b8ed67afeb59bb2e98c0c253557db8f4864689fa i18n/hun/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-changed in both
-  base   100644 a03a32613a60fe26013bd53f7c20f4668520f3d0 i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 236476e89a262d4e51ec02393f20d9a7b2715c82 i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 bc83f527961205d75ef59e1a759f04800ebeba1f i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,11 @@
- 	"exeBasedRecommendation": "Ez a kiegészítő azért ajánlott, mert a következő telepítve van: {0}.",
- 	"fileBasedRecommendation": "Ez a kiegészítő a közelmúltban megnyitott fájlok alapján ajánlott.",
- 	"workspaceRecommendation": "Ez a kiegészítő az aktuális munkaterület felhasználói által ajánlott.",
-+=======
-+	"workspaceRecommendation": "Ez a kiegészítő az aktuális munkaterület felhasználói által ajánlott.",
-+	"fileBasedRecommendation": "Ez a kiegészítő a közelmúltban megnyitott fájlok alapján ajánlott.",
-+	"exeBasedRecommendation": "Ez a kiegészítő azért ajánlott, mert a következő telepítve van: {0}.",
-+>>>>>>> .their
- 	"reallyRecommended2": "Ehhez a fájltípushoz a(z) '{0}' kiegészítő ajánlott.",
- 	"reallyRecommendedExtensionPack": "Ehhez a fájltípushoz a(z) '{0}' kiegészítőcsomag ajánlott.",
- 	"install": "Telepítés",
-added in both
-  our    100644 a79e4252425f9889ab5576fc0f0adcbeedabfc56 i18n/hun/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-  their  100644 652267823c8bbedc4527a98dd2de575285564b22 i18n/hun/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"workbenchConfigurationTitle": "Munkaterület",
- 	"feedbackVisibility": "Meghatározza az állapotsoron megjelenő, visszajelzés tweetelése (mosoly) gomb láthatóságát."
- }
-\ No newline at end of file
-changed in both
-  base   100644 d2b7c3c88fa26c808df63de9ea1f4008e1fcd386 i18n/hun/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
-  our    100644 9c6fd91e68403f5fedbdb402411fe1687d26d356 i18n/hun/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
-  their  100644 5bf2f90ef1e24509ed6eda99d199e8394290af4d i18n/hun/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
-added in both
-  our    100644 34a5f733ab91e51764f2f093058b6813d0bf353a i18n/hun/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-  their  100644 d2ae286b72e268d27878b066ffaeb11ea6f898b4 i18n/hun/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"hide": "Elrejtés"
- }
-\ No newline at end of file
-changed in both
-  base   100644 d032a29e6848f4733cc59fe0f86da9ce35f137b6 i18n/hun/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  our    100644 d0fac53b4410bf224f1dcd4d64ae1809aca9b0d6 i18n/hun/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  their  100644 f08e18c1fc14f69c7c15b545bc017d85afdbbfa4 i18n/hun/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-@@ -12,7 +12,10 @@
- 	"revertLocalChanges": "Saját módosítások elvetése és a lemezen lévő tartalom visszaállítása",
- 	"copyPathOfActive": "Aktív fájl elérési útjának másolása",
- 	"saveAllInGroup": "Összes mentése a csoportban",
-+<<<<<<< .our
- 	"saveFiles": "Összes fájl mentése",
-+=======
-+>>>>>>> .their
- 	"revert": "Fájl visszaállítása",
- 	"compareActiveWithSaved": "Aktív fájl összehasonlítása a mentett változattal",
- 	"closeEditor": "Szerkesztőablak bezárása",
-@@ -26,10 +29,16 @@
- 	"compareWithSaved": "Összehasonlítás a mentett változattal",
- 	"compareWithSelected": "Összehasonlítás a kiválasztottal",
- 	"compareSource": "Kijelölés összehasonlításhoz",
-+<<<<<<< .our
- 	"compareSelected": "Kiválasztottak összehasonlítása",
- 	"close": "Bezárás",
- 	"closeOthers": "Többi bezárása",
- 	"closeSaved": "Mentettek bezárása",
-+=======
-+	"close": "Bezárás",
-+	"closeOthers": "Többi bezárása",
-+	"closeUnmodified": "Nem módosultak bezárása",
-+>>>>>>> .their
- 	"closeAll": "Összes bezárása",
- 	"deleteFile": "Végleges törlés"
- }
-\ No newline at end of file
-changed in both
-  base   100644 559fe056a7de82e88f80d89bbe2b2f98b86844d1 i18n/hun/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 9db97a911ffdf192afd5e70644f8d902d86c6323 i18n/hun/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 c9d588b821796907d328f994973d7ae09be385d7 i18n/hun/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"newFile": "Új fájl",
- 	"newFolder": "Új mappa",
- 	"rename": "Átnevezés",
-@@ -13,7 +16,11 @@
- 	"copyFile": "Másolás",
- 	"pasteFile": "Beillesztés",
- 	"retry": "Újrapróbálkozás",
-+<<<<<<< .our
- 	"renameWhenSourcePathIsParentOfTargetError": "Létező mappában az „Új mappa” vagy „Új fájl” parancsokkal hozhat lére új elemeket.",
-+=======
-+	"openFolderFirst": "Mappák vagy fájlok létrehozásához először nyisson meg egy mappát!",
-+>>>>>>> .their
- 	"newUntitledFile": "Új, névtelen fájl",
- 	"createNewFile": "Új fájl",
- 	"createNewFolder": "Új mappa",
-@@ -29,6 +36,7 @@
- 	"undoTrash": "Helyreállíthatja a kukából.",
- 	"doNotAskAgain": "Ne kérdezze meg újra",
- 	"irreversible": "A művelet nem vonható vissza!",
-+<<<<<<< .our
- 	"binFailed": "Nem sikerült törölni a lomtár használatával. Szeretné helyette véglegesen törölni?",
- 	"trashFailed": "Nem sikerült törölni a kuka használatával. Szeretné helyette véglegesen törölni?",
- 	"deletePermanentlyButtonLabel": "&&Törlés véglegesen",
-@@ -48,6 +56,14 @@
- 	"replaceButtonLabel": "&&Csere",
- 	"fileIsAncestor": "A beillesztendő fájl a célmappa szülője",
- 	"fileDeleted": "A beillesztendő fájl időközben törölve lett vagy át lett helyezve",
-+=======
-+	"permDelete": "Végleges törlés",
-+	"importFiles": "Fájlok importálása",
-+	"confirmOverwrite": "A célmappában már van ilyen nevű mappa vagy fájl. Le szeretné cserélni?",
-+	"replaceButtonLabel": "&&Csere",
-+	"fileDeleted": "A fájl időközben törölve lett vagy át lett helyezve",
-+	"fileIsAncestor": "A másolandó fájl a célmappa szülője",
-+>>>>>>> .their
- 	"duplicateFile": "Duplikálás",
- 	"globalCompareFile": "Aktív fájl összehasonlítása...",
- 	"openFileToCompare": "Fájlok összehasonlításához elősször nyisson meg egy fájlt.",
-changed in both
-  base   100644 dd9057b1fa4b3a5d19b450f77eb6adb79dc83d18 i18n/hun/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  our    100644 57708c04947e66257427692040ce53bc266ffa2e i18n/hun/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  their  100644 7c49a5eefb215cd54f7d12fff2a3f8e231c93deb i18n/hun/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,12 +7,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"revealInWindows": "Megjelenítés a fájlkezelőben",
- 	"revealInMac": "Megjelenítés a Finderben",
- 	"openContainer": "Tartalmazó mappa megnyitása",
- 	"saveAs": "Mentés másként...",
- 	"save": "Mentés",
- 	"saveAll": "Összes mentése",
-+<<<<<<< .our
-+=======
-+	"saveFiles": "Összes fájl mentése",
-+>>>>>>> .their
- 	"removeFolderFromWorkspace": "Mappa eltávolítása a munkaterületről",
- 	"genericRevertError": "Nem sikerült a(z) '{0}' visszaállítása: {1}",
- 	"modifiedLabel": "{0} (a lemezen) ↔ {1}",
-changed in both
-  base   100644 22341f239a222b613ad30c90da315fa6cb00df4d i18n/hun/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 edaae86a63ad7a54d245b58378e8574f687d98c7 i18n/hun/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 6cd44ae8d9bfef27b5b8b59cbce0d8668a23f514 i18n/hun/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-@@ -40,7 +40,10 @@
- 	"formatOnSave": "Fájlok formázása mentéskor. Az adott nyelvhez rendelkezésre kell állni formázónak, nem lehet beállítva automatikus mentés, és a szerkesztő nem állhat éppen lefelé.",
- 	"formatOnSaveTimeout": "Időkorlát mentéskor végzett formázások esetén. Meghatároz egy időkorlátot ezredmásodpercben a formatOnSave-parancsok számára. Az ennél hosszabb ideig tartó parancsok meg lesznek szakítva.",
- 	"explorerConfigurationTitle": "Fájlkezelő",
-+<<<<<<< .our
- 	"openEditorsVisible": "A megnyitott szerkesztőablakok panelen megjelenített szerkesztőablakok száma.",
-+=======
-+>>>>>>> .their
- 	"autoReveal": "Meghatározza, hogy a fájlkezelőben automatikusan fel legyenek fedve és ki legyenek jelölve a fájlok, amikor megnyitják őket.",
- 	"enableDragAndDrop": "Meghatározza, hogy a fájlkezelőben áthelyezhetők-e a fájlok és mappák húzással.",
- 	"confirmDragAndDrop": "Meghatározza, hogy a fájlkezelő kérjen-e megerősítést fájlok és mappák húzással történő áthelyezése esetén.",
-changed in both
-  base   100644 0bb33fdc62885d8181dadd5465bc06840190d8fc i18n/hun/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  our    100644 b8d7b3a39533354bdc0b19ec9d16e5be9870876d i18n/hun/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  their  100644 da61a7106fd401d131dc95b0192c045983fbad7e i18n/hun/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,12 @@
- 	],
- 	"userGuide": "Használja a szerkesztői eszköztáron található műveleteket a helyi változtatások visszavonására vagy írja felül a lemezen lévő tartalmat a változtatásokkal",
- 	"staleSaveError": "Nem sikerült menteni a(z) '{0}' fájlt: a lemezen lévő tartalom újabb. Hasonlítsa össze a helyi és a lemezen lévő változatot!",
-+=======
-+	"userGuide": "Használja a jobbra lévő szerkesztői eszköztáron található műveleteket a saját módosítások **visszavonására** vagy **írja felül** a lemezen lévő tartalmat a változtatásokkal",
-+	"overwriteElevated": "Felülírás rendszergazdaként...",
-+	"saveElevated": "Újrapróbálkozás rendszergazdaként...",
-+	"overwrite": "Felülírás",
-+>>>>>>> .their
- 	"retry": "Újrapróbálkozás",
- 	"discard": "Elvetés",
- 	"readonlySaveErrorAdmin": "Nem sikerült menteni a(z) '{0}' fájlt: a fájl írásvédett. Válassza a 'Felülírás rendszergazdaként' lehetőséget a védelem eltávolításához!",
-changed in both
-  base   100644 99cf9cb13e7cb7eda3c6aabe47011c55959da9f5 i18n/hun/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  our    100644 701e6f98bc8ea1747b95354d9e0077f468336b3e i18n/hun/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  their  100644 4e9c224f2c9c65bc6b5f06dd845a038719658335 i18n/hun/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-added in both
-  our    100644 47c134fd47123c14705e1807ec020fc9b1ded0d6 i18n/hun/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-  their  100644 a647b02e9cbef82928d12ccd7a4243a34d25282c i18n/hun/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"mainLog": "Napló (elsődleges)",
- 	"sharedLog": "Napló (megosztott)",
- 	"rendererLog": "Napló (ablak)",
-added in both
-  our    100644 533388e750ee4e135ca7c686e5459ac247110cdf i18n/hun/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  their  100644 fde9c01e66fbd7ca4bf154d1fc195e6ba3df84f4 i18n/hun/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -16,6 +17,23 @@
- 	"selectProcess": "Válasszon folyamatnaplót!",
- 	"openLogFile": "Naplófájl megnyitása...",
- 	"setLogLevel": "Naplózási szint beállítása...",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"openLogsFolder": "Naplómappa megnyitása",
-+	"showLogs": "Naplók megjelenítése...",
-+	"mainProcess": "Elsődleges",
-+	"sharedProcess": "Megosztott",
-+	"rendererProcess": "Ablak",
-+	"extensionHost": "Kiegészítő gazdafolyamata",
-+	"selectProcess": "Válasszon folyamatot!",
-+	"openLogFile": "Naplófájl megnyitása...",
-+	"setLogLevel": "Naplózási szint beállítása",
-+>>>>>>> .their
- 	"trace": "Nyomkövetés",
- 	"debug": "Hibakeresés",
- 	"info": "Információ",
-@@ -23,8 +41,12 @@
- 	"err": "Hiba",
- 	"critical": "Kritikus",
- 	"off": "Kikapcsolva",
-+<<<<<<< .our
- 	"selectLogLevel": "Naplózási szint beállítása",
- 	"default and current": "Alapértelmezett & jelenlegi",
- 	"default": "Alapértelmezett",
- 	"current": "Aktuális"
-+=======
-+	"selectLogLevel": "Naplózási szint beállítása"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 1ecd95e356c42cd928f136758d5915a5958b8383 i18n/hun/src/vs/workbench/parts/markers/common/messages.i18n.json
-  our    100644 773ba59f111e82d92f85498810cfb48f654435e6 i18n/hun/src/vs/workbench/parts/markers/common/messages.i18n.json
-  their  100644 efb38ebffa8d40532ab38a7844821dbdbe0227e3 i18n/hun/src/vs/workbench/parts/markers/common/messages.i18n.json
-@@ -7,8 +7,11 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"viewCategory": "Nézet",
-+<<<<<<< .our
- 	"problems.view.toggle.label": "Problémák be- és kikapcsolása (hiba, figyelmeztetés, információ)",
- 	"problems.view.focus.label": "Váltás a problémákra (hiba, figyelmeztetés, információ)",
-+=======
-+>>>>>>> .their
- 	"problems.panel.configuration.title": "Problémák-nézet",
- 	"problems.panel.configuration.autoreveal": "Meghatározza, hogy a problémák nézet automatikusan felfedje-e a fájlokat, amikor megnyitja őket.",
- 	"markers.panel.title.problems": "Problémák",
-added in both
-  our    100644 0e30f5732769755e32b7f939289bdeed34aa9a2e i18n/hun/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-  their  100644 5cbaa37bf1689e274a9a45602cfd646019065e63 i18n/hun/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -11,4 +12,16 @@
- 	"viewCategory": "Nézet",
- 	"clearOutput.label": "Kimenet törlése",
- 	"openActiveLogOutputFile": "Nézet: Aktív napló kimeneti fájljának megnyitása"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"output": "Kimenet",
-+	"logViewer": "Naplófájl-megjelenítő",
-+	"viewCategory": "Nézet",
-+	"clearOutput.label": "Kimenet törlése"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 2967f9f2d34d8572fdfa4deeb66d87d7ea3ebd63 i18n/hun/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-  their  100644 c164d86f883a8aca57bf2f38a9ebed65bf233e60 i18n/hun/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"output": "{0} – Kimenet",
- 	"channel": "A(z) '{0}' kimeneti csatornája"
- }
-\ No newline at end of file
-changed in both
-  base   100644 ef9a96afe7b57217ea6e9cf3d6363034233cce43 i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 e4a3df1c36f48711ee71b3e1a1f3261e36551d1e i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 3a1caa89fed892f466dd6064be98791c54bdcf1e i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"defaultSettings": "A jobb oldalon lévő szerkesztőablakban elhelyezett beállítások felülírják az alapértelmezett beállításokat.",
- 	"noSettingsFound": "Beállítás nem található.",
- 	"settingsSwitcherBarAriaLabel": "Beállításkapcsoló",
-changed in both
-  base   100644 1fd4f23c9d2b2587042661b7a080ae8cfbbbae60 i18n/hun/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  our    100644 ec3d7a520ad7c939cbe0c7ae9a4418c76f0a7de7 i18n/hun/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  their  100644 35cc39622d0b228bc74bd668bd12c257a3928b0f i18n/hun/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-changed in both
-  base   100644 7e61210cdf735b07d4eb51ee7fd095eafb87752f i18n/hun/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  our    100644 30ceee409e667b0d6338b5c25accb24f8665eb86 i18n/hun/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  their  100644 cd538504f4718f3e4cf4c06ae311e651e5029de4 i18n/hun/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"view": "Nézet",
- 	"commandsHandlerDescriptionDefault": "Parancsok megjelenítése és futtatása",
- 	"gotoLineDescriptionMac": "Ugrás adott sorhoz",
-changed in both
-  base   100644 4f8b481dc00d734f2215c121c783ca9022c3ba6e i18n/hun/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  our    100644 b8dbc7740d8d5f70035f6da70f3e92605c2e7f25 i18n/hun/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  their  100644 39ce0536498b6d4284daca2c5f3ab1ffe4deef4e i18n/hun/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-@@ -13,5 +13,9 @@
- 	"scmConfigurationTitle": "VKR (SCM)",
- 	"alwaysShowProviders": "Mindig megjelenjen-e a verziókezelő rendszerek szakasz.",
- 	"diffDecorations": "Vezérli a szerkesztőablakban megjelenő, változásokat jelölő dekorátorokat.",
-+<<<<<<< .our
- 	"diffGutterWidth": "Vezérli a szerkesztőablak margóján megjelenő, változásokat jelölő dekorátorok szélességét (pixelben)."
-+=======
-+	"inputCounter": "Meghatározza, hogy mikor jelenjen meg a bemeneti karakterszámláló."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 821a91e9b573b0a7c174b82a6cf123ea2bcb4d45 i18n/hun/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  our    100644 eed65b480a816d02a454fae412b29472fd8ae097 i18n/hun/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  their  100644 aa865d6ba594bf767a297569800526d4be540307 i18n/hun/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-@@ -8,6 +8,9 @@
- 	],
- 	"scm providers": "Verziókezelő rendszerek",
- 	"hideRepository": "Elrejtés",
-+	"commitMessageInfo": "{0} karakter a jelenlegi sorban",
-+	"commitMessageCountdown": "{0} karakter maradt az aktuális sorban",
-+	"commitMessageWarning": " {0} karakterrel több, mint {1} az aktuális sorban",
- 	"installAdditionalSCMProviders": "További verziókezelő rendszerek telepítése...",
- 	"no open repo": "Nincs aktív verziókezelő rendszer.",
- 	"source control": "Verziókezelő rendszer",
-changed in both
-  base   100644 9f5f0bf4d8bf46686df8f057972894fecef8d779 i18n/hun/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 9a1dc2269a19b301bdc256c8a1594b2d89a94c18 i18n/hun/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 ce4480e2eb9a0734da7b53dcfc7f672d8b35049e i18n/hun/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-changed in both
-  base   100644 e1fb57e6aa623e9dfca003a7601a1ea33526d0ec i18n/hun/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 1439e6263aeea9edcee41566036c04020ed9c86f i18n/hun/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 9cd24f4c87207b799b0de682cedce2f442d14153 i18n/hun/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -21,6 +22,19 @@
- 	"findInFiles": "Keresés a fájlokban",
- 	"openAnythingHandlerDescription": "Ugrás fájlhoz",
- 	"openSymbolDescriptionNormal": "Ugrás szimbólumhoz a munkaterületen",
-+=======
-+	"findInFolder": "Keresés mappában...",
-+	"findInWorkspace": "Keresés a munkaterületen...",
-+	"showTriggerActions": "Szimbólum megkeresése a munkaterületen...",
-+	"name": "Keresés",
-+	"search": "Keresés",
-+	"showSearchViewlet": "Keresés megjelenítése",
-+	"view": "Nézet",
-+	"findInFiles": "Keresés a fájlokban",
-+	"openAnythingHandlerDescription": "Fájl megkeresése",
-+	"openSymbolDescriptionNormal": "Szimbólum megkeresése a munkaterületen",
-+	"searchOutputChannelTitle": "Keresés",
-+>>>>>>> .their
- 	"searchConfigurationTitle": "Keresés",
- 	"exclude": "Fájlok és mappák keresésből való kizárására szolgáló globális minták. Örökli az összes globális mintát a fliex.exclude beállításból.",
- 	"exclude.boolean": "A globális minta, amire illesztve lesznek a fájlok elérési útjai. A minta engedélyezéséhez vagy letiltásához állítsa igaz vagy hamis értékre.",
-@@ -29,7 +43,11 @@
- 	"useIgnoreFiles": "Meghatározza, hogy a .gitignore és .ignore fájlok használva legyenek-e a kereséshez.",
- 	"search.quickOpen.includeSymbols": "Meghatározza, hogy a fájlok gyors megnyitásánál megjelenjenek-e a globális szimbólumkereső találatai.",
- 	"search.followSymlinks": "Meghatározza, hogy keresés során követve legyenek-e a szimbolikus linkek.",
-+<<<<<<< .our
- 	"search.smartCase": "Figyelmen kívül hagyja a kis- és nagybetűket, ha a minta csak kisbetűkből áll, ellenkező esetben kis- és nagybetűérzékenyen keres",
- 	"search.globalFindClipboard": "Meghatározza, hogy a keresőmodul olvassa és módosítsa-e a megosztott keresési vágólapot macOS-en.",
- 	"search.location": "Meghatározza, hogy a keresés az oldalsávon jelenik meg vagy egy panelként a panelterületen, mely utóbbi esetén több vízszintes hely áll rendelkezésre."
-+=======
-+	"search.smartCase": "Figyelmen kívül hagyja a kis- és nagybetűket, ha a minta csak kisbetűkből áll, ellenkező esetben kis- és nagybetűérzékenyen keres"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 f3d84a4571d187f3aa22dc07ec0d3fda3e75c69f i18n/hun/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-  their  100644 4d54491cc1ed72763941c012edc41e2c501530dd i18n/hun/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"global.scope": "(globális)",
- 	"global.1": "(({0})",
- 	"new.global": "Új globális kódrészlet-fájl...",
-changed in both
-  base   100644 12f3a6365e8c382d700b5b941bbf4e17778baf5b i18n/hun/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  our    100644 5a3f80015bbe3e795dee371fc7f943aa67c6afa3 i18n/hun/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  their  100644 61cbea48ecab4b7fa71edb3b4f17f906071e7b67 i18n/hun/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"snippetSchema.json.default": "Üres kódrészlet",
- 	"snippetSchema.json": "Felhasználói kódrészlet-konfiguráció",
- 	"snippetSchema.json.prefix": "A kódrészlet IntelliSense-ben történő kiválasztásánál használt előtag",
-added in both
-  our    100644 869515c3c57f9df3f8a5d163b6964f24055ea3fd i18n/hun/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-  their  100644 ac8bcd025bd97956a0c20ada292404341892a6be i18n/hun/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,5 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"source.snippetGlobal": "Globális felhasználói kódrészket",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"source.snippet": "Felhasználói kódrészlet"
- }
-\ No newline at end of file
-changed in both
-  base   100644 b86aeaf6994bcf3fab27a5d8501c4a09aa00327e i18n/hun/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  our    100644 f6494963584f4e252a29cc4278b64a8bdc027d55 i18n/hun/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 ef351110a21e65ccc7e04ad14bc49433a6be5892 i18n/hun/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,9 @@
- 	],
- 	"invalid.path.0": "Hiányzó karakterlánc a `contributes.{0}.path`-ban. A megadott érték: {1}",
- 	"invalid.language.0": "Nyelv elhagyása esetén a `contributes.{0}.path` értékének egy `.code-snippets`-fájlnak kell lennie. A megadott érték: {1}",
-+=======
-+	"invalid.path.0": "Hiányzó karakterlánc a `contributes.{0}.path`-ban. A megadott érték: {1}",
-+>>>>>>> .their
- 	"invalid.language": "Ismeretlen nyelv található a következőben: `contributes.{0}.language`. A megadott érték: {1}",
- 	"invalid.path.1": "A `contributes.{0}.path` ({1}) nem a kiegészítő mappáján belül található ({2}). Emiatt előfordulhat, hogy a kiegészítő nem lesz hordozható.",
- 	"vscode.extension.contributes.snippets": "Kódrészleteket szolgáltat.",
-changed in both
-  base   100644 4d4b7d5d7cf9f5df951944bbb6bec0cfe484e9e1 i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 8ec8f827057c19dd6709715ecc51f43540d7d5cc i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 525d9caef57e87c58eeaacc366e52e7500bb518f i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -15,7 +15,11 @@
- 	"terminal.integrated.shellArgs.osx": "OS X-terminál esetén használt parancssori argumentumok.",
- 	"terminal.integrated.shell.windows": "A terminál által használt shell elérési útja Windowson. A Windows beépített shelljei (cmd, PowerShell vagy Bash on Ubuntu) használata esetén kell megadni.",
- 	"terminal.integrated.shellArgs.windows": "Windows-terminál esetén használt parancssori argumentumok.",
-+<<<<<<< .our
- 	"terminal.integrated.macOptionIsMeta": "Az option billentyű meta billentyűként legyen kezelve a terminálban, macOS-en.",
-+=======
-+	"terminal.integrated.rightClickCopyPaste": "Ha be van kapcsolva, megakadályozza, hogy megjelenjen a helyi menü a terminálon történő jobb kattintás esetén. Ehelyett másol, ha van kijelölés, és beilleszt, ha nincs.",
-+>>>>>>> .their
- 	"terminal.integrated.copyOnSelection": "Ha be van kapcsolva, a terminálban kijelölt szöveg a vágólapra lesz másolva.",
- 	"terminal.integrated.fontFamily": "Meghatározza a terminál betűtípusát. Alapértelmezett értéke az editor.fontFamily értéke.",
- 	"terminal.integrated.fontSize": "Meghatározza a terminálban használt betű méretét, pixelekben.",
-@@ -30,14 +34,21 @@
- 	"terminal.integrated.rendererType": "Meghatározza, hogy melyik módszerrel van kirajzolva a terminál: a „canvas” esetén az alap (gyors) canvas-alapú megjelenítővel, míg „dom” esetén a tartalék DOM-alapú megjelenítővel. Az „auto” esetén a VS Code megpróbálja kitalálni, melyik módszer lesz hatékonyabb. Az érték módosítása után újra kell tölteni a VS Code-ot, hogy az új terminálokban érvénybe lépjen a beállítás.",
- 	"terminal.integrated.rightClickBehavior": "Meghatározza, hogy a terminál milyen műveletet hajt végre jobb kattintás esetén. Lehetséges értékek: „default”, „copyPaste” és „selectWord”. „default” esetén megjelenik a helyi menü, „copyPaste” esetén másolja a kijelölt szöveget vagy beilleszt, „selectWord” esetén pedig kijelöli a kurzor alatti szót és megjeleníti a helyi menüt.",
- 	"terminal.integrated.cwd": "Explicit elérési út, ahol a terminál indítva lesz. Ez a shellfolyamat munkakönyvtára (cwd) lesz. Ez a beállítás nagyon hasznos olyan munkaterületeken, ahol a gyökérkönyvtár nem felel meg munkakönyvtárnak.",
-+<<<<<<< .our
- 	"terminal.integrated.confirmOnExit": "Az alkalmazás kérjen-e megerősítést kilépéskor, ha van aktív terminál-munkafolyamat.",
-+=======
-+	"terminal.integrated.confirmOnExit": "Meghatározza, hogy megerősítést kér-e az alkalamzás, ha van aktív terminál-munkafolyamat.",
-+>>>>>>> .their
- 	"terminal.integrated.enableBell": "Meghatározza, hogy engedélyezve van-e a csengő a terminálba.",
- 	"terminal.integrated.commandsToSkipShell": "Olyan parancsazonosítók listája, melyek nem lesznek elküldve a shellnek, és ehelyett mindig a Code kezeli le őket. Ez lehetővé teszi, hogy az olyan billentyűparancsok, melyeket normál esetben a shell dolgozna fel, ugyanúgy működjenek, mint mikor a terminálon nincs fókusz. Például ilyen a gyorsmegnyitás indításához használt Ctrl+P.",
- 	"terminal.integrated.env.osx": "A VS Code folyamatához hozzáadott környezeti változókat tartalmazó objektum, amit az OS X-es terminál használ.",
- 	"terminal.integrated.env.linux": "A VS Code folyamatához hozzáadott környezeti változókat tartalmazó objektum, amit a linuxos terminál használ.",
- 	"terminal.integrated.env.windows": "A VS Code folyamatához hozzáadott környezeti változókat tartalmazó objektum, amit a windowsos terminál használ.",
- 	"terminal.integrated.showExitAlert": "A `A terminálfolyamat a következő kilépési kóddal állt le` üzenet megjelenítése, ha a kilépési kód nem nulla.",
-+<<<<<<< .our
- 	"terminal.integrated.experimentalRestore": "Vissza legyenek-e állítva a terminálos munkamenetek a VS Code indításakor. Ez egy kísérleti beállítás: hibákat tartalmazhat és változhat is a jövőben.",
-+=======
-+>>>>>>> .their
- 	"terminalCategory": "Terminál",
- 	"viewCategory": "Nézet"
- }
-\ No newline at end of file
-changed in both
-  base   100644 c671a91c989425f4bf80c56e6f8c52501e72874f i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 b5d8a4cb5cb8f374a5aeb4f4cc4a537c343663e4 i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 8f1350c0d3c136eeff7e342ce7501fe8e447f793 i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -20,6 +20,7 @@
- 	"workbench.action.terminal.new.short": "Új terminál",
- 	"workbench.action.terminal.newWorkspacePlaceholder": "Az aktuális munkakönyvtár kiválasztása az új terminálhoz",
- 	"workbench.action.terminal.newInActiveWorkspace": "Új integrált terminál létrehozása (az aktív munkaterületen)",
-+<<<<<<< .our
- 	"workbench.action.terminal.split": "Terminál kettéosztása",
- 	"workbench.action.terminal.splitInActiveWorkspace": "Terminál kettéosztása (az aktív munkaterületen)",
- 	"workbench.action.terminal.focusPreviousPane": "Váltás az előző panelra",
-@@ -28,6 +29,8 @@
- 	"workbench.action.terminal.resizePaneRight": "Méret növelése jobbra",
- 	"workbench.action.terminal.resizePaneUp": "Méret növelése felfelé",
- 	"workbench.action.terminal.resizePaneDown": "Méret növelése lefelé",
-+=======
-+>>>>>>> .their
- 	"workbench.action.terminal.focus": "Váltás a terminálra",
- 	"workbench.action.terminal.focusNext": "Váltás a következő terminálra",
- 	"workbench.action.terminal.focusPrevious": "Váltás az előző terminálra",
-changed in both
-  base   100644 3471cfec5dcce1f100d328201f3b000e1d18da3a i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 e68d7791167aa4ec39545b66085dd1627ef11c4c i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 ff1983f42c6ac4977dd9aa08d10801bae1071130 i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -11,6 +11,9 @@
- 	"terminalCursor.foreground": "A terminál kurzorának előtérszíne.",
- 	"terminalCursor.background": "A terminál kurzorának háttérszíne. Lehetővé teszik az olyan karakterek színének módosítását, amelyek fölött egy blokk-típusú kurzor áll.",
- 	"terminal.selectionBackground": "A terminálban kijelölt tartalom háttérszíne.",
-+<<<<<<< .our
- 	"terminal.border": "A terminálokat elválasztó keret színe. Alapértelmezett értéke megegyezik a panel.border értékével.",
-+=======
-+>>>>>>> .their
- 	"terminal.ansiColor": "'{0}' ANSI-szín a terminálban."
- }
-\ No newline at end of file
-changed in both
-  base   100644 45f5c16180ae420c53dfc644c2bfcbe0a48c6b4e i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  our    100644 f684fc9f6733f94b9bcb701dcd43e00f95643c28 i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  their  100644 ea617c7168de836ff539020b57ac4cbb510225b0 i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-@@ -8,7 +8,11 @@
- 	],
- 	"terminal.integrated.chooseWindowsShellInfo": "Megváltoztathatja az alapértelmezett terminált a testreszabás gomb választásával.",
- 	"customize": "Testreszabás",
-+<<<<<<< .our
- 	"never again": "Ne jelenítse meg újra",
-+=======
-+	"cancel": "Mégse",
-+>>>>>>> .their
- 	"terminal.integrated.chooseWindowsShell": "Válassza ki a preferált terminál shellt! Ez később módosítható a beállításokban.",
- 	"terminalService.terminalCloseConfirmationSingular": "Van egy aktív terminálmunkamenet. Szeretné megszakítani?",
- 	"terminalService.terminalCloseConfirmationPlural": "{0} aktív terminálmunkamenet van. Szeretné megszakítani?"
-changed in both
-  base   100644 79c64944348333dd89589910b851ed928966c6c0 i18n/hun/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 ee1596339153cc7e8c412014c640971b5ecc963e i18n/hun/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 6315a5d17bd9e93ca63f53bf47f6f5bb1af2107a i18n/hun/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -9,9 +9,17 @@
- 	"releaseNotes": "Kiadási jegyzék",
- 	"showReleaseNotes": "Kiadási jegyzék megjelenítése",
- 	"read the release notes": "Üdvözöljük a {0} v{1} verziójában. Szeretné megtekinteni a kiadási jegyzéket?",
-+<<<<<<< .our
- 	"licenseChanged": "A licencfeltételek változtak. A változások áttekintéséhez kattintson [ide]({0})!",
- 	"neveragain": "Ne jelenítse meg újra",
- 	"64bitisavailable": "Elérhető a {0} 64-bites Windowsra készült változata! További információhoz kattintson [ide]({1})!",
-+=======
-+	"licenseChanged": "A licencfeltételek változtak. Olvassa végig!",
-+	"license": "Licenc elolvasása",
-+	"neveragain": "Ne jelenítse meg újra",
-+	"64bitisavailable": "Elérhető a {0} 64-bites Windowsra készült változata!",
-+	"learn more": "További információ",
-+>>>>>>> .their
- 	"updateIsReady": "Új {0}-frissítés érhető el.",
- 	"noUpdatesAvailable": "Jelenleg nincs elérhető frissítés.",
- 	"ok": "OK",
-@@ -26,7 +34,10 @@
- 	"commandPalette": "Parancskatalógus...",
- 	"settings": "Beállítások",
- 	"keyboardShortcuts": "Billentyűparancsok",
-+<<<<<<< .our
- 	"showExtensions": "Kiegészítők kezelése",
-+=======
-+>>>>>>> .their
- 	"userSnippets": "Felhasználói kódrészletek",
- 	"selectTheme.label": "Színtéma",
- 	"themes.selectIconTheme.label": "Fájlikontéma",
-changed in both
-  base   100644 f77948f5276ebd4bb9e66fb0947ab85b691a7f9b i18n/hun/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  our    100644 7f2659c063a55d4aff7833d69377336452a2b34d i18n/hun/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  their  100644 e2deab2db4ee2c09ea694c553ff0103d7fcf5f79 i18n/hun/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,4 +14,9 @@
- 	"fileBinaryError": "A fájl binárisnak tűnik és nem nyitható meg szövegként",
- 	"err.create": "Nem sikerült létrehozni a(z) {0} nevű fájlt",
- 	"fileMoveConflict": "Nem lehet áthelyezni vagy másolni. A fájl már létezik a célhelyen."
-+=======
-+	"fileIsDirectoryError": "A fájl egy könyvtár",
-+	"fileNotModifiedError": "A fájl azóta nem módosult",
-+	"fileBinaryError": "A fájl binárisnak tűnik és nem nyitható meg szövegként"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 91ce4d8f7507b70e6368467215efb47981f817f9 i18n/hun/src/vs/workbench/services/files/node/fileService.i18n.json
-  our    100644 639f690d07a4fe700c4fefee8584b4b846406706 i18n/hun/src/vs/workbench/services/files/node/fileService.i18n.json
-  their  100644 fcbe399cbac9cd0e806515e65cfd433c1abae8ea i18n/hun/src/vs/workbench/services/files/node/fileService.i18n.json
-changed in both
-  base   100644 6928f2f1935ea97ba4f8513bc030d8cf99a3f317 i18n/hun/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
-  our    100644 fda6870576bb69cf7b2986a30abcc10f56bee35b i18n/hun/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
-  their  100644 38b057d0682fa26a8a2b0024466b20f214be59aa i18n/hun/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
-changed in both
-  base   100644 a411a51ba5910c363ac333b59cfea93365ce12eb i18n/hun/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  our    100644 b94fe48249e25b823960304a227c6cacab895951 i18n/hun/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  their  100644 5a0ddc8c0429c77b95e2ddf7c7adf1bf6aa53da9 i18n/hun/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-changed in both
-  base   100644 d67776bc4335d4713e95dc3e8b7d83f1043ec825 i18n/hun/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 cf978af5d8a1515d6c83d24f871d30875b427657 i18n/hun/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 afe4cf7833a0af629d6f87fa691910fe55420b8b i18n/hun/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-changed in both
-  base   100644 068445ae82b0a0db65c00e0449c4cea4d3b71d25 i18n/hun/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  our    100644 eda2e6fffa6eb36223a779093d2d797359c79998 i18n/hun/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  their  100644 3c7eb68f49e9ad5ba9bdff300a15c35dfa0d75a5 i18n/hun/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-@@ -8,5 +8,10 @@
- 	],
- 	"errorInvalidTaskConfiguration": "Nem sikerült írni a munkaterület konfigurációs fájljába. Nyissa meg a fájlt, javítsa a benne található hibákat és figyelmeztetéseket, majd próbálja újra!",
- 	"errorWorkspaceConfigurationFileDirty": "Nem sikerült írni a munkaterület konfigurációs fájljába, mert módosítva lett. Mentse, majd próbálja újra!",
-+<<<<<<< .our
- 	"openWorkspaceConfigurationFile": "Munkaterület-konfiguráció megnyitása"
-+=======
-+	"openWorkspaceConfigurationFile": "Munkaterület konfigurációs fájljának megnyitása",
-+	"close": "Bezárás"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 b51df7e140de3cfa8d940b59564fd038dcddaade i18n/ita/extensions/git/out/autofetch.i18n.json
-  our    100644 204ce5999322752d9ff0594e13195091068c5a02 i18n/ita/extensions/git/out/autofetch.i18n.json
-  their  100644 ffe7f9d6f24ed36c2ffdac9c9692f7aecb0ae508 i18n/ita/extensions/git/out/autofetch.i18n.json
-@@ -7,7 +7,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"yes": "Sì",
-+<<<<<<< .our
- 	"no": "No",
- 	"not now": "Chiedimelo in seguito",
- 	"suggest auto fetch": "Desideri che Code [esegua `git fetch` periodicamente]({0})?"
-+=======
-+	"read more": "Altre informazioni",
-+	"no": "No"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 b544cb5ca24aa5dfa2984deb2835a530ad9c1af6 i18n/ita/extensions/git/out/commands.i18n.json
-  our    100644 b8b9f0490197b0e5904f4f035caca3a7f04c7df9 i18n/ita/extensions/git/out/commands.i18n.json
-  their  100644 d7970a8aad21578eaee5cec13983d498ef750123 i18n/ita/extensions/git/out/commands.i18n.json
-@@ -71,12 +71,19 @@
- 	"pick remote pull repo": "Selezionare un repository remoto da cui effettuare il pull del ramo",
- 	"no remotes to push": "Il repository non contiene elementi remoti configurati come destinazione del push.",
- 	"nobranch": "Estrarre un ramo per eseguire il push in un elemento remoto.",
-+<<<<<<< .our
- 	"confirm publish branch": "La branch '{0}' non ha una branch corrispondente a monte. Desideri pubblicarla?",
- 	"ok": "OK",
- 	"push with tags success": "Il push con tag è riuscito.",
- 	"pick remote": "Selezionare un repository remoto in cui pubblicare il ramo '{0}':",
- 	"sync is unpredictable": "Questa azione consentirà di effettuare il push e il pull di commit da e verso '{0}/[1]'.",
- 	"never again": "OK, non visualizzare più",
-+=======
-+	"ok": "OK",
-+	"push with tags success": "Il push con tag è riuscito.",
-+	"pick remote": "Selezionare un repository remoto in cui pubblicare il ramo '{0}':",
-+	"sync is unpredictable": "Questa azione consentirà di effettuare il push e il pull di commit da e verso '{0}'.",
-+>>>>>>> .their
- 	"no remotes to publish": "Il repository non contiene elementi remoti configurati come destinazione della pubblicazione.",
- 	"no changes stash": "Non ci sono modifiche da accantonare.",
- 	"provide stash message": "Specificare un messaggio di accantonamento (facoltativo)",
-added in both
-  our    100644 ffa2bc44d1e47cb10d96a67a8a32dfe939ae2d74 i18n/ita/extensions/typescript/out/commands.i18n.json
-  their  100644 e771e7a4a9eca41e3fd32ac7db21d483d0c22fc3 i18n/ita/extensions/typescript/out/commands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -13,4 +14,20 @@
- 	"typescript.noJavaScriptProjectConfig": "Il file non fa parte di un progetto JavaScript. Clicca [qui]({0}) per saperne di più.",
- 	"typescript.configureTsconfigQuickPick": "Configura tsconfig.json",
- 	"typescript.configureJsconfigQuickPick": "Configura jsconfig.json"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"typescript.projectConfigNoWorkspace": "Aprire una cartella in Visual Studio Code per usare un progetto TypeScript o JavaScript",
-+	"typescript.projectConfigUnsupportedFile": "Non è stato possibile determinare il progetto TypeScript o JavaScript. Il tipo di file non è supportato",
-+	"typescript.projectConfigCouldNotGetInfo": "Non è stato possibile determinare il progetto TypeScript o JavaScript",
-+	"typescript.noTypeScriptProjectConfig": "Il file non fa parte di un progetto TypeScript",
-+	"typescript.noJavaScriptProjectConfig": "Il file non fa parte di un progetto JavaScript",
-+	"typescript.configureTsconfigQuickPick": "Configura tsconfig.json",
-+	"typescript.configureJsconfigQuickPick": "Configura jsconfig.json",
-+	"typescript.projectConfigLearnMore": "Altre informazioni"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6e295ef1e2c5c31c8dc900b0e03428d88047083e i18n/ita/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json
-  our    100644 2b12daabc0796df315e4942ce02045465f3738b4 i18n/ita/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json
-  their  100644 8baf1308a2690753586ce30c1180e0e6e3dd727f i18n/ita/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json
-added in both
-  our    100644 750d811d866eaa3d43818bd1d8e28c9898acf514 i18n/ita/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/ita/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"selectAriaOption": "{0}"
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-added in both
-  our    100644 4795960aaa0875a994fc1e5ce04159a9c9274acb i18n/ita/src/vs/base/node/ps.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/ita/src/vs/base/node/ps.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"collecting": "Raccolta informazioni su CPU e memoria in corso. Potrebbe impiegare qualche secondo."
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 99d10858e0709d519335020016e89ff83886bd5a i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 f91d8d15e9f7c53e3b2a0166aab270c9bf1f772e i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 8d193dcadbd9e3dc855f9044884516aad27afacb i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -16,7 +16,10 @@
- 	"lineNumbers.on": "I numeri di riga vengono visualizzati come numeri assoluti.",
- 	"lineNumbers.relative": "I numeri di riga vengono visualizzati come distanza in linee alla posizione del cursore.",
- 	"lineNumbers.interval": "I numeri di riga vengono visualizzati ogni 10 righe.",
-+<<<<<<< .our
- 	"lineNumbers": "Controlla la visualizzazione dei numeri di riga.",
-+=======
-+>>>>>>> .their
- 	"rulers": "Mostra righelli verticali dopo un certo numero di caratteri a spaziatura fissa. Utilizza più valori  per più righelli. Nessun righello viene disegnati se la matrice è vuota",
- 	"wordSeparators": "Caratteri che verranno usati come separatori di parola quando si eseguono operazioni o spostamenti correlati a parole",
- 	"tabSize": "Il numero di spazi corrispondenti ad un carattere Tab. Questa impostazione viene sottoposta a override in base al contenuto dei file quando 'editor.detectIndentation' è 'on'.",
-changed in both
-  base   100644 bd8958bdf975b50d0b84527ddedde871e5173eeb i18n/ita/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 047668b002c0125f22b3c77979675bee2ddbe88f i18n/ita/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 81909087f6997d03636a64c7e6359a458f752770 i18n/ita/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -8,8 +8,11 @@
- 	],
- 	"lineHighlight": "Colore di sfondo per l'evidenziazione della riga alla posizione del cursore.",
- 	"lineHighlightBorderBox": "Colore di sfondo per il bordo intorno alla riga alla posizione del cursore.",
-+<<<<<<< .our
- 	"rangeHighlight": "Colore di sfondo degli intervalli evidenziati, ad esempio dalle funzionalità Quick Open e Trova. il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.",
- 	"rangeHighlightBorder": "Colore di sfondo del bordo intorno agli intervalli selezionati.",
-+=======
-+>>>>>>> .their
- 	"caret": "Colore del cursore dell'editor.",
- 	"editorCursorBackground": "Colore di sfondo del cursore editor. Permette di personalizzare il colore di un carattere quando sovrapposto da un blocco cursore.",
- 	"editorWhitespaces": "Colore dei caratteri di spazio vuoto nell'editor.",
-changed in both
-  base   100644 2d24c4f96eaf51c1b02a0c01092959b732bde063 i18n/ita/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  our    100644 489403787509136e0d47f57e12029772ff110678 i18n/ita/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  their  100644 505e8cba0142a8379a942fd18d371f10de6570e5 i18n/ita/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -10,4 +11,11 @@
- 	"markerAction.previous.label": "Vai al problema precedente (Errore, Avviso, Info)",
- 	"markerAction.nextInFiles.label": "Vai al Problema Successivo nei File (Error, Warning, Info)",
- 	"markerAction.previousInFiles.label": "Vai al Problema Precedente nei File (Error, Warning, Info) "
-+=======
-+	"title.wo_source": "({0}/{1})",
-+	"editorMarkerNavigationError": "Colore per gli errori del widget di spostamento tra marcatori dell'editor.",
-+	"editorMarkerNavigationWarning": "Colore per gli avvisi del widget di spostamento tra marcatori dell'editor.",
-+	"editorMarkerNavigationInfo": "Colore delle informazioni del widget di navigazione marcatori dell'editor.",
-+	"editorMarkerNavigationBackground": "Sfondo del widget di spostamento tra marcatori dell'editor."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d57627a559aaf9ec3945b4e01975197a974efca5 i18n/ita/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  our    100644 e0d29249698047f3608784eabef81557838d41db i18n/ita/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  their  100644 b355190a13bf71dac74e3b66531a86f551fc2eed i18n/ita/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,10 @@
- 	"wordHighlightStrongBorder": "Colore del bordo di un simbolo durante l'accesso in scrittura, ad esempio durante la scrittura in una variabile.",
- 	"overviewRulerWordHighlightForeground": "Colore del marcatore righello panoramica per evidenziazione simboli. Il colore non deve essere opaco per non nascondere decorazioni sottostanti.",
- 	"overviewRulerWordHighlightStrongForeground": "Colore del marcatore righello panoramica per evidenziazione simboli con accesso in scrittura. Il colore non deve essere opaco per non nascondere decorazioni sottostanti.",
-+=======
-+	"overviewRulerWordHighlightForeground": "Colore del marcatore del righello delle annotazioni per le evidenziazioni dei simboli.",
-+	"overviewRulerWordHighlightStrongForeground": "Colore del marcatore del righello delle annotazioni per le evidenziazioni dei simboli di accesso in scrittura.",
-+>>>>>>> .their
- 	"wordHighlight.next.label": "Vai al prossimo simbolo evidenziato",
- 	"wordHighlight.previous.label": "Vai al precedente simbolo evidenziato"
- }
-\ No newline at end of file
-changed in both
-  base   100644 32a58ae4a610928e553df9a55cccf0ff6b7f818f i18n/ita/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  our    100644 1b2a046fdb00dc2b8d3837f833d8eac80b820712 i18n/ita/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  their  100644 f8e28e396b6a8860050ff84708478ecf8296bafd i18n/ita/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 194dc9d937c95859b7ae7875cbd542c08c06b7ba i18n/ita/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 9db983246eacb0b2b4bfd0f1c8d91ee5c10e2e9a i18n/ita/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 bf517983deb3be176ce69164bb8433c57463b23c i18n/ita/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,11 +10,19 @@
- 	"diff": "Confronta due file tra loro.",
- 	"add": "Aggiunge la cartella o le cartelle all'ultima finestra attiva.",
- 	"goto": "Apre un file nel percorso alla posizione specificata di riga e carattere.",
-+<<<<<<< .our
- 	"newWindow": "Forza l'apertura di una nuova finestra.",
- 	"reuseWindow": "Forza l'apertura di un file o di una cartella nell'ultima finestra attiva.",
- 	"wait": "Attendere la chiusura dei file prima della restituzione.",
- 	"locale": "Impostazioni locali da usare, ad esempio en-US o it-IT.",
- 	"userDataDir": "Consente di specificare la directory in cui si trovano i dati utente. Può essere usata per aprire più istanze diverse di Code.",
-+=======
-+	"newWindow": "Forza una nuova istanza di Code.",
-+	"reuseWindow": "Forza l'apertura di un file o di una cartella nell'ultima finestra attiva.",
-+	"wait": "Attendere la chiusura dei file prima della restituzione.",
-+	"locale": "Impostazioni locali da usare, ad esempio en-US o it-IT.",
-+	"userDataDir": "Consente di specificare la directory in cui si trovano i dati utente. Utile quando viene eseguito come root.",
-+>>>>>>> .their
- 	"version": "Visualizza la versione.",
- 	"help": "Visualizza la sintassi.",
- 	"extensionHomePath": "Impostare il percorso radice per le estensioni.",
-@@ -22,18 +30,28 @@
- 	"showVersions": "Mostra le versioni delle estensioni installate, quando si usa --list-extension.",
- 	"installExtension": "Installa un'estensione.",
- 	"uninstallExtension": "Disinstalla un'estensione.",
-+<<<<<<< .our
- 	"experimentalApis": "Abilita funzionalità di API proposte per un'estensione.",
-+=======
-+	"experimentalApis": "Abilita funzionalità di API proposte per un'estensione specifica.",
-+>>>>>>> .their
- 	"verbose": "Visualizza l'output dettagliato (implica --wait).",
- 	"log": "Livello di logging da utilizzare. Il valore predefinito è 'info'. I valori consentiti sono 'critical, 'error', 'warn', 'info', 'debug', 'trace', 'off'.",
- 	"status": "Stampare le informazioni di utilizzo e diagnostica di processo.",
- 	"performance": "Eseguire l'avvio con il comando 'Developer: Startup Performance' abilitato.",
- 	"prof-startup": "Esegui il profiler della CPU durante l'avvio",
- 	"disableExtensions": "Disabilita tutte le estensioni installate.",
-+<<<<<<< .our
- 	"inspect-extensions": "Consente il debug e profiling delle estensioni. Controllare gli strumenti di sviluppo per la URI di connessione.",
- 	"inspect-brk-extensions": "Consente di eseguire debug e profilatura delle estensioni con l'host dell'estensione messo in pausa dopo l'avvio. Controllare gli strumenti di sviluppo per l'URI di connessione.",
- 	"disableGPU": "Disabilita l'accelerazione hardware della GPU.",
- 	"uploadLogs": "Caricamento dei log della sessione corrente verso un punto di comunicazione sicuro.",
- 	"maxMemory": "Dimensione massima della memoria per una finestra (in Mbytes).",
-+=======
-+	"inspect-extensions": "Consentire il debug e profiling delle estensioni. Controllare gli strumenti di sviluppo per l'uri di connessione.",
-+	"inspect-brk-extensions": "Consentire il debug e profiling delle estensioni con l'host di estensione in pausa dopo inizio. Controllare gli strumenti di sviluppo per l'uri di connessione.",
-+	"disableGPU": "Disabilita l'accelerazione hardware della GPU.",
-+>>>>>>> .their
- 	"usage": "Utilizzo",
- 	"options": "opzioni",
- 	"paths": "percorsi",
-changed in both
-  base   100644 f82303364610623245f511acc588590a5af5d0fa i18n/ita/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 35f8ed83f0da1c4a75798a67e5b16affcd21632f i18n/ita/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 d95dd9e9e679494c9f2ef8bfb3c2bf00c494d33d i18n/ita/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -7,17 +7,23 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"invalidManifest": "Estensione non valida: package.json non è un file JSON.",
-+<<<<<<< .our
- 	"incompatible": "Impossibile installare l'estensione '{0}' in quanto non è compatibile con VS Code '{1}'.",
-+=======
-+>>>>>>> .their
- 	"restartCode": "Riavviare Code prima di reinstallare {0}.",
- 	"installingOutdatedExtension": "Una versione più recente di questa estensione è già installata. Vuoi eseguire l'override di questa con la versione precedente?",
- 	"override": "Eseguire l'override",
- 	"cancel": "Annulla",
-+<<<<<<< .our
- 	"errorInstallingDependencies": "Errore durante l'installazione delle dipendenze. {0}",
- 	"MarketPlaceDisabled": "Il Marketplace non è abilitato",
- 	"removeError": "Errore durante la rimozione dell'estensione: {0}. Chiudere e riavviare VS Code prima di riprovare.",
- 	"Not a Marketplace extension": "Solo le Estensioni del Marketplace possono essere reinstallate",
- 	"notFoundCompatible": "Impossibile installare '{0}'; non è presente alcuna versione compatibile con VS Code '{1}'.",
- 	"malicious extension": "Non è possibile installare l'estensione poiché è stata segnalata come problematica.",
-+=======
-+>>>>>>> .their
- 	"notFoundCompatibleDependency": "Impossibile installare perché non è stata trovata l'estensione dipendente '{0}' compatibile con la versione corrente '{1}' di VS Code.",
- 	"quitCode": "Impossibile installare l'estensione. Riavviare VS Code prima di procedere ad un nuovo setup.",
- 	"exitCode": "Impossibile installare l'estensione. Riavviare VS Code prima di procedere ad un nuovo setup.",
-changed in both
-  base   100644 c623cd2a9bbf82447eb68b0fc47ce142a2f98414 i18n/ita/src/vs/platform/message/common/message.i18n.json
-  our    100644 5361700d443353ba59a58493689a184452d2d709 i18n/ita/src/vs/platform/message/common/message.i18n.json
-  their  100644 2822182506c18db11a5f3e8da82270a5a2d7a765 i18n/ita/src/vs/platform/message/common/message.i18n.json
-changed in both
-  base   100644 6505e976a25def5cb56d70e5a46dec00c6182e17 i18n/ita/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 db040b20535e5fbe6df69ea748baeb36651c5732 i18n/ita/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 5375e34f3cbf3f78942ea628094c9af2a47de5d6 i18n/ita/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -68,6 +68,7 @@
- 	"editorWidgetBorder": "Colore bordo dei widget dell'editor. Il colore viene utilizzato solo se il widget sceglie di avere un bordo e se il colore non è sottoposto a override da un widget.",
- 	"editorSelectionBackground": "Colore della selezione dell'editor.",
- 	"editorSelectionForeground": "Colore del testo selezionato per il contrasto elevato.",
-+<<<<<<< .our
- 	"editorInactiveSelection": "Colore della selezione in un editor non attivo. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.",
- 	"editorSelectionHighlight": "Colore delle aree con lo stesso contenuto della selezione. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.",
- 	"editorSelectionHighlightBorder": "Colore del bordo delle regioni con lo stesso contenuto della selezione.",
-@@ -79,6 +80,9 @@
- 	"findRangeHighlightBorder": "Colore del bordo dell'intervallo di limite della ricerca. Il colore non deve essere opaco per non nascondere decorazioni sottostanti.",
- 	"findWidgetResizeBorder": "Colore del bordo della barra di ridimensionamento del comando trova.",
- 	"hoverHighlight": "Evidenziazione sotto la parola per cui è visualizzata un'area sensibile al passaggio del mouse. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.",
-+=======
-+	"editorFindMatch": "Colore della corrispondenza di ricerca corrente.",
-+>>>>>>> .their
- 	"hoverBackground": "Colore di sfondo dell'area sensibile al passaggio del mouse dell'editor.",
- 	"hoverBorder": "Colore del bordo dell'area sensibile al passaggio del mouse dell'editor.",
- 	"activeLinkForeground": "Colore dei collegamenti attivi.",
-@@ -86,12 +90,15 @@
- 	"diffEditorRemoved": "Colore di sfondo per il testo che è stato rimosso. Il colore non deve essere opaco per non nascondere le decorazioni sottostanti.",
- 	"diffEditorInsertedOutline": "Colore del contorno del testo che è stato inserito.",
- 	"diffEditorRemovedOutline": "Colore del contorno del testo che è stato rimosso.",
-+<<<<<<< .our
- 	"mergeCurrentHeaderBackground": "Sfondo intestazione corrente in conflitti di merge in linea. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.",
- 	"mergeCurrentContentBackground": "Sfondo contenuto corrente in conflitti di merge in linea. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.",
- 	"mergeIncomingHeaderBackground": "Sfondo intestazione modifica in ingresso in conflitti di merge in linea. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.",
- 	"mergeIncomingContentBackground": "Sfondo contenuto modifica in ingresso in conflitti di merge in linea. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.",
- 	"mergeCommonHeaderBackground": "Sfondo dell'intestazione dell'antenato comune nei conflitti di merge in linea. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.",
- 	"mergeCommonContentBackground": "Sfondo del contenuto del predecessore comune in conflitti di merge in line. Il colore non deve essere opaco per non nascondere decorazioni sottostanti.",
-+=======
-+>>>>>>> .their
- 	"mergeBorder": "Colore bordo su intestazioni e sulla barra di divisione di conflitti di merge in linea.",
- 	"overviewRulerCurrentContentForeground": "Colore primo piano righello panoramica attuale per i conflitti di merge in linea.",
- 	"overviewRulerIncomingContentForeground": "Colore primo piano del righello panoramica modifiche in arrivo per i conflitti di merge in linea.",
-added in both
-  our    100644 475ba817066d79b528abeae699b840a0322796c0 i18n/ita/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/ita/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,4 +11,12 @@
- 	"codeActionsOnSave.didTimeout": "codeActionsOnSave interrotto dopo {0} ms",
- 	"timeout.onWillSave": "Evento onWillSaveTextDocument interrotto dopo 1750 ms",
- 	"saveParticipants": "Esecuzione del salvataggio partecipanti..."
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 04c4b11db8ce880414ddf274995758b9caf0ec71 i18n/ita/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  our    100644 3a17c732425a4b7dbee77da7b6537e08e051f468 i18n/ita/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  their  100644 aac2c8ae46ed8e1d0b4570e0215762f1d1b9e6fe i18n/ita/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,7 @@
- 	],
- 	"treeView.notRegistered": "Nessuna visualizzazione di struttura ad albero con ID '{0}' registrata.",
- 	"treeView.duplicateElement": "L'elemento con id {0} è già registrato"
-+=======
-+	"treeView.notRegistered": "Nessuna visualizzazione di struttura ad albero con ID '{0}' registrata."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 0a58dca9eaaf74ffb9f135ba4039a3e5f5a663da i18n/ita/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 967a9460fbe454ea199d54b4639f97929c5854cd i18n/ita/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 b30eb5b862d16fac9f145700dbe4800a61e1e401 i18n/ita/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -15,5 +15,9 @@
- 	"saveWorkspace": "Salva area di lavoro",
- 	"openWorkspaceAction": "Apri area di lavoro...",
- 	"openWorkspaceConfigFile": "Apri file di configurazione dell'area di lavoro",
-+<<<<<<< .our
- 	"duplicateWorkspaceInNewWindow": "Duplica area di lavoro nella nuova finestra"
-+=======
-+	"openFolderAsWorkspaceInNewWindow": "Apre la cartella come area di lavoro in una nuova finestra"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 48e9eddc787607e89120b63fe629a9ff5438a2a8 i18n/ita/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-  their  100644 e07a448e23d87b4c7ec0e6fa3cb935960a4996fb i18n/ita/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,4 +11,15 @@
- 	"add": "&&Aggiungi",
- 	"addFolderToWorkspaceTitle": "Aggiungi cartella all'area di lavoro",
- 	"workspaceFolderPickerPlaceholder": "Selezionare la cartella dell'area di lavoro"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"addFolderToWorkspace": "Aggiungi cartella all'area di lavoro...",
-+	"add": "&&Aggiungi",
-+	"addFolderToWorkspaceTitle": "Aggiungi cartella all'area di lavoro"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 aa914d12c1da869e962088d2cbdaa71dec18f105 i18n/ita/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  our    100644 cf3660bce1c9a34616bf6f0a1fe1b1d7c7bf7a0a i18n/ita/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  their  100644 8430880ec80121e257189c80cb2c92dfce5beb88 i18n/ita/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-@@ -19,6 +19,7 @@
- 	"close": "Chiudi",
- 	"closeOthers": "Chiudi altri",
- 	"closeRight": "Chiudi a destra",
-+<<<<<<< .our
- 	"closeAllSaved": "Chiudi salvati",
- 	"closeAll": "Chiudi tutto",
- 	"keepOpen": "Mantieni aperto",
-@@ -27,6 +28,15 @@
- 	"keepEditor": "Mantieni editor",
- 	"closeEditorsInGroup": "Chiudi tutti gli editor del gruppo",
- 	"closeSavedEditors": "Chiudi editor salvati del gruppo",
-+=======
-+	"closeAllUnmodified": "Chiudi non modificati",
-+	"closeAll": "Chiudi tutto",
-+	"keepOpen": "Mantieni aperto",
-+	"showOpenedEditors": "Mostra editor aperti",
-+	"keepEditor": "Mantieni editor",
-+	"closeEditorsInGroup": "Chiudi tutti gli editor del gruppo",
-+	"closeUnmodifiedEditors": "Chiudi editor non modificati del gruppo",
-+>>>>>>> .their
- 	"closeOtherEditors": "Chiudi gli altri editor",
- 	"closeRightEditors": "Chiudi editor a destra"
- }
-\ No newline at end of file
-changed in both
-  base   100644 00de0aab7d64af505627619a2939d5ad43b9ef74 i18n/ita/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 52332d26b607badcbfc6c1f6cb20390d01164f46 i18n/ita/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 5ff06b5baf65ba27890b39cc2876b0c6e9e70b69 i18n/ita/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 0e49511fa544f8bb8b1399692fefdd6a2f5c053d i18n/ita/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  our    100644 5a34fab0153073ac4fb299fb69d62730cb37cc6a i18n/ita/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  their  100644 023619e8620222beb29d86577c98bdd95709bc7b i18n/ita/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-changed in both
-  base   100644 1efc298b02cd642114945ecbf24a0dcdb425ecdd i18n/ita/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  our    100644 22268f1a23d3f17b0a706fdd5cbc81afbafc8e4b i18n/ita/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  their  100644 4476182db1851e83dca5a41301587321e328de72 i18n/ita/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-@@ -12,6 +12,10 @@
- 	"editableEditorWithInputAriaLabel": "{0}. Editor di confronto file di testo",
- 	"editableEditorAriaLabel": "Editor di confronto file di testo.",
- 	"navigate.next.label": "Revisione successiva",
-+<<<<<<< .our
- 	"navigate.prev.label": "Revisione precedente",
- 	"toggleIgnoreTrimWhitespace.label": "Ignora lo spazio vuoto finale"
-+=======
-+	"navigate.prev.label": "Revisione precedente"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 db72fb32688992ef42a8b202d502ed51312384af i18n/ita/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  our    100644 87ef247c9492a31e5723c851ba5fe6a0bcdca2a4 i18n/ita/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  their  100644 12d1b76075f4a87ecf796e5cfc6a1731a864e7e1 i18n/ita/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"close": "Chiudi",
-+>>>>>>> .their
- 	"araLabelEditorActions": "Azioni editor"
- }
-\ No newline at end of file
-changed in both
-  base   100644 c2344ccce6ac86de46b28825eb9665a6a82d07cc i18n/ita/src/vs/workbench/common/theme.i18n.json
-  our    100644 35f6e5209eb686bd26e13c1a8f96b6d2fe49fc8a i18n/ita/src/vs/workbench/common/theme.i18n.json
-  their  100644 f33262a82e27e122948638178e12b4abc25ebfb5 i18n/ita/src/vs/workbench/common/theme.i18n.json
-@@ -24,7 +24,10 @@
- 	"editorGroupBackground": "Colore di sfondo di un gruppo di editor. I gruppi di editor sono contenitori di editor. Il colore di sfondo viene visualizzato quando si trascinano i gruppi di editor in un'altra posizione.",
- 	"tabsContainerBackground": "Colore di sfondo dell'intestazione del titolo di gruppo di editor, quando le schede sono abilitate. I gruppi di editor sono i contenitori degli editor.",
- 	"tabsContainerBorder": "Colore del bordo dell'intestazione del titolo di gruppo di editor, quando le schede sono abilitate. I gruppi di editor sono i contenitori degli editor.",
-+<<<<<<< .our
- 	"editorGroupHeaderBackground": "Colore di sfondo dell'intestazione del titolo dell'editor quando le schede sono disabilitate (`\"workbench.editor.showTabs\": false`). I gruppi di editor sono contenitori di editor.",
-+=======
-+>>>>>>> .their
- 	"editorGroupBorder": "Colore per separare più gruppi di editor l'uno dall'altro. I gruppi di editor sono i contenitori degli editor.",
- 	"editorDragAndDropBackground": "Colore di sfondo quando si trascinano gli editor. Il colore dovrebbe avere una trasparenza impostata in modo che il contenuto dell'editor sia ancora visibile.",
- 	"panelBackground": "Colore di sfondo dei pannelli. I pannelli sono visualizzati sotto l'area degli editor e contengono visualizzazioni quali quella di output e del terminale integrato.",
-@@ -41,8 +44,11 @@
- 	"statusBarNoFolderBorder": "Colore del bordo della barra di stato che la separa dalla barra laterale e dall'editor quando non ci sono cartelle aperte. La barra di stato è visualizzata nella parte inferiore della finestra.",
- 	"statusBarItemActiveBackground": "Colore di sfondo degli elementi della barra di stato quando si fa clic. La barra di stato è visualizzata nella parte inferiore della finestra.",
- 	"statusBarItemHoverBackground": "Colore di sfondo degli elementi della barra di stato al passaggio del mouse. La barra di stato è visualizzata nella parte inferiore della finestra.",
-+<<<<<<< .our
- 	"statusBarProminentItemBackground": "Colore di sfondo degli elementi rilevanti della barra di stato. Gli elementi rilevanti spiccano rispetto ad altre voci della barra di stato. Per vedere un esempio, cambiare la modalità `Toggle Tab Key Moves Focus` nella barra dei comandi. La barra di stato è visualizzata nella parte inferiore della finestra.",
- 	"statusBarProminentItemHoverBackground": "Colore di sfondo degli elementi rilevanti della barra di stato al passaggio del mouse. Gli elementi rilevanti spiccano rispetto ad altre voci della barra di stato. Per vedere un esempio, cambiare la modalità `Toggle Tab Key Moves Focus` nella barra dei comandi. La barra di stato è visualizzata nella parte inferiore della finestra.",
-+=======
-+>>>>>>> .their
- 	"activityBarBackground": "Colore di sfondo della barra attività. La barra attività viene visualizzata nella parte inferiore sinistra/destra e consente il passaggio tra diverse visualizzazioni della barra laterale",
- 	"activityBarForeground": "Colore primo piano della barra attività (ad es. quello utilizzato per le icone). La barra attività viene mostrata all'estrema sinistra o destra e permette di alternare le visualizzazioni della barra laterale.",
- 	"activityBarBorder": "Colore del bordo della barra attività che la separa dalla barra laterale. La barra di attività viene mostrata all'estrema sinistra o destra e permette di alternare le visualizzazioni della barra laterale.",
-added in both
-  our    100644 eb055ed4506d14dd8144f10f4a8398105285f0d3 i18n/ita/src/vs/workbench/common/views.i18n.json
-  their  100644 ed1c7bde950f4f84edbe5116a0bd3ad795711bbe i18n/ita/src/vs/workbench/common/views.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"duplicateId": "Nel percorso '{1}' è già registrata una visualizzazione con ID '{0}' "
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"duplicateId": "Nel percorso `{1}` è già registrata una visualizzazione con ID `{0}` "
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ac85b55822ecb116e00b5b2b2635f000c1b16c96 i18n/ita/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 9737d645d67a50d571dc86669b68ed740de20eba i18n/ita/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 9ae1266d1f0d77f8d6b59d77637bd1971adb8fc8 i18n/ita/src/vs/workbench/electron-browser/actions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"closeWindow": "Chiudi finestra",
- 	"closeWorkspace": "Chiudi area di lavoro",
- 	"noWorkspaceOpened": "In questa istanza non ci sono attualmente aree di lavoro aperte da chiudere.",
-@@ -50,6 +53,14 @@
- 	"moveWindowTabToNewWindow": "Sposta scheda della finestra in una nuova finestra",
- 	"mergeAllWindowTabs": "Unisci tutte le finestre",
- 	"toggleWindowTabsBar": "Attiva/Disattiva barra delle schede delle finestre",
-+<<<<<<< .our
- 	"about": "Informazioni su {0}",
- 	"inspect context keys": "Esamina le chiavi di contesto"
-+=======
-+	"configureLocale": "Configura lingua",
-+	"displayLanguage": "Definisce la lingua visualizzata di VSCode.",
-+	"doc": "Per un elenco delle lingue supportate, vedere {0}.",
-+	"restart": "Se si modifica il valore, è necessario riavviare VSCode.",
-+	"fail.createSettings": "Non è possibile creare '{0}' ({1})."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 14e407b8a5d2dd18080b98db4aeceb6e82efc738 i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 16fec1a5d98f225249a95297ad06c45ba75efafc i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 103d383af16da2b098a39da278dfab3e080b1192 i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,12 +35,19 @@
- 	"panelDefaultLocation": "Controlla la posizione predefinita del pannello. Può essere mostrato nella parte inferiore o a destra del banco di lavoro.",
- 	"statusBarVisibility": "Controlla la visibilità della barra di stato nella parte inferiore del workbench.",
- 	"activityBarVisibility": "Controlla la visibilità della barra attività nel workbench.",
-+<<<<<<< .our
- 	"viewVisibility": "Controlla la visibilità delle azioni dell'intestazione della visualizzazione. Le azioni dell'intestazione della visualizzazione possono essere sempre visibili oppure visibili solo quando lo stato attivo è spostato sulla visualizzazione o si passa con il puntatore sulla visualizzazione.",
- 	"fontAliasing": "Controlla il metodo di aliasing dei caratteri nell'area di lavoro.\n- default: anti-aliasing dei caratteri a livello di sub-pixel. Nella maggior parte delle visualizzazioni non retina consentirà di ottenere un testo con il massimo contrasto.\n- antialiased: anti-aliasing dei caratteri a livello di pixel, invece che a livello di sub-pixel. Consente di visualizzare i caratteri più chiari.\n- none: disabilita l'anti-aliasing dei caratteri. Il testo verrà visualizzato con contorni irregolari.\n- auto: applica automaticamente `default` o `antialiased` in base al valore DPI degli schermi.",
- 	"workbench.fontAliasing.default": "Anti-aliasing dei caratteri a livello di sub-pixel. Nella maggior parte delle visualizzazioni non retina consentirà di ottenere un testo con il massimo contrasto.",
- 	"workbench.fontAliasing.antialiased": "Anti-aliasing dei caratteri a livello di pixel, invece che a livello di sub-pixel. Consente di visualizzare i caratteri più chiari.",
- 	"workbench.fontAliasing.none": "Disabilita l'anti-aliasing dei caratteri. Il testo verrà visualizzato con contorni irregolari. ",
- 	"workbench.fontAliasing.auto": "Applica automaticamente `default` o `antialiased` in base al valore DPI degli schermi.",
-+=======
-+	"fontAliasing": "Controlla il metodo di aliasing dei caratteri nell'area di lavoro.\n- impostazione predefinita: anti-aliasing dei caratteri a livello di sub-pixel. Nella maggior parte delle visualizzazioni non retina consentirà di ottenere un testo con il massimo contrasto.\n- anti-aliasing: anti-aliasing dei caratteri a livello di pixel, invece che a livello di sub-pixel. Consente di visualizzare i caratteri più chiari.\n- nessuno: disabilita l'anti-aliasing dei caratteri. Il testo verrà visualizzato con contorni irregolari.",
-+	"workbench.fontAliasing.default": "Anti-aliasing dei caratteri a livello di sub-pixel. Nella maggior parte delle visualizzazioni non retina consentirà di ottenere un testo con il massimo contrasto.",
-+	"workbench.fontAliasing.antialiased": "Anti-aliasing dei caratteri a livello di pixel, invece che a livello di sub-pixel. Consente di visualizzare i caratteri più chiari.",
-+	"workbench.fontAliasing.none": "Disabilita l'anti-aliasing dei caratteri. Il testo verrà visualizzato con contorni irregolari. ",
-+>>>>>>> .their
- 	"enableNaturalLanguageSettingsSearch": "Controlla se abilitare la modalità di ricerca in linguaggio naturale per le impostazioni.",
- 	"windowConfigurationTitle": "Finestra",
- 	"window.openFilesInNewWindow.on": "I file verranno aperti in una nuova finestra",
-changed in both
-  base   100644 7e90f64d82a4fa36c43e4f29e139ce445abd4761 i18n/ita/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  our    100644 40bf3c283240817477f8aec83bc57568d8f25770 i18n/ita/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  their  100644 94d7c45f7eb94399a63be2ad6ff3de70299bf789 i18n/ita/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"debug.terminal.title": "oggetto del debug"
- }
-\ No newline at end of file
-changed in both
-  base   100644 1b150a45b5f94b4afe926f7593fd6e0077139c2c i18n/ita/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  our    100644 2e6bc1e73d84675841055020e554bed2fb64eb7d i18n/ita/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  their  100644 5f819964e722118667f0dcca31bb29c830895978 i18n/ita/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-changed in both
-  base   100644 ec5fd33a3b1949fdef92ce08e1586cdcb9ac2168 i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 87312cd2502c47006701381399f821b3154685ff i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 2623cd6b56bff896693a3f32685e5f5cc3f93b1f i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,11 @@
- 	"exeBasedRecommendation": "Questa estensione è consigliata perché avete installato {0}.",
- 	"fileBasedRecommendation": "Questa estensione è raccomandata in base ai file aperti di recente.",
- 	"workspaceRecommendation": "Questa estensione è consigliata dagli utenti dell'area di lavoro corrente.",
-+=======
-+	"workspaceRecommendation": "Questa estensione è consigliata dagli utenti dell'area di lavoro corrente.",
-+	"fileBasedRecommendation": "Questa estensione è raccomandata in base ai file aperti di recente.",
-+	"exeBasedRecommendation": "Questa estensione è consigliata perché avete installato {0}.",
-+>>>>>>> .their
- 	"reallyRecommended2": "Per questo tipo di file è consigliabile utilizzare l'estensione '{0}'.",
- 	"reallyRecommendedExtensionPack": "Per questo tipo di file è consigliabile usare il pacchetto di estensione '{0}'.",
- 	"install": "Installa",
-added in both
-  our    100644 f20b6fbba0271cb5b08b436000b1e92f6bf372b0 i18n/ita/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-  their  100644 1866903b33ec0a986aef1e651e9eb5e0863bee0b i18n/ita/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,13 @@
- 	],
- 	"workbenchConfigurationTitle": "Area di lavoro",
- 	"feedbackVisibility": "Controlla la visibilità del feedback Twitter (smiley) nella barra di stato nella parte inferiore del banco di lavoro."
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"workbenchConfigurationTitle": "Area di lavoro"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 f61ceeb442ff48c8180bf65c9a3fe795d133ade9 i18n/ita/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/ita/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"hide": "Nascondi"
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 979ee1896bb4a0ed40f3dc0f15d528c50ff49c3c i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  our    100644 f659f351cf6a9bd615c47ae466bed823f6c0842e i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  their  100644 4a78ba420237fe710966fa472b33c74f8f36a88c i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-@@ -12,7 +12,10 @@
- 	"revertLocalChanges": "Annullare le modifiche e tornare al contenuto sul disco",
- 	"copyPathOfActive": "Copia percorso del file attivo",
- 	"saveAllInGroup": "Salva tutto nel gruppo",
-+<<<<<<< .our
- 	"saveFiles": "Salva tutti i file",
-+=======
-+>>>>>>> .their
- 	"revert": "Ripristina file",
- 	"compareActiveWithSaved": "Confronta file attivo con file salvato",
- 	"closeEditor": "Chiudi editor",
-@@ -24,12 +27,19 @@
- 	"copyPath": "Copia percorso",
- 	"saveAll": "Salva tutto",
- 	"compareWithSaved": "Confronta con file salvato",
-+<<<<<<< .our
- 	"compareWithSelected": "Confronta con selezionati",
- 	"compareSource": "Seleziona per il confronto",
- 	"compareSelected": "Confronta selezionati",
- 	"close": "Chiudi",
- 	"closeOthers": "Chiudi altri",
- 	"closeSaved": "Chiudi salvati",
-+=======
-+	"compareSource": "Seleziona per il confronto",
-+	"close": "Chiudi",
-+	"closeOthers": "Chiudi altri",
-+	"closeUnmodified": "Chiudi non modificati",
-+>>>>>>> .their
- 	"closeAll": "Chiudi tutto",
- 	"deleteFile": "Elimina definitivamente"
- }
-\ No newline at end of file
-changed in both
-  base   100644 7d23a38e70345906d2303122bbd907e2d0b21fb4 i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 be168507f7ffd1be04bdbdbb14365762be628f25 i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 14358d0abb2b5379df97f131dcbf8c76cacf6a11 i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"newFile": "Nuovo file",
- 	"newFolder": "Nuova cartella",
- 	"rename": "Rinomina",
-@@ -13,7 +16,11 @@
- 	"copyFile": "Copia",
- 	"pasteFile": "Incolla",
- 	"retry": "Riprova",
-+<<<<<<< .our
- 	"renameWhenSourcePathIsParentOfTargetError": "Usare il comando 'Nuova cartella' o 'Nuovo file' per aggiungere elementi figlio a una cartella esistente",
-+=======
-+	"openFolderFirst": "Aprire prima di tutto una cartella per creare file o cartelle al suo interno.",
-+>>>>>>> .their
- 	"newUntitledFile": "Nuovo file senza nome",
- 	"createNewFile": "Nuovo file",
- 	"createNewFolder": "Nuova cartella",
-@@ -43,11 +50,19 @@
- 	"confirmDeleteMessageMultiple": "Sei sicuro di voler eliminare permanentemente i seguenti {0} file?",
- 	"confirmDeleteMessageFolder": "Eliminare definitivamente '{0}' e il relativo contenuto?",
- 	"confirmDeleteMessageFile": "Eliminare definitivamente '{0}'?",
-+<<<<<<< .our
- 	"addFiles": "Aggiungi file",
- 	"confirmOverwrite": "Nella cartella di destinazione esiste già un file o una cartella con lo stesso nome. Sovrascrivere?",
- 	"replaceButtonLabel": "&&Sostituisci",
- 	"fileIsAncestor": "Il file da incollare è un predecessore della cartella di destinazione",
- 	"fileDeleted": "Il file da incollare è stato eliminato o spostato nel frattempo",
-+=======
-+	"irreversible": "Questa azione è irreversibile.",
-+	"permDelete": "Elimina definitivamente",
-+	"importFiles": "Importa file",
-+	"confirmOverwrite": "Nella cartella di destinazione esiste già un file o una cartella con lo stesso nome. Sovrascrivere?",
-+	"replaceButtonLabel": "&&Sostituisci",
-+>>>>>>> .their
- 	"duplicateFile": "Duplicato",
- 	"globalCompareFile": "Confronta file attivo con...",
- 	"openFileToCompare": "Aprire prima un file per confrontarlo con un altro file.",
-changed in both
-  base   100644 a02c62cce4f7b3b0f711396a7a7b6078c2363a94 i18n/ita/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  our    100644 2e22a3e434ad464b47a1a671a80bcc90e411bd12 i18n/ita/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  their  100644 34188204b433c3286a8826d315f200b3513a3884 i18n/ita/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,15 +7,22 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"revealInWindows": "Visualizza in Esplora risorse",
- 	"revealInMac": "Visualizza in Finder",
- 	"openContainer": "Apri cartella superiore",
- 	"saveAs": "Salva con nome...",
- 	"save": "Salva",
- 	"saveAll": "Salva tutto",
-+<<<<<<< .our
- 	"removeFolderFromWorkspace": "Rimuovi cartella dall'area di lavoro",
- 	"genericRevertError": "Impossibile ripristinare '{0}': {1}",
- 	"modifiedLabel": "{0} (su disco) ↔ {1}",
-+=======
-+	"saveFiles": "Salva tutti i file",
-+	"removeFolderFromWorkspace": "Rimuovi cartella dall'area di lavoro",
-+>>>>>>> .their
- 	"openFileToReveal": "Aprire prima un file per visualizzarlo",
- 	"openFileToCopy": "Aprire prima un file per copiarne il percorso"
- }
-\ No newline at end of file
-changed in both
-  base   100644 6fb07e8966ee518868af4ed7683ea01b1010f41f i18n/ita/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 a29bf6c8fddc26469df2a03b0634b7525ec1e6dc i18n/ita/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 bf53e0bc960d3b4c3597d078f47da85d82c62dcb i18n/ita/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-@@ -40,7 +40,10 @@
- 	"formatOnSave": "Formatta un file durante il salvataggio. Deve essere disponibile un formattatore, il file non deve essere salvato automaticamente e l'editor non deve essere in fase di chiusura.",
- 	"formatOnSaveTimeout": "Timeout per Formatta dopo il salvataggio. Specifica un limite di tempo in millisecondi per i comandi formatOnSave. I comandi che richiedono più tempo del timeout specificato verranno annullati.",
- 	"explorerConfigurationTitle": "Esplora file",
-+<<<<<<< .our
- 	"openEditorsVisible": "Numero di editor visualizzati nel riquadro degli editor aperti.",
-+=======
-+>>>>>>> .their
- 	"autoReveal": "Controlla se Esplora risorse deve rivelare automaticamente e selezionare i file durante l'apertura.",
- 	"enableDragAndDrop": "Controlla se Esplora risorse deve consentire lo spostamento di file e cartelle tramite trascinamento della selezione.",
- 	"confirmDragAndDrop": "Controlla se Esplora risorse deve chiedere conferma prima di spostare file e cartelle tramite trascinamento della selezione.",
-changed in both
-  base   100644 49ebceb9611a7d647962c205cef0ff00c56d0e9d i18n/ita/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  our    100644 f0de873df312d3467a7db1430cfde0ec5b45cfe3 i18n/ita/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  their  100644 8052e44e9f3ae0dd2ed736e663832982ea4c9f09 i18n/ita/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,6 +14,12 @@
- 	"readonlySaveErrorAdmin": "Impossibile salvare '{0}': Il file è protetto da scrittura. Selezionare 'Sovrascrivi come Admin' per riprovare come amministratore.",
- 	"readonlySaveError": "Impossibile salvare '{0}': Il file è protetto da scrittura. Selezionare 'Sovrascrivi come Admin' per provare a rimuovere la protezione.",
- 	"permissionDeniedSaveError": "Impossibile salvare '{0}': Autorizzazioni insufficienti. Selezionare 'Riprova come Admin' per eseguire come amministratore.",
-+=======
-+	"userGuide": "Usare le azioni della barra degli strumenti dell'editor a destra per **annullare** le modifiche o per **sovrascrivere** il contenuto su disco con le modifiche",
-+	"overwrite": "Sovrascrivi",
-+	"retry": "Riprova",
-+	"discard": "Rimuovi",
-+>>>>>>> .their
- 	"genericSaveError": "Non è stato possibile salvare '{0}': {1}",
- 	"learnMore": "Altre informazioni",
- 	"dontShowAgain": "Non visualizzare più questo messaggio",
-changed in both
-  base   100644 5627c56823f1524e5aa8c0ed705dd6664eefe687 i18n/ita/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  our    100644 9d379690a9023ffd416a683636dffb8cc779fe5f i18n/ita/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  their  100644 f7d56641c92acc5dbb78d334bea25c8a4bb37c56 i18n/ita/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-added in both
-  our    100644 020217534a1c289db69b1db7e69fe2ce7a18a56e i18n/ita/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-  their  100644 458e72265954305465acaa798dd03a6debfd8145 i18n/ita/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,5 +11,13 @@
- 	"sharedLog": "Log (Condiviso)",
- 	"rendererLog": "Log (Finestra)",
- 	"extensionsLog": "Log (Host dell'estensione)",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"developer": "Sviluppatore"
- }
-\ No newline at end of file
-added in both
-  our    100644 1f4e198062af620354f99b641819730c9dd1751a i18n/ita/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  their  100644 88a2d7b74875e9bf8e394c1c6643bd422794042e i18n/ita/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -16,6 +17,22 @@
- 	"selectProcess": "Seleziona log per il processo",
- 	"openLogFile": "Apri file di Log...",
- 	"setLogLevel": "Imposta livello log...",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"openLogsFolder": "Apri cartella dei log",
-+	"showLogs": "Mostra log...",
-+	"mainProcess": "Principale",
-+	"sharedProcess": "Condiviso",
-+	"rendererProcess": "Finestra",
-+	"extensionHost": "Host dell'estensione",
-+	"selectProcess": "Seleziona il processo",
-+	"setLogLevel": "Imposta livello log",
-+>>>>>>> .their
- 	"trace": "Analisi",
- 	"debug": "Debug",
- 	"info": "Informazioni",
-@@ -23,8 +40,12 @@
- 	"err": "Errore",
- 	"critical": "Errori critici",
- 	"off": "Disattivato",
-+<<<<<<< .our
- 	"selectLogLevel": "Seleziona il livello log",
- 	"default and current": "Predefinito e corrente",
- 	"default": "Impostazione predefinita",
- 	"current": "Corrente"
-+=======
-+	"selectLogLevel": "Seleziona il livello log"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 5e585c6ea401a6decbb3a6fa908c9d0a7d3d4d6c i18n/ita/src/vs/workbench/parts/markers/common/messages.i18n.json
-  our    100644 c69fa3b4ca1f52f43b5f29fa9b4d56c7496d7921 i18n/ita/src/vs/workbench/parts/markers/common/messages.i18n.json
-  their  100644 0337b4edbb1f21cca10f4bb997307d6ac708add6 i18n/ita/src/vs/workbench/parts/markers/common/messages.i18n.json
-@@ -7,8 +7,11 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"viewCategory": "Visualizza",
-+<<<<<<< .our
- 	"problems.view.toggle.label": "Attiva/Disattiva Problemi (Errori, Avvisi, Informazioni)",
- 	"problems.view.focus.label": "Sposta lo stato attivo su problemi (Errori, Avvisi, Informazioni)",
-+=======
-+>>>>>>> .their
- 	"problems.panel.configuration.title": "Visualizzazione Problemi",
- 	"problems.panel.configuration.autoreveal": "Controlla se la visualizzazione Problemi deve visualizzare automaticamente i file durante l'apertura",
- 	"markers.panel.title.problems": "Problemi",
-added in both
-  our    100644 9800b7b0870a97d47c83526ea2b330b35e18dfa1 i18n/ita/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-  their  100644 99ba0e6815c405d714d796f9256da2822fa0574f i18n/ita/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -11,4 +12,15 @@
- 	"viewCategory": "Visualizza",
- 	"clearOutput.label": "Cancella output",
- 	"openActiveLogOutputFile": "Visualizza: Apri file di output del log attivo"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"output": "Output",
-+	"viewCategory": "Visualizza",
-+	"clearOutput.label": "Cancella output"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 2592755ea524e2e13b05e59e9af9746c2e3fb809 i18n/ita/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/ita/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,12 @@
- 	],
- 	"output": "{0} - Output",
- 	"channel": "Canale Output per '{0}'"
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 7c1a3a7d3098bd08a59acf5cb5b4879d594479f6 i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 fe346036c36b558ff4bb96cc47cf0bc0e91a4106 i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 4669fa3cd569668aa151bf2371615c0405cad3df i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"defaultSettings": "Inserire le impostazioni nell'editor di lato destro per eseguire l'override.",
- 	"noSettingsFound": "Non sono state trovate impostazioni.",
- 	"settingsSwitcherBarAriaLabel": "Selezione impostazioni",
-changed in both
-  base   100644 c4cdd4ead337c007b5986cec2f24a27abcbf7db7 i18n/ita/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  our    100644 0dbd18fbe236306a0033a2febcef40e1643db2ff i18n/ita/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  their  100644 7149b64d24f5dfcf7812bd41014e1ca0e3f2d263 i18n/ita/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-changed in both
-  base   100644 13929c1fa4b022999e94efe11748cc6b6ea6f6a1 i18n/ita/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  our    100644 5323d00bb1895b2b9d343a1d3915400bb17b41c9 i18n/ita/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  their  100644 9d39d9c9b4135f71faddc10c4078aa254b6c9c23 i18n/ita/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"view": "Visualizza",
- 	"commandsHandlerDescriptionDefault": "Mostra ed esegui comandi",
- 	"gotoLineDescriptionMac": "Vai alla riga",
-changed in both
-  base   100644 44389863a6597158d5c8c1ef5cea9a4f43086987 i18n/ita/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  our    100644 1bf66fd38b69adac67e7b86fcb0f801683c89491 i18n/ita/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  their  100644 7bc3bea7022aa54af41de235d7782e11963e0cd2 i18n/ita/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-@@ -10,8 +10,12 @@
- 	"source control": "Controllo del codice sorgente",
- 	"toggleSCMViewlet": "Mostra Gestione controllo servizi",
- 	"view": "Visualizza",
-+<<<<<<< .our
- 	"scmConfigurationTitle": "Gestione controllo servizi",
- 	"alwaysShowProviders": "Mostrare sempre la sezione Provider di controllo del codice sorgente.",
- 	"diffDecorations": "Controlla decorazioni diff nell'editor",
- 	"diffGutterWidth": "Controlla la larghezza (px) delle decorazioni diff nella barra di navigazione (aggiunte e modificate)."
-+=======
-+	"scmConfigurationTitle": "Gestione controllo servizi"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ebff6e3002a34b93ac0d6892854634f5bafe8207 i18n/ita/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 92c227f579048a55e12147b807cef8b2e56a92a0 i18n/ita/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 406201bbecb0a61ccccddc178e86b190bce050f9 i18n/ita/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-changed in both
-  base   100644 25315a7f99eac9c9766c4f6939865daa29f48e65 i18n/ita/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 13379f4fe2a00cfa238ca2e6341676a8a3328e76 i18n/ita/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 b29d6b897b6fdc5eca03973165a4f62061411d5a i18n/ita/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,11 +13,18 @@
- 	"copyAllLabel": "Copia tutti",
- 	"clearSearchHistoryLabel": "Cancella cronologia di ricerca",
- 	"toggleSearchViewPositionLabel": "Attiva/Disattiva ricerca posizione della visualizzazione",
-+=======
-+>>>>>>> .their
- 	"findInFolder": "Trova nella cartella...",
- 	"findInWorkspace": "Trova nell'area di lavoro...",
- 	"showTriggerActions": "Vai al simbolo nell'area di lavoro...",
- 	"name": "Cerca",
-+<<<<<<< .our
- 	"showSearchViewl": "Mostra Cerca",
-+=======
-+	"search": "Cerca",
-+	"showSearchViewlet": "Mostra Cerca",
-+>>>>>>> .their
- 	"view": "Visualizza",
- 	"findInFiles": "Cerca nei file",
- 	"openAnythingHandlerDescription": "Vai al file",
-added in both
-  our    100644 e38dd49d0c9e389b07d35c25b7a3e57218fd6e82 i18n/ita/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-  their  100644 32dc45ab7fd6ef5de46f1281f30315dcc6e50722 i18n/ita/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -13,5 +14,14 @@
- 	"new.global.sep": "Nuovi frammenti di codice",
- 	"openSnippet.pickLanguage": "Selezionare file di Frammenti o creare Frammenti di codice",
- 	"openSnippet.label": "Configura Frammenti utente",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"global.1": "({0})",
-+>>>>>>> .their
- 	"preferences": "Preferenze"
- }
-\ No newline at end of file
-changed in both
-  base   100644 7cea9caafc3bb08fce418e3954db6eed7a06c76e i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  our    100644 9b4c727b904e62e008f2cc5a8dfb849b594c3479 i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  their  100644 356ac5c6fe2dab52c70cc0fdee1033fdaeac088c i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"snippetSchema.json.default": "Frammento vuoto",
- 	"snippetSchema.json": "Configurazione del frammento utente",
- 	"snippetSchema.json.prefix": "Prefisso da usare quando si seleziona il frammento in IntelliSense",
-added in both
-  our    100644 0c9e86e93b1c8cd9f783fbdd35456c032d41e2f3 i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-  their  100644 fee95f06a2ca34f7350242c419e8a4806c5e1dab i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,5 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"source.snippetGlobal": "Frammento utente globale",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"source.snippet": "Frammento utente"
- }
-\ No newline at end of file
-changed in both
-  base   100644 d130ea84c16b708173b07dd8897cf004329160b5 i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  our    100644 c878d5c9380cb8bf8f1d7f22ef4111b700bf8888 i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 02cfa9b88abde71b706d2a84a76e9f6835080b40 i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,9 @@
- 	],
- 	"invalid.path.0": "È previsto un valore stringa in `contributes.{0}.path`. Valore specificato: {1}",
- 	"invalid.language.0": "Quando si omette il linguaggio, il valore di `contributes.{0}.path` deve essere un file `.code-snippets`. Fornire il valore: {1}",
-+=======
-+	"invalid.path.0": "È previsto un valore stringa in `contributes.{0}.path`. Valore specificato: {1}",
-+>>>>>>> .their
- 	"invalid.language": "Il linguaggio in `contributes.{0}.language` è sconosciuto. Valore specificato: {1}",
- 	"invalid.path.1": "Valore previsto di `contributes.{0}.path` ({1}) da includere nella cartella dell'estensione ({2}). L'estensione potrebbe non essere più portatile.",
- 	"vscode.extension.contributes.snippets": "Frammenti per contributes.",
-changed in both
-  base   100644 6d85a5950278a18e9fb88e927ad82d95caac736b i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 7ae3aac58f69dc8b25dec80d0624497a5e9abe14 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 2d53dad915697fd458b2f3c70929a0bc3883be01 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -10,7 +10,11 @@
- 	"terminal.foreground": "Il colore di primo piano del terminale.",
- 	"terminalCursor.foreground": "Colore di primo piano del cursore del terminale.",
- 	"terminalCursor.background": "Colore di sfondo del cursore del terminale. Permette di personalizzare il colore di un carattere quando sovrapposto da un blocco cursore.",
-+<<<<<<< .our
- 	"terminal.selectionBackground": "Colore di sfondo di selezione del terminale.",
- 	"terminal.border": "Colore del bordo che separa i riquadri divisi all'interno del terminale. L'impostazione predefinita è panel.border.",
- 	"terminal.ansiColor": "'{0}' colori ANSI nel terminale. "
-+=======
-+	"terminal.selectionBackground": "Colore di sfondo di selezione del terminale."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6055f7da096e705eed9691feffcfb1cc96e45424 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  our    100644 40819f4f5c0ae27f5cd1ace3053b821e16b4452e i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  their  100644 f695d8b57b2d7697977cdcdf3ff8b47e2431ada8 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-@@ -8,7 +8,11 @@
- 	],
- 	"terminal.integrated.chooseWindowsShellInfo": "È possibile modificare la shell di terminale di default selezionando il pulsante Personalizza.",
- 	"customize": "Personalizza",
-+<<<<<<< .our
- 	"never again": "Non visualizzare più questo messaggio",
-+=======
-+	"cancel": "Annulla",
-+>>>>>>> .their
- 	"terminal.integrated.chooseWindowsShell": "Seleziona la shell di terminale preferita - è possibile modificare questa impostazione dopo",
- 	"terminalService.terminalCloseConfirmationSingular": "C'è una sessione di terminale attiva. Terminarla?",
- 	"terminalService.terminalCloseConfirmationPlural": "Ci sono {0} sessioni di terminale attive. Terminarle?"
-changed in both
-  base   100644 46c966a637e00f99a76a08c2c86d66c2ae0d7e48 i18n/ita/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 aed35ee0f736e71e25693c29ccc2843fb9df2498 i18n/ita/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 7d586fdfcf427d7d9700095eaa698e584ee1d4ec i18n/ita/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -26,7 +26,10 @@
- 	"commandPalette": "Riquadro comandi...",
- 	"settings": "Impostazioni",
- 	"keyboardShortcuts": "Scelte rapide da tastiera",
-+<<<<<<< .our
- 	"showExtensions": "Gestisci le estensioni",
-+=======
-+>>>>>>> .their
- 	"userSnippets": "Frammenti utente",
- 	"selectTheme.label": "Tema colori",
- 	"themes.selectIconTheme.label": "Tema icona file",
-changed in both
-  base   100644 6952c245dd7cea50c20ee74fe2f371f8ca6991f1 i18n/ita/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  our    100644 b25e5dc4490f42f2acd95fbd251f7ac1e096a7d8 i18n/ita/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  their  100644 fb6e0553811d6c1a7865a24d00402f27231293aa i18n/ita/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,4 +14,9 @@
- 	"fileBinaryError": "Il file sembra essere binario e non può essere aperto come file di testo",
- 	"err.create": "Non è stato possibile creare il file {0}",
- 	"fileMoveConflict": "Non è possibile eseguire operazioni di spostamento/copia. Il file esiste già nella destinazione."
-+=======
-+	"fileIsDirectoryError": "Il File è una Directory",
-+	"fileNotModifiedError": "File non modificato dal giorno",
-+	"fileBinaryError": "Il file sembra essere binario e non può essere aperto come file di testo"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c6f9ca638623692c6f9b7125c9322e47d38ae7e9 i18n/ita/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  our    100644 bd90eec60a770b172512124f2896972c4cb8c6ef i18n/ita/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  their  100644 11826e9bcfba41f91db0a83d2251a9e633af8d47 i18n/ita/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-changed in both
-  base   100644 c8e3f4e44d82d3aaeb93613417c2d43aa5efbaad i18n/ita/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 59d0978a765c9fd6ca13b8566191473ce46ff2e1 i18n/ita/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 7ff89ea80bdc0fb0a3c023c828f60208023770b4 i18n/ita/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-changed in both
-  base   100644 83c0f4d81a8c79b8412faddc40c38af56b7610c9 i18n/ita/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  our    100644 11167d34b3da69e1f16a2d4464dfd47538392442 i18n/ita/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  their  100644 af0e885e44ba80dedad719d26ff2e047fbb96c20 i18n/ita/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-@@ -8,5 +8,10 @@
- 	],
- 	"errorInvalidTaskConfiguration": "Impossibile scrivere nel file di configurazione dell'area di lavoro. Si prega di aprire il file per correggere eventuali errori/avvisi e riprovare.",
- 	"errorWorkspaceConfigurationFileDirty": "Impossibile scrivere nel file di configurazione dell'area di lavoro, perché il file è sporco. Si prega di salvarlo e riprovare.",
-+<<<<<<< .our
- 	"openWorkspaceConfigurationFile": "Apri configurazione dell'area di lavoro"
-+=======
-+	"openWorkspaceConfigurationFile": "Apri file di configurazione dell'area di lavoro",
-+	"close": "Chiudi"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f8b65e69685274c83f0178dfc7ec0de385f2bde4 i18n/jpn/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
-  our    100644 e71ba067641ea2202f8bbf4473a591865dfa618b i18n/jpn/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
-  their  100644 905556c139c3bce76422da2fcc6939fd1d413744 i18n/jpn/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
-changed in both
-  base   100644 5ff9ba2550a340998a02f56e6644132b9df7f23d i18n/jpn/extensions/css/package.i18n.json
-  our    100644 afbe11a31b688e3d20e90f7c0034dcf3b0256eba i18n/jpn/extensions/css/package.i18n.json
-  their  100644 4716b3c9ee15e15e0e5cf00158b044f410537d88 i18n/jpn/extensions/css/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,76 @@
- 	],
- 	"displayName": "CSS の基本言語サポート",
- 	"description": "CSS、LESS、SCSS ファイル内で構文ハイライト、かっこ一致を提供します。"
-+=======
-+	"css.title": "CSS",
-+	"css.lint.argumentsInColorFunction.desc": "無効なパラメーター数値",
-+	"css.lint.boxModel.desc": "padding や border を使用するときに width や height を使用しないでください",
-+	"css.lint.compatibleVendorPrefixes.desc": "ベンダー プレフィックス を使用するときは、他すべてのベンダー プレフィックスも必ず含めてください",
-+	"css.lint.duplicateProperties.desc": "重複するスタイル定義を使用しないでください",
-+	"css.lint.emptyRules.desc": "空の規則セットを使用しないでください",
-+	"css.lint.float.desc": "'float' の使用を避けてください。float は脆弱な CSS につながり、レイアウトの一部が変更されたときに CSS が破損しやすくなります。",
-+	"css.lint.fontFaceProperties.desc": "@font-face 規則で 'src' プロパティと 'font-family' プロパティを定義する必要があります",
-+	"css.lint.hexColorLength.desc": "Hex には 3 つまたは 6 つの 16 進数が含まれる必要があります",
-+	"css.lint.idSelector.desc": "セレクターには ID を含めないでください。これらの規則と HTML の結合が密接すぎます。",
-+	"css.lint.ieHack.desc": "IE ハックは、IE7 以前をサポートする場合にのみ必要です",
-+	"css.lint.important.desc": "!important は使用しないでください。これは CSS 全体の特定性が制御不能になり、リファクタリングが必要なことを示しています。",
-+	"css.lint.importStatement.desc": "複数の Import ステートメントを同時に読み込むことはできません",
-+	"css.lint.propertyIgnoredDueToDisplay.desc": "display によってプロパティを無視します。例: 'display: inline' の場合、width、height、margin-top、margin-bottom、float プロパティには効果がありません。",
-+	"css.lint.universalSelector.desc": "ユニバーサル セレクター (*) を使用すると処理速度が低下することが分かっています",
-+	"css.lint.unknownProperties.desc": "不明なプロパティ。",
-+	"css.lint.unknownVendorSpecificProperties.desc": "不明なベンダー固有のプロパティ。",
-+	"css.lint.vendorPrefix.desc": "ベンダー固有のプレフィックスを使用する場合は、標準のプロパティも含めます",
-+	"css.lint.zeroUnits.desc": "0 に単位は必要ありません",
-+	"css.trace.server.desc": "VS Code と CSS 言語サーバー間の通信をトレースします。",
-+	"css.validate.title": "CSS の検証と問題の重大度を制御します。",
-+	"css.validate.desc": "すべての検証を有効または無効にします",
-+	"less.title": "LESS",
-+	"less.lint.argumentsInColorFunction.desc": "正しくないパラメーターの数",
-+	"less.lint.boxModel.desc": "パディングまたは枠線を使用する場合は幅または高さを使用しないでください",
-+	"less.lint.compatibleVendorPrefixes.desc": "ベンダー固有のプレフィックスを使用する場合は、他のすべてのベンダー固有のプロパティも必ず含めてください",
-+	"less.lint.duplicateProperties.desc": "重複するスタイル定義を使用しないでください",
-+	"less.lint.emptyRules.desc": "空の規則セットを使用しないでください",
-+	"less.lint.float.desc": "'float' は使用しないでください。float を使用すると、レイアウトの一部が変更されたときに CSS が破損しやすくなります。",
-+	"less.lint.fontFaceProperties.desc": "@font-face 規則で 'src' プロパティと 'font-family' プロパティを定義する必要があります",
-+	"less.lint.hexColorLength.desc": "16 進数の色には、3 つまたは 6 つの 16 進数が含まれる必要があります",
-+	"less.lint.idSelector.desc": "セレクターには ID を含めないでください。これらの規則と HTML の結合が密接すぎます。",
-+	"less.lint.ieHack.desc": "IE ハックは、IE7 以前をサポートする場合にのみ必要です",
-+	"less.lint.important.desc": "!important は使用しないでください。これは CSS 全体の特定性が制御不能になり、リファクタリングが必要なことを示しています。",
-+	"less.lint.importStatement.desc": "複数の Import ステートメントを同時に読み込むことはできません",
-+	"less.lint.propertyIgnoredDueToDisplay.desc": "表示によりプロパティが無視されます。たとえば、'display: inline' の場合、width、height、margin-top、margin-bottom、および float のプロパティには効果がありません",
-+	"less.lint.universalSelector.desc": "ユニバーサル セレクター (*) を使用すると処理速度が低下することが分かっています",
-+	"less.lint.unknownProperties.desc": "不明なプロパティ。",
-+	"less.lint.unknownVendorSpecificProperties.desc": "不明なベンダー固有のプロパティ。",
-+	"less.lint.vendorPrefix.desc": "ベンダー固有のプレフィックスを使用する場合は、標準のプロパティも含めます",
-+	"less.lint.zeroUnits.desc": "0 の単位は必要ありません",
-+	"less.validate.title": "LESS の検証と問題の重大度を制御します。",
-+	"less.validate.desc": "すべての検証を有効または無効にします",
-+	"scss.title": "SCSS (Sass)",
-+	"scss.lint.argumentsInColorFunction.desc": "正しくないパラメーターの数",
-+	"scss.lint.boxModel.desc": "パディングまたは枠線を使用する場合は幅または高さを使用しないでください",
-+	"scss.lint.compatibleVendorPrefixes.desc": "ベンダー固有のプレフィックスを使用する場合は、他のすべてのベンダー固有のプロパティも必ず含めてください",
-+	"scss.lint.duplicateProperties.desc": "重複するスタイル定義を使用しないでください",
-+	"scss.lint.emptyRules.desc": "空の規則セットを使用しないでください",
-+	"scss.lint.float.desc": "'float' は使用しないでください。float を使用すると、レイアウトの一部が変更されたときに CSS が破損しやすくなります。",
-+	"scss.lint.fontFaceProperties.desc": "@font-face 規則で 'src' プロパティと 'font-family' プロパティを定義する必要があります",
-+	"scss.lint.hexColorLength.desc": "16 進数の色には、3 つまたは 6 つの 16 進数が含まれる必要があります",
-+	"scss.lint.idSelector.desc": "セレクターには ID を含めないでください。これらの規則と HTML の結合が密接すぎます。",
-+	"scss.lint.ieHack.desc": "IE ハックは、IE7 以前をサポートする場合にのみ必要です",
-+	"scss.lint.important.desc": "!important は使用しないでください。これは CSS 全体の特定性が制御不能になり、リファクタリングが必要なことを示しています。",
-+	"scss.lint.importStatement.desc": "複数の Import ステートメントを同時に読み込むことはできません",
-+	"scss.lint.propertyIgnoredDueToDisplay.desc": "表示によりプロパティが無視されます。たとえば、'display: inline' の場合、width、height、margin-top、margin-bottom、および float のプロパティには効果がありません",
-+	"scss.lint.universalSelector.desc": "ユニバーサル セレクター (*) を使用すると処理速度が低下することが分かっています",
-+	"scss.lint.unknownProperties.desc": "不明なプロパティ。",
-+	"scss.lint.unknownVendorSpecificProperties.desc": "不明なベンダー固有のプロパティ。",
-+	"scss.lint.vendorPrefix.desc": "ベンダー固有のプレフィックスを使用する場合は、標準のプロパティも含めます",
-+	"scss.lint.zeroUnits.desc": "0 の単位は必要ありません",
-+	"scss.validate.title": "SCSS の検証と問題の重大度を制御します。",
-+	"scss.validate.desc": "すべての検証を有効または無効にします",
-+	"less.colorDecorators.enable.desc": "カラー デコレーターを有効または無効にします",
-+	"scss.colorDecorators.enable.desc": "カラー デコレーターを有効または無効にします",
-+	"css.colorDecorators.enable.desc": "カラー デコレーターを有効または無効にします",
-+	"css.colorDecorators.enable.deprecationMessage": "設定 `css.colorDecorators.enable` は使用されなくなりました。`editor.colorDecorators` を使用してください。",
-+	"scss.colorDecorators.enable.deprecationMessage": "設定 `scss.colorDecorators.enable` は使用されなくなりました。`editor.colorDecorators` を使用してください。",
-+	"less.colorDecorators.enable.deprecationMessage": "設定 `less.colorDecorators.enable` は使用されなくなりました。`editor.colorDecorators` を使用してください。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a4b33109cea1b6c98d48944df564c19818ec26ed i18n/jpn/extensions/git/out/autofetch.i18n.json
-  our    100644 8f0a88a1e105a3accbc50cc36a8a30af004cf3ee i18n/jpn/extensions/git/out/autofetch.i18n.json
-  their  100644 4dcee36f0c2c7ee5d39809763276b70e0a3cfb3d i18n/jpn/extensions/git/out/autofetch.i18n.json
-@@ -7,7 +7,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"yes": "はい",
-+	"read more": "詳細を参照",
- 	"no": "いいえ",
- 	"not now": "後で通知する",
-+<<<<<<< .our
- 	"suggest auto fetch": "Code が [定期的に 'git fetch']({0}) を実行してもよろしいですか?"
-+=======
-+	"suggest auto fetch": "Code が定期的に `git fetch` を実行してもよろしいですか?"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e73b6d879f2f1176dcd6feb39f50489f26c1b5bb i18n/jpn/extensions/git/out/commands.i18n.json
-  our    100644 9e38217888fdc2db31af2a431341d645d8b6b16d i18n/jpn/extensions/git/out/commands.i18n.json
-  their  100644 2dfc5f400ac70622c04d1ec0937586eb7c2462e8 i18n/jpn/extensions/git/out/commands.i18n.json
-@@ -14,8 +14,12 @@
- 	"cloning": "Git リポジトリ '{0}' を複製しています...",
- 	"proposeopen": "クローンしたリポジトリを開きますか?",
- 	"openrepo": "リポジトリを開く",
-+<<<<<<< .our
- 	"add": "ワークスペースに追加",
- 	"proposeopen2": "複製したリポジトリを開きますか? または現在のワークスペースに追加しますか?",
-+=======
-+	"proposeopen": "クローンしたリポジトリを開きますか?",
-+>>>>>>> .their
- 	"init": "Git リポジトリを初期化するワークスペース フォルダーを選択してください",
- 	"init repo": "リポジトリの初期化",
- 	"create repo": "リポジトリの初期化",
-@@ -75,8 +79,12 @@
- 	"ok": "OK",
- 	"push with tags success": "タグが正常にプッシュされました。",
- 	"pick remote": "リモートを選んで、ブランチ '{0}' を次に公開します:",
-+<<<<<<< .our
- 	"sync is unpredictable": "このアクションはコミットを '{0}/{1}' との間でプッシュしたりプルしたりします。",
- 	"never again": "OK、今後は表示しない",
-+=======
-+	"sync is unpredictable": "このアクションはコミットを '{0}' との間でプッシュしたりプルしたりします。",
-+>>>>>>> .their
- 	"no remotes to publish": "リポジトリには、発行先として構成されているリモートがありません。",
- 	"no changes stash": "スタッシュする変更がありません。",
- 	"provide stash message": "必要に応じてスタッシュ メッセージを入力してください",
-changed in both
-  base   100644 1574014e89e8f1845a893b41aec6e8db6256937c i18n/jpn/extensions/git/package.i18n.json
-  our    100644 5f3a79c480024cb95bcb777b25dc5a51987c0ee1 i18n/jpn/extensions/git/package.i18n.json
-  their  100644 bdc7a5612edaeca2409014e4d8068fa87e0dd126 i18n/jpn/extensions/git/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,8 @@
- 	],
- 	"displayName": "Git",
- 	"description": "Git SCM統合",
-+=======
-+>>>>>>> .their
- 	"command.clone": "クローン",
- 	"command.init": "リポジトリの初期化",
- 	"command.close": "リポジトリを閉じる",
-changed in both
-  base   100644 9c09de2d69a13a871142e7f954f937a50d3fd097 i18n/jpn/extensions/markdown/package.i18n.json
-  our    100644 58b68df0b74f4d164ab945b5a5c202367b240d88 i18n/jpn/extensions/markdown/package.i18n.json
-  their  100644 5f1c24f35e0f7c9b346888054377f5516d7a697f i18n/jpn/extensions/markdown/package.i18n.json
-@@ -27,6 +27,10 @@
- 	"markdown.styles.dec": "マークダウン プレビューから使用する CSS スタイル シートの URL またはローカル パスの一覧。相対パスは、エクスプローラーで開かれているフォルダーへの絶対パスと解釈されます。開かれているフォルダーがない場合、マークダウン ファイルの場所を基準としていると解釈されます。'\\' はすべて '\\\\' と入力する必要があります。",
- 	"markdown.showPreviewSecuritySelector.title": "プレビュー のセキュリティ設定を変更",
- 	"markdown.trace.desc": "マークダウン拡張機能のデバッグ ログを有効にします。",
-+<<<<<<< .our
- 	"markdown.preview.refresh.title": "プレビューを更新",
- 	"markdown.preview.toggleLock.title": "プレビュー ロックの切り替え"
-+=======
-+	"markdown.refreshPreview.title": "プレビューを更新"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 1e7a986fcec129586c4ebc893b09e7bad7f9ca0e i18n/jpn/extensions/php/package.i18n.json
-  our    100644 16bb0ef7ca18648009f9c673553f431c802597ac i18n/jpn/extensions/php/package.i18n.json
-  their  100644 77aae3a85d168648b978e46ef0eaf89de12ff538 i18n/jpn/extensions/php/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,13 @@
- 	],
- 	"displayName": "PHP の基本言語サポート",
- 	"description": "PHP ファイル内に構文ハイライト、かっこ一致を提供します。"
-+=======
-+	"configuration.suggest.basic": "組み込みの PHP 言語候補機能を有効にするかどうかを設定します。このサポートによって、PHP グローバルと変数の候補が示されます。",
-+	"configuration.validate.enable": "組み込みの PHP 検証を有効/無効にします。",
-+	"configuration.validate.executablePath": "PHP 実行可能ファイルを指定します。",
-+	"configuration.validate.run": "リンターを保存時に実行するか、入力時に実行するか。",
-+	"configuration.title": "PHP",
-+	"commands.categroy.php": "PHP",
-+	"command.untrustValidationExecutable": "PHP の検証を無効にします (ワークスペース設定として定義)。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 e69dc45423d16b98f5e9e65539d9e67a02feb930 i18n/jpn/extensions/typescript/out/commands.i18n.json
-  their  100644 e996cf2c1a958e0fcb34d18359d3aabd8e811f9a i18n/jpn/extensions/typescript/out/commands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -13,4 +14,20 @@
- 	"typescript.noJavaScriptProjectConfig": "ファイルは JavaScript プロジェクトの一部ではありません。詳細情報は [こちら]({1}) をクリックしてください。",
- 	"typescript.configureTsconfigQuickPick": "tsconfig.json を構成する",
- 	"typescript.configureJsconfigQuickPick": "jsconfig.json を構成する"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"typescript.projectConfigNoWorkspace": "TypeScript または JavaScript プロジェクトを使用するには、VS Code でフォルダーを開いてください",
-+	"typescript.projectConfigUnsupportedFile": "TypeScript または JavaScript のプロジェクトを判別できませんでした。サポートされていないファイルの種類です",
-+	"typescript.projectConfigCouldNotGetInfo": "TypeScript または JavaScript のプロジェクトを判別できませんでした",
-+	"typescript.noTypeScriptProjectConfig": "ファイルは TypeScript プロジェクトの一部ではない",
-+	"typescript.noJavaScriptProjectConfig": "ファイルは JavaScript プロジェクトの一部ではない",
-+	"typescript.configureTsconfigQuickPick": "tsconfig.json を構成する",
-+	"typescript.configureJsconfigQuickPick": "jsconfig.json を構成する",
-+	"typescript.projectConfigLearnMore": "詳細情報"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 837e11b29720d796f3a2ee5c9b9d3d94cd56e0fd i18n/jpn/extensions/typescript/package.i18n.json
-  our    100644 a1554306e84a86835cd4f134180dd845efc6c209 i18n/jpn/extensions/typescript/package.i18n.json
-  their  100644 0b964b94699c94cb21bf0f73161164bbc1969acb i18n/jpn/extensions/typescript/package.i18n.json
-added in both
-  our    100644 750d811d866eaa3d43818bd1d8e28c9898acf514 i18n/jpn/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-  their  100644 ed15423097d5cbb03aeb8c474db3877ca0d1584f i18n/jpn/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"selectAriaOption": "{0}"
- }
-\ No newline at end of file
-added in both
-  our    100644 063f7302f8e223a059726b80fee0fa0525cf9b9d i18n/jpn/src/vs/base/node/ps.i18n.json
-  their  100644 94b9be487275957485a72387008b8e53ec493b07 i18n/jpn/src/vs/base/node/ps.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"collecting": "CPU とメモリーの情報を収集しています。これには数秒かかる場合があります。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8a7dad6df22ed065d81d19a89a2fd0f156cf93ac i18n/jpn/src/vs/code/electron-main/menus.i18n.json
-  our    100644 ff7eb3df479fa3b25aa486b1991a4263b1ee917b i18n/jpn/src/vs/code/electron-main/menus.i18n.json
-  their  100644 3de2dd195d05b0754773bd80390a265b766d9f82 i18n/jpn/src/vs/code/electron-main/menus.i18n.json
-changed in both
-  base   100644 17e8239c8b5ac31e2fb7af0453f3896e4fa58a70 i18n/jpn/src/vs/code/node/cliProcessMain.i18n.json
-  our    100644 d4f994f4c39cc7b339d1a835d51cee5caefa992a i18n/jpn/src/vs/code/node/cliProcessMain.i18n.json
-  their  100644 36f86e4b3e5ff757910f1bd23ffdd060e80c2856 i18n/jpn/src/vs/code/node/cliProcessMain.i18n.json
-changed in both
-  base   100644 ccf74d0af32e892eba94450a5d7effd68b2c4dc6 i18n/jpn/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 8a524167aa36e1a9cb85f51526bd76d90fd343d7 i18n/jpn/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 6d5f2ea1582053b5dcf0315ce5cca83607f259ca i18n/jpn/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -16,7 +16,11 @@
- 	"lineNumbers.on": "行番号は、絶対数として表示されます。",
- 	"lineNumbers.relative": "行番号は、カーソル位置までの行数として表示されます。",
- 	"lineNumbers.interval": "行番号は 10 行ごとに表示されます。",
-+<<<<<<< .our
- 	"lineNumbers": "行番号の表示を制御します。",
-+=======
-+	"lineNumbers": "行番号の表示を制御します。使用可能な値は、'on'、'off'、'relative'、'interval' です。",
-+>>>>>>> .their
- 	"rulers": "等幅フォントの特定番号の後ろに垂直ルーラーを表示します。複数のルーラーには複数の値を使用します。配列が空の場合はルーラーを表示しません。",
- 	"wordSeparators": "単語に関連したナビゲーションまたは操作を実行するときに、単語の区切り文字として使用される文字",
- 	"tabSize": "1 つのタブに相当するスペースの数。`editor.detectIndentation` がオンの場合、この設定はファイル コンテンツに基づいて上書きされます。",
-@@ -81,7 +85,11 @@
- 	"cursorBlinking": "カーソルのアニメーション方式を制御します。",
- 	"mouseWheelZoom": "Ctrl キーを押しながらマウス ホイールを使用してエディターのフォントをズームします",
- 	"cursorStyle": "カーソルのスタイルを制御します。指定できる値は 'block'、'block-outline'、'line'、'line-thin'、'underline'、'underline-thin' です",
-+<<<<<<< .our
- 	"cursorWidth": "editor.cursorStyle が 'line' に設定されている場合、カーソルの幅を制御する",
-+=======
-+	"lineCursorWidth": "editor.cursorStyle が 'line' に設定されている場合、カーソルの幅を制御する",
-+>>>>>>> .their
- 	"fontLigatures": "フォントの合字を使用します",
- 	"hideCursorInOverviewRuler": "概要ルーラーでカーソルを非表示にするかどうかを制御します。",
- 	"renderWhitespace": "エディターで空白文字を表示する方法を制御します。'none'、'boundary' および 'all' が使用可能です。'boundary' オプションでは、単語間の単一スペースは表示されません。",
-changed in both
-  base   100644 ccbe80f4d3957e10e1ecafed44eb90c8a1c07554 i18n/jpn/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 94d561750e1a7b0be01cfe4af934ab8ee7840419 i18n/jpn/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 89993cc361889bd6279d46f34293314a3dd7131f i18n/jpn/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -9,7 +9,10 @@
- 	"lineHighlight": "カーソル位置の行を強調表示する背景色。",
- 	"lineHighlightBorderBox": "カーソル位置の行の境界線を強調表示する背景色。",
- 	"rangeHighlight": "Quick Open 機能や検索機能などによって強調表示された範囲の背景色。下にある装飾を隠さないために、色は不透過であってはなりません。",
-+<<<<<<< .our
- 	"rangeHighlightBorder": "強調表示された範囲の境界線の背景色。",
-+=======
-+>>>>>>> .their
- 	"caret": "エディターのカーソルの色。",
- 	"editorCursorBackground": "選択された文字列の背景色です。選択された文字列の背景色をカスタマイズ出来ます。",
- 	"editorWhitespaces": "エディターのスペース文字の色。",
-changed in both
-  base   100644 c6a310be421987dcb4399ef92c4cb897e5bb5ebf i18n/jpn/src/vs/editor/contrib/folding/folding.i18n.json
-  our    100644 0bebad98f593ecc4ddf6f049b905c5020711ef4d i18n/jpn/src/vs/editor/contrib/folding/folding.i18n.json
-  their  100644 1c780e8f0a351ffb964da8be6a679545f2ab4b3d i18n/jpn/src/vs/editor/contrib/folding/folding.i18n.json
-changed in both
-  base   100644 53ea71a9d4e2557c2f29f9a12dd3a919ab2a19c2 i18n/jpn/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  our    100644 f1211735237aaac61b21818a3c3c88592aa4c9dc i18n/jpn/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  their  100644 37cec91d1cdc4e3994226766a2cf4fd4c4d73c2b i18n/jpn/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -10,4 +11,13 @@
- 	"markerAction.previous.label": "前の問題 (エラー、警告、情報) へ移動",
- 	"markerAction.nextInFiles.label": "ファイル内の次の問題 (エラー、警告、情報) へ移動",
- 	"markerAction.previousInFiles.label": "ファイル内の前の問題 (エラー、警告、情報) へ移動"
-+=======
-+	"title.wo_source": "({0}/{1})",
-+	"markerAction.next.label": "次の問題 (エラー、警告、情報) へ移動",
-+	"markerAction.previous.label": "前の問題 (エラー、警告、情報) へ移動",
-+	"editorMarkerNavigationError": "エディターのマーカー ナビゲーション ウィジェットのエラーの色。",
-+	"editorMarkerNavigationWarning": "エディターのマーカー ナビゲーション ウィジェットの警告の色。",
-+	"editorMarkerNavigationInfo": "エディターのマーカー ナビゲーション ウィジェットの情報の色。",
-+	"editorMarkerNavigationBackground": "エディターのマーカー ナビゲーション ウィジェットの背景。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 0df6dca88c6cfa73951a90e81d78337a06dc226f i18n/jpn/src/vs/editor/contrib/multicursor/multicursor.i18n.json
-  our    100644 28bb716c138831a8b2822f5e9328566cdb98cf16 i18n/jpn/src/vs/editor/contrib/multicursor/multicursor.i18n.json
-  their  100644 22250151607f28c6f117c25e281299344cd743f4 i18n/jpn/src/vs/editor/contrib/multicursor/multicursor.i18n.json
-changed in both
-  base   100644 63cb60134963c7d5b60343cc1e0a7ba4ea804da0 i18n/jpn/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json
-  our    100644 429d9328a15d2454592901b69f97a29d4a6dadfd i18n/jpn/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json
-  their  100644 6b75d7b1bbe4b3238b90db19318b047240e4e714 i18n/jpn/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"toggle.tabMovesFocus": "TAB キーのフォーカス移動を切り替え"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8eac21c6979bdc2bbd84922338b3a14576eeeb14 i18n/jpn/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  our    100644 04ae521063b32ff3cfa5cc8483ba0965433e55dd i18n/jpn/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  their  100644 9ecf4479aa813b6b9747ca27b595ef1bd93ed008 i18n/jpn/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,12 @@
- 	"wordHighlightStrongBorder": "変数への書き込みなど書き込みアクセス中のシンボルの境界線の色。",
- 	"overviewRulerWordHighlightForeground": "シンボルを強調表示するときの概要ルーラーのマーカー色。この色は下地の色に紛れないよう不明瞭であってはいけません。",
- 	"overviewRulerWordHighlightStrongForeground": "書き込みアクセス シンボルを強調表示するときの概要ルーラーのマーカー色。この色は下地の色に紛れないよう不明瞭であってはいけません。",
-+=======
-+	"wordHighlight": "変数の読み取りなど読み取りアクセス中のシンボルの背景色。下にある装飾を隠さないために、色は不透過であってはなりません。",
-+	"wordHighlightStrong": "変数への書き込みなど書き込みアクセス中のシンボルの背景色。下にある装飾を隠さないために、色は不透過であってはなりません。",
-+	"overviewRulerWordHighlightForeground": "シンボルを強調表示するときの概要ルーラーのマーカー色。",
-+	"overviewRulerWordHighlightStrongForeground": "書き込みアクセス シンボルを強調表示するときの概要ルーラーのマーカー色。",
-+>>>>>>> .their
- 	"wordHighlight.next.label": "次のシンボル ハイライトに移動",
- 	"wordHighlight.previous.label": "前のシンボル ハイライトに移動"
- }
-\ No newline at end of file
-changed in both
-  base   100644 981e3bb87da93a8df7124822af50d363295f8844 i18n/jpn/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  our    100644 ef65f3f2706c8a53c3db11c1f57ddc0e49a1f2f7 i18n/jpn/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  their  100644 2a2b18aa6b8fb64ff7526aa4b5f56af44bffc4ca i18n/jpn/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 e5dd71eb7e2dc3ddd0b217173934064d4cb20cbf i18n/jpn/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 dd4553b6a25f3d18d9ae6f341855e230cceed4fe i18n/jpn/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 41c3e1463873b07dc82881b1bad33aa7b744ab55 i18n/jpn/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,11 +10,19 @@
- 	"diff": "2 つのファイルを比較します。",
- 	"add": "最後にアクティブだったウィンドウにフォルダーを追加します。",
- 	"goto": "指定した行と文字の位置にあるパスでファイルを開きます。",
-+<<<<<<< .our
- 	"newWindow": "強制的に新しいウィンドウを開きます。",
- 	"reuseWindow": "強制的に最後にアクティブだったウィンドウ内でファイルかフォルダーを開きます。",
- 	"wait": "現在のファイルが閉じられるまで待機します。",
- 	"locale": "使用する国と地域 (例:en-US や zh-TW など)。",
- 	"userDataDir": "ユーザー データが保持されるディレクトリを指定します。複数の異なる Code のインスタンスを開くために使用できます。",
-+=======
-+	"newWindow": "新しい Code のインスタンスを強制します。",
-+	"reuseWindow": "最後のアクティブ ウィンドウにファイルまたはフォルダーを強制的に開きます。",
-+	"wait": "現在のファイルが閉じられるまで待機します。",
-+	"locale": "使用する国と地域 (例:en-US や zh-TW など)。",
-+	"userDataDir": "ユーザー データを保持するディレクトリを指定します。ルートで実行している場合に役立ちます。",
-+>>>>>>> .their
- 	"version": "バージョンを表示します。",
- 	"help": "使用法を表示します。",
- 	"extensionHomePath": "拡張機能のルート パスを設定します。",
-@@ -29,11 +37,18 @@
- 	"performance": "'Developer: Startup Performance' コマンドを有効にして開始します。",
- 	"prof-startup": "起動中に CPU プロファイラーを実行する",
- 	"disableExtensions": "インストールされたすべての拡張機能を無効にします。",
-+<<<<<<< .our
- 	"inspect-extensions": "拡張機能のデバッグとプロファイリングを許可します。connection URI を開発者ツールで確認します。",
- 	"inspect-brk-extensions": "起動後に一時停止されている拡張ホストとの拡張機能のデバッグとプロファイリングを許可します。connection URI を開発者ツールで確認ます。",
- 	"disableGPU": "GPU ハードウェア アクセラレータを無効にします。",
- 	"uploadLogs": "現在のセッションから安全なエンドポイントにログをアップロードします。",
- 	"maxMemory": "ウィンドウの最大メモリ サイズ (バイト単位)。",
-+=======
-+	"inspect-extensions": "拡張機能のデバッグとプロファイリングを許可します。接続 URI を開発者ツールでチェックします。",
-+	"inspect-brk-extensions": "起動後に一時停止されている拡張ホストとの拡張機能のデバッグとプロファイリングを許可します。接続 URI を開発者ツールでチェックします。",
-+	"disableGPU": "GPU ハードウェア アクセラレータを無効にします。",
-+	"uploadLogs": "現在のセッションから安全なエンドポイントにログをアップロードします。",
-+>>>>>>> .their
- 	"usage": "使用法",
- 	"options": "オプション",
- 	"paths": "パス",
-changed in both
-  base   100644 9901a3c82e48e932edf83b646fd6cd75d84a7bff i18n/jpn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 64efa1b1dbf8d2e7a5e45feb436be37921131cc7 i18n/jpn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 9b169d44885576ebdfeced39a44b2a326a503434 i18n/jpn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -7,12 +7,16 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"invalidManifest": "正しくない拡張機能: package.json は JSON ファイルではありません。",
-+<<<<<<< .our
- 	"incompatible": "Code '{1}' と互換性のない拡張機能 '{0}' をインストールできません。",
-+=======
-+>>>>>>> .their
- 	"restartCode": "{0} を再インストールする前に、Code を再起動してください。",
- 	"installingOutdatedExtension": "この拡張機能の新しいバージョンが既にインストールされています。古いバージョンでこれを上書きしますか?",
- 	"override": "上書き",
- 	"cancel": "キャンセル",
- 	"errorInstallingDependencies": "依存関係のインストール中にエラーが発生しました。{0}",
-+<<<<<<< .our
- 	"MarketPlaceDisabled": "Marketplace が有効になっていません",
- 	"removeError": "拡張機能の削除中にエラーが発生しました: {0}。もう一度やり直す前に、VS Code の終了と起動を実施してください。",
- 	"Not a Marketplace extension": "Marketplace の拡張機能のみ再インストールできます",
-@@ -22,6 +26,12 @@
- 	"quitCode": "拡張機能をインストールできません。再インストールの前に VS Code の終了と起動を実施してください。",
- 	"exitCode": "拡張機能をインストールできません。再インストールの前に VS Code の終了と起動を実施してください。",
- 	"renameError": "{0} から {1} に名前変更中に不明なエラーが発生しました",
-+=======
-+	"notFoundCompatible": "'{0}' をインストールできません。VS Code '{1}' と互換性がある利用可能なバージョンがありません。",
-+	"notFoundCompatibleDependency": "VS Code の現在のバージョン '{1}'  と互換性を持つ、依存関係がある拡張機能 '{0}' が見つからないため、インストールできません。",
-+	"quitCode": "拡張機能をインストールできません。再インストールの前に VS Code の終了と起動を実施してください。",
-+	"exitCode": "拡張機能をインストールできません。再インストールの前に VS Code の終了と起動を実施してください。",
-+>>>>>>> .their
- 	"uninstallDependeciesConfirmation": "'{0}' のみをアンインストールしますか、または依存関係もアンインストールしますか?",
- 	"uninstallOnly": "拡張機能のみ",
- 	"uninstallAll": "すべてアンインストール",
-changed in both
-  base   100644 85415e2c95f05c99483b00dbcddb1ac857d7951d i18n/jpn/src/vs/platform/message/common/message.i18n.json
-  our    100644 44348c07c173ab2ed8f8e1c645e7000e63f2474a i18n/jpn/src/vs/platform/message/common/message.i18n.json
-  their  100644 15eee72cd0d00c38fd641bed911f95df3949b66e i18n/jpn/src/vs/platform/message/common/message.i18n.json
-changed in both
-  base   100644 24c492550e35674611c420910224df45569b5514 i18n/jpn/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 10667640968038e7107ce7d296e8264e00fd0ada i18n/jpn/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 46bb9caa152555db21871fc9761102e6c6c28f48 i18n/jpn/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -70,6 +70,7 @@
- 	"editorSelectionForeground": "ハイ コントラストの選択済みテキストの色。",
- 	"editorInactiveSelection": "非アクティブなエディターの選択範囲の色。下にある装飾を隠さないために、色は不透過であってはなりません。",
- 	"editorSelectionHighlight": "選択範囲と同じコンテンツの領域の色。下にある装飾を隠さないために、色は不透過であってはなりません。",
-+<<<<<<< .our
- 	"editorSelectionHighlightBorder": "選択範囲と同じコンテンツの境界線の色。",
- 	"editorFindMatch": "現在の検索一致項目の色。",
- 	"findMatchHighlight": "他の検索一致項目の色。下にある装飾を隠さないために、色は不透過であってはなりません。",
-@@ -78,6 +79,11 @@
- 	"findMatchHighlightBorder": "他の検索一致項目の境界線の色。",
- 	"findRangeHighlightBorder": "検索を制限する範囲の境界線の色。下にある装飾を隠さないために、色は不透過であってはなりません。",
- 	"findWidgetResizeBorder": "検索ウィジェットのサイズ変更バーの境界線の色。",
-+=======
-+	"editorFindMatch": "現在の検索一致項目の色。",
-+	"findMatchHighlight": "他の検索一致項目の色。下にある装飾を隠さないために、色は不透過であってはなりません。",
-+	"findRangeHighlight": "検索を制限する範囲の色。下にある装飾を隠さないために、色は不透過であってはなりません。",
-+>>>>>>> .their
- 	"hoverHighlight": "ホバーが表示されているワードの下を強調表示します。下にある装飾を隠さないために、色は不透過であってはなりません。",
- 	"hoverBackground": "エディター ホバーの背景色。",
- 	"hoverBorder": "エディター ホバーの境界線の色。",
-added in both
-  our    100644 2cc93b193154fd04e31e1ca64d2cba66a45babf7 i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 e4fd63e446222595a41279ed7472e31d799f572b i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,5 +10,13 @@
- 	"timeout.formatOnSave": "保存時のフォーマットは {0}ms 後に中止されました",
- 	"codeActionsOnSave.didTimeout": "codeActionsOnSave は {0} ms 後に中止されました",
- 	"timeout.onWillSave": "onWillSaveTextDocument-event は 1750ms 後に中止されました",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"saveParticipants": "Save Participants が実行中です..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 74c5f0eabd7020572aa3c8f8959faa3362591a60 i18n/jpn/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  our    100644 d8c4f33ad00ee482dae25c607088df5ba7e7ad66 i18n/jpn/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  their  100644 3d99fafeeda777cc694195e620a58919f1d1af36 i18n/jpn/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,7 @@
- 	],
- 	"treeView.notRegistered": "ID '{0}' のツリー ビューは登録されていません。",
- 	"treeView.duplicateElement": "id [0] の要素はすでに登録されています。"
-+=======
-+	"treeView.notRegistered": "ID '{0}' のツリー ビューは登録されていません。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 60ed1228f04d6929e6b458899b34f5a2ba7ce757 i18n/jpn/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 504738102db98241f299da4b50371a12d6a5d3cc i18n/jpn/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 69c30877972235f393360d69e4af073576f20fcd i18n/jpn/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -15,5 +15,9 @@
- 	"saveWorkspace": "ワークスペースを保存",
- 	"openWorkspaceAction": "ワークスペースを開く...",
- 	"openWorkspaceConfigFile": "ワークスペースの構成ファイルを開く",
-+<<<<<<< .our
- 	"duplicateWorkspaceInNewWindow": "新しいウィンドウでワークスペースを複製"
-+=======
-+	"openFolderAsWorkspaceInNewWindow": "新しいウィンドウでワークスペースとしてフォルダーを開く"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 8ba90a3ef5edfbd4b6365be6cfc9b9a3761d1b5c i18n/jpn/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-  their  100644 d1d72afcab9707b2b75997ca8f014af73f1a53f0 i18n/jpn/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"addFolderToWorkspace": "ワークスペースにフォルダーを追加...",
- 	"add": "追加(&&A)",
- 	"addFolderToWorkspaceTitle": "ワークスペースにフォルダーを追加",
-changed in both
-  base   100644 86cc5cdfa14cb47cabc40a1202f4942768cf9485 i18n/jpn/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  our    100644 aeadb4468253843db19d9398c2ca92c54c55a2d3 i18n/jpn/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  their  100644 ef30ff122d1ea643c0fc375a8497feab9f1bacc4 i18n/jpn/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-@@ -19,14 +19,22 @@
- 	"close": "閉じる",
- 	"closeOthers": "その他を閉じる",
- 	"closeRight": "右側を閉じる",
-+<<<<<<< .our
- 	"closeAllSaved": "保存済みを閉じる",
-+=======
-+	"closeAllUnmodified": "未変更を閉じる",
-+>>>>>>> .their
- 	"closeAll": "すべて閉じる",
- 	"keepOpen": "開いたままにする",
- 	"toggleInlineView": "インライン表示に切り替え",
- 	"showOpenedEditors": "開いているエディターを表示",
- 	"keepEditor": "エディターを保持",
- 	"closeEditorsInGroup": "グループ内のすべてのエディターを閉じる",
-+<<<<<<< .our
- 	"closeSavedEditors": "グループ内の保存済みエディターを閉じる",
-+=======
-+	"closeUnmodifiedEditors": "グループ内の未変更のエディターを閉じる",
-+>>>>>>> .their
- 	"closeOtherEditors": "その他のエディターを閉じる",
- 	"closeRightEditors": "右側のエディターを閉じる"
- }
-\ No newline at end of file
-changed in both
-  base   100644 9e1f0ccd5c365a276ca51e4b03070f0c18559ca9 i18n/jpn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 e7a6b2fb2a7d5101005b456fa1e81b0ef5fafa9d i18n/jpn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 3d1749e2a396b970311ed3d2b10364a1a69c6303 i18n/jpn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 31949627cfd901c66c46556d53ca6f8181b61f54 i18n/jpn/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  our    100644 2b13248d5c162d04db01dbccc9ed63bfb7fac545 i18n/jpn/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  their  100644 faa2938621c37ae44b6ed2193e3ddd312dfc6680 i18n/jpn/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-changed in both
-  base   100644 e5581c64d21b199927659ab8a3d892a37025ddce i18n/jpn/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  our    100644 6701af9c3444eaa5a9a22215a9faf090cbc27372 i18n/jpn/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  their  100644 17ddb4365e0722d36c2f3e06324a32a09bb72bb2 i18n/jpn/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-changed in both
-  base   100644 c10bd2e7b6047dd1dca8c353f7b29fa27bc040b0 i18n/jpn/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  our    100644 8d15ea098f8039c366d4add5a88362704001f96c i18n/jpn/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  their  100644 f0f64f4f3adf51a7ffd61698f519e76ad382c077 i18n/jpn/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"close": "閉じる",
-+>>>>>>> .their
- 	"araLabelEditorActions": "エディター操作"
- }
-\ No newline at end of file
-changed in both
-  base   100644 5c96f185104d0318f131335c56a8b5cdaa2d7b82 i18n/jpn/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
-  our    100644 94be0507f0953c8f81b6db7dc4f9d1fbfa9dbd2b i18n/jpn/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
-  their  100644 2ac16cc30bc1b39456bb90f4bc1322263d7a54ef i18n/jpn/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
-changed in both
-  base   100644 a296fd913c1ec72a5656e12417b469fa276d0b4b i18n/jpn/src/vs/workbench/common/theme.i18n.json
-  our    100644 b14021a35078518051aec469e7adb4b85583e1c9 i18n/jpn/src/vs/workbench/common/theme.i18n.json
-  their  100644 61bc140d9d312b6dbffae0fd01acad1333aa5be6 i18n/jpn/src/vs/workbench/common/theme.i18n.json
-@@ -11,10 +11,15 @@
- 	"tabHoverBackground": "ホバー時のタブの背景色。タブはエディター領域におけるエディターのコンテナです。1 つのエディター グループで複数のタブを開くことができます。エディター グループを複数にすることもできます。",
- 	"tabUnfocusedHoverBackground": "ホバー時のフォーカスされていないグループ内のタブの背景色。タブはエディター領域におけるエディターのコンテナです。1 つのエディター グループで複数のタブを開くことができます。エディター グループを複数にすることもできます。",
- 	"tabBorder": "タブ同士を分けるための境界線。タブはエディター領域内にあるエディターのコンテナーです。複数のタブを 1 つのエディター グループで開くことができます。複数のエディター グループがある可能性があります。",
-+<<<<<<< .our
- 	"tabActiveBorder": "アクティブなタブの下部の境界線。タブはエディター領域内にあるエディターのコンテナーです。複数のタブを 1 つのエディター グループで開くことができます。複数のエディター グループがある可能性があります。",
- 	"tabActiveBorderTop": "アクティブなタブの上部の境界線。タブはエディター領域内にあるエディターのコンテナーです。複数のタブを 1 つのエディター グループで開くことができます。複数のエディター グループがある可能性があります。",
- 	"tabActiveUnfocusedBorder": "フォーカスされていないグループ内で、アクティブなタブの下部の境界線。タブはエディター領域内にあるエディターのコンテナーです。複数のタブを 1 つのエディター グループで開くことができます。複数のエディター グループがある可能性があります。",
- 	"tabActiveUnfocusedBorderTop": "フォーカスされていないグループ内で、アクティブなタブの上部の境界線。タブはエディター領域内にあるエディターのコンテナーです。複数のタブを 1 つのエディター グループで開くことができます。複数のエディター グループがある可能性があります。",
-+=======
-+	"tabActiveBorder": "アクティブなタブを強調表示するための境界線。タブはエディター領域内にあるエディターのコンテナーです。複数のタブを 1 つのエディター グループで開くことができます。複数のエディター グループがある可能性があります。",
-+	"tabActiveUnfocusedBorder": "フォーカスされていないグループ内のアクティブ タブを強調表示するための境界線。タブはエディター領域内にあるエディターのコンテナーです。複数のタブを 1 つのエディター グループで開くことができます。複数のエディター グループがある可能性があります。",
-+>>>>>>> .their
- 	"tabHoverBorder": "ホバー時のタブを強調表示するための境界線。タブはエディター領域内にあるエディターのコンテナーです。複数のタブを 1 つのエディター グループで開くことができます。複数のエディター グループがある可能性があります。",
- 	"tabUnfocusedHoverBorder": "ホバー時のフォーカスされていないグループ内のタブを強調表示するための境界線。タブはエディター領域内にあるエディターのコンテナーです。複数のタブを 1 つのエディター グループで開くことができます。複数のエディター グループがある可能性があります。",
- 	"tabActiveForeground": "アクティブ グループ内のアクティブ タブの前景色。タブはエディター領域におけるエディターのコンテナーです。1 つのエディター グループで複数のタブを開くことができます。エディター グループを複数にすることもできます。",
-added in both
-  our    100644 9bb889a78e17b7f6ce367e5f9aa8bade3d905923 i18n/jpn/src/vs/workbench/common/views.i18n.json
-  their  100644 3607a9f498a8646093dcabaca4caf8faf870a3a2 i18n/jpn/src/vs/workbench/common/views.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"duplicateId": "location '{1}' で id '{0}' のビューが既に登録されています"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"duplicateId": "location `{1}` で id `{0}` のビューが既に登録されています"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e4698109a33894229a72372693cee43af1018a24 i18n/jpn/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 bb47142b4560b826311d6df88270f90b21754504 i18n/jpn/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 68ba00974f357dd62e78c1ca54ca6ae569554481 i18n/jpn/src/vs/workbench/electron-browser/actions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"closeWindow": "ウィンドウを閉じる",
- 	"closeWorkspace": "ワークスペースを閉じる",
- 	"noWorkspaceOpened": "このインスタンスで現在開いているワークスペースがないので、閉じられません。",
-@@ -50,6 +53,14 @@
- 	"moveWindowTabToNewWindow": "ウィンドウ タブを新しいウィンドウに移動",
- 	"mergeAllWindowTabs": "すべてのウィンドウを統合",
- 	"toggleWindowTabsBar": "ウィンドウ タブ バーの切り替え",
-+<<<<<<< .our
- 	"about": "{0} のバージョン情報",
- 	"inspect context keys": "コンテキスト キーの検査"
-+=======
-+	"configureLocale": "言語を構成する",
-+	"displayLanguage": "VSCode の表示言語を定義します。",
-+	"doc": "サポートされている言語の一覧については、{0} をご覧ください。",
-+	"restart": "値を変更するには VS Code の再起動が必要です。",
-+	"fail.createSettings": "'{0}' ({1}) を作成できません。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 2f2b510b284b045c0d435ad5d563e0aa69d59ba7 i18n/jpn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 3b03f30557674ed7892d9127c78ab05070c860e0 i18n/jpn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 c0540ea9122e04a01debed4ba82d9c2d9f116fe4 i18n/jpn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,12 +35,19 @@
- 	"panelDefaultLocation": "パネルの既定の位置を制御します。ワークベンチの下部または右のいずれかに表示できます。",
- 	"statusBarVisibility": "ワークベンチの下部にステータス バーを表示するかどうかを制御します。",
- 	"activityBarVisibility": "ワークベンチでのアクティビティ バーの表示をコントロールします。",
-+<<<<<<< .our
- 	"viewVisibility": "ビュー ヘッダー アクションを表示するかどうかを制御します。ビュー ヘッダー アクションは常に表示されるか、パネルをフォーカスやホバーしたときのみ表示のいずれかです。",
- 	"fontAliasing": "ワークベンチのフォント エイリアシング方法を制御します。\n- default: サブピクセル方式でフォントを滑らかにします。ほとんどの非 Retina ディスプレイでもっとも鮮明なテキストを提供します\n- antialiased: サブピクセルとは対照的に、ピクセルのレベルでフォントを滑らかにします。フォント全体がより細く見えます\n- none: フォントのスムージングを無効にします。テキストをぎざぎざな尖ったエッジで表示します\n- auto: ディスプレイの DPI に基づいて自動的に `default` か `antialiased` を適用します",
- 	"workbench.fontAliasing.default": "サブピクセル方式でフォントを滑らかにします。ほとんどの非 Retina ディスプレイでもっとも鮮明なテキストを提供します。",
- 	"workbench.fontAliasing.antialiased": "サブピクセルとは対照的に、ピクセルのレベルでフォントを滑らかにします。フォント全体がより細く見えるようになります。",
- 	"workbench.fontAliasing.none": "フォントのスムージングを無効にします。テキストをぎざぎざな尖ったエッジで表示します。",
- 	"workbench.fontAliasing.auto": "ディスプレイの DPI に基づいて自動的に `default` か `antialiased` を適用します。",
-+=======
-+	"fontAliasing": "ワークベンチのフォント エイリアシング方法を制御します。\n- default: サブピクセル方式でフォントを滑らかにします。ほとんどの非 Retina ディスプレイでもっとも鮮明なテキストを提供します\n- antialiased: サブピクセルとは対照的に、ピクセルのレベルでフォントを滑らかにします。フォント全体がより細く見えます\n- none: フォントのスムージングを無効にします。テキストをぎざぎざな尖ったエッジで表示します",
-+	"workbench.fontAliasing.default": "サブピクセル方式でフォントを滑らかにします。ほとんどの非 Retina ディスプレイでもっとも鮮明なテキストを提供します。",
-+	"workbench.fontAliasing.antialiased": "サブピクセルとは対照的に、ピクセルのレベルでフォントを滑らかにします。フォント全体がより細く見えるようになります。",
-+	"workbench.fontAliasing.none": "フォントのスムージングを無効にします。テキストをぎざぎざな尖ったエッジで表示します。",
-+>>>>>>> .their
- 	"enableNaturalLanguageSettingsSearch": "設定で自然文検索モードを有効にするかどうかを制御します。",
- 	"windowConfigurationTitle": "ウィンドウ",
- 	"window.openFilesInNewWindow.on": "新しいウィンドウでファイルを開きます",
-changed in both
-  base   100644 0813ed28598088e292a260022b49a00ce865f8fa i18n/jpn/src/vs/workbench/electron-browser/window.i18n.json
-  our    100644 b544af3baf4b86010347cffabbb513883c29d0b1 i18n/jpn/src/vs/workbench/electron-browser/window.i18n.json
-  their  100644 b9e99cd4528550ac99f2af0df2655310f80c644c i18n/jpn/src/vs/workbench/electron-browser/window.i18n.json
-changed in both
-  base   100644 1c53dd86bdd7755e8704fc04d9b680e1041a03a8 i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json
-  our    100644 a58b652a6cc8941988971708ff5c077ddd28ac7b i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json
-  their  100644 f1f6fe1ec7d6140ff801b7f1507b95caf50212aa i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json
-changed in both
-  base   100644 3b84ee3fdb42ee514a5ff3cc16ab720a6edc61d7 i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json
-  our    100644 cb56f95f2b83a120d83eb17f398af3bde78ea841 i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json
-  their  100644 ec3d813e1dcc52bbd9d7e6276cc3b632c23b446d i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"toggleLocation": "マルチカーソル修飾子の切り替え"
- }
-\ No newline at end of file
-changed in both
-  base   100644 57ba460378dd45795c649d0249394cdf43e71916 i18n/jpn/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-  our    100644 f154d6f46bc66710819bc962ae3fe874f33b5b39 i18n/jpn/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-  their  100644 bf61b86ff83d866aae2955f3da0113ea02572124 i18n/jpn/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-changed in both
-  base   100644 8876044c17ee89af0ca31ce68e5b05c586def4a2 i18n/jpn/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
-  our    100644 5de2170d2975b2ef9a94f0b7134442fb1ea04bc5 i18n/jpn/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
-  their  100644 00d3b5a76c0f64f4e606c4b2d7c49e39b1b7f9bd i18n/jpn/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"debugToolBarBackground": "デバッグ ツール バーの背景色。",
- 	"debugToolBarBorder": "デバッグ ツール バーの境界線色。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 f9530ecfb908541cc509990d08c2505993ac9f84 i18n/jpn/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
-  our    100644 39b690741dbbc33fef29e4c5a7002a685f6648df i18n/jpn/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
-  their  100644 76d3254c4eb1d4951df04e21d4c75e116fadc6a1 i18n/jpn/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
-changed in both
-  base   100644 3b2b57ca85d48acb38f819086be63f79fb78f113 i18n/jpn/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json
-  our    100644 512d0bf249cb35e694a8f2cbfa5c7efd3a476990 i18n/jpn/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json
-  their  100644 010c65f0dc86d6cef8eba3a9f5bfb5ed2418db67 i18n/jpn/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json
-changed in both
-  base   100644 248289a591ac684b4f25bd9dfc57d8538c403fb7 i18n/jpn/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  our    100644 13d471ad7b03653747d4f87af1fdafa5879ffc90 i18n/jpn/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  their  100644 af2aec81915a406830e2f74bdf3fbccbd4469e9a i18n/jpn/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"debug.terminal.title": "デバッグ対象"
- }
-\ No newline at end of file
-changed in both
-  base   100644 2a9f118d0842023cdca7ae655efd239c9f3302ce i18n/jpn/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  our    100644 3d2ead4c932daddd0da08581216ff6faa31260b5 i18n/jpn/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  their  100644 ecb730ce4d3b79e5e5b72a6fe5d16bb901df6bea i18n/jpn/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-changed in both
-  base   100644 c381b702335077f34383b8d458cd753617e02c14 i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 c1d5e7d9f012953fc3bd6919da0d8a29b234fa8c i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 07e196a71f546c4f2b74859483ea1ef5207c664d i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,11 @@
- 	"exeBasedRecommendation": "{0} がインストールされているため、この拡張機能を推奨します。",
- 	"fileBasedRecommendation": "最近開いたファイルに基づいてこの拡張機能が推奨されます。",
- 	"workspaceRecommendation": "現在のワークスペースのユーザーによってこの拡張機能が推奨されています。",
-+=======
-+	"workspaceRecommendation": "現在のワークスペースのユーザーによってこの拡張機能が推奨されています。",
-+	"fileBasedRecommendation": "最近開いたファイルに基づいてこの拡張機能が推奨されます。",
-+	"exeBasedRecommendation": "{0} がインストールされているため、この拡張機能を推奨します。",
-+>>>>>>> .their
- 	"reallyRecommended2": "このファイルの種類には拡張機能 '{0}' が推奨されます。",
- 	"reallyRecommendedExtensionPack": "このファイルの種類には拡張機能パック '{0}' が推奨されます。",
- 	"install": "インストール",
-added in both
-  our    100644 494c5510591deade1b0589b8541356e40e88bb35 i18n/jpn/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-  their  100644 78d76e265f4bb6500f736c9919abca8c6be0e5c8 i18n/jpn/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"workbenchConfigurationTitle": "ワークベンチ",
- 	"feedbackVisibility": "ワークベンチ下部にあるステータス バーで Twitter のフィードバック (スマイル) を表示するかどうかを制御します。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 ba6b165a86a5d233d7219c5b099f78d69e15f5ce i18n/jpn/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
-  our    100644 2751b55c435f00e1ced16515851e547557a75bce i18n/jpn/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
-  their  100644 8f7ff5b2b6f2d9f33375f52f551c83d14ee871aa i18n/jpn/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
-added in both
-  our    100644 156f602f4b4f6f6193e2ce8f018bfa4211ff4b32 i18n/jpn/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-  their  100644 e31810d983cbbd6904f67d9cc82eebb5e9093f6b i18n/jpn/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"hide": "非表示"
- }
-\ No newline at end of file
-changed in both
-  base   100644 7630615995592f8f91c58aceae957eaa9824d0b4 i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  our    100644 d74bc3c8267703bc29f154b03152cdd6ab8f04af i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  their  100644 8c1cdd182eeb48cbf0039e3ad27c2546b8a42b8a i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-@@ -12,7 +12,10 @@
- 	"revertLocalChanges": "変更を破棄してディスク上の内容に戻る",
- 	"copyPathOfActive": "アクティブ ファイルのパスのコピー",
- 	"saveAllInGroup": "グループ内のすべてを保存する",
-+<<<<<<< .our
- 	"saveFiles": "すべてのファイルを保存",
-+=======
-+>>>>>>> .their
- 	"revert": "ファイルを元に戻す",
- 	"compareActiveWithSaved": "保存済みファイルと作業中のファイルを比較",
- 	"closeEditor": "エディターを閉じる",
-@@ -29,7 +32,11 @@
- 	"compareSelected": "選択項目の比較",
- 	"close": "閉じる",
- 	"closeOthers": "その他を閉じる",
-+<<<<<<< .our
- 	"closeSaved": "保存済みを閉じる",
-+=======
-+	"closeUnmodified": "未変更を閉じる",
-+>>>>>>> .their
- 	"closeAll": "すべて閉じる",
- 	"deleteFile": "完全に削除"
- }
-\ No newline at end of file
-changed in both
-  base   100644 2ef009f9c59c0827e7d3538b89266dc7db0d0891 i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 e65ff7942d87b569809cd4818a0800fdfb729d2c i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 7754a978dc6155e02685a4f611fcdefce037c78e i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"newFile": "新しいファイル",
- 	"newFolder": "新しいフォルダー",
- 	"rename": "名前変更",
-@@ -13,7 +16,11 @@
- 	"copyFile": "コピー",
- 	"pasteFile": "貼り付け",
- 	"retry": "再試行",
-+<<<<<<< .our
- 	"renameWhenSourcePathIsParentOfTargetError": "既存のフォルダーに子を追加するには 'New Folder' や 'New File' コマンドを使用してください",
-+=======
-+	"openFolderFirst": "フォルダー内にファイルやフォルダーを作成するには、フォルダーをまず開く必要があります。",
-+>>>>>>> .their
- 	"newUntitledFile": "無題の新規ファイル",
- 	"createNewFile": "新しいファイル",
- 	"createNewFolder": "新しいフォルダー",
-@@ -25,9 +32,16 @@
- 	"dirtyMessageFolderDelete": "保存されていない変更があるファイルを {0} 個含むフォルダーを削除します。続行しますか?",
- 	"dirtyMessageFileDelete": "保存されていない変更があるファイルを削除します。続行しますか?",
- 	"dirtyWarning": "保存しないと変更内容が失われます。",
-+<<<<<<< .our
-+=======
-+	"confirmMoveTrashMessageMultiple": "次の {0} 個のファイルを削除してもよろしいですか?",
-+	"confirmMoveTrashMessageFolder": "'{0}' とその内容を削除しますか?",
-+	"confirmMoveTrashMessageFile": "'{0}' を削除しますか?",
-+>>>>>>> .their
- 	"undoBin": "ごみ箱から復元できます。",
- 	"undoTrash": "ごみ箱から復元できます。",
- 	"doNotAskAgain": "再度表示しない",
-+<<<<<<< .our
- 	"irreversible": "このアクションは元に戻すことができません。",
- 	"binFailed": "ごみ箱を使用した削除に失敗しました。代わりに完全に削除しますか?",
- 	"trashFailed": "ごみ箱を使用した削除に失敗しました。代わりに完全に削除しますか?",
-@@ -48,6 +62,18 @@
- 	"replaceButtonLabel": "置換(&&R)",
- 	"fileIsAncestor": "ペーストするファイルは送り先フォルダの上位にいます",
- 	"fileDeleted": "ファイルは削除されたか移動されています",
-+=======
-+	"confirmDeleteMessageMultiple": "次の {0} 個のファイルを完全に削除してもよろしいですか?",
-+	"confirmDeleteMessageFolder": "'{0}' とその内容を完全に削除してもよろしいですか?",
-+	"confirmDeleteMessageFile": "'{0}' を完全に削除してもよろしいですか?",
-+	"irreversible": "このアクションは元に戻すことができません。",
-+	"permDelete": "完全に削除",
-+	"importFiles": "ファイルのインポート",
-+	"confirmOverwrite": "保存先のフォルダーに同じ名前のファイルまたはフォルダーが既に存在します。置き換えてもよろしいですか?",
-+	"replaceButtonLabel": "置換(&&R)",
-+	"fileDeleted": "ファイルは削除されたか移動されています",
-+	"fileIsAncestor": "コピーするファイルがコピー先フォルダの上位にあります",
-+>>>>>>> .their
- 	"duplicateFile": "重複",
- 	"globalCompareFile": "アクティブ ファイルを比較しています...",
- 	"openFileToCompare": "まずファイルを開いてから別のファイルと比較してください",
-changed in both
-  base   100644 4f2a963e3591eb4a89fdbfa6b1f568856f5925d3 i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  our    100644 67b41ed99db00273b3e6fff83af33450998ea209 i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  their  100644 e49e3964c1f01584c7cca6ee51904f9d11559878 i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,12 +7,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"revealInWindows": "エクスプローラーで表示",
- 	"revealInMac": "Finder で表示します",
- 	"openContainer": "このアイテムのフォルダーを開く",
- 	"saveAs": "名前を付けて保存...",
- 	"save": "保存",
- 	"saveAll": "すべて保存",
-+<<<<<<< .our
-+=======
-+	"saveFiles": "すべてのファイルを保存",
-+>>>>>>> .their
- 	"removeFolderFromWorkspace": "ワークスペースからフォルダーを削除",
- 	"genericRevertError": "元へ戻すことに失敗しました '{0}': {1}",
- 	"modifiedLabel": "{0} (ローカル) ↔ {1}",
-changed in both
-  base   100644 5461c0b3fa9062516c7b3d179dc36d861ad4f80d i18n/jpn/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 fa96297a410af2da774ca395b16f67db3922f007 i18n/jpn/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 9527bde40498ac28548816b8250be378808f2650 i18n/jpn/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-@@ -40,7 +40,10 @@
- 	"formatOnSave": "ファイルを保存するときにフォーマットしてください。フォーマッタを使用可能にして、ファイルを自動保存せず、エディターをシャットダウンしないでください。",
- 	"formatOnSaveTimeout": "保存時フォーマットのタイムアウトを制御します。formatOnSave-コマンドの時間制限をミリ秒単位で指定してください。指定したタイムアウトよりも時間がかかるコマンドはキャンセルされます。",
- 	"explorerConfigurationTitle": "エクスプローラー",
-+<<<<<<< .our
- 	"openEditorsVisible": "[開いているエディター] ウィンドウに表示するエディターの数。",
-+=======
-+>>>>>>> .their
- 	"autoReveal": "エクスプローラーでファイルを開くとき、自動的にファイルの内容を表示して選択するかどうかを制御します。",
- 	"enableDragAndDrop": "ドラッグ アンド ドロップを使用したファイルとフォルダーの移動をエクスプローラーが許可するかどうかを制御します。",
- 	"confirmDragAndDrop": "ドラッグ アンド ドロップを使用したファイルやフォルダーの移動時にエクスプローラーが確認を求めるかどうかを制御します。",
-changed in both
-  base   100644 a11f1cb6ffcfb5e06270333d72e9da53434c8b98 i18n/jpn/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  our    100644 7134cb66e1307df99079e70d8981772471b96fab i18n/jpn/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  their  100644 e3aeaafe4e7cb37ea2cd8f521f54d27de7b9a6bf i18n/jpn/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,12 @@
- 	],
- 	"userGuide": "エディター ツール バーの操作で、変更を元に戻すか、ディスクの内容を変更内容で上書きします。",
- 	"staleSaveError": "'{0} の保存に失敗しました。ディスクの内容の方が新しくなっています。ご使用のバージョンをディスク上のバージョンと比較してください。",
-+=======
-+	"userGuide": "右側のエディター ツール バーの操作で、変更を [元に戻す] か、ディスクの内容を変更内容で [上書き] します",
-+	"overwriteElevated": "管理者権限で上書き...",
-+	"saveElevated": "管理者権限で再試行...",
-+	"overwrite": "上書き",
-+>>>>>>> .their
- 	"retry": "再試行",
- 	"discard": "破棄",
- 	"readonlySaveErrorAdmin": "'{0}' の保存に失敗しました。ファイルが書き込み禁止になっています。[管理者権限で上書き] を選択して管理者として再試行してください。",
-changed in both
-  base   100644 f9c3565a125a3775c3cb9968e3484f6908b01830 i18n/jpn/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  our    100644 4d56ec46874ac782b2c92ce51da4ad6dca292f5d i18n/jpn/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  their  100644 3b5ce0838f3c8df0822f86b724c043b6ee09d11c i18n/jpn/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-@@ -15,9 +15,13 @@
- 	"dropFolder": "ワークスペースにフォルダーを追加しますか?",
- 	"addFolders": "フォルダーの追加(&&A)",
- 	"addFolder": "フォルダーの追加(&&A)",
-+<<<<<<< .our
- 	"confirmRootsMove": "ワークスペース内の複数のルート フォルダーの順序が変更されますがよろしいですか?",
- 	"confirmMultiMove": "次の {0} 個のファイルを移動してもよろしいですか?",
- 	"confirmRootMove": "ワークスペース内のルート フォルダー '{0}' の順序が変更されますがよろしいですか?",
-+=======
-+	"confirmMultiMove": "次の {0} 個のファイルを移動してもよろしいですか?",
-+>>>>>>> .their
- 	"confirmMove": "'{0}' を移動しますか?",
- 	"doNotAskAgain": "再度表示しない",
- 	"moveButtonLabel": "移動(&&M)",
-changed in both
-  base   100644 b798b662ed0b77f7500c4f64e873a72cd6374ff6 i18n/jpn/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  our    100644 7befdcbac2fb84853fd0e99a856a739d3be762b8 i18n/jpn/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  their  100644 95dfcf4fae90813563e6e41da2e1268ee30249bd i18n/jpn/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-added in both
-  our    100644 ae3a259ed9828450fba141df4fc47acc12626407 i18n/jpn/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-  their  100644 f95880fcc367cd4e846ff5289a4ad5fbd91a0d76 i18n/jpn/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"mainLog": "ログ (メイン)",
- 	"sharedLog": "ログ (共有)",
- 	"rendererLog": "ログ (ウィンドウ)",
-added in both
-  our    100644 109ecf99fed822d185e649c8205c099c654f43d6 i18n/jpn/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  their  100644 861a564f2de9b6c3defb91d1ac3f31c6c9a084f0 i18n/jpn/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -16,6 +17,23 @@
- 	"selectProcess": "プロセスのログを選択",
- 	"openLogFile": "ログ ファイルを開く...",
- 	"setLogLevel": "ログ レベルの設定...",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"openLogsFolder": "ログ フォルダーを開く",
-+	"showLogs": "ログの表示...",
-+	"mainProcess": "メイン",
-+	"sharedProcess": "共有",
-+	"rendererProcess": "ウィンドウ",
-+	"extensionHost": "拡張機能ホスト",
-+	"selectProcess": "プロセスの選択",
-+	"openLogFile": "ログ ファイルを開く...",
-+	"setLogLevel": "ログ レベルの設定",
-+>>>>>>> .their
- 	"trace": "トレース",
- 	"debug": "デバッグ",
- 	"info": "情報",
-@@ -23,8 +41,12 @@
- 	"err": "エラー",
- 	"critical": "重大",
- 	"off": "オフ",
-+<<<<<<< .our
- 	"selectLogLevel": "ログ レベルを選択",
- 	"default and current": "既定と現在",
- 	"default": "既定",
- 	"current": "現在"
-+=======
-+	"selectLogLevel": "ログ レベルを選択"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 efe22d017f6854d2c0b1e23ab94a97b9d50a9e6a i18n/jpn/src/vs/workbench/parts/markers/common/messages.i18n.json
-  our    100644 d8eb9ed547f88361ae8eaf178f4ac443da393aae i18n/jpn/src/vs/workbench/parts/markers/common/messages.i18n.json
-  their  100644 0c951e42e75b78ba91fae3ac10217a5cdefc22a2 i18n/jpn/src/vs/workbench/parts/markers/common/messages.i18n.json
-added in both
-  our    100644 7ce6bdc9900a469499ce223f44e405e1a69ce79c i18n/jpn/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-  their  100644 57deadb1a555b0da8c0e02da3bb7074585a55322 i18n/jpn/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -11,4 +12,16 @@
- 	"viewCategory": "表示",
- 	"clearOutput.label": "出力のクリア",
- 	"openActiveLogOutputFile": "表示: アクティブなログ出力ファイルを開く"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"output": "出力",
-+	"logViewer": "ログ ビューアー",
-+	"viewCategory": "表示",
-+	"clearOutput.label": "出力のクリア"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 03f9d6c7a380dc85ca734e65204a5250a7cff5a6 i18n/jpn/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-  their  100644 8f00064048d37f3e3665135e84ffd798e3901b2f i18n/jpn/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"output": "{0} - 出力",
- 	"channel": "'{0}' の出力チャネル"
- }
-\ No newline at end of file
-changed in both
-  base   100644 efdc6c41cac4e9954bc2945f8ef35c4d672b141d i18n/jpn/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
-  our    100644 5cd18931c0838f38bc083757d7290ee0bedae111 i18n/jpn/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
-  their  100644 99ba1fc8808833b1d97a4527890c22f121675342 i18n/jpn/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
-changed in both
-  base   100644 d963a2915fea0d01e64c9a3a9a00508874c725c7 i18n/jpn/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  our    100644 efda21bd7670c25e5650677646e9f03bb3b4771d i18n/jpn/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  their  100644 d1d1439074eae5e5d65e0e90e749586efe9e5b56 i18n/jpn/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-changed in both
-  base   100644 dacdf6ccd9d160635871da2a509aada0e93c6c67 i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-  our    100644 e3cca40ad76d05372fb67caf1061803a6dcbcf24 i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-  their  100644 00efa778c9193ade6adf965f8d645490cf5a90c2 i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-changed in both
-  base   100644 dbb463d1324514c366dea4fda12a36c718e4ae27 i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 8465cccb637ff0eb8a583c0254f668f121044d71 i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 05635b7c0f46fdc0694bc4e4672f2fa0a5a258ff i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"defaultSettings": "上書きするには、右側のエディターに設定を入力します。",
- 	"noSettingsFound": "設定が見つかりません。",
- 	"settingsSwitcherBarAriaLabel": "設定切り替え",
-changed in both
-  base   100644 a99b14b8dd8d80e8fa4fcaadcfc2f287635c2e1e i18n/jpn/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  our    100644 7b3c484d2020fa4fff9eeb1f190b1cb0a33d4c24 i18n/jpn/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  their  100644 f28c0310389d88127f65c8e110c9af1bf85ba8ed i18n/jpn/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-changed in both
-  base   100644 63217f20e3ee7501485a6421d192d07f7f646cd9 i18n/jpn/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  our    100644 977fd1e5ceb06b67bd625cb16f4268665a9745b6 i18n/jpn/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  their  100644 932be0b6bfa03be0cde1ac5c714ec7c1c9effdc2 i18n/jpn/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"view": "表示",
- 	"commandsHandlerDescriptionDefault": "コマンドの表示と実行",
- 	"gotoLineDescriptionMac": "行へ移動",
-changed in both
-  base   100644 b650b0b0eb32f851abac1ec77b6afec79ef866ff i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  our    100644 a508097adbd35ddee214a11ce8ccd760b70a063c i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  their  100644 84c7c41eb09bd5351001c8125a113874a2d00cfe i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-@@ -13,5 +13,9 @@
- 	"scmConfigurationTitle": "SCM",
- 	"alwaysShowProviders": "ソース管理プロバイダーのセクションを常に表示するかどうか。",
- 	"diffDecorations": "エディターの差分デコレーターを制御します。",
-+<<<<<<< .our
- 	"diffGutterWidth": "(追加や修正を示す) ガター内の差分デコレーター幅 (px) を制御します。"
-+=======
-+	"inputCounter": "入力文字のカウントをいつ表示するかを制御します。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 2cd7ee76d8f0f44309a8984673fe3e97dfc6a010 i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  our    100644 fadead296a93c202fdae35990b689034db6c7569 i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  their  100644 58ba9f785fc38aa2d8f27c2506abc10cbeed0996 i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-@@ -8,6 +8,9 @@
- 	],
- 	"scm providers": "ソース管理プロバイダー",
- 	"hideRepository": "非表示",
-+	"commitMessageInfo": "現在の行に {0}  文字",
-+	"commitMessageCountdown": "現在の行で残り {0} 文字",
-+	"commitMessageWarning": "現在の行で {1} から {0} 文字オーバー",
- 	"installAdditionalSCMProviders": "その他の SCM プロバイダーをインストール...",
- 	"no open repo": "有効なソース管理プロバイダーがありません。",
- 	"source control": "ソース管理",
-changed in both
-  base   100644 d07e4c94a3f37008b5af125af6022ffc3a50d14a i18n/jpn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 0c0e1ef6922bb2ebfdd24dd39aa82c38ab488084 i18n/jpn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 eeb352c7ca2d1e8de06d6e2fb07240db758bef5c i18n/jpn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-changed in both
-  base   100644 e266c4b0298ded90a07f37e3d112aaee0f09d9bb i18n/jpn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 d63dc1c7de64299d00cc648c70a452e18abf1957 i18n/jpn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 5253824e4bd04e5835135bc768367c5db7910dc1 i18n/jpn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,11 +13,18 @@
- 	"copyAllLabel": "すべてコピー",
- 	"clearSearchHistoryLabel": "検索履歴のクリア",
- 	"toggleSearchViewPositionLabel": "検索ビュー位置の切り替え",
-+=======
-+>>>>>>> .their
- 	"findInFolder": "フォルダー内を検索...",
- 	"findInWorkspace": "ワークスペース内を検索...",
- 	"showTriggerActions": "ワークスペース内のシンボルへ移動...",
- 	"name": "検索",
-+<<<<<<< .our
- 	"showSearchViewl": "検索の表示",
-+=======
-+	"search": "検索",
-+	"showSearchViewlet": "検索の表示",
-+>>>>>>> .their
- 	"view": "表示",
- 	"findInFiles": "フォルダーを指定して検索",
- 	"openAnythingHandlerDescription": "ファイルに移動する",
-@@ -29,7 +37,11 @@
- 	"useIgnoreFiles": "ファイルを検索するときに、.gitignore ファイルを使用するか .ignore ファイルを使用するかを制御します。",
- 	"search.quickOpen.includeSymbols": "グローバル シンボル検索の結果を、Quick Open の結果ファイルに含めるように構成します。",
- 	"search.followSymlinks": "検索中にシンボリック リンクをたどるかどうかを制御します。",
-+<<<<<<< .our
- 	"search.smartCase": "すべて小文字のパターンの場合、大文字と小文字を区別しないで検索し、そうでない場合は大文字と小文字を区別して検索する",
- 	"search.globalFindClipboard": "macOS で検索ビューが共有の検索クリップボードを読み取りまたは変更するかどうかを制御します",
- 	"search.location": "検索をサイドバーのビューとして表示するか、より水平方向の空間をとるためにパネル領域のパネルとして表示するかを制御します。"
-+=======
-+	"search.smartCase": "すべて小文字のパターンの場合、大文字と小文字を区別しないで検索し、そうでない場合は大文字と小文字を区別して検索する"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 555cee1e7acf405015caf2e6fae5db5c183a45ad i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-  their  100644 9f9a7171140dcdfa85a2ed100c54d3d9e36f3c08 i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"global.scope": "(グローバル)",
- 	"global.1": "({0})",
- 	"new.global": "新しいグローバル スニペット ファイル...",
-changed in both
-  base   100644 72cf35b045c5fe40308f361d3a58341a46705f4d i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  our    100644 e715ffb25dda725fde81327107aec4812ac52bec i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  their  100644 f4559520bc0fff3b005edfba2fbc04f03225f0af i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"snippetSchema.json.default": "空のスニペット",
- 	"snippetSchema.json": "ユーザー スニペット構成",
- 	"snippetSchema.json.prefix": "intellisense でスニペットを選択するときに使用するプレフィックス",
-added in both
-  our    100644 ee6c777124c5d672c13d006929dc9f8efc46a594 i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-  their  100644 6528c4a5c7238fcbd074aeda94a2860a01137610 i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,5 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"source.snippetGlobal": "グローバル ユーザー スニペット",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"source.snippet": "ユーザー スニペット"
- }
-\ No newline at end of file
-changed in both
-  base   100644 247f01f3cea87cfed95420450444b0f1b4b904ea i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  our    100644 21441eaa2729bf554391d89816b61bd2454648a6 i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 8d9acf90cf17d4d9b9f3959efabb56280b58f573 i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,10 @@
- 	],
- 	"invalid.path.0": "`contributes.{0}.path` に文字列が必要です。提供された値: {1}",
- 	"invalid.language.0": "言語を省略するとき、`contributes.{0}.path` の値は `.code-snippets`-file にする必要があります。提供された値: {1}",
-+=======
-+	"invalid.path.0": "`contributes.{0}.path` に文字列が必要です。提供された値: {1}",
-+	"invalid.language.0": "言語を省略するとき、`contributes.{0}.path` の値は `.code-snippets`-file にする必要があります。提供された値: {1}",
-+>>>>>>> .their
- 	"invalid.language": "`contributes.{0}.language` で不明な言語です。提供された値: {1}",
- 	"invalid.path.1": "拡張機能のフォルダー ({2}) の中に `contributes.{0}.path` ({1}) が含まれている必要があります。これにより拡張を移植できなくなる可能性があります。",
- 	"vscode.extension.contributes.snippets": "スニペットを提供します。",
-changed in both
-  base   100644 76dbf9d84f08fdee8be3a8772ad06f54b9d992ae i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 62e38b3747f8554dd00fc9cb1775537cf7a36bb1 i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 189e87c799d7ceb0a024935ff2bb969404bd5c14 i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -15,7 +15,11 @@
- 	"terminal.integrated.shellArgs.osx": "OS X 端末で使用するコマンド ライン引数。",
- 	"terminal.integrated.shell.windows": "Windows でターミナルが使用するシェルのパス。 Windows に同梱されているシェルを使用する場合 (cmd、PowerShell、または Bash on Ubuntu) 。",
- 	"terminal.integrated.shellArgs.windows": "Windows ターミナル上の場合に使用されるコマンド ライン引数。",
-+<<<<<<< .our
- 	"terminal.integrated.macOptionIsMeta": "macOS のターミナルでは、オプション キーをメタ キーとして扱います。",
-+=======
-+	"terminal.integrated.rightClickCopyPaste": "設定している場合、ターミナル内で右クリックしたときにコンテキスト メニューを表示させず、選択範囲がある場合はコピー、選択範囲がない場合は貼り付けの操作を行います。",
-+>>>>>>> .their
- 	"terminal.integrated.copyOnSelection": "設定した場合、ターミナルで選択しているテキストはクリップボードにコピーされます。",
- 	"terminal.integrated.fontFamily": "端末のフォント ファミリを制御します。既定値は editor.fontFamily になります。",
- 	"terminal.integrated.fontSize": "ターミナルのフォント サイズをピクセル単位で制御します。",
-@@ -37,7 +41,10 @@
- 	"terminal.integrated.env.linux": "Linux のターミナルで使用される VS Code のプロセスに追加される環境変数を持つオブジェクト",
- 	"terminal.integrated.env.windows": "Windows のターミナルで使用される VS Code のプロセスに追加される環境変数を持つオブジェクト",
- 	"terminal.integrated.showExitAlert": "0 以外の終了コードのとき `終了コードを伴ってターミナルの処理が終了しました` と警告を表示します。",
-+<<<<<<< .our
- 	"terminal.integrated.experimentalRestore": "VS Code の起動時に自動的にワークスペースのターミナル セッションを復元するかどうか。これは実験的な設定です。不具合や将来的に変更される可能性があります。",
-+=======
-+>>>>>>> .their
- 	"terminalCategory": "ターミナル",
- 	"viewCategory": "表示"
- }
-\ No newline at end of file
-changed in both
-  base   100644 6015fb400ae24c2a08d6d8ea3a586b233bbb5444 i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 bd0ce9939936ef31eabab48bc5a42980b19e29b3 i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 96aa73cab67f529aa85106668a5543012b5b2f55 i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -19,6 +19,7 @@
- 	"workbench.action.terminal.new": "新しい統合ターミナルの作成",
- 	"workbench.action.terminal.new.short": "新しいターミナル",
- 	"workbench.action.terminal.newWorkspacePlaceholder": "新しいターミナルの作業ディレクトリを選択してください",
-+<<<<<<< .our
- 	"workbench.action.terminal.newInActiveWorkspace": "(アクティブなワークスペースで) 新しいターミナルの作成",
- 	"workbench.action.terminal.split": "ターミナルの分割",
- 	"workbench.action.terminal.splitInActiveWorkspace": "(アクティブなワークスペースで) ターミナルの分割",
-@@ -28,6 +29,9 @@
- 	"workbench.action.terminal.resizePaneRight": "ペインを右にリサイズ",
- 	"workbench.action.terminal.resizePaneUp": "ペインを上にリサイズ",
- 	"workbench.action.terminal.resizePaneDown": "ペインを下にリサイズ",
-+=======
-+	"workbench.action.terminal.newInActiveWorkspace": "新しい統合ターミナルを作成 (アクティブなワークスペースに)",
-+>>>>>>> .their
- 	"workbench.action.terminal.focus": "端末にフォーカス",
- 	"workbench.action.terminal.focusNext": "次の端末にフォーカス",
- 	"workbench.action.terminal.focusPrevious": "前のターミナルにフォーカス",
-changed in both
-  base   100644 42ec3aff61936a075ec5f1200fc49a3dcd04c987 i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  our    100644 ccb663830c2e7340c8cd35b61e49ac51e8e0ed36 i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  their  100644 95f2aea84fde6a0a42380e8f65013fe582627ca3 i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-@@ -8,7 +8,11 @@
- 	],
- 	"terminal.integrated.chooseWindowsShellInfo": "カスタマイズ ボタンを選択して、既定のターミナル シェルを変更できます。",
- 	"customize": "カスタマイズする",
-+<<<<<<< .our
- 	"never again": "今後は表示しない",
-+=======
-+	"cancel": "キャンセル",
-+>>>>>>> .their
- 	"terminal.integrated.chooseWindowsShell": "優先するターミナル シェルを選択します。これは後で設定から変更できます",
- 	"terminalService.terminalCloseConfirmationSingular": "アクティブなターミナル セッションが 1 つあります。中止しますか?",
- 	"terminalService.terminalCloseConfirmationPlural": "アクティブなターミナル セッションが {0} 個あります。中止しますか?"
-changed in both
-  base   100644 5007e4d58ae2dd2ca0b047d697ac1b5dbbec988a i18n/jpn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 be4c3ee187a4c958a13a55a867d75c42dce31777 i18n/jpn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 6df9478e8ba13b85a7543935136418fb7002fe96 i18n/jpn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -26,12 +26,19 @@
- 	"commandPalette": "コマンド パレット...",
- 	"settings": "設定",
- 	"keyboardShortcuts": "キーボード ショートカット",
-+<<<<<<< .our
- 	"showExtensions": "拡張機能の管理",
-+=======
-+>>>>>>> .their
- 	"userSnippets": "ユーザー スニペット",
- 	"selectTheme.label": "配色テーマ",
- 	"themes.selectIconTheme.label": "ファイル アイコンのテーマ",
- 	"checkForUpdates": "更新の確認...",
- 	"checkingForUpdates": "更新を確認しています...",
-+<<<<<<< .our
-+=======
-+	"DownloadUpdate": "利用可能な更新プログラムをダウンロード",
-+>>>>>>> .their
- 	"DownloadingUpdate": "更新をダウンロードしています...",
- 	"installUpdate...": "更新プログラムのインストール...",
- 	"installingUpdate": "更新プログラムをインストールしています...",
-changed in both
-  base   100644 fbd940c7d4762804bfe2f4a935dec2171f56cc1c i18n/jpn/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  our    100644 946723a67128023eb3e9fb6c646c3cf967e21f00 i18n/jpn/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  their  100644 39c4fd74ba474c3c8903819c7b2dcfe4239040f9 i18n/jpn/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-changed in both
-  base   100644 26fc540488227acc4616c847680c01b3787d3c7e i18n/jpn/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  our    100644 da438326649bf3dd9d5fc83ed7deb703ead893a5 i18n/jpn/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  their  100644 6384721117f67cc624586049d18e156f30743846 i18n/jpn/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,4 +14,9 @@
- 	"fileBinaryError": "ファイルはバイナリのようなので、テキストとして開くことができません",
- 	"err.create": "ファイル {0} を作成できませんでした",
- 	"fileMoveConflict": "移動/コピーできません。移動/コピー先にファイルが既に存在します。"
-+=======
-+	"fileIsDirectoryError": "ファイルはディレクトリです",
-+	"fileNotModifiedError": "ファイルは次の時点以後に変更されていません:",
-+	"fileBinaryError": "ファイルはバイナリのようなので、テキストとして開くことができません"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 104db33f6337244ed2d1a32c88616ef6d47055e8 i18n/jpn/src/vs/workbench/services/files/node/fileService.i18n.json
-  our    100644 15dc46337bb140480f30e488f657bed5792e70af i18n/jpn/src/vs/workbench/services/files/node/fileService.i18n.json
-  their  100644 95c0a8bffc27db772b3068eab4edad0c15f564cb i18n/jpn/src/vs/workbench/services/files/node/fileService.i18n.json
-changed in both
-  base   100644 4845e670df1147efbb31bcac89aab4f4f778e627 i18n/jpn/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
-  our    100644 3da56ec25d97ddc8a13e5b385285a1ed56d58d19 i18n/jpn/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
-  their  100644 5d95483dfacddc859a1dda58617e5b4d648df780 i18n/jpn/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
-changed in both
-  base   100644 2b4d38667bc03741b9a025d1caa748242db5031a i18n/jpn/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  our    100644 7bade8011c7c29276dc09955be1b5f86fb4ce0c4 i18n/jpn/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  their  100644 a570e254df85187eee4e073694ccdff523520e6e i18n/jpn/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-changed in both
-  base   100644 b1fd1a9b69e9d14352615df73dceb000745bd5a9 i18n/jpn/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 1c24e18b8352f7c98a6c854017d4381edcc0bc7e i18n/jpn/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 3430db60129b30e585503589928284fea30f6a9a i18n/jpn/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-changed in both
-  base   100644 ec391b0543b8d09a5cc2e511a55235b679ec1d3f i18n/jpn/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  our    100644 8bba8a3b7036c74920c718836509c48a1615d496 i18n/jpn/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  their  100644 132852e62fff39db34e244465f769eec52e60a88 i18n/jpn/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-@@ -8,5 +8,10 @@
- 	],
- 	"errorInvalidTaskConfiguration": "ワークスペース構成ファイルに書き込めません。ファイルを開いて、ファイル内のエラー/警告を修正してからもう一度お試しください。",
- 	"errorWorkspaceConfigurationFileDirty": "ファイルが変更されているため、ワークスペース構成ファイルに書き込めません。ファイルを保存してから、もう一度お試しください。",
-+<<<<<<< .our
- 	"openWorkspaceConfigurationFile": "ワークスペースの構成を開く"
-+=======
-+	"openWorkspaceConfigurationFile": "ワークスペースの構成ファイルを開く",
-+	"close": "閉じる"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a02c668eb9ded1dcee8405b81b1b5a737beabaf6 i18n/kor/extensions/git/out/autofetch.i18n.json
-  our    100644 7f6a3198eb6e65405a295e58494ed873b68808c1 i18n/kor/extensions/git/out/autofetch.i18n.json
-  their  100644 88fc1cbb4d546033292251e93149b6b17a35fc43 i18n/kor/extensions/git/out/autofetch.i18n.json
-@@ -7,7 +7,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"yes": "예",
-+	"read more": "자세히 알아보기",
- 	"no": "아니요",
-+<<<<<<< .our
- 	"not now": "나중에 물어보기",
- 	"suggest auto fetch": "Code에서 ['git fetch']({0})를 정기적으로 실행하도록 하시겠습니까?"
-+=======
-+	"not now": "나중에 물어보기"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 15fcc99ffbe05058c00b3c23391a5ff72ff598ef i18n/kor/extensions/git/out/commands.i18n.json
-  our    100644 5c881abd459fc945dcc1b911f43b518f709ac538 i18n/kor/extensions/git/out/commands.i18n.json
-  their  100644 7ec5dec31a379813a5f8bfe4869d344eacd8ecb9 i18n/kor/extensions/git/out/commands.i18n.json
-@@ -71,12 +71,19 @@
- 	"pick remote pull repo": "분기를 가져올 원격 선택",
- 	"no remotes to push": "리포지토리에 푸시하도록 구성된 원격이 없습니다.",
- 	"nobranch": "원격에 푸시할 분기를 체크 아웃하세요.",
-+<<<<<<< .our
- 	"confirm publish branch": "'{0}' 분기에는 상향 분기가 없습니다. 이 분기를 게시하시겠습니까?",
- 	"ok": "확인",
- 	"push with tags success": "태그와 함께 푸시되었습니다.",
- 	"pick remote": "'{0}' 분기를 다음에 게시하려면 원격을 선택하세요.",
- 	"sync is unpredictable": "이 작업은 '{0}/{1}' 간에 커밋을 푸시하고 풀합니다. ",
- 	"never again": "다시 표시 안 함",
-+=======
-+	"ok": "확인",
-+	"push with tags success": "태그와 함께 푸시되었습니다.",
-+	"pick remote": "'{0}' 분기를 다음에 게시하려면 원격을 선택하세요.",
-+	"sync is unpredictable": "이 작업은 '{0}' 간에 커밋을 푸시하고 풀합니다.",
-+>>>>>>> .their
- 	"no remotes to publish": "리포지토리에 게시하도록 구성된 원격이 없습니다.",
- 	"no changes stash": "스태시할 변경 내용이 없습니다.",
- 	"provide stash message": "필요한 경우 스태시 메시지를 입력하세요.",
-added in both
-  our    100644 dd43847bd6ece7506b20c3035653b12c6c8b6d0c i18n/kor/extensions/typescript/out/commands.i18n.json
-  their  100644 70c3246796b0e15d0a190071976e7b3d5b462f2e i18n/kor/extensions/typescript/out/commands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -13,4 +14,20 @@
- 	"typescript.noJavaScriptProjectConfig": "파일이 JavaScript 프로젝트의 일부가 아닙니다. 자세히 알아보려면 [여기]({0})를 클릭하세요.",
- 	"typescript.configureTsconfigQuickPick": "tsconfig.json 구성",
- 	"typescript.configureJsconfigQuickPick": "jsconfig.json 구성"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"typescript.projectConfigNoWorkspace": "TypeScript 또는 JavaScript 프로젝트를 사용하려면 VS Code의 폴더를 여세요.",
-+	"typescript.projectConfigUnsupportedFile": "TypeScript 또는 JavaScript 프로젝트를 확인할 수 없습니다. 지원되지 않는 파일 형식",
-+	"typescript.projectConfigCouldNotGetInfo": "TypeScript 또는 JavaScript 프로젝트를 확인할 수 없습니다.",
-+	"typescript.noTypeScriptProjectConfig": "파일이 TypeScript 프로젝트의 일부가 아닙니다.",
-+	"typescript.noJavaScriptProjectConfig": "파일이 JavaScript 프로젝트의 일부가 아닙니다.",
-+	"typescript.configureTsconfigQuickPick": "tsconfig.json 구성",
-+	"typescript.configureJsconfigQuickPick": "jsconfig.json 구성",
-+	"typescript.projectConfigLearnMore": "자세한 정보"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 750d811d866eaa3d43818bd1d8e28c9898acf514 i18n/kor/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"selectAriaOption": "{0}"
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-added in both
-  our    100644 8c188b449a527f72011a4dc1ef63653395edb3be i18n/kor/src/vs/base/node/ps.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/src/vs/base/node/ps.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"collecting": "CPU와 메모리 정보를 수집중입니다. 시간이 약간 걸립니다."
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 1fe9d415d3a479365c1bc6205d1ce5230d48875d i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 c96c0fe1469ce78842b73db686d63d6305f28dfb i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 15922e9831448977409f73ad2274ebc4f59654b3 i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -16,7 +16,11 @@
- 	"lineNumbers.on": "줄 번호는 절대값으로 렌더링 됩니다.",
- 	"lineNumbers.relative": "줄 번호는 커서 위치에서 줄 간격 거리로 렌더링 됩니다.",
- 	"lineNumbers.interval": "줄 번호는 매 10 줄마다 렌더링이 이루어집니다.",
-+<<<<<<< .our
- 	"lineNumbers": "줄 번호의 표시 여부를 제어합니다.",
-+=======
-+	"lineNumbers": "줄 번호의 표시 방식을 제어합니다. 가능한 값은 'on', 'off', 'relative', 'interval' 입니다.",
-+>>>>>>> .their
- 	"rulers": "특정 수의 고정 폭 문자 뒤에 세로 눈금자를 렌더링합니다. 여러 눈금자의 경우 여러 값을 사용합니다. 배열이 비어 있는 경우 눈금자가 그려져 있지 않습니다.",
- 	"wordSeparators": "단어 관련 탐색 또는 작업을 수행할 때 단어 구분 기호로 사용되는 문자입니다.",
- 	"tabSize": "탭 한 개에 해당하는 공백 수입니다. `editor.detectIndentation`이 켜져 있는 경우 이 설정은 파일 콘텐츠에 따라 재정의됩니다.",
-changed in both
-  base   100644 a8423dd155b69f4f3c407aa89df59d4826fc226b i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 c148a56d8d67892505611b68cdd18b2ba3428134 i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 90813fe32fbf4edd2a8cad840cb0c3b02152bc23 i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -8,8 +8,11 @@
- 	],
- 	"lineHighlight": "커서 위치의 줄 강조 표시에 대한 배경색입니다.",
- 	"lineHighlightBorderBox": "커서 위치의 줄 테두리에 대한 배경색입니다.",
-+<<<<<<< .our
- 	"rangeHighlight": "빠른 열기 및 찾기 기능 등을 통해 강조 표시된 영역의 배경색입니다. 색은 밑에 깔린 꾸밈을 가리지 않도록 반드시 불투명이 아니어야 합니다.",
- 	"rangeHighlightBorder": "강조 영역 주변의 테두리에 대한 배경색입니다",
-+=======
-+>>>>>>> .their
- 	"caret": "편집기 커서 색입니다.",
- 	"editorCursorBackground": "편집기 커서의 배경색입니다. 블록 커서와 겹치는 글자의 색상을 사용자 정의할 수 있습니다.",
- 	"editorWhitespaces": "편집기의 공백 문자 색입니다.",
-changed in both
-  base   100644 58029e4cfcd556951eb746b7402c3a1924701a1a i18n/kor/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  our    100644 4b9dba9293172925bc959636fe204382fdbad72d i18n/kor/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  their  100644 73b79e4472120f3df3e3b9dd7dad1944b6e9c93f i18n/kor/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -10,4 +11,11 @@
- 	"markerAction.previous.label": "이전 문제로 이동 (오류, 경고, 정보)",
- 	"markerAction.nextInFiles.label": "파일의 다음 문제로 이동 (오류, 경고, 정보)",
- 	"markerAction.previousInFiles.label": "파일의 이전 문제로 이동 (오류, 경고, 정보)"
-+=======
-+	"title.wo_source": "({0}/{1})",
-+	"editorMarkerNavigationError": "편집기 표식 탐색 위젯 오류 색입니다.",
-+	"editorMarkerNavigationWarning": "편집기 표식 탐색 위젯 경고 색입니다.",
-+	"editorMarkerNavigationInfo": "편집기 표식 탐색 위젯 정보 색입니다.",
-+	"editorMarkerNavigationBackground": "편집기 표식 탐색 위젯 배경입니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ab340d73f19ecf15cb9622216450ecbc5bb87e24 i18n/kor/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  our    100644 aaaf9225abdbdfc447713d7247e23a460f779984 i18n/kor/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  their  100644 8dd1a533f7215632c7a5a8827d4f348d99330d10 i18n/kor/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,10 @@
- 	"wordHighlightStrongBorder": "변수에 쓰기와 같은 쓰기 액세스 중 기호의 테두리 색입니다.",
- 	"overviewRulerWordHighlightForeground": "기호 강조의 개요 눈금자 표식 색입니다. 이 색은 불투명해야만 내부 장식을 가리지 않습니다.",
- 	"overviewRulerWordHighlightStrongForeground": "쓰기 액세스 기호 강조의 개요 눈금자 표식 색입니다. 이 색은 불투명해야만 내부 장식을 가리지 않습니다.",
-+=======
-+	"overviewRulerWordHighlightForeground": "기호 강조 표시의 개요 눈금자 마커 색입니다.",
-+	"overviewRulerWordHighlightStrongForeground": "쓰기 권한 기호 강조 표시의 개요 눈금자 마커 색입니다.",
-+>>>>>>> .their
- 	"wordHighlight.next.label": "다음 강조 기호로 이동",
- 	"wordHighlight.previous.label": "이전 강조 기호로 이동"
- }
-\ No newline at end of file
-changed in both
-  base   100644 ee9870e16a1c7b6737e23bead633ce05b4850eb3 i18n/kor/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  our    100644 c92b8c11e09e6ba98f1ebf4744826c9d584019e9 i18n/kor/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  their  100644 8a92234e152e83135bc7ae99cd0092d2defbe462 i18n/kor/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 43b38b984db11136b8e50299f58c4be89210311d i18n/kor/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 5e47e69c5607206a94dadfaaaaa5928d57a2cd8e i18n/kor/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 ccaf072898e8c3816390566fdc3ad8203a7088cf i18n/kor/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,11 +10,19 @@
- 	"diff": "두 파일을 서로 비교합니다.",
- 	"add": "마지막 활성 창에 폴더를 추가합니다.",
- 	"goto": "지정된 줄과 문자 위치에 있는 경로의 파일을 엽니다.",
-+<<<<<<< .our
- 	"newWindow": "새 창을 강제로 엽니다.",
- 	"reuseWindow": "마지막 활성 창에서 파일 또는 파일을 강제로 엽니다.",
- 	"wait": "파일이 닫힐 때 까지 기다린 후 돌아갑니다.",
- 	"locale": "사용할 로캘(예: en-US 또는 zh-TW)입니다.",
- 	"userDataDir": "사용자 데이터가 저장되는 디렉터리를 지정합니다. Code의 여러 고유 인스턴스를 여는 데 사용할 수 있습니다.",
-+=======
-+	"newWindow": "Code의 새 인스턴스를 강제 적용합니다.",
-+	"reuseWindow": "마지막 활성 창에서 파일 또는 폴더를 강제로 엽니다.",
-+	"wait": "파일이 닫힐 때 까지 기다린 후 돌아갑니다.",
-+	"locale": "사용할 로캘(예: en-US 또는 zh-TW)입니다.",
-+	"userDataDir": "사용자 데이터가 저장되는 디렉터리를 지정합니다(루트로 실행할 경우 유용함).",
-+>>>>>>> .their
- 	"version": "버전을 출력합니다.",
- 	"help": "사용법을 출력합니다.",
- 	"extensionHomePath": "확장의 루트 경로를 설정합니다.",
-@@ -29,17 +37,27 @@
- 	"performance": "'Developer: Startup Performance' 명령을 사용하여 시작합니다.",
- 	"prof-startup": "시작하는 동안 CPU 프로파일러 실행",
- 	"disableExtensions": "설치된 모든 확장을 사용하지 않도록 설정합니다.",
-+<<<<<<< .our
- 	"inspect-extensions": "디버깅 및 확장 프로파일링을 허용합니다. 연결 URI는 개발자 도구를 확인하세요.",
- 	"inspect-brk-extensions": "시작 후 일시 중시된 확장 호스트에서 디버깅 및 확장 프로파일링을 허용합니다. 연결 URI는 개발자 도구를 확인하세요.",
- 	"disableGPU": "GPU 하드웨어 가속을 사용하지 않도록 설정합니다.",
- 	"uploadLogs": "현재의 세션에서 안전한 종점으로 로그 업로드",
- 	"maxMemory": "윈도우에 대한 최대 메모리 크기 (단위 MB).",
-+=======
-+	"inspect-extensions": "디버깅 및 확장 프로파일링을 허용합니다. 연결 uri에 대한 개발자 도구를 확인하십시오.",
-+	"inspect-brk-extensions": "시작 후 일시 중시된 확장 호스트에서 디버깅 및 확장 프로파일링을 허용합니다. 연결 URL은 개발자 도구를 확인하세요.",
-+	"disableGPU": "GPU 하드웨어 가속을 사용하지 않도록 설정합니다.",
-+>>>>>>> .their
- 	"usage": "사용법",
- 	"options": "옵션",
- 	"paths": "경로",
- 	"stdinWindows": "다른 프로그램의 출력을 읽으려면, '-'를 추가하십시오. (예: 'echo Hello World | {0} -')",
-+<<<<<<< .our
- 	"stdinUnix": "stdin에서 읽어오려면, '-'를 추가하십시오.(예. 'ps aux | grep code | {0} -')",
- 	"optionsUpperCase": "옵션",
- 	"extensionsManagement": "확장 관리",
- 	"troubleshooting": "문제 해결"
-+=======
-+	"optionsUpperCase": "옵션"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 64578b6f8a5697a6d3ecc2adc9fb1ae266aab116 i18n/kor/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 05518f96202309824a89dfbd3498bbcde7102ebd i18n/kor/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 651652bfe31ecaac8309cb32e9812045bc6e6c05 i18n/kor/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -7,11 +7,15 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"invalidManifest": "잘못된 확장: package.json이 JSON 파일이 아닙니다.",
-+<<<<<<< .our
- 	"incompatible": "'{0}' 확장은 Code '{1}'과(와) 호환되지 않으므로 설치할 수 없습니다.",
-+=======
-+>>>>>>> .their
- 	"restartCode": "{0}을(를) 다시 설치하기 전에 Code를 다시 시작하세요.",
- 	"installingOutdatedExtension": "이 확장의 최신 버전이 이미 설치되어 있습니다. 이 버전을 이전 버전으로 재정의하시겠습니까?",
- 	"override": "재정의",
- 	"cancel": "취소",
-+<<<<<<< .our
- 	"errorInstallingDependencies": "의존성 설치 중 오류가 발생했습니다. {0}",
- 	"MarketPlaceDisabled": "Marketplace를 사용할 수 없습니다.",
- 	"removeError": "확장을 제거하는 동안 오류가 발생했습니다. {0}. 다시 시도하기 전에 VS Code를 종료하고 다시 시작하세요.",
-@@ -22,6 +26,11 @@
- 	"quitCode": "확장을 설치할 수 없습니다. 다시 설치하기 위해 VS Code를 종료하고 다시 시작하십시오.",
- 	"exitCode": "확장을 설치할 수 없습니다. 다시 설치하기 전에 VS 코드를 종료한 후 다시 시작하십시오. ",
- 	"renameError": "이름을 {0}에서 {1}(으)로 변경하는 중 알 수 없는 오류 발생",
-+=======
-+	"notFoundCompatible": "'{0}'을(를) 설치할 수 없습니다; VS Code '{1}'과 호환되는 버전이 없습니다.",
-+	"notFoundCompatibleDependency": "VS Code의 현재 버전 '{1}'과(와) 호환되는 종속된 확장 '{0}'을(를) 찾을 수 없으므로 설치할 수 없습니다.",
-+	"quitCode": "확장을 설치할 수 없습니다. 다시 설치하기 위해 VS Code를 종료하고 다시 시작하십시오.",
-+>>>>>>> .their
- 	"uninstallDependeciesConfirmation": "'{0}'만 제거할까요, 아니면 종속성도 제거할까요?",
- 	"uninstallOnly": "확장만",
- 	"uninstallAll": "모두 제거",
-changed in both
-  base   100644 8194d2b9b95582dc722ec72dc023ce8743f159c5 i18n/kor/src/vs/platform/message/common/message.i18n.json
-  our    100644 c0cadb165e7c4e1b2a1da41d518d3d410bb015b7 i18n/kor/src/vs/platform/message/common/message.i18n.json
-  their  100644 7cec53dd19a577971d81e797a402e19eb48f42f6 i18n/kor/src/vs/platform/message/common/message.i18n.json
-changed in both
-  base   100644 8f111cba06f865ee961ebf16a79910e37debbb04 i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 44b01274f5b039d38e4cfbd58f3d0758fa5d1e89 i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 ac7b14b24ea4951ce6a60a3aa22c2ea3de79574d i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -68,6 +68,7 @@
- 	"editorWidgetBorder": "편집기 위젯의 테두리 색입니다. 위젯에 테두리가 있고 위젯이 색상을 무시하지 않을 때만 사용됩니다.",
- 	"editorSelectionBackground": "편집기 선택 영역의 색입니다.",
- 	"editorSelectionForeground": "고대비를 위한 선택 텍스트의 색입니다.",
-+<<<<<<< .our
- 	"editorInactiveSelection": "비활성화된 편집기에서 선택영역의 색상. 색상은 밑의 꾸밈을 가리지 않도록 반드시 불투명이 아니어야 합니다.",
- 	"editorSelectionHighlight": "선택 영역과 동일한 콘텐츠가 있는 영역의 색입니다. 색상은 밑의 꾸밈을 가리지 않도록 반드시 불투명이 아니어야 합니다.",
- 	"editorSelectionHighlightBorder": "선택 영역과 동일한 콘텐츠가 있는 영역의 테두리 색입니다.",
-@@ -79,6 +80,9 @@
- 	"findRangeHighlightBorder": "검색을 제한하는 범위의 테두리 색입니다. 이 색은 기본 장식을 가리지 않도록 불투명하지 않아야 합니다.",
- 	"findWidgetResizeBorder": "찾기 위젯의 크기 조정 막대의 테두리 색입니다.",
- 	"hoverHighlight": "호버가 표시된 단어 아래를 강조 표시합니다. 색상은 밑의 꾸밈을 가리지 않도록 반드시 불투명이 아니어야 합니다.",
-+=======
-+	"editorFindMatch": "현재 검색 일치 항목의 색입니다.",
-+>>>>>>> .their
- 	"hoverBackground": "편집기 호버의 배경색.",
- 	"hoverBorder": "편집기 호버의 테두리 색입니다.",
- 	"activeLinkForeground": "활성 링크의 색입니다.",
-@@ -86,12 +90,15 @@
- 	"diffEditorRemoved": "글자 배경색이 제거되었습니다. 해당 색상은 적용된 꾸밈을 가리지 않기 위해 불투명해서는 안됩니다.",
- 	"diffEditorInsertedOutline": "삽입된 텍스트의 윤곽선 색입니다.",
- 	"diffEditorRemovedOutline": "제거된 텍스트의 윤곽선 색입니다.",
-+<<<<<<< .our
- 	"mergeCurrentHeaderBackground": "인라인 병합 충돌의 현재 헤더 배경입니다. 색상은 밑의 꾸밈을 가리지 않도록 반드시 불투명이 아니어야 합니다.",
- 	"mergeCurrentContentBackground": "인라인 병합 충돌의 현재 콘텐츠 배경입니다. 색상은 밑의 꾸밈을 가리지 않도록 반드시 불투명이 아니어야 합니다.",
- 	"mergeIncomingHeaderBackground": "인라인 병합 충돌에서 수신 헤더 배경입니다. 색상은 밑의 꾸밈을 가리지 않도록 반드시 불투명이 아니어야 합니다.",
- 	"mergeIncomingContentBackground": "인라인 병합 충돌에서 수신 콘텐츠 배경입니다. 색상은 밑의 꾸밈을 가리지 않도록 반드시 불투명이 아니어야 합니다.",
- 	"mergeCommonHeaderBackground": "인라인 병합 충돌의 공통 과거 헤더 배경입니다. 색상은 밑의 꾸밈을 가리지 않도록 반드시 불투명이 아니어야 합니다.",
- 	"mergeCommonContentBackground": "인라인 병합 충돌의 공용 상위 콘텐츠 배경입니다. 이 색은 기본 장식을 가리지 않도록 불투명하지 않아야 합니다.",
-+=======
-+>>>>>>> .their
- 	"mergeBorder": "인라인 병합 충돌에서 헤더 및 스플리터의 테두리 색입니다.",
- 	"overviewRulerCurrentContentForeground": "인라인 병합 충돌에서 현재 개요 눈금 전경색입니다.",
- 	"overviewRulerIncomingContentForeground": "인라인 병합 충돌에서 수신 개요 눈금 전경색입니다.",
-added in both
-  our    100644 e260c7da4c6f560f0c6c1ac69ad396ed1b97cbf2 i18n/kor/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,4 +11,12 @@
- 	"codeActionsOnSave.didTimeout": "{0}밀리초 후 codeActionsOnSave 중단됨",
- 	"timeout.onWillSave": "1750ms 후에 onWillSaveTextDocument-event가 중단됨",
- 	"saveParticipants": "실행중인 저장 관계자..."
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 4dfa6a6e897b2345cb362e2a5dd9f07169480213 i18n/kor/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  our    100644 119f9434ea1f9659429413fc03778e6c282f471a i18n/kor/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  their  100644 80def44cc8576a4588bf8c80a57debefcba77de9 i18n/kor/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,7 @@
- 	],
- 	"treeView.notRegistered": "ID가 '{0}'인 등록된 트리 뷰가 없습니다.",
- 	"treeView.duplicateElement": "ID가 {0}인 요소가 이미 등록되어 있습니다."
-+=======
-+	"treeView.notRegistered": "ID가 '{0}'인 등록된 트리 뷰가 없습니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d99bcba35efbb21b5038a87126393fb6a3d9901f i18n/kor/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 9f392ee6782a9cd3b3d60690870bfb3e051b1e8b i18n/kor/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 646be54e1886499a8642a6a702b7e56d11fa37e0 i18n/kor/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -15,5 +15,9 @@
- 	"saveWorkspace": "작업 영역 저장",
- 	"openWorkspaceAction": "작업 영역 열기...",
- 	"openWorkspaceConfigFile": "작업 영역 구성 파일 열기",
-+<<<<<<< .our
- 	"duplicateWorkspaceInNewWindow": "새 창에 작업 영역 복제"
-+=======
-+	"openFolderAsWorkspaceInNewWindow": "새 창에서 작업 영역으로 폴더 열기"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 ab09f3bfef7fccac53c50cd54471d952d954f19d i18n/kor/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-  their  100644 4aff2c193448b890bf306a457ac22fe60b50b0e2 i18n/kor/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,4 +11,15 @@
- 	"add": "추가(&&A)",
- 	"addFolderToWorkspaceTitle": "작업 영역에 폴더 추가",
- 	"workspaceFolderPickerPlaceholder": "작업 영역 폴더 선택"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"addFolderToWorkspace": "작업 영역에 폴더 추가...",
-+	"add": "추가(&&A)",
-+	"addFolderToWorkspaceTitle": "작업 영역에 폴더 추가"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 32f439e8de1f35d68885df5a4944179d25544ef0 i18n/kor/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  our    100644 f0e2070a7f457cc0db76815fba6defcb9702d6e1 i18n/kor/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  their  100644 57c83a5d7c53b5f16030ec8f525789016b9b1556 i18n/kor/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-@@ -19,6 +19,7 @@
- 	"close": "닫기",
- 	"closeOthers": "기타 항목 닫기",
- 	"closeRight": "오른쪽에 있는 항목 닫기",
-+<<<<<<< .our
- 	"closeAllSaved": "저장된 항목 닫기",
- 	"closeAll": "모두 닫기",
- 	"keepOpen": "열린 상태 유지",
-@@ -27,6 +28,15 @@
- 	"keepEditor": "편집기 유지",
- 	"closeEditorsInGroup": "그룹의 모든 편집기 닫기",
- 	"closeSavedEditors": "그룹에서 저장된 편집기 닫기",
-+=======
-+	"closeAllUnmodified": "미수정 항목 닫기",
-+	"closeAll": "모두 닫기",
-+	"keepOpen": "열린 상태 유지",
-+	"showOpenedEditors": "열려 있는 편집기 표시",
-+	"keepEditor": "편집기 유지",
-+	"closeEditorsInGroup": "그룹의 모든 편집기 닫기",
-+	"closeUnmodifiedEditors": "그룹의 수정되지 않은 편집기 닫기",
-+>>>>>>> .their
- 	"closeOtherEditors": "다른 편집기 닫기",
- 	"closeRightEditors": "오른쪽에 있는 편집기 닫기"
- }
-\ No newline at end of file
-changed in both
-  base   100644 ed6d0f43e21177bc9f82ef796dc89d0285c5ba1d i18n/kor/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 c3a38e203dc33f498428fe02d849236cb876a123 i18n/kor/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 92ac30a939f4323f1a28cd0ed37faa8b093f0576 i18n/kor/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 6c0c854e4bf50db4f061e0608d915252f016a4d7 i18n/kor/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  our    100644 610a770a8a9b2f4b0cc9af12766b082e0eb56297 i18n/kor/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  their  100644 b32e252f6bf82835e0d590f270a5b3da9009e13d i18n/kor/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-changed in both
-  base   100644 dedfef7381bc2d7d7e83ccc9548352af81b21946 i18n/kor/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  our    100644 b2d63ee836a92104cf275cb56fc82528c9b6082d i18n/kor/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  their  100644 13977c6a0095c19b20465d30a1976f04d97bd5f8 i18n/kor/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-@@ -12,6 +12,10 @@
- 	"editableEditorWithInputAriaLabel": "{0}. 텍스트 파일 비교 편집기입니다.",
- 	"editableEditorAriaLabel": "텍스트 파일 비교 편집기입니다.",
- 	"navigate.next.label": "다음 변경 내용",
-+<<<<<<< .our
- 	"navigate.prev.label": "이전 변경 내용",
- 	"toggleIgnoreTrimWhitespace.label": "자르기 공백 무시"
-+=======
-+	"navigate.prev.label": "이전 변경 내용"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a290c09983793e960b59a3c92d69e50510e72055 i18n/kor/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  our    100644 2acca1606b7d94081e6530150993d936d7b73b81 i18n/kor/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  their  100644 13cca1a33360eb702e2281eda5901ae235034d21 i18n/kor/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"close": "닫기",
-+>>>>>>> .their
- 	"araLabelEditorActions": "편집기 작업"
- }
-\ No newline at end of file
-changed in both
-  base   100644 c43957e4bd8a3ec74d08ce0d2f31f76919e68cf6 i18n/kor/src/vs/workbench/common/theme.i18n.json
-  our    100644 634f6ea85a754d26140eeb8ed57e39a6ab596db9 i18n/kor/src/vs/workbench/common/theme.i18n.json
-  their  100644 4cd1b7fa5815cef6f3a1b0ea77e820be16e0c7f7 i18n/kor/src/vs/workbench/common/theme.i18n.json
-@@ -41,8 +41,11 @@
- 	"statusBarNoFolderBorder": "열린 폴더가 없을 때 사이드바 및 편집기와 구분하는 상태 표시줄 테두리 색입니다. 상태 표시줄은 창의 맨 아래에 표시됩니다.",
- 	"statusBarItemActiveBackground": "클릭할 때의 상태 표시줄 항목 배경색입니다. 상태 표시줄은 창의 맨 아래에 표시됩니다.",
- 	"statusBarItemHoverBackground": "마우스로 가리킬 때의 상태 표시줄 항목 배경색입니다. 상태 표시줄은 창의 맨 아래에 표시됩니다.",
-+<<<<<<< .our
- 	"statusBarProminentItemBackground": " 상태 표시줄 주요 항목 배경 색. 주요 항목은 중요성을 알려주기 위해 다른 상태 표시줄 항목보다 눈에 띕니다. 예제를 보기 위해 명령 팔레트에서 '포커스 이동을 위해 탭 키 토글' 모드를 변경합니다. 창 아래쪽에 상태 표시줄이 나타납니다.",
- 	"statusBarProminentItemHoverBackground": "마우스 커서를 올렸을 때 상태 표시줄 주요 항목 배경 색. 주요 항목은 중요성을 알려주기 위해 다른 상태 표시줄 항목보다 눈에 띕니다. 예제를 보기 위해 명령 팔레트에서 '포커스 이동을 위해 탭 키 토글' 모드를 변경합니다. 창 아래쪽에 상태 표시줄이 나타납니다.",
-+=======
-+>>>>>>> .their
- 	"activityBarBackground": "작업 막대 배경색입니다. 작업 막대는 맨 왼쪽이나 오른쪽에 표시되며 사이드바의 뷰 간을 전환하는 데 사용할 수 있습니다.",
- 	"activityBarForeground": "작업 막대 전경 색(예: 아이콘에 사용됨)입니다. 작업 막대는 오른쪽이나 왼쪽 끝에 표시되며 사이드바의 보기 간을 전환할 수 있습니다.",
- 	"activityBarBorder": "사이드바와 구분하는 작업 막대 테두리색입니다. 작업 막대는 오른쪽이나 왼쪽 끝에 표시되며 사이드바의 보기 간을 전환할 수 있습니다.",
-added in both
-  our    100644 dd937818bf97b5a69827678de5353616c3d86286 i18n/kor/src/vs/workbench/common/views.i18n.json
-  their  100644 6a3532ad44d8242de5c7ca3d3919142c91ee69df i18n/kor/src/vs/workbench/common/views.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"duplicateId": "ID `{0}`인 뷰가 위치 `{1}`에 이미 등록되어 있습니다."
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"duplicateId": "ID `{0}`이(가) 포함된 뷰가 위치 `{1}`에 이미 등록되어 있습니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 96f43aced40ed7c653c61ae714a6abe54398e585 i18n/kor/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 e913e127345422fb81d57f13fd8b5c25a0d63e10 i18n/kor/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 a1086cd9b19b2f24bfa7d9f722ecb202165030e2 i18n/kor/src/vs/workbench/electron-browser/actions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"closeWindow": "창 닫기",
- 	"closeWorkspace": "작업 영역 닫기",
- 	"noWorkspaceOpened": "현재 이 인스턴스에 열려 있는 작업 영역이 없습니다.",
-@@ -50,6 +53,14 @@
- 	"moveWindowTabToNewWindow": "창 탭을 새 창으로 이동",
- 	"mergeAllWindowTabs": "모든 창 병합",
- 	"toggleWindowTabsBar": "창 탭 모음 설정/해제",
-+<<<<<<< .our
- 	"about": "{0} 정보",
- 	"inspect context keys": "컨텍스트 키 검사"
-+=======
-+	"configureLocale": "언어 구성",
-+	"displayLanguage": "VSCode의 표시 언어를 정의합니다.",
-+	"doc": "지원되는 언어 목록은 {0} 을(를) 참조하세요.",
-+	"restart": "값을 변경하려면 VSCode를 다시 시작해야 합니다.",
-+	"fail.createSettings": "{0}'({1})을(를) 만들 수 없습니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 b3ca18516e9974812c405cbae34392dfe0bd02e0 i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 faff44b17686fcb835995d2bfd92efcfdcc183b1 i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 612e6f3495e7c6f3d105f83e4659cc9b45d3c8f1 i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,12 +35,19 @@
- 	"panelDefaultLocation": "패널의 기본 위치를 제어합니다. 워크벤치의 아래 또는 오른쪽에 표시될 수 있습니다.",
- 	"statusBarVisibility": "워크벤치 아래쪽에서 상태 표시줄의 표시 유형을 제어합니다.",
- 	"activityBarVisibility": "워크벤치에서 작업 막대의 표시 유형을 제어합니다.",
-+<<<<<<< .our
- 	"viewVisibility": "보기 머리글 작업의 표시 여부를 제어합니다. 보기 머리글 작업은 항상 표시할 수도 있고 보기에 포커스가 있거나 보기를 마우스로 가리킬 때만 표시할 수도 있습니다.",
- 	"fontAliasing": "워크벤치에서 글꼴 앨리어싱 방식을 제어합니다.\n- 기본: 서브 픽셀 글꼴 다듬기. 대부분의 일반 디스플레이에서 가장 선명한 글꼴 제공\n- 안티앨리어싱: 서브 픽셀이 아닌 픽셀 단위에서 글꼴 다듬기. 전반적으로 더 밝은 느낌을 줄 수 있음\n- 없음: 글꼴 다듬기 사용 안 함. 텍스트 모서리가 각지게 표시됨\n- 자동: 디스플레이의 DPI에 따라 `기본` 또는 `안티앨리어싱`을 자동으로 적용합니다.",
- 	"workbench.fontAliasing.default": "서브 픽셀 글꼴 다듬기. 대부분의 일반 디스플레이에서 가장 선명한 텍스트를 제공합니다. ",
- 	"workbench.fontAliasing.antialiased": "서브 픽셀이 아닌 픽셀 수준에서 글꼴을 다듬습니다. 전반적으로 글꼴이 더 밝게 표시됩니다.",
- 	"workbench.fontAliasing.none": "글꼴 다듬기를 사용하지 않습니다. 텍스트 가장자리가 각지게 표시됩니다.",
- 	"workbench.fontAliasing.auto": "디스플레이의 DPI에 따라 `기본` 또는 `안티앨리어싱`을 자동으로 적용합니다.",
-+=======
-+	"fontAliasing": "워크벤치에서 글꼴 앨리어싱 방식을 제어합니다.\n- 기본: 서브 픽셀 글꼴 다듬기. 대부분의 일반 디스플레이에서 가장 선명한 글꼴 제공\n- 안티앨리어싱: 서브 픽셀이 아닌 픽셀 단위에서 글꼴 다듬기. 전반적으로 더 밝은 느낌을 줄 수 있음\n- 없음: 글꼴 다듬기 사용 안 함. 텍스트 모서리가 각지게 표시됨",
-+	"workbench.fontAliasing.default": "서브 픽셀 글꼴 다듬기. 대부분의 일반 디스플레이에서 가장 선명한 텍스트를 제공합니다. ",
-+	"workbench.fontAliasing.antialiased": "서브 픽셀이 아닌 픽셀 수준에서 글꼴을 다듬습니다. 전반적으로 글꼴이 더 밝게 표시됩니다.",
-+	"workbench.fontAliasing.none": "글꼴 다듬기를 사용하지 않습니다. 텍스트 가장자리가 각지게 표시됩니다.",
-+>>>>>>> .their
- 	"enableNaturalLanguageSettingsSearch": "설정에 대한 자연어 검색 모드를 사용할지 여부를 제어합니다.",
- 	"windowConfigurationTitle": "창",
- 	"window.openFilesInNewWindow.on": "파일이 새 창에서 열립니다.",
-changed in both
-  base   100644 0530d6e3338b0221d2863ec624ecb6c4b65f1a85 i18n/kor/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  our    100644 225f55e21c15f2eea5a8d413dde22258cc15ec40 i18n/kor/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  their  100644 744cd683e866c0e76d54cc033fd64d3dc884ca6f i18n/kor/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"debug.terminal.title": "디버기"
- }
-\ No newline at end of file
-changed in both
-  base   100644 50730f440768cb821b1884c299c5df52891014fd i18n/kor/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  our    100644 d7e3fbf5baba4bf721149551ff3617009db1827d i18n/kor/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  their  100644 318c2b33d6f83a9a94e6a1051404c5faa042baf2 i18n/kor/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-changed in both
-  base   100644 3b5fdb0caacd5c75cac18cf6e05cd98d9a1a6f58 i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 7d98f29daa7e57a06988b8e2e9d76dd40150f638 i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 109cbec7026cb0f1ace5ef8da3f1ad27b242c92a i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,11 @@
- 	"exeBasedRecommendation": "{0}이(가) 설치되어 있으므로 이 확장을 권장합니다.",
- 	"fileBasedRecommendation": "최근에 연 파일을 기반으로 확장이 권장됩니다.",
- 	"workspaceRecommendation": "이 확장은 현재 작업 영역 사용자가 권장합니다.",
-+=======
-+	"workspaceRecommendation": "이 확장은 현재 작업 영역 사용자가 권장합니다.",
-+	"fileBasedRecommendation": "최근에 연 파일을 기반으로 확장이 권장됩니다.",
-+	"exeBasedRecommendation": "{0}이(가) 설치되어 있으므로 이 확장을 권장합니다.",
-+>>>>>>> .their
- 	"reallyRecommended2": "이 파일 형식에 대해 '{0}' 확장이 권장됩니다.",
- 	"reallyRecommendedExtensionPack": "이 파일 형식에 대해 '{0}' 확장 팩이 권장됩니다.",
- 	"install": "설치",
-added in both
-  our    100644 a10f291195902ad8d48ea6f23379b0adcd1fba71 i18n/kor/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-  their  100644 f1ae7883f3271382ee0800dc248f9462974eb71d i18n/kor/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,13 @@
- 	],
- 	"workbenchConfigurationTitle": "워크벤치",
- 	"feedbackVisibility": "워크벤치의 아래쪽에 있는 상태 표시줄에 Twitter 피드백(스마일 기호)의 표시 여부를 제어합니다."
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"workbenchConfigurationTitle": "워크벤치"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 2831ffe9f709c06aa3aa3754a4052d98e06ca948 i18n/kor/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"hide": "숨기기"
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 70dd81693214bc1f5e2dd3c5ff772183c2626bcc i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  our    100644 42cc77c6edf6d2ceb65bde3d33c468e821956123 i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  their  100644 68afc8f65f7e75b24cb638fe842866e43eb53cdb i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-@@ -12,7 +12,10 @@
- 	"revertLocalChanges": "변경 내용을 취소하고 디스크의 콘텐츠로 되돌리기",
- 	"copyPathOfActive": "활성 파일의 경로 복사",
- 	"saveAllInGroup": "그룹의 모든 항목 저장",
-+<<<<<<< .our
- 	"saveFiles": "파일 모두 저장",
-+=======
-+>>>>>>> .their
- 	"revert": "파일 되돌리기",
- 	"compareActiveWithSaved": "활성 파일을 저장된 파일과 비교",
- 	"closeEditor": "편집기 닫기",
-@@ -24,12 +27,19 @@
- 	"copyPath": "경로 복사",
- 	"saveAll": "모두 저장",
- 	"compareWithSaved": "저장된 항목과 비교",
-+<<<<<<< .our
- 	"compareWithSelected": "선택한 항목과 비교",
- 	"compareSource": "비교를 위해 선택",
- 	"compareSelected": "선택 항목 비교",
- 	"close": "닫기",
- 	"closeOthers": "기타 항목 닫기",
- 	"closeSaved": "저장된 항목 닫기",
-+=======
-+	"compareSource": "비교를 위해 선택",
-+	"close": "닫기",
-+	"closeOthers": "기타 항목 닫기",
-+	"closeUnmodified": "미수정 항목 닫기",
-+>>>>>>> .their
- 	"closeAll": "모두 닫기",
- 	"deleteFile": "영구히 삭제"
- }
-\ No newline at end of file
-changed in both
-  base   100644 87d00a4c77a6c99ce0050a71341b3aa317861ab4 i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 3bf77a27ac7c066f4ce3c283301cd1346b8314d5 i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 63c70d80b92fb03eea89634fc736d19b0ff93f2f i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"newFile": "새 파일",
- 	"newFolder": "새 폴더",
- 	"rename": "이름 바꾸기",
-@@ -13,7 +16,11 @@
- 	"copyFile": "복사",
- 	"pasteFile": "붙여넣기",
- 	"retry": "다시 시도",
-+<<<<<<< .our
- 	"renameWhenSourcePathIsParentOfTargetError": "'새 폴더' 또는 '새 파일' 명령을 사용하여 기존 폴더에 자식을 추가하세요.",
-+=======
-+	"openFolderFirst": "안에 파일이나 폴더를 만들려면 먼저 폴더를 엽니다.",
-+>>>>>>> .their
- 	"newUntitledFile": "제목이 없는 새 파일",
- 	"createNewFile": "새 파일",
- 	"createNewFolder": "새 폴더",
-@@ -43,11 +50,19 @@
- 	"confirmDeleteMessageMultiple": "다음 {0}개 파일을 영구히 삭제하시겠습니까?",
- 	"confirmDeleteMessageFolder": "'{0}'과(와) 해당 내용을 영구히 삭제할까요?",
- 	"confirmDeleteMessageFile": "'{0}'을(를) 영구히 삭제할까요?",
-+<<<<<<< .our
- 	"addFiles": "파일 추가",
- 	"confirmOverwrite": "이름이 같은 파일 또는 폴더가 대상 폴더에 이미 있습니다. 덮어쓸까요?",
- 	"replaceButtonLabel": "바꾸기(&&R)",
- 	"fileIsAncestor": "붙여 넣을 파일이 대상 폴더의 상위 항목입니다.",
- 	"fileDeleted": "그동안 붙여 넣을 파일이 삭제되거나 이동되었습니다.",
-+=======
-+	"irreversible": "이 작업은 취소할 수 없습니다.",
-+	"permDelete": "영구히 삭제",
-+	"importFiles": "파일 가져오기",
-+	"confirmOverwrite": "이름이 같은 파일 또는 폴더가 대상 폴더에 이미 있습니다. 덮어쓸까요?",
-+	"replaceButtonLabel": "바꾸기(&&R)",
-+>>>>>>> .their
- 	"duplicateFile": "중복",
- 	"globalCompareFile": "활성 파일을 다음과 비교...",
- 	"openFileToCompare": "첫 번째 파일을 열어서 다른 파일과 비교합니다.",
-changed in both
-  base   100644 f77f75c50138464181aa8f884f64c26c1f67eb85 i18n/kor/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  our    100644 8c22f8027cd9eef29ec4cae4de0b4128be5e3340 i18n/kor/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  their  100644 a5bbd5fb7c4b25c35afe090d025afa11375e4607 i18n/kor/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,14 +7,21 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"revealInWindows": "탐색기에 표시",
- 	"revealInMac": "Finder에 표시",
- 	"openContainer": "상위 폴더 열기",
- 	"saveAs": "다른 이름으로 저장...",
- 	"save": "저장",
- 	"saveAll": "모두 저장",
-+<<<<<<< .our
- 	"removeFolderFromWorkspace": "작업 영역에서 폴더 삭제",
- 	"genericRevertError": "'{0}' 되돌리기 실패: {1}",
-+=======
-+	"saveFiles": "파일 모두 저장",
-+	"removeFolderFromWorkspace": "작업 영역에서 폴더 삭제",
-+>>>>>>> .their
- 	"modifiedLabel": "{0}(디스크) ↔ {1}",
- 	"openFileToReveal": "첫 번째 파일을 열어서 나타냅니다.",
- 	"openFileToCopy": "첫 번째 파일을 열어서 경로를 복사합니다."
-changed in both
-  base   100644 64e3a748c1d30ddcf3658546af6b8c004e841f1b i18n/kor/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 86c9a7c9d2ee8cfe00d51c1241e8d08a131418a5 i18n/kor/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 f166c5489ca516205c09bb1b74fd9ded9a969b87 i18n/kor/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-@@ -40,7 +40,10 @@
- 	"formatOnSave": "파일 저장 시 서식을 지정합니다. 포맷터를 사용할 수 있어야 하며, 파일이 자동으로 저장되지 않아야 하고, 편집기가 종료되지 않아야 합니다.",
- 	"formatOnSaveTimeout": "저장 시 서식 지정의 시간 제한. FormatOnSave 명령에 대한 시간 제한을 밀리초로 지정합니다. 지정된 시간 제한보다 오래 걸리는 명령은 취소됩니다.",
- 	"explorerConfigurationTitle": "파일 탐색기",
-+<<<<<<< .our
- 	"openEditorsVisible": "열려 있는 편집기 창에 표시되는 편집기 수입니다.",
-+=======
-+>>>>>>> .their
- 	"autoReveal": "탐색기에서 파일을 열 때 자동으로 표시하고 선택할지를 제어합니다.",
- 	"enableDragAndDrop": "탐색기에서 끌어서 놓기를 통한 파일 및 폴더 이동을 허용하는지를 제어합니다.",
- 	"confirmDragAndDrop": "끌어서 놓기를 사용하여 파일 및 폴더를 이동하기 위해 탐색기에서 확인을 요청해야 하는지 제어합니다.",
-changed in both
-  base   100644 6cf353ae7129b46c74d8a2ece73bc29603959134 i18n/kor/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  our    100644 b2bb3346a0aacef8ebfc8da00ebb91b7f0db3e37 i18n/kor/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  their  100644 33af3c52303b5d5c86b269bf94c42d146bc63096 i18n/kor/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,12 @@
- 	"discard": "삭제",
- 	"readonlySaveErrorAdmin": "'{0}' 저장 실패: 파일이 쓰기 보호되어 있습니다. 관리자로 다시 시도하려면 '관리자로 덮어쓰기'를 선택하세요.",
- 	"readonlySaveError": "'{0}' 저장 실패: 파일이 쓰기 보호되어 있습니다. 보호를 제거하려면 '덮어쓰기'를 선택하세요.",
-+=======
-+	"userGuide": "오른쪽 편집기 도구 모음의 작업을 사용하여 변경 내용을 **실행 취소**하거나 디스크의 콘텐츠를 변경 내용으로 **덮어쓰기**",
-+	"overwrite": "덮어쓰기",
-+	"retry": "다시 시도",
-+	"discard": "삭제",
-+>>>>>>> .their
- 	"permissionDeniedSaveError": "저장 실패 '{0}': 권한 부족. 관리자로 다시 시도하려면 '관리자로 다시 시도'를 선택하세요.",
- 	"genericSaveError": "'{0}'을(를) 저장하지 못했습니다. {1}",
- 	"learnMore": "자세한 정보",
-changed in both
-  base   100644 56030126c946d60dd34c0e74df7b13cae4e247fc i18n/kor/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  our    100644 37b7ea8b1927c92d33258a48c45eb49b54d27f3a i18n/kor/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  their  100644 3f6a56914c00b16db4b0a62bd3a1bdd3d3d56596 i18n/kor/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-added in both
-  our    100644 eed5e71d3e51cecfb4abc494c43deb0639649284 i18n/kor/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-  their  100644 c6b46a532f7203db44d48a02586881da86bad7ba i18n/kor/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,6 +9,15 @@
- 	],
- 	"mainLog": "로그(메인)",
- 	"sharedLog": "로그(공유)",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"mainLog": "로그(메인)",
-+>>>>>>> .their
- 	"rendererLog": "로그(창)",
- 	"extensionsLog": "로그(확장 호스트)",
- 	"developer": "개발자"
-added in both
-  our    100644 3bd63de7ca6d73e0237b469acdb4b75d84710150 i18n/kor/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  their  100644 e36190cd574022ab0883f29a99804ebd05e1206b i18n/kor/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -16,15 +17,34 @@
- 	"selectProcess": "프로세스에 대한 로그 선택",
- 	"openLogFile": "로그 파일 열기...",
- 	"setLogLevel": "로그 수준 설정...",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"openLogsFolder": "로그 폴더 열기",
-+	"showLogs": "로그 표시...",
-+	"mainProcess": "기본",
-+	"sharedProcess": "공유",
-+	"rendererProcess": "창",
-+	"selectProcess": "프로세스 선택",
-+	"setLogLevel": "로그 수준 설정",
-+>>>>>>> .their
- 	"trace": "Trace",
- 	"debug": "디버그",
- 	"info": "정보",
- 	"warn": "경고",
- 	"err": "오류",
- 	"critical": "Critical",
-+<<<<<<< .our
- 	"off": "Off",
- 	"selectLogLevel": "로그 수준 선택",
- 	"default and current": "기본값 및 현재",
- 	"default": "기본값",
- 	"current": "현재"
-+=======
-+	"off": "Off"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f9e867de14d4dfeed9a8cddbe7b34f6cb7164ee5 i18n/kor/src/vs/workbench/parts/markers/common/messages.i18n.json
-  our    100644 96ac7a8193ddf876a2dd0c0ad04713fa5d3664fb i18n/kor/src/vs/workbench/parts/markers/common/messages.i18n.json
-  their  100644 f0b9f22340cc989ca63f6d483137c0ae88c877c3 i18n/kor/src/vs/workbench/parts/markers/common/messages.i18n.json
-@@ -7,8 +7,11 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"viewCategory": "보기",
-+<<<<<<< .our
- 	"problems.view.toggle.label": "문제 토글(오류, 경고, 정보)",
- 	"problems.view.focus.label": "포커스 문제(오류, 경고, 정보)",
-+=======
-+>>>>>>> .their
- 	"problems.panel.configuration.title": "문제 보기",
- 	"problems.panel.configuration.autoreveal": "문제 보기를 열 때 문제 보기에 자동으로 파일이 표시되어야 하는지를 제어합니다.",
- 	"markers.panel.title.problems": "문제",
-added in both
-  our    100644 1b45ff7d9277ac5b9d1a2428fbd68f7a6aa6726c i18n/kor/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-  their  100644 921f1b58efc5319968ac9a325ddceb07bdc09aad i18n/kor/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -11,4 +12,16 @@
- 	"viewCategory": "보기",
- 	"clearOutput.label": "출력 내용 지우기",
- 	"openActiveLogOutputFile": "보기: 활성 로그 출력 파일 열기"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"output": "출력",
-+	"logViewer": "로그 표시기",
-+	"viewCategory": "보기",
-+	"clearOutput.label": "출력 내용 지우기"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 675dfcdef1543f7d95350e3767211a37bcdaabf5 i18n/kor/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-  their  100644 9261a8ba1e2aa92f3ce85128d06cb57d3cea7e85 i18n/kor/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,13 @@
- 	],
- 	"output": "{0} - 출력",
- 	"channel": "'{0}'에 대한 출력 채널"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"output": "{0} - 출력"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 188fd9c37dab70a07e044f3acd7af0dbac94f1fb i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 a8bd67a28f391e840f7a35323a824c51031c0c11 i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 9dc8bd95b1fd2faa72e49f874b1b93bcc4d2a847 i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"defaultSettings": "설정을 오른쪽 편집기에 넣어서 덮어씁니다.",
- 	"noSettingsFound": "설정을 찾을 수 없습니다.",
- 	"settingsSwitcherBarAriaLabel": "설정 전환기",
-changed in both
-  base   100644 de4c67a1e309bee8918b8b47fe850519106e3a5f i18n/kor/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  our    100644 9d01c25ee379b65a93a0db2fa71c9ac23d6dc2ba i18n/kor/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  their  100644 90960b4f14df0be59da277d2ef17c628c8281345 i18n/kor/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-changed in both
-  base   100644 0be24d926bb109d9b6513cff06fd02cf2d9e582d i18n/kor/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  our    100644 648ba46bbdb4258ba2811ebb0a8e4fd73f3afd8c i18n/kor/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  their  100644 c631d0cd782a4f86aa6b89af2f4e3d33d8a58195 i18n/kor/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"view": "보기",
- 	"commandsHandlerDescriptionDefault": "명령 표시 및 실행",
- 	"gotoLineDescriptionMac": "줄 이동",
-changed in both
-  base   100644 4b848835e917596b00ac1d10a906244611a01da8 i18n/kor/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  our    100644 073f844e7848ee2b0e2748bc20d2dbf992c527a9 i18n/kor/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  their  100644 29d19883f06e86f0844644b0d0b8f3ee5525ab9e i18n/kor/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-@@ -10,8 +10,12 @@
- 	"source control": "소스 제어",
- 	"toggleSCMViewlet": "SCM 표시",
- 	"view": "보기",
-+<<<<<<< .our
- 	"scmConfigurationTitle": "SCM",
- 	"alwaysShowProviders": "소스 제어 공급자 부분을 항상 표시할지의 여부",
- 	"diffDecorations": "편집기에서 차이점 장식을 제어합니다.",
- 	"diffGutterWidth": "여백에서 차이점 장식의 너비(px)를 제어합니다(추가 및 수정됨)."
-+=======
-+	"scmConfigurationTitle": "SCM"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 b045a022b2727df2c0cc63f7e9cda6b8fec6a04e i18n/kor/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 071d294ccc8fe4437d151c87e9b3a4d19cd1a8d5 i18n/kor/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 68680603aada9fac8f8164953f0ec5f12e06b0d6 i18n/kor/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-changed in both
-  base   100644 9b239f6fd5f9008bb0b725a14f7d3a6db63c34a2 i18n/kor/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 b8f4fa84a25213fae0e380ab22868cdef4e860d3 i18n/kor/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 bbdbfe7784606ea6b208d775b1a31e9867c6e403 i18n/kor/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -16,7 +16,12 @@
- 	"findInWorkspace": "작업 영역에서 찾기...",
- 	"showTriggerActions": "작업 영역에서 기호로 이동...",
- 	"name": "검색",
-+<<<<<<< .our
- 	"showSearchViewl": "검색 표시",
-+=======
-+	"search": "검색",
-+	"showSearchViewlet": "검색 표시",
-+>>>>>>> .their
- 	"view": "보기",
- 	"findInFiles": "파일에서 찾기",
- 	"openAnythingHandlerDescription": "파일로 이동",
-added in both
-  our    100644 aa0416d884efba14871042b317d2778897688fd4 i18n/kor/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-  their  100644 37d5355620e8211aa261ddb94de67d4926a21815 i18n/kor/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -13,5 +14,14 @@
- 	"new.global.sep": "새 코드 조각",
- 	"openSnippet.pickLanguage": "코드 조각 파일 선택 또는 코드 조각 만들기",
- 	"openSnippet.label": "사용자 코드 조각 구성",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"global.1": "({0})",
-+>>>>>>> .their
- 	"preferences": "기본 설정"
- }
-\ No newline at end of file
-changed in both
-  base   100644 582f284bf105ba2ba12fd77c5e61870ad29a9e51 i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  our    100644 c3fc6b2dfd0ffa3761c492bddaef2c73abf54e0d i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  their  100644 7a0857e6f8db197acee7033ae0953aae216ecdd0 i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"snippetSchema.json.default": "빈 코드 조각",
- 	"snippetSchema.json": "사용자 코드 조각 구성",
- 	"snippetSchema.json.prefix": "IntelliSense에서 코드 조각을 선택할 때 사용할 접두사입니다.",
-added in both
-  our    100644 aab78fb22a41e48d45fdcc8647715d2bb747131a i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-  their  100644 587455cd532ab711c9767b3e0d1972dec0d85fce i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,5 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"source.snippetGlobal": "전역 사용자 코드 조각",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"source.snippet": "사용자 코드 조각"
- }
-\ No newline at end of file
-changed in both
-  base   100644 c423047529b1d2dae016299bae1ec0ca95c817e6 i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  our    100644 4bb4deec5c3699ac48cd50b00a644c268e111a10 i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 b33ab06f4bb9c93940966027afdff9513d921d9e i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,9 @@
- 	],
- 	"invalid.path.0": "`contributes.{0}.path`에 문자열이 필요합니다. 제공된 값: {1}",
- 	"invalid.language.0": "언어를 생략하는 경우 `contributes.{0}.path` 값은 `.code-snippets`-file이어야 합니다. 제공된 값: {1}",
-+=======
-+	"invalid.path.0": "`contributes.{0}.path`에 문자열이 필요합니다. 제공된 값: {1}",
-+>>>>>>> .their
- 	"invalid.language": "`contributes.{0}.language`에 알 수 없는 언어가 있습니다. 제공된 값: {1}",
- 	"invalid.path.1": "확장 폴더({2})에 포함할 `contributes.{0}.path`({1})가 필요합니다. 확장이 이식 불가능해질 수 있습니다.",
- 	"vscode.extension.contributes.snippets": "코드 조각을 적용합니다.",
-changed in both
-  base   100644 32869d5021697b6a3ae2a49d5c06af5f67762158 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 d9e00ba07827f3430d124e149c098a234044e854 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 8483a433151216aa9fbf3fddaedcf0a31a55c803 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -10,7 +10,11 @@
- 	"terminal.foreground": "터미널의 전경색입니다.",
- 	"terminalCursor.foreground": "터미널 커서의 전경색입니다.",
- 	"terminalCursor.background": "터미널 커서의 배경색입니다. 블록 커서와 겹친 문자의 색상을 사용자 정의할 수 있습니다.",
-+<<<<<<< .our
- 	"terminal.selectionBackground": "터미널의 선택 영역 배경색입니다.",
- 	"terminal.border": "터미널 내의 분할 창을 구분하는 테두리의 색입니다. 기본값은 panel.border입니다.",
- 	"terminal.ansiColor": "터미널의 '{0}' ANSI 색상"
-+=======
-+	"terminal.selectionBackground": "터미널의 선택 영역 배경색입니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 b21bf5b25fa6ac48731ec0b42b544e7b23fdfda9 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  our    100644 444b81d0780111787d9f82a5eb6b8366a4b685f3 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  their  100644 ed40b3753394864ef40b2a9c63498f1501b3b57f i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-@@ -8,7 +8,11 @@
- 	],
- 	"terminal.integrated.chooseWindowsShellInfo": "사용자 지정 단추를 선택하여 기본 터미널 셸을 변경할 수 있습니다.",
- 	"customize": "사용자 지정",
-+<<<<<<< .our
- 	"never again": "다시 표시 안 함",
-+=======
-+	"cancel": "취소",
-+>>>>>>> .their
- 	"terminal.integrated.chooseWindowsShell": "기본으로 설정할 터미널 셸을 선택하세요. 나중에 설정에서 이 셸을 변경할 수 있습니다.",
- 	"terminalService.terminalCloseConfirmationSingular": "활성 터미널 세션이 있습니다. 종료할까요?",
- 	"terminalService.terminalCloseConfirmationPlural": "{0}개의 활성 터미널 세션이 있습니다. 종료할까요?"
-changed in both
-  base   100644 bb502a90cb606760056865a84c2a991300ed2f22 i18n/kor/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 46a0013cd0e5a09c5cae294dfef72bf6b6e0aeef i18n/kor/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 485a7f763c870063998c2a9d386904611161858e i18n/kor/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -26,7 +26,10 @@
- 	"commandPalette": "명령 팔레트...",
- 	"settings": "설정",
- 	"keyboardShortcuts": "바로 가기 키(&&K)",
-+<<<<<<< .our
- 	"showExtensions": "확장 관리",
-+=======
-+>>>>>>> .their
- 	"userSnippets": "사용자 코드 조각",
- 	"selectTheme.label": "색 테마",
- 	"themes.selectIconTheme.label": "파일 아이콘 테마",
-changed in both
-  base   100644 d48fe3d053ed2dc38f5bddbada7b2a82ca715bee i18n/kor/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  our    100644 ef565fe453fde1417671d5ced994cfb294239811 i18n/kor/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  their  100644 196d40bcdb55e2b6de392be49b76cfbba6e8b513 i18n/kor/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,4 +14,9 @@
- 	"fileBinaryError": "파일이 이진인 것 같으므로 테스트로 열 수 없습니다.",
- 	"err.create": "{0} 파일을 만들지 못했습니다.",
- 	"fileMoveConflict": "이동/복사할 수 없습니다. 대상에 파일이 이미 있습니다."
-+=======
-+	"fileIsDirectoryError": "파일이 디렉터리입니다.",
-+	"fileNotModifiedError": "파일 수정 안 됨",
-+	"fileBinaryError": "파일이 이진인 것 같으므로 테스트로 열 수 없습니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 db19c348ac824e0b0faff0e1b2a9b016e51cc366 i18n/kor/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  our    100644 cbccbeec8141420ec8797d51e0c293b63dfc8bd6 i18n/kor/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  their  100644 56bf06242e355541f4f9b47bca9f6f6590c3b18e i18n/kor/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-changed in both
-  base   100644 d365ddcbff536cb02d8bff0768789adcc4a138ec i18n/kor/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 d97177c41e4a5031dad60cb0cfff30a1e2f28fd5 i18n/kor/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 ae661bf418711d1e853152b9f7ccefff653eea06 i18n/kor/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-changed in both
-  base   100644 e836eb6be3f6f1b36ea5bc50a8ee77b81f58c92e i18n/kor/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  our    100644 61519fa8e49ab82b98366279c3dfb35de603779e i18n/kor/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  their  100644 a2425123fe5cb812caec31e8b43b97d7848e805a i18n/kor/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-@@ -8,5 +8,10 @@
- 	],
- 	"errorInvalidTaskConfiguration": "작업 영역 구성 파일에 쓸 수 없습니다. 파일을 열고 오류/경고를 수정한 다음 다시 시도하세요.",
- 	"errorWorkspaceConfigurationFileDirty": "파일이 변경되어 작업 영역 구성 파일에 쓸 수 없습니다. 저장하고 다시 시도하세요.",
-+<<<<<<< .our
- 	"openWorkspaceConfigurationFile": "작업 영역 구성 열기"
-+=======
-+	"openWorkspaceConfigurationFile": "작업 영역 구성 파일 열기",
-+	"close": "닫기"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 1c3c1cf318dae2f4a85b2bddce7f29366680009c i18n/ptb/extensions/git/out/autofetch.i18n.json
-  our    100644 00c05e0d65e0882e3be75520f80b85335bfeee15 i18n/ptb/extensions/git/out/autofetch.i18n.json
-  their  100644 5df527f070d346afba2e40468e55b4c12ce6cef6 i18n/ptb/extensions/git/out/autofetch.i18n.json
-@@ -7,7 +7,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"yes": "Sim",
-+	"read more": "Ler Mais",
- 	"no": "Não",
- 	"not now": "Pergunte-me depois",
-+<<<<<<< .our
- 	"suggest auto fetch": "Você gostaria que o Code [execute periodicamente o 'git fetch']({0})?"
-+=======
-+	"suggest auto fetch": "Você gostaria que o Code executasse periodicamente `git fetch`?"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 03a6223ad1dc3fa3e7fafa7e02188183242602fc i18n/ptb/extensions/git/out/commands.i18n.json
-  our    100644 614b7d0fe2aa5964fe65add6e8d1ab893a154db4 i18n/ptb/extensions/git/out/commands.i18n.json
-  their  100644 c75b803004751bec12b2b40a66553d8895b80237 i18n/ptb/extensions/git/out/commands.i18n.json
-@@ -68,12 +68,19 @@
- 	"pick remote pull repo": "Selecione um remoto para efeutar o pull da ramificação",
- 	"no remotes to push": "O seu repositório não possui remotos configurados para efetuar push.",
- 	"nobranch": "Por favor, faça checkout em um ramo para fazer push em um remoto.",
-+<<<<<<< .our
- 	"confirm publish branch": "O branch '{0}' não possui um branch superior. Você quer publicar este branch?",
- 	"ok": "OK",
- 	"push with tags success": "Envio de rótulos finalizado com sucesso.",
- 	"pick remote": "Pegue um  remoto para publicar o ramo '{0}':",
- 	"sync is unpredictable": "Esta ação vai empurrar e puxar commits de e para '{0}/{1}'.",
- 	"never again": "OK, Não Mostrar Novamente",
-+=======
-+	"ok": "OK",
-+	"push with tags success": "Envio de rótulos finalizado com sucesso.",
-+	"pick remote": "Pegue um  remoto para publicar o ramo '{0}':",
-+	"sync is unpredictable": "Esta ação vai fazer push e pull nos commits de e para '{0}'.",
-+>>>>>>> .their
- 	"no remotes to publish": "Seu repositório não possui remotos configurados para publicação.",
- 	"no changes stash": "Não há nenhuma mudança para esconder.",
- 	"provide stash message": "Opcionalmente forneça uma mensagem para esconder.",
-changed in both
-  base   100644 214c9e1d36f08c8508004ac99a370a4a0aac98f5 i18n/ptb/extensions/git/out/repository.i18n.json
-  our    100644 ee4b84c24042f8a1bb30756b849d017dd6de9b1e i18n/ptb/extensions/git/out/repository.i18n.json
-  their  100644 df6cf8fd75102fcff3ba16749971c925774c27c0 i18n/ptb/extensions/git/out/repository.i18n.json
-@@ -28,8 +28,12 @@
- 	"merge changes": "Mesclar Alterações",
- 	"staged changes": "Alterações em Etapas",
- 	"changes": "Alterações",
-+<<<<<<< .our
- 	"commitMessageCountdown": "{0} caracteres restantes na linha atual",
- 	"commitMessageWarning": "{0} caracteres sobre {1} na linha atual",
-+=======
-+	"ok": "OK",
-+>>>>>>> .their
- 	"neveragain": "Não mostrar novamente",
- 	"huge": "O repositório git em '{0}' tem muitas atualizações ativas, somente um subconjunto de funcionalidades do Git será habilitado."
- }
-\ No newline at end of file
-changed in both
-  base   100644 81db50ac04f6bd43a62124176541dbaf62a751f6 i18n/ptb/extensions/git/package.i18n.json
-  our    100644 6ab84324adbad521926986bc352591224f0e601f i18n/ptb/extensions/git/package.i18n.json
-  their  100644 d92673284f64184c0ce5eb14c29251bbf986c237 i18n/ptb/extensions/git/package.i18n.json
-added in both
-  our    100644 43bfcb4644a79d71f0381001a2872f48c763e21f i18n/ptb/extensions/typescript/out/commands.i18n.json
-  their  100644 01c9f9ae0d97df7568082a2eee2d90a7de8e0794 i18n/ptb/extensions/typescript/out/commands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -13,4 +14,20 @@
- 	"typescript.noJavaScriptProjectConfig": "O arquivo não é parte do projeto JavaScript. Clique [aqui]({0}) para mais informações.",
- 	"typescript.configureTsconfigQuickPick": "Configurar tsconfig.json",
- 	"typescript.configureJsconfigQuickPick": "Configurar jsconfig.json"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"typescript.projectConfigNoWorkspace": "Favor abrir uma pasta no VS Code para usar um projeto TypeScript ou JavaScript",
-+	"typescript.projectConfigUnsupportedFile": "Não foi possível determinar o projeto TypeScript ou JavaScript. Tipo de arquivo não suportado",
-+	"typescript.projectConfigCouldNotGetInfo": "Não foi possível determinar o projeto TypeScript ou JavaScript",
-+	"typescript.noTypeScriptProjectConfig": "Arquivo não é parte de um projeto TypeScript",
-+	"typescript.noJavaScriptProjectConfig": "Arquivo não é parte de um projeto JavaScript",
-+	"typescript.configureTsconfigQuickPick": "Configurar tsconfig.json",
-+	"typescript.configureJsconfigQuickPick": "Configurar jsconfig.json",
-+	"typescript.projectConfigLearnMore": "Saiba Mais"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 750d811d866eaa3d43818bd1d8e28c9898acf514 i18n/ptb/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-  their  100644 ed15423097d5cbb03aeb8c474db3877ca0d1584f i18n/ptb/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"selectAriaOption": "{0}"
- }
-\ No newline at end of file
-added in both
-  our    100644 0e0f9b95d0edd6dc40d681d7546a779f946426db i18n/ptb/src/vs/base/node/ps.i18n.json
-  their  100644 e8b9b91a595a2dff9f06115e9c4fae55fbbd1b8d i18n/ptb/src/vs/base/node/ps.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"collecting": "Coletando informações de CPU e memória. Isso pode demorar alguns segundos."
- }
-\ No newline at end of file
-changed in both
-  base   100644 52ffce48a73d152ac7b3fed7adaa27517ed61e3d i18n/ptb/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 6c41dd22a5af7308ee2eafe191d717bc6243ff1f i18n/ptb/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 3e9436d02bf817fc555ccdb3a8af651d3c3b9c74 i18n/ptb/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -16,6 +16,10 @@
- 	"lineNumbers.on": "Números de linhas são renderizados em números absolutos.",
- 	"lineNumbers.relative": "Números de linhas são renderizadas como distância em linhas até a posição do cursor.",
- 	"lineNumbers.interval": "Números de linhas são renderizados a cada 10 linhas.",
-+<<<<<<< .our
-+=======
-+	"lineNumbers": "Controla a exibição dos números de linha. Os valores possíveis são 'on', 'off', 'relative' e 'interval'.",
-+>>>>>>> .their
- 	"rulers": "Renderiza réguas verticais após um certo número de caracteres de espaço. Use vários valores para várias réguas. Réguas não serão desenhadas se a matriz estiver vazia",
- 	"wordSeparators": "Caracteres que serão usados como separadores de palavras ao fazer navegação relacionada a palavras ou operações",
- 	"tabSize": "O número de espaços equivalentes a uma tabulação. Esta configuração é sobreposta com base no conteúdo do arquivo quando `editor.detectIndentation` está ligado.",
-@@ -78,7 +82,11 @@
- 	"cursorBlinking": "Controla o estilo de animação do cursor.",
- 	"mouseWheelZoom": "Alterar o zoom da fonte editor quando utilizada a roda do mouse e pressionando Ctrl",
- 	"cursorStyle": "Controla o estilo do cursor, os valores aceitos são 'block', 'block-outline', 'line', 'line-thin', 'underline' e 'underline-thin'",
-+<<<<<<< .our
- 	"cursorWidth": "Controla a largura do cursor quando editor.cursorStyle está definido como 'line'",
-+=======
-+	"lineCursorWidth": "Controla a largura do cursor quando editor.cursorStyle está definido como 'line'",
-+>>>>>>> .their
- 	"fontLigatures": "Habilita ligaduras de fontes",
- 	"hideCursorInOverviewRuler": "Controla se o cursor deve ficar oculto na régua de visão geral.",
- 	"renderWhitespace": "Controla como o editor deve rendenizar caracteres de espaços em branco, possibilidades são 'none', 'boundary' e 'all'. A opção 'boundary' não rendeniza espaços simples entre palavras.",
-changed in both
-  base   100644 434fe65993d9b4ecc14018b297b3c72b70a49c24 i18n/ptb/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 94d4e2ad2eeafdadb40b9a7361c52cda20aa5187 i18n/ptb/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 5134c6e6945eac669197770b3357f78dab5c83b1 i18n/ptb/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -8,8 +8,11 @@
- 	],
- 	"lineHighlight": "Cor de fundo para a posição do cursor  na seleção de linhas.",
- 	"lineHighlightBorderBox": "Cor de fundo para a borda em volta da linha na posição do cursor",
-+<<<<<<< .our
- 	"rangeHighlight": "Cor de fundo dos intervalos selecionados, assim como da abertura instantânea e localização de recursos. A cor não deve ser opaca para evitar esconder as decorações subjacentes",
- 	"rangeHighlightBorder": "Cor de fundo para a borda em volta do intervalo destacado.",
-+=======
-+>>>>>>> .their
- 	"caret": "Cor do cursor no editor.",
- 	"editorCursorBackground": "A cor de fundo do cursor do editor. Permite customizar a cor de um caractere sobreposto pelo bloco do cursor.",
- 	"editorWhitespaces": "Cor dos caracteres em branco no editor",
-changed in both
-  base   100644 d05aeee6c34a13b81b7adcfba031b88757f57331 i18n/ptb/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  our    100644 517488c6efedf7334bd0de67d967b57d25fa5312 i18n/ptb/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  their  100644 e6fba46dfd7c9d35d40b005547b29ac347881f0d i18n/ptb/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -9,4 +10,11 @@
- 	"markerAction.next.label": "Ir para o Próximo Problema (Erro, Aviso, Informação)",
- 	"markerAction.previous.label": "Ir para o Problema Anterior (Erro, Aviso, Informação)",
- 	"markerAction.nextInFiles.label": "Ir para Próximo Problema nos Aquivos (Erro, Aviso, Info)"
-+=======
-+	"title.wo_source": "({0}/{1})",
-+	"editorMarkerNavigationError": "Ferramenta de marcação de edição apresentando error na cor ",
-+	"editorMarkerNavigationWarning": "Ferramenta de marcação de edição apresentando adventência na cor",
-+	"editorMarkerNavigationInfo": "Cor de informação da ferramenta de navegação do marcador do editor.",
-+	"editorMarkerNavigationBackground": "Cor de fundo da ferramenta de marcação de navegação do editor."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6ccc873b02c525f36b274892c1587125f6f8687a i18n/ptb/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  our    100644 1c858bde51cdbd3b27000ce6a2b87452b5ad125f i18n/ptb/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  their  100644 99acb12e285a8c2b521bba90e6efa4e94212b58b i18n/ptb/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,12 @@
- 	"wordHighlightStrongBorder": "Cor de fundo de um símbolo durante acesso de escrita, como ao escrever uma variável.",
- 	"overviewRulerWordHighlightForeground": "Visão geral da cor do marcador da régua para destaques de símbolos. A cor não deve ser opaca para não esconder decorações subjacentes.",
- 	"overviewRulerWordHighlightStrongForeground": "Visão geral da cor do marcador da régua para destaques de símbolos de acesso de escrita. A cor não deve ser opaca para não esconder decorações subjacentes.",
-+=======
-+	"wordHighlight": "Cor de fundo de um símbolo durante o acesso de leitura, como ao ler uma variável. A cor não deve ser opaca para não ocultar as decorações subjacentes.",
-+	"wordHighlightStrong": "Cor de fundo de um símbolo durante o acesso de escrita, como ao escrever uma variável. A cor não deve ser opaca para não ocultar as decorações subjacentes.",
-+	"overviewRulerWordHighlightForeground": "Visão geral da cor do marcador da régua para destaques de símbolos.",
-+	"overviewRulerWordHighlightStrongForeground": "Visão geral da cor do marcador da régua para gravação de destaques de símbolos.",
-+>>>>>>> .their
- 	"wordHighlight.next.label": "Ir para o próximo símbolo em destaque",
- 	"wordHighlight.previous.label": "Ir para o símbolo de destaque anterior"
- }
-\ No newline at end of file
-changed in both
-  base   100644 28adcb870653d4e3ae4406b036a344f8ed678e46 i18n/ptb/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  our    100644 2aa222eaf70279b60b151ccffab51a1ed5b7a7ab i18n/ptb/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  their  100644 5ade9a9290cd57c4001dbf09c55d2173113b8182 i18n/ptb/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 ed9e5aca99ca21666c8f46c0690781a42cad37c6 i18n/ptb/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 a3aea9d9c8c0805d0052884c40ebb83b3447e311 i18n/ptb/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 e056838d01991d7878a55297a08ccd1179a6bdfa i18n/ptb/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,11 +10,19 @@
- 	"diff": "Comparar dois arquivos entre si.",
- 	"add": "Adicione pasta(s) para a última janela ativa.",
- 	"goto": "Abra um arquivo no caminho sobre a linha especificada e a posição do caractere.",
-+<<<<<<< .our
- 	"newWindow": "Obriga a abrir uma nova janela.",
- 	"reuseWindow": "Obriga a abrir um arquivo ou pasta na última janela ativa.",
- 	"wait": "Espere pelos arquivos a serem fechados antes de retornar.",
- 	"locale": "Para localização utilize (ex. en-US ou zh-TW).",
- 	"userDataDir": "Especifica o diretório em que os dados do usuário são mantidos. Pode ser usado para abrir várias instâncias distintas do Code.",
-+=======
-+	"newWindow": "Força uma nova instância do Código.",
-+	"reuseWindow": "Forçar a abertura de um arquivo ou pasta na última janela ativa",
-+	"wait": "Espere pelos arquivos a serem fechados antes de retornar.",
-+	"locale": "Para localização utilize (ex. en-US ou zh-TW).",
-+	"userDataDir": "Especifica o diretório que os dados do usuário serão mantidos, útil quando estiver rodando como root.",
-+>>>>>>> .their
- 	"version": "Versão de impressão",
- 	"help": "Uso de impressão.",
- 	"extensionHomePath": "Defina o caminho raíz para as extensões.",
-@@ -22,18 +30,28 @@
- 	"showVersions": "Exibir versões de extensões instaladas, quando estiver usando --list-extension",
- 	"installExtension": "Instala uma extensão.",
- 	"uninstallExtension": "Desinstala uma extensão.",
-+<<<<<<< .our
- 	"experimentalApis": "Habilita recursos propostos a API para uma extensão.",
-+=======
-+	"experimentalApis": "Permite recursos de api propostos para uma extensão.",
-+>>>>>>> .their
- 	"verbose": "Imprimir a saída detalhada (Implica -- esperar).",
- 	"log": "Nível de log a ser utilizado. O padrão é 'info'. Os valores permitidos são 'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off'.",
- 	"status": "Utilização do processo de impressão e informações de diagnóstico.",
- 	"performance": "Comece com o 'Desenvolvedor: Desempenho de inicialização' comando habilitado.",
- 	"prof-startup": "Rodar o CPU profiler durante a inicialização",
- 	"disableExtensions": "Desabilita todas as extensões instaladas.",
-+<<<<<<< .our
- 	"inspect-extensions": "Permite a depuração e profiling de extensões. Verifique as ferramentas de desenvolvedor para obter o URI da conexão.",
- 	"inspect-brk-extensions": "Permite a depuração e profiling de extensões com o host de extensão sendo pausado após o início. Verifique as ferramentas de desenvolvedor para obter o URI da conexão.",
- 	"disableGPU": "Desabilita aceleração de hardware via GPU.",
- 	"uploadLogs": "Envia os registros de atividade da sessão atual para um destino seguro.",
- 	"maxMemory": "Tamanho máximo de memória para uma janela (em Mbytes).",
-+=======
-+	"inspect-extensions": "Permite depuração e criação de perfis de extensões. Verifique as ferramentas de desenvolvimento para a conexão uri.",
-+	"inspect-brk-extensions": "Permitir depuração e criação de perfil de extensões com o host de extensão em pausa após o início. Verifique as ferramentas do desenvolvedor para a conexão uri.",
-+	"disableGPU": "Desabilita aceleração de hardware da GPU.",
-+>>>>>>> .their
- 	"usage": "Uso",
- 	"options": "opções",
- 	"paths": "caminhos",
-changed in both
-  base   100644 98c0be5cdcba42bc256b1b304f3886d6898a0abc i18n/ptb/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 69dfaa48d2b66f351d8413f62573d04c105f2c85 i18n/ptb/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 4fe84adc13b1a146d56e91d6e36f6e80c08c3677 i18n/ptb/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -7,12 +7,16 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"invalidManifest": "Extensão inválida: pacote.json nao é um arquivo JSON válido",
-+<<<<<<< .our
- 	"incompatible": "Não é possível instalar a Extensão '{0}' que não é compatível com o Code '{1}'.",
-+=======
-+>>>>>>> .their
- 	"restartCode": "Por favor reinicie Code antes de reinstalar {0}.",
- 	"installingOutdatedExtension": "Uma nova versão desta extensão já está instalada. Você deseja sobrescrever esta instalação com a versão mais antiga?",
- 	"override": "Sobrescrever",
- 	"cancel": "Cancelar",
- 	"errorInstallingDependencies": "Erro ao instalar dependências. {0}",
-+<<<<<<< .our
- 	"MarketPlaceDisabled": "Loja não está habilitada.",
- 	"removeError": "Erro ao remover a extensão: {0}. por favor, Saia e Inicie o VS Code antes de tentar novamente.",
- 	"Not a Marketplace extension": "Somente Extensões da Loja podem ser reinstaladas",
-@@ -22,6 +26,12 @@
- 	"quitCode": "Não foi possível instalar a extensão. Por favor, saia e reinicie o VS Code antes de reinstalar.",
- 	"exitCode": "Não foi possível instalar a extensão. Por favor, saia e reinicie o VS Code antes de reinstalar.",
- 	"renameError": "Erro desconhecido ao renomear {0} para {1}",
-+=======
-+	"notFoundCompatible": "Não foi possível instalar '{0}; não existe nenhuma versão compatível com o VSCode '{1}'.",
-+	"notFoundCompatibleDependency": "Não foi possível instalar porque a extensão dependente '{0}' compatível com a versão atual '{1}' do VS Code não foi encontrada.",
-+	"quitCode": "Não foi possível instalar a extensão. Por favor, saia e reinicie o VS Code antes de reinstalar.",
-+	"exitCode": "Não foi possível instalar a extensão. Por favor, saia e reinicie o VS Code antes de reinstalar.",
-+>>>>>>> .their
- 	"uninstallDependeciesConfirmation": "Gostaria de desinstalar '{0}' somente, ou suas dependências também?",
- 	"uninstallOnly": "Somente Extensão",
- 	"uninstallAll": "Desinstalar Tudo",
-changed in both
-  base   100644 620c63edd0712ec1f8e8ed3fd061052a203859db i18n/ptb/src/vs/platform/message/common/message.i18n.json
-  our    100644 c464e8e6468d6dd5a8aa69855b8084ea3e7674b0 i18n/ptb/src/vs/platform/message/common/message.i18n.json
-  their  100644 0d24937956e242f5314fd3ff6693f9cafad48fbd i18n/ptb/src/vs/platform/message/common/message.i18n.json
-changed in both
-  base   100644 6f399a88a062458966ee84c4fa6ba3fd75c261c6 i18n/ptb/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 260c1b4a3e4eca5d178e7a38ec6a34692e2a3d10 i18n/ptb/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 635a04864dac99ea99fe504d8e870cc79fded8fa i18n/ptb/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -64,6 +64,7 @@
- 	"editorSelectionBackground": "Cor de seleção do editor.",
- 	"editorSelectionForeground": "Cor do texto selecionado para alto contraste.",
- 	"editorInactiveSelection": "Cor da seleção em um editor inativo. A cor não deve ser opaca para não esconder decorações subjacentes.",
-+<<<<<<< .our
- 	"editorSelectionHighlight": "Cor para regiões com o mesmo conteúdo da seleção. A cor não deve ser opaca para não esconder decorações subjacentes.",
- 	"editorSelectionHighlightBorder": "Cor da borda para regiões com o mesmo conteúdo da seleção.",
- 	"editorFindMatch": "Cor da correspondência de pesquisa atual.",
-@@ -72,6 +73,9 @@
- 	"findMatchHighlightBorder": "Cor da borda dos outros resultados de pesquisa.",
- 	"findRangeHighlightBorder": "Cor da borda da faixa limitando a pesquisa. A cor não deve ser opaca para não esconder decorações subjacentes.",
- 	"hoverHighlight": "Destaque abaixo da palavra para qual um flutuador é mostrado. A cor não deve ser opaca para não esconder decorações subjacentes.",
-+=======
-+	"editorFindMatch": "Cor da correspondência de pesquisa atual.",
-+>>>>>>> .their
- 	"hoverBackground": "Cor de fundo para o item flutuante do editor",
- 	"hoverBorder": "Cor da borda para o item flutuante do editor.",
- 	"activeLinkForeground": "Cor dos links ativos.",
-@@ -79,11 +83,14 @@
- 	"diffEditorRemoved": "Cor de fundo para o texto que foi removido. A cor não deve ser opaca para não esconder as decorações subjacentes.",
- 	"diffEditorInsertedOutline": "Cor de contorno para o texto que foi inserido.",
- 	"diffEditorRemovedOutline": "Cor de contorno para o texto que foi removido.",
-+<<<<<<< .our
- 	"mergeCurrentHeaderBackground": "Fundo do cabeçalho atual em conflitos de merge inline. A cor não deve ser opaca para não esconder decorações subjacentes.",
- 	"mergeCurrentContentBackground": "Fundo do conteúdo atual em conflitos de merge inline. A cor não deve ser opaca para não esconder decorações subjacentes.",
- 	"mergeIncomingHeaderBackground": "Fundo do cabeçalho entrante em conflitos de merge inline. A cor não deve ser opaca para não esconder decorações subjacentes.",
- 	"mergeIncomingContentBackground": "Fundo do conteúdo entrante em conflitos de merge inline. A cor não deve ser opaca para não esconder decorações subjacentes.",
- 	"mergeCommonHeaderBackground": "Fundo comum do cabeçalho antepassado em conflitos de merge inline. A cor não deve ser opaca para não esconder decorações subjacentes.",
-+=======
-+>>>>>>> .their
- 	"mergeBorder": "Cor da borda dos cabeçalhos e separadores estão em conflito de mesclagem em linha.",
- 	"overviewRulerCurrentContentForeground": "Cor de fundo de régua de visuaização atual em conflito de mesclagem em linha.",
- 	"overviewRulerIncomingContentForeground": "Cor de fundo de régua de visuaização de entrada em conflito de mesclagem em linha.",
-added in both
-  our    100644 bc8cba57378baaa6f56bf615b25d25924d3fc6bd i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 d2677dfdc5bb12f42952f80c2bb038263388db27 i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"saveParticipants": "Executando Salvamento de Participantes..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 d5ca67a93536092670de28815cfbc255646ab541 i18n/ptb/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  our    100644 fdc114a3fe784668b6e07f90806247b6f632760b i18n/ptb/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  their  100644 a2c9cbd217b120f8d5a7394ccc7792bc346a7d2f i18n/ptb/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,7 @@
- 	],
- 	"treeView.notRegistered": "Nenhuma visualização de árvore com id '{0}' registrado.",
- 	"treeView.duplicateElement": "Elemento com id {0} já está registrado"
-+=======
-+	"treeView.notRegistered": "Nenhuma visualização de árvore com id '{0}' registrado."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 18546fb98ab625419dd84bac49ca35f309af3013 i18n/ptb/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 c0131be8c0f47591731287a576edb83735664081 i18n/ptb/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 84f170bd32cdf44ccc40d883dd19f0fcc17151b1 i18n/ptb/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -14,5 +14,10 @@
- 	"save": "&&Salvar",
- 	"saveWorkspace": "Salvar o espaço de trabalho",
- 	"openWorkspaceAction": "Abrir o Espaço de Trabalho...",
-+<<<<<<< .our
- 	"openWorkspaceConfigFile": "Abrir o Arquivo de Configuração do Espaço de Trabalho"
-+=======
-+	"openWorkspaceConfigFile": "Abrir o Arquivo de Configuração do Espaço de Trabalho",
-+	"openFolderAsWorkspaceInNewWindow": "Abrir a pasta como espaço de trabalho em nova janela"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 2ea045e264ea8c57f7acbaf1332256e858eb5741 i18n/ptb/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-  their  100644 fdb629550fd654b577693a6edfff709633cff317 i18n/ptb/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,4 +11,15 @@
- 	"add": "&&Adicionar",
- 	"addFolderToWorkspaceTitle": "Adicionar pasta ao espaço de trabalho",
- 	"workspaceFolderPickerPlaceholder": "Selecione a pasta do espaço de trabalho"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"addFolderToWorkspace": "Adicionar pasta ao espaço de trabalho...",
-+	"add": "&&Adicionar",
-+	"addFolderToWorkspaceTitle": "Adicionar pasta ao espaço de trabalho"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d1d8a425227b67eb3258b7844077d91f032f4f0d i18n/ptb/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  our    100644 3991d555141b86ae4264c724195d522ff4374831 i18n/ptb/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  their  100644 c1dd3fcfe9b93d4826601a319a92daa27bd50f2b i18n/ptb/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-@@ -19,6 +19,7 @@
- 	"close": "Fechar",
- 	"closeOthers": "Fechar Outros",
- 	"closeRight": "Fechar à direita",
-+<<<<<<< .our
- 	"closeAllSaved": "Fechar Salvos",
- 	"closeAll": "Fechar todos",
- 	"keepOpen": "Manter aberto",
-@@ -27,6 +28,15 @@
- 	"keepEditor": "Manter editor",
- 	"closeEditorsInGroup": "Fechar todos editores no grupo",
- 	"closeSavedEditors": "Fechar Editores Salvos em Grupo",
-+=======
-+	"closeAllUnmodified": "Fechar Não Modificados",
-+	"closeAll": "Fechar todos",
-+	"keepOpen": "Manter aberto",
-+	"showOpenedEditors": "Mostrar editores abertos",
-+	"keepEditor": "Manter editor",
-+	"closeEditorsInGroup": "Fechar todos editores no grupo",
-+	"closeUnmodifiedEditors": "Fechar os Editores Não Modificados no Grupo",
-+>>>>>>> .their
- 	"closeOtherEditors": "Fechar outros editores",
- 	"closeRightEditors": "Fechar editores à direita"
- }
-\ No newline at end of file
-changed in both
-  base   100644 5035a541040ce6ae31f3941ef00602526e12b871 i18n/ptb/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 8f7c2c323736446313384ee58a6648f36e7ab418 i18n/ptb/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 fce09f85b3db21d1c0859265ce9134c5d6e10e5f i18n/ptb/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 4b701929e85abf85c5c763f3274b30264cccf824 i18n/ptb/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  our    100644 126b3f4b4ed18dcdc7c7251ffc1ac28fb448f98a i18n/ptb/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  their  100644 550e345a27faa202343756a8937cd227509cf285 i18n/ptb/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-changed in both
-  base   100644 8af2aff62d5e24ad58816935b949dd546f2e3617 i18n/ptb/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  our    100644 05ac26584d42e4613fb9b74a470b82911e4b24de i18n/ptb/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  their  100644 1e1fde93df03c54842da28a1c37bc8cd079e0ea1 i18n/ptb/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-changed in both
-  base   100644 aafa87dc9bf2f2941d23620c8a8e08c4e2314c76 i18n/ptb/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  our    100644 4b815cd265aa330a6810a981084def6208c7decf i18n/ptb/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  their  100644 b78b8688cfdbfc18491f7eb77be147bb0830f9de i18n/ptb/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"close": "Fechar",
-+>>>>>>> .their
- 	"araLabelEditorActions": "Ações de editor"
- }
-\ No newline at end of file
-changed in both
-  base   100644 1c3db4d572b5064d3259de8d01bbaf6430ac25e8 i18n/ptb/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
-  our    100644 55c41655d21480208ae148096b6d57f5c14ec886 i18n/ptb/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
-  their  100644 4c843f96e0832e078c9bbb849a07e9d5eff1a607 i18n/ptb/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
-changed in both
-  base   100644 0ed9a7f544708c7e144aa2f65dd3da58d988aa2b i18n/ptb/src/vs/workbench/common/theme.i18n.json
-  our    100644 431c9c090b931f212ddb987a19512fdc507d3bd6 i18n/ptb/src/vs/workbench/common/theme.i18n.json
-  their  100644 b8e2f1b3570606f36287385a24c88e42c2faf90f i18n/ptb/src/vs/workbench/common/theme.i18n.json
-@@ -11,6 +11,11 @@
- 	"tabHoverBackground": "Cor de fundo da guia ao passar o mouse. As guias são os contêineres para editores na área do editor. Várias guias podem ser abertas em um grupo de editor. Podem existir vários grupos de editor.",
- 	"tabUnfocusedHoverBackground": "Cor de fundo da guia em um grupo fora de foco ao passar o mouse. As guias são os contêineres para editores na área do editor. Várias guias podem ser abertas em um grupo de editor. Podem existir vários grupos de editor.",
- 	"tabBorder": "Borda para separar uma guia das outras. As guias são os recipientes para editores na área do editor. Várias guias podem ser abertas em um grupo de editores. Podem haver vários grupos de editor.",
-+<<<<<<< .our
-+=======
-+	"tabActiveBorder": "Borda para destacar guias ativas. As guias são os recipientes para editores na área do editor. Várias guias podem ser abertas em um grupo de editores. Podem haver vários grupos de editores.",
-+	"tabActiveUnfocusedBorder": "Borda para destacar guias ativas em um grupo fora de foco. As guias são os recipientes para editores na área do editor. Várias guias podem ser abertas em um grupo de editores. Podem haver vários grupos de editores.",
-+>>>>>>> .their
- 	"tabHoverBorder": "Borda para destacar guias ao passar o mouse. As guias são os contêineres para editores na área do editor. Várias guias podem ser abertas em um grupo de editor. Podem existir vários grupos de editor.",
- 	"tabUnfocusedHoverBorder": "Borda para destacar guias em um grupo fora de foco ao passar o mouse. As guias são os contêineres para editores na área do editor. Várias guias podem ser abertas em um grupo de editor. Podem existir vários grupos de editor.",
- 	"tabActiveForeground": "Cor de primeiro plano da guia ativa em um grupo ativo. As guias são os recipientes para editores na área do editor. Várias guias podem ser abertas em um grupo de editores. Podem haver vários grupos de editor.",
-added in both
-  our    100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ptb/src/vs/workbench/common/views.i18n.json
-  their  100644 b7201e3d4af00fde6454ac604c45a33b472baf05 i18n/ptb/src/vs/workbench/common/views.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,4 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	]
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"duplicateId": "Uma exibição com id '{0}' já está registrada na localização '{1}'"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 67b112045f5d9d5106f2f5fb7edeb28a179c9d19 i18n/ptb/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 62b4a14f179ce17a8ef358da83ed726d39cdb13f i18n/ptb/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 44851d18637a50f93333fd36fe7aeb81f5f5349d i18n/ptb/src/vs/workbench/electron-browser/actions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"closeWindow": "Fechar Janela",
- 	"closeWorkspace": "Fechar o espaço de trabalho",
- 	"noWorkspaceOpened": "Não há nenhum espaço de trabalho aberto nessa instância para ser fechado.",
-@@ -50,6 +53,14 @@
- 	"moveWindowTabToNewWindow": "Mover a guia da janela para a nova janela",
- 	"mergeAllWindowTabs": "Mesclar todas as janelas",
- 	"toggleWindowTabsBar": "Alternar a Barra de Guias da Janela",
-+<<<<<<< .our
- 	"about": "Sobre {0}",
- 	"inspect context keys": "Inspecionar Chaves de Contexto"
-+=======
-+	"configureLocale": "Configurar Idioma",
-+	"displayLanguage": "Define o idioma de exibição do VSCode.",
-+	"doc": "Veja {0} para obter uma lista dos idiomas suportados.",
-+	"restart": "Modificar o valor requer reinicialização do VSCode.",
-+	"fail.createSettings": "Não foi possível criar '{0}' ({1})."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 06f44d416ff2bae86eeae9973f09930ad34e5772 i18n/ptb/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 15dd21d37a31b843a88f5eb322486062a4b034bf i18n/ptb/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 fc80fefdfe6e0c2cf48e10635b00156b6efd64fd i18n/ptb/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,12 +35,19 @@
- 	"panelDefaultLocation": "Controla o local padrão do painel. Pode ser visualizado na parte inferior ou no lado direito da área de trabalho.",
- 	"statusBarVisibility": "Controla a visibilidade da barra de status na parte inferior da área de trabalho.",
- 	"activityBarVisibility": "Controla a visibilidade da barra de atividades na área de trabalho.",
-+<<<<<<< .our
- 	"viewVisibility": "Controla a visibilidade das ações do cabeçalho de exibição. Ações de cabeçalho de exibição podem ser sempre visíveis ou somente visíveis quando a exibição tiver o foco ou quando passar o mouse.",
- 	"fontAliasing": "Controla o método de aliasing da fonte na área de trabalho.\n- default: Suavização de fonte por Sub-pixel. Na maioria das telas não-retina, este fornecerá o texto mais nítido\n- antialiased: Suavização da fontes no nível do pixel, oposto ao subpixel. Pode fazer a fonte parecer mais fina/clara no geral.\n- none: Desabilita a suavização de fonte. O texto será mostrado com bordas pixeladas.\n- auto: Aplica `default` ou `antialiased` automaticamente baseado no DPI das telas.",
- 	"workbench.fontAliasing.default": "Suavização de fonte subpixel. Na maioria dos monitores não-retina isto mostrará o texto mais nítido.",
- 	"workbench.fontAliasing.antialiased": "Suavizar a fonte no nível do pixel, em oposição a subpixel. Pode fazer com que a fonte apareça mais clara de uma forma geral.",
- 	"workbench.fontAliasing.none": "Desabilita a suavização de fonte. Texto será mostrado com bordas irregulares.",
- 	"workbench.fontAliasing.auto": "Aplica `default` ou `antialiased` automaticamente, baseado no DPI das telas.",
-+=======
-+	"fontAliasing": "Controla o método de identificação de fonte no espaço de trabalho.\n- padrão: Suavização de fonte subpixel. Na maioria dos monitores não-retina isto mostrará o texto mais nítido\n- antialiased: Suaviza a fonte no nível do pixel, em oposição a subpixel. Pode fazer a fonte aparecer mais clara de um modo geral \n- nenhum: Desabilita a suavização de fonte. Texto será mostrado com bordas irregulares",
-+	"workbench.fontAliasing.default": "Suavização de fonte subpixel. Na maioria dos monitores não-retina isto mostrará o texto mais nítido.",
-+	"workbench.fontAliasing.antialiased": "Suavizar a fonte no nível do pixel, em oposição a subpixel. Pode fazer com que a fonte apareça mais clara de uma forma geral.",
-+	"workbench.fontAliasing.none": "Desabilita a suavização de fonte. Texto será mostrado com bordas irregulares.",
-+>>>>>>> .their
- 	"enableNaturalLanguageSettingsSearch": "Controla se deve habilitar o modo de busca de linguagem natural para as configurações.",
- 	"windowConfigurationTitle": "Janela",
- 	"window.openFilesInNewWindow.on": "Arquivos serão abertos em uma nova janela",
-changed in both
-  base   100644 8a03ff87882eac824ec8cf3828aed006658a3411 i18n/ptb/src/vs/workbench/electron-browser/window.i18n.json
-  our    100644 676a0758385e0e41de8ed3de00c9c63bab54ddb0 i18n/ptb/src/vs/workbench/electron-browser/window.i18n.json
-  their  100644 3bb18871ba8aa4981651373180d9c51762a264b9 i18n/ptb/src/vs/workbench/electron-browser/window.i18n.json
-changed in both
-  base   100644 421e5b19c79c48f393096b4c2b57c679964447d3 i18n/ptb/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
-  our    100644 7cf5bc7303c6a9d45f4165db9620196970de5e97 i18n/ptb/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
-  their  100644 05dd117d6de11c1b4deca263c7e52a29cb37c1fb i18n/ptb/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"debugToolBarBackground": "Cor de fundo da barra de ferramentas de depuração.",
- 	"debugToolBarBorder": "Cor da borda da barra de ferramentas de depuração."
- }
-\ No newline at end of file
-changed in both
-  base   100644 898a18605fbc3836ec3ae70dcdd6ac489fc138bf i18n/ptb/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  our    100644 53b616809b4df15fc5f76746da24f19a323e0ef3 i18n/ptb/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  their  100644 68ea94e5a20f7f2c52acee807a6d7d7df1fa120e i18n/ptb/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"debug.terminal.title": "depurado"
- }
-\ No newline at end of file
-changed in both
-  base   100644 548fff57edc7ad5c846c14754364e6b302202573 i18n/ptb/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  our    100644 6af6df4d31287b541ed6cc10af679c34b7abac5e i18n/ptb/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  their  100644 21d5f668ec9ca993dd9860e291a6b5eea5f1a891 i18n/ptb/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-changed in both
-  base   100644 b4f99cdf7467985c20dc66e8264976ec3719723f i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 ddb9ffa28f8d3daf13de0c0b7197d8da53424c16 i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 be1060230617b1f08e54c7e9474c56257cb4d309 i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,11 @@
- 	"exeBasedRecommendation": "Esta extensão é recomendada porque você tem {0} instalado.",
- 	"fileBasedRecommendation": "Esta extensão é recomendada baseada nos arquivos que você abriu recentemente.",
- 	"workspaceRecommendation": "Esta extensão é recomendada pelos usuários da área de trabalho atual.",
-+=======
-+	"workspaceRecommendation": "Esta extensão é recomendada pelos usuários da área de trabalho atual.",
-+	"fileBasedRecommendation": "Esta extensão é recomendada baseada nos arquivos que você abriu recentemente.",
-+	"exeBasedRecommendation": "Esta extensão é recomendada porque você tem {0} instalado.",
-+>>>>>>> .their
- 	"reallyRecommended2": "A extensão {0} é recomendada para este tipo de arquivo.",
- 	"reallyRecommendedExtensionPack": "O pacote de extensão '{0}' é recomendado para este tipo de arquivo.",
- 	"install": "Instalar",
-added in both
-  our    100644 48850302ad7edf1afdb12f5f0594b61795bf80af i18n/ptb/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-  their  100644 254a1e7b5f11f31ab34b7a65e8ca88d4dd6492a4 i18n/ptb/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,13 @@
- 	],
- 	"workbenchConfigurationTitle": "Área de Trabalho",
- 	"feedbackVisibility": "Controla a visibilidade do feedback no Twitter (smiley) na barra de status na região inferior da área de trabalho."
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"workbenchConfigurationTitle": "Área de Trabalho"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 ad2caa896d3e0225c45812b0baff3ede0c7a94fc i18n/ptb/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-  their  100644 afb315a42d434674bd0f918e90ac2b4896f61b06 i18n/ptb/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"hide": "Ocultar"
- }
-\ No newline at end of file
-changed in both
-  base   100644 464da97e4e947785f5bb671924b8aff5c7abe604 i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  our    100644 e1ba064de6a7f4fbc32dc59666be04570de2a9fe i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  their  100644 1ebe014543ed4649ec87705e2f8428817c4afe74 i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-@@ -12,7 +12,10 @@
- 	"revertLocalChanges": "Descartar as alterações e reverter para o conteúdo no disco",
- 	"copyPathOfActive": "Copiar Caminho do Arquivo Ativo",
- 	"saveAllInGroup": "Salvar Todos no Grupo",
-+<<<<<<< .our
- 	"saveFiles": "Salvar todos os arquivos",
-+=======
-+>>>>>>> .their
- 	"revert": "Reverter Arquivo",
- 	"compareActiveWithSaved": "Comparar o Arquivo Ativo com o Arquivo Salvo",
- 	"closeEditor": "Fechar Editor",
-@@ -26,10 +29,16 @@
- 	"compareWithSaved": "Comparar com o salvo",
- 	"compareWithSelected": "Comparar com o Selecionado",
- 	"compareSource": "Selecione para comparar",
-+<<<<<<< .our
- 	"compareSelected": "Comparar Selecionado",
- 	"close": "Fechar",
- 	"closeOthers": "Fechar Outros",
- 	"closeSaved": "Fechar Salvo",
-+=======
-+	"close": "Fechar",
-+	"closeOthers": "Fechar Outros",
-+	"closeUnmodified": "Fechar Não Modificados",
-+>>>>>>> .their
- 	"closeAll": "Fechar todos",
- 	"deleteFile": "Excluir permanentemente"
- }
-\ No newline at end of file
-changed in both
-  base   100644 18ed68af70c5f2e01c8a8cca58fd7ca34cfd3cad i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 6f4dc9047cdb115e21fc423b4a6eca5180a2ad01 i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 48ba3f85e8c5f768f5aef3005174e595983bb356 i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"newFile": "Novo Arquivo",
- 	"newFolder": "Nova Pasta",
- 	"rename": "Renomear",
-@@ -13,6 +16,10 @@
- 	"copyFile": "Copiar",
- 	"pasteFile": "Colar",
- 	"retry": "Tentar novamente",
-+<<<<<<< .our
-+=======
-+	"openFolderFirst": "Abrir uma pasta primeiro para criar arquivos ou pastas dentro dele.",
-+>>>>>>> .their
- 	"newUntitledFile": "Novo Arquivo Sem Título",
- 	"createNewFile": "Novo Arquivo",
- 	"createNewFolder": "Nova Pasta",
-@@ -34,9 +41,18 @@
- 	"confirmDeleteMessageMultiple": "Você tem certeza que deseja excluir permanentemente os seguintes {0} arquivos?",
- 	"confirmDeleteMessageFolder": "Tem certeza de que deseja excluir permanentemente '{0}' e seu conteúdo?",
- 	"confirmDeleteMessageFile": "Tem certeza de que deseja excluir permanentemente '{0}'?",
-+<<<<<<< .our
- 	"confirmOverwrite": "Um arquivo ou pasta com o mesmo nome já existe na pasta de destino. Você quer substituí-lo?",
- 	"replaceButtonLabel": "&&Substituir",
- 	"fileDeleted": "Arquivo para colar foi excluído ou movido no meio-tempo",
-+=======
-+	"irreversible": "Esta ação é irreversível!",
-+	"permDelete": "Excluir permanentemente",
-+	"importFiles": "Importar Arquivos",
-+	"confirmOverwrite": "Um arquivo ou pasta com o mesmo nome já existe na pasta de destino. Você quer substituí-lo?",
-+	"replaceButtonLabel": "&&Substituir",
-+	"fileIsAncestor": "Arquivo a ser copiado é um ancestral da pasta de destino.",
-+>>>>>>> .their
- 	"duplicateFile": "Duplicar",
- 	"globalCompareFile": "Compare o Arquivo Ativo Com...",
- 	"openFileToCompare": "Abrir um arquivo primeiro para compará-lo com outro arquivo.",
-changed in both
-  base   100644 2e61a1656c803409140a862fc3f46f08664243ef i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  our    100644 da3989cd8952cb4839a890a30c1614078d598a3a i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  their  100644 4d9e669b83d841459168133eb5b3d69b3e31b263 i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,12 +7,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"revealInWindows": "Revelar no Explorer",
- 	"revealInMac": "Revelar no Finder",
- 	"openContainer": "Abrir a Pasta",
- 	"saveAs": "Salvar como...",
- 	"save": "Salvar",
- 	"saveAll": "Salvar Todos",
-+<<<<<<< .our
-+=======
-+	"saveFiles": "Salvar todos os arquivos",
-+>>>>>>> .their
- 	"removeFolderFromWorkspace": "Remover pasta da área de trabalho",
- 	"genericRevertError": "Falha ao reverter '{0}': {1}",
- 	"modifiedLabel": "{0} (em disco) ↔ {1}",
-changed in both
-  base   100644 0e95d226253753e96cd8acccc486951d1a479af6 i18n/ptb/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 8c362a6a140d6ce015130d77851c1404b28f2419 i18n/ptb/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 f6bbbed75c4215ee93b76e01293c59a2242bf484 i18n/ptb/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-@@ -38,7 +38,10 @@
- 	"editorConfigurationTitle": "Editor",
- 	"formatOnSave": "Formata um arquivo no salvamento. Um formatador deve estar disponível, o arquivo não deve ser salvo automaticamente e editor não deve ser desligado.",
- 	"explorerConfigurationTitle": "Explorador de arquivos",
-+<<<<<<< .our
- 	"openEditorsVisible": "Número de editores mostrados no painel Editores Abertos.",
-+=======
-+>>>>>>> .their
- 	"autoReveal": "Controla se o explorador deve automaticamente revelar e selecionar arquivos ao abri-los.",
- 	"enableDragAndDrop": "Controla se o explorador deve permitir mover arquivos e pastas através de arrastar e soltar.",
- 	"confirmDragAndDrop": "Controla se o explorer deve pedir a confirmação ao mover arquivos ou pastas através de arrastar e soltar.",
-changed in both
-  base   100644 09a298946434f65c4b34322ee572832c7bb5a8c1 i18n/ptb/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  our    100644 4c80942ead8f390ee36c6fb925c8d39c8c4d027b i18n/ptb/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  their  100644 5f8a28ec46b40b685863447989cf1c4a327ecf26 i18n/ptb/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,12 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"userGuide": "Use as ações na barra de ferramentas de editor para a direita para **desfazer** suas alterações ou **substituir** o conteúdo no disco com as alterações",
-+	"overwriteElevated": "Sobrescrever como Admin...",
-+	"saveElevated": "Tentar novamente como Admin...",
-+	"overwrite": "Sobrescrever",
-+>>>>>>> .their
- 	"retry": "Tentar novamente",
- 	"discard": "Descartar",
- 	"readonlySaveErrorAdmin": "Falha ao salvar '{0}': O arquivo está protegido contra gravação. Selecione 'Sobrescrever como Admin' para tentar novamente como administrador.",
-changed in both
-  base   100644 83f2a510196a33dea50882f0cecf222c5596cc3d i18n/ptb/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  our    100644 e4ceea553e3bf52cf9248e76044c501e631fa80d i18n/ptb/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  their  100644 e075736dad376998525eb4ba3372c866c011f87c i18n/ptb/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-added in both
-  our    100644 6539931b21c1db53cab6e10b1197f8cdbb1c82fd i18n/ptb/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-  their  100644 05cf5d42db3859aa460de5b05904482bed12edd4 i18n/ptb/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"mainLog": "Log (Principal)",
- 	"sharedLog": "Log (Compartilhado)",
- 	"rendererLog": "Log (Janela)",
-added in both
-  our    100644 2eb83b4affdb1796e75bcf3cb50b217b75722be9 i18n/ptb/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  their  100644 30c8e9206e8221cb4ff2ad87c5298b236c01f406 i18n/ptb/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -16,6 +17,22 @@
- 	"selectProcess": "Selecione o Log para o processo",
- 	"openLogFile": "Abrir Arquivo de Log...",
- 	"setLogLevel": "Definir Nível de Log...",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"openLogsFolder": "Abrir Pasta de Logs",
-+	"showLogs": "Exibir Logs...",
-+	"mainProcess": "Principal",
-+	"sharedProcess": "Compartilhado",
-+	"rendererProcess": "Janela",
-+	"extensionHost": "Host de Extensão",
-+	"selectProcess": "Selecionar processo",
-+	"setLogLevel": "Definir Nível de Log",
-+>>>>>>> .their
- 	"trace": "Rastreamento",
- 	"debug": "Depurar",
- 	"info": "Informações",
-@@ -23,8 +40,12 @@
- 	"err": "Erro",
- 	"critical": "Crítico",
- 	"off": "Desligado",
-+<<<<<<< .our
- 	"selectLogLevel": "Selecione o nível de log",
- 	"default and current": "Padrão & Atual",
- 	"default": "Valor padrão",
- 	"current": "Atual"
-+=======
-+	"selectLogLevel": "Selecione o nível de log"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ad1f8b439c5405e18eac5e7b9ecc690c58a48b9a i18n/ptb/src/vs/workbench/parts/markers/common/messages.i18n.json
-  our    100644 598c8bf75e397ffcfa02762b995ecaa835f4f8d1 i18n/ptb/src/vs/workbench/parts/markers/common/messages.i18n.json
-  their  100644 f038135e0fbc66d2ead08d0bd621d74976958a8e i18n/ptb/src/vs/workbench/parts/markers/common/messages.i18n.json
-@@ -7,8 +7,11 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"viewCategory": "Exibir",
-+<<<<<<< .our
- 	"problems.view.toggle.label": "Esconder/exibir Problemas (Erros, Avisos, Infos)",
- 	"problems.view.focus.label": "Focar Problemas (Erros, Avisos, Infos)",
-+=======
-+>>>>>>> .their
- 	"problems.panel.configuration.title": "Visualização de Problemas",
- 	"problems.panel.configuration.autoreveal": "Controla se a visaulização de problemas evela os arquivos automaticamente ao abri-los",
- 	"markers.panel.title.problems": "Problemas",
-added in both
-  our    100644 9b7076124695fe72a8e6d829243d88ef8a7b9fda i18n/ptb/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-  their  100644 9a9c6f731568b3cc11517abf4a5b294772e06799 i18n/ptb/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -11,4 +12,16 @@
- 	"viewCategory": "Exibir",
- 	"clearOutput.label": "Limpar saída",
- 	"openActiveLogOutputFile": "Exibir: Abrir Arquivo de Saída de Log Ativo"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"output": "Saída",
-+	"logViewer": "Visualizador do Log",
-+	"viewCategory": "Exibir",
-+	"clearOutput.label": "Limpar saída"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 2c09c09b92b9591f8d53f301a131e86b16fc4dac i18n/ptb/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-  their  100644 383a9f4835d3b1eb40db70a7c39519a64971bb76 i18n/ptb/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"output": "{0} - Saída",
- 	"channel": "Canal de saída para '{0}'"
- }
-\ No newline at end of file
-changed in both
-  base   100644 800b9bf18e2ad4ffdcbd14e023bb7df84f195990 i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 01c8a007893399a7bfe4bbd3c682db21fadac779 i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 df12c20c366d7d1cb2447cd301d697bd027e7e05 i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"defaultSettings": "Coloque suas configurações no editor do lado direito para substituir.",
- 	"noSettingsFound": "Não há configurações encontradas.",
- 	"settingsSwitcherBarAriaLabel": "Chave de Configurações",
-changed in both
-  base   100644 9f80cd79e8b2eb5eda1f0afe86d7c29ad1812e9b i18n/ptb/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  our    100644 cc122314c699ae2a93dc3ff54c506a522c5df317 i18n/ptb/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  their  100644 6427118b75bed8db6da9c928ecfb45ebc090726a i18n/ptb/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-changed in both
-  base   100644 e3c6204b6055ca1ee0992fc51f9530523757334c i18n/ptb/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  our    100644 1abc4b0dbcf5852b89b34227ddcb305852f89e3e i18n/ptb/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  their  100644 75a93eabf9c7f046e0f2946fdc2c0806ddc1fc0f i18n/ptb/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"view": "Exibir",
- 	"commandsHandlerDescriptionDefault": "Exibir e executar comandos",
- 	"gotoLineDescriptionMac": "Ir para linha",
-changed in both
-  base   100644 117ddc11b046f6840855512deb617c3c416d0435 i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  our    100644 5186f0aaae9ff54a935df56019817030e2dd75cc i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  their  100644 668463cff466fb520a26283309eeda0329045311 i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-@@ -13,5 +13,9 @@
- 	"scmConfigurationTitle": "SCM",
- 	"alwaysShowProviders": "Se deverá sempre mostrar a seção Provedor de Controle de Código Fonte.",
- 	"diffDecorations": "Controla decorações do diff no editor.",
-+<<<<<<< .our
- 	"diffGutterWidth": "Controla a largura(px) das decorações diff no gutter (adicionada e modificada)."
-+=======
-+	"inputCounter": "Controla quando exibir o contador de entrada."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 fc4f8f90311883e3e69380ff1a782e6e2660d29d i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  our    100644 dfb6a734a7bd828d4b5aba3c014e4458b5423834 i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  their  100644 916c6469ab8d0ed908656706d934e844fd0944b7 i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-@@ -8,6 +8,9 @@
- 	],
- 	"scm providers": "Provedores de Controle de Código Fonte",
- 	"hideRepository": "Ocultar",
-+	"commitMessageInfo": "{0} caracteres na linha atual",
-+	"commitMessageCountdown": "{0} caracteres restantes na linha atual",
-+	"commitMessageWarning": "{0} caracteres sobre {1} na linha atual",
- 	"installAdditionalSCMProviders": "Instalar provedores de SCM adicionais...",
- 	"no open repo": "Não existem provedores de controle de código fonte ativos.",
- 	"source control": "Controle de código-fonte",
-changed in both
-  base   100644 34ded87a267343aca52c7d8a1138213e9fdb4cfb i18n/ptb/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 ba5b86d8773fd55c24bc979c0c74cb81491c0258 i18n/ptb/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 62c0f96918e287a206dbb15306a548d81491b84f i18n/ptb/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-changed in both
-  base   100644 b7b7494e9e4b4bd3e9b4e9565e52c213b3692be9 i18n/ptb/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 08831e79b99c984b5f938c4d959c75ada794a1e4 i18n/ptb/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 1d6d8fc3238de4d1c4975cf69b3e55e16ae3cff1 i18n/ptb/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -11,11 +12,18 @@
- 	"copyPathLabel": "Copiar Caminho",
- 	"copyAllLabel": "Copiar todos",
- 	"clearSearchHistoryLabel": "Limpar Histórico de Pesquisa",
-+=======
-+>>>>>>> .their
- 	"findInFolder": "Procurar na pasta...",
- 	"findInWorkspace": "Procurar no Espaço de Trabalho...",
- 	"showTriggerActions": "Ir para Símbolo no Espaço de Trabalho...",
- 	"name": "Pesquisar",
-+<<<<<<< .our
- 	"showSearchViewl": "Mostrar Busca",
-+=======
-+	"search": "Pesquisar",
-+	"showSearchViewlet": "Mostrar Busca",
-+>>>>>>> .their
- 	"view": "Exibir",
- 	"findInFiles": "Localizar nos Arquivos",
- 	"openAnythingHandlerDescription": "Ir para o Arquivo",
-added in both
-  our    100644 76910c87bbe694745265a56b60baf18a1b6fd7c0 i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-  their  100644 5d08c410ab909c29fb019ab5cd0dc409b66203ef i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,11 +7,22 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"global.scope": "(global)",
- 	"global.1": "({0})",
- 	"new.global": "Novo Arquivo de Trechos de Código Global...",
- 	"group.global": "Trechos de código existentes",
-+<<<<<<< .our
- 	"new.global.sep": "Novos Trechos de Código",
-+=======
-+>>>>>>> .their
- 	"openSnippet.pickLanguage": "Selecionar Arquivo de Trechos de Código ou Criar Trechos de Código",
- 	"openSnippet.label": "Configurar Trechos de Código do Usuário",
- 	"preferences": "Preferências"
-changed in both
-  base   100644 b9823c384ad0faa0cf1ad63fcc15f42b5365baf3 i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  our    100644 c9ce0ad1543ce0a6eecedad59ee0d1be9e8495ab i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  their  100644 5cad5c0f57dca7c6b72e9ed82bdb92a07f060890 i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"snippetSchema.json.default": "Trecho de código vazio",
- 	"snippetSchema.json": "Configuração do trecho do usuário",
- 	"snippetSchema.json.prefix": "O prefixo usado ao selecionar o trecho no intelliSense",
-added in both
-  our    100644 338e6baa050bb04f4cf3970e7baba18e89de95e0 i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-  their  100644 bfdaf9232d5a7e11a44deddaad015b3eced94985 i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,5 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"source.snippetGlobal": "Trecho de Código Global do Usuário",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"source.snippet": "Trecho de código do usuário"
- }
-\ No newline at end of file
-changed in both
-  base   100644 a2c0fbab96ac31e00976c7ddfc2934d836ae67cb i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  our    100644 45d06c4ce6eaaf39c9ff212dad2bdd8819812f84 i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 e4fdc20a1294ac5b743a510cce71028a178fc7ae i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,9 @@
- 	],
- 	"invalid.path.0": "Esperada uma string em `contributes.{0}.path`. Valor informado: {1}",
- 	"invalid.language.0": "Quando a linguagem for omitida, o valor de `contributes.{0}.path` deve ser um arquivo-`.code-snippets`. Valor definido: {1}",
-+=======
-+	"invalid.path.0": "Esperada uma string em `contributes.{0}.path`. Valor informado: {1}",
-+>>>>>>> .their
- 	"invalid.language": "Linguagem desconhecida em `contributes.{0}.language`. Valor fornecido: {1}",
- 	"invalid.path.1": "É esperado que `contributes.{0}.path` ({1}) seja incluído na pasta da extensão ({2}). Isto pode tornar a extensão não portável.",
- 	"vscode.extension.contributes.snippets": "Contribui aos trechos de código.",
-changed in both
-  base   100644 d97a515c6ead1b021f02b14e2486ea3556f49613 i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 a7fcbfe8b12598411b8516f57bb30b642834b0bc i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 7eeff3082188a3ad45b7a5d5b49f693b1c3ad72e i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -15,7 +15,11 @@
- 	"terminal.integrated.shellArgs.osx": "Os argumentos de linha de comando a serem usados no terminal do OS X.",
- 	"terminal.integrated.shell.windows": "O caminho do shell que o terminal utiliza no Windows. Quando estiver usando shells fornecidos com o Windows (cmd, PowerShell ou Bash no Ubuntu).",
- 	"terminal.integrated.shellArgs.windows": "Os argumentos de linha de comando a serem utilizados no terminal do Windows.",
-+<<<<<<< .our
- 	"terminal.integrated.macOptionIsMeta": "Tratar a tecla option como a tecla meta no terminal no macOS.",
-+=======
-+	"terminal.integrated.rightClickCopyPaste": "Quando configurado, isto evitará que o menu de contexto apareça quando pressionado o botão direito do mouse dentro do terminal, em vez disso vai copiar quando há uma seleção e colar quando não há nenhuma seleção.",
-+>>>>>>> .their
- 	"terminal.integrated.copyOnSelection": "Quando ativado, texto selecionado no terminal será copiado para a área de transferência.",
- 	"terminal.integrated.fontFamily": "Controla a família de fontes do terminal, este padrão é o valor do editor.fontFamily.",
- 	"terminal.integrated.fontSize": "Controla o tamanho da fonte em pixels do terminal.",
-changed in both
-  base   100644 2ee45b6deb3a230fe1264f1fc2641f40cff31549 i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 5844af8cc38149dcfa5ec9e4de0ec76188e00645 i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 f59efd68a9788e548d56fab4cfe35fc5a6754dee i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -20,6 +20,7 @@
- 	"workbench.action.terminal.new.short": "Novo Terminal",
- 	"workbench.action.terminal.newWorkspacePlaceholder": "Selecione o diretório de trabalho atual para novo terminal",
- 	"workbench.action.terminal.newInActiveWorkspace": "Criar Novo Terminal Integrado (No Espaço de Trabalho Ativo)",
-+<<<<<<< .our
- 	"workbench.action.terminal.split": "Dividir Terminal",
- 	"workbench.action.terminal.focusPreviousPane": "Focar Painel Anterior",
- 	"workbench.action.terminal.focusNextPane": "Foco próximo painel",
-@@ -27,6 +28,8 @@
- 	"workbench.action.terminal.resizePaneRight": "Redimensionar Painel à Direita",
- 	"workbench.action.terminal.resizePaneUp": "Redimensionar Painel Superior",
- 	"workbench.action.terminal.resizePaneDown": "Redimensionar Painel Inferior",
-+=======
-+>>>>>>> .their
- 	"workbench.action.terminal.focus": "Focalizar Terminal",
- 	"workbench.action.terminal.focusNext": "Focalizar Próximo Terminal",
- 	"workbench.action.terminal.focusPrevious": "Focalizar Terminal Anterior",
-changed in both
-  base   100644 655ae8902e5a0c04db12eef7469869ea8427ff91 i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 a9e83e391ee49f8fd391069e025b8de1705f72a9 i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 345ffbe4d25d9d3137ef18292bf8bf8afe00e66a i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-changed in both
-  base   100644 83214ad4be8a1fd3efa01b2260b09c17cd430927 i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  our    100644 1463cb4fa9ec88229dfed6213081a5f02d71c18e i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  their  100644 a500552f06f71c9b38cd547750595400c57bfe2b i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-@@ -8,7 +8,11 @@
- 	],
- 	"terminal.integrated.chooseWindowsShellInfo": "Você pode alterar o terminal shell padrão selecionando o botão Personalizar.",
- 	"customize": "Personalizar",
-+<<<<<<< .our
- 	"never again": "Não mostrar novamente",
-+=======
-+	"cancel": "Cancelar",
-+>>>>>>> .their
- 	"terminal.integrated.chooseWindowsShell": "Selecione o seu terminal shell preferido, você pode alterar isso mais tarde em suas configurações",
- 	"terminalService.terminalCloseConfirmationSingular": "Há uma sessão ativa de terminal, você quer finalizá-la?",
- 	"terminalService.terminalCloseConfirmationPlural": "Existem {0} sessões ativas de terminal, você quer finalizá-las?"
-changed in both
-  base   100644 6a2cfcb15ab8c5a993db42865a78ed0364ac27f2 i18n/ptb/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 da6e72a8a9829b085b81f04ac2a19502d69acb6e i18n/ptb/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 84ce2109e07ce97bbd7e8cbcf45d81315980981d i18n/ptb/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -9,9 +9,17 @@
- 	"releaseNotes": "Notas da Versão",
- 	"showReleaseNotes": "Mostrar Notas da Versão",
- 	"read the release notes": "Bem-vindo a {0} v{1}! Gostaria de ler as Notas da Versão?",
-+<<<<<<< .our
- 	"licenseChanged": "Nossos termos de licença mudaram, por favor, clique [aqui]({0}) para revisá-los.",
- 	"neveragain": "Não mostrar novamente",
- 	"64bitisavailable": "{0} para Windows de 64 bits está agora disponível! Clique [aqui]({0}) para maiores informações.",
-+=======
-+	"licenseChanged": "Nossos termos de licença mudaram, favor revisá-los.",
-+	"license": "Ler Licença",
-+	"neveragain": "Não mostrar novamente",
-+	"64bitisavailable": "{0} para Windows de 64 bits está agora disponível!",
-+	"learn more": "Saiba Mais",
-+>>>>>>> .their
- 	"updateIsReady": "Nova atualização de {0} disponível.",
- 	"noUpdatesAvailable": "Não há nenhuma atualização disponível no momento.",
- 	"ok": "OK",
-@@ -24,7 +32,10 @@
- 	"commandPalette": "Paleta de comandos...",
- 	"settings": "Configurações",
- 	"keyboardShortcuts": "Atalhos de Teclado",
-+<<<<<<< .our
- 	"showExtensions": "Gerenciar Extensões",
-+=======
-+>>>>>>> .their
- 	"userSnippets": "Trecho de código do usuário",
- 	"selectTheme.label": "Tema de Cores",
- 	"themes.selectIconTheme.label": "Arquivo de Ícone do Tema",
-changed in both
-  base   100644 7b91deaec2e42a9e5312a345a687403d3e7daa70 i18n/ptb/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  our    100644 6789efd204043271857054115b76d8df180ce2d3 i18n/ptb/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  their  100644 1cc780952f6a712f7effd279d7b1edae05675830 i18n/ptb/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -11,4 +12,9 @@
- 	"fileNotModifiedError": "Arquivo não modificado desde",
- 	"fileBinaryError": "Arquivo parece ser binário e não pode ser aberto como texto",
- 	"fileMoveConflict": "Não é possível mover/copiar. Arquivo já existe no destino."
-+=======
-+	"fileIsDirectoryError": "Arquivo é um diretório",
-+	"fileNotModifiedError": "Arquivo não modificado desde",
-+	"fileBinaryError": "Arquivo parece ser binário e não pode ser aberto como texto"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ae4ae7187430526f4afd7f10491bb8014896269f i18n/ptb/src/vs/workbench/services/files/node/fileService.i18n.json
-  our    100644 29bfbb0d0406e61dc08f81bd41ff0cd2f4dd056a i18n/ptb/src/vs/workbench/services/files/node/fileService.i18n.json
-  their  100644 dba7ada15b58384345edf357995f42af495e661b i18n/ptb/src/vs/workbench/services/files/node/fileService.i18n.json
-changed in both
-  base   100644 fedfd5457f0de6068aff139dde2b9cc1c477dd88 i18n/ptb/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
-  our    100644 4de199c4c2fe4fdd932d1d0671e2326d7c5a2f0e i18n/ptb/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
-  their  100644 4e6320dddaaba07fd89b8dbc8063b21cb9e5da10 i18n/ptb/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
-changed in both
-  base   100644 491b19e87c4efa4dee5923e674c93aed715e7be8 i18n/ptb/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  our    100644 7522dc2b84c4c005e2d53ba31a8480bb47fcfe0b i18n/ptb/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  their  100644 f86146be73a5c45365bedfb92621d4804f902c74 i18n/ptb/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-changed in both
-  base   100644 15017c071573e63a29279ee8b00141e3bff3f8a5 i18n/ptb/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 effaee068b393bc8fea42a2d38b17e32baca11e5 i18n/ptb/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 164708fcd634ee28360b9239a48b55a9dd23e7b6 i18n/ptb/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-changed in both
-  base   100644 078a8eb1b7dce1ba63a8a813339187488bb2cabb i18n/ptb/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  our    100644 df3c6fe6d65f0ab7a9a903481f15896fcc167190 i18n/ptb/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  their  100644 73fdc1bd8e41e045d7774d7f0f5057c16d06a4f3 i18n/ptb/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-@@ -8,5 +8,10 @@
- 	],
- 	"errorInvalidTaskConfiguration": "Não é possível escrever no arquivo de configuração. Por favor, abra o arquivo para corrigir erros/avisos nele e tente novamente.",
- 	"errorWorkspaceConfigurationFileDirty": "Não é possível escrever no arquivo de configuração do espaço de trabalho porque o arquivo está sujo. Por favor, salve-o e tente novamente.",
-+<<<<<<< .our
- 	"openWorkspaceConfigurationFile": "Abrir Configuração do Espaço de Trabalho"
-+=======
-+	"openWorkspaceConfigurationFile": "Abrir o Arquivo de Configuração do Espaço de Trabalho",
-+	"close": "Fechar"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 1e461cf4629319ae5dd2cc20137a3683d3d8ed9b i18n/rus/extensions/git/out/autofetch.i18n.json
-  our    100644 674a3834cc198d7819143c18bcdd12ed733e4813 i18n/rus/extensions/git/out/autofetch.i18n.json
-  their  100644 d3d761f36367e8bcaa020ae3512dc8c569de2e36 i18n/rus/extensions/git/out/autofetch.i18n.json
-@@ -7,7 +7,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"yes": "Да",
-+<<<<<<< .our
- 	"no": "Нет",
- 	"not now": "Спросить меня позже",
- 	"suggest auto fetch": "Вы хотите, чтобы среда Code [периодически выполняла команду \"git fetch\"]({0})?"
-+=======
-+	"read more": "Подробнее",
-+	"no": "Нет"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d8d6feaa35d000d85deb6dadc78f8004729efb8f i18n/rus/extensions/git/out/commands.i18n.json
-  our    100644 bdd7adadfadc50db48d014178fb19ce838d13900 i18n/rus/extensions/git/out/commands.i18n.json
-  their  100644 b99a2ac09aae79bfeda8e571d39dd67ac8f3d049 i18n/rus/extensions/git/out/commands.i18n.json
-@@ -71,12 +71,19 @@
- 	"pick remote pull repo": "Выберите удаленный компьютер, с которого следует загрузить ветвь",
- 	"no remotes to push": "Для вашего репозитория не настроены удаленные репозитории для отправки данных.",
- 	"nobranch": "Извлеките ветвь, чтобы передать данные в удаленный репозиторий.",
-+<<<<<<< .our
- 	"confirm publish branch": "В ветви '{0}' отсутствует восходящая ветвь. Вы хотите опубликовать эту ветвь?",
- 	"ok": "ОК",
- 	"push with tags success": "Файлы с тегами успешно отправлены.",
- 	"pick remote": "Выберите удаленный сервер, на котором нужно опубликовать ветвь \"{0}\":",
- 	"sync is unpredictable": "Это действие отправляет фиксации в \"{0}/{1}\" и извлекает их из этого расположения.",
- 	"never again": "ОК, больше не показывать",
-+=======
-+	"ok": "ОК",
-+	"push with tags success": "Файлы с тегами успешно отправлены.",
-+	"pick remote": "Выберите удаленный сервер, на котором нужно опубликовать ветвь \"{0}\":",
-+	"sync is unpredictable": "Это действие отправляет фиксации в \"{0}\" и извлекает их из этого расположения.",
-+>>>>>>> .their
- 	"no remotes to publish": "Для вашего репозитория не настроены удаленные репозитории для публикации.",
- 	"no changes stash": "Отсутствуют изменения, которые необходимо спрятать.",
- 	"provide stash message": "Укажите сообщение о скрытии",
-added in both
-  our    100644 c2ebfd192413e0e1da8793b7e8acbdca9db58ff1 i18n/rus/extensions/typescript/out/commands.i18n.json
-  their  100644 719d56f4f9282136e6547a837474f78e01fcab4c i18n/rus/extensions/typescript/out/commands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -13,4 +14,20 @@
- 	"typescript.noJavaScriptProjectConfig": "Файл не является частью проекта JavaScript. Дополнительные сведения см. [здесь]({0}).",
- 	"typescript.configureTsconfigQuickPick": "Настроить tsconfig.json",
- 	"typescript.configureJsconfigQuickPick": "Настроить jsconfig.json"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"typescript.projectConfigNoWorkspace": "Откройте папку в VS Code, чтобы использовать проект JavaScript или TypeScript.",
-+	"typescript.projectConfigUnsupportedFile": "Не удалось определить проект TypeScript или JavaScript. Неподдерживаемый тип файла",
-+	"typescript.projectConfigCouldNotGetInfo": "Не удалось определить проект TypeScript или JavaScript.",
-+	"typescript.noTypeScriptProjectConfig": "Файл не является частью проекта TypeScript.",
-+	"typescript.noJavaScriptProjectConfig": "Файл не является частью проекта JavaScript.",
-+	"typescript.configureTsconfigQuickPick": "Настроить tsconfig.json",
-+	"typescript.configureJsconfigQuickPick": "Настроить jsconfig.json",
-+	"typescript.projectConfigLearnMore": "Дополнительные сведения"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 750d811d866eaa3d43818bd1d8e28c9898acf514 i18n/rus/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-  their  100644 ed15423097d5cbb03aeb8c474db3877ca0d1584f i18n/rus/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"selectAriaOption": "{0}"
- }
-\ No newline at end of file
-added in both
-  our    100644 83e49b47cbf977bdcef1d89c7da9925e8624223a i18n/rus/src/vs/base/node/ps.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/src/vs/base/node/ps.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"collecting": "Сбор информации о процессоре и памяти. Это может занять пару секунд."
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 f265f8d9eaa5d4bc740910d00a86729ad5704674 i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 66cf48db0f575d6b4f93e4e908a24029fed35a72 i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 04d052b0abb17e9217ceff360a85a092d43cf48a i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -16,7 +16,11 @@
- 	"lineNumbers.on": "Отображаются абсолютные номера строк.",
- 	"lineNumbers.relative": "Отображаемые номера строк вычисляются как расстояние в строках до положения курсора.",
- 	"lineNumbers.interval": "Номера строк отображаются каждые 10 строк.",
-+<<<<<<< .our
- 	"lineNumbers": "Управляет отображением номеров строк.",
-+=======
-+	"lineNumbers": "Управляет отображением номеров строк. Возможные значения: 'on', 'off', 'relative' и 'interval'.",
-+>>>>>>> .their
- 	"rulers": "Отображать вертикальные линейки после определенного числа моноширинных символов. Для отображения нескольких линеек укажите несколько значений. Если не указано ни одного значения, вертикальные линейки отображаться не будут.",
- 	"wordSeparators": "Символы, которые будут использоваться как разделители слов при выполнении навигации или других операций, связанных со словами.",
- 	"tabSize": "Число пробелов в табуляции. Этот параметр переопределяется на основе содержимого файла, если установлен параметр \"editor.detectIndentation\".",
-changed in both
-  base   100644 4801d2ec386d6b4bfbe0889515045812867e8c2d i18n/rus/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 9d3bc679fc1f2c06c947cdc33c9616b8b522920c i18n/rus/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 435033a9d39fe97fcd7eedb7ed0b4e2445dc46fa i18n/rus/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -8,8 +8,11 @@
- 	],
- 	"lineHighlight": "Цвет фона для выделения строки в позиции курсора.",
- 	"lineHighlightBorderBox": "Цвет фона границ вокруг строки в позиции курсора.",
-+<<<<<<< .our
- 	"rangeHighlight": "Фоновый цвет выбранных диапазонов, например, в функциях быстрого открытия и поиска. Цвет должен быть прозрачным чтобы не перекрывать основных знаков отличия.",
- 	"rangeHighlightBorder": "Цвет фона обводки выделения.",
-+=======
-+>>>>>>> .their
- 	"caret": "Цвет курсора редактора.",
- 	"editorCursorBackground": "Цвет фона курсора редактора. Позволяет настраивать цвет символа, перекрываемого прямоугольным курсором.",
- 	"editorWhitespaces": "Цвет пробелов в редакторе.",
-changed in both
-  base   100644 5ca181d11bd738f9eaba0717983dc5ba7af49957 i18n/rus/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  our    100644 7a40f2cf14561ceae85a652f8f7ffc53f4f9707f i18n/rus/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  their  100644 46e2fc5601eb02243252f2cab12988c5751c4397 i18n/rus/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -10,4 +11,11 @@
- 	"markerAction.previous.label": "Перейти к Предыдущей Проблеме (Ошибке, Предупреждению, Информации)",
- 	"markerAction.nextInFiles.label": "Перейти к следующей проблеме в файлах (ошибки, предупреждения, информационные сообщения)",
- 	"markerAction.previousInFiles.label": "Перейти к предыдущей проблеме в файлах (ошибки, предупреждения, информационные сообщения)"
-+=======
-+	"title.wo_source": "({0}/{1})",
-+	"editorMarkerNavigationError": "Цвет ошибки в мини-приложении навигации по меткам редактора.",
-+	"editorMarkerNavigationWarning": "Цвет предупреждения в мини-приложении навигации по меткам редактора.",
-+	"editorMarkerNavigationInfo": "Цвет информационного сообщения в мини-приложении навигации по меткам редактора.",
-+	"editorMarkerNavigationBackground": "Фон мини-приложения навигации по меткам редактора."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ab058cc24db7358f649c11408aac34dcd487cb98 i18n/rus/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  our    100644 5b31b385ffd5c6dc8e210cee2ebf9889c7b9deb5 i18n/rus/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  their  100644 0894ee93e1f8569651a774412c6c26db93009d42 i18n/rus/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,10 @@
- 	"wordHighlightStrongBorder": "Цвет границы символа при доступе на запись, например, при записи переменной. ",
- 	"overviewRulerWordHighlightForeground": "Цвет метки линейки в окне просмотра для выделения символов. Цвет не должен был прозрачным, чтобы не перекрывать основные знаки отличия.",
- 	"overviewRulerWordHighlightStrongForeground": "Цвет метки линейки в окне просмотра для выделения символов с доступом на запись. Цвет не должен был прозрачным, чтобы не перекрывать основные знаки отличия.",
-+=======
-+	"overviewRulerWordHighlightForeground": "Цвет метки линейки в окне просмотра для выделений символов.",
-+	"overviewRulerWordHighlightStrongForeground": "Цвет метки линейки в окне просмотра для выделений символов, доступных для записи. ",
-+>>>>>>> .their
- 	"wordHighlight.next.label": "Перейти к следующему выделению символов",
- 	"wordHighlight.previous.label": "Перейти к предыдущему выделению символов"
- }
-\ No newline at end of file
-changed in both
-  base   100644 b8216927851de334ae4cceeeb5443a2820d5e776 i18n/rus/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  our    100644 c6bce4e5b081d94db7fb3a1598287f67537f7b4f i18n/rus/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  their  100644 74a4edfb15c69c45a2ffec724b979db4c9f52f93 i18n/rus/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 7314aa060875ee62bb108f63f9fce24622982510 i18n/rus/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 60e5e887ae41d0c2770bdb1306a52fd5bbf7375a i18n/rus/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 ddfd930f08e6001c274dc2493287b6697433f71d i18n/rus/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,11 +10,19 @@
- 	"diff": "Сравнение двух файлов друг с другом",
- 	"add": "Добавление папок в последнее активное окно.",
- 	"goto": "Открытие файла по указанному пути с выделением указанного символа в указанной строке.",
-+<<<<<<< .our
- 	"newWindow": "Принудительно открыть новое окно.",
- 	"reuseWindow": "Принудительно открыть файл или папку в последнем активном окне.",
- 	"wait": "Дождаться закрытия файлов перед возвратом.",
- 	"locale": "Языковой стандарт, который следует использовать (например, en-US или zh-TW).",
- 	"userDataDir": "Указывает каталог, в котором хранятся данные пользователей. Может использоваться для открытия нескольких отдельных экземпляров Code.",
-+=======
-+	"newWindow": "Принудительно запустить новый экземпляр Code.",
-+	"reuseWindow": "Принудительно открыть файл или папку в последнем активном окне.",
-+	"wait": "Дождаться закрытия файлов перед возвратом.",
-+	"locale": "Языковой стандарт, который следует использовать (например, en-US или zh-TW).",
-+	"userDataDir": "Указывает каталог, в котором хранятся данные пользователей, используется в случае выполнения от имени привилегированного пользователя.",
-+>>>>>>> .their
- 	"version": "Печать версии.",
- 	"help": "Распечатать данные об использовании.",
- 	"extensionHomePath": "Задайте корневой путь для расширений.",
-@@ -32,8 +40,11 @@
- 	"inspect-extensions": "Разрешить отладку и профилирование расширений. Проверьте URI подключения для инструментов разработчика.",
- 	"inspect-brk-extensions": "Разрешить отладку и профилирование расширений, когда узел расширения приостановлен после запуска. Проверьте URI подключения для инструментов разработчика. ",
- 	"disableGPU": "Отключить аппаратное ускорение GPU.",
-+<<<<<<< .our
- 	"uploadLogs": "Отправляет журналы из текущего сеанса в защищенную конечную точку.",
- 	"maxMemory": "Максимальный размер памяти для окна (в МБ).",
-+=======
-+>>>>>>> .their
- 	"usage": "Использование",
- 	"options": "параметры",
- 	"paths": "пути",
-changed in both
-  base   100644 c25a9a85ff7ba00ef21a13c790094ead598b3c21 i18n/rus/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 b5b010a1ed08e7bd0639632258a4ace9da636f30 i18n/rus/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 8201cea8194efb9f86ecf108f6a428226a57974b i18n/rus/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -7,17 +7,23 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"invalidManifest": "Недопустимое расширение: package.json не является файлом JSON.",
-+<<<<<<< .our
- 	"incompatible": "Не удалось установить расширение '{0}', так как оно не совместимо с Code '{1}'.",
-+=======
-+>>>>>>> .their
- 	"restartCode": "Перезапустите код перед переустановкой {0}.",
- 	"installingOutdatedExtension": "Уже установлена более новая версия этого расширения. Вы хотите переопределить ее более старой версией?",
- 	"override": "Переопределить",
- 	"cancel": "Отмена",
-+<<<<<<< .our
- 	"errorInstallingDependencies": "Ошибка при установке зависимостей. {0}",
- 	"MarketPlaceDisabled": "Marketplace не включен",
- 	"removeError": "Ошибка при удалении расширения: {0}. Закройте и снова откройте VS Code, затем повторите попытку.",
- 	"Not a Marketplace extension": "Можно переустановить только расширения из Marketplace",
- 	"notFoundCompatible": "Невозможно установить '{0}'; нет версии, совместимой с VS Code '{1}'.",
- 	"malicious extension": "Не удается установить расширение, так как оно помечено как проблемное.",
-+=======
-+>>>>>>> .their
- 	"notFoundCompatibleDependency": "Не удается выполнить установку, так как не найдено зависимое расширение '{0}', совместимое с текущей версией VS Code '{1}'. ",
- 	"quitCode": "Невозможно установить расширение. Пожалуйста, выйдите и зайдите в VS Code перед переустановкой.",
- 	"exitCode": "Невозможно установить расширение. Пожалуйста, выйдите и зайдите в VS Code перед переустановкой.",
-changed in both
-  base   100644 62863fdeb53c1f97a0aea26a0cc5f8b4da03a08b i18n/rus/src/vs/platform/message/common/message.i18n.json
-  our    100644 d2165310fe587911c53ff08a32d4a1a51c619758 i18n/rus/src/vs/platform/message/common/message.i18n.json
-  their  100644 aab52c88b341702c27130464845802e51893f5ec i18n/rus/src/vs/platform/message/common/message.i18n.json
-changed in both
-  base   100644 98e2cebe278a569ebc93b9f5a2b0590fb6d02e1b i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 a203da5726ce360e6e4c7bd4be5cee05446e8ca5 i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 bbb9e4cefb0ef95c41cf32b4721247685c8d46c8 i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -68,6 +68,7 @@
- 	"editorWidgetBorder": "Цвет границы мини-приложений редактора. Этот цвет используется только в том случае, если у мини-приложения есть граница и если этот цвет не переопределен мини-приложением.",
- 	"editorSelectionBackground": "Цвет выделения редактора.",
- 	"editorSelectionForeground": "Цвет выделенного текста в режиме высокого контраста.",
-+<<<<<<< .our
- 	"editorInactiveSelection": "Цвет выбора в не активном редакторе. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
- 	"editorSelectionHighlight": "Цвет регионов с тем же содержимым, что и в выделении. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
- 	"editorSelectionHighlightBorder": "Цвет границы регионов с тем же содержимым, что и в выделении.",
-@@ -79,6 +80,9 @@
- 	"findRangeHighlightBorder": "Цвет границы диапазона для ограничения поиска. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
- 	"findWidgetResizeBorder": "Цвет границ панели изменения размера для мини-приложения поиска.",
- 	"hoverHighlight": "Выделение под словом, для которого показано наведение. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
-+=======
-+	"editorFindMatch": "Цвет текущего поиска совпадений.",
-+>>>>>>> .their
- 	"hoverBackground": "Цвет фона при наведении указателя на редактор.",
- 	"hoverBorder": "Цвет границ при наведении указателя на редактор.",
- 	"activeLinkForeground": "Цвет активных ссылок.",
-@@ -86,12 +90,15 @@
- 	"diffEditorRemoved": "Цвет фона для удаленного текста. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия. ",
- 	"diffEditorInsertedOutline": "Цвет контура для добавленных строк.",
- 	"diffEditorRemovedOutline": "Цвет контура для удаленных строк.",
-+<<<<<<< .our
- 	"mergeCurrentHeaderBackground": "Фон текущего заголовка при конфликтах встроеного слияния. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
- 	"mergeCurrentContentBackground": "Фон текущего содержания при конфликтах встроеного слияния. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
- 	"mergeIncomingHeaderBackground": "Фон измененного заголовка при конфликтах встроенного слияния. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
- 	"mergeIncomingContentBackground": "Фон измененного содержания при конфликтах встроенного слияния. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
- 	"mergeCommonHeaderBackground": "Фон заголовка для общего предшественника при конфликтах внутреннего слияния. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
- 	"mergeCommonContentBackground": "Фон содержания общего предшественника при конфликтах внутреннего слияния. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
-+=======
-+>>>>>>> .their
- 	"mergeBorder": "Цвет границы заголовков и разделителя во внутренних конфликтах слияния.",
- 	"overviewRulerCurrentContentForeground": "Цвет переднего плана линейки текущего окна во внутренних конфликтах слияния.",
- 	"overviewRulerIncomingContentForeground": "Цвет переднего плана линейки входящего окна во внутренних конфликтах слияния.",
-added in both
-  our    100644 b7b1c72487ebcdd28a2f6de4bbc845fb5f8459a4 i18n/rus/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,4 +11,12 @@
- 	"codeActionsOnSave.didTimeout": "Метод codeActionsOnSave прерван через {0} мс",
- 	"timeout.onWillSave": "Событие onWillSaveTextDocument-event прервано по истечении 1750 мс",
- 	"saveParticipants": "Сохранение участников..."
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 9f9c8f9221d8249c95724d9daae63f7103b1f7fa i18n/rus/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  our    100644 efe7bffddd0505fd6690a01342f518f8a199e753 i18n/rus/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  their  100644 9dad9f3a71bcae83121bb862a94fedbd527d9147 i18n/rus/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,7 @@
- 	],
- 	"treeView.notRegistered": "Отсутствует зарегистрированное представление в виде дерева с идентификатором '{0}'.",
- 	"treeView.duplicateElement": "Элемент с идентификационным номером {0} уже зарегестрирован"
-+=======
-+	"treeView.notRegistered": "Отсутствует зарегистрированное представление в виде дерева с идентификатором '{0}'."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7f87d17117ef5dbdd32a150b1191e9944234e145 i18n/rus/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 c446918f7398d91df096414504ebb365f7b433fb i18n/rus/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 c63304e93bab12fd229eb7cbe574717daeb741ca i18n/rus/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -15,5 +15,9 @@
- 	"saveWorkspace": "Сохранить рабочую область",
- 	"openWorkspaceAction": "Открыть рабочую область...",
- 	"openWorkspaceConfigFile": "Открыть файл конфигурации рабочей области",
-+<<<<<<< .our
- 	"duplicateWorkspaceInNewWindow": "Создать копию рабочей области в новом окне"
-+=======
-+	"openFolderAsWorkspaceInNewWindow": "Открыть папку как рабочую область в новом окне"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 29ba2b2f4f0b3d5e5f0c9d7456645bda94725c1c i18n/rus/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-  their  100644 80b92b744452b7fad0f32ee4dd3138fd0e648baa i18n/rus/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"addFolderToWorkspace": "Добавить папку в рабочую область...",
- 	"add": "&&Добавить",
- 	"addFolderToWorkspaceTitle": "Добавить папку в рабочую область",
-changed in both
-  base   100644 3c123d9ce41de04bda8ec966cfe236ac491435ff i18n/rus/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  our    100644 0dbd953e79a55730f12c5d543642ff3b7502f278 i18n/rus/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  their  100644 6382785efa1b173eeb4f221cb5bbd94f6f4b2935 i18n/rus/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-@@ -19,6 +19,7 @@
- 	"close": "Закрыть",
- 	"closeOthers": "Закрыть другие",
- 	"closeRight": "Закрыть справа",
-+<<<<<<< .our
- 	"closeAllSaved": "Закрыть сохраненные",
- 	"closeAll": "Закрыть все",
- 	"keepOpen": "Оставить открытым",
-@@ -27,6 +28,15 @@
- 	"keepEditor": "Сохранить редактор",
- 	"closeEditorsInGroup": "Закрыть все редакторы в группе",
- 	"closeSavedEditors": "Закрыть сохраненные редакторы в группе",
-+=======
-+	"closeAllUnmodified": "Закрыть без изменений",
-+	"closeAll": "Закрыть все",
-+	"keepOpen": "Оставить открытым",
-+	"showOpenedEditors": "Показать открытые редакторы",
-+	"keepEditor": "Сохранить редактор",
-+	"closeEditorsInGroup": "Закрыть все редакторы в группе",
-+	"closeUnmodifiedEditors": "Закрыть редакторы без изменений в группе",
-+>>>>>>> .their
- 	"closeOtherEditors": "Закрыть другие редакторы",
- 	"closeRightEditors": "Закрыть редакторы справа"
- }
-\ No newline at end of file
-changed in both
-  base   100644 4dba80c961def551c7c1860039a2c339eaf2fff3 i18n/rus/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 99aca234c7b93506a14c237c3960c0558fba20a4 i18n/rus/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 f1572dc1c1826463f3e477c46b12614c03597cc2 i18n/rus/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 32e566863c80db35e9dd9f27cdaad3f1be966e9e i18n/rus/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  our    100644 dc07ab24638605893378a2dd26ba1cc911f57626 i18n/rus/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  their  100644 64223b3c4b5b3046daafe6c7bdc570491406e018 i18n/rus/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-changed in both
-  base   100644 7e9ef4fb62e34268424ff77de9e4bd38535134f8 i18n/rus/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  our    100644 ce74baadb43ac75843c84b736b7042b0ef2c0120 i18n/rus/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  their  100644 f8b0ee45376a259e9c97cae302f254d44c28b84b i18n/rus/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-@@ -12,6 +12,10 @@
- 	"editableEditorWithInputAriaLabel": "{0}. Редактор сравнения текстовых файлов.",
- 	"editableEditorAriaLabel": "Редактор сравнения текстовых файлов.",
- 	"navigate.next.label": "Следующее исправление",
-+<<<<<<< .our
- 	"navigate.prev.label": "Предыдущее исправление",
- 	"toggleIgnoreTrimWhitespace.label": "Игнорировать удаление пробелов"
-+=======
-+	"navigate.prev.label": "Предыдущее исправление"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f09bdce23248db6030dc7a4c80eda8e5c117baf4 i18n/rus/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  our    100644 9d49f9d5c3c21f241c037d0a6e2a388b8bdee631 i18n/rus/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  their  100644 cf0dce309ede1b1a726d38dd77f01d6c3e461984 i18n/rus/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"close": "Закрыть",
-+>>>>>>> .their
- 	"araLabelEditorActions": "Действия редактора"
- }
-\ No newline at end of file
-changed in both
-  base   100644 bd0d0f8b98bdcbebcab5d3adf085fa08676778b7 i18n/rus/src/vs/workbench/common/theme.i18n.json
-  our    100644 1ea38452a6e8832b511f19d37e5007a3b201c44b i18n/rus/src/vs/workbench/common/theme.i18n.json
-  their  100644 364c328c4c01eb5e2d283727aa606345379fd73f i18n/rus/src/vs/workbench/common/theme.i18n.json
-@@ -24,7 +24,10 @@
- 	"editorGroupBackground": "Цвет фона группы редакторов. Группы редакторов представляют собой контейнеры редакторов. Цвет фона отображается при перетаскивании групп редакторов.",
- 	"tabsContainerBackground": "Цвет фона для заголовка группы редакторов, когда вкладки включены. Группы редакторов представляют собой контейнеры редакторов.",
- 	"tabsContainerBorder": "Цвет границы для заголовка группы редакторов, когда вкладки включены. Группы редакторов представляют собой контейнеры редакторов.",
-+<<<<<<< .our
- 	"editorGroupHeaderBackground": "Цвет фона для заголовка группы редакторов, когда вкладки отключены (`\"workbench.editor.showTabs\": false`). Группы редакторов представляют собой контейнеры редакторов.",
-+=======
-+>>>>>>> .their
- 	"editorGroupBorder": "Цвет для разделения нескольких групп редакторов. Группы редакторов — это контейнеры редакторов.",
- 	"editorDragAndDropBackground": "Цвет фона при перетаскивании редакторов. Этот цвет должен обладать прозрачностью, чтобы содержимое редактора оставалось видимым.",
- 	"panelBackground": "Цвет фона панели. Панели показаны под областью редактора и содержат такие представления, как выходные данные и встроенный терминал.",
-@@ -41,8 +44,11 @@
- 	"statusBarNoFolderBorder": "Цвет границы строки состояния, который распространяется на боковую панель и редактор, когда открытые папки отсутствуют. Строка состояния расположена в нижней части окна.",
- 	"statusBarItemActiveBackground": "Цвет фона элементов панели состояния при щелчке. Панель состояния отображается внизу окна.",
- 	"statusBarItemHoverBackground": "Цвет фона элементов панели состояния при наведении. Панель состояния отображается внизу окна.",
-+<<<<<<< .our
- 	"statusBarProminentItemBackground": "Цвет фона приоритетных элементов панели состояния. Приоритетные элементы выделяются на фоне других элементов панели состояния, чтобы подчеркнуть их значение. Чтобы просмотреть пример, измените режим \"Toggle Tab Key Moves Focus\" из палитры команд. Панель состояния отображается в нижней части окна.",
- 	"statusBarProminentItemHoverBackground": "Цвет фона приоритетных элементов панели состояния при наведении. Приоритетные элементы выделяются на фоне других элементов панели состояния, чтобы подчеркнуть их значение. Чтобы просмотреть пример, измените режим \"Toggle Tab Key Moves Focus\" из палитры команд. Панель состояния отображается в нижней части окна.",
-+=======
-+>>>>>>> .their
- 	"activityBarBackground": "Цвет фона панели действий. Панель действий отображается слева или справа и позволяет переключаться между представлениями боковой панели.",
- 	"activityBarForeground": "Цвет переднего плана панели действий (например, цвет, используемый для значков). Панель действий отображается слева или справа и позволяет переключаться между представлениями боковой панели.",
- 	"activityBarBorder": "Цвет границы панели действий, который распространяется на боковую панель. Панель действий отображается слева или справа и позволяет переключаться между представлениями в боковой панели.",
-added in both
-  our    100644 69f15ecbcb81dc961efa29635e1bf71936245981 i18n/rus/src/vs/workbench/common/views.i18n.json
-  their  100644 2feabab41e559a13b0daf471017593e66beed996 i18n/rus/src/vs/workbench/common/views.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"duplicateId": "Представление с идентификатором '{0}' уже зарегистрировано в расположении '{1}'"
- }
-\ No newline at end of file
-changed in both
-  base   100644 2380d05741c3cbea0514da1f0c5d12343fef18b3 i18n/rus/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 266dadc0ddcb2cfb8391eafba4890dbacea4172b i18n/rus/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 5768ee78d85c96586af7f8d6ea9914bb6cc014c3 i18n/rus/src/vs/workbench/electron-browser/actions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"closeWindow": "Закрыть окно",
- 	"closeWorkspace": "Закрыть рабочую область",
- 	"noWorkspaceOpened": "В этом экземпляре отсутствуют открытые рабочие области.",
-@@ -50,6 +53,14 @@
- 	"moveWindowTabToNewWindow": "Переместить вкладку окна в новое окно",
- 	"mergeAllWindowTabs": "Объединить все окна",
- 	"toggleWindowTabsBar": "Переключить панель вкладок окна",
-+<<<<<<< .our
- 	"about": "О программе {0}",
- 	"inspect context keys": "Проверить ключи контекста"
-+=======
-+	"configureLocale": "Настроить язык",
-+	"displayLanguage": "Определяет язык интерфейса VSCode.",
-+	"doc": "Список поддерживаемых языков см. в {0}.",
-+	"restart": "Для изменения значения требуется перезапуск VSCode.",
-+	"fail.createSettings": "Невозможно создать \"{0}\" ({1})."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f0c8c83bedf56fbc46c5e5c030f7b5d2806199a7 i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 bdb5e10a72aa6a97a13c01acd6d5626456147e68 i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 e67791315855f576a3280c032c5beeacc95d9224 i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,12 +35,19 @@
- 	"panelDefaultLocation": "Определяет расположение панели по умолчанию. Она может находиться снизу или справа от рабочего места.",
- 	"statusBarVisibility": "Управляет видимостью строки состояния в нижней части рабочего места.",
- 	"activityBarVisibility": "Управляет видимостью панели действий на рабочем месте.",
-+<<<<<<< .our
- 	"viewVisibility": "Управляет видимостью действий в заголовке представления. Действия в заголовке представления могут быть видимы всегда или видимы только тогда, когда представление получает фокус или на него наводится курсор мыши.",
- 	"fontAliasing": "Управляет методом сглаживания шрифтов в рабочей области.\n- default: субпиксельное сглаживание шрифтов; позволит добиться максимальной четкости текста на большинстве дисплеев за исключением Retina\n- antialiased: сглаживание шрифтов на уровне пикселей, в отличие от субпиксельного сглаживания; позволит сделать шрифт более светлым в целом\n- none: сглаживание шрифтов отключено; текст будет отображаться с неровными острыми краями\n- auto: автоматически применяется режим \"default\" или \"antialiased\" в зависимости от разрешения дисплея (количество точек на дюйм).",
- 	"workbench.fontAliasing.default": "Субпиксельное сглаживание шрифтов; позволит добиться максимальной четкости текста на большинстве дисплеев за исключением Retina.",
- 	"workbench.fontAliasing.antialiased": "Сглаживание шрифтов на уровне пикселей, в отличие от субпиксельного сглаживания. Может сделать шрифт светлее в целом.",
- 	"workbench.fontAliasing.none": "Отключает сглаживание шрифтов; текст будет отображаться с неровными острыми краями.",
- 	"workbench.fontAliasing.auto": "Автоматически применяется режим \"default\" или \"antialiased\" в зависимости от разрешения дисплея (количество точек на дюйм).",
-+=======
-+	"fontAliasing": "Управляет методом сглаживания шрифтов в рабочей области.-по умолчанию: субпиксельное сглаживание шрифтов; позволит добиться максимальной четкости текста на большинстве дисплеев за исключением Retina - сглаживание: сглаживание шрифтов на уровне пикселей, в отличие от субпиксельного сглаживания; позволит сделать шрифт более светлым в целом - нет: сглаживание шрифтов отключено; текст будет отображаться с неровными острыми краями ",
-+	"workbench.fontAliasing.default": "Субпиксельное сглаживание шрифтов; позволит добиться максимальной четкости текста на большинстве дисплеев за исключением Retina.",
-+	"workbench.fontAliasing.antialiased": "Сглаживание шрифтов на уровне пикселей, в отличие от субпиксельного сглаживания. Может сделать шрифт светлее в целом.",
-+	"workbench.fontAliasing.none": "Отключает сглаживание шрифтов; текст будет отображаться с неровными острыми краями.",
-+>>>>>>> .their
- 	"enableNaturalLanguageSettingsSearch": "Определяет, следует ли включить режим поиска естественного языка для параметров.",
- 	"windowConfigurationTitle": "Окно",
- 	"window.openFilesInNewWindow.on": "Файлы будут открываться в новом окне.",
-changed in both
-  base   100644 64ed05c095833c3e9c6728b49eb1f1b308c79b57 i18n/rus/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  our    100644 f8d06534f608da61321ef16f51f67e05aee58a14 i18n/rus/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  their  100644 80636157f78b1d94a9f7a457a9f0926d303044e6 i18n/rus/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"debug.terminal.title": "отлаживаемый объект"
- }
-\ No newline at end of file
-changed in both
-  base   100644 4671a2c1d2386d77c57263adca2af6874f936563 i18n/rus/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  our    100644 aed4ddc96e0fa43f50c41bf2aa86012d93744f14 i18n/rus/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  their  100644 7b4f9ca1fd9ee43dfddb5a1e7a64613e1ed3dcde i18n/rus/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-changed in both
-  base   100644 3e00ebd88967071f0fa78b86272ed5b4184ad866 i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 11278b85abb135a3195540e01213542dadbc0081 i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 e55b39d762ba9ed7f50da7a6f13fc794c2632a9f i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,11 @@
- 	"exeBasedRecommendation": "Рекомендуется использовать это расширение, так как установлено {0}.",
- 	"fileBasedRecommendation": "Рекомендуется использовать это расширение (на основе недавно открытых файлов).",
- 	"workspaceRecommendation": "Это расширение рекомендуется пользователями текущей рабочей области.",
-+=======
-+	"workspaceRecommendation": "Это расширение рекомендуется пользователями текущей рабочей области.",
-+	"fileBasedRecommendation": "Рекомендуется использовать это расширение (на основе недавно открытых файлов).",
-+	"exeBasedRecommendation": "Рекомендуется использовать это расширение, так как установлено {0}.",
-+>>>>>>> .their
- 	"reallyRecommended2": "Для этого типа файлов рекомендуется использовать расширение '{0}'.",
- 	"reallyRecommendedExtensionPack": "Для этого типа файлов рекомендуется использовать пакет расширений '{0}'.",
- 	"install": "Установить",
-added in both
-  our    100644 a559dd5de9c17c83d8598a983cb5722c1a0a4524 i18n/rus/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-  their  100644 933a96a0d6f26d405048cb9bd7917959fda315d9 i18n/rus/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,13 @@
- 	],
- 	"workbenchConfigurationTitle": "Рабочее место",
- 	"feedbackVisibility": "Определяет, отображается ли отзыв Twitter (смайлик) на панели состояния в нижней части рабочего места."
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"workbenchConfigurationTitle": "Рабочее место"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 956ea0325cf1c64f1c13d732d89f6f2927535e96 i18n/rus/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"hide": "Скрыть"
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 821930bfc8797aa66e392542a9a207e98e5802c7 i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  our    100644 54559890c5017a8fa991d36e1d32e0ea4a0f5415 i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  their  100644 8ff5f3c27f7cdd0333ba5c5df8959667a7ac2027 i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-@@ -12,7 +12,10 @@
- 	"revertLocalChanges": "Отменить изменения и вернуться к содержимому на диске",
- 	"copyPathOfActive": "Копировать путь к активному файлу",
- 	"saveAllInGroup": "Сохранить все в группе",
-+<<<<<<< .our
- 	"saveFiles": "Сохранить все файлы",
-+=======
-+>>>>>>> .their
- 	"revert": "Отменить изменения в файле",
- 	"compareActiveWithSaved": "Сравнить активный файл с сохраненным",
- 	"closeEditor": "Закрыть редактор",
-@@ -24,12 +27,19 @@
- 	"copyPath": "Скопировать путь",
- 	"saveAll": "Сохранить все",
- 	"compareWithSaved": "Сравнить с сохраненным",
-+<<<<<<< .our
- 	"compareWithSelected": "Сравнить с выбранным",
- 	"compareSource": "Выбрать для сравнения",
- 	"compareSelected": "Сравнить выбранное",
- 	"close": "Закрыть",
- 	"closeOthers": "Закрыть другие",
- 	"closeSaved": "Закрыть сохраненное",
-+=======
-+	"compareSource": "Выбрать для сравнения",
-+	"close": "Закрыть",
-+	"closeOthers": "Закрыть другие",
-+	"closeUnmodified": "Закрыть без изменений",
-+>>>>>>> .their
- 	"closeAll": "Закрыть все",
- 	"deleteFile": "Удалить навсегда"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8e87ab6930ac96fbe342955841c0a060b532186e i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 2c38d1331217bb70a1fc665d1c79c9658eacde43 i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 33066ff5f3379043f15062a1edfbeead49649ff7 i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"newFile": "Создать файл",
- 	"newFolder": "Создать папку",
- 	"rename": "Переименовать",
-@@ -13,7 +16,11 @@
- 	"copyFile": "Копировать",
- 	"pasteFile": "Вставить",
- 	"retry": "Повторить попытку",
-+<<<<<<< .our
- 	"renameWhenSourcePathIsParentOfTargetError": "Для добавления дочерних элементов к существующей папке используйте команды \"Создать папку\" или \"Создать файл\"",
-+=======
-+	"openFolderFirst": "Сначала откройте папку, в которой будут созданы файлы и папки.",
-+>>>>>>> .their
- 	"newUntitledFile": "Новый файл без имени",
- 	"createNewFile": "Создать файл",
- 	"createNewFolder": "Создать папку",
-@@ -43,11 +50,19 @@
- 	"confirmDeleteMessageMultiple": "Вы действительно хотите удалить следующие файлы ({0}) без возможности восстановления?",
- 	"confirmDeleteMessageFolder": "Вы действительно хотите удалить папку \"{0}\" и ее содержимое без возможности восстановления?",
- 	"confirmDeleteMessageFile": "Вы действительно хотите удалить \"{0}\" без возможности восстановления?",
-+<<<<<<< .our
- 	"addFiles": "Добавить файлы",
- 	"confirmOverwrite": "Файл или папка с таким именем уже существует в конечной папке. Заменить их?",
- 	"replaceButtonLabel": "Заменить",
- 	"fileIsAncestor": "Файл для вставки является предком папки назначения",
- 	"fileDeleted": "Файл для вставки был удален или перемещен в другое место",
-+=======
-+	"irreversible": "Это действие необратимо.",
-+	"permDelete": "Удалить навсегда",
-+	"importFiles": "Импорт файлов",
-+	"confirmOverwrite": "Файл или папка с таким именем уже существует в конечной папке. Заменить их?",
-+	"replaceButtonLabel": "Заменить",
-+>>>>>>> .their
- 	"duplicateFile": "Дублировать",
- 	"globalCompareFile": "Сравнить активный файл с...",
- 	"openFileToCompare": "Чтобы сравнить файл с другим файлом, сначала откройте его.",
-changed in both
-  base   100644 f51fb88b34b0afd8d6f8f7420a62fe6370e9c16a i18n/rus/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  our    100644 0f4e31686b5285cee77568bb441986c0fcd0b94a i18n/rus/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  their  100644 18416689c0121ec6502f0e886685e95e1a158437 i18n/rus/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"revealInWindows": "Отобразить в проводнике",
- 	"revealInMac": "Отобразить в Finder",
- 	"openContainer": "Открыть содержащую папку",
-@@ -13,7 +16,10 @@
- 	"save": "Сохранить",
- 	"saveAll": "Сохранить все",
- 	"removeFolderFromWorkspace": "Удалить папку из рабочей области",
-+<<<<<<< .our
- 	"genericRevertError": "Не удалось отменить изменения \"{0}\": {1}",
-+=======
-+>>>>>>> .their
- 	"modifiedLabel": "{0} (на диске) ↔ {1}",
- 	"openFileToReveal": "Чтобы отобразить файл, сначала откройте его",
- 	"openFileToCopy": "Чтобы скопировать путь к файлу, сначала откройте его"
-changed in both
-  base   100644 d0ffe58b0f9ebe24ca76843f1e06cf08de4b0f94 i18n/rus/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 8abc8c89790838ab546398086d2a394a5956c230 i18n/rus/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 6f4f5194bc64405a5fa5211a08ae2ed9dd843634 i18n/rus/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-@@ -40,7 +40,10 @@
- 	"formatOnSave": "Форматирование файла при сохранении. Модуль форматирования должен быть доступен, файл не должен сохраняться автоматически, а работа редактора не должна завершаться.",
- 	"formatOnSaveTimeout": "Время ожидания форматирования при сохранении. Указывает ограничение времени в миллисекундах для команд форматирования при сохранении. Команды, выполнение которых превышает указанное время ожидания, будут отменены.",
- 	"explorerConfigurationTitle": "Проводник",
-+<<<<<<< .our
- 	"openEditorsVisible": "Число редакторов, отображаемых на панели \"Открытые редакторы\".",
-+=======
-+>>>>>>> .their
- 	"autoReveal": "Определяет, будет ли проводник автоматически отображать и выбирать файлы при их открытии.",
- 	"enableDragAndDrop": "Определяет, разрешено ли перемещение файлов и папок перетаскиванием в проводнике.",
- 	"confirmDragAndDrop": "Определяет, должно ли запрашиваться подтверждение при перемещении файлов и папок в проводнике.",
-changed in both
-  base   100644 d5622eec39a12463acb3bf3b84df8406aca38203 i18n/rus/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  our    100644 2c555771b4a5a50496e84e47522fb4a9fc9a7db4 i18n/rus/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  their  100644 a99d73ed5193b2044b825c26d22f4fd23d5be40d i18n/rus/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,6 +14,12 @@
- 	"readonlySaveErrorAdmin": "Не удалось сохранить \"{0}\": файл защищен от записи. Чтобы повторить попытку с правами администратора, выберите \"Перезаписать с правами администратора\".",
- 	"readonlySaveError": "Не удалось сохранить \"{0}\": файл защищен от записи. Чтобы попытаться снять защиту, выберите \"Перезаписать\".",
- 	"permissionDeniedSaveError": "Не удалось сохранить \"{0}\": недостаточные разрешения. Чтобы повторить попытку с правами администратора, выберите \"Повторить попытку с правами администратора\".",
-+=======
-+	"userGuide": "Используйте команды на панели инструментов редактора справа для **отмены** изменений или **перезаписи** содержимого на диске с учетом этих изменений",
-+	"overwrite": "Перезаписать",
-+	"retry": "Повторить попытку",
-+	"discard": "Отмена",
-+>>>>>>> .their
- 	"genericSaveError": "Не удалось сохранить \"{0}\": {1}",
- 	"learnMore": "Дополнительные сведения",
- 	"dontShowAgain": "Больше не показывать",
-changed in both
-  base   100644 ecfb243efe9b21f2cee45008abbfd753f73df0e8 i18n/rus/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  our    100644 521498e74533cb56165fc110217cfd5500b2d565 i18n/rus/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  their  100644 e8bc16acb29acaefc24728699479bc09c02b0ef6 i18n/rus/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-added in both
-  our    100644 e75467d67155eeec49d79a0cb44d78fbecda4936 i18n/rus/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-  their  100644 fa130c143cff110735ad65ca1497754598b46f7a i18n/rus/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,5 +11,13 @@
- 	"sharedLog": "Лог (общий)",
- 	"rendererLog": "Журнал (окно)",
- 	"extensionsLog": "Журнал (узел расширения)",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"developer": "Разработчик"
- }
-\ No newline at end of file
-added in both
-  our    100644 0e35df992440dc39588c4c4bfc73c2bf58694991 i18n/rus/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  their  100644 6d7a48207b90837ea75740fd72c545dee105ff20 i18n/rus/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -16,15 +17,34 @@
- 	"selectProcess": "Выберите журнал для обработки",
- 	"openLogFile": "Открыть лог",
- 	"setLogLevel": "Установите уровень ведения журнала...",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"openLogsFolder": "Открыть папку журналов",
-+	"mainProcess": "Главный",
-+	"sharedProcess": "Общий",
-+	"rendererProcess": "Окно",
-+	"extensionHost": "Узел расширения",
-+	"setLogLevel": "Установите уровень ведения журнала",
-+>>>>>>> .their
- 	"trace": "Трассировка",
- 	"debug": "Отладка",
- 	"info": "Сведения",
- 	"warn": "Предупреждение",
- 	"err": "Ошибка",
-+<<<<<<< .our
- 	"critical": "Критично",
- 	"off": "Отключено",
- 	"selectLogLevel": "Установите уровень ведения журнала",
- 	"default and current": "По умолчанию и текущий",
- 	"default": "По умолчанию",
- 	"current": "Текущий"
-+=======
-+	"off": "Отключено",
-+	"selectLogLevel": "Установите уровень ведения журнала"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 4a0ebeccf873e1e0f47f5c6df66188e36b38f2ff i18n/rus/src/vs/workbench/parts/markers/common/messages.i18n.json
-  our    100644 a1ef2cd59b1cfdd0fef3ef7c2f1f17680b2a643a i18n/rus/src/vs/workbench/parts/markers/common/messages.i18n.json
-  their  100644 c561464b58350e9cf499b713d23184cff38fbe55 i18n/rus/src/vs/workbench/parts/markers/common/messages.i18n.json
-@@ -7,8 +7,11 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"viewCategory": "Просмотреть",
-+<<<<<<< .our
- 	"problems.view.toggle.label": "Включить или отключить сообщения о проблемах (ошибки, предупреждения, информационные сообщения)",
- 	"problems.view.focus.label": "Перевести фокус на сообщения о проблемах (ошибки, предупреждения, информационные сообщения) ",
-+=======
-+>>>>>>> .their
- 	"problems.panel.configuration.title": "Представление \"Проблемы\"",
- 	"problems.panel.configuration.autoreveal": "Определяет, следует ли представлению \"Проблемы\" отображать файлы при их открытии",
- 	"markers.panel.title.problems": "Проблемы",
-added in both
-  our    100644 66e8e86a36d5d543bef59dd5916b76c60f477b16 i18n/rus/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-  their  100644 68cc0434ecd2068b11998afaae95f90e09b5fd10 i18n/rus/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -11,4 +12,15 @@
- 	"viewCategory": "Просмотр",
- 	"clearOutput.label": "Очистить выходные данные",
- 	"openActiveLogOutputFile": "Просмотр: открыть активный выходной файл журнала"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"output": "Вывод",
-+	"viewCategory": "Просмотр",
-+	"clearOutput.label": "Очистить выходные данные"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 78ebecbf38b11d94c1d1b83ebcaaa8b64e3ebcc1 i18n/rus/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,12 @@
- 	],
- 	"output": "{0} - выходные данные",
- 	"channel": "Канал выходных данных для '{0}'"
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 cdba5fc34b20d61e1b453013d04522dcb8083ed2 i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 2639f8a70dc171eed499a24e68b57de977a1debe i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 aa42a73f571c9e4cbfa1a6f46e495d33b17dca5a i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"defaultSettings": "Чтобы переопределить параметры по умолчанию, укажите свои параметры в области справа.",
- 	"noSettingsFound": "Параметры не найдены.",
- 	"settingsSwitcherBarAriaLabel": "Переключатель параметров",
-changed in both
-  base   100644 345c107b419df1726ab8ea2085df7d0d7187d01f i18n/rus/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  our    100644 483c3b52c9f8f9cbb40dc452ed503745972ba5e2 i18n/rus/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  their  100644 3305d6aa84d144d7e837abbb85ab71651d52c337 i18n/rus/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-changed in both
-  base   100644 a683b0d8467ceb8de1d0c32015833691e735ce99 i18n/rus/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  our    100644 c4999d23f084babf6ae588d11b5369e70fb0cf07 i18n/rus/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  their  100644 f0071d32bf8d2e6a969c2190e1af1574557756b9 i18n/rus/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"view": "Просмотр",
- 	"commandsHandlerDescriptionDefault": "Показать и выполнить команды",
- 	"gotoLineDescriptionMac": "Перейти к строке",
-changed in both
-  base   100644 029a91dd1211a2d0d2a7b909a874cad6a54856c1 i18n/rus/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  our    100644 39961b3a4e8ca19501aa8f2ce29968dd3e4cbb83 i18n/rus/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  their  100644 9b3baff608332f78e429028ad878102c1235f6e3 i18n/rus/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-@@ -10,8 +10,12 @@
- 	"source control": "Система управления версиями",
- 	"toggleSCMViewlet": "Показать SCM",
- 	"view": "Просмотреть",
-+<<<<<<< .our
- 	"scmConfigurationTitle": "SCM",
- 	"alwaysShowProviders": "Всегда отображать хранилище исходного кода",
- 	"diffDecorations": "Управляет декораторами diff в редакторе.",
- 	"diffGutterWidth": "Управляет шириной (в пикселах) декораторов diff в поле (добавление и изменение)."
-+=======
-+	"scmConfigurationTitle": "SCM"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 acbdea84856b1cefb4e065513b84863254aa5518 i18n/rus/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 012af24286aec719761b0687ebd50b2292e4db5e i18n/rus/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 cd1b69665355d9112254187841fbb8f3c4985ebf i18n/rus/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-changed in both
-  base   100644 fb91734ab3bc363372fdf1dea6f0720c64d52c02 i18n/rus/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 113d804b27033c0eb1fd8478b7abca09ae0f3e64 i18n/rus/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 e2ad0465583f781ffdc748b254abb4273c4bcfe9 i18n/rus/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -16,7 +16,12 @@
- 	"findInWorkspace": "Найти в рабочей области...",
- 	"showTriggerActions": "Перейти к символу в рабочей области...",
- 	"name": "Поиск",
-+<<<<<<< .our
- 	"showSearchViewl": "Показать средство поиска",
-+=======
-+	"search": "Поиск",
-+	"showSearchViewlet": "Показать средство поиска",
-+>>>>>>> .their
- 	"view": "Просмотр",
- 	"findInFiles": "Найти в файлах",
- 	"openAnythingHandlerDescription": "Перейти к файлу",
-added in both
-  our    100644 be81058c120ea99acf154c232771dc0c03be4a7f i18n/rus/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-  their  100644 26ab76b193c42da36904f96687895ae1a8975ae8 i18n/rus/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -13,5 +14,14 @@
- 	"new.global.sep": "Новые фрагменты кода",
- 	"openSnippet.pickLanguage": "Выберите файл фрагментов кода или создайте фрагменты",
- 	"openSnippet.label": "Настроить пользовательские фрагменты кода",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"global.1": "({0})",
-+>>>>>>> .their
- 	"preferences": "Параметры"
- }
-\ No newline at end of file
-changed in both
-  base   100644 a3a8c117e656c5166b6788c38531e9e653c25775 i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  our    100644 4a2946695c164a4a0f1eb0ce1f03d90cce755916 i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  their  100644 0bfa5d00f22bb36ffd41809dd5a3ab1ad0d7c78d i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"snippetSchema.json.default": "Пустой фрагмент",
- 	"snippetSchema.json": "Настройка фрагмента пользователя",
- 	"snippetSchema.json.prefix": "Префикс, используемый при выборе фрагмента в Intellisense.",
-added in both
-  our    100644 c1919f596fc5f167770df0667fbe250479669163 i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-  their  100644 dd3a311fe89b353bba0bf915b580e0ebfee64fc7 i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,5 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"source.snippetGlobal": "Глобальный пользовательский фрагмент кода",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"source.snippet": "Фрагмент кода пользователя"
- }
-\ No newline at end of file
-changed in both
-  base   100644 6c5ec091a1a8bf47c22b120df8180dc103e3af1f i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  our    100644 6a37d94b67d26daf129e538d4e91992157d2b014 i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 afe0462f8a1bf28a66a62f5acfe40de60b9ebc00 i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,9 @@
- 	],
- 	"invalid.path.0": "В contributes.{0}.path требуется строка. Указанное значение: {1}",
- 	"invalid.language.0": "Если язык не указан, то в качестве значения параметра \"contributes.{0}.path\" необходимо указать файл \".code-snippets\". Указанное значение: {1}",
-+=======
-+	"invalid.path.0": "В contributes.{0}.path требуется строка. Указанное значение: {1}",
-+>>>>>>> .their
- 	"invalid.language": "Неизвестный язык в contributes.{0}.language. Указанное значение: {1}",
- 	"invalid.path.1": "contributes.{0}.path ({1}) должен был быть включен в папку расширения ({2}). Это может сделать расширение непереносимым.",
- 	"vscode.extension.contributes.snippets": "Добавляет фрагменты.",
-changed in both
-  base   100644 fc208588fb0fbe740f70c087d14259a8f43f705b i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 aca12bf1061a643000b1615902ead62bb39d5223 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 04ba7d28169afecb0309b7b00bc1bdc5d4f0e6bf i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -10,7 +10,11 @@
- 	"terminal.foreground": "Цвет переднего плана терминала.",
- 	"terminalCursor.foreground": "Цвет переднего плана курсора терминала.",
- 	"terminalCursor.background": "Цвет фона курсора терминала. Позволяет выбрать цвет символа, который перекрывается блочным курсором.",
-+<<<<<<< .our
- 	"terminal.selectionBackground": "Цвет фона выделения терминала.",
- 	"terminal.border": "Цвет границы, которая отделяет области в терминале. По умолчанию используется panel.border.",
- 	"terminal.ansiColor": "Цвет ANSI \"{0}\" в терминале."
-+=======
-+	"terminal.selectionBackground": "Цвет фона выделения терминала."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 440d374ef82a867ce1e826cae5020ba7637c4dc3 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  our    100644 cc8f5ba62551fedf802d2c73116bb6cf543dedf0 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  their  100644 9de408a96531f26b10ca2872b2d9cae2cffc0c62 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-@@ -8,7 +8,11 @@
- 	],
- 	"terminal.integrated.chooseWindowsShellInfo": "Вы можете изменить оболочку терминала по умолчанию, нажав кнопку \"Настроить\".",
- 	"customize": "Настроить",
-+<<<<<<< .our
- 	"never again": "Больше не показывать",
-+=======
-+	"cancel": "Отмена",
-+>>>>>>> .their
- 	"terminal.integrated.chooseWindowsShell": "Выберите предпочитаемую оболочку терминала. Ее можно позже изменить в параметрах",
- 	"terminalService.terminalCloseConfirmationSingular": "Есть активный сеанс терминала, завершить его?",
- 	"terminalService.terminalCloseConfirmationPlural": "Есть несколько активных сеансов терминала ({0}), завершить их?"
-changed in both
-  base   100644 54fbd1ada7bea832b4126e776a432a2416a6e049 i18n/rus/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  our    100644 2c983a39d579894623f58659f4686ad21c8ac392 i18n/rus/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  their  100644 04cb07cdd65339926fe65b4a50a88d81465067ea i18n/rus/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,4 +14,8 @@
- 	"fileBinaryError": "Похоже, файл является двоичным, и его нельзя открыть как текстовый.",
- 	"err.create": "Не удалось создать файл {0}",
- 	"fileMoveConflict": "Невозможно переместить или скопировать файл, так как он уже существует в папке назначения."
-+=======
-+	"fileNotModifiedError": "undefined",
-+	"fileBinaryError": "Похоже, файл является двоичным, и его нельзя открыть как текстовый."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 fd9cd98e381e558ab8aa0622777622809edef278 i18n/rus/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  our    100644 c95c2d23f40165f8294939adbeb06bfeb1329160 i18n/rus/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  their  100644 27106b8b44deea758057ba532dca3dd8c4013542 i18n/rus/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-changed in both
-  base   100644 9cba5bba5fd02f0bdeee2b92090657d20b995d21 i18n/rus/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 73e5413908fbafda8e65fdd1e7768bf4e42a1926 i18n/rus/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 768f28f6eae7f92a9394a892067e932fa662a109 i18n/rus/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-changed in both
-  base   100644 019229d3fbb49ee267496c8b4f77617bec14a7b4 i18n/rus/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  our    100644 680471e1ac0c7a4674469f91fa5e0f8217d52603 i18n/rus/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  their  100644 d4e81ae004d3800ac9660ff05a0dd0295368f335 i18n/rus/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-@@ -8,5 +8,10 @@
- 	],
- 	"errorInvalidTaskConfiguration": "Не удается записать файл конфигурации рабочей области. Откройте файл, исправьте ошибки и предупреждения и повторите попытку.",
- 	"errorWorkspaceConfigurationFileDirty": "Не удается записать файл конфигурации рабочей области, так как файл был изменен. Сохраните файл и повторите попытку.",
-+<<<<<<< .our
- 	"openWorkspaceConfigurationFile": "Открыть конфигурацию рабочей области"
-+=======
-+	"openWorkspaceConfigurationFile": "Открыть файл конфигурации рабочей области",
-+	"close": "Закрыть"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 95a3249f5f42d72c85f1118613642151a0bf7432 i18n/trk/extensions/git/out/autofetch.i18n.json
-  our    100644 e8cd01ea688ad2f3d81abdedfd84873e92fd5d52 i18n/trk/extensions/git/out/autofetch.i18n.json
-  their  100644 737e720ea79d9b552bdd82bc0d6dba9081c7383f i18n/trk/extensions/git/out/autofetch.i18n.json
-@@ -7,7 +7,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"yes": "Evet",
-+	"read more": "Devamını oku",
- 	"no": "Hayır",
- 	"not now": "Daha sonra hatırlat",
-+<<<<<<< .our
- 	"suggest auto fetch": "Code'un [düzenli olarak 'git fetch' komutunu çalıştırmasını]({0}) ister misiniz?"
-+=======
-+	"suggest auto fetch": "Code'un düzenli olarak `git fetch` komutunu çalıştırmasını ister misiniz?"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 fac3c95bae738f7838f2d8abeae2fc33198e6b22 i18n/trk/extensions/git/out/commands.i18n.json
-  our    100644 6794dc4934caa0927c5d65dc1f742c2cefd9cd5b i18n/trk/extensions/git/out/commands.i18n.json
-  their  100644 1f602af17def513c8593487fc45294cce36a34da i18n/trk/extensions/git/out/commands.i18n.json
-@@ -75,8 +75,12 @@
- 	"ok": "Tamam",
- 	"push with tags success": "Başarılı bir şekilde etiketlerle gönderildi.",
- 	"pick remote": "'{0}' dalının yayınlanacağı bir uzak uçbirim seçin:",
-+<<<<<<< .our
- 	"sync is unpredictable": "Bu eylem, '{0}/{1}' deposuna commitleri gönderecek ve alacaktır.",
- 	"never again": "Tamam, Tekrar Gösterme",
-+=======
-+	"sync is unpredictable": "Bu eylem, '{0}' esas projesine commitleri gönderecek ve alacaktır.",
-+>>>>>>> .their
- 	"no remotes to publish": "Deponuzda yayınlamanın yapılacağı hiçbir uzak uçbirim yapılandırılmamış.",
- 	"no changes stash": "Geçici olarak saklanacak bir değişiklik yok.",
- 	"provide stash message": "İsteğe bağlı olarak bir geçici olarak saklama mesajı belirtin",
-changed in both
-  base   100644 34a8658c3922be1002212f040cace7d4c39bf362 i18n/trk/extensions/git/out/main.i18n.json
-  our    100644 22cc3828e0d29dd283113a2173362b997f248b1d i18n/trk/extensions/git/out/main.i18n.json
-  their  100644 ebd9e4be3fa503be51a49085efbf8cdef4b19020 i18n/trk/extensions/git/out/main.i18n.json
-changed in both
-  base   100644 3955baf58a0316b298f3939e180e82f77bab7484 i18n/trk/extensions/git/package.i18n.json
-  our    100644 c440a7230c670854e02c25e2d19a46df2b4abcb8 i18n/trk/extensions/git/package.i18n.json
-  their  100644 7e10d7b3daeb0393ed03dd7d4eaef943f299586c i18n/trk/extensions/git/package.i18n.json
-added in both
-  our    100644 8893bf346b34401ace4bd99635e7a8db66098e78 i18n/trk/extensions/typescript/out/commands.i18n.json
-  their  100644 2751d3bb07c455357481a32f33edb879ad40badd i18n/trk/extensions/typescript/out/commands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -13,4 +14,20 @@
- 	"typescript.noJavaScriptProjectConfig": "Dosya bir JavaScript projesinin parçası değil. Daha fazla bilgi almak için [buraya]({0}) tıklayın.",
- 	"typescript.configureTsconfigQuickPick": "tsconfig.json'u yapılandır",
- 	"typescript.configureJsconfigQuickPick": "jsconfig.json'u yapılandır"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"typescript.projectConfigNoWorkspace": "Bir TypeScript veya JavaScript projesini kullanmak için lütfen bir klasör açın",
-+	"typescript.projectConfigUnsupportedFile": "TypeScript mi yoksa JavaScript mi projesi olduğu tespit edilemedi. Desteklenmeyen dosya türü",
-+	"typescript.projectConfigCouldNotGetInfo": "TypeScript mi yoksa JavaScript mi projesi olduğu tespit edilemedi",
-+	"typescript.noTypeScriptProjectConfig": "Dosya bir TypeScript projesinin bir parçası değil",
-+	"typescript.noJavaScriptProjectConfig": "Dosya bir JavaScript projesinin bir parçası değil",
-+	"typescript.configureTsconfigQuickPick": "tsconfig.json'u yapılandır",
-+	"typescript.configureJsconfigQuickPick": "jsconfig.json'u yapılandır",
-+	"typescript.projectConfigLearnMore": "Daha Fazla Bilgi Edin"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 750d811d866eaa3d43818bd1d8e28c9898acf514 i18n/trk/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-  their  100644 ed15423097d5cbb03aeb8c474db3877ca0d1584f i18n/trk/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"selectAriaOption": "{0}"
- }
-\ No newline at end of file
-added in both
-  our    100644 36b27f91f651be04b8d69e6ded6a5a4741204c40 i18n/trk/src/vs/base/node/ps.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/trk/src/vs/base/node/ps.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"collecting": "CPU ve bellek bilgisi toplanıyor. Bu işlem birkaç saniye sürebilir."
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 3a5d4006fd7b681fc7de41047ccba5ea23784969 i18n/trk/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 80d2362504c2993d022a2eba3b68977e0e73b16b i18n/trk/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 d00cee8579ff5166807cb052755381b44bcf84e5 i18n/trk/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -16,7 +16,11 @@
- 	"lineNumbers.on": "Satır numaraları mutlak sayı olarak gösterilir.",
- 	"lineNumbers.relative": "Satır numaraları imlecin konumuna olan uzaklık olarak gösterilir.",
- 	"lineNumbers.interval": "Satır numaraları her 10 satırda bir gösterilir.",
-+<<<<<<< .our
- 	"lineNumbers": "Satır numaralarının görüntülenmesini denetler.",
-+=======
-+	"lineNumbers": "Satır numaralarının görüntülenmesini denetler. Olası değerler 'on', 'off', 'relative' ve 'interval'dir.\n",
-+>>>>>>> .their
- 	"rulers": "Belirli bir eşit genişlikli karakterlerden sonra dikey cetveller göster. Birden çok cetvel için birden çok değer kullanın. Dizi boş ise cetvel gösterilmez",
- 	"wordSeparators": "Sözcüklerle ilgili gezinti veya işlem yaparken kelime ayırıcı olarak kullanılacak karakterler",
- 	"tabSize": "Bir sekmenin eşit olduğu boşluk sayısı. Bu ayar, `editor.detectIndentation` açıkken dosya içeriğine bağlı olarak geçersiz kılınır.",
-changed in both
-  base   100644 6022a86b6cc49f3e32c1c4da21bd8325d92f169e i18n/trk/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 2cef84bd724584b1f220944adb841c7825808a67 i18n/trk/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 8fb29c3b6d61793d592a1c3f575c596f64cdb401 i18n/trk/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -8,8 +8,11 @@
- 	],
- 	"lineHighlight": "İmlecin bulunduğu satırın vurgusunun arka plan rengi.",
- 	"lineHighlightBorderBox": "İmlecin bulunduğu satırın kenarlığının arka plan rengi.",
-+<<<<<<< .our
- 	"rangeHighlight": "Hızlı açma veya arama özellikleri gibi vurgulanan aralıkların arka plan rengi. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
- 	"rangeHighlightBorder": "Vurgulanmış alanın etrafındaki kenarlıkların arka plan rengi.",
-+=======
-+>>>>>>> .their
- 	"caret": "Düzenleyici imlecinin rengi.",
- 	"editorCursorBackground": "Düzenleyici imlecinin arka plan rengi. Bir blok imlecinin kapladığı bir karakterin rengini özelleştirmeyi sağlar.",
- 	"editorWhitespaces": "Düzenleyicideki boşluk karakterlerinin rengi.",
-changed in both
-  base   100644 6bc3935d6f49b063ef85feb665e245d4c7e9f34b i18n/trk/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  our    100644 8f00d61b2f910b917c402fab646ed42ebd87d4ff i18n/trk/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  their  100644 b9f1dd5ddfd778c505d1f9f8b85078f6ea4ae0cb i18n/trk/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -10,4 +11,11 @@
- 	"markerAction.previous.label": "Önceki Soruna Git (Hata, Uyarı, Bilgi)",
- 	"markerAction.nextInFiles.label": "Dosyalarda Sonraki Soruna Git (Hata, Uyarı, Bilgi)",
- 	"markerAction.previousInFiles.label": "Dosyalarda Önceki Soruna Git (Hata, Uyarı, Bilgi)"
-+=======
-+	"title.wo_source": "({0}/{1})",
-+	"editorMarkerNavigationError": "Düzenleyicinin işaretçi gezinti aracının hata rengi.",
-+	"editorMarkerNavigationWarning": "Düzenleyicinin işaretçi gezinti aracının uyarı rengi.",
-+	"editorMarkerNavigationInfo": "Düzenleyicinin işaretçi gezinti aracının bilgilendirme rengi.",
-+	"editorMarkerNavigationBackground": "Düzenleyicinin işaretçi gezinti aracının arka planı."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6faf663326db20aad45550dfe4eb9100056606f9 i18n/trk/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  our    100644 5d14aeee198e7881b94c6c28f52827c185996785 i18n/trk/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  their  100644 f6e38f50e993ddcc0ce78aae39e18293342c8ba9 i18n/trk/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,10 @@
- 	"wordHighlightStrongBorder": "Bir değişkene yazılırken ki gibi, bir sembolün yazma erişimi sırasındaki kenarlık rengi.",
- 	"overviewRulerWordHighlightForeground": "Sembol vurguları için genel bakış cetvelinin işaretleyici rengi. Altta yer alan süslemeleri gizlememek için renk mat olmamalıdır.",
- 	"overviewRulerWordHighlightStrongForeground": "Yazma erişimli sembol vurguları için genel bakış cetvelinin işaretleyici rengi. Altta yer alan süslemeleri gizlememek için renk mat olmamalıdır.",
-+=======
-+	"overviewRulerWordHighlightForeground": "Sembol vurguları için genel bakış cetvelinin işaretleyici rengi.",
-+	"overviewRulerWordHighlightStrongForeground": "Yazma erişimli sembol vurguları için genel bakış cetvelinin işaretleyici rengi.",
-+>>>>>>> .their
- 	"wordHighlight.next.label": "Sonraki Sembol Vurgusuna Git",
- 	"wordHighlight.previous.label": "Önceki Sembol Vurgusuna Git"
- }
-\ No newline at end of file
-changed in both
-  base   100644 5ddafd4b6b978d2fd799290a45716122eb6bdef0 i18n/trk/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  our    100644 cf0aa1dfaf2b39bdf7038b0ab5c826f2430d60ca i18n/trk/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  their  100644 5565278f23e7a27ac0b9b8f77088ec3336f58a3d i18n/trk/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 a4c4cd296d5db4ce1136a2bc299ac1232dc02f9f i18n/trk/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 de45d35b28e099e902eb3585dc451750064bb035 i18n/trk/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 6838345e4f98f3b46ae9471a0618445895b385ee i18n/trk/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,11 +10,19 @@
- 	"diff": "İki dosyayı birbiriyle karşılaştır.",
- 	"add": "Son aktif pencereye klasör(ler) ekle.",
- 	"goto": "Konumdaki bir dosyayı belirtilen satır ve sütunda aç.",
-+<<<<<<< .our
- 	"newWindow": "Yeni pencere açmaya zorla.",
- 	"reuseWindow": "Bir dosya veya klasörü son aktif pencerede açmaya zorlayın.",
- 	"wait": "Geri dönmeden önce dosyaların kapanmasını bekle.",
- 	"locale": "Kullanılacak yerel dil (örnek: en-US veya zh-TW).",
- 	"userDataDir": "Kullanıcı verilerinin tutulacağı klasörü belirtir. Code'un farklı örneklerini açmak için kullanılabilir.",
-+=======
-+	"newWindow": "Yeni bir Code örneğini zorla.",
-+	"reuseWindow": "Bir dosya veya klasörü son etkin pencerede açmaya zorlayın.",
-+	"wait": "Geri dönmeden önce dosyaların kapanmasını bekle.",
-+	"locale": "Kullanılacak yerel dil (örnek: en-US veya zh-TW).",
-+	"userDataDir": "Kullanıcı verilerinin tutulacağı klasörü belirtir, root olarak çalışırken yararlıdır.",
-+>>>>>>> .their
- 	"version": "Sürümü göster.",
- 	"help": "Kullanımı göster.",
- 	"extensionHomePath": "Eklentilerin kök dizinini belirle.",
-@@ -32,8 +40,11 @@
- 	"inspect-extensions": "Eklentilerde hata ayıklama ve ayrımlamaya izin ver. Bağlantı URI'ı için geliştirici araçlarını kontrol edin.",
- 	"inspect-brk-extensions": "Eklentilerde hata ayıklama ve ayrımlamaya eklenti sunucusu başladıktan hemen sonra duraklatılacak şekilde izin ver. Bağlantı URI'ı için geliştirici araçlarını kontrol edin.",
- 	"disableGPU": "GPU donanım hızlandırmasını devre dışı bırak.",
-+<<<<<<< .our
- 	"uploadLogs": "Geçerli oturumdaki günlükleri güvenli bir uçbirime yükler.",
- 	"maxMemory": "Bir pencere için maksimum bellek miktarı (Mbyte olarak).",
-+=======
-+>>>>>>> .their
- 	"usage": "Kullanım",
- 	"options": "seçenekler",
- 	"paths": "yollar",
-changed in both
-  base   100644 7cf70b2f373b87273786cad5f29d0b1a09fb87ba i18n/trk/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 8beb681b33236f0693c452fd17c2070b7f15779a i18n/trk/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 4014a5cf5420bea2dbb4f100b2f27f9d993d668a i18n/trk/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -7,11 +7,15 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"invalidManifest": "Eklenti geçersiz: package.json bir JSON dosyası değil.",
-+<<<<<<< .our
- 	"incompatible": "VS Code '{1}' ile uyumlu olmadığı için '{0}' eklentisi yüklenemiyor.",
-+=======
-+>>>>>>> .their
- 	"restartCode": "{0} eklentisini yeniden yüklemeden önce lütfen Code'u yeniden başlatın.",
- 	"installingOutdatedExtension": "Bu eklentinin daha yeni bir sürümü zaten yüklü. Bunu, daha eski bir sürümle geçersiz kılmak ister misiniz?",
- 	"override": "Geçersiz Kıl",
- 	"cancel": "İptal",
-+<<<<<<< .our
- 	"errorInstallingDependencies": "Bağımlılıklar yüklenirken hata oluştu. {0}",
- 	"MarketPlaceDisabled": "Market etkin değil",
- 	"removeError": "Eklenti kaldırılırken hata oluştu: {0}. Yeniden yüklemeden önce lütfen VS Code'dan çıkın ve tekrar açın.",
-@@ -22,6 +26,12 @@
- 	"quitCode": "Eklenti yüklenemedi. Lütfen yeniden yüklemeden önce VS Code'u sonlandırın ve tekrar başlatın.",
- 	"exitCode": "Eklenti yüklenemedi. Lütfen yeniden yüklemeden önce VS Code'u sonlandırın ve tekrar başlatın.",
- 	"renameError": "{0}, {1} olarak yeniden adlandırılırken bilinmeyen hata oluştu",
-+=======
-+	"notFoundCompatible": "'{0}' yüklenemiyor; VS Code '{1}' ile uyumlu mevcut bir sürümü yok.",
-+	"notFoundCompatibleDependency": "Yükleme başarısız oldu çünkü, bağımlılığı bulunan '{0}' eklentisinin uyumlu olduğu VS Code'un '{1}' sürümü bulunamadı.",
-+	"quitCode": "Eklenti yüklenemedi. Lütfen yeniden yüklemeden önce VS Code'u sonlandırın ve tekrar başlatın.",
-+	"exitCode": "Eklenti yüklenemedi. Lütfen yeniden yüklemeden önce VS Code'u sonlandırın ve tekrar başlatın.",
-+>>>>>>> .their
- 	"uninstallDependeciesConfirmation": "Yalnızca '{0}' eklentisini mi yoksa bağımlılıklarını da kaldırmak ister misiniz?",
- 	"uninstallOnly": "Sadece Eklenti",
- 	"uninstallAll": "Tümünü Kaldır",
-changed in both
-  base   100644 8d0fe38437997006f64b88fc3f596247e05cfe6b i18n/trk/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
-  our    100644 6cac235b96e23fa0206c3f9a16422d2ed38ebd54 i18n/trk/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
-  their  100644 a5e03c838162a38e04b07d5280efa34867dc36d7 i18n/trk/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -9,4 +10,10 @@
- 	"integrity.prompt": "{0} kurulumunuz bozuk görünüyor. Lütfen yeniden yükleyin.",
- 	"integrity.moreInformation": "Daha Fazla Bilgi",
- 	"integrity.dontShowAgain": "Tekrar Gösterme"
-+=======
-+	"integrity.ok": "Tamam",
-+	"integrity.dontShowAgain": "Tekrar Gösterme",
-+	"integrity.moreInfo": "Daha fazla bilgi",
-+	"integrity.prompt": "{0} kurulumunuz bozuk görünüyor. Lütfen yeniden yükleyin."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 4f9a44f93833cfe6541dafcb1c0839c572c4c55b i18n/trk/src/vs/platform/message/common/message.i18n.json
-  our    100644 e202ce636d4fa0f9420deac8135228049e24e40d i18n/trk/src/vs/platform/message/common/message.i18n.json
-  their  100644 3d5ccdec1e6a197b608e75f72be5f58389625ef6 i18n/trk/src/vs/platform/message/common/message.i18n.json
-changed in both
-  base   100644 d6e0e3db1425ccda186cceb638402e8abdb1619c i18n/trk/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 fdc69c2c9e4d77a2bba5e0204a27fccdd7aa58e1 i18n/trk/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 f57a875d1dbf08cf13d7c6380851eece010e953b i18n/trk/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -68,6 +68,7 @@
- 	"editorWidgetBorder": "Editör araçlarının kenarlık rengi. Renk, araç bir kenarlığı olmasına karar verdiğinde ve renk hiçbir eklenti tarafından geçersiz kılınmadığında kullanılır.",
- 	"editorSelectionBackground": "Düzenleyici seçiminin rengi.",
- 	"editorSelectionForeground": "Yüksek karşıtlık için seçilen metnin rengi.",
-+<<<<<<< .our
- 	"editorInactiveSelection": "Aktif olmayan bir düzenleyicideki seçimin rengi. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
- 	"editorSelectionHighlight": "Seçimle aynı içeriğe sahip bölgelerin rengi. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
- 	"editorSelectionHighlightBorder": "Seçimle aynı içeriğe sahip bölgelerin kenarlık rengi.",
-@@ -79,6 +80,9 @@
- 	"findRangeHighlightBorder": "Aramayı sınırlandıran aralığın kenarlık rengi. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
- 	"findWidgetResizeBorder": "Gereç bulmak için yeniden boyutlandırma çubuğunun kenarlık rengi.",
- 	"hoverHighlight": "Sözcüğün altında yer alan bağlantı vurgusu. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
-+=======
-+	"editorFindMatch": "Geçerli arama eşleşmesinin rengi.",
-+>>>>>>> .their
- 	"hoverBackground": "Düzenleyici bağlantı vurgusunun arka plan rengi.",
- 	"hoverBorder": "Düzenleyici bağlantı vurgusunun kenarlık rengi.",
- 	"activeLinkForeground": "Aktif bağlantıların rengi.",
-@@ -86,12 +90,15 @@
- 	"diffEditorRemoved": "Kaldırılmış metin için arka plan rengi. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
- 	"diffEditorInsertedOutline": "Eklenen metnin ana hat rengi.",
- 	"diffEditorRemovedOutline": "Çıkarılan metnin ana hat rengi.",
-+<<<<<<< .our
- 	"mergeCurrentHeaderBackground": "Satır içi birleştirme çakışmalarında \"mevcut olan\" üstbilgisi arka planı. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
- 	"mergeCurrentContentBackground": "Satır içi birleştirme çakışmalarında mevcut olan içeriğin arka planı. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
- 	"mergeIncomingHeaderBackground": "Satır içi birleştirme çakışmalarında \"gelen değişiklik\" üstbilgisi arka planı. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
- 	"mergeIncomingContentBackground": "Satır içi birleştirme çakışmalarında gelen değişiklik içeriğinin arka planı. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
- 	"mergeCommonHeaderBackground": "Satır içi birleştirme çakışmalarında ortak ata üstbilgisi arka planı. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
- 	"mergeCommonContentBackground": "Satır içi birleştirme çakışmalarında ortak ata içeriğinin arka planı. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
-+=======
-+>>>>>>> .their
- 	"mergeBorder": "Satır içi birleştirme çakışmalarında üst bilgi ve ayırıcıdaki kenarlık rengi.",
- 	"overviewRulerCurrentContentForeground": "Satır içi birleştirme çakışmalarında \"mevcut olan\" için genel bakış cetveli ön planı.",
- 	"overviewRulerIncomingContentForeground": "Satır içi birleştirme çakışmalarında gelen genel bakış cetveli ön planı.",
-added in both
-  our    100644 15d5c003a775612763a5b3ad8b2eef344c75ffe7 i18n/trk/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 94c6abc9b61773b1f3828a91c9260207b7b8fd41 i18n/trk/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,5 +10,13 @@
- 	"timeout.formatOnSave": "Kaydederken biçimlendirme {0}ms sonrasında durduruldu",
- 	"codeActionsOnSave.didTimeout": "{0}ms sonra codeActionsOnSave durduruldu",
- 	"timeout.onWillSave": "onWillSaveTextDocument olayı 1750ms sonrasında durduruldu",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"saveParticipants": "Katılımcıların Kaydedilmesi İşlemi Çalıştırılıyor..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 a3dd0ab5f9592ff9fa83f5206912fe6681d60586 i18n/trk/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  our    100644 45dce70f0b9433b89e94a31f7ddb89010e48f4d1 i18n/trk/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  their  100644 737337540bff2cfe0fd0dc62773c48499a07a52a i18n/trk/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,7 @@
- 	],
- 	"treeView.notRegistered": "Kayıtlı '{0}' Id'li ağaç görünümü yok.",
- 	"treeView.duplicateElement": "{0} id'sine sahip bir öge zaten kayıtlı"
-+=======
-+	"treeView.notRegistered": "Kayıtlı '{0}' Id'li ağaç görünümü yok."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a8ba8956df1916cb5172c224f38f368360e420c2 i18n/trk/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 ca5ef369836861985d260e6a09f5dc65617432d0 i18n/trk/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 43558a9d00d8da318d90aa2859fe679a44a9b8d0 i18n/trk/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -14,5 +14,10 @@
- 	"save": "&&Kaydet",
- 	"saveWorkspace": "Çalışma Alanını Kaydet",
- 	"openWorkspaceAction": "Çalışma Alanı Aç...",
-+<<<<<<< .our
- 	"openWorkspaceConfigFile": "Çalışma Alanı Yapılandırma Dosyasını Aç"
-+=======
-+	"openWorkspaceConfigFile": "Çalışma Alanı Yapılandırma Dosyasını Aç",
-+	"openFolderAsWorkspaceInNewWindow": "Klasörü Yeni Pencerede Çalışma Alanı Olarak Aç"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 1986c3bda9bd068bfeb472a340408056933df8ba i18n/trk/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-  their  100644 1b71f510ec6c595be6563703877d9a777f5ef7ab i18n/trk/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"addFolderToWorkspace": "Çalışma Alanına Klasör Ekle...",
- 	"add": "&&Ekle",
- 	"addFolderToWorkspaceTitle": "Çalışma Alanına Klasör Ekle",
-changed in both
-  base   100644 5ff77e04882de7728a0c4c1c0344082789e38d93 i18n/trk/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  our    100644 00ae5c22030c68e202403cce3d407c25a3c30e50 i18n/trk/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  their  100644 4ee34bebb2da28b6a9deb6b5fd9b9f21641e59d0 i18n/trk/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-@@ -19,6 +19,7 @@
- 	"close": "Kapat",
- 	"closeOthers": "Diğerlerini Kapat",
- 	"closeRight": "Sağdakileri Kapat",
-+<<<<<<< .our
- 	"closeAllSaved": "Kaydedilenleri Kapat",
- 	"closeAll": "Tümünü Kapat",
- 	"keepOpen": "Açık Tut",
-@@ -27,6 +28,15 @@
- 	"keepEditor": "Düzenleyiciyi Tut",
- 	"closeEditorsInGroup": "Gruptaki Tüm Düzenleyicileri Kapat",
- 	"closeSavedEditors": "Gruptaki Kaydedilmiş Düzenleyicileri Kapat",
-+=======
-+	"closeAllUnmodified": "Değiştirilmeyenleri Kapat",
-+	"closeAll": "Tümünü Kapat",
-+	"keepOpen": "Açık Tut",
-+	"showOpenedEditors": "Açık Düzenleyicileri Göster",
-+	"keepEditor": "Düzenleyiciyi Tut",
-+	"closeEditorsInGroup": "Gruptaki Tüm Düzenleyicileri Kapat",
-+	"closeUnmodifiedEditors": "Gruptaki Değiştirilmemiş Düzenleyicileri Kapat",
-+>>>>>>> .their
- 	"closeOtherEditors": "Diğer Düzenleyicileri Kapat",
- 	"closeRightEditors": "Düzenleyicinin Sağındakileri Kapat"
- }
-\ No newline at end of file
-changed in both
-  base   100644 b32e97503d97ea9e266a872e3dc8971ba5a5a596 i18n/trk/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 90a1b3244f94cd03152dda02b0a88dc41cc1f806 i18n/trk/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 3264a4ed56efaf885f95de85b98975e54ae898c8 i18n/trk/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 4eac419d706d6ad980a10bd754e50d3865311237 i18n/trk/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  our    100644 c70ebf429600ae042203dc5c1bed3bdc5d9ccef5 i18n/trk/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  their  100644 0f560d95c003737ea68b3ee3c89abb7bf7cbeb54 i18n/trk/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-changed in both
-  base   100644 9fb7a026e34e17fcd958e5b7a2f1cea1d72665a1 i18n/trk/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  our    100644 f0597ecc3636a2dd0a6cc651bfee1daf2088f409 i18n/trk/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  their  100644 e73c3315e6d6648c7ce756b7971f0dc63f37f381 i18n/trk/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-changed in both
-  base   100644 18e318decfd8835f0849fe67428da002bafb90b9 i18n/trk/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  our    100644 4c89a16f31ac4d92047d3020376f32ce8eae9eb7 i18n/trk/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  their  100644 d62c167e7b6a78584a114bd9afa0ea33bb8e390a i18n/trk/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"close": "Kapat",
-+>>>>>>> .their
- 	"araLabelEditorActions": "Düzenleyici eylemleri"
- }
-\ No newline at end of file
-changed in both
-  base   100644 f143e04de94477b7e04d853f70671c718a770495 i18n/trk/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
-  our    100644 d037c5d4f78bd407b3b48905c40176441a8d79b2 i18n/trk/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
-  their  100644 1b5f24a539859b1a112b86dc51cd771ee5419ad2 i18n/trk/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
-changed in both
-  base   100644 9eb9ad116a5238fbf876533e50d6b63e7763457c i18n/trk/src/vs/workbench/common/theme.i18n.json
-  our    100644 c3e69879379552f9bae45b018ec024370c6f07fc i18n/trk/src/vs/workbench/common/theme.i18n.json
-  their  100644 02c2f8fa5d62f49f82c67171012fbd15d4628ecf i18n/trk/src/vs/workbench/common/theme.i18n.json
-@@ -11,10 +11,15 @@
- 	"tabHoverBackground": "Fareyle üzerine gelindiğinde sekme arka plan rengi. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
- 	"tabUnfocusedHoverBackground": "Fareyle üzerine gelindiğinde odaklanılmamış bir gruptaki aktif sekmenin arka plan rengi. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
- 	"tabBorder": "Sekmeleri birbirinden ayıran kenarlığın rengi. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
-+<<<<<<< .our
- 	"tabActiveBorder": "Aktif bir sekmenin altındaki kenarlık. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
- 	"tabActiveBorderTop": "Aktif bir sekmenin üstündeki kenarlık. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
- 	"tabActiveUnfocusedBorder": "Odaklanılmamış bir gruptaki aktif bir sekmenin altındaki kenarlık. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
- 	"tabActiveUnfocusedBorderTop": "Odaklanılmamış bir gruptaki aktif bir sekmenin üstündeki kenarlık. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
-+=======
-+	"tabActiveBorder": "Aktif sekmeleri vurgulayacak kenarlık. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
-+	"tabActiveUnfocusedBorder": "Odaklanılmamış bir gruptaki aktif sekmeleri vurgulayacak kenarlık. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
-+>>>>>>> .their
- 	"tabHoverBorder": "Fareyle üzerine gelindiğinde sekmeleri vurgulayacak kenarlık. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
- 	"tabUnfocusedHoverBorder": "Fareyle üzerine gelindiğinde odaklanılmamış bir gruptaki sekmeleri vurgulayacak kenarlık. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
- 	"tabActiveForeground": "Aktif bir gruptaki aktif sekmenin ön plan rengi. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
-added in both
-  our    100644 352d616cb2388788962d28d337cb996ea2f9989a i18n/trk/src/vs/workbench/common/views.i18n.json
-  their  100644 d412455fd999557822fd98125fbbda96d8e45ae8 i18n/trk/src/vs/workbench/common/views.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"duplicateId": "'{0}' id'sine sahip bir görünüm '{1}' konumunda zaten kayıtlı"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"duplicateId": "`{0}` kimliğine sahip bir görünüm `{1}` konumunda zaten kayıtlı"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e3e29379b77ea4d15e4b1f5feab2ecd14b223fb8 i18n/trk/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 44732b7e6176ac8f50fe0253110d6ef6cb302c9c i18n/trk/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 5cb1f86f054622162153a85d8b1e04234b27cd87 i18n/trk/src/vs/workbench/electron-browser/actions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"closeWindow": "Pencereyi Kapat",
- 	"closeWorkspace": "Çalışma Alanını Kapat",
- 	"noWorkspaceOpened": "Şu an bu örnekte kapatmak için açık bir çalışma alanı bulunmuyor.",
-@@ -50,6 +53,14 @@
- 	"moveWindowTabToNewWindow": "Pencere Sekmesini Yeni Pencereye Taşı",
- 	"mergeAllWindowTabs": "Tüm Pencereleri Birleştir",
- 	"toggleWindowTabsBar": "Pencere Sekmeleri Çubuğunu Gizle/Göster",
-+<<<<<<< .our
- 	"about": "{0} Hakkında",
- 	"inspect context keys": "Bağlam Anahtarlarını Denetle"
-+=======
-+	"configureLocale": "Dili Yapılandır",
-+	"displayLanguage": "VSCode'un görüntüleme dilini tanımlar.",
-+	"doc": "Desteklenen dillerin listesi için göz atın: {0}",
-+	"restart": "Değeri değiştirirseniz VSCode'u yeniden başlatmanız gerekir.",
-+	"fail.createSettings": " '{0}' oluşturulamadı ({1})."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8aacc6f4f6e57c664b0082f257889b078b03b88b i18n/trk/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 6083c93c0aa8c7594afe0d6fb609d69d65163ece i18n/trk/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 b66debcf9ce8eb524bfe41a12b2b6d6b1878f945 i18n/trk/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,12 +35,19 @@
- 	"panelDefaultLocation": "Panelin varsayılan konumunu denetler. Çalışma ekranının ya altında ya da sağında gösterilebilir.",
- 	"statusBarVisibility": "Çalışma ekranının altındaki durum çubuğunun görünürlüğünü denetler.",
- 	"activityBarVisibility": "Çalışma ekranındaki etkinlik çubuğunun görünürlüğünü denetler.",
-+<<<<<<< .our
- 	"viewVisibility": "Görünüm üstbilgi eylemlerinin görünürlüğünü denetler. Görünüm üstbilgi eylemleri ya her zaman görünür ya da sadece o görünüme odaklanıldığında veya fareyle üzerine gelindiğinde görünebilir.",
- 	"fontAliasing": "Çalışma ekranındaki yazı tipi yumuşatma yöntemini denetler.\n- default: Alt-piksel yazı tipi yumuşatma. Bu, çoğu retina olmayan ekranda en keskin metni verir\n- antialiased: Alt-pikselin tersine, pikselin seviyesine göre yazı tipini yumuşat. Yazı tipinin genel olarak daha açık görünmesini sağlayabilir\n- none: Yazı tipi yumuşatmayı devre dışı bırakır. Metin pürüzlü keskin kenarlarla gösterilir.\n- auto: Ekranların DPI'ına göre otomatik olarak `default` veya`antialiased`ı uygular.",
- 	"workbench.fontAliasing.default": "Alt-piksel yazı tipi yumuşatma. Bu, çoğu retina olmayan ekranda en keskin metni verir.",
- 	"workbench.fontAliasing.antialiased": "Alt-pikselin tersine, pikselin seviyesine göre yazı tipini yumuşat. Yazı tipinin genel olarak daha açık görünmesini sağlayabilir.",
- 	"workbench.fontAliasing.none": "Yazı tipi yumuşatmayı devre dışı bırakır. Metin pürüzlü keskin kenarlarla gösterilir.",
- 	"workbench.fontAliasing.auto": "Ekranların DPI'ına göre otomatik olarak `default` veya `antialiased`ı uygular.",
-+=======
-+	"fontAliasing": "Çalışma ekranındaki yazı tipi yumuşatma yöntemini denetler.\n- default: Alt-piksel yazı tipi yumuşatma. Bu, çoğu retina olmayan ekranda en keskin metni verir\n- antialiased: Alt-pikselin tersine, pikselin seviyesine göre yazı tipini yumuşat. Yazı tipinin genel olarak daha açık görünmesini sağlayabilir\n- none: Yazı tipi yumuşatmayı devre dışı bırakır. Metin pürüzlü keskin kenarlarla gösterilir.",
-+	"workbench.fontAliasing.default": "Alt-piksel yazı tipi yumuşatma. Bu, çoğu retina olmayan ekranda en keskin metni verir.",
-+	"workbench.fontAliasing.antialiased": "Alt-pikselin tersine, pikselin seviyesine göre yazı tipini yumuşat. Yazı tipinin genel olarak daha açık görünmesini sağlayabilir.",
-+	"workbench.fontAliasing.none": "Yazı tipi yumuşatmayı devre dışı bırakır. Metin pürüzlü keskin kenarlarla gösterilir.",
-+>>>>>>> .their
- 	"enableNaturalLanguageSettingsSearch": "Ayarlar için doğal dil arama modunun etkinleştirilip etkinleştirilmeyeceğini denetler.",
- 	"windowConfigurationTitle": "Pencere",
- 	"window.openFilesInNewWindow.on": "Dosyalar yeni bir pencerede açılacak",
-changed in both
-  base   100644 c583af8e7cc6927171694b5f244978ad43d7382a i18n/trk/src/vs/workbench/electron-browser/window.i18n.json
-  our    100644 861c7f35ac06435e7b62f3f5887738853101c48d i18n/trk/src/vs/workbench/electron-browser/window.i18n.json
-  their  100644 394ee06ccfd4310af8d3e0e74095beaab9a2533d i18n/trk/src/vs/workbench/electron-browser/window.i18n.json
-changed in both
-  base   100644 01e4868daa1a6b51c436a8f1b45475be54126b6f i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
-  our    100644 36714e1e60d8927fb3b91b1b0e0eccad06a58d10 i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
-  their  100644 793bdc84f28bdfe0ddd0bd4eeb7fb52161492db2 i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
-changed in both
-  base   100644 b5f38fd9078de00122713c91ce286b7dd093c9cd i18n/trk/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  our    100644 3563efca10a6eb315a6f751ea72d5d38f1f1f0cd i18n/trk/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  their  100644 d27710092c4bc145bc458ac1830e0405071dea4c i18n/trk/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"debug.terminal.title": "hata ayıklanan"
- }
-\ No newline at end of file
-changed in both
-  base   100644 010a09cd0cb214b388d75666d89cb848afabb1b5 i18n/trk/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  our    100644 54479d956c07d88719f3ce1441f0f635c2035849 i18n/trk/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  their  100644 ca0fb5ce18835c6c305b24e26031a1cb9416e1f0 i18n/trk/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-changed in both
-  base   100644 63820e9cd1c199a25695fc98440764b156a75525 i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 c1fd4a38b55f33cc75802aa90a13a4a917da2acc i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 2cb48be881f3309263706a8bdbee40105820d843 i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,11 +13,21 @@
- 	"exeBasedRecommendation": "Bu eklenti, sizde {0} kurulu olduğu için tavsiye ediliyor.",
- 	"fileBasedRecommendation": "Bu eklenti yakınlarda açtığınız dosyalara dayanarak tavsiye ediliyor.",
- 	"workspaceRecommendation": "Bu eklenti geçerli çalışma alanı kullanıcıları tarafından tavsiye ediliyor.",
-+=======
-+	"workspaceRecommendation": "Bu eklenti geçerli çalışma alanı kullanıcıları tarafından tavsiye ediliyor.",
-+	"fileBasedRecommendation": "Bu eklenti yakınlarda açtığınız dosyalara dayanarak tavsiye ediliyor.",
-+	"exeBasedRecommendation": "Bu eklenti, sizde {0} kurulu olduğu için tavsiye ediliyor.",
-+>>>>>>> .their
- 	"reallyRecommended2": "'{0}' eklentisi bu dosya türü için tavsiye edilir.",
- 	"reallyRecommendedExtensionPack": "'{0}' eklenti paketi bu dosya türü için tavsiye edilir.",
- 	"install": "Yükle",
-+<<<<<<< .our
- 	"showRecommendations": "Tavsiyeleri Göster",
- 	"showLanguageExtensions": "Markette '.{0}' dosyaları için yardımcı olabilecek eklentiler bulunuyor",
-+=======
-+	"neverShowAgain": "Tekrar Gösterme",
-+	"close": "Kapat",
-+>>>>>>> .their
- 	"workspaceRecommended": "Bu çalışma alanı bazı eklentileri tavsiye ediyor.",
- 	"installAll": "Tümünü Yükle",
- 	"ignoreExtensionRecommendations": "Tüm eklenti tavsiyelerini yok saymak istiyor musunuz?",
-added in both
-  our    100644 2cb4c52d6df311a62b6c55ca77bef496996f0237 i18n/trk/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-  their  100644 0b6bb4e43963d9cd11e7756d01c7d4ec2409a7a1 i18n/trk/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,13 @@
- 	],
- 	"workbenchConfigurationTitle": "Çalışma Ekranı",
- 	"feedbackVisibility": "Çalışma ekranının altındaki durum çubuğunda bulunan Twitter geri bildiriminin (gülen yüz) görünürlüğünü denetler."
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"workbenchConfigurationTitle": "Çalışma Ekranı"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 b49d8e0fcadf2a7575f866b05c10bc043c6ae70a i18n/trk/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/trk/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"hide": "Gizle"
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 09b50f5c81945072189ac1aa45f8a8f40beeb948 i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  our    100644 c82aabc8a92fc1cb3fddf178d2ffeb9f8678824c i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  their  100644 4d4134863662810aed11016aca8683318c283d3d i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-@@ -12,7 +12,10 @@
- 	"revertLocalChanges": "Değişikliklerinizi göz ardı edin ve diskteki içeriğe geri dönün",
- 	"copyPathOfActive": "Aktif Dosyanın Yolunu Kopyala",
- 	"saveAllInGroup": "Gruptaki Tümünü Kadet",
-+<<<<<<< .our
- 	"saveFiles": "Tüm Dosyaları Kaydet",
-+=======
-+>>>>>>> .their
- 	"revert": "Dosyayı Geri Döndür",
- 	"compareActiveWithSaved": "Aktif Dosyayı Kaydedilenle Karşılaştır",
- 	"closeEditor": "Düzenleyiciyi Kapat",
-@@ -26,10 +29,16 @@
- 	"compareWithSaved": "Kaydedilenle Karşılaştır",
- 	"compareWithSelected": "Seçilenle Karşılaştır",
- 	"compareSource": "Karşılaştırma İçin Seç",
-+<<<<<<< .our
- 	"compareSelected": "Seçilenle Karşılaştır",
- 	"close": "Kapat",
- 	"closeOthers": "Diğerlerini Kapat",
- 	"closeSaved": "Kaydedilenleri Kapat",
-+=======
-+	"close": "Kapat",
-+	"closeOthers": "Diğerlerini Kapat",
-+	"closeUnmodified": "Değiştirilmeyenleri Kapat",
-+>>>>>>> .their
- 	"closeAll": "Tümünü Kapat",
- 	"deleteFile": "Kalıcı Olarak Sil"
- }
-\ No newline at end of file
-changed in both
-  base   100644 2be3f4a5668b0dd7401d32f46f6140b26534378f i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 43e3bf4348f9b7a25892a993e8f5dd85c62e9798 i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 e326729b004cf129612ea326c18ad3ef7c0dc03b i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"newFile": "Yeni Dosya",
- 	"newFolder": "Yeni Klasör",
- 	"rename": "Yeniden Adlandır",
-@@ -13,7 +16,11 @@
- 	"copyFile": "Kopyala",
- 	"pasteFile": "Yapıştır",
- 	"retry": "Yeniden Dene",
-+<<<<<<< .our
- 	"renameWhenSourcePathIsParentOfTargetError": "Var olan bir klasöre dosya veya klasör eklemek için lütfen 'Yeni Klasör' veya 'Yeni Dosya' komutunu kullanın",
-+=======
-+	"openFolderFirst": "İçinde dosyalar veya klasörler oluşturmak için ilk olarak bir klasör açın.",
-+>>>>>>> .their
- 	"newUntitledFile": "Yeni İsimsiz Dosya",
- 	"createNewFile": "Yeni Dosya",
- 	"createNewFolder": "Yeni Klasör",
-@@ -29,6 +36,7 @@
- 	"undoTrash": "Çöp Kutusu'ndan geri alabilirsiniz.",
- 	"doNotAskAgain": "Bir daha sorma",
- 	"irreversible": "Bu eylem geri döndürülemez!",
-+<<<<<<< .our
- 	"binFailed": "Geri Dönüşüm Kutusu'nu kullanarak silme başarısız oldu. Bunun yerine, kalıcı olarak silmek ister misiniz?",
- 	"trashFailed": "Çöp Kutusu'nu kullanarak silme başarısız oldu. Bunun yerine, kalıcı olarak silmek ister misiniz?",
- 	"deletePermanentlyButtonLabel": "&&Kalıcı Olarak Sil",
-@@ -48,6 +56,14 @@
- 	"replaceButtonLabel": "&&Değiştir",
- 	"fileIsAncestor": "Yapıştırılacak dosya hedef klasörün atalarından biridir",
- 	"fileDeleted": "Yapıştırılacak dosya bu arada silindi veya taşındı",
-+=======
-+	"permDelete": "Kalıcı Olarak Sil",
-+	"importFiles": "Dosya İçe Aktar",
-+	"confirmOverwrite": "Hedef klasörde aynı ada sahip bir dosya veya klasör zaten var. Değiştirmek istiyor musunuz?",
-+	"replaceButtonLabel": "&&Değiştir",
-+	"fileDeleted": "Dosya bu arada silindi veya taşındı",
-+	"fileIsAncestor": "Hedef klasör, kopyalanacak klasörün içinde yer alıyor",
-+>>>>>>> .their
- 	"duplicateFile": "Çoğalt",
- 	"globalCompareFile": "Aktif Dosyayı Karşılaştır...",
- 	"openFileToCompare": "Bir başka dosya ile karşılaştırmak için ilk olarak bir dosya açın.",
-changed in both
-  base   100644 699305824d3ed72f4db5e5e739e8de24cc613818 i18n/trk/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  our    100644 c5a258c69c30e5ad5a4f54c2a947b9da4a89e081 i18n/trk/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  their  100644 b1f43f0662a145a9e703b8962e1ddb1a610bbd77 i18n/trk/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,12 +7,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"revealInWindows": "Gezginde Ortaya Çıkar",
- 	"revealInMac": "Finder'da Ortaya Çıkar",
- 	"openContainer": "İçeren Klasörü Aç",
- 	"saveAs": "Farklı Kaydet...",
- 	"save": "Kaydet",
- 	"saveAll": "Tümünü Kaydet",
-+<<<<<<< .our
-+=======
-+	"saveFiles": "Tüm Dosyaları Kaydet",
-+>>>>>>> .their
- 	"removeFolderFromWorkspace": "Çalışma Alanından Klasör Kaldır",
- 	"genericRevertError": "'{0}' geri döndürülemedi: {1}",
- 	"modifiedLabel": "{0} (diskte) ↔ {1}",
-changed in both
-  base   100644 4948cddf5c4363e22249b656347c511d008f08b3 i18n/trk/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 193fd22e9317327dfd29fb29331773d21ad13c21 i18n/trk/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 642be842a155b24ebad017dd69c5b925968a55ff i18n/trk/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-@@ -40,7 +40,10 @@
- 	"formatOnSave": "Dosyayı kaydederken biçimlendir. Bir biçimlendirici mevcut olmalıdır, dosya otomatik olarak kaydedilmemelidir, ve düzenleyici kapanmıyor olmalıdır.",
- 	"formatOnSaveTimeout": "Dosyayı kaydederken biçimlendirme zaman aşımı. formatOnSave komutlarında kullanılacak milisaniye cinsinden zaman limiti. Belirtilen zaman aşımından daha uzun süren komutlar iptal edilecektir.",
- 	"explorerConfigurationTitle": "Dosya Gezgini",
-+<<<<<<< .our
- 	"openEditorsVisible": "Açık Düzenleyiciler bölmesinde gösterilen düzenleyici sayısı.",
-+=======
-+>>>>>>> .their
- 	"autoReveal": "Gezginin dosyaları açarken, onları otomatik olarak ortaya çıkartmasını ve seçmesini denetler.",
- 	"enableDragAndDrop": "Gezgeinin sürükle bırak ile dosyaları ve klasörleri taşımaya izin verip vermeyeceğini denetler.",
- 	"confirmDragAndDrop": "Gezginin, sürükle bırak ile dosyalar ve klasörlerin taşındığı zaman onay isteyip istemeyeceğini denetler.",
-changed in both
-  base   100644 660d16789d0a95c736c82f7033a211c046c9320a i18n/trk/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  our    100644 ba53583a6bd8393f02f512281397e3e3dec3bb01 i18n/trk/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  their  100644 a7b5a9c8bb975287ecc4cbfa143a262f744d53d6 i18n/trk/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,12 @@
- 	],
- 	"userGuide": "Değişikliklerinizi geri almak veya diskteki içeriğin üzerine yazmak için düzenleyicideki araç çubuğundaki eylemleri kullanabilirsiniz.",
- 	"staleSaveError": "'{0}' kaydedilemedi: Diskteki içerik daha yeni. Lütfen sizdeki sürüm ile disktekini karşılaştırın.",
-+=======
-+	"userGuide": "Değişikliklerinizi **geri al**mak veya diskteki içeriğin **üzerine yaz**mak için düzenleyicideki araç çubuğunu kullanabilirsiniz",
-+	"overwriteElevated": "Yönetici Olarak Üzerine Yaz...",
-+	"saveElevated": "Yönetici Olarak Yeniden Dene...",
-+	"overwrite": "Üzerine Yaz",
-+>>>>>>> .their
- 	"retry": "Yeniden Dene",
- 	"discard": "At",
- 	"readonlySaveErrorAdmin": "'{0}' kaydedilemedi: Dosya yazmaya karşı korunuyor. Yönetici olarak denemek için 'Yönetici Olarak Üzerine Yaz'ı seçin.",
-changed in both
-  base   100644 9f1cee51d9871a56dae0faf8939960ffb59bb51b i18n/trk/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  our    100644 65b6a337676d0d6a5034bdd2408a1b2dc1bae73e i18n/trk/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  their  100644 d1e6467f5d8a585bafe5e943e6f295e98da7029c i18n/trk/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-added in both
-  our    100644 e9f359925ecc6d94d9f1bac6b0f7e86d59e0d380 i18n/trk/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-  their  100644 aeb7121cb059e74598637e00ca8fb08cf90e2b93 i18n/trk/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,5 +11,13 @@
- 	"sharedLog": "Günlük (Ortak)",
- 	"rendererLog": "Günlük (Pencere)",
- 	"extensionsLog": "Günlük (Eklenti Sunucusu)",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"developer": "Geliştirici"
- }
-\ No newline at end of file
-added in both
-  our    100644 d594b47dfcbc84cc38c0941471d4fda1de491553 i18n/trk/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  their  100644 ad7b602e907840e9c181d8483cfc42789fdaaa77 i18n/trk/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -16,15 +17,33 @@
- 	"selectProcess": "İşlem için Günlük Seçin",
- 	"openLogFile": "Günlük Dosyasını Aç...",
- 	"setLogLevel": "Günlük Düzeyini Ayarla...",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"openLogsFolder": "Günlük Klasörünü Aç",
-+	"showLogs": "Günlükleri Göster...",
-+	"rendererProcess": "Pencere",
-+	"extensionHost": "Eklenti Sunucusu",
-+	"selectProcess": "İşlem seçin",
-+	"setLogLevel": "Günlük Düzeyini Ayarla",
-+>>>>>>> .their
- 	"trace": "İzle",
- 	"debug": "Hata Ayıklama",
- 	"info": "Bilgi",
- 	"warn": "Uyarı",
- 	"err": "Hata",
-+<<<<<<< .our
- 	"critical": "Kritik",
- 	"off": "Kapalı",
- 	"selectLogLevel": "Günlük düzeyini seçin",
- 	"default and current": "Varsayılan & Geçerli Olan",
- 	"default": "Varsayılan",
- 	"current": "Geçerli Olan"
-+=======
-+	"selectLogLevel": "Günlük düzeyini seçin"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 fe543da8a994fafde3a4bb5699fcd7601dd7a7b8 i18n/trk/src/vs/workbench/parts/markers/common/messages.i18n.json
-  our    100644 6f51355c9d123c79b1f0a359e73c1468d3c1f402 i18n/trk/src/vs/workbench/parts/markers/common/messages.i18n.json
-  their  100644 ca58bfe5d322f88fc4debe94baf297eb28d0390d i18n/trk/src/vs/workbench/parts/markers/common/messages.i18n.json
-@@ -7,8 +7,11 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"viewCategory": "Görüntüle",
-+<<<<<<< .our
- 	"problems.view.toggle.label": "Sorunları Aç/Kapat (Hatalar, Uyarılar, Bilgiler)",
- 	"problems.view.focus.label": "Sorunlara Odakla (Hatalar, Uyarılar, Bilgiler)",
-+=======
-+>>>>>>> .their
- 	"problems.panel.configuration.title": "Sorunlar Görünümü",
- 	"problems.panel.configuration.autoreveal": "Sorunlar görünümünün; dosyalar açılırken, dosyaları otomatik olarak ortaya çıkarıp çıkarmayacağını denetler.",
- 	"markers.panel.title.problems": "Sorunlar",
-added in both
-  our    100644 3aa95c60f2d27458dcf8f6380fe433002d86f6f6 i18n/trk/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-  their  100644 fe8f6125b1a1e34f4e3d23efb12673f805fe5846 i18n/trk/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -11,4 +12,15 @@
- 	"viewCategory": "Görüntüle",
- 	"clearOutput.label": "Çıktıyı Temizle",
- 	"openActiveLogOutputFile": "Görüntüle: Aktif Günlük Dosyasını Aç"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"output": "Çıktı",
-+	"viewCategory": "Görüntüle",
-+	"clearOutput.label": "Çıktıyı Temizle"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 b87f8651833d4c39926e5c3e83c6858ba7606d1e i18n/trk/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/trk/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,12 @@
- 	],
- 	"output": "{0} - Çıktı",
- 	"channel": "'{0}' için çıktı kanalı"
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 dad393ec3bf0353dcc7bfd28cc53642de8a559c9 i18n/trk/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 1afe539c47468df2636e1e87d0cd9a72ca9c9caf i18n/trk/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 dc51088525e306ac10ab4e9664740fae8edabdb3 i18n/trk/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"defaultSettings": "Geçersiz kılmak için ayarlarınızı sağ taraftaki düzeyiciye ekleyin.",
- 	"noSettingsFound": "Hiçbir Ayar Bulunamadı.",
- 	"settingsSwitcherBarAriaLabel": "Ayar Değiştirici",
-changed in both
-  base   100644 ad4ed40e8890b2bcd07161a8e44662a01c3a9bab i18n/trk/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  our    100644 d820bb4fe889b05f2ff4ef7bcfc676d8fff80977 i18n/trk/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  their  100644 dc4c28efe529a16d8b78a2405486e63a813e3ada i18n/trk/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-changed in both
-  base   100644 fe14853bad62054670243378ff8988acd24a83da i18n/trk/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  our    100644 b5212eb95dd1ce6d73e1ac87386973d6c3143dbb i18n/trk/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  their  100644 018ca1806dd04f5720a0ae42ed8b003a767fb26d i18n/trk/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"view": "Görüntüle",
- 	"commandsHandlerDescriptionDefault": "Komutları Göster ve Çalıştır",
- 	"gotoLineDescriptionMac": "Satıra Git",
-changed in both
-  base   100644 cf14cf9120f75fd510c0b93364d690cd606d9789 i18n/trk/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 79f2510cc1fd43ae4f1eeb8816a6f7d7cb58e36e i18n/trk/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 d06d8e0857e74867f1c38fb8073365540680d0e9 i18n/trk/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-changed in both
-  base   100644 fd6f32d47d67fb3d038b3000c78f1e0b06b673ce i18n/trk/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 9e04840f3efedecf23f5b2d44316f1a7c8399da8 i18n/trk/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 58d2149f726e1069cb7302a271b62d294ea31469 i18n/trk/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,11 +13,18 @@
- 	"copyAllLabel": "Tümünü Kopyala",
- 	"clearSearchHistoryLabel": "Arama Geçmişini Temizle",
- 	"toggleSearchViewPositionLabel": "Arama Görünümü Konumunu Değiştir",
-+=======
-+>>>>>>> .their
- 	"findInFolder": "Klasörde Bul...",
- 	"findInWorkspace": "Çalışma Alanında Bul...",
- 	"showTriggerActions": "Çalışma Alanında Sembole Git...",
- 	"name": "Ara",
-+<<<<<<< .our
- 	"showSearchViewl": "Aramayı Göster",
-+=======
-+	"search": "Ara",
-+	"showSearchViewlet": "Aramayı Göster",
-+>>>>>>> .their
- 	"view": "Görüntüle",
- 	"findInFiles": "Dosyalarda Bul",
- 	"openAnythingHandlerDescription": "Dosyaya Git",
-added in both
-  our    100644 370e3ca46f159c386414c78ab2206c7cef0db540 i18n/trk/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-  their  100644 a6843828675d70f0edddc473873e5fe732c76ef2 i18n/trk/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -13,5 +14,14 @@
- 	"new.global.sep": "Yeni Parçacıklar",
- 	"openSnippet.pickLanguage": "Parçacıklar Dosyası Seç veya Parçacık Oluştur",
- 	"openSnippet.label": "Kullanıcı Parçacıklarını Yapılandır",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"global.1": "({0})",
-+>>>>>>> .their
- 	"preferences": "Tercihler"
- }
-\ No newline at end of file
-changed in both
-  base   100644 11671c7d0b4f61d54db51e0029370f7b4b8adcd0 i18n/trk/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  our    100644 61a732f0568f1f61a9bc01d53b3a8a8fbf250233 i18n/trk/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  their  100644 7e1c6237303f7ea86b85838b89776b30e62a4a1d i18n/trk/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"snippetSchema.json.default": "Boş parçacık",
- 	"snippetSchema.json": "Kullanıcı parçacığı yapılandırması",
- 	"snippetSchema.json.prefix": "Parçacığı IntelliSense'de seçerken kullanılacak ön ek",
-added in both
-  our    100644 334b2419218a5bb8ddc103b0eb2c52c1301171ed i18n/trk/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-  their  100644 d246a5f624ddbeba796d4a2d3f7a4766a42f61e8 i18n/trk/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,5 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"source.snippetGlobal": "Global Kullanıcı Parçacığı",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"source.snippet": "Kullanıcı Parçacığı"
- }
-\ No newline at end of file
-changed in both
-  base   100644 ebad445a20b19ff902daf3a355595b6766900c4c i18n/trk/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  our    100644 c12f98f1f7d6d1b253efc6dc8980812a619c7534 i18n/trk/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 8257fed50b08db31bfccc66751a6f4977cd89c52 i18n/trk/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,9 @@
- 	],
- 	"invalid.path.0": "`contributes.{0}.path` ögesinde dize bekleniyor. Sağlanan değer: {1}",
- 	"invalid.language.0": "Dil atlanırken `contributes.{0}.path`in değeri bir `.code-snippets` dosyası olmalıdır. Belirtilen değer {1}",
-+=======
-+	"invalid.path.0": "`contributes.{0}.path` ögesinde dize bekleniyor. Sağlanan değer: {1}",
-+>>>>>>> .their
- 	"invalid.language": "`contributes.{0}.language` ögesinde bilinmeyen dil. Sağlanan değer: {1}",
- 	"invalid.path.1": "`contributes.{0}.path` ögesinin ({1}) eklentinin klasöründe ({2}) yer alması bekleniyor. Bu, eklentiyi taşınamaz yapabilir.",
- 	"vscode.extension.contributes.snippets": "Parçacıklara ekleme yapar.",
-changed in both
-  base   100644 a994ebe0909dc2bfab405360618d111f55ed5437 i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 9ae8066e173c22960f98c998dc667f2fcb4550fe i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 644e7e44a52c21ad7bd01c6a8703e0899dc472e5 i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -10,7 +10,11 @@
- 	"terminal.foreground": "Terminalin ön plan rengi.",
- 	"terminalCursor.foreground": "Terminal imlecinin ön plan rengi.",
- 	"terminalCursor.background": "Terminal imlecinin arka plan rengi. Bir blok imlecinin kapladığı bir karakterin rengini özelleştirmeyi sağlar.",
-+<<<<<<< .our
- 	"terminal.selectionBackground": "Terminalin seçim arkaplanı rengi.",
- 	"terminal.border": "Terminaldeki bölmeleri ayıran kenarlığın rengi. panel.border bunun için varsayılan olarak kullanılır.",
- 	"terminal.ansiColor": "Terminalde '{0}' ANSI rengi."
-+=======
-+	"terminal.selectionBackground": "Terminalin seçim arkaplanı rengi."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a30794054e1dccc56b1cea9102490787e16edfef i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  our    100644 fc73a2254fd3174dcad137d26a0314e53d8ddb7a i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  their  100644 2c0a6d7607f41fed156cc045c9a90fb135bd30ed i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-@@ -8,7 +8,11 @@
- 	],
- 	"terminal.integrated.chooseWindowsShellInfo": "Özelleştir butonuna tıklayıp varsayılan terminal kabuğunu seçebilirsiniz.",
- 	"customize": "Özelleştir",
-+<<<<<<< .our
- 	"never again": "Tekrar Gösterme",
-+=======
-+	"cancel": "İptal",
-+>>>>>>> .their
- 	"terminal.integrated.chooseWindowsShell": "Tercih ettiğiniz terminal kabuğunu seçin, bunu daha sonra ayarlarınızdan değiştirebilirsiniz",
- 	"terminalService.terminalCloseConfirmationSingular": "Aktif bir terminal oturumu var, sonlandırmak istiyor musunuz?",
- 	"terminalService.terminalCloseConfirmationPlural": "{0} aktif terminal oturumu var, bunları sonlandırmak istiyor musunuz?"
-changed in both
-  base   100644 61ebe35f50cc0198e08a3eafd72952210fa283f6 i18n/trk/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 f7e01d490d6d3b9163203a648fd3930fc88e2b59 i18n/trk/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 64fe6d494dbfc3a626e05fccd532a3ffc376aebb i18n/trk/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -26,7 +26,10 @@
- 	"commandPalette": "Komut Paleti...",
- 	"settings": "Ayarlar",
- 	"keyboardShortcuts": "Klavye Kısayolları",
-+<<<<<<< .our
- 	"showExtensions": "Eklentileri Yönet",
-+=======
-+>>>>>>> .their
- 	"userSnippets": "Kullanıcı Parçacıkları",
- 	"selectTheme.label": "Renk Teması",
- 	"themes.selectIconTheme.label": "Dosya Simgesi Teması",
-changed in both
-  base   100644 320c074b5d232d591fc068a3032fe7af5158d3c3 i18n/trk/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  our    100644 0178637fbdf0424ea4af3cebade365489a085e58 i18n/trk/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  their  100644 699613ce8f0c9c2f0ea466184777af4fed3d0f89 i18n/trk/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,4 +14,9 @@
- 	"fileBinaryError": "Dosya ikili olarak görünüyor ve metin olarak açılamıyor",
- 	"err.create": "{0} dosyası oluşturulamadı",
- 	"fileMoveConflict": "Taşıma/kopyalama yapılamadı. Dosya, hedefte zaten mevcut."
-+=======
-+	"fileIsDirectoryError": "Dosya bir dizindir",
-+	"fileNotModifiedError": "Dosya şu tarihten beri değiştirilmemiş:",
-+	"fileBinaryError": "Dosya ikili olarak görünüyor ve metin olarak açılamıyor"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 5284725dbcbe101b6a615d631b63835268055210 i18n/trk/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  our    100644 4695dec6a6e07d0eac717c2465d78071445dbd0f i18n/trk/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  their  100644 f0547df6a624012e52686bd0a2485a14e627d7e2 i18n/trk/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-changed in both
-  base   100644 06e828ba73e2e57eb711bee3c553e4e5222dd624 i18n/trk/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 62ba4066699b1c2fed6080768294776dd46a2b53 i18n/trk/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 f60dda6f647ff39ec1f99e0c38c04c20edaeee64 i18n/trk/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-changed in both
-  base   100644 38e103f1ee82388b61bb621e3595136e1c8d08f9 i18n/trk/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  our    100644 e05f69c833c1bb2aa943e69d669908a71fb3ad90 i18n/trk/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  their  100644 19e6e2498a438168f55c544c85f4ca0ee200003c i18n/trk/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-@@ -8,5 +8,10 @@
- 	],
- 	"errorInvalidTaskConfiguration": "Çalışma alanı yapılandırma dosyasına yazılamıyor. Lütfen dosyadaki hata/uyarıları düzeltmek için dosyayı açın ve tekrar deneyin.",
- 	"errorWorkspaceConfigurationFileDirty": "Kaydedilmemiş değişiklikler içerdiği için çalışma alanı yapılandırma dosyasına yazılamıyor. Lütfen dosyayı kaydedin ve tekrar deneyin.",
-+<<<<<<< .our
- 	"openWorkspaceConfigurationFile": "Çalışma Alanı Yapılandırmasını Aç"
-+=======
-+	"openWorkspaceConfigurationFile": "Çalışma Alanı Yapılandırma Dosyasını Aç",
-+	"close": "Kapat"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 37e0498d121729dabc3c589ea2c22c1392823a39 src/vs/workbench/services/themes/electron-browser/colorThemeData.ts
-  our    100644 f49ab6eea33cacddae01b555b693b3bf72e5bdaa src/vs/workbench/services/themes/electron-browser/colorThemeData.ts
-  their  100644 fd7ad73cded0a13631dfccd452800b6d3db6d78f src/vs/workbench/services/themes/electron-browser/colorThemeData.ts
-@@ -31,7 +31,11 @@
- 	numbers: ['constant.numeric'],
- 	types: ['entity.name.type', 'entity.name.class', 'support.type', 'support.class'],
- 	functions: ['entity.name.function', 'support.function'],
-+<<<<<<< .our
- 	variables: ['variable', 'entity.name.variable']
-+=======
-+	variables: ['variable']
-+>>>>>>> .their
- };
- 
- export class ColorThemeData implements IColorTheme {
diff --git a/app/test/fixtures/merge-parser/vscode/merge-aeschli-refactor-nls-scripts-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-aeschli-refactor-nls-scripts-into-master.txt
deleted file mode 100644
index b02d682457a..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-aeschli-refactor-nls-scripts-into-master.txt
+++ /dev/null
@@ -1,16610 +0,0 @@
-changed in both
-  base   100644 78a09a2db01f98b34f9be4de7b7f5e92cf968391 build/gulpfile.vscode.js
-  our    100644 d79071e56bcfc53b3448052cc08bd7247bd7e789 build/gulpfile.vscode.js
-  their  100644 be4f4e97128c2ecb33768902521cb96c3d6e1f64 build/gulpfile.vscode.js
-@@ -93,6 +93,33 @@
- 	' *--------------------------------------------------------*/'
- ].join('\n');
- 
-+<<<<<<< .our
-+=======
-+const defaultLanguages /*: Language[] */ = [
-+	{ id: 'zh-tw', iso639_3: 'cht', transifexId: 'zh-hant' },
-+	{ id: 'zh-cn', iso639_3: 'chs', transifexId: 'zh-hans' },
-+	{ id: 'ja', iso639_3: 'jpn' },
-+	{ id: 'ko', iso639_3: 'kor' },
-+	{ id: 'de', iso639_3: 'deu' },
-+	{ id: 'fr', iso639_3: 'fra' },
-+	{ id: 'es', iso639_3: 'esn' },
-+	{ id: 'ru', iso639_3: 'rus' },
-+	{ id: 'it', iso639_3: 'ita' }
-+];
-+
-+// languages requested by the community to non-stable builds
-+const insidersLanguages /*: Language[] */ = [
-+	{ id: 'pt-br', iso639_3: 'ptb' },
-+	{ id: 'hu', iso639_3: 'hun' },
-+	{ id: 'tr', iso639_3: 'trk' }
-+];
-+
-+var languages = defaultLanguages;
-+if (process.env.VSCODE_QUALITY !== 'stable') {
-+	languages = languages.concat(insidersLanguages);
-+}
-+
-+>>>>>>> .their
- gulp.task('clean-optimized-vscode', util.rimraf('out-vscode'));
- gulp.task('optimize-vscode', ['clean-optimized-vscode', 'compile-build', 'compile-extensions-build'], common.optimizeTask({
- 	src: 'out-build',
-@@ -102,7 +129,11 @@
- 	loaderConfig: common.loaderConfig(nodeModules),
- 	header: BUNDLED_FILE_HEADER,
- 	out: 'out-vscode',
-+<<<<<<< .our
- 	bundleInfo: undefined
-+=======
-+	languages: languages,
-+>>>>>>> .their
- }));
- 
- 
-@@ -240,8 +271,20 @@
- 			.filter(({ name }) => builtInExtensions.every(b => b.name !== name));
- 
- 		const localExtensions = es.merge(...localExtensionDescriptions.map(extension => {
-+<<<<<<< .our
- 			return ext.fromLocal(extension.path, sourceMappingURLBase)
- 				.pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`));
-+=======
-+			const nlsFilter = filter('**/*.nls.json', { restore: true });
-+
-+			return ext.fromLocal(extension.path)
-+				.pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`))
-+				// 	// TODO@Dirk: this filter / buffer is here to make sure the nls.json files are buffered
-+				.pipe(nlsFilter)
-+				.pipe(buffer())
-+				.pipe(nlsDev.createAdditionalLanguageFiles(languages.map(l => l.iso639_3), path.join(__dirname, '..', 'i18n')))
-+				.pipe(nlsFilter.restore);
-+>>>>>>> .their
- 		}));
- 
- 		const localExtensionDependencies = gulp.src('extensions/node_modules/**', { base: '.' });
-@@ -416,6 +459,7 @@
- 	).pipe(i18n.pushXlfFiles(apiHostname, apiName, apiToken));
- });
- 
-+<<<<<<< .our
- gulp.task('vscode-translations-push-test', ['optimize-vscode'], function () {
- 	const pathToMetadata = './out-vscode/nls.metadata.json';
- 	const pathToExtensions = './extensions/*';
-@@ -432,6 +476,11 @@
- gulp.task('vscode-translations-pull', function () {
- 	[...i18n.defaultLanguages, ...i18n.extraLanguages].forEach(language => {
- 		i18n.pullCoreAndExtensionsXlfFiles(apiHostname, apiName, apiToken, language).pipe(vfs.dest(`../vscode-localization/${language.id}/build`));
-+=======
-+gulp.task('vscode-translations-pull', function () {
-+	[...defaultLanguages, ...insidersLanguages].forEach(language => {
-+		i18n.pullBuildXlfFiles(apiHostname, apiName, apiToken, language).pipe(vfs.dest(`../vscode-localization/${language.id}/build`));
-+>>>>>>> .their
- 
- 		let includeDefault = !!innoSetupConfig[language.id].defaultInfo;
- 		i18n.pullSetupXlfFiles(apiHostname, apiName, apiToken, language, includeDefault).pipe(vfs.dest(`../vscode-localization/${language.id}/setup`));
-@@ -439,10 +488,17 @@
- });
- 
- gulp.task('vscode-translations-import', function () {
-+<<<<<<< .our
- 	[...i18n.defaultLanguages, ...i18n.extraLanguages].forEach(language => {
- 		gulp.src(`../vscode-localization/${language.id}/build/*/*.xlf`)
- 			.pipe(i18n.prepareI18nFiles())
- 			.pipe(vfs.dest(`./i18n/${language.folderName}`));
-+=======
-+	[...defaultLanguages, ...insidersLanguages].forEach(language => {
-+		gulp.src(`../vscode-localization/${language.id}/build/*/*.xlf`)
-+			.pipe(i18n.prepareI18nFiles(language))
-+			.pipe(vfs.dest(`./i18n/${language.iso639_3}`));
-+>>>>>>> .their
- 		gulp.src(`../vscode-localization/${language.id}/setup/*/*.xlf`)
- 			.pipe(i18n.prepareIslFiles(language, innoSetupConfig[language.id]))
- 			.pipe(vfs.dest(`./build/win32/i18n`));
-changed in both
-  base   100644 1be9709523fcd7669a359faa9dbf2da5c88e39eb build/lib/i18n.js
-  our    100644 61893ed8b1d64d1d9d09eea63a22779c7dfee56b build/lib/i18n.js
-  their  100644 5d1463e786324c2b1850917739d9eb53626579b7 build/lib/i18n.js
-@@ -15,7 +15,11 @@
- var gulp = require("gulp");
- var util = require('gulp-util');
- var iconv = require('iconv-lite');
-+<<<<<<< .our
- var NUMBER_OF_CONCURRENT_DOWNLOADS = 4;
-+=======
-+var NUMBER_OF_CONCURRENT_DOWNLOADS = 1;
-+>>>>>>> .their
- function log(message) {
-     var rest = [];
-     for (var _i = 1; _i < arguments.length; _i++) {
-@@ -245,6 +249,7 @@
-                     }
-                     var messages = {};
-                     var transUnits = file.body[0]['trans-unit'];
-+<<<<<<< .our
-                     if (transUnits) {
-                         transUnits.forEach(function (unit) {
-                             var key = unit.$.id;
-@@ -261,6 +266,22 @@
-                         });
-                         files.push({ messages: messages, originalFilePath: originalFilePath, language: language.toLowerCase() });
-                     }
-+=======
-+                    transUnits.forEach(function (unit) {
-+                        var key = unit.$.id;
-+                        if (!unit.target) {
-+                            return; // No translation available
-+                        }
-+                        var val = unit.target.toString();
-+                        if (key && val) {
-+                            messages[key] = decodeEntities(val);
-+                        }
-+                        else {
-+                            reject(new Error("XLF parsing error: XLIFF file does not contain full localization data. ID or target translation for one of the trans-unit nodes is not present."));
-+                        }
-+                    });
-+                    files.push({ messages: messages, originalFilePath: originalFilePath, language: language });
-+>>>>>>> .their
-                 });
-                 resolve(files);
-             });
-@@ -405,8 +426,12 @@
-         }
-         statistics[language.id] = 0;
-         var localizedModules = Object.create(null);
-+<<<<<<< .our
-         var languageFolderName = language.folderName || language.id;
-         var cwd = path.join(languageDirectory, languageFolderName, 'src');
-+=======
-+        var cwd = path.join(languageDirectory, language.iso639_3, 'src');
-+>>>>>>> .their
-         modules.forEach(function (module) {
-             var order = keysSection[module];
-             var i18nFile = path.join(cwd, module) + '.i18n.json';
-@@ -462,7 +487,11 @@
-                 contents.push(index < modules.length - 1 ? '\t],' : '\t]');
-             });
-             contents.push('});');
-+<<<<<<< .our
-             emitter.queue(new File({ path: bundle + '.nls.' + language.id + '.js', contents: Buffer.from(contents.join('\n'), 'utf-8') }));
-+=======
-+            emitter.emit('data', new File({ path: bundle + '.nls.' + language.id + '.js', contents: new Buffer(contents.join('\n'), 'utf-8') }));
-+>>>>>>> .their
-         });
-     });
-     Object.keys(statistics).forEach(function (key) {
-@@ -921,6 +950,7 @@
-     });
- }
- // cache resources
-+<<<<<<< .our
- var _coreAndExtensionResources;
- function pullCoreAndExtensionsXlfFiles(apiHostname, username, password, language, externalExtensions) {
-     if (!_coreAndExtensionResources) {
-@@ -935,6 +965,24 @@
-         glob.sync('./extensions/*/node_modules/vscode-nls').forEach(function (extension) { return extensionsToLocalize_1[extension.split('/')[2]] = true; });
-         Object.keys(extensionsToLocalize_1).forEach(function (extension) {
-             _coreAndExtensionResources.push({ name: extension, project: extensionsProject });
-+=======
-+var _buildResources;
-+function pullBuildXlfFiles(apiHostname, username, password, language) {
-+    if (!_buildResources) {
-+        _buildResources = [];
-+        // editor and workbench
-+        var json = JSON.parse(fs.readFileSync('./build/lib/i18n.resources.json', 'utf8'));
-+        _buildResources.push.apply(_buildResources, json.editor);
-+        _buildResources.push.apply(_buildResources, json.workbench);
-+        // extensions
-+        var extensionsToLocalize = glob.sync('./extensions/**/*.nls.json').map(function (extension) { return extension.split('/')[2]; });
-+        var resourcesToPull_1 = [];
-+        extensionsToLocalize.forEach(function (extension) {
-+            if (resourcesToPull_1.indexOf(extension) === -1) {
-+                resourcesToPull_1.push(extension);
-+                _buildResources.push({ name: extension, project: 'vscode-extensions' });
-+            }
-+>>>>>>> .their
-         });
-         if (externalExtensions) {
-             for (var resourceName in externalExtensions) {
-@@ -942,6 +990,7 @@
-             }
-         }
-     }
-+<<<<<<< .our
-     return pullXlfFiles(apiHostname, username, password, language, _coreAndExtensionResources);
- }
- exports.pullCoreAndExtensionsXlfFiles = pullCoreAndExtensionsXlfFiles;
-@@ -949,6 +998,15 @@
-     var setupResources = [{ name: 'setup_messages', project: workbenchProject }];
-     if (includeDefault) {
-         setupResources.push({ name: 'setup_default', project: setupProject });
-+=======
-+    return pullXlfFiles(apiHostname, username, password, language, _buildResources);
-+}
-+exports.pullBuildXlfFiles = pullBuildXlfFiles;
-+function pullSetupXlfFiles(apiHostname, username, password, language, includeDefault) {
-+    var setupResources = [{ name: 'setup_messages', project: 'vscode-workbench' }];
-+    if (includeDefault) {
-+        setupResources.push({ name: 'setup_default', project: 'vscode-setup' });
-+>>>>>>> .their
-     }
-     return pullXlfFiles(apiHostname, username, password, language, setupResources);
- }
-@@ -967,9 +1025,13 @@
-             var stream_1 = this;
-             resources.map(function (resource) {
-                 retrieveResource(language, resource, apiHostname, credentials).then(function (file) {
-+<<<<<<< .our
-                     if (file) {
-                         stream_1.emit('data', file);
-                     }
-+=======
-+                    stream_1.emit('data', file);
-+>>>>>>> .their
-                     translationsRetrieved++;
-                 }).catch(function (error) { throw new Error(error); });
-             });
-@@ -982,7 +1044,11 @@
-     return limiter.queue(function () { return new Promise(function (resolve, reject) {
-         var slug = resource.name.replace(/\//g, '_');
-         var project = resource.project;
-+<<<<<<< .our
-         var transifexLanguageId = language.id === 'ps' ? 'en' : language.transifexId || language.id;
-+=======
-+        var iso639 = language.transifexId || language.id;
-+>>>>>>> .their
-         var options = {
-             hostname: apiHostname,
-             path: "/api/2/project/" + project + "/resource/" + slug + "/translation/" + transifexLanguageId + "?file&mode=onlyreviewed",
-@@ -996,6 +1062,7 @@
-             res.on('data', function (chunk) { return xlfBuffer.push(chunk); });
-             res.on('end', function () {
-                 if (res.statusCode === 200) {
-+<<<<<<< .our
-                     resolve(new File({ contents: Buffer.concat(xlfBuffer), path: project + "/" + slug + ".xlf" }));
-                 }
-                 else if (res.statusCode === 404) {
-@@ -1004,6 +1071,10 @@
-                 }
-                 else {
-                     reject(slug + " in " + project + " returned no data. Response code: " + res.statusCode + ".");
-+=======
-+                    console.log('success: ' + options.path);
-+                    resolve(new File({ contents: Buffer.concat(xlfBuffer), path: project + "/" + slug + ".xlf" }));
-+>>>>>>> .their
-                 }
-             });
-         });
-@@ -1011,9 +1082,16 @@
-             reject("Failed to query resource " + slug + " with the following error: " + err + ". " + options.path);
-         });
-         request.end();
-+<<<<<<< .our
-     }); });
- }
- function prepareI18nFiles() {
-+=======
-+        console.log('started: ' + options.path);
-+    }); });
-+}
-+function prepareI18nFiles(language) {
-+>>>>>>> .their
-     var parsePromises = [];
-     return event_stream_1.through(function (xlf) {
-         var stream = this;
-@@ -1021,6 +1099,7 @@
-         parsePromises.push(parsePromise);
-         parsePromise.then(function (resolvedFiles) {
-             resolvedFiles.forEach(function (file) {
-+<<<<<<< .our
-                 var translatedFile = createI18nFile(file.originalFilePath, file.messages);
-                 stream.queue(translatedFile);
-             });
-@@ -1094,6 +1173,10 @@
-                 else {
-                     mainPack.contents[path.substr(firstSlash + 1)] = file.messages;
-                 }
-+=======
-+                var translatedFile = createI18nFile(language, file.originalFilePath, file.messages);
-+                stream.emit('data', translatedFile);
-+>>>>>>> .their
-             });
-         });
-     }, function () {
-@@ -1119,6 +1202,7 @@
-             .catch(function (reason) { throw new Error(reason); });
-     });
- }
-+<<<<<<< .our
- exports.prepareI18nPackFiles = prepareI18nPackFiles;
- function prepareIslFiles(language, innoSetupConfig) {
-     var parsePromises = [];
-@@ -1142,6 +1226,44 @@
-             .catch(function (reason) { throw new Error(reason); });
-     });
- }
-+=======
-+exports.prepareI18nFiles = prepareI18nFiles;
-+function createI18nFile(language, originalFilePath, messages) {
-+    var content = [
-+        '/*---------------------------------------------------------------------------------------------',
-+        ' *  Copyright (c) Microsoft Corporation. All rights reserved.',
-+        ' *  Licensed under the MIT License. See License.txt in the project root for license information.',
-+        ' *--------------------------------------------------------------------------------------------*/',
-+        '// Do not edit this file. It is machine generated.'
-+    ].join('\n') + '\n' + JSON.stringify(messages, null, '\t').replace(/\r\n/g, '\n');
-+    return new File({
-+        path: path.join(originalFilePath + '.i18n.json'),
-+        contents: new Buffer(content, 'utf8')
-+    });
-+}
-+function prepareIslFiles(language, innoSetupConfig) {
-+    var parsePromises = [];
-+    return event_stream_1.through(function (xlf) {
-+        var stream = this;
-+        var parsePromise = XLF.parse(xlf.contents.toString());
-+        parsePromises.push(parsePromise);
-+        parsePromise.then(function (resolvedFiles) {
-+            resolvedFiles.forEach(function (file) {
-+                if (path.basename(file.originalFilePath) === 'Default' && !innoSetupConfig.defaultInfo) {
-+                    return;
-+                }
-+                var translatedFile = createIslFile(file.originalFilePath, file.messages, language, innoSetupConfig);
-+                stream.emit('data', translatedFile);
-+            });
-+        });
-+    }, function () {
-+        var _this = this;
-+        Promise.all(parsePromises)
-+            .then(function () { _this.emit('end'); })
-+            .catch(function (reason) { throw new Error(reason); });
-+    });
-+}
-+>>>>>>> .their
- exports.prepareIslFiles = prepareIslFiles;
- function createIslFile(originalFilePath, messages, language, innoSetup) {
-     var content = [];
-@@ -1192,7 +1314,11 @@
-     var filePath = basename + "." + language.id + ".isl";
-     return new File({
-         path: filePath,
-+<<<<<<< .our
-         contents: iconv.encode(Buffer.from(content.join('\r\n'), 'utf8'), innoSetup.codePage)
-+=======
-+        contents: iconv.encode(new Buffer(content.join('\r\n'), 'utf8'), innoSetup.codePage)
-+>>>>>>> .their
-     });
- }
- function encodeEntities(value) {
-changed in both
-  base   100644 93cf72c39c98424f7503f1fbadbdca5c941eae5e build/lib/i18n.resources.json
-  our    100644 81fda4c4e9ebad89e54fa997c5d551b3f33d7e1a build/lib/i18n.resources.json
-  their  100644 499ef117f7dd18a8477c28ece12eb240a9e430de build/lib/i18n.resources.json
-@@ -229,10 +229,13 @@
- 		{
- 			"name": "vs/workbench/services/decorations",
- 			"project": "vscode-workbench"
-+<<<<<<< .our
- 		},
- 		{
- 			"name": "vs/workbench/services/preferences",
- 			"project": "vscode-preferences"
-+=======
-+>>>>>>> .their
- 		}
- 	]
- }
-changed in both
-  base   100644 db67ffc3812675b6b05478130e9d1afcbf68a717 build/lib/i18n.ts
-  our    100644 06b51be8767fddebbb1c08372f644ab15c648478 build/lib/i18n.ts
-  their  100644 1925fe0f047c7bcc0a39eafbbdedc0c16f7a0d2f build/lib/i18n.ts
-@@ -17,7 +17,11 @@
- var util = require('gulp-util');
- var iconv = require('iconv-lite');
- 
-+<<<<<<< .our
- const NUMBER_OF_CONCURRENT_DOWNLOADS = 4;
-+=======
-+const NUMBER_OF_CONCURRENT_DOWNLOADS = 1;
-+>>>>>>> .their
- 
- function log(message: any, ...rest: any[]): void {
- 	util.log(util.colors.green('[i18n]'), message, ...rest);
-@@ -25,8 +29,13 @@
- 
- export interface Language {
- 	id: string; // laguage id, e.g. zh-tw, de
-+<<<<<<< .our
- 	transifexId?: string; // language id used in transifex, e.g zh-hant, de (optional, if not set, the id is used)
- 	folderName?: string; // language specific folder name, e.g. cht, deu  (optional, if not set, the id is used)
-+=======
-+	transifexId?: string; // language id used in transifex (optional), e.g zh-hant
-+	iso639_3: string; // 3 letter id, e.g. chs
-+>>>>>>> .their
- }
- 
- export interface InnoSetup {
-@@ -37,6 +46,7 @@
- 	};
- }
- 
-+<<<<<<< .our
- export const defaultLanguages: Language[] = [
- 	{ id: 'zh-tw', folderName: 'cht', transifexId: 'zh-hant' },
- 	{ id: 'zh-cn', folderName: 'chs', transifexId: 'zh-hans' },
-@@ -64,6 +74,8 @@
- };
- 
- 
-+=======
-+>>>>>>> .their
- interface Map<V> {
- 	[key: string]: V;
- }
-@@ -98,7 +110,7 @@
- }
- 
- interface BundledFormat {
--	keys: Map<(string | LocalizeInfo)[]>;
-+	keys: Map<(string | LocalizeInfo) []>;
- 	messages: Map<string[]>;
- 	bundles: Map<string[]>;
- }
-@@ -139,7 +151,7 @@
- 
- interface ModuleJsonFormat {
- 	messages: string[];
--	keys: (string | LocalizeInfo)[];
-+	keys: (string | LocalizeInfo) [];
- }
- 
- module ModuleJsonFormat {
-@@ -339,6 +351,7 @@
- 					const messages: Map<string> = {};
- 
- 					const transUnits = file.body[0]['trans-unit'];
-+<<<<<<< .our
- 					if (transUnits) {
- 						transUnits.forEach(unit => {
- 							const key = unit.$.id;
-@@ -355,6 +368,24 @@
- 						});
- 						files.push({ messages: messages, originalFilePath: originalFilePath, language: language.toLowerCase() });
- 					}
-+=======
-+
-+					transUnits.forEach(unit => {
-+						const key = unit.$.id;
-+						if (!unit.target) {
-+							return; // No translation available
-+						}
-+
-+						const val = unit.target.toString();
-+						if (key && val) {
-+							messages[key] = decodeEntities(val);
-+						} else {
-+							reject(new Error(`XLF parsing error: XLIFF file does not contain full localization data. ID or target translation for one of the trans-unit nodes is not present.`));
-+						}
-+					});
-+
-+					files.push({ messages: messages, originalFilePath: originalFilePath, language: language });
-+>>>>>>> .their
- 				});
- 
- 				resolve(files);
-@@ -477,7 +508,11 @@
- 	return result.join('');
- }
- 
-+<<<<<<< .our
- function processCoreBundleFormat(fileHeader: string, languages: Language[], json: BundledFormat, emitter: ThroughStream) {
-+=======
-+function processCoreBundleFormat(fileHeader: string, languages: Language[], json: BundledFormat, emitter: any) {
-+>>>>>>> .their
- 	let keysSection = json.keys;
- 	let messageSection = json.messages;
- 	let bundleSection = json.bundles;
-@@ -515,8 +550,12 @@
- 
- 		statistics[language.id] = 0;
- 		let localizedModules: Map<string[]> = Object.create(null);
-+<<<<<<< .our
- 		let languageFolderName = language.folderName || language.id;
- 		let cwd = path.join(languageDirectory, languageFolderName, 'src');
-+=======
-+		let cwd = path.join(languageDirectory, language.iso639_3, 'src');
-+>>>>>>> .their
- 		modules.forEach((module) => {
- 			let order = keysSection[module];
- 			let i18nFile = path.join(cwd, module) + '.i18n.json';
-@@ -570,7 +609,11 @@
- 				contents.push(index < modules.length - 1 ? '\t],' : '\t]');
- 			});
- 			contents.push('});');
-+<<<<<<< .our
- 			emitter.queue(new File({ path: bundle + '.nls.' + language.id + '.js', contents: Buffer.from(contents.join('\n'), 'utf-8') }));
-+=======
-+			emitter.emit('data', new File({ path: bundle + '.nls.' + language.id + '.js', contents: new Buffer(contents.join('\n'), 'utf-8') }));
-+>>>>>>> .their
- 		});
- 	});
- 	Object.keys(statistics).forEach(key => {
-@@ -586,7 +629,11 @@
- }
- 
- export function processNlsFiles(opts: { fileHeader: string; languages: Language[] }): ThroughStream {
-+<<<<<<< .our
- 	return through(function (this: ThroughStream, file: File) {
-+=======
-+	return through(function (file: File) {
-+>>>>>>> .their
- 		let fileName = path.basename(file.path);
- 		if (fileName === 'nls.metadata.json') {
- 			let json = null;
-@@ -679,7 +726,63 @@
- 			this.emit('error', new Error(`File ${file.relative} is not a core meta data file.`));
- 			return;
- 		}
-+<<<<<<< .our
- 	});
-+=======
-+
-+		let xlf = bundleXlfs[resource] ? bundleXlfs[resource] : bundleXlfs[resource] = new XLF(project);
-+		xlf.addFile('src/' + source, keys, messages);
-+	}
-+
-+	for (let resource in bundleXlfs) {
-+		const newFilePath = `${bundleXlfs[resource].project}/${resource.replace(/\//g, '_')}.xlf`;
-+		const xlfFile = new File({ path: newFilePath, contents: new Buffer(bundleXlfs[resource].toString(), 'utf-8') });
-+		stream.emit('data', xlfFile);
-+	}
-+}
-+
-+// Keeps existing XLF instances and a state of how many files were already processed for faster file emission
-+var extensions: Map<{ xlf: XLF, processed: number }> = Object.create(null);
-+function importModuleOrPackageJson(file: File, json: ModuleJsonFormat | PackageJsonFormat, projectName: string, stream: ThroughStream, extensionName?: string): void {
-+	if (ModuleJsonFormat.is(json) && json['keys'].length !== json['messages'].length) {
-+		throw new Error(`There is a mismatch between keys and messages in ${file.relative}`);
-+	}
-+
-+	// Prepare the source path for <original/> attribute in XLF & extract messages from JSON
-+	const formattedSourcePath = file.relative.replace(/\\/g, '/');
-+	const messages = Object.keys(json).map((key) => json[key].toString());
-+
-+	// Stores the amount of localization files to be transformed to XLF before the emission
-+	let localizationFilesCount,
-+		originalFilePath;
-+	// If preparing XLF for external extension, then use different glob pattern and source path
-+	if (extensionName) {
-+		localizationFilesCount = glob.sync('**/*.nls.json').length;
-+		originalFilePath = `${formattedSourcePath.substr(0, formattedSourcePath.length - '.nls.json'.length)}`;
-+	} else {
-+		// Used for vscode/extensions folder
-+		extensionName = formattedSourcePath.split('/') [0];
-+		localizationFilesCount = glob.sync(`./extensions/${extensionName}/**/*.nls.json`).length;
-+		originalFilePath = `extensions/${formattedSourcePath.substr(0, formattedSourcePath.length - '.nls.json'.length)}`;
-+	}
-+
-+	let extension = extensions[extensionName] ?
-+		extensions[extensionName] : extensions[extensionName] = { xlf: new XLF(projectName), processed: 0 };
-+
-+	// .nls.json can come with empty array of keys and messages, check for it
-+	if (ModuleJsonFormat.is(json) && json.keys.length !== 0) {
-+		extension.xlf.addFile(originalFilePath, json.keys, json.messages);
-+	} else if (PackageJsonFormat.is(json) && Object.keys(json).length !== 0) {
-+		extension.xlf.addFile(originalFilePath, Object.keys(json), messages);
-+	}
-+
-+	// Check if XLF is populated with file nodes to emit it
-+	if (++extensions[extensionName].processed === localizationFilesCount) {
-+		const newFilePath = path.join(projectName, extensionName + '.xlf');
-+		const xlfFile = new File({ path: newFilePath, contents: new Buffer(extension.xlf.toString(), 'utf-8') });
-+		stream.emit('data', xlfFile);
-+	}
-+>>>>>>> .their
- }
- 
- export function createXlfFilesForExtensions(): ThroughStream {
-@@ -758,6 +861,7 @@
- 	});
- }
- 
-+<<<<<<< .our
- export function createXlfFilesForIsl(): ThroughStream {
- 	return through(function (this: ThroughStream, file: File) {
- 		let projectName: string,
-@@ -773,6 +877,10 @@
- 		let xlf = new XLF(projectName),
- 			keys: string[] = [],
- 			messages: string[] = [];
-+=======
-+	const originalPath = file.path.substring(file.cwd.length + 1, file.path.split('.') [0].length).replace(/\\/g, '/');
-+	xlf.addFile(originalPath, keys, messages);
-+>>>>>>> .their
- 
- 		let model = new TextModel(file.contents.toString());
- 		let inMessageSection = false;
-@@ -1036,6 +1144,7 @@
- }
- 
- // cache resources
-+<<<<<<< .our
- let _coreAndExtensionResources: Resource[];
- 
- export function pullCoreAndExtensionsXlfFiles(apiHostname: string, username: string, password: string, language: Language, externalExtensions?: Map<string>): NodeJS.ReadableStream {
-@@ -1068,6 +1177,36 @@
- 	let setupResources = [{ name: 'setup_messages', project: workbenchProject }];
- 	if (includeDefault) {
- 		setupResources.push({ name: 'setup_default', project: setupProject });
-+=======
-+let _buildResources: Resource[];
-+
-+export function pullBuildXlfFiles(apiHostname: string, username: string, password: string, language: Language): NodeJS.ReadableStream {
-+	if (!_buildResources) {
-+		_buildResources = [];
-+		// editor and workbench
-+		const json = JSON.parse(fs.readFileSync('./build/lib/i18n.resources.json', 'utf8'));
-+		_buildResources.push(...json.editor);
-+		_buildResources.push(...json.workbench);
-+
-+		// extensions
-+		let extensionsToLocalize: string[] = glob.sync('./extensions/**/*.nls.json').map(extension => extension.split('/') [2]);
-+		let resourcesToPull: string[] = [];
-+
-+		extensionsToLocalize.forEach(extension => {
-+			if (resourcesToPull.indexOf(extension) === -1) { // remove duplicate elements returned by glob
-+				resourcesToPull.push(extension);
-+				_buildResources.push({ name: extension, project: 'vscode-extensions' });
-+			}
-+		});
-+	}
-+	return pullXlfFiles(apiHostname, username, password, language, _buildResources);
-+}
-+
-+export function pullSetupXlfFiles(apiHostname: string, username: string, password: string, language: Language, includeDefault: boolean): NodeJS.ReadableStream {
-+	let setupResources = [{ name: 'setup_messages', project: 'vscode-workbench' }];
-+	if (includeDefault) {
-+		setupResources.push({ name: 'setup_default', project: 'vscode-setup' });
-+>>>>>>> .their
- 	}
- 	return pullXlfFiles(apiHostname, username, password, language, setupResources);
- }
-@@ -1088,9 +1227,13 @@
- 			const stream = this;
- 			resources.map(function (resource) {
- 				retrieveResource(language, resource, apiHostname, credentials).then((file: File) => {
-+<<<<<<< .our
- 					if (file) {
- 						stream.emit('data', file);
- 					}
-+=======
-+					stream.emit('data', file);
-+>>>>>>> .their
- 					translationsRetrieved++;
- 				}).catch(error => { throw new Error(error); });
- 			});
-@@ -1105,7 +1248,11 @@
- 	return limiter.queue(() => new Promise<File>((resolve, reject) => {
- 		const slug = resource.name.replace(/\//g, '_');
- 		const project = resource.project;
-+<<<<<<< .our
- 		let transifexLanguageId = language.id === 'ps' ? 'en' : language.transifexId || language.id;
-+=======
-+		const iso639 = language.transifexId || language.id;
-+>>>>>>> .their
- 		const options = {
- 			hostname: apiHostname,
- 			path: `/api/2/project/${project}/resource/${slug}/translation/${transifexLanguageId}?file&mode=onlyreviewed`,
-@@ -1120,12 +1267,17 @@
- 			res.on('data', (chunk: Buffer) => xlfBuffer.push(chunk));
- 			res.on('end', () => {
- 				if (res.statusCode === 200) {
-+<<<<<<< .our
- 					resolve(new File({ contents: Buffer.concat(xlfBuffer), path: `${project}/${slug}.xlf` }));
- 				} else if (res.statusCode === 404) {
- 					console.log(`[transifex] ${slug} in ${project} returned no data.`);
- 					resolve(null);
- 				} else {
- 					reject(`${slug} in ${project} returned no data. Response code: ${res.statusCode}.`);
-+=======
-+					console.log('success: ' + options.path);
-+					resolve(new File({ contents: Buffer.concat(xlfBuffer), path: `${project}/${slug}.xlf` }));
-+>>>>>>> .their
- 				}
- 			});
- 		});
-@@ -1133,10 +1285,18 @@
- 			reject(`Failed to query resource ${slug} with the following error: ${err}. ${options.path}`);
- 		});
- 		request.end();
-+<<<<<<< .our
- 	}));
- }
- 
- export function prepareI18nFiles(): ThroughStream {
-+=======
-+		console.log('started: ' + options.path);
-+	}));
-+}
-+
-+export function prepareI18nFiles(language: Language): ThroughStream {
-+>>>>>>> .their
- 	let parsePromises: Promise<ParsedXLF[]>[] = [];
- 
- 	return through(function (this: ThroughStream, xlf: File) {
-@@ -1146,8 +1306,13 @@
- 		parsePromise.then(
- 			resolvedFiles => {
- 				resolvedFiles.forEach(file => {
-+<<<<<<< .our
- 					let translatedFile = createI18nFile(file.originalFilePath, file.messages);
- 					stream.queue(translatedFile);
-+=======
-+					let translatedFile = createI18nFile(language, file.originalFilePath, file.messages);
-+					stream.emit('data', translatedFile);
-+>>>>>>> .their
- 				});
- 			}
- 		);
-@@ -1158,6 +1323,7 @@
- 	});
- }
- 
-+<<<<<<< .our
- function createI18nFile(originalFilePath: string, messages: any): File {
- 	let result = Object.create(null);
- 	result[''] = [
-@@ -1170,6 +1336,16 @@
- 	for (let key of Object.keys(messages)) {
- 		result[key] = messages[key];
- 	}
-+=======
-+function createI18nFile(language: Language, originalFilePath: string, messages: Map<string>): File {
-+	let content = [
-+		'/*---------------------------------------------------------------------------------------------',
-+		' *  Copyright (c) Microsoft Corporation. All rights reserved.',
-+		' *  Licensed under the MIT License. See License.txt in the project root for license information.',
-+		' *--------------------------------------------------------------------------------------------*/',
-+		'// Do not edit this file. It is machine generated.'
-+	].join('\n') + '\n' + JSON.stringify(messages, null, '\t').replace(/\r\n/g, '\n');
-+>>>>>>> .their
- 
- 	let content = JSON.stringify(result, null, '\t');
- 	if (process.platform === 'win32') {
-@@ -1177,6 +1353,7 @@
- 	}
- 	return new File({
- 		path: path.join(originalFilePath + '.i18n.json'),
-+<<<<<<< .our
- 		contents: Buffer.from(content, 'utf8')
- 	});
- }
-@@ -1264,6 +1441,16 @@
- 	let parsePromises: Promise<ParsedXLF[]>[] = [];
- 
- 	return through(function (this: ThroughStream, xlf: File) {
-+=======
-+		contents: new Buffer(content, 'utf8')
-+	});
-+}
-+
-+export function prepareIslFiles(language: Language, innoSetupConfig: InnoSetup): ThroughStream {
-+	let parsePromises: Promise<ParsedXLF[]>[] = [];
-+
-+	return through(function (xlf: File) {
-+>>>>>>> .their
- 		let stream = this;
- 		let parsePromise = XLF.parse(xlf.contents.toString());
- 		parsePromises.push(parsePromise);
-@@ -1274,13 +1461,21 @@
- 						return;
- 					}
- 					let translatedFile = createIslFile(file.originalFilePath, file.messages, language, innoSetupConfig);
-+<<<<<<< .our
- 					stream.queue(translatedFile);
-+=======
-+					stream.emit('data', translatedFile);
-+>>>>>>> .their
- 				});
- 			}
- 		);
- 	}, function () {
- 		Promise.all(parsePromises)
-+<<<<<<< .our
- 			.then(() => { this.queue(null); })
-+=======
-+			.then(() => { this.emit('end'); })
-+>>>>>>> .their
- 			.catch(reason => { throw new Error(reason); });
- 	});
- }
-@@ -1331,7 +1526,11 @@
- 
- 	return new File({
- 		path: filePath,
-+<<<<<<< .our
- 		contents: iconv.encode(Buffer.from(content.join('\r\n'), 'utf8'), innoSetup.codePage)
-+=======
-+		contents: iconv.encode(new Buffer(content.join('\r\n'), 'utf8'), innoSetup.codePage)
-+>>>>>>> .their
- 	});
- }
- 
-changed in both
-  base   100644 428fa08a5bcf38d2de742d8a1e17f274173ef628 build/lib/optimize.ts
-  our    100644 038cf09dd21bfefcec33d2e0eaa808b3e9d1fce9 build/lib/optimize.ts
-  their  100644 eb39e9deed1b8791c672fe185a6ce10c63d48e63 build/lib/optimize.ts
-@@ -167,7 +167,11 @@
- 	/**
- 	 * (out folder name)
- 	 */
-+<<<<<<< .our
- 	languages?: Language[];
-+=======
-+	languages: i18n.Language[];
-+>>>>>>> .their
- }
- 
- export function optimizeTask(opts: IOptimizeTaskOpts): () => NodeJS.ReadWriteStream {
-changed in both
-  base   100644 6df74592845c82212cede74b7190e028a2ae69b3 i18n/chs/extensions/git/out/autofetch.i18n.json
-  our    100644 1b09e9c6bd8b812e46758456cd483ea4739537f6 i18n/chs/extensions/git/out/autofetch.i18n.json
-  their  100644 823bb93043fd6924820d2ab9e8443c022cafded6 i18n/chs/extensions/git/out/autofetch.i18n.json
-@@ -7,7 +7,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"yes": "是",
-+	"read more": "了解详细信息",
- 	"no": "否",
- 	"not now": "稍后询问",
-+<<<<<<< .our
- 	"suggest auto fetch": "您希望 Code [定期运行 \"git fetch\"]({0}) 吗?"
-+=======
-+	"suggest auto fetch": "您希望 Code 定期运行 \"git fetch\" 吗?"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8f5f2a83f793b721a04539cf46eadfc8f5fa1ec5 i18n/chs/extensions/git/out/commands.i18n.json
-  our    100644 04fae89946b4fff2a3f253e57b9b96d137dedd28 i18n/chs/extensions/git/out/commands.i18n.json
-  their  100644 dcd0b9e0ae9e29e14655917740f030434d0734cd i18n/chs/extensions/git/out/commands.i18n.json
-@@ -75,8 +75,12 @@
- 	"ok": "确定",
- 	"push with tags success": "已成功带标签进行推送。",
- 	"pick remote": "选取要将分支“{0}”发布到的远程:",
-+<<<<<<< .our
- 	"sync is unpredictable": "此操作将推送提交至“{0}/{1}”，并从中拉取提交。",
- 	"never again": "确定，且不再显示",
-+=======
-+	"sync is unpredictable": "此操作将推送提交至“{0}”，并从中拉取提交。",
-+>>>>>>> .their
- 	"no remotes to publish": "存储库未配置任何要发布到的远程存储库。",
- 	"no changes stash": "没有要储藏的更改。",
- 	"provide stash message": "提供储藏消息(可选)",
-changed in both
-  base   100644 cb8443b7aecb74a6659f99fc88dc857dc7b6853c i18n/chs/extensions/git/package.i18n.json
-  our    100644 7c2a3b49c9f848f60d2957657294486b061a17aa i18n/chs/extensions/git/package.i18n.json
-  their  100644 33772606c95496123209b39400f92841756cf22d i18n/chs/extensions/git/package.i18n.json
-added in both
-  our    100644 71f03151b6fecd58c9a8721067f26bc58ad33734 i18n/chs/extensions/typescript/out/commands.i18n.json
-  their  100644 36b3b2d5f6ba3680fe26093fc105449a9293a487 i18n/chs/extensions/typescript/out/commands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -13,4 +14,20 @@
- 	"typescript.noJavaScriptProjectConfig": "文件不属于 JavaScript 项目。点击[这里]({0})了解更多。",
- 	"typescript.configureTsconfigQuickPick": "配置 tsconfig.json",
- 	"typescript.configureJsconfigQuickPick": "配置 jsconfig.json"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"typescript.projectConfigNoWorkspace": "请在 VS Code 中打开一个文件夹，以使用 TypeScript 或 JavaScript 项目",
-+	"typescript.projectConfigUnsupportedFile": "无法确定 TypeScript 或 JavaScript 项目。不受支持的文件类型",
-+	"typescript.projectConfigCouldNotGetInfo": "无法确定 TypeScript 或 JavaScript 项目",
-+	"typescript.noTypeScriptProjectConfig": "文件不属于 TypeScript 项目",
-+	"typescript.noJavaScriptProjectConfig": "文件不属于 JavaScript 项目",
-+	"typescript.configureTsconfigQuickPick": "配置 tsconfig.json",
-+	"typescript.configureJsconfigQuickPick": "配置 jsconfig.json",
-+	"typescript.projectConfigLearnMore": "了解详细信息"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 750d811d866eaa3d43818bd1d8e28c9898acf514 i18n/chs/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-  their  100644 ed15423097d5cbb03aeb8c474db3877ca0d1584f i18n/chs/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"selectAriaOption": "{0}"
- }
-\ No newline at end of file
-added in both
-  our    100644 4b6a11e30ab2010ef07b79ec8f1cd51920718289 i18n/chs/src/vs/base/node/ps.i18n.json
-  their  100644 da69e94cccc4b9e1f6bd36e963f7e0f7c4c57a57 i18n/chs/src/vs/base/node/ps.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"collecting": "正在收集 CPU 与内存信息。这可能需要几秒钟的时间。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 9c145d8c4d96ed4d4ed34fe0011175c2a7f1e61c i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 e4c993e2df857650110681bbfaaa48507f4e2ec6 i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 b2f32f3d15bb587157f73cfef6a3d91e500ce421 i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -16,7 +16,11 @@
- 	"lineNumbers.on": "将行号显示为绝对行数。",
- 	"lineNumbers.relative": "将行号显示为与光标相隔的行数。",
- 	"lineNumbers.interval": "每 10 行显示一次行号。",
-+<<<<<<< .our
- 	"lineNumbers": "控制行号的显示。",
-+=======
-+	"lineNumbers": "控制行号的显示。可选值为 \"on\"、\"off\"、\"relative\" 和 \"interval\"。",
-+>>>>>>> .their
- 	"rulers": "在一定数量的等宽字符后显示垂直标尺。输入多个值，显示多个标尺。若数组为空，则不绘制标尺。",
- 	"wordSeparators": "执行文字相关的导航或操作时将用作文字分隔符的字符",
- 	"tabSize": "一个制表符等于的空格数。该设置在 \"editor.detectIndentation\" 启用时根据文件内容可能会被覆盖。",
-@@ -81,7 +85,11 @@
- 	"cursorBlinking": "控制光标的动画样式。",
- 	"mouseWheelZoom": "按住 Ctrl 键并滚动鼠标滚轮可缩放编辑器字体大小",
- 	"cursorStyle": "控制光标样式，接受的值为 \"block\"、\"block-outline\"、\"line\"、\"line-thin\" 、\"underline\" 和 \"underline-thin\"",
-+<<<<<<< .our
- 	"cursorWidth": "当 editor.cursorStyle 设置为 \"line\" 时控制光标的宽度。",
-+=======
-+	"lineCursorWidth": "当 editor.cursorStyle 设置为 \"line\" 时控制光标的宽度。",
-+>>>>>>> .their
- 	"fontLigatures": "启用字体连字",
- 	"hideCursorInOverviewRuler": "控制光标是否应隐藏在概述标尺中。",
- 	"renderWhitespace": "控制编辑器在空白字符上显示特殊符号的方式。可选值为 \"none\"(无)、\"boundary\"(边界) 或 \"all\"(所有)。选择 \"boundary\" 选项，则不会在单词之间的单个空格上显示特殊符号。",
-changed in both
-  base   100644 168dd2fb958ae830c3931ca87f2d3b51f2177c19 i18n/chs/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 264f0668a4da9659a58613193f24657a9dfbbc79 i18n/chs/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 6d1dfc8be232f5b57f9e41b60d0f29e3dc2c6313 i18n/chs/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -8,8 +8,12 @@
- 	],
- 	"lineHighlight": "光标所在行高亮内容的背景颜色。",
- 	"lineHighlightBorderBox": "光标所在行四周边框的背景颜色。",
-+<<<<<<< .our
- 	"rangeHighlight": "高亮范围的背景色，像是由 \"Quick Open\" 和“查找”功能高亮的范围。颜色必须透明，使其不会挡住下方的其他元素。",
- 	"rangeHighlightBorder": "高亮区域边框的背景颜色。",
-+=======
-+	"rangeHighlight": "高亮范围的背景色，例如由 \"Quick Open\" 和“查找”功能高亮的范围。颜色必须透明，这样不会挡住其下的其他元素。",
-+>>>>>>> .their
- 	"caret": "编辑器光标颜色。",
- 	"editorCursorBackground": "编辑器光标的背景色。可以自定义块型光标覆盖字符的颜色。",
- 	"editorWhitespaces": "编辑器中空白字符的颜色。",
-changed in both
-  base   100644 8dc6ee58760895e0ce0231d59214f863bdbf9e42 i18n/chs/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  our    100644 07ca5b151407128f5c67abeabd325c94baa546d7 i18n/chs/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  their  100644 1613d026f4c2506d7dc1e0a7559c213185dd4257 i18n/chs/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -10,4 +11,11 @@
- 	"markerAction.previous.label": "转到上一个问题 (错误、警告、信息)",
- 	"markerAction.nextInFiles.label": "转到文件中的下一个问题 (错误、警告、信息)",
- 	"markerAction.previousInFiles.label": "转到文件中的上一个问题 (错误、警告、信息)"
-+=======
-+	"title.wo_source": "({0}/{1})",
-+	"editorMarkerNavigationError": "编辑器标记导航小组件错误颜色。",
-+	"editorMarkerNavigationWarning": "编辑器标记导航小组件警告颜色。",
-+	"editorMarkerNavigationInfo": "编辑器标记导航小组件信息颜色。",
-+	"editorMarkerNavigationBackground": "编辑器标记导航小组件背景色。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7926047995cd2085bb787739e9fc392f79b6f9fb i18n/chs/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  our    100644 1340c8a0009aff7341c597272cd8012da0f8ba44 i18n/chs/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  their  100644 185a3d3162017d13d575cf1d85c8514990de7a64 i18n/chs/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,12 @@
- 	"wordHighlightStrongBorder": "符号在进行写入访问操作时的边框颜色，例如写入变量。",
- 	"overviewRulerWordHighlightForeground": "概览标尺中符号高亮的标记颜色。颜色必须透明，使其不会挡住下方的其他元素。",
- 	"overviewRulerWordHighlightStrongForeground": "概览标尺中写入访问符号高亮的标记颜色。颜色必须透明，使其不会挡住下方的其他元素。",
-+=======
-+	"wordHighlight": "进行读取访问操作时符号的背景颜色，例如读取变量时。颜色必须透明，这样不会挡住其下的其他元素。",
-+	"wordHighlightStrong": "进行写入访问操作时符号的背景颜色，例如写入变量时。颜色必须透明，这样不会挡住其下的其他元素。",
-+	"overviewRulerWordHighlightForeground": "概述符号突出显示的标尺标记颜色。",
-+	"overviewRulerWordHighlightStrongForeground": "概述写访问符号突出显示的标尺标记颜色。",
-+>>>>>>> .their
- 	"wordHighlight.next.label": "转到下一个突出显示的符号",
- 	"wordHighlight.previous.label": "转到上一个突出显示的符号"
- }
-\ No newline at end of file
-changed in both
-  base   100644 d14243882a7e041eb7326c95dffaca2dd93b0761 i18n/chs/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  our    100644 d23732f8ae4a1f9b08239592f29e3466b2c23adf i18n/chs/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  their  100644 dd181ef9f459c13e4ff6322f75ff4653c16087b1 i18n/chs/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 9a1faa5d9834a9baf000967abbf2ad5cd872c29e i18n/chs/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 9b8e352f2e01c71634dfc189a8ddc9dc7485da94 i18n/chs/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 30d7fd225a23bd396022f1e66ac73228123bbd55 i18n/chs/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,11 +10,19 @@
- 	"diff": "将两个文件相互比较。",
- 	"add": "将文件夹添加到上一个活动窗口。",
- 	"goto": "打开路径下的文件并定位到特定行和特定列。",
-+<<<<<<< .our
- 	"newWindow": "强制打开新窗口。",
- 	"reuseWindow": "强制打开上一个活动窗口中的文件或文件夹。",
- 	"wait": "等文件关闭后再返回。",
- 	"locale": "要使用的区域设置(例如 en-US 或 zh-TW)。",
- 	"userDataDir": "指定保存用户数据的目录。可用于打开多个不同的 Code 实例。",
-+=======
-+	"newWindow": "强制创建一个新的 Code 实例。",
-+	"reuseWindow": "在上一活动窗口中强制打开文件或文件夹。",
-+	"wait": "等文件关闭后再返回。",
-+	"locale": "要使用的区域设置(例如 en-US 或 zh-TW)。",
-+	"userDataDir": "指定存放用户数据的目录。此目录在以 root 身份运行时十分有用。",
-+>>>>>>> .their
- 	"version": "打印版本。",
- 	"help": "打印使用情况。",
- 	"extensionHomePath": "设置扩展的根路径。",
-@@ -22,13 +30,18 @@
- 	"showVersions": "使用 --list-extension 时，显示已安装扩展的版本。",
- 	"installExtension": "安装扩展。",
- 	"uninstallExtension": "卸载扩展。",
-+<<<<<<< .our
- 	"experimentalApis": "为扩展启用实验性 API 功能。",
-+=======
-+	"experimentalApis": "启用扩展程序实验性 api 功能。",
-+>>>>>>> .their
- 	"verbose": "打印详细输出(隐含 --wait 参数)。",
- 	"log": "使用的日志级别。默认值为 \"info\"。允许的值为 \"critical\" (关键)、\"error\" (错误)、\"warn\" (警告)、\"info\" (信息)、\"debug\" (调试)、\"trace\" (跟踪) 和 \"off\" (关闭)。",
- 	"status": "打印进程使用情况和诊断信息。",
- 	"performance": "通过启用 \"Developer: Startup Performance\" 命令开始。",
- 	"prof-startup": "启动期间运行 CPU 探查器",
- 	"disableExtensions": "禁用所有已安装的扩展。",
-+<<<<<<< .our
- 	"inspect-extensions": "允许调试和分析扩展。您可以在开发人员工具中找到连接 URI。",
- 	"inspect-brk-extensions": "允许扩展宿主在启动后暂停时进行扩展的调试和分析。您可以在开发人员工具中找到连接 URI。",
- 	"disableGPU": "禁用 GPU 硬件加速。",
-@@ -38,6 +51,16 @@
- 	"options": "选项",
- 	"paths": "路径",
- 	"stdinWindows": "要读取其他程序的输出，请追加 \"-\" (例如 \"echo Hello World | {0} -')",
-+=======
-+	"inspect-extensions": "允许进行扩展的调试与分析。检查开发人员工具可获取连接 URI。",
-+	"inspect-brk-extensions": "允许在扩展主机在启动后暂停时进行扩展的调试与分析。检查开发人员工具可获取连接 URI。",
-+	"disableGPU": "禁用 GPU 硬件加速。",
-+	"uploadLogs": "将当前会话的日志上传到安全端点。",
-+	"usage": "使用情况",
-+	"options": "选项",
-+	"paths": "路径",
-+	"stdinWindows": "要读取其他程序的输出，请追加 \"-\" (例如 \"echo Hello World\" | {0} -')",
-+>>>>>>> .their
- 	"stdinUnix": "要从 stdin 中读取，请追加 \"-\" (例如 \"ps aux | grep code | {0} -')",
- 	"optionsUpperCase": "选项",
- 	"extensionsManagement": "扩展管理",
-changed in both
-  base   100644 a6e3a8ea7bc9a06e9c6c887aa44c0473b27cb057 i18n/chs/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 7fee73e8505eefc794b34e899f5cfb2204f92225 i18n/chs/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 c72b93d1de938768477baeb2a28cbd24aedc32eb i18n/chs/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -7,12 +7,16 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"invalidManifest": "扩展无效: package.json 不是 JSON 文件。",
-+<<<<<<< .our
- 	"incompatible": "无法安装扩展“{0}”，它与 Code “{1}”不兼容。",
-+=======
-+>>>>>>> .their
- 	"restartCode": "请先重启 Code 再重新安装 {0}。",
- 	"installingOutdatedExtension": "您已安装此扩展的新版程序。是否要使用旧版覆盖？",
- 	"override": "覆盖",
- 	"cancel": "取消",
- 	"errorInstallingDependencies": "安装依赖项时出错。{0}",
-+<<<<<<< .our
- 	"MarketPlaceDisabled": "商店未启用",
- 	"removeError": "删除扩展时出错: {0}。请重启 VS Code，然后重试。",
- 	"Not a Marketplace extension": "只能重新安装商店中的扩展",
-@@ -25,6 +29,17 @@
- 	"uninstallDependeciesConfirmation": "是仅卸载“{0}”还是与其依赖项一起卸载?",
- 	"uninstallOnly": "仅此扩展",
- 	"uninstallAll": "全部卸载",
-+=======
-+	"notFoundCompatible": "无法安装“{0}”；没有可用的版本与 VS Code “{1}”兼容。",
-+	"notFoundCompatibleDependency": "无法安装。找不到与 VS Code 当前版本 ({1}) 兼容的依赖扩展“{0}”。",
-+	"quitCode": "无法安装扩展。请在重启 VS Code 后重新安装。",
-+	"exitCode": "无法安装扩展。请在重启 VS Code 后重新安装。",
-+	"uninstallDependeciesConfirmation": "要仅卸载“{0}”或者其依赖项也一起卸载?",
-+	"uninstallOnly": "仅",
-+	"uninstallAll": "全部",
-+	"uninstallConfirmation": "是否确定要卸载“{0}”?",
-+	"ok": "确定",
-+>>>>>>> .their
- 	"singleDependentError": "无法卸载扩展程序“{0}”。扩展程序“{1}”依赖于此。",
- 	"twoDependentsError": "无法卸载扩展程序“{0}”。扩展程序“{1}”、“{2}”依赖于此。",
- 	"multipleDependentsError": "无法卸载扩展程序“{0}”。扩展程序“{1}”、“{2}”以及其他扩展程序都依赖于此。",
-changed in both
-  base   100644 864f82423ea1aefaf453829ded69186ccf90e1e1 i18n/chs/src/vs/platform/message/common/message.i18n.json
-  our    100644 db08df116eef5fe3a9bdcfdb3c527899324b8959 i18n/chs/src/vs/platform/message/common/message.i18n.json
-  their  100644 6ab699b790e6cb991fbccac8c96a921a9d0f6a2e i18n/chs/src/vs/platform/message/common/message.i18n.json
-changed in both
-  base   100644 7c3d96dd488d30cbdad11c18b72d481ffd24e5b3 i18n/chs/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 c983e4e827a53b4bffaaa1c1c11e806845efcb6b i18n/chs/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 0e3e7d546d396f0d12ec42de6ca670df52c86bd3 i18n/chs/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -68,6 +68,7 @@
- 	"editorWidgetBorder": "编辑器小部件的边框颜色。此颜色仅在小部件有边框且不被小部件重写时适用。",
- 	"editorSelectionBackground": "编辑器所选内容的颜色。",
- 	"editorSelectionForeground": "用以彰显高对比度的所选文本的颜色。",
-+<<<<<<< .our
- 	"editorInactiveSelection": "非活动编辑器内已选内容的颜色。颜色必须透明，使其不会挡住下方的其他元素。",
- 	"editorSelectionHighlight": "与所选项内容相同的区域的颜色。颜色必须透明，使其不会挡住下方的其他元素。",
- 	"editorSelectionHighlightBorder": "与所选项内容相同的区域的边框颜色。",
-@@ -79,6 +80,14 @@
- 	"findRangeHighlightBorder": "搜索限制范围的边框颜色。颜色必须透明，使其不会挡住下方的其他元素。",
- 	"findWidgetResizeBorder": "“查找”小部件中大小调整条的边框颜色。",
- 	"hoverHighlight": "文本在悬停提示显示时的高亮颜色。颜色必须透明，使其不会挡住下方的其他元素。",
-+=======
-+	"editorInactiveSelection": "非活动编辑器选择内容的颜色。颜色必须透明，这样不会挡住其下的其他元素。",
-+	"editorSelectionHighlight": "与已选项内容相同区域的颜色。颜色必须透明，这样不会挡住其下的其他元素。",
-+	"editorFindMatch": "当前搜索匹配项的颜色。",
-+	"findMatchHighlight": "其他搜索匹配项的颜色。颜色必须透明，这样不会挡住其下的其他元素。",
-+	"findRangeHighlight": "搜索限制范围的颜色。颜色必须透明，这样不会挡住其下的其他元素。",
-+	"hoverHighlight": "悬停提示显示时文本的高亮颜色。颜色必须透明，这样不会挡住其下的其他元素。",
-+>>>>>>> .their
- 	"hoverBackground": "编辑器悬停提示的背景颜色。",
- 	"hoverBorder": "光标悬停时编辑器的边框颜色。",
- 	"activeLinkForeground": "活动链接颜色。",
-@@ -86,12 +95,21 @@
- 	"diffEditorRemoved": "移除文本的背景色。颜色必须透明，使其不会挡住下方的其他元素。",
- 	"diffEditorInsertedOutline": "插入的文本的轮廓颜色。",
- 	"diffEditorRemovedOutline": "被删除文本的轮廓颜色。",
-+<<<<<<< .our
- 	"mergeCurrentHeaderBackground": "内嵌的合并冲突处理器中当前版本区域头部的背景色。颜色必须透明，使其不会挡住下方的其他元素。",
- 	"mergeCurrentContentBackground": "内嵌的合并冲突处理器中当前版本区域内容的背景色。颜色必须透明，使其不会挡住下方的其他元素。",
- 	"mergeIncomingHeaderBackground": "内嵌的合并冲突处理器中传入版本区域头部的背景色。颜色必须透明，使其不会挡住下方的其他元素。",
- 	"mergeIncomingContentBackground": "内嵌的合并冲突处理器中传入版本区域内容的背景色。颜色必须透明，使其不会挡住下方的其他元素。",
- 	"mergeCommonHeaderBackground": "内嵌的合并冲突处理器中共同上级区域头部的背景色。颜色必须透明，使其不会挡住下方的其他元素。",
- 	"mergeCommonContentBackground": "内嵌的合并冲突处理器中共同上级区域内容的背景色。颜色必须透明，使其不会挡住下方的其他元素。",
-+=======
-+	"mergeCurrentHeaderBackground": "内联合并冲突中当前版本区域头部的背景色。颜色必须透明，这样不会挡住其下的其他元素。",
-+	"mergeCurrentContentBackground": "内联合并冲突中当前版本区域内容的背景色。颜色必须透明，这样不会挡住其下的其他元素。",
-+	"mergeIncomingHeaderBackground": "内联合并冲突中传入版本区域头部的背景色。颜色必须透明，这样不会挡住其下的其他元素。",
-+	"mergeIncomingContentBackground": "内联合并冲突中传入版本区域内容的背景色。颜色必须透明，这样不会挡住其下的其他元素。",
-+	"mergeCommonHeaderBackground": "内联合并冲突中共同上级区域头部的背景色。颜色必须透明，这样不会挡住其下的其他元素。",
-+	"mergeCommonContentBackground": "内联合并冲突中共同上级区域内容的背景色。颜色必须透明，这样不会挡住其下的其他元素。",
-+>>>>>>> .their
- 	"mergeBorder": "内联合并冲突中标头和分割线的边框颜色。",
- 	"overviewRulerCurrentContentForeground": "内联合并冲突中当前版本区域的概览标尺前景色。",
- 	"overviewRulerIncomingContentForeground": "内联合并冲突中传入的版本区域的概览标尺前景色。",
-added in both
-  our    100644 8117f5f86ff11ff7ea3fc98cdad68c3984b0dd2e i18n/chs/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 519a8e806a76fcb6e0d3e48ce315f684950e8fca i18n/chs/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,5 +10,13 @@
- 	"timeout.formatOnSave": "在 {0}ms 后终止了保存时进行的格式设置",
- 	"codeActionsOnSave.didTimeout": "在 {0}ms 后终止了 codeActionsOnSave ",
- 	"timeout.onWillSave": "在 1750ms 后终止了 onWillSaveTextDocument 事件",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"saveParticipants": "正在运行保存参与程序..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 7bfb0b886ded6448e92465cb63ab0ee172a110f9 i18n/chs/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  our    100644 468408a29dd30fc7bc139b6e7dd756255644e1a3 i18n/chs/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  their  100644 903f7203bbbf1a0a8b36327b824a43e0e7f88af3 i18n/chs/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,7 @@
- 	],
- 	"treeView.notRegistered": "没有注册 ID 为“{0}”的树形图。",
- 	"treeView.duplicateElement": "ID 为 {0} 的元素已被注册"
-+=======
-+	"treeView.notRegistered": "没有注册 ID 为“{0}”的树形图。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 b282efac3d09db774d38d17d7066a0bc0562cc83 i18n/chs/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 1be88d0e515057ba8dbf0bcd7cef8fa6af9d6bf5 i18n/chs/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 0ac87020d7bd2829721b96f209bea20515e22523 i18n/chs/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -15,5 +15,9 @@
- 	"saveWorkspace": "保存工作区",
- 	"openWorkspaceAction": "打开工作区...",
- 	"openWorkspaceConfigFile": "打开工作区配置文件",
-+<<<<<<< .our
- 	"duplicateWorkspaceInNewWindow": "复制此工作区并在新窗口打开"
-+=======
-+	"openFolderAsWorkspaceInNewWindow": "在新窗口中将文件夹作为工作区打开"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 4edf839a663bb84d07b5c6498969aedf9eac1cad i18n/chs/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-  their  100644 ff43d2fcbf7daa358ffcebce9525104b0e5633b2 i18n/chs/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"addFolderToWorkspace": "将文件夹添加到工作区...",
- 	"add": "添加(&&A)",
- 	"addFolderToWorkspaceTitle": "将文件夹添加到工作区",
-changed in both
-  base   100644 a2f0727f5791c87ae5b382d91952287a660ca64f i18n/chs/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  our    100644 0afdcb03a407d7395c5dfda27f1e82a5fbc03461 i18n/chs/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  their  100644 d2749a6922270c0432b40f38d1eebacfd61ad972 i18n/chs/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-@@ -18,15 +18,24 @@
- 	"file": "文件",
- 	"close": "关闭",
- 	"closeOthers": "关闭其他",
-+<<<<<<< .our
- 	"closeRight": "关闭右侧",
- 	"closeAllSaved": "关闭已保存",
-+=======
-+	"closeRight": "关闭到右侧",
-+	"closeAllUnmodified": "关闭未更改",
-+>>>>>>> .their
- 	"closeAll": "全部关闭",
- 	"keepOpen": "保持打开状态",
- 	"toggleInlineView": "切换内联视图",
- 	"showOpenedEditors": "显示打开的编辑器",
- 	"keepEditor": "保留编辑器",
- 	"closeEditorsInGroup": "关闭组中的所有编辑器",
-+<<<<<<< .our
- 	"closeSavedEditors": "关闭组中已保存的编辑器",
-+=======
-+	"closeUnmodifiedEditors": "关闭组中未作更改的编辑器",
-+>>>>>>> .their
- 	"closeOtherEditors": "关闭其他编辑器",
- 	"closeRightEditors": "关闭右侧编辑器"
- }
-\ No newline at end of file
-changed in both
-  base   100644 dd3e01e846c5a40d153653a4da14320970f14556 i18n/chs/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 d88886a35383d5f41237ade41887aa92519da9a1 i18n/chs/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 1d48cf8bccc26acb5b7a728135ff71c154c8e270 i18n/chs/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 9c9da616c68f199130fded466cf33bb3f9b52fab i18n/chs/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  our    100644 7288c1715223c1a48b55b4c38eeb19d83aa23eff i18n/chs/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  their  100644 94ef2c116b8697213febb9db68bf7d5bb36fb62f i18n/chs/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-changed in both
-  base   100644 9d821488d27392b57c99662107bfbc69473d7770 i18n/chs/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  our    100644 f99f129b03cb22c3e0ba8d5b9a5ccd3c7bc7f680 i18n/chs/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  their  100644 d5044cab6608083bc628894c1a26bf366c64f905 i18n/chs/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-changed in both
-  base   100644 90dedb611faac865cd269b429974f7fd3c21df3d i18n/chs/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  our    100644 928aff21e4992e87ab9bef7c409760daf942c7a2 i18n/chs/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  their  100644 d7a330cd5e2160410d539205323179d9646a3fab i18n/chs/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"close": "关闭",
-+>>>>>>> .their
- 	"araLabelEditorActions": "编辑器操作"
- }
-\ No newline at end of file
-changed in both
-  base   100644 452ee0335c551c8b3368096c7a75b79910fa6bbb i18n/chs/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
-  our    100644 4a2dece6b8d0c2c926cfb8b8bb507e016c3a2fbb i18n/chs/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
-  their  100644 1b911dc529631f9925b1f50ee36daeb94b3dea6f i18n/chs/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
-changed in both
-  base   100644 8ebf8f723db31c43b8eb24f67501b3d72999f545 i18n/chs/src/vs/workbench/common/theme.i18n.json
-  our    100644 9dff140c48c8d58d62f0adab067f1886bd30d318 i18n/chs/src/vs/workbench/common/theme.i18n.json
-  their  100644 1b50f1b309f55d9430ab087eb735b14ddf0f205d i18n/chs/src/vs/workbench/common/theme.i18n.json
-@@ -11,10 +11,15 @@
- 	"tabHoverBackground": "选项卡被悬停时的背景色。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以有多个编辑器组。",
- 	"tabUnfocusedHoverBackground": "非焦点组选项卡被悬停时的背景色。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以有多个编辑器组。",
- 	"tabBorder": "用于将选项卡彼此分隔开的边框。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以存在多个编辑器组。",
-+<<<<<<< .our
- 	"tabActiveBorder": "活动选项卡底部的边框。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以存在多个编辑器组。",
- 	"tabActiveBorderTop": "活动选项卡顶部的边框。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以存在多个编辑器组。",
- 	"tabActiveUnfocusedBorder": "在失去焦点的编辑器组中的活动选项卡底部的边框。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以存在多个编辑器组。",
- 	"tabActiveUnfocusedBorderTop": "在失去焦点的编辑器组中的活动选项卡顶部的边框。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以存在多个编辑器组。",
-+=======
-+	"tabActiveBorder": "用于高亮活动的选项卡的边框。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以存在多个编辑器组。",
-+	"tabActiveUnfocusedBorder": "用于高亮一个失去焦点的编辑器组中的活动选项卡的边框。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以存在多个编辑器组。",
-+>>>>>>> .their
- 	"tabHoverBorder": "选项卡被悬停时用于突出显示的边框。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以有多个编辑器组。",
- 	"tabUnfocusedHoverBorder": "非焦点组选项卡被悬停时用于突出显示的边框。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以有多个编辑器组。",
- 	"tabActiveForeground": "活动组中活动选项卡的前景色。在编辑器区域，选项卡是编辑器的容器。可在一个编辑器组中打开多个选项卡。可以有多个编辑器组。",
-added in both
-  our    100644 bb6a3e28cb1ceaccd929d0fbcc922bb49545d934 i18n/chs/src/vs/workbench/common/views.i18n.json
-  their  100644 85f57daaba0619c567a165965d11bba39939db10 i18n/chs/src/vs/workbench/common/views.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"duplicateId": "ID 为 {0} 的视图在位置“{1}”已被注册"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"duplicateId": "ID 为“{0}”的视图在位置“{1}”已被注册"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 24ec2fcb7bd484dfd433484d28404685cb08eba2 i18n/chs/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 c8466983eb9f265f121ef57d4bfbd3223d7f8d81 i18n/chs/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 f941d8a0956c6c5c56ea171736d348f42ba5c3d7 i18n/chs/src/vs/workbench/electron-browser/actions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"closeWindow": "关闭窗口",
- 	"closeWorkspace": "关闭工作区",
- 	"noWorkspaceOpened": "此实例当前没有打开工作区，无法关闭。",
-@@ -50,6 +53,14 @@
- 	"moveWindowTabToNewWindow": "将窗口选项卡移动到新窗口",
- 	"mergeAllWindowTabs": "合并所有窗口",
- 	"toggleWindowTabsBar": "切换窗口选项卡栏",
-+<<<<<<< .our
- 	"about": "关于 {0}",
- 	"inspect context keys": "检查上下文键值"
-+=======
-+	"configureLocale": "配置语言",
-+	"displayLanguage": "定义 VSCode 的显示语言。",
-+	"doc": "请参阅 {0}，了解支持的语言列表。",
-+	"restart": "更改此值需要重启 VSCode。",
-+	"fail.createSettings": "无法创建“{0}”({1})。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e93318a00b839cd8e3377f7b6ab94731b16d5dbf i18n/chs/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 eb24c55b636f82951f7ddca06c62ab11e05e6e73 i18n/chs/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 62b6aada113ef4231d6d2b6ece783c385a393bd0 i18n/chs/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,12 +35,19 @@
- 	"panelDefaultLocation": "控制此面板的默认位置。可显示在工作台的底部或右侧。",
- 	"statusBarVisibility": "控制工作台底部状态栏的可见性。",
- 	"activityBarVisibility": "控制工作台中活动栏的可见性。",
-+<<<<<<< .our
- 	"viewVisibility": "控制是否显示视图头部的操作项。视图头部操作项可以一直，或是仅当聚焦到和悬停在视图上时显示。",
- 	"fontAliasing": "控制工作台中字体的渲染方式\n- default: 次像素平滑字体。将在大多数非 retina 显示器上显示最清晰的文字\n- antialiased: 进行像素而不是次像素级别的字体平滑。可能会导致字体整体显示得更细\n- none: 禁用字体平滑。将显示边缘粗糙、有锯齿的文字\n- auto: 根据显示器 DPI 自动应用 \"default\" 或 \"antialiased\" 选项。",
- 	"workbench.fontAliasing.default": "次像素平滑字体。将在大多数非 retina 显示器上显示最清晰的文字。",
- 	"workbench.fontAliasing.antialiased": "进行像素而不是次像素级别的字体平滑。可能会导致字体整体显示得更细。",
- 	"workbench.fontAliasing.none": "禁用字体平滑。将显示边缘粗糙、有锯齿的文字。",
- 	"workbench.fontAliasing.auto": "根据显示器 DPI 自动应用 \"default\" 或 \"antialiased\" 选项。",
-+=======
-+	"fontAliasing": "控制工作台中字体的渲染方式\n- default: 次像素平滑字体。将在大多数非 retina 显示器上显示最清晰的文字\n- antialiased: 进行像素而不是次像素级别的字体平滑。可能会导致字体整体显示得更细\n- none: 禁用字体平滑。将显示边缘粗糙、有锯齿的文字",
-+	"workbench.fontAliasing.default": "次像素平滑字体。将在大多数非 retina 显示器上显示最清晰的文字。",
-+	"workbench.fontAliasing.antialiased": "进行像素而不是次像素级别的字体平滑。可能会导致字体整体显示得更细。",
-+	"workbench.fontAliasing.none": "禁用字体平滑。将显示边缘粗糙、有锯齿的文字。",
-+>>>>>>> .their
- 	"enableNaturalLanguageSettingsSearch": "控制是否在设置中启用自然语言搜索模式。",
- 	"windowConfigurationTitle": "窗口",
- 	"window.openFilesInNewWindow.on": "文件将在新窗口中打开",
-changed in both
-  base   100644 b2c1d0e6763a13d5f4c50d21fd3a2cc1d555c72c i18n/chs/src/vs/workbench/electron-browser/window.i18n.json
-  our    100644 b437f51e7f989125bf762fd5e4c708b7a064f39e i18n/chs/src/vs/workbench/electron-browser/window.i18n.json
-  their  100644 a2e4b30b59e96319184e568888dd7ffbd71fe451 i18n/chs/src/vs/workbench/electron-browser/window.i18n.json
-changed in both
-  base   100644 3fee2b4ab4747b0452b1121dc21d5a4cc0ffa07d i18n/chs/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  our    100644 728adbd6b66f04d35493e4d519f09b04541a9764 i18n/chs/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  their  100644 0fa0e030ff25376903329ca5ef27570eedf64516 i18n/chs/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"debug.terminal.title": "调试对象"
- }
-\ No newline at end of file
-changed in both
-  base   100644 f54abac52da1ea0c7f0f166022a8376c900e01ce i18n/chs/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  our    100644 d453e14482f3f3302ee38720c42d66708f224382 i18n/chs/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  their  100644 2db5cdad108402332c07fa87d399e6aab2e120aa i18n/chs/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-changed in both
-  base   100644 efe5507494d6e4d4f3a59014a1d7f14840521a24 i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 6d06818b00cbd9cc446af3ed0c5d32bc725f9a34 i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 5d553a4d9cdd269db70f64e29e7b76ed078db35f i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,11 @@
- 	"exeBasedRecommendation": "根据你安装的 {0}，向你推荐此扩展。",
- 	"fileBasedRecommendation": "根据您最近打开的文件推荐此扩展。",
- 	"workspaceRecommendation": "当前工作区的用户推荐此扩展。",
-+=======
-+	"workspaceRecommendation": "当前工作区的用户推荐此扩展。",
-+	"fileBasedRecommendation": "根据您最近打开的文件推荐此扩展。",
-+	"exeBasedRecommendation": "根据你安装的 {0}，向你推荐此扩展。",
-+>>>>>>> .their
- 	"reallyRecommended2": "建议对这种类型的文件使用“{0}”扩展。",
- 	"reallyRecommendedExtensionPack": "建议对这种类型的文件使用“{0}”扩展包。",
- 	"install": "安装",
-added in both
-  our    100644 aa5a46d3109a70c21f1ef31af92edb21d696a0f4 i18n/chs/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-  their  100644 475d836e696aa54c6f008d040e96b8886e9d8d05 i18n/chs/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"workbenchConfigurationTitle": "工作台",
- 	"feedbackVisibility": "控制是否显示工作台底部状态栏中的 Twitter 反馈 (笑脸图标)。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 a2b15babb5f5ec49f69d6118338a875381e70756 i18n/chs/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
-  our    100644 c98e15157a96a135b2cfe82bb4116edb377fe627 i18n/chs/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
-  their  100644 84925c604c17aa22b2456f8ec1451fca22d0742a i18n/chs/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
-added in both
-  our    100644 c800714c60bd47d3f5367f812c0fbffa567d4739 i18n/chs/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-  their  100644 c5b0fd0e5a5598bf13969daefd23ffb3480429a3 i18n/chs/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"hide": "隐藏"
- }
-\ No newline at end of file
-changed in both
-  base   100644 30c68b4c7adb739a8ec61165b42a5ce9b8282eb8 i18n/chs/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  our    100644 f82464e44918dc13a9709b800a0f2a4b4d3bbd77 i18n/chs/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  their  100644 2854354d6af14fd176c3a9234ccd60b72fc96875 i18n/chs/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-@@ -12,12 +12,19 @@
- 	"revertLocalChanges": "放弃你的更改并还原为磁盘上的内容",
- 	"copyPathOfActive": "复制活动文件的路径",
- 	"saveAllInGroup": "保存组中的全部内容",
-+<<<<<<< .our
- 	"saveFiles": "保存所有文件",
-+=======
-+>>>>>>> .their
- 	"revert": "还原文件",
- 	"compareActiveWithSaved": "比较活动与已保存的文件",
- 	"closeEditor": "关闭编辑器",
- 	"view": "查看",
-+<<<<<<< .our
- 	"openToSide": "在侧边打开",
-+=======
-+	"openToSide": "打开到侧边",
-+>>>>>>> .their
- 	"revealInWindows": "在资源管理器中显示",
- 	"revealInMac": "在 Finder 中显示",
- 	"openContainer": "打开所在的文件夹",
-@@ -25,11 +32,19 @@
- 	"saveAll": "全部保存",
- 	"compareWithSaved": "与已保存文件比较",
- 	"compareWithSelected": "与已选项目进行比较",
-+<<<<<<< .our
- 	"compareSource": "选择进行比较",
- 	"compareSelected": "将已选项进行比较",
- 	"close": "关闭",
- 	"closeOthers": "关闭其他",
- 	"closeSaved": "关闭已保存",
-+=======
-+	"compareSource": "选择以进行比较",
-+	"compareSelected": "将已选项进行比较",
-+	"close": "关闭",
-+	"closeOthers": "关闭其他",
-+	"closeUnmodified": "关闭未更改",
-+>>>>>>> .their
- 	"closeAll": "全部关闭",
- 	"deleteFile": "永久删除"
- }
-\ No newline at end of file
-changed in both
-  base   100644 f9208415003c3fca3ac10a6b4dad634318b1cef7 i18n/chs/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 1da53727f33c4b77a3b37c4cffac28b954a12332 i18n/chs/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 513e4e1f0d76cc46a85ef43e169c2d2ccf529dd1 i18n/chs/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"newFile": "新建文件",
- 	"newFolder": "新建文件夹",
- 	"rename": "重命名",
-@@ -13,7 +16,11 @@
- 	"copyFile": "复制",
- 	"pasteFile": "粘贴",
- 	"retry": "重试",
-+<<<<<<< .our
- 	"renameWhenSourcePathIsParentOfTargetError": "请使用“新建文件夹”或“新建文件”命令来向已有文件夹添加子项",
-+=======
-+	"openFolderFirst": "先打开一个文件夹，以在其中创建文件或文件夹。",
-+>>>>>>> .their
- 	"newUntitledFile": "新的无标题文件",
- 	"createNewFile": "新建文件",
- 	"createNewFolder": "新建文件夹",
-@@ -25,9 +32,16 @@
- 	"dirtyMessageFolderDelete": "你正在删除的文件夹有 {0} 个文件具有未保存的更改。是否继续?",
- 	"dirtyMessageFileDelete": "你正在删除的文件具有未保存的更改。是否继续?",
- 	"dirtyWarning": "如果不保存，更改将丢失。",
-+<<<<<<< .our
-+=======
-+	"confirmMoveTrashMessageMultiple": "是否确定要删除以下 {0} 个文件?",
-+	"confirmMoveTrashMessageFolder": "是否确实要删除“{0}”及其内容?",
-+	"confirmMoveTrashMessageFile": "是否确实要删除“{0}”?",
-+>>>>>>> .their
- 	"undoBin": "可以从回收站还原。",
- 	"undoTrash": "可以从废纸篓还原。",
- 	"doNotAskAgain": "不再询问",
-+<<<<<<< .our
- 	"irreversible": "此操作不可逆!",
- 	"binFailed": "无法删除到回收站。是否永久删除？",
- 	"trashFailed": "无法删除到废纸篓。是否永久删除？",
-@@ -48,6 +62,18 @@
- 	"replaceButtonLabel": "替换(&&R)",
- 	"fileIsAncestor": "粘贴的项目是目标文件夹的上级",
- 	"fileDeleted": "粘贴的文件已被删除或移动",
-+=======
-+	"confirmDeleteMessageMultiple": "是否确定要永久删除以下 {0} 个文件?",
-+	"confirmDeleteMessageFolder": "是否确定要永久删除“{0}”及其内容?",
-+	"confirmDeleteMessageFile": "是否确定要永久删除“{0}”?",
-+	"irreversible": "此操作不可逆!",
-+	"permDelete": "永久删除",
-+	"importFiles": "导入文件",
-+	"confirmOverwrite": "目标文件夹中已存在具有相同名称的文件或文件夹。是否要替换它?",
-+	"replaceButtonLabel": "替换(&&R)",
-+	"fileDeleted": "文件已被删除或移动",
-+	"fileIsAncestor": "复制的项目是目标文件夹的上级",
-+>>>>>>> .their
- 	"duplicateFile": "重复",
- 	"globalCompareFile": "比较活动文件与...",
- 	"openFileToCompare": "首先打开文件以将其与另外一个文件比较。",
-changed in both
-  base   100644 702c021c5f321621dd09b3c087cc0836817001fb i18n/chs/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  our    100644 10c5b3be19adb07dcaa678018210987dcd3f7fb4 i18n/chs/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  their  100644 5687f75d023d874ea76222a31d34160b4efbdd9c i18n/chs/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,12 +7,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"revealInWindows": "在资源管理器中显示",
- 	"revealInMac": "在 Finder 中显示",
- 	"openContainer": "打开所在的文件夹",
- 	"saveAs": "另存为...",
- 	"save": "保存",
- 	"saveAll": "全部保存",
-+<<<<<<< .our
-+=======
-+	"saveFiles": "保存所有文件",
-+>>>>>>> .their
- 	"removeFolderFromWorkspace": "将文件夹从工作区删除",
- 	"genericRevertError": "未能还原“{0}”: {1}",
- 	"modifiedLabel": "{0} (磁盘上) ↔ {1}",
-changed in both
-  base   100644 63427668f5f3315bd1b2d497574a17d7eb4d0258 i18n/chs/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 4067aaffcecae16961ab77b1a2fdc98050b339ec i18n/chs/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 da879d0ffddf597bd426561df66dfe291690c14d i18n/chs/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-@@ -40,7 +40,10 @@
- 	"formatOnSave": "保存时设置文件的格式。格式化程序必须可用，不能自动保存文件，并且不能关闭编辑器。",
- 	"formatOnSaveTimeout": "在保存时格式化操作的超时时间。为 formatOnSave 命令指定时间限制 (单位: 毫秒)。运行超过设定时间的命令将被取消。",
- 	"explorerConfigurationTitle": "文件资源管理器",
-+<<<<<<< .our
- 	"openEditorsVisible": "在“打开的编辑器”窗格中显示的编辑器数量。",
-+=======
-+>>>>>>> .their
- 	"autoReveal": "控制资源管理器是否应在打开文件时自动显示并选择它们。",
- 	"enableDragAndDrop": "控制资源管理器是否应该允许通过拖放移动文件和文件夹。",
- 	"confirmDragAndDrop": "控制在资源管理器内拖放移动文件或文件夹时是否进行确认。",
-changed in both
-  base   100644 8ebee88ce98514139e584e769bb79856d04e3ed1 i18n/chs/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  our    100644 253dcd9399aed798381061a169d7db7e656ea079 i18n/chs/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  their  100644 4911cddc49b8b610c6834d6a89f169eaa6f086a5 i18n/chs/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,12 @@
- 	],
- 	"userGuide": "使用编辑器工具栏中的操作撤消更改或覆盖磁盘上的内容",
- 	"staleSaveError": "无法保存“{0}”: 磁盘上的内容较新。请将您的版本和磁盘上的版本进行比较。",
-+=======
-+	"userGuide": "使用右侧编辑器工具栏的操作来**撤消**你的更改或用你的更改来**覆盖**磁盘上的内容",
-+	"overwriteElevated": "以管理员身份覆盖...",
-+	"saveElevated": "以管理员身份重试...",
-+	"overwrite": "覆盖",
-+>>>>>>> .their
- 	"retry": "重试",
- 	"discard": "放弃",
- 	"readonlySaveErrorAdmin": "无法保存“{0}”: 文件写保护。选择“以管理员身份覆盖”可作为管理员重试。 ",
-changed in both
-  base   100644 d97098d02f75c7878aa7990a2af3993ce04c3448 i18n/chs/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  our    100644 feb8a37af6b21eb233b78ad5de0f56245b4c0162 i18n/chs/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  their  100644 0be09e758627e6bdbe1ffe15c9f3de004f56ad6f i18n/chs/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-@@ -15,9 +15,13 @@
- 	"dropFolder": "你是否要将文件夹添加到工作区?",
- 	"addFolders": "添加文件夹(&&A)",
- 	"addFolder": "添加文件夹(&&A)",
-+<<<<<<< .our
- 	"confirmRootsMove": "是否确定要更改工作区中多个根文件夹的顺序?",
- 	"confirmMultiMove": "是否确定要移动以下 {0} 个文件?",
- 	"confirmRootMove": "是否确定要更改工作区中根文件夹“{0}”的顺序?",
-+=======
-+	"confirmMultiMove": "是否确定要移动以下 {0} 个文件?",
-+>>>>>>> .their
- 	"confirmMove": "是否确实要移动“{0}”?",
- 	"doNotAskAgain": "不再询问",
- 	"moveButtonLabel": "移动(&&M)",
-changed in both
-  base   100644 0c93f41d44d0715ff7b7f636c5386091754fa1aa i18n/chs/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  our    100644 eb40d6687d9ca4b4c349f4f4b0c0adba2bdfb0b7 i18n/chs/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  their  100644 f501bedc60f6ef88a16b47e02bf89d6c3046e80b i18n/chs/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-added in both
-  our    100644 3aaa4125fd26071dce0a93643b0ac03f07ddf861 i18n/chs/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-  their  100644 c1b32a5c26c246d37ac0f55e2d0656d921099e6e i18n/chs/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,5 +11,13 @@
- 	"sharedLog": "日志(共享进程)",
- 	"rendererLog": "日志(窗口进程)",
- 	"extensionsLog": "日志(扩展主机)",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"developer": "开发者"
- }
-\ No newline at end of file
-added in both
-  our    100644 6d8451561beae9b6de9d16f8e428c5a1d25661fb i18n/chs/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  their  100644 98d55d28fe6eb9edaadb54db5a28f67e0c6a625e i18n/chs/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -17,14 +18,32 @@
- 	"openLogFile": "打开日志文件...",
- 	"setLogLevel": "设置日志级别...",
- 	"trace": "跟踪",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"openLogsFolder": "打开日志文件夹",
-+	"showLogs": "显示日志...",
-+	"mainProcess": "主进程",
-+	"sharedProcess": "共享进程",
-+	"rendererProcess": "窗口",
-+	"selectProcess": "选择进程",
-+>>>>>>> .their
- 	"debug": "调试",
- 	"info": "信息",
- 	"warn": "警告",
- 	"err": "错误",
-+<<<<<<< .our
- 	"critical": "严重",
- 	"off": "关闭",
- 	"selectLogLevel": "选择日志级别",
- 	"default and current": "默认 当前",
- 	"default": "默认",
- 	"current": "当前"
-+=======
-+	"off": "关闭"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 3e34c78c26aa95f47180585167bacc0395872e10 i18n/chs/src/vs/workbench/parts/markers/common/messages.i18n.json
-  our    100644 fd25b458d39eb773f340d2389c6ac2c7295fed55 i18n/chs/src/vs/workbench/parts/markers/common/messages.i18n.json
-  their  100644 7e174f3cfafe87c1ec839ab93697f3926cfd415e i18n/chs/src/vs/workbench/parts/markers/common/messages.i18n.json
-@@ -7,8 +7,11 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"viewCategory": "查看",
-+<<<<<<< .our
- 	"problems.view.toggle.label": "切换问题 (错误、警告、信息) 视图",
- 	"problems.view.focus.label": "聚焦于问题 (错误、警告、信息) 视图",
-+=======
-+>>>>>>> .their
- 	"problems.panel.configuration.title": "问题预览",
- 	"problems.panel.configuration.autoreveal": "控制问题预览是否应在打开文件时自动显示它们。",
- 	"markers.panel.title.problems": "问题",
-added in both
-  our    100644 3a4c87eda4fd45f8c39cf34234b1dd0feb221b60 i18n/chs/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-  their  100644 a96772cdf43790d5a37c660761258bcf5585e357 i18n/chs/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -11,4 +12,15 @@
- 	"viewCategory": "查看",
- 	"clearOutput.label": "清除输出",
- 	"openActiveLogOutputFile": "查看: 打开活动日志输出文件"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"output": "输出",
-+	"viewCategory": "查看",
-+	"clearOutput.label": "清除输出"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 fa3bf1243ba7208adbcc1a99b90dc9e88cd58cd9 i18n/chs/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/chs/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,12 @@
- 	],
- 	"output": "{0} - 输出",
- 	"channel": "“{0}”的输出通道"
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 5c28c560886bedfc3babae822dd572c6201154c2 i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 8970ed17aa11152cc3e1fcdaae0d242f4d3682a2 i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 10c2fc221a5d746ae67028d16b221888ed610a10 i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"defaultSettings": "将您的设置放入右侧编辑器以覆盖。",
- 	"noSettingsFound": "未找到设置。",
- 	"settingsSwitcherBarAriaLabel": "设置转换器",
-changed in both
-  base   100644 26f355bb38254d12a1baead93d91ca21c4a410ce i18n/chs/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  our    100644 4c83144fd6cb6c2fbf429568b9c9118e209bb6b4 i18n/chs/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  their  100644 ef307afdfbd268446ac1a9025fdc54b26089dc6d i18n/chs/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-changed in both
-  base   100644 4fff98737e809779e7fa546bb4ac26a3c82247ba i18n/chs/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  our    100644 8e121198c82cd4074271a0906c87b6adbb82ed78 i18n/chs/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  their  100644 0f609a3500014142e0bc25605e31b7504aebe7f3 i18n/chs/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"view": "查看",
- 	"commandsHandlerDescriptionDefault": "显示并运行命令",
- 	"gotoLineDescriptionMac": "转到行",
-changed in both
-  base   100644 cc08da73602c84cf0f3684de91336c89c1be3ed8 i18n/chs/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  our    100644 8c0bab20637f95dcd55c856707e386b397840a9c i18n/chs/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  their  100644 ebf378aac8546f5f10da26e5036ae6bbeecca9ff i18n/chs/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-@@ -13,5 +13,9 @@
- 	"scmConfigurationTitle": "源代码管理",
- 	"alwaysShowProviders": "是否总是显示源代码管理提供程序部分。",
- 	"diffDecorations": "控制编辑器中差异的显示效果。",
-+<<<<<<< .our
- 	"diffGutterWidth": "控制导航线上已添加和已修改差异图标的宽度 (px)。"
-+=======
-+	"inputCounter": "控制何时显示输入计数。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 eb08e1a30308e03cbdfa8f61f3334074a7bbf867 i18n/chs/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  our    100644 72a33d59853b6a03462fb33cc281f9024f7e12dd i18n/chs/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  their  100644 dc3530badc80b2be6ffa845a18c97ef60526e958 i18n/chs/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-@@ -8,6 +8,9 @@
- 	],
- 	"scm providers": "源代码管理提供程序",
- 	"hideRepository": "隐藏",
-+	"commitMessageInfo": "当前行有 {0} 个字符",
-+	"commitMessageCountdown": "当前行剩余 {0} 个字符",
-+	"commitMessageWarning": "当前行比 {1} 超出 {0} 个字符",
- 	"installAdditionalSCMProviders": "安装其他源代码管理提供程序...",
- 	"no open repo": "没有活动的源代码管理提供程序。",
- 	"source control": "源代码管理",
-changed in both
-  base   100644 ebf392aa07de19ef42b3ca9ed3e22a7b63947842 i18n/chs/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 db5d7a07f49a26b2f7df503221d63078c01a6dc6 i18n/chs/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 65d9e1b855d29d852cd8e28dee1010be19796b1e i18n/chs/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-changed in both
-  base   100644 971f3dddcce66938820acc384a9bf40f7989b8fb i18n/chs/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 61397c437f22149a7bd941ec158bc6fa9182474a i18n/chs/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 d457d977632f3a61eb4c7a68d2d8f09125950cc2 i18n/chs/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,11 +13,18 @@
- 	"copyAllLabel": "全部复制",
- 	"clearSearchHistoryLabel": "清除搜索历史记录",
- 	"toggleSearchViewPositionLabel": "切换搜索视图位置",
-+=======
-+>>>>>>> .their
- 	"findInFolder": "在文件夹中查找...",
- 	"findInWorkspace": "在工作区中查找...",
- 	"showTriggerActions": "转到工作区中的符号...",
- 	"name": "搜索",
-+<<<<<<< .our
- 	"showSearchViewl": "显示搜索",
-+=======
-+	"search": "搜索",
-+	"showSearchViewlet": "显示搜索",
-+>>>>>>> .their
- 	"view": "查看",
- 	"findInFiles": "在文件中查找",
- 	"openAnythingHandlerDescription": "转到文件",
-added in both
-  our    100644 779254ef8e6759aa065ad11aed4d5e7867992d02 i18n/chs/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-  their  100644 b6d24a6f92198ddcf29b66a212241f491eb5180b i18n/chs/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"global.scope": "(全局)",
- 	"global.1": "({0})",
- 	"new.global": "新建全局代码片段文件...",
-changed in both
-  base   100644 6023eaf614ff3151b4495d5db802ed432250ec5b i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  our    100644 0b17c6271c329c8da7909c7c4ebbcd83c84f3588 i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  their  100644 84c29334b8164c35ace813f2c6b4dffd5dc7d14e i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"snippetSchema.json.default": "空代码片段",
- 	"snippetSchema.json": "用户代码片段配置",
- 	"snippetSchema.json.prefix": "在 Intellisense 中选择代码片段时将使用的前缀",
-added in both
-  our    100644 f62e870f672eca0be0cb5b754d681d68cc91570a i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-  their  100644 bfcf4616bc8101dfb0157b7ed2ac96f5740ab5b8 i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,5 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"source.snippetGlobal": "全局用户代码片段",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"source.snippet": "用户代码片段"
- }
-\ No newline at end of file
-changed in both
-  base   100644 e4e7302f24649f0332b4060f6160799515387265 i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  our    100644 d0caabc81b4c752c13714f95e565498af6ee0254 i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 7c00034a89a7b005d82de70df917969696cb3ab5 i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"invalid.path.0": "“contributes.{0}.path”中应为字符串。提供的值: {1}",
- 	"invalid.language.0": "省略语言时，\"contributes.{0}.path\" 的值必须为一个 \".code-snippets\" 文件。提供的值: {1}",
- 	"invalid.language": "“contributes.{0}.language”中存在未知的语言。提供的值: {1}",
-changed in both
-  base   100644 75d151b4bb59e2f8f6d2d998482d307cc44b3fac i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 c2fbe4fef10dc5236ff5c8da48376f2ca681d709 i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 199139684a9431456f0b1f76dca8458dcf5cad53 i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -15,7 +15,11 @@
- 	"terminal.integrated.shellArgs.osx": "在 OS X 终端上时要使用的命令行参数。",
- 	"terminal.integrated.shell.windows": "终端在 Windows 使用的 shell 路径。使用随 Windows 一起提供的 shell (cmd、PowerShell 或 Bash on Ubuntu) 时。",
- 	"terminal.integrated.shellArgs.windows": "在 Windows 终端上时使用的命令行参数。",
-+<<<<<<< .our
- 	"terminal.integrated.macOptionIsMeta": "在终端中，使用 Option 键作为 Meta 键。(macOS)",
-+=======
-+	"terminal.integrated.rightClickCopyPaste": "设置后，在终端内右键单击时，这将阻止显示上下文菜单，相反，它将在有选项时进行复制，并且在没有选项时进行粘贴。",
-+>>>>>>> .their
- 	"terminal.integrated.copyOnSelection": "设置后，终端中选中的文字将被复制到剪贴板。",
- 	"terminal.integrated.fontFamily": "控制终端的字体系列，这在编辑器中是默认的。fontFamily 的值。",
- 	"terminal.integrated.fontSize": "控制终端的字号(以像素为单位)。",
-@@ -37,7 +41,10 @@
- 	"terminal.integrated.env.linux": "要添加到 VS Code 进程中的带有环境变量的对象，其会被 Linux 终端使用。",
- 	"terminal.integrated.env.windows": "要添加到 VS Code 进程中的带有环境变量的对象，其会被 Windows 终端使用。",
- 	"terminal.integrated.showExitAlert": "当退出代码非零时，显示“终端进程以某退出代码终止”的警告。",
-+<<<<<<< .our
- 	"terminal.integrated.experimentalRestore": "启动 VS Code 时，是否自动恢复工作区的终端会话。这是一项实验性设置，可能会出现问题，将来也可能会有变化。",
-+=======
-+>>>>>>> .their
- 	"terminalCategory": "终端",
- 	"viewCategory": "查看"
- }
-\ No newline at end of file
-changed in both
-  base   100644 d96d23dca0e928587a9845011037f6c40aeb93e0 i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 1becbfa0f08ad931e9c32c280588da0196edc807 i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 ca6d8ab62f9d9ed77ec55c2c3ebad38ce98757e1 i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -20,6 +20,7 @@
- 	"workbench.action.terminal.new.short": "新的终端",
- 	"workbench.action.terminal.newWorkspacePlaceholder": "选择当前工作目录新建终端",
- 	"workbench.action.terminal.newInActiveWorkspace": "新建集成终端 (活动工作区)",
-+<<<<<<< .our
- 	"workbench.action.terminal.split": "拆分终端",
- 	"workbench.action.terminal.splitInActiveWorkspace": "拆分终端 (活动工作区)",
- 	"workbench.action.terminal.focusPreviousPane": "聚焦于上一个窗格",
-@@ -28,6 +29,8 @@
- 	"workbench.action.terminal.resizePaneRight": "向右调整窗格大小",
- 	"workbench.action.terminal.resizePaneUp": "向上调整窗格大小",
- 	"workbench.action.terminal.resizePaneDown": "向下调整窗格大小",
-+=======
-+>>>>>>> .their
- 	"workbench.action.terminal.focus": "聚焦于终端",
- 	"workbench.action.terminal.focusNext": "聚焦于下一终端",
- 	"workbench.action.terminal.focusPrevious": "聚焦于上一终端",
-changed in both
-  base   100644 25d612371f7288bbfb9feffd3492713fa6ff1bc6 i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  our    100644 226ce4dc16f358fb511aaf000b7fbdf565995bce i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  their  100644 d0a2a31bbb9f92d68c9d8e49cec8b6141ac666de i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-@@ -8,7 +8,11 @@
- 	],
- 	"terminal.integrated.chooseWindowsShellInfo": "你可以按下“自定义”按钮并更换默认终端 Shell。",
- 	"customize": "自定义",
-+<<<<<<< .our
- 	"never again": "不再显示",
-+=======
-+	"cancel": "取消",
-+>>>>>>> .their
- 	"terminal.integrated.chooseWindowsShell": "选择首选的终端 shell，你可稍后在设置中进行更改",
- 	"terminalService.terminalCloseConfirmationSingular": "存在一个活动的终端会话，是否要终止此会话?",
- 	"terminalService.terminalCloseConfirmationPlural": "存在 {0} 个活动的终端会话，是否要终止这些会话?"
-changed in both
-  base   100644 d43fc9ca29b2221e63e144fe4130ed4103353809 i18n/chs/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 34456c16f6384eecbdba1d3ed14696eac3704dab i18n/chs/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 9460987e42b532e0b64803a7e1cf984cc4b9b776 i18n/chs/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -26,7 +26,10 @@
- 	"commandPalette": "命令面板...",
- 	"settings": "设置",
- 	"keyboardShortcuts": "键盘快捷方式",
-+<<<<<<< .our
- 	"showExtensions": "管理扩展",
-+=======
-+>>>>>>> .their
- 	"userSnippets": "用户代码片段",
- 	"selectTheme.label": "颜色主题",
- 	"themes.selectIconTheme.label": "文件图标主题",
-changed in both
-  base   100644 80b697be3d34deecad3bc9e3e7c958001a29ef06 i18n/chs/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  our    100644 8d343959d4318fc5914175bbc666001176d1ca2b i18n/chs/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  their  100644 fdbcd8bad77a3439142c1ddfa78c84ac45baef25 i18n/chs/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,4 +14,9 @@
- 	"fileBinaryError": "文件似乎是二进制文件，无法作为文档打开",
- 	"err.create": "未能创建文件 {0}",
- 	"fileMoveConflict": "无法移动/复制。文件已存在于目标位置。"
-+=======
-+	"fileIsDirectoryError": "文件是目录",
-+	"fileNotModifiedError": "自以下时间未修改的文件:",
-+	"fileBinaryError": "文件似乎是二进制文件，无法作为文档打开"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6bee43183975780bcdebd06a4b9811797a042ff6 i18n/chs/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  our    100644 bfa6e5440fbabd08e7a20d6c476163896e7e6ffa i18n/chs/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  their  100644 ba2101635d060218d07c0d3af65c411742553735 i18n/chs/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-changed in both
-  base   100644 af35cdf722be09f7871f1513dc9fe8c8c17dc12f i18n/chs/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 b8184384917ecac19f65cc6ad82a6fa2b4f59292 i18n/chs/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 fbf48931d61404454f75ba5d7ccdf5e517cbd90e i18n/chs/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-changed in both
-  base   100644 11ecec6e1ac18a67f0b2005aba6d1ff78bed0563 i18n/chs/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  our    100644 6495d3ab4d4499f0b00c6e5971a8830daaaeb4e7 i18n/chs/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  their  100644 b9142ec415a1e4fca252b2edacd1be3471dd8e3e i18n/chs/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-@@ -8,5 +8,10 @@
- 	],
- 	"errorInvalidTaskConfiguration": "无法写入工作区配置文件。请打开文件以更正错误或警告，然后重试。",
- 	"errorWorkspaceConfigurationFileDirty": "文件已变更，因此无法写入工作区配置文件。请先保存此文件，然后重试。",
-+<<<<<<< .our
- 	"openWorkspaceConfigurationFile": "打开工作区配置"
-+=======
-+	"openWorkspaceConfigurationFile": "打开工作区配置文件",
-+	"close": "关闭"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 78cd65caa1f2df6d3c1ef580c197e00b304c866b i18n/cht/extensions/git/out/autofetch.i18n.json
-  our    100644 15e10683f3186e8a5874bd157f3e207ae6f6fd89 i18n/cht/extensions/git/out/autofetch.i18n.json
-  their  100644 a9b802babec3476b912277e91d35399b0a917c33 i18n/cht/extensions/git/out/autofetch.i18n.json
-@@ -7,7 +7,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"yes": "是",
-+	"read more": "閱讀其他資訊",
- 	"no": "否",
- 	"not now": "稍後詢問我",
-+<<<<<<< .our
- 	"suggest auto fetch": "您希望 Code [定期執行 'git fetch']({0}) 嗎?"
-+=======
-+	"suggest auto fetch": "您想要 Code 定期的執行  `git fetch` 嗎？"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 1ace18f1610a2558d62519881c68284f5a1519a1 i18n/cht/extensions/git/out/commands.i18n.json
-  our    100644 f99c465da1ed922e8de7f8c6dfd9a26e886bdd66 i18n/cht/extensions/git/out/commands.i18n.json
-  their  100644 3b5fb4974c39a926359ffde2264ffeabb7b4ee9a i18n/cht/extensions/git/out/commands.i18n.json
-@@ -44,7 +44,10 @@
- 	"yes discard tracked": "捨棄 1 個追蹤的檔案",
- 	"yes discard tracked multiple": "捨棄 {0} 個追蹤的檔案",
- 	"unsaved files single": "下列檔案尚未儲存： {0}。\n\n您要在認可之前進行儲存嗎？",
-+<<<<<<< .our
- 	"unsaved files": "有 {0} 個未儲存檔案。\n\n您要在認可之前進行儲存嗎？",
-+=======
-+>>>>>>> .their
- 	"save and commit": "儲存全部且認可",
- 	"commit": "無論如何仍認可",
- 	"no staged changes": "沒有暫存變更進行提交\n\n您希望自動暫存您所有變更並直接提交?",
-@@ -75,8 +78,12 @@
- 	"ok": "確定",
- 	"push with tags success": "已成功使用標籤推送。",
- 	"pick remote": "挑選要發行分支 '{0}' 的目標遠端:",
-+<<<<<<< .our
- 	"sync is unpredictable": "此動作會推送認可至`{0}/{1}`並從中提取認可。",
- 	"never again": "確定，不要再顯示",
-+=======
-+	"sync is unpredictable": "此動作會將認可發送至 '{0}' 及從中提取認可。",
-+>>>>>>> .their
- 	"no remotes to publish": "您的儲存庫未設定要發行的遠端目標。",
- 	"no changes stash": "沒有變更可供隱藏。",
- 	"provide stash message": "可選擇提供隱藏訊息",
-added in both
-  our    100644 90f4f953b408a26e9487a134c7058ac5721f794b i18n/cht/extensions/typescript/out/commands.i18n.json
-  their  100644 628429984fc9b1c0224f83ff325efa5bd7ae9765 i18n/cht/extensions/typescript/out/commands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -13,4 +14,20 @@
- 	"typescript.noJavaScriptProjectConfig": "檔案不屬於 JavaScript 專案。若要深入了解，請按一下[這裡]({0})。",
- 	"typescript.configureTsconfigQuickPick": "設定 tsconfig.json",
- 	"typescript.configureJsconfigQuickPick": "設定 jsconfig.json"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"typescript.projectConfigNoWorkspace": "請在 VS Code 中開啟資料夾，以使用 TypeScript 或 JavaScript 專案",
-+	"typescript.projectConfigUnsupportedFile": "無法判斷 TypeScript 或 JavaScript 專案。不支援的檔案類型",
-+	"typescript.projectConfigCouldNotGetInfo": "無法判斷 TypeScript 或 JavaScript 專案",
-+	"typescript.noTypeScriptProjectConfig": "檔案不是 TypeScript 專案的一部份",
-+	"typescript.noJavaScriptProjectConfig": "檔案不是 JavaScript 專案的一部份",
-+	"typescript.configureTsconfigQuickPick": "設定 tsconfig.json",
-+	"typescript.configureJsconfigQuickPick": "設定 jsconfig.json",
-+	"typescript.projectConfigLearnMore": "深入了解"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 750d811d866eaa3d43818bd1d8e28c9898acf514 i18n/cht/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-  their  100644 ed15423097d5cbb03aeb8c474db3877ca0d1584f i18n/cht/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"selectAriaOption": "{0}"
- }
-\ No newline at end of file
-added in both
-  our    100644 832371dc96044f6cf12101b96265daa3e7176c82 i18n/cht/src/vs/base/node/ps.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/cht/src/vs/base/node/ps.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"collecting": "收集 CPU 與記憶體資訊中，可能需要幾秒鐘的時間。"
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 71be40322db097c5d8f26877c3ff83baae54bc42 i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 15a1cfb1f061b73d70aaaf6b56b29fe87aab2b5a i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 e45ee33a6937d350c1d03f2b5d136af64efbc760 i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -16,7 +16,11 @@
- 	"lineNumbers.on": "行號以絕對值顯示。",
- 	"lineNumbers.relative": "行號以目前游標的相對值顯示。",
- 	"lineNumbers.interval": "每 10 行顯示行號。",
-+<<<<<<< .our
- 	"lineNumbers": "控制行號的顯示。",
-+=======
-+	"lineNumbers": "控制行號的顯示方式。允許的設定值為 'on'、 'off'、'relative' 及 'interval'",
-+>>>>>>> .their
- 	"rulers": "在特定的等寬字元數之後轉譯垂直尺規。有多個尺規就使用多個值。若陣列為空，則不繪製任何尺規。",
- 	"wordSeparators": "執行文字相關導覽或作業時將作為文字分隔符號的字元",
- 	"tabSize": "與 Tab 相等的空格數量。當 `editor.detectIndentation` 已開啟時，會根據檔案內容覆寫此設定。",
-changed in both
-  base   100644 85ff9ee951ef36906b8a41504f07634e0b2791ef i18n/cht/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 66736a4e736cf7b9a66b648bff264434bc450d4c i18n/cht/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 4513171b5a07c5893b352541e7a2a91c9c7ee677 i18n/cht/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -8,8 +8,11 @@
- 	],
- 	"lineHighlight": "目前游標位置行的反白顯示背景色彩。",
- 	"lineHighlightBorderBox": "目前游標位置行之周圍框線的背景色彩。",
-+<<<<<<< .our
- 	"rangeHighlight": "突顯顯示範圍的背景顏色，例如快速開啟和尋找功能。不能使用非透明的顏色來隱藏底層的樣式。",
- 	"rangeHighlightBorder": "反白顯示範圍周圍邊框的背景顏色。",
-+=======
-+>>>>>>> .their
- 	"caret": "編輯器游標的色彩。",
- 	"editorCursorBackground": "編輯器游標的背景色彩。允許自訂區塊游標重疊的字元色彩。",
- 	"editorWhitespaces": "編輯器中空白字元的色彩。",
-changed in both
-  base   100644 9fbf329131ba8e36be00e706850b0ebbd9d65678 i18n/cht/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  our    100644 36aedfc24d5bd9bde31a7c30cfbf43349d24c117 i18n/cht/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  their  100644 c569d86bd1a23d8a1140e1b5a2c62cc3e5186924 i18n/cht/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -10,4 +11,11 @@
- 	"markerAction.previous.label": "移至上一個問題 (錯誤, 警告, 資訊)",
- 	"markerAction.nextInFiles.label": "移至檔案裡面的下一個問題 (錯誤, 警告, 資訊)",
- 	"markerAction.previousInFiles.label": "移至檔案裡面的上一個問題 (錯誤, 警告, 資訊)"
-+=======
-+	"title.wo_source": "({0}/{1})",
-+	"editorMarkerNavigationError": "編輯器標記導覽小工具錯誤的色彩。",
-+	"editorMarkerNavigationWarning": "編輯器標記導覽小工具警告的色彩。",
-+	"editorMarkerNavigationInfo": "編輯器標記導覽小工具資訊的色彩",
-+	"editorMarkerNavigationBackground": "編輯器標記導覽小工具的背景。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 97c113d82f04c657f7c081d1b902007e0beca10b i18n/cht/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  our    100644 1018aa75dc78a5f5fcd1bfb9b36a3da6fe5373f3 i18n/cht/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  their  100644 6dedbdd9c9673814a6fa751ec44d3502fb794187 i18n/cht/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,10 @@
- 	"wordHighlightStrongBorder": "寫入存取期間 (例如寫入變數時) 符號的邊框顏色。 ",
- 	"overviewRulerWordHighlightForeground": "概述反白符號的尺規標記顏色。不能使用非透明的顏色來隱藏底層的樣式。",
- 	"overviewRulerWordHighlightStrongForeground": "概述反白寫入權限符號的尺規標記顏色。不能使用非透明的顏色來隱藏底層的樣式。",
-+=======
-+	"overviewRulerWordHighlightForeground": "符號醒目提示的概觀尺規標記色彩。",
-+	"overviewRulerWordHighlightStrongForeground": "寫入權限符號醒目提示的概觀尺規標記色彩。",
-+>>>>>>> .their
- 	"wordHighlight.next.label": "移至下一個反白符號",
- 	"wordHighlight.previous.label": "移至上一個反白符號"
- }
-\ No newline at end of file
-changed in both
-  base   100644 3484e0af5e72c3161ac13f116359799eb03b9296 i18n/cht/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  our    100644 16528bb0fea69d7b1f4ce878596d45af316d6a07 i18n/cht/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  their  100644 f1ab5b8686afa490fb8d599c967a04fbc574095e i18n/cht/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 0874564b4c90f40b96b0ab41970b164eed784770 i18n/cht/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 d84006726480d7b55e5c9363c0ac7b4dbb203a6d i18n/cht/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 b57662f507d15279b847b5b00fa77a1d6c397d4b i18n/cht/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,11 +10,19 @@
- 	"diff": "互相比較兩個檔案。",
- 	"add": "將資料夾新增至上一個使用中的視窗。",
- 	"goto": "在路徑上的指定行與字元位置開啟檔案。",
-+<<<<<<< .our
- 	"newWindow": "強制開啟新視窗。",
- 	"reuseWindow": "強制在上一個使用中的視窗開啟檔案或資料夾。",
- 	"wait": "等候檔案在傳回前關閉。",
- 	"locale": "要使用的地區設定 (例如 en-US 或 zh-TW)。",
- 	"userDataDir": "指定用於保存使用者資料的目錄。可用於開啟多個相異的 Code 執行個體。",
-+=======
-+	"newWindow": "強制執行 Code 的新執行個體。",
-+	"reuseWindow": "強制在最近使用的視窗中開啟檔案或資料夾。",
-+	"wait": "等候檔案在傳回前關閉。",
-+	"locale": "要使用的地區設定 (例如 en-US 或 zh-TW)。",
-+	"userDataDir": "指定保留使用者資料的目錄，這在以根目錄身分執行時有用。",
-+>>>>>>> .their
- 	"version": "列印版本。",
- 	"help": "列印使用方式。",
- 	"extensionHomePath": "設定擴充功能的根路徑。",
-@@ -22,18 +30,28 @@
- 	"showVersions": "使用 --list-extension 時，顯示安裝的擴充功能版本。",
- 	"installExtension": "安裝擴充功能。",
- 	"uninstallExtension": "解除安裝擴充功能。",
-+<<<<<<< .our
- 	"experimentalApis": "啟用延伸模組的建議 API 功能。",
-+=======
-+	"experimentalApis": "為延伸模組啟用建議的 API 功能。",
-+>>>>>>> .their
- 	"verbose": "列印詳細資訊輸出 (表示 --wait)。",
- 	"log": "使用的日誌級別。預設為\"訊息\"。允許的值是 \"關鍵\"、\"錯誤\"、\"警告\"、\"訊息\"、\"偵錯\"、\"追蹤\"、\"關閉\"。",
- 	"status": "列印進程使用方式和診斷資訊。",
- 	"performance": "在已啟用 'Developer: Startup Performance' 命令的情況下開始。",
- 	"prof-startup": "啟動時執行 CPU 分析工具",
- 	"disableExtensions": "停用所有已安裝的擴充功能。",
-+<<<<<<< .our
- 	"inspect-extensions": "允許延伸模組的偵錯與分析。如需連線 URI，請查看開發人員工具。",
- 	"inspect-brk-extensions": "允許對延伸主機在啟動後暫停擴充功能進行偵錯和分析。如需連線 URI，請查看開發人員工具。",
- 	"disableGPU": "停用 GPU 硬體加速。",
- 	"uploadLogs": "上傳目前的工作階段紀錄至安全的端點。",
- 	"maxMemory": "視窗的最大記憶體大小 (以 MB 為單位)。",
-+=======
-+	"inspect-extensions": "允許對擴充功能進行除錯和分析。檢查開發工具的連接 uri。",
-+	"inspect-brk-extensions": "允許對擴展主機在啟動後暫停擴充功能進行除錯和分析。檢查開發工具中的連接 uri。",
-+	"disableGPU": "停用 GPU 硬體加速。",
-+>>>>>>> .their
- 	"usage": "使用方式",
- 	"options": "選項",
- 	"paths": "路徑",
-changed in both
-  base   100644 bdd6cf5331230b3a429d893ebcbb8b3a9fdee8de i18n/cht/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 a2cc538e14e2cfd1305228b36fae8794fa7c56f9 i18n/cht/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 29b7e86d734e1473b576d855e3ea5c964139aff0 i18n/cht/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -7,11 +7,15 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"invalidManifest": "擴充功能無效: package.json 不是 JSON 檔案。",
-+<<<<<<< .our
- 	"incompatible": "因為延伸模組 '{0}' 與程式碼 '{1}' 不相容，所以無法安裝。",
-+=======
-+>>>>>>> .their
- 	"restartCode": "請先重新啟動 Code，再重新安裝 {0}。",
- 	"installingOutdatedExtension": "已安裝此擴充功能的較新版本。是否要使用舊版本覆蓋此項？",
- 	"override": "覆寫",
- 	"cancel": "取消",
-+<<<<<<< .our
- 	"errorInstallingDependencies": "安裝相依套件時發生錯誤。{0}",
- 	"MarketPlaceDisabled": "未啟用市集",
- 	"removeError": "移除擴充功能: {0} 時發生錯誤。重新嘗試前請離開並再次啟動 VS Code。",
-@@ -22,6 +26,12 @@
- 	"quitCode": "無法安裝擴充功能。重新安裝以前請重啟 VS Code。",
- 	"exitCode": "無法安裝擴充功能。重新安裝以前請離開並再次啟動 VS Code。",
- 	"renameError": "將 {0} 重新命名為 {1} 時發生未知錯誤",
-+=======
-+	"notFoundCompatible": "無法安裝 '{0}'；沒有任何與 VS Code 相容的可用版本 '{1}'。",
-+	"notFoundCompatibleDependency": "無法安裝，因為找不到相容於 VS Code 目前版本 '{1}' 的相依擴充功能 '{0}'。",
-+	"quitCode": "無法安裝擴充功能。重新安裝以前請重啟 VS Code。",
-+	"exitCode": "無法安裝擴充功能。重新安裝以前請離開並再次啟動 VS Code。",
-+>>>>>>> .their
- 	"uninstallDependeciesConfirmation": "只要將 '{0}' 解除安裝，或要包含其相依性?",
- 	"uninstallOnly": "僅擴充功能",
- 	"uninstallAll": "全部解除安裝",
-changed in both
-  base   100644 7a9cbb1bf06c323d637eef20a41c068766d46c65 i18n/cht/src/vs/platform/message/common/message.i18n.json
-  our    100644 34830e4a0c176436899e522878f1cb20ff4ceba2 i18n/cht/src/vs/platform/message/common/message.i18n.json
-  their  100644 f23fb38d41815438114f898b119b8e10e20c0e3e i18n/cht/src/vs/platform/message/common/message.i18n.json
-changed in both
-  base   100644 4868c4bbc6c4e5500d0edede4ad2f376ac897420 i18n/cht/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 790929bd611f6dd14a59e2ff8a6640378fde30cb i18n/cht/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 03e619b672cbadffc41f9e9f3eb812c6cf334d00 i18n/cht/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -68,6 +68,7 @@
- 	"editorWidgetBorder": "編輯器小工具的邊界色彩。小工具選擇擁有邊界或色彩未被小工具覆寫時，才會使用色彩。",
- 	"editorSelectionBackground": "編輯器選取範圍的色彩。",
- 	"editorSelectionForeground": "為選取的文字顏色高對比化",
-+<<<<<<< .our
- 	"editorInactiveSelection": "在非使用中的編輯器的選取項目顏色。不能使用非透明的顏色來隱藏底層的樣式。",
- 	"editorSelectionHighlight": "與選取項目相同的區域顏色。不能使用非透明的顏色來隱藏底層的樣式。",
- 	"editorSelectionHighlightBorder": "選取時，內容相同之區域的框線色彩。",
-@@ -79,6 +80,9 @@
- 	"findRangeHighlightBorder": "限制搜尋範圍的邊框色彩。不能使用非透明的色彩來隱藏基礎樣式。",
- 	"findWidgetResizeBorder": "尋找小工具的調整列的邊框顏色。",
- 	"hoverHighlight": "突顯懸停顯示的文字。不能使用非透明的顏色來隱藏底層的樣式。",
-+=======
-+	"editorFindMatch": "符合目前搜尋的色彩。",
-+>>>>>>> .their
- 	"hoverBackground": "編輯器動態顯示的背景色彩。",
- 	"hoverBorder": "編輯器動態顯示的框線色彩。",
- 	"activeLinkForeground": "使用中之連結的色彩。",
-@@ -86,12 +90,15 @@
- 	"diffEditorRemoved": "移除文字的背景顏色。不能使用非透明的顏色來隱藏底層的樣式。 ",
- 	"diffEditorInsertedOutline": "插入的文字外框色彩。",
- 	"diffEditorRemovedOutline": "移除的文字外框色彩。",
-+<<<<<<< .our
- 	"mergeCurrentHeaderBackground": "目前內嵌合併衝突中的深色標題背景。不能使用非透明的顏色來隱藏底層的樣式。",
- 	"mergeCurrentContentBackground": "目前內嵌合併衝突中的內容背景。不能使用非透明的顏色來隱藏底層的樣式。",
- 	"mergeIncomingHeaderBackground": "傳入內嵌合併衝突中的深色標題背景。不能使用非透明的顏色來隱藏底層的樣式。",
- 	"mergeIncomingContentBackground": "傳入內嵌合併衝突中的內容背景。不能使用非透明的顏色來隱藏底層的樣式。",
- 	"mergeCommonHeaderBackground": "內嵌合併衝突中的共同始祖標題背景。不能使用非透明的顏色來隱藏底層的樣式。",
- 	"mergeCommonContentBackground": "內嵌合併衝突中的共同始祖內容背景。不能使用非透明的顏色來隱藏基礎樣式。",
-+=======
-+>>>>>>> .their
- 	"mergeBorder": "內嵌合併衝突中標頭及分隔器的邊界色彩。",
- 	"overviewRulerCurrentContentForeground": "目前內嵌合併衝突的概觀尺規前景。",
- 	"overviewRulerIncomingContentForeground": "傳入內嵌合併衝突的概觀尺規前景。",
-added in both
-  our    100644 074f6b2402f4fe019ee3d9c00f5e2c58606d8173 i18n/cht/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/cht/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,4 +11,12 @@
- 	"codeActionsOnSave.didTimeout": "在 {0} 毫秒後中止了 codeActionsOnSave",
- 	"timeout.onWillSave": "在 1750 亳秒後中止 onWillSaveTextDocument 事件",
- 	"saveParticipants": "執行儲存參與者..."
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 edc32bace6e95d2cbba253f02f7ddcd5e5ed3e24 i18n/cht/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  our    100644 abe4ed1d76a55705946e1a1d5c0bb771605939cd i18n/cht/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  their  100644 2df7e9c33f5b5017875be52d51d368ffe7343f52 i18n/cht/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,7 @@
- 	],
- 	"treeView.notRegistered": "未註冊識別碼為 '{0}' 的樹狀檢視。",
- 	"treeView.duplicateElement": "識別碼為 {0} 的元件已被註冊"
-+=======
-+	"treeView.notRegistered": "未註冊識別碼為 '{0}' 的樹狀檢視。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 abe1e77c79707384ddb4e23a233c59c1fb5e4e4e i18n/cht/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 fb350c87bdc732a5022e5d51b20bc738ad941987 i18n/cht/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 f5c23870560285795913ccce5187ff77875ff207 i18n/cht/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -15,5 +15,9 @@
- 	"saveWorkspace": "儲存工作區",
- 	"openWorkspaceAction": "開啟工作區...",
- 	"openWorkspaceConfigFile": "開啟工作區組態檔",
-+<<<<<<< .our
- 	"duplicateWorkspaceInNewWindow": "新視窗中的重覆工作區"
-+=======
-+	"openFolderAsWorkspaceInNewWindow": "在新視窗中開啟資料夾作為工作區"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 6d82e2865dfe76c63f5f1fba50cdcdb823f720b1 i18n/cht/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-  their  100644 19777945aa7127f146b39eabd45dd7379fd2d6a2 i18n/cht/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"addFolderToWorkspace": "將資料夾新增到工作區...",
- 	"add": "新增",
- 	"addFolderToWorkspaceTitle": "將資料夾新增到工作區",
-changed in both
-  base   100644 fc25ce13ad0bfeb0d5832f5875c28a21ea2377bc i18n/cht/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  our    100644 57210caa274005f47f9e79a24ece0188fe40d93b i18n/cht/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  their  100644 9dbae940daf1322aad98d5d9e82abbe5113205c7 i18n/cht/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-@@ -19,6 +19,7 @@
- 	"close": "關閉",
- 	"closeOthers": "關閉其他",
- 	"closeRight": "關到右側",
-+<<<<<<< .our
- 	"closeAllSaved": "關閉已儲存項目",
- 	"closeAll": "全部關閉",
- 	"keepOpen": "保持開啟",
-@@ -27,6 +28,15 @@
- 	"keepEditor": "保留編輯器",
- 	"closeEditorsInGroup": "關閉群組中的所有編輯器",
- 	"closeSavedEditors": "關閉群組中的已儲存編輯器",
-+=======
-+	"closeAllUnmodified": "關閉未變更的檔案",
-+	"closeAll": "全部關閉",
-+	"keepOpen": "保持開啟",
-+	"showOpenedEditors": "顯示開啟的編輯器",
-+	"keepEditor": "保留編輯器",
-+	"closeEditorsInGroup": "關閉群組中的所有編輯器",
-+	"closeUnmodifiedEditors": "在群組中關閉未修改的編輯器",
-+>>>>>>> .their
- 	"closeOtherEditors": "關閉其他編輯器",
- 	"closeRightEditors": "將編輯器關到右側"
- }
-\ No newline at end of file
-changed in both
-  base   100644 6f4e3589f00b78ffff200239c271e9748368b385 i18n/cht/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 9af81e350d69047f6d84eaf0bd191dc1d54db2a0 i18n/cht/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 b0ae21a8fc3d7a9622a035ea3849d2b94bf886a2 i18n/cht/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 f93bcde4036126fee7dc69568528e596b4828fb2 i18n/cht/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  our    100644 70182509e578a9143d95039dd3772171f13ad836 i18n/cht/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  their  100644 043d904547ff4cee81c5eb3b127b0a9712ed27b0 i18n/cht/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-changed in both
-  base   100644 7071905be9d1464fb90bf10c52527f7e442398af i18n/cht/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  our    100644 98279e8e6e328b48d46b8daa5bdb4dddd0effc3b i18n/cht/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  their  100644 71cfbf7358591bf1974c0f8c9c1203380f5cd4f8 i18n/cht/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-@@ -12,6 +12,10 @@
- 	"editableEditorWithInputAriaLabel": "{0}。文字檔案比較編輯器。",
- 	"editableEditorAriaLabel": "文字檔比較編輯器。",
- 	"navigate.next.label": "下一個變更",
-+<<<<<<< .our
- 	"navigate.prev.label": "上一個變更",
- 	"toggleIgnoreTrimWhitespace.label": "忽略修剪空白字元"
-+=======
-+	"navigate.prev.label": "上一個變更"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 bfffed93b029eadb9ad51eebc2680d385c49e18a i18n/cht/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  our    100644 47f703cf2f9fbc98afcbcef5d5db808a65fd9a6f i18n/cht/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  their  100644 b9bd84d74099300d5c59979bc15eed36eefde8eb i18n/cht/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"close": "關閉",
-+>>>>>>> .their
- 	"araLabelEditorActions": "編輯器動作"
- }
-\ No newline at end of file
-changed in both
-  base   100644 6be57ab281c6524fe9f41d9e4d4bfc88fbeb25c2 i18n/cht/src/vs/workbench/common/theme.i18n.json
-  our    100644 41a6d8c801b131296a56223489edd198cc2bf33b i18n/cht/src/vs/workbench/common/theme.i18n.json
-  their  100644 0ca701a7da981740372be47f006f49b29dc2df9d i18n/cht/src/vs/workbench/common/theme.i18n.json
-@@ -24,7 +24,10 @@
- 	"editorGroupBackground": "編輯器群組的背景色彩。編輯器群組是編輯器的容器。當拖曳編輯器群組時會顯示背景色彩。",
- 	"tabsContainerBackground": "當索引標籤啟用的時候編輯器群組標題的背景色彩。編輯器群組是編輯器的容器。",
- 	"tabsContainerBorder": "當索引標籤啟用時，編輯器群組標題的框線色彩。編輯器群組是編輯器的容器。",
-+<<<<<<< .our
- 	"editorGroupHeaderBackground": "當索引標籤禁用的時候編輯器群組標題的背景顏色 (`\"workbench.editor.showTabs\": false`)。編輯器群組是編輯器的容器。",
-+=======
-+>>>>>>> .their
- 	"editorGroupBorder": "用以分隔多個編輯器群組彼此的色彩。編輯器群組是編輯器的容器。",
- 	"editorDragAndDropBackground": "拖拉編輯器時的背景顏色,可設置透明度讓內容穿透顯示.",
- 	"panelBackground": "面板的前景色彩。面板會顯示在編輯器區域的下方，其中包含諸如輸出與整合式終端機等檢視。",
-@@ -41,8 +44,11 @@
- 	"statusBarNoFolderBorder": "未開啟資料夾時，用以分隔資訊看板與編輯器的狀態列框線色彩。狀態列會顯示在視窗的底部。 ",
- 	"statusBarItemActiveBackground": "按下滑鼠按鈕時，狀態列項目的背景色彩。狀態列會顯示在視窗的底部。",
- 	"statusBarItemHoverBackground": "動態顯示時，狀態列項目的背景色彩。狀態列會顯示在視窗的底部。",
-+<<<<<<< .our
- 	"statusBarProminentItemBackground": "狀態列突出項目的背景顏色。突出項目比狀態列的其他項目更顯眼，用於表示重要性更高。從命令選擇區變更模式 `切換 Tab 鍵移動焦點` 來檢視範例。狀態列會顯示在視窗的底部。",
- 	"statusBarProminentItemHoverBackground": "當暫留狀態列突出項目的背景顏色。突出項目比狀態列的其他項目更顯眼，用於表示重要性更高。從命令選擇區變更模式 `切換 Tab 鍵移動焦點` 來檢視範例。狀態列會顯示在視窗的底部。",
-+=======
-+>>>>>>> .their
- 	"activityBarBackground": "活動列背景的色彩。活動列會顯示在最左側或最右側，並可切換不同的提要欄位檢視。",
- 	"activityBarForeground": "活動列的前背景色彩(例如用於圖示)。此活動列會顯示在最左側或最右側，讓您可以切換提要欄位的不同檢視。",
- 	"activityBarBorder": "用以分隔提要欄位的活動列框線色彩。此活動列會顯示在最左側或最右側，讓您可以切換提要欄位的不同檢視。",
-added in both
-  our    100644 fd56bed834966709f195244249e53963d1d8486d i18n/cht/src/vs/workbench/common/views.i18n.json
-  their  100644 b6fbcb12ae35381939fe87ed3fa6453b8ccbc39a i18n/cht/src/vs/workbench/common/views.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"duplicateId": "識別碼為 '{0}' 的檢視已在位置 '{1}' 註冊"
- }
-\ No newline at end of file
-changed in both
-  base   100644 daf7e22d21e520f6d3f111d84ce8ecbf63d29995 i18n/cht/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 8c04c44fd8aa84aafd673c4f7e7c350b8ac52c3b i18n/cht/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 c6e5b092bd1ede4f855f73cb760186660ec53e35 i18n/cht/src/vs/workbench/electron-browser/actions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"closeWindow": "關閉視窗",
- 	"closeWorkspace": "關閉工作區",
- 	"noWorkspaceOpened": "此執行個體中目前沒有開啟的工作區可以關閉。",
-@@ -50,6 +53,14 @@
- 	"moveWindowTabToNewWindow": "將視窗索引標籤移至新的視窗",
- 	"mergeAllWindowTabs": "合併所有視窗",
- 	"toggleWindowTabsBar": "切換視窗索引標籤列",
-+<<<<<<< .our
- 	"about": "關於 {0}",
- 	"inspect context keys": "檢查功能表內容"
-+=======
-+	"configureLocale": "設定語言",
-+	"displayLanguage": "定義 VSCode 的顯示語言。",
-+	"doc": "如需支援的語言清單，請參閱 {0}。",
-+	"restart": "改變設定值後需要重新啟動 VSCode.",
-+	"fail.createSettings": "無法建立 '{0}' ({1})。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 33e2c22230a0dd4f4c910e9234080655668a9c6b i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 bf339c91e8587ec53fe81a294c54ddc0f5aad010 i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 c719faa3f8f8322b412c3a99680cc8e77b11e1b4 i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,12 +35,19 @@
- 	"panelDefaultLocation": "控制面板的預設位置。可顯示在 Workbench 的底部或是右方。",
- 	"statusBarVisibility": "控制 Workbench 底端狀態列的可視性。",
- 	"activityBarVisibility": "控制活動列在 workbench 中的可見度。",
-+<<<<<<< .our
- 	"viewVisibility": "控制檢視標頭動作的可見度。檢視標頭動作可為總是可見，或在檢視為焦點或暫留時才可見。",
- 	"fontAliasing": "控制工作台中的字型鋸齒化方法。\n- default: 子像素字型平滑化。在多數非 Retina 的顯示器上，這會使文字變得最鮮明\n- antialiased: 在像素層級上使字型平滑化，與子像素相對。能夠使字型整體顯示較亮\n- none: 停用字型平滑化。顯示的文字會帶有鋸齒狀銳利邊緣\n- auto: 根據顯示器的 DPI 自動套用 `default` 或 `antialiased`。",
- 	"workbench.fontAliasing.default": "子像素字型平滑處理。在大部分非 Retina 顯示器上會顯示出最銳利的文字。",
- 	"workbench.fontAliasing.antialiased": "相對於子像素，根據像素層級平滑字型。可以讓字型整體顯得較細。",
- 	"workbench.fontAliasing.none": "禁用字體平滑.文字將會顯示鋸齒狀與鋒利的邊緣.",
- 	"workbench.fontAliasing.auto": "根據顯示器的 DPI 自動套用 `default` 或 `antialiased`。",
-+=======
-+	"fontAliasing": "在 Workbench 中控制字型鋸齒化的方法。- 預設: 子像素字型平滑處理。在大部分非 Retina 顯示器上會顯示出最銳利的文字- 已消除鋸齒: 相對於子像素，根據像素層級平滑字型。可讓字型整體顯得較細- 無: 停用字型平滑處理。文字會以鋸齒狀的銳邊顯示 ",
-+	"workbench.fontAliasing.default": "子像素字型平滑處理。在大部分非 Retina 顯示器上會顯示出最銳利的文字。",
-+	"workbench.fontAliasing.antialiased": "相對於子像素，根據像素層級平滑字型。可以讓字型整體顯得較細。",
-+	"workbench.fontAliasing.none": "禁用字體平滑.文字將會顯示鋸齒狀與鋒利的邊緣.",
-+>>>>>>> .their
- 	"enableNaturalLanguageSettingsSearch": "控制是否啟用自然語言搜尋模式。",
- 	"windowConfigurationTitle": "視窗",
- 	"window.openFilesInNewWindow.on": "檔案會在新視窗中開啟",
-changed in both
-  base   100644 8bd875c749d3c08b1b912a5fd5fb9b119c3e6988 i18n/cht/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
-  our    100644 649599cad385fe860287b9d1f1b6e0699ce6e478 i18n/cht/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
-  their  100644 33b7f3d44675768252eb39160033325d67975cdf i18n/cht/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"debugToolBarBackground": "偵錯工具列背景色彩。",
- 	"debugToolBarBorder": "偵錯工具列的邊框色彩"
- }
-\ No newline at end of file
-changed in both
-  base   100644 c16e8f409d63bde9c51c8cf037069cf2f3ee7498 i18n/cht/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  our    100644 0c85b37c8f146a183b27bdbacba854cd89eab6d5 i18n/cht/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  their  100644 c127cd12e93ac4cbd2b849be5d898a1a216b4d4f i18n/cht/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"debug.terminal.title": "偵錯項目"
- }
-\ No newline at end of file
-changed in both
-  base   100644 cebab2d329a2be9074bc396a357fba1301da9a40 i18n/cht/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  our    100644 74bcaae504a4a54801ebc152e9c1eb5f67cdf659 i18n/cht/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  their  100644 370fe5dd9482d211dbd3cc62841bbdb2e5251a7a i18n/cht/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-changed in both
-  base   100644 89b01309fa3551db55acdecd525dbbe3e36cb497 i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 68a719930ef86e9c0443de55d9783ccfe2efafc4 i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 0f331df92b84cbfd8d3ba04d0b7cd7bf0c449488 i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,11 @@
- 	"exeBasedRecommendation": "因為您已安裝 {0}，所以建議您使用此延伸模組。",
- 	"fileBasedRecommendation": "根據您最近開啟的檔案，建議您使用此延伸模組。",
- 	"workspaceRecommendation": "根據目前工作區的使用者，建議您使用此延伸模組。",
-+=======
-+	"workspaceRecommendation": "根據目前工作區的使用者，建議您使用此延伸模組。",
-+	"fileBasedRecommendation": "根據您最近開啟的檔案，建議您使用此延伸模組。",
-+	"exeBasedRecommendation": "因為您已安裝 {0}，所以建議您使用此延伸模組。",
-+>>>>>>> .their
- 	"reallyRecommended2": "建議對此檔案類型使用 '{0}' 延伸模組。",
- 	"reallyRecommendedExtensionPack": "建議對此檔案類型使用 '{0}' 延伸模組套件。",
- 	"install": "安裝",
-added in both
-  our    100644 f5a2db16545b0bc0375ab5309f1665e2cc4cb8f5 i18n/cht/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-  their  100644 37b9d5384a5d805a2e73f89815075c787883f868 i18n/cht/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,13 @@
- 	],
- 	"workbenchConfigurationTitle": "工作台",
- 	"feedbackVisibility": "控制工作台底部狀態列中的 Twitter 回饋 (笑臉) 的可見度。"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"workbenchConfigurationTitle": "工作台"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 570b71dc6f4715db1dc4fdf2ef9a82ddc5649b30 i18n/cht/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-  their  100644 e8a6eb4e02cf8268484f0a642b7b3404b1e5df64 i18n/cht/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"hide": "隱藏"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8edf80232253478b27e2c990d82b50ff4df4bdb6 i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  our    100644 7db983f67d10cddebe8cba0535ddc6aaff11c9ea i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  their  100644 0203e579bac3ebaef869dc141ed17d6107286c79 i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-@@ -12,7 +12,10 @@
- 	"revertLocalChanges": "捨棄您的變更並還原成磁碟上的內容",
- 	"copyPathOfActive": "複製使用中檔案的路徑",
- 	"saveAllInGroup": "全部儲存在群組中",
-+<<<<<<< .our
- 	"saveFiles": "儲存所有檔案",
-+=======
-+>>>>>>> .their
- 	"revert": "還原檔案",
- 	"compareActiveWithSaved": "比較使用中的檔案和已儲存的檔案",
- 	"closeEditor": "關閉編輯器",
-@@ -24,12 +27,19 @@
- 	"copyPath": "複製路徑",
- 	"saveAll": "全部儲存",
- 	"compareWithSaved": "與已儲存的檔案比較",
-+<<<<<<< .our
- 	"compareWithSelected": "與選取的比較",
- 	"compareSource": "選取用以比較",
- 	"compareSelected": "比較已選取",
- 	"close": "關閉",
- 	"closeOthers": "關閉其他",
- 	"closeSaved": "關閉已儲存項目",
-+=======
-+	"compareSource": "選取用以比較",
-+	"close": "關閉",
-+	"closeOthers": "關閉其他",
-+	"closeUnmodified": "關閉未變更的檔案",
-+>>>>>>> .their
- 	"closeAll": "全部關閉",
- 	"deleteFile": "永久刪除"
- }
-\ No newline at end of file
-changed in both
-  base   100644 c32641ccebc8fbed926c69242f64a9fbc36d13e0 i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 17eb85d0cba4bf089ef8b48577e75838680e330d i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 033e57751ec6c094519046c4b9f21e15e8cea426 i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"newFile": "新增檔案",
- 	"newFolder": "新增資料夾",
- 	"rename": "重新命名",
-@@ -13,7 +16,11 @@
- 	"copyFile": "複製",
- 	"pasteFile": "貼上",
- 	"retry": "重試",
-+<<<<<<< .our
- 	"renameWhenSourcePathIsParentOfTargetError": "請使用 'New Folder' 或 'New File' 命令將子系新增至現有的資料夾",
-+=======
-+	"openFolderFirst": "先開啟資料夾，以在其中建立檔案或資料夾。",
-+>>>>>>> .their
- 	"newUntitledFile": "新增未命名檔案",
- 	"createNewFile": "新增檔案",
- 	"createNewFolder": "新增資料夾",
-@@ -43,11 +50,19 @@
- 	"confirmDeleteMessageMultiple": "確定要永久地刪除以下 {0} 個檔案嗎？",
- 	"confirmDeleteMessageFolder": "您確定要永久刪除 '{0}' 和其中的內容嗎?",
- 	"confirmDeleteMessageFile": "您確定要永久刪除 '{0}' 嗎?",
-+<<<<<<< .our
- 	"addFiles": "新增檔案",
- 	"confirmOverwrite": "目的資料夾中已有同名的檔案或資料夾。要取代它嗎?",
- 	"replaceButtonLabel": "取代(&&R)",
- 	"fileIsAncestor": "要貼上的檔案是在目地資料夾的上層 ",
- 	"fileDeleted": "要貼上的檔案被刪除或移動",
-+=======
-+	"irreversible": "此動作無法回復!",
-+	"permDelete": "永久刪除",
-+	"importFiles": "匯入檔案",
-+	"confirmOverwrite": "目的資料夾中已有同名的檔案或資料夾。要取代它嗎?",
-+	"replaceButtonLabel": "取代(&&R)",
-+>>>>>>> .their
- 	"duplicateFile": "複製",
- 	"globalCompareFile": "使用中檔案的比較對象...",
- 	"openFileToCompare": "先開啟檔案以與其他檔案進行比較",
-changed in both
-  base   100644 75bdd951541007bdd0b8f91851760b6d8e726732 i18n/cht/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  our    100644 4f037a1090495f08486b17df05200026e15e83c9 i18n/cht/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  their  100644 4a3f606e9a71cb89a6474c23f0e78951c3c6134e i18n/cht/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,12 +7,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"revealInWindows": "在檔案總管中顯示",
- 	"revealInMac": "在 Finder 中顯示",
- 	"openContainer": "開啟收納資料夾",
- 	"saveAs": "另存新檔...",
- 	"save": "儲存",
- 	"saveAll": "全部儲存",
-+<<<<<<< .our
-+=======
-+	"saveFiles": "儲存所有檔案",
-+>>>>>>> .their
- 	"removeFolderFromWorkspace": "將資料夾從工作區移除",
- 	"genericRevertError": "無法還原 '{0}': {1}",
- 	"modifiedLabel": "{0} (在磁碟上) ↔ {1}",
-changed in both
-  base   100644 867d603ca5633a190dd294a861b5733b06da3c8c i18n/cht/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 be3fbea1a573a3ae7e9cb55afbd7c2737b3d71f0 i18n/cht/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 28e38af66ab4a7ca841438751197196900429c65 i18n/cht/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-@@ -40,7 +40,10 @@
- 	"formatOnSave": "在儲存時設定檔案格式。格式器必須處於可用狀態、檔案不得自動儲存，且編輯器不得關機。",
- 	"formatOnSaveTimeout": "儲存時格式化超時。指定 formatOnSave 命令的時間限制 (以毫秒為單位)。超過指定超時時間的命令將被取消。",
- 	"explorerConfigurationTitle": "檔案總管",
-+<<<<<<< .our
- 	"openEditorsVisible": "[開放式編輯器] 窗格中顯示的編輯器數目。",
-+=======
-+>>>>>>> .their
- 	"autoReveal": "控制總管是否在開啟檔案時自動加以顯示及選取。",
- 	"enableDragAndDrop": "控制總管是否應該允許透過拖放功能移動檔案和資料夾。",
- 	"confirmDragAndDrop": "控制總管是否須要求確認，以透過拖放來移動檔案和資料夾。",
-changed in both
-  base   100644 7a6f0b075f74848503c85069b40013f41dc423f4 i18n/cht/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  our    100644 eef73b3e6bc035b5c2b5b170f3146f31c7abcee8 i18n/cht/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  their  100644 6f482834b344badd7e33e67dc9899439b9cea27a i18n/cht/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,6 +14,14 @@
- 	"readonlySaveErrorAdmin": "無法儲存 '{0}': 檔案有防寫保護。請選取 [以系統管理者身分覆寫] 來做為系統管理者身分重試。 ",
- 	"readonlySaveError": "無法儲存 '{0}': 檔案有防寫保護。請選取 [覆寫] 以嚐試移除保護。 ",
- 	"permissionDeniedSaveError": "無法儲存 '{0}': 權限不足。請選取 [以系統管理者身分重試] 做為系統管理者身分重試。 ",
-+=======
-+	"userGuide": "在右方使用編輯器工具列中的動作來 **復原** 您的變更，或以您的變更 **覆寫** 磁碟上的內容",
-+	"overwriteElevated": "以系統管理者身分覆寫...",
-+	"saveElevated": "以系統管理者身分重試",
-+	"overwrite": "覆寫",
-+	"retry": "重試",
-+	"discard": "捨棄",
-+>>>>>>> .their
- 	"genericSaveError": "無法儲存 '{0}': {1}",
- 	"learnMore": "深入了解",
- 	"dontShowAgain": "不要再顯示",
-changed in both
-  base   100644 b48ed12d51855b12f5079b2ba6ccbf5bd5f20d47 i18n/cht/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  our    100644 35ea5e6b125818531a84cf5f3ecaaca77128b961 i18n/cht/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  their  100644 bc39c809e3de74122b4578e5fca38234e4ead479 i18n/cht/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-added in both
-  our    100644 6437a50222a0fcf7edb1151253eed3b35a74133c i18n/cht/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-  their  100644 801a62c062aab71774689d06cb71739e00066e94 i18n/cht/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,5 +11,13 @@
- 	"sharedLog": "紀錄 (共享) ",
- 	"rendererLog": "紀錄 (視窗)",
- 	"extensionsLog": "紀錄 (延伸主機) ",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"developer": "開發人員"
- }
-\ No newline at end of file
-added in both
-  our    100644 5ba4662a59600e7cc718255220a16ebea20d28b1 i18n/cht/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  their  100644 ddfff57509fec37578e10bc0f429803973011ab6 i18n/cht/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -16,15 +17,34 @@
- 	"selectProcess": "選取程序的記錄",
- 	"openLogFile": "開啟紀錄檔案...",
- 	"setLogLevel": "設定紀錄層級",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"openLogsFolder": "開啟紀錄資料夾",
-+	"showLogs": "顯示紀錄...。",
-+	"rendererProcess": "視窗",
-+	"extensionHost": "延伸主機",
-+	"selectProcess": "選取程序",
-+	"setLogLevel": "設定記錄層級",
-+>>>>>>> .their
- 	"trace": "追蹤",
- 	"debug": "偵錯",
- 	"info": "資訊",
- 	"warn": "警告",
- 	"err": "錯誤",
-+<<<<<<< .our
- 	"critical": "嚴重",
- 	"off": "關閉",
- 	"selectLogLevel": "選擇紀錄層級",
- 	"default and current": "預設與目前",
- 	"default": "預設",
- 	"current": "目前"
-+=======
-+	"off": "關閉",
-+	"selectLogLevel": "選擇紀錄層級"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7fd5ffaf852bbf00495cf764f9c33e0de548897a i18n/cht/src/vs/workbench/parts/markers/common/messages.i18n.json
-  our    100644 277304218a05614a88d10d3dfa976833dcf8b63a i18n/cht/src/vs/workbench/parts/markers/common/messages.i18n.json
-  their  100644 c754d02f8731022e67c633f1b10793e3890f192e i18n/cht/src/vs/workbench/parts/markers/common/messages.i18n.json
-@@ -7,8 +7,11 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"viewCategory": "檢視",
-+<<<<<<< .our
- 	"problems.view.toggle.label": "切換至問題(錯誤, 警告, 資訊)",
- 	"problems.view.focus.label": "聚焦於問題(錯誤, 警告, 資訊)",
-+=======
-+>>>>>>> .their
- 	"problems.panel.configuration.title": "[問題] 檢視",
- 	"problems.panel.configuration.autoreveal": "控制 [問題] 檢視是否應自動在開啟檔案時加以顯示",
- 	"markers.panel.title.problems": "問題",
-added in both
-  our    100644 d1554edfa0acf2920b90a909dcd24f6940d242a7 i18n/cht/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-  their  100644 223611af94e7f474bfa685f4e40e651a8ab6647e i18n/cht/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -11,4 +12,15 @@
- 	"viewCategory": "檢視",
- 	"clearOutput.label": "清除輸出",
- 	"openActiveLogOutputFile": "檢視: 開啟活動日誌輸出檔案"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"output": "輸出",
-+	"viewCategory": "檢視",
-+	"clearOutput.label": "清除輸出"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 650a7d283969cd39e172f31623aa27f163ca725c i18n/cht/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/cht/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,12 @@
- 	],
- 	"output": "{0} - 輸出",
- 	"channel": "'{0}' 的輸出通道"
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 480c3d2dbc2429466eae73efdf10836ba24348cb i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 17bda120dbd77f09aaae9b33d7a0fd346cfe2603 i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 5c3acf7c7d64621384457e83b84b68b723891289 i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"defaultSettings": "將您的設定放置於右方編輯器中以覆寫。",
- 	"noSettingsFound": "找不到任何設定。",
- 	"settingsSwitcherBarAriaLabel": "設定切換器",
-changed in both
-  base   100644 3aed58520858912cd1bb672948bfa8d19d71ffdf i18n/cht/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  our    100644 8733c537f59df2fc8c00e76d49613ca2252a3d72 i18n/cht/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  their  100644 4a5625894bd6dacc5f486e4c24636132474ae2ec i18n/cht/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-changed in both
-  base   100644 238b60d70077764c93852c2ac5217b9e6ae52ed5 i18n/cht/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  our    100644 ec7b2f0037cdd44476f6c632907da49a58637baa i18n/cht/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  their  100644 6a7eae1ed19269002f0a6c5e3cf423b201b789be i18n/cht/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"view": "檢視",
- 	"commandsHandlerDescriptionDefault": "顯示並執行命令",
- 	"gotoLineDescriptionMac": "移至行",
-changed in both
-  base   100644 c0bccd6864ce28dcfdecff56da124d7a48f07b0b i18n/cht/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  our    100644 a47e720b85b124ad8277e1dd5180192fef41e422 i18n/cht/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  their  100644 813fb7021bf2a52dd967f16ada8f5d8e063f305e i18n/cht/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-@@ -10,8 +10,13 @@
- 	"source control": "原始檔控制",
- 	"toggleSCMViewlet": "顯示 SCM",
- 	"view": "檢視",
-+<<<<<<< .our
- 	"scmConfigurationTitle": "原始碼管理 (SCM)",
- 	"alwaysShowProviders": "是否總是顯示原始檔控制提供者區段",
- 	"diffDecorations": "控制差異裝飾於編輯器中",
- 	"diffGutterWidth": "控制邊框中差異裝飾的寬度 (px) (增加和修改)。"
-+=======
-+	"alwaysShowProviders": "是否總是顯示原始檔控制提供者區段",
-+	"inputCounter": "控制何時顯示輸入計數器"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 72f9807aa29260fb51db6a1706a9fb685cb9707b i18n/cht/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  our    100644 4bf0fb57a82a100d4c5b072e1a13f960c4e14c31 i18n/cht/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  their  100644 29439ddb2cf3c79607587f5025d52dd962dec0b0 i18n/cht/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-@@ -8,6 +8,7 @@
- 	],
- 	"scm providers": "原始檔控制提供者",
- 	"hideRepository": "隱藏",
-+	"commitMessageInfo": "在目前行數有 {0} 個字元",
- 	"installAdditionalSCMProviders": "安裝額外SCM提供者...",
- 	"no open repo": "沒有使用中的原始檔控制提供者。",
- 	"source control": "原始檔控制",
-changed in both
-  base   100644 551008efc7893399c0221873de05b323f9c2b7c1 i18n/cht/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 ba1fd77bc20f96eb0056aa05843bd1bb7818c0eb i18n/cht/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 e52a383a212b6ec13896414aeda0899108eb6a7b i18n/cht/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-changed in both
-  base   100644 2737e83ab4e2d72307285d25741cd8198fec0007 i18n/cht/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 ebc27f353b31e6e9c7c072ddd7a5d4a8a93dc07d i18n/cht/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 1244f50ad8cfe7d8cef62d92d94a515cff364e74 i18n/cht/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,11 +13,18 @@
- 	"copyAllLabel": "全部複製",
- 	"clearSearchHistoryLabel": "清除搜尋歷程記錄",
- 	"toggleSearchViewPositionLabel": "切換搜尋檢視位置",
-+=======
-+>>>>>>> .their
- 	"findInFolder": "在資料夾中尋找...",
- 	"findInWorkspace": "在工作區中尋找...",
- 	"showTriggerActions": "前往工作區中的符號...",
- 	"name": "搜尋",
-+<<<<<<< .our
- 	"showSearchViewl": "顯示搜尋",
-+=======
-+	"search": "搜尋",
-+	"showSearchViewlet": "顯示搜尋",
-+>>>>>>> .their
- 	"view": "檢視",
- 	"findInFiles": "在檔案中尋找",
- 	"openAnythingHandlerDescription": "前往檔案",
-added in both
-  our    100644 eee83ac59d306906e966b7a1fd22be00a3fc38a2 i18n/cht/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-  their  100644 8c1786823ea517774c1c191d8b394423976b590b i18n/cht/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -13,5 +14,15 @@
- 	"new.global.sep": "新增程式碼片段",
- 	"openSnippet.pickLanguage": "選取程式碼片段檔案或建立程式碼片段",
- 	"openSnippet.label": "設定使用者程式碼片段",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"global.scope": "(全域)",
-+	"global.1": "({0})",
-+>>>>>>> .their
- 	"preferences": "喜好設定"
- }
-\ No newline at end of file
-changed in both
-  base   100644 10abf9bdd4dee37b35d418c5088f12fe4ce635cf i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  our    100644 179e7258b664148a5ba38b4e024fbd706aee0cb7 i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  their  100644 115f5980d39013977ba7c3f359fd2a7014cb8a91 i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"snippetSchema.json.default": "空白程式碼片段",
- 	"snippetSchema.json": "使用者程式碼片段組態",
- 	"snippetSchema.json.prefix": "在 Intellisense 中選取程式碼片段時要使用的前置詞",
-added in both
-  our    100644 41c38916afd896b61492589c5f2dd9668e4bf74a i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-  their  100644 4a43b9b0daf355d6ea9e712605f44b652f28a4e7 i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,5 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"source.snippetGlobal": "全域使用者程式碼片段",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"source.snippet": "使用者程式碼片段"
- }
-\ No newline at end of file
-changed in both
-  base   100644 e7261d392fd61f6d6e84e036a1d31a2661b64366 i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  our    100644 763c92b7367ac35034e9498d362e409a1ce2c7f1 i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 bcbd784bf1c57f1f349a9faf93450ee1eb78bf56 i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,9 @@
- 	],
- 	"invalid.path.0": "'contributes.{0}.path' 中應有字串。提供的值: {1}",
- 	"invalid.language.0": "省略語言時，`contributes.{0}.path` 的值必須是 `.code-snippets`-file。您目前提供的值：{1}",
-+=======
-+	"invalid.path.0": "'contributes.{0}.path' 中應有字串。提供的值: {1}",
-+>>>>>>> .their
- 	"invalid.language": "`contributes.{0}.language` 中的不明語言。提供的值: {1}",
- 	"invalid.path.1": "擴充功能資料夾 ({2}) 應包含 'contributes.{0}.path' ({1})。這可能會導致擴充功能無法移植。",
- 	"vscode.extension.contributes.snippets": "提供程式碼片段。",
-changed in both
-  base   100644 80abe8bb59c2d8ae4b753b7631b622d1b57645e7 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 dc4a98ed7869a7cc55922d5bc3bb8ecb137f6a4d i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 d824ac236e9f4d77c996e9ba90ec028e900b5a9a i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -15,7 +15,11 @@
- 	"terminal.integrated.shellArgs.osx": "在 OS X 終端機要使用的命令列引數。",
- 	"terminal.integrated.shell.windows": "終端機在 Windows 上使用的殼層路徑。使用隨附於 Windows 的殼層 (cmd、PowerShell 或 Bash on Ubuntu) 時。",
- 	"terminal.integrated.shellArgs.windows": "在 Windows 終端機上時要使用的命令列引數。",
-+<<<<<<< .our
- 	"terminal.integrated.macOptionIsMeta": "將選項鍵視為 macOS 終端機中的 meta 鍵。",
-+=======
-+	"terminal.integrated.rightClickCopyPaste": "如有設定，這會防止在終端機內按滑鼠右鍵時顯示操作功能表，而是在有選取項目時複製、沒有選取項目時貼上。",
-+>>>>>>> .their
- 	"terminal.integrated.copyOnSelection": "當設定時，在終端機中選擇的文字將會被複製至剪貼簿",
- 	"terminal.integrated.fontFamily": "控制終端機的字型家族，預設為 editor.fontFamily 的值。",
- 	"terminal.integrated.fontSize": "控制終端機的字型大小 (以像素為單位)。",
-changed in both
-  base   100644 4034245817950e0bafe49e25a55f31d69cafbc3c i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 b65af1ec7222f34f85465a0e272b45818ced6ea4 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 5adfeb27fedb082946776a84cbc017dc3d31a120 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -19,6 +19,7 @@
- 	"workbench.action.terminal.new": "建立新的整合式終端機",
- 	"workbench.action.terminal.new.short": "新增終端機",
- 	"workbench.action.terminal.newWorkspacePlaceholder": "為新的終端機選擇目前的工作目錄",
-+<<<<<<< .our
- 	"workbench.action.terminal.newInActiveWorkspace": "建立新的整合式終端機 (於目前工作區)",
- 	"workbench.action.terminal.split": "分割終端機",
- 	"workbench.action.terminal.splitInActiveWorkspace": "分割終端機 (於使用中的工作區)",
-@@ -28,6 +29,8 @@
- 	"workbench.action.terminal.resizePaneRight": "調整窗格右側",
- 	"workbench.action.terminal.resizePaneUp": "調整窗格上方",
- 	"workbench.action.terminal.resizePaneDown": "調整窗格下方",
-+=======
-+>>>>>>> .their
- 	"workbench.action.terminal.focus": "聚焦終端機",
- 	"workbench.action.terminal.focusNext": "聚焦下一個終端機",
- 	"workbench.action.terminal.focusPrevious": "聚焦上一個終端機",
-changed in both
-  base   100644 3c4cccada80ab6272079756f801b41915d757acb i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 2657899133e07b49fde3b011113a300d729b30b8 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 3effe14e672e13014de0a1e61a8ed9999f074242 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -10,7 +10,11 @@
- 	"terminal.foreground": "終端機的前景色彩。",
- 	"terminalCursor.foreground": "終端機游標的前景色彩。",
- 	"terminalCursor.background": "終端機游標的背景色彩。允許區塊游標重疊於自訂字元色彩。",
-+<<<<<<< .our
- 	"terminal.selectionBackground": "終端機的選取項目背景色彩。",
- 	"terminal.border": "在終端機內將窗格分割之邊界的色彩。預設為 panel.border。",
- 	"terminal.ansiColor": "終端機中的 '{0}' ANSI 色彩。"
-+=======
-+	"terminal.selectionBackground": "終端機的選取項目背景色彩。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 fc6b0624a086866da0e905e5276f239252ef8963 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  our    100644 55ce4576943b4064c238335449bd2f01b7cfc32d i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  their  100644 331a28ddaf2c2df3af8caec873d010121aa0eb3b i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-@@ -8,7 +8,11 @@
- 	],
- 	"terminal.integrated.chooseWindowsShellInfo": "您可以選取 [自訂] 按鈕變更預設的終端機殼層。",
- 	"customize": "自訂",
-+<<<<<<< .our
- 	"never again": "不要再顯示",
-+=======
-+	"cancel": "取消",
-+>>>>>>> .their
- 	"terminal.integrated.chooseWindowsShell": "請選取所需的終端機殼層。您之後可以在設定中變更此選擇",
- 	"terminalService.terminalCloseConfirmationSingular": "仍有一個使用中的終端機工作階段。要予以終止嗎?",
- 	"terminalService.terminalCloseConfirmationPlural": "目前共有 {0} 個使用中的終端機工作階段。要予以終止嗎?"
-changed in both
-  base   100644 e043af15328ee3940be29307d54ad6c128a488d4 i18n/cht/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 3fdd15bb8f2f2cfb1dd6d7b789581c43681e05de i18n/cht/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 0090723f9a2daea55fbc4fa46f8aa608d33fc741 i18n/cht/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -26,7 +26,10 @@
- 	"commandPalette": "命令選擇區...",
- 	"settings": "設定",
- 	"keyboardShortcuts": "鍵盤快速鍵(&&K)",
-+<<<<<<< .our
- 	"showExtensions": "管理擴充功能",
-+=======
-+>>>>>>> .their
- 	"userSnippets": "使用者程式碼片段",
- 	"selectTheme.label": "色彩佈景主題",
- 	"themes.selectIconTheme.label": "檔案圖示佈景主題",
-changed in both
-  base   100644 067f2923a48309193cd28fa6fb886049ddae521d i18n/cht/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  our    100644 7d5350b520b4d67111b7f41cf915db16407871b6 i18n/cht/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  their  100644 106253b1f0cd21b5879ab6abea7ab78ddd0e573b i18n/cht/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,4 +14,9 @@
- 	"fileBinaryError": "檔案似乎是二進位檔，因此無法當做文字開啟",
- 	"err.create": "無法建立檔案 {0}",
- 	"fileMoveConflict": "無法移動/複製。目的地已存在檔案。"
-+=======
-+	"fileIsDirectoryError": "檔案是目錄",
-+	"fileNotModifiedError": "未修改檔案的時間",
-+	"fileBinaryError": "檔案似乎是二進位檔，因此無法當做文字開啟"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 5fb9fd9998bac3aad993a60cd8b0e874756dfd7e i18n/cht/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  our    100644 cc9ac892518cde73d902e325d06f8149dd79c06c i18n/cht/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  their  100644 fe4c04e35cd0e415ea1de05739efbcddbf395a19 i18n/cht/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-changed in both
-  base   100644 939ead9df9c71727207d82585424fde289b02903 i18n/cht/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 80a488e2a3e2c61dc5b117e10596d1fd5524e484 i18n/cht/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 8096baf29535b730056e2ec35f12d3dde02cecb1 i18n/cht/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-changed in both
-  base   100644 283d3809ddb10d028c96aed1895e6717e7489153 i18n/cht/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  our    100644 4d4e5f4f69d10620c3c84b07885a16c64b735010 i18n/cht/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  their  100644 e0710f14e3f8b69f252fb20afac94eaf50310d9a i18n/cht/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-@@ -8,5 +8,10 @@
- 	],
- 	"errorInvalidTaskConfiguration": "無法寫入工作區組態檔。請開啟檔案更正其中的錯誤/警告，然後再試一次。 ",
- 	"errorWorkspaceConfigurationFileDirty": "因為檔案已變更，所以無法寫入工作區組態檔。請將其儲存，然後再試一次。",
-+<<<<<<< .our
- 	"openWorkspaceConfigurationFile": "開啟工作區組態設定"
-+=======
-+	"openWorkspaceConfigurationFile": "開啟工作區組態檔",
-+	"close": "關閉"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e1242008fcfe02d7588828e7ab2667e41a98f385 i18n/deu/extensions/git/out/autofetch.i18n.json
-  our    100644 57d1be570fcceb0c9d422fc4552c950a9b3239ce i18n/deu/extensions/git/out/autofetch.i18n.json
-  their  100644 5a1bb589fb2c67f7ba11c705a32336a2b8044edc i18n/deu/extensions/git/out/autofetch.i18n.json
-@@ -7,7 +7,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"yes": "Ja",
-+	"read more": "Weitere Informationen",
- 	"no": "Nein",
- 	"not now": "Erneut nachfragen",
-+<<<<<<< .our
- 	"suggest auto fetch": "Möchten Sie Code [regelmäßig \"git fetch\" ausführen lassen] ({0})?"
-+=======
-+	"suggest auto fetch": "Möchten Sie Code regelmäßig `git fetch` ausführen lassen?"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 27787e3b3d420f2a46e6300d31a08177fb527d00 i18n/deu/extensions/git/out/commands.i18n.json
-  our    100644 1abad5f86ec11c777f2319fc1588d47f5ea1c8f5 i18n/deu/extensions/git/out/commands.i18n.json
-  their  100644 e26a7235e02a5fb6cdb11ab58c45c8718cabc756 i18n/deu/extensions/git/out/commands.i18n.json
-@@ -45,7 +45,10 @@
- 	"yes discard tracked multiple": "{0} verfolgte Dateien verwerfen",
- 	"unsaved files single": "Die folgende Datei ist nicht gespeichert: {0}.\n\nMöchten Sie diese vor dem Committen speichern?",
- 	"unsaved files": "{0} Dateien sind nicht gespeichert.\n\nMöchten Sie diese vor dem Committen speichern?",
-+<<<<<<< .our
- 	"save and commit": "Alles speichern und committen",
-+=======
-+>>>>>>> .their
- 	"commit": "Trotzdem committen",
- 	"no staged changes": "Es sind keine Änderungen bereitgestellt.\n\nMöchten Sie alle Ihre Änderungen automatisch bereitstellen und direkt committen?",
- 	"always": "Immer",
-@@ -71,12 +74,19 @@
- 	"pick remote pull repo": "Remoteelement zum Pullen des Branch auswählen",
- 	"no remotes to push": "In Ihrem Repository wurden keine Remoteelemente für den Push konfiguriert.",
- 	"nobranch": "Wählen Sie ein Branch für den Push zu einem Remoteelement aus.",
-+<<<<<<< .our
- 	"confirm publish branch": "Der Branch \"{0}\" verfügt über keinen Upstreambranch. Möchten Sie diesen Branch veröffentlichen?",
- 	"ok": "OK",
- 	"push with tags success": "Push mit Tags erfolgreich ausgeführt.",
- 	"pick remote": "Remotespeicherort auswählen, an dem der Branch \"{0}\" veröffentlicht wird:",
- 	"sync is unpredictable": "Mit dieser Aktion werden Commits per Push und Pull an und von \"{0}/{1}\" übertragen.",
- 	"never again": "OK, nicht mehr anzeigen",
-+=======
-+	"ok": "OK",
-+	"push with tags success": "Push mit Tags erfolgreich ausgeführt.",
-+	"pick remote": "Remotespeicherort auswählen, an dem der Branch \"{0}\" veröffentlicht wird:",
-+	"sync is unpredictable": "Mit dieser Aktion werden Commits per Push und Pull an und von \"{0}\" übertragen.",
-+>>>>>>> .their
- 	"no remotes to publish": "In Ihrem Repository wurden keine Remoteelemente für die Veröffentlichung konfiguriert.",
- 	"no changes stash": "Es sind keine Änderungen vorhanden, für die ein Stash ausgeführt werden kann.",
- 	"provide stash message": "Geben Sie optional eine Stash-Nachricht ein.",
-changed in both
-  base   100644 9c6af561332b3614cc176ac11385b5e7ed3c419f i18n/deu/extensions/git/out/repository.i18n.json
-  our    100644 19de752d1259c61a02eef63529268457137c8f97 i18n/deu/extensions/git/out/repository.i18n.json
-  their  100644 cb3c5c9809f00b45ccc5447a012894e9762398fa i18n/deu/extensions/git/out/repository.i18n.json
-@@ -28,8 +28,12 @@
- 	"merge changes": "Änderungen zusammenführen",
- 	"staged changes": "Bereitgestellte Änderungen",
- 	"changes": "Änderungen",
-+<<<<<<< .our
- 	"commitMessageCountdown": "{0} Zeichen in der aktuellen Zeile verbleibend",
- 	"commitMessageWarning": "{0} Zeichen über {1} in der aktuellen Zeile",
-+=======
-+	"ok": "OK",
-+>>>>>>> .their
- 	"neveragain": "Nicht mehr anzeigen",
- 	"huge": "Das Git-Repository unter {0} umfasst zu viele aktive Änderungen. Nur ein Teil der Git-Features wird aktiviert."
- }
-\ No newline at end of file
-changed in both
-  base   100644 de4d841dd213285f434ae56f6ed42a2d3e3eeed7 i18n/deu/extensions/git/package.i18n.json
-  our    100644 70e0819e8ad95e53d1958520356a5b59f85a5e7c i18n/deu/extensions/git/package.i18n.json
-  their  100644 f2ecf9579370ca60e3fd970aee942cfce87cf477 i18n/deu/extensions/git/package.i18n.json
-added in both
-  our    100644 cdebacc88dbcf9d9afaa3a97d1e65074370aba3b i18n/deu/extensions/typescript/out/commands.i18n.json
-  their  100644 abb5c164718f4e5685e81d8bd48e588149556961 i18n/deu/extensions/typescript/out/commands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -13,4 +14,20 @@
- 	"typescript.noJavaScriptProjectConfig": "Datei ist nicht Teil eines JavaScript-Projekt. Klicken Sie [hier]({0}), um mehr zu erfahren.",
- 	"typescript.configureTsconfigQuickPick": "tsconfig.json konfigurieren",
- 	"typescript.configureJsconfigQuickPick": "jsconfig.json konfigurieren"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"typescript.projectConfigNoWorkspace": "Öffnen Sie einen Ordner in VS Code, um ein TypeScript- oder JavaScript-Projekt zu verwenden.",
-+	"typescript.projectConfigUnsupportedFile": "TypeScript- oder JavaScript-Projekt konnte nicht ermittelt werden. Nicht unterstützter Dateityp.",
-+	"typescript.projectConfigCouldNotGetInfo": "TypeScript- oder JavaScript-Projekt konnte nicht ermittelt werden.",
-+	"typescript.noTypeScriptProjectConfig": "Datei ist nicht Teil eines TypeScript-Projekts.",
-+	"typescript.noJavaScriptProjectConfig": "Datei ist nicht Teil eines JavaScript-Projekts.",
-+	"typescript.configureTsconfigQuickPick": "tsconfig.json konfigurieren",
-+	"typescript.configureJsconfigQuickPick": "jsconfig.json konfigurieren",
-+	"typescript.projectConfigLearnMore": "Weitere Informationen"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 750d811d866eaa3d43818bd1d8e28c9898acf514 i18n/deu/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-  their  100644 ed15423097d5cbb03aeb8c474db3877ca0d1584f i18n/deu/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"selectAriaOption": "{0}"
- }
-\ No newline at end of file
-added in both
-  our    100644 6cb929906482e56a542bad412001991e4554c641 i18n/deu/src/vs/base/node/ps.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/deu/src/vs/base/node/ps.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"collecting": "Sammeln von CPU- und Speicherinformationen. Dies kann einige Sekunden dauern."
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 42d65e250ff2d0d7ecb26879d1548e9dd2a4fbd0 i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 0cb95fccc47d309d94aacd1e25b0718fd455d527 i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 3bd907833f1a18864b55fd7d0409f427ef543676 i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -16,7 +16,11 @@
- 	"lineNumbers.on": "Zeilennummern werden als absolute Zahl dargestellt.",
- 	"lineNumbers.relative": "Zeilennummern werden als Abstand in Zeilen an Cursorposition dargestellt.",
- 	"lineNumbers.interval": "Zeilennummern werden alle 10 Zeilen dargestellt.",
-+<<<<<<< .our
- 	"lineNumbers": "Steuert die Anzeige von Zeilennummern.",
-+=======
-+	"lineNumbers": "Steuert die Anzeige von Zeilennummern. Mögliche Werte sind \"on\", \"off\", \"relative\" und \"interval\".",
-+>>>>>>> .their
- 	"rulers": "Vertikale Linien nach einer bestimmten Anzahl von Monospace Zeichen zeichnen. Verwenden Sie mehrere Werte für mehrere Linien. Keine Linie wird gezeichnet, wenn das Array leer ist.",
- 	"wordSeparators": "Zeichen, die als Worttrennzeichen verwendet werden, wenn wortbezogene Navigationen oder Vorgänge ausgeführt werden.",
- 	"tabSize": "Die Anzahl der Leerzeichen, denen ein Tabstopp entspricht. Diese Einstellung wird basierend auf dem Inhalt der Datei überschrieben, wenn \"editor.detectIndentation\" aktiviert ist.",
-changed in both
-  base   100644 fa37f670425bf1fa26d424baca2aa885fd889088 i18n/deu/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 7bcd160f251f75f4318d89da439565bbd4c696e5 i18n/deu/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 512b68939183ef1357f32a2d4fc55535aeea45f6 i18n/deu/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -8,8 +8,11 @@
- 	],
- 	"lineHighlight": "Hintergrundfarbe zur Hervorhebung der Zeile an der Cursorposition.",
- 	"lineHighlightBorderBox": "Hintergrundfarbe für den Rahmen um die Zeile an der Cursorposition.",
-+<<<<<<< .our
- 	"rangeHighlight": "Hintergrundfarbe hervorgehobener Bereiche, beispielsweise durch Features wie Quick Open und Suche. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen. ",
- 	"rangeHighlightBorder": "Hintergrundfarbe für den Rahmen um hervorgehobene Bereiche.",
-+=======
-+>>>>>>> .their
- 	"caret": "Farbe des Cursors im Editor.",
- 	"editorCursorBackground": "Hintergrundfarbe vom Editor-Cursor. Erlaubt die Anpassung der Farbe von einem Zeichen, welches von einem Block-Cursor überdeckt wird.",
- 	"editorWhitespaces": "Farbe der Leerzeichen im Editor.",
-changed in both
-  base   100644 02553773e89a405c3313536c028171aefb241d53 i18n/deu/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  our    100644 1bf59098e6bb675310a58bc407214801197d5f27 i18n/deu/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  their  100644 cc799cdb63a2a13e72c96b26bea3db59e7eac659 i18n/deu/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -10,4 +11,11 @@
- 	"markerAction.previous.label": "Gehe zu vorigem Problem (Fehler, Warnung, Information)",
- 	"markerAction.nextInFiles.label": "Gehe zu dem nächsten Problem in den Dateien (Fehler, Warnung, Info) ",
- 	"markerAction.previousInFiles.label": "Gehe zu dem vorherigen Problem in den Dateien (Fehler, Warnung, Info) "
-+=======
-+	"title.wo_source": "({0}/{1})",
-+	"editorMarkerNavigationError": "Editormarkierung: Farbe bei Fehler des Navigationswidgets.",
-+	"editorMarkerNavigationWarning": "Editormarkierung: Farbe bei Warnung des Navigationswidgets.",
-+	"editorMarkerNavigationInfo": "Editormarkierung: Farbe bei Warnung des Navigationswidgets.",
-+	"editorMarkerNavigationBackground": "Editormarkierung: Hintergrund des Navigationswidgets."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d706ff2e9b2d0d291ab89967a844b41798e381a1 i18n/deu/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  our    100644 d79e05a3c241c5572a0749df3f61a43a014dac07 i18n/deu/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  their  100644 f6176a5826f065dcf365fdb84143e934ffa33dbc i18n/deu/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,10 @@
- 	"wordHighlightStrongBorder": "Randfarbe eines Symbols beim Schreibzugriff, wie etwa beim Schreiben einer Variablen.",
- 	"overviewRulerWordHighlightForeground": "Übersichtslineal-Markierungsfarbe für Symbolhervorhebungen. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen.",
- 	"overviewRulerWordHighlightStrongForeground": "Übersichtslineal-Markierungsfarbe für Schreibzugriffs-Symbolhervorhebungen. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen.",
-+=======
-+	"overviewRulerWordHighlightForeground": "Übersichtslineal-Markierungsfarbe für Symbolhervorhebungen.",
-+	"overviewRulerWordHighlightStrongForeground": "Übersichtslineal-Markierungsfarbe für Schreibzugriffs-Symbolhervorhebungen.",
-+>>>>>>> .their
- 	"wordHighlight.next.label": "Gehe zur nächsten Symbolhervorhebungen",
- 	"wordHighlight.previous.label": "Gehe zur vorherigen Symbolhervorhebungen"
- }
-\ No newline at end of file
-changed in both
-  base   100644 5cd50df300ac1d988c35e6b77263b3e60c6bd44a i18n/deu/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  our    100644 5dc1bba0ffa0332aada387afdb06b43754a7fefe i18n/deu/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  their  100644 30e3fed7ba6288d01c3c98f0722023352fbd6653 i18n/deu/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 e990ea9bf1ec2df4a4d7c3a0db611fe7436aa236 i18n/deu/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 f6bdb0310262230d9fd3311d63fcfc0ae9c687d8 i18n/deu/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 973f6daca81c52d8e267d1ce880900e8bfa61263 i18n/deu/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,11 +10,19 @@
- 	"diff": "Vergleicht zwei Dateien.",
- 	"add": "Fügt einen oder mehrere Ordner zum letzten aktiven Fenster hinzu.",
- 	"goto": "Öffnet eine Datei im Pfad in der angegebenen Zeile und an der Zeichenposition.",
-+<<<<<<< .our
- 	"newWindow": "Öffnen eines neuen Fensters erzwingen.",
- 	"reuseWindow": "Öffnen einer Datei oder eines Ordners im letzten aktiven Fenster erzwingen.",
- 	"wait": "Warten Sie, bis die Dateien geschlossen sind, bevor Sie zurück gehen können.",
- 	"locale": "Das zu verwendende Gebietsschema (z. B. en-US oder zh-TW).",
- 	"userDataDir": "Gibt das Verzeichnis an, in dem Benutzerdaten gespeichert werden. Kann zum Öffnen mehrerer verschiedener Codeinstanzen verwendet werden.",
-+=======
-+	"newWindow": "Erzwingt eine neue Instanz des Codes.",
-+	"reuseWindow": "Erzwingt das Öffnen einer Datei oder eines Ordners im letzten aktiven Fenster.",
-+	"wait": "Warten Sie, bis die Dateien geschlossen sind, bevor Sie zurück gehen können.",
-+	"locale": "Das zu verwendende Gebietsschema (z. B. en-US oder zh-TW).",
-+	"userDataDir": "Gibt das Verzeichnis an, in dem Benutzerdaten gespeichert werden. Nützlich, wenn die Ausführung als \"root\" erfolgt.",
-+>>>>>>> .their
- 	"version": "Gibt die Version aus.",
- 	"help": "Gibt die Syntax aus.",
- 	"extensionHomePath": "Legen Sie den Stammpfad für Extensions fest.",
-@@ -29,11 +37,17 @@
- 	"performance": "Startet mit aktiviertem Befehl \"Developer: Startup Performance\".",
- 	"prof-startup": "CPU-Profiler beim Start ausführen",
- 	"disableExtensions": "Deaktiviert alle installierten Extensions.",
-+<<<<<<< .our
- 	"inspect-extensions": "Erlaubt Debuggen und Profilerstellung für Erweiterungen. Überprüfen Sie die Entwicklertools für die Verbindungs-URI.",
- 	"inspect-brk-extensions": "Erlaubt Debuggen und Profilerstellung für Erweiterungen, wobei der Erweiterungs-Host nach dem Start angehalten wird. Überprüfen Sie die Entwicklertools für die Verbindungs-URI.",
- 	"disableGPU": "Deaktiviert die GPU-Hardwarebeschleunigung.",
- 	"uploadLogs": "Lädt die Logs der aktuellen Sitzung an einem sicheren Endpunkt hoch.",
- 	"maxMemory": "Maximale Speichergröße für ein Fenster (in Mbyte).",
-+=======
-+	"inspect-extensions": "Erlaubt Debugging und Profiling für Erweiterungen. Überprüfen Sie die Entwicklertools für die Verbindungs-URI.",
-+	"inspect-brk-extensions": "Erlaubt Debugging und Profiling für Erweiterungen, wobei der Erweiterungs-Host nach dem Starten pausiert wird. Überprüfen Sie die Entwicklertools für die Verbindungs-URI.",
-+	"disableGPU": "Deaktiviert die GPU-Hardwarebeschleunigung.",
-+>>>>>>> .their
- 	"usage": "Verwendung",
- 	"options": "Optionen",
- 	"paths": "Pfade",
-changed in both
-  base   100644 256756a3fdd26e6ea0b4cb814e8b8026cff0adc7 i18n/deu/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 efdaa6c50b1a7075eb309307a09334b8e64087d3 i18n/deu/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 503ec4aa8a3fdf7a6ab3bfaaf2395b1f9cb3a24a i18n/deu/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -7,11 +7,15 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"invalidManifest": "Die Erweiterung ist ungültig: \"package.json\" ist keine JSON-Datei.",
-+<<<<<<< .our
- 	"incompatible": "Die Erweiterung \"{0}\" kann nicht installiert werden, die sie nicht mit dem Code \"{1}\" kompatibel ist.",
-+=======
-+>>>>>>> .their
- 	"restartCode": "Bitte starten Sie Code vor der Neuinstallation von {0} neu.",
- 	"installingOutdatedExtension": "Eine neuere Version dieser Erweiterung ist bereits installiert. Möchten Sie diese mit der älteren Version überschreiben?",
- 	"override": "Überschreiben",
- 	"cancel": "Abbrechen",
-+<<<<<<< .our
- 	"errorInstallingDependencies": "Fehler während Installation der Abhängigkeiten. {0}",
- 	"MarketPlaceDisabled": "Marketplace ist nicht aktiviert.",
- 	"removeError": "Fehler beim Entfernen der Erweiterung: {0}. Bitte beenden Sie und starten Sie VS Code neu bevor Sie erneut versuchen die Erweiterung zu installieren.",
-@@ -22,6 +26,12 @@
- 	"quitCode": "Fehler bei der Installation der Erweiterung. Beenden und starten Sie VS Code vor der erneuten Installation neu.",
- 	"exitCode": "Fehler bei der Installation der Erweiterung. Beenden und starten Sie VS Code vor der erneuten Installation neu.",
- 	"renameError": "Unbekannter Fehler beim Umbenennen von {0} in {1}",
-+=======
-+	"notFoundCompatible": "'{0}' kann nicht installiert werden: Es gibt keine mit VS Code '{1}' kompatible Version.",
-+	"notFoundCompatibleDependency": "Kann nicht installiert werden, da die abhängige Erweiterung '{0}', die mit der aktuellen VS Code Version '{1}' kompatibel ist, nicht gefunden werden kann. ",
-+	"quitCode": "Fehler bei der Installation der Erweiterung. Beenden und starten Sie VS Code vor der erneuten Installation neu.",
-+	"exitCode": "Fehler bei der Installation der Erweiterung. Beenden und starten Sie VS Code vor der erneuten Installation neu.",
-+>>>>>>> .their
- 	"uninstallDependeciesConfirmation": "Möchten Sie nur \"{0}\" oder auch die zugehörigen Abhängigkeiten deinstallieren?",
- 	"uninstallOnly": "Nur Erweiterung",
- 	"uninstallAll": "Alle deinstallieren",
-changed in both
-  base   100644 f4286f9eb7869d09d49755b2fdeaace2a172da5a i18n/deu/src/vs/platform/message/common/message.i18n.json
-  our    100644 f09fe4a631bf21973c3d242d650d3131ae314755 i18n/deu/src/vs/platform/message/common/message.i18n.json
-  their  100644 774ad662835630d27b879b1848bf72cd90c19201 i18n/deu/src/vs/platform/message/common/message.i18n.json
-changed in both
-  base   100644 937855710852497edd351ef5072275dfd928a600 i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 b32f03c31fd5ffcb9742f2b1188daade81a7b028 i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 38654cc79857a94beb2dc0dc1fa17bdf0c013413 i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -68,6 +68,7 @@
- 	"editorWidgetBorder": "Rahmenfarbe von Editorwigdets. Die Farbe wird nur verwendet, wenn für das Widget ein Rahmen verwendet wird und die Farbe nicht von einem Widget überschrieben wird.",
- 	"editorSelectionBackground": "Farbe der Editor-Auswahl.",
- 	"editorSelectionForeground": "Farbe des gewählten Text für einen hohen Kontrast",
-+<<<<<<< .our
- 	"editorInactiveSelection": "Farbe der Auswahl in einem inaktiven Editor. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen. ",
- 	"editorSelectionHighlight": "Farbe für Bereiche, deren Inhalt der Auswahl entspricht. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen.",
- 	"editorSelectionHighlightBorder": "Randfarbe für Bereiche, deren Inhalt der Auswahl entspricht.",
-@@ -79,6 +80,9 @@
- 	"findRangeHighlightBorder": "Rahmenfarbe des Bereichs zur Einschränkung der Suche. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen.",
- 	"findWidgetResizeBorder": "Rahmenfarbe der Größenänderungsleiste im Suchwidget.",
- 	"hoverHighlight": "Hervorhebung eines Worts, unter dem ein Mauszeiger angezeigt wird. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen. ",
-+=======
-+	"editorFindMatch": "Farbe des aktuellen Suchergebnisses.",
-+>>>>>>> .their
- 	"hoverBackground": "Background color of the editor hover.",
- 	"hoverBorder": "Rahmenfarbe des Editor-Mauszeigers.",
- 	"activeLinkForeground": "Farbe der aktiven Links.",
-@@ -86,12 +90,15 @@
- 	"diffEditorRemoved": "Hintergrundfarbe für entfernten Text. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen. ",
- 	"diffEditorInsertedOutline": "Konturfarbe für eingefügten Text.",
- 	"diffEditorRemovedOutline": "Konturfarbe für entfernten Text.",
-+<<<<<<< .our
- 	"mergeCurrentHeaderBackground": "Aktueller Kopfzeilenhintergrund in Inline-Mergingkonflikten. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen.",
- 	"mergeCurrentContentBackground": "Aktueller Inhaltshintergrund in Inline-Mergingkonflikten. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen. ",
- 	"mergeIncomingHeaderBackground": "Hintergrund für eingehende Kopfzeile in Inline-Mergingkonflikten. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen. ",
- 	"mergeIncomingContentBackground": "Hintergrund für eingehenden Inhalt in Inline-Mergingkonflikten. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen. ",
- 	"mergeCommonHeaderBackground": "Inhaltshintergrund des gemeinsamen übergeordneten Elements bei Inline-Mergingkonflikten. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen.",
- 	"mergeCommonContentBackground": "Inhaltshintergrund des gemeinsamen übergeordneten Elements bei Inline-Mergingkonflikten. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen.",
-+=======
-+>>>>>>> .their
- 	"mergeBorder": "Rahmenfarbe für Kopfzeilen und die Aufteilung in Inline-Mergingkonflikten.",
- 	"overviewRulerCurrentContentForeground": "Aktueller Übersichtslineal-Vordergrund für Inline-Mergingkonflikte.",
- 	"overviewRulerIncomingContentForeground": "Eingehender Übersichtslineal-Vordergrund für Inline-Mergingkonflikte. ",
-added in both
-  our    100644 75b2994052291390999698977515572a80141a18 i18n/deu/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/deu/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,4 +11,12 @@
- 	"codeActionsOnSave.didTimeout": "codeActionsOnSave nach {0} ms abgebrochen",
- 	"timeout.onWillSave": "Bei onWillSaveTextDocument-Ereignis nach 1750 ms abgebrochen",
- 	"saveParticipants": "Speichern von Teilnehmern wird ausgeführt …"
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 76a366889135ebe861e46bed9044b6cbf74a402c i18n/deu/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  our    100644 411898837318f5e7088a5861f163c76ed4ae6164 i18n/deu/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  their  100644 d76ac6f164225adb657cd9ec520b46b15b30aa6e i18n/deu/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,7 @@
- 	],
- 	"treeView.notRegistered": "Kein Treeviw mit der id '{0}' registriert.",
- 	"treeView.duplicateElement": "Das Element mit der ID {0} ist bereits registriert"
-+=======
-+	"treeView.notRegistered": "Kein Treeviw mit der id '{0}' registriert."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 174408464b67a407711ee70819030ddfca4e3f16 i18n/deu/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 108a8fac6be8b55e95f04920e7eb7dd21d592b50 i18n/deu/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 79911f9a8b9ee1c996abcffe5dc791404280d776 i18n/deu/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -15,5 +15,9 @@
- 	"saveWorkspace": "Arbeitsbereich speichern",
- 	"openWorkspaceAction": "Arbeitsbereich öffnen...",
- 	"openWorkspaceConfigFile": "Konfigurationsdatei des Arbeitsbereichs öffnen",
-+<<<<<<< .our
- 	"duplicateWorkspaceInNewWindow": "Duplikat des Arbeitsbereichs in neuem Fenster erstellen"
-+=======
-+	"openFolderAsWorkspaceInNewWindow": "Ordner als Arbeitsbereich in neuem Fenster öffnen"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 09731afa67ad9ee74f589e136aaa2f159c6d7e92 i18n/deu/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-  their  100644 60a543c8bbac1628418f8eebce1a2cd6e75442e2 i18n/deu/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"addFolderToWorkspace": "Ordner zum Arbeitsbereich hinzufügen...",
- 	"add": "&&Hinzufügen",
- 	"addFolderToWorkspaceTitle": "Ordner zum Arbeitsbereich hinzufügen",
-changed in both
-  base   100644 0812b9299a43455786b39be7b02c2ddbea206893 i18n/deu/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  our    100644 12e4c96abba0bc9f3237a988e8c2b28fd6bc23a7 i18n/deu/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  their  100644 95de712113ef0e23b7d39e569416e4fa9ccb81d0 i18n/deu/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-@@ -19,6 +19,7 @@
- 	"close": "Schließen",
- 	"closeOthers": "Andere schließen",
- 	"closeRight": "Rechts schließen",
-+<<<<<<< .our
- 	"closeAllSaved": "Gespeicherte schließen",
- 	"closeAll": "Alle schließen",
- 	"keepOpen": "Geöffnet lassen",
-@@ -27,6 +28,15 @@
- 	"keepEditor": "Editor beibehalten",
- 	"closeEditorsInGroup": "Alle Editoren in der Gruppe schließen",
- 	"closeSavedEditors": "Gespeicherte Editoren in Gruppe schließen",
-+=======
-+	"closeAllUnmodified": "Nicht geänderte schließen",
-+	"closeAll": "Alle schließen",
-+	"keepOpen": "Geöffnet lassen",
-+	"showOpenedEditors": "Geöffnete Editoren anzeigen",
-+	"keepEditor": "Editor beibehalten",
-+	"closeEditorsInGroup": "Alle Editoren in der Gruppe schließen",
-+	"closeUnmodifiedEditors": "Nicht geänderte Editoren in der Gruppe schließen",
-+>>>>>>> .their
- 	"closeOtherEditors": "Andere Editoren schließen",
- 	"closeRightEditors": "Editoren rechts schließen"
- }
-\ No newline at end of file
-changed in both
-  base   100644 eea7eefe298809c96a2e0fdf585166c2c427a0bd i18n/deu/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 bfd72770d07a936659f4d75458f1721e0e96ed8a i18n/deu/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 f94ad3ec09a068198b31cc459d02c48a9cb56268 i18n/deu/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 2b4ef55801bd9bec491371c61147fb773e0b36d2 i18n/deu/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  our    100644 ad42a8f37c9ae280a7cad2c863b690a8d39222a1 i18n/deu/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  their  100644 9080d3ad0fbaf717291fb87c00904012ca17b9e2 i18n/deu/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-changed in both
-  base   100644 f5bb0f973969973c267c026a7099104710b90242 i18n/deu/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  our    100644 66a620287b3ee4b1a14687e084425f394a8e24cf i18n/deu/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  their  100644 c46090d74198329a772e41f10e29044d90300a43 i18n/deu/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-changed in both
-  base   100644 33a0388a6478433a7033bb97b4ab59c52e4111a2 i18n/deu/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  our    100644 6054596bd29084288d548fe3228ad8b8077164e4 i18n/deu/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  their  100644 4b868884b773a0500e57a510c453dd1c68bb43b7 i18n/deu/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"close": "Schließen",
-+>>>>>>> .their
- 	"araLabelEditorActions": "Editor-Aktionen"
- }
-\ No newline at end of file
-changed in both
-  base   100644 5618ae8213a77ab8ef13c4fbea5b7bad40ddd12e i18n/deu/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
-  our    100644 f4bb553343ecdf29a6f6cc1bab49b2620fd1a1b3 i18n/deu/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
-  their  100644 4697a7de886b4e7b622b78c456d02605b65a925e i18n/deu/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
-changed in both
-  base   100644 4336f732bee2d7e45a60d66f703e0d7095b9626a i18n/deu/src/vs/workbench/common/theme.i18n.json
-  our    100644 7230e04365d13635c1ebe9cad1ed0f92866146cc i18n/deu/src/vs/workbench/common/theme.i18n.json
-  their  100644 56819e7b1df16ba1e42a1243bb6b021a88be5a88 i18n/deu/src/vs/workbench/common/theme.i18n.json
-@@ -11,10 +11,15 @@
- 	"tabHoverBackground": "Hintergrundfarbe der Registerkarte beim Daraufzeigen. Registerkarten sind die Container für Editoren im Editorbereich. In einer Editorgruppe können mehrere Registerkarten geöffnet werden. Mehrere Editorgruppen können vorhanden sein.",
- 	"tabUnfocusedHoverBackground": "Hintergrundfarbe für Registerkarten in einer unfokussierten Gruppe beim Daraufzeigen. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.",
- 	"tabBorder": "Rahmen zum Trennen von Registerkarten. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.",
-+<<<<<<< .our
- 	"tabActiveBorder": "Rahmen am unteren Rand einer aktiven Registerkarte. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.",
- 	"tabActiveBorderTop": "Rahmen am oberen Rand einer aktiven Registerkarte. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.",
- 	"tabActiveUnfocusedBorder": "Rahmen am unteren Rand einer aktiven Registerkarte in einer unfokussierten Gruppe. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.",
- 	"tabActiveUnfocusedBorderTop": "Rahmen am oberen Rand einer aktiven Registerkarte in einer unfokussierten Gruppe. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.",
-+=======
-+	"tabActiveBorder": "Rahmen zum Hervorheben aktiver Registerkarten. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.",
-+	"tabActiveUnfocusedBorder": "Rahmen zum Hervorheben aktiver Registerkarten in einer unfokussierten Gruppe. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.",
-+>>>>>>> .their
- 	"tabHoverBorder": "Rahmen zum Hervorheben von Registerkarten beim Daraufzeigen. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.",
- 	"tabUnfocusedHoverBorder": "Rahmen zum Hervorheben von Registerkarten in einer unfokussierten Gruppe beim Daraufzeigen. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.",
- 	"tabActiveForeground": "Vordergrundfarbe der aktiven Registerkarte in einer aktiven Gruppe. Registerkarten sind die Container für Editors im Editorbereich. In einer Editorgruppe können mehrere Registerkarten geöffnet werden. Mehrere Editorgruppen können vorhanden sein.",
-@@ -41,8 +46,11 @@
- 	"statusBarNoFolderBorder": "Rahmenfarbe der Statusleiste zur Abtrennung von der Randleiste und dem Editor, wenn kein Ordner geöffnet ist. Die Statusleiste wird unten im Fenster angezeigt.",
- 	"statusBarItemActiveBackground": "Hintergrundfarbe für Statusleistenelemente beim Klicken. Die Statusleiste wird am unteren Rand des Fensters angezeigt.",
- 	"statusBarItemHoverBackground": "Hintergrundfarbe der Statusleistenelemente beim Daraufzeigen. Die Statusleiste wird am unteren Seitenrand angezeigt.",
-+<<<<<<< .our
- 	"statusBarProminentItemBackground": "Hintergrundfarbe für markante Elemente der Statusleiste. Markante Elemente sind im Vergleich zu anderen Statusleisteneinträgen hervorgehoben, um auf ihre Bedeutung hinzuweisen. Ändern Sie den Modus mithilfe von \"TAB-Umschalttaste verschiebt Fokus\" auf der Befehlspalette, um ein Beispiel anzuzeigen. Die Statusleiste wird unten im Fenster angezeigt.",
- 	"statusBarProminentItemHoverBackground": "Hintergrundfarbe für markante Elemente der Statusleiste, wenn auf diese gezeigt wird. Markante Elemente sind im Vergleich zu anderen Statusleisteneinträgen hervorgehoben, um auf ihre Bedeutung hinzuweisen. Ändern Sie den Modus mithilfe von \"TAB-Umschalttaste verschiebt Fokus\" auf der Befehlspalette, um ein Beispiel anzuzeigen. Die Statusleiste wird unten im Fenster angezeigt.",
-+=======
-+>>>>>>> .their
- 	"activityBarBackground": "Hintergrundfarbe der Aktivitätsleiste. Die Aktivitätsleiste wird ganz links oder rechts angezeigt und ermöglicht das Wechseln zwischen verschiedenen Ansichten der Seitenleiste.",
- 	"activityBarForeground": "Vordergrundfarbe der Aktivitätsleiste (z. B. für Symbole). Die Aktivitätsleiste wird ganz links oder rechts angezeigt und ermöglicht das Wechseln zwischen verschiedenen Ansichten der Seitenleiste.",
- 	"activityBarBorder": "Rahmenfarbe der Aktivitätsleiste für die Abtrennung von der Seitenleiste. Die Aktivitätsleiste wird ganz links oder rechts angezeigt und ermöglicht das Wechseln zwischen verschiedenen Ansichten der Seitenleiste.",
-added in both
-  our    100644 53cde5ce48767baccff87423ee7d359da429d7e8 i18n/deu/src/vs/workbench/common/views.i18n.json
-  their  100644 a36d97eb0e0703c97ad14755ae71577eaf5e6789 i18n/deu/src/vs/workbench/common/views.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"duplicateId": "Eine Ansicht mit der ID \"{0}\" ist bereits am Speicherort \"{1}\" registriert."
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"duplicateId": "Eine Ansicht mit der ID \"{0}\" ist am Speicherort \"{1}\" bereits registriert."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7331216a594d4acf61cbf610077b089d1f6fe5e2 i18n/deu/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 1609e7c92719c7aa89402c8bf0018971f9a1043e i18n/deu/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 4f7255a9d9157dd3852b225b3f473bfbf618f435 i18n/deu/src/vs/workbench/electron-browser/actions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"closeWindow": "Fenster schließen",
- 	"closeWorkspace": "Arbeitsbereich schließen",
- 	"noWorkspaceOpened": "Zurzeit ist kein Arbeitsbereich in dieser Instanz geöffnet, der geschlossen werden kann.",
-@@ -50,6 +53,14 @@
- 	"moveWindowTabToNewWindow": "Fensterregisterkarte in neues Fenster verschieben",
- 	"mergeAllWindowTabs": "Alle Fenster zusammenführen",
- 	"toggleWindowTabsBar": "Fensterregisterkarten-Leiste umschalten",
-+<<<<<<< .our
- 	"about": "Informationen zu {0}",
- 	"inspect context keys": "Kontextschlüssel prüfen"
-+=======
-+	"configureLocale": "Sprache konfigurieren",
-+	"displayLanguage": "Definiert die Anzeigesprache von VSCode.",
-+	"doc": "Unter {0} finden Sie eine Liste der unterstützten Sprachen.",
-+	"restart": "Das Ändern dieses Wertes erfordert einen Neustart von VSCode.",
-+	"fail.createSettings": "{0} ({1}) kann nicht erstellt werden."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 2a2af0f320b0f5411da37030fef16436d5a0c6f6 i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 fc92fd392259fb9b2d1dec1cecdbc3c76bdc7440 i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 aba53ab9214081804a7d45f78cf889841be349f3 i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,12 +35,19 @@
- 	"panelDefaultLocation": "Steuert die Standardposition des Panels. Dieses kann entweder unterhalb oder rechts von der Workbench angezeigt werden.",
- 	"statusBarVisibility": "Steuert die Sichtbarkeit der Statusleiste im unteren Bereich der Workbench.",
- 	"activityBarVisibility": "Steuert die Sichtbarkeit der Aktivitätsleiste in der Workbench.",
-+<<<<<<< .our
- 	"viewVisibility": "Steuert die Sichtbarkeit von Headeraktionen. Headeraktionen können immer sichtbar sein oder nur sichtbar sein, wenn diese Ansicht fokussiert ist oder mit der Maus darauf gezeigt wird.",
- 	"fontAliasing": "Steuert die Schriftartaliasingmethode in der Workbench.\n - default: Subpixel-Schriftartglättung. Auf den meisten Nicht-Retina-Displays wird Text bei dieser Einstellung am schärfsten dargestellt. \n- antialiased: Glättet die Schriftart auf der Pixelebene (im Gegensatz zur Subpixelebene). Bei dieser Einstellung kann die Schriftart insgesamt heller wirken.\n- none: Deaktiviert die Schriftartglättung. Text wird mit gezackten scharfen Kanten dargestellt.\n- auto: Wendet ausgehend vom DPI der Anzeige automatisch \"default\" oder \"antialiased\" an.",
- 	"workbench.fontAliasing.default": "Subpixel-Schriftartglättung. Auf den meisten Nicht-Retina-Displays wird Text bei dieser Einstellung am schärfsten dargestellt.",
- 	"workbench.fontAliasing.antialiased": "Glättet die Schriftart auf der Pixelebene (im Gegensatz zur Subpixelebene). Bei dieser Einstellung kann die Schriftart insgesamt heller wirken.",
- 	"workbench.fontAliasing.none": "Deaktiviert die Schriftartglättung. Text wird mit gezackten scharfen Kanten dargestellt.",
- 	"workbench.fontAliasing.auto": "Wendet ausgehend vom DPI der Anzeige automatisch \"default\" oder \"antialiased\" an.",
-+=======
-+	"fontAliasing": "Steuert die Schriftartaliasingmethode in der Workbench.\n- default: Subpixel-Schriftartglättung. Auf den meisten Nicht-Retina-Displays wird Text bei dieser Einstellung am schärfsten dargestellt.\n- antialiased: Glättet die Schriftart auf der Pixelebene (im Gegensatz zur Subpixelebene). Bei dieser Einstellung kann die Schriftart insgesamt heller wirken.\n- none: Deaktiviert die Schriftartglättung. Text wird mit gezackten scharfen Kanten dargestellt.\n",
-+	"workbench.fontAliasing.default": "Subpixel-Schriftartglättung. Auf den meisten Nicht-Retina-Displays wird Text bei dieser Einstellung am schärfsten dargestellt.",
-+	"workbench.fontAliasing.antialiased": "Glättet die Schriftart auf der Pixelebene (im Gegensatz zur Subpixelebene). Bei dieser Einstellung kann die Schriftart insgesamt heller wirken.",
-+	"workbench.fontAliasing.none": "Deaktiviert die Schriftartglättung. Text wird mit gezackten scharfen Kanten dargestellt.",
-+>>>>>>> .their
- 	"enableNaturalLanguageSettingsSearch": "Steuert, ob der Suchmodus mit natürlicher Sprache für die Einstellungen aktiviert werden soll.",
- 	"windowConfigurationTitle": "Fenster",
- 	"window.openFilesInNewWindow.on": "Dateien werden in einem neuen Fenster geöffnet.",
-changed in both
-  base   100644 dac54eb81af521a636bd69231e013783a6901dbf i18n/deu/src/vs/workbench/electron-browser/window.i18n.json
-  our    100644 4c4d3d858c118a5c816610f7b78e3f49ca6d0d66 i18n/deu/src/vs/workbench/electron-browser/window.i18n.json
-  their  100644 ea9b198df1d9f06916293a2e80b74806176a900e i18n/deu/src/vs/workbench/electron-browser/window.i18n.json
-changed in both
-  base   100644 e3b17702d867e09ffd60ef890b7f3269e684a5b9 i18n/deu/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
-  our    100644 8ec09261787690fad6c9e403fa27279193845448 i18n/deu/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
-  their  100644 adbe0beedd641f0a86e8a0398fcf959d19dbd85c i18n/deu/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"debugToolBarBackground": "Hintergrundfarbe der Debug-Symbolleiste.",
- 	"debugToolBarBorder": "Rahmenfarbe der Debug-Symbolleiste."
- }
-\ No newline at end of file
-changed in both
-  base   100644 3352485c42bc53f3de895daab547f0617fd3fdee i18n/deu/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  our    100644 6d4ddb2489811e2ef60298e7cf30a51a4d1d0b3f i18n/deu/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  their  100644 23af77e5fa7953dba64babcbb70111ced4c4a8e8 i18n/deu/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"debug.terminal.title": "Zu debuggende Komponente"
- }
-\ No newline at end of file
-changed in both
-  base   100644 0b10a0310640832c8a3915fac3d07fdb8efec6d2 i18n/deu/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  our    100644 ffcb91c35c3b84aa761f9cf48403d04cda0e5ae4 i18n/deu/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  their  100644 6e06fdbca612b0de6995f15ee04f685e2b977289 i18n/deu/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-changed in both
-  base   100644 9cde3634e7645260427694be43e17b2a038481a7 i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 5272d4afb1fdf32991cbacee03058c69d41ba9c7 i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 5da27da0751687f8c169b73268fead0283e1498f i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,11 @@
- 	"exeBasedRecommendation": "Diese Erweiterung wird empfohlen, da Sie {0} installiert haben.",
- 	"fileBasedRecommendation": "Ausgehend von den kürzlich geöffneten Dateien wird diese Erweiterung empfohlen.",
- 	"workspaceRecommendation": "Diese Erweiterung wird von Benutzern des aktuellen Arbeitsbereichs empfohlen.",
-+=======
-+	"workspaceRecommendation": "Diese Erweiterung wird von Benutzern des aktuellen Arbeitsbereichs empfohlen.",
-+	"fileBasedRecommendation": "Ausgehend von den kürzlich geöffneten Dateien wird diese Erweiterung empfohlen.",
-+	"exeBasedRecommendation": "Diese Erweiterung wird empfohlen, da Sie {0} installiert haben.",
-+>>>>>>> .their
- 	"reallyRecommended2": "Für diesen Dateityp wird die Erweiterung \"{0}\" empfohlen.",
- 	"reallyRecommendedExtensionPack": "Für diesen Dateityp wird das Erweiterungspaket \"{0}\" empfohlen.",
- 	"install": "Installieren",
-added in both
-  our    100644 9164d64820a6b949c16fe909991fa91b471f16c6 i18n/deu/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-  their  100644 b9d7e353c742f68c29783490f94e117bd8aca160 i18n/deu/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,13 @@
- 	],
- 	"workbenchConfigurationTitle": "Workbench",
- 	"feedbackVisibility": "Steuert die Sichtbarkeit des Twitter-Feedbacks (Smiley) in der Statusleiste am unteren Rand der Workbench."
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"workbenchConfigurationTitle": "Workbench"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 c4df282604643006e40a305e7c2305b303345b91 i18n/deu/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/deu/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"hide": "Ausblenden"
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 46de1e8541a805d4182b71abb75b9857226854c4 i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  our    100644 da62e80408d3ad02f6eb7c71f4a32236b4605b89 i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  their  100644 e8abcac28b77d4c425e180d1a4f6d7746a9cf392 i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-@@ -12,7 +12,10 @@
- 	"revertLocalChanges": "Änderungen verwerfen und Datenträgerinhalte wiederherstellen",
- 	"copyPathOfActive": "Pfad der aktiven Datei kopieren",
- 	"saveAllInGroup": "Alle in der Gruppe speichern",
-+<<<<<<< .our
- 	"saveFiles": "Alle Dateien speichern",
-+=======
-+>>>>>>> .their
- 	"revert": "Datei wiederherstellen",
- 	"compareActiveWithSaved": "Aktive Datei mit gespeicherter Datei vergleichen",
- 	"closeEditor": "Editor schließen",
-@@ -24,12 +27,19 @@
- 	"copyPath": "Pfad kopieren",
- 	"saveAll": "Alle speichern",
- 	"compareWithSaved": "Mit gespeicherter Datei vergleichen",
-+<<<<<<< .our
- 	"compareWithSelected": "Mit Auswahl vergleichen",
- 	"compareSource": "Für Vergleich auswählen",
- 	"compareSelected": "Auswahl vergleichen",
- 	"close": "Schließen",
- 	"closeOthers": "Andere schließen",
- 	"closeSaved": "Gespeicherte schließen",
-+=======
-+	"compareSource": "Für Vergleich auswählen",
-+	"close": "Schließen",
-+	"closeOthers": "Andere schließen",
-+	"closeUnmodified": "Nicht geänderte schließen",
-+>>>>>>> .their
- 	"closeAll": "Alle schließen",
- 	"deleteFile": "Endgültig löschen"
- }
-\ No newline at end of file
-changed in both
-  base   100644 4d300a15634e7f7f35e201fb8aa4decb601ebc72 i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 e5540f790640626d6989cde6c94da0327b708bbf i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 3e34e541dce56ab693f943bad8ae77844041321d i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"newFile": "Neue Datei",
- 	"newFolder": "Neuer Ordner",
- 	"rename": "Umbenennen",
-@@ -13,7 +16,11 @@
- 	"copyFile": "Kopieren",
- 	"pasteFile": "Einfügen",
- 	"retry": "Wiederholen",
-+<<<<<<< .our
- 	"renameWhenSourcePathIsParentOfTargetError": "Verwenden Sie den Befehl \"Neuer Ordner\" oder \"Neue Datei\", um untergeordnete Elemente zu einem vorhandenen Ordner hinzuzufügen",
-+=======
-+	"openFolderFirst": "Öffnet zuerst einen Ordner, in dem Dateien oder Ordner erstellt werden.",
-+>>>>>>> .their
- 	"newUntitledFile": "Neue unbenannte Datei",
- 	"createNewFile": "Neue Datei",
- 	"createNewFolder": "Neuer Ordner",
-@@ -43,11 +50,19 @@
- 	"confirmDeleteMessageMultiple": "Möchten Sie die folgenden {0} Dateien endgültig löschen?",
- 	"confirmDeleteMessageFolder": "Möchten Sie \"{0}\" samt Inhalt wirklich endgültig löschen?",
- 	"confirmDeleteMessageFile": "Möchten Sie \"{0}\" wirklich endgültig löschen?",
-+<<<<<<< .our
- 	"addFiles": "Dateien hinzufügen",
- 	"confirmOverwrite": "Im Zielordner ist bereits eine Datei oder ein Ordner mit dem gleichen Namen vorhanden. Möchten Sie sie bzw. ihn ersetzen?",
- 	"replaceButtonLabel": "&&Ersetzen",
- 	"fileIsAncestor": "Die einzufügende Datei ist ein Vorgänger des Zielordners",
- 	"fileDeleted": "Die einzufügende Datei wurde zwischenzeitlich gelöscht oder verschoben.",
-+=======
-+	"irreversible": "Diese Aktion kann nicht rückgängig gemacht werden.",
-+	"permDelete": "Endgültig löschen",
-+	"importFiles": "Dateien importieren",
-+	"confirmOverwrite": "Im Zielordner ist bereits eine Datei oder ein Ordner mit dem gleichen Namen vorhanden. Möchten Sie sie bzw. ihn ersetzen?",
-+	"replaceButtonLabel": "&&Ersetzen",
-+>>>>>>> .their
- 	"duplicateFile": "Duplikat",
- 	"globalCompareFile": "Aktive Datei vergleichen mit...",
- 	"openFileToCompare": "Zuerst eine Datei öffnen, um diese mit einer anderen Datei zu vergleichen",
-changed in both
-  base   100644 c248ffc568212a8ea0830b0b61cb393bcaab50e5 i18n/deu/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  our    100644 129fede53cc56e72cfb3d746b13864af45afebad i18n/deu/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  their  100644 216d652c91acca8c87253a5845c6f83f9343fa7a i18n/deu/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,12 +7,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"revealInWindows": "Im Explorer anzeigen",
- 	"revealInMac": "Im Finder anzeigen",
- 	"openContainer": "Enthaltenden Ordner öffnen",
- 	"saveAs": "Speichern unter...",
- 	"save": "Speichern",
- 	"saveAll": "Alle speichern",
-+<<<<<<< .our
-+=======
-+	"saveFiles": "Alle Dateien speichern",
-+>>>>>>> .their
- 	"removeFolderFromWorkspace": "Ordner aus dem Arbeitsbereich entfernen",
- 	"genericRevertError": "Fehler beim Zurücksetzen von '{0}': {1}",
- 	"modifiedLabel": "{0} (auf Datenträger) ↔ {1}",
-changed in both
-  base   100644 00a2164ceaa6feb9c7573ae407355c84d09fbc3c i18n/deu/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 99f2be77fbb56221d4c3c1cc8f45e6884be7fd7a i18n/deu/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 2ddf50e3ffccf3b546c44b4c3b88f8f6cb9d54df i18n/deu/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-@@ -40,7 +40,10 @@
- 	"formatOnSave": "Hiermit wird eine Datei beim Speichern formatiert. Es muss ein Formatierer vorhanden sein, die Datei darf nicht automatisch gespeichert werden, und der Editor darf nicht geschlossen werden.",
- 	"formatOnSaveTimeout": "Zeitüberschreitung beim Formatieren während des Speicherns. Legt eine Zeitbegrenzung in Millisekunden für formatOnSave-Befehle fest. Befehle, die länger dauern als die festgelegte Zeitüberschreitung, werden abgebrochen. ",
- 	"explorerConfigurationTitle": "Datei-Explorer",
-+<<<<<<< .our
- 	"openEditorsVisible": "Die Anzahl der Editoren, die im Bereich \"Geöffnete Editoren\" angezeigt werden.",
-+=======
-+>>>>>>> .their
- 	"autoReveal": "Steuert, ob der Explorer Dateien beim Öffnen automatisch anzeigen und auswählen soll.",
- 	"enableDragAndDrop": "Steuert, ob der Explorer das Verschieben von Dateien und Ordnern mithilfe von Drag  Drop zulassen soll.",
- 	"confirmDragAndDrop": "Steuert, ob der Explorer um Bestätigung bittet, um Dateien und Ordner per Drag & Drop zu verschieben.",
-changed in both
-  base   100644 55ed6344bee5a16153879a922530a6ec8eac9933 i18n/deu/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  our    100644 fa18bc6bf78042dea5f4d857217818cf336d6a91 i18n/deu/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  their  100644 25a34e50d398b34c9becb4982c1bce6d481e51a1 i18n/deu/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,12 @@
- 	],
- 	"userGuide": "Verwenden Sie die Aktionen in der Editor-Symbolleiste, um Ihre Änderungen rückgängig zu machen oder den Inhalt auf dem Datenträger mit Ihren Änderungen zu überschreiben.",
- 	"staleSaveError": "Fehler beim Speichern von \"{0}\": Der Inhalt auf dem Datenträger ist neuer. Vergleichen Sie Ihre Version mit der Version auf dem Datenträger.",
-+=======
-+	"userGuide": "Verwenden Sie die Aktionen auf der Editor-Symbolleiste auf der rechten Seite, um Ihre Änderungen **rückgängig zu machen** oder den Inhalt auf dem Datenträger mit Ihren Änderungen zu **überschreiben**.",
-+	"overwriteElevated": "Als Admin überschreiben...",
-+	"saveElevated": "Als Admin wiederholen...",
-+	"overwrite": "Überschreiben",
-+>>>>>>> .their
- 	"retry": "Wiederholen",
- 	"discard": "Verwerfen",
- 	"readonlySaveErrorAdmin": "Fehler beim Speichern von '{0}': Datei ist schreibgeschützt. 'Als Admin überschreiben' auswählen, um den Vorgang als Administrator zu wiederholen. ",
-changed in both
-  base   100644 a5003c845394b5745e0956c505a3677728728e20 i18n/deu/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  our    100644 518f83fa0bd4f8b0e33a01da12419f514179482f i18n/deu/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  their  100644 41368e44e5a42bdebd82602e8236861631b461c2 i18n/deu/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-added in both
-  our    100644 2d9f1d89efacb8c3aefeaa7692f2b0216d3be115 i18n/deu/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-  their  100644 9ef6f12276ae7e638cc215bba851e294670b96a7 i18n/deu/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,5 +11,13 @@
- 	"sharedLog": "Protokoll (freigegeben)",
- 	"rendererLog": "Protokoll (Fenster)",
- 	"extensionsLog": "Protokoll (Erweiterungshost)",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"developer": "Entwickler"
- }
-\ No newline at end of file
-added in both
-  our    100644 0b0f4d7c9c60baa558aea30524b31e8a72e10f84 i18n/deu/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  their  100644 2a19c259b0dcc5cb6a2b7ef3223d82dae1f7c02e i18n/deu/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -17,14 +18,31 @@
- 	"openLogFile": "Protokolldatei öffnen …",
- 	"setLogLevel": "Protokollstufe festlegen…",
- 	"trace": "Nachverfolgen",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"openLogsFolder": "Protokollordner öffnen",
-+	"showLogs": "Protokolle anzeigen...",
-+	"rendererProcess": "Fenster",
-+	"extensionHost": "Erweiterungshost",
-+	"setLogLevel": "Protokollstufe festlegen",
-+>>>>>>> .their
- 	"debug": "Debuggen",
- 	"info": "Info",
- 	"warn": "Warnung",
- 	"err": "Fehler",
- 	"critical": "Kritisch",
- 	"off": "Aus",
-+<<<<<<< .our
- 	"selectLogLevel": "Protokollstufe auswählen",
- 	"default and current": "Standard und aktuell",
- 	"default": "Standard",
- 	"current": "Aktuell"
-+=======
-+	"selectLogLevel": "Protokollstufe auswählen"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f9df98f6f178305e236dc1b54073ea78a66afc75 i18n/deu/src/vs/workbench/parts/markers/common/messages.i18n.json
-  our    100644 08feefc0086392fcd6f986e3c1116e070a102b03 i18n/deu/src/vs/workbench/parts/markers/common/messages.i18n.json
-  their  100644 4fe33d4fdf687cd10b21d61dd8ae6de3a0895e46 i18n/deu/src/vs/workbench/parts/markers/common/messages.i18n.json
-@@ -7,8 +7,11 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"viewCategory": "Anzeigen",
-+<<<<<<< .our
- 	"problems.view.toggle.label": "Probleme umschalten (Fehler, Warnungen, Informationen)",
- 	"problems.view.focus.label": "Probleme fokussieren (Fehler, Warnungen, Informationen)",
-+=======
-+>>>>>>> .their
- 	"problems.panel.configuration.title": "Ansicht \"Probleme\"",
- 	"problems.panel.configuration.autoreveal": "Steuert, ob die Ansicht \"Probleme\" automatisch Dateien anzeigen sollte, wenn diese geöffnet werden.",
- 	"markers.panel.title.problems": "Probleme",
-added in both
-  our    100644 900a7f7ac3b7b4eec58da0278aaf74958ffe4b28 i18n/deu/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-  their  100644 a49f4a37242fa9082d3846d1e50fe8c1fe7db741 i18n/deu/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -11,4 +12,15 @@
- 	"viewCategory": "Anzeigen",
- 	"clearOutput.label": "Ausgabe löschen",
- 	"openActiveLogOutputFile": "Ansicht: Aktive Protokollausgabedatei öffnen"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"output": "Ausgabe",
-+	"viewCategory": "Anzeigen",
-+	"clearOutput.label": "Ausgabe löschen"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 69740f1779c65b50c80daa9cad3a7d57a25e9024 i18n/deu/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-  their  100644 95b7cc617b7765b9506eb33296b2cf8adb8f6c74 i18n/deu/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"output": "{0} - Ausgabe",
- 	"channel": "Ausgabekanal für '{0}'"
- }
-\ No newline at end of file
-changed in both
-  base   100644 26e5d28d6589aaf879b25cc42b85d9ccbad216ea i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 cfd3784b25185836bda1d8d6784b3e81792155f0 i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 fb9b2bd366ab4e8cc3462f0d9da92849435a18ac i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"defaultSettings": "Platzieren Sie Ihre Einstellungen zum Überschreiben im Editor auf der rechten Seite.",
- 	"noSettingsFound": "Keine Einstellungen gefunden.",
- 	"settingsSwitcherBarAriaLabel": "Einstellungsumschaltung",
-changed in both
-  base   100644 74ffcdff9a140bf095b6da331c25c6511a62896c i18n/deu/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  our    100644 db93b66f34fda877ff44d1ba11f1c28d8148660f i18n/deu/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  their  100644 f93cea2858c08890f1fed79d7457f04649df8add i18n/deu/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-changed in both
-  base   100644 f5e2daabe29a2847d5e10cf5c6436432dd248846 i18n/deu/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  our    100644 fef34355ad78a01fbe48c872905d3bee3d212c27 i18n/deu/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  their  100644 2ca5c08b0a999e2311929e4b18e8080d37de41a4 i18n/deu/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"view": "Anzeigen",
- 	"commandsHandlerDescriptionDefault": "Befehle anzeigen und ausführen",
- 	"gotoLineDescriptionMac": "Gehe zu Zeile",
-changed in both
-  base   100644 cfb59dde79057dfcf687c79f87274defaa585187 i18n/deu/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  our    100644 eb263d7ae8b832d5edd4a36de00889ae94057caa i18n/deu/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  their  100644 114466fcfbfe869b6454b253a7718316e1f1bad5 i18n/deu/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-@@ -12,6 +12,10 @@
- 	"view": "Anzeigen",
- 	"scmConfigurationTitle": "SCM",
- 	"alwaysShowProviders": "Ob der Quellcodeverwaltungsanbieter-Abschnitt immer angezeigt wird.",
-+<<<<<<< .our
- 	"diffDecorations": "Steuert die Diff-Dekorationen im Editor.",
- 	"diffGutterWidth": "Steuert die Breite (px) der Diff-Dekorationen in der Liste (hinzugefügt und verändert)."
-+=======
-+	"inputCounter": "Steuert die Anzeige des Eingabezählers."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6119d2359c65eea80efd0aaf02b621b2d0b0f537 i18n/deu/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  our    100644 c287ce1399d3a4cbf5ee2cf49ae6344e62eac3a2 i18n/deu/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  their  100644 faa904ce1ab1b4ccfc2dcda5fd2075e7c37c30fa i18n/deu/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-@@ -8,6 +8,8 @@
- 	],
- 	"scm providers": "Quellcodeanbieter",
- 	"hideRepository": "Ausblenden",
-+	"commitMessageInfo": "{0} Zeichen in aktueller Zeile",
-+	"commitMessageCountdown": "{0} Zeichen in der aktuellen Zeile verbleibend",
- 	"installAdditionalSCMProviders": "Installiere weiter SCM Provider...",
- 	"no open repo": "Es gibt keine aktiven Quellcodeanbieter.",
- 	"source control": "Quellcodeverwaltung",
-changed in both
-  base   100644 f4671bfc3a89be1507a7ce128ab11235dd9744b9 i18n/deu/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 1dcdaff92772bd253ab87cb0ce46920ce5c5e6bc i18n/deu/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 365328f012662c857cadba948e8ee08c958eb6c6 i18n/deu/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-changed in both
-  base   100644 a765a1ac06fcdb16377300be0c54f9d277dca20d i18n/deu/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 24b953a60a63d0739209f04cdbf2997fcdde9b37 i18n/deu/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 e32b687f050c5ce762822614d0296709eae61321 i18n/deu/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,11 +13,18 @@
- 	"copyAllLabel": "Alles kopieren",
- 	"clearSearchHistoryLabel": "Suchverlauf löschen",
- 	"toggleSearchViewPositionLabel": "Position der Suchansicht umschalten",
-+=======
-+>>>>>>> .their
- 	"findInFolder": "In Ordner suchen...",
- 	"findInWorkspace": "In Arbeitsbereich suchen...",
- 	"showTriggerActions": "Zu Symbol im Arbeitsbereich wechseln...",
- 	"name": "Suchen",
-+<<<<<<< .our
- 	"showSearchViewl": "Suche anzeigen",
-+=======
-+	"search": "Suchen",
-+	"showSearchViewlet": "Suche anzeigen",
-+>>>>>>> .their
- 	"view": "Anzeigen",
- 	"findInFiles": "In Dateien suchen",
- 	"openAnythingHandlerDescription": "Zu Datei wechseln",
-added in both
-  our    100644 e92da46ec508ef7cccb1d0ab9d66d2cf76d05f91 i18n/deu/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-  their  100644 fa89fddbd1a3487aaf37aa27fe72098ace6e5156 i18n/deu/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -13,5 +14,14 @@
- 	"new.global.sep": "Neue Codeausschnitte",
- 	"openSnippet.pickLanguage": "Codeausschnittsdatei auswählen oder Codeausschnitte erstellen",
- 	"openSnippet.label": "Benutzercodeausschnitte konfigurieren",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"global.1": "({0})",
-+>>>>>>> .their
- 	"preferences": "Einstellungen"
- }
-\ No newline at end of file
-changed in both
-  base   100644 7a1c949566eddcfcdec1a0a0da414045e7aa1db7 i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  our    100644 a09996ad1397a284296d725c6ca90498d1c125e2 i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  their  100644 6d4c86fa94fef1e983f1d2af3fefb46c8dd84bf3 i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"snippetSchema.json.default": "Leerer Codeausschnitt",
- 	"snippetSchema.json": "Benutzerkonfiguration des Codeausschnitts",
- 	"snippetSchema.json.prefix": "Das Präfix, das beim Auswählen des Codeausschnitts in IntelliSense verwendet werden soll.",
-added in both
-  our    100644 ddf2fdf01abb8305fb6c689e6a2d14fbad5ba7ab i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-  their  100644 3daae2bbcbd6a14c122b93647c7f94af9ccd6b8e i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,5 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"source.snippetGlobal": "Globaler Benutzercodeausschnitt",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"source.snippet": "Benutzercodeausschnitt"
- }
-\ No newline at end of file
-changed in both
-  base   100644 e67d5f89a93412d3a93540146db0afb274b86bc9 i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  our    100644 da21c5deaa2fffc31211d74e9a379224211f67e5 i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 f989f6698dcbf373b390346e52b04592369347ab i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,9 @@
- 	],
- 	"invalid.path.0": "Expected string in `contributes.{0}.path`. Provided value: {1}",
- 	"invalid.language.0": "Beim Auslassen der Sprache muss der Wert von \"contributes.{0}.path\" eine \".code-snippets\"-Datei sein. Angegebener Wert: {1}",
-+=======
-+	"invalid.path.0": "Expected string in `contributes.{0}.path`. Provided value: {1}",
-+>>>>>>> .their
- 	"invalid.language": "Unbekannte Sprache in \"contributes.{0}.language\". Bereitgestellter Wert: {1}",
- 	"invalid.path.1": "Es wurde erwartet, dass \"contributes.{0}.path\" ({1}) im Ordner ({2}) der Erweiterung enthalten ist. Dies führt ggf. dazu, dass die Erweiterung nicht portierbar ist.",
- 	"vscode.extension.contributes.snippets": "Trägt Codeausschnitte bei.",
-changed in both
-  base   100644 bc6dee18ad00b1f89b8fe4ba9ffad8ea4e5ec37c i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 e7e17f13a867ab30a0455dba8cfbc4967b92e2a0 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 e6464f3ff186da5f0d84d4c60d6e3133d8ca7ad3 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -15,7 +15,11 @@
- 	"terminal.integrated.shellArgs.osx": "Die Befehlszeilenargumente, die für das OS X-Terminal verwendet werden sollen.",
- 	"terminal.integrated.shell.windows": "Der Pfad der Shell, den das Terminal unter Windows verwendet, wenn in Windows enthaltene Terminals verwendet werden  (cmd, PowerShell oder Bash unter Ubuntu).",
- 	"terminal.integrated.shellArgs.windows": "Die Befehlszeilenargumente, die im Windows-Terminal verwendet werden sollen.",
-+<<<<<<< .our
- 	"terminal.integrated.macOptionIsMeta": "Optionsschlüssel als Metaschlüssel im Terminal auf macOS behandeln.",
-+=======
-+	"terminal.integrated.rightClickCopyPaste": "Wenn dies festgelegt ist, erscheint das Kontextmenü bei einem Rechtsklick im Terminal nicht mehr. Stattdessen erfolgen die Vorgänge Kopieren, wenn eine Auswahl vorgenommen wurde, sowie Einfügen, wenn keine Auswahl vorgenommen wurde.",
-+>>>>>>> .their
- 	"terminal.integrated.copyOnSelection": "Wenn gesetzt, wird der im Terminal ausgewählte Text in die Zwischenablage kopiert.",
- 	"terminal.integrated.fontFamily": "Steuert die Schriftartfamilie des Terminals. Der Standardwert ist \"editor.fontFamily\".",
- 	"terminal.integrated.fontSize": "Steuert den Schriftgrad des Terminals in Pixeln.",
-changed in both
-  base   100644 93a8b04286a39968cd485c4529ed5308424eaf80 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 17f468b874b715481031f72251583765b50e478f i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 edacb0183b5a58060e129f5d8181ab9017549fb4 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -20,6 +20,7 @@
- 	"workbench.action.terminal.new.short": "Neues Terminal",
- 	"workbench.action.terminal.newWorkspacePlaceholder": "Aktuelles Arbeitsverzeichnis für neues Terminal auswählen",
- 	"workbench.action.terminal.newInActiveWorkspace": "Neues integriertes Terminal erstellen (in aktivem Arbeitsbereich)",
-+<<<<<<< .our
- 	"workbench.action.terminal.split": "Terminal verdoppeln",
- 	"workbench.action.terminal.splitInActiveWorkspace": "Terminal teilen (in aktivem Arbeitsbereich)",
- 	"workbench.action.terminal.focusPreviousPane": "Fokus in vorherigem Bereich",
-@@ -28,6 +29,8 @@
- 	"workbench.action.terminal.resizePaneRight": "Größe des rechten Bereichs ändern",
- 	"workbench.action.terminal.resizePaneUp": "Größe des oberen Bereichs ändern",
- 	"workbench.action.terminal.resizePaneDown": "Größe des unteren Bereichs ändern",
-+=======
-+>>>>>>> .their
- 	"workbench.action.terminal.focus": "Fokus im Terminal",
- 	"workbench.action.terminal.focusNext": "Fokus im nächsten Terminal",
- 	"workbench.action.terminal.focusPrevious": "Fokus im vorherigen Terminal",
-changed in both
-  base   100644 76d17079ae8593f6abcc2da12d7db4ec963105fb i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 84fc7fe0d67567c48c4b669c0d3d08c7386267cc i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 35f0add77c1465e033a1bf3882249064d9d9dfe6 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -10,7 +10,11 @@
- 	"terminal.foreground": "Die Vordergrundfarbe des Terminal.",
- 	"terminalCursor.foreground": "Die Vordergrundfarbe des Terminalcursors.",
- 	"terminalCursor.background": "Die Hintergrundfarbe des Terminalcursors. Ermöglicht das Anpassen der Farbe eines Zeichens, das von einem Blockcursor überdeckt wird.",
-+<<<<<<< .our
- 	"terminal.selectionBackground": "Die Auswahlvordergrundfarbe des Terminals.",
- 	"terminal.border": "Die Farbe des Rahmens, der Bereiche innerhalb des Terminals teilt. Der Standardwert ist panel.border.",
- 	"terminal.ansiColor": "\"{0}\" ANSI-Farbe im Terminal"
-+=======
-+	"terminal.selectionBackground": "Die Auswahlvordergrundfarbe des Terminals."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ac6f1dfc78c798a7231e5d0622a55069b6a4d6ba i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  our    100644 19d7340468676889919217f01b6462b1b0b9da96 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  their  100644 a768c43ba81e34675a5bb2d9f0924b7ba79831fe i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-@@ -8,7 +8,11 @@
- 	],
- 	"terminal.integrated.chooseWindowsShellInfo": "Sie können die Standardterminalshell über die Schaltfläche \"Anpassen\" ändern.",
- 	"customize": "Anpassen",
-+<<<<<<< .our
- 	"never again": "Nicht mehr anzeigen",
-+=======
-+	"cancel": "Abbrechen",
-+>>>>>>> .their
- 	"terminal.integrated.chooseWindowsShell": "Wählen Sie Ihre bevorzugte Terminalshell. Sie können diese später in Ihren Einstellungen ändern.",
- 	"terminalService.terminalCloseConfirmationSingular": "Eine aktive Terminalsitzung ist vorhanden. Möchten Sie sie beenden?",
- 	"terminalService.terminalCloseConfirmationPlural": "{0} aktive Terminalsitzungen sind vorhanden. Möchten Sie sie beenden?"
-changed in both
-  base   100644 7c24ef226ba5ac868abd398b492b1ed58f0fc93a i18n/deu/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 dca9f59735754d2304f7bca4be1c8c6b2470923f i18n/deu/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 58c22d0ae125e2befe42a186bcf8ba17274f989c i18n/deu/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -9,9 +9,17 @@
- 	"releaseNotes": "Anmerkungen zu dieser Version",
- 	"showReleaseNotes": "Anmerkungen zu dieser Version anzeigen",
- 	"read the release notes": "Willkommen bei {0} v{1}! Möchten Sie die Hinweise zu dieser Version lesen?",
-+<<<<<<< .our
- 	"licenseChanged": "Unsere Lizenzbedingungen haben sich geändert. Bitte klicken Sie [hier]({0}), um die neuen Bedingungen zu lesen.",
- 	"neveragain": "Nicht mehr anzeigen",
- 	"64bitisavailable": "{0} für 64-Bit-Windows ist jetzt verfügbar! Klicken Sie [hier]({1}), um mehr zu erfahren.",
-+=======
-+	"licenseChanged": "Unsere Lizenzbedingungen haben sich geändert. Bitte lesen Sie die neuen Bedingungen.",
-+	"license": "Lizenz lesen",
-+	"neveragain": "Nicht mehr anzeigen",
-+	"64bitisavailable": "{0} für 64-Bit-Windows ist jetzt verfügbar!",
-+	"learn more": "Weitere Informationen",
-+>>>>>>> .their
- 	"updateIsReady": "Neues {0}-Update verfügbar.",
- 	"noUpdatesAvailable": "Zurzeit sind keine Updates verfügbar.",
- 	"ok": "OK",
-@@ -26,7 +34,10 @@
- 	"commandPalette": "Befehlspalette...",
- 	"settings": "Einstellungen",
- 	"keyboardShortcuts": "Tastenkombinationen",
-+<<<<<<< .our
- 	"showExtensions": "Erweiterungen verwalten",
-+=======
-+>>>>>>> .their
- 	"userSnippets": "Benutzercodeausschnitte",
- 	"selectTheme.label": "Farbdesign",
- 	"themes.selectIconTheme.label": "Dateisymboldesign",
-changed in both
-  base   100644 ed6cda9de2ae565cc8d095e31765b9afd114f185 i18n/deu/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  our    100644 f971f5bb684d0a7cf682d2a34acf06f1a81459bf i18n/deu/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  their  100644 bf366f305f3783e9e4e4f44ff815fba145df9513 i18n/deu/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,4 +14,9 @@
- 	"fileBinaryError": "Die Datei scheint eine Binärdatei zu sein und kann nicht als Text geöffnet werden.",
- 	"err.create": "Fehler beim Erstellen der Datei {0}.",
- 	"fileMoveConflict": "Verschieben/Kopieren kann nicht ausgeführt werden. Die Datei ist am Ziel bereits vorhanden."
-+=======
-+	"fileIsDirectoryError": "Die Datei ist ein Verzeichnis",
-+	"fileNotModifiedError": "Datei nicht geändert seit",
-+	"fileBinaryError": "Die Datei scheint eine Binärdatei zu sein und kann nicht als Text geöffnet werden."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c16b29bce92f30aeeaaaa9315f1ffa4b1c765f5c i18n/deu/src/vs/workbench/services/files/node/fileService.i18n.json
-  our    100644 a2229be0ceef3b429bbc28d1dcb6e2f94145d317 i18n/deu/src/vs/workbench/services/files/node/fileService.i18n.json
-  their  100644 7f863867abd9e59252ef40c066eee7f240011dc3 i18n/deu/src/vs/workbench/services/files/node/fileService.i18n.json
-changed in both
-  base   100644 32304e03cea139fe4f815f9abc553bd82baea500 i18n/deu/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
-  our    100644 a6064ca5ef859e51cac23754703b911bd531d048 i18n/deu/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
-  their  100644 2fb3a8af23778ba84e2a9dba9cf542f6a0a3d610 i18n/deu/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
-changed in both
-  base   100644 1e2d38883dcb78e06179e762b9e7dcdc090c5f19 i18n/deu/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  our    100644 829895898c41ae2ef8b39b082fa121dd8657445a i18n/deu/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  their  100644 f953949ef0045c9eaf82d2e5f7fcab58099b6e01 i18n/deu/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-changed in both
-  base   100644 7d1b7fccbe0dedb57b7188cd1356022c591dfb91 i18n/deu/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 66c124a9d5a7fdc4a4f5dd03bfbddf459d3761cb i18n/deu/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 957e24486647e6e8b2f818469a0721403477d4e8 i18n/deu/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-changed in both
-  base   100644 67d01f0f0d412e9d74ae8f7651ba59886dd37e70 i18n/deu/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  our    100644 e86a18877a777946dc953d1135a4123abedf75f6 i18n/deu/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  their  100644 ded36282a855ba131e6e99c7e7d8dbcdfd0c14cc i18n/deu/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-@@ -8,5 +8,10 @@
- 	],
- 	"errorInvalidTaskConfiguration": "In die Konfigurationsdatei des Arbeitsbereichs kann nicht geschrieben werden. Öffnen Sie die Datei, um Fehler/Warnungen darin zu beheben, und versuchen Sie es noch mal.",
- 	"errorWorkspaceConfigurationFileDirty": "In die Konfigurationsdatei des Arbeitsbereichs kann nicht geschrieben werden, weil sie geändert wurde. Speichern Sie die Datei, und versuchen Sie es noch mal.",
-+<<<<<<< .our
- 	"openWorkspaceConfigurationFile": "Konfiguration des Arbeitsbereichs öffnen"
-+=======
-+	"openWorkspaceConfigurationFile": "Konfigurationsdatei des Arbeitsbereichs öffnen",
-+	"close": "Schließen"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 270030fe345b04bff448196f870ea4ed68a49ebe i18n/esn/extensions/git/out/autofetch.i18n.json
-  our    100644 8ad760617c8d7633e49b3f5d82115f7d1966094c i18n/esn/extensions/git/out/autofetch.i18n.json
-  their  100644 98972c6f0a2502caebde3d6a369d80adc01d9aa3 i18n/esn/extensions/git/out/autofetch.i18n.json
-@@ -7,7 +7,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"yes": "Sí",
-+<<<<<<< .our
- 	"no": "No",
- 	"not now": "Preguntarme luego",
- 	"suggest auto fetch": "¿Te gustaría que Code [ejecute 'git fetch' periódicamente]({0})?"
-+=======
-+	"read more": "Leer más",
-+	"no": "No"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 2258e1755477bba20f2a5fd41776e6156ae11b1e i18n/esn/extensions/git/out/commands.i18n.json
-  our    100644 022bf20d57e92a28a5ced5a2d0998bc8b0dfe335 i18n/esn/extensions/git/out/commands.i18n.json
-  their  100644 3be82274dd3b757250f3321733622a4e51ee045e i18n/esn/extensions/git/out/commands.i18n.json
-@@ -71,12 +71,19 @@
- 	"pick remote pull repo": "Seleccione un origen remoto desde el que extraer la rama",
- 	"no remotes to push": "El repositorio no tiene remotos configurados en los que insertar.",
- 	"nobranch": "Extraiga del repositorio una rama para insertar un remoto.",
-+<<<<<<< .our
- 	"confirm publish branch": "La rama ' {0} ' no tiene ninguna rama ascendente. ¿desea publicar esta rama?",
- 	"ok": "Aceptar",
- 	"push with tags success": "Insertado con etiquetas correctamente.",
- 	"pick remote": "Seleccionar un elemento remoto para publicar la rama '{0}':",
- 	"sync is unpredictable": "Esta acción insertará e incorporará cambios en y desde '{0}/{1}'.",
- 	"never again": "No volver a mostrar ",
-+=======
-+	"ok": "Aceptar",
-+	"push with tags success": "Insertado con etiquetas correctamente.",
-+	"pick remote": "Seleccionar un elemento remoto para publicar la rama '{0}':",
-+	"sync is unpredictable": "Esta acción insertará y extraerá confirmaciones en '{0}'.",
-+>>>>>>> .their
- 	"no remotes to publish": "El repositorio no tiene remotos configurados en los que publicar.",
- 	"no changes stash": "No existen cambios para el guardado provisional.",
- 	"provide stash message": "Opcionalmente, proporcionar un mensaje para el guardado provisional",
-added in both
-  our    100644 0406f029ae527b55c40f2e37e24799d52680f037 i18n/esn/extensions/typescript/out/commands.i18n.json
-  their  100644 cfccf2b7bf9ea2e62c6ca391df975cc13111910f i18n/esn/extensions/typescript/out/commands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -13,4 +14,20 @@
- 	"typescript.noJavaScriptProjectConfig": "El archivo no forma parte de un proyecto de JavaScript. Haga clic [aquí]({0}) para obtener más información.",
- 	"typescript.configureTsconfigQuickPick": "Configurar tsconfig.json",
- 	"typescript.configureJsconfigQuickPick": "Configurar jsconfig.json"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"typescript.projectConfigNoWorkspace": "Abra una carpeta en VS Code para usar un proyecto de TypeScript o JavaScript",
-+	"typescript.projectConfigUnsupportedFile": "No se pudo determinar el proyecto de TypeScript o JavaScript. Tipo de archivo no compatible",
-+	"typescript.projectConfigCouldNotGetInfo": "No se pudo determinar el proyecto de TypeScript o JavaScript",
-+	"typescript.noTypeScriptProjectConfig": "El archivo no forma parte de un proyecto de TypeScript",
-+	"typescript.noJavaScriptProjectConfig": "El archivo no forma parte de un proyecto de JavaScript",
-+	"typescript.configureTsconfigQuickPick": "Configurar tsconfig.json",
-+	"typescript.configureJsconfigQuickPick": "Configurar jsconfig.json",
-+	"typescript.projectConfigLearnMore": "Más información"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 750d811d866eaa3d43818bd1d8e28c9898acf514 i18n/esn/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/esn/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"selectAriaOption": "{0}"
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-added in both
-  our    100644 d646706d4418daa32fa8efee56ac8fc54b049183 i18n/esn/src/vs/base/node/ps.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/esn/src/vs/base/node/ps.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"collecting": "Recopilando información de memoria y CPU. Esto puede tardar unos segundos. "
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 582dfe7c78ff3f9e1e74ab5530c86c597d062bc6 i18n/esn/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 6ad3e3ebd5e87cf26a1b950237c8c58f3d92b674 i18n/esn/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 b156efc4162ee9527f59a38e590217f7486a08ac i18n/esn/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -16,7 +16,10 @@
- 	"lineNumbers.on": "Los números de línea se muestran como un número absoluto.",
- 	"lineNumbers.relative": "Los números de línea se muestran como distancia en líneas a la posición del cursor.",
- 	"lineNumbers.interval": "Los números de línea se muestran cada 10 líneas.",
-+<<<<<<< .our
- 	"lineNumbers": "Controla la visualización de los números de línea.",
-+=======
-+>>>>>>> .their
- 	"rulers": "Representar reglas verticales después de un cierto número de caracteres monoespacio. Usar multiples valores para multiples reglas. No se dibuja ninguna regla si la matriz esta vacía.",
- 	"wordSeparators": "Caracteres que se usarán como separadores de palabras al realizar operaciones o navegaciones relacionadas con palabras.",
- 	"tabSize": "El número de espacios a los que equivale una tabulación. Este valor se invalida según el contenido del archivo cuando `editor.detectIndentation` está activado.",
-changed in both
-  base   100644 9cd43302e16aafe48d28d96c44766e331b35b343 i18n/esn/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 e90f2798b359468ab2a777af9b7d68417b46fdb4 i18n/esn/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 e60652a0dd4b51231c6d4e1561577b89dcf74d45 i18n/esn/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -8,8 +8,11 @@
- 	],
- 	"lineHighlight": "Color de fondo para la línea resaltada en la posición del cursor.",
- 	"lineHighlightBorderBox": "Color de fondo del borde alrededor de la línea en la posición del cursor.",
-+<<<<<<< .our
- 	"rangeHighlight": "Color de fondo de los rangos resaltados, como por ejemplo las características de abrir rápidamente y encontrar. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
- 	"rangeHighlightBorder": "Color de fondo del borde alrededor de los intervalos resaltados.",
-+=======
-+>>>>>>> .their
- 	"caret": "Color del cursor del editor.",
- 	"editorCursorBackground": "Color de fondo del cursor de edición. Permite personalizar el color del caracter solapado por el bloque del cursor.",
- 	"editorWhitespaces": "Color de los caracteres de espacio en blanco del editor.",
-changed in both
-  base   100644 a46ce2aad760840ea75f16672c2236ca62ca3d12 i18n/esn/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  our    100644 5c079ae0936aa1d85c9383de57cec1e0ac4d0539 i18n/esn/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  their  100644 3320bca40f6f0b631ddf762d5c1194a9c5f0c243 i18n/esn/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -10,4 +11,11 @@
- 	"markerAction.previous.label": "Ir al problema anterior (Error, Advertencia, Información)",
- 	"markerAction.nextInFiles.label": "Ir al siguiente problema en Archivos (Error, Advertencia, Información)",
- 	"markerAction.previousInFiles.label": "Ir al problema anterior en Archivos (Error, Advertencia, Información)"
-+=======
-+	"title.wo_source": "({0}/{1})",
-+	"editorMarkerNavigationError": "Color de los errores del widget de navegación de marcadores del editor.",
-+	"editorMarkerNavigationWarning": "Color de las advertencias del widget de navegación de marcadores del editor.",
-+	"editorMarkerNavigationInfo": "Color del widget informativo marcador de navegación en el editor.",
-+	"editorMarkerNavigationBackground": "Fondo del widget de navegación de marcadores del editor."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ce1db0c57f28706e8cb649ba2cef27d66109e621 i18n/esn/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  our    100644 502886a6ec82fbe73ff74225015c8197467ab037 i18n/esn/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  their  100644 22f02c804871062bdf0474340f3ba5218c7548f7 i18n/esn/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,10 @@
- 	"wordHighlightStrongBorder": "Color de fondo de un símbolo durante el acceso de escritura; por ejemplo, cuando se escribe una variable.",
- 	"overviewRulerWordHighlightForeground": "Destaca el color del marcador para los puntos del símbolo. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
- 	"overviewRulerWordHighlightStrongForeground": "Destaca el color del marcador de acceso de escritura. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
-+=======
-+	"overviewRulerWordHighlightForeground": "Color de marcador de regla de información general para símbolos resaltados.",
-+	"overviewRulerWordHighlightStrongForeground": "Color de marcador de regla de información general para símbolos de acceso de escritura resaltados. ",
-+>>>>>>> .their
- 	"wordHighlight.next.label": "Ir al siguiente símbolo destacado",
- 	"wordHighlight.previous.label": "Ir al símbolo destacado anterior"
- }
-\ No newline at end of file
-changed in both
-  base   100644 fc4e80ef3e405b39e4f68f91aa909f57ab374ff5 i18n/esn/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  our    100644 ebca59c681c79c71e23dedb1815f394e6a16a4e3 i18n/esn/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  their  100644 660d6b834cb4c2cdb032cc69605c206aaa83f94a i18n/esn/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 37027504432c32285d2a3cdf76345ec0ffcb0222 i18n/esn/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 b4899e15c5b89e537d227799bd60ed681404b6ca i18n/esn/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 7e6ced9e2f1009f81577308388b7d10b8a251d26 i18n/esn/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,11 +10,19 @@
- 	"diff": "Comparar dos archivos entre sí.",
- 	"add": "Agregar carpetas a la última ventana activa.",
- 	"goto": "Abrir un archivo en la ruta de acceso de la línea y posición de carácter especificadas.",
-+<<<<<<< .our
- 	"newWindow": "Fuerza para abrir una nueva ventana.",
- 	"reuseWindow": "Forzar para abrir un archivo o carpeta en la última ventana activa.",
- 	"wait": "Espere a que los archivos sean cerrados antes de volver.",
- 	"locale": "La configuración regional que se usará (por ejemplo, en-US o zh-TW).",
- 	"userDataDir": "Especifica el directorio donde se guardan los datos del usuario. Se puede utilizar para abrir varias instancias de código distintas.",
-+=======
-+	"newWindow": "Fuerce una nueva instancia de Code.",
-+	"reuseWindow": "Fuerce la apertura de un archivo o carpeta en la última ventana activa.",
-+	"wait": "Espere a que los archivos sean cerrados antes de volver.",
-+	"locale": "La configuración regional que se usará (por ejemplo, en-US o zh-TW).",
-+	"userDataDir": "Especifica el directorio en que se conservan los datos de usuario; es útil cuando se ejecuta como raíz.",
-+>>>>>>> .their
- 	"version": "Versión de impresión.",
- 	"help": "Imprima el uso.",
- 	"extensionHomePath": "Establezca la ruta de acceso raíz para las extensiones.",
-@@ -22,18 +30,28 @@
- 	"showVersions": "Muestra las versiones de las extensiones instaladas cuando se usa --list-extension.",
- 	"installExtension": "Instala una extensión.",
- 	"uninstallExtension": "Desinstala una extensión.",
-+<<<<<<< .our
- 	"experimentalApis": "Permite las funciones de API propuestas para una extensión.",
-+=======
-+	"experimentalApis": "Habilita características de API propuestas para una extensión.",
-+>>>>>>> .their
- 	"verbose": "Imprima salidas detalladas (implica --wait).",
- 	"log": "Nivel de registro a utilizar. Por defecto es 'info'. Los valores permitidos son 'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off'.",
- 	"status": "Imprimir el uso del proceso y la información de diagnóstico.",
- 	"performance": "Comience con el comando 'Developer: Startup Performance' habilitado.",
- 	"prof-startup": "Ejecutar generador de perfiles de CPU durante el inicio",
- 	"disableExtensions": "Deshabilite todas las extensiones instaladas.",
-+<<<<<<< .our
- 	"inspect-extensions": "Permite perfilar y depurar las extensiones. Revise las herramientas de desarrollador para la conexión URI.",
- 	"inspect-brk-extensions": "Permite perfilar y depurar las extensiones con el host de la extensión pausado después de iniciar. Revise las herramientas de desarrollador para la conexión URI. ",
- 	"disableGPU": "Deshabilita la aceleración de hardware de GPU.",
- 	"uploadLogs": "Carga los registros de la sesión actual a un extremo.",
- 	"maxMemory": "Tamaño máximo de memoria para una ventana (en Mbytes).",
-+=======
-+	"inspect-extensions": "Permitir la depuración y el perfil de las extensiones. Revisar las herramientas de desarrollador para la conexión uri.",
-+	"inspect-brk-extensions": "Permitir la depuración y el perfil de las extensiones con el host de la extensión pausado después del inicio. Revisar las herramientas de desarrollador para la conexión uri.",
-+	"disableGPU": "Deshabilita la aceleración de hardware de GPU.",
-+>>>>>>> .their
- 	"usage": "Uso",
- 	"options": "opciones",
- 	"paths": "rutas de acceso",
-changed in both
-  base   100644 645d8566a96a045756ed7fdfce9f9d3a5819338e i18n/esn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 862953cea1ced6aa68869023b06a401296a0b72c i18n/esn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 d1ce3f10c5f81c47851a56564ec52a97f996f443 i18n/esn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -7,17 +7,23 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"invalidManifest": "Extensión no válida: package.json no es un archivo JSON.",
-+<<<<<<< .our
- 	"incompatible": "No se puede instalar la extensión ' {0} ', ya que no es compatible con el código ' {1} '.",
-+=======
-+>>>>>>> .their
- 	"restartCode": "Reinicie Code antes de volver a instalar {0}.",
- 	"installingOutdatedExtension": "Una versión más nueva de esta extensión ya está instalada. ¿Desea anular esto con la versión anterior?",
- 	"override": "Anular",
- 	"cancel": "Cancelar",
-+<<<<<<< .our
- 	"errorInstallingDependencies": "Error instalando dependencias. {0}",
- 	"MarketPlaceDisabled": "Marketplace no está habilitado",
- 	"removeError": "Error al quitar la extensión: {0}. Salga e inicie VS Code antes de intentarlo de nuevo.",
- 	"Not a Marketplace extension": "Sólo se pueden reinstalar Extensiones del Marketplace",
- 	"notFoundCompatible": "No se pueden instalar '{0}'; no hay ninguna versión disponible compatible con VS Code '{1}'. ",
- 	"malicious extension": "No se puede instalar la extensión ya que se informó que era problemático.",
-+=======
-+>>>>>>> .their
- 	"notFoundCompatibleDependency": "No se puede instalar porque no se encuentra la extensión dependiente '{0}' compatible con la versión actual '{1}' del VS Code.",
- 	"quitCode": "No se puede instalar la extensión. Por favor, salga e inicie VS Code antes de reinstalarlo. ",
- 	"exitCode": "No se puede instalar la extensión. Por favor, salga e inicie VS Code antes de reinstalarlo. ",
-changed in both
-  base   100644 9058cce900d3483eca62d4ddbbb14aa4f716d2f0 i18n/esn/src/vs/platform/message/common/message.i18n.json
-  our    100644 0d10d99e27623da352d5edf7f0d58dfbc3e6a68b i18n/esn/src/vs/platform/message/common/message.i18n.json
-  their  100644 8e3765bff6ee5e8f4ebf19c3bc3d966093751639 i18n/esn/src/vs/platform/message/common/message.i18n.json
-changed in both
-  base   100644 9f8669717f04d38404ff98307351e2a564bd9c61 i18n/esn/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 df47f2d2522b992756f57ce29b59bc070792254f i18n/esn/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 d2e9d5e7292b422571131739b83179981e65ae6e i18n/esn/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -68,6 +68,7 @@
- 	"editorWidgetBorder": "Color de borde de los widgets del editor. El color solo se usa si el widget elige tener un borde y no invalida el color.",
- 	"editorSelectionBackground": "Color de la selección del editor.",
- 	"editorSelectionForeground": "Color del texto seleccionado para alto contraste.",
-+<<<<<<< .our
- 	"editorInactiveSelection": "Color de la selección en un editor inactivo. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
- 	"editorSelectionHighlight": "Color para regiones con el mismo contenido que la selección. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
- 	"editorSelectionHighlightBorder": "Color de borde de las regiones con el mismo contenido que la selección.",
-@@ -79,6 +80,9 @@
- 	"findRangeHighlightBorder": "Color de borde de la gama que limita la búsqueda. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
- 	"findWidgetResizeBorder": "Color del borde de la barra de tamaño del widget de búsqueda.",
- 	"hoverHighlight": "Resalte debajo de la palabra para la cual se muestra un Hover. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
-+=======
-+	"editorFindMatch": "Color de la coincidencia de búsqueda actual.",
-+>>>>>>> .their
- 	"hoverBackground": "Color de fondo al mantener el puntero en el editor.",
- 	"hoverBorder": "Color del borde al mantener el puntero en el editor.",
- 	"activeLinkForeground": "Color de los vínculos activos.",
-@@ -86,12 +90,15 @@
- 	"diffEditorRemoved": "Color de fondo del texto que se eliminó. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
- 	"diffEditorInsertedOutline": "Color de contorno para el texto insertado.",
- 	"diffEditorRemovedOutline": "Color de contorno para el texto quitado.",
-+<<<<<<< .our
- 	"mergeCurrentHeaderBackground": "Fondo de encabezado actual en conflictos de fusión en línea. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
- 	"mergeCurrentContentBackground": "Fondo de contenido actual en conflictos de fusión en línea. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
- 	"mergeIncomingHeaderBackground": "Fondo de encabezado entrante en conflictos de fusión en línea. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
- 	"mergeIncomingContentBackground": "Fondo de contenido entrante en conflictos de fusión en línea. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
- 	"mergeCommonHeaderBackground": "Fondo de encabezado de ancestro común en conflictos de fusión en línea. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
- 	"mergeCommonContentBackground": "Fondo de contenido común de ancestro en conflictos de fusión en línea. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
-+=======
-+>>>>>>> .their
- 	"mergeBorder": "Color del borde en los encabezados y el divisor en conflictos de combinación alineados.",
- 	"overviewRulerCurrentContentForeground": "Primer plano de la regla de visión general actual para conflictos de combinación alineados.",
- 	"overviewRulerIncomingContentForeground": "Primer plano de regla de visión general de entrada para conflictos de combinación alineados.",
-added in both
-  our    100644 40e2044209fec4e5b919e2e5e83378e9f6815093 i18n/esn/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/esn/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,4 +11,12 @@
- 	"codeActionsOnSave.didTimeout": "codeActionsOnSave anulado después de {0} ms",
- 	"timeout.onWillSave": "Se anuló onWillSaveTextDocument-event después de 1750 ms",
- 	"saveParticipants": "Ejecutando Guardar Participantes..."
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 1127a4ec4f832993371655e52fc17e5b4cc59dff i18n/esn/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  our    100644 a3395d69a3eb29f7d81d045d6273164f407ffcc0 i18n/esn/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  their  100644 e897d06ac348cf0ebb4494e7cdd0feb862725b8f i18n/esn/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,7 @@
- 	],
- 	"treeView.notRegistered": "No se ha registrado ninga vista del árbol con id '{0}'.",
- 	"treeView.duplicateElement": "El elemento con id {0} está ya registrado"
-+=======
-+	"treeView.notRegistered": "No se ha registrado ninga vista del árbol con id '{0}'."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 1e2b99a187010f3fc708c8e7d1f0a552ed144c10 i18n/esn/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 c48bc5883853a0c6c279c545c6c1c9d024a6241b i18n/esn/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 9f92beb9392ac000af3ad81b7acf9e8ff393487e i18n/esn/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -15,5 +15,9 @@
- 	"saveWorkspace": "Guardar área de trabajo",
- 	"openWorkspaceAction": "Abrir área de trabajo...",
- 	"openWorkspaceConfigFile": "Abrir archivo de configuración del área de trabajo",
-+<<<<<<< .our
- 	"duplicateWorkspaceInNewWindow": "Duplicar el área de trabajo en una ventana nueva"
-+=======
-+	"openFolderAsWorkspaceInNewWindow": "Abrir carpeta como Área de trabajo en una Nueva Ventana"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 1375d8b899c23d4e939a50148edb6d270cfdae42 i18n/esn/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-  their  100644 832cb0abb68fff04475d658c3d6b687675c6a986 i18n/esn/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,6 +9,15 @@
- 	],
- 	"addFolderToWorkspace": "Agregar carpeta al área de trabajo...",
- 	"add": "&&Añadir",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"addFolderToWorkspace": "Agregar carpeta al área de trabajo...",
-+>>>>>>> .their
- 	"addFolderToWorkspaceTitle": "Agregar carpeta al área de trabajo",
- 	"workspaceFolderPickerPlaceholder": "Seleccionar la carpeta del área de trabajo"
- }
-\ No newline at end of file
-changed in both
-  base   100644 ae6d0079e4ca41ccb58d842d72b28aa7faed3415 i18n/esn/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  our    100644 0c66b08e50d23c7fe17d4450febaeb2a1c46e5cc i18n/esn/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  their  100644 0e9cbb0a9e2da036405297f65651630ca89d2538 i18n/esn/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-@@ -19,6 +19,7 @@
- 	"close": "Cerrar",
- 	"closeOthers": "Cerrar otros",
- 	"closeRight": "Cerrar a la derecha",
-+<<<<<<< .our
- 	"closeAllSaved": "Cerrar guardados",
- 	"closeAll": "Cerrar todo",
- 	"keepOpen": "Mantener abierto",
-@@ -27,6 +28,15 @@
- 	"keepEditor": "Mantener editor",
- 	"closeEditorsInGroup": "Cerrar todos los editores del grupo",
- 	"closeSavedEditors": "Cerrar los editores guardados del grupo",
-+=======
-+	"closeAllUnmodified": "Cerrar los que no se han modificado",
-+	"closeAll": "Cerrar todo",
-+	"keepOpen": "Mantener abierto",
-+	"showOpenedEditors": "Mostrar editores abiertos",
-+	"keepEditor": "Mantener editor",
-+	"closeEditorsInGroup": "Cerrar todos los editores del grupo",
-+	"closeUnmodifiedEditors": "Cerrar los editores en el grupo sin modificar",
-+>>>>>>> .their
- 	"closeOtherEditors": "Cerrar otros editores",
- 	"closeRightEditors": "Cerrar los editores a la derecha"
- }
-\ No newline at end of file
-changed in both
-  base   100644 f88c82cd9dfd8d1f723ae0f9ccacaeadadc90dff i18n/esn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 e35e95658e0757a0dd58a01697234694ea4f0954 i18n/esn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 93badc7f42aae66191b592e2fda1232048404581 i18n/esn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 a44acd1dea7c10c9fa41ec216cc0896d042a4aa4 i18n/esn/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  our    100644 41dbe6869149b754d7d02273f8302ea1a662cfeb i18n/esn/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  their  100644 441fc68d0e67b5808ed41ce6426d097f4d894130 i18n/esn/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-changed in both
-  base   100644 d1ec23e2db6cc292f5ea6ef8037055acf3ef7885 i18n/esn/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  our    100644 bdfe340e0584db3b3e9be2779c08147211eb5f9c i18n/esn/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  their  100644 8fda63005496a55b62f1a077be6bfc1768c94486 i18n/esn/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-@@ -12,6 +12,10 @@
- 	"editableEditorWithInputAriaLabel": "{0}. Editor de comparación de archivos de texto.",
- 	"editableEditorAriaLabel": "Editor de comparación de archivos de texto.",
- 	"navigate.next.label": "Cambio siguiente",
-+<<<<<<< .our
- 	"navigate.prev.label": "Cambio anterior",
- 	"toggleIgnoreTrimWhitespace.label": "Ignorar espacios en blanco al principio y final"
-+=======
-+	"navigate.prev.label": "Cambio anterior"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 49c85dbc052576ab06514b9d25b9ea02829256aa i18n/esn/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  our    100644 9310ecec99739a11969e16199e5b70e1dba3f377 i18n/esn/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  their  100644 d7236689da90464e87303fbf3d53d20704f46bd4 i18n/esn/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"close": "Cerrar",
-+>>>>>>> .their
- 	"araLabelEditorActions": "Acciones del editor"
- }
-\ No newline at end of file
-changed in both
-  base   100644 323cb6d934f7c3835c359bf3db166f03461d42ba i18n/esn/src/vs/workbench/common/theme.i18n.json
-  our    100644 a12ae1a7d50911472b1c450409ccd4fd8e4aba33 i18n/esn/src/vs/workbench/common/theme.i18n.json
-  their  100644 1f48fa2867dd731ced45b198d547a46b3f2b238c i18n/esn/src/vs/workbench/common/theme.i18n.json
-@@ -24,7 +24,10 @@
- 	"editorGroupBackground": "Color de fondo de un grupo de editores. Los grupos de editores son los contenedores de los editores. El color de fondo se ve cuando se mueven arrastrando los grupos de editores.",
- 	"tabsContainerBackground": "Color de fondo del encabezado del título del grupo de editores cuando las fichas están habilitadas. Los grupos de editores son contenedores de editores.",
- 	"tabsContainerBorder": "Color de borde del encabezado del título del grupo de editores cuando las fichas están habilitadas. Los grupos de editores son contenedores de editores.",
-+<<<<<<< .our
- 	"editorGroupHeaderBackground": "Color de fondo del encabezado de título del grupo editor cuando las tabulaciones están deshabilitadas (' \"Workbench. Editor. showTabs \": false '). Los grupos editor son los contenedores de los editores.",
-+=======
-+>>>>>>> .their
- 	"editorGroupBorder": "Color para separar varios grupos de editores entre sí. Los grupos de editores son los contenedores de los editores.",
- 	"editorDragAndDropBackground": "Color de fondo cuando se arrastran los editores. El color debería tener transparencia para que el contenido del editor pueda brillar a su través.",
- 	"panelBackground": "Color de fondo del panel. Los paneles se muestran debajo del área de editores y contienen vistas, como Salida y Terminal integrado.",
-@@ -41,8 +44,11 @@
- 	"statusBarNoFolderBorder": "Color de borde de la barra de estado que separa la barra lateral y el editor cuando no hay ninguna carpeta abierta. La barra de estado se muestra en la parte inferior de la ventana.",
- 	"statusBarItemActiveBackground": "Color de fondo de un elemento de la barra de estado al hacer clic. La barra de estado se muestra en la parte inferior de la ventana.",
- 	"statusBarItemHoverBackground": "Color de fondo de un elemento de la barra de estado al mantener el puntero. La barra de estado se muestra en la parte inferior de la ventana.",
-+<<<<<<< .our
- 	"statusBarProminentItemBackground": "Barra de estado elementos prominentes color de fondo. Los artículos prominentes se destacan de otras entradas de la barra de estado para indicar importancia, Cambiar el modo de  'Toggle Tab Key Moves Focus' de la paleta de comandos para ver un ejemplo. La barra de estado se muestra en la parte inferior de la ventana.",
- 	"statusBarProminentItemHoverBackground": "Barra de estado elementos prominentes color de fondo cuando se activa. Los artículos prominentes se destacan de otras entradas de la barra de estado para indicar importancia. Cambiar el modo de 'Toggle Tab Key Moves Focus' de la paleta de comandos para ver un ejemplo. La barra de estado se muestra en la parte inferior de la ventana.",
-+=======
-+>>>>>>> .their
- 	"activityBarBackground": "Color de fondo de la barra de actividad, que se muestra en el lado izquierdo o derecho y que permite cambiar entre diferentes vistas de la barra lateral.",
- 	"activityBarForeground": "Color de fondo de la barra de actividad (por ejemplo utilizado por los iconos). La barra de actividad muestra en el lado izquierdo o derecho y permite cambiar entre diferentes vistas de la barra lateral.",
- 	"activityBarBorder": "Color de borde de la barra de actividad que separa la barra lateral. La barra de actividad se muestra en el extremo derecho o izquierdo y permite cambiar entre las vistas de la barra lateral.",
-added in both
-  our    100644 9bb6104842d89b413c500800affec815c7e87827 i18n/esn/src/vs/workbench/common/views.i18n.json
-  their  100644 f22e31a7e4501ed4bba7c269b73d899d1c2e0ece i18n/esn/src/vs/workbench/common/views.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"duplicateId": "La vista con id '{0}' ya se encuentra registrada en la ubicación '{1}' "
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"duplicateId": "Ya existe una vista registrada con el identificador '{0}' en la ubicación '{1}'"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 81432663720a6a4eb93f9b7fae88edbba3a3eaac i18n/esn/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 89fe344b57b1d619a163cac9c32cff2261374fbd i18n/esn/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 c875a388e0395fd6c6818617dafef68c36c2a3cd i18n/esn/src/vs/workbench/electron-browser/actions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"closeWindow": "Cerrar ventana",
- 	"closeWorkspace": "Cerrar área de trabajo",
- 	"noWorkspaceOpened": "No hay ninguna área de trabajo abierta en esta instancia para cerrarla.",
-@@ -50,6 +53,14 @@
- 	"moveWindowTabToNewWindow": "Mover pestaña de ventana a una nueva ventana",
- 	"mergeAllWindowTabs": "Fusionar todas las ventanas",
- 	"toggleWindowTabsBar": "Alternar barra de pestañas de ventana",
-+<<<<<<< .our
- 	"about": "Acerca de {0}",
- 	"inspect context keys": "Inspeccionar claves de contexto"
-+=======
-+	"configureLocale": "Configurar idioma",
-+	"displayLanguage": "Define el lenguaje para mostrar de VSCode.",
-+	"doc": "Consulte {0} para obtener una lista de idiomas compatibles.",
-+	"restart": "Al cambiar el valor se requiere reiniciar VSCode.",
-+	"fail.createSettings": "No se puede crear '{0}' ({1})."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f2abdd8deafb9f03832ecba56880fac8af664758 i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 57d447a0a0b664b859bc321a1781f6980e63b0fd i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 dd5456c4e0f07be8abb74f0b7227b3b9cf2e50cf i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,12 +35,19 @@
- 	"panelDefaultLocation": "Controla la ubicación predeterminada del panel. Puede mostrarse en la parte inferior o a la derecha de la mesa de banco.",
- 	"statusBarVisibility": "Controla la visibilidad de la barra de estado en la parte inferior del área de trabajo.",
- 	"activityBarVisibility": "Controla la visibilidad de la barra de actividades en el área de trabajo.",
-+<<<<<<< .our
- 	"viewVisibility": "Controla la visibilidad de las acciones en el encabezado de la vista. Las acciones en el encabezado de la vista pueden ser siempre visibles, o solo cuando la vista es enfocada o apuntada.",
- 	"fontAliasing": "Controla el método de suavizado de fuentes en la mesa de trabajo.\n-por defecto: subpíxel suavizado de fuentes. En la mayoría las pantallas retina no dará el texto más agudo - alisado: suavizar la fuente a nivel del píxel, a diferencia de los subpíxeles. Puede hacer que la fuente aparezca más general - ninguno: desactiva el suavizado de fuentes. Texto se mostrará con dentados filos - auto: se aplica el 'default' o 'antialiasing' automáticamente en función de la DPI de la muestra.",
- 	"workbench.fontAliasing.default": "Suavizado de fuentes en subpíxeles. En la mayoría de las pantallas que no son Retina, esta opción muestra el texto más nítido.",
- 	"workbench.fontAliasing.antialiased": "Suaviza las fuentes en píxeles, en lugar de subpíxeles. Puede hacer que las fuentes se vean más claras en general.",
- 	"workbench.fontAliasing.none": "Deshabilita el suavizado de fuentes. El texto se muestra con bordes nítidos irregulares.",
- 	"workbench.fontAliasing.auto": "Aplica ' default ' o ' antialiased ' automáticamente basándose en la DPI de las pantallas.",
-+=======
-+	"fontAliasing": "Controla el método de suavizado de fuentes en el área de trabajo.\n- default: suavizado de fuentes en subpíxeles. En la mayoría de las pantallas que no son Retina, esta opción muestra el texto más nítido.\n- antialiased: suaviza las fuentes en píxeles, en lugar de subpíxeles. Puede hacer que las fuentes se vean más claras en general\n- none: deshabilita el suavizado de fuentes. El texto se muestra con bordes nítidos irregulares.",
-+	"workbench.fontAliasing.default": "Suavizado de fuentes en subpíxeles. En la mayoría de las pantallas que no son Retina, esta opción muestra el texto más nítido.",
-+	"workbench.fontAliasing.antialiased": "Suaviza las fuentes en píxeles, en lugar de subpíxeles. Puede hacer que las fuentes se vean más claras en general.",
-+	"workbench.fontAliasing.none": "Deshabilita el suavizado de fuentes. El texto se muestra con bordes nítidos irregulares.",
-+>>>>>>> .their
- 	"enableNaturalLanguageSettingsSearch": "Controla si habilita el modo de búsqueda de lenguaje natural para la configuración.",
- 	"windowConfigurationTitle": "Ventana",
- 	"window.openFilesInNewWindow.on": "Los archivos se abrirán en una nueva ventana",
-changed in both
-  base   100644 0f8291c057285c9438640a7cb6752223c9c667f4 i18n/esn/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  our    100644 53b616809b4df15fc5f76746da24f19a323e0ef3 i18n/esn/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  their  100644 68ea94e5a20f7f2c52acee807a6d7d7df1fa120e i18n/esn/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"debug.terminal.title": "depurado"
- }
-\ No newline at end of file
-changed in both
-  base   100644 1ba4ecd59bfc07c63a473d7ae6f7babb9e6398aa i18n/esn/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  our    100644 e802eea53ea3a73df02c2279784bba5d97b51e1e i18n/esn/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  their  100644 c01e0004e658acd2d3dbfd414c3bfb294cefe913 i18n/esn/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-changed in both
-  base   100644 3335907cc3ec704fac6ce4cc7ac138ac4b7b21f9 i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 99cc3686e6501d7b489d9fd1df7919d3f52f53bb i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 a0c3a72ce3f5c59798c7cf6a53acc84f41525f5f i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,11 @@
- 	"exeBasedRecommendation": "Se recomienda esta extensión porque tiene instalado {0} . ",
- 	"fileBasedRecommendation": "Esta extensión se recomienda basado en los archivos que abrió recientemente.",
- 	"workspaceRecommendation": "Esta extensión es recomendada por los usuarios del espacio de trabajo actual.",
-+=======
-+	"workspaceRecommendation": "Esta extensión es recomendada por los usuarios del espacio de trabajo actual.",
-+	"fileBasedRecommendation": "Esta extensión se recomienda basado en los archivos que abrió recientemente.",
-+	"exeBasedRecommendation": "Se recomienda esta extensión porque tiene instalado {0} . ",
-+>>>>>>> .their
- 	"reallyRecommended2": "La extension recomendada para este tipo de archivo es {0}",
- 	"reallyRecommendedExtensionPack": "Para este tipo de fichero, se recomienda el paquete de extensión '{0}'.",
- 	"install": "Instalar",
-added in both
-  our    100644 435b23b45a195a35cafd6efbf416e4143f9ada87 i18n/esn/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-  their  100644 eff0be207f1523cbe6f854eab3747ba5db7b51c3 i18n/esn/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,13 @@
- 	],
- 	"workbenchConfigurationTitle": "Área de trabajo",
- 	"feedbackVisibility": "Controla la visibilidad de los comentarios de Twitter (smiley) en la barra de estado en la parte inferior del área de trabajo."
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"workbenchConfigurationTitle": "Área de trabajo"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 ad2caa896d3e0225c45812b0baff3ede0c7a94fc i18n/esn/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/esn/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"hide": "Ocultar"
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 5b4f1d9a867259ee397b0ce30c196d0e0e92f66c i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  our    100644 1dbea27e4536b6f350db236a658aa477ded299b1 i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  their  100644 619e931bff18f0074492cfaf0afc59758beb6ae3 i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-@@ -12,7 +12,10 @@
- 	"revertLocalChanges": "Descartar los cambios y volver al contenido del disco",
- 	"copyPathOfActive": "Copiar ruta del archivo activo",
- 	"saveAllInGroup": "Guardar todo en el grupo",
-+<<<<<<< .our
- 	"saveFiles": "Guardar todos los archivos",
-+=======
-+>>>>>>> .their
- 	"revert": "Revertir archivo",
- 	"compareActiveWithSaved": "Comparar el archivo activo con el guardado",
- 	"closeEditor": "Cerrar editor",
-@@ -24,12 +27,19 @@
- 	"copyPath": "Copiar ruta de acceso",
- 	"saveAll": "Guardar todos",
- 	"compareWithSaved": "Comparar con el guardado",
-+<<<<<<< .our
- 	"compareWithSelected": "Comparar con seleccionados",
- 	"compareSource": "Seleccionar para comparar",
- 	"compareSelected": "Comparar seleccionados",
- 	"close": "Cerrar",
- 	"closeOthers": "Cerrar otros",
- 	"closeSaved": "Cerrar guardados",
-+=======
-+	"compareSource": "Seleccionar para comparar",
-+	"close": "Cerrar",
-+	"closeOthers": "Cerrar otros",
-+	"closeUnmodified": "Cerrar los que no se han modificado",
-+>>>>>>> .their
- 	"closeAll": "Cerrar todo",
- 	"deleteFile": "Eliminar permanentemente"
- }
-\ No newline at end of file
-changed in both
-  base   100644 849c94fa0c7e35ab449c4fc3119e299ffdce94ab i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 1e23db714d120943226391e3c5ce27170460d94d i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 a96cb97676ffa634304afac30a02a0f35df8afc1 i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"newFile": "Nuevo archivo",
- 	"newFolder": "Nueva carpeta",
- 	"rename": "Cambiar nombre",
-@@ -13,7 +16,11 @@
- 	"copyFile": "Copiar",
- 	"pasteFile": "Pegar",
- 	"retry": "Reintentar",
-+<<<<<<< .our
- 	"renameWhenSourcePathIsParentOfTargetError": "Utilice el comando 'Nueva carpeta' o 'Nuevo archivo' para agregar elementos a una carpeta existente ",
-+=======
-+	"openFolderFirst": "Abra primero una carpeta para crear archivos o carpetas en ella.",
-+>>>>>>> .their
- 	"newUntitledFile": "Nuevo archivo sin título",
- 	"createNewFile": "Nuevo archivo",
- 	"createNewFolder": "Nueva carpeta",
-@@ -43,11 +50,19 @@
- 	"confirmDeleteMessageMultiple": "¿Está seguro de que desea eliminar de forma permanente los siguientes archivos {0}?",
- 	"confirmDeleteMessageFolder": "¿Está seguro de que desea eliminar '{0}' y su contenido de forma permanente?",
- 	"confirmDeleteMessageFile": "¿Está seguro de que desea eliminar '{0}' de forma permanente?",
-+<<<<<<< .our
- 	"addFiles": "Agregar archivos",
- 	"confirmOverwrite": "Ya existe un archivo o carpeta con el mismo nombre en la carpeta de destino. ¿Quiere reemplazarlo?",
- 	"replaceButtonLabel": "&&Reemplazar",
- 	"fileIsAncestor": "El archivo que se va a pegar es un antecesor de la carpeta de destino",
- 	"fileDeleted": "El archivo que se iba a pegar se ha eliminado o movido mientras tanto",
-+=======
-+	"irreversible": "Esta acción es irreversible.",
-+	"permDelete": "Eliminar permanentemente",
-+	"importFiles": "Importar archivos",
-+	"confirmOverwrite": "Ya existe un archivo o carpeta con el mismo nombre en la carpeta de destino. ¿Quiere reemplazarlo?",
-+	"replaceButtonLabel": "&&Reemplazar",
-+>>>>>>> .their
- 	"duplicateFile": "Duplicado",
- 	"globalCompareFile": "Comparar archivo activo con...",
- 	"openFileToCompare": "Abrir un archivo antes para compararlo con otro archivo.",
-changed in both
-  base   100644 f417c4b11aaeae4178ccd7c01777f554f3dd838a i18n/esn/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  our    100644 c49256b3f498d54fd8e17479701ff2178d372675 i18n/esn/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  their  100644 41e7bc8dcafb70b3ede33e55a3c6184c4856c1e6 i18n/esn/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,14 +7,21 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"revealInWindows": "Mostrar en el Explorador",
- 	"revealInMac": "Mostrar en Finder",
- 	"openContainer": "Abrir carpeta contenedora",
- 	"saveAs": "Guardar como...",
- 	"save": "Guardar",
- 	"saveAll": "Guardar todos",
-+<<<<<<< .our
- 	"removeFolderFromWorkspace": "Quitar carpeta del área de trabajo",
- 	"genericRevertError": "No se pudo revertir ' {0} ': {1}",
-+=======
-+	"saveFiles": "Guardar todos los archivos",
-+	"removeFolderFromWorkspace": "Quitar carpeta del área de trabajo",
-+>>>>>>> .their
- 	"modifiedLabel": "{0} (en el disco) ↔ {1}",
- 	"openFileToReveal": "Abrir un archivo antes para mostrarlo",
- 	"openFileToCopy": "Abrir un archivo antes para copiar su ruta de acceso"
-changed in both
-  base   100644 6b7926d2bf7039c9fedbd3b89b2c9e98ee891b0d i18n/esn/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 530360de300c015c0e1de9b17dd26ccddaf04e46 i18n/esn/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 34df999607beee7ceb3dd186b892826c19a33c5e i18n/esn/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-@@ -40,7 +40,10 @@
- 	"formatOnSave": "Formatea un archivo al guardarlo. Debe haber un formateador disponible, el archivo no debe guardarse automáticamente y el editor no debe estar cerrándose.",
- 	"formatOnSaveTimeout": "Tiempo de espera de aplicación de formato al guardar. Especifica un límite de tiempo en milisegundos para los comandos formatOnSave. Los comandos que tarden más del tiempo de espera especificado se cancelarán.",
- 	"explorerConfigurationTitle": "Explorador de archivos",
-+<<<<<<< .our
- 	"openEditorsVisible": "Número de editores mostrados en el panel de editores abiertos.",
-+=======
-+>>>>>>> .their
- 	"autoReveal": "Controla si el explorador debe mostrar y seleccionar automáticamente los archivos al abrirlos.",
- 	"enableDragAndDrop": "Controla si el explorador debe permitir mover archivos y carpetas mediante la función arrastrar y colocar.",
- 	"confirmDragAndDrop": "Controla si el explorador debe pedir la confirmación al reubicar archivos o carpetas a través de arrastrar y soltar.",
-changed in both
-  base   100644 186f5cdaa427312a38cea816fd6aefcbf2dffeee i18n/esn/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  our    100644 c8225196607251b5e80d30b5cb856d0580528d43 i18n/esn/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  their  100644 85b5734142ed89efdd39e71bc3d6358f9b5ff0f7 i18n/esn/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,6 +14,12 @@
- 	"readonlySaveErrorAdmin": "No se pudo guardar '{0}': El archivo está protegido contra escritura. Seleccione 'Sobrescribir como Admin' para volverlo a intentar como administrador.",
- 	"readonlySaveError": "No se pudo guardar '{0}': El archivo está protegido contra escritura. Seleccione 'Sobrescribir' para intentar quitar la protección.",
- 	"permissionDeniedSaveError": "No se pudo guardar '{0}': Permisos insuficientes. Seleccione 'Reintentar como Admin' para volverlo a intentar como administrador.",
-+=======
-+	"userGuide": "Use las acciones de la barra de herramientas del editor situada a la derecha para **deshacer** los cambios o **sobrescribir** el contenido del disco con sus cambios",
-+	"overwrite": "Sobrescribir",
-+	"retry": "Reintentar",
-+	"discard": "Descartar",
-+>>>>>>> .their
- 	"genericSaveError": "No se pudo guardar '{0}': {1}",
- 	"learnMore": "Más información",
- 	"dontShowAgain": "No volver a mostrar",
-changed in both
-  base   100644 b4bad361098c6b698b532b3104154851075ba621 i18n/esn/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  our    100644 5fbf86be80c868954306037ae08ea885b5396dcf i18n/esn/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  their  100644 f5060aef05b2a77caad343c683ddc2a6d8eb8101 i18n/esn/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-added in both
-  our    100644 aed691191cb06f4b2844db758a0a68d4ea03c112 i18n/esn/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-  their  100644 68e35e56b163c1bbb124959749646d8eb2764f69 i18n/esn/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,5 +11,13 @@
- 	"sharedLog": "Log (Compartido)",
- 	"rendererLog": "Log (Ventana)",
- 	"extensionsLog": "Log (Extensión del Host)",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"developer": "Desarrollador"
- }
-\ No newline at end of file
-added in both
-  our    100644 6d6dfbb8c770fb0e507d7b4d7b666813db7a2504 i18n/esn/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  their  100644 80e723dfda2eca4385e346201afd0109e929d186 i18n/esn/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -16,15 +17,35 @@
- 	"selectProcess": "Seleccionar un registro para procesar",
- 	"openLogFile": "Abrir archivo de log...",
- 	"setLogLevel": "Establecer nivel de registro...",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"openLogsFolder": "Abrir carpeta de registros",
-+	"showLogs": "Mostrar registros...",
-+	"mainProcess": "Principal",
-+	"sharedProcess": "Compartido",
-+	"rendererProcess": "Ventana",
-+	"extensionHost": "Host de extensión",
-+	"selectProcess": "Seleccionar proceso",
-+	"setLogLevel": "Establecer nivel de registro",
-+>>>>>>> .their
- 	"trace": "Seguimiento",
- 	"debug": "Depurar",
- 	"info": "Información",
- 	"warn": "Advertencia",
- 	"err": "Error",
- 	"critical": "Crítico",
-+<<<<<<< .our
- 	"off": "Apagado",
- 	"selectLogLevel": "Seleccionar nivel de log",
- 	"default and current": "Predeterminado y actual ",
- 	"default": "Predeterminado",
- 	"current": "Actual\n"
-+=======
-+	"off": "Apagado"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a028050eafbc7240b9d3feb32eb7cba0d745377b i18n/esn/src/vs/workbench/parts/markers/common/messages.i18n.json
-  our    100644 b9a7c1d4a8655de528c4e8a8c59413fe51aea89e i18n/esn/src/vs/workbench/parts/markers/common/messages.i18n.json
-  their  100644 b28c9ca334272d634234979721c470b87f49b613 i18n/esn/src/vs/workbench/parts/markers/common/messages.i18n.json
-@@ -7,8 +7,11 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"viewCategory": "Ver",
-+<<<<<<< .our
- 	"problems.view.toggle.label": "Alternar problemas (errores, advertencias, información)",
- 	"problems.view.focus.label": "Problemas de enfoque (errores, advertencias, información)",
-+=======
-+>>>>>>> .their
- 	"problems.panel.configuration.title": "Vista Problemas",
- 	"problems.panel.configuration.autoreveal": "Controla si la vista Problemas debe revelar automáticamente los archivos cuando los abre",
- 	"markers.panel.title.problems": "Problemas",
-added in both
-  our    100644 1ce77e76c3fe1ef57f1b3d147bb4e4d2c90985dc i18n/esn/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-  their  100644 c75638715f922570d102dc714c608db8ff735b6d i18n/esn/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -11,4 +12,15 @@
- 	"viewCategory": "Ver",
- 	"clearOutput.label": "Borrar salida",
- 	"openActiveLogOutputFile": "Ver: abrir el archivo de salida del registro activo"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"output": "Salida",
-+	"viewCategory": "Ver",
-+	"clearOutput.label": "Borrar salida"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 49cc23858561615b313b90ea5575f4fcab086a03 i18n/esn/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/esn/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,12 @@
- 	],
- 	"output": "{0} - Output",
- 	"channel": "Canal de output para '{0}' "
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 b720c2b8a5720c8e6aeab62ad792fadbe7c31519 i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 ab7d78224458e031f0d5873434caefe0111f3854 i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 7f4ed8494b70511298bc515478b6363a200b8c47 i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"defaultSettings": "Colocar la configuración en el editor de lado de mano derecha para anular.",
- 	"noSettingsFound": "No se encontró ninguna configuración.",
- 	"settingsSwitcherBarAriaLabel": "Conmutador de configuración",
-changed in both
-  base   100644 575bc61fdb44c04e4bc6df49a5c23a0b03c70826 i18n/esn/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  our    100644 38c1319f3c18210eb148df6e618f8acb25d84c62 i18n/esn/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  their  100644 2ae85dc2ac18da574504382d4fc94ba8b9f47537 i18n/esn/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-changed in both
-  base   100644 3a50ec52260a1cfb23ff26fd945816a32fb6aaed i18n/esn/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  our    100644 09eabb344398908e0c8f2f2df9597c1873d32a81 i18n/esn/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  their  100644 6e19797b529d15e80e1ccdf9306947ec87f3fe64 i18n/esn/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"view": "Ver",
- 	"commandsHandlerDescriptionDefault": "Mostrar y ejecutar comandos",
- 	"gotoLineDescriptionMac": "Ir a la línea",
-changed in both
-  base   100644 2d44f58d5145a7f19318557e6b24393b0a4bea4c i18n/esn/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  our    100644 dcde42ae5b9e9263b1e8523db6c8f5fea75da510 i18n/esn/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  their  100644 c5061e853b0d544066fbea469f51de1f48f43e2f i18n/esn/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-@@ -10,8 +10,12 @@
- 	"source control": "Control de código fuente",
- 	"toggleSCMViewlet": "Mostrar SCM",
- 	"view": "Ver",
-+<<<<<<< .our
- 	"scmConfigurationTitle": "SCM",
- 	"alwaysShowProviders": "Si desea mostrar siempre la sección proveedor de control de código fuente.",
- 	"diffDecorations": "Controla las decoraciones de diff en el editor.",
- 	"diffGutterWidth": "Controla el ancho (px) de las decoraciones de diferencias en el medianil (agregadas y modificadas)."
-+=======
-+	"scmConfigurationTitle": "SCM"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 bcfc62d1906034ad2de3cf999de8e6f1f816060a i18n/esn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 08f95963fe8efaa9640a8368bea5bd91b3e1ccb0 i18n/esn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 5357b8b610a47599a4ec9ac16d9cc0401252bcec i18n/esn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-changed in both
-  base   100644 fe7e74dbe3347b3193953e09f1f3134f38f031f2 i18n/esn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 d7550e4cd76b5e1079a00c63a6ae28b84fca74d3 i18n/esn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 a0aba2b8419960038690fe853d75ac51a2ec64be i18n/esn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,11 +13,18 @@
- 	"copyAllLabel": "Copiar todo",
- 	"clearSearchHistoryLabel": "Borrar historial de búsqueda",
- 	"toggleSearchViewPositionLabel": "Alternar la posición de vista de búsqueda",
-+=======
-+>>>>>>> .their
- 	"findInFolder": "Buscar en carpeta...",
- 	"findInWorkspace": "Buscar en área de trabajo...",
- 	"showTriggerActions": "Ir al símbolo en el área de trabajo...",
- 	"name": "Buscar",
-+<<<<<<< .our
- 	"showSearchViewl": "Mostrar búsqueda",
-+=======
-+	"search": "Buscar",
-+	"showSearchViewlet": "Mostrar búsqueda",
-+>>>>>>> .their
- 	"view": "Ver",
- 	"findInFiles": "Buscar en archivos",
- 	"openAnythingHandlerDescription": "Ir al archivo",
-added in both
-  our    100644 b2b344c8a846e36292a8956d98d0de9827e2109b i18n/esn/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-  their  100644 9675a4f182c260697a0657f2df233ce6fd0c0cd2 i18n/esn/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -13,5 +14,14 @@
- 	"new.global.sep": "Nuevos fragmentos de código",
- 	"openSnippet.pickLanguage": "Seleccione Archivo de fragmentos o Crear fragmentos de código",
- 	"openSnippet.label": "Configurar fragmentos de usuario ",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"global.1": "({0})",
-+>>>>>>> .their
- 	"preferences": "Preferencias"
- }
-\ No newline at end of file
-changed in both
-  base   100644 c49e1beb60b7114849f6666bc9a7245fb56b2854 i18n/esn/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  our    100644 c162d3a865814ba204996b9b8c83e0a5a11dc0ef i18n/esn/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  their  100644 5fb6638f35be5d2308588ccc1c3a19405d5df73a i18n/esn/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"snippetSchema.json.default": "Fragmento de código vacío",
- 	"snippetSchema.json": "Configuración de fragmento de código del usuario",
- 	"snippetSchema.json.prefix": "El prefijo que se debe usar al seleccionar el fragmento de código en Intellisense",
-added in both
-  our    100644 4e9dde048d3554df0b3c9ad9eb45e9a57e1ae767 i18n/esn/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-  their  100644 8c806f2935a012b6df0aacb8d136405e86d62f23 i18n/esn/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,5 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"source.snippetGlobal": "Fragmento del usuario global",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"source.snippet": "Fragmento de código del usuario"
- }
-\ No newline at end of file
-changed in both
-  base   100644 ecf3b81fb81f80fbc859664dd185fb4800869794 i18n/esn/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  our    100644 336485742eb7e33ce1559e1ea1a94d2bd2070216 i18n/esn/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 34d3cff577c3035e0bfe679a5e2adeadc56ca579 i18n/esn/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,9 @@
- 	],
- 	"invalid.path.0": "Se esperaba una cadena en \"contributes.{0}.path\". Valor proporcionado: {1}",
- 	"invalid.language.0": "Al omitir el lenguaje, el valor de 'contributes. {0}. Path' debe ser un archivo '. Code-snippets'. Valor proporcionado: {1}",
-+=======
-+	"invalid.path.0": "Se esperaba una cadena en \"contributes.{0}.path\". Valor proporcionado: {1}",
-+>>>>>>> .their
- 	"invalid.language": "Lenguaje desconocido en \"contributes.{0}.language\". Valor proporcionado: {1}",
- 	"invalid.path.1": "Se esperaba que \"contributes.{0}.path\" ({1}) se incluyera en la carpeta de la extensión ({2}). Esto puede hacer que la extensión no sea portátil.",
- 	"vscode.extension.contributes.snippets": "Aporta fragmentos de código.",
-changed in both
-  base   100644 b41adfc8dd9501e20adcfddf83682fff38019c8e i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 452c57e69431420c6bcfb59a898fee8e18810b50 i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 f8bbe6f41b9fe6df040339754d4ce508336db19f i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -10,7 +10,11 @@
- 	"terminal.foreground": "El color de primer plano del terminal.",
- 	"terminalCursor.foreground": "Color de primer plano del cursor del terminal.",
- 	"terminalCursor.background": "Color de fondo del cursor del terminal. Permite personalizar el color de un carácter solapado por un cursor de bloque.",
-+<<<<<<< .our
- 	"terminal.selectionBackground": "Color de fondo de selección del terminal.",
- 	"terminal.border": "Color del borde que separa paneles divididos en el terminal. El valor predeterminado es panel.border.",
- 	"terminal.ansiColor": "color ANSI ' {0} ' en el terminal."
-+=======
-+	"terminal.selectionBackground": "Color de fondo de selección del terminal."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 1a5374df014415b68f0f6986ac389717c605e88c i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  our    100644 689cce2491f015781c9b24c814852e6d003b5f99 i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  their  100644 d5f5c068b5f16e1fe921bd9a429cea361aa7bef2 i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-@@ -8,7 +8,11 @@
- 	],
- 	"terminal.integrated.chooseWindowsShellInfo": "Para cambiar el shell de terminal predeterminado, seleccione el botón Personalizar.",
- 	"customize": "Personalizar",
-+<<<<<<< .our
- 	"never again": "No volver a mostrar",
-+=======
-+	"cancel": "Cancelar",
-+>>>>>>> .their
- 	"terminal.integrated.chooseWindowsShell": "Seleccione el shell de terminal que desee, puede cambiarlo más adelante en la configuración",
- 	"terminalService.terminalCloseConfirmationSingular": "Hay una sesión de terminal activa, ¿quiere terminarla?",
- 	"terminalService.terminalCloseConfirmationPlural": "Hay {0} sesiones de terminal activas, ¿quiere terminarlas?"
-changed in both
-  base   100644 1d8632efe35f2ff3166aa0263f593a2d23533d30 i18n/esn/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  our    100644 4b86e7ab2775952921d67856af54454ce0ec3d5d i18n/esn/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  their  100644 45b01f6989760ad38e8c70c68e70e9d0961743be i18n/esn/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,4 +14,8 @@
- 	"fileBinaryError": "El archivo parece ser binario y no se puede abrir como texto",
- 	"err.create": "No se pudo crear el archivo {0}",
- 	"fileMoveConflict": "No se puede mover o copiar. El archivo ya existe en la ubicación de destino. "
-+=======
-+	"fileNotModifiedError": "Archivo no modificado desde",
-+	"fileBinaryError": "El archivo parece ser binario y no se puede abrir como texto"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e49927e3bdf91eb08ced657429584d077de52228 i18n/esn/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  our    100644 fed00bd32680a81ef2272a7f7f5db25e0b1f5c94 i18n/esn/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  their  100644 caa8ce6bf0013b31e5ccb2ed5aee668636d3d35e i18n/esn/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-changed in both
-  base   100644 302c7ed170b67df7c7253f5a7dade850bdcbcbca i18n/esn/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 5a34a01efe3be981f2f79fe82b2b70f00f7de801 i18n/esn/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 410c2efcbcbb1115a7d34e1054b4785a0243686a i18n/esn/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-changed in both
-  base   100644 83604230ec4d9b0f30399254ca5e2f6cc31dea0b i18n/esn/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  our    100644 3fc80146a13ac4d0fb26444f689ade8ddc44a010 i18n/esn/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  their  100644 e7f9d116f0184a7add12c292ea49766fcc201be0 i18n/esn/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-@@ -8,5 +8,10 @@
- 	],
- 	"errorInvalidTaskConfiguration": "No se puede escribir en el archivo de configuración del espacio de trabajo. Por favor, abra el archivo para corregir sus errores/advertencias e inténtelo de nuevo.",
- 	"errorWorkspaceConfigurationFileDirty": "No se puede escribir en el archivo de configuración de espacio de trabajo porque el archivo ha sido modificado. Por favor, guárdelo y vuelva a intentarlo.",
-+<<<<<<< .our
- 	"openWorkspaceConfigurationFile": "Configuración del espacio de trabajo abierta"
-+=======
-+	"openWorkspaceConfigurationFile": "Abrir archivo de configuración del área de trabajo",
-+	"close": "Cerrar"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c7e1b61f3ec5ed59936e065e9abf976b7d27c45e i18n/fra/extensions/git/out/autofetch.i18n.json
-  our    100644 3f1feec0c843445e5da3bdcdbe026cb81413d634 i18n/fra/extensions/git/out/autofetch.i18n.json
-  their  100644 54fcbb321ef6d280cfe5004e6709b442fbb41609 i18n/fra/extensions/git/out/autofetch.i18n.json
-@@ -7,7 +7,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"yes": "Oui",
-+<<<<<<< .our
- 	"no": "Non",
- 	"not now": "Me demander plus tard",
- 	"suggest auto fetch": "Voulez-vous que Code exécute [périodiquement 'git fetch']({0}) ?"
-+=======
-+	"read more": "Lire la suite",
-+	"no": "Non"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ec8efb3f0d7c9db3de2b430fa5b890ce09d681b1 i18n/fra/extensions/git/out/commands.i18n.json
-  our    100644 95b33e9cb37384a542e0f0621ed506addc05f3b9 i18n/fra/extensions/git/out/commands.i18n.json
-  their  100644 cc941a646ad841569c88ce288085911a8e533c0a i18n/fra/extensions/git/out/commands.i18n.json
-@@ -71,12 +71,19 @@
- 	"pick remote pull repo": "Choisir un dépôt distant duquel extraire la branche",
- 	"no remotes to push": "Votre dépôt n'a aucun dépôt distant configuré pour un Push.",
- 	"nobranch": "Vous devez extraire une branche dont vous souhaitez effectuer le Push vers un emplacement distant.",
-+<<<<<<< .our
- 	"confirm publish branch": "La branche '{0}' n'a pas de branche en amont. Voulez-vous publier cette branche ?",
- 	"ok": "OK",
- 	"push with tags success": "Envoyé (push) avec des balises.",
- 	"pick remote": "Choisissez un dépôt distant où publier la branche '{0}' :",
- 	"sync is unpredictable": "Cette action va effectuer un transfert (Push) et une récupération (Pull) des commits à destination et en provenance de '{0}/{1}'.",
- 	"never again": "OK, Ne plus afficher",
-+=======
-+	"ok": "OK",
-+	"push with tags success": "Envoyé (push) avec des balises.",
-+	"pick remote": "Choisissez un dépôt distant où publier la branche '{0}' :",
-+	"sync is unpredictable": "Cette action effectue un transfert (Push) et un tirage (Pull) des validations à destination et en provenance de '{0}'.",
-+>>>>>>> .their
- 	"no remotes to publish": "Votre dépôt n'a aucun dépôt distant configuré pour une publication.",
- 	"no changes stash": "Aucune modification à remiser (stash).",
- 	"provide stash message": "Spécifier éventuellement un message pour la remise (stash)",
-added in both
-  our    100644 1738a01dc86a6b278c846837e519b86be98cd86b i18n/fra/extensions/typescript/out/commands.i18n.json
-  their  100644 6c1e268636a398598dc2d0ca2dce2b7023c1f0e9 i18n/fra/extensions/typescript/out/commands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -13,4 +14,20 @@
- 	"typescript.noJavaScriptProjectConfig": "Le fichier ne fait pas partie d'un projet JavaScript. Cliquer [ici]({0}) pour en savoir plus.",
- 	"typescript.configureTsconfigQuickPick": "Configurer tsconfig.json",
- 	"typescript.configureJsconfigQuickPick": "Configurer jsconfig.json"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"typescript.projectConfigNoWorkspace": "Ouvrez un dossier dans VS Code pour utiliser un projet TypeScript ou JavaScript",
-+	"typescript.projectConfigUnsupportedFile": "Impossible de déterminer le projet TypeScript ou JavaScript. Type de fichier non pris en charge",
-+	"typescript.projectConfigCouldNotGetInfo": "Impossible de déterminer le projet TypeScript ou JavaScript",
-+	"typescript.noTypeScriptProjectConfig": "Le fichier ne fait pas partie d'un projet TypeScript",
-+	"typescript.noJavaScriptProjectConfig": "Le fichier ne fait pas partie d'un projet JavaScript",
-+	"typescript.configureTsconfigQuickPick": "Configurer tsconfig.json",
-+	"typescript.configureJsconfigQuickPick": "Configurer jsconfig.json",
-+	"typescript.projectConfigLearnMore": "En savoir plus"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 750d811d866eaa3d43818bd1d8e28c9898acf514 i18n/fra/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/fra/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"selectAriaOption": "{0}"
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-added in both
-  our    100644 35e988ef51fde8c623e4c8b67918761cbfe7d329 i18n/fra/src/vs/base/node/ps.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/fra/src/vs/base/node/ps.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"collecting": "Récupération des informations processeur et mémoire. Cela peut prendre quelques secondes."
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 dd19016cb459a92b6c18acdc20e0d80133be0e99 i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 1ad1b4ad7ba3d841a13ddfeab561381b182d7f45 i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 406f474987ef89483ce600f8d8386660291e1abe i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -16,7 +16,10 @@
- 	"lineNumbers.on": "Les numéros de ligne sont affichés en nombre absolu.",
- 	"lineNumbers.relative": "Les numéros de ligne sont affichés sous la forme de distance en lignes à la position du curseur.",
- 	"lineNumbers.interval": "Les numéros de ligne sont affichés toutes les 10 lignes.",
-+<<<<<<< .our
- 	"lineNumbers": "Contrôle l’affichage des numéros de ligne.",
-+=======
-+>>>>>>> .their
- 	"rulers": "Afficher les règles verticales après un certain nombre de caractères à espacement fixe. Utiliser plusieurs valeurs pour plusieurs règles. Aucune règle n'est dessinée si le tableau est vide",
- 	"wordSeparators": "Caractères utilisés comme séparateurs de mots durant la navigation ou les opérations basées sur les mots",
- 	"tabSize": "Le nombre d'espaces correspondant à une tabulation. Ce paramètre est remplacé en fonction du contenu du fichier quand 'editor.detectIndentation' est activé.",
-changed in both
-  base   100644 4bea17a181e6f3c8bf610dfeee088c6a024707f0 i18n/fra/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 e3b7be89c4680bacecf118915da9495bb164163d i18n/fra/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 f2cc0b4325a89c44451e40b4607bf44c8fe527e9 i18n/fra/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -8,8 +8,11 @@
- 	],
- 	"lineHighlight": "Couleur d'arrière-plan de la mise en surbrillance de la ligne à la position du curseur.",
- 	"lineHighlightBorderBox": "Couleur d'arrière-plan de la bordure autour de la ligne à la position du curseur.",
-+<<<<<<< .our
- 	"rangeHighlight": "Couleur d'arrière-plan des plages mises en surbrillance, par exemple par les fonctionnalités d'ouverture rapide et de recherche. La couleur ne doit pas être opaque pour ne pas masquer les décorations sous-jacentes.",
- 	"rangeHighlightBorder": "Couleur d'arrière-plan de la bordure autour des plages mises en surbrillance.",
-+=======
-+>>>>>>> .their
- 	"caret": "Couleur du curseur de l'éditeur.",
- 	"editorCursorBackground": "La couleur de fond du curseur de l'éditeur. Permet de personnaliser la couleur d'un caractère survolé par un curseur de bloc.",
- 	"editorWhitespaces": "Couleur des espaces blancs dans l'éditeur.",
-changed in both
-  base   100644 2e7dbc5e1ee03a2dfa6f52125f1f97d9f87ec6ef i18n/fra/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  our    100644 ea5476700aaf3baa2b1d9f2182980ee09877e07b i18n/fra/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  their  100644 e09d1ef1ebe9833a5ffa9f7c8fbb832813b3ec47 i18n/fra/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -10,4 +11,11 @@
- 	"markerAction.previous.label": "Aller au problème précédent (Erreur, Avertissement, Info)",
- 	"markerAction.nextInFiles.label": "Aller au problème suivant dans Fichiers (Erreur, Avertissement, Info)",
- 	"markerAction.previousInFiles.label": "Aller au problème précédent dans Fichiers (Erreur, Avertissement, Info)"
-+=======
-+	"title.wo_source": "({0}/{1})",
-+	"editorMarkerNavigationError": "Couleur d'erreur du widget de navigation dans les marqueurs de l'éditeur.",
-+	"editorMarkerNavigationWarning": "Couleur d'avertissement du widget de navigation dans les marqueurs de l'éditeur.",
-+	"editorMarkerNavigationInfo": "Couleur d’information du widget de navigation du marqueur de l'éditeur.",
-+	"editorMarkerNavigationBackground": "Arrière-plan du widget de navigation dans les marqueurs de l'éditeur."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 45974daea0a3b23575493224f878de50cb38f733 i18n/fra/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  our    100644 0eab06eb685f4758358cca5f7016ccbea93a5376 i18n/fra/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  their  100644 9b718f920086f343eae9c3decae9933ee46d7aac i18n/fra/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,10 @@
- 	"wordHighlightStrongBorder": "Couleur de bordure d'un symbole durant l'accès en écriture, par exemple l'écriture dans une variable.",
- 	"overviewRulerWordHighlightForeground": "Couleur du marqueur de la règle d'aperçu pour les mises en surbrillance de symbole. La couleur doit ne pas être opaque pour ne pas masquer les décorations du dessous.",
- 	"overviewRulerWordHighlightStrongForeground": "Couleur du marqueur de la règle d'aperçu pour les mises en surbrillance de symbole d'accès en écriture. La couleur doit ne pas être opaque pour ne pas masquer les décorations du dessous.",
-+=======
-+	"overviewRulerWordHighlightForeground": "Couleur du marqueur de la règle d'aperçu pour la mise en évidence de symbole.",
-+	"overviewRulerWordHighlightStrongForeground": "Couleur du marqueur de la règle d'aperçu la mise en évidence de symbole d’accès en écriture.",
-+>>>>>>> .their
- 	"wordHighlight.next.label": "Aller à la prochaine mise en évidence de symbole",
- 	"wordHighlight.previous.label": "Aller à la mise en évidence de symbole précédente"
- }
-\ No newline at end of file
-changed in both
-  base   100644 ed0024d2710056b6d6aa2cc7085850607a7ec970 i18n/fra/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  our    100644 8224c04d14f4b9a2a9f4bfece560cc047b4d9b4d i18n/fra/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  their  100644 f13a4bbc9e9acb8a343321c0ceb324931c583f8e i18n/fra/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 f676e6c787f3387989d02061946c3167f2b6852a i18n/fra/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 3a6ec15a4d0b2f141967d5aa037637bcdca560c3 i18n/fra/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 7b909d1fca4c04119fc6bee39d2c48c934a4df4c i18n/fra/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,11 +10,19 @@
- 	"diff": "Comparez deux fichiers entre eux.",
- 	"add": "Ajoutez un ou plusieurs dossiers à la dernière fenêtre active.",
- 	"goto": "Ouvrez un fichier dans le chemin, à la ligne et la position de caractère spécifiées.",
-+<<<<<<< .our
- 	"newWindow": "Force à ouvrir une nouvelle fenêtre.",
- 	"reuseWindow": "Force à ouvrir un fichier ou un dossier dans la dernière fenêtre active.",
- 	"wait": "Attendre que les fichiers soient fermés avant de retourner.",
- 	"locale": "Paramètres régionaux à utiliser (exemple : fr-FR ou en-US).",
- 	"userDataDir": "Spécifie le répertoire de l’utilisateur dans lequel les données sont conservées. Peut être utilisé pour ouvrir plusieurs instances distinctes du Code.",
-+=======
-+	"newWindow": "Forcez l'utilisation d'une nouvelle instance de Code.",
-+	"reuseWindow": "Forcez l'ouverture d'un fichier ou dossier dans la dernière fenêtre active.",
-+	"wait": "Attendre que les fichiers soient fermés avant de retourner.",
-+	"locale": "Paramètres régionaux à utiliser (exemple : fr-FR ou en-US).",
-+	"userDataDir": "Spécifie le répertoire où sont conservées les données des utilisateurs. S'avère utile pour une exécution en tant que root.",
-+>>>>>>> .their
- 	"version": "Affichez la version.",
- 	"help": "Affichez le mode d'utilisation.",
- 	"extensionHomePath": "Définissez le chemin racine des extensions.",
-@@ -22,18 +30,28 @@
- 	"showVersions": "Affichez les versions des extensions installées, quand --list-extension est utilisé.",
- 	"installExtension": "Installe une extension.",
- 	"uninstallExtension": "Désinstalle une extension.",
-+<<<<<<< .our
- 	"experimentalApis": "Active les fonctionnalités de l’API proposées pour une extension.",
-+=======
-+	"experimentalApis": "Active les fonctionnalités d'API proposées pour une extension.",
-+>>>>>>> .their
- 	"verbose": "Affichez la sortie détaillée (implique --wait).",
- 	"log": "Niveau de journalisation à utiliser. La valeur par défaut est 'info'. Les valeurs autorisées sont 'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off.",
- 	"status": "Imprimer l'utilisation de processus et l'information des diagnostics.",
- 	"performance": "Démarrez avec la commande 'Développeur : performance de démarrage' activée.",
- 	"prof-startup": "Exécuter le profileur d'UC au démarrage",
- 	"disableExtensions": "Désactivez toutes les extensions installées.",
-+<<<<<<< .our
- 	"inspect-extensions": "Permettre le débogage et le profilage d’extensions. Vérifier les outils de développement pour l'URI de connexion.",
- 	"inspect-brk-extensions": "Permettre le débogage et le profilage d’extensions avec l’hôte de l’extension étant suspendu après le démarrage. Vérifier les outils de développement pour l'URI de connexion.",
- 	"disableGPU": "Désactivez l'accélération matérielle du GPU.",
- 	"uploadLogs": "Upload les logs depuis la session actuelle vers le endpoint sécurisé.",
- 	"maxMemory": "Taille mémoire maximale pour une fenêtre (En Megaoctêts)",
-+=======
-+	"inspect-extensions": "Autorise le débogage et le profilage des extensions. Vérifier les outils de développements pour l'uri de connexion.",
-+	"inspect-brk-extensions": "Autorise le débogage et le profilage des extensions avec l'hôte d'extensions en pause après le démarrage. Vérifier les outils de développement pour l'uri de connexion.",
-+	"disableGPU": "Désactivez l'accélération matérielle du GPU.",
-+>>>>>>> .their
- 	"usage": "Utilisation",
- 	"options": "options",
- 	"paths": "chemins",
-changed in both
-  base   100644 620e2694e2a1d0a6da7943187ec6d8c18e8a6159 i18n/fra/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 6d87da3180e1228e72028373cd528db86fbc5793 i18n/fra/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 40c901eec8fb8f08acc2cb2af69dfb6a29aa1774 i18n/fra/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -7,17 +7,23 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"invalidManifest": "Extension non valide : package.json n'est pas un fichier JSON.",
-+<<<<<<< .our
- 	"incompatible": "Impossible d’installer l’Extension '{0}' car elle n’est pas compatible avec VS Code '{1}'.",
-+=======
-+>>>>>>> .their
- 	"restartCode": "Redémarrez Code avant de réinstaller {0}.",
- 	"installingOutdatedExtension": "Une version plus récente de cette extension est déjà installée. Voulez-vous remplacer celle-ci avec l'ancienne version ?",
- 	"override": "Remplacer",
- 	"cancel": "Annuler",
-+<<<<<<< .our
- 	"errorInstallingDependencies": "Erreur lors de l'installation des dépendances. {0}",
- 	"MarketPlaceDisabled": "Le marketplace n’est pas activé",
- 	"removeError": "Erreur lors de la suppression de l’extension : {0}. Veuillez quitter et relancer VS Code avant de réessayer.",
- 	"Not a Marketplace extension": "Seules les Extensions de Marketplace peuvent être réinstallées",
- 	"notFoundCompatible": "Impossible d’installer '{0}'; Il n’y a pas de version disponible compatible avec VS Code '{1}'.",
- 	"malicious extension": "Impossible d’installer l'extension car elle a été signalée comme problématique.",
-+=======
-+>>>>>>> .their
- 	"notFoundCompatibleDependency": "Installation impossible car l'extension dépendante '{0}' compatible avec la version actuelle '{1}' de VS Code est introuvable.",
- 	"quitCode": "Impossible d’installer l’extension. Veuillez s’il vous plaît quitter et redémarrer VS Code avant de le réinstaller.",
- 	"exitCode": "Impossible d’installer l’extension. Veuillez s’il vous plaît sortir et redémarrer VS Code avant de le réinstaller.",
-changed in both
-  base   100644 93ee2acf35baf432241e2bcfe97de0760b10a71b i18n/fra/src/vs/platform/message/common/message.i18n.json
-  our    100644 c755d6892fe621e543d3e26012e16cb326775c48 i18n/fra/src/vs/platform/message/common/message.i18n.json
-  their  100644 227d6123d7a19d1e20bbf61ce8249d086f9cd07f i18n/fra/src/vs/platform/message/common/message.i18n.json
-changed in both
-  base   100644 64fc37335ec6239b5488584e47e510ccf3900e95 i18n/fra/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 30e1e919ce20ea7d38be72764392ce906b3ac7c0 i18n/fra/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 2d46ac2791e91c1c03e66a90426ae54a2eac5cfe i18n/fra/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -68,6 +68,7 @@
- 	"editorWidgetBorder": "Couleur de bordure des widgets de l'éditeur. La couleur est utilisée uniquement si le widget choisit d'avoir une bordure et si la couleur n'est pas remplacée par un widget.",
- 	"editorSelectionBackground": "Couleur de la sélection de l'éditeur.",
- 	"editorSelectionForeground": "Couleur du texte sélectionné pour le contraste élevé.",
-+<<<<<<< .our
- 	"editorInactiveSelection": "Couleur de sélection dans un éditeur inactif. La couleur doit ne pas être opaque afin de ne pas masquer les décorations sous-jacentes.",
- 	"editorSelectionHighlight": "Couleur des régions avec le même contenu que la sélection. La couleur doit ne pas être opaque afin de ne pas masquer les décorations sous-jacentes.",
- 	"editorSelectionHighlightBorder": "Couleur de bordure des régions dont le contenu est identique à la sélection.",
-@@ -79,6 +80,9 @@
- 	"findRangeHighlightBorder": "Couleur de la bordure limitant la recherche. La couleur ne doit pas être opaque pour ne pas masquer les décorations sous-jacentes. ",
- 	"findWidgetResizeBorder": "Couleur de la bordure de la barre de redimensionnement du widget de recherche.",
- 	"hoverHighlight": "Mettre en surbrillance ci-dessous le mot pour lequel un survol est affiché. La couleur doit ne pas être opaque afin de ne pas masquer les décorations sous-jacentes.",
-+=======
-+	"editorFindMatch": "Couleur du résultat de recherche actif.",
-+>>>>>>> .their
- 	"hoverBackground": "Couleur d'arrière-plan du pointage de l'éditeur.",
- 	"hoverBorder": "Couleur de bordure du pointage de l'éditeur.",
- 	"activeLinkForeground": "Couleur des liens actifs.",
-@@ -86,12 +90,15 @@
- 	"diffEditorRemoved": "Couleur de fond pour le texte qui est retiré. La couleur doit ne pas être opaque pour ne pas masquer les décorations du dessous. ",
- 	"diffEditorInsertedOutline": "Couleur de contour du texte inséré.",
- 	"diffEditorRemovedOutline": "Couleur de contour du texte supprimé.",
-+<<<<<<< .our
- 	"mergeCurrentHeaderBackground": "Arrière-plan de l'en-tête en cours dans les conflits de fusion inline. La couleur doit ne pas être opaque afin de ne pas masquer les décorations sous-jacentes.",
- 	"mergeCurrentContentBackground": "Arrière-plan du contenu en cours dans les conflits de fusion inline. La couleur doit ne pas être opaque afin de ne pas masquer les décorations sous-jacentes.",
- 	"mergeIncomingHeaderBackground": "Arrière-plan de l'en-tête qui arrive dans les conflits de fusion inline. La couleur doit ne pas être opaque afin de ne pas masquer les décorations sous-jacentes.",
- 	"mergeIncomingContentBackground": "Arrière-plan du contenu qui arrive dans les conflits de fusion inline. La couleur doit ne pas être opaque afin de ne pas masquer les décorations sous-jacentes.",
- 	"mergeCommonHeaderBackground": "Arrière-plan de l'en-tête de l'ancêtre commun dans les conflits de fusion inline. La couleur doit ne pas être opaque afin de ne pas masquer les décorations sous-jacentes.",
- 	"mergeCommonContentBackground": "Arrière-plan du contenu de l'ancêtre commun dans les conflits de fusion inline. La couleur ne doit pas être opaque pour ne pas masquer les décorations sous-jacentes.",
-+=======
-+>>>>>>> .their
- 	"mergeBorder": "Couleur de bordure des en-têtes et du séparateur dans les conflits de fusion inline.",
- 	"overviewRulerCurrentContentForeground": "Premier plan de la règle d'aperçu actuelle pour les conflits de fusion inline.",
- 	"overviewRulerIncomingContentForeground": "Premier plan de la règle d'aperçu entrante pour les conflits de fusion inline.",
-added in both
-  our    100644 8e1c626a771393d667c7b3c11b9837bda978f030 i18n/fra/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/fra/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,4 +11,12 @@
- 	"codeActionsOnSave.didTimeout": "codeActionsOnSave abandonné au bout de {0} ms",
- 	"timeout.onWillSave": "OnWillSaveTextDocument-event avorté après 1750 ms",
- 	"saveParticipants": "Exécution de la sauvegarde des participants..."
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 2c25d01eeb19c95193f0492c7f1fc02377b2fcda i18n/fra/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  our    100644 103c4bd542cf3db7d39d94ae35fdf26541c9c1f7 i18n/fra/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  their  100644 42b1301caed28cd8568a1e1a0799f9e09c11b59a i18n/fra/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,7 @@
- 	],
- 	"treeView.notRegistered": "Aucune arborescence avec l'ID '{0}' n'est inscrite.",
- 	"treeView.duplicateElement": "L'élément avec l'id {0} est déjà inscrit"
-+=======
-+	"treeView.notRegistered": "Aucune arborescence avec l'ID '{0}' n'est inscrite."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6158fd5950f60d0fb321999752337ae839d70eca i18n/fra/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 4522e0fd127e1bcf08d6748e14cb70d5513ca327 i18n/fra/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 3bffd603d63ad73618ba9aaf32d17eedaed6a9d5 i18n/fra/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -15,5 +15,9 @@
- 	"saveWorkspace": "Enregistrer l’espace de travail",
- 	"openWorkspaceAction": "Ouvrir un espace de travail...",
- 	"openWorkspaceConfigFile": "Ouvrir le Fichier de Configuration d’espace de travail",
-+<<<<<<< .our
- 	"duplicateWorkspaceInNewWindow": "Dupliquer l'espace de travail dans une Nouvelle fenêtre"
-+=======
-+	"openFolderAsWorkspaceInNewWindow": "Ouvrir le dossier en tant qu'espace de travail dans une nouvelle fenêtre"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 2128948d9da5493ae61953e282e5a735987d700e i18n/fra/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-  their  100644 b644d1c957219a02841597400a272aa3809511c3 i18n/fra/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"addFolderToWorkspace": "Ajouter un dossier à l'espace de travail...",
- 	"add": "&&Ajouter",
- 	"addFolderToWorkspaceTitle": "Ajouter un dossier à l'espace de travail",
-changed in both
-  base   100644 4326e29e9e49ede05fc9a84a852a08c1d90f0166 i18n/fra/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  our    100644 c9bb8bcfa2ee1a86019d6b2302e1485e65aabd3f i18n/fra/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  their  100644 0db82346ee1c50c6f7718b3202404266f4839ffb i18n/fra/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-@@ -19,6 +19,7 @@
- 	"close": "Fermer",
- 	"closeOthers": "Fermer les autres",
- 	"closeRight": "Fermer à droite",
-+<<<<<<< .our
- 	"closeAllSaved": "Fermer la version sauvegardée",
- 	"closeAll": "Tout fermer",
- 	"keepOpen": "Garder ouvert",
-@@ -27,6 +28,15 @@
- 	"keepEditor": "Conserver l'éditeur",
- 	"closeEditorsInGroup": "Fermer tous les éditeurs du groupe",
- 	"closeSavedEditors": "Fermer les éditeurs sauvegardés dans le groupe",
-+=======
-+	"closeAllUnmodified": "Fermer les éléments non modifiés",
-+	"closeAll": "Tout fermer",
-+	"keepOpen": "Garder ouvert",
-+	"showOpenedEditors": "Afficher les éditeurs ouverts",
-+	"keepEditor": "Conserver l'éditeur",
-+	"closeEditorsInGroup": "Fermer tous les éditeurs du groupe",
-+	"closeUnmodifiedEditors": "Fermer les éditeurs non modifiés du groupe",
-+>>>>>>> .their
- 	"closeOtherEditors": "Fermer les autres éditeurs",
- 	"closeRightEditors": "Fermer les éditeurs situés à droite"
- }
-\ No newline at end of file
-changed in both
-  base   100644 19586632ac858e36172c4be96e6a80966d8ff6c4 i18n/fra/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 1cdd98b12a70baa1c905f59b19493e7b2e495bea i18n/fra/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 e7febec4edac2daca7b011b0c49b83ad81caf631 i18n/fra/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 be96f08df0d60445d3a3ca3daec4ba2b561cd205 i18n/fra/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  our    100644 fd29dc9390d1c5bacd1f28330b66131ba6f6a44b i18n/fra/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  their  100644 5dc335cf48b5fb68aacd964d41a1f8bb9c80182a i18n/fra/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-changed in both
-  base   100644 92e9eaf8779ac8dbccad9621efae7579ea536f08 i18n/fra/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  our    100644 19f6bbbcc307571a9164ed53bc3f4813b55da8ce i18n/fra/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  their  100644 c8b5ce11fb1b9506d2dcce0c3040a35f77a5bf03 i18n/fra/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-@@ -12,6 +12,10 @@
- 	"editableEditorWithInputAriaLabel": "{0}. Éditeur de comparaison de fichier texte.",
- 	"editableEditorAriaLabel": "Éditeur de comparaison de fichier texte.",
- 	"navigate.next.label": "Modification suivante",
-+<<<<<<< .our
- 	"navigate.prev.label": "Modification précédente",
- 	"toggleIgnoreTrimWhitespace.label": "Ignorer la suppression des espaces"
-+=======
-+	"navigate.prev.label": "Modification précédente"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 99c0ec41f617e9310dcaf188f3e054eef17590eb i18n/fra/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  our    100644 628561d4d2ce7df0d246ee2b11ec756535486af1 i18n/fra/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  their  100644 a0384c94b7a7caa63e42bf054dee2a64324d0d9b i18n/fra/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"close": "Fermer",
-+>>>>>>> .their
- 	"araLabelEditorActions": "Actions de l'éditeur"
- }
-\ No newline at end of file
-changed in both
-  base   100644 0082e6d4ec103ec09a23bd56ca76408ee4620ddc i18n/fra/src/vs/workbench/common/theme.i18n.json
-  our    100644 67b5e93740c6b4696aa15e5da68929b00e585c36 i18n/fra/src/vs/workbench/common/theme.i18n.json
-  their  100644 d89c104a156a95d3258ebcc5666faea1ebb9cc0d i18n/fra/src/vs/workbench/common/theme.i18n.json
-@@ -24,7 +24,10 @@
- 	"editorGroupBackground": "Couleur d'arrière-plan d'un groupe d'éditeurs. Les groupes d'éditeurs sont les conteneurs des éditeurs. La couleur d'arrière-plan s'affiche pendant le glissement de groupes d'éditeurs.",
- 	"tabsContainerBackground": "Couleur d'arrière-plan de l'en-tête du titre du groupe d'éditeurs quand les onglets sont activés. Les groupes d'éditeurs sont les conteneurs des éditeurs.",
- 	"tabsContainerBorder": "Couleur de bordure de l'en-tête du titre du groupe d'éditeurs quand les onglets sont activés. Les groupes d'éditeurs sont les conteneurs des éditeurs.",
-+<<<<<<< .our
- 	"editorGroupHeaderBackground": "Couleur d'arrière-plan de l'en-tête du titre du groupe d'éditeurs quand les onglets sont désactivés (`\"workbench.editor.showTabs\": false`). Les groupes d'éditeurs sont les conteneurs des éditeurs.",
-+=======
-+>>>>>>> .their
- 	"editorGroupBorder": "Couleur séparant plusieurs groupes d'éditeurs les uns des autres. Les groupes d'éditeurs sont les conteneurs des éditeurs.",
- 	"editorDragAndDropBackground": "Couleur d'arrière-plan lors du déplacement des éditeurs par glissement. La couleur doit avoir une transparence pour que le contenu de l'éditeur soit visible à travers.",
- 	"panelBackground": "Couleur d'arrière-plan du panneau. Les panneaux s'affichent sous la zone d'éditeurs et contiennent des affichages tels que la sortie et le terminal intégré.",
-@@ -41,8 +44,11 @@
- 	"statusBarNoFolderBorder": "Couleur de la bordure qui sépare la barre latérale et l’éditeur lorsque aucun dossier ne s’ouvre la barre d’état. La barre d’état s’affiche en bas de la fenêtre.",
- 	"statusBarItemActiveBackground": "Couleur d'arrière-plan de l'élément de la barre d'état durant un clic. La barre d'état est affichée en bas de la fenêtre.",
- 	"statusBarItemHoverBackground": "Couleur d'arrière-plan de l'élément de la barre d'état durant un pointage. La barre d'état est affichée en bas de la fenêtre.",
-+<<<<<<< .our
- 	"statusBarProminentItemBackground": "Couleur d'arrière-plan des éléments importants de la barre d'état. Les éléments importants se différencient des autres entrées de la barre d'état pour indiquer l'importance. Changer le mode `Appuyer sur la touche tabulation déplace le focus` depuis la palette de commandes pour voir un exemple. La barre d'état est affichée en bas de la fenêtre.",
- 	"statusBarProminentItemHoverBackground": "Couleur d'arrière-plan des éléments importants de la barre d'état lors du survol. Les éléments importants se différencient des autres entrées de la barre d'état pour indiquer l'importance. Changer le mode `Appuyer sur la touche tabulation déplace le focus` depuis la palette de commandes pour voir un exemple. La barre d'état est affichée en bas de la fenêtre.",
-+=======
-+>>>>>>> .their
- 	"activityBarBackground": "Couleur d'arrière-plan de la barre d'activités. La barre d'activités s'affiche complètement à gauche ou à droite, et permet de naviguer entre les affichages de la barre latérale.",
- 	"activityBarForeground": "Couleur de premier plan de la barre d'activités (par ex., utilisée pour les icônes). La barre d'activités s'affiche complètement à gauche ou à droite, et permet de parcourir les vues de la barre latérale.",
- 	"activityBarBorder": "Couleur de bordure de la barre d'activités faisant la séparation avec la barre latérale. La barre d'activités, située à l'extrême droite ou gauche, permet de parcourir les vues de la barre latérale.",
-added in both
-  our    100644 f67d84f0a4de973e8d50c2dc122c6c2b23ad157d i18n/fra/src/vs/workbench/common/views.i18n.json
-  their  100644 e7ba8e9e54b2d05bb081b7d561fbfffe91a93e59 i18n/fra/src/vs/workbench/common/views.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"duplicateId": "Une vue avec l’id `{0}` est déjà enregistrée à l’emplacement `{1}`"
- }
-\ No newline at end of file
-changed in both
-  base   100644 541429a54086804cccb221a94137634a9048efc9 i18n/fra/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 8f9f7eb339d47d55df577bac8ccf306bd77eb0fa i18n/fra/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 93919d9a8514e2ca94a94b83d74c2c85bce322eb i18n/fra/src/vs/workbench/electron-browser/actions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"closeWindow": "Fermer la fenêtre",
- 	"closeWorkspace": "Fermer l’espace de travail",
- 	"noWorkspaceOpened": "Il n’y a actuellement aucun espace de travail ouvert dans cette instance à fermer.",
-@@ -50,6 +53,14 @@
- 	"moveWindowTabToNewWindow": "Déplacer l’onglet de la fenêtre vers la nouvelle fenêtre",
- 	"mergeAllWindowTabs": "Fusionner toutes les fenêtres",
- 	"toggleWindowTabsBar": "Activer/désactiver la barre de fenêtres d’onglets",
-+<<<<<<< .our
- 	"about": "À propos de {0}",
- 	"inspect context keys": "Inspecter les clés de contexte"
-+=======
-+	"configureLocale": "Configurer la langue",
-+	"displayLanguage": "Définit le langage affiché par VSCode.",
-+	"doc": "Consultez {0} pour connaître la liste des langues prises en charge.",
-+	"restart": "Le changement de la valeur nécessite le redémarrage de VS Code.",
-+	"fail.createSettings": "Impossible de créer '{0}' ({1})."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7c7573087ca85319c16384f5f8cf3c56ced0b16b i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 1a663cb4405d0c8f86ec154a57cdd2b613d93195 i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 ad524f220e9ae3754cd192832fd587164dead852 i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,12 +35,19 @@
- 	"panelDefaultLocation": "Contrôle l’emplacement par défaut du panneau. Il peut être affiché soit en bas ou à droite du banc d'essai.",
- 	"statusBarVisibility": "Contrôle la visibilité de la barre d'état au bas du banc d'essai.",
- 	"activityBarVisibility": "Contrôle la visibilité de la barre d'activités dans le banc d'essai.",
-+<<<<<<< .our
- 	"viewVisibility": "Contrôle la visibilité des actions d'en-tête de vue. Les actions d'en-tête de vue peuvent être soit toujours visibles, ou uniquement visibles quand cette vue a le focus ou est survolée.",
- 	"fontAliasing": "Contrôle la méthode de font aliasing dans le workbench.\n- default : Lissage des polices de sous-pixel. Sur la plupart des affichages non-ratina, cela vous donnera le texte le plus vif\n- antialiased : Lisse les polices au niveau du pixel, plutôt que les sous-pixels. Peut faire en sorte que la police apparaisse plus fine dans l’ensemble \n- none : Désactive le lissage des polices. Le texte s'affichera avec des bordures dentelées\n- auto: Applique `default` ou `antialiased` automatiquement en se basant sur la résolution de l'affichage.",
- 	"workbench.fontAliasing.default": "Lissage de sous-pixel des polices. Sur la plupart des affichages non-retina, cela vous donnera le texte le plus vif.",
- 	"workbench.fontAliasing.antialiased": "Lisser les polices au niveau du pixel, plutôt que les sous-pixels. Peut faire en sorte que la police apparaisse plus légère dans l’ensemble.",
- 	"workbench.fontAliasing.none": "Désactive le lissage des polices. Le texte s'affichera avec des bordures dentelées.",
- 	"workbench.fontAliasing.auto": "Applique `default` ou `antialiased`automatiquement en se basant sur la résolution de l'affichage.",
-+=======
-+	"fontAliasing": "Contrôle la méthode de font aliasing dans le workbench.\n- par défaut : Lissage des polices de sous-pixel. Sur la plupart des affichages non-ratina, cela vous donnera le texte le plus vif\n- crénelées : Lisse les polices au niveau du pixel, plutôt que les sous-pixels. Peut faire en sorte que la police apparaisse plus légère dans l’ensemble \n- none : désactive le lissage des polices. Le texte s'affichera avec des bordures dentelées",
-+	"workbench.fontAliasing.default": "Lissage de sous-pixel des polices. Sur la plupart des affichages non-retina, cela vous donnera le texte le plus vif.",
-+	"workbench.fontAliasing.antialiased": "Lisser les polices au niveau du pixel, plutôt que les sous-pixels. Peut faire en sorte que la police apparaisse plus légère dans l’ensemble.",
-+	"workbench.fontAliasing.none": "Désactive le lissage des polices. Le texte s'affichera avec des bordures dentelées.",
-+>>>>>>> .their
- 	"enableNaturalLanguageSettingsSearch": "Contrôle s’il faut activer le mode de recherche en langage naturel pour les paramètres.",
- 	"windowConfigurationTitle": "Fenêtre",
- 	"window.openFilesInNewWindow.on": "Les fichiers s'ouvrent dans une nouvelle fenêtre",
-changed in both
-  base   100644 6740cff8f8e6f7e8f1a7088c19f237f174194b36 i18n/fra/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  our    100644 d0bcb578d2b9d02993bd911e832231746bf9f3a3 i18n/fra/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  their  100644 c08a897c7ff95221728d0781b37f2bf40f89822c i18n/fra/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"debug.terminal.title": "élément débogué"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8fadf8b958bad5b0f9ead536beda02b61da7f096 i18n/fra/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  our    100644 3551b5e036401750ea0c8346808de61f5309a6a0 i18n/fra/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  their  100644 f5bf621cde95c62f04cc51bef66ba5cace65d680 i18n/fra/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-changed in both
-  base   100644 32c0006fd6719b621f6db26f320d872d5575dab1 i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 3c10fdb84d0f8c069b4d8fe6dac7e8ac54606d34 i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 deaa7b6f4229c86a40c6b1806ce8288565b321f1 i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,11 @@
- 	"exeBasedRecommendation": "Cette extension est recommandée parce que {0} est installé.",
- 	"fileBasedRecommendation": "Cette extension est recommandée basé sur les fichiers que vous avez ouverts récemment.",
- 	"workspaceRecommendation": "Cette extension est recommandée par les utilisateurs de l’espace de travail actuel.",
-+=======
-+	"workspaceRecommendation": "Cette extension est recommandée par les utilisateurs de l’espace de travail actuel.",
-+	"fileBasedRecommendation": "Cette extension est recommandée basé sur les fichiers que vous avez ouverts récemment.",
-+	"exeBasedRecommendation": "Cette extension est recommandée parce que {0} est installé.",
-+>>>>>>> .their
- 	"reallyRecommended2": "L'extension '{0}' est recommandée pour ce type de fichier.",
- 	"reallyRecommendedExtensionPack": "Le pack d’extensions '{0}' est recommandé pour ce type de fichier.",
- 	"install": "Installer",
-added in both
-  our    100644 8906c9a19860e81f0b3f75d9e867cf511e34d43d i18n/fra/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-  their  100644 92f8f5bfde6c159dbe207ca7a068419e2e63f8be i18n/fra/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,13 @@
- 	],
- 	"workbenchConfigurationTitle": "Banc d'essai",
- 	"feedbackVisibility": "Contrôle la visibilité du feedback Twitter (smiley) dans la barre d'état au bas du banc d'essai."
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"workbenchConfigurationTitle": "Banc d'essai"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 b737c209cdb7633db0d3e2bd2d7f214f7a292000 i18n/fra/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/fra/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"hide": "Masquer"
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 54a25f75ec00386fd9ea6fad3d9def717ce63fbd i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  our    100644 722fad1246b7935d1c18bb1776f817604a55c3ac i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  their  100644 6b95908d9abaf0f2ddaeff16117a41d9eb9b5e7f i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-@@ -12,7 +12,10 @@
- 	"revertLocalChanges": "Ignorer les modifications locales et restaurer le contenu sur disque",
- 	"copyPathOfActive": "Copier le chemin du fichier actif",
- 	"saveAllInGroup": "Enregistrer tout dans le groupe",
-+<<<<<<< .our
- 	"saveFiles": "Enregistrer tous les fichiers",
-+=======
-+>>>>>>> .their
- 	"revert": "Rétablir le fichier",
- 	"compareActiveWithSaved": "Compare le fichier actif avec celui enregistré",
- 	"closeEditor": "Fermer l'éditeur",
-@@ -24,12 +27,19 @@
- 	"copyPath": "Copier le chemin",
- 	"saveAll": "Enregistrer tout",
- 	"compareWithSaved": "Comparer avec celui enregistré",
-+<<<<<<< .our
- 	"compareWithSelected": "Comparer avec ce qui est sélectionné",
- 	"compareSource": "Sélectionner pour comparer",
- 	"compareSelected": "Comparer le sélectionné",
- 	"close": "Fermer",
- 	"closeOthers": "Fermer les autres",
- 	"closeSaved": "Fermer la version sauvegardée",
-+=======
-+	"compareSource": "Sélectionner pour comparer",
-+	"close": "Fermer",
-+	"closeOthers": "Fermer les autres",
-+	"closeUnmodified": "Fermer les éléments non modifiés",
-+>>>>>>> .their
- 	"closeAll": "Tout fermer",
- 	"deleteFile": "Supprimer définitivement"
- }
-\ No newline at end of file
-changed in both
-  base   100644 002c86e7daa11ee8e4cb8e14c577629400ceb3ea i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 fa117de3746fd117674712532fb1af257c3eacf4 i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 c54a8d0847c17c130e10f0304f8a2a8162a2fd8b i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"newFile": "Nouveau fichier",
- 	"newFolder": "Nouveau dossier",
- 	"rename": "Renommer",
-@@ -13,7 +16,11 @@
- 	"copyFile": "Copier",
- 	"pasteFile": "Coller",
- 	"retry": "Réessayer",
-+<<<<<<< .our
- 	"renameWhenSourcePathIsParentOfTargetError": "Veuillez utiliser la commande 'Nouveau dossier' ou 'Nouveau fichier\" pour ajouter des enfants à un dossier existant",
-+=======
-+	"openFolderFirst": "Ouvrez d'abord un dossier pour y créer des fichiers ou des dossiers.",
-+>>>>>>> .their
- 	"newUntitledFile": "Nouveau fichier sans titre",
- 	"createNewFile": "Nouveau fichier",
- 	"createNewFolder": "Nouveau dossier",
-@@ -43,11 +50,19 @@
- 	"confirmDeleteMessageMultiple": "Êtes-vous sûr de vouloir supprimer définitivement les fichiers {0} suivants ?",
- 	"confirmDeleteMessageFolder": "Voulez-vous vraiment supprimer définitivement '{0}' et son contenu ?",
- 	"confirmDeleteMessageFile": "Voulez-vous vraiment supprimer définitivement '{0}' ?",
-+<<<<<<< .our
- 	"addFiles": "Ajouter des fichiers",
- 	"confirmOverwrite": "Un fichier ou dossier portant le même nom existe déjà dans le dossier de destination. Voulez-vous le remplacer ?",
- 	"replaceButtonLabel": "&&Remplacer",
- 	"fileIsAncestor": "Le fichier à copier est un ancêtre du dossier de destination",
- 	"fileDeleted": "Le fichier à coller a été supprimé ou déplacé pendant ce temps",
-+=======
-+	"irreversible": "Cette action est irréversible !",
-+	"permDelete": "Supprimer définitivement",
-+	"importFiles": "Importer des fichiers",
-+	"confirmOverwrite": "Un fichier ou dossier portant le même nom existe déjà dans le dossier de destination. Voulez-vous le remplacer ?",
-+	"replaceButtonLabel": "&&Remplacer",
-+>>>>>>> .their
- 	"duplicateFile": "Doublon",
- 	"globalCompareFile": "Comparer le fichier actif à...",
- 	"openFileToCompare": "Ouvrez d'abord un fichier pour le comparer à un autre fichier.",
-changed in both
-  base   100644 ee5d441071a6cd936fce7f8abe031a76dad156a7 i18n/fra/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  our    100644 a0333b3b922295d2ae3b0a9c2995ea463fc0a7ce i18n/fra/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  their  100644 01118df61d26032e877dcdf9979c75f0db7af697 i18n/fra/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,14 +7,21 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"revealInWindows": "Révéler dans l'Explorateur",
- 	"revealInMac": "Révéler dans le Finder",
- 	"openContainer": "Ouvrir le dossier contenant",
- 	"saveAs": "Enregistrer sous...",
- 	"save": "Enregistrer",
- 	"saveAll": "Enregistrer tout",
-+<<<<<<< .our
- 	"removeFolderFromWorkspace": "Supprimer le dossier de l'espace de travail",
- 	"genericRevertError": "Échec pour faire revenir '{0}' : {1}",
-+=======
-+	"saveFiles": "Enregistrer tous les fichiers",
-+	"removeFolderFromWorkspace": "Supprimer le dossier de l'espace de travail",
-+>>>>>>> .their
- 	"modifiedLabel": "{0} (sur le disque) ↔ {1}",
- 	"openFileToReveal": "Ouvrir d'abord un fichier à révéler",
- 	"openFileToCopy": "Ouvrir d'abord un fichier pour copier son chemin"
-changed in both
-  base   100644 9693ca31c50911feab4d02a16763cfd2142313b0 i18n/fra/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 a75d38efac11add868250527f11214dd6ff75d12 i18n/fra/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 906663f100ad125ebf75d72043d1de73855bc293 i18n/fra/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-@@ -40,7 +40,10 @@
- 	"formatOnSave": "Met en forme un fichier au moment de l'enregistrement. Un formateur doit être disponible, le fichier ne doit pas être enregistré automatiquement, et l'éditeur ne doit pas être en cours d'arrêt.",
- 	"formatOnSaveTimeout": "Délai d’attente pour formater lors de l'enregistrement. Spécifie le délai en millisecondes pour les commandes formatOnSave. Les commandes prenant plus de temps que le délai d’attente spécifié seront annulées.",
- 	"explorerConfigurationTitle": "Explorateur de fichiers",
-+<<<<<<< .our
- 	"openEditorsVisible": "Nombre d'éditeurs affichés dans le volet Éditeurs ouverts.",
-+=======
-+>>>>>>> .their
- 	"autoReveal": "Contrôle si l'Explorateur doit automatiquement afficher et sélectionner les fichiers à l'ouverture.",
- 	"enableDragAndDrop": "Contrôle si l'explorateur doit autoriser le déplacement de fichiers et de dossiers par glisser-déplacer.",
- 	"confirmDragAndDrop": "Contrôle si l’Explorateur doit demander confirmation lors du déplacement de fichiers ou de dossiers via glisser-déposer.",
-changed in both
-  base   100644 f944e7fc14ff13265af3f6fef112a7a5de5ca326 i18n/fra/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  our    100644 ad930cf9e96c6c6f2bb1e3ed666446143bea2fa8 i18n/fra/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  their  100644 e1888e6d1c25b75f2363abb418c422bf10282952 i18n/fra/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,6 +14,12 @@
- 	"readonlySaveErrorAdmin": "Échec de l'enregistrement de '{0}' : le fichier est protégé en écriture. Sélectionnez 'Remplacer' pour réessayer en tant qu'administrateur.",
- 	"readonlySaveError": "Échec de l'enregistrement de '{0}' : le fichier est protégé en écriture. Sélectionnez 'Remplacer' pour essayer de supprimer la protection.",
- 	"permissionDeniedSaveError": "Échec de l'enregistrement de '{0}' : Permissions insuffisantes. Sélectionnez 'Remplacer en tant qu'Admin' pour réessayer en tant qu'administrator.",
-+=======
-+	"userGuide": "Utiliser les actions dans la barre d’outils de l’éditeur vers la droite pour soit **annuler** vos modifications ou **écraser** le contenu sur le disque avec vos modifications",
-+	"overwrite": "Remplacer",
-+	"retry": "Réessayer",
-+	"discard": "Abandonner",
-+>>>>>>> .their
- 	"genericSaveError": "Échec d'enregistrement de '{0}' ({1}).",
- 	"learnMore": "En savoir plus",
- 	"dontShowAgain": "Ne plus afficher",
-changed in both
-  base   100644 c536ea46a5d8ef428d43213b1ece8372a0089a5f i18n/fra/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  our    100644 68bdf7d5c3ba2abd16609dec619663b60cc7e427 i18n/fra/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  their  100644 620260dc73ab3534bc1bbd1bfc9b585e054c29f4 i18n/fra/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-added in both
-  our    100644 78c2e49a0fa262e7ff38912f66b47037d874a25b i18n/fra/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-  their  100644 9af3f02e1b1bcf540fa84508b6c3fd25db4a3481 i18n/fra/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,5 +11,13 @@
- 	"sharedLog": "Journal (Partagé)",
- 	"rendererLog": "Journal (Fenêtre)",
- 	"extensionsLog": "Journal (Hôte d'extension)",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"developer": "Développeur"
- }
-\ No newline at end of file
-added in both
-  our    100644 a4b260b7b1424820b72d256857339774c04df50f i18n/fra/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  their  100644 53a40630054e60be59b43d818644a29e7f1bcca6 i18n/fra/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -17,14 +18,31 @@
- 	"openLogFile": "Ouvrir le fichier de log...",
- 	"setLogLevel": "Définir le niveau de journalisation (log) ...",
- 	"trace": "Trace",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"openLogsFolder": "Ouvrir le dossier des journaux",
-+	"rendererProcess": "Fenêtre",
-+	"selectProcess": "Sélectionner le processus",
-+	"setLogLevel": "Définir le niveau de journalisation (log)",
-+>>>>>>> .their
- 	"debug": "Déboguer",
- 	"info": "Informations",
- 	"warn": "Avertissement",
- 	"err": "Erreur",
-+<<<<<<< .our
- 	"critical": "Critique",
- 	"off": "Désactivé",
- 	"selectLogLevel": "Sélectionner le niveau de journalisation (log)",
- 	"default and current": "Par défaut & actuel",
- 	"default": "Par défaut",
- 	"current": "Actuel"
-+=======
-+	"off": "Désactivé",
-+	"selectLogLevel": "Sélectionner le niveau de journalisation (log)"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 de7f944af4932846fbdac737c099aed33f4ecede i18n/fra/src/vs/workbench/parts/markers/common/messages.i18n.json
-  our    100644 26c532d9d00dc046cc7b45dadce5acdcd1c029b0 i18n/fra/src/vs/workbench/parts/markers/common/messages.i18n.json
-  their  100644 2b60a006c266a47829aabd32cd357bacd8fac641 i18n/fra/src/vs/workbench/parts/markers/common/messages.i18n.json
-@@ -7,8 +7,11 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"viewCategory": "Affichage",
-+<<<<<<< .our
- 	"problems.view.toggle.label": "Activer/désactiver les problèmes (Erreurs, Avertissements, Infos)",
- 	"problems.view.focus.label": " Focus sur les problèmes (Erreurs, Avertissements, Infos)",
-+=======
-+>>>>>>> .their
- 	"problems.panel.configuration.title": "Affichage des problèmes",
- 	"problems.panel.configuration.autoreveal": "Contrôle si l'affichage des problèmes doit automatiquement montrer les fichiers quand il les ouvre",
- 	"markers.panel.title.problems": "Problèmes",
-added in both
-  our    100644 25674d1f3059db8688302e2e91efe68cdd721332 i18n/fra/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-  their  100644 1298d315d6c4a47c600e16979cced930359d3f87 i18n/fra/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -11,4 +12,15 @@
- 	"viewCategory": "Affichage",
- 	"clearOutput.label": "Effacer la sortie",
- 	"openActiveLogOutputFile": "Affichage: Ouvrir le fichier de log de sortie actif"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"output": "Sortie",
-+	"viewCategory": "Affichage",
-+	"clearOutput.label": "Effacer la sortie"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 c3e117dc72cf6c63eb673fd37d3a4f3314624c1d i18n/fra/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/fra/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,12 @@
- 	],
- 	"output": "{0} - Sortie",
- 	"channel": "Canal de sortie pour '{0}'"
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 89aaca94b7b03f4e1f4ba9ef4338ee2344243212 i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 40cb14d81b25931ed98c99ed64c659dbe62e387d i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 d5cd0fe71d7cc2c34ec9616465c980cafd6457cb i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"defaultSettings": "Placez vos paramètres dans l’éditeur du côté droit pour substituer.",
- 	"noSettingsFound": "Aucun paramètre.",
- 	"settingsSwitcherBarAriaLabel": "Sélecteur de paramètres",
-changed in both
-  base   100644 42c1698dcd39da6eade370fde166980fb99e02db i18n/fra/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  our    100644 e65303731cdbdd387dbb5d282fd9835d35690414 i18n/fra/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  their  100644 5800126a7771248ee2458b4ee86434a0525ac0b1 i18n/fra/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-changed in both
-  base   100644 923695e6fb46126c969f586e150a356c244c419f i18n/fra/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  our    100644 0dd64fdd2e25eac3f307caeeb24a3e07990d7b2d i18n/fra/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  their  100644 561c8b8fcd3de6626d2eb8799774f77e229ec428 i18n/fra/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"view": "Affichage",
- 	"commandsHandlerDescriptionDefault": "Commandes d'affichage et d'exécution",
- 	"gotoLineDescriptionMac": "Atteindre la ligne",
-changed in both
-  base   100644 015c5898f64a1906ae042e551610af6e1eb3b070 i18n/fra/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  our    100644 cff66834ecd9a182ea692c3558e8fa31ebfdf5cb i18n/fra/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  their  100644 48bc93f989d908cf0355b00ba95d796523692c1e i18n/fra/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-@@ -10,8 +10,12 @@
- 	"source control": "Contrôle de code source",
- 	"toggleSCMViewlet": "Afficher SCM",
- 	"view": "Afficher",
-+<<<<<<< .our
- 	"scmConfigurationTitle": "SCM",
- 	"alwaysShowProviders": "S'il faut toujours afficher la section Fournisseur de contrôle de code source.",
- 	"diffDecorations": "Contrôle les décorations diff dans l'éditeur",
- 	"diffGutterWidth": "Contrôle la largeur (px) des décorations diff dans la gouttière (ajoutées et modifiées)"
-+=======
-+	"scmConfigurationTitle": "SCM"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 72ef3e89f83b046c2a066afb8e686819adeba96c i18n/fra/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 7927ac428c9397051edb023d925d6ab74f6c0189 i18n/fra/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 c87f37c878ca7d69c4630e1ea273a246798d6cd5 i18n/fra/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-changed in both
-  base   100644 727436ac8ed32d6cc6548751c4fcda56b1f00c6a i18n/fra/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 043fb92d98d510a0c65a09cbbe5e12feb8f611fa i18n/fra/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 578f575ae02713a5cc6602e12b62470b01ebb4e8 i18n/fra/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,11 +13,18 @@
- 	"copyAllLabel": "Copier tout",
- 	"clearSearchHistoryLabel": "Effacer l'historique de recherche",
- 	"toggleSearchViewPositionLabel": "Basculer la position de la vue de Recherche",
-+=======
-+>>>>>>> .their
- 	"findInFolder": "Rechercher dans le dossier...",
- 	"findInWorkspace": "Trouver dans l’espace de travail...",
- 	"showTriggerActions": "Atteindre le symbole dans l'espace de travail...",
- 	"name": "Rechercher",
-+<<<<<<< .our
- 	"showSearchViewl": "Afficher la zone de recherche",
-+=======
-+	"search": "Rechercher",
-+	"showSearchViewlet": "Afficher la zone de recherche",
-+>>>>>>> .their
- 	"view": "Affichage",
- 	"findInFiles": "Chercher dans les fichiers",
- 	"openAnythingHandlerDescription": "Accéder au fichier",
-added in both
-  our    100644 c6029c79c7a57a5c629447893e6fed6dd5f01d87 i18n/fra/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-  their  100644 7b7ad15376c18c01df197ab1a3f0c1d29099d45a i18n/fra/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -13,5 +14,14 @@
- 	"new.global.sep": "Nouveaux extraits",
- 	"openSnippet.pickLanguage": "Sélectionner le fichier d'extraits ou créer des extraits",
- 	"openSnippet.label": "Configurer les extraits de l’utilisateur",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"global.1": "({0})",
-+>>>>>>> .their
- 	"preferences": "Préférences"
- }
-\ No newline at end of file
-changed in both
-  base   100644 96366bc3eb52948c0cce6a37f8cc23ca93cb8564 i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  our    100644 41b673caee35ba5599ed55d34f9115a33ee09e5b i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  their  100644 b30a97f875d4fea836f050427a8b3d62577695c4 i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"snippetSchema.json.default": "Extrait de code vide",
- 	"snippetSchema.json": "Configuration de l'extrait de code utilisateur",
- 	"snippetSchema.json.prefix": "Préfixe à utiliser durant la sélection de l'extrait de code dans IntelliSense",
-added in both
-  our    100644 6d8d447dfa2fd2d0a93aaf03c20bac52fa92d5c0 i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-  their  100644 c12c73b0de8d6456419dce2557a6d6362a9f7ea5 i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,5 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"source.snippetGlobal": "Extrait de code global de l’utilisateur",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"source.snippet": "Extrait de code utilisateur"
- }
-\ No newline at end of file
-changed in both
-  base   100644 0c67783e02add356224816add6e645edca0a51bf i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  our    100644 6aff63f3b8ed86c22e3db3f7b4b70ba36b0a5d67 i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 a5340df30928fb26ec148d9efa045266c2e8a7ff i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,9 @@
- 	],
- 	"invalid.path.0": "Chaîne attendue dans 'contributes.{0}.path'. Valeur fournie : {1}",
- 	"invalid.language.0": "Si le langage est omis, la valeur de 'contributes.{0}.path' doit être un fichier `.code-snippets`. Valeur fournie : {1}",
-+=======
-+	"invalid.path.0": "Chaîne attendue dans 'contributes.{0}.path'. Valeur fournie : {1}",
-+>>>>>>> .their
- 	"invalid.language": "Langage inconnu dans 'contributes.{0}.language'. Valeur fournie : {1}",
- 	"invalid.path.1": "'contributes.{0}.path' ({1}) est censé être inclus dans le dossier ({2}) de l'extension. Cela risque de rendre l'extension non portable.",
- 	"vscode.extension.contributes.snippets": "Ajoute des extraits de code.",
-changed in both
-  base   100644 89f1b8269952be2124739d6d636080f0525343fb i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 e89604d819428678dc7ff9b330667ccb471d786a i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 4908dd97c81b0154b72e73335738b445c3608c73 i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -10,7 +10,11 @@
- 	"terminal.foreground": "Couleur de premier plan du terminal.",
- 	"terminalCursor.foreground": "La couleur de premier plan du curseur du terminal.",
- 	"terminalCursor.background": "La couleur d’arrière-plan du curseur terminal. Permet de personnaliser la couleur d’un caractère recouvert par un curseur de bloc.",
-+<<<<<<< .our
- 	"terminal.selectionBackground": "La couleur d’arrière-plan de sélection du terminal.",
- 	"terminal.border": "Couleur de bordure qui sépare les volets de fractionnement dans le terminal. La valeur par défaut est panel.border.",
- 	"terminal.ansiColor": "Couleur ansi '{0}' dans le terminal."
-+=======
-+	"terminal.selectionBackground": "La couleur d’arrière-plan de sélection du terminal."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d636f6886f808c9a144c44e3e494a870aa3d59c7 i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  our    100644 866daa5d73fe70c822cf9cd59398b1a220df5355 i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  their  100644 531697fe3da266ef23df55e60b7223fb6831a8ad i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-@@ -8,7 +8,11 @@
- 	],
- 	"terminal.integrated.chooseWindowsShellInfo": "Vous pouvez changer l'interpréteur de commandes par défaut du terminal en sélectionnant le bouton Personnaliser.",
- 	"customize": "Personnaliser",
-+<<<<<<< .our
- 	"never again": "Ne plus afficher",
-+=======
-+	"cancel": "Annuler",
-+>>>>>>> .their
- 	"terminal.integrated.chooseWindowsShell": "Sélectionnez votre interpréteur de commandes de terminal favori. Vous pouvez le changer plus tard dans vos paramètres",
- 	"terminalService.terminalCloseConfirmationSingular": "Il existe une session de terminal active. Voulez-vous la tuer ?",
- 	"terminalService.terminalCloseConfirmationPlural": "Il existe {0} sessions de terminal actives. Voulez-vous les tuer ?"
-changed in both
-  base   100644 12b4156b835781ca1de4186f3756ef0f9112212f i18n/fra/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 7338692978cc41a3c9963a6eada047d9ffbf7ca9 i18n/fra/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 1e7c69d38aae32d6f49a84d3fd1e0a5ca8205440 i18n/fra/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -26,7 +26,10 @@
- 	"commandPalette": "Palette de commandes...",
- 	"settings": "Paramètres",
- 	"keyboardShortcuts": "Raccourcis clavier",
-+<<<<<<< .our
- 	"showExtensions": "Gérer les extensions",
-+=======
-+>>>>>>> .their
- 	"userSnippets": "Extraits de code de l'utilisateur",
- 	"selectTheme.label": "Thème de couleur",
- 	"themes.selectIconTheme.label": "Thème d'icône de fichier",
-changed in both
-  base   100644 8ca568a2f4015dd7ebbc73a406355daae9858969 i18n/fra/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  our    100644 765129d9a5321e8f52031cdb135764c97f338133 i18n/fra/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  their  100644 865514aec03632520bfd541850119cfeeadc313b i18n/fra/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,4 +14,9 @@
- 	"fileBinaryError": "Il semble que le fichier soit binaire. Impossible de l'ouvrir en tant que texte",
- 	"err.create": "Impossible de créer le fichier {0}",
- 	"fileMoveConflict": "Déplacement/copie impossible. Le fichier existe déjà dans la destination."
-+=======
-+	"fileIsDirectoryError": "Le fichier est un répertoire",
-+	"fileNotModifiedError": "Fichier non modifié depuis",
-+	"fileBinaryError": "Il semble que le fichier soit binaire. Impossible de l'ouvrir en tant que texte"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 4d90040dd20e484ff33c0bbc4586caac5b4704d2 i18n/fra/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  our    100644 ce3bee795d96c88f25dab19286972a170c3fad44 i18n/fra/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  their  100644 a5d794a742eeccfd5ebcc916668c97b9fcc4d5c8 i18n/fra/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-changed in both
-  base   100644 46a345fad2d7573ee6be186851f5a1b533755ca1 i18n/fra/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 7050924f08d64059ea7847ed31aea3e00de2d358 i18n/fra/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 e40e5326149d7f66aff9851a241559490e0d7a3b i18n/fra/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-changed in both
-  base   100644 079d530ab03a5fb017d1dcbfbc96d116d4f84e7d i18n/fra/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  our    100644 dcd91092d2562a6bf45acc7079eed26ac5f049a8 i18n/fra/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  their  100644 f4f2e4991549a7e51c02e6eb5c679f2eb6a8f8c5 i18n/fra/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-@@ -8,5 +8,10 @@
- 	],
- 	"errorInvalidTaskConfiguration": "Impossible d’écrire dans le fichier de configuration de l’espace de travail. Veuillez ouvrir le fichier pour y corriger les erreurs/avertissements et essayez à nouveau.",
- 	"errorWorkspaceConfigurationFileDirty": "Impossible d’écrire dans le fichier de configuration de l’espace de travail, car le fichier a été modifié. Veuillez, s’il vous plaît, l'enregistrez et réessayez.",
-+<<<<<<< .our
- 	"openWorkspaceConfigurationFile": "Ouvrir la Configuration de l’espace de travail"
-+=======
-+	"openWorkspaceConfigurationFile": "Ouvrir le Fichier de Configuration d’espace de travail",
-+	"close": "Fermer"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 fe69406ef37c2acc56509a1a45b73bc21fcea89e i18n/hun/extensions/git/out/autofetch.i18n.json
-  our    100644 7645777b08ab0f3eae0f87656a210f6ae20a2881 i18n/hun/extensions/git/out/autofetch.i18n.json
-  their  100644 83092572a2a1ce50df8fcff09a5f29a38318e6bf i18n/hun/extensions/git/out/autofetch.i18n.json
-@@ -7,7 +7,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"yes": "Igen",
-+	"read more": "További információk",
- 	"no": "Nem",
- 	"not now": "Kérdezzen rá később",
-+<<<<<<< .our
- 	"suggest auto fetch": "Szeretné, hogy a Code [időszakosan futtassa a 'git fetch' parancsot]({0})?"
-+=======
-+	"suggest auto fetch": "Szeretné, hogy a Code időszakosan futtasson `git fetch`-t?"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d2dfa251e5d25cb8285a926f608ff708bb006a41 i18n/hun/extensions/git/out/commands.i18n.json
-  our    100644 affdd78fc14682c19c792c8ead9202e7167f2315 i18n/hun/extensions/git/out/commands.i18n.json
-  their  100644 712e3b40563322edad55dca8b2758070ef2658dd i18n/hun/extensions/git/out/commands.i18n.json
-@@ -75,8 +75,12 @@
- 	"ok": "OK",
- 	"push with tags success": "A címkékkel együtt történő pusholás sikeresen befejeződött.",
- 	"pick remote": "Válassza ki a távoli szervert, ahová publikálni szeretné a(z) '{0}' ágat:",
-+<<<<<<< .our
- 	"sync is unpredictable": "Ez a művelet pusholja és pullozza a commitokat a következő helyről: '{0}/{1}'.",
- 	"never again": "Rendben, ne jelenjen meg újra",
-+=======
-+	"sync is unpredictable": "Ez a művelet pusholja és pullozza a commitokat a következő helyről: '{0}'.",
-+>>>>>>> .their
- 	"no remotes to publish": "A forráskódtárhoz nincsenek távoli szerverek konfigurálva, ahová publikálni lehetne.",
- 	"no changes stash": "Nincs elrakandó módosítás.",
- 	"provide stash message": "Adja meg a stash-hez tartozó üzenet (nem kötelező)",
-changed in both
-  base   100644 ab59b50cfc784146306d84f601f03ad0a7f31a6d i18n/hun/extensions/git/out/main.i18n.json
-  our    100644 34ef76e258ca1851c9a5efe9b01c0ac0109e7b83 i18n/hun/extensions/git/out/main.i18n.json
-  their  100644 19742ee7152041f294039a21e4e7f74966e0898a i18n/hun/extensions/git/out/main.i18n.json
-changed in both
-  base   100644 234abfc4470a1ad3f066bef954abbfbd9cee42bd i18n/hun/extensions/git/out/repository.i18n.json
-  our    100644 cbcda0cc8b4d1780f1b5648ec0e6c19e36877abc i18n/hun/extensions/git/out/repository.i18n.json
-  their  100644 b2654e062b72fbb1a17176b789b23de4477a64b4 i18n/hun/extensions/git/out/repository.i18n.json
-@@ -28,8 +28,12 @@
- 	"merge changes": "Módosítások összeolvasztása",
- 	"staged changes": "Beadásra előjegyzett módosítások",
- 	"changes": "Módosítások",
-+<<<<<<< .our
- 	"commitMessageCountdown": "{0} karakter maradt az aktuális sorban",
- 	"commitMessageWarning": " {0} karakterrel több, mint {1} az aktuális sorban",
-+=======
-+	"ok": "OK",
-+>>>>>>> .their
- 	"neveragain": "Ne jelenítse meg újra",
- 	"huge": "A(z) '{0}' forráskódtárban túl sok aktív módosítás van. A Git-funkciók csak egy része lesz engedélyezve."
- }
-\ No newline at end of file
-changed in both
-  base   100644 150ac02318b8ffb83a2d7af343ac105b348156d8 i18n/hun/extensions/git/package.i18n.json
-  our    100644 d2831b61da52e95d0526dd36ac91c937df6fc33e i18n/hun/extensions/git/package.i18n.json
-  their  100644 87388db14f4ece24aa8aa6ee5cfbc6837ac8c1a2 i18n/hun/extensions/git/package.i18n.json
-added in both
-  our    100644 2d667c10166cd725addba9a06f9512737a1ce4c9 i18n/hun/extensions/typescript/out/commands.i18n.json
-  their  100644 c521fb331a6d229b7ae06a62b562681dd79fcb75 i18n/hun/extensions/typescript/out/commands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -13,4 +14,20 @@
- 	"typescript.noJavaScriptProjectConfig": "A fájl nem egy JavaScript-projekt része. További információkat [ide]({0}) kattintva tudhat meg.",
- 	"typescript.configureTsconfigQuickPick": "tsconfig.json konfigurálása",
- 	"typescript.configureJsconfigQuickPick": "jsconfig.json konfigurálása"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"typescript.projectConfigNoWorkspace": "Nyisson meg egy mappát a VS Code-ban typescriptes vagy javascriptes projekt használatához!",
-+	"typescript.projectConfigUnsupportedFile": "Nem sikerült meghatározni a TypeScript- vagy JavaScript-projektet. Nem támogatott fájltípus",
-+	"typescript.projectConfigCouldNotGetInfo": "Nem sikerült meghatározni a TypeScript- vagy JavaScript-projektet",
-+	"typescript.noTypeScriptProjectConfig": "A fájl nem része egy TypeScript-projektnek",
-+	"typescript.noJavaScriptProjectConfig": "A fájl nem része egy JavaScript-projektnek",
-+	"typescript.configureTsconfigQuickPick": "tsconfig.json konfigurálása",
-+	"typescript.configureJsconfigQuickPick": "jsconfig.json konfigurálása",
-+	"typescript.projectConfigLearnMore": "További információ"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 750d811d866eaa3d43818bd1d8e28c9898acf514 i18n/hun/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-  their  100644 ed15423097d5cbb03aeb8c474db3877ca0d1584f i18n/hun/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"selectAriaOption": "{0}"
- }
-\ No newline at end of file
-added in both
-  our    100644 8f727d4bf0445b589905c6044d27a94553f3a015 i18n/hun/src/vs/base/node/ps.i18n.json
-  their  100644 688e86b7228c7f67981b485e08f175828d7e6b3d i18n/hun/src/vs/base/node/ps.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"collecting": "Processzor- és memóriahasználattal kapcsolatos információk gyűjtése. A folyamat eltarthat néhány másodpercig."
- }
-\ No newline at end of file
-changed in both
-  base   100644 48b15939e90bd455b4e48ccb22e9241d8ec84e23 i18n/hun/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 2379691d68b1bb47b875192927c6b81fe486ec04 i18n/hun/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 7f137c6fbffdc3cb8e488aee937e8d7ae878db1d i18n/hun/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -16,7 +16,11 @@
- 	"lineNumbers.on": "A sorszámok abszolút értékként jelennek meg.",
- 	"lineNumbers.relative": "A sorszámok a kurzortól való távolságuk alapján jelennek meg.",
- 	"lineNumbers.interval": "A sorszámok minden 10. sorban jelennek meg.",
-+<<<<<<< .our
- 	"lineNumbers": "Meghatározza a sorszámok megjelenítési módját.",
-+=======
-+	"lineNumbers": "Meghatározza a sorszámok megjelenését. A lehetséges értékek: 'on', 'off', 'relative' és 'interval'.",
-+>>>>>>> .their
- 	"rulers": "Függőleges vonalzók kirajzolása bizonyos számú fix szélességű karakter után. Több vonalzó használatához adjon meg több értéket. Nincs kirajzolva semmi, ha a tömb üres.",
- 	"wordSeparators": "Azon karakterek listája, amelyek szóelválasztónak vannak tekintve szavakkal kapcsolatos navigáció vagy műveletek során.",
- 	"tabSize": "Egy tabulátor hány szóköznek felel meg. Ez a beállítás felülírásra kerül a fájl tartalma alapján, ha az `editor.detectIndentation` beállítás aktív.",
-@@ -81,7 +85,11 @@
- 	"cursorBlinking": "Meghatározza a kurzor animációjának stílusát.",
- 	"mouseWheelZoom": "A szerkesztőablak betűtípusának nagyítása vagy kicsinyítése az egérgörgő Ctrl lenyomása mellett történő használata esetén",
- 	"cursorStyle": "Meghatározza a kurzor stílusát. Lehetséges értékek: 'block', 'block-outline', 'line', 'line-thin', 'underline' vagy 'underline-thin'",
-+<<<<<<< .our
- 	"cursorWidth": "Meghatározza a kurzor szélességét, ha az editor.cursorStyle értéke 'line'.",
-+=======
-+	"lineCursorWidth": "Meghatározza a kurzor szélességét, ha az editor.cursorStyle értéke 'line'.",
-+>>>>>>> .their
- 	"fontLigatures": "Engedélyezi a betűtípusban található ligatúrák használatát",
- 	"hideCursorInOverviewRuler": "Meghatározza, hogy a kurzor pozíciója el legyen-e rejtve az áttekintő sávon.",
- 	"renderWhitespace": "Meghatározza, hogy a szerkesztőablakban hogyan legyenek kirajzolva a szóköz karakterek. Lehetséges értékek: 'none', 'boundary', vagy 'all'. A 'boundary' beállítás esetén, ha szavak között egyetlen szóköz található, akkor az nem lesz kirajzolva.",
-changed in both
-  base   100644 ca5c75eaa9372228d57d97f25ee673f349358823 i18n/hun/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 4128ea8ed8c31eaff6f326d9803f8603753a32a5 i18n/hun/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 5238b0d9399bc52a65065a984ef6a407b439dce8 i18n/hun/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -8,8 +8,11 @@
- 	],
- 	"lineHighlight": "A kurzor pozícióján található sor kiemelési háttérszíne.",
- 	"lineHighlightBorderBox": "A kurzor pozícióján található sor keretszíne.",
-+<<<<<<< .our
- 	"rangeHighlight": "A kiemelt területek háttérszíne, pl. a gyors megnyitás és keresés funkcióknál. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
- 	"rangeHighlightBorder": "A kiemelt területek körüli keret háttérszíne.",
-+=======
-+>>>>>>> .their
- 	"caret": "A szerkesztőablak kurzorának színe.",
- 	"editorCursorBackground": "A szerkesztőablak kurzorának háttérszíne. Lehetővé teszik az olyan karakterek színének módosítását, amelyek fölött egy blokk-típusú kurzor áll.",
- 	"editorWhitespaces": "A szerkesztőablakban található szóköz karakterek színe.",
-changed in both
-  base   100644 e3ec625549ef5021b6b60bb463d4c286c69ff860 i18n/hun/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  our    100644 5f21b0406da880d778293e255ba11e7f7a24268f i18n/hun/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  their  100644 6689a8e1f95cce9cb55ed55f44bd3d7331afc4d5 i18n/hun/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -10,4 +11,11 @@
- 	"markerAction.previous.label": "Előző probléma (hiba, figyelmeztetés, információ)",
- 	"markerAction.nextInFiles.label": "Következő probléma a fájlokban (hiba, figyelmeztetés, információ)",
- 	"markerAction.previousInFiles.label": "Előző probléma a fájlokban (hiba, figyelmeztetés, információ)"
-+=======
-+	"title.wo_source": "({0}/{1})",
-+	"editorMarkerNavigationError": "A szerkesztőablak jelzőnavigációs moduljának színe hiba esetén.",
-+	"editorMarkerNavigationWarning": "A szerkesztőablak jelzőnavigációs moduljának színe figyelmeztetés esetén.",
-+	"editorMarkerNavigationInfo": "A szerkesztőablak jelzőnavigációs moduljának színe információ esetén.",
-+	"editorMarkerNavigationBackground": "A szerkesztőablak jelzőnavigációs moduljának háttérszíne."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 dc4360652cbf419fea7b2bfe6f6e90184410262b i18n/hun/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json
-  our    100644 6ff7a9e10f69f5074a234aff3db906c9c6d18877 i18n/hun/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json
-  their  100644 96f61fa990d0959ca50f9f738e9a8280d4060e00 i18n/hun/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"toggle.tabMovesFocus": "Tabulátor billentyűvel mozgatott fókusz ki- és bekapcsolása"
- }
-\ No newline at end of file
-changed in both
-  base   100644 fa7c3359075157c0a146e8ae8c803e06a1fb1a60 i18n/hun/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  our    100644 e66f795b53cfca6fe629f2b5534cfa72d14dc9fe i18n/hun/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  their  100644 92c1811fa1eadd4561935ff265b19d2ad1a0ae13 i18n/hun/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,10 @@
- 	"wordHighlightStrongBorder": "Szimbólumok háttérszíne írási hozzáférés, például változó írása esetén.",
- 	"overviewRulerWordHighlightForeground": "A kiemelt szimbólumokat jelölő jelzések színe az áttekintősávon. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
- 	"overviewRulerWordHighlightStrongForeground": "Az írási hozzáféréssel rendelkező szimbólumokat jelölő jelzések színe az áttekintősávon. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
-+=======
-+	"overviewRulerWordHighlightForeground": "A kiemelt szimbólumokat jelölő jelzések színe az áttekintősávon.",
-+	"overviewRulerWordHighlightStrongForeground": "A kiemelt, írási hozzáférésű szimbólumokat jelölő jelzések színe az áttekintősávon.",
-+>>>>>>> .their
- 	"wordHighlight.next.label": "Ugrás a következő kiemelt szimbólumhoz",
- 	"wordHighlight.previous.label": "Ugrás az előző kiemelt szimbólumhoz"
- }
-\ No newline at end of file
-changed in both
-  base   100644 27181140f4be7f30cedc1692ab424fddcbb2df73 i18n/hun/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  our    100644 e50c39417bf314b45d74cbd848fd7794fab13bae i18n/hun/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  their  100644 9ef8de88790f6f7938838355e0b2608d33895d3c i18n/hun/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 acbe400a835f132893c2b46d80667e338e47014e i18n/hun/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 77c071af2b9d55c9f89889f4eaba840c5ab42297 i18n/hun/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 400ec23c073960d0fb36d89c146beccae672da88 i18n/hun/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,11 +10,19 @@
- 	"diff": "Két fájl összehasonlítása egymással.",
- 	"add": "Mappá(k) hozzáadása a legutolsó aktív ablakhoz.",
- 	"goto": "Megnyitja a megadott elérési úton található fájlt a megadott sornál és oszlopnál.",
-+<<<<<<< .our
- 	"newWindow": "Mindenképp új ablakban nyíljon meg",
- 	"reuseWindow": "Fájl vagy mappa a legutolsó aktív ablakban nyíljon meg.",
- 	"wait": "Várjon a fájlok bezárására a visszatérés előtt.",
- 	"locale": "A használt lokalizáció (pl. en-US vagy zh-TW)",
- 	"userDataDir": "Meghatározza azt a mappát, ahol a felhasználói adatok vannak tárolva. Egyszerre több megnyitott Code-példány is használhatja.",
-+=======
-+	"newWindow": "Mindenképp induljon új példány a Code-ból.",
-+	"reuseWindow": "Fájl vagy mappa megnyitása a legutoljára aktív ablakban.",
-+	"wait": "Várjon a fájlok bezárására a visszatérés előtt.",
-+	"locale": "A használt lokalizáció (pl. en-US vagy zh-TW)",
-+	"userDataDir": "Meghatározza a könyvtárat, ahol a felhasználói adatok vannak tárolva. Hasznás, ha rootként van futtatva.",
-+>>>>>>> .their
- 	"version": "Verzió kiírása.",
- 	"help": "Használati útmutató kiírása.",
- 	"extensionHomePath": "A kiegészítők gyökérkönyvtárának beállítása.",
-@@ -22,18 +30,28 @@
- 	"showVersions": "Telepített kiegészítők verziójának megjelenítése a --list-extension kapcsoló használata esetén.",
- 	"installExtension": "Kiegészítő telepítése.",
- 	"uninstallExtension": "Kiegészítő eltávolítása.",
-+<<<<<<< .our
- 	"experimentalApis": "Tervezett API-funkciók engedélyezése a kiegészítők számára.",
-+=======
-+	"experimentalApis": "Tervezett API-funkciók engedélyezése egy kiegészítő számára.",
-+>>>>>>> .their
- 	"verbose": "Részletes kimenet kiírása (magába foglalja a --wait kapcsolót)",
- 	"log": "A naplózott események szintje.Az 'info' az alapértelmezett értéke. Lehetséges értékek: 'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off'.",
- 	"status": "Folyamatok erőforrás-használati és diagnosztikai adatinak kiíratása.",
- 	"performance": "Indítás a 'Developer: Startup Performance' parancs engedélyezésével.",
- 	"prof-startup": "Processzorhasználat profilozása induláskor",
- 	"disableExtensions": "Összes telepített kiegészítő letiltása.",
-+<<<<<<< .our
- 	"inspect-extensions": "Hibakeresés és profilozás engedélyezése a kiegészítőkben. A csatlakozási URI-t a fejlesztői eszközöknél találja meg.",
- 	"inspect-brk-extensions": "Hibakeresés és profilozás engedélyezése a kiegészítőkben, úgy, hogy a kiegészítő gazdafolyamata szüneteltetve lesz az indítás után. A csatlakozási URI-t a fejlesztői eszközöknél találja meg.",
- 	"disableGPU": "Hardveres gyorsítás letiltása.",
- 	"uploadLogs": "Az aktuális munkamenet naplóinak feltöltése egy biztonságos végpontra.",
- 	"maxMemory": "Egy ablak maximális memóriamérete (megabájtban).",
-+=======
-+	"inspect-extensions": "Hibakeresés és profilozás engedélyezése a kiegészítőkben. Ellenőrizze a fejlesztői eszközöket a csatlakozási URI-hoz.",
-+	"inspect-brk-extensions": "Hibakeresés és profilozás engedélyezése a kiegészítőkben, úgy, hogy a kiegészítő gazdafolyamata szüneteltetve lesz az indítás után. Ellenőrizze a fejlesztői eszközöket a csatlakozási URI-hoz. ",
-+	"disableGPU": "Hardveres gyorsítás letiltása.",
-+>>>>>>> .their
- 	"usage": "Használat",
- 	"options": "beállítások",
- 	"paths": "elérési utak",
-changed in both
-  base   100644 8788d40a469b3b8ecd64e644a614eefa1c60c177 i18n/hun/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 4e39213a98716ec8731af717bd7eabd7943bfb73 i18n/hun/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 b5c8c712977e570afe3a68115f9998ed0bee9f95 i18n/hun/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -7,12 +7,16 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"invalidManifest": "A kiegészítő érvénytelen: a package.json nem egy JSON-fájl.",
-+<<<<<<< .our
- 	"incompatible": "A(z) '{0}' kiegészítő nem telepíthető, mivel nem kompatibilis a Code '{1}' verziójával.",
-+=======
-+>>>>>>> .their
- 	"restartCode": "Indítsa újra a Code-ot a(z) {0} újratelepítése előtt.",
- 	"installingOutdatedExtension": "A kiegészítő egy újabb verziója már telepítve van. Szeretné felülírni a régebbi verzióval?",
- 	"override": "Felülírás",
- 	"cancel": "Mégse",
- 	"errorInstallingDependencies": "Hiba a függőségek telepítése közben. {0}",
-+<<<<<<< .our
- 	"MarketPlaceDisabled": "A piactér nincs engedélyezve",
- 	"removeError": "Hiba történt a kiegészítő eltávolítása közben: {0}. Lépjen ki és indítsa el a VS Code-ot mielőtt újrapróbálná!",
- 	"Not a Marketplace extension": "Csak a piactérről származó kiegészítőket lehet újratelepíteni",
-@@ -22,6 +26,12 @@
- 	"quitCode": "A kiegészítő telepítése nem sikerült. Lépjen ki és indítsa el a VS Code-ot az újratelepítés előtt!",
- 	"exitCode": "A kiegészítő telepítése nem sikerült. Lépjen ki és indítsa el a VS Code-ot az újratelepítés előtt!",
- 	"renameError": "Ismeretlen hiba történt a(z) {0} {1} névre való átnevezése közben",
-+=======
-+	"notFoundCompatible": "A(z) '{0}' nem telepíthető: nincs a VS Code '{1}' verziójával kompatibilis változat.",
-+	"notFoundCompatibleDependency": "A telepítés nem sikerült, mert a(z) '{0}' kiegészítő függőség VS Code '{1}' verziójával kompatibilis változata nem található. ",
-+	"quitCode": "A kiegészítő telepítése nem sikerült. Lépjen ki és indítsa el a VS Code-ot az újratelepítés előtt!",
-+	"exitCode": "A kiegészítő telepítése nem sikerült. Lépjen ki és indítsa el a VS Code-ot az újratelepítés előtt!",
-+>>>>>>> .their
- 	"uninstallDependeciesConfirmation": "Csak a(z) '{0}' kiegészítőt szeretné eltávolítani vagy annak függőségeit is?",
- 	"uninstallOnly": "Csak a kiegészítőt",
- 	"uninstallAll": "Az összes eltávolítása",
-changed in both
-  base   100644 a4f556eb01c230e361a1f99208d3fb06f0a954af i18n/hun/src/vs/platform/message/common/message.i18n.json
-  our    100644 edfa6c97087c28db068688d4c7e69b180d9a7695 i18n/hun/src/vs/platform/message/common/message.i18n.json
-  their  100644 ee6d194b8dd57d5ccd047d89c9a20d3ac6fb60d7 i18n/hun/src/vs/platform/message/common/message.i18n.json
-changed in both
-  base   100644 a024837c58333387fb06c4c570530d4bc65c76c5 i18n/hun/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 b9f948caca15d9f0853c29c47b30338822af7bb9 i18n/hun/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 dce5fb0ac3dec43ea2ca7c5134010bb5daf4c8e9 i18n/hun/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -68,6 +68,7 @@
- 	"editorWidgetBorder": "A szerkesztőablak-modulok keretszíne. A szín csak akkor van használva, ha a modul beállítása alapján rendelkezik kerettel, és a színt nem írja felül a modul.",
- 	"editorSelectionBackground": "A szerkesztőablak-szakasz színe.",
- 	"editorSelectionForeground": "A kijelölt szöveg színe nagy kontrasztú téma esetén.",
-+<<<<<<< .our
- 	"editorInactiveSelection": "Az inaktív szerkesztőablakban található kijelölések színe. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
- 	"editorSelectionHighlight": "A kijelöléssel megegyező tartalmú területek színe. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
- 	"editorSelectionHighlightBorder": "A kijelöléssel megegyező tartalmú területek keretszíne.",
-@@ -79,6 +80,9 @@
- 	"findRangeHighlightBorder": "A keresést korlátozó terület keretszíne. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
- 	"findWidgetResizeBorder": "A keresőmodul átméretezősávjának keretszíne.",
- 	"hoverHighlight": "Kiemelés azon szó alatt, amely fölött lebegő elem jelenik meg. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
-+=======
-+	"editorFindMatch": "A keresés jelenlegi találatának színe.",
-+>>>>>>> .their
- 	"hoverBackground": "A szerkesztőablakban lebegő elemek háttérszíne.",
- 	"hoverBorder": "A szerkesztőablakban lebegő elemek keretszíne.",
- 	"activeLinkForeground": "Az aktív hivatkozások háttérszíne.",
-@@ -86,12 +90,15 @@
- 	"diffEditorRemoved": "Az eltávolított szöveg háttérszíne. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
- 	"diffEditorInsertedOutline": "A beillesztett szövegek körvonalának színe.",
- 	"diffEditorRemovedOutline": "Az eltávolított szövegek körvonalának színe.",
-+<<<<<<< .our
- 	"mergeCurrentHeaderBackground": "A helyi tartalom fejlécének háttérszíne sorok között megjelenített összeolvasztási konfliktusok esetén. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
- 	"mergeCurrentContentBackground": "A helyi tartalom háttérszíne sorok között megjelenített összeolvasztási konfliktusok esetén. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
- 	"mergeIncomingHeaderBackground": "A beérkező tartalom fejlécének háttérszíne sorok között megjelenített összeolvasztási konfliktusok esetén. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
- 	"mergeIncomingContentBackground": "A beérkező tartalom háttérszíne sorok között megjelenített összeolvasztási konfliktusok esetén. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
- 	"mergeCommonHeaderBackground": "A közös ős tartalom fejlécének háttérszíne sorok között megjelenített összeolvasztási konfliktusok esetén. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
- 	"mergeCommonContentBackground": "A közös ős tartalmának háttérszíne sorok között megjelenített összeolvasztási konfliktusok esetén. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
-+=======
-+>>>>>>> .their
- 	"mergeBorder": "A fejlécek és az elválasztó sáv keretszíne a sorok között megjelenített összeolvasztási konfliktusok esetén.",
- 	"overviewRulerCurrentContentForeground": "A helyi tartalom előtérszíne az áttekintő sávon összeolvasztási konfliktusok esetén.",
- 	"overviewRulerIncomingContentForeground": "A beérkező tartalom előtérszíne az áttekintő sávon összeolvasztási konfliktusok esetén.",
-added in both
-  our    100644 d0aa3c15e349efa447f405e1304fad51f64459cc i18n/hun/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 753cc84e856416f15f0a04a26340734c911f6121 i18n/hun/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,5 +10,13 @@
- 	"timeout.formatOnSave": "Mentéskor végzett formázás megszakítva {0}ms után",
- 	"codeActionsOnSave.didTimeout": "codeActionsOnSave megszakítva {0}ms után",
- 	"timeout.onWillSave": "OnWillSaveTextDocument-esemény megszakítva 1750ms után",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"saveParticipants": "Mentési események futtatása..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 ad630367cbae501c824f2c6b3391f7d446b345ea i18n/hun/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  our    100644 ea4c6c999845b97aef472a29ea0fcf97207605d2 i18n/hun/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  their  100644 adbae4c28f45c140088189b6669175a4c232b316 i18n/hun/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,7 @@
- 	],
- 	"treeView.notRegistered": "Nincs '{0}' azonosítóval regisztrált fanézet.",
- 	"treeView.duplicateElement": "Már van {0} azonosítójú elem regisztrálva"
-+=======
-+	"treeView.notRegistered": "Nincs '{0}' azonosítóval regisztrált fanézet."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 586bbb9d5a1791c83cabf4ea122c38732721d86d i18n/hun/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 123987f7d72edfd6ce2f5a4dafa7e92b866ab98d i18n/hun/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 5b05c77fb5d0d7fc9830ffdd25e3774ef20750f2 i18n/hun/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -15,5 +15,9 @@
- 	"saveWorkspace": "Munkaterület mentése",
- 	"openWorkspaceAction": "Munkaterület megnyitása...",
- 	"openWorkspaceConfigFile": "Munkaterület konfigurációs fájljának megnyitása",
-+<<<<<<< .our
- 	"duplicateWorkspaceInNewWindow": "Munkaterület megnyitása egy új ablakban"
-+=======
-+	"openFolderAsWorkspaceInNewWindow": "Mappa megnyitása munkaterületként egy új ablakban"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 3ce627556d81fdfa94602adee0d29b810ecfba85 i18n/hun/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-  their  100644 080898a7ed6b2833730a053cc6c9bb63f54df611 i18n/hun/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"addFolderToWorkspace": "Mappa hozzáadása a munkaterülethez...",
- 	"add": "&&Hozzáadás",
- 	"addFolderToWorkspaceTitle": "Mappa hozzáadása a munkaterülethez",
-changed in both
-  base   100644 05a3be821614f3df3158b0c5ab2bf909aa844c7a i18n/hun/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  our    100644 1aa06197ac876e8d6242ea2be7341080d6c6f7fd i18n/hun/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  their  100644 5d48accc6b6ac2a31943ea8485de30848358ee47 i18n/hun/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-@@ -19,14 +19,22 @@
- 	"close": "Bezárás",
- 	"closeOthers": "Többi bezárása",
- 	"closeRight": "Jobbra lévők bezárása",
-+<<<<<<< .our
- 	"closeAllSaved": "Mentettek bezárása",
-+=======
-+	"closeAllUnmodified": "Nem módosultak bezárása",
-+>>>>>>> .their
- 	"closeAll": "Összes bezárása",
- 	"keepOpen": "Maradjon nyitva",
- 	"toggleInlineView": "Sorok közötti nézet be- és kikapcsolása",
- 	"showOpenedEditors": "Megnyitott szerkesztőablak megjelenítése",
- 	"keepEditor": "Szerkesztőablak nyitva tartása",
- 	"closeEditorsInGroup": "A csoportban lévő összes szerkesztőablak bezárása",
-+<<<<<<< .our
- 	"closeSavedEditors": "A csoportban lévő mentett szerkesztőablakok bezárása",
-+=======
-+	"closeUnmodifiedEditors": "Nem módosult szerkesztőablakok bezárása a csoportban",
-+>>>>>>> .their
- 	"closeOtherEditors": "Többi szerkesztőablak bezárása",
- 	"closeRightEditors": "Jobbra lévő szerkesztőablakok bezárása"
- }
-\ No newline at end of file
-changed in both
-  base   100644 c82ab6ff2a23f28ebea61b6b7a53c71f4cdae1bd i18n/hun/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 2de10454592751643d624e3a92df2a9575809a4b i18n/hun/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 52fa76d91e72060d2bc049d9c61b5719e8e4ff90 i18n/hun/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 b15ee093f22c841f442aa3a3e878d51eeb0a97aa i18n/hun/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  our    100644 b85e766a1db851d76d4002b436880c6bb7ed7759 i18n/hun/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  their  100644 37f4933240bc2bc4c46602997769fbfd474298a5 i18n/hun/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-changed in both
-  base   100644 0cb7c46cb05e4fabb9aa9c72f0406ad3a9b3f2a6 i18n/hun/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  our    100644 749328c186d97fd976d4f31d1b2d7b979fa92d15 i18n/hun/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  their  100644 5d020bd339d91b797c77692b50152dbe6eeec356 i18n/hun/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-changed in both
-  base   100644 0ef6405cab271d74fa57e086b7af25565adef1d2 i18n/hun/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  our    100644 d823f6837d977fa8c4af575fecfec0bd88c0c6ad i18n/hun/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  their  100644 11d4a655ad1b4c0e9b0344f9902c5f33117594dd i18n/hun/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"close": "Bezárás",
-+>>>>>>> .their
- 	"araLabelEditorActions": "Szerkesztőablak-műveletek"
- }
-\ No newline at end of file
-changed in both
-  base   100644 6ed546539cf83653779af2df1324a1ff40ab0c37 i18n/hun/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
-  our    100644 e551ece9506badbb40e8b19c970a08c2c618f72d i18n/hun/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
-  their  100644 9fd111df3c0ccc2925a8edeba1a3aa1dc613dac2 i18n/hun/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
-changed in both
-  base   100644 b30bec0d2458b102c5da1ad21589cce6ecef6f52 i18n/hun/src/vs/workbench/common/theme.i18n.json
-  our    100644 3406c795c4b8de9d50192c0ba339b8532a562f5d i18n/hun/src/vs/workbench/common/theme.i18n.json
-  their  100644 634a2ddeccc13ee3aa0fcaf094bf0653eae03df9 i18n/hun/src/vs/workbench/common/theme.i18n.json
-@@ -11,10 +11,15 @@
- 	"tabHoverBackground": "A fülek háttérszíne amikor az egérkurzor fölöttük van. A fülek tartalmazzák a szerkesztőterületen lévő szerkesztőablakokat. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
- 	"tabUnfocusedHoverBackground": "A fülek háttérszíne egy fókusz nélküli csoportban, amikor az egérkurzor fölötte van. A fülek tartalmazzák a szerkesztőterületen lévő szerkesztőablakokat. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
- 	"tabBorder": "A füleket egymástól elválasztó keret színe. A fülek tartalmazzák a szerkesztőterületen lévő szerkesztőablakokat. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
-+<<<<<<< .our
- 	"tabActiveBorder": "Az aktív fülek aljának keretszíne. A fülek tartalmazzák a szerkesztőablakokat a szerkesztőterületen. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
- 	"tabActiveBorderTop": "Az aktív fülek tetejének keretszíne. A fülek tartalmazzák a szerkesztőablakokat a szerkesztőterületen. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
- 	"tabActiveUnfocusedBorder": "Az aktív fülek aljának keretszíne egy fókusz nélküli csoportban. A fülek tartalmazzák a szerkesztőablakokat a szerkesztőterületen. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni. ",
- 	"tabActiveUnfocusedBorderTop": "Az aktív fülek tetejének keretszíne egy fókusz nélküli csoportban. A fülek tartalmazzák a szerkesztőablakokat a szerkesztőterületen. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
-+=======
-+	"tabActiveBorder": "Az aktív fülek kiemelésére használt keret színe. A fülek tartalmazzák a szerkesztőterületen lévő szerkesztőablakokat. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
-+	"tabActiveUnfocusedBorder": "Az aktív fülek kiemelésére használt keret színe egy fókusz nélküli csoportban. A fülek tartalmazzák a szerkesztőterületen lévő szerkesztőablakokat. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
-+>>>>>>> .their
- 	"tabHoverBorder": "A fülek kiemelésére használt keret színe amikor az egérkurzor fölöttük van. A fülek tartalmazzák a szerkesztőterületen lévő szerkesztőablakokat. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
- 	"tabUnfocusedHoverBorder": "A fülek kiemelésére használt keret színe egy fókusz nélküli csoportban, amikor az egérkurzor fölöttük van. A fülek tartalmazzák a szerkesztőterületen lévő szerkesztőablakokat. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
- 	"tabActiveForeground": "Az aktív fül előtérszíne az aktív csoportban. A fülek tartalmazzák a szerkesztőterületen lévő szerkesztőablakokat. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
-added in both
-  our    100644 0b45e8b69a77cf5a968a8274c4f8cc930b908390 i18n/hun/src/vs/workbench/common/views.i18n.json
-  their  100644 52cc050953f8f727972673febedba5e5edb099ab i18n/hun/src/vs/workbench/common/views.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"duplicateId": "Már van '{0}' azonosítójú nézet regisztrálva a következő helyen: '{1}'"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"duplicateId": "Már van `{0}` azonosítójú nézet regisztrálva a következő helyen: `{1}`"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8fa88c8859b2857c7b6ebe2dd8a86d0c4df0d2af i18n/hun/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 37d0d2519062540d66345cd2a09ec42cdf189245 i18n/hun/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 2e7a5636a3de332e1df8c42dea1d1b431ed8cd16 i18n/hun/src/vs/workbench/electron-browser/actions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"closeWindow": "Ablak bezárása",
- 	"closeWorkspace": "Munkaterület bezárása",
- 	"noWorkspaceOpened": "Az aktuális példányban nincs egyetlen munkaterület sem nyitva, amit be lehetne zárni.",
-@@ -50,6 +53,14 @@
- 	"moveWindowTabToNewWindow": "Ablakfül átmozgatása új ablakba",
- 	"mergeAllWindowTabs": "Összes ablak összeolvasztása",
- 	"toggleWindowTabsBar": "Ablakfülsáv be- és kikapcsolása",
-+<<<<<<< .our
- 	"about": "A(z) {0} névjegye",
- 	"inspect context keys": "Kontextuskulcsok vizsgálata"
-+=======
-+	"configureLocale": "Nyelv beállítása",
-+	"displayLanguage": "Meghatározza a VSCode felületének nyelvét.",
-+	"doc": "Az elérhető nyelvek listája a következő címen tekinthető meg: {0}",
-+	"restart": "Az érték módosítása után újra kell indítani a VSCode-ot.",
-+	"fail.createSettings": "Nem sikerült a(z) '{0}' létrehozás ({1})."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ffdce8089b56bb92a1044bd7761cd34b7d6ed32b i18n/hun/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 cc21f47e7a5add72269e1dcc252497e79ab58b6b i18n/hun/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 e6f6299231ed743d6f35c08e245910c8834d343f i18n/hun/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,12 +35,19 @@
- 	"panelDefaultLocation": "Meghatározza a panel alapértelmezett pozícióját. A panel a munkaterület alján vagy jobb oldalán jelenhet meg.",
- 	"statusBarVisibility": "Meghatározza, hogy megjelenjen-e az állapotsor a munkaterület alján.",
- 	"activityBarVisibility": "Meghatározza, hogy megjelenjen-e a tevékenységsáv a munkaterületen.",
-+<<<<<<< .our
- 	"viewVisibility": "Meghatározza a nézetek fejlécén található műveletek láthatóságát. A műveletek vagy mindig láthatók, vagy csak akkor jelennek meg, ha a nézeten van a fókusz vagy az egérkurzor fölötte van.",
- 	"fontAliasing": "Meghatározza a munkaterületen megjelenő betűtípusok élsimítási módszerét.\n- default: Szubpixeles betűsimítás. A legtöbb nem-retina típusú kijelzőn ez adja a legélesebb szöveget.\n- antialiased: A betűket pixelek, és nem szubpixelek szintjén simítja. A betűtípus vékonyabbnak tűnhet összességében.\n- none: Letiltja a betűtípusok élsimítését. A szövegek egyenetlen, éles szélekkel jelennek meg.\n- auto: A `default` vagy `antialiased` beállítások automatikus alkalmazása a kijelzők DPI-je alapján.",
- 	"workbench.fontAliasing.default": "Szubpixeles betűsimítás. A legtöbb nem-retina típusú kijelzőn ez adja a legélesebb szöveget.",
- 	"workbench.fontAliasing.antialiased": "A betűket pixelek, és nem szubpixelek szintjén simítja. A betűtípus vékonyabbnak tűnhet összességében.",
- 	"workbench.fontAliasing.none": "Letiltja a betűtípusok élsimítését. A szövegek egyenetlen, éles szélekkel jelennek meg.",
- 	"workbench.fontAliasing.auto": " A `default` vagy `antialiased` beállítások automatikus alkalmazása a kijelzők DPI-je alapján.",
-+=======
-+	"fontAliasing": "Meghatározza a munkaterületen megjelenő betűtípusok élsimítási módszerét.\n- default: Szubpixeles betűsimítás. A legtöbb nem-retina típusú kijelzőn ez adja a legélesebb szöveget.\n- antialiased: A betűket pixelek, és nem szubpixelek szintjén simítja. A betűtípus vékonyabbnak tűnhet összességében.\n- none: Letiltja a betűtípusok élsimítését. A szövegek egyenetlen, éles szélekkel jelennek meg.",
-+	"workbench.fontAliasing.default": "Szubpixeles betűsimítás. A legtöbb nem-retina típusú kijelzőn ez adja a legélesebb szöveget.",
-+	"workbench.fontAliasing.antialiased": "A betűket pixelek, és nem szubpixelek szintjén simítja. A betűtípus vékonyabbnak tűnhet összességében.",
-+	"workbench.fontAliasing.none": "Letiltja a betűtípusok élsimítését. A szövegek egyenetlen, éles szélekkel jelennek meg.",
-+>>>>>>> .their
- 	"enableNaturalLanguageSettingsSearch": "Meghatározza, hogy engedélyezve van-e a természetes nyelvi keresési mód a beállításoknál.",
- 	"windowConfigurationTitle": "Ablak",
- 	"window.openFilesInNewWindow.on": "A fájlok új ablakban nyílnak meg",
-changed in both
-  base   100644 3f8ae5cf9ddff63b8beb040265845f413c95dc4b i18n/hun/src/vs/workbench/electron-browser/window.i18n.json
-  our    100644 0da8bd6c434595c584e7d6a578513ca7f171e8fe i18n/hun/src/vs/workbench/electron-browser/window.i18n.json
-  their  100644 59e05312870b3866252807fc499f342f5bcc08db i18n/hun/src/vs/workbench/electron-browser/window.i18n.json
-changed in both
-  base   100644 1631851aee5fc1d1a3752c92515e59275b59bacf i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
-  our    100644 325146a60013b6a6cf71673d67d0125f22bb9420 i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
-  their  100644 ef8b1ac13ebabadda7ec353f0ed5292f9e2eb304 i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
-changed in both
-  base   100644 fa1bc4e164b69e736e9af17c81da7b8222f52b7c i18n/hun/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
-  our    100644 b12fa835fc27d4b6a915acfad161f1ffd542d5de i18n/hun/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
-  their  100644 c02cc939c66520687f045901dca3c9147b16331c i18n/hun/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"debugToolBarBackground": "A hibakeresési eszköztár háttérszíne.",
- 	"debugToolBarBorder": "A hibakeresési eszköztár keretszíne."
- }
-\ No newline at end of file
-changed in both
-  base   100644 8e82d560ff02743e1db814ac8ccca057ba3eba35 i18n/hun/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  our    100644 ff69b90fbc577aa860166719588e6f2942a832ed i18n/hun/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  their  100644 9708ac70e9bb642e3ecf27f0372f7c47fd315ef7 i18n/hun/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"debug.terminal.title": "hibakereső"
- }
-\ No newline at end of file
-changed in both
-  base   100644 a33718b8e732d0ae3ae712a9f173a4c65dddf3bd i18n/hun/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  our    100644 11a68ca775fd4f5f784c2f0bafd2d0cdcc46c728 i18n/hun/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  their  100644 b8ed67afeb59bb2e98c0c253557db8f4864689fa i18n/hun/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-changed in both
-  base   100644 a03a32613a60fe26013bd53f7c20f4668520f3d0 i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 236476e89a262d4e51ec02393f20d9a7b2715c82 i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 bc83f527961205d75ef59e1a759f04800ebeba1f i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,11 @@
- 	"exeBasedRecommendation": "Ez a kiegészítő azért ajánlott, mert a következő telepítve van: {0}.",
- 	"fileBasedRecommendation": "Ez a kiegészítő a közelmúltban megnyitott fájlok alapján ajánlott.",
- 	"workspaceRecommendation": "Ez a kiegészítő az aktuális munkaterület felhasználói által ajánlott.",
-+=======
-+	"workspaceRecommendation": "Ez a kiegészítő az aktuális munkaterület felhasználói által ajánlott.",
-+	"fileBasedRecommendation": "Ez a kiegészítő a közelmúltban megnyitott fájlok alapján ajánlott.",
-+	"exeBasedRecommendation": "Ez a kiegészítő azért ajánlott, mert a következő telepítve van: {0}.",
-+>>>>>>> .their
- 	"reallyRecommended2": "Ehhez a fájltípushoz a(z) '{0}' kiegészítő ajánlott.",
- 	"reallyRecommendedExtensionPack": "Ehhez a fájltípushoz a(z) '{0}' kiegészítőcsomag ajánlott.",
- 	"install": "Telepítés",
-added in both
-  our    100644 a79e4252425f9889ab5576fc0f0adcbeedabfc56 i18n/hun/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-  their  100644 652267823c8bbedc4527a98dd2de575285564b22 i18n/hun/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"workbenchConfigurationTitle": "Munkaterület",
- 	"feedbackVisibility": "Meghatározza az állapotsoron megjelenő, visszajelzés tweetelése (mosoly) gomb láthatóságát."
- }
-\ No newline at end of file
-changed in both
-  base   100644 d2b7c3c88fa26c808df63de9ea1f4008e1fcd386 i18n/hun/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
-  our    100644 9c6fd91e68403f5fedbdb402411fe1687d26d356 i18n/hun/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
-  their  100644 5bf2f90ef1e24509ed6eda99d199e8394290af4d i18n/hun/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
-added in both
-  our    100644 34a5f733ab91e51764f2f093058b6813d0bf353a i18n/hun/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-  their  100644 d2ae286b72e268d27878b066ffaeb11ea6f898b4 i18n/hun/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"hide": "Elrejtés"
- }
-\ No newline at end of file
-changed in both
-  base   100644 d032a29e6848f4733cc59fe0f86da9ce35f137b6 i18n/hun/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  our    100644 d0fac53b4410bf224f1dcd4d64ae1809aca9b0d6 i18n/hun/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  their  100644 f08e18c1fc14f69c7c15b545bc017d85afdbbfa4 i18n/hun/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-@@ -12,7 +12,10 @@
- 	"revertLocalChanges": "Saját módosítások elvetése és a lemezen lévő tartalom visszaállítása",
- 	"copyPathOfActive": "Aktív fájl elérési útjának másolása",
- 	"saveAllInGroup": "Összes mentése a csoportban",
-+<<<<<<< .our
- 	"saveFiles": "Összes fájl mentése",
-+=======
-+>>>>>>> .their
- 	"revert": "Fájl visszaállítása",
- 	"compareActiveWithSaved": "Aktív fájl összehasonlítása a mentett változattal",
- 	"closeEditor": "Szerkesztőablak bezárása",
-@@ -26,10 +29,16 @@
- 	"compareWithSaved": "Összehasonlítás a mentett változattal",
- 	"compareWithSelected": "Összehasonlítás a kiválasztottal",
- 	"compareSource": "Kijelölés összehasonlításhoz",
-+<<<<<<< .our
- 	"compareSelected": "Kiválasztottak összehasonlítása",
- 	"close": "Bezárás",
- 	"closeOthers": "Többi bezárása",
- 	"closeSaved": "Mentettek bezárása",
-+=======
-+	"close": "Bezárás",
-+	"closeOthers": "Többi bezárása",
-+	"closeUnmodified": "Nem módosultak bezárása",
-+>>>>>>> .their
- 	"closeAll": "Összes bezárása",
- 	"deleteFile": "Végleges törlés"
- }
-\ No newline at end of file
-changed in both
-  base   100644 559fe056a7de82e88f80d89bbe2b2f98b86844d1 i18n/hun/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 9db97a911ffdf192afd5e70644f8d902d86c6323 i18n/hun/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 c9d588b821796907d328f994973d7ae09be385d7 i18n/hun/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"newFile": "Új fájl",
- 	"newFolder": "Új mappa",
- 	"rename": "Átnevezés",
-@@ -13,7 +16,11 @@
- 	"copyFile": "Másolás",
- 	"pasteFile": "Beillesztés",
- 	"retry": "Újrapróbálkozás",
-+<<<<<<< .our
- 	"renameWhenSourcePathIsParentOfTargetError": "Létező mappában az „Új mappa” vagy „Új fájl” parancsokkal hozhat lére új elemeket.",
-+=======
-+	"openFolderFirst": "Mappák vagy fájlok létrehozásához először nyisson meg egy mappát!",
-+>>>>>>> .their
- 	"newUntitledFile": "Új, névtelen fájl",
- 	"createNewFile": "Új fájl",
- 	"createNewFolder": "Új mappa",
-@@ -29,6 +36,7 @@
- 	"undoTrash": "Helyreállíthatja a kukából.",
- 	"doNotAskAgain": "Ne kérdezze meg újra",
- 	"irreversible": "A művelet nem vonható vissza!",
-+<<<<<<< .our
- 	"binFailed": "Nem sikerült törölni a lomtár használatával. Szeretné helyette véglegesen törölni?",
- 	"trashFailed": "Nem sikerült törölni a kuka használatával. Szeretné helyette véglegesen törölni?",
- 	"deletePermanentlyButtonLabel": "&&Törlés véglegesen",
-@@ -48,6 +56,14 @@
- 	"replaceButtonLabel": "&&Csere",
- 	"fileIsAncestor": "A beillesztendő fájl a célmappa szülője",
- 	"fileDeleted": "A beillesztendő fájl időközben törölve lett vagy át lett helyezve",
-+=======
-+	"permDelete": "Végleges törlés",
-+	"importFiles": "Fájlok importálása",
-+	"confirmOverwrite": "A célmappában már van ilyen nevű mappa vagy fájl. Le szeretné cserélni?",
-+	"replaceButtonLabel": "&&Csere",
-+	"fileDeleted": "A fájl időközben törölve lett vagy át lett helyezve",
-+	"fileIsAncestor": "A másolandó fájl a célmappa szülője",
-+>>>>>>> .their
- 	"duplicateFile": "Duplikálás",
- 	"globalCompareFile": "Aktív fájl összehasonlítása...",
- 	"openFileToCompare": "Fájlok összehasonlításához elősször nyisson meg egy fájlt.",
-changed in both
-  base   100644 dd9057b1fa4b3a5d19b450f77eb6adb79dc83d18 i18n/hun/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  our    100644 57708c04947e66257427692040ce53bc266ffa2e i18n/hun/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  their  100644 7c49a5eefb215cd54f7d12fff2a3f8e231c93deb i18n/hun/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,12 +7,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"revealInWindows": "Megjelenítés a fájlkezelőben",
- 	"revealInMac": "Megjelenítés a Finderben",
- 	"openContainer": "Tartalmazó mappa megnyitása",
- 	"saveAs": "Mentés másként...",
- 	"save": "Mentés",
- 	"saveAll": "Összes mentése",
-+<<<<<<< .our
-+=======
-+	"saveFiles": "Összes fájl mentése",
-+>>>>>>> .their
- 	"removeFolderFromWorkspace": "Mappa eltávolítása a munkaterületről",
- 	"genericRevertError": "Nem sikerült a(z) '{0}' visszaállítása: {1}",
- 	"modifiedLabel": "{0} (a lemezen) ↔ {1}",
-changed in both
-  base   100644 22341f239a222b613ad30c90da315fa6cb00df4d i18n/hun/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 edaae86a63ad7a54d245b58378e8574f687d98c7 i18n/hun/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 6cd44ae8d9bfef27b5b8b59cbce0d8668a23f514 i18n/hun/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-@@ -40,7 +40,10 @@
- 	"formatOnSave": "Fájlok formázása mentéskor. Az adott nyelvhez rendelkezésre kell állni formázónak, nem lehet beállítva automatikus mentés, és a szerkesztő nem állhat éppen lefelé.",
- 	"formatOnSaveTimeout": "Időkorlát mentéskor végzett formázások esetén. Meghatároz egy időkorlátot ezredmásodpercben a formatOnSave-parancsok számára. Az ennél hosszabb ideig tartó parancsok meg lesznek szakítva.",
- 	"explorerConfigurationTitle": "Fájlkezelő",
-+<<<<<<< .our
- 	"openEditorsVisible": "A megnyitott szerkesztőablakok panelen megjelenített szerkesztőablakok száma.",
-+=======
-+>>>>>>> .their
- 	"autoReveal": "Meghatározza, hogy a fájlkezelőben automatikusan fel legyenek fedve és ki legyenek jelölve a fájlok, amikor megnyitják őket.",
- 	"enableDragAndDrop": "Meghatározza, hogy a fájlkezelőben áthelyezhetők-e a fájlok és mappák húzással.",
- 	"confirmDragAndDrop": "Meghatározza, hogy a fájlkezelő kérjen-e megerősítést fájlok és mappák húzással történő áthelyezése esetén.",
-changed in both
-  base   100644 0bb33fdc62885d8181dadd5465bc06840190d8fc i18n/hun/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  our    100644 b8d7b3a39533354bdc0b19ec9d16e5be9870876d i18n/hun/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  their  100644 da61a7106fd401d131dc95b0192c045983fbad7e i18n/hun/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,12 @@
- 	],
- 	"userGuide": "Használja a szerkesztői eszköztáron található műveleteket a helyi változtatások visszavonására vagy írja felül a lemezen lévő tartalmat a változtatásokkal",
- 	"staleSaveError": "Nem sikerült menteni a(z) '{0}' fájlt: a lemezen lévő tartalom újabb. Hasonlítsa össze a helyi és a lemezen lévő változatot!",
-+=======
-+	"userGuide": "Használja a jobbra lévő szerkesztői eszköztáron található műveleteket a saját módosítások **visszavonására** vagy **írja felül** a lemezen lévő tartalmat a változtatásokkal",
-+	"overwriteElevated": "Felülírás rendszergazdaként...",
-+	"saveElevated": "Újrapróbálkozás rendszergazdaként...",
-+	"overwrite": "Felülírás",
-+>>>>>>> .their
- 	"retry": "Újrapróbálkozás",
- 	"discard": "Elvetés",
- 	"readonlySaveErrorAdmin": "Nem sikerült menteni a(z) '{0}' fájlt: a fájl írásvédett. Válassza a 'Felülírás rendszergazdaként' lehetőséget a védelem eltávolításához!",
-changed in both
-  base   100644 99cf9cb13e7cb7eda3c6aabe47011c55959da9f5 i18n/hun/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  our    100644 701e6f98bc8ea1747b95354d9e0077f468336b3e i18n/hun/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  their  100644 4e9c224f2c9c65bc6b5f06dd845a038719658335 i18n/hun/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-added in both
-  our    100644 47c134fd47123c14705e1807ec020fc9b1ded0d6 i18n/hun/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-  their  100644 a647b02e9cbef82928d12ccd7a4243a34d25282c i18n/hun/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"mainLog": "Napló (elsődleges)",
- 	"sharedLog": "Napló (megosztott)",
- 	"rendererLog": "Napló (ablak)",
-added in both
-  our    100644 533388e750ee4e135ca7c686e5459ac247110cdf i18n/hun/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  their  100644 fde9c01e66fbd7ca4bf154d1fc195e6ba3df84f4 i18n/hun/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -16,6 +17,23 @@
- 	"selectProcess": "Válasszon folyamatnaplót!",
- 	"openLogFile": "Naplófájl megnyitása...",
- 	"setLogLevel": "Naplózási szint beállítása...",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"openLogsFolder": "Naplómappa megnyitása",
-+	"showLogs": "Naplók megjelenítése...",
-+	"mainProcess": "Elsődleges",
-+	"sharedProcess": "Megosztott",
-+	"rendererProcess": "Ablak",
-+	"extensionHost": "Kiegészítő gazdafolyamata",
-+	"selectProcess": "Válasszon folyamatot!",
-+	"openLogFile": "Naplófájl megnyitása...",
-+	"setLogLevel": "Naplózási szint beállítása",
-+>>>>>>> .their
- 	"trace": "Nyomkövetés",
- 	"debug": "Hibakeresés",
- 	"info": "Információ",
-@@ -23,8 +41,12 @@
- 	"err": "Hiba",
- 	"critical": "Kritikus",
- 	"off": "Kikapcsolva",
-+<<<<<<< .our
- 	"selectLogLevel": "Naplózási szint beállítása",
- 	"default and current": "Alapértelmezett & jelenlegi",
- 	"default": "Alapértelmezett",
- 	"current": "Aktuális"
-+=======
-+	"selectLogLevel": "Naplózási szint beállítása"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 1ecd95e356c42cd928f136758d5915a5958b8383 i18n/hun/src/vs/workbench/parts/markers/common/messages.i18n.json
-  our    100644 773ba59f111e82d92f85498810cfb48f654435e6 i18n/hun/src/vs/workbench/parts/markers/common/messages.i18n.json
-  their  100644 efb38ebffa8d40532ab38a7844821dbdbe0227e3 i18n/hun/src/vs/workbench/parts/markers/common/messages.i18n.json
-@@ -7,8 +7,11 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"viewCategory": "Nézet",
-+<<<<<<< .our
- 	"problems.view.toggle.label": "Problémák be- és kikapcsolása (hiba, figyelmeztetés, információ)",
- 	"problems.view.focus.label": "Váltás a problémákra (hiba, figyelmeztetés, információ)",
-+=======
-+>>>>>>> .their
- 	"problems.panel.configuration.title": "Problémák-nézet",
- 	"problems.panel.configuration.autoreveal": "Meghatározza, hogy a problémák nézet automatikusan felfedje-e a fájlokat, amikor megnyitja őket.",
- 	"markers.panel.title.problems": "Problémák",
-added in both
-  our    100644 0e30f5732769755e32b7f939289bdeed34aa9a2e i18n/hun/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-  their  100644 5cbaa37bf1689e274a9a45602cfd646019065e63 i18n/hun/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -11,4 +12,16 @@
- 	"viewCategory": "Nézet",
- 	"clearOutput.label": "Kimenet törlése",
- 	"openActiveLogOutputFile": "Nézet: Aktív napló kimeneti fájljának megnyitása"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"output": "Kimenet",
-+	"logViewer": "Naplófájl-megjelenítő",
-+	"viewCategory": "Nézet",
-+	"clearOutput.label": "Kimenet törlése"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 2967f9f2d34d8572fdfa4deeb66d87d7ea3ebd63 i18n/hun/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-  their  100644 c164d86f883a8aca57bf2f38a9ebed65bf233e60 i18n/hun/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"output": "{0} – Kimenet",
- 	"channel": "A(z) '{0}' kimeneti csatornája"
- }
-\ No newline at end of file
-changed in both
-  base   100644 ef9a96afe7b57217ea6e9cf3d6363034233cce43 i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 e4a3df1c36f48711ee71b3e1a1f3261e36551d1e i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 3a1caa89fed892f466dd6064be98791c54bdcf1e i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"defaultSettings": "A jobb oldalon lévő szerkesztőablakban elhelyezett beállítások felülírják az alapértelmezett beállításokat.",
- 	"noSettingsFound": "Beállítás nem található.",
- 	"settingsSwitcherBarAriaLabel": "Beállításkapcsoló",
-changed in both
-  base   100644 1fd4f23c9d2b2587042661b7a080ae8cfbbbae60 i18n/hun/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  our    100644 ec3d7a520ad7c939cbe0c7ae9a4418c76f0a7de7 i18n/hun/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  their  100644 35cc39622d0b228bc74bd668bd12c257a3928b0f i18n/hun/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-changed in both
-  base   100644 7e61210cdf735b07d4eb51ee7fd095eafb87752f i18n/hun/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  our    100644 30ceee409e667b0d6338b5c25accb24f8665eb86 i18n/hun/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  their  100644 cd538504f4718f3e4cf4c06ae311e651e5029de4 i18n/hun/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"view": "Nézet",
- 	"commandsHandlerDescriptionDefault": "Parancsok megjelenítése és futtatása",
- 	"gotoLineDescriptionMac": "Ugrás adott sorhoz",
-changed in both
-  base   100644 4f8b481dc00d734f2215c121c783ca9022c3ba6e i18n/hun/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  our    100644 b8dbc7740d8d5f70035f6da70f3e92605c2e7f25 i18n/hun/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  their  100644 39ce0536498b6d4284daca2c5f3ab1ffe4deef4e i18n/hun/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-@@ -13,5 +13,9 @@
- 	"scmConfigurationTitle": "VKR (SCM)",
- 	"alwaysShowProviders": "Mindig megjelenjen-e a verziókezelő rendszerek szakasz.",
- 	"diffDecorations": "Vezérli a szerkesztőablakban megjelenő, változásokat jelölő dekorátorokat.",
-+<<<<<<< .our
- 	"diffGutterWidth": "Vezérli a szerkesztőablak margóján megjelenő, változásokat jelölő dekorátorok szélességét (pixelben)."
-+=======
-+	"inputCounter": "Meghatározza, hogy mikor jelenjen meg a bemeneti karakterszámláló."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 821a91e9b573b0a7c174b82a6cf123ea2bcb4d45 i18n/hun/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  our    100644 eed65b480a816d02a454fae412b29472fd8ae097 i18n/hun/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  their  100644 aa865d6ba594bf767a297569800526d4be540307 i18n/hun/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-@@ -8,6 +8,9 @@
- 	],
- 	"scm providers": "Verziókezelő rendszerek",
- 	"hideRepository": "Elrejtés",
-+	"commitMessageInfo": "{0} karakter a jelenlegi sorban",
-+	"commitMessageCountdown": "{0} karakter maradt az aktuális sorban",
-+	"commitMessageWarning": " {0} karakterrel több, mint {1} az aktuális sorban",
- 	"installAdditionalSCMProviders": "További verziókezelő rendszerek telepítése...",
- 	"no open repo": "Nincs aktív verziókezelő rendszer.",
- 	"source control": "Verziókezelő rendszer",
-changed in both
-  base   100644 9f5f0bf4d8bf46686df8f057972894fecef8d779 i18n/hun/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 9a1dc2269a19b301bdc256c8a1594b2d89a94c18 i18n/hun/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 ce4480e2eb9a0734da7b53dcfc7f672d8b35049e i18n/hun/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-changed in both
-  base   100644 e1fb57e6aa623e9dfca003a7601a1ea33526d0ec i18n/hun/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 1439e6263aeea9edcee41566036c04020ed9c86f i18n/hun/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 9cd24f4c87207b799b0de682cedce2f442d14153 i18n/hun/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -21,6 +22,19 @@
- 	"findInFiles": "Keresés a fájlokban",
- 	"openAnythingHandlerDescription": "Ugrás fájlhoz",
- 	"openSymbolDescriptionNormal": "Ugrás szimbólumhoz a munkaterületen",
-+=======
-+	"findInFolder": "Keresés mappában...",
-+	"findInWorkspace": "Keresés a munkaterületen...",
-+	"showTriggerActions": "Szimbólum megkeresése a munkaterületen...",
-+	"name": "Keresés",
-+	"search": "Keresés",
-+	"showSearchViewlet": "Keresés megjelenítése",
-+	"view": "Nézet",
-+	"findInFiles": "Keresés a fájlokban",
-+	"openAnythingHandlerDescription": "Fájl megkeresése",
-+	"openSymbolDescriptionNormal": "Szimbólum megkeresése a munkaterületen",
-+	"searchOutputChannelTitle": "Keresés",
-+>>>>>>> .their
- 	"searchConfigurationTitle": "Keresés",
- 	"exclude": "Fájlok és mappák keresésből való kizárására szolgáló globális minták. Örökli az összes globális mintát a fliex.exclude beállításból.",
- 	"exclude.boolean": "A globális minta, amire illesztve lesznek a fájlok elérési útjai. A minta engedélyezéséhez vagy letiltásához állítsa igaz vagy hamis értékre.",
-@@ -29,7 +43,11 @@
- 	"useIgnoreFiles": "Meghatározza, hogy a .gitignore és .ignore fájlok használva legyenek-e a kereséshez.",
- 	"search.quickOpen.includeSymbols": "Meghatározza, hogy a fájlok gyors megnyitásánál megjelenjenek-e a globális szimbólumkereső találatai.",
- 	"search.followSymlinks": "Meghatározza, hogy keresés során követve legyenek-e a szimbolikus linkek.",
-+<<<<<<< .our
- 	"search.smartCase": "Figyelmen kívül hagyja a kis- és nagybetűket, ha a minta csak kisbetűkből áll, ellenkező esetben kis- és nagybetűérzékenyen keres",
- 	"search.globalFindClipboard": "Meghatározza, hogy a keresőmodul olvassa és módosítsa-e a megosztott keresési vágólapot macOS-en.",
- 	"search.location": "Meghatározza, hogy a keresés az oldalsávon jelenik meg vagy egy panelként a panelterületen, mely utóbbi esetén több vízszintes hely áll rendelkezésre."
-+=======
-+	"search.smartCase": "Figyelmen kívül hagyja a kis- és nagybetűket, ha a minta csak kisbetűkből áll, ellenkező esetben kis- és nagybetűérzékenyen keres"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 f3d84a4571d187f3aa22dc07ec0d3fda3e75c69f i18n/hun/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-  their  100644 4d54491cc1ed72763941c012edc41e2c501530dd i18n/hun/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"global.scope": "(globális)",
- 	"global.1": "(({0})",
- 	"new.global": "Új globális kódrészlet-fájl...",
-changed in both
-  base   100644 12f3a6365e8c382d700b5b941bbf4e17778baf5b i18n/hun/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  our    100644 5a3f80015bbe3e795dee371fc7f943aa67c6afa3 i18n/hun/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  their  100644 61cbea48ecab4b7fa71edb3b4f17f906071e7b67 i18n/hun/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"snippetSchema.json.default": "Üres kódrészlet",
- 	"snippetSchema.json": "Felhasználói kódrészlet-konfiguráció",
- 	"snippetSchema.json.prefix": "A kódrészlet IntelliSense-ben történő kiválasztásánál használt előtag",
-added in both
-  our    100644 869515c3c57f9df3f8a5d163b6964f24055ea3fd i18n/hun/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-  their  100644 ac8bcd025bd97956a0c20ada292404341892a6be i18n/hun/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,5 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"source.snippetGlobal": "Globális felhasználói kódrészket",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"source.snippet": "Felhasználói kódrészlet"
- }
-\ No newline at end of file
-changed in both
-  base   100644 b86aeaf6994bcf3fab27a5d8501c4a09aa00327e i18n/hun/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  our    100644 f6494963584f4e252a29cc4278b64a8bdc027d55 i18n/hun/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 ef351110a21e65ccc7e04ad14bc49433a6be5892 i18n/hun/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,9 @@
- 	],
- 	"invalid.path.0": "Hiányzó karakterlánc a `contributes.{0}.path`-ban. A megadott érték: {1}",
- 	"invalid.language.0": "Nyelv elhagyása esetén a `contributes.{0}.path` értékének egy `.code-snippets`-fájlnak kell lennie. A megadott érték: {1}",
-+=======
-+	"invalid.path.0": "Hiányzó karakterlánc a `contributes.{0}.path`-ban. A megadott érték: {1}",
-+>>>>>>> .their
- 	"invalid.language": "Ismeretlen nyelv található a következőben: `contributes.{0}.language`. A megadott érték: {1}",
- 	"invalid.path.1": "A `contributes.{0}.path` ({1}) nem a kiegészítő mappáján belül található ({2}). Emiatt előfordulhat, hogy a kiegészítő nem lesz hordozható.",
- 	"vscode.extension.contributes.snippets": "Kódrészleteket szolgáltat.",
-changed in both
-  base   100644 4d4b7d5d7cf9f5df951944bbb6bec0cfe484e9e1 i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 8ec8f827057c19dd6709715ecc51f43540d7d5cc i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 525d9caef57e87c58eeaacc366e52e7500bb518f i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -15,7 +15,11 @@
- 	"terminal.integrated.shellArgs.osx": "OS X-terminál esetén használt parancssori argumentumok.",
- 	"terminal.integrated.shell.windows": "A terminál által használt shell elérési útja Windowson. A Windows beépített shelljei (cmd, PowerShell vagy Bash on Ubuntu) használata esetén kell megadni.",
- 	"terminal.integrated.shellArgs.windows": "Windows-terminál esetén használt parancssori argumentumok.",
-+<<<<<<< .our
- 	"terminal.integrated.macOptionIsMeta": "Az option billentyű meta billentyűként legyen kezelve a terminálban, macOS-en.",
-+=======
-+	"terminal.integrated.rightClickCopyPaste": "Ha be van kapcsolva, megakadályozza, hogy megjelenjen a helyi menü a terminálon történő jobb kattintás esetén. Ehelyett másol, ha van kijelölés, és beilleszt, ha nincs.",
-+>>>>>>> .their
- 	"terminal.integrated.copyOnSelection": "Ha be van kapcsolva, a terminálban kijelölt szöveg a vágólapra lesz másolva.",
- 	"terminal.integrated.fontFamily": "Meghatározza a terminál betűtípusát. Alapértelmezett értéke az editor.fontFamily értéke.",
- 	"terminal.integrated.fontSize": "Meghatározza a terminálban használt betű méretét, pixelekben.",
-@@ -30,14 +34,21 @@
- 	"terminal.integrated.rendererType": "Meghatározza, hogy melyik módszerrel van kirajzolva a terminál: a „canvas” esetén az alap (gyors) canvas-alapú megjelenítővel, míg „dom” esetén a tartalék DOM-alapú megjelenítővel. Az „auto” esetén a VS Code megpróbálja kitalálni, melyik módszer lesz hatékonyabb. Az érték módosítása után újra kell tölteni a VS Code-ot, hogy az új terminálokban érvénybe lépjen a beállítás.",
- 	"terminal.integrated.rightClickBehavior": "Meghatározza, hogy a terminál milyen műveletet hajt végre jobb kattintás esetén. Lehetséges értékek: „default”, „copyPaste” és „selectWord”. „default” esetén megjelenik a helyi menü, „copyPaste” esetén másolja a kijelölt szöveget vagy beilleszt, „selectWord” esetén pedig kijelöli a kurzor alatti szót és megjeleníti a helyi menüt.",
- 	"terminal.integrated.cwd": "Explicit elérési út, ahol a terminál indítva lesz. Ez a shellfolyamat munkakönyvtára (cwd) lesz. Ez a beállítás nagyon hasznos olyan munkaterületeken, ahol a gyökérkönyvtár nem felel meg munkakönyvtárnak.",
-+<<<<<<< .our
- 	"terminal.integrated.confirmOnExit": "Az alkalmazás kérjen-e megerősítést kilépéskor, ha van aktív terminál-munkafolyamat.",
-+=======
-+	"terminal.integrated.confirmOnExit": "Meghatározza, hogy megerősítést kér-e az alkalamzás, ha van aktív terminál-munkafolyamat.",
-+>>>>>>> .their
- 	"terminal.integrated.enableBell": "Meghatározza, hogy engedélyezve van-e a csengő a terminálba.",
- 	"terminal.integrated.commandsToSkipShell": "Olyan parancsazonosítók listája, melyek nem lesznek elküldve a shellnek, és ehelyett mindig a Code kezeli le őket. Ez lehetővé teszi, hogy az olyan billentyűparancsok, melyeket normál esetben a shell dolgozna fel, ugyanúgy működjenek, mint mikor a terminálon nincs fókusz. Például ilyen a gyorsmegnyitás indításához használt Ctrl+P.",
- 	"terminal.integrated.env.osx": "A VS Code folyamatához hozzáadott környezeti változókat tartalmazó objektum, amit az OS X-es terminál használ.",
- 	"terminal.integrated.env.linux": "A VS Code folyamatához hozzáadott környezeti változókat tartalmazó objektum, amit a linuxos terminál használ.",
- 	"terminal.integrated.env.windows": "A VS Code folyamatához hozzáadott környezeti változókat tartalmazó objektum, amit a windowsos terminál használ.",
- 	"terminal.integrated.showExitAlert": "A `A terminálfolyamat a következő kilépési kóddal állt le` üzenet megjelenítése, ha a kilépési kód nem nulla.",
-+<<<<<<< .our
- 	"terminal.integrated.experimentalRestore": "Vissza legyenek-e állítva a terminálos munkamenetek a VS Code indításakor. Ez egy kísérleti beállítás: hibákat tartalmazhat és változhat is a jövőben.",
-+=======
-+>>>>>>> .their
- 	"terminalCategory": "Terminál",
- 	"viewCategory": "Nézet"
- }
-\ No newline at end of file
-changed in both
-  base   100644 c671a91c989425f4bf80c56e6f8c52501e72874f i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 b5d8a4cb5cb8f374a5aeb4f4cc4a537c343663e4 i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 8f1350c0d3c136eeff7e342ce7501fe8e447f793 i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -20,6 +20,7 @@
- 	"workbench.action.terminal.new.short": "Új terminál",
- 	"workbench.action.terminal.newWorkspacePlaceholder": "Az aktuális munkakönyvtár kiválasztása az új terminálhoz",
- 	"workbench.action.terminal.newInActiveWorkspace": "Új integrált terminál létrehozása (az aktív munkaterületen)",
-+<<<<<<< .our
- 	"workbench.action.terminal.split": "Terminál kettéosztása",
- 	"workbench.action.terminal.splitInActiveWorkspace": "Terminál kettéosztása (az aktív munkaterületen)",
- 	"workbench.action.terminal.focusPreviousPane": "Váltás az előző panelra",
-@@ -28,6 +29,8 @@
- 	"workbench.action.terminal.resizePaneRight": "Méret növelése jobbra",
- 	"workbench.action.terminal.resizePaneUp": "Méret növelése felfelé",
- 	"workbench.action.terminal.resizePaneDown": "Méret növelése lefelé",
-+=======
-+>>>>>>> .their
- 	"workbench.action.terminal.focus": "Váltás a terminálra",
- 	"workbench.action.terminal.focusNext": "Váltás a következő terminálra",
- 	"workbench.action.terminal.focusPrevious": "Váltás az előző terminálra",
-changed in both
-  base   100644 3471cfec5dcce1f100d328201f3b000e1d18da3a i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 e68d7791167aa4ec39545b66085dd1627ef11c4c i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 ff1983f42c6ac4977dd9aa08d10801bae1071130 i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -11,6 +11,9 @@
- 	"terminalCursor.foreground": "A terminál kurzorának előtérszíne.",
- 	"terminalCursor.background": "A terminál kurzorának háttérszíne. Lehetővé teszik az olyan karakterek színének módosítását, amelyek fölött egy blokk-típusú kurzor áll.",
- 	"terminal.selectionBackground": "A terminálban kijelölt tartalom háttérszíne.",
-+<<<<<<< .our
- 	"terminal.border": "A terminálokat elválasztó keret színe. Alapértelmezett értéke megegyezik a panel.border értékével.",
-+=======
-+>>>>>>> .their
- 	"terminal.ansiColor": "'{0}' ANSI-szín a terminálban."
- }
-\ No newline at end of file
-changed in both
-  base   100644 45f5c16180ae420c53dfc644c2bfcbe0a48c6b4e i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  our    100644 f684fc9f6733f94b9bcb701dcd43e00f95643c28 i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  their  100644 ea617c7168de836ff539020b57ac4cbb510225b0 i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-@@ -8,7 +8,11 @@
- 	],
- 	"terminal.integrated.chooseWindowsShellInfo": "Megváltoztathatja az alapértelmezett terminált a testreszabás gomb választásával.",
- 	"customize": "Testreszabás",
-+<<<<<<< .our
- 	"never again": "Ne jelenítse meg újra",
-+=======
-+	"cancel": "Mégse",
-+>>>>>>> .their
- 	"terminal.integrated.chooseWindowsShell": "Válassza ki a preferált terminál shellt! Ez később módosítható a beállításokban.",
- 	"terminalService.terminalCloseConfirmationSingular": "Van egy aktív terminálmunkamenet. Szeretné megszakítani?",
- 	"terminalService.terminalCloseConfirmationPlural": "{0} aktív terminálmunkamenet van. Szeretné megszakítani?"
-changed in both
-  base   100644 79c64944348333dd89589910b851ed928966c6c0 i18n/hun/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 ee1596339153cc7e8c412014c640971b5ecc963e i18n/hun/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 6315a5d17bd9e93ca63f53bf47f6f5bb1af2107a i18n/hun/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -9,9 +9,17 @@
- 	"releaseNotes": "Kiadási jegyzék",
- 	"showReleaseNotes": "Kiadási jegyzék megjelenítése",
- 	"read the release notes": "Üdvözöljük a {0} v{1} verziójában. Szeretné megtekinteni a kiadási jegyzéket?",
-+<<<<<<< .our
- 	"licenseChanged": "A licencfeltételek változtak. A változások áttekintéséhez kattintson [ide]({0})!",
- 	"neveragain": "Ne jelenítse meg újra",
- 	"64bitisavailable": "Elérhető a {0} 64-bites Windowsra készült változata! További információhoz kattintson [ide]({1})!",
-+=======
-+	"licenseChanged": "A licencfeltételek változtak. Olvassa végig!",
-+	"license": "Licenc elolvasása",
-+	"neveragain": "Ne jelenítse meg újra",
-+	"64bitisavailable": "Elérhető a {0} 64-bites Windowsra készült változata!",
-+	"learn more": "További információ",
-+>>>>>>> .their
- 	"updateIsReady": "Új {0}-frissítés érhető el.",
- 	"noUpdatesAvailable": "Jelenleg nincs elérhető frissítés.",
- 	"ok": "OK",
-@@ -26,7 +34,10 @@
- 	"commandPalette": "Parancskatalógus...",
- 	"settings": "Beállítások",
- 	"keyboardShortcuts": "Billentyűparancsok",
-+<<<<<<< .our
- 	"showExtensions": "Kiegészítők kezelése",
-+=======
-+>>>>>>> .their
- 	"userSnippets": "Felhasználói kódrészletek",
- 	"selectTheme.label": "Színtéma",
- 	"themes.selectIconTheme.label": "Fájlikontéma",
-changed in both
-  base   100644 f77948f5276ebd4bb9e66fb0947ab85b691a7f9b i18n/hun/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  our    100644 7f2659c063a55d4aff7833d69377336452a2b34d i18n/hun/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  their  100644 e2deab2db4ee2c09ea694c553ff0103d7fcf5f79 i18n/hun/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,4 +14,9 @@
- 	"fileBinaryError": "A fájl binárisnak tűnik és nem nyitható meg szövegként",
- 	"err.create": "Nem sikerült létrehozni a(z) {0} nevű fájlt",
- 	"fileMoveConflict": "Nem lehet áthelyezni vagy másolni. A fájl már létezik a célhelyen."
-+=======
-+	"fileIsDirectoryError": "A fájl egy könyvtár",
-+	"fileNotModifiedError": "A fájl azóta nem módosult",
-+	"fileBinaryError": "A fájl binárisnak tűnik és nem nyitható meg szövegként"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 91ce4d8f7507b70e6368467215efb47981f817f9 i18n/hun/src/vs/workbench/services/files/node/fileService.i18n.json
-  our    100644 639f690d07a4fe700c4fefee8584b4b846406706 i18n/hun/src/vs/workbench/services/files/node/fileService.i18n.json
-  their  100644 fcbe399cbac9cd0e806515e65cfd433c1abae8ea i18n/hun/src/vs/workbench/services/files/node/fileService.i18n.json
-changed in both
-  base   100644 6928f2f1935ea97ba4f8513bc030d8cf99a3f317 i18n/hun/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
-  our    100644 fda6870576bb69cf7b2986a30abcc10f56bee35b i18n/hun/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
-  their  100644 38b057d0682fa26a8a2b0024466b20f214be59aa i18n/hun/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
-changed in both
-  base   100644 a411a51ba5910c363ac333b59cfea93365ce12eb i18n/hun/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  our    100644 b94fe48249e25b823960304a227c6cacab895951 i18n/hun/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  their  100644 5a0ddc8c0429c77b95e2ddf7c7adf1bf6aa53da9 i18n/hun/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-changed in both
-  base   100644 d67776bc4335d4713e95dc3e8b7d83f1043ec825 i18n/hun/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 cf978af5d8a1515d6c83d24f871d30875b427657 i18n/hun/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 afe4cf7833a0af629d6f87fa691910fe55420b8b i18n/hun/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-changed in both
-  base   100644 068445ae82b0a0db65c00e0449c4cea4d3b71d25 i18n/hun/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  our    100644 eda2e6fffa6eb36223a779093d2d797359c79998 i18n/hun/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  their  100644 3c7eb68f49e9ad5ba9bdff300a15c35dfa0d75a5 i18n/hun/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-@@ -8,5 +8,10 @@
- 	],
- 	"errorInvalidTaskConfiguration": "Nem sikerült írni a munkaterület konfigurációs fájljába. Nyissa meg a fájlt, javítsa a benne található hibákat és figyelmeztetéseket, majd próbálja újra!",
- 	"errorWorkspaceConfigurationFileDirty": "Nem sikerült írni a munkaterület konfigurációs fájljába, mert módosítva lett. Mentse, majd próbálja újra!",
-+<<<<<<< .our
- 	"openWorkspaceConfigurationFile": "Munkaterület-konfiguráció megnyitása"
-+=======
-+	"openWorkspaceConfigurationFile": "Munkaterület konfigurációs fájljának megnyitása",
-+	"close": "Bezárás"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 b51df7e140de3cfa8d940b59564fd038dcddaade i18n/ita/extensions/git/out/autofetch.i18n.json
-  our    100644 204ce5999322752d9ff0594e13195091068c5a02 i18n/ita/extensions/git/out/autofetch.i18n.json
-  their  100644 ffe7f9d6f24ed36c2ffdac9c9692f7aecb0ae508 i18n/ita/extensions/git/out/autofetch.i18n.json
-@@ -7,7 +7,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"yes": "Sì",
-+<<<<<<< .our
- 	"no": "No",
- 	"not now": "Chiedimelo in seguito",
- 	"suggest auto fetch": "Desideri che Code [esegua `git fetch` periodicamente]({0})?"
-+=======
-+	"read more": "Altre informazioni",
-+	"no": "No"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 b544cb5ca24aa5dfa2984deb2835a530ad9c1af6 i18n/ita/extensions/git/out/commands.i18n.json
-  our    100644 b8b9f0490197b0e5904f4f035caca3a7f04c7df9 i18n/ita/extensions/git/out/commands.i18n.json
-  their  100644 d7970a8aad21578eaee5cec13983d498ef750123 i18n/ita/extensions/git/out/commands.i18n.json
-@@ -71,12 +71,19 @@
- 	"pick remote pull repo": "Selezionare un repository remoto da cui effettuare il pull del ramo",
- 	"no remotes to push": "Il repository non contiene elementi remoti configurati come destinazione del push.",
- 	"nobranch": "Estrarre un ramo per eseguire il push in un elemento remoto.",
-+<<<<<<< .our
- 	"confirm publish branch": "La branch '{0}' non ha una branch corrispondente a monte. Desideri pubblicarla?",
- 	"ok": "OK",
- 	"push with tags success": "Il push con tag è riuscito.",
- 	"pick remote": "Selezionare un repository remoto in cui pubblicare il ramo '{0}':",
- 	"sync is unpredictable": "Questa azione consentirà di effettuare il push e il pull di commit da e verso '{0}/[1]'.",
- 	"never again": "OK, non visualizzare più",
-+=======
-+	"ok": "OK",
-+	"push with tags success": "Il push con tag è riuscito.",
-+	"pick remote": "Selezionare un repository remoto in cui pubblicare il ramo '{0}':",
-+	"sync is unpredictable": "Questa azione consentirà di effettuare il push e il pull di commit da e verso '{0}'.",
-+>>>>>>> .their
- 	"no remotes to publish": "Il repository non contiene elementi remoti configurati come destinazione della pubblicazione.",
- 	"no changes stash": "Non ci sono modifiche da accantonare.",
- 	"provide stash message": "Specificare un messaggio di accantonamento (facoltativo)",
-added in both
-  our    100644 ffa2bc44d1e47cb10d96a67a8a32dfe939ae2d74 i18n/ita/extensions/typescript/out/commands.i18n.json
-  their  100644 e771e7a4a9eca41e3fd32ac7db21d483d0c22fc3 i18n/ita/extensions/typescript/out/commands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -13,4 +14,20 @@
- 	"typescript.noJavaScriptProjectConfig": "Il file non fa parte di un progetto JavaScript. Clicca [qui]({0}) per saperne di più.",
- 	"typescript.configureTsconfigQuickPick": "Configura tsconfig.json",
- 	"typescript.configureJsconfigQuickPick": "Configura jsconfig.json"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"typescript.projectConfigNoWorkspace": "Aprire una cartella in Visual Studio Code per usare un progetto TypeScript o JavaScript",
-+	"typescript.projectConfigUnsupportedFile": "Non è stato possibile determinare il progetto TypeScript o JavaScript. Il tipo di file non è supportato",
-+	"typescript.projectConfigCouldNotGetInfo": "Non è stato possibile determinare il progetto TypeScript o JavaScript",
-+	"typescript.noTypeScriptProjectConfig": "Il file non fa parte di un progetto TypeScript",
-+	"typescript.noJavaScriptProjectConfig": "Il file non fa parte di un progetto JavaScript",
-+	"typescript.configureTsconfigQuickPick": "Configura tsconfig.json",
-+	"typescript.configureJsconfigQuickPick": "Configura jsconfig.json",
-+	"typescript.projectConfigLearnMore": "Altre informazioni"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6e295ef1e2c5c31c8dc900b0e03428d88047083e i18n/ita/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json
-  our    100644 2b12daabc0796df315e4942ce02045465f3738b4 i18n/ita/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json
-  their  100644 8baf1308a2690753586ce30c1180e0e6e3dd727f i18n/ita/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json
-added in both
-  our    100644 750d811d866eaa3d43818bd1d8e28c9898acf514 i18n/ita/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/ita/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"selectAriaOption": "{0}"
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-added in both
-  our    100644 4795960aaa0875a994fc1e5ce04159a9c9274acb i18n/ita/src/vs/base/node/ps.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/ita/src/vs/base/node/ps.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"collecting": "Raccolta informazioni su CPU e memoria in corso. Potrebbe impiegare qualche secondo."
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 99d10858e0709d519335020016e89ff83886bd5a i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 f91d8d15e9f7c53e3b2a0166aab270c9bf1f772e i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 8d193dcadbd9e3dc855f9044884516aad27afacb i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -16,7 +16,10 @@
- 	"lineNumbers.on": "I numeri di riga vengono visualizzati come numeri assoluti.",
- 	"lineNumbers.relative": "I numeri di riga vengono visualizzati come distanza in linee alla posizione del cursore.",
- 	"lineNumbers.interval": "I numeri di riga vengono visualizzati ogni 10 righe.",
-+<<<<<<< .our
- 	"lineNumbers": "Controlla la visualizzazione dei numeri di riga.",
-+=======
-+>>>>>>> .their
- 	"rulers": "Mostra righelli verticali dopo un certo numero di caratteri a spaziatura fissa. Utilizza più valori  per più righelli. Nessun righello viene disegnati se la matrice è vuota",
- 	"wordSeparators": "Caratteri che verranno usati come separatori di parola quando si eseguono operazioni o spostamenti correlati a parole",
- 	"tabSize": "Il numero di spazi corrispondenti ad un carattere Tab. Questa impostazione viene sottoposta a override in base al contenuto dei file quando 'editor.detectIndentation' è 'on'.",
-changed in both
-  base   100644 bd8958bdf975b50d0b84527ddedde871e5173eeb i18n/ita/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 047668b002c0125f22b3c77979675bee2ddbe88f i18n/ita/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 81909087f6997d03636a64c7e6359a458f752770 i18n/ita/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -8,8 +8,11 @@
- 	],
- 	"lineHighlight": "Colore di sfondo per l'evidenziazione della riga alla posizione del cursore.",
- 	"lineHighlightBorderBox": "Colore di sfondo per il bordo intorno alla riga alla posizione del cursore.",
-+<<<<<<< .our
- 	"rangeHighlight": "Colore di sfondo degli intervalli evidenziati, ad esempio dalle funzionalità Quick Open e Trova. il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.",
- 	"rangeHighlightBorder": "Colore di sfondo del bordo intorno agli intervalli selezionati.",
-+=======
-+>>>>>>> .their
- 	"caret": "Colore del cursore dell'editor.",
- 	"editorCursorBackground": "Colore di sfondo del cursore editor. Permette di personalizzare il colore di un carattere quando sovrapposto da un blocco cursore.",
- 	"editorWhitespaces": "Colore dei caratteri di spazio vuoto nell'editor.",
-changed in both
-  base   100644 2d24c4f96eaf51c1b02a0c01092959b732bde063 i18n/ita/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  our    100644 489403787509136e0d47f57e12029772ff110678 i18n/ita/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  their  100644 505e8cba0142a8379a942fd18d371f10de6570e5 i18n/ita/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -10,4 +11,11 @@
- 	"markerAction.previous.label": "Vai al problema precedente (Errore, Avviso, Info)",
- 	"markerAction.nextInFiles.label": "Vai al Problema Successivo nei File (Error, Warning, Info)",
- 	"markerAction.previousInFiles.label": "Vai al Problema Precedente nei File (Error, Warning, Info) "
-+=======
-+	"title.wo_source": "({0}/{1})",
-+	"editorMarkerNavigationError": "Colore per gli errori del widget di spostamento tra marcatori dell'editor.",
-+	"editorMarkerNavigationWarning": "Colore per gli avvisi del widget di spostamento tra marcatori dell'editor.",
-+	"editorMarkerNavigationInfo": "Colore delle informazioni del widget di navigazione marcatori dell'editor.",
-+	"editorMarkerNavigationBackground": "Sfondo del widget di spostamento tra marcatori dell'editor."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d57627a559aaf9ec3945b4e01975197a974efca5 i18n/ita/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  our    100644 e0d29249698047f3608784eabef81557838d41db i18n/ita/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  their  100644 b355190a13bf71dac74e3b66531a86f551fc2eed i18n/ita/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,10 @@
- 	"wordHighlightStrongBorder": "Colore del bordo di un simbolo durante l'accesso in scrittura, ad esempio durante la scrittura in una variabile.",
- 	"overviewRulerWordHighlightForeground": "Colore del marcatore righello panoramica per evidenziazione simboli. Il colore non deve essere opaco per non nascondere decorazioni sottostanti.",
- 	"overviewRulerWordHighlightStrongForeground": "Colore del marcatore righello panoramica per evidenziazione simboli con accesso in scrittura. Il colore non deve essere opaco per non nascondere decorazioni sottostanti.",
-+=======
-+	"overviewRulerWordHighlightForeground": "Colore del marcatore del righello delle annotazioni per le evidenziazioni dei simboli.",
-+	"overviewRulerWordHighlightStrongForeground": "Colore del marcatore del righello delle annotazioni per le evidenziazioni dei simboli di accesso in scrittura.",
-+>>>>>>> .their
- 	"wordHighlight.next.label": "Vai al prossimo simbolo evidenziato",
- 	"wordHighlight.previous.label": "Vai al precedente simbolo evidenziato"
- }
-\ No newline at end of file
-changed in both
-  base   100644 32a58ae4a610928e553df9a55cccf0ff6b7f818f i18n/ita/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  our    100644 1b2a046fdb00dc2b8d3837f833d8eac80b820712 i18n/ita/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  their  100644 f8e28e396b6a8860050ff84708478ecf8296bafd i18n/ita/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 194dc9d937c95859b7ae7875cbd542c08c06b7ba i18n/ita/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 9db983246eacb0b2b4bfd0f1c8d91ee5c10e2e9a i18n/ita/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 bf517983deb3be176ce69164bb8433c57463b23c i18n/ita/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,11 +10,19 @@
- 	"diff": "Confronta due file tra loro.",
- 	"add": "Aggiunge la cartella o le cartelle all'ultima finestra attiva.",
- 	"goto": "Apre un file nel percorso alla posizione specificata di riga e carattere.",
-+<<<<<<< .our
- 	"newWindow": "Forza l'apertura di una nuova finestra.",
- 	"reuseWindow": "Forza l'apertura di un file o di una cartella nell'ultima finestra attiva.",
- 	"wait": "Attendere la chiusura dei file prima della restituzione.",
- 	"locale": "Impostazioni locali da usare, ad esempio en-US o it-IT.",
- 	"userDataDir": "Consente di specificare la directory in cui si trovano i dati utente. Può essere usata per aprire più istanze diverse di Code.",
-+=======
-+	"newWindow": "Forza una nuova istanza di Code.",
-+	"reuseWindow": "Forza l'apertura di un file o di una cartella nell'ultima finestra attiva.",
-+	"wait": "Attendere la chiusura dei file prima della restituzione.",
-+	"locale": "Impostazioni locali da usare, ad esempio en-US o it-IT.",
-+	"userDataDir": "Consente di specificare la directory in cui si trovano i dati utente. Utile quando viene eseguito come root.",
-+>>>>>>> .their
- 	"version": "Visualizza la versione.",
- 	"help": "Visualizza la sintassi.",
- 	"extensionHomePath": "Impostare il percorso radice per le estensioni.",
-@@ -22,18 +30,28 @@
- 	"showVersions": "Mostra le versioni delle estensioni installate, quando si usa --list-extension.",
- 	"installExtension": "Installa un'estensione.",
- 	"uninstallExtension": "Disinstalla un'estensione.",
-+<<<<<<< .our
- 	"experimentalApis": "Abilita funzionalità di API proposte per un'estensione.",
-+=======
-+	"experimentalApis": "Abilita funzionalità di API proposte per un'estensione specifica.",
-+>>>>>>> .their
- 	"verbose": "Visualizza l'output dettagliato (implica --wait).",
- 	"log": "Livello di logging da utilizzare. Il valore predefinito è 'info'. I valori consentiti sono 'critical, 'error', 'warn', 'info', 'debug', 'trace', 'off'.",
- 	"status": "Stampare le informazioni di utilizzo e diagnostica di processo.",
- 	"performance": "Eseguire l'avvio con il comando 'Developer: Startup Performance' abilitato.",
- 	"prof-startup": "Esegui il profiler della CPU durante l'avvio",
- 	"disableExtensions": "Disabilita tutte le estensioni installate.",
-+<<<<<<< .our
- 	"inspect-extensions": "Consente il debug e profiling delle estensioni. Controllare gli strumenti di sviluppo per la URI di connessione.",
- 	"inspect-brk-extensions": "Consente di eseguire debug e profilatura delle estensioni con l'host dell'estensione messo in pausa dopo l'avvio. Controllare gli strumenti di sviluppo per l'URI di connessione.",
- 	"disableGPU": "Disabilita l'accelerazione hardware della GPU.",
- 	"uploadLogs": "Caricamento dei log della sessione corrente verso un punto di comunicazione sicuro.",
- 	"maxMemory": "Dimensione massima della memoria per una finestra (in Mbytes).",
-+=======
-+	"inspect-extensions": "Consentire il debug e profiling delle estensioni. Controllare gli strumenti di sviluppo per l'uri di connessione.",
-+	"inspect-brk-extensions": "Consentire il debug e profiling delle estensioni con l'host di estensione in pausa dopo inizio. Controllare gli strumenti di sviluppo per l'uri di connessione.",
-+	"disableGPU": "Disabilita l'accelerazione hardware della GPU.",
-+>>>>>>> .their
- 	"usage": "Utilizzo",
- 	"options": "opzioni",
- 	"paths": "percorsi",
-changed in both
-  base   100644 f82303364610623245f511acc588590a5af5d0fa i18n/ita/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 35f8ed83f0da1c4a75798a67e5b16affcd21632f i18n/ita/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 d95dd9e9e679494c9f2ef8bfb3c2bf00c494d33d i18n/ita/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -7,17 +7,23 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"invalidManifest": "Estensione non valida: package.json non è un file JSON.",
-+<<<<<<< .our
- 	"incompatible": "Impossibile installare l'estensione '{0}' in quanto non è compatibile con VS Code '{1}'.",
-+=======
-+>>>>>>> .their
- 	"restartCode": "Riavviare Code prima di reinstallare {0}.",
- 	"installingOutdatedExtension": "Una versione più recente di questa estensione è già installata. Vuoi eseguire l'override di questa con la versione precedente?",
- 	"override": "Eseguire l'override",
- 	"cancel": "Annulla",
-+<<<<<<< .our
- 	"errorInstallingDependencies": "Errore durante l'installazione delle dipendenze. {0}",
- 	"MarketPlaceDisabled": "Il Marketplace non è abilitato",
- 	"removeError": "Errore durante la rimozione dell'estensione: {0}. Chiudere e riavviare VS Code prima di riprovare.",
- 	"Not a Marketplace extension": "Solo le Estensioni del Marketplace possono essere reinstallate",
- 	"notFoundCompatible": "Impossibile installare '{0}'; non è presente alcuna versione compatibile con VS Code '{1}'.",
- 	"malicious extension": "Non è possibile installare l'estensione poiché è stata segnalata come problematica.",
-+=======
-+>>>>>>> .their
- 	"notFoundCompatibleDependency": "Impossibile installare perché non è stata trovata l'estensione dipendente '{0}' compatibile con la versione corrente '{1}' di VS Code.",
- 	"quitCode": "Impossibile installare l'estensione. Riavviare VS Code prima di procedere ad un nuovo setup.",
- 	"exitCode": "Impossibile installare l'estensione. Riavviare VS Code prima di procedere ad un nuovo setup.",
-changed in both
-  base   100644 c623cd2a9bbf82447eb68b0fc47ce142a2f98414 i18n/ita/src/vs/platform/message/common/message.i18n.json
-  our    100644 5361700d443353ba59a58493689a184452d2d709 i18n/ita/src/vs/platform/message/common/message.i18n.json
-  their  100644 2822182506c18db11a5f3e8da82270a5a2d7a765 i18n/ita/src/vs/platform/message/common/message.i18n.json
-changed in both
-  base   100644 6505e976a25def5cb56d70e5a46dec00c6182e17 i18n/ita/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 db040b20535e5fbe6df69ea748baeb36651c5732 i18n/ita/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 5375e34f3cbf3f78942ea628094c9af2a47de5d6 i18n/ita/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -68,6 +68,7 @@
- 	"editorWidgetBorder": "Colore bordo dei widget dell'editor. Il colore viene utilizzato solo se il widget sceglie di avere un bordo e se il colore non è sottoposto a override da un widget.",
- 	"editorSelectionBackground": "Colore della selezione dell'editor.",
- 	"editorSelectionForeground": "Colore del testo selezionato per il contrasto elevato.",
-+<<<<<<< .our
- 	"editorInactiveSelection": "Colore della selezione in un editor non attivo. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.",
- 	"editorSelectionHighlight": "Colore delle aree con lo stesso contenuto della selezione. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.",
- 	"editorSelectionHighlightBorder": "Colore del bordo delle regioni con lo stesso contenuto della selezione.",
-@@ -79,6 +80,9 @@
- 	"findRangeHighlightBorder": "Colore del bordo dell'intervallo di limite della ricerca. Il colore non deve essere opaco per non nascondere decorazioni sottostanti.",
- 	"findWidgetResizeBorder": "Colore del bordo della barra di ridimensionamento del comando trova.",
- 	"hoverHighlight": "Evidenziazione sotto la parola per cui è visualizzata un'area sensibile al passaggio del mouse. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.",
-+=======
-+	"editorFindMatch": "Colore della corrispondenza di ricerca corrente.",
-+>>>>>>> .their
- 	"hoverBackground": "Colore di sfondo dell'area sensibile al passaggio del mouse dell'editor.",
- 	"hoverBorder": "Colore del bordo dell'area sensibile al passaggio del mouse dell'editor.",
- 	"activeLinkForeground": "Colore dei collegamenti attivi.",
-@@ -86,12 +90,15 @@
- 	"diffEditorRemoved": "Colore di sfondo per il testo che è stato rimosso. Il colore non deve essere opaco per non nascondere le decorazioni sottostanti.",
- 	"diffEditorInsertedOutline": "Colore del contorno del testo che è stato inserito.",
- 	"diffEditorRemovedOutline": "Colore del contorno del testo che è stato rimosso.",
-+<<<<<<< .our
- 	"mergeCurrentHeaderBackground": "Sfondo intestazione corrente in conflitti di merge in linea. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.",
- 	"mergeCurrentContentBackground": "Sfondo contenuto corrente in conflitti di merge in linea. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.",
- 	"mergeIncomingHeaderBackground": "Sfondo intestazione modifica in ingresso in conflitti di merge in linea. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.",
- 	"mergeIncomingContentBackground": "Sfondo contenuto modifica in ingresso in conflitti di merge in linea. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.",
- 	"mergeCommonHeaderBackground": "Sfondo dell'intestazione dell'antenato comune nei conflitti di merge in linea. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.",
- 	"mergeCommonContentBackground": "Sfondo del contenuto del predecessore comune in conflitti di merge in line. Il colore non deve essere opaco per non nascondere decorazioni sottostanti.",
-+=======
-+>>>>>>> .their
- 	"mergeBorder": "Colore bordo su intestazioni e sulla barra di divisione di conflitti di merge in linea.",
- 	"overviewRulerCurrentContentForeground": "Colore primo piano righello panoramica attuale per i conflitti di merge in linea.",
- 	"overviewRulerIncomingContentForeground": "Colore primo piano del righello panoramica modifiche in arrivo per i conflitti di merge in linea.",
-added in both
-  our    100644 475ba817066d79b528abeae699b840a0322796c0 i18n/ita/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/ita/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,4 +11,12 @@
- 	"codeActionsOnSave.didTimeout": "codeActionsOnSave interrotto dopo {0} ms",
- 	"timeout.onWillSave": "Evento onWillSaveTextDocument interrotto dopo 1750 ms",
- 	"saveParticipants": "Esecuzione del salvataggio partecipanti..."
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 04c4b11db8ce880414ddf274995758b9caf0ec71 i18n/ita/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  our    100644 3a17c732425a4b7dbee77da7b6537e08e051f468 i18n/ita/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  their  100644 aac2c8ae46ed8e1d0b4570e0215762f1d1b9e6fe i18n/ita/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,7 @@
- 	],
- 	"treeView.notRegistered": "Nessuna visualizzazione di struttura ad albero con ID '{0}' registrata.",
- 	"treeView.duplicateElement": "L'elemento con id {0} è già registrato"
-+=======
-+	"treeView.notRegistered": "Nessuna visualizzazione di struttura ad albero con ID '{0}' registrata."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 0a58dca9eaaf74ffb9f135ba4039a3e5f5a663da i18n/ita/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 967a9460fbe454ea199d54b4639f97929c5854cd i18n/ita/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 b30eb5b862d16fac9f145700dbe4800a61e1e401 i18n/ita/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -15,5 +15,9 @@
- 	"saveWorkspace": "Salva area di lavoro",
- 	"openWorkspaceAction": "Apri area di lavoro...",
- 	"openWorkspaceConfigFile": "Apri file di configurazione dell'area di lavoro",
-+<<<<<<< .our
- 	"duplicateWorkspaceInNewWindow": "Duplica area di lavoro nella nuova finestra"
-+=======
-+	"openFolderAsWorkspaceInNewWindow": "Apre la cartella come area di lavoro in una nuova finestra"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 48e9eddc787607e89120b63fe629a9ff5438a2a8 i18n/ita/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-  their  100644 e07a448e23d87b4c7ec0e6fa3cb935960a4996fb i18n/ita/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,4 +11,15 @@
- 	"add": "&&Aggiungi",
- 	"addFolderToWorkspaceTitle": "Aggiungi cartella all'area di lavoro",
- 	"workspaceFolderPickerPlaceholder": "Selezionare la cartella dell'area di lavoro"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"addFolderToWorkspace": "Aggiungi cartella all'area di lavoro...",
-+	"add": "&&Aggiungi",
-+	"addFolderToWorkspaceTitle": "Aggiungi cartella all'area di lavoro"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 aa914d12c1da869e962088d2cbdaa71dec18f105 i18n/ita/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  our    100644 cf3660bce1c9a34616bf6f0a1fe1b1d7c7bf7a0a i18n/ita/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  their  100644 8430880ec80121e257189c80cb2c92dfce5beb88 i18n/ita/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-@@ -19,6 +19,7 @@
- 	"close": "Chiudi",
- 	"closeOthers": "Chiudi altri",
- 	"closeRight": "Chiudi a destra",
-+<<<<<<< .our
- 	"closeAllSaved": "Chiudi salvati",
- 	"closeAll": "Chiudi tutto",
- 	"keepOpen": "Mantieni aperto",
-@@ -27,6 +28,15 @@
- 	"keepEditor": "Mantieni editor",
- 	"closeEditorsInGroup": "Chiudi tutti gli editor del gruppo",
- 	"closeSavedEditors": "Chiudi editor salvati del gruppo",
-+=======
-+	"closeAllUnmodified": "Chiudi non modificati",
-+	"closeAll": "Chiudi tutto",
-+	"keepOpen": "Mantieni aperto",
-+	"showOpenedEditors": "Mostra editor aperti",
-+	"keepEditor": "Mantieni editor",
-+	"closeEditorsInGroup": "Chiudi tutti gli editor del gruppo",
-+	"closeUnmodifiedEditors": "Chiudi editor non modificati del gruppo",
-+>>>>>>> .their
- 	"closeOtherEditors": "Chiudi gli altri editor",
- 	"closeRightEditors": "Chiudi editor a destra"
- }
-\ No newline at end of file
-changed in both
-  base   100644 00de0aab7d64af505627619a2939d5ad43b9ef74 i18n/ita/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 52332d26b607badcbfc6c1f6cb20390d01164f46 i18n/ita/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 5ff06b5baf65ba27890b39cc2876b0c6e9e70b69 i18n/ita/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 0e49511fa544f8bb8b1399692fefdd6a2f5c053d i18n/ita/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  our    100644 5a34fab0153073ac4fb299fb69d62730cb37cc6a i18n/ita/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  their  100644 023619e8620222beb29d86577c98bdd95709bc7b i18n/ita/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-changed in both
-  base   100644 1efc298b02cd642114945ecbf24a0dcdb425ecdd i18n/ita/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  our    100644 22268f1a23d3f17b0a706fdd5cbc81afbafc8e4b i18n/ita/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  their  100644 4476182db1851e83dca5a41301587321e328de72 i18n/ita/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-@@ -12,6 +12,10 @@
- 	"editableEditorWithInputAriaLabel": "{0}. Editor di confronto file di testo",
- 	"editableEditorAriaLabel": "Editor di confronto file di testo.",
- 	"navigate.next.label": "Revisione successiva",
-+<<<<<<< .our
- 	"navigate.prev.label": "Revisione precedente",
- 	"toggleIgnoreTrimWhitespace.label": "Ignora lo spazio vuoto finale"
-+=======
-+	"navigate.prev.label": "Revisione precedente"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 db72fb32688992ef42a8b202d502ed51312384af i18n/ita/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  our    100644 87ef247c9492a31e5723c851ba5fe6a0bcdca2a4 i18n/ita/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  their  100644 12d1b76075f4a87ecf796e5cfc6a1731a864e7e1 i18n/ita/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"close": "Chiudi",
-+>>>>>>> .their
- 	"araLabelEditorActions": "Azioni editor"
- }
-\ No newline at end of file
-changed in both
-  base   100644 c2344ccce6ac86de46b28825eb9665a6a82d07cc i18n/ita/src/vs/workbench/common/theme.i18n.json
-  our    100644 35f6e5209eb686bd26e13c1a8f96b6d2fe49fc8a i18n/ita/src/vs/workbench/common/theme.i18n.json
-  their  100644 f33262a82e27e122948638178e12b4abc25ebfb5 i18n/ita/src/vs/workbench/common/theme.i18n.json
-@@ -24,7 +24,10 @@
- 	"editorGroupBackground": "Colore di sfondo di un gruppo di editor. I gruppi di editor sono contenitori di editor. Il colore di sfondo viene visualizzato quando si trascinano i gruppi di editor in un'altra posizione.",
- 	"tabsContainerBackground": "Colore di sfondo dell'intestazione del titolo di gruppo di editor, quando le schede sono abilitate. I gruppi di editor sono i contenitori degli editor.",
- 	"tabsContainerBorder": "Colore del bordo dell'intestazione del titolo di gruppo di editor, quando le schede sono abilitate. I gruppi di editor sono i contenitori degli editor.",
-+<<<<<<< .our
- 	"editorGroupHeaderBackground": "Colore di sfondo dell'intestazione del titolo dell'editor quando le schede sono disabilitate (`\"workbench.editor.showTabs\": false`). I gruppi di editor sono contenitori di editor.",
-+=======
-+>>>>>>> .their
- 	"editorGroupBorder": "Colore per separare più gruppi di editor l'uno dall'altro. I gruppi di editor sono i contenitori degli editor.",
- 	"editorDragAndDropBackground": "Colore di sfondo quando si trascinano gli editor. Il colore dovrebbe avere una trasparenza impostata in modo che il contenuto dell'editor sia ancora visibile.",
- 	"panelBackground": "Colore di sfondo dei pannelli. I pannelli sono visualizzati sotto l'area degli editor e contengono visualizzazioni quali quella di output e del terminale integrato.",
-@@ -41,8 +44,11 @@
- 	"statusBarNoFolderBorder": "Colore del bordo della barra di stato che la separa dalla barra laterale e dall'editor quando non ci sono cartelle aperte. La barra di stato è visualizzata nella parte inferiore della finestra.",
- 	"statusBarItemActiveBackground": "Colore di sfondo degli elementi della barra di stato quando si fa clic. La barra di stato è visualizzata nella parte inferiore della finestra.",
- 	"statusBarItemHoverBackground": "Colore di sfondo degli elementi della barra di stato al passaggio del mouse. La barra di stato è visualizzata nella parte inferiore della finestra.",
-+<<<<<<< .our
- 	"statusBarProminentItemBackground": "Colore di sfondo degli elementi rilevanti della barra di stato. Gli elementi rilevanti spiccano rispetto ad altre voci della barra di stato. Per vedere un esempio, cambiare la modalità `Toggle Tab Key Moves Focus` nella barra dei comandi. La barra di stato è visualizzata nella parte inferiore della finestra.",
- 	"statusBarProminentItemHoverBackground": "Colore di sfondo degli elementi rilevanti della barra di stato al passaggio del mouse. Gli elementi rilevanti spiccano rispetto ad altre voci della barra di stato. Per vedere un esempio, cambiare la modalità `Toggle Tab Key Moves Focus` nella barra dei comandi. La barra di stato è visualizzata nella parte inferiore della finestra.",
-+=======
-+>>>>>>> .their
- 	"activityBarBackground": "Colore di sfondo della barra attività. La barra attività viene visualizzata nella parte inferiore sinistra/destra e consente il passaggio tra diverse visualizzazioni della barra laterale",
- 	"activityBarForeground": "Colore primo piano della barra attività (ad es. quello utilizzato per le icone). La barra attività viene mostrata all'estrema sinistra o destra e permette di alternare le visualizzazioni della barra laterale.",
- 	"activityBarBorder": "Colore del bordo della barra attività che la separa dalla barra laterale. La barra di attività viene mostrata all'estrema sinistra o destra e permette di alternare le visualizzazioni della barra laterale.",
-added in both
-  our    100644 eb055ed4506d14dd8144f10f4a8398105285f0d3 i18n/ita/src/vs/workbench/common/views.i18n.json
-  their  100644 ed1c7bde950f4f84edbe5116a0bd3ad795711bbe i18n/ita/src/vs/workbench/common/views.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"duplicateId": "Nel percorso '{1}' è già registrata una visualizzazione con ID '{0}' "
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"duplicateId": "Nel percorso `{1}` è già registrata una visualizzazione con ID `{0}` "
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ac85b55822ecb116e00b5b2b2635f000c1b16c96 i18n/ita/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 9737d645d67a50d571dc86669b68ed740de20eba i18n/ita/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 9ae1266d1f0d77f8d6b59d77637bd1971adb8fc8 i18n/ita/src/vs/workbench/electron-browser/actions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"closeWindow": "Chiudi finestra",
- 	"closeWorkspace": "Chiudi area di lavoro",
- 	"noWorkspaceOpened": "In questa istanza non ci sono attualmente aree di lavoro aperte da chiudere.",
-@@ -50,6 +53,14 @@
- 	"moveWindowTabToNewWindow": "Sposta scheda della finestra in una nuova finestra",
- 	"mergeAllWindowTabs": "Unisci tutte le finestre",
- 	"toggleWindowTabsBar": "Attiva/Disattiva barra delle schede delle finestre",
-+<<<<<<< .our
- 	"about": "Informazioni su {0}",
- 	"inspect context keys": "Esamina le chiavi di contesto"
-+=======
-+	"configureLocale": "Configura lingua",
-+	"displayLanguage": "Definisce la lingua visualizzata di VSCode.",
-+	"doc": "Per un elenco delle lingue supportate, vedere {0}.",
-+	"restart": "Se si modifica il valore, è necessario riavviare VSCode.",
-+	"fail.createSettings": "Non è possibile creare '{0}' ({1})."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 14e407b8a5d2dd18080b98db4aeceb6e82efc738 i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 16fec1a5d98f225249a95297ad06c45ba75efafc i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 103d383af16da2b098a39da278dfab3e080b1192 i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,12 +35,19 @@
- 	"panelDefaultLocation": "Controlla la posizione predefinita del pannello. Può essere mostrato nella parte inferiore o a destra del banco di lavoro.",
- 	"statusBarVisibility": "Controlla la visibilità della barra di stato nella parte inferiore del workbench.",
- 	"activityBarVisibility": "Controlla la visibilità della barra attività nel workbench.",
-+<<<<<<< .our
- 	"viewVisibility": "Controlla la visibilità delle azioni dell'intestazione della visualizzazione. Le azioni dell'intestazione della visualizzazione possono essere sempre visibili oppure visibili solo quando lo stato attivo è spostato sulla visualizzazione o si passa con il puntatore sulla visualizzazione.",
- 	"fontAliasing": "Controlla il metodo di aliasing dei caratteri nell'area di lavoro.\n- default: anti-aliasing dei caratteri a livello di sub-pixel. Nella maggior parte delle visualizzazioni non retina consentirà di ottenere un testo con il massimo contrasto.\n- antialiased: anti-aliasing dei caratteri a livello di pixel, invece che a livello di sub-pixel. Consente di visualizzare i caratteri più chiari.\n- none: disabilita l'anti-aliasing dei caratteri. Il testo verrà visualizzato con contorni irregolari.\n- auto: applica automaticamente `default` o `antialiased` in base al valore DPI degli schermi.",
- 	"workbench.fontAliasing.default": "Anti-aliasing dei caratteri a livello di sub-pixel. Nella maggior parte delle visualizzazioni non retina consentirà di ottenere un testo con il massimo contrasto.",
- 	"workbench.fontAliasing.antialiased": "Anti-aliasing dei caratteri a livello di pixel, invece che a livello di sub-pixel. Consente di visualizzare i caratteri più chiari.",
- 	"workbench.fontAliasing.none": "Disabilita l'anti-aliasing dei caratteri. Il testo verrà visualizzato con contorni irregolari. ",
- 	"workbench.fontAliasing.auto": "Applica automaticamente `default` o `antialiased` in base al valore DPI degli schermi.",
-+=======
-+	"fontAliasing": "Controlla il metodo di aliasing dei caratteri nell'area di lavoro.\n- impostazione predefinita: anti-aliasing dei caratteri a livello di sub-pixel. Nella maggior parte delle visualizzazioni non retina consentirà di ottenere un testo con il massimo contrasto.\n- anti-aliasing: anti-aliasing dei caratteri a livello di pixel, invece che a livello di sub-pixel. Consente di visualizzare i caratteri più chiari.\n- nessuno: disabilita l'anti-aliasing dei caratteri. Il testo verrà visualizzato con contorni irregolari.",
-+	"workbench.fontAliasing.default": "Anti-aliasing dei caratteri a livello di sub-pixel. Nella maggior parte delle visualizzazioni non retina consentirà di ottenere un testo con il massimo contrasto.",
-+	"workbench.fontAliasing.antialiased": "Anti-aliasing dei caratteri a livello di pixel, invece che a livello di sub-pixel. Consente di visualizzare i caratteri più chiari.",
-+	"workbench.fontAliasing.none": "Disabilita l'anti-aliasing dei caratteri. Il testo verrà visualizzato con contorni irregolari. ",
-+>>>>>>> .their
- 	"enableNaturalLanguageSettingsSearch": "Controlla se abilitare la modalità di ricerca in linguaggio naturale per le impostazioni.",
- 	"windowConfigurationTitle": "Finestra",
- 	"window.openFilesInNewWindow.on": "I file verranno aperti in una nuova finestra",
-changed in both
-  base   100644 7e90f64d82a4fa36c43e4f29e139ce445abd4761 i18n/ita/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  our    100644 40bf3c283240817477f8aec83bc57568d8f25770 i18n/ita/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  their  100644 94d7c45f7eb94399a63be2ad6ff3de70299bf789 i18n/ita/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"debug.terminal.title": "oggetto del debug"
- }
-\ No newline at end of file
-changed in both
-  base   100644 1b150a45b5f94b4afe926f7593fd6e0077139c2c i18n/ita/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  our    100644 2e6bc1e73d84675841055020e554bed2fb64eb7d i18n/ita/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  their  100644 5f819964e722118667f0dcca31bb29c830895978 i18n/ita/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-changed in both
-  base   100644 ec5fd33a3b1949fdef92ce08e1586cdcb9ac2168 i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 87312cd2502c47006701381399f821b3154685ff i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 2623cd6b56bff896693a3f32685e5f5cc3f93b1f i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,11 @@
- 	"exeBasedRecommendation": "Questa estensione è consigliata perché avete installato {0}.",
- 	"fileBasedRecommendation": "Questa estensione è raccomandata in base ai file aperti di recente.",
- 	"workspaceRecommendation": "Questa estensione è consigliata dagli utenti dell'area di lavoro corrente.",
-+=======
-+	"workspaceRecommendation": "Questa estensione è consigliata dagli utenti dell'area di lavoro corrente.",
-+	"fileBasedRecommendation": "Questa estensione è raccomandata in base ai file aperti di recente.",
-+	"exeBasedRecommendation": "Questa estensione è consigliata perché avete installato {0}.",
-+>>>>>>> .their
- 	"reallyRecommended2": "Per questo tipo di file è consigliabile utilizzare l'estensione '{0}'.",
- 	"reallyRecommendedExtensionPack": "Per questo tipo di file è consigliabile usare il pacchetto di estensione '{0}'.",
- 	"install": "Installa",
-added in both
-  our    100644 f20b6fbba0271cb5b08b436000b1e92f6bf372b0 i18n/ita/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-  their  100644 1866903b33ec0a986aef1e651e9eb5e0863bee0b i18n/ita/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,13 @@
- 	],
- 	"workbenchConfigurationTitle": "Area di lavoro",
- 	"feedbackVisibility": "Controlla la visibilità del feedback Twitter (smiley) nella barra di stato nella parte inferiore del banco di lavoro."
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"workbenchConfigurationTitle": "Area di lavoro"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 f61ceeb442ff48c8180bf65c9a3fe795d133ade9 i18n/ita/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/ita/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"hide": "Nascondi"
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 979ee1896bb4a0ed40f3dc0f15d528c50ff49c3c i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  our    100644 f659f351cf6a9bd615c47ae466bed823f6c0842e i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  their  100644 4a78ba420237fe710966fa472b33c74f8f36a88c i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-@@ -12,7 +12,10 @@
- 	"revertLocalChanges": "Annullare le modifiche e tornare al contenuto sul disco",
- 	"copyPathOfActive": "Copia percorso del file attivo",
- 	"saveAllInGroup": "Salva tutto nel gruppo",
-+<<<<<<< .our
- 	"saveFiles": "Salva tutti i file",
-+=======
-+>>>>>>> .their
- 	"revert": "Ripristina file",
- 	"compareActiveWithSaved": "Confronta file attivo con file salvato",
- 	"closeEditor": "Chiudi editor",
-@@ -24,12 +27,19 @@
- 	"copyPath": "Copia percorso",
- 	"saveAll": "Salva tutto",
- 	"compareWithSaved": "Confronta con file salvato",
-+<<<<<<< .our
- 	"compareWithSelected": "Confronta con selezionati",
- 	"compareSource": "Seleziona per il confronto",
- 	"compareSelected": "Confronta selezionati",
- 	"close": "Chiudi",
- 	"closeOthers": "Chiudi altri",
- 	"closeSaved": "Chiudi salvati",
-+=======
-+	"compareSource": "Seleziona per il confronto",
-+	"close": "Chiudi",
-+	"closeOthers": "Chiudi altri",
-+	"closeUnmodified": "Chiudi non modificati",
-+>>>>>>> .their
- 	"closeAll": "Chiudi tutto",
- 	"deleteFile": "Elimina definitivamente"
- }
-\ No newline at end of file
-changed in both
-  base   100644 7d23a38e70345906d2303122bbd907e2d0b21fb4 i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 be168507f7ffd1be04bdbdbb14365762be628f25 i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 14358d0abb2b5379df97f131dcbf8c76cacf6a11 i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"newFile": "Nuovo file",
- 	"newFolder": "Nuova cartella",
- 	"rename": "Rinomina",
-@@ -13,7 +16,11 @@
- 	"copyFile": "Copia",
- 	"pasteFile": "Incolla",
- 	"retry": "Riprova",
-+<<<<<<< .our
- 	"renameWhenSourcePathIsParentOfTargetError": "Usare il comando 'Nuova cartella' o 'Nuovo file' per aggiungere elementi figlio a una cartella esistente",
-+=======
-+	"openFolderFirst": "Aprire prima di tutto una cartella per creare file o cartelle al suo interno.",
-+>>>>>>> .their
- 	"newUntitledFile": "Nuovo file senza nome",
- 	"createNewFile": "Nuovo file",
- 	"createNewFolder": "Nuova cartella",
-@@ -43,11 +50,19 @@
- 	"confirmDeleteMessageMultiple": "Sei sicuro di voler eliminare permanentemente i seguenti {0} file?",
- 	"confirmDeleteMessageFolder": "Eliminare definitivamente '{0}' e il relativo contenuto?",
- 	"confirmDeleteMessageFile": "Eliminare definitivamente '{0}'?",
-+<<<<<<< .our
- 	"addFiles": "Aggiungi file",
- 	"confirmOverwrite": "Nella cartella di destinazione esiste già un file o una cartella con lo stesso nome. Sovrascrivere?",
- 	"replaceButtonLabel": "&&Sostituisci",
- 	"fileIsAncestor": "Il file da incollare è un predecessore della cartella di destinazione",
- 	"fileDeleted": "Il file da incollare è stato eliminato o spostato nel frattempo",
-+=======
-+	"irreversible": "Questa azione è irreversibile.",
-+	"permDelete": "Elimina definitivamente",
-+	"importFiles": "Importa file",
-+	"confirmOverwrite": "Nella cartella di destinazione esiste già un file o una cartella con lo stesso nome. Sovrascrivere?",
-+	"replaceButtonLabel": "&&Sostituisci",
-+>>>>>>> .their
- 	"duplicateFile": "Duplicato",
- 	"globalCompareFile": "Confronta file attivo con...",
- 	"openFileToCompare": "Aprire prima un file per confrontarlo con un altro file.",
-changed in both
-  base   100644 a02c62cce4f7b3b0f711396a7a7b6078c2363a94 i18n/ita/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  our    100644 2e22a3e434ad464b47a1a671a80bcc90e411bd12 i18n/ita/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  their  100644 34188204b433c3286a8826d315f200b3513a3884 i18n/ita/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,15 +7,22 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"revealInWindows": "Visualizza in Esplora risorse",
- 	"revealInMac": "Visualizza in Finder",
- 	"openContainer": "Apri cartella superiore",
- 	"saveAs": "Salva con nome...",
- 	"save": "Salva",
- 	"saveAll": "Salva tutto",
-+<<<<<<< .our
- 	"removeFolderFromWorkspace": "Rimuovi cartella dall'area di lavoro",
- 	"genericRevertError": "Impossibile ripristinare '{0}': {1}",
- 	"modifiedLabel": "{0} (su disco) ↔ {1}",
-+=======
-+	"saveFiles": "Salva tutti i file",
-+	"removeFolderFromWorkspace": "Rimuovi cartella dall'area di lavoro",
-+>>>>>>> .their
- 	"openFileToReveal": "Aprire prima un file per visualizzarlo",
- 	"openFileToCopy": "Aprire prima un file per copiarne il percorso"
- }
-\ No newline at end of file
-changed in both
-  base   100644 6fb07e8966ee518868af4ed7683ea01b1010f41f i18n/ita/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 a29bf6c8fddc26469df2a03b0634b7525ec1e6dc i18n/ita/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 bf53e0bc960d3b4c3597d078f47da85d82c62dcb i18n/ita/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-@@ -40,7 +40,10 @@
- 	"formatOnSave": "Formatta un file durante il salvataggio. Deve essere disponibile un formattatore, il file non deve essere salvato automaticamente e l'editor non deve essere in fase di chiusura.",
- 	"formatOnSaveTimeout": "Timeout per Formatta dopo il salvataggio. Specifica un limite di tempo in millisecondi per i comandi formatOnSave. I comandi che richiedono più tempo del timeout specificato verranno annullati.",
- 	"explorerConfigurationTitle": "Esplora file",
-+<<<<<<< .our
- 	"openEditorsVisible": "Numero di editor visualizzati nel riquadro degli editor aperti.",
-+=======
-+>>>>>>> .their
- 	"autoReveal": "Controlla se Esplora risorse deve rivelare automaticamente e selezionare i file durante l'apertura.",
- 	"enableDragAndDrop": "Controlla se Esplora risorse deve consentire lo spostamento di file e cartelle tramite trascinamento della selezione.",
- 	"confirmDragAndDrop": "Controlla se Esplora risorse deve chiedere conferma prima di spostare file e cartelle tramite trascinamento della selezione.",
-changed in both
-  base   100644 49ebceb9611a7d647962c205cef0ff00c56d0e9d i18n/ita/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  our    100644 f0de873df312d3467a7db1430cfde0ec5b45cfe3 i18n/ita/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  their  100644 8052e44e9f3ae0dd2ed736e663832982ea4c9f09 i18n/ita/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,6 +14,12 @@
- 	"readonlySaveErrorAdmin": "Impossibile salvare '{0}': Il file è protetto da scrittura. Selezionare 'Sovrascrivi come Admin' per riprovare come amministratore.",
- 	"readonlySaveError": "Impossibile salvare '{0}': Il file è protetto da scrittura. Selezionare 'Sovrascrivi come Admin' per provare a rimuovere la protezione.",
- 	"permissionDeniedSaveError": "Impossibile salvare '{0}': Autorizzazioni insufficienti. Selezionare 'Riprova come Admin' per eseguire come amministratore.",
-+=======
-+	"userGuide": "Usare le azioni della barra degli strumenti dell'editor a destra per **annullare** le modifiche o per **sovrascrivere** il contenuto su disco con le modifiche",
-+	"overwrite": "Sovrascrivi",
-+	"retry": "Riprova",
-+	"discard": "Rimuovi",
-+>>>>>>> .their
- 	"genericSaveError": "Non è stato possibile salvare '{0}': {1}",
- 	"learnMore": "Altre informazioni",
- 	"dontShowAgain": "Non visualizzare più questo messaggio",
-changed in both
-  base   100644 5627c56823f1524e5aa8c0ed705dd6664eefe687 i18n/ita/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  our    100644 9d379690a9023ffd416a683636dffb8cc779fe5f i18n/ita/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  their  100644 f7d56641c92acc5dbb78d334bea25c8a4bb37c56 i18n/ita/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-added in both
-  our    100644 020217534a1c289db69b1db7e69fe2ce7a18a56e i18n/ita/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-  their  100644 458e72265954305465acaa798dd03a6debfd8145 i18n/ita/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,5 +11,13 @@
- 	"sharedLog": "Log (Condiviso)",
- 	"rendererLog": "Log (Finestra)",
- 	"extensionsLog": "Log (Host dell'estensione)",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"developer": "Sviluppatore"
- }
-\ No newline at end of file
-added in both
-  our    100644 1f4e198062af620354f99b641819730c9dd1751a i18n/ita/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  their  100644 88a2d7b74875e9bf8e394c1c6643bd422794042e i18n/ita/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -16,6 +17,22 @@
- 	"selectProcess": "Seleziona log per il processo",
- 	"openLogFile": "Apri file di Log...",
- 	"setLogLevel": "Imposta livello log...",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"openLogsFolder": "Apri cartella dei log",
-+	"showLogs": "Mostra log...",
-+	"mainProcess": "Principale",
-+	"sharedProcess": "Condiviso",
-+	"rendererProcess": "Finestra",
-+	"extensionHost": "Host dell'estensione",
-+	"selectProcess": "Seleziona il processo",
-+	"setLogLevel": "Imposta livello log",
-+>>>>>>> .their
- 	"trace": "Analisi",
- 	"debug": "Debug",
- 	"info": "Informazioni",
-@@ -23,8 +40,12 @@
- 	"err": "Errore",
- 	"critical": "Errori critici",
- 	"off": "Disattivato",
-+<<<<<<< .our
- 	"selectLogLevel": "Seleziona il livello log",
- 	"default and current": "Predefinito e corrente",
- 	"default": "Impostazione predefinita",
- 	"current": "Corrente"
-+=======
-+	"selectLogLevel": "Seleziona il livello log"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 5e585c6ea401a6decbb3a6fa908c9d0a7d3d4d6c i18n/ita/src/vs/workbench/parts/markers/common/messages.i18n.json
-  our    100644 c69fa3b4ca1f52f43b5f29fa9b4d56c7496d7921 i18n/ita/src/vs/workbench/parts/markers/common/messages.i18n.json
-  their  100644 0337b4edbb1f21cca10f4bb997307d6ac708add6 i18n/ita/src/vs/workbench/parts/markers/common/messages.i18n.json
-@@ -7,8 +7,11 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"viewCategory": "Visualizza",
-+<<<<<<< .our
- 	"problems.view.toggle.label": "Attiva/Disattiva Problemi (Errori, Avvisi, Informazioni)",
- 	"problems.view.focus.label": "Sposta lo stato attivo su problemi (Errori, Avvisi, Informazioni)",
-+=======
-+>>>>>>> .their
- 	"problems.panel.configuration.title": "Visualizzazione Problemi",
- 	"problems.panel.configuration.autoreveal": "Controlla se la visualizzazione Problemi deve visualizzare automaticamente i file durante l'apertura",
- 	"markers.panel.title.problems": "Problemi",
-added in both
-  our    100644 9800b7b0870a97d47c83526ea2b330b35e18dfa1 i18n/ita/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-  their  100644 99ba0e6815c405d714d796f9256da2822fa0574f i18n/ita/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -11,4 +12,15 @@
- 	"viewCategory": "Visualizza",
- 	"clearOutput.label": "Cancella output",
- 	"openActiveLogOutputFile": "Visualizza: Apri file di output del log attivo"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"output": "Output",
-+	"viewCategory": "Visualizza",
-+	"clearOutput.label": "Cancella output"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 2592755ea524e2e13b05e59e9af9746c2e3fb809 i18n/ita/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/ita/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,12 @@
- 	],
- 	"output": "{0} - Output",
- 	"channel": "Canale Output per '{0}'"
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 7c1a3a7d3098bd08a59acf5cb5b4879d594479f6 i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 fe346036c36b558ff4bb96cc47cf0bc0e91a4106 i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 4669fa3cd569668aa151bf2371615c0405cad3df i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"defaultSettings": "Inserire le impostazioni nell'editor di lato destro per eseguire l'override.",
- 	"noSettingsFound": "Non sono state trovate impostazioni.",
- 	"settingsSwitcherBarAriaLabel": "Selezione impostazioni",
-changed in both
-  base   100644 c4cdd4ead337c007b5986cec2f24a27abcbf7db7 i18n/ita/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  our    100644 0dbd18fbe236306a0033a2febcef40e1643db2ff i18n/ita/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  their  100644 7149b64d24f5dfcf7812bd41014e1ca0e3f2d263 i18n/ita/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-changed in both
-  base   100644 13929c1fa4b022999e94efe11748cc6b6ea6f6a1 i18n/ita/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  our    100644 5323d00bb1895b2b9d343a1d3915400bb17b41c9 i18n/ita/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  their  100644 9d39d9c9b4135f71faddc10c4078aa254b6c9c23 i18n/ita/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"view": "Visualizza",
- 	"commandsHandlerDescriptionDefault": "Mostra ed esegui comandi",
- 	"gotoLineDescriptionMac": "Vai alla riga",
-changed in both
-  base   100644 44389863a6597158d5c8c1ef5cea9a4f43086987 i18n/ita/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  our    100644 1bf66fd38b69adac67e7b86fcb0f801683c89491 i18n/ita/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  their  100644 7bc3bea7022aa54af41de235d7782e11963e0cd2 i18n/ita/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-@@ -10,8 +10,12 @@
- 	"source control": "Controllo del codice sorgente",
- 	"toggleSCMViewlet": "Mostra Gestione controllo servizi",
- 	"view": "Visualizza",
-+<<<<<<< .our
- 	"scmConfigurationTitle": "Gestione controllo servizi",
- 	"alwaysShowProviders": "Mostrare sempre la sezione Provider di controllo del codice sorgente.",
- 	"diffDecorations": "Controlla decorazioni diff nell'editor",
- 	"diffGutterWidth": "Controlla la larghezza (px) delle decorazioni diff nella barra di navigazione (aggiunte e modificate)."
-+=======
-+	"scmConfigurationTitle": "Gestione controllo servizi"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ebff6e3002a34b93ac0d6892854634f5bafe8207 i18n/ita/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 92c227f579048a55e12147b807cef8b2e56a92a0 i18n/ita/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 406201bbecb0a61ccccddc178e86b190bce050f9 i18n/ita/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-changed in both
-  base   100644 25315a7f99eac9c9766c4f6939865daa29f48e65 i18n/ita/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 13379f4fe2a00cfa238ca2e6341676a8a3328e76 i18n/ita/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 b29d6b897b6fdc5eca03973165a4f62061411d5a i18n/ita/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,11 +13,18 @@
- 	"copyAllLabel": "Copia tutti",
- 	"clearSearchHistoryLabel": "Cancella cronologia di ricerca",
- 	"toggleSearchViewPositionLabel": "Attiva/Disattiva ricerca posizione della visualizzazione",
-+=======
-+>>>>>>> .their
- 	"findInFolder": "Trova nella cartella...",
- 	"findInWorkspace": "Trova nell'area di lavoro...",
- 	"showTriggerActions": "Vai al simbolo nell'area di lavoro...",
- 	"name": "Cerca",
-+<<<<<<< .our
- 	"showSearchViewl": "Mostra Cerca",
-+=======
-+	"search": "Cerca",
-+	"showSearchViewlet": "Mostra Cerca",
-+>>>>>>> .their
- 	"view": "Visualizza",
- 	"findInFiles": "Cerca nei file",
- 	"openAnythingHandlerDescription": "Vai al file",
-added in both
-  our    100644 e38dd49d0c9e389b07d35c25b7a3e57218fd6e82 i18n/ita/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-  their  100644 32dc45ab7fd6ef5de46f1281f30315dcc6e50722 i18n/ita/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -13,5 +14,14 @@
- 	"new.global.sep": "Nuovi frammenti di codice",
- 	"openSnippet.pickLanguage": "Selezionare file di Frammenti o creare Frammenti di codice",
- 	"openSnippet.label": "Configura Frammenti utente",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"global.1": "({0})",
-+>>>>>>> .their
- 	"preferences": "Preferenze"
- }
-\ No newline at end of file
-changed in both
-  base   100644 7cea9caafc3bb08fce418e3954db6eed7a06c76e i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  our    100644 9b4c727b904e62e008f2cc5a8dfb849b594c3479 i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  their  100644 356ac5c6fe2dab52c70cc0fdee1033fdaeac088c i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"snippetSchema.json.default": "Frammento vuoto",
- 	"snippetSchema.json": "Configurazione del frammento utente",
- 	"snippetSchema.json.prefix": "Prefisso da usare quando si seleziona il frammento in IntelliSense",
-added in both
-  our    100644 0c9e86e93b1c8cd9f783fbdd35456c032d41e2f3 i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-  their  100644 fee95f06a2ca34f7350242c419e8a4806c5e1dab i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,5 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"source.snippetGlobal": "Frammento utente globale",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"source.snippet": "Frammento utente"
- }
-\ No newline at end of file
-changed in both
-  base   100644 d130ea84c16b708173b07dd8897cf004329160b5 i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  our    100644 c878d5c9380cb8bf8f1d7f22ef4111b700bf8888 i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 02cfa9b88abde71b706d2a84a76e9f6835080b40 i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,9 @@
- 	],
- 	"invalid.path.0": "È previsto un valore stringa in `contributes.{0}.path`. Valore specificato: {1}",
- 	"invalid.language.0": "Quando si omette il linguaggio, il valore di `contributes.{0}.path` deve essere un file `.code-snippets`. Fornire il valore: {1}",
-+=======
-+	"invalid.path.0": "È previsto un valore stringa in `contributes.{0}.path`. Valore specificato: {1}",
-+>>>>>>> .their
- 	"invalid.language": "Il linguaggio in `contributes.{0}.language` è sconosciuto. Valore specificato: {1}",
- 	"invalid.path.1": "Valore previsto di `contributes.{0}.path` ({1}) da includere nella cartella dell'estensione ({2}). L'estensione potrebbe non essere più portatile.",
- 	"vscode.extension.contributes.snippets": "Frammenti per contributes.",
-changed in both
-  base   100644 6d85a5950278a18e9fb88e927ad82d95caac736b i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 7ae3aac58f69dc8b25dec80d0624497a5e9abe14 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 2d53dad915697fd458b2f3c70929a0bc3883be01 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -10,7 +10,11 @@
- 	"terminal.foreground": "Il colore di primo piano del terminale.",
- 	"terminalCursor.foreground": "Colore di primo piano del cursore del terminale.",
- 	"terminalCursor.background": "Colore di sfondo del cursore del terminale. Permette di personalizzare il colore di un carattere quando sovrapposto da un blocco cursore.",
-+<<<<<<< .our
- 	"terminal.selectionBackground": "Colore di sfondo di selezione del terminale.",
- 	"terminal.border": "Colore del bordo che separa i riquadri divisi all'interno del terminale. L'impostazione predefinita è panel.border.",
- 	"terminal.ansiColor": "'{0}' colori ANSI nel terminale. "
-+=======
-+	"terminal.selectionBackground": "Colore di sfondo di selezione del terminale."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6055f7da096e705eed9691feffcfb1cc96e45424 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  our    100644 40819f4f5c0ae27f5cd1ace3053b821e16b4452e i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  their  100644 f695d8b57b2d7697977cdcdf3ff8b47e2431ada8 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-@@ -8,7 +8,11 @@
- 	],
- 	"terminal.integrated.chooseWindowsShellInfo": "È possibile modificare la shell di terminale di default selezionando il pulsante Personalizza.",
- 	"customize": "Personalizza",
-+<<<<<<< .our
- 	"never again": "Non visualizzare più questo messaggio",
-+=======
-+	"cancel": "Annulla",
-+>>>>>>> .their
- 	"terminal.integrated.chooseWindowsShell": "Seleziona la shell di terminale preferita - è possibile modificare questa impostazione dopo",
- 	"terminalService.terminalCloseConfirmationSingular": "C'è una sessione di terminale attiva. Terminarla?",
- 	"terminalService.terminalCloseConfirmationPlural": "Ci sono {0} sessioni di terminale attive. Terminarle?"
-changed in both
-  base   100644 46c966a637e00f99a76a08c2c86d66c2ae0d7e48 i18n/ita/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 aed35ee0f736e71e25693c29ccc2843fb9df2498 i18n/ita/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 7d586fdfcf427d7d9700095eaa698e584ee1d4ec i18n/ita/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -26,7 +26,10 @@
- 	"commandPalette": "Riquadro comandi...",
- 	"settings": "Impostazioni",
- 	"keyboardShortcuts": "Scelte rapide da tastiera",
-+<<<<<<< .our
- 	"showExtensions": "Gestisci le estensioni",
-+=======
-+>>>>>>> .their
- 	"userSnippets": "Frammenti utente",
- 	"selectTheme.label": "Tema colori",
- 	"themes.selectIconTheme.label": "Tema icona file",
-changed in both
-  base   100644 6952c245dd7cea50c20ee74fe2f371f8ca6991f1 i18n/ita/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  our    100644 b25e5dc4490f42f2acd95fbd251f7ac1e096a7d8 i18n/ita/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  their  100644 fb6e0553811d6c1a7865a24d00402f27231293aa i18n/ita/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,4 +14,9 @@
- 	"fileBinaryError": "Il file sembra essere binario e non può essere aperto come file di testo",
- 	"err.create": "Non è stato possibile creare il file {0}",
- 	"fileMoveConflict": "Non è possibile eseguire operazioni di spostamento/copia. Il file esiste già nella destinazione."
-+=======
-+	"fileIsDirectoryError": "Il File è una Directory",
-+	"fileNotModifiedError": "File non modificato dal giorno",
-+	"fileBinaryError": "Il file sembra essere binario e non può essere aperto come file di testo"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c6f9ca638623692c6f9b7125c9322e47d38ae7e9 i18n/ita/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  our    100644 bd90eec60a770b172512124f2896972c4cb8c6ef i18n/ita/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  their  100644 11826e9bcfba41f91db0a83d2251a9e633af8d47 i18n/ita/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-changed in both
-  base   100644 c8e3f4e44d82d3aaeb93613417c2d43aa5efbaad i18n/ita/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 59d0978a765c9fd6ca13b8566191473ce46ff2e1 i18n/ita/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 7ff89ea80bdc0fb0a3c023c828f60208023770b4 i18n/ita/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-changed in both
-  base   100644 83c0f4d81a8c79b8412faddc40c38af56b7610c9 i18n/ita/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  our    100644 11167d34b3da69e1f16a2d4464dfd47538392442 i18n/ita/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  their  100644 af0e885e44ba80dedad719d26ff2e047fbb96c20 i18n/ita/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-@@ -8,5 +8,10 @@
- 	],
- 	"errorInvalidTaskConfiguration": "Impossibile scrivere nel file di configurazione dell'area di lavoro. Si prega di aprire il file per correggere eventuali errori/avvisi e riprovare.",
- 	"errorWorkspaceConfigurationFileDirty": "Impossibile scrivere nel file di configurazione dell'area di lavoro, perché il file è sporco. Si prega di salvarlo e riprovare.",
-+<<<<<<< .our
- 	"openWorkspaceConfigurationFile": "Apri configurazione dell'area di lavoro"
-+=======
-+	"openWorkspaceConfigurationFile": "Apri file di configurazione dell'area di lavoro",
-+	"close": "Chiudi"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f8b65e69685274c83f0178dfc7ec0de385f2bde4 i18n/jpn/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
-  our    100644 e71ba067641ea2202f8bbf4473a591865dfa618b i18n/jpn/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
-  their  100644 905556c139c3bce76422da2fcc6939fd1d413744 i18n/jpn/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
-changed in both
-  base   100644 5ff9ba2550a340998a02f56e6644132b9df7f23d i18n/jpn/extensions/css/package.i18n.json
-  our    100644 afbe11a31b688e3d20e90f7c0034dcf3b0256eba i18n/jpn/extensions/css/package.i18n.json
-  their  100644 4716b3c9ee15e15e0e5cf00158b044f410537d88 i18n/jpn/extensions/css/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,76 @@
- 	],
- 	"displayName": "CSS の基本言語サポート",
- 	"description": "CSS、LESS、SCSS ファイル内で構文ハイライト、かっこ一致を提供します。"
-+=======
-+	"css.title": "CSS",
-+	"css.lint.argumentsInColorFunction.desc": "無効なパラメーター数値",
-+	"css.lint.boxModel.desc": "padding や border を使用するときに width や height を使用しないでください",
-+	"css.lint.compatibleVendorPrefixes.desc": "ベンダー プレフィックス を使用するときは、他すべてのベンダー プレフィックスも必ず含めてください",
-+	"css.lint.duplicateProperties.desc": "重複するスタイル定義を使用しないでください",
-+	"css.lint.emptyRules.desc": "空の規則セットを使用しないでください",
-+	"css.lint.float.desc": "'float' の使用を避けてください。float は脆弱な CSS につながり、レイアウトの一部が変更されたときに CSS が破損しやすくなります。",
-+	"css.lint.fontFaceProperties.desc": "@font-face 規則で 'src' プロパティと 'font-family' プロパティを定義する必要があります",
-+	"css.lint.hexColorLength.desc": "Hex には 3 つまたは 6 つの 16 進数が含まれる必要があります",
-+	"css.lint.idSelector.desc": "セレクターには ID を含めないでください。これらの規則と HTML の結合が密接すぎます。",
-+	"css.lint.ieHack.desc": "IE ハックは、IE7 以前をサポートする場合にのみ必要です",
-+	"css.lint.important.desc": "!important は使用しないでください。これは CSS 全体の特定性が制御不能になり、リファクタリングが必要なことを示しています。",
-+	"css.lint.importStatement.desc": "複数の Import ステートメントを同時に読み込むことはできません",
-+	"css.lint.propertyIgnoredDueToDisplay.desc": "display によってプロパティを無視します。例: 'display: inline' の場合、width、height、margin-top、margin-bottom、float プロパティには効果がありません。",
-+	"css.lint.universalSelector.desc": "ユニバーサル セレクター (*) を使用すると処理速度が低下することが分かっています",
-+	"css.lint.unknownProperties.desc": "不明なプロパティ。",
-+	"css.lint.unknownVendorSpecificProperties.desc": "不明なベンダー固有のプロパティ。",
-+	"css.lint.vendorPrefix.desc": "ベンダー固有のプレフィックスを使用する場合は、標準のプロパティも含めます",
-+	"css.lint.zeroUnits.desc": "0 に単位は必要ありません",
-+	"css.trace.server.desc": "VS Code と CSS 言語サーバー間の通信をトレースします。",
-+	"css.validate.title": "CSS の検証と問題の重大度を制御します。",
-+	"css.validate.desc": "すべての検証を有効または無効にします",
-+	"less.title": "LESS",
-+	"less.lint.argumentsInColorFunction.desc": "正しくないパラメーターの数",
-+	"less.lint.boxModel.desc": "パディングまたは枠線を使用する場合は幅または高さを使用しないでください",
-+	"less.lint.compatibleVendorPrefixes.desc": "ベンダー固有のプレフィックスを使用する場合は、他のすべてのベンダー固有のプロパティも必ず含めてください",
-+	"less.lint.duplicateProperties.desc": "重複するスタイル定義を使用しないでください",
-+	"less.lint.emptyRules.desc": "空の規則セットを使用しないでください",
-+	"less.lint.float.desc": "'float' は使用しないでください。float を使用すると、レイアウトの一部が変更されたときに CSS が破損しやすくなります。",
-+	"less.lint.fontFaceProperties.desc": "@font-face 規則で 'src' プロパティと 'font-family' プロパティを定義する必要があります",
-+	"less.lint.hexColorLength.desc": "16 進数の色には、3 つまたは 6 つの 16 進数が含まれる必要があります",
-+	"less.lint.idSelector.desc": "セレクターには ID を含めないでください。これらの規則と HTML の結合が密接すぎます。",
-+	"less.lint.ieHack.desc": "IE ハックは、IE7 以前をサポートする場合にのみ必要です",
-+	"less.lint.important.desc": "!important は使用しないでください。これは CSS 全体の特定性が制御不能になり、リファクタリングが必要なことを示しています。",
-+	"less.lint.importStatement.desc": "複数の Import ステートメントを同時に読み込むことはできません",
-+	"less.lint.propertyIgnoredDueToDisplay.desc": "表示によりプロパティが無視されます。たとえば、'display: inline' の場合、width、height、margin-top、margin-bottom、および float のプロパティには効果がありません",
-+	"less.lint.universalSelector.desc": "ユニバーサル セレクター (*) を使用すると処理速度が低下することが分かっています",
-+	"less.lint.unknownProperties.desc": "不明なプロパティ。",
-+	"less.lint.unknownVendorSpecificProperties.desc": "不明なベンダー固有のプロパティ。",
-+	"less.lint.vendorPrefix.desc": "ベンダー固有のプレフィックスを使用する場合は、標準のプロパティも含めます",
-+	"less.lint.zeroUnits.desc": "0 の単位は必要ありません",
-+	"less.validate.title": "LESS の検証と問題の重大度を制御します。",
-+	"less.validate.desc": "すべての検証を有効または無効にします",
-+	"scss.title": "SCSS (Sass)",
-+	"scss.lint.argumentsInColorFunction.desc": "正しくないパラメーターの数",
-+	"scss.lint.boxModel.desc": "パディングまたは枠線を使用する場合は幅または高さを使用しないでください",
-+	"scss.lint.compatibleVendorPrefixes.desc": "ベンダー固有のプレフィックスを使用する場合は、他のすべてのベンダー固有のプロパティも必ず含めてください",
-+	"scss.lint.duplicateProperties.desc": "重複するスタイル定義を使用しないでください",
-+	"scss.lint.emptyRules.desc": "空の規則セットを使用しないでください",
-+	"scss.lint.float.desc": "'float' は使用しないでください。float を使用すると、レイアウトの一部が変更されたときに CSS が破損しやすくなります。",
-+	"scss.lint.fontFaceProperties.desc": "@font-face 規則で 'src' プロパティと 'font-family' プロパティを定義する必要があります",
-+	"scss.lint.hexColorLength.desc": "16 進数の色には、3 つまたは 6 つの 16 進数が含まれる必要があります",
-+	"scss.lint.idSelector.desc": "セレクターには ID を含めないでください。これらの規則と HTML の結合が密接すぎます。",
-+	"scss.lint.ieHack.desc": "IE ハックは、IE7 以前をサポートする場合にのみ必要です",
-+	"scss.lint.important.desc": "!important は使用しないでください。これは CSS 全体の特定性が制御不能になり、リファクタリングが必要なことを示しています。",
-+	"scss.lint.importStatement.desc": "複数の Import ステートメントを同時に読み込むことはできません",
-+	"scss.lint.propertyIgnoredDueToDisplay.desc": "表示によりプロパティが無視されます。たとえば、'display: inline' の場合、width、height、margin-top、margin-bottom、および float のプロパティには効果がありません",
-+	"scss.lint.universalSelector.desc": "ユニバーサル セレクター (*) を使用すると処理速度が低下することが分かっています",
-+	"scss.lint.unknownProperties.desc": "不明なプロパティ。",
-+	"scss.lint.unknownVendorSpecificProperties.desc": "不明なベンダー固有のプロパティ。",
-+	"scss.lint.vendorPrefix.desc": "ベンダー固有のプレフィックスを使用する場合は、標準のプロパティも含めます",
-+	"scss.lint.zeroUnits.desc": "0 の単位は必要ありません",
-+	"scss.validate.title": "SCSS の検証と問題の重大度を制御します。",
-+	"scss.validate.desc": "すべての検証を有効または無効にします",
-+	"less.colorDecorators.enable.desc": "カラー デコレーターを有効または無効にします",
-+	"scss.colorDecorators.enable.desc": "カラー デコレーターを有効または無効にします",
-+	"css.colorDecorators.enable.desc": "カラー デコレーターを有効または無効にします",
-+	"css.colorDecorators.enable.deprecationMessage": "設定 `css.colorDecorators.enable` は使用されなくなりました。`editor.colorDecorators` を使用してください。",
-+	"scss.colorDecorators.enable.deprecationMessage": "設定 `scss.colorDecorators.enable` は使用されなくなりました。`editor.colorDecorators` を使用してください。",
-+	"less.colorDecorators.enable.deprecationMessage": "設定 `less.colorDecorators.enable` は使用されなくなりました。`editor.colorDecorators` を使用してください。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a4b33109cea1b6c98d48944df564c19818ec26ed i18n/jpn/extensions/git/out/autofetch.i18n.json
-  our    100644 8f0a88a1e105a3accbc50cc36a8a30af004cf3ee i18n/jpn/extensions/git/out/autofetch.i18n.json
-  their  100644 4dcee36f0c2c7ee5d39809763276b70e0a3cfb3d i18n/jpn/extensions/git/out/autofetch.i18n.json
-@@ -7,7 +7,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"yes": "はい",
-+	"read more": "詳細を参照",
- 	"no": "いいえ",
- 	"not now": "後で通知する",
-+<<<<<<< .our
- 	"suggest auto fetch": "Code が [定期的に 'git fetch']({0}) を実行してもよろしいですか?"
-+=======
-+	"suggest auto fetch": "Code が定期的に `git fetch` を実行してもよろしいですか?"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e73b6d879f2f1176dcd6feb39f50489f26c1b5bb i18n/jpn/extensions/git/out/commands.i18n.json
-  our    100644 9e38217888fdc2db31af2a431341d645d8b6b16d i18n/jpn/extensions/git/out/commands.i18n.json
-  their  100644 2dfc5f400ac70622c04d1ec0937586eb7c2462e8 i18n/jpn/extensions/git/out/commands.i18n.json
-@@ -14,8 +14,12 @@
- 	"cloning": "Git リポジトリ '{0}' を複製しています...",
- 	"proposeopen": "クローンしたリポジトリを開きますか?",
- 	"openrepo": "リポジトリを開く",
-+<<<<<<< .our
- 	"add": "ワークスペースに追加",
- 	"proposeopen2": "複製したリポジトリを開きますか? または現在のワークスペースに追加しますか?",
-+=======
-+	"proposeopen": "クローンしたリポジトリを開きますか?",
-+>>>>>>> .their
- 	"init": "Git リポジトリを初期化するワークスペース フォルダーを選択してください",
- 	"init repo": "リポジトリの初期化",
- 	"create repo": "リポジトリの初期化",
-@@ -75,8 +79,12 @@
- 	"ok": "OK",
- 	"push with tags success": "タグが正常にプッシュされました。",
- 	"pick remote": "リモートを選んで、ブランチ '{0}' を次に公開します:",
-+<<<<<<< .our
- 	"sync is unpredictable": "このアクションはコミットを '{0}/{1}' との間でプッシュしたりプルしたりします。",
- 	"never again": "OK、今後は表示しない",
-+=======
-+	"sync is unpredictable": "このアクションはコミットを '{0}' との間でプッシュしたりプルしたりします。",
-+>>>>>>> .their
- 	"no remotes to publish": "リポジトリには、発行先として構成されているリモートがありません。",
- 	"no changes stash": "スタッシュする変更がありません。",
- 	"provide stash message": "必要に応じてスタッシュ メッセージを入力してください",
-changed in both
-  base   100644 1574014e89e8f1845a893b41aec6e8db6256937c i18n/jpn/extensions/git/package.i18n.json
-  our    100644 5f3a79c480024cb95bcb777b25dc5a51987c0ee1 i18n/jpn/extensions/git/package.i18n.json
-  their  100644 bdc7a5612edaeca2409014e4d8068fa87e0dd126 i18n/jpn/extensions/git/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,8 @@
- 	],
- 	"displayName": "Git",
- 	"description": "Git SCM統合",
-+=======
-+>>>>>>> .their
- 	"command.clone": "クローン",
- 	"command.init": "リポジトリの初期化",
- 	"command.close": "リポジトリを閉じる",
-changed in both
-  base   100644 9c09de2d69a13a871142e7f954f937a50d3fd097 i18n/jpn/extensions/markdown/package.i18n.json
-  our    100644 58b68df0b74f4d164ab945b5a5c202367b240d88 i18n/jpn/extensions/markdown/package.i18n.json
-  their  100644 5f1c24f35e0f7c9b346888054377f5516d7a697f i18n/jpn/extensions/markdown/package.i18n.json
-@@ -27,6 +27,10 @@
- 	"markdown.styles.dec": "マークダウン プレビューから使用する CSS スタイル シートの URL またはローカル パスの一覧。相対パスは、エクスプローラーで開かれているフォルダーへの絶対パスと解釈されます。開かれているフォルダーがない場合、マークダウン ファイルの場所を基準としていると解釈されます。'\\' はすべて '\\\\' と入力する必要があります。",
- 	"markdown.showPreviewSecuritySelector.title": "プレビュー のセキュリティ設定を変更",
- 	"markdown.trace.desc": "マークダウン拡張機能のデバッグ ログを有効にします。",
-+<<<<<<< .our
- 	"markdown.preview.refresh.title": "プレビューを更新",
- 	"markdown.preview.toggleLock.title": "プレビュー ロックの切り替え"
-+=======
-+	"markdown.refreshPreview.title": "プレビューを更新"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 1e7a986fcec129586c4ebc893b09e7bad7f9ca0e i18n/jpn/extensions/php/package.i18n.json
-  our    100644 16bb0ef7ca18648009f9c673553f431c802597ac i18n/jpn/extensions/php/package.i18n.json
-  their  100644 77aae3a85d168648b978e46ef0eaf89de12ff538 i18n/jpn/extensions/php/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,13 @@
- 	],
- 	"displayName": "PHP の基本言語サポート",
- 	"description": "PHP ファイル内に構文ハイライト、かっこ一致を提供します。"
-+=======
-+	"configuration.suggest.basic": "組み込みの PHP 言語候補機能を有効にするかどうかを設定します。このサポートによって、PHP グローバルと変数の候補が示されます。",
-+	"configuration.validate.enable": "組み込みの PHP 検証を有効/無効にします。",
-+	"configuration.validate.executablePath": "PHP 実行可能ファイルを指定します。",
-+	"configuration.validate.run": "リンターを保存時に実行するか、入力時に実行するか。",
-+	"configuration.title": "PHP",
-+	"commands.categroy.php": "PHP",
-+	"command.untrustValidationExecutable": "PHP の検証を無効にします (ワークスペース設定として定義)。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 e69dc45423d16b98f5e9e65539d9e67a02feb930 i18n/jpn/extensions/typescript/out/commands.i18n.json
-  their  100644 e996cf2c1a958e0fcb34d18359d3aabd8e811f9a i18n/jpn/extensions/typescript/out/commands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -13,4 +14,20 @@
- 	"typescript.noJavaScriptProjectConfig": "ファイルは JavaScript プロジェクトの一部ではありません。詳細情報は [こちら]({1}) をクリックしてください。",
- 	"typescript.configureTsconfigQuickPick": "tsconfig.json を構成する",
- 	"typescript.configureJsconfigQuickPick": "jsconfig.json を構成する"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"typescript.projectConfigNoWorkspace": "TypeScript または JavaScript プロジェクトを使用するには、VS Code でフォルダーを開いてください",
-+	"typescript.projectConfigUnsupportedFile": "TypeScript または JavaScript のプロジェクトを判別できませんでした。サポートされていないファイルの種類です",
-+	"typescript.projectConfigCouldNotGetInfo": "TypeScript または JavaScript のプロジェクトを判別できませんでした",
-+	"typescript.noTypeScriptProjectConfig": "ファイルは TypeScript プロジェクトの一部ではない",
-+	"typescript.noJavaScriptProjectConfig": "ファイルは JavaScript プロジェクトの一部ではない",
-+	"typescript.configureTsconfigQuickPick": "tsconfig.json を構成する",
-+	"typescript.configureJsconfigQuickPick": "jsconfig.json を構成する",
-+	"typescript.projectConfigLearnMore": "詳細情報"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 837e11b29720d796f3a2ee5c9b9d3d94cd56e0fd i18n/jpn/extensions/typescript/package.i18n.json
-  our    100644 a1554306e84a86835cd4f134180dd845efc6c209 i18n/jpn/extensions/typescript/package.i18n.json
-  their  100644 0b964b94699c94cb21bf0f73161164bbc1969acb i18n/jpn/extensions/typescript/package.i18n.json
-added in both
-  our    100644 750d811d866eaa3d43818bd1d8e28c9898acf514 i18n/jpn/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-  their  100644 ed15423097d5cbb03aeb8c474db3877ca0d1584f i18n/jpn/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"selectAriaOption": "{0}"
- }
-\ No newline at end of file
-added in both
-  our    100644 063f7302f8e223a059726b80fee0fa0525cf9b9d i18n/jpn/src/vs/base/node/ps.i18n.json
-  their  100644 94b9be487275957485a72387008b8e53ec493b07 i18n/jpn/src/vs/base/node/ps.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"collecting": "CPU とメモリーの情報を収集しています。これには数秒かかる場合があります。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8a7dad6df22ed065d81d19a89a2fd0f156cf93ac i18n/jpn/src/vs/code/electron-main/menus.i18n.json
-  our    100644 ff7eb3df479fa3b25aa486b1991a4263b1ee917b i18n/jpn/src/vs/code/electron-main/menus.i18n.json
-  their  100644 3de2dd195d05b0754773bd80390a265b766d9f82 i18n/jpn/src/vs/code/electron-main/menus.i18n.json
-changed in both
-  base   100644 17e8239c8b5ac31e2fb7af0453f3896e4fa58a70 i18n/jpn/src/vs/code/node/cliProcessMain.i18n.json
-  our    100644 d4f994f4c39cc7b339d1a835d51cee5caefa992a i18n/jpn/src/vs/code/node/cliProcessMain.i18n.json
-  their  100644 36f86e4b3e5ff757910f1bd23ffdd060e80c2856 i18n/jpn/src/vs/code/node/cliProcessMain.i18n.json
-changed in both
-  base   100644 ccf74d0af32e892eba94450a5d7effd68b2c4dc6 i18n/jpn/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 8a524167aa36e1a9cb85f51526bd76d90fd343d7 i18n/jpn/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 6d5f2ea1582053b5dcf0315ce5cca83607f259ca i18n/jpn/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -16,7 +16,11 @@
- 	"lineNumbers.on": "行番号は、絶対数として表示されます。",
- 	"lineNumbers.relative": "行番号は、カーソル位置までの行数として表示されます。",
- 	"lineNumbers.interval": "行番号は 10 行ごとに表示されます。",
-+<<<<<<< .our
- 	"lineNumbers": "行番号の表示を制御します。",
-+=======
-+	"lineNumbers": "行番号の表示を制御します。使用可能な値は、'on'、'off'、'relative'、'interval' です。",
-+>>>>>>> .their
- 	"rulers": "等幅フォントの特定番号の後ろに垂直ルーラーを表示します。複数のルーラーには複数の値を使用します。配列が空の場合はルーラーを表示しません。",
- 	"wordSeparators": "単語に関連したナビゲーションまたは操作を実行するときに、単語の区切り文字として使用される文字",
- 	"tabSize": "1 つのタブに相当するスペースの数。`editor.detectIndentation` がオンの場合、この設定はファイル コンテンツに基づいて上書きされます。",
-@@ -81,7 +85,11 @@
- 	"cursorBlinking": "カーソルのアニメーション方式を制御します。",
- 	"mouseWheelZoom": "Ctrl キーを押しながらマウス ホイールを使用してエディターのフォントをズームします",
- 	"cursorStyle": "カーソルのスタイルを制御します。指定できる値は 'block'、'block-outline'、'line'、'line-thin'、'underline'、'underline-thin' です",
-+<<<<<<< .our
- 	"cursorWidth": "editor.cursorStyle が 'line' に設定されている場合、カーソルの幅を制御する",
-+=======
-+	"lineCursorWidth": "editor.cursorStyle が 'line' に設定されている場合、カーソルの幅を制御する",
-+>>>>>>> .their
- 	"fontLigatures": "フォントの合字を使用します",
- 	"hideCursorInOverviewRuler": "概要ルーラーでカーソルを非表示にするかどうかを制御します。",
- 	"renderWhitespace": "エディターで空白文字を表示する方法を制御します。'none'、'boundary' および 'all' が使用可能です。'boundary' オプションでは、単語間の単一スペースは表示されません。",
-changed in both
-  base   100644 ccbe80f4d3957e10e1ecafed44eb90c8a1c07554 i18n/jpn/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 94d561750e1a7b0be01cfe4af934ab8ee7840419 i18n/jpn/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 89993cc361889bd6279d46f34293314a3dd7131f i18n/jpn/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -9,7 +9,10 @@
- 	"lineHighlight": "カーソル位置の行を強調表示する背景色。",
- 	"lineHighlightBorderBox": "カーソル位置の行の境界線を強調表示する背景色。",
- 	"rangeHighlight": "Quick Open 機能や検索機能などによって強調表示された範囲の背景色。下にある装飾を隠さないために、色は不透過であってはなりません。",
-+<<<<<<< .our
- 	"rangeHighlightBorder": "強調表示された範囲の境界線の背景色。",
-+=======
-+>>>>>>> .their
- 	"caret": "エディターのカーソルの色。",
- 	"editorCursorBackground": "選択された文字列の背景色です。選択された文字列の背景色をカスタマイズ出来ます。",
- 	"editorWhitespaces": "エディターのスペース文字の色。",
-changed in both
-  base   100644 c6a310be421987dcb4399ef92c4cb897e5bb5ebf i18n/jpn/src/vs/editor/contrib/folding/folding.i18n.json
-  our    100644 0bebad98f593ecc4ddf6f049b905c5020711ef4d i18n/jpn/src/vs/editor/contrib/folding/folding.i18n.json
-  their  100644 1c780e8f0a351ffb964da8be6a679545f2ab4b3d i18n/jpn/src/vs/editor/contrib/folding/folding.i18n.json
-changed in both
-  base   100644 53ea71a9d4e2557c2f29f9a12dd3a919ab2a19c2 i18n/jpn/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  our    100644 f1211735237aaac61b21818a3c3c88592aa4c9dc i18n/jpn/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  their  100644 37cec91d1cdc4e3994226766a2cf4fd4c4d73c2b i18n/jpn/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -10,4 +11,13 @@
- 	"markerAction.previous.label": "前の問題 (エラー、警告、情報) へ移動",
- 	"markerAction.nextInFiles.label": "ファイル内の次の問題 (エラー、警告、情報) へ移動",
- 	"markerAction.previousInFiles.label": "ファイル内の前の問題 (エラー、警告、情報) へ移動"
-+=======
-+	"title.wo_source": "({0}/{1})",
-+	"markerAction.next.label": "次の問題 (エラー、警告、情報) へ移動",
-+	"markerAction.previous.label": "前の問題 (エラー、警告、情報) へ移動",
-+	"editorMarkerNavigationError": "エディターのマーカー ナビゲーション ウィジェットのエラーの色。",
-+	"editorMarkerNavigationWarning": "エディターのマーカー ナビゲーション ウィジェットの警告の色。",
-+	"editorMarkerNavigationInfo": "エディターのマーカー ナビゲーション ウィジェットの情報の色。",
-+	"editorMarkerNavigationBackground": "エディターのマーカー ナビゲーション ウィジェットの背景。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 0df6dca88c6cfa73951a90e81d78337a06dc226f i18n/jpn/src/vs/editor/contrib/multicursor/multicursor.i18n.json
-  our    100644 28bb716c138831a8b2822f5e9328566cdb98cf16 i18n/jpn/src/vs/editor/contrib/multicursor/multicursor.i18n.json
-  their  100644 22250151607f28c6f117c25e281299344cd743f4 i18n/jpn/src/vs/editor/contrib/multicursor/multicursor.i18n.json
-changed in both
-  base   100644 63cb60134963c7d5b60343cc1e0a7ba4ea804da0 i18n/jpn/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json
-  our    100644 429d9328a15d2454592901b69f97a29d4a6dadfd i18n/jpn/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json
-  their  100644 6b75d7b1bbe4b3238b90db19318b047240e4e714 i18n/jpn/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"toggle.tabMovesFocus": "TAB キーのフォーカス移動を切り替え"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8eac21c6979bdc2bbd84922338b3a14576eeeb14 i18n/jpn/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  our    100644 04ae521063b32ff3cfa5cc8483ba0965433e55dd i18n/jpn/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  their  100644 9ecf4479aa813b6b9747ca27b595ef1bd93ed008 i18n/jpn/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,12 @@
- 	"wordHighlightStrongBorder": "変数への書き込みなど書き込みアクセス中のシンボルの境界線の色。",
- 	"overviewRulerWordHighlightForeground": "シンボルを強調表示するときの概要ルーラーのマーカー色。この色は下地の色に紛れないよう不明瞭であってはいけません。",
- 	"overviewRulerWordHighlightStrongForeground": "書き込みアクセス シンボルを強調表示するときの概要ルーラーのマーカー色。この色は下地の色に紛れないよう不明瞭であってはいけません。",
-+=======
-+	"wordHighlight": "変数の読み取りなど読み取りアクセス中のシンボルの背景色。下にある装飾を隠さないために、色は不透過であってはなりません。",
-+	"wordHighlightStrong": "変数への書き込みなど書き込みアクセス中のシンボルの背景色。下にある装飾を隠さないために、色は不透過であってはなりません。",
-+	"overviewRulerWordHighlightForeground": "シンボルを強調表示するときの概要ルーラーのマーカー色。",
-+	"overviewRulerWordHighlightStrongForeground": "書き込みアクセス シンボルを強調表示するときの概要ルーラーのマーカー色。",
-+>>>>>>> .their
- 	"wordHighlight.next.label": "次のシンボル ハイライトに移動",
- 	"wordHighlight.previous.label": "前のシンボル ハイライトに移動"
- }
-\ No newline at end of file
-changed in both
-  base   100644 981e3bb87da93a8df7124822af50d363295f8844 i18n/jpn/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  our    100644 ef65f3f2706c8a53c3db11c1f57ddc0e49a1f2f7 i18n/jpn/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  their  100644 2a2b18aa6b8fb64ff7526aa4b5f56af44bffc4ca i18n/jpn/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 e5dd71eb7e2dc3ddd0b217173934064d4cb20cbf i18n/jpn/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 dd4553b6a25f3d18d9ae6f341855e230cceed4fe i18n/jpn/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 41c3e1463873b07dc82881b1bad33aa7b744ab55 i18n/jpn/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,11 +10,19 @@
- 	"diff": "2 つのファイルを比較します。",
- 	"add": "最後にアクティブだったウィンドウにフォルダーを追加します。",
- 	"goto": "指定した行と文字の位置にあるパスでファイルを開きます。",
-+<<<<<<< .our
- 	"newWindow": "強制的に新しいウィンドウを開きます。",
- 	"reuseWindow": "強制的に最後にアクティブだったウィンドウ内でファイルかフォルダーを開きます。",
- 	"wait": "現在のファイルが閉じられるまで待機します。",
- 	"locale": "使用する国と地域 (例:en-US や zh-TW など)。",
- 	"userDataDir": "ユーザー データが保持されるディレクトリを指定します。複数の異なる Code のインスタンスを開くために使用できます。",
-+=======
-+	"newWindow": "新しい Code のインスタンスを強制します。",
-+	"reuseWindow": "最後のアクティブ ウィンドウにファイルまたはフォルダーを強制的に開きます。",
-+	"wait": "現在のファイルが閉じられるまで待機します。",
-+	"locale": "使用する国と地域 (例:en-US や zh-TW など)。",
-+	"userDataDir": "ユーザー データを保持するディレクトリを指定します。ルートで実行している場合に役立ちます。",
-+>>>>>>> .their
- 	"version": "バージョンを表示します。",
- 	"help": "使用法を表示します。",
- 	"extensionHomePath": "拡張機能のルート パスを設定します。",
-@@ -29,11 +37,18 @@
- 	"performance": "'Developer: Startup Performance' コマンドを有効にして開始します。",
- 	"prof-startup": "起動中に CPU プロファイラーを実行する",
- 	"disableExtensions": "インストールされたすべての拡張機能を無効にします。",
-+<<<<<<< .our
- 	"inspect-extensions": "拡張機能のデバッグとプロファイリングを許可します。connection URI を開発者ツールで確認します。",
- 	"inspect-brk-extensions": "起動後に一時停止されている拡張ホストとの拡張機能のデバッグとプロファイリングを許可します。connection URI を開発者ツールで確認ます。",
- 	"disableGPU": "GPU ハードウェア アクセラレータを無効にします。",
- 	"uploadLogs": "現在のセッションから安全なエンドポイントにログをアップロードします。",
- 	"maxMemory": "ウィンドウの最大メモリ サイズ (バイト単位)。",
-+=======
-+	"inspect-extensions": "拡張機能のデバッグとプロファイリングを許可します。接続 URI を開発者ツールでチェックします。",
-+	"inspect-brk-extensions": "起動後に一時停止されている拡張ホストとの拡張機能のデバッグとプロファイリングを許可します。接続 URI を開発者ツールでチェックします。",
-+	"disableGPU": "GPU ハードウェア アクセラレータを無効にします。",
-+	"uploadLogs": "現在のセッションから安全なエンドポイントにログをアップロードします。",
-+>>>>>>> .their
- 	"usage": "使用法",
- 	"options": "オプション",
- 	"paths": "パス",
-changed in both
-  base   100644 9901a3c82e48e932edf83b646fd6cd75d84a7bff i18n/jpn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 64efa1b1dbf8d2e7a5e45feb436be37921131cc7 i18n/jpn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 9b169d44885576ebdfeced39a44b2a326a503434 i18n/jpn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -7,12 +7,16 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"invalidManifest": "正しくない拡張機能: package.json は JSON ファイルではありません。",
-+<<<<<<< .our
- 	"incompatible": "Code '{1}' と互換性のない拡張機能 '{0}' をインストールできません。",
-+=======
-+>>>>>>> .their
- 	"restartCode": "{0} を再インストールする前に、Code を再起動してください。",
- 	"installingOutdatedExtension": "この拡張機能の新しいバージョンが既にインストールされています。古いバージョンでこれを上書きしますか?",
- 	"override": "上書き",
- 	"cancel": "キャンセル",
- 	"errorInstallingDependencies": "依存関係のインストール中にエラーが発生しました。{0}",
-+<<<<<<< .our
- 	"MarketPlaceDisabled": "Marketplace が有効になっていません",
- 	"removeError": "拡張機能の削除中にエラーが発生しました: {0}。もう一度やり直す前に、VS Code の終了と起動を実施してください。",
- 	"Not a Marketplace extension": "Marketplace の拡張機能のみ再インストールできます",
-@@ -22,6 +26,12 @@
- 	"quitCode": "拡張機能をインストールできません。再インストールの前に VS Code の終了と起動を実施してください。",
- 	"exitCode": "拡張機能をインストールできません。再インストールの前に VS Code の終了と起動を実施してください。",
- 	"renameError": "{0} から {1} に名前変更中に不明なエラーが発生しました",
-+=======
-+	"notFoundCompatible": "'{0}' をインストールできません。VS Code '{1}' と互換性がある利用可能なバージョンがありません。",
-+	"notFoundCompatibleDependency": "VS Code の現在のバージョン '{1}'  と互換性を持つ、依存関係がある拡張機能 '{0}' が見つからないため、インストールできません。",
-+	"quitCode": "拡張機能をインストールできません。再インストールの前に VS Code の終了と起動を実施してください。",
-+	"exitCode": "拡張機能をインストールできません。再インストールの前に VS Code の終了と起動を実施してください。",
-+>>>>>>> .their
- 	"uninstallDependeciesConfirmation": "'{0}' のみをアンインストールしますか、または依存関係もアンインストールしますか?",
- 	"uninstallOnly": "拡張機能のみ",
- 	"uninstallAll": "すべてアンインストール",
-changed in both
-  base   100644 85415e2c95f05c99483b00dbcddb1ac857d7951d i18n/jpn/src/vs/platform/message/common/message.i18n.json
-  our    100644 44348c07c173ab2ed8f8e1c645e7000e63f2474a i18n/jpn/src/vs/platform/message/common/message.i18n.json
-  their  100644 15eee72cd0d00c38fd641bed911f95df3949b66e i18n/jpn/src/vs/platform/message/common/message.i18n.json
-changed in both
-  base   100644 24c492550e35674611c420910224df45569b5514 i18n/jpn/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 10667640968038e7107ce7d296e8264e00fd0ada i18n/jpn/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 46bb9caa152555db21871fc9761102e6c6c28f48 i18n/jpn/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -70,6 +70,7 @@
- 	"editorSelectionForeground": "ハイ コントラストの選択済みテキストの色。",
- 	"editorInactiveSelection": "非アクティブなエディターの選択範囲の色。下にある装飾を隠さないために、色は不透過であってはなりません。",
- 	"editorSelectionHighlight": "選択範囲と同じコンテンツの領域の色。下にある装飾を隠さないために、色は不透過であってはなりません。",
-+<<<<<<< .our
- 	"editorSelectionHighlightBorder": "選択範囲と同じコンテンツの境界線の色。",
- 	"editorFindMatch": "現在の検索一致項目の色。",
- 	"findMatchHighlight": "他の検索一致項目の色。下にある装飾を隠さないために、色は不透過であってはなりません。",
-@@ -78,6 +79,11 @@
- 	"findMatchHighlightBorder": "他の検索一致項目の境界線の色。",
- 	"findRangeHighlightBorder": "検索を制限する範囲の境界線の色。下にある装飾を隠さないために、色は不透過であってはなりません。",
- 	"findWidgetResizeBorder": "検索ウィジェットのサイズ変更バーの境界線の色。",
-+=======
-+	"editorFindMatch": "現在の検索一致項目の色。",
-+	"findMatchHighlight": "他の検索一致項目の色。下にある装飾を隠さないために、色は不透過であってはなりません。",
-+	"findRangeHighlight": "検索を制限する範囲の色。下にある装飾を隠さないために、色は不透過であってはなりません。",
-+>>>>>>> .their
- 	"hoverHighlight": "ホバーが表示されているワードの下を強調表示します。下にある装飾を隠さないために、色は不透過であってはなりません。",
- 	"hoverBackground": "エディター ホバーの背景色。",
- 	"hoverBorder": "エディター ホバーの境界線の色。",
-added in both
-  our    100644 2cc93b193154fd04e31e1ca64d2cba66a45babf7 i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 e4fd63e446222595a41279ed7472e31d799f572b i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,5 +10,13 @@
- 	"timeout.formatOnSave": "保存時のフォーマットは {0}ms 後に中止されました",
- 	"codeActionsOnSave.didTimeout": "codeActionsOnSave は {0} ms 後に中止されました",
- 	"timeout.onWillSave": "onWillSaveTextDocument-event は 1750ms 後に中止されました",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"saveParticipants": "Save Participants が実行中です..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 74c5f0eabd7020572aa3c8f8959faa3362591a60 i18n/jpn/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  our    100644 d8c4f33ad00ee482dae25c607088df5ba7e7ad66 i18n/jpn/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  their  100644 3d99fafeeda777cc694195e620a58919f1d1af36 i18n/jpn/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,7 @@
- 	],
- 	"treeView.notRegistered": "ID '{0}' のツリー ビューは登録されていません。",
- 	"treeView.duplicateElement": "id [0] の要素はすでに登録されています。"
-+=======
-+	"treeView.notRegistered": "ID '{0}' のツリー ビューは登録されていません。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 60ed1228f04d6929e6b458899b34f5a2ba7ce757 i18n/jpn/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 504738102db98241f299da4b50371a12d6a5d3cc i18n/jpn/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 69c30877972235f393360d69e4af073576f20fcd i18n/jpn/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -15,5 +15,9 @@
- 	"saveWorkspace": "ワークスペースを保存",
- 	"openWorkspaceAction": "ワークスペースを開く...",
- 	"openWorkspaceConfigFile": "ワークスペースの構成ファイルを開く",
-+<<<<<<< .our
- 	"duplicateWorkspaceInNewWindow": "新しいウィンドウでワークスペースを複製"
-+=======
-+	"openFolderAsWorkspaceInNewWindow": "新しいウィンドウでワークスペースとしてフォルダーを開く"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 8ba90a3ef5edfbd4b6365be6cfc9b9a3761d1b5c i18n/jpn/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-  their  100644 d1d72afcab9707b2b75997ca8f014af73f1a53f0 i18n/jpn/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"addFolderToWorkspace": "ワークスペースにフォルダーを追加...",
- 	"add": "追加(&&A)",
- 	"addFolderToWorkspaceTitle": "ワークスペースにフォルダーを追加",
-changed in both
-  base   100644 86cc5cdfa14cb47cabc40a1202f4942768cf9485 i18n/jpn/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  our    100644 aeadb4468253843db19d9398c2ca92c54c55a2d3 i18n/jpn/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  their  100644 ef30ff122d1ea643c0fc375a8497feab9f1bacc4 i18n/jpn/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-@@ -19,14 +19,22 @@
- 	"close": "閉じる",
- 	"closeOthers": "その他を閉じる",
- 	"closeRight": "右側を閉じる",
-+<<<<<<< .our
- 	"closeAllSaved": "保存済みを閉じる",
-+=======
-+	"closeAllUnmodified": "未変更を閉じる",
-+>>>>>>> .their
- 	"closeAll": "すべて閉じる",
- 	"keepOpen": "開いたままにする",
- 	"toggleInlineView": "インライン表示に切り替え",
- 	"showOpenedEditors": "開いているエディターを表示",
- 	"keepEditor": "エディターを保持",
- 	"closeEditorsInGroup": "グループ内のすべてのエディターを閉じる",
-+<<<<<<< .our
- 	"closeSavedEditors": "グループ内の保存済みエディターを閉じる",
-+=======
-+	"closeUnmodifiedEditors": "グループ内の未変更のエディターを閉じる",
-+>>>>>>> .their
- 	"closeOtherEditors": "その他のエディターを閉じる",
- 	"closeRightEditors": "右側のエディターを閉じる"
- }
-\ No newline at end of file
-changed in both
-  base   100644 9e1f0ccd5c365a276ca51e4b03070f0c18559ca9 i18n/jpn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 e7a6b2fb2a7d5101005b456fa1e81b0ef5fafa9d i18n/jpn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 3d1749e2a396b970311ed3d2b10364a1a69c6303 i18n/jpn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 31949627cfd901c66c46556d53ca6f8181b61f54 i18n/jpn/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  our    100644 2b13248d5c162d04db01dbccc9ed63bfb7fac545 i18n/jpn/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  their  100644 faa2938621c37ae44b6ed2193e3ddd312dfc6680 i18n/jpn/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-changed in both
-  base   100644 e5581c64d21b199927659ab8a3d892a37025ddce i18n/jpn/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  our    100644 6701af9c3444eaa5a9a22215a9faf090cbc27372 i18n/jpn/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  their  100644 17ddb4365e0722d36c2f3e06324a32a09bb72bb2 i18n/jpn/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-changed in both
-  base   100644 c10bd2e7b6047dd1dca8c353f7b29fa27bc040b0 i18n/jpn/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  our    100644 8d15ea098f8039c366d4add5a88362704001f96c i18n/jpn/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  their  100644 f0f64f4f3adf51a7ffd61698f519e76ad382c077 i18n/jpn/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"close": "閉じる",
-+>>>>>>> .their
- 	"araLabelEditorActions": "エディター操作"
- }
-\ No newline at end of file
-changed in both
-  base   100644 5c96f185104d0318f131335c56a8b5cdaa2d7b82 i18n/jpn/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
-  our    100644 94be0507f0953c8f81b6db7dc4f9d1fbfa9dbd2b i18n/jpn/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
-  their  100644 2ac16cc30bc1b39456bb90f4bc1322263d7a54ef i18n/jpn/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
-changed in both
-  base   100644 a296fd913c1ec72a5656e12417b469fa276d0b4b i18n/jpn/src/vs/workbench/common/theme.i18n.json
-  our    100644 b14021a35078518051aec469e7adb4b85583e1c9 i18n/jpn/src/vs/workbench/common/theme.i18n.json
-  their  100644 61bc140d9d312b6dbffae0fd01acad1333aa5be6 i18n/jpn/src/vs/workbench/common/theme.i18n.json
-@@ -11,10 +11,15 @@
- 	"tabHoverBackground": "ホバー時のタブの背景色。タブはエディター領域におけるエディターのコンテナです。1 つのエディター グループで複数のタブを開くことができます。エディター グループを複数にすることもできます。",
- 	"tabUnfocusedHoverBackground": "ホバー時のフォーカスされていないグループ内のタブの背景色。タブはエディター領域におけるエディターのコンテナです。1 つのエディター グループで複数のタブを開くことができます。エディター グループを複数にすることもできます。",
- 	"tabBorder": "タブ同士を分けるための境界線。タブはエディター領域内にあるエディターのコンテナーです。複数のタブを 1 つのエディター グループで開くことができます。複数のエディター グループがある可能性があります。",
-+<<<<<<< .our
- 	"tabActiveBorder": "アクティブなタブの下部の境界線。タブはエディター領域内にあるエディターのコンテナーです。複数のタブを 1 つのエディター グループで開くことができます。複数のエディター グループがある可能性があります。",
- 	"tabActiveBorderTop": "アクティブなタブの上部の境界線。タブはエディター領域内にあるエディターのコンテナーです。複数のタブを 1 つのエディター グループで開くことができます。複数のエディター グループがある可能性があります。",
- 	"tabActiveUnfocusedBorder": "フォーカスされていないグループ内で、アクティブなタブの下部の境界線。タブはエディター領域内にあるエディターのコンテナーです。複数のタブを 1 つのエディター グループで開くことができます。複数のエディター グループがある可能性があります。",
- 	"tabActiveUnfocusedBorderTop": "フォーカスされていないグループ内で、アクティブなタブの上部の境界線。タブはエディター領域内にあるエディターのコンテナーです。複数のタブを 1 つのエディター グループで開くことができます。複数のエディター グループがある可能性があります。",
-+=======
-+	"tabActiveBorder": "アクティブなタブを強調表示するための境界線。タブはエディター領域内にあるエディターのコンテナーです。複数のタブを 1 つのエディター グループで開くことができます。複数のエディター グループがある可能性があります。",
-+	"tabActiveUnfocusedBorder": "フォーカスされていないグループ内のアクティブ タブを強調表示するための境界線。タブはエディター領域内にあるエディターのコンテナーです。複数のタブを 1 つのエディター グループで開くことができます。複数のエディター グループがある可能性があります。",
-+>>>>>>> .their
- 	"tabHoverBorder": "ホバー時のタブを強調表示するための境界線。タブはエディター領域内にあるエディターのコンテナーです。複数のタブを 1 つのエディター グループで開くことができます。複数のエディター グループがある可能性があります。",
- 	"tabUnfocusedHoverBorder": "ホバー時のフォーカスされていないグループ内のタブを強調表示するための境界線。タブはエディター領域内にあるエディターのコンテナーです。複数のタブを 1 つのエディター グループで開くことができます。複数のエディター グループがある可能性があります。",
- 	"tabActiveForeground": "アクティブ グループ内のアクティブ タブの前景色。タブはエディター領域におけるエディターのコンテナーです。1 つのエディター グループで複数のタブを開くことができます。エディター グループを複数にすることもできます。",
-added in both
-  our    100644 9bb889a78e17b7f6ce367e5f9aa8bade3d905923 i18n/jpn/src/vs/workbench/common/views.i18n.json
-  their  100644 3607a9f498a8646093dcabaca4caf8faf870a3a2 i18n/jpn/src/vs/workbench/common/views.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"duplicateId": "location '{1}' で id '{0}' のビューが既に登録されています"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"duplicateId": "location `{1}` で id `{0}` のビューが既に登録されています"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e4698109a33894229a72372693cee43af1018a24 i18n/jpn/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 bb47142b4560b826311d6df88270f90b21754504 i18n/jpn/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 68ba00974f357dd62e78c1ca54ca6ae569554481 i18n/jpn/src/vs/workbench/electron-browser/actions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"closeWindow": "ウィンドウを閉じる",
- 	"closeWorkspace": "ワークスペースを閉じる",
- 	"noWorkspaceOpened": "このインスタンスで現在開いているワークスペースがないので、閉じられません。",
-@@ -50,6 +53,14 @@
- 	"moveWindowTabToNewWindow": "ウィンドウ タブを新しいウィンドウに移動",
- 	"mergeAllWindowTabs": "すべてのウィンドウを統合",
- 	"toggleWindowTabsBar": "ウィンドウ タブ バーの切り替え",
-+<<<<<<< .our
- 	"about": "{0} のバージョン情報",
- 	"inspect context keys": "コンテキスト キーの検査"
-+=======
-+	"configureLocale": "言語を構成する",
-+	"displayLanguage": "VSCode の表示言語を定義します。",
-+	"doc": "サポートされている言語の一覧については、{0} をご覧ください。",
-+	"restart": "値を変更するには VS Code の再起動が必要です。",
-+	"fail.createSettings": "'{0}' ({1}) を作成できません。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 2f2b510b284b045c0d435ad5d563e0aa69d59ba7 i18n/jpn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 3b03f30557674ed7892d9127c78ab05070c860e0 i18n/jpn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 c0540ea9122e04a01debed4ba82d9c2d9f116fe4 i18n/jpn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,12 +35,19 @@
- 	"panelDefaultLocation": "パネルの既定の位置を制御します。ワークベンチの下部または右のいずれかに表示できます。",
- 	"statusBarVisibility": "ワークベンチの下部にステータス バーを表示するかどうかを制御します。",
- 	"activityBarVisibility": "ワークベンチでのアクティビティ バーの表示をコントロールします。",
-+<<<<<<< .our
- 	"viewVisibility": "ビュー ヘッダー アクションを表示するかどうかを制御します。ビュー ヘッダー アクションは常に表示されるか、パネルをフォーカスやホバーしたときのみ表示のいずれかです。",
- 	"fontAliasing": "ワークベンチのフォント エイリアシング方法を制御します。\n- default: サブピクセル方式でフォントを滑らかにします。ほとんどの非 Retina ディスプレイでもっとも鮮明なテキストを提供します\n- antialiased: サブピクセルとは対照的に、ピクセルのレベルでフォントを滑らかにします。フォント全体がより細く見えます\n- none: フォントのスムージングを無効にします。テキストをぎざぎざな尖ったエッジで表示します\n- auto: ディスプレイの DPI に基づいて自動的に `default` か `antialiased` を適用します",
- 	"workbench.fontAliasing.default": "サブピクセル方式でフォントを滑らかにします。ほとんどの非 Retina ディスプレイでもっとも鮮明なテキストを提供します。",
- 	"workbench.fontAliasing.antialiased": "サブピクセルとは対照的に、ピクセルのレベルでフォントを滑らかにします。フォント全体がより細く見えるようになります。",
- 	"workbench.fontAliasing.none": "フォントのスムージングを無効にします。テキストをぎざぎざな尖ったエッジで表示します。",
- 	"workbench.fontAliasing.auto": "ディスプレイの DPI に基づいて自動的に `default` か `antialiased` を適用します。",
-+=======
-+	"fontAliasing": "ワークベンチのフォント エイリアシング方法を制御します。\n- default: サブピクセル方式でフォントを滑らかにします。ほとんどの非 Retina ディスプレイでもっとも鮮明なテキストを提供します\n- antialiased: サブピクセルとは対照的に、ピクセルのレベルでフォントを滑らかにします。フォント全体がより細く見えます\n- none: フォントのスムージングを無効にします。テキストをぎざぎざな尖ったエッジで表示します",
-+	"workbench.fontAliasing.default": "サブピクセル方式でフォントを滑らかにします。ほとんどの非 Retina ディスプレイでもっとも鮮明なテキストを提供します。",
-+	"workbench.fontAliasing.antialiased": "サブピクセルとは対照的に、ピクセルのレベルでフォントを滑らかにします。フォント全体がより細く見えるようになります。",
-+	"workbench.fontAliasing.none": "フォントのスムージングを無効にします。テキストをぎざぎざな尖ったエッジで表示します。",
-+>>>>>>> .their
- 	"enableNaturalLanguageSettingsSearch": "設定で自然文検索モードを有効にするかどうかを制御します。",
- 	"windowConfigurationTitle": "ウィンドウ",
- 	"window.openFilesInNewWindow.on": "新しいウィンドウでファイルを開きます",
-changed in both
-  base   100644 0813ed28598088e292a260022b49a00ce865f8fa i18n/jpn/src/vs/workbench/electron-browser/window.i18n.json
-  our    100644 b544af3baf4b86010347cffabbb513883c29d0b1 i18n/jpn/src/vs/workbench/electron-browser/window.i18n.json
-  their  100644 b9e99cd4528550ac99f2af0df2655310f80c644c i18n/jpn/src/vs/workbench/electron-browser/window.i18n.json
-changed in both
-  base   100644 1c53dd86bdd7755e8704fc04d9b680e1041a03a8 i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json
-  our    100644 a58b652a6cc8941988971708ff5c077ddd28ac7b i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json
-  their  100644 f1f6fe1ec7d6140ff801b7f1507b95caf50212aa i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json
-changed in both
-  base   100644 3b84ee3fdb42ee514a5ff3cc16ab720a6edc61d7 i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json
-  our    100644 cb56f95f2b83a120d83eb17f398af3bde78ea841 i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json
-  their  100644 ec3d813e1dcc52bbd9d7e6276cc3b632c23b446d i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"toggleLocation": "マルチカーソル修飾子の切り替え"
- }
-\ No newline at end of file
-changed in both
-  base   100644 57ba460378dd45795c649d0249394cdf43e71916 i18n/jpn/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-  our    100644 f154d6f46bc66710819bc962ae3fe874f33b5b39 i18n/jpn/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-  their  100644 bf61b86ff83d866aae2955f3da0113ea02572124 i18n/jpn/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-changed in both
-  base   100644 8876044c17ee89af0ca31ce68e5b05c586def4a2 i18n/jpn/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
-  our    100644 5de2170d2975b2ef9a94f0b7134442fb1ea04bc5 i18n/jpn/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
-  their  100644 00d3b5a76c0f64f4e606c4b2d7c49e39b1b7f9bd i18n/jpn/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"debugToolBarBackground": "デバッグ ツール バーの背景色。",
- 	"debugToolBarBorder": "デバッグ ツール バーの境界線色。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 f9530ecfb908541cc509990d08c2505993ac9f84 i18n/jpn/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
-  our    100644 39b690741dbbc33fef29e4c5a7002a685f6648df i18n/jpn/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
-  their  100644 76d3254c4eb1d4951df04e21d4c75e116fadc6a1 i18n/jpn/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
-changed in both
-  base   100644 3b2b57ca85d48acb38f819086be63f79fb78f113 i18n/jpn/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json
-  our    100644 512d0bf249cb35e694a8f2cbfa5c7efd3a476990 i18n/jpn/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json
-  their  100644 010c65f0dc86d6cef8eba3a9f5bfb5ed2418db67 i18n/jpn/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json
-changed in both
-  base   100644 248289a591ac684b4f25bd9dfc57d8538c403fb7 i18n/jpn/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  our    100644 13d471ad7b03653747d4f87af1fdafa5879ffc90 i18n/jpn/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  their  100644 af2aec81915a406830e2f74bdf3fbccbd4469e9a i18n/jpn/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"debug.terminal.title": "デバッグ対象"
- }
-\ No newline at end of file
-changed in both
-  base   100644 2a9f118d0842023cdca7ae655efd239c9f3302ce i18n/jpn/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  our    100644 3d2ead4c932daddd0da08581216ff6faa31260b5 i18n/jpn/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  their  100644 ecb730ce4d3b79e5e5b72a6fe5d16bb901df6bea i18n/jpn/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-changed in both
-  base   100644 c381b702335077f34383b8d458cd753617e02c14 i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 c1d5e7d9f012953fc3bd6919da0d8a29b234fa8c i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 07e196a71f546c4f2b74859483ea1ef5207c664d i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,11 @@
- 	"exeBasedRecommendation": "{0} がインストールされているため、この拡張機能を推奨します。",
- 	"fileBasedRecommendation": "最近開いたファイルに基づいてこの拡張機能が推奨されます。",
- 	"workspaceRecommendation": "現在のワークスペースのユーザーによってこの拡張機能が推奨されています。",
-+=======
-+	"workspaceRecommendation": "現在のワークスペースのユーザーによってこの拡張機能が推奨されています。",
-+	"fileBasedRecommendation": "最近開いたファイルに基づいてこの拡張機能が推奨されます。",
-+	"exeBasedRecommendation": "{0} がインストールされているため、この拡張機能を推奨します。",
-+>>>>>>> .their
- 	"reallyRecommended2": "このファイルの種類には拡張機能 '{0}' が推奨されます。",
- 	"reallyRecommendedExtensionPack": "このファイルの種類には拡張機能パック '{0}' が推奨されます。",
- 	"install": "インストール",
-added in both
-  our    100644 494c5510591deade1b0589b8541356e40e88bb35 i18n/jpn/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-  their  100644 78d76e265f4bb6500f736c9919abca8c6be0e5c8 i18n/jpn/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"workbenchConfigurationTitle": "ワークベンチ",
- 	"feedbackVisibility": "ワークベンチ下部にあるステータス バーで Twitter のフィードバック (スマイル) を表示するかどうかを制御します。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 ba6b165a86a5d233d7219c5b099f78d69e15f5ce i18n/jpn/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
-  our    100644 2751b55c435f00e1ced16515851e547557a75bce i18n/jpn/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
-  their  100644 8f7ff5b2b6f2d9f33375f52f551c83d14ee871aa i18n/jpn/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
-added in both
-  our    100644 156f602f4b4f6f6193e2ce8f018bfa4211ff4b32 i18n/jpn/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-  their  100644 e31810d983cbbd6904f67d9cc82eebb5e9093f6b i18n/jpn/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"hide": "非表示"
- }
-\ No newline at end of file
-changed in both
-  base   100644 7630615995592f8f91c58aceae957eaa9824d0b4 i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  our    100644 d74bc3c8267703bc29f154b03152cdd6ab8f04af i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  their  100644 8c1cdd182eeb48cbf0039e3ad27c2546b8a42b8a i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-@@ -12,7 +12,10 @@
- 	"revertLocalChanges": "変更を破棄してディスク上の内容に戻る",
- 	"copyPathOfActive": "アクティブ ファイルのパスのコピー",
- 	"saveAllInGroup": "グループ内のすべてを保存する",
-+<<<<<<< .our
- 	"saveFiles": "すべてのファイルを保存",
-+=======
-+>>>>>>> .their
- 	"revert": "ファイルを元に戻す",
- 	"compareActiveWithSaved": "保存済みファイルと作業中のファイルを比較",
- 	"closeEditor": "エディターを閉じる",
-@@ -29,7 +32,11 @@
- 	"compareSelected": "選択項目の比較",
- 	"close": "閉じる",
- 	"closeOthers": "その他を閉じる",
-+<<<<<<< .our
- 	"closeSaved": "保存済みを閉じる",
-+=======
-+	"closeUnmodified": "未変更を閉じる",
-+>>>>>>> .their
- 	"closeAll": "すべて閉じる",
- 	"deleteFile": "完全に削除"
- }
-\ No newline at end of file
-changed in both
-  base   100644 2ef009f9c59c0827e7d3538b89266dc7db0d0891 i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 e65ff7942d87b569809cd4818a0800fdfb729d2c i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 7754a978dc6155e02685a4f611fcdefce037c78e i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"newFile": "新しいファイル",
- 	"newFolder": "新しいフォルダー",
- 	"rename": "名前変更",
-@@ -13,7 +16,11 @@
- 	"copyFile": "コピー",
- 	"pasteFile": "貼り付け",
- 	"retry": "再試行",
-+<<<<<<< .our
- 	"renameWhenSourcePathIsParentOfTargetError": "既存のフォルダーに子を追加するには 'New Folder' や 'New File' コマンドを使用してください",
-+=======
-+	"openFolderFirst": "フォルダー内にファイルやフォルダーを作成するには、フォルダーをまず開く必要があります。",
-+>>>>>>> .their
- 	"newUntitledFile": "無題の新規ファイル",
- 	"createNewFile": "新しいファイル",
- 	"createNewFolder": "新しいフォルダー",
-@@ -25,9 +32,16 @@
- 	"dirtyMessageFolderDelete": "保存されていない変更があるファイルを {0} 個含むフォルダーを削除します。続行しますか?",
- 	"dirtyMessageFileDelete": "保存されていない変更があるファイルを削除します。続行しますか?",
- 	"dirtyWarning": "保存しないと変更内容が失われます。",
-+<<<<<<< .our
-+=======
-+	"confirmMoveTrashMessageMultiple": "次の {0} 個のファイルを削除してもよろしいですか?",
-+	"confirmMoveTrashMessageFolder": "'{0}' とその内容を削除しますか?",
-+	"confirmMoveTrashMessageFile": "'{0}' を削除しますか?",
-+>>>>>>> .their
- 	"undoBin": "ごみ箱から復元できます。",
- 	"undoTrash": "ごみ箱から復元できます。",
- 	"doNotAskAgain": "再度表示しない",
-+<<<<<<< .our
- 	"irreversible": "このアクションは元に戻すことができません。",
- 	"binFailed": "ごみ箱を使用した削除に失敗しました。代わりに完全に削除しますか?",
- 	"trashFailed": "ごみ箱を使用した削除に失敗しました。代わりに完全に削除しますか?",
-@@ -48,6 +62,18 @@
- 	"replaceButtonLabel": "置換(&&R)",
- 	"fileIsAncestor": "ペーストするファイルは送り先フォルダの上位にいます",
- 	"fileDeleted": "ファイルは削除されたか移動されています",
-+=======
-+	"confirmDeleteMessageMultiple": "次の {0} 個のファイルを完全に削除してもよろしいですか?",
-+	"confirmDeleteMessageFolder": "'{0}' とその内容を完全に削除してもよろしいですか?",
-+	"confirmDeleteMessageFile": "'{0}' を完全に削除してもよろしいですか?",
-+	"irreversible": "このアクションは元に戻すことができません。",
-+	"permDelete": "完全に削除",
-+	"importFiles": "ファイルのインポート",
-+	"confirmOverwrite": "保存先のフォルダーに同じ名前のファイルまたはフォルダーが既に存在します。置き換えてもよろしいですか?",
-+	"replaceButtonLabel": "置換(&&R)",
-+	"fileDeleted": "ファイルは削除されたか移動されています",
-+	"fileIsAncestor": "コピーするファイルがコピー先フォルダの上位にあります",
-+>>>>>>> .their
- 	"duplicateFile": "重複",
- 	"globalCompareFile": "アクティブ ファイルを比較しています...",
- 	"openFileToCompare": "まずファイルを開いてから別のファイルと比較してください",
-changed in both
-  base   100644 4f2a963e3591eb4a89fdbfa6b1f568856f5925d3 i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  our    100644 67b41ed99db00273b3e6fff83af33450998ea209 i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  their  100644 e49e3964c1f01584c7cca6ee51904f9d11559878 i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,12 +7,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"revealInWindows": "エクスプローラーで表示",
- 	"revealInMac": "Finder で表示します",
- 	"openContainer": "このアイテムのフォルダーを開く",
- 	"saveAs": "名前を付けて保存...",
- 	"save": "保存",
- 	"saveAll": "すべて保存",
-+<<<<<<< .our
-+=======
-+	"saveFiles": "すべてのファイルを保存",
-+>>>>>>> .their
- 	"removeFolderFromWorkspace": "ワークスペースからフォルダーを削除",
- 	"genericRevertError": "元へ戻すことに失敗しました '{0}': {1}",
- 	"modifiedLabel": "{0} (ローカル) ↔ {1}",
-changed in both
-  base   100644 5461c0b3fa9062516c7b3d179dc36d861ad4f80d i18n/jpn/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 fa96297a410af2da774ca395b16f67db3922f007 i18n/jpn/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 9527bde40498ac28548816b8250be378808f2650 i18n/jpn/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-@@ -40,7 +40,10 @@
- 	"formatOnSave": "ファイルを保存するときにフォーマットしてください。フォーマッタを使用可能にして、ファイルを自動保存せず、エディターをシャットダウンしないでください。",
- 	"formatOnSaveTimeout": "保存時フォーマットのタイムアウトを制御します。formatOnSave-コマンドの時間制限をミリ秒単位で指定してください。指定したタイムアウトよりも時間がかかるコマンドはキャンセルされます。",
- 	"explorerConfigurationTitle": "エクスプローラー",
-+<<<<<<< .our
- 	"openEditorsVisible": "[開いているエディター] ウィンドウに表示するエディターの数。",
-+=======
-+>>>>>>> .their
- 	"autoReveal": "エクスプローラーでファイルを開くとき、自動的にファイルの内容を表示して選択するかどうかを制御します。",
- 	"enableDragAndDrop": "ドラッグ アンド ドロップを使用したファイルとフォルダーの移動をエクスプローラーが許可するかどうかを制御します。",
- 	"confirmDragAndDrop": "ドラッグ アンド ドロップを使用したファイルやフォルダーの移動時にエクスプローラーが確認を求めるかどうかを制御します。",
-changed in both
-  base   100644 a11f1cb6ffcfb5e06270333d72e9da53434c8b98 i18n/jpn/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  our    100644 7134cb66e1307df99079e70d8981772471b96fab i18n/jpn/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  their  100644 e3aeaafe4e7cb37ea2cd8f521f54d27de7b9a6bf i18n/jpn/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,12 @@
- 	],
- 	"userGuide": "エディター ツール バーの操作で、変更を元に戻すか、ディスクの内容を変更内容で上書きします。",
- 	"staleSaveError": "'{0} の保存に失敗しました。ディスクの内容の方が新しくなっています。ご使用のバージョンをディスク上のバージョンと比較してください。",
-+=======
-+	"userGuide": "右側のエディター ツール バーの操作で、変更を [元に戻す] か、ディスクの内容を変更内容で [上書き] します",
-+	"overwriteElevated": "管理者権限で上書き...",
-+	"saveElevated": "管理者権限で再試行...",
-+	"overwrite": "上書き",
-+>>>>>>> .their
- 	"retry": "再試行",
- 	"discard": "破棄",
- 	"readonlySaveErrorAdmin": "'{0}' の保存に失敗しました。ファイルが書き込み禁止になっています。[管理者権限で上書き] を選択して管理者として再試行してください。",
-changed in both
-  base   100644 f9c3565a125a3775c3cb9968e3484f6908b01830 i18n/jpn/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  our    100644 4d56ec46874ac782b2c92ce51da4ad6dca292f5d i18n/jpn/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  their  100644 3b5ce0838f3c8df0822f86b724c043b6ee09d11c i18n/jpn/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-@@ -15,9 +15,13 @@
- 	"dropFolder": "ワークスペースにフォルダーを追加しますか?",
- 	"addFolders": "フォルダーの追加(&&A)",
- 	"addFolder": "フォルダーの追加(&&A)",
-+<<<<<<< .our
- 	"confirmRootsMove": "ワークスペース内の複数のルート フォルダーの順序が変更されますがよろしいですか?",
- 	"confirmMultiMove": "次の {0} 個のファイルを移動してもよろしいですか?",
- 	"confirmRootMove": "ワークスペース内のルート フォルダー '{0}' の順序が変更されますがよろしいですか?",
-+=======
-+	"confirmMultiMove": "次の {0} 個のファイルを移動してもよろしいですか?",
-+>>>>>>> .their
- 	"confirmMove": "'{0}' を移動しますか?",
- 	"doNotAskAgain": "再度表示しない",
- 	"moveButtonLabel": "移動(&&M)",
-changed in both
-  base   100644 b798b662ed0b77f7500c4f64e873a72cd6374ff6 i18n/jpn/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  our    100644 7befdcbac2fb84853fd0e99a856a739d3be762b8 i18n/jpn/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  their  100644 95dfcf4fae90813563e6e41da2e1268ee30249bd i18n/jpn/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-added in both
-  our    100644 ae3a259ed9828450fba141df4fc47acc12626407 i18n/jpn/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-  their  100644 f95880fcc367cd4e846ff5289a4ad5fbd91a0d76 i18n/jpn/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"mainLog": "ログ (メイン)",
- 	"sharedLog": "ログ (共有)",
- 	"rendererLog": "ログ (ウィンドウ)",
-added in both
-  our    100644 109ecf99fed822d185e649c8205c099c654f43d6 i18n/jpn/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  their  100644 861a564f2de9b6c3defb91d1ac3f31c6c9a084f0 i18n/jpn/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -16,6 +17,23 @@
- 	"selectProcess": "プロセスのログを選択",
- 	"openLogFile": "ログ ファイルを開く...",
- 	"setLogLevel": "ログ レベルの設定...",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"openLogsFolder": "ログ フォルダーを開く",
-+	"showLogs": "ログの表示...",
-+	"mainProcess": "メイン",
-+	"sharedProcess": "共有",
-+	"rendererProcess": "ウィンドウ",
-+	"extensionHost": "拡張機能ホスト",
-+	"selectProcess": "プロセスの選択",
-+	"openLogFile": "ログ ファイルを開く...",
-+	"setLogLevel": "ログ レベルの設定",
-+>>>>>>> .their
- 	"trace": "トレース",
- 	"debug": "デバッグ",
- 	"info": "情報",
-@@ -23,8 +41,12 @@
- 	"err": "エラー",
- 	"critical": "重大",
- 	"off": "オフ",
-+<<<<<<< .our
- 	"selectLogLevel": "ログ レベルを選択",
- 	"default and current": "既定と現在",
- 	"default": "既定",
- 	"current": "現在"
-+=======
-+	"selectLogLevel": "ログ レベルを選択"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 efe22d017f6854d2c0b1e23ab94a97b9d50a9e6a i18n/jpn/src/vs/workbench/parts/markers/common/messages.i18n.json
-  our    100644 d8eb9ed547f88361ae8eaf178f4ac443da393aae i18n/jpn/src/vs/workbench/parts/markers/common/messages.i18n.json
-  their  100644 0c951e42e75b78ba91fae3ac10217a5cdefc22a2 i18n/jpn/src/vs/workbench/parts/markers/common/messages.i18n.json
-added in both
-  our    100644 7ce6bdc9900a469499ce223f44e405e1a69ce79c i18n/jpn/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-  their  100644 57deadb1a555b0da8c0e02da3bb7074585a55322 i18n/jpn/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -11,4 +12,16 @@
- 	"viewCategory": "表示",
- 	"clearOutput.label": "出力のクリア",
- 	"openActiveLogOutputFile": "表示: アクティブなログ出力ファイルを開く"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"output": "出力",
-+	"logViewer": "ログ ビューアー",
-+	"viewCategory": "表示",
-+	"clearOutput.label": "出力のクリア"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 03f9d6c7a380dc85ca734e65204a5250a7cff5a6 i18n/jpn/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-  their  100644 8f00064048d37f3e3665135e84ffd798e3901b2f i18n/jpn/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"output": "{0} - 出力",
- 	"channel": "'{0}' の出力チャネル"
- }
-\ No newline at end of file
-changed in both
-  base   100644 efdc6c41cac4e9954bc2945f8ef35c4d672b141d i18n/jpn/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
-  our    100644 5cd18931c0838f38bc083757d7290ee0bedae111 i18n/jpn/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
-  their  100644 99ba1fc8808833b1d97a4527890c22f121675342 i18n/jpn/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
-changed in both
-  base   100644 d963a2915fea0d01e64c9a3a9a00508874c725c7 i18n/jpn/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  our    100644 efda21bd7670c25e5650677646e9f03bb3b4771d i18n/jpn/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  their  100644 d1d1439074eae5e5d65e0e90e749586efe9e5b56 i18n/jpn/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-changed in both
-  base   100644 dacdf6ccd9d160635871da2a509aada0e93c6c67 i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-  our    100644 e3cca40ad76d05372fb67caf1061803a6dcbcf24 i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-  their  100644 00efa778c9193ade6adf965f8d645490cf5a90c2 i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-changed in both
-  base   100644 dbb463d1324514c366dea4fda12a36c718e4ae27 i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 8465cccb637ff0eb8a583c0254f668f121044d71 i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 05635b7c0f46fdc0694bc4e4672f2fa0a5a258ff i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"defaultSettings": "上書きするには、右側のエディターに設定を入力します。",
- 	"noSettingsFound": "設定が見つかりません。",
- 	"settingsSwitcherBarAriaLabel": "設定切り替え",
-changed in both
-  base   100644 a99b14b8dd8d80e8fa4fcaadcfc2f287635c2e1e i18n/jpn/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  our    100644 7b3c484d2020fa4fff9eeb1f190b1cb0a33d4c24 i18n/jpn/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  their  100644 f28c0310389d88127f65c8e110c9af1bf85ba8ed i18n/jpn/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-changed in both
-  base   100644 63217f20e3ee7501485a6421d192d07f7f646cd9 i18n/jpn/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  our    100644 977fd1e5ceb06b67bd625cb16f4268665a9745b6 i18n/jpn/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  their  100644 932be0b6bfa03be0cde1ac5c714ec7c1c9effdc2 i18n/jpn/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"view": "表示",
- 	"commandsHandlerDescriptionDefault": "コマンドの表示と実行",
- 	"gotoLineDescriptionMac": "行へ移動",
-changed in both
-  base   100644 b650b0b0eb32f851abac1ec77b6afec79ef866ff i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  our    100644 a508097adbd35ddee214a11ce8ccd760b70a063c i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  their  100644 84c7c41eb09bd5351001c8125a113874a2d00cfe i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-@@ -13,5 +13,9 @@
- 	"scmConfigurationTitle": "SCM",
- 	"alwaysShowProviders": "ソース管理プロバイダーのセクションを常に表示するかどうか。",
- 	"diffDecorations": "エディターの差分デコレーターを制御します。",
-+<<<<<<< .our
- 	"diffGutterWidth": "(追加や修正を示す) ガター内の差分デコレーター幅 (px) を制御します。"
-+=======
-+	"inputCounter": "入力文字のカウントをいつ表示するかを制御します。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 2cd7ee76d8f0f44309a8984673fe3e97dfc6a010 i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  our    100644 fadead296a93c202fdae35990b689034db6c7569 i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  their  100644 58ba9f785fc38aa2d8f27c2506abc10cbeed0996 i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-@@ -8,6 +8,9 @@
- 	],
- 	"scm providers": "ソース管理プロバイダー",
- 	"hideRepository": "非表示",
-+	"commitMessageInfo": "現在の行に {0}  文字",
-+	"commitMessageCountdown": "現在の行で残り {0} 文字",
-+	"commitMessageWarning": "現在の行で {1} から {0} 文字オーバー",
- 	"installAdditionalSCMProviders": "その他の SCM プロバイダーをインストール...",
- 	"no open repo": "有効なソース管理プロバイダーがありません。",
- 	"source control": "ソース管理",
-changed in both
-  base   100644 d07e4c94a3f37008b5af125af6022ffc3a50d14a i18n/jpn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 0c0e1ef6922bb2ebfdd24dd39aa82c38ab488084 i18n/jpn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 eeb352c7ca2d1e8de06d6e2fb07240db758bef5c i18n/jpn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-changed in both
-  base   100644 e266c4b0298ded90a07f37e3d112aaee0f09d9bb i18n/jpn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 d63dc1c7de64299d00cc648c70a452e18abf1957 i18n/jpn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 5253824e4bd04e5835135bc768367c5db7910dc1 i18n/jpn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,11 +13,18 @@
- 	"copyAllLabel": "すべてコピー",
- 	"clearSearchHistoryLabel": "検索履歴のクリア",
- 	"toggleSearchViewPositionLabel": "検索ビュー位置の切り替え",
-+=======
-+>>>>>>> .their
- 	"findInFolder": "フォルダー内を検索...",
- 	"findInWorkspace": "ワークスペース内を検索...",
- 	"showTriggerActions": "ワークスペース内のシンボルへ移動...",
- 	"name": "検索",
-+<<<<<<< .our
- 	"showSearchViewl": "検索の表示",
-+=======
-+	"search": "検索",
-+	"showSearchViewlet": "検索の表示",
-+>>>>>>> .their
- 	"view": "表示",
- 	"findInFiles": "フォルダーを指定して検索",
- 	"openAnythingHandlerDescription": "ファイルに移動する",
-@@ -29,7 +37,11 @@
- 	"useIgnoreFiles": "ファイルを検索するときに、.gitignore ファイルを使用するか .ignore ファイルを使用するかを制御します。",
- 	"search.quickOpen.includeSymbols": "グローバル シンボル検索の結果を、Quick Open の結果ファイルに含めるように構成します。",
- 	"search.followSymlinks": "検索中にシンボリック リンクをたどるかどうかを制御します。",
-+<<<<<<< .our
- 	"search.smartCase": "すべて小文字のパターンの場合、大文字と小文字を区別しないで検索し、そうでない場合は大文字と小文字を区別して検索する",
- 	"search.globalFindClipboard": "macOS で検索ビューが共有の検索クリップボードを読み取りまたは変更するかどうかを制御します",
- 	"search.location": "検索をサイドバーのビューとして表示するか、より水平方向の空間をとるためにパネル領域のパネルとして表示するかを制御します。"
-+=======
-+	"search.smartCase": "すべて小文字のパターンの場合、大文字と小文字を区別しないで検索し、そうでない場合は大文字と小文字を区別して検索する"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 555cee1e7acf405015caf2e6fae5db5c183a45ad i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-  their  100644 9f9a7171140dcdfa85a2ed100c54d3d9e36f3c08 i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"global.scope": "(グローバル)",
- 	"global.1": "({0})",
- 	"new.global": "新しいグローバル スニペット ファイル...",
-changed in both
-  base   100644 72cf35b045c5fe40308f361d3a58341a46705f4d i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  our    100644 e715ffb25dda725fde81327107aec4812ac52bec i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  their  100644 f4559520bc0fff3b005edfba2fbc04f03225f0af i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"snippetSchema.json.default": "空のスニペット",
- 	"snippetSchema.json": "ユーザー スニペット構成",
- 	"snippetSchema.json.prefix": "intellisense でスニペットを選択するときに使用するプレフィックス",
-added in both
-  our    100644 ee6c777124c5d672c13d006929dc9f8efc46a594 i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-  their  100644 6528c4a5c7238fcbd074aeda94a2860a01137610 i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,5 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"source.snippetGlobal": "グローバル ユーザー スニペット",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"source.snippet": "ユーザー スニペット"
- }
-\ No newline at end of file
-changed in both
-  base   100644 247f01f3cea87cfed95420450444b0f1b4b904ea i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  our    100644 21441eaa2729bf554391d89816b61bd2454648a6 i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 8d9acf90cf17d4d9b9f3959efabb56280b58f573 i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,10 @@
- 	],
- 	"invalid.path.0": "`contributes.{0}.path` に文字列が必要です。提供された値: {1}",
- 	"invalid.language.0": "言語を省略するとき、`contributes.{0}.path` の値は `.code-snippets`-file にする必要があります。提供された値: {1}",
-+=======
-+	"invalid.path.0": "`contributes.{0}.path` に文字列が必要です。提供された値: {1}",
-+	"invalid.language.0": "言語を省略するとき、`contributes.{0}.path` の値は `.code-snippets`-file にする必要があります。提供された値: {1}",
-+>>>>>>> .their
- 	"invalid.language": "`contributes.{0}.language` で不明な言語です。提供された値: {1}",
- 	"invalid.path.1": "拡張機能のフォルダー ({2}) の中に `contributes.{0}.path` ({1}) が含まれている必要があります。これにより拡張を移植できなくなる可能性があります。",
- 	"vscode.extension.contributes.snippets": "スニペットを提供します。",
-changed in both
-  base   100644 76dbf9d84f08fdee8be3a8772ad06f54b9d992ae i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 62e38b3747f8554dd00fc9cb1775537cf7a36bb1 i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 189e87c799d7ceb0a024935ff2bb969404bd5c14 i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -15,7 +15,11 @@
- 	"terminal.integrated.shellArgs.osx": "OS X 端末で使用するコマンド ライン引数。",
- 	"terminal.integrated.shell.windows": "Windows でターミナルが使用するシェルのパス。 Windows に同梱されているシェルを使用する場合 (cmd、PowerShell、または Bash on Ubuntu) 。",
- 	"terminal.integrated.shellArgs.windows": "Windows ターミナル上の場合に使用されるコマンド ライン引数。",
-+<<<<<<< .our
- 	"terminal.integrated.macOptionIsMeta": "macOS のターミナルでは、オプション キーをメタ キーとして扱います。",
-+=======
-+	"terminal.integrated.rightClickCopyPaste": "設定している場合、ターミナル内で右クリックしたときにコンテキスト メニューを表示させず、選択範囲がある場合はコピー、選択範囲がない場合は貼り付けの操作を行います。",
-+>>>>>>> .their
- 	"terminal.integrated.copyOnSelection": "設定した場合、ターミナルで選択しているテキストはクリップボードにコピーされます。",
- 	"terminal.integrated.fontFamily": "端末のフォント ファミリを制御します。既定値は editor.fontFamily になります。",
- 	"terminal.integrated.fontSize": "ターミナルのフォント サイズをピクセル単位で制御します。",
-@@ -37,7 +41,10 @@
- 	"terminal.integrated.env.linux": "Linux のターミナルで使用される VS Code のプロセスに追加される環境変数を持つオブジェクト",
- 	"terminal.integrated.env.windows": "Windows のターミナルで使用される VS Code のプロセスに追加される環境変数を持つオブジェクト",
- 	"terminal.integrated.showExitAlert": "0 以外の終了コードのとき `終了コードを伴ってターミナルの処理が終了しました` と警告を表示します。",
-+<<<<<<< .our
- 	"terminal.integrated.experimentalRestore": "VS Code の起動時に自動的にワークスペースのターミナル セッションを復元するかどうか。これは実験的な設定です。不具合や将来的に変更される可能性があります。",
-+=======
-+>>>>>>> .their
- 	"terminalCategory": "ターミナル",
- 	"viewCategory": "表示"
- }
-\ No newline at end of file
-changed in both
-  base   100644 6015fb400ae24c2a08d6d8ea3a586b233bbb5444 i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 bd0ce9939936ef31eabab48bc5a42980b19e29b3 i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 96aa73cab67f529aa85106668a5543012b5b2f55 i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -19,6 +19,7 @@
- 	"workbench.action.terminal.new": "新しい統合ターミナルの作成",
- 	"workbench.action.terminal.new.short": "新しいターミナル",
- 	"workbench.action.terminal.newWorkspacePlaceholder": "新しいターミナルの作業ディレクトリを選択してください",
-+<<<<<<< .our
- 	"workbench.action.terminal.newInActiveWorkspace": "(アクティブなワークスペースで) 新しいターミナルの作成",
- 	"workbench.action.terminal.split": "ターミナルの分割",
- 	"workbench.action.terminal.splitInActiveWorkspace": "(アクティブなワークスペースで) ターミナルの分割",
-@@ -28,6 +29,9 @@
- 	"workbench.action.terminal.resizePaneRight": "ペインを右にリサイズ",
- 	"workbench.action.terminal.resizePaneUp": "ペインを上にリサイズ",
- 	"workbench.action.terminal.resizePaneDown": "ペインを下にリサイズ",
-+=======
-+	"workbench.action.terminal.newInActiveWorkspace": "新しい統合ターミナルを作成 (アクティブなワークスペースに)",
-+>>>>>>> .their
- 	"workbench.action.terminal.focus": "端末にフォーカス",
- 	"workbench.action.terminal.focusNext": "次の端末にフォーカス",
- 	"workbench.action.terminal.focusPrevious": "前のターミナルにフォーカス",
-changed in both
-  base   100644 42ec3aff61936a075ec5f1200fc49a3dcd04c987 i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  our    100644 ccb663830c2e7340c8cd35b61e49ac51e8e0ed36 i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  their  100644 95f2aea84fde6a0a42380e8f65013fe582627ca3 i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-@@ -8,7 +8,11 @@
- 	],
- 	"terminal.integrated.chooseWindowsShellInfo": "カスタマイズ ボタンを選択して、既定のターミナル シェルを変更できます。",
- 	"customize": "カスタマイズする",
-+<<<<<<< .our
- 	"never again": "今後は表示しない",
-+=======
-+	"cancel": "キャンセル",
-+>>>>>>> .their
- 	"terminal.integrated.chooseWindowsShell": "優先するターミナル シェルを選択します。これは後で設定から変更できます",
- 	"terminalService.terminalCloseConfirmationSingular": "アクティブなターミナル セッションが 1 つあります。中止しますか?",
- 	"terminalService.terminalCloseConfirmationPlural": "アクティブなターミナル セッションが {0} 個あります。中止しますか?"
-changed in both
-  base   100644 5007e4d58ae2dd2ca0b047d697ac1b5dbbec988a i18n/jpn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 be4c3ee187a4c958a13a55a867d75c42dce31777 i18n/jpn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 6df9478e8ba13b85a7543935136418fb7002fe96 i18n/jpn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -26,12 +26,19 @@
- 	"commandPalette": "コマンド パレット...",
- 	"settings": "設定",
- 	"keyboardShortcuts": "キーボード ショートカット",
-+<<<<<<< .our
- 	"showExtensions": "拡張機能の管理",
-+=======
-+>>>>>>> .their
- 	"userSnippets": "ユーザー スニペット",
- 	"selectTheme.label": "配色テーマ",
- 	"themes.selectIconTheme.label": "ファイル アイコンのテーマ",
- 	"checkForUpdates": "更新の確認...",
- 	"checkingForUpdates": "更新を確認しています...",
-+<<<<<<< .our
-+=======
-+	"DownloadUpdate": "利用可能な更新プログラムをダウンロード",
-+>>>>>>> .their
- 	"DownloadingUpdate": "更新をダウンロードしています...",
- 	"installUpdate...": "更新プログラムのインストール...",
- 	"installingUpdate": "更新プログラムをインストールしています...",
-changed in both
-  base   100644 fbd940c7d4762804bfe2f4a935dec2171f56cc1c i18n/jpn/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  our    100644 946723a67128023eb3e9fb6c646c3cf967e21f00 i18n/jpn/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  their  100644 39c4fd74ba474c3c8903819c7b2dcfe4239040f9 i18n/jpn/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-changed in both
-  base   100644 26fc540488227acc4616c847680c01b3787d3c7e i18n/jpn/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  our    100644 da438326649bf3dd9d5fc83ed7deb703ead893a5 i18n/jpn/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  their  100644 6384721117f67cc624586049d18e156f30743846 i18n/jpn/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,4 +14,9 @@
- 	"fileBinaryError": "ファイルはバイナリのようなので、テキストとして開くことができません",
- 	"err.create": "ファイル {0} を作成できませんでした",
- 	"fileMoveConflict": "移動/コピーできません。移動/コピー先にファイルが既に存在します。"
-+=======
-+	"fileIsDirectoryError": "ファイルはディレクトリです",
-+	"fileNotModifiedError": "ファイルは次の時点以後に変更されていません:",
-+	"fileBinaryError": "ファイルはバイナリのようなので、テキストとして開くことができません"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 104db33f6337244ed2d1a32c88616ef6d47055e8 i18n/jpn/src/vs/workbench/services/files/node/fileService.i18n.json
-  our    100644 15dc46337bb140480f30e488f657bed5792e70af i18n/jpn/src/vs/workbench/services/files/node/fileService.i18n.json
-  their  100644 95c0a8bffc27db772b3068eab4edad0c15f564cb i18n/jpn/src/vs/workbench/services/files/node/fileService.i18n.json
-changed in both
-  base   100644 4845e670df1147efbb31bcac89aab4f4f778e627 i18n/jpn/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
-  our    100644 3da56ec25d97ddc8a13e5b385285a1ed56d58d19 i18n/jpn/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
-  their  100644 5d95483dfacddc859a1dda58617e5b4d648df780 i18n/jpn/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
-changed in both
-  base   100644 2b4d38667bc03741b9a025d1caa748242db5031a i18n/jpn/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  our    100644 7bade8011c7c29276dc09955be1b5f86fb4ce0c4 i18n/jpn/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  their  100644 a570e254df85187eee4e073694ccdff523520e6e i18n/jpn/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-changed in both
-  base   100644 b1fd1a9b69e9d14352615df73dceb000745bd5a9 i18n/jpn/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 1c24e18b8352f7c98a6c854017d4381edcc0bc7e i18n/jpn/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 3430db60129b30e585503589928284fea30f6a9a i18n/jpn/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-changed in both
-  base   100644 ec391b0543b8d09a5cc2e511a55235b679ec1d3f i18n/jpn/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  our    100644 8bba8a3b7036c74920c718836509c48a1615d496 i18n/jpn/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  their  100644 132852e62fff39db34e244465f769eec52e60a88 i18n/jpn/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-@@ -8,5 +8,10 @@
- 	],
- 	"errorInvalidTaskConfiguration": "ワークスペース構成ファイルに書き込めません。ファイルを開いて、ファイル内のエラー/警告を修正してからもう一度お試しください。",
- 	"errorWorkspaceConfigurationFileDirty": "ファイルが変更されているため、ワークスペース構成ファイルに書き込めません。ファイルを保存してから、もう一度お試しください。",
-+<<<<<<< .our
- 	"openWorkspaceConfigurationFile": "ワークスペースの構成を開く"
-+=======
-+	"openWorkspaceConfigurationFile": "ワークスペースの構成ファイルを開く",
-+	"close": "閉じる"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a02c668eb9ded1dcee8405b81b1b5a737beabaf6 i18n/kor/extensions/git/out/autofetch.i18n.json
-  our    100644 7f6a3198eb6e65405a295e58494ed873b68808c1 i18n/kor/extensions/git/out/autofetch.i18n.json
-  their  100644 88fc1cbb4d546033292251e93149b6b17a35fc43 i18n/kor/extensions/git/out/autofetch.i18n.json
-@@ -7,7 +7,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"yes": "예",
-+	"read more": "자세히 알아보기",
- 	"no": "아니요",
-+<<<<<<< .our
- 	"not now": "나중에 물어보기",
- 	"suggest auto fetch": "Code에서 ['git fetch']({0})를 정기적으로 실행하도록 하시겠습니까?"
-+=======
-+	"not now": "나중에 물어보기"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 15fcc99ffbe05058c00b3c23391a5ff72ff598ef i18n/kor/extensions/git/out/commands.i18n.json
-  our    100644 5c881abd459fc945dcc1b911f43b518f709ac538 i18n/kor/extensions/git/out/commands.i18n.json
-  their  100644 7ec5dec31a379813a5f8bfe4869d344eacd8ecb9 i18n/kor/extensions/git/out/commands.i18n.json
-@@ -71,12 +71,19 @@
- 	"pick remote pull repo": "분기를 가져올 원격 선택",
- 	"no remotes to push": "리포지토리에 푸시하도록 구성된 원격이 없습니다.",
- 	"nobranch": "원격에 푸시할 분기를 체크 아웃하세요.",
-+<<<<<<< .our
- 	"confirm publish branch": "'{0}' 분기에는 상향 분기가 없습니다. 이 분기를 게시하시겠습니까?",
- 	"ok": "확인",
- 	"push with tags success": "태그와 함께 푸시되었습니다.",
- 	"pick remote": "'{0}' 분기를 다음에 게시하려면 원격을 선택하세요.",
- 	"sync is unpredictable": "이 작업은 '{0}/{1}' 간에 커밋을 푸시하고 풀합니다. ",
- 	"never again": "다시 표시 안 함",
-+=======
-+	"ok": "확인",
-+	"push with tags success": "태그와 함께 푸시되었습니다.",
-+	"pick remote": "'{0}' 분기를 다음에 게시하려면 원격을 선택하세요.",
-+	"sync is unpredictable": "이 작업은 '{0}' 간에 커밋을 푸시하고 풀합니다.",
-+>>>>>>> .their
- 	"no remotes to publish": "리포지토리에 게시하도록 구성된 원격이 없습니다.",
- 	"no changes stash": "스태시할 변경 내용이 없습니다.",
- 	"provide stash message": "필요한 경우 스태시 메시지를 입력하세요.",
-added in both
-  our    100644 dd43847bd6ece7506b20c3035653b12c6c8b6d0c i18n/kor/extensions/typescript/out/commands.i18n.json
-  their  100644 70c3246796b0e15d0a190071976e7b3d5b462f2e i18n/kor/extensions/typescript/out/commands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -13,4 +14,20 @@
- 	"typescript.noJavaScriptProjectConfig": "파일이 JavaScript 프로젝트의 일부가 아닙니다. 자세히 알아보려면 [여기]({0})를 클릭하세요.",
- 	"typescript.configureTsconfigQuickPick": "tsconfig.json 구성",
- 	"typescript.configureJsconfigQuickPick": "jsconfig.json 구성"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"typescript.projectConfigNoWorkspace": "TypeScript 또는 JavaScript 프로젝트를 사용하려면 VS Code의 폴더를 여세요.",
-+	"typescript.projectConfigUnsupportedFile": "TypeScript 또는 JavaScript 프로젝트를 확인할 수 없습니다. 지원되지 않는 파일 형식",
-+	"typescript.projectConfigCouldNotGetInfo": "TypeScript 또는 JavaScript 프로젝트를 확인할 수 없습니다.",
-+	"typescript.noTypeScriptProjectConfig": "파일이 TypeScript 프로젝트의 일부가 아닙니다.",
-+	"typescript.noJavaScriptProjectConfig": "파일이 JavaScript 프로젝트의 일부가 아닙니다.",
-+	"typescript.configureTsconfigQuickPick": "tsconfig.json 구성",
-+	"typescript.configureJsconfigQuickPick": "jsconfig.json 구성",
-+	"typescript.projectConfigLearnMore": "자세한 정보"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 750d811d866eaa3d43818bd1d8e28c9898acf514 i18n/kor/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"selectAriaOption": "{0}"
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-added in both
-  our    100644 8c188b449a527f72011a4dc1ef63653395edb3be i18n/kor/src/vs/base/node/ps.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/src/vs/base/node/ps.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"collecting": "CPU와 메모리 정보를 수집중입니다. 시간이 약간 걸립니다."
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 1fe9d415d3a479365c1bc6205d1ce5230d48875d i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 c96c0fe1469ce78842b73db686d63d6305f28dfb i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 15922e9831448977409f73ad2274ebc4f59654b3 i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -16,7 +16,11 @@
- 	"lineNumbers.on": "줄 번호는 절대값으로 렌더링 됩니다.",
- 	"lineNumbers.relative": "줄 번호는 커서 위치에서 줄 간격 거리로 렌더링 됩니다.",
- 	"lineNumbers.interval": "줄 번호는 매 10 줄마다 렌더링이 이루어집니다.",
-+<<<<<<< .our
- 	"lineNumbers": "줄 번호의 표시 여부를 제어합니다.",
-+=======
-+	"lineNumbers": "줄 번호의 표시 방식을 제어합니다. 가능한 값은 'on', 'off', 'relative', 'interval' 입니다.",
-+>>>>>>> .their
- 	"rulers": "특정 수의 고정 폭 문자 뒤에 세로 눈금자를 렌더링합니다. 여러 눈금자의 경우 여러 값을 사용합니다. 배열이 비어 있는 경우 눈금자가 그려져 있지 않습니다.",
- 	"wordSeparators": "단어 관련 탐색 또는 작업을 수행할 때 단어 구분 기호로 사용되는 문자입니다.",
- 	"tabSize": "탭 한 개에 해당하는 공백 수입니다. `editor.detectIndentation`이 켜져 있는 경우 이 설정은 파일 콘텐츠에 따라 재정의됩니다.",
-changed in both
-  base   100644 a8423dd155b69f4f3c407aa89df59d4826fc226b i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 c148a56d8d67892505611b68cdd18b2ba3428134 i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 90813fe32fbf4edd2a8cad840cb0c3b02152bc23 i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -8,8 +8,11 @@
- 	],
- 	"lineHighlight": "커서 위치의 줄 강조 표시에 대한 배경색입니다.",
- 	"lineHighlightBorderBox": "커서 위치의 줄 테두리에 대한 배경색입니다.",
-+<<<<<<< .our
- 	"rangeHighlight": "빠른 열기 및 찾기 기능 등을 통해 강조 표시된 영역의 배경색입니다. 색은 밑에 깔린 꾸밈을 가리지 않도록 반드시 불투명이 아니어야 합니다.",
- 	"rangeHighlightBorder": "강조 영역 주변의 테두리에 대한 배경색입니다",
-+=======
-+>>>>>>> .their
- 	"caret": "편집기 커서 색입니다.",
- 	"editorCursorBackground": "편집기 커서의 배경색입니다. 블록 커서와 겹치는 글자의 색상을 사용자 정의할 수 있습니다.",
- 	"editorWhitespaces": "편집기의 공백 문자 색입니다.",
-changed in both
-  base   100644 58029e4cfcd556951eb746b7402c3a1924701a1a i18n/kor/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  our    100644 4b9dba9293172925bc959636fe204382fdbad72d i18n/kor/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  their  100644 73b79e4472120f3df3e3b9dd7dad1944b6e9c93f i18n/kor/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -10,4 +11,11 @@
- 	"markerAction.previous.label": "이전 문제로 이동 (오류, 경고, 정보)",
- 	"markerAction.nextInFiles.label": "파일의 다음 문제로 이동 (오류, 경고, 정보)",
- 	"markerAction.previousInFiles.label": "파일의 이전 문제로 이동 (오류, 경고, 정보)"
-+=======
-+	"title.wo_source": "({0}/{1})",
-+	"editorMarkerNavigationError": "편집기 표식 탐색 위젯 오류 색입니다.",
-+	"editorMarkerNavigationWarning": "편집기 표식 탐색 위젯 경고 색입니다.",
-+	"editorMarkerNavigationInfo": "편집기 표식 탐색 위젯 정보 색입니다.",
-+	"editorMarkerNavigationBackground": "편집기 표식 탐색 위젯 배경입니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ab340d73f19ecf15cb9622216450ecbc5bb87e24 i18n/kor/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  our    100644 aaaf9225abdbdfc447713d7247e23a460f779984 i18n/kor/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  their  100644 8dd1a533f7215632c7a5a8827d4f348d99330d10 i18n/kor/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,10 @@
- 	"wordHighlightStrongBorder": "변수에 쓰기와 같은 쓰기 액세스 중 기호의 테두리 색입니다.",
- 	"overviewRulerWordHighlightForeground": "기호 강조의 개요 눈금자 표식 색입니다. 이 색은 불투명해야만 내부 장식을 가리지 않습니다.",
- 	"overviewRulerWordHighlightStrongForeground": "쓰기 액세스 기호 강조의 개요 눈금자 표식 색입니다. 이 색은 불투명해야만 내부 장식을 가리지 않습니다.",
-+=======
-+	"overviewRulerWordHighlightForeground": "기호 강조 표시의 개요 눈금자 마커 색입니다.",
-+	"overviewRulerWordHighlightStrongForeground": "쓰기 권한 기호 강조 표시의 개요 눈금자 마커 색입니다.",
-+>>>>>>> .their
- 	"wordHighlight.next.label": "다음 강조 기호로 이동",
- 	"wordHighlight.previous.label": "이전 강조 기호로 이동"
- }
-\ No newline at end of file
-changed in both
-  base   100644 ee9870e16a1c7b6737e23bead633ce05b4850eb3 i18n/kor/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  our    100644 c92b8c11e09e6ba98f1ebf4744826c9d584019e9 i18n/kor/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  their  100644 8a92234e152e83135bc7ae99cd0092d2defbe462 i18n/kor/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 43b38b984db11136b8e50299f58c4be89210311d i18n/kor/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 5e47e69c5607206a94dadfaaaaa5928d57a2cd8e i18n/kor/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 ccaf072898e8c3816390566fdc3ad8203a7088cf i18n/kor/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,11 +10,19 @@
- 	"diff": "두 파일을 서로 비교합니다.",
- 	"add": "마지막 활성 창에 폴더를 추가합니다.",
- 	"goto": "지정된 줄과 문자 위치에 있는 경로의 파일을 엽니다.",
-+<<<<<<< .our
- 	"newWindow": "새 창을 강제로 엽니다.",
- 	"reuseWindow": "마지막 활성 창에서 파일 또는 파일을 강제로 엽니다.",
- 	"wait": "파일이 닫힐 때 까지 기다린 후 돌아갑니다.",
- 	"locale": "사용할 로캘(예: en-US 또는 zh-TW)입니다.",
- 	"userDataDir": "사용자 데이터가 저장되는 디렉터리를 지정합니다. Code의 여러 고유 인스턴스를 여는 데 사용할 수 있습니다.",
-+=======
-+	"newWindow": "Code의 새 인스턴스를 강제 적용합니다.",
-+	"reuseWindow": "마지막 활성 창에서 파일 또는 폴더를 강제로 엽니다.",
-+	"wait": "파일이 닫힐 때 까지 기다린 후 돌아갑니다.",
-+	"locale": "사용할 로캘(예: en-US 또는 zh-TW)입니다.",
-+	"userDataDir": "사용자 데이터가 저장되는 디렉터리를 지정합니다(루트로 실행할 경우 유용함).",
-+>>>>>>> .their
- 	"version": "버전을 출력합니다.",
- 	"help": "사용법을 출력합니다.",
- 	"extensionHomePath": "확장의 루트 경로를 설정합니다.",
-@@ -29,17 +37,27 @@
- 	"performance": "'Developer: Startup Performance' 명령을 사용하여 시작합니다.",
- 	"prof-startup": "시작하는 동안 CPU 프로파일러 실행",
- 	"disableExtensions": "설치된 모든 확장을 사용하지 않도록 설정합니다.",
-+<<<<<<< .our
- 	"inspect-extensions": "디버깅 및 확장 프로파일링을 허용합니다. 연결 URI는 개발자 도구를 확인하세요.",
- 	"inspect-brk-extensions": "시작 후 일시 중시된 확장 호스트에서 디버깅 및 확장 프로파일링을 허용합니다. 연결 URI는 개발자 도구를 확인하세요.",
- 	"disableGPU": "GPU 하드웨어 가속을 사용하지 않도록 설정합니다.",
- 	"uploadLogs": "현재의 세션에서 안전한 종점으로 로그 업로드",
- 	"maxMemory": "윈도우에 대한 최대 메모리 크기 (단위 MB).",
-+=======
-+	"inspect-extensions": "디버깅 및 확장 프로파일링을 허용합니다. 연결 uri에 대한 개발자 도구를 확인하십시오.",
-+	"inspect-brk-extensions": "시작 후 일시 중시된 확장 호스트에서 디버깅 및 확장 프로파일링을 허용합니다. 연결 URL은 개발자 도구를 확인하세요.",
-+	"disableGPU": "GPU 하드웨어 가속을 사용하지 않도록 설정합니다.",
-+>>>>>>> .their
- 	"usage": "사용법",
- 	"options": "옵션",
- 	"paths": "경로",
- 	"stdinWindows": "다른 프로그램의 출력을 읽으려면, '-'를 추가하십시오. (예: 'echo Hello World | {0} -')",
-+<<<<<<< .our
- 	"stdinUnix": "stdin에서 읽어오려면, '-'를 추가하십시오.(예. 'ps aux | grep code | {0} -')",
- 	"optionsUpperCase": "옵션",
- 	"extensionsManagement": "확장 관리",
- 	"troubleshooting": "문제 해결"
-+=======
-+	"optionsUpperCase": "옵션"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 64578b6f8a5697a6d3ecc2adc9fb1ae266aab116 i18n/kor/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 05518f96202309824a89dfbd3498bbcde7102ebd i18n/kor/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 651652bfe31ecaac8309cb32e9812045bc6e6c05 i18n/kor/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -7,11 +7,15 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"invalidManifest": "잘못된 확장: package.json이 JSON 파일이 아닙니다.",
-+<<<<<<< .our
- 	"incompatible": "'{0}' 확장은 Code '{1}'과(와) 호환되지 않으므로 설치할 수 없습니다.",
-+=======
-+>>>>>>> .their
- 	"restartCode": "{0}을(를) 다시 설치하기 전에 Code를 다시 시작하세요.",
- 	"installingOutdatedExtension": "이 확장의 최신 버전이 이미 설치되어 있습니다. 이 버전을 이전 버전으로 재정의하시겠습니까?",
- 	"override": "재정의",
- 	"cancel": "취소",
-+<<<<<<< .our
- 	"errorInstallingDependencies": "의존성 설치 중 오류가 발생했습니다. {0}",
- 	"MarketPlaceDisabled": "Marketplace를 사용할 수 없습니다.",
- 	"removeError": "확장을 제거하는 동안 오류가 발생했습니다. {0}. 다시 시도하기 전에 VS Code를 종료하고 다시 시작하세요.",
-@@ -22,6 +26,11 @@
- 	"quitCode": "확장을 설치할 수 없습니다. 다시 설치하기 위해 VS Code를 종료하고 다시 시작하십시오.",
- 	"exitCode": "확장을 설치할 수 없습니다. 다시 설치하기 전에 VS 코드를 종료한 후 다시 시작하십시오. ",
- 	"renameError": "이름을 {0}에서 {1}(으)로 변경하는 중 알 수 없는 오류 발생",
-+=======
-+	"notFoundCompatible": "'{0}'을(를) 설치할 수 없습니다; VS Code '{1}'과 호환되는 버전이 없습니다.",
-+	"notFoundCompatibleDependency": "VS Code의 현재 버전 '{1}'과(와) 호환되는 종속된 확장 '{0}'을(를) 찾을 수 없으므로 설치할 수 없습니다.",
-+	"quitCode": "확장을 설치할 수 없습니다. 다시 설치하기 위해 VS Code를 종료하고 다시 시작하십시오.",
-+>>>>>>> .their
- 	"uninstallDependeciesConfirmation": "'{0}'만 제거할까요, 아니면 종속성도 제거할까요?",
- 	"uninstallOnly": "확장만",
- 	"uninstallAll": "모두 제거",
-changed in both
-  base   100644 8194d2b9b95582dc722ec72dc023ce8743f159c5 i18n/kor/src/vs/platform/message/common/message.i18n.json
-  our    100644 c0cadb165e7c4e1b2a1da41d518d3d410bb015b7 i18n/kor/src/vs/platform/message/common/message.i18n.json
-  their  100644 7cec53dd19a577971d81e797a402e19eb48f42f6 i18n/kor/src/vs/platform/message/common/message.i18n.json
-changed in both
-  base   100644 8f111cba06f865ee961ebf16a79910e37debbb04 i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 44b01274f5b039d38e4cfbd58f3d0758fa5d1e89 i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 ac7b14b24ea4951ce6a60a3aa22c2ea3de79574d i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -68,6 +68,7 @@
- 	"editorWidgetBorder": "편집기 위젯의 테두리 색입니다. 위젯에 테두리가 있고 위젯이 색상을 무시하지 않을 때만 사용됩니다.",
- 	"editorSelectionBackground": "편집기 선택 영역의 색입니다.",
- 	"editorSelectionForeground": "고대비를 위한 선택 텍스트의 색입니다.",
-+<<<<<<< .our
- 	"editorInactiveSelection": "비활성화된 편집기에서 선택영역의 색상. 색상은 밑의 꾸밈을 가리지 않도록 반드시 불투명이 아니어야 합니다.",
- 	"editorSelectionHighlight": "선택 영역과 동일한 콘텐츠가 있는 영역의 색입니다. 색상은 밑의 꾸밈을 가리지 않도록 반드시 불투명이 아니어야 합니다.",
- 	"editorSelectionHighlightBorder": "선택 영역과 동일한 콘텐츠가 있는 영역의 테두리 색입니다.",
-@@ -79,6 +80,9 @@
- 	"findRangeHighlightBorder": "검색을 제한하는 범위의 테두리 색입니다. 이 색은 기본 장식을 가리지 않도록 불투명하지 않아야 합니다.",
- 	"findWidgetResizeBorder": "찾기 위젯의 크기 조정 막대의 테두리 색입니다.",
- 	"hoverHighlight": "호버가 표시된 단어 아래를 강조 표시합니다. 색상은 밑의 꾸밈을 가리지 않도록 반드시 불투명이 아니어야 합니다.",
-+=======
-+	"editorFindMatch": "현재 검색 일치 항목의 색입니다.",
-+>>>>>>> .their
- 	"hoverBackground": "편집기 호버의 배경색.",
- 	"hoverBorder": "편집기 호버의 테두리 색입니다.",
- 	"activeLinkForeground": "활성 링크의 색입니다.",
-@@ -86,12 +90,15 @@
- 	"diffEditorRemoved": "글자 배경색이 제거되었습니다. 해당 색상은 적용된 꾸밈을 가리지 않기 위해 불투명해서는 안됩니다.",
- 	"diffEditorInsertedOutline": "삽입된 텍스트의 윤곽선 색입니다.",
- 	"diffEditorRemovedOutline": "제거된 텍스트의 윤곽선 색입니다.",
-+<<<<<<< .our
- 	"mergeCurrentHeaderBackground": "인라인 병합 충돌의 현재 헤더 배경입니다. 색상은 밑의 꾸밈을 가리지 않도록 반드시 불투명이 아니어야 합니다.",
- 	"mergeCurrentContentBackground": "인라인 병합 충돌의 현재 콘텐츠 배경입니다. 색상은 밑의 꾸밈을 가리지 않도록 반드시 불투명이 아니어야 합니다.",
- 	"mergeIncomingHeaderBackground": "인라인 병합 충돌에서 수신 헤더 배경입니다. 색상은 밑의 꾸밈을 가리지 않도록 반드시 불투명이 아니어야 합니다.",
- 	"mergeIncomingContentBackground": "인라인 병합 충돌에서 수신 콘텐츠 배경입니다. 색상은 밑의 꾸밈을 가리지 않도록 반드시 불투명이 아니어야 합니다.",
- 	"mergeCommonHeaderBackground": "인라인 병합 충돌의 공통 과거 헤더 배경입니다. 색상은 밑의 꾸밈을 가리지 않도록 반드시 불투명이 아니어야 합니다.",
- 	"mergeCommonContentBackground": "인라인 병합 충돌의 공용 상위 콘텐츠 배경입니다. 이 색은 기본 장식을 가리지 않도록 불투명하지 않아야 합니다.",
-+=======
-+>>>>>>> .their
- 	"mergeBorder": "인라인 병합 충돌에서 헤더 및 스플리터의 테두리 색입니다.",
- 	"overviewRulerCurrentContentForeground": "인라인 병합 충돌에서 현재 개요 눈금 전경색입니다.",
- 	"overviewRulerIncomingContentForeground": "인라인 병합 충돌에서 수신 개요 눈금 전경색입니다.",
-added in both
-  our    100644 e260c7da4c6f560f0c6c1ac69ad396ed1b97cbf2 i18n/kor/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,4 +11,12 @@
- 	"codeActionsOnSave.didTimeout": "{0}밀리초 후 codeActionsOnSave 중단됨",
- 	"timeout.onWillSave": "1750ms 후에 onWillSaveTextDocument-event가 중단됨",
- 	"saveParticipants": "실행중인 저장 관계자..."
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 4dfa6a6e897b2345cb362e2a5dd9f07169480213 i18n/kor/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  our    100644 119f9434ea1f9659429413fc03778e6c282f471a i18n/kor/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  their  100644 80def44cc8576a4588bf8c80a57debefcba77de9 i18n/kor/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,7 @@
- 	],
- 	"treeView.notRegistered": "ID가 '{0}'인 등록된 트리 뷰가 없습니다.",
- 	"treeView.duplicateElement": "ID가 {0}인 요소가 이미 등록되어 있습니다."
-+=======
-+	"treeView.notRegistered": "ID가 '{0}'인 등록된 트리 뷰가 없습니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d99bcba35efbb21b5038a87126393fb6a3d9901f i18n/kor/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 9f392ee6782a9cd3b3d60690870bfb3e051b1e8b i18n/kor/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 646be54e1886499a8642a6a702b7e56d11fa37e0 i18n/kor/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -15,5 +15,9 @@
- 	"saveWorkspace": "작업 영역 저장",
- 	"openWorkspaceAction": "작업 영역 열기...",
- 	"openWorkspaceConfigFile": "작업 영역 구성 파일 열기",
-+<<<<<<< .our
- 	"duplicateWorkspaceInNewWindow": "새 창에 작업 영역 복제"
-+=======
-+	"openFolderAsWorkspaceInNewWindow": "새 창에서 작업 영역으로 폴더 열기"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 ab09f3bfef7fccac53c50cd54471d952d954f19d i18n/kor/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-  their  100644 4aff2c193448b890bf306a457ac22fe60b50b0e2 i18n/kor/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,4 +11,15 @@
- 	"add": "추가(&&A)",
- 	"addFolderToWorkspaceTitle": "작업 영역에 폴더 추가",
- 	"workspaceFolderPickerPlaceholder": "작업 영역 폴더 선택"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"addFolderToWorkspace": "작업 영역에 폴더 추가...",
-+	"add": "추가(&&A)",
-+	"addFolderToWorkspaceTitle": "작업 영역에 폴더 추가"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 32f439e8de1f35d68885df5a4944179d25544ef0 i18n/kor/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  our    100644 f0e2070a7f457cc0db76815fba6defcb9702d6e1 i18n/kor/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  their  100644 57c83a5d7c53b5f16030ec8f525789016b9b1556 i18n/kor/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-@@ -19,6 +19,7 @@
- 	"close": "닫기",
- 	"closeOthers": "기타 항목 닫기",
- 	"closeRight": "오른쪽에 있는 항목 닫기",
-+<<<<<<< .our
- 	"closeAllSaved": "저장된 항목 닫기",
- 	"closeAll": "모두 닫기",
- 	"keepOpen": "열린 상태 유지",
-@@ -27,6 +28,15 @@
- 	"keepEditor": "편집기 유지",
- 	"closeEditorsInGroup": "그룹의 모든 편집기 닫기",
- 	"closeSavedEditors": "그룹에서 저장된 편집기 닫기",
-+=======
-+	"closeAllUnmodified": "미수정 항목 닫기",
-+	"closeAll": "모두 닫기",
-+	"keepOpen": "열린 상태 유지",
-+	"showOpenedEditors": "열려 있는 편집기 표시",
-+	"keepEditor": "편집기 유지",
-+	"closeEditorsInGroup": "그룹의 모든 편집기 닫기",
-+	"closeUnmodifiedEditors": "그룹의 수정되지 않은 편집기 닫기",
-+>>>>>>> .their
- 	"closeOtherEditors": "다른 편집기 닫기",
- 	"closeRightEditors": "오른쪽에 있는 편집기 닫기"
- }
-\ No newline at end of file
-changed in both
-  base   100644 ed6d0f43e21177bc9f82ef796dc89d0285c5ba1d i18n/kor/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 c3a38e203dc33f498428fe02d849236cb876a123 i18n/kor/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 92ac30a939f4323f1a28cd0ed37faa8b093f0576 i18n/kor/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 6c0c854e4bf50db4f061e0608d915252f016a4d7 i18n/kor/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  our    100644 610a770a8a9b2f4b0cc9af12766b082e0eb56297 i18n/kor/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  their  100644 b32e252f6bf82835e0d590f270a5b3da9009e13d i18n/kor/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-changed in both
-  base   100644 dedfef7381bc2d7d7e83ccc9548352af81b21946 i18n/kor/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  our    100644 b2d63ee836a92104cf275cb56fc82528c9b6082d i18n/kor/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  their  100644 13977c6a0095c19b20465d30a1976f04d97bd5f8 i18n/kor/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-@@ -12,6 +12,10 @@
- 	"editableEditorWithInputAriaLabel": "{0}. 텍스트 파일 비교 편집기입니다.",
- 	"editableEditorAriaLabel": "텍스트 파일 비교 편집기입니다.",
- 	"navigate.next.label": "다음 변경 내용",
-+<<<<<<< .our
- 	"navigate.prev.label": "이전 변경 내용",
- 	"toggleIgnoreTrimWhitespace.label": "자르기 공백 무시"
-+=======
-+	"navigate.prev.label": "이전 변경 내용"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a290c09983793e960b59a3c92d69e50510e72055 i18n/kor/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  our    100644 2acca1606b7d94081e6530150993d936d7b73b81 i18n/kor/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  their  100644 13cca1a33360eb702e2281eda5901ae235034d21 i18n/kor/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"close": "닫기",
-+>>>>>>> .their
- 	"araLabelEditorActions": "편집기 작업"
- }
-\ No newline at end of file
-changed in both
-  base   100644 c43957e4bd8a3ec74d08ce0d2f31f76919e68cf6 i18n/kor/src/vs/workbench/common/theme.i18n.json
-  our    100644 634f6ea85a754d26140eeb8ed57e39a6ab596db9 i18n/kor/src/vs/workbench/common/theme.i18n.json
-  their  100644 4cd1b7fa5815cef6f3a1b0ea77e820be16e0c7f7 i18n/kor/src/vs/workbench/common/theme.i18n.json
-@@ -41,8 +41,11 @@
- 	"statusBarNoFolderBorder": "열린 폴더가 없을 때 사이드바 및 편집기와 구분하는 상태 표시줄 테두리 색입니다. 상태 표시줄은 창의 맨 아래에 표시됩니다.",
- 	"statusBarItemActiveBackground": "클릭할 때의 상태 표시줄 항목 배경색입니다. 상태 표시줄은 창의 맨 아래에 표시됩니다.",
- 	"statusBarItemHoverBackground": "마우스로 가리킬 때의 상태 표시줄 항목 배경색입니다. 상태 표시줄은 창의 맨 아래에 표시됩니다.",
-+<<<<<<< .our
- 	"statusBarProminentItemBackground": " 상태 표시줄 주요 항목 배경 색. 주요 항목은 중요성을 알려주기 위해 다른 상태 표시줄 항목보다 눈에 띕니다. 예제를 보기 위해 명령 팔레트에서 '포커스 이동을 위해 탭 키 토글' 모드를 변경합니다. 창 아래쪽에 상태 표시줄이 나타납니다.",
- 	"statusBarProminentItemHoverBackground": "마우스 커서를 올렸을 때 상태 표시줄 주요 항목 배경 색. 주요 항목은 중요성을 알려주기 위해 다른 상태 표시줄 항목보다 눈에 띕니다. 예제를 보기 위해 명령 팔레트에서 '포커스 이동을 위해 탭 키 토글' 모드를 변경합니다. 창 아래쪽에 상태 표시줄이 나타납니다.",
-+=======
-+>>>>>>> .their
- 	"activityBarBackground": "작업 막대 배경색입니다. 작업 막대는 맨 왼쪽이나 오른쪽에 표시되며 사이드바의 뷰 간을 전환하는 데 사용할 수 있습니다.",
- 	"activityBarForeground": "작업 막대 전경 색(예: 아이콘에 사용됨)입니다. 작업 막대는 오른쪽이나 왼쪽 끝에 표시되며 사이드바의 보기 간을 전환할 수 있습니다.",
- 	"activityBarBorder": "사이드바와 구분하는 작업 막대 테두리색입니다. 작업 막대는 오른쪽이나 왼쪽 끝에 표시되며 사이드바의 보기 간을 전환할 수 있습니다.",
-added in both
-  our    100644 dd937818bf97b5a69827678de5353616c3d86286 i18n/kor/src/vs/workbench/common/views.i18n.json
-  their  100644 6a3532ad44d8242de5c7ca3d3919142c91ee69df i18n/kor/src/vs/workbench/common/views.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"duplicateId": "ID `{0}`인 뷰가 위치 `{1}`에 이미 등록되어 있습니다."
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"duplicateId": "ID `{0}`이(가) 포함된 뷰가 위치 `{1}`에 이미 등록되어 있습니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 96f43aced40ed7c653c61ae714a6abe54398e585 i18n/kor/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 e913e127345422fb81d57f13fd8b5c25a0d63e10 i18n/kor/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 a1086cd9b19b2f24bfa7d9f722ecb202165030e2 i18n/kor/src/vs/workbench/electron-browser/actions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"closeWindow": "창 닫기",
- 	"closeWorkspace": "작업 영역 닫기",
- 	"noWorkspaceOpened": "현재 이 인스턴스에 열려 있는 작업 영역이 없습니다.",
-@@ -50,6 +53,14 @@
- 	"moveWindowTabToNewWindow": "창 탭을 새 창으로 이동",
- 	"mergeAllWindowTabs": "모든 창 병합",
- 	"toggleWindowTabsBar": "창 탭 모음 설정/해제",
-+<<<<<<< .our
- 	"about": "{0} 정보",
- 	"inspect context keys": "컨텍스트 키 검사"
-+=======
-+	"configureLocale": "언어 구성",
-+	"displayLanguage": "VSCode의 표시 언어를 정의합니다.",
-+	"doc": "지원되는 언어 목록은 {0} 을(를) 참조하세요.",
-+	"restart": "값을 변경하려면 VSCode를 다시 시작해야 합니다.",
-+	"fail.createSettings": "{0}'({1})을(를) 만들 수 없습니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 b3ca18516e9974812c405cbae34392dfe0bd02e0 i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 faff44b17686fcb835995d2bfd92efcfdcc183b1 i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 612e6f3495e7c6f3d105f83e4659cc9b45d3c8f1 i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,12 +35,19 @@
- 	"panelDefaultLocation": "패널의 기본 위치를 제어합니다. 워크벤치의 아래 또는 오른쪽에 표시될 수 있습니다.",
- 	"statusBarVisibility": "워크벤치 아래쪽에서 상태 표시줄의 표시 유형을 제어합니다.",
- 	"activityBarVisibility": "워크벤치에서 작업 막대의 표시 유형을 제어합니다.",
-+<<<<<<< .our
- 	"viewVisibility": "보기 머리글 작업의 표시 여부를 제어합니다. 보기 머리글 작업은 항상 표시할 수도 있고 보기에 포커스가 있거나 보기를 마우스로 가리킬 때만 표시할 수도 있습니다.",
- 	"fontAliasing": "워크벤치에서 글꼴 앨리어싱 방식을 제어합니다.\n- 기본: 서브 픽셀 글꼴 다듬기. 대부분의 일반 디스플레이에서 가장 선명한 글꼴 제공\n- 안티앨리어싱: 서브 픽셀이 아닌 픽셀 단위에서 글꼴 다듬기. 전반적으로 더 밝은 느낌을 줄 수 있음\n- 없음: 글꼴 다듬기 사용 안 함. 텍스트 모서리가 각지게 표시됨\n- 자동: 디스플레이의 DPI에 따라 `기본` 또는 `안티앨리어싱`을 자동으로 적용합니다.",
- 	"workbench.fontAliasing.default": "서브 픽셀 글꼴 다듬기. 대부분의 일반 디스플레이에서 가장 선명한 텍스트를 제공합니다. ",
- 	"workbench.fontAliasing.antialiased": "서브 픽셀이 아닌 픽셀 수준에서 글꼴을 다듬습니다. 전반적으로 글꼴이 더 밝게 표시됩니다.",
- 	"workbench.fontAliasing.none": "글꼴 다듬기를 사용하지 않습니다. 텍스트 가장자리가 각지게 표시됩니다.",
- 	"workbench.fontAliasing.auto": "디스플레이의 DPI에 따라 `기본` 또는 `안티앨리어싱`을 자동으로 적용합니다.",
-+=======
-+	"fontAliasing": "워크벤치에서 글꼴 앨리어싱 방식을 제어합니다.\n- 기본: 서브 픽셀 글꼴 다듬기. 대부분의 일반 디스플레이에서 가장 선명한 글꼴 제공\n- 안티앨리어싱: 서브 픽셀이 아닌 픽셀 단위에서 글꼴 다듬기. 전반적으로 더 밝은 느낌을 줄 수 있음\n- 없음: 글꼴 다듬기 사용 안 함. 텍스트 모서리가 각지게 표시됨",
-+	"workbench.fontAliasing.default": "서브 픽셀 글꼴 다듬기. 대부분의 일반 디스플레이에서 가장 선명한 텍스트를 제공합니다. ",
-+	"workbench.fontAliasing.antialiased": "서브 픽셀이 아닌 픽셀 수준에서 글꼴을 다듬습니다. 전반적으로 글꼴이 더 밝게 표시됩니다.",
-+	"workbench.fontAliasing.none": "글꼴 다듬기를 사용하지 않습니다. 텍스트 가장자리가 각지게 표시됩니다.",
-+>>>>>>> .their
- 	"enableNaturalLanguageSettingsSearch": "설정에 대한 자연어 검색 모드를 사용할지 여부를 제어합니다.",
- 	"windowConfigurationTitle": "창",
- 	"window.openFilesInNewWindow.on": "파일이 새 창에서 열립니다.",
-changed in both
-  base   100644 0530d6e3338b0221d2863ec624ecb6c4b65f1a85 i18n/kor/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  our    100644 225f55e21c15f2eea5a8d413dde22258cc15ec40 i18n/kor/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  their  100644 744cd683e866c0e76d54cc033fd64d3dc884ca6f i18n/kor/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"debug.terminal.title": "디버기"
- }
-\ No newline at end of file
-changed in both
-  base   100644 50730f440768cb821b1884c299c5df52891014fd i18n/kor/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  our    100644 d7e3fbf5baba4bf721149551ff3617009db1827d i18n/kor/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  their  100644 318c2b33d6f83a9a94e6a1051404c5faa042baf2 i18n/kor/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-changed in both
-  base   100644 3b5fdb0caacd5c75cac18cf6e05cd98d9a1a6f58 i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 7d98f29daa7e57a06988b8e2e9d76dd40150f638 i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 109cbec7026cb0f1ace5ef8da3f1ad27b242c92a i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,11 @@
- 	"exeBasedRecommendation": "{0}이(가) 설치되어 있으므로 이 확장을 권장합니다.",
- 	"fileBasedRecommendation": "최근에 연 파일을 기반으로 확장이 권장됩니다.",
- 	"workspaceRecommendation": "이 확장은 현재 작업 영역 사용자가 권장합니다.",
-+=======
-+	"workspaceRecommendation": "이 확장은 현재 작업 영역 사용자가 권장합니다.",
-+	"fileBasedRecommendation": "최근에 연 파일을 기반으로 확장이 권장됩니다.",
-+	"exeBasedRecommendation": "{0}이(가) 설치되어 있으므로 이 확장을 권장합니다.",
-+>>>>>>> .their
- 	"reallyRecommended2": "이 파일 형식에 대해 '{0}' 확장이 권장됩니다.",
- 	"reallyRecommendedExtensionPack": "이 파일 형식에 대해 '{0}' 확장 팩이 권장됩니다.",
- 	"install": "설치",
-added in both
-  our    100644 a10f291195902ad8d48ea6f23379b0adcd1fba71 i18n/kor/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-  their  100644 f1ae7883f3271382ee0800dc248f9462974eb71d i18n/kor/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,13 @@
- 	],
- 	"workbenchConfigurationTitle": "워크벤치",
- 	"feedbackVisibility": "워크벤치의 아래쪽에 있는 상태 표시줄에 Twitter 피드백(스마일 기호)의 표시 여부를 제어합니다."
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"workbenchConfigurationTitle": "워크벤치"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 2831ffe9f709c06aa3aa3754a4052d98e06ca948 i18n/kor/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"hide": "숨기기"
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 70dd81693214bc1f5e2dd3c5ff772183c2626bcc i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  our    100644 42cc77c6edf6d2ceb65bde3d33c468e821956123 i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  their  100644 68afc8f65f7e75b24cb638fe842866e43eb53cdb i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-@@ -12,7 +12,10 @@
- 	"revertLocalChanges": "변경 내용을 취소하고 디스크의 콘텐츠로 되돌리기",
- 	"copyPathOfActive": "활성 파일의 경로 복사",
- 	"saveAllInGroup": "그룹의 모든 항목 저장",
-+<<<<<<< .our
- 	"saveFiles": "파일 모두 저장",
-+=======
-+>>>>>>> .their
- 	"revert": "파일 되돌리기",
- 	"compareActiveWithSaved": "활성 파일을 저장된 파일과 비교",
- 	"closeEditor": "편집기 닫기",
-@@ -24,12 +27,19 @@
- 	"copyPath": "경로 복사",
- 	"saveAll": "모두 저장",
- 	"compareWithSaved": "저장된 항목과 비교",
-+<<<<<<< .our
- 	"compareWithSelected": "선택한 항목과 비교",
- 	"compareSource": "비교를 위해 선택",
- 	"compareSelected": "선택 항목 비교",
- 	"close": "닫기",
- 	"closeOthers": "기타 항목 닫기",
- 	"closeSaved": "저장된 항목 닫기",
-+=======
-+	"compareSource": "비교를 위해 선택",
-+	"close": "닫기",
-+	"closeOthers": "기타 항목 닫기",
-+	"closeUnmodified": "미수정 항목 닫기",
-+>>>>>>> .their
- 	"closeAll": "모두 닫기",
- 	"deleteFile": "영구히 삭제"
- }
-\ No newline at end of file
-changed in both
-  base   100644 87d00a4c77a6c99ce0050a71341b3aa317861ab4 i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 3bf77a27ac7c066f4ce3c283301cd1346b8314d5 i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 63c70d80b92fb03eea89634fc736d19b0ff93f2f i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"newFile": "새 파일",
- 	"newFolder": "새 폴더",
- 	"rename": "이름 바꾸기",
-@@ -13,7 +16,11 @@
- 	"copyFile": "복사",
- 	"pasteFile": "붙여넣기",
- 	"retry": "다시 시도",
-+<<<<<<< .our
- 	"renameWhenSourcePathIsParentOfTargetError": "'새 폴더' 또는 '새 파일' 명령을 사용하여 기존 폴더에 자식을 추가하세요.",
-+=======
-+	"openFolderFirst": "안에 파일이나 폴더를 만들려면 먼저 폴더를 엽니다.",
-+>>>>>>> .their
- 	"newUntitledFile": "제목이 없는 새 파일",
- 	"createNewFile": "새 파일",
- 	"createNewFolder": "새 폴더",
-@@ -43,11 +50,19 @@
- 	"confirmDeleteMessageMultiple": "다음 {0}개 파일을 영구히 삭제하시겠습니까?",
- 	"confirmDeleteMessageFolder": "'{0}'과(와) 해당 내용을 영구히 삭제할까요?",
- 	"confirmDeleteMessageFile": "'{0}'을(를) 영구히 삭제할까요?",
-+<<<<<<< .our
- 	"addFiles": "파일 추가",
- 	"confirmOverwrite": "이름이 같은 파일 또는 폴더가 대상 폴더에 이미 있습니다. 덮어쓸까요?",
- 	"replaceButtonLabel": "바꾸기(&&R)",
- 	"fileIsAncestor": "붙여 넣을 파일이 대상 폴더의 상위 항목입니다.",
- 	"fileDeleted": "그동안 붙여 넣을 파일이 삭제되거나 이동되었습니다.",
-+=======
-+	"irreversible": "이 작업은 취소할 수 없습니다.",
-+	"permDelete": "영구히 삭제",
-+	"importFiles": "파일 가져오기",
-+	"confirmOverwrite": "이름이 같은 파일 또는 폴더가 대상 폴더에 이미 있습니다. 덮어쓸까요?",
-+	"replaceButtonLabel": "바꾸기(&&R)",
-+>>>>>>> .their
- 	"duplicateFile": "중복",
- 	"globalCompareFile": "활성 파일을 다음과 비교...",
- 	"openFileToCompare": "첫 번째 파일을 열어서 다른 파일과 비교합니다.",
-changed in both
-  base   100644 f77f75c50138464181aa8f884f64c26c1f67eb85 i18n/kor/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  our    100644 8c22f8027cd9eef29ec4cae4de0b4128be5e3340 i18n/kor/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  their  100644 a5bbd5fb7c4b25c35afe090d025afa11375e4607 i18n/kor/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,14 +7,21 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"revealInWindows": "탐색기에 표시",
- 	"revealInMac": "Finder에 표시",
- 	"openContainer": "상위 폴더 열기",
- 	"saveAs": "다른 이름으로 저장...",
- 	"save": "저장",
- 	"saveAll": "모두 저장",
-+<<<<<<< .our
- 	"removeFolderFromWorkspace": "작업 영역에서 폴더 삭제",
- 	"genericRevertError": "'{0}' 되돌리기 실패: {1}",
-+=======
-+	"saveFiles": "파일 모두 저장",
-+	"removeFolderFromWorkspace": "작업 영역에서 폴더 삭제",
-+>>>>>>> .their
- 	"modifiedLabel": "{0}(디스크) ↔ {1}",
- 	"openFileToReveal": "첫 번째 파일을 열어서 나타냅니다.",
- 	"openFileToCopy": "첫 번째 파일을 열어서 경로를 복사합니다."
-changed in both
-  base   100644 64e3a748c1d30ddcf3658546af6b8c004e841f1b i18n/kor/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 86c9a7c9d2ee8cfe00d51c1241e8d08a131418a5 i18n/kor/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 f166c5489ca516205c09bb1b74fd9ded9a969b87 i18n/kor/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-@@ -40,7 +40,10 @@
- 	"formatOnSave": "파일 저장 시 서식을 지정합니다. 포맷터를 사용할 수 있어야 하며, 파일이 자동으로 저장되지 않아야 하고, 편집기가 종료되지 않아야 합니다.",
- 	"formatOnSaveTimeout": "저장 시 서식 지정의 시간 제한. FormatOnSave 명령에 대한 시간 제한을 밀리초로 지정합니다. 지정된 시간 제한보다 오래 걸리는 명령은 취소됩니다.",
- 	"explorerConfigurationTitle": "파일 탐색기",
-+<<<<<<< .our
- 	"openEditorsVisible": "열려 있는 편집기 창에 표시되는 편집기 수입니다.",
-+=======
-+>>>>>>> .their
- 	"autoReveal": "탐색기에서 파일을 열 때 자동으로 표시하고 선택할지를 제어합니다.",
- 	"enableDragAndDrop": "탐색기에서 끌어서 놓기를 통한 파일 및 폴더 이동을 허용하는지를 제어합니다.",
- 	"confirmDragAndDrop": "끌어서 놓기를 사용하여 파일 및 폴더를 이동하기 위해 탐색기에서 확인을 요청해야 하는지 제어합니다.",
-changed in both
-  base   100644 6cf353ae7129b46c74d8a2ece73bc29603959134 i18n/kor/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  our    100644 b2bb3346a0aacef8ebfc8da00ebb91b7f0db3e37 i18n/kor/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  their  100644 33af3c52303b5d5c86b269bf94c42d146bc63096 i18n/kor/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,12 @@
- 	"discard": "삭제",
- 	"readonlySaveErrorAdmin": "'{0}' 저장 실패: 파일이 쓰기 보호되어 있습니다. 관리자로 다시 시도하려면 '관리자로 덮어쓰기'를 선택하세요.",
- 	"readonlySaveError": "'{0}' 저장 실패: 파일이 쓰기 보호되어 있습니다. 보호를 제거하려면 '덮어쓰기'를 선택하세요.",
-+=======
-+	"userGuide": "오른쪽 편집기 도구 모음의 작업을 사용하여 변경 내용을 **실행 취소**하거나 디스크의 콘텐츠를 변경 내용으로 **덮어쓰기**",
-+	"overwrite": "덮어쓰기",
-+	"retry": "다시 시도",
-+	"discard": "삭제",
-+>>>>>>> .their
- 	"permissionDeniedSaveError": "저장 실패 '{0}': 권한 부족. 관리자로 다시 시도하려면 '관리자로 다시 시도'를 선택하세요.",
- 	"genericSaveError": "'{0}'을(를) 저장하지 못했습니다. {1}",
- 	"learnMore": "자세한 정보",
-changed in both
-  base   100644 56030126c946d60dd34c0e74df7b13cae4e247fc i18n/kor/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  our    100644 37b7ea8b1927c92d33258a48c45eb49b54d27f3a i18n/kor/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  their  100644 3f6a56914c00b16db4b0a62bd3a1bdd3d3d56596 i18n/kor/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-added in both
-  our    100644 eed5e71d3e51cecfb4abc494c43deb0639649284 i18n/kor/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-  their  100644 c6b46a532f7203db44d48a02586881da86bad7ba i18n/kor/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,6 +9,15 @@
- 	],
- 	"mainLog": "로그(메인)",
- 	"sharedLog": "로그(공유)",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"mainLog": "로그(메인)",
-+>>>>>>> .their
- 	"rendererLog": "로그(창)",
- 	"extensionsLog": "로그(확장 호스트)",
- 	"developer": "개발자"
-added in both
-  our    100644 3bd63de7ca6d73e0237b469acdb4b75d84710150 i18n/kor/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  their  100644 e36190cd574022ab0883f29a99804ebd05e1206b i18n/kor/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -16,15 +17,34 @@
- 	"selectProcess": "프로세스에 대한 로그 선택",
- 	"openLogFile": "로그 파일 열기...",
- 	"setLogLevel": "로그 수준 설정...",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"openLogsFolder": "로그 폴더 열기",
-+	"showLogs": "로그 표시...",
-+	"mainProcess": "기본",
-+	"sharedProcess": "공유",
-+	"rendererProcess": "창",
-+	"selectProcess": "프로세스 선택",
-+	"setLogLevel": "로그 수준 설정",
-+>>>>>>> .their
- 	"trace": "Trace",
- 	"debug": "디버그",
- 	"info": "정보",
- 	"warn": "경고",
- 	"err": "오류",
- 	"critical": "Critical",
-+<<<<<<< .our
- 	"off": "Off",
- 	"selectLogLevel": "로그 수준 선택",
- 	"default and current": "기본값 및 현재",
- 	"default": "기본값",
- 	"current": "현재"
-+=======
-+	"off": "Off"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f9e867de14d4dfeed9a8cddbe7b34f6cb7164ee5 i18n/kor/src/vs/workbench/parts/markers/common/messages.i18n.json
-  our    100644 96ac7a8193ddf876a2dd0c0ad04713fa5d3664fb i18n/kor/src/vs/workbench/parts/markers/common/messages.i18n.json
-  their  100644 f0b9f22340cc989ca63f6d483137c0ae88c877c3 i18n/kor/src/vs/workbench/parts/markers/common/messages.i18n.json
-@@ -7,8 +7,11 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"viewCategory": "보기",
-+<<<<<<< .our
- 	"problems.view.toggle.label": "문제 토글(오류, 경고, 정보)",
- 	"problems.view.focus.label": "포커스 문제(오류, 경고, 정보)",
-+=======
-+>>>>>>> .their
- 	"problems.panel.configuration.title": "문제 보기",
- 	"problems.panel.configuration.autoreveal": "문제 보기를 열 때 문제 보기에 자동으로 파일이 표시되어야 하는지를 제어합니다.",
- 	"markers.panel.title.problems": "문제",
-added in both
-  our    100644 1b45ff7d9277ac5b9d1a2428fbd68f7a6aa6726c i18n/kor/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-  their  100644 921f1b58efc5319968ac9a325ddceb07bdc09aad i18n/kor/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -11,4 +12,16 @@
- 	"viewCategory": "보기",
- 	"clearOutput.label": "출력 내용 지우기",
- 	"openActiveLogOutputFile": "보기: 활성 로그 출력 파일 열기"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"output": "출력",
-+	"logViewer": "로그 표시기",
-+	"viewCategory": "보기",
-+	"clearOutput.label": "출력 내용 지우기"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 675dfcdef1543f7d95350e3767211a37bcdaabf5 i18n/kor/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-  their  100644 9261a8ba1e2aa92f3ce85128d06cb57d3cea7e85 i18n/kor/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,13 @@
- 	],
- 	"output": "{0} - 출력",
- 	"channel": "'{0}'에 대한 출력 채널"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"output": "{0} - 출력"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 188fd9c37dab70a07e044f3acd7af0dbac94f1fb i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 a8bd67a28f391e840f7a35323a824c51031c0c11 i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 9dc8bd95b1fd2faa72e49f874b1b93bcc4d2a847 i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"defaultSettings": "설정을 오른쪽 편집기에 넣어서 덮어씁니다.",
- 	"noSettingsFound": "설정을 찾을 수 없습니다.",
- 	"settingsSwitcherBarAriaLabel": "설정 전환기",
-changed in both
-  base   100644 de4c67a1e309bee8918b8b47fe850519106e3a5f i18n/kor/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  our    100644 9d01c25ee379b65a93a0db2fa71c9ac23d6dc2ba i18n/kor/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  their  100644 90960b4f14df0be59da277d2ef17c628c8281345 i18n/kor/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-changed in both
-  base   100644 0be24d926bb109d9b6513cff06fd02cf2d9e582d i18n/kor/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  our    100644 648ba46bbdb4258ba2811ebb0a8e4fd73f3afd8c i18n/kor/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  their  100644 c631d0cd782a4f86aa6b89af2f4e3d33d8a58195 i18n/kor/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"view": "보기",
- 	"commandsHandlerDescriptionDefault": "명령 표시 및 실행",
- 	"gotoLineDescriptionMac": "줄 이동",
-changed in both
-  base   100644 4b848835e917596b00ac1d10a906244611a01da8 i18n/kor/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  our    100644 073f844e7848ee2b0e2748bc20d2dbf992c527a9 i18n/kor/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  their  100644 29d19883f06e86f0844644b0d0b8f3ee5525ab9e i18n/kor/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-@@ -10,8 +10,12 @@
- 	"source control": "소스 제어",
- 	"toggleSCMViewlet": "SCM 표시",
- 	"view": "보기",
-+<<<<<<< .our
- 	"scmConfigurationTitle": "SCM",
- 	"alwaysShowProviders": "소스 제어 공급자 부분을 항상 표시할지의 여부",
- 	"diffDecorations": "편집기에서 차이점 장식을 제어합니다.",
- 	"diffGutterWidth": "여백에서 차이점 장식의 너비(px)를 제어합니다(추가 및 수정됨)."
-+=======
-+	"scmConfigurationTitle": "SCM"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 b045a022b2727df2c0cc63f7e9cda6b8fec6a04e i18n/kor/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 071d294ccc8fe4437d151c87e9b3a4d19cd1a8d5 i18n/kor/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 68680603aada9fac8f8164953f0ec5f12e06b0d6 i18n/kor/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-changed in both
-  base   100644 9b239f6fd5f9008bb0b725a14f7d3a6db63c34a2 i18n/kor/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 b8f4fa84a25213fae0e380ab22868cdef4e860d3 i18n/kor/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 bbdbfe7784606ea6b208d775b1a31e9867c6e403 i18n/kor/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -16,7 +16,12 @@
- 	"findInWorkspace": "작업 영역에서 찾기...",
- 	"showTriggerActions": "작업 영역에서 기호로 이동...",
- 	"name": "검색",
-+<<<<<<< .our
- 	"showSearchViewl": "검색 표시",
-+=======
-+	"search": "검색",
-+	"showSearchViewlet": "검색 표시",
-+>>>>>>> .their
- 	"view": "보기",
- 	"findInFiles": "파일에서 찾기",
- 	"openAnythingHandlerDescription": "파일로 이동",
-added in both
-  our    100644 aa0416d884efba14871042b317d2778897688fd4 i18n/kor/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-  their  100644 37d5355620e8211aa261ddb94de67d4926a21815 i18n/kor/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -13,5 +14,14 @@
- 	"new.global.sep": "새 코드 조각",
- 	"openSnippet.pickLanguage": "코드 조각 파일 선택 또는 코드 조각 만들기",
- 	"openSnippet.label": "사용자 코드 조각 구성",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"global.1": "({0})",
-+>>>>>>> .their
- 	"preferences": "기본 설정"
- }
-\ No newline at end of file
-changed in both
-  base   100644 582f284bf105ba2ba12fd77c5e61870ad29a9e51 i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  our    100644 c3fc6b2dfd0ffa3761c492bddaef2c73abf54e0d i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  their  100644 7a0857e6f8db197acee7033ae0953aae216ecdd0 i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"snippetSchema.json.default": "빈 코드 조각",
- 	"snippetSchema.json": "사용자 코드 조각 구성",
- 	"snippetSchema.json.prefix": "IntelliSense에서 코드 조각을 선택할 때 사용할 접두사입니다.",
-added in both
-  our    100644 aab78fb22a41e48d45fdcc8647715d2bb747131a i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-  their  100644 587455cd532ab711c9767b3e0d1972dec0d85fce i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,5 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"source.snippetGlobal": "전역 사용자 코드 조각",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"source.snippet": "사용자 코드 조각"
- }
-\ No newline at end of file
-changed in both
-  base   100644 c423047529b1d2dae016299bae1ec0ca95c817e6 i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  our    100644 4bb4deec5c3699ac48cd50b00a644c268e111a10 i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 b33ab06f4bb9c93940966027afdff9513d921d9e i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,9 @@
- 	],
- 	"invalid.path.0": "`contributes.{0}.path`에 문자열이 필요합니다. 제공된 값: {1}",
- 	"invalid.language.0": "언어를 생략하는 경우 `contributes.{0}.path` 값은 `.code-snippets`-file이어야 합니다. 제공된 값: {1}",
-+=======
-+	"invalid.path.0": "`contributes.{0}.path`에 문자열이 필요합니다. 제공된 값: {1}",
-+>>>>>>> .their
- 	"invalid.language": "`contributes.{0}.language`에 알 수 없는 언어가 있습니다. 제공된 값: {1}",
- 	"invalid.path.1": "확장 폴더({2})에 포함할 `contributes.{0}.path`({1})가 필요합니다. 확장이 이식 불가능해질 수 있습니다.",
- 	"vscode.extension.contributes.snippets": "코드 조각을 적용합니다.",
-changed in both
-  base   100644 32869d5021697b6a3ae2a49d5c06af5f67762158 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 d9e00ba07827f3430d124e149c098a234044e854 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 8483a433151216aa9fbf3fddaedcf0a31a55c803 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -10,7 +10,11 @@
- 	"terminal.foreground": "터미널의 전경색입니다.",
- 	"terminalCursor.foreground": "터미널 커서의 전경색입니다.",
- 	"terminalCursor.background": "터미널 커서의 배경색입니다. 블록 커서와 겹친 문자의 색상을 사용자 정의할 수 있습니다.",
-+<<<<<<< .our
- 	"terminal.selectionBackground": "터미널의 선택 영역 배경색입니다.",
- 	"terminal.border": "터미널 내의 분할 창을 구분하는 테두리의 색입니다. 기본값은 panel.border입니다.",
- 	"terminal.ansiColor": "터미널의 '{0}' ANSI 색상"
-+=======
-+	"terminal.selectionBackground": "터미널의 선택 영역 배경색입니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 b21bf5b25fa6ac48731ec0b42b544e7b23fdfda9 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  our    100644 444b81d0780111787d9f82a5eb6b8366a4b685f3 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  their  100644 ed40b3753394864ef40b2a9c63498f1501b3b57f i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-@@ -8,7 +8,11 @@
- 	],
- 	"terminal.integrated.chooseWindowsShellInfo": "사용자 지정 단추를 선택하여 기본 터미널 셸을 변경할 수 있습니다.",
- 	"customize": "사용자 지정",
-+<<<<<<< .our
- 	"never again": "다시 표시 안 함",
-+=======
-+	"cancel": "취소",
-+>>>>>>> .their
- 	"terminal.integrated.chooseWindowsShell": "기본으로 설정할 터미널 셸을 선택하세요. 나중에 설정에서 이 셸을 변경할 수 있습니다.",
- 	"terminalService.terminalCloseConfirmationSingular": "활성 터미널 세션이 있습니다. 종료할까요?",
- 	"terminalService.terminalCloseConfirmationPlural": "{0}개의 활성 터미널 세션이 있습니다. 종료할까요?"
-changed in both
-  base   100644 bb502a90cb606760056865a84c2a991300ed2f22 i18n/kor/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 46a0013cd0e5a09c5cae294dfef72bf6b6e0aeef i18n/kor/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 485a7f763c870063998c2a9d386904611161858e i18n/kor/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -26,7 +26,10 @@
- 	"commandPalette": "명령 팔레트...",
- 	"settings": "설정",
- 	"keyboardShortcuts": "바로 가기 키(&&K)",
-+<<<<<<< .our
- 	"showExtensions": "확장 관리",
-+=======
-+>>>>>>> .their
- 	"userSnippets": "사용자 코드 조각",
- 	"selectTheme.label": "색 테마",
- 	"themes.selectIconTheme.label": "파일 아이콘 테마",
-changed in both
-  base   100644 d48fe3d053ed2dc38f5bddbada7b2a82ca715bee i18n/kor/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  our    100644 ef565fe453fde1417671d5ced994cfb294239811 i18n/kor/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  their  100644 196d40bcdb55e2b6de392be49b76cfbba6e8b513 i18n/kor/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,4 +14,9 @@
- 	"fileBinaryError": "파일이 이진인 것 같으므로 테스트로 열 수 없습니다.",
- 	"err.create": "{0} 파일을 만들지 못했습니다.",
- 	"fileMoveConflict": "이동/복사할 수 없습니다. 대상에 파일이 이미 있습니다."
-+=======
-+	"fileIsDirectoryError": "파일이 디렉터리입니다.",
-+	"fileNotModifiedError": "파일 수정 안 됨",
-+	"fileBinaryError": "파일이 이진인 것 같으므로 테스트로 열 수 없습니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 db19c348ac824e0b0faff0e1b2a9b016e51cc366 i18n/kor/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  our    100644 cbccbeec8141420ec8797d51e0c293b63dfc8bd6 i18n/kor/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  their  100644 56bf06242e355541f4f9b47bca9f6f6590c3b18e i18n/kor/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-changed in both
-  base   100644 d365ddcbff536cb02d8bff0768789adcc4a138ec i18n/kor/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 d97177c41e4a5031dad60cb0cfff30a1e2f28fd5 i18n/kor/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 ae661bf418711d1e853152b9f7ccefff653eea06 i18n/kor/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-changed in both
-  base   100644 e836eb6be3f6f1b36ea5bc50a8ee77b81f58c92e i18n/kor/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  our    100644 61519fa8e49ab82b98366279c3dfb35de603779e i18n/kor/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  their  100644 a2425123fe5cb812caec31e8b43b97d7848e805a i18n/kor/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-@@ -8,5 +8,10 @@
- 	],
- 	"errorInvalidTaskConfiguration": "작업 영역 구성 파일에 쓸 수 없습니다. 파일을 열고 오류/경고를 수정한 다음 다시 시도하세요.",
- 	"errorWorkspaceConfigurationFileDirty": "파일이 변경되어 작업 영역 구성 파일에 쓸 수 없습니다. 저장하고 다시 시도하세요.",
-+<<<<<<< .our
- 	"openWorkspaceConfigurationFile": "작업 영역 구성 열기"
-+=======
-+	"openWorkspaceConfigurationFile": "작업 영역 구성 파일 열기",
-+	"close": "닫기"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 1c3c1cf318dae2f4a85b2bddce7f29366680009c i18n/ptb/extensions/git/out/autofetch.i18n.json
-  our    100644 00c05e0d65e0882e3be75520f80b85335bfeee15 i18n/ptb/extensions/git/out/autofetch.i18n.json
-  their  100644 5df527f070d346afba2e40468e55b4c12ce6cef6 i18n/ptb/extensions/git/out/autofetch.i18n.json
-@@ -7,7 +7,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"yes": "Sim",
-+	"read more": "Ler Mais",
- 	"no": "Não",
- 	"not now": "Pergunte-me depois",
-+<<<<<<< .our
- 	"suggest auto fetch": "Você gostaria que o Code [execute periodicamente o 'git fetch']({0})?"
-+=======
-+	"suggest auto fetch": "Você gostaria que o Code executasse periodicamente `git fetch`?"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 03a6223ad1dc3fa3e7fafa7e02188183242602fc i18n/ptb/extensions/git/out/commands.i18n.json
-  our    100644 614b7d0fe2aa5964fe65add6e8d1ab893a154db4 i18n/ptb/extensions/git/out/commands.i18n.json
-  their  100644 c75b803004751bec12b2b40a66553d8895b80237 i18n/ptb/extensions/git/out/commands.i18n.json
-@@ -68,12 +68,19 @@
- 	"pick remote pull repo": "Selecione um remoto para efeutar o pull da ramificação",
- 	"no remotes to push": "O seu repositório não possui remotos configurados para efetuar push.",
- 	"nobranch": "Por favor, faça checkout em um ramo para fazer push em um remoto.",
-+<<<<<<< .our
- 	"confirm publish branch": "O branch '{0}' não possui um branch superior. Você quer publicar este branch?",
- 	"ok": "OK",
- 	"push with tags success": "Envio de rótulos finalizado com sucesso.",
- 	"pick remote": "Pegue um  remoto para publicar o ramo '{0}':",
- 	"sync is unpredictable": "Esta ação vai empurrar e puxar commits de e para '{0}/{1}'.",
- 	"never again": "OK, Não Mostrar Novamente",
-+=======
-+	"ok": "OK",
-+	"push with tags success": "Envio de rótulos finalizado com sucesso.",
-+	"pick remote": "Pegue um  remoto para publicar o ramo '{0}':",
-+	"sync is unpredictable": "Esta ação vai fazer push e pull nos commits de e para '{0}'.",
-+>>>>>>> .their
- 	"no remotes to publish": "Seu repositório não possui remotos configurados para publicação.",
- 	"no changes stash": "Não há nenhuma mudança para esconder.",
- 	"provide stash message": "Opcionalmente forneça uma mensagem para esconder.",
-changed in both
-  base   100644 214c9e1d36f08c8508004ac99a370a4a0aac98f5 i18n/ptb/extensions/git/out/repository.i18n.json
-  our    100644 ee4b84c24042f8a1bb30756b849d017dd6de9b1e i18n/ptb/extensions/git/out/repository.i18n.json
-  their  100644 df6cf8fd75102fcff3ba16749971c925774c27c0 i18n/ptb/extensions/git/out/repository.i18n.json
-@@ -28,8 +28,12 @@
- 	"merge changes": "Mesclar Alterações",
- 	"staged changes": "Alterações em Etapas",
- 	"changes": "Alterações",
-+<<<<<<< .our
- 	"commitMessageCountdown": "{0} caracteres restantes na linha atual",
- 	"commitMessageWarning": "{0} caracteres sobre {1} na linha atual",
-+=======
-+	"ok": "OK",
-+>>>>>>> .their
- 	"neveragain": "Não mostrar novamente",
- 	"huge": "O repositório git em '{0}' tem muitas atualizações ativas, somente um subconjunto de funcionalidades do Git será habilitado."
- }
-\ No newline at end of file
-changed in both
-  base   100644 81db50ac04f6bd43a62124176541dbaf62a751f6 i18n/ptb/extensions/git/package.i18n.json
-  our    100644 6ab84324adbad521926986bc352591224f0e601f i18n/ptb/extensions/git/package.i18n.json
-  their  100644 d92673284f64184c0ce5eb14c29251bbf986c237 i18n/ptb/extensions/git/package.i18n.json
-added in both
-  our    100644 43bfcb4644a79d71f0381001a2872f48c763e21f i18n/ptb/extensions/typescript/out/commands.i18n.json
-  their  100644 01c9f9ae0d97df7568082a2eee2d90a7de8e0794 i18n/ptb/extensions/typescript/out/commands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -13,4 +14,20 @@
- 	"typescript.noJavaScriptProjectConfig": "O arquivo não é parte do projeto JavaScript. Clique [aqui]({0}) para mais informações.",
- 	"typescript.configureTsconfigQuickPick": "Configurar tsconfig.json",
- 	"typescript.configureJsconfigQuickPick": "Configurar jsconfig.json"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"typescript.projectConfigNoWorkspace": "Favor abrir uma pasta no VS Code para usar um projeto TypeScript ou JavaScript",
-+	"typescript.projectConfigUnsupportedFile": "Não foi possível determinar o projeto TypeScript ou JavaScript. Tipo de arquivo não suportado",
-+	"typescript.projectConfigCouldNotGetInfo": "Não foi possível determinar o projeto TypeScript ou JavaScript",
-+	"typescript.noTypeScriptProjectConfig": "Arquivo não é parte de um projeto TypeScript",
-+	"typescript.noJavaScriptProjectConfig": "Arquivo não é parte de um projeto JavaScript",
-+	"typescript.configureTsconfigQuickPick": "Configurar tsconfig.json",
-+	"typescript.configureJsconfigQuickPick": "Configurar jsconfig.json",
-+	"typescript.projectConfigLearnMore": "Saiba Mais"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 750d811d866eaa3d43818bd1d8e28c9898acf514 i18n/ptb/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-  their  100644 ed15423097d5cbb03aeb8c474db3877ca0d1584f i18n/ptb/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"selectAriaOption": "{0}"
- }
-\ No newline at end of file
-added in both
-  our    100644 0e0f9b95d0edd6dc40d681d7546a779f946426db i18n/ptb/src/vs/base/node/ps.i18n.json
-  their  100644 e8b9b91a595a2dff9f06115e9c4fae55fbbd1b8d i18n/ptb/src/vs/base/node/ps.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"collecting": "Coletando informações de CPU e memória. Isso pode demorar alguns segundos."
- }
-\ No newline at end of file
-changed in both
-  base   100644 52ffce48a73d152ac7b3fed7adaa27517ed61e3d i18n/ptb/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 6c41dd22a5af7308ee2eafe191d717bc6243ff1f i18n/ptb/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 3e9436d02bf817fc555ccdb3a8af651d3c3b9c74 i18n/ptb/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -16,6 +16,10 @@
- 	"lineNumbers.on": "Números de linhas são renderizados em números absolutos.",
- 	"lineNumbers.relative": "Números de linhas são renderizadas como distância em linhas até a posição do cursor.",
- 	"lineNumbers.interval": "Números de linhas são renderizados a cada 10 linhas.",
-+<<<<<<< .our
-+=======
-+	"lineNumbers": "Controla a exibição dos números de linha. Os valores possíveis são 'on', 'off', 'relative' e 'interval'.",
-+>>>>>>> .their
- 	"rulers": "Renderiza réguas verticais após um certo número de caracteres de espaço. Use vários valores para várias réguas. Réguas não serão desenhadas se a matriz estiver vazia",
- 	"wordSeparators": "Caracteres que serão usados como separadores de palavras ao fazer navegação relacionada a palavras ou operações",
- 	"tabSize": "O número de espaços equivalentes a uma tabulação. Esta configuração é sobreposta com base no conteúdo do arquivo quando `editor.detectIndentation` está ligado.",
-@@ -78,7 +82,11 @@
- 	"cursorBlinking": "Controla o estilo de animação do cursor.",
- 	"mouseWheelZoom": "Alterar o zoom da fonte editor quando utilizada a roda do mouse e pressionando Ctrl",
- 	"cursorStyle": "Controla o estilo do cursor, os valores aceitos são 'block', 'block-outline', 'line', 'line-thin', 'underline' e 'underline-thin'",
-+<<<<<<< .our
- 	"cursorWidth": "Controla a largura do cursor quando editor.cursorStyle está definido como 'line'",
-+=======
-+	"lineCursorWidth": "Controla a largura do cursor quando editor.cursorStyle está definido como 'line'",
-+>>>>>>> .their
- 	"fontLigatures": "Habilita ligaduras de fontes",
- 	"hideCursorInOverviewRuler": "Controla se o cursor deve ficar oculto na régua de visão geral.",
- 	"renderWhitespace": "Controla como o editor deve rendenizar caracteres de espaços em branco, possibilidades são 'none', 'boundary' e 'all'. A opção 'boundary' não rendeniza espaços simples entre palavras.",
-changed in both
-  base   100644 434fe65993d9b4ecc14018b297b3c72b70a49c24 i18n/ptb/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 94d4e2ad2eeafdadb40b9a7361c52cda20aa5187 i18n/ptb/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 5134c6e6945eac669197770b3357f78dab5c83b1 i18n/ptb/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -8,8 +8,11 @@
- 	],
- 	"lineHighlight": "Cor de fundo para a posição do cursor  na seleção de linhas.",
- 	"lineHighlightBorderBox": "Cor de fundo para a borda em volta da linha na posição do cursor",
-+<<<<<<< .our
- 	"rangeHighlight": "Cor de fundo dos intervalos selecionados, assim como da abertura instantânea e localização de recursos. A cor não deve ser opaca para evitar esconder as decorações subjacentes",
- 	"rangeHighlightBorder": "Cor de fundo para a borda em volta do intervalo destacado.",
-+=======
-+>>>>>>> .their
- 	"caret": "Cor do cursor no editor.",
- 	"editorCursorBackground": "A cor de fundo do cursor do editor. Permite customizar a cor de um caractere sobreposto pelo bloco do cursor.",
- 	"editorWhitespaces": "Cor dos caracteres em branco no editor",
-changed in both
-  base   100644 d05aeee6c34a13b81b7adcfba031b88757f57331 i18n/ptb/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  our    100644 517488c6efedf7334bd0de67d967b57d25fa5312 i18n/ptb/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  their  100644 e6fba46dfd7c9d35d40b005547b29ac347881f0d i18n/ptb/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -9,4 +10,11 @@
- 	"markerAction.next.label": "Ir para o Próximo Problema (Erro, Aviso, Informação)",
- 	"markerAction.previous.label": "Ir para o Problema Anterior (Erro, Aviso, Informação)",
- 	"markerAction.nextInFiles.label": "Ir para Próximo Problema nos Aquivos (Erro, Aviso, Info)"
-+=======
-+	"title.wo_source": "({0}/{1})",
-+	"editorMarkerNavigationError": "Ferramenta de marcação de edição apresentando error na cor ",
-+	"editorMarkerNavigationWarning": "Ferramenta de marcação de edição apresentando adventência na cor",
-+	"editorMarkerNavigationInfo": "Cor de informação da ferramenta de navegação do marcador do editor.",
-+	"editorMarkerNavigationBackground": "Cor de fundo da ferramenta de marcação de navegação do editor."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6ccc873b02c525f36b274892c1587125f6f8687a i18n/ptb/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  our    100644 1c858bde51cdbd3b27000ce6a2b87452b5ad125f i18n/ptb/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  their  100644 99acb12e285a8c2b521bba90e6efa4e94212b58b i18n/ptb/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,12 @@
- 	"wordHighlightStrongBorder": "Cor de fundo de um símbolo durante acesso de escrita, como ao escrever uma variável.",
- 	"overviewRulerWordHighlightForeground": "Visão geral da cor do marcador da régua para destaques de símbolos. A cor não deve ser opaca para não esconder decorações subjacentes.",
- 	"overviewRulerWordHighlightStrongForeground": "Visão geral da cor do marcador da régua para destaques de símbolos de acesso de escrita. A cor não deve ser opaca para não esconder decorações subjacentes.",
-+=======
-+	"wordHighlight": "Cor de fundo de um símbolo durante o acesso de leitura, como ao ler uma variável. A cor não deve ser opaca para não ocultar as decorações subjacentes.",
-+	"wordHighlightStrong": "Cor de fundo de um símbolo durante o acesso de escrita, como ao escrever uma variável. A cor não deve ser opaca para não ocultar as decorações subjacentes.",
-+	"overviewRulerWordHighlightForeground": "Visão geral da cor do marcador da régua para destaques de símbolos.",
-+	"overviewRulerWordHighlightStrongForeground": "Visão geral da cor do marcador da régua para gravação de destaques de símbolos.",
-+>>>>>>> .their
- 	"wordHighlight.next.label": "Ir para o próximo símbolo em destaque",
- 	"wordHighlight.previous.label": "Ir para o símbolo de destaque anterior"
- }
-\ No newline at end of file
-changed in both
-  base   100644 28adcb870653d4e3ae4406b036a344f8ed678e46 i18n/ptb/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  our    100644 2aa222eaf70279b60b151ccffab51a1ed5b7a7ab i18n/ptb/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  their  100644 5ade9a9290cd57c4001dbf09c55d2173113b8182 i18n/ptb/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 ed9e5aca99ca21666c8f46c0690781a42cad37c6 i18n/ptb/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 a3aea9d9c8c0805d0052884c40ebb83b3447e311 i18n/ptb/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 e056838d01991d7878a55297a08ccd1179a6bdfa i18n/ptb/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,11 +10,19 @@
- 	"diff": "Comparar dois arquivos entre si.",
- 	"add": "Adicione pasta(s) para a última janela ativa.",
- 	"goto": "Abra um arquivo no caminho sobre a linha especificada e a posição do caractere.",
-+<<<<<<< .our
- 	"newWindow": "Obriga a abrir uma nova janela.",
- 	"reuseWindow": "Obriga a abrir um arquivo ou pasta na última janela ativa.",
- 	"wait": "Espere pelos arquivos a serem fechados antes de retornar.",
- 	"locale": "Para localização utilize (ex. en-US ou zh-TW).",
- 	"userDataDir": "Especifica o diretório em que os dados do usuário são mantidos. Pode ser usado para abrir várias instâncias distintas do Code.",
-+=======
-+	"newWindow": "Força uma nova instância do Código.",
-+	"reuseWindow": "Forçar a abertura de um arquivo ou pasta na última janela ativa",
-+	"wait": "Espere pelos arquivos a serem fechados antes de retornar.",
-+	"locale": "Para localização utilize (ex. en-US ou zh-TW).",
-+	"userDataDir": "Especifica o diretório que os dados do usuário serão mantidos, útil quando estiver rodando como root.",
-+>>>>>>> .their
- 	"version": "Versão de impressão",
- 	"help": "Uso de impressão.",
- 	"extensionHomePath": "Defina o caminho raíz para as extensões.",
-@@ -22,18 +30,28 @@
- 	"showVersions": "Exibir versões de extensões instaladas, quando estiver usando --list-extension",
- 	"installExtension": "Instala uma extensão.",
- 	"uninstallExtension": "Desinstala uma extensão.",
-+<<<<<<< .our
- 	"experimentalApis": "Habilita recursos propostos a API para uma extensão.",
-+=======
-+	"experimentalApis": "Permite recursos de api propostos para uma extensão.",
-+>>>>>>> .their
- 	"verbose": "Imprimir a saída detalhada (Implica -- esperar).",
- 	"log": "Nível de log a ser utilizado. O padrão é 'info'. Os valores permitidos são 'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off'.",
- 	"status": "Utilização do processo de impressão e informações de diagnóstico.",
- 	"performance": "Comece com o 'Desenvolvedor: Desempenho de inicialização' comando habilitado.",
- 	"prof-startup": "Rodar o CPU profiler durante a inicialização",
- 	"disableExtensions": "Desabilita todas as extensões instaladas.",
-+<<<<<<< .our
- 	"inspect-extensions": "Permite a depuração e profiling de extensões. Verifique as ferramentas de desenvolvedor para obter o URI da conexão.",
- 	"inspect-brk-extensions": "Permite a depuração e profiling de extensões com o host de extensão sendo pausado após o início. Verifique as ferramentas de desenvolvedor para obter o URI da conexão.",
- 	"disableGPU": "Desabilita aceleração de hardware via GPU.",
- 	"uploadLogs": "Envia os registros de atividade da sessão atual para um destino seguro.",
- 	"maxMemory": "Tamanho máximo de memória para uma janela (em Mbytes).",
-+=======
-+	"inspect-extensions": "Permite depuração e criação de perfis de extensões. Verifique as ferramentas de desenvolvimento para a conexão uri.",
-+	"inspect-brk-extensions": "Permitir depuração e criação de perfil de extensões com o host de extensão em pausa após o início. Verifique as ferramentas do desenvolvedor para a conexão uri.",
-+	"disableGPU": "Desabilita aceleração de hardware da GPU.",
-+>>>>>>> .their
- 	"usage": "Uso",
- 	"options": "opções",
- 	"paths": "caminhos",
-changed in both
-  base   100644 98c0be5cdcba42bc256b1b304f3886d6898a0abc i18n/ptb/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 69dfaa48d2b66f351d8413f62573d04c105f2c85 i18n/ptb/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 4fe84adc13b1a146d56e91d6e36f6e80c08c3677 i18n/ptb/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -7,12 +7,16 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"invalidManifest": "Extensão inválida: pacote.json nao é um arquivo JSON válido",
-+<<<<<<< .our
- 	"incompatible": "Não é possível instalar a Extensão '{0}' que não é compatível com o Code '{1}'.",
-+=======
-+>>>>>>> .their
- 	"restartCode": "Por favor reinicie Code antes de reinstalar {0}.",
- 	"installingOutdatedExtension": "Uma nova versão desta extensão já está instalada. Você deseja sobrescrever esta instalação com a versão mais antiga?",
- 	"override": "Sobrescrever",
- 	"cancel": "Cancelar",
- 	"errorInstallingDependencies": "Erro ao instalar dependências. {0}",
-+<<<<<<< .our
- 	"MarketPlaceDisabled": "Loja não está habilitada.",
- 	"removeError": "Erro ao remover a extensão: {0}. por favor, Saia e Inicie o VS Code antes de tentar novamente.",
- 	"Not a Marketplace extension": "Somente Extensões da Loja podem ser reinstaladas",
-@@ -22,6 +26,12 @@
- 	"quitCode": "Não foi possível instalar a extensão. Por favor, saia e reinicie o VS Code antes de reinstalar.",
- 	"exitCode": "Não foi possível instalar a extensão. Por favor, saia e reinicie o VS Code antes de reinstalar.",
- 	"renameError": "Erro desconhecido ao renomear {0} para {1}",
-+=======
-+	"notFoundCompatible": "Não foi possível instalar '{0}; não existe nenhuma versão compatível com o VSCode '{1}'.",
-+	"notFoundCompatibleDependency": "Não foi possível instalar porque a extensão dependente '{0}' compatível com a versão atual '{1}' do VS Code não foi encontrada.",
-+	"quitCode": "Não foi possível instalar a extensão. Por favor, saia e reinicie o VS Code antes de reinstalar.",
-+	"exitCode": "Não foi possível instalar a extensão. Por favor, saia e reinicie o VS Code antes de reinstalar.",
-+>>>>>>> .their
- 	"uninstallDependeciesConfirmation": "Gostaria de desinstalar '{0}' somente, ou suas dependências também?",
- 	"uninstallOnly": "Somente Extensão",
- 	"uninstallAll": "Desinstalar Tudo",
-changed in both
-  base   100644 620c63edd0712ec1f8e8ed3fd061052a203859db i18n/ptb/src/vs/platform/message/common/message.i18n.json
-  our    100644 c464e8e6468d6dd5a8aa69855b8084ea3e7674b0 i18n/ptb/src/vs/platform/message/common/message.i18n.json
-  their  100644 0d24937956e242f5314fd3ff6693f9cafad48fbd i18n/ptb/src/vs/platform/message/common/message.i18n.json
-changed in both
-  base   100644 6f399a88a062458966ee84c4fa6ba3fd75c261c6 i18n/ptb/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 260c1b4a3e4eca5d178e7a38ec6a34692e2a3d10 i18n/ptb/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 635a04864dac99ea99fe504d8e870cc79fded8fa i18n/ptb/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -64,6 +64,7 @@
- 	"editorSelectionBackground": "Cor de seleção do editor.",
- 	"editorSelectionForeground": "Cor do texto selecionado para alto contraste.",
- 	"editorInactiveSelection": "Cor da seleção em um editor inativo. A cor não deve ser opaca para não esconder decorações subjacentes.",
-+<<<<<<< .our
- 	"editorSelectionHighlight": "Cor para regiões com o mesmo conteúdo da seleção. A cor não deve ser opaca para não esconder decorações subjacentes.",
- 	"editorSelectionHighlightBorder": "Cor da borda para regiões com o mesmo conteúdo da seleção.",
- 	"editorFindMatch": "Cor da correspondência de pesquisa atual.",
-@@ -72,6 +73,9 @@
- 	"findMatchHighlightBorder": "Cor da borda dos outros resultados de pesquisa.",
- 	"findRangeHighlightBorder": "Cor da borda da faixa limitando a pesquisa. A cor não deve ser opaca para não esconder decorações subjacentes.",
- 	"hoverHighlight": "Destaque abaixo da palavra para qual um flutuador é mostrado. A cor não deve ser opaca para não esconder decorações subjacentes.",
-+=======
-+	"editorFindMatch": "Cor da correspondência de pesquisa atual.",
-+>>>>>>> .their
- 	"hoverBackground": "Cor de fundo para o item flutuante do editor",
- 	"hoverBorder": "Cor da borda para o item flutuante do editor.",
- 	"activeLinkForeground": "Cor dos links ativos.",
-@@ -79,11 +83,14 @@
- 	"diffEditorRemoved": "Cor de fundo para o texto que foi removido. A cor não deve ser opaca para não esconder as decorações subjacentes.",
- 	"diffEditorInsertedOutline": "Cor de contorno para o texto que foi inserido.",
- 	"diffEditorRemovedOutline": "Cor de contorno para o texto que foi removido.",
-+<<<<<<< .our
- 	"mergeCurrentHeaderBackground": "Fundo do cabeçalho atual em conflitos de merge inline. A cor não deve ser opaca para não esconder decorações subjacentes.",
- 	"mergeCurrentContentBackground": "Fundo do conteúdo atual em conflitos de merge inline. A cor não deve ser opaca para não esconder decorações subjacentes.",
- 	"mergeIncomingHeaderBackground": "Fundo do cabeçalho entrante em conflitos de merge inline. A cor não deve ser opaca para não esconder decorações subjacentes.",
- 	"mergeIncomingContentBackground": "Fundo do conteúdo entrante em conflitos de merge inline. A cor não deve ser opaca para não esconder decorações subjacentes.",
- 	"mergeCommonHeaderBackground": "Fundo comum do cabeçalho antepassado em conflitos de merge inline. A cor não deve ser opaca para não esconder decorações subjacentes.",
-+=======
-+>>>>>>> .their
- 	"mergeBorder": "Cor da borda dos cabeçalhos e separadores estão em conflito de mesclagem em linha.",
- 	"overviewRulerCurrentContentForeground": "Cor de fundo de régua de visuaização atual em conflito de mesclagem em linha.",
- 	"overviewRulerIncomingContentForeground": "Cor de fundo de régua de visuaização de entrada em conflito de mesclagem em linha.",
-added in both
-  our    100644 bc8cba57378baaa6f56bf615b25d25924d3fc6bd i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 d2677dfdc5bb12f42952f80c2bb038263388db27 i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"saveParticipants": "Executando Salvamento de Participantes..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 d5ca67a93536092670de28815cfbc255646ab541 i18n/ptb/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  our    100644 fdc114a3fe784668b6e07f90806247b6f632760b i18n/ptb/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  their  100644 a2c9cbd217b120f8d5a7394ccc7792bc346a7d2f i18n/ptb/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,7 @@
- 	],
- 	"treeView.notRegistered": "Nenhuma visualização de árvore com id '{0}' registrado.",
- 	"treeView.duplicateElement": "Elemento com id {0} já está registrado"
-+=======
-+	"treeView.notRegistered": "Nenhuma visualização de árvore com id '{0}' registrado."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 18546fb98ab625419dd84bac49ca35f309af3013 i18n/ptb/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 c0131be8c0f47591731287a576edb83735664081 i18n/ptb/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 84f170bd32cdf44ccc40d883dd19f0fcc17151b1 i18n/ptb/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -14,5 +14,10 @@
- 	"save": "&&Salvar",
- 	"saveWorkspace": "Salvar o espaço de trabalho",
- 	"openWorkspaceAction": "Abrir o Espaço de Trabalho...",
-+<<<<<<< .our
- 	"openWorkspaceConfigFile": "Abrir o Arquivo de Configuração do Espaço de Trabalho"
-+=======
-+	"openWorkspaceConfigFile": "Abrir o Arquivo de Configuração do Espaço de Trabalho",
-+	"openFolderAsWorkspaceInNewWindow": "Abrir a pasta como espaço de trabalho em nova janela"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 2ea045e264ea8c57f7acbaf1332256e858eb5741 i18n/ptb/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-  their  100644 fdb629550fd654b577693a6edfff709633cff317 i18n/ptb/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,4 +11,15 @@
- 	"add": "&&Adicionar",
- 	"addFolderToWorkspaceTitle": "Adicionar pasta ao espaço de trabalho",
- 	"workspaceFolderPickerPlaceholder": "Selecione a pasta do espaço de trabalho"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"addFolderToWorkspace": "Adicionar pasta ao espaço de trabalho...",
-+	"add": "&&Adicionar",
-+	"addFolderToWorkspaceTitle": "Adicionar pasta ao espaço de trabalho"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d1d8a425227b67eb3258b7844077d91f032f4f0d i18n/ptb/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  our    100644 3991d555141b86ae4264c724195d522ff4374831 i18n/ptb/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  their  100644 c1dd3fcfe9b93d4826601a319a92daa27bd50f2b i18n/ptb/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-@@ -19,6 +19,7 @@
- 	"close": "Fechar",
- 	"closeOthers": "Fechar Outros",
- 	"closeRight": "Fechar à direita",
-+<<<<<<< .our
- 	"closeAllSaved": "Fechar Salvos",
- 	"closeAll": "Fechar todos",
- 	"keepOpen": "Manter aberto",
-@@ -27,6 +28,15 @@
- 	"keepEditor": "Manter editor",
- 	"closeEditorsInGroup": "Fechar todos editores no grupo",
- 	"closeSavedEditors": "Fechar Editores Salvos em Grupo",
-+=======
-+	"closeAllUnmodified": "Fechar Não Modificados",
-+	"closeAll": "Fechar todos",
-+	"keepOpen": "Manter aberto",
-+	"showOpenedEditors": "Mostrar editores abertos",
-+	"keepEditor": "Manter editor",
-+	"closeEditorsInGroup": "Fechar todos editores no grupo",
-+	"closeUnmodifiedEditors": "Fechar os Editores Não Modificados no Grupo",
-+>>>>>>> .their
- 	"closeOtherEditors": "Fechar outros editores",
- 	"closeRightEditors": "Fechar editores à direita"
- }
-\ No newline at end of file
-changed in both
-  base   100644 5035a541040ce6ae31f3941ef00602526e12b871 i18n/ptb/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 8f7c2c323736446313384ee58a6648f36e7ab418 i18n/ptb/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 fce09f85b3db21d1c0859265ce9134c5d6e10e5f i18n/ptb/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 4b701929e85abf85c5c763f3274b30264cccf824 i18n/ptb/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  our    100644 126b3f4b4ed18dcdc7c7251ffc1ac28fb448f98a i18n/ptb/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  their  100644 550e345a27faa202343756a8937cd227509cf285 i18n/ptb/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-changed in both
-  base   100644 8af2aff62d5e24ad58816935b949dd546f2e3617 i18n/ptb/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  our    100644 05ac26584d42e4613fb9b74a470b82911e4b24de i18n/ptb/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  their  100644 1e1fde93df03c54842da28a1c37bc8cd079e0ea1 i18n/ptb/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-changed in both
-  base   100644 aafa87dc9bf2f2941d23620c8a8e08c4e2314c76 i18n/ptb/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  our    100644 4b815cd265aa330a6810a981084def6208c7decf i18n/ptb/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  their  100644 b78b8688cfdbfc18491f7eb77be147bb0830f9de i18n/ptb/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"close": "Fechar",
-+>>>>>>> .their
- 	"araLabelEditorActions": "Ações de editor"
- }
-\ No newline at end of file
-changed in both
-  base   100644 1c3db4d572b5064d3259de8d01bbaf6430ac25e8 i18n/ptb/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
-  our    100644 55c41655d21480208ae148096b6d57f5c14ec886 i18n/ptb/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
-  their  100644 4c843f96e0832e078c9bbb849a07e9d5eff1a607 i18n/ptb/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
-changed in both
-  base   100644 0ed9a7f544708c7e144aa2f65dd3da58d988aa2b i18n/ptb/src/vs/workbench/common/theme.i18n.json
-  our    100644 431c9c090b931f212ddb987a19512fdc507d3bd6 i18n/ptb/src/vs/workbench/common/theme.i18n.json
-  their  100644 b8e2f1b3570606f36287385a24c88e42c2faf90f i18n/ptb/src/vs/workbench/common/theme.i18n.json
-@@ -11,6 +11,11 @@
- 	"tabHoverBackground": "Cor de fundo da guia ao passar o mouse. As guias são os contêineres para editores na área do editor. Várias guias podem ser abertas em um grupo de editor. Podem existir vários grupos de editor.",
- 	"tabUnfocusedHoverBackground": "Cor de fundo da guia em um grupo fora de foco ao passar o mouse. As guias são os contêineres para editores na área do editor. Várias guias podem ser abertas em um grupo de editor. Podem existir vários grupos de editor.",
- 	"tabBorder": "Borda para separar uma guia das outras. As guias são os recipientes para editores na área do editor. Várias guias podem ser abertas em um grupo de editores. Podem haver vários grupos de editor.",
-+<<<<<<< .our
-+=======
-+	"tabActiveBorder": "Borda para destacar guias ativas. As guias são os recipientes para editores na área do editor. Várias guias podem ser abertas em um grupo de editores. Podem haver vários grupos de editores.",
-+	"tabActiveUnfocusedBorder": "Borda para destacar guias ativas em um grupo fora de foco. As guias são os recipientes para editores na área do editor. Várias guias podem ser abertas em um grupo de editores. Podem haver vários grupos de editores.",
-+>>>>>>> .their
- 	"tabHoverBorder": "Borda para destacar guias ao passar o mouse. As guias são os contêineres para editores na área do editor. Várias guias podem ser abertas em um grupo de editor. Podem existir vários grupos de editor.",
- 	"tabUnfocusedHoverBorder": "Borda para destacar guias em um grupo fora de foco ao passar o mouse. As guias são os contêineres para editores na área do editor. Várias guias podem ser abertas em um grupo de editor. Podem existir vários grupos de editor.",
- 	"tabActiveForeground": "Cor de primeiro plano da guia ativa em um grupo ativo. As guias são os recipientes para editores na área do editor. Várias guias podem ser abertas em um grupo de editores. Podem haver vários grupos de editor.",
-added in both
-  our    100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ptb/src/vs/workbench/common/views.i18n.json
-  their  100644 b7201e3d4af00fde6454ac604c45a33b472baf05 i18n/ptb/src/vs/workbench/common/views.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,4 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	]
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"duplicateId": "Uma exibição com id '{0}' já está registrada na localização '{1}'"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 67b112045f5d9d5106f2f5fb7edeb28a179c9d19 i18n/ptb/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 62b4a14f179ce17a8ef358da83ed726d39cdb13f i18n/ptb/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 44851d18637a50f93333fd36fe7aeb81f5f5349d i18n/ptb/src/vs/workbench/electron-browser/actions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"closeWindow": "Fechar Janela",
- 	"closeWorkspace": "Fechar o espaço de trabalho",
- 	"noWorkspaceOpened": "Não há nenhum espaço de trabalho aberto nessa instância para ser fechado.",
-@@ -50,6 +53,14 @@
- 	"moveWindowTabToNewWindow": "Mover a guia da janela para a nova janela",
- 	"mergeAllWindowTabs": "Mesclar todas as janelas",
- 	"toggleWindowTabsBar": "Alternar a Barra de Guias da Janela",
-+<<<<<<< .our
- 	"about": "Sobre {0}",
- 	"inspect context keys": "Inspecionar Chaves de Contexto"
-+=======
-+	"configureLocale": "Configurar Idioma",
-+	"displayLanguage": "Define o idioma de exibição do VSCode.",
-+	"doc": "Veja {0} para obter uma lista dos idiomas suportados.",
-+	"restart": "Modificar o valor requer reinicialização do VSCode.",
-+	"fail.createSettings": "Não foi possível criar '{0}' ({1})."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 06f44d416ff2bae86eeae9973f09930ad34e5772 i18n/ptb/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 15dd21d37a31b843a88f5eb322486062a4b034bf i18n/ptb/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 fc80fefdfe6e0c2cf48e10635b00156b6efd64fd i18n/ptb/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,12 +35,19 @@
- 	"panelDefaultLocation": "Controla o local padrão do painel. Pode ser visualizado na parte inferior ou no lado direito da área de trabalho.",
- 	"statusBarVisibility": "Controla a visibilidade da barra de status na parte inferior da área de trabalho.",
- 	"activityBarVisibility": "Controla a visibilidade da barra de atividades na área de trabalho.",
-+<<<<<<< .our
- 	"viewVisibility": "Controla a visibilidade das ações do cabeçalho de exibição. Ações de cabeçalho de exibição podem ser sempre visíveis ou somente visíveis quando a exibição tiver o foco ou quando passar o mouse.",
- 	"fontAliasing": "Controla o método de aliasing da fonte na área de trabalho.\n- default: Suavização de fonte por Sub-pixel. Na maioria das telas não-retina, este fornecerá o texto mais nítido\n- antialiased: Suavização da fontes no nível do pixel, oposto ao subpixel. Pode fazer a fonte parecer mais fina/clara no geral.\n- none: Desabilita a suavização de fonte. O texto será mostrado com bordas pixeladas.\n- auto: Aplica `default` ou `antialiased` automaticamente baseado no DPI das telas.",
- 	"workbench.fontAliasing.default": "Suavização de fonte subpixel. Na maioria dos monitores não-retina isto mostrará o texto mais nítido.",
- 	"workbench.fontAliasing.antialiased": "Suavizar a fonte no nível do pixel, em oposição a subpixel. Pode fazer com que a fonte apareça mais clara de uma forma geral.",
- 	"workbench.fontAliasing.none": "Desabilita a suavização de fonte. Texto será mostrado com bordas irregulares.",
- 	"workbench.fontAliasing.auto": "Aplica `default` ou `antialiased` automaticamente, baseado no DPI das telas.",
-+=======
-+	"fontAliasing": "Controla o método de identificação de fonte no espaço de trabalho.\n- padrão: Suavização de fonte subpixel. Na maioria dos monitores não-retina isto mostrará o texto mais nítido\n- antialiased: Suaviza a fonte no nível do pixel, em oposição a subpixel. Pode fazer a fonte aparecer mais clara de um modo geral \n- nenhum: Desabilita a suavização de fonte. Texto será mostrado com bordas irregulares",
-+	"workbench.fontAliasing.default": "Suavização de fonte subpixel. Na maioria dos monitores não-retina isto mostrará o texto mais nítido.",
-+	"workbench.fontAliasing.antialiased": "Suavizar a fonte no nível do pixel, em oposição a subpixel. Pode fazer com que a fonte apareça mais clara de uma forma geral.",
-+	"workbench.fontAliasing.none": "Desabilita a suavização de fonte. Texto será mostrado com bordas irregulares.",
-+>>>>>>> .their
- 	"enableNaturalLanguageSettingsSearch": "Controla se deve habilitar o modo de busca de linguagem natural para as configurações.",
- 	"windowConfigurationTitle": "Janela",
- 	"window.openFilesInNewWindow.on": "Arquivos serão abertos em uma nova janela",
-changed in both
-  base   100644 8a03ff87882eac824ec8cf3828aed006658a3411 i18n/ptb/src/vs/workbench/electron-browser/window.i18n.json
-  our    100644 676a0758385e0e41de8ed3de00c9c63bab54ddb0 i18n/ptb/src/vs/workbench/electron-browser/window.i18n.json
-  their  100644 3bb18871ba8aa4981651373180d9c51762a264b9 i18n/ptb/src/vs/workbench/electron-browser/window.i18n.json
-changed in both
-  base   100644 421e5b19c79c48f393096b4c2b57c679964447d3 i18n/ptb/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
-  our    100644 7cf5bc7303c6a9d45f4165db9620196970de5e97 i18n/ptb/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
-  their  100644 05dd117d6de11c1b4deca263c7e52a29cb37c1fb i18n/ptb/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"debugToolBarBackground": "Cor de fundo da barra de ferramentas de depuração.",
- 	"debugToolBarBorder": "Cor da borda da barra de ferramentas de depuração."
- }
-\ No newline at end of file
-changed in both
-  base   100644 898a18605fbc3836ec3ae70dcdd6ac489fc138bf i18n/ptb/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  our    100644 53b616809b4df15fc5f76746da24f19a323e0ef3 i18n/ptb/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  their  100644 68ea94e5a20f7f2c52acee807a6d7d7df1fa120e i18n/ptb/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"debug.terminal.title": "depurado"
- }
-\ No newline at end of file
-changed in both
-  base   100644 548fff57edc7ad5c846c14754364e6b302202573 i18n/ptb/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  our    100644 6af6df4d31287b541ed6cc10af679c34b7abac5e i18n/ptb/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  their  100644 21d5f668ec9ca993dd9860e291a6b5eea5f1a891 i18n/ptb/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-changed in both
-  base   100644 b4f99cdf7467985c20dc66e8264976ec3719723f i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 ddb9ffa28f8d3daf13de0c0b7197d8da53424c16 i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 be1060230617b1f08e54c7e9474c56257cb4d309 i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,11 @@
- 	"exeBasedRecommendation": "Esta extensão é recomendada porque você tem {0} instalado.",
- 	"fileBasedRecommendation": "Esta extensão é recomendada baseada nos arquivos que você abriu recentemente.",
- 	"workspaceRecommendation": "Esta extensão é recomendada pelos usuários da área de trabalho atual.",
-+=======
-+	"workspaceRecommendation": "Esta extensão é recomendada pelos usuários da área de trabalho atual.",
-+	"fileBasedRecommendation": "Esta extensão é recomendada baseada nos arquivos que você abriu recentemente.",
-+	"exeBasedRecommendation": "Esta extensão é recomendada porque você tem {0} instalado.",
-+>>>>>>> .their
- 	"reallyRecommended2": "A extensão {0} é recomendada para este tipo de arquivo.",
- 	"reallyRecommendedExtensionPack": "O pacote de extensão '{0}' é recomendado para este tipo de arquivo.",
- 	"install": "Instalar",
-added in both
-  our    100644 48850302ad7edf1afdb12f5f0594b61795bf80af i18n/ptb/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-  their  100644 254a1e7b5f11f31ab34b7a65e8ca88d4dd6492a4 i18n/ptb/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,13 @@
- 	],
- 	"workbenchConfigurationTitle": "Área de Trabalho",
- 	"feedbackVisibility": "Controla a visibilidade do feedback no Twitter (smiley) na barra de status na região inferior da área de trabalho."
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"workbenchConfigurationTitle": "Área de Trabalho"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 ad2caa896d3e0225c45812b0baff3ede0c7a94fc i18n/ptb/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-  their  100644 afb315a42d434674bd0f918e90ac2b4896f61b06 i18n/ptb/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"hide": "Ocultar"
- }
-\ No newline at end of file
-changed in both
-  base   100644 464da97e4e947785f5bb671924b8aff5c7abe604 i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  our    100644 e1ba064de6a7f4fbc32dc59666be04570de2a9fe i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  their  100644 1ebe014543ed4649ec87705e2f8428817c4afe74 i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-@@ -12,7 +12,10 @@
- 	"revertLocalChanges": "Descartar as alterações e reverter para o conteúdo no disco",
- 	"copyPathOfActive": "Copiar Caminho do Arquivo Ativo",
- 	"saveAllInGroup": "Salvar Todos no Grupo",
-+<<<<<<< .our
- 	"saveFiles": "Salvar todos os arquivos",
-+=======
-+>>>>>>> .their
- 	"revert": "Reverter Arquivo",
- 	"compareActiveWithSaved": "Comparar o Arquivo Ativo com o Arquivo Salvo",
- 	"closeEditor": "Fechar Editor",
-@@ -26,10 +29,16 @@
- 	"compareWithSaved": "Comparar com o salvo",
- 	"compareWithSelected": "Comparar com o Selecionado",
- 	"compareSource": "Selecione para comparar",
-+<<<<<<< .our
- 	"compareSelected": "Comparar Selecionado",
- 	"close": "Fechar",
- 	"closeOthers": "Fechar Outros",
- 	"closeSaved": "Fechar Salvo",
-+=======
-+	"close": "Fechar",
-+	"closeOthers": "Fechar Outros",
-+	"closeUnmodified": "Fechar Não Modificados",
-+>>>>>>> .their
- 	"closeAll": "Fechar todos",
- 	"deleteFile": "Excluir permanentemente"
- }
-\ No newline at end of file
-changed in both
-  base   100644 18ed68af70c5f2e01c8a8cca58fd7ca34cfd3cad i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 6f4dc9047cdb115e21fc423b4a6eca5180a2ad01 i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 48ba3f85e8c5f768f5aef3005174e595983bb356 i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"newFile": "Novo Arquivo",
- 	"newFolder": "Nova Pasta",
- 	"rename": "Renomear",
-@@ -13,6 +16,10 @@
- 	"copyFile": "Copiar",
- 	"pasteFile": "Colar",
- 	"retry": "Tentar novamente",
-+<<<<<<< .our
-+=======
-+	"openFolderFirst": "Abrir uma pasta primeiro para criar arquivos ou pastas dentro dele.",
-+>>>>>>> .their
- 	"newUntitledFile": "Novo Arquivo Sem Título",
- 	"createNewFile": "Novo Arquivo",
- 	"createNewFolder": "Nova Pasta",
-@@ -34,9 +41,18 @@
- 	"confirmDeleteMessageMultiple": "Você tem certeza que deseja excluir permanentemente os seguintes {0} arquivos?",
- 	"confirmDeleteMessageFolder": "Tem certeza de que deseja excluir permanentemente '{0}' e seu conteúdo?",
- 	"confirmDeleteMessageFile": "Tem certeza de que deseja excluir permanentemente '{0}'?",
-+<<<<<<< .our
- 	"confirmOverwrite": "Um arquivo ou pasta com o mesmo nome já existe na pasta de destino. Você quer substituí-lo?",
- 	"replaceButtonLabel": "&&Substituir",
- 	"fileDeleted": "Arquivo para colar foi excluído ou movido no meio-tempo",
-+=======
-+	"irreversible": "Esta ação é irreversível!",
-+	"permDelete": "Excluir permanentemente",
-+	"importFiles": "Importar Arquivos",
-+	"confirmOverwrite": "Um arquivo ou pasta com o mesmo nome já existe na pasta de destino. Você quer substituí-lo?",
-+	"replaceButtonLabel": "&&Substituir",
-+	"fileIsAncestor": "Arquivo a ser copiado é um ancestral da pasta de destino.",
-+>>>>>>> .their
- 	"duplicateFile": "Duplicar",
- 	"globalCompareFile": "Compare o Arquivo Ativo Com...",
- 	"openFileToCompare": "Abrir um arquivo primeiro para compará-lo com outro arquivo.",
-changed in both
-  base   100644 2e61a1656c803409140a862fc3f46f08664243ef i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  our    100644 da3989cd8952cb4839a890a30c1614078d598a3a i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  their  100644 4d9e669b83d841459168133eb5b3d69b3e31b263 i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,12 +7,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"revealInWindows": "Revelar no Explorer",
- 	"revealInMac": "Revelar no Finder",
- 	"openContainer": "Abrir a Pasta",
- 	"saveAs": "Salvar como...",
- 	"save": "Salvar",
- 	"saveAll": "Salvar Todos",
-+<<<<<<< .our
-+=======
-+	"saveFiles": "Salvar todos os arquivos",
-+>>>>>>> .their
- 	"removeFolderFromWorkspace": "Remover pasta da área de trabalho",
- 	"genericRevertError": "Falha ao reverter '{0}': {1}",
- 	"modifiedLabel": "{0} (em disco) ↔ {1}",
-changed in both
-  base   100644 0e95d226253753e96cd8acccc486951d1a479af6 i18n/ptb/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 8c362a6a140d6ce015130d77851c1404b28f2419 i18n/ptb/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 f6bbbed75c4215ee93b76e01293c59a2242bf484 i18n/ptb/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-@@ -38,7 +38,10 @@
- 	"editorConfigurationTitle": "Editor",
- 	"formatOnSave": "Formata um arquivo no salvamento. Um formatador deve estar disponível, o arquivo não deve ser salvo automaticamente e editor não deve ser desligado.",
- 	"explorerConfigurationTitle": "Explorador de arquivos",
-+<<<<<<< .our
- 	"openEditorsVisible": "Número de editores mostrados no painel Editores Abertos.",
-+=======
-+>>>>>>> .their
- 	"autoReveal": "Controla se o explorador deve automaticamente revelar e selecionar arquivos ao abri-los.",
- 	"enableDragAndDrop": "Controla se o explorador deve permitir mover arquivos e pastas através de arrastar e soltar.",
- 	"confirmDragAndDrop": "Controla se o explorer deve pedir a confirmação ao mover arquivos ou pastas através de arrastar e soltar.",
-changed in both
-  base   100644 09a298946434f65c4b34322ee572832c7bb5a8c1 i18n/ptb/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  our    100644 4c80942ead8f390ee36c6fb925c8d39c8c4d027b i18n/ptb/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  their  100644 5f8a28ec46b40b685863447989cf1c4a327ecf26 i18n/ptb/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,12 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"userGuide": "Use as ações na barra de ferramentas de editor para a direita para **desfazer** suas alterações ou **substituir** o conteúdo no disco com as alterações",
-+	"overwriteElevated": "Sobrescrever como Admin...",
-+	"saveElevated": "Tentar novamente como Admin...",
-+	"overwrite": "Sobrescrever",
-+>>>>>>> .their
- 	"retry": "Tentar novamente",
- 	"discard": "Descartar",
- 	"readonlySaveErrorAdmin": "Falha ao salvar '{0}': O arquivo está protegido contra gravação. Selecione 'Sobrescrever como Admin' para tentar novamente como administrador.",
-changed in both
-  base   100644 83f2a510196a33dea50882f0cecf222c5596cc3d i18n/ptb/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  our    100644 e4ceea553e3bf52cf9248e76044c501e631fa80d i18n/ptb/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  their  100644 e075736dad376998525eb4ba3372c866c011f87c i18n/ptb/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-added in both
-  our    100644 6539931b21c1db53cab6e10b1197f8cdbb1c82fd i18n/ptb/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-  their  100644 05cf5d42db3859aa460de5b05904482bed12edd4 i18n/ptb/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"mainLog": "Log (Principal)",
- 	"sharedLog": "Log (Compartilhado)",
- 	"rendererLog": "Log (Janela)",
-added in both
-  our    100644 2eb83b4affdb1796e75bcf3cb50b217b75722be9 i18n/ptb/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  their  100644 30c8e9206e8221cb4ff2ad87c5298b236c01f406 i18n/ptb/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -16,6 +17,22 @@
- 	"selectProcess": "Selecione o Log para o processo",
- 	"openLogFile": "Abrir Arquivo de Log...",
- 	"setLogLevel": "Definir Nível de Log...",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"openLogsFolder": "Abrir Pasta de Logs",
-+	"showLogs": "Exibir Logs...",
-+	"mainProcess": "Principal",
-+	"sharedProcess": "Compartilhado",
-+	"rendererProcess": "Janela",
-+	"extensionHost": "Host de Extensão",
-+	"selectProcess": "Selecionar processo",
-+	"setLogLevel": "Definir Nível de Log",
-+>>>>>>> .their
- 	"trace": "Rastreamento",
- 	"debug": "Depurar",
- 	"info": "Informações",
-@@ -23,8 +40,12 @@
- 	"err": "Erro",
- 	"critical": "Crítico",
- 	"off": "Desligado",
-+<<<<<<< .our
- 	"selectLogLevel": "Selecione o nível de log",
- 	"default and current": "Padrão & Atual",
- 	"default": "Valor padrão",
- 	"current": "Atual"
-+=======
-+	"selectLogLevel": "Selecione o nível de log"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ad1f8b439c5405e18eac5e7b9ecc690c58a48b9a i18n/ptb/src/vs/workbench/parts/markers/common/messages.i18n.json
-  our    100644 598c8bf75e397ffcfa02762b995ecaa835f4f8d1 i18n/ptb/src/vs/workbench/parts/markers/common/messages.i18n.json
-  their  100644 f038135e0fbc66d2ead08d0bd621d74976958a8e i18n/ptb/src/vs/workbench/parts/markers/common/messages.i18n.json
-@@ -7,8 +7,11 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"viewCategory": "Exibir",
-+<<<<<<< .our
- 	"problems.view.toggle.label": "Esconder/exibir Problemas (Erros, Avisos, Infos)",
- 	"problems.view.focus.label": "Focar Problemas (Erros, Avisos, Infos)",
-+=======
-+>>>>>>> .their
- 	"problems.panel.configuration.title": "Visualização de Problemas",
- 	"problems.panel.configuration.autoreveal": "Controla se a visaulização de problemas evela os arquivos automaticamente ao abri-los",
- 	"markers.panel.title.problems": "Problemas",
-added in both
-  our    100644 9b7076124695fe72a8e6d829243d88ef8a7b9fda i18n/ptb/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-  their  100644 9a9c6f731568b3cc11517abf4a5b294772e06799 i18n/ptb/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -11,4 +12,16 @@
- 	"viewCategory": "Exibir",
- 	"clearOutput.label": "Limpar saída",
- 	"openActiveLogOutputFile": "Exibir: Abrir Arquivo de Saída de Log Ativo"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"output": "Saída",
-+	"logViewer": "Visualizador do Log",
-+	"viewCategory": "Exibir",
-+	"clearOutput.label": "Limpar saída"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 2c09c09b92b9591f8d53f301a131e86b16fc4dac i18n/ptb/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-  their  100644 383a9f4835d3b1eb40db70a7c39519a64971bb76 i18n/ptb/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"output": "{0} - Saída",
- 	"channel": "Canal de saída para '{0}'"
- }
-\ No newline at end of file
-changed in both
-  base   100644 800b9bf18e2ad4ffdcbd14e023bb7df84f195990 i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 01c8a007893399a7bfe4bbd3c682db21fadac779 i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 df12c20c366d7d1cb2447cd301d697bd027e7e05 i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"defaultSettings": "Coloque suas configurações no editor do lado direito para substituir.",
- 	"noSettingsFound": "Não há configurações encontradas.",
- 	"settingsSwitcherBarAriaLabel": "Chave de Configurações",
-changed in both
-  base   100644 9f80cd79e8b2eb5eda1f0afe86d7c29ad1812e9b i18n/ptb/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  our    100644 cc122314c699ae2a93dc3ff54c506a522c5df317 i18n/ptb/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  their  100644 6427118b75bed8db6da9c928ecfb45ebc090726a i18n/ptb/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-changed in both
-  base   100644 e3c6204b6055ca1ee0992fc51f9530523757334c i18n/ptb/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  our    100644 1abc4b0dbcf5852b89b34227ddcb305852f89e3e i18n/ptb/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  their  100644 75a93eabf9c7f046e0f2946fdc2c0806ddc1fc0f i18n/ptb/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"view": "Exibir",
- 	"commandsHandlerDescriptionDefault": "Exibir e executar comandos",
- 	"gotoLineDescriptionMac": "Ir para linha",
-changed in both
-  base   100644 117ddc11b046f6840855512deb617c3c416d0435 i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  our    100644 5186f0aaae9ff54a935df56019817030e2dd75cc i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  their  100644 668463cff466fb520a26283309eeda0329045311 i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-@@ -13,5 +13,9 @@
- 	"scmConfigurationTitle": "SCM",
- 	"alwaysShowProviders": "Se deverá sempre mostrar a seção Provedor de Controle de Código Fonte.",
- 	"diffDecorations": "Controla decorações do diff no editor.",
-+<<<<<<< .our
- 	"diffGutterWidth": "Controla a largura(px) das decorações diff no gutter (adicionada e modificada)."
-+=======
-+	"inputCounter": "Controla quando exibir o contador de entrada."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 fc4f8f90311883e3e69380ff1a782e6e2660d29d i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  our    100644 dfb6a734a7bd828d4b5aba3c014e4458b5423834 i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  their  100644 916c6469ab8d0ed908656706d934e844fd0944b7 i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-@@ -8,6 +8,9 @@
- 	],
- 	"scm providers": "Provedores de Controle de Código Fonte",
- 	"hideRepository": "Ocultar",
-+	"commitMessageInfo": "{0} caracteres na linha atual",
-+	"commitMessageCountdown": "{0} caracteres restantes na linha atual",
-+	"commitMessageWarning": "{0} caracteres sobre {1} na linha atual",
- 	"installAdditionalSCMProviders": "Instalar provedores de SCM adicionais...",
- 	"no open repo": "Não existem provedores de controle de código fonte ativos.",
- 	"source control": "Controle de código-fonte",
-changed in both
-  base   100644 34ded87a267343aca52c7d8a1138213e9fdb4cfb i18n/ptb/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 ba5b86d8773fd55c24bc979c0c74cb81491c0258 i18n/ptb/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 62c0f96918e287a206dbb15306a548d81491b84f i18n/ptb/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-changed in both
-  base   100644 b7b7494e9e4b4bd3e9b4e9565e52c213b3692be9 i18n/ptb/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 08831e79b99c984b5f938c4d959c75ada794a1e4 i18n/ptb/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 1d6d8fc3238de4d1c4975cf69b3e55e16ae3cff1 i18n/ptb/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -11,11 +12,18 @@
- 	"copyPathLabel": "Copiar Caminho",
- 	"copyAllLabel": "Copiar todos",
- 	"clearSearchHistoryLabel": "Limpar Histórico de Pesquisa",
-+=======
-+>>>>>>> .their
- 	"findInFolder": "Procurar na pasta...",
- 	"findInWorkspace": "Procurar no Espaço de Trabalho...",
- 	"showTriggerActions": "Ir para Símbolo no Espaço de Trabalho...",
- 	"name": "Pesquisar",
-+<<<<<<< .our
- 	"showSearchViewl": "Mostrar Busca",
-+=======
-+	"search": "Pesquisar",
-+	"showSearchViewlet": "Mostrar Busca",
-+>>>>>>> .their
- 	"view": "Exibir",
- 	"findInFiles": "Localizar nos Arquivos",
- 	"openAnythingHandlerDescription": "Ir para o Arquivo",
-added in both
-  our    100644 76910c87bbe694745265a56b60baf18a1b6fd7c0 i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-  their  100644 5d08c410ab909c29fb019ab5cd0dc409b66203ef i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,11 +7,22 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"global.scope": "(global)",
- 	"global.1": "({0})",
- 	"new.global": "Novo Arquivo de Trechos de Código Global...",
- 	"group.global": "Trechos de código existentes",
-+<<<<<<< .our
- 	"new.global.sep": "Novos Trechos de Código",
-+=======
-+>>>>>>> .their
- 	"openSnippet.pickLanguage": "Selecionar Arquivo de Trechos de Código ou Criar Trechos de Código",
- 	"openSnippet.label": "Configurar Trechos de Código do Usuário",
- 	"preferences": "Preferências"
-changed in both
-  base   100644 b9823c384ad0faa0cf1ad63fcc15f42b5365baf3 i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  our    100644 c9ce0ad1543ce0a6eecedad59ee0d1be9e8495ab i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  their  100644 5cad5c0f57dca7c6b72e9ed82bdb92a07f060890 i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"snippetSchema.json.default": "Trecho de código vazio",
- 	"snippetSchema.json": "Configuração do trecho do usuário",
- 	"snippetSchema.json.prefix": "O prefixo usado ao selecionar o trecho no intelliSense",
-added in both
-  our    100644 338e6baa050bb04f4cf3970e7baba18e89de95e0 i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-  their  100644 bfdaf9232d5a7e11a44deddaad015b3eced94985 i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,5 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"source.snippetGlobal": "Trecho de Código Global do Usuário",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"source.snippet": "Trecho de código do usuário"
- }
-\ No newline at end of file
-changed in both
-  base   100644 a2c0fbab96ac31e00976c7ddfc2934d836ae67cb i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  our    100644 45d06c4ce6eaaf39c9ff212dad2bdd8819812f84 i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 e4fdc20a1294ac5b743a510cce71028a178fc7ae i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,9 @@
- 	],
- 	"invalid.path.0": "Esperada uma string em `contributes.{0}.path`. Valor informado: {1}",
- 	"invalid.language.0": "Quando a linguagem for omitida, o valor de `contributes.{0}.path` deve ser um arquivo-`.code-snippets`. Valor definido: {1}",
-+=======
-+	"invalid.path.0": "Esperada uma string em `contributes.{0}.path`. Valor informado: {1}",
-+>>>>>>> .their
- 	"invalid.language": "Linguagem desconhecida em `contributes.{0}.language`. Valor fornecido: {1}",
- 	"invalid.path.1": "É esperado que `contributes.{0}.path` ({1}) seja incluído na pasta da extensão ({2}). Isto pode tornar a extensão não portável.",
- 	"vscode.extension.contributes.snippets": "Contribui aos trechos de código.",
-changed in both
-  base   100644 d97a515c6ead1b021f02b14e2486ea3556f49613 i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 a7fcbfe8b12598411b8516f57bb30b642834b0bc i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 7eeff3082188a3ad45b7a5d5b49f693b1c3ad72e i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -15,7 +15,11 @@
- 	"terminal.integrated.shellArgs.osx": "Os argumentos de linha de comando a serem usados no terminal do OS X.",
- 	"terminal.integrated.shell.windows": "O caminho do shell que o terminal utiliza no Windows. Quando estiver usando shells fornecidos com o Windows (cmd, PowerShell ou Bash no Ubuntu).",
- 	"terminal.integrated.shellArgs.windows": "Os argumentos de linha de comando a serem utilizados no terminal do Windows.",
-+<<<<<<< .our
- 	"terminal.integrated.macOptionIsMeta": "Tratar a tecla option como a tecla meta no terminal no macOS.",
-+=======
-+	"terminal.integrated.rightClickCopyPaste": "Quando configurado, isto evitará que o menu de contexto apareça quando pressionado o botão direito do mouse dentro do terminal, em vez disso vai copiar quando há uma seleção e colar quando não há nenhuma seleção.",
-+>>>>>>> .their
- 	"terminal.integrated.copyOnSelection": "Quando ativado, texto selecionado no terminal será copiado para a área de transferência.",
- 	"terminal.integrated.fontFamily": "Controla a família de fontes do terminal, este padrão é o valor do editor.fontFamily.",
- 	"terminal.integrated.fontSize": "Controla o tamanho da fonte em pixels do terminal.",
-changed in both
-  base   100644 2ee45b6deb3a230fe1264f1fc2641f40cff31549 i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 5844af8cc38149dcfa5ec9e4de0ec76188e00645 i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 f59efd68a9788e548d56fab4cfe35fc5a6754dee i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -20,6 +20,7 @@
- 	"workbench.action.terminal.new.short": "Novo Terminal",
- 	"workbench.action.terminal.newWorkspacePlaceholder": "Selecione o diretório de trabalho atual para novo terminal",
- 	"workbench.action.terminal.newInActiveWorkspace": "Criar Novo Terminal Integrado (No Espaço de Trabalho Ativo)",
-+<<<<<<< .our
- 	"workbench.action.terminal.split": "Dividir Terminal",
- 	"workbench.action.terminal.focusPreviousPane": "Focar Painel Anterior",
- 	"workbench.action.terminal.focusNextPane": "Foco próximo painel",
-@@ -27,6 +28,8 @@
- 	"workbench.action.terminal.resizePaneRight": "Redimensionar Painel à Direita",
- 	"workbench.action.terminal.resizePaneUp": "Redimensionar Painel Superior",
- 	"workbench.action.terminal.resizePaneDown": "Redimensionar Painel Inferior",
-+=======
-+>>>>>>> .their
- 	"workbench.action.terminal.focus": "Focalizar Terminal",
- 	"workbench.action.terminal.focusNext": "Focalizar Próximo Terminal",
- 	"workbench.action.terminal.focusPrevious": "Focalizar Terminal Anterior",
-changed in both
-  base   100644 655ae8902e5a0c04db12eef7469869ea8427ff91 i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 a9e83e391ee49f8fd391069e025b8de1705f72a9 i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 345ffbe4d25d9d3137ef18292bf8bf8afe00e66a i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-changed in both
-  base   100644 83214ad4be8a1fd3efa01b2260b09c17cd430927 i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  our    100644 1463cb4fa9ec88229dfed6213081a5f02d71c18e i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  their  100644 a500552f06f71c9b38cd547750595400c57bfe2b i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-@@ -8,7 +8,11 @@
- 	],
- 	"terminal.integrated.chooseWindowsShellInfo": "Você pode alterar o terminal shell padrão selecionando o botão Personalizar.",
- 	"customize": "Personalizar",
-+<<<<<<< .our
- 	"never again": "Não mostrar novamente",
-+=======
-+	"cancel": "Cancelar",
-+>>>>>>> .their
- 	"terminal.integrated.chooseWindowsShell": "Selecione o seu terminal shell preferido, você pode alterar isso mais tarde em suas configurações",
- 	"terminalService.terminalCloseConfirmationSingular": "Há uma sessão ativa de terminal, você quer finalizá-la?",
- 	"terminalService.terminalCloseConfirmationPlural": "Existem {0} sessões ativas de terminal, você quer finalizá-las?"
-changed in both
-  base   100644 6a2cfcb15ab8c5a993db42865a78ed0364ac27f2 i18n/ptb/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 da6e72a8a9829b085b81f04ac2a19502d69acb6e i18n/ptb/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 84ce2109e07ce97bbd7e8cbcf45d81315980981d i18n/ptb/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -9,9 +9,17 @@
- 	"releaseNotes": "Notas da Versão",
- 	"showReleaseNotes": "Mostrar Notas da Versão",
- 	"read the release notes": "Bem-vindo a {0} v{1}! Gostaria de ler as Notas da Versão?",
-+<<<<<<< .our
- 	"licenseChanged": "Nossos termos de licença mudaram, por favor, clique [aqui]({0}) para revisá-los.",
- 	"neveragain": "Não mostrar novamente",
- 	"64bitisavailable": "{0} para Windows de 64 bits está agora disponível! Clique [aqui]({0}) para maiores informações.",
-+=======
-+	"licenseChanged": "Nossos termos de licença mudaram, favor revisá-los.",
-+	"license": "Ler Licença",
-+	"neveragain": "Não mostrar novamente",
-+	"64bitisavailable": "{0} para Windows de 64 bits está agora disponível!",
-+	"learn more": "Saiba Mais",
-+>>>>>>> .their
- 	"updateIsReady": "Nova atualização de {0} disponível.",
- 	"noUpdatesAvailable": "Não há nenhuma atualização disponível no momento.",
- 	"ok": "OK",
-@@ -24,7 +32,10 @@
- 	"commandPalette": "Paleta de comandos...",
- 	"settings": "Configurações",
- 	"keyboardShortcuts": "Atalhos de Teclado",
-+<<<<<<< .our
- 	"showExtensions": "Gerenciar Extensões",
-+=======
-+>>>>>>> .their
- 	"userSnippets": "Trecho de código do usuário",
- 	"selectTheme.label": "Tema de Cores",
- 	"themes.selectIconTheme.label": "Arquivo de Ícone do Tema",
-changed in both
-  base   100644 7b91deaec2e42a9e5312a345a687403d3e7daa70 i18n/ptb/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  our    100644 6789efd204043271857054115b76d8df180ce2d3 i18n/ptb/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  their  100644 1cc780952f6a712f7effd279d7b1edae05675830 i18n/ptb/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -11,4 +12,9 @@
- 	"fileNotModifiedError": "Arquivo não modificado desde",
- 	"fileBinaryError": "Arquivo parece ser binário e não pode ser aberto como texto",
- 	"fileMoveConflict": "Não é possível mover/copiar. Arquivo já existe no destino."
-+=======
-+	"fileIsDirectoryError": "Arquivo é um diretório",
-+	"fileNotModifiedError": "Arquivo não modificado desde",
-+	"fileBinaryError": "Arquivo parece ser binário e não pode ser aberto como texto"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ae4ae7187430526f4afd7f10491bb8014896269f i18n/ptb/src/vs/workbench/services/files/node/fileService.i18n.json
-  our    100644 29bfbb0d0406e61dc08f81bd41ff0cd2f4dd056a i18n/ptb/src/vs/workbench/services/files/node/fileService.i18n.json
-  their  100644 dba7ada15b58384345edf357995f42af495e661b i18n/ptb/src/vs/workbench/services/files/node/fileService.i18n.json
-changed in both
-  base   100644 fedfd5457f0de6068aff139dde2b9cc1c477dd88 i18n/ptb/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
-  our    100644 4de199c4c2fe4fdd932d1d0671e2326d7c5a2f0e i18n/ptb/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
-  their  100644 4e6320dddaaba07fd89b8dbc8063b21cb9e5da10 i18n/ptb/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
-changed in both
-  base   100644 491b19e87c4efa4dee5923e674c93aed715e7be8 i18n/ptb/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  our    100644 7522dc2b84c4c005e2d53ba31a8480bb47fcfe0b i18n/ptb/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  their  100644 f86146be73a5c45365bedfb92621d4804f902c74 i18n/ptb/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-changed in both
-  base   100644 15017c071573e63a29279ee8b00141e3bff3f8a5 i18n/ptb/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 effaee068b393bc8fea42a2d38b17e32baca11e5 i18n/ptb/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 164708fcd634ee28360b9239a48b55a9dd23e7b6 i18n/ptb/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-changed in both
-  base   100644 078a8eb1b7dce1ba63a8a813339187488bb2cabb i18n/ptb/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  our    100644 df3c6fe6d65f0ab7a9a903481f15896fcc167190 i18n/ptb/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  their  100644 73fdc1bd8e41e045d7774d7f0f5057c16d06a4f3 i18n/ptb/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-@@ -8,5 +8,10 @@
- 	],
- 	"errorInvalidTaskConfiguration": "Não é possível escrever no arquivo de configuração. Por favor, abra o arquivo para corrigir erros/avisos nele e tente novamente.",
- 	"errorWorkspaceConfigurationFileDirty": "Não é possível escrever no arquivo de configuração do espaço de trabalho porque o arquivo está sujo. Por favor, salve-o e tente novamente.",
-+<<<<<<< .our
- 	"openWorkspaceConfigurationFile": "Abrir Configuração do Espaço de Trabalho"
-+=======
-+	"openWorkspaceConfigurationFile": "Abrir o Arquivo de Configuração do Espaço de Trabalho",
-+	"close": "Fechar"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 1e461cf4629319ae5dd2cc20137a3683d3d8ed9b i18n/rus/extensions/git/out/autofetch.i18n.json
-  our    100644 674a3834cc198d7819143c18bcdd12ed733e4813 i18n/rus/extensions/git/out/autofetch.i18n.json
-  their  100644 d3d761f36367e8bcaa020ae3512dc8c569de2e36 i18n/rus/extensions/git/out/autofetch.i18n.json
-@@ -7,7 +7,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"yes": "Да",
-+<<<<<<< .our
- 	"no": "Нет",
- 	"not now": "Спросить меня позже",
- 	"suggest auto fetch": "Вы хотите, чтобы среда Code [периодически выполняла команду \"git fetch\"]({0})?"
-+=======
-+	"read more": "Подробнее",
-+	"no": "Нет"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d8d6feaa35d000d85deb6dadc78f8004729efb8f i18n/rus/extensions/git/out/commands.i18n.json
-  our    100644 bdd7adadfadc50db48d014178fb19ce838d13900 i18n/rus/extensions/git/out/commands.i18n.json
-  their  100644 b99a2ac09aae79bfeda8e571d39dd67ac8f3d049 i18n/rus/extensions/git/out/commands.i18n.json
-@@ -71,12 +71,19 @@
- 	"pick remote pull repo": "Выберите удаленный компьютер, с которого следует загрузить ветвь",
- 	"no remotes to push": "Для вашего репозитория не настроены удаленные репозитории для отправки данных.",
- 	"nobranch": "Извлеките ветвь, чтобы передать данные в удаленный репозиторий.",
-+<<<<<<< .our
- 	"confirm publish branch": "В ветви '{0}' отсутствует восходящая ветвь. Вы хотите опубликовать эту ветвь?",
- 	"ok": "ОК",
- 	"push with tags success": "Файлы с тегами успешно отправлены.",
- 	"pick remote": "Выберите удаленный сервер, на котором нужно опубликовать ветвь \"{0}\":",
- 	"sync is unpredictable": "Это действие отправляет фиксации в \"{0}/{1}\" и извлекает их из этого расположения.",
- 	"never again": "ОК, больше не показывать",
-+=======
-+	"ok": "ОК",
-+	"push with tags success": "Файлы с тегами успешно отправлены.",
-+	"pick remote": "Выберите удаленный сервер, на котором нужно опубликовать ветвь \"{0}\":",
-+	"sync is unpredictable": "Это действие отправляет фиксации в \"{0}\" и извлекает их из этого расположения.",
-+>>>>>>> .their
- 	"no remotes to publish": "Для вашего репозитория не настроены удаленные репозитории для публикации.",
- 	"no changes stash": "Отсутствуют изменения, которые необходимо спрятать.",
- 	"provide stash message": "Укажите сообщение о скрытии",
-added in both
-  our    100644 c2ebfd192413e0e1da8793b7e8acbdca9db58ff1 i18n/rus/extensions/typescript/out/commands.i18n.json
-  their  100644 719d56f4f9282136e6547a837474f78e01fcab4c i18n/rus/extensions/typescript/out/commands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -13,4 +14,20 @@
- 	"typescript.noJavaScriptProjectConfig": "Файл не является частью проекта JavaScript. Дополнительные сведения см. [здесь]({0}).",
- 	"typescript.configureTsconfigQuickPick": "Настроить tsconfig.json",
- 	"typescript.configureJsconfigQuickPick": "Настроить jsconfig.json"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"typescript.projectConfigNoWorkspace": "Откройте папку в VS Code, чтобы использовать проект JavaScript или TypeScript.",
-+	"typescript.projectConfigUnsupportedFile": "Не удалось определить проект TypeScript или JavaScript. Неподдерживаемый тип файла",
-+	"typescript.projectConfigCouldNotGetInfo": "Не удалось определить проект TypeScript или JavaScript.",
-+	"typescript.noTypeScriptProjectConfig": "Файл не является частью проекта TypeScript.",
-+	"typescript.noJavaScriptProjectConfig": "Файл не является частью проекта JavaScript.",
-+	"typescript.configureTsconfigQuickPick": "Настроить tsconfig.json",
-+	"typescript.configureJsconfigQuickPick": "Настроить jsconfig.json",
-+	"typescript.projectConfigLearnMore": "Дополнительные сведения"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 750d811d866eaa3d43818bd1d8e28c9898acf514 i18n/rus/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-  their  100644 ed15423097d5cbb03aeb8c474db3877ca0d1584f i18n/rus/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"selectAriaOption": "{0}"
- }
-\ No newline at end of file
-added in both
-  our    100644 83e49b47cbf977bdcef1d89c7da9925e8624223a i18n/rus/src/vs/base/node/ps.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/src/vs/base/node/ps.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"collecting": "Сбор информации о процессоре и памяти. Это может занять пару секунд."
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 f265f8d9eaa5d4bc740910d00a86729ad5704674 i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 66cf48db0f575d6b4f93e4e908a24029fed35a72 i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 04d052b0abb17e9217ceff360a85a092d43cf48a i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -16,7 +16,11 @@
- 	"lineNumbers.on": "Отображаются абсолютные номера строк.",
- 	"lineNumbers.relative": "Отображаемые номера строк вычисляются как расстояние в строках до положения курсора.",
- 	"lineNumbers.interval": "Номера строк отображаются каждые 10 строк.",
-+<<<<<<< .our
- 	"lineNumbers": "Управляет отображением номеров строк.",
-+=======
-+	"lineNumbers": "Управляет отображением номеров строк. Возможные значения: 'on', 'off', 'relative' и 'interval'.",
-+>>>>>>> .their
- 	"rulers": "Отображать вертикальные линейки после определенного числа моноширинных символов. Для отображения нескольких линеек укажите несколько значений. Если не указано ни одного значения, вертикальные линейки отображаться не будут.",
- 	"wordSeparators": "Символы, которые будут использоваться как разделители слов при выполнении навигации или других операций, связанных со словами.",
- 	"tabSize": "Число пробелов в табуляции. Этот параметр переопределяется на основе содержимого файла, если установлен параметр \"editor.detectIndentation\".",
-changed in both
-  base   100644 4801d2ec386d6b4bfbe0889515045812867e8c2d i18n/rus/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 9d3bc679fc1f2c06c947cdc33c9616b8b522920c i18n/rus/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 435033a9d39fe97fcd7eedb7ed0b4e2445dc46fa i18n/rus/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -8,8 +8,11 @@
- 	],
- 	"lineHighlight": "Цвет фона для выделения строки в позиции курсора.",
- 	"lineHighlightBorderBox": "Цвет фона границ вокруг строки в позиции курсора.",
-+<<<<<<< .our
- 	"rangeHighlight": "Фоновый цвет выбранных диапазонов, например, в функциях быстрого открытия и поиска. Цвет должен быть прозрачным чтобы не перекрывать основных знаков отличия.",
- 	"rangeHighlightBorder": "Цвет фона обводки выделения.",
-+=======
-+>>>>>>> .their
- 	"caret": "Цвет курсора редактора.",
- 	"editorCursorBackground": "Цвет фона курсора редактора. Позволяет настраивать цвет символа, перекрываемого прямоугольным курсором.",
- 	"editorWhitespaces": "Цвет пробелов в редакторе.",
-changed in both
-  base   100644 5ca181d11bd738f9eaba0717983dc5ba7af49957 i18n/rus/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  our    100644 7a40f2cf14561ceae85a652f8f7ffc53f4f9707f i18n/rus/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  their  100644 46e2fc5601eb02243252f2cab12988c5751c4397 i18n/rus/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -10,4 +11,11 @@
- 	"markerAction.previous.label": "Перейти к Предыдущей Проблеме (Ошибке, Предупреждению, Информации)",
- 	"markerAction.nextInFiles.label": "Перейти к следующей проблеме в файлах (ошибки, предупреждения, информационные сообщения)",
- 	"markerAction.previousInFiles.label": "Перейти к предыдущей проблеме в файлах (ошибки, предупреждения, информационные сообщения)"
-+=======
-+	"title.wo_source": "({0}/{1})",
-+	"editorMarkerNavigationError": "Цвет ошибки в мини-приложении навигации по меткам редактора.",
-+	"editorMarkerNavigationWarning": "Цвет предупреждения в мини-приложении навигации по меткам редактора.",
-+	"editorMarkerNavigationInfo": "Цвет информационного сообщения в мини-приложении навигации по меткам редактора.",
-+	"editorMarkerNavigationBackground": "Фон мини-приложения навигации по меткам редактора."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ab058cc24db7358f649c11408aac34dcd487cb98 i18n/rus/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  our    100644 5b31b385ffd5c6dc8e210cee2ebf9889c7b9deb5 i18n/rus/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  their  100644 0894ee93e1f8569651a774412c6c26db93009d42 i18n/rus/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,10 @@
- 	"wordHighlightStrongBorder": "Цвет границы символа при доступе на запись, например, при записи переменной. ",
- 	"overviewRulerWordHighlightForeground": "Цвет метки линейки в окне просмотра для выделения символов. Цвет не должен был прозрачным, чтобы не перекрывать основные знаки отличия.",
- 	"overviewRulerWordHighlightStrongForeground": "Цвет метки линейки в окне просмотра для выделения символов с доступом на запись. Цвет не должен был прозрачным, чтобы не перекрывать основные знаки отличия.",
-+=======
-+	"overviewRulerWordHighlightForeground": "Цвет метки линейки в окне просмотра для выделений символов.",
-+	"overviewRulerWordHighlightStrongForeground": "Цвет метки линейки в окне просмотра для выделений символов, доступных для записи. ",
-+>>>>>>> .their
- 	"wordHighlight.next.label": "Перейти к следующему выделению символов",
- 	"wordHighlight.previous.label": "Перейти к предыдущему выделению символов"
- }
-\ No newline at end of file
-changed in both
-  base   100644 b8216927851de334ae4cceeeb5443a2820d5e776 i18n/rus/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  our    100644 c6bce4e5b081d94db7fb3a1598287f67537f7b4f i18n/rus/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  their  100644 74a4edfb15c69c45a2ffec724b979db4c9f52f93 i18n/rus/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 7314aa060875ee62bb108f63f9fce24622982510 i18n/rus/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 60e5e887ae41d0c2770bdb1306a52fd5bbf7375a i18n/rus/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 ddfd930f08e6001c274dc2493287b6697433f71d i18n/rus/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,11 +10,19 @@
- 	"diff": "Сравнение двух файлов друг с другом",
- 	"add": "Добавление папок в последнее активное окно.",
- 	"goto": "Открытие файла по указанному пути с выделением указанного символа в указанной строке.",
-+<<<<<<< .our
- 	"newWindow": "Принудительно открыть новое окно.",
- 	"reuseWindow": "Принудительно открыть файл или папку в последнем активном окне.",
- 	"wait": "Дождаться закрытия файлов перед возвратом.",
- 	"locale": "Языковой стандарт, который следует использовать (например, en-US или zh-TW).",
- 	"userDataDir": "Указывает каталог, в котором хранятся данные пользователей. Может использоваться для открытия нескольких отдельных экземпляров Code.",
-+=======
-+	"newWindow": "Принудительно запустить новый экземпляр Code.",
-+	"reuseWindow": "Принудительно открыть файл или папку в последнем активном окне.",
-+	"wait": "Дождаться закрытия файлов перед возвратом.",
-+	"locale": "Языковой стандарт, который следует использовать (например, en-US или zh-TW).",
-+	"userDataDir": "Указывает каталог, в котором хранятся данные пользователей, используется в случае выполнения от имени привилегированного пользователя.",
-+>>>>>>> .their
- 	"version": "Печать версии.",
- 	"help": "Распечатать данные об использовании.",
- 	"extensionHomePath": "Задайте корневой путь для расширений.",
-@@ -32,8 +40,11 @@
- 	"inspect-extensions": "Разрешить отладку и профилирование расширений. Проверьте URI подключения для инструментов разработчика.",
- 	"inspect-brk-extensions": "Разрешить отладку и профилирование расширений, когда узел расширения приостановлен после запуска. Проверьте URI подключения для инструментов разработчика. ",
- 	"disableGPU": "Отключить аппаратное ускорение GPU.",
-+<<<<<<< .our
- 	"uploadLogs": "Отправляет журналы из текущего сеанса в защищенную конечную точку.",
- 	"maxMemory": "Максимальный размер памяти для окна (в МБ).",
-+=======
-+>>>>>>> .their
- 	"usage": "Использование",
- 	"options": "параметры",
- 	"paths": "пути",
-changed in both
-  base   100644 c25a9a85ff7ba00ef21a13c790094ead598b3c21 i18n/rus/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 b5b010a1ed08e7bd0639632258a4ace9da636f30 i18n/rus/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 8201cea8194efb9f86ecf108f6a428226a57974b i18n/rus/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -7,17 +7,23 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"invalidManifest": "Недопустимое расширение: package.json не является файлом JSON.",
-+<<<<<<< .our
- 	"incompatible": "Не удалось установить расширение '{0}', так как оно не совместимо с Code '{1}'.",
-+=======
-+>>>>>>> .their
- 	"restartCode": "Перезапустите код перед переустановкой {0}.",
- 	"installingOutdatedExtension": "Уже установлена более новая версия этого расширения. Вы хотите переопределить ее более старой версией?",
- 	"override": "Переопределить",
- 	"cancel": "Отмена",
-+<<<<<<< .our
- 	"errorInstallingDependencies": "Ошибка при установке зависимостей. {0}",
- 	"MarketPlaceDisabled": "Marketplace не включен",
- 	"removeError": "Ошибка при удалении расширения: {0}. Закройте и снова откройте VS Code, затем повторите попытку.",
- 	"Not a Marketplace extension": "Можно переустановить только расширения из Marketplace",
- 	"notFoundCompatible": "Невозможно установить '{0}'; нет версии, совместимой с VS Code '{1}'.",
- 	"malicious extension": "Не удается установить расширение, так как оно помечено как проблемное.",
-+=======
-+>>>>>>> .their
- 	"notFoundCompatibleDependency": "Не удается выполнить установку, так как не найдено зависимое расширение '{0}', совместимое с текущей версией VS Code '{1}'. ",
- 	"quitCode": "Невозможно установить расширение. Пожалуйста, выйдите и зайдите в VS Code перед переустановкой.",
- 	"exitCode": "Невозможно установить расширение. Пожалуйста, выйдите и зайдите в VS Code перед переустановкой.",
-changed in both
-  base   100644 62863fdeb53c1f97a0aea26a0cc5f8b4da03a08b i18n/rus/src/vs/platform/message/common/message.i18n.json
-  our    100644 d2165310fe587911c53ff08a32d4a1a51c619758 i18n/rus/src/vs/platform/message/common/message.i18n.json
-  their  100644 aab52c88b341702c27130464845802e51893f5ec i18n/rus/src/vs/platform/message/common/message.i18n.json
-changed in both
-  base   100644 98e2cebe278a569ebc93b9f5a2b0590fb6d02e1b i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 a203da5726ce360e6e4c7bd4be5cee05446e8ca5 i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 bbb9e4cefb0ef95c41cf32b4721247685c8d46c8 i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -68,6 +68,7 @@
- 	"editorWidgetBorder": "Цвет границы мини-приложений редактора. Этот цвет используется только в том случае, если у мини-приложения есть граница и если этот цвет не переопределен мини-приложением.",
- 	"editorSelectionBackground": "Цвет выделения редактора.",
- 	"editorSelectionForeground": "Цвет выделенного текста в режиме высокого контраста.",
-+<<<<<<< .our
- 	"editorInactiveSelection": "Цвет выбора в не активном редакторе. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
- 	"editorSelectionHighlight": "Цвет регионов с тем же содержимым, что и в выделении. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
- 	"editorSelectionHighlightBorder": "Цвет границы регионов с тем же содержимым, что и в выделении.",
-@@ -79,6 +80,9 @@
- 	"findRangeHighlightBorder": "Цвет границы диапазона для ограничения поиска. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
- 	"findWidgetResizeBorder": "Цвет границ панели изменения размера для мини-приложения поиска.",
- 	"hoverHighlight": "Выделение под словом, для которого показано наведение. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
-+=======
-+	"editorFindMatch": "Цвет текущего поиска совпадений.",
-+>>>>>>> .their
- 	"hoverBackground": "Цвет фона при наведении указателя на редактор.",
- 	"hoverBorder": "Цвет границ при наведении указателя на редактор.",
- 	"activeLinkForeground": "Цвет активных ссылок.",
-@@ -86,12 +90,15 @@
- 	"diffEditorRemoved": "Цвет фона для удаленного текста. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия. ",
- 	"diffEditorInsertedOutline": "Цвет контура для добавленных строк.",
- 	"diffEditorRemovedOutline": "Цвет контура для удаленных строк.",
-+<<<<<<< .our
- 	"mergeCurrentHeaderBackground": "Фон текущего заголовка при конфликтах встроеного слияния. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
- 	"mergeCurrentContentBackground": "Фон текущего содержания при конфликтах встроеного слияния. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
- 	"mergeIncomingHeaderBackground": "Фон измененного заголовка при конфликтах встроенного слияния. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
- 	"mergeIncomingContentBackground": "Фон измененного содержания при конфликтах встроенного слияния. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
- 	"mergeCommonHeaderBackground": "Фон заголовка для общего предшественника при конфликтах внутреннего слияния. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
- 	"mergeCommonContentBackground": "Фон содержания общего предшественника при конфликтах внутреннего слияния. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
-+=======
-+>>>>>>> .their
- 	"mergeBorder": "Цвет границы заголовков и разделителя во внутренних конфликтах слияния.",
- 	"overviewRulerCurrentContentForeground": "Цвет переднего плана линейки текущего окна во внутренних конфликтах слияния.",
- 	"overviewRulerIncomingContentForeground": "Цвет переднего плана линейки входящего окна во внутренних конфликтах слияния.",
-added in both
-  our    100644 b7b1c72487ebcdd28a2f6de4bbc845fb5f8459a4 i18n/rus/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,4 +11,12 @@
- 	"codeActionsOnSave.didTimeout": "Метод codeActionsOnSave прерван через {0} мс",
- 	"timeout.onWillSave": "Событие onWillSaveTextDocument-event прервано по истечении 1750 мс",
- 	"saveParticipants": "Сохранение участников..."
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 9f9c8f9221d8249c95724d9daae63f7103b1f7fa i18n/rus/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  our    100644 efe7bffddd0505fd6690a01342f518f8a199e753 i18n/rus/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  their  100644 9dad9f3a71bcae83121bb862a94fedbd527d9147 i18n/rus/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,7 @@
- 	],
- 	"treeView.notRegistered": "Отсутствует зарегистрированное представление в виде дерева с идентификатором '{0}'.",
- 	"treeView.duplicateElement": "Элемент с идентификационным номером {0} уже зарегестрирован"
-+=======
-+	"treeView.notRegistered": "Отсутствует зарегистрированное представление в виде дерева с идентификатором '{0}'."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7f87d17117ef5dbdd32a150b1191e9944234e145 i18n/rus/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 c446918f7398d91df096414504ebb365f7b433fb i18n/rus/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 c63304e93bab12fd229eb7cbe574717daeb741ca i18n/rus/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -15,5 +15,9 @@
- 	"saveWorkspace": "Сохранить рабочую область",
- 	"openWorkspaceAction": "Открыть рабочую область...",
- 	"openWorkspaceConfigFile": "Открыть файл конфигурации рабочей области",
-+<<<<<<< .our
- 	"duplicateWorkspaceInNewWindow": "Создать копию рабочей области в новом окне"
-+=======
-+	"openFolderAsWorkspaceInNewWindow": "Открыть папку как рабочую область в новом окне"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 29ba2b2f4f0b3d5e5f0c9d7456645bda94725c1c i18n/rus/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-  their  100644 80b92b744452b7fad0f32ee4dd3138fd0e648baa i18n/rus/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"addFolderToWorkspace": "Добавить папку в рабочую область...",
- 	"add": "&&Добавить",
- 	"addFolderToWorkspaceTitle": "Добавить папку в рабочую область",
-changed in both
-  base   100644 3c123d9ce41de04bda8ec966cfe236ac491435ff i18n/rus/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  our    100644 0dbd953e79a55730f12c5d543642ff3b7502f278 i18n/rus/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  their  100644 6382785efa1b173eeb4f221cb5bbd94f6f4b2935 i18n/rus/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-@@ -19,6 +19,7 @@
- 	"close": "Закрыть",
- 	"closeOthers": "Закрыть другие",
- 	"closeRight": "Закрыть справа",
-+<<<<<<< .our
- 	"closeAllSaved": "Закрыть сохраненные",
- 	"closeAll": "Закрыть все",
- 	"keepOpen": "Оставить открытым",
-@@ -27,6 +28,15 @@
- 	"keepEditor": "Сохранить редактор",
- 	"closeEditorsInGroup": "Закрыть все редакторы в группе",
- 	"closeSavedEditors": "Закрыть сохраненные редакторы в группе",
-+=======
-+	"closeAllUnmodified": "Закрыть без изменений",
-+	"closeAll": "Закрыть все",
-+	"keepOpen": "Оставить открытым",
-+	"showOpenedEditors": "Показать открытые редакторы",
-+	"keepEditor": "Сохранить редактор",
-+	"closeEditorsInGroup": "Закрыть все редакторы в группе",
-+	"closeUnmodifiedEditors": "Закрыть редакторы без изменений в группе",
-+>>>>>>> .their
- 	"closeOtherEditors": "Закрыть другие редакторы",
- 	"closeRightEditors": "Закрыть редакторы справа"
- }
-\ No newline at end of file
-changed in both
-  base   100644 4dba80c961def551c7c1860039a2c339eaf2fff3 i18n/rus/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 99aca234c7b93506a14c237c3960c0558fba20a4 i18n/rus/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 f1572dc1c1826463f3e477c46b12614c03597cc2 i18n/rus/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 32e566863c80db35e9dd9f27cdaad3f1be966e9e i18n/rus/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  our    100644 dc07ab24638605893378a2dd26ba1cc911f57626 i18n/rus/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  their  100644 64223b3c4b5b3046daafe6c7bdc570491406e018 i18n/rus/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-changed in both
-  base   100644 7e9ef4fb62e34268424ff77de9e4bd38535134f8 i18n/rus/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  our    100644 ce74baadb43ac75843c84b736b7042b0ef2c0120 i18n/rus/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  their  100644 f8b0ee45376a259e9c97cae302f254d44c28b84b i18n/rus/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-@@ -12,6 +12,10 @@
- 	"editableEditorWithInputAriaLabel": "{0}. Редактор сравнения текстовых файлов.",
- 	"editableEditorAriaLabel": "Редактор сравнения текстовых файлов.",
- 	"navigate.next.label": "Следующее исправление",
-+<<<<<<< .our
- 	"navigate.prev.label": "Предыдущее исправление",
- 	"toggleIgnoreTrimWhitespace.label": "Игнорировать удаление пробелов"
-+=======
-+	"navigate.prev.label": "Предыдущее исправление"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f09bdce23248db6030dc7a4c80eda8e5c117baf4 i18n/rus/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  our    100644 9d49f9d5c3c21f241c037d0a6e2a388b8bdee631 i18n/rus/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  their  100644 cf0dce309ede1b1a726d38dd77f01d6c3e461984 i18n/rus/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"close": "Закрыть",
-+>>>>>>> .their
- 	"araLabelEditorActions": "Действия редактора"
- }
-\ No newline at end of file
-changed in both
-  base   100644 bd0d0f8b98bdcbebcab5d3adf085fa08676778b7 i18n/rus/src/vs/workbench/common/theme.i18n.json
-  our    100644 1ea38452a6e8832b511f19d37e5007a3b201c44b i18n/rus/src/vs/workbench/common/theme.i18n.json
-  their  100644 364c328c4c01eb5e2d283727aa606345379fd73f i18n/rus/src/vs/workbench/common/theme.i18n.json
-@@ -24,7 +24,10 @@
- 	"editorGroupBackground": "Цвет фона группы редакторов. Группы редакторов представляют собой контейнеры редакторов. Цвет фона отображается при перетаскивании групп редакторов.",
- 	"tabsContainerBackground": "Цвет фона для заголовка группы редакторов, когда вкладки включены. Группы редакторов представляют собой контейнеры редакторов.",
- 	"tabsContainerBorder": "Цвет границы для заголовка группы редакторов, когда вкладки включены. Группы редакторов представляют собой контейнеры редакторов.",
-+<<<<<<< .our
- 	"editorGroupHeaderBackground": "Цвет фона для заголовка группы редакторов, когда вкладки отключены (`\"workbench.editor.showTabs\": false`). Группы редакторов представляют собой контейнеры редакторов.",
-+=======
-+>>>>>>> .their
- 	"editorGroupBorder": "Цвет для разделения нескольких групп редакторов. Группы редакторов — это контейнеры редакторов.",
- 	"editorDragAndDropBackground": "Цвет фона при перетаскивании редакторов. Этот цвет должен обладать прозрачностью, чтобы содержимое редактора оставалось видимым.",
- 	"panelBackground": "Цвет фона панели. Панели показаны под областью редактора и содержат такие представления, как выходные данные и встроенный терминал.",
-@@ -41,8 +44,11 @@
- 	"statusBarNoFolderBorder": "Цвет границы строки состояния, который распространяется на боковую панель и редактор, когда открытые папки отсутствуют. Строка состояния расположена в нижней части окна.",
- 	"statusBarItemActiveBackground": "Цвет фона элементов панели состояния при щелчке. Панель состояния отображается внизу окна.",
- 	"statusBarItemHoverBackground": "Цвет фона элементов панели состояния при наведении. Панель состояния отображается внизу окна.",
-+<<<<<<< .our
- 	"statusBarProminentItemBackground": "Цвет фона приоритетных элементов панели состояния. Приоритетные элементы выделяются на фоне других элементов панели состояния, чтобы подчеркнуть их значение. Чтобы просмотреть пример, измените режим \"Toggle Tab Key Moves Focus\" из палитры команд. Панель состояния отображается в нижней части окна.",
- 	"statusBarProminentItemHoverBackground": "Цвет фона приоритетных элементов панели состояния при наведении. Приоритетные элементы выделяются на фоне других элементов панели состояния, чтобы подчеркнуть их значение. Чтобы просмотреть пример, измените режим \"Toggle Tab Key Moves Focus\" из палитры команд. Панель состояния отображается в нижней части окна.",
-+=======
-+>>>>>>> .their
- 	"activityBarBackground": "Цвет фона панели действий. Панель действий отображается слева или справа и позволяет переключаться между представлениями боковой панели.",
- 	"activityBarForeground": "Цвет переднего плана панели действий (например, цвет, используемый для значков). Панель действий отображается слева или справа и позволяет переключаться между представлениями боковой панели.",
- 	"activityBarBorder": "Цвет границы панели действий, который распространяется на боковую панель. Панель действий отображается слева или справа и позволяет переключаться между представлениями в боковой панели.",
-added in both
-  our    100644 69f15ecbcb81dc961efa29635e1bf71936245981 i18n/rus/src/vs/workbench/common/views.i18n.json
-  their  100644 2feabab41e559a13b0daf471017593e66beed996 i18n/rus/src/vs/workbench/common/views.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"duplicateId": "Представление с идентификатором '{0}' уже зарегистрировано в расположении '{1}'"
- }
-\ No newline at end of file
-changed in both
-  base   100644 2380d05741c3cbea0514da1f0c5d12343fef18b3 i18n/rus/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 266dadc0ddcb2cfb8391eafba4890dbacea4172b i18n/rus/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 5768ee78d85c96586af7f8d6ea9914bb6cc014c3 i18n/rus/src/vs/workbench/electron-browser/actions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"closeWindow": "Закрыть окно",
- 	"closeWorkspace": "Закрыть рабочую область",
- 	"noWorkspaceOpened": "В этом экземпляре отсутствуют открытые рабочие области.",
-@@ -50,6 +53,14 @@
- 	"moveWindowTabToNewWindow": "Переместить вкладку окна в новое окно",
- 	"mergeAllWindowTabs": "Объединить все окна",
- 	"toggleWindowTabsBar": "Переключить панель вкладок окна",
-+<<<<<<< .our
- 	"about": "О программе {0}",
- 	"inspect context keys": "Проверить ключи контекста"
-+=======
-+	"configureLocale": "Настроить язык",
-+	"displayLanguage": "Определяет язык интерфейса VSCode.",
-+	"doc": "Список поддерживаемых языков см. в {0}.",
-+	"restart": "Для изменения значения требуется перезапуск VSCode.",
-+	"fail.createSettings": "Невозможно создать \"{0}\" ({1})."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f0c8c83bedf56fbc46c5e5c030f7b5d2806199a7 i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 bdb5e10a72aa6a97a13c01acd6d5626456147e68 i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 e67791315855f576a3280c032c5beeacc95d9224 i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,12 +35,19 @@
- 	"panelDefaultLocation": "Определяет расположение панели по умолчанию. Она может находиться снизу или справа от рабочего места.",
- 	"statusBarVisibility": "Управляет видимостью строки состояния в нижней части рабочего места.",
- 	"activityBarVisibility": "Управляет видимостью панели действий на рабочем месте.",
-+<<<<<<< .our
- 	"viewVisibility": "Управляет видимостью действий в заголовке представления. Действия в заголовке представления могут быть видимы всегда или видимы только тогда, когда представление получает фокус или на него наводится курсор мыши.",
- 	"fontAliasing": "Управляет методом сглаживания шрифтов в рабочей области.\n- default: субпиксельное сглаживание шрифтов; позволит добиться максимальной четкости текста на большинстве дисплеев за исключением Retina\n- antialiased: сглаживание шрифтов на уровне пикселей, в отличие от субпиксельного сглаживания; позволит сделать шрифт более светлым в целом\n- none: сглаживание шрифтов отключено; текст будет отображаться с неровными острыми краями\n- auto: автоматически применяется режим \"default\" или \"antialiased\" в зависимости от разрешения дисплея (количество точек на дюйм).",
- 	"workbench.fontAliasing.default": "Субпиксельное сглаживание шрифтов; позволит добиться максимальной четкости текста на большинстве дисплеев за исключением Retina.",
- 	"workbench.fontAliasing.antialiased": "Сглаживание шрифтов на уровне пикселей, в отличие от субпиксельного сглаживания. Может сделать шрифт светлее в целом.",
- 	"workbench.fontAliasing.none": "Отключает сглаживание шрифтов; текст будет отображаться с неровными острыми краями.",
- 	"workbench.fontAliasing.auto": "Автоматически применяется режим \"default\" или \"antialiased\" в зависимости от разрешения дисплея (количество точек на дюйм).",
-+=======
-+	"fontAliasing": "Управляет методом сглаживания шрифтов в рабочей области.-по умолчанию: субпиксельное сглаживание шрифтов; позволит добиться максимальной четкости текста на большинстве дисплеев за исключением Retina - сглаживание: сглаживание шрифтов на уровне пикселей, в отличие от субпиксельного сглаживания; позволит сделать шрифт более светлым в целом - нет: сглаживание шрифтов отключено; текст будет отображаться с неровными острыми краями ",
-+	"workbench.fontAliasing.default": "Субпиксельное сглаживание шрифтов; позволит добиться максимальной четкости текста на большинстве дисплеев за исключением Retina.",
-+	"workbench.fontAliasing.antialiased": "Сглаживание шрифтов на уровне пикселей, в отличие от субпиксельного сглаживания. Может сделать шрифт светлее в целом.",
-+	"workbench.fontAliasing.none": "Отключает сглаживание шрифтов; текст будет отображаться с неровными острыми краями.",
-+>>>>>>> .their
- 	"enableNaturalLanguageSettingsSearch": "Определяет, следует ли включить режим поиска естественного языка для параметров.",
- 	"windowConfigurationTitle": "Окно",
- 	"window.openFilesInNewWindow.on": "Файлы будут открываться в новом окне.",
-changed in both
-  base   100644 64ed05c095833c3e9c6728b49eb1f1b308c79b57 i18n/rus/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  our    100644 f8d06534f608da61321ef16f51f67e05aee58a14 i18n/rus/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  their  100644 80636157f78b1d94a9f7a457a9f0926d303044e6 i18n/rus/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"debug.terminal.title": "отлаживаемый объект"
- }
-\ No newline at end of file
-changed in both
-  base   100644 4671a2c1d2386d77c57263adca2af6874f936563 i18n/rus/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  our    100644 aed4ddc96e0fa43f50c41bf2aa86012d93744f14 i18n/rus/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  their  100644 7b4f9ca1fd9ee43dfddb5a1e7a64613e1ed3dcde i18n/rus/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-changed in both
-  base   100644 3e00ebd88967071f0fa78b86272ed5b4184ad866 i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 11278b85abb135a3195540e01213542dadbc0081 i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 e55b39d762ba9ed7f50da7a6f13fc794c2632a9f i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,11 @@
- 	"exeBasedRecommendation": "Рекомендуется использовать это расширение, так как установлено {0}.",
- 	"fileBasedRecommendation": "Рекомендуется использовать это расширение (на основе недавно открытых файлов).",
- 	"workspaceRecommendation": "Это расширение рекомендуется пользователями текущей рабочей области.",
-+=======
-+	"workspaceRecommendation": "Это расширение рекомендуется пользователями текущей рабочей области.",
-+	"fileBasedRecommendation": "Рекомендуется использовать это расширение (на основе недавно открытых файлов).",
-+	"exeBasedRecommendation": "Рекомендуется использовать это расширение, так как установлено {0}.",
-+>>>>>>> .their
- 	"reallyRecommended2": "Для этого типа файлов рекомендуется использовать расширение '{0}'.",
- 	"reallyRecommendedExtensionPack": "Для этого типа файлов рекомендуется использовать пакет расширений '{0}'.",
- 	"install": "Установить",
-added in both
-  our    100644 a559dd5de9c17c83d8598a983cb5722c1a0a4524 i18n/rus/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-  their  100644 933a96a0d6f26d405048cb9bd7917959fda315d9 i18n/rus/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,13 @@
- 	],
- 	"workbenchConfigurationTitle": "Рабочее место",
- 	"feedbackVisibility": "Определяет, отображается ли отзыв Twitter (смайлик) на панели состояния в нижней части рабочего места."
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"workbenchConfigurationTitle": "Рабочее место"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 956ea0325cf1c64f1c13d732d89f6f2927535e96 i18n/rus/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"hide": "Скрыть"
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 821930bfc8797aa66e392542a9a207e98e5802c7 i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  our    100644 54559890c5017a8fa991d36e1d32e0ea4a0f5415 i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  their  100644 8ff5f3c27f7cdd0333ba5c5df8959667a7ac2027 i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-@@ -12,7 +12,10 @@
- 	"revertLocalChanges": "Отменить изменения и вернуться к содержимому на диске",
- 	"copyPathOfActive": "Копировать путь к активному файлу",
- 	"saveAllInGroup": "Сохранить все в группе",
-+<<<<<<< .our
- 	"saveFiles": "Сохранить все файлы",
-+=======
-+>>>>>>> .their
- 	"revert": "Отменить изменения в файле",
- 	"compareActiveWithSaved": "Сравнить активный файл с сохраненным",
- 	"closeEditor": "Закрыть редактор",
-@@ -24,12 +27,19 @@
- 	"copyPath": "Скопировать путь",
- 	"saveAll": "Сохранить все",
- 	"compareWithSaved": "Сравнить с сохраненным",
-+<<<<<<< .our
- 	"compareWithSelected": "Сравнить с выбранным",
- 	"compareSource": "Выбрать для сравнения",
- 	"compareSelected": "Сравнить выбранное",
- 	"close": "Закрыть",
- 	"closeOthers": "Закрыть другие",
- 	"closeSaved": "Закрыть сохраненное",
-+=======
-+	"compareSource": "Выбрать для сравнения",
-+	"close": "Закрыть",
-+	"closeOthers": "Закрыть другие",
-+	"closeUnmodified": "Закрыть без изменений",
-+>>>>>>> .their
- 	"closeAll": "Закрыть все",
- 	"deleteFile": "Удалить навсегда"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8e87ab6930ac96fbe342955841c0a060b532186e i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 2c38d1331217bb70a1fc665d1c79c9658eacde43 i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 33066ff5f3379043f15062a1edfbeead49649ff7 i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"newFile": "Создать файл",
- 	"newFolder": "Создать папку",
- 	"rename": "Переименовать",
-@@ -13,7 +16,11 @@
- 	"copyFile": "Копировать",
- 	"pasteFile": "Вставить",
- 	"retry": "Повторить попытку",
-+<<<<<<< .our
- 	"renameWhenSourcePathIsParentOfTargetError": "Для добавления дочерних элементов к существующей папке используйте команды \"Создать папку\" или \"Создать файл\"",
-+=======
-+	"openFolderFirst": "Сначала откройте папку, в которой будут созданы файлы и папки.",
-+>>>>>>> .their
- 	"newUntitledFile": "Новый файл без имени",
- 	"createNewFile": "Создать файл",
- 	"createNewFolder": "Создать папку",
-@@ -43,11 +50,19 @@
- 	"confirmDeleteMessageMultiple": "Вы действительно хотите удалить следующие файлы ({0}) без возможности восстановления?",
- 	"confirmDeleteMessageFolder": "Вы действительно хотите удалить папку \"{0}\" и ее содержимое без возможности восстановления?",
- 	"confirmDeleteMessageFile": "Вы действительно хотите удалить \"{0}\" без возможности восстановления?",
-+<<<<<<< .our
- 	"addFiles": "Добавить файлы",
- 	"confirmOverwrite": "Файл или папка с таким именем уже существует в конечной папке. Заменить их?",
- 	"replaceButtonLabel": "Заменить",
- 	"fileIsAncestor": "Файл для вставки является предком папки назначения",
- 	"fileDeleted": "Файл для вставки был удален или перемещен в другое место",
-+=======
-+	"irreversible": "Это действие необратимо.",
-+	"permDelete": "Удалить навсегда",
-+	"importFiles": "Импорт файлов",
-+	"confirmOverwrite": "Файл или папка с таким именем уже существует в конечной папке. Заменить их?",
-+	"replaceButtonLabel": "Заменить",
-+>>>>>>> .their
- 	"duplicateFile": "Дублировать",
- 	"globalCompareFile": "Сравнить активный файл с...",
- 	"openFileToCompare": "Чтобы сравнить файл с другим файлом, сначала откройте его.",
-changed in both
-  base   100644 f51fb88b34b0afd8d6f8f7420a62fe6370e9c16a i18n/rus/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  our    100644 0f4e31686b5285cee77568bb441986c0fcd0b94a i18n/rus/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  their  100644 18416689c0121ec6502f0e886685e95e1a158437 i18n/rus/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"revealInWindows": "Отобразить в проводнике",
- 	"revealInMac": "Отобразить в Finder",
- 	"openContainer": "Открыть содержащую папку",
-@@ -13,7 +16,10 @@
- 	"save": "Сохранить",
- 	"saveAll": "Сохранить все",
- 	"removeFolderFromWorkspace": "Удалить папку из рабочей области",
-+<<<<<<< .our
- 	"genericRevertError": "Не удалось отменить изменения \"{0}\": {1}",
-+=======
-+>>>>>>> .their
- 	"modifiedLabel": "{0} (на диске) ↔ {1}",
- 	"openFileToReveal": "Чтобы отобразить файл, сначала откройте его",
- 	"openFileToCopy": "Чтобы скопировать путь к файлу, сначала откройте его"
-changed in both
-  base   100644 d0ffe58b0f9ebe24ca76843f1e06cf08de4b0f94 i18n/rus/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 8abc8c89790838ab546398086d2a394a5956c230 i18n/rus/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 6f4f5194bc64405a5fa5211a08ae2ed9dd843634 i18n/rus/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-@@ -40,7 +40,10 @@
- 	"formatOnSave": "Форматирование файла при сохранении. Модуль форматирования должен быть доступен, файл не должен сохраняться автоматически, а работа редактора не должна завершаться.",
- 	"formatOnSaveTimeout": "Время ожидания форматирования при сохранении. Указывает ограничение времени в миллисекундах для команд форматирования при сохранении. Команды, выполнение которых превышает указанное время ожидания, будут отменены.",
- 	"explorerConfigurationTitle": "Проводник",
-+<<<<<<< .our
- 	"openEditorsVisible": "Число редакторов, отображаемых на панели \"Открытые редакторы\".",
-+=======
-+>>>>>>> .their
- 	"autoReveal": "Определяет, будет ли проводник автоматически отображать и выбирать файлы при их открытии.",
- 	"enableDragAndDrop": "Определяет, разрешено ли перемещение файлов и папок перетаскиванием в проводнике.",
- 	"confirmDragAndDrop": "Определяет, должно ли запрашиваться подтверждение при перемещении файлов и папок в проводнике.",
-changed in both
-  base   100644 d5622eec39a12463acb3bf3b84df8406aca38203 i18n/rus/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  our    100644 2c555771b4a5a50496e84e47522fb4a9fc9a7db4 i18n/rus/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  their  100644 a99d73ed5193b2044b825c26d22f4fd23d5be40d i18n/rus/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,6 +14,12 @@
- 	"readonlySaveErrorAdmin": "Не удалось сохранить \"{0}\": файл защищен от записи. Чтобы повторить попытку с правами администратора, выберите \"Перезаписать с правами администратора\".",
- 	"readonlySaveError": "Не удалось сохранить \"{0}\": файл защищен от записи. Чтобы попытаться снять защиту, выберите \"Перезаписать\".",
- 	"permissionDeniedSaveError": "Не удалось сохранить \"{0}\": недостаточные разрешения. Чтобы повторить попытку с правами администратора, выберите \"Повторить попытку с правами администратора\".",
-+=======
-+	"userGuide": "Используйте команды на панели инструментов редактора справа для **отмены** изменений или **перезаписи** содержимого на диске с учетом этих изменений",
-+	"overwrite": "Перезаписать",
-+	"retry": "Повторить попытку",
-+	"discard": "Отмена",
-+>>>>>>> .their
- 	"genericSaveError": "Не удалось сохранить \"{0}\": {1}",
- 	"learnMore": "Дополнительные сведения",
- 	"dontShowAgain": "Больше не показывать",
-changed in both
-  base   100644 ecfb243efe9b21f2cee45008abbfd753f73df0e8 i18n/rus/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  our    100644 521498e74533cb56165fc110217cfd5500b2d565 i18n/rus/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  their  100644 e8bc16acb29acaefc24728699479bc09c02b0ef6 i18n/rus/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-added in both
-  our    100644 e75467d67155eeec49d79a0cb44d78fbecda4936 i18n/rus/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-  their  100644 fa130c143cff110735ad65ca1497754598b46f7a i18n/rus/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,5 +11,13 @@
- 	"sharedLog": "Лог (общий)",
- 	"rendererLog": "Журнал (окно)",
- 	"extensionsLog": "Журнал (узел расширения)",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"developer": "Разработчик"
- }
-\ No newline at end of file
-added in both
-  our    100644 0e35df992440dc39588c4c4bfc73c2bf58694991 i18n/rus/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  their  100644 6d7a48207b90837ea75740fd72c545dee105ff20 i18n/rus/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -16,15 +17,34 @@
- 	"selectProcess": "Выберите журнал для обработки",
- 	"openLogFile": "Открыть лог",
- 	"setLogLevel": "Установите уровень ведения журнала...",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"openLogsFolder": "Открыть папку журналов",
-+	"mainProcess": "Главный",
-+	"sharedProcess": "Общий",
-+	"rendererProcess": "Окно",
-+	"extensionHost": "Узел расширения",
-+	"setLogLevel": "Установите уровень ведения журнала",
-+>>>>>>> .their
- 	"trace": "Трассировка",
- 	"debug": "Отладка",
- 	"info": "Сведения",
- 	"warn": "Предупреждение",
- 	"err": "Ошибка",
-+<<<<<<< .our
- 	"critical": "Критично",
- 	"off": "Отключено",
- 	"selectLogLevel": "Установите уровень ведения журнала",
- 	"default and current": "По умолчанию и текущий",
- 	"default": "По умолчанию",
- 	"current": "Текущий"
-+=======
-+	"off": "Отключено",
-+	"selectLogLevel": "Установите уровень ведения журнала"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 4a0ebeccf873e1e0f47f5c6df66188e36b38f2ff i18n/rus/src/vs/workbench/parts/markers/common/messages.i18n.json
-  our    100644 a1ef2cd59b1cfdd0fef3ef7c2f1f17680b2a643a i18n/rus/src/vs/workbench/parts/markers/common/messages.i18n.json
-  their  100644 c561464b58350e9cf499b713d23184cff38fbe55 i18n/rus/src/vs/workbench/parts/markers/common/messages.i18n.json
-@@ -7,8 +7,11 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"viewCategory": "Просмотреть",
-+<<<<<<< .our
- 	"problems.view.toggle.label": "Включить или отключить сообщения о проблемах (ошибки, предупреждения, информационные сообщения)",
- 	"problems.view.focus.label": "Перевести фокус на сообщения о проблемах (ошибки, предупреждения, информационные сообщения) ",
-+=======
-+>>>>>>> .their
- 	"problems.panel.configuration.title": "Представление \"Проблемы\"",
- 	"problems.panel.configuration.autoreveal": "Определяет, следует ли представлению \"Проблемы\" отображать файлы при их открытии",
- 	"markers.panel.title.problems": "Проблемы",
-added in both
-  our    100644 66e8e86a36d5d543bef59dd5916b76c60f477b16 i18n/rus/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-  their  100644 68cc0434ecd2068b11998afaae95f90e09b5fd10 i18n/rus/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -11,4 +12,15 @@
- 	"viewCategory": "Просмотр",
- 	"clearOutput.label": "Очистить выходные данные",
- 	"openActiveLogOutputFile": "Просмотр: открыть активный выходной файл журнала"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"output": "Вывод",
-+	"viewCategory": "Просмотр",
-+	"clearOutput.label": "Очистить выходные данные"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 78ebecbf38b11d94c1d1b83ebcaaa8b64e3ebcc1 i18n/rus/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,12 @@
- 	],
- 	"output": "{0} - выходные данные",
- 	"channel": "Канал выходных данных для '{0}'"
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 cdba5fc34b20d61e1b453013d04522dcb8083ed2 i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 2639f8a70dc171eed499a24e68b57de977a1debe i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 aa42a73f571c9e4cbfa1a6f46e495d33b17dca5a i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"defaultSettings": "Чтобы переопределить параметры по умолчанию, укажите свои параметры в области справа.",
- 	"noSettingsFound": "Параметры не найдены.",
- 	"settingsSwitcherBarAriaLabel": "Переключатель параметров",
-changed in both
-  base   100644 345c107b419df1726ab8ea2085df7d0d7187d01f i18n/rus/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  our    100644 483c3b52c9f8f9cbb40dc452ed503745972ba5e2 i18n/rus/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  their  100644 3305d6aa84d144d7e837abbb85ab71651d52c337 i18n/rus/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-changed in both
-  base   100644 a683b0d8467ceb8de1d0c32015833691e735ce99 i18n/rus/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  our    100644 c4999d23f084babf6ae588d11b5369e70fb0cf07 i18n/rus/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  their  100644 f0071d32bf8d2e6a969c2190e1af1574557756b9 i18n/rus/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"view": "Просмотр",
- 	"commandsHandlerDescriptionDefault": "Показать и выполнить команды",
- 	"gotoLineDescriptionMac": "Перейти к строке",
-changed in both
-  base   100644 029a91dd1211a2d0d2a7b909a874cad6a54856c1 i18n/rus/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  our    100644 39961b3a4e8ca19501aa8f2ce29968dd3e4cbb83 i18n/rus/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  their  100644 9b3baff608332f78e429028ad878102c1235f6e3 i18n/rus/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-@@ -10,8 +10,12 @@
- 	"source control": "Система управления версиями",
- 	"toggleSCMViewlet": "Показать SCM",
- 	"view": "Просмотреть",
-+<<<<<<< .our
- 	"scmConfigurationTitle": "SCM",
- 	"alwaysShowProviders": "Всегда отображать хранилище исходного кода",
- 	"diffDecorations": "Управляет декораторами diff в редакторе.",
- 	"diffGutterWidth": "Управляет шириной (в пикселах) декораторов diff в поле (добавление и изменение)."
-+=======
-+	"scmConfigurationTitle": "SCM"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 acbdea84856b1cefb4e065513b84863254aa5518 i18n/rus/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 012af24286aec719761b0687ebd50b2292e4db5e i18n/rus/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 cd1b69665355d9112254187841fbb8f3c4985ebf i18n/rus/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-changed in both
-  base   100644 fb91734ab3bc363372fdf1dea6f0720c64d52c02 i18n/rus/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 113d804b27033c0eb1fd8478b7abca09ae0f3e64 i18n/rus/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 e2ad0465583f781ffdc748b254abb4273c4bcfe9 i18n/rus/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -16,7 +16,12 @@
- 	"findInWorkspace": "Найти в рабочей области...",
- 	"showTriggerActions": "Перейти к символу в рабочей области...",
- 	"name": "Поиск",
-+<<<<<<< .our
- 	"showSearchViewl": "Показать средство поиска",
-+=======
-+	"search": "Поиск",
-+	"showSearchViewlet": "Показать средство поиска",
-+>>>>>>> .their
- 	"view": "Просмотр",
- 	"findInFiles": "Найти в файлах",
- 	"openAnythingHandlerDescription": "Перейти к файлу",
-added in both
-  our    100644 be81058c120ea99acf154c232771dc0c03be4a7f i18n/rus/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-  their  100644 26ab76b193c42da36904f96687895ae1a8975ae8 i18n/rus/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -13,5 +14,14 @@
- 	"new.global.sep": "Новые фрагменты кода",
- 	"openSnippet.pickLanguage": "Выберите файл фрагментов кода или создайте фрагменты",
- 	"openSnippet.label": "Настроить пользовательские фрагменты кода",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"global.1": "({0})",
-+>>>>>>> .their
- 	"preferences": "Параметры"
- }
-\ No newline at end of file
-changed in both
-  base   100644 a3a8c117e656c5166b6788c38531e9e653c25775 i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  our    100644 4a2946695c164a4a0f1eb0ce1f03d90cce755916 i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  their  100644 0bfa5d00f22bb36ffd41809dd5a3ab1ad0d7c78d i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"snippetSchema.json.default": "Пустой фрагмент",
- 	"snippetSchema.json": "Настройка фрагмента пользователя",
- 	"snippetSchema.json.prefix": "Префикс, используемый при выборе фрагмента в Intellisense.",
-added in both
-  our    100644 c1919f596fc5f167770df0667fbe250479669163 i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-  their  100644 dd3a311fe89b353bba0bf915b580e0ebfee64fc7 i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,5 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"source.snippetGlobal": "Глобальный пользовательский фрагмент кода",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"source.snippet": "Фрагмент кода пользователя"
- }
-\ No newline at end of file
-changed in both
-  base   100644 6c5ec091a1a8bf47c22b120df8180dc103e3af1f i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  our    100644 6a37d94b67d26daf129e538d4e91992157d2b014 i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 afe0462f8a1bf28a66a62f5acfe40de60b9ebc00 i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,9 @@
- 	],
- 	"invalid.path.0": "В contributes.{0}.path требуется строка. Указанное значение: {1}",
- 	"invalid.language.0": "Если язык не указан, то в качестве значения параметра \"contributes.{0}.path\" необходимо указать файл \".code-snippets\". Указанное значение: {1}",
-+=======
-+	"invalid.path.0": "В contributes.{0}.path требуется строка. Указанное значение: {1}",
-+>>>>>>> .their
- 	"invalid.language": "Неизвестный язык в contributes.{0}.language. Указанное значение: {1}",
- 	"invalid.path.1": "contributes.{0}.path ({1}) должен был быть включен в папку расширения ({2}). Это может сделать расширение непереносимым.",
- 	"vscode.extension.contributes.snippets": "Добавляет фрагменты.",
-changed in both
-  base   100644 fc208588fb0fbe740f70c087d14259a8f43f705b i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 aca12bf1061a643000b1615902ead62bb39d5223 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 04ba7d28169afecb0309b7b00bc1bdc5d4f0e6bf i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -10,7 +10,11 @@
- 	"terminal.foreground": "Цвет переднего плана терминала.",
- 	"terminalCursor.foreground": "Цвет переднего плана курсора терминала.",
- 	"terminalCursor.background": "Цвет фона курсора терминала. Позволяет выбрать цвет символа, который перекрывается блочным курсором.",
-+<<<<<<< .our
- 	"terminal.selectionBackground": "Цвет фона выделения терминала.",
- 	"terminal.border": "Цвет границы, которая отделяет области в терминале. По умолчанию используется panel.border.",
- 	"terminal.ansiColor": "Цвет ANSI \"{0}\" в терминале."
-+=======
-+	"terminal.selectionBackground": "Цвет фона выделения терминала."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 440d374ef82a867ce1e826cae5020ba7637c4dc3 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  our    100644 cc8f5ba62551fedf802d2c73116bb6cf543dedf0 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  their  100644 9de408a96531f26b10ca2872b2d9cae2cffc0c62 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-@@ -8,7 +8,11 @@
- 	],
- 	"terminal.integrated.chooseWindowsShellInfo": "Вы можете изменить оболочку терминала по умолчанию, нажав кнопку \"Настроить\".",
- 	"customize": "Настроить",
-+<<<<<<< .our
- 	"never again": "Больше не показывать",
-+=======
-+	"cancel": "Отмена",
-+>>>>>>> .their
- 	"terminal.integrated.chooseWindowsShell": "Выберите предпочитаемую оболочку терминала. Ее можно позже изменить в параметрах",
- 	"terminalService.terminalCloseConfirmationSingular": "Есть активный сеанс терминала, завершить его?",
- 	"terminalService.terminalCloseConfirmationPlural": "Есть несколько активных сеансов терминала ({0}), завершить их?"
-changed in both
-  base   100644 54fbd1ada7bea832b4126e776a432a2416a6e049 i18n/rus/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  our    100644 2c983a39d579894623f58659f4686ad21c8ac392 i18n/rus/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  their  100644 04cb07cdd65339926fe65b4a50a88d81465067ea i18n/rus/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,4 +14,8 @@
- 	"fileBinaryError": "Похоже, файл является двоичным, и его нельзя открыть как текстовый.",
- 	"err.create": "Не удалось создать файл {0}",
- 	"fileMoveConflict": "Невозможно переместить или скопировать файл, так как он уже существует в папке назначения."
-+=======
-+	"fileNotModifiedError": "undefined",
-+	"fileBinaryError": "Похоже, файл является двоичным, и его нельзя открыть как текстовый."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 fd9cd98e381e558ab8aa0622777622809edef278 i18n/rus/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  our    100644 c95c2d23f40165f8294939adbeb06bfeb1329160 i18n/rus/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  their  100644 27106b8b44deea758057ba532dca3dd8c4013542 i18n/rus/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-changed in both
-  base   100644 9cba5bba5fd02f0bdeee2b92090657d20b995d21 i18n/rus/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 73e5413908fbafda8e65fdd1e7768bf4e42a1926 i18n/rus/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 768f28f6eae7f92a9394a892067e932fa662a109 i18n/rus/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-changed in both
-  base   100644 019229d3fbb49ee267496c8b4f77617bec14a7b4 i18n/rus/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  our    100644 680471e1ac0c7a4674469f91fa5e0f8217d52603 i18n/rus/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  their  100644 d4e81ae004d3800ac9660ff05a0dd0295368f335 i18n/rus/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-@@ -8,5 +8,10 @@
- 	],
- 	"errorInvalidTaskConfiguration": "Не удается записать файл конфигурации рабочей области. Откройте файл, исправьте ошибки и предупреждения и повторите попытку.",
- 	"errorWorkspaceConfigurationFileDirty": "Не удается записать файл конфигурации рабочей области, так как файл был изменен. Сохраните файл и повторите попытку.",
-+<<<<<<< .our
- 	"openWorkspaceConfigurationFile": "Открыть конфигурацию рабочей области"
-+=======
-+	"openWorkspaceConfigurationFile": "Открыть файл конфигурации рабочей области",
-+	"close": "Закрыть"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 95a3249f5f42d72c85f1118613642151a0bf7432 i18n/trk/extensions/git/out/autofetch.i18n.json
-  our    100644 e8cd01ea688ad2f3d81abdedfd84873e92fd5d52 i18n/trk/extensions/git/out/autofetch.i18n.json
-  their  100644 737e720ea79d9b552bdd82bc0d6dba9081c7383f i18n/trk/extensions/git/out/autofetch.i18n.json
-@@ -7,7 +7,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"yes": "Evet",
-+	"read more": "Devamını oku",
- 	"no": "Hayır",
- 	"not now": "Daha sonra hatırlat",
-+<<<<<<< .our
- 	"suggest auto fetch": "Code'un [düzenli olarak 'git fetch' komutunu çalıştırmasını]({0}) ister misiniz?"
-+=======
-+	"suggest auto fetch": "Code'un düzenli olarak `git fetch` komutunu çalıştırmasını ister misiniz?"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 fac3c95bae738f7838f2d8abeae2fc33198e6b22 i18n/trk/extensions/git/out/commands.i18n.json
-  our    100644 6794dc4934caa0927c5d65dc1f742c2cefd9cd5b i18n/trk/extensions/git/out/commands.i18n.json
-  their  100644 1f602af17def513c8593487fc45294cce36a34da i18n/trk/extensions/git/out/commands.i18n.json
-@@ -75,8 +75,12 @@
- 	"ok": "Tamam",
- 	"push with tags success": "Başarılı bir şekilde etiketlerle gönderildi.",
- 	"pick remote": "'{0}' dalının yayınlanacağı bir uzak uçbirim seçin:",
-+<<<<<<< .our
- 	"sync is unpredictable": "Bu eylem, '{0}/{1}' deposuna commitleri gönderecek ve alacaktır.",
- 	"never again": "Tamam, Tekrar Gösterme",
-+=======
-+	"sync is unpredictable": "Bu eylem, '{0}' esas projesine commitleri gönderecek ve alacaktır.",
-+>>>>>>> .their
- 	"no remotes to publish": "Deponuzda yayınlamanın yapılacağı hiçbir uzak uçbirim yapılandırılmamış.",
- 	"no changes stash": "Geçici olarak saklanacak bir değişiklik yok.",
- 	"provide stash message": "İsteğe bağlı olarak bir geçici olarak saklama mesajı belirtin",
-changed in both
-  base   100644 34a8658c3922be1002212f040cace7d4c39bf362 i18n/trk/extensions/git/out/main.i18n.json
-  our    100644 22cc3828e0d29dd283113a2173362b997f248b1d i18n/trk/extensions/git/out/main.i18n.json
-  their  100644 ebd9e4be3fa503be51a49085efbf8cdef4b19020 i18n/trk/extensions/git/out/main.i18n.json
-changed in both
-  base   100644 3955baf58a0316b298f3939e180e82f77bab7484 i18n/trk/extensions/git/package.i18n.json
-  our    100644 c440a7230c670854e02c25e2d19a46df2b4abcb8 i18n/trk/extensions/git/package.i18n.json
-  their  100644 7e10d7b3daeb0393ed03dd7d4eaef943f299586c i18n/trk/extensions/git/package.i18n.json
-added in both
-  our    100644 8893bf346b34401ace4bd99635e7a8db66098e78 i18n/trk/extensions/typescript/out/commands.i18n.json
-  their  100644 2751d3bb07c455357481a32f33edb879ad40badd i18n/trk/extensions/typescript/out/commands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -13,4 +14,20 @@
- 	"typescript.noJavaScriptProjectConfig": "Dosya bir JavaScript projesinin parçası değil. Daha fazla bilgi almak için [buraya]({0}) tıklayın.",
- 	"typescript.configureTsconfigQuickPick": "tsconfig.json'u yapılandır",
- 	"typescript.configureJsconfigQuickPick": "jsconfig.json'u yapılandır"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"typescript.projectConfigNoWorkspace": "Bir TypeScript veya JavaScript projesini kullanmak için lütfen bir klasör açın",
-+	"typescript.projectConfigUnsupportedFile": "TypeScript mi yoksa JavaScript mi projesi olduğu tespit edilemedi. Desteklenmeyen dosya türü",
-+	"typescript.projectConfigCouldNotGetInfo": "TypeScript mi yoksa JavaScript mi projesi olduğu tespit edilemedi",
-+	"typescript.noTypeScriptProjectConfig": "Dosya bir TypeScript projesinin bir parçası değil",
-+	"typescript.noJavaScriptProjectConfig": "Dosya bir JavaScript projesinin bir parçası değil",
-+	"typescript.configureTsconfigQuickPick": "tsconfig.json'u yapılandır",
-+	"typescript.configureJsconfigQuickPick": "jsconfig.json'u yapılandır",
-+	"typescript.projectConfigLearnMore": "Daha Fazla Bilgi Edin"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 750d811d866eaa3d43818bd1d8e28c9898acf514 i18n/trk/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-  their  100644 ed15423097d5cbb03aeb8c474db3877ca0d1584f i18n/trk/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"selectAriaOption": "{0}"
- }
-\ No newline at end of file
-added in both
-  our    100644 36b27f91f651be04b8d69e6ded6a5a4741204c40 i18n/trk/src/vs/base/node/ps.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/trk/src/vs/base/node/ps.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"collecting": "CPU ve bellek bilgisi toplanıyor. Bu işlem birkaç saniye sürebilir."
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 3a5d4006fd7b681fc7de41047ccba5ea23784969 i18n/trk/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 80d2362504c2993d022a2eba3b68977e0e73b16b i18n/trk/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 d00cee8579ff5166807cb052755381b44bcf84e5 i18n/trk/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -16,7 +16,11 @@
- 	"lineNumbers.on": "Satır numaraları mutlak sayı olarak gösterilir.",
- 	"lineNumbers.relative": "Satır numaraları imlecin konumuna olan uzaklık olarak gösterilir.",
- 	"lineNumbers.interval": "Satır numaraları her 10 satırda bir gösterilir.",
-+<<<<<<< .our
- 	"lineNumbers": "Satır numaralarının görüntülenmesini denetler.",
-+=======
-+	"lineNumbers": "Satır numaralarının görüntülenmesini denetler. Olası değerler 'on', 'off', 'relative' ve 'interval'dir.\n",
-+>>>>>>> .their
- 	"rulers": "Belirli bir eşit genişlikli karakterlerden sonra dikey cetveller göster. Birden çok cetvel için birden çok değer kullanın. Dizi boş ise cetvel gösterilmez",
- 	"wordSeparators": "Sözcüklerle ilgili gezinti veya işlem yaparken kelime ayırıcı olarak kullanılacak karakterler",
- 	"tabSize": "Bir sekmenin eşit olduğu boşluk sayısı. Bu ayar, `editor.detectIndentation` açıkken dosya içeriğine bağlı olarak geçersiz kılınır.",
-changed in both
-  base   100644 6022a86b6cc49f3e32c1c4da21bd8325d92f169e i18n/trk/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 2cef84bd724584b1f220944adb841c7825808a67 i18n/trk/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 8fb29c3b6d61793d592a1c3f575c596f64cdb401 i18n/trk/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -8,8 +8,11 @@
- 	],
- 	"lineHighlight": "İmlecin bulunduğu satırın vurgusunun arka plan rengi.",
- 	"lineHighlightBorderBox": "İmlecin bulunduğu satırın kenarlığının arka plan rengi.",
-+<<<<<<< .our
- 	"rangeHighlight": "Hızlı açma veya arama özellikleri gibi vurgulanan aralıkların arka plan rengi. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
- 	"rangeHighlightBorder": "Vurgulanmış alanın etrafındaki kenarlıkların arka plan rengi.",
-+=======
-+>>>>>>> .their
- 	"caret": "Düzenleyici imlecinin rengi.",
- 	"editorCursorBackground": "Düzenleyici imlecinin arka plan rengi. Bir blok imlecinin kapladığı bir karakterin rengini özelleştirmeyi sağlar.",
- 	"editorWhitespaces": "Düzenleyicideki boşluk karakterlerinin rengi.",
-changed in both
-  base   100644 6bc3935d6f49b063ef85feb665e245d4c7e9f34b i18n/trk/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  our    100644 8f00d61b2f910b917c402fab646ed42ebd87d4ff i18n/trk/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-  their  100644 b9f1dd5ddfd778c505d1f9f8b85078f6ea4ae0cb i18n/trk/src/vs/editor/contrib/gotoError/gotoError.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -10,4 +11,11 @@
- 	"markerAction.previous.label": "Önceki Soruna Git (Hata, Uyarı, Bilgi)",
- 	"markerAction.nextInFiles.label": "Dosyalarda Sonraki Soruna Git (Hata, Uyarı, Bilgi)",
- 	"markerAction.previousInFiles.label": "Dosyalarda Önceki Soruna Git (Hata, Uyarı, Bilgi)"
-+=======
-+	"title.wo_source": "({0}/{1})",
-+	"editorMarkerNavigationError": "Düzenleyicinin işaretçi gezinti aracının hata rengi.",
-+	"editorMarkerNavigationWarning": "Düzenleyicinin işaretçi gezinti aracının uyarı rengi.",
-+	"editorMarkerNavigationInfo": "Düzenleyicinin işaretçi gezinti aracının bilgilendirme rengi.",
-+	"editorMarkerNavigationBackground": "Düzenleyicinin işaretçi gezinti aracının arka planı."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6faf663326db20aad45550dfe4eb9100056606f9 i18n/trk/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  our    100644 5d14aeee198e7881b94c6c28f52827c185996785 i18n/trk/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  their  100644 f6e38f50e993ddcc0ce78aae39e18293342c8ba9 i18n/trk/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,10 @@
- 	"wordHighlightStrongBorder": "Bir değişkene yazılırken ki gibi, bir sembolün yazma erişimi sırasındaki kenarlık rengi.",
- 	"overviewRulerWordHighlightForeground": "Sembol vurguları için genel bakış cetvelinin işaretleyici rengi. Altta yer alan süslemeleri gizlememek için renk mat olmamalıdır.",
- 	"overviewRulerWordHighlightStrongForeground": "Yazma erişimli sembol vurguları için genel bakış cetvelinin işaretleyici rengi. Altta yer alan süslemeleri gizlememek için renk mat olmamalıdır.",
-+=======
-+	"overviewRulerWordHighlightForeground": "Sembol vurguları için genel bakış cetvelinin işaretleyici rengi.",
-+	"overviewRulerWordHighlightStrongForeground": "Yazma erişimli sembol vurguları için genel bakış cetvelinin işaretleyici rengi.",
-+>>>>>>> .their
- 	"wordHighlight.next.label": "Sonraki Sembol Vurgusuna Git",
- 	"wordHighlight.previous.label": "Önceki Sembol Vurgusuna Git"
- }
-\ No newline at end of file
-changed in both
-  base   100644 5ddafd4b6b978d2fd799290a45716122eb6bdef0 i18n/trk/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  our    100644 cf0aa1dfaf2b39bdf7038b0ab5c826f2430d60ca i18n/trk/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  their  100644 5565278f23e7a27ac0b9b8f77088ec3336f58a3d i18n/trk/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 a4c4cd296d5db4ce1136a2bc299ac1232dc02f9f i18n/trk/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 de45d35b28e099e902eb3585dc451750064bb035 i18n/trk/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 6838345e4f98f3b46ae9471a0618445895b385ee i18n/trk/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,11 +10,19 @@
- 	"diff": "İki dosyayı birbiriyle karşılaştır.",
- 	"add": "Son aktif pencereye klasör(ler) ekle.",
- 	"goto": "Konumdaki bir dosyayı belirtilen satır ve sütunda aç.",
-+<<<<<<< .our
- 	"newWindow": "Yeni pencere açmaya zorla.",
- 	"reuseWindow": "Bir dosya veya klasörü son aktif pencerede açmaya zorlayın.",
- 	"wait": "Geri dönmeden önce dosyaların kapanmasını bekle.",
- 	"locale": "Kullanılacak yerel dil (örnek: en-US veya zh-TW).",
- 	"userDataDir": "Kullanıcı verilerinin tutulacağı klasörü belirtir. Code'un farklı örneklerini açmak için kullanılabilir.",
-+=======
-+	"newWindow": "Yeni bir Code örneğini zorla.",
-+	"reuseWindow": "Bir dosya veya klasörü son etkin pencerede açmaya zorlayın.",
-+	"wait": "Geri dönmeden önce dosyaların kapanmasını bekle.",
-+	"locale": "Kullanılacak yerel dil (örnek: en-US veya zh-TW).",
-+	"userDataDir": "Kullanıcı verilerinin tutulacağı klasörü belirtir, root olarak çalışırken yararlıdır.",
-+>>>>>>> .their
- 	"version": "Sürümü göster.",
- 	"help": "Kullanımı göster.",
- 	"extensionHomePath": "Eklentilerin kök dizinini belirle.",
-@@ -32,8 +40,11 @@
- 	"inspect-extensions": "Eklentilerde hata ayıklama ve ayrımlamaya izin ver. Bağlantı URI'ı için geliştirici araçlarını kontrol edin.",
- 	"inspect-brk-extensions": "Eklentilerde hata ayıklama ve ayrımlamaya eklenti sunucusu başladıktan hemen sonra duraklatılacak şekilde izin ver. Bağlantı URI'ı için geliştirici araçlarını kontrol edin.",
- 	"disableGPU": "GPU donanım hızlandırmasını devre dışı bırak.",
-+<<<<<<< .our
- 	"uploadLogs": "Geçerli oturumdaki günlükleri güvenli bir uçbirime yükler.",
- 	"maxMemory": "Bir pencere için maksimum bellek miktarı (Mbyte olarak).",
-+=======
-+>>>>>>> .their
- 	"usage": "Kullanım",
- 	"options": "seçenekler",
- 	"paths": "yollar",
-changed in both
-  base   100644 7cf70b2f373b87273786cad5f29d0b1a09fb87ba i18n/trk/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 8beb681b33236f0693c452fd17c2070b7f15779a i18n/trk/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 4014a5cf5420bea2dbb4f100b2f27f9d993d668a i18n/trk/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -7,11 +7,15 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"invalidManifest": "Eklenti geçersiz: package.json bir JSON dosyası değil.",
-+<<<<<<< .our
- 	"incompatible": "VS Code '{1}' ile uyumlu olmadığı için '{0}' eklentisi yüklenemiyor.",
-+=======
-+>>>>>>> .their
- 	"restartCode": "{0} eklentisini yeniden yüklemeden önce lütfen Code'u yeniden başlatın.",
- 	"installingOutdatedExtension": "Bu eklentinin daha yeni bir sürümü zaten yüklü. Bunu, daha eski bir sürümle geçersiz kılmak ister misiniz?",
- 	"override": "Geçersiz Kıl",
- 	"cancel": "İptal",
-+<<<<<<< .our
- 	"errorInstallingDependencies": "Bağımlılıklar yüklenirken hata oluştu. {0}",
- 	"MarketPlaceDisabled": "Market etkin değil",
- 	"removeError": "Eklenti kaldırılırken hata oluştu: {0}. Yeniden yüklemeden önce lütfen VS Code'dan çıkın ve tekrar açın.",
-@@ -22,6 +26,12 @@
- 	"quitCode": "Eklenti yüklenemedi. Lütfen yeniden yüklemeden önce VS Code'u sonlandırın ve tekrar başlatın.",
- 	"exitCode": "Eklenti yüklenemedi. Lütfen yeniden yüklemeden önce VS Code'u sonlandırın ve tekrar başlatın.",
- 	"renameError": "{0}, {1} olarak yeniden adlandırılırken bilinmeyen hata oluştu",
-+=======
-+	"notFoundCompatible": "'{0}' yüklenemiyor; VS Code '{1}' ile uyumlu mevcut bir sürümü yok.",
-+	"notFoundCompatibleDependency": "Yükleme başarısız oldu çünkü, bağımlılığı bulunan '{0}' eklentisinin uyumlu olduğu VS Code'un '{1}' sürümü bulunamadı.",
-+	"quitCode": "Eklenti yüklenemedi. Lütfen yeniden yüklemeden önce VS Code'u sonlandırın ve tekrar başlatın.",
-+	"exitCode": "Eklenti yüklenemedi. Lütfen yeniden yüklemeden önce VS Code'u sonlandırın ve tekrar başlatın.",
-+>>>>>>> .their
- 	"uninstallDependeciesConfirmation": "Yalnızca '{0}' eklentisini mi yoksa bağımlılıklarını da kaldırmak ister misiniz?",
- 	"uninstallOnly": "Sadece Eklenti",
- 	"uninstallAll": "Tümünü Kaldır",
-changed in both
-  base   100644 8d0fe38437997006f64b88fc3f596247e05cfe6b i18n/trk/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
-  our    100644 6cac235b96e23fa0206c3f9a16422d2ed38ebd54 i18n/trk/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
-  their  100644 a5e03c838162a38e04b07d5280efa34867dc36d7 i18n/trk/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -9,4 +10,10 @@
- 	"integrity.prompt": "{0} kurulumunuz bozuk görünüyor. Lütfen yeniden yükleyin.",
- 	"integrity.moreInformation": "Daha Fazla Bilgi",
- 	"integrity.dontShowAgain": "Tekrar Gösterme"
-+=======
-+	"integrity.ok": "Tamam",
-+	"integrity.dontShowAgain": "Tekrar Gösterme",
-+	"integrity.moreInfo": "Daha fazla bilgi",
-+	"integrity.prompt": "{0} kurulumunuz bozuk görünüyor. Lütfen yeniden yükleyin."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 4f9a44f93833cfe6541dafcb1c0839c572c4c55b i18n/trk/src/vs/platform/message/common/message.i18n.json
-  our    100644 e202ce636d4fa0f9420deac8135228049e24e40d i18n/trk/src/vs/platform/message/common/message.i18n.json
-  their  100644 3d5ccdec1e6a197b608e75f72be5f58389625ef6 i18n/trk/src/vs/platform/message/common/message.i18n.json
-changed in both
-  base   100644 d6e0e3db1425ccda186cceb638402e8abdb1619c i18n/trk/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 fdc69c2c9e4d77a2bba5e0204a27fccdd7aa58e1 i18n/trk/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 f57a875d1dbf08cf13d7c6380851eece010e953b i18n/trk/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -68,6 +68,7 @@
- 	"editorWidgetBorder": "Editör araçlarının kenarlık rengi. Renk, araç bir kenarlığı olmasına karar verdiğinde ve renk hiçbir eklenti tarafından geçersiz kılınmadığında kullanılır.",
- 	"editorSelectionBackground": "Düzenleyici seçiminin rengi.",
- 	"editorSelectionForeground": "Yüksek karşıtlık için seçilen metnin rengi.",
-+<<<<<<< .our
- 	"editorInactiveSelection": "Aktif olmayan bir düzenleyicideki seçimin rengi. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
- 	"editorSelectionHighlight": "Seçimle aynı içeriğe sahip bölgelerin rengi. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
- 	"editorSelectionHighlightBorder": "Seçimle aynı içeriğe sahip bölgelerin kenarlık rengi.",
-@@ -79,6 +80,9 @@
- 	"findRangeHighlightBorder": "Aramayı sınırlandıran aralığın kenarlık rengi. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
- 	"findWidgetResizeBorder": "Gereç bulmak için yeniden boyutlandırma çubuğunun kenarlık rengi.",
- 	"hoverHighlight": "Sözcüğün altında yer alan bağlantı vurgusu. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
-+=======
-+	"editorFindMatch": "Geçerli arama eşleşmesinin rengi.",
-+>>>>>>> .their
- 	"hoverBackground": "Düzenleyici bağlantı vurgusunun arka plan rengi.",
- 	"hoverBorder": "Düzenleyici bağlantı vurgusunun kenarlık rengi.",
- 	"activeLinkForeground": "Aktif bağlantıların rengi.",
-@@ -86,12 +90,15 @@
- 	"diffEditorRemoved": "Kaldırılmış metin için arka plan rengi. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
- 	"diffEditorInsertedOutline": "Eklenen metnin ana hat rengi.",
- 	"diffEditorRemovedOutline": "Çıkarılan metnin ana hat rengi.",
-+<<<<<<< .our
- 	"mergeCurrentHeaderBackground": "Satır içi birleştirme çakışmalarında \"mevcut olan\" üstbilgisi arka planı. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
- 	"mergeCurrentContentBackground": "Satır içi birleştirme çakışmalarında mevcut olan içeriğin arka planı. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
- 	"mergeIncomingHeaderBackground": "Satır içi birleştirme çakışmalarında \"gelen değişiklik\" üstbilgisi arka planı. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
- 	"mergeIncomingContentBackground": "Satır içi birleştirme çakışmalarında gelen değişiklik içeriğinin arka planı. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
- 	"mergeCommonHeaderBackground": "Satır içi birleştirme çakışmalarında ortak ata üstbilgisi arka planı. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
- 	"mergeCommonContentBackground": "Satır içi birleştirme çakışmalarında ortak ata içeriğinin arka planı. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
-+=======
-+>>>>>>> .their
- 	"mergeBorder": "Satır içi birleştirme çakışmalarında üst bilgi ve ayırıcıdaki kenarlık rengi.",
- 	"overviewRulerCurrentContentForeground": "Satır içi birleştirme çakışmalarında \"mevcut olan\" için genel bakış cetveli ön planı.",
- 	"overviewRulerIncomingContentForeground": "Satır içi birleştirme çakışmalarında gelen genel bakış cetveli ön planı.",
-added in both
-  our    100644 15d5c003a775612763a5b3ad8b2eef344c75ffe7 i18n/trk/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 94c6abc9b61773b1f3828a91c9260207b7b8fd41 i18n/trk/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,5 +10,13 @@
- 	"timeout.formatOnSave": "Kaydederken biçimlendirme {0}ms sonrasında durduruldu",
- 	"codeActionsOnSave.didTimeout": "{0}ms sonra codeActionsOnSave durduruldu",
- 	"timeout.onWillSave": "onWillSaveTextDocument olayı 1750ms sonrasında durduruldu",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"saveParticipants": "Katılımcıların Kaydedilmesi İşlemi Çalıştırılıyor..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 a3dd0ab5f9592ff9fa83f5206912fe6681d60586 i18n/trk/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  our    100644 45dce70f0b9433b89e94a31f7ddb89010e48f4d1 i18n/trk/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-  their  100644 737337540bff2cfe0fd0dc62773c48499a07a52a i18n/trk/src/vs/workbench/api/node/extHostTreeViews.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,7 @@
- 	],
- 	"treeView.notRegistered": "Kayıtlı '{0}' Id'li ağaç görünümü yok.",
- 	"treeView.duplicateElement": "{0} id'sine sahip bir öge zaten kayıtlı"
-+=======
-+	"treeView.notRegistered": "Kayıtlı '{0}' Id'li ağaç görünümü yok."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a8ba8956df1916cb5172c224f38f368360e420c2 i18n/trk/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 ca5ef369836861985d260e6a09f5dc65617432d0 i18n/trk/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 43558a9d00d8da318d90aa2859fe679a44a9b8d0 i18n/trk/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -14,5 +14,10 @@
- 	"save": "&&Kaydet",
- 	"saveWorkspace": "Çalışma Alanını Kaydet",
- 	"openWorkspaceAction": "Çalışma Alanı Aç...",
-+<<<<<<< .our
- 	"openWorkspaceConfigFile": "Çalışma Alanı Yapılandırma Dosyasını Aç"
-+=======
-+	"openWorkspaceConfigFile": "Çalışma Alanı Yapılandırma Dosyasını Aç",
-+	"openFolderAsWorkspaceInNewWindow": "Klasörü Yeni Pencerede Çalışma Alanı Olarak Aç"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 1986c3bda9bd068bfeb472a340408056933df8ba i18n/trk/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-  their  100644 1b71f510ec6c595be6563703877d9a777f5ef7ab i18n/trk/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"addFolderToWorkspace": "Çalışma Alanına Klasör Ekle...",
- 	"add": "&&Ekle",
- 	"addFolderToWorkspaceTitle": "Çalışma Alanına Klasör Ekle",
-changed in both
-  base   100644 5ff77e04882de7728a0c4c1c0344082789e38d93 i18n/trk/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  our    100644 00ae5c22030c68e202403cce3d407c25a3c30e50 i18n/trk/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  their  100644 4ee34bebb2da28b6a9deb6b5fd9b9f21641e59d0 i18n/trk/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-@@ -19,6 +19,7 @@
- 	"close": "Kapat",
- 	"closeOthers": "Diğerlerini Kapat",
- 	"closeRight": "Sağdakileri Kapat",
-+<<<<<<< .our
- 	"closeAllSaved": "Kaydedilenleri Kapat",
- 	"closeAll": "Tümünü Kapat",
- 	"keepOpen": "Açık Tut",
-@@ -27,6 +28,15 @@
- 	"keepEditor": "Düzenleyiciyi Tut",
- 	"closeEditorsInGroup": "Gruptaki Tüm Düzenleyicileri Kapat",
- 	"closeSavedEditors": "Gruptaki Kaydedilmiş Düzenleyicileri Kapat",
-+=======
-+	"closeAllUnmodified": "Değiştirilmeyenleri Kapat",
-+	"closeAll": "Tümünü Kapat",
-+	"keepOpen": "Açık Tut",
-+	"showOpenedEditors": "Açık Düzenleyicileri Göster",
-+	"keepEditor": "Düzenleyiciyi Tut",
-+	"closeEditorsInGroup": "Gruptaki Tüm Düzenleyicileri Kapat",
-+	"closeUnmodifiedEditors": "Gruptaki Değiştirilmemiş Düzenleyicileri Kapat",
-+>>>>>>> .their
- 	"closeOtherEditors": "Diğer Düzenleyicileri Kapat",
- 	"closeRightEditors": "Düzenleyicinin Sağındakileri Kapat"
- }
-\ No newline at end of file
-changed in both
-  base   100644 b32e97503d97ea9e266a872e3dc8971ba5a5a596 i18n/trk/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 90a1b3244f94cd03152dda02b0a88dc41cc1f806 i18n/trk/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 3264a4ed56efaf885f95de85b98975e54ae898c8 i18n/trk/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 4eac419d706d6ad980a10bd754e50d3865311237 i18n/trk/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  our    100644 c70ebf429600ae042203dc5c1bed3bdc5d9ccef5 i18n/trk/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  their  100644 0f560d95c003737ea68b3ee3c89abb7bf7cbeb54 i18n/trk/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-changed in both
-  base   100644 9fb7a026e34e17fcd958e5b7a2f1cea1d72665a1 i18n/trk/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  our    100644 f0597ecc3636a2dd0a6cc651bfee1daf2088f409 i18n/trk/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-  their  100644 e73c3315e6d6648c7ce756b7971f0dc63f37f381 i18n/trk/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
-changed in both
-  base   100644 18e318decfd8835f0849fe67428da002bafb90b9 i18n/trk/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  our    100644 4c89a16f31ac4d92047d3020376f32ce8eae9eb7 i18n/trk/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  their  100644 d62c167e7b6a78584a114bd9afa0ea33bb8e390a i18n/trk/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"close": "Kapat",
-+>>>>>>> .their
- 	"araLabelEditorActions": "Düzenleyici eylemleri"
- }
-\ No newline at end of file
-changed in both
-  base   100644 f143e04de94477b7e04d853f70671c718a770495 i18n/trk/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
-  our    100644 d037c5d4f78bd407b3b48905c40176441a8d79b2 i18n/trk/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
-  their  100644 1b5f24a539859b1a112b86dc51cd771ee5419ad2 i18n/trk/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
-changed in both
-  base   100644 9eb9ad116a5238fbf876533e50d6b63e7763457c i18n/trk/src/vs/workbench/common/theme.i18n.json
-  our    100644 c3e69879379552f9bae45b018ec024370c6f07fc i18n/trk/src/vs/workbench/common/theme.i18n.json
-  their  100644 02c2f8fa5d62f49f82c67171012fbd15d4628ecf i18n/trk/src/vs/workbench/common/theme.i18n.json
-@@ -11,10 +11,15 @@
- 	"tabHoverBackground": "Fareyle üzerine gelindiğinde sekme arka plan rengi. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
- 	"tabUnfocusedHoverBackground": "Fareyle üzerine gelindiğinde odaklanılmamış bir gruptaki aktif sekmenin arka plan rengi. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
- 	"tabBorder": "Sekmeleri birbirinden ayıran kenarlığın rengi. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
-+<<<<<<< .our
- 	"tabActiveBorder": "Aktif bir sekmenin altındaki kenarlık. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
- 	"tabActiveBorderTop": "Aktif bir sekmenin üstündeki kenarlık. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
- 	"tabActiveUnfocusedBorder": "Odaklanılmamış bir gruptaki aktif bir sekmenin altındaki kenarlık. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
- 	"tabActiveUnfocusedBorderTop": "Odaklanılmamış bir gruptaki aktif bir sekmenin üstündeki kenarlık. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
-+=======
-+	"tabActiveBorder": "Aktif sekmeleri vurgulayacak kenarlık. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
-+	"tabActiveUnfocusedBorder": "Odaklanılmamış bir gruptaki aktif sekmeleri vurgulayacak kenarlık. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
-+>>>>>>> .their
- 	"tabHoverBorder": "Fareyle üzerine gelindiğinde sekmeleri vurgulayacak kenarlık. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
- 	"tabUnfocusedHoverBorder": "Fareyle üzerine gelindiğinde odaklanılmamış bir gruptaki sekmeleri vurgulayacak kenarlık. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
- 	"tabActiveForeground": "Aktif bir gruptaki aktif sekmenin ön plan rengi. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
-added in both
-  our    100644 352d616cb2388788962d28d337cb996ea2f9989a i18n/trk/src/vs/workbench/common/views.i18n.json
-  their  100644 d412455fd999557822fd98125fbbda96d8e45ae8 i18n/trk/src/vs/workbench/common/views.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"duplicateId": "'{0}' id'sine sahip bir görünüm '{1}' konumunda zaten kayıtlı"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"duplicateId": "`{0}` kimliğine sahip bir görünüm `{1}` konumunda zaten kayıtlı"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e3e29379b77ea4d15e4b1f5feab2ecd14b223fb8 i18n/trk/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 44732b7e6176ac8f50fe0253110d6ef6cb302c9c i18n/trk/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 5cb1f86f054622162153a85d8b1e04234b27cd87 i18n/trk/src/vs/workbench/electron-browser/actions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"closeWindow": "Pencereyi Kapat",
- 	"closeWorkspace": "Çalışma Alanını Kapat",
- 	"noWorkspaceOpened": "Şu an bu örnekte kapatmak için açık bir çalışma alanı bulunmuyor.",
-@@ -50,6 +53,14 @@
- 	"moveWindowTabToNewWindow": "Pencere Sekmesini Yeni Pencereye Taşı",
- 	"mergeAllWindowTabs": "Tüm Pencereleri Birleştir",
- 	"toggleWindowTabsBar": "Pencere Sekmeleri Çubuğunu Gizle/Göster",
-+<<<<<<< .our
- 	"about": "{0} Hakkında",
- 	"inspect context keys": "Bağlam Anahtarlarını Denetle"
-+=======
-+	"configureLocale": "Dili Yapılandır",
-+	"displayLanguage": "VSCode'un görüntüleme dilini tanımlar.",
-+	"doc": "Desteklenen dillerin listesi için göz atın: {0}",
-+	"restart": "Değeri değiştirirseniz VSCode'u yeniden başlatmanız gerekir.",
-+	"fail.createSettings": " '{0}' oluşturulamadı ({1})."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8aacc6f4f6e57c664b0082f257889b078b03b88b i18n/trk/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 6083c93c0aa8c7594afe0d6fb609d69d65163ece i18n/trk/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 b66debcf9ce8eb524bfe41a12b2b6d6b1878f945 i18n/trk/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,12 +35,19 @@
- 	"panelDefaultLocation": "Panelin varsayılan konumunu denetler. Çalışma ekranının ya altında ya da sağında gösterilebilir.",
- 	"statusBarVisibility": "Çalışma ekranının altındaki durum çubuğunun görünürlüğünü denetler.",
- 	"activityBarVisibility": "Çalışma ekranındaki etkinlik çubuğunun görünürlüğünü denetler.",
-+<<<<<<< .our
- 	"viewVisibility": "Görünüm üstbilgi eylemlerinin görünürlüğünü denetler. Görünüm üstbilgi eylemleri ya her zaman görünür ya da sadece o görünüme odaklanıldığında veya fareyle üzerine gelindiğinde görünebilir.",
- 	"fontAliasing": "Çalışma ekranındaki yazı tipi yumuşatma yöntemini denetler.\n- default: Alt-piksel yazı tipi yumuşatma. Bu, çoğu retina olmayan ekranda en keskin metni verir\n- antialiased: Alt-pikselin tersine, pikselin seviyesine göre yazı tipini yumuşat. Yazı tipinin genel olarak daha açık görünmesini sağlayabilir\n- none: Yazı tipi yumuşatmayı devre dışı bırakır. Metin pürüzlü keskin kenarlarla gösterilir.\n- auto: Ekranların DPI'ına göre otomatik olarak `default` veya`antialiased`ı uygular.",
- 	"workbench.fontAliasing.default": "Alt-piksel yazı tipi yumuşatma. Bu, çoğu retina olmayan ekranda en keskin metni verir.",
- 	"workbench.fontAliasing.antialiased": "Alt-pikselin tersine, pikselin seviyesine göre yazı tipini yumuşat. Yazı tipinin genel olarak daha açık görünmesini sağlayabilir.",
- 	"workbench.fontAliasing.none": "Yazı tipi yumuşatmayı devre dışı bırakır. Metin pürüzlü keskin kenarlarla gösterilir.",
- 	"workbench.fontAliasing.auto": "Ekranların DPI'ına göre otomatik olarak `default` veya `antialiased`ı uygular.",
-+=======
-+	"fontAliasing": "Çalışma ekranındaki yazı tipi yumuşatma yöntemini denetler.\n- default: Alt-piksel yazı tipi yumuşatma. Bu, çoğu retina olmayan ekranda en keskin metni verir\n- antialiased: Alt-pikselin tersine, pikselin seviyesine göre yazı tipini yumuşat. Yazı tipinin genel olarak daha açık görünmesini sağlayabilir\n- none: Yazı tipi yumuşatmayı devre dışı bırakır. Metin pürüzlü keskin kenarlarla gösterilir.",
-+	"workbench.fontAliasing.default": "Alt-piksel yazı tipi yumuşatma. Bu, çoğu retina olmayan ekranda en keskin metni verir.",
-+	"workbench.fontAliasing.antialiased": "Alt-pikselin tersine, pikselin seviyesine göre yazı tipini yumuşat. Yazı tipinin genel olarak daha açık görünmesini sağlayabilir.",
-+	"workbench.fontAliasing.none": "Yazı tipi yumuşatmayı devre dışı bırakır. Metin pürüzlü keskin kenarlarla gösterilir.",
-+>>>>>>> .their
- 	"enableNaturalLanguageSettingsSearch": "Ayarlar için doğal dil arama modunun etkinleştirilip etkinleştirilmeyeceğini denetler.",
- 	"windowConfigurationTitle": "Pencere",
- 	"window.openFilesInNewWindow.on": "Dosyalar yeni bir pencerede açılacak",
-changed in both
-  base   100644 c583af8e7cc6927171694b5f244978ad43d7382a i18n/trk/src/vs/workbench/electron-browser/window.i18n.json
-  our    100644 861c7f35ac06435e7b62f3f5887738853101c48d i18n/trk/src/vs/workbench/electron-browser/window.i18n.json
-  their  100644 394ee06ccfd4310af8d3e0e74095beaab9a2533d i18n/trk/src/vs/workbench/electron-browser/window.i18n.json
-changed in both
-  base   100644 01e4868daa1a6b51c436a8f1b45475be54126b6f i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
-  our    100644 36714e1e60d8927fb3b91b1b0e0eccad06a58d10 i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
-  their  100644 793bdc84f28bdfe0ddd0bd4eeb7fb52161492db2 i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
-changed in both
-  base   100644 b5f38fd9078de00122713c91ce286b7dd093c9cd i18n/trk/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  our    100644 3563efca10a6eb315a6f751ea72d5d38f1f1f0cd i18n/trk/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-  their  100644 d27710092c4bc145bc458ac1830e0405071dea4c i18n/trk/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"debug.terminal.title": "hata ayıklanan"
- }
-\ No newline at end of file
-changed in both
-  base   100644 010a09cd0cb214b388d75666d89cb848afabb1b5 i18n/trk/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  our    100644 54479d956c07d88719f3ce1441f0f635c2035849 i18n/trk/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  their  100644 ca0fb5ce18835c6c305b24e26031a1cb9416e1f0 i18n/trk/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-changed in both
-  base   100644 63820e9cd1c199a25695fc98440764b156a75525 i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 c1fd4a38b55f33cc75802aa90a13a4a917da2acc i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 2cb48be881f3309263706a8bdbee40105820d843 i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,11 +13,21 @@
- 	"exeBasedRecommendation": "Bu eklenti, sizde {0} kurulu olduğu için tavsiye ediliyor.",
- 	"fileBasedRecommendation": "Bu eklenti yakınlarda açtığınız dosyalara dayanarak tavsiye ediliyor.",
- 	"workspaceRecommendation": "Bu eklenti geçerli çalışma alanı kullanıcıları tarafından tavsiye ediliyor.",
-+=======
-+	"workspaceRecommendation": "Bu eklenti geçerli çalışma alanı kullanıcıları tarafından tavsiye ediliyor.",
-+	"fileBasedRecommendation": "Bu eklenti yakınlarda açtığınız dosyalara dayanarak tavsiye ediliyor.",
-+	"exeBasedRecommendation": "Bu eklenti, sizde {0} kurulu olduğu için tavsiye ediliyor.",
-+>>>>>>> .their
- 	"reallyRecommended2": "'{0}' eklentisi bu dosya türü için tavsiye edilir.",
- 	"reallyRecommendedExtensionPack": "'{0}' eklenti paketi bu dosya türü için tavsiye edilir.",
- 	"install": "Yükle",
-+<<<<<<< .our
- 	"showRecommendations": "Tavsiyeleri Göster",
- 	"showLanguageExtensions": "Markette '.{0}' dosyaları için yardımcı olabilecek eklentiler bulunuyor",
-+=======
-+	"neverShowAgain": "Tekrar Gösterme",
-+	"close": "Kapat",
-+>>>>>>> .their
- 	"workspaceRecommended": "Bu çalışma alanı bazı eklentileri tavsiye ediyor.",
- 	"installAll": "Tümünü Yükle",
- 	"ignoreExtensionRecommendations": "Tüm eklenti tavsiyelerini yok saymak istiyor musunuz?",
-added in both
-  our    100644 2cb4c52d6df311a62b6c55ca77bef496996f0237 i18n/trk/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-  their  100644 0b6bb4e43963d9cd11e7756d01c7d4ec2409a7a1 i18n/trk/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,13 @@
- 	],
- 	"workbenchConfigurationTitle": "Çalışma Ekranı",
- 	"feedbackVisibility": "Çalışma ekranının altındaki durum çubuğunda bulunan Twitter geri bildiriminin (gülen yüz) görünürlüğünü denetler."
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"workbenchConfigurationTitle": "Çalışma Ekranı"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 b49d8e0fcadf2a7575f866b05c10bc043c6ae70a i18n/trk/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/trk/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,12 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"hide": "Gizle"
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 09b50f5c81945072189ac1aa45f8a8f40beeb948 i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  our    100644 c82aabc8a92fc1cb3fddf178d2ffeb9f8678824c i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  their  100644 4d4134863662810aed11016aca8683318c283d3d i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-@@ -12,7 +12,10 @@
- 	"revertLocalChanges": "Değişikliklerinizi göz ardı edin ve diskteki içeriğe geri dönün",
- 	"copyPathOfActive": "Aktif Dosyanın Yolunu Kopyala",
- 	"saveAllInGroup": "Gruptaki Tümünü Kadet",
-+<<<<<<< .our
- 	"saveFiles": "Tüm Dosyaları Kaydet",
-+=======
-+>>>>>>> .their
- 	"revert": "Dosyayı Geri Döndür",
- 	"compareActiveWithSaved": "Aktif Dosyayı Kaydedilenle Karşılaştır",
- 	"closeEditor": "Düzenleyiciyi Kapat",
-@@ -26,10 +29,16 @@
- 	"compareWithSaved": "Kaydedilenle Karşılaştır",
- 	"compareWithSelected": "Seçilenle Karşılaştır",
- 	"compareSource": "Karşılaştırma İçin Seç",
-+<<<<<<< .our
- 	"compareSelected": "Seçilenle Karşılaştır",
- 	"close": "Kapat",
- 	"closeOthers": "Diğerlerini Kapat",
- 	"closeSaved": "Kaydedilenleri Kapat",
-+=======
-+	"close": "Kapat",
-+	"closeOthers": "Diğerlerini Kapat",
-+	"closeUnmodified": "Değiştirilmeyenleri Kapat",
-+>>>>>>> .their
- 	"closeAll": "Tümünü Kapat",
- 	"deleteFile": "Kalıcı Olarak Sil"
- }
-\ No newline at end of file
-changed in both
-  base   100644 2be3f4a5668b0dd7401d32f46f6140b26534378f i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 43e3bf4348f9b7a25892a993e8f5dd85c62e9798 i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 e326729b004cf129612ea326c18ad3ef7c0dc03b i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"newFile": "Yeni Dosya",
- 	"newFolder": "Yeni Klasör",
- 	"rename": "Yeniden Adlandır",
-@@ -13,7 +16,11 @@
- 	"copyFile": "Kopyala",
- 	"pasteFile": "Yapıştır",
- 	"retry": "Yeniden Dene",
-+<<<<<<< .our
- 	"renameWhenSourcePathIsParentOfTargetError": "Var olan bir klasöre dosya veya klasör eklemek için lütfen 'Yeni Klasör' veya 'Yeni Dosya' komutunu kullanın",
-+=======
-+	"openFolderFirst": "İçinde dosyalar veya klasörler oluşturmak için ilk olarak bir klasör açın.",
-+>>>>>>> .their
- 	"newUntitledFile": "Yeni İsimsiz Dosya",
- 	"createNewFile": "Yeni Dosya",
- 	"createNewFolder": "Yeni Klasör",
-@@ -29,6 +36,7 @@
- 	"undoTrash": "Çöp Kutusu'ndan geri alabilirsiniz.",
- 	"doNotAskAgain": "Bir daha sorma",
- 	"irreversible": "Bu eylem geri döndürülemez!",
-+<<<<<<< .our
- 	"binFailed": "Geri Dönüşüm Kutusu'nu kullanarak silme başarısız oldu. Bunun yerine, kalıcı olarak silmek ister misiniz?",
- 	"trashFailed": "Çöp Kutusu'nu kullanarak silme başarısız oldu. Bunun yerine, kalıcı olarak silmek ister misiniz?",
- 	"deletePermanentlyButtonLabel": "&&Kalıcı Olarak Sil",
-@@ -48,6 +56,14 @@
- 	"replaceButtonLabel": "&&Değiştir",
- 	"fileIsAncestor": "Yapıştırılacak dosya hedef klasörün atalarından biridir",
- 	"fileDeleted": "Yapıştırılacak dosya bu arada silindi veya taşındı",
-+=======
-+	"permDelete": "Kalıcı Olarak Sil",
-+	"importFiles": "Dosya İçe Aktar",
-+	"confirmOverwrite": "Hedef klasörde aynı ada sahip bir dosya veya klasör zaten var. Değiştirmek istiyor musunuz?",
-+	"replaceButtonLabel": "&&Değiştir",
-+	"fileDeleted": "Dosya bu arada silindi veya taşındı",
-+	"fileIsAncestor": "Hedef klasör, kopyalanacak klasörün içinde yer alıyor",
-+>>>>>>> .their
- 	"duplicateFile": "Çoğalt",
- 	"globalCompareFile": "Aktif Dosyayı Karşılaştır...",
- 	"openFileToCompare": "Bir başka dosya ile karşılaştırmak için ilk olarak bir dosya açın.",
-changed in both
-  base   100644 699305824d3ed72f4db5e5e739e8de24cc613818 i18n/trk/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  our    100644 c5a258c69c30e5ad5a4f54c2a947b9da4a89e081 i18n/trk/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-  their  100644 b1f43f0662a145a9e703b8962e1ddb1a610bbd77 i18n/trk/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,12 +7,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"revealInWindows": "Gezginde Ortaya Çıkar",
- 	"revealInMac": "Finder'da Ortaya Çıkar",
- 	"openContainer": "İçeren Klasörü Aç",
- 	"saveAs": "Farklı Kaydet...",
- 	"save": "Kaydet",
- 	"saveAll": "Tümünü Kaydet",
-+<<<<<<< .our
-+=======
-+	"saveFiles": "Tüm Dosyaları Kaydet",
-+>>>>>>> .their
- 	"removeFolderFromWorkspace": "Çalışma Alanından Klasör Kaldır",
- 	"genericRevertError": "'{0}' geri döndürülemedi: {1}",
- 	"modifiedLabel": "{0} (diskte) ↔ {1}",
-changed in both
-  base   100644 4948cddf5c4363e22249b656347c511d008f08b3 i18n/trk/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 193fd22e9317327dfd29fb29331773d21ad13c21 i18n/trk/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 642be842a155b24ebad017dd69c5b925968a55ff i18n/trk/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-@@ -40,7 +40,10 @@
- 	"formatOnSave": "Dosyayı kaydederken biçimlendir. Bir biçimlendirici mevcut olmalıdır, dosya otomatik olarak kaydedilmemelidir, ve düzenleyici kapanmıyor olmalıdır.",
- 	"formatOnSaveTimeout": "Dosyayı kaydederken biçimlendirme zaman aşımı. formatOnSave komutlarında kullanılacak milisaniye cinsinden zaman limiti. Belirtilen zaman aşımından daha uzun süren komutlar iptal edilecektir.",
- 	"explorerConfigurationTitle": "Dosya Gezgini",
-+<<<<<<< .our
- 	"openEditorsVisible": "Açık Düzenleyiciler bölmesinde gösterilen düzenleyici sayısı.",
-+=======
-+>>>>>>> .their
- 	"autoReveal": "Gezginin dosyaları açarken, onları otomatik olarak ortaya çıkartmasını ve seçmesini denetler.",
- 	"enableDragAndDrop": "Gezgeinin sürükle bırak ile dosyaları ve klasörleri taşımaya izin verip vermeyeceğini denetler.",
- 	"confirmDragAndDrop": "Gezginin, sürükle bırak ile dosyalar ve klasörlerin taşındığı zaman onay isteyip istemeyeceğini denetler.",
-changed in both
-  base   100644 660d16789d0a95c736c82f7033a211c046c9320a i18n/trk/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  our    100644 ba53583a6bd8393f02f512281397e3e3dec3bb01 i18n/trk/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  their  100644 a7b5a9c8bb975287ecc4cbfa143a262f744d53d6 i18n/trk/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,12 @@
- 	],
- 	"userGuide": "Değişikliklerinizi geri almak veya diskteki içeriğin üzerine yazmak için düzenleyicideki araç çubuğundaki eylemleri kullanabilirsiniz.",
- 	"staleSaveError": "'{0}' kaydedilemedi: Diskteki içerik daha yeni. Lütfen sizdeki sürüm ile disktekini karşılaştırın.",
-+=======
-+	"userGuide": "Değişikliklerinizi **geri al**mak veya diskteki içeriğin **üzerine yaz**mak için düzenleyicideki araç çubuğunu kullanabilirsiniz",
-+	"overwriteElevated": "Yönetici Olarak Üzerine Yaz...",
-+	"saveElevated": "Yönetici Olarak Yeniden Dene...",
-+	"overwrite": "Üzerine Yaz",
-+>>>>>>> .their
- 	"retry": "Yeniden Dene",
- 	"discard": "At",
- 	"readonlySaveErrorAdmin": "'{0}' kaydedilemedi: Dosya yazmaya karşı korunuyor. Yönetici olarak denemek için 'Yönetici Olarak Üzerine Yaz'ı seçin.",
-changed in both
-  base   100644 9f1cee51d9871a56dae0faf8939960ffb59bb51b i18n/trk/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  our    100644 65b6a337676d0d6a5034bdd2408a1b2dc1bae73e i18n/trk/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-  their  100644 d1e6467f5d8a585bafe5e943e6f295e98da7029c i18n/trk/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
-added in both
-  our    100644 e9f359925ecc6d94d9f1bac6b0f7e86d59e0d380 i18n/trk/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-  their  100644 aeb7121cb059e74598637e00ca8fb08cf90e2b93 i18n/trk/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,5 +11,13 @@
- 	"sharedLog": "Günlük (Ortak)",
- 	"rendererLog": "Günlük (Pencere)",
- 	"extensionsLog": "Günlük (Eklenti Sunucusu)",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"developer": "Geliştirici"
- }
-\ No newline at end of file
-added in both
-  our    100644 d594b47dfcbc84cc38c0941471d4fda1de491553 i18n/trk/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  their  100644 ad7b602e907840e9c181d8483cfc42789fdaaa77 i18n/trk/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -16,15 +17,33 @@
- 	"selectProcess": "İşlem için Günlük Seçin",
- 	"openLogFile": "Günlük Dosyasını Aç...",
- 	"setLogLevel": "Günlük Düzeyini Ayarla...",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"openLogsFolder": "Günlük Klasörünü Aç",
-+	"showLogs": "Günlükleri Göster...",
-+	"rendererProcess": "Pencere",
-+	"extensionHost": "Eklenti Sunucusu",
-+	"selectProcess": "İşlem seçin",
-+	"setLogLevel": "Günlük Düzeyini Ayarla",
-+>>>>>>> .their
- 	"trace": "İzle",
- 	"debug": "Hata Ayıklama",
- 	"info": "Bilgi",
- 	"warn": "Uyarı",
- 	"err": "Hata",
-+<<<<<<< .our
- 	"critical": "Kritik",
- 	"off": "Kapalı",
- 	"selectLogLevel": "Günlük düzeyini seçin",
- 	"default and current": "Varsayılan & Geçerli Olan",
- 	"default": "Varsayılan",
- 	"current": "Geçerli Olan"
-+=======
-+	"selectLogLevel": "Günlük düzeyini seçin"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 fe543da8a994fafde3a4bb5699fcd7601dd7a7b8 i18n/trk/src/vs/workbench/parts/markers/common/messages.i18n.json
-  our    100644 6f51355c9d123c79b1f0a359e73c1468d3c1f402 i18n/trk/src/vs/workbench/parts/markers/common/messages.i18n.json
-  their  100644 ca58bfe5d322f88fc4debe94baf297eb28d0390d i18n/trk/src/vs/workbench/parts/markers/common/messages.i18n.json
-@@ -7,8 +7,11 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"viewCategory": "Görüntüle",
-+<<<<<<< .our
- 	"problems.view.toggle.label": "Sorunları Aç/Kapat (Hatalar, Uyarılar, Bilgiler)",
- 	"problems.view.focus.label": "Sorunlara Odakla (Hatalar, Uyarılar, Bilgiler)",
-+=======
-+>>>>>>> .their
- 	"problems.panel.configuration.title": "Sorunlar Görünümü",
- 	"problems.panel.configuration.autoreveal": "Sorunlar görünümünün; dosyalar açılırken, dosyaları otomatik olarak ortaya çıkarıp çıkarmayacağını denetler.",
- 	"markers.panel.title.problems": "Sorunlar",
-added in both
-  our    100644 3aa95c60f2d27458dcf8f6380fe433002d86f6f6 i18n/trk/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-  their  100644 fe8f6125b1a1e34f4e3d23efb12673f805fe5846 i18n/trk/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -11,4 +12,15 @@
- 	"viewCategory": "Görüntüle",
- 	"clearOutput.label": "Çıktıyı Temizle",
- 	"openActiveLogOutputFile": "Görüntüle: Aktif Günlük Dosyasını Aç"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"output": "Çıktı",
-+	"viewCategory": "Görüntüle",
-+	"clearOutput.label": "Çıktıyı Temizle"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 b87f8651833d4c39926e5c3e83c6858ba7606d1e i18n/trk/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-  their  100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/trk/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,12 @@
- 	],
- 	"output": "{0} - Çıktı",
- 	"channel": "'{0}' için çıktı kanalı"
--}
-\ No newline at end of file
-+}
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{}
-+>>>>>>> .their
-changed in both
-  base   100644 dad393ec3bf0353dcc7bfd28cc53642de8a559c9 i18n/trk/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 1afe539c47468df2636e1e87d0cd9a72ca9c9caf i18n/trk/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 dc51088525e306ac10ab4e9664740fae8edabdb3 i18n/trk/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"defaultSettings": "Geçersiz kılmak için ayarlarınızı sağ taraftaki düzeyiciye ekleyin.",
- 	"noSettingsFound": "Hiçbir Ayar Bulunamadı.",
- 	"settingsSwitcherBarAriaLabel": "Ayar Değiştirici",
-changed in both
-  base   100644 ad4ed40e8890b2bcd07161a8e44662a01c3a9bab i18n/trk/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  our    100644 d820bb4fe889b05f2ff4ef7bcfc676d8fff80977 i18n/trk/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  their  100644 dc4c28efe529a16d8b78a2405486e63a813e3ada i18n/trk/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-changed in both
-  base   100644 fe14853bad62054670243378ff8988acd24a83da i18n/trk/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  our    100644 b5212eb95dd1ce6d73e1ac87386973d6c3143dbb i18n/trk/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-  their  100644 018ca1806dd04f5720a0ae42ed8b003a767fb26d i18n/trk/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"view": "Görüntüle",
- 	"commandsHandlerDescriptionDefault": "Komutları Göster ve Çalıştır",
- 	"gotoLineDescriptionMac": "Satıra Git",
-changed in both
-  base   100644 cf14cf9120f75fd510c0b93364d690cd606d9789 i18n/trk/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 79f2510cc1fd43ae4f1eeb8816a6f7d7cb58e36e i18n/trk/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 d06d8e0857e74867f1c38fb8073365540680d0e9 i18n/trk/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-changed in both
-  base   100644 fd6f32d47d67fb3d038b3000c78f1e0b06b673ce i18n/trk/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 9e04840f3efedecf23f5b2d44316f1a7c8399da8 i18n/trk/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 58d2149f726e1069cb7302a271b62d294ea31469 i18n/trk/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,11 +13,18 @@
- 	"copyAllLabel": "Tümünü Kopyala",
- 	"clearSearchHistoryLabel": "Arama Geçmişini Temizle",
- 	"toggleSearchViewPositionLabel": "Arama Görünümü Konumunu Değiştir",
-+=======
-+>>>>>>> .their
- 	"findInFolder": "Klasörde Bul...",
- 	"findInWorkspace": "Çalışma Alanında Bul...",
- 	"showTriggerActions": "Çalışma Alanında Sembole Git...",
- 	"name": "Ara",
-+<<<<<<< .our
- 	"showSearchViewl": "Aramayı Göster",
-+=======
-+	"search": "Ara",
-+	"showSearchViewlet": "Aramayı Göster",
-+>>>>>>> .their
- 	"view": "Görüntüle",
- 	"findInFiles": "Dosyalarda Bul",
- 	"openAnythingHandlerDescription": "Dosyaya Git",
-added in both
-  our    100644 370e3ca46f159c386414c78ab2206c7cef0db540 i18n/trk/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-  their  100644 a6843828675d70f0edddc473873e5fe732c76ef2 i18n/trk/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -13,5 +14,14 @@
- 	"new.global.sep": "Yeni Parçacıklar",
- 	"openSnippet.pickLanguage": "Parçacıklar Dosyası Seç veya Parçacık Oluştur",
- 	"openSnippet.label": "Kullanıcı Parçacıklarını Yapılandır",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"global.1": "({0})",
-+>>>>>>> .their
- 	"preferences": "Tercihler"
- }
-\ No newline at end of file
-changed in both
-  base   100644 11671c7d0b4f61d54db51e0029370f7b4b8adcd0 i18n/trk/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  our    100644 61a732f0568f1f61a9bc01d53b3a8a8fbf250233 i18n/trk/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-  their  100644 7e1c6237303f7ea86b85838b89776b30e62a4a1d i18n/trk/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"snippetSchema.json.default": "Boş parçacık",
- 	"snippetSchema.json": "Kullanıcı parçacığı yapılandırması",
- 	"snippetSchema.json.prefix": "Parçacığı IntelliSense'de seçerken kullanılacak ön ek",
-added in both
-  our    100644 334b2419218a5bb8ddc103b0eb2c52c1301171ed i18n/trk/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-  their  100644 d246a5f624ddbeba796d4a2d3f7a4766a42f61e8 i18n/trk/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,5 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"source.snippetGlobal": "Global Kullanıcı Parçacığı",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"source.snippet": "Kullanıcı Parçacığı"
- }
-\ No newline at end of file
-changed in both
-  base   100644 ebad445a20b19ff902daf3a355595b6766900c4c i18n/trk/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  our    100644 c12f98f1f7d6d1b253efc6dc8980812a619c7534 i18n/trk/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 8257fed50b08db31bfccc66751a6f4977cd89c52 i18n/trk/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,9 @@
- 	],
- 	"invalid.path.0": "`contributes.{0}.path` ögesinde dize bekleniyor. Sağlanan değer: {1}",
- 	"invalid.language.0": "Dil atlanırken `contributes.{0}.path`in değeri bir `.code-snippets` dosyası olmalıdır. Belirtilen değer {1}",
-+=======
-+	"invalid.path.0": "`contributes.{0}.path` ögesinde dize bekleniyor. Sağlanan değer: {1}",
-+>>>>>>> .their
- 	"invalid.language": "`contributes.{0}.language` ögesinde bilinmeyen dil. Sağlanan değer: {1}",
- 	"invalid.path.1": "`contributes.{0}.path` ögesinin ({1}) eklentinin klasöründe ({2}) yer alması bekleniyor. Bu, eklentiyi taşınamaz yapabilir.",
- 	"vscode.extension.contributes.snippets": "Parçacıklara ekleme yapar.",
-changed in both
-  base   100644 a994ebe0909dc2bfab405360618d111f55ed5437 i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 9ae8066e173c22960f98c998dc667f2fcb4550fe i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 644e7e44a52c21ad7bd01c6a8703e0899dc472e5 i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -10,7 +10,11 @@
- 	"terminal.foreground": "Terminalin ön plan rengi.",
- 	"terminalCursor.foreground": "Terminal imlecinin ön plan rengi.",
- 	"terminalCursor.background": "Terminal imlecinin arka plan rengi. Bir blok imlecinin kapladığı bir karakterin rengini özelleştirmeyi sağlar.",
-+<<<<<<< .our
- 	"terminal.selectionBackground": "Terminalin seçim arkaplanı rengi.",
- 	"terminal.border": "Terminaldeki bölmeleri ayıran kenarlığın rengi. panel.border bunun için varsayılan olarak kullanılır.",
- 	"terminal.ansiColor": "Terminalde '{0}' ANSI rengi."
-+=======
-+	"terminal.selectionBackground": "Terminalin seçim arkaplanı rengi."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a30794054e1dccc56b1cea9102490787e16edfef i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  our    100644 fc73a2254fd3174dcad137d26a0314e53d8ddb7a i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  their  100644 2c0a6d7607f41fed156cc045c9a90fb135bd30ed i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-@@ -8,7 +8,11 @@
- 	],
- 	"terminal.integrated.chooseWindowsShellInfo": "Özelleştir butonuna tıklayıp varsayılan terminal kabuğunu seçebilirsiniz.",
- 	"customize": "Özelleştir",
-+<<<<<<< .our
- 	"never again": "Tekrar Gösterme",
-+=======
-+	"cancel": "İptal",
-+>>>>>>> .their
- 	"terminal.integrated.chooseWindowsShell": "Tercih ettiğiniz terminal kabuğunu seçin, bunu daha sonra ayarlarınızdan değiştirebilirsiniz",
- 	"terminalService.terminalCloseConfirmationSingular": "Aktif bir terminal oturumu var, sonlandırmak istiyor musunuz?",
- 	"terminalService.terminalCloseConfirmationPlural": "{0} aktif terminal oturumu var, bunları sonlandırmak istiyor musunuz?"
-changed in both
-  base   100644 61ebe35f50cc0198e08a3eafd72952210fa283f6 i18n/trk/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 f7e01d490d6d3b9163203a648fd3930fc88e2b59 i18n/trk/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 64fe6d494dbfc3a626e05fccd532a3ffc376aebb i18n/trk/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -26,7 +26,10 @@
- 	"commandPalette": "Komut Paleti...",
- 	"settings": "Ayarlar",
- 	"keyboardShortcuts": "Klavye Kısayolları",
-+<<<<<<< .our
- 	"showExtensions": "Eklentileri Yönet",
-+=======
-+>>>>>>> .their
- 	"userSnippets": "Kullanıcı Parçacıkları",
- 	"selectTheme.label": "Renk Teması",
- 	"themes.selectIconTheme.label": "Dosya Simgesi Teması",
-changed in both
-  base   100644 320c074b5d232d591fc068a3032fe7af5158d3c3 i18n/trk/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  our    100644 0178637fbdf0424ea4af3cebade365489a085e58 i18n/trk/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  their  100644 699613ce8f0c9c2f0ea466184777af4fed3d0f89 i18n/trk/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -13,4 +14,9 @@
- 	"fileBinaryError": "Dosya ikili olarak görünüyor ve metin olarak açılamıyor",
- 	"err.create": "{0} dosyası oluşturulamadı",
- 	"fileMoveConflict": "Taşıma/kopyalama yapılamadı. Dosya, hedefte zaten mevcut."
-+=======
-+	"fileIsDirectoryError": "Dosya bir dizindir",
-+	"fileNotModifiedError": "Dosya şu tarihten beri değiştirilmemiş:",
-+	"fileBinaryError": "Dosya ikili olarak görünüyor ve metin olarak açılamıyor"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 5284725dbcbe101b6a615d631b63835268055210 i18n/trk/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  our    100644 4695dec6a6e07d0eac717c2465d78071445dbd0f i18n/trk/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-  their  100644 f0547df6a624012e52686bd0a2485a14e627d7e2 i18n/trk/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json
-changed in both
-  base   100644 06e828ba73e2e57eb711bee3c553e4e5222dd624 i18n/trk/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 62ba4066699b1c2fed6080768294776dd46a2b53 i18n/trk/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 f60dda6f647ff39ec1f99e0c38c04c20edaeee64 i18n/trk/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-changed in both
-  base   100644 38e103f1ee82388b61bb621e3595136e1c8d08f9 i18n/trk/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  our    100644 e05f69c833c1bb2aa943e69d669908a71fb3ad90 i18n/trk/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  their  100644 19e6e2498a438168f55c544c85f4ca0ee200003c i18n/trk/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-@@ -8,5 +8,10 @@
- 	],
- 	"errorInvalidTaskConfiguration": "Çalışma alanı yapılandırma dosyasına yazılamıyor. Lütfen dosyadaki hata/uyarıları düzeltmek için dosyayı açın ve tekrar deneyin.",
- 	"errorWorkspaceConfigurationFileDirty": "Kaydedilmemiş değişiklikler içerdiği için çalışma alanı yapılandırma dosyasına yazılamıyor. Lütfen dosyayı kaydedin ve tekrar deneyin.",
-+<<<<<<< .our
- 	"openWorkspaceConfigurationFile": "Çalışma Alanı Yapılandırmasını Aç"
-+=======
-+	"openWorkspaceConfigurationFile": "Çalışma Alanı Yapılandırma Dosyasını Aç",
-+	"close": "Kapat"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 37e0498d121729dabc3c589ea2c22c1392823a39 src/vs/workbench/services/themes/electron-browser/colorThemeData.ts
-  our    100644 f49ab6eea33cacddae01b555b693b3bf72e5bdaa src/vs/workbench/services/themes/electron-browser/colorThemeData.ts
-  their  100644 fd7ad73cded0a13631dfccd452800b6d3db6d78f src/vs/workbench/services/themes/electron-browser/colorThemeData.ts
-@@ -31,7 +31,11 @@
- 	numbers: ['constant.numeric'],
- 	types: ['entity.name.type', 'entity.name.class', 'support.type', 'support.class'],
- 	functions: ['entity.name.function', 'support.function'],
-+<<<<<<< .our
- 	variables: ['variable', 'entity.name.variable']
-+=======
-+	variables: ['variable']
-+>>>>>>> .their
- };
- 
- export class ColorThemeData implements IColorTheme {
diff --git a/app/test/fixtures/merge-parser/vscode/merge-alex-snapshot2-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-alex-snapshot2-into-master.txt
deleted file mode 100644
index b2faff845ab..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-alex-snapshot2-into-master.txt
+++ /dev/null
@@ -1,2159 +0,0 @@
-merged
-  result 100644 0a0e48c9ff2f3d28fdde103e591095de77618042 build/lib/snapshotLoader.js
-  our    100644 eb22844b08af4869827440f39489c1195b028e74 build/lib/snapshotLoader.js
-@@ -30,7 +30,7 @@
-     snapshotLoader(loaderFilepath, startupBlobFilepath);
-     function snapshotLoader(loaderFilepath, startupBlobFilepath) {
-         var inputFile = fs.readFileSync(loaderFilepath);
--        var wrappedInputFile = "\n\t\tvar Monaco_Loader_Init;\n\t\t(function() {\n\t\t\tvar doNotInitLoader = true;\n\t\t\t" + inputFile.toString() + ";\n\t\t\tMonaco_Loader_Init = function() {\n\t\t\t\tAMDLoader.init();\n\t\t\t\tCSSLoaderPlugin.init();\n\t\t\t\tNLSLoaderPlugin.init();\n\n\t\t\t\treturn { define, require };\n\t\t\t}\n\t\t})();\n\t\t";
-+        var wrappedInputFile = "\n\t\tvar Monaco_Loader_Init;\n\t\t(function() {\n\t\t\tvar doNotInitLoader = true;\n\t\t\t" + inputFile.toString() + ";\n\t\t\tMonaco_Loader_Init = function() {\n\t\t\t\tAMDLoader.init();\n\t\t\t\t// CSSLoaderPlugin.init();\n\t\t\t\t// NLSLoaderPlugin.init();\n\n\t\t\t\treturn { define, require };\n\t\t\t}\n\t\t})();\n\t\t";
-         var wrappedInputFilepath = path.join(os.tmpdir(), 'wrapped-loader.js');
-         console.log(wrappedInputFilepath);
-         fs.writeFileSync(wrappedInputFilepath, wrappedInputFile);
-merged
-  result 100644 e64085eea7667a480dd7d22f5f578b2d4bf1af87 build/lib/snapshotLoader.ts
-  our    100644 4d4eef1ea94984fd1f71c1b7ea553075b50a924a build/lib/snapshotLoader.ts
-@@ -47,8 +47,8 @@
- 			${inputFile.toString()};
- 			Monaco_Loader_Init = function() {
- 				AMDLoader.init();
--				CSSLoaderPlugin.init();
--				NLSLoaderPlugin.init();
-+				// CSSLoaderPlugin.init();
-+				// NLSLoaderPlugin.init();
- 
- 				return { define, require };
- 			}
-added in remote
-  their  100644 71109a5eacbed8b0067d009568bddc3743d07950 scripts/prepare.js
-@@ -0,0 +1,1209 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+const fs = require('fs');
-+const path = require('path');
-+const product = require('../product.json');
-+const package = require('../package.json');
-+const cp = require('child_process');
-+const vm = require('vm');
-+
-+const PREFIX = [
-+	'vs/loader.js',
-+	'vs/css.js',
-+	'vs/nls.js',
-+];
-+
-+const CONTENTS = [
-+	'vs/base/browser/iframe',
-+	'vs/base/browser/ui/list/rangeMap',
-+	'vs/base/browser/ui/scrollbar/scrollbarState',
-+	'vs/base/common/assert',
-+	'vs/base/common/collections',
-+	'vs/base/common/color',
-+	'vs/base/common/date',
-+	'vs/base/common/decorators',
-+	'vs/base/common/diff/diffChange',
-+	'vs/base/common/diff/diff',
-+	'vs/base/common/functional',
-+	'vs/base/common/hash',
-+	'vs/base/common/idGenerator',
-+	'vs/base/common/iterator',
-+	'vs/base/common/history',
-+	'vs/base/common/json',
-+	'vs/base/common/jsonFormatter',
-+	'vs/base/common/jsonEdit',
-+	'vs/base/common/keyCodes',
-+	'vs/base/common/lifecycle',
-+	'vs/base/common/linkedList',
-+	'vs/base/common/marked/raw.marked',
-+	'vs/base/common/marked/marked',
-+	'vs/base/common/network',
-+	'vs/base/common/numbers',
-+	'vs/base/common/performance',
-+	'vs/base/common/platform',
-+	'vs/base/common/diagnostics',
-+	'vs/base/common/processes',
-+	'vs/base/common/stopwatch',
-+	'vs/base/common/types',
-+	'vs/base/common/graph',
-+	'vs/base/common/objects',
-+	'vs/base/common/parsers',
-+	'vs/base/common/uri',
-+	'vs/base/common/map',
-+	'vs/base/common/marshalling',
-+	'vs/base/common/strings',
-+	'vs/base/common/filters',
-+	'vs/base/common/octicon',
-+	'vs/base/common/paths',
-+	'vs/base/common/comparers',
-+	'vs/base/common/labels',
-+	'vs/base/common/resources',
-+	'vs/base/common/uuid',
-+	'vs/base/common/winjs.base.raw',
-+	'vs/base/common/winjs.base',
-+	'vs/base/common/arrays',
-+	'vs/base/common/cache',
-+	'vs/base/common/errors',
-+	'vs/base/common/event',
-+	'vs/base/browser/browser',
-+	'vs/base/browser/event',
-+	'vs/base/browser/keyboardEvent',
-+	'vs/base/browser/mouseEvent',
-+	'vs/base/common/actions',
-+	'vs/base/common/cancellation',
-+	'vs/base/common/async',
-+	'vs/base/browser/dom',
-+	'vs/base/browser/fastDomNode',
-+	'vs/base/browser/globalMouseMoveMonitor',
-+	'vs/base/browser/touch',
-+	'vs/base/browser/ui/list/rowCache',
-+	'vs/base/browser/ui/selectBox/selectBoxNative',
-+	'vs/base/browser/ui/widget',
-+	'vs/base/browser/ui/scrollbar/scrollbarArrow',
-+	'vs/base/common/glob',
-+	'vs/base/common/htmlContent',
-+	'vs/base/browser/htmlContentRenderer',
-+	'vs/base/common/mime',
-+	'vs/base/common/paging',
-+	'vs/base/common/scrollable',
-+	'vs/base/browser/ui/scrollbar/scrollbarVisibilityController',
-+	'vs/base/browser/ui/scrollbar/abstractScrollbar',
-+	'vs/base/browser/ui/scrollbar/horizontalScrollbar',
-+	'vs/base/browser/ui/scrollbar/verticalScrollbar',
-+	'vs/base/common/sequence',
-+	'vs/base/common/worker/simpleWorker',
-+	'vs/base/node/console',
-+	'vs/base/node/decoder',
-+	'vs/base/node/flow',
-+	'vs/base/node/id',
-+	'vs/base/node/ports',
-+	'vs/base/node/proxy',
-+	'vs/base/node/stdFork',
-+	'vs/base/node/stream',
-+	'vs/base/node/encoding',
-+	'vs/base/node/extfs',
-+	'vs/base/node/config',
-+	'vs/base/node/mime',
-+	'vs/base/node/pfs',
-+	'vs/base/parts/ipc/common/ipc',
-+	'vs/base/parts/ipc/common/ipc.electron',
-+	'vs/base/parts/ipc/electron-browser/ipc.electron-browser',
-+	'vs/base/parts/ipc/node/ipc.net',
-+	'vs/base/parts/quickopen/browser/quickOpenViewer',
-+	'vs/base/parts/quickopen/common/quickOpen',
-+	'vs/base/parts/quickopen/common/quickOpenScorer',
-+	'vs/base/parts/tree/browser/tree',
-+	'vs/base/parts/tree/browser/treeDnd',
-+	'vs/base/parts/tree/browser/treeModel',
-+	'vs/base/parts/tree/browser/treeViewModel',
-+	'vs/base/worker/defaultWorkerFactory',
-+	'vs/base/browser/builder',
-+	'vs/base/browser/dnd',
-+	'vs/base/browser/ui/button/button',
-+	'vs/base/browser/ui/checkbox/checkbox',
-+	'vs/base/browser/ui/contextview/contextview',
-+	'vs/base/browser/ui/countBadge/countBadge',
-+	'vs/base/browser/ui/dropdown/dropdown',
-+	'vs/base/browser/ui/octiconLabel/octiconLabel',
-+	'vs/base/browser/ui/highlightedlabel/highlightedLabel',
-+	'vs/base/browser/ui/iconLabel/iconLabel',
-+	'vs/base/browser/ui/progressbar/progressbar',
-+	'vs/base/browser/ui/sash/sash',
-+	'vs/base/browser/ui/scrollbar/scrollableElement',
-+	'vs/base/browser/ui/list/listView',
-+	'vs/base/browser/ui/list/listWidget',
-+	'vs/base/browser/ui/list/listPaging',
-+	'vs/base/parts/tree/browser/treeView',
-+	'vs/base/browser/ui/splitview/splitview',
-+	'vs/base/browser/ui/splitview/panelview',
-+	'vs/editor/browser/config/charWidthReader',
-+	'vs/editor/browser/config/elementSizeObserver',
-+	'vs/editor/browser/core/editorState',
-+	'vs/editor/browser/editorDom',
-+	'vs/editor/browser/services/abstractCodeEditorService',
-+	'vs/editor/common/config/editorZoom',
-+	'vs/editor/common/controller/cursorEvents',
-+	'vs/editor/common/core/position',
-+	'vs/editor/common/core/range',
-+	'vs/editor/browser/widget/diffNavigator',
-+	'vs/editor/common/core/editOperation',
-+	'vs/editor/common/commands/trimTrailingWhitespaceCommand',
-+	'vs/editor/common/core/rgba',
-+	'vs/editor/common/core/selection',
-+	'vs/editor/common/commands/replaceCommand',
-+	'vs/editor/common/commands/surroundSelectionCommand',
-+	'vs/editor/common/core/stringBuilder',
-+	'vs/editor/browser/view/viewLayer',
-+	'vs/editor/common/core/token',
-+	'vs/editor/common/core/uint',
-+	'vs/editor/common/core/characterClassifier',
-+	'vs/editor/common/controller/wordCharacterClassifier',
-+	'vs/editor/common/diff/diffComputer',
-+	'vs/editor/common/editorAction',
-+	'vs/editor/common/editorCommon',
-+	'vs/editor/browser/editorBrowser',
-+	'vs/editor/common/model',
-+	'vs/editor/browser/controller/textAreaState',
-+	'vs/editor/browser/controller/textAreaInput',
-+	'vs/editor/common/model/chunksTextBuffer/bufferPiece',
-+	'vs/editor/common/model/chunksTextBuffer/chunksTextBuffer',
-+	'vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder',
-+	'vs/editor/common/model/editStack',
-+	'vs/editor/common/model/indentationGuesser',
-+	'vs/editor/common/model/intervalTree',
-+	'vs/editor/common/model/linesTextBuffer/textSource',
-+	'vs/editor/common/model/pieceTreeTextBuffer/rbTreeBase',
-+	'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase',
-+	'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer',
-+	'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder',
-+	'vs/editor/common/model/textModelEvents',
-+	'vs/editor/common/model/textModelSearch',
-+	'vs/editor/common/model/wordHelper',
-+	'vs/editor/common/modes/abstractMode',
-+	'vs/editor/common/modes/languageConfiguration',
-+	'vs/editor/common/modes/languageSelector',
-+	'vs/editor/common/modes/languageFeatureRegistry',
-+	'vs/editor/common/modes/linkComputer',
-+	'vs/editor/common/modes/supports/characterPair',
-+	'vs/editor/common/modes/supports/indentRules',
-+	'vs/editor/common/modes/supports/inplaceReplaceSupport',
-+	'vs/editor/common/modes/supports/onEnter',
-+	'vs/editor/common/modes/supports/richEditBrackets',
-+	'vs/editor/common/modes/supports/tokenization',
-+	'vs/editor/common/modes/tokenizationRegistry',
-+	'vs/editor/common/modes',
-+	'vs/editor/common/core/lineTokens',
-+	'vs/editor/common/modes/nullMode',
-+	'vs/editor/common/model/textModelTokens',
-+	'vs/editor/common/modes/supports',
-+	'vs/editor/common/modes/supports/electricCharacter',
-+	'vs/editor/common/modes/languageConfigurationRegistry',
-+	'vs/editor/common/modes/textToHtmlTokenizer',
-+	'vs/editor/common/standalone/standaloneBase',
-+	'vs/editor/common/view/minimapCharRenderer',
-+	'vs/editor/common/view/overviewZoneManager',
-+	'vs/editor/common/view/renderingContext',
-+	'vs/editor/browser/viewParts/lines/rangeUtil',
-+	'vs/editor/common/view/runtimeMinimapCharRenderer',
-+	'vs/editor/common/view/viewContext',
-+	'vs/editor/common/view/viewEventDispatcher',
-+	'vs/editor/common/view/viewEvents',
-+	'vs/editor/common/viewLayout/lineDecorations',
-+	'vs/editor/common/viewLayout/viewLineRenderer',
-+	'vs/editor/common/viewLayout/viewLinesViewportData',
-+	'vs/editor/common/viewLayout/whitespaceComputer',
-+	'vs/editor/common/viewLayout/linesLayout',
-+	'vs/editor/common/viewModel/prefixSumComputer',
-+	'vs/editor/common/model/linesTextBuffer/linesTextBuffer',
-+	'vs/editor/common/model/linesTextBuffer/linesTextBufferBuilder',
-+	'vs/editor/common/model/mirrorTextModel',
-+	'vs/editor/common/services/editorSimpleWorker',
-+	'vs/editor/common/viewModel/viewEventHandler',
-+	'vs/editor/browser/view/dynamicViewOverlay',
-+	'vs/editor/browser/view/viewPart',
-+	'vs/editor/browser/viewParts/contentWidgets/contentWidgets',
-+	'vs/editor/browser/viewParts/decorations/decorations',
-+	'vs/editor/browser/viewParts/glyphMargin/glyphMargin',
-+	'vs/editor/browser/viewParts/linesDecorations/linesDecorations',
-+	'vs/editor/browser/viewParts/margin/margin',
-+	'vs/editor/browser/viewParts/marginDecorations/marginDecorations',
-+	'vs/editor/browser/viewParts/overlayWidgets/overlayWidgets',
-+	'vs/editor/browser/viewParts/overviewRuler/overviewRuler',
-+	'vs/editor/browser/viewParts/viewZones/viewZones',
-+	'vs/editor/common/viewModel/viewModel',
-+	'vs/editor/common/viewLayout/viewLayout',
-+	'vs/editor/common/viewModel/viewModelDecorations',
-+	'vs/editor/contrib/caretOperations/moveCaretCommand',
-+	'vs/editor/contrib/colorPicker/color',
-+	'vs/editor/contrib/colorPicker/colorPickerModel',
-+	'vs/editor/contrib/comment/blockCommentCommand',
-+	'vs/editor/contrib/comment/lineCommentCommand',
-+	'vs/editor/contrib/dnd/dragAndDropCommand',
-+	'vs/editor/contrib/find/findState',
-+	'vs/editor/contrib/find/replaceAllCommand',
-+	'vs/editor/contrib/find/replacePattern',
-+	'vs/editor/contrib/folding/foldingRanges',
-+	'vs/editor/contrib/folding/foldingModel',
-+	'vs/editor/contrib/folding/hiddenRangeModel',
-+	'vs/editor/contrib/format/formatCommand',
-+	'vs/editor/contrib/goToDeclaration/clickLinkGesture',
-+	'vs/editor/contrib/hover/hoverOperation',
-+	'vs/editor/contrib/hover/hoverWidgets',
-+	'vs/editor/contrib/hover/modesGlyphHover',
-+	'vs/editor/contrib/inPlaceReplace/inPlaceReplaceCommand',
-+	'vs/editor/contrib/indentation/indentUtils',
-+	'vs/editor/contrib/linesOperations/copyLinesCommand',
-+	'vs/editor/contrib/linesOperations/deleteLinesCommand',
-+	'vs/editor/contrib/linesOperations/sortLinesCommand',
-+	'vs/editor/contrib/quickFix/codeActionTrigger',
-+	'vs/editor/contrib/quickFix/quickFixWidget',
-+	'vs/editor/contrib/smartSelect/tokenTree',
-+	'vs/editor/contrib/snippet/snippetParser',
-+	'vs/editor/contrib/snippet/snippetVariables',
-+	'vs/editor/contrib/suggest/completionModel',
-+	'vs/base/browser/ui/aria/aria',
-+	'vs/base/browser/ui/findinput/findInputCheckboxes',
-+	'vs/base/browser/ui/selectBox/selectBoxCustom',
-+	'vs/base/browser/ui/selectBox/selectBox',
-+	'vs/base/browser/ui/actionbar/actionbar',
-+	'vs/base/browser/ui/inputbox/inputBox',
-+	'vs/base/browser/ui/findinput/findInput',
-+	'vs/base/browser/ui/toolbar/toolbar',
-+	'vs/base/common/errorMessage',
-+	'vs/base/common/jsonErrorMessages',
-+	'vs/base/common/keybindingLabels',
-+	'vs/base/browser/ui/keybindingLabel/keybindingLabel',
-+	'vs/base/common/severity',
-+	'vs/base/node/processes',
-+	'vs/base/parts/ipc/node/ipc.cp',
-+	'vs/base/parts/quickopen/browser/quickOpenModel',
-+	'vs/base/parts/tree/browser/treeDefaults',
-+	'vs/base/parts/tree/browser/treeImpl',
-+	'vs/base/parts/quickopen/browser/quickOpenWidget',
-+	'vs/editor/common/config/editorOptions',
-+	'vs/editor/common/config/fontInfo',
-+	'vs/editor/common/model/textModel',
-+	'vs/editor/common/controller/cursorCommon',
-+	'vs/editor/common/commands/shiftCommand',
-+	'vs/editor/common/controller/cursorColumnSelection',
-+	'vs/editor/common/controller/cursorMoveOperations',
-+	'vs/editor/common/controller/cursorDeleteOperations',
-+	'vs/editor/common/controller/cursorTypeOperations',
-+	'vs/editor/common/controller/cursorWordOperations',
-+	'vs/editor/common/controller/cursorMoveCommands',
-+	'vs/editor/common/controller/oneCursor',
-+	'vs/editor/common/controller/cursorCollection',
-+	'vs/editor/common/viewModel/splitLinesCollection',
-+	'vs/editor/common/viewModel/characterHardWrappingLineMapper',
-+	'vs/editor/common/viewModel/viewModelImpl',
-+	'vs/editor/contrib/folding/foldingDecorations',
-+	'vs/editor/contrib/folding/indentRangeProvider',
-+	'vs/editor/contrib/linesOperations/moveLinesCommand',
-+	'vs/editor/contrib/quickFix/lightBulbWidget',
-+	'vs/editor/contrib/zoneWidget/zoneWidget',
-+	'vs/editor/common/controller/cursor',
-+	'vs/editor/contrib/referenceSearch/referencesModel',
-+	'vs/platform/clipboard/electron-browser/clipboardService',
-+	'vs/platform/extensionManagement/common/extensionManagementIpc',
-+	'vs/platform/extensions/common/extensionHost',
-+	'vs/platform/extensions/node/extensionValidator',
-+	'vs/platform/files/node/files',
-+	'vs/platform/instantiation/common/descriptors',
-+	'vs/platform/instantiation/common/extensions',
-+	'vs/platform/instantiation/common/instantiation',
-+	'vs/editor/browser/services/codeEditorService',
-+	'vs/editor/common/services/editorWorkerService',
-+	'vs/editor/common/services/modeService',
-+	'vs/editor/common/services/modelService',
-+	'vs/editor/common/services/resolverService',
-+	'vs/editor/common/services/resourceConfiguration',
-+	'vs/editor/common/services/editorWorkerServiceImpl',
-+	'vs/editor/common/services/webWorker',
-+	'vs/editor/contrib/smartSelect/tokenSelectionSupport',
-+	'vs/platform/clipboard/common/clipboardService',
-+	'vs/editor/contrib/snippet/snippetSession',
-+	'vs/platform/commands/common/commands',
-+	'vs/editor/contrib/links/getLinks',
-+	'vs/platform/contextkey/common/contextkey',
-+	'vs/editor/common/editorContextKeys',
-+	'vs/platform/actions/common/actions',
-+	'vs/platform/actions/common/menu',
-+	'vs/platform/contextview/browser/contextView',
-+	'vs/platform/editor/common/editor',
-+	'vs/platform/environment/common/environment',
-+	'vs/platform/extensionManagement/common/extensionManagement',
-+	'vs/platform/extensionManagement/common/extensionManagementUtil',
-+	'vs/platform/extensionManagement/node/extensionManagementUtil',
-+	'vs/platform/extensions/common/extensions',
-+	'vs/platform/actions/common/menuService',
-+	'vs/platform/files/common/files',
-+	'vs/platform/instantiation/common/serviceCollection',
-+	'vs/editor/common/commonCodeEditor',
-+	'vs/platform/instantiation/common/instantiationService',
-+	'vs/platform/integrity/common/integrity',
-+	'vs/platform/issue/common/issue',
-+	'vs/platform/issue/common/issueIpc',
-+	'vs/platform/keybinding/common/abstractKeybindingService',
-+	'vs/platform/keybinding/common/keybinding',
-+	'vs/platform/keybinding/common/keybindingResolver',
-+	'vs/platform/keybinding/common/resolvedKeybindingItem',
-+	'vs/platform/keybinding/common/usLayoutResolvedKeybinding',
-+	'vs/platform/lifecycle/common/lifecycle',
-+	'vs/platform/localizations/common/localizations',
-+	'vs/platform/localizations/common/localizationsIpc',
-+	'vs/platform/log/common/log',
-+	'vs/platform/broadcast/electron-browser/broadcastService',
-+	'vs/platform/commands/common/commandService',
-+	'vs/platform/log/common/logIpc',
-+	'vs/platform/log/node/spdlogService',
-+	'vs/platform/markers/common/markerService',
-+	'vs/platform/markers/common/markers',
-+	'vs/platform/message/common/message',
-+	'vs/platform/actions/browser/menuItemActionItem',
-+	'vs/platform/message/common/messageIpc',
-+	'vs/platform/node/package',
-+	'vs/base/node/paths',
-+	'vs/platform/node/product',
-+	'vs/platform/environment/node/environmentService',
-+	'vs/platform/opener/common/opener',
-+	'vs/editor/contrib/markdown/markdownRenderer',
-+	'vs/platform/progress/common/progress',
-+	'vs/editor/browser/services/bulkEdit',
-+	'vs/platform/quickOpen/common/quickOpen',
-+	'vs/platform/registry/common/platform',
-+	'vs/editor/common/modes/modesRegistry',
-+	'vs/platform/jsonschemas/common/jsonContributionRegistry',
-+	'vs/platform/configuration/common/configurationRegistry',
-+	'vs/editor/common/config/commonEditorConfig',
-+	'vs/editor/common/services/languagesRegistry',
-+	'vs/editor/common/services/modeServiceImpl',
-+	'vs/platform/configuration/common/configuration',
-+	'vs/editor/common/services/resourceConfigurationImpl',
-+	'vs/platform/configuration/common/configurationModels',
-+	'vs/platform/configuration/node/configuration',
-+	'vs/platform/contextkey/browser/contextKeyService',
-+	'vs/platform/extensions/common/extensionsRegistry',
-+	'vs/platform/actions/electron-browser/menusExtensionPoint',
-+	'vs/platform/jsonschemas/common/jsonValidationExtensionPoint',
-+	'vs/platform/keybinding/common/keybindingsRegistry',
-+	'vs/platform/markers/common/problemMatcher',
-+	'vs/platform/request/node/request',
-+	'vs/platform/search/common/replace',
-+	'vs/platform/search/common/search',
-+	'vs/platform/statusbar/common/statusbar',
-+	'vs/platform/storage/common/storage',
-+	'vs/editor/browser/config/configuration',
-+	'vs/editor/browser/view/viewOverlays',
-+	'vs/editor/browser/viewParts/viewCursors/viewCursor',
-+	'vs/editor/contrib/suggest/suggestMemory',
-+	'vs/platform/integrity/node/integrityServiceImpl',
-+	'vs/platform/storage/common/storageService',
-+	'vs/platform/storage/common/migration',
-+	'vs/platform/telemetry/browser/errorTelemetry',
-+	'vs/platform/telemetry/common/experiments',
-+	'vs/platform/telemetry/common/telemetry',
-+	'vs/editor/browser/editorExtensions',
-+	'vs/editor/browser/controller/coreCommands',
-+	'vs/editor/browser/view/viewController',
-+	'vs/editor/contrib/caretOperations/caretOperations',
-+	'vs/editor/contrib/caretOperations/transpose',
-+	'vs/editor/contrib/clipboard/clipboard',
-+	'vs/editor/contrib/codelens/codelens',
-+	'vs/editor/contrib/colorPicker/colorDetector',
-+	'vs/editor/contrib/comment/comment',
-+	'vs/editor/contrib/contextmenu/contextmenu',
-+	'vs/editor/contrib/cursorUndo/cursorUndo',
-+	'vs/editor/contrib/dnd/dnd',
-+	'vs/editor/contrib/folding/folding',
-+	'vs/editor/contrib/format/format',
-+	'vs/editor/contrib/format/formatActions',
-+	'vs/editor/contrib/goToDeclaration/goToDeclaration',
-+	'vs/editor/contrib/hover/getHover',
-+	'vs/editor/contrib/indentation/indentation',
-+	'vs/editor/contrib/linesOperations/linesOperations',
-+	'vs/editor/contrib/parameterHints/provideSignatureHelp',
-+	'vs/editor/contrib/quickFix/quickFix',
-+	'vs/editor/contrib/quickFix/quickFixModel',
-+	'vs/editor/contrib/quickFix/quickFixCommands',
-+	'vs/editor/contrib/quickOpen/quickOpen',
-+	'vs/editor/contrib/smartSelect/smartSelect',
-+	'vs/editor/contrib/suggest/suggest',
-+	'vs/editor/contrib/snippet/snippetController2',
-+	'vs/editor/contrib/suggest/suggestModel',
-+	'vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode',
-+	'vs/editor/contrib/wordOperations/wordOperations',
-+	'vs/platform/contextview/browser/contextViewService',
-+	'vs/platform/telemetry/common/telemetryIpc',
-+	'vs/platform/telemetry/common/telemetryService',
-+	'vs/platform/telemetry/common/telemetryUtils',
-+	'vs/platform/opener/browser/openerService',
-+	'vs/platform/opener/browser/opener.contribution',
-+	'vs/platform/telemetry/node/commonProperties',
-+	'vs/platform/telemetry/node/telemetryNodeUtils',
-+	'vs/platform/telemetry/node/workbenchCommonProperties',
-+	'vs/platform/theme/common/colorRegistry',
-+	'vs/platform/theme/common/colorExtensionPoint',
-+	'vs/platform/theme/common/styler',
-+	'vs/platform/theme/common/themeService',
-+	'vs/editor/browser/services/codeEditorServiceImpl',
-+	'vs/editor/browser/viewParts/editorScrollbar/editorScrollbar',
-+	'vs/editor/browser/viewParts/lines/viewLine',
-+	'vs/editor/browser/controller/mouseTarget',
-+	'vs/editor/browser/controller/mouseHandler',
-+	'vs/editor/browser/controller/pointerHandler',
-+	'vs/editor/browser/view/viewOutgoingEvents',
-+	'vs/editor/browser/viewParts/lines/viewLines',
-+	'vs/editor/browser/viewParts/minimap/minimap',
-+	'vs/editor/browser/viewParts/scrollDecoration/scrollDecoration',
-+	'vs/editor/browser/viewParts/selections/selections',
-+	'vs/editor/common/view/editorColorRegistry',
-+	'vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight',
-+	'vs/editor/browser/viewParts/currentLineMarginHighlight/currentLineMarginHighlight',
-+	'vs/editor/browser/viewParts/indentGuides/indentGuides',
-+	'vs/editor/browser/viewParts/lineNumbers/lineNumbers',
-+	'vs/editor/browser/controller/textAreaHandler',
-+	'vs/editor/browser/viewParts/overviewRuler/decorationsOverviewRuler',
-+	'vs/editor/browser/viewParts/rulers/rulers',
-+	'vs/editor/browser/viewParts/viewCursors/viewCursors',
-+	'vs/editor/browser/view/viewImpl',
-+	'vs/editor/browser/widget/codeEditorWidget',
-+	'vs/editor/browser/codeEditor',
-+	'vs/editor/browser/widget/diffReview',
-+	'vs/editor/browser/widget/diffEditorWidget',
-+	'vs/editor/browser/widget/embeddedCodeEditorWidget',
-+	'vs/editor/common/services/modelServiceImpl',
-+	'vs/editor/contrib/bracketMatching/bracketMatching',
-+	'vs/editor/contrib/codelens/codelensWidget',
-+	'vs/editor/contrib/codelens/codelensController',
-+	'vs/editor/contrib/colorPicker/colorPickerWidget',
-+	'vs/editor/contrib/find/findDecorations',
-+	'vs/editor/contrib/find/findModel',
-+	'vs/editor/contrib/find/findOptionsWidget',
-+	'vs/editor/contrib/find/findWidget',
-+	'vs/editor/contrib/find/findController',
-+	'vs/editor/contrib/find/simpleFindWidget',
-+	'vs/editor/contrib/gotoError/gotoError',
-+	'vs/editor/contrib/hover/modesContentHover',
-+	'vs/editor/contrib/hover/hover',
-+	'vs/editor/contrib/inPlaceReplace/inPlaceReplace',
-+	'vs/editor/contrib/links/links',
-+	'vs/editor/contrib/message/messageController',
-+	'vs/editor/contrib/multicursor/multicursor',
-+	'vs/editor/contrib/parameterHints/parameterHintsWidget',
-+	'vs/editor/contrib/parameterHints/parameterHints',
-+	'vs/editor/contrib/referenceSearch/peekViewWidget',
-+	'vs/editor/contrib/rename/renameInputField',
-+	'vs/editor/contrib/rename/rename',
-+	'vs/editor/contrib/suggest/suggestWidget',
-+	'vs/editor/contrib/suggest/suggestController',
-+	'vs/editor/contrib/wordHighlighter/wordHighlighter',
-+	'vs/platform/update/common/update',
-+	'vs/platform/update/common/updateIpc',
-+	'vs/platform/update/node/update.config.contribution',
-+	'vs/platform/url/common/url',
-+	'vs/platform/windows/common/windows',
-+	'vs/platform/lifecycle/electron-browser/lifecycleService',
-+	'vs/platform/url/common/urlIpc',
-+	'vs/platform/windows/common/windowsIpc',
-+	'vs/platform/windows/electron-browser/windowService',
-+	'vs/platform/workbench/common/contextkeys',
-+	'vs/platform/list/browser/listService',
-+	'vs/platform/workspaces/common/workspaces',
-+	'vs/platform/workspace/common/workspace',
-+	'vs/editor/contrib/referenceSearch/referencesWidget',
-+	'vs/editor/contrib/referenceSearch/referencesController',
-+	'vs/editor/contrib/goToDeclaration/goToDeclarationCommands',
-+	'vs/editor/contrib/goToDeclaration/goToDeclarationMouse',
-+	'vs/editor/contrib/referenceSearch/referenceSearch',
-+	'vs/editor/editor.all',
-+	'vs/platform/extensionManagement/common/extensionEnablementService',
-+	'vs/platform/workspaces/common/workspacesIpc',
-+	'vs/platform/workspaces/node/workspaces',
-+	'vs/workbench/api/electron-browser/extHostCustomers',
-+	'vs/workbench/api/node/extHostTypes',
-+	'vs/workbench/browser/actions',
-+	'vs/workbench/browser/parts/quickopen/quickopen',
-+	'vs/workbench/browser/parts/statusbar/statusbar',
-+	'vs/workbench/common/actions',
-+	'vs/workbench/browser/actions/toggleTabsVisibility',
-+	'vs/workbench/common/activity',
-+	'vs/workbench/common/contributions',
-+	'vs/workbench/common/editor',
-+	'vs/workbench/browser/quickopen',
-+	'vs/workbench/common/editor/diffEditorModel',
-+	'vs/workbench/common/editor/editorStacksModel',
-+	'vs/workbench/common/editor/textDiffEditorModel',
-+	'vs/workbench/common/editor/textEditorModel',
-+	'vs/workbench/common/editor/diffEditorInput',
-+	'vs/workbench/common/editor/resourceEditorModel',
-+	'vs/workbench/common/memento',
-+	'vs/workbench/common/resources',
-+	'vs/workbench/common/editor/binaryEditorModel',
-+	'vs/workbench/common/editor/dataUriEditorInput',
-+	'vs/workbench/common/theme',
-+	'vs/workbench/common/component',
-+	'vs/workbench/browser/composite',
-+	'vs/workbench/browser/panel',
-+	'vs/workbench/browser/part',
-+	'vs/workbench/browser/parts/editor/baseEditor',
-+	'vs/workbench/browser/editor',
-+	'vs/workbench/browser/parts/editor/sideBySideEditor',
-+	'vs/workbench/browser/parts/editor/webviewEditor',
-+	'vs/workbench/common/views',
-+	'vs/workbench/electron-browser/resources',
-+	'vs/workbench/parts/cache/node/nodeCachedDataManager',
-+	'vs/workbench/parts/cache/node/cache.contribution',
-+	'vs/workbench/parts/cli/electron-browser/cli.contribution',
-+	'vs/workbench/parts/codeEditor/electron-browser/accessibility',
-+	'vs/workbench/parts/codeEditor/electron-browser/menuPreventer',
-+	'vs/workbench/parts/codeEditor/electron-browser/selectionClipboard',
-+	'vs/workbench/parts/codeEditor/electron-browser/toggleMinimap',
-+	'vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier',
-+	'vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter',
-+	'vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace',
-+	'vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap',
-+	'vs/workbench/parts/debug/common/debug',
-+	'vs/workbench/parts/debug/browser/breakpointWidget',
-+	'vs/workbench/parts/debug/browser/debugActionItems',
-+	'vs/workbench/parts/debug/browser/debugStatus',
-+	'vs/workbench/parts/debug/common/debugSource',
-+	'vs/workbench/parts/debug/browser/debugContentProvider',
-+	'vs/workbench/parts/debug/common/debugModel',
-+	'vs/workbench/parts/debug/browser/baseDebugView',
-+	'vs/workbench/parts/debug/common/debugViewModel',
-+	'vs/workbench/parts/debug/common/replHistory',
-+	'vs/workbench/parts/debug/electron-browser/electronDebugActions',
-+	'vs/workbench/parts/debug/electron-browser/terminalSupport',
-+	'vs/workbench/parts/debug/node/debugAdapter',
-+	'vs/workbench/parts/debug/node/v8Protocol',
-+	'vs/workbench/parts/emmet/browser/actions/showEmmetCommands',
-+	'vs/workbench/parts/emmet/browser/emmet.browser.contribution',
-+	'vs/workbench/parts/execution/common/execution',
-+	'vs/workbench/parts/execution/electron-browser/terminal',
-+	'vs/workbench/parts/execution/electron-browser/terminalService',
-+	'vs/workbench/parts/extensions/common/extensionQuery',
-+	'vs/workbench/parts/extensions/common/extensions',
-+	'vs/workbench/parts/extensions/browser/dependenciesViewer',
-+	'vs/workbench/parts/extensions/browser/extensionsWidgets',
-+	'vs/workbench/parts/extensions/common/extensionsFileTemplate',
-+	'vs/workbench/parts/extensions/common/extensionsInput',
-+	'vs/workbench/parts/extensions/electron-browser/extensionsUtils',
-+	'vs/workbench/parts/files/common/explorerModel',
-+	'vs/workbench/parts/files/browser/files',
-+	'vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider',
-+	'vs/workbench/parts/html/browser/webviewEditor',
-+	'vs/workbench/parts/html/browser/webviewFindWidget',
-+	'vs/workbench/parts/html/browser/webview',
-+	'vs/workbench/parts/logs/common/logConstants',
-+	'vs/workbench/parts/markers/common/constants',
-+	'vs/workbench/parts/markers/common/messages',
-+	'vs/workbench/parts/markers/common/markersModel',
-+	'vs/workbench/parts/markers/browser/markersTreeController',
-+	'vs/workbench/parts/output/common/output',
-+	'vs/workbench/parts/logs/electron-browser/logsActions',
-+	'vs/workbench/parts/logs/electron-browser/logs.contribution',
-+	'vs/workbench/parts/output/common/outputLinkProvider',
-+	'vs/workbench/parts/performance/electron-browser/stats',
-+	'vs/workbench/parts/preferences/browser/keybindingWidgets',
-+	'vs/workbench/parts/preferences/browser/preferencesWidgets',
-+	'vs/workbench/parts/preferences/common/keybindingsEditorModel',
-+	'vs/workbench/parts/preferences/common/preferences',
-+	'vs/workbench/parts/preferences/common/preferencesModels',
-+	'vs/workbench/parts/preferences/common/smartSnippetInserter',
-+	'vs/workbench/parts/quickopen/browser/helpHandler',
-+	'vs/workbench/parts/relauncher/electron-browser/relauncher.contribution',
-+	'vs/workbench/parts/scm/common/scm',
-+	'vs/workbench/parts/scm/electron-browser/scmUtil',
-+	'vs/workbench/parts/scm/electron-browser/scmMenus',
-+	'vs/workbench/parts/search/browser/patternInputWidget',
-+	'vs/workbench/parts/search/common/constants',
-+	'vs/workbench/parts/search/common/queryBuilder',
-+	'vs/workbench/parts/search/common/replace',
-+	'vs/workbench/parts/search/common/search',
-+	'vs/workbench/parts/search/common/searchModel',
-+	'vs/workbench/parts/search/browser/replaceService',
-+	'vs/workbench/parts/search/browser/replaceContributions',
-+	'vs/workbench/parts/snippets/electron-browser/snippets.contribution',
-+	'vs/workbench/parts/snippets/electron-browser/configureSnippets',
-+	'vs/workbench/parts/snippets/electron-browser/snippetsFile',
-+	'vs/workbench/parts/snippets/electron-browser/insertSnippet',
-+	'vs/workbench/parts/stats/node/workspaceStats',
-+	'vs/workbench/parts/stats/node/stats.contribution',
-+	'vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution',
-+	'vs/workbench/parts/surveys/electron-browser/nps.contribution',
-+	'vs/workbench/parts/tasks/common/problemCollectors',
-+	'vs/workbench/parts/tasks/common/taskDefinitionRegistry',
-+	'vs/workbench/parts/tasks/common/taskSystem',
-+	'vs/workbench/parts/tasks/common/taskTemplates',
-+	'vs/workbench/parts/tasks/common/tasks',
-+	'vs/workbench/parts/tasks/common/taskService',
-+	'vs/workbench/parts/tasks/browser/quickOpen',
-+	'vs/workbench/parts/tasks/browser/taskQuickOpen',
-+	'vs/workbench/parts/tasks/electron-browser/jsonSchemaCommon',
-+	'vs/workbench/parts/tasks/electron-browser/jsonSchema_v1',
-+	'vs/workbench/parts/tasks/electron-browser/jsonSchema_v2',
-+	'vs/workbench/parts/tasks/electron-browser/terminalTaskSystem',
-+	'vs/workbench/parts/tasks/node/processRunnerDetector',
-+	'vs/workbench/parts/tasks/node/processTaskSystem',
-+	'vs/workbench/parts/tasks/node/taskConfiguration',
-+	'vs/workbench/parts/terminal/browser/terminalWidgetManager',
-+	'vs/workbench/parts/terminal/common/terminal',
-+	'vs/workbench/parts/debug/electron-browser/rawDebugSession',
-+	'vs/workbench/parts/terminal/browser/terminalQuickOpen',
-+	'vs/workbench/parts/terminal/electron-browser/terminal',
-+	'vs/workbench/parts/terminal/electron-browser/terminalColorRegistry',
-+	'vs/workbench/parts/terminal/electron-browser/terminalCommands',
-+	'vs/workbench/parts/terminal/electron-browser/terminalFindWidget',
-+	'vs/workbench/parts/terminal/electron-browser/terminalLinkHandler',
-+	'vs/workbench/parts/terminal/electron-browser/windowsShellHelper',
-+	'vs/workbench/parts/update/electron-browser/releaseNotesInput',
-+	'vs/workbench/parts/welcome/gettingStarted/electron-browser/gettingStarted',
-+	'vs/workbench/parts/welcome/gettingStarted/electron-browser/gettingStarted.contribution',
-+	'vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page',
-+	'vs/workbench/parts/welcome/walkThrough/node/walkThroughUtils',
-+	'vs/workbench/services/activity/common/activity',
-+	'vs/workbench/browser/parts/compositebar/compositeBarActions',
-+	'vs/workbench/browser/parts/compositebar/compositeBar',
-+	'vs/workbench/parts/markers/common/markers',
-+	'vs/workbench/services/backup/common/backup',
-+	'vs/workbench/common/editor/untitledEditorModel',
-+	'vs/workbench/services/backup/node/backupFileService',
-+	'vs/workbench/services/configuration/common/configuration',
-+	'vs/workbench/parts/feedback/electron-browser/feedback',
-+	'vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem',
-+	'vs/workbench/parts/feedback/electron-browser/feedback.contribution',
-+	'vs/workbench/parts/terminal/electron-browser/terminalConfigHelper',
-+	'vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution',
-+	'vs/workbench/services/configuration/common/configurationExtensionPoint',
-+	'vs/workbench/services/configuration/common/configurationModels',
-+	'vs/workbench/services/configuration/common/jsonEditing',
-+	'vs/workbench/services/configuration/node/configuration',
-+	'vs/workbench/services/configurationResolver/common/configurationResolver',
-+	'vs/workbench/services/contextview/electron-browser/contextmenuService',
-+	'vs/workbench/services/crashReporter/electron-browser/crashReporterService',
-+	'vs/workbench/services/decorations/browser/decorations',
-+	'vs/workbench/parts/markers/browser/markersFileDecorations',
-+	'vs/workbench/services/decorations/browser/decorationsService',
-+	'vs/workbench/services/extensions/electron-browser/extensionHost',
-+	'vs/workbench/services/extensions/electron-browser/extensionHostProfiler',
-+	'vs/workbench/services/extensions/node/extensionDescriptionRegistry',
-+	'vs/workbench/services/extensions/node/extensionPoints',
-+	'vs/workbench/services/extensions/node/lazyPromise',
-+	'vs/workbench/services/extensions/node/proxyIdentifier',
-+	'vs/workbench/api/node/extHost.protocol',
-+	'vs/workbench/api/electron-browser/mainThreadCommands',
-+	'vs/workbench/api/electron-browser/mainThreadConfiguration',
-+	'vs/workbench/api/electron-browser/mainThreadDebugService',
-+	'vs/workbench/api/electron-browser/mainThreadDecorations',
-+	'vs/workbench/api/electron-browser/mainThreadDiagnostics',
-+	'vs/workbench/api/electron-browser/mainThreadDialogs',
-+	'vs/workbench/api/electron-browser/mainThreadEditor',
-+	'vs/workbench/api/electron-browser/mainThreadErrors',
-+	'vs/workbench/api/electron-browser/mainThreadFileSystemEventService',
-+	'vs/workbench/api/electron-browser/mainThreadHeapService',
-+	'vs/workbench/api/electron-browser/mainThreadLanguages',
-+	'vs/workbench/api/electron-browser/mainThreadLogService',
-+	'vs/workbench/api/electron-browser/mainThreadMessageService',
-+	'vs/workbench/api/electron-browser/mainThreadProgress',
-+	'vs/workbench/api/electron-browser/mainThreadQuickOpen',
-+	'vs/workbench/api/electron-browser/mainThreadStatusBar',
-+	'vs/workbench/api/electron-browser/mainThreadStorage',
-+	'vs/workbench/api/electron-browser/mainThreadTask',
-+	'vs/workbench/api/electron-browser/mainThreadTelemetry',
-+	'vs/workbench/api/electron-browser/mainThreadTerminalService',
-+	'vs/workbench/api/electron-browser/mainThreadTreeViews',
-+	'vs/workbench/api/electron-browser/mainThreadWindow',
-+	'vs/workbench/services/extensions/node/rpcProtocol',
-+	'vs/workbench/services/files/node/watcher/common',
-+	'vs/workbench/services/files/node/watcher/nsfw/watcherIpc',
-+	'vs/workbench/services/files/node/watcher/nsfw/watcherService',
-+	'vs/workbench/services/files/node/watcher/unix/watcherIpc',
-+	'vs/workbench/services/files/node/watcher/unix/watcherService',
-+	'vs/workbench/services/files/node/watcher/win32/csharpWatcherService',
-+	'vs/workbench/services/files/node/watcher/win32/watcherService',
-+	'vs/workbench/services/files/node/fileService',
-+	'vs/workbench/services/files/electron-browser/fileService',
-+	'vs/workbench/services/files/electron-browser/remoteFileService',
-+	'vs/workbench/services/group/common/groupService',
-+	'vs/workbench/api/electron-browser/mainThreadDocumentContentProviders',
-+	'vs/workbench/browser/actions/toggleEditorLayout',
-+	'vs/workbench/browser/parts/editor/resourceViewer',
-+	'vs/workbench/browser/parts/editor/binaryEditor',
-+	'vs/workbench/browser/parts/editor/binaryDiffEditor',
-+	'vs/workbench/parts/preferences/common/preferencesContribution',
-+	'vs/workbench/services/hash/common/hashService',
-+	'vs/workbench/common/editor/resourceEditorInput',
-+	'vs/workbench/parts/html/common/htmlInput',
-+	'vs/workbench/parts/welcome/walkThrough/node/walkThroughInput',
-+	'vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart',
-+	'vs/workbench/services/hash/node/hashService',
-+	'vs/workbench/services/history/common/history',
-+	'vs/workbench/services/issue/common/issue',
-+	'vs/workbench/services/issue/electron-browser/workbenchIssueService',
-+	'vs/workbench/services/keybinding/common/keyboardMapper',
-+	'vs/workbench/services/keybinding/common/scanCode',
-+	'vs/workbench/services/keybinding/common/keybindingIO',
-+	'vs/workbench/services/keybinding/common/macLinuxFallbackKeyboardMapper',
-+	'vs/workbench/services/keybinding/common/macLinuxKeyboardMapper',
-+	'vs/workbench/services/keybinding/common/windowsKeyboardMapper',
-+	'vs/workbench/parts/preferences/browser/keybindingsEditorContribution',
-+	'vs/workbench/services/keybinding/electron-browser/keybindingService',
-+	'vs/workbench/services/message/browser/messageList',
-+	'vs/workbench/services/message/browser/messageService',
-+	'vs/workbench/services/message/electron-browser/messageService',
-+	'vs/workbench/services/mode/common/workbenchModeService',
-+	'vs/workbench/parts/snippets/electron-browser/snippetsService',
-+	'vs/workbench/parts/snippets/electron-browser/tabCompletion',
-+	'vs/workbench/parts/debug/electron-browser/replEditor',
-+	'vs/workbench/services/panel/common/panelService',
-+	'vs/workbench/parts/output/electron-browser/outputServices',
-+	'vs/workbench/parts/terminal/electron-browser/terminalInstance',
-+	'vs/workbench/parts/terminal/electron-browser/terminalTab',
-+	'vs/workbench/services/activity/browser/activityService',
-+	'vs/workbench/services/part/common/partService',
-+	'vs/workbench/api/electron-browser/mainThreadOutputService',
-+	'vs/workbench/browser/actions/toggleActivityBarVisibility',
-+	'vs/workbench/browser/actions/toggleSidebarPosition',
-+	'vs/workbench/browser/actions/toggleSidebarVisibility',
-+	'vs/workbench/browser/actions/toggleStatusbarVisibility',
-+	'vs/workbench/browser/actions/toggleZenMode',
-+	'vs/workbench/browser/parts/panel/panelActions',
-+	'vs/workbench/parts/debug/browser/statusbarColorProvider',
-+	'vs/workbench/parts/html/browser/htmlPreviewPart',
-+	'vs/workbench/parts/markers/browser/markersPanelActions',
-+	'vs/workbench/parts/output/browser/outputActions',
-+	'vs/workbench/parts/terminal/common/terminalService',
-+	'vs/workbench/parts/terminal/electron-browser/terminalService',
-+	'vs/workbench/parts/update/electron-browser/releaseNotesEditor',
-+	'vs/workbench/services/scm/common/scm',
-+	'vs/workbench/api/electron-browser/mainThreadSCM',
-+	'vs/workbench/parts/scm/electron-browser/scmActivity',
-+	'vs/workbench/services/scm/common/scmService',
-+	'vs/workbench/services/search/node/searchIpc',
-+	'vs/workbench/services/textMate/electron-browser/TMGrammars',
-+	'vs/workbench/parts/emmet/electron-browser/emmetActions',
-+	'vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation',
-+	'vs/workbench/parts/emmet/electron-browser/emmet.contribution',
-+	'vs/workbench/services/textMate/electron-browser/TMHelper',
-+	'vs/workbench/services/textMate/electron-browser/textMateService',
-+	'vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint',
-+	'vs/workbench/services/textfile/common/textfiles',
-+	'vs/workbench/api/node/extHostTypeConverters',
-+	'vs/workbench/api/electron-browser/mainThreadLanguageFeatures',
-+	'vs/workbench/browser/parts/editor/textEditor',
-+	'vs/workbench/common/editor/untitledEditorInput',
-+	'vs/workbench/browser/parts/editor/textResourceEditor',
-+	'vs/workbench/parts/files/common/files',
-+	'vs/workbench/parts/files/browser/editors/binaryFileEditor',
-+	'vs/workbench/parts/files/common/editors/fileEditorInput',
-+	'vs/workbench/parts/output/browser/logViewer',
-+	'vs/workbench/parts/output/browser/outputPanel',
-+	'vs/workbench/parts/welcome/walkThrough/node/walkThroughContentProvider',
-+	'vs/workbench/services/configuration/node/jsonEditingService',
-+	'vs/workbench/services/keybinding/common/keybindingEditing',
-+	'vs/workbench/services/textfile/common/textFileEditorModel',
-+	'vs/workbench/api/electron-browser/mainThreadSaveParticipant',
-+	'vs/workbench/services/textfile/common/textFileEditorModelManager',
-+	'vs/workbench/services/textfile/common/textFileService',
-+	'vs/workbench/services/themes/common/colorThemeSchema',
-+	'vs/workbench/services/themes/common/fileIconThemeSchema',
-+	'vs/workbench/services/themes/common/workbenchThemeService',
-+	'vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes',
-+	'vs/workbench/services/textMate/electron-browser/TMSyntax',
-+	'vs/workbench/services/themes/electron-browser/fileIconThemeData',
-+	'vs/workbench/services/themes/electron-browser/fileIconThemeStore',
-+	'vs/workbench/services/themes/electron-browser/themeCompatibility',
-+	'vs/workbench/services/themes/electron-browser/colorThemeData',
-+	'vs/workbench/services/themes/electron-browser/colorThemeStore',
-+	'vs/workbench/services/themes/electron-browser/workbenchThemeService',
-+	'vs/workbench/services/timer/common/timerService',
-+	'vs/workbench/services/timer/node/timerService',
-+	'vs/workbench/services/title/common/titleService',
-+	'vs/workbench/services/untitled/common/untitledEditorService',
-+	'vs/workbench/api/electron-browser/mainThreadDocuments',
-+	'vs/workbench/browser/labels',
-+	'vs/workbench/parts/backup/common/backupModelTracker',
-+	'vs/workbench/parts/markers/browser/markersTreeViewer',
-+	'vs/workbench/services/editor/common/editorService',
-+	'vs/workbench/api/electron-browser/mainThreadEditors',
-+	'vs/workbench/api/electron-browser/mainThreadDocumentsAndEditors',
-+	'vs/workbench/api/electron-browser/mainThreadWebview',
-+	'vs/workbench/browser/dnd',
-+	'vs/workbench/browser/parts/editor/editorPicker',
-+	'vs/workbench/browser/parts/editor/editorStatus',
-+	'vs/workbench/browser/parts/editor/rangeDecorations',
-+	'vs/workbench/browser/parts/editor/textDiffEditor',
-+	'vs/workbench/browser/parts/editor/editorCommands',
-+	'vs/workbench/browser/parts/editor/editorActions',
-+	'vs/workbench/browser/parts/editor/editor.contribution',
-+	'vs/workbench/browser/parts/editor/titleControl',
-+	'vs/workbench/browser/parts/editor/noTabsTitleControl',
-+	'vs/workbench/browser/parts/editor/tabsTitleControl',
-+	'vs/workbench/browser/parts/editor/editorGroupsControl',
-+	'vs/workbench/browser/parts/quickopen/quickOpenController',
-+	'vs/workbench/browser/parts/quickopen/quickopen.contribution',
-+	'vs/workbench/browser/parts/statusbar/statusbarPart',
-+	'vs/workbench/browser/parts/titlebar/titlebarPart',
-+	'vs/workbench/parts/backup/common/backupRestorer',
-+	'vs/workbench/parts/backup/common/backup.contribution',
-+	'vs/workbench/parts/codeEditor/electron-browser/inspectKeybindings',
-+	'vs/workbench/parts/codeEditor/codeEditor.contribution',
-+	'vs/workbench/parts/debug/browser/debugActions',
-+	'vs/workbench/parts/debug/browser/debugActionsWidget',
-+	'vs/workbench/parts/debug/browser/debugQuickOpen',
-+	'vs/workbench/parts/debug/browser/linkDetector',
-+	'vs/workbench/parts/debug/browser/exceptionWidget',
-+	'vs/workbench/parts/debug/electron-browser/debugConfigurationManager',
-+	'vs/workbench/parts/debug/electron-browser/replViewer',
-+	'vs/workbench/parts/debug/electron-browser/repl',
-+	'vs/workbench/parts/execution/electron-browser/execution.contribution',
-+	'vs/workbench/parts/extensions/node/extensionsWorkbenchService',
-+	'vs/workbench/parts/files/browser/editors/fileEditorTracker',
-+	'vs/workbench/parts/files/common/dirtyFilesTracker',
-+	'vs/workbench/parts/html/browser/webviewCommands',
-+	'vs/workbench/parts/html/browser/webview.contribution',
-+	'vs/workbench/parts/html/browser/html.contribution',
-+	'vs/workbench/parts/localizations/browser/localizationsActions',
-+	'vs/workbench/parts/localizations/browser/localizations.contribution',
-+	'vs/workbench/parts/markers/browser/markersPanel',
-+	'vs/workbench/parts/markers/browser/markersWorkbenchContributions',
-+	'vs/workbench/parts/markers/electron-browser/markersElectronContributions',
-+	'vs/workbench/parts/markers/markers.contribution',
-+	'vs/workbench/parts/output/electron-browser/output.contribution',
-+	'vs/workbench/parts/preferences/browser/keybindingsEditor',
-+	'vs/workbench/parts/preferences/browser/preferencesRenderers',
-+	'vs/workbench/parts/preferences/browser/preferencesEditor',
-+	'vs/workbench/parts/preferences/browser/preferencesService',
-+	'vs/workbench/parts/quickopen/browser/commandsHandler',
-+	'vs/workbench/parts/quickopen/browser/gotoLineHandler',
-+	'vs/workbench/parts/quickopen/browser/gotoSymbolHandler',
-+	'vs/workbench/parts/scm/electron-browser/dirtydiffDecorator',
-+	'vs/workbench/parts/search/browser/openFileHandler',
-+	'vs/workbench/parts/search/browser/openSymbolHandler',
-+	'vs/workbench/parts/search/browser/openAnythingHandler',
-+	'vs/workbench/parts/themes/test/electron-browser/themes.test.contribution',
-+	'vs/workbench/parts/welcome/overlay/browser/welcomeOverlay',
-+	'vs/workbench/parts/welcome/page/electron-browser/welcomePage',
-+	'vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution',
-+	'vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough',
-+	'vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions',
-+	'vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution',
-+	'vs/workbench/services/configuration/node/configurationEditingService',
-+	'vs/workbench/services/configuration/node/configurationService',
-+	'vs/workbench/services/configurationResolver/electron-browser/configurationResolverService',
-+	'vs/workbench/services/history/electron-browser/history',
-+	'vs/workbench/services/search/node/searchService',
-+	'vs/workbench/services/textfile/electron-browser/textFileService',
-+	'vs/workbench/services/textmodelResolver/common/textModelResolverService',
-+	'vs/workbench/services/viewlet/browser/viewlet',
-+	'vs/workbench/browser/layout',
-+	'vs/workbench/browser/parts/activitybar/activitybarActions',
-+	'vs/workbench/browser/parts/activitybar/activitybarPart',
-+	'vs/workbench/browser/viewlet',
-+	'vs/workbench/browser/parts/views/panelViewlet',
-+	'vs/workbench/browser/parts/views/viewsViewlet',
-+	'vs/workbench/browser/parts/views/customView',
-+	'vs/workbench/browser/parts/views/customViewPanel',
-+	'vs/workbench/api/browser/viewsExtensionPoint',
-+	'vs/workbench/electron-browser/actions',
-+	'vs/workbench/parts/debug/browser/breakpointsView',
-+	'vs/workbench/parts/debug/browser/debugCommands',
-+	'vs/workbench/parts/debug/browser/debugEditorActions',
-+	'vs/workbench/parts/debug/browser/debugEditorModelManager',
-+	'vs/workbench/parts/debug/browser/debugViewlet',
-+	'vs/workbench/parts/debug/electron-browser/callStackView',
-+	'vs/workbench/parts/debug/electron-browser/debugService',
-+	'vs/workbench/parts/debug/electron-browser/variablesView',
-+	'vs/workbench/parts/debug/electron-browser/debugHover',
-+	'vs/workbench/parts/debug/electron-browser/debugEditorContribution',
-+	'vs/workbench/parts/debug/electron-browser/watchExpressionsView',
-+	'vs/workbench/parts/debug/electron-browser/debug.contribution',
-+	'vs/workbench/parts/extensions/browser/extensionsQuickOpen',
-+	'vs/workbench/parts/extensions/electron-browser/extensionsActions',
-+	'vs/workbench/parts/files/browser/editors/textFileEditor',
-+	'vs/workbench/parts/performance/electron-browser/startupProfiler',
-+	'vs/workbench/parts/performance/electron-browser/performance.contribution',
-+	'vs/workbench/parts/quickopen/browser/viewPickerHandler',
-+	'vs/workbench/parts/quickopen/browser/quickopen.contribution',
-+	'vs/workbench/parts/scm/electron-browser/scmViewlet',
-+	'vs/workbench/parts/scm/electron-browser/scm.contribution',
-+	'vs/workbench/parts/search/browser/searchActions',
-+	'vs/workbench/parts/search/browser/searchResultsView',
-+	'vs/workbench/parts/search/browser/searchWidget',
-+	'vs/workbench/parts/tasks/electron-browser/task.contribution',
-+	'vs/workbench/parts/themes/electron-browser/themes.contribution',
-+	'vs/workbench/services/extensions/electron-browser/extensionService',
-+	'vs/workbench/api/electron-browser/mainThreadExtensionService',
-+	'vs/workbench/services/progress/browser/progressService',
-+	'vs/workbench/browser/parts/compositePart',
-+	'vs/workbench/browser/parts/editor/editorPart',
-+	'vs/workbench/browser/parts/panel/panelPart',
-+	'vs/workbench/browser/parts/sidebar/sidebarPart',
-+	'vs/workbench/services/progress/browser/progressService2',
-+	'vs/workbench/services/viewlet/browser/viewletService',
-+	'vs/workbench/services/workspace/common/workspaceEditing',
-+	'vs/workbench/api/electron-browser/mainThreadFileSystem',
-+	'vs/workbench/api/electron-browser/mainThreadWorkspace',
-+	'vs/workbench/api/electron-browser/extensionHost.contribution',
-+	'vs/workbench/browser/actions/workspaceCommands',
-+	'vs/workbench/browser/actions/workspaceActions',
-+	'vs/workbench/electron-browser/window',
-+	'vs/workbench/parts/extensions/browser/extensionsActions',
-+	'vs/workbench/parts/extensions/browser/extensionEditor',
-+	'vs/workbench/parts/extensions/browser/extensionsList',
-+	'vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor',
-+	'vs/workbench/parts/extensions/electron-browser/extensionProfileService',
-+	'vs/workbench/parts/files/electron-browser/fileCommands',
-+	'vs/workbench/parts/files/electron-browser/fileActions',
-+	'vs/workbench/parts/files/electron-browser/saveErrorHandler',
-+	'vs/workbench/parts/files/electron-browser/views/emptyView',
-+	'vs/workbench/parts/files/electron-browser/views/explorerViewer',
-+	'vs/workbench/parts/files/electron-browser/views/explorerView',
-+	'vs/workbench/parts/files/electron-browser/views/openEditorsView',
-+	'vs/workbench/parts/files/electron-browser/explorerViewlet',
-+	'vs/workbench/parts/files/electron-browser/files.contribution',
-+	'vs/workbench/parts/preferences/browser/preferencesActions',
-+	'vs/workbench/parts/extensions/electron-browser/extensionsViews',
-+	'vs/workbench/parts/extensions/electron-browser/extensionsViewlet',
-+	'vs/workbench/parts/files/electron-browser/fileActions.contribution',
-+	'vs/workbench/parts/search/browser/searchViewlet',
-+	'vs/workbench/parts/search/electron-browser/search.contribution',
-+	'vs/workbench/parts/terminal/electron-browser/terminalActions',
-+	'vs/workbench/parts/terminal/electron-browser/terminalPanel',
-+	'vs/workbench/parts/terminal/electron-browser/terminal.contribution',
-+	'vs/workbench/parts/watermark/electron-browser/watermark',
-+	'vs/workbench/services/workspace/node/workspaceEditingService',
-+	'vs/workbench/electron-browser/workbench',
-+	'vs/workbench/electron-browser/commands',
-+	'vs/workbench/electron-browser/main.contribution',
-+	'vs/base/node/request',
-+	'vs/platform/extensionManagement/node/extensionGalleryService',
-+	'vs/platform/request/node/requestService',
-+	'vs/platform/request/electron-browser/requestService',
-+	'vs/workbench/electron-browser/shell',
-+	'vs/workbench/electron-browser/main',
-+	'vs/workbench/parts/extensions/electron-browser/extensionTipsService',
-+	'vs/workbench/parts/extensions/electron-browser/extensions.contribution',
-+	'vs/workbench/parts/preferences/electron-browser/preferencesSearch',
-+	'vs/workbench/parts/preferences/electron-browser/preferences.contribution',
-+	'vs/workbench/parts/update/electron-browser/update',
-+	'vs/workbench/parts/update/electron-browser/update.contribution',
-+	'vs/workbench/workbench.main'
-+];
-+
-+let loader = [];
-+let results = [];
-+
-+function getFileContents(file) {
-+	const filePath = path.join(__dirname, '../out', file);
-+	const fileContents = fs.readFileSync(filePath);
-+	return fileContents.toString('utf8');
-+}
-+
-+PREFIX.forEach((file) => {
-+	const fileContents = getFileContents(file);
-+	loader.push(fileContents);
-+});
-+
-+var CSS = [];
-+CONTENTS.forEach((file) => {
-+	let fileContents = getFileContents(file + '.js');
-+	fileContents = fileContents.replace(/define\(\[/g, `define("${file}", [`);
-+
-+	let changed = false;
-+	do {
-+		changed = false;
-+		let m = fileContents.match(/, "vs\/css!([^"]+)"/);
-+		if (m) {
-+			let cssPath = m[1];
-+			let result = cssPath;
-+			if (/^(\.\/)|(\.\.\/)/.test(result)) {
-+				result = path.join(file + '/../', result);
-+			}
-+			// console.log(`${file} + ${cssPath} ===> ${result}`);
-+			CSS.push(`vs/css!${result}`);
-+			fileContents = fileContents.replace(/, "vs\/css!([^"]+)"/, '');
-+			changed = true;
-+		}
-+	} while(changed);
-+
-+	results.push(fileContents);
-+});
-+
-+// TODO@snapshot
-+const productNameLong = product.nameLong;
-+// if (!false || process.env['VSCODE_DEV']) {
-+// 	product.nameShort += ' Dev';
-+// 	product.nameLong += ' Dev';
-+// 	product.dataFolderName += '-dev';
-+// }
-+
-+
-+product.commit = "05ea088890f0b0a70fa883047b67bf64c005b5b1";
-+product.date = "2018-02-13T16:38:50.446Z";
-+product.settingsSearchBuildId = 121000243;
-+
-+// TODO@snapshot
-+package.name = 'Code - OSS';
-+
-+const startupFileContents = `
-+var Monaco_Loader_Init;
-+var Monaco_CSS = ${JSON.stringify(CSS)};
-+// var Monaco_Node_Modules = null;
-+(function() {
-+	var doNotInitLoader = true;
-+	var MonacoSnapshotPlatform = '${process.platform}';
-+	var MonacoSnapshotArch = '${process.arch}';
-+	var MonacoSnapshotGlobal = this;
-+	var MonacoSnapshotPackage = ${JSON.stringify(package)};
-+	var MonacoSnapshotProduct = ${JSON.stringify(product)};
-+	var MonacoSnapshotInitializeCallbacks = [];
-+	var navigator = {
-+		userAgent: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_3) AppleWebKit/537.36 (KHTML, like Gecko) code-oss-dev/1.21.0 Chrome/58.0.3029.110 Electron/1.7.9 Safari/537.36'
-+	};
-+	${loader.join('\n;\n').toString()};
-+	(function() {
-+		var NODE_MODULES = [
-+			'assert',
-+			'child_process',
-+			'crypto',
-+			'electron',
-+			'fs',
-+			'graceful-fs',
-+			'iconv-lite',
-+			'native-keymap',
-+			'net',
-+			'os',
-+			'path',
-+			'semver',
-+			'spdlog',
-+			'stream',
-+			'string_decoder',
-+			'url',
-+			'util',
-+			'zlib',
-+		];
-+		// Monaco_Node_Modules = Object.create(null);
-+		var bindModule = function(moduleName) {
-+			define(moduleName, function() {
-+				// Monaco_Node_Modules[moduleName] = {};
-+				// return Monaco_Node_Modules[moduleName];
-+
-+				var loaded = false;
-+				var actual = null;
-+				var cache = Object.create(null);
-+				var cached = Object.create(null);
-+				var handler = {
-+					get: (target, name) => {
-+						// console.log('get for ' + moduleName + '.' + name);
-+						// console.log(typeof require.__$__nodeRequire);
-+						if (!loaded) {
-+							loaded = true;
-+							if (moduleName === 'fs') {
-+								actual = require.__$__nodeRequire('original-fs');
-+							} else {
-+								actual = require.__$__nodeRequire(moduleName);
-+							}
-+						}
-+
-+						if (!cached[name]) {
-+							let result = actual[name];
-+							// console.log('===> ' + typeof actual[name]);
-+							if (typeof result === 'function') {
-+								result = result.bind(actual);
-+							}
-+							cache[name] = result;
-+							cached[name] = true;
-+						}
-+
-+
-+						return cache[name];
-+					},
-+					set: (target, name, value) => {
-+						// console.log('set for ' + moduleName + '.' + name);
-+						cache[name] = value;
-+						cached[name] = true;
-+					}
-+				};
-+				return new Proxy(Object.create(null), handler);
-+
-+			});
-+		};
-+		NODE_MODULES.forEach(bindModule);
-+	})();
-+	${results.join('\n;\n').toString()};
-+	Monaco_Loader_Init = function() {
-+		AMDLoader.init();
-+		// Object.keys(Monaco_Node_Modules).forEach(function(moduleName) {
-+		// 	var actual = require.__$__nodeRequire(moduleName);
-+		// 	var target = Monaco_Node_Modules[moduleName];
-+
-+		// 	//console.log('required ' + moduleName);
-+		// 	Object.keys(actual).forEach(function(key) {
-+		// 		if (moduleName === 'crypto') {
-+		// 			if (key === 'createCredentials' || key === 'Credentials') {
-+		// 				return;
-+		// 			}
-+		// 		}
-+		// 		target[key] = actual[key];
-+		// 	});
-+		// });
-+		MonacoSnapshotInitializeCallbacks.forEach(function(callback) {
-+			callback();
-+		});
-+		[
-+			'assert',
-+			'child_process',
-+			'crypto',
-+			'electron',
-+			'fs',
-+			'graceful-fs',
-+			'iconv-lite',
-+			'native-keymap',
-+			'net',
-+			'os',
-+			'path',
-+			'semver',
-+			'spdlog',
-+			'stream',
-+			'string_decoder',
-+			'url',
-+			'util',
-+			'zlib',
-+		].forEach(function(moduleName) {
-+			require.__$__nodeRequire(moduleName);
-+		});
-+		return { define, require };
-+	};
-+})();
-+`;
-+
-+const startupFile = path.join(__dirname, 'start.js');
-+fs.writeFileSync(startupFile, startupFileContents);
-+
-+const startupBlobFilepath = path.join(__dirname, `../.build/electron/${productNameLong}.app/Contents/Frameworks/Electron Framework.framework/Resources/snapshot_blob.bin`);
-+// startupBlobFilepath = `VSCode-${process.platform}-${arch}/snapshot_blob.bin`;
-+
-+// Restore original
-+try { fs.unlinkSync(startupBlobFilepath); } catch (err) { /**/ }
-+// fs.copyFileSync(startupBlobFilepath + '.original', startupBlobFilepath);
-+// process.exit(0);
-+
-+// Check that the file works!
-+vm.runInNewContext(startupFileContents, undefined, { filename: startupFile, displayErrors: true });
-+
-+const mksnapshot = path.join(__dirname, `../node_modules/.bin/${process.platform === 'win32' ? 'mksnapshot.cmd' : 'mksnapshot'}`);
-+cp.execFileSync(mksnapshot, [`--no-use_ic`, `--no-lazy`, startupFile, `--startup_blob`, startupBlobFilepath]);
-+
-+// --ignition --turbo
-+
-+console.log(`FILE SIZE: ${fs.statSync(startupBlobFilepath).size}`);
-+
-+
-+// Extra copy
-+const startupBlobFilepath2 = path.join(__dirname, `../../VSCode-darwin/Code - OSS.app/Contents/Frameworks/Electron Framework.framework/Resources/snapshot_blob.bin`);
-+try { fs.unlinkSync(startupBlobFilepath2); } catch (err) { /**/ }
-+fs.copyFileSync(startupBlobFilepath, startupBlobFilepath2);
-merged
-  result 100644 857a568d8ad526c7ccda27932372100b09543cd2 src/paths.js
-  our    100644 1fa7c625ee19b191343c1708382a4bab066ae3a5 src/paths.js
-@@ -7,6 +7,7 @@
- var os = require('os');
- var pkg = require('../package.json');
- 
-+// TODO@snapshot: duplicated in vs/base/node/paths.ts
- function getAppDataPath(platform) {
- 	switch (platform) {
- 		case 'win32': return process.env['VSCODE_APPDATA'] || process.env['APPDATA'] || path.join(process.env['USERPROFILE'], 'AppData', 'Roaming');
-@@ -16,9 +17,10 @@
- 	}
- }
- 
-+// TODO@snapshot: duplicated in vs/base/node/paths.ts
- function getDefaultUserDataPath(platform) {
- 	return path.join(getAppDataPath(platform), pkg.name);
- }
- 
- exports.getAppDataPath = getAppDataPath;
--exports.getDefaultUserDataPath = getDefaultUserDataPath;
-\ No newline at end of file
-+exports.getDefaultUserDataPath = getDefaultUserDataPath;
-changed in both
-  base   100644 5bee1d98f35e1a39a67f65b85f1f92e18ce37cd1 src/vs/base/common/platform.ts
-  our    100644 277929ed5d02284c4e3e3de3c755086c00b03837 src/vs/base/common/platform.ts
-  their  100644 51fad79347f6862af3f32e4457e58d8d6b75fd01 src/vs/base/common/platform.ts
-@@ -4,6 +4,9 @@
-  *--------------------------------------------------------------------------------------------*/
- 'use strict';
- 
-+declare var MonacoSnapshotPlatform: 'win32' | 'darwin' | 'linux';
-+declare var MonacoSnapshotGlobal: any;
-+
- let _isWindows = false;
- let _isMacintosh = false;
- let _isLinux = false;
-@@ -42,7 +45,18 @@
- export const LANGUAGE_DEFAULT = 'en';
- 
- // OS detection
-+<<<<<<< .our
- if (typeof process === 'object' && typeof process.nextTick === 'function' && typeof process.platform === 'string') {
-+=======
-+if (typeof MonacoSnapshotPlatform === 'string') {
-+	_isWindows = (MonacoSnapshotPlatform === 'win32');
-+	_isMacintosh = (MonacoSnapshotPlatform === 'darwin');
-+	_isLinux = (MonacoSnapshotPlatform === 'linux');
-+	_locale = 'en-us';
-+	_language = 'en';
-+	_isNative = true;
-+} else if (typeof process === 'object') {
-+>>>>>>> .their
- 	_isWindows = (process.platform === 'win32');
- 	_isMacintosh = (process.platform === 'darwin');
- 	_isLinux = (process.platform === 'linux');
-@@ -119,7 +133,12 @@
-  */
- export const translationsConfigFile = _translationsConfigFile;
- 
--const _globals = (typeof self === 'object' ? self : typeof global === 'object' ? global : {} as any);
-+const _globals = (
-+	typeof self === 'object' ? self :
-+		typeof global === 'object' ? global :
-+			typeof MonacoSnapshotGlobal !== 'undefined' ? MonacoSnapshotGlobal :
-+				{} as any
-+);
- export const globals: any = _globals;
- 
- let _setImmediate: (callback: (...args: any[]) => void) => number = null;
-removed in local
-  base   100644 d827548303e3092ab26a5ac75904e219c3c5a899 src/vs/base/common/winjs.base.raw.js
-  their  100644 70ce72215f12cb2e09aa30cbc8a20d304ebbb1c4 src/vs/base/common/winjs.base.raw.js
-changed in both
-  base   100644 dfdc28def8a697a0227f28ae05141400ec1e496d src/vs/base/node/paths.ts
-  our    100644 66930cdaf4bc6cf04b361862f6dcfa7a313455af src/vs/base/node/paths.ts
-  their  100644 6e20a48e0239f0e4f759a34a7a104c2c8490ba63 src/vs/base/node/paths.ts
-@@ -3,14 +3,32 @@
-  *  Licensed under the MIT License. See License.txt in the project root for license information.
-  *--------------------------------------------------------------------------------------------*/
- 
-+<<<<<<< .our
- import { getPathFromAmdModule } from 'vs/base/common/amd';
-+=======
-+import * as path from 'path';
-+import * as os from 'os';
-+import pkg from 'vs/platform/node/package';
-+>>>>>>> .their
- 
--interface IPaths {
--	getAppDataPath(platform: string): string;
--	getDefaultUserDataPath(platform: string): string;
-+// TODO@snapshot: duplicated in paths.js
-+export function getAppDataPath(platform: string): string {
-+	switch (platform) {
-+		case 'win32': return process.env['VSCODE_APPDATA'] || process.env['APPDATA'] || path.join(process.env['USERPROFILE'], 'AppData', 'Roaming');
-+		case 'darwin': return process.env['VSCODE_APPDATA'] || path.join(os.homedir(), 'Library', 'Application Support');
-+		case 'linux': return process.env['VSCODE_APPDATA'] || process.env['XDG_CONFIG_HOME'] || path.join(os.homedir(), '.config');
-+		default: throw new Error('Platform not supported');
-+	}
- }
- 
-+<<<<<<< .our
- const pathsPath = getPathFromAmdModule(require, 'paths');
- const paths = require.__$__nodeRequire<IPaths>(pathsPath);
- export const getAppDataPath = paths.getAppDataPath;
- export const getDefaultUserDataPath = paths.getDefaultUserDataPath;
-+=======
-+// TODO@snapshot: duplicated in paths.js
-+export function getDefaultUserDataPath(platform: string): string {
-+	return path.join(getAppDataPath(platform), pkg.name);
-+}
-+>>>>>>> .their
-changed in both
-  base   100644 cd669a4a94b4e88ed6c049f9f47cd24277afc7c5 src/vs/editor/common/services/editorSimpleWorker.ts
-  our    100644 884fba7fa029c1f7e19eb6f3082961988cc818ec src/vs/editor/common/services/editorSimpleWorker.ts
-  their  100644 91380f07ecfa88ee6f56d62b587e5ba09a6bf3b9 src/vs/editor/common/services/editorSimpleWorker.ts
-@@ -627,6 +627,7 @@
- declare function importScripts(...urls: string[]): void;
- 
- if (typeof importScripts === 'function') {
-+	// TODO@snapshot
- 	// Running in a web worker
- 	globals.monaco = createMonacoBaseAPI();
- }
-changed in both
-  base   100644 cc1adabd5fde1ab1dae154ea37de655d659834b8 src/vs/platform/environment/node/environmentService.ts
-  our    100644 2224b6afd174362bfa9961df6a595526ecac9042 src/vs/platform/environment/node/environmentService.ts
-  their  100644 ebc86ccb7abc06f3d9d2e689fc693a637efbee5d src/vs/platform/environment/node/environmentService.ts
-@@ -17,7 +17,16 @@
- 
- // Read this before there's any chance it is overwritten
- // Related to https://github.com/Microsoft/vscode/issues/30624
--const xdgRuntimeDir = process.env['XDG_RUNTIME_DIR'];
-+let xdgRuntimeDir: string = null;
-+let _initialize = () => {
-+	xdgRuntimeDir = process.env['XDG_RUNTIME_DIR'];
-+};
-+declare var MonacoSnapshotInitializeCallbacks;
-+if (typeof MonacoSnapshotInitializeCallbacks !== 'undefined') {
-+	MonacoSnapshotInitializeCallbacks.push(_initialize);
-+} else {
-+	_initialize();
-+}
- 
- function getNixIPCHandle(userDataPath: string, type: string): string {
- 	if (xdgRuntimeDir) {
-merged
-  result 100644 be6e32995ee2e32daff84dfa2271f6a992bfbe0f src/vs/platform/files/node/files.ts
-  our    100644 629a67e84998155d3f24356db42533d1c713606f src/vs/platform/files/node/files.ts
-@@ -7,9 +7,11 @@
- const WIN32_MAX_FILE_SIZE = 300 * 1024 * 1024; // 300 MB
- const GENERAL_MAX_FILE_SIZE = 16 * 1024 * 1024 * 1024; // 16 GB
- 
-+declare var MonacoSnapshotArch: string;
-+const arch: string = (typeof MonacoSnapshotArch !== 'undefined' ? MonacoSnapshotArch : process.arch);
- // See https://github.com/v8/v8/blob/5918a23a3d571b9625e5cce246bdd5b46ff7cd8b/src/heap/heap.cc#L149
- const WIN32_MAX_HEAP_SIZE = 700 * 1024 * 1024; // 700 MB
- const GENERAL_MAX_HEAP_SIZE = 700 * 2 * 1024 * 1024; // 1400 MB
- 
--export const MAX_FILE_SIZE = process.arch === 'ia32' ? WIN32_MAX_FILE_SIZE : GENERAL_MAX_FILE_SIZE;
--export const MAX_HEAP_SIZE = process.arch === 'ia32' ? WIN32_MAX_HEAP_SIZE : GENERAL_MAX_HEAP_SIZE;
-\ No newline at end of file
-+export const MAX_FILE_SIZE = arch === 'ia32' ? WIN32_MAX_FILE_SIZE : GENERAL_MAX_FILE_SIZE;
-+export const MAX_HEAP_SIZE = arch === 'ia32' ? WIN32_MAX_HEAP_SIZE : GENERAL_MAX_HEAP_SIZE;
-changed in both
-  base   100644 fff85d911f2d8c95fb743cf594b8534ef00dfd68 src/vs/platform/node/package.ts
-  our    100644 93c32bc7117b6dfb65e98dc59de6a1e4ebf4eb4d src/vs/platform/node/package.ts
-  their  100644 b678c0473c0fe029e5b0777d313462f9472a1f17 src/vs/platform/node/package.ts
-@@ -11,6 +11,19 @@
- 	version: string;
- }
- 
-+<<<<<<< .our
- const rootPath = path.dirname(getPathFromAmdModule(require, ''));
- const packageJsonPath = path.join(rootPath, 'package.json');
- export default require.__$__nodeRequire(packageJsonPath) as IPackageConfiguration;
-+=======
-+let packageJSONContents: IPackageConfiguration = null;
-+declare var MonacoSnapshotPackage: any;
-+if (typeof MonacoSnapshotPackage !== 'undefined') {
-+	packageJSONContents = MonacoSnapshotPackage;
-+} else {
-+	const rootPath = path.dirname(uri.parse(require.toUrl('')).fsPath);
-+	const packageJsonPath = path.join(rootPath, 'package.json');
-+	packageJSONContents = require.__$__nodeRequire(packageJsonPath) as IPackageConfiguration;
-+}
-+export default packageJSONContents;
-+>>>>>>> .their
-changed in both
-  base   100644 0e902be82db231e6f04e82c7b03cf6e16caac0cf src/vs/platform/node/product.ts
-  our    100644 dbb84fd473f8212ea96a20a8f12d66c5b703786a src/vs/platform/node/product.ts
-  their  100644 b76bcd1a2a8bd00732171682e1d4f5b15cc5381d src/vs/platform/node/product.ts
-@@ -90,6 +90,7 @@
- 	userProbability: number;
- }
- 
-+<<<<<<< .our
- const rootPath = path.dirname(getPathFromAmdModule(require, ''));
- const productJsonPath = path.join(rootPath, 'product.json');
- const product = require.__$__nodeRequire(productJsonPath) as IProductConfiguration;
-@@ -98,6 +99,21 @@
- 	product.nameShort += ' Dev';
- 	product.nameLong += ' Dev';
- 	product.dataFolderName += '-dev';
-+=======
-+let product: IProductConfiguration = null;
-+declare var MonacoSnapshotProduct: any;
-+if (typeof MonacoSnapshotProduct !== 'undefined') {
-+	product = MonacoSnapshotProduct;
-+} else {
-+	const rootPath = path.dirname(uri.parse(require.toUrl('')).fsPath);
-+	const productJsonPath = path.join(rootPath, 'product.json');
-+	product = require.__$__nodeRequire(productJsonPath) as IProductConfiguration;
-+	if (process.env['VSCODE_DEV']) {
-+		product.nameShort += ' Dev';
-+		product.nameLong += ' Dev';
-+		product.dataFolderName += '-dev';
-+	}
-+>>>>>>> .their
- }
- 
- export default product;
-changed in both
-  base   100644 d4b6e878238499763c21a1c5fa51871cfc6232eb src/vs/workbench/electron-browser/bootstrap/index.js
-  our    100644 8cbef8ef0a0c1d16b84ce10ca0692af3015de2e2 src/vs/workbench/electron-browser/bootstrap/index.js
-  their  100644 90e76750db5cdcfe92154b45e914eab880bfb701 src/vs/workbench/electron-browser/bootstrap/index.js
-@@ -7,7 +7,7 @@
- 
- 'use strict';
- 
--/*global window,document,define*/
-+/*global window,document,define,Monaco_Loader_Init,Monaco_CSS*/
- 
- const perf = require('../../../base/common/performance');
- perf.mark('renderer/started');
-@@ -280,17 +280,33 @@
- 	const enableDeveloperTools = (process.env['VSCODE_DEV'] || !!configuration.extensionDevelopmentPath) && !configuration.extensionTestsPath;
- 	const unbind = registerListeners(enableDeveloperTools);
- 
--	// Load the loader and start loading the workbench
--	const loaderFilename = configuration.appRoot + '/out/vs/loader.js';
--	const loaderSource = require('fs').readFileSync(loaderFilename);
--	require('vm').runInThisContext(loaderSource, { filename: loaderFilename });
--	var define = global.define;
--	global.define = undefined;
-+<<<<<<< .our
-+=======
-+	// disable pinch zoom & apply zoom level early to avoid glitches
-+	const zoomLevel = configuration.zoomLevel;
-+	webFrame.setVisualZoomLevelLimits(1, 1);
-+	if (typeof zoomLevel === 'number' && zoomLevel !== 0) {
-+		webFrame.setZoomLevel(zoomLevel);
-+	}
- 
--	window.nodeRequire = require.__$__nodeRequire;
-+	var define = null;
- 
--	define('fs', ['original-fs'], function (originalFS) { return originalFS; }); // replace the patched electron fs with the original node fs for all AMD code
-+>>>>>>> .their
-+	// Load the loader and start loading the workbench
-+	if (typeof Monaco_Loader_Init === 'function') {
-+		// There has been a snapshot
-+		define = Monaco_Loader_Init().define;
-+	} else {
-+		const loaderFilename = configuration.appRoot + '/out/vs/loader.js';
-+		const loaderSource = require('fs').readFileSync(loaderFilename);
-+		require('vm').runInThisContext(loaderSource, { filename: loaderFilename });
-+		define = global.define;
-+		global.define = undefined;
- 
-+		define('fs', ['original-fs'], function (originalFS) { return originalFS; }); // replace the patched electron fs with the original node fs for all AMD code
-+	}
-+
-+	window.nodeRequire = require.__$__nodeRequire;
- 	window.MonacoEnvironment = {};
- 
- 	const onNodeCachedData = window.MonacoEnvironment.onNodeCachedData = [];
-@@ -310,11 +326,15 @@
- 	}
- 
- 	perf.mark('willLoadWorkbenchMain');
--	require([
-+	var loadModules = [
- 		'vs/workbench/workbench.main',
- 		'vs/nls!vs/workbench/workbench.main',
- 		'vs/css!vs/workbench/workbench.main'
--	], function () {
-+	];
-+	if (typeof Monaco_CSS !== 'undefined' && process.env['VSCODE_DEV']) {
-+		loadModules = loadModules.concat(Monaco_CSS);
-+	}
-+	require(loadModules, function () {
- 		perf.mark('didLoadWorkbenchMain');
- 
- 		process.lazyEnv.then(function () {
-changed in both
-  base   100644 da39162e0b2c7ba7d7ac37245a3e4fe0a86b2995 src/vs/workbench/electron-browser/main.contribution.ts
-  our    100644 b5ea1f2025fd492a8d56b60ad98cd59a2319f383 src/vs/workbench/electron-browser/main.contribution.ts
-  their  100644 10218dbf8066051275994fe21ede703c447f2e51 src/vs/workbench/electron-browser/main.contribution.ts
-@@ -664,6 +664,7 @@
- });
- 
- // Configuration: Window
-+<<<<<<< .our
- 
- configurationRegistry.registerConfiguration({
- 	'id': 'window',
-@@ -813,9 +814,131 @@
- 			'scope': ConfigurationScope.APPLICATION,
- 			'description': nls.localize('window.clickThroughInactive', "If enabled, clicking on an inactive window will both activate the window and trigger the element under the mouse if it is clickable. If disabled, clicking anywhere on an inactive window will activate it only and a second click is required on the element."),
- 			'included': isMacintosh
-+=======
-+let _initialize = () => {
-+	configurationRegistry.registerConfiguration({
-+		'id': 'window',
-+		'order': 8,
-+		'title': nls.localize('windowConfigurationTitle', "Window"),
-+		'type': 'object',
-+		'properties': {
-+			'window.openFilesInNewWindow': {
-+				'type': 'string',
-+				'enum': ['on', 'off', 'default'],
-+				'enumDescriptions': [
-+					nls.localize('window.openFilesInNewWindow.on', "Files will open in a new window"),
-+					nls.localize('window.openFilesInNewWindow.off', "Files will open in the window with the files' folder open or the last active window"),
-+					nls.localize('window.openFilesInNewWindow.default', "Files will open in the window with the files' folder open or the last active window unless opened via the dock or from finder (macOS only)")
-+				],
-+				'default': 'off',
-+				'description':
-+					nls.localize('openFilesInNewWindow', "Controls if files should open in a new window.\n- default: files will open in the window with the files' folder open or the last active window unless opened via the dock or from finder (macOS only)\n- on: files will open in a new window\n- off: files will open in the window with the files' folder open or the last active window\nNote that there can still be cases where this setting is ignored (e.g. when using the -new-window or -reuse-window command line option).")
-+			},
-+			'window.openFoldersInNewWindow': {
-+				'type': 'string',
-+				'enum': ['on', 'off', 'default'],
-+				'enumDescriptions': [
-+					nls.localize('window.openFoldersInNewWindow.on', "Folders will open in a new window"),
-+					nls.localize('window.openFoldersInNewWindow.off', "Folders will replace the last active window"),
-+					nls.localize('window.openFoldersInNewWindow.default', "Folders will open in a new window unless a folder is picked from within the application (e.g. via the File menu)")
-+				],
-+				'default': 'default',
-+				'description': nls.localize('openFoldersInNewWindow', "Controls if folders should open in a new window or replace the last active window.\n- default: folders will open in a new window unless a folder is picked from within the application (e.g. via the File menu)\n- on: folders will open in a new window\n- off: folders will replace the last active window\nNote that there can still be cases where this setting is ignored (e.g. when using the -new-window or -reuse-window command line option).")
-+			},
-+			'window.restoreWindows': {
-+				'type': 'string',
-+				'enum': ['all', 'folders', 'one', 'none'],
-+				'enumDescriptions': [
-+					nls.localize('window.reopenFolders.all', "Reopen all windows."),
-+					nls.localize('window.reopenFolders.folders', "Reopen all folders. Empty workspaces will not be restored."),
-+					nls.localize('window.reopenFolders.one', "Reopen the last active window."),
-+					nls.localize('window.reopenFolders.none', "Never reopen a window. Always start with an empty one.")
-+				],
-+				'default': 'one',
-+				'description': nls.localize('restoreWindows', "Controls how windows are being reopened after a restart. Select 'none' to always start with an empty workspace, 'one' to reopen the last window you worked on, 'folders' to reopen all windows that had folders opened or 'all' to reopen all windows of your last session.")
-+			},
-+			'window.restoreFullscreen': {
-+				'type': 'boolean',
-+				'default': false,
-+				'description': nls.localize('restoreFullscreen', "Controls if a window should restore to full screen mode if it was exited in full screen mode.")
-+			},
-+			'window.zoomLevel': {
-+				'type': 'number',
-+				'default': 0,
-+				'description': nls.localize('zoomLevel', "Adjust the zoom level of the window. The original size is 0 and each increment above (e.g. 1) or below (e.g. -1) represents zooming 20% larger or smaller. You can also enter decimals to adjust the zoom level with a finer granularity.")
-+			},
-+			'window.title': {
-+				'type': 'string',
-+				'default': isMacintosh ? '${activeEditorShort}${separator}${rootName}' : '${dirty}${activeEditorShort}${separator}${rootName}${separator}${appName}',
-+				'description': nls.localize({ comment: ['This is the description for a setting. Values surrounded by parenthesis are not to be translated.'], key: 'title' },
-+					"Controls the window title based on the active editor. Variables are substituted based on the context:\n\${activeEditorShort}: the file name (e.g. myFile.txt)\n\${activeEditorMedium}: the path of the file relative to the workspace folder (e.g. myFolder/myFile.txt)\n\${activeEditorLong}: the full path of the file (e.g. /Users/Development/myProject/myFolder/myFile.txt)\n\${folderName}: name of the workspace folder the file is contained in (e.g. myFolder)\n\${folderPath}: file path of the workspace folder the file is contained in (e.g. /Users/Development/myFolder)\n\${rootName}: name of the workspace (e.g. myFolder or myWorkspace)\n\${rootPath}: file path of the workspace (e.g. /Users/Development/myWorkspace)\n\${appName}: e.g. VS Code\n\${dirty}: a dirty indicator if the active editor is dirty\n\${separator}: a conditional separator (\" - \") that only shows when surrounded by variables with values")
-+			},
-+			'window.newWindowDimensions': {
-+				'type': 'string',
-+				'enum': ['default', 'inherit', 'maximized', 'fullscreen'],
-+				'enumDescriptions': [
-+					nls.localize('window.newWindowDimensions.default', "Open new windows in the center of the screen."),
-+					nls.localize('window.newWindowDimensions.inherit', "Open new windows with same dimension as last active one."),
-+					nls.localize('window.newWindowDimensions.maximized', "Open new windows maximized."),
-+					nls.localize('window.newWindowDimensions.fullscreen', "Open new windows in full screen mode.")
-+				],
-+				'default': 'default',
-+				'description': nls.localize('newWindowDimensions', "Controls the dimensions of opening a new window when at least one window is already opened. By default, a new window will open in the center of the screen with small dimensions. When set to 'inherit', the window will get the same dimensions as the last window that was active. When set to 'maximized', the window will open maximized and fullscreen if configured to 'fullscreen'. Note that this setting does not have an impact on the first window that is opened. The first window will always restore the size and location as you left it before closing.")
-+			},
-+			'window.closeWhenEmpty': {
-+				'type': 'boolean',
-+				'default': false,
-+				'description': nls.localize('closeWhenEmpty', "Controls if closing the last editor should also close the window. This setting only applies for windows that do not show folders.")
-+			},
-+			'window.menuBarVisibility': {
-+				'type': 'string',
-+				'enum': ['default', 'visible', 'toggle', 'hidden'],
-+				'enumDescriptions': [
-+					nls.localize('window.menuBarVisibility.default', "Menu is only hidden in full screen mode."),
-+					nls.localize('window.menuBarVisibility.visible', "Menu is always visible even in full screen mode."),
-+					nls.localize('window.menuBarVisibility.toggle', "Menu is hidden but can be displayed via Alt key."),
-+					nls.localize('window.menuBarVisibility.hidden', "Menu is always hidden.")
-+				],
-+				'default': 'default',
-+				'description': nls.localize('menuBarVisibility', "Control the visibility of the menu bar. A setting of 'toggle' means that the menu bar is hidden and a single press of the Alt key will show it. By default, the menu bar will be visible, unless the window is full screen."),
-+				'included': isWindows || isLinux
-+			},
-+			'window.enableMenuBarMnemonics': {
-+				'type': 'boolean',
-+				'default': true,
-+				'description': nls.localize('enableMenuBarMnemonics', "If enabled, the main menus can be opened via Alt-key shortcuts. Disabling mnemonics allows to bind these Alt-key shortcuts to editor commands instead."),
-+				'included': isWindows || isLinux
-+			},
-+			'window.autoDetectHighContrast': {
-+				'type': 'boolean',
-+				'default': true,
-+				'description': nls.localize('autoDetectHighContrast', "If enabled, will automatically change to high contrast theme if Windows is using a high contrast theme, and to dark theme when switching away from a Windows high contrast theme."),
-+				'included': isWindows
-+			},
-+			'window.titleBarStyle': {
-+				'type': 'string',
-+				'enum': ['native', 'custom'],
-+				'default': 'custom',
-+				'description': nls.localize('titleBarStyle', "Adjust the appearance of the window title bar. Changes require a full restart to apply."),
-+				'included': isMacintosh
-+			},
-+			'window.nativeTabs': {
-+				'type': 'boolean',
-+				'default': false,
-+				'description': nls.localize('window.nativeTabs', "Enables macOS Sierra window tabs. Note that changes require a full restart to apply and that native tabs will disable a custom title bar style if configured."),
-+				'included': isMacintosh && parseFloat(os.release()) >= 16 // Minimum: macOS Sierra (10.12.x = darwin 16.x)
-+			}
-+>>>>>>> .their
- 		}
--	}
--});
-+	});
-+};
-+
-+declare var MonacoSnapshotInitializeCallbacks: any;
-+if (typeof MonacoSnapshotInitializeCallbacks !== 'undefined') {
-+	MonacoSnapshotInitializeCallbacks.push(_initialize);
-+} else {
-+	_initialize();
-+}
- 
- // Configuration: Zen Mode
- configurationRegistry.registerConfiguration({
-changed in both
-  base   100644 6c93107c6ccb7e1568e8ff6a836071a868129a07 src/vs/workbench/electron-browser/main.ts
-  our    100644 f69daf2f901dbd47817c934f8ea25b566e08e690 src/vs/workbench/electron-browser/main.ts
-  their  100644 1df36b05d47872961dfe4c7430bd5161b9f90ed5 src/vs/workbench/electron-browser/main.ts
-@@ -23,7 +23,12 @@
- import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
- import { realpath } from 'vs/base/node/pfs';
- import { EnvironmentService } from 'vs/platform/environment/node/environmentService';
-+<<<<<<< .our
- import * as gracefulFs from 'graceful-fs';
-+=======
-+import { IInitData } from 'vs/workbench/services/timer/common/timerService';
-+import { TimerService } from 'vs/workbench/services/timer/node/timerService';
-+>>>>>>> .their
- import { KeyboardMapperFactory } from 'vs/workbench/services/keybinding/electron-browser/keybindingService';
- import { IWindowConfiguration, IWindowsService } from 'vs/platform/windows/common/windows';
- import { WindowsChannelClient } from 'vs/platform/windows/common/windowsIpc';
-@@ -39,17 +44,40 @@
- import { WorkspacesChannelClient } from 'vs/platform/workspaces/common/workspacesIpc';
- import { IWorkspacesService, ISingleFolderWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
- import { createSpdLogService } from 'vs/platform/log/node/spdlogService';
-+<<<<<<< .our
- import * as fs from 'fs';
-+=======
-+
-+// TODO@snapshot
-+// import gracefulFs = require('graceful-fs');
-+// import fs = require('fs');
-+>>>>>>> .their
- import { ConsoleLogService, MultiplexLogService, ILogService } from 'vs/platform/log/common/log';
- import { IssueChannelClient } from 'vs/platform/issue/common/issueIpc';
- import { IIssueService } from 'vs/platform/issue/common/issue';
- import { LogLevelSetterChannelClient, FollowerLogService } from 'vs/platform/log/common/logIpc';
-+<<<<<<< .our
- import { RelayURLService } from 'vs/platform/url/common/urlService';
- import { MenubarChannelClient } from 'vs/platform/menubar/common/menubarIpc';
- import { IMenubarService } from 'vs/platform/menubar/common/menubar';
- import { Schemas } from 'vs/base/common/network';
- 
- gracefulFs.gracefulify(fs); // enable gracefulFs
-+=======
-+
-+let _initialize = () => {
-+	// TODO@snapshot
-+	// gracefulFs.gracefulify(fs); // enable gracefulFs
-+};
-+
-+declare var MonacoSnapshotInitializeCallbacks: any;
-+if (typeof MonacoSnapshotInitializeCallbacks !== 'undefined') {
-+	MonacoSnapshotInitializeCallbacks.push(_initialize);
-+} else {
-+	_initialize();
-+}
-+
-+>>>>>>> .their
- 
- export function startup(configuration: IWindowConfiguration): TPromise<void> {
- 
-changed in both
-  base   100644 42d312d8c7e8c8e27b0fad62190559ec62518af3 src/vs/workbench/parts/codeEditor/codeEditor.contribution.ts
-  our    100644 d66877173a11e6363e68df153c77b1db5a3da12b src/vs/workbench/parts/codeEditor/codeEditor.contribution.ts
-  their  100644 1b940190635ee1d8280b240bcc6691f1acc92d58 src/vs/workbench/parts/codeEditor/codeEditor.contribution.ts
-@@ -14,4 +14,23 @@
- import './electron-browser/toggleRenderControlCharacter';
- import './electron-browser/toggleRenderWhitespace';
- import './electron-browser/toggleWordWrap';
--import './electron-browser/workbenchReferenceSearch';
-\ No newline at end of file
-+<<<<<<< .our
-+import './electron-browser/workbenchReferenceSearch';
-+=======
-+import { OPTIONS, TextBufferType } from 'vs/editor/common/model/textModel';
-+
-+let _initialize = () => {
-+	// Configure text buffer implementation
-+	if (process.env['VSCODE_PIECE_TREE']) {
-+		console.log(`Using TextBufferType.PieceTree (env variable VSCODE_PIECE_TREE)`);
-+		OPTIONS.TEXT_BUFFER_IMPLEMENTATION = TextBufferType.PieceTree;
-+	}
-+};
-+
-+declare var MonacoSnapshotInitializeCallbacks: any;
-+if (typeof MonacoSnapshotInitializeCallbacks !== 'undefined') {
-+	MonacoSnapshotInitializeCallbacks.push(_initialize);
-+} else {
-+	_initialize();
-+}
-+>>>>>>> .their
-changed in both
-  base   100644 e56fffecff5a2e70662d77daed82b262549fee4f src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts
-  our    100644 8687e81f62d2fa201c3da1a398d6dea00fcd8ffb src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts
-  their  100644 2645d037c874ee2d0c6eac9eb61f44d675f81cf9 src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts
-@@ -37,6 +37,7 @@
- 	registerSingleton(ITerminalService, LinuxTerminalService);
- }
- 
-+<<<<<<< .our
- getDefaultTerminalLinuxReady().then(defaultTerminalLinux => {
- 	let configurationRegistry = Registry.as<IConfigurationRegistry>(Extensions.Configuration);
- 	configurationRegistry.registerConfiguration({
-@@ -75,10 +76,56 @@
- 				description: nls.localize('terminal.external.linuxExec', "Customizes which terminal to run on Linux."),
- 				default: defaultTerminalLinux,
- 				scope: ConfigurationScope.APPLICATION
-+=======
-+let _initialize = () => {
-+	getDefaultTerminalLinuxReady().then(defaultTerminalLinux => {
-+		let configurationRegistry = <IConfigurationRegistry>Registry.as(Extensions.Configuration);
-+		configurationRegistry.registerConfiguration({
-+			'id': 'externalTerminal',
-+			'order': 100,
-+			'title': nls.localize('terminalConfigurationTitle', "External Terminal"),
-+			'type': 'object',
-+			'properties': {
-+				'terminal.explorerKind': {
-+					'type': 'string',
-+					'enum': [
-+						'integrated',
-+						'external'
-+					],
-+					'description': nls.localize('explorer.openInTerminalKind', "Customizes what kind of terminal to launch."),
-+					'default': 'integrated',
-+					'isExecutable': false
-+				},
-+				'terminal.external.windowsExec': {
-+					'type': 'string',
-+					'description': nls.localize('terminal.external.windowsExec', "Customizes which terminal to run on Windows."),
-+					'default': getDefaultTerminalWindows(),
-+					'isExecutable': true
-+				},
-+				'terminal.external.osxExec': {
-+					'type': 'string',
-+					'description': nls.localize('terminal.external.osxExec', "Customizes which terminal application to run on OS X."),
-+					'default': DEFAULT_TERMINAL_OSX,
-+					'isExecutable': true
-+				},
-+				'terminal.external.linuxExec': {
-+					'type': 'string',
-+					'description': nls.localize('terminal.external.linuxExec', "Customizes which terminal to run on Linux."),
-+					'default': defaultTerminalLinux,
-+					'isExecutable': true
-+				}
-+>>>>>>> .their
- 			}
--		}
-+		});
- 	});
--});
-+};
-+
-+declare var MonacoSnapshotInitializeCallbacks: any;
-+if (typeof MonacoSnapshotInitializeCallbacks !== 'undefined') {
-+	MonacoSnapshotInitializeCallbacks.push(_initialize);
-+} else {
-+	_initialize();
-+}
- 
- const OPEN_IN_TERMINAL_COMMAND_ID = 'openInTerminal';
- CommandsRegistry.registerCommand({
-changed in both
-  base   100644 b94b3f695b27ac60dd20749c78a927a2c9b0ad65 src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
-  our    100644 9ef058f2994595d2b04a5e832c71a30592895aac src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
-  their  100644 f87cee85bb607136699b21a02aab30babed02379 src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
-@@ -67,6 +67,7 @@
- const actionBarRegistry = Registry.as<IActionBarRegistry>(ActionBarExtensions.Actionbar);
- actionBarRegistry.registerActionBarContributor(Scope.VIEWER, QuickOpenActionTermContributor);
- 
-+<<<<<<< .our
- const configurationRegistry = Registry.as<IConfigurationRegistry>(Extensions.Configuration);
- configurationRegistry.registerConfiguration({
- 	id: 'terminal',
-@@ -359,6 +360,251 @@
- 		}
- 	}
- });
-+=======
-+let configurationRegistry = <IConfigurationRegistry>Registry.as(Extensions.Configuration);
-+let _initialize = () => {
-+	configurationRegistry.registerConfiguration({
-+		'id': 'terminal',
-+		'order': 100,
-+		'title': nls.localize('terminalIntegratedConfigurationTitle', "Integrated Terminal"),
-+		'type': 'object',
-+		'properties': {
-+			'terminal.integrated.shell.linux': {
-+				'description': nls.localize('terminal.integrated.shell.linux', "The path of the shell that the terminal uses on Linux."),
-+				'type': 'string',
-+				'default': getTerminalDefaultShellUnixLike()
-+			},
-+			'terminal.integrated.shellArgs.linux': {
-+				'description': nls.localize('terminal.integrated.shellArgs.linux', "The command line arguments to use when on the Linux terminal."),
-+				'type': 'array',
-+				'items': {
-+					'type': 'string'
-+				},
-+				'default': []
-+			},
-+			'terminal.integrated.shell.osx': {
-+				'description': nls.localize('terminal.integrated.shell.osx', "The path of the shell that the terminal uses on OS X."),
-+				'type': 'string',
-+				'default': getTerminalDefaultShellUnixLike()
-+			},
-+			'terminal.integrated.shellArgs.osx': {
-+				'description': nls.localize('terminal.integrated.shellArgs.osx', "The command line arguments to use when on the OS X terminal."),
-+				'type': 'array',
-+				'items': {
-+					'type': 'string'
-+				},
-+				// Unlike on Linux, ~/.profile is not sourced when logging into a macOS session. This
-+				// is the reason terminals on macOS typically run login shells by default which set up
-+				// the environment. See http://unix.stackexchange.com/a/119675/115410
-+				'default': ['-l']
-+			},
-+			'terminal.integrated.shell.windows': {
-+				'description': nls.localize('terminal.integrated.shell.windows', "The path of the shell that the terminal uses on Windows. When using shells shipped with Windows (cmd, PowerShell or Bash on Ubuntu)."),
-+				'type': 'string',
-+				'default': getTerminalDefaultShellWindows()
-+			},
-+			'terminal.integrated.shellArgs.windows': {
-+				'description': nls.localize('terminal.integrated.shellArgs.windows', "The command line arguments to use when on the Windows terminal."),
-+				'type': 'array',
-+				'items': {
-+					'type': 'string'
-+				},
-+				'default': []
-+			},
-+			'terminal.integrated.macOptionIsMeta': {
-+				'description': nls.localize('terminal.integrated.macOptionIsMeta', "Treat the option key as the meta key in the terminal on macOS."),
-+				'type': 'boolean',
-+				'default': false
-+			},
-+			'terminal.integrated.copyOnSelection': {
-+				'description': nls.localize('terminal.integrated.copyOnSelection', "When set, text selected in the terminal will be copied to the clipboard."),
-+				'type': 'boolean',
-+				'default': false
-+			},
-+			'terminal.integrated.fontFamily': {
-+				'description': nls.localize('terminal.integrated.fontFamily', "Controls the font family of the terminal, this defaults to editor.fontFamily's value."),
-+				'type': 'string'
-+			},
-+			// TODO: Support font ligatures
-+			// 'terminal.integrated.fontLigatures': {
-+			// 	'description': nls.localize('terminal.integrated.fontLigatures', "Controls whether font ligatures are enabled in the terminal."),
-+			// 	'type': 'boolean',
-+			// 	'default': false
-+			// },
-+			'terminal.integrated.fontSize': {
-+				'description': nls.localize('terminal.integrated.fontSize', "Controls the font size in pixels of the terminal."),
-+				'type': 'number',
-+				'default': EDITOR_FONT_DEFAULTS.fontSize
-+			},
-+			'terminal.integrated.lineHeight': {
-+				'description': nls.localize('terminal.integrated.lineHeight', "Controls the line height of the terminal, this number is multiplied by the terminal font size to get the actual line-height in pixels."),
-+				'type': 'number',
-+				'default': 1
-+			},
-+			'terminal.integrated.fontWeight': {
-+				'type': 'string',
-+				'enum': ['normal', 'bold', '100', '200', '300', '400', '500', '600', '700', '800', '900'],
-+				'description': nls.localize('terminal.integrated.fontWeight', "The font weight to use within the terminal for non-bold text."),
-+				'default': 'normal'
-+			},
-+			'terminal.integrated.fontWeightBold': {
-+				'type': 'string',
-+				'enum': ['normal', 'bold', '100', '200', '300', '400', '500', '600', '700', '800', '900'],
-+				'description': nls.localize('terminal.integrated.fontWeightBold', "The font weight to use within the terminal for bold text."),
-+				'default': 'bold'
-+			},
-+			'terminal.integrated.cursorBlinking': {
-+				'description': nls.localize('terminal.integrated.cursorBlinking', "Controls whether the terminal cursor blinks."),
-+				'type': 'boolean',
-+				'default': false
-+			},
-+			'terminal.integrated.cursorStyle': {
-+				'description': nls.localize('terminal.integrated.cursorStyle', "Controls the style of terminal cursor."),
-+				'enum': [TerminalCursorStyle.BLOCK, TerminalCursorStyle.LINE, TerminalCursorStyle.UNDERLINE],
-+				'default': TerminalCursorStyle.BLOCK
-+			},
-+			'terminal.integrated.scrollback': {
-+				'description': nls.localize('terminal.integrated.scrollback', "Controls the maximum amount of lines the terminal keeps in its buffer."),
-+				'type': 'number',
-+				'default': 1000
-+			},
-+			'terminal.integrated.setLocaleVariables': {
-+				'description': nls.localize('terminal.integrated.setLocaleVariables', "Controls whether locale variables are set at startup of the terminal, this defaults to true on OS X, false on other platforms."),
-+				'type': 'boolean',
-+				'default': platform.isMacintosh
-+			},
-+			'terminal.integrated.rightClickBehavior': {
-+				'type': 'string',
-+				'enum': ['default', 'copyPaste', 'selectWord'],
-+				default: platform.isMacintosh ? 'selectWord' : platform.isWindows ? 'copyPaste' : 'default',
-+				description: nls.localize('terminal.integrated.rightClickBehavior', "Controls how terminal reacts to right click, possibilities are 'default', 'copyPaste', and 'selectWord'. 'default' will show the context menu, 'copyPaste' will copy when there is a selection otherwise paste, 'selectWord' will select the word under the cursor and show the context menu.")
-+			},
-+			'terminal.integrated.cwd': {
-+				'description': nls.localize('terminal.integrated.cwd', "An explicit start path where the terminal will be launched, this is used as the current working directory (cwd) for the shell process. This may be particularly useful in workspace settings if the root directory is not a convenient cwd."),
-+				'type': 'string',
-+				'default': undefined
-+			},
-+			'terminal.integrated.confirmOnExit': {
-+				'description': nls.localize('terminal.integrated.confirmOnExit', "Whether to confirm on exit if there are active terminal sessions."),
-+				'type': 'boolean',
-+				'default': false
-+			},
-+			'terminal.integrated.enableBell': {
-+				'description': nls.localize('terminal.integrated.enableBell', "Whether the terminal bell is enabled or not."),
-+				'type': 'boolean',
-+				'default': false
-+			},
-+			'terminal.integrated.commandsToSkipShell': {
-+				'description': nls.localize('terminal.integrated.commandsToSkipShell', "A set of command IDs whose keybindings will not be sent to the shell and instead always be handled by Code. This allows the use of keybindings that would normally be consumed by the shell to act the same as when the terminal is not focused, for example ctrl+p to launch Quick Open."),
-+				'type': 'array',
-+				'items': {
-+					'type': 'string'
-+				},
-+				'default': [
-+					ToggleTabFocusModeAction.ID,
-+					FocusActiveGroupAction.ID,
-+					QUICKOPEN_ACTION_ID,
-+					QUICKOPEN_FOCUS_SECONDARY_ACTION_ID,
-+					ShowAllCommandsAction.ID,
-+					CreateNewTerminalAction.ID,
-+					CreateNewInActiveWorkspaceTerminalAction.ID,
-+					CopyTerminalSelectionAction.ID,
-+					KillTerminalAction.ID,
-+					FocusActiveTerminalAction.ID,
-+					FocusPreviousTerminalAction.ID,
-+					FocusNextTerminalAction.ID,
-+					'workbench.action.tasks.build',
-+					'workbench.action.tasks.restartTask',
-+					'workbench.action.tasks.runTask',
-+					'workbench.action.tasks.showLog',
-+					'workbench.action.tasks.showTasks',
-+					'workbench.action.tasks.terminate',
-+					'workbench.action.tasks.test',
-+					'workbench.action.terminal.focusAtIndex1',
-+					'workbench.action.terminal.focusAtIndex2',
-+					'workbench.action.terminal.focusAtIndex3',
-+					'workbench.action.terminal.focusAtIndex4',
-+					'workbench.action.terminal.focusAtIndex5',
-+					'workbench.action.terminal.focusAtIndex6',
-+					'workbench.action.terminal.focusAtIndex7',
-+					'workbench.action.terminal.focusAtIndex8',
-+					'workbench.action.terminal.focusAtIndex9',
-+					TerminalPasteAction.ID,
-+					RunSelectedTextInTerminalAction.ID,
-+					RunActiveFileInTerminalAction.ID,
-+					ToggleTerminalAction.ID,
-+					ScrollDownTerminalAction.ID,
-+					ScrollDownPageTerminalAction.ID,
-+					ScrollToBottomTerminalAction.ID,
-+					ScrollUpTerminalAction.ID,
-+					ScrollUpPageTerminalAction.ID,
-+					ScrollToTopTerminalAction.ID,
-+					ClearTerminalAction.ID,
-+					debugActions.StartAction.ID,
-+					debugActions.StopAction.ID,
-+					debugActions.RunAction.ID,
-+					debugActions.RestartAction.ID,
-+					debugActions.ContinueAction.ID,
-+					debugActions.PauseAction.ID,
-+					debugActions.StepIntoAction.ID,
-+					debugActions.StepOutAction.ID,
-+					debugActions.StepOverAction.ID,
-+					OpenNextRecentlyUsedEditorInGroupAction.ID,
-+					OpenPreviousRecentlyUsedEditorInGroupAction.ID,
-+					FocusFirstGroupAction.ID,
-+					FocusSecondGroupAction.ID,
-+					FocusThirdGroupAction.ID,
-+					SelectAllTerminalAction.ID,
-+					FocusTerminalFindWidgetAction.ID,
-+					HideTerminalFindWidgetAction.ID,
-+					ShowPreviousFindTermTerminalFindWidgetAction.ID,
-+					ShowNextFindTermTerminalFindWidgetAction.ID,
-+					NavigateUpAction.ID,
-+					NavigateDownAction.ID,
-+					NavigateRightAction.ID,
-+					NavigateLeftAction.ID,
-+					DeleteWordLeftTerminalAction.ID,
-+					DeleteWordRightTerminalAction.ID,
-+					MoveToLineStartTerminalAction.ID,
-+					MoveToLineEndTerminalAction.ID,
-+					TogglePanelAction.ID,
-+					'workbench.action.quickOpenView',
-+					SplitVerticalTerminalAction.ID,
-+					FocusTerminalLeftAction.ID,
-+					FocusTerminalRightAction.ID
-+				].sort()
-+			},
-+			'terminal.integrated.env.osx': {
-+				'description': nls.localize('terminal.integrated.env.osx', "Object with environment variables that will be added to the VS Code process to be used by the terminal on OS X"),
-+				'type': 'object',
-+				'default': {}
-+			},
-+			'terminal.integrated.env.linux': {
-+				'description': nls.localize('terminal.integrated.env.linux', "Object with environment variables that will be added to the VS Code process to be used by the terminal on Linux"),
-+				'type': 'object',
-+				'default': {}
-+			},
-+			'terminal.integrated.env.windows': {
-+				'description': nls.localize('terminal.integrated.env.windows', "Object with environment variables that will be added to the VS Code process to be used by the terminal on Windows"),
-+				'type': 'object',
-+				'default': {}
-+			},
-+			'terminal.integrated.showExitAlert': {
-+				'description': nls.localize('terminal.integrated.showExitAlert', "Show alert `The terminal process terminated with exit code` when exit code is non-zero."),
-+				'type': 'boolean',
-+				'default': true
-+			},
-+		}
-+	});
-+};
-+
-+declare var MonacoSnapshotInitializeCallbacks: any;
-+if (typeof MonacoSnapshotInitializeCallbacks !== 'undefined') {
-+	MonacoSnapshotInitializeCallbacks.push(_initialize);
-+} else {
-+	_initialize();
-+}
-+>>>>>>> .their
- 
- registerSingleton(ITerminalService, TerminalService);
- 
-changed in both
-  base   100644 f33d45cb29d42564f70b008a2fdd82a9f787799f src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts
-  our    100644 77a0eb4cd9ec4b638661e8eafb091dee6d5b72c6 src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts
-  their  100644 1c436277ff80e656b22ea9ef4448b4470fbd7d51 src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts
-@@ -594,6 +594,7 @@
- let schemaRegistry = Registry.as<IJSONContributionRegistry>(Extensions.JSONContribution);
- schemaRegistry.registerSchema(schemaId, schema);
- 
-+<<<<<<< .our
- const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigExtensions.Configuration);
- const keyboardConfiguration: IConfigurationNode = {
- 	'id': 'keyboard',
-@@ -614,8 +615,39 @@
- 			'default': true,
- 			'description': nls.localize('touchbar.enabled', "Enables the macOS touchbar buttons on the keyboard if available."),
- 			'included': OS === OperatingSystem.Macintosh && parseFloat(release()) >= 16 // Minimum: macOS Sierra (10.12.x = darwin 16.x)
-+=======
-+const configurationRegistry = <IConfigurationRegistry>Registry.as(ConfigExtensions.Configuration);
-+
-+let _initialize = () => {
-+	const keyboardConfiguration: IConfigurationNode = {
-+		'id': 'keyboard',
-+		'order': 15,
-+		'type': 'object',
-+		'title': nls.localize('keyboardConfigurationTitle', "Keyboard"),
-+		'overridable': true,
-+		'properties': {
-+			'keyboard.dispatch': {
-+				'type': 'string',
-+				'enum': ['code', 'keyCode'],
-+				'default': 'code',
-+				'description': nls.localize('dispatch', "Controls the dispatching logic for key presses to use either `code` (recommended) or `keyCode`."),
-+				'included': OS === OperatingSystem.Macintosh || OS === OperatingSystem.Linux
-+			},
-+			'keyboard.touchbar.enabled': {
-+				'type': 'boolean',
-+				'default': true,
-+				'description': nls.localize('touchbar.enabled', "Enables the macOS touchbar buttons on the keyboard if available."),
-+				'included': OS === OperatingSystem.Macintosh && parseFloat(release()) >= 16 // Minimum: macOS Sierra (10.12.x = darwin 16.x)
-+			}
-+>>>>>>> .their
- 		}
--	}
--};
-+	};
- 
--configurationRegistry.registerConfiguration(keyboardConfiguration);
-+	configurationRegistry.registerConfiguration(keyboardConfiguration);
-+};
-+declare var MonacoSnapshotInitializeCallbacks;
-+if (typeof MonacoSnapshotInitializeCallbacks !== 'undefined') {
-+	MonacoSnapshotInitializeCallbacks.push(_initialize);
-+} else {
-+	_initialize();
-+}
diff --git a/app/test/fixtures/merge-parser/vscode/merge-avoid-fssync-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-avoid-fssync-into-master.txt
deleted file mode 100644
index 3fd76e74d3e..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-avoid-fssync-into-master.txt
+++ /dev/null
@@ -1,134 +0,0 @@
-changed in both
-  base   100644 29c55f1e4398c37e27660f4ece9976cf551cd804 src/vs/platform/node/product.ts
-  our    100644 dbb84fd473f8212ea96a20a8f12d66c5b703786a src/vs/platform/node/product.ts
-  their  100644 c2d0ab485103b0decd8479198b2da31682ec534f src/vs/platform/node/product.ts
-@@ -36,7 +36,11 @@
- 	};
- 	extensionTips: { [id: string]: string; };
- 	extensionImportantTips: { [id: string]: { name: string; pattern: string; }; };
-+<<<<<<< .our
- 	exeBasedExtensionTips: { [id: string]: { friendlyName: string, windowsPath?: string, recommendations: string[] }; };
-+=======
-+	exeBasedExtensionTips: { [id: string]: any; };
-+>>>>>>> .their
- 	extensionKeywords: { [extension: string]: string[]; };
- 	extensionAllowedBadgeProviders: string[];
- 	extensionAllowedProposedApi: string[];
-changed in both
-  base   100644 3918fe5f9f03c9ec1cd687a7caf8069a54a87775 src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
-  our    100644 6f9d4a74f5feb07a450341f183980ee0a10455a9 src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
-  their  100644 869c71175a9d30718bd642261ff65e81f9459f3b src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
-@@ -28,6 +28,7 @@
- import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
- import * as pfs from 'vs/base/node/pfs';
- import * as os from 'os';
-+<<<<<<< .our
- import { flatten, distinct, shuffle, coalesce } from 'vs/base/common/arrays';
- import { IEnvironmentService } from 'vs/platform/environment/common/environment';
- import { guessMimeTypes, MIME_UNKNOWN } from 'vs/base/common/mime';
-@@ -43,6 +44,9 @@
- import URI from 'vs/base/common/uri';
- import { areSameExtensions, getGalleryExtensionIdFromLocal } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
- import { IExperimentService, ExperimentActionType, ExperimentState } from 'vs/workbench/parts/experiments/node/experimentService';
-+=======
-+import { flatten, distinct } from 'vs/base/common/arrays';
-+>>>>>>> .their
- 
- const milliSecondsInADay = 1000 * 60 * 60 * 24;
- const choiceNever = localize('neverShowAgain', "Don't Show Again");
-@@ -113,9 +117,19 @@
- 			return;
- 		}
- 
-+<<<<<<< .our
- 		if (product.extensionsGallery && product.extensionsGallery.recommendationsUrl) {
- 			this._extensionsRecommendationsUrl = product.extensionsGallery.recommendationsUrl;
- 		}
-+=======
-+		this._suggestTips();
-+		this._suggestWorkspaceRecommendations();
-+
-+		// Executable based recommendations carry out a lot of file stats, so run them after 10 secs
-+		// So that the startup is not affected
-+		setTimeout(() => this._suggestBasedOnExecutables(this._exeBasedRecommendations), 10000);
-+	}
-+>>>>>>> .their
- 
- 		this.sessionSeed = +new Date();
- 
-@@ -286,6 +300,7 @@
- 				}));
- 	}
- 
-+<<<<<<< .our
- 	private fetchExtensionRecommendationContents(): TPromise<{ contents: IExtensionsConfigContent, source: ExtensionRecommendationSource }[]> {
- 		const workspace = this.contextService.getWorkspace();
- 		return TPromise.join<{ contents: IExtensionsConfigContent, source: ExtensionRecommendationSource }>([
-@@ -293,6 +308,9 @@
- 			...workspace.folders.map(workspaceFolder => this.resolveWorkspaceFolderExtensionConfig(workspaceFolder).then(contents => contents ? { contents, source: workspaceFolder } : null))
- 		]).then(contents => coalesce(contents));
- 	}
-+=======
-+		const exeBased = distinct(this._exeBasedRecommendations);
-+>>>>>>> .their
- 
- 	private resolveWorkspaceExtensionConfig(workspace: IWorkspace): TPromise<IExtensionsConfigContent | null> {
- 		if (!workspace.configuration) {
-@@ -801,6 +819,7 @@
- 		);
- 	}
- 
-+<<<<<<< .our
- 	private fetchExecutableRecommendations(): TPromise<any> {
- 		const homeDir = os.homedir();
- 		let foundExecutables: Set<string> = new Set<string>();
-@@ -815,11 +834,25 @@
- 								this._exeBasedRecommendations[extensionId.toLowerCase()] = product.exeBasedExtensionTips[exeName]['friendlyName'];
- 							}
- 						});
-+=======
-+	private _suggestBasedOnExecutables(recommendations: string[]): void {
-+		const homeDir = os.homedir();
-+		let foundExecutables: Set<string> = new Set<string>();
-+
-+		let findExecutable = (exeName, path) => {
-+			return pfs.fileExists(path).then(exists => {
-+				if (!foundExecutables.has(exeName)) {
-+					foundExecutables.add(exeName);
-+					recommendations.push(...product.exeBasedExtensionTips[exeName]['recommendations']);
-+>>>>>>> .their
- 				}
- 			});
- 		};
- 
-+<<<<<<< .our
- 		let promises: TPromise<any>[] = [];
-+=======
-+>>>>>>> .their
- 		// Loop through recommended extensions
- 		forEach(product.exeBasedExtensionTips, entry => {
- 			if (typeof entry.value !== 'object' || !Array.isArray(entry.value['recommendations'])) {
-@@ -832,6 +865,7 @@
- 				if (!windowsPath || typeof windowsPath !== 'string') {
- 					return;
- 				}
-+<<<<<<< .our
- 				windowsPath = windowsPath.replace('%USERPROFILE%', process.env['USERPROFILE'])
- 					.replace('%ProgramFiles(x86)%', process.env['ProgramFiles(x86)'])
- 					.replace('%ProgramFiles%', process.env['ProgramFiles'])
-@@ -844,6 +878,15 @@
- 		});
- 
- 		return TPromise.join(promises);
-+=======
-+				windowsPath = windowsPath.replace('%USERPROFILE%', process.env['USERPROFILE']);
-+				findExecutable(exeName, windowsPath);
-+			} else {
-+				findExecutable(exeName, paths.join('/usr/local/bin', exeName));
-+				findExecutable(exeName, paths.join(homeDir, exeName));
-+			}
-+		});
-+>>>>>>> .their
- 	}
- 
- 	private setIgnoreRecommendationsConfig(configVal: boolean) {
diff --git a/app/test/fixtures/merge-parser/vscode/merge-aweinand-loadedscripts-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-aweinand-loadedscripts-into-master.txt
deleted file mode 100644
index e7f0817892d..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-aweinand-loadedscripts-into-master.txt
+++ /dev/null
@@ -1,300 +0,0 @@
-changed in both
-  base   100644 da803391a973399fb94e5558711c81b08163b994 src/vs/workbench/parts/debug/browser/loadedScriptsView.ts
-  our    100644 780b5ebb659f0555d2292809a3fc8a6d6586d54b src/vs/workbench/parts/debug/browser/loadedScriptsView.ts
-  their  100644 d5f424be6299e7708d25d9f5c55009341cd0b18b src/vs/workbench/parts/debug/browser/loadedScriptsView.ts
-@@ -38,11 +38,16 @@
- 
- class BaseTreeItem {
- 
-+<<<<<<< .our
- 	private _showedMoreThanOne: boolean;
-+=======
-+	private _id: string;
-+>>>>>>> .their
- 	private _children: { [key: string]: BaseTreeItem; };
- 	private _source: Source;
- 
- 	constructor(private _parent: BaseTreeItem, private _label: string) {
-+<<<<<<< .our
- 		this._children = {};
- 		this._showedMoreThanOne = false;
- 	}
-@@ -62,12 +67,30 @@
- 
- 	remove(key: string): void {
- 		delete this._children[key];
-+=======
-+		this._id = this._parent ? `${this._parent._id}/${this._label}` : this._label;
-+		this._children = {};
-+	}
-+
-+	getLabel() {
-+		const child = this.oneChild();
-+		if (child) {
-+			const sep = this instanceof RootFolderTreeItem ? ' • ' : '/';
-+			return `${this._label}${sep}${child.getLabel()}`;
-+		}
-+		return this._label;
-+	}
-+
-+	getId(): string {
-+		return this._id;
-+>>>>>>> .their
- 	}
- 
- 	getTemplateId(): string {
- 		return SOURCE_TEMPLATE_ID;
- 	}
- 
-+<<<<<<< .our
- 	// a dynamic ID based on the parent chain; required for reparenting (see #55448)
- 	getId(): string {
- 		const parent = this.getParent();
-@@ -87,6 +110,17 @@
- 	}
- 
- 	// skips intermediate single-child nodes
-+=======
-+	getChildren(): TPromise<BaseTreeItem[]> {
-+		const child = this.oneChild();
-+		if (child) {
-+			return child.getChildren();
-+		}
-+		const array = Object.keys(this._children).map(key => this._children[key]);
-+		return TPromise.as(array.sort((a, b) => this.compare(a, b)));
-+	}
-+
-+>>>>>>> .their
- 	hasChildren(): boolean {
- 		const child = this.oneChild();
- 		if (child) {
-@@ -95,6 +129,7 @@
- 		return Object.keys(this._children).length > 0;
- 	}
- 
-+<<<<<<< .our
- 	// skips intermediate single-child nodes
- 	getChildren(): TPromise<BaseTreeItem[]> {
- 		const child = this.oneChild();
-@@ -134,6 +169,31 @@
- 			return child.getSource();
- 		}
- 		return this._source;
-+=======
-+	getSource() {
-+		const child = this.oneChild();
-+		if (child) {
-+			return child.getSource();
-+		}
-+		return this._source;
-+	}
-+
-+	setSource(session: ISession, source: Source): void {
-+		this._source = source;
-+	}
-+
-+	createIfNeeded<T extends BaseTreeItem>(key: string, factory: (parent: BaseTreeItem, label: string) => T): T {
-+		let child = <T>this._children[key];
-+		if (!child) {
-+			child = factory(this, key);
-+			this._children[key] = child;
-+		}
-+		return child;
-+	}
-+
-+	remove(key: string): void {
-+		delete this._children[key];
-+>>>>>>> .their
- 	}
- 
- 	protected compare(a: BaseTreeItem, b: BaseTreeItem): number {
-@@ -144,15 +204,22 @@
- 	}
- 
- 	private oneChild(): BaseTreeItem {
-+<<<<<<< .our
- 		if (SMART && !this._showedMoreThanOne) {
-+=======
-+		if (SMART && !(this instanceof RootTreeItem)) {
-+>>>>>>> .their
- 			const keys = Object.keys(this._children);
- 			if (keys.length === 1) {
- 				return this._children[keys[0]];
- 			}
-+<<<<<<< .our
- 			// if a node had more than one child once, it will never be skipped again
- 			if (keys.length > 1) {
- 				this._showedMoreThanOne = true;
- 			}
-+=======
-+>>>>>>> .their
- 		}
- 		return undefined;
- 	}
-@@ -171,13 +238,40 @@
- 
- class RootTreeItem extends BaseTreeItem {
- 
-+<<<<<<< .our
- 	constructor(private _debugModel: IModel, private _environmentService: IEnvironmentService, private _contextService: IWorkspaceContextService) {
- 		super(undefined, 'Root');
-+=======
-+	private _showedMoreThanOne: boolean;
-+
-+	constructor(private _debugModel: IModel, private _environmentService: IEnvironmentService, private _contextService: IWorkspaceContextService) {
-+		super(undefined, 'Root');
-+		this._showedMoreThanOne = false;
-+>>>>>>> .their
- 		this._debugModel.getSessions().forEach(session => {
- 			this.add(session);
- 		});
- 	}
- 
-+<<<<<<< .our
-+=======
-+	hasChildren(): boolean {
-+		return true;
-+	}
-+
-+	getChildren(): TPromise<BaseTreeItem[]> {
-+		return super.getChildren().then(children => {
-+			const size = children.length;
-+			if (!this._showedMoreThanOne && size === 1) {
-+				// skip session if there is only one
-+				return children[0].getChildren();
-+			}
-+			this._showedMoreThanOne = size > 1;
-+			return children;
-+		});
-+	}
-+
-+>>>>>>> .their
- 	add(session: ISession): SessionTreeItem {
- 		return this.createIfNeeded(session.getId(), () => new SessionTreeItem(this, session, this._environmentService, this._contextService));
- 	}
-@@ -196,10 +290,13 @@
- 		this._session = session;
- 	}
- 
-+<<<<<<< .our
- 	getHoverLabel(): string {
- 		return undefined;
- 	}
- 
-+=======
-+>>>>>>> .their
- 	getTemplateId(): string {
- 		return SESSION_TEMPLATE_ID;
- 	}
-@@ -230,6 +327,12 @@
- 		return super.compare(a, b);
- 	}
- 
-+<<<<<<< .our
-+=======
-+	/**
-+	 * Return an ordinal number for folders
-+	 */
-+>>>>>>> .their
- 	private category(item: BaseTreeItem): number {
- 
- 		// workspace scripts come at the beginning in "folder" order
-@@ -286,6 +389,12 @@
- 
- 		let x: BaseTreeItem = this;
- 		path.split(/[\/\\]/).forEach((segment, i) => {
-+<<<<<<< .our
-+=======
-+			if (segment.length === 0) {	// macOS or unix path
-+				segment = '/';
-+			}
-+>>>>>>> .their
- 			if (i === 0 && folder) {
- 				x = x.createIfNeeded(folder.name, parent => new RootFolderTreeItem(parent, folder));
- 			} else if (i === 0 && url) {
-@@ -377,18 +486,27 @@
- 
- 			clearTimeout(timeout);
- 			timeout = setTimeout(() => {
-+<<<<<<< .our
- 				if (this.tree) {
- 					this.tree.refresh(root, true);
- 				}
-+=======
-+				this.tree.refresh(root, true);
-+>>>>>>> .their
- 			}, 300);
- 		}));
- 
- 		this.disposables.push(this.debugService.onDidEndSession(session => {
-+<<<<<<< .our
- 			clearTimeout(timeout);
- 			root.remove(session.getId());
- 			if (this.tree) {
- 				this.tree.refresh(root, false);
- 			}
-+=======
-+			root.remove(session.getId());
-+			this.tree.refresh(root, false);
-+>>>>>>> .their
- 		}));
- 	}
- 
-@@ -422,7 +540,11 @@
- 	}
- 
- 	getParent(tree: ITree, element: any): TPromise<any> {
-+<<<<<<< .our
- 		return element.getParent();
-+=======
-+		return TPromise.as(null);
-+>>>>>>> .their
- 	}
- 
- 	shouldAutoexpand?(tree: ITree, element: any): boolean {
-@@ -486,17 +608,29 @@
- 	}
- 
- 	private renderSession(session: SessionTreeItem, data: ISessionTemplateData): void {
-+<<<<<<< .our
- 		data.session.title = nls.localize('loadedScriptsSession', "Session");
-+=======
-+		data.session.title = 'session';
-+>>>>>>> .their
- 		data.session.textContent = session.getLabel();
- 	}
- 
- 	private renderSource(source: BaseTreeItem, data: ISourceTemplateData): void {
-+<<<<<<< .our
- 		data.source.title = source.getHoverLabel();
-+=======
-+		data.source.title = 'source';
-+>>>>>>> .their
- 		data.source.textContent = source.getLabel();
- 	}
- 
- 	private renderNode(node: BaseTreeItem, data: INodeTemplateData): void {
-+<<<<<<< .our
- 		data.node.title = node.getHoverLabel();
-+=======
-+		data.node.title = 'node';
-+>>>>>>> .their
- 		data.node.textContent = node.getLabel();
- 	}
- }
-changed in both
-  base   100644 8db643264cde812839cbc62922a7879e95479774 src/vs/workbench/parts/debug/common/debug.ts
-  our    100644 6af33b36e60bc4ed9fd12760518ea3ad7586a202 src/vs/workbench/parts/debug/common/debug.ts
-  their  100644 0d62b0df93db2a6b66222a2de470c977e720fab0 src/vs/workbench/parts/debug/common/debug.ts
-changed in both
-  base   100644 3ec47d67994408fceb068a8f41544f0a7d6165b6 src/vs/workbench/parts/debug/electron-browser/debugService.ts
-  our    100644 a5e2dcee7a0eb14bc388d84c6c7cac591067b1b2 src/vs/workbench/parts/debug/electron-browser/debugService.ts
-  their  100644 1e4a2db28bceab742e1469359b45090d46b7447c src/vs/workbench/parts/debug/electron-browser/debugService.ts
-changed in both
-  base   100644 1e7a2fd9db2f6018839848dd26fd099693f51bfc src/vs/workbench/parts/debug/electron-browser/rawDebugSession.ts
-  our    100644 93891ff0b4ea9e2eac2605dcf9af9a084b4cb222 src/vs/workbench/parts/debug/electron-browser/rawDebugSession.ts
-  their  100644 5e9785e36c85aa19267c06900fafe388080b843e src/vs/workbench/parts/debug/electron-browser/rawDebugSession.ts
-changed in both
-  base   100644 ceb4cc25a49bf74d4fc737342e0ffec5c925c680 src/vs/workbench/parts/debug/test/common/mockDebug.ts
-  our    100644 f92a322a3a036508e656bfcc26cb44dbda385b53 src/vs/workbench/parts/debug/test/common/mockDebug.ts
-  their  100644 b186fce4eb8018b946dbb44a1fd900be4ffa21a2 src/vs/workbench/parts/debug/test/common/mockDebug.ts
diff --git a/app/test/fixtures/merge-parser/vscode/merge-ben-19707-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-ben-19707-into-master.txt
deleted file mode 100644
index 44f649af92d..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-ben-19707-into-master.txt
+++ /dev/null
@@ -1,305 +0,0 @@
-changed in both
-  base   100644 e37142cbab4cc21d66760f0e3657c907f7dc4342 build/gulpfile.vscode.js
-  our    100644 d79071e56bcfc53b3448052cc08bd7247bd7e789 build/gulpfile.vscode.js
-  their  100644 68db2ef28bffaca7e6f8635d64f7c9a98a1909a9 build/gulpfile.vscode.js
-@@ -297,8 +297,11 @@
- 			.pipe(util.cleanNodeModule('windows-mutex', ['binding.gyp', 'build/**', 'src/**'], ['**/*.node']))
- 			.pipe(util.cleanNodeModule('native-keymap', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], ['**/*.node']))
- 			.pipe(util.cleanNodeModule('native-is-elevated', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], ['**/*.node']))
-+<<<<<<< .our
- 			.pipe(util.cleanNodeModule('native-watchdog', ['binding.gyp', 'build/**', 'src/**'], ['**/*.node']))
- 			.pipe(util.cleanNodeModule('spdlog', ['binding.gyp', 'build/**', 'deps/**', 'src/**', 'test/**'], ['**/*.node']))
-+=======
-+>>>>>>> .their
- 			.pipe(util.cleanNodeModule('jschardet', ['dist/**']))
- 			.pipe(util.cleanNodeModule('windows-foreground-love', ['binding.gyp', 'build/**', 'src/**'], ['**/*.node']))
- 			.pipe(util.cleanNodeModule('windows-process-tree', ['binding.gyp', 'build/**', 'src/**'], ['**/*.node']))
-removed in local
-  base   100644 ef084f4913e7f22ffb3737a557d6a42eed63492d npm-shrinkwrap.json
-  their  100644 fda17327b08352ce1cb22a958158e07d3d5eb1e7 npm-shrinkwrap.json
-changed in both
-  base   100644 59026697ac9f412d7ed6efa48f8fb8bda9525048 package.json
-  our    100644 d0e982ce0b76c5b1b5eb02b673e459e47f3353a4 package.json
-  their  100644 06ec255e4bc3737db612fd03afc2f97794ab3569 package.json
-@@ -36,6 +36,7 @@
-     "jschardet": "1.6.0",
-     "keytar": "4.2.1",
-     "minimist": "1.2.0",
-+<<<<<<< .our
-     "native-is-elevated": "^0.2.1",
-     "native-keymap": "1.2.5",
-     "native-watchdog": "0.3.0",
-@@ -52,6 +53,19 @@
-     "vscode-xterm": "3.7.0-beta4",
-     "winreg": "^1.2.4",
-     "yauzl": "^2.9.1"
-+=======
-+    "native-keymap": "1.2.1",
-+    "node-pty": "0.6.2",
-+    "semver": "4.3.6",
-+    "v8-profiler": "jrieken/v8-profiler#vscode",
-+    "vscode-debugprotocol": "1.18.0",
-+    "vscode-ripgrep": "0.0.11",
-+    "vscode-textmate": "^3.1.3",
-+    "winreg": "1.2.0",
-+    "xterm": "Tyriar/xterm.js#vscode-release/1.11",
-+    "yauzl": "2.3.1",
-+    "native-is-elevated": "^0.2.0"
-+>>>>>>> .their
-   },
-   "devDependencies": {
-     "7zip": "0.0.6",
-added in both
-  our    100644 1b79764d6a056be641849643f89589afe991457c src/typings/native-is-elevated.d.ts
-  their  100644 d9ea0a111c3134d55c22fc3f16e8be8b8ed81e59 src/typings/native-is-elevated.d.ts
-@@ -1,8 +1,11 @@
-+<<<<<<< .our
- /*---------------------------------------------------------------------------------------------
-  *  Copyright (c) Microsoft Corporation. All rights reserved.
-  *  Licensed under the MIT License. See License.txt in the project root for license information.
-  *--------------------------------------------------------------------------------------------*/
- 
-+=======
-+>>>>>>> .their
- declare module 'native-is-elevated' {
- 	function isElevated(): boolean;
- 
-changed in both
-  base   100644 cb712577c795a82dcfa91263e48db79bc1c6efe0 src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
-  our    100644 9a4bc78f8bfb46964c500453932b1dd3cffe5d15 src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
-  their  100644 d3057291cb770b31a883074b1dc458170137b852 src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
-@@ -17,12 +17,19 @@
- import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
- import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
- import { IAction, Action } from 'vs/base/common/actions';
-+<<<<<<< .our
- import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
- import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-+=======
-+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-+import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
-+import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
-+>>>>>>> .their
- import { IDisposable, dispose } from 'vs/base/common/lifecycle';
- import * as nls from 'vs/nls';
- import { EditorInput, toResource, Verbosity } from 'vs/workbench/common/editor';
- import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-+<<<<<<< .our
- import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
- import { IThemeService, registerThemingParticipant, ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
- import { TITLE_BAR_ACTIVE_BACKGROUND, TITLE_BAR_ACTIVE_FOREGROUND, TITLE_BAR_INACTIVE_FOREGROUND, TITLE_BAR_INACTIVE_BACKGROUND, TITLE_BAR_BORDER } from 'vs/workbench/common/theme';
-@@ -36,16 +43,36 @@
- import { template, getBaseLabel } from 'vs/base/common/labels';
- import { IUriLabelService } from 'vs/platform/uriLabel/common/uriLabel';
- import { Event } from 'vs/base/common/event';
-+=======
-+import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-+import { Verbosity } from 'vs/platform/editor/common/editor';
-+import { IThemeService } from 'vs/platform/theme/common/themeService';
-+import { TITLE_BAR_ACTIVE_BACKGROUND, TITLE_BAR_ACTIVE_FOREGROUND, TITLE_BAR_INACTIVE_FOREGROUND, TITLE_BAR_INACTIVE_BACKGROUND } from 'vs/workbench/common/theme';
-+import { isWindows } from 'vs/base/common/platform';
-+
-+export interface ITitleProperties {
-+	isPure: boolean;
-+	isAdmin: boolean;
-+}
-+>>>>>>> .their
- 
- export class TitlebarPart extends Part implements ITitleService {
- 
- 	_serviceBrand: any;
- 
-+<<<<<<< .our
- 	private static readonly NLS_UNSUPPORTED = nls.localize('patchedWindowTitle', "[Unsupported]");
- 	private static readonly NLS_USER_IS_ADMIN = isWindows ? nls.localize('userIsAdmin', "[Administrator]") : nls.localize('userIsSudo', "[Superuser]");
- 	private static readonly NLS_EXTENSION_HOST = nls.localize('devExtensionWindowTitlePrefix', "[Extension Development Host]");
- 	private static readonly TITLE_DIRTY = '\u25cf ';
- 	private static readonly TITLE_SEPARATOR = isMacintosh ? ' — ' : ' - '; // macOS uses special - separator
-+=======
-+	private static NLS_UNSUPPORTED = nls.localize('patchedWindowTitle', "[Unsupported]");
-+	private static NLS_USER_IS_ADMIN = nls.localize('userIsAdmin', "(Administrator)");
-+	private static NLS_EXTENSION_HOST = nls.localize('devExtensionWindowTitlePrefix', "[Extension Development Host]");
-+	private static TITLE_DIRTY = '\u25cf ';
-+	private static TITLE_SEPARATOR = ' - ';
-+>>>>>>> .their
- 
- 	private titleContainer: Builder;
- 	private title: Builder;
-@@ -70,6 +97,10 @@
- 
- 	private isInactive: boolean;
- 
-+<<<<<<< .our
-+=======
-+	private titleTemplate: string;
-+>>>>>>> .their
- 	private properties: ITitleProperties;
- 	private activeEditorListeners: IDisposable[];
- 
-@@ -79,7 +110,12 @@
- 		@IWindowService private windowService: IWindowService,
- 		@IConfigurationService private configurationService: IConfigurationService,
- 		@IWindowsService private windowsService: IWindowsService,
-+<<<<<<< .our
- 		@IEditorService private editorService: IEditorService,
-+=======
-+		@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
-+		@IEditorGroupService private editorGroupService: IEditorGroupService,
-+>>>>>>> .their
- 		@IEnvironmentService private environmentService: IEnvironmentService,
- 		@IWorkspaceContextService private contextService: IWorkspaceContextService,
- 		@IInstantiationService private instantiationService: IInstantiationService,
-@@ -94,6 +130,18 @@
- 		this.registerListeners();
- 	}
- 
-+<<<<<<< .our
-+=======
-+	private init(): void {
-+
-+		// Read initial config
-+		this.onConfigurationChanged();
-+
-+		// Initial window title
-+		this.setTitle(this.getWindowTitle());
-+	}
-+
-+>>>>>>> .their
- 	private registerListeners(): void {
- 		this._register(addDisposableListener(window, EventType.BLUR, () => this.onBlur()));
- 		this._register(addDisposableListener(window, EventType.FOCUS, () => this.onFocus()));
-@@ -181,14 +229,21 @@
- 			title = this.environmentService.appNameLong;
- 		}
- 
-+<<<<<<< .our
- 		if (this.properties.isAdmin) {
- 			title = `${title} ${TitlebarPart.NLS_USER_IS_ADMIN}`;
- 		}
- 
-+=======
-+>>>>>>> .their
- 		if (!this.properties.isPure) {
- 			title = `${title} ${TitlebarPart.NLS_UNSUPPORTED}`;
- 		}
- 
-+		if (isWindows && this.properties.isAdmin) {
-+			title = `${title} ${TitlebarPart.NLS_USER_IS_ADMIN}`;
-+		}
-+
- 		// Extension Development Host gets a special title to identify itself
- 		if (this.environmentService.isExtensionDevelopment) {
- 			title = `${TitlebarPart.NLS_EXTENSION_HOST} - ${title}`;
-@@ -461,7 +516,16 @@
- 		return actions;
- 	}
- 
-+<<<<<<< .our
- 	setTitle(title: string): void {
-+=======
-+	public updateProperties(properties: ITitleProperties): void {
-+		this.properties = properties;
-+		this.setTitle(this.getWindowTitle());
-+	}
-+
-+	public setTitle(title: string): void {
-+>>>>>>> .their
- 
- 		// Always set the native window title to identify us properly to the OS
- 		window.document.title = title;
-changed in both
-  base   100644 8d790905d271360945dbc86ca9403f7611652a04 src/vs/workbench/electron-browser/shell.ts
-  our    100644 33bea4a0ca07789e5913902a82c7d187af26b943 src/vs/workbench/electron-browser/shell.ts
-  their  100644 79b38c5c856c5f24114c6a5a18946fb86acc2d33 src/vs/workbench/electron-browser/shell.ts
-@@ -34,10 +34,15 @@
- import { MarkerService } from 'vs/platform/markers/common/markerService';
- import { IModelService } from 'vs/editor/common/services/modelService';
- import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl';
-+<<<<<<< .our
- import { CodeEditorService } from 'vs/workbench/services/codeEditor/browser/codeEditorService';
- import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
- import { IntegrityServiceImpl } from 'vs/platform/integrity/node/integrityServiceImpl';
- import { IIntegrityService } from 'vs/platform/integrity/common/integrity';
-+=======
-+import { CodeEditorServiceImpl } from 'vs/editor/browser/services/codeEditorServiceImpl';
-+import { ICodeEditorService } from 'vs/editor/common/services/codeEditorService';
-+>>>>>>> .their
- import { EditorWorkerServiceImpl } from 'vs/editor/common/services/editorWorkerServiceImpl';
- import { IEditorWorkerService } from 'vs/editor/common/services/editorWorkerService';
- import { ExtensionService } from 'vs/workbench/services/extensions/electron-browser/extensionService';
-@@ -417,11 +422,16 @@
- 
- 		serviceCollection.set(ISearchHistoryService, new SyncDescriptor(SearchHistoryService));
- 
-+<<<<<<< .our
- 		serviceCollection.set(IWorkbenchIssueService, new SyncDescriptor(WorkbenchIssueService));
- 
- 		serviceCollection.set(ICodeEditorService, new SyncDescriptor(CodeEditorService));
- 
- 		serviceCollection.set(IOpenerService, new SyncDescriptor(OpenerService));
-+=======
-+		const updateChannel = mainProcessClient.getChannel('update');
-+		serviceCollection.set(IUpdateService, new SyncDescriptor(UpdateChannelClient, updateChannel));
-+>>>>>>> .their
- 
- 		serviceCollection.set(IIntegrityService, new SyncDescriptor(IntegrityServiceImpl));
- 
-changed in both
-  base   100644 b609fb275de23787d86c43882fe92e7acbc6d59c src/vs/workbench/electron-browser/workbench.ts
-  our    100644 78add76eb65984b5c27c1721cb6482b45327e839 src/vs/workbench/electron-browser/workbench.ts
-  their  100644 de63203e9030c28435fc8649e772dd2017758a6f src/vs/workbench/electron-browser/workbench.ts
-@@ -37,8 +37,17 @@
- import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
- import { QuickInputService } from 'vs/workbench/browser/parts/quickinput/quickInput';
- import { getServices } from 'vs/platform/instantiation/common/extensions';
-+<<<<<<< .our
- import { Position, Parts, IPartService, ILayoutOptions, IDimension } from 'vs/workbench/services/part/common/partService';
- import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-+=======
-+import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
-+import { WorkbenchEditorService } from 'vs/workbench/services/editor/browser/editorService';
-+import { Position, Parts, IPartService, ILayoutOptions } from 'vs/workbench/services/part/common/partService';
-+import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-+import { IntegrityServiceImpl } from 'vs/platform/integrity/node/integrityServiceImpl';
-+import { IIntegrityService } from 'vs/platform/integrity/common/integrity';
-+>>>>>>> .their
- import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
- import { ContextMenuService as NativeContextMenuService } from 'vs/workbench/services/contextview/electron-browser/contextmenuService';
- import { ContextMenuService as HTMLContextMenuService } from 'vs/platform/contextview/browser/contextMenuService';
-@@ -201,11 +210,16 @@
- 	private contextKeyService: IContextKeyService;
- 	private keybindingService: IKeybindingService;
- 	private backupFileService: IBackupFileService;
-+<<<<<<< .our
- 	private fileService: IFileService;
- 	private quickInput: QuickInputService;
- 
- 	private workbenchLayout: WorkbenchLayout;
- 
-+=======
-+	private integrityService: IIntegrityService;
-+	private configurationEditingService: IConfigurationEditingService;
-+>>>>>>> .their
- 	private titlebarPart: TitlebarPart;
- 	private activitybarPart: ActivitybarPart;
- 	private sidebarPart: SidebarPart;
-@@ -333,6 +347,10 @@
- 		// Services we contribute
- 		serviceCollection.set(IPartService, this);
- 
-+		// Integrity
-+		this.integrityService = this.instantiationService.createInstance(IntegrityServiceImpl);
-+		serviceCollection.set(IIntegrityService, this.integrityService);
-+
- 		// Clipboard
- 		serviceCollection.set(IClipboardService, new ClipboardService());
- 
-@@ -1027,6 +1045,8 @@
- 		const titlebarContainer = this.createPart(Identifiers.TITLEBAR_PART, ['part', 'titlebar'], 'contentinfo');
- 
- 		this.titlebarPart.create(titlebarContainer);
-+
-+		// TODO resolve integrity and isAdmin after timeout
- 	}
- 
- 	private createActivityBarPart(): void {
diff --git a/app/test/fixtures/merge-parser/vscode/merge-chines-locale-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-chines-locale-into-master.txt
deleted file mode 100644
index e6871ec9fba..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-chines-locale-into-master.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-changed in both
-  base   100644 340f821e0f471b5fe1c903386515436c2aa2b392 src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.ts
-  our    100644 052de75c677677d839ae5533561df1d9238d3218 src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.ts
-  their  100644 ef0e09b3c44f40f738a590cf7d9e6c17d035f958 src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.ts
-@@ -210,6 +210,22 @@
- 
- 	}
- 
-+<<<<<<< .our
-+=======
-+	private getLanguagePackExtension(language: string): TPromise<IGalleryExtension> {
-+		return this.localizationService.getLanguageIds(LanguageType.Core)
-+			.then(coreLanguages => {
-+				if (coreLanguages.some(c => c.toLowerCase() === language)) {
-+					const extensionIdPrefix = language === 'zh-cn' ? 'zh-hans' : language === 'zh-tw' ? 'zh-hant' : language;
-+					const extensionId = `MS-CEINTL.vscode-language-pack-${extensionIdPrefix}`;
-+					return this.galleryService.query({ names: [extensionId], pageSize: 1 })
-+						.then(result => result.total === 1 ? result.firstPage[0] : null);
-+				}
-+				return null;
-+			});
-+	}
-+
-+>>>>>>> .their
- 	private isLanguageInstalled(language: string): TPromise<boolean> {
- 		return this.extensionManagementService.getInstalled(LocalExtensionType.User)
- 			.then(installed => installed.some(i => i.manifest && i.manifest.contributes && i.manifest.contributes.localizations && i.manifest.contributes.localizations.length && i.manifest.contributes.localizations.some(l => l.languageId.toLowerCase() === language)));
diff --git a/app/test/fixtures/merge-parser/vscode/merge-chrmarti-quickinputapi-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-chrmarti-quickinputapi-into-master.txt
deleted file mode 100644
index ee3b4b40f4e..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-chrmarti-quickinputapi-into-master.txt
+++ /dev/null
@@ -1,372 +0,0 @@
-added in remote
-  their  100644 7cf36bd89bb3ae6eb026d76cd4e9162cc9d88644 extensions/extension-editing/src/quickInputExploration.ts
-@@ -0,0 +1,249 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+import { ExtensionContext, commands, QuickPickItem, window, Disposable, CancellationToken, QuickInputCommand, QuickInput } from 'vscode';
-+
-+export function activate(context: ExtensionContext) {
-+	context.subscriptions.push(commands.registerCommand('foobar', async () => {
-+		const inputs = await collectInputs();
-+		console.log(inputs);
-+	}));
-+}
-+
-+const resourceGroups: QuickPickItem[] = ['vscode-data-function', 'vscode-website-microservices', 'vscode-website-monitor', 'vscode-website-preview', 'vscode-website-prod']
-+	.map(label => ({ label }));
-+
-+
-+interface Result {
-+	resourceGroup: QuickPickItem | string;
-+	name: string;
-+	runtime: QuickPickItem;
-+}
-+
-+async function collectInputs() {
-+	const result = {} as Partial<Result>;
-+	await MultiStepInput.run(input => pickResourceGroup(input, {}));
-+	return result;
-+}
-+
-+class MyCommand implements QuickInputCommand {
-+	constructor(public iconPath: string) { }
-+}
-+
-+async function pickResourceGroup(input: MultiStepInput, state: Partial<Result>) {
-+	const createResourceGroupItem = new MyCommand('createResourceGroup.svg');
-+	const pick = await input.showQuickPick({
-+		placeHolder: 'Pick a resource group',
-+		items: resourceGroups,
-+		commands: [createResourceGroupItem],
-+		shouldResume: shouldResume
-+	});
-+	if (pick instanceof MyCommand) {
-+		return (input: MultiStepInput) => inputResourceGroupName(input, state);
-+	}
-+	state.resourceGroup = pick;
-+	return (input: MultiStepInput) => inputName(input, state);
-+}
-+
-+async function inputResourceGroupName(input: MultiStepInput, state: Partial<Result>) {
-+	state.resourceGroup = await input.showInputBox({
-+		prompt: 'Choose a unique name for the resource group',
-+		validate: validateNameIsUnique,
-+		shouldResume: shouldResume
-+	});
-+	return (input: MultiStepInput) => inputName(input, state);
-+}
-+
-+async function inputName(input: MultiStepInput, state: Partial<Result>) {
-+	state.name = await input.showInputBox({
-+		prompt: 'Choose a unique name for the application service',
-+		validate: validateNameIsUnique,
-+		shouldResume: shouldResume
-+	});
-+	return (input: MultiStepInput) => pickRuntime(input, state);
-+}
-+
-+async function pickRuntime(input: MultiStepInput, state: Partial<Result>) {
-+	const runtimes = await getAvailableRuntimes(state.resourceGroup, null /* token */);
-+	state.runtime = await input.showQuickPick({
-+		placeHolder: 'Pick a runtime',
-+		items: runtimes,
-+		shouldResume: shouldResume
-+	});
-+}
-+
-+function shouldResume() {
-+	// Could show a notification with the option to resume.
-+	return new Promise<boolean>((resolve, reject) => {
-+
-+	});
-+}
-+
-+class InputFlowAction {
-+	private constructor() { }
-+	static back = new InputFlowAction();
-+	static cancel = new InputFlowAction();
-+	static resume = new InputFlowAction();
-+}
-+
-+type InputStep = (input: MultiStepInput) => Thenable<InputStep | void>;
-+
-+interface QuickPickParameters {
-+	items: QuickPickItem[];
-+	placeHolder: string;
-+	commands?: QuickInputCommand[];
-+	shouldResume: () => Thenable<boolean>;
-+}
-+
-+interface InputBoxParameters {
-+	prompt: string;
-+	validate: (value: string) => Promise<string>;
-+	commands?: QuickInputCommand[];
-+	shouldResume: () => Thenable<boolean>;
-+}
-+
-+const backItem: QuickInputCommand = { iconPath: 'back.svg' };
-+
-+class MultiStepInput {
-+
-+	static async run<T>(start: InputStep) {
-+		const input = new MultiStepInput();
-+		return input.stepThrough(start);
-+	}
-+
-+	private current?: QuickInput;
-+	private steps: InputStep[] = [];
-+
-+	private async stepThrough<T>(start: InputStep) {
-+		let step: InputStep | void = start;
-+		while (step) {
-+			this.steps.push(step);
-+			if (this.current) {
-+				this.current.enabled = false;
-+				this.current.busy = true;
-+			}
-+			try {
-+				step = await step(this);
-+			} catch (err) {
-+				if (err === InputFlowAction.back) {
-+					this.steps.pop();
-+					step = this.steps.pop();
-+				} else if (err === InputFlowAction.resume) {
-+					step = this.steps.pop();
-+				} else if (err === InputFlowAction.cancel) {
-+					step = undefined;
-+				} else {
-+					throw err;
-+				}
-+			}
-+		}
-+		if (this.current) {
-+			this.current.dispose();
-+		}
-+	}
-+
-+	async showQuickPick<P extends QuickPickParameters>({ items, placeHolder, commands, shouldResume }: P) {
-+		const disposables: Disposable[] = [];
-+		try {
-+			return await new Promise<QuickPickItem | (P extends { commands: (infer I)[] } ? I : never)>((resolve, reject) => {
-+				const input = window.createQuickPick();
-+				input.placeholder = placeHolder;
-+				input.items = items;
-+				input.commands = [
-+					...(this.steps.length > 1 ? [backItem] : []),
-+					...(commands || [])
-+				];
-+				disposables.push(
-+					input,
-+					input.onDidTriggerCommand(item => {
-+						if (item === backItem) {
-+							reject(InputFlowAction.back);
-+						}
-+					}),
-+					input.onDidSelectItem(item => resolve(item)),
-+					input.onHide(() => {
-+						(async () => {
-+							reject(shouldResume && await shouldResume() ? InputFlowAction.resume : InputFlowAction.cancel);
-+						})()
-+							.catch(reject);
-+					})
-+				);
-+				if (this.current) {
-+					this.current.hide();
-+				}
-+				this.current = input;
-+				this.current.show();
-+			});
-+		} finally {
-+			disposables.forEach(d => d.dispose());
-+		}
-+	}
-+
-+	async showInputBox<P extends InputBoxParameters>({ prompt, validate, commands, shouldResume }: P) {
-+		const disposables: Disposable[] = [];
-+		try {
-+			return await new Promise<string | (P extends { commands: (infer I)[] } ? I : never)>((resolve, reject) => {
-+				const input = window.createInputBox();
-+				input.prompt = prompt;
-+				input.commands = [
-+					...(this.steps.length > 1 ? [backItem] : []),
-+					...(commands || [])
-+				];
-+				let validating = validate('');
-+				disposables.push(
-+					input,
-+					input.onDidTriggerCommand(item => {
-+						if (item === backItem) {
-+							reject(InputFlowAction.back);
-+						}
-+					}),
-+					input.onDidAccept(async text => {
-+						if (!(await validate(text))) {
-+							resolve(text);
-+						}
-+					}),
-+					input.onDidValueChange(async text => {
-+						const current = validate(text);
-+						validating = current;
-+						const validationMessage = await current;
-+						if (current === validating) {
-+							input.validationMessage = validationMessage;
-+						}
-+					}),
-+					input.onHide(() => {
-+						(async () => {
-+							reject(shouldResume && await shouldResume() ? InputFlowAction.resume : InputFlowAction.cancel);
-+						})()
-+							.catch(reject);
-+					})
-+				);
-+				if (this.current) {
-+					this.current.hide();
-+				}
-+				this.current = input;
-+				this.current.show();
-+			});
-+		} finally {
-+			disposables.forEach(d => d.dispose());
-+		}
-+	}
-+}
-+
-+
-+// ---------------------------------------------------------------------------------------
-+
-+
-+async function validateNameIsUnique(name: string) {
-+	// ...validate...
-+	await new Promise(resolve => setTimeout(resolve, 1000));
-+	return name === 'vscode' ? 'Name not unique' : undefined;
-+}
-+
-+async function getAvailableRuntimes(resourceGroup: QuickPickItem | string, token: CancellationToken): Promise<QuickPickItem[]> {
-+	// ...retrieve...
-+	await new Promise(resolve => setTimeout(resolve, 2000));
-+	return ['Node 8.9', 'Node 6.11', 'Node 4.5']
-+		.map(label => ({ label }));
-+}
-merged
-  result 100644 c9849d48e083fe1a719179065d190e1a803486f1 extensions/extension-editing/src/typings/ref.d.ts
-  our    100644 216911a680eb22a4ef86b9a54eb9ee28e67db23e extensions/extension-editing/src/typings/ref.d.ts
-@@ -4,3 +4,4 @@
-  *--------------------------------------------------------------------------------------------*/
- 
- /// <reference path='../../../../src/vs/vscode.d.ts'/>
-+/// <reference path='../../../../src/vs/vscode.proposed.d.ts'/>
-changed in both
-  base   100644 b7c2346400e7efe94ea5912bae2e6d5246679622 src/vs/vscode.proposed.d.ts
-  our    100644 3de4a7af9dda9e3e523ba4b5774f1667d66b0b9b src/vs/vscode.proposed.d.ts
-  their  100644 6bd99a8a26e991accc444355c48c107bf8f42eb4 src/vs/vscode.proposed.d.ts
-@@ -5,6 +5,8 @@
- 
- // This is the place for API experiments and proposals.
- 
-+import { QuickPickItem } from 'vscode';
-+
- declare module 'vscode' {
- 
- 	export namespace window {
-@@ -768,10 +770,98 @@
- 
- 	//#endregion
- 
-+<<<<<<< .our
- 	//#region mjbvz,joh: https://github.com/Microsoft/vscode/issues/43768
- 	export interface FileRenameEvent {
- 		readonly oldUri: Uri;
- 		readonly newUri: Uri;
-+=======
-+	//#region Multi-step input
-+
-+	export namespace window {
-+
-+		export function createQuickPick(): QuickPick;
-+		export function createInputBox(): InputBox;
-+	}
-+
-+	export interface QuickInput {
-+
-+		enabled: boolean;
-+
-+		busy: boolean;
-+
-+		show(): void;
-+
-+		hide(): void;
-+
-+		onHide: Event<void>;
-+
-+		dispose(): void;
-+	}
-+
-+	export interface QuickPick extends QuickInput {
-+
-+		value: string;
-+
-+		placeholder: string;
-+
-+		onDidValueChange: Event<string>;
-+
-+		onDidAccept: Event<string>;
-+
-+		commands: QuickInputCommand[];
-+
-+		onDidTriggerCommand: Event<QuickInputCommand>;
-+
-+		items: QuickPickItem[];
-+
-+		canSelectMany: boolean;
-+
-+		builtInFilter: boolean;
-+
-+		selectedItems: QuickPickItem[];
-+
-+		onDidSelectItem: Event<QuickPickItem>;
-+	}
-+
-+	export interface InputBox extends QuickInput {
-+
-+		value: string;
-+
-+		placeholder: string;
-+
-+		password: boolean;
-+
-+		onDidValueChange: Event<string>;
-+
-+		onDidAccept: Event<string>;
-+
-+		commands: QuickInputCommand[];
-+
-+		onDidTriggerCommand: Event<QuickInputCommand>;
-+
-+		prompt: string;
-+
-+		validationMessage: string;
-+	}
-+
-+	export interface QuickInputCommand {
-+		iconPath: string | Uri | { light: string | Uri; dark: string | Uri } | ThemeIcon;
-+		tooltip?: string | undefined;
-+	}
-+
-+	//#endregion
-+
-+	//#region mjbvz: Unused diagnostics
-+	/**
-+	 * Additional metadata about the type of diagnostic.
-+	 */
-+	export enum DiagnosticTag {
-+		/**
-+		 * Unused or unnecessary code.
-+		 */
-+		Unnecessary = 1,
-+>>>>>>> .their
- 	}
- 
- 	export interface FileWillRenameEvent {
diff --git a/app/test/fixtures/merge-parser/vscode/merge-chrmarti-quickinputapioptions-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-chrmarti-quickinputapioptions-into-master.txt
deleted file mode 100644
index 944ad1ccb77..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-chrmarti-quickinputapioptions-into-master.txt
+++ /dev/null
@@ -1,1792 +0,0 @@
-added in remote
-  their  100644 1153d81353884cac8a67f3af402f27bdc8ceb3e3 extensions/extension-editing/src/quickInputExploration.ts
-@@ -0,0 +1,1325 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+import { QuickInputToolbarItem3, ExtensionContext, commands, QuickPickItem, window, QuickInputSession9, QuickInput3, Disposable, CancellationToken, QuickInput7, QuickInput6, QuickInput11, QuickInputToolbarItem11, QuickInputCommand13, QuickInput13 } from 'vscode';
-+
-+export function activate(context: ExtensionContext) {
-+	context.subscriptions.push(commands.registerCommand('foobar', async () => {
-+		const inputs1 = await collectInputs1();
-+		const inputs2 = await collectInputs2();
-+		const inputs3 = await collectInputs3();
-+		const inputs4 = await collectInputs4();
-+		const inputs5 = await collectInputs5();
-+		const inputs6 = await collectInputs6();
-+		const inputs7 = await collectInputs7();
-+		const inputs8 = await collectInputs8();
-+		const inputs9 = await collectInputs9();
-+		const inputs10 = await collectInputs10();
-+		const inputs11 = await collectInputs11();
-+		const inputs12 = await collectInputs12();
-+		const inputs13 = await collectInputs13();
-+	}));
-+}
-+
-+const resourceGroups: QuickPickItem[] = ['vscode-data-function', 'vscode-website-microservices', 'vscode-website-monitor', 'vscode-website-preview', 'vscode-website-prod']
-+	.map(label => ({ label }));
-+
-+
-+
-+
-+// #region Take 1 --------------------------------------------------------------------------------
-+
-+async function collectInputs1() {
-+	return window.multiStepInput(async (input, token) => {
-+		const resourceGroup = await input.showQuickPick(resourceGroups, { placeHolder: 'Pick a resource group' });
-+		if (!resourceGroup || token.isCancellationRequested) {
-+			return undefined;
-+		}
-+		const name = await input.showInputBox({
-+			prompt: 'Choose a unique name',
-+			validateInput: value => validateNameIsUnique(value)
-+		});
-+		if (!name || token.isCancellationRequested) {
-+			return undefined;
-+		}
-+		const runtimes = await getAvailableRuntimes(resourceGroup, token);
-+		const runtime = await input.showQuickPick(runtimes, { placeHolder: 'Pick a runtime' });
-+		return { resourceGroup, name, runtime };
-+	});
-+}
-+
-+// #endregion
-+
-+// #region Take 2 --------------------------------------------------------------------------------
-+
-+async function collectInputs2() {
-+	const input = window.createQuickInput2();
-+	try {
-+		const resourceGroup = await input.showQuickPick(resourceGroups, { placeHolder: 'Pick a resource group' });
-+		if (!resourceGroup || input.token.isCancellationRequested) {
-+			return undefined;
-+		}
-+		const name = await input.showInputBox({
-+			prompt: 'Choose a unique name',
-+			validateInput: value => validateNameIsUnique(value)
-+		});
-+		if (!name || input.token.isCancellationRequested) {
-+			return undefined;
-+		}
-+		const runtimes = await getAvailableRuntimes(resourceGroup, input.token);
-+		const runtime = await input.showQuickPick(runtimes, { placeHolder: 'Pick a runtime' });
-+		return { resourceGroup, name, runtime };
-+	} finally {
-+		input.dispose();
-+	}
-+}
-+
-+// #endregion
-+
-+// #region Take 3 --------------------------------------------------------------------------------
-+
-+async function collectInputs3() {
-+	const input = window.createQuickInput3();
-+
-+	const resourceGroup = await showQuickPick3({
-+		input,
-+		placeHolder: 'Pick a resource group',
-+		items: resourceGroups
-+	});
-+	if (!resourceGroup) {
-+		return undefined;
-+	}
-+
-+	const name = await showInputBox3({
-+		input,
-+		prompt: 'Choose a unique name',
-+		validate: validateNameIsUnique
-+	});
-+	if (name === undefined) {
-+		return undefined;
-+	}
-+
-+	const runtimes = await getAvailableRuntimes(resourceGroup, null /* token */);
-+	const runtime = await showQuickPick3({
-+		input,
-+		placeHolder: 'Pick a runtime',
-+		items: runtimes
-+	});
-+	if (!runtime) {
-+		return undefined;
-+	}
-+
-+	input.hide();
-+	return { resourceGroup, name, runtime };
-+}
-+
-+interface QuickPickParameters3 {
-+	input: QuickInput3;
-+	items: QuickPickItem[];
-+	placeHolder: string;
-+}
-+
-+async function showQuickPick3({ input, items, placeHolder }: QuickPickParameters3) {
-+	const disposables: Disposable[] = [];
-+	try {
-+		return await new Promise<QuickPickItem>(resolve => {
-+			const { inputBox, message, list } = input;
-+			inputBox.visible = true;
-+			inputBox.placeholder = placeHolder;
-+			inputBox.text = '';
-+			message.visible = false;
-+			list.visible = true;
-+			list.items = items;
-+			disposables.push(
-+				list.onDidSelectItem(item => resolve(item)),
-+				input.onHide(() => resolve(undefined))
-+			);
-+			input.show();
-+		});
-+	} finally {
-+		disposables.forEach(d => d.dispose());
-+	}
-+}
-+
-+interface InputBoxParameters3 {
-+	input: QuickInput3;
-+	prompt: string;
-+	validate: (value: string) => Promise<string>;
-+}
-+
-+async function showInputBox3({ input, prompt, validate }: InputBoxParameters3) {
-+	const disposables: Disposable[] = [];
-+	try {
-+		return await new Promise<string>(resolve => {
-+			const { inputBox, message, list } = input;
-+			inputBox.visible = true;
-+			inputBox.placeholder = undefined;
-+			inputBox.text = '';
-+			message.visible = true;
-+			message.text = prompt;
-+			message.severity = 0;
-+			list.visible = true;
-+			list.items = undefined;
-+			let validating = validate('');
-+			disposables.push(
-+				inputBox.onDidAccept(async text => {
-+					if (!(await validate(text))) {
-+						resolve(text);
-+					}
-+				}),
-+				inputBox.onDidTextChange(async text => {
-+					const current = validate(text);
-+					validating = current;
-+					const validationMessage = await current;
-+					if (current === validating) {
-+						if (validationMessage) {
-+							message.text = validationMessage;
-+							message.severity = 2;
-+						} else {
-+							message.text = prompt;
-+							message.severity = 0;
-+						}
-+					}
-+				}),
-+				input.onHide(() => resolve(undefined))
-+			);
-+			input.show();
-+		});
-+	} finally {
-+		disposables.forEach(d => d.dispose());
-+	}
-+}
-+
-+// #endregion
-+
-+// #region Take 4 --------------------------------------------------------------------------------
-+
-+async function collectInputs4() {
-+	return window.multiStepInput4('resourceGroup', {
-+		resourceGroup: {
-+			kind: 'singlePick',
-+			items: resourceGroups,
-+			placeHolder: 'Pick a resource group',
-+			nextStep: 'name'
-+		},
-+		name: {
-+			kind: 'textInput',
-+			prompt: 'Choose a unique name',
-+			validateInput: value => validateNameIsUnique(value),
-+			nextStep: 'runtime'
-+		},
-+		runtime: {
-+			kind: 'singlePick',
-+			items: await getAvailableRuntimes(null /* inputs.resourceGroup */, null /* token */),
-+			placeHolder: 'Pick a runtime'
-+		},
-+	});
-+}
-+
-+// #endregion
-+
-+// #region Take 5 --------------------------------------------------------------------------------
-+
-+async function collectInputs5() {
-+	return window.multiStepInput5('resourceGroup', {
-+		resourceGroup: async input => ({
-+			value: input.showQuickPick(resourceGroups, { placeHolder: 'Pick a resource group' }),
-+			next: 'name'
-+		}),
-+		name: async input => ({
-+			value: input.showInputBox({
-+				prompt: 'Choose a unique name',
-+				validateInput: value => validateNameIsUnique(value)
-+			}),
-+			next: 'runtime'
-+		}),
-+		runtime: async (input, values) => {
-+			const runtimes = await getAvailableRuntimes(values.resourceGroup, input.token);
-+			return { value: input.showQuickPick(runtimes, { placeHolder: 'Pick a runtime' }) };
-+		}
-+	});
-+}
-+
-+// #endregion
-+
-+// #region Take 6 --------------------------------------------------------------------------------
-+
-+async function collectInputs6() {
-+	const result: Partial<Result> = {};
-+
-+	const resourceGroup = await window.showQuickPick(resourceGroups, {
-+		placeHolder: 'Pick a resource group',
-+		next: chooseName
-+	});
-+
-+	async function chooseName(input: QuickInput6, resourceGroup: QuickPickItem) {
-+		result.resourceGroup = resourceGroup;
-+		const name = await input.showInputBox({
-+			prompt: 'Choose a unique name',
-+			validateInput: value => validateNameIsUnique(value),
-+			next: chooseRuntime
-+		});
-+	}
-+
-+	async function chooseRuntime(input: QuickInput6, name: string) {
-+		result.name = name;
-+		const runtimes = await getAvailableRuntimes(result.resourceGroup, input.token);
-+		const runtime = await input.showQuickPick(runtimes, { placeHolder: 'Pick a runtime' });
-+		result.runtime = runtime;
-+	}
-+
-+	return <Result>result;
-+}
-+
-+// #endregion
-+
-+// #region Take 7 --------------------------------------------------------------------------------
-+
-+async function collectInputs7() {
-+	let step = 1;
-+	const result: Partial<Result> = {};
-+	await window.multiStepInput7({
-+		next: async input => {
-+			await collectInput7(input, result, ++step);
-+		},
-+		previous: async input => {
-+			await collectInput7(input, result, --step);
-+		},
-+		cancel: async input => {
-+			input.close();
-+		},
-+	});
-+	return <Result>result;
-+}
-+
-+async function collectInput7(input: QuickInput7, result: Partial<Result>, step: number) {
-+	switch (step) {
-+		case 1:
-+			result.resourceGroup = await input.showQuickPick(resourceGroups, { placeHolder: 'Pick a resource group' });
-+			break;
-+		case 2:
-+			result.name = await input.showInputBox({
-+				prompt: 'Choose a unique name',
-+				validateInput: value => validateNameIsUnique(value)
-+			});
-+			break;
-+		case 3:
-+			const runtimes = await getAvailableRuntimes(result.resourceGroup, input.token);
-+			result.runtime = await input.showQuickPick(runtimes, { placeHolder: 'Pick a runtime' });
-+			break;
-+		case 4:
-+			input.close();
-+			break;
-+	}
-+}
-+
-+// #endregion
-+
-+// #region Take 8 --------------------------------------------------------------------------------
-+
-+async function collectInputs8() {
-+	const session = window.createQuickInputSession();
-+	try {
-+		const resourceGroup = await window.showQuickPick(resourceGroups, { placeHolder: 'Pick a resource group', session });
-+		if (!resourceGroup || session.token.isCancellationRequested) {
-+			return undefined;
-+		}
-+		const name = await window.showInputBox({
-+			prompt: 'Choose a unique name',
-+			validateInput: value => validateNameIsUnique(value),
-+			session
-+		});
-+		if (!name || session.token.isCancellationRequested) {
-+			return undefined;
-+		}
-+		const runtimes = await getAvailableRuntimes(resourceGroup, session.token);
-+		const runtime = await window.showQuickPick(runtimes, { placeHolder: 'Pick a runtime', session });
-+		return { resourceGroup, name, runtime };
-+	} finally {
-+		session.dispose();
-+	}
-+}
-+
-+// #endregion
-+
-+// #region Take 9 --------------------------------------------------------------------------------
-+
-+async function collectInputs9() {
-+	// How to surface 'Back', 'Create Resource Group' as result?
-+
-+	const result: Partial<Result> = {};
-+
-+	window.multiStepInput9(async session => {
-+		result.resourceGroup = await window.showQuickPick(resourceGroups, {
-+			placeHolder: 'Pick a resource group',
-+			session
-+		});
-+		return chooseName;
-+	});
-+
-+	async function chooseName(session: QuickInputSession9) {
-+		result.name = await window.showInputBox({
-+			prompt: 'Choose a unique name',
-+			validateInput: value => validateNameIsUnique(value),
-+			session
-+		});
-+		return chooseRuntime;
-+	}
-+
-+	async function chooseRuntime(session: QuickInputSession9) {
-+		const runtimes = await getAvailableRuntimes(result.resourceGroup, session.token);
-+		const runtime = await window.showQuickPick(runtimes, { placeHolder: 'Pick a runtime', session });
-+		result.runtime = runtime;
-+	}
-+
-+	return <Result>result;
-+}
-+
-+// #endregion
-+
-+// #region Take 10 --------------------------------------------------------------------------------
-+
-+interface Result10 {
-+	resourceGroup: QuickPickItem | string;
-+	name: string;
-+	runtime: QuickPickItem;
-+}
-+
-+const createResourceGroupItem10 = { iconPath: 'createResourceGroup.svg' };
-+
-+async function collectInputs10() {
-+	const result: Partial<Result10> = {};
-+
-+	const multiStep = createMultiStepInput10([pickResourceGroup]);
-+	await stepThrough10(multiStep);
-+
-+	async function pickResourceGroup() {
-+		return showQuickPick10({
-+			multiStep,
-+			placeHolder: 'Pick a resource group',
-+			items: resourceGroups,
-+			toolbarItems: [createResourceGroupItem10],
-+			triggerToolbarItem: item => inputResourceGroupName,
-+			pick: item => {
-+				result.resourceGroup = item;
-+				return inputName;
-+			}
-+		});
-+	}
-+
-+	async function inputResourceGroupName() {
-+		return showInputBox10({
-+			multiStep,
-+			prompt: 'Choose a unique name for the resource group',
-+			validate: validateNameIsUnique,
-+			accept: text => {
-+				result.resourceGroup = text;
-+				return inputName;
-+			},
-+			shouldResume: suspend
-+		});
-+	}
-+
-+	async function inputName() {
-+		return showInputBox10({
-+			multiStep,
-+			prompt: 'Choose a unique name for the application service',
-+			validate: validateNameIsUnique,
-+			accept: text => {
-+				result.name = text;
-+				return pickRuntime;
-+			},
-+			shouldResume: suspend
-+		});
-+	}
-+
-+	async function pickRuntime() {
-+		const runtimes = await getAvailableRuntimes(result.resourceGroup, null /* token */);
-+		return showQuickPick10({
-+			multiStep,
-+			placeHolder: 'Pick a runtime',
-+			items: runtimes,
-+			pick: item => {
-+				result.runtime = item;
-+			},
-+			shouldResume: suspend
-+		});
-+	}
-+
-+	function suspend() {
-+		// Could show a notification with the option to resume.
-+		return new Promise<boolean>((resolve, reject) => {
-+
-+		});
-+	}
-+
-+	return <Result10>result;
-+}
-+
-+interface MultiStepInput10 {
-+	input: QuickInput3;
-+	steps: InputStep10[];
-+}
-+
-+function createMultiStepInput10(steps: InputStep10[]): MultiStepInput10 {
-+	return {
-+		input: window.createQuickInput3(),
-+		steps
-+	};
-+}
-+
-+type InputStep10 = (() => Thenable<InputStep10>) | void;
-+
-+async function stepThrough10(multiStep: MultiStepInput10) {
-+	let step = multiStep.steps.pop();
-+	while (step) {
-+		multiStep.steps.push(step);
-+		multiStep.input.enabled = false;
-+		multiStep.input.busy = true;
-+		try {
-+			step = await step();
-+		} catch (e) {
-+			if (e === 'back') {
-+				multiStep.steps.pop();
-+				step = multiStep.steps.pop();
-+			} if (e === 'resume') {
-+				multiStep.steps.pop();
-+			} else {
-+				throw e;
-+			}
-+		}
-+	}
-+	multiStep.input.hide();
-+}
-+
-+interface QuickPickParameters10 {
-+	multiStep: MultiStepInput10;
-+	items: QuickPickItem[];
-+	placeHolder: string;
-+	toolbarItems?: QuickInputToolbarItem3[]; // TODO
-+	triggerToolbarItem?: (item: QuickInputToolbarItem3) => InputStep10;
-+	pick: (item: QuickPickItem) => InputStep10;
-+	shouldResume?: () => Thenable<boolean>;
-+}
-+
-+const backItem10: QuickInputToolbarItem3 = { iconPath: 'back.svg' };
-+
-+async function showQuickPick10({ multiStep, items, placeHolder, pick, shouldResume }: QuickPickParameters10) {
-+	const disposables: Disposable[] = [];
-+	try {
-+		return await new Promise<InputStep10>((resolve, reject) => {
-+			const { input } = multiStep;
-+			const { inputBox, toolbar, message, list } = input;
-+			inputBox.visible = true;
-+			inputBox.placeholder = placeHolder;
-+			inputBox.text = '';
-+			message.visible = false;
-+			list.visible = true;
-+			list.items = items;
-+			toolbar.visible = multiStep.steps.length > 1;
-+			toolbar.toolbarItems = [backItem10];
-+			toolbar.onDidTriggerToolbarItem(item => {
-+				if (item === backItem10) {
-+					reject('back');
-+				}
-+			});
-+			disposables.push(
-+				list.onDidSelectItem(item => resolve(pick(item))),
-+				input.onHide(() => {
-+					if (shouldResume) {
-+						resolve(shouldResume().then(resume => {
-+							if (resume) {
-+								// tslint:disable-next-line:no-string-throw
-+								throw 'resume';
-+							}
-+						}));
-+					} else {
-+						resolve();
-+					}
-+				})
-+			);
-+			input.enabled = true;
-+			input.busy = false;
-+			input.show();
-+		});
-+	} finally {
-+		disposables.forEach(d => d.dispose());
-+	}
-+}
-+
-+interface InputBoxParameters10 {
-+	multiStep: MultiStepInput10;
-+	prompt: string;
-+	validate: (value: string) => Promise<string>;
-+	toolbarItems?: QuickInputToolbarItem3[]; // TODO
-+	triggerToolbarItem?: (item: QuickInputToolbarItem3) => InputStep10;
-+	accept: (text: string) => InputStep10;
-+	shouldResume?: () => Thenable<boolean>;
-+}
-+
-+async function showInputBox10({ multiStep, prompt, validate, accept, shouldResume }: InputBoxParameters10) {
-+	const disposables: Disposable[] = [];
-+	try {
-+		return await new Promise<InputStep10>((resolve, reject) => {
-+			const { input } = multiStep;
-+			const { inputBox, toolbar, message, list } = input;
-+			inputBox.visible = true;
-+			inputBox.placeholder = undefined;
-+			inputBox.text = '';
-+			message.visible = true;
-+			message.text = prompt;
-+			message.severity = 0;
-+			list.visible = true;
-+			list.items = undefined;
-+			toolbar.visible = multiStep.steps.length > 1;
-+			toolbar.toolbarItems = [backItem10];
-+			toolbar.onDidTriggerToolbarItem(item => {
-+				if (item === backItem10) {
-+					reject('back');
-+				}
-+			});
-+			let validating = validate('');
-+			disposables.push(
-+				inputBox.onDidAccept(async text => {
-+					if (!(await validate(text))) {
-+						resolve(accept(text));
-+					}
-+				}),
-+				inputBox.onDidTextChange(async text => {
-+					const current = validate(text);
-+					validating = current;
-+					const validationMessage = await current;
-+					if (current === validating) {
-+						if (validationMessage) {
-+							message.text = validationMessage;
-+							message.severity = 2;
-+						} else {
-+							message.text = prompt;
-+							message.severity = 0;
-+						}
-+					}
-+				}),
-+				input.onHide(() => {
-+					if (shouldResume) {
-+						resolve(shouldResume().then(resume => {
-+							if (resume) {
-+								// tslint:disable-next-line:no-string-throw
-+								throw 'resume';
-+							}
-+						}));
-+					} else {
-+						resolve();
-+					}
-+				})
-+			);
-+			input.enabled = true;
-+			input.busy = false;
-+			input.show();
-+		});
-+	} finally {
-+		disposables.forEach(d => d.dispose());
-+	}
-+}
-+
-+// #endregion
-+
-+// #region Take 11 --------------------------------------------------------------------------------
-+
-+interface Result11 {
-+	resourceGroup: QuickPickItem | string;
-+	name: string;
-+	runtime: QuickPickItem;
-+}
-+
-+async function collectInputs11() {
-+	return (await MultiStepInput11.run(pickResourceGroup11, {} as Partial<Result11>)) as Result11;
-+}
-+
-+class MyToolbarItem11 implements QuickInputToolbarItem11 {
-+	constructor(public iconPath: string) { }
-+}
-+
-+async function pickResourceGroup11(input: MultiStepInput11, state: Partial<Result11>) {
-+	const createResourceGroupItem11 = new MyToolbarItem11('createResourceGroup.svg');
-+	const pick = await input.showQuickPick11({
-+		placeHolder: 'Pick a resource group',
-+		items: resourceGroups,
-+		toolbarItems: [createResourceGroupItem11]
-+	});
-+	if (pick instanceof InputFlowAction11) {
-+		return pick;
-+	}
-+	if (pick instanceof MyToolbarItem11) {
-+		return inputResourceGroupName11;
-+	}
-+	state.resourceGroup = pick;
-+	return inputName11;
-+}
-+
-+async function inputResourceGroupName11(input: MultiStepInput11, state: Partial<Result11>) {
-+	const name = await input.showInputBox11({
-+		prompt: 'Choose a unique name for the resource group',
-+		validate: validateNameIsUnique
-+	});
-+	if (name === InputFlowAction11.cancel && await suspend11()) {
-+		return InputFlowAction11.resume;
-+	}
-+	if (name instanceof InputFlowAction11) {
-+		return name;
-+	}
-+	state.resourceGroup = name;
-+	return inputName11;
-+}
-+
-+async function inputName11(input: MultiStepInput11, state: Partial<Result11>) {
-+	const name = await input.showInputBox11({
-+		prompt: 'Choose a unique name for the application service',
-+		validate: validateNameIsUnique
-+	});
-+	if (name === InputFlowAction11.cancel && await suspend11()) {
-+		return InputFlowAction11.resume;
-+	}
-+	if (name instanceof InputFlowAction11) {
-+		return name;
-+	}
-+	state.name = name;
-+	return pickRuntime11;
-+}
-+
-+async function pickRuntime11(input: MultiStepInput11, state: Partial<Result11>) {
-+	const runtimes = await getAvailableRuntimes(state.resourceGroup, null /* token */);
-+	const runtime = await input.showQuickPick11({
-+		placeHolder: 'Pick a runtime',
-+		items: runtimes
-+	});
-+	if (runtime === InputFlowAction11.cancel && await suspend11()) {
-+		return InputFlowAction11.resume;
-+	}
-+	if (runtime instanceof InputFlowAction11) {
-+		return runtime;
-+	}
-+	state.runtime = runtime;
-+}
-+
-+function suspend11() {
-+	// Could show a notification with the option to resume.
-+	return new Promise<boolean>((resolve, reject) => {
-+
-+	});
-+}
-+
-+class InputFlowAction11 {
-+	private constructor() { }
-+	static back = new InputFlowAction11();
-+	static cancel = new InputFlowAction11();
-+	static resume = new InputFlowAction11();
-+}
-+
-+type InputStep11<T> = (input: MultiStepInput11, state: T) => Thenable<InputStep11<T> | InputFlowAction11 | void>;
-+
-+interface QuickPickParameters11 {
-+	items: QuickPickItem[];
-+	placeHolder: string;
-+	toolbarItems?: QuickInputToolbarItem11[]; // TODO
-+}
-+
-+interface InputBoxParameters11 {
-+	prompt: string;
-+	validate: (value: string) => Promise<string>;
-+	toolbarItems?: QuickInputToolbarItem11[]; // TODO
-+}
-+
-+const backItem11: QuickInputToolbarItem11 = { iconPath: 'back.svg' };
-+
-+class MultiStepInput11 {
-+
-+	static async run<T>(start: InputStep11<T>, state: T) {
-+		const input = new MultiStepInput11();
-+		return input.stepThrough11(start, state);
-+	}
-+
-+	private current?: QuickInput11;
-+	private steps: InputStep11<any>[] = [];
-+
-+	private async stepThrough11<T>(start: InputStep11<T>, state: T) {
-+		let step: InputStep11<T> | void = start;
-+		while (step) {
-+			this.steps.push(step);
-+			if (this.current) {
-+				this.current.enabled = false;
-+				this.current.busy = true;
-+			}
-+			let next = await step(this, state);
-+			if (next === 'back') {
-+				this.steps.pop();
-+				step = this.steps.pop();
-+			} if (next === 'resume') {
-+				step = this.steps.pop();
-+			} else {
-+				step = next;
-+			}
-+		}
-+		if (this.current) {
-+			this.current.dispose();
-+		}
-+		return state;
-+	}
-+
-+	async showQuickPick11<P extends QuickPickParameters11>({ items, placeHolder }: P) {
-+		const disposables: Disposable[] = [];
-+		try {
-+			return await new Promise<QuickPickItem | (P extends { toolbarItems: (infer I)[] } ? I : never) | InputFlowAction11>((resolve, reject) => {
-+				const input = window.createQuickPick11();
-+				const { inputBox, toolbar, list } = input;
-+				inputBox.placeholder = placeHolder;
-+				list.items = items;
-+				toolbar.toolbarItems = this.steps.length > 1 ? [backItem11] : [];
-+				disposables.push(
-+					input,
-+					toolbar.onDidTriggerToolbarItem(item => {
-+						if (item === backItem11) {
-+							resolve(InputFlowAction11.back);
-+						}
-+					}),
-+					list.onDidSelectItem(item => resolve(item)),
-+					input.onHide(() => resolve(InputFlowAction11.cancel))
-+				);
-+				if (this.current) {
-+					this.current.replace(input);
-+				} else {
-+					input.show();
-+				}
-+				this.current = input;
-+			});
-+		} finally {
-+			disposables.forEach(d => d.dispose());
-+		}
-+	}
-+
-+	async showInputBox11<P extends InputBoxParameters11>({ prompt, validate }: P) {
-+		const disposables: Disposable[] = [];
-+		try {
-+			return await new Promise<string | (P extends { toolbarItems: QuickInputToolbarItem11[] } ? QuickInputToolbarItem11 : never) | InputFlowAction11>((resolve, reject) => {
-+				const input = window.createInputBox11();
-+				const { inputBox, toolbar, message } = input;
-+				message.text = prompt;
-+				message.severity = 0;
-+				toolbar.toolbarItems = this.steps.length > 1 ? [backItem11] : [];
-+				let validating = validate('');
-+				disposables.push(
-+					input,
-+					toolbar.onDidTriggerToolbarItem(item => {
-+						if (item === backItem11) {
-+							resolve(InputFlowAction11.back);
-+						}
-+					}),
-+					inputBox.onDidAccept(async text => {
-+						if (!(await validate(text))) {
-+							resolve(text);
-+						}
-+					}),
-+					inputBox.onDidTextChange(async text => {
-+						const current = validate(text);
-+						validating = current;
-+						const validationMessage = await current;
-+						if (current === validating) {
-+							if (validationMessage) {
-+								message.text = validationMessage;
-+								message.severity = 2;
-+							} else {
-+								message.text = prompt;
-+								message.severity = 0;
-+							}
-+						}
-+					}),
-+					input.onHide(() => resolve(InputFlowAction11.cancel))
-+				);
-+				if (this.current) {
-+					this.current.replace(input);
-+				} else {
-+					input.show();
-+				}
-+				this.current = input;
-+			});
-+		} finally {
-+			disposables.forEach(d => d.dispose());
-+		}
-+	}
-+}
-+
-+// #endregion
-+
-+// #region Take 12 --------------------------------------------------------------------------------
-+
-+interface Result12 {
-+	resourceGroup: QuickPickItem | string;
-+	name: string;
-+	runtime: QuickPickItem;
-+}
-+
-+async function collectInputs12() {
-+	const result = {} as Partial<Result12>;
-+	await MultiStepInput12.run(input => pickResourceGroup12(input, {}));
-+	return result;
-+}
-+
-+class MyToolbarItem12 implements QuickInputToolbarItem11 {
-+	constructor(public iconPath: string) { }
-+}
-+
-+async function pickResourceGroup12(input: MultiStepInput12, state: Partial<Result12>) {
-+	const createResourceGroupItem12 = new MyToolbarItem12('createResourceGroup.svg');
-+	const pick = await input.showQuickPick12({
-+		placeHolder: 'Pick a resource group',
-+		items: resourceGroups,
-+		toolbarItems: [createResourceGroupItem12],
-+		shouldResume: shouldResume12
-+	});
-+	if (pick instanceof MyToolbarItem12) {
-+		return (input: MultiStepInput12) => inputResourceGroupName12(input, state);
-+	}
-+	state.resourceGroup = pick;
-+	return (input: MultiStepInput12) => inputName12(input, state);
-+}
-+
-+async function inputResourceGroupName12(input: MultiStepInput12, state: Partial<Result12>) {
-+	state.resourceGroup = await input.showInputBox12({
-+		prompt: 'Choose a unique name for the resource group',
-+		validate: validateNameIsUnique,
-+		shouldResume: shouldResume12
-+	});
-+	return (input: MultiStepInput12) => inputName12(input, state);
-+}
-+
-+async function inputName12(input: MultiStepInput12, state: Partial<Result12>) {
-+	state.name = await input.showInputBox12({
-+		prompt: 'Choose a unique name for the application service',
-+		validate: validateNameIsUnique,
-+		shouldResume: shouldResume12
-+	});
-+	return (input: MultiStepInput12) => pickRuntime12(input, state);
-+}
-+
-+async function pickRuntime12(input: MultiStepInput12, state: Partial<Result12>) {
-+	const runtimes = await getAvailableRuntimes(state.resourceGroup, null /* token */);
-+	state.runtime = await input.showQuickPick12({
-+		placeHolder: 'Pick a runtime',
-+		items: runtimes,
-+		shouldResume: shouldResume12
-+	});
-+}
-+
-+function shouldResume12() {
-+	// Could show a notification with the option to resume.
-+	return new Promise<boolean>((resolve, reject) => {
-+
-+	});
-+}
-+
-+class InputFlowAction12 {
-+	private constructor() { }
-+	static back = new InputFlowAction12();
-+	static cancel = new InputFlowAction12();
-+	static resume = new InputFlowAction12();
-+}
-+
-+type InputStep12 = (input: MultiStepInput12) => Thenable<InputStep12 | void>;
-+
-+interface QuickPickParameters12 {
-+	items: QuickPickItem[];
-+	placeHolder: string;
-+	toolbarItems?: QuickInputToolbarItem11[];
-+	shouldResume: () => Thenable<boolean>;
-+}
-+
-+interface InputBoxParameters12 {
-+	prompt: string;
-+	validate: (value: string) => Promise<string>;
-+	toolbarItems?: QuickInputToolbarItem11[];
-+	shouldResume: () => Thenable<boolean>;
-+}
-+
-+const backItem12: QuickInputToolbarItem11 = { iconPath: 'back.svg' };
-+
-+class MultiStepInput12 {
-+
-+	static async run<T>(start: InputStep12) {
-+		const input = new MultiStepInput12();
-+		return input.stepThrough12(start);
-+	}
-+
-+	private current?: QuickInput11;
-+	private steps: InputStep12[] = [];
-+
-+	private async stepThrough12<T>(start: InputStep12) {
-+		let step: InputStep12 | void = start;
-+		while (step) {
-+			this.steps.push(step);
-+			if (this.current) {
-+				this.current.enabled = false;
-+				this.current.busy = true;
-+			}
-+			try {
-+				step = await step(this);
-+			} catch (err) {
-+				if (err === InputFlowAction12.back) {
-+					this.steps.pop();
-+					step = this.steps.pop();
-+				} else if (err === InputFlowAction12.resume) {
-+					step = this.steps.pop();
-+				} else if (err === InputFlowAction12.cancel) {
-+					step = undefined;
-+				} else {
-+					throw err;
-+				}
-+			}
-+		}
-+		if (this.current) {
-+			this.current.dispose();
-+		}
-+	}
-+
-+	async showQuickPick12<P extends QuickPickParameters12>({ items, placeHolder, toolbarItems, shouldResume }: P) {
-+		const disposables: Disposable[] = [];
-+		try {
-+			return await new Promise<QuickPickItem | (P extends { toolbarItems: (infer I)[] } ? I : never)>((resolve, reject) => {
-+				const input = window.createQuickPick11();
-+				const { inputBox, toolbar, list } = input;
-+				inputBox.placeholder = placeHolder;
-+				list.items = items;
-+				toolbar.toolbarItems = [
-+					...(this.steps.length > 1 ? [backItem12] : []),
-+					...(toolbarItems || [])
-+				];
-+				disposables.push(
-+					input,
-+					toolbar.onDidTriggerToolbarItem(item => {
-+						if (item === backItem12) {
-+							reject(InputFlowAction12.back);
-+						}
-+					}),
-+					list.onDidSelectItem(item => resolve(item)),
-+					input.onHide(() => {
-+						(async () => {
-+							reject(shouldResume && await shouldResume() ? InputFlowAction12.resume : InputFlowAction12.cancel);
-+						})()
-+							.catch(reject);
-+					})
-+				);
-+				if (this.current) {
-+					this.current.replace(input);
-+				} else {
-+					input.show();
-+				}
-+				this.current = input;
-+			});
-+		} finally {
-+			disposables.forEach(d => d.dispose());
-+		}
-+	}
-+
-+	async showInputBox12<P extends InputBoxParameters12>({ prompt, validate, toolbarItems, shouldResume }: P) {
-+		const disposables: Disposable[] = [];
-+		try {
-+			return await new Promise<string | (P extends { toolbarItems: (infer I)[] } ? I : never)>((resolve, reject) => {
-+				const input = window.createInputBox11();
-+				const { inputBox, toolbar, message } = input;
-+				message.text = prompt;
-+				message.severity = 0;
-+				toolbar.toolbarItems = [
-+					...(this.steps.length > 1 ? [backItem12] : []),
-+					...(toolbarItems || [])
-+				];
-+				let validating = validate('');
-+				disposables.push(
-+					input,
-+					toolbar.onDidTriggerToolbarItem(item => {
-+						if (item === backItem12) {
-+							reject(InputFlowAction12.back);
-+						}
-+					}),
-+					inputBox.onDidAccept(async text => {
-+						if (!(await validate(text))) {
-+							resolve(text);
-+						}
-+					}),
-+					inputBox.onDidTextChange(async text => {
-+						const current = validate(text);
-+						validating = current;
-+						const validationMessage = await current;
-+						if (current === validating) {
-+							if (validationMessage) {
-+								message.text = validationMessage;
-+								message.severity = 2;
-+							} else {
-+								message.text = prompt;
-+								message.severity = 0;
-+							}
-+						}
-+					}),
-+					input.onHide(() => {
-+						(async () => {
-+							reject(shouldResume && await shouldResume() ? InputFlowAction12.resume : InputFlowAction12.cancel);
-+						})()
-+							.catch(reject);
-+					})
-+				);
-+				if (this.current) {
-+					this.current.replace(input);
-+				} else {
-+					input.show();
-+				}
-+				this.current = input;
-+			});
-+		} finally {
-+			disposables.forEach(d => d.dispose());
-+		}
-+	}
-+}
-+
-+// #endregion
-+
-+// #region Take 13 --------------------------------------------------------------------------------
-+
-+interface Result13 {
-+	resourceGroup: QuickPickItem | string;
-+	name: string;
-+	runtime: QuickPickItem;
-+}
-+
-+async function collectInputs13() {
-+	const result = {} as Partial<Result13>;
-+	await MultiStepInput13.run(input => pickResourceGroup13(input, {}));
-+	return result;
-+}
-+
-+class MyCommand13 implements QuickInputCommand13 {
-+	constructor(public iconPath: string) { }
-+}
-+
-+async function pickResourceGroup13(input: MultiStepInput13, state: Partial<Result13>) {
-+	const createResourceGroupItem13 = new MyCommand13('createResourceGroup.svg');
-+	const pick = await input.showQuickPick13({
-+		placeHolder: 'Pick a resource group',
-+		items: resourceGroups,
-+		commands: [createResourceGroupItem13],
-+		shouldResume: shouldResume13
-+	});
-+	if (pick instanceof MyCommand13) {
-+		return (input: MultiStepInput13) => inputResourceGroupName13(input, state);
-+	}
-+	state.resourceGroup = pick;
-+	return (input: MultiStepInput13) => inputName13(input, state);
-+}
-+
-+async function inputResourceGroupName13(input: MultiStepInput13, state: Partial<Result13>) {
-+	state.resourceGroup = await input.showInputBox13({
-+		prompt: 'Choose a unique name for the resource group',
-+		validate: validateNameIsUnique,
-+		shouldResume: shouldResume13
-+	});
-+	return (input: MultiStepInput13) => inputName13(input, state);
-+}
-+
-+async function inputName13(input: MultiStepInput13, state: Partial<Result13>) {
-+	state.name = await input.showInputBox13({
-+		prompt: 'Choose a unique name for the application service',
-+		validate: validateNameIsUnique,
-+		shouldResume: shouldResume13
-+	});
-+	return (input: MultiStepInput13) => pickRuntime13(input, state);
-+}
-+
-+async function pickRuntime13(input: MultiStepInput13, state: Partial<Result13>) {
-+	const runtimes = await getAvailableRuntimes(state.resourceGroup, null /* token */);
-+	state.runtime = await input.showQuickPick13({
-+		placeHolder: 'Pick a runtime',
-+		items: runtimes,
-+		shouldResume: shouldResume13
-+	});
-+}
-+
-+function shouldResume13() {
-+	// Could show a notification with the option to resume.
-+	return new Promise<boolean>((resolve, reject) => {
-+
-+	});
-+}
-+
-+class InputFlowAction13 {
-+	private constructor() { }
-+	static back = new InputFlowAction13();
-+	static cancel = new InputFlowAction13();
-+	static resume = new InputFlowAction13();
-+}
-+
-+type InputStep13 = (input: MultiStepInput13) => Thenable<InputStep13 | void>;
-+
-+interface QuickPickParameters13 {
-+	items: QuickPickItem[];
-+	placeHolder: string;
-+	commands?: QuickInputCommand13[];
-+	shouldResume: () => Thenable<boolean>;
-+}
-+
-+interface InputBoxParameters13 {
-+	prompt: string;
-+	validate: (value: string) => Promise<string>;
-+	commands?: QuickInputCommand13[];
-+	shouldResume: () => Thenable<boolean>;
-+}
-+
-+const backItem13: QuickInputCommand13 = { iconPath: 'back.svg' };
-+
-+class MultiStepInput13 {
-+
-+	static async run<T>(start: InputStep13) {
-+		const input = new MultiStepInput13();
-+		return input.stepThrough13(start);
-+	}
-+
-+	private current?: QuickInput13;
-+	private steps: InputStep13[] = [];
-+
-+	private async stepThrough13<T>(start: InputStep13) {
-+		let step: InputStep13 | void = start;
-+		while (step) {
-+			this.steps.push(step);
-+			if (this.current) {
-+				this.current.enabled = false;
-+				this.current.busy = true;
-+			}
-+			try {
-+				step = await step(this);
-+			} catch (err) {
-+				if (err === InputFlowAction13.back) {
-+					this.steps.pop();
-+					step = this.steps.pop();
-+				} else if (err === InputFlowAction13.resume) {
-+					step = this.steps.pop();
-+				} else if (err === InputFlowAction13.cancel) {
-+					step = undefined;
-+				} else {
-+					throw err;
-+				}
-+			}
-+		}
-+		if (this.current) {
-+			this.current.dispose();
-+		}
-+	}
-+
-+	async showQuickPick13<P extends QuickPickParameters13>({ items, placeHolder, commands, shouldResume }: P) {
-+		const disposables: Disposable[] = [];
-+		try {
-+			return await new Promise<QuickPickItem | (P extends { commands: (infer I)[] } ? I : never)>((resolve, reject) => {
-+				const input = window.createQuickPick13();
-+				input.placeholder = placeHolder;
-+				input.items = items;
-+				input.commands = [
-+					...(this.steps.length > 1 ? [backItem13] : []),
-+					...(commands || [])
-+				];
-+				disposables.push(
-+					input,
-+					input.onDidTriggerCommand(item => {
-+						if (item === backItem13) {
-+							reject(InputFlowAction13.back);
-+						}
-+					}),
-+					input.onDidSelectItem(item => resolve(item)),
-+					input.onHide(() => {
-+						(async () => {
-+							reject(shouldResume && await shouldResume() ? InputFlowAction13.resume : InputFlowAction13.cancel);
-+						})()
-+							.catch(reject);
-+					})
-+				);
-+				if (this.current) {
-+					this.current.hide();
-+				}
-+				this.current = input;
-+				this.current.show();
-+			});
-+		} finally {
-+			disposables.forEach(d => d.dispose());
-+		}
-+	}
-+
-+	async showInputBox13<P extends InputBoxParameters13>({ prompt, validate, commands, shouldResume }: P) {
-+		const disposables: Disposable[] = [];
-+		try {
-+			return await new Promise<string | (P extends { commands: (infer I)[] } ? I : never)>((resolve, reject) => {
-+				const input = window.createInputBox13();
-+				input.prompt = prompt;
-+				input.commands = [
-+					...(this.steps.length > 1 ? [backItem13] : []),
-+					...(commands || [])
-+				];
-+				let validating = validate('');
-+				disposables.push(
-+					input,
-+					input.onDidTriggerCommand(item => {
-+						if (item === backItem13) {
-+							reject(InputFlowAction13.back);
-+						}
-+					}),
-+					input.onDidAccept(async text => {
-+						if (!(await validate(text))) {
-+							resolve(text);
-+						}
-+					}),
-+					input.onDidValueChange(async text => {
-+						const current = validate(text);
-+						validating = current;
-+						const validationMessage = await current;
-+						if (current === validating) {
-+							input.validationMessage = validationMessage;
-+						}
-+					}),
-+					input.onHide(() => {
-+						(async () => {
-+							reject(shouldResume && await shouldResume() ? InputFlowAction13.resume : InputFlowAction13.cancel);
-+						})()
-+							.catch(reject);
-+					})
-+				);
-+				if (this.current) {
-+					this.current.hide();
-+				}
-+				this.current = input;
-+				this.current.show();
-+			});
-+		} finally {
-+			disposables.forEach(d => d.dispose());
-+		}
-+	}
-+}
-+
-+// #endregion
-+
-+
-+
-+// ---------------------------------------------------------------------------------------
-+
-+
-+interface Result {
-+	resourceGroup: QuickPickItem;
-+	name: string;
-+	runtime: QuickPickItem;
-+}
-+
-+async function validateNameIsUnique(name: string) {
-+	// ...validate...
-+	await new Promise(resolve => setTimeout(resolve, 1000));
-+	return name === 'vscode' ? 'Name not unique' : undefined;
-+}
-+
-+async function getAvailableRuntimes(resourceGroup: QuickPickItem | string, token: CancellationToken): Promise<QuickPickItem[]> {
-+	// ...retrieve...
-+	await new Promise(resolve => setTimeout(resolve, 2000));
-+	return ['Node 8.9', 'Node 6.11', 'Node 4.5']
-+		.map(label => ({ label }));
-+}
-merged
-  result 100644 c9849d48e083fe1a719179065d190e1a803486f1 extensions/extension-editing/src/typings/ref.d.ts
-  our    100644 216911a680eb22a4ef86b9a54eb9ee28e67db23e extensions/extension-editing/src/typings/ref.d.ts
-@@ -4,3 +4,4 @@
-  *--------------------------------------------------------------------------------------------*/
- 
- /// <reference path='../../../../src/vs/vscode.d.ts'/>
-+/// <reference path='../../../../src/vs/vscode.proposed.d.ts'/>
-changed in both
-  base   100644 97a964e0335a2d322c551f1684118a69025e2476 src/vs/vscode.proposed.d.ts
-  our    100644 3de4a7af9dda9e3e523ba4b5774f1667d66b0b9b src/vs/vscode.proposed.d.ts
-  their  100644 7c89352d7be1f406633a868411651a51ac7c8409 src/vs/vscode.proposed.d.ts
-@@ -5,6 +5,8 @@
- 
- // This is the place for API experiments and proposals.
- 
-+import { QuickPickItem } from 'vscode';
-+
- declare module 'vscode' {
- 
- 	export namespace window {
-@@ -768,10 +770,26 @@
- 
- 	//#endregion
- 
-+<<<<<<< .our
- 	//#region mjbvz,joh: https://github.com/Microsoft/vscode/issues/43768
- 	export interface FileRenameEvent {
- 		readonly oldUri: Uri;
- 		readonly newUri: Uri;
-+=======
-+	//#region Multi-step input
-+
-+	//#region Take 1
-+
-+	export namespace window {
-+
-+		/**
-+		 * Collect multiple inputs from the user. The provided handler will be called with a
-+		 * [`QuickInput`](#QuickInput) that should be used to control the UI.
-+		 *
-+		 * @param handler The callback that will collect the inputs.
-+		 */
-+		export function multiStepInput<T>(handler: (input: QuickInput, token: CancellationToken) => Thenable<T>, token?: CancellationToken): Thenable<T>;
-+>>>>>>> .their
- 	}
- 
- 	export interface FileWillRenameEvent {
-@@ -785,4 +803,415 @@
- 		export const onDidRenameFile: Event<FileRenameEvent>;
- 	}
- 	//#endregion
-+
-+	//#region Take 2
-+
-+	export namespace window {
-+
-+		/**
-+		 * Start collecting multiple inputs from the user. The returned
-+		 * [`QuickInput2`](#QuickInput2) should be used to control the UI.
-+		 *
-+		 * Note that this API is only needed when collecting multiple inputs.
-+		 * For single inputs, the input functions on [`window`](#window) can be used.
-+		 *
-+		 * @return A [`QuickInput2`](#QuickInput2) to control the UI.
-+		 */
-+		export function createQuickInput2(): QuickInput2;
-+	}
-+
-+	/**
-+	 * Controls the UI within a multi-step input session.
-+	 */
-+	export interface QuickInput2 {
-+
-+		/**
-+		 * A cancellation token indicating when this multi-step input session was
-+		 * canceled by the user (either directly or by triggering another input session).
-+		 */
-+		token: CancellationToken;
-+
-+		showQuickPick: typeof window.showQuickPick;
-+
-+		showInputBox: typeof window.showInputBox;
-+
-+		/**
-+		 * Dispose the input object and associated resources.
-+		 */
-+		dispose(): void;
-+	}
-+
-+	//#endregion
-+
-+	//#region Take 3
-+
-+	export namespace window {
-+
-+		export function createQuickInput3(): QuickInput3;
-+	}
-+
-+	/**
-+	 * Controls the UI within a input session.
-+	 */
-+	export interface QuickInput3 {
-+
-+		inputBox: {
-+			visible: boolean;
-+
-+			text: string | undefined;
-+
-+			placeholder: string | undefined;
-+
-+			onDidTextChange: Event<string>;
-+
-+			onDidAccept: Event<string>;
-+		};
-+
-+		toolbar: {
-+			// TODO: Investigate using commands.
-+
-+			visible: boolean;
-+
-+			toolbarItems: QuickInputToolbarItem3[] | undefined;
-+
-+			onDidTriggerToolbarItem: Event<QuickInputToolbarItem3>;
-+		};
-+
-+		list: {
-+			visible: boolean;
-+
-+			items: QuickPickItem[] | undefined;
-+
-+			canSelectMany: boolean;
-+
-+			selectedItems: QuickPickItem[];
-+
-+			onDidSelectItem: Event<QuickPickItem>;
-+		};
-+
-+		message: {
-+			visible: boolean;
-+
-+			text: string;
-+
-+			severity: number;
-+		};
-+
-+		enabled: boolean;
-+		busy: boolean;
-+
-+		show(): void;
-+
-+		hide(): void;
-+
-+		onHide: Event<void>;
-+
-+		dispose(): void;
-+	}
-+
-+	export interface QuickInputToolbarItem3 {
-+		iconPath: string | Uri | { light: string | Uri; dark: string | Uri } | ThemeIcon;
-+		tooltip?: string | undefined;
-+	}
-+
-+	//#endregion
-+
-+	//#region Take 4
-+
-+	type MultiStepInput = { [id: string]: InputStep<any> };
-+
-+	type InputStep<T> = SinglePickStep<T extends QuickPickItem ? T : never> | TextInputStep<T extends string ? T : never>;
-+	interface SinglePickStep<T extends QuickPickItem> {
-+		kind: 'singlePick';
-+		items: T[];
-+		placeHolder: string;
-+		nextStep?: string;
-+	}
-+	interface TextInputStep<T extends string> {
-+		kind: 'textInput';
-+		prompt: string;
-+		validateInput: (value: string) => Thenable<string>;
-+		nextStep?: string;
-+	}
-+
-+	type Inputs<T extends MultiStepInput> = { [P in keyof T]: SingleInput<T[P]> };
-+	type SingleInput<T> =
-+		T extends SinglePickStep<infer R> ? R :
-+		T extends TextInputStep<infer R> ? R :
-+		never;
-+
-+	export namespace window {
-+		export function multiStepInput4<T extends MultiStepInput>(firstStep: keyof T, steps: T): Thenable<Inputs<T>>;
-+	}
-+
-+	//#endregion
-+
-+	//#region Take 5
-+
-+	type MultiStepInput5 = { [id: string]: InputStep5<any> };
-+
-+	interface InputStep5<T> {
-+		(input: QuickInput5, values: any): Thenable<{ value: T, next?: string; }>;
-+	}
-+
-+	type Inputs5<T extends MultiStepInput5> = { [P in keyof T]: SingleInput5<T[P]> };
-+	type SingleInput5<T> = T extends InputStep5<infer R> ? R : never;
-+
-+	export namespace window {
-+		export function multiStepInput5<T extends MultiStepInput5>(firstStep: keyof T, steps: T): Thenable<Inputs5<T>>;
-+	}
-+
-+	export interface QuickInput5 {
-+		token: CancellationToken;
-+		showQuickPick: typeof window.showQuickPick;
-+		showInputBox: typeof window.showInputBox;
-+	}
-+
-+	//#endregion
-+
-+	//#region Take 6
-+
-+	export interface QuickPickOptions {
-+		next?: (input: QuickInput6, result: QuickPickItem) => Promise<void> | undefined;
-+	}
-+
-+	export interface InputBoxOptions {
-+		next?: (input: QuickInput6, result: string) => Promise<void> | undefined;
-+	}
-+
-+	export interface QuickInput6 {
-+		token: CancellationToken;
-+		showQuickPick: typeof window.showQuickPick;
-+		showInputBox: typeof window.showInputBox;
-+	}
-+
-+	//#endregion
-+
-+	//#region Take 7
-+
-+	export namespace window {
-+		export function multiStepInput7<T>(nav: InputNavigation): Thenable<T>;
-+	}
-+
-+	export interface InputNavigation {
-+		next(input: QuickInput7): Thenable<void>;
-+		previous(input: QuickInput7): Thenable<void>;
-+		cancel(input: QuickInput7): Thenable<void>;
-+	}
-+
-+	export interface QuickInput7 {
-+		token: CancellationToken;
-+		showQuickPick: typeof window.showQuickPick;
-+		showInputBox: typeof window.showInputBox;
-+		close: () => void;
-+	}
-+
-+	//#endregion
-+
-+	//#region Take 8
-+
-+	export namespace window {
-+		export function createQuickInputSession(): QuickInputSession8;
-+	}
-+
-+	export interface QuickInputSession8 {
-+		token: CancellationToken;
-+		dispose(): void;
-+	}
-+
-+	export interface QuickPickOptions {
-+		session?: QuickInputSession8;
-+	}
-+
-+	export interface InputBoxOptions {
-+		session?: QuickInputSession8;
-+	}
-+
-+	//#endregion
-+
-+	//#region Take 9
-+
-+	type InputStep9 = (session: QuickInputSession9) => Thenable<InputStep9 | void>;
-+
-+	export namespace window {
-+		export function multiStepInput9(step: InputStep9): Thenable<void>;
-+	}
-+
-+	export interface QuickInputSession9 {
-+		token: CancellationToken;
-+		dispose(): void;
-+	}
-+
-+	//#endregion
-+
-+	//#region Take 11
-+
-+	export namespace window {
-+
-+		export function createQuickPick11(): QuickPick11;
-+		export function createInputBox11(): InputBox11;
-+	}
-+
-+	export interface QuickInput11 {
-+
-+		enabled: boolean;
-+		busy: boolean;
-+
-+		show(): void;
-+
-+		hide(): void;
-+
-+		onHide: Event<void>;
-+
-+		replace(input: QuickInput11): void;
-+
-+		dispose(): void;
-+	}
-+
-+	export interface QuickPick11 extends QuickInput11 {
-+
-+		inputBox: {
-+			text: string;
-+
-+			placeholder: string;
-+
-+			onDidTextChange: Event<string>;
-+
-+			onDidAccept: Event<string>;
-+		};
-+
-+		toolbar: {
-+			// TODO: Investigate using commands.
-+
-+			toolbarItems: QuickInputToolbarItem11[];
-+
-+			onDidTriggerToolbarItem: Event<QuickInputToolbarItem11>;
-+		};
-+
-+		list: {
-+			items: QuickPickItem[];
-+
-+			canSelectMany: boolean;
-+
-+			builtInFilter: boolean;
-+
-+			selectedItems: QuickPickItem[];
-+
-+			onDidSelectItem: Event<QuickPickItem>;
-+		};
-+	}
-+
-+	export interface InputBox11 extends QuickInput11 {
-+
-+		inputBox: {
-+			text: string;
-+
-+			placeholder: string;
-+
-+			password: boolean;
-+
-+			onDidTextChange: Event<string>;
-+
-+			onDidAccept: Event<string>;
-+		};
-+
-+		toolbar: {
-+			// TODO: Investigate using commands.
-+
-+			toolbarItems: QuickInputToolbarItem11[];
-+
-+			onDidTriggerToolbarItem: Event<QuickInputToolbarItem11>;
-+		};
-+
-+		message: {
-+			text: string | undefined;
-+
-+			severity: number;
-+		};
-+	}
-+
-+	export interface QuickInputToolbarItem11 {
-+		iconPath: string | Uri | { light: string | Uri; dark: string | Uri } | ThemeIcon;
-+		tooltip?: string | undefined;
-+	}
-+
-+	//#endregion
-+
-+	//#region Take 13
-+
-+	export namespace window {
-+
-+		export function createQuickPick13(): QuickPick13;
-+		export function createInputBox13(): InputBox13;
-+	}
-+
-+	export interface QuickInput13 {
-+
-+		enabled: boolean;
-+
-+		busy: boolean;
-+
-+		show(): void;
-+
-+		hide(): void;
-+
-+		onHide: Event<void>;
-+
-+		dispose(): void;
-+	}
-+
-+	export interface QuickPick13 extends QuickInput13 {
-+
-+		value: string;
-+
-+		placeholder: string;
-+
-+		onDidValueChange: Event<string>;
-+
-+		onDidAccept: Event<string>;
-+
-+		commands: QuickInputCommand13[];
-+
-+		onDidTriggerCommand: Event<QuickInputCommand13>;
-+
-+		items: QuickPickItem[];
-+
-+		canSelectMany: boolean;
-+
-+		builtInFilter: boolean;
-+
-+		selectedItems: QuickPickItem[];
-+
-+		onDidSelectItem: Event<QuickPickItem>;
-+	}
-+
-+	export interface InputBox13 extends QuickInput13 {
-+
-+		value: string;
-+
-+		placeholder: string;
-+
-+		password: boolean;
-+
-+		onDidValueChange: Event<string>;
-+
-+		onDidAccept: Event<string>;
-+
-+		commands: QuickInputCommand13[];
-+
-+		onDidTriggerCommand: Event<QuickInputCommand13>;
-+
-+		prompt: string;
-+
-+		validationMessage: string;
-+	}
-+
-+	export interface QuickInputCommand13 {
-+		iconPath: string | Uri | { light: string | Uri; dark: string | Uri } | ThemeIcon;
-+		tooltip?: string | undefined;
-+	}
-+
-+	//#endregion
-+
-+	//#endregion
- }
diff --git a/app/test/fixtures/merge-parser/vscode/merge-chrmarti-quickinputapiwip-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-chrmarti-quickinputapiwip-into-master.txt
deleted file mode 100644
index a93392d0395..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-chrmarti-quickinputapiwip-into-master.txt
+++ /dev/null
@@ -1,2758 +0,0 @@
-added in remote
-  their  100644 cef52ece3d909f713567ef3f874c758fb766387c extensions/extension-editing/src/quickInputExploration.ts
-@@ -0,0 +1,249 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+import { ExtensionContext, commands, QuickPickItem, window, Disposable, CancellationToken, QuickInputButton, QuickInput } from 'vscode';
-+
-+export function activate(context: ExtensionContext) {
-+	context.subscriptions.push(commands.registerCommand('foobar', async () => {
-+		const inputs = await collectInputs();
-+		console.log(inputs);
-+	}));
-+}
-+
-+const resourceGroups: QuickPickItem[] = ['vscode-data-function', 'vscode-website-microservices', 'vscode-website-monitor', 'vscode-website-preview', 'vscode-website-prod']
-+	.map(label => ({ label }));
-+
-+
-+interface Result {
-+	resourceGroup: QuickPickItem | string;
-+	name: string;
-+	runtime: QuickPickItem;
-+}
-+
-+async function collectInputs() {
-+	const result = {} as Partial<Result>;
-+	await MultiStepInput.run(input => pickResourceGroup(input, {}));
-+	return result;
-+}
-+
-+class MyCommand implements QuickInputButton {
-+	constructor(public iconPath: string) { }
-+}
-+
-+async function pickResourceGroup(input: MultiStepInput, state: Partial<Result>) {
-+	const createResourceGroupItem = new MyCommand('createResourceGroup.svg');
-+	const pick = await input.showQuickPick({
-+		placeHolder: 'Pick a resource group',
-+		items: resourceGroups,
-+		commands: [createResourceGroupItem],
-+		shouldResume: shouldResume
-+	});
-+	if (pick instanceof MyCommand) {
-+		return (input: MultiStepInput) => inputResourceGroupName(input, state);
-+	}
-+	state.resourceGroup = pick;
-+	return (input: MultiStepInput) => inputName(input, state);
-+}
-+
-+async function inputResourceGroupName(input: MultiStepInput, state: Partial<Result>) {
-+	state.resourceGroup = await input.showInputBox({
-+		prompt: 'Choose a unique name for the resource group',
-+		validate: validateNameIsUnique,
-+		shouldResume: shouldResume
-+	});
-+	return (input: MultiStepInput) => inputName(input, state);
-+}
-+
-+async function inputName(input: MultiStepInput, state: Partial<Result>) {
-+	state.name = await input.showInputBox({
-+		prompt: 'Choose a unique name for the application service',
-+		validate: validateNameIsUnique,
-+		shouldResume: shouldResume
-+	});
-+	return (input: MultiStepInput) => pickRuntime(input, state);
-+}
-+
-+async function pickRuntime(input: MultiStepInput, state: Partial<Result>) {
-+	const runtimes = await getAvailableRuntimes(state.resourceGroup, null /* token */);
-+	state.runtime = await input.showQuickPick({
-+		placeHolder: 'Pick a runtime',
-+		items: runtimes,
-+		shouldResume: shouldResume
-+	});
-+}
-+
-+function shouldResume() {
-+	// Could show a notification with the option to resume.
-+	return new Promise<boolean>((resolve, reject) => {
-+
-+	});
-+}
-+
-+class InputFlowAction {
-+	private constructor() { }
-+	static back = new InputFlowAction();
-+	static cancel = new InputFlowAction();
-+	static resume = new InputFlowAction();
-+}
-+
-+type InputStep = (input: MultiStepInput) => Thenable<InputStep | void>;
-+
-+interface QuickPickParameters {
-+	items: QuickPickItem[];
-+	placeHolder: string;
-+	commands?: QuickInputButton[];
-+	shouldResume: () => Thenable<boolean>;
-+}
-+
-+interface InputBoxParameters {
-+	prompt: string;
-+	validate: (value: string) => Promise<string>;
-+	commands?: QuickInputButton[];
-+	shouldResume: () => Thenable<boolean>;
-+}
-+
-+const backItem: QuickInputButton = { iconPath: 'back.svg' };
-+
-+class MultiStepInput {
-+
-+	static async run<T>(start: InputStep) {
-+		const input = new MultiStepInput();
-+		return input.stepThrough(start);
-+	}
-+
-+	private current?: QuickInput;
-+	private steps: InputStep[] = [];
-+
-+	private async stepThrough<T>(start: InputStep) {
-+		let step: InputStep | void = start;
-+		while (step) {
-+			this.steps.push(step);
-+			if (this.current) {
-+				this.current.enabled = false;
-+				this.current.busy = true;
-+			}
-+			try {
-+				step = await step(this);
-+			} catch (err) {
-+				if (err === InputFlowAction.back) {
-+					this.steps.pop();
-+					step = this.steps.pop();
-+				} else if (err === InputFlowAction.resume) {
-+					step = this.steps.pop();
-+				} else if (err === InputFlowAction.cancel) {
-+					step = undefined;
-+				} else {
-+					throw err;
-+				}
-+			}
-+		}
-+		if (this.current) {
-+			this.current.dispose();
-+		}
-+	}
-+
-+	async showQuickPick<P extends QuickPickParameters>({ items, placeHolder, commands, shouldResume }: P) {
-+		const disposables: Disposable[] = [];
-+		try {
-+			return await new Promise<QuickPickItem | (P extends { commands: (infer I)[] } ? I : never)>((resolve, reject) => {
-+				const input = window.createQuickPick();
-+				input.placeholder = placeHolder;
-+				input.items = items;
-+				input.buttons = [
-+					...(this.steps.length > 1 ? [backItem] : []),
-+					...(commands || [])
-+				];
-+				disposables.push(
-+					input,
-+					input.onDidTriggerButton(item => {
-+						if (item === backItem) {
-+							reject(InputFlowAction.back);
-+						}
-+					}),
-+					input.onDidChangeSelection(items => resolve(items[0])),
-+					input.onDidHide(() => {
-+						(async () => {
-+							reject(shouldResume && await shouldResume() ? InputFlowAction.resume : InputFlowAction.cancel);
-+						})()
-+							.catch(reject);
-+					})
-+				);
-+				if (this.current) {
-+					this.current.hide();
-+				}
-+				this.current = input;
-+				this.current.show();
-+			});
-+		} finally {
-+			disposables.forEach(d => d.dispose());
-+		}
-+	}
-+
-+	async showInputBox<P extends InputBoxParameters>({ prompt, validate, commands, shouldResume }: P) {
-+		const disposables: Disposable[] = [];
-+		try {
-+			return await new Promise<string | (P extends { commands: (infer I)[] } ? I : never)>((resolve, reject) => {
-+				const input = window.createInputBox();
-+				input.prompt = prompt;
-+				input.buttons = [
-+					...(this.steps.length > 1 ? [backItem] : []),
-+					...(commands || [])
-+				];
-+				let validating = validate('');
-+				disposables.push(
-+					input,
-+					input.onDidTriggerButton(item => {
-+						if (item === backItem) {
-+							reject(InputFlowAction.back);
-+						}
-+					}),
-+					input.onDidAccept(async text => {
-+						if (!(await validate(text))) {
-+							resolve(text);
-+						}
-+					}),
-+					input.onDidChangeValue(async text => {
-+						const current = validate(text);
-+						validating = current;
-+						const validationMessage = await current;
-+						if (current === validating) {
-+							input.validationMessage = validationMessage;
-+						}
-+					}),
-+					input.onDidHide(() => {
-+						(async () => {
-+							reject(shouldResume && await shouldResume() ? InputFlowAction.resume : InputFlowAction.cancel);
-+						})()
-+							.catch(reject);
-+					})
-+				);
-+				if (this.current) {
-+					this.current.hide();
-+				}
-+				this.current = input;
-+				this.current.show();
-+			});
-+		} finally {
-+			disposables.forEach(d => d.dispose());
-+		}
-+	}
-+}
-+
-+
-+// ---------------------------------------------------------------------------------------
-+
-+
-+async function validateNameIsUnique(name: string) {
-+	// ...validate...
-+	await new Promise(resolve => setTimeout(resolve, 1000));
-+	return name === 'vscode' ? 'Name not unique' : undefined;
-+}
-+
-+async function getAvailableRuntimes(resourceGroup: QuickPickItem | string, token: CancellationToken): Promise<QuickPickItem[]> {
-+	// ...retrieve...
-+	await new Promise(resolve => setTimeout(resolve, 2000));
-+	return ['Node 8.9', 'Node 6.11', 'Node 4.5']
-+		.map(label => ({ label }));
-+}
-merged
-  result 100644 c9849d48e083fe1a719179065d190e1a803486f1 extensions/extension-editing/src/typings/ref.d.ts
-  our    100644 216911a680eb22a4ef86b9a54eb9ee28e67db23e extensions/extension-editing/src/typings/ref.d.ts
-@@ -4,3 +4,4 @@
-  *--------------------------------------------------------------------------------------------*/
- 
- /// <reference path='../../../../src/vs/vscode.d.ts'/>
-+/// <reference path='../../../../src/vs/vscode.proposed.d.ts'/>
-added in both
-  our    100644 04f8ba296e3e0ba1391a1ab32940763dc1d53a5c extensions/vscode-api-tests/src/singlefolder-tests/quickInput.test.ts
-  their  100644 19ad6839edf44300173d1588b351438d4a9fb55b extensions/vscode-api-tests/src/singlefolder-tests/quickInput.test.ts
-@@ -9,6 +9,7 @@
- import { window, commands } from 'vscode';
- import { closeAllEditors } from '../utils';
- 
-+<<<<<<< .our
- interface QuickPickExpected {
- 	events: string[];
- 	activeItems: string[][];
-@@ -19,6 +20,8 @@
- 	};
- }
- 
-+=======
-+>>>>>>> .their
- suite('window namespace tests', function () {
- 
- 	suite('QuickInput tests', function () {
-@@ -29,6 +32,7 @@
- 				done = () => {};
- 				_done(err);
- 			};
-+<<<<<<< .our
- 
- 			const quickPick = createQuickPick({
- 				events: ['active', 'active', 'selection', 'accept', 'hide'],
-@@ -90,20 +94,47 @@
- 				},
- 			}, (err?: any) => done(err));
- 			quickPick.canSelectMany = true;
-+=======
-+			const quickPick = window.createQuickPick();
-+			const expectedFocusChanges = [['eins'], ['zwei']];
-+			quickPick.onDidChangeActive(items => {
-+				try {
-+					assert.deepEqual(items.map(item => item.label), expectedFocusChanges.shift());
-+				} catch (err) {
-+					done(err);
-+				}
-+			});
-+			quickPick.onDidAccept(() => {
-+				try {
-+					const items = quickPick.activeItems;
-+					quickPick.dispose();
-+					assert.equal(items.length, 1);
-+					assert.equal(items[0].label, 'zwei');
-+					assert.equal(expectedFocusChanges.length, 0);
-+					done();
-+				} catch (err) {
-+					done(err);
-+				}
-+			});
-+>>>>>>> .their
- 			quickPick.items = ['eins', 'zwei', 'drei'].map(label => ({ label }));
- 			quickPick.show();
- 
- 			(async () => {
- 				await commands.executeCommand('workbench.action.quickOpenSelectNext');
-+<<<<<<< .our
- 				await commands.executeCommand('workbench.action.quickPickManyToggle');
- 				await commands.executeCommand('workbench.action.quickOpenSelectNext');
- 				await commands.executeCommand('workbench.action.quickPickManyToggle');
-+=======
-+>>>>>>> .their
- 				await commands.executeCommand('workbench.action.acceptSelectedQuickOpenItem');
- 			})()
- 				.catch(err => done(err));
- 		});
- 	});
- });
-+<<<<<<< .our
- 
- function createQuickPick(expected: QuickPickExpected, done: (err?: any) => void) {
- 	const quickPick = window.createQuickPick();
-@@ -149,4 +180,6 @@
- 	});
- 
- 	return quickPick;
--}
-\ No newline at end of file
-+}
-+=======
-+>>>>>>> .their
-changed in both
-  base   100644 efe7c1848e60f7377d0971b69af7db5373258776 extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts
-  our    100644 ab90746f65a472d1786bcdf33b4a22ef90fb8db7 extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts
-  their  100644 4efe6c0f4e3891ef08cf606878295996082df5e8 extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts
-changed in both
-  base   100755 8222ce00f1c633ff767f1a3eee5437279a8be44f scripts/test-integration.sh
-  our    100755 d2225c4475d754de72e745def72814606c90f9a3 scripts/test-integration.sh
-  their  100755 0eff7c4a0a6b2835357d384bc15752f43dd9958f scripts/test-integration.sh
-@@ -13,20 +13,33 @@
- cd $ROOT
- 
- # Tests in the extension host
-+<<<<<<< .our
- ./scripts/code.sh $ROOT/extensions/vscode-api-tests/testWorkspace --extensionDevelopmentPath=$ROOT/extensions/vscode-api-tests --extensionTestsPath=$ROOT/extensions/vscode-api-tests/out/singlefolder-tests --disableExtensions --user-data-dir=$VSCODEUSERDATADIR --skip-getting-started
- ./scripts/code.sh $ROOT/extensions/vscode-api-tests/testworkspace.code-workspace --extensionDevelopmentPath=$ROOT/extensions/vscode-api-tests --extensionTestsPath=$ROOT/extensions/vscode-api-tests/out/workspace-tests --disableExtensions --user-data-dir=$VSCODEUSERDATADIR --skip-getting-started
- ./scripts/code.sh $ROOT/extensions/vscode-colorize-tests/test --extensionDevelopmentPath=$ROOT/extensions/vscode-colorize-tests --extensionTestsPath=$ROOT/extensions/vscode-colorize-tests/out --disableExtensions --user-data-dir=$VSCODEUSERDATADIR --skip-getting-started
- ./scripts/code.sh $ROOT/extensions/markdown-language-features/test-fixtures --extensionDevelopmentPath=$ROOT/extensions/markdown-language-features --extensionTestsPath=$ROOT/extensions/markdown-language-features/out/test --disableExtensions --user-data-dir=$VSCODEUSERDATADIR --skip-getting-started
-+=======
-+./scripts/code.sh $ROOT/extensions/vscode-api-tests/testWorkspace --extensionDevelopmentPath=$ROOT/extensions/vscode-api-tests --extensionTestsPath=$ROOT/extensions/vscode-api-tests/out/singlefolder-tests --disableExtensions --user-data-dir=$VSCODEUSERDATADIR --skip-getting-started #--debugBrkPluginHost=5687
-+# ./scripts/code.sh $ROOT/extensions/vscode-api-tests/testworkspace.code-workspace --extensionDevelopmentPath=$ROOT/extensions/vscode-api-tests --extensionTestsPath=$ROOT/extensions/vscode-api-tests/out/workspace-tests --disableExtensions --user-data-dir=$VSCODEUSERDATADIR --skip-getting-started
-+# ./scripts/code.sh $ROOT/extensions/vscode-colorize-tests/test --extensionDevelopmentPath=$ROOT/extensions/vscode-colorize-tests --extensionTestsPath=$ROOT/extensions/vscode-colorize-tests/out --disableExtensions --user-data-dir=$VSCODEUSERDATADIR --skip-getting-started
-+# ./scripts/code.sh $ROOT/extensions/markdown-language-features/test-fixtures --extensionDevelopmentPath=$ROOT/extensions/markdown-language-features --extensionTestsPath=$ROOT/extensions/markdown-language-features/out/test --disableExtensions --user-data-dir=$VSCODEUSERDATADIR --skip-getting-started
-+exit 0
-+>>>>>>> .their
- 
--mkdir $ROOT/extensions/emmet/test-fixtures
--./scripts/code.sh $ROOT/extensions/emmet/test-fixtures --extensionDevelopmentPath=$ROOT/extensions/emmet --extensionTestsPath=$ROOT/extensions/emmet/out/test --disableExtensions --user-data-dir=$VSCODEUSERDATADIR --skip-getting-started .
--rm -r $ROOT/extensions/emmet/test-fixtures
-+# mkdir $ROOT/extensions/emmet/test-fixtures
-+# ./scripts/code.sh $ROOT/extensions/emmet/test-fixtures --extensionDevelopmentPath=$ROOT/extensions/emmet --extensionTestsPath=$ROOT/extensions/emmet/out/test --disableExtensions --user-data-dir=$VSCODEUSERDATADIR --skip-getting-started .
-+# rm -r $ROOT/extensions/emmet/test-fixtures
- 
--# Integration tests in AMD
--./scripts/test.sh --runGlob **/*.integrationTest.js "$@"
-+# # Integration tests in AMD
-+# ./scripts/test.sh --runGlob **/*.integrationTest.js "$@"
- 
-+<<<<<<< .our
- # Tests in commonJS
- cd $ROOT/extensions/css-language-features/server && $ROOT/scripts/node-electron.sh test/index.js
- cd $ROOT/extensions/html-language-features/server && $ROOT/scripts/node-electron.sh test/index.js
-+=======
-+# # Tests in commonJS (HTML, CSS, JSON language server tests...)
-+# ./scripts/node-electron.sh ./node_modules/mocha/bin/_mocha ./extensions/*/server/out/test/
-+>>>>>>> .their
- 
- rm -r $VSCODEUSERDATADIR
-changed in both
-  base   100644 14edbfdfa229d1a149d0448bfdee198f16491a40 src/vs/platform/quickinput/common/quickInput.ts
-  our    100644 b384addd50947ac569852010fe7ee90e9558cf6b src/vs/platform/quickinput/common/quickInput.ts
-  their  100644 6ec617b0535d27f5365a0e7f0755112927eb3283 src/vs/platform/quickinput/common/quickInput.ts
-@@ -9,10 +9,17 @@
- import { CancellationToken } from 'vs/base/common/cancellation';
- import { ResolvedKeybinding } from 'vs/base/common/keyCodes';
- import URI from 'vs/base/common/uri';
-+<<<<<<< .our
- import { Event } from 'vs/base/common/event';
- 
- export interface IQuickPickItem {
- 	type?: 'item';
-+=======
-+import { ThemeIcon } from 'vs/platform/theme/common/themeService';
-+import { Event } from 'vs/base/common/event';
-+
-+export interface IQuickPickItem {
-+>>>>>>> .their
- 	id?: string;
- 	label: string;
- 	description?: string;
-@@ -121,6 +128,7 @@
- 
- export interface IQuickInput {
- 
-+<<<<<<< .our
- 	title: string | undefined;
- 
- 	step: number | undefined;
-@@ -131,6 +139,11 @@
- 
- 	contextKey: string | undefined;
- 
-+=======
-+
-+	enabled: boolean;
-+
-+>>>>>>> .their
- 	busy: boolean;
- 
- 	ignoreFocusOut: boolean;
-@@ -144,6 +157,7 @@
- 	dispose(): void;
- }
- 
-+<<<<<<< .our
- export interface IQuickPick<T extends IQuickPickItem> extends IQuickInput {
- 
- 	value: string;
-@@ -151,16 +165,31 @@
- 	placeholder: string | undefined;
- 
- 	readonly onDidChangeValue: Event<string>;
-+=======
-+export interface IQuickPick extends IQuickInput {
-+
-+	value: string;
-+
-+	placeholder: string;
-+
-+	readonly onDidValueChange: Event<string>;
-+>>>>>>> .their
- 
- 	readonly onDidAccept: Event<string>;
- 
- 	buttons: ReadonlyArray<IQuickInputButton>;
- 
-+<<<<<<< .our
- 	readonly onDidTriggerButton: Event<IQuickInputButton>;
- 
- 	readonly onDidTriggerItemButton: Event<IQuickPickItemButtonEvent<T>>;
- 
- 	items: ReadonlyArray<T | IQuickPickSeparator>;
-+=======
-+	readonly onDidTriggerCommand: Event<IQuickInputButton>;
-+
-+	items: ReadonlyArray<IQuickPickItem>;
-+>>>>>>> .their
- 
- 	canSelectMany: boolean;
- 
-@@ -168,6 +197,7 @@
- 
- 	matchOnDetail: boolean;
- 
-+<<<<<<< .our
- 	quickNavigate: IQuickNavigateConfiguration | undefined;
- 
- 	activeItems: ReadonlyArray<T>;
-@@ -179,6 +209,15 @@
- 	readonly onDidChangeSelection: Event<T[]>;
- 
- 	readonly keyMods: IKeyMods;
-+=======
-+	readonly activeItems: ReadonlyArray<IQuickPickItem>;
-+
-+	readonly onDidChangeActive: Event<IQuickPickItem[]>;
-+
-+	readonly selectedItems: ReadonlyArray<IQuickPickItem>;
-+
-+	readonly onDidChangeSelection: Event<IQuickPickItem[]>;
-+>>>>>>> .their
- }
- 
- export interface IInputBox extends IQuickInput {
-@@ -187,7 +226,11 @@
- 
- 	valueSelection: Readonly<[number, number]>;
- 
-+<<<<<<< .our
- 	placeholder: string | undefined;
-+=======
-+	placeholder: string;
-+>>>>>>> .their
- 
- 	password: boolean;
- 
-@@ -199,6 +242,7 @@
- 
- 	readonly onDidTriggerButton: Event<IQuickInputButton>;
- 
-+<<<<<<< .our
- 	prompt: string | undefined;
- 
- 	validationMessage: string | undefined;
-@@ -217,14 +261,27 @@
- 
- export interface IQuickPickItemButtonContext<T extends IQuickPickItem> extends IQuickPickItemButtonEvent<T> {
- 	removeItem(): void;
-+=======
-+	prompt: string;
-+
-+	validationMessage: string;
-+}
-+
-+export interface IQuickInputButton {
-+	iconPath: string | URI | { light: string | URI; dark: string | URI } | ThemeIcon;
-+	tooltip?: string | undefined;
-+>>>>>>> .their
- }
- 
- export const IQuickInputService = createDecorator<IQuickInputService>('quickInputService');
- 
-+<<<<<<< .our
- export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
- 
- export type QuickPickInput<T = IQuickPickItem> = T | IQuickPickSeparator;
- 
-+=======
-+>>>>>>> .their
- export interface IQuickInputService {
- 
- 	_serviceBrand: any;
-@@ -232,18 +289,26 @@
- 	/**
- 	 * Opens the quick input box for selecting items and returns a promise with the user selected item(s) if any.
- 	 */
-+<<<<<<< .our
- 	pick<T extends IQuickPickItem>(picks: TPromise<QuickPickInput<T>[]> | QuickPickInput<T>[], options?: IPickOptions<T> & { canPickMany: true }, token?: CancellationToken): TPromise<T[]>;
- 	pick<T extends IQuickPickItem>(picks: TPromise<QuickPickInput<T>[]> | QuickPickInput<T>[], options?: IPickOptions<T> & { canPickMany: false }, token?: CancellationToken): TPromise<T>;
- 	pick<T extends IQuickPickItem>(picks: TPromise<QuickPickInput<T>[]> | QuickPickInput<T>[], options?: Omit<IPickOptions<T>, 'canPickMany'>, token?: CancellationToken): TPromise<T>;
-+=======
-+	pick<T extends IQuickPickItem, O extends IPickOptions>(picks: TPromise<T[]>, options?: O, token?: CancellationToken): TPromise<O extends { canPickMany: true } ? T[] : T>;
-+>>>>>>> .their
- 
- 	/**
- 	 * Opens the quick input box for text input and returns a promise with the user typed value if any.
- 	 */
- 	input(options?: IInputOptions, token?: CancellationToken): TPromise<string>;
- 
-+<<<<<<< .our
- 	backButton: IQuickInputButton;
- 
- 	createQuickPick<T extends IQuickPickItem>(): IQuickPick<T>;
-+=======
-+	createQuickPick(): IQuickPick;
-+>>>>>>> .their
- 	createInputBox(): IInputBox;
- 
- 	focus(): void;
-changed in both
-  base   100644 7f0634707038962af26042da5fe74792a49844b9 src/vs/vscode.proposed.d.ts
-  our    100644 3de4a7af9dda9e3e523ba4b5774f1667d66b0b9b src/vs/vscode.proposed.d.ts
-  their  100644 4801bc52870fae75c097fbbadd1756206fb9f263 src/vs/vscode.proposed.d.ts
-@@ -5,6 +5,8 @@
- 
- // This is the place for API experiments and proposals.
- 
-+import { QuickPickItem } from 'vscode';
-+
- declare module 'vscode' {
- 
- 	export namespace window {
-@@ -681,6 +683,98 @@
- 		 */
- 		dimensions: TerminalDimensions | undefined;
- 
-+<<<<<<< .our
-+=======
-+	//#region QuickInput API
-+
-+	export namespace window {
-+
-+		export function createQuickPick(): QuickPick;
-+		export function createInputBox(): InputBox;
-+	}
-+
-+	export interface QuickInput {
-+
-+		enabled: boolean;
-+
-+		busy: boolean;
-+
-+		ignoreFocusOut: boolean;
-+
-+		show(): void;
-+
-+		hide(): void;
-+
-+		onDidHide: Event<void>;
-+
-+		dispose(): void;
-+	}
-+
-+	export interface QuickPick extends QuickInput {
-+
-+		value: string;
-+
-+		placeholder: string;
-+
-+		readonly onDidChangeValue: Event<string>;
-+
-+		readonly onDidAccept: Event<void>;
-+
-+		buttons: ReadonlyArray<QuickInputButton>;
-+
-+		readonly onDidTriggerButton: Event<QuickInputButton>;
-+
-+		items: ReadonlyArray<QuickPickItem>;
-+
-+		canSelectMany: boolean;
-+
-+		matchOnDescription: boolean;
-+
-+		matchOnDetail: boolean;
-+
-+		readonly activeItems: ReadonlyArray<QuickPickItem>;
-+
-+		readonly onDidChangeActive: Event<QuickPickItem[]>;
-+
-+		readonly selectedItems: ReadonlyArray<QuickPickItem>;
-+
-+		readonly onDidChangeSelection: Event<QuickPickItem[]>;
-+	}
-+
-+	export interface InputBox extends QuickInput {
-+
-+		value: string;
-+
-+		placeholder: string;
-+
-+		password: boolean;
-+
-+		readonly onDidChangeValue: Event<string>;
-+
-+		readonly onDidAccept: Event<string>;
-+
-+		buttons: ReadonlyArray<QuickInputButton>;
-+
-+		readonly onDidTriggerButton: Event<QuickInputButton>;
-+
-+		prompt: string;
-+
-+		validationMessage: string;
-+	}
-+
-+	export interface QuickInputButton {
-+		iconPath: string | Uri | { light: string | Uri; dark: string | Uri } | ThemeIcon;
-+		tooltip?: string | undefined;
-+	}
-+
-+	//#endregion
-+
-+	//#region mjbvz: Unused diagnostics
-+	/**
-+	 * Additional metadata about the type of diagnostic.
-+	 */
-+	export enum DiagnosticTag {
-+>>>>>>> .their
- 		/**
- 		 * The maximum dimensions of the terminal, this will be undefined immediately after a
- 		 * terminal renderer is created and also until the terminal becomes visible in the UI.
-changed in both
-  base   100644 e98293c8a8a8abd46b38cc58caf66f59f2f6f7a2 src/vs/workbench/api/electron-browser/mainThreadQuickOpen.ts
-  our    100644 7435dda07b668fcc7e08e3f118b731133774c674 src/vs/workbench/api/electron-browser/mainThreadQuickOpen.ts
-  their  100644 03e43b23d46c3e851e96b54aa6d02c06154da0c4 src/vs/workbench/api/electron-browser/mainThreadQuickOpen.ts
-@@ -8,15 +8,22 @@
- import { asWinJsPromise } from 'vs/base/common/async';
- import { IPickOptions, IInputOptions, IQuickInputService, IQuickInput } from 'vs/platform/quickinput/common/quickInput';
- import { InputBoxOptions } from 'vscode';
-+<<<<<<< .our
- import { ExtHostContext, MainThreadQuickOpenShape, ExtHostQuickOpenShape, TransferQuickPickItems, MainContext, IExtHostContext, TransferQuickInput, TransferQuickInputButton } from 'vs/workbench/api/node/extHost.protocol';
-+=======
-+import { ExtHostContext, MainThreadQuickOpenShape, ExtHostQuickOpenShape, MyQuickPickItems, MainContext, IExtHostContext, TransferQuickInput } from '../node/extHost.protocol';
-+>>>>>>> .their
- import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
- import URI from 'vs/base/common/uri';
- 
-+<<<<<<< .our
- interface QuickInputSession {
- 	input: IQuickInput;
- 	handlesToItems: Map<number, TransferQuickPickItems>;
- }
- 
-+=======
-+>>>>>>> .their
- @extHostNamedCustomer(MainContext.MainThreadQuickOpen)
- export class MainThreadQuickOpen implements MainThreadQuickOpenShape {
- 
-@@ -38,7 +45,11 @@
- 	public dispose(): void {
- 	}
- 
-+<<<<<<< .our
- 	$show(options: IPickOptions<TransferQuickPickItems>): TPromise<number | number[]> {
-+=======
-+	$show(options: IPickOptions): TPromise<number | number[]> {
-+>>>>>>> .their
- 		const myToken = ++this._token;
- 
- 		this._contents = new TPromise<TransferQuickPickItems[]>((c, e) => {
-@@ -120,7 +131,11 @@
- 
- 	// ---- QuickInput
- 
-+<<<<<<< .our
- 	private sessions = new Map<number, QuickInputSession>();
-+=======
-+	private sessions = new Map<number, IQuickInput>();
-+>>>>>>> .their
- 
- 	$createOrUpdate(params: TransferQuickInput): TPromise<void> {
- 		const sessionId = params.id;
-@@ -132,6 +147,7 @@
- 					this._proxy.$onDidAccept(sessionId);
- 				});
- 				input.onDidChangeActive(items => {
-+<<<<<<< .our
- 					this._proxy.$onDidChangeActive(sessionId, items.map(item => (item as TransferQuickPickItems).handle));
- 				});
- 				input.onDidChangeSelection(items => {
-@@ -150,11 +166,20 @@
- 					input,
- 					handlesToItems: new Map()
- 				};
-+=======
-+					this._proxy.$onDidChangeActive(sessionId, items.map(item => (item as MyQuickPickItems).handle));
-+				});
-+				input.onDidChangeSelection(items => {
-+					this._proxy.$onDidChangeSelection(sessionId, items.map(item => (item as MyQuickPickItems).handle));
-+				});
-+				session = input;
-+>>>>>>> .their
- 			} else {
- 				const input = this._quickInputService.createInputBox();
- 				input.onDidAccept(() => {
- 					this._proxy.$onDidAccept(sessionId);
- 				});
-+<<<<<<< .our
- 				input.onDidTriggerButton(button => {
- 					this._proxy.$onDidTriggerButton(sessionId, (button as TransferQuickInputButton).handle);
- 				});
-@@ -172,12 +197,19 @@
- 			this.sessions.set(sessionId, session);
- 		}
- 		const { input, handlesToItems } = session;
-+=======
-+				session = input;
-+			}
-+			this.sessions.set(sessionId, session);
-+		}
-+>>>>>>> .their
- 		for (const param in params) {
- 			if (param === 'id' || param === 'type') {
- 				continue;
- 			}
- 			if (param === 'visible') {
- 				if (params.visible) {
-+<<<<<<< .our
- 					input.show();
- 				} else {
- 					input.hide();
-@@ -209,6 +241,14 @@
- 				});
- 			} else {
- 				input[param] = params[param];
-+=======
-+					session.show();
-+				} else {
-+					session.hide();
-+				}
-+			} else {
-+				session[param] = params[param];
-+>>>>>>> .their
- 			}
- 		}
- 		return TPromise.as(undefined);
-@@ -217,7 +257,11 @@
- 	$dispose(sessionId: number): TPromise<void> {
- 		const session = this.sessions.get(sessionId);
- 		if (session) {
-+<<<<<<< .our
- 			session.input.dispose();
-+=======
-+			session.dispose();
-+>>>>>>> .their
- 			this.sessions.delete(sessionId);
- 		}
- 		return TPromise.as(undefined);
-changed in both
-  base   100644 52309306e47ad59f30e0f0bf09148844eef6c0d9 src/vs/workbench/api/node/extHost.api.impl.ts
-  our    100644 ea64898c5b15cfae4b4ab32d722f4ae4a68f831a src/vs/workbench/api/node/extHost.api.impl.ts
-  their  100644 ca2f8e5a5a70d6e0a025130982fa64eedf7f858d src/vs/workbench/api/node/extHost.api.impl.ts
-@@ -401,6 +401,15 @@
- 			},
- 			showInputBox(options?: vscode.InputBoxOptions, token?: vscode.CancellationToken) {
- 				return extHostQuickOpen.showInput(options, token);
-+<<<<<<< .our
-+=======
-+			},
-+			createQuickPick(): vscode.QuickPick {
-+				return extHostQuickOpen.createQuickPick(extension.id);
-+			},
-+			createInputBox(): vscode.InputBox {
-+				return extHostQuickOpen.createInputBox(extension.id);
-+>>>>>>> .their
- 			},
- 			showOpenDialog(options) {
- 				return extHostDialogs.showOpenDialog(options);
-changed in both
-  base   100644 5b9cbdc684fba567cb55574c0b37e2917f879add src/vs/workbench/api/node/extHost.protocol.ts
-  our    100644 edb764542adfbf0fba64e1b93de7c309bedf0d12 src/vs/workbench/api/node/extHost.protocol.ts
-  their  100644 96968d918577251d5839ab5ee51e561c5942c56d src/vs/workbench/api/node/extHost.protocol.ts
-@@ -9,6 +9,26 @@
- import Severity from 'vs/base/common/severity';
- import URI, { UriComponents } from 'vs/base/common/uri';
- import { TPromise } from 'vs/base/common/winjs.base';
-+<<<<<<< .our
-+=======
-+
-+import { IMarkerData } from 'vs/platform/markers/common/markers';
-+import { EditorViewColumn } from 'vs/workbench/api/shared/editor';
-+import { IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
-+import { StatusbarAlignment as MainThreadStatusBarAlignment } from 'vs/platform/statusbar/common/statusbar';
-+import { ITelemetryInfo } from 'vs/platform/telemetry/common/telemetry';
-+import { ICommandHandlerDescription } from 'vs/platform/commands/common/commands';
-+import { IProgressOptions, IProgressStep } from 'vs/workbench/services/progress/common/progress';
-+
-+import * as editorCommon from 'vs/editor/common/editorCommon';
-+import * as modes from 'vs/editor/common/modes';
-+
-+import { IConfigurationData, ConfigurationTarget, IConfigurationModel } from 'vs/platform/configuration/common/configuration';
-+import { IConfig, IAdapterExecutable, ITerminalSettings } from 'vs/workbench/parts/debug/common/debug';
-+
-+import { IQuickPickItem, IPickOptions } from 'vs/platform/quickinput/common/quickInput';
-+import { SaveReason } from 'vs/workbench/services/textfile/common/textfiles';
-+>>>>>>> .their
- import { TextEditorCursorStyle } from 'vs/editor/common/config/editorOptions';
- import { IPosition } from 'vs/editor/common/core/position';
- import { IRange } from 'vs/editor/common/core/range';
-@@ -340,7 +360,11 @@
- 	handle: number;
- }
- 
-+<<<<<<< .our
- export interface TransferQuickInputButton extends IQuickInputButton {
-+=======
-+export interface MyQuickPickItems extends IQuickPickItem {
-+>>>>>>> .their
- 	handle: number;
- }
- 
-@@ -367,6 +391,7 @@
- 
- 	placeholder?: string;
- 
-+<<<<<<< .our
- 	buttons?: TransferQuickInputButton[];
- 
- 	items?: TransferQuickPickItems[];
-@@ -374,6 +399,11 @@
- 	activeItems?: number[];
- 
- 	selectedItems?: number[];
-+=======
-+	commands?: TransferQuickInputCommand[];
-+
-+	items?: MyQuickPickItems[];
-+>>>>>>> .their
- 
- 	canSelectMany?: boolean;
- 
-@@ -394,16 +424,31 @@
- 
- 	password?: boolean;
- 
-+<<<<<<< .our
- 	buttons?: TransferQuickInputButton[];
-+=======
-+	commands?: TransferQuickInputCommand[];
-+>>>>>>> .their
- 
- 	prompt?: string;
- 
- 	validationMessage?: string;
- }
- 
-+<<<<<<< .our
- export interface MainThreadQuickOpenShape extends IDisposable {
- 	$show(options: IPickOptions<TransferQuickPickItems>): TPromise<number | number[]>;
- 	$setItems(items: TransferQuickPickItems[]): TPromise<any>;
-+=======
-+export interface TransferQuickInputCommand {
-+	iconPath: { light: string; dark: string; };
-+	tooltip?: string | undefined;
-+}
-+
-+export interface MainThreadQuickOpenShape extends IDisposable {
-+	$show(options: IPickOptions): TPromise<number | number[]>;
-+	$setItems(items: MyQuickPickItems[]): TPromise<any>;
-+>>>>>>> .their
- 	$setError(error: Error): TPromise<any>;
- 	$input(options: vscode.InputBoxOptions, validateInput: boolean): TPromise<string>;
- 	$createOrUpdate(params: TransferQuickInput): TPromise<void>;
-@@ -852,9 +897,12 @@
- 	$onDidChangeActive(sessionId: number, handles: number[]): void;
- 	$onDidChangeSelection(sessionId: number, handles: number[]): void;
- 	$onDidAccept(sessionId: number): void;
-+<<<<<<< .our
- 	$onDidChangeValue(sessionId: number, value: string): void;
- 	$onDidTriggerButton(sessionId: number, handle: number): void;
- 	$onDidHide(sessionId: number): void;
-+=======
-+>>>>>>> .their
- }
- 
- export interface ShellLaunchConfigDto {
-changed in both
-  base   100644 bb1af794ce9e6003bc0fa632a60f7379e1db8026 src/vs/workbench/api/node/extHostQuickOpen.ts
-  our    100644 29928df44f9e10f445081622c42d5ce1027abeb4 src/vs/workbench/api/node/extHostQuickOpen.ts
-  their  100644 7ad24f9235d636b5c2065771933bd33a63da1a30 src/vs/workbench/api/node/extHostQuickOpen.ts
-@@ -6,6 +6,7 @@
- 
- import { asWinJsPromise, wireCancellationToken } from 'vs/base/common/async';
- import { CancellationToken } from 'vs/base/common/cancellation';
-+<<<<<<< .our
- import { Emitter } from 'vs/base/common/event';
- import { dispose, IDisposable } from 'vs/base/common/lifecycle';
- import { TPromise } from 'vs/base/common/winjs.base';
-@@ -15,6 +16,15 @@
- import { ExtHostQuickOpenShape, IMainContext, MainContext, MainThreadQuickOpenShape, TransferQuickPickItems, TransferQuickInput, TransferQuickInputButton } from './extHost.protocol';
- import URI from 'vs/base/common/uri';
- import { ThemeIcon, QuickInputButtons } from 'vs/workbench/api/node/extHostTypes';
-+=======
-+import { QuickPickOptions, QuickPickItem, InputBoxOptions, WorkspaceFolderPickOptions, WorkspaceFolder, QuickInput, QuickPick, InputBox, QuickInputButton } from 'vscode';
-+import { MainContext, MainThreadQuickOpenShape, ExtHostQuickOpenShape, MyQuickPickItems, IMainContext, TransferQuickInput } from './extHost.protocol';
-+import { ExtHostWorkspace } from 'vs/workbench/api/node/extHostWorkspace';
-+import { ExtHostCommands } from 'vs/workbench/api/node/extHostCommands';
-+import { Emitter } from 'vs/base/common/event';
-+import { assign } from 'vs/base/common/objects';
-+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-+>>>>>>> .their
- 
- export type Item = string | QuickPickItem;
- 
-@@ -151,7 +161,11 @@
- 
- 	// ---- QuickInput
- 
-+<<<<<<< .our
- 	createQuickPick<T extends QuickPickItem>(extensionId: string): QuickPick<T> {
-+=======
-+	createQuickPick(extensionId: string): QuickPick {
-+>>>>>>> .their
- 		const session = new ExtHostQuickPick(this._proxy, extensionId, () => this._sessions.delete(session._id));
- 		this._sessions.set(session._id, session);
- 		return session;
-@@ -163,6 +177,7 @@
- 		return session;
- 	}
- 
-+<<<<<<< .our
- 	$onDidChangeValue(sessionId: number, value: string): void {
- 		const session = this._sessions.get(sessionId);
- 		if (session) {
-@@ -173,6 +188,11 @@
- 	$onDidAccept(sessionId: number): void {
- 		const session = this._sessions.get(sessionId);
- 		if (session) {
-+=======
-+	$onDidAccept(sessionId: number): void {
-+		const session = this._sessions.get(sessionId);
-+		if (session instanceof ExtHostQuickPick) {
-+>>>>>>> .their
- 			session._fireDidAccept();
- 		}
- 	}
-@@ -180,7 +200,11 @@
- 	$onDidChangeActive(sessionId: number, handles: number[]): void {
- 		const session = this._sessions.get(sessionId);
- 		if (session instanceof ExtHostQuickPick) {
-+<<<<<<< .our
- 			session._fireDidChangeActive(handles);
-+=======
-+			session._fireDidChangeFocus(handles);
-+>>>>>>> .their
- 		}
- 	}
- 
-@@ -190,6 +214,7 @@
- 			session._fireDidChangeSelection(handles);
- 		}
- 	}
-+<<<<<<< .our
- 
- 	$onDidTriggerButton(sessionId: number, handle: number): void {
- 		const session = this._sessions.get(sessionId);
-@@ -292,6 +317,275 @@
- 	set ignoreFocusOut(ignoreFocusOut: boolean) {
- 		this._ignoreFocusOut = ignoreFocusOut;
- 		this.update({ ignoreFocusOut });
-+=======
-+}
-+
-+class ExtHostQuickInput implements QuickInput {
-+
-+	private static _nextId = 1;
-+	_id = ExtHostQuickPick._nextId++;
-+
-+	private _visible = false;
-+	private _enabled = true;
-+	private _busy = false;
-+	private _ignoreFocusOut = true;
-+	private _onDidHideEmitter = new Emitter<void>();
-+	private _updateTimeout: number;
-+	private _pendingUpdate: TransferQuickInput = { id: this._id };
-+
-+	private _disposed = false;
-+	protected _disposables: IDisposable[] = [
-+		this._onDidHideEmitter
-+	];
-+
-+	constructor(protected _proxy: MainThreadQuickOpenShape, protected _extensionId: string, private _onDidDispose: () => void) {
-+	}
-+
-+	get enabled() {
-+		return this._enabled;
-+	}
-+
-+	set enabled(enabled: boolean) {
-+		this._enabled = enabled;
-+		this.update({ enabled });
-+	}
-+
-+	get busy() {
-+		return this._busy;
-+	}
-+
-+	set busy(busy: boolean) {
-+		this._busy = busy;
-+		this.update({ busy });
-+	}
-+
-+	get ignoreFocusOut() {
-+		return this._ignoreFocusOut;
-+	}
-+
-+	set ignoreFocusOut(ignoreFocusOut: boolean) {
-+		this._ignoreFocusOut = ignoreFocusOut;
-+		this.update({ ignoreFocusOut });
-+	}
-+
-+	show(): void {
-+		this._visible = true;
-+		this.update({ visible: true });
-+	}
-+
-+	hide(): void {
-+		this._visible = false;
-+		this.update({ visible: false });
-+	}
-+
-+	onDidHide = this._onDidHideEmitter.event;
-+
-+	public dispose(): void {
-+		if (this._disposed) {
-+			return;
-+		}
-+		this._disposed = true;
-+		this._disposables = dispose(this._disposables);
-+		if (this._updateTimeout) {
-+			clearTimeout(this._updateTimeout);
-+			this._updateTimeout = undefined;
-+		}
-+		this._proxy.$dispose(this._id);
-+		this._onDidDispose();
-+	}
-+
-+	protected update(properties: Record<string, any>): void {
-+		if (this._disposed) {
-+			return;
-+		}
-+		assign(this._pendingUpdate, properties);
-+
-+		if (!this._visible) {
-+			return;
-+		}
-+
-+		if (properties.visible) {
-+			if (this._updateTimeout) {
-+				clearTimeout(this._updateTimeout);
-+				this._updateTimeout = undefined;
-+			}
-+			this.dispatchUpdate();
-+		} else if (!this._updateTimeout) {
-+			// Defer the update so that multiple changes to setters dont cause a redraw each
-+			this._updateTimeout = setTimeout(() => {
-+				this._updateTimeout = undefined;
-+				this.dispatchUpdate();
-+			}, 0);
-+		}
-+	}
-+
-+	private dispatchUpdate() {
-+		this._proxy.$createOrUpdate(this._pendingUpdate);
-+		this._pendingUpdate = { id: this._id };
-+	}
-+}
-+
-+class ExtHostQuickPick extends ExtHostQuickInput implements QuickPick {
-+
-+	private _value = '';
-+	private _placeholder: string;
-+	private _onDidChangeValueEmitter = new Emitter<string>();
-+	private _onDidAcceptEmitter = new Emitter<void>();
-+	private _commands: QuickInputButton[] = [];
-+	private _onDidTriggerButtonEmitter = new Emitter<QuickInputButton>();
-+	private _items: QuickPickItem[] = [];
-+	private _handlesToItems = new Map<number, QuickPickItem>();
-+	private _canSelectMany = false;
-+	private _matchOnDescription = true;
-+	private _matchOnDetail = true;
-+	private _focusedItems: QuickPickItem[] = [];
-+	private _onDidChangeActiveEmitter = new Emitter<QuickPickItem[]>();
-+	private _selectedItems: QuickPickItem[] = [];
-+	private _onDidChangeSelectionEmitter = new Emitter<QuickPickItem[]>();
-+
-+	constructor(proxy: MainThreadQuickOpenShape, extensionId: string, onDispose: () => void) {
-+		super(proxy, extensionId, onDispose);
-+		this._disposables.push(
-+			this._onDidChangeValueEmitter,
-+			this._onDidAcceptEmitter,
-+			this._onDidTriggerButtonEmitter,
-+			this._onDidChangeActiveEmitter,
-+			this._onDidChangeSelectionEmitter,
-+		);
-+		this.update({ type: 'quickPick' });
-+	}
-+
-+	get value() {
-+		return this._value;
-+	}
-+
-+	set value(value: string) {
-+		this._value = value;
-+		this.update({ value });
-+	}
-+
-+	get placeholder() {
-+		return this._placeholder;
-+	}
-+
-+	set placeholder(placeholder: string) {
-+		this._placeholder = placeholder;
-+		this.update({ placeholder });
-+	}
-+
-+	onDidChangeValue = this._onDidChangeValueEmitter.event;
-+
-+	onDidAccept = this._onDidAcceptEmitter.event;
-+
-+	get buttons() {
-+		return this._commands;
-+	}
-+
-+	set buttons(commands: QuickInputButton[]) {
-+		this._commands = commands;
-+		this.update({ commands });
-+	}
-+
-+	onDidTriggerButton = this._onDidTriggerButtonEmitter.event;
-+
-+	get items() {
-+		return this._items;
-+	}
-+
-+	set items(items: QuickPickItem[]) {
-+		this._items = items;
-+		this._handlesToItems.clear();
-+		items.forEach((item, i) => {
-+			this._handlesToItems.set(i, item);
-+		});
-+		this.update({
-+			items: items.map((item, i) => ({
-+				label: item.label,
-+				description: item.description,
-+				handle: i,
-+				detail: item.detail,
-+				picked: item.picked
-+			}))
-+		});
-+	}
-+
-+	get canSelectMany() {
-+		return this._canSelectMany;
-+	}
-+
-+	set canSelectMany(canSelectMany: boolean) {
-+		this._canSelectMany = canSelectMany;
-+		this.update({ canSelectMany });
-+	}
-+
-+	get matchOnDescription() {
-+		return this._matchOnDescription;
-+	}
-+
-+	set matchOnDescription(matchOnDescription: boolean) {
-+		this._matchOnDescription = matchOnDescription;
-+		this.update({ matchOnDescription });
-+	}
-+
-+	get matchOnDetail() {
-+		return this._matchOnDetail;
-+	}
-+
-+	set matchOnDetail(matchOnDetail: boolean) {
-+		this._matchOnDetail = matchOnDetail;
-+		this.update({ matchOnDetail });
-+	}
-+
-+	get activeItems() {
-+		return this._focusedItems;
-+	}
-+
-+	onDidChangeActive = this._onDidChangeActiveEmitter.event;
-+
-+	get selectedItems() {
-+		return this._selectedItems;
-+	}
-+
-+	onDidChangeSelection = this._onDidChangeSelectionEmitter.event;
-+
-+	_fireDidAccept() {
-+		this._onDidAcceptEmitter.fire();
-+	}
-+
-+	_fireDidChangeFocus(handles: number[]) {
-+		const items = handles.map(handle => this._handlesToItems.get(handle));
-+		this._focusedItems = items;
-+		this._onDidChangeActiveEmitter.fire(items);
-+	}
-+
-+	_fireDidChangeSelection(handles: number[]) {
-+		const items = handles.map(handle => this._handlesToItems.get(handle));
-+		this._selectedItems = items;
-+		this._onDidChangeSelectionEmitter.fire(items);
-+	}
-+}
-+
-+class ExtHostInputBox extends ExtHostQuickInput implements InputBox {
-+
-+	private _value = '';
-+	private _placeholder: string;
-+	private _password: boolean;
-+	private _prompt: string;
-+	private _validationMessage: string;
-+	private _onDidChangeValueEmitter = new Emitter<string>();
-+	private _onDidAcceptEmitter = new Emitter<string>();
-+	private _commands: QuickInputButton[] = [];
-+	private _onDidTriggerButtonEmitter = new Emitter<QuickInputButton>();
-+
-+	constructor(proxy: MainThreadQuickOpenShape, extensionId: string, onDispose: () => void) {
-+		super(proxy, extensionId, onDispose);
-+		this._disposables.push(
-+			this._onDidChangeValueEmitter,
-+			this._onDidAcceptEmitter,
-+			this._onDidTriggerButtonEmitter,
-+		);
-+		this.update({ type: 'inputBox' });
-+>>>>>>> .their
- 	}
- 
- 	get value() {
-@@ -312,6 +606,7 @@
- 		this.update({ placeholder });
- 	}
- 
-+<<<<<<< .our
- 	onDidChangeValue = this._onDidChangeValueEmitter.event;
- 
- 	onDidAccept = this._onDidAcceptEmitter.event;
-@@ -561,6 +856,8 @@
- 		this.update({ type: 'inputBox' });
- 	}
- 
-+=======
-+>>>>>>> .their
- 	get password() {
- 		return this._password;
- 	}
-@@ -587,4 +884,22 @@
- 		this._validationMessage = validationMessage;
- 		this.update({ validationMessage });
- 	}
-+<<<<<<< .our
-+=======
-+
-+	onDidChangeValue = this._onDidChangeValueEmitter.event;
-+
-+	onDidAccept = this._onDidAcceptEmitter.event;
-+
-+	get buttons() {
-+		return this._commands;
-+	}
-+
-+	set buttons(commands: QuickInputButton[]) {
-+		this._commands = commands;
-+		this.update({ commands });
-+	}
-+
-+	onDidTriggerButton = this._onDidTriggerButtonEmitter.event;
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 630d3d6ba5f7b14b12d49ed0013a3f3315c4aab4 src/vs/workbench/browser/parts/quickinput/quickInput.css
-  our    100644 690286ea03324d7f2df24ff450315cac3c7620b3 src/vs/workbench/browser/parts/quickinput/quickInput.css
-  their  100644 b3e7a8784183fc792a07649d817e85d079125e06 src/vs/workbench/browser/parts/quickinput/quickInput.css
-@@ -155,11 +155,19 @@
- 	margin-left: 10px;
- }
- 
-+<<<<<<< .our
- .quick-input-widget .quick-input-list .quick-input-list-checkbox {
- 	display: none;
- }
- .quick-input-widget.show-checkboxes .quick-input-list .quick-input-list-checkbox {
- 	display: inline;
-+=======
-+.quick-input-widget .quick-input-list .quick-input-list-rows input[type=checkbox] {
-+	display: 'none';
-+}
-+.quick-input-widget.show-checkboxes .quick-input-list .quick-input-list-rows input[type=checkbox] {
-+	display: 'inline';
-+>>>>>>> .their
- }
- 
- .quick-input-list .quick-input-list-rows > .quick-input-list-row {
-changed in both
-  base   100644 dffd902c812482964da61f4dcebf0be17575736c src/vs/workbench/browser/parts/quickinput/quickInput.ts
-  our    100644 d834bd59460d51375417fd865daeb856b353a144 src/vs/workbench/browser/parts/quickinput/quickInput.ts
-  their  100644 7899036534a832c55cfca32c12679719eeeec405 src/vs/workbench/browser/parts/quickinput/quickInput.ts
-@@ -7,7 +7,11 @@
- 
- import 'vs/css!./quickInput';
- import { Component } from 'vs/workbench/common/component';
-+<<<<<<< .our
- import { IQuickInputService, IQuickPickItem, IPickOptions, IInputOptions, IQuickNavigateConfiguration, IQuickPick, IQuickInput, IQuickInputButton, IInputBox, IQuickPickItemButtonEvent, QuickPickInput, IQuickPickSeparator, IKeyMods } from 'vs/platform/quickinput/common/quickInput';
-+=======
-+import { IQuickInputService, IQuickPickItem, IPickOptions, IInputOptions, IQuickNavigateConfiguration, IQuickPick, IQuickInput, IQuickInputButton, IInputBox } from 'vs/platform/quickinput/common/quickInput';
-+>>>>>>> .their
- import { IPartService } from 'vs/workbench/services/part/common/partService';
- import * as dom from 'vs/base/browser/dom';
- import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-@@ -28,7 +32,11 @@
- import { attachBadgeStyler, attachProgressBarStyler, attachButtonStyler } from 'vs/platform/theme/common/styler';
- import { IEnvironmentService } from 'vs/platform/environment/common/environment';
- import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
-+<<<<<<< .our
- import { debounceEvent, Emitter, Event } from 'vs/base/common/event';
-+=======
-+import { chain, debounceEvent, Emitter, Event } from 'vs/base/common/event';
-+>>>>>>> .their
- import { Button } from 'vs/base/browser/ui/button/button';
- import { dispose, IDisposable } from 'vs/base/common/lifecycle';
- import Severity from 'vs/base/common/severity';
-@@ -48,6 +56,7 @@
- 
- type Writeable<T> = { -readonly [P in keyof T]: T[P] };
- 
-+<<<<<<< .our
- const backButton = {
- 	iconPath: {
- 		dark: URI.parse(require.toUrl('vs/workbench/browser/parts/quickinput/media/dark/arrow-left.svg')),
-@@ -56,6 +65,44 @@
- 	tooltip: localize('quickInput.back', "Back"),
- 	handle: -1 // TODO
- };
-+=======
-+type InputResult<P extends InputParameters> =
-+	P extends PickOneParameters<infer T> ? T :
-+	P extends PickManyParameters<infer T> ? T[] :
-+	P extends TextInputParameters ? string :
-+	never;
-+
-+interface BaseInputParameters {
-+	readonly type: 'pickOne' | 'pickMany' | 'textInput';
-+	readonly ignoreFocusLost?: boolean;
-+}
-+
-+interface PickParameters<T extends IQuickPickItem = IQuickPickItem> extends BaseInputParameters {
-+	readonly type: 'pickOne' | 'pickMany';
-+	readonly picks: TPromise<T[]>;
-+	readonly matchOnDescription?: boolean;
-+	readonly matchOnDetail?: boolean;
-+	readonly placeholder?: string;
-+}
-+
-+interface PickOneParameters<T extends IQuickPickItem = IQuickPickItem> extends PickParameters<T> {
-+	readonly type: 'pickOne';
-+}
-+
-+interface PickManyParameters<T extends IQuickPickItem = IQuickPickItem> extends PickParameters<T> {
-+	readonly type: 'pickMany';
-+}
-+
-+interface TextInputParameters extends BaseInputParameters {
-+	readonly type: 'textInput';
-+	readonly value?: string;
-+	readonly valueSelection?: [number, number];
-+	readonly prompt?: string;
-+	readonly placeHolder?: string;
-+	readonly password?: boolean;
-+	readonly validateInput?: (input: string) => TPromise<string>;
-+}
-+>>>>>>> .their
- 
- interface QuickInputUI {
- 	container: HTMLElement;
-@@ -70,6 +117,7 @@
- 	progressBar: ProgressBar;
- 	list: QuickInputList;
- 	onDidAccept: Event<void>;
-+<<<<<<< .our
- 	onDidTriggerButton: Event<IQuickInputButton>;
- 	ignoreFocusOut: boolean;
- 	keyMods: Writeable<IKeyMods>;
-@@ -332,6 +380,46 @@
- 	get value() {
- 		return this._value;
- 	}
-+=======
-+	ignoreFocusOut: boolean;
-+	show(controller: QuickInput): void;
-+	hide(): void;
-+	setVisibilities(visibilities: Visibilities): void;
-+	close(ok?: true | Thenable<never>): void;
-+}
-+
-+type Visibilities = { [k in keyof QuickInputUI]?: boolean; } & { ok?: boolean; };
-+
-+interface InputController<R> {
-+	readonly showUI: Visibilities;
-+	readonly result: TPromise<R>;
-+	readonly ready: TPromise<void>;
-+	readonly resolve: (ok?: true | Thenable<never>) => void | TPromise<void>;
-+}
-+
-+class PickOneController<T extends IQuickPickItem> implements InputController<T> {
-+	public showUI = { inputBox: true, list: true };
-+	public result: TPromise<T>;
-+	public ready: TPromise<void>;
-+	public resolve: (ok?: true | Thenable<never>) => void;
-+	public progress: (value: T) => void;
-+	private closed = false;
-+	private quickNavigate = false;
-+	private disposables: IDisposable[] = [];
-+
-+	constructor(private ui: QuickInputUI, parameters: PickOneParameters<T>) {
-+		this.result = new TPromise<T>((resolve, reject, progress) => {
-+			this.resolve = ok => resolve(ok === true ? <T>ui.list.getFocusedElements()[0] : ok);
-+			this.progress = progress;
-+		});
-+		this.result.then(() => this.dispose());
-+
-+		ui.inputBox.value = '';
-+		ui.inputBox.placeholder = parameters.placeholder || '';
-+		ui.list.matchOnDescription = parameters.matchOnDescription;
-+		ui.list.matchOnDetail = parameters.matchOnDetail;
-+		ui.list.setElements([]);
-+>>>>>>> .their
- 
- 	set value(value: string) {
- 		this._value = value || '';
-@@ -379,6 +467,7 @@
- 		this.update();
- 	}
- 
-+<<<<<<< .our
- 	get matchOnDetail() {
- 		return this._matchOnDetail;
- 	}
-@@ -424,6 +513,12 @@
- 				this.ui.inputBox.onDidChange(value => {
- 					if (value === this.value) {
- 						return;
-+=======
-+			this.disposables.push(
-+				ui.list.onDidChangeSelection(elements => {
-+					if (elements[0]) {
-+						ui.close(true);
-+>>>>>>> .their
- 					}
- 					this._value = value;
- 					this.ui.list.filter(this.ui.inputBox.value);
-@@ -517,11 +612,20 @@
- 		super.show();
- 	}
- 
-+<<<<<<< .our
- 	private registerQuickNavigation() {
- 		return dom.addDisposableListener(this.ui.container, dom.EventType.KEY_UP, (e: KeyboardEvent) => {
- 			if (this.canSelectMany || !this.quickNavigate) {
- 				return;
- 			}
-+=======
-+	configureQuickNavigate(quickNavigate: IQuickNavigateConfiguration) {
-+		// TODO: Add to new implementation.
-+		if (this.quickNavigate) {
-+			return;
-+		}
-+		this.quickNavigate = true;
-+>>>>>>> .their
- 
- 			const keyboardEvent: StandardKeyboardEvent = new StandardKeyboardEvent(e as KeyboardEvent);
- 			const keyCode = keyboardEvent.keyCode;
-@@ -620,6 +724,7 @@
- 	}
- }
- 
-+<<<<<<< .our
- class InputBox extends QuickInput implements IInputBox {
- 
- 	private static noPromptMessage = localize('inputModeEntry', "Press 'Enter' to confirm your input or 'Escape' to cancel");
-@@ -646,6 +751,41 @@
- 	get value() {
- 		return this._value;
- 	}
-+=======
-+class PickManyController<T extends IQuickPickItem> implements InputController<T[]> {
-+	public showUI = { checkAll: true, inputBox: true, count: true, ok: true, list: true };
-+	public result: TPromise<T[]>;
-+	public ready: TPromise<void>;
-+	public resolve: (ok?: true | Thenable<never>) => void;
-+	public progress: (value: T) => void;
-+	private closed = false;
-+	private disposables: IDisposable[] = [];
-+
-+	constructor(ui: QuickInputUI, parameters: PickManyParameters<T>) {
-+		this.result = new TPromise<T[]>((resolve, reject, progress) => {
-+			this.resolve = ok => resolve(ok === true ? <T[]>ui.list.getCheckedElements() : ok);
-+			this.progress = progress;
-+		});
-+		this.result.then(() => this.dispose());
-+
-+		ui.inputBox.value = '';
-+		ui.inputBox.placeholder = parameters.placeholder || '';
-+		ui.list.matchOnDescription = parameters.matchOnDescription;
-+		ui.list.matchOnDetail = parameters.matchOnDetail;
-+		ui.list.setElements([]);
-+		ui.checkAll.checked = ui.list.getAllVisibleChecked();
-+		ui.count.setCount(ui.list.getCheckedCount());
-+
-+		this.ready = parameters.picks.then(elements => {
-+			if (this.closed) {
-+				return;
-+			}
-+
-+			ui.list.setElements(elements);
-+			ui.list.filter(ui.inputBox.value);
-+			ui.checkAll.checked = ui.list.getAllVisibleChecked();
-+			ui.count.setCount(ui.list.getCheckedCount());
-+>>>>>>> .their
- 
- 	set value(value: string) {
- 		this._value = value || '';
-@@ -658,8 +798,45 @@
- 		this.update();
- 	}
- 
-+<<<<<<< .our
- 	get placeholder() {
- 		return this._placeholder;
-+=======
-+class TextInputController implements InputController<string> {
-+	public showUI = { inputBox: true, message: true };
-+	public result: TPromise<string>;
-+	public ready = TPromise.as(null);
-+	public resolveResult: (string) => void;
-+	private validationValue: string;
-+	private validation: TPromise<string>;
-+	private defaultMessage: string;
-+	private disposables: IDisposable[] = [];
-+
-+	constructor(private ui: QuickInputUI, private parameters: TextInputParameters) {
-+		this.result = new TPromise<string>((resolve, reject, progress) => {
-+			this.resolveResult = resolve;
-+		});
-+		this.result.then(() => this.dispose());
-+
-+		ui.inputBox.value = parameters.value || '';
-+		const selection = parameters.valueSelection;
-+		ui.inputBox.select(selection && { start: selection[0], end: selection[1] });
-+		ui.inputBox.placeholder = parameters.placeHolder || '';
-+		this.defaultMessage = parameters.prompt
-+			? localize('inputModeEntryDescription', "{0} (Press 'Enter' to confirm or 'Escape' to cancel)", parameters.prompt)
-+			: localize('inputModeEntry', "Press 'Enter' to confirm your input or 'Escape' to cancel");
-+		ui.message.textContent = this.defaultMessage;
-+		ui.inputBox.password = parameters.password;
-+
-+		if (parameters.validateInput) {
-+			const onDidChange = debounceEvent(ui.inputBox.onDidChange, (last, cur) => cur, 100);
-+			this.disposables.push(onDidChange(() => this.didChange()));
-+			if (ui.inputBox.value) {
-+				// Replicating old behavior: only fire if value is not empty.
-+				this.didChange();
-+			}
-+		}
-+>>>>>>> .their
- 	}
- 
- 	set placeholder(placeholder: string) {
-@@ -762,6 +939,7 @@
- 	private okContainer: HTMLElement;
- 	private ok: Button;
- 	private ui: QuickInputUI;
-+<<<<<<< .our
- 	private enabled = true;
- 	private inQuickOpenWidgets: Record<string, boolean> = {};
- 	private inQuickOpenContext: IContextKey<boolean>;
-@@ -770,6 +948,15 @@
- 	private onDidTriggerButtonEmitter = this._register(new Emitter<IQuickInputButton>());
- 
- 	private controller: QuickInput;
-+=======
-+	private ready = false;
-+	private inQuickOpenWidgets: Record<string, boolean> = {};
-+	private inQuickOpenContext: IContextKey<boolean>;
-+	private onDidAcceptEmitter = new Emitter<void>();
-+
-+	private controller: InputController<any>;
-+	private controller2: QuickInput;
-+>>>>>>> .their
- 
- 	constructor(
- 		@IEnvironmentService private environmentService: IEnvironmentService,
-@@ -784,8 +971,16 @@
- 	) {
- 		super(QuickInputService.ID, themeService);
- 		this.inQuickOpenContext = new RawContextKey<boolean>('inQuickOpen', false).bindTo(contextKeyService);
-+<<<<<<< .our
- 		this._register(this.quickOpenService.onShow(() => this.inQuickOpen('quickOpen', true)));
- 		this._register(this.quickOpenService.onHide(() => this.inQuickOpen('quickOpen', false)));
-+=======
-+		this.toUnbind.push(
-+			this.quickOpenService.onShow(() => this.inQuickOpen('quickOpen', true)),
-+			this.quickOpenService.onHide(() => this.inQuickOpen('quickOpen', false)),
-+			this.onDidAcceptEmitter
-+		);
-+>>>>>>> .their
- 	}
- 
- 	private inQuickOpen(widget: 'quickInput' | 'quickOpen', open: boolean) {
-@@ -883,17 +1078,32 @@
- 		this._register(attachBadgeStyler(count, this.themeService));
- 
- 		this.okContainer = dom.append(headerContainer, $('.quick-input-action'));
-+<<<<<<< .our
- 		this.ok = new Button(this.okContainer);
- 		attachButtonStyler(this.ok, this.themeService);
- 		this.ok.label = localize('ok', "OK");
- 		this._register(this.ok.onDidClick(e => {
- 			this.onDidAcceptEmitter.fire();
-+=======
-+		const ok = new Button(this.okContainer);
-+		attachButtonStyler(ok, this.themeService);
-+		ok.label = localize('ok', "OK");
-+		this.toUnbind.push(ok.onDidClick(e => {
-+			if (this.controller) {
-+				if (this.ready) {
-+					this.close(true);
-+				}
-+			} else {
-+				this.onDidAcceptEmitter.fire(); // TODO: make single-select QuickPick exclusively use Accept?
-+			}
-+>>>>>>> .their
- 		}));
- 
- 		const message = dom.append(container, $('.quick-input-message'));
- 
- 		const progressBar = new ProgressBar(container);
- 		dom.addClass(progressBar.getContainer(), 'quick-input-progress');
-+<<<<<<< .our
- 		this._register(attachProgressBarStyler(progressBar, this.themeService));
- 
- 		const list = this._register(this.instantiationService.createInstance(QuickInputList, container));
-@@ -904,6 +1114,16 @@
- 			visibleCount.setCount(c);
- 		}));
- 		this._register(list.onChangedCheckedCount(c => {
-+=======
-+		this.toUnbind.push(attachProgressBarStyler(progressBar, this.themeService));
-+
-+		const list = this.instantiationService.createInstance(QuickInputList, container);
-+		this.toUnbind.push(list);
-+		this.toUnbind.push(list.onChangedAllVisibleChecked(checked => {
-+			checkAll.checked = checked;
-+		}));
-+		this.toUnbind.push(list.onChangedCheckedCount(c => {
-+>>>>>>> .their
- 			count.setCount(c);
- 		}));
- 		this._register(list.onLeave(() => {
-@@ -915,12 +1135,43 @@
- 				}
- 			}, 0);
- 		}));
-+<<<<<<< .our
- 
- 		const focusTracker = dom.trackFocus(container);
- 		this._register(focusTracker);
- 		this._register(focusTracker.onDidBlur(() => {
- 			if (!this.ui.ignoreFocusOut && !this.environmentService.args['sticky-quickopen'] && this.configurationService.getValue(CLOSE_ON_FOCUS_LOST_CONFIG)) {
- 				this.hide(true);
-+=======
-+		this.toUnbind.push(
-+			chain(list.onDidChangeFocus)
-+				.map(e => e[0])
-+				.filter(e => !!e)
-+				.latch()
-+				.on(e => {
-+					if (this.controller instanceof PickOneController || this.controller instanceof PickManyController) {
-+						this.controller.progress(e);
-+					}
-+				})
-+		);
-+
-+		this.toUnbind.push(dom.addDisposableListener(container, 'focusout', (e: FocusEvent) => {
-+			if (e.relatedTarget === container) {
-+				(<HTMLElement>e.target).focus();
-+				return;
-+			}
-+			for (let element = <Element>e.relatedTarget; element; element = element.parentElement) {
-+				if (element === container) {
-+					return;
-+				}
-+			}
-+			if (!this.ui.ignoreFocusOut && !this.environmentService.args['sticky-quickopen'] && this.configurationService.getValue(CLOSE_ON_FOCUS_LOST_CONFIG)) {
-+				if (this.controller) {
-+					this.close(undefined, true);
-+				} else {
-+					this.hide2(true);
-+				}
-+>>>>>>> .their
- 			}
- 		}));
- 		this._register(dom.addDisposableListener(container, dom.EventType.KEY_DOWN, (e: KeyboardEvent) => {
-@@ -928,11 +1179,29 @@
- 			switch (event.keyCode) {
- 				case KeyCode.Enter:
- 					dom.EventHelper.stop(e, true);
-+<<<<<<< .our
- 					this.onDidAcceptEmitter.fire();
- 					break;
- 				case KeyCode.Escape:
- 					dom.EventHelper.stop(e, true);
- 					this.hide();
-+=======
-+					if (this.controller) {
-+						if (this.ready) {
-+							this.close(true);
-+						}
-+					} else {
-+						this.onDidAcceptEmitter.fire();
-+					}
-+					break;
-+				case KeyCode.Escape:
-+					dom.EventHelper.stop(e, true);
-+					if (this.controller) {
-+						this.close();
-+					} else {
-+						this.hide2();
-+					}
-+>>>>>>> .their
- 					break;
- 				case KeyCode.Tab:
- 					if (!event.altKey && !event.ctrlKey && !event.metaKey) {
-@@ -982,6 +1251,7 @@
- 			}
- 		}));
- 
-+<<<<<<< .our
- 		this._register(this.quickOpenService.onShow(() => this.hide(true)));
- 
- 		this.ui = {
-@@ -992,11 +1262,20 @@
- 			checkAll,
- 			inputBox,
- 			visibleCount,
-+=======
-+		this.toUnbind.push(this.quickOpenService.onShow(() => this.controller ? this.close() : this.hide2()));
-+
-+		this.ui = {
-+			container,
-+			checkAll,
-+			inputBox,
-+>>>>>>> .their
- 			count,
- 			message,
- 			progressBar,
- 			list,
- 			onDidAccept: this.onDidAcceptEmitter.event,
-+<<<<<<< .our
- 			onDidTriggerButton: this.onDidTriggerButtonEmitter.event,
- 			ignoreFocusOut: false,
- 			keyMods: { ctrlCmd: false, alt: false },
-@@ -1005,10 +1284,18 @@
- 			setVisibilities: visibilities => this.setVisibilities(visibilities),
- 			setEnabled: enabled => this.setEnabled(enabled),
- 			setContextKey: contextKey => this.setContextKey(contextKey),
-+=======
-+			ignoreFocusOut: false,
-+			show: controller => this.show2(controller),
-+			hide: () => this.hide2(),
-+			setVisibilities: visibilities => this.setVisibilities(visibilities),
-+			close: ok => this.close(ok)
-+>>>>>>> .their
- 		};
- 		this.updateStyles();
- 	}
- 
-+<<<<<<< .our
- 	pick<T extends IQuickPickItem, O extends IPickOptions<T>>(picks: TPromise<QuickPickInput<T>[]> | QuickPickInput<T>[], options: O = <O>{}, token: CancellationToken = CancellationToken.None): TPromise<O extends { canPickMany: true } ? T[] : T> {
- 		return new TPromise<O extends { canPickMany: true } ? T[] : T>((doResolve, reject) => {
- 			let resolve = (result: any) => {
-@@ -1175,6 +1462,168 @@
- 	}
- 
- 	private show(controller: QuickInput) {
-+=======
-+	private close(ok?: true | Thenable<never>, focusLost?: boolean) {
-+		if (!this.isDisplayed()) {
-+			return TPromise.as(undefined);
-+		}
-+		if (this.controller) {
-+			const resolved = this.controller.resolve(ok);
-+			if (resolved) {
-+				const result = resolved
-+					.then(() => {
-+						this.hide(focusLost);
-+					});
-+				result.then(null, onUnexpectedError);
-+				return result;
-+			}
-+		}
-+		this.hide(focusLost);
-+		return TPromise.as(undefined);
-+	}
-+
-+	private hide(focusLost?: boolean) {
-+		this.inQuickOpen('quickInput', false);
-+		this.ui.container.style.display = 'none';
-+		if (!focusLost) {
-+			this.editorGroupService.activeGroup.focus();
-+		}
-+	}
-+
-+	private hide2(focusLost?: boolean) {
-+		const controller = this.controller2;
-+		if (controller) {
-+			this.controller2 = null;
-+			this.hide(focusLost);
-+			controller.doHide();
-+		}
-+	}
-+
-+	pick<T extends IQuickPickItem, O extends IPickOptions>(picks: TPromise<T[]>, options: O = <O>{}, token: CancellationToken = CancellationToken.None): TPromise<O extends { canPickMany: true } ? T[] : T> {
-+		return new TPromise<O extends { canPickMany: true } ? T[] : T>((resolve, reject, progress) => {
-+			if (token.isCancellationRequested) {
-+				resolve(undefined);
-+				return;
-+			}
-+			const input = this.createQuickPick();
-+			const disposables = [
-+				input,
-+				input.onDidAccept(() => {
-+					if (input.canSelectMany) {
-+						resolve(<any>input.selectedItems); // TODO: generify interface to use T extends IQuickPickItem
-+						input.hide();
-+					} else {
-+						const result = input.activeItems[0];
-+						if (result) {
-+							resolve(<any>result);
-+							input.hide();
-+						}
-+					}
-+				}),
-+				input.onDidChangeActive(items => {
-+					const focused = items[0];
-+					if (focused) {
-+						progress(focused);
-+					}
-+				}),
-+				input.onDidChangeSelection(items => {
-+					if (!input.canSelectMany) {
-+						const result = items[0];
-+						if (result) {
-+							resolve(<any>result);
-+							input.hide();
-+						}
-+					}
-+				}),
-+				token.onCancellationRequested(() => {
-+					input.hide();
-+				}),
-+				input.onDidHide(() => {
-+					dispose(disposables);
-+					resolve(undefined);
-+				}),
-+			];
-+			input.canSelectMany = options.canPickMany;
-+			input.placeholder = options.placeHolder;
-+			input.ignoreFocusOut = options.ignoreFocusLost;
-+			input.matchOnDescription = options.matchOnDescription;
-+			input.matchOnDetail = options.matchOnDetail;
-+			input.busy = true;
-+			picks.then(items => {
-+				input.busy = false;
-+				input.items = items;
-+			});
-+			input.show();
-+			picks.then(null, err => {
-+				reject(err);
-+				input.hide();
-+			});
-+		});
-+	}
-+
-+	input(options: IInputOptions = {}, token: CancellationToken = CancellationToken.None): TPromise<string> {
-+		return new TPromise<string>((resolve, reject) => {
-+			if (token.isCancellationRequested) {
-+				resolve(undefined);
-+				return;
-+			}
-+			const input = this.createInputBox();
-+			const validateInput = options.validateInput || (() => TPromise.as(undefined));
-+			const onDidValueChange = debounceEvent(input.onDidChangeValue, (last, cur) => cur, 100);
-+			let validationValue: string;
-+			let validation = TPromise.as('');
-+			const disposables = [
-+				input,
-+				onDidValueChange(value => {
-+					if (value !== validationValue) {
-+						validation = TPromise.wrap(validateInput(value));
-+					}
-+					validation.then(result => {
-+						input.validationMessage = result;
-+					});
-+				}),
-+				input.onDidAccept(() => {
-+					const value = input.value;
-+					if (value !== validationValue) {
-+						validation = TPromise.wrap(validateInput(value));
-+					}
-+					validation.then(result => {
-+						if (!result) {
-+							resolve(value);
-+							input.hide();
-+						}
-+					});
-+				}),
-+				token.onCancellationRequested(() => {
-+					input.hide();
-+				}),
-+				input.onDidHide(() => {
-+					dispose(disposables);
-+					resolve(undefined);
-+				}),
-+			];
-+			input.value = options.value;
-+			input.valueSelection = options.valueSelection;
-+			input.prompt = options.prompt;
-+			input.placeholder = options.placeHolder;
-+			input.password = options.password;
-+			input.ignoreFocusOut = options.ignoreFocusLost;
-+			input.show();
-+		});
-+	}
-+
-+	createQuickPick(): IQuickPick {
-+		this.create();
-+		return new QuickPick(this.ui);
-+	}
-+
-+	createInputBox(): IInputBox {
-+		this.create();
-+		return new InputBox(this.ui);
-+	}
-+
-+	show<P extends InputParameters>(parameters: P, token: CancellationToken = CancellationToken.None): TPromise<InputResult<P>> {
-+>>>>>>> .their
- 		this.create();
- 		this.quickOpenService.close();
- 		const oldController = this.controller;
-@@ -1183,6 +1632,7 @@
- 			oldController.didHide();
- 		}
- 
-+<<<<<<< .our
- 		this.setEnabled(true);
- 		this.ui.leftActionBar.clear();
- 		this.ui.title.textContent = '';
-@@ -1208,6 +1658,18 @@
- 
- 		this.inQuickOpen('quickInput', true);
- 		this.resetContextKeys();
-+=======
-+		this.ui.container.setAttribute('data-type', parameters.type);
-+
-+		this.ui.ignoreFocusOut = parameters.ignoreFocusLost;
-+
-+		this.ui.progressBar.stop();
-+		this.ready = false;
-+
-+		this.controller = this.createController(parameters);
-+		this.setVisibilities(this.controller.showUI);
-+		this.ui.inputBox.showDecoration(Severity.Ignore);
-+>>>>>>> .their
- 
- 		this.ui.container.style.display = '';
- 		this.updateLayout();
-@@ -1227,15 +1689,23 @@
- 		this.updateLayout(); // TODO
- 	}
- 
-+<<<<<<< .our
- 	private setEnabled(enabled: boolean) {
- 		if (enabled !== this.enabled) {
- 			this.enabled = enabled;
- 			for (const item of this.ui.leftActionBar.items) {
- 				(item as ActionItem).getAction().enabled = enabled;
-+=======
-+		const delay = TPromise.timeout(800);
-+		delay.then(() => {
-+			if (this.controller === wasController) {
-+				this.ui.progressBar.infinite();
-+>>>>>>> .their
- 			}
- 			for (const item of this.ui.rightActionBar.items) {
- 				(item as ActionItem).getAction().enabled = enabled;
- 			}
-+<<<<<<< .our
- 			this.ui.checkAll.disabled = !enabled;
- 			// this.ui.inputBox.enabled = enabled; Avoid loosing focus.
- 			this.ok.enabled = enabled;
-@@ -1255,6 +1725,67 @@
- 			}
- 			controller.didHide();
- 		}
-+=======
-+
-+			this.ui.progressBar.stop();
-+			this.ready = true;
-+
-+			this.updateLayout();
-+		}).then(null, reason => this.close(TPromise.wrapError(reason)));
-+
-+		return this.controller.result;
-+	}
-+
-+	private createController(parameters: InputParameters) {
-+		switch (parameters.type) {
-+			case 'pickOne': return new PickOneController(this.ui, parameters);
-+			case 'pickMany': return new PickManyController(this.ui, parameters);
-+			case 'textInput': return new TextInputController(this.ui, parameters);
-+			default: ((p: never) => {
-+				throw new Error(`Unknown input type: ${(<any>p).type}`);
-+			})(parameters);
-+		}
-+	}
-+
-+	private show2(controller: QuickInput) {
-+		this.create();
-+		this.quickOpenService.close();
-+		const oldController = this.controller2;
-+		this.controller2 = controller;
-+		if (oldController) {
-+			oldController.doHide();
-+		}
-+
-+		this.ui.checkAll.checked = false;
-+		this.ui.inputBox.value = '';
-+		this.ui.inputBox.placeholder = '';
-+		this.ui.inputBox.password = false;
-+		this.ui.inputBox.showDecoration(Severity.Ignore);
-+		this.ui.count.setCount(0);
-+		this.ui.message.textContent = '';
-+		this.ui.progressBar.stop();
-+		this.ui.list.setElements([]);
-+		this.ui.list.matchOnDescription = false;
-+		this.ui.list.matchOnDetail = false;
-+		this.ui.ignoreFocusOut = false;
-+
-+		this.inQuickOpen('quickInput', true);
-+
-+		this.ui.container.style.display = '';
-+		this.updateLayout();
-+		this.ui.inputBox.setFocus();
-+	}
-+
-+	private setVisibilities(visibilities: Visibilities) {
-+		this.ui.checkAll.style.display = visibilities.checkAll ? '' : 'none';
-+		this.filterContainer.style.display = visibilities.inputBox ? '' : 'none';
-+		this.countContainer.style.display = visibilities.count ? '' : 'none';
-+		this.okContainer.style.display = visibilities.ok ? '' : 'none';
-+		this.ui.message.style.display = visibilities.message ? '' : 'none';
-+		this.ui.list.display(visibilities.list);
-+		this.ui.container.classList[visibilities.checkAll ? 'add' : 'remove']('show-checkboxes');
-+		this.updateLayout(); // TODO
-+>>>>>>> .their
- 	}
- 
- 	focus() {
-@@ -1264,7 +1795,11 @@
- 	}
- 
- 	toggle() {
-+<<<<<<< .our
- 		if (this.isDisplayed() && this.controller instanceof QuickPick && this.controller.canSelectMany) {
-+=======
-+		if (this.isDisplayed() && ((this.controller2 instanceof QuickPick && this.controller2.canSelectMany) || this.controller instanceof PickManyController)) {
-+>>>>>>> .their
- 			this.ui.list.toggleCheckbox();
- 		}
- 	}
-@@ -1279,6 +1814,7 @@
- 	}
- 
- 	accept() {
-+<<<<<<< .our
- 		this.onDidAcceptEmitter.fire();
- 		return TPromise.as(undefined);
- 	}
-@@ -1291,6 +1827,23 @@
- 	cancel() {
- 		this.hide();
- 		return TPromise.as(undefined);
-+=======
-+		if (this.controller) {
-+			return this.close(true);
-+		} else {
-+			this.onDidAcceptEmitter.fire();
-+			return TPromise.as(undefined);
-+		}
-+	}
-+
-+	cancel() {
-+		if (this.controller) {
-+			return this.close();
-+		} else {
-+			this.hide2();
-+			return TPromise.as(undefined);
-+		}
-+>>>>>>> .their
- 	}
- 
- 	layout(dimension: dom.Dimension): void {
-@@ -1347,6 +1900,7 @@
- 	}
- };
- 
-+<<<<<<< .our
- export class BackAction extends Action {
- 
- 	public static readonly ID = 'workbench.action.quickInputBack';
-@@ -1361,3 +1915,437 @@
- 		return TPromise.as(null);
- 	}
- }
-+=======
-+class QuickInput implements IQuickInput {
-+
-+	protected visible = false;
-+	private _enabled = true;
-+	private _busy = false;
-+	private _ignoreFocusOut = false;
-+	private onDidHideEmitter = new Emitter<void>();
-+
-+	protected visibleDisposables: IDisposable[] = [];
-+	protected disposables: IDisposable[] = [];
-+
-+	private busyDelay: TPromise<void>;
-+
-+	constructor(protected ui: QuickInputUI) {
-+		this.disposables.push(this.onDidHideEmitter);
-+	}
-+
-+	get enabled() {
-+		return this._enabled;
-+	}
-+
-+	set enabled(enabled: boolean) {
-+		this._enabled = enabled;
-+		this.update(); // TODO
-+	}
-+
-+	get busy() {
-+		return this._busy;
-+	}
-+
-+	set busy(busy: boolean) {
-+		this._busy = busy;
-+		this.update();
-+	}
-+
-+	get ignoreFocusOut() {
-+		return this._ignoreFocusOut;
-+	}
-+
-+	set ignoreFocusOut(ignoreFocusOut: boolean) {
-+		this._ignoreFocusOut = ignoreFocusOut;
-+		this.update();
-+	}
-+
-+	show(): void {
-+		if (this.visible) {
-+			return;
-+		}
-+		this.ui.show(this);
-+		this.visible = true;
-+		this.update();
-+	}
-+
-+	hide(): void {
-+		if (!this.visible) {
-+			return;
-+		}
-+		this.ui.hide();
-+	}
-+
-+	doHide(): void {
-+		this.visible = false;
-+		this.visibleDisposables = dispose(this.visibleDisposables);
-+		this.onDidHideEmitter.fire();
-+	}
-+
-+	onDidHide = this.onDidHideEmitter.event;
-+
-+	protected update() {
-+		if (!this.visible) {
-+			return;
-+		}
-+		if (this.busy && !this.busyDelay) {
-+			this.busyDelay = TPromise.timeout(800);
-+			this.busyDelay.then(() => {
-+				this.ui.progressBar.infinite();
-+			}, () => { /* ignore */ });
-+		}
-+		if (!this.busy && this.busyDelay) {
-+			this.ui.progressBar.stop();
-+			this.busyDelay.cancel();
-+			this.busyDelay = null;
-+		}
-+	}
-+
-+	public dispose(): void {
-+		this.hide();
-+		this.disposables = dispose(this.disposables);
-+	}
-+}
-+
-+class QuickPick extends QuickInput implements IQuickPick {
-+
-+	private _value = '';
-+	private _placeholder = '';
-+	private onDidChangeValueEmitter = new Emitter<string>();
-+	private onDidAcceptEmitter = new Emitter<string>();
-+	private _commands: IQuickInputButton[] = [];
-+	private onDidTriggerCommandEmitter = new Emitter<IQuickInputButton>();
-+	private _items: IQuickPickItem[] = [];
-+	private itemsUpdated = false;
-+	private _canSelectMany = false;
-+	private _matchOnDescription = true;
-+	private _matchOnDetail = true;
-+	private _activeItems: IQuickPickItem[] = [];
-+	private onDidChangeActiveEmitter = new Emitter<IQuickPickItem[]>();
-+	private _selectedItems: IQuickPickItem[] = [];
-+	private onDidChangeSelectionEmitter = new Emitter<IQuickPickItem[]>();
-+
-+	constructor(ui: QuickInputUI) {
-+		super(ui);
-+		this.disposables.push(
-+			this.onDidChangeValueEmitter,
-+			this.onDidAcceptEmitter,
-+			this.onDidTriggerCommandEmitter,
-+			this.onDidChangeActiveEmitter,
-+			this.onDidChangeSelectionEmitter,
-+		);
-+	}
-+
-+	get value() {
-+		return this._value;
-+	}
-+
-+	set value(value: string) {
-+		this._value = value || '';
-+		this.update();
-+	}
-+
-+	get placeholder() {
-+		return this._placeholder;
-+	}
-+
-+	set placeholder(placeholder: string) {
-+		this._placeholder = placeholder || '';
-+		this.update();
-+	}
-+
-+	onDidValueChange = this.onDidChangeValueEmitter.event;
-+
-+	onDidAccept = this.onDidAcceptEmitter.event;
-+
-+	get buttons() {
-+		return this._commands;
-+	}
-+
-+	set buttons(commands: IQuickInputButton[]) {
-+		this._commands = commands;
-+		this.update(); // TODO
-+	}
-+
-+	onDidTriggerCommand = this.onDidTriggerCommandEmitter.event;
-+
-+	get items() {
-+		return this._items;
-+	}
-+
-+	set items(items: IQuickPickItem[]) {
-+		this._items = items;
-+		this.itemsUpdated = true;
-+		this.update();
-+	}
-+
-+	get canSelectMany() {
-+		return this._canSelectMany;
-+	}
-+
-+	set canSelectMany(canSelectMany: boolean) {
-+		this._canSelectMany = canSelectMany;
-+		this.update();
-+	}
-+
-+	get matchOnDescription() {
-+		return this._matchOnDescription;
-+	}
-+
-+	set matchOnDescription(matchOnDescription: boolean) {
-+		this._matchOnDescription = matchOnDescription;
-+		this.update();
-+	}
-+
-+	get matchOnDetail() {
-+		return this._matchOnDetail;
-+	}
-+
-+	set matchOnDetail(matchOnDetail: boolean) {
-+		this._matchOnDetail = matchOnDetail;
-+		this.update();
-+	}
-+
-+	get activeItems() {
-+		return this._activeItems;
-+	}
-+
-+	onDidChangeActive = this.onDidChangeActiveEmitter.event;
-+
-+	get selectedItems() {
-+		return this._selectedItems;
-+	}
-+
-+	onDidChangeSelection = this.onDidChangeSelectionEmitter.event;
-+
-+	show() {
-+		if (!this.visible) {
-+			// TODO: this.onDidTriggerCommandEmitter,
-+			this.visibleDisposables.push(
-+				this.ui.inputBox.onDidChange(value => {
-+					this._value = value;
-+					this.ui.list.filter(this.ui.inputBox.value);
-+					if (!this.canSelectMany) {
-+						this.ui.list.focus('First');
-+					}
-+					this.onDidChangeValueEmitter.fire(value);
-+				}),
-+				this.ui.inputBox.onKeyDown(event => {
-+					switch (event.keyCode) {
-+						case KeyCode.DownArrow:
-+							this.ui.list.focus('Next');
-+							if (this.canSelectMany) {
-+								this.ui.list.domFocus();
-+							}
-+							break;
-+						case KeyCode.UpArrow:
-+							this.ui.list.focus('Previous');
-+							if (this.canSelectMany) {
-+								this.ui.list.domFocus();
-+							}
-+							break;
-+					}
-+				}),
-+				this.ui.onDidAccept(() => this.onDidAcceptEmitter.fire()),
-+				this.ui.list.onDidChangeFocus(focusedItems => {
-+					// Drop initial event.
-+					if (!focusedItems.length && !this._activeItems.length) {
-+						return;
-+					}
-+					this._activeItems = focusedItems;
-+					this.onDidChangeActiveEmitter.fire(focusedItems);
-+				}),
-+				this.ui.list.onDidChangeSelection(selectedItems => {
-+					if (this.canSelectMany) {
-+						return;
-+					}
-+					// Drop initial event.
-+					if (!selectedItems.length && !this._selectedItems.length) {
-+						return;
-+					}
-+					this._selectedItems = selectedItems;
-+					this.onDidChangeSelectionEmitter.fire(selectedItems);
-+				}),
-+				this.ui.list.onChangedCheckedElements(checkedItems => {
-+					if (!this.canSelectMany) {
-+						return;
-+					}
-+					this._selectedItems = checkedItems;
-+					this.onDidChangeSelectionEmitter.fire(checkedItems);
-+				}),
-+			);
-+		}
-+		super.show();
-+	}
-+
-+	protected update() {
-+		super.update();
-+		if (!this.visible) {
-+			return;
-+		}
-+		if (this.ui.inputBox.value !== this.value) {
-+			this.ui.inputBox.value = this.value;
-+		}
-+		if (this.ui.inputBox.placeholder !== this.placeholder) {
-+			this.ui.inputBox.placeholder = this.placeholder;
-+		}
-+		if (this.itemsUpdated) {
-+			this.ui.list.setElements(this.items);
-+			this.ui.list.filter(this.ui.inputBox.value);
-+			this.ui.checkAll.checked = this.ui.list.getAllVisibleChecked();
-+			this.ui.count.setCount(this.ui.list.getCheckedCount());
-+			if (!this.canSelectMany) {
-+				this.ui.list.focus('First');
-+			}
-+			this.itemsUpdated = false;
-+		}
-+		if (this.ui.container.classList.contains('show-checkboxes') !== this.canSelectMany) {
-+			if (this.canSelectMany) {
-+				this.ui.list.clearFocus();
-+			} else {
-+				this.ui.list.focus('First');
-+			}
-+		}
-+		this.ui.ignoreFocusOut = this.ignoreFocusOut;
-+		this.ui.list.matchOnDescription = this.matchOnDescription;
-+		this.ui.list.matchOnDetail = this.matchOnDetail;
-+		this.ui.setVisibilities(this.canSelectMany ? { checkAll: true, inputBox: true, count: true, ok: true, list: true } : { inputBox: true, list: true });
-+	}
-+}
-+
-+class InputBox extends QuickInput implements IInputBox {
-+
-+	private _value = '';
-+	private _valueSelection: Readonly<[number, number]>;
-+	private valueSelectionUpdated = true;
-+	private _placeholder = '';
-+	private _password = false;
-+	private _prompt = '';
-+	private _validationMessage = '';
-+	private onDidValueChangeEmitter = new Emitter<string>();
-+	private onDidAcceptEmitter = new Emitter<string>();
-+	private _commands: IQuickInputButton[] = [];
-+	private onDidTriggerCommandEmitter = new Emitter<IQuickInputButton>();
-+
-+	constructor(ui: QuickInputUI) {
-+		super(ui);
-+		this.disposables.push(
-+			this.onDidValueChangeEmitter,
-+			this.onDidAcceptEmitter,
-+			this.onDidTriggerCommandEmitter,
-+		);
-+	}
-+
-+	get value() {
-+		return this._value;
-+	}
-+
-+	set value(value: string) {
-+		this._value = value || '';
-+		this.update();
-+	}
-+
-+	set valueSelection(valueSelection: Readonly<[number, number]>) {
-+		this._valueSelection = valueSelection;
-+		this.valueSelectionUpdated = true;
-+		this.update();
-+	}
-+
-+	get placeholder() {
-+		return this._placeholder;
-+	}
-+
-+	set placeholder(placeholder: string) {
-+		this._placeholder = placeholder || '';
-+		this.update();
-+	}
-+
-+	get password() {
-+		return this._password;
-+	}
-+
-+	set password(password: boolean) {
-+		this._password = password || false;
-+		this.update();
-+	}
-+
-+	get prompt() {
-+		return this._prompt;
-+	}
-+
-+	set prompt(prompt: string) {
-+		this._prompt = prompt || '';
-+		this.update();
-+	}
-+
-+	get validationMessage() {
-+		return this._validationMessage;
-+	}
-+
-+	set validationMessage(validationMessage: string) {
-+		this._validationMessage = validationMessage || '';
-+		this.update();
-+	}
-+
-+	onDidChangeValue = this.onDidValueChangeEmitter.event;
-+
-+	onDidAccept = this.onDidAcceptEmitter.event;
-+
-+	get buttons() {
-+		return this._commands;
-+	}
-+
-+	set buttons(commands: IQuickInputButton[]) {
-+		this._commands = commands;
-+		this.update(); // TODO
-+	}
-+
-+	onDidTriggerButton = this.onDidTriggerCommandEmitter.event;
-+
-+	show() {
-+		if (!this.visible) {
-+			// TODO: this.onDidTriggerCommandEmitter,
-+			this.visibleDisposables.push(
-+				this.ui.inputBox.onDidChange(value => {
-+					this._value = value;
-+					this.onDidValueChangeEmitter.fire(value);
-+				}),
-+				this.ui.onDidAccept(() => this.onDidAcceptEmitter.fire()),
-+			);
-+		}
-+		super.show();
-+	}
-+
-+	protected update() {
-+		super.update();
-+		if (!this.visible) {
-+			return;
-+		}
-+		if (this.ui.inputBox.value !== this.value) {
-+			this.ui.inputBox.value = this.value;
-+		}
-+		if (this.valueSelectionUpdated) {
-+			this.valueSelectionUpdated = false;
-+			this.ui.inputBox.select(this._valueSelection && { start: this._valueSelection[0], end: this._valueSelection[1] });
-+		}
-+		if (this.ui.inputBox.placeholder !== this.placeholder) {
-+			this.ui.inputBox.placeholder = this.placeholder;
-+		}
-+		if (this.ui.inputBox.password !== this.password) {
-+			this.ui.inputBox.password = this.password;
-+		}
-+		if (this.ui.inputBox.password !== this.password) {
-+			this.ui.inputBox.password = this.password;
-+		}
-+		if (!this.validationMessage && this.ui.message.textContent !== this.prompt) {
-+			this.ui.message.textContent = this.prompt;
-+			this.ui.inputBox.showDecoration(Severity.Ignore);
-+		}
-+		if (this.validationMessage && this.ui.message.textContent !== this.validationMessage) {
-+			this.ui.message.textContent = this.validationMessage;
-+			this.ui.inputBox.showDecoration(Severity.Error);
-+		}
-+		this.ui.setVisibilities({ inputBox: true, message: true });
-+	}
-+}
-+>>>>>>> .their
-changed in both
-  base   100644 b99245aece5d069f52dc02ead3221b3091809e1b src/vs/workbench/browser/parts/quickinput/quickInputBox.ts
-  our    100644 a0dcdf10dcae42f216ed10dc555b680c6f826450 src/vs/workbench/browser/parts/quickinput/quickInputBox.ts
-  their  100644 e03a4d66cf8450e395f5036991574211d7937c9f src/vs/workbench/browser/parts/quickinput/quickInputBox.ts
-@@ -81,10 +81,13 @@
- 
- 	set password(password: boolean) {
- 		this.inputBox.inputElement.type = password ? 'password' : 'text';
-+<<<<<<< .our
- 	}
- 
- 	set enabled(enabled: boolean) {
- 		this.inputBox.setEnabled(enabled);
-+=======
-+>>>>>>> .their
- 	}
- 
- 	showDecoration(decoration: Severity): void {
-changed in both
-  base   100644 1af9308ea94b3173a47ef3ff2ec6ba182e1881d2 src/vs/workbench/browser/parts/quickinput/quickInputList.ts
-  our    100644 0b2ecb2d2654b011c55a59c24ed9e4cd19ca2710 src/vs/workbench/browser/parts/quickinput/quickInputList.ts
-  their  100644 4ccc0b8437d676fd6578366238aea9560eb26753 src/vs/workbench/browser/parts/quickinput/quickInputList.ts
-@@ -11,7 +11,11 @@
- import { dispose, IDisposable } from 'vs/base/common/lifecycle';
- import { WorkbenchList } from 'vs/platform/list/browser/listService';
- import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-+<<<<<<< .our
- import { IQuickPickItem, IQuickPickItemButtonEvent, IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput';
-+=======
-+import { IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-+>>>>>>> .their
- import { IMatch } from 'vs/base/common/filters';
- import { matchesFuzzyOcticonAware, parseOcticons } from 'vs/base/common/octicon';
- import { compareAnything } from 'vs/base/common/comparers';
-@@ -36,8 +40,11 @@
- 	index: number;
- 	item: IQuickPickItem;
- 	checked: boolean;
-+<<<<<<< .our
- 	separator: IQuickPickSeparator;
- 	fireButtonTriggered: (event: IQuickPickItemButtonEvent<IQuickPickItem>) => void;
-+=======
-+>>>>>>> .their
- }
- 
- class ListElement implements IListElement {
-@@ -213,12 +220,17 @@
- 	onChangedAllVisibleChecked: Event<boolean> = this._onChangedAllVisibleChecked.event;
- 	private _onChangedCheckedCount = new Emitter<number>();
- 	onChangedCheckedCount: Event<number> = this._onChangedCheckedCount.event;
-+<<<<<<< .our
- 	private _onChangedVisibleCount = new Emitter<number>();
- 	onChangedVisibleCount: Event<number> = this._onChangedVisibleCount.event;
- 	private _onChangedCheckedElements = new Emitter<IQuickPickItem[]>();
- 	onChangedCheckedElements: Event<IQuickPickItem[]> = this._onChangedCheckedElements.event;
- 	private _onButtonTriggered = new Emitter<IQuickPickItemButtonEvent<IQuickPickItem>>();
- 	onButtonTriggered = this._onButtonTriggered.event;
-+=======
-+	private _onChangedCheckedElements = new Emitter<IQuickPickItem[]>();
-+	onChangedCheckedElements: Event<IQuickPickItem[]> = this._onChangedCheckedElements.event;
-+>>>>>>> .their
- 	private _onLeave = new Emitter<void>();
- 	onLeave: Event<void> = this._onLeave.event;
- 	private _fireCheckedEvents = true;
-@@ -339,6 +351,7 @@
- 		}
- 	}
- 
-+<<<<<<< .our
- 	setElements(inputElements: (IQuickPickItem | IQuickPickSeparator)[]): void {
- 		this.elementDisposables = dispose(this.elementDisposables);
- 		const fireButtonTriggered = (event: IQuickPickItemButtonEvent<IQuickPickItem>) => this.fireButtonTriggered(event);
-@@ -362,6 +375,16 @@
- 			map.set(element.item, index);
- 			return map;
- 		}, new Map<IQuickPickItem, number>());
-+=======
-+	setElements(elements: IQuickPickItem[]): void {
-+		this.elementDisposables = dispose(this.elementDisposables);
-+		this.elements = elements.map((item, index) => new ListElement({
-+			index,
-+			item,
-+			checked: !!item.picked
-+		}));
-+		this.elementDisposables.push(...this.elements.map(element => element.onChecked(() => this.fireCheckedEvents())));
-+>>>>>>> .their
- 		this.list.splice(0, this.list.length, this.elements);
- 		this.list.setFocus([]);
- 		this._onChangedVisibleCount.fire(this.elements.length);
-@@ -389,11 +412,12 @@
- 			.map(item => this.elementsToIndexes.get(item)));
- 	}
- 
--	getCheckedElements() {
--		return this.elements.filter(e => e.checked)
-+	getFocusedElements() {
-+		return this.list.getFocusedElements()
- 			.map(e => e.item);
- 	}
- 
-+<<<<<<< .our
- 	setCheckedElements(items: IQuickPickItem[]) {
- 		try {
- 			this._fireCheckedEvents = false;
-@@ -412,6 +436,16 @@
- 
- 	set enabled(value: boolean) {
- 		this.list.getHTMLElement().style.pointerEvents = value ? null : 'none';
-+=======
-+	getSelectedElements() {
-+		return this.list.getSelectedElements()
-+			.map(e => e.item);
-+	}
-+
-+	getCheckedElements() {
-+		return this.elements.filter(e => e.checked)
-+			.map(e => e.item);
-+>>>>>>> .their
- 	}
- 
- 	focus(what: 'First' | 'Last' | 'Next' | 'Previous' | 'NextPage' | 'PreviousPage'): void {
-@@ -498,7 +532,10 @@
- 		this.list.layout();
- 
- 		this._onChangedAllVisibleChecked.fire(this.getAllVisibleChecked());
-+<<<<<<< .our
- 		this._onChangedVisibleCount.fire(shownElements.length);
-+=======
-+>>>>>>> .their
- 	}
- 
- 	toggleCheckbox() {
diff --git a/app/test/fixtures/merge-parser/vscode/merge-cli-log-uploader-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-cli-log-uploader-into-master.txt
deleted file mode 100644
index a2d16a26dd8..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-cli-log-uploader-into-master.txt
+++ /dev/null
@@ -1,272 +0,0 @@
-changed in both
-  base   100644 91d3f39378aa3df1871bdc01e12b849f1f3366cd src/vs/code/electron-main/launch.ts
-  our    100644 a3affdb0597fc84d217c3981070db0ed9a7afe07 src/vs/code/electron-main/launch.ts
-  their  100644 ed265a71d8e06f037e743a88e14028bf9bf34e8f src/vs/code/electron-main/launch.ts
-@@ -9,7 +9,11 @@
- import { IChannel } from 'vs/base/parts/ipc/common/ipc';
- import { ILogService } from 'vs/platform/log/common/log';
- import { IURLService } from 'vs/platform/url/common/url';
-+<<<<<<< .our
- import { IProcessEnvironment, isMacintosh } from 'vs/base/common/platform';
-+=======
-+import { IProcessEnvironment } from 'vs/base/common/platform';
-+>>>>>>> .their
- import { ParsedArgs, IEnvironmentService } from 'vs/platform/environment/common/environment';
- import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
- import { OpenContext, IWindowSettings } from 'vs/platform/windows/common/windows';
-@@ -122,7 +126,11 @@
- 		return this.channel.call('get-main-process-info', null);
- 	}
- 
-+<<<<<<< .our
- 	getLogsPath(): TPromise<string> {
-+=======
-+	public getLogsPath(): TPromise<string> {
-+>>>>>>> .their
- 		return this.channel.call('get-logs-path', null);
- 	}
- }
-@@ -136,8 +144,12 @@
- 		@IWindowsMainService private windowsMainService: IWindowsMainService,
- 		@IURLService private urlService: IURLService,
- 		@IWorkspacesMainService private workspacesMainService: IWorkspacesMainService,
-+<<<<<<< .our
- 		@IEnvironmentService private readonly environmentService: IEnvironmentService,
- 		@IConfigurationService private readonly configurationService: IConfigurationService
-+=======
-+		@IEnvironmentService private readonly environmentService: IEnvironmentService
-+>>>>>>> .their
- 	) { }
- 
- 	start(args: ParsedArgs, userEnv: IProcessEnvironment): TPromise<void> {
-@@ -268,6 +280,7 @@
- 		} as IMainProcessInfo);
- 	}
- 
-+<<<<<<< .our
- 	getLogsPath(): TPromise<string> {
- 		this.logService.trace('Received request for logs path from other instance.');
- 
-@@ -276,6 +289,15 @@
- 
- 	private codeWindowToInfo(window: ICodeWindow): IWindowInfo {
- 		const folderURIs: URI[] = [];
-+=======
-+	public getLogsPath(): TPromise<string> {
-+		this.logService.trace('Received request for logs path from other instance.');
-+		return TPromise.as(this.environmentService.logsPath);
-+	}
-+
-+	private getWindowInfo(window: ICodeWindow): IWindowInfo {
-+		const folders: string[] = [];
-+>>>>>>> .their
- 
- 		if (window.openedFolderUri) {
- 			folderURIs.push(window.openedFolderUri);
-added in both
-  our    100644 7142aa19a4cc1eda1ba377d464497305ab507809 src/vs/code/electron-main/logUploader.ts
-  their  100644 34e15bbd78babcd4fadbab996b4e66cc26865d77 src/vs/code/electron-main/logUploader.ts
-@@ -8,6 +8,7 @@
- import * as os from 'os';
- import * as cp from 'child_process';
- import * as fs from 'fs';
-+<<<<<<< .our
- import * as path from 'path';
- 
- import { localize } from 'vs/nls';
-@@ -115,6 +116,67 @@
- 				reject(e);
- 			}
- 		});
-+=======
-+import * as https from 'https';
-+import * as path from 'path';
-+
-+import { ILaunchChannel } from 'vs/code/electron-main/launch';
-+import { TPromise } from 'vs/base/common/winjs.base';
-+
-+interface PostResult {
-+	blob_id: string;
-+}
-+
-+export async function uploadLogs(
-+	channel: ILaunchChannel
-+): TPromise<any> {
-+	const logsPath = await channel.call('get-logs-path', null);
-+	const outZip = await zipLogs(logsPath);
-+	const result = await postLogs(logsPath, outZip);
-+	console.log('Blob: ' + result.blob_id);
-+	return result;
-+}
-+
-+function postLogs(
-+	logsPath: string,
-+	outZip: string
-+): TPromise<PostResult> {
-+	return new TPromise((resolve, reject) => {
-+		const req = https.request({
-+			host: 'vscode-log-uploader.azure-api.net',
-+			path: '/v1/upload',
-+			method: 'POST',
-+			headers: {
-+				'Content-Type': 'application/zip',
-+				'Content-Length': fs.statSync(outZip).size
-+			}
-+		}, res => {
-+			const chunks: (Buffer)[] = [];
-+			res.on('data', (chunk: Buffer) => {
-+				chunks.push(chunk);
-+			});
-+			res.on('end', () => {
-+				const body = Buffer.concat(chunks);
-+				try {
-+					const data = JSON.parse(body.toString());
-+					if (data.error) {
-+						reject(data.error);
-+						return
-+					}
-+					resolve(data);
-+					return;
-+				} catch (e) {
-+					console.log('Error parsing response');
-+					reject(e);
-+				}
-+			});
-+			res.on('error', (e) => {
-+				console.log('Error posting logs');
-+				reject(e);
-+			});
-+		});
-+		fs.createReadStream(outZip).pipe(req);
-+>>>>>>> .their
- 	});
- }
- 
-@@ -125,12 +187,23 @@
- 	const outZip = path.join(tempDir, 'logs.zip');
- 	return new TPromise<string>((resolve, reject) => {
- 		doZip(logsPath, outZip, tempDir, (err, stdout, stderr) => {
-+<<<<<<< .our
- 			if (err) {
- 				console.error(localize('zipError', 'Error zipping logs: {0}', err));
- 				reject(err);
- 			} else {
- 				resolve(outZip);
- 			}
-+=======
-+			console.log(stderr);
-+			if (err || stderr) {
-+				console.error('Error zipping logs', err, stderr);
-+				reject(stderr);
-+				return;
-+			}
-+			console.log('Log zip: ' + outZip);
-+			resolve(outZip);
-+>>>>>>> .their
- 		});
- 	});
- }
-@@ -144,12 +217,24 @@
- 	switch (os.platform()) {
- 		case 'win32':
- 			// Copy directory first to avoid file locking issues
-+<<<<<<< .our
- 			const sub = path.join(tempDir, 'sub');
-+=======
-+			const sub = tempDir + '\\sub\\';
-+>>>>>>> .their
- 			return cp.execFile('powershell', ['-Command',
- 				`[System.IO.Directory]::CreateDirectory("${sub}"); Copy-Item -recurse "${logsPath}" "${sub}"; Compress-Archive -Path "${sub}" -DestinationPath "${outZip}"`],
- 				{ cwd: logsPath },
- 				callback);
-+<<<<<<< .our
-+		default:
-+			return cp.execFile('zip', ['-r', outZip, '.'], { cwd: logsPath }, callback);
-+	}
-+}
-+=======
-+
- 		default:
- 			return cp.execFile('zip', ['-r', outZip, '.'], { cwd: logsPath }, callback);
- 	}
- }
-+>>>>>>> .their
-changed in both
-  base   100644 3c042ea5a6717c573bde6b7bbcea4d7de5068dd8 src/vs/code/electron-main/main.ts
-  our    100644 dbe95eb11e2541904621bd2a4f74434f9f66801b src/vs/code/electron-main/main.ts
-  their  100644 dd09f17471c9a1a21d25d204c92ff48f3d0b9820 src/vs/code/electron-main/main.ts
-@@ -206,9 +206,15 @@
- 					}
- 
- 					// Log uploader
-+<<<<<<< .our
- 					if (typeof environmentService.args['upload-logs'] !== 'undefined') {
- 						return uploadLogs(channel, requestService, environmentService)
- 							.then(() => TPromise.wrapError(new ExpectedError()));
-+=======
-+					if (environmentService.args['upload-logs']) {
-+						return import('vs/code/electron-main/logUploader').then(logUploader =>
-+							logUploader.uploadLogs(channel));
-+>>>>>>> .their
- 					}
- 
- 					logService.trace('Sending env to running instance...');
-changed in both
-  base   100644 184147fff5f71cbb839ee940b44b0312a60e1b64 src/vs/platform/environment/common/environment.ts
-  our    100644 52431b2e260012bfee9b7964e1e56089ce2601ab src/vs/platform/environment/common/environment.ts
-  their  100644 65536466bd34cbd4b819ac5b9f5a01f0e069e94b src/vs/platform/environment/common/environment.ts
-@@ -57,12 +57,18 @@
- 	'disable-updates'?: string;
- 	'disable-crash-reporter'?: string;
- 	'skip-add-to-recently-opened'?: boolean;
-+<<<<<<< .our
- 	'max-memory'?: number;
- 	'file-write'?: boolean;
- 	'file-chmod'?: boolean;
- 	'upload-logs'?: string;
- 	'driver'?: string;
- 	'driver-verbose'?: boolean;
-+=======
-+	'sudo-write'?: boolean;
-+	'sudo-chmod'?: boolean;
-+	'upload-logs'?: boolean;
-+>>>>>>> .their
- }
- 
- export const IEnvironmentService = createDecorator<IEnvironmentService>('environmentService');
-changed in both
-  base   100644 862f737db012de51ca80d2fd2b925c50fe7bcad5 src/vs/platform/environment/node/argv.ts
-  our    100644 7183c2471eb1043a8263fbc1a8a7863b41344622 src/vs/platform/environment/node/argv.ts
-  their  100644 ca3f36fbe9d230e80e3c059c6edb58da78d5b195 src/vs/platform/environment/node/argv.ts
-@@ -65,9 +65,15 @@
- 		'disable-crash-reporter',
- 		'skip-add-to-recently-opened',
- 		'status',
-+<<<<<<< .our
- 		'file-write',
- 		'file-chmod',
- 		'driver-verbose'
-+=======
-+		'sudo-write',
-+		'sudo-chmod',
-+		'upload-logs'
-+>>>>>>> .their
- 	],
- 	alias: {
- 		add: 'a',
-@@ -177,8 +183,15 @@
- 	'--inspect-extensions': localize('inspect-extensions', "Allow debugging and profiling of extensions. Check the developer tools for the connection URI."),
- 	'--inspect-brk-extensions': localize('inspect-brk-extensions', "Allow debugging and profiling of extensions with the extension host being paused after start. Check the developer tools for the connection URI."),
- 	'--disable-gpu': localize('disableGPU', "Disable GPU hardware acceleration."),
-+<<<<<<< .our
- 	'--upload-logs': localize('uploadLogs', "Uploads logs from current session to a secure endpoint."),
- 	'--max-memory': localize('maxMemory', "Max memory size for a window (in Mbytes).")
-+=======
-+	'-s, --status': localize('status', "Print process usage and diagnostics information."),
-+	'-v, --version': localize('version', "Print version."),
-+	'-h, --help': localize('help', "Print usage."),
-+	'--upload-logs': localize('uploadLogs', "Upload logs.")
-+>>>>>>> .their
- };
- 
- export function formatOptions(options: { [name: string]: string; }, columns: number): string {
diff --git a/app/test/fixtures/merge-parser/vscode/merge-dbaeumer-48032-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-dbaeumer-48032-into-master.txt
deleted file mode 100644
index 35c05c0c165..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-dbaeumer-48032-into-master.txt
+++ /dev/null
@@ -1,383 +0,0 @@
-changed in both
-  base   100644 6bf0f87445fe3ccb228374314da81208cb4d725a src/vs/vscode.proposed.d.ts
-  our    100644 3de4a7af9dda9e3e523ba4b5774f1667d66b0b9b src/vs/vscode.proposed.d.ts
-  their  100644 4271b67e616c94aa077dde2c4a65e67747610e8c src/vs/vscode.proposed.d.ts
-@@ -241,8 +241,14 @@
- 		maxResults?: number;
- 
- 		/**
-+<<<<<<< .our
- 		 * Whether external files that exclude files, like .gitignore, should be respected.
- 		 * See the vscode setting `"search.useIgnoreFiles"`.
-+=======
-+		 * Subscribe to events in the file or folder denoted by `uri`.
-+		 * @param uri
-+		 * @param options
-+>>>>>>> .their
- 		 */
- 		useIgnoreFiles?: boolean;
- 
-@@ -261,7 +267,14 @@
- 
- 	export namespace workspace {
- 		/**
-+<<<<<<< .our
- 		 * DEPRECATED
-+=======
-+		 * Create a new directory. *Note* that new files are created via `write`-calls.
-+		 *
-+		 * @param uri The uri of the *new* folder.
-+		 * @param token A cancellation token.
-+>>>>>>> .their
- 		 */
- 		export function registerSearchProvider(): Disposable;
- 
-@@ -713,6 +726,7 @@
- 		write(text: string): void;
- 
- 		/**
-+<<<<<<< .our
- 		 * An event which fires on keystrokes in the terminal or when an extension calls
- 		 * [Terminal.sendText](#Terminal.sendText). Keystrokes are converted into their
- 		 * corresponding VT sequence representation.
-@@ -726,6 +740,14 @@
- 		 * });
- 		 * terminalRenderer.terminal.then(t => t.sendText('Hello world'));
- 		 * ```
-+=======
-+		 * The id of the process executing the task.
-+		 */
-+		processId: number;
-+
-+		/**
-+		 * Terminates the task execution.
-+>>>>>>> .their
- 		 */
- 		readonly onDidAcceptInput: Event<string>;
- 
-@@ -758,7 +780,21 @@
- 		export function createTerminalRenderer(name: string): TerminalRenderer;
- 	}
- 
-+<<<<<<< .our
- 	//#endregion
-+=======
-+		/**
-+		 * The currently active task executions or an empty array.
-+		 *
-+		 * @readonly
-+		 */
-+		export let taskExecutions: TaskExecution[];
-+
-+		/**
-+		 * Fires when a task starts.
-+		 */
-+		export const onDidStartTask: Event<TaskStartEvent>;
-+>>>>>>> .their
- 
- 	//#region Joh -> exclusive document filters
- 
-changed in both
-  base   100644 1e052ee9e0eda70f8703b804e23d309954d8eac0 src/vs/workbench/api/electron-browser/mainThreadTask.ts
-  our    100644 a1b5243fa6c16f6ebb0cd18d9a073d52f0a691f4 src/vs/workbench/api/electron-browser/mainThreadTask.ts
-  their  100644 c4ce5ed82a79d428e1366f8a64425fbc1445776a src/vs/workbench/api/electron-browser/mainThreadTask.ts
-@@ -36,6 +36,7 @@
- 	export function from(value: TaskExecution): TaskExecutionDTO {
- 		return {
- 			id: value.id,
-+			processId: value.processId,
- 			task: TaskDTO.from(value.task)
- 		};
- 	}
-@@ -60,7 +61,12 @@
- 	export function from(value: TaskExecution, exitCode: number): TaskProcessEndedDTO {
- 		return {
- 			id: value.id,
-+<<<<<<< .our
- 			exitCode
-+=======
-+			processId: value.processId,
-+			task: TaskDTO.to(value.task, workspace)
-+>>>>>>> .their
- 		};
- 	}
- }
-@@ -429,8 +435,13 @@
- 		return TPromise.wrap<void>(undefined);
- 	}
- 
-+<<<<<<< .our
- 	public $fetchTasks(filter?: TaskFilterDTO): TPromise<TaskDTO[]> {
- 		return this._taskService.tasks(TaskFilterDTO.to(filter)).then((tasks) => {
-+=======
-+	public $executeTaskProvider(): TPromise<TaskDTO[]> {
-+		return this._taskService.tasks({ version: '2' }).then((tasks) => {
-+>>>>>>> .their
- 			let result: TaskDTO[] = [];
- 			for (let task of tasks) {
- 				let item = TaskDTO.from(task);
-changed in both
-  base   100644 02fe0073cfedd34c14027bb406b5db880f157f68 src/vs/workbench/api/node/extHost.api.impl.ts
-  our    100644 ea64898c5b15cfae4b4ab32d722f4ae4a68f831a src/vs/workbench/api/node/extHost.api.impl.ts
-  their  100644 654a9db3a4b4071940b049fab02ce323ea702aa8 src/vs/workbench/api/node/extHost.api.impl.ts
-@@ -584,11 +584,25 @@
- 				// Temp for live share in Insiders
- 				return { dispose: () => { } };
- 			}),
-+<<<<<<< .our
- 			registerTextSearchProvider: proposedApiFunction(extension, (scheme, provider) => {
- 				return extHostSearch.registerTextSearchProvider(scheme, provider);
- 			}),
- 			registerFileIndexProvider: proposedApiFunction(extension, (scheme, provider) => {
- 				return extHostSearch.registerFileIndexProvider(scheme, provider);
-+=======
-+			get taskExecutions(): vscode.TaskExecution[] {
-+				return extHostTask.taskExecutions;
-+			},
-+			onDidStartTask: (listeners, thisArgs?, disposables?) => {
-+				return extHostTask.onDidStartTask(listeners, thisArgs, disposables);
-+			},
-+			onDidEndTask: (listeners, thisArgs?, disposables?) => {
-+				return extHostTask.onDidEndTask(listeners, thisArgs, disposables);
-+			},
-+			registerFileSystemProvider: proposedApiFunction(extension, (scheme, provider, newProvider?) => {
-+				return extHostFileSystem.registerFileSystemProvider(scheme, provider, newProvider);
-+>>>>>>> .their
- 			}),
- 			registerDocumentCommentProvider: proposedApiFunction(extension, (provider: vscode.DocumentCommentProvider) => {
- 				return exthostCommentProviders.registerDocumentCommentProvider(provider);
-changed in both
-  base   100644 7128c03fb41b4ebac467e7117a3ce30e6f578518 src/vs/workbench/api/node/extHostTask.ts
-  our    100644 ee825674099281f31bafe1feebca54d478f9b15b src/vs/workbench/api/node/extHostTask.ts
-  their  100644 6fb9e23f4a0cfad64a2f01761dc873240e9c0f7e src/vs/workbench/api/node/extHostTask.ts
-@@ -687,14 +687,22 @@
- }
- 
- class TaskExecutionImpl implements vscode.TaskExecution {
-+<<<<<<< .our
- 
- 	constructor(private readonly _tasks: ExtHostTask, readonly _id: string, private readonly _task: vscode.Task) {
-+=======
-+	constructor(readonly _id: string, private _processId: number, private readonly _task: vscode.Task, private readonly _tasks: ExtHostTask) {
-+>>>>>>> .their
- 	}
- 
- 	public get task(): vscode.Task {
- 		return this._task;
- 	}
- 
-+	get processId(): number {
-+		return this._processId;
-+	}
-+
- 	public terminate(): void {
- 		this._tasks.terminateTask(this);
- 	}
-@@ -708,11 +716,16 @@
- 
- namespace TaskExecutionDTO {
- 	export function to(value: TaskExecutionDTO, tasks: ExtHostTask): vscode.TaskExecution {
-+<<<<<<< .our
- 		return new TaskExecutionImpl(tasks, value.id, TaskDTO.to(value.task, tasks.extHostWorkspace));
-+=======
-+		return new TaskExecutionImpl(value.id, value.processId, TaskDTO.to(value.task, tasks.extHostWorkspace), tasks);
-+>>>>>>> .their
- 	}
- 	export function from(value: vscode.TaskExecution): TaskExecutionDTO {
- 		return {
- 			id: (value as TaskExecutionImpl)._id,
-+			processId: value.processId,
- 			task: undefined
- 		};
- 	}
-@@ -797,10 +810,27 @@
- 		}
- 	}
- 
-+<<<<<<< .our
- 	public get taskExecutions(): vscode.TaskExecution[] {
- 		let result: vscode.TaskExecution[] = [];
- 		this._taskExecutions.forEach(value => result.push(value));
- 		return result;
-+=======
-+	public $taskStarted(execution: TaskExecutionDTO): void {
-+		this._onDidExecuteTask.fire({
-+			execution: this.getTaskExecution(execution)
-+		});
-+	}
-+
-+	get taskExecutions(): vscode.TaskExecution[] {
-+		let result: vscode.TaskExecution[] = [];
-+		this._taskExecutions.forEach(value => result.push(value));
-+		return result;
-+	}
-+
-+	get onDidStartTask(): Event<vscode.TaskStartEvent> {
-+		return this._onDidExecuteTask.event;
-+>>>>>>> .their
- 	}
- 
- 	public terminateTask(execution: vscode.TaskExecution): TPromise<void> {
-@@ -915,7 +945,11 @@
- 		if (result) {
- 			return result;
- 		}
-+<<<<<<< .our
- 		result = new TaskExecutionImpl(this, execution.id, task ? task : TaskDTO.to(execution.task, this._workspaceService));
-+=======
-+		result = new TaskExecutionImpl(execution.id, execution.processId, task ? task : TaskDTO.to(execution.task, this._extHostWorkspace), this);
-+>>>>>>> .their
- 		this._taskExecutions.set(execution.id, result);
- 		return result;
- 	}
-changed in both
-  base   100644 093fff83f06147b63bc465e9e7b4a5812f7439e3 src/vs/workbench/api/shared/tasks.ts
-  our    100644 c03895bfb41ad43e666e8e08c019be189d46ecbe src/vs/workbench/api/shared/tasks.ts
-  their  100644 d8df14d81eaa9de91bcecbaf045ac88a28e87aa6 src/vs/workbench/api/shared/tasks.ts
-@@ -86,6 +86,7 @@
- 
- export interface TaskExecutionDTO {
- 	id: string;
-+	processId: number;
- 	task: TaskDTO;
- }
- 
-changed in both
-  base   100644 53aad9582320b0117d566e4f3d05fe210e5234d1 src/vs/workbench/parts/tasks/common/taskService.ts
-  our    100644 50e7dadcfe5a399cf13cd762d2c265df25f9c063 src/vs/workbench/parts/tasks/common/taskService.ts
-  their  100644 03e6d58589867c16eff2fdbf6d0ba78c64eacacf src/vs/workbench/parts/tasks/common/taskService.ts
-@@ -34,10 +34,24 @@
- }
- 
- export interface TaskFilter {
-+<<<<<<< .our
- 	version?: string;
- 	type?: string;
- }
- 
-+=======
-+	version?: '1' | '2';
-+	type?: string;
-+}
-+
-+export interface RunResult {
-+	promise: TPromise<ITaskSummary>;
-+	processInfo: {
-+		processId: number;
-+	};
-+}
-+
-+>>>>>>> .their
- export interface ITaskService {
- 	_serviceBrand: any;
- 	onDidStateChange: Event<TaskEvent>;
-@@ -46,7 +60,7 @@
- 	configureAction(): Action;
- 	build(): TPromise<ITaskSummary>;
- 	runTest(): TPromise<ITaskSummary>;
--	run(task: Task, options?: RunOptions): TPromise<ITaskSummary>;
-+	run(task: Task, options?: RunOptions): RunResult;
- 	inTerminal(): boolean;
- 	isActive(): TPromise<boolean>;
- 	getActiveTasks(): TPromise<Task[]>;
-changed in both
-  base   100644 d88cca89e951e82521bab74e6f4a4aa280dd8b26 src/vs/workbench/parts/tasks/common/taskSystem.ts
-  our    100644 9ef94395b0f970a895f59a803fd410f6ff6fa897 src/vs/workbench/parts/tasks/common/taskSystem.ts
-  their  100644 5a50bb7882fd0f3bc377ac93b4360d6753881358 src/vs/workbench/parts/tasks/common/taskSystem.ts
-@@ -86,6 +86,7 @@
- export interface ITaskExecuteResult {
- 	kind: TaskExecuteKind;
- 	promise: TPromise<ITaskSummary>;
-+	processId: number;
- 	started?: {
- 		restartOnFileChanges?: string;
- 	};
-changed in both
-  base   100644 2dc2a15bbac5927386c0ebe3e49c2301092b3c23 src/vs/workbench/parts/tasks/common/tasks.ts
-  our    100644 9a771032c99cebab4d7cc264d0bbfbd5c11067ca src/vs/workbench/parts/tasks/common/tasks.ts
-  their  100644 9a85f452a28ff762f8b76430746fed6b23724796 src/vs/workbench/parts/tasks/common/tasks.ts
-@@ -637,7 +637,11 @@
- 		}
- 	}
- 
-+<<<<<<< .our
- 	export function getTaskDefinition(task: Task, useSource: boolean = false): KeyedTaskIdentifier {
-+=======
-+	export function getTaskDefinition(task: Task): TaskIdentifier {
-+>>>>>>> .their
- 		if (ContributedTask.is(task)) {
- 			return task.defines;
- 		} else if (CustomTask.is(task)) {
-@@ -662,6 +666,7 @@
- 
- export interface TaskExecution {
- 	id: string;
-+	processId: number;
- 	task: Task;
- }
- 
-changed in both
-  base   100644 da0905a8aefd2c13d5b0b17bc2ae1c225100e83a src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
-  our    100644 f6c79e586a73787324e35cffd199df14d720e4da src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
-  their  100644 2d5655d4a0eed7d29626dac57628c3e34950b509 src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
-@@ -74,7 +74,11 @@
- import {
- 	Task, CustomTask, ConfiguringTask, ContributedTask, InMemoryTask, TaskEvent,
- 	TaskEventKind, TaskSet, TaskGroup, GroupType, ExecutionEngine, JsonSchemaVersion, TaskSourceKind,
-+<<<<<<< .our
- 	TaskSorter, TaskIdentifier, KeyedTaskIdentifier, TASK_RUNNING_STATE
-+=======
-+	TaskIdentifier, TaskSorter
-+>>>>>>> .their
- } from 'vs/workbench/parts/tasks/common/tasks';
- import { ITaskService, ITaskProvider, RunOptions, CustomizationProperties, TaskFilter } from 'vs/workbench/parts/tasks/common/taskService';
- import { getTemplates as getTaskTemplates } from 'vs/workbench/parts/tasks/common/taskTemplates';
-@@ -708,10 +712,15 @@
- 	}
- 
- 	public tasks(filter?: TaskFilter): TPromise<Task[]> {
-+<<<<<<< .our
- 		let range = filter && filter.version ? filter.version : undefined;
- 		let engine = this.executionEngine;
- 
- 		if (range && ((semver.satisfies('0.1.0', range) && engine === ExecutionEngine.Terminal) || (semver.satisfies('2.0.0', range) && engine === ExecutionEngine.Process))) {
-+=======
-+		let engine = this.executionEngine;
-+		if (filter && ((filter.version === '1' && engine === ExecutionEngine.Terminal) || (filter.version === '2' && engine === ExecutionEngine.Process))) {
-+>>>>>>> .their
- 			return TPromise.as<Task[]>([]);
- 		}
- 		return this.getGroupedTasks().then((map) => {
-@@ -721,6 +730,7 @@
- 			let result: Task[] = [];
- 			map.forEach((tasks) => {
- 				for (let task of tasks) {
-+<<<<<<< .our
- 					if (ContributedTask.is(task) && task.defines.type === filter.type) {
- 						result.push(task);
- 					} else if (CustomTask.is(task)) {
-@@ -732,6 +742,11 @@
- 								result.push(task);
- 							}
- 						}
-+=======
-+					let definition = Task.getTaskDefinition(task);
-+					if (definition && definition.type === filter.type) {
-+						result.push(task);
-+>>>>>>> .their
- 					}
- 				}
- 			});
-changed in both
-  base   100644 584292e76c09e692a1af44b6f3ba2b47611b9ba8 src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
-  our    100644 6b4da35a3f141112a169ecfa12aadfaea48de26e src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
-  their  100644 ce3afa2899be88b73ccedbe29fb427c3bea4b1a3 src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
-@@ -161,7 +161,7 @@
- 				this.terminalService.setActiveInstance(terminalData.terminal);
- 				this.terminalService.showPanel(focus);
- 			}
--			return { kind: TaskExecuteKind.Active, active: { same: true, background: task.isBackground }, promise: terminalData.promise };
-+			return { kind: TaskExecuteKind.Active, active: { same: true, background: task.isBackground }, processId: terminalData.terminal.processId, promise: terminalData.promise };
- 		}
- 
- 		try {
diff --git a/app/test/fixtures/merge-parser/vscode/merge-dbaeumer-50588-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-dbaeumer-50588-into-master.txt
deleted file mode 100644
index 7c4e45f928a..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-dbaeumer-50588-into-master.txt
+++ /dev/null
@@ -1,87 +0,0 @@
-changed in both
-  base   100644 3ec638c2f2292edf6ae2d953c45264d2346f8f3f build/gulpfile.extensions.js
-  our    100644 57d52b03b064192aea691d79ce06fc7cc53609da build/gulpfile.extensions.js
-  their  100644 acc7d90bfb7f2b83474bac7f277f65742d78cf23 build/gulpfile.extensions.js
-changed in both
-  base   100644 30a1563d7b9c1e437ccf5c2f6f66478d4ba6c798 build/gulpfile.vscode.js
-  our    100644 d79071e56bcfc53b3448052cc08bd7247bd7e789 build/gulpfile.vscode.js
-  their  100644 47f243676b54d21d65e242340e69766ab223c94c build/gulpfile.vscode.js
-@@ -240,7 +240,11 @@
- 			.filter(({ name }) => builtInExtensions.every(b => b.name !== name));
- 
- 		const localExtensions = es.merge(...localExtensionDescriptions.map(extension => {
-+<<<<<<< .our
- 			return ext.fromLocal(extension.path, sourceMappingURLBase)
-+=======
-+			return ext.fromLocal(extension.path)
-+>>>>>>> .their
- 				.pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`));
- 		}));
- 
-changed in both
-  base   100644 2693d9f519aae8ea384188f9a1ea9421b0a857b0 build/lib/optimize.js
-  our    100644 60169cf18927277efc99c7e1a6bcb32d9aad361e build/lib/optimize.js
-  their  100644 3599086a4b43ba1ab40b0684311deb1350237876 build/lib/optimize.js
-@@ -165,10 +165,13 @@
-             addComment: true,
-             includeContent: true
-         }))
-+<<<<<<< .our
-             .pipe(opts.languages && opts.languages.length ? i18n_1.processNlsFiles({
-             fileHeader: bundledFileHeader,
-             languages: opts.languages
-         }) : es.through())
-+=======
-+>>>>>>> .their
-             .pipe(gulp.dest(out));
-     };
- }
-changed in both
-  base   100644 b5636ffb8ef2deb27db06717ac2e11b65a26e7c7 build/lib/optimize.ts
-  our    100644 038cf09dd21bfefcec33d2e0eaa808b3e9d1fce9 build/lib/optimize.ts
-  their  100644 7c5f15309c3c6c3b3acaa3434c5405f8666c17fc build/lib/optimize.ts
-@@ -164,10 +164,13 @@
- 	 * (out folder name)
- 	 */
- 	out: string;
-+<<<<<<< .our
- 	/**
- 	 * (out folder name)
- 	 */
- 	languages?: Language[];
-+=======
-+>>>>>>> .their
- }
- 
- export function optimizeTask(opts: IOptimizeTaskOpts): () => NodeJS.ReadWriteStream {
-@@ -239,10 +242,13 @@
- 				addComment: true,
- 				includeContent: true
- 			}))
-+<<<<<<< .our
- 			.pipe(opts.languages && opts.languages.length ? processNlsFiles({
- 				fileHeader: bundledFileHeader,
- 				languages: opts.languages
- 			}) : es.through())
-+=======
-+>>>>>>> .their
- 			.pipe(gulp.dest(out));
- 	};
- }
-changed in both
-  base   100644 ce9c5e893b23d548f6f595d667937c6245cab984 src/main.js
-  our    100644 711217d64e2bdc43f33652d0bed34caa052cc331 src/main.js
-  their  100644 0d33c6fef3047efffd6d0521ac3ad36428904b21 src/main.js
-@@ -269,8 +269,12 @@
- 	let initialLocale = locale;
- 
- 	perf.mark('nlsGeneration:start');
-+<<<<<<< .our
- 
- 	let defaultResult = function (locale) {
-+=======
-+	let defaultResult = function(locale) {
-+>>>>>>> .their
- 		perf.mark('nlsGeneration:end');
- 		return Promise.resolve({ locale: locale, availableLanguages: {} });
- 	};
diff --git a/app/test/fixtures/merge-parser/vscode/merge-dbaeumer-50799-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-dbaeumer-50799-into-master.txt
deleted file mode 100644
index 2d78c1c7df2..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-dbaeumer-50799-into-master.txt
+++ /dev/null
@@ -1,152 +0,0 @@
-changed in both
-  base   100644 466ced9706b902e76304384bc2effc04c9b71360 src/vs/workbench/api/electron-browser/mainThreadTask.ts
-  our    100644 a1b5243fa6c16f6ebb0cd18d9a073d52f0a691f4 src/vs/workbench/api/electron-browser/mainThreadTask.ts
-  their  100644 ab2c0f3e367122750f4ac1724749784a79f37fdc src/vs/workbench/api/electron-browser/mainThreadTask.ts
-@@ -71,6 +71,7 @@
- 		delete result._key;
- 		return result;
- 	}
-+<<<<<<< .our
- 	export function to(value: TaskDefinitionDTO, executeOnly: boolean): KeyedTaskIdentifier {
- 		let result = TaskDefinition.createTaskIdentifier(value, console);
- 		if (result === void 0 && executeOnly) {
-@@ -80,6 +81,10 @@
- 			};
- 		}
- 		return result;
-+=======
-+	export function to(value: TaskDefinitionDTO): KeyedTaskIdentifier {
-+		return TaskDefinition.createTaskIdentifier(value, console);
-+>>>>>>> .their
- 	}
- }
- 
-@@ -395,8 +400,13 @@
- 
- 	public $registerTaskProvider(handle: number): TPromise<void> {
- 		this._taskService.registerTaskProvider(handle, {
-+<<<<<<< .our
- 			provideTasks: (validTypes: IStringDictionary<boolean>) => {
- 				return this._proxy.$provideTasks(handle, validTypes).then((value) => {
-+=======
-+			provideTasks: () => {
-+				return this._proxy.$provideTasks(handle).then((value) => {
-+>>>>>>> .their
- 					let tasks: Task[] = [];
- 					for (let task of value.tasks) {
- 						let taskTransfer = task._source as any as ExtensionTaskSourceTransfer;
-changed in both
-  base   100644 03c10b1ee810fd25378385e1f604ce77ac04243c src/vs/workbench/api/node/extHostTask.ts
-  our    100644 ee825674099281f31bafe1feebca54d478f9b15b src/vs/workbench/api/node/extHostTask.ts
-  their  100644 d4a10652e5d2f035f5c7a415d4a22dfa753148b5 src/vs/workbench/api/node/extHostTask.ts
-changed in both
-  base   100644 62db4699fa16947080f364a1c089c8dd05655a5f src/vs/workbench/api/node/extHostTypes.ts
-  our    100644 7e7572fe66c624d470c8506c4a3ebf35efe8320a src/vs/workbench/api/node/extHostTypes.ts
-  their  100644 5da741492352041412d508f78b0bf12cc50ff07f src/vs/workbench/api/node/extHostTypes.ts
-changed in both
-  base   100644 7a055bf14a96b97a4b0a77deb179c21bc6613f70 src/vs/workbench/parts/tasks/common/taskSystem.ts
-  our    100644 9ef94395b0f970a895f59a803fd410f6ff6fa897 src/vs/workbench/parts/tasks/common/taskSystem.ts
-  their  100644 38407b7894938b4cdad7292926b94876b2b7f827 src/vs/workbench/parts/tasks/common/taskSystem.ts
-changed in both
-  base   100644 f1528ca95ce936effa1e771ed167056249d2a52c src/vs/workbench/parts/tasks/common/tasks.ts
-  our    100644 9a771032c99cebab4d7cc264d0bbfbd5c11067ca src/vs/workbench/parts/tasks/common/tasks.ts
-  their  100644 c41e4ca76dc2f52f2de9fad0825c6ca0023bbe82 src/vs/workbench/parts/tasks/common/tasks.ts
-@@ -624,7 +624,11 @@
- 		if (Types.isString(key)) {
- 			return key === task._label || key === task.identifier || (compareId && key === task._id);
- 		}
-+<<<<<<< .our
- 		let identifier = Task.getTaskDefinition(task, true);
-+=======
-+		let identifier = Task.getTaskDefinition(task);
-+>>>>>>> .their
- 		return identifier !== void 0 && identifier._key === key._key;
- 	}
- 
-changed in both
-  base   100644 4f3218fda3712056f065d93844893c1f503cd641 src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.ts
-  our    100644 32352f92e5b6403e5d2a2dab5342a6748583e197 src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.ts
-  their  100644 7ad25b8f045fe2370652a03025bc7bc71a38b54b src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.ts
-changed in both
-  base   100644 dc3d73f3cee59dddc32e47a077e6066b1cc0c4d8 src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
-  our    100644 f6c79e586a73787324e35cffd199df14d720e4da src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
-  their  100644 ceea88273314b0b0556dd9ecd2b8124a8adaea70 src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
-@@ -74,7 +74,11 @@
- import {
- 	Task, CustomTask, ConfiguringTask, ContributedTask, InMemoryTask, TaskEvent,
- 	TaskEventKind, TaskSet, TaskGroup, GroupType, ExecutionEngine, JsonSchemaVersion, TaskSourceKind,
-+<<<<<<< .our
- 	TaskSorter, TaskIdentifier, KeyedTaskIdentifier, TASK_RUNNING_STATE
-+=======
-+	TaskSorter, TaskIdentifier, KeyedTaskIdentifier
-+>>>>>>> .their
- } from 'vs/workbench/parts/tasks/common/tasks';
- import { ITaskService, ITaskProvider, RunOptions, CustomizationProperties, TaskFilter } from 'vs/workbench/parts/tasks/common/taskService';
- import { getTemplates as getTaskTemplates } from 'vs/workbench/parts/tasks/common/taskTemplates';
-@@ -1917,7 +1921,16 @@
- 		if (!this.canRunCommand()) {
- 			return;
- 		}
-+<<<<<<< .our
- 		let identifier = this.getTaskIdentifier(arg);
-+=======
-+		let identifier: string | KeyedTaskIdentifier = undefined;
-+		if (Types.isString(arg)) {
-+			identifier = arg;
-+		} else if (arg && Types.isString((arg as TaskIdentifier).type)) {
-+			identifier = TaskDefinition.createTaskIdentifier(arg as TaskIdentifier, console);
-+		}
-+>>>>>>> .their
- 		if (identifier !== void 0) {
- 			this.getGroupedTasks().then((grouped) => {
- 				let resolver = this.createResolver(grouped);
-changed in both
-  base   100644 3d7718062da0bdd736afb716e84cb9a4ada08bab src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
-  our    100644 6b4da35a3f141112a169ecfa12aadfaea48de26e src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
-  their  100644 72d858d7b51a7793eb9079165bd3f8dc74ddca5f src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
-changed in both
-  base   100644 0ad38de152abcd9f636fdde5111d4c500c85ff3d src/vs/workbench/parts/tasks/node/taskConfiguration.ts
-  our    100644 6b46b4eb0c3f506cf19665071c9a69cc86383d9a src/vs/workbench/parts/tasks/node/taskConfiguration.ts
-  their  100644 4bbc30ff45b71c762d1c00a345e6bdc3de41b0cc src/vs/workbench/parts/tasks/node/taskConfiguration.ts
-@@ -1180,7 +1180,11 @@
- 			if (Types.isArray(external.dependsOn)) {
- 				result.dependsOn = external.dependsOn.map(item => TaskDependency.from(item, context));
- 			} else {
-+<<<<<<< .our
- 				result.dependsOn = [TaskDependency.from(external.dependsOn, context)];
-+=======
-+				result.dependsOn = [TaskDependency.from(external, context)];
-+>>>>>>> .their
- 			}
- 		}
- 		if (includeCommandOptions && (external.presentation !== void 0 || (external as LegacyCommandProperties).terminal !== void 0)) {
-@@ -1257,7 +1261,11 @@
- 		if (taskIdentifier === void 0) {
- 			context.problemReporter.error(nls.localize(
- 				'ConfigurationParser.incorrectType',
-+<<<<<<< .our
- 				'Error: the task configuration \'{0}\' is using an unknown type. The task configuration will be ignored.', JSON.stringify(external, undefined, 0)
-+=======
-+				'Error: the task configuration \'{0}\' is using and unknown type. The task configuration will be ignored.', JSON.stringify(external, undefined, 0)
-+>>>>>>> .their
- 			));
- 			return undefined;
- 		}
-added in both
-  our    100644 a24e94c013ae4b1477ee310f0ed2c4d14b698418 src/vs/workbench/parts/tasks/node/tasks.ts
-  their  100644 c0cd15ad06df13e79c3df608c54b735ffe45ba88 src/vs/workbench/parts/tasks/node/tasks.ts
-@@ -27,10 +27,14 @@
- 	export function createTaskIdentifier(external: TaskIdentifier, reporter: { error(message: string): void; }): KeyedTaskIdentifier | undefined {
- 		let definition = TaskDefinitionRegistry.get(external.type);
- 		if (definition === void 0) {
-+<<<<<<< .our
- 			// We have no task definition so we can't sanitize the literal. Take it as is
- 			let copy = Objects.deepClone(external);
- 			delete copy._key;
- 			return KeyedTaskIdentifier.create(copy);
-+=======
-+			return undefined;
-+>>>>>>> .their
- 		}
- 
- 		let literal: { type: string;[name: string]: any } = Object.create(null);
diff --git a/app/test/fixtures/merge-parser/vscode/merge-dockfind-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-dockfind-into-master.txt
deleted file mode 100644
index 9955166db6c..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-dockfind-into-master.txt
+++ /dev/null
@@ -1,230 +0,0 @@
-changed in both
-  base   100644 c945e012dee5c99538272d8f5fc851a0d70f6341 src/vs/editor/browser/editorBrowser.ts
-  our    100644 d2b256b0ac954a95d910921337989333c3361cd3 src/vs/editor/browser/editorBrowser.ts
-  their  100644 dfac5d47ff79a3603ca671af11006ae4420156f6 src/vs/editor/browser/editorBrowser.ts
-@@ -170,7 +170,12 @@
- 	/**
- 	 * Position the overlay widget in the top center
- 	 */
--	TOP_CENTER
-+	TOP_CENTER,
-+
-+	/**
-+	 * Position the overlay widget in the top center
-+	 */
-+	BOTTOM_STICK
- }
- /**
-  * A position for rendering overlay widgets.
-@@ -180,6 +185,7 @@
- 	 * The position preference for the overlay widget.
- 	 */
- 	preference: OverlayWidgetPositionPreference;
-+	reRender?: boolean;
- }
- /**
-  * An overlay widgets renders on top of the text.
-changed in both
-  base   100644 9a2390c4a36e78523e729ec99bcc6f276d85b4b2 src/vs/editor/browser/view/viewImpl.ts
-  our    100644 f619f1adef4f12e7f3e990d008867ec5f137fb73 src/vs/editor/browser/view/viewImpl.ts
-  their  100644 6eefdf390da32c7f4f5fc6d9714f400e9991aec9 src/vs/editor/browser/view/viewImpl.ts
-@@ -570,7 +570,8 @@
- 
- 	public layoutOverlayWidget(widgetData: IOverlayWidgetData): void {
- 		let newPreference = widgetData.position ? widgetData.position.preference : null;
--		let shouldRender = this.overlayWidgets.setWidgetPosition(widgetData.widget, newPreference);
-+		let reRender = widgetData.position ? widgetData.position.reRender : false;
-+		let shouldRender = this.overlayWidgets.setWidgetPosition(widgetData.widget, newPreference, reRender);
- 		if (shouldRender) {
- 			this._scheduleRender();
- 		}
-merged
-  result 100644 f0cc38fe8cd0fedb9bcd8042a16195224dc3e2ce src/vs/editor/browser/viewParts/overlayWidgets/overlayWidgets.ts
-  our    100644 fc87fd6fa56b73557e8bf6e8cc09c571b662174d src/vs/editor/browser/viewParts/overlayWidgets/overlayWidgets.ts
-@@ -91,9 +91,9 @@
- 		this.setShouldRender();
- 	}
- 
--	public setWidgetPosition(widget: IOverlayWidget, preference: OverlayWidgetPositionPreference): boolean {
-+	public setWidgetPosition(widget: IOverlayWidget, preference: OverlayWidgetPositionPreference, forceRender?: boolean): boolean {
- 		let widgetData = this._widgets[widget.getId()];
--		if (widgetData.preference === preference) {
-+		if (widgetData.preference === preference && !forceRender) {
- 			return false;
- 		}
- 
-@@ -133,6 +133,11 @@
- 		} else if (widgetData.preference === OverlayWidgetPositionPreference.TOP_CENTER) {
- 			domNode.setTop(0);
- 			domNode.domNode.style.right = '50%';
-+		} else if(widgetData.preference === OverlayWidgetPositionPreference.BOTTOM_STICK) {
-+			let widgetHeight = domNode.domNode.clientHeight;
-+			let wordwrap = this._context.configuration.editor.wrappingInfo.isViewportWrapping;
-+			domNode.setTop((this._editorHeight - widgetHeight - (wordwrap ? 1 : 0 ) * this._horizontalScrollbarHeight));
-+			domNode.setRight((2 * this._verticalScrollbarWidth) + this._minimapWidth);
- 		}
- 	}
- 
-changed in both
-  base   100644 e804b2bd36bd1b465b899fc48d1c68bb629dd112 src/vs/editor/common/config/commonEditorConfig.ts
-  our    100644 07380bbb371743d18229dc1396d98193d5bf04b8 src/vs/editor/common/config/commonEditorConfig.ts
-  their  100644 5917019e38f03d67ecc099240ba613769949ff7b src/vs/editor/common/config/commonEditorConfig.ts
-@@ -552,6 +552,12 @@
- 			'default': EDITOR_DEFAULTS.contribInfo.suggest.snippets,
- 			'description': nls.localize('snippetSuggestions', "Controls whether snippets are shown with other suggestions and how they are sorted.")
- 		},
-+		'editor.findWidget': {
-+			'type': 'string',
-+			'enum': ['default', 'top', 'bottom'],
-+			'default': EDITOR_DEFAULTS.contribInfo.findWidget,
-+			'description': nls.localize('findWidget', "Controls where find widget is shown")
-+		},
- 		'editor.emptySelectionClipboard': {
- 			'type': 'boolean',
- 			'default': EDITOR_DEFAULTS.emptySelectionClipboard,
-changed in both
-  base   100644 2bc5f7ad1f98c415bb6d29cf6ceebdbf13e562c9 src/vs/editor/common/config/editorOptions.ts
-  our    100644 3a51038033803eb3e426c81c8416ce7c260eb272 src/vs/editor/common/config/editorOptions.ts
-  their  100644 8ac3d82429c1c7a7f5a278ad72a0fae6af3f8cba src/vs/editor/common/config/editorOptions.ts
-@@ -520,6 +520,10 @@
- 	 */
- 	snippetSuggestions?: 'top' | 'bottom' | 'inline' | 'none';
- 	/**
-+	 * Control where the findWidget is shown;
-+	 */
-+	findWidget?: 'default' | 'top' | 'bottom';
-+	/**
- 	 * Copying without a selection copies the current line.
- 	 */
- 	emptySelectionClipboard?: boolean;
-@@ -939,7 +943,13 @@
- 	readonly suggestOnTriggerCharacters: boolean;
- 	readonly acceptSuggestionOnEnter: 'on' | 'smart' | 'off';
- 	readonly acceptSuggestionOnCommitCharacter: boolean;
-+<<<<<<< .our
- 	// readonly snippetSuggestions: 'top' | 'bottom' | 'inline' | 'none';
-+=======
-+	readonly snippetSuggestions: 'top' | 'bottom' | 'inline' | 'none';
-+	readonly findWidget: 'default' | 'top' | 'bottom';
-+	readonly emptySelectionClipboard: boolean;
-+>>>>>>> .their
- 	readonly wordBasedSuggestions: boolean;
- 	readonly suggestSelection: 'first' | 'recentlyUsed' | 'recentlyUsedByPrefix';
- 	readonly suggestFontSize: number;
-@@ -1329,6 +1339,12 @@
- 			&& a.suggestOnTriggerCharacters === b.suggestOnTriggerCharacters
- 			&& a.acceptSuggestionOnEnter === b.acceptSuggestionOnEnter
- 			&& a.acceptSuggestionOnCommitCharacter === b.acceptSuggestionOnCommitCharacter
-+<<<<<<< .our
-+=======
-+			&& a.snippetSuggestions === b.snippetSuggestions
-+			&& a.findWidget === b.findWidget
-+			&& a.emptySelectionClipboard === b.emptySelectionClipboard
-+>>>>>>> .their
- 			&& a.wordBasedSuggestions === b.wordBasedSuggestions
- 			&& a.suggestSelection === b.suggestSelection
- 			&& a.suggestFontSize === b.suggestFontSize
-@@ -1933,6 +1949,12 @@
- 			suggestOnTriggerCharacters: _boolean(opts.suggestOnTriggerCharacters, defaults.suggestOnTriggerCharacters),
- 			acceptSuggestionOnEnter: _stringSet<'on' | 'smart' | 'off'>(opts.acceptSuggestionOnEnter, defaults.acceptSuggestionOnEnter, ['on', 'smart', 'off']),
- 			acceptSuggestionOnCommitCharacter: _boolean(opts.acceptSuggestionOnCommitCharacter, defaults.acceptSuggestionOnCommitCharacter),
-+<<<<<<< .our
-+=======
-+			snippetSuggestions: _stringSet<'top' | 'bottom' | 'inline' | 'none'>(opts.snippetSuggestions, defaults.snippetSuggestions, ['top', 'bottom', 'inline', 'none']),
-+			findWidget: _stringSet<'default' | 'top' | 'bottom'>(opts.findWidget, defaults.findWidget, ['default', 'top', 'bottom']),
-+			emptySelectionClipboard: _boolean(opts.emptySelectionClipboard, defaults.emptySelectionClipboard),
-+>>>>>>> .their
- 			wordBasedSuggestions: _boolean(opts.wordBasedSuggestions, defaults.wordBasedSuggestions),
- 			suggestSelection: _stringSet<'first' | 'recentlyUsed' | 'recentlyUsedByPrefix'>(opts.suggestSelection, defaults.suggestSelection, ['first', 'recentlyUsed', 'recentlyUsedByPrefix']),
- 			suggestFontSize: _clampedInt(opts.suggestFontSize, defaults.suggestFontSize, 0, 1000),
-@@ -2515,6 +2537,12 @@
- 		suggestOnTriggerCharacters: true,
- 		acceptSuggestionOnEnter: 'on',
- 		acceptSuggestionOnCommitCharacter: true,
-+<<<<<<< .our
-+=======
-+		snippetSuggestions: 'inline',
-+		findWidget: 'default',
-+		emptySelectionClipboard: true,
-+>>>>>>> .their
- 		wordBasedSuggestions: true,
- 		suggestSelection: 'recentlyUsed',
- 		suggestFontSize: 0,
-removed in local
-  base   100644 74d52635a45a88b57e36a396e5edcd476d8630a7 src/vs/editor/contrib/find/browser/findWidget.css
-  their  100644 38a12717f57f9deec7a136d3bccfd88f638bd7a4 src/vs/editor/contrib/find/browser/findWidget.css
-removed in local
-  base   100644 e909b466c000735604c4afb18477e0e690b42ec4 src/vs/editor/contrib/find/browser/findWidget.ts
-  their  100644 4f57bf85ab9857e5240dff8511bfaa0e741f5a4c src/vs/editor/contrib/find/browser/findWidget.ts
-changed in both
-  base   100644 43916db530ced43c8604b3ed7e8696102ae9d31b src/vs/monaco.d.ts
-  our    100644 76dcf491ff9c1973ad61bf5d423713bb1a3b4e44 src/vs/monaco.d.ts
-  their  100644 0efdc63770888b96c92a3df1b030a7376cef592c src/vs/monaco.d.ts
-@@ -2899,6 +2899,10 @@
- 		 */
- 		snippetSuggestions?: 'top' | 'bottom' | 'inline' | 'none';
- 		/**
-+		 * Control where the findWidget is shown;
-+		 */
-+		findWidget?: 'default' | 'top' | 'bottom';
-+		/**
- 		 * Copying without a selection copies the current line.
- 		 */
- 		emptySelectionClipboard?: boolean;
-@@ -3259,6 +3263,12 @@
- 		readonly suggestOnTriggerCharacters: boolean;
- 		readonly acceptSuggestionOnEnter: 'on' | 'smart' | 'off';
- 		readonly acceptSuggestionOnCommitCharacter: boolean;
-+<<<<<<< .our
-+=======
-+		readonly snippetSuggestions: 'top' | 'bottom' | 'inline' | 'none';
-+		readonly findWidget: 'default' | 'top' | 'bottom';
-+		readonly emptySelectionClipboard: boolean;
-+>>>>>>> .their
- 		readonly wordBasedSuggestions: boolean;
- 		readonly suggestSelection: 'first' | 'recentlyUsed' | 'recentlyUsedByPrefix';
- 		readonly suggestFontSize: number;
-@@ -3593,7 +3603,15 @@
- 		/**
- 		 * Position the overlay widget in the top center
- 		 */
-+<<<<<<< .our
- 		TOP_CENTER = 2
-+=======
-+		TOP_CENTER = 2,
-+		/**
-+		 * Position the overlay widget in the top center
-+		 */
-+		BOTTOM_STICK = 3,
-+>>>>>>> .their
- 	}
- 
- 	/**
-@@ -3604,6 +3622,7 @@
- 		 * The position preference for the overlay widget.
- 		 */
- 		preference: OverlayWidgetPositionPreference;
-+		reRender?: boolean;
- 	}
- 
- 	/**
-changed in both
-  base   100644 32dca3259a40460f5ff1f471bab745452d684d41 src/vs/platform/telemetry/common/telemetryUtils.ts
-  our    100644 83a4326ca5e511e1b955212a7929341083ae29ff src/vs/platform/telemetry/common/telemetryUtils.ts
-  their  100644 40edea496a6b7d77c80290210d379c1e098a2338 src/vs/platform/telemetry/common/telemetryUtils.ts
-@@ -123,11 +123,15 @@
- 	'editor.acceptSuggestionOnEnter',
- 	'editor.acceptSuggestionOnCommitCharacter',
- 	'editor.snippetSuggestions',
-+<<<<<<< .our
- 	'editor.emptySelectionClipboard',
- 	'editor.wordBasedSuggestions',
- 	'editor.suggestSelection',
- 	'editor.suggestFontSize',
- 	'editor.suggestLineHeight',
-+=======
-+	'editor.findWidget',
-+>>>>>>> .their
- 	'editor.selectionHighlight',
- 	'editor.occurrencesHighlight',
- 	'editor.overviewRulerLanes',
diff --git a/app/test/fixtures/merge-parser/vscode/merge-electron-3.0.x-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-electron-3.0.x-into-master.txt
deleted file mode 100644
index aabeb3e95e9..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-electron-3.0.x-into-master.txt
+++ /dev/null
@@ -1,4692 +0,0 @@
-merged
-  result 100644 475565722b1029936ff5d7fe47196ca0eb445eb0 .yarnrc
-  our    100644 58d37cc88fb09a1944c25f4599a9bf93b42a143e .yarnrc
-@@ -1,3 +1,3 @@
- disturl "https://atom.io/download/electron"
--target "2.0.7"
-+target "3.0.0-beta.5"
- runtime "electron"
-merged
-  result 100644 744a6bcac17ec79314944ff462354c088a311af1 OSSREADME.json
-  our    100644 e15cccabcadbd5afb0980967f0af53c135710fc0 OSSREADME.json
-@@ -2,7 +2,7 @@
- [
- {
- 	"name": "chromium",
--	"version": "61.0.3163.100",
-+	"version": "66.0.3359.181",
- 	"repositoryURL": "http://www.chromium.org/Home",
- 	"licenseDetail": [
- 		"BSD License",
-@@ -38,20 +38,20 @@
- },
- {
- 	"name": "libchromiumcontent",
--	"version": "61.0.3163.100",
-+	"version": "66.0.3359.181",
- 	"license": "MIT",
- 	"repositoryURL": "https://github.com/electron/libchromiumcontent",
- 	"isProd": true
- },
- {
- 	"name": "nodejs",
--	"version": "8.9.3",
-+	"version": "10.2.0",
- 	"repositoryURL": "https://github.com/nodejs/node",
- 	"isProd": true
- },
- {
- 	"name": "electron",
--	"version": "2.0.7",
-+	"version": "3.0.0-beta.5",
- 	"license": "MIT",
- 	"repositoryURL": "https://github.com/electron/electron",
- 	"isProd": true
-merged
-  result 100644 03d292a48e340ca5d7d7159b9154a1ded1afde78 build/tfs/darwin/continuous-build-darwin.yml
-  our    100644 5fadd2b4d8d03dcad0a6574f23bf5e9dd0c23162 build/tfs/darwin/continuous-build-darwin.yml
-@@ -1,7 +1,7 @@
- steps:
- - task: NodeTool@0
-   inputs:
--    versionSpec: "8.9.1"
-+    versionSpec: "10.2.1"
- - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-   inputs:
-     versionSpec: "1.3.2"
-merged
-  result 100644 4ecef7ba0fd03bbc37e69069ea2a31c096746fda build/tfs/darwin/product-build-darwin.yml
-  our    100644 0dd3150358630c75dbf77387203c2ba39425b301 build/tfs/darwin/product-build-darwin.yml
-@@ -1,7 +1,7 @@
- steps:
- - task: NodeTool@0
-   inputs:
--    versionSpec: "8.9.1"
-+    versionSpec: "10.2.1"
- 
- - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-   inputs:
-merged
-  result 100644 ed9df376cb24ffa7c9c31fe0b5aa24c27cbaaf8e build/tfs/linux/continuous-build-linux.yml
-  our    100644 abd9a9126dd498b75fadc73e74027c520784a49c build/tfs/linux/continuous-build-linux.yml
-@@ -11,7 +11,7 @@
-     service dbus start
- - task: NodeTool@0
-   inputs:
--    versionSpec: "8.9.1"
-+    versionSpec: "10.2.1"
- - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-   inputs:
-     versionSpec: "1.3.2"
-merged
-  result 100644 67856362537197392c9021d26df2a9db2b5a1f1f build/tfs/linux/product-build-linux.yml
-  our    100644 9505d71ff34898c51d8133de2a9aa145a8cc567d build/tfs/linux/product-build-linux.yml
-@@ -1,7 +1,7 @@
- steps:
- - task: NodeTool@0
-   inputs:
--    versionSpec: "8.9.1"
-+    versionSpec: "10.2.1"
- 
- - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-   inputs:
-merged
-  result 100644 4d579f0dcd22370da02671d279a59ed1cc81a0e4 build/tfs/win32/continuous-build-win32.yml
-  our    100644 4e409f5d53dcaecbc0c5a30e655943ea929fdd36 build/tfs/win32/continuous-build-win32.yml
-@@ -1,7 +1,7 @@
- steps:
- - task: NodeTool@0
-   inputs:
--    versionSpec: "8.9.1"
-+    versionSpec: "10.2.1"
- - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-   inputs:
-     versionSpec: "1.3.2"
-merged
-  result 100644 41c6190f2fbe2177b3eb25a14602f8f121f52beb build/tfs/win32/product-build-win32.yml
-  our    100644 c887ade31fddad368413f901c9e8b2e1a350228d build/tfs/win32/product-build-win32.yml
-@@ -1,7 +1,7 @@
- steps:
- - task: NodeTool@0
-   inputs:
--    versionSpec: "8.9.1"
-+    versionSpec: "10.2.1"
- 
- - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-   inputs:
-changed in both
-  base   100644 786f109e924641589010138a6cc2e3cc001dbd8d package.json
-  our    100644 d0e982ce0b76c5b1b5eb02b673e459e47f3353a4 package.json
-  their  100644 7c08b03da29d150ed70f032232dcf5c8fce26685 package.json
-@@ -1,7 +1,7 @@
- {
-   "name": "code-oss-dev",
-   "version": "1.27.0",
--  "distro": "a4155d9780fbbc94ead6cb3017dd0fc3806c57b8",
-+  "distro": "8bf4f1b8058f88ed6a0e54643470c7171eab1eb7",
-   "author": {
-     "name": "Microsoft Corporation"
-   },
-@@ -44,11 +44,11 @@
-     "spdlog": "0.7.1",
-     "sudo-prompt": "8.2.0",
-     "v8-inspect-profiler": "^0.0.8",
--    "vscode-chokidar": "1.6.2",
-+    "vscode-chokidar": "^1.6.2",
-     "vscode-debugprotocol": "1.31.0",
--    "vscode-nsfw": "1.0.17",
-+    "vscode-nsfw": "Tyriar/vscode-nsfw#electron-3.0.x",
-     "vscode-ripgrep": "1.1.0",
--    "vscode-textmate": "^4.0.1",
-+    "vscode-textmate": "Microsoft/vscode-textmate#electron-3.0.x",
-     "vscode-xterm": "3.7.0-beta4",
-     "winreg": "^1.2.4",
-     "yauzl": "^2.9.1"
-@@ -139,7 +139,7 @@
-   },
-   "optionalDependencies": {
-     "windows-foreground-love": "0.1.0",
--    "windows-mutex": "^0.2.0",
--    "windows-process-tree": "0.2.2"
-+    "windows-mutex": "Microsoft/node-windows-mutex#electron-3.0.x",
-+    "windows-process-tree": "Microsoft/vscode-windows-process-tree#electron-3.0.x"
-   }
- }
-\ No newline at end of file
-merged
-  result 100644 c08df94a8595ab1577dcd2e93d638a6680e75789 src/main.js
-  our    100644 711217d64e2bdc43f33652d0bed34caa052cc331 src/main.js
-@@ -78,10 +78,8 @@
- 
- const app = require('electron').app;
- 
--// TODO@Ben Electron 2.0.x: prevent localStorage migration from SQLite to LevelDB due to issues
--app.commandLine.appendSwitch('disable-mojo-local-storage');
--
- // Force pre-Chrome-60 color profile handling (for https://github.com/Microsoft/vscode/issues/51791)
-+// TODO@Ben check if future versions of Electron still support this flag
- app.commandLine.appendSwitch('disable-features', 'ColorCorrectRendering');
- 
- const minimist = require('minimist');
-merged
-  result 100644 defbbd2bc6aac9900bd4f750bc1585eb13d1c57c src/typings/electron.d.ts
-  our    100644 445234b2076f14266e2c682765eab7de784259e4 src/typings/electron.d.ts
-@@ -1,5 +1,5 @@
--// Type definitions for Electron 2.0.5
--// Project: http://electron.atom.io/
-+// Type definitions for Electron 3.0.0-beta.5
-+// Project: http://electronjs.org/
- // Definitions by: The Electron Team <https://github.com/electron/electron>
- // Definitions: https://github.com/electron/electron-typescript-definitions
- 
-@@ -64,6 +64,7 @@
- 		Menu: typeof Menu;
- 		MenuItem: typeof MenuItem;
- 		net: Net;
-+		netLog: NetLog;
- 		Notification: typeof Notification;
- 		powerMonitor: PowerMonitor;
- 		powerSaveBlocker: PowerSaveBlocker;
-@@ -101,6 +102,7 @@
- 	type nativeImage = NativeImage;
- 	const nativeImage: typeof NativeImage;
- 	const net: Net;
-+	const netLog: NetLog;
- 	const powerMonitor: PowerMonitor;
- 	const powerSaveBlocker: PowerSaveBlocker;
- 	const protocol: Protocol;
-@@ -471,6 +473,50 @@
- 		addListener(event: 'ready', listener: (launchInfo: any) => void): this;
- 		removeListener(event: 'ready', listener: (launchInfo: any) => void): this;
- 		/**
-+		 * This event will be emitted inside the primary instance of your application when
-+		 * a second instance has been executed. argv is an Array of the second instance's
-+		 * command line arguments, and workingDirectory is its current working directory.
-+		 * Usually applications respond to this by making their primary window focused and
-+		 * non-minimized. This event is guaranteed to be emitted after the ready event of
-+		 * app gets emitted.
-+		 */
-+		on(event: 'second-instance', listener: (event: Event,
-+			/**
-+			 * An array of the second instance's command line arguments
-+			 */
-+			argv: string[],
-+			/**
-+			 * The second instance's working directory
-+			 */
-+			workingDirectory: string) => void): this;
-+		once(event: 'second-instance', listener: (event: Event,
-+			/**
-+			 * An array of the second instance's command line arguments
-+			 */
-+			argv: string[],
-+			/**
-+			 * The second instance's working directory
-+			 */
-+			workingDirectory: string) => void): this;
-+		addListener(event: 'second-instance', listener: (event: Event,
-+			/**
-+			 * An array of the second instance's command line arguments
-+			 */
-+			argv: string[],
-+			/**
-+			 * The second instance's working directory
-+			 */
-+			workingDirectory: string) => void): this;
-+		removeListener(event: 'second-instance', listener: (event: Event,
-+			/**
-+			 * An array of the second instance's command line arguments
-+			 */
-+			argv: string[],
-+			/**
-+			 * The second instance's working directory
-+			 */
-+			workingDirectory: string) => void): this;
-+		/**
- 		 * Emitted when a client certificate is requested. The url corresponds to the
- 		 * navigation entry requesting the client certificate and callback can be called
- 		 * with an entry filtered from the list. Using event.preventDefault() prevents the
-@@ -497,6 +543,17 @@
- 			certificateList: Certificate[],
- 			callback: (certificate?: Certificate) => void) => void): this;
- 		/**
-+		 * Emitted when Electron has created a new session.
-+		 */
-+		on(event: 'session-created', listener: (event: Event,
-+			session: Session) => void): this;
-+		once(event: 'session-created', listener: (event: Event,
-+			session: Session) => void): this;
-+		addListener(event: 'session-created', listener: (event: Event,
-+			session: Session) => void): this;
-+		removeListener(event: 'session-created', listener: (event: Event,
-+			session: Session) => void): this;
-+		/**
- 		 * Emitted when Handoff is about to be resumed on another device. If you need to
- 		 * update the state to be transferred, you should call event.preventDefault()
- 		 * immediately, construct a new userInfo dictionary and call
-@@ -581,7 +638,7 @@
- 		 * event represents the applicationWillFinishLaunching notification of
- 		 * NSApplication. You would usually set up listeners for the open-file and open-url
- 		 * events here, and start the crash reporter and auto updater. In most cases, you
--		 * should just do everything in the ready event handler.
-+		 * should do everything in the ready event handler.
- 		 */
- 		on(event: 'will-finish-launching', listener: Function): this;
- 		once(event: 'will-finish-launching', listener: Function): this;
-@@ -656,12 +713,12 @@
- 		 * Fetches a path's associated icon. On Windows, there a 2 kinds of icons: On Linux
- 		 * and macOS, icons depend on the application associated with file mime type.
- 		 */
--		getFileIcon(path: string, callback: (error: Error, icon: NativeImage) => void): void;
-+		getFileIcon(path: string, options: FileIconOptions, callback: (error: Error, icon: NativeImage) => void): void;
- 		/**
- 		 * Fetches a path's associated icon. On Windows, there a 2 kinds of icons: On Linux
- 		 * and macOS, icons depend on the application associated with file mime type.
- 		 */
--		getFileIcon(path: string, options: FileIconOptions, callback: (error: Error, icon: NativeImage) => void): void;
-+		getFileIcon(path: string, callback: (error: Error, icon: NativeImage) => void): void;
- 		getGPUFeatureStatus(): GPUFeatureStatus;
- 		getJumpListSettings(): JumpListSettings;
- 		/**
-@@ -689,6 +746,12 @@
- 		getPath(name: string): string;
- 		getVersion(): string;
- 		/**
-+		 * This method returns whether or not this instance of your app is currently
-+		 * holding the single instance lock.  You can request the lock with
-+		 * app.requestSingleInstanceLock() and release with app.releaseSingleInstanceLock()
-+		 */
-+		hasSingleInstanceLock(): boolean;
-+		/**
- 		 * Hides all application windows without minimizing them.
- 		 */
- 		hide(): void;
-@@ -718,27 +781,6 @@
- 		isReady(): boolean;
- 		isUnityRunning(): boolean;
- 		/**
--		 * This method makes your application a Single Instance Application - instead of
--		 * allowing multiple instances of your app to run, this will ensure that only a
--		 * single instance of your app is running, and other instances signal this instance
--		 * and exit. callback will be called by the first instance with callback(argv,
--		 * workingDirectory) when a second instance has been executed. argv is an Array of
--		 * the second instance's command line arguments, and workingDirectory is its
--		 * current working directory. Usually applications respond to this by making their
--		 * primary window focused and non-minimized. The callback is guaranteed to be
--		 * executed after the ready event of app gets emitted. This method returns false if
--		 * your process is the primary instance of the application and your app should
--		 * continue loading. And returns true if your process has sent its parameters to
--		 * another instance, and you should immediately quit. On macOS the system enforces
--		 * single instance automatically when users try to open a second instance of your
--		 * app in Finder, and the open-file and open-url events will be emitted for that.
--		 * However when users start your app in command line the system's single instance
--		 * mechanism will be bypassed and you have to use this method to ensure single
--		 * instance. An example of activating the window of primary instance when a second
--		 * instance starts:
--		 */
--		makeSingleInstance(callback: (argv: string[], workingDirectory: string) => void): boolean;
--		/**
- 		 * No confirmation dialog will be presented by default, if you wish to allow the
- 		 * user to confirm the operation you may do so using the dialog API. NOTE: This
- 		 * method throws errors if anything other than the user causes the move to fail.
-@@ -770,16 +812,35 @@
- 		 */
- 		relaunch(options?: RelaunchOptions): void;
- 		/**
--		 * Releases all locks that were created by makeSingleInstance. This will allow
--		 * multiple instances of the application to once again run side by side.
-+		 * Releases all locks that were created by requestSingleInstanceLock. This will
-+		 * allow multiple instances of the application to once again run side by side.
- 		 */
--		releaseSingleInstance(): void;
-+		releaseSingleInstanceLock(): void;
- 		/**
- 		 * This method checks if the current executable as the default handler for a
- 		 * protocol (aka URI scheme). If so, it will remove the app as the default handler.
- 		 */
- 		removeAsDefaultProtocolClient(protocol: string, path?: string, args?: string[]): boolean;
- 		/**
-+		 * This method makes your application a Single Instance Application - instead of
-+		 * allowing multiple instances of your app to run, this will ensure that only a
-+		 * single instance of your app is running, and other instances signal this instance
-+		 * and exit. The return value of this method indicates whether or not this instance
-+		 * of your application successfully obtained the lock.  If it failed to obtain the
-+		 * lock you can assume that another instance of your application is already running
-+		 * with the lock and exit immediately. I.e. This method returns true if your
-+		 * process is the primary instance of your application and your app should continue
-+		 * loading.  It returns false if your process should immediately quit as it has
-+		 * sent its parameters to another instance that has already acquired the lock. On
-+		 * macOS the system enforces single instance automatically when users try to open a
-+		 * second instance of your app in Finder, and the open-file and open-url events
-+		 * will be emitted for that. However when users start your app in command line the
-+		 * system's single instance mechanism will be bypassed and you have to use this
-+		 * method to ensure single instance. An example of activating the window of primary
-+		 * instance when a second instance starts:
-+		 */
-+		requestSingleInstanceLock(): boolean;
-+		/**
- 		 * Set the about panel options. This will override the values defined in the app's
- 		 * .plist file. See the Apple docs for more details.
- 		 */
-@@ -883,8 +944,15 @@
- 		 * userInfo into its current userInfo dictionary.
- 		 */
- 		updateCurrentActivity(type: string, userInfo: any): void;
-+		whenReady(): Promise<any>;
- 		commandLine: CommandLine;
- 		dock: Dock;
-+		/**
-+		 * A Boolean property that returns  true if the app is packaged, false otherwise.
-+		 * For many apps, this property can be used to distinguish development and
-+		 * production environments.
-+		 */
-+		isPackaged?: boolean;
- 	}
- 
- 	interface AutoUpdater extends EventEmitter {
-@@ -892,6 +960,17 @@
- 		// Docs: http://electron.atom.io/docs/api/auto-updater
- 
- 		/**
-+		 * This event is emitted after a user calls quitAndInstall(). When this API is
-+		 * called, the before-quit event is not emitted before all windows are closed. As a
-+		 * result you should listen to this event if you wish to perform actions before the
-+		 * windows are closed while a process is quitting, as well as listening to
-+		 * before-quit.
-+		 */
-+		on(event: 'before-quit-for-update', listener: Function): this;
-+		once(event: 'before-quit-for-update', listener: Function): this;
-+		addListener(event: 'before-quit-for-update', listener: Function): this;
-+		removeListener(event: 'before-quit-for-update', listener: Function): this;
-+		/**
- 		 * Emitted when checking if an update has started.
- 		 */
- 		on(event: 'checking-for-update', listener: Function): this;
-@@ -1034,7 +1113,7 @@
- 		 * cancel the close. For example: Note: There is a subtle difference between the
- 		 * behaviors of window.onbeforeunload = handler and
- 		 * window.addEventListener('beforeunload', handler). It is recommended to always
--		 * set the event.returnValue explicitly, instead of just returning a value, as the
-+		 * set the event.returnValue explicitly, instead of only returning a value, as the
- 		 * former works more consistently within Electron.
- 		 */
- 		on(event: 'close', listener: (event: Event) => void): this;
-@@ -1107,7 +1186,7 @@
- 		removeListener(event: 'minimize', listener: Function): this;
- 		/**
- 		 * Emitted when the window is being moved to a new position. Note: On macOS this
--		 * event is just an alias of moved.
-+		 * event is an alias of moved.
- 		 */
- 		on(event: 'move', listener: Function): this;
- 		once(event: 'move', listener: Function): this;
-@@ -1274,7 +1353,7 @@
- 		 * emitted.
- 		 */
- 		static getExtensions(): Extensions;
--		static getFocusedWindow(): BrowserWindow;
-+		static getFocusedWindow(): BrowserWindow | null;
- 		/**
- 		 * Remove a DevTools extension by name. Note: This API cannot be called before the
- 		 * ready event of the app module is emitted.
-@@ -1440,6 +1519,10 @@
- 		 */
- 		moveTabToNewWindow(): void;
- 		/**
-+		 * Moves window to top(z-order) regardless of focus
-+		 */
-+		moveTop(): void;
-+		/**
- 		 * Uses Quick Look to preview a file at a given path.
- 		 */
- 		previewFile(path: string, displayName?: string): void;
-@@ -1484,8 +1567,9 @@
- 		 * ratio for HD @1920x1080) within the player itself we would call this function
- 		 * with arguments of 16/9 and [ 40, 50 ]. The second argument doesn't care where
- 		 * the extra width and height are within the content view--only that they exist.
--		 * Just sum any extra width and height areas you have within the overall content
--		 * view.
-+		 * Sum any extra width and height areas you have within the overall content view.
-+		 * Calling this function with a value of 0 will remove any previously set aspect
-+		 * ratios.
- 		 */
- 		setAspectRatio(aspectRatio: number, extraSize: Size): void;
- 		/**
-@@ -1602,7 +1686,7 @@
- 		 * Sets a 16 x 16 pixel overlay onto the current taskbar icon, usually used to
- 		 * convey some sort of application status or to passively notify the user.
- 		 */
--		setOverlayIcon(overlay: NativeImage, description: string): void;
-+		setOverlayIcon(overlay: NativeImage | null, description: string): void;
- 		/**
- 		 * Sets parent as current window's parent window, passing null will turn current
- 		 * window into a top-level window.
-@@ -2438,6 +2522,12 @@
- 		// Docs: http://electron.atom.io/docs/api/structures/desktop-capturer-source
- 
- 		/**
-+		 * A unique identifier that will correspond to the id of the matching returned by
-+		 * the . On some platforms, this is equivalent to the XX portion of the id field
-+		 * above and on others it will differ. It will be an empty string if not available.
-+		 */
-+		display_id: string;
-+		/**
- 		 * The identifier of a window or screen that can be used as a chromeMediaSourceId
- 		 * constraint when calling [navigator.webkitGetUserMedia]. The format of the
- 		 * identifier will be window:XX or screen:XX, where XX is a random generated
-@@ -2785,26 +2875,42 @@
- 		 */
- 		on(event: 'transactions-updated', listener: (event: Event,
- 			/**
--			 * Array of transactions.
-+			 * Array of objects.
- 			 */
- 			transactions: Transaction[]) => void): this;
- 		once(event: 'transactions-updated', listener: (event: Event,
- 			/**
--			 * Array of transactions.
-+			 * Array of objects.
- 			 */
- 			transactions: Transaction[]) => void): this;
- 		addListener(event: 'transactions-updated', listener: (event: Event,
- 			/**
--			 * Array of transactions.
-+			 * Array of objects.
- 			 */
- 			transactions: Transaction[]) => void): this;
- 		removeListener(event: 'transactions-updated', listener: (event: Event,
- 			/**
--			 * Array of transactions.
-+			 * Array of objects.
- 			 */
- 			transactions: Transaction[]) => void): this;
- 		canMakePayments(): boolean;
-+		/**
-+		 * Completes all pending transactions.
-+		 */
-+		finishAllTransactions(): void;
-+		/**
-+		 * Completes the pending transactions corresponding to the date.
-+		 */
-+		finishTransactionByDate(date: string): void;
-+		/**
-+		 * Retrieves the product descriptions.
-+		 */
-+		getProducts(productIDs: string[], callback: (products: Product[]) => void): void;
- 		getReceiptURL(): string;
-+		/**
-+		 * You should listen for the transactions-updated event as soon as possible and
-+		 * certainly before you call purchaseProduct.
-+		 */
- 		purchaseProduct(productID: string, quantity?: number, callback?: (isProductValid: boolean) => void): void;
- 	}
- 
-@@ -3097,10 +3203,9 @@
- 		removeListener(event: 'menu-will-show', listener: (event: Event) => void): this;
- 		constructor();
- 		/**
--		 * Generally, the template is just an array of options for constructing a MenuItem.
--		 * The usage can be referenced above. You can also attach other fields to the
--		 * element of the template and they will become properties of the constructed menu
--		 * items.
-+		 * Generally, the template is an array of options for constructing a MenuItem. The
-+		 * usage can be referenced above. You can also attach other fields to the element
-+		 * of the template and they will become properties of the constructed menu items.
- 		 */
- 		static buildFromTemplate(template: MenuItemConstructorOptions[]): Menu;
- 		/**
-@@ -3110,9 +3215,9 @@
- 		static getApplicationMenu(): Menu | null;
- 		/**
- 		 * Sends the action to the first responder of application. This is used for
--		 * emulating default macOS menu behaviors. Usually you would just use the role
--		 * property of a MenuItem. See the macOS Cocoa Event Handling Guide for more
--		 * information on macOS' native actions.
-+		 * emulating default macOS menu behaviors. Usually you would use the role property
-+		 * of a MenuItem. See the macOS Cocoa Event Handling Guide for more information on
-+		 * macOS' native actions.
- 		 */
- 		static sendActionToFirstResponder(action: string): void;
- 		/**
-@@ -3248,6 +3353,29 @@
- 		request(options: any | string): ClientRequest;
- 	}
- 
-+	interface NetLog extends EventEmitter {
-+
-+		// Docs: http://electron.atom.io/docs/api/net-log
-+
-+		/**
-+		 * Starts recording network events to path.
-+		 */
-+		startLogging(path: string): void;
-+		/**
-+		 * Stops recording network events. If not called, net logging will automatically
-+		 * end when app quits.
-+		 */
-+		stopLogging(callback?: (path: string) => void): void;
-+		/**
-+		 * A Boolean property that indicates whether network logs are recorded.
-+		 */
-+		currentlyLogging?: boolean;
-+		/**
-+		 * A String property that returns the path to the current log file.
-+		 */
-+		currentlyLoggingPath?: string;
-+	}
-+
- 	class Notification extends EventEmitter {
- 
- 		// Docs: http://electron.atom.io/docs/api/notification
-@@ -3329,11 +3457,11 @@
- 		close(): void;
- 		/**
- 		 * Immediately shows the notification to the user, please note this means unlike
--		 * the HTML5 Notification implementation, simply instantiating a new Notification
--		 * does not immediately show it to the user, you need to call this method before
--		 * the OS will display it. If the notification has been shown before, this method
--		 * will dismiss the previously shown notification and create a new one with
--		 * identical properties.
-+		 * the HTML5 Notification implementation, instantiating a new Notification does not
-+		 * immediately show it to the user, you need to call this method before the OS will
-+		 * display it. If the notification has been shown before, this method will dismiss
-+		 * the previously shown notification and create a new one with identical
-+		 * properties.
- 		 */
- 		show(): void;
- 	}
-@@ -3365,6 +3493,13 @@
- 		// Docs: http://electron.atom.io/docs/api/power-monitor
- 
- 		/**
-+		 * Emitted when the system is about to lock the screen.
-+		 */
-+		on(event: 'lock-screen', listener: Function): this;
-+		once(event: 'lock-screen', listener: Function): this;
-+		addListener(event: 'lock-screen', listener: Function): this;
-+		removeListener(event: 'lock-screen', listener: Function): this;
-+		/**
- 		 * Emitted when the system changes to AC power.
- 		 */
- 		on(event: 'on-ac', listener: Function): this;
-@@ -3402,6 +3537,13 @@
- 		once(event: 'suspend', listener: Function): this;
- 		addListener(event: 'suspend', listener: Function): this;
- 		removeListener(event: 'suspend', listener: Function): this;
-+		/**
-+		 * Emitted as soon as the systems screen is unlocked.
-+		 */
-+		on(event: 'unlock-screen', listener: Function): this;
-+		once(event: 'unlock-screen', listener: Function): this;
-+		addListener(event: 'unlock-screen', listener: Function): this;
-+		removeListener(event: 'unlock-screen', listener: Function): this;
- 	}
- 
- 	interface PowerSaveBlocker extends EventEmitter {
-@@ -3458,6 +3600,45 @@
- 		type: string;
- 	}
- 
-+	interface Product {
-+
-+		// Docs: http://electron.atom.io/docs/api/structures/product
-+
-+		/**
-+		 * The total size of the content, in bytes.
-+		 */
-+		contentLengths: number[];
-+		/**
-+		 * A string that identifies the version of the content.
-+		 */
-+		contentVersion: string;
-+		/**
-+		 * A Boolean value that indicates whether the App Store has downloadable content
-+		 * for this product.
-+		 */
-+		downloadable: boolean;
-+		/**
-+		 * The locale formatted price of the product.
-+		 */
-+		formattedPrice: string;
-+		/**
-+		 * A description of the product.
-+		 */
-+		localizedDescription: string;
-+		/**
-+		 * The name of the product.
-+		 */
-+		localizedTitle: string;
-+		/**
-+		 * The cost of the product in the local currency.
-+		 */
-+		price: number;
-+		/**
-+		 * The string that identifies the product to the Apple App Store.
-+		 */
-+		productIdentifier: string;
-+	}
-+
- 	interface Protocol extends EventEmitter {
- 
- 		// Docs: http://electron.atom.io/docs/api/protocol
-@@ -3590,11 +3771,32 @@
- 		y: number;
- 	}
- 
-+	interface Referrer {
-+
-+		// Docs: http://electron.atom.io/docs/api/structures/referrer
-+
-+		/**
-+		 * Can be default, unsafe-url, no-referrer-when-downgrade, no-referrer, origin,
-+		 * strict-origin-when-cross-origin, same-origin or strict-origin. See the for more
-+		 * details on the meaning of these values.
-+		 */
-+		policy: ('default' | 'unsafe-url' | 'no-referrer-when-downgrade' | 'no-referrer' | 'origin' | 'strict-origin-when-cross-origin' | 'same-origin' | 'strict-origin');
-+		/**
-+		 * HTTP Referrer URL.
-+		 */
-+		url: string;
-+	}
-+
- 	interface Remote extends MainInterface {
- 
- 		// Docs: http://electron.atom.io/docs/api/remote
- 
- 		getCurrentWebContents(): WebContents;
-+		/**
-+		 * Note: Do not use removeAllListeners on BrowserWindow. Use of this can remove all
-+		 * blur listeners, disable click events on touch bar buttons, and other unintended
-+		 * consequences.
-+		 */
- 		getCurrentWindow(): BrowserWindow;
- 		getGlobal(name: string): any;
- 		/**
-@@ -3698,6 +3900,17 @@
- 			oldDisplay: Display) => void): this;
- 		removeListener(event: 'display-removed', listener: (event: Event,
- 			oldDisplay: Display) => void): this;
-+		/**
-+		 * Converts a screen DIP point to a screen physical point. The DPI scale is
-+		 * performed relative to the display containing the DIP point.
-+		 */
-+		dipToScreenPoint(point: Point): Point;
-+		/**
-+		 * Converts a screen DIP rect to a screen physical rect. The DPI scale is performed
-+		 * relative to the display nearest to window. If window is null, scaling will be
-+		 * performed to the display nearest to rect.
-+		 */
-+		dipToScreenRect(window: BrowserWindow | null, rect: Rectangle): Rectangle;
- 		getAllDisplays(): Display[];
- 		/**
- 		 * The current absolute position of the mouse pointer.
-@@ -3705,8 +3918,18 @@
- 		getCursorScreenPoint(): Point;
- 		getDisplayMatching(rect: Rectangle): Display;
- 		getDisplayNearestPoint(point: Point): Display;
--		getMenuBarHeight(): number;
- 		getPrimaryDisplay(): Display;
-+		/**
-+		 * Converts a screen physical point to a screen DIP point. The DPI scale is
-+		 * performed relative to the display containing the physical point.
-+		 */
-+		screenToDipPoint(point: Point): Point;
-+		/**
-+		 * Converts a screen physical rect to a screen DIP rect. The DPI scale is performed
-+		 * relative to the display nearest to window. If window is null, scaling will be
-+		 * performed to the display nearest to rect.
-+		 */
-+		screenToDipRect(window: BrowserWindow | null, rect: Rectangle): Rectangle;
- 	}
- 
- 	interface ScrubberItem {
-@@ -4052,6 +4275,11 @@
- 		 */
- 		postNotification(event: string, userInfo: any): void;
- 		/**
-+		 * Posts event as native notifications of macOS. The userInfo is an Object that
-+		 * contains the user information dictionary sent along with the notification.
-+		 */
-+		postWorkspaceNotification(event: string, userInfo: any): void;
-+		/**
- 		 * Add the specified defaults to your application's NSUserDefaults.
- 		 */
- 		registerDefaults(defaults: any): void;
-@@ -4080,6 +4308,12 @@
- 		 */
- 		subscribeNotification(event: string, callback: (event: string, userInfo: any) => void): void;
- 		/**
-+		 * Same as subscribeNotification, but uses
-+		 * NSWorkspace.sharedWorkspace.notificationCenter. This is necessary for events
-+		 * such as NSWorkspaceDidActivateApplicationNotification.
-+		 */
-+		subscribeWorkspaceNotification(event: string, callback: (event: string, userInfo: any) => void): void;
-+		/**
- 		 * Same as unsubscribeNotification, but removes the subscriber from
- 		 * NSNotificationCenter.
- 		 */
-@@ -4088,6 +4322,11 @@
- 		 * Removes the subscriber with id.
- 		 */
- 		unsubscribeNotification(id: number): void;
-+		/**
-+		 * Same as unsubscribeNotification, but removes the subscriber from
-+		 * NSWorkspace.sharedWorkspace.notificationCenter.
-+		 */
-+		unsubscribeWorkspaceNotification(id: number): void;
- 	}
- 
- 	interface Task {
-@@ -4251,17 +4490,32 @@
- 
- 		// Docs: http://electron.atom.io/docs/api/structures/transaction
- 
-+		/**
-+		 * The error code if an error occurred while processing the transaction.
-+		 */
- 		errorCode: number;
-+		/**
-+		 * The error message if an error occurred while processing the transaction.
-+		 */
- 		errorMessage: string;
-+		/**
-+		 * The identifier of the restored transaction by the App Store.
-+		 */
- 		originalTransactionIdentifier: string;
- 		payment: Payment;
-+		/**
-+		 * The date the transaction was added to the App Store’s payment queue.
-+		 */
- 		transactionDate: string;
-+		/**
-+		 * A string that uniquely identifies a successful payment transaction.
-+		 */
- 		transactionIdentifier: string;
- 		/**
--		 * The transaction sate ("purchasing", "purchased", "failed", "restored", or
--		 * "deferred")
-+		 * The transaction state, can be purchasing, purchased, failed, restored or
-+		 * deferred.
- 		 */
--		transactionState: string;
-+		transactionState: ('purchasing' | 'purchased' | 'failed' | 'restored' | 'deferred');
- 	}
- 
- 	class Tray extends EventEmitter {
-@@ -4531,6 +4785,7 @@
- 		 * The bounds of this tray icon as Object.
- 		 */
- 		getBounds(): Rectangle;
-+		getIgnoreDoubleClickEvents(): boolean;
- 		isDestroyed(): boolean;
- 		/**
- 		 * Pops up the context menu of the tray icon. When menu is passed, the menu will be
-@@ -4549,13 +4804,19 @@
- 		 */
- 		setHighlightMode(mode: 'selection' | 'always' | 'never'): void;
- 		/**
-+		 * Sets the option to ignore double click events. Ignoring these events allows you
-+		 * to detect every individual click of the tray icon. This value is set to false by
-+		 * default.
-+		 */
-+		setIgnoreDoubleClickEvents(ignore: boolean): void;
-+		/**
- 		 * Sets the image associated with this tray icon.
- 		 */
- 		setImage(image: NativeImage | string): void;
- 		/**
- 		 * Sets the image associated with this tray icon when pressed on macOS.
- 		 */
--		setPressedImage(image: NativeImage): void;
-+		setPressedImage(image: NativeImage | string): void;
- 		/**
- 		 * Sets the title displayed aside of the tray icon in the status bar (Support ANSI
- 		 * colors).
-@@ -4625,32 +4886,6 @@
- 		type: string;
- 	}
- 
--	interface UploadFileSystem {
--
--		// Docs: http://electron.atom.io/docs/api/structures/upload-file-system
--
--		/**
--		 * FileSystem url to read data for upload.
--		 */
--		filsSystemURL: string;
--		/**
--		 * Number of bytes to read from offset. Defaults to 0.
--		 */
--		length: number;
--		/**
--		 * Last Modification time in number of seconds since the UNIX epoch.
--		 */
--		modificationTime: number;
--		/**
--		 * Defaults to 0.
--		 */
--		offset: number;
--		/**
--		 * fileSystem.
--		 */
--		type: string;
--	}
--
- 	interface UploadRawData {
- 
- 		// Docs: http://electron.atom.io/docs/api/structures/upload-raw-data
-@@ -4737,19 +4972,23 @@
- 		 * Emitted when the associated window logs a console message. Will not be emitted
- 		 * for windows with offscreen rendering enabled.
- 		 */
--		on(event: 'console-message', listener: (level: number,
-+		on(event: 'console-message', listener: (event: Event,
-+			level: number,
- 			message: string,
- 			line: number,
- 			sourceId: string) => void): this;
--		once(event: 'console-message', listener: (level: number,
-+		once(event: 'console-message', listener: (event: Event,
-+			level: number,
- 			message: string,
- 			line: number,
- 			sourceId: string) => void): this;
--		addListener(event: 'console-message', listener: (level: number,
-+		addListener(event: 'console-message', listener: (event: Event,
-+			level: number,
- 			message: string,
- 			line: number,
- 			sourceId: string) => void): this;
--		removeListener(event: 'console-message', listener: (level: number,
-+		removeListener(event: 'console-message', listener: (event: Event,
-+			level: number,
- 			message: string,
- 			line: number,
- 			sourceId: string) => void): this;
-@@ -4938,22 +5177,30 @@
- 			errorCode: number,
- 			errorDescription: string,
- 			validatedURL: string,
--			isMainFrame: boolean) => void): this;
-+			isMainFrame: boolean,
-+			frameProcessId: number,
-+			frameRoutingId: number) => void): this;
- 		once(event: 'did-fail-load', listener: (event: Event,
- 			errorCode: number,
- 			errorDescription: string,
- 			validatedURL: string,
--			isMainFrame: boolean) => void): this;
-+			isMainFrame: boolean,
-+			frameProcessId: number,
-+			frameRoutingId: number) => void): this;
- 		addListener(event: 'did-fail-load', listener: (event: Event,
- 			errorCode: number,
- 			errorDescription: string,
- 			validatedURL: string,
--			isMainFrame: boolean) => void): this;
-+			isMainFrame: boolean,
-+			frameProcessId: number,
-+			frameRoutingId: number) => void): this;
- 		removeListener(event: 'did-fail-load', listener: (event: Event,
- 			errorCode: number,
- 			errorDescription: string,
- 			validatedURL: string,
--			isMainFrame: boolean) => void): this;
-+			isMainFrame: boolean,
-+			frameProcessId: number,
-+			frameRoutingId: number) => void): this;
- 		/**
- 		 * Emitted when the navigation is done, i.e. the spinner of the tab has stopped
- 		 * spinning, and the onload event was dispatched.
-@@ -4966,119 +5213,149 @@
- 		 * Emitted when a frame has done navigation.
- 		 */
- 		on(event: 'did-frame-finish-load', listener: (event: Event,
--			isMainFrame: boolean) => void): this;
-+			isMainFrame: boolean,
-+			frameProcessId: number,
-+			frameRoutingId: number) => void): this;
- 		once(event: 'did-frame-finish-load', listener: (event: Event,
--			isMainFrame: boolean) => void): this;
-+			isMainFrame: boolean,
-+			frameProcessId: number,
-+			frameRoutingId: number) => void): this;
- 		addListener(event: 'did-frame-finish-load', listener: (event: Event,
--			isMainFrame: boolean) => void): this;
-+			isMainFrame: boolean,
-+			frameProcessId: number,
-+			frameRoutingId: number) => void): this;
- 		removeListener(event: 'did-frame-finish-load', listener: (event: Event,
--			isMainFrame: boolean) => void): this;
-+			isMainFrame: boolean,
-+			frameProcessId: number,
-+			frameRoutingId: number) => void): this;
- 		/**
--		 * Emitted when a redirect is received while requesting a resource.
-+		 * Emitted when any frame navigation is done. This event is not emitted for in-page
-+		 * navigations, such as clicking anchor links or updating the window.location.hash.
-+		 * Use did-navigate-in-page event for this purpose.
- 		 */
--		on(event: 'did-get-redirect-request', listener: (event: Event,
--			oldURL: string,
--			newURL: string,
--			isMainFrame: boolean,
-+		on(event: 'did-frame-navigate', listener: (event: Event,
-+			url: string,
-+			/**
-+			 * -1 for non HTTP navigations
-+			 */
- 			httpResponseCode: number,
--			requestMethod: string,
--			referrer: string,
--			headers: any) => void): this;
--		once(event: 'did-get-redirect-request', listener: (event: Event,
--			oldURL: string,
--			newURL: string,
-+			/**
-+			 * empty for non HTTP navigations,
-+			 */
-+			httpStatusText: string,
- 			isMainFrame: boolean,
-+			frameProcessId: number,
-+			frameRoutingId: number) => void): this;
-+		once(event: 'did-frame-navigate', listener: (event: Event,
-+			url: string,
-+			/**
-+			 * -1 for non HTTP navigations
-+			 */
- 			httpResponseCode: number,
--			requestMethod: string,
--			referrer: string,
--			headers: any) => void): this;
--		addListener(event: 'did-get-redirect-request', listener: (event: Event,
--			oldURL: string,
--			newURL: string,
-+			/**
-+			 * empty for non HTTP navigations,
-+			 */
-+			httpStatusText: string,
- 			isMainFrame: boolean,
-+			frameProcessId: number,
-+			frameRoutingId: number) => void): this;
-+		addListener(event: 'did-frame-navigate', listener: (event: Event,
-+			url: string,
-+			/**
-+			 * -1 for non HTTP navigations
-+			 */
- 			httpResponseCode: number,
--			requestMethod: string,
--			referrer: string,
--			headers: any) => void): this;
--		removeListener(event: 'did-get-redirect-request', listener: (event: Event,
--			oldURL: string,
--			newURL: string,
-+			/**
-+			 * empty for non HTTP navigations,
-+			 */
-+			httpStatusText: string,
- 			isMainFrame: boolean,
-+			frameProcessId: number,
-+			frameRoutingId: number) => void): this;
-+		removeListener(event: 'did-frame-navigate', listener: (event: Event,
-+			url: string,
-+			/**
-+			 * -1 for non HTTP navigations
-+			 */
- 			httpResponseCode: number,
--			requestMethod: string,
--			referrer: string,
--			headers: any) => void): this;
--		/**
--		 * Emitted when details regarding a requested resource are available. status
--		 * indicates the socket connection to download the resource.
--		 */
--		on(event: 'did-get-response-details', listener: (event: Event,
--			status: boolean,
--			newURL: string,
--			originalURL: string,
--			httpResponseCode: number,
--			requestMethod: string,
--			referrer: string,
--			headers: any,
--			resourceType: string) => void): this;
--		once(event: 'did-get-response-details', listener: (event: Event,
--			status: boolean,
--			newURL: string,
--			originalURL: string,
--			httpResponseCode: number,
--			requestMethod: string,
--			referrer: string,
--			headers: any,
--			resourceType: string) => void): this;
--		addListener(event: 'did-get-response-details', listener: (event: Event,
--			status: boolean,
--			newURL: string,
--			originalURL: string,
--			httpResponseCode: number,
--			requestMethod: string,
--			referrer: string,
--			headers: any,
--			resourceType: string) => void): this;
--		removeListener(event: 'did-get-response-details', listener: (event: Event,
--			status: boolean,
--			newURL: string,
--			originalURL: string,
--			httpResponseCode: number,
--			requestMethod: string,
--			referrer: string,
--			headers: any,
--			resourceType: string) => void): this;
-+			/**
-+			 * empty for non HTTP navigations,
-+			 */
-+			httpStatusText: string,
-+			isMainFrame: boolean,
-+			frameProcessId: number,
-+			frameRoutingId: number) => void): this;
- 		/**
--		 * Emitted when a navigation is done. This event is not emitted for in-page
--		 * navigations, such as clicking anchor links or updating the window.location.hash.
--		 * Use did-navigate-in-page event for this purpose.
-+		 * Emitted when a main frame navigation is done. This event is not emitted for
-+		 * in-page navigations, such as clicking anchor links or updating the
-+		 * window.location.hash. Use did-navigate-in-page event for this purpose.
- 		 */
- 		on(event: 'did-navigate', listener: (event: Event,
--			url: string) => void): this;
-+			url: string,
-+			/**
-+			 * -1 for non HTTP navigations
-+			 */
-+			httpResponseCode: number,
-+			/**
-+			 * empty for non HTTP navigations
-+			 */
-+			httpStatusText: string) => void): this;
- 		once(event: 'did-navigate', listener: (event: Event,
--			url: string) => void): this;
-+			url: string,
-+			/**
-+			 * -1 for non HTTP navigations
-+			 */
-+			httpResponseCode: number,
-+			/**
-+			 * empty for non HTTP navigations
-+			 */
-+			httpStatusText: string) => void): this;
- 		addListener(event: 'did-navigate', listener: (event: Event,
--			url: string) => void): this;
-+			url: string,
-+			/**
-+			 * -1 for non HTTP navigations
-+			 */
-+			httpResponseCode: number,
-+			/**
-+			 * empty for non HTTP navigations
-+			 */
-+			httpStatusText: string) => void): this;
- 		removeListener(event: 'did-navigate', listener: (event: Event,
--			url: string) => void): this;
-+			url: string,
-+			/**
-+			 * -1 for non HTTP navigations
-+			 */
-+			httpResponseCode: number,
-+			/**
-+			 * empty for non HTTP navigations
-+			 */
-+			httpStatusText: string) => void): this;
- 		/**
--		 * Emitted when an in-page navigation happened. When in-page navigation happens,
--		 * the page URL changes but does not cause navigation outside of the page. Examples
--		 * of this occurring are when anchor links are clicked or when the DOM hashchange
--		 * event is triggered.
-+		 * Emitted when an in-page navigation happened in any frame. When in-page
-+		 * navigation happens, the page URL changes but does not cause navigation outside
-+		 * of the page. Examples of this occurring are when anchor links are clicked or
-+		 * when the DOM hashchange event is triggered.
- 		 */
- 		on(event: 'did-navigate-in-page', listener: (event: Event,
- 			url: string,
--			isMainFrame: boolean) => void): this;
-+			isMainFrame: boolean,
-+			frameProcessId: number,
-+			frameRoutingId: number) => void): this;
- 		once(event: 'did-navigate-in-page', listener: (event: Event,
- 			url: string,
--			isMainFrame: boolean) => void): this;
-+			isMainFrame: boolean,
-+			frameProcessId: number,
-+			frameRoutingId: number) => void): this;
- 		addListener(event: 'did-navigate-in-page', listener: (event: Event,
- 			url: string,
--			isMainFrame: boolean) => void): this;
-+			isMainFrame: boolean,
-+			frameProcessId: number,
-+			frameRoutingId: number) => void): this;
- 		removeListener(event: 'did-navigate-in-page', listener: (event: Event,
- 			url: string,
--			isMainFrame: boolean) => void): this;
-+			isMainFrame: boolean,
-+			frameProcessId: number,
-+			frameRoutingId: number) => void): this;
- 		/**
- 		 * Corresponds to the points in time when the spinner of the tab started spinning.
- 		 */
-@@ -5087,6 +5364,30 @@
- 		addListener(event: 'did-start-loading', listener: Function): this;
- 		removeListener(event: 'did-start-loading', listener: Function): this;
- 		/**
-+		 * Emitted when any frame (including main) starts navigating. isInplace will be
-+		 * true for in-page navigations.
-+		 */
-+		on(event: 'did-start-navigation', listener: (url: string,
-+			isInPlace: boolean,
-+			isMainFrame: boolean,
-+			frameProcessId: number,
-+			frameRoutingId: number) => void): this;
-+		once(event: 'did-start-navigation', listener: (url: string,
-+			isInPlace: boolean,
-+			isMainFrame: boolean,
-+			frameProcessId: number,
-+			frameRoutingId: number) => void): this;
-+		addListener(event: 'did-start-navigation', listener: (url: string,
-+			isInPlace: boolean,
-+			isMainFrame: boolean,
-+			frameProcessId: number,
-+			frameRoutingId: number) => void): this;
-+		removeListener(event: 'did-start-navigation', listener: (url: string,
-+			isInPlace: boolean,
-+			isMainFrame: boolean,
-+			frameProcessId: number,
-+			frameRoutingId: number) => void): this;
-+		/**
- 		 * Corresponds to the points in time when the spinner of the tab stopped spinning.
- 		 */
- 		on(event: 'did-stop-loading', listener: Function): this;
-@@ -5171,7 +5472,12 @@
- 			 * The non-standard features (features not handled by Chromium or Electron) given
- 			 * to `window.open()`.
- 			 */
--			additionalFeatures: string[]) => void): this;
-+			additionalFeatures: string[],
-+			/**
-+			 * The referrer that will be passed to the new window. May or may not result in the
-+			 * `Referer` header being sent, depending on the referrer policy.
-+			 */
-+			referrer: Referrer) => void): this;
- 		once(event: 'new-window', listener: (event: Event,
- 			url: string,
- 			frameName: string,
-@@ -5188,7 +5494,12 @@
- 			 * The non-standard features (features not handled by Chromium or Electron) given
- 			 * to `window.open()`.
- 			 */
--			additionalFeatures: string[]) => void): this;
-+			additionalFeatures: string[],
-+			/**
-+			 * The referrer that will be passed to the new window. May or may not result in the
-+			 * `Referer` header being sent, depending on the referrer policy.
-+			 */
-+			referrer: Referrer) => void): this;
- 		addListener(event: 'new-window', listener: (event: Event,
- 			url: string,
- 			frameName: string,
-@@ -5205,7 +5516,12 @@
- 			 * The non-standard features (features not handled by Chromium or Electron) given
- 			 * to `window.open()`.
- 			 */
--			additionalFeatures: string[]) => void): this;
-+			additionalFeatures: string[],
-+			/**
-+			 * The referrer that will be passed to the new window. May or may not result in the
-+			 * `Referer` header being sent, depending on the referrer policy.
-+			 */
-+			referrer: Referrer) => void): this;
- 		removeListener(event: 'new-window', listener: (event: Event,
- 			url: string,
- 			frameName: string,
-@@ -5222,7 +5538,12 @@
- 			 * The non-standard features (features not handled by Chromium or Electron) given
- 			 * to `window.open()`.
- 			 */
--			additionalFeatures: string[]) => void): this;
-+			additionalFeatures: string[],
-+			/**
-+			 * The referrer that will be passed to the new window. May or may not result in the
-+			 * `Referer` header being sent, depending on the referrer policy.
-+			 */
-+			referrer: Referrer) => void): this;
- 		/**
- 		 * Emitted when page receives favicon urls.
- 		 */
-@@ -5290,6 +5611,13 @@
- 			name: string,
- 			version: string) => void): this;
- 		/**
-+		 * Emitted when the unresponsive web page becomes responsive again.
-+		 */
-+		on(event: 'responsive', listener: Function): this;
-+		once(event: 'responsive', listener: Function): this;
-+		addListener(event: 'responsive', listener: Function): this;
-+		removeListener(event: 'responsive', listener: Function): this;
-+		/**
- 		 * Emitted when bluetooth device needs to be selected on call to
- 		 * navigator.bluetooth.requestDevice. To use navigator.bluetooth api webBluetooth
- 		 * should be enabled. If event.preventDefault is not called, first available device
-@@ -5329,6 +5657,13 @@
- 			certificateList: Certificate[],
- 			callback: (certificate: Certificate) => void) => void): this;
- 		/**
-+		 * Emitted when the web page becomes unresponsive.
-+		 */
-+		on(event: 'unresponsive', listener: Function): this;
-+		once(event: 'unresponsive', listener: Function): this;
-+		addListener(event: 'unresponsive', listener: Function): this;
-+		removeListener(event: 'unresponsive', listener: Function): this;
-+		/**
- 		 * Emitted when mouse moves over a link or the keyboard moves the focus to a link.
- 		 */
- 		on(event: 'update-target-url', listener: (event: Event,
-@@ -5424,30 +5759,22 @@
- 		addWorkSpace(path: string): void;
- 		/**
- 		 * Begin subscribing for presentation events and captured frames, the callback will
--		 * be called with callback(frameBuffer, dirtyRect) when there is a presentation
--		 * event. The frameBuffer is a Buffer that contains raw pixel data. On most
--		 * machines, the pixel data is effectively stored in 32bit BGRA format, but the
--		 * actual representation depends on the endianness of the processor (most modern
--		 * processors are little-endian, on machines with big-endian processors the data is
--		 * in 32bit ARGB format). The dirtyRect is an object with x, y, width, height
--		 * properties that describes which part of the page was repainted. If onlyDirty is
--		 * set to true, frameBuffer will only contain the repainted area. onlyDirty
--		 * defaults to false.
--		 */
--		beginFrameSubscription(callback: (frameBuffer: Buffer, dirtyRect: Rectangle) => void): void;
-+		 * be called with callback(image, dirtyRect) when there is a presentation event.
-+		 * The image is an instance of NativeImage that stores the captured frame. The
-+		 * dirtyRect is an object with x, y, width, height properties that describes which
-+		 * part of the page was repainted. If onlyDirty is set to true, image will only
-+		 * contain the repainted area. onlyDirty defaults to false.
-+		 */
-+		beginFrameSubscription(callback: (image: NativeImage, dirtyRect: Rectangle) => void): void;
- 		/**
- 		 * Begin subscribing for presentation events and captured frames, the callback will
--		 * be called with callback(frameBuffer, dirtyRect) when there is a presentation
--		 * event. The frameBuffer is a Buffer that contains raw pixel data. On most
--		 * machines, the pixel data is effectively stored in 32bit BGRA format, but the
--		 * actual representation depends on the endianness of the processor (most modern
--		 * processors are little-endian, on machines with big-endian processors the data is
--		 * in 32bit ARGB format). The dirtyRect is an object with x, y, width, height
--		 * properties that describes which part of the page was repainted. If onlyDirty is
--		 * set to true, frameBuffer will only contain the repainted area. onlyDirty
--		 * defaults to false.
--		 */
--		beginFrameSubscription(onlyDirty: boolean, callback: (frameBuffer: Buffer, dirtyRect: Rectangle) => void): void;
-+		 * be called with callback(image, dirtyRect) when there is a presentation event.
-+		 * The image is an instance of NativeImage that stores the captured frame. The
-+		 * dirtyRect is an object with x, y, width, height properties that describes which
-+		 * part of the page was repainted. If onlyDirty is set to true, image will only
-+		 * contain the repainted area. onlyDirty defaults to false.
-+		 */
-+		beginFrameSubscription(onlyDirty: boolean, callback: (image: NativeImage, dirtyRect: Rectangle) => void): void;
- 		canGoBack(): boolean;
- 		canGoForward(): boolean;
- 		canGoToOffset(offset: number): boolean;
-@@ -5456,13 +5783,13 @@
- 		 * called with callback(image). The image is an instance of NativeImage that stores
- 		 * data of the snapshot. Omitting rect will capture the whole visible page.
- 		 */
--		capturePage(callback: (image: NativeImage) => void): void;
-+		capturePage(rect: Rectangle, callback: (image: NativeImage) => void): void;
- 		/**
- 		 * Captures a snapshot of the page within rect. Upon completion callback will be
- 		 * called with callback(image). The image is an instance of NativeImage that stores
- 		 * data of the snapshot. Omitting rect will capture the whole visible page.
- 		 */
--		capturePage(rect: Rectangle, callback: (image: NativeImage) => void): void;
-+		capturePage(callback: (image: NativeImage) => void): void;
- 		/**
- 		 * Clears the navigation history.
- 		 */
-@@ -5528,6 +5855,7 @@
- 		 * Get the system printer list.
- 		 */
- 		getPrinters(): PrinterInfo[];
-+		getProcessId(): number;
- 		getTitle(): string;
- 		getURL(): string;
- 		getUserAgent(): string;
-@@ -5817,6 +6145,9 @@
- 		 * Work like executeJavaScript but evaluates scripts in isolated context.
- 		 */
- 		executeJavaScriptInIsolatedWorld(worldId: number, scripts: WebSource[], userGesture?: boolean, callback?: (result: any) => void): void;
-+		findFrameByName(name: string): WebFrame;
-+		findFrameByRoutingId(routingId: number): WebFrame;
-+		getFrameForSelector(selector: string): WebFrame;
- 		/**
- 		 * Returns an object describing usage information of Blink's internal memory
- 		 * caches. This will generate:
-@@ -5841,12 +6172,6 @@
- 		 */
- 		registerURLSchemeAsPrivileged(scheme: string, options?: RegisterURLSchemeAsPrivilegedOptions): void;
- 		/**
--		 * Registers the scheme as secure scheme. Secure schemes do not trigger mixed
--		 * content warnings. For example, https and data are secure schemes because they
--		 * cannot be corrupted by active network attackers.
--		 */
--		registerURLSchemeAsSecure(scheme: string): void;
--		/**
- 		 * Set the content security policy of the isolated world.
- 		 */
- 		setIsolatedWorldContentSecurityPolicy(worldId: number, csp: string): void;
-@@ -5883,6 +6208,39 @@
- 		 * limits of 300% and 50% of original size, respectively.
- 		 */
- 		setZoomLevel(level: number): void;
-+		/**
-+		 * A WebFrame representing the first child frame of webFrame, the property would be
-+		 * null if webFrame has no children or if first child is not in the current
-+		 * renderer process.
-+		 */
-+		firstChild?: WebFrame;
-+		/**
-+		 * A WebFrame representing next sibling frame, the property would be null if
-+		 * webFrame is the last frame in its parent or if the next sibling is not in the
-+		 * current renderer process.
-+		 */
-+		nextSibling?: WebFrame;
-+		/**
-+		 * A WebFrame representing the frame which opened webFrame, the property would be
-+		 * null if there's no opener or opener is not in the current renderer process.
-+		 */
-+		opener?: WebFrame;
-+		/**
-+		 * A WebFrame representing parent frame of webFrame, the property would be null if
-+		 * webFrame is top or parent is not in the current renderer process.
-+		 */
-+		parent?: WebFrame;
-+		/**
-+		 * An Integer representing the unique frame id in the current renderer process.
-+		 * Distinct WebFrame instances that refer to the same underlying frame will have
-+		 * the same routingId.
-+		 */
-+		routingId?: number;
-+		/**
-+		 * A WebFrame representing top frame in frame hierarchy to which webFrame belongs,
-+		 * the property would be null if top frame is not in the current renderer process.
-+		 */
-+		top?: WebFrame;
- 	}
- 
- 	class WebRequest extends EventEmitter {
-@@ -6030,17 +6388,6 @@
- 		addEventListener(event: 'did-stop-loading', listener: (event: Event) => void, useCapture?: boolean): this;
- 		removeEventListener(event: 'did-stop-loading', listener: (event: Event) => void): this;
- 		/**
--		 * Fired when details regarding a requested resource is available. status indicates
--		 * socket connection to download the resource.
--		 */
--		addEventListener(event: 'did-get-response-details', listener: (event: DidGetResponseDetailsEvent) => void, useCapture?: boolean): this;
--		removeEventListener(event: 'did-get-response-details', listener: (event: DidGetResponseDetailsEvent) => void): this;
--		/**
--		 * Fired when a redirect was received while requesting a resource.
--		 */
--		addEventListener(event: 'did-get-redirect-request', listener: (event: DidGetRedirectRequestEvent) => void, useCapture?: boolean): this;
--		removeEventListener(event: 'did-get-redirect-request', listener: (event: DidGetRedirectRequestEvent) => void): this;
--		/**
- 		 * Fired when document in the given frame is loaded.
- 		 */
- 		addEventListener(event: 'dom-ready', listener: (event: Event) => void, useCapture?: boolean): this;
-@@ -6118,8 +6465,8 @@
- 		removeEventListener(event: 'close', listener: (event: Event) => void): this;
- 		/**
- 		 * Fired when the guest page has sent an asynchronous message to embedder page.
--		 * With sendToHost method and ipc-message event you can easily communicate between
--		 * guest page and embedder page:
-+		 * With sendToHost method and ipc-message event you can communicate between guest
-+		 * page and embedder page:
- 		 */
- 		addEventListener(event: 'ipc-message', listener: (event: IpcMessageEvent) => void, useCapture?: boolean): this;
- 		removeEventListener(event: 'ipc-message', listener: (event: IpcMessageEvent) => void): this;
-@@ -6384,12 +6731,6 @@
- 		 */
- 		autosize?: string;
- 		/**
--		 * A list of strings which specifies the blink features to be enabled separated by
--		 * ,. The full list of supported feature strings can be found in the
--		 * RuntimeEnabledFeatures.json5 file.
--		 */
--		blinkfeatures?: string;
--		/**
- 		 * A list of strings which specifies the blink features to be disabled separated by
- 		 * ,. The full list of supported feature strings can be found in the
- 		 * RuntimeEnabledFeatures.json5 file.
-@@ -6409,6 +6750,12 @@
- 		 */
- 		disablewebsecurity?: string;
- 		/**
-+		 * A list of strings which specifies the blink features to be enabled separated by
-+		 * ,. The full list of supported feature strings can be found in the
-+		 * RuntimeEnabledFeatures.json5 file.
-+		 */
-+		enableblinkfeatures?: string;
-+		/**
- 		 * A value that links the webview to a specific webContents. When a webview first
- 		 * loads a new webContents is created and this attribute is set to its instance
- 		 * identifier. Setting this attribute on a new or existing webview connects it to
-@@ -6827,7 +7174,7 @@
- 		origin?: string;
- 		/**
- 		 * The types of storages to clear, can contain: appcache, cookies, filesystem,
--		 * indexdb, localstorage, shadercache, websql, serviceworkers.
-+		 * indexdb, localstorage, shadercache, websql, serviceworkers, cachestorage.
- 		 */
- 		storages?: string[];
- 		/**
-@@ -7097,23 +7444,6 @@
- 		isMainFrame: boolean;
- 	}
- 
--	interface DidGetRedirectRequestEvent extends Event {
--		oldURL: string;
--		newURL: string;
--		isMainFrame: boolean;
--	}
--
--	interface DidGetResponseDetailsEvent extends Event {
--		status: boolean;
--		newURL: string;
--		originalURL: string;
--		httpResponseCode: number;
--		requestMethod: string;
--		referrer: string;
--		headers: Headers;
--		resourceType: string;
--	}
--
- 	interface DidNavigateEvent extends Event {
- 		url: string;
- 	}
-@@ -7284,6 +7614,18 @@
- 	interface Headers {
- 	}
- 
-+	interface HeapStatistics {
-+		totalHeapSize: number;
-+		totalHeapSizeExecutable: number;
-+		totalPhysicalSize: number;
-+		totalAvailableSize: number;
-+		usedHeapSize: number;
-+		heapSizeLimit: number;
-+		mallocedMemory: number;
-+		peakMallocedMemory: number;
-+		doesZapGarbage: boolean;
-+	}
-+
- 	interface IgnoreMouseEventsOptions {
- 		/**
- 		 * If true, forwards mouse move messages to Chromium, enabling mouse related events
-@@ -7413,9 +7755,9 @@
- 
- 	interface LoadURLOptions {
- 		/**
--		 * A HTTP Referrer url.
-+		 * An HTTP Referrer url.
- 		 */
--		httpReferrer?: string;
-+		httpReferrer?: string | Referrer;
- 		/**
- 		 * A user agent originating the request.
- 		 */
-@@ -7424,10 +7766,7 @@
- 		 * Extra headers separated by "\n"
- 		 */
- 		extraHeaders?: string;
--		/**
--		 * -
--		 */
--		postData?: UploadRawData[] | UploadFile[] | UploadFileSystem[] | UploadBlob[];
-+		postData?: UploadRawData[] | UploadFile[] | UploadBlob[];
- 		/**
- 		 * Base url (with trailing path separator) for files to be loaded by the data url.
- 		 * This is needed only if the specified url is a data url and needs to load other
-@@ -7879,7 +8218,13 @@
- 	}
- 
- 	interface Payment {
-+		/**
-+		 * The identifier of the purchased product.
-+		 */
- 		productIdentifier: string;
-+		/**
-+		 * The quantity purchased.
-+		 */
- 		quantity: number;
- 	}
- 
-@@ -8675,7 +9020,7 @@
- 		 * A list of feature strings separated by ,, like CSSVariables,KeyboardEventKey to
- 		 * enable. The full list of supported feature strings can be found in the file.
- 		 */
--		blinkFeatures?: string;
-+		enableBlinkFeatures?: string;
- 		/**
- 		 * A list of feature strings separated by ,, like CSSVariables,KeyboardEventKey to
- 		 * disable. The full list of supported feature strings can be found in the file.
-@@ -8745,7 +9090,22 @@
- 		 * of this app. Useful for passing small bits of data down to renderer process
- 		 * preload scripts.
- 		 */
--		additionArguments?: string[];
-+		additionalArguments?: string[];
-+		/**
-+		 * Whether to enable browser style consecutive dialog protection. Default is false.
-+		 */
-+		safeDialogs?: boolean;
-+		/**
-+		 * The message to display when consecutive dialog protection is triggered. If not
-+		 * defined the default message would be used, note that currently the default
-+		 * message is in English and not localized.
-+		 */
-+		safeDialogsMessage?: string;
-+		/**
-+		 * Whether dragging and dropping a file or link onto the page causes a navigation.
-+		 * Default is false.
-+		 */
-+		navigateOnDragDrop?: boolean;
- 	}
- 
- 	interface DefaultFontFamily {
-@@ -8841,6 +9201,11 @@
- 		 */
- 		crash(): void;
- 		getCPUUsage(): Electron.CPUUsage;
-+		/**
-+		 * Returns an object with V8 heap statistics. Note that all statistics are reported
-+		 * in Kilobytes.
-+		 */
-+		getHeapStatistics(): Electron.HeapStatistics;
- 		getIOCounters(): Electron.IOCounters;
- 		/**
- 		 * Returns an object giving memory usage statistics about the current process. Note
-@@ -8921,4 +9286,4 @@
- 		electron: string;
- 		chrome: string;
- 	}
--}
-\ No newline at end of file
-+}
-merged
-  result 100644 1f18683bcdddf2a268fcebbd75901d8104afaf8f src/typings/node.d.ts
-  our    100644 b8e246d1ecfcd73b526ff08cc271d3ac734512f4 src/typings/node.d.ts
-@@ -1,4 +1,4 @@
--// Type definitions for Node.js 8.9.x
-+// Type definitions for Node.js 10.5.x
- // Project: http://nodejs.org/
- // Definitions by: Microsoft TypeScript <http://typescriptlang.org>
- //                 DefinitelyTyped <https://github.com/DefinitelyTyped/DefinitelyTyped>
-@@ -16,14 +16,17 @@
- //                 Sebastian Silbermann <https://github.com/eps1lon>
- //                 Hannes Magnusson <https://github.com/Hannes-Magnusson-CK>
- //                 Alberto Schiabel <https://github.com/jkomyno>
-+//                 Klaus Meinhardt <https://github.com/ajafff>
- //                 Huw <https://github.com/hoo29>
- //                 Nicolas Even <https://github.com/n-e>
- //                 Bruno Scheufler <https://github.com/brunoscheufler>
-+//                 Mohsen Azimi <https://github.com/mohsen1>
- //                 Hoàng Văn Khải <https://github.com/KSXGitHub>
-+//                 Alexander T. <https://github.com/a-tarasyuk>
- //                 Lishude <https://github.com/islishude>
- //                 Andrew Makarov <https://github.com/r3nya>
-+//                 Zane Hannan AU <https://github.com/ZaneHannanAU>
- // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
--// TypeScript Version: 2.1
- 
- // ### BEGIN VSCODE MODIFICATION ###
- // /** inspector module types */
-@@ -33,16 +36,101 @@
- // This needs to be global to avoid TS2403 in case lib.dom.d.ts is present in the same build
- interface Console {
-     Console: NodeJS.ConsoleConstructor;
-+    /**
-+     * A simple assertion test that verifies whether `value` is truthy.
-+     * If it is not, an `AssertionError` is thrown.
-+     * If provided, the error `message` is formatted using `util.format()` and used as the error message.
-+     */
-     assert(value: any, message?: string, ...optionalParams: any[]): void;
--    dir(obj: any, options?: NodeJS.InspectOptions): void;
-+    /**
-+     * When `stdout` is a TTY, calling `console.clear()` will attempt to clear the TTY.
-+     * When `stdout` is not a TTY, this method does nothing.
-+     */
-+    clear(): void;
-+    /**
-+     * Maintains an internal counter specific to `label` and outputs to `stdout` the number of times `console.count()` has been called with the given `label`.
-+     */
-+    count(label?: string): void;
-+    /**
-+     * Resets the internal counter specific to `label`.
-+     */
-+    countReset(label?: string): void;
-+    /**
-+     * The `console.debug()` function is an alias for {@link console.log()}.
-+     */
-     debug(message?: any, ...optionalParams: any[]): void;
-+    /**
-+     * Uses {@link util.inspect()} on `obj` and prints the resulting string to `stdout`.
-+     * This function bypasses any custom `inspect()` function defined on `obj`.
-+     */
-+    dir(obj: any, options?: NodeJS.InspectOptions): void;
-+    /**
-+     * This method calls {@link console.log()} passing it the arguments received. Please note that this method does not produce any XML formatting
-+     */
-+    dirxml(...data: any[]): void;
-+    /**
-+     * Prints to `stderr` with newline.
-+     */
-     error(message?: any, ...optionalParams: any[]): void;
-+    /**
-+     * Increases indentation of subsequent lines by two spaces.
-+     * If one or more `label`s are provided, those are printed first without the additional indentation.
-+     */
-+    group(...label: any[]): void;
-+    /**
-+     * The `console.groupCollapsed()` function is an alias for {@link console.group()}.
-+     */
-+    groupCollapsed(): void;
-+    /**
-+     * Decreases indentation of subsequent lines by two spaces.
-+     */
-+    groupEnd(): void;
-+    /**
-+     * The {@link console.info()} function is an alias for {@link console.log()}.
-+     */
-     info(message?: any, ...optionalParams: any[]): void;
-+    /**
-+     * Prints to `stdout` with newline.
-+     */
-     log(message?: any, ...optionalParams: any[]): void;
--    time(label: string): void;
--    timeEnd(label: string): void;
-+    /**
-+     * This method does not display anything unless used in the inspector.
-+     *  Prints to `stdout` the array `array` formatted as a table.
-+     */
-+    table(tabularData: any, properties?: string[]): void;
-+    /**
-+     * Starts a timer that can be used to compute the duration of an operation. Timers are identified by a unique `label`.
-+     */
-+    time(label?: string): void;
-+    /**
-+     * Stops a timer that was previously started by calling {@link console.time()} and prints the result to `stdout`.
-+     */
-+    timeEnd(label?: string): void;
-+    /**
-+     * Prints to `stderr` the string 'Trace :', followed by the {@link util.format()} formatted message and stack trace to the current position in the code.
-+     */
-     trace(message?: any, ...optionalParams: any[]): void;
-+    /**
-+     * The {@link console.warn()} function is an alias for {@link console.error()}.
-+     */
-     warn(message?: any, ...optionalParams: any[]): void;
-+
-+    // --- Inspector mode only ---
-+    /**
-+     * This method does not display anything unless used in the inspector.
-+     *  Starts a JavaScript CPU profile with an optional label.
-+     */
-+    profile(label?: string): void;
-+    /**
-+     * This method does not display anything unless used in the inspector.
-+     *  Stops the current JavaScript CPU profiling session if one has been started and prints the report to the Profiles panel of the inspector.
-+     */
-+    profileEnd(): void;
-+    /**
-+     * This method does not display anything unless used in the inspector.
-+     *  Adds an event with the label `label` to the Timeline panel of the inspector.
-+     */
-+    timeStamp(label?: string): void;
- }
- 
- interface Error {
-@@ -78,8 +166,11 @@
-     next(value?: any): IteratorResult<T>;
- }
- interface IteratorResult<T> { }
-+interface AsyncIterableIterator<T> { }
- interface SymbolConstructor {
-+    readonly observable: symbol;
-     readonly iterator: symbol;
-+    readonly asyncIterator: symbol;
- }
- declare var Symbol: SymbolConstructor;
- 
-@@ -178,7 +269,61 @@
- 
- // Buffer class
- type BufferEncoding = "ascii" | "utf8" | "utf16le" | "ucs2" | "base64" | "latin1" | "binary" | "hex";
--interface Buffer extends NodeBuffer { }
-+interface Buffer extends Uint8Array {
-+    write(string: string, offset?: number, length?: number, encoding?: string): number;
-+    toString(encoding?: string, start?: number, end?: number): string;
-+    toJSON(): { type: 'Buffer', data: any[] };
-+    equals(otherBuffer: Uint8Array): boolean;
-+    compare(otherBuffer: Uint8Array, targetStart?: number, targetEnd?: number, sourceStart?: number, sourceEnd?: number): number;
-+    copy(targetBuffer: Uint8Array, targetStart?: number, sourceStart?: number, sourceEnd?: number): number;
-+    slice(start?: number, end?: number): Buffer;
-+    writeUIntLE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
-+    writeUIntBE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
-+    writeIntLE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
-+    writeIntBE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
-+    readUIntLE(offset: number, byteLength: number, noAssert?: boolean): number;
-+    readUIntBE(offset: number, byteLength: number, noAssert?: boolean): number;
-+    readIntLE(offset: number, byteLength: number, noAssert?: boolean): number;
-+    readIntBE(offset: number, byteLength: number, noAssert?: boolean): number;
-+    readUInt8(offset: number, noAssert?: boolean): number;
-+    readUInt16LE(offset: number, noAssert?: boolean): number;
-+    readUInt16BE(offset: number, noAssert?: boolean): number;
-+    readUInt32LE(offset: number, noAssert?: boolean): number;
-+    readUInt32BE(offset: number, noAssert?: boolean): number;
-+    readInt8(offset: number, noAssert?: boolean): number;
-+    readInt16LE(offset: number, noAssert?: boolean): number;
-+    readInt16BE(offset: number, noAssert?: boolean): number;
-+    readInt32LE(offset: number, noAssert?: boolean): number;
-+    readInt32BE(offset: number, noAssert?: boolean): number;
-+    readFloatLE(offset: number, noAssert?: boolean): number;
-+    readFloatBE(offset: number, noAssert?: boolean): number;
-+    readDoubleLE(offset: number, noAssert?: boolean): number;
-+    readDoubleBE(offset: number, noAssert?: boolean): number;
-+    swap16(): Buffer;
-+    swap32(): Buffer;
-+    swap64(): Buffer;
-+    writeUInt8(value: number, offset: number, noAssert?: boolean): number;
-+    writeUInt16LE(value: number, offset: number, noAssert?: boolean): number;
-+    writeUInt16BE(value: number, offset: number, noAssert?: boolean): number;
-+    writeUInt32LE(value: number, offset: number, noAssert?: boolean): number;
-+    writeUInt32BE(value: number, offset: number, noAssert?: boolean): number;
-+    writeInt8(value: number, offset: number, noAssert?: boolean): number;
-+    writeInt16LE(value: number, offset: number, noAssert?: boolean): number;
-+    writeInt16BE(value: number, offset: number, noAssert?: boolean): number;
-+    writeInt32LE(value: number, offset: number, noAssert?: boolean): number;
-+    writeInt32BE(value: number, offset: number, noAssert?: boolean): number;
-+    writeFloatLE(value: number, offset: number, noAssert?: boolean): number;
-+    writeFloatBE(value: number, offset: number, noAssert?: boolean): number;
-+    writeDoubleLE(value: number, offset: number, noAssert?: boolean): number;
-+    writeDoubleBE(value: number, offset: number, noAssert?: boolean): number;
-+    fill(value: any, offset?: number, end?: number): this;
-+    indexOf(value: string | number | Uint8Array, byteOffset?: number, encoding?: string): number;
-+    lastIndexOf(value: string | number | Uint8Array, byteOffset?: number, encoding?: string): number;
-+    entries(): IterableIterator<[number, number]>;
-+    includes(value: string | number | Buffer, byteOffset?: number, encoding?: string): boolean;
-+    keys(): IterableIterator<number>;
-+    values(): IterableIterator<number>;
-+}
- 
- /**
-  * Raw data is stored in instances of the Buffer class.
-@@ -191,18 +336,21 @@
-      *
-      * @param str String to store in buffer.
-      * @param encoding encoding to use, optional.  Default is 'utf8'
-+     * @deprecated since v10.0.0 - Use `Buffer.from(string[, encoding])` instead.
-      */
-     new(str: string, encoding?: string): Buffer;
-     /**
-      * Allocates a new buffer of {size} octets.
-      *
-      * @param size count of octets to allocate.
-+     * @deprecated since v10.0.0 - Use `Buffer.alloc()` instead (also see `Buffer.allocUnsafe()`).
-      */
-     new(size: number): Buffer;
-     /**
-      * Allocates a new buffer containing the given {array} of octets.
-      *
-      * @param array The octets to store.
-+     * @deprecated since v10.0.0 - Use `Buffer.from(array)` instead.
-      */
-     new(array: Uint8Array): Buffer;
-     /**
-@@ -211,18 +359,21 @@
-      *
-      *
-      * @param arrayBuffer The ArrayBuffer with which to share memory.
-+     * @deprecated since v10.0.0 - Use `Buffer.from(arrayBuffer[, byteOffset[, length]])` instead.
-      */
-     new(arrayBuffer: ArrayBuffer): Buffer;
-     /**
-      * Allocates a new buffer containing the given {array} of octets.
-      *
-      * @param array The octets to store.
-+     * @deprecated since v10.0.0 - Use `Buffer.from(array)` instead.
-      */
-     new(array: any[]): Buffer;
-     /**
-      * Copies the passed {buffer} data onto a new {Buffer} instance.
-      *
-      * @param buffer The buffer to copy.
-+     * @deprecated since v10.0.0 - Use `Buffer.from(buffer)` instead.
-      */
-     new(buffer: Buffer): Buffer;
-     prototype: Buffer;
-@@ -232,14 +383,16 @@
-      * The optional {byteOffset} and {length} arguments specify a memory range
-      * within the {arrayBuffer} that will be shared by the Buffer.
-      *
--     * @param arrayBuffer The .buffer property of a TypedArray or a new ArrayBuffer()
-+     * @param arrayBuffer The .buffer property of any TypedArray or a new ArrayBuffer()
-      */
-     from(arrayBuffer: ArrayBuffer, byteOffset?: number, length?: number): Buffer;
-+    // from(arrayBuffer: SharedArrayBuffer, byteOffset?: number, length?: number): Buffer;
-     /**
-      * Creates a new Buffer using the passed {data}
-      * @param data data to create a new Buffer
-      */
--    from(data: any[] | string | Buffer | ArrayBuffer /*| TypedArray*/): Buffer;
-+    from(data: any[]): Buffer;
-+    from(data: Uint8Array): Buffer;
-     /**
-      * Creates a new Buffer containing the given JavaScript string {str}.
-      * If provided, the {encoding} parameter identifies the character encoding.
-@@ -247,6 +400,11 @@
-      */
-     from(str: string, encoding?: string): Buffer;
-     /**
-+     * Creates a new Buffer using the passed {data}
-+     * @param values to create a new Buffer
-+     */
-+    of(...items: number[]): Buffer;
-+    /**
-      * Returns true if {obj} is a Buffer
-      *
-      * @param obj object to test.
-@@ -258,7 +416,7 @@
-      *
-      * @param encoding string to test.
-      */
--    isEncoding(encoding: string): boolean;
-+    isEncoding(encoding: string): boolean | undefined;
-     /**
-      * Gives the actual byte length of a string. encoding defaults to 'utf8'.
-      * This is not the same as String.prototype.length since that returns the number of characters in a string.
-@@ -266,7 +424,7 @@
-      * @param string string to test. (TypedArray is also allowed, but it is only available starting ES2017)
-      * @param encoding encoding used to evaluate (defaults to 'utf8')
-      */
--    byteLength(string: string | Buffer | DataView | ArrayBuffer, encoding?: string): number;
-+    byteLength(string: string | ArrayBuffer | ArrayBufferView, encoding?: string): number;
-     /**
-      * Returns a buffer which is the result of concatenating all the buffers in the list together.
-      *
-@@ -278,11 +436,11 @@
-      * @param totalLength Total length of the buffers when concatenated.
-      *   If totalLength is not provided, it is read from the buffers in the list. However, this adds an additional loop to the function, so it is faster to provide the length explicitly.
-      */
--    concat(list: Buffer[], totalLength?: number): Buffer;
-+    concat(list: Uint8Array[], totalLength?: number): Buffer;
-     /**
-      * The same as buf1.compare(buf2).
-      */
--    compare(buf1: Buffer, buf2: Buffer): number;
-+    compare(buf1: Uint8Array, buf2: Uint8Array): number;
-     /**
-      * Allocates a new buffer of {size} octets.
-      *
-@@ -326,6 +484,7 @@
-         showProxy?: boolean;
-         maxArrayLength?: number | null;
-         breakLength?: number;
-+        compact?: boolean;
-     }
- 
-     export interface ConsoleConstructor {
-@@ -420,10 +579,12 @@
-         on(event: string | symbol, listener: (...args: any[]) => void): this;
-         once(event: string | symbol, listener: (...args: any[]) => void): this;
-         removeListener(event: string | symbol, listener: (...args: any[]) => void): this;
-+        off(event: string | symbol, listener: (...args: any[]) => void): this;
-         removeAllListeners(event?: string | symbol): this;
-         setMaxListeners(n: number): this;
-         getMaxListeners(): number;
-         listeners(event: string | symbol): Function[];
-+        rawListeners(event: string | symbol): Function[];
-         emit(event: string | symbol, ...args: any[]): boolean;
-         listenerCount(type: string | symbol): number;
-         // Added in Node 6...
-@@ -444,6 +605,7 @@
-         unshift(chunk: string): void;
-         unshift(chunk: Buffer): void;
-         wrap(oldStream: ReadableStream): this;
-+        [Symbol.asyncIterator](): AsyncIterableIterator<string | Buffer>;
-     }
- 
-     export interface WritableStream extends EventEmitter {
-@@ -466,7 +628,6 @@
-         remove(emitter: Events): void;
-         bind(cb: (err: Error, data: any) => any): any;
-         intercept(cb: (data: any) => any): any;
--        dispose(): void;
- 
-         addListener(event: string, listener: (...args: any[]) => void): this;
-         on(event: string, listener: (...args: any[]) => void): this;
-@@ -522,7 +683,7 @@
-     type UnhandledRejectionListener = (reason: any, promise: Promise<any>) => void;
-     type WarningListener = (warning: Error) => void;
-     type MessageListener = (message: any, sendHandle: any) => void;
--    type SignalsListener = () => void;
-+    type SignalsListener = (signal: Signals) => void;
-     type NewListenerListener = (type: string | symbol, listener: (...args: any[]) => void) => void;
-     type RemoveListenerListener = (type: string | symbol, listener: (...args: any[]) => void) => void;
- 
-@@ -536,6 +697,7 @@
- 
-     export interface WriteStream extends Socket {
-         readonly writableHighWaterMark: number;
-+        readonly writableLength: number;
-         columns?: number;
-         rows?: number;
-         _write(chunk: any, encoding: string, callback: Function): void;
-@@ -548,6 +710,7 @@
-     }
-     export interface ReadStream extends Socket {
-         readonly readableHighWaterMark: number;
-+        readonly readableLength: number;
-         isRaw?: boolean;
-         setRawMode?(mode: boolean): void;
-         _read(size: number): void;
-@@ -583,6 +746,8 @@
-         setegid(id: number | string): void;
-         getgroups(): number[];
-         setgroups(groups: Array<string | number>): void;
-+        setUncaughtExceptionCaptureCallback(cb: ((err: Error) => void) | null): void;
-+        hasUncaughtExceptionCaptureCallback(): boolean;
-         version: string;
-         versions: ProcessVersions;
-         config: {
-@@ -613,6 +778,7 @@
-         };
-         kill(pid: number, signal?: string | number): void;
-         pid: number;
-+        ppid: number;
-         title: string;
-         arch: string;
-         platform: Platform;
-@@ -822,65 +988,6 @@
- 
- interface IterableIterator<T> { }
- 
--/**
-- * @deprecated
-- */
--interface NodeBuffer extends Uint8Array {
--    write(string: string, offset?: number, length?: number, encoding?: string): number;
--    toString(encoding?: string, start?: number, end?: number): string;
--    toJSON(): { type: 'Buffer', data: any[] };
--    equals(otherBuffer: Buffer): boolean;
--    compare(otherBuffer: Buffer, targetStart?: number, targetEnd?: number, sourceStart?: number, sourceEnd?: number): number;
--    copy(targetBuffer: Buffer, targetStart?: number, sourceStart?: number, sourceEnd?: number): number;
--    slice(start?: number, end?: number): Buffer;
--    writeUIntLE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
--    writeUIntBE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
--    writeIntLE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
--    writeIntBE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
--    readUIntLE(offset: number, byteLength: number, noAssert?: boolean): number;
--    readUIntBE(offset: number, byteLength: number, noAssert?: boolean): number;
--    readIntLE(offset: number, byteLength: number, noAssert?: boolean): number;
--    readIntBE(offset: number, byteLength: number, noAssert?: boolean): number;
--    readUInt8(offset: number, noAssert?: boolean): number;
--    readUInt16LE(offset: number, noAssert?: boolean): number;
--    readUInt16BE(offset: number, noAssert?: boolean): number;
--    readUInt32LE(offset: number, noAssert?: boolean): number;
--    readUInt32BE(offset: number, noAssert?: boolean): number;
--    readInt8(offset: number, noAssert?: boolean): number;
--    readInt16LE(offset: number, noAssert?: boolean): number;
--    readInt16BE(offset: number, noAssert?: boolean): number;
--    readInt32LE(offset: number, noAssert?: boolean): number;
--    readInt32BE(offset: number, noAssert?: boolean): number;
--    readFloatLE(offset: number, noAssert?: boolean): number;
--    readFloatBE(offset: number, noAssert?: boolean): number;
--    readDoubleLE(offset: number, noAssert?: boolean): number;
--    readDoubleBE(offset: number, noAssert?: boolean): number;
--    swap16(): Buffer;
--    swap32(): Buffer;
--    swap64(): Buffer;
--    writeUInt8(value: number, offset: number, noAssert?: boolean): number;
--    writeUInt16LE(value: number, offset: number, noAssert?: boolean): number;
--    writeUInt16BE(value: number, offset: number, noAssert?: boolean): number;
--    writeUInt32LE(value: number, offset: number, noAssert?: boolean): number;
--    writeUInt32BE(value: number, offset: number, noAssert?: boolean): number;
--    writeInt8(value: number, offset: number, noAssert?: boolean): number;
--    writeInt16LE(value: number, offset: number, noAssert?: boolean): number;
--    writeInt16BE(value: number, offset: number, noAssert?: boolean): number;
--    writeInt32LE(value: number, offset: number, noAssert?: boolean): number;
--    writeInt32BE(value: number, offset: number, noAssert?: boolean): number;
--    writeFloatLE(value: number, offset: number, noAssert?: boolean): number;
--    writeFloatBE(value: number, offset: number, noAssert?: boolean): number;
--    writeDoubleLE(value: number, offset: number, noAssert?: boolean): number;
--    writeDoubleBE(value: number, offset: number, noAssert?: boolean): number;
--    fill(value: any, offset?: number, end?: number): this;
--    indexOf(value: string | number | Buffer, byteOffset?: number, encoding?: string): number;
--    lastIndexOf(value: string | number | Buffer, byteOffset?: number, encoding?: string): number;
--    entries(): IterableIterator<[number, number]>;
--    includes(value: string | number | Buffer, byteOffset?: number, encoding?: string): boolean;
--    keys(): IterableIterator<number>;
--    values(): IterableIterator<number>;
--}
--
- /************************************************
- *                                               *
- *                   MODULES                     *
-@@ -917,7 +1024,8 @@
- 
-     namespace internal {
-         export class EventEmitter extends internal {
--            static listenerCount(emitter: EventEmitter, event: string | symbol): number; // deprecated
-+            /** @deprecated since v4.0.0 */
-+            static listenerCount(emitter: EventEmitter, event: string | symbol): number;
-             static defaultMaxListeners: number;
- 
-             addListener(event: string | symbol, listener: (...args: any[]) => void): this;
-@@ -926,10 +1034,12 @@
-             prependListener(event: string | symbol, listener: (...args: any[]) => void): this;
-             prependOnceListener(event: string | symbol, listener: (...args: any[]) => void): this;
-             removeListener(event: string | symbol, listener: (...args: any[]) => void): this;
-+            off(event: string | symbol, listener: (...args: any[]) => void): this;
-             removeAllListeners(event?: string | symbol): this;
-             setMaxListeners(n: number): this;
-             getMaxListeners(): number;
-             listeners(event: string | symbol): Function[];
-+            rawListeners(event: string | symbol): Function[];
-             emit(event: string | symbol, ...args: any[]): boolean;
-             eventNames(): Array<string | symbol>;
-             listenerCount(type: string | symbol): number;
-@@ -1482,7 +1592,7 @@
-     export function createInflateRaw(options?: ZlibOptions): InflateRaw;
-     export function createUnzip(options?: ZlibOptions): Unzip;
- 
--    type InputType = string | Buffer | DataView /* | TypedArray */;
-+    type InputType = string | Buffer | DataView | ArrayBuffer /* | TypedArray */;
-     export function deflate(buf: InputType, callback: (error: Error | null, result: Buffer) => void): void;
-     export function deflate(buf: InputType, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
-     export function deflateSync(buf: InputType, options?: ZlibOptions): Buffer;
-@@ -1754,18 +1864,10 @@
- 
-     export type ServerOptions = tls.SecureContextOptions & tls.TlsOptions;
- 
--    // see https://nodejs.org/docs/latest-v8.x/api/https.html#https_https_request_options_callback
--    type extendedRequestKeys = "pfx" |
--        "key" |
--        "passphrase" |
--        "cert" |
--        "ca" |
--        "ciphers" |
--        "rejectUnauthorized" |
--        "secureProtocol" |
--        "servername";
--
--    export type RequestOptions = http.RequestOptions & Pick<tls.ConnectionOptions, extendedRequestKeys>;
-+    export type RequestOptions = http.RequestOptions & tls.SecureContextOptions & {
-+        rejectUnauthorized?: boolean; // Defaults to true
-+        servername?: string; // SNI TLS Extension
-+    };
- 
-     export interface AgentOptions extends http.AgentOptions, tls.ConnectionOptions {
-         rejectUnauthorized?: boolean;
-@@ -2010,6 +2112,7 @@
-     export function createContext(sandbox?: Context): Context;
-     export function isContext(sandbox: Context): boolean;
-     export function runInContext(code: string, contextifiedSandbox: Context, options?: RunningScriptOptions | string): any;
-+    /** @deprecated */
-     export function runInDebugContext(code: string): any;
-     export function runInNewContext(code: string, sandbox?: Context, options?: RunningScriptOptions | string): any;
-     export function runInThisContext(code: string, options?: RunningScriptOptions | string): any;
-@@ -2093,6 +2196,7 @@
-     }
- 
-     export interface SpawnOptions {
-+        argv0?: string;
-         cwd?: string;
-         env?: any;
-         stdio?: any;
-@@ -2177,33 +2281,33 @@
- 
-     export function execFile(file: string): ChildProcess;
-     export function execFile(file: string, options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null): ChildProcess;
--    export function execFile(file: string, args: string[] | undefined | null): ChildProcess;
--    export function execFile(file: string, args: string[] | undefined | null, options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null): ChildProcess;
-+    export function execFile(file: string, args?: ReadonlyArray<string> | null): ChildProcess;
-+    export function execFile(file: string, args: ReadonlyArray<string> | undefined | null, options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null): ChildProcess;
- 
-     // no `options` definitely means stdout/stderr are `string`.
-     export function execFile(file: string, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
--    export function execFile(file: string, args: string[] | undefined | null, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
-+    export function execFile(file: string, args: ReadonlyArray<string> | undefined | null, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
- 
-     // `options` with `"buffer"` or `null` for `encoding` means stdout/stderr are definitely `Buffer`.
-     export function execFile(file: string, options: ExecFileOptionsWithBufferEncoding, callback: (error: Error | null, stdout: Buffer, stderr: Buffer) => void): ChildProcess;
--    export function execFile(file: string, args: string[] | undefined | null, options: ExecFileOptionsWithBufferEncoding, callback: (error: Error | null, stdout: Buffer, stderr: Buffer) => void): ChildProcess;
-+    export function execFile(file: string, args: ReadonlyArray<string> | undefined | null, options: ExecFileOptionsWithBufferEncoding, callback: (error: Error | null, stdout: Buffer, stderr: Buffer) => void): ChildProcess;
- 
-     // `options` with well known `encoding` means stdout/stderr are definitely `string`.
-     export function execFile(file: string, options: ExecFileOptionsWithStringEncoding, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
--    export function execFile(file: string, args: string[] | undefined | null, options: ExecFileOptionsWithStringEncoding, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
-+    export function execFile(file: string, args: ReadonlyArray<string> | undefined | null, options: ExecFileOptionsWithStringEncoding, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
- 
-     // `options` with an `encoding` whose type is `string` means stdout/stderr could either be `Buffer` or `string`.
-     // There is no guarantee the `encoding` is unknown as `string` is a superset of `BufferEncoding`.
-     export function execFile(file: string, options: ExecFileOptionsWithOtherEncoding, callback: (error: Error | null, stdout: string | Buffer, stderr: string | Buffer) => void): ChildProcess;
--    export function execFile(file: string, args: string[] | undefined | null, options: ExecFileOptionsWithOtherEncoding, callback: (error: Error | null, stdout: string | Buffer, stderr: string | Buffer) => void): ChildProcess;
-+    export function execFile(file: string, args: ReadonlyArray<string> | undefined | null, options: ExecFileOptionsWithOtherEncoding, callback: (error: Error | null, stdout: string | Buffer, stderr: string | Buffer) => void): ChildProcess;
- 
-     // `options` without an `encoding` means stdout/stderr are definitely `string`.
-     export function execFile(file: string, options: ExecFileOptions, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
--    export function execFile(file: string, args: string[] | undefined | null, options: ExecFileOptions, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
-+    export function execFile(file: string, args: ReadonlyArray<string> | undefined | null, options: ExecFileOptions, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
- 
-     // fallback if nothing else matches. Worst case is always `string | Buffer`.
-     export function execFile(file: string, options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null, callback: ((error: Error | null, stdout: string | Buffer, stderr: string | Buffer) => void) | undefined | null): ChildProcess;
--    export function execFile(file: string, args: string[] | undefined | null, options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null, callback: ((error: Error | null, stdout: string | Buffer, stderr: string | Buffer) => void) | undefined | null): ChildProcess;
-+    export function execFile(file: string, args: ReadonlyArray<string> | undefined | null, options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null, callback: ((error: Error | null, stdout: string | Buffer, stderr: string | Buffer) => void) | undefined | null): ChildProcess;
- 
-     // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
-     export namespace execFile {
-@@ -2232,9 +2336,10 @@
-         gid?: number;
-         windowsVerbatimArguments?: boolean;
-     }
--    export function fork(modulePath: string, args?: string[], options?: ForkOptions): ChildProcess;
-+    export function fork(modulePath: string, args?: ReadonlyArray<string>, options?: ForkOptions): ChildProcess;
- 
-     export interface SpawnSyncOptions {
-+        argv0?: string;
-         cwd?: string;
-         input?: string | Buffer;
-         stdio?: any;
-@@ -2268,9 +2373,9 @@
-     export function spawnSync(command: string, options?: SpawnSyncOptionsWithStringEncoding): SpawnSyncReturns<string>;
-     export function spawnSync(command: string, options?: SpawnSyncOptionsWithBufferEncoding): SpawnSyncReturns<Buffer>;
-     export function spawnSync(command: string, options?: SpawnSyncOptions): SpawnSyncReturns<Buffer>;
--    export function spawnSync(command: string, args?: string[], options?: SpawnSyncOptionsWithStringEncoding): SpawnSyncReturns<string>;
--    export function spawnSync(command: string, args?: string[], options?: SpawnSyncOptionsWithBufferEncoding): SpawnSyncReturns<Buffer>;
--    export function spawnSync(command: string, args?: string[], options?: SpawnSyncOptions): SpawnSyncReturns<Buffer>;
-+    export function spawnSync(command: string, args?: ReadonlyArray<string>, options?: SpawnSyncOptionsWithStringEncoding): SpawnSyncReturns<string>;
-+    export function spawnSync(command: string, args?: ReadonlyArray<string>, options?: SpawnSyncOptionsWithBufferEncoding): SpawnSyncReturns<Buffer>;
-+    export function spawnSync(command: string, args?: ReadonlyArray<string>, options?: SpawnSyncOptions): SpawnSyncReturns<Buffer>;
- 
-     export interface ExecSyncOptions {
-         cwd?: string;
-@@ -2320,9 +2425,9 @@
-     export function execFileSync(command: string, options?: ExecFileSyncOptionsWithStringEncoding): string;
-     export function execFileSync(command: string, options?: ExecFileSyncOptionsWithBufferEncoding): Buffer;
-     export function execFileSync(command: string, options?: ExecFileSyncOptions): Buffer;
--    export function execFileSync(command: string, args?: string[], options?: ExecFileSyncOptionsWithStringEncoding): string;
--    export function execFileSync(command: string, args?: string[], options?: ExecFileSyncOptionsWithBufferEncoding): Buffer;
--    export function execFileSync(command: string, args?: string[], options?: ExecFileSyncOptions): Buffer;
-+    export function execFileSync(command: string, args?: ReadonlyArray<string>, options?: ExecFileSyncOptionsWithStringEncoding): string;
-+    export function execFileSync(command: string, args?: ReadonlyArray<string>, options?: ExecFileSyncOptionsWithBufferEncoding): Buffer;
-+    export function execFileSync(command: string, args?: ReadonlyArray<string>, options?: ExecFileSyncOptions): Buffer;
- }
- 
- declare module "url" {
-@@ -2380,23 +2485,6 @@
-         unicode?: boolean;
-     }
- 
--    export class URLSearchParams implements Iterable<[string, string]> {
--        constructor(init?: URLSearchParams | string | { [key: string]: string | string[] | undefined } | Iterable<[string, string]> | Array<[string, string]>);
--        append(name: string, value: string): void;
--        delete(name: string): void;
--        entries(): IterableIterator<[string, string]>;
--        forEach(callback: (value: string, name: string) => void): void;
--        get(name: string): string | null;
--        getAll(name: string): string[];
--        has(name: string): boolean;
--        keys(): IterableIterator<string>;
--        set(name: string, value: string): void;
--        sort(): void;
--        toString(): string;
--        values(): IterableIterator<string>;
--        [Symbol.iterator](): IterableIterator<[string, string]>;
--    }
--
-     export class URL {
-         constructor(input: string, base?: string | URL);
-         hash: string;
-@@ -2414,6 +2502,23 @@
-         toString(): string;
-         toJSON(): string;
-     }
-+
-+    export class URLSearchParams implements Iterable<[string, string]> {
-+        constructor(init?: URLSearchParams | string | { [key: string]: string | string[] | undefined } | Iterable<[string, string]> | Array<[string, string]>);
-+        append(name: string, value: string): void;
-+        delete(name: string): void;
-+        entries(): IterableIterator<[string, string]>;
-+        forEach(callback: (value: string, name: string) => void): void;
-+        get(name: string): string | null;
-+        getAll(name: string): string[];
-+        has(name: string): boolean;
-+        keys(): IterableIterator<string>;
-+        set(name: string, value: string): void;
-+        sort(): void;
-+        toString(): string;
-+        values(): IterableIterator<string>;
-+        [Symbol.iterator](): IterableIterator<[string, string]>;
-+    }
- }
- 
- declare module "dns" {
-@@ -2472,11 +2577,19 @@
-         ttl: number;
-     }
- 
-+    export interface AnyRecordWithTtl extends RecordWithTtl {
-+        type: "A" | "AAAA";
-+    }
-+
-     export interface MxRecord {
-         priority: number;
-         exchange: string;
-     }
- 
-+    export interface AnyMxRecord extends MxRecord {
-+        type: "MX";
-+    }
-+
-     export interface NaptrRecord {
-         flags: string;
-         service: string;
-@@ -2486,6 +2599,10 @@
-         preference: number;
-     }
- 
-+    export interface AnyNaptrRecord extends NaptrRecord {
-+        type: "NAPTR";
-+    }
-+
-     export interface SoaRecord {
-         nsname: string;
-         hostmaster: string;
-@@ -2496,6 +2613,10 @@
-         minttl: number;
-     }
- 
-+    export interface AnySoaRecord extends SoaRecord {
-+        type: "SOA";
-+    }
-+
-     export interface SrvRecord {
-         priority: number;
-         weight: number;
-@@ -2503,9 +2624,19 @@
-         name: string;
-     }
- 
-+    export interface AnySrvRecord extends SrvRecord {
-+        type: "SRV";
-+    }
-+
-+    export interface AnyTxtRecord {
-+        type: "TXT";
-+        entries: string[];
-+    }
-+
-     export function resolve(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
-     export function resolve(hostname: string, rrtype: "A", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
-     export function resolve(hostname: string, rrtype: "AAAA", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
-+    export function resolve(hostname: string, rrtype: "ANY", callback: (err: NodeJS.ErrnoException, addresses: ReadonlyArray<AnySrvRecord | AnySoaRecord | AnyNaptrRecord | AnyRecordWithTtl | AnyMxRecord | AnyTxtRecord>) => void): void;
-     export function resolve(hostname: string, rrtype: "CNAME", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
-     export function resolve(hostname: string, rrtype: "MX", callback: (err: NodeJS.ErrnoException, addresses: MxRecord[]) => void): void;
-     export function resolve(hostname: string, rrtype: "NAPTR", callback: (err: NodeJS.ErrnoException, addresses: NaptrRecord[]) => void): void;
-@@ -2519,6 +2650,7 @@
-     // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
-     export namespace resolve {
-         export function __promisify__(hostname: string, rrtype?: "A" | "AAAA" | "CNAME" | "NS" | "PTR"): Promise<string[]>;
-+        export function __promisify__(hostname: string, rrtype: "ANY"): Promise<ReadonlyArray<AnySrvRecord | AnySoaRecord | AnyNaptrRecord | AnyRecordWithTtl | AnyMxRecord | AnyTxtRecord>>;
-         export function __promisify__(hostname: string, rrtype: "MX"): Promise<MxRecord[]>;
-         export function __promisify__(hostname: string, rrtype: "NAPTR"): Promise<NaptrRecord[]>;
-         export function __promisify__(hostname: string, rrtype: "SOA"): Promise<SoaRecord>;
-@@ -2549,6 +2681,7 @@
-         export function __promisify__(hostname: string, options?: ResolveOptions): Promise<string[] | RecordWithTtl[]>;
-     }
- 
-+    export function resolveAny(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: ReadonlyArray<AnySrvRecord | AnySoaRecord | AnyNaptrRecord | AnyRecordWithTtl | AnyMxRecord | AnyTxtRecord>) => void): void;
-     export function resolveCname(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
-     export function resolveMx(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: MxRecord[]) => void): void;
-     export function resolveNaptr(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: NaptrRecord[]) => void): void;
-@@ -2595,6 +2728,12 @@
- 
-     type LookupFunction = (hostname: string, options: dns.LookupOneOptions, callback: (err: NodeJS.ErrnoException | null, address: string, family: number) => void) => void;
- 
-+    export interface AddressInfo {
-+        address: string;
-+        family: string;
-+        port: number;
-+    }
-+
-     export interface SocketConstructorOpts {
-         fd?: number;
-         allowHalfOpen?: boolean;
-@@ -2642,7 +2781,7 @@
-         setTimeout(timeout: number, callback?: Function): this;
-         setNoDelay(noDelay?: boolean): this;
-         setKeepAlive(enable?: boolean, initialDelay?: number): this;
--        address(): { port: number; family: string; address: string; };
-+        address(): AddressInfo | string;
-         unref(): void;
-         ref(): void;
- 
-@@ -2741,6 +2880,8 @@
-         backlog?: number;
-         path?: string;
-         exclusive?: boolean;
-+        readableAll?: boolean;
-+        writableAll?: boolean;
-     }
- 
-     // https://github.com/nodejs/node/blob/master/lib/net.js
-@@ -2758,7 +2899,7 @@
-         listen(handle: any, backlog?: number, listeningListener?: Function): this;
-         listen(handle: any, listeningListener?: Function): this;
-         close(callback?: Function): this;
--        address(): { port: number; family: string; address: string; };
-+        address(): AddressInfo | string;
-         getConnections(cb: (error: Error | null, count: number) => void): void;
-         ref(): this;
-         unref(): this;
-@@ -2834,22 +2975,17 @@
- }
- 
- declare module "dgram" {
--    import * as events from "events";
-+    import { AddressInfo } from "net";
-     import * as dns from "dns";
-+    import * as events from "events";
- 
--    interface RemoteInfo {
--        address: string;
--        family: string;
--        port: number;
--    }
--
--    interface AddressInfo {
-+    export interface RemoteInfo {
-         address: string;
-         family: string;
-         port: number;
-     }
- 
--    interface BindOptions {
-+    export interface BindOptions {
-         port: number;
-         address?: string;
-         exclusive?: boolean;
-@@ -2857,7 +2993,7 @@
- 
-     type SocketType = "udp4" | "udp6";
- 
--    interface SocketOptions {
-+    export interface SocketOptions {
-         type: SocketType;
-         reuseAddr?: boolean;
-         recvBufferSize?: number;
-@@ -2876,7 +3012,7 @@
-         bind(callback?: () => void): void;
-         bind(options: BindOptions, callback?: Function): void;
-         close(callback?: () => void): void;
--        address(): AddressInfo;
-+        address(): AddressInfo | string;
-         setBroadcast(flag: boolean): void;
-         setTTL(ttl: number): void;
-         setMulticastTTL(ttl: number): void;
-@@ -3004,7 +3140,9 @@
-     }
- 
-     export class ReadStream extends stream.Readable {
--        close(): void;
-+        // ### BEGIN VSCODE MODIFICATION ###
-+        // close(): void; // this method does not exist officially and should never be called. Use destroy() instead. See also https://github.com/nodejs/node/issues/2006
-+        // ### BEGIN VSCODE MODIFICATION ###
-         destroy(): void;
-         bytesRead: number;
-         path: string | Buffer;
-@@ -3036,7 +3174,9 @@
-     }
- 
-     export class WriteStream extends stream.Writable {
--        close(): void;
-+        // ### BEGIN VSCODE MODIFICATION ###
-+        // close(): void; // this method does not exist officially and should never be called. Use destroy() instead. See also https://github.com/nodejs/node/issues/2006
-+        // ### BEGIN VSCODE MODIFICATION ###
-         bytesWritten: number;
-         path: string | Buffer;
- 
-@@ -3539,6 +3679,11 @@
-          * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-          */
-         export function __promisify__(path: PathLike, options?: { encoding?: string | null } | string | null): Promise<string | Buffer>;
-+
-+        export function native(path: PathLike, options: { encoding?: BufferEncoding | null } | BufferEncoding | undefined | null, callback: (err: NodeJS.ErrnoException, resolvedPath: string) => void): void;
-+        export function native(path: PathLike, options: { encoding: "buffer" } | "buffer", callback: (err: NodeJS.ErrnoException, resolvedPath: Buffer) => void): void;
-+        export function native(path: PathLike, options: { encoding?: string | null } | string | undefined | null, callback: (err: NodeJS.ErrnoException, resolvedPath: string | Buffer) => void): void;
-+        export function native(path: PathLike, callback: (err: NodeJS.ErrnoException, resolvedPath: string) => void): void;
-     }
- 
-     /**
-@@ -3562,6 +3707,12 @@
-      */
-     export function realpathSync(path: PathLike, options?: { encoding?: string | null } | string | null): string | Buffer;
- 
-+    export namespace realpathSync {
-+        export function native(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): string;
-+        export function native(path: PathLike, options: { encoding: "buffer" } | "buffer"): Buffer;
-+        export function native(path: PathLike, options?: { encoding?: string | null } | string | null): string | Buffer;
-+    }
-+
-     /**
-      * Asynchronous unlink(2) - delete a name and possibly the file it refers to.
-      * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-@@ -4332,6 +4483,17 @@
-         /** Constant for fs.access(). File can be executed by the calling process. */
-         export const X_OK: number;
- 
-+        // File Copy Constants
-+
-+        /** Constant for fs.copyFile. Flag indicating the destination file should not be overwritten if it already exists. */
-+        export const COPYFILE_EXCL: number;
-+
-+        /** Constant for fs.copyFile. copy operation will attempt to create a copy-on-write reflink. If the underlying platform does not support copy-on-write, then a fallback copy mechanism is used. */
-+        export const COPYFILE_FICLONE: number;
-+
-+        /** Constant for fs.copyFile. Copy operation will attempt to create a copy-on-write reflink. If the underlying platform does not support copy-on-write, then the operation will fail with an error. */
-+        export const COPYFILE_FICLONE_FORCE: number;
-+
-         // File Open Constants
- 
-         /** Constant for fs.open(). Flag indicating to open a file for read-only access. */
-@@ -4445,9 +4607,6 @@
- 
-         /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating executable by others. */
-         export const S_IXOTH: number;
--
--        /** Constant for fs.copyFile. Flag indicating the destination file should not be overwritten if it already exists. */
--        export const COPYFILE_EXCL: number;
-     }
- 
-     /**
-@@ -4579,37 +4738,512 @@
-      * @param flags An optional integer that specifies the behavior of the copy operation. The only supported flag is fs.constants.COPYFILE_EXCL, which causes the copy operation to fail if dest already exists.
-      */
-     export function copyFileSync(src: PathLike, dest: PathLike, flags?: number): void;
--}
- 
--declare module "path" {
--    /**
--     * A parsed path object generated by path.parse() or consumed by path.format().
--     */
--    export interface ParsedPath {
--        /**
--         * The root of the path such as '/' or 'c:\'
--         */
--        root: string;
--        /**
--         * The full directory path such as '/home/user/dir' or 'c:\path\dir'
--         */
--        dir: string;
--        /**
--         * The file name including extension (if any) such as 'index.html'
--         */
--        base: string;
--        /**
--         * The file extension (if any) such as '.html'
--         */
--        ext: string;
--        /**
--         * The file name without extension (if any) such as 'index'
--         */
--        name: string;
--    }
--    export interface FormatInputPathObject {
--        /**
--         * The root of the path such as '/' or 'c:\'
-+    export namespace promises {
-+        interface FileHandle {
-+            /**
-+             * Gets the file descriptor for this file handle.
-+             */
-+            readonly fd: number;
-+
-+            /**
-+             * Asynchronously append data to a file, creating the file if it does not exist. The underlying file will _not_ be closed automatically.
-+             * The `FileHandle` must have been opened for appending.
-+             * @param data The data to write. If something other than a `Buffer` or `Uint8Array` is provided, the value is coerced to a string.
-+             * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
-+             * If `encoding` is not supplied, the default of `'utf8'` is used.
-+             * If `mode` is not supplied, the default of `0o666` is used.
-+             * If `mode` is a string, it is parsed as an octal integer.
-+             * If `flag` is not supplied, the default of `'a'` is used.
-+             */
-+            appendFile(data: any, options?: { encoding?: string | null, mode?: string | number, flag?: string | number } | string | null): Promise<void>;
-+
-+            /**
-+             * Asynchronous fchown(2) - Change ownership of a file.
-+             */
-+            chown(uid: number, gid: number): Promise<void>;
-+
-+            /**
-+             * Asynchronous fchmod(2) - Change permissions of a file.
-+             * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
-+             */
-+            chmod(mode: string | number): Promise<void>;
-+
-+            /**
-+             * Asynchronous fdatasync(2) - synchronize a file's in-core state with storage device.
-+             */
-+            datasync(): Promise<void>;
-+
-+            /**
-+             * Asynchronous fsync(2) - synchronize a file's in-core state with the underlying storage device.
-+             */
-+            sync(): Promise<void>;
-+
-+            /**
-+             * Asynchronously reads data from the file.
-+             * The `FileHandle` must have been opened for reading.
-+             * @param buffer The buffer that the data will be written to.
-+             * @param offset The offset in the buffer at which to start writing.
-+             * @param length The number of bytes to read.
-+             * @param position The offset from the beginning of the file from which data should be read. If `null`, data will be read from the current position.
-+             */
-+            read<TBuffer extends Buffer | Uint8Array>(buffer: TBuffer, offset?: number | null, length?: number | null, position?: number | null): Promise<{ bytesRead: number, buffer: TBuffer }>;
-+
-+            /**
-+             * Asynchronously reads the entire contents of a file. The underlying file will _not_ be closed automatically.
-+             * The `FileHandle` must have been opened for reading.
-+             * @param options An object that may contain an optional flag.
-+             * If a flag is not provided, it defaults to `'r'`.
-+             */
-+            readFile(options?: { encoding?: null, flag?: string | number } | null): Promise<Buffer>;
-+
-+            /**
-+             * Asynchronously reads the entire contents of a file. The underlying file will _not_ be closed automatically.
-+             * The `FileHandle` must have been opened for reading.
-+             * @param options An object that may contain an optional flag.
-+             * If a flag is not provided, it defaults to `'r'`.
-+             */
-+            readFile(options: { encoding: BufferEncoding, flag?: string | number } | BufferEncoding): Promise<string>;
-+
-+            /**
-+             * Asynchronously reads the entire contents of a file. The underlying file will _not_ be closed automatically.
-+             * The `FileHandle` must have been opened for reading.
-+             * @param options An object that may contain an optional flag.
-+             * If a flag is not provided, it defaults to `'r'`.
-+             */
-+            readFile(options?: { encoding?: string | null, flag?: string | number } | string | null): Promise<string | Buffer>;
-+
-+            /**
-+             * Asynchronous fstat(2) - Get file status.
-+             */
-+            stat(): Promise<Stats>;
-+
-+            /**
-+             * Asynchronous ftruncate(2) - Truncate a file to a specified length.
-+             * @param len If not specified, defaults to `0`.
-+             */
-+            truncate(len?: number): Promise<void>;
-+
-+            /**
-+             * Asynchronously change file timestamps of the file.
-+             * @param atime The last access time. If a string is provided, it will be coerced to number.
-+             * @param mtime The last modified time. If a string is provided, it will be coerced to number.
-+             */
-+            utimes(atime: string | number | Date, mtime: string | number | Date): Promise<void>;
-+
-+            /**
-+             * Asynchronously writes `buffer` to the file.
-+             * The `FileHandle` must have been opened for writing.
-+             * @param buffer The buffer that the data will be written to.
-+             * @param offset The part of the buffer to be written. If not supplied, defaults to `0`.
-+             * @param length The number of bytes to write. If not supplied, defaults to `buffer.length - offset`.
-+             * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
-+             */
-+            write<TBuffer extends Buffer | Uint8Array>(buffer: TBuffer, offset?: number | null, length?: number | null, position?: number | null): Promise<{ bytesWritten: number, buffer: TBuffer }>;
-+
-+            /**
-+             * Asynchronously writes `string` to the file.
-+             * The `FileHandle` must have been opened for writing.
-+             * It is unsafe to call `write()` multiple times on the same file without waiting for the `Promise` to be resolved (or rejected). For this scenario, `fs.createWriteStream` is strongly recommended.
-+             * @param string A string to write. If something other than a string is supplied it will be coerced to a string.
-+             * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
-+             * @param encoding The expected string encoding.
-+             */
-+            write(data: any, position?: number | null, encoding?: string | null): Promise<{ bytesWritten: number, buffer: string }>;
-+
-+            /**
-+             * Asynchronously writes data to a file, replacing the file if it already exists. The underlying file will _not_ be closed automatically.
-+             * The `FileHandle` must have been opened for writing.
-+             * It is unsafe to call `writeFile()` multiple times on the same file without waiting for the `Promise` to be resolved (or rejected).
-+             * @param data The data to write. If something other than a `Buffer` or `Uint8Array` is provided, the value is coerced to a string.
-+             * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
-+             * If `encoding` is not supplied, the default of `'utf8'` is used.
-+             * If `mode` is not supplied, the default of `0o666` is used.
-+             * If `mode` is a string, it is parsed as an octal integer.
-+             * If `flag` is not supplied, the default of `'w'` is used.
-+             */
-+            writeFile(data: any, options?: { encoding?: string | null, mode?: string | number, flag?: string | number } | string | null): Promise<void>;
-+
-+            /**
-+             * Asynchronous close(2) - close a `FileHandle`.
-+             */
-+            close(): Promise<void>;
-+        }
-+
-+        /**
-+         * Asynchronously tests a user's permissions for the file specified by path.
-+         * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
-+         * URL support is _experimental_.
-+         */
-+        function access(path: PathLike, mode?: number): Promise<void>;
-+
-+        /**
-+         * Asynchronously copies `src` to `dest`. By default, `dest` is overwritten if it already exists.
-+         * Node.js makes no guarantees about the atomicity of the copy operation.
-+         * If an error occurs after the destination file has been opened for writing, Node.js will attempt
-+         * to remove the destination.
-+         * @param src A path to the source file.
-+         * @param dest A path to the destination file.
-+         * @param flags An optional integer that specifies the behavior of the copy operation. The only
-+         * supported flag is `fs.constants.COPYFILE_EXCL`, which causes the copy operation to fail if
-+         * `dest` already exists.
-+         */
-+        function copyFile(src: PathLike, dest: PathLike, flags?: number): Promise<void>;
-+
-+        /**
-+         * Asynchronous open(2) - open and possibly create a file.
-+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-+         * @param mode A file mode. If a string is passed, it is parsed as an octal integer. If not
-+         * supplied, defaults to `0o666`.
-+         */
-+        function open(path: PathLike, flags: string | number, mode?: string | number): Promise<FileHandle>;
-+
-+        /**
-+         * Asynchronously reads data from the file referenced by the supplied `FileHandle`.
-+         * @param handle A `FileHandle`.
-+         * @param buffer The buffer that the data will be written to.
-+         * @param offset The offset in the buffer at which to start writing.
-+         * @param length The number of bytes to read.
-+         * @param position The offset from the beginning of the file from which data should be read. If
-+         * `null`, data will be read from the current position.
-+         */
-+        function read<TBuffer extends Buffer | Uint8Array>(handle: FileHandle, buffer: TBuffer, offset?: number | null, length?: number | null, position?: number | null): Promise<{ bytesRead: number, buffer: TBuffer }>;
-+
-+        /**
-+         * Asynchronously writes `buffer` to the file referenced by the supplied `FileHandle`.
-+         * It is unsafe to call `fsPromises.write()` multiple times on the same file without waiting for the `Promise` to be resolved (or rejected). For this scenario, `fs.createWriteStream` is strongly recommended.
-+         * @param handle A `FileHandle`.
-+         * @param buffer The buffer that the data will be written to.
-+         * @param offset The part of the buffer to be written. If not supplied, defaults to `0`.
-+         * @param length The number of bytes to write. If not supplied, defaults to `buffer.length - offset`.
-+         * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
-+         */
-+        function write<TBuffer extends Buffer | Uint8Array>(handle: FileHandle, buffer: TBuffer, offset?: number | null, length?: number | null, position?: number | null): Promise<{ bytesWritten: number, buffer: TBuffer }>;
-+
-+        /**
-+         * Asynchronously writes `string` to the file referenced by the supplied `FileHandle`.
-+         * It is unsafe to call `fsPromises.write()` multiple times on the same file without waiting for the `Promise` to be resolved (or rejected). For this scenario, `fs.createWriteStream` is strongly recommended.
-+         * @param handle A `FileHandle`.
-+         * @param string A string to write. If something other than a string is supplied it will be coerced to a string.
-+         * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
-+         * @param encoding The expected string encoding.
-+         */
-+        function write(handle: FileHandle, string: any, position?: number | null, encoding?: string | null): Promise<{ bytesWritten: number, buffer: string }>;
-+
-+        /**
-+         * Asynchronous rename(2) - Change the name or location of a file or directory.
-+         * @param oldPath A path to a file. If a URL is provided, it must use the `file:` protocol.
-+         * URL support is _experimental_.
-+         * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
-+         * URL support is _experimental_.
-+         */
-+        function rename(oldPath: PathLike, newPath: PathLike): Promise<void>;
-+
-+        /**
-+         * Asynchronous truncate(2) - Truncate a file to a specified length.
-+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-+         * @param len If not specified, defaults to `0`.
-+         */
-+        function truncate(path: PathLike, len?: number): Promise<void>;
-+
-+        /**
-+         * Asynchronous ftruncate(2) - Truncate a file to a specified length.
-+         * @param handle A `FileHandle`.
-+         * @param len If not specified, defaults to `0`.
-+         */
-+        function ftruncate(handle: FileHandle, len?: number): Promise<void>;
-+
-+        /**
-+         * Asynchronous rmdir(2) - delete a directory.
-+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-+         */
-+        function rmdir(path: PathLike): Promise<void>;
-+
-+        /**
-+         * Asynchronous fdatasync(2) - synchronize a file's in-core state with storage device.
-+         * @param handle A `FileHandle`.
-+         */
-+        function fdatasync(handle: FileHandle): Promise<void>;
-+
-+        /**
-+         * Asynchronous fsync(2) - synchronize a file's in-core state with the underlying storage device.
-+         * @param handle A `FileHandle`.
-+         */
-+        function fsync(handle: FileHandle): Promise<void>;
-+
-+        /**
-+         * Asynchronous mkdir(2) - create a directory.
-+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-+         * @param mode A file mode. If a string is passed, it is parsed as an octal integer. If not specified, defaults to `0o777`.
-+         */
-+        function mkdir(path: PathLike, mode?: string | number): Promise<void>;
-+
-+        /**
-+         * Asynchronous readdir(3) - read a directory.
-+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-+         */
-+        function readdir(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): Promise<string[]>;
-+
-+        /**
-+         * Asynchronous readdir(3) - read a directory.
-+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-+         */
-+        function readdir(path: PathLike, options: { encoding: "buffer" } | "buffer"): Promise<Buffer[]>;
-+
-+        /**
-+         * Asynchronous readdir(3) - read a directory.
-+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-+         */
-+        function readdir(path: PathLike, options?: { encoding?: string | null } | string | null): Promise<string[] | Buffer[]>;
-+
-+        /**
-+         * Asynchronous readlink(2) - read value of a symbolic link.
-+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-+         */
-+        function readlink(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): Promise<string>;
-+
-+        /**
-+         * Asynchronous readlink(2) - read value of a symbolic link.
-+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-+         */
-+        function readlink(path: PathLike, options: { encoding: "buffer" } | "buffer"): Promise<Buffer>;
-+
-+        /**
-+         * Asynchronous readlink(2) - read value of a symbolic link.
-+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-+         */
-+        function readlink(path: PathLike, options?: { encoding?: string | null } | string | null): Promise<string | Buffer>;
-+
-+        /**
-+         * Asynchronous symlink(2) - Create a new symbolic link to an existing file.
-+         * @param target A path to an existing file. If a URL is provided, it must use the `file:` protocol.
-+         * @param path A path to the new symlink. If a URL is provided, it must use the `file:` protocol.
-+         * @param type May be set to `'dir'`, `'file'`, or `'junction'` (default is `'file'`) and is only available on Windows (ignored on other platforms).
-+         * When using `'junction'`, the `target` argument will automatically be normalized to an absolute path.
-+         */
-+        function symlink(target: PathLike, path: PathLike, type?: string | null): Promise<void>;
-+
-+        /**
-+         * Asynchronous fstat(2) - Get file status.
-+         * @param handle A `FileHandle`.
-+         */
-+        function fstat(handle: FileHandle): Promise<Stats>;
-+
-+        /**
-+         * Asynchronous lstat(2) - Get file status. Does not dereference symbolic links.
-+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-+         */
-+        function lstat(path: PathLike): Promise<Stats>;
-+
-+        /**
-+         * Asynchronous stat(2) - Get file status.
-+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-+         */
-+        function stat(path: PathLike): Promise<Stats>;
-+
-+        /**
-+         * Asynchronous link(2) - Create a new link (also known as a hard link) to an existing file.
-+         * @param existingPath A path to a file. If a URL is provided, it must use the `file:` protocol.
-+         * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
-+         */
-+        function link(existingPath: PathLike, newPath: PathLike): Promise<void>;
-+
-+        /**
-+         * Asynchronous unlink(2) - delete a name and possibly the file it refers to.
-+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-+         */
-+        function unlink(path: PathLike): Promise<void>;
-+
-+        /**
-+         * Asynchronous fchmod(2) - Change permissions of a file.
-+         * @param handle A `FileHandle`.
-+         * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
-+         */
-+        function fchmod(handle: FileHandle, mode: string | number): Promise<void>;
-+
-+        /**
-+         * Asynchronous chmod(2) - Change permissions of a file.
-+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-+         * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
-+         */
-+        function chmod(path: PathLike, mode: string | number): Promise<void>;
-+
-+        /**
-+         * Asynchronous lchmod(2) - Change permissions of a file. Does not dereference symbolic links.
-+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-+         * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
-+         */
-+        function lchmod(path: PathLike, mode: string | number): Promise<void>;
-+
-+        /**
-+         * Asynchronous lchown(2) - Change ownership of a file. Does not dereference symbolic links.
-+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-+         */
-+        function lchown(path: PathLike, uid: number, gid: number): Promise<void>;
-+
-+        /**
-+         * Asynchronous fchown(2) - Change ownership of a file.
-+         * @param handle A `FileHandle`.
-+         */
-+        function fchown(handle: FileHandle, uid: number, gid: number): Promise<void>;
-+
-+        /**
-+         * Asynchronous chown(2) - Change ownership of a file.
-+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-+         */
-+        function chown(path: PathLike, uid: number, gid: number): Promise<void>;
-+
-+        /**
-+         * Asynchronously change file timestamps of the file referenced by the supplied path.
-+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-+         * @param atime The last access time. If a string is provided, it will be coerced to number.
-+         * @param mtime The last modified time. If a string is provided, it will be coerced to number.
-+         */
-+        function utimes(path: PathLike, atime: string | number | Date, mtime: string | number | Date): Promise<void>;
-+
-+        /**
-+         * Asynchronously change file timestamps of the file referenced by the supplied `FileHandle`.
-+         * @param handle A `FileHandle`.
-+         * @param atime The last access time. If a string is provided, it will be coerced to number.
-+         * @param mtime The last modified time. If a string is provided, it will be coerced to number.
-+         */
-+        function futimes(handle: FileHandle, atime: string | number | Date, mtime: string | number | Date): Promise<void>;
-+
-+        /**
-+         * Asynchronous realpath(3) - return the canonicalized absolute pathname.
-+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-+         */
-+        function realpath(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): Promise<string>;
-+
-+        /**
-+         * Asynchronous realpath(3) - return the canonicalized absolute pathname.
-+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-+         */
-+        function realpath(path: PathLike, options: { encoding: "buffer" } | "buffer"): Promise<Buffer>;
-+
-+        /**
-+         * Asynchronous realpath(3) - return the canonicalized absolute pathname.
-+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-+         */
-+        function realpath(path: PathLike, options?: { encoding?: string | null } | string | null): Promise<string | Buffer>;
-+
-+        /**
-+         * Asynchronously creates a unique temporary directory.
-+         * Generates six random characters to be appended behind a required `prefix` to create a unique temporary directory.
-+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-+         */
-+        function mkdtemp(prefix: string, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): Promise<string>;
-+
-+        /**
-+         * Asynchronously creates a unique temporary directory.
-+         * Generates six random characters to be appended behind a required `prefix` to create a unique temporary directory.
-+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-+         */
-+        function mkdtemp(prefix: string, options: { encoding: "buffer" } | "buffer"): Promise<Buffer>;
-+
-+        /**
-+         * Asynchronously creates a unique temporary directory.
-+         * Generates six random characters to be appended behind a required `prefix` to create a unique temporary directory.
-+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-+         */
-+        function mkdtemp(prefix: string, options?: { encoding?: string | null } | string | null): Promise<string | Buffer>;
-+
-+        /**
-+         * Asynchronously writes data to a file, replacing the file if it already exists.
-+         * It is unsafe to call `fsPromises.writeFile()` multiple times on the same file without waiting for the `Promise` to be resolved (or rejected).
-+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-+         * URL support is _experimental_.
-+         * If a `FileHandle` is provided, the underlying file will _not_ be closed automatically.
-+         * @param data The data to write. If something other than a `Buffer` or `Uint8Array` is provided, the value is coerced to a string.
-+         * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
-+         * If `encoding` is not supplied, the default of `'utf8'` is used.
-+         * If `mode` is not supplied, the default of `0o666` is used.
-+         * If `mode` is a string, it is parsed as an octal integer.
-+         * If `flag` is not supplied, the default of `'w'` is used.
-+         */
-+        function writeFile(path: PathLike | FileHandle, data: any, options?: { encoding?: string | null, mode?: string | number, flag?: string | number } | string | null): Promise<void>;
-+
-+        /**
-+         * Asynchronously append data to a file, creating the file if it does not exist.
-+         * @param file A path to a file. If a URL is provided, it must use the `file:` protocol.
-+         * URL support is _experimental_.
-+         * If a `FileHandle` is provided, the underlying file will _not_ be closed automatically.
-+         * @param data The data to write. If something other than a `Buffer` or `Uint8Array` is provided, the value is coerced to a string.
-+         * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
-+         * If `encoding` is not supplied, the default of `'utf8'` is used.
-+         * If `mode` is not supplied, the default of `0o666` is used.
-+         * If `mode` is a string, it is parsed as an octal integer.
-+         * If `flag` is not supplied, the default of `'a'` is used.
-+         */
-+        function appendFile(path: PathLike | FileHandle, data: any, options?: { encoding?: string | null, mode?: string | number, flag?: string | number } | string | null): Promise<void>;
-+
-+        /**
-+         * Asynchronously reads the entire contents of a file.
-+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-+         * If a `FileHandle` is provided, the underlying file will _not_ be closed automatically.
-+         * @param options An object that may contain an optional flag.
-+         * If a flag is not provided, it defaults to `'r'`.
-+         */
-+        function readFile(path: PathLike | FileHandle, options?: { encoding?: null, flag?: string | number } | null): Promise<Buffer>;
-+
-+        /**
-+         * Asynchronously reads the entire contents of a file.
-+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-+         * If a `FileHandle` is provided, the underlying file will _not_ be closed automatically.
-+         * @param options An object that may contain an optional flag.
-+         * If a flag is not provided, it defaults to `'r'`.
-+         */
-+        function readFile(path: PathLike | FileHandle, options: { encoding: BufferEncoding, flag?: string | number } | BufferEncoding): Promise<string>;
-+
-+        /**
-+         * Asynchronously reads the entire contents of a file.
-+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-+         * If a `FileHandle` is provided, the underlying file will _not_ be closed automatically.
-+         * @param options An object that may contain an optional flag.
-+         * If a flag is not provided, it defaults to `'r'`.
-+         */
-+        function readFile(path: PathLike | FileHandle, options?: { encoding?: string | null, flag?: string | number } | string | null): Promise<string | Buffer>;
-+    }
-+}
-+
-+declare module "path" {
-+    /**
-+     * A parsed path object generated by path.parse() or consumed by path.format().
-+     */
-+    export interface ParsedPath {
-+        /**
-+         * The root of the path such as '/' or 'c:\'
-+         */
-+        root: string;
-+        /**
-+         * The full directory path such as '/home/user/dir' or 'c:\path\dir'
-+         */
-+        dir: string;
-+        /**
-+         * The file name including extension (if any) such as 'index.html'
-+         */
-+        base: string;
-+        /**
-+         * The file extension (if any) such as '.html'
-+         */
-+        ext: string;
-+        /**
-+         * The file name without extension (if any) such as 'index'
-+         */
-+        name: string;
-+    }
-+    export interface FormatInputPathObject {
-+        /**
-+         * The root of the path such as '/' or 'c:\'
-          */
-         root?: string;
-         /**
-@@ -5068,23 +5702,6 @@
-         prependOnceListener(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
-     }
- 
--    export interface ClearTextStream extends stream.Duplex {
--        authorized: boolean;
--        authorizationError: Error;
--        getPeerCertificate(): any;
--        getCipher: {
--            name: string;
--            version: string;
--        };
--        address: {
--            port: number;
--            family: string;
--            address: string;
--        };
--        remoteAddress: string;
--        remotePort: number;
--    }
--
-     export interface SecurePair {
-         encrypted: any;
-         cleartext: any;
-@@ -5099,6 +5716,7 @@
-         ciphers?: string;
-         honorCipherOrder?: boolean;
-         ecdhCurve?: string;
-+        clientCertEngine?: string;
-         crl?: string | Buffer | Array<string | Buffer>;
-         dhparam?: string | Buffer;
-         secureOptions?: number; // Value is a numeric bitmask of the `SSL_OP_*` options
-@@ -5130,16 +5748,19 @@
- }
- 
- declare module "crypto" {
-+    import * as stream from "stream";
-+
-     export interface Certificate {
--        exportChallenge(spkac: string | Buffer): Buffer;
--        exportPublicKey(spkac: string | Buffer): Buffer;
--        verifySpkac(spkac: Buffer): boolean;
-+        exportChallenge(spkac: string | ArrayBufferView): Buffer;
-+        exportPublicKey(spkac: string | ArrayBufferView): Buffer;
-+        verifySpkac(spkac: ArrayBufferView): boolean;
-     }
-     export var Certificate: {
-         new(): Certificate;
-         (): Certificate;
-     };
- 
-+    /** @deprecated since v10.0.0 */
-     export var fips: boolean;
- 
-     export interface CredentialDetails {
-@@ -5153,8 +5774,8 @@
-     }
-     export interface Credentials { context?: any; }
-     export function createCredentials(details: CredentialDetails): Credentials;
--    export function createHash(algorithm: string): Hash;
--    export function createHmac(algorithm: string, key: string | Buffer): Hmac;
-+    export function createHash(algorithm: string, options?: stream.TransformOptions): Hash;
-+    export function createHmac(algorithm: string, key: string | ArrayBufferView, options?: stream.TransformOptions): Hmac;
- 
-     type Utf8AsciiLatin1Encoding = "utf8" | "ascii" | "latin1";
-     type HexBase64Latin1Encoding = "latin1" | "hex" | "base64";
-@@ -5163,69 +5784,112 @@
-     type ECDHKeyFormat = "compressed" | "uncompressed" | "hybrid";
- 
-     export interface Hash extends NodeJS.ReadWriteStream {
--        update(data: string | Buffer | DataView): Hash;
--        update(data: string | Buffer | DataView, input_encoding: Utf8AsciiLatin1Encoding): Hash;
-+        update(data: string | ArrayBufferView): Hash;
-+        update(data: string, input_encoding: Utf8AsciiLatin1Encoding): Hash;
-         digest(): Buffer;
-         digest(encoding: HexBase64Latin1Encoding): string;
-     }
-     export interface Hmac extends NodeJS.ReadWriteStream {
--        update(data: string | Buffer | DataView): Hmac;
--        update(data: string | Buffer | DataView, input_encoding: Utf8AsciiLatin1Encoding): Hmac;
-+        update(data: string | ArrayBufferView): Hmac;
-+        update(data: string, input_encoding: Utf8AsciiLatin1Encoding): Hmac;
-         digest(): Buffer;
-         digest(encoding: HexBase64Latin1Encoding): string;
-     }
--    export function createCipher(algorithm: string, password: any): Cipher;
--    export function createCipheriv(algorithm: string, key: any, iv: any): Cipher;
-+    export type CipherCCMTypes = 'aes-128-ccm' | 'aes-192-ccm' | 'aes-256-ccm';
-+    export type CipherGCMTypes = 'aes-128-gcm' | 'aes-192-gcm' | 'aes-256-gcm';
-+    export interface CipherCCMOptions extends stream.TransformOptions {
-+        authTagLength: number;
-+    }
-+    export interface CipherGCMOptions extends stream.TransformOptions {
-+        authTagLength?: number;
-+    }
-+    /** @deprecated since v10.0.0 use createCipheriv() */
-+    export function createCipher(algorithm: string, password: string | ArrayBufferView, options?: stream.TransformOptions): Cipher;
-+    export function createCipher(algorithm: CipherCCMTypes, password: string | ArrayBufferView, options: CipherCCMOptions): CipherCCM;
-+    export function createCipher(algorithm: CipherGCMTypes, password: string | ArrayBufferView, options: CipherGCMOptions): CipherGCM;
-+
-+    export function createCipheriv(algorithm: string, key: string | ArrayBufferView, iv: string | ArrayBufferView, options?: stream.TransformOptions): Cipher;
-+    export function createCipheriv(algorithm: CipherGCMTypes, key: string | ArrayBufferView, iv: string | ArrayBufferView, options: CipherCCMOptions): CipherCCM;
-+    export function createCipheriv(algorithm: CipherGCMTypes, key: string | ArrayBufferView, iv: string | ArrayBufferView, options: CipherGCMOptions): CipherGCM;
-+
-     export interface Cipher extends NodeJS.ReadWriteStream {
--        update(data: Buffer | DataView): Buffer;
-+        update(data: string | ArrayBufferView): Buffer;
-         update(data: string, input_encoding: Utf8AsciiBinaryEncoding): Buffer;
--        update(data: Buffer | DataView, input_encoding: any, output_encoding: HexBase64BinaryEncoding): string;
-+        update(data: ArrayBufferView, output_encoding: HexBase64BinaryEncoding): string;
-+        update(data: ArrayBufferView, input_encoding: any, output_encoding: HexBase64BinaryEncoding): string;
-+        // second arg ignored
-         update(data: string, input_encoding: Utf8AsciiBinaryEncoding, output_encoding: HexBase64BinaryEncoding): string;
-         final(): Buffer;
-         final(output_encoding: string): string;
-         setAutoPadding(auto_padding?: boolean): this;
-+        // getAuthTag(): Buffer;
-+        // setAAD(buffer: Buffer): this; // docs only say buffer
-+    }
-+    export interface CipherCCM extends Cipher {
-+        setAAD(buffer: Buffer, options: { plainTextLength: number }): this;
-+        getAuthTag(): Buffer;
-+    }
-+    export interface CipherGCM extends Cipher {
-+        setAAD(buffer: Buffer, options?: { plainTextLength: number }): this;
-         getAuthTag(): Buffer;
--        setAAD(buffer: Buffer): this;
-     }
--    export function createDecipher(algorithm: string, password: any): Decipher;
--    export function createDecipheriv(algorithm: string, key: any, iv: any): Decipher;
-+    /** @deprecated since v10.0.0 use createCipheriv() */
-+    export function createDecipher(algorithm: string, password: string | ArrayBufferView, options?: stream.TransformOptions): Decipher;
-+    export function createDecipher(algorithm: CipherCCMTypes, password: string | ArrayBufferView, options: CipherCCMOptions): DecipherCCM;
-+    export function createDecipher(algorithm: CipherGCMTypes, password: string | ArrayBufferView, options: CipherGCMOptions): DecipherGCM;
-+
-+    export function createDecipheriv(algorithm: string, key: string | ArrayBufferView, iv: string | ArrayBufferView, options?: stream.TransformOptions): Decipher;
-+    export function createDecipheriv(algorithm: CipherCCMTypes, key: string | ArrayBufferView, iv: string | ArrayBufferView, options: CipherCCMOptions): DecipherCCM;
-+    export function createDecipheriv(algorithm: CipherGCMTypes, key: string | ArrayBufferView, iv: string | ArrayBufferView, options: CipherGCMOptions): DecipherGCM;
-+
-     export interface Decipher extends NodeJS.ReadWriteStream {
--        update(data: Buffer | DataView): Buffer;
-+        update(data: ArrayBufferView): Buffer;
-         update(data: string, input_encoding: HexBase64BinaryEncoding): Buffer;
--        update(data: Buffer | DataView, input_encoding: any, output_encoding: Utf8AsciiBinaryEncoding): string;
-+        update(data: ArrayBufferView, input_encoding: any, output_encoding: Utf8AsciiBinaryEncoding): string;
-+        // second arg is ignored
-         update(data: string, input_encoding: HexBase64BinaryEncoding, output_encoding: Utf8AsciiBinaryEncoding): string;
-         final(): Buffer;
-         final(output_encoding: string): string;
-         setAutoPadding(auto_padding?: boolean): this;
--        setAuthTag(tag: Buffer): this;
--        setAAD(buffer: Buffer): this;
-+        // setAuthTag(tag: ArrayBufferView): this;
-+        // setAAD(buffer: ArrayBufferView): this; // docs say buffer view
-+    }
-+    export interface DecipherCCM extends Decipher {
-+        setAuthTag(buffer: ArrayBufferView, options: { plainTextLength: number }): this;
-+        setAAD(buffer: ArrayBufferView): this; // docs say buffer view
-     }
--    export function createSign(algorithm: string): Signer;
-+    export interface DecipherGCM extends Decipher {
-+        setAuthTag(buffer: ArrayBufferView, options?: { plainTextLength: number }): this;
-+        setAAD(buffer: ArrayBufferView): this; // docs say buffer view
-+    }
-+
-+    export function createSign(algorithm: string, options?: stream.WritableOptions): Signer;
-     export interface Signer extends NodeJS.WritableStream {
--        update(data: string | Buffer | DataView): Signer;
--        update(data: string | Buffer | DataView, input_encoding: Utf8AsciiLatin1Encoding): Signer;
-+        update(data: string | ArrayBufferView): Signer;
-+        update(data: string, input_encoding: Utf8AsciiLatin1Encoding): Signer;
-         sign(private_key: string | { key: string; passphrase: string }): Buffer;
-         sign(private_key: string | { key: string; passphrase: string }, output_format: HexBase64Latin1Encoding): string;
-     }
--    export function createVerify(algorith: string): Verify;
-+    export function createVerify(algorith: string, options?: stream.WritableOptions): Verify;
-     export interface Verify extends NodeJS.WritableStream {
--        update(data: string | Buffer | DataView): Verify;
--        update(data: string | Buffer | DataView, input_encoding: Utf8AsciiLatin1Encoding): Verify;
--        verify(object: string | Object, signature: Buffer | DataView): boolean;
-+        update(data: string | ArrayBufferView): Verify;
-+        update(data: string, input_encoding: Utf8AsciiLatin1Encoding): Verify;
-+        verify(object: string | Object, signature: ArrayBufferView): boolean;
-         verify(object: string | Object, signature: string, signature_format: HexBase64Latin1Encoding): boolean;
-         // https://nodejs.org/api/crypto.html#crypto_verifier_verify_object_signature_signature_format
-         // The signature field accepts a TypedArray type, but it is only available starting ES2017
-     }
--    export function createDiffieHellman(prime_length: number, generator?: number): DiffieHellman;
--    export function createDiffieHellman(prime: Buffer): DiffieHellman;
-+    export function createDiffieHellman(prime_length: number, generator?: number | ArrayBufferView): DiffieHellman;
-+    export function createDiffieHellman(prime: ArrayBufferView): DiffieHellman;
-     export function createDiffieHellman(prime: string, prime_encoding: HexBase64Latin1Encoding): DiffieHellman;
--    export function createDiffieHellman(prime: string, prime_encoding: HexBase64Latin1Encoding, generator: number | Buffer): DiffieHellman;
-+    export function createDiffieHellman(prime: string, prime_encoding: HexBase64Latin1Encoding, generator: number | ArrayBufferView): DiffieHellman;
-     export function createDiffieHellman(prime: string, prime_encoding: HexBase64Latin1Encoding, generator: string, generator_encoding: HexBase64Latin1Encoding): DiffieHellman;
-     export interface DiffieHellman {
-         generateKeys(): Buffer;
-         generateKeys(encoding: HexBase64Latin1Encoding): string;
--        computeSecret(other_public_key: Buffer): Buffer;
-+        computeSecret(other_public_key: ArrayBufferView): Buffer;
-         computeSecret(other_public_key: string, input_encoding: HexBase64Latin1Encoding): Buffer;
-+        computeSecret(other_public_key: ArrayBufferView, output_encoding: HexBase64Latin1Encoding): string;
-         computeSecret(other_public_key: string, input_encoding: HexBase64Latin1Encoding, output_encoding: HexBase64Latin1Encoding): string;
-         getPrime(): Buffer;
-         getPrime(encoding: HexBase64Latin1Encoding): string;
-@@ -5235,26 +5899,36 @@
-         getPublicKey(encoding: HexBase64Latin1Encoding): string;
-         getPrivateKey(): Buffer;
-         getPrivateKey(encoding: HexBase64Latin1Encoding): string;
--        setPublicKey(public_key: Buffer): void;
-+        setPublicKey(public_key: ArrayBufferView): void;
-         setPublicKey(public_key: string, encoding: string): void;
--        setPrivateKey(private_key: Buffer): void;
-+        setPrivateKey(private_key: ArrayBufferView): void;
-         setPrivateKey(private_key: string, encoding: string): void;
-         verifyError: number;
-     }
-     export function getDiffieHellman(group_name: string): DiffieHellman;
--    export function pbkdf2(password: string | Buffer, salt: string | Buffer, iterations: number, keylen: number, digest: string, callback: (err: Error, derivedKey: Buffer) => any): void;
--    export function pbkdf2Sync(password: string | Buffer, salt: string | Buffer, iterations: number, keylen: number, digest: string): Buffer;
-+    export function pbkdf2(password: string | ArrayBufferView, salt: string | ArrayBufferView, iterations: number, keylen: number, digest: string, callback: (err: Error | null, derivedKey: Buffer) => any): void;
-+    export function pbkdf2Sync(password: string | ArrayBufferView, salt: string | ArrayBufferView, iterations: number, keylen: number, digest: string): Buffer;
-+
-     export function randomBytes(size: number): Buffer;
--    export function randomBytes(size: number, callback: (err: Error, buf: Buffer) => void): void;
-+    export function randomBytes(size: number, callback: (err: Error | null, buf: Buffer) => void): void;
-     export function pseudoRandomBytes(size: number): Buffer;
--    export function pseudoRandomBytes(size: number, callback: (err: Error, buf: Buffer) => void): void;
--    export function randomFillSync(buffer: Buffer | Uint8Array, offset?: number, size?: number): Buffer;
--    export function randomFill(buffer: Buffer, callback: (err: Error, buf: Buffer) => void): void;
--    export function randomFill(buffer: Uint8Array, callback: (err: Error, buf: Uint8Array) => void): void;
--    export function randomFill(buffer: Buffer, offset: number, callback: (err: Error, buf: Buffer) => void): void;
--    export function randomFill(buffer: Uint8Array, offset: number, callback: (err: Error, buf: Uint8Array) => void): void;
--    export function randomFill(buffer: Buffer, offset: number, size: number, callback: (err: Error, buf: Buffer) => void): void;
--    export function randomFill(buffer: Uint8Array, offset: number, size: number, callback: (err: Error, buf: Uint8Array) => void): void;
-+    export function pseudoRandomBytes(size: number, callback: (err: Error | null, buf: Buffer) => void): void;
-+
-+    export function randomFillSync<T extends Buffer | ArrayBufferView>(buffer: T, offset?: number, size?: number): T;
-+    export function randomFill<T extends Buffer | ArrayBufferView>(buffer: T, callback: (err: Error | null, buf: T) => void): void;
-+    export function randomFill<T extends Buffer | ArrayBufferView>(buffer: T, offset: number, callback: (err: Error | null, buf: T) => void): void;
-+    export function randomFill<T extends Buffer | ArrayBufferView>(buffer: T, offset: number, size: number, callback: (err: Error | null, buf: T) => void): void;
-+
-+    export interface ScryptOptions {
-+        N?: number;
-+        r?: number;
-+        p?: number;
-+        maxmem?: number;
-+    }
-+    export function scrypt(password: string | ArrayBufferView, salt: string | ArrayBufferView, keylen: number, callback: (err: Error | null, derivedKey: Buffer) => void): void;
-+    export function scrypt(password: string | ArrayBufferView, salt: string | ArrayBufferView, keylen: number, options: ScryptOptions, callback: (err: Error | null, derivedKey: Buffer) => void): void;
-+    export function scryptSync(password: string | ArrayBufferView, salt: string | ArrayBufferView, keylen: number, options?: ScryptOptions): Buffer;
-+
-     export interface RsaPublicKey {
-         key: string;
-         padding?: number;
-@@ -5264,30 +5938,31 @@
-         passphrase?: string;
-         padding?: number;
-     }
--    export function publicEncrypt(public_key: string | RsaPublicKey, buffer: Buffer): Buffer;
--    export function privateDecrypt(private_key: string | RsaPrivateKey, buffer: Buffer): Buffer;
--    export function privateEncrypt(private_key: string | RsaPrivateKey, buffer: Buffer): Buffer;
--    export function publicDecrypt(public_key: string | RsaPublicKey, buffer: Buffer): Buffer;
-+    export function publicEncrypt(public_key: string | RsaPublicKey, buffer: ArrayBufferView): Buffer;
-+    export function privateDecrypt(private_key: string | RsaPrivateKey, buffer: ArrayBufferView): Buffer;
-+    export function privateEncrypt(private_key: string | RsaPrivateKey, buffer: ArrayBufferView): Buffer;
-+    export function publicDecrypt(public_key: string | RsaPublicKey, buffer: ArrayBufferView): Buffer;
-     export function getCiphers(): string[];
-     export function getCurves(): string[];
-     export function getHashes(): string[];
--    export interface ECDH {
-+    export class ECDH {
-+        static convertKey(key: string | ArrayBufferView, curve: string, inputEncoding?: HexBase64Latin1Encoding, outputEncoding?: "latin1" | "hex" | "base64", format?: "uncompressed" | "compressed" | "hybrid"): Buffer | string;
-         generateKeys(): Buffer;
--        generateKeys(encoding: HexBase64Latin1Encoding): string;
--        generateKeys(encoding: HexBase64Latin1Encoding, format: ECDHKeyFormat): string;
--        computeSecret(other_public_key: Buffer): Buffer;
-+        generateKeys(encoding: HexBase64Latin1Encoding, format?: ECDHKeyFormat): string;
-+        computeSecret(other_public_key: ArrayBufferView): Buffer;
-         computeSecret(other_public_key: string, input_encoding: HexBase64Latin1Encoding): Buffer;
-+        computeSecret(other_public_key: ArrayBufferView, output_encoding: HexBase64Latin1Encoding): string;
-         computeSecret(other_public_key: string, input_encoding: HexBase64Latin1Encoding, output_encoding: HexBase64Latin1Encoding): string;
-         getPrivateKey(): Buffer;
-         getPrivateKey(encoding: HexBase64Latin1Encoding): string;
-         getPublicKey(): Buffer;
--        getPublicKey(encoding: HexBase64Latin1Encoding): string;
--        getPublicKey(encoding: HexBase64Latin1Encoding, format: ECDHKeyFormat): string;
--        setPrivateKey(private_key: Buffer): void;
-+        getPublicKey(encoding: HexBase64Latin1Encoding, format?: ECDHKeyFormat): string;
-+        setPrivateKey(private_key: ArrayBufferView): void;
-         setPrivateKey(private_key: string, encoding: HexBase64Latin1Encoding): void;
-     }
-     export function createECDH(curve_name: string): ECDH;
--    export function timingSafeEqual(a: Buffer, b: Buffer): boolean;
-+    export function timingSafeEqual(a: ArrayBufferView, b: ArrayBufferView): boolean;
-+    /** @deprecated since v10.0.0 */
-     export var DEFAULT_ENCODING: string;
- }
- 
-@@ -5312,6 +5987,7 @@
-         export class Readable extends Stream implements NodeJS.ReadableStream {
-             readable: boolean;
-             readonly readableHighWaterMark: number;
-+            readonly readableLength: number;
-             constructor(opts?: ReadableOptions);
-             _read(size: number): void;
-             read(size?: number): any;
-@@ -5383,6 +6059,8 @@
-             removeListener(event: "end", listener: () => void): this;
-             removeListener(event: "readable", listener: () => void): this;
-             removeListener(event: "error", listener: (err: Error) => void): this;
-+
-+            [Symbol.asyncIterator](): AsyncIterableIterator<Buffer | string>;
-         }
- 
-         export interface WritableOptions {
-@@ -5398,6 +6076,7 @@
-         export class Writable extends Stream implements NodeJS.WritableStream {
-             writable: boolean;
-             readonly writableHighWaterMark: number;
-+            readonly writableLength: number;
-             constructor(opts?: WritableOptions);
-             _write(chunk: any, encoding: string, callback: (err?: Error) => void): void;
-             _writev?(chunks: Array<{ chunk: any, encoding: string }>, callback: (err?: Error) => void): void;
-@@ -5490,6 +6169,7 @@
-         export class Duplex extends Readable implements Writable {
-             writable: boolean;
-             readonly writableHighWaterMark: number;
-+            readonly writableLength: number;
-             constructor(opts?: DuplexOptions);
-             _write(chunk: any, encoding: string, callback: (err?: Error) => void): void;
-             _writev?(chunks: Array<{ chunk: any, encoding: string }>, callback: (err?: Error) => void): void;
-@@ -5505,18 +6185,35 @@
-             uncork(): void;
-         }
- 
-+        type TransformCallback = (err?: Error, data?: any) => void;
-+
-         export interface TransformOptions extends DuplexOptions {
--            transform?: (chunk: string | Buffer, encoding: string, callback: Function) => any;
--            flush?: (callback: Function) => any;
-+            transform?: (chunk: any, encoding: string, callback: TransformCallback) => any;
-+            flush?: (callback: TransformCallback) => any;
-         }
- 
-         export class Transform extends Duplex {
-             constructor(opts?: TransformOptions);
--            _transform(chunk: any, encoding: string, callback: Function): void;
-+            _transform(chunk: any, encoding: string, callback: TransformCallback): void;
-             destroy(error?: Error): void;
-         }
- 
-         export class PassThrough extends Transform { }
-+
-+        export function pipeline<T extends NodeJS.WritableStream>(stream1: NodeJS.ReadableStream, stream2: T, callback?: (err: NodeJS.ErrnoException) => void): T;
-+        export function pipeline<T extends NodeJS.WritableStream>(stream1: NodeJS.ReadableStream, stream2: NodeJS.ReadWriteStream, stream3: T, callback?: (err: NodeJS.ErrnoException) => void): T;
-+        export function pipeline<T extends NodeJS.WritableStream>(stream1: NodeJS.ReadableStream, stream2: NodeJS.ReadWriteStream, stream3: NodeJS.ReadWriteStream, stream4: T, callback?: (err: NodeJS.ErrnoException) => void): T;
-+        export function pipeline<T extends NodeJS.WritableStream>(stream1: NodeJS.ReadableStream, stream2: NodeJS.ReadWriteStream, stream3: NodeJS.ReadWriteStream, stream4: NodeJS.ReadWriteStream, stream5: T, callback?: (err: NodeJS.ErrnoException) => void): T;
-+        export function pipeline(streams: Array<NodeJS.ReadableStream | NodeJS.WritableStream | NodeJS.ReadWriteStream>, callback?: (err: NodeJS.ErrnoException) => void): NodeJS.WritableStream;
-+        export function pipeline(stream1: NodeJS.ReadableStream, stream2: NodeJS.ReadWriteStream | NodeJS.WritableStream, ...streams: Array<NodeJS.ReadWriteStream | NodeJS.WritableStream | ((err: NodeJS.ErrnoException) => void)>): NodeJS.WritableStream;
-+        export namespace pipeline {
-+            export function __promisify__<T extends NodeJS.WritableStream>(stream1: NodeJS.ReadableStream, stream2: T): Promise<void>;
-+            export function __promisify__<T extends NodeJS.WritableStream>(stream1: NodeJS.ReadableStream, stream2: NodeJS.ReadWriteStream, stream3: T): Promise<void>;
-+            export function __promisify__<T extends NodeJS.WritableStream>(stream1: NodeJS.ReadableStream, stream2: NodeJS.ReadWriteStream, stream3: NodeJS.ReadWriteStream, stream4: T): Promise<void>;
-+            export function __promisify__<T extends NodeJS.WritableStream>(stream1: NodeJS.ReadableStream, stream2: NodeJS.ReadWriteStream, stream3: NodeJS.ReadWriteStream, stream4: NodeJS.ReadWriteStream, stream5: T): Promise<void>;
-+            export function __promisify__(streams: Array<NodeJS.ReadableStream | NodeJS.WritableStream | NodeJS.ReadWriteStream>): Promise<void>;
-+            export function __promisify__(stream1: NodeJS.ReadableStream, stream2: NodeJS.ReadWriteStream | NodeJS.WritableStream, ...streams: Array<NodeJS.ReadWriteStream | NodeJS.WritableStream>): Promise<void>;
-+        }
-     }
- 
-     export = internal;
-@@ -5525,10 +6222,15 @@
- declare module "util" {
-     export interface InspectOptions extends NodeJS.InspectOptions { }
-     export function format(format: any, ...param: any[]): string;
-+    /** @deprecated since v0.11.3 - use `console.error()` instead. */
-     export function debug(string: string): void;
-+    /** @deprecated since v0.11.3 - use `console.error()` instead. */
-     export function error(...param: any[]): void;
-+    /** @deprecated since v0.11.3 - use `console.log()` instead. */
-     export function puts(...param: any[]): void;
-+    /** @deprecated since v0.11.3 - use `console.log()` instead. */
-     export function print(...param: any[]): void;
-+    /** @deprecated since v0.11.3 - use a third party module instead. */
-     export function log(string: string): void;
-     export var inspect: {
-         (object: any, showHidden?: boolean, depth?: number | null, color?: boolean): string;
-@@ -5542,24 +6244,40 @@
-         defaultOptions: InspectOptions;
-         custom: symbol;
-     };
-+    /** @deprecated since v4.0.0 - use `Array.isArray()` instead. */
-     export function isArray(object: any): object is any[];
-+    /** @deprecated since v4.0.0 - use `util.types.isRegExp()` instead. */
-     export function isRegExp(object: any): object is RegExp;
-+    /** @deprecated since v4.0.0 - use `util.types.isDate()` instead. */
-     export function isDate(object: any): object is Date;
-+    /** @deprecated since v4.0.0 - use `util.types.isNativeError()` instead. */
-     export function isError(object: any): object is Error;
-     export function inherits(constructor: any, superConstructor: any): void;
-     export function debuglog(key: string): (msg: string, ...param: any[]) => void;
-+    /** @deprecated since v4.0.0 - use `typeof value === 'boolean'` instead. */
-     export function isBoolean(object: any): object is boolean;
-+    /** @deprecated since v4.0.0 - use `Buffer.isBuffer()` instead. */
-     export function isBuffer(object: any): object is Buffer;
-+    /** @deprecated since v4.0.0 - use `typeof value === 'function'` instead. */
-     export function isFunction(object: any): boolean;
-+    /** @deprecated since v4.0.0 - use `value === null` instead. */
-     export function isNull(object: any): object is null;
-+    /** @deprecated since v4.0.0 - use `value === null || value === undefined` instead. */
-     export function isNullOrUndefined(object: any): object is null | undefined;
-+    /** @deprecated since v4.0.0 - use `typeof value === 'number'` instead. */
-     export function isNumber(object: any): object is number;
-+    /** @deprecated since v4.0.0 - use `value !== null && typeof value === 'object'` instead. */
-     export function isObject(object: any): boolean;
-+    /** @deprecated since v4.0.0 - use `(typeof value !== 'object' && typeof value !== 'function') || value === null` instead. */
-     export function isPrimitive(object: any): boolean;
-+    /** @deprecated since v4.0.0 - use `typeof value === 'string'` instead. */
-     export function isString(object: any): object is string;
-+    /** @deprecated since v4.0.0 - use `typeof value === 'symbol'` instead. */
-     export function isSymbol(object: any): object is symbol;
-+    /** @deprecated since v4.0.0 - use `value === undefined` instead. */
-     export function isUndefined(object: any): object is undefined;
-     export function deprecate<T extends Function>(fn: T, message: string): T;
-+    export function isDeepStrictEqual(val1: any, val2: any): boolean;
- 
-     export interface CustomPromisify<TCustom extends Function> extends Function {
-         __promisify__: TCustom;
-@@ -5598,6 +6316,44 @@
-         const custom: symbol;
-     }
- 
-+    export namespace types {
-+        export function isAnyArrayBuffer(object: any): boolean;
-+        export function isArgumentsObject(object: any): object is IArguments;
-+        export function isArrayBuffer(object: any): object is ArrayBuffer;
-+        export function isAsyncFunction(object: any): boolean;
-+        export function isBooleanObject(object: any): object is Boolean;
-+        export function isDataView(object: any): object is DataView;
-+        export function isDate(object: any): object is Date;
-+        export function isExternal(object: any): boolean;
-+        export function isFloat32Array(object: any): object is Float32Array;
-+        export function isFloat64Array(object: any): object is Float64Array;
-+        export function isGeneratorFunction(object: any): boolean;
-+        export function isGeneratorObject(object: any): boolean;
-+        export function isInt8Array(object: any): object is Int8Array;
-+        export function isInt16Array(object: any): object is Int16Array;
-+        export function isInt32Array(object: any): object is Int32Array;
-+        export function isMap(object: any): boolean;
-+        export function isMapIterator(object: any): boolean;
-+        export function isNativeError(object: any): object is Error;
-+        export function isNumberObject(object: any): object is Number;
-+        export function isPromise(object: any): boolean;
-+        export function isProxy(object: any): boolean;
-+        export function isRegExp(object: any): object is RegExp;
-+        export function isSet(object: any): boolean;
-+        export function isSetIterator(object: any): boolean;
-+        export function isSharedArrayBuffer(object: any): boolean;
-+        export function isStringObject(object: any): boolean;
-+        export function isSymbolObject(object: any): boolean;
-+        export function isTypedArray(object: any): object is Uint8Array | Uint8ClampedArray | Uint16Array | Uint32Array | Int8Array | Int16Array | Int32Array | Float32Array | Float64Array;
-+        export function isUint8Array(object: any): object is Uint8Array;
-+        export function isUint8ClampedArray(object: any): object is Uint8ClampedArray;
-+        export function isUint16Array(object: any): object is Uint16Array;
-+        export function isUint32Array(object: any): object is Uint32Array;
-+        export function isWeakMap(object: any): boolean;
-+        export function isWeakSet(object: any): boolean;
-+        export function isWebAssemblyCompiledModule(object: any): boolean;
-+    }
-+
-     export class TextDecoder {
-         readonly encoding: string;
-         readonly fatal: boolean;
-@@ -5649,11 +6405,16 @@
-         }
- 
-         export function fail(message: string): never;
-+        /** @deprecated since v10.0.0 */
-         export function fail(actual: any, expected: any, message?: string, operator?: string): never;
-         export function ok(value: any, message?: string): void;
-+        /** @deprecated use strictEqual() */
-         export function equal(actual: any, expected: any, message?: string): void;
-+        /** @deprecated use notStrictEqual() */
-         export function notEqual(actual: any, expected: any, message?: string): void;
-+        /** @deprecated use deepStrictEqual() */
-         export function deepEqual(actual: any, expected: any, message?: string): void;
-+        /** @deprecated use notDeepStrictEqual() */
-         export function notDeepEqual(acutal: any, expected: any, message?: string): void;
-         export function strictEqual(actual: any, expected: any, message?: string): void;
-         export function notStrictEqual(actual: any, expected: any, message?: string): void;
-@@ -5671,6 +6432,13 @@
-         export function doesNotThrow(block: Function, error: (err: any) => boolean, message?: string): void;
- 
-         export function ifError(value: any): void;
-+
-+        export function rejects(block: Function | Promise<any>, message?: string): Promise<void>;
-+        export function rejects(block: Function | Promise<any>, error: Function | RegExp | Object | Error, message?: string): Promise<void>;
-+        export function doesNotReject(block: Function | Promise<any>, message?: string): Promise<void>;
-+        export function doesNotReject(block: Function | Promise<any>, error: Function | RegExp | Object | Error, message?: string): Promise<void>;
-+
-+        export var strict: typeof internal;
-     }
- 
-     export = internal;
-@@ -5701,7 +6469,6 @@
-         remove(emitter: events.EventEmitter): void;
-         bind(cb: (err: Error, data: any) => any): any;
-         intercept(cb: (data: any) => any): any;
--        dispose(): void;
-         members: any[];
-         enter(): void;
-         exit(): void;
-@@ -5955,6 +6722,9 @@
-     export var R_OK: number;
-     export var W_OK: number;
-     export var X_OK: number;
-+    export var COPYFILE_EXCL: number;
-+    export var COPYFILE_FICLONE: number;
-+    export var COPYFILE_FICLONE_FORCE: number;
-     export var UV_UDP_REUSEADDR: number;
-     export var SIGQUIT: number;
-     export var SIGTRAP: number;
-@@ -5995,7 +6765,6 @@
-     export = process;
- }
- 
--// tslint:disable-next-line:no-declare-current-package
- declare module "v8" {
-     interface HeapSpaceInfo {
-         space_name: string;
-@@ -6054,15 +6823,11 @@
-      * Returns the asyncId of the current execution context.
-      */
-     export function executionAsyncId(): number;
--    /// @deprecated - replaced by executionAsyncId()
--    export function currentId(): number;
- 
-     /**
-      * Returns the ID of the resource responsible for calling the callback that is currently being executed.
-      */
-     export function triggerAsyncId(): number;
--    /// @deprecated - replaced by triggerAsyncId()
--    export function triggerId(): number;
- 
-     export interface HookCallbacks {
-         /**
-@@ -6149,21 +6914,36 @@
-          * @param type The type of async event.
-          * @param triggerAsyncId The ID of the execution context that created
-          *   this async event (default: `executionAsyncId()`), or an
--         *   AsyncResourceOptions object (since 8.10)
-+         *   AsyncResourceOptions object (since 9.3)
-          */
-         constructor(type: string, triggerAsyncId?: number | AsyncResourceOptions);
- 
-         /**
-          * Call AsyncHooks before callbacks.
-+         * @deprecated since 9.6 - Use asyncResource.runInAsyncScope() instead.
-          */
-         emitBefore(): void;
- 
-         /**
--         * Call AsyncHooks after callbacks
-+         * Call AsyncHooks after callbacks.
-+         * @deprecated since 9.6 - Use asyncResource.runInAsyncScope() instead.
-          */
-         emitAfter(): void;
- 
-         /**
-+         * Call the provided function with the provided arguments in the
-+         * execution context of the async resource. This will establish the
-+         * context, trigger the AsyncHooks before callbacks, call the function,
-+         * trigger the AsyncHooks after callbacks, and then restore the original
-+         * execution context.
-+         * @param fn The function to call in the execution context of this
-+         *   async resource.
-+         * @param thisArg The receiver to be used for the function call.
-+         * @param args Optional arguments to pass to the function.
-+         */
-+        runInAsyncScope<This, Result>(fn: (this: This, ...args: any[]) => Result, thisArg?: This, ...args: any[]): Result;
-+
-+        /**
-          * Call AsyncHooks destroy callbacks.
-          */
-         emitDestroy(): void;
-@@ -6188,8 +6968,19 @@
-     import * as tls from "tls";
-     import * as url from "url";
- 
--    import { IncomingHttpHeaders, OutgoingHttpHeaders } from "http";
--    export { IncomingHttpHeaders, OutgoingHttpHeaders } from "http";
-+    import { IncomingHttpHeaders as Http1IncomingHttpHeaders, OutgoingHttpHeaders } from "http";
-+    export { OutgoingHttpHeaders } from "http";
-+
-+    export interface IncomingHttpStatusHeader {
-+        ":status"?: number;
-+    }
-+
-+    export interface IncomingHttpHeaders extends Http1IncomingHttpHeaders {
-+        ":path"?: string;
-+        ":method"?: string;
-+        ":authority"?: string;
-+        ":scheme"?: string;
-+    }
- 
-     // Http2Stream
- 
-@@ -6232,15 +7023,12 @@
- 
-     export interface Http2Stream extends stream.Duplex {
-         readonly aborted: boolean;
-+        close(code?: number, callback?: () => void): void;
-+        readonly closed: boolean;
-         readonly destroyed: boolean;
-+        readonly pending: boolean;
-         priority(options: StreamPriorityOptions): void;
-         readonly rstCode: number;
--        rstStream(code: number): void;
--        rstWithNoError(): void;
--        rstWithProtocolError(): void;
--        rstWithCancel(): void;
--        rstWithRefuse(): void;
--        rstWithInternalError(): void;
-         readonly session: Http2Session;
-         setTimeout(msecs: number, callback?: () => void): void;
-         readonly state: StreamState;
-@@ -6338,42 +7126,42 @@
- 
-     export interface ClientHttp2Stream extends Http2Stream {
-         addListener(event: string, listener: (...args: any[]) => void): this;
--        addListener(event: "headers", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
-+        addListener(event: "headers", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
-         addListener(event: "push", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
--        addListener(event: "response", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
-+        addListener(event: "response", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
- 
-         emit(event: string | symbol, ...args: any[]): boolean;
--        emit(event: "headers", headers: IncomingHttpHeaders, flags: number): boolean;
-+        emit(event: "headers", headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number): boolean;
-         emit(event: "push", headers: IncomingHttpHeaders, flags: number): boolean;
--        emit(event: "response", headers: IncomingHttpHeaders, flags: number): boolean;
-+        emit(event: "response", headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number): boolean;
- 
-         on(event: string, listener: (...args: any[]) => void): this;
--        on(event: "headers", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
-+        on(event: "headers", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
-         on(event: "push", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
--        on(event: "response", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
-+        on(event: "response", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
- 
-         once(event: string, listener: (...args: any[]) => void): this;
--        once(event: "headers", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
-+        once(event: "headers", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
-         once(event: "push", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
--        once(event: "response", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
-+        once(event: "response", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
- 
-         prependListener(event: string, listener: (...args: any[]) => void): this;
--        prependListener(event: "headers", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
-+        prependListener(event: "headers", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
-         prependListener(event: "push", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
--        prependListener(event: "response", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
-+        prependListener(event: "response", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
- 
-         prependOnceListener(event: string, listener: (...args: any[]) => void): this;
--        prependOnceListener(event: "headers", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
-+        prependOnceListener(event: "headers", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
-         prependOnceListener(event: "push", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
--        prependOnceListener(event: "response", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
-+        prependOnceListener(event: "response", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
-     }
- 
-     export interface ServerHttp2Stream extends Http2Stream {
-         additionalHeaders(headers: OutgoingHttpHeaders): void;
-         readonly headersSent: boolean;
-         readonly pushAllowed: boolean;
--        pushStream(headers: OutgoingHttpHeaders, callback?: (pushStream: ServerHttp2Stream) => void): void;
--        pushStream(headers: OutgoingHttpHeaders, options?: StreamPriorityOptions, callback?: (pushStream: ServerHttp2Stream) => void): void;
-+        pushStream(headers: OutgoingHttpHeaders, callback?: (err: Error | null, pushStream: ServerHttp2Stream, headers: OutgoingHttpHeaders) => void): void;
-+        pushStream(headers: OutgoingHttpHeaders, options?: StreamPriorityOptions, callback?: (err: Error | null, pushStream: ServerHttp2Stream, headers: OutgoingHttpHeaders) => void): void;
-         respond(headers?: OutgoingHttpHeaders, options?: ServerStreamResponseOptions): void;
-         respondWithFD(fd: number, headers?: OutgoingHttpHeaders, options?: ServerStreamFileResponseOptions): void;
-         respondWithFile(path: string, headers?: OutgoingHttpHeaders, options?: ServerStreamFileResponseOptionsWithError): void;
-@@ -6398,13 +7186,6 @@
-         getTrailers?: (trailers: OutgoingHttpHeaders, flags: number) => void;
-     }
- 
--    export interface SessionShutdownOptions {
--        graceful?: boolean;
--        errorCode?: number;
--        lastStreamID?: number;
--        opaqueData?: Buffer | Uint8Array;
--    }
--
-     export interface SessionState {
-         effectiveLocalWindowSize?: number;
-         effectiveRecvDataLength?: number;
-@@ -6418,20 +7199,26 @@
-     }
- 
-     export interface Http2Session extends events.EventEmitter {
--        destroy(): void;
-+        readonly alpnProtocol?: string;
-+        close(callback?: () => void): void;
-+        readonly closed: boolean;
-+        destroy(error?: Error, code?: number): void;
-         readonly destroyed: boolean;
-+        readonly encrypted?: boolean;
-+        goaway(code?: number, lastStreamID?: number, opaqueData?: Buffer | DataView /*| TypedArray*/): void;
-         readonly localSettings: Settings;
-+        readonly originSet?: string[];
-         readonly pendingSettingsAck: boolean;
-+        ref(): void;
-         readonly remoteSettings: Settings;
-         rstStream(stream: Http2Stream, code?: number): void;
-         setTimeout(msecs: number, callback?: () => void): void;
--        shutdown(callback?: () => void): void;
--        shutdown(options: SessionShutdownOptions, callback?: () => void): void;
-         readonly socket: net.Socket | tls.TLSSocket;
-         readonly state: SessionState;
-         priority(stream: Http2Stream, options: StreamPriorityOptions): void;
-         settings(settings: Settings): void;
-         readonly type: number;
-+        unref(): void;
- 
-         addListener(event: string, listener: (...args: any[]) => void): this;
-         addListener(event: "close", listener: () => void): this;
-@@ -6440,7 +7227,6 @@
-         addListener(event: "goaway", listener: (errorCode: number, lastStreamID: number, opaqueData: Buffer) => void): this;
-         addListener(event: "localSettings", listener: (settings: Settings) => void): this;
-         addListener(event: "remoteSettings", listener: (settings: Settings) => void): this;
--        addListener(event: "socketError", listener: (err: Error) => void): this;
-         addListener(event: "timeout", listener: () => void): this;
- 
-         emit(event: string | symbol, ...args: any[]): boolean;
-@@ -6450,7 +7236,6 @@
-         emit(event: "goaway", errorCode: number, lastStreamID: number, opaqueData: Buffer): boolean;
-         emit(event: "localSettings", settings: Settings): boolean;
-         emit(event: "remoteSettings", settings: Settings): boolean;
--        emit(event: "socketError", err: Error): boolean;
-         emit(event: "timeout"): boolean;
- 
-         on(event: string, listener: (...args: any[]) => void): this;
-@@ -6460,7 +7245,6 @@
-         on(event: "goaway", listener: (errorCode: number, lastStreamID: number, opaqueData: Buffer) => void): this;
-         on(event: "localSettings", listener: (settings: Settings) => void): this;
-         on(event: "remoteSettings", listener: (settings: Settings) => void): this;
--        on(event: "socketError", listener: (err: Error) => void): this;
-         on(event: "timeout", listener: () => void): this;
- 
-         once(event: string, listener: (...args: any[]) => void): this;
-@@ -6470,7 +7254,6 @@
-         once(event: "goaway", listener: (errorCode: number, lastStreamID: number, opaqueData: Buffer) => void): this;
-         once(event: "localSettings", listener: (settings: Settings) => void): this;
-         once(event: "remoteSettings", listener: (settings: Settings) => void): this;
--        once(event: "socketError", listener: (err: Error) => void): this;
-         once(event: "timeout", listener: () => void): this;
- 
-         prependListener(event: string, listener: (...args: any[]) => void): this;
-@@ -6480,7 +7263,6 @@
-         prependListener(event: "goaway", listener: (errorCode: number, lastStreamID: number, opaqueData: Buffer) => void): this;
-         prependListener(event: "localSettings", listener: (settings: Settings) => void): this;
-         prependListener(event: "remoteSettings", listener: (settings: Settings) => void): this;
--        prependListener(event: "socketError", listener: (err: Error) => void): this;
-         prependListener(event: "timeout", listener: () => void): this;
- 
-         prependOnceListener(event: string, listener: (...args: any[]) => void): this;
-@@ -6490,7 +7272,6 @@
-         prependOnceListener(event: "goaway", listener: (errorCode: number, lastStreamID: number, opaqueData: Buffer) => void): this;
-         prependOnceListener(event: "localSettings", listener: (settings: Settings) => void): this;
-         prependOnceListener(event: "remoteSettings", listener: (settings: Settings) => void): this;
--        prependOnceListener(event: "socketError", listener: (err: Error) => void): this;
-         prependOnceListener(event: "timeout", listener: () => void): this;
-     }
- 
-@@ -6498,31 +7279,42 @@
-         request(headers?: OutgoingHttpHeaders, options?: ClientSessionRequestOptions): ClientHttp2Stream;
- 
-         addListener(event: string, listener: (...args: any[]) => void): this;
-+        addListener(event: "altsvc", listener: (alt: string, origin: string, stream: number) => void): this;
-         addListener(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
--        addListener(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
-+        addListener(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
- 
-         emit(event: string | symbol, ...args: any[]): boolean;
-+        emit(event: "altsvc", alt: string, origin: string, stream: number): boolean;
-         emit(event: "connect", session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket): boolean;
--        emit(event: "stream", stream: ClientHttp2Stream, headers: IncomingHttpHeaders, flags: number): boolean;
-+        emit(event: "stream", stream: ClientHttp2Stream, headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number): boolean;
- 
-         on(event: string, listener: (...args: any[]) => void): this;
-+        on(event: "altsvc", listener: (alt: string, origin: string, stream: number) => void): this;
-         on(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
--        on(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
-+        on(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
- 
-         once(event: string, listener: (...args: any[]) => void): this;
-+        once(event: "altsvc", listener: (alt: string, origin: string, stream: number) => void): this;
-         once(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
--        once(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
-+        once(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
- 
-         prependListener(event: string, listener: (...args: any[]) => void): this;
-+        prependListener(event: "altsvc", listener: (alt: string, origin: string, stream: number) => void): this;
-         prependListener(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
--        prependListener(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
-+        prependListener(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
- 
-         prependOnceListener(event: string, listener: (...args: any[]) => void): this;
-+        prependOnceListener(event: "altsvc", listener: (alt: string, origin: string, stream: number) => void): this;
-         prependOnceListener(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
--        prependOnceListener(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
-+        prependOnceListener(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
-+    }
-+
-+    export interface AlternativeServiceOptions {
-+        origin: number | string | url.URL;
-     }
- 
-     export interface ServerHttp2Session extends Http2Session {
-+        altsvc(alt: string, originOrStream: number | string | url.URL | AlternativeServiceOptions): void;
-         readonly server: Http2Server | Http2SecureServer;
- 
-         addListener(event: string, listener: (...args: any[]) => void): this;
-@@ -6578,93 +7370,93 @@
- 
-     export interface Http2Server extends net.Server {
-         addListener(event: string, listener: (...args: any[]) => void): this;
-+        addListener(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
-         addListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
-         addListener(event: "sessionError", listener: (err: Error) => void): this;
--        addListener(event: "socketError", listener: (err: Error) => void): this;
-         addListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
-         addListener(event: "timeout", listener: () => void): this;
- 
-         emit(event: string | symbol, ...args: any[]): boolean;
-+        emit(event: "checkContinue", request: Http2ServerRequest, response: Http2ServerResponse): boolean;
-         emit(event: "request", request: Http2ServerRequest, response: Http2ServerResponse): boolean;
-         emit(event: "sessionError", err: Error): boolean;
--        emit(event: "socketError", err: Error): boolean;
-         emit(event: "stream", stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number): boolean;
-         emit(event: "timeout"): boolean;
- 
-         on(event: string, listener: (...args: any[]) => void): this;
-+        on(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
-         on(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
-         on(event: "sessionError", listener: (err: Error) => void): this;
--        on(event: "socketError", listener: (err: Error) => void): this;
-         on(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
-         on(event: "timeout", listener: () => void): this;
- 
-         once(event: string, listener: (...args: any[]) => void): this;
-+        once(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
-         once(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
-         once(event: "sessionError", listener: (err: Error) => void): this;
--        once(event: "socketError", listener: (err: Error) => void): this;
-         once(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
-         once(event: "timeout", listener: () => void): this;
- 
-         prependListener(event: string, listener: (...args: any[]) => void): this;
-+        prependListener(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
-         prependListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
-         prependListener(event: "sessionError", listener: (err: Error) => void): this;
--        prependListener(event: "socketError", listener: (err: Error) => void): this;
-         prependListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
-         prependListener(event: "timeout", listener: () => void): this;
- 
-         prependOnceListener(event: string, listener: (...args: any[]) => void): this;
-+        prependOnceListener(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
-         prependOnceListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
-         prependOnceListener(event: "sessionError", listener: (err: Error) => void): this;
--        prependOnceListener(event: "socketError", listener: (err: Error) => void): this;
-         prependOnceListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
-         prependOnceListener(event: "timeout", listener: () => void): this;
-     }
- 
-     export interface Http2SecureServer extends tls.Server {
-         addListener(event: string, listener: (...args: any[]) => void): this;
-+        addListener(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
-         addListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
-         addListener(event: "sessionError", listener: (err: Error) => void): this;
--        addListener(event: "socketError", listener: (err: Error) => void): this;
-         addListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
-         addListener(event: "timeout", listener: () => void): this;
-         addListener(event: "unknownProtocol", listener: (socket: tls.TLSSocket) => void): this;
- 
-         emit(event: string | symbol, ...args: any[]): boolean;
-+        emit(event: "checkContinue", request: Http2ServerRequest, response: Http2ServerResponse): boolean;
-         emit(event: "request", request: Http2ServerRequest, response: Http2ServerResponse): boolean;
-         emit(event: "sessionError", err: Error): boolean;
--        emit(event: "socketError", err: Error): boolean;
-         emit(event: "stream", stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number): boolean;
-         emit(event: "timeout"): boolean;
-         emit(event: "unknownProtocol", socket: tls.TLSSocket): boolean;
- 
-         on(event: string, listener: (...args: any[]) => void): this;
-+        on(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
-         on(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
-         on(event: "sessionError", listener: (err: Error) => void): this;
--        on(event: "socketError", listener: (err: Error) => void): this;
-         on(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
-         on(event: "timeout", listener: () => void): this;
-         on(event: "unknownProtocol", listener: (socket: tls.TLSSocket) => void): this;
- 
-         once(event: string, listener: (...args: any[]) => void): this;
-+        once(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
-         once(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
-         once(event: "sessionError", listener: (err: Error) => void): this;
--        once(event: "socketError", listener: (err: Error) => void): this;
-         once(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
-         once(event: "timeout", listener: () => void): this;
-         once(event: "unknownProtocol", listener: (socket: tls.TLSSocket) => void): this;
- 
-         prependListener(event: string, listener: (...args: any[]) => void): this;
-+        prependListener(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
-         prependListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
-         prependListener(event: "sessionError", listener: (err: Error) => void): this;
--        prependListener(event: "socketError", listener: (err: Error) => void): this;
-         prependListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
-         prependListener(event: "timeout", listener: () => void): this;
-         prependListener(event: "unknownProtocol", listener: (socket: tls.TLSSocket) => void): this;
- 
-         prependOnceListener(event: string, listener: (...args: any[]) => void): this;
-+        prependOnceListener(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
-         prependOnceListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
-         prependOnceListener(event: "sessionError", listener: (err: Error) => void): this;
--        prependOnceListener(event: "socketError", listener: (err: Error) => void): this;
-         prependOnceListener(event: "stream", listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
-         prependOnceListener(event: "timeout", listener: () => void): this;
-         prependOnceListener(event: "unknownProtocol", listener: (socket: tls.TLSSocket) => void): this;
-@@ -6999,6 +7791,8 @@
- }
- 
- declare module "perf_hooks" {
-+    import { AsyncResource } from "async_hooks";
-+
-     export interface PerformanceEntry {
-         /**
-          * The total number of milliseconds elapsed for this entry.
-@@ -7211,7 +8005,7 @@
- 
-     export type PerformanceObserverCallback = (list: PerformanceObserverEntryList, observer: PerformanceObserver) => void;
- 
--    export class PerformanceObserver {
-+    export class PerformanceObserver extends AsyncResource {
-         constructor(callback: PerformanceObserverCallback);
- 
-         /**
-merged
-  result 100644 fb4dc0deba536f409a3c68f8bfac222d1d34155b src/vs/base/browser/dom.ts
-  our    100644 55d7a57ba6a391c964d03038ed5c842483b5d1f7 src/vs/base/browser/dom.ts
-@@ -812,7 +812,6 @@
- export const EventType = {
- 	// Mouse
- 	CLICK: 'click',
--	AUXCLICK: 'auxclick', // >= Chrome 56
- 	DBLCLICK: 'dblclick',
- 	MOUSE_UP: 'mouseup',
- 	MOUSE_DOWN: 'mousedown',
-merged
-  result 100644 2ffbf6ba29774ebfa3b63f0fa4f0a512d0faf614 src/vs/base/node/extfs.ts
-  our    100644 b52c4e36f0d50b64738354bf296dc8f1052351ff src/vs/base/node/extfs.ts
-@@ -388,7 +388,7 @@
- 			if (error) {
- 				if (isOpen) {
- 					writer.once('close', () => callback(error));
--					writer.close();
-+					writer.destroy();
- 				} else {
- 					callback(error);
- 				}
-@@ -448,10 +448,10 @@
- 					canFlush = false;
- 				}
- 
--				writer.close();
-+				writer.destroy();
- 			});
- 		} else {
--			writer.close();
-+			writer.destroy();
- 		}
- 	});
- 
-merged
-  result 100644 9c495f88edf6673f2521ca37bcfbc6caaca91dbc src/vs/base/node/ps.ts
-  our    100644 fc8c25a115347ff7439f36cde991f728a809fc7b src/vs/base/node/ps.ts
-@@ -60,7 +60,7 @@
- 
- 		function findName(cmd: string): string {
- 
--			const RENDERER_PROCESS_HINT = /--disable-blink-features=Auxclick/;
-+			const SHARED_PROCESS_HINT = /--background-color=#ff0000/;
- 			const WINDOWS_WATCHER_HINT = /\\watcher\\win32\\CodeHelper\.exe/;
- 			const WINDOWS_CRASH_REPORTER = /--crashes-directory/;
- 			const WINDOWS_PTY = /\\pipe\\winpty-control/;
-@@ -91,7 +91,7 @@
- 			let matches = TYPE.exec(cmd);
- 			if (matches && matches.length === 2) {
- 				if (matches[1] === 'renderer') {
--					if (!RENDERER_PROCESS_HINT.exec(cmd)) {
-+					if (SHARED_PROCESS_HINT.exec(cmd)) {
- 						return 'shared-process';
- 					}
- 
-merged
-  result 100644 ac08618b9bb7e15451fdd9f183e626491c55e168 src/vs/base/node/zip.ts
-  our    100644 652fb21c73bc138f81a5df22570bbfe8f60967cd src/vs/base/node/zip.ts
-@@ -86,7 +86,7 @@
- 		stream.pipe(istream);
- 	}, () => {
- 		if (istream) {
--			istream.close();
-+			istream.destroy();
- 		}
- 	}));
- }
-merged
-  result 100644 c03407a9413d14bb5b15a31d84d556cad8553849 src/vs/base/parts/tree/browser/treeView.ts
-  our    100644 6b1e97a1a7f247863b6e4867e10351a2ef228606 src/vs/base/parts/tree/browser/treeView.ts
-@@ -553,7 +553,6 @@
- 		this.viewListeners.push(DOM.addDisposableListener(this.domNode, 'mousedown', (e) => this.onMouseDown(e)));
- 		this.viewListeners.push(DOM.addDisposableListener(this.domNode, 'mouseup', (e) => this.onMouseUp(e)));
- 		this.viewListeners.push(DOM.addDisposableListener(this.wrapper, 'click', (e) => this.onClick(e)));
--		this.viewListeners.push(DOM.addDisposableListener(this.wrapper, 'auxclick', (e) => this.onClick(e))); // >= Chrome 56
- 		this.viewListeners.push(DOM.addDisposableListener(this.domNode, 'contextmenu', (e) => this.onContextMenu(e)));
- 		this.viewListeners.push(DOM.addDisposableListener(this.wrapper, Touch.EventType.Tap, (e) => this.onTap(e)));
- 		this.viewListeners.push(DOM.addDisposableListener(this.wrapper, Touch.EventType.Change, (e) => this.onTouchChange(e)));
-merged
-  result 100644 5b2e51b8bba66fa100e81d25f78f5b8c62219282 src/vs/code/electron-main/auth.ts
-  our    100644 2ac42d5406a4a851e749e5b9fff829d003bccb2a src/vs/code/electron-main/auth.ts
-@@ -56,10 +56,7 @@
- 			width: 450,
- 			height: 220,
- 			show: true,
--			title: 'VS Code',
--			webPreferences: {
--				disableBlinkFeatures: 'Auxclick'
--			}
-+			title: 'VS Code'
- 		};
- 
- 		const focusedWindow = this.windowsMainService.getFocusedWindow();
-merged
-  result 100644 d169c5d21f0307445ab4c1f123bd090695d18a88 src/vs/code/electron-main/sharedProcess.ts
-  our    100644 7f0a1fca2b57c3f32e59c797f508e511672a725e src/vs/code/electron-main/sharedProcess.ts
-@@ -37,7 +37,8 @@
- 				images: false,
- 				webaudio: false,
- 				webgl: false
--			}
-+			},
-+			backgroundColor: '#ff0000' // do NOT change, allows us to identify this window as shared-process in the process explorer
- 		});
- 		const config = assign({
- 			appRoot: this.environmentService.appRoot,
-changed in both
-  base   100644 9f7403ac236c43ab71e4d2ac52bc9c8e93a9f045 src/vs/code/electron-main/window.ts
-  our    100644 98a4328213e146b214e8da866ab92dc7f9c449a9 src/vs/code/electron-main/window.ts
-  their  100644 399ca44daf628f7539f9d9823bcc7ae592e889fd src/vs/code/electron-main/window.ts
-@@ -140,12 +140,16 @@
- 			show: !isFullscreenOrMaximized,
- 			title: product.nameLong,
- 			webPreferences: {
-+<<<<<<< .our
- 				// By default if Code is in the background, intervals and timeouts get throttled, so we
- 				// want to enforce that Code stays in the foreground. This triggers a disable_hidden_
- 				// flag that Electron provides via patch:
- 				// https://github.com/electron/libchromiumcontent/blob/master/patches/common/chromium/disable_hidden.patch
- 				'backgroundThrottling': false,
- 				disableBlinkFeatures: 'Auxclick' // disable auxclick events (see https://developers.google.com/web/updates/2016/10/auxclick)
-+=======
-+				'backgroundThrottling': false, // by default if Code is in the background, intervals and timeouts get throttled,
-+>>>>>>> .their
- 			}
- 		};
- 
-merged
-  result 100644 9fad9a52fe492d14925a568c83966ad0509a8d91 src/vs/editor/browser/services/codeEditorServiceImpl.ts
-  our    100644 aec6b1e4030c7d2800b7bf274e616db80c8ee6a0 src/vs/editor/browser/services/codeEditorServiceImpl.ts
-@@ -212,7 +212,7 @@
- 
- const _CSS_MAP: { [prop: string]: string; } = {
- 	color: 'color:{0} !important;',
--	opacity: 'opacity:{0}; will-change: opacity;', // TODO@Ben: 'will-change: opacity' is a workaround for https://github.com/Microsoft/vscode/issues/52196
-+	opacity: 'opacity:{0};',
- 	backgroundColor: 'background-color:{0};',
- 
- 	outline: 'outline:{0};',
-merged
-  result 100644 84fa5689b5a741654da378ca680f5d95856e4415 src/vs/editor/browser/widget/codeEditorWidget.ts
-  our    100644 6f588e16445e2740e0f36730ce132f1ff91e44d8 src/vs/editor/browser/widget/codeEditorWidget.ts
-@@ -1831,7 +1831,7 @@
- 
- 	const unnecessaryForeground = theme.getColor(editorUnnecessaryCodeOpacity);
- 	if (unnecessaryForeground) {
--		collector.addRule(`.${SHOW_UNUSED_ENABLED_CLASS} .monaco-editor .${ClassName.EditorUnnecessaryInlineDecoration} { opacity: ${unnecessaryForeground.rgba.a}; will-change: opacity; }`); // TODO@Ben: 'will-change: opacity' is a workaround for https://github.com/Microsoft/vscode/issues/52196
-+		collector.addRule(`.${SHOW_UNUSED_ENABLED_CLASS} .monaco-editor .${ClassName.EditorUnnecessaryInlineDecoration} { opacity: ${unnecessaryForeground.rgba.a}; }`);
- 	}
- 
- 	const unnecessaryBorder = theme.getColor(editorUnnecessaryCodeBorder);
-merged
-  result 100644 bc0c32ee323e92adad31c8a7ab4e8c7aa9259b0d src/vs/platform/issue/electron-main/issueService.ts
-  our    100644 cebb4e612373900c38659291fafa9b78f51e1be1 src/vs/platform/issue/electron-main/issueService.ts
-@@ -61,10 +61,7 @@
- 				x: position.x,
- 				y: position.y,
- 				title: localize('issueReporter', "Issue Reporter"),
--				backgroundColor: data.styles.backgroundColor || DEFAULT_BACKGROUND_COLOR,
--				webPreferences: {
--					disableBlinkFeatures: 'Auxclick'
--				}
-+				backgroundColor: data.styles.backgroundColor || DEFAULT_BACKGROUND_COLOR
- 			});
- 
- 			this._issueWindow.setMenuBarVisibility(false); // workaround for now, until a menu is implemented
-@@ -111,10 +108,7 @@
- 				x: position.x,
- 				y: position.y,
- 				backgroundColor: data.styles.backgroundColor,
--				title: localize('processExplorer', "Process Explorer"),
--				webPreferences: {
--					disableBlinkFeatures: 'Auxclick'
--				}
-+				title: localize('processExplorer', "Process Explorer")
- 			});
- 
- 			this._processExplorerWindow.setMenuBarVisibility(false);
-merged
-  result 100644 7c98f4596173b533496835e7244bf603124ab143 src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
-  our    100644 52d0ff4ccf36e18a9e6bb376e85eb8574851026e src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
-@@ -19,14 +19,11 @@
- import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
- import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
- import { ToggleActivityBarVisibilityAction } from 'vs/workbench/browser/actions/toggleActivityBarVisibility';
--import { IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-+import { IThemeService } from 'vs/platform/theme/common/themeService';
- import { ACTIVITY_BAR_BACKGROUND, ACTIVITY_BAR_BORDER, ACTIVITY_BAR_FOREGROUND, ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND, ACTIVITY_BAR_DRAG_AND_DROP_BACKGROUND } from 'vs/workbench/common/theme';
- import { contrastBorder } from 'vs/platform/theme/common/colorRegistry';
- import { CompositeBar } from 'vs/workbench/browser/parts/compositeBar';
--import { isMacintosh } from 'vs/base/common/platform';
--import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
--import { scheduleAtNextAnimationFrame, Dimension, addClass } from 'vs/base/browser/dom';
--import { Color } from 'vs/base/common/color';
-+import { Dimension, addClass } from 'vs/base/browser/dom';
- import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
- import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
- import URI from 'vs/base/common/uri';
-@@ -65,7 +62,6 @@
- 		@IInstantiationService private instantiationService: IInstantiationService,
- 		@IPartService private partService: IPartService,
- 		@IThemeService themeService: IThemeService,
--		@ILifecycleService private lifecycleService: ILifecycleService,
- 		@IStorageService private storageService: IStorageService,
- 		@IExtensionService private extensionService: IExtensionService
- 	) {
-@@ -169,27 +165,6 @@
- 
- 		this.createGlobalActivityActionBar(globalActivities);
- 
--		// TODO@Ben: workaround for https://github.com/Microsoft/vscode/issues/45700
--		// It looks like there are rendering glitches on macOS with Chrome 61 when
--		// using --webkit-mask with a background color that is different from the image
--		// The workaround is to promote the element onto its own drawing layer. We do
--		// this only after the workbench has loaded because otherwise there is ugly flicker.
--		if (isMacintosh) {
--			this.lifecycleService.when(LifecyclePhase.Running).then(() => {
--				scheduleAtNextAnimationFrame(() => { // another delay...
--					scheduleAtNextAnimationFrame(() => { // ...to prevent more flickering on startup
--						registerThemingParticipant((theme, collector) => {
--							const activityBarForeground = theme.getColor(ACTIVITY_BAR_FOREGROUND);
--							if (activityBarForeground && !activityBarForeground.equals(Color.white)) {
--								// only apply this workaround if the color is different from the image one (white)
--								collector.addRule('.monaco-workbench .activitybar > .content .monaco-action-bar .action-label { will-change: transform; }');
--							}
--						});
--					});
--				});
--			});
--		}
--
- 		return content;
- 	}
- 
-merged
-  result 100644 022637f2a1997508511972865d5bec0d1f43080a src/vs/workbench/electron-browser/bootstrap/index.js
-  our    100644 8cbef8ef0a0c1d16b84ce10ca0692af3015de2e2 src/vs/workbench/electron-browser/bootstrap/index.js
-@@ -224,9 +224,8 @@
- 	// Correctly inherit the parent's environment
- 	assign(process.env, configuration.userEnv);
- 
--	// disable pinch zoom & apply zoom level early to avoid glitches
-+	// Apply zoom level early to avoid glitches
- 	const zoomLevel = configuration.zoomLevel;
--	webFrame.setVisualZoomLevelLimits(1, 1);
- 	if (typeof zoomLevel === 'number' && zoomLevel !== 0) {
- 		webFrame.setZoomLevel(zoomLevel);
- 	}
-merged
-  result 100644 94ee33d0ad863d645401c343ebafe18b4f99abc3 src/vs/workbench/parts/webview/electron-browser/webviewElement.ts
-  our    100644 a82c36d8793f3379277319554df1f2ce4b3daa29 src/vs/workbench/parts/webview/electron-browser/webviewElement.ts
-@@ -49,9 +49,6 @@
- 		this._webview = document.createElement('webview');
- 		this._webview.setAttribute('partition', this._options.allowSvgs ? 'webview' : `webview${Date.now()}`);
- 
--		// disable auxclick events (see https://developers.google.com/web/updates/2016/10/auxclick)
--		this._webview.setAttribute('disableblinkfeatures', 'Auxclick');
--
- 		this._webview.setAttribute('disableguestresize', '');
- 		this._webview.setAttribute('webpreferences', 'contextIsolation=yes');
- 
-merged
-  result 100644 1e8e64dde981477dbce16421044e89dd9537684c test/smoke/package.json
-  our    100644 34cb60f37eea12ad56dcd91bda59439f17bd2961 test/smoke/package.json
-@@ -22,7 +22,7 @@
-     "@types/webdriverio": "4.6.1",
-     "concurrently": "^3.5.1",
-     "cpx": "^1.5.0",
--    "electron": "^2.0.6",
-+    "electron": "3.0.0-beta.5",
-     "htmlparser2": "^3.9.2",
-     "mkdirp": "^0.5.1",
-     "mocha": "^5.2.0",
-merged
-  result 100644 19d8e2d5de6e3091a140ee8b63fd45400fbca344 test/smoke/yarn.lock
-  our    100644 57ac002dedb03738167be9a4fbb49ef7aca531db test/smoke/yarn.lock
-@@ -479,42 +479,42 @@
-   dependencies:
-     jsbn "~0.1.0"
- 
--electron-download@^3.0.1:
--  version "3.3.0"
--  resolved "https://registry.yarnpkg.com/electron-download/-/electron-download-3.3.0.tgz#2cfd54d6966c019c4d49ad65fbe65cc9cdef68c8"
-+electron-download@^4.1.0:
-+  version "4.1.0"
-+  resolved "https://registry.yarnpkg.com/electron-download/-/electron-download-4.1.0.tgz#bf932c746f2f87ffcc09d1dd472f2ff6b9187845"
-   dependencies:
-     debug "^2.2.0"
--    fs-extra "^0.30.0"
--    home-path "^1.0.1"
-+    env-paths "^1.0.0"
-+    fs-extra "^2.0.0"
-     minimist "^1.2.0"
-     nugget "^2.0.0"
--    path-exists "^2.1.0"
-+    path-exists "^3.0.0"
-     rc "^1.1.2"
-     semver "^5.3.0"
--    sumchecker "^1.2.0"
-+    sumchecker "^2.0.1"
- 
--electron@^2.0.6:
--  version "2.0.6"
--  resolved "https://registry.yarnpkg.com/electron/-/electron-2.0.6.tgz#8e5c1bd2ebc08fa7a6ee906de3753c1ece9d7300"
-+electron@3.0.0-beta.5:
-+  version "3.0.0-beta.5"
-+  resolved "https://registry.yarnpkg.com/electron/-/electron-3.0.0-beta.5.tgz#06e92b611d3099a03194da34a87133d34ff32851"
-   dependencies:
-     "@types/node" "^8.0.24"
--    electron-download "^3.0.1"
-+    electron-download "^4.1.0"
-     extract-zip "^1.0.3"
- 
- entities@^1.1.1, entities@~1.1.1:
-   version "1.1.1"
-   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
- 
-+env-paths@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-1.0.0.tgz#4168133b42bb05c38a35b1ae4397c8298ab369e0"
-+
- error-ex@^1.2.0:
-   version "1.3.1"
-   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
-   dependencies:
-     is-arrayish "^0.2.1"
- 
--es6-promise@^4.0.5:
--  version "4.1.1"
--  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.1.1.tgz#8811e90915d9a0dba36274f0b242dbda78f9c92a"
--
- escape-string-regexp@1.0.5, escape-string-regexp@^1.0.0:
-   version "1.0.5"
-   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-@@ -629,15 +629,12 @@
-     combined-stream "^1.0.5"
-     mime-types "^2.1.12"
- 
--fs-extra@^0.30.0:
--  version "0.30.0"
--  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.30.0.tgz#f233ffcc08d4da7d432daa449776989db1df93f0"
-+fs-extra@^2.0.0:
-+  version "2.1.2"
-+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-2.1.2.tgz#046c70163cef9aad46b0e4a7fa467fb22d71de35"
-   dependencies:
-     graceful-fs "^4.1.2"
-     jsonfile "^2.1.0"
--    klaw "^1.0.0"
--    path-is-absolute "^1.0.0"
--    rimraf "^2.2.8"
- 
- fs.realpath@^1.0.0:
-   version "1.0.0"
-@@ -720,7 +717,7 @@
-     once "^1.3.0"
-     path-is-absolute "^1.0.0"
- 
--graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
-+graceful-fs@^4.1.2, graceful-fs@^4.1.6:
-   version "4.1.11"
-   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
- 
-@@ -798,10 +795,6 @@
-   version "4.2.0"
-   resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d"
- 
--home-path@^1.0.1:
--  version "1.0.5"
--  resolved "https://registry.yarnpkg.com/home-path/-/home-path-1.0.5.tgz#788b29815b12d53bacf575648476e6f9041d133f"
--
- hosted-git-info@^2.1.4:
-   version "2.5.0"
-   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c"
-@@ -1009,12 +1002,6 @@
-   dependencies:
-     is-buffer "^1.1.5"
- 
--klaw@^1.0.0:
--  version "1.3.1"
--  resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
--  optionalDependencies:
--    graceful-fs "^4.1.9"
--
- load-json-file@^1.0.0:
-   version "1.1.0"
-   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
-@@ -1298,12 +1285,16 @@
-   dependencies:
-     error-ex "^1.2.0"
- 
--path-exists@^2.0.0, path-exists@^2.1.0:
-+path-exists@^2.0.0:
-   version "2.1.0"
-   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
-   dependencies:
-     pinkie-promise "^2.0.0"
- 
-+path-exists@^3.0.0:
-+  version "3.0.0"
-+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
-+
- path-is-absolute@^1.0.0:
-   version "1.0.1"
-   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-@@ -1569,7 +1560,7 @@
-   dependencies:
-     path-parse "^1.0.5"
- 
--rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.6.1:
-+rimraf@2, rimraf@^2.5.1, rimraf@^2.6.1:
-   version "2.6.2"
-   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
-   dependencies:
-@@ -1730,12 +1721,11 @@
-   dependencies:
-     minimist "^1.1.0"
- 
--sumchecker@^1.2.0:
--  version "1.3.1"
--  resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-1.3.1.tgz#79bb3b4456dd04f18ebdbc0d703a1d1daec5105d"
-+sumchecker@^2.0.1:
-+  version "2.0.2"
-+  resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-2.0.2.tgz#0f42c10e5d05da5d42eea3e56c3399a37d6c5b3e"
-   dependencies:
-     debug "^2.2.0"
--    es6-promise "^4.0.5"
- 
- supports-color@5.4.0:
-   version "5.4.0"
-changed in both
-  base   100644 454ff72215dd40f4193dd2bcd378af8a0f4255e0 yarn.lock
-  our    100644 b56aa332449f9eb6db4b03a16548d91df21604bb yarn.lock
-  their  100644 1433c0215318719bf6c503ced27041449743e312 yarn.lock
-@@ -2691,7 +2691,7 @@
-   version "0.1.0"
-   resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add"
- 
--fs-extra@0.26.7, fs-extra@^0.26.5:
-+fs-extra@0.26.7:
-   version "0.26.7"
-   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.26.7.tgz#9ae1fdd94897798edab76d0918cf42d0c3184fa9"
-   dependencies:
-@@ -2708,6 +2708,7 @@
-     graceful-fs "^4.1.2"
-     jsonfile "^2.1.0"
- 
-+<<<<<<< .our
- fs-minipass@^1.2.5:
-   version "1.2.5"
-   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
-@@ -2722,6 +2723,15 @@
-     iferr "^0.1.5"
-     imurmurhash "^0.1.4"
-     readable-stream "1 || 2"
-+=======
-+fs-extra@^7.0.0:
-+  version "7.0.0"
-+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.0.tgz#8cc3f47ce07ef7b3593a11b9fb245f7e34c041d6"
-+  dependencies:
-+    graceful-fs "^4.1.2"
-+    jsonfile "^4.0.0"
-+    universalify "^0.1.0"
-+>>>>>>> .their
- 
- fs.realpath@^1.0.0:
-   version "1.0.0"
-@@ -4166,6 +4176,12 @@
-   optionalDependencies:
-     graceful-fs "^4.1.6"
- 
-+jsonfile@^4.0.0:
-+  version "4.0.0"
-+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
-+  optionalDependencies:
-+    graceful-fs "^4.1.6"
-+
- jsonify@~0.0.0:
-   version "0.0.0"
-   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
-@@ -4983,7 +4999,11 @@
-   version "0.0.7"
-   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
- 
-+<<<<<<< .our
- nan@2.10.0, nan@^2.9.2:
-+=======
-+nan@2.10.0, nan@^2.10.0:
-+>>>>>>> .their
-   version "2.10.0"
-   resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
- 
-@@ -4991,6 +5011,7 @@
-   version "2.8.0"
-   resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a"
- 
-+<<<<<<< .our
- nan@^2.0.0:
-   version "2.9.2"
-   resolved "https://registry.yarnpkg.com/nan/-/nan-2.9.2.tgz#f564d75f5f8f36a6d9456cca7a6c4fe488ab7866"
-@@ -5023,6 +5044,8 @@
-     snapdragon "^0.8.1"
-     to-regex "^3.0.1"
- 
-+=======
-+>>>>>>> .their
- native-is-elevated@^0.2.1:
-   version "0.2.1"
-   resolved "https://registry.yarnpkg.com/native-is-elevated/-/native-is-elevated-0.2.1.tgz#70a2123a8575b9f624a3ef465d98cb74ae017385"
-@@ -5128,7 +5151,7 @@
-   dependencies:
-     is "^3.1.0"
- 
--nodegit-promise@~4.0.0:
-+nodegit-promise@^4.0.0:
-   version "4.0.0"
-   resolved "https://registry.yarnpkg.com/nodegit-promise/-/nodegit-promise-4.0.0.tgz#5722b184f2df7327161064a791d2e842c9167b34"
-   dependencies:
-@@ -5261,7 +5284,7 @@
-   version "3.0.0"
-   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2"
- 
--object-assign@^4.0.0, object-assign@^4.0.1, object-assign@^4.1.0:
-+object-assign@^4.0.0, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
-   version "4.1.1"
-   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
- 
-@@ -5327,6 +5350,7 @@
-   version "1.1.0"
-   resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
- 
-+<<<<<<< .our
- onetime@^2.0.0:
-   version "2.0.1"
-   resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
-@@ -5334,10 +5358,13 @@
-     mimic-fn "^1.0.0"
- 
- oniguruma@^7.0.0:
-+=======
-+oniguruma@bpasero/node-oniguruma#nan-2.10.0:
-+>>>>>>> .their
-   version "7.0.0"
--  resolved "https://registry.yarnpkg.com/oniguruma/-/oniguruma-7.0.0.tgz#cf258a8b1a2ec1d0d68964d6336df264008ebf4c"
-+  resolved "https://codeload.github.com/bpasero/node-oniguruma/tar.gz/ee02dceee2e45f4edf7b1eeef518f5d3ad19a7bd"
-   dependencies:
--    nan "^2.0.9"
-+    nan "^2.10.0"
- 
- optimist@0.3.5:
-   version "0.3.5"
-@@ -5996,6 +6023,7 @@
-   version "1.1.8"
-   resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
- 
-+<<<<<<< .our
- promise-inflight@^1.0.1:
-   version "1.0.1"
-   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
-@@ -6003,8 +6031,14 @@
- promisify-node@^0.3.0:
-   version "0.3.0"
-   resolved "https://registry.yarnpkg.com/promisify-node/-/promisify-node-0.3.0.tgz#b4b55acf90faa7d2b8b90ca396899086c03060cf"
-+=======
-+promisify-node@^0.5.0:
-+  version "0.5.0"
-+  resolved "https://registry.yarnpkg.com/promisify-node/-/promisify-node-0.5.0.tgz#b7115a9d5cd241e939c96e260acda24938d25720"
-+>>>>>>> .their
-   dependencies:
--    nodegit-promise "~4.0.0"
-+    nodegit-promise "^4.0.0"
-+    object-assign "^4.1.1"
- 
- proto-list@~1.2.1:
-   version "1.2.4"
-@@ -7613,6 +7647,10 @@
-     json-stable-stringify "^1.0.0"
-     through2-filter "^2.0.0"
- 
-+universalify@^0.1.0:
-+  version "0.1.2"
-+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
-+
- unpipe@1.0.0, unpipe@~1.0.0:
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
-@@ -7855,9 +7893,9 @@
-     yauzl "^2.3.1"
-     yazl "^2.2.2"
- 
--vscode-chokidar@1.6.2:
--  version "1.6.2"
--  resolved "https://registry.yarnpkg.com/vscode-chokidar/-/vscode-chokidar-1.6.2.tgz#4db06e2d963befe42dd44434212f5b8606b53831"
-+vscode-chokidar@^1.6.2:
-+  version "1.6.3"
-+  resolved "https://registry.yarnpkg.com/vscode-chokidar/-/vscode-chokidar-1.6.3.tgz#69d760870549d53355b570789b514db914d16b9c"
-   dependencies:
-     anymatch "^1.3.0"
-     async-each "^1.0.0"
-@@ -7868,17 +7906,17 @@
-     path-is-absolute "^1.0.0"
-     readdirp "^2.0.0"
-   optionalDependencies:
--    vscode-fsevents "0.3.8"
-+    vscode-fsevents "0.3.9"
- 
- vscode-debugprotocol@1.31.0:
-   version "1.31.0"
-   resolved "https://registry.yarnpkg.com/vscode-debugprotocol/-/vscode-debugprotocol-1.31.0.tgz#8467eeabeea65f52da5ac03b03c18e10e8b95eb4"
- 
--vscode-fsevents@0.3.8:
--  version "0.3.8"
--  resolved "https://registry.yarnpkg.com/vscode-fsevents/-/vscode-fsevents-0.3.8.tgz#389647fa2f6daffedf1b40132a5bb96ac6501521"
-+vscode-fsevents@0.3.9:
-+  version "0.3.9"
-+  resolved "https://registry.yarnpkg.com/vscode-fsevents/-/vscode-fsevents-0.3.9.tgz#edbb66ea2c4eeb102b9194bb602e73bd9512c64c"
-   dependencies:
--    nan "^2.3.0"
-+    nan "^2.10.0"
- 
- vscode-nls-dev@3.1.0:
-   version "3.1.0"
-@@ -7896,25 +7934,25 @@
-     xml2js "^0.4.19"
-     yargs "^10.1.1"
- 
--vscode-nsfw@1.0.17:
--  version "1.0.17"
--  resolved "https://registry.yarnpkg.com/vscode-nsfw/-/vscode-nsfw-1.0.17.tgz#da3820f26aea3a7e95cadc54bd9e5dae3d47e474"
-+vscode-nsfw@Tyriar/vscode-nsfw#electron-3.0.x:
-+  version "1.0.19"
-+  resolved "https://codeload.github.com/Tyriar/vscode-nsfw/tar.gz/a7144a01e246f32d897432921f26fc1cbf2bfba0"
-   dependencies:
--    fs-extra "^0.26.5"
-+    fs-extra "^7.0.0"
-     lodash.isinteger "^4.0.4"
-     lodash.isundefined "^3.0.1"
--    nan "^2.0.0"
--    promisify-node "^0.3.0"
-+    nan "^2.10.0"
-+    promisify-node "^0.5.0"
- 
- vscode-ripgrep@1.1.0:
-   version "1.1.0"
-   resolved "https://registry.yarnpkg.com/vscode-ripgrep/-/vscode-ripgrep-1.1.0.tgz#93c1e39d88342ee1b15530a12898ce930d511948"
- 
--vscode-textmate@^4.0.1:
-+vscode-textmate@Microsoft/vscode-textmate#electron-3.0.x:
-   version "4.0.1"
--  resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-4.0.1.tgz#6c36f28e9059ce12bc34907f7a33ea43166b26a8"
-+  resolved "https://codeload.github.com/Microsoft/vscode-textmate/tar.gz/a29af05076a6ad0d598c00d65fe130fe9b84b164"
-   dependencies:
--    oniguruma "^7.0.0"
-+    oniguruma bpasero/node-oniguruma#nan-2.10.0
- 
- vscode-xterm@3.7.0-beta4:
-   version "3.7.0-beta4"
-@@ -8036,18 +8074,18 @@
-   version "0.1.0"
-   resolved "https://registry.yarnpkg.com/windows-foreground-love/-/windows-foreground-love-0.1.0.tgz#948e4beac0733cd58624710cc09432b7e8bf3521"
- 
--windows-mutex@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/windows-mutex/-/windows-mutex-0.2.0.tgz#3c1fb8aae592810698cf31576a150aa8161894f4"
-+windows-mutex@Microsoft/node-windows-mutex#electron-3.0.x:
-+  version "0.2.1"
-+  resolved "https://codeload.github.com/Microsoft/node-windows-mutex/tar.gz/14c9465655de19aa76d6092d47d0d28b8aff027e"
-   dependencies:
-     bindings "^1.2.1"
--    nan "^2.1.0"
-+    nan "^2.10.0"
- 
--windows-process-tree@0.2.2:
--  version "0.2.2"
--  resolved "https://registry.yarnpkg.com/windows-process-tree/-/windows-process-tree-0.2.2.tgz#1ab2518588d6f389c10e5a6c9c0d5550989506f4"
-+windows-process-tree@Microsoft/vscode-windows-process-tree#electron-3.0.x:
-+  version "0.2.4"
-+  resolved "https://codeload.github.com/Microsoft/vscode-windows-process-tree/tar.gz/11c2f63b412a152a7a40a1c7d2121c76503bbb42"
-   dependencies:
--    nan "^2.6.2"
-+    nan "^2.10.0"
- 
- winreg@^1.2.4:
-   version "1.2.4"
diff --git a/app/test/fixtures/merge-parser/vscode/merge-err-telemetry-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-err-telemetry-into-master.txt
deleted file mode 100644
index d418e8d7952..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-err-telemetry-into-master.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-changed in both
-  base   100644 5c1adfdc994e3fb64a7753c2b1252ec0de7da623 src/vs/base/common/errors.ts
-  our    100644 46b7f230ff80d3c03c6159d5c920eb9b2b996ad6 src/vs/base/common/errors.ts
-  their  100644 ac9452576661dd66c0979863b80e932a00f2d380 src/vs/base/common/errors.ts
-@@ -145,11 +145,24 @@
- 	return undefined;
- }
- 
-+<<<<<<< .our
- export interface SerializedError {
- 	readonly $isError: true;
- 	readonly name: string;
- 	readonly message: string;
- 	readonly stack: string;
-+=======
-+export function onUnexpectedExternalError(e: any): void {
-+
-+	// ignore errors from cancelled promises
-+	if (!isPromiseCanceledError(e)) {
-+		errorHandler.onUnexpectedExternalError(e);
-+	}
-+}
-+
-+export function onUnexpectedPromiseError<T>(promise: TPromise<T>): TPromise<T> {
-+	return promise.then<T>(null, onUnexpectedError);
-+>>>>>>> .their
- }
- 
- export function transformErrorForSerialization(error: Error): SerializedError;
-removed in local
-  base   100644 e4f026e1ad5b388f36cf0a79fd432fb7479603b0 src/vs/editor/contrib/codelens/common/codelens.ts
-  their  100644 884884e65cc86be1ce96b0cb1897917e7f2baaf7 src/vs/editor/contrib/codelens/common/codelens.ts
-removed in local
-  base   100644 22f4be617f1c01097ae60a9eb4c9a74015d187bc src/vs/editor/contrib/format/common/format.ts
-  their  100644 a66ecbf2227eb28554829d10fd8cc8cefdd4dd76 src/vs/editor/contrib/format/common/format.ts
-removed in local
-  base   100644 c5ff86b4116ecacd02e3f8958b66828f79d91ab7 src/vs/editor/contrib/goToDeclaration/common/goToDeclaration.ts
-  their  100644 0d076deae367ae4ae09e52dbf73817edbf3a2832 src/vs/editor/contrib/goToDeclaration/common/goToDeclaration.ts
-removed in local
-  base   100644 2e6864d31973c0bf02f7a0f21ac6d342aa756265 src/vs/editor/contrib/hover/common/hover.ts
-  their  100644 b8c52af4f7f0bc79bd9f48c37c4f4d9330a6b9fd src/vs/editor/contrib/hover/common/hover.ts
-removed in local
-  base   100644 3b5ebe2d052e439467d778287362f57e890a9ed1 src/vs/editor/contrib/links/common/links.ts
-  their  100644 a4f2f2e7f6c23ae15cfdd104591a6b8bfdd305f6 src/vs/editor/contrib/links/common/links.ts
-removed in local
-  base   100644 569aec7ce40001ffacc93c9a68fd168298076c8e src/vs/editor/contrib/parameterHints/common/parameterHints.ts
-  their  100644 9a405aa3875ecaaa1b32c07b746fe07ee7c56f14 src/vs/editor/contrib/parameterHints/common/parameterHints.ts
-removed in local
-  base   100644 a4a1044d03425f0543a34393bd839385f7d04649 src/vs/editor/contrib/quickFix/common/quickFix.ts
-  their  100644 f75967b827490f3f58791598ac1d31a723552f80 src/vs/editor/contrib/quickFix/common/quickFix.ts
-removed in local
-  base   100644 507b21a59d35e9d276dac5d813b091c0fd3fc13a src/vs/editor/contrib/quickOpen/common/quickOpen.ts
-  their  100644 58e759decf60f0647679b8b2ca68ac2b814578e3 src/vs/editor/contrib/quickOpen/common/quickOpen.ts
-removed in local
-  base   100644 54eeb5c217b9d18acf2327035ae1c1a095f86e4d src/vs/editor/contrib/referenceSearch/common/referenceSearch.ts
-  their  100644 a3871998ca0641b53b21b2d1835454d2769bec62 src/vs/editor/contrib/referenceSearch/common/referenceSearch.ts
-removed in local
-  base   100644 3d25d167b6f2f582f0c837606a108c4246dfdee2 src/vs/editor/contrib/rename/common/rename.ts
-  their  100644 20cf763cdd016a7cc1a10cd24f59c42b46b668c9 src/vs/editor/contrib/rename/common/rename.ts
-removed in local
-  base   100644 1019068eee4d54fdd4333deb49b9092fcbf6470b src/vs/editor/contrib/suggest/common/suggest.ts
-  their  100644 c7a1a166cd4a6e18caba40210b7c722657d75751 src/vs/editor/contrib/suggest/common/suggest.ts
-removed in local
-  base   100644 48049ead0cd9c2822d14cdeb6cb9e4cdd2ecdb66 src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.ts
-  their  100644 12757dc84e1a42eabfa5ec865d1ad8012b28b128 src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.ts
diff --git a/app/test/fixtures/merge-parser/vscode/merge-file-ext-tag-telemetry-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-file-ext-tag-telemetry-into-master.txt
deleted file mode 100644
index 2400449af90..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-file-ext-tag-telemetry-into-master.txt
+++ /dev/null
@@ -1,1494 +0,0 @@
-changed in both
-  base   100644 f74918098565c226b0caefe395a4fe02dd4f808f build/builtInExtensions.json
-  our    100644 b3efcd2cc657706605008661521b555c93a32c16 build/builtInExtensions.json
-  their  100644 a3b35277a0d16d4dbbbb572bf484ba9c57d40015 build/builtInExtensions.json
-@@ -1,7 +1,11 @@
- [
- 	{
- 		"name": "ms-vscode.node-debug",
-+<<<<<<< .our
- 		"version": "1.27.2",
-+=======
-+		"version": "1.20.12",
-+>>>>>>> .their
- 		"repo": "https://github.com/Microsoft/vscode-node-debug"
- 	},
- 	{
-changed in both
-  base   100644 d484484cbdc8135cb1ce39535578e49293b8d1a5 extensions/emmet/src/abbreviationActions.ts
-  our    100644 26444af31e5994ebc9cddebb9de151cacae3311b extensions/emmet/src/abbreviationActions.ts
-  their  100644 f03492699697d1e2bdccaffda4d2704a72e145fc extensions/emmet/src/abbreviationActions.ts
-changed in both
-  base   100644 202d73c4c00e72d222b9eab805caef82f43b3b23 extensions/git/package.json
-  our    100644 712f071eb3a07013f5d0d6a279de9bb561020d87 extensions/git/package.json
-  their  100644 72d29e62dadbc2e69b9731158925c86d5b44f1e2 extensions/git/package.json
-@@ -1196,9 +1196,14 @@
-     "byline": "^5.0.0",
-     "file-type": "^7.2.0",
-     "iconv-lite": "0.4.19",
-+<<<<<<< .our
-     "jschardet": "^1.6.0",
-     "vscode-extension-telemetry": "0.0.18",
-     "vscode-nls": "^3.2.4",
-+=======
-+    "vscode-extension-telemetry": "0.0.8",
-+    "vscode-nls": "^3.2.1",
-+>>>>>>> .their
-     "which": "^1.3.0"
-   },
-   "devDependencies": {
-changed in both
-  base   100644 b7c0719c1320935df55831d836c3f25d30208910 extensions/git/package.nls.json
-  our    100644 bc4c812d75bab82c7f66b4ac04102d4914b8efbe extensions/git/package.nls.json
-  their  100644 67005ce9e704345544e20e0d2f83f188b04effa5 extensions/git/package.nls.json
-@@ -80,8 +80,12 @@
- 	"config.decorations.enabled": "Controls whether Git contributes colors and badges to the explorer and the open editors view.",
- 	"config.promptToSaveFilesBeforeCommit": "Controls whether Git should check for unsaved files before committing.",
- 	"config.showInlineOpenFileAction": "Controls whether to show an inline Open File action in the Git changes view.",
-+<<<<<<< .our
- 	"config.showPushSuccessNotification": "Controls whether to show a notification when a push is successful.",
- 	"config.inputValidation": "Controls when to show commit message input validation.",
-+=======
-+	"config.inputValidation": "Controls when to show input validation.",
-+>>>>>>> .their
- 	"config.detectSubmodules": "Controls whether to automatically detect git submodules.",
- 	"colors.added": "Color for added resources.",
- 	"config.detectSubmodulesLimit": "Controls the limit of git submodules detected.",
-changed in both
-  base   100644 f840f51b49fcf3eb31974563d5685c3b98e57c01 extensions/git/yarn.lock
-  our    100644 cf3f64be85380b9d42abc452055ff323ba258bce extensions/git/yarn.lock
-  their  100644 a5348c49a520fa5794b80bedbb776de443cd8cc3 extensions/git/yarn.lock
-@@ -30,13 +30,9 @@
-   version "1.0.28"
-   resolved "https://registry.yarnpkg.com/@types/which/-/which-1.0.28.tgz#016e387629b8817bed653fe32eab5d11279c8df6"
- 
--applicationinsights@1.0.1:
--  version "1.0.1"
--  resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-1.0.1.tgz#53446b830fe8d5d619eee2a278b31d3d25030927"
--  dependencies:
--    diagnostic-channel "0.2.0"
--    diagnostic-channel-publishers "0.2.1"
--    zone.js "0.7.6"
-+applicationinsights@0.18.0:
-+  version "0.18.0"
-+  resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-0.18.0.tgz#162ebb48a383408bc4de44db32b417307f45bbc1"
- 
- balanced-match@^1.0.0:
-   version "1.0.0"
-@@ -73,16 +69,6 @@
-   dependencies:
-     ms "2.0.0"
- 
--diagnostic-channel-publishers@0.2.1:
--  version "0.2.1"
--  resolved "https://registry.yarnpkg.com/diagnostic-channel-publishers/-/diagnostic-channel-publishers-0.2.1.tgz#8e2d607a8b6d79fe880b548bc58cc6beb288c4f3"
--
--diagnostic-channel@0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/diagnostic-channel/-/diagnostic-channel-0.2.0.tgz#cc99af9612c23fb1fff13612c72f2cbfaa8d5a17"
--  dependencies:
--    semver "^5.3.0"
--
- diff@3.2.0:
-   version "3.2.0"
-   resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9"
-@@ -247,21 +233,24 @@
-   version "1.0.1"
-   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
- 
--semver@^5.3.0:
--  version "5.5.0"
--  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
--
- supports-color@3.1.2:
-   version "3.1.2"
-   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"
-   dependencies:
-     has-flag "^1.0.0"
- 
-+<<<<<<< .our
- vscode-extension-telemetry@0.0.18:
-   version "0.0.18"
-   resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.18.tgz#602ba20d8c71453aa34533a291e7638f6e5c0327"
-+=======
-+vscode-extension-telemetry@0.0.8:
-+  version "0.0.8"
-+  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.8.tgz#2261bff986b6690a6f1f746a45ac5bd1f85d29e0"
-+>>>>>>> .their
-   dependencies:
--    applicationinsights "1.0.1"
-+    applicationinsights "0.18.0"
-+    winreg "1.2.3"
- 
- vscode-nls@^3.2.4:
-   version "3.2.4"
-@@ -273,10 +262,10 @@
-   dependencies:
-     isexe "^2.0.0"
- 
-+winreg@1.2.3:
-+  version "1.2.3"
-+  resolved "https://registry.yarnpkg.com/winreg/-/winreg-1.2.3.tgz#93ad116b2696da87d58f7265a8fcea5254a965d5"
-+
- wrappy@1:
-   version "1.0.2"
-   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
--
--zone.js@0.7.6:
--  version "0.7.6"
--  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.7.6.tgz#fbbc39d3e0261d0986f1ba06306eb3aeb0d22009"
-changed in both
-  base   100644 a8bbb91b7613c4e23f075182382e69177815890b extensions/html/package.json
-  our    100644 5bcc9be5877c773efa5d16e5dc79ee66b4fba518 extensions/html/package.json
-  their  100644 d28af119e6f74c48242371546ba9f74aa482714e extensions/html/package.json
-@@ -66,6 +66,18 @@
-         "language": "html",
-         "path": "./snippets/html.snippets.json"
-       }
-+<<<<<<< .our
-     ]
-+=======
-+    }
-+  },
-+  "dependencies": {
-+    "vscode-extension-telemetry": "0.0.8",
-+    "vscode-languageclient": "^3.5.0",
-+    "vscode-nls": "^3.2.1"
-+  },
-+  "devDependencies": {
-+    "@types/node": "7.0.43"
-+>>>>>>> .their
-   }
- }
-removed in local
-  base   100644 47c5c2e51b717cefb936d0f55ab3ae6de64bc62d extensions/html/yarn.lock
-  their  100644 e21fadd6db7c7454df5a669b3560d283a9089f42 extensions/html/yarn.lock
-changed in both
-  base   100644 5b9b79b5c1191566cb7a55573fbf0ad740fc4dd9 extensions/json/package.json
-  our    100644 af9024bfde9123390d1583e73a5ad460ae6c9ea8 extensions/json/package.json
-  their  100644 69a6dcbabaffad169db72a8e25eb0e789f16b13d extensions/json/package.json
-@@ -67,6 +67,92 @@
-         "fileMatch": "*.schema.json",
-         "url": "http://json-schema.org/draft-04/schema#"
-       }
-+<<<<<<< .our
-     ]
-+=======
-+    ],
-+    "configuration": {
-+      "id": "json",
-+      "order": 20,
-+      "type": "object",
-+      "title": "JSON",
-+      "properties": {
-+        "json.schemas": {
-+          "type": "array",
-+          "scope": "resource",
-+          "description": "%json.schemas.desc%",
-+          "items": {
-+            "type": "object",
-+            "default": {
-+              "fileMatch": [
-+                "/myfile"
-+              ],
-+              "url": "schemaURL"
-+            },
-+            "properties": {
-+              "url": {
-+                "type": "string",
-+                "default": "/user.schema.json",
-+                "description": "%json.schemas.url.desc%"
-+              },
-+              "fileMatch": {
-+                "type": "array",
-+                "items": {
-+                  "type": "string",
-+                  "default": "MyFile.json",
-+                  "description": "%json.schemas.fileMatch.item.desc%"
-+                },
-+                "minItems": 1,
-+                "description": "%json.schemas.fileMatch.desc%"
-+              },
-+              "schema": {
-+                "$ref": "http://json-schema.org/draft-04/schema#",
-+                "description": "%json.schemas.schema.desc%"
-+              }
-+            }
-+          }
-+        },
-+        "json.format.enable": {
-+          "type": "boolean",
-+          "scope": "window",
-+          "default": true,
-+          "description": "%json.format.enable.desc%"
-+        },
-+        "json.trace.server": {
-+          "type": "string",
-+          "scope": "window",
-+          "enum": [
-+            "off",
-+            "messages",
-+            "verbose"
-+          ],
-+          "default": "off",
-+          "description": "%json.tracing.desc%"
-+        },
-+        "json.colorDecorators.enable": {
-+          "type": "boolean",
-+          "scope": "window",
-+          "default": true,
-+          "description": "%json.colorDecorators.enable.desc%",
-+          "deprecationMessage": "%json.colorDecorators.enable.deprecationMessage%"
-+        }
-+      }
-+    },
-+    "configurationDefaults": {
-+      "[json]": {
-+        "editor.quickSuggestions": {
-+          "strings": true
-+        }
-+      }
-+    }
-+  },
-+  "dependencies": {
-+    "vscode-extension-telemetry": "0.0.8",
-+    "vscode-languageclient": "^3.5.0",
-+    "vscode-nls": "^3.2.1"
-+  },
-+  "devDependencies": {
-+    "@types/node": "7.0.43"
-+>>>>>>> .their
-   }
- }
-removed in local
-  base   100644 47c5c2e51b717cefb936d0f55ab3ae6de64bc62d extensions/json/yarn.lock
-  their  100644 e21fadd6db7c7454df5a669b3560d283a9089f42 extensions/json/yarn.lock
-removed in local
-  base   100644 ec99b44b91d51d43a7e7ce480c306765798adb13 extensions/markdown/package.json
-  their  100644 f6961eed26e7fe612bc24ab427a2c3d45020a34b extensions/markdown/package.json
-removed in local
-  base   100644 b1ed9e8c9a1b99a6ba7c6cc731578b6f759010f4 extensions/markdown/yarn.lock
-  their  100644 c88a44add56d5e4ce96e482d176b22c2afa43bc9 extensions/markdown/yarn.lock
-changed in both
-  base   100644 146b7fd061a9878ab2b1741dd96d98df6904b124 extensions/merge-conflict/package.json
-  our    100644 81b65c21ac62f3d1237abb6a363f0644349d8408 extensions/merge-conflict/package.json
-  their  100644 9445d17a812bf2334d997119e66109339acebdb3 extensions/merge-conflict/package.json
-@@ -100,7 +100,12 @@
-     }
-   },
-   "dependencies": {
-+<<<<<<< .our
-     "vscode-nls": "^3.2.4"
-+=======
-+    "vscode-extension-telemetry": "0.0.8",
-+    "vscode-nls": "^3.2.1"
-+>>>>>>> .their
-   },
-   "devDependencies": {
-     "@types/node": "8.0.33"
-changed in both
-  base   100644 74ebd7c4fcfcc1dc36d48a77d0aefa622f17c905 extensions/merge-conflict/yarn.lock
-  our    100644 5b1dccc447c34e2e61ebbf9b7966bc495f7fb97f extensions/merge-conflict/yarn.lock
-  their  100644 ecb3d8de216c9e7eab37a06453f22837e894a46e extensions/merge-conflict/yarn.lock
-@@ -6,6 +6,27 @@
-   version "8.0.33"
-   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.33.tgz#1126e94374014e54478092830704f6ea89df04cd"
- 
-+<<<<<<< .our
- vscode-nls@^3.2.4:
-   version "3.2.4"
-   resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398"
-+=======
-+applicationinsights@0.18.0:
-+  version "0.18.0"
-+  resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-0.18.0.tgz#162ebb48a383408bc4de44db32b417307f45bbc1"
-+
-+vscode-extension-telemetry@0.0.8:
-+  version "0.0.8"
-+  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.8.tgz#2261bff986b6690a6f1f746a45ac5bd1f85d29e0"
-+  dependencies:
-+    applicationinsights "0.18.0"
-+    winreg "1.2.3"
-+
-+vscode-nls@^3.2.1:
-+  version "3.2.1"
-+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.1.tgz#b1f3e04e8a94a715d5a7bcbc8339c51e6d74ca51"
-+
-+winreg@1.2.3:
-+  version "1.2.3"
-+  resolved "https://registry.yarnpkg.com/winreg/-/winreg-1.2.3.tgz#93ad116b2696da87d58f7265a8fcea5254a965d5"
-+>>>>>>> .their
-removed in local
-  base   100644 3a94a50c4c3c3c9116c117b5b65f1d827692a71a extensions/typescript/package.json
-  their  100644 e876f7e3be79aaf2a54ab9ffcd5cf6b737601cbc extensions/typescript/package.json
-removed in local
-  base   100644 0fcc8a28cac0b15db4afa7fd7a682bc5d5b516e2 extensions/typescript/yarn.lock
-  their  100644 9e1bb7b96b0f41ffb035e7126b71468805a46796 extensions/typescript/yarn.lock
-changed in both
-  base   100644 d2cd7701ffb1504dda1860dbe1224113422b13dd package.json
-  our    100644 d0e982ce0b76c5b1b5eb02b673e459e47f3353a4 package.json
-  their  100644 b366410af4c11ebc6ef919d3178b75d13f501561 package.json
-@@ -1,7 +1,12 @@
- {
-   "name": "code-oss-dev",
-+<<<<<<< .our
-   "version": "1.27.0",
-   "distro": "a4155d9780fbbc94ead6cb3017dd0fc3806c57b8",
-+=======
-+  "version": "1.20.0",
-+  "distro": "4f4765e9dc2643798d3f9910ee585e09427081b3",
-+>>>>>>> .their
-   "author": {
-     "name": "Microsoft Corporation"
-   },
-changed in both
-  base   100644 400b8610977e771f443c1c0a21129eea48db5042 src/vs/code/electron-browser/issue/issueReporterMain.ts
-  our    100644 2e25cb33248a3d343edf9a79d532a58614f0a2b1 src/vs/code/electron-browser/issue/issueReporterMain.ts
-  their  100644 c0676aa709203ee235d1de62f04026299fb243f8 src/vs/code/electron-browser/issue/issueReporterMain.ts
-@@ -51,6 +51,8 @@
- 	state?: string;
- }
- 
-+const MAX_URL_LENGTH = 5400;
-+
- export interface IssueReporterConfiguration extends IWindowConfiguration {
- 	data: IssueReporterData;
- 	features: IssueReporterFeatures;
-@@ -68,12 +70,18 @@
- 	private telemetryService: ITelemetryService;
- 	private logService: ILogService;
- 	private issueReporterModel: IssueReporterModel;
-+<<<<<<< .our
- 	private numberOfSearchResultsDisplayed = 0;
- 	private receivedSystemInfo = false;
- 	private receivedPerformanceInfo = false;
- 	private shouldQueueSearch = false;
- 
- 	private previewButton: Button;
-+=======
-+	private shouldQueueSearch = true;
-+	private receivedSystemInfo = false;
-+	private receivedPerformanceInfo = false;
-+>>>>>>> .their
- 
- 	constructor(configuration: IssueReporterConfiguration) {
- 		super();
-@@ -89,10 +97,14 @@
- 			extensionsDisabled: !!this.environmentService.disableExtensions,
- 		});
- 
-+<<<<<<< .our
- 		this.previewButton = new Button(document.getElementById('issue-reporter'));
- 
- 		ipcRenderer.on('issuePerformanceInfoResponse', (event, info) => {
- 			this.logService.trace('issueReporter: Received performance data');
-+=======
-+		ipcRenderer.on('issuePerformanceInfoResponse', (event, info) => {
-+>>>>>>> .their
- 			this.issueReporterModel.update(info);
- 			this.receivedPerformanceInfo = true;
- 
-@@ -101,21 +113,33 @@
- 			this.updateWorkspaceInfo(state);
- 			this.updatePreviewButtonState();
- 		});
-+<<<<<<< .our
- 
- 		ipcRenderer.on('issueSystemInfoResponse', (event, info) => {
- 			this.logService.trace('issueReporter: Received system data');
- 			this.issueReporterModel.update({ systemInfo: info });
- 			this.receivedSystemInfo = true;
- 
-+=======
-+
-+		ipcRenderer.on('issueSystemInfoResponse', (event, info) => {
-+			this.issueReporterModel.update({ systemInfo: info });
-+			this.receivedSystemInfo = true;
-+
-+>>>>>>> .their
- 			this.updateSystemInfo(this.issueReporterModel.getData());
- 			this.updatePreviewButtonState();
- 		});
- 
- 		ipcRenderer.send('issueSystemInfoRequest');
-+<<<<<<< .our
- 		if (configuration.data.issueType === IssueType.PerformanceIssue) {
- 			ipcRenderer.send('issuePerformanceInfoRequest');
- 		}
- 		this.logService.trace('issueReporter: Sent data requests');
-+=======
-+		ipcRenderer.send('issuePerformanceInfoRequest');
-+>>>>>>> .their
- 
- 		if (window.document.documentElement.lang !== 'en') {
- 			show(document.getElementById('english'));
-@@ -304,12 +328,17 @@
- 	}
- 
- 	private setEventHandlers(): void {
-+<<<<<<< .our
- 		this.addEventListener('issue-type', 'change', (event: Event) => {
- 			const issueType = parseInt((<HTMLInputElement>event.target).value);
- 			this.issueReporterModel.update({ issueType: issueType });
- 			if (issueType === IssueType.PerformanceIssue && !this.receivedPerformanceInfo) {
- 				ipcRenderer.send('issuePerformanceInfoRequest');
- 			}
-+=======
-+		document.getElementById('issue-type').addEventListener('change', (event: Event) => {
-+			this.issueReporterModel.update({ issueType: parseInt((<HTMLInputElement>event.target).value) });
-+>>>>>>> .their
- 			this.updatePreviewButtonState();
- 			this.render();
- 		});
-@@ -353,6 +382,7 @@
- 			}
- 		});
- 
-+<<<<<<< .our
- 		this.addEventListener('description', 'input', (event: Event) => {
- 			const issueDescription = (<HTMLInputElement>event.target).value;
- 			this.issueReporterModel.update({ issueDescription });
-@@ -362,6 +392,10 @@
- 				const title = (<HTMLInputElement>document.getElementById('issue-title')).value;
- 				this.searchVSCodeIssues(title, issueDescription);
- 			}
-+=======
-+		document.getElementById('description').addEventListener('input', (event: Event) => {
-+			this.issueReporterModel.update({ issueDescription: (<HTMLInputElement>event.target).value });
-+>>>>>>> .their
- 		});
- 
- 		this.addEventListener('issue-title', 'input', (e) => {
-@@ -383,16 +417,27 @@
- 
- 		this.previewButton.onDidClick(() => this.createIssue());
- 
-+<<<<<<< .our
- 		this.addEventListener('disableExtensions', 'click', () => {
- 			ipcRenderer.send('workbenchCommand', 'workbench.action.reloadWindowWithExtensionsDisabled');
- 		});
- 
- 		this.addEventListener('disableExtensions', 'keydown', (e: KeyboardEvent) => {
- 			e.stopPropagation();
-+=======
-+		const disableExtensions = document.getElementById('disableExtensions');
-+		disableExtensions.addEventListener('click', () => {
-+			ipcRenderer.send('workbenchCommand', 'workbench.extensions.action.disableAll');
-+			ipcRenderer.send('workbenchCommand', 'workbench.action.reloadWindow');
-+		});
-+
-+		disableExtensions.addEventListener('keydown', (e) => {
-+>>>>>>> .their
- 			if (e.keyCode === 13 || e.keyCode === 32) {
- 				ipcRenderer.send('workbenchCommand', 'workbench.extensions.action.disableAll');
- 				ipcRenderer.send('workbenchCommand', 'workbench.action.reloadWindow');
- 			}
-+<<<<<<< .our
- 		});
- 
- 		document.onkeydown = (e: KeyboardEvent) => {
-@@ -401,6 +446,29 @@
- 			if (cmdOrCtrlKey && e.keyCode === 13) {
- 				if (this.createIssue()) {
- 					remote.getCurrentWindow().close();
-+=======
-+		});
-+
-+		const showRunning = document.getElementById('showRunning');
-+		showRunning.addEventListener('click', () => {
-+			ipcRenderer.send('workbenchCommand', 'workbench.action.showRuntimeExtensions');
-+		});
-+
-+		showRunning.addEventListener('keydown', (e) => {
-+			if (e.keyCode === 13 || e.keyCode === 32) {
-+				ipcRenderer.send('workbenchCommand', 'workbench.action.showRuntimeExtensions');
-+			}
-+		});
-+
-+		// Cmd+Enter or Mac or Ctrl+Enter on other platforms previews issue and closes window
-+		if (platform.isMacintosh) {
-+			let prevKeyWasCommand = false;
-+			document.onkeydown = (e: KeyboardEvent) => {
-+				if (prevKeyWasCommand && e.keyCode === 13) {
-+					if (this.createIssue()) {
-+						remote.getCurrentWindow().close();
-+					}
-+>>>>>>> .their
- 				}
- 			}
- 
-@@ -475,6 +543,7 @@
- 		}
- 	}
- 
-+<<<<<<< .our
- 	private searchExtensionIssues(title: string): void {
- 		const url = this.getExtensionGitHubUrl();
- 		if (title) {
-@@ -499,6 +568,34 @@
- 		const similarIssues = document.getElementById('similar-issues');
- 		similarIssues.innerHTML = '';
- 		this.numberOfSearchResultsDisplayed = 0;
-+=======
-+	private updatePreviewButtonState() {
-+		const submitButton = <HTMLButtonElement>document.getElementById('github-submit-btn');
-+		if (this.isPreviewEnabled()) {
-+			submitButton.disabled = false;
-+			submitButton.textContent = localize('previewOnGitHub', "Preview on GitHub");
-+		} else {
-+			submitButton.disabled = true;
-+			submitButton.textContent = localize('loadingData', "Loading data...");
-+		}
-+	}
-+
-+	private isPreviewEnabled() {
-+		const issueType = this.issueReporterModel.getData().issueType;
-+		if (issueType === IssueType.Bug && this.receivedSystemInfo) {
-+			return true;
-+		}
-+
-+		if (issueType === IssueType.PerformanceIssue && this.receivedSystemInfo && this.receivedPerformanceInfo) {
-+			return true;
-+		}
-+
-+		if (issueType === IssueType.FeatureRequest) {
-+			return true;
-+		}
-+
-+		return false;
-+>>>>>>> .their
- 	}
- 
- 	@debounce(300)
-@@ -669,6 +766,7 @@
- 		hide(problemSourceHelpText);
- 		hide(extensionSelector);
- 
-+
- 		if (issueType === IssueType.Bug) {
- 			show(blockContainer);
- 			show(systemBlock);
-@@ -690,18 +788,30 @@
- 			show(workspaceBlock);
- 			show(problemSource);
- 
-+<<<<<<< .our
- 			if (fileOnExtension) {
- 				show(extensionSelector);
- 			} else {
- 				show(extensionsBlock);
- 				show(problemSourceHelpText);
- 			}
-+=======
-+			descriptionTitle.innerHTML = `${localize('stepsToReproduce', "Steps to Reproduce")} <span class="required-input">*</span>`;
-+			descriptionSubtitle.innerHTML = localize('performanceIssueDesciption', "When did this performance issue happen? Does it occur on startup or after a specific series of actions? We support GitHub-flavored Markdown. You will be able to edit your issue and add screenshots when we preview it on GitHub.");
-+		} else {
-+			hide(systemBlock);
-+			hide(processBlock);
-+			hide(workspaceBlock);
-+			hide(extensionsBlock);
-+			hide(disabledExtensions);
-+>>>>>>> .their
- 
- 			descriptionTitle.innerHTML = `${localize('stepsToReproduce', "Steps to Reproduce")} <span class="required-input">*</span>`;
- 			descriptionSubtitle.innerHTML = localize('performanceIssueDesciption', "When did this performance issue happen? Does it occur on startup or after a specific series of actions? We support GitHub-flavored Markdown. You will be able to edit your issue and add screenshots when we preview it on GitHub.");
- 		} else if (issueType === IssueType.FeatureRequest) {
- 			descriptionTitle.innerHTML = `${localize('description', "Description")} <span class="required-input">*</span>`;
- 			descriptionSubtitle.innerHTML = localize('featureRequestDescription', "Please describe the feature you would like to see. We support GitHub-flavored Markdown. You will be able to edit your issue and add screenshots when we preview it on GitHub.");
-+<<<<<<< .our
- 			show(problemSource);
- 
- 			if (fileOnExtension) {
-@@ -714,6 +824,8 @@
- 
- 			descriptionTitle.innerHTML = `${localize('expectedResults', "Expected Results")} <span class="required-input">*</span>`;
- 			descriptionSubtitle.innerHTML = localize('settingsSearchResultsDescription', "Please list the results that you were expecting to see when you searched with this query. We support GitHub-flavored Markdown. You will be able to edit your issue and add screenshots when we preview it on GitHub.");
-+=======
-+>>>>>>> .their
- 		}
- 	}
- 
-@@ -775,19 +887,36 @@
- 		*/
- 		this.telemetryService.publicLog('issueReporterSubmit', { issueType: this.issueReporterModel.getData().issueType, numSimilarIssuesDisplayed: this.numberOfSearchResultsDisplayed });
- 
-+<<<<<<< .our
- 		const baseUrl = this.getIssueUrlWithTitle((<HTMLInputElement>document.getElementById('issue-title')).value);
-+=======
-+		const issueTitle = encodeURIComponent((<HTMLInputElement>document.getElementById('issue-title')).value);
-+		const queryStringPrefix = product.reportIssueUrl.indexOf('?') === -1 ? '?' : '&';
-+		const baseUrl = `${product.reportIssueUrl}${queryStringPrefix}title=${issueTitle}&body=`;
-+>>>>>>> .their
- 		const issueBody = this.issueReporterModel.serialize();
- 		let url = baseUrl + `&body=${encodeURIComponent(issueBody)}`;
- 
-+<<<<<<< .our
- 		if (url.length > MAX_URL_LENGTH) {
- 			clipboard.writeText(issueBody);
- 			url = baseUrl + `&body=${encodeURIComponent(localize('pasteData', "We have written the needed data into your clipboard because it was too large to send. Please paste."))}`;
-+=======
-+		const lengthValidationElement = document.getElementById('url-length-validation-error');
-+		if (url.length > MAX_URL_LENGTH) {
-+			lengthValidationElement.textContent = localize('urlLengthError', "The data exceeds the length limit of {0} characters. The data is length {1}.", MAX_URL_LENGTH, url.length);
-+			show(lengthValidationElement);
-+			return false;
-+		} else {
-+			hide(lengthValidationElement);
-+>>>>>>> .their
- 		}
- 
- 		shell.openExternal(url);
- 		return true;
- 	}
- 
-+<<<<<<< .our
- 	private getExtensionGitHubUrl(): string {
- 		let repositoryUrl = '';
- 		const bugsUrl = this.getExtensionBugsUrl();
-@@ -815,6 +944,8 @@
- 		return `${repositoryUrl}${queryStringPrefix}title=${encodeURIComponent(issueTitle)}`;
- 	}
- 
-+=======
-+>>>>>>> .their
- 	private updateSystemInfo = (state) => {
- 		const target = document.querySelector('.block-system .block-info');
- 		let tableHtml = '';
-changed in both
-  base   100644 86d5a0afc344211db40807ec5ceb13e6aaeae8bd src/vs/code/electron-browser/issue/issueReporterPage.ts
-  our    100644 afa0c79c4b86524a7065a34520049d4f1bbdcf14 src/vs/code/electron-browser/issue/issueReporterPage.ts
-  their  100644 14742da3b7362f75ce9c58b70fa09ef428bf6705 src/vs/code/electron-browser/issue/issueReporterPage.ts
-@@ -13,12 +13,28 @@
- 
- 	<div class="section">
- 		<div class="input-group">
-+<<<<<<< .our
- 			<label class="inline-label" for="issue-type">${escape(localize('issueTypeLabel', "This is a"))}</label>
- 			<select id="issue-type" class="inline-form-control">
-+=======
-+			<label id="issue-type-label" class="inline-form-control" for="issue-type">${escape(localize('issueTypeLabel', "This is a"))}</label>
-+			<select id="issue-type" class="inline-form-control">
-+				<option value="0">${escape(localize('bugReporter', "Bug Report"))}</option>
-+				<option value="1">${escape(localize('performanceIssue', "Performance Issue"))}</option>
-+				<option value="2">${escape(localize('featureRequest', "Feature Request"))}</option>
-+			</select>
-+		</div>
-+
-+		<div class="input-group">
-+			<label id="issue-title-label" for="issue-title">${escape(localize('issueTitleLabel', "Title"))} <span class="required-input">*</span></label>
-+			<input id="issue-title" type="text" class="inline-form-control" placeholder="${escape(localize('issueTitleRequired', "Please enter a title."))}" required>
-+			<small id="similar-issues">
-+>>>>>>> .their
- 				<!-- To be dynamically filled -->
- 			</select>
- 		</div>
- 
-+<<<<<<< .our
- 		<div class="input-group" id="problem-source">
- 			<label class="inline-label" for="issue-source">${escape(localize('issueSourceLabel', "File on"))}</label>
- 			<select id="issue-source" class="inline-form-control">
-@@ -34,9 +50,71 @@
- 				<select id="extension-selector" class="inline-form-control">
- 					<!-- To be dynamically filled -->
- 				</select>
-+=======
-+	<div class="system-info">
-+		<div id="block-container">
-+			<div class="block block-system">
-+				<details>
-+					<summary>${escape(localize('systemInfo', "My System Info"))}
-+						<div class="include-data">
-+							<input class="sendData" type="checkbox" id="includeSystemInfo" checked>
-+								<label class="caption" for="includeSystemInfo">${escape(localize('sendData', "Send my data"))}</label>
-+							</input>
-+						</div>
-+					</summary>
-+					<div class="block-info">
-+						<!-- To be dynamically filled -->
-+					</div>
-+				</details>
-+			</div>
-+			<div class="block block-process">
-+				<details>
-+					<summary>${escape(localize('processes', "Currently Running Processes"))}
-+						<div class="include-data">
-+							<input class="sendData"  type="checkbox" id="includeProcessInfo" checked>
-+								<label class="caption" for="includeProcessInfo">${escape(localize('sendData', "Send my data"))}</label>
-+							</input>
-+						</div>
-+					</summary>
-+					<div class="block-info">
-+						<!-- To be dynamically filled -->
-+					</div>
-+				</details>
-+			</div>
-+			<div class="block block-workspace">
-+				<details>
-+					<summary>${escape(localize('workspaceStats', "My Workspace Stats"))}
-+						<div class="include-data">
-+							<input class="sendData"  type="checkbox" id="includeWorkspaceInfo" checked>
-+								<label class="caption" for="includeWorkspaceInfo">${escape(localize('sendData', "Send my data"))}</label>
-+							</input>
-+						</div>
-+					</summary>
-+					<pre class="block-info">
-+						<code>
-+							<!-- To be dynamically filled -->
-+						</code>
-+					</pre>
-+				</details>
-+			</div>
-+			<div class="block block-extensions">
-+				<details>
-+					<summary>${escape(localize('extensions', "My Extensions"))}
-+						<div class="include-data">
-+							<input class="sendData"  type="checkbox" id="includeExtensions" checked>
-+								<label class="caption" for="includeExtensions">${escape(localize('sendData', "Send my data"))}</label>
-+							</input>
-+						</div>
-+					</summary>
-+					<div class="block-info">
-+						<!-- To be dynamically filled -->
-+					</div>
-+				</details>
-+>>>>>>> .their
- 			</div>
- 		</div>
- 
-+<<<<<<< .our
- 		<div class="input-group">
- 			<label class="inline-label" for="issue-title">${escape(localize('issueTitleLabel', "Title"))} <span class="required-input">*</span></label>
- 			<input id="issue-title" type="text" class="inline-form-control" placeholder="${escape(localize('issueTitleRequired', "Please enter a title."))}" required>
-@@ -44,6 +122,25 @@
- 			<small id="similar-issues">
- 				<!-- To be dynamically filled -->
- 			</small>
-+=======
-+	<div class="section">
-+		<div id="disabledExtensions">
-+			<div class="extensions-form">
-+				<label>${escape(localize('tryDisablingExtensions', "Is the problem reproducible when extensions are disabled?"))}</label>
-+				<div class="form-buttons">
-+					<div class="choice">
-+						<input type="radio" id="reproducesWithoutExtensions" value=true name="reprosWithoutExtensions" />
-+						<label for="reproducesWithoutExtensions">${escape(localize('yes', "Yes"))}</label>
-+					</div>
-+					<div class="choice">
-+						<input type="radio" id="reproducesWithExtensions" value=false name="reprosWithoutExtensions" checked/>
-+						<label for="reproducesWithExtensions">${escape(localize('no', "No"))}</label>
-+					</div>
-+				</div>
-+			</div>
-+			<div class="instructions">${escape(localize('disableExtensionsLabel', "Try to reproduce the problem after "))}<span tabIndex=0 role="button" id="disableExtensions" class="workbenchCommand">${escape(localize('disableExtensions', "disabling all extensions and reloading the window"))}</span>.</div>
-+			<div class="instructions">${escape(localize('showRunningExtensionsLabel', "If you suspect it's an extension issue, "))}<span tabIndex=0 role="button"id="showRunning" class="workbenchCommand">${escape(localize('showRunningExtensions', "see all running extensions"))}</span>.</div>
-+>>>>>>> .their
- 		</div>
- 
- 	</div>
-@@ -56,7 +153,11 @@
- 			<!-- To be dynamically filled -->
- 		</div>
- 		<div class="block-info-text">
-+<<<<<<< .our
- 			<textarea name="description" id="description" placeholder="${escape(localize('details', "Please enter details."))}" required></textarea>
-+=======
-+			<textarea name="description" id="description" cols="100" rows="12" placeholder="${escape(localize('details', "Please enter details."))}" required></textarea>
-+>>>>>>> .their
- 		</div>
- 	</div>
- 
-changed in both
-  base   100644 b0da6839f0ee6dec0e298b5475601cfbef9e151f src/vs/code/electron-browser/issue/media/issueReporter.css
-  our    100644 aeb02c73f2bd814e5226d69fd77698600c612772 src/vs/code/electron-browser/issue/media/issueReporter.css
-  their  100644 e5e13bf685f73db3a6ae0665d174c72fcb920401 src/vs/code/electron-browser/issue/media/issueReporter.css
-@@ -33,7 +33,16 @@
- }
- 
- .section {
-+<<<<<<< .our
- 	margin-bottom: .5em;
-+=======
-+	margin-bottom: 1.5em;
-+}
-+
-+#similar-issues {
-+	margin-left: 10%;
-+	display: block;
-+>>>>>>> .their
- }
- 
- /**
-@@ -50,6 +59,13 @@
- 	border: 1px solid #ced4da;
- }
- 
-+<<<<<<< .our
-+=======
-+.inline-form-control {
-+	display: inline-block !important;
-+}
-+
-+>>>>>>> .their
- textarea {
- 	overflow: auto;
- 	resize: vertical;
-@@ -108,7 +124,11 @@
- 
- .block .block-info {
- 	width: 100%;
-+<<<<<<< .our
- 	font-family: Monaco, Menlo, Consolas, "Droid Sans Mono", "Inconsolata", "Courier New", monospace, "Droid Sans Fallback";
-+=======
-+	font-family: 'Menlo', 'Courier New', 'Courier', monospace;
-+>>>>>>> .their
- 	font-size: 12px;
- 	overflow: auto;
- 	overflow-wrap: break-word;
-@@ -168,8 +188,40 @@
- 	margin-bottom: 1em;
- }
- 
-+<<<<<<< .our
- #extension-selection {
- 	margin-top: 1em;
-+=======
-+.extensions-form {
-+	display: flex;
-+}
-+
-+.extensions-form > .form-buttons {
-+	display: flex;
-+	margin-left: 20px;
-+}
-+
-+.extensions-form > .form-buttons > .choice {
-+	margin-right: 35px;
-+	position: relative;
-+}
-+
-+.extensions-form > .form-buttons > .choice > label, .extensions-form  > .form-buttons > .choice > input {
-+	cursor: pointer;
-+	height: 100%;
-+	margin-top: 1px;
-+}
-+
-+.extensions-form > .form-buttons > .choice > label {
-+	position: absolute;
-+	top: 50%;
-+	margin-top: -50%;
-+	left: 20px;
-+}
-+
-+.system-info {
-+	margin-bottom: 1.25em;
-+>>>>>>> .their
- }
- 
- select, input, textarea {
-@@ -177,12 +229,40 @@
- 	margin-top: 10px;
- }
- 
-+<<<<<<< .our
-+=======
-+summary {
-+	border: 1px solid transparent;
-+	padding: 0 10px;
-+	margin-bottom: 5px;
-+}
-+>>>>>>> .their
- 
- .validation-error {
- 	font-size: 12px;
- 	margin-top: 1em;
- }
- 
-+<<<<<<< .our
-+=======
-+.include-data {
-+	display: inline-block;
-+	position: relative;
-+}
-+
-+.include-data > .caption {
-+	display: inline-block;
-+	font-size: 12px;
-+	position: absolute;
-+	width: 80px;
-+	top: 2px;
-+	left: 30px;
-+}
-+
-+.sendData {
-+	margin-left: 1em;
-+}
-+>>>>>>> .their
- 
- input[type="checkbox"] {
- 	width: auto;
-@@ -206,6 +286,7 @@
- 	margin-top: .5em;
- }
- 
-+<<<<<<< .our
- a, .workbenchCommand {
- 	cursor: pointer;
- 	border: 1px solid transparent;
-@@ -214,6 +295,11 @@
- .workbenchCommand:disabled {
- 	color: #868e96;
- 	cursor: default
-+=======
-+.workbenchCommand:disabled {
-+	color: #868e96;
-+	cursor: pointer;
-+>>>>>>> .their
- }
- 
- .block-extensions .block-info {
-@@ -240,6 +326,7 @@
- 	color: #be1100;
- }
- 
-+<<<<<<< .our
- .section .input-group .validation-error {
- 	margin-left: 15%;
- }
-@@ -280,10 +367,52 @@
- 
- 	.section .inline-form-control  {
- 		width: calc(85% - 5px);
-+=======
-+button {
-+	background-color: #007ACC;
-+	color: #fff;
-+}
-+
-+#issue-type-label {
-+	width: 95px;
-+}
-+
-+#issue-type {
-+	width: calc(100% - 100px);
-+}
-+
-+#issue-title-label {
-+	width: 80px;
-+	display: inline-block;
-+}
-+
-+#issue-title {
-+	width: calc(100% - 85px);
-+}
-+
-+
-+@media (max-width: 950px) {
-+	#issue-type-label {
-+		width: 12%;
-+	}
-+
-+	#issue-type {
-+		width: calc(88% - 5px);
-+	}
-+
-+	#issue-title-label {
-+		width: 10%;
-+		display: inline-block
-+	}
-+
-+	#issue-title {
-+		width: calc(90% - 5px);
-+>>>>>>> .their
- 	}
- }
- 
- @media (max-width: 620px) {
-+<<<<<<< .our
- 	.section .inline-label {
- 		display: none !important;
- 	}
-@@ -352,3 +481,17 @@
- 	text-overflow: ellipsis;
- 	overflow: hidden;
- }
-+=======
-+	#issue-title-label, #issue-type-label {
-+		display: none !important;
-+	}
-+
-+	#issue-type, #issue-title {
-+		width: 100%;
-+	}
-+
-+	#similar-issues {
-+		margin-left: 0;
-+	}
-+}
-+>>>>>>> .their
-changed in both
-  base   100644 926ce809c15e50b217e7611d57950e1abb2b320e src/vs/code/electron-main/diagnostics.ts
-  our    100644 3bb9e182899533e24fe8967328f2174571df8e45 src/vs/code/electron-main/diagnostics.ts
-  their  100644 20101529482e798fcb9a3661e923227ec6db57b7 src/vs/code/electron-main/diagnostics.ts
-@@ -41,7 +41,11 @@
- }
- 
- export interface PerformanceInfo {
-+<<<<<<< .our
- 	processInfo?: string;
-+=======
-+	processInfo?: ProcessInfo[];
-+>>>>>>> .their
- 	workspaceInfo?: string;
- }
- 
-@@ -84,6 +88,7 @@
- 			});
- 		}
- 
-+<<<<<<< .our
- 		return Promise.all(workspaceStatPromises).then(() => {
- 			return {
- 				processInfo: formatProcessList(info, rootProcess),
-@@ -95,6 +100,12 @@
- 				workspaceInfo: `Unable to calculate workspace stats: ${error}`
- 			};
- 		});
-+=======
-+		return {
-+			processInfo: getProcessList(info, rootProcess),
-+			workspaceInfo: workspaceInfoMessages.join('\n')
-+		};
-+>>>>>>> .their
- 	});
- }
- 
-@@ -106,8 +117,12 @@
- 		'Memory (System)': `${(os.totalmem() / GB).toFixed(2)}GB (${(os.freemem() / GB).toFixed(2)}GB free)`,
- 		VM: `${Math.round((virtualMachineHint.value() * 100))}%`,
- 		'Screen Reader': `${app.isAccessibilitySupportEnabled() ? 'yes' : 'no'}`,
-+<<<<<<< .our
- 		'Process Argv': `${info.mainArguments.join(' ')}`,
- 		'GPU Status': app.getGPUFeatureStatus()
-+=======
-+		'Process Argv': `${info.mainArguments.join(' ')}`
-+>>>>>>> .their
- 	};
- 
- 	const cpus = os.cpus();
-@@ -233,11 +248,55 @@
- 	return output.join('\n');
- }
- 
-+<<<<<<< .our
- function expandGPUFeatures(): string {
- 	const gpuFeatures = app.getGPUFeatureStatus();
- 	const longestFeatureName = Math.max(...Object.keys(gpuFeatures).map(feature => feature.length));
- 	// Make columns aligned by adding spaces after feature name
- 	return Object.keys(gpuFeatures).map(feature => `${feature}:  ${repeat(' ', longestFeatureName - feature.length)}  ${gpuFeatures[feature]}`).join('\n                  ');
-+=======
-+function getProcessList(info: IMainProcessInfo, rootProcess: ProcessItem): ProcessInfo[] {
-+	const mapPidToWindowTitle = new Map<number, string>();
-+	info.windows.forEach(window => mapPidToWindowTitle.set(window.pid, window.title));
-+
-+	const processes: ProcessInfo[] = [];
-+
-+	if (rootProcess) {
-+		getProcessItem(mapPidToWindowTitle, processes, rootProcess, 0);
-+	}
-+
-+	return processes;
-+}
-+
-+function getProcessItem(mapPidToWindowTitle: Map<number, string>, processes: ProcessInfo[], item: ProcessItem, indent: number): void {
-+	const isRoot = (indent === 0);
-+
-+	const MB = 1024 * 1024;
-+
-+	// Format name with indent
-+	let name: string;
-+	if (isRoot) {
-+		name = `${product.applicationName} main`;
-+	} else {
-+		name = `${repeat('--', indent)} ${item.name}`;
-+
-+		if (item.name === 'window') {
-+			name = `${name} (${mapPidToWindowTitle.get(item.pid)})`;
-+		}
-+	}
-+	const memory = process.platform === 'win32' ? item.mem : (os.totalmem() * (item.mem / 100));
-+	processes.push({
-+		cpu: Number(item.load.toFixed(0)),
-+		memory: Number((memory / MB).toFixed(0)),
-+		pid: Number((item.pid).toFixed(0)),
-+		name
-+	});
-+
-+	// Recurse into children if any
-+	if (Array.isArray(item.children)) {
-+		item.children.forEach(child => getProcessItem(mapPidToWindowTitle, processes, child, indent + 1));
-+	}
-+>>>>>>> .their
- }
- 
- export function formatEnvironment(info: IMainProcessInfo): string {
-changed in both
-  base   100644 87425685c5bf2d06a5f136e2c85c9eb94a531eec src/vs/code/electron-main/logUploader.ts
-  our    100644 7142aa19a4cc1eda1ba377d464497305ab507809 src/vs/code/electron-main/logUploader.ts
-  their  100644 543fab3fb4112192910de1b00ccfbfb1392035a8 src/vs/code/electron-main/logUploader.ts
-changed in both
-  base   100644 f92847452e17f8a74e8e3061d3cdcd8497cc2a98 src/vs/editor/common/config/editorOptions.ts
-  our    100644 3a51038033803eb3e426c81c8416ce7c260eb272 src/vs/editor/common/config/editorOptions.ts
-  their  100644 921165fc844a1ffffaabae0686019f416d9cf666 src/vs/editor/common/config/editorOptions.ts
-changed in both
-  base   100644 7eb0243f2c1d3b7f1423d6ddaf20adeb7c3ba27a src/vs/editor/contrib/find/test/findController.test.ts
-  our    100644 e5ce80bb6016a1e51d5e1e85539a8e82a7c12e34 src/vs/editor/contrib/find/test/findController.test.ts
-  their  100644 f48c33a69778ffbb8ff101d0333db8b792a0fcc7 src/vs/editor/contrib/find/test/findController.test.ts
-changed in both
-  base   100644 3fdcc99d6befa01c078606e59f0f27bcb685735f src/vs/editor/contrib/suggest/suggestMemory.ts
-  our    100644 e278a619c962e7c12a5cd1b555b0c59b33e32c0a src/vs/editor/contrib/suggest/suggestMemory.ts
-  their  100644 58df1fd71798f5aefc1600422c7325aee09a6afe src/vs/editor/contrib/suggest/suggestMemory.ts
-changed in both
-  base   100644 ee095d5b1fed42389037b0f1aafa2a9c6ff2ebdb src/vs/monaco.d.ts
-  our    100644 76dcf491ff9c1973ad61bf5d423713bb1a3b4e44 src/vs/monaco.d.ts
-  their  100644 0a1cc793efdd772ec44aca5ef7cc0b887353421c src/vs/monaco.d.ts
-changed in both
-  base   100644 02ed4c6986266d06910a3eb61efa5ede6c6b5c5c src/vs/platform/issue/electron-main/issueService.ts
-  our    100644 cebb4e612373900c38659291fafa9b78f51e1be1 src/vs/platform/issue/electron-main/issueService.ts
-  their  100644 06355038ac58012ea185270479c7e8f0d2d1f7fa src/vs/platform/issue/electron-main/issueService.ts
-@@ -9,21 +9,33 @@
- import { localize } from 'vs/nls';
- import * as objects from 'vs/base/common/objects';
- import { parseArgs } from 'vs/platform/environment/node/argv';
-+<<<<<<< .our
- import { IIssueService, IssueReporterData, IssueReporterFeatures, ProcessExplorerData } from 'vs/platform/issue/common/issue';
-+=======
-+import { IIssueService, IssueReporterData } from 'vs/platform/issue/common/issue';
-+>>>>>>> .their
- import { BrowserWindow, ipcMain, screen } from 'electron';
- import { ILaunchService } from 'vs/code/electron-main/launch';
- import { getPerformanceInfo, PerformanceInfo, getSystemInfo, SystemInfo } from 'vs/code/electron-main/diagnostics';
- import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-+<<<<<<< .our
- import { isMacintosh, IProcessEnvironment } from 'vs/base/common/platform';
- import { ILogService } from 'vs/platform/log/common/log';
-+=======
-+import { isMacintosh } from 'vs/base/common/platform';
-+>>>>>>> .their
- 
- const DEFAULT_BACKGROUND_COLOR = '#1E1E1E';
- 
- export class IssueService implements IIssueService {
- 	_serviceBrand: any;
- 	_issueWindow: BrowserWindow;
-+<<<<<<< .our
- 	_issueParentWindow: BrowserWindow;
- 	_processExplorerWindow: BrowserWindow;
-+=======
-+	_parentWindow: BrowserWindow;
-+>>>>>>> .their
- 
- 	constructor(
- 		private machineId: string,
-@@ -47,6 +59,7 @@
- 		});
- 
- 		ipcMain.on('workbenchCommand', (event, arg) => {
-+<<<<<<< .our
- 			this._issueParentWindow.webContents.send('vscode:runAction', { id: arg, from: 'issueReporter' });
- 		});
- 
-@@ -95,6 +108,22 @@
- 			this.launchService.getMainProcessInfo().then(info => {
- 				event.sender.send('windowsInfoResponse', info.windows);
- 			});
-+=======
-+			this._parentWindow.webContents.send('vscode:runAction', { id: arg });
-+		});
-+
-+		this._parentWindow = BrowserWindow.getFocusedWindow();
-+		const position = this.getWindowPosition();
-+		this._issueWindow = new BrowserWindow({
-+			width: position.width,
-+			height: position.height,
-+			minWidth: 300,
-+			minHeight: 200,
-+			x: position.x,
-+			y: position.y,
-+			title: localize('issueReporter', "Issue Reporter"),
-+			backgroundColor: data.styles.backgroundColor || DEFAULT_BACKGROUND_COLOR
-+>>>>>>> .their
- 		});
- 
- 		// Create as singleton
-@@ -154,7 +183,11 @@
- 		return TPromise.as(null);
- 	}
- 
-+<<<<<<< .our
- 	private getWindowPosition(parentWindow: BrowserWindow, defaultWidth: number, defaultHeight: number) {
-+=======
-+	private getWindowPosition() {
-+>>>>>>> .their
- 		// We want the new window to open on the same display that the parent is in
- 		let displayToUse: Electron.Display;
- 		const displays = screen.getAllDisplays();
-@@ -174,8 +207,13 @@
- 			}
- 
- 			// if we have a last active window, use that display for the new window
-+<<<<<<< .our
- 			if (!displayToUse && parentWindow) {
- 				displayToUse = screen.getDisplayMatching(parentWindow.getBounds());
-+=======
-+			if (!displayToUse && this._parentWindow) {
-+				displayToUse = screen.getDisplayMatching(this._parentWindow.getBounds());
-+>>>>>>> .their
- 			}
- 
- 			// fallback to primary display or first display
-@@ -185,6 +223,7 @@
- 		}
- 
- 		let state = {
-+<<<<<<< .our
- 			width: defaultWidth,
- 			height: defaultHeight,
- 			x: undefined,
-@@ -220,6 +259,15 @@
- 				state.height = displayBounds.height; // prevent window from exceeding display bounds height
- 			}
- 		}
-+=======
-+			width: 800,
-+			height: 900,
-+			x: undefined,
-+			y: undefined
-+		};
-+		state.x = displayToUse.bounds.x + (displayToUse.bounds.width / 2) - (state.width / 2);
-+		state.y = displayToUse.bounds.y + (displayToUse.bounds.height / 2) - (state.height / 2);
-+>>>>>>> .their
- 
- 		return state;
- 	}
-changed in both
-  base   100644 de93ac69de48a0346cdacb450d2e51025c485f95 src/vs/workbench/browser/parts/editor/editorCommands.ts
-  our    100644 f8a7357eecc3080de4e3febda7b346e2b0e5aeaa src/vs/workbench/browser/parts/editor/editorCommands.ts
-  their  100644 18f4458765383b885d4024bccf842e1a399b68a2 src/vs/workbench/browser/parts/editor/editorCommands.ts
-@@ -498,10 +498,15 @@
- 					.filter(context => context.groupId === groupId)
- 					.map(context => typeof context.editorIndex === 'number' ? group.getEditor(context.editorIndex) : group.activeEditor);
- 
-+<<<<<<< .our
- 				return group.closeEditors(editors);
- 			}));
- 		}
- 	});
-+=======
-+						return group.activeEditor;
-+					}).filter(input => !!input);
-+>>>>>>> .their
- 
- 	KeybindingsRegistry.registerCommandAndKeybindingRule({
- 		id: CLOSE_EDITOR_GROUP_COMMAND_ID,
-removed in local
-  base   100644 b3b5dfc497319f909209434d226ee3043a841739 src/vs/workbench/browser/parts/views/treeView.ts
-  their  100644 69fd5b0cab97585b2857a4b8710a8c348e762830 src/vs/workbench/browser/parts/views/treeView.ts
-changed in both
-  base   100644 7c4a15e8e7b5a76263d9cf59c24a21607c8d7a3d src/vs/workbench/electron-browser/actions.ts
-  our    100644 bdd05d8bf604885479f782703b020131fa80ea9f src/vs/workbench/electron-browser/actions.ts
-  their  100644 00db7589aea4cc5c06afae34fee65f342a38e3f8 src/vs/workbench/electron-browser/actions.ts
-@@ -29,6 +29,7 @@
- import { getBaseLabel } from 'vs/base/common/labels';
- import { IViewlet } from 'vs/workbench/common/viewlet';
- import { IPanel } from 'vs/workbench/common/panel';
-+<<<<<<< .our
- import { IWorkspaceIdentifier, getWorkspaceLabel, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
- import { FileKind } from 'vs/platform/files/common/files';
- import { IssueType } from 'vs/platform/issue/common/issue';
-@@ -46,6 +47,19 @@
- import { IModeService } from 'vs/editor/common/services/modeService';
- import { IQuickInputService, IQuickPickItem, IQuickInputButton, IQuickPickSeparator, IKeyMods } from 'vs/platform/quickinput/common/quickInput';
- import { getIconClasses } from 'vs/workbench/browser/labels';
-+=======
-+import { IWorkspaceIdentifier, getWorkspaceLabel, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
-+import { FileKind, IFileService } from 'vs/platform/files/common/files';
-+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-+import { IExtensionService, ActivationTimes } from 'vs/platform/extensions/common/extensions';
-+import { getEntries } from 'vs/base/common/performance';
-+import { IEditor } from 'vs/platform/editor/common/editor';
-+import { IIssueService, IssueReporterData, IssueType, IssueReporterStyles } from 'vs/platform/issue/common/issue';
-+import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService';
-+import { textLinkForeground, inputBackground, inputBorder, inputForeground, buttonBackground, buttonHoverBackground, buttonForeground, inputValidationErrorBorder, foreground, inputActiveOptionBorder } from 'vs/platform/theme/common/colorRegistry';
-+import { SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme';
-+import { getGalleryExtensionIdFromLocal } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-+>>>>>>> .their
- 
- // --- actions
- 
-@@ -584,9 +598,26 @@
- 		super(id, label);
- 	}
- 
-+<<<<<<< .our
- 	run(): TPromise<boolean> {
- 		return this.issueService.openProcessExplorer()
- 			.then(() => true);
-+=======
-+	public run(): TPromise<boolean> {
-+		return this.extensionManagementService.getInstalled(LocalExtensionType.User).then(extensions => {
-+			const enabledExtensions = extensions.filter(extension => this.extensionEnablementService.isEnabled({ id: getGalleryExtensionIdFromLocal(extension) }));
-+			const theme = this.themeService.getTheme();
-+			const issueReporterData: IssueReporterData = {
-+				styles: getIssueReporterStyles(theme),
-+				zoomLevel: webFrame.getZoomLevel(),
-+				enabledExtensions
-+			};
-+
-+			return this.issueService.openReporter(issueReporterData).then(() => {
-+				return TPromise.as(true);
-+			});
-+		});
-+>>>>>>> .their
- 	}
- }
- 
-changed in both
-  base   100644 c3806ceef8da4420d0f7eff870511a61269245f7 src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
-  our    100644 3bfb6cffba943bf68a9fa9c24fb1903c66dd3fad src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
-  their  100644 a390e5cabbb4df24c40a9a396717ef1dd87f5030 src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
-@@ -323,7 +323,7 @@
- 		}
- 
- 		if (text) {
--			options = assign(options, { text: text.substr(0, 350), source: 'searchText' });
-+			options = assign(options, { text: text.substr(0, 350), source: text === query.value ? 'searchText' : 'file-extension-tags' });
- 		} else {
- 			options.source = 'viewlet';
- 		}
-changed in both
-  base   100644 6e4bf7992f557c12f3341b9300dd35d3beed11e3 src/vs/workbench/parts/files/electron-browser/fileCommands.ts
-  our    100644 38cb4a1c6b995d502359ecceccc8480e423cd6e0 src/vs/workbench/parts/files/electron-browser/fileCommands.ts
-  their  100644 ee8f3d96a5ed02f85a336743d200bd6f62b67e26 src/vs/workbench/parts/files/electron-browser/fileCommands.ts
-@@ -352,12 +352,17 @@
- 	}
- });
- 
-+<<<<<<< .our
- function revealResourcesInOS(resources: URI[], windowsService: IWindowsService, notificationService: INotificationService, workspaceContextService: IWorkspaceContextService): void {
-+=======
-+function revealResourcesInOS(resources: URI[], windowsService: IWindowsService, messageService: IMessageService): void {
-+>>>>>>> .their
- 	if (resources.length) {
- 		sequence(resources.map(r => () => windowsService.showItemInFolder(paths.normalize(r.fsPath, true))));
- 	} else if (workspaceContextService.getWorkspace().folders.length) {
- 		windowsService.showItemInFolder(paths.normalize(workspaceContextService.getWorkspace().folders[0].uri.fsPath, true));
- 	} else {
-+<<<<<<< .our
- 		notificationService.info(nls.localize('openFileToReveal', "Open a file first to reveal"));
- 	}
- }
-@@ -366,10 +371,20 @@
- 	id: REVEAL_IN_OS_COMMAND_ID,
- 	weight: KeybindingWeight.WorkbenchContrib,
- 	when: EditorContextKeys.focus.toNegated(),
-+=======
-+		messageService.show(severity.Info, nls.localize('openFileToReveal', "Open a file first to reveal"));
-+	}
-+}
-+KeybindingsRegistry.registerCommandAndKeybindingRule({
-+	id: REVEAL_IN_OS_COMMAND_ID,
-+	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
-+	when: ExplorerFocusCondition,
-+>>>>>>> .their
- 	primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KEY_R,
- 	win: {
- 		primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KEY_R
- 	},
-+<<<<<<< .our
- 	handler: (accessor: ServicesAccessor, resource: URI | object) => {
- 		const resources = getMultiSelectedResources(resource, accessor.get(IListService), accessor.get(IEditorService));
- 		revealResourcesInOS(resources, accessor.get(IWindowsService), accessor.get(INotificationService), accessor.get(IWorkspaceContextService));
-@@ -390,6 +405,27 @@
- });
- 
- function resourcesToClipboard(resources: URI[], clipboardService: IClipboardService, notificationService: INotificationService, contextService?: IWorkspaceContextService): void {
-+=======
-+	handler: (accessor: ServicesAccessor, resource: URI) => {
-+		const resources = getMultiSelectedResources(resource, accessor.get(IListService), accessor.get(IWorkbenchEditorService));
-+		revealResourcesInOS(resources, accessor.get(IWindowsService), accessor.get(IMessageService));
-+	}
-+});
-+KeybindingsRegistry.registerCommandAndKeybindingRule({
-+	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
-+	when: undefined,
-+	primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.KEY_R),
-+	id: 'workbench.action.files.revealActiveFileInWindows',
-+	handler: (accessor: ServicesAccessor, resource: URI) => {
-+		const editorService = accessor.get(IWorkbenchEditorService);
-+		const activeInput = editorService.getActiveEditorInput();
-+		const resources = activeInput && activeInput.getResource() ? [activeInput.getResource()] : [];
-+		revealResourcesInOS(resources, accessor.get(IWindowsService), accessor.get(IMessageService));
-+	}
-+});
-+
-+function resourcesToClipboard(resources: URI[], clipboardService: IClipboardService, messageService: IMessageService): void {
-+>>>>>>> .their
- 	if (resources.length) {
- 		const lineDelimiter = isWindows ? '\r\n' : '\n';
- 
-@@ -413,10 +449,16 @@
- 		}).join(lineDelimiter);
- 		clipboardService.writeText(text);
- 	} else {
-+<<<<<<< .our
- 		notificationService.info(nls.localize('openFileToCopy', "Open a file first to copy its path"));
- 	}
- }
- 
-+=======
-+		messageService.show(severity.Info, nls.localize('openFileToCopy', "Open a file first to copy its path"));
-+	}
-+}
-+>>>>>>> .their
- KeybindingsRegistry.registerCommandAndKeybindingRule({
- 	weight: KeybindingWeight.WorkbenchContrib,
- 	when: EditorContextKeys.focus.toNegated(),
-@@ -425,13 +467,20 @@
- 		primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KEY_C
- 	},
- 	id: COPY_PATH_COMMAND_ID,
-+<<<<<<< .our
- 	handler: (accessor, resource: URI | object) => {
- 		const resources = getMultiSelectedResources(resource, accessor.get(IListService), accessor.get(IEditorService));
- 		resourcesToClipboard(resources, accessor.get(IClipboardService), accessor.get(INotificationService));
-+=======
-+	handler: (accessor, resource: URI) => {
-+		const resources = getMultiSelectedResources(resource, accessor.get(IListService), accessor.get(IWorkbenchEditorService));
-+		resourcesToClipboard(resources, accessor.get(IClipboardService), accessor.get(IMessageService));
-+>>>>>>> .their
- 	}
- });
- 
- KeybindingsRegistry.registerCommandAndKeybindingRule({
-+<<<<<<< .our
- 	weight: KeybindingWeight.WorkbenchContrib,
- 	when: EditorContextKeys.focus.toNegated(),
- 	primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyMod.Alt | KeyCode.KEY_C,
-@@ -455,6 +504,17 @@
- 		const activeInput = editorService.activeEditor;
- 		const resources = activeInput && activeInput.getResource() ? [activeInput.getResource()] : [];
- 		resourcesToClipboard(resources, accessor.get(IClipboardService), accessor.get(INotificationService));
-+=======
-+	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
-+	when: undefined,
-+	primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.KEY_P),
-+	id: 'workbench.action.files.copyPathOfActiveFile',
-+	handler: (accessor, resource: URI) => {
-+		const editorService = accessor.get(IWorkbenchEditorService);
-+		const activeInput = editorService.getActiveEditorInput();
-+		const resources = activeInput && activeInput.getResource() ? [activeInput.getResource()] : [];
-+		resourcesToClipboard(resources, accessor.get(IClipboardService), accessor.get(IMessageService));
-+>>>>>>> .their
- 	}
- });
- 
diff --git a/app/test/fixtures/merge-parser/vscode/merge-for-christof-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-for-christof-into-master.txt
deleted file mode 100644
index 6742c122aea..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-for-christof-into-master.txt
+++ /dev/null
@@ -1,327 +0,0 @@
-added in both
-  our    100644 8a89122dafb8dcbe4e91533e3e4b61fe25255b43 extensions/emmet/.vscode/launch.json
-  their  100644 1009ac683facba7ce9da1904b93034f83b90cd95 extensions/emmet/.vscode/launch.json
-@@ -10,11 +10,19 @@
-             "name": "Launch Extension",
-             "runtimeExecutable": "${execPath}",
-             "args": [
-+<<<<<<< .our
-                 "--extensionDevelopmentPath=${workspaceFolder}"
-             ],
-             "sourceMaps": true,
-             "outFiles": [
-                 "${workspaceFolder}/out/**/*.js"
-+=======
-+                "--extensionDevelopmentPath=${workspaceRoot}"
-+            ],
-+            "sourceMaps": true,
-+            "outFiles": [
-+                "${workspaceRoot}/out/**/*.js"
-+>>>>>>> .their
-             ]
-         }
-     ]
-changed in both
-  base   100644 482ef44988c21aae2c8e7c55a33d7ac12285c937 extensions/emmet/package.json
-  our    100644 d9be62f74d1063d961b7895eab86495b34482691 extensions/emmet/package.json
-  their  100644 7a2288a96c2aa39450dbd447d3997981873342b6 extensions/emmet/package.json
-@@ -64,7 +64,11 @@
-                         }
-                     },
-                     "default": {},
-+<<<<<<< .our
-                     "description": "%emmetVariables%"
-+=======
-+                    "description": "Applicable only when emmet.useNewEmmet is set to true.\nVariables to be used in emmet snippets"
-+>>>>>>> .their
-                 },
-                 "emmet.syntaxProfiles": {
-                     "type": "object",
-@@ -73,15 +77,20 @@
-                 },
-                 "emmet.excludeLanguages": {
-                     "type": "array",
-+<<<<<<< .our
-                     "default": [
-                         "markdown"
-                     ],
-+=======
-+                    "default": ["markdown"],
-+>>>>>>> .their
-                     "description": "%emmetExclude%"
-                 },
-                 "emmet.extensionsPath": {
-                     "type": "string",
-                     "default": null,
-                     "description": "%emmetExtensionsPath%"
-+<<<<<<< .our
-                 },
-                 "emmet.triggerExpansionOnTab": {
-                     "type": "boolean",
-@@ -216,6 +225,8 @@
-                     "type": "boolean",
-                     "default": true,
-                     "markdownDescription": "%emmetOptimizeStylesheetParsing%"
-+=======
-+>>>>>>> .their
-                 }
-             }
-         },
-changed in both
-  base   100644 79a18e731d7f03ca08377be335dc90e6bfb8460a extensions/emmet/package.nls.json
-  our    100644 3f3bf912fd84e40ee4fbf65592c9123e2f4d160a extensions/emmet/package.nls.json
-  their  100644 9655779d355c783b2b5b5211bbe52c20ae187ec5 extensions/emmet/package.nls.json
-@@ -23,6 +23,7 @@
- 	"command.decrementNumberByOneTenth": "Decrement by 0.1",
- 	"command.incrementNumberByTen": "Increment by 10",
- 	"command.decrementNumberByTen": "Decrement by 10",
-+<<<<<<< .our
- 	"emmetSyntaxProfiles": "Define profile for specified syntax or use your own profile with specific rules.",
- 	"emmetExclude": "An array of languages where Emmet abbreviations should not be expanded.",
- 	"emmetExtensionsPath": "Path to a folder containing Emmet profiles and snippets.",
-@@ -56,3 +57,9 @@
- 	"emmetPreferencesCssFuzzySearchMinScore": "The minimum score (from 0 to 1) that fuzzy-matched abbreviation should achieve. Lower values may produce many false-positive matches, higher values may reduce possible matches.",
- 	"emmetOptimizeStylesheetParsing": "When set to `false`, the whole file is parsed to determine if current position is valid for expanding Emmet abbreviations. When set to `true`, only the content around the current position in css/scss/less files is parsed."
- }
-+=======
-+	"emmetExclude":"An array of languages where emmet abbreviations should not be expanded.",
-+	"emmetExtensionsPath":"Path to a folder containing emmet profiles and snippets",
-+	"emmetSyntaxProfiles":"Define profile for specified syntax or use your own profile with specific rules."
-+}
-+>>>>>>> .their
-changed in both
-  base   100644 2b7211fac756d6aa253cbd566d260ce0724d6f09 extensions/emmet/src/test/abbreviationAction.test.ts
-  our    100644 b5fb87d8b0791993b65959e4e4c9219aa4e8388c extensions/emmet/src/test/abbreviationAction.test.ts
-  their  100644 1b65ca181390ebceac8073acd7386f8ad42eec42 extensions/emmet/src/test/abbreviationAction.test.ts
-@@ -271,6 +271,7 @@
- 		});
- 	});
- 
-+<<<<<<< .our
- 	test('No expanding text in completion list inside style tag if position is not for property name (HTML)', () => {
- 		return withRandomFileEditor(htmlContents, 'html', (editor, doc) => {
- 			editor.selection = new Selection(13, 14, 13, 14);
-@@ -294,6 +295,10 @@
- 				return Promise.resolve();
- 			});
- 		});
-+=======
-+	test('Expand using bem filter', () => {
-+		//return testHtmlExpandAbbreviation(new Selection(16, 55, 16, 55), bemFilterExample, expectedBemFilterOutput);
-+>>>>>>> .their
- 	});
- 
- 	test('Expand css when inside style attribute in completion list (HTML)', () => {
-removed in local
-  base   100644 ded0fe27c3cb84a182bb2e8594901feaeb781e68 npm-shrinkwrap.json
-  their  100644 b69ed5f866e39ffe2761dd576a6b74185bb8cc41 npm-shrinkwrap.json
-changed in both
-  base   100644 6dbb4c4d4bf6858ca6c4c0472bfbcae9c7620658 package.json
-  our    100644 d0e982ce0b76c5b1b5eb02b673e459e47f3353a4 package.json
-  their  100644 c9dec43802c6f464f4d791ef4dc85d9788c622d6 package.json
-@@ -25,7 +25,12 @@
-     "download-builtin-extensions": "node build/lib/builtInExtensions.js"
-   },
-   "dependencies": {
-+<<<<<<< .our
-     "applicationinsights": "0.18.0",
-+=======
-+    "applicationinsights": "0.17.1",
-+    "chokidar": "bpasero/chokidar#vscode",
-+>>>>>>> .their
-     "fast-plist": "0.1.2",
-     "gc-signals": "^0.0.1",
-     "getmac": "1.4.1",
-changed in both
-  base   100644 05acd8aa0459e8e63068f80575ee8b56dd6d559e src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.ts
-  our    100644 42968c4b84603ff59a9acfd4957937949e3cc7cd src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.ts
-  their  100644 e2abb29c80e803b7d87b2f21549e7c494b48a7c5 src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.ts
-@@ -4,6 +4,7 @@
-  *--------------------------------------------------------------------------------------------*/
- 
- 'use strict';
-+<<<<<<< .our
- import * as nls from 'vs/nls';
- import { EmmetEditorAction } from 'vs/workbench/parts/emmet/electron-browser/emmetActions';
- import { registerEditorAction } from 'vs/editor/browser/editorExtensions';
-@@ -13,6 +14,15 @@
- import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
- import { MenuId } from 'vs/platform/actions/common/actions';
- 
-+=======
-+
-+import nls = require('vs/nls');
-+import { EmmetEditorAction } from 'vs/workbench/parts/emmet/electron-browser/emmetActions';
-+import { editorAction } from 'vs/editor/common/editorCommonExtensions';
-+import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-+
-+@editorAction
-+>>>>>>> .their
- class ExpandAbbreviationAction extends EmmetEditorAction {
- 
- 	constructor() {
-@@ -21,6 +31,7 @@
- 			label: nls.localize('expandAbbreviationAction', "Emmet: Expand Abbreviation"),
- 			alias: 'Emmet: Expand Abbreviation',
- 			precondition: EditorContextKeys.writable,
-+<<<<<<< .our
- 			actionName: 'expand_abbreviation',
- 			kbOpts: {
- 				primary: KeyCode.Tab,
-@@ -37,6 +48,9 @@
- 				title: nls.localize({ key: 'miEmmetExpandAbbreviation', comment: ['&& denotes a mnemonic'] }, "Emmet: E&&xpand Abbreviation"),
- 				order: 3
- 			}
-+=======
-+			actionName: 'expand_abbreviation'
-+>>>>>>> .their
- 		});
- 
- 	}
-removed in local
-  base   100644 ab7d540a33147de4b2711d2556562683302be412 src/vs/workbench/parts/emmet/electron-browser/actions/wrapWithAbbreviation.ts
-  their  100644 db6ab3833d1ba005763d6287831417c47708ccb0 src/vs/workbench/parts/emmet/electron-browser/actions/wrapWithAbbreviation.ts
-changed in both
-  base   100644 39241708d43e23bd5a78d63c2c09f371589f1272 src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.ts
-  our    100644 686f51fa59ade654e6a1199463e46a64561f79d1 src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.ts
-  their  100644 107c401d147279a60431706d31dba6b20b4a628c src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.ts
-@@ -6,4 +6,8 @@
- 'use strict';
- 
- import './actions/expandAbbreviation';
-+<<<<<<< .our
-+=======
-+import './actions/wrapWithAbbreviation';
-+>>>>>>> .their
- 
-changed in both
-  base   100644 a614323904289009181501f4209567e4f3de21a8 src/vs/workbench/parts/emmet/electron-browser/emmetActions.ts
-  our    100644 bf59f107638768b79dc868ff93ca7a7050471ddb src/vs/workbench/parts/emmet/electron-browser/emmetActions.ts
-  their  100644 3f822b3c801f73cd4677b0939df8a01cc49f5006 src/vs/workbench/parts/emmet/electron-browser/emmetActions.ts
-@@ -5,6 +5,7 @@
- 'use strict';
- 
- import { TPromise } from 'vs/base/common/winjs.base';
-+<<<<<<< .our
- import { EditorAction, ServicesAccessor, IActionOptions } from 'vs/editor/browser/editorExtensions';
- import { grammarsExtPoint, ITMSyntaxExtensionPoint } from 'vs/workbench/services/textMate/electron-browser/TMGrammars';
- import { IModeService } from 'vs/editor/common/services/modeService';
-@@ -12,6 +13,15 @@
- import { ICommandService } from 'vs/platform/commands/common/commands';
- import { LanguageId, LanguageIdentifier } from 'vs/editor/common/modes';
- import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-+=======
-+import { ICommonCodeEditor } from 'vs/editor/common/editorCommon';
-+import { EditorAction, ServicesAccessor, IActionOptions } from 'vs/editor/common/editorCommonExtensions';
-+import { grammarsExtPoint, ITMSyntaxExtensionPoint } from 'vs/workbench/services/textMate/electron-browser/TMGrammars';
-+import { IModeService } from 'vs/editor/common/services/modeService';
-+import { IExtensionService, ExtensionPointContribution } from 'vs/platform/extensions/common/extensions';
-+import { ICommandService } from 'vs/platform/commands/common/commands';
-+import { LanguageId, LanguageIdentifier } from 'vs/editor/common/modes';
-+>>>>>>> .their
- 
- interface ModeScopeMap {
- 	[key: string]: string;
-@@ -78,21 +88,38 @@
- 		return this._lastGrammarContributions;
- 	}
- 
-+<<<<<<< .our
- 	public run(accessor: ServicesAccessor, editor: ICodeEditor): TPromise<void> {
-+=======
-+	public run(accessor: ServicesAccessor, editor: ICommonCodeEditor): TPromise<void> {
-+>>>>>>> .their
- 		const extensionService = accessor.get(IExtensionService);
- 		const modeService = accessor.get(IModeService);
- 		const commandService = accessor.get(ICommandService);
- 
-+<<<<<<< .our
- 		return this._withGrammarContributions(extensionService).then((grammarContributions) => {
- 
- 			if (this.id === 'editor.emmet.action.expandAbbreviation') {
- 				return commandService.executeCommand<void>('emmet.expandAbbreviation', EmmetEditorAction.getLanguage(modeService, editor, grammarContributions));
-+=======
-+		let mappedCommand = this.actionMap[this.id];
-+		if (mappedCommand && mappedCommand !== 'emmet.expandAbbreviation' && mappedCommand !== 'emmet.wrapWithAbbreviation') {
-+			return commandService.executeCommand<void>(mappedCommand);
-+		}
-+
-+		return this._withGrammarContributions(extensionService).then((grammarContributions) => {
-+
-+			if (mappedCommand === 'emmet.expandAbbreviation' || mappedCommand === 'emmet.wrapWithAbbreviation') {
-+				return commandService.executeCommand<void>(mappedCommand, EmmetEditorAction.getLanguage(modeService, editor, grammarContributions));
-+>>>>>>> .their
- 			}
- 
- 			return undefined;
- 		});
- 
- 	}
-+<<<<<<< .our
- 
- 	public static getLanguage(languageIdentifierResolver: ILanguageIdentifierResolver, editor: ICodeEditor, grammars: IGrammarContributions) {
- 		let position = editor.getSelection().getStartPosition();
-@@ -101,6 +128,16 @@
- 		let language = languageIdentifierResolver.getLanguageIdentifier(languageId).language;
- 		let syntax = language.split('.').pop();
- 
-+=======
-+
-+	public static getLanguage(languageIdentifierResolver: ILanguageIdentifierResolver, editor: ICommonCodeEditor, grammars: IGrammarContributions) {
-+		let position = editor.getSelection().getStartPosition();
-+		editor.getModel().forceTokenization(position.lineNumber);
-+		let languageId = editor.getModel().getLanguageIdAtPosition(position.lineNumber, position.column);
-+		let language = languageIdentifierResolver.getLanguageIdentifier(languageId).language;
-+		let syntax = language.split('.').pop();
-+
-+>>>>>>> .their
- 		let checkParentMode = (): string => {
- 			let languageGrammar = grammars.getGrammar(syntax);
- 			if (!languageGrammar) {
-@@ -127,3 +164,5 @@
- 
- 
- }
-+
-+
-added in both
-  our    100644 6dcb146ee6a0d0177fc2c40235f34629bbfecd95 src/vs/workbench/parts/emmet/test/electron-browser/emmetAction.test.ts
-  their  100644 7cd89850e85ddaa97fbf8a09a49cf124482521f5 src/vs/workbench/parts/emmet/test/electron-browser/emmetAction.test.ts
-@@ -6,8 +6,13 @@
- 'use strict';
- 
- import { IGrammarContributions, ILanguageIdentifierResolver, EmmetEditorAction } from 'vs/workbench/parts/emmet/electron-browser/emmetActions';
-+<<<<<<< .our
- import { withTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
- import * as assert from 'assert';
-+=======
-+import { withMockCodeEditor } from 'vs/editor/test/common/mocks/mockCodeEditor';
-+import assert = require('assert');
-+>>>>>>> .their
- import { LanguageId, LanguageIdentifier } from 'vs/editor/common/modes';
- 
- //
-@@ -16,7 +21,11 @@
- // 	"name": "Stacks Tests",
- // 	"type": "node",
- // 	"request": "launch",
-+<<<<<<< .our
- // 	"program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
-+=======
-+// 	"program": "${workspaceRoot}/node_modules/mocha/bin/_mocha",
-+>>>>>>> .their
- // 	"stopOnEntry": false,
- // 	"args": [
- // 		"--timeout",
-@@ -43,7 +52,11 @@
- suite('Emmet', () => {
- 
- 	test('Get language mode and parent mode for emmet', () => {
-+<<<<<<< .our
- 		withTestCodeEditor([], {}, (editor) => {
-+=======
-+		withMockCodeEditor([], {}, (editor) => {
-+>>>>>>> .their
- 
- 			function testIsEnabled(mode: string, scopeName: string, expectedLanguage?: string, expectedParentLanguage?: string) {
- 				const languageIdentifier = new LanguageIdentifier(mode, 73);
diff --git a/app/test/fixtures/merge-parser/vscode/merge-hackathon-profile-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-hackathon-profile-into-master.txt
deleted file mode 100644
index 1c353e2cd45..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-hackathon-profile-into-master.txt
+++ /dev/null
@@ -1,735 +0,0 @@
-merged
-  result 100644 5a070d6acd031c5302f80713aa624bea695a3890 src/typings/v8-inspect-profiler.d.ts
-  our    100644 50449c7ae10dff078a4e6e78013fe4f399b69e0c src/typings/v8-inspect-profiler.d.ts
-@@ -31,7 +31,18 @@
- 		stop(afterDelay?: number): PromiseLike<ProfileResult>;
- 	}
- 
--	export function startProfiling(options: { port: number, tries?: number, retyWait?: number }): PromiseLike<ProfilingSession>;
-+	export interface Target {
-+		description: string,
-+    	devtoolsFrontendUrl: string,
-+		id: string,
-+		title: string,
-+		type: string,
-+		url: string,
-+		webSocketDebuggerUrl: string
-+	}
-+
-+	export function listTabs(options: { port: number, tries?: number, retyWait?: number }): PromiseLike<Target[]>;
-+	export function startProfiling(options: { port: number, tries?: number, retyWait?: number, chooseTab?: (targets: Target[]) => any }): PromiseLike<ProfilingSession>;
- 	export function writeProfile(profile: ProfileResult, name?: string): PromiseLike<void>;
- 	export function rewriteAbsolutePaths(profile, replaceWith?);
- }
-changed in both
-  base   100644 6f979c4c459b9e1de0a15a582215b4656decfa0d src/vs/base/common/strings.ts
-  our    100644 5cb6ea767546631fc484ca1e7c18929880db834d src/vs/base/common/strings.ts
-  their  100644 c6d3d91d9033f3a6b6ad3e1ceb38fcfed130994c src/vs/base/common/strings.ts
-@@ -21,7 +21,7 @@
- /**
-  * @returns the provided number with the given number of preceding zeros.
-  */
--export function pad(n: number, l: number, char: string = '0'): string {
-+export function pad(n: number | string, l: number, char: string = '0'): string {
- 	let str = '' + n;
- 	let r = [str];
- 
-changed in both
-  base   100644 94e6cfb01dc526cc409b2a5ff8350029e9a40d8d src/vs/base/node/ports.ts
-  our    100644 49f2f47b1551add965a0be8e6129de1eabedc3c3 src/vs/base/node/ports.ts
-  their  100644 cc6389a5ff65173d9ef965dd8d41f6bab8d9fa05 src/vs/base/node/ports.ts
-@@ -41,6 +41,11 @@
- 	});
- }
- 
-+export function findRandomFreePort(): Thenable<number> {
-+	const port = Math.floor(Math.random() * (20000 - 9000) + 9000);
-+	return findFreePort(port, 10, 5000);
-+}
-+
- function doFindFreePort(startPort: number, giveUpAfter: number, clb: (port: number) => void): void {
- 	if (giveUpAfter === 0) {
- 		return clb(0);
-changed in both
-  base   100644 23813aeaec64938af444d5c2521a9dc21247ecc7 src/vs/code/electron-main/diagnostics.ts
-  our    100644 3bb9e182899533e24fe8967328f2174571df8e45 src/vs/code/electron-main/diagnostics.ts
-  their  100644 120c4a6afa432d5793c5cb454fdf1084510504fd src/vs/code/electron-main/diagnostics.ts
-@@ -123,6 +123,9 @@
- 	return systemInfo;
- }
- 
-+const DEBUG_FLAGS_PATTERN = /\s--(inspect|debug)(-brk)?(=([0-9]+))/;
-+const RENDERER_DEBUG_PATTERN = /--remote-debugging-port=([0-9]+)/;
-+
- export function printDiagnostics(info: IMainProcessInfo): Promise<any> {
- 	return listProcesses(info.mainPID).then(rootProcess => {
- 
-@@ -269,7 +272,7 @@
- 
- 	const output: string[] = [];
- 
--	output.push('CPU %\tMem MB\t   PID\tProcess');
-+	output.push('CPU %\tMem MB\t   PID\t Port\tProcess');
- 
- 	if (rootProcess) {
- 		formatProcessItem(mapPidToWindowTitle, output, rootProcess, 0);
-@@ -278,7 +281,7 @@
- 	return output.join('\n');
- }
- 
--function formatProcessItem(mapPidToWindowTitle: Map<number, string>, output: string[], item: ProcessItem, indent: number): void {
-+function formatProcessItem(mapPidToWindowTitle: Map<number, string>, output: string[], item: ProcessItem, indent: number, rendererDebugPort?: string): void {
- 	const isRoot = (indent === 0);
- 
- 	const MB = 1024 * 1024;
-@@ -287,6 +290,10 @@
- 	let name: string;
- 	if (isRoot) {
- 		name = `${product.applicationName} main`;
-+		let matches = RENDERER_DEBUG_PATTERN.exec(item.cmd);
-+		if (matches && matches.length === 2) {
-+			rendererDebugPort = matches[1];
-+		}
- 	} else {
- 		name = `${repeat('  ', indent)} ${item.name}`;
- 
-@@ -294,11 +301,22 @@
- 			name = `${name} (${mapPidToWindowTitle.get(item.pid)})`;
- 		}
- 	}
-+
-+	const matches = DEBUG_FLAGS_PATTERN.exec(item.cmd);
-+	let debugPort = '';
-+	if (matches && matches.length === 5 && matches[4]) {
-+		debugPort = matches[4];
-+	}
-+
-+	if ((item.name === 'window' || item.name === 'shared-process') && rendererDebugPort) {
-+		debugPort = rendererDebugPort;
-+	}
-+
- 	const memory = process.platform === 'win32' ? item.mem : (os.totalmem() * (item.mem / 100));
--	output.push(`${pad(Number(item.load.toFixed(0)), 5, ' ')}\t${pad(Number((memory / MB).toFixed(0)), 6, ' ')}\t${pad(Number((item.pid).toFixed(0)), 6, ' ')}\t${name}`);
-+	output.push(`${pad(Number(item.load.toFixed(0)), 5, ' ')}\t${pad(Number((memory / MB).toFixed(0)), 6, ' ')}\t${pad(Number((item.pid).toFixed(0)), 6, ' ')}\t${pad(debugPort, 6, ' ')}\t${name}`);
- 
- 	// Recurse into children if any
- 	if (Array.isArray(item.children)) {
--		item.children.forEach(child => formatProcessItem(mapPidToWindowTitle, output, child, indent + 1));
-+		item.children.forEach(child => formatProcessItem(mapPidToWindowTitle, output, child, indent + 1, rendererDebugPort));
- 	}
- }
-changed in both
-  base   100644 4da3a6af5fca5cdb9a6db0c81d1c7e3165817537 src/vs/code/node/cli.ts
-  our    100644 3ca3fd9ec9479918271b1fd5d7cd262e40dae630 src/vs/code/node/cli.ts
-  their  100644 379628b02bf782cdeb08cdc5aa33088ac0497984 src/vs/code/node/cli.ts
-@@ -14,9 +14,10 @@
- import * as os from 'os';
- import * as fs from 'fs';
- import { whenDeleted } from 'vs/base/node/pfs';
--import { findFreePort } from 'vs/base/node/ports';
-+import { findFreePort, findRandomFreePort } from 'vs/base/node/ports';
- import { resolveTerminalEncoding } from 'vs/base/node/encoding';
- import * as iconv from 'iconv-lite';
-+import { cpuProfile } from './cpuProfile';
- import { writeFileAndFlushSync } from 'vs/base/node/extfs';
- import { isWindows } from 'vs/base/common/platform';
- 
-@@ -49,10 +50,9 @@
- 	// Version Info
- 	else if (args.version) {
- 		console.log(`${pkg.version}\n${product.commit}\n${process.arch}`);
--	}
--
--	// Extensions Management
--	else if (shouldSpawnCliProcess(args)) {
-+	} else if (args['cpu-profile']) {
-+		return cpuProfile(args['cpu-profile']);
-+	} else if (shouldSpawnCliProcess(args)) {
- 		const mainCli = new TPromise<IMainCli>(c => require(['vs/code/node/cliProcessMain'], c));
- 		return mainCli.then(cli => cli.main(args));
- 	}
-@@ -306,11 +306,18 @@
- 			});
- 		}
- 
-+<<<<<<< .our
- 		if (args['js-flags']) {
- 			const match = /max_old_space_size=(\d+)/g.exec(args['js-flags']);
- 			if (match && !args['max-memory']) {
- 				argv.push(`--max-memory=${match[1]}`);
- 			}
-+=======
-+		if (args['inspect-all']) {
-+			argv.push(`--inspect=${await findRandomFreePort()}`);
-+			argv.push(`--remote-debugging-port=${await findRandomFreePort()}`);
-+			argv.push(`--inspect-search=${await findRandomFreePort()}`);
-+>>>>>>> .their
- 		}
- 
- 		const options = {
-@@ -318,9 +325,13 @@
- 			env
- 		};
- 
-+<<<<<<< .our
- 		if (typeof args['upload-logs'] !== 'undefined') {
- 			options['stdio'] = ['pipe', 'pipe', 'pipe'];
- 		} else if (!verbose) {
-+=======
-+		if (!verbose && !args['inspect-all']) {
-+>>>>>>> .their
- 			options['stdio'] = 'ignore';
- 		}
- 
-added in remote
-  their  100644 ec34c2292d4767e3efcb809a21dd8825d7141148 src/vs/code/node/cpuProfile.ts
-@@ -0,0 +1,104 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+import * as paths from 'path';
-+import * as os from 'os';
-+import { TPromise } from 'vs/base/common/winjs.base';
-+import * as readline from 'readline';
-+import { Target } from 'v8-inspect-profiler';
-+import { isNumber } from 'vs/base/common/types';
-+
-+async function chooseRendererProcess(targets: Target[]): Promise<number> {
-+	if (!targets || targets.length === 0) {
-+		return TPromise.as(-1);
-+	}
-+	if (targets.length > 1) {
-+		let askForChooseTab = '? Which process do you want to profile\n';
-+		for (let i = 0, len = targets.length; i < len; i++) {
-+			if (targets[i].title.indexOf('sharedProcess.html') === 0) {
-+				askForChooseTab += `${i}. shared-process\n`;
-+			} else {
-+				askForChooseTab += `${i}. window (${targets[i].title})\n`;
-+			}
-+		}
-+
-+		console.log(askForChooseTab);
-+
-+		return new TPromise<number>((resolve, reject) => {
-+			var rl = readline.createInterface(process.stdin, process.stdout);
-+			rl.setPrompt('> ');
-+			rl.prompt();
-+			let targetTab = -1;
-+			rl.on('line', function (line) {
-+				let tabNumber = Number(line);
-+				if (isNumber(tabNumber) && tabNumber >= 0 && tabNumber < targets.length) {
-+					targetTab = tabNumber;
-+					rl.close();
-+				} else {
-+					console.log('Please provide valid number ;)');
-+					rl.prompt();
-+				}
-+			}).on('close', function () {
-+				if (targetTab === -1) {
-+					process.exit(0);
-+				} else {
-+					resolve(targetTab);
-+				}
-+			});
-+		});
-+	} else {
-+		return TPromise.as(0);
-+	}
-+}
-+
-+export async function cpuProfile(debugPortStr: string): Promise<void> {
-+	let debugPort = Number(debugPortStr);
-+
-+	if (!isNumber(debugPort)) {
-+		console.error(`${debugPort} is invalid. Run with "--status" to get list of valid ports.`);
-+		return;
-+	}
-+
-+	const profiler = await import('v8-inspect-profiler');
-+	const targets = await profiler.listTabs({ port: debugPort });
-+	if (targets.length < 1) {
-+		return;
-+	}
-+
-+	return chooseRendererProcess(targets).then(async tabNumber => {
-+		let options;
-+		if (tabNumber >= 0 && tabNumber < targets.length) {
-+			options = {
-+				port: debugPort, chooseTab: (targets) => {
-+					const target = targets[tabNumber];
-+					return target;
-+				}
-+			};
-+		} else {
-+			options = { port: debugPort };
-+		}
-+
-+		console.log('Profiling started, press Ctrl+C to stop.');
-+		const targetProcess = await profiler.startProfiling(options);
-+		const filenamePrefix = paths.join(os.homedir(), `CPU-${new Date().toISOString().replace(/[\-:]/g, '')}.cpuprofile`);
-+
-+		return new TPromise(c => {
-+			process.on('SIGINT', async () => {
-+				let suffix = '';
-+				let profileTargetProcess = await targetProcess.stop();
-+
-+				if (!process.env['VSCODE_DEV']) {
-+					profileTargetProcess = profiler.rewriteAbsolutePaths(profileTargetProcess, 'piiRemoved');
-+					suffix = '.txt';
-+				}
-+
-+				await profiler.writeProfile(profileTargetProcess, `${filenamePrefix}${suffix}`);
-+				console.log(`\nCPU Profile written to ${filenamePrefix}${suffix}`);
-+				c(null);
-+				process.exit(0);
-+			});
-+		});
-+	});
-+}
-\ No newline at end of file
-changed in both
-  base   100644 d3fc28397ffb8b2c75af214abad3d4f5c47a01dd src/vs/platform/environment/common/environment.ts
-  our    100644 52431b2e260012bfee9b7964e1e56089ce2601ab src/vs/platform/environment/common/environment.ts
-  their  100644 8f453b2f9721da960e256e41f6171536bbf4295d src/vs/platform/environment/common/environment.ts
-@@ -27,7 +27,11 @@
- 	performance?: boolean;
- 	'prof-startup'?: string;
- 	'prof-startup-prefix'?: string;
-+<<<<<<< .our
- 	'prof-append-timers'?: string;
-+=======
-+	'cpu-profile'?: string;
-+>>>>>>> .their
- 	verbose?: boolean;
- 	log?: string;
- 	logExtensionHostCommunication?: boolean;
-@@ -57,12 +61,17 @@
- 	'disable-updates'?: string;
- 	'disable-crash-reporter'?: string;
- 	'skip-add-to-recently-opened'?: boolean;
-+<<<<<<< .our
- 	'max-memory'?: number;
- 	'file-write'?: boolean;
- 	'file-chmod'?: boolean;
- 	'upload-logs'?: string;
- 	'driver'?: string;
- 	'driver-verbose'?: boolean;
-+=======
-+	'inspect-all'?: boolean;
-+	'write-elevated-helper'?: boolean;
-+>>>>>>> .their
- }
- 
- export const IEnvironmentService = createDecorator<IEnvironmentService>('environmentService');
-changed in both
-  base   100644 d546e1511ecb750f414f79dbd1552ce1fb5b6db9 src/vs/platform/environment/node/argv.ts
-  our    100644 7183c2471eb1043a8263fbc1a8a7863b41344622 src/vs/platform/environment/node/argv.ts
-  their  100644 787b02337ea006a55db6acca211221d44ea94214 src/vs/platform/environment/node/argv.ts
-@@ -33,8 +33,12 @@
- 		'enable-proposed-api',
- 		'export-default-configuration',
- 		'install-source',
-+<<<<<<< .our
- 		'upload-logs',
- 		'driver'
-+=======
-+		'cpu-profile'
-+>>>>>>> .their
- 	],
- 	boolean: [
- 		'help',
-@@ -64,6 +68,7 @@
- 		'disable-updates',
- 		'disable-crash-reporter',
- 		'skip-add-to-recently-opened',
-+		'inspect-all',
- 		'status',
- 		'file-write',
- 		'file-chmod',
-@@ -177,8 +182,16 @@
- 	'--inspect-extensions': localize('inspect-extensions', "Allow debugging and profiling of extensions. Check the developer tools for the connection URI."),
- 	'--inspect-brk-extensions': localize('inspect-brk-extensions', "Allow debugging and profiling of extensions with the extension host being paused after start. Check the developer tools for the connection URI."),
- 	'--disable-gpu': localize('disableGPU', "Disable GPU hardware acceleration."),
-+<<<<<<< .our
- 	'--upload-logs': localize('uploadLogs', "Uploads logs from current session to a secure endpoint."),
- 	'--max-memory': localize('maxMemory', "Max memory size for a window (in Mbytes).")
-+=======
-+	'-s, --status': localize('status', "Print process usage and diagnostics information."),
-+	'-v, --version': localize('version', "Print version."),
-+	'-h, --help': localize('help', "Print usage."),
-+	'--inspect-all': localize('inspect-all', "Start processes in debug mode and print debug ports to console"),
-+	'--cpu-profile <port>': localize('cpu-profile', "Collect CPU profile from debug port. Run with \"--status\" to get list of valid ports.")
-+>>>>>>> .their
- };
- 
- export function formatOptions(options: { [name: string]: string; }, columns: number): string {
-added in remote
-  their  100644 e8dff05baeb722c39fe923f9427f07a46b8554b2 src/vs/workbench/parts/performance/electron-browser/cpu.contribution.ts
-@@ -0,0 +1,42 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+'use strict';
-+
-+import { localize } from 'vs/nls';
-+import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-+import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
-+import { IWindowsService } from 'vs/platform/windows/common/windows';
-+import { findFreePort } from 'vs/base/node/ports';
-+
-+CommandsRegistry.registerCommand('workbench.reload.debug', async accessor => {
-+	const windowService = accessor.get(IWindowsService);
-+
-+	let argv = [];
-+	const portMain = await findFreePort(9222, 10, 6000);
-+	const portRenderer = await findFreePort(portMain + 1, 10, 6000);
-+	const portExthost = await findFreePort(portRenderer + 1, 10, 6000);
-+	const portSearch = await findFreePort(portExthost + 1, 10, 6000);
-+
-+	if (!portMain || !portRenderer || !portExthost || !portSearch) {
-+		console.error('Failed to find free ports for profiler to connect to do.');
-+		return;
-+	}
-+
-+	argv.push('--inspect-all');
-+	argv.push(`--inspect=${portMain}`);
-+	argv.push(`--remote-debugging-port=${portRenderer}`);
-+	argv.push(`--inspect-extensions=${portExthost}`);
-+	argv.push(`--inspect-search=${portSearch}`);
-+
-+
-+	windowService.relaunch({
-+		addArgs: argv
-+	});
-+});
-+
-+MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: 'workbench.reload.debug', title: localize('workbench.reload.debug', "Reload Workspace in Debug Mode") } });
-+
-+MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: 'workbench.profile.debug', title: localize('workbench.profile.debug', "Profile Processes") } });
-changed in both
-  base   100644 2bf830a0f1becf0c6f78b71c997c1c10c6ba8818 src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
-  our    100644 04d9dcba251cf79c28429027cda3ca3b0c10a29c src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
-  their  100644 e6d96d1fecb50c092193e85e49f7fdbbb03b81c1 src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
-@@ -27,6 +27,7 @@
- import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
- import { ansiColorIdentifiers, TERMINAL_BACKGROUND_COLOR, TERMINAL_FOREGROUND_COLOR, TERMINAL_CURSOR_FOREGROUND_COLOR, TERMINAL_CURSOR_BACKGROUND_COLOR, TERMINAL_SELECTION_BACKGROUND_COLOR } from 'vs/workbench/parts/terminal/common/terminalColorRegistry';
- import { PANEL_BACKGROUND } from 'vs/workbench/common/theme';
-+<<<<<<< .our
- import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
- import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
- import { INotificationService, Severity, IPromptChoice } from 'vs/platform/notification/common/notification';
-@@ -39,6 +40,15 @@
- // which suggests the fallback DOM-based renderer
- const SLOW_CANVAS_RENDER_THRESHOLD = 50;
- const NUMBER_OF_FRAMES_TO_MEASURE = 20;
-+=======
-+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-+import { findRandomFreePort } from 'vs/base/node/ports';
-+import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
-+import { IWorkspaceContextService, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-+
-+/** The amount of time to consider terminal errors to be related to the launch */
-+const LAUNCHING_DURATION = 500;
-+>>>>>>> .their
- 
- let Terminal: typeof XTermTerminal;
- 
-@@ -117,6 +127,7 @@
- 		private readonly _configHelper: TerminalConfigHelper,
- 		private _container: HTMLElement,
- 		private _shellLaunchConfig: IShellLaunchConfig,
-+<<<<<<< .our
- 		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
- 		@IKeybindingService private readonly _keybindingService: IKeybindingService,
- 		@INotificationService private readonly _notificationService: INotificationService,
-@@ -127,6 +138,19 @@
- 		@IConfigurationService private readonly _configurationService: IConfigurationService,
- 		@ILogService private _logService: ILogService,
- 		@IStorageService private readonly _storageService: IStorageService
-+=======
-+		@IContextKeyService private _contextKeyService: IContextKeyService,
-+		@IKeybindingService private _keybindingService: IKeybindingService,
-+		@IMessageService private _messageService: IMessageService,
-+		@IPanelService private _panelService: IPanelService,
-+		@IInstantiationService private _instantiationService: IInstantiationService,
-+		@IClipboardService private _clipboardService: IClipboardService,
-+		@IHistoryService private _historyService: IHistoryService,
-+		@IThemeService private _themeService: IThemeService,
-+		@IEnvironmentService private _envService: IEnvironmentService,
-+		@IConfigurationResolverService private _configurationResolverService: IConfigurationResolverService,
-+		@IWorkspaceContextService private _workspaceContextService: IWorkspaceContextService
-+>>>>>>> .their
- 	) {
- 		this._disposables = [];
- 		this._skipTerminalCommands = [];
-@@ -141,6 +165,7 @@
- 		this._logService.trace(`terminalInstance#ctor (id: ${this.id})`, this._shellLaunchConfig);
- 
- 		this._initDimensions();
-+<<<<<<< .our
- 		if (!this.shellLaunchConfig.isRendererOnly) {
- 			this._createProcess();
- 		} else {
-@@ -163,12 +188,23 @@
- 				this.updateAccessibilitySupport();
- 			}
- 		}));
-+=======
-+		this._initialCwd = this._getCwd(this._shellLaunchConfig, this._historyService.getLastActiveWorkspaceRoot('file'));
-+		this._xtermReadyPromise = this._createProcessAndXterm();
-+		this.attachToElement(this._container);
-+>>>>>>> .their
- 	}
- 
- 	public addDisposable(disposable: lifecycle.IDisposable): void {
- 		this._disposables.push(disposable);
- 	}
- 
-+	private async _createProcessAndXterm(): TPromise<void> {
-+		let _createProcessPromise = this._envService.args['inspect-all'] ? this._createProcessInDebugMode() : TPromise.as(this._createProcess());
-+		await _createProcessPromise;
-+		await this._createXterm();
-+	}
-+
- 	private _initDimensions(): void {
- 		// The terminal panel needs to have been created
- 		if (!this._container) {
-@@ -300,6 +336,7 @@
- 			this._xterm.writeln(this._shellLaunchConfig.initialText);
- 		}
- 		this._xterm.winptyCompatInit();
-+<<<<<<< .our
- 		this._xterm.on('linefeed', () => this._onLineFeed());
- 		if (this._processManager) {
- 			this._processManager.onProcessData(data => this._onProcessData(data));
-@@ -349,6 +386,33 @@
- 	}
- 
- 	public _attachToElement(container: HTMLElement): void {
-+=======
-+		this._xterm.on('lineFeed', () => this._onLineFeed());
-+		this._xterm.on('data', (data) => {
-+			if (this._processId) {
-+				// Send data if the pty is ready
-+				this._process.send({
-+					event: 'input',
-+					data
-+				});
-+			} else {
-+				// If the pty is not ready, queue the data received from
-+				// xterm.js until the pty is ready
-+				this._preLaunchInputQueue += data;
-+			}
-+			return false;
-+		});
-+		this._linkHandler = this._instantiationService.createInstance(TerminalLinkHandler, this._xterm, platform.platform, this._initialCwd);
-+		this._linkHandler.registerLocalLinkHandler();
-+		this._instanceDisposables.push(this._themeService.onThemeChange(theme => this._updateTheme(theme)));
-+	}
-+
-+	public attachToElement(container: HTMLElement): void {
-+		// Only attach xterm.js to the DOM if the terminal panel has been opened before.
-+		if (!container) {
-+			return;
-+		}
-+>>>>>>> .their
- 		this._xtermReadyPromise.then(() => {
- 			if (this._wrapperElement) {
- 				throw new Error('The terminal instance has already been attached to a container');
-@@ -709,6 +773,7 @@
- 		this._terminalHasTextContextKey.set(isActive && this.hasSelection());
- 	}
- 
-+<<<<<<< .our
- 	protected _createProcess(): void {
- 		this._processManager = this._instantiationService.createInstance(TerminalProcessManager, this._id, this._configHelper);
- 		this._processManager.onProcessReady(() => this._onProcessIdReady.fire(this));
-@@ -716,6 +781,43 @@
- 		this._processManager.createProcess(this._shellLaunchConfig, this._cols, this._rows);
- 
- 		this._processManager.onProcessData(data => this._onData.fire(data));
-+=======
-+	protected _createProcessInDebugMode() {
-+		return findRandomFreePort().then(port => {
-+			console.log(`Terminal process running in inspect mode using port: ${port}`);
-+			this._createProcess(port);
-+		});
-+	}
-+
-+	protected _createProcess(port?: number): void {
-+		const locale = this._configHelper.config.setLocaleVariables ? platform.locale : undefined;
-+		if (!this._shellLaunchConfig.executable) {
-+			this._configHelper.mergeDefaultShellPathAndArgs(this._shellLaunchConfig);
-+		}
-+
-+		const lastActiveWorkspaceRootUri = this._historyService.getLastActiveWorkspaceRoot('file');
-+
-+		// Resolve env vars from config and shell
-+		const lastActiveWorkspaceRoot = this._workspaceContextService.getWorkspaceFolder(lastActiveWorkspaceRootUri);
-+		const platformKey = platform.isWindows ? 'windows' : (platform.isMacintosh ? 'osx' : 'linux');
-+		const envFromConfig = TerminalInstance.resolveConfigurationVariables(this._configurationResolverService, { ...this._configHelper.config.env[platformKey] }, lastActiveWorkspaceRoot);
-+		const envFromShell = TerminalInstance.resolveConfigurationVariables(this._configurationResolverService, { ...this._shellLaunchConfig.env }, lastActiveWorkspaceRoot);
-+		this._shellLaunchConfig.env = envFromShell;
-+
-+		// Merge process env with the env from config
-+		const parentEnv = { ...process.env };
-+		TerminalInstance.mergeEnvironments(parentEnv, envFromConfig);
-+
-+		// Continue env initialization, merging in the env from the launch
-+		// config and adding keys that are needed to create the process
-+		const env = TerminalInstance.createTerminalEnv(parentEnv, this._shellLaunchConfig, this._initialCwd, locale, this._cols, this._rows);
-+		this._process = cp.fork(Uri.parse(require.toUrl('bootstrap')).fsPath, ['--type=terminal'], {
-+			env,
-+			cwd: Uri.parse(path.dirname(require.toUrl('../node/terminalProcess'))).fsPath,
-+			execArgv: port ? [`--inspect=${port}`] : []
-+		});
-+		this._processState = ProcessState.LAUNCHING;
-+>>>>>>> .their
- 
- 		if (this._shellLaunchConfig.name) {
- 			this.setTitle(this._shellLaunchConfig.name, false);
-@@ -724,6 +826,25 @@
- 			this.setTitle(this._shellLaunchConfig.executable, true);
- 			this._messageTitleDisposable = this._processManager.onProcessTitle(title => this.setTitle(title ? title : '', true));
- 		}
-+<<<<<<< .our
-+=======
-+		this._process.on('message', message => this._onPtyMessage(message));
-+		this._process.on('exit', exitCode => this._onPtyProcessExit(exitCode));
-+		setTimeout(() => {
-+			if (this._processState === ProcessState.LAUNCHING) {
-+				this._processState = ProcessState.RUNNING;
-+			}
-+		}, LAUNCHING_DURATION);
-+
-+		if (platform.isWindows) {
-+			this._processReady.then(() => {
-+				if (!this._isDisposed) {
-+					this._windowsShellHelper = new WindowsShellHelper(this._processId, this, this._xterm);
-+				}
-+			});
-+		}
-+	}
-+>>>>>>> .their
- 
- 		if (platform.isWindows) {
- 			this._processManager.ptyProcessReady.then(() => {
-@@ -736,12 +857,33 @@
- 		}
- 	}
- 
-+<<<<<<< .our
- 	private _onProcessData(data: string): void {
- 		if (this._widgetManager) {
- 			this._widgetManager.closeMessage();
- 		}
- 		if (this._xterm) {
- 			this._xterm.write(data);
-+=======
-+	private _onPtyMessage(message: { type: string, content: string }): void {
-+		if (message.type === 'data') {
-+			if (this._widgetManager) {
-+				this._widgetManager.closeMessage();
-+			}
-+			this._xtermReadyPromise.then(() => this._xterm.write(message.content));
-+		} else if (message.type === 'pid') {
-+			this._processId = parseInt(message.content, 10);
-+
-+			// Send any queued data that's waiting
-+			if (this._preLaunchInputQueue.length > 0) {
-+				this._process.send({
-+					event: 'input',
-+					data: this._preLaunchInputQueue
-+				});
-+				this._preLaunchInputQueue = null;
-+			}
-+			this._onProcessIdReady.fire(this);
-+>>>>>>> .their
- 		}
- 	}
- 
-@@ -834,11 +976,18 @@
- 		// Initialize new process
- 		const oldTitle = this._title;
- 		this._shellLaunchConfig = shell;
--		this._createProcess();
-+		if (this._envService.args['inspect-all']) {
-+			this._createProcessInDebugMode();
-+		} else {
-+			this._createProcess();
-+		}
- 		if (oldTitle !== this._title) {
- 			this.setTitle(this._title, true);
- 		}
-+<<<<<<< .our
- 		this._processManager.onProcessData(data => this._onProcessData(data));
-+=======
-+>>>>>>> .their
- 
- 		// Clean up waitOnExit state
- 		if (this._isExiting && this._shellLaunchConfig.waitOnExit) {
-@@ -846,8 +995,6 @@
- 			this._isExiting = false;
- 		}
- 
--		// Set the new shell launch config
--		this._shellLaunchConfig = shell;
- 	}
- 
- 	private _sendRendererInput(input: string): void {
-removed in local
-  base   100644 a7f066b25bd56c0e72dcf449320bc7d719933150 src/vs/workbench/parts/terminal/test/electron-browser/terminalInstance.test.ts
-  their  100644 2dbfc9385382adb94e61d3919e48055fa0599610 src/vs/workbench/parts/terminal/test/electron-browser/terminalInstance.test.ts
-changed in both
-  base   100644 4e881ab0b2ffa612f2278abbf2e1c43cbbf0e529 src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
-  our    100644 e30e323957d4065215ca39593ac4ac26251c0480 src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
-  their  100644 26db4cfa8d58bd4c934c8822c6afe815770e3ed7 src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
-@@ -10,7 +10,12 @@
- import * as objects from 'vs/base/common/objects';
- import { TPromise } from 'vs/base/common/winjs.base';
- import { isWindows, isLinux } from 'vs/base/common/platform';
-+<<<<<<< .our
- import { findFreePort } from 'vs/base/node/ports';
-+=======
-+import { findRandomFreePort, findFreePort } from 'vs/base/node/ports';
-+import { IMessageService, Severity } from 'vs/platform/message/common/message';
-+>>>>>>> .their
- import { ILifecycleService, ShutdownEvent } from 'vs/platform/lifecycle/common/lifecycle';
- import { IWindowsService, IWindowService } from 'vs/platform/windows/common/windows';
- import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-@@ -289,12 +294,17 @@
- 		} else {
- 			return TPromise.as({ expected: undefined, actual: 0 });
- 		}
-+
-+		const findPort = this._environmentService.args['inspect-all'] ? findRandomFreePort() : findFreePort(startPort, 10 /* try 10 ports */, 5000 /* try up to 5 seconds */);
-+
- 		return new TPromise((c, e) => {
--			return findFreePort(startPort, 10 /* try 10 ports */, 5000 /* try up to 5 seconds */).then(port => {
-+			return findPort.then(port => {
- 				if (!port) {
- 					console.warn('%c[Extension Host] %cCould not find a free port for debugging', 'color: blue', 'color: black');
- 				} else {
--					if (expected && port !== expected) {
-+					if (this._environmentService.args['inspect-all']) {
-+						console.log(`Extension host running in inspect mode using port: ${port}`);
-+					} else if (expected && port !== expected) {
- 						console.warn(`%c[Extension Host] %cProvided debugging port ${expected} is not free, using ${port} instead.`, 'color: blue', 'color: black');
- 					}
- 					if (this._isExtensionDevDebugBrk) {
-changed in both
-  base   100644 8b75deae37f611d9abe4c41ad2f8af9a234ac0f9 src/vs/workbench/workbench.main.ts
-  our    100644 184ccb27ce759508b970ffbffaf64adb3d96ca2f src/vs/workbench/workbench.main.ts
-  their  100644 f82071c76a684e8774bc2f8df7a4da7e86c8528e src/vs/workbench/workbench.main.ts
-@@ -124,6 +124,7 @@
- import 'vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution';
- 
- import 'vs/workbench/parts/performance/electron-browser/performance.contribution';
-+import 'vs/workbench/parts/performance/electron-browser/cpu.contribution';
- 
- import 'vs/workbench/parts/cli/electron-browser/cli.contribution';
- 
diff --git a/app/test/fixtures/merge-parser/vscode/merge-isidorn-normalizePaths-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-isidorn-normalizePaths-into-master.txt
deleted file mode 100644
index 0fe7d183146..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-isidorn-normalizePaths-into-master.txt
+++ /dev/null
@@ -1,119 +0,0 @@
-changed in both
-  base   100644 70c4b3ae231d8ff01a89e68336202be6b3ef6030 src/vs/base/common/paths.ts
-  our    100644 e5ed22fb7b905feb482624e3e7f407091cdf1024 src/vs/base/common/paths.ts
-  their  100644 af5284647d721f4363aa4adb42f559f2b7aaff82 src/vs/base/common/paths.ts
-@@ -319,6 +319,9 @@
- }
- 
- export function isEqual(pathA: string, pathB: string, ignoreCase?: boolean): boolean {
-+	pathA = normalize(pathA);
-+	pathB = normalize(pathB);
-+
- 	const identityEquals = (pathA === pathB);
- 	if (!ignoreCase || identityEquals) {
- 		return identityEquals;
-@@ -344,6 +347,9 @@
- 		return false;
- 	}
- 
-+	path = normalize(path);
-+	candidate = normalize(candidate);
-+
- 	if (ignoreCase) {
- 		const beginsWith = startsWithIgnoreCase(path, candidate);
- 		if (!beginsWith) {
-changed in both
-  base   100644 45814e12d24d6b98f0f284268c26935fcf801218 src/vs/base/common/resources.ts
-  our    100644 53357fe29f5f8919d794f7850dfaffd61f179591 src/vs/base/common/resources.ts
-  their  100644 48651112bbaf7d0e735714e736363379ae7e090f src/vs/base/common/resources.ts
-@@ -5,11 +5,15 @@
- 'use strict';
- 
- import * as paths from 'vs/base/common/paths';
-+<<<<<<< .our
- import URI from 'vs/base/common/uri';
- import { equalsIgnoreCase } from 'vs/base/common/strings';
- import { Schemas } from 'vs/base/common/network';
- import { isLinux, isWindows } from 'vs/base/common/platform';
- import { CharCode } from 'vs/base/common/charCode';
-+=======
-+import uri from 'vs/base/common/uri';
-+>>>>>>> .their
- 
- export function getComparisonKey(resource: URI): string {
- 	return hasToIgnoreCase(resource) ? resource.toString().toLowerCase() : resource.toString();
-@@ -56,11 +60,11 @@
- 		return false;
- 	}
- 
--	if (ignoreCase) {
--		return equalsIgnoreCase(first.toString(), second.toString());
-+	if (first.scheme === second.scheme && first.authority === second.authority) {
-+		return paths.isEqual(first.path, second.path, ignoreCase);
- 	}
- 
--	return first.toString() === second.toString();
-+	return false;
- }
- 
- export function basename(resource: URI): string {
-changed in both
-  base   100644 afcf1bbefb3cce59b98b033038529b6e8de501d3 src/vs/workbench/parts/files/common/explorerModel.ts
-  our    100644 49d64d0a561cfc89077f412464843a7b0f047e1f src/vs/workbench/parts/files/common/explorerModel.ts
-  their  100644 31fc24bd827444a06de0e8ae026f419f50a68e14 src/vs/workbench/parts/files/common/explorerModel.ts
-@@ -7,7 +7,6 @@
- 
- import URI from 'vs/base/common/uri';
- import * as paths from 'vs/base/common/paths';
--import * as resources from 'vs/base/common/resources';
- import { ResourceMap } from 'vs/base/common/map';
- import { isLinux } from 'vs/base/common/platform';
- import { IFileStat } from 'vs/platform/files/common/files';
-@@ -157,7 +156,11 @@
- 			// the folder is fully resolved if either it has a list of children or the client requested this by using the resolveTo
- 			// array of resource path to resolve.
- 			stat.isDirectoryResolved = !!raw.children || (!!resolveTo && resolveTo.some((r) => {
-+<<<<<<< .our
- 				return resources.isEqualOrParent(r, stat.resource, resources.hasToIgnoreCase(r));
-+=======
-+				return !!stat.find(r);
-+>>>>>>> .their
- 			}));
- 
- 			// Recurse into children
-changed in both
-  base   100644 ea60112f840405e2c3afe63a982e63c94a691094 src/vs/workbench/parts/files/electron-browser/views/explorerView.ts
-  our    100644 40850fe8f725373739fb0ea2990aa0abb55de3ae src/vs/workbench/parts/files/electron-browser/views/explorerView.ts
-  their  100644 69078f74e0129c17abadd998f00a06510e8b4f83 src/vs/workbench/parts/files/electron-browser/views/explorerView.ts
-@@ -41,8 +41,12 @@
- import { DelayedDragHandler } from 'vs/base/browser/dnd';
- import { Schemas } from 'vs/base/common/network';
- import { INotificationService } from 'vs/platform/notification/common/notification';
-+<<<<<<< .our
- import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
- import { IViewletPanelOptions } from 'vs/workbench/browser/parts/views/panelViewlet';
-+=======
-+import { equalsIgnoreCase } from 'vs/base/common/strings';
-+>>>>>>> .their
- 
- export interface IExplorerViewOptions extends IViewletViewOptions {
- 	viewletState: FileViewletState;
-@@ -879,11 +883,15 @@
- 	private getResolvedDirectories(stat: ExplorerItem, resolvedDirectories: URI[]): void {
- 		if (stat.isDirectoryResolved) {
- 			if (!stat.isRoot) {
--
-+				const areEqual = (first: string, second: string) => isLinux ? first === second : equalsIgnoreCase(first, second);
- 				// Drop those path which are parents of the current one
- 				for (let i = resolvedDirectories.length - 1; i >= 0; i--) {
--					const resource = resolvedDirectories[i];
--					if (resources.isEqualOrParent(stat.resource, resource, !isLinux /* ignorecase */)) {
-+					const resourceStr = resolvedDirectories[i].toString();
-+					let statToCompare = stat;
-+					while (statToCompare && !areEqual(statToCompare.resource.toString(), resourceStr)) {
-+						statToCompare = statToCompare.parent;
-+					}
-+					if (statToCompare) {
- 						resolvedDirectories.splice(i);
- 					}
- 				}
diff --git a/app/test/fixtures/merge-parser/vscode/merge-isidorn-resourceTrimTrailingSlash-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-isidorn-resourceTrimTrailingSlash-into-master.txt
deleted file mode 100644
index b05e6c2f364..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-isidorn-resourceTrimTrailingSlash-into-master.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-changed in both
-  base   100644 bbc5c6ca22330d8a7ca0127dfbeb52994efeee03 src/vs/base/common/resources.ts
-  our    100644 53357fe29f5f8919d794f7850dfaffd61f179591 src/vs/base/common/resources.ts
-  their  100644 d5a6bda7bb2281940b5ecf98493bce8192cbad36 src/vs/base/common/resources.ts
-@@ -5,21 +5,33 @@
- 'use strict';
- 
- import * as paths from 'vs/base/common/paths';
-+<<<<<<< .our
- import URI from 'vs/base/common/uri';
- import { equalsIgnoreCase } from 'vs/base/common/strings';
- import { Schemas } from 'vs/base/common/network';
- import { isLinux, isWindows } from 'vs/base/common/platform';
- import { CharCode } from 'vs/base/common/charCode';
-+=======
-+import uri from 'vs/base/common/uri';
-+import { equalsIgnoreCase, rtrim } from 'vs/base/common/strings';
-+>>>>>>> .their
- 
- export function getComparisonKey(resource: URI): string {
- 	return hasToIgnoreCase(resource) ? resource.toString().toLowerCase() : resource.toString();
- }
- 
-+<<<<<<< .our
- export function hasToIgnoreCase(resource: URI): boolean {
- 	// A file scheme resource is in the same platform as code, so ignore case for non linux platforms
- 	// Resource can be from another platform. Lowering the case as an hack. Should come from File system provider
- 	return resource && resource.scheme === Schemas.file ? !isLinux : true;
- }
-+=======
-+export function isEqualOrParent(resource: uri, candidate: uri, ignoreCase?: boolean): boolean {
-+	if (resource.scheme === candidate.scheme && resource.authority === candidate.authority) {
-+		return paths.isEqualOrParent(rtrim(resource.fsPath, paths.sep), rtrim(candidate.fsPath, paths.sep), ignoreCase);
-+	}
-+>>>>>>> .their
- 
- export function basenameOrAuthority(resource: URI): string {
- 	return basename(resource) || resource.authority;
-@@ -56,11 +68,13 @@
- 		return false;
- 	}
- 
-+	const firstStr = rtrim(first.toString(), paths.sep);
-+	const secondStr = rtrim(second.toString(), paths.sep);
- 	if (ignoreCase) {
--		return equalsIgnoreCase(first.toString(), second.toString());
-+		return equalsIgnoreCase(firstStr, secondStr);
- 	}
- 
--	return first.toString() === second.toString();
-+	return firstStr === secondStr;
- }
- 
- export function basename(resource: URI): string {
-@@ -172,6 +186,7 @@
- 
- 	return distinctParents;
- }
-+<<<<<<< .our
- 
- /**
-  * Tests wheter the given URL is a file URI created by `URI.parse` instead of `URI.file`.
-@@ -187,3 +202,5 @@
- 	return void 0;
- }
- 
-+=======
-+>>>>>>> .their
diff --git a/app/test/fixtures/merge-parser/vscode/merge-joao-compile-es6-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-joao-compile-es6-into-master.txt
deleted file mode 100644
index 7edfceb80e3..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-joao-compile-es6-into-master.txt
+++ /dev/null
@@ -1,141 +0,0 @@
-changed in both
-  base   100644 998ebb4f37933426d1055845731602a7d70ea7a3 build/lib/compilation.js
-  our    100644 ad73e2dcf7309fcc9c63b1c1b73c3f86ecac6dca build/lib/compilation.js
-  their  100644 8474b052a0d08f25e61ad512941f1661b7ea5453 build/lib/compilation.js
-@@ -63,8 +63,15 @@
- }
- function compileTask(src, out, build) {
-     return function () {
-+<<<<<<< .our
-         var compile = createCompile(src, build, true);
-         var srcPipe = es.merge(gulp.src(src + "/**", { base: "" + src }), gulp.src('node_modules/typescript/lib/lib.d.ts'));
-+=======
-+        var compile = createCompile(build, true);
-+        var src = es.merge(gulp.src('src/**', { base: 'src' }), 
-+        // gulp.src('node_modules/typescript/lib/lib.dom.d.ts'),
-+        gulp.src('node_modules/typescript/lib/lib.es6.d.ts'));
-+>>>>>>> .their
-         // Do not write .d.ts files to disk, as they are not needed there.
-         var dtsFilter = util.filter(function (data) { return !/\.d\.ts$/.test(data.path); });
-         return srcPipe
-@@ -78,8 +85,15 @@
- exports.compileTask = compileTask;
- function watchTask(out, build) {
-     return function () {
-+<<<<<<< .our
-         var compile = createCompile('src', build);
-         var src = es.merge(gulp.src('src/**', { base: 'src' }), gulp.src('node_modules/typescript/lib/lib.d.ts'));
-+=======
-+        var compile = createCompile(build);
-+        var src = es.merge(gulp.src('src/**', { base: 'src' }), 
-+        // gulp.src('node_modules/typescript/lib/lib.dom.d.ts'),
-+        gulp.src('node_modules/typescript/lib/lib.es6.d.ts'));
-+>>>>>>> .their
-         var watchSrc = watch('src/**', { base: 'src' });
-         // Do not write .d.ts files to disk, as they are not needed there.
-         var dtsFilter = util.filter(function (data) { return !/\.d\.ts$/.test(data.path); });
-changed in both
-  base   100644 cedcb4155b67881275825f7d0442cf4877dba9ce build/lib/compilation.ts
-  our    100644 33d8c11169093df0fd783c944e15dd2444a1594d build/lib/compilation.ts
-  their  100644 5fce216ae74fa44e64ef516b998a5c745ce19467 build/lib/compilation.ts
-@@ -76,9 +76,18 @@
- 	return function () {
- 		const compile = createCompile(src, build, true);
- 
-+<<<<<<< .our
- 		const srcPipe = es.merge(
- 			gulp.src(`${src}/**`, { base: `${src}` }),
- 			gulp.src('node_modules/typescript/lib/lib.d.ts'),
-+=======
-+		const src = es.merge(
-+			gulp.src('src/**', { base: 'src' }),
-+			// gulp.src('node_modules/typescript/lib/lib.dom.d.ts'),
-+			gulp.src('node_modules/typescript/lib/lib.es6.d.ts'),
-+			// gulp.src('node_modules/typescript/lib/lib.dom.iterable.d.ts'),
-+			// gulp.src('node_modules/typescript/lib/lib.scripthost.d.ts'),
-+>>>>>>> .their
- 		);
- 
- 		// Do not write .d.ts files to disk, as they are not needed there.
-@@ -100,7 +109,10 @@
- 
- 		const src = es.merge(
- 			gulp.src('src/**', { base: 'src' }),
--			gulp.src('node_modules/typescript/lib/lib.d.ts'),
-+			// gulp.src('node_modules/typescript/lib/lib.dom.d.ts'),
-+			gulp.src('node_modules/typescript/lib/lib.es6.d.ts'),
-+			// gulp.src('node_modules/typescript/lib/lib.dom.iterable.d.ts'),
-+			// gulp.src('node_modules/typescript/lib/lib.scripthost.d.ts'),
- 		);
- 		const watchSrc = watch('src/**', { base: 'src' });
- 
-merged
-  result 100644 11324aadb556f9c88dacf6b35dd091fdb447fe4d src/tsconfig.json
-  our    100644 408cad4917b111de7f66539f51d6de23be523d02 src/tsconfig.json
-@@ -5,7 +5,14 @@
- 		"noImplicitAny": false,
- 		"removeComments": false,
- 		"preserveConstEnums": true,
--		"target": "es5",
-+		"target": "es6",
-+		"lib": [
-+			"dom",
-+			"es5",
-+			"es2015.promise",
-+			"es2015.iterable",
-+			"es2015.collection"
-+		],
- 		"sourceMap": false,
- 		"experimentalDecorators": true,
- 		"declaration": true,
-@@ -14,12 +21,16 @@
- 		"noImplicitThis": true,
- 		"alwaysStrict": true,
- 		"baseUrl": ".",
--		"outDir": "../out",
-+		"outDir": "../out/vs",
- 		"typeRoots": [
- 			"typings"
- 		]
- 	},
- 	"exclude": [
-+		"typings/es6-promise.d.ts",
-+		"typings/lib.ie11_safe_es6.d.ts",
-+		"src/vs/base/common/winjs.polyfill.promise.ts",
-+		"src/vs/base/test/common/winjs.polyfill.promise.test.ts",
- 		"../out",
- 		"../out-build",
- 		"../out-vscode"
-merged
-  result 100644 9fb08a80011614f651dbf2e2fc5fb213ffa9acc3 src/typings/es6-promise.d.ts
-  our    100644 f674baa6a874584a8deeeceadf649a4dce792604 src/typings/es6-promise.d.ts
-@@ -81,4 +81,4 @@
- 		export function polyfill(): void;
- 	}
- 	export = rsvp;
--}
-+}
-\ No newline at end of file
-merged
-  result 100644 69cce99eb05de77dbfbdd6a5d3c39abd730cdee4 src/vs/base/common/types.ts
-  our    100644 5cae5c567f889b41d37bbc0ea343dbf8b434f818 src/vs/base/common/types.ts
-@@ -162,8 +162,16 @@
-  * any additional argument supplied.
-  */
- export function create(ctor: Function, ...args: any[]): any {
--	let obj = Object.create(ctor.prototype);
--	ctor.apply(obj, args);
-+	if (isES6Class(ctor)) {
-+		return new (ctor as any)(...args);
-+	} else {
-+		let obj = Object.create(ctor.prototype);
-+		ctor.apply(obj, args);
-+		return obj;
-+	}
-+}
- 
--	return obj;
-+function isES6Class(func) {
-+	// https://stackoverflow.com/questions/29093396/how-do-you-check-the-difference-between-an-ecmascript-6-class-and-function?answertab=votes#tab-top
-+	return typeof func === 'function' && /^class\s/.test(Function.prototype.toString.call(func));
- }
diff --git a/app/test/fixtures/merge-parser/vscode/merge-joao-linux-integration-tests-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-joao-linux-integration-tests-into-master.txt
deleted file mode 100644
index 80cd2389825..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-joao-linux-integration-tests-into-master.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-changed in both
-  base   100644 b5333d7de8d3d98e3db060247fc5e97fed35143c build/tfs/continuous-build.yml
-  our    100644 a2cfee540131cb5d87adb4bc09cbeaac203254b8 build/tfs/continuous-build.yml
-  their  100644 1abacbd4c317406f207c3870db29642cf59c7389 build/tfs/continuous-build.yml
-@@ -1,4 +1,5 @@
- phases:
-+<<<<<<< .our
- - phase: Windows
-   queue: Hosted VS2017
-   steps:
-@@ -12,4 +13,39 @@
- - phase: macOS
-   queue: Hosted macOS Preview
-   steps:
--  - template: darwin/continuous-build-darwin.yml
-\ No newline at end of file
-+  - template: darwin/continuous-build-darwin.yml
-+=======
-+- phase: Linux
-+  queue: Hosted Linux Preview
-+  steps:
-+  - script: |
-+      apt-get update
-+      apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 libgconf-2-4 dbus xvfb
-+      cp build/tfs/linux/x64/xvfb.init /etc/init.d/xvfb
-+      chmod +x /etc/init.d/xvfb
-+      update-rc.d xvfb defaults
-+      ln -sf /bin/dbus-daemon /usr/bin/dbus-daemon
-+      service xvfb start
-+      service dbus start
-+  - task: NodeTool@0
-+    inputs:
-+      versionSpec: "8.9.1"
-+  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-+    inputs:
-+      versionSpec: "1.3.2"
-+  - script: |
-+      yarn
-+      npm run gulp -- electron-x64
-+  - script: |
-+      # npm run gulp -- hygiene
-+      # ./node_modules/.bin/tsc -p ./src/tsconfig.monaco.json --noEmit
-+      npm run compile
-+    name: build
-+  - script: |
-+      # DISPLAY=:10 ./scripts/test.sh --tfs
-+      DISPLAY=:10 ./scripts/test-integration.sh
-+    name: test
-+  - task: PublishTestResults@2
-+    inputs:
-+      testResultsFiles: '.build/tests/unit-test-results.xml'
-+>>>>>>> .their
diff --git a/app/test/fixtures/merge-parser/vscode/merge-joao-npm5-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-joao-npm5-into-master.txt
deleted file mode 100644
index e0d89750750..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-joao-npm5-into-master.txt
+++ /dev/null
@@ -1,23726 +0,0 @@
-changed in both
-  base   100644 a729078205539fba023b5a6b6175586714343e1f build/gulpfile.hygiene.js
-  our    100644 6a4cd05d17fefc0e6fdc6e8d0fd2997f3c2894ff build/gulpfile.hygiene.js
-  their  100644 5ec7e58ee4aa2f1855e95625cb7dedb922722f72 build/gulpfile.hygiene.js
-@@ -61,10 +61,15 @@
- 
- 	// except multiple specific files
- 	'!**/package.json',
-+<<<<<<< .our
- 	'!**/yarn.lock',
- 	'!**/yarn-error.log',
- 
- 	// except multiple specific folders
-+=======
-+	'!**/*-shrinkwrap.json',
-+	'!**/package-lock.json',
-+>>>>>>> .their
- 	'!**/octicons/**',
- 	'!**/fixtures/**',
- 	'!**/lib/**',
-changed in both
-  base   100644 a7610ae620478dae64224e0e77e0f3d577d5ae68 build/lib/i18n.js
-  our    100644 61893ed8b1d64d1d9d09eea63a22779c7dfee56b build/lib/i18n.js
-  their  100644 c602385de748d8b6525de71f00d1bc411df50024 build/lib/i18n.js
-@@ -12,10 +12,15 @@
- var xml2js = require("xml2js");
- var glob = require("glob");
- var https = require("https");
-+<<<<<<< .our
- var gulp = require("gulp");
- var util = require('gulp-util');
- var iconv = require('iconv-lite');
- var NUMBER_OF_CONCURRENT_DOWNLOADS = 4;
-+=======
-+var util = require('gulp-util');
-+var iconv = require('iconv-lite');
-+>>>>>>> .their
- function log(message) {
-     var rest = [];
-     for (var _i = 1; _i < arguments.length; _i++) {
-@@ -23,6 +28,7 @@
-     }
-     util.log.apply(util, [util.colors.green('[i18n]'), message].concat(rest));
- }
-+<<<<<<< .our
- exports.defaultLanguages = [
-     { id: 'zh-tw', folderName: 'cht', transifexId: 'zh-hant' },
-     { id: 'zh-cn', folderName: 'chs', transifexId: 'zh-hans' },
-@@ -46,6 +52,8 @@
-     'vscode-node-debug': 'ms-vscode.node-debug',
-     'vscode-node-debug2': 'ms-vscode.node-debug2'
- };
-+=======
-+>>>>>>> .their
- var LocalizeInfo;
- (function (LocalizeInfo) {
-     function is(value) {
-@@ -89,7 +97,11 @@
-     }
-     ModuleJsonFormat.is = is;
- })(ModuleJsonFormat || (ModuleJsonFormat = {}));
-+<<<<<<< .our
- var Line = /** @class */ (function () {
-+=======
-+var Line = (function () {
-+>>>>>>> .their
-     function Line(indent) {
-         if (indent === void 0) { indent = 0; }
-         this.indent = indent;
-@@ -108,7 +120,11 @@
-     return Line;
- }());
- exports.Line = Line;
-+<<<<<<< .our
- var TextModel = /** @class */ (function () {
-+=======
-+var TextModel = (function () {
-+>>>>>>> .their
-     function TextModel(contents) {
-         this._lines = contents.split(/\r\n|\r|\n/);
-     }
-@@ -121,12 +137,19 @@
-     });
-     return TextModel;
- }());
-+<<<<<<< .our
- var XLF = /** @class */ (function () {
-+=======
-+var XLF = (function () {
-+>>>>>>> .their
-     function XLF(project) {
-         this.project = project;
-         this.buffer = [];
-         this.files = Object.create(null);
-+<<<<<<< .our
-         this.numberOfMessages = 0;
-+=======
-+>>>>>>> .their
-     }
-     XLF.prototype.toString = function () {
-         this.appendHeader();
-@@ -142,6 +165,7 @@
-         return this.buffer.join('\r\n');
-     };
-     XLF.prototype.addFile = function (original, keys, messages) {
-+<<<<<<< .our
-         if (keys.length === 0) {
-             console.log('No keys in ' + original);
-             return;
-@@ -172,11 +196,38 @@
-             existingKeys.add(realKey);
-             var message = encodeEntities(messages[i]);
-             this.files[original].push({ id: realKey, message: message, comment: comment });
-+=======
-+        this.files[original] = [];
-+        var existingKeys = [];
-+        for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
-+            var key = keys_1[_i];
-+            // Ignore duplicate keys because Transifex does not populate those with translated values.
-+            if (existingKeys.indexOf(key) !== -1) {
-+                continue;
-+            }
-+            existingKeys.push(key);
-+            var message = encodeEntities(messages[keys.indexOf(key)]);
-+            var comment = undefined;
-+            // Check if the message contains description (if so, it becomes an object type in JSON)
-+            if (Is.string(key)) {
-+                this.files[original].push({ id: key, message: message, comment: comment });
-+            }
-+            else {
-+                if (key['comment'] && key['comment'].length > 0) {
-+                    comment = key['comment'].map(function (comment) { return encodeEntities(comment); }).join('\r\n');
-+                }
-+                this.files[original].push({ id: key['key'], message: message, comment: comment });
-+            }
-+>>>>>>> .their
-         }
-     };
-     XLF.prototype.addStringItem = function (item) {
-         if (!item.id || !item.message) {
-+<<<<<<< .our
-             throw new Error("No item ID or value specified: " + JSON.stringify(item));
-+=======
-+            throw new Error('No item ID or value specified.');
-+>>>>>>> .their
-         }
-         this.appendNewLine("<trans-unit id=\"" + item.id + "\">", 4);
-         this.appendNewLine("<source xml:lang=\"en\">" + item.message + "</source>", 6);
-@@ -197,6 +248,7 @@
-         line.append(content);
-         this.buffer.push(line.toString());
-     };
-+<<<<<<< .our
-     XLF.parsePseudo = function (xlfString) {
-         return new Promise(function (resolve, reject) {
-             var parser = new xml2js.Parser();
-@@ -302,6 +354,114 @@
- function sortLanguages(languages) {
-     return languages.sort(function (a, b) {
-         return a.id < b.id ? -1 : (a.id > b.id ? 1 : 0);
-+=======
-+    return XLF;
-+}());
-+XLF.parse = function (xlfString) {
-+    return new Promise(function (resolve, reject) {
-+        var parser = new xml2js.Parser();
-+        var files = [];
-+        parser.parseString(xlfString, function (err, result) {
-+            if (err) {
-+                reject("Failed to parse XLIFF string. " + err);
-+            }
-+            var fileNodes = result['xliff']['file'];
-+            if (!fileNodes) {
-+                reject('XLIFF file does not contain "xliff" or "file" node(s) required for parsing.');
-+            }
-+            fileNodes.forEach(function (file) {
-+                var originalFilePath = file.$.original;
-+                if (!originalFilePath) {
-+                    reject('XLIFF file node does not contain original attribute to determine the original location of the resource file.');
-+                }
-+                var language = file.$['target-language'].toLowerCase();
-+                if (!language) {
-+                    reject('XLIFF file node does not contain target-language attribute to determine translated language.');
-+                }
-+                var messages = {};
-+                var transUnits = file.body[0]['trans-unit'];
-+                transUnits.forEach(function (unit) {
-+                    var key = unit.$.id;
-+                    if (!unit.target) {
-+                        return; // No translation available
-+                    }
-+                    var val = unit.target.toString();
-+                    if (key && val) {
-+                        messages[key] = decodeEntities(val);
-+                    }
-+                    else {
-+                        reject('XLIFF file does not contain full localization data. ID or target translation for one of the trans-unit nodes is not present.');
-+                    }
-+                });
-+                files.push({ messages: messages, originalFilePath: originalFilePath, language: language });
-+            });
-+            resolve(files);
-+        });
-+    });
-+};
-+exports.XLF = XLF;
-+var iso639_3_to_2 = {
-+    'chs': 'zh-cn',
-+    'cht': 'zh-tw',
-+    'csy': 'cs-cz',
-+    'deu': 'de',
-+    'enu': 'en',
-+    'esn': 'es',
-+    'fra': 'fr',
-+    'hun': 'hu',
-+    'ita': 'it',
-+    'jpn': 'ja',
-+    'kor': 'ko',
-+    'nld': 'nl',
-+    'plk': 'pl',
-+    'ptb': 'pt-br',
-+    'ptg': 'pt',
-+    'rus': 'ru',
-+    'sve': 'sv-se',
-+    'trk': 'tr'
-+};
-+/**
-+ * Used to map Transifex to VS Code language code representation.
-+ */
-+var iso639_2_to_3 = {
-+    'zh-hans': 'chs',
-+    'zh-hant': 'cht',
-+    'cs-cz': 'csy',
-+    'de': 'deu',
-+    'en': 'enu',
-+    'es': 'esn',
-+    'fr': 'fra',
-+    'hu': 'hun',
-+    'it': 'ita',
-+    'ja': 'jpn',
-+    'ko': 'kor',
-+    'nl': 'nld',
-+    'pl': 'plk',
-+    'pt-br': 'ptb',
-+    'pt': 'ptg',
-+    'ru': 'rus',
-+    'sv-se': 'sve',
-+    'tr': 'trk'
-+};
-+function sortLanguages(directoryNames) {
-+    return directoryNames.map(function (dirName) {
-+        var lower = dirName.toLowerCase();
-+        return {
-+            name: lower,
-+            iso639_2: iso639_3_to_2[lower]
-+        };
-+    }).sort(function (a, b) {
-+        if (!a.iso639_2 && !b.iso639_2) {
-+            return 0;
-+        }
-+        if (!a.iso639_2) {
-+            return -1;
-+        }
-+        if (!b.iso639_2) {
-+            return 1;
-+        }
-+        return a.iso639_2 < b.iso639_2 ? -1 : (a.iso639_2 > b.iso639_2 ? 1 : 0);
-+>>>>>>> .their
-     });
- }
- function stripComments(content) {
-@@ -389,7 +549,11 @@
-         defaultMessages[module] = messageMap;
-         keys.map(function (key, i) {
-             total++;
-+<<<<<<< .our
-             if (typeof key === 'string') {
-+=======
-+            if (Is.string(key)) {
-+>>>>>>> .their
-                 messageMap[key] = messages[i];
-             }
-             else {
-@@ -398,6 +562,7 @@
-         });
-     });
-     var languageDirectory = path.join(__dirname, '..', '..', 'i18n');
-+<<<<<<< .our
-     var sortedLanguages = sortLanguages(languages);
-     sortedLanguages.forEach(function (language) {
-         if (process.env['VSCODE_BUILD_VERBOSE']) {
-@@ -407,6 +572,25 @@
-         var localizedModules = Object.create(null);
-         var languageFolderName = language.folderName || language.id;
-         var cwd = path.join(languageDirectory, languageFolderName, 'src');
-+=======
-+    var languageDirs;
-+    if (languages) {
-+        languageDirs = sortLanguages(languages);
-+    }
-+    else {
-+        languageDirs = sortLanguages(fs.readdirSync(languageDirectory).filter(function (item) { return fs.statSync(path.join(languageDirectory, item)).isDirectory(); }));
-+    }
-+    languageDirs.forEach(function (language) {
-+        if (!language.iso639_2) {
-+            return;
-+        }
-+        if (process.env['VSCODE_BUILD_VERBOSE']) {
-+            log("Generating nls bundles for: " + language.iso639_2);
-+        }
-+        statistics[language.iso639_2] = 0;
-+        var localizedModules = Object.create(null);
-+        var cwd = path.join(languageDirectory, language.name, 'src');
-+>>>>>>> .their
-         modules.forEach(function (module) {
-             var order = keysSection[module];
-             var i18nFile = path.join(cwd, module) + '.i18n.json';
-@@ -420,12 +604,20 @@
-                     log("No localized messages found for module " + module + ". Using default messages.");
-                 }
-                 messages = defaultMessages[module];
-+<<<<<<< .our
-                 statistics[language.id] = statistics[language.id] + Object.keys(messages).length;
-+=======
-+                statistics[language.iso639_2] = statistics[language.iso639_2] + Object.keys(messages).length;
-+>>>>>>> .their
-             }
-             var localizedMessages = [];
-             order.forEach(function (keyInfo) {
-                 var key = null;
-+<<<<<<< .our
-                 if (typeof keyInfo === 'string') {
-+=======
-+                if (Is.string(keyInfo)) {
-+>>>>>>> .their
-                     key = keyInfo;
-                 }
-                 else {
-@@ -437,7 +629,11 @@
-                         log("No localized message found for key " + key + " in module " + module + ". Using default message.");
-                     }
-                     message = defaultMessages[module][key];
-+<<<<<<< .our
-                     statistics[language.id] = statistics[language.id] + 1;
-+=======
-+                    statistics[language.iso639_2] = statistics[language.iso639_2] + 1;
-+>>>>>>> .their
-                 }
-                 localizedMessages.push(message);
-             });
-@@ -447,7 +643,11 @@
-             var modules = bundleSection[bundle];
-             var contents = [
-                 fileHeader,
-+<<<<<<< .our
-                 "define(\"" + bundle + ".nls." + language.id + "\", {"
-+=======
-+                "define(\"" + bundle + ".nls." + language.iso639_2 + "\", {"
-+>>>>>>> .their
-             ];
-             modules.forEach(function (module, index) {
-                 contents.push("\t\"" + module + "\": [");
-@@ -462,17 +662,35 @@
-                 contents.push(index < modules.length - 1 ? '\t],' : '\t]');
-             });
-             contents.push('});');
-+<<<<<<< .our
-             emitter.queue(new File({ path: bundle + '.nls.' + language.id + '.js', contents: Buffer.from(contents.join('\n'), 'utf-8') }));
-+=======
-+            emitter.emit('data', new File({ path: bundle + '.nls.' + language.iso639_2 + '.js', contents: new Buffer(contents.join('\n'), 'utf-8') }));
-+>>>>>>> .their
-         });
-     });
-     Object.keys(statistics).forEach(function (key) {
-         var value = statistics[key];
-         log(key + " has " + value + " untranslated strings.");
-     });
-+<<<<<<< .our
-     sortedLanguages.forEach(function (language) {
-         var stats = statistics[language.id];
-         if (Is.undef(stats)) {
-             log("\tNo translations found for language " + language.id + ". Using default language instead.");
-+=======
-+    languageDirs.forEach(function (dir) {
-+        var language = dir.name;
-+        var iso639_2 = iso639_3_to_2[language];
-+        if (!iso639_2) {
-+            log("\tCouldn't find iso639 2 mapping for language " + language + ". Using default language instead.");
-+        }
-+        else {
-+            var stats = statistics[iso639_2];
-+            if (Is.undef(stats)) {
-+                log("\tNo translations found for language " + language + ". Using default language instead.");
-+            }
-+>>>>>>> .their
-         }
-     });
- }
-@@ -486,16 +704,50 @@
-             }
-             else {
-                 this.emit('error', "Failed to read component file: " + file.relative);
-+<<<<<<< .our
-                 return;
-+=======
-+>>>>>>> .their
-             }
-             if (BundledFormat.is(json)) {
-                 processCoreBundleFormat(opts.fileHeader, opts.languages, json, this);
-             }
-         }
-+<<<<<<< .our
-         this.queue(file);
-     });
- }
- exports.processNlsFiles = processNlsFiles;
-+=======
-+        this.emit('data', file);
-+    });
-+}
-+exports.processNlsFiles = processNlsFiles;
-+function prepareXlfFiles(projectName, extensionName) {
-+    return event_stream_1.through(function (file) {
-+        if (!file.isBuffer()) {
-+            throw new Error("Failed to read component file: " + file.relative);
-+        }
-+        var extension = path.extname(file.path);
-+        if (extension === '.json') {
-+            var json = JSON.parse(file.contents.toString('utf8'));
-+            if (BundledFormat.is(json)) {
-+                importBundleJson(file, json, this);
-+            }
-+            else if (PackageJsonFormat.is(json) || ModuleJsonFormat.is(json)) {
-+                importModuleOrPackageJson(file, json, projectName, this, extensionName);
-+            }
-+            else {
-+                throw new Error("JSON format cannot be deduced for " + file.relative + ".");
-+            }
-+        }
-+        else if (extension === '.isl') {
-+            importIsl(file, this);
-+        }
-+    });
-+}
-+exports.prepareXlfFiles = prepareXlfFiles;
-+>>>>>>> .their
- var editorProject = 'vscode-editor', workbenchProject = 'vscode-workbench', extensionsProject = 'vscode-extensions', setupProject = 'vscode-setup';
- function getResource(sourceFile) {
-     var resource;
-@@ -528,6 +780,7 @@
-     throw new Error("Could not identify the XLF bundle for " + sourceFile);
- }
- exports.getResource = getResource;
-+<<<<<<< .our
- function createXlfFilesForCoreBundle() {
-     return event_stream_1.through(function (file) {
-         var basename = path.basename(file.path);
-@@ -708,6 +961,115 @@
-     });
- }
- exports.createXlfFilesForIsl = createXlfFilesForIsl;
-+=======
-+function importBundleJson(file, json, stream) {
-+    var bundleXlfs = Object.create(null);
-+    for (var source in json.keys) {
-+        var projectResource = getResource(source);
-+        var resource = projectResource.name;
-+        var project = projectResource.project;
-+        var keys = json.keys[source];
-+        var messages = json.messages[source];
-+        if (keys.length !== messages.length) {
-+            throw new Error("There is a mismatch between keys and messages in " + file.relative);
-+        }
-+        var xlf = bundleXlfs[resource] ? bundleXlfs[resource] : bundleXlfs[resource] = new XLF(project);
-+        xlf.addFile('src/' + source, keys, messages);
-+    }
-+    for (var resource in bundleXlfs) {
-+        var newFilePath = bundleXlfs[resource].project + "/" + resource.replace(/\//g, '_') + ".xlf";
-+        var xlfFile = new File({ path: newFilePath, contents: new Buffer(bundleXlfs[resource].toString(), 'utf-8') });
-+        stream.emit('data', xlfFile);
-+    }
-+}
-+// Keeps existing XLF instances and a state of how many files were already processed for faster file emission
-+var extensions = Object.create(null);
-+function importModuleOrPackageJson(file, json, projectName, stream, extensionName) {
-+    if (ModuleJsonFormat.is(json) && json['keys'].length !== json['messages'].length) {
-+        throw new Error("There is a mismatch between keys and messages in " + file.relative);
-+    }
-+    // Prepare the source path for <original/> attribute in XLF & extract messages from JSON
-+    var formattedSourcePath = file.relative.replace(/\\/g, '/');
-+    var messages = Object.keys(json).map(function (key) { return json[key].toString(); });
-+    // Stores the amount of localization files to be transformed to XLF before the emission
-+    var localizationFilesCount, originalFilePath;
-+    // If preparing XLF for external extension, then use different glob pattern and source path
-+    if (extensionName) {
-+        localizationFilesCount = glob.sync('**/*.nls.json').length;
-+        originalFilePath = "" + formattedSourcePath.substr(0, formattedSourcePath.length - '.nls.json'.length);
-+    }
-+    else {
-+        // Used for vscode/extensions folder
-+        extensionName = formattedSourcePath.split('/')[0];
-+        localizationFilesCount = glob.sync("./extensions/" + extensionName + "/**/*.nls.json").length;
-+        originalFilePath = "extensions/" + formattedSourcePath.substr(0, formattedSourcePath.length - '.nls.json'.length);
-+    }
-+    var extension = extensions[extensionName] ?
-+        extensions[extensionName] : extensions[extensionName] = { xlf: new XLF(projectName), processed: 0 };
-+    // .nls.json can come with empty array of keys and messages, check for it
-+    if (ModuleJsonFormat.is(json) && json.keys.length !== 0) {
-+        extension.xlf.addFile(originalFilePath, json.keys, json.messages);
-+    }
-+    else if (PackageJsonFormat.is(json) && Object.keys(json).length !== 0) {
-+        extension.xlf.addFile(originalFilePath, Object.keys(json), messages);
-+    }
-+    // Check if XLF is populated with file nodes to emit it
-+    if (++extensions[extensionName].processed === localizationFilesCount) {
-+        var newFilePath = path.join(projectName, extensionName + '.xlf');
-+        var xlfFile = new File({ path: newFilePath, contents: new Buffer(extension.xlf.toString(), 'utf-8') });
-+        stream.emit('data', xlfFile);
-+    }
-+}
-+function importIsl(file, stream) {
-+    var projectName, resourceFile;
-+    if (path.basename(file.path) === 'Default.isl') {
-+        projectName = setupProject;
-+        resourceFile = 'setup_default.xlf';
-+    }
-+    else {
-+        projectName = workbenchProject;
-+        resourceFile = 'setup_messages.xlf';
-+    }
-+    var xlf = new XLF(projectName), keys = [], messages = [];
-+    var model = new TextModel(file.contents.toString());
-+    var inMessageSection = false;
-+    model.lines.forEach(function (line) {
-+        if (line.length === 0) {
-+            return;
-+        }
-+        var firstChar = line.charAt(0);
-+        switch (firstChar) {
-+            case ';':
-+                // Comment line;
-+                return;
-+            case '[':
-+                inMessageSection = '[Messages]' === line || '[CustomMessages]' === line;
-+                return;
-+        }
-+        if (!inMessageSection) {
-+            return;
-+        }
-+        var sections = line.split('=');
-+        if (sections.length !== 2) {
-+            throw new Error("Badly formatted message found: " + line);
-+        }
-+        else {
-+            var key = sections[0];
-+            var value = sections[1];
-+            if (key.length > 0 && value.length > 0) {
-+                keys.push(key);
-+                messages.push(value);
-+            }
-+        }
-+    });
-+    var originalPath = file.path.substring(file.cwd.length + 1, file.path.split('.')[0].length).replace(/\\/g, '/');
-+    xlf.addFile(originalPath, keys, messages);
-+    // Emit only upon all ISL files combined into single XLF instance
-+    var newFilePath = path.join(projectName, resourceFile);
-+    var xlfFile = new File({ path: newFilePath, contents: new Buffer(xlf.toString(), 'utf-8') });
-+    stream.emit('data', xlfFile);
-+}
-+>>>>>>> .their
- function pushXlfFiles(apiHostname, username, password) {
-     var tryGetPromises = [];
-     var updateCreatePromises = [];
-@@ -733,12 +1095,17 @@
-         // End the pipe only after all the communication with Transifex API happened
-         Promise.all(tryGetPromises).then(function () {
-             Promise.all(updateCreatePromises).then(function () {
-+<<<<<<< .our
-                 _this.queue(null);
-+=======
-+                _this.emit('end');
-+>>>>>>> .their
-             }).catch(function (reason) { throw new Error(reason); });
-         }).catch(function (reason) { throw new Error(reason); });
-     });
- }
- exports.pushXlfFiles = pushXlfFiles;
-+<<<<<<< .our
- function getAllResources(project, apiHostname, username, password) {
-     return new Promise(function (resolve, reject) {
-         var credentials = username + ":" + password;
-@@ -821,6 +1188,8 @@
-     });
- }
- exports.findObsoleteResources = findObsoleteResources;
-+=======
-+>>>>>>> .their
- function tryGetResource(project, slug, apiHostname, credentials) {
-     return new Promise(function (resolve, reject) {
-         var options = {
-@@ -920,6 +1289,7 @@
-         request.end();
-     });
- }
-+<<<<<<< .our
- // cache resources
- var _coreAndExtensionResources;
- function pullCoreAndExtensionsXlfFiles(apiHostname, username, password, language, externalExtensions) {
-@@ -956,6 +1326,42 @@
- function pullXlfFiles(apiHostname, username, password, language, resources) {
-     var credentials = username + ":" + password;
-     var expectedTranslationsCount = resources.length;
-+=======
-+function obtainProjectResources(projectName) {
-+    var resources = [];
-+    if (projectName === editorProject) {
-+        var json = fs.readFileSync('./build/lib/i18n.resources.json', 'utf8');
-+        resources = JSON.parse(json).editor;
-+    }
-+    else if (projectName === workbenchProject) {
-+        var json = fs.readFileSync('./build/lib/i18n.resources.json', 'utf8');
-+        resources = JSON.parse(json).workbench;
-+    }
-+    else if (projectName === extensionsProject) {
-+        var extensionsToLocalize = glob.sync('./extensions/**/*.nls.json').map(function (extension) { return extension.split('/')[2]; });
-+        var resourcesToPull_1 = [];
-+        extensionsToLocalize.forEach(function (extension) {
-+            if (resourcesToPull_1.indexOf(extension) === -1) {
-+                resourcesToPull_1.push(extension);
-+                resources.push({ name: extension, project: projectName });
-+            }
-+        });
-+    }
-+    else if (projectName === setupProject) {
-+        resources.push({ name: 'setup_default', project: setupProject });
-+    }
-+    return resources;
-+}
-+function pullXlfFiles(projectName, apiHostname, username, password, languages, resources) {
-+    if (!resources) {
-+        resources = obtainProjectResources(projectName);
-+    }
-+    if (!resources) {
-+        throw new Error('Transifex projects and resources must be defined to be able to pull translations from Transifex.');
-+    }
-+    var credentials = username + ":" + password;
-+    var expectedTranslationsCount = languages.length * resources.length;
-+>>>>>>> .their
-     var translationsRetrieved = 0, called = false;
-     return event_stream_1.readable(function (count, callback) {
-         // Mark end of stream when all resources were retrieved
-@@ -965,6 +1371,7 @@
-         if (!called) {
-             called = true;
-             var stream_1 = this;
-+<<<<<<< .our
-             resources.map(function (resource) {
-                 retrieveResource(language, resource, apiHostname, credentials).then(function (file) {
-                     if (file) {
-@@ -972,11 +1379,22 @@
-                     }
-                     translationsRetrieved++;
-                 }).catch(function (error) { throw new Error(error); });
-+=======
-+            // Retrieve XLF files from main projects
-+            languages.map(function (language) {
-+                resources.map(function (resource) {
-+                    retrieveResource(language, resource, apiHostname, credentials).then(function (file) {
-+                        stream_1.emit('data', file);
-+                        translationsRetrieved++;
-+                    }).catch(function (error) { throw new Error(error); });
-+                });
-+>>>>>>> .their
-             });
-         }
-         callback();
-     });
- }
-+<<<<<<< .our
- var limiter = new Limiter(NUMBER_OF_CONCURRENT_DOWNLOADS);
- function retrieveResource(language, resource, apiHostname, credentials) {
-     return limiter.queue(function () { return new Promise(function (resolve, reject) {
-@@ -991,11 +1409,26 @@
-             method: 'GET'
-         };
-         console.log('[transifex] Fetching ' + options.path);
-+=======
-+exports.pullXlfFiles = pullXlfFiles;
-+function retrieveResource(language, resource, apiHostname, credentials) {
-+    return new Promise(function (resolve, reject) {
-+        var slug = resource.name.replace(/\//g, '_');
-+        var project = resource.project;
-+        var iso639 = language.toLowerCase();
-+        var options = {
-+            hostname: apiHostname,
-+            path: "/api/2/project/" + project + "/resource/" + slug + "/translation/" + iso639 + "?file&mode=onlyreviewed",
-+            auth: credentials,
-+            method: 'GET'
-+        };
-+>>>>>>> .their
-         var request = https.request(options, function (res) {
-             var xlfBuffer = [];
-             res.on('data', function (chunk) { return xlfBuffer.push(chunk); });
-             res.on('end', function () {
-                 if (res.statusCode === 200) {
-+<<<<<<< .our
-                     resolve(new File({ contents: Buffer.concat(xlfBuffer), path: project + "/" + slug + ".xlf" }));
-                 }
-                 else if (res.statusCode === 404) {
-@@ -1095,10 +1528,48 @@
-                     mainPack.contents[path.substr(firstSlash + 1)] = file.messages;
-                 }
-             });
-+=======
-+                    resolve(new File({ contents: Buffer.concat(xlfBuffer), path: project + "/" + iso639_2_to_3[language] + "/" + slug + ".xlf" }));
-+                }
-+                reject(slug + " in " + project + " returned no data. Response code: " + res.statusCode + ".");
-+            });
-+        });
-+        request.on('error', function (err) {
-+            reject("Failed to query resource " + slug + " with the following error: " + err);
-+        });
-+        request.end();
-+    });
-+}
-+function prepareJsonFiles() {
-+    var parsePromises = [];
-+    return event_stream_1.through(function (xlf) {
-+        var stream = this;
-+        var parsePromise = XLF.parse(xlf.contents.toString());
-+        parsePromises.push(parsePromise);
-+        parsePromise.then(function (resolvedFiles) {
-+            resolvedFiles.forEach(function (file) {
-+                var messages = file.messages, translatedFile;
-+                // ISL file path always starts with 'build/'
-+                if (/^build\//.test(file.originalFilePath)) {
-+                    var defaultLanguages = { 'zh-hans': true, 'zh-hant': true, 'ko': true };
-+                    if (path.basename(file.originalFilePath) === 'Default' && !defaultLanguages[file.language]) {
-+                        return;
-+                    }
-+                    translatedFile = createIslFile('..', file.originalFilePath, messages, iso639_2_to_3[file.language]);
-+                }
-+                else {
-+                    translatedFile = createI18nFile(iso639_2_to_3[file.language], file.originalFilePath, messages);
-+                }
-+                stream.emit('data', translatedFile);
-+            });
-+        }, function (rejectReason) {
-+            throw new Error("XLF parsing error: " + rejectReason);
-+>>>>>>> .their
-         });
-     }, function () {
-         var _this = this;
-         Promise.all(parsePromises)
-+<<<<<<< .our
-             .then(function () {
-             var translatedMainFile = createI18nFile('./main', mainPack);
-             resultingTranslationPaths.push({ id: 'vscode', resourceName: 'main.i18n.json' });
-@@ -1144,6 +1615,51 @@
- }
- exports.prepareIslFiles = prepareIslFiles;
- function createIslFile(originalFilePath, messages, language, innoSetup) {
-+=======
-+            .then(function () { _this.emit('end'); })
-+            .catch(function (reason) { throw new Error(reason); });
-+    });
-+}
-+exports.prepareJsonFiles = prepareJsonFiles;
-+function createI18nFile(base, originalFilePath, messages) {
-+    var content = [
-+        '/*---------------------------------------------------------------------------------------------',
-+        ' *  Copyright (c) Microsoft Corporation. All rights reserved.',
-+        ' *  Licensed under the MIT License. See License.txt in the project root for license information.',
-+        ' *--------------------------------------------------------------------------------------------*/',
-+        '// Do not edit this file. It is machine generated.'
-+    ].join('\n') + '\n' + JSON.stringify(messages, null, '\t').replace(/\r\n/g, '\n');
-+    return new File({
-+        path: path.join(base, originalFilePath + '.i18n.json'),
-+        contents: new Buffer(content, 'utf8')
-+    });
-+}
-+var languageNames = {
-+    'chs': 'Simplified Chinese',
-+    'cht': 'Traditional Chinese',
-+    'kor': 'Korean'
-+};
-+var languageIds = {
-+    'chs': '$0804',
-+    'cht': '$0404',
-+    'kor': '$0412'
-+};
-+var encodings = {
-+    'chs': 'CP936',
-+    'cht': 'CP950',
-+    'jpn': 'CP932',
-+    'kor': 'CP949',
-+    'deu': 'CP1252',
-+    'fra': 'CP1252',
-+    'esn': 'CP1252',
-+    'rus': 'CP1251',
-+    'ita': 'CP1252',
-+    'ptb': 'CP1252',
-+    'hun': 'CP1250',
-+    'trk': 'CP1254'
-+};
-+function createIslFile(base, originalFilePath, messages, language) {
-+>>>>>>> .their
-     var content = [];
-     var originalContent;
-     if (path.basename(originalFilePath) === 'Default') {
-@@ -1157,7 +1673,11 @@
-             var firstChar = line.charAt(0);
-             if (firstChar === '[' || firstChar === ';') {
-                 if (line === '; *** Inno Setup version 5.5.3+ English messages ***') {
-+<<<<<<< .our
-                     content.push("; *** Inno Setup version 5.5.3+ " + innoSetup.defaultInfo.name + " messages ***");
-+=======
-+                    content.push("; *** Inno Setup version 5.5.3+ " + languageNames[language] + " messages ***");
-+>>>>>>> .their
-                 }
-                 else {
-                     content.push(line);
-@@ -1169,6 +1689,7 @@
-                 var translated = line;
-                 if (key) {
-                     if (key === 'LanguageName') {
-+<<<<<<< .our
-                         translated = key + "=" + innoSetup.defaultInfo.name;
-                     }
-                     else if (key === 'LanguageID') {
-@@ -1176,6 +1697,15 @@
-                     }
-                     else if (key === 'LanguageCodePage') {
-                         translated = key + "=" + innoSetup.codePage.substr(2);
-+=======
-+                        translated = key + "=" + languageNames[language];
-+                    }
-+                    else if (key === 'LanguageID') {
-+                        translated = key + "=" + languageIds[language];
-+                    }
-+                    else if (key === 'LanguageCodePage') {
-+                        translated = key + "=" + encodings[language].substr(2);
-+>>>>>>> .their
-                     }
-                     else {
-                         var translatedMessage = messages[key];
-@@ -1188,11 +1718,20 @@
-             }
-         }
-     });
-+<<<<<<< .our
-     var basename = path.basename(originalFilePath);
-     var filePath = basename + "." + language.id + ".isl";
-     return new File({
-         path: filePath,
-         contents: iconv.encode(Buffer.from(content.join('\r\n'), 'utf8'), innoSetup.codePage)
-+=======
-+    var tag = iso639_3_to_2[language];
-+    var basename = path.basename(originalFilePath);
-+    var filePath = path.join(base, path.dirname(originalFilePath), basename) + "." + tag + ".isl";
-+    return new File({
-+        path: filePath,
-+        contents: iconv.encode(new Buffer(content.join('\r\n'), 'utf8'), encodings[language])
-+>>>>>>> .their
-     });
- }
- function encodeEntities(value) {
-@@ -1218,6 +1757,9 @@
- function decodeEntities(value) {
-     return value.replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&amp;/g, '&');
- }
-+<<<<<<< .our
- function pseudify(message) {
-     return '\uFF3B' + message.replace(/[aouei]/g, '$&$&') + '\uFF3D';
- }
-+=======
-+>>>>>>> .their
-added in remote
-  their  100644 955bfe240aa0d11778ea04fe11fe420ea95d57a3 build/lib/watch/package-lock.json
-@@ -0,0 +1,2067 @@
-+{
-+  "name": "watch",
-+  "version": "1.0.0",
-+  "lockfileVersion": 1,
-+  "requires": true,
-+  "dependencies": {
-+    "ansi-regex": {
-+      "version": "2.1.1",
-+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-+      "dev": true
-+    },
-+    "ansi-styles": {
-+      "version": "2.2.1",
-+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-+      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-+      "dev": true
-+    },
-+    "anymatch": {
-+      "version": "1.3.0",
-+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz",
-+      "integrity": "sha1-o+Uvo5FoyCX/V7AkgSbOWo/5VQc=",
-+      "dev": true,
-+      "requires": {
-+        "arrify": "1.0.1",
-+        "micromatch": "2.3.11"
-+      }
-+    },
-+    "arr-diff": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-+      "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
-+      "dev": true,
-+      "requires": {
-+        "arr-flatten": "1.0.3"
-+      }
-+    },
-+    "arr-flatten": {
-+      "version": "1.0.3",
-+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.3.tgz",
-+      "integrity": "sha1-onTthawIhJtr14R8RYB0XcUa37E=",
-+      "dev": true
-+    },
-+    "array-differ": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
-+      "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=",
-+      "dev": true
-+    },
-+    "array-uniq": {
-+      "version": "1.0.3",
-+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
-+      "dev": true
-+    },
-+    "array-unique": {
-+      "version": "0.2.1",
-+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-+      "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-+      "dev": true
-+    },
-+    "arrify": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-+      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
-+      "dev": true
-+    },
-+    "asap": {
-+      "version": "2.0.5",
-+      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.5.tgz",
-+      "integrity": "sha1-UidltQw1EEkOUtfc/ghe+bqWlY8=",
-+      "dev": true
-+    },
-+    "async-each": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz",
-+      "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=",
-+      "dev": true
-+    },
-+    "balanced-match": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-+      "dev": true
-+    },
-+    "beeper": {
-+      "version": "1.1.1",
-+      "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz",
-+      "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=",
-+      "dev": true
-+    },
-+    "binary-extensions": {
-+      "version": "1.8.0",
-+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.8.0.tgz",
-+      "integrity": "sha1-SOyNFt9Dd+rl+liEaCSAr02Vx3Q=",
-+      "dev": true
-+    },
-+    "brace-expansion": {
-+      "version": "1.1.8",
-+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
-+      "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
-+      "dev": true,
-+      "requires": {
-+        "balanced-match": "1.0.0",
-+        "concat-map": "0.0.1"
-+      }
-+    },
-+    "braces": {
-+      "version": "1.8.5",
-+      "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-+      "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
-+      "dev": true,
-+      "requires": {
-+        "expand-range": "1.8.2",
-+        "preserve": "0.2.0",
-+        "repeat-element": "1.1.2"
-+      }
-+    },
-+    "chalk": {
-+      "version": "1.1.3",
-+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-+      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-+      "dev": true,
-+      "requires": {
-+        "ansi-styles": "2.2.1",
-+        "escape-string-regexp": "1.0.5",
-+        "has-ansi": "2.0.0",
-+        "strip-ansi": "3.0.1",
-+        "supports-color": "2.0.0"
-+      }
-+    },
-+    "chokidar": {
-+      "version": "1.7.0",
-+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
-+      "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
-+      "dev": true,
-+      "requires": {
-+        "anymatch": "1.3.0",
-+        "async-each": "1.0.1",
-+        "fsevents": "1.1.2",
-+        "glob-parent": "2.0.0",
-+        "inherits": "2.0.3",
-+        "is-binary-path": "1.0.1",
-+        "is-glob": "2.0.1",
-+        "path-is-absolute": "1.0.1",
-+        "readdirp": "2.1.0"
-+      },
-+      "dependencies": {
-+        "glob-parent": {
-+          "version": "2.0.0",
-+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-+          "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
-+          "dev": true,
-+          "requires": {
-+            "is-glob": "2.0.1"
-+          }
-+        }
-+      }
-+    },
-+    "clone": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz",
-+      "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=",
-+      "dev": true
-+    },
-+    "clone-stats": {
-+      "version": "0.0.1",
-+      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
-+      "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=",
-+      "dev": true
-+    },
-+    "concat-map": {
-+      "version": "0.0.1",
-+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-+      "dev": true
-+    },
-+    "core-util-is": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-+      "dev": true
-+    },
-+    "dateformat": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.0.0.tgz",
-+      "integrity": "sha1-J0Pjq7XD/CRi5SfcpEXgTp9N7hc=",
-+      "dev": true
-+    },
-+    "duplexer2": {
-+      "version": "0.0.2",
-+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-+      "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
-+      "dev": true,
-+      "requires": {
-+        "readable-stream": "1.1.14"
-+      },
-+      "dependencies": {
-+        "isarray": {
-+          "version": "0.0.1",
-+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-+          "dev": true
-+        },
-+        "readable-stream": {
-+          "version": "1.1.14",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-+          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-+          "dev": true,
-+          "requires": {
-+            "core-util-is": "1.0.2",
-+            "inherits": "2.0.3",
-+            "isarray": "0.0.1",
-+            "string_decoder": "0.10.31"
-+          }
-+        },
-+        "string_decoder": {
-+          "version": "0.10.31",
-+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "escape-string-regexp": {
-+      "version": "1.0.5",
-+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-+      "dev": true
-+    },
-+    "expand-brackets": {
-+      "version": "0.1.5",
-+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
-+      "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
-+      "dev": true,
-+      "requires": {
-+        "is-posix-bracket": "0.1.1"
-+      }
-+    },
-+    "expand-range": {
-+      "version": "1.8.2",
-+      "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
-+      "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
-+      "dev": true,
-+      "requires": {
-+        "fill-range": "2.2.3"
-+      }
-+    },
-+    "extglob": {
-+      "version": "0.3.2",
-+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
-+      "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
-+      "dev": true,
-+      "requires": {
-+        "is-extglob": "1.0.0"
-+      }
-+    },
-+    "fancy-log": {
-+      "version": "1.3.0",
-+      "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.0.tgz",
-+      "integrity": "sha1-Rb4X0Cu5kX1gzP/UmVyZnmyMmUg=",
-+      "dev": true,
-+      "requires": {
-+        "chalk": "1.1.3",
-+        "time-stamp": "1.1.0"
-+      }
-+    },
-+    "filename-regex": {
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
-+      "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
-+      "dev": true
-+    },
-+    "fill-range": {
-+      "version": "2.2.3",
-+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
-+      "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
-+      "dev": true,
-+      "requires": {
-+        "is-number": "2.1.0",
-+        "isobject": "2.1.0",
-+        "randomatic": "1.1.7",
-+        "repeat-element": "1.1.2",
-+        "repeat-string": "1.6.1"
-+      }
-+    },
-+    "first-chunk-stream": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz",
-+      "integrity": "sha1-G97NuOCDwGZLkZRVgVd6Q6nzHXA=",
-+      "dev": true,
-+      "requires": {
-+        "readable-stream": "2.3.3"
-+      }
-+    },
-+    "for-in": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-+      "dev": true
-+    },
-+    "for-own": {
-+      "version": "0.1.5",
-+      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-+      "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
-+      "dev": true,
-+      "requires": {
-+        "for-in": "1.0.2"
-+      }
-+    },
-+    "fs-extra": {
-+      "version": "0.26.7",
-+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz",
-+      "integrity": "sha1-muH92UiXeY7at20JGM9C0MMYT6k=",
-+      "dev": true,
-+      "requires": {
-+        "graceful-fs": "4.1.11",
-+        "jsonfile": "2.4.0",
-+        "klaw": "1.3.1",
-+        "path-is-absolute": "1.0.1",
-+        "rimraf": "2.6.1"
-+      }
-+    },
-+    "fs.realpath": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-+      "dev": true
-+    },
-+    "fsevents": {
-+      "version": "1.1.2",
-+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz",
-+      "integrity": "sha512-Sn44E5wQW4bTHXvQmvSHwqbuiXtduD6Rrjm2ZtUEGbyrig+nUH3t/QD4M4/ZXViY556TBpRgZkHLDx3JxPwxiw==",
-+      "dev": true,
-+      "optional": true,
-+      "requires": {
-+        "nan": "2.6.2",
-+        "node-pre-gyp": "0.6.36"
-+      },
-+      "dependencies": {
-+        "abbrev": {
-+          "version": "1.1.0",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "ajv": {
-+          "version": "4.11.8",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+            "co": "4.6.0",
-+            "json-stable-stringify": "1.0.1"
-+          }
-+        },
-+        "ansi-regex": {
-+          "version": "2.1.1",
-+          "bundled": true,
-+          "dev": true
-+        },
-+        "aproba": {
-+          "version": "1.1.1",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "are-we-there-yet": {
-+          "version": "1.1.4",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+            "delegates": "1.0.0",
-+            "readable-stream": "2.2.9"
-+          }
-+        },
-+        "asn1": {
-+          "version": "0.2.3",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "assert-plus": {
-+          "version": "0.2.0",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "asynckit": {
-+          "version": "0.4.0",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "aws-sign2": {
-+          "version": "0.6.0",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "aws4": {
-+          "version": "1.6.0",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "balanced-match": {
-+          "version": "0.4.2",
-+          "bundled": true,
-+          "dev": true
-+        },
-+        "bcrypt-pbkdf": {
-+          "version": "1.0.1",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+            "tweetnacl": "0.14.5"
-+          }
-+        },
-+        "block-stream": {
-+          "version": "0.0.9",
-+          "bundled": true,
-+          "dev": true,
-+          "requires": {
-+            "inherits": "2.0.3"
-+          }
-+        },
-+        "boom": {
-+          "version": "2.10.1",
-+          "bundled": true,
-+          "dev": true,
-+          "requires": {
-+            "hoek": "2.16.3"
-+          }
-+        },
-+        "brace-expansion": {
-+          "version": "1.1.7",
-+          "bundled": true,
-+          "dev": true,
-+          "requires": {
-+            "balanced-match": "0.4.2",
-+            "concat-map": "0.0.1"
-+          }
-+        },
-+        "buffer-shims": {
-+          "version": "1.0.0",
-+          "bundled": true,
-+          "dev": true
-+        },
-+        "caseless": {
-+          "version": "0.12.0",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "co": {
-+          "version": "4.6.0",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "code-point-at": {
-+          "version": "1.1.0",
-+          "bundled": true,
-+          "dev": true
-+        },
-+        "combined-stream": {
-+          "version": "1.0.5",
-+          "bundled": true,
-+          "dev": true,
-+          "requires": {
-+            "delayed-stream": "1.0.0"
-+          }
-+        },
-+        "concat-map": {
-+          "version": "0.0.1",
-+          "bundled": true,
-+          "dev": true
-+        },
-+        "console-control-strings": {
-+          "version": "1.1.0",
-+          "bundled": true,
-+          "dev": true
-+        },
-+        "core-util-is": {
-+          "version": "1.0.2",
-+          "bundled": true,
-+          "dev": true
-+        },
-+        "cryptiles": {
-+          "version": "2.0.5",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+            "boom": "2.10.1"
-+          }
-+        },
-+        "dashdash": {
-+          "version": "1.14.1",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+            "assert-plus": "1.0.0"
-+          },
-+          "dependencies": {
-+            "assert-plus": {
-+              "version": "1.0.0",
-+              "bundled": true,
-+              "dev": true,
-+              "optional": true
-+            }
-+          }
-+        },
-+        "debug": {
-+          "version": "2.6.8",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+            "ms": "2.0.0"
-+          }
-+        },
-+        "deep-extend": {
-+          "version": "0.4.2",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "delayed-stream": {
-+          "version": "1.0.0",
-+          "bundled": true,
-+          "dev": true
-+        },
-+        "delegates": {
-+          "version": "1.0.0",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "ecc-jsbn": {
-+          "version": "0.1.1",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+            "jsbn": "0.1.1"
-+          }
-+        },
-+        "extend": {
-+          "version": "3.0.1",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "extsprintf": {
-+          "version": "1.0.2",
-+          "bundled": true,
-+          "dev": true
-+        },
-+        "forever-agent": {
-+          "version": "0.6.1",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "form-data": {
-+          "version": "2.1.4",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+            "asynckit": "0.4.0",
-+            "combined-stream": "1.0.5",
-+            "mime-types": "2.1.15"
-+          }
-+        },
-+        "fs.realpath": {
-+          "version": "1.0.0",
-+          "bundled": true,
-+          "dev": true
-+        },
-+        "fstream": {
-+          "version": "1.0.11",
-+          "bundled": true,
-+          "dev": true,
-+          "requires": {
-+            "graceful-fs": "4.1.11",
-+            "inherits": "2.0.3",
-+            "mkdirp": "0.5.1",
-+            "rimraf": "2.6.1"
-+          }
-+        },
-+        "fstream-ignore": {
-+          "version": "1.0.5",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+            "fstream": "1.0.11",
-+            "inherits": "2.0.3",
-+            "minimatch": "3.0.4"
-+          }
-+        },
-+        "gauge": {
-+          "version": "2.7.4",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+            "aproba": "1.1.1",
-+            "console-control-strings": "1.1.0",
-+            "has-unicode": "2.0.1",
-+            "object-assign": "4.1.1",
-+            "signal-exit": "3.0.2",
-+            "string-width": "1.0.2",
-+            "strip-ansi": "3.0.1",
-+            "wide-align": "1.1.2"
-+          }
-+        },
-+        "getpass": {
-+          "version": "0.1.7",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+            "assert-plus": "1.0.0"
-+          },
-+          "dependencies": {
-+            "assert-plus": {
-+              "version": "1.0.0",
-+              "bundled": true,
-+              "dev": true,
-+              "optional": true
-+            }
-+          }
-+        },
-+        "glob": {
-+          "version": "7.1.2",
-+          "bundled": true,
-+          "dev": true,
-+          "requires": {
-+            "fs.realpath": "1.0.0",
-+            "inflight": "1.0.6",
-+            "inherits": "2.0.3",
-+            "minimatch": "3.0.4",
-+            "once": "1.4.0",
-+            "path-is-absolute": "1.0.1"
-+          }
-+        },
-+        "graceful-fs": {
-+          "version": "4.1.11",
-+          "bundled": true,
-+          "dev": true
-+        },
-+        "har-schema": {
-+          "version": "1.0.5",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "har-validator": {
-+          "version": "4.2.1",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+            "ajv": "4.11.8",
-+            "har-schema": "1.0.5"
-+          }
-+        },
-+        "has-unicode": {
-+          "version": "2.0.1",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "hawk": {
-+          "version": "3.1.3",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+            "boom": "2.10.1",
-+            "cryptiles": "2.0.5",
-+            "hoek": "2.16.3",
-+            "sntp": "1.0.9"
-+          }
-+        },
-+        "hoek": {
-+          "version": "2.16.3",
-+          "bundled": true,
-+          "dev": true
-+        },
-+        "http-signature": {
-+          "version": "1.1.1",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+            "assert-plus": "0.2.0",
-+            "jsprim": "1.4.0",
-+            "sshpk": "1.13.0"
-+          }
-+        },
-+        "inflight": {
-+          "version": "1.0.6",
-+          "bundled": true,
-+          "dev": true,
-+          "requires": {
-+            "once": "1.4.0",
-+            "wrappy": "1.0.2"
-+          }
-+        },
-+        "inherits": {
-+          "version": "2.0.3",
-+          "bundled": true,
-+          "dev": true
-+        },
-+        "ini": {
-+          "version": "1.3.4",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "is-fullwidth-code-point": {
-+          "version": "1.0.0",
-+          "bundled": true,
-+          "dev": true,
-+          "requires": {
-+            "number-is-nan": "1.0.1"
-+          }
-+        },
-+        "is-typedarray": {
-+          "version": "1.0.0",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "isarray": {
-+          "version": "1.0.0",
-+          "bundled": true,
-+          "dev": true
-+        },
-+        "isstream": {
-+          "version": "0.1.2",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "jodid25519": {
-+          "version": "1.0.2",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+            "jsbn": "0.1.1"
-+          }
-+        },
-+        "jsbn": {
-+          "version": "0.1.1",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "json-schema": {
-+          "version": "0.2.3",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "json-stable-stringify": {
-+          "version": "1.0.1",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+            "jsonify": "0.0.0"
-+          }
-+        },
-+        "json-stringify-safe": {
-+          "version": "5.0.1",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "jsonify": {
-+          "version": "0.0.0",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "jsprim": {
-+          "version": "1.4.0",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+            "assert-plus": "1.0.0",
-+            "extsprintf": "1.0.2",
-+            "json-schema": "0.2.3",
-+            "verror": "1.3.6"
-+          },
-+          "dependencies": {
-+            "assert-plus": {
-+              "version": "1.0.0",
-+              "bundled": true,
-+              "dev": true,
-+              "optional": true
-+            }
-+          }
-+        },
-+        "mime-db": {
-+          "version": "1.27.0",
-+          "bundled": true,
-+          "dev": true
-+        },
-+        "mime-types": {
-+          "version": "2.1.15",
-+          "bundled": true,
-+          "dev": true,
-+          "requires": {
-+            "mime-db": "1.27.0"
-+          }
-+        },
-+        "minimatch": {
-+          "version": "3.0.4",
-+          "bundled": true,
-+          "dev": true,
-+          "requires": {
-+            "brace-expansion": "1.1.7"
-+          }
-+        },
-+        "minimist": {
-+          "version": "0.0.8",
-+          "bundled": true,
-+          "dev": true
-+        },
-+        "mkdirp": {
-+          "version": "0.5.1",
-+          "bundled": true,
-+          "dev": true,
-+          "requires": {
-+            "minimist": "0.0.8"
-+          }
-+        },
-+        "ms": {
-+          "version": "2.0.0",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "node-pre-gyp": {
-+          "version": "0.6.36",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+            "mkdirp": "0.5.1",
-+            "nopt": "4.0.1",
-+            "npmlog": "4.1.0",
-+            "rc": "1.2.1",
-+            "request": "2.81.0",
-+            "rimraf": "2.6.1",
-+            "semver": "5.3.0",
-+            "tar": "2.2.1",
-+            "tar-pack": "3.4.0"
-+          }
-+        },
-+        "nopt": {
-+          "version": "4.0.1",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+            "abbrev": "1.1.0",
-+            "osenv": "0.1.4"
-+          }
-+        },
-+        "npmlog": {
-+          "version": "4.1.0",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+            "are-we-there-yet": "1.1.4",
-+            "console-control-strings": "1.1.0",
-+            "gauge": "2.7.4",
-+            "set-blocking": "2.0.0"
-+          }
-+        },
-+        "number-is-nan": {
-+          "version": "1.0.1",
-+          "bundled": true,
-+          "dev": true
-+        },
-+        "oauth-sign": {
-+          "version": "0.8.2",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "object-assign": {
-+          "version": "4.1.1",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "once": {
-+          "version": "1.4.0",
-+          "bundled": true,
-+          "dev": true,
-+          "requires": {
-+            "wrappy": "1.0.2"
-+          }
-+        },
-+        "os-homedir": {
-+          "version": "1.0.2",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "os-tmpdir": {
-+          "version": "1.0.2",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "osenv": {
-+          "version": "0.1.4",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+            "os-homedir": "1.0.2",
-+            "os-tmpdir": "1.0.2"
-+          }
-+        },
-+        "path-is-absolute": {
-+          "version": "1.0.1",
-+          "bundled": true,
-+          "dev": true
-+        },
-+        "performance-now": {
-+          "version": "0.2.0",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "process-nextick-args": {
-+          "version": "1.0.7",
-+          "bundled": true,
-+          "dev": true
-+        },
-+        "punycode": {
-+          "version": "1.4.1",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "qs": {
-+          "version": "6.4.0",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "rc": {
-+          "version": "1.2.1",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+            "deep-extend": "0.4.2",
-+            "ini": "1.3.4",
-+            "minimist": "1.2.0",
-+            "strip-json-comments": "2.0.1"
-+          },
-+          "dependencies": {
-+            "minimist": {
-+              "version": "1.2.0",
-+              "bundled": true,
-+              "dev": true,
-+              "optional": true
-+            }
-+          }
-+        },
-+        "readable-stream": {
-+          "version": "2.2.9",
-+          "bundled": true,
-+          "dev": true,
-+          "requires": {
-+            "buffer-shims": "1.0.0",
-+            "core-util-is": "1.0.2",
-+            "inherits": "2.0.3",
-+            "isarray": "1.0.0",
-+            "process-nextick-args": "1.0.7",
-+            "string_decoder": "1.0.1",
-+            "util-deprecate": "1.0.2"
-+          }
-+        },
-+        "request": {
-+          "version": "2.81.0",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+            "aws-sign2": "0.6.0",
-+            "aws4": "1.6.0",
-+            "caseless": "0.12.0",
-+            "combined-stream": "1.0.5",
-+            "extend": "3.0.1",
-+            "forever-agent": "0.6.1",
-+            "form-data": "2.1.4",
-+            "har-validator": "4.2.1",
-+            "hawk": "3.1.3",
-+            "http-signature": "1.1.1",
-+            "is-typedarray": "1.0.0",
-+            "isstream": "0.1.2",
-+            "json-stringify-safe": "5.0.1",
-+            "mime-types": "2.1.15",
-+            "oauth-sign": "0.8.2",
-+            "performance-now": "0.2.0",
-+            "qs": "6.4.0",
-+            "safe-buffer": "5.0.1",
-+            "stringstream": "0.0.5",
-+            "tough-cookie": "2.3.2",
-+            "tunnel-agent": "0.6.0",
-+            "uuid": "3.0.1"
-+          }
-+        },
-+        "rimraf": {
-+          "version": "2.6.1",
-+          "bundled": true,
-+          "dev": true,
-+          "requires": {
-+            "glob": "7.1.2"
-+          }
-+        },
-+        "safe-buffer": {
-+          "version": "5.0.1",
-+          "bundled": true,
-+          "dev": true
-+        },
-+        "semver": {
-+          "version": "5.3.0",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "set-blocking": {
-+          "version": "2.0.0",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "signal-exit": {
-+          "version": "3.0.2",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "sntp": {
-+          "version": "1.0.9",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+            "hoek": "2.16.3"
-+          }
-+        },
-+        "sshpk": {
-+          "version": "1.13.0",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+            "asn1": "0.2.3",
-+            "assert-plus": "1.0.0",
-+            "bcrypt-pbkdf": "1.0.1",
-+            "dashdash": "1.14.1",
-+            "ecc-jsbn": "0.1.1",
-+            "getpass": "0.1.7",
-+            "jodid25519": "1.0.2",
-+            "jsbn": "0.1.1",
-+            "tweetnacl": "0.14.5"
-+          },
-+          "dependencies": {
-+            "assert-plus": {
-+              "version": "1.0.0",
-+              "bundled": true,
-+              "dev": true,
-+              "optional": true
-+            }
-+          }
-+        },
-+        "string_decoder": {
-+          "version": "1.0.1",
-+          "bundled": true,
-+          "dev": true,
-+          "requires": {
-+            "safe-buffer": "5.0.1"
-+          }
-+        },
-+        "string-width": {
-+          "version": "1.0.2",
-+          "bundled": true,
-+          "dev": true,
-+          "requires": {
-+            "code-point-at": "1.1.0",
-+            "is-fullwidth-code-point": "1.0.0",
-+            "strip-ansi": "3.0.1"
-+          }
-+        },
-+        "stringstream": {
-+          "version": "0.0.5",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "strip-ansi": {
-+          "version": "3.0.1",
-+          "bundled": true,
-+          "dev": true,
-+          "requires": {
-+            "ansi-regex": "2.1.1"
-+          }
-+        },
-+        "strip-json-comments": {
-+          "version": "2.0.1",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "tar": {
-+          "version": "2.2.1",
-+          "bundled": true,
-+          "dev": true,
-+          "requires": {
-+            "block-stream": "0.0.9",
-+            "fstream": "1.0.11",
-+            "inherits": "2.0.3"
-+          }
-+        },
-+        "tar-pack": {
-+          "version": "3.4.0",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+            "debug": "2.6.8",
-+            "fstream": "1.0.11",
-+            "fstream-ignore": "1.0.5",
-+            "once": "1.4.0",
-+            "readable-stream": "2.2.9",
-+            "rimraf": "2.6.1",
-+            "tar": "2.2.1",
-+            "uid-number": "0.0.6"
-+          }
-+        },
-+        "tough-cookie": {
-+          "version": "2.3.2",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+            "punycode": "1.4.1"
-+          }
-+        },
-+        "tunnel-agent": {
-+          "version": "0.6.0",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+            "safe-buffer": "5.0.1"
-+          }
-+        },
-+        "tweetnacl": {
-+          "version": "0.14.5",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "uid-number": {
-+          "version": "0.0.6",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "util-deprecate": {
-+          "version": "1.0.2",
-+          "bundled": true,
-+          "dev": true
-+        },
-+        "uuid": {
-+          "version": "3.0.1",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true
-+        },
-+        "verror": {
-+          "version": "1.3.6",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+            "extsprintf": "1.0.2"
-+          }
-+        },
-+        "wide-align": {
-+          "version": "1.1.2",
-+          "bundled": true,
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+            "string-width": "1.0.2"
-+          }
-+        },
-+        "wrappy": {
-+          "version": "1.0.2",
-+          "bundled": true,
-+          "dev": true
-+        }
-+      }
-+    },
-+    "glob": {
-+      "version": "7.1.2",
-+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+      "dev": true,
-+      "requires": {
-+        "fs.realpath": "1.0.0",
-+        "inflight": "1.0.6",
-+        "inherits": "2.0.3",
-+        "minimatch": "3.0.4",
-+        "once": "1.4.0",
-+        "path-is-absolute": "1.0.1"
-+      }
-+    },
-+    "glob-base": {
-+      "version": "0.3.0",
-+      "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
-+      "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
-+      "dev": true,
-+      "requires": {
-+        "glob-parent": "2.0.0",
-+        "is-glob": "2.0.1"
-+      },
-+      "dependencies": {
-+        "glob-parent": {
-+          "version": "2.0.0",
-+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-+          "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
-+          "dev": true,
-+          "requires": {
-+            "is-glob": "2.0.1"
-+          }
-+        }
-+      }
-+    },
-+    "glob-parent": {
-+      "version": "3.1.0",
-+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-+      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-+      "dev": true,
-+      "requires": {
-+        "is-glob": "3.1.0",
-+        "path-dirname": "1.0.2"
-+      },
-+      "dependencies": {
-+        "is-extglob": {
-+          "version": "2.1.1",
-+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-+          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-+          "dev": true
-+        },
-+        "is-glob": {
-+          "version": "3.1.0",
-+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-+          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-+          "dev": true,
-+          "requires": {
-+            "is-extglob": "2.1.1"
-+          }
-+        }
-+      }
-+    },
-+    "glogg": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz",
-+      "integrity": "sha1-f+DxmfV6yQbPUS/urY+Q7kooT8U=",
-+      "dev": true,
-+      "requires": {
-+        "sparkles": "1.0.0"
-+      }
-+    },
-+    "graceful-fs": {
-+      "version": "4.1.11",
-+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-+      "dev": true
-+    },
-+    "gulp-util": {
-+      "version": "3.0.8",
-+      "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz",
-+      "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=",
-+      "dev": true,
-+      "requires": {
-+        "array-differ": "1.0.0",
-+        "array-uniq": "1.0.3",
-+        "beeper": "1.1.1",
-+        "chalk": "1.1.3",
-+        "dateformat": "2.0.0",
-+        "fancy-log": "1.3.0",
-+        "gulplog": "1.0.0",
-+        "has-gulplog": "0.1.0",
-+        "lodash._reescape": "3.0.0",
-+        "lodash._reevaluate": "3.0.0",
-+        "lodash._reinterpolate": "3.0.0",
-+        "lodash.template": "3.6.2",
-+        "minimist": "1.2.0",
-+        "multipipe": "0.1.2",
-+        "object-assign": "3.0.0",
-+        "replace-ext": "0.0.1",
-+        "through2": "2.0.3",
-+        "vinyl": "0.5.3"
-+      },
-+      "dependencies": {
-+        "object-assign": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
-+          "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=",
-+          "dev": true
-+        },
-+        "vinyl": {
-+          "version": "0.5.3",
-+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
-+          "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=",
-+          "dev": true,
-+          "requires": {
-+            "clone": "1.0.2",
-+            "clone-stats": "0.0.1",
-+            "replace-ext": "0.0.1"
-+          }
-+        }
-+      }
-+    },
-+    "gulp-watch": {
-+      "version": "4.3.11",
-+      "resolved": "https://registry.npmjs.org/gulp-watch/-/gulp-watch-4.3.11.tgz",
-+      "integrity": "sha1-Fi/FY96fx3DpH5p845VVE6mhGMA=",
-+      "dev": true,
-+      "requires": {
-+        "anymatch": "1.3.0",
-+        "chokidar": "1.7.0",
-+        "glob-parent": "3.1.0",
-+        "gulp-util": "3.0.8",
-+        "object-assign": "4.1.1",
-+        "path-is-absolute": "1.0.1",
-+        "readable-stream": "2.3.3",
-+        "slash": "1.0.0",
-+        "vinyl": "1.2.0",
-+        "vinyl-file": "2.0.0"
-+      }
-+    },
-+    "gulplog": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
-+      "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
-+      "dev": true,
-+      "requires": {
-+        "glogg": "1.0.0"
-+      }
-+    },
-+    "has-ansi": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-+      "dev": true,
-+      "requires": {
-+        "ansi-regex": "2.1.1"
-+      }
-+    },
-+    "has-gulplog": {
-+      "version": "0.1.0",
-+      "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
-+      "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=",
-+      "dev": true,
-+      "requires": {
-+        "sparkles": "1.0.0"
-+      }
-+    },
-+    "inflight": {
-+      "version": "1.0.6",
-+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-+      "dev": true,
-+      "requires": {
-+        "once": "1.4.0",
-+        "wrappy": "1.0.2"
-+      }
-+    },
-+    "inherits": {
-+      "version": "2.0.3",
-+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-+      "dev": true
-+    },
-+    "is-binary-path": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-+      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
-+      "dev": true,
-+      "requires": {
-+        "binary-extensions": "1.8.0"
-+      }
-+    },
-+    "is-buffer": {
-+      "version": "1.1.5",
-+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz",
-+      "integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw=",
-+      "dev": true
-+    },
-+    "is-dotfile": {
-+      "version": "1.0.3",
-+      "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
-+      "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
-+      "dev": true
-+    },
-+    "is-equal-shallow": {
-+      "version": "0.1.3",
-+      "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
-+      "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
-+      "dev": true,
-+      "requires": {
-+        "is-primitive": "2.0.0"
-+      }
-+    },
-+    "is-extendable": {
-+      "version": "0.1.1",
-+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-+      "dev": true
-+    },
-+    "is-extglob": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-+      "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-+      "dev": true
-+    },
-+    "is-glob": {
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-+      "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-+      "dev": true,
-+      "requires": {
-+        "is-extglob": "1.0.0"
-+      }
-+    },
-+    "is-number": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-+      "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
-+      "dev": true,
-+      "requires": {
-+        "kind-of": "3.2.2"
-+      }
-+    },
-+    "is-posix-bracket": {
-+      "version": "0.1.1",
-+      "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
-+      "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
-+      "dev": true
-+    },
-+    "is-primitive": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
-+      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
-+      "dev": true
-+    },
-+    "is-utf8": {
-+      "version": "0.2.1",
-+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-+      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
-+      "dev": true
-+    },
-+    "isarray": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-+      "dev": true
-+    },
-+    "isobject": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-+      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-+      "dev": true,
-+      "requires": {
-+        "isarray": "1.0.0"
-+      }
-+    },
-+    "jsonfile": {
-+      "version": "2.4.0",
-+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
-+      "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
-+      "dev": true,
-+      "requires": {
-+        "graceful-fs": "4.1.11"
-+      }
-+    },
-+    "kind-of": {
-+      "version": "3.2.2",
-+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-+      "dev": true,
-+      "requires": {
-+        "is-buffer": "1.1.5"
-+      }
-+    },
-+    "klaw": {
-+      "version": "1.3.1",
-+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
-+      "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
-+      "dev": true,
-+      "requires": {
-+        "graceful-fs": "4.1.11"
-+      }
-+    },
-+    "lodash": {
-+      "version": "4.17.4",
-+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-+      "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
-+      "dev": true
-+    },
-+    "lodash._basecopy": {
-+      "version": "3.0.1",
-+      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
-+      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
-+      "dev": true
-+    },
-+    "lodash._basetostring": {
-+      "version": "3.0.1",
-+      "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
-+      "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=",
-+      "dev": true
-+    },
-+    "lodash._basevalues": {
-+      "version": "3.0.0",
-+      "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
-+      "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=",
-+      "dev": true
-+    },
-+    "lodash._getnative": {
-+      "version": "3.9.1",
-+      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-+      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
-+      "dev": true
-+    },
-+    "lodash._isiterateecall": {
-+      "version": "3.0.9",
-+      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
-+      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
-+      "dev": true
-+    },
-+    "lodash._reescape": {
-+      "version": "3.0.0",
-+      "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
-+      "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=",
-+      "dev": true
-+    },
-+    "lodash._reevaluate": {
-+      "version": "3.0.0",
-+      "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
-+      "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=",
-+      "dev": true
-+    },
-+    "lodash._reinterpolate": {
-+      "version": "3.0.0",
-+      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-+      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
-+      "dev": true
-+    },
-+    "lodash._root": {
-+      "version": "3.0.1",
-+      "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
-+      "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=",
-+      "dev": true
-+    },
-+    "lodash.escape": {
-+      "version": "3.2.0",
-+      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
-+      "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=",
-+      "dev": true,
-+      "requires": {
-+        "lodash._root": "3.0.1"
-+      }
-+    },
-+    "lodash.isarguments": {
-+      "version": "3.1.0",
-+      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
-+      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
-+      "dev": true
-+    },
-+    "lodash.isarray": {
-+      "version": "3.0.4",
-+      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-+      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
-+      "dev": true
-+    },
-+    "lodash.keys": {
-+      "version": "3.1.2",
-+      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
-+      "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
-+      "dev": true,
-+      "requires": {
-+        "lodash._getnative": "3.9.1",
-+        "lodash.isarguments": "3.1.0",
-+        "lodash.isarray": "3.0.4"
-+      }
-+    },
-+    "lodash.restparam": {
-+      "version": "3.6.1",
-+      "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
-+      "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
-+      "dev": true
-+    },
-+    "lodash.template": {
-+      "version": "3.6.2",
-+      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
-+      "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=",
-+      "dev": true,
-+      "requires": {
-+        "lodash._basecopy": "3.0.1",
-+        "lodash._basetostring": "3.0.1",
-+        "lodash._basevalues": "3.0.0",
-+        "lodash._isiterateecall": "3.0.9",
-+        "lodash._reinterpolate": "3.0.0",
-+        "lodash.escape": "3.2.0",
-+        "lodash.keys": "3.1.2",
-+        "lodash.restparam": "3.6.1",
-+        "lodash.templatesettings": "3.1.1"
-+      }
-+    },
-+    "lodash.templatesettings": {
-+      "version": "3.1.1",
-+      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz",
-+      "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=",
-+      "dev": true,
-+      "requires": {
-+        "lodash._reinterpolate": "3.0.0",
-+        "lodash.escape": "3.2.0"
-+      }
-+    },
-+    "micromatch": {
-+      "version": "2.3.11",
-+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-+      "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-+      "dev": true,
-+      "requires": {
-+        "arr-diff": "2.0.0",
-+        "array-unique": "0.2.1",
-+        "braces": "1.8.5",
-+        "expand-brackets": "0.1.5",
-+        "extglob": "0.3.2",
-+        "filename-regex": "2.0.1",
-+        "is-extglob": "1.0.0",
-+        "is-glob": "2.0.1",
-+        "kind-of": "3.2.2",
-+        "normalize-path": "2.1.1",
-+        "object.omit": "2.0.1",
-+        "parse-glob": "3.0.4",
-+        "regex-cache": "0.4.3"
-+      }
-+    },
-+    "minimatch": {
-+      "version": "3.0.4",
-+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-+      "dev": true,
-+      "requires": {
-+        "brace-expansion": "1.1.8"
-+      }
-+    },
-+    "minimist": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-+      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-+      "dev": true
-+    },
-+    "multipipe": {
-+      "version": "0.1.2",
-+      "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
-+      "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=",
-+      "dev": true,
-+      "requires": {
-+        "duplexer2": "0.0.2"
-+      }
-+    },
-+    "nan": {
-+      "version": "2.6.2",
-+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz",
-+      "integrity": "sha1-5P805slf37WuzAjeZZb0NgWn20U=",
-+      "dev": true
-+    },
-+    "nodegit-promise": {
-+      "version": "4.0.0",
-+      "resolved": "https://registry.npmjs.org/nodegit-promise/-/nodegit-promise-4.0.0.tgz",
-+      "integrity": "sha1-VyKxhPLfcycWEGSnkdLoQskWezQ=",
-+      "dev": true,
-+      "requires": {
-+        "asap": "2.0.5"
-+      }
-+    },
-+    "normalize-path": {
-+      "version": "2.1.1",
-+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-+      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-+      "dev": true,
-+      "requires": {
-+        "remove-trailing-separator": "1.0.2"
-+      }
-+    },
-+    "nsfw": {
-+      "version": "1.0.15",
-+      "resolved": "https://registry.npmjs.org/nsfw/-/nsfw-1.0.15.tgz",
-+      "integrity": "sha1-ylZ/SThoGtdWWj2xVTUdhTA1QH8=",
-+      "dev": true,
-+      "requires": {
-+        "fs-extra": "0.26.7",
-+        "lodash": "4.17.4",
-+        "nan": "2.6.2",
-+        "promisify-node": "0.3.0"
-+      }
-+    },
-+    "object-assign": {
-+      "version": "4.1.1",
-+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-+      "dev": true
-+    },
-+    "object.omit": {
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
-+      "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
-+      "dev": true,
-+      "requires": {
-+        "for-own": "0.1.5",
-+        "is-extendable": "0.1.1"
-+      }
-+    },
-+    "once": {
-+      "version": "1.4.0",
-+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-+      "dev": true,
-+      "requires": {
-+        "wrappy": "1.0.2"
-+      }
-+    },
-+    "parse-glob": {
-+      "version": "3.0.4",
-+      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
-+      "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
-+      "dev": true,
-+      "requires": {
-+        "glob-base": "0.3.0",
-+        "is-dotfile": "1.0.3",
-+        "is-extglob": "1.0.0",
-+        "is-glob": "2.0.1"
-+      }
-+    },
-+    "path-dirname": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-+      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
-+      "dev": true
-+    },
-+    "path-is-absolute": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-+      "dev": true
-+    },
-+    "pify": {
-+      "version": "2.3.0",
-+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-+      "dev": true
-+    },
-+    "pinkie": {
-+      "version": "2.0.4",
-+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-+      "dev": true
-+    },
-+    "pinkie-promise": {
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-+      "dev": true,
-+      "requires": {
-+        "pinkie": "2.0.4"
-+      }
-+    },
-+    "preserve": {
-+      "version": "0.2.0",
-+      "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
-+      "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
-+      "dev": true
-+    },
-+    "process-nextick-args": {
-+      "version": "1.0.7",
-+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-+      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
-+      "dev": true
-+    },
-+    "promisify-node": {
-+      "version": "0.3.0",
-+      "resolved": "https://registry.npmjs.org/promisify-node/-/promisify-node-0.3.0.tgz",
-+      "integrity": "sha1-tLVaz5D6p9K4uQyjlomQhsAwYM8=",
-+      "dev": true,
-+      "requires": {
-+        "nodegit-promise": "4.0.0"
-+      }
-+    },
-+    "randomatic": {
-+      "version": "1.1.7",
-+      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
-+      "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==",
-+      "dev": true,
-+      "requires": {
-+        "is-number": "3.0.0",
-+        "kind-of": "4.0.0"
-+      },
-+      "dependencies": {
-+        "is-number": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-+          "dev": true,
-+          "requires": {
-+            "kind-of": "3.2.2"
-+          },
-+          "dependencies": {
-+            "kind-of": {
-+              "version": "3.2.2",
-+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-+              "dev": true,
-+              "requires": {
-+                "is-buffer": "1.1.5"
-+              }
-+            }
-+          }
-+        },
-+        "kind-of": {
-+          "version": "4.0.0",
-+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-+          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-+          "dev": true,
-+          "requires": {
-+            "is-buffer": "1.1.5"
-+          }
-+        }
-+      }
-+    },
-+    "readable-stream": {
-+      "version": "2.3.3",
-+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-+      "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-+      "dev": true,
-+      "requires": {
-+        "core-util-is": "1.0.2",
-+        "inherits": "2.0.3",
-+        "isarray": "1.0.0",
-+        "process-nextick-args": "1.0.7",
-+        "safe-buffer": "5.1.1",
-+        "string_decoder": "1.0.3",
-+        "util-deprecate": "1.0.2"
-+      }
-+    },
-+    "readdirp": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz",
-+      "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
-+      "dev": true,
-+      "requires": {
-+        "graceful-fs": "4.1.11",
-+        "minimatch": "3.0.4",
-+        "readable-stream": "2.3.3",
-+        "set-immediate-shim": "1.0.1"
-+      }
-+    },
-+    "regex-cache": {
-+      "version": "0.4.3",
-+      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz",
-+      "integrity": "sha1-mxpsNdTQ3871cRrmUejp09cRQUU=",
-+      "dev": true,
-+      "requires": {
-+        "is-equal-shallow": "0.1.3",
-+        "is-primitive": "2.0.0"
-+      }
-+    },
-+    "remove-trailing-separator": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz",
-+      "integrity": "sha1-abBi2XhyetFNxrVrpKt3L9jXBRE=",
-+      "dev": true
-+    },
-+    "repeat-element": {
-+      "version": "1.1.2",
-+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz",
-+      "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=",
-+      "dev": true
-+    },
-+    "repeat-string": {
-+      "version": "1.6.1",
-+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
-+      "dev": true
-+    },
-+    "replace-ext": {
-+      "version": "0.0.1",
-+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
-+      "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
-+      "dev": true
-+    },
-+    "rimraf": {
-+      "version": "2.6.1",
-+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
-+      "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=",
-+      "dev": true,
-+      "requires": {
-+        "glob": "7.1.2"
-+      }
-+    },
-+    "safe-buffer": {
-+      "version": "5.1.1",
-+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-+      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
-+      "dev": true
-+    },
-+    "set-immediate-shim": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
-+      "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
-+      "dev": true
-+    },
-+    "slash": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-+      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
-+      "dev": true
-+    },
-+    "sparkles": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz",
-+      "integrity": "sha1-Gsu/tZJDbRC76PeFt8xvgoFQEsM=",
-+      "dev": true
-+    },
-+    "string_decoder": {
-+      "version": "1.0.3",
-+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-+      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-+      "dev": true,
-+      "requires": {
-+        "safe-buffer": "5.1.1"
-+      }
-+    },
-+    "strip-ansi": {
-+      "version": "3.0.1",
-+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-+      "dev": true,
-+      "requires": {
-+        "ansi-regex": "2.1.1"
-+      }
-+    },
-+    "strip-bom": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-+      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-+      "dev": true,
-+      "requires": {
-+        "is-utf8": "0.2.1"
-+      }
-+    },
-+    "strip-bom-stream": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-2.0.0.tgz",
-+      "integrity": "sha1-+H217yYT9paKpUWr/h7HKLaoKco=",
-+      "dev": true,
-+      "requires": {
-+        "first-chunk-stream": "2.0.0",
-+        "strip-bom": "2.0.0"
-+      }
-+    },
-+    "supports-color": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-+      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-+      "dev": true
-+    },
-+    "through2": {
-+      "version": "2.0.3",
-+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
-+      "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
-+      "dev": true,
-+      "requires": {
-+        "readable-stream": "2.3.3",
-+        "xtend": "4.0.1"
-+      }
-+    },
-+    "time-stamp": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
-+      "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
-+      "dev": true
-+    },
-+    "util-deprecate": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-+      "dev": true
-+    },
-+    "vinyl": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
-+      "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
-+      "dev": true,
-+      "requires": {
-+        "clone": "1.0.2",
-+        "clone-stats": "0.0.1",
-+        "replace-ext": "0.0.1"
-+      }
-+    },
-+    "vinyl-file": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/vinyl-file/-/vinyl-file-2.0.0.tgz",
-+      "integrity": "sha1-p+v1/779obfRjRQPyweyI++2dRo=",
-+      "dev": true,
-+      "requires": {
-+        "graceful-fs": "4.1.11",
-+        "pify": "2.3.0",
-+        "pinkie-promise": "2.0.1",
-+        "strip-bom": "2.0.0",
-+        "strip-bom-stream": "2.0.0",
-+        "vinyl": "1.2.0"
-+      }
-+    },
-+    "wrappy": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-+      "dev": true
-+    },
-+    "xtend": {
-+      "version": "4.0.1",
-+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-+      "dev": true
-+    }
-+  }
-+}
-added in remote
-  their  100644 1b6a78c8425708cd7fda1e2f9b6f8eb1510e66cd build/package-lock.json
-@@ -0,0 +1,817 @@
-+{
-+  "name": "code-oss-dev-build",
-+  "version": "1.0.0",
-+  "lockfileVersion": 1,
-+  "requires": true,
-+  "dependencies": {
-+    "@types/azure": {
-+      "version": "0.9.19",
-+      "resolved": "https://registry.npmjs.org/@types/azure/-/azure-0.9.19.tgz",
-+      "integrity": "sha1-Gmqb2Fa0N93s8/n8hAemg8hpugI=",
-+      "dev": true,
-+      "requires": {
-+        "@types/node": "7.0.33"
-+      }
-+    },
-+    "@types/documentdb": {
-+      "version": "1.10.1",
-+      "resolved": "https://registry.npmjs.org/@types/documentdb/-/documentdb-1.10.1.tgz",
-+      "integrity": "sha1-zTnOE0h94AaKI5U920XIbSFa2Yo=",
-+      "dev": true,
-+      "requires": {
-+        "@types/node": "7.0.33"
-+      }
-+    },
-+    "@types/es6-collections": {
-+      "version": "0.5.30",
-+      "resolved": "https://registry.npmjs.org/@types/es6-collections/-/es6-collections-0.5.30.tgz",
-+      "integrity": "sha1-g/WKQgR72CIg1avrecQrqeuvrwQ=",
-+      "dev": true
-+    },
-+    "@types/es6-promise": {
-+      "version": "0.0.32",
-+      "resolved": "https://registry.npmjs.org/@types/es6-promise/-/es6-promise-0.0.32.tgz",
-+      "integrity": "sha1-O89E+x5Cnz33YYjIxth0Rjujcf0=",
-+      "dev": true
-+    },
-+    "@types/mime": {
-+      "version": "0.0.29",
-+      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-0.0.29.tgz",
-+      "integrity": "sha1-+8/TMFc7kS71nu7hRgK/rOYwdUs=",
-+      "dev": true
-+    },
-+    "@types/node": {
-+      "version": "7.0.33",
-+      "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.33.tgz",
-+      "integrity": "sha512-8fVvl6Yyk3jZvSYxRMS9/AmZJ5RXCOP9N4xSlykyBViVESu751pxHYTN14Embn1Fem78YwEHdC7p7KGQQpwunw==",
-+      "dev": true
-+    },
-+    "@types/xml2js": {
-+      "version": "0.0.33",
-+      "resolved": "https://registry.npmjs.org/@types/xml2js/-/xml2js-0.0.33.tgz",
-+      "integrity": "sha1-IMXdZGAkUoTWSlVpABW5XkCft94=",
-+      "dev": true
-+    },
-+    "ansi-regex": {
-+      "version": "2.1.1",
-+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-+      "dev": true
-+    },
-+    "ansi-styles": {
-+      "version": "2.2.1",
-+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-+      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-+      "dev": true
-+    },
-+    "asn1": {
-+      "version": "0.2.3",
-+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-+      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
-+      "dev": true
-+    },
-+    "assert-plus": {
-+      "version": "0.2.0",
-+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
-+      "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
-+      "dev": true
-+    },
-+    "async": {
-+      "version": "2.5.0",
-+      "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz",
-+      "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==",
-+      "dev": true,
-+      "requires": {
-+        "lodash": "4.17.4"
-+      }
-+    },
-+    "aws-sign2": {
-+      "version": "0.6.0",
-+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
-+      "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
-+      "dev": true
-+    },
-+    "aws4": {
-+      "version": "1.6.0",
-+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-+      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
-+      "dev": true
-+    },
-+    "azure-storage": {
-+      "version": "2.2.1",
-+      "resolved": "https://registry.npmjs.org/azure-storage/-/azure-storage-2.2.1.tgz",
-+      "integrity": "sha1-26BUs1dco9+vw9Q3qr/I6ELmmDE=",
-+      "dev": true,
-+      "requires": {
-+        "browserify-mime": "1.2.9",
-+        "extend": "1.2.1",
-+        "json-edm-parser": "0.1.2",
-+        "md5.js": "1.3.4",
-+        "readable-stream": "2.0.6",
-+        "request": "2.74.0",
-+        "underscore": "1.8.3",
-+        "uuid": "3.1.0",
-+        "validator": "3.35.0",
-+        "xml2js": "0.2.7",
-+        "xmlbuilder": "0.4.3"
-+      },
-+      "dependencies": {
-+        "xml2js": {
-+          "version": "0.2.7",
-+          "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.2.7.tgz",
-+          "integrity": "sha1-GDhRi7AXQcrgh4urSRXklMMjBq8=",
-+          "dev": true,
-+          "requires": {
-+            "sax": "0.5.2"
-+          }
-+        }
-+      }
-+    },
-+    "bcrypt-pbkdf": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
-+      "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
-+      "dev": true,
-+      "optional": true,
-+      "requires": {
-+        "tweetnacl": "0.14.5"
-+      }
-+    },
-+    "binary-search-bounds": {
-+      "version": "2.0.3",
-+      "resolved": "https://registry.npmjs.org/binary-search-bounds/-/binary-search-bounds-2.0.3.tgz",
-+      "integrity": "sha1-X/hhbW3SylOIvIWy1iZuK52lAtw=",
-+      "dev": true
-+    },
-+    "bl": {
-+      "version": "1.1.2",
-+      "resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz",
-+      "integrity": "sha1-/cqHGplxOqANGeO7ukHER4emU5g=",
-+      "dev": true,
-+      "requires": {
-+        "readable-stream": "2.0.6"
-+      }
-+    },
-+    "boom": {
-+      "version": "2.10.1",
-+      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
-+      "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
-+      "dev": true,
-+      "requires": {
-+        "hoek": "2.16.3"
-+      }
-+    },
-+    "browserify-mime": {
-+      "version": "1.2.9",
-+      "resolved": "https://registry.npmjs.org/browserify-mime/-/browserify-mime-1.2.9.tgz",
-+      "integrity": "sha1-rrGvKN5sDXpqLOQK22j/GEIq8x8=",
-+      "dev": true
-+    },
-+    "caseless": {
-+      "version": "0.11.0",
-+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
-+      "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
-+      "dev": true
-+    },
-+    "chalk": {
-+      "version": "1.1.3",
-+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-+      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-+      "dev": true,
-+      "requires": {
-+        "ansi-styles": "2.2.1",
-+        "escape-string-regexp": "1.0.5",
-+        "has-ansi": "2.0.0",
-+        "strip-ansi": "3.0.1",
-+        "supports-color": "2.0.0"
-+      }
-+    },
-+    "combined-stream": {
-+      "version": "1.0.5",
-+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-+      "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
-+      "dev": true,
-+      "requires": {
-+        "delayed-stream": "1.0.0"
-+      }
-+    },
-+    "commander": {
-+      "version": "2.11.0",
-+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
-+      "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
-+      "dev": true
-+    },
-+    "core-util-is": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-+      "dev": true
-+    },
-+    "cryptiles": {
-+      "version": "2.0.5",
-+      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-+      "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
-+      "dev": true,
-+      "requires": {
-+        "boom": "2.10.1"
-+      }
-+    },
-+    "dashdash": {
-+      "version": "1.14.1",
-+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-+      "dev": true,
-+      "requires": {
-+        "assert-plus": "1.0.0"
-+      },
-+      "dependencies": {
-+        "assert-plus": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "delayed-stream": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-+      "dev": true
-+    },
-+    "documentdb": {
-+      "version": "1.12.0",
-+      "resolved": "https://registry.npmjs.org/documentdb/-/documentdb-1.12.0.tgz",
-+      "integrity": "sha1-MyWgSd3ykNfjP0BaMq6CzNeX3Fo=",
-+      "dev": true,
-+      "requires": {
-+        "binary-search-bounds": "2.0.3",
-+        "priorityqueuejs": "1.0.0",
-+        "semaphore": "1.0.5",
-+        "underscore": "1.8.3"
-+      }
-+    },
-+    "ecc-jsbn": {
-+      "version": "0.1.1",
-+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
-+      "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
-+      "dev": true,
-+      "optional": true,
-+      "requires": {
-+        "jsbn": "0.1.1"
-+      }
-+    },
-+    "escape-string-regexp": {
-+      "version": "1.0.5",
-+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-+      "dev": true
-+    },
-+    "extend": {
-+      "version": "1.2.1",
-+      "resolved": "https://registry.npmjs.org/extend/-/extend-1.2.1.tgz",
-+      "integrity": "sha1-oPX9bPyDpf5J72mNYOyKYk3UV2w=",
-+      "dev": true
-+    },
-+    "extsprintf": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz",
-+      "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=",
-+      "dev": true
-+    },
-+    "forever-agent": {
-+      "version": "0.6.1",
-+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-+      "dev": true
-+    },
-+    "form-data": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.1.tgz",
-+      "integrity": "sha1-rjFduaSQf6BlUCMEpm13M0de43w=",
-+      "dev": true,
-+      "requires": {
-+        "async": "2.5.0",
-+        "combined-stream": "1.0.5",
-+        "mime-types": "2.1.15"
-+      }
-+    },
-+    "generate-function": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
-+      "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=",
-+      "dev": true
-+    },
-+    "generate-object-property": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
-+      "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
-+      "dev": true,
-+      "requires": {
-+        "is-property": "1.0.2"
-+      }
-+    },
-+    "getpass": {
-+      "version": "0.1.7",
-+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-+      "dev": true,
-+      "requires": {
-+        "assert-plus": "1.0.0"
-+      },
-+      "dependencies": {
-+        "assert-plus": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "har-validator": {
-+      "version": "2.0.6",
-+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
-+      "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=",
-+      "dev": true,
-+      "requires": {
-+        "chalk": "1.1.3",
-+        "commander": "2.11.0",
-+        "is-my-json-valid": "2.16.0",
-+        "pinkie-promise": "2.0.1"
-+      }
-+    },
-+    "has-ansi": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-+      "dev": true,
-+      "requires": {
-+        "ansi-regex": "2.1.1"
-+      }
-+    },
-+    "hash-base": {
-+      "version": "3.0.4",
-+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
-+      "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
-+      "dev": true,
-+      "requires": {
-+        "inherits": "2.0.3",
-+        "safe-buffer": "5.1.1"
-+      }
-+    },
-+    "hawk": {
-+      "version": "3.1.3",
-+      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-+      "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
-+      "dev": true,
-+      "requires": {
-+        "boom": "2.10.1",
-+        "cryptiles": "2.0.5",
-+        "hoek": "2.16.3",
-+        "sntp": "1.0.9"
-+      }
-+    },
-+    "hoek": {
-+      "version": "2.16.3",
-+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-+      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-+      "dev": true
-+    },
-+    "http-signature": {
-+      "version": "1.1.1",
-+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
-+      "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
-+      "dev": true,
-+      "requires": {
-+        "assert-plus": "0.2.0",
-+        "jsprim": "1.4.0",
-+        "sshpk": "1.13.1"
-+      }
-+    },
-+    "inherits": {
-+      "version": "2.0.3",
-+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-+      "dev": true
-+    },
-+    "is-my-json-valid": {
-+      "version": "2.16.0",
-+      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz",
-+      "integrity": "sha1-8Hndm/2uZe4gOKrorLyGqxCeNpM=",
-+      "dev": true,
-+      "requires": {
-+        "generate-function": "2.0.0",
-+        "generate-object-property": "1.2.0",
-+        "jsonpointer": "4.0.1",
-+        "xtend": "4.0.1"
-+      }
-+    },
-+    "is-property": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
-+      "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=",
-+      "dev": true
-+    },
-+    "is-typedarray": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-+      "dev": true
-+    },
-+    "isarray": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-+      "dev": true
-+    },
-+    "isstream": {
-+      "version": "0.1.2",
-+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-+      "dev": true
-+    },
-+    "jsbn": {
-+      "version": "0.1.1",
-+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-+      "dev": true,
-+      "optional": true
-+    },
-+    "json-edm-parser": {
-+      "version": "0.1.2",
-+      "resolved": "https://registry.npmjs.org/json-edm-parser/-/json-edm-parser-0.1.2.tgz",
-+      "integrity": "sha1-HmCw/vG8CvZ7wNFG393lSGzWFbQ=",
-+      "dev": true,
-+      "requires": {
-+        "jsonparse": "1.2.0"
-+      }
-+    },
-+    "json-schema": {
-+      "version": "0.2.3",
-+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-+      "dev": true
-+    },
-+    "json-stringify-safe": {
-+      "version": "5.0.1",
-+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-+      "dev": true
-+    },
-+    "jsonparse": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.2.0.tgz",
-+      "integrity": "sha1-XAxWhRBxYOcv50ib3eoLRMK8Z70=",
-+      "dev": true
-+    },
-+    "jsonpointer": {
-+      "version": "4.0.1",
-+      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
-+      "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",
-+      "dev": true
-+    },
-+    "jsprim": {
-+      "version": "1.4.0",
-+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz",
-+      "integrity": "sha1-o7h+QCmNjDgFUtjMdiigu5WiKRg=",
-+      "dev": true,
-+      "requires": {
-+        "assert-plus": "1.0.0",
-+        "extsprintf": "1.0.2",
-+        "json-schema": "0.2.3",
-+        "verror": "1.3.6"
-+      },
-+      "dependencies": {
-+        "assert-plus": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "lodash": {
-+      "version": "4.17.4",
-+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-+      "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
-+      "dev": true
-+    },
-+    "md5.js": {
-+      "version": "1.3.4",
-+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz",
-+      "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=",
-+      "dev": true,
-+      "requires": {
-+        "hash-base": "3.0.4",
-+        "inherits": "2.0.3"
-+      }
-+    },
-+    "mime": {
-+      "version": "1.3.6",
-+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.6.tgz",
-+      "integrity": "sha1-WR2E02U6awtKO5343lqoEI5y5eA=",
-+      "dev": true
-+    },
-+    "mime-db": {
-+      "version": "1.27.0",
-+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz",
-+      "integrity": "sha1-gg9XIpa70g7CXtVeW13oaeVDbrE=",
-+      "dev": true
-+    },
-+    "mime-types": {
-+      "version": "2.1.15",
-+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz",
-+      "integrity": "sha1-pOv1BkCUVpI3uM9wBGd20J/JKu0=",
-+      "dev": true,
-+      "requires": {
-+        "mime-db": "1.27.0"
-+      }
-+    },
-+    "minimist": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-+      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-+      "dev": true
-+    },
-+    "oauth-sign": {
-+      "version": "0.8.2",
-+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-+      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
-+      "dev": true
-+    },
-+    "pinkie": {
-+      "version": "2.0.4",
-+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-+      "dev": true
-+    },
-+    "pinkie-promise": {
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-+      "dev": true,
-+      "requires": {
-+        "pinkie": "2.0.4"
-+      }
-+    },
-+    "priorityqueuejs": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/priorityqueuejs/-/priorityqueuejs-1.0.0.tgz",
-+      "integrity": "sha1-LuTyPCVgkT4IwHzlzN1t498sWvg=",
-+      "dev": true
-+    },
-+    "process-nextick-args": {
-+      "version": "1.0.7",
-+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-+      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
-+      "dev": true
-+    },
-+    "punycode": {
-+      "version": "1.4.1",
-+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-+      "dev": true
-+    },
-+    "qs": {
-+      "version": "6.2.3",
-+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.3.tgz",
-+      "integrity": "sha1-HPyyXBCpsrSDBT/zn138kjOQjP4=",
-+      "dev": true
-+    },
-+    "readable-stream": {
-+      "version": "2.0.6",
-+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
-+      "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
-+      "dev": true,
-+      "requires": {
-+        "core-util-is": "1.0.2",
-+        "inherits": "2.0.3",
-+        "isarray": "1.0.0",
-+        "process-nextick-args": "1.0.7",
-+        "string_decoder": "0.10.31",
-+        "util-deprecate": "1.0.2"
-+      }
-+    },
-+    "request": {
-+      "version": "2.74.0",
-+      "resolved": "https://registry.npmjs.org/request/-/request-2.74.0.tgz",
-+      "integrity": "sha1-dpPKdou7DqXIzgjAhKRe+gW4kqs=",
-+      "dev": true,
-+      "requires": {
-+        "aws-sign2": "0.6.0",
-+        "aws4": "1.6.0",
-+        "bl": "1.1.2",
-+        "caseless": "0.11.0",
-+        "combined-stream": "1.0.5",
-+        "extend": "3.0.1",
-+        "forever-agent": "0.6.1",
-+        "form-data": "1.0.1",
-+        "har-validator": "2.0.6",
-+        "hawk": "3.1.3",
-+        "http-signature": "1.1.1",
-+        "is-typedarray": "1.0.0",
-+        "isstream": "0.1.2",
-+        "json-stringify-safe": "5.0.1",
-+        "mime-types": "2.1.15",
-+        "node-uuid": "1.4.8",
-+        "oauth-sign": "0.8.2",
-+        "qs": "6.2.3",
-+        "stringstream": "0.0.5",
-+        "tough-cookie": "2.3.2",
-+        "tunnel-agent": "0.4.3"
-+      },
-+      "dependencies": {
-+        "extend": {
-+          "version": "3.0.1",
-+          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-+          "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
-+          "dev": true
-+        },
-+        "node-uuid": {
-+          "version": "1.4.8",
-+          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz",
-+          "integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "safe-buffer": {
-+      "version": "5.1.1",
-+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-+      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
-+      "dev": true
-+    },
-+    "sax": {
-+      "version": "0.5.2",
-+      "resolved": "https://registry.npmjs.org/sax/-/sax-0.5.2.tgz",
-+      "integrity": "sha1-c1/6o5oc/4/7lZjwIjq9sDqfsuo=",
-+      "dev": true
-+    },
-+    "semaphore": {
-+      "version": "1.0.5",
-+      "resolved": "https://registry.npmjs.org/semaphore/-/semaphore-1.0.5.tgz",
-+      "integrity": "sha1-tJJXbmavGT25XWXiXsU/Xxl5jWA=",
-+      "dev": true
-+    },
-+    "sntp": {
-+      "version": "1.0.9",
-+      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
-+      "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
-+      "dev": true,
-+      "requires": {
-+        "hoek": "2.16.3"
-+      }
-+    },
-+    "sshpk": {
-+      "version": "1.13.1",
-+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
-+      "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
-+      "dev": true,
-+      "requires": {
-+        "asn1": "0.2.3",
-+        "assert-plus": "1.0.0",
-+        "bcrypt-pbkdf": "1.0.1",
-+        "dashdash": "1.14.1",
-+        "ecc-jsbn": "0.1.1",
-+        "getpass": "0.1.7",
-+        "jsbn": "0.1.1",
-+        "tweetnacl": "0.14.5"
-+      },
-+      "dependencies": {
-+        "assert-plus": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "string_decoder": {
-+      "version": "0.10.31",
-+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-+      "dev": true
-+    },
-+    "stringstream": {
-+      "version": "0.0.5",
-+      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-+      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
-+      "dev": true
-+    },
-+    "strip-ansi": {
-+      "version": "3.0.1",
-+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-+      "dev": true,
-+      "requires": {
-+        "ansi-regex": "2.1.1"
-+      }
-+    },
-+    "supports-color": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-+      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-+      "dev": true
-+    },
-+    "tough-cookie": {
-+      "version": "2.3.2",
-+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
-+      "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=",
-+      "dev": true,
-+      "requires": {
-+        "punycode": "1.4.1"
-+      }
-+    },
-+    "tunnel-agent": {
-+      "version": "0.4.3",
-+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-+      "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
-+      "dev": true
-+    },
-+    "tweetnacl": {
-+      "version": "0.14.5",
-+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-+      "dev": true,
-+      "optional": true
-+    },
-+    "typescript": {
-+      "version": "2.3.4",
-+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.3.4.tgz",
-+      "integrity": "sha1-PTgyGCgjHkNPKHUUlZw3qCtin0I=",
-+      "dev": true
-+    },
-+    "underscore": {
-+      "version": "1.8.3",
-+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
-+      "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=",
-+      "dev": true
-+    },
-+    "util-deprecate": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-+      "dev": true
-+    },
-+    "uuid": {
-+      "version": "3.1.0",
-+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-+      "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
-+      "dev": true
-+    },
-+    "validator": {
-+      "version": "3.35.0",
-+      "resolved": "https://registry.npmjs.org/validator/-/validator-3.35.0.tgz",
-+      "integrity": "sha1-PwcklALB/I/Ak8MsbkPXKnnModw=",
-+      "dev": true
-+    },
-+    "verror": {
-+      "version": "1.3.6",
-+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz",
-+      "integrity": "sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw=",
-+      "dev": true,
-+      "requires": {
-+        "extsprintf": "1.0.2"
-+      }
-+    },
-+    "xml2js": {
-+      "version": "0.4.17",
-+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.17.tgz",
-+      "integrity": "sha1-F76T6q4/O3eTWceVtBlwWogX6Gg=",
-+      "dev": true,
-+      "requires": {
-+        "sax": "1.2.4",
-+        "xmlbuilder": "4.2.1"
-+      },
-+      "dependencies": {
-+        "sax": {
-+          "version": "1.2.4",
-+          "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-+          "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-+          "dev": true
-+        },
-+        "xmlbuilder": {
-+          "version": "4.2.1",
-+          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.2.1.tgz",
-+          "integrity": "sha1-qlijBBoGb5DqoWwvU4n/GfP0YaU=",
-+          "dev": true,
-+          "requires": {
-+            "lodash": "4.17.4"
-+          }
-+        }
-+      }
-+    },
-+    "xmlbuilder": {
-+      "version": "0.4.3",
-+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.3.tgz",
-+      "integrity": "sha1-xGFLp04K0ZbmCcknLNnh3bKKilg=",
-+      "dev": true
-+    },
-+    "xtend": {
-+      "version": "4.0.1",
-+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-+      "dev": true
-+    }
-+  }
-+}
-added in remote
-  their  100644 858491a3e2a2a8b4582b81c324463e188fd30124 extensions/configuration-editing/package-lock.json
-@@ -0,0 +1,27 @@
-+{
-+  "name": "configuration-editing",
-+  "version": "0.0.1",
-+  "lockfileVersion": 1,
-+  "requires": true,
-+  "dependencies": {
-+    "@types/node": {
-+      "version": "7.0.33",
-+      "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.33.tgz",
-+      "integrity": "sha512-8fVvl6Yyk3jZvSYxRMS9/AmZJ5RXCOP9N4xSlykyBViVESu751pxHYTN14Embn1Fem78YwEHdC7p7KGQQpwunw==",
-+      "dev": true
-+    },
-+    "jsonc-parser": {
-+      "version": "0.3.1",
-+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-0.3.1.tgz",
-+      "integrity": "sha1-br9cdSJDaNSwfvTCb5Q05ldHLpU=",
-+      "requires": {
-+        "vscode-nls": "2.0.2"
-+      }
-+    },
-+    "vscode-nls": {
-+      "version": "2.0.2",
-+      "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-2.0.2.tgz",
-+      "integrity": "sha1-gIUiOAhEuK0VNJmvXDsDkhrqAto="
-+    }
-+  }
-+}
-added in remote
-  their  100644 ea33ad609936edf01ee967a1411e137dcb979530 extensions/css/package-lock.json
-@@ -0,0 +1,40 @@
-+{
-+  "name": "css",
-+  "version": "0.1.0",
-+  "lockfileVersion": 1,
-+  "requires": true,
-+  "dependencies": {
-+    "@types/node": {
-+      "version": "6.0.79",
-+      "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.79.tgz",
-+      "integrity": "sha512-7F3/P6MkTPA0QxOstRqfcnoReCUy5V/QG92cyBoZSPnqdX44L8TtNELSVfN56gAttm3YWj9cEi8FRIPVq0WmeQ==",
-+      "dev": true
-+    },
-+    "vscode-languageclient": {
-+      "version": "3.3.0",
-+      "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-3.3.0.tgz",
-+      "integrity": "sha512-4HVt0GorAV7lJfoT2C6qh/Fug9u/HSmKUa8u+y+Pte0HqvUtOwTI8qlX1vu8vyQ5OHD8t8pJad/9yIbYntwxCw==",
-+      "requires": {
-+        "vscode-jsonrpc": "3.3.1",
-+        "vscode-languageserver-types": "3.3.0"
-+      },
-+      "dependencies": {
-+        "vscode-jsonrpc": {
-+          "version": "3.3.1",
-+          "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.3.1.tgz",
-+          "integrity": "sha512-iLlG27498AJF0j4GJ4yua7Z9bpJfLfwpAaAA9mihe6VDoYHwK8TyFgnpXdgjoTb8X9/DnzimQeg0bjIWINvPWw=="
-+        },
-+        "vscode-languageserver-types": {
-+          "version": "3.3.0",
-+          "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.3.0.tgz",
-+          "integrity": "sha512-5BMClM4D3mRl5JlWFxIxhhJAbcVW9dFviz8ubppmG8epCTzl1bPpndcnvsjOjUlVsO9V8l8Ktklqc70Ew6soew=="
-+        }
-+      }
-+    },
-+    "vscode-nls": {
-+      "version": "2.0.2",
-+      "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-2.0.2.tgz",
-+      "integrity": "sha1-gIUiOAhEuK0VNJmvXDsDkhrqAto="
-+    }
-+  }
-+}
-added in remote
-  their  100644 bd9a413d22eea93ccb2fabb4a7d028042946cc6f extensions/css/server/package-lock.json
-@@ -0,0 +1,56 @@
-+{
-+  "name": "vscode-css-languageserver",
-+  "version": "1.0.0",
-+  "lockfileVersion": 1,
-+  "requires": true,
-+  "dependencies": {
-+    "@types/node": {
-+      "version": "6.0.79",
-+      "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.79.tgz",
-+      "integrity": "sha512-7F3/P6MkTPA0QxOstRqfcnoReCUy5V/QG92cyBoZSPnqdX44L8TtNELSVfN56gAttm3YWj9cEi8FRIPVq0WmeQ==",
-+      "dev": true
-+    },
-+    "vscode-css-languageservice": {
-+      "version": "2.1.1",
-+      "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-2.1.1.tgz",
-+      "integrity": "sha1-UQOPEzSWSLYRyrN5aeZ2ussliKA=",
-+      "requires": {
-+        "vscode-languageserver-types": "3.3.0",
-+        "vscode-nls": "2.0.2"
-+      },
-+      "dependencies": {
-+        "vscode-languageserver-types": {
-+          "version": "3.3.0",
-+          "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.3.0.tgz",
-+          "integrity": "sha512-5BMClM4D3mRl5JlWFxIxhhJAbcVW9dFviz8ubppmG8epCTzl1bPpndcnvsjOjUlVsO9V8l8Ktklqc70Ew6soew=="
-+        },
-+        "vscode-nls": {
-+          "version": "2.0.2",
-+          "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-2.0.2.tgz",
-+          "integrity": "sha1-gIUiOAhEuK0VNJmvXDsDkhrqAto="
-+        }
-+      }
-+    },
-+    "vscode-languageserver": {
-+      "version": "3.3.0",
-+      "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.3.0.tgz",
-+      "integrity": "sha512-8YvEbjl77Nl24/cgcSbQC/CPEhSoJwvLLKGJZJbIF4DsGo4jrVDbuARXfmUt9S6vCEEr++o3fbbZ17iLZ0QH0A==",
-+      "requires": {
-+        "vscode-jsonrpc": "3.3.1",
-+        "vscode-languageserver-types": "3.3.0"
-+      },
-+      "dependencies": {
-+        "vscode-jsonrpc": {
-+          "version": "3.3.1",
-+          "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.3.1.tgz",
-+          "integrity": "sha512-iLlG27498AJF0j4GJ4yua7Z9bpJfLfwpAaAA9mihe6VDoYHwK8TyFgnpXdgjoTb8X9/DnzimQeg0bjIWINvPWw=="
-+        },
-+        "vscode-languageserver-types": {
-+          "version": "3.3.0",
-+          "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.3.0.tgz",
-+          "integrity": "sha512-5BMClM4D3mRl5JlWFxIxhhJAbcVW9dFviz8ubppmG8epCTzl1bPpndcnvsjOjUlVsO9V8l8Ktklqc70Ew6soew=="
-+        }
-+      }
-+    }
-+  }
-+}
-added in remote
-  their  100644 cc0f8e1d0df0f89cd5cbd55e8b11e8736e663376 extensions/emmet/package-lock.json
-@@ -0,0 +1,236 @@
-+{
-+  "name": "emmet",
-+  "version": "0.0.1",
-+  "lockfileVersion": 1,
-+  "requires": true,
-+  "dependencies": {
-+    "@emmetio/css-parser": {
-+      "version": "0.3.0",
-+      "resolved": "https://registry.npmjs.org/@emmetio/css-parser/-/css-parser-0.3.0.tgz",
-+      "integrity": "sha1-yJ5fmgTEnflsidtsA8GIPpNMOto=",
-+      "requires": {
-+        "@emmetio/stream-reader": "2.2.0",
-+        "@emmetio/stream-reader-utils": "0.1.0"
-+      },
-+      "dependencies": {
-+        "@emmetio/stream-reader": {
-+          "version": "2.2.0",
-+          "resolved": "https://registry.npmjs.org/@emmetio/stream-reader/-/stream-reader-2.2.0.tgz",
-+          "integrity": "sha1-Rs/+oRmgoAMxKiHC2bVijLX81EI="
-+        },
-+        "@emmetio/stream-reader-utils": {
-+          "version": "0.1.0",
-+          "resolved": "https://registry.npmjs.org/@emmetio/stream-reader-utils/-/stream-reader-utils-0.1.0.tgz",
-+          "integrity": "sha1-JEywLHfsLnT3ipvTGCGKvJxQCmE="
-+        }
-+      }
-+    },
-+    "@emmetio/expand-abbreviation": {
-+      "version": "0.5.8",
-+      "resolved": "https://registry.npmjs.org/@emmetio/expand-abbreviation/-/expand-abbreviation-0.5.8.tgz",
-+      "integrity": "sha1-FBNIMUsfdsCTKkHgycxfk2R76iU=",
-+      "requires": {
-+        "@emmetio/abbreviation": "0.6.1",
-+        "@emmetio/css-abbreviation": "0.3.1",
-+        "@emmetio/css-snippets-resolver": "0.2.5",
-+        "@emmetio/html-snippets-resolver": "0.1.4",
-+        "@emmetio/html-transform": "0.3.2",
-+        "@emmetio/lorem": "1.0.1",
-+        "@emmetio/markup-formatters": "0.3.3",
-+        "@emmetio/output-profile": "0.1.5",
-+        "@emmetio/snippets": "0.2.3",
-+        "@emmetio/snippets-registry": "0.3.1",
-+        "@emmetio/stylesheet-formatters": "0.1.2",
-+        "@emmetio/variable-resolver": "0.2.1"
-+      },
-+      "dependencies": {
-+        "@emmetio/abbreviation": {
-+          "version": "0.6.1",
-+          "resolved": "https://registry.npmjs.org/@emmetio/abbreviation/-/abbreviation-0.6.1.tgz",
-+          "integrity": "sha1-ElWz9Gi8YQ3W6p3S9w86+pICfCY=",
-+          "requires": {
-+            "@emmetio/node": "0.1.2",
-+            "@emmetio/stream-reader": "2.2.0",
-+            "@emmetio/stream-reader-utils": "0.1.0"
-+          }
-+        },
-+        "@emmetio/css-abbreviation": {
-+          "version": "0.3.1",
-+          "resolved": "https://registry.npmjs.org/@emmetio/css-abbreviation/-/css-abbreviation-0.3.1.tgz",
-+          "integrity": "sha1-yM5WMYv1+NWrXj0nYL1QvKLKiIg=",
-+          "requires": {
-+            "@emmetio/node": "0.1.2",
-+            "@emmetio/stream-reader": "2.2.0",
-+            "@emmetio/stream-reader-utils": "0.1.0"
-+          }
-+        },
-+        "@emmetio/css-snippets-resolver": {
-+          "version": "0.2.5",
-+          "resolved": "https://registry.npmjs.org/@emmetio/css-snippets-resolver/-/css-snippets-resolver-0.2.5.tgz",
-+          "integrity": "sha1-5nuCeCErRiGy01VpIsRtrS9PDI0="
-+        },
-+        "@emmetio/field-parser": {
-+          "version": "0.3.0",
-+          "resolved": "https://registry.npmjs.org/@emmetio/field-parser/-/field-parser-0.3.0.tgz",
-+          "integrity": "sha1-enz1HDma6nuuRV4Pzz6zKPjAwhU=",
-+          "requires": {
-+            "@emmetio/stream-reader": "2.2.0",
-+            "@emmetio/stream-reader-utils": "0.1.0"
-+          }
-+        },
-+        "@emmetio/html-snippets-resolver": {
-+          "version": "0.1.4",
-+          "resolved": "https://registry.npmjs.org/@emmetio/html-snippets-resolver/-/html-snippets-resolver-0.1.4.tgz",
-+          "integrity": "sha1-szrT+nj9eNZLlL+Iqftos62Ojn4=",
-+          "requires": {
-+            "@emmetio/abbreviation": "0.6.1"
-+          }
-+        },
-+        "@emmetio/html-transform": {
-+          "version": "0.3.2",
-+          "resolved": "https://registry.npmjs.org/@emmetio/html-transform/-/html-transform-0.3.2.tgz",
-+          "integrity": "sha1-bFAQDWh+Gk2fHlBjL88k84O3AHU=",
-+          "requires": {
-+            "@emmetio/implicit-tag": "1.0.0"
-+          }
-+        },
-+        "@emmetio/implicit-tag": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/@emmetio/implicit-tag/-/implicit-tag-1.0.0.tgz",
-+          "integrity": "sha1-+CbU4fxR2jlDTCMmtvbQ4rLntBk="
-+        },
-+        "@emmetio/lorem": {
-+          "version": "1.0.1",
-+          "resolved": "https://registry.npmjs.org/@emmetio/lorem/-/lorem-1.0.1.tgz",
-+          "integrity": "sha1-T14LQ7ngH+Kp5c3CSHAIhKHKuVo=",
-+          "requires": {
-+            "@emmetio/implicit-tag": "1.0.0"
-+          }
-+        },
-+        "@emmetio/markup-formatters": {
-+          "version": "0.3.3",
-+          "resolved": "https://registry.npmjs.org/@emmetio/markup-formatters/-/markup-formatters-0.3.3.tgz",
-+          "integrity": "sha1-tobAWpeG1Ilr5kdk/yOl5A2vY9w=",
-+          "requires": {
-+            "@emmetio/field-parser": "0.3.0",
-+            "@emmetio/output-renderer": "0.1.1"
-+          }
-+        },
-+        "@emmetio/node": {
-+          "version": "0.1.2",
-+          "resolved": "https://registry.npmjs.org/@emmetio/node/-/node-0.1.2.tgz",
-+          "integrity": "sha1-QjHVOMRUgaUYNfwquj9dn8EpY0w="
-+        },
-+        "@emmetio/output-profile": {
-+          "version": "0.1.5",
-+          "resolved": "https://registry.npmjs.org/@emmetio/output-profile/-/output-profile-0.1.5.tgz",
-+          "integrity": "sha1-Uok6c8GSTuS0FUqfjZdyuJxPYd0="
-+        },
-+        "@emmetio/output-renderer": {
-+          "version": "0.1.1",
-+          "resolved": "https://registry.npmjs.org/@emmetio/output-renderer/-/output-renderer-0.1.1.tgz",
-+          "integrity": "sha1-pNWFVKISAKkZHdeZpzF3h5yl19Y=",
-+          "requires": {
-+            "@emmetio/field-parser": "0.3.0"
-+          }
-+        },
-+        "@emmetio/snippets": {
-+          "version": "0.2.3",
-+          "resolved": "https://registry.npmjs.org/@emmetio/snippets/-/snippets-0.2.3.tgz",
-+          "integrity": "sha1-c+IJ/ANtu598mqEFADjMaK0ILBo="
-+        },
-+        "@emmetio/snippets-registry": {
-+          "version": "0.3.1",
-+          "resolved": "https://registry.npmjs.org/@emmetio/snippets-registry/-/snippets-registry-0.3.1.tgz",
-+          "integrity": "sha1-7A6KEi/paDZZzmmiI5b0E2uUDSA="
-+        },
-+        "@emmetio/stream-reader": {
-+          "version": "2.2.0",
-+          "resolved": "https://registry.npmjs.org/@emmetio/stream-reader/-/stream-reader-2.2.0.tgz",
-+          "integrity": "sha1-Rs/+oRmgoAMxKiHC2bVijLX81EI="
-+        },
-+        "@emmetio/stream-reader-utils": {
-+          "version": "0.1.0",
-+          "resolved": "https://registry.npmjs.org/@emmetio/stream-reader-utils/-/stream-reader-utils-0.1.0.tgz",
-+          "integrity": "sha1-JEywLHfsLnT3ipvTGCGKvJxQCmE="
-+        },
-+        "@emmetio/stylesheet-formatters": {
-+          "version": "0.1.2",
-+          "resolved": "https://registry.npmjs.org/@emmetio/stylesheet-formatters/-/stylesheet-formatters-0.1.2.tgz",
-+          "integrity": "sha1-MDbtbYweQDReZzBEt1w/FJhgIs8=",
-+          "requires": {
-+            "@emmetio/field-parser": "0.3.0",
-+            "@emmetio/output-renderer": "0.1.1"
-+          }
-+        },
-+        "@emmetio/variable-resolver": {
-+          "version": "0.2.1",
-+          "resolved": "https://registry.npmjs.org/@emmetio/variable-resolver/-/variable-resolver-0.2.1.tgz",
-+          "integrity": "sha1-zhG1FYRmmjQJhmkM8OwmnkTGP7o="
-+        }
-+      }
-+    },
-+    "@emmetio/extract-abbreviation": {
-+      "version": "0.1.2",
-+      "resolved": "https://registry.npmjs.org/@emmetio/extract-abbreviation/-/extract-abbreviation-0.1.2.tgz",
-+      "integrity": "sha1-4fHAY0n0saACQbobqKcZBi+RlLA="
-+    },
-+    "@emmetio/html-matcher": {
-+      "version": "0.3.2",
-+      "resolved": "https://registry.npmjs.org/@emmetio/html-matcher/-/html-matcher-0.3.2.tgz",
-+      "integrity": "sha1-7+ACPpcZHeFjnwH9zwoZi1iNNiQ=",
-+      "requires": {
-+        "@emmetio/stream-reader": "2.2.0",
-+        "@emmetio/stream-reader-utils": "0.1.0"
-+      },
-+      "dependencies": {
-+        "@emmetio/stream-reader": {
-+          "version": "2.2.0",
-+          "resolved": "https://registry.npmjs.org/@emmetio/stream-reader/-/stream-reader-2.2.0.tgz",
-+          "integrity": "sha1-Rs/+oRmgoAMxKiHC2bVijLX81EI="
-+        },
-+        "@emmetio/stream-reader-utils": {
-+          "version": "0.1.0",
-+          "resolved": "https://registry.npmjs.org/@emmetio/stream-reader-utils/-/stream-reader-utils-0.1.0.tgz",
-+          "integrity": "sha1-JEywLHfsLnT3ipvTGCGKvJxQCmE="
-+        }
-+      }
-+    },
-+    "@emmetio/math-expression": {
-+      "version": "0.1.1",
-+      "resolved": "https://registry.npmjs.org/@emmetio/math-expression/-/math-expression-0.1.1.tgz",
-+      "integrity": "sha1-H/LH8FgA9kxXyokDjuGLzp9Xdtw=",
-+      "requires": {
-+        "@emmetio/stream-reader": "2.2.0",
-+        "@emmetio/stream-reader-utils": "0.1.0"
-+      },
-+      "dependencies": {
-+        "@emmetio/stream-reader": {
-+          "version": "2.2.0",
-+          "resolved": "https://registry.npmjs.org/@emmetio/stream-reader/-/stream-reader-2.2.0.tgz",
-+          "integrity": "sha1-Rs/+oRmgoAMxKiHC2bVijLX81EI="
-+        },
-+        "@emmetio/stream-reader-utils": {
-+          "version": "0.1.0",
-+          "resolved": "https://registry.npmjs.org/@emmetio/stream-reader-utils/-/stream-reader-utils-0.1.0.tgz",
-+          "integrity": "sha1-JEywLHfsLnT3ipvTGCGKvJxQCmE="
-+        }
-+      }
-+    },
-+    "@types/node": {
-+      "version": "7.0.33",
-+      "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.33.tgz",
-+      "integrity": "sha512-8fVvl6Yyk3jZvSYxRMS9/AmZJ5RXCOP9N4xSlykyBViVESu751pxHYTN14Embn1Fem78YwEHdC7p7KGQQpwunw==",
-+      "dev": true
-+    },
-+    "vscode-emmet-helper": {
-+      "version": "0.0.18",
-+      "resolved": "https://registry.npmjs.org/vscode-emmet-helper/-/vscode-emmet-helper-0.0.18.tgz",
-+      "integrity": "sha1-eHY7J49EVEFfgA2HzoLOSgSsEf4=",
-+      "requires": {
-+        "@emmetio/expand-abbreviation": "0.5.8",
-+        "@emmetio/extract-abbreviation": "0.1.2"
-+      }
-+    }
-+  }
-+}
-changed in both
-  base   100644 439621a13712d9b601884e082c520f756469f66b extensions/emmet/package.json
-  our    100644 d9be62f74d1063d961b7895eab86495b34482691 extensions/emmet/package.json
-  their  100644 74cbeef903662574b26120d2c6afbb0421e7fb51 extensions/emmet/package.json
-@@ -64,6 +64,7 @@
-                         }
-                     },
-                     "default": {},
-+<<<<<<< .our
-                     "description": "%emmetVariables%"
-                 },
-                 "emmet.syntaxProfiles": {
-@@ -216,6 +217,9 @@
-                     "type": "boolean",
-                     "default": true,
-                     "markdownDescription": "%emmetOptimizeStylesheetParsing%"
-+=======
-+                    "description": "Applicable only when emmet.useNewEmmet is set to true.\nVariables to be used in emmet snippets"
-+>>>>>>> .their
-                 }
-             }
-         },
-@@ -446,7 +450,11 @@
-         "@emmetio/css-parser": "ramya-rao-a/css-parser#vscode",
-         "@emmetio/html-matcher": "^0.3.3",
-         "@emmetio/math-expression": "^0.1.1",
-+<<<<<<< .our
-         "image-size": "^0.5.2",
-         "vscode-emmet-helper": "^1.2.11"
-+=======
-+        "vscode-emmet-helper": "0.0.18"
-+>>>>>>> .their
-     }
- }
-added in remote
-  their  100644 c074046639c6d46879b0174ffcc96f69aab28e8c extensions/extension-editing/package-lock.json
-@@ -0,0 +1,98 @@
-+{
-+  "name": "extension-editing",
-+  "version": "0.0.1",
-+  "lockfileVersion": 1,
-+  "requires": true,
-+  "dependencies": {
-+    "@types/markdown-it": {
-+      "version": "0.0.2",
-+      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-0.0.2.tgz",
-+      "integrity": "sha1-XZrRnm5lCM3S8llt+G/Qqt5ZhmA=",
-+      "dev": true
-+    },
-+    "@types/node": {
-+      "version": "7.0.33",
-+      "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.33.tgz",
-+      "integrity": "sha512-8fVvl6Yyk3jZvSYxRMS9/AmZJ5RXCOP9N4xSlykyBViVESu751pxHYTN14Embn1Fem78YwEHdC7p7KGQQpwunw==",
-+      "dev": true
-+    },
-+    "jsonc-parser": {
-+      "version": "0.3.1",
-+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-0.3.1.tgz",
-+      "integrity": "sha1-br9cdSJDaNSwfvTCb5Q05ldHLpU=",
-+      "requires": {
-+        "vscode-nls": "2.0.2"
-+      }
-+    },
-+    "markdown-it": {
-+      "version": "8.3.1",
-+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-8.3.1.tgz",
-+      "integrity": "sha1-L0tiKUjM3Bk9ZvPKLUMSWsSscyM=",
-+      "requires": {
-+        "argparse": "1.0.9",
-+        "entities": "1.1.1",
-+        "linkify-it": "2.0.3",
-+        "mdurl": "1.0.1",
-+        "uc.micro": "1.0.3"
-+      },
-+      "dependencies": {
-+        "argparse": {
-+          "version": "1.0.9",
-+          "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
-+          "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
-+          "requires": {
-+            "sprintf-js": "1.0.3"
-+          }
-+        },
-+        "entities": {
-+          "version": "1.1.1",
-+          "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
-+          "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA="
-+        },
-+        "linkify-it": {
-+          "version": "2.0.3",
-+          "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.0.3.tgz",
-+          "integrity": "sha1-2UpGSPmxwXnWT6lykSaL22zpQ08=",
-+          "requires": {
-+            "uc.micro": "1.0.3"
-+          }
-+        },
-+        "mdurl": {
-+          "version": "1.0.1",
-+          "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-+          "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4="
-+        },
-+        "sprintf-js": {
-+          "version": "1.0.3",
-+          "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-+          "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
-+        },
-+        "uc.micro": {
-+          "version": "1.0.3",
-+          "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.3.tgz",
-+          "integrity": "sha1-ftUNXg+an7ClczeSWfKndFjVAZI="
-+        }
-+      }
-+    },
-+    "parse5": {
-+      "version": "3.0.2",
-+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.2.tgz",
-+      "integrity": "sha1-Be/1fw70V3+xRKefi5qWemzERRA=",
-+      "requires": {
-+        "@types/node": "6.0.79"
-+      },
-+      "dependencies": {
-+        "@types/node": {
-+          "version": "6.0.79",
-+          "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.79.tgz",
-+          "integrity": "sha512-7F3/P6MkTPA0QxOstRqfcnoReCUy5V/QG92cyBoZSPnqdX44L8TtNELSVfN56gAttm3YWj9cEi8FRIPVq0WmeQ=="
-+        }
-+      }
-+    },
-+    "vscode-nls": {
-+      "version": "2.0.2",
-+      "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-2.0.2.tgz",
-+      "integrity": "sha1-gIUiOAhEuK0VNJmvXDsDkhrqAto="
-+    }
-+  }
-+}
-added in remote
-  their  100644 ac16192c5fed3b3ea2adda950db2514a28773c44 extensions/git/package-lock.json
-@@ -0,0 +1,316 @@
-+{
-+  "name": "git",
-+  "version": "0.0.1",
-+  "lockfileVersion": 1,
-+  "requires": true,
-+  "dependencies": {
-+    "@types/mocha": {
-+      "version": "2.2.41",
-+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-2.2.41.tgz",
-+      "integrity": "sha1-4nzwgXFT658nE7LT9saPHhw8pgg=",
-+      "dev": true
-+    },
-+    "@types/node": {
-+      "version": "7.0.33",
-+      "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.33.tgz",
-+      "integrity": "sha512-8fVvl6Yyk3jZvSYxRMS9/AmZJ5RXCOP9N4xSlykyBViVESu751pxHYTN14Embn1Fem78YwEHdC7p7KGQQpwunw==",
-+      "dev": true
-+    },
-+    "balanced-match": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-+      "dev": true
-+    },
-+    "brace-expansion": {
-+      "version": "1.1.8",
-+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
-+      "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
-+      "dev": true,
-+      "requires": {
-+        "balanced-match": "1.0.0",
-+        "concat-map": "0.0.1"
-+      }
-+    },
-+    "browser-stdout": {
-+      "version": "1.3.0",
-+      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz",
-+      "integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8=",
-+      "dev": true
-+    },
-+    "commander": {
-+      "version": "2.9.0",
-+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
-+      "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
-+      "dev": true,
-+      "requires": {
-+        "graceful-readlink": "1.0.1"
-+      }
-+    },
-+    "concat-map": {
-+      "version": "0.0.1",
-+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-+      "dev": true
-+    },
-+    "debug": {
-+      "version": "2.6.0",
-+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz",
-+      "integrity": "sha1-vFlryr52F/Edn6FTYe3tVgi4SZs=",
-+      "dev": true,
-+      "requires": {
-+        "ms": "0.7.2"
-+      }
-+    },
-+    "diff": {
-+      "version": "3.2.0",
-+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz",
-+      "integrity": "sha1-yc45Okt8vQsFinJck98pkCeGj/k=",
-+      "dev": true
-+    },
-+    "escape-string-regexp": {
-+      "version": "1.0.5",
-+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-+      "dev": true
-+    },
-+    "fs.realpath": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-+      "dev": true
-+    },
-+    "glob": {
-+      "version": "7.1.1",
-+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz",
-+      "integrity": "sha1-gFIR3wT6rxxjo2ADBs31reULLsg=",
-+      "dev": true,
-+      "requires": {
-+        "fs.realpath": "1.0.0",
-+        "inflight": "1.0.6",
-+        "inherits": "2.0.3",
-+        "minimatch": "3.0.4",
-+        "once": "1.4.0",
-+        "path-is-absolute": "1.0.1"
-+      }
-+    },
-+    "graceful-readlink": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
-+      "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
-+      "dev": true
-+    },
-+    "growl": {
-+      "version": "1.9.2",
-+      "resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz",
-+      "integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=",
-+      "dev": true
-+    },
-+    "has-flag": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-+      "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-+      "dev": true
-+    },
-+    "iconv-lite": {
-+      "version": "0.4.15",
-+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz",
-+      "integrity": "sha1-/iZaIYrGpXz+hUkn6dBMGYJe3es="
-+    },
-+    "inflight": {
-+      "version": "1.0.6",
-+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-+      "dev": true,
-+      "requires": {
-+        "once": "1.4.0",
-+        "wrappy": "1.0.2"
-+      }
-+    },
-+    "inherits": {
-+      "version": "2.0.3",
-+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-+      "dev": true
-+    },
-+    "json3": {
-+      "version": "3.3.2",
-+      "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
-+      "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=",
-+      "dev": true
-+    },
-+    "lodash._baseassign": {
-+      "version": "3.2.0",
-+      "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
-+      "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=",
-+      "dev": true,
-+      "requires": {
-+        "lodash._basecopy": "3.0.1",
-+        "lodash.keys": "3.1.2"
-+      }
-+    },
-+    "lodash._basecopy": {
-+      "version": "3.0.1",
-+      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
-+      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
-+      "dev": true
-+    },
-+    "lodash._basecreate": {
-+      "version": "3.0.3",
-+      "resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz",
-+      "integrity": "sha1-G8ZhYU2qf8MRt9A78WgGoCE8+CE=",
-+      "dev": true
-+    },
-+    "lodash._getnative": {
-+      "version": "3.9.1",
-+      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-+      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
-+      "dev": true
-+    },
-+    "lodash._isiterateecall": {
-+      "version": "3.0.9",
-+      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
-+      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
-+      "dev": true
-+    },
-+    "lodash.create": {
-+      "version": "3.1.1",
-+      "resolved": "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz",
-+      "integrity": "sha1-1/KEnw29p+BGgruM1yqwIkYd6+c=",
-+      "dev": true,
-+      "requires": {
-+        "lodash._baseassign": "3.2.0",
-+        "lodash._basecreate": "3.0.3",
-+        "lodash._isiterateecall": "3.0.9"
-+      }
-+    },
-+    "lodash.isarguments": {
-+      "version": "3.1.0",
-+      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
-+      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
-+      "dev": true
-+    },
-+    "lodash.isarray": {
-+      "version": "3.0.4",
-+      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-+      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
-+      "dev": true
-+    },
-+    "lodash.keys": {
-+      "version": "3.1.2",
-+      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
-+      "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
-+      "dev": true,
-+      "requires": {
-+        "lodash._getnative": "3.9.1",
-+        "lodash.isarguments": "3.1.0",
-+        "lodash.isarray": "3.0.4"
-+      }
-+    },
-+    "minimatch": {
-+      "version": "3.0.4",
-+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-+      "dev": true,
-+      "requires": {
-+        "brace-expansion": "1.1.8"
-+      }
-+    },
-+    "minimist": {
-+      "version": "0.0.8",
-+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-+      "dev": true
-+    },
-+    "mkdirp": {
-+      "version": "0.5.1",
-+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-+      "dev": true,
-+      "requires": {
-+        "minimist": "0.0.8"
-+      }
-+    },
-+    "mocha": {
-+      "version": "3.4.2",
-+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-3.4.2.tgz",
-+      "integrity": "sha1-0O9NMyEm2/GNDWQMmzgt1IvpdZQ=",
-+      "dev": true,
-+      "requires": {
-+        "browser-stdout": "1.3.0",
-+        "commander": "2.9.0",
-+        "debug": "2.6.0",
-+        "diff": "3.2.0",
-+        "escape-string-regexp": "1.0.5",
-+        "glob": "7.1.1",
-+        "growl": "1.9.2",
-+        "json3": "3.3.2",
-+        "lodash.create": "3.1.1",
-+        "mkdirp": "0.5.1",
-+        "supports-color": "3.1.2"
-+      }
-+    },
-+    "ms": {
-+      "version": "0.7.2",
-+      "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
-+      "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
-+      "dev": true
-+    },
-+    "once": {
-+      "version": "1.4.0",
-+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-+      "dev": true,
-+      "requires": {
-+        "wrappy": "1.0.2"
-+      }
-+    },
-+    "path-is-absolute": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-+      "dev": true
-+    },
-+    "supports-color": {
-+      "version": "3.1.2",
-+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz",
-+      "integrity": "sha1-cqJiiU2dQIuVbKBf83su2KbiotU=",
-+      "dev": true,
-+      "requires": {
-+        "has-flag": "1.0.0"
-+      }
-+    },
-+    "vscode-extension-telemetry": {
-+      "version": "0.0.8",
-+      "resolved": "https://registry.npmjs.org/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.8.tgz",
-+      "integrity": "sha1-ImG/+Ya2aQpvH3RqRaxb0fhdKeA=",
-+      "requires": {
-+        "applicationinsights": "0.18.0",
-+        "winreg": "1.2.3"
-+      },
-+      "dependencies": {
-+        "applicationinsights": {
-+          "version": "0.18.0",
-+          "resolved": "https://registry.npmjs.org/applicationinsights/-/applicationinsights-0.18.0.tgz",
-+          "integrity": "sha1-Fi67SKODQIvE3kTbMrQXMH9Fu8E="
-+        },
-+        "winreg": {
-+          "version": "1.2.3",
-+          "resolved": "https://registry.npmjs.org/winreg/-/winreg-1.2.3.tgz",
-+          "integrity": "sha1-k60RayaW2ofVj3JlqPzqUlSpZdU="
-+        }
-+      }
-+    },
-+    "vscode-nls": {
-+      "version": "2.0.2",
-+      "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-2.0.2.tgz",
-+      "integrity": "sha1-gIUiOAhEuK0VNJmvXDsDkhrqAto="
-+    },
-+    "wrappy": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-+      "dev": true
-+    }
-+  }
-+}
-changed in both
-  base   100644 bf8fe767cdfbadb313a0ef2a861f85ded991722f extensions/git/package.json
-  our    100644 712f071eb3a07013f5d0d6a279de9bb561020d87 extensions/git/package.json
-  their  100644 ab7acd2099c5a7c7cdd33f2823bb522fa9f81d2a extensions/git/package.json
-added in remote
-  their  100644 26c855086fc6d5f7da8d5515026671acbc76c7b2 extensions/grunt/package-lock.json
-@@ -0,0 +1,19 @@
-+{
-+  "name": "grunt",
-+  "version": "0.0.1",
-+  "lockfileVersion": 1,
-+  "requires": true,
-+  "dependencies": {
-+    "@types/node": {
-+      "version": "7.0.33",
-+      "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.33.tgz",
-+      "integrity": "sha512-8fVvl6Yyk3jZvSYxRMS9/AmZJ5RXCOP9N4xSlykyBViVESu751pxHYTN14Embn1Fem78YwEHdC7p7KGQQpwunw==",
-+      "dev": true
-+    },
-+    "vscode-nls": {
-+      "version": "2.0.2",
-+      "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-2.0.2.tgz",
-+      "integrity": "sha1-gIUiOAhEuK0VNJmvXDsDkhrqAto="
-+    }
-+  }
-+}
-changed in both
-  base   100644 0758d440b08daec814427c74e6b762eedaac373b extensions/grunt/package.json
-  our    100644 c1839be2cc9fcd096988b24b4a61a36cfb5b8e94 extensions/grunt/package.json
-  their  100644 09be5b88843e8a5d1c5e8d558747cfcb632c0097 extensions/grunt/package.json
-added in remote
-  their  100644 573752fb3a5ab1a4e0d89300febf649175275d83 extensions/gulp/package-lock.json
-@@ -0,0 +1,19 @@
-+{
-+  "name": "gulp",
-+  "version": "0.0.1",
-+  "lockfileVersion": 1,
-+  "requires": true,
-+  "dependencies": {
-+    "@types/node": {
-+      "version": "7.0.33",
-+      "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.33.tgz",
-+      "integrity": "sha512-8fVvl6Yyk3jZvSYxRMS9/AmZJ5RXCOP9N4xSlykyBViVESu751pxHYTN14Embn1Fem78YwEHdC7p7KGQQpwunw==",
-+      "dev": true
-+    },
-+    "vscode-nls": {
-+      "version": "2.0.2",
-+      "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-2.0.2.tgz",
-+      "integrity": "sha1-gIUiOAhEuK0VNJmvXDsDkhrqAto="
-+    }
-+  }
-+}
-changed in both
-  base   100644 235f3e2d1384c7fe6a7c47243abd17b0d4bcc041 extensions/gulp/package.json
-  our    100644 5c5656a126dc8bffcbb7098797ef752c99e9aa99 extensions/gulp/package.json
-  their  100644 6cd87b9705a1f3dcd7054b5aaaec17c40ff22a14 extensions/gulp/package.json
-added in remote
-  their  100644 c47290670a8e34c6bd864179856c082f4fad56d2 extensions/html/package-lock.json
-@@ -0,0 +1,67 @@
-+{
-+  "name": "html",
-+  "version": "0.1.0",
-+  "lockfileVersion": 1,
-+  "requires": true,
-+  "dependencies": {
-+    "@types/mocha": {
-+      "version": "2.2.41",
-+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-2.2.41.tgz",
-+      "integrity": "sha1-4nzwgXFT658nE7LT9saPHhw8pgg=",
-+      "dev": true
-+    },
-+    "@types/node": {
-+      "version": "6.0.79",
-+      "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.79.tgz",
-+      "integrity": "sha512-7F3/P6MkTPA0QxOstRqfcnoReCUy5V/QG92cyBoZSPnqdX44L8TtNELSVfN56gAttm3YWj9cEi8FRIPVq0WmeQ==",
-+      "dev": true
-+    },
-+    "vscode-extension-telemetry": {
-+      "version": "0.0.8",
-+      "resolved": "https://registry.npmjs.org/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.8.tgz",
-+      "integrity": "sha1-ImG/+Ya2aQpvH3RqRaxb0fhdKeA=",
-+      "requires": {
-+        "applicationinsights": "0.18.0",
-+        "winreg": "1.2.3"
-+      },
-+      "dependencies": {
-+        "applicationinsights": {
-+          "version": "0.18.0",
-+          "resolved": "https://registry.npmjs.org/applicationinsights/-/applicationinsights-0.18.0.tgz",
-+          "integrity": "sha1-Fi67SKODQIvE3kTbMrQXMH9Fu8E="
-+        },
-+        "winreg": {
-+          "version": "1.2.3",
-+          "resolved": "https://registry.npmjs.org/winreg/-/winreg-1.2.3.tgz",
-+          "integrity": "sha1-k60RayaW2ofVj3JlqPzqUlSpZdU="
-+        }
-+      }
-+    },
-+    "vscode-languageclient": {
-+      "version": "3.1.0-alpha.1",
-+      "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-3.1.0-alpha.1.tgz",
-+      "integrity": "sha1-SKlTw0gccGKzw+Ztb7uDmk+uixU=",
-+      "requires": {
-+        "vscode-jsonrpc": "3.3.1",
-+        "vscode-languageserver-types": "3.0.3"
-+      },
-+      "dependencies": {
-+        "vscode-jsonrpc": {
-+          "version": "3.3.1",
-+          "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.3.1.tgz",
-+          "integrity": "sha512-iLlG27498AJF0j4GJ4yua7Z9bpJfLfwpAaAA9mihe6VDoYHwK8TyFgnpXdgjoTb8X9/DnzimQeg0bjIWINvPWw=="
-+        }
-+      }
-+    },
-+    "vscode-languageserver-types": {
-+      "version": "3.0.3",
-+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.0.3.tgz",
-+      "integrity": "sha1-MDsqMHwglS/1wfWmCPPJEUYCjUc="
-+    },
-+    "vscode-nls": {
-+      "version": "2.0.2",
-+      "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-2.0.2.tgz",
-+      "integrity": "sha1-gIUiOAhEuK0VNJmvXDsDkhrqAto="
-+    }
-+  }
-+}
-changed in both
-  base   100644 df231a22a2f619d2e8fe11520fb62e06008f35c5 extensions/html/package.json
-  our    100644 5bcc9be5877c773efa5d16e5dc79ee66b4fba518 extensions/html/package.json
-  their  100644 19fdf95fb31c5906f6c91f3b7accad9cfa409343 extensions/html/package.json
-added in remote
-  their  100644 9bb124abc2fad6dc69d39c547c6e3827fb9e356e extensions/html/server/package-lock.json
-@@ -0,0 +1,84 @@
-+{
-+  "name": "vscode-html-languageserver",
-+  "version": "1.0.0",
-+  "lockfileVersion": 1,
-+  "requires": true,
-+  "dependencies": {
-+    "@types/mocha": {
-+      "version": "2.2.41",
-+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-2.2.41.tgz",
-+      "integrity": "sha1-4nzwgXFT658nE7LT9saPHhw8pgg=",
-+      "dev": true
-+    },
-+    "@types/node": {
-+      "version": "6.0.79",
-+      "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.79.tgz",
-+      "integrity": "sha512-7F3/P6MkTPA0QxOstRqfcnoReCUy5V/QG92cyBoZSPnqdX44L8TtNELSVfN56gAttm3YWj9cEi8FRIPVq0WmeQ==",
-+      "dev": true
-+    },
-+    "vscode-css-languageservice": {
-+      "version": "2.1.1",
-+      "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-2.1.1.tgz",
-+      "integrity": "sha1-UQOPEzSWSLYRyrN5aeZ2ussliKA=",
-+      "requires": {
-+        "vscode-languageserver-types": "3.3.0",
-+        "vscode-nls": "2.0.2"
-+      },
-+      "dependencies": {
-+        "vscode-languageserver-types": {
-+          "version": "3.3.0",
-+          "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.3.0.tgz",
-+          "integrity": "sha512-5BMClM4D3mRl5JlWFxIxhhJAbcVW9dFviz8ubppmG8epCTzl1bPpndcnvsjOjUlVsO9V8l8Ktklqc70Ew6soew=="
-+        }
-+      }
-+    },
-+    "vscode-html-languageservice": {
-+      "version": "2.0.5",
-+      "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-2.0.5.tgz",
-+      "integrity": "sha1-q/9+xdD6aIRN0m2APaYMlK5iE+w=",
-+      "requires": {
-+        "vscode-languageserver-types": "3.3.0",
-+        "vscode-nls": "2.0.2",
-+        "vscode-uri": "1.0.1"
-+      },
-+      "dependencies": {
-+        "vscode-languageserver-types": {
-+          "version": "3.3.0",
-+          "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.3.0.tgz",
-+          "integrity": "sha512-5BMClM4D3mRl5JlWFxIxhhJAbcVW9dFviz8ubppmG8epCTzl1bPpndcnvsjOjUlVsO9V8l8Ktklqc70Ew6soew=="
-+        }
-+      }
-+    },
-+    "vscode-languageserver": {
-+      "version": "3.3.0",
-+      "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.3.0.tgz",
-+      "integrity": "sha512-8YvEbjl77Nl24/cgcSbQC/CPEhSoJwvLLKGJZJbIF4DsGo4jrVDbuARXfmUt9S6vCEEr++o3fbbZ17iLZ0QH0A==",
-+      "requires": {
-+        "vscode-jsonrpc": "3.3.1",
-+        "vscode-languageserver-types": "3.3.0"
-+      },
-+      "dependencies": {
-+        "vscode-jsonrpc": {
-+          "version": "3.3.1",
-+          "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.3.1.tgz",
-+          "integrity": "sha512-iLlG27498AJF0j4GJ4yua7Z9bpJfLfwpAaAA9mihe6VDoYHwK8TyFgnpXdgjoTb8X9/DnzimQeg0bjIWINvPWw=="
-+        },
-+        "vscode-languageserver-types": {
-+          "version": "3.3.0",
-+          "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.3.0.tgz",
-+          "integrity": "sha512-5BMClM4D3mRl5JlWFxIxhhJAbcVW9dFviz8ubppmG8epCTzl1bPpndcnvsjOjUlVsO9V8l8Ktklqc70Ew6soew=="
-+        }
-+      }
-+    },
-+    "vscode-nls": {
-+      "version": "2.0.2",
-+      "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-2.0.2.tgz",
-+      "integrity": "sha1-gIUiOAhEuK0VNJmvXDsDkhrqAto="
-+    },
-+    "vscode-uri": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.1.tgz",
-+      "integrity": "sha1-Eahr7+rDxKo+wIYjZRo8gabQu8g="
-+    }
-+  }
-+}
-added in remote
-  their  100644 3eb36daeb5f654ca0f5cb1a01edcb6d611524c9d extensions/jake/package-lock.json
-@@ -0,0 +1,19 @@
-+{
-+  "name": "jake",
-+  "version": "0.0.1",
-+  "lockfileVersion": 1,
-+  "requires": true,
-+  "dependencies": {
-+    "@types/node": {
-+      "version": "7.0.33",
-+      "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.33.tgz",
-+      "integrity": "sha512-8fVvl6Yyk3jZvSYxRMS9/AmZJ5RXCOP9N4xSlykyBViVESu751pxHYTN14Embn1Fem78YwEHdC7p7KGQQpwunw==",
-+      "dev": true
-+    },
-+    "vscode-nls": {
-+      "version": "2.0.2",
-+      "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-2.0.2.tgz",
-+      "integrity": "sha1-gIUiOAhEuK0VNJmvXDsDkhrqAto="
-+    }
-+  }
-+}
-changed in both
-  base   100644 9e48dd07c438bae2f008c818cc51ba3bd27250ee extensions/jake/package.json
-  our    100644 34a149cf355995d027eea2c486192c94cad35d31 extensions/jake/package.json
-  their  100644 6b389bc9e49324deb115030801c8fc84b9edf5f9 extensions/jake/package.json
-added in remote
-  their  100644 e75aa91b1789d90eaab6a29263a1238b51d8fdd2 extensions/javascript/package-lock.json
-@@ -0,0 +1,74 @@
-+{
-+  "name": "javascript",
-+  "version": "0.1.0",
-+  "lockfileVersion": 1,
-+  "requires": true,
-+  "dependencies": {
-+    "@types/node": {
-+      "version": "7.0.33",
-+      "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.33.tgz",
-+      "integrity": "sha512-8fVvl6Yyk3jZvSYxRMS9/AmZJ5RXCOP9N4xSlykyBViVESu751pxHYTN14Embn1Fem78YwEHdC7p7KGQQpwunw==",
-+      "dev": true
-+    },
-+    "agent-base": {
-+      "version": "https://registry.npmjs.org/agent-base/-/agent-base-1.0.2.tgz",
-+      "integrity": "sha1-aJDT+yFwBLYrcPiSjg+uX4lSpwY="
-+    },
-+    "debug": {
-+      "version": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-+      "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
-+      "requires": {
-+        "ms": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
-+      }
-+    },
-+    "extend": {
-+      "version": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz",
-+      "integrity": "sha1-WkdDU7nzNT3dgXbf03uRyDpG8dQ="
-+    },
-+    "http-proxy-agent": {
-+      "version": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-0.2.7.tgz",
-+      "integrity": "sha1-4X/aZfCQLZUs55IeYsf/iGJlWl4=",
-+      "requires": {
-+        "agent-base": "https://registry.npmjs.org/agent-base/-/agent-base-1.0.2.tgz",
-+        "debug": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-+        "extend": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
-+      }
-+    },
-+    "https-proxy-agent": {
-+      "version": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-0.3.6.tgz",
-+      "integrity": "sha1-cT+jjl01P1DrFKNC/r4pAz7RYZs=",
-+      "requires": {
-+        "agent-base": "https://registry.npmjs.org/agent-base/-/agent-base-1.0.2.tgz",
-+        "debug": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-+        "extend": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
-+      }
-+    },
-+    "jsonc-parser": {
-+      "version": "0.3.1",
-+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-0.3.1.tgz",
-+      "integrity": "sha1-br9cdSJDaNSwfvTCb5Q05ldHLpU=",
-+      "requires": {
-+        "vscode-nls": "2.0.2"
-+      }
-+    },
-+    "ms": {
-+      "version": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-+      "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg="
-+    },
-+    "request-light": {
-+      "version": "0.2.0",
-+      "resolved": "https://registry.npmjs.org/request-light/-/request-light-0.2.0.tgz",
-+      "integrity": "sha1-kiSXeRwuaFKBJN+4I1TPN+S7LPw=",
-+      "requires": {
-+        "http-proxy-agent": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-0.2.7.tgz",
-+        "https-proxy-agent": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-0.3.6.tgz",
-+        "vscode-nls": "2.0.2"
-+      }
-+    },
-+    "vscode-nls": {
-+      "version": "2.0.2",
-+      "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-2.0.2.tgz",
-+      "integrity": "sha1-gIUiOAhEuK0VNJmvXDsDkhrqAto="
-+    }
-+  }
-+}
-changed in both
-  base   100644 b8c76ba64aaf24aaabf656d0eacb75141ca118d0 extensions/javascript/package.json
-  our    100644 c60988f88fef854ed179bdb3251936d4abfc8088 extensions/javascript/package.json
-  their  100644 b5102e5c6ba1a3b73ff7fb9a2c297083b2596569 extensions/javascript/package.json
-@@ -129,4 +129,4 @@
-       }
-     ]
-   }
--}
-\ No newline at end of file
-+}
-added in remote
-  their  100644 62e4e23cdf5e65a0d16cb5f7c06fdec358981c5b extensions/json/package-lock.json
-@@ -0,0 +1,61 @@
-+{
-+  "name": "json",
-+  "version": "0.1.0",
-+  "lockfileVersion": 1,
-+  "requires": true,
-+  "dependencies": {
-+    "@types/node": {
-+      "version": "6.0.79",
-+      "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.79.tgz",
-+      "integrity": "sha512-7F3/P6MkTPA0QxOstRqfcnoReCUy5V/QG92cyBoZSPnqdX44L8TtNELSVfN56gAttm3YWj9cEi8FRIPVq0WmeQ==",
-+      "dev": true
-+    },
-+    "vscode-extension-telemetry": {
-+      "version": "0.0.8",
-+      "resolved": "https://registry.npmjs.org/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.8.tgz",
-+      "integrity": "sha1-ImG/+Ya2aQpvH3RqRaxb0fhdKeA=",
-+      "requires": {
-+        "applicationinsights": "0.18.0",
-+        "winreg": "1.2.3"
-+      },
-+      "dependencies": {
-+        "applicationinsights": {
-+          "version": "0.18.0",
-+          "resolved": "https://registry.npmjs.org/applicationinsights/-/applicationinsights-0.18.0.tgz",
-+          "integrity": "sha1-Fi67SKODQIvE3kTbMrQXMH9Fu8E="
-+        },
-+        "winreg": {
-+          "version": "1.2.3",
-+          "resolved": "https://registry.npmjs.org/winreg/-/winreg-1.2.3.tgz",
-+          "integrity": "sha1-k60RayaW2ofVj3JlqPzqUlSpZdU="
-+        }
-+      }
-+    },
-+    "vscode-languageclient": {
-+      "version": "3.1.0-alpha.1",
-+      "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-3.1.0-alpha.1.tgz",
-+      "integrity": "sha1-SKlTw0gccGKzw+Ztb7uDmk+uixU=",
-+      "requires": {
-+        "vscode-jsonrpc": "3.3.1",
-+        "vscode-languageserver-types": "3.3.0"
-+      },
-+      "dependencies": {
-+        "vscode-jsonrpc": {
-+          "version": "3.3.1",
-+          "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.3.1.tgz",
-+          "integrity": "sha512-iLlG27498AJF0j4GJ4yua7Z9bpJfLfwpAaAA9mihe6VDoYHwK8TyFgnpXdgjoTb8X9/DnzimQeg0bjIWINvPWw=="
-+        },
-+        "vscode-languageserver-types": {
-+          "version": "3.3.0",
-+          "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.3.0.tgz",
-+          "integrity": "sha512-5BMClM4D3mRl5JlWFxIxhhJAbcVW9dFviz8ubppmG8epCTzl1bPpndcnvsjOjUlVsO9V8l8Ktklqc70Ew6soew=="
-+        }
-+      }
-+    },
-+    "vscode-nls": {
-+      "version": "2.0.2",
-+      "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-2.0.2.tgz",
-+      "integrity": "sha1-gIUiOAhEuK0VNJmvXDsDkhrqAto="
-+    }
-+  }
-+}
-changed in both
-  base   100644 92fd2f2645c9daa82031d29834e398133d1cafa0 extensions/json/package.json
-  our    100644 af9024bfde9123390d1583e73a5ad460ae6c9ea8 extensions/json/package.json
-  their  100644 f4fa15a10fedd88f6fabe9f0f6b29fabe7e8eb24 extensions/json/package.json
-added in remote
-  their  100644 9f22cf407f99c47ea69b7109dc7b24f1504b9beb extensions/json/server/package-lock.json
-@@ -0,0 +1,126 @@
-+{
-+  "name": "vscode-json-languageserver",
-+  "version": "1.0.0",
-+  "lockfileVersion": 1,
-+  "requires": true,
-+  "dependencies": {
-+    "@types/node": {
-+      "version": "6.0.79",
-+      "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.79.tgz",
-+      "integrity": "sha512-7F3/P6MkTPA0QxOstRqfcnoReCUy5V/QG92cyBoZSPnqdX44L8TtNELSVfN56gAttm3YWj9cEi8FRIPVq0WmeQ==",
-+      "dev": true
-+    },
-+    "jsonc-parser": {
-+      "version": "0.4.2",
-+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-0.4.2.tgz",
-+      "integrity": "sha1-pLLK9n0acjlCgwZgYBMPcVBRMx0=",
-+      "requires": {
-+        "vscode-nls": "2.0.2"
-+      }
-+    },
-+    "request-light": {
-+      "version": "0.2.1",
-+      "resolved": "https://registry.npmjs.org/request-light/-/request-light-0.2.1.tgz",
-+      "integrity": "sha1-mG9agok+nRymqJbr5vRsUca0VX8=",
-+      "requires": {
-+        "http-proxy-agent": "0.2.7",
-+        "https-proxy-agent": "0.3.6",
-+        "vscode-nls": "2.0.2"
-+      },
-+      "dependencies": {
-+        "agent-base": {
-+          "version": "1.0.2",
-+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-1.0.2.tgz",
-+          "integrity": "sha1-aJDT+yFwBLYrcPiSjg+uX4lSpwY="
-+        },
-+        "debug": {
-+          "version": "2.6.8",
-+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-+          "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
-+          "requires": {
-+            "ms": "2.0.0"
-+          }
-+        },
-+        "extend": {
-+          "version": "3.0.1",
-+          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-+          "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
-+        },
-+        "http-proxy-agent": {
-+          "version": "0.2.7",
-+          "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-0.2.7.tgz",
-+          "integrity": "sha1-4X/aZfCQLZUs55IeYsf/iGJlWl4=",
-+          "requires": {
-+            "agent-base": "1.0.2",
-+            "debug": "2.6.8",
-+            "extend": "3.0.1"
-+          }
-+        },
-+        "https-proxy-agent": {
-+          "version": "0.3.6",
-+          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-0.3.6.tgz",
-+          "integrity": "sha1-cT+jjl01P1DrFKNC/r4pAz7RYZs=",
-+          "requires": {
-+            "agent-base": "1.0.2",
-+            "debug": "2.6.8",
-+            "extend": "3.0.1"
-+          }
-+        },
-+        "ms": {
-+          "version": "2.0.0",
-+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-+        }
-+      }
-+    },
-+    "vscode-json-languageservice": {
-+      "version": "2.0.12",
-+      "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-2.0.12.tgz",
-+      "integrity": "sha1-NmHQ6xv60JZ2IwjWh2qi5vUQYF0=",
-+      "requires": {
-+        "jsonc-parser": "0.4.2",
-+        "vscode-languageserver-types": "3.3.0",
-+        "vscode-nls": "2.0.2",
-+        "vscode-uri": "1.0.1"
-+      },
-+      "dependencies": {
-+        "vscode-languageserver-types": {
-+          "version": "3.3.0",
-+          "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.3.0.tgz",
-+          "integrity": "sha512-5BMClM4D3mRl5JlWFxIxhhJAbcVW9dFviz8ubppmG8epCTzl1bPpndcnvsjOjUlVsO9V8l8Ktklqc70Ew6soew=="
-+        },
-+        "vscode-uri": {
-+          "version": "1.0.1",
-+          "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.1.tgz",
-+          "integrity": "sha1-Eahr7+rDxKo+wIYjZRo8gabQu8g="
-+        }
-+      }
-+    },
-+    "vscode-languageserver": {
-+      "version": "3.3.0",
-+      "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.3.0.tgz",
-+      "integrity": "sha512-8YvEbjl77Nl24/cgcSbQC/CPEhSoJwvLLKGJZJbIF4DsGo4jrVDbuARXfmUt9S6vCEEr++o3fbbZ17iLZ0QH0A==",
-+      "requires": {
-+        "vscode-jsonrpc": "3.3.1",
-+        "vscode-languageserver-types": "3.3.0"
-+      },
-+      "dependencies": {
-+        "vscode-jsonrpc": {
-+          "version": "3.3.1",
-+          "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.3.1.tgz",
-+          "integrity": "sha512-iLlG27498AJF0j4GJ4yua7Z9bpJfLfwpAaAA9mihe6VDoYHwK8TyFgnpXdgjoTb8X9/DnzimQeg0bjIWINvPWw=="
-+        },
-+        "vscode-languageserver-types": {
-+          "version": "3.3.0",
-+          "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.3.0.tgz",
-+          "integrity": "sha512-5BMClM4D3mRl5JlWFxIxhhJAbcVW9dFviz8ubppmG8epCTzl1bPpndcnvsjOjUlVsO9V8l8Ktklqc70Ew6soew=="
-+        }
-+      }
-+    },
-+    "vscode-nls": {
-+      "version": "2.0.2",
-+      "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-2.0.2.tgz",
-+      "integrity": "sha1-gIUiOAhEuK0VNJmvXDsDkhrqAto="
-+    }
-+  }
-+}
-added in remote
-  their  100644 31c57ea366117fc2a0dbbfb0fc1ae5b7a7f351bd extensions/markdown/package-lock.json
-@@ -0,0 +1,232 @@
-+{
-+  "name": "vscode-markdown",
-+  "version": "0.2.0",
-+  "lockfileVersion": 1,
-+  "requires": true,
-+  "dependencies": {
-+    "@types/node": {
-+      "version": "7.0.33",
-+      "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.33.tgz",
-+      "integrity": "sha512-8fVvl6Yyk3jZvSYxRMS9/AmZJ5RXCOP9N4xSlykyBViVESu751pxHYTN14Embn1Fem78YwEHdC7p7KGQQpwunw==",
-+      "dev": true
-+    },
-+    "binaryextensions": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/binaryextensions/-/binaryextensions-1.0.1.tgz",
-+      "integrity": "sha1-HmN0iLNbWL2l9HdL+WpSEqjJB1U=",
-+      "dev": true
-+    },
-+    "core-util-is": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-+      "dev": true
-+    },
-+    "escape-string-regexp": {
-+      "version": "1.0.5",
-+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-+      "dev": true
-+    },
-+    "gulp-rename": {
-+      "version": "1.2.2",
-+      "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-1.2.2.tgz",
-+      "integrity": "sha1-OtRCh2PwXidk3sHGfYaNsnVoeBc=",
-+      "dev": true
-+    },
-+    "gulp-replace": {
-+      "version": "0.5.4",
-+      "resolved": "https://registry.npmjs.org/gulp-replace/-/gulp-replace-0.5.4.tgz",
-+      "integrity": "sha1-aaZ5FLvRPFYr/xT1BKQDeWqg2qk=",
-+      "dev": true,
-+      "requires": {
-+        "istextorbinary": "1.0.2",
-+        "readable-stream": "2.3.3",
-+        "replacestream": "4.0.2"
-+      }
-+    },
-+    "highlight.js": {
-+      "version": "9.5.0",
-+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.5.0.tgz",
-+      "integrity": "sha1-Rq5RudsA9wBSvN8ZbNQEdXtlgq4="
-+    },
-+    "inherits": {
-+      "version": "2.0.3",
-+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-+      "dev": true
-+    },
-+    "isarray": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-+      "dev": true
-+    },
-+    "istextorbinary": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/istextorbinary/-/istextorbinary-1.0.2.tgz",
-+      "integrity": "sha1-rOGTVNGpoBc+/rEITOD4ewrX3s8=",
-+      "dev": true,
-+      "requires": {
-+        "binaryextensions": "1.0.1",
-+        "textextensions": "1.0.2"
-+      }
-+    },
-+    "markdown-it": {
-+      "version": "8.2.2",
-+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-8.2.2.tgz",
-+      "integrity": "sha1-45WT2Xb5xLfufzOKOh6eEMPbTjY=",
-+      "requires": {
-+        "argparse": "1.0.9",
-+        "entities": "1.1.1",
-+        "linkify-it": "2.0.3",
-+        "mdurl": "1.0.1",
-+        "uc.micro": "1.0.3"
-+      },
-+      "dependencies": {
-+        "argparse": {
-+          "version": "1.0.9",
-+          "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
-+          "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
-+          "requires": {
-+            "sprintf-js": "1.0.3"
-+          }
-+        },
-+        "entities": {
-+          "version": "1.1.1",
-+          "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
-+          "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA="
-+        },
-+        "linkify-it": {
-+          "version": "2.0.3",
-+          "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.0.3.tgz",
-+          "integrity": "sha1-2UpGSPmxwXnWT6lykSaL22zpQ08=",
-+          "requires": {
-+            "uc.micro": "1.0.3"
-+          }
-+        },
-+        "mdurl": {
-+          "version": "1.0.1",
-+          "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-+          "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4="
-+        },
-+        "sprintf-js": {
-+          "version": "1.0.3",
-+          "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-+          "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
-+        },
-+        "uc.micro": {
-+          "version": "1.0.3",
-+          "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.3.tgz",
-+          "integrity": "sha1-ftUNXg+an7ClczeSWfKndFjVAZI="
-+        }
-+      }
-+    },
-+    "markdown-it-named-headers": {
-+      "version": "0.0.4",
-+      "resolved": "https://registry.npmjs.org/markdown-it-named-headers/-/markdown-it-named-headers-0.0.4.tgz",
-+      "integrity": "sha1-gu/CgyQkCmsed7mq5QF3HV81HB8=",
-+      "requires": {
-+        "string": "3.3.3"
-+      },
-+      "dependencies": {
-+        "string": {
-+          "version": "3.3.3",
-+          "resolved": "https://registry.npmjs.org/string/-/string-3.3.3.tgz",
-+          "integrity": "sha1-XqIRzZLSKOGEKUmQpsyXs2anfLA="
-+        }
-+      }
-+    },
-+    "object-assign": {
-+      "version": "4.1.1",
-+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-+      "dev": true
-+    },
-+    "process-nextick-args": {
-+      "version": "1.0.7",
-+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-+      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
-+      "dev": true
-+    },
-+    "readable-stream": {
-+      "version": "2.3.3",
-+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-+      "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-+      "dev": true,
-+      "requires": {
-+        "core-util-is": "1.0.2",
-+        "inherits": "2.0.3",
-+        "isarray": "1.0.0",
-+        "process-nextick-args": "1.0.7",
-+        "safe-buffer": "5.1.1",
-+        "string_decoder": "1.0.3",
-+        "util-deprecate": "1.0.2"
-+      }
-+    },
-+    "replacestream": {
-+      "version": "4.0.2",
-+      "resolved": "https://registry.npmjs.org/replacestream/-/replacestream-4.0.2.tgz",
-+      "integrity": "sha1-DEFAcH5PAyP1DeBEhRcIz1i8N70=",
-+      "dev": true,
-+      "requires": {
-+        "escape-string-regexp": "1.0.5",
-+        "object-assign": "4.1.1",
-+        "readable-stream": "2.3.3"
-+      }
-+    },
-+    "safe-buffer": {
-+      "version": "5.1.1",
-+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-+      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
-+      "dev": true
-+    },
-+    "string_decoder": {
-+      "version": "1.0.3",
-+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-+      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-+      "dev": true,
-+      "requires": {
-+        "safe-buffer": "5.1.1"
-+      }
-+    },
-+    "textextensions": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/textextensions/-/textextensions-1.0.2.tgz",
-+      "integrity": "sha1-ZUhjk+4fK7A5pgy7oFsLaL2VAdI=",
-+      "dev": true
-+    },
-+    "util-deprecate": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-+      "dev": true
-+    },
-+    "vscode-extension-telemetry": {
-+      "version": "0.0.8",
-+      "resolved": "https://registry.npmjs.org/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.8.tgz",
-+      "integrity": "sha1-ImG/+Ya2aQpvH3RqRaxb0fhdKeA=",
-+      "requires": {
-+        "applicationinsights": "0.18.0",
-+        "winreg": "1.2.3"
-+      },
-+      "dependencies": {
-+        "applicationinsights": {
-+          "version": "0.18.0",
-+          "resolved": "https://registry.npmjs.org/applicationinsights/-/applicationinsights-0.18.0.tgz",
-+          "integrity": "sha1-Fi67SKODQIvE3kTbMrQXMH9Fu8E="
-+        },
-+        "winreg": {
-+          "version": "1.2.3",
-+          "resolved": "https://registry.npmjs.org/winreg/-/winreg-1.2.3.tgz",
-+          "integrity": "sha1-k60RayaW2ofVj3JlqPzqUlSpZdU="
-+        }
-+      }
-+    },
-+    "vscode-nls": {
-+      "version": "2.0.2",
-+      "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-2.0.2.tgz",
-+      "integrity": "sha1-gIUiOAhEuK0VNJmvXDsDkhrqAto="
-+    }
-+  }
-+}
-removed in local
-  base   100644 33d53cc5a01c4792dadf9a077b1151d3a9a733d6 extensions/markdown/package.json
-  their  100644 d6f4d19ac1311eed9235781f78b499731e08ff52 extensions/markdown/package.json
-added in remote
-  their  100644 07949c3898cfe34b91d508a5fd9b1e8fe50a200c extensions/merge-conflict/package-lock.json
-@@ -0,0 +1,40 @@
-+{
-+  "name": "merge-conflict",
-+  "version": "0.7.0",
-+  "lockfileVersion": 1,
-+  "requires": true,
-+  "dependencies": {
-+    "@types/node": {
-+      "version": "7.0.33",
-+      "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.33.tgz",
-+      "integrity": "sha512-8fVvl6Yyk3jZvSYxRMS9/AmZJ5RXCOP9N4xSlykyBViVESu751pxHYTN14Embn1Fem78YwEHdC7p7KGQQpwunw==",
-+      "dev": true
-+    },
-+    "vscode-extension-telemetry": {
-+      "version": "0.0.8",
-+      "resolved": "https://registry.npmjs.org/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.8.tgz",
-+      "integrity": "sha1-ImG/+Ya2aQpvH3RqRaxb0fhdKeA=",
-+      "requires": {
-+        "applicationinsights": "0.18.0",
-+        "winreg": "1.2.3"
-+      },
-+      "dependencies": {
-+        "applicationinsights": {
-+          "version": "0.18.0",
-+          "resolved": "https://registry.npmjs.org/applicationinsights/-/applicationinsights-0.18.0.tgz",
-+          "integrity": "sha1-Fi67SKODQIvE3kTbMrQXMH9Fu8E="
-+        },
-+        "winreg": {
-+          "version": "1.2.3",
-+          "resolved": "https://registry.npmjs.org/winreg/-/winreg-1.2.3.tgz",
-+          "integrity": "sha1-k60RayaW2ofVj3JlqPzqUlSpZdU="
-+        }
-+      }
-+    },
-+    "vscode-nls": {
-+      "version": "2.0.2",
-+      "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-2.0.2.tgz",
-+      "integrity": "sha1-gIUiOAhEuK0VNJmvXDsDkhrqAto="
-+    }
-+  }
-+}
-changed in both
-  base   100644 05fa4d772e87e6b093cb3622b6231921d1e6b4c8 extensions/merge-conflict/package.json
-  our    100644 81b65c21ac62f3d1237abb6a363f0644349d8408 extensions/merge-conflict/package.json
-  their  100644 8a04b4cce02de7022aea41bd165d80c198fbb77a extensions/merge-conflict/package.json
-@@ -105,4 +105,4 @@
-   "devDependencies": {
-     "@types/node": "8.0.33"
-   }
--}
-\ No newline at end of file
-+}
-added in remote
-  their  100644 f173191c9c60bac26bd522f5cc8da86d8cf2307f extensions/npm/package-lock.json
-@@ -0,0 +1,19 @@
-+{
-+  "name": "npm",
-+  "version": "0.0.1",
-+  "lockfileVersion": 1,
-+  "requires": true,
-+  "dependencies": {
-+    "@types/node": {
-+      "version": "7.0.33",
-+      "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.33.tgz",
-+      "integrity": "sha512-8fVvl6Yyk3jZvSYxRMS9/AmZJ5RXCOP9N4xSlykyBViVESu751pxHYTN14Embn1Fem78YwEHdC7p7KGQQpwunw==",
-+      "dev": true
-+    },
-+    "vscode-nls": {
-+      "version": "2.0.2",
-+      "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-2.0.2.tgz",
-+      "integrity": "sha1-gIUiOAhEuK0VNJmvXDsDkhrqAto="
-+    }
-+  }
-+}
-changed in both
-  base   100644 0570253af1f5ace5eab0075b7ff41937da8aadcb extensions/npm/package.json
-  our    100644 2e478c09e5ec71a0201c841cd3d23ac312a66662 extensions/npm/package.json
-  their  100644 85fea536c324891a0c129b41d683f371228ef0e6 extensions/npm/package.json
-added in remote
-  their  100644 3f43eab1804be4af684a5e75e03be18045780b7a extensions/package-lock.json
-@@ -0,0 +1,13 @@
-+{
-+  "name": "vscode-extensions",
-+  "version": "0.0.1",
-+  "lockfileVersion": 1,
-+  "requires": true,
-+  "dependencies": {
-+    "typescript": {
-+      "version": "2.4.2-insiders.20170630",
-+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.4.2-insiders.20170630.tgz",
-+      "integrity": "sha1-Gg3uNG8nCDoduaKawGYBwueRToI="
-+    }
-+  }
-+}
-added in remote
-  their  100644 4a63f2d3b097daa3aa71ecb982048f1a8972d587 extensions/php/package-lock.json
-@@ -0,0 +1,19 @@
-+{
-+  "name": "php",
-+  "version": "0.1.0",
-+  "lockfileVersion": 1,
-+  "requires": true,
-+  "dependencies": {
-+    "@types/node": {
-+      "version": "7.0.33",
-+      "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.33.tgz",
-+      "integrity": "sha512-8fVvl6Yyk3jZvSYxRMS9/AmZJ5RXCOP9N4xSlykyBViVESu751pxHYTN14Embn1Fem78YwEHdC7p7KGQQpwunw==",
-+      "dev": true
-+    },
-+    "vscode-nls": {
-+      "version": "1.0.7",
-+      "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-1.0.7.tgz",
-+      "integrity": "sha1-KYwB/Oh4AsZEwKFe9SajPGLA1Y4="
-+    }
-+  }
-+}
-changed in both
-  base   100644 e3b313bb3210f6122bea8482a6f0f357904153d9 extensions/php/package.json
-  our    100644 53d0b2ebe4572c9b889f2a68525614453df8b6f5 extensions/php/package.json
-  their  100644 3f50c17669ba412a2b8bb414d32653d78e6b6a7e extensions/php/package.json
-@@ -22,7 +22,11 @@
- 					"PHP",
- 					"php"
- 				],
-+<<<<<<< .our
- 				"firstLine": "^#!\\s*/.*\\bphp\\b",
-+=======
-+				"firstLine": "^#!/.*\\bphp\\b",
-+>>>>>>> .their
- 				"mimetypes": [
- 					"application/x-php"
- 				],
-added in remote
-  their  100644 bb40d40e80afcf7100b91c0a90c791ecfac5af95 extensions/typescript/package-lock.json
-@@ -0,0 +1,51 @@
-+{
-+  "name": "typescript",
-+  "version": "0.10.1",
-+  "lockfileVersion": 1,
-+  "requires": true,
-+  "dependencies": {
-+    "@types/node": {
-+      "version": "7.0.33",
-+      "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.33.tgz",
-+      "integrity": "sha512-8fVvl6Yyk3jZvSYxRMS9/AmZJ5RXCOP9N4xSlykyBViVESu751pxHYTN14Embn1Fem78YwEHdC7p7KGQQpwunw==",
-+      "dev": true
-+    },
-+    "@types/semver": {
-+      "version": "5.3.32",
-+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-5.3.32.tgz",
-+      "integrity": "sha512-MdbWERx4JWmN4zP+skJy9Kio+Cddvmyn1k8x0S8UAqDoMgOJeobQo7yhlE4BfiimonHirgixWfva/hKUlXBsrw==",
-+      "dev": true
-+    },
-+    "semver": {
-+      "version": "4.3.6",
-+      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
-+      "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto="
-+    },
-+    "vscode-extension-telemetry": {
-+      "version": "0.0.8",
-+      "resolved": "https://registry.npmjs.org/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.8.tgz",
-+      "integrity": "sha1-ImG/+Ya2aQpvH3RqRaxb0fhdKeA=",
-+      "requires": {
-+        "applicationinsights": "0.18.0",
-+        "winreg": "1.2.3"
-+      },
-+      "dependencies": {
-+        "applicationinsights": {
-+          "version": "0.18.0",
-+          "resolved": "https://registry.npmjs.org/applicationinsights/-/applicationinsights-0.18.0.tgz",
-+          "integrity": "sha1-Fi67SKODQIvE3kTbMrQXMH9Fu8E="
-+        },
-+        "winreg": {
-+          "version": "1.2.3",
-+          "resolved": "https://registry.npmjs.org/winreg/-/winreg-1.2.3.tgz",
-+          "integrity": "sha1-k60RayaW2ofVj3JlqPzqUlSpZdU="
-+        }
-+      }
-+    },
-+    "vscode-nls": {
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-2.0.1.tgz",
-+      "integrity": "sha1-eFOGbjP5xQykFeUblkDQgYAONsY="
-+    }
-+  }
-+}
-removed in local
-  base   100644 46579d1b0428cf0d4cfd8b36e4323fd6d83cc3c0 extensions/typescript/package.json
-  their  100644 a6f2f9a17d8c9f6ab2d7717992fa51cbb1f31f57 extensions/typescript/package.json
-added in remote
-  their  100644 464ceb514e573c763a48acf1de2d2c38ecddb125 extensions/vscode-api-tests/package-lock.json
-@@ -0,0 +1,3199 @@
-+{
-+	"name": "vscode-api-tests",
-+	"version": "0.0.1",
-+	"lockfileVersion": 1,
-+	"requires": true,
-+	"dependencies": {
-+		"@types/mocha": {
-+			"version": "2.2.41",
-+			"resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-2.2.41.tgz",
-+			"integrity": "sha1-4nzwgXFT658nE7LT9saPHhw8pgg=",
-+			"dev": true
-+		},
-+		"@types/node": {
-+			"version": "7.0.33",
-+			"resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.33.tgz",
-+			"integrity": "sha512-8fVvl6Yyk3jZvSYxRMS9/AmZJ5RXCOP9N4xSlykyBViVESu751pxHYTN14Embn1Fem78YwEHdC7p7KGQQpwunw==",
-+			"dev": true
-+		},
-+		"ajv": {
-+			"version": "4.11.8",
-+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
-+			"integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
-+			"dev": true,
-+			"requires": {
-+				"co": "4.6.0",
-+				"json-stable-stringify": "1.0.1"
-+			}
-+		},
-+		"amdefine": {
-+			"version": "1.0.1",
-+			"resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-+			"integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
-+			"dev": true
-+		},
-+		"ansi-regex": {
-+			"version": "2.1.1",
-+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-+			"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-+			"dev": true
-+		},
-+		"ansi-styles": {
-+			"version": "2.2.1",
-+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-+			"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-+			"dev": true
-+		},
-+		"arr-diff": {
-+			"version": "2.0.0",
-+			"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-+			"integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
-+			"dev": true,
-+			"requires": {
-+				"arr-flatten": "1.0.3"
-+			}
-+		},
-+		"arr-flatten": {
-+			"version": "1.0.3",
-+			"resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.3.tgz",
-+			"integrity": "sha1-onTthawIhJtr14R8RYB0XcUa37E=",
-+			"dev": true
-+		},
-+		"array-differ": {
-+			"version": "1.0.0",
-+			"resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
-+			"integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=",
-+			"dev": true
-+		},
-+		"array-find-index": {
-+			"version": "1.0.2",
-+			"resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
-+			"integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
-+			"dev": true
-+		},
-+		"array-union": {
-+			"version": "1.0.2",
-+			"resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-+			"integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-+			"dev": true,
-+			"requires": {
-+				"array-uniq": "1.0.3"
-+			}
-+		},
-+		"array-uniq": {
-+			"version": "1.0.3",
-+			"resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-+			"integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
-+			"dev": true
-+		},
-+		"array-unique": {
-+			"version": "0.2.1",
-+			"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-+			"integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-+			"dev": true
-+		},
-+		"arrify": {
-+			"version": "1.0.1",
-+			"resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-+			"integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
-+			"dev": true
-+		},
-+		"asn1": {
-+			"version": "0.2.3",
-+			"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-+			"integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
-+			"dev": true
-+		},
-+		"assert-plus": {
-+			"version": "0.2.0",
-+			"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
-+			"integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
-+			"dev": true
-+		},
-+		"asynckit": {
-+			"version": "0.4.0",
-+			"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-+			"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-+			"dev": true
-+		},
-+		"aws-sign2": {
-+			"version": "0.6.0",
-+			"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
-+			"integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
-+			"dev": true
-+		},
-+		"aws4": {
-+			"version": "1.6.0",
-+			"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-+			"integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
-+			"dev": true
-+		},
-+		"balanced-match": {
-+			"version": "1.0.0",
-+			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-+			"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-+			"dev": true
-+		},
-+		"bcrypt-pbkdf": {
-+			"version": "1.0.1",
-+			"resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
-+			"integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
-+			"dev": true,
-+			"optional": true,
-+			"requires": {
-+				"tweetnacl": "0.14.5"
-+			}
-+		},
-+		"beeper": {
-+			"version": "1.1.1",
-+			"resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz",
-+			"integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=",
-+			"dev": true
-+		},
-+		"block-stream": {
-+			"version": "0.0.9",
-+			"resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
-+			"integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
-+			"dev": true,
-+			"requires": {
-+				"inherits": "2.0.3"
-+			}
-+		},
-+		"boom": {
-+			"version": "2.10.1",
-+			"resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
-+			"integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
-+			"dev": true,
-+			"requires": {
-+				"hoek": "2.16.3"
-+			}
-+		},
-+		"brace-expansion": {
-+			"version": "1.1.8",
-+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
-+			"integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
-+			"dev": true,
-+			"requires": {
-+				"balanced-match": "1.0.0",
-+				"concat-map": "0.0.1"
-+			}
-+		},
-+		"braces": {
-+			"version": "1.8.5",
-+			"resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-+			"integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
-+			"dev": true,
-+			"requires": {
-+				"expand-range": "1.8.2",
-+				"preserve": "0.2.0",
-+				"repeat-element": "1.1.2"
-+			}
-+		},
-+		"buffer-crc32": {
-+			"version": "0.2.13",
-+			"resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-+			"integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-+			"dev": true
-+		},
-+		"builtin-modules": {
-+			"version": "1.1.1",
-+			"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
-+			"integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
-+			"dev": true
-+		},
-+		"camelcase": {
-+			"version": "2.1.1",
-+			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-+			"integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
-+			"dev": true
-+		},
-+		"camelcase-keys": {
-+			"version": "2.1.0",
-+			"resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
-+			"integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
-+			"dev": true,
-+			"requires": {
-+				"camelcase": "2.1.1",
-+				"map-obj": "1.0.1"
-+			}
-+		},
-+		"caseless": {
-+			"version": "0.11.0",
-+			"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
-+			"integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
-+			"dev": true
-+		},
-+		"chalk": {
-+			"version": "1.1.3",
-+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-+			"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-+			"dev": true,
-+			"requires": {
-+				"ansi-styles": "2.2.1",
-+				"escape-string-regexp": "1.0.5",
-+				"has-ansi": "2.0.0",
-+				"strip-ansi": "3.0.1",
-+				"supports-color": "2.0.0"
-+			}
-+		},
-+		"clone": {
-+			"version": "1.0.2",
-+			"resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz",
-+			"integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=",
-+			"dev": true
-+		},
-+		"clone-buffer": {
-+			"version": "1.0.0",
-+			"resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
-+			"integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=",
-+			"dev": true
-+		},
-+		"clone-stats": {
-+			"version": "0.0.1",
-+			"resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
-+			"integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=",
-+			"dev": true
-+		},
-+		"cloneable-readable": {
-+			"version": "1.0.0",
-+			"resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.0.0.tgz",
-+			"integrity": "sha1-pikNQT8hemEjL5XkWP84QYz7ARc=",
-+			"dev": true,
-+			"requires": {
-+				"inherits": "2.0.3",
-+				"process-nextick-args": "1.0.7",
-+				"through2": "2.0.3"
-+			}
-+		},
-+		"co": {
-+			"version": "4.6.0",
-+			"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-+			"integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-+			"dev": true
-+		},
-+		"combined-stream": {
-+			"version": "1.0.5",
-+			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-+			"integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
-+			"dev": true,
-+			"requires": {
-+				"delayed-stream": "1.0.0"
-+			}
-+		},
-+		"commander": {
-+			"version": "2.11.0",
-+			"resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
-+			"integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
-+			"dev": true
-+		},
-+		"concat-map": {
-+			"version": "0.0.1",
-+			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-+			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-+			"dev": true
-+		},
-+		"convert-source-map": {
-+			"version": "1.5.0",
-+			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz",
-+			"integrity": "sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU=",
-+			"dev": true
-+		},
-+		"core-util-is": {
-+			"version": "1.0.2",
-+			"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-+			"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-+			"dev": true
-+		},
-+		"cryptiles": {
-+			"version": "2.0.5",
-+			"resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-+			"integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
-+			"dev": true,
-+			"requires": {
-+				"boom": "2.10.1"
-+			}
-+		},
-+		"currently-unhandled": {
-+			"version": "0.4.1",
-+			"resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
-+			"integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
-+			"dev": true,
-+			"requires": {
-+				"array-find-index": "1.0.2"
-+			}
-+		},
-+		"dashdash": {
-+			"version": "1.14.1",
-+			"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-+			"integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-+			"dev": true,
-+			"requires": {
-+				"assert-plus": "1.0.0"
-+			},
-+			"dependencies": {
-+				"assert-plus": {
-+					"version": "1.0.0",
-+					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-+					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-+					"dev": true
-+				}
-+			}
-+		},
-+		"dateformat": {
-+			"version": "2.0.0",
-+			"resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.0.0.tgz",
-+			"integrity": "sha1-J0Pjq7XD/CRi5SfcpEXgTp9N7hc=",
-+			"dev": true
-+		},
-+		"debug": {
-+			"version": "2.2.0",
-+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-+			"integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
-+			"dev": true,
-+			"requires": {
-+				"ms": "0.7.1"
-+			}
-+		},
-+		"decamelize": {
-+			"version": "1.2.0",
-+			"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-+			"integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-+			"dev": true
-+		},
-+		"deep-assign": {
-+			"version": "1.0.0",
-+			"resolved": "https://registry.npmjs.org/deep-assign/-/deep-assign-1.0.0.tgz",
-+			"integrity": "sha1-sJJ0O+hCfcYh6gBnzex+cN0Z83s=",
-+			"dev": true,
-+			"requires": {
-+				"is-obj": "1.0.1"
-+			}
-+		},
-+		"delayed-stream": {
-+			"version": "1.0.0",
-+			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-+			"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-+			"dev": true
-+		},
-+		"diff": {
-+			"version": "1.4.0",
-+			"resolved": "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz",
-+			"integrity": "sha1-fyjS657nsVqX79ic5j3P2qPMur8=",
-+			"dev": true
-+		},
-+		"duplexer": {
-+			"version": "0.1.1",
-+			"resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
-+			"integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
-+			"dev": true
-+		},
-+		"duplexer2": {
-+			"version": "0.0.2",
-+			"resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-+			"integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
-+			"dev": true,
-+			"requires": {
-+				"readable-stream": "1.1.14"
-+			},
-+			"dependencies": {
-+				"isarray": {
-+					"version": "0.0.1",
-+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-+					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-+					"dev": true
-+				},
-+				"readable-stream": {
-+					"version": "1.1.14",
-+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-+					"integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-+					"dev": true,
-+					"requires": {
-+						"core-util-is": "1.0.2",
-+						"inherits": "2.0.3",
-+						"isarray": "0.0.1",
-+						"string_decoder": "0.10.31"
-+					}
-+				},
-+				"string_decoder": {
-+					"version": "0.10.31",
-+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-+					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-+					"dev": true
-+				}
-+			}
-+		},
-+		"duplexify": {
-+			"version": "3.5.0",
-+			"resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.0.tgz",
-+			"integrity": "sha1-GqdzAC4VeEV+nZ1KULDMquvL1gQ=",
-+			"dev": true,
-+			"requires": {
-+				"end-of-stream": "1.0.0",
-+				"inherits": "2.0.3",
-+				"readable-stream": "2.3.3",
-+				"stream-shift": "1.0.0"
-+			}
-+		},
-+		"ecc-jsbn": {
-+			"version": "0.1.1",
-+			"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
-+			"integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
-+			"dev": true,
-+			"optional": true,
-+			"requires": {
-+				"jsbn": "0.1.1"
-+			}
-+		},
-+		"end-of-stream": {
-+			"version": "1.0.0",
-+			"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz",
-+			"integrity": "sha1-1FlucCc0qT5A6a+GQxnqvZn/Lw4=",
-+			"dev": true,
-+			"requires": {
-+				"once": "1.3.3"
-+			},
-+			"dependencies": {
-+				"once": {
-+					"version": "1.3.3",
-+					"resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-+					"integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=",
-+					"dev": true,
-+					"requires": {
-+						"wrappy": "1.0.2"
-+					}
-+				}
-+			}
-+		},
-+		"error-ex": {
-+			"version": "1.3.1",
-+			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz",
-+			"integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=",
-+			"dev": true,
-+			"requires": {
-+				"is-arrayish": "0.2.1"
-+			}
-+		},
-+		"escape-string-regexp": {
-+			"version": "1.0.5",
-+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-+			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-+			"dev": true
-+		},
-+		"event-stream": {
-+			"version": "3.3.4",
-+			"resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
-+			"integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
-+			"dev": true,
-+			"requires": {
-+				"duplexer": "0.1.1",
-+				"from": "0.1.7",
-+				"map-stream": "0.1.0",
-+				"pause-stream": "0.0.11",
-+				"split": "0.3.3",
-+				"stream-combiner": "0.0.4",
-+				"through": "2.3.8"
-+			}
-+		},
-+		"expand-brackets": {
-+			"version": "0.1.5",
-+			"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
-+			"integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
-+			"dev": true,
-+			"requires": {
-+				"is-posix-bracket": "0.1.1"
-+			}
-+		},
-+		"expand-range": {
-+			"version": "1.8.2",
-+			"resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
-+			"integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
-+			"dev": true,
-+			"requires": {
-+				"fill-range": "2.2.3"
-+			}
-+		},
-+		"extend": {
-+			"version": "3.0.1",
-+			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-+			"integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
-+			"dev": true
-+		},
-+		"extend-shallow": {
-+			"version": "2.0.1",
-+			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-+			"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-+			"dev": true,
-+			"requires": {
-+				"is-extendable": "0.1.1"
-+			}
-+		},
-+		"extglob": {
-+			"version": "0.3.2",
-+			"resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
-+			"integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
-+			"dev": true,
-+			"requires": {
-+				"is-extglob": "1.0.0"
-+			},
-+			"dependencies": {
-+				"is-extglob": {
-+					"version": "1.0.0",
-+					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-+					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-+					"dev": true
-+				}
-+			}
-+		},
-+		"extsprintf": {
-+			"version": "1.0.2",
-+			"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz",
-+			"integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=",
-+			"dev": true
-+		},
-+		"fancy-log": {
-+			"version": "1.3.0",
-+			"resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.0.tgz",
-+			"integrity": "sha1-Rb4X0Cu5kX1gzP/UmVyZnmyMmUg=",
-+			"dev": true,
-+			"requires": {
-+				"chalk": "1.1.3",
-+				"time-stamp": "1.1.0"
-+			}
-+		},
-+		"fd-slicer": {
-+			"version": "1.0.1",
-+			"resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
-+			"integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
-+			"dev": true,
-+			"requires": {
-+				"pend": "1.2.0"
-+			}
-+		},
-+		"filename-regex": {
-+			"version": "2.0.1",
-+			"resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
-+			"integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
-+			"dev": true
-+		},
-+		"fill-range": {
-+			"version": "2.2.3",
-+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
-+			"integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
-+			"dev": true,
-+			"requires": {
-+				"is-number": "2.1.0",
-+				"isobject": "2.1.0",
-+				"randomatic": "1.1.7",
-+				"repeat-element": "1.1.2",
-+				"repeat-string": "1.6.1"
-+			}
-+		},
-+		"find-up": {
-+			"version": "1.1.2",
-+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-+			"integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-+			"dev": true,
-+			"requires": {
-+				"path-exists": "2.1.0",
-+				"pinkie-promise": "2.0.1"
-+			}
-+		},
-+		"first-chunk-stream": {
-+			"version": "1.0.0",
-+			"resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz",
-+			"integrity": "sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=",
-+			"dev": true
-+		},
-+		"for-in": {
-+			"version": "1.0.2",
-+			"resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-+			"integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-+			"dev": true
-+		},
-+		"for-own": {
-+			"version": "0.1.5",
-+			"resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-+			"integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
-+			"dev": true,
-+			"requires": {
-+				"for-in": "1.0.2"
-+			}
-+		},
-+		"forever-agent": {
-+			"version": "0.6.1",
-+			"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-+			"integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-+			"dev": true
-+		},
-+		"form-data": {
-+			"version": "2.1.4",
-+			"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
-+			"integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
-+			"dev": true,
-+			"requires": {
-+				"asynckit": "0.4.0",
-+				"combined-stream": "1.0.5",
-+				"mime-types": "2.1.15"
-+			}
-+		},
-+		"from": {
-+			"version": "0.1.7",
-+			"resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
-+			"integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=",
-+			"dev": true
-+		},
-+		"fs.realpath": {
-+			"version": "1.0.0",
-+			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-+			"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-+			"dev": true
-+		},
-+		"fstream": {
-+			"version": "0.1.31",
-+			"resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
-+			"integrity": "sha1-czfwWPu7vvqMn1YaKMqwhJICyYg=",
-+			"dev": true,
-+			"requires": {
-+				"graceful-fs": "3.0.11",
-+				"inherits": "2.0.3",
-+				"mkdirp": "0.5.1",
-+				"rimraf": "2.6.1"
-+			},
-+			"dependencies": {
-+				"graceful-fs": {
-+					"version": "3.0.11",
-+					"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz",
-+					"integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=",
-+					"dev": true,
-+					"requires": {
-+						"natives": "1.1.0"
-+					}
-+				}
-+			}
-+		},
-+		"generate-function": {
-+			"version": "2.0.0",
-+			"resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
-+			"integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=",
-+			"dev": true
-+		},
-+		"generate-object-property": {
-+			"version": "1.2.0",
-+			"resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
-+			"integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
-+			"dev": true,
-+			"requires": {
-+				"is-property": "1.0.2"
-+			}
-+		},
-+		"get-stdin": {
-+			"version": "4.0.1",
-+			"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-+			"integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-+			"dev": true
-+		},
-+		"getpass": {
-+			"version": "0.1.7",
-+			"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-+			"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-+			"dev": true,
-+			"requires": {
-+				"assert-plus": "1.0.0"
-+			},
-+			"dependencies": {
-+				"assert-plus": {
-+					"version": "1.0.0",
-+					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-+					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-+					"dev": true
-+				}
-+			}
-+		},
-+		"glob": {
-+			"version": "5.0.15",
-+			"resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-+			"integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-+			"dev": true,
-+			"requires": {
-+				"inflight": "1.0.6",
-+				"inherits": "2.0.3",
-+				"minimatch": "3.0.4",
-+				"once": "1.4.0",
-+				"path-is-absolute": "1.0.1"
-+			}
-+		},
-+		"glob-base": {
-+			"version": "0.3.0",
-+			"resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
-+			"integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
-+			"dev": true,
-+			"requires": {
-+				"glob-parent": "2.0.0",
-+				"is-glob": "2.0.1"
-+			},
-+			"dependencies": {
-+				"glob-parent": {
-+					"version": "2.0.0",
-+					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-+					"integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
-+					"dev": true,
-+					"requires": {
-+						"is-glob": "2.0.1"
-+					}
-+				},
-+				"is-extglob": {
-+					"version": "1.0.0",
-+					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-+					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-+					"dev": true
-+				},
-+				"is-glob": {
-+					"version": "2.0.1",
-+					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-+					"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-+					"dev": true,
-+					"requires": {
-+						"is-extglob": "1.0.0"
-+					}
-+				}
-+			}
-+		},
-+		"glob-parent": {
-+			"version": "3.1.0",
-+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-+			"integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-+			"dev": true,
-+			"requires": {
-+				"is-glob": "3.1.0",
-+				"path-dirname": "1.0.2"
-+			}
-+		},
-+		"glob-stream": {
-+			"version": "5.3.5",
-+			"resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz",
-+			"integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=",
-+			"dev": true,
-+			"requires": {
-+				"extend": "3.0.1",
-+				"glob": "5.0.15",
-+				"glob-parent": "3.1.0",
-+				"micromatch": "2.3.11",
-+				"ordered-read-streams": "0.3.0",
-+				"through2": "0.6.5",
-+				"to-absolute-glob": "0.1.1",
-+				"unique-stream": "2.2.1"
-+			},
-+			"dependencies": {
-+				"isarray": {
-+					"version": "0.0.1",
-+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-+					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-+					"dev": true
-+				},
-+				"readable-stream": {
-+					"version": "1.0.34",
-+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-+					"integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-+					"dev": true,
-+					"requires": {
-+						"core-util-is": "1.0.2",
-+						"inherits": "2.0.3",
-+						"isarray": "0.0.1",
-+						"string_decoder": "0.10.31"
-+					}
-+				},
-+				"string_decoder": {
-+					"version": "0.10.31",
-+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-+					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-+					"dev": true
-+				},
-+				"through2": {
-+					"version": "0.6.5",
-+					"resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-+					"integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-+					"dev": true,
-+					"requires": {
-+						"readable-stream": "1.0.34",
-+						"xtend": "4.0.1"
-+					}
-+				}
-+			}
-+		},
-+		"glogg": {
-+			"version": "1.0.0",
-+			"resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz",
-+			"integrity": "sha1-f+DxmfV6yQbPUS/urY+Q7kooT8U=",
-+			"dev": true,
-+			"requires": {
-+				"sparkles": "1.0.0"
-+			}
-+		},
-+		"graceful-fs": {
-+			"version": "4.1.11",
-+			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-+			"integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-+			"dev": true
-+		},
-+		"growl": {
-+			"version": "1.9.2",
-+			"resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz",
-+			"integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=",
-+			"dev": true
-+		},
-+		"gulp-chmod": {
-+			"version": "1.3.0",
-+			"resolved": "https://registry.npmjs.org/gulp-chmod/-/gulp-chmod-1.3.0.tgz",
-+			"integrity": "sha1-i7bowRiV3L+bQlIMh0NHpQIryw0=",
-+			"dev": true,
-+			"requires": {
-+				"deep-assign": "1.0.0",
-+				"stat-mode": "0.2.2",
-+				"through2": "2.0.3"
-+			}
-+		},
-+		"gulp-filter": {
-+			"version": "4.0.0",
-+			"resolved": "https://registry.npmjs.org/gulp-filter/-/gulp-filter-4.0.0.tgz",
-+			"integrity": "sha1-OV9YolbFWc254NFX8cqvUkijjcs=",
-+			"dev": true,
-+			"requires": {
-+				"gulp-util": "3.0.8",
-+				"multimatch": "2.1.0",
-+				"streamfilter": "1.0.5"
-+			}
-+		},
-+		"gulp-gunzip": {
-+			"version": "0.0.3",
-+			"resolved": "https://registry.npmjs.org/gulp-gunzip/-/gulp-gunzip-0.0.3.tgz",
-+			"integrity": "sha1-e24HsPWP09QlFcSOrVpj3wVy9i8=",
-+			"dev": true,
-+			"requires": {
-+				"through2": "0.6.5",
-+				"vinyl": "0.4.6"
-+			},
-+			"dependencies": {
-+				"clone": {
-+					"version": "0.2.0",
-+					"resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
-+					"integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-+					"dev": true
-+				},
-+				"isarray": {
-+					"version": "0.0.1",
-+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-+					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-+					"dev": true
-+				},
-+				"readable-stream": {
-+					"version": "1.0.34",
-+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-+					"integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-+					"dev": true,
-+					"requires": {
-+						"core-util-is": "1.0.2",
-+						"inherits": "2.0.3",
-+						"isarray": "0.0.1",
-+						"string_decoder": "0.10.31"
-+					}
-+				},
-+				"string_decoder": {
-+					"version": "0.10.31",
-+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-+					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-+					"dev": true
-+				},
-+				"through2": {
-+					"version": "0.6.5",
-+					"resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-+					"integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-+					"dev": true,
-+					"requires": {
-+						"readable-stream": "1.0.34",
-+						"xtend": "4.0.1"
-+					}
-+				},
-+				"vinyl": {
-+					"version": "0.4.6",
-+					"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
-+					"integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
-+					"dev": true,
-+					"requires": {
-+						"clone": "0.2.0",
-+						"clone-stats": "0.0.1"
-+					}
-+				}
-+			}
-+		},
-+		"gulp-remote-src": {
-+			"version": "0.4.2",
-+			"resolved": "https://registry.npmjs.org/gulp-remote-src/-/gulp-remote-src-0.4.2.tgz",
-+			"integrity": "sha1-zrN3DjREMo1hOG+6qrIAvBHNmKg=",
-+			"dev": true,
-+			"requires": {
-+				"event-stream": "3.3.4",
-+				"node.extend": "1.1.6",
-+				"request": "2.79.0",
-+				"through2": "2.0.3",
-+				"vinyl": "2.0.2"
-+			},
-+			"dependencies": {
-+				"clone-stats": {
-+					"version": "1.0.0",
-+					"resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
-+					"integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
-+					"dev": true
-+				},
-+				"replace-ext": {
-+					"version": "1.0.0",
-+					"resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
-+					"integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
-+					"dev": true
-+				},
-+				"request": {
-+					"version": "2.79.0",
-+					"resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz",
-+					"integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=",
-+					"dev": true,
-+					"requires": {
-+						"aws-sign2": "0.6.0",
-+						"aws4": "1.6.0",
-+						"caseless": "0.11.0",
-+						"combined-stream": "1.0.5",
-+						"extend": "3.0.1",
-+						"forever-agent": "0.6.1",
-+						"form-data": "2.1.4",
-+						"har-validator": "2.0.6",
-+						"hawk": "3.1.3",
-+						"http-signature": "1.1.1",
-+						"is-typedarray": "1.0.0",
-+						"isstream": "0.1.2",
-+						"json-stringify-safe": "5.0.1",
-+						"mime-types": "2.1.15",
-+						"oauth-sign": "0.8.2",
-+						"qs": "6.3.2",
-+						"stringstream": "0.0.5",
-+						"tough-cookie": "2.3.2",
-+						"tunnel-agent": "0.4.3",
-+						"uuid": "3.1.0"
-+					}
-+				},
-+				"vinyl": {
-+					"version": "2.0.2",
-+					"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.0.2.tgz",
-+					"integrity": "sha1-CjcT2NTpIhxY8QyhbAEWyeJe2nw=",
-+					"dev": true,
-+					"requires": {
-+						"clone": "1.0.2",
-+						"clone-buffer": "1.0.0",
-+						"clone-stats": "1.0.0",
-+						"cloneable-readable": "1.0.0",
-+						"is-stream": "1.1.0",
-+						"remove-trailing-separator": "1.0.2",
-+						"replace-ext": "1.0.0"
-+					}
-+				}
-+			}
-+		},
-+		"gulp-sourcemaps": {
-+			"version": "1.6.0",
-+			"resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz",
-+			"integrity": "sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=",
-+			"dev": true,
-+			"requires": {
-+				"convert-source-map": "1.5.0",
-+				"graceful-fs": "4.1.11",
-+				"strip-bom": "2.0.0",
-+				"through2": "2.0.3",
-+				"vinyl": "1.2.0"
-+			},
-+			"dependencies": {
-+				"vinyl": {
-+					"version": "1.2.0",
-+					"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
-+					"integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
-+					"dev": true,
-+					"requires": {
-+						"clone": "1.0.2",
-+						"clone-stats": "0.0.1",
-+						"replace-ext": "0.0.1"
-+					}
-+				}
-+			}
-+		},
-+		"gulp-symdest": {
-+			"version": "1.1.0",
-+			"resolved": "https://registry.npmjs.org/gulp-symdest/-/gulp-symdest-1.1.0.tgz",
-+			"integrity": "sha1-wWUyBzLRks5W/ZQnH/oSMjS/KuA=",
-+			"dev": true,
-+			"requires": {
-+				"event-stream": "3.3.4",
-+				"mkdirp": "0.5.1",
-+				"queue": "3.1.0",
-+				"vinyl-fs": "2.4.4"
-+			}
-+		},
-+		"gulp-untar": {
-+			"version": "0.0.4",
-+			"resolved": "https://registry.npmjs.org/gulp-untar/-/gulp-untar-0.0.4.tgz",
-+			"integrity": "sha1-Y1zH1n09SK7A28aYImI/x8M/fTc=",
-+			"dev": true,
-+			"requires": {
-+				"event-stream": "3.1.7",
-+				"gulp-util": "2.2.20",
-+				"streamifier": "0.1.1",
-+				"tar": "0.1.20",
-+				"through2": "0.4.2"
-+			},
-+			"dependencies": {
-+				"ansi-regex": {
-+					"version": "0.2.1",
-+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
-+					"integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk=",
-+					"dev": true
-+				},
-+				"ansi-styles": {
-+					"version": "1.1.0",
-+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz",
-+					"integrity": "sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94=",
-+					"dev": true
-+				},
-+				"chalk": {
-+					"version": "0.5.1",
-+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
-+					"integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=",
-+					"dev": true,
-+					"requires": {
-+						"ansi-styles": "1.1.0",
-+						"escape-string-regexp": "1.0.5",
-+						"has-ansi": "0.1.0",
-+						"strip-ansi": "0.3.0",
-+						"supports-color": "0.2.0"
-+					}
-+				},
-+				"dateformat": {
-+					"version": "1.0.12",
-+					"resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
-+					"integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=",
-+					"dev": true,
-+					"requires": {
-+						"get-stdin": "4.0.1",
-+						"meow": "3.7.0"
-+					}
-+				},
-+				"event-stream": {
-+					"version": "3.1.7",
-+					"resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.1.7.tgz",
-+					"integrity": "sha1-tMVAAS0P4UmEIPPYlGAI22OTw3o=",
-+					"dev": true,
-+					"requires": {
-+						"duplexer": "0.1.1",
-+						"from": "0.1.7",
-+						"map-stream": "0.1.0",
-+						"pause-stream": "0.0.11",
-+						"split": "0.2.10",
-+						"stream-combiner": "0.0.4",
-+						"through": "2.3.8"
-+					}
-+				},
-+				"gulp-util": {
-+					"version": "2.2.20",
-+					"resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-2.2.20.tgz",
-+					"integrity": "sha1-1xRuVyiRC9jwR6awseVJvCLb1kw=",
-+					"dev": true,
-+					"requires": {
-+						"chalk": "0.5.1",
-+						"dateformat": "1.0.12",
-+						"lodash._reinterpolate": "2.4.1",
-+						"lodash.template": "2.4.1",
-+						"minimist": "0.2.0",
-+						"multipipe": "0.1.2",
-+						"through2": "0.5.1",
-+						"vinyl": "0.2.3"
-+					},
-+					"dependencies": {
-+						"through2": {
-+							"version": "0.5.1",
-+							"resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
-+							"integrity": "sha1-390BLrnHAOIyP9M084rGIqs3Lac=",
-+							"dev": true,
-+							"requires": {
-+								"readable-stream": "1.0.34",
-+								"xtend": "3.0.0"
-+							}
-+						}
-+					}
-+				},
-+				"has-ansi": {
-+					"version": "0.1.0",
-+					"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
-+					"integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=",
-+					"dev": true,
-+					"requires": {
-+						"ansi-regex": "0.2.1"
-+					}
-+				},
-+				"isarray": {
-+					"version": "0.0.1",
-+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-+					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-+					"dev": true
-+				},
-+				"lodash._reinterpolate": {
-+					"version": "2.4.1",
-+					"resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz",
-+					"integrity": "sha1-TxInqlqHEfxjL1sHofRgequLMiI=",
-+					"dev": true
-+				},
-+				"lodash.escape": {
-+					"version": "2.4.1",
-+					"resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz",
-+					"integrity": "sha1-LOEsXghNsKV92l5dHu659dF1o7Q=",
-+					"dev": true,
-+					"requires": {
-+						"lodash._escapehtmlchar": "2.4.1",
-+						"lodash._reunescapedhtml": "2.4.1",
-+						"lodash.keys": "2.4.1"
-+					}
-+				},
-+				"lodash.keys": {
-+					"version": "2.4.1",
-+					"resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
-+					"integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
-+					"dev": true,
-+					"requires": {
-+						"lodash._isnative": "2.4.1",
-+						"lodash._shimkeys": "2.4.1",
-+						"lodash.isobject": "2.4.1"
-+					}
-+				},
-+				"lodash.template": {
-+					"version": "2.4.1",
-+					"resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz",
-+					"integrity": "sha1-nmEQB+32KRKal0qzxIuBez4c8g0=",
-+					"dev": true,
-+					"requires": {
-+						"lodash._escapestringchar": "2.4.1",
-+						"lodash._reinterpolate": "2.4.1",
-+						"lodash.defaults": "2.4.1",
-+						"lodash.escape": "2.4.1",
-+						"lodash.keys": "2.4.1",
-+						"lodash.templatesettings": "2.4.1",
-+						"lodash.values": "2.4.1"
-+					}
-+				},
-+				"lodash.templatesettings": {
-+					"version": "2.4.1",
-+					"resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz",
-+					"integrity": "sha1-6nbHXRHrhtTb6JqDiTu4YZKaxpk=",
-+					"dev": true,
-+					"requires": {
-+						"lodash._reinterpolate": "2.4.1",
-+						"lodash.escape": "2.4.1"
-+					}
-+				},
-+				"minimist": {
-+					"version": "0.2.0",
-+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz",
-+					"integrity": "sha1-Tf/lJdriuGTGbC4jxicdev3s784=",
-+					"dev": true
-+				},
-+				"readable-stream": {
-+					"version": "1.0.34",
-+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-+					"integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-+					"dev": true,
-+					"requires": {
-+						"core-util-is": "1.0.2",
-+						"inherits": "2.0.3",
-+						"isarray": "0.0.1",
-+						"string_decoder": "0.10.31"
-+					}
-+				},
-+				"split": {
-+					"version": "0.2.10",
-+					"resolved": "https://registry.npmjs.org/split/-/split-0.2.10.tgz",
-+					"integrity": "sha1-Zwl8YB1pfOE2j0GPBs0gHPBSGlc=",
-+					"dev": true,
-+					"requires": {
-+						"through": "2.3.8"
-+					}
-+				},
-+				"string_decoder": {
-+					"version": "0.10.31",
-+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-+					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-+					"dev": true
-+				},
-+				"strip-ansi": {
-+					"version": "0.3.0",
-+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
-+					"integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=",
-+					"dev": true,
-+					"requires": {
-+						"ansi-regex": "0.2.1"
-+					}
-+				},
-+				"supports-color": {
-+					"version": "0.2.0",
-+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz",
-+					"integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=",
-+					"dev": true
-+				},
-+				"through2": {
-+					"version": "0.4.2",
-+					"resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
-+					"integrity": "sha1-2/WGYDEVHsg1K7bE22SiKSqEC5s=",
-+					"dev": true,
-+					"requires": {
-+						"readable-stream": "1.0.34",
-+						"xtend": "2.1.2"
-+					},
-+					"dependencies": {
-+						"xtend": {
-+							"version": "2.1.2",
-+							"resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
-+							"integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
-+							"dev": true,
-+							"requires": {
-+								"object-keys": "0.4.0"
-+							}
-+						}
-+					}
-+				},
-+				"vinyl": {
-+					"version": "0.2.3",
-+					"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.2.3.tgz",
-+					"integrity": "sha1-vKk4IJWC7FpJrVOKAPofEl5RMlI=",
-+					"dev": true,
-+					"requires": {
-+						"clone-stats": "0.0.1"
-+					}
-+				},
-+				"xtend": {
-+					"version": "3.0.0",
-+					"resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
-+					"integrity": "sha1-XM50B7r2Qsunvs2laBEcST9ZZlo=",
-+					"dev": true
-+				}
-+			}
-+		},
-+		"gulp-util": {
-+			"version": "3.0.8",
-+			"resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz",
-+			"integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=",
-+			"dev": true,
-+			"requires": {
-+				"array-differ": "1.0.0",
-+				"array-uniq": "1.0.3",
-+				"beeper": "1.1.1",
-+				"chalk": "1.1.3",
-+				"dateformat": "2.0.0",
-+				"fancy-log": "1.3.0",
-+				"gulplog": "1.0.0",
-+				"has-gulplog": "0.1.0",
-+				"lodash._reescape": "3.0.0",
-+				"lodash._reevaluate": "3.0.0",
-+				"lodash._reinterpolate": "3.0.0",
-+				"lodash.template": "3.6.2",
-+				"minimist": "1.2.0",
-+				"multipipe": "0.1.2",
-+				"object-assign": "3.0.0",
-+				"replace-ext": "0.0.1",
-+				"through2": "2.0.3",
-+				"vinyl": "0.5.3"
-+			}
-+		},
-+		"gulp-vinyl-zip": {
-+			"version": "1.4.0",
-+			"resolved": "https://registry.npmjs.org/gulp-vinyl-zip/-/gulp-vinyl-zip-1.4.0.tgz",
-+			"integrity": "sha1-VjgvLMtXIxuwR4x4c3zNVylzvuE=",
-+			"dev": true,
-+			"requires": {
-+				"event-stream": "3.3.4",
-+				"queue": "3.1.0",
-+				"through2": "0.6.5",
-+				"vinyl": "0.4.6",
-+				"vinyl-fs": "2.4.4",
-+				"yauzl": "2.8.0",
-+				"yazl": "2.4.2"
-+			},
-+			"dependencies": {
-+				"clone": {
-+					"version": "0.2.0",
-+					"resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
-+					"integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-+					"dev": true
-+				},
-+				"isarray": {
-+					"version": "0.0.1",
-+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-+					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-+					"dev": true
-+				},
-+				"readable-stream": {
-+					"version": "1.0.34",
-+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-+					"integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-+					"dev": true,
-+					"requires": {
-+						"core-util-is": "1.0.2",
-+						"inherits": "2.0.3",
-+						"isarray": "0.0.1",
-+						"string_decoder": "0.10.31"
-+					}
-+				},
-+				"string_decoder": {
-+					"version": "0.10.31",
-+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-+					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-+					"dev": true
-+				},
-+				"through2": {
-+					"version": "0.6.5",
-+					"resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-+					"integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-+					"dev": true,
-+					"requires": {
-+						"readable-stream": "1.0.34",
-+						"xtend": "4.0.1"
-+					}
-+				},
-+				"vinyl": {
-+					"version": "0.4.6",
-+					"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
-+					"integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
-+					"dev": true,
-+					"requires": {
-+						"clone": "0.2.0",
-+						"clone-stats": "0.0.1"
-+					}
-+				}
-+			}
-+		},
-+		"gulplog": {
-+			"version": "1.0.0",
-+			"resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
-+			"integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
-+			"dev": true,
-+			"requires": {
-+				"glogg": "1.0.0"
-+			}
-+		},
-+		"har-schema": {
-+			"version": "1.0.5",
-+			"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
-+			"integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=",
-+			"dev": true
-+		},
-+		"har-validator": {
-+			"version": "2.0.6",
-+			"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
-+			"integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=",
-+			"dev": true,
-+			"requires": {
-+				"chalk": "1.1.3",
-+				"commander": "2.11.0",
-+				"is-my-json-valid": "2.16.0",
-+				"pinkie-promise": "2.0.1"
-+			}
-+		},
-+		"has-ansi": {
-+			"version": "2.0.0",
-+			"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-+			"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-+			"dev": true,
-+			"requires": {
-+				"ansi-regex": "2.1.1"
-+			}
-+		},
-+		"has-gulplog": {
-+			"version": "0.1.0",
-+			"resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
-+			"integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=",
-+			"dev": true,
-+			"requires": {
-+				"sparkles": "1.0.0"
-+			}
-+		},
-+		"hawk": {
-+			"version": "3.1.3",
-+			"resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-+			"integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
-+			"dev": true,
-+			"requires": {
-+				"boom": "2.10.1",
-+				"cryptiles": "2.0.5",
-+				"hoek": "2.16.3",
-+				"sntp": "1.0.9"
-+			}
-+		},
-+		"hoek": {
-+			"version": "2.16.3",
-+			"resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-+			"integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-+			"dev": true
-+		},
-+		"hosted-git-info": {
-+			"version": "2.5.0",
-+			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz",
-+			"integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==",
-+			"dev": true
-+		},
-+		"http-signature": {
-+			"version": "1.1.1",
-+			"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
-+			"integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
-+			"dev": true,
-+			"requires": {
-+				"assert-plus": "0.2.0",
-+				"jsprim": "1.4.0",
-+				"sshpk": "1.13.1"
-+			}
-+		},
-+		"indent-string": {
-+			"version": "2.1.0",
-+			"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-+			"integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
-+			"dev": true,
-+			"requires": {
-+				"repeating": "2.0.1"
-+			}
-+		},
-+		"inflight": {
-+			"version": "1.0.6",
-+			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-+			"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-+			"dev": true,
-+			"requires": {
-+				"once": "1.4.0",
-+				"wrappy": "1.0.2"
-+			}
-+		},
-+		"inherits": {
-+			"version": "2.0.3",
-+			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-+			"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-+			"dev": true
-+		},
-+		"is": {
-+			"version": "3.2.1",
-+			"resolved": "https://registry.npmjs.org/is/-/is-3.2.1.tgz",
-+			"integrity": "sha1-0Kwq1V63sL7JJqUmb2xmKqqD3KU=",
-+			"dev": true
-+		},
-+		"is-arrayish": {
-+			"version": "0.2.1",
-+			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-+			"integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-+			"dev": true
-+		},
-+		"is-buffer": {
-+			"version": "1.1.5",
-+			"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz",
-+			"integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw=",
-+			"dev": true
-+		},
-+		"is-builtin-module": {
-+			"version": "1.0.0",
-+			"resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
-+			"integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
-+			"dev": true,
-+			"requires": {
-+				"builtin-modules": "1.1.1"
-+			}
-+		},
-+		"is-dotfile": {
-+			"version": "1.0.3",
-+			"resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
-+			"integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
-+			"dev": true
-+		},
-+		"is-equal-shallow": {
-+			"version": "0.1.3",
-+			"resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
-+			"integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
-+			"dev": true,
-+			"requires": {
-+				"is-primitive": "2.0.0"
-+			}
-+		},
-+		"is-extendable": {
-+			"version": "0.1.1",
-+			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-+			"integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-+			"dev": true
-+		},
-+		"is-extglob": {
-+			"version": "2.1.1",
-+			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-+			"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-+			"dev": true
-+		},
-+		"is-finite": {
-+			"version": "1.0.2",
-+			"resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
-+			"integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
-+			"dev": true,
-+			"requires": {
-+				"number-is-nan": "1.0.1"
-+			}
-+		},
-+		"is-glob": {
-+			"version": "3.1.0",
-+			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-+			"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-+			"dev": true,
-+			"requires": {
-+				"is-extglob": "2.1.1"
-+			}
-+		},
-+		"is-my-json-valid": {
-+			"version": "2.16.0",
-+			"resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz",
-+			"integrity": "sha1-8Hndm/2uZe4gOKrorLyGqxCeNpM=",
-+			"dev": true,
-+			"requires": {
-+				"generate-function": "2.0.0",
-+				"generate-object-property": "1.2.0",
-+				"jsonpointer": "4.0.1",
-+				"xtend": "4.0.1"
-+			}
-+		},
-+		"is-number": {
-+			"version": "2.1.0",
-+			"resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-+			"integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
-+			"dev": true,
-+			"requires": {
-+				"kind-of": "3.2.2"
-+			}
-+		},
-+		"is-obj": {
-+			"version": "1.0.1",
-+			"resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-+			"integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
-+			"dev": true
-+		},
-+		"is-posix-bracket": {
-+			"version": "0.1.1",
-+			"resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
-+			"integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
-+			"dev": true
-+		},
-+		"is-primitive": {
-+			"version": "2.0.0",
-+			"resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
-+			"integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
-+			"dev": true
-+		},
-+		"is-property": {
-+			"version": "1.0.2",
-+			"resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
-+			"integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=",
-+			"dev": true
-+		},
-+		"is-stream": {
-+			"version": "1.1.0",
-+			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-+			"integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
-+			"dev": true
-+		},
-+		"is-typedarray": {
-+			"version": "1.0.0",
-+			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-+			"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-+			"dev": true
-+		},
-+		"is-utf8": {
-+			"version": "0.2.1",
-+			"resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-+			"integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
-+			"dev": true
-+		},
-+		"is-valid-glob": {
-+			"version": "0.3.0",
-+			"resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz",
-+			"integrity": "sha1-1LVcafUYhvm2XHDWwmItN+KfSP4=",
-+			"dev": true
-+		},
-+		"isarray": {
-+			"version": "1.0.0",
-+			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-+			"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-+			"dev": true
-+		},
-+		"isobject": {
-+			"version": "2.1.0",
-+			"resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-+			"integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-+			"dev": true,
-+			"requires": {
-+				"isarray": "1.0.0"
-+			}
-+		},
-+		"isstream": {
-+			"version": "0.1.2",
-+			"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-+			"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-+			"dev": true
-+		},
-+		"jade": {
-+			"version": "0.26.3",
-+			"resolved": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz",
-+			"integrity": "sha1-jxDXl32NefL2/4YqgbBRPMslaGw=",
-+			"dev": true,
-+			"requires": {
-+				"commander": "0.6.1",
-+				"mkdirp": "0.3.0"
-+			},
-+			"dependencies": {
-+				"commander": {
-+					"version": "0.6.1",
-+					"resolved": "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz",
-+					"integrity": "sha1-+mihT2qUXVTbvlDYzbMyDp47GgY=",
-+					"dev": true
-+				},
-+				"mkdirp": {
-+					"version": "0.3.0",
-+					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz",
-+					"integrity": "sha1-G79asbqCevI1dRQ0kEJkVfSB/h4=",
-+					"dev": true
-+				}
-+			}
-+		},
-+		"jsbn": {
-+			"version": "0.1.1",
-+			"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-+			"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-+			"dev": true,
-+			"optional": true
-+		},
-+		"json-schema": {
-+			"version": "0.2.3",
-+			"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-+			"integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-+			"dev": true
-+		},
-+		"json-stable-stringify": {
-+			"version": "1.0.1",
-+			"resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
-+			"integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
-+			"dev": true,
-+			"requires": {
-+				"jsonify": "0.0.0"
-+			}
-+		},
-+		"json-stringify-safe": {
-+			"version": "5.0.1",
-+			"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-+			"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-+			"dev": true
-+		},
-+		"jsonify": {
-+			"version": "0.0.0",
-+			"resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-+			"integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
-+			"dev": true
-+		},
-+		"jsonpointer": {
-+			"version": "4.0.1",
-+			"resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
-+			"integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",
-+			"dev": true
-+		},
-+		"jsprim": {
-+			"version": "1.4.0",
-+			"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz",
-+			"integrity": "sha1-o7h+QCmNjDgFUtjMdiigu5WiKRg=",
-+			"dev": true,
-+			"requires": {
-+				"assert-plus": "1.0.0",
-+				"extsprintf": "1.0.2",
-+				"json-schema": "0.2.3",
-+				"verror": "1.3.6"
-+			},
-+			"dependencies": {
-+				"assert-plus": {
-+					"version": "1.0.0",
-+					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-+					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-+					"dev": true
-+				}
-+			}
-+		},
-+		"kind-of": {
-+			"version": "3.2.2",
-+			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-+			"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-+			"dev": true,
-+			"requires": {
-+				"is-buffer": "1.1.5"
-+			}
-+		},
-+		"lazystream": {
-+			"version": "1.0.0",
-+			"resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
-+			"integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
-+			"dev": true,
-+			"requires": {
-+				"readable-stream": "2.3.3"
-+			}
-+		},
-+		"load-json-file": {
-+			"version": "1.1.0",
-+			"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-+			"integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-+			"dev": true,
-+			"requires": {
-+				"graceful-fs": "4.1.11",
-+				"parse-json": "2.2.0",
-+				"pify": "2.3.0",
-+				"pinkie-promise": "2.0.1",
-+				"strip-bom": "2.0.0"
-+			}
-+		},
-+		"lodash._basecopy": {
-+			"version": "3.0.1",
-+			"resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
-+			"integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
-+			"dev": true
-+		},
-+		"lodash._basetostring": {
-+			"version": "3.0.1",
-+			"resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
-+			"integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=",
-+			"dev": true
-+		},
-+		"lodash._basevalues": {
-+			"version": "3.0.0",
-+			"resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
-+			"integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=",
-+			"dev": true
-+		},
-+		"lodash._escapehtmlchar": {
-+			"version": "2.4.1",
-+			"resolved": "https://registry.npmjs.org/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz",
-+			"integrity": "sha1-32fDu2t+jh6DGrSL+geVuSr+iZ0=",
-+			"dev": true,
-+			"requires": {
-+				"lodash._htmlescapes": "2.4.1"
-+			}
-+		},
-+		"lodash._escapestringchar": {
-+			"version": "2.4.1",
-+			"resolved": "https://registry.npmjs.org/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz",
-+			"integrity": "sha1-7P4iYYoq3lC/7qQ5N+Ud9m8O23I=",
-+			"dev": true
-+		},
-+		"lodash._getnative": {
-+			"version": "3.9.1",
-+			"resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-+			"integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
-+			"dev": true
-+		},
-+		"lodash._htmlescapes": {
-+			"version": "2.4.1",
-+			"resolved": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz",
-+			"integrity": "sha1-MtFL8IRLbeb4tioFG09nwii2JMs=",
-+			"dev": true
-+		},
-+		"lodash._isiterateecall": {
-+			"version": "3.0.9",
-+			"resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
-+			"integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
-+			"dev": true
-+		},
-+		"lodash._isnative": {
-+			"version": "2.4.1",
-+			"resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz",
-+			"integrity": "sha1-PqZAS3hKe+g2x7V1gOHN95sUgyw=",
-+			"dev": true
-+		},
-+		"lodash._objecttypes": {
-+			"version": "2.4.1",
-+			"resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz",
-+			"integrity": "sha1-fAt/admKH3ZSn4kLDNsbTf7BHBE=",
-+			"dev": true
-+		},
-+		"lodash._reescape": {
-+			"version": "3.0.0",
-+			"resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
-+			"integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=",
-+			"dev": true
-+		},
-+		"lodash._reevaluate": {
-+			"version": "3.0.0",
-+			"resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
-+			"integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=",
-+			"dev": true
-+		},
-+		"lodash._reinterpolate": {
-+			"version": "3.0.0",
-+			"resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-+			"integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
-+			"dev": true
-+		},
-+		"lodash._reunescapedhtml": {
-+			"version": "2.4.1",
-+			"resolved": "https://registry.npmjs.org/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz",
-+			"integrity": "sha1-dHxPxAED6zu4oJduVx96JlnpO6c=",
-+			"dev": true,
-+			"requires": {
-+				"lodash._htmlescapes": "2.4.1",
-+				"lodash.keys": "2.4.1"
-+			},
-+			"dependencies": {
-+				"lodash.keys": {
-+					"version": "2.4.1",
-+					"resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
-+					"integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
-+					"dev": true,
-+					"requires": {
-+						"lodash._isnative": "2.4.1",
-+						"lodash._shimkeys": "2.4.1",
-+						"lodash.isobject": "2.4.1"
-+					}
-+				}
-+			}
-+		},
-+		"lodash._root": {
-+			"version": "3.0.1",
-+			"resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
-+			"integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=",
-+			"dev": true
-+		},
-+		"lodash._shimkeys": {
-+			"version": "2.4.1",
-+			"resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz",
-+			"integrity": "sha1-bpzJZm/wgfC1psl4uD4kLmlJ0gM=",
-+			"dev": true,
-+			"requires": {
-+				"lodash._objecttypes": "2.4.1"
-+			}
-+		},
-+		"lodash.defaults": {
-+			"version": "2.4.1",
-+			"resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
-+			"integrity": "sha1-p+iIXwXmiFEUS24SqPNngCa8TFQ=",
-+			"dev": true,
-+			"requires": {
-+				"lodash._objecttypes": "2.4.1",
-+				"lodash.keys": "2.4.1"
-+			},
-+			"dependencies": {
-+				"lodash.keys": {
-+					"version": "2.4.1",
-+					"resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
-+					"integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
-+					"dev": true,
-+					"requires": {
-+						"lodash._isnative": "2.4.1",
-+						"lodash._shimkeys": "2.4.1",
-+						"lodash.isobject": "2.4.1"
-+					}
-+				}
-+			}
-+		},
-+		"lodash.escape": {
-+			"version": "3.2.0",
-+			"resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
-+			"integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=",
-+			"dev": true,
-+			"requires": {
-+				"lodash._root": "3.0.1"
-+			}
-+		},
-+		"lodash.isarguments": {
-+			"version": "3.1.0",
-+			"resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
-+			"integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
-+			"dev": true
-+		},
-+		"lodash.isarray": {
-+			"version": "3.0.4",
-+			"resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-+			"integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
-+			"dev": true
-+		},
-+		"lodash.isequal": {
-+			"version": "4.5.0",
-+			"resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-+			"integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
-+			"dev": true
-+		},
-+		"lodash.isobject": {
-+			"version": "2.4.1",
-+			"resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
-+			"integrity": "sha1-Wi5H/mmVPx7mMafrof5k0tBlWPU=",
-+			"dev": true,
-+			"requires": {
-+				"lodash._objecttypes": "2.4.1"
-+			}
-+		},
-+		"lodash.keys": {
-+			"version": "3.1.2",
-+			"resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
-+			"integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
-+			"dev": true,
-+			"requires": {
-+				"lodash._getnative": "3.9.1",
-+				"lodash.isarguments": "3.1.0",
-+				"lodash.isarray": "3.0.4"
-+			}
-+		},
-+		"lodash.restparam": {
-+			"version": "3.6.1",
-+			"resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
-+			"integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
-+			"dev": true
-+		},
-+		"lodash.template": {
-+			"version": "3.6.2",
-+			"resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
-+			"integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=",
-+			"dev": true,
-+			"requires": {
-+				"lodash._basecopy": "3.0.1",
-+				"lodash._basetostring": "3.0.1",
-+				"lodash._basevalues": "3.0.0",
-+				"lodash._isiterateecall": "3.0.9",
-+				"lodash._reinterpolate": "3.0.0",
-+				"lodash.escape": "3.2.0",
-+				"lodash.keys": "3.1.2",
-+				"lodash.restparam": "3.6.1",
-+				"lodash.templatesettings": "3.1.1"
-+			}
-+		},
-+		"lodash.templatesettings": {
-+			"version": "3.1.1",
-+			"resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz",
-+			"integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=",
-+			"dev": true,
-+			"requires": {
-+				"lodash._reinterpolate": "3.0.0",
-+				"lodash.escape": "3.2.0"
-+			}
-+		},
-+		"lodash.values": {
-+			"version": "2.4.1",
-+			"resolved": "https://registry.npmjs.org/lodash.values/-/lodash.values-2.4.1.tgz",
-+			"integrity": "sha1-q/UUQ2s8twUAFieXjLzzCxKA7qQ=",
-+			"dev": true,
-+			"requires": {
-+				"lodash.keys": "2.4.1"
-+			},
-+			"dependencies": {
-+				"lodash.keys": {
-+					"version": "2.4.1",
-+					"resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
-+					"integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
-+					"dev": true,
-+					"requires": {
-+						"lodash._isnative": "2.4.1",
-+						"lodash._shimkeys": "2.4.1",
-+						"lodash.isobject": "2.4.1"
-+					}
-+				}
-+			}
-+		},
-+		"loud-rejection": {
-+			"version": "1.6.0",
-+			"resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
-+			"integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
-+			"dev": true,
-+			"requires": {
-+				"currently-unhandled": "0.4.1",
-+				"signal-exit": "3.0.2"
-+			}
-+		},
-+		"lru-cache": {
-+			"version": "2.7.3",
-+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
-+			"integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=",
-+			"dev": true
-+		},
-+		"map-obj": {
-+			"version": "1.0.1",
-+			"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-+			"integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-+			"dev": true
-+		},
-+		"map-stream": {
-+			"version": "0.1.0",
-+			"resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
-+			"integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=",
-+			"dev": true
-+		},
-+		"meow": {
-+			"version": "3.7.0",
-+			"resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-+			"integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
-+			"dev": true,
-+			"requires": {
-+				"camelcase-keys": "2.1.0",
-+				"decamelize": "1.2.0",
-+				"loud-rejection": "1.6.0",
-+				"map-obj": "1.0.1",
-+				"minimist": "1.2.0",
-+				"normalize-package-data": "2.4.0",
-+				"object-assign": "4.1.1",
-+				"read-pkg-up": "1.0.1",
-+				"redent": "1.0.0",
-+				"trim-newlines": "1.0.0"
-+			},
-+			"dependencies": {
-+				"object-assign": {
-+					"version": "4.1.1",
-+					"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-+					"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-+					"dev": true
-+				}
-+			}
-+		},
-+		"merge-stream": {
-+			"version": "1.0.1",
-+			"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz",
-+			"integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=",
-+			"dev": true,
-+			"requires": {
-+				"readable-stream": "2.3.3"
-+			}
-+		},
-+		"micromatch": {
-+			"version": "2.3.11",
-+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-+			"integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-+			"dev": true,
-+			"requires": {
-+				"arr-diff": "2.0.0",
-+				"array-unique": "0.2.1",
-+				"braces": "1.8.5",
-+				"expand-brackets": "0.1.5",
-+				"extglob": "0.3.2",
-+				"filename-regex": "2.0.1",
-+				"is-extglob": "1.0.0",
-+				"is-glob": "2.0.1",
-+				"kind-of": "3.2.2",
-+				"normalize-path": "2.1.1",
-+				"object.omit": "2.0.1",
-+				"parse-glob": "3.0.4",
-+				"regex-cache": "0.4.3"
-+			},
-+			"dependencies": {
-+				"is-extglob": {
-+					"version": "1.0.0",
-+					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-+					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-+					"dev": true
-+				},
-+				"is-glob": {
-+					"version": "2.0.1",
-+					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-+					"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-+					"dev": true,
-+					"requires": {
-+						"is-extglob": "1.0.0"
-+					}
-+				}
-+			}
-+		},
-+		"mime-db": {
-+			"version": "1.27.0",
-+			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz",
-+			"integrity": "sha1-gg9XIpa70g7CXtVeW13oaeVDbrE=",
-+			"dev": true
-+		},
-+		"mime-types": {
-+			"version": "2.1.15",
-+			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz",
-+			"integrity": "sha1-pOv1BkCUVpI3uM9wBGd20J/JKu0=",
-+			"dev": true,
-+			"requires": {
-+				"mime-db": "1.27.0"
-+			}
-+		},
-+		"minimatch": {
-+			"version": "3.0.4",
-+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-+			"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-+			"dev": true,
-+			"requires": {
-+				"brace-expansion": "1.1.8"
-+			}
-+		},
-+		"minimist": {
-+			"version": "1.2.0",
-+			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-+			"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-+			"dev": true
-+		},
-+		"mkdirp": {
-+			"version": "0.5.1",
-+			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-+			"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-+			"dev": true,
-+			"requires": {
-+				"minimist": "0.0.8"
-+			},
-+			"dependencies": {
-+				"minimist": {
-+					"version": "0.0.8",
-+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-+					"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-+					"dev": true
-+				}
-+			}
-+		},
-+		"mocha": {
-+			"version": "2.5.3",
-+			"resolved": "https://registry.npmjs.org/mocha/-/mocha-2.5.3.tgz",
-+			"integrity": "sha1-FhvlvetJZ3HrmzV0UFC2IrWu/Fg=",
-+			"dev": true,
-+			"requires": {
-+				"commander": "2.3.0",
-+				"debug": "2.2.0",
-+				"diff": "1.4.0",
-+				"escape-string-regexp": "1.0.2",
-+				"glob": "3.2.11",
-+				"growl": "1.9.2",
-+				"jade": "0.26.3",
-+				"mkdirp": "0.5.1",
-+				"supports-color": "1.2.0",
-+				"to-iso-string": "0.0.2"
-+			},
-+			"dependencies": {
-+				"commander": {
-+					"version": "2.3.0",
-+					"resolved": "https://registry.npmjs.org/commander/-/commander-2.3.0.tgz",
-+					"integrity": "sha1-/UMOiJgy7DU7ms0d4hfBHLPu+HM=",
-+					"dev": true
-+				},
-+				"escape-string-regexp": {
-+					"version": "1.0.2",
-+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz",
-+					"integrity": "sha1-Tbwv5nTnGUnK8/smlc5/LcHZqNE=",
-+					"dev": true
-+				},
-+				"glob": {
-+					"version": "3.2.11",
-+					"resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
-+					"integrity": "sha1-Spc/Y1uRkPcV0QmH1cAP0oFevj0=",
-+					"dev": true,
-+					"requires": {
-+						"inherits": "2.0.3",
-+						"minimatch": "0.3.0"
-+					}
-+				},
-+				"minimatch": {
-+					"version": "0.3.0",
-+					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
-+					"integrity": "sha1-J12O2qxPG7MyZHIInnlJyDlGmd0=",
-+					"dev": true,
-+					"requires": {
-+						"lru-cache": "2.7.3",
-+						"sigmund": "1.0.1"
-+					}
-+				},
-+				"supports-color": {
-+					"version": "1.2.0",
-+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.2.0.tgz",
-+					"integrity": "sha1-/x7R5hFp0Gs88tWI4YixjYhH4X4=",
-+					"dev": true
-+				}
-+			}
-+		},
-+		"ms": {
-+			"version": "0.7.1",
-+			"resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-+			"integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
-+			"dev": true
-+		},
-+		"multimatch": {
-+			"version": "2.1.0",
-+			"resolved": "https://registry.npmjs.org/multimatch/-/multimatch-2.1.0.tgz",
-+			"integrity": "sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=",
-+			"dev": true,
-+			"requires": {
-+				"array-differ": "1.0.0",
-+				"array-union": "1.0.2",
-+				"arrify": "1.0.1",
-+				"minimatch": "3.0.4"
-+			}
-+		},
-+		"multipipe": {
-+			"version": "0.1.2",
-+			"resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
-+			"integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=",
-+			"dev": true,
-+			"requires": {
-+				"duplexer2": "0.0.2"
-+			}
-+		},
-+		"natives": {
-+			"version": "1.1.0",
-+			"resolved": "https://registry.npmjs.org/natives/-/natives-1.1.0.tgz",
-+			"integrity": "sha1-6f+EFBimsux6SV6TmYT3jxY+bjE=",
-+			"dev": true
-+		},
-+		"node.extend": {
-+			"version": "1.1.6",
-+			"resolved": "https://registry.npmjs.org/node.extend/-/node.extend-1.1.6.tgz",
-+			"integrity": "sha1-p7iCyC1sk6SGOlUEvV3o7IYli5Y=",
-+			"dev": true,
-+			"requires": {
-+				"is": "3.2.1"
-+			}
-+		},
-+		"normalize-package-data": {
-+			"version": "2.4.0",
-+			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-+			"integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
-+			"dev": true,
-+			"requires": {
-+				"hosted-git-info": "2.5.0",
-+				"is-builtin-module": "1.0.0",
-+				"semver": "5.3.0",
-+				"validate-npm-package-license": "3.0.1"
-+			}
-+		},
-+		"normalize-path": {
-+			"version": "2.1.1",
-+			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-+			"integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-+			"dev": true,
-+			"requires": {
-+				"remove-trailing-separator": "1.0.2"
-+			}
-+		},
-+		"number-is-nan": {
-+			"version": "1.0.1",
-+			"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-+			"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-+			"dev": true
-+		},
-+		"oauth-sign": {
-+			"version": "0.8.2",
-+			"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-+			"integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
-+			"dev": true
-+		},
-+		"object-assign": {
-+			"version": "3.0.0",
-+			"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
-+			"integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=",
-+			"dev": true
-+		},
-+		"object-keys": {
-+			"version": "0.4.0",
-+			"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
-+			"integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=",
-+			"dev": true
-+		},
-+		"object.omit": {
-+			"version": "2.0.1",
-+			"resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
-+			"integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
-+			"dev": true,
-+			"requires": {
-+				"for-own": "0.1.5",
-+				"is-extendable": "0.1.1"
-+			}
-+		},
-+		"once": {
-+			"version": "1.4.0",
-+			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-+			"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-+			"dev": true,
-+			"requires": {
-+				"wrappy": "1.0.2"
-+			}
-+		},
-+		"ordered-read-streams": {
-+			"version": "0.3.0",
-+			"resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz",
-+			"integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=",
-+			"dev": true,
-+			"requires": {
-+				"is-stream": "1.1.0",
-+				"readable-stream": "2.3.3"
-+			}
-+		},
-+		"parse-glob": {
-+			"version": "3.0.4",
-+			"resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
-+			"integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
-+			"dev": true,
-+			"requires": {
-+				"glob-base": "0.3.0",
-+				"is-dotfile": "1.0.3",
-+				"is-extglob": "1.0.0",
-+				"is-glob": "2.0.1"
-+			},
-+			"dependencies": {
-+				"is-extglob": {
-+					"version": "1.0.0",
-+					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-+					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-+					"dev": true
-+				},
-+				"is-glob": {
-+					"version": "2.0.1",
-+					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-+					"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-+					"dev": true,
-+					"requires": {
-+						"is-extglob": "1.0.0"
-+					}
-+				}
-+			}
-+		},
-+		"parse-json": {
-+			"version": "2.2.0",
-+			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-+			"integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-+			"dev": true,
-+			"requires": {
-+				"error-ex": "1.3.1"
-+			}
-+		},
-+		"path-dirname": {
-+			"version": "1.0.2",
-+			"resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-+			"integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
-+			"dev": true
-+		},
-+		"path-exists": {
-+			"version": "2.1.0",
-+			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-+			"integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-+			"dev": true,
-+			"requires": {
-+				"pinkie-promise": "2.0.1"
-+			}
-+		},
-+		"path-is-absolute": {
-+			"version": "1.0.1",
-+			"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-+			"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-+			"dev": true
-+		},
-+		"path-type": {
-+			"version": "1.1.0",
-+			"resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-+			"integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-+			"dev": true,
-+			"requires": {
-+				"graceful-fs": "4.1.11",
-+				"pify": "2.3.0",
-+				"pinkie-promise": "2.0.1"
-+			}
-+		},
-+		"pause-stream": {
-+			"version": "0.0.11",
-+			"resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
-+			"integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
-+			"dev": true,
-+			"requires": {
-+				"through": "2.3.8"
-+			}
-+		},
-+		"pend": {
-+			"version": "1.2.0",
-+			"resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-+			"integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
-+			"dev": true
-+		},
-+		"performance-now": {
-+			"version": "0.2.0",
-+			"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
-+			"integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=",
-+			"dev": true
-+		},
-+		"pify": {
-+			"version": "2.3.0",
-+			"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-+			"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-+			"dev": true
-+		},
-+		"pinkie": {
-+			"version": "2.0.4",
-+			"resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-+			"integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-+			"dev": true
-+		},
-+		"pinkie-promise": {
-+			"version": "2.0.1",
-+			"resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-+			"integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-+			"dev": true,
-+			"requires": {
-+				"pinkie": "2.0.4"
-+			}
-+		},
-+		"preserve": {
-+			"version": "0.2.0",
-+			"resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
-+			"integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
-+			"dev": true
-+		},
-+		"process-nextick-args": {
-+			"version": "1.0.7",
-+			"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-+			"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
-+			"dev": true
-+		},
-+		"punycode": {
-+			"version": "1.4.1",
-+			"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-+			"integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-+			"dev": true
-+		},
-+		"qs": {
-+			"version": "6.3.2",
-+			"resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz",
-+			"integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw=",
-+			"dev": true
-+		},
-+		"queue": {
-+			"version": "3.1.0",
-+			"resolved": "https://registry.npmjs.org/queue/-/queue-3.1.0.tgz",
-+			"integrity": "sha1-bEnQHwCeIlZ4h4nyv/rGuLmZBYU=",
-+			"dev": true,
-+			"requires": {
-+				"inherits": "2.0.3"
-+			}
-+		},
-+		"randomatic": {
-+			"version": "1.1.7",
-+			"resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
-+			"integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==",
-+			"dev": true,
-+			"requires": {
-+				"is-number": "3.0.0",
-+				"kind-of": "4.0.0"
-+			},
-+			"dependencies": {
-+				"is-number": {
-+					"version": "3.0.0",
-+					"resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-+					"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-+					"dev": true,
-+					"requires": {
-+						"kind-of": "3.2.2"
-+					},
-+					"dependencies": {
-+						"kind-of": {
-+							"version": "3.2.2",
-+							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-+							"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-+							"dev": true,
-+							"requires": {
-+								"is-buffer": "1.1.5"
-+							}
-+						}
-+					}
-+				},
-+				"kind-of": {
-+					"version": "4.0.0",
-+					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-+					"integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-+					"dev": true,
-+					"requires": {
-+						"is-buffer": "1.1.5"
-+					}
-+				}
-+			}
-+		},
-+		"read-pkg": {
-+			"version": "1.1.0",
-+			"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-+			"integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-+			"dev": true,
-+			"requires": {
-+				"load-json-file": "1.1.0",
-+				"normalize-package-data": "2.4.0",
-+				"path-type": "1.1.0"
-+			}
-+		},
-+		"read-pkg-up": {
-+			"version": "1.0.1",
-+			"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-+			"integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-+			"dev": true,
-+			"requires": {
-+				"find-up": "1.1.2",
-+				"read-pkg": "1.1.0"
-+			}
-+		},
-+		"readable-stream": {
-+			"version": "2.3.3",
-+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-+			"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-+			"dev": true,
-+			"requires": {
-+				"core-util-is": "1.0.2",
-+				"inherits": "2.0.3",
-+				"isarray": "1.0.0",
-+				"process-nextick-args": "1.0.7",
-+				"safe-buffer": "5.1.1",
-+				"string_decoder": "1.0.3",
-+				"util-deprecate": "1.0.2"
-+			}
-+		},
-+		"redent": {
-+			"version": "1.0.0",
-+			"resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-+			"integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
-+			"dev": true,
-+			"requires": {
-+				"indent-string": "2.1.0",
-+				"strip-indent": "1.0.1"
-+			}
-+		},
-+		"regex-cache": {
-+			"version": "0.4.3",
-+			"resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz",
-+			"integrity": "sha1-mxpsNdTQ3871cRrmUejp09cRQUU=",
-+			"dev": true,
-+			"requires": {
-+				"is-equal-shallow": "0.1.3",
-+				"is-primitive": "2.0.0"
-+			}
-+		},
-+		"remove-trailing-separator": {
-+			"version": "1.0.2",
-+			"resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz",
-+			"integrity": "sha1-abBi2XhyetFNxrVrpKt3L9jXBRE=",
-+			"dev": true
-+		},
-+		"repeat-element": {
-+			"version": "1.1.2",
-+			"resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz",
-+			"integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=",
-+			"dev": true
-+		},
-+		"repeat-string": {
-+			"version": "1.6.1",
-+			"resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-+			"integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
-+			"dev": true
-+		},
-+		"repeating": {
-+			"version": "2.0.1",
-+			"resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
-+			"integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
-+			"dev": true,
-+			"requires": {
-+				"is-finite": "1.0.2"
-+			}
-+		},
-+		"replace-ext": {
-+			"version": "0.0.1",
-+			"resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
-+			"integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
-+			"dev": true
-+		},
-+		"request": {
-+			"version": "2.81.0",
-+			"resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
-+			"integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
-+			"dev": true,
-+			"requires": {
-+				"aws-sign2": "0.6.0",
-+				"aws4": "1.6.0",
-+				"caseless": "0.12.0",
-+				"combined-stream": "1.0.5",
-+				"extend": "3.0.1",
-+				"forever-agent": "0.6.1",
-+				"form-data": "2.1.4",
-+				"har-validator": "4.2.1",
-+				"hawk": "3.1.3",
-+				"http-signature": "1.1.1",
-+				"is-typedarray": "1.0.0",
-+				"isstream": "0.1.2",
-+				"json-stringify-safe": "5.0.1",
-+				"mime-types": "2.1.15",
-+				"oauth-sign": "0.8.2",
-+				"performance-now": "0.2.0",
-+				"qs": "6.4.0",
-+				"safe-buffer": "5.1.1",
-+				"stringstream": "0.0.5",
-+				"tough-cookie": "2.3.2",
-+				"tunnel-agent": "0.6.0",
-+				"uuid": "3.1.0"
-+			},
-+			"dependencies": {
-+				"caseless": {
-+					"version": "0.12.0",
-+					"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-+					"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-+					"dev": true
-+				},
-+				"har-validator": {
-+					"version": "4.2.1",
-+					"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
-+					"integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
-+					"dev": true,
-+					"requires": {
-+						"ajv": "4.11.8",
-+						"har-schema": "1.0.5"
-+					}
-+				},
-+				"qs": {
-+					"version": "6.4.0",
-+					"resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
-+					"integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
-+					"dev": true
-+				},
-+				"tunnel-agent": {
-+					"version": "0.6.0",
-+					"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-+					"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-+					"dev": true,
-+					"requires": {
-+						"safe-buffer": "5.1.1"
-+					}
-+				}
-+			}
-+		},
-+		"rimraf": {
-+			"version": "2.6.1",
-+			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
-+			"integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=",
-+			"dev": true,
-+			"requires": {
-+				"glob": "7.1.2"
-+			},
-+			"dependencies": {
-+				"glob": {
-+					"version": "7.1.2",
-+					"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+					"integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+					"dev": true,
-+					"requires": {
-+						"fs.realpath": "1.0.0",
-+						"inflight": "1.0.6",
-+						"inherits": "2.0.3",
-+						"minimatch": "3.0.4",
-+						"once": "1.4.0",
-+						"path-is-absolute": "1.0.1"
-+					}
-+				}
-+			}
-+		},
-+		"safe-buffer": {
-+			"version": "5.1.1",
-+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-+			"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
-+			"dev": true
-+		},
-+		"semver": {
-+			"version": "5.3.0",
-+			"resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-+			"integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
-+			"dev": true
-+		},
-+		"sigmund": {
-+			"version": "1.0.1",
-+			"resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
-+			"integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=",
-+			"dev": true
-+		},
-+		"signal-exit": {
-+			"version": "3.0.2",
-+			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-+			"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
-+			"dev": true
-+		},
-+		"sntp": {
-+			"version": "1.0.9",
-+			"resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
-+			"integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
-+			"dev": true,
-+			"requires": {
-+				"hoek": "2.16.3"
-+			}
-+		},
-+		"source-map": {
-+			"version": "0.1.32",
-+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz",
-+			"integrity": "sha1-yLbBZ3l7pHQKjqMyUhYv8IWRsmY=",
-+			"dev": true,
-+			"requires": {
-+				"amdefine": "1.0.1"
-+			}
-+		},
-+		"source-map-support": {
-+			"version": "0.3.3",
-+			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.3.3.tgz",
-+			"integrity": "sha1-NJAJd9W6PwfHdX7nLnO7GptTdU8=",
-+			"dev": true,
-+			"requires": {
-+				"source-map": "0.1.32"
-+			}
-+		},
-+		"sparkles": {
-+			"version": "1.0.0",
-+			"resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz",
-+			"integrity": "sha1-Gsu/tZJDbRC76PeFt8xvgoFQEsM=",
-+			"dev": true
-+		},
-+		"spdx-correct": {
-+			"version": "1.0.2",
-+			"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
-+			"integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=",
-+			"dev": true,
-+			"requires": {
-+				"spdx-license-ids": "1.2.2"
-+			}
-+		},
-+		"spdx-expression-parse": {
-+			"version": "1.0.4",
-+			"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz",
-+			"integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=",
-+			"dev": true
-+		},
-+		"spdx-license-ids": {
-+			"version": "1.2.2",
-+			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz",
-+			"integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=",
-+			"dev": true
-+		},
-+		"split": {
-+			"version": "0.3.3",
-+			"resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
-+			"integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=",
-+			"dev": true,
-+			"requires": {
-+				"through": "2.3.8"
-+			}
-+		},
-+		"sshpk": {
-+			"version": "1.13.1",
-+			"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
-+			"integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
-+			"dev": true,
-+			"requires": {
-+				"asn1": "0.2.3",
-+				"assert-plus": "1.0.0",
-+				"bcrypt-pbkdf": "1.0.1",
-+				"dashdash": "1.14.1",
-+				"ecc-jsbn": "0.1.1",
-+				"getpass": "0.1.7",
-+				"jsbn": "0.1.1",
-+				"tweetnacl": "0.14.5"
-+			},
-+			"dependencies": {
-+				"assert-plus": {
-+					"version": "1.0.0",
-+					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-+					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-+					"dev": true
-+				}
-+			}
-+		},
-+		"stat-mode": {
-+			"version": "0.2.2",
-+			"resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-0.2.2.tgz",
-+			"integrity": "sha1-5sgLYjEj19gM8TLOU480YokHJQI=",
-+			"dev": true
-+		},
-+		"stream-combiner": {
-+			"version": "0.0.4",
-+			"resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
-+			"integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=",
-+			"dev": true,
-+			"requires": {
-+				"duplexer": "0.1.1"
-+			}
-+		},
-+		"stream-shift": {
-+			"version": "1.0.0",
-+			"resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
-+			"integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
-+			"dev": true
-+		},
-+		"streamfilter": {
-+			"version": "1.0.5",
-+			"resolved": "https://registry.npmjs.org/streamfilter/-/streamfilter-1.0.5.tgz",
-+			"integrity": "sha1-h1BxEb644phFFxe1Ec/tjwAqv1M=",
-+			"dev": true,
-+			"requires": {
-+				"readable-stream": "2.3.3"
-+			}
-+		},
-+		"streamifier": {
-+			"version": "0.1.1",
-+			"resolved": "https://registry.npmjs.org/streamifier/-/streamifier-0.1.1.tgz",
-+			"integrity": "sha1-l+mNj6TRBdYqJpHR3AfoINuN/E8=",
-+			"dev": true
-+		},
-+		"string_decoder": {
-+			"version": "1.0.3",
-+			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-+			"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-+			"dev": true,
-+			"requires": {
-+				"safe-buffer": "5.1.1"
-+			}
-+		},
-+		"stringstream": {
-+			"version": "0.0.5",
-+			"resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-+			"integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
-+			"dev": true
-+		},
-+		"strip-ansi": {
-+			"version": "3.0.1",
-+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-+			"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-+			"dev": true,
-+			"requires": {
-+				"ansi-regex": "2.1.1"
-+			}
-+		},
-+		"strip-bom": {
-+			"version": "2.0.0",
-+			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-+			"integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-+			"dev": true,
-+			"requires": {
-+				"is-utf8": "0.2.1"
-+			}
-+		},
-+		"strip-bom-stream": {
-+			"version": "1.0.0",
-+			"resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz",
-+			"integrity": "sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=",
-+			"dev": true,
-+			"requires": {
-+				"first-chunk-stream": "1.0.0",
-+				"strip-bom": "2.0.0"
-+			}
-+		},
-+		"strip-indent": {
-+			"version": "1.0.1",
-+			"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
-+			"integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
-+			"dev": true,
-+			"requires": {
-+				"get-stdin": "4.0.1"
-+			}
-+		},
-+		"supports-color": {
-+			"version": "2.0.0",
-+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-+			"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-+			"dev": true
-+		},
-+		"tar": {
-+			"version": "0.1.20",
-+			"resolved": "https://registry.npmjs.org/tar/-/tar-0.1.20.tgz",
-+			"integrity": "sha1-QpQLrltfIsdEg2mRJvnz8nRJyxM=",
-+			"dev": true,
-+			"requires": {
-+				"block-stream": "0.0.9",
-+				"fstream": "0.1.31",
-+				"inherits": "2.0.3"
-+			}
-+		},
-+		"through": {
-+			"version": "2.3.8",
-+			"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-+			"integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-+			"dev": true
-+		},
-+		"through2": {
-+			"version": "2.0.3",
-+			"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
-+			"integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
-+			"dev": true,
-+			"requires": {
-+				"readable-stream": "2.3.3",
-+				"xtend": "4.0.1"
-+			}
-+		},
-+		"through2-filter": {
-+			"version": "2.0.0",
-+			"resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz",
-+			"integrity": "sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=",
-+			"dev": true,
-+			"requires": {
-+				"through2": "2.0.3",
-+				"xtend": "4.0.1"
-+			}
-+		},
-+		"time-stamp": {
-+			"version": "1.1.0",
-+			"resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
-+			"integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
-+			"dev": true
-+		},
-+		"to-absolute-glob": {
-+			"version": "0.1.1",
-+			"resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz",
-+			"integrity": "sha1-HN+kcqnvUMI57maZm2YsoOs5k38=",
-+			"dev": true,
-+			"requires": {
-+				"extend-shallow": "2.0.1"
-+			}
-+		},
-+		"to-iso-string": {
-+			"version": "0.0.2",
-+			"resolved": "https://registry.npmjs.org/to-iso-string/-/to-iso-string-0.0.2.tgz",
-+			"integrity": "sha1-TcGeZk38y+Jb2NtQiwDG2hWCVdE=",
-+			"dev": true
-+		},
-+		"tough-cookie": {
-+			"version": "2.3.2",
-+			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
-+			"integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=",
-+			"dev": true,
-+			"requires": {
-+				"punycode": "1.4.1"
-+			}
-+		},
-+		"trim-newlines": {
-+			"version": "1.0.0",
-+			"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-+			"integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
-+			"dev": true
-+		},
-+		"tunnel-agent": {
-+			"version": "0.4.3",
-+			"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-+			"integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
-+			"dev": true
-+		},
-+		"tweetnacl": {
-+			"version": "0.14.5",
-+			"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-+			"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-+			"dev": true,
-+			"optional": true
-+		},
-+		"typescript": {
-+			"version": "1.8.10",
-+			"resolved": "https://registry.npmjs.org/typescript/-/typescript-1.8.10.tgz",
-+			"integrity": "sha1-tHXW4N/wv1DyluXKbvn7tccyDx4=",
-+			"dev": true
-+		},
-+		"unique-stream": {
-+			"version": "2.2.1",
-+			"resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.1.tgz",
-+			"integrity": "sha1-WqADz76Uxf+GbE59ZouxxNuts2k=",
-+			"dev": true,
-+			"requires": {
-+				"json-stable-stringify": "1.0.1",
-+				"through2-filter": "2.0.0"
-+			}
-+		},
-+		"util-deprecate": {
-+			"version": "1.0.2",
-+			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-+			"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-+			"dev": true
-+		},
-+		"uuid": {
-+			"version": "3.1.0",
-+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-+			"integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
-+			"dev": true
-+		},
-+		"vali-date": {
-+			"version": "1.0.0",
-+			"resolved": "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz",
-+			"integrity": "sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY=",
-+			"dev": true
-+		},
-+		"validate-npm-package-license": {
-+			"version": "3.0.1",
-+			"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
-+			"integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=",
-+			"dev": true,
-+			"requires": {
-+				"spdx-correct": "1.0.2",
-+				"spdx-expression-parse": "1.0.4"
-+			}
-+		},
-+		"verror": {
-+			"version": "1.3.6",
-+			"resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz",
-+			"integrity": "sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw=",
-+			"dev": true,
-+			"requires": {
-+				"extsprintf": "1.0.2"
-+			}
-+		},
-+		"vinyl": {
-+			"version": "0.5.3",
-+			"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
-+			"integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=",
-+			"dev": true,
-+			"requires": {
-+				"clone": "1.0.2",
-+				"clone-stats": "0.0.1",
-+				"replace-ext": "0.0.1"
-+			}
-+		},
-+		"vinyl-fs": {
-+			"version": "2.4.4",
-+			"resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz",
-+			"integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=",
-+			"dev": true,
-+			"requires": {
-+				"duplexify": "3.5.0",
-+				"glob-stream": "5.3.5",
-+				"graceful-fs": "4.1.11",
-+				"gulp-sourcemaps": "1.6.0",
-+				"is-valid-glob": "0.3.0",
-+				"lazystream": "1.0.0",
-+				"lodash.isequal": "4.5.0",
-+				"merge-stream": "1.0.1",
-+				"mkdirp": "0.5.1",
-+				"object-assign": "4.1.1",
-+				"readable-stream": "2.3.3",
-+				"strip-bom": "2.0.0",
-+				"strip-bom-stream": "1.0.0",
-+				"through2": "2.0.3",
-+				"through2-filter": "2.0.0",
-+				"vali-date": "1.0.0",
-+				"vinyl": "1.2.0"
-+			},
-+			"dependencies": {
-+				"object-assign": {
-+					"version": "4.1.1",
-+					"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-+					"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-+					"dev": true
-+				},
-+				"vinyl": {
-+					"version": "1.2.0",
-+					"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
-+					"integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
-+					"dev": true,
-+					"requires": {
-+						"clone": "1.0.2",
-+						"clone-stats": "0.0.1",
-+						"replace-ext": "0.0.1"
-+					}
-+				}
-+			}
-+		},
-+		"vinyl-source-stream": {
-+			"version": "1.1.0",
-+			"resolved": "https://registry.npmjs.org/vinyl-source-stream/-/vinyl-source-stream-1.1.0.tgz",
-+			"integrity": "sha1-RMvlEIIFJ53rDFZTwJSiiHk4sas=",
-+			"dev": true,
-+			"requires": {
-+				"through2": "0.6.5",
-+				"vinyl": "0.4.6"
-+			},
-+			"dependencies": {
-+				"clone": {
-+					"version": "0.2.0",
-+					"resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
-+					"integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-+					"dev": true
-+				},
-+				"isarray": {
-+					"version": "0.0.1",
-+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-+					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-+					"dev": true
-+				},
-+				"readable-stream": {
-+					"version": "1.0.34",
-+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-+					"integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-+					"dev": true,
-+					"requires": {
-+						"core-util-is": "1.0.2",
-+						"inherits": "2.0.3",
-+						"isarray": "0.0.1",
-+						"string_decoder": "0.10.31"
-+					}
-+				},
-+				"string_decoder": {
-+					"version": "0.10.31",
-+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-+					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-+					"dev": true
-+				},
-+				"through2": {
-+					"version": "0.6.5",
-+					"resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-+					"integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-+					"dev": true,
-+					"requires": {
-+						"readable-stream": "1.0.34",
-+						"xtend": "4.0.1"
-+					}
-+				},
-+				"vinyl": {
-+					"version": "0.4.6",
-+					"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
-+					"integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
-+					"dev": true,
-+					"requires": {
-+						"clone": "0.2.0",
-+						"clone-stats": "0.0.1"
-+					}
-+				}
-+			}
-+		},
-+		"vscode": {
-+			"version": "1.0.1",
-+			"resolved": "https://registry.npmjs.org/vscode/-/vscode-1.0.1.tgz",
-+			"integrity": "sha1-PRYSAGFf4q8dkt3GUHURWUEaUTs=",
-+			"dev": true,
-+			"requires": {
-+				"glob": "5.0.15",
-+				"gulp-chmod": "1.3.0",
-+				"gulp-filter": "4.0.0",
-+				"gulp-gunzip": "0.0.3",
-+				"gulp-remote-src": "0.4.2",
-+				"gulp-symdest": "1.1.0",
-+				"gulp-untar": "0.0.4",
-+				"gulp-vinyl-zip": "1.4.0",
-+				"mocha": "2.5.3",
-+				"request": "2.81.0",
-+				"semver": "5.3.0",
-+				"source-map-support": "0.3.3",
-+				"vinyl-source-stream": "1.1.0"
-+			}
-+		},
-+		"wrappy": {
-+			"version": "1.0.2",
-+			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-+			"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-+			"dev": true
-+		},
-+		"xtend": {
-+			"version": "4.0.1",
-+			"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-+			"integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-+			"dev": true
-+		},
-+		"yauzl": {
-+			"version": "2.8.0",
-+			"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.8.0.tgz",
-+			"integrity": "sha1-eUUK/yKyqcWkHvVOAtuQfM+/nuI=",
-+			"dev": true,
-+			"requires": {
-+				"buffer-crc32": "0.2.13",
-+				"fd-slicer": "1.0.1"
-+			}
-+		},
-+		"yazl": {
-+			"version": "2.4.2",
-+			"resolved": "https://registry.npmjs.org/yazl/-/yazl-2.4.2.tgz",
-+			"integrity": "sha1-FMsZCD4eJacAksFYiqvg9OTdTYg=",
-+			"dev": true,
-+			"requires": {
-+				"buffer-crc32": "0.2.13"
-+			}
-+		}
-+	}
-+}
-changed in both
-  base   100644 93ac38acad8aaac1604d951dea2c1c01ed5aecec extensions/vscode-api-tests/package.json
-  our    100644 4c3f93d4fc21b8845ef026bba5365be9d8aac55d extensions/vscode-api-tests/package.json
-  their  100644 b58eb162a2c0e9ba37160a9b6b05dc58e31c0a0b extensions/vscode-api-tests/package.json
-added in remote
-  their  100644 b6dbe046c572acac94caaa226eeca6ad13979f17 extensions/vscode-colorize-tests/package-lock.json
-@@ -0,0 +1,3193 @@
-+{
-+	"name": "vscode-colorize-tests",
-+	"version": "0.0.1",
-+	"lockfileVersion": 1,
-+	"requires": true,
-+	"dependencies": {
-+		"@types/mocha": {
-+			"version": "2.2.41",
-+			"resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-2.2.41.tgz",
-+			"integrity": "sha1-4nzwgXFT658nE7LT9saPHhw8pgg=",
-+			"dev": true
-+		},
-+		"@types/node": {
-+			"version": "7.0.33",
-+			"resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.33.tgz",
-+			"integrity": "sha512-8fVvl6Yyk3jZvSYxRMS9/AmZJ5RXCOP9N4xSlykyBViVESu751pxHYTN14Embn1Fem78YwEHdC7p7KGQQpwunw==",
-+			"dev": true
-+		},
-+		"ajv": {
-+			"version": "4.11.8",
-+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
-+			"integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
-+			"dev": true,
-+			"requires": {
-+				"co": "4.6.0",
-+				"json-stable-stringify": "1.0.1"
-+			}
-+		},
-+		"amdefine": {
-+			"version": "1.0.1",
-+			"resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-+			"integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
-+			"dev": true
-+		},
-+		"ansi-regex": {
-+			"version": "2.1.1",
-+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-+			"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-+			"dev": true
-+		},
-+		"ansi-styles": {
-+			"version": "2.2.1",
-+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-+			"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-+			"dev": true
-+		},
-+		"arr-diff": {
-+			"version": "2.0.0",
-+			"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-+			"integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
-+			"dev": true,
-+			"requires": {
-+				"arr-flatten": "1.0.3"
-+			}
-+		},
-+		"arr-flatten": {
-+			"version": "1.0.3",
-+			"resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.3.tgz",
-+			"integrity": "sha1-onTthawIhJtr14R8RYB0XcUa37E=",
-+			"dev": true
-+		},
-+		"array-differ": {
-+			"version": "1.0.0",
-+			"resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
-+			"integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=",
-+			"dev": true
-+		},
-+		"array-find-index": {
-+			"version": "1.0.2",
-+			"resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
-+			"integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
-+			"dev": true
-+		},
-+		"array-union": {
-+			"version": "1.0.2",
-+			"resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-+			"integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-+			"dev": true,
-+			"requires": {
-+				"array-uniq": "1.0.3"
-+			}
-+		},
-+		"array-uniq": {
-+			"version": "1.0.3",
-+			"resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-+			"integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
-+			"dev": true
-+		},
-+		"array-unique": {
-+			"version": "0.2.1",
-+			"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-+			"integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-+			"dev": true
-+		},
-+		"arrify": {
-+			"version": "1.0.1",
-+			"resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-+			"integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
-+			"dev": true
-+		},
-+		"asn1": {
-+			"version": "0.2.3",
-+			"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-+			"integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
-+			"dev": true
-+		},
-+		"assert-plus": {
-+			"version": "0.2.0",
-+			"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
-+			"integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
-+			"dev": true
-+		},
-+		"asynckit": {
-+			"version": "0.4.0",
-+			"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-+			"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-+			"dev": true
-+		},
-+		"aws-sign2": {
-+			"version": "0.6.0",
-+			"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
-+			"integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
-+			"dev": true
-+		},
-+		"aws4": {
-+			"version": "1.6.0",
-+			"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-+			"integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
-+			"dev": true
-+		},
-+		"balanced-match": {
-+			"version": "1.0.0",
-+			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-+			"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-+			"dev": true
-+		},
-+		"bcrypt-pbkdf": {
-+			"version": "1.0.1",
-+			"resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
-+			"integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
-+			"dev": true,
-+			"optional": true,
-+			"requires": {
-+				"tweetnacl": "0.14.5"
-+			}
-+		},
-+		"beeper": {
-+			"version": "1.1.1",
-+			"resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz",
-+			"integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=",
-+			"dev": true
-+		},
-+		"block-stream": {
-+			"version": "0.0.9",
-+			"resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
-+			"integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
-+			"dev": true,
-+			"requires": {
-+				"inherits": "2.0.3"
-+			}
-+		},
-+		"boom": {
-+			"version": "2.10.1",
-+			"resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
-+			"integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
-+			"dev": true,
-+			"requires": {
-+				"hoek": "2.16.3"
-+			}
-+		},
-+		"brace-expansion": {
-+			"version": "1.1.8",
-+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
-+			"integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
-+			"dev": true,
-+			"requires": {
-+				"balanced-match": "1.0.0",
-+				"concat-map": "0.0.1"
-+			}
-+		},
-+		"braces": {
-+			"version": "1.8.5",
-+			"resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-+			"integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
-+			"dev": true,
-+			"requires": {
-+				"expand-range": "1.8.2",
-+				"preserve": "0.2.0",
-+				"repeat-element": "1.1.2"
-+			}
-+		},
-+		"buffer-crc32": {
-+			"version": "0.2.13",
-+			"resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-+			"integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-+			"dev": true
-+		},
-+		"builtin-modules": {
-+			"version": "1.1.1",
-+			"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
-+			"integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
-+			"dev": true
-+		},
-+		"camelcase": {
-+			"version": "2.1.1",
-+			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-+			"integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
-+			"dev": true
-+		},
-+		"camelcase-keys": {
-+			"version": "2.1.0",
-+			"resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
-+			"integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
-+			"dev": true,
-+			"requires": {
-+				"camelcase": "2.1.1",
-+				"map-obj": "1.0.1"
-+			}
-+		},
-+		"caseless": {
-+			"version": "0.11.0",
-+			"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
-+			"integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
-+			"dev": true
-+		},
-+		"chalk": {
-+			"version": "1.1.3",
-+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-+			"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-+			"dev": true,
-+			"requires": {
-+				"ansi-styles": "2.2.1",
-+				"escape-string-regexp": "1.0.5",
-+				"has-ansi": "2.0.0",
-+				"strip-ansi": "3.0.1",
-+				"supports-color": "2.0.0"
-+			}
-+		},
-+		"clone": {
-+			"version": "1.0.2",
-+			"resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz",
-+			"integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=",
-+			"dev": true
-+		},
-+		"clone-buffer": {
-+			"version": "1.0.0",
-+			"resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
-+			"integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=",
-+			"dev": true
-+		},
-+		"clone-stats": {
-+			"version": "0.0.1",
-+			"resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
-+			"integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=",
-+			"dev": true
-+		},
-+		"cloneable-readable": {
-+			"version": "1.0.0",
-+			"resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.0.0.tgz",
-+			"integrity": "sha1-pikNQT8hemEjL5XkWP84QYz7ARc=",
-+			"dev": true,
-+			"requires": {
-+				"inherits": "2.0.3",
-+				"process-nextick-args": "1.0.7",
-+				"through2": "2.0.3"
-+			}
-+		},
-+		"co": {
-+			"version": "4.6.0",
-+			"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-+			"integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-+			"dev": true
-+		},
-+		"combined-stream": {
-+			"version": "1.0.5",
-+			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-+			"integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
-+			"dev": true,
-+			"requires": {
-+				"delayed-stream": "1.0.0"
-+			}
-+		},
-+		"commander": {
-+			"version": "2.11.0",
-+			"resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
-+			"integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
-+			"dev": true
-+		},
-+		"concat-map": {
-+			"version": "0.0.1",
-+			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-+			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-+			"dev": true
-+		},
-+		"convert-source-map": {
-+			"version": "1.5.0",
-+			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz",
-+			"integrity": "sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU=",
-+			"dev": true
-+		},
-+		"core-util-is": {
-+			"version": "1.0.2",
-+			"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-+			"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-+			"dev": true
-+		},
-+		"cryptiles": {
-+			"version": "2.0.5",
-+			"resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-+			"integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
-+			"dev": true,
-+			"requires": {
-+				"boom": "2.10.1"
-+			}
-+		},
-+		"currently-unhandled": {
-+			"version": "0.4.1",
-+			"resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
-+			"integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
-+			"dev": true,
-+			"requires": {
-+				"array-find-index": "1.0.2"
-+			}
-+		},
-+		"dashdash": {
-+			"version": "1.14.1",
-+			"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-+			"integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-+			"dev": true,
-+			"requires": {
-+				"assert-plus": "1.0.0"
-+			},
-+			"dependencies": {
-+				"assert-plus": {
-+					"version": "1.0.0",
-+					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-+					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-+					"dev": true
-+				}
-+			}
-+		},
-+		"dateformat": {
-+			"version": "2.0.0",
-+			"resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.0.0.tgz",
-+			"integrity": "sha1-J0Pjq7XD/CRi5SfcpEXgTp9N7hc=",
-+			"dev": true
-+		},
-+		"debug": {
-+			"version": "2.2.0",
-+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-+			"integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
-+			"dev": true,
-+			"requires": {
-+				"ms": "0.7.1"
-+			}
-+		},
-+		"decamelize": {
-+			"version": "1.2.0",
-+			"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-+			"integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-+			"dev": true
-+		},
-+		"deep-assign": {
-+			"version": "1.0.0",
-+			"resolved": "https://registry.npmjs.org/deep-assign/-/deep-assign-1.0.0.tgz",
-+			"integrity": "sha1-sJJ0O+hCfcYh6gBnzex+cN0Z83s=",
-+			"dev": true,
-+			"requires": {
-+				"is-obj": "1.0.1"
-+			}
-+		},
-+		"delayed-stream": {
-+			"version": "1.0.0",
-+			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-+			"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-+			"dev": true
-+		},
-+		"diff": {
-+			"version": "1.4.0",
-+			"resolved": "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz",
-+			"integrity": "sha1-fyjS657nsVqX79ic5j3P2qPMur8=",
-+			"dev": true
-+		},
-+		"duplexer": {
-+			"version": "0.1.1",
-+			"resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
-+			"integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
-+			"dev": true
-+		},
-+		"duplexer2": {
-+			"version": "0.0.2",
-+			"resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-+			"integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
-+			"dev": true,
-+			"requires": {
-+				"readable-stream": "1.1.14"
-+			},
-+			"dependencies": {
-+				"isarray": {
-+					"version": "0.0.1",
-+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-+					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-+					"dev": true
-+				},
-+				"readable-stream": {
-+					"version": "1.1.14",
-+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-+					"integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-+					"dev": true,
-+					"requires": {
-+						"core-util-is": "1.0.2",
-+						"inherits": "2.0.3",
-+						"isarray": "0.0.1",
-+						"string_decoder": "0.10.31"
-+					}
-+				},
-+				"string_decoder": {
-+					"version": "0.10.31",
-+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-+					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-+					"dev": true
-+				}
-+			}
-+		},
-+		"duplexify": {
-+			"version": "3.5.0",
-+			"resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.0.tgz",
-+			"integrity": "sha1-GqdzAC4VeEV+nZ1KULDMquvL1gQ=",
-+			"dev": true,
-+			"requires": {
-+				"end-of-stream": "1.0.0",
-+				"inherits": "2.0.3",
-+				"readable-stream": "2.3.3",
-+				"stream-shift": "1.0.0"
-+			}
-+		},
-+		"ecc-jsbn": {
-+			"version": "0.1.1",
-+			"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
-+			"integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
-+			"dev": true,
-+			"optional": true,
-+			"requires": {
-+				"jsbn": "0.1.1"
-+			}
-+		},
-+		"end-of-stream": {
-+			"version": "1.0.0",
-+			"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz",
-+			"integrity": "sha1-1FlucCc0qT5A6a+GQxnqvZn/Lw4=",
-+			"dev": true,
-+			"requires": {
-+				"once": "1.3.3"
-+			},
-+			"dependencies": {
-+				"once": {
-+					"version": "1.3.3",
-+					"resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-+					"integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=",
-+					"dev": true,
-+					"requires": {
-+						"wrappy": "1.0.2"
-+					}
-+				}
-+			}
-+		},
-+		"error-ex": {
-+			"version": "1.3.1",
-+			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz",
-+			"integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=",
-+			"dev": true,
-+			"requires": {
-+				"is-arrayish": "0.2.1"
-+			}
-+		},
-+		"escape-string-regexp": {
-+			"version": "1.0.5",
-+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-+			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-+			"dev": true
-+		},
-+		"event-stream": {
-+			"version": "3.3.4",
-+			"resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
-+			"integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
-+			"dev": true,
-+			"requires": {
-+				"duplexer": "0.1.1",
-+				"from": "0.1.7",
-+				"map-stream": "0.1.0",
-+				"pause-stream": "0.0.11",
-+				"split": "0.3.3",
-+				"stream-combiner": "0.0.4",
-+				"through": "2.3.8"
-+			}
-+		},
-+		"expand-brackets": {
-+			"version": "0.1.5",
-+			"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
-+			"integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
-+			"dev": true,
-+			"requires": {
-+				"is-posix-bracket": "0.1.1"
-+			}
-+		},
-+		"expand-range": {
-+			"version": "1.8.2",
-+			"resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
-+			"integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
-+			"dev": true,
-+			"requires": {
-+				"fill-range": "2.2.3"
-+			}
-+		},
-+		"extend": {
-+			"version": "3.0.1",
-+			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-+			"integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
-+			"dev": true
-+		},
-+		"extend-shallow": {
-+			"version": "2.0.1",
-+			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-+			"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-+			"dev": true,
-+			"requires": {
-+				"is-extendable": "0.1.1"
-+			}
-+		},
-+		"extglob": {
-+			"version": "0.3.2",
-+			"resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
-+			"integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
-+			"dev": true,
-+			"requires": {
-+				"is-extglob": "1.0.0"
-+			},
-+			"dependencies": {
-+				"is-extglob": {
-+					"version": "1.0.0",
-+					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-+					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-+					"dev": true
-+				}
-+			}
-+		},
-+		"extsprintf": {
-+			"version": "1.0.2",
-+			"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz",
-+			"integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=",
-+			"dev": true
-+		},
-+		"fancy-log": {
-+			"version": "1.3.0",
-+			"resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.0.tgz",
-+			"integrity": "sha1-Rb4X0Cu5kX1gzP/UmVyZnmyMmUg=",
-+			"dev": true,
-+			"requires": {
-+				"chalk": "1.1.3",
-+				"time-stamp": "1.1.0"
-+			}
-+		},
-+		"fd-slicer": {
-+			"version": "1.0.1",
-+			"resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
-+			"integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
-+			"dev": true,
-+			"requires": {
-+				"pend": "1.2.0"
-+			}
-+		},
-+		"filename-regex": {
-+			"version": "2.0.1",
-+			"resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
-+			"integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
-+			"dev": true
-+		},
-+		"fill-range": {
-+			"version": "2.2.3",
-+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
-+			"integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
-+			"dev": true,
-+			"requires": {
-+				"is-number": "2.1.0",
-+				"isobject": "2.1.0",
-+				"randomatic": "1.1.7",
-+				"repeat-element": "1.1.2",
-+				"repeat-string": "1.6.1"
-+			}
-+		},
-+		"find-up": {
-+			"version": "1.1.2",
-+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-+			"integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-+			"dev": true,
-+			"requires": {
-+				"path-exists": "2.1.0",
-+				"pinkie-promise": "2.0.1"
-+			}
-+		},
-+		"first-chunk-stream": {
-+			"version": "1.0.0",
-+			"resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz",
-+			"integrity": "sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=",
-+			"dev": true
-+		},
-+		"for-in": {
-+			"version": "1.0.2",
-+			"resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-+			"integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-+			"dev": true
-+		},
-+		"for-own": {
-+			"version": "0.1.5",
-+			"resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-+			"integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
-+			"dev": true,
-+			"requires": {
-+				"for-in": "1.0.2"
-+			}
-+		},
-+		"forever-agent": {
-+			"version": "0.6.1",
-+			"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-+			"integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-+			"dev": true
-+		},
-+		"form-data": {
-+			"version": "2.1.4",
-+			"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
-+			"integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
-+			"dev": true,
-+			"requires": {
-+				"asynckit": "0.4.0",
-+				"combined-stream": "1.0.5",
-+				"mime-types": "2.1.15"
-+			}
-+		},
-+		"from": {
-+			"version": "0.1.7",
-+			"resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
-+			"integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=",
-+			"dev": true
-+		},
-+		"fs.realpath": {
-+			"version": "1.0.0",
-+			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-+			"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-+			"dev": true
-+		},
-+		"fstream": {
-+			"version": "0.1.31",
-+			"resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
-+			"integrity": "sha1-czfwWPu7vvqMn1YaKMqwhJICyYg=",
-+			"dev": true,
-+			"requires": {
-+				"graceful-fs": "3.0.11",
-+				"inherits": "2.0.3",
-+				"mkdirp": "0.5.1",
-+				"rimraf": "2.6.1"
-+			},
-+			"dependencies": {
-+				"graceful-fs": {
-+					"version": "3.0.11",
-+					"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz",
-+					"integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=",
-+					"dev": true,
-+					"requires": {
-+						"natives": "1.1.0"
-+					}
-+				}
-+			}
-+		},
-+		"generate-function": {
-+			"version": "2.0.0",
-+			"resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
-+			"integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=",
-+			"dev": true
-+		},
-+		"generate-object-property": {
-+			"version": "1.2.0",
-+			"resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
-+			"integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
-+			"dev": true,
-+			"requires": {
-+				"is-property": "1.0.2"
-+			}
-+		},
-+		"get-stdin": {
-+			"version": "4.0.1",
-+			"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-+			"integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-+			"dev": true
-+		},
-+		"getpass": {
-+			"version": "0.1.7",
-+			"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-+			"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-+			"dev": true,
-+			"requires": {
-+				"assert-plus": "1.0.0"
-+			},
-+			"dependencies": {
-+				"assert-plus": {
-+					"version": "1.0.0",
-+					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-+					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-+					"dev": true
-+				}
-+			}
-+		},
-+		"glob": {
-+			"version": "5.0.15",
-+			"resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-+			"integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-+			"dev": true,
-+			"requires": {
-+				"inflight": "1.0.6",
-+				"inherits": "2.0.3",
-+				"minimatch": "3.0.4",
-+				"once": "1.4.0",
-+				"path-is-absolute": "1.0.1"
-+			}
-+		},
-+		"glob-base": {
-+			"version": "0.3.0",
-+			"resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
-+			"integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
-+			"dev": true,
-+			"requires": {
-+				"glob-parent": "2.0.0",
-+				"is-glob": "2.0.1"
-+			},
-+			"dependencies": {
-+				"glob-parent": {
-+					"version": "2.0.0",
-+					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-+					"integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
-+					"dev": true,
-+					"requires": {
-+						"is-glob": "2.0.1"
-+					}
-+				},
-+				"is-extglob": {
-+					"version": "1.0.0",
-+					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-+					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-+					"dev": true
-+				},
-+				"is-glob": {
-+					"version": "2.0.1",
-+					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-+					"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-+					"dev": true,
-+					"requires": {
-+						"is-extglob": "1.0.0"
-+					}
-+				}
-+			}
-+		},
-+		"glob-parent": {
-+			"version": "3.1.0",
-+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-+			"integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-+			"dev": true,
-+			"requires": {
-+				"is-glob": "3.1.0",
-+				"path-dirname": "1.0.2"
-+			}
-+		},
-+		"glob-stream": {
-+			"version": "5.3.5",
-+			"resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz",
-+			"integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=",
-+			"dev": true,
-+			"requires": {
-+				"extend": "3.0.1",
-+				"glob": "5.0.15",
-+				"glob-parent": "3.1.0",
-+				"micromatch": "2.3.11",
-+				"ordered-read-streams": "0.3.0",
-+				"through2": "0.6.5",
-+				"to-absolute-glob": "0.1.1",
-+				"unique-stream": "2.2.1"
-+			},
-+			"dependencies": {
-+				"isarray": {
-+					"version": "0.0.1",
-+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-+					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-+					"dev": true
-+				},
-+				"readable-stream": {
-+					"version": "1.0.34",
-+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-+					"integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-+					"dev": true,
-+					"requires": {
-+						"core-util-is": "1.0.2",
-+						"inherits": "2.0.3",
-+						"isarray": "0.0.1",
-+						"string_decoder": "0.10.31"
-+					}
-+				},
-+				"string_decoder": {
-+					"version": "0.10.31",
-+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-+					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-+					"dev": true
-+				},
-+				"through2": {
-+					"version": "0.6.5",
-+					"resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-+					"integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-+					"dev": true,
-+					"requires": {
-+						"readable-stream": "1.0.34",
-+						"xtend": "4.0.1"
-+					}
-+				}
-+			}
-+		},
-+		"glogg": {
-+			"version": "1.0.0",
-+			"resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz",
-+			"integrity": "sha1-f+DxmfV6yQbPUS/urY+Q7kooT8U=",
-+			"dev": true,
-+			"requires": {
-+				"sparkles": "1.0.0"
-+			}
-+		},
-+		"graceful-fs": {
-+			"version": "4.1.11",
-+			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-+			"integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-+			"dev": true
-+		},
-+		"growl": {
-+			"version": "1.9.2",
-+			"resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz",
-+			"integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=",
-+			"dev": true
-+		},
-+		"gulp-chmod": {
-+			"version": "1.3.0",
-+			"resolved": "https://registry.npmjs.org/gulp-chmod/-/gulp-chmod-1.3.0.tgz",
-+			"integrity": "sha1-i7bowRiV3L+bQlIMh0NHpQIryw0=",
-+			"dev": true,
-+			"requires": {
-+				"deep-assign": "1.0.0",
-+				"stat-mode": "0.2.2",
-+				"through2": "2.0.3"
-+			}
-+		},
-+		"gulp-filter": {
-+			"version": "4.0.0",
-+			"resolved": "https://registry.npmjs.org/gulp-filter/-/gulp-filter-4.0.0.tgz",
-+			"integrity": "sha1-OV9YolbFWc254NFX8cqvUkijjcs=",
-+			"dev": true,
-+			"requires": {
-+				"gulp-util": "3.0.8",
-+				"multimatch": "2.1.0",
-+				"streamfilter": "1.0.5"
-+			}
-+		},
-+		"gulp-gunzip": {
-+			"version": "0.0.3",
-+			"resolved": "https://registry.npmjs.org/gulp-gunzip/-/gulp-gunzip-0.0.3.tgz",
-+			"integrity": "sha1-e24HsPWP09QlFcSOrVpj3wVy9i8=",
-+			"dev": true,
-+			"requires": {
-+				"through2": "0.6.5",
-+				"vinyl": "0.4.6"
-+			},
-+			"dependencies": {
-+				"clone": {
-+					"version": "0.2.0",
-+					"resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
-+					"integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-+					"dev": true
-+				},
-+				"isarray": {
-+					"version": "0.0.1",
-+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-+					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-+					"dev": true
-+				},
-+				"readable-stream": {
-+					"version": "1.0.34",
-+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-+					"integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-+					"dev": true,
-+					"requires": {
-+						"core-util-is": "1.0.2",
-+						"inherits": "2.0.3",
-+						"isarray": "0.0.1",
-+						"string_decoder": "0.10.31"
-+					}
-+				},
-+				"string_decoder": {
-+					"version": "0.10.31",
-+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-+					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-+					"dev": true
-+				},
-+				"through2": {
-+					"version": "0.6.5",
-+					"resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-+					"integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-+					"dev": true,
-+					"requires": {
-+						"readable-stream": "1.0.34",
-+						"xtend": "4.0.1"
-+					}
-+				},
-+				"vinyl": {
-+					"version": "0.4.6",
-+					"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
-+					"integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
-+					"dev": true,
-+					"requires": {
-+						"clone": "0.2.0",
-+						"clone-stats": "0.0.1"
-+					}
-+				}
-+			}
-+		},
-+		"gulp-remote-src": {
-+			"version": "0.4.2",
-+			"resolved": "https://registry.npmjs.org/gulp-remote-src/-/gulp-remote-src-0.4.2.tgz",
-+			"integrity": "sha1-zrN3DjREMo1hOG+6qrIAvBHNmKg=",
-+			"dev": true,
-+			"requires": {
-+				"event-stream": "3.3.4",
-+				"node.extend": "1.1.6",
-+				"request": "2.79.0",
-+				"through2": "2.0.3",
-+				"vinyl": "2.0.2"
-+			},
-+			"dependencies": {
-+				"clone-stats": {
-+					"version": "1.0.0",
-+					"resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
-+					"integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
-+					"dev": true
-+				},
-+				"replace-ext": {
-+					"version": "1.0.0",
-+					"resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
-+					"integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
-+					"dev": true
-+				},
-+				"request": {
-+					"version": "2.79.0",
-+					"resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz",
-+					"integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=",
-+					"dev": true,
-+					"requires": {
-+						"aws-sign2": "0.6.0",
-+						"aws4": "1.6.0",
-+						"caseless": "0.11.0",
-+						"combined-stream": "1.0.5",
-+						"extend": "3.0.1",
-+						"forever-agent": "0.6.1",
-+						"form-data": "2.1.4",
-+						"har-validator": "2.0.6",
-+						"hawk": "3.1.3",
-+						"http-signature": "1.1.1",
-+						"is-typedarray": "1.0.0",
-+						"isstream": "0.1.2",
-+						"json-stringify-safe": "5.0.1",
-+						"mime-types": "2.1.15",
-+						"oauth-sign": "0.8.2",
-+						"qs": "6.3.2",
-+						"stringstream": "0.0.5",
-+						"tough-cookie": "2.3.2",
-+						"tunnel-agent": "0.4.3",
-+						"uuid": "3.1.0"
-+					}
-+				},
-+				"vinyl": {
-+					"version": "2.0.2",
-+					"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.0.2.tgz",
-+					"integrity": "sha1-CjcT2NTpIhxY8QyhbAEWyeJe2nw=",
-+					"dev": true,
-+					"requires": {
-+						"clone": "1.0.2",
-+						"clone-buffer": "1.0.0",
-+						"clone-stats": "1.0.0",
-+						"cloneable-readable": "1.0.0",
-+						"is-stream": "1.1.0",
-+						"remove-trailing-separator": "1.0.2",
-+						"replace-ext": "1.0.0"
-+					}
-+				}
-+			}
-+		},
-+		"gulp-sourcemaps": {
-+			"version": "1.6.0",
-+			"resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz",
-+			"integrity": "sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=",
-+			"dev": true,
-+			"requires": {
-+				"convert-source-map": "1.5.0",
-+				"graceful-fs": "4.1.11",
-+				"strip-bom": "2.0.0",
-+				"through2": "2.0.3",
-+				"vinyl": "1.2.0"
-+			},
-+			"dependencies": {
-+				"vinyl": {
-+					"version": "1.2.0",
-+					"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
-+					"integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
-+					"dev": true,
-+					"requires": {
-+						"clone": "1.0.2",
-+						"clone-stats": "0.0.1",
-+						"replace-ext": "0.0.1"
-+					}
-+				}
-+			}
-+		},
-+		"gulp-symdest": {
-+			"version": "1.1.0",
-+			"resolved": "https://registry.npmjs.org/gulp-symdest/-/gulp-symdest-1.1.0.tgz",
-+			"integrity": "sha1-wWUyBzLRks5W/ZQnH/oSMjS/KuA=",
-+			"dev": true,
-+			"requires": {
-+				"event-stream": "3.3.4",
-+				"mkdirp": "0.5.1",
-+				"queue": "3.1.0",
-+				"vinyl-fs": "2.4.4"
-+			}
-+		},
-+		"gulp-untar": {
-+			"version": "0.0.4",
-+			"resolved": "https://registry.npmjs.org/gulp-untar/-/gulp-untar-0.0.4.tgz",
-+			"integrity": "sha1-Y1zH1n09SK7A28aYImI/x8M/fTc=",
-+			"dev": true,
-+			"requires": {
-+				"event-stream": "3.1.7",
-+				"gulp-util": "2.2.20",
-+				"streamifier": "0.1.1",
-+				"tar": "0.1.20",
-+				"through2": "0.4.2"
-+			},
-+			"dependencies": {
-+				"ansi-regex": {
-+					"version": "0.2.1",
-+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
-+					"integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk=",
-+					"dev": true
-+				},
-+				"ansi-styles": {
-+					"version": "1.1.0",
-+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz",
-+					"integrity": "sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94=",
-+					"dev": true
-+				},
-+				"chalk": {
-+					"version": "0.5.1",
-+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
-+					"integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=",
-+					"dev": true,
-+					"requires": {
-+						"ansi-styles": "1.1.0",
-+						"escape-string-regexp": "1.0.5",
-+						"has-ansi": "0.1.0",
-+						"strip-ansi": "0.3.0",
-+						"supports-color": "0.2.0"
-+					}
-+				},
-+				"dateformat": {
-+					"version": "1.0.12",
-+					"resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
-+					"integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=",
-+					"dev": true,
-+					"requires": {
-+						"get-stdin": "4.0.1",
-+						"meow": "3.7.0"
-+					}
-+				},
-+				"event-stream": {
-+					"version": "3.1.7",
-+					"resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.1.7.tgz",
-+					"integrity": "sha1-tMVAAS0P4UmEIPPYlGAI22OTw3o=",
-+					"dev": true,
-+					"requires": {
-+						"duplexer": "0.1.1",
-+						"from": "0.1.7",
-+						"map-stream": "0.1.0",
-+						"pause-stream": "0.0.11",
-+						"split": "0.2.10",
-+						"stream-combiner": "0.0.4",
-+						"through": "2.3.8"
-+					}
-+				},
-+				"gulp-util": {
-+					"version": "2.2.20",
-+					"resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-2.2.20.tgz",
-+					"integrity": "sha1-1xRuVyiRC9jwR6awseVJvCLb1kw=",
-+					"dev": true,
-+					"requires": {
-+						"chalk": "0.5.1",
-+						"dateformat": "1.0.12",
-+						"lodash._reinterpolate": "2.4.1",
-+						"lodash.template": "2.4.1",
-+						"minimist": "0.2.0",
-+						"multipipe": "0.1.2",
-+						"through2": "0.5.1",
-+						"vinyl": "0.2.3"
-+					},
-+					"dependencies": {
-+						"through2": {
-+							"version": "0.5.1",
-+							"resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
-+							"integrity": "sha1-390BLrnHAOIyP9M084rGIqs3Lac=",
-+							"dev": true,
-+							"requires": {
-+								"readable-stream": "1.0.34",
-+								"xtend": "3.0.0"
-+							}
-+						}
-+					}
-+				},
-+				"has-ansi": {
-+					"version": "0.1.0",
-+					"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
-+					"integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=",
-+					"dev": true,
-+					"requires": {
-+						"ansi-regex": "0.2.1"
-+					}
-+				},
-+				"isarray": {
-+					"version": "0.0.1",
-+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-+					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-+					"dev": true
-+				},
-+				"lodash._reinterpolate": {
-+					"version": "2.4.1",
-+					"resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz",
-+					"integrity": "sha1-TxInqlqHEfxjL1sHofRgequLMiI=",
-+					"dev": true
-+				},
-+				"lodash.escape": {
-+					"version": "2.4.1",
-+					"resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz",
-+					"integrity": "sha1-LOEsXghNsKV92l5dHu659dF1o7Q=",
-+					"dev": true,
-+					"requires": {
-+						"lodash._escapehtmlchar": "2.4.1",
-+						"lodash._reunescapedhtml": "2.4.1",
-+						"lodash.keys": "2.4.1"
-+					}
-+				},
-+				"lodash.keys": {
-+					"version": "2.4.1",
-+					"resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
-+					"integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
-+					"dev": true,
-+					"requires": {
-+						"lodash._isnative": "2.4.1",
-+						"lodash._shimkeys": "2.4.1",
-+						"lodash.isobject": "2.4.1"
-+					}
-+				},
-+				"lodash.template": {
-+					"version": "2.4.1",
-+					"resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz",
-+					"integrity": "sha1-nmEQB+32KRKal0qzxIuBez4c8g0=",
-+					"dev": true,
-+					"requires": {
-+						"lodash._escapestringchar": "2.4.1",
-+						"lodash._reinterpolate": "2.4.1",
-+						"lodash.defaults": "2.4.1",
-+						"lodash.escape": "2.4.1",
-+						"lodash.keys": "2.4.1",
-+						"lodash.templatesettings": "2.4.1",
-+						"lodash.values": "2.4.1"
-+					}
-+				},
-+				"lodash.templatesettings": {
-+					"version": "2.4.1",
-+					"resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz",
-+					"integrity": "sha1-6nbHXRHrhtTb6JqDiTu4YZKaxpk=",
-+					"dev": true,
-+					"requires": {
-+						"lodash._reinterpolate": "2.4.1",
-+						"lodash.escape": "2.4.1"
-+					}
-+				},
-+				"minimist": {
-+					"version": "0.2.0",
-+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz",
-+					"integrity": "sha1-Tf/lJdriuGTGbC4jxicdev3s784=",
-+					"dev": true
-+				},
-+				"readable-stream": {
-+					"version": "1.0.34",
-+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-+					"integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-+					"dev": true,
-+					"requires": {
-+						"core-util-is": "1.0.2",
-+						"inherits": "2.0.3",
-+						"isarray": "0.0.1",
-+						"string_decoder": "0.10.31"
-+					}
-+				},
-+				"split": {
-+					"version": "0.2.10",
-+					"resolved": "https://registry.npmjs.org/split/-/split-0.2.10.tgz",
-+					"integrity": "sha1-Zwl8YB1pfOE2j0GPBs0gHPBSGlc=",
-+					"dev": true,
-+					"requires": {
-+						"through": "2.3.8"
-+					}
-+				},
-+				"string_decoder": {
-+					"version": "0.10.31",
-+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-+					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-+					"dev": true
-+				},
-+				"strip-ansi": {
-+					"version": "0.3.0",
-+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
-+					"integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=",
-+					"dev": true,
-+					"requires": {
-+						"ansi-regex": "0.2.1"
-+					}
-+				},
-+				"supports-color": {
-+					"version": "0.2.0",
-+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz",
-+					"integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=",
-+					"dev": true
-+				},
-+				"through2": {
-+					"version": "0.4.2",
-+					"resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
-+					"integrity": "sha1-2/WGYDEVHsg1K7bE22SiKSqEC5s=",
-+					"dev": true,
-+					"requires": {
-+						"readable-stream": "1.0.34",
-+						"xtend": "2.1.2"
-+					},
-+					"dependencies": {
-+						"xtend": {
-+							"version": "2.1.2",
-+							"resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
-+							"integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
-+							"dev": true,
-+							"requires": {
-+								"object-keys": "0.4.0"
-+							}
-+						}
-+					}
-+				},
-+				"vinyl": {
-+					"version": "0.2.3",
-+					"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.2.3.tgz",
-+					"integrity": "sha1-vKk4IJWC7FpJrVOKAPofEl5RMlI=",
-+					"dev": true,
-+					"requires": {
-+						"clone-stats": "0.0.1"
-+					}
-+				},
-+				"xtend": {
-+					"version": "3.0.0",
-+					"resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
-+					"integrity": "sha1-XM50B7r2Qsunvs2laBEcST9ZZlo=",
-+					"dev": true
-+				}
-+			}
-+		},
-+		"gulp-util": {
-+			"version": "3.0.8",
-+			"resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz",
-+			"integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=",
-+			"dev": true,
-+			"requires": {
-+				"array-differ": "1.0.0",
-+				"array-uniq": "1.0.3",
-+				"beeper": "1.1.1",
-+				"chalk": "1.1.3",
-+				"dateformat": "2.0.0",
-+				"fancy-log": "1.3.0",
-+				"gulplog": "1.0.0",
-+				"has-gulplog": "0.1.0",
-+				"lodash._reescape": "3.0.0",
-+				"lodash._reevaluate": "3.0.0",
-+				"lodash._reinterpolate": "3.0.0",
-+				"lodash.template": "3.6.2",
-+				"minimist": "1.2.0",
-+				"multipipe": "0.1.2",
-+				"object-assign": "3.0.0",
-+				"replace-ext": "0.0.1",
-+				"through2": "2.0.3",
-+				"vinyl": "0.5.3"
-+			}
-+		},
-+		"gulp-vinyl-zip": {
-+			"version": "1.4.0",
-+			"resolved": "https://registry.npmjs.org/gulp-vinyl-zip/-/gulp-vinyl-zip-1.4.0.tgz",
-+			"integrity": "sha1-VjgvLMtXIxuwR4x4c3zNVylzvuE=",
-+			"dev": true,
-+			"requires": {
-+				"event-stream": "3.3.4",
-+				"queue": "3.1.0",
-+				"through2": "0.6.5",
-+				"vinyl": "0.4.6",
-+				"vinyl-fs": "2.4.4",
-+				"yauzl": "2.8.0",
-+				"yazl": "2.4.2"
-+			},
-+			"dependencies": {
-+				"clone": {
-+					"version": "0.2.0",
-+					"resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
-+					"integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-+					"dev": true
-+				},
-+				"isarray": {
-+					"version": "0.0.1",
-+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-+					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-+					"dev": true
-+				},
-+				"readable-stream": {
-+					"version": "1.0.34",
-+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-+					"integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-+					"dev": true,
-+					"requires": {
-+						"core-util-is": "1.0.2",
-+						"inherits": "2.0.3",
-+						"isarray": "0.0.1",
-+						"string_decoder": "0.10.31"
-+					}
-+				},
-+				"string_decoder": {
-+					"version": "0.10.31",
-+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-+					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-+					"dev": true
-+				},
-+				"through2": {
-+					"version": "0.6.5",
-+					"resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-+					"integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-+					"dev": true,
-+					"requires": {
-+						"readable-stream": "1.0.34",
-+						"xtend": "4.0.1"
-+					}
-+				},
-+				"vinyl": {
-+					"version": "0.4.6",
-+					"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
-+					"integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
-+					"dev": true,
-+					"requires": {
-+						"clone": "0.2.0",
-+						"clone-stats": "0.0.1"
-+					}
-+				}
-+			}
-+		},
-+		"gulplog": {
-+			"version": "1.0.0",
-+			"resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
-+			"integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
-+			"dev": true,
-+			"requires": {
-+				"glogg": "1.0.0"
-+			}
-+		},
-+		"har-schema": {
-+			"version": "1.0.5",
-+			"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
-+			"integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=",
-+			"dev": true
-+		},
-+		"har-validator": {
-+			"version": "2.0.6",
-+			"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
-+			"integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=",
-+			"dev": true,
-+			"requires": {
-+				"chalk": "1.1.3",
-+				"commander": "2.11.0",
-+				"is-my-json-valid": "2.16.0",
-+				"pinkie-promise": "2.0.1"
-+			}
-+		},
-+		"has-ansi": {
-+			"version": "2.0.0",
-+			"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-+			"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-+			"dev": true,
-+			"requires": {
-+				"ansi-regex": "2.1.1"
-+			}
-+		},
-+		"has-gulplog": {
-+			"version": "0.1.0",
-+			"resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
-+			"integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=",
-+			"dev": true,
-+			"requires": {
-+				"sparkles": "1.0.0"
-+			}
-+		},
-+		"hawk": {
-+			"version": "3.1.3",
-+			"resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-+			"integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
-+			"dev": true,
-+			"requires": {
-+				"boom": "2.10.1",
-+				"cryptiles": "2.0.5",
-+				"hoek": "2.16.3",
-+				"sntp": "1.0.9"
-+			}
-+		},
-+		"hoek": {
-+			"version": "2.16.3",
-+			"resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-+			"integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-+			"dev": true
-+		},
-+		"hosted-git-info": {
-+			"version": "2.5.0",
-+			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz",
-+			"integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==",
-+			"dev": true
-+		},
-+		"http-signature": {
-+			"version": "1.1.1",
-+			"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
-+			"integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
-+			"dev": true,
-+			"requires": {
-+				"assert-plus": "0.2.0",
-+				"jsprim": "1.4.0",
-+				"sshpk": "1.13.1"
-+			}
-+		},
-+		"indent-string": {
-+			"version": "2.1.0",
-+			"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-+			"integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
-+			"dev": true,
-+			"requires": {
-+				"repeating": "2.0.1"
-+			}
-+		},
-+		"inflight": {
-+			"version": "1.0.6",
-+			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-+			"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-+			"dev": true,
-+			"requires": {
-+				"once": "1.4.0",
-+				"wrappy": "1.0.2"
-+			}
-+		},
-+		"inherits": {
-+			"version": "2.0.3",
-+			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-+			"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-+			"dev": true
-+		},
-+		"is": {
-+			"version": "3.2.1",
-+			"resolved": "https://registry.npmjs.org/is/-/is-3.2.1.tgz",
-+			"integrity": "sha1-0Kwq1V63sL7JJqUmb2xmKqqD3KU=",
-+			"dev": true
-+		},
-+		"is-arrayish": {
-+			"version": "0.2.1",
-+			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-+			"integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-+			"dev": true
-+		},
-+		"is-buffer": {
-+			"version": "1.1.5",
-+			"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz",
-+			"integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw=",
-+			"dev": true
-+		},
-+		"is-builtin-module": {
-+			"version": "1.0.0",
-+			"resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
-+			"integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
-+			"dev": true,
-+			"requires": {
-+				"builtin-modules": "1.1.1"
-+			}
-+		},
-+		"is-dotfile": {
-+			"version": "1.0.3",
-+			"resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
-+			"integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
-+			"dev": true
-+		},
-+		"is-equal-shallow": {
-+			"version": "0.1.3",
-+			"resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
-+			"integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
-+			"dev": true,
-+			"requires": {
-+				"is-primitive": "2.0.0"
-+			}
-+		},
-+		"is-extendable": {
-+			"version": "0.1.1",
-+			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-+			"integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-+			"dev": true
-+		},
-+		"is-extglob": {
-+			"version": "2.1.1",
-+			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-+			"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-+			"dev": true
-+		},
-+		"is-finite": {
-+			"version": "1.0.2",
-+			"resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
-+			"integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
-+			"dev": true,
-+			"requires": {
-+				"number-is-nan": "1.0.1"
-+			}
-+		},
-+		"is-glob": {
-+			"version": "3.1.0",
-+			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-+			"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-+			"dev": true,
-+			"requires": {
-+				"is-extglob": "2.1.1"
-+			}
-+		},
-+		"is-my-json-valid": {
-+			"version": "2.16.0",
-+			"resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz",
-+			"integrity": "sha1-8Hndm/2uZe4gOKrorLyGqxCeNpM=",
-+			"dev": true,
-+			"requires": {
-+				"generate-function": "2.0.0",
-+				"generate-object-property": "1.2.0",
-+				"jsonpointer": "4.0.1",
-+				"xtend": "4.0.1"
-+			}
-+		},
-+		"is-number": {
-+			"version": "2.1.0",
-+			"resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-+			"integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
-+			"dev": true,
-+			"requires": {
-+				"kind-of": "3.2.2"
-+			}
-+		},
-+		"is-obj": {
-+			"version": "1.0.1",
-+			"resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-+			"integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
-+			"dev": true
-+		},
-+		"is-posix-bracket": {
-+			"version": "0.1.1",
-+			"resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
-+			"integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
-+			"dev": true
-+		},
-+		"is-primitive": {
-+			"version": "2.0.0",
-+			"resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
-+			"integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
-+			"dev": true
-+		},
-+		"is-property": {
-+			"version": "1.0.2",
-+			"resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
-+			"integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=",
-+			"dev": true
-+		},
-+		"is-stream": {
-+			"version": "1.1.0",
-+			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-+			"integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
-+			"dev": true
-+		},
-+		"is-typedarray": {
-+			"version": "1.0.0",
-+			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-+			"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-+			"dev": true
-+		},
-+		"is-utf8": {
-+			"version": "0.2.1",
-+			"resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-+			"integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
-+			"dev": true
-+		},
-+		"is-valid-glob": {
-+			"version": "0.3.0",
-+			"resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz",
-+			"integrity": "sha1-1LVcafUYhvm2XHDWwmItN+KfSP4=",
-+			"dev": true
-+		},
-+		"isarray": {
-+			"version": "1.0.0",
-+			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-+			"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-+			"dev": true
-+		},
-+		"isobject": {
-+			"version": "2.1.0",
-+			"resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-+			"integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-+			"dev": true,
-+			"requires": {
-+				"isarray": "1.0.0"
-+			}
-+		},
-+		"isstream": {
-+			"version": "0.1.2",
-+			"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-+			"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-+			"dev": true
-+		},
-+		"jade": {
-+			"version": "0.26.3",
-+			"resolved": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz",
-+			"integrity": "sha1-jxDXl32NefL2/4YqgbBRPMslaGw=",
-+			"dev": true,
-+			"requires": {
-+				"commander": "0.6.1",
-+				"mkdirp": "0.3.0"
-+			},
-+			"dependencies": {
-+				"commander": {
-+					"version": "0.6.1",
-+					"resolved": "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz",
-+					"integrity": "sha1-+mihT2qUXVTbvlDYzbMyDp47GgY=",
-+					"dev": true
-+				},
-+				"mkdirp": {
-+					"version": "0.3.0",
-+					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz",
-+					"integrity": "sha1-G79asbqCevI1dRQ0kEJkVfSB/h4=",
-+					"dev": true
-+				}
-+			}
-+		},
-+		"jsbn": {
-+			"version": "0.1.1",
-+			"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-+			"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-+			"dev": true,
-+			"optional": true
-+		},
-+		"json-schema": {
-+			"version": "0.2.3",
-+			"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-+			"integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-+			"dev": true
-+		},
-+		"json-stable-stringify": {
-+			"version": "1.0.1",
-+			"resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
-+			"integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
-+			"dev": true,
-+			"requires": {
-+				"jsonify": "0.0.0"
-+			}
-+		},
-+		"json-stringify-safe": {
-+			"version": "5.0.1",
-+			"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-+			"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-+			"dev": true
-+		},
-+		"jsonify": {
-+			"version": "0.0.0",
-+			"resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-+			"integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
-+			"dev": true
-+		},
-+		"jsonpointer": {
-+			"version": "4.0.1",
-+			"resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
-+			"integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",
-+			"dev": true
-+		},
-+		"jsprim": {
-+			"version": "1.4.0",
-+			"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz",
-+			"integrity": "sha1-o7h+QCmNjDgFUtjMdiigu5WiKRg=",
-+			"dev": true,
-+			"requires": {
-+				"assert-plus": "1.0.0",
-+				"extsprintf": "1.0.2",
-+				"json-schema": "0.2.3",
-+				"verror": "1.3.6"
-+			},
-+			"dependencies": {
-+				"assert-plus": {
-+					"version": "1.0.0",
-+					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-+					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-+					"dev": true
-+				}
-+			}
-+		},
-+		"kind-of": {
-+			"version": "3.2.2",
-+			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-+			"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-+			"dev": true,
-+			"requires": {
-+				"is-buffer": "1.1.5"
-+			}
-+		},
-+		"lazystream": {
-+			"version": "1.0.0",
-+			"resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
-+			"integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
-+			"dev": true,
-+			"requires": {
-+				"readable-stream": "2.3.3"
-+			}
-+		},
-+		"load-json-file": {
-+			"version": "1.1.0",
-+			"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-+			"integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-+			"dev": true,
-+			"requires": {
-+				"graceful-fs": "4.1.11",
-+				"parse-json": "2.2.0",
-+				"pify": "2.3.0",
-+				"pinkie-promise": "2.0.1",
-+				"strip-bom": "2.0.0"
-+			}
-+		},
-+		"lodash._basecopy": {
-+			"version": "3.0.1",
-+			"resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
-+			"integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
-+			"dev": true
-+		},
-+		"lodash._basetostring": {
-+			"version": "3.0.1",
-+			"resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
-+			"integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=",
-+			"dev": true
-+		},
-+		"lodash._basevalues": {
-+			"version": "3.0.0",
-+			"resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
-+			"integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=",
-+			"dev": true
-+		},
-+		"lodash._escapehtmlchar": {
-+			"version": "2.4.1",
-+			"resolved": "https://registry.npmjs.org/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz",
-+			"integrity": "sha1-32fDu2t+jh6DGrSL+geVuSr+iZ0=",
-+			"dev": true,
-+			"requires": {
-+				"lodash._htmlescapes": "2.4.1"
-+			}
-+		},
-+		"lodash._escapestringchar": {
-+			"version": "2.4.1",
-+			"resolved": "https://registry.npmjs.org/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz",
-+			"integrity": "sha1-7P4iYYoq3lC/7qQ5N+Ud9m8O23I=",
-+			"dev": true
-+		},
-+		"lodash._getnative": {
-+			"version": "3.9.1",
-+			"resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-+			"integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
-+			"dev": true
-+		},
-+		"lodash._htmlescapes": {
-+			"version": "2.4.1",
-+			"resolved": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz",
-+			"integrity": "sha1-MtFL8IRLbeb4tioFG09nwii2JMs=",
-+			"dev": true
-+		},
-+		"lodash._isiterateecall": {
-+			"version": "3.0.9",
-+			"resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
-+			"integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
-+			"dev": true
-+		},
-+		"lodash._isnative": {
-+			"version": "2.4.1",
-+			"resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz",
-+			"integrity": "sha1-PqZAS3hKe+g2x7V1gOHN95sUgyw=",
-+			"dev": true
-+		},
-+		"lodash._objecttypes": {
-+			"version": "2.4.1",
-+			"resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz",
-+			"integrity": "sha1-fAt/admKH3ZSn4kLDNsbTf7BHBE=",
-+			"dev": true
-+		},
-+		"lodash._reescape": {
-+			"version": "3.0.0",
-+			"resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
-+			"integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=",
-+			"dev": true
-+		},
-+		"lodash._reevaluate": {
-+			"version": "3.0.0",
-+			"resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
-+			"integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=",
-+			"dev": true
-+		},
-+		"lodash._reinterpolate": {
-+			"version": "3.0.0",
-+			"resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-+			"integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
-+			"dev": true
-+		},
-+		"lodash._reunescapedhtml": {
-+			"version": "2.4.1",
-+			"resolved": "https://registry.npmjs.org/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz",
-+			"integrity": "sha1-dHxPxAED6zu4oJduVx96JlnpO6c=",
-+			"dev": true,
-+			"requires": {
-+				"lodash._htmlescapes": "2.4.1",
-+				"lodash.keys": "2.4.1"
-+			},
-+			"dependencies": {
-+				"lodash.keys": {
-+					"version": "2.4.1",
-+					"resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
-+					"integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
-+					"dev": true,
-+					"requires": {
-+						"lodash._isnative": "2.4.1",
-+						"lodash._shimkeys": "2.4.1",
-+						"lodash.isobject": "2.4.1"
-+					}
-+				}
-+			}
-+		},
-+		"lodash._root": {
-+			"version": "3.0.1",
-+			"resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
-+			"integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=",
-+			"dev": true
-+		},
-+		"lodash._shimkeys": {
-+			"version": "2.4.1",
-+			"resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz",
-+			"integrity": "sha1-bpzJZm/wgfC1psl4uD4kLmlJ0gM=",
-+			"dev": true,
-+			"requires": {
-+				"lodash._objecttypes": "2.4.1"
-+			}
-+		},
-+		"lodash.defaults": {
-+			"version": "2.4.1",
-+			"resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
-+			"integrity": "sha1-p+iIXwXmiFEUS24SqPNngCa8TFQ=",
-+			"dev": true,
-+			"requires": {
-+				"lodash._objecttypes": "2.4.1",
-+				"lodash.keys": "2.4.1"
-+			},
-+			"dependencies": {
-+				"lodash.keys": {
-+					"version": "2.4.1",
-+					"resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
-+					"integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
-+					"dev": true,
-+					"requires": {
-+						"lodash._isnative": "2.4.1",
-+						"lodash._shimkeys": "2.4.1",
-+						"lodash.isobject": "2.4.1"
-+					}
-+				}
-+			}
-+		},
-+		"lodash.escape": {
-+			"version": "3.2.0",
-+			"resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
-+			"integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=",
-+			"dev": true,
-+			"requires": {
-+				"lodash._root": "3.0.1"
-+			}
-+		},
-+		"lodash.isarguments": {
-+			"version": "3.1.0",
-+			"resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
-+			"integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
-+			"dev": true
-+		},
-+		"lodash.isarray": {
-+			"version": "3.0.4",
-+			"resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-+			"integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
-+			"dev": true
-+		},
-+		"lodash.isequal": {
-+			"version": "4.5.0",
-+			"resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-+			"integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
-+			"dev": true
-+		},
-+		"lodash.isobject": {
-+			"version": "2.4.1",
-+			"resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
-+			"integrity": "sha1-Wi5H/mmVPx7mMafrof5k0tBlWPU=",
-+			"dev": true,
-+			"requires": {
-+				"lodash._objecttypes": "2.4.1"
-+			}
-+		},
-+		"lodash.keys": {
-+			"version": "3.1.2",
-+			"resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
-+			"integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
-+			"dev": true,
-+			"requires": {
-+				"lodash._getnative": "3.9.1",
-+				"lodash.isarguments": "3.1.0",
-+				"lodash.isarray": "3.0.4"
-+			}
-+		},
-+		"lodash.restparam": {
-+			"version": "3.6.1",
-+			"resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
-+			"integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
-+			"dev": true
-+		},
-+		"lodash.template": {
-+			"version": "3.6.2",
-+			"resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
-+			"integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=",
-+			"dev": true,
-+			"requires": {
-+				"lodash._basecopy": "3.0.1",
-+				"lodash._basetostring": "3.0.1",
-+				"lodash._basevalues": "3.0.0",
-+				"lodash._isiterateecall": "3.0.9",
-+				"lodash._reinterpolate": "3.0.0",
-+				"lodash.escape": "3.2.0",
-+				"lodash.keys": "3.1.2",
-+				"lodash.restparam": "3.6.1",
-+				"lodash.templatesettings": "3.1.1"
-+			}
-+		},
-+		"lodash.templatesettings": {
-+			"version": "3.1.1",
-+			"resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz",
-+			"integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=",
-+			"dev": true,
-+			"requires": {
-+				"lodash._reinterpolate": "3.0.0",
-+				"lodash.escape": "3.2.0"
-+			}
-+		},
-+		"lodash.values": {
-+			"version": "2.4.1",
-+			"resolved": "https://registry.npmjs.org/lodash.values/-/lodash.values-2.4.1.tgz",
-+			"integrity": "sha1-q/UUQ2s8twUAFieXjLzzCxKA7qQ=",
-+			"dev": true,
-+			"requires": {
-+				"lodash.keys": "2.4.1"
-+			},
-+			"dependencies": {
-+				"lodash.keys": {
-+					"version": "2.4.1",
-+					"resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
-+					"integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
-+					"dev": true,
-+					"requires": {
-+						"lodash._isnative": "2.4.1",
-+						"lodash._shimkeys": "2.4.1",
-+						"lodash.isobject": "2.4.1"
-+					}
-+				}
-+			}
-+		},
-+		"loud-rejection": {
-+			"version": "1.6.0",
-+			"resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
-+			"integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
-+			"dev": true,
-+			"requires": {
-+				"currently-unhandled": "0.4.1",
-+				"signal-exit": "3.0.2"
-+			}
-+		},
-+		"lru-cache": {
-+			"version": "2.7.3",
-+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
-+			"integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=",
-+			"dev": true
-+		},
-+		"map-obj": {
-+			"version": "1.0.1",
-+			"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-+			"integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-+			"dev": true
-+		},
-+		"map-stream": {
-+			"version": "0.1.0",
-+			"resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
-+			"integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=",
-+			"dev": true
-+		},
-+		"meow": {
-+			"version": "3.7.0",
-+			"resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-+			"integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
-+			"dev": true,
-+			"requires": {
-+				"camelcase-keys": "2.1.0",
-+				"decamelize": "1.2.0",
-+				"loud-rejection": "1.6.0",
-+				"map-obj": "1.0.1",
-+				"minimist": "1.2.0",
-+				"normalize-package-data": "2.4.0",
-+				"object-assign": "4.1.1",
-+				"read-pkg-up": "1.0.1",
-+				"redent": "1.0.0",
-+				"trim-newlines": "1.0.0"
-+			},
-+			"dependencies": {
-+				"object-assign": {
-+					"version": "4.1.1",
-+					"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-+					"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-+					"dev": true
-+				}
-+			}
-+		},
-+		"merge-stream": {
-+			"version": "1.0.1",
-+			"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz",
-+			"integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=",
-+			"dev": true,
-+			"requires": {
-+				"readable-stream": "2.3.3"
-+			}
-+		},
-+		"micromatch": {
-+			"version": "2.3.11",
-+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-+			"integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-+			"dev": true,
-+			"requires": {
-+				"arr-diff": "2.0.0",
-+				"array-unique": "0.2.1",
-+				"braces": "1.8.5",
-+				"expand-brackets": "0.1.5",
-+				"extglob": "0.3.2",
-+				"filename-regex": "2.0.1",
-+				"is-extglob": "1.0.0",
-+				"is-glob": "2.0.1",
-+				"kind-of": "3.2.2",
-+				"normalize-path": "2.1.1",
-+				"object.omit": "2.0.1",
-+				"parse-glob": "3.0.4",
-+				"regex-cache": "0.4.3"
-+			},
-+			"dependencies": {
-+				"is-extglob": {
-+					"version": "1.0.0",
-+					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-+					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-+					"dev": true
-+				},
-+				"is-glob": {
-+					"version": "2.0.1",
-+					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-+					"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-+					"dev": true,
-+					"requires": {
-+						"is-extglob": "1.0.0"
-+					}
-+				}
-+			}
-+		},
-+		"mime-db": {
-+			"version": "1.27.0",
-+			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz",
-+			"integrity": "sha1-gg9XIpa70g7CXtVeW13oaeVDbrE=",
-+			"dev": true
-+		},
-+		"mime-types": {
-+			"version": "2.1.15",
-+			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz",
-+			"integrity": "sha1-pOv1BkCUVpI3uM9wBGd20J/JKu0=",
-+			"dev": true,
-+			"requires": {
-+				"mime-db": "1.27.0"
-+			}
-+		},
-+		"minimatch": {
-+			"version": "3.0.4",
-+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-+			"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-+			"dev": true,
-+			"requires": {
-+				"brace-expansion": "1.1.8"
-+			}
-+		},
-+		"minimist": {
-+			"version": "1.2.0",
-+			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-+			"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-+			"dev": true
-+		},
-+		"mkdirp": {
-+			"version": "0.5.1",
-+			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-+			"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-+			"dev": true,
-+			"requires": {
-+				"minimist": "0.0.8"
-+			},
-+			"dependencies": {
-+				"minimist": {
-+					"version": "0.0.8",
-+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-+					"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-+					"dev": true
-+				}
-+			}
-+		},
-+		"mocha": {
-+			"version": "2.5.3",
-+			"resolved": "https://registry.npmjs.org/mocha/-/mocha-2.5.3.tgz",
-+			"integrity": "sha1-FhvlvetJZ3HrmzV0UFC2IrWu/Fg=",
-+			"dev": true,
-+			"requires": {
-+				"commander": "2.3.0",
-+				"debug": "2.2.0",
-+				"diff": "1.4.0",
-+				"escape-string-regexp": "1.0.2",
-+				"glob": "3.2.11",
-+				"growl": "1.9.2",
-+				"jade": "0.26.3",
-+				"mkdirp": "0.5.1",
-+				"supports-color": "1.2.0",
-+				"to-iso-string": "0.0.2"
-+			},
-+			"dependencies": {
-+				"commander": {
-+					"version": "2.3.0",
-+					"resolved": "https://registry.npmjs.org/commander/-/commander-2.3.0.tgz",
-+					"integrity": "sha1-/UMOiJgy7DU7ms0d4hfBHLPu+HM=",
-+					"dev": true
-+				},
-+				"escape-string-regexp": {
-+					"version": "1.0.2",
-+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz",
-+					"integrity": "sha1-Tbwv5nTnGUnK8/smlc5/LcHZqNE=",
-+					"dev": true
-+				},
-+				"glob": {
-+					"version": "3.2.11",
-+					"resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
-+					"integrity": "sha1-Spc/Y1uRkPcV0QmH1cAP0oFevj0=",
-+					"dev": true,
-+					"requires": {
-+						"inherits": "2.0.3",
-+						"minimatch": "0.3.0"
-+					}
-+				},
-+				"minimatch": {
-+					"version": "0.3.0",
-+					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
-+					"integrity": "sha1-J12O2qxPG7MyZHIInnlJyDlGmd0=",
-+					"dev": true,
-+					"requires": {
-+						"lru-cache": "2.7.3",
-+						"sigmund": "1.0.1"
-+					}
-+				},
-+				"supports-color": {
-+					"version": "1.2.0",
-+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.2.0.tgz",
-+					"integrity": "sha1-/x7R5hFp0Gs88tWI4YixjYhH4X4=",
-+					"dev": true
-+				}
-+			}
-+		},
-+		"ms": {
-+			"version": "0.7.1",
-+			"resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-+			"integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
-+			"dev": true
-+		},
-+		"multimatch": {
-+			"version": "2.1.0",
-+			"resolved": "https://registry.npmjs.org/multimatch/-/multimatch-2.1.0.tgz",
-+			"integrity": "sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=",
-+			"dev": true,
-+			"requires": {
-+				"array-differ": "1.0.0",
-+				"array-union": "1.0.2",
-+				"arrify": "1.0.1",
-+				"minimatch": "3.0.4"
-+			}
-+		},
-+		"multipipe": {
-+			"version": "0.1.2",
-+			"resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
-+			"integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=",
-+			"dev": true,
-+			"requires": {
-+				"duplexer2": "0.0.2"
-+			}
-+		},
-+		"natives": {
-+			"version": "1.1.0",
-+			"resolved": "https://registry.npmjs.org/natives/-/natives-1.1.0.tgz",
-+			"integrity": "sha1-6f+EFBimsux6SV6TmYT3jxY+bjE=",
-+			"dev": true
-+		},
-+		"node.extend": {
-+			"version": "1.1.6",
-+			"resolved": "https://registry.npmjs.org/node.extend/-/node.extend-1.1.6.tgz",
-+			"integrity": "sha1-p7iCyC1sk6SGOlUEvV3o7IYli5Y=",
-+			"dev": true,
-+			"requires": {
-+				"is": "3.2.1"
-+			}
-+		},
-+		"normalize-package-data": {
-+			"version": "2.4.0",
-+			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-+			"integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
-+			"dev": true,
-+			"requires": {
-+				"hosted-git-info": "2.5.0",
-+				"is-builtin-module": "1.0.0",
-+				"semver": "5.3.0",
-+				"validate-npm-package-license": "3.0.1"
-+			}
-+		},
-+		"normalize-path": {
-+			"version": "2.1.1",
-+			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-+			"integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-+			"dev": true,
-+			"requires": {
-+				"remove-trailing-separator": "1.0.2"
-+			}
-+		},
-+		"number-is-nan": {
-+			"version": "1.0.1",
-+			"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-+			"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-+			"dev": true
-+		},
-+		"oauth-sign": {
-+			"version": "0.8.2",
-+			"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-+			"integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
-+			"dev": true
-+		},
-+		"object-assign": {
-+			"version": "3.0.0",
-+			"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
-+			"integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=",
-+			"dev": true
-+		},
-+		"object-keys": {
-+			"version": "0.4.0",
-+			"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
-+			"integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=",
-+			"dev": true
-+		},
-+		"object.omit": {
-+			"version": "2.0.1",
-+			"resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
-+			"integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
-+			"dev": true,
-+			"requires": {
-+				"for-own": "0.1.5",
-+				"is-extendable": "0.1.1"
-+			}
-+		},
-+		"once": {
-+			"version": "1.4.0",
-+			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-+			"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-+			"dev": true,
-+			"requires": {
-+				"wrappy": "1.0.2"
-+			}
-+		},
-+		"ordered-read-streams": {
-+			"version": "0.3.0",
-+			"resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz",
-+			"integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=",
-+			"dev": true,
-+			"requires": {
-+				"is-stream": "1.1.0",
-+				"readable-stream": "2.3.3"
-+			}
-+		},
-+		"parse-glob": {
-+			"version": "3.0.4",
-+			"resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
-+			"integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
-+			"dev": true,
-+			"requires": {
-+				"glob-base": "0.3.0",
-+				"is-dotfile": "1.0.3",
-+				"is-extglob": "1.0.0",
-+				"is-glob": "2.0.1"
-+			},
-+			"dependencies": {
-+				"is-extglob": {
-+					"version": "1.0.0",
-+					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-+					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-+					"dev": true
-+				},
-+				"is-glob": {
-+					"version": "2.0.1",
-+					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-+					"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-+					"dev": true,
-+					"requires": {
-+						"is-extglob": "1.0.0"
-+					}
-+				}
-+			}
-+		},
-+		"parse-json": {
-+			"version": "2.2.0",
-+			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-+			"integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-+			"dev": true,
-+			"requires": {
-+				"error-ex": "1.3.1"
-+			}
-+		},
-+		"path-dirname": {
-+			"version": "1.0.2",
-+			"resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-+			"integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
-+			"dev": true
-+		},
-+		"path-exists": {
-+			"version": "2.1.0",
-+			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-+			"integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-+			"dev": true,
-+			"requires": {
-+				"pinkie-promise": "2.0.1"
-+			}
-+		},
-+		"path-is-absolute": {
-+			"version": "1.0.1",
-+			"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-+			"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-+			"dev": true
-+		},
-+		"path-type": {
-+			"version": "1.1.0",
-+			"resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-+			"integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-+			"dev": true,
-+			"requires": {
-+				"graceful-fs": "4.1.11",
-+				"pify": "2.3.0",
-+				"pinkie-promise": "2.0.1"
-+			}
-+		},
-+		"pause-stream": {
-+			"version": "0.0.11",
-+			"resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
-+			"integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
-+			"dev": true,
-+			"requires": {
-+				"through": "2.3.8"
-+			}
-+		},
-+		"pend": {
-+			"version": "1.2.0",
-+			"resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-+			"integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
-+			"dev": true
-+		},
-+		"performance-now": {
-+			"version": "0.2.0",
-+			"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
-+			"integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=",
-+			"dev": true
-+		},
-+		"pify": {
-+			"version": "2.3.0",
-+			"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-+			"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-+			"dev": true
-+		},
-+		"pinkie": {
-+			"version": "2.0.4",
-+			"resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-+			"integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-+			"dev": true
-+		},
-+		"pinkie-promise": {
-+			"version": "2.0.1",
-+			"resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-+			"integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-+			"dev": true,
-+			"requires": {
-+				"pinkie": "2.0.4"
-+			}
-+		},
-+		"preserve": {
-+			"version": "0.2.0",
-+			"resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
-+			"integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
-+			"dev": true
-+		},
-+		"process-nextick-args": {
-+			"version": "1.0.7",
-+			"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-+			"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
-+			"dev": true
-+		},
-+		"punycode": {
-+			"version": "1.4.1",
-+			"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-+			"integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-+			"dev": true
-+		},
-+		"qs": {
-+			"version": "6.3.2",
-+			"resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz",
-+			"integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw=",
-+			"dev": true
-+		},
-+		"queue": {
-+			"version": "3.1.0",
-+			"resolved": "https://registry.npmjs.org/queue/-/queue-3.1.0.tgz",
-+			"integrity": "sha1-bEnQHwCeIlZ4h4nyv/rGuLmZBYU=",
-+			"dev": true,
-+			"requires": {
-+				"inherits": "2.0.3"
-+			}
-+		},
-+		"randomatic": {
-+			"version": "1.1.7",
-+			"resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
-+			"integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==",
-+			"dev": true,
-+			"requires": {
-+				"is-number": "3.0.0",
-+				"kind-of": "4.0.0"
-+			},
-+			"dependencies": {
-+				"is-number": {
-+					"version": "3.0.0",
-+					"resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-+					"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-+					"dev": true,
-+					"requires": {
-+						"kind-of": "3.2.2"
-+					},
-+					"dependencies": {
-+						"kind-of": {
-+							"version": "3.2.2",
-+							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-+							"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-+							"dev": true,
-+							"requires": {
-+								"is-buffer": "1.1.5"
-+							}
-+						}
-+					}
-+				},
-+				"kind-of": {
-+					"version": "4.0.0",
-+					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-+					"integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-+					"dev": true,
-+					"requires": {
-+						"is-buffer": "1.1.5"
-+					}
-+				}
-+			}
-+		},
-+		"read-pkg": {
-+			"version": "1.1.0",
-+			"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-+			"integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-+			"dev": true,
-+			"requires": {
-+				"load-json-file": "1.1.0",
-+				"normalize-package-data": "2.4.0",
-+				"path-type": "1.1.0"
-+			}
-+		},
-+		"read-pkg-up": {
-+			"version": "1.0.1",
-+			"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-+			"integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-+			"dev": true,
-+			"requires": {
-+				"find-up": "1.1.2",
-+				"read-pkg": "1.1.0"
-+			}
-+		},
-+		"readable-stream": {
-+			"version": "2.3.3",
-+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-+			"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-+			"dev": true,
-+			"requires": {
-+				"core-util-is": "1.0.2",
-+				"inherits": "2.0.3",
-+				"isarray": "1.0.0",
-+				"process-nextick-args": "1.0.7",
-+				"safe-buffer": "5.1.1",
-+				"string_decoder": "1.0.3",
-+				"util-deprecate": "1.0.2"
-+			}
-+		},
-+		"redent": {
-+			"version": "1.0.0",
-+			"resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-+			"integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
-+			"dev": true,
-+			"requires": {
-+				"indent-string": "2.1.0",
-+				"strip-indent": "1.0.1"
-+			}
-+		},
-+		"regex-cache": {
-+			"version": "0.4.3",
-+			"resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz",
-+			"integrity": "sha1-mxpsNdTQ3871cRrmUejp09cRQUU=",
-+			"dev": true,
-+			"requires": {
-+				"is-equal-shallow": "0.1.3",
-+				"is-primitive": "2.0.0"
-+			}
-+		},
-+		"remove-trailing-separator": {
-+			"version": "1.0.2",
-+			"resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz",
-+			"integrity": "sha1-abBi2XhyetFNxrVrpKt3L9jXBRE=",
-+			"dev": true
-+		},
-+		"repeat-element": {
-+			"version": "1.1.2",
-+			"resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz",
-+			"integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=",
-+			"dev": true
-+		},
-+		"repeat-string": {
-+			"version": "1.6.1",
-+			"resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-+			"integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
-+			"dev": true
-+		},
-+		"repeating": {
-+			"version": "2.0.1",
-+			"resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
-+			"integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
-+			"dev": true,
-+			"requires": {
-+				"is-finite": "1.0.2"
-+			}
-+		},
-+		"replace-ext": {
-+			"version": "0.0.1",
-+			"resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
-+			"integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
-+			"dev": true
-+		},
-+		"request": {
-+			"version": "2.81.0",
-+			"resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
-+			"integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
-+			"dev": true,
-+			"requires": {
-+				"aws-sign2": "0.6.0",
-+				"aws4": "1.6.0",
-+				"caseless": "0.12.0",
-+				"combined-stream": "1.0.5",
-+				"extend": "3.0.1",
-+				"forever-agent": "0.6.1",
-+				"form-data": "2.1.4",
-+				"har-validator": "4.2.1",
-+				"hawk": "3.1.3",
-+				"http-signature": "1.1.1",
-+				"is-typedarray": "1.0.0",
-+				"isstream": "0.1.2",
-+				"json-stringify-safe": "5.0.1",
-+				"mime-types": "2.1.15",
-+				"oauth-sign": "0.8.2",
-+				"performance-now": "0.2.0",
-+				"qs": "6.4.0",
-+				"safe-buffer": "5.1.1",
-+				"stringstream": "0.0.5",
-+				"tough-cookie": "2.3.2",
-+				"tunnel-agent": "0.6.0",
-+				"uuid": "3.1.0"
-+			},
-+			"dependencies": {
-+				"caseless": {
-+					"version": "0.12.0",
-+					"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-+					"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-+					"dev": true
-+				},
-+				"har-validator": {
-+					"version": "4.2.1",
-+					"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
-+					"integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
-+					"dev": true,
-+					"requires": {
-+						"ajv": "4.11.8",
-+						"har-schema": "1.0.5"
-+					}
-+				},
-+				"qs": {
-+					"version": "6.4.0",
-+					"resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
-+					"integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
-+					"dev": true
-+				},
-+				"tunnel-agent": {
-+					"version": "0.6.0",
-+					"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-+					"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-+					"dev": true,
-+					"requires": {
-+						"safe-buffer": "5.1.1"
-+					}
-+				}
-+			}
-+		},
-+		"rimraf": {
-+			"version": "2.6.1",
-+			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
-+			"integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=",
-+			"dev": true,
-+			"requires": {
-+				"glob": "7.1.2"
-+			},
-+			"dependencies": {
-+				"glob": {
-+					"version": "7.1.2",
-+					"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+					"integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+					"dev": true,
-+					"requires": {
-+						"fs.realpath": "1.0.0",
-+						"inflight": "1.0.6",
-+						"inherits": "2.0.3",
-+						"minimatch": "3.0.4",
-+						"once": "1.4.0",
-+						"path-is-absolute": "1.0.1"
-+					}
-+				}
-+			}
-+		},
-+		"safe-buffer": {
-+			"version": "5.1.1",
-+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-+			"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
-+			"dev": true
-+		},
-+		"semver": {
-+			"version": "5.3.0",
-+			"resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-+			"integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
-+			"dev": true
-+		},
-+		"sigmund": {
-+			"version": "1.0.1",
-+			"resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
-+			"integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=",
-+			"dev": true
-+		},
-+		"signal-exit": {
-+			"version": "3.0.2",
-+			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-+			"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
-+			"dev": true
-+		},
-+		"sntp": {
-+			"version": "1.0.9",
-+			"resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
-+			"integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
-+			"dev": true,
-+			"requires": {
-+				"hoek": "2.16.3"
-+			}
-+		},
-+		"source-map": {
-+			"version": "0.1.32",
-+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz",
-+			"integrity": "sha1-yLbBZ3l7pHQKjqMyUhYv8IWRsmY=",
-+			"dev": true,
-+			"requires": {
-+				"amdefine": "1.0.1"
-+			}
-+		},
-+		"source-map-support": {
-+			"version": "0.3.3",
-+			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.3.3.tgz",
-+			"integrity": "sha1-NJAJd9W6PwfHdX7nLnO7GptTdU8=",
-+			"dev": true,
-+			"requires": {
-+				"source-map": "0.1.32"
-+			}
-+		},
-+		"sparkles": {
-+			"version": "1.0.0",
-+			"resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz",
-+			"integrity": "sha1-Gsu/tZJDbRC76PeFt8xvgoFQEsM=",
-+			"dev": true
-+		},
-+		"spdx-correct": {
-+			"version": "1.0.2",
-+			"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
-+			"integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=",
-+			"dev": true,
-+			"requires": {
-+				"spdx-license-ids": "1.2.2"
-+			}
-+		},
-+		"spdx-expression-parse": {
-+			"version": "1.0.4",
-+			"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz",
-+			"integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=",
-+			"dev": true
-+		},
-+		"spdx-license-ids": {
-+			"version": "1.2.2",
-+			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz",
-+			"integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=",
-+			"dev": true
-+		},
-+		"split": {
-+			"version": "0.3.3",
-+			"resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
-+			"integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=",
-+			"dev": true,
-+			"requires": {
-+				"through": "2.3.8"
-+			}
-+		},
-+		"sshpk": {
-+			"version": "1.13.1",
-+			"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
-+			"integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
-+			"dev": true,
-+			"requires": {
-+				"asn1": "0.2.3",
-+				"assert-plus": "1.0.0",
-+				"bcrypt-pbkdf": "1.0.1",
-+				"dashdash": "1.14.1",
-+				"ecc-jsbn": "0.1.1",
-+				"getpass": "0.1.7",
-+				"jsbn": "0.1.1",
-+				"tweetnacl": "0.14.5"
-+			},
-+			"dependencies": {
-+				"assert-plus": {
-+					"version": "1.0.0",
-+					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-+					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-+					"dev": true
-+				}
-+			}
-+		},
-+		"stat-mode": {
-+			"version": "0.2.2",
-+			"resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-0.2.2.tgz",
-+			"integrity": "sha1-5sgLYjEj19gM8TLOU480YokHJQI=",
-+			"dev": true
-+		},
-+		"stream-combiner": {
-+			"version": "0.0.4",
-+			"resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
-+			"integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=",
-+			"dev": true,
-+			"requires": {
-+				"duplexer": "0.1.1"
-+			}
-+		},
-+		"stream-shift": {
-+			"version": "1.0.0",
-+			"resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
-+			"integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
-+			"dev": true
-+		},
-+		"streamfilter": {
-+			"version": "1.0.5",
-+			"resolved": "https://registry.npmjs.org/streamfilter/-/streamfilter-1.0.5.tgz",
-+			"integrity": "sha1-h1BxEb644phFFxe1Ec/tjwAqv1M=",
-+			"dev": true,
-+			"requires": {
-+				"readable-stream": "2.3.3"
-+			}
-+		},
-+		"streamifier": {
-+			"version": "0.1.1",
-+			"resolved": "https://registry.npmjs.org/streamifier/-/streamifier-0.1.1.tgz",
-+			"integrity": "sha1-l+mNj6TRBdYqJpHR3AfoINuN/E8=",
-+			"dev": true
-+		},
-+		"string_decoder": {
-+			"version": "1.0.3",
-+			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-+			"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-+			"dev": true,
-+			"requires": {
-+				"safe-buffer": "5.1.1"
-+			}
-+		},
-+		"stringstream": {
-+			"version": "0.0.5",
-+			"resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-+			"integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
-+			"dev": true
-+		},
-+		"strip-ansi": {
-+			"version": "3.0.1",
-+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-+			"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-+			"dev": true,
-+			"requires": {
-+				"ansi-regex": "2.1.1"
-+			}
-+		},
-+		"strip-bom": {
-+			"version": "2.0.0",
-+			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-+			"integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-+			"dev": true,
-+			"requires": {
-+				"is-utf8": "0.2.1"
-+			}
-+		},
-+		"strip-bom-stream": {
-+			"version": "1.0.0",
-+			"resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz",
-+			"integrity": "sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=",
-+			"dev": true,
-+			"requires": {
-+				"first-chunk-stream": "1.0.0",
-+				"strip-bom": "2.0.0"
-+			}
-+		},
-+		"strip-indent": {
-+			"version": "1.0.1",
-+			"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
-+			"integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
-+			"dev": true,
-+			"requires": {
-+				"get-stdin": "4.0.1"
-+			}
-+		},
-+		"supports-color": {
-+			"version": "2.0.0",
-+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-+			"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-+			"dev": true
-+		},
-+		"tar": {
-+			"version": "0.1.20",
-+			"resolved": "https://registry.npmjs.org/tar/-/tar-0.1.20.tgz",
-+			"integrity": "sha1-QpQLrltfIsdEg2mRJvnz8nRJyxM=",
-+			"dev": true,
-+			"requires": {
-+				"block-stream": "0.0.9",
-+				"fstream": "0.1.31",
-+				"inherits": "2.0.3"
-+			}
-+		},
-+		"through": {
-+			"version": "2.3.8",
-+			"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-+			"integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-+			"dev": true
-+		},
-+		"through2": {
-+			"version": "2.0.3",
-+			"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
-+			"integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
-+			"dev": true,
-+			"requires": {
-+				"readable-stream": "2.3.3",
-+				"xtend": "4.0.1"
-+			}
-+		},
-+		"through2-filter": {
-+			"version": "2.0.0",
-+			"resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz",
-+			"integrity": "sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=",
-+			"dev": true,
-+			"requires": {
-+				"through2": "2.0.3",
-+				"xtend": "4.0.1"
-+			}
-+		},
-+		"time-stamp": {
-+			"version": "1.1.0",
-+			"resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
-+			"integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
-+			"dev": true
-+		},
-+		"to-absolute-glob": {
-+			"version": "0.1.1",
-+			"resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz",
-+			"integrity": "sha1-HN+kcqnvUMI57maZm2YsoOs5k38=",
-+			"dev": true,
-+			"requires": {
-+				"extend-shallow": "2.0.1"
-+			}
-+		},
-+		"to-iso-string": {
-+			"version": "0.0.2",
-+			"resolved": "https://registry.npmjs.org/to-iso-string/-/to-iso-string-0.0.2.tgz",
-+			"integrity": "sha1-TcGeZk38y+Jb2NtQiwDG2hWCVdE=",
-+			"dev": true
-+		},
-+		"tough-cookie": {
-+			"version": "2.3.2",
-+			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
-+			"integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=",
-+			"dev": true,
-+			"requires": {
-+				"punycode": "1.4.1"
-+			}
-+		},
-+		"trim-newlines": {
-+			"version": "1.0.0",
-+			"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-+			"integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
-+			"dev": true
-+		},
-+		"tunnel-agent": {
-+			"version": "0.4.3",
-+			"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-+			"integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
-+			"dev": true
-+		},
-+		"tweetnacl": {
-+			"version": "0.14.5",
-+			"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-+			"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-+			"dev": true,
-+			"optional": true
-+		},
-+		"unique-stream": {
-+			"version": "2.2.1",
-+			"resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.1.tgz",
-+			"integrity": "sha1-WqADz76Uxf+GbE59ZouxxNuts2k=",
-+			"dev": true,
-+			"requires": {
-+				"json-stable-stringify": "1.0.1",
-+				"through2-filter": "2.0.0"
-+			}
-+		},
-+		"util-deprecate": {
-+			"version": "1.0.2",
-+			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-+			"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-+			"dev": true
-+		},
-+		"uuid": {
-+			"version": "3.1.0",
-+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-+			"integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
-+			"dev": true
-+		},
-+		"vali-date": {
-+			"version": "1.0.0",
-+			"resolved": "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz",
-+			"integrity": "sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY=",
-+			"dev": true
-+		},
-+		"validate-npm-package-license": {
-+			"version": "3.0.1",
-+			"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
-+			"integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=",
-+			"dev": true,
-+			"requires": {
-+				"spdx-correct": "1.0.2",
-+				"spdx-expression-parse": "1.0.4"
-+			}
-+		},
-+		"verror": {
-+			"version": "1.3.6",
-+			"resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz",
-+			"integrity": "sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw=",
-+			"dev": true,
-+			"requires": {
-+				"extsprintf": "1.0.2"
-+			}
-+		},
-+		"vinyl": {
-+			"version": "0.5.3",
-+			"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
-+			"integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=",
-+			"dev": true,
-+			"requires": {
-+				"clone": "1.0.2",
-+				"clone-stats": "0.0.1",
-+				"replace-ext": "0.0.1"
-+			}
-+		},
-+		"vinyl-fs": {
-+			"version": "2.4.4",
-+			"resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz",
-+			"integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=",
-+			"dev": true,
-+			"requires": {
-+				"duplexify": "3.5.0",
-+				"glob-stream": "5.3.5",
-+				"graceful-fs": "4.1.11",
-+				"gulp-sourcemaps": "1.6.0",
-+				"is-valid-glob": "0.3.0",
-+				"lazystream": "1.0.0",
-+				"lodash.isequal": "4.5.0",
-+				"merge-stream": "1.0.1",
-+				"mkdirp": "0.5.1",
-+				"object-assign": "4.1.1",
-+				"readable-stream": "2.3.3",
-+				"strip-bom": "2.0.0",
-+				"strip-bom-stream": "1.0.0",
-+				"through2": "2.0.3",
-+				"through2-filter": "2.0.0",
-+				"vali-date": "1.0.0",
-+				"vinyl": "1.2.0"
-+			},
-+			"dependencies": {
-+				"object-assign": {
-+					"version": "4.1.1",
-+					"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-+					"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-+					"dev": true
-+				},
-+				"vinyl": {
-+					"version": "1.2.0",
-+					"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
-+					"integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
-+					"dev": true,
-+					"requires": {
-+						"clone": "1.0.2",
-+						"clone-stats": "0.0.1",
-+						"replace-ext": "0.0.1"
-+					}
-+				}
-+			}
-+		},
-+		"vinyl-source-stream": {
-+			"version": "1.1.0",
-+			"resolved": "https://registry.npmjs.org/vinyl-source-stream/-/vinyl-source-stream-1.1.0.tgz",
-+			"integrity": "sha1-RMvlEIIFJ53rDFZTwJSiiHk4sas=",
-+			"dev": true,
-+			"requires": {
-+				"through2": "0.6.5",
-+				"vinyl": "0.4.6"
-+			},
-+			"dependencies": {
-+				"clone": {
-+					"version": "0.2.0",
-+					"resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
-+					"integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-+					"dev": true
-+				},
-+				"isarray": {
-+					"version": "0.0.1",
-+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-+					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-+					"dev": true
-+				},
-+				"readable-stream": {
-+					"version": "1.0.34",
-+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-+					"integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-+					"dev": true,
-+					"requires": {
-+						"core-util-is": "1.0.2",
-+						"inherits": "2.0.3",
-+						"isarray": "0.0.1",
-+						"string_decoder": "0.10.31"
-+					}
-+				},
-+				"string_decoder": {
-+					"version": "0.10.31",
-+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-+					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-+					"dev": true
-+				},
-+				"through2": {
-+					"version": "0.6.5",
-+					"resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-+					"integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-+					"dev": true,
-+					"requires": {
-+						"readable-stream": "1.0.34",
-+						"xtend": "4.0.1"
-+					}
-+				},
-+				"vinyl": {
-+					"version": "0.4.6",
-+					"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
-+					"integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
-+					"dev": true,
-+					"requires": {
-+						"clone": "0.2.0",
-+						"clone-stats": "0.0.1"
-+					}
-+				}
-+			}
-+		},
-+		"vscode": {
-+			"version": "1.0.1",
-+			"resolved": "https://registry.npmjs.org/vscode/-/vscode-1.0.1.tgz",
-+			"integrity": "sha1-PRYSAGFf4q8dkt3GUHURWUEaUTs=",
-+			"dev": true,
-+			"requires": {
-+				"glob": "5.0.15",
-+				"gulp-chmod": "1.3.0",
-+				"gulp-filter": "4.0.0",
-+				"gulp-gunzip": "0.0.3",
-+				"gulp-remote-src": "0.4.2",
-+				"gulp-symdest": "1.1.0",
-+				"gulp-untar": "0.0.4",
-+				"gulp-vinyl-zip": "1.4.0",
-+				"mocha": "2.5.3",
-+				"request": "2.81.0",
-+				"semver": "5.3.0",
-+				"source-map-support": "0.3.3",
-+				"vinyl-source-stream": "1.1.0"
-+			}
-+		},
-+		"wrappy": {
-+			"version": "1.0.2",
-+			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-+			"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-+			"dev": true
-+		},
-+		"xtend": {
-+			"version": "4.0.1",
-+			"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-+			"integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-+			"dev": true
-+		},
-+		"yauzl": {
-+			"version": "2.8.0",
-+			"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.8.0.tgz",
-+			"integrity": "sha1-eUUK/yKyqcWkHvVOAtuQfM+/nuI=",
-+			"dev": true,
-+			"requires": {
-+				"buffer-crc32": "0.2.13",
-+				"fd-slicer": "1.0.1"
-+			}
-+		},
-+		"yazl": {
-+			"version": "2.4.2",
-+			"resolved": "https://registry.npmjs.org/yazl/-/yazl-2.4.2.tgz",
-+			"integrity": "sha1-FMsZCD4eJacAksFYiqvg9OTdTYg=",
-+			"dev": true,
-+			"requires": {
-+				"buffer-crc32": "0.2.13"
-+			}
-+		}
-+	}
-+}
-changed in both
-  base   100644 2e886b6718905c9954971088a64077ba6055f3d8 extensions/vscode-colorize-tests/package.json
-  our    100644 9b43cfa2a6c2a3065e9898cee1e48af1f54e5551 extensions/vscode-colorize-tests/package.json
-  their  100644 2a74b92a61bfd1705468c41b42ba4e24b9aba0f6 extensions/vscode-colorize-tests/package.json
-added in remote
-  their  100644 e6f66f9833ecb776cb6fd026ed0f2595baebf4d4 old-shrinkwrap.json
-@@ -0,0 +1,565 @@
-+{
-+  "name": "code-oss-dev",
-+  "version": "1.15.0",
-+  "dependencies": {
-+    "agent-base": {
-+      "version": "1.0.2",
-+      "from": "agent-base@>=1.0.1 <1.1.0",
-+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-1.0.2.tgz"
-+    },
-+    "anymatch": {
-+      "version": "1.3.0",
-+      "from": "anymatch@>=1.3.0 <2.0.0",
-+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz"
-+    },
-+    "applicationinsights": {
-+      "version": "0.17.1",
-+      "from": "applicationinsights@0.17.1",
-+      "resolved": "https://registry.npmjs.org/applicationinsights/-/applicationinsights-0.17.1.tgz"
-+    },
-+    "arr-diff": {
-+      "version": "2.0.0",
-+      "from": "arr-diff@>=2.0.0 <3.0.0",
-+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz"
-+    },
-+    "arr-flatten": {
-+      "version": "1.0.1",
-+      "from": "arr-flatten@>=1.0.1 <2.0.0",
-+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.1.tgz"
-+    },
-+    "array-unique": {
-+      "version": "0.2.1",
-+      "from": "array-unique@>=0.2.1 <0.3.0",
-+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz"
-+    },
-+    "arrify": {
-+      "version": "1.0.1",
-+      "from": "arrify@>=1.0.0 <2.0.0",
-+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz"
-+    },
-+    "async-each": {
-+      "version": "1.0.1",
-+      "from": "async-each@>=1.0.0 <2.0.0",
-+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz"
-+    },
-+    "balanced-match": {
-+      "version": "0.4.2",
-+      "from": "balanced-match@>=0.4.1 <0.5.0",
-+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz"
-+    },
-+    "binary-extensions": {
-+      "version": "1.6.0",
-+      "from": "binary-extensions@>=1.0.0 <2.0.0",
-+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.6.0.tgz"
-+    },
-+    "brace-expansion": {
-+      "version": "1.1.6",
-+      "from": "brace-expansion@>=1.0.0 <2.0.0",
-+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz"
-+    },
-+    "braces": {
-+      "version": "1.8.5",
-+      "from": "braces@>=1.8.2 <2.0.0",
-+      "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz"
-+    },
-+    "buffer-shims": {
-+      "version": "1.0.0",
-+      "from": "buffer-shims@>=1.0.0 <2.0.0",
-+      "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz"
-+    },
-+    "chokidar": {
-+      "version": "1.6.0",
-+      "from": "bpasero/chokidar#vscode",
-+      "resolved": "git+https://github.com/bpasero/chokidar.git#8b64fda5a22cc9850f1346d12302051c5ba65b10"
-+    },
-+    "concat-map": {
-+      "version": "0.0.1",
-+      "from": "concat-map@0.0.1",
-+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-+    },
-+    "core-util-is": {
-+      "version": "1.0.2",
-+      "from": "core-util-is@>=1.0.0 <1.1.0",
-+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-+    },
-+    "debug": {
-+      "version": "2.2.0",
-+      "from": "debug@>=2.0.0 <3.0.0",
-+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"
-+    },
-+    "emmet": {
-+      "version": "1.3.1",
-+      "from": "ramya-rao-a/emmet#vscode",
-+      "resolved": "git+https://github.com/ramya-rao-a/emmet.git#b4d3edc30de7fa98032302cd1f017a940ab879fd"
-+    },
-+    "expand-brackets": {
-+      "version": "0.1.5",
-+      "from": "expand-brackets@>=0.1.4 <0.2.0",
-+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz"
-+    },
-+    "expand-range": {
-+      "version": "1.8.2",
-+      "from": "expand-range@>=1.8.1 <2.0.0",
-+      "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz"
-+    },
-+    "extend": {
-+      "version": "3.0.0",
-+      "from": "extend@>=3.0.0 <4.0.0",
-+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
-+    },
-+    "extglob": {
-+      "version": "0.3.2",
-+      "from": "extglob@>=0.3.1 <0.4.0",
-+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz"
-+    },
-+    "extract-opts": {
-+      "version": "2.2.0",
-+      "from": "extract-opts@>=2.2.0 <3.0.0",
-+      "resolved": "https://registry.npmjs.org/extract-opts/-/extract-opts-2.2.0.tgz"
-+    },
-+    "fast-plist": {
-+      "version": "0.1.2",
-+      "from": "fast-plist@0.1.2",
-+      "resolved": "https://registry.npmjs.org/fast-plist/-/fast-plist-0.1.2.tgz"
-+    },
-+    "fd-slicer": {
-+      "version": "1.0.1",
-+      "from": "fd-slicer@>=1.0.1 <1.1.0",
-+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz"
-+    },
-+    "filename-regex": {
-+      "version": "2.0.0",
-+      "from": "filename-regex@>=2.0.0 <3.0.0",
-+      "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.0.tgz"
-+    },
-+    "fill-range": {
-+      "version": "2.2.3",
-+      "from": "fill-range@>=2.1.0 <3.0.0",
-+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz"
-+    },
-+    "for-in": {
-+      "version": "0.1.5",
-+      "from": "for-in@>=0.1.5 <0.2.0",
-+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.5.tgz"
-+    },
-+    "for-own": {
-+      "version": "0.1.4",
-+      "from": "for-own@>=0.1.3 <0.2.0",
-+      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.4.tgz"
-+    },
-+    "fsevents": {
-+      "version": "0.3.8",
-+      "from": "bpasero/fsevents#vscode",
-+      "resolved": "git+https://github.com/bpasero/fsevents.git#fe2aaccaaffbd69a23374cf46a8c6bafe8e51b01"
-+    },
-+    "gc-signals": {
-+      "version": "0.0.1",
-+      "from": "gc-signals@0.0.1",
-+      "resolved": "https://registry.npmjs.org/gc-signals/-/gc-signals-0.0.1.tgz"
-+    },
-+    "getmac": {
-+      "version": "1.0.7",
-+      "from": "getmac@1.0.7",
-+      "resolved": "https://registry.npmjs.org/getmac/-/getmac-1.0.7.tgz"
-+    },
-+    "glob-base": {
-+      "version": "0.3.0",
-+      "from": "glob-base@>=0.3.0 <0.4.0",
-+      "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz"
-+    },
-+    "glob-parent": {
-+      "version": "2.0.0",
-+      "from": "glob-parent@>=2.0.0 <3.0.0",
-+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz"
-+    },
-+    "graceful-fs": {
-+      "version": "4.1.11",
-+      "from": "graceful-fs@4.1.11",
-+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"
-+    },
-+    "http-proxy-agent": {
-+      "version": "0.2.7",
-+      "from": "http-proxy-agent@0.2.7",
-+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-0.2.7.tgz"
-+    },
-+    "https-proxy-agent": {
-+      "version": "0.3.6",
-+      "from": "https-proxy-agent@0.3.6",
-+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-0.3.6.tgz"
-+    },
-+    "iconv-lite": {
-+      "version": "0.4.15",
-+      "from": "iconv-lite@0.4.15",
-+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz"
-+    },
-+    "inherits": {
-+      "version": "2.0.1",
-+      "from": "inherits@>=2.0.1 <3.0.0",
-+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-+    },
-+    "is-binary-path": {
-+      "version": "1.0.1",
-+      "from": "is-binary-path@>=1.0.0 <2.0.0",
-+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz"
-+    },
-+    "is-buffer": {
-+      "version": "1.1.4",
-+      "from": "is-buffer@>=1.0.2 <2.0.0",
-+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz"
-+    },
-+    "is-dotfile": {
-+      "version": "1.0.2",
-+      "from": "is-dotfile@>=1.0.0 <2.0.0",
-+      "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.2.tgz"
-+    },
-+    "is-equal-shallow": {
-+      "version": "0.1.3",
-+      "from": "is-equal-shallow@>=0.1.3 <0.2.0",
-+      "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz"
-+    },
-+    "is-extendable": {
-+      "version": "0.1.1",
-+      "from": "is-extendable@>=0.1.1 <0.2.0",
-+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz"
-+    },
-+    "is-extglob": {
-+      "version": "1.0.0",
-+      "from": "is-extglob@>=1.0.0 <2.0.0",
-+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz"
-+    },
-+    "is-glob": {
-+      "version": "2.0.1",
-+      "from": "is-glob@>=2.0.0 <3.0.0",
-+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz"
-+    },
-+    "is-number": {
-+      "version": "2.1.0",
-+      "from": "is-number@>=2.1.0 <3.0.0",
-+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz"
-+    },
-+    "is-posix-bracket": {
-+      "version": "0.1.1",
-+      "from": "is-posix-bracket@>=0.1.0 <0.2.0",
-+      "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz"
-+    },
-+    "is-primitive": {
-+      "version": "2.0.0",
-+      "from": "is-primitive@>=2.0.0 <3.0.0",
-+      "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz"
-+    },
-+    "isarray": {
-+      "version": "1.0.0",
-+      "from": "isarray@1.0.0",
-+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
-+    },
-+    "isobject": {
-+      "version": "2.1.0",
-+      "from": "isobject@>=2.0.0 <3.0.0",
-+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz"
-+    },
-+    "jschardet": {
-+      "version": "1.4.2",
-+      "from": "jschardet@>=1.4.2 <2.0.0",
-+      "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-1.4.2.tgz"
-+    },
-+    "kind-of": {
-+      "version": "3.0.4",
-+      "from": "kind-of@>=3.0.2 <4.0.0",
-+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.0.4.tgz"
-+    },
-+    "micromatch": {
-+      "version": "2.3.11",
-+      "from": "micromatch@>=2.1.5 <3.0.0",
-+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz"
-+    },
-+    "minimatch": {
-+      "version": "3.0.3",
-+      "from": "minimatch@>=3.0.2 <4.0.0",
-+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz"
-+    },
-+    "minimist": {
-+      "version": "1.2.0",
-+      "from": "minimist@1.2.0",
-+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
-+    },
-+    "ms": {
-+      "version": "0.7.1",
-+      "from": "ms@0.7.1",
-+      "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
-+    },
-+    "nan": {
-+      "version": "2.4.0",
-+      "from": "nan@>=2.3.0 <3.0.0",
-+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz"
-+    },
-+    "native-keymap": {
-+      "version": "1.2.4",
-+      "from": "native-keymap@1.2.4",
-+      "resolved": "https://registry.npmjs.org/native-keymap/-/native-keymap-1.2.4.tgz"
-+    },
-+    "normalize-path": {
-+      "version": "2.0.1",
-+      "from": "normalize-path@>=2.0.1 <3.0.0",
-+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.0.1.tgz"
-+    },
-+    "object.omit": {
-+      "version": "2.0.0",
-+      "from": "object.omit@>=2.0.0 <3.0.0",
-+      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.0.tgz"
-+    },
-+    "oniguruma": {
-+      "version": "6.1.1",
-+      "from": "oniguruma@>=6.0.1 <7.0.0",
-+      "resolved": "https://registry.npmjs.org/oniguruma/-/oniguruma-6.1.1.tgz"
-+    },
-+    "parse-glob": {
-+      "version": "3.0.4",
-+      "from": "parse-glob@>=3.0.4 <4.0.0",
-+      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz"
-+    },
-+    "path-is-absolute": {
-+      "version": "1.0.0",
-+      "from": "path-is-absolute@>=1.0.0 <2.0.0",
-+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-+    },
-+    "pend": {
-+      "version": "1.2.0",
-+      "from": "pend@>=1.2.0 <1.3.0",
-+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz"
-+    },
-+    "preserve": {
-+      "version": "0.2.0",
-+      "from": "preserve@>=0.2.0 <0.3.0",
-+      "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz"
-+    },
-+    "process-nextick-args": {
-+      "version": "1.0.7",
-+      "from": "process-nextick-args@>=1.0.6 <1.1.0",
-+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"
-+    },
-+    "node-pty": {
-+      "version": "0.6.8",
-+      "from": "node-pty@0.6.8",
-+      "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-0.6.8.tgz",
-+      "dependencies": {
-+        "nan": {
-+          "version": "2.5.0",
-+          "from": "nan@2.5.0",
-+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz"
-+        }
-+      }
-+    },
-+    "randomatic": {
-+      "version": "1.1.5",
-+      "from": "randomatic@>=1.1.3 <2.0.0",
-+      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.5.tgz"
-+    },
-+    "readable-stream": {
-+      "version": "2.1.5",
-+      "from": "readable-stream@>=2.0.2 <3.0.0",
-+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz"
-+    },
-+    "readdirp": {
-+      "version": "2.1.0",
-+      "from": "readdirp@>=2.0.0 <3.0.0",
-+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz"
-+    },
-+    "regex-cache": {
-+      "version": "0.4.3",
-+      "from": "regex-cache@>=0.4.2 <0.5.0",
-+      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz"
-+    },
-+    "repeat-element": {
-+      "version": "1.1.2",
-+      "from": "repeat-element@>=1.1.2 <2.0.0",
-+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz"
-+    },
-+    "repeat-string": {
-+      "version": "1.5.4",
-+      "from": "repeat-string@>=1.5.2 <2.0.0",
-+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.4.tgz"
-+    },
-+    "semver": {
-+      "version": "4.3.6",
-+      "from": "semver@4.3.6",
-+      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz"
-+    },
-+    "set-immediate-shim": {
-+      "version": "1.0.1",
-+      "from": "set-immediate-shim@>=1.0.1 <2.0.0",
-+      "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz"
-+    },
-+    "string_decoder": {
-+      "version": "0.10.31",
-+      "from": "string_decoder@>=0.10.0 <0.11.0",
-+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-+    },
-+    "typechecker": {
-+      "version": "2.0.8",
-+      "from": "typechecker@>=2.0.1 <2.1.0",
-+      "resolved": "https://registry.npmjs.org/typechecker/-/typechecker-2.0.8.tgz"
-+    },
-+    "util-deprecate": {
-+      "version": "1.0.2",
-+      "from": "util-deprecate@>=1.0.1 <1.1.0",
-+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-+    },
-+    "v8-profiler": {
-+      "version": "5.6.5",
-+      "from": "v8-profiler@5.6.5",
-+      "resolved": "git://github.com/jrieken/v8-profiler.git#bc0803a4d4b2150b8a1bbffa80270769007036c2"
-+    },
-+    "vscode-debugprotocol": {
-+      "version": "1.21.0",
-+      "from": "vscode-debugprotocol@1.21.0",
-+      "resolved": "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.21.0.tgz"
-+    },
-+    "vscode-ripgrep": {
-+      "version": "0.0.12",
-+      "from": "vscode-ripgrep@0.0.12",
-+      "resolved": "https://registry.npmjs.org/vscode-ripgrep/-/vscode-ripgrep-0.0.12.tgz"
-+    },
-+    "vscode-textmate": {
-+      "version": "3.1.5",
-+      "from": "vscode-textmate@3.1.5",
-+      "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-3.1.5.tgz"
-+    },
-+    "windows-foreground-love": {
-+      "version": "0.1.0",
-+      "from": "windows-foreground-love@0.1.0",
-+      "resolved": "https://registry.npmjs.org/windows-foreground-love/-/windows-foreground-love-0.1.0.tgz"
-+    },
-+    "windows-mutex": {
-+      "version": "0.2.0",
-+      "from": "windows-mutex@>=0.2.0 <0.3.0",
-+      "resolved": "https://registry.npmjs.org/windows-mutex/-/windows-mutex-0.2.0.tgz"
-+    },
-+    "winreg": {
-+      "version": "1.2.0",
-+      "from": "winreg@1.2.0",
-+      "resolved": "https://registry.npmjs.org/winreg/-/winreg-1.2.0.tgz"
-+    },
-+    "xterm": {
-+      "version": "2.7.0",
-+      "from": "Tyriar/xterm.js#vscode-release/1.14",
-+      "resolved": "git+https://github.com/Tyriar/xterm.js.git#7d7207a592461f15711f2f5df46eb5b1a7726da4"
-+    },
-+    "yauzl": {
-+      "version": "2.3.1",
-+      "from": "yauzl@2.3.1",
-+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.3.1.tgz"
-+    },
-+    "nsfw": {
-+      "version": "1.0.15",
-+      "from": "nsfw@1.0.15",
-+      "resolved": "https://registry.npmjs.org/nsfw/-/nsfw-1.0.15.tgz",
-+      "dependencies": {
-+        "asap": {
-+          "version": "2.0.5",
-+          "from": "asap@>=2.0.3 <2.1.0",
-+          "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.5.tgz"
-+        },
-+        "balanced-match": {
-+          "version": "1.0.0",
-+          "from": "balanced-match@>=1.0.0 <2.0.0",
-+          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"
-+        },
-+        "brace-expansion": {
-+          "version": "1.1.8",
-+          "from": "brace-expansion@>=1.1.7 <2.0.0",
-+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz"
-+        },
-+        "concat-map": {
-+          "version": "0.0.1",
-+          "from": "concat-map@0.0.1",
-+          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-+        },
-+        "fs-extra": {
-+          "version": "0.26.7",
-+          "from": "fs-extra@>=0.26.5 <0.27.0",
-+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz"
-+        },
-+        "fs.realpath": {
-+          "version": "1.0.0",
-+          "from": "fs.realpath@>=1.0.0 <2.0.0",
-+          "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
-+        },
-+        "glob": {
-+          "version": "7.1.2",
-+          "from": "glob@>=7.0.5 <8.0.0",
-+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz"
-+        },
-+        "graceful-fs": {
-+          "version": "4.1.11",
-+          "from": "graceful-fs@>=4.1.2 <5.0.0",
-+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"
-+        },
-+        "inflight": {
-+          "version": "1.0.6",
-+          "from": "inflight@>=1.0.4 <2.0.0",
-+          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"
-+        },
-+        "inherits": {
-+          "version": "2.0.3",
-+          "from": "inherits@>=2.0.0 <3.0.0",
-+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
-+        },
-+        "jsonfile": {
-+          "version": "2.4.0",
-+          "from": "jsonfile@>=2.1.0 <3.0.0",
-+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz"
-+        },
-+        "klaw": {
-+          "version": "1.3.1",
-+          "from": "klaw@>=1.0.0 <2.0.0",
-+          "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz"
-+        },
-+        "lodash": {
-+          "version": "4.17.4",
-+          "from": "lodash@>=4.6.1 <5.0.0",
-+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"
-+        },
-+        "minimatch": {
-+          "version": "3.0.4",
-+          "from": "minimatch@>=3.0.4 <4.0.0",
-+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"
-+        },
-+        "nan": {
-+          "version": "2.6.2",
-+          "from": "nan@>=2.0.0 <3.0.0",
-+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz"
-+        },
-+        "nodegit-promise": {
-+          "version": "4.0.0",
-+          "from": "nodegit-promise@>=4.0.0 <4.1.0",
-+          "resolved": "https://registry.npmjs.org/nodegit-promise/-/nodegit-promise-4.0.0.tgz"
-+        },
-+        "once": {
-+          "version": "1.4.0",
-+          "from": "once@>=1.3.0 <2.0.0",
-+          "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz"
-+        },
-+        "path-is-absolute": {
-+          "version": "1.0.1",
-+          "from": "path-is-absolute@>=1.0.0 <2.0.0",
-+          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
-+        },
-+        "promisify-node": {
-+          "version": "0.3.0",
-+          "from": "promisify-node@>=0.3.0 <0.4.0",
-+          "resolved": "https://registry.npmjs.org/promisify-node/-/promisify-node-0.3.0.tgz"
-+        },
-+        "rimraf": {
-+          "version": "2.6.1",
-+          "from": "rimraf@>=2.2.8 <3.0.0",
-+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz"
-+        },
-+        "wrappy": {
-+          "version": "1.0.2",
-+          "from": "wrappy@>=1.0.0 <2.0.0",
-+          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
-+        }
-+      }
-+    }
-+  }
-+}
-added in remote
-  their  100644 6cadcdf2a71cabdb2b46a6942bbab307da19c36e package-lock.json
-@@ -0,0 +1,11200 @@
-+{
-+  "name": "code-oss-dev",
-+  "version": "1.15.0",
-+  "lockfileVersion": 1,
-+  "requires": true,
-+  "dependencies": {
-+    "@gulp-sourcemaps/map-sources": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/map-sources/-/map-sources-1.0.0.tgz",
-+      "integrity": "sha1-iQrnxdjId/bThIYCFazp1+yUW9o=",
-+      "dev": true,
-+      "requires": {
-+        "normalize-path": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.0.1.tgz",
-+        "through2": "2.0.3"
-+      },
-+      "dependencies": {
-+        "through2": {
-+          "version": "2.0.3",
-+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
-+          "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
-+          "dev": true,
-+          "requires": {
-+            "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz",
-+            "xtend": "4.0.1"
-+          }
-+        }
-+      }
-+    },
-+    "@types/minimist": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.0.tgz",
-+      "integrity": "sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=",
-+      "dev": true
-+    },
-+    "@types/mocha": {
-+      "version": "2.2.41",
-+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-2.2.41.tgz",
-+      "integrity": "sha1-4nzwgXFT658nE7LT9saPHhw8pgg=",
-+      "dev": true
-+    },
-+    "@types/node": {
-+      "version": "6.0.79",
-+      "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.79.tgz",
-+      "integrity": "sha512-7F3/P6MkTPA0QxOstRqfcnoReCUy5V/QG92cyBoZSPnqdX44L8TtNELSVfN56gAttm3YWj9cEi8FRIPVq0WmeQ==",
-+      "dev": true
-+    },
-+    "@types/semver": {
-+      "version": "5.3.32",
-+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-5.3.32.tgz",
-+      "integrity": "sha512-MdbWERx4JWmN4zP+skJy9Kio+Cddvmyn1k8x0S8UAqDoMgOJeobQo7yhlE4BfiimonHirgixWfva/hKUlXBsrw==",
-+      "dev": true
-+    },
-+    "@types/sinon": {
-+      "version": "1.16.36",
-+      "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-1.16.36.tgz",
-+      "integrity": "sha1-dLtu15KFl8Gz+xsAkAXpTcbq41c=",
-+      "dev": true
-+    },
-+    "@types/winreg": {
-+      "version": "1.2.30",
-+      "resolved": "https://registry.npmjs.org/@types/winreg/-/winreg-1.2.30.tgz",
-+      "integrity": "sha1-kdZxDlNtNFucmwF8V0z2qNpkxRg=",
-+      "dev": true
-+    },
-+    "7zip": {
-+      "version": "0.0.6",
-+      "resolved": "https://registry.npmjs.org/7zip/-/7zip-0.0.6.tgz",
-+      "integrity": "sha1-nK+xca+CMpSQNTtIFvAzR6oVCjA=",
-+      "dev": true
-+    },
-+    "abbrev": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
-+      "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8=",
-+      "dev": true
-+    },
-+    "accepts": {
-+      "version": "1.3.3",
-+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz",
-+      "integrity": "sha1-w8p0NJOGSMPg2cHjKN1otiLChMo=",
-+      "dev": true,
-+      "requires": {
-+        "mime-types": "2.1.15",
-+        "negotiator": "0.6.1"
-+      }
-+    },
-+    "acorn": {
-+      "version": "5.0.3",
-+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.0.3.tgz",
-+      "integrity": "sha1-xGDfCEkUY/AozLguqzcwvwEIez0=",
-+      "dev": true
-+    },
-+    "acorn-jsx": {
-+      "version": "3.0.1",
-+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
-+      "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
-+      "dev": true,
-+      "requires": {
-+        "acorn": "3.3.0"
-+      },
-+      "dependencies": {
-+        "acorn": {
-+          "version": "3.3.0",
-+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
-+          "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "ajv": {
-+      "version": "4.11.8",
-+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
-+      "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
-+      "dev": true,
-+      "requires": {
-+        "co": "4.6.0",
-+        "json-stable-stringify": "1.0.1"
-+      }
-+    },
-+    "ajv-keywords": {
-+      "version": "1.5.1",
-+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz",
-+      "integrity": "sha1-MU3QpLM2j609/NxU7eYXG4htrzw=",
-+      "dev": true
-+    },
-+    "align-text": {
-+      "version": "0.1.4",
-+      "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
-+      "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
-+      "dev": true,
-+      "requires": {
-+        "kind-of": "https://registry.npmjs.org/kind-of/-/kind-of-3.0.4.tgz",
-+        "longest": "1.0.1",
-+        "repeat-string": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.4.tgz"
-+      }
-+    },
-+    "alphanum-sort": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
-+      "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
-+      "dev": true
-+    },
-+    "amdefine": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-+      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
-+      "dev": true
-+    },
-+    "ansi-align": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz",
-+      "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=",
-+      "dev": true,
-+      "requires": {
-+        "string-width": "2.1.0"
-+      },
-+      "dependencies": {
-+        "ansi-regex": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-+          "dev": true
-+        },
-+        "is-fullwidth-code-point": {
-+          "version": "2.0.0",
-+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-+          "dev": true
-+        },
-+        "string-width": {
-+          "version": "2.1.0",
-+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.0.tgz",
-+          "integrity": "sha1-AwZkVh/BRslCPsfZeP4kV0N/5tA=",
-+          "dev": true,
-+          "requires": {
-+            "is-fullwidth-code-point": "2.0.0",
-+            "strip-ansi": "4.0.0"
-+          }
-+        },
-+        "strip-ansi": {
-+          "version": "4.0.0",
-+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-+          "dev": true,
-+          "requires": {
-+            "ansi-regex": "3.0.0"
-+          }
-+        }
-+      }
-+    },
-+    "ansi-escapes": {
-+      "version": "1.4.0",
-+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz",
-+      "integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4=",
-+      "dev": true
-+    },
-+    "ansi-regex": {
-+      "version": "2.1.1",
-+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-+      "dev": true
-+    },
-+    "ansi-styles": {
-+      "version": "2.2.1",
-+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-+      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-+      "dev": true
-+    },
-+    "applicationinsights": {
-+      "version": "0.17.1",
-+      "resolved": "https://registry.npmjs.org/applicationinsights/-/applicationinsights-0.17.1.tgz",
-+      "integrity": "sha1-HBJQHb6cHpF2Qj/ODOjaYRzMuag="
-+    },
-+    "archy": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
-+      "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
-+      "dev": true
-+    },
-+    "argparse": {
-+      "version": "1.0.9",
-+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
-+      "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
-+      "dev": true,
-+      "requires": {
-+        "sprintf-js": "1.0.3"
-+      }
-+    },
-+    "arr-diff": {
-+      "version": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-+      "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
-+      "dev": true,
-+      "requires": {
-+        "arr-flatten": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.1.tgz"
-+      }
-+    },
-+    "arr-flatten": {
-+      "version": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.1.tgz",
-+      "integrity": "sha1-5f/lTUXhnzLyFukeuZyM6JK7YEs=",
-+      "dev": true
-+    },
-+    "array-differ": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
-+      "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=",
-+      "dev": true
-+    },
-+    "array-each": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
-+      "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
-+      "dev": true
-+    },
-+    "array-find-index": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
-+      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
-+      "dev": true
-+    },
-+    "array-flatten": {
-+      "version": "1.1.1",
-+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-+      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
-+      "dev": true
-+    },
-+    "array-parallel": {
-+      "version": "0.1.3",
-+      "resolved": "https://registry.npmjs.org/array-parallel/-/array-parallel-0.1.3.tgz",
-+      "integrity": "sha1-j3hTCJJu1apHjEfmTRszS2wMlH0=",
-+      "dev": true
-+    },
-+    "array-series": {
-+      "version": "0.1.5",
-+      "resolved": "https://registry.npmjs.org/array-series/-/array-series-0.1.5.tgz",
-+      "integrity": "sha1-3103v8XC7wdV4qpPkv6ufUtaly8=",
-+      "dev": true
-+    },
-+    "array-slice": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.0.0.tgz",
-+      "integrity": "sha1-5zA08A3MH0CHYAj9IP6ud71LfC8=",
-+      "dev": true
-+    },
-+    "array-union": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-+      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-+      "dev": true,
-+      "requires": {
-+        "array-uniq": "1.0.3"
-+      }
-+    },
-+    "array-uniq": {
-+      "version": "1.0.3",
-+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
-+      "dev": true
-+    },
-+    "array-unique": {
-+      "version": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-+      "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-+      "dev": true
-+    },
-+    "arrify": {
-+      "version": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-+      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
-+      "dev": true
-+    },
-+    "asap": {
-+      "version": "2.0.5",
-+      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.5.tgz",
-+      "integrity": "sha1-UidltQw1EEkOUtfc/ghe+bqWlY8="
-+    },
-+    "asn1": {
-+      "version": "0.1.11",
-+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
-+      "integrity": "sha1-VZvhg3bQik7E2+gId9J4GGObLfc=",
-+      "dev": true
-+    },
-+    "assert-plus": {
-+      "version": "0.1.5",
-+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
-+      "integrity": "sha1-7nQAlBMALYTOxyGcasgRgS5yMWA=",
-+      "dev": true
-+    },
-+    "async": {
-+      "version": "0.9.2",
-+      "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
-+      "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
-+      "dev": true
-+    },
-+    "asynckit": {
-+      "version": "0.4.0",
-+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-+      "dev": true
-+    },
-+    "atob": {
-+      "version": "1.1.3",
-+      "resolved": "https://registry.npmjs.org/atob/-/atob-1.1.3.tgz",
-+      "integrity": "sha1-lfE2KbEsOlGl0hWr3OKqnzL4B3M=",
-+      "dev": true
-+    },
-+    "autoprefixer": {
-+      "version": "6.7.7",
-+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz",
-+      "integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=",
-+      "dev": true,
-+      "requires": {
-+        "browserslist": "1.7.7",
-+        "caniuse-db": "1.0.30000697",
-+        "normalize-range": "0.1.2",
-+        "num2fraction": "1.2.2",
-+        "postcss": "5.2.17",
-+        "postcss-value-parser": "3.3.0"
-+      }
-+    },
-+    "aws-sign": {
-+      "version": "0.3.0",
-+      "resolved": "https://registry.npmjs.org/aws-sign/-/aws-sign-0.3.0.tgz",
-+      "integrity": "sha1-PYHKabR0seFlGHKLUcJP8Lvtxuk=",
-+      "dev": true
-+    },
-+    "aws-sign2": {
-+      "version": "0.6.0",
-+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
-+      "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
-+      "dev": true
-+    },
-+    "aws4": {
-+      "version": "1.6.0",
-+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-+      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
-+      "dev": true
-+    },
-+    "azure-storage": {
-+      "version": "0.3.3",
-+      "resolved": "https://registry.npmjs.org/azure-storage/-/azure-storage-0.3.3.tgz",
-+      "integrity": "sha1-XhkgunXGeMs/XlKokTbvNiELWKE=",
-+      "dev": true,
-+      "requires": {
-+        "extend": "1.2.1",
-+        "mime": "1.2.11",
-+        "node-uuid": "1.4.8",
-+        "request": "2.27.0",
-+        "underscore": "1.4.4",
-+        "validator": "3.1.0",
-+        "xml2js": "0.2.7",
-+        "xmlbuilder": "0.4.3"
-+      },
-+      "dependencies": {
-+        "extend": {
-+          "version": "1.2.1",
-+          "resolved": "https://registry.npmjs.org/extend/-/extend-1.2.1.tgz",
-+          "integrity": "sha1-oPX9bPyDpf5J72mNYOyKYk3UV2w=",
-+          "dev": true
-+        },
-+        "underscore": {
-+          "version": "1.4.4",
-+          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz",
-+          "integrity": "sha1-YaajIBBiKvoHljvzJSA88SI51gQ=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "babel-code-frame": {
-+      "version": "6.22.0",
-+      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz",
-+      "integrity": "sha1-AnYgvuVnqIwyVhV05/0IAdMxGOQ=",
-+      "dev": true,
-+      "requires": {
-+        "chalk": "1.1.3",
-+        "esutils": "2.0.2",
-+        "js-tokens": "3.0.2"
-+      }
-+    },
-+    "balanced-match": {
-+      "version": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-+      "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
-+      "dev": true
-+    },
-+    "base64-js": {
-+      "version": "0.0.8",
-+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz",
-+      "integrity": "sha1-EQHpVE9KdrG8OybUUsqW16NeeXg=",
-+      "dev": true
-+    },
-+    "bcrypt-pbkdf": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
-+      "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
-+      "dev": true,
-+      "optional": true,
-+      "requires": {
-+        "tweetnacl": "0.14.5"
-+      }
-+    },
-+    "beeper": {
-+      "version": "1.1.1",
-+      "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz",
-+      "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=",
-+      "dev": true
-+    },
-+    "binary-search-bounds": {
-+      "version": "2.0.3",
-+      "resolved": "https://registry.npmjs.org/binary-search-bounds/-/binary-search-bounds-2.0.3.tgz",
-+      "integrity": "sha1-X/hhbW3SylOIvIWy1iZuK52lAtw=",
-+      "dev": true
-+    },
-+    "binaryextensions": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/binaryextensions/-/binaryextensions-1.0.1.tgz",
-+      "integrity": "sha1-HmN0iLNbWL2l9HdL+WpSEqjJB1U=",
-+      "dev": true
-+    },
-+    "bl": {
-+      "version": "1.1.2",
-+      "resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz",
-+      "integrity": "sha1-/cqHGplxOqANGeO7ukHER4emU5g=",
-+      "dev": true,
-+      "requires": {
-+        "readable-stream": "2.0.6"
-+      },
-+      "dependencies": {
-+        "readable-stream": {
-+          "version": "2.0.6",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
-+          "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
-+          "dev": true,
-+          "requires": {
-+            "core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-+            "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-+            "isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-+            "process-nextick-args": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-+            "string_decoder": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-+            "util-deprecate": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-+          }
-+        }
-+      }
-+    },
-+    "bluebird": {
-+      "version": "3.5.0",
-+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz",
-+      "integrity": "sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw=",
-+      "dev": true
-+    },
-+    "boolbase": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-+      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
-+      "dev": true
-+    },
-+    "boom": {
-+      "version": "0.4.2",
-+      "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz",
-+      "integrity": "sha1-emNune1O/O+xnO9JR6PGffrukRs=",
-+      "dev": true,
-+      "requires": {
-+        "hoek": "0.9.1"
-+      }
-+    },
-+    "boxen": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.1.0.tgz",
-+      "integrity": "sha1-sbad1SIwXoB6md7ud329blFnsQI=",
-+      "dev": true,
-+      "requires": {
-+        "ansi-align": "2.0.0",
-+        "camelcase": "4.1.0",
-+        "chalk": "1.1.3",
-+        "cli-boxes": "1.0.0",
-+        "string-width": "2.1.0",
-+        "term-size": "0.1.1",
-+        "widest-line": "1.0.0"
-+      },
-+      "dependencies": {
-+        "ansi-regex": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-+          "dev": true
-+        },
-+        "camelcase": {
-+          "version": "4.1.0",
-+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-+          "dev": true
-+        },
-+        "is-fullwidth-code-point": {
-+          "version": "2.0.0",
-+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-+          "dev": true
-+        },
-+        "string-width": {
-+          "version": "2.1.0",
-+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.0.tgz",
-+          "integrity": "sha1-AwZkVh/BRslCPsfZeP4kV0N/5tA=",
-+          "dev": true,
-+          "requires": {
-+            "is-fullwidth-code-point": "2.0.0",
-+            "strip-ansi": "4.0.0"
-+          }
-+        },
-+        "strip-ansi": {
-+          "version": "4.0.0",
-+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-+          "dev": true,
-+          "requires": {
-+            "ansi-regex": "3.0.0"
-+          }
-+        }
-+      }
-+    },
-+    "brace-expansion": {
-+      "version": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz",
-+      "integrity": "sha1-cZfX6qm4fmSDkOph/GbIRCdCDfk=",
-+      "dev": true,
-+      "requires": {
-+        "balanced-match": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-+        "concat-map": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-+      }
-+    },
-+    "braces": {
-+      "version": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-+      "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
-+      "dev": true,
-+      "requires": {
-+        "expand-range": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
-+        "preserve": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
-+        "repeat-element": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz"
-+      }
-+    },
-+    "browser-request": {
-+      "version": "0.3.3",
-+      "resolved": "https://registry.npmjs.org/browser-request/-/browser-request-0.3.3.tgz",
-+      "integrity": "sha1-ns5bWsqJopkyJC4Yv5M975h2zBc=",
-+      "dev": true
-+    },
-+    "browserify-mime": {
-+      "version": "1.2.9",
-+      "resolved": "https://registry.npmjs.org/browserify-mime/-/browserify-mime-1.2.9.tgz",
-+      "integrity": "sha1-rrGvKN5sDXpqLOQK22j/GEIq8x8=",
-+      "dev": true
-+    },
-+    "browserslist": {
-+      "version": "1.7.7",
-+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz",
-+      "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
-+      "dev": true,
-+      "requires": {
-+        "caniuse-db": "1.0.30000697",
-+        "electron-to-chromium": "1.3.15"
-+      }
-+    },
-+    "buffer-crc32": {
-+      "version": "0.2.13",
-+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-+      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-+      "dev": true
-+    },
-+    "buffer-shims": {
-+      "version": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
-+      "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E=",
-+      "dev": true
-+    },
-+    "bufferstreams": {
-+      "version": "1.1.1",
-+      "resolved": "https://registry.npmjs.org/bufferstreams/-/bufferstreams-1.1.1.tgz",
-+      "integrity": "sha1-AWE3MGCsWYjv+ZBYcxEU9uGV1R4=",
-+      "dev": true,
-+      "requires": {
-+        "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz"
-+      }
-+    },
-+    "builtin-modules": {
-+      "version": "1.1.1",
-+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
-+      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
-+      "dev": true
-+    },
-+    "caller-path": {
-+      "version": "0.1.0",
-+      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
-+      "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
-+      "dev": true,
-+      "requires": {
-+        "callsites": "0.2.0"
-+      }
-+    },
-+    "callsites": {
-+      "version": "0.2.0",
-+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
-+      "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=",
-+      "dev": true
-+    },
-+    "camelcase": {
-+      "version": "2.1.1",
-+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-+      "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
-+      "dev": true
-+    },
-+    "camelcase-keys": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
-+      "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
-+      "dev": true,
-+      "requires": {
-+        "camelcase": "2.1.1",
-+        "map-obj": "1.0.1"
-+      }
-+    },
-+    "caniuse-api": {
-+      "version": "1.6.1",
-+      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-1.6.1.tgz",
-+      "integrity": "sha1-tTTnxzTE+B7F++isoq0kNUuWLGw=",
-+      "dev": true,
-+      "requires": {
-+        "browserslist": "1.7.7",
-+        "caniuse-db": "1.0.30000697",
-+        "lodash.memoize": "4.1.2",
-+        "lodash.uniq": "4.5.0"
-+      }
-+    },
-+    "caniuse-db": {
-+      "version": "1.0.30000697",
-+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000697.tgz",
-+      "integrity": "sha1-IM5qnO7vTvShXcjoDy6PuQSejXc="
-+    },
-+    "capture-stack-trace": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz",
-+      "integrity": "sha1-Sm+gc5nCa7pH8LJJa00PtAjFVQ0=",
-+      "dev": true
-+    },
-+    "caseless": {
-+      "version": "0.11.0",
-+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
-+      "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
-+      "dev": true
-+    },
-+    "center-align": {
-+      "version": "0.1.3",
-+      "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
-+      "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
-+      "dev": true,
-+      "optional": true,
-+      "requires": {
-+        "align-text": "0.1.4",
-+        "lazy-cache": "1.0.4"
-+      }
-+    },
-+    "chalk": {
-+      "version": "1.1.3",
-+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-+      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-+      "dev": true,
-+      "requires": {
-+        "ansi-styles": "2.2.1",
-+        "escape-string-regexp": "1.0.5",
-+        "has-ansi": "2.0.0",
-+        "strip-ansi": "3.0.1",
-+        "supports-color": "2.0.0"
-+      }
-+    },
-+    "cheerio": {
-+      "version": "1.0.0-rc.2",
-+      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.2.tgz",
-+      "integrity": "sha1-S59TqBsn5NXawxwP/Qz6A8xoMNs=",
-+      "dev": true,
-+      "requires": {
-+        "css-select": "1.2.0",
-+        "dom-serializer": "0.1.0",
-+        "entities": "1.1.1",
-+        "htmlparser2": "3.9.2",
-+        "lodash": "4.17.4",
-+        "parse5": "3.0.2"
-+      },
-+      "dependencies": {
-+        "parse5": {
-+          "version": "3.0.2",
-+          "resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.2.tgz",
-+          "integrity": "sha1-Be/1fw70V3+xRKefi5qWemzERRA=",
-+          "dev": true,
-+          "requires": {
-+            "@types/node": "6.0.79"
-+          }
-+        }
-+      }
-+    },
-+    "chokidar": {
-+      "version": "github:bpasero/chokidar#4c167ce0c29dae1727518998ecad63a049433e35",
-+      "requires": {
-+        "anymatch": "1.3.0",
-+        "async-each": "1.0.1",
-+        "fsevents": "github:bpasero/fsevents#fe2aaccaaffbd69a23374cf46a8c6bafe8e51b01",
-+        "glob-parent": "2.0.0",
-+        "inherits": "2.0.3",
-+        "is-binary-path": "1.0.1",
-+        "is-glob": "2.0.1",
-+        "path-is-absolute": "1.0.1",
-+        "readdirp": "2.1.0"
-+      },
-+      "dependencies": {
-+        "anymatch": {
-+          "version": "1.3.0",
-+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz",
-+          "integrity": "sha1-o+Uvo5FoyCX/V7AkgSbOWo/5VQc=",
-+          "requires": {
-+            "arrify": "1.0.1",
-+            "micromatch": "2.3.11"
-+          }
-+        },
-+        "arr-diff": {
-+          "version": "2.0.0",
-+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-+          "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
-+          "requires": {
-+            "arr-flatten": "1.1.0"
-+          }
-+        },
-+        "arr-flatten": {
-+          "version": "1.1.0",
-+          "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-+          "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="
-+        },
-+        "array-unique": {
-+          "version": "0.2.1",
-+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-+          "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM="
-+        },
-+        "arrify": {
-+          "version": "1.0.1",
-+          "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-+          "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0="
-+        },
-+        "async-each": {
-+          "version": "1.0.1",
-+          "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz",
-+          "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0="
-+        },
-+        "balanced-match": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-+          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
-+        },
-+        "binary-extensions": {
-+          "version": "1.8.0",
-+          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.8.0.tgz",
-+          "integrity": "sha1-SOyNFt9Dd+rl+liEaCSAr02Vx3Q="
-+        },
-+        "brace-expansion": {
-+          "version": "1.1.8",
-+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
-+          "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
-+          "requires": {
-+            "balanced-match": "1.0.0",
-+            "concat-map": "0.0.1"
-+          }
-+        },
-+        "braces": {
-+          "version": "1.8.5",
-+          "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-+          "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
-+          "requires": {
-+            "expand-range": "1.8.2",
-+            "preserve": "0.2.0",
-+            "repeat-element": "1.1.2"
-+          }
-+        },
-+        "concat-map": {
-+          "version": "0.0.1",
-+          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-+          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-+        },
-+        "core-util-is": {
-+          "version": "1.0.2",
-+          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-+          "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
-+        },
-+        "expand-brackets": {
-+          "version": "0.1.5",
-+          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
-+          "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
-+          "requires": {
-+            "is-posix-bracket": "0.1.1"
-+          }
-+        },
-+        "expand-range": {
-+          "version": "1.8.2",
-+          "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
-+          "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
-+          "requires": {
-+            "fill-range": "2.2.3"
-+          }
-+        },
-+        "extglob": {
-+          "version": "0.3.2",
-+          "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
-+          "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
-+          "requires": {
-+            "is-extglob": "1.0.0"
-+          }
-+        },
-+        "filename-regex": {
-+          "version": "2.0.1",
-+          "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
-+          "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY="
-+        },
-+        "fill-range": {
-+          "version": "2.2.3",
-+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
-+          "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
-+          "requires": {
-+            "is-number": "2.1.0",
-+            "isobject": "2.1.0",
-+            "randomatic": "1.1.7",
-+            "repeat-element": "1.1.2",
-+            "repeat-string": "1.6.1"
-+          }
-+        },
-+        "for-in": {
-+          "version": "1.0.2",
-+          "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-+          "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA="
-+        },
-+        "for-own": {
-+          "version": "0.1.5",
-+          "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-+          "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
-+          "requires": {
-+            "for-in": "1.0.2"
-+          }
-+        },
-+        "fsevents": {
-+          "version": "github:bpasero/fsevents#fe2aaccaaffbd69a23374cf46a8c6bafe8e51b01",
-+          "optional": true,
-+          "requires": {
-+            "nan": "2.6.2"
-+          }
-+        },
-+        "glob-base": {
-+          "version": "0.3.0",
-+          "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
-+          "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
-+          "requires": {
-+            "glob-parent": "2.0.0",
-+            "is-glob": "2.0.1"
-+          }
-+        },
-+        "glob-parent": {
-+          "version": "2.0.0",
-+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-+          "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
-+          "requires": {
-+            "is-glob": "2.0.1"
-+          }
-+        },
-+        "inherits": {
-+          "version": "2.0.3",
-+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-+        },
-+        "is-binary-path": {
-+          "version": "1.0.1",
-+          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-+          "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
-+          "requires": {
-+            "binary-extensions": "1.8.0"
-+          }
-+        },
-+        "is-buffer": {
-+          "version": "1.1.5",
-+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz",
-+          "integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw="
-+        },
-+        "is-dotfile": {
-+          "version": "1.0.3",
-+          "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
-+          "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE="
-+        },
-+        "is-equal-shallow": {
-+          "version": "0.1.3",
-+          "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
-+          "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
-+          "requires": {
-+            "is-primitive": "2.0.0"
-+          }
-+        },
-+        "is-extendable": {
-+          "version": "0.1.1",
-+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-+          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik="
-+        },
-+        "is-extglob": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-+          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA="
-+        },
-+        "is-glob": {
-+          "version": "2.0.1",
-+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-+          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-+          "requires": {
-+            "is-extglob": "1.0.0"
-+          }
-+        },
-+        "is-number": {
-+          "version": "2.1.0",
-+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-+          "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
-+          "requires": {
-+            "kind-of": "3.2.2"
-+          }
-+        },
-+        "is-posix-bracket": {
-+          "version": "0.1.1",
-+          "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
-+          "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q="
-+        },
-+        "is-primitive": {
-+          "version": "2.0.0",
-+          "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
-+          "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU="
-+        },
-+        "isarray": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-+        },
-+        "isobject": {
-+          "version": "2.1.0",
-+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-+          "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-+          "requires": {
-+            "isarray": "1.0.0"
-+          }
-+        },
-+        "kind-of": {
-+          "version": "3.2.2",
-+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-+          "requires": {
-+            "is-buffer": "1.1.5"
-+          }
-+        },
-+        "micromatch": {
-+          "version": "2.3.11",
-+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-+          "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-+          "requires": {
-+            "arr-diff": "2.0.0",
-+            "array-unique": "0.2.1",
-+            "braces": "1.8.5",
-+            "expand-brackets": "0.1.5",
-+            "extglob": "0.3.2",
-+            "filename-regex": "2.0.1",
-+            "is-extglob": "1.0.0",
-+            "is-glob": "2.0.1",
-+            "kind-of": "3.2.2",
-+            "normalize-path": "2.1.1",
-+            "object.omit": "2.0.1",
-+            "parse-glob": "3.0.4",
-+            "regex-cache": "0.4.3"
-+          }
-+        },
-+        "minimatch": {
-+          "version": "3.0.4",
-+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-+          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-+          "requires": {
-+            "brace-expansion": "1.1.8"
-+          }
-+        },
-+        "nan": {
-+          "version": "2.6.2",
-+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz",
-+          "integrity": "sha1-5P805slf37WuzAjeZZb0NgWn20U=",
-+          "optional": true
-+        },
-+        "normalize-path": {
-+          "version": "2.1.1",
-+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-+          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-+          "requires": {
-+            "remove-trailing-separator": "1.0.2"
-+          }
-+        },
-+        "object.omit": {
-+          "version": "2.0.1",
-+          "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
-+          "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
-+          "requires": {
-+            "for-own": "0.1.5",
-+            "is-extendable": "0.1.1"
-+          }
-+        },
-+        "parse-glob": {
-+          "version": "3.0.4",
-+          "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
-+          "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
-+          "requires": {
-+            "glob-base": "0.3.0",
-+            "is-dotfile": "1.0.3",
-+            "is-extglob": "1.0.0",
-+            "is-glob": "2.0.1"
-+          }
-+        },
-+        "path-is-absolute": {
-+          "version": "1.0.1",
-+          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-+          "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
-+        },
-+        "preserve": {
-+          "version": "0.2.0",
-+          "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
-+          "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks="
-+        },
-+        "process-nextick-args": {
-+          "version": "1.0.7",
-+          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-+          "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
-+        },
-+        "randomatic": {
-+          "version": "1.1.7",
-+          "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
-+          "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==",
-+          "requires": {
-+            "is-number": "3.0.0",
-+            "kind-of": "4.0.0"
-+          },
-+          "dependencies": {
-+            "is-number": {
-+              "version": "3.0.0",
-+              "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-+              "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-+              "requires": {
-+                "kind-of": "3.2.2"
-+              },
-+              "dependencies": {
-+                "kind-of": {
-+                  "version": "3.2.2",
-+                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-+                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-+                  "requires": {
-+                    "is-buffer": "1.1.5"
-+                  }
-+                }
-+              }
-+            },
-+            "kind-of": {
-+              "version": "4.0.0",
-+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-+              "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-+              "requires": {
-+                "is-buffer": "1.1.5"
-+              }
-+            }
-+          }
-+        },
-+        "readable-stream": {
-+          "version": "2.3.3",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-+          "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-+          "requires": {
-+            "core-util-is": "1.0.2",
-+            "inherits": "2.0.3",
-+            "isarray": "1.0.0",
-+            "process-nextick-args": "1.0.7",
-+            "safe-buffer": "5.1.1",
-+            "string_decoder": "1.0.3",
-+            "util-deprecate": "1.0.2"
-+          }
-+        },
-+        "readdirp": {
-+          "version": "2.1.0",
-+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz",
-+          "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
-+          "requires": {
-+            "graceful-fs": "4.1.11",
-+            "minimatch": "3.0.4",
-+            "readable-stream": "2.3.3",
-+            "set-immediate-shim": "1.0.1"
-+          }
-+        },
-+        "regex-cache": {
-+          "version": "0.4.3",
-+          "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz",
-+          "integrity": "sha1-mxpsNdTQ3871cRrmUejp09cRQUU=",
-+          "requires": {
-+            "is-equal-shallow": "0.1.3",
-+            "is-primitive": "2.0.0"
-+          }
-+        },
-+        "repeat-element": {
-+          "version": "1.1.2",
-+          "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz",
-+          "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo="
-+        },
-+        "repeat-string": {
-+          "version": "1.6.1",
-+          "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-+          "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc="
-+        },
-+        "set-immediate-shim": {
-+          "version": "1.0.1",
-+          "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
-+          "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E="
-+        },
-+        "string_decoder": {
-+          "version": "1.0.3",
-+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-+          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-+          "requires": {
-+            "safe-buffer": "5.1.1"
-+          }
-+        },
-+        "util-deprecate": {
-+          "version": "1.0.2",
-+          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-+          "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-+        }
-+      }
-+    },
-+    "ci-info": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.0.0.tgz",
-+      "integrity": "sha1-3FKF8rTiUYIWg2gcOBwziPRuxTQ=",
-+      "dev": true
-+    },
-+    "circular-json": {
-+      "version": "0.3.1",
-+      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.1.tgz",
-+      "integrity": "sha1-vos2rvzN6LPKeqLWr8B6NyQsDS0=",
-+      "dev": true
-+    },
-+    "clap": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.0.tgz",
-+      "integrity": "sha1-WckP4+E3EEdG/xlGmiemNP9oyFc=",
-+      "dev": true,
-+      "requires": {
-+        "chalk": "1.1.3"
-+      }
-+    },
-+    "clean-css": {
-+      "version": "3.4.6",
-+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.6.tgz",
-+      "integrity": "sha1-/LTxcFfdt/hyFhb3CweylNlf/EU=",
-+      "dev": true,
-+      "requires": {
-+        "commander": "2.8.1",
-+        "source-map": "0.4.4"
-+      }
-+    },
-+    "cli-boxes": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz",
-+      "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM=",
-+      "dev": true
-+    },
-+    "cli-cursor": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
-+      "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
-+      "dev": true,
-+      "requires": {
-+        "restore-cursor": "1.0.1"
-+      }
-+    },
-+    "cli-width": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.1.0.tgz",
-+      "integrity": "sha1-sjTKIJsp72b8UY2bmNWEewDt8Ao=",
-+      "dev": true
-+    },
-+    "cliui": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-+      "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
-+      "dev": true,
-+      "optional": true,
-+      "requires": {
-+        "center-align": "0.1.3",
-+        "right-align": "0.1.3",
-+        "wordwrap": "0.0.2"
-+      },
-+      "dependencies": {
-+        "wordwrap": {
-+          "version": "0.0.2",
-+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-+          "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
-+          "dev": true,
-+          "optional": true
-+        }
-+      }
-+    },
-+    "clone": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz",
-+      "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=",
-+      "dev": true
-+    },
-+    "clone-buffer": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
-+      "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=",
-+      "dev": true
-+    },
-+    "clone-stats": {
-+      "version": "0.0.1",
-+      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
-+      "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=",
-+      "dev": true
-+    },
-+    "cloneable-readable": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.0.0.tgz",
-+      "integrity": "sha1-pikNQT8hemEjL5XkWP84QYz7ARc=",
-+      "dev": true,
-+      "requires": {
-+        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-+        "process-nextick-args": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-+        "through2": "2.0.3"
-+      },
-+      "dependencies": {
-+        "through2": {
-+          "version": "2.0.3",
-+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
-+          "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
-+          "dev": true,
-+          "requires": {
-+            "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz",
-+            "xtend": "4.0.1"
-+          }
-+        }
-+      }
-+    },
-+    "co": {
-+      "version": "4.6.0",
-+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-+      "dev": true
-+    },
-+    "coa": {
-+      "version": "1.0.3",
-+      "resolved": "https://registry.npmjs.org/coa/-/coa-1.0.3.tgz",
-+      "integrity": "sha1-G1Sl4dz3fJkEVdTe6pjFZEFtyJM=",
-+      "dev": true,
-+      "requires": {
-+        "q": "1.5.0"
-+      }
-+    },
-+    "code-point-at": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-+      "dev": true
-+    },
-+    "coffee-script": {
-+      "version": "1.12.6",
-+      "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.6.tgz",
-+      "integrity": "sha1-KFo/cRVokGUGTWv570Vy22ZpXL8=",
-+      "dev": true
-+    },
-+    "color": {
-+      "version": "0.11.4",
-+      "resolved": "https://registry.npmjs.org/color/-/color-0.11.4.tgz",
-+      "integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=",
-+      "dev": true,
-+      "requires": {
-+        "clone": "1.0.2",
-+        "color-convert": "1.9.0",
-+        "color-string": "0.3.0"
-+      }
-+    },
-+    "color-convert": {
-+      "version": "1.9.0",
-+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz",
-+      "integrity": "sha1-Gsz5fdc5uYO/mU1W/sj5WFNkG3o=",
-+      "dev": true,
-+      "requires": {
-+        "color-name": "1.1.2"
-+      }
-+    },
-+    "color-name": {
-+      "version": "1.1.2",
-+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz",
-+      "integrity": "sha1-XIq3K2S9IhXWF66VWeuxSEdc+Y0=",
-+      "dev": true
-+    },
-+    "color-string": {
-+      "version": "0.3.0",
-+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz",
-+      "integrity": "sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=",
-+      "dev": true,
-+      "requires": {
-+        "color-name": "1.1.2"
-+      }
-+    },
-+    "colormin": {
-+      "version": "1.1.2",
-+      "resolved": "https://registry.npmjs.org/colormin/-/colormin-1.1.2.tgz",
-+      "integrity": "sha1-6i90IKcrlogaOKrlnsEkpvcpgTM=",
-+      "dev": true,
-+      "requires": {
-+        "color": "0.11.4",
-+        "css-color-names": "0.0.4",
-+        "has": "1.0.1"
-+      }
-+    },
-+    "colors": {
-+      "version": "0.6.2",
-+      "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz",
-+      "integrity": "sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w=",
-+      "dev": true
-+    },
-+    "combined-stream": {
-+      "version": "0.0.7",
-+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
-+      "integrity": "sha1-ATfmV7qlp1QcV6w3rF/AfXO03B8=",
-+      "dev": true,
-+      "requires": {
-+        "delayed-stream": "0.0.5"
-+      }
-+    },
-+    "commander": {
-+      "version": "2.8.1",
-+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
-+      "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
-+      "dev": true,
-+      "requires": {
-+        "graceful-readlink": "1.0.1"
-+      }
-+    },
-+    "commandpost": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/commandpost/-/commandpost-1.1.0.tgz",
-+      "integrity": "sha512-9yPICKOPS0+24bMM4kHx7AgTZ1tWw51/eq0BUYqzDodNoiszL3Z0w4JRt/UXd93Aw003tlQlpuERcw7mBlxt9g==",
-+      "dev": true
-+    },
-+    "concat-map": {
-+      "version": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-+    },
-+    "concat-stream": {
-+      "version": "1.6.0",
-+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz",
-+      "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=",
-+      "dev": true,
-+      "requires": {
-+        "inherits": "2.0.3",
-+        "readable-stream": "2.3.3",
-+        "typedarray": "0.0.6"
-+      },
-+      "dependencies": {
-+        "inherits": {
-+          "version": "2.0.3",
-+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-+          "dev": true
-+        },
-+        "readable-stream": {
-+          "version": "2.3.3",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-+          "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-+          "dev": true,
-+          "requires": {
-+            "core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-+            "inherits": "2.0.3",
-+            "isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-+            "process-nextick-args": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-+            "safe-buffer": "5.1.1",
-+            "string_decoder": "1.0.3",
-+            "util-deprecate": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-+          }
-+        },
-+        "string_decoder": {
-+          "version": "1.0.3",
-+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-+          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-+          "dev": true,
-+          "requires": {
-+            "safe-buffer": "5.1.1"
-+          }
-+        }
-+      }
-+    },
-+    "concat-with-sourcemaps": {
-+      "version": "1.0.4",
-+      "resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.0.4.tgz",
-+      "integrity": "sha1-9Vs74q60dgGxCi1SWcz7cP0vHdY=",
-+      "dev": true,
-+      "requires": {
-+        "source-map": "0.5.6"
-+      },
-+      "dependencies": {
-+        "source-map": {
-+          "version": "0.5.6",
-+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-+          "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "config-chain": {
-+      "version": "1.1.11",
-+      "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz",
-+      "integrity": "sha1-q6CXR9++TD5w52am5BWG4YWfxvI=",
-+      "dev": true,
-+      "requires": {
-+        "ini": "1.3.4",
-+        "proto-list": "1.2.4"
-+      }
-+    },
-+    "configstore": {
-+      "version": "3.1.0",
-+      "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.0.tgz",
-+      "integrity": "sha1-Rd+QcHPibfoc9LLVL1tgVF6qEdE=",
-+      "dev": true,
-+      "requires": {
-+        "dot-prop": "4.1.1",
-+        "graceful-fs": "4.1.11",
-+        "make-dir": "1.0.0",
-+        "unique-string": "1.0.0",
-+        "write-file-atomic": "2.1.0",
-+        "xdg-basedir": "3.0.0"
-+      }
-+    },
-+    "content-disposition": {
-+      "version": "0.5.2",
-+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
-+      "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=",
-+      "dev": true
-+    },
-+    "content-type": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz",
-+      "integrity": "sha1-t9ETrueo3Se9IRM8TcJSnfFyHu0=",
-+      "dev": true
-+    },
-+    "convert-source-map": {
-+      "version": "1.5.0",
-+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz",
-+      "integrity": "sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU=",
-+      "dev": true
-+    },
-+    "cookie": {
-+      "version": "0.3.1",
-+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
-+      "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=",
-+      "dev": true
-+    },
-+    "cookie-jar": {
-+      "version": "0.3.0",
-+      "resolved": "https://registry.npmjs.org/cookie-jar/-/cookie-jar-0.3.0.tgz",
-+      "integrity": "sha1-vJon1OK5fhhs1XyeIGPLmfpozMw=",
-+      "dev": true
-+    },
-+    "cookie-signature": {
-+      "version": "1.0.6",
-+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-+      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
-+      "dev": true
-+    },
-+    "core-util-is": {
-+      "version": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-+      "dev": true
-+    },
-+    "coveralls": {
-+      "version": "2.13.1",
-+      "resolved": "https://registry.npmjs.org/coveralls/-/coveralls-2.13.1.tgz",
-+      "integrity": "sha1-1wu5rMGDXsTwY/+drFQjwXsR8Xg=",
-+      "dev": true,
-+      "requires": {
-+        "js-yaml": "3.6.1",
-+        "lcov-parse": "0.0.10",
-+        "log-driver": "1.2.5",
-+        "minimist": "1.2.0",
-+        "request": "2.79.0"
-+      },
-+      "dependencies": {
-+        "assert-plus": {
-+          "version": "0.2.0",
-+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
-+          "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
-+          "dev": true
-+        },
-+        "boom": {
-+          "version": "2.10.1",
-+          "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
-+          "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
-+          "dev": true,
-+          "requires": {
-+            "hoek": "2.16.3"
-+          }
-+        },
-+        "combined-stream": {
-+          "version": "1.0.5",
-+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-+          "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
-+          "dev": true,
-+          "requires": {
-+            "delayed-stream": "1.0.0"
-+          }
-+        },
-+        "cryptiles": {
-+          "version": "2.0.5",
-+          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-+          "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
-+          "dev": true,
-+          "requires": {
-+            "boom": "2.10.1"
-+          }
-+        },
-+        "delayed-stream": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-+          "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-+          "dev": true
-+        },
-+        "forever-agent": {
-+          "version": "0.6.1",
-+          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-+          "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-+          "dev": true
-+        },
-+        "form-data": {
-+          "version": "2.1.4",
-+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
-+          "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
-+          "dev": true,
-+          "requires": {
-+            "asynckit": "0.4.0",
-+            "combined-stream": "1.0.5",
-+            "mime-types": "2.1.15"
-+          }
-+        },
-+        "hawk": {
-+          "version": "3.1.3",
-+          "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-+          "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
-+          "dev": true,
-+          "requires": {
-+            "boom": "2.10.1",
-+            "cryptiles": "2.0.5",
-+            "hoek": "2.16.3",
-+            "sntp": "1.0.9"
-+          }
-+        },
-+        "hoek": {
-+          "version": "2.16.3",
-+          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-+          "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-+          "dev": true
-+        },
-+        "http-signature": {
-+          "version": "1.1.1",
-+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
-+          "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
-+          "dev": true,
-+          "requires": {
-+            "assert-plus": "0.2.0",
-+            "jsprim": "1.4.0",
-+            "sshpk": "1.13.1"
-+          }
-+        },
-+        "oauth-sign": {
-+          "version": "0.8.2",
-+          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-+          "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
-+          "dev": true
-+        },
-+        "qs": {
-+          "version": "6.3.2",
-+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz",
-+          "integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw=",
-+          "dev": true
-+        },
-+        "request": {
-+          "version": "2.79.0",
-+          "resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz",
-+          "integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=",
-+          "dev": true,
-+          "requires": {
-+            "aws-sign2": "0.6.0",
-+            "aws4": "1.6.0",
-+            "caseless": "0.11.0",
-+            "combined-stream": "1.0.5",
-+            "extend": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz",
-+            "forever-agent": "0.6.1",
-+            "form-data": "2.1.4",
-+            "har-validator": "2.0.6",
-+            "hawk": "3.1.3",
-+            "http-signature": "1.1.1",
-+            "is-typedarray": "1.0.0",
-+            "isstream": "0.1.2",
-+            "json-stringify-safe": "5.0.1",
-+            "mime-types": "2.1.15",
-+            "oauth-sign": "0.8.2",
-+            "qs": "6.3.2",
-+            "stringstream": "0.0.5",
-+            "tough-cookie": "2.3.2",
-+            "tunnel-agent": "0.4.3",
-+            "uuid": "3.1.0"
-+          }
-+        },
-+        "sntp": {
-+          "version": "1.0.9",
-+          "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
-+          "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
-+          "dev": true,
-+          "requires": {
-+            "hoek": "2.16.3"
-+          }
-+        },
-+        "tunnel-agent": {
-+          "version": "0.4.3",
-+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-+          "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
-+          "dev": true
-+        },
-+        "uuid": {
-+          "version": "3.1.0",
-+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-+          "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "create-error-class": {
-+      "version": "3.0.2",
-+      "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
-+      "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
-+      "dev": true,
-+      "requires": {
-+        "capture-stack-trace": "1.0.0"
-+      }
-+    },
-+    "cross-spawn": {
-+      "version": "4.0.2",
-+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
-+      "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=",
-+      "dev": true,
-+      "requires": {
-+        "lru-cache": "4.1.1",
-+        "which": "1.2.14"
-+      },
-+      "dependencies": {
-+        "lru-cache": {
-+          "version": "4.1.1",
-+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz",
-+          "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==",
-+          "dev": true,
-+          "requires": {
-+            "pseudomap": "1.0.2",
-+            "yallist": "2.1.2"
-+          }
-+        }
-+      }
-+    },
-+    "cross-spawn-async": {
-+      "version": "2.2.5",
-+      "resolved": "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz",
-+      "integrity": "sha1-hF/wwINKPe2dFg2sptOQkGuyiMw=",
-+      "dev": true,
-+      "requires": {
-+        "lru-cache": "4.1.1",
-+        "which": "1.2.14"
-+      },
-+      "dependencies": {
-+        "lru-cache": {
-+          "version": "4.1.1",
-+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz",
-+          "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==",
-+          "dev": true,
-+          "requires": {
-+            "pseudomap": "1.0.2",
-+            "yallist": "2.1.2"
-+          }
-+        }
-+      }
-+    },
-+    "cryptiles": {
-+      "version": "0.2.2",
-+      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz",
-+      "integrity": "sha1-7ZH/HxetE9N0gohZT4pIoNJvMlw=",
-+      "dev": true,
-+      "requires": {
-+        "boom": "0.4.2"
-+      }
-+    },
-+    "crypto-random-string": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
-+      "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=",
-+      "dev": true
-+    },
-+    "cson-parser": {
-+      "version": "1.3.5",
-+      "resolved": "https://registry.npmjs.org/cson-parser/-/cson-parser-1.3.5.tgz",
-+      "integrity": "sha1-fsZ14DkUVTO/KmqFYHPxWZ2cLSQ=",
-+      "dev": true,
-+      "requires": {
-+        "coffee-script": "1.12.6"
-+      }
-+    },
-+    "css": {
-+      "version": "2.2.1",
-+      "resolved": "https://registry.npmjs.org/css/-/css-2.2.1.tgz",
-+      "integrity": "sha1-c6TIHehdtmTU7mdPfUcIXjstVdw=",
-+      "dev": true,
-+      "requires": {
-+        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-+        "source-map": "0.1.43",
-+        "source-map-resolve": "0.3.1",
-+        "urix": "0.1.0"
-+      },
-+      "dependencies": {
-+        "source-map": {
-+          "version": "0.1.43",
-+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
-+          "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
-+          "dev": true,
-+          "requires": {
-+            "amdefine": "1.0.1"
-+          }
-+        }
-+      }
-+    },
-+    "css-color-names": {
-+      "version": "0.0.4",
-+      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
-+      "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
-+      "dev": true
-+    },
-+    "css-select": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
-+      "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
-+      "dev": true,
-+      "requires": {
-+        "boolbase": "1.0.0",
-+        "css-what": "2.1.0",
-+        "domutils": "1.5.1",
-+        "nth-check": "1.0.1"
-+      },
-+      "dependencies": {
-+        "domutils": {
-+          "version": "1.5.1",
-+          "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
-+          "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
-+          "dev": true,
-+          "requires": {
-+            "dom-serializer": "0.1.0",
-+            "domelementtype": "1.3.0"
-+          }
-+        }
-+      }
-+    },
-+    "css-what": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.0.tgz",
-+      "integrity": "sha1-lGfQMsOM+u+58teVASUwYvh/ob0=",
-+      "dev": true
-+    },
-+    "cssnano": {
-+      "version": "3.10.0",
-+      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-3.10.0.tgz",
-+      "integrity": "sha1-Tzj2zqK5sX+gFJDyPx3GjqZcHDg=",
-+      "dev": true,
-+      "requires": {
-+        "autoprefixer": "6.7.7",
-+        "decamelize": "1.2.0",
-+        "defined": "1.0.0",
-+        "has": "1.0.1",
-+        "object-assign": "4.1.1",
-+        "postcss": "5.2.17",
-+        "postcss-calc": "5.3.1",
-+        "postcss-colormin": "2.2.2",
-+        "postcss-convert-values": "2.6.1",
-+        "postcss-discard-comments": "2.0.4",
-+        "postcss-discard-duplicates": "2.1.0",
-+        "postcss-discard-empty": "2.1.0",
-+        "postcss-discard-overridden": "0.1.1",
-+        "postcss-discard-unused": "2.2.3",
-+        "postcss-filter-plugins": "2.0.2",
-+        "postcss-merge-idents": "2.1.7",
-+        "postcss-merge-longhand": "2.0.2",
-+        "postcss-merge-rules": "2.1.2",
-+        "postcss-minify-font-values": "1.0.5",
-+        "postcss-minify-gradients": "1.0.5",
-+        "postcss-minify-params": "1.2.2",
-+        "postcss-minify-selectors": "2.1.1",
-+        "postcss-normalize-charset": "1.1.1",
-+        "postcss-normalize-url": "3.0.8",
-+        "postcss-ordered-values": "2.2.3",
-+        "postcss-reduce-idents": "2.4.0",
-+        "postcss-reduce-initial": "1.0.1",
-+        "postcss-reduce-transforms": "1.0.4",
-+        "postcss-svgo": "2.1.6",
-+        "postcss-unique-selectors": "2.0.2",
-+        "postcss-value-parser": "3.3.0",
-+        "postcss-zindex": "2.2.0"
-+      }
-+    },
-+    "csso": {
-+      "version": "2.3.2",
-+      "resolved": "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz",
-+      "integrity": "sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U=",
-+      "dev": true,
-+      "requires": {
-+        "clap": "1.2.0",
-+        "source-map": "0.5.6"
-+      },
-+      "dependencies": {
-+        "source-map": {
-+          "version": "0.5.6",
-+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-+          "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "cssom": {
-+      "version": "0.3.2",
-+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.2.tgz",
-+      "integrity": "sha1-uANhcMefB6kP8vFuIihAJ6JDhIs=",
-+      "dev": true
-+    },
-+    "cssstyle": {
-+      "version": "0.2.37",
-+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.37.tgz",
-+      "integrity": "sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=",
-+      "dev": true,
-+      "requires": {
-+        "cssom": "0.3.2"
-+      }
-+    },
-+    "ctype": {
-+      "version": "0.5.3",
-+      "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz",
-+      "integrity": "sha1-gsGMJGH3QRTvFsE1IkrQuRRMoS8=",
-+      "dev": true
-+    },
-+    "currently-unhandled": {
-+      "version": "0.4.1",
-+      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
-+      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
-+      "dev": true,
-+      "requires": {
-+        "array-find-index": "1.0.2"
-+      }
-+    },
-+    "d": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
-+      "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
-+      "dev": true,
-+      "requires": {
-+        "es5-ext": "0.10.23"
-+      }
-+    },
-+    "dashdash": {
-+      "version": "1.14.1",
-+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-+      "dev": true,
-+      "requires": {
-+        "assert-plus": "1.0.0"
-+      },
-+      "dependencies": {
-+        "assert-plus": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "dateformat": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.0.0.tgz",
-+      "integrity": "sha1-J0Pjq7XD/CRi5SfcpEXgTp9N7hc=",
-+      "dev": true
-+    },
-+    "debounce": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/debounce/-/debounce-1.0.2.tgz",
-+      "integrity": "sha1-UDzGdNjX9zcJlmT7dd29NrlibcY=",
-+      "dev": true
-+    },
-+    "debug": {
-+      "version": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-+      "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
-+      "dev": true,
-+      "requires": {
-+        "ms": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
-+      }
-+    },
-+    "debug-fabulous": {
-+      "version": "0.0.4",
-+      "resolved": "https://registry.npmjs.org/debug-fabulous/-/debug-fabulous-0.0.4.tgz",
-+      "integrity": "sha1-+gccXYdIRoVCSAdCHKSxawsaB2M=",
-+      "dev": true,
-+      "requires": {
-+        "debug": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-+        "lazy-debug-legacy": "0.0.1",
-+        "object-assign": "4.1.0"
-+      },
-+      "dependencies": {
-+        "object-assign": {
-+          "version": "4.1.0",
-+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz",
-+          "integrity": "sha1-ejs9DpgGPUP0wD8uiubNUahog6A=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "decamelize": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-+      "dev": true
-+    },
-+    "deep-extend": {
-+      "version": "0.4.2",
-+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
-+      "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=",
-+      "dev": true
-+    },
-+    "deep-is": {
-+      "version": "0.1.3",
-+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-+      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
-+      "dev": true
-+    },
-+    "deepmerge": {
-+      "version": "0.2.10",
-+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-0.2.10.tgz",
-+      "integrity": "sha1-iQa/nlJaT78bIDsq/LRkAkmCEhk=",
-+      "dev": true
-+    },
-+    "defaults": {
-+      "version": "1.0.3",
-+      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
-+      "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
-+      "dev": true,
-+      "requires": {
-+        "clone": "1.0.2"
-+      }
-+    },
-+    "defined": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
-+      "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=",
-+      "dev": true
-+    },
-+    "del": {
-+      "version": "2.2.2",
-+      "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
-+      "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
-+      "dev": true,
-+      "requires": {
-+        "globby": "5.0.0",
-+        "is-path-cwd": "1.0.0",
-+        "is-path-in-cwd": "1.0.0",
-+        "object-assign": "4.1.1",
-+        "pify": "2.3.0",
-+        "pinkie-promise": "2.0.1",
-+        "rimraf": "2.6.1"
-+      }
-+    },
-+    "delayed-stream": {
-+      "version": "0.0.5",
-+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
-+      "integrity": "sha1-1LH0OpPoKW3+AmlPRoC8N6MTxz8=",
-+      "dev": true
-+    },
-+    "denodeify": {
-+      "version": "1.2.1",
-+      "resolved": "https://registry.npmjs.org/denodeify/-/denodeify-1.2.1.tgz",
-+      "integrity": "sha1-OjYof1A05pnnV3kBBSwubJQlFjE=",
-+      "dev": true
-+    },
-+    "depd": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz",
-+      "integrity": "sha1-4b2Cxqq2ztlluXuIsX7T5SjKGMM=",
-+      "dev": true
-+    },
-+    "deprecated": {
-+      "version": "0.0.1",
-+      "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz",
-+      "integrity": "sha1-+cmvVGSvoeepcUWKi97yqpTVuxk=",
-+      "dev": true
-+    },
-+    "destroy": {
-+      "version": "1.0.4",
-+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-+      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
-+      "dev": true
-+    },
-+    "detect-file": {
-+      "version": "0.1.0",
-+      "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-0.1.0.tgz",
-+      "integrity": "sha1-STXe39lIhkjgBrASlWbpOGcR6mM=",
-+      "dev": true,
-+      "requires": {
-+        "fs-exists-sync": "0.1.0"
-+      }
-+    },
-+    "detect-indent": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-2.0.0.tgz",
-+      "integrity": "sha1-cg/1Hk2Xt2iE9r9XKSNIsT396Tk=",
-+      "dev": true,
-+      "requires": {
-+        "get-stdin": "3.0.2",
-+        "minimist": "1.2.0",
-+        "repeating": "1.1.3"
-+      },
-+      "dependencies": {
-+        "get-stdin": {
-+          "version": "3.0.2",
-+          "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-3.0.2.tgz",
-+          "integrity": "sha1-wc7SS5A5s43thb3xYeV3E7bdSr4=",
-+          "dev": true
-+        },
-+        "repeating": {
-+          "version": "1.1.3",
-+          "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz",
-+          "integrity": "sha1-PUEUIYh3U3SU+X93+Xhfq4EPpKw=",
-+          "dev": true,
-+          "requires": {
-+            "is-finite": "1.0.2"
-+          }
-+        }
-+      }
-+    },
-+    "detect-newline": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz",
-+      "integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=",
-+      "dev": true
-+    },
-+    "diff": {
-+      "version": "1.4.0",
-+      "resolved": "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz",
-+      "integrity": "sha1-fyjS657nsVqX79ic5j3P2qPMur8=",
-+      "dev": true
-+    },
-+    "doctrine": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.0.0.tgz",
-+      "integrity": "sha1-xz2NKQnSIpHhoAejlYBNqLZl/mM=",
-+      "dev": true,
-+      "requires": {
-+        "esutils": "2.0.2",
-+        "isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
-+      }
-+    },
-+    "documentdb": {
-+      "version": "1.12.0",
-+      "resolved": "https://registry.npmjs.org/documentdb/-/documentdb-1.12.0.tgz",
-+      "integrity": "sha1-MyWgSd3ykNfjP0BaMq6CzNeX3Fo=",
-+      "dev": true,
-+      "requires": {
-+        "binary-search-bounds": "2.0.3",
-+        "priorityqueuejs": "1.0.0",
-+        "semaphore": "1.0.5",
-+        "underscore": "1.8.3"
-+      }
-+    },
-+    "dom-serializer": {
-+      "version": "0.1.0",
-+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
-+      "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
-+      "dev": true,
-+      "requires": {
-+        "domelementtype": "1.1.3",
-+        "entities": "1.1.1"
-+      },
-+      "dependencies": {
-+        "domelementtype": {
-+          "version": "1.1.3",
-+          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
-+          "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "domelementtype": {
-+      "version": "1.3.0",
-+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
-+      "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=",
-+      "dev": true
-+    },
-+    "domhandler": {
-+      "version": "2.4.1",
-+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz",
-+      "integrity": "sha1-iS5HAAqZvlW783dP/qBWHYh5wlk=",
-+      "dev": true,
-+      "requires": {
-+        "domelementtype": "1.3.0"
-+      }
-+    },
-+    "domutils": {
-+      "version": "1.6.2",
-+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.6.2.tgz",
-+      "integrity": "sha1-GVjMC0yUJuntNn+xyOhUiRsPo/8=",
-+      "dev": true,
-+      "requires": {
-+        "dom-serializer": "0.1.0",
-+        "domelementtype": "1.3.0"
-+      }
-+    },
-+    "dot-prop": {
-+      "version": "4.1.1",
-+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.1.1.tgz",
-+      "integrity": "sha1-qEk/C3te7sglJbXHWH+n3nyoWcE=",
-+      "dev": true,
-+      "requires": {
-+        "is-obj": "1.0.1"
-+      }
-+    },
-+    "duplexer": {
-+      "version": "0.1.1",
-+      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
-+      "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
-+      "dev": true
-+    },
-+    "duplexer2": {
-+      "version": "0.0.2",
-+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-+      "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
-+      "dev": true,
-+      "requires": {
-+        "readable-stream": "1.1.14"
-+      },
-+      "dependencies": {
-+        "isarray": {
-+          "version": "0.0.1",
-+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-+          "dev": true
-+        },
-+        "readable-stream": {
-+          "version": "1.1.14",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-+          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-+          "dev": true,
-+          "requires": {
-+            "core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-+            "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-+            "isarray": "0.0.1",
-+            "string_decoder": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-+          }
-+        }
-+      }
-+    },
-+    "duplexer3": {
-+      "version": "0.1.4",
-+      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
-+      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
-+      "dev": true
-+    },
-+    "duplexify": {
-+      "version": "3.5.0",
-+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.0.tgz",
-+      "integrity": "sha1-GqdzAC4VeEV+nZ1KULDMquvL1gQ=",
-+      "dev": true,
-+      "requires": {
-+        "end-of-stream": "1.0.0",
-+        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-+        "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz",
-+        "stream-shift": "1.0.0"
-+      },
-+      "dependencies": {
-+        "end-of-stream": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz",
-+          "integrity": "sha1-1FlucCc0qT5A6a+GQxnqvZn/Lw4=",
-+          "dev": true,
-+          "requires": {
-+            "once": "1.3.3"
-+          }
-+        },
-+        "once": {
-+          "version": "1.3.3",
-+          "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-+          "integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=",
-+          "dev": true,
-+          "requires": {
-+            "wrappy": "1.0.2"
-+          }
-+        }
-+      }
-+    },
-+    "ecc-jsbn": {
-+      "version": "0.1.1",
-+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
-+      "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
-+      "dev": true,
-+      "optional": true,
-+      "requires": {
-+        "jsbn": "0.1.1"
-+      }
-+    },
-+    "editorconfig": {
-+      "version": "0.13.2",
-+      "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.13.2.tgz",
-+      "integrity": "sha1-jleSbZ7mmrbLmZ8CfCFxRnrM6zU=",
-+      "dev": true,
-+      "requires": {
-+        "bluebird": "3.5.0",
-+        "commander": "2.11.0",
-+        "lru-cache": "3.2.0",
-+        "sigmund": "1.0.1"
-+      },
-+      "dependencies": {
-+        "commander": {
-+          "version": "2.11.0",
-+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
-+          "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
-+          "dev": true
-+        },
-+        "lru-cache": {
-+          "version": "3.2.0",
-+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz",
-+          "integrity": "sha1-cXibO39Tmb7IVl3aOKow0qCX7+4=",
-+          "dev": true,
-+          "requires": {
-+            "pseudomap": "1.0.2"
-+          }
-+        }
-+      }
-+    },
-+    "ee-first": {
-+      "version": "1.1.1",
-+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-+      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
-+      "dev": true
-+    },
-+    "electron-download": {
-+      "version": "3.3.0",
-+      "resolved": "https://registry.npmjs.org/electron-download/-/electron-download-3.3.0.tgz",
-+      "integrity": "sha1-LP1U1pZsAZxNSa1l++Zcyc3vaMg=",
-+      "dev": true,
-+      "requires": {
-+        "debug": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-+        "fs-extra": "0.30.0",
-+        "home-path": "1.0.5",
-+        "minimist": "1.2.0",
-+        "nugget": "2.0.1",
-+        "path-exists": "2.1.0",
-+        "rc": "1.2.1",
-+        "semver": "5.3.0",
-+        "sumchecker": "1.3.1"
-+      },
-+      "dependencies": {
-+        "semver": {
-+          "version": "5.3.0",
-+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-+          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "electron-mksnapshot": {
-+      "version": "1.6.0",
-+      "resolved": "https://registry.npmjs.org/electron-mksnapshot/-/electron-mksnapshot-1.6.0.tgz",
-+      "integrity": "sha1-4/AOMfsirTiY/PjsnUAKUh2uWic=",
-+      "dev": true,
-+      "requires": {
-+        "electron-download": "3.3.0",
-+        "extract-zip": "1.6.5"
-+      }
-+    },
-+    "electron-to-chromium": {
-+      "version": "1.3.15",
-+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.15.tgz",
-+      "integrity": "sha1-CDl5NIkcvPrrvRi4KpW1pIETg2k=",
-+      "dev": true
-+    },
-+    "emmet": {
-+      "version": "github:ramya-rao-a/emmet#b4d3edc30de7fa98032302cd1f017a940ab879fd",
-+      "requires": {
-+        "caniuse-db": "1.0.30000697"
-+      }
-+    },
-+    "encodeurl": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz",
-+      "integrity": "sha1-eePVhlU0aQn+bw9Fpd5oEDspTSA=",
-+      "dev": true
-+    },
-+    "end-of-stream": {
-+      "version": "0.1.5",
-+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
-+      "integrity": "sha1-jhdyBsPICDfYVjLouTWd/osvbq8=",
-+      "dev": true,
-+      "requires": {
-+        "once": "1.3.3"
-+      },
-+      "dependencies": {
-+        "once": {
-+          "version": "1.3.3",
-+          "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-+          "integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=",
-+          "dev": true,
-+          "requires": {
-+            "wrappy": "1.0.2"
-+          }
-+        }
-+      }
-+    },
-+    "entities": {
-+      "version": "1.1.1",
-+      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
-+      "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=",
-+      "dev": true
-+    },
-+    "error-ex": {
-+      "version": "1.3.1",
-+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz",
-+      "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=",
-+      "dev": true,
-+      "requires": {
-+        "is-arrayish": "0.2.1"
-+      }
-+    },
-+    "es5-ext": {
-+      "version": "0.10.23",
-+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.23.tgz",
-+      "integrity": "sha1-dXi1G+l0IHpUh4IbVlOMIk5Oezg=",
-+      "dev": true,
-+      "requires": {
-+        "es6-iterator": "2.0.1",
-+        "es6-symbol": "3.1.1"
-+      }
-+    },
-+    "es6-iterator": {
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz",
-+      "integrity": "sha1-jjGcnwRTv1ddN0lAplWSDlnKVRI=",
-+      "dev": true,
-+      "requires": {
-+        "d": "1.0.0",
-+        "es5-ext": "0.10.23",
-+        "es6-symbol": "3.1.1"
-+      }
-+    },
-+    "es6-map": {
-+      "version": "0.1.5",
-+      "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz",
-+      "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=",
-+      "dev": true,
-+      "requires": {
-+        "d": "1.0.0",
-+        "es5-ext": "0.10.23",
-+        "es6-iterator": "2.0.1",
-+        "es6-set": "0.1.5",
-+        "es6-symbol": "3.1.1",
-+        "event-emitter": "0.3.5"
-+      }
-+    },
-+    "es6-promise": {
-+      "version": "4.1.1",
-+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.1.1.tgz",
-+      "integrity": "sha512-OaU1hHjgJf+b0NzsxCg7NdIYERD6Hy/PEmFLTjw+b65scuisG3Kt4QoTvJ66BBkPZ581gr0kpoVzKnxniM8nng==",
-+      "dev": true
-+    },
-+    "es6-promisify": {
-+      "version": "5.0.0",
-+      "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
-+      "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
-+      "dev": true,
-+      "requires": {
-+        "es6-promise": "4.1.1"
-+      }
-+    },
-+    "es6-set": {
-+      "version": "0.1.5",
-+      "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz",
-+      "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=",
-+      "dev": true,
-+      "requires": {
-+        "d": "1.0.0",
-+        "es5-ext": "0.10.23",
-+        "es6-iterator": "2.0.1",
-+        "es6-symbol": "3.1.1",
-+        "event-emitter": "0.3.5"
-+      }
-+    },
-+    "es6-symbol": {
-+      "version": "3.1.1",
-+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
-+      "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
-+      "dev": true,
-+      "requires": {
-+        "d": "1.0.0",
-+        "es5-ext": "0.10.23"
-+      }
-+    },
-+    "es6-weak-map": {
-+      "version": "2.0.2",
-+      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz",
-+      "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=",
-+      "dev": true,
-+      "requires": {
-+        "d": "1.0.0",
-+        "es5-ext": "0.10.23",
-+        "es6-iterator": "2.0.1",
-+        "es6-symbol": "3.1.1"
-+      }
-+    },
-+    "escape-html": {
-+      "version": "1.0.3",
-+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-+      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
-+      "dev": true
-+    },
-+    "escape-string-regexp": {
-+      "version": "1.0.5",
-+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-+      "dev": true
-+    },
-+    "escodegen": {
-+      "version": "1.7.1",
-+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.7.1.tgz",
-+      "integrity": "sha1-MOz89mypjcZ80v0WKr626vqM5vw=",
-+      "dev": true,
-+      "requires": {
-+        "esprima": "1.2.5",
-+        "estraverse": "1.9.3",
-+        "esutils": "2.0.2",
-+        "optionator": "0.5.0",
-+        "source-map": "0.2.0"
-+      },
-+      "dependencies": {
-+        "esprima": {
-+          "version": "1.2.5",
-+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.2.5.tgz",
-+          "integrity": "sha1-CZNQL+r2aBODJXVvMPmlH+7sEek=",
-+          "dev": true
-+        },
-+        "estraverse": {
-+          "version": "1.9.3",
-+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz",
-+          "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=",
-+          "dev": true
-+        },
-+        "fast-levenshtein": {
-+          "version": "1.0.7",
-+          "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.7.tgz",
-+          "integrity": "sha1-AXjc3uAjuSkFGTrwlZ6KdjnP3Lk=",
-+          "dev": true
-+        },
-+        "levn": {
-+          "version": "0.2.5",
-+          "resolved": "https://registry.npmjs.org/levn/-/levn-0.2.5.tgz",
-+          "integrity": "sha1-uo0znQykphDjo/FFucr0iAcVUFQ=",
-+          "dev": true,
-+          "requires": {
-+            "prelude-ls": "1.1.2",
-+            "type-check": "0.3.2"
-+          }
-+        },
-+        "optionator": {
-+          "version": "0.5.0",
-+          "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.5.0.tgz",
-+          "integrity": "sha1-t1qJlaLUF98ltuTjhi9QqohlE2g=",
-+          "dev": true,
-+          "requires": {
-+            "deep-is": "0.1.3",
-+            "fast-levenshtein": "1.0.7",
-+            "levn": "0.2.5",
-+            "prelude-ls": "1.1.2",
-+            "type-check": "0.3.2",
-+            "wordwrap": "0.0.3"
-+          }
-+        },
-+        "source-map": {
-+          "version": "0.2.0",
-+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz",
-+          "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=",
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+            "amdefine": "1.0.1"
-+          }
-+        },
-+        "wordwrap": {
-+          "version": "0.0.3",
-+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-+          "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "escope": {
-+      "version": "3.6.0",
-+      "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz",
-+      "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=",
-+      "dev": true,
-+      "requires": {
-+        "es6-map": "0.1.5",
-+        "es6-weak-map": "2.0.2",
-+        "esrecurse": "4.2.0",
-+        "estraverse": "4.2.0"
-+      }
-+    },
-+    "eslint": {
-+      "version": "3.19.0",
-+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz",
-+      "integrity": "sha1-yPxiAcf0DdCJQbh8CFdnOGpnmsw=",
-+      "dev": true,
-+      "requires": {
-+        "babel-code-frame": "6.22.0",
-+        "chalk": "1.1.3",
-+        "concat-stream": "1.6.0",
-+        "debug": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-+        "doctrine": "2.0.0",
-+        "escope": "3.6.0",
-+        "espree": "3.4.3",
-+        "esquery": "1.0.0",
-+        "estraverse": "4.2.0",
-+        "esutils": "2.0.2",
-+        "file-entry-cache": "2.0.0",
-+        "glob": "7.1.2",
-+        "globals": "9.18.0",
-+        "ignore": "3.3.3",
-+        "imurmurhash": "0.1.4",
-+        "inquirer": "0.12.0",
-+        "is-my-json-valid": "2.16.0",
-+        "is-resolvable": "1.0.0",
-+        "js-yaml": "3.6.1",
-+        "json-stable-stringify": "1.0.1",
-+        "levn": "0.3.0",
-+        "lodash": "4.17.4",
-+        "mkdirp": "0.5.1",
-+        "natural-compare": "1.4.0",
-+        "optionator": "0.8.2",
-+        "path-is-inside": "1.0.2",
-+        "pluralize": "1.2.1",
-+        "progress": "1.1.8",
-+        "require-uncached": "1.0.3",
-+        "shelljs": "0.7.8",
-+        "strip-bom": "3.0.0",
-+        "strip-json-comments": "2.0.1",
-+        "table": "3.8.3",
-+        "text-table": "0.2.0",
-+        "user-home": "2.0.0"
-+      },
-+      "dependencies": {
-+        "balanced-match": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-+          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-+          "dev": true
-+        },
-+        "brace-expansion": {
-+          "version": "1.1.8",
-+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
-+          "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
-+          "dev": true,
-+          "requires": {
-+            "balanced-match": "1.0.0",
-+            "concat-map": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-+          }
-+        },
-+        "glob": {
-+          "version": "7.1.2",
-+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+          "dev": true,
-+          "requires": {
-+            "fs.realpath": "1.0.0",
-+            "inflight": "1.0.6",
-+            "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-+            "minimatch": "3.0.4",
-+            "once": "1.4.0",
-+            "path-is-absolute": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-+          }
-+        },
-+        "minimatch": {
-+          "version": "3.0.4",
-+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-+          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-+          "dev": true,
-+          "requires": {
-+            "brace-expansion": "1.1.8"
-+          }
-+        },
-+        "strip-bom": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "espree": {
-+      "version": "3.4.3",
-+      "resolved": "https://registry.npmjs.org/espree/-/espree-3.4.3.tgz",
-+      "integrity": "sha1-KRC1zNSc6JPC//+qtP2LOjG4I3Q=",
-+      "dev": true,
-+      "requires": {
-+        "acorn": "5.0.3",
-+        "acorn-jsx": "3.0.1"
-+      }
-+    },
-+    "esprima": {
-+      "version": "2.7.3",
-+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
-+      "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
-+      "dev": true
-+    },
-+    "esquery": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.0.tgz",
-+      "integrity": "sha1-z7qLV9f7qT8XKYqKAGoEzaE9gPo=",
-+      "dev": true,
-+      "requires": {
-+        "estraverse": "4.2.0"
-+      }
-+    },
-+    "esrecurse": {
-+      "version": "4.2.0",
-+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz",
-+      "integrity": "sha1-+pVo2Y04I/mkHZHpAtyrnqblsWM=",
-+      "dev": true,
-+      "requires": {
-+        "estraverse": "4.2.0",
-+        "object-assign": "4.1.1"
-+      }
-+    },
-+    "estraverse": {
-+      "version": "4.2.0",
-+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-+      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
-+      "dev": true
-+    },
-+    "esutils": {
-+      "version": "2.0.2",
-+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
-+      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
-+      "dev": true
-+    },
-+    "etag": {
-+      "version": "1.8.0",
-+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.0.tgz",
-+      "integrity": "sha1-b2Ma7zNtbEY2K1F2QETOIWvjwFE=",
-+      "dev": true
-+    },
-+    "event-emitter": {
-+      "version": "0.3.5",
-+      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
-+      "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
-+      "dev": true,
-+      "requires": {
-+        "d": "1.0.0",
-+        "es5-ext": "0.10.23"
-+      }
-+    },
-+    "event-stream": {
-+      "version": "3.3.4",
-+      "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
-+      "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
-+      "dev": true,
-+      "requires": {
-+        "duplexer": "0.1.1",
-+        "from": "0.1.7",
-+        "map-stream": "0.1.0",
-+        "pause-stream": "0.0.11",
-+        "split": "0.3.3",
-+        "stream-combiner": "0.0.4",
-+        "through": "2.3.8"
-+      }
-+    },
-+    "eventemitter2": {
-+      "version": "0.4.14",
-+      "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz",
-+      "integrity": "sha1-j2G3XN4BKy6esoTUVFWDtWQ7Yas=",
-+      "dev": true
-+    },
-+    "execa": {
-+      "version": "0.4.0",
-+      "resolved": "https://registry.npmjs.org/execa/-/execa-0.4.0.tgz",
-+      "integrity": "sha1-TrZGejaglfq7KXD/nV4/t7zm68M=",
-+      "dev": true,
-+      "requires": {
-+        "cross-spawn-async": "2.2.5",
-+        "is-stream": "1.1.0",
-+        "npm-run-path": "1.0.0",
-+        "object-assign": "4.1.1",
-+        "path-key": "1.0.0",
-+        "strip-eof": "1.0.0"
-+      }
-+    },
-+    "exit": {
-+      "version": "0.1.2",
-+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-+      "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
-+      "dev": true
-+    },
-+    "exit-hook": {
-+      "version": "1.1.1",
-+      "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz",
-+      "integrity": "sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g=",
-+      "dev": true
-+    },
-+    "expand-brackets": {
-+      "version": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
-+      "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
-+      "dev": true,
-+      "requires": {
-+        "is-posix-bracket": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz"
-+      }
-+    },
-+    "expand-range": {
-+      "version": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
-+      "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
-+      "dev": true,
-+      "requires": {
-+        "fill-range": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz"
-+      }
-+    },
-+    "expand-tilde": {
-+      "version": "1.2.2",
-+      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.2.tgz",
-+      "integrity": "sha1-C4HrqJflo9MdHD0QL48BRB5VlEk=",
-+      "dev": true,
-+      "requires": {
-+        "os-homedir": "1.0.2"
-+      }
-+    },
-+    "express": {
-+      "version": "4.15.3",
-+      "resolved": "https://registry.npmjs.org/express/-/express-4.15.3.tgz",
-+      "integrity": "sha1-urZdDwOqgMNYQIly/HAPkWlEtmI=",
-+      "dev": true,
-+      "requires": {
-+        "accepts": "1.3.3",
-+        "array-flatten": "1.1.1",
-+        "content-disposition": "0.5.2",
-+        "content-type": "1.0.2",
-+        "cookie": "0.3.1",
-+        "cookie-signature": "1.0.6",
-+        "debug": "2.6.7",
-+        "depd": "1.1.0",
-+        "encodeurl": "1.0.1",
-+        "escape-html": "1.0.3",
-+        "etag": "1.8.0",
-+        "finalhandler": "1.0.3",
-+        "fresh": "0.5.0",
-+        "merge-descriptors": "1.0.1",
-+        "methods": "1.1.2",
-+        "on-finished": "2.3.0",
-+        "parseurl": "1.3.1",
-+        "path-to-regexp": "0.1.7",
-+        "proxy-addr": "1.1.4",
-+        "qs": "6.4.0",
-+        "range-parser": "1.2.0",
-+        "send": "0.15.3",
-+        "serve-static": "1.12.3",
-+        "setprototypeof": "1.0.3",
-+        "statuses": "1.3.1",
-+        "type-is": "1.6.15",
-+        "utils-merge": "1.0.0",
-+        "vary": "1.1.1"
-+      },
-+      "dependencies": {
-+        "debug": {
-+          "version": "2.6.7",
-+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz",
-+          "integrity": "sha1-krrR9tBbu2u6Isyoi80OyJTChh4=",
-+          "dev": true,
-+          "requires": {
-+            "ms": "2.0.0"
-+          }
-+        },
-+        "ms": {
-+          "version": "2.0.0",
-+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-+          "dev": true
-+        },
-+        "qs": {
-+          "version": "6.4.0",
-+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
-+          "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "extend": {
-+      "version": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz",
-+      "integrity": "sha1-WkdDU7nzNT3dgXbf03uRyDpG8dQ=",
-+      "dev": true
-+    },
-+    "extend-shallow": {
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-+      "dev": true,
-+      "requires": {
-+        "is-extendable": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz"
-+      }
-+    },
-+    "extglob": {
-+      "version": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
-+      "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
-+      "dev": true,
-+      "requires": {
-+        "is-extglob": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz"
-+      }
-+    },
-+    "extract-zip": {
-+      "version": "1.6.5",
-+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.5.tgz",
-+      "integrity": "sha1-maBnNbbqIOqbcF13ms/8yHz/BEA=",
-+      "dev": true,
-+      "requires": {
-+        "concat-stream": "1.6.0",
-+        "debug": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-+        "mkdirp": "0.5.0",
-+        "yauzl": "2.4.1"
-+      },
-+      "dependencies": {
-+        "minimist": {
-+          "version": "0.0.8",
-+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-+          "dev": true
-+        },
-+        "mkdirp": {
-+          "version": "0.5.0",
-+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
-+          "integrity": "sha1-HXMHam35hs2TROFecfzAWkyavxI=",
-+          "dev": true,
-+          "requires": {
-+            "minimist": "0.0.8"
-+          }
-+        },
-+        "yauzl": {
-+          "version": "2.4.1",
-+          "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz",
-+          "integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=",
-+          "dev": true,
-+          "requires": {
-+            "fd-slicer": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz"
-+          }
-+        }
-+      }
-+    },
-+    "extsprintf": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz",
-+      "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=",
-+      "dev": true
-+    },
-+    "fancy-log": {
-+      "version": "1.3.0",
-+      "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.0.tgz",
-+      "integrity": "sha1-Rb4X0Cu5kX1gzP/UmVyZnmyMmUg=",
-+      "dev": true,
-+      "requires": {
-+        "chalk": "1.1.3",
-+        "time-stamp": "1.1.0"
-+      }
-+    },
-+    "fast-levenshtein": {
-+      "version": "2.0.6",
-+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-+      "dev": true
-+    },
-+    "fast-plist": {
-+      "version": "0.1.2",
-+      "resolved": "https://registry.npmjs.org/fast-plist/-/fast-plist-0.1.2.tgz",
-+      "integrity": "sha1-pFr/NFGWAG1AbKbNzQX2kFHvNbg="
-+    },
-+    "fd-slicer": {
-+      "version": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
-+      "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
-+      "dev": true,
-+      "requires": {
-+        "pend": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz"
-+      }
-+    },
-+    "figures": {
-+      "version": "1.7.0",
-+      "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
-+      "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
-+      "dev": true,
-+      "requires": {
-+        "escape-string-regexp": "1.0.5",
-+        "object-assign": "4.1.1"
-+      }
-+    },
-+    "file-entry-cache": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
-+      "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
-+      "dev": true,
-+      "requires": {
-+        "flat-cache": "1.2.2",
-+        "object-assign": "4.1.1"
-+      }
-+    },
-+    "filename-regex": {
-+      "version": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.0.tgz",
-+      "integrity": "sha1-mW4+gEebmLmJfxWopYs9CE6SZ3U=",
-+      "dev": true
-+    },
-+    "fileset": {
-+      "version": "0.2.1",
-+      "resolved": "https://registry.npmjs.org/fileset/-/fileset-0.2.1.tgz",
-+      "integrity": "sha1-WI74lzxmI7KnbfRlEFaWuWqsgGc=",
-+      "dev": true,
-+      "requires": {
-+        "glob": "5.0.15",
-+        "minimatch": "2.0.10"
-+      },
-+      "dependencies": {
-+        "minimatch": {
-+          "version": "2.0.10",
-+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-+          "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=",
-+          "dev": true,
-+          "requires": {
-+            "brace-expansion": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz"
-+          }
-+        }
-+      }
-+    },
-+    "fill-range": {
-+      "version": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
-+      "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
-+      "dev": true,
-+      "requires": {
-+        "is-number": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-+        "isobject": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-+        "randomatic": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.5.tgz",
-+        "repeat-element": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz",
-+        "repeat-string": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.4.tgz"
-+      }
-+    },
-+    "finalhandler": {
-+      "version": "1.0.3",
-+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.3.tgz",
-+      "integrity": "sha1-70fneVDpmXgOhgIqVg4yF+DQzIk=",
-+      "dev": true,
-+      "requires": {
-+        "debug": "2.6.7",
-+        "encodeurl": "1.0.1",
-+        "escape-html": "1.0.3",
-+        "on-finished": "2.3.0",
-+        "parseurl": "1.3.1",
-+        "statuses": "1.3.1",
-+        "unpipe": "1.0.0"
-+      },
-+      "dependencies": {
-+        "debug": {
-+          "version": "2.6.7",
-+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz",
-+          "integrity": "sha1-krrR9tBbu2u6Isyoi80OyJTChh4=",
-+          "dev": true,
-+          "requires": {
-+            "ms": "2.0.0"
-+          }
-+        },
-+        "ms": {
-+          "version": "2.0.0",
-+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "find-index": {
-+      "version": "0.1.1",
-+      "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz",
-+      "integrity": "sha1-Z101iyyjiS15Whq0cjL4tuLg3eQ=",
-+      "dev": true
-+    },
-+    "find-parent-dir": {
-+      "version": "0.3.0",
-+      "resolved": "https://registry.npmjs.org/find-parent-dir/-/find-parent-dir-0.3.0.tgz",
-+      "integrity": "sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ=",
-+      "dev": true
-+    },
-+    "find-up": {
-+      "version": "1.1.2",
-+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-+      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-+      "dev": true,
-+      "requires": {
-+        "path-exists": "2.1.0",
-+        "pinkie-promise": "2.0.1"
-+      }
-+    },
-+    "findup-sync": {
-+      "version": "0.4.3",
-+      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.4.3.tgz",
-+      "integrity": "sha1-QAQ5Kee8YK3wt/SCfExudaDeyhI=",
-+      "dev": true,
-+      "requires": {
-+        "detect-file": "0.1.0",
-+        "is-glob": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-+        "micromatch": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-+        "resolve-dir": "0.1.1"
-+      }
-+    },
-+    "fined": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/fined/-/fined-1.1.0.tgz",
-+      "integrity": "sha1-s33IRLdqL15wgeiE98CuNE8VNHY=",
-+      "dev": true,
-+      "requires": {
-+        "expand-tilde": "2.0.2",
-+        "is-plain-object": "2.0.3",
-+        "object.defaults": "1.1.0",
-+        "object.pick": "1.2.0",
-+        "parse-filepath": "1.0.1"
-+      },
-+      "dependencies": {
-+        "expand-tilde": {
-+          "version": "2.0.2",
-+          "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-+          "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
-+          "dev": true,
-+          "requires": {
-+            "homedir-polyfill": "1.0.1"
-+          }
-+        }
-+      }
-+    },
-+    "first-chunk-stream": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz",
-+      "integrity": "sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=",
-+      "dev": true
-+    },
-+    "flagged-respawn": {
-+      "version": "0.3.2",
-+      "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.2.tgz",
-+      "integrity": "sha1-/xke3c1wiKZ1smEP/8l2vpuAdLU=",
-+      "dev": true
-+    },
-+    "flat-cache": {
-+      "version": "1.2.2",
-+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.2.2.tgz",
-+      "integrity": "sha1-+oZxTnLCHbiGAXYezy9VXRq8a5Y=",
-+      "dev": true,
-+      "requires": {
-+        "circular-json": "0.3.1",
-+        "del": "2.2.2",
-+        "graceful-fs": "4.1.11",
-+        "write": "0.2.1"
-+      }
-+    },
-+    "flatpak-bundler": {
-+      "version": "0.1.3",
-+      "resolved": "https://registry.npmjs.org/flatpak-bundler/-/flatpak-bundler-0.1.3.tgz",
-+      "integrity": "sha1-5F36DEp0hcNw4JFeRyiSl5hQOUY=",
-+      "dev": true,
-+      "requires": {
-+        "debug": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-+        "es6-promisify": "5.0.0",
-+        "fs-extra": "0.30.0",
-+        "lodash": "4.17.4",
-+        "tmp": "0.0.29"
-+      }
-+    },
-+    "flatten": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz",
-+      "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=",
-+      "dev": true
-+    },
-+    "for-in": {
-+      "version": "https://registry.npmjs.org/for-in/-/for-in-0.1.5.tgz",
-+      "integrity": "sha1-AHN04rbVxnQgoUeb23WgSHK3OMQ=",
-+      "dev": true
-+    },
-+    "for-own": {
-+      "version": "https://registry.npmjs.org/for-own/-/for-own-0.1.4.tgz",
-+      "integrity": "sha1-AUm0GjkIjHUV9R6+HBOG1F+TUHI=",
-+      "dev": true,
-+      "requires": {
-+        "for-in": "https://registry.npmjs.org/for-in/-/for-in-0.1.5.tgz"
-+      }
-+    },
-+    "forever-agent": {
-+      "version": "0.5.2",
-+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz",
-+      "integrity": "sha1-bQ4JxJIflKJ/Y9O0nF/v8epMUTA=",
-+      "dev": true
-+    },
-+    "form-data": {
-+      "version": "0.1.4",
-+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
-+      "integrity": "sha1-kavXiKupcCsaq/qLwBAxoqyeOxI=",
-+      "dev": true,
-+      "requires": {
-+        "async": "0.9.2",
-+        "combined-stream": "0.0.7",
-+        "mime": "1.2.11"
-+      }
-+    },
-+    "formatio": {
-+      "version": "1.1.1",
-+      "resolved": "https://registry.npmjs.org/formatio/-/formatio-1.1.1.tgz",
-+      "integrity": "sha1-XtPM1jZVEJc4NGXZlhmRAOhhYek=",
-+      "dev": true,
-+      "requires": {
-+        "samsam": "1.1.2"
-+      }
-+    },
-+    "forwarded": {
-+      "version": "0.1.0",
-+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz",
-+      "integrity": "sha1-Ge+YdMSuHCl7zweP3mOgm2aoQ2M=",
-+      "dev": true
-+    },
-+    "fresh": {
-+      "version": "0.5.0",
-+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.0.tgz",
-+      "integrity": "sha1-9HTKXmqSRtb9jglTz6m5yAWvp44=",
-+      "dev": true
-+    },
-+    "from": {
-+      "version": "0.1.7",
-+      "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
-+      "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=",
-+      "dev": true
-+    },
-+    "fs-exists-sync": {
-+      "version": "0.1.0",
-+      "resolved": "https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz",
-+      "integrity": "sha1-mC1ok6+RjnLQjeyehnP/K1qNat0=",
-+      "dev": true
-+    },
-+    "fs-extra": {
-+      "version": "0.30.0",
-+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
-+      "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=",
-+      "dev": true,
-+      "requires": {
-+        "graceful-fs": "4.1.11",
-+        "jsonfile": "2.4.0",
-+        "klaw": "1.3.1",
-+        "path-is-absolute": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz",
-+        "rimraf": "2.6.1"
-+      }
-+    },
-+    "fs.realpath": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
-+    },
-+    "fsevents": {
-+      "version": "git+https://github.com/bpasero/fsevents.git#fe2aaccaaffbd69a23374cf46a8c6bafe8e51b01",
-+      "optional": true,
-+      "requires": {
-+        "nan": "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz"
-+      }
-+    },
-+    "function-bind": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz",
-+      "integrity": "sha1-FhdnFMgBeY5Ojyz391KUZ7tKV3E=",
-+      "dev": true
-+    },
-+    "gaze": {
-+      "version": "0.5.2",
-+      "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz",
-+      "integrity": "sha1-QLcJU30k0dRXZ9takIaJ3+aaxE8=",
-+      "dev": true,
-+      "requires": {
-+        "globule": "0.1.0"
-+      }
-+    },
-+    "gc-signals": {
-+      "version": "0.0.1",
-+      "resolved": "https://registry.npmjs.org/gc-signals/-/gc-signals-0.0.1.tgz",
-+      "integrity": "sha1-keO3kEFotYqj3Hi2Gbe0SVtAOKs="
-+    },
-+    "generate-function": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
-+      "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=",
-+      "dev": true
-+    },
-+    "generate-object-property": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
-+      "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
-+      "dev": true,
-+      "requires": {
-+        "is-property": "1.0.2"
-+      }
-+    },
-+    "get-stdin": {
-+      "version": "4.0.1",
-+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-+      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-+      "dev": true
-+    },
-+    "get-stream": {
-+      "version": "3.0.0",
-+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-+      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-+      "dev": true
-+    },
-+    "getmac": {
-+      "version": "1.0.7",
-+      "resolved": "https://registry.npmjs.org/getmac/-/getmac-1.0.7.tgz",
-+      "integrity": "sha1-lEYPl3hpjS4VmgPabBZWifIs3Wc=",
-+      "requires": {
-+        "extract-opts": "2.2.0"
-+      },
-+      "dependencies": {
-+        "extract-opts": {
-+          "version": "2.2.0",
-+          "resolved": "https://registry.npmjs.org/extract-opts/-/extract-opts-2.2.0.tgz",
-+          "integrity": "sha1-H6KOunNSxttID4hc63GkaBC+bX0=",
-+          "requires": {
-+            "typechecker": "2.0.8"
-+          }
-+        },
-+        "typechecker": {
-+          "version": "2.0.8",
-+          "resolved": "https://registry.npmjs.org/typechecker/-/typechecker-2.0.8.tgz",
-+          "integrity": "sha1-6D2oS7ZMWEzLNFg4V2xAsDN9uC4="
-+        }
-+      }
-+    },
-+    "getobject": {
-+      "version": "0.1.0",
-+      "resolved": "https://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz",
-+      "integrity": "sha1-BHpEl4n6Fg0Bj1SG7ZEyC27HiFw=",
-+      "dev": true
-+    },
-+    "getpass": {
-+      "version": "0.1.7",
-+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-+      "dev": true,
-+      "requires": {
-+        "assert-plus": "1.0.0"
-+      },
-+      "dependencies": {
-+        "assert-plus": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "github-releases": {
-+      "version": "0.2.1",
-+      "resolved": "https://registry.npmjs.org/github-releases/-/github-releases-0.2.1.tgz",
-+      "integrity": "sha1-kcrjzHQA0LYUSkNxzK3d3xwC21g=",
-+      "dev": true,
-+      "requires": {
-+        "grunt": "0.4.5",
-+        "minimatch": "0.2.12",
-+        "optimist": "0.4.0",
-+        "prettyjson": "0.8.1",
-+        "request": "2.27.0"
-+      },
-+      "dependencies": {
-+        "minimatch": {
-+          "version": "0.2.12",
-+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.12.tgz",
-+          "integrity": "sha1-6oKgEqxmLH3fqhRPHBR+aUb12vs=",
-+          "dev": true,
-+          "requires": {
-+            "lru-cache": "2.7.3",
-+            "sigmund": "1.0.1"
-+          }
-+        },
-+        "optimist": {
-+          "version": "0.4.0",
-+          "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.4.0.tgz",
-+          "integrity": "sha1-y47Dfy/jqphky2eidSUOfhliCiU=",
-+          "dev": true,
-+          "requires": {
-+            "wordwrap": "0.0.3"
-+          }
-+        },
-+        "wordwrap": {
-+          "version": "0.0.3",
-+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-+          "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "glob": {
-+      "version": "5.0.15",
-+      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-+      "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-+      "dev": true,
-+      "requires": {
-+        "inflight": "1.0.6",
-+        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-+        "minimatch": "2.0.10",
-+        "once": "1.4.0",
-+        "path-is-absolute": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-+      }
-+    },
-+    "glob-base": {
-+      "version": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
-+      "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
-+      "dev": true,
-+      "requires": {
-+        "glob-parent": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-+        "is-glob": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz"
-+      }
-+    },
-+    "glob-expand": {
-+      "version": "0.2.1",
-+      "resolved": "https://registry.npmjs.org/glob-expand/-/glob-expand-0.2.1.tgz",
-+      "integrity": "sha1-GwiKwnK1cViHC3aBYRHaRhimag8=",
-+      "dev": true,
-+      "requires": {
-+        "glob": "4.5.3",
-+        "lodash": "4.13.1"
-+      },
-+      "dependencies": {
-+        "glob": {
-+          "version": "4.5.3",
-+          "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
-+          "integrity": "sha1-xstz0yJsHv7wTePFbQEvAzd+4V8=",
-+          "dev": true,
-+          "requires": {
-+            "inflight": "1.0.6",
-+            "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-+            "minimatch": "2.0.10",
-+            "once": "1.4.0"
-+          }
-+        },
-+        "lodash": {
-+          "version": "4.13.1",
-+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz",
-+          "integrity": "sha1-g+SxCRP0hJbU0W/sSlYK8u50S2g=",
-+          "dev": true
-+        },
-+        "minimatch": {
-+          "version": "2.0.10",
-+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-+          "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=",
-+          "dev": true,
-+          "requires": {
-+            "brace-expansion": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz"
-+          }
-+        }
-+      }
-+    },
-+    "glob-parent": {
-+      "version": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-+      "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
-+      "dev": true,
-+      "requires": {
-+        "is-glob": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz"
-+      }
-+    },
-+    "glob-stream": {
-+      "version": "3.1.18",
-+      "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
-+      "integrity": "sha1-kXCl8St5Awb9/lmPMT+PeVT9FDs=",
-+      "dev": true,
-+      "requires": {
-+        "glob": "4.5.3",
-+        "glob2base": "0.0.12",
-+        "minimatch": "2.0.10",
-+        "ordered-read-streams": "0.1.0",
-+        "through2": "0.6.5",
-+        "unique-stream": "1.0.0"
-+      },
-+      "dependencies": {
-+        "glob": {
-+          "version": "4.5.3",
-+          "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
-+          "integrity": "sha1-xstz0yJsHv7wTePFbQEvAzd+4V8=",
-+          "dev": true,
-+          "requires": {
-+            "inflight": "1.0.6",
-+            "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-+            "minimatch": "2.0.10",
-+            "once": "1.4.0"
-+          }
-+        },
-+        "isarray": {
-+          "version": "0.0.1",
-+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-+          "dev": true
-+        },
-+        "minimatch": {
-+          "version": "2.0.10",
-+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-+          "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=",
-+          "dev": true,
-+          "requires": {
-+            "brace-expansion": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz"
-+          }
-+        },
-+        "readable-stream": {
-+          "version": "1.0.34",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-+          "dev": true,
-+          "requires": {
-+            "core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-+            "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-+            "isarray": "0.0.1",
-+            "string_decoder": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-+          }
-+        },
-+        "through2": {
-+          "version": "0.6.5",
-+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-+          "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-+          "dev": true,
-+          "requires": {
-+            "readable-stream": "1.0.34",
-+            "xtend": "4.0.1"
-+          }
-+        }
-+      }
-+    },
-+    "glob-watcher": {
-+      "version": "0.0.6",
-+      "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
-+      "integrity": "sha1-uVtKjfdLOcgymLDAXJeLTZo7cQs=",
-+      "dev": true,
-+      "requires": {
-+        "gaze": "0.5.2"
-+      }
-+    },
-+    "glob2base": {
-+      "version": "0.0.12",
-+      "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
-+      "integrity": "sha1-nUGbPijxLoOjYhZKJ3BVkiycDVY=",
-+      "dev": true,
-+      "requires": {
-+        "find-index": "0.1.1"
-+      }
-+    },
-+    "global-modules": {
-+      "version": "0.2.3",
-+      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz",
-+      "integrity": "sha1-6lo77ULG1s6ZWk+KEmm12uIjgo0=",
-+      "dev": true,
-+      "requires": {
-+        "global-prefix": "0.1.5",
-+        "is-windows": "0.2.0"
-+      }
-+    },
-+    "global-prefix": {
-+      "version": "0.1.5",
-+      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz",
-+      "integrity": "sha1-jTvGuNo8qBEqFg2NSW/wRiv+948=",
-+      "dev": true,
-+      "requires": {
-+        "homedir-polyfill": "1.0.1",
-+        "ini": "1.3.4",
-+        "is-windows": "0.2.0",
-+        "which": "1.2.14"
-+      }
-+    },
-+    "globals": {
-+      "version": "9.18.0",
-+      "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-+      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-+      "dev": true
-+    },
-+    "globby": {
-+      "version": "5.0.0",
-+      "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
-+      "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
-+      "dev": true,
-+      "requires": {
-+        "array-union": "1.0.2",
-+        "arrify": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-+        "glob": "7.1.2",
-+        "object-assign": "4.1.1",
-+        "pify": "2.3.0",
-+        "pinkie-promise": "2.0.1"
-+      },
-+      "dependencies": {
-+        "balanced-match": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-+          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-+          "dev": true
-+        },
-+        "brace-expansion": {
-+          "version": "1.1.8",
-+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
-+          "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
-+          "dev": true,
-+          "requires": {
-+            "balanced-match": "1.0.0",
-+            "concat-map": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-+          }
-+        },
-+        "glob": {
-+          "version": "7.1.2",
-+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+          "dev": true,
-+          "requires": {
-+            "fs.realpath": "1.0.0",
-+            "inflight": "1.0.6",
-+            "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-+            "minimatch": "3.0.4",
-+            "once": "1.4.0",
-+            "path-is-absolute": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-+          }
-+        },
-+        "minimatch": {
-+          "version": "3.0.4",
-+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-+          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-+          "dev": true,
-+          "requires": {
-+            "brace-expansion": "1.1.8"
-+          }
-+        }
-+      }
-+    },
-+    "globule": {
-+      "version": "0.1.0",
-+      "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
-+      "integrity": "sha1-2cjt3h2nnRJaFRt5UzuXhnY0auU=",
-+      "dev": true,
-+      "requires": {
-+        "glob": "3.1.21",
-+        "lodash": "1.0.2",
-+        "minimatch": "0.2.14"
-+      },
-+      "dependencies": {
-+        "glob": {
-+          "version": "3.1.21",
-+          "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
-+          "integrity": "sha1-0p4KBV3qUTj00H7UDomC6DwgZs0=",
-+          "dev": true,
-+          "requires": {
-+            "graceful-fs": "1.2.3",
-+            "inherits": "1.0.2",
-+            "minimatch": "0.2.14"
-+          }
-+        },
-+        "graceful-fs": {
-+          "version": "1.2.3",
-+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz",
-+          "integrity": "sha1-FaSAaldUfLLS2/J/QuiajDRRs2Q=",
-+          "dev": true
-+        },
-+        "inherits": {
-+          "version": "1.0.2",
-+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz",
-+          "integrity": "sha1-ykMJ2t7mtUzAuNJH6NfHoJdb3Js=",
-+          "dev": true
-+        },
-+        "lodash": {
-+          "version": "1.0.2",
-+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz",
-+          "integrity": "sha1-j1dWDIO1n8JwvT1WG2kAQ0MOJVE=",
-+          "dev": true
-+        },
-+        "minimatch": {
-+          "version": "0.2.14",
-+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
-+          "integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=",
-+          "dev": true,
-+          "requires": {
-+            "lru-cache": "2.7.3",
-+            "sigmund": "1.0.1"
-+          }
-+        }
-+      }
-+    },
-+    "glogg": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz",
-+      "integrity": "sha1-f+DxmfV6yQbPUS/urY+Q7kooT8U=",
-+      "dev": true,
-+      "requires": {
-+        "sparkles": "1.0.0"
-+      }
-+    },
-+    "gm": {
-+      "version": "1.23.0",
-+      "resolved": "https://registry.npmjs.org/gm/-/gm-1.23.0.tgz",
-+      "integrity": "sha1-gKL+nL8TFRUCSEZERlhGEmn1JmE=",
-+      "dev": true,
-+      "requires": {
-+        "array-parallel": "0.1.3",
-+        "array-series": "0.1.5",
-+        "cross-spawn": "4.0.2",
-+        "debug": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"
-+      }
-+    },
-+    "got": {
-+      "version": "6.7.1",
-+      "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
-+      "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
-+      "dev": true,
-+      "requires": {
-+        "create-error-class": "3.0.2",
-+        "duplexer3": "0.1.4",
-+        "get-stream": "3.0.0",
-+        "is-redirect": "1.0.0",
-+        "is-retry-allowed": "1.1.0",
-+        "is-stream": "1.1.0",
-+        "lowercase-keys": "1.0.0",
-+        "safe-buffer": "5.1.1",
-+        "timed-out": "4.0.1",
-+        "unzip-response": "2.0.1",
-+        "url-parse-lax": "1.0.0"
-+      }
-+    },
-+    "graceful-fs": {
-+      "version": "4.1.11",
-+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
-+    },
-+    "graceful-readlink": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
-+      "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
-+      "dev": true
-+    },
-+    "growl": {
-+      "version": "1.9.2",
-+      "resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz",
-+      "integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=",
-+      "dev": true
-+    },
-+    "grunt": {
-+      "version": "0.4.5",
-+      "resolved": "https://registry.npmjs.org/grunt/-/grunt-0.4.5.tgz",
-+      "integrity": "sha1-VpN81RlDJK3/bSB2MYMqnWuk5/A=",
-+      "dev": true,
-+      "requires": {
-+        "async": "0.1.22",
-+        "coffee-script": "1.3.3",
-+        "colors": "0.6.2",
-+        "dateformat": "1.0.2-1.2.3",
-+        "eventemitter2": "0.4.14",
-+        "exit": "0.1.2",
-+        "findup-sync": "0.1.3",
-+        "getobject": "0.1.0",
-+        "glob": "3.1.21",
-+        "grunt-legacy-log": "0.1.3",
-+        "grunt-legacy-util": "0.2.0",
-+        "hooker": "0.2.3",
-+        "iconv-lite": "0.2.11",
-+        "js-yaml": "2.0.5",
-+        "lodash": "0.9.2",
-+        "minimatch": "0.2.14",
-+        "nopt": "1.0.10",
-+        "rimraf": "2.2.8",
-+        "underscore.string": "2.2.1",
-+        "which": "1.0.9"
-+      },
-+      "dependencies": {
-+        "argparse": {
-+          "version": "0.1.16",
-+          "resolved": "https://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz",
-+          "integrity": "sha1-z9AeD7uj1srtBJ+9dY1A9lGW9Xw=",
-+          "dev": true,
-+          "requires": {
-+            "underscore": "1.7.0",
-+            "underscore.string": "2.4.0"
-+          },
-+          "dependencies": {
-+            "underscore.string": {
-+              "version": "2.4.0",
-+              "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz",
-+              "integrity": "sha1-jN2PusTi0uoefi6Al8QvRCKA+Fs=",
-+              "dev": true
-+            }
-+          }
-+        },
-+        "async": {
-+          "version": "0.1.22",
-+          "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz",
-+          "integrity": "sha1-D8GqoIig4+8Ovi2IMbqw3PiEUGE=",
-+          "dev": true
-+        },
-+        "coffee-script": {
-+          "version": "1.3.3",
-+          "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.3.3.tgz",
-+          "integrity": "sha1-FQ1rTLUiiUNp7+1qIQHCC8f0pPQ=",
-+          "dev": true
-+        },
-+        "dateformat": {
-+          "version": "1.0.2-1.2.3",
-+          "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz",
-+          "integrity": "sha1-sCIMAt6YYXQztyhRz0fePfLNvuk=",
-+          "dev": true
-+        },
-+        "esprima": {
-+          "version": "1.0.4",
-+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz",
-+          "integrity": "sha1-n1V+CPw7TSbs6d00+Pv0drYlha0=",
-+          "dev": true
-+        },
-+        "findup-sync": {
-+          "version": "0.1.3",
-+          "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
-+          "integrity": "sha1-fz56l7gjksZTvwZYm9hRkOk8NoM=",
-+          "dev": true,
-+          "requires": {
-+            "glob": "3.2.11",
-+            "lodash": "2.4.2"
-+          },
-+          "dependencies": {
-+            "glob": {
-+              "version": "3.2.11",
-+              "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
-+              "integrity": "sha1-Spc/Y1uRkPcV0QmH1cAP0oFevj0=",
-+              "dev": true,
-+              "requires": {
-+                "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-+                "minimatch": "0.3.0"
-+              }
-+            },
-+            "lodash": {
-+              "version": "2.4.2",
-+              "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
-+              "integrity": "sha1-+t2DS5aDBz2hebPq5tnA0VBT9z4=",
-+              "dev": true
-+            },
-+            "minimatch": {
-+              "version": "0.3.0",
-+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
-+              "integrity": "sha1-J12O2qxPG7MyZHIInnlJyDlGmd0=",
-+              "dev": true,
-+              "requires": {
-+                "lru-cache": "2.7.3",
-+                "sigmund": "1.0.1"
-+              }
-+            }
-+          }
-+        },
-+        "glob": {
-+          "version": "3.1.21",
-+          "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
-+          "integrity": "sha1-0p4KBV3qUTj00H7UDomC6DwgZs0=",
-+          "dev": true,
-+          "requires": {
-+            "graceful-fs": "1.2.3",
-+            "inherits": "1.0.2",
-+            "minimatch": "0.2.14"
-+          },
-+          "dependencies": {
-+            "inherits": {
-+              "version": "1.0.2",
-+              "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz",
-+              "integrity": "sha1-ykMJ2t7mtUzAuNJH6NfHoJdb3Js=",
-+              "dev": true
-+            }
-+          }
-+        },
-+        "graceful-fs": {
-+          "version": "1.2.3",
-+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz",
-+          "integrity": "sha1-FaSAaldUfLLS2/J/QuiajDRRs2Q=",
-+          "dev": true
-+        },
-+        "iconv-lite": {
-+          "version": "0.2.11",
-+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz",
-+          "integrity": "sha1-HOYKOleGSiktEyH/RgnKS7llrcg=",
-+          "dev": true
-+        },
-+        "js-yaml": {
-+          "version": "2.0.5",
-+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-2.0.5.tgz",
-+          "integrity": "sha1-olrmUJmZ6X3yeMZxnaEb0Gh3Q6g=",
-+          "dev": true,
-+          "requires": {
-+            "argparse": "0.1.16",
-+            "esprima": "1.0.4"
-+          }
-+        },
-+        "lodash": {
-+          "version": "0.9.2",
-+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-0.9.2.tgz",
-+          "integrity": "sha1-jzSZxSRdNG1oLlsNO0B2fgnxqSw=",
-+          "dev": true
-+        },
-+        "minimatch": {
-+          "version": "0.2.14",
-+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
-+          "integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=",
-+          "dev": true,
-+          "requires": {
-+            "lru-cache": "2.7.3",
-+            "sigmund": "1.0.1"
-+          }
-+        },
-+        "rimraf": {
-+          "version": "2.2.8",
-+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
-+          "integrity": "sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI=",
-+          "dev": true
-+        },
-+        "underscore": {
-+          "version": "1.7.0",
-+          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz",
-+          "integrity": "sha1-a7rwh3UA02vjTsqlhODbn+8DUgk=",
-+          "dev": true
-+        },
-+        "which": {
-+          "version": "1.0.9",
-+          "resolved": "https://registry.npmjs.org/which/-/which-1.0.9.tgz",
-+          "integrity": "sha1-RgwdoPgQED0DIam2M6+eV15kSG8=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "grunt-legacy-log": {
-+      "version": "0.1.3",
-+      "resolved": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-0.1.3.tgz",
-+      "integrity": "sha1-7ClCboAwIa9ZAp+H0vnNczWgVTE=",
-+      "dev": true,
-+      "requires": {
-+        "colors": "0.6.2",
-+        "grunt-legacy-log-utils": "0.1.1",
-+        "hooker": "0.2.3",
-+        "lodash": "2.4.2",
-+        "underscore.string": "2.3.3"
-+      },
-+      "dependencies": {
-+        "lodash": {
-+          "version": "2.4.2",
-+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
-+          "integrity": "sha1-+t2DS5aDBz2hebPq5tnA0VBT9z4=",
-+          "dev": true
-+        },
-+        "underscore.string": {
-+          "version": "2.3.3",
-+          "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz",
-+          "integrity": "sha1-ccCL9rQosRM/N+ePo6Icgvcymw0=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "grunt-legacy-log-utils": {
-+      "version": "0.1.1",
-+      "resolved": "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-0.1.1.tgz",
-+      "integrity": "sha1-wHBrndkGThFvNvI/5OawSGcsD34=",
-+      "dev": true,
-+      "requires": {
-+        "colors": "0.6.2",
-+        "lodash": "2.4.2",
-+        "underscore.string": "2.3.3"
-+      },
-+      "dependencies": {
-+        "lodash": {
-+          "version": "2.4.2",
-+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
-+          "integrity": "sha1-+t2DS5aDBz2hebPq5tnA0VBT9z4=",
-+          "dev": true
-+        },
-+        "underscore.string": {
-+          "version": "2.3.3",
-+          "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz",
-+          "integrity": "sha1-ccCL9rQosRM/N+ePo6Icgvcymw0=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "grunt-legacy-util": {
-+      "version": "0.2.0",
-+      "resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.2.0.tgz",
-+      "integrity": "sha1-kzJIhNv343qf98Am3/RR2UqeVUs=",
-+      "dev": true,
-+      "requires": {
-+        "async": "0.1.22",
-+        "exit": "0.1.2",
-+        "getobject": "0.1.0",
-+        "hooker": "0.2.3",
-+        "lodash": "0.9.2",
-+        "underscore.string": "2.2.1",
-+        "which": "1.0.9"
-+      },
-+      "dependencies": {
-+        "async": {
-+          "version": "0.1.22",
-+          "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz",
-+          "integrity": "sha1-D8GqoIig4+8Ovi2IMbqw3PiEUGE=",
-+          "dev": true
-+        },
-+        "lodash": {
-+          "version": "0.9.2",
-+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-0.9.2.tgz",
-+          "integrity": "sha1-jzSZxSRdNG1oLlsNO0B2fgnxqSw=",
-+          "dev": true
-+        },
-+        "which": {
-+          "version": "1.0.9",
-+          "resolved": "https://registry.npmjs.org/which/-/which-1.0.9.tgz",
-+          "integrity": "sha1-RgwdoPgQED0DIam2M6+eV15kSG8=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "gulp": {
-+      "version": "3.9.1",
-+      "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz",
-+      "integrity": "sha1-VxzkWSjdQK9lFPxAEYZgFsE4RbQ=",
-+      "dev": true,
-+      "requires": {
-+        "archy": "1.0.0",
-+        "chalk": "1.1.3",
-+        "deprecated": "0.0.1",
-+        "gulp-util": "3.0.8",
-+        "interpret": "1.0.3",
-+        "liftoff": "2.3.0",
-+        "minimist": "1.2.0",
-+        "orchestrator": "0.3.8",
-+        "pretty-hrtime": "1.0.3",
-+        "semver": "4.3.6",
-+        "tildify": "1.2.0",
-+        "v8flags": "2.1.1",
-+        "vinyl-fs": "0.3.14"
-+      },
-+      "dependencies": {
-+        "graceful-fs": {
-+          "version": "3.0.11",
-+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz",
-+          "integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=",
-+          "dev": true,
-+          "requires": {
-+            "natives": "1.1.0"
-+          }
-+        },
-+        "isarray": {
-+          "version": "0.0.1",
-+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-+          "dev": true
-+        },
-+        "readable-stream": {
-+          "version": "1.0.34",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-+          "dev": true,
-+          "requires": {
-+            "core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-+            "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-+            "isarray": "0.0.1",
-+            "string_decoder": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-+          }
-+        },
-+        "strip-bom": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
-+          "integrity": "sha1-hbiGLzhEtabV7IRnqTWYFzo295Q=",
-+          "dev": true,
-+          "requires": {
-+            "first-chunk-stream": "1.0.0",
-+            "is-utf8": "0.2.1"
-+          }
-+        },
-+        "through2": {
-+          "version": "0.6.5",
-+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-+          "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-+          "dev": true,
-+          "requires": {
-+            "readable-stream": "1.0.34",
-+            "xtend": "4.0.1"
-+          }
-+        },
-+        "vinyl-fs": {
-+          "version": "0.3.14",
-+          "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.14.tgz",
-+          "integrity": "sha1-mmhRzhysHBzqX+hsCTHWIMLPqeY=",
-+          "dev": true,
-+          "requires": {
-+            "defaults": "1.0.3",
-+            "glob-stream": "3.1.18",
-+            "glob-watcher": "0.0.6",
-+            "graceful-fs": "3.0.11",
-+            "mkdirp": "0.5.1",
-+            "strip-bom": "1.0.0",
-+            "through2": "0.6.5",
-+            "vinyl": "0.4.6"
-+          }
-+        }
-+      }
-+    },
-+    "gulp-atom-electron": {
-+      "version": "1.14.0",
-+      "resolved": "https://registry.npmjs.org/gulp-atom-electron/-/gulp-atom-electron-1.14.0.tgz",
-+      "integrity": "sha1-LjkzjK4D0R1m7wD6MXPaR9/VWY4=",
-+      "dev": true,
-+      "requires": {
-+        "event-stream": "3.3.4",
-+        "github-releases": "0.2.1",
-+        "gulp-filter": "4.0.0",
-+        "gulp-rename": "1.2.2",
-+        "gulp-symdest": "1.1.0",
-+        "gulp-vinyl-zip": "1.4.0",
-+        "mkdirp": "0.5.1",
-+        "object-assign": "4.1.1",
-+        "plist": "1.2.0",
-+        "progress": "1.1.8",
-+        "rcedit": "0.3.0",
-+        "rimraf": "2.6.1",
-+        "semver": "4.3.6",
-+        "temp": "0.8.3",
-+        "vinyl": "0.5.3",
-+        "vinyl-fs": "0.3.14"
-+      },
-+      "dependencies": {
-+        "graceful-fs": {
-+          "version": "3.0.11",
-+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz",
-+          "integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=",
-+          "dev": true,
-+          "requires": {
-+            "natives": "1.1.0"
-+          }
-+        },
-+        "gulp-filter": {
-+          "version": "4.0.0",
-+          "resolved": "https://registry.npmjs.org/gulp-filter/-/gulp-filter-4.0.0.tgz",
-+          "integrity": "sha1-OV9YolbFWc254NFX8cqvUkijjcs=",
-+          "dev": true,
-+          "requires": {
-+            "gulp-util": "3.0.8",
-+            "multimatch": "2.1.0",
-+            "streamfilter": "1.0.5"
-+          }
-+        },
-+        "isarray": {
-+          "version": "0.0.1",
-+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-+          "dev": true
-+        },
-+        "readable-stream": {
-+          "version": "1.0.34",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-+          "dev": true,
-+          "requires": {
-+            "core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-+            "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-+            "isarray": "0.0.1",
-+            "string_decoder": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-+          }
-+        },
-+        "strip-bom": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
-+          "integrity": "sha1-hbiGLzhEtabV7IRnqTWYFzo295Q=",
-+          "dev": true,
-+          "requires": {
-+            "first-chunk-stream": "1.0.0",
-+            "is-utf8": "0.2.1"
-+          }
-+        },
-+        "through2": {
-+          "version": "0.6.5",
-+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-+          "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-+          "dev": true,
-+          "requires": {
-+            "readable-stream": "1.0.34",
-+            "xtend": "4.0.1"
-+          }
-+        },
-+        "vinyl": {
-+          "version": "0.5.3",
-+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
-+          "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=",
-+          "dev": true,
-+          "requires": {
-+            "clone": "1.0.2",
-+            "clone-stats": "0.0.1",
-+            "replace-ext": "0.0.1"
-+          }
-+        },
-+        "vinyl-fs": {
-+          "version": "0.3.14",
-+          "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.14.tgz",
-+          "integrity": "sha1-mmhRzhysHBzqX+hsCTHWIMLPqeY=",
-+          "dev": true,
-+          "requires": {
-+            "defaults": "1.0.3",
-+            "glob-stream": "3.1.18",
-+            "glob-watcher": "0.0.6",
-+            "graceful-fs": "3.0.11",
-+            "mkdirp": "0.5.1",
-+            "strip-bom": "1.0.0",
-+            "through2": "0.6.5",
-+            "vinyl": "0.4.6"
-+          },
-+          "dependencies": {
-+            "clone": {
-+              "version": "0.2.0",
-+              "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
-+              "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-+              "dev": true
-+            },
-+            "vinyl": {
-+              "version": "0.4.6",
-+              "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
-+              "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
-+              "dev": true,
-+              "requires": {
-+                "clone": "0.2.0",
-+                "clone-stats": "0.0.1"
-+              }
-+            }
-+          }
-+        }
-+      }
-+    },
-+    "gulp-azure-storage": {
-+      "version": "0.7.1",
-+      "resolved": "https://registry.npmjs.org/gulp-azure-storage/-/gulp-azure-storage-0.7.1.tgz",
-+      "integrity": "sha1-kGDs3sTh4jn+UlnZ1xAdojWs28Y=",
-+      "dev": true,
-+      "requires": {
-+        "azure-storage": "1.4.0",
-+        "delayed-stream": "0.0.6",
-+        "event-stream": "3.3.4",
-+        "mime": "1.3.6",
-+        "optimist": "0.6.1",
-+        "progress": "1.1.8",
-+        "queue": "3.1.0",
-+        "streamifier": "0.1.1",
-+        "vinyl": "0.4.6",
-+        "vinyl-fs": "0.3.14"
-+      },
-+      "dependencies": {
-+        "assert-plus": {
-+          "version": "0.2.0",
-+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
-+          "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
-+          "dev": true
-+        },
-+        "async": {
-+          "version": "2.5.0",
-+          "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz",
-+          "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==",
-+          "dev": true,
-+          "requires": {
-+            "lodash": "4.17.4"
-+          }
-+        },
-+        "azure-storage": {
-+          "version": "1.4.0",
-+          "resolved": "https://registry.npmjs.org/azure-storage/-/azure-storage-1.4.0.tgz",
-+          "integrity": "sha1-+1L6aLPvppgMM/18XNSJt63EbtE=",
-+          "dev": true,
-+          "requires": {
-+            "browserify-mime": "1.2.9",
-+            "extend": "1.2.1",
-+            "json-edm-parser": "0.1.2",
-+            "node-uuid": "1.4.8",
-+            "readable-stream": "2.0.6",
-+            "request": "2.74.0",
-+            "underscore": "1.4.4",
-+            "validator": "3.22.2",
-+            "xml2js": "0.2.7",
-+            "xmlbuilder": "0.4.3"
-+          }
-+        },
-+        "boom": {
-+          "version": "2.10.1",
-+          "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
-+          "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
-+          "dev": true,
-+          "requires": {
-+            "hoek": "2.16.3"
-+          }
-+        },
-+        "combined-stream": {
-+          "version": "1.0.5",
-+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-+          "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
-+          "dev": true,
-+          "requires": {
-+            "delayed-stream": "1.0.0"
-+          },
-+          "dependencies": {
-+            "delayed-stream": {
-+              "version": "1.0.0",
-+              "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-+              "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-+              "dev": true
-+            }
-+          }
-+        },
-+        "cryptiles": {
-+          "version": "2.0.5",
-+          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-+          "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
-+          "dev": true,
-+          "requires": {
-+            "boom": "2.10.1"
-+          }
-+        },
-+        "delayed-stream": {
-+          "version": "0.0.6",
-+          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.6.tgz",
-+          "integrity": "sha1-omRst+w9XXd0YUZwp6Zd4MFz7bw=",
-+          "dev": true
-+        },
-+        "extend": {
-+          "version": "1.2.1",
-+          "resolved": "https://registry.npmjs.org/extend/-/extend-1.2.1.tgz",
-+          "integrity": "sha1-oPX9bPyDpf5J72mNYOyKYk3UV2w=",
-+          "dev": true
-+        },
-+        "forever-agent": {
-+          "version": "0.6.1",
-+          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-+          "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-+          "dev": true
-+        },
-+        "form-data": {
-+          "version": "1.0.1",
-+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.1.tgz",
-+          "integrity": "sha1-rjFduaSQf6BlUCMEpm13M0de43w=",
-+          "dev": true,
-+          "requires": {
-+            "async": "2.5.0",
-+            "combined-stream": "1.0.5",
-+            "mime-types": "2.1.15"
-+          }
-+        },
-+        "graceful-fs": {
-+          "version": "3.0.11",
-+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz",
-+          "integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=",
-+          "dev": true,
-+          "requires": {
-+            "natives": "1.1.0"
-+          }
-+        },
-+        "hawk": {
-+          "version": "3.1.3",
-+          "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-+          "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
-+          "dev": true,
-+          "requires": {
-+            "boom": "2.10.1",
-+            "cryptiles": "2.0.5",
-+            "hoek": "2.16.3",
-+            "sntp": "1.0.9"
-+          }
-+        },
-+        "hoek": {
-+          "version": "2.16.3",
-+          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-+          "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-+          "dev": true
-+        },
-+        "http-signature": {
-+          "version": "1.1.1",
-+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
-+          "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
-+          "dev": true,
-+          "requires": {
-+            "assert-plus": "0.2.0",
-+            "jsprim": "1.4.0",
-+            "sshpk": "1.13.1"
-+          }
-+        },
-+        "mime": {
-+          "version": "1.3.6",
-+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.6.tgz",
-+          "integrity": "sha1-WR2E02U6awtKO5343lqoEI5y5eA=",
-+          "dev": true
-+        },
-+        "minimist": {
-+          "version": "0.0.10",
-+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
-+          "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
-+          "dev": true
-+        },
-+        "oauth-sign": {
-+          "version": "0.8.2",
-+          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-+          "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
-+          "dev": true
-+        },
-+        "optimist": {
-+          "version": "0.6.1",
-+          "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
-+          "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
-+          "dev": true,
-+          "requires": {
-+            "minimist": "0.0.10",
-+            "wordwrap": "0.0.3"
-+          }
-+        },
-+        "qs": {
-+          "version": "6.2.3",
-+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.3.tgz",
-+          "integrity": "sha1-HPyyXBCpsrSDBT/zn138kjOQjP4=",
-+          "dev": true
-+        },
-+        "queue": {
-+          "version": "3.1.0",
-+          "resolved": "https://registry.npmjs.org/queue/-/queue-3.1.0.tgz",
-+          "integrity": "sha1-bEnQHwCeIlZ4h4nyv/rGuLmZBYU=",
-+          "dev": true,
-+          "requires": {
-+            "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-+          }
-+        },
-+        "readable-stream": {
-+          "version": "2.0.6",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
-+          "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
-+          "dev": true,
-+          "requires": {
-+            "core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-+            "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-+            "isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-+            "process-nextick-args": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-+            "string_decoder": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-+            "util-deprecate": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-+          }
-+        },
-+        "request": {
-+          "version": "2.74.0",
-+          "resolved": "https://registry.npmjs.org/request/-/request-2.74.0.tgz",
-+          "integrity": "sha1-dpPKdou7DqXIzgjAhKRe+gW4kqs=",
-+          "dev": true,
-+          "requires": {
-+            "aws-sign2": "0.6.0",
-+            "aws4": "1.6.0",
-+            "bl": "1.1.2",
-+            "caseless": "0.11.0",
-+            "combined-stream": "1.0.5",
-+            "extend": "3.0.1",
-+            "forever-agent": "0.6.1",
-+            "form-data": "1.0.1",
-+            "har-validator": "2.0.6",
-+            "hawk": "3.1.3",
-+            "http-signature": "1.1.1",
-+            "is-typedarray": "1.0.0",
-+            "isstream": "0.1.2",
-+            "json-stringify-safe": "5.0.1",
-+            "mime-types": "2.1.15",
-+            "node-uuid": "1.4.8",
-+            "oauth-sign": "0.8.2",
-+            "qs": "6.2.3",
-+            "stringstream": "0.0.5",
-+            "tough-cookie": "2.3.2",
-+            "tunnel-agent": "0.4.3"
-+          },
-+          "dependencies": {
-+            "extend": {
-+              "version": "3.0.1",
-+              "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-+              "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
-+              "dev": true
-+            }
-+          }
-+        },
-+        "sntp": {
-+          "version": "1.0.9",
-+          "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
-+          "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
-+          "dev": true,
-+          "requires": {
-+            "hoek": "2.16.3"
-+          }
-+        },
-+        "strip-bom": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
-+          "integrity": "sha1-hbiGLzhEtabV7IRnqTWYFzo295Q=",
-+          "dev": true,
-+          "requires": {
-+            "first-chunk-stream": "1.0.0",
-+            "is-utf8": "0.2.1"
-+          }
-+        },
-+        "through2": {
-+          "version": "0.6.5",
-+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-+          "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-+          "dev": true,
-+          "requires": {
-+            "readable-stream": "1.0.34",
-+            "xtend": "4.0.1"
-+          },
-+          "dependencies": {
-+            "isarray": {
-+              "version": "0.0.1",
-+              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-+              "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-+              "dev": true
-+            },
-+            "readable-stream": {
-+              "version": "1.0.34",
-+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-+              "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-+              "dev": true,
-+              "requires": {
-+                "core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-+                "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-+                "isarray": "0.0.1",
-+                "string_decoder": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-+              }
-+            }
-+          }
-+        },
-+        "tunnel-agent": {
-+          "version": "0.4.3",
-+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-+          "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
-+          "dev": true
-+        },
-+        "underscore": {
-+          "version": "1.4.4",
-+          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz",
-+          "integrity": "sha1-YaajIBBiKvoHljvzJSA88SI51gQ=",
-+          "dev": true
-+        },
-+        "validator": {
-+          "version": "3.22.2",
-+          "resolved": "https://registry.npmjs.org/validator/-/validator-3.22.2.tgz",
-+          "integrity": "sha1-byl65n9/gqzHbQr9tJ8Y2aCcGMA=",
-+          "dev": true
-+        },
-+        "vinyl-fs": {
-+          "version": "0.3.14",
-+          "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.14.tgz",
-+          "integrity": "sha1-mmhRzhysHBzqX+hsCTHWIMLPqeY=",
-+          "dev": true,
-+          "requires": {
-+            "defaults": "1.0.3",
-+            "glob-stream": "3.1.18",
-+            "glob-watcher": "0.0.6",
-+            "graceful-fs": "3.0.11",
-+            "mkdirp": "0.5.1",
-+            "strip-bom": "1.0.0",
-+            "through2": "0.6.5",
-+            "vinyl": "0.4.6"
-+          }
-+        },
-+        "wordwrap": {
-+          "version": "0.0.3",
-+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-+          "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "gulp-bom": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/gulp-bom/-/gulp-bom-1.0.0.tgz",
-+      "integrity": "sha1-OKGDoHGHvVenki03l3RB83nfKr8=",
-+      "dev": true,
-+      "requires": {
-+        "gulp-util": "3.0.8",
-+        "through2": "2.0.3"
-+      },
-+      "dependencies": {
-+        "through2": {
-+          "version": "2.0.3",
-+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
-+          "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
-+          "dev": true,
-+          "requires": {
-+            "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz",
-+            "xtend": "4.0.1"
-+          }
-+        }
-+      }
-+    },
-+    "gulp-buffer": {
-+      "version": "0.0.2",
-+      "resolved": "https://registry.npmjs.org/gulp-buffer/-/gulp-buffer-0.0.2.tgz",
-+      "integrity": "sha1-r4G0NGEBc2tJlC7GyfqGf/5zcDY=",
-+      "dev": true,
-+      "requires": {
-+        "through2": "0.4.2"
-+      },
-+      "dependencies": {
-+        "isarray": {
-+          "version": "0.0.1",
-+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-+          "dev": true
-+        },
-+        "readable-stream": {
-+          "version": "1.0.34",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-+          "dev": true,
-+          "requires": {
-+            "core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-+            "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-+            "isarray": "0.0.1",
-+            "string_decoder": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-+          }
-+        },
-+        "through2": {
-+          "version": "0.4.2",
-+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
-+          "integrity": "sha1-2/WGYDEVHsg1K7bE22SiKSqEC5s=",
-+          "dev": true,
-+          "requires": {
-+            "readable-stream": "1.0.34",
-+            "xtend": "2.1.2"
-+          }
-+        },
-+        "xtend": {
-+          "version": "2.1.2",
-+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
-+          "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
-+          "dev": true,
-+          "requires": {
-+            "object-keys": "0.4.0"
-+          }
-+        }
-+      }
-+    },
-+    "gulp-concat": {
-+      "version": "2.6.1",
-+      "resolved": "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.1.tgz",
-+      "integrity": "sha1-Yz0WyV2IUEYorQJmVmPO5aR5M1M=",
-+      "dev": true,
-+      "requires": {
-+        "concat-with-sourcemaps": "1.0.4",
-+        "through2": "2.0.3",
-+        "vinyl": "2.1.0"
-+      },
-+      "dependencies": {
-+        "clone": {
-+          "version": "2.1.1",
-+          "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz",
-+          "integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=",
-+          "dev": true
-+        },
-+        "clone-stats": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
-+          "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
-+          "dev": true
-+        },
-+        "replace-ext": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
-+          "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
-+          "dev": true
-+        },
-+        "through2": {
-+          "version": "2.0.3",
-+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
-+          "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
-+          "dev": true,
-+          "requires": {
-+            "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz",
-+            "xtend": "4.0.1"
-+          }
-+        },
-+        "vinyl": {
-+          "version": "2.1.0",
-+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.1.0.tgz",
-+          "integrity": "sha1-Ah+cLPlR1rk5lDyJ617lrdT9kkw=",
-+          "dev": true,
-+          "requires": {
-+            "clone": "2.1.1",
-+            "clone-buffer": "1.0.0",
-+            "clone-stats": "1.0.0",
-+            "cloneable-readable": "1.0.0",
-+            "remove-trailing-separator": "1.0.2",
-+            "replace-ext": "1.0.0"
-+          }
-+        }
-+      }
-+    },
-+    "gulp-cssnano": {
-+      "version": "2.1.2",
-+      "resolved": "https://registry.npmjs.org/gulp-cssnano/-/gulp-cssnano-2.1.2.tgz",
-+      "integrity": "sha1-4IoJdx7FRUpUnxoAW90lbLjl4KM=",
-+      "dev": true,
-+      "requires": {
-+        "cssnano": "3.10.0",
-+        "gulp-util": "3.0.8",
-+        "object-assign": "4.1.1",
-+        "vinyl-sourcemaps-apply": "0.2.1"
-+      }
-+    },
-+    "gulp-eslint": {
-+      "version": "3.0.1",
-+      "resolved": "https://registry.npmjs.org/gulp-eslint/-/gulp-eslint-3.0.1.tgz",
-+      "integrity": "sha1-BOV+PhjGl0JnwSz2hV3HF9SjE70=",
-+      "dev": true,
-+      "requires": {
-+        "bufferstreams": "1.1.1",
-+        "eslint": "3.19.0",
-+        "gulp-util": "3.0.8"
-+      }
-+    },
-+    "gulp-filter": {
-+      "version": "3.0.1",
-+      "resolved": "https://registry.npmjs.org/gulp-filter/-/gulp-filter-3.0.1.tgz",
-+      "integrity": "sha1-fG/85bVj6J3nqQ387/FuyKjLFWI=",
-+      "dev": true,
-+      "requires": {
-+        "gulp-util": "3.0.8",
-+        "multimatch": "2.1.0",
-+        "streamfilter": "1.0.5"
-+      }
-+    },
-+    "gulp-flatmap": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/gulp-flatmap/-/gulp-flatmap-1.0.0.tgz",
-+      "integrity": "sha1-5jTgPP+yY666z9wi3Yzi89dv/pc=",
-+      "dev": true,
-+      "requires": {
-+        "gulp-util": "2.2.20",
-+        "through2": "0.6.5"
-+      },
-+      "dependencies": {
-+        "ansi-regex": {
-+          "version": "0.2.1",
-+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
-+          "integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk=",
-+          "dev": true
-+        },
-+        "ansi-styles": {
-+          "version": "1.1.0",
-+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz",
-+          "integrity": "sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94=",
-+          "dev": true
-+        },
-+        "chalk": {
-+          "version": "0.5.1",
-+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
-+          "integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=",
-+          "dev": true,
-+          "requires": {
-+            "ansi-styles": "1.1.0",
-+            "escape-string-regexp": "1.0.5",
-+            "has-ansi": "0.1.0",
-+            "strip-ansi": "0.3.0",
-+            "supports-color": "0.2.0"
-+          }
-+        },
-+        "dateformat": {
-+          "version": "1.0.12",
-+          "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
-+          "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=",
-+          "dev": true,
-+          "requires": {
-+            "get-stdin": "4.0.1",
-+            "meow": "3.7.0"
-+          }
-+        },
-+        "gulp-util": {
-+          "version": "2.2.20",
-+          "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-2.2.20.tgz",
-+          "integrity": "sha1-1xRuVyiRC9jwR6awseVJvCLb1kw=",
-+          "dev": true,
-+          "requires": {
-+            "chalk": "0.5.1",
-+            "dateformat": "1.0.12",
-+            "lodash._reinterpolate": "2.4.1",
-+            "lodash.template": "2.4.1",
-+            "minimist": "0.2.0",
-+            "multipipe": "0.1.2",
-+            "through2": "0.5.1",
-+            "vinyl": "0.2.3"
-+          },
-+          "dependencies": {
-+            "through2": {
-+              "version": "0.5.1",
-+              "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
-+              "integrity": "sha1-390BLrnHAOIyP9M084rGIqs3Lac=",
-+              "dev": true,
-+              "requires": {
-+                "readable-stream": "1.0.34",
-+                "xtend": "3.0.0"
-+              }
-+            }
-+          }
-+        },
-+        "has-ansi": {
-+          "version": "0.1.0",
-+          "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
-+          "integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=",
-+          "dev": true,
-+          "requires": {
-+            "ansi-regex": "0.2.1"
-+          }
-+        },
-+        "isarray": {
-+          "version": "0.0.1",
-+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-+          "dev": true
-+        },
-+        "lodash._reinterpolate": {
-+          "version": "2.4.1",
-+          "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz",
-+          "integrity": "sha1-TxInqlqHEfxjL1sHofRgequLMiI=",
-+          "dev": true
-+        },
-+        "lodash.escape": {
-+          "version": "2.4.1",
-+          "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz",
-+          "integrity": "sha1-LOEsXghNsKV92l5dHu659dF1o7Q=",
-+          "dev": true,
-+          "requires": {
-+            "lodash._escapehtmlchar": "2.4.1",
-+            "lodash._reunescapedhtml": "2.4.1",
-+            "lodash.keys": "2.4.1"
-+          }
-+        },
-+        "lodash.keys": {
-+          "version": "2.4.1",
-+          "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
-+          "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
-+          "dev": true,
-+          "requires": {
-+            "lodash._isnative": "2.4.1",
-+            "lodash._shimkeys": "2.4.1",
-+            "lodash.isobject": "2.4.1"
-+          }
-+        },
-+        "lodash.template": {
-+          "version": "2.4.1",
-+          "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz",
-+          "integrity": "sha1-nmEQB+32KRKal0qzxIuBez4c8g0=",
-+          "dev": true,
-+          "requires": {
-+            "lodash._escapestringchar": "2.4.1",
-+            "lodash._reinterpolate": "2.4.1",
-+            "lodash.defaults": "2.4.1",
-+            "lodash.escape": "2.4.1",
-+            "lodash.keys": "2.4.1",
-+            "lodash.templatesettings": "2.4.1",
-+            "lodash.values": "2.4.1"
-+          }
-+        },
-+        "lodash.templatesettings": {
-+          "version": "2.4.1",
-+          "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz",
-+          "integrity": "sha1-6nbHXRHrhtTb6JqDiTu4YZKaxpk=",
-+          "dev": true,
-+          "requires": {
-+            "lodash._reinterpolate": "2.4.1",
-+            "lodash.escape": "2.4.1"
-+          }
-+        },
-+        "minimist": {
-+          "version": "0.2.0",
-+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz",
-+          "integrity": "sha1-Tf/lJdriuGTGbC4jxicdev3s784=",
-+          "dev": true
-+        },
-+        "readable-stream": {
-+          "version": "1.0.34",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-+          "dev": true,
-+          "requires": {
-+            "core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-+            "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-+            "isarray": "0.0.1",
-+            "string_decoder": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-+          }
-+        },
-+        "strip-ansi": {
-+          "version": "0.3.0",
-+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
-+          "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=",
-+          "dev": true,
-+          "requires": {
-+            "ansi-regex": "0.2.1"
-+          }
-+        },
-+        "supports-color": {
-+          "version": "0.2.0",
-+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz",
-+          "integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=",
-+          "dev": true
-+        },
-+        "through2": {
-+          "version": "0.6.5",
-+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-+          "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-+          "dev": true,
-+          "requires": {
-+            "readable-stream": "1.0.34",
-+            "xtend": "4.0.1"
-+          },
-+          "dependencies": {
-+            "xtend": {
-+              "version": "4.0.1",
-+              "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-+              "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-+              "dev": true
-+            }
-+          }
-+        },
-+        "vinyl": {
-+          "version": "0.2.3",
-+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.2.3.tgz",
-+          "integrity": "sha1-vKk4IJWC7FpJrVOKAPofEl5RMlI=",
-+          "dev": true,
-+          "requires": {
-+            "clone-stats": "0.0.1"
-+          }
-+        },
-+        "xtend": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
-+          "integrity": "sha1-XM50B7r2Qsunvs2laBEcST9ZZlo=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "gulp-gm": {
-+      "version": "0.0.8",
-+      "resolved": "https://registry.npmjs.org/gulp-gm/-/gulp-gm-0.0.8.tgz",
-+      "integrity": "sha1-X7aaUebLtEnMwwQ0eaaRJH9dsmg=",
-+      "dev": true,
-+      "requires": {
-+        "gm": "1.23.0",
-+        "gulp-util": "2.2.20",
-+        "through2": "0.4.2"
-+      },
-+      "dependencies": {
-+        "ansi-regex": {
-+          "version": "0.2.1",
-+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
-+          "integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk=",
-+          "dev": true
-+        },
-+        "ansi-styles": {
-+          "version": "1.1.0",
-+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz",
-+          "integrity": "sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94=",
-+          "dev": true
-+        },
-+        "chalk": {
-+          "version": "0.5.1",
-+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
-+          "integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=",
-+          "dev": true,
-+          "requires": {
-+            "ansi-styles": "1.1.0",
-+            "escape-string-regexp": "1.0.5",
-+            "has-ansi": "0.1.0",
-+            "strip-ansi": "0.3.0",
-+            "supports-color": "0.2.0"
-+          }
-+        },
-+        "dateformat": {
-+          "version": "1.0.12",
-+          "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
-+          "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=",
-+          "dev": true,
-+          "requires": {
-+            "get-stdin": "4.0.1",
-+            "meow": "3.7.0"
-+          }
-+        },
-+        "gulp-util": {
-+          "version": "2.2.20",
-+          "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-2.2.20.tgz",
-+          "integrity": "sha1-1xRuVyiRC9jwR6awseVJvCLb1kw=",
-+          "dev": true,
-+          "requires": {
-+            "chalk": "0.5.1",
-+            "dateformat": "1.0.12",
-+            "lodash._reinterpolate": "2.4.1",
-+            "lodash.template": "2.4.1",
-+            "minimist": "0.2.0",
-+            "multipipe": "0.1.2",
-+            "through2": "0.5.1",
-+            "vinyl": "0.2.3"
-+          },
-+          "dependencies": {
-+            "through2": {
-+              "version": "0.5.1",
-+              "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
-+              "integrity": "sha1-390BLrnHAOIyP9M084rGIqs3Lac=",
-+              "dev": true,
-+              "requires": {
-+                "readable-stream": "1.0.34",
-+                "xtend": "3.0.0"
-+              }
-+            }
-+          }
-+        },
-+        "has-ansi": {
-+          "version": "0.1.0",
-+          "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
-+          "integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=",
-+          "dev": true,
-+          "requires": {
-+            "ansi-regex": "0.2.1"
-+          }
-+        },
-+        "isarray": {
-+          "version": "0.0.1",
-+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-+          "dev": true
-+        },
-+        "lodash._reinterpolate": {
-+          "version": "2.4.1",
-+          "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz",
-+          "integrity": "sha1-TxInqlqHEfxjL1sHofRgequLMiI=",
-+          "dev": true
-+        },
-+        "lodash.escape": {
-+          "version": "2.4.1",
-+          "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz",
-+          "integrity": "sha1-LOEsXghNsKV92l5dHu659dF1o7Q=",
-+          "dev": true,
-+          "requires": {
-+            "lodash._escapehtmlchar": "2.4.1",
-+            "lodash._reunescapedhtml": "2.4.1",
-+            "lodash.keys": "2.4.1"
-+          }
-+        },
-+        "lodash.keys": {
-+          "version": "2.4.1",
-+          "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
-+          "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
-+          "dev": true,
-+          "requires": {
-+            "lodash._isnative": "2.4.1",
-+            "lodash._shimkeys": "2.4.1",
-+            "lodash.isobject": "2.4.1"
-+          }
-+        },
-+        "lodash.template": {
-+          "version": "2.4.1",
-+          "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz",
-+          "integrity": "sha1-nmEQB+32KRKal0qzxIuBez4c8g0=",
-+          "dev": true,
-+          "requires": {
-+            "lodash._escapestringchar": "2.4.1",
-+            "lodash._reinterpolate": "2.4.1",
-+            "lodash.defaults": "2.4.1",
-+            "lodash.escape": "2.4.1",
-+            "lodash.keys": "2.4.1",
-+            "lodash.templatesettings": "2.4.1",
-+            "lodash.values": "2.4.1"
-+          }
-+        },
-+        "lodash.templatesettings": {
-+          "version": "2.4.1",
-+          "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz",
-+          "integrity": "sha1-6nbHXRHrhtTb6JqDiTu4YZKaxpk=",
-+          "dev": true,
-+          "requires": {
-+            "lodash._reinterpolate": "2.4.1",
-+            "lodash.escape": "2.4.1"
-+          }
-+        },
-+        "minimist": {
-+          "version": "0.2.0",
-+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz",
-+          "integrity": "sha1-Tf/lJdriuGTGbC4jxicdev3s784=",
-+          "dev": true
-+        },
-+        "readable-stream": {
-+          "version": "1.0.34",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-+          "dev": true,
-+          "requires": {
-+            "core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-+            "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-+            "isarray": "0.0.1",
-+            "string_decoder": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-+          }
-+        },
-+        "strip-ansi": {
-+          "version": "0.3.0",
-+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
-+          "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=",
-+          "dev": true,
-+          "requires": {
-+            "ansi-regex": "0.2.1"
-+          }
-+        },
-+        "supports-color": {
-+          "version": "0.2.0",
-+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz",
-+          "integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=",
-+          "dev": true
-+        },
-+        "through2": {
-+          "version": "0.4.2",
-+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
-+          "integrity": "sha1-2/WGYDEVHsg1K7bE22SiKSqEC5s=",
-+          "dev": true,
-+          "requires": {
-+            "readable-stream": "1.0.34",
-+            "xtend": "2.1.2"
-+          },
-+          "dependencies": {
-+            "xtend": {
-+              "version": "2.1.2",
-+              "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
-+              "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
-+              "dev": true,
-+              "requires": {
-+                "object-keys": "0.4.0"
-+              }
-+            }
-+          }
-+        },
-+        "vinyl": {
-+          "version": "0.2.3",
-+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.2.3.tgz",
-+          "integrity": "sha1-vKk4IJWC7FpJrVOKAPofEl5RMlI=",
-+          "dev": true,
-+          "requires": {
-+            "clone-stats": "0.0.1"
-+          }
-+        },
-+        "xtend": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
-+          "integrity": "sha1-XM50B7r2Qsunvs2laBEcST9ZZlo=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "gulp-image-resize": {
-+      "version": "0.10.0",
-+      "resolved": "https://registry.npmjs.org/gulp-image-resize/-/gulp-image-resize-0.10.0.tgz",
-+      "integrity": "sha1-RqbN+jS/AxWmAemNvTLuybnVr0g=",
-+      "dev": true,
-+      "requires": {
-+        "async": "0.2.10",
-+        "gulp-gm": "0.0.8",
-+        "lodash": "2.4.2",
-+        "through2": "0.4.2"
-+      },
-+      "dependencies": {
-+        "async": {
-+          "version": "0.2.10",
-+          "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
-+          "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=",
-+          "dev": true
-+        },
-+        "isarray": {
-+          "version": "0.0.1",
-+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-+          "dev": true
-+        },
-+        "lodash": {
-+          "version": "2.4.2",
-+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
-+          "integrity": "sha1-+t2DS5aDBz2hebPq5tnA0VBT9z4=",
-+          "dev": true
-+        },
-+        "readable-stream": {
-+          "version": "1.0.34",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-+          "dev": true,
-+          "requires": {
-+            "core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-+            "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-+            "isarray": "0.0.1",
-+            "string_decoder": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-+          }
-+        },
-+        "through2": {
-+          "version": "0.4.2",
-+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
-+          "integrity": "sha1-2/WGYDEVHsg1K7bE22SiKSqEC5s=",
-+          "dev": true,
-+          "requires": {
-+            "readable-stream": "1.0.34",
-+            "xtend": "2.1.2"
-+          }
-+        },
-+        "xtend": {
-+          "version": "2.1.2",
-+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
-+          "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
-+          "dev": true,
-+          "requires": {
-+            "object-keys": "0.4.0"
-+          }
-+        }
-+      }
-+    },
-+    "gulp-json-editor": {
-+      "version": "2.2.1",
-+      "resolved": "https://registry.npmjs.org/gulp-json-editor/-/gulp-json-editor-2.2.1.tgz",
-+      "integrity": "sha1-fE3XR36NBtxdxJwLgedFzbBPl7s=",
-+      "dev": true,
-+      "requires": {
-+        "deepmerge": "0.2.10",
-+        "detect-indent": "2.0.0",
-+        "gulp-util": "3.0.8",
-+        "js-beautify": "1.5.10",
-+        "through2": "0.5.1"
-+      },
-+      "dependencies": {
-+        "isarray": {
-+          "version": "0.0.1",
-+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-+          "dev": true
-+        },
-+        "readable-stream": {
-+          "version": "1.0.34",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-+          "dev": true,
-+          "requires": {
-+            "core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-+            "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-+            "isarray": "0.0.1",
-+            "string_decoder": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-+          }
-+        },
-+        "through2": {
-+          "version": "0.5.1",
-+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
-+          "integrity": "sha1-390BLrnHAOIyP9M084rGIqs3Lac=",
-+          "dev": true,
-+          "requires": {
-+            "readable-stream": "1.0.34",
-+            "xtend": "3.0.0"
-+          }
-+        },
-+        "xtend": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
-+          "integrity": "sha1-XM50B7r2Qsunvs2laBEcST9ZZlo=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "gulp-mocha": {
-+      "version": "2.2.0",
-+      "resolved": "https://registry.npmjs.org/gulp-mocha/-/gulp-mocha-2.2.0.tgz",
-+      "integrity": "sha1-HOXrpLlLQMdDav7DxJgsjuqJQZI=",
-+      "dev": true,
-+      "requires": {
-+        "gulp-util": "3.0.8",
-+        "mocha": "2.5.3",
-+        "plur": "2.1.2",
-+        "resolve-from": "1.0.1",
-+        "temp": "0.8.3",
-+        "through": "2.3.8"
-+      }
-+    },
-+    "gulp-remote-src": {
-+      "version": "0.4.2",
-+      "resolved": "https://registry.npmjs.org/gulp-remote-src/-/gulp-remote-src-0.4.2.tgz",
-+      "integrity": "sha1-zrN3DjREMo1hOG+6qrIAvBHNmKg=",
-+      "dev": true,
-+      "requires": {
-+        "event-stream": "3.3.4",
-+        "node.extend": "1.1.6",
-+        "request": "2.79.0",
-+        "through2": "2.0.3",
-+        "vinyl": "2.0.2"
-+      },
-+      "dependencies": {
-+        "assert-plus": {
-+          "version": "0.2.0",
-+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
-+          "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
-+          "dev": true
-+        },
-+        "boom": {
-+          "version": "2.10.1",
-+          "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
-+          "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
-+          "dev": true,
-+          "requires": {
-+            "hoek": "2.16.3"
-+          }
-+        },
-+        "clone-stats": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
-+          "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
-+          "dev": true
-+        },
-+        "combined-stream": {
-+          "version": "1.0.5",
-+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-+          "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
-+          "dev": true,
-+          "requires": {
-+            "delayed-stream": "1.0.0"
-+          }
-+        },
-+        "cryptiles": {
-+          "version": "2.0.5",
-+          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-+          "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
-+          "dev": true,
-+          "requires": {
-+            "boom": "2.10.1"
-+          }
-+        },
-+        "delayed-stream": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-+          "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-+          "dev": true
-+        },
-+        "forever-agent": {
-+          "version": "0.6.1",
-+          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-+          "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-+          "dev": true
-+        },
-+        "form-data": {
-+          "version": "2.1.4",
-+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
-+          "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
-+          "dev": true,
-+          "requires": {
-+            "asynckit": "0.4.0",
-+            "combined-stream": "1.0.5",
-+            "mime-types": "2.1.15"
-+          }
-+        },
-+        "hawk": {
-+          "version": "3.1.3",
-+          "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-+          "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
-+          "dev": true,
-+          "requires": {
-+            "boom": "2.10.1",
-+            "cryptiles": "2.0.5",
-+            "hoek": "2.16.3",
-+            "sntp": "1.0.9"
-+          }
-+        },
-+        "hoek": {
-+          "version": "2.16.3",
-+          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-+          "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-+          "dev": true
-+        },
-+        "http-signature": {
-+          "version": "1.1.1",
-+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
-+          "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
-+          "dev": true,
-+          "requires": {
-+            "assert-plus": "0.2.0",
-+            "jsprim": "1.4.0",
-+            "sshpk": "1.13.1"
-+          }
-+        },
-+        "oauth-sign": {
-+          "version": "0.8.2",
-+          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-+          "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
-+          "dev": true
-+        },
-+        "qs": {
-+          "version": "6.3.2",
-+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz",
-+          "integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw=",
-+          "dev": true
-+        },
-+        "replace-ext": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
-+          "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
-+          "dev": true
-+        },
-+        "request": {
-+          "version": "2.79.0",
-+          "resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz",
-+          "integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=",
-+          "dev": true,
-+          "requires": {
-+            "aws-sign2": "0.6.0",
-+            "aws4": "1.6.0",
-+            "caseless": "0.11.0",
-+            "combined-stream": "1.0.5",
-+            "extend": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz",
-+            "forever-agent": "0.6.1",
-+            "form-data": "2.1.4",
-+            "har-validator": "2.0.6",
-+            "hawk": "3.1.3",
-+            "http-signature": "1.1.1",
-+            "is-typedarray": "1.0.0",
-+            "isstream": "0.1.2",
-+            "json-stringify-safe": "5.0.1",
-+            "mime-types": "2.1.15",
-+            "oauth-sign": "0.8.2",
-+            "qs": "6.3.2",
-+            "stringstream": "0.0.5",
-+            "tough-cookie": "2.3.2",
-+            "tunnel-agent": "0.4.3",
-+            "uuid": "3.1.0"
-+          }
-+        },
-+        "sntp": {
-+          "version": "1.0.9",
-+          "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
-+          "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
-+          "dev": true,
-+          "requires": {
-+            "hoek": "2.16.3"
-+          }
-+        },
-+        "through2": {
-+          "version": "2.0.3",
-+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
-+          "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
-+          "dev": true,
-+          "requires": {
-+            "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz",
-+            "xtend": "4.0.1"
-+          }
-+        },
-+        "tunnel-agent": {
-+          "version": "0.4.3",
-+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-+          "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
-+          "dev": true
-+        },
-+        "uuid": {
-+          "version": "3.1.0",
-+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-+          "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
-+          "dev": true
-+        },
-+        "vinyl": {
-+          "version": "2.0.2",
-+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.0.2.tgz",
-+          "integrity": "sha1-CjcT2NTpIhxY8QyhbAEWyeJe2nw=",
-+          "dev": true,
-+          "requires": {
-+            "clone": "1.0.2",
-+            "clone-buffer": "1.0.0",
-+            "clone-stats": "1.0.0",
-+            "cloneable-readable": "1.0.0",
-+            "is-stream": "1.1.0",
-+            "remove-trailing-separator": "1.0.2",
-+            "replace-ext": "1.0.0"
-+          }
-+        }
-+      }
-+    },
-+    "gulp-rename": {
-+      "version": "1.2.2",
-+      "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-1.2.2.tgz",
-+      "integrity": "sha1-OtRCh2PwXidk3sHGfYaNsnVoeBc=",
-+      "dev": true
-+    },
-+    "gulp-replace": {
-+      "version": "0.5.4",
-+      "resolved": "https://registry.npmjs.org/gulp-replace/-/gulp-replace-0.5.4.tgz",
-+      "integrity": "sha1-aaZ5FLvRPFYr/xT1BKQDeWqg2qk=",
-+      "dev": true,
-+      "requires": {
-+        "istextorbinary": "1.0.2",
-+        "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz",
-+        "replacestream": "4.0.2"
-+      }
-+    },
-+    "gulp-shell": {
-+      "version": "0.5.2",
-+      "resolved": "https://registry.npmjs.org/gulp-shell/-/gulp-shell-0.5.2.tgz",
-+      "integrity": "sha1-pJWcoGUa0ce7/nCy0K27tOGuqY0=",
-+      "dev": true,
-+      "requires": {
-+        "async": "1.5.2",
-+        "gulp-util": "3.0.8",
-+        "lodash": "4.17.4",
-+        "through2": "2.0.3"
-+      },
-+      "dependencies": {
-+        "async": {
-+          "version": "1.5.2",
-+          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-+          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-+          "dev": true
-+        },
-+        "through2": {
-+          "version": "2.0.3",
-+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
-+          "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
-+          "dev": true,
-+          "requires": {
-+            "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz",
-+            "xtend": "4.0.1"
-+          }
-+        }
-+      }
-+    },
-+    "gulp-sourcemaps": {
-+      "version": "1.12.0",
-+      "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.12.0.tgz",
-+      "integrity": "sha1-eG+XyUoPloSSRl1wVY4EJCxnlZg=",
-+      "dev": true,
-+      "requires": {
-+        "@gulp-sourcemaps/map-sources": "1.0.0",
-+        "acorn": "4.0.13",
-+        "convert-source-map": "1.5.0",
-+        "css": "2.2.1",
-+        "debug-fabulous": "0.0.4",
-+        "detect-newline": "2.1.0",
-+        "graceful-fs": "4.1.11",
-+        "source-map": "0.4.4",
-+        "strip-bom": "2.0.0",
-+        "through2": "2.0.3",
-+        "vinyl": "1.2.0"
-+      },
-+      "dependencies": {
-+        "acorn": {
-+          "version": "4.0.13",
-+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
-+          "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=",
-+          "dev": true
-+        },
-+        "through2": {
-+          "version": "2.0.3",
-+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
-+          "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
-+          "dev": true,
-+          "requires": {
-+            "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz",
-+            "xtend": "4.0.1"
-+          }
-+        },
-+        "vinyl": {
-+          "version": "1.2.0",
-+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
-+          "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
-+          "dev": true,
-+          "requires": {
-+            "clone": "1.0.2",
-+            "clone-stats": "0.0.1",
-+            "replace-ext": "0.0.1"
-+          }
-+        }
-+      }
-+    },
-+    "gulp-symdest": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/gulp-symdest/-/gulp-symdest-1.1.0.tgz",
-+      "integrity": "sha1-wWUyBzLRks5W/ZQnH/oSMjS/KuA=",
-+      "dev": true,
-+      "requires": {
-+        "event-stream": "3.3.4",
-+        "mkdirp": "0.5.1",
-+        "queue": "3.1.0",
-+        "vinyl-fs": "2.4.4"
-+      },
-+      "dependencies": {
-+        "queue": {
-+          "version": "3.1.0",
-+          "resolved": "https://registry.npmjs.org/queue/-/queue-3.1.0.tgz",
-+          "integrity": "sha1-bEnQHwCeIlZ4h4nyv/rGuLmZBYU=",
-+          "dev": true,
-+          "requires": {
-+            "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-+          }
-+        }
-+      }
-+    },
-+    "gulp-tsb": {
-+      "version": "2.0.3",
-+      "resolved": "https://registry.npmjs.org/gulp-tsb/-/gulp-tsb-2.0.3.tgz",
-+      "integrity": "sha1-XS3oRjYWfUdCO5loIo0hiKRGMmc=",
-+      "dev": true,
-+      "requires": {
-+        "gulp-util": "3.0.8",
-+        "through": "2.3.8",
-+        "vinyl": "0.4.6"
-+      }
-+    },
-+    "gulp-tslint": {
-+      "version": "7.1.0",
-+      "resolved": "https://registry.npmjs.org/gulp-tslint/-/gulp-tslint-7.1.0.tgz",
-+      "integrity": "sha1-m9P/T7wW1MvZq7CP94bbibVj6T0=",
-+      "dev": true,
-+      "requires": {
-+        "gulp-util": "3.0.8",
-+        "map-stream": "0.1.0",
-+        "through": "2.3.8"
-+      }
-+    },
-+    "gulp-uglify": {
-+      "version": "3.0.0",
-+      "resolved": "https://registry.npmjs.org/gulp-uglify/-/gulp-uglify-3.0.0.tgz",
-+      "integrity": "sha1-DfAzHXKg0wLj434QlIXd3zPG0co=",
-+      "dev": true,
-+      "requires": {
-+        "gulplog": "1.0.0",
-+        "has-gulplog": "0.1.0",
-+        "lodash": "4.17.4",
-+        "make-error-cause": "1.2.2",
-+        "through2": "2.0.3",
-+        "uglify-js": "3.0.23",
-+        "vinyl-sourcemaps-apply": "0.2.1"
-+      },
-+      "dependencies": {
-+        "commander": {
-+          "version": "2.9.0",
-+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
-+          "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
-+          "dev": true,
-+          "requires": {
-+            "graceful-readlink": "1.0.1"
-+          }
-+        },
-+        "source-map": {
-+          "version": "0.5.6",
-+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-+          "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=",
-+          "dev": true
-+        },
-+        "through2": {
-+          "version": "2.0.3",
-+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
-+          "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
-+          "dev": true,
-+          "requires": {
-+            "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz",
-+            "xtend": "4.0.1"
-+          }
-+        },
-+        "uglify-js": {
-+          "version": "3.0.23",
-+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.23.tgz",
-+          "integrity": "sha512-miLHbO2QcdQGxL/q1wLcUr6TGIRHhMnpKyywUbAdZRkJMqCeZCDmBsgYu1Wlj26xHBXN+sU5tHaWh38QsN208g==",
-+          "dev": true,
-+          "requires": {
-+            "commander": "2.9.0",
-+            "source-map": "0.5.6"
-+          }
-+        }
-+      }
-+    },
-+    "gulp-util": {
-+      "version": "3.0.8",
-+      "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz",
-+      "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=",
-+      "dev": true,
-+      "requires": {
-+        "array-differ": "1.0.0",
-+        "array-uniq": "1.0.3",
-+        "beeper": "1.1.1",
-+        "chalk": "1.1.3",
-+        "dateformat": "2.0.0",
-+        "fancy-log": "1.3.0",
-+        "gulplog": "1.0.0",
-+        "has-gulplog": "0.1.0",
-+        "lodash._reescape": "3.0.0",
-+        "lodash._reevaluate": "3.0.0",
-+        "lodash._reinterpolate": "3.0.0",
-+        "lodash.template": "3.6.2",
-+        "minimist": "1.2.0",
-+        "multipipe": "0.1.2",
-+        "object-assign": "3.0.0",
-+        "replace-ext": "0.0.1",
-+        "through2": "2.0.3",
-+        "vinyl": "0.5.3"
-+      },
-+      "dependencies": {
-+        "object-assign": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
-+          "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=",
-+          "dev": true
-+        },
-+        "through2": {
-+          "version": "2.0.3",
-+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
-+          "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
-+          "dev": true,
-+          "requires": {
-+            "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz",
-+            "xtend": "4.0.1"
-+          }
-+        },
-+        "vinyl": {
-+          "version": "0.5.3",
-+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
-+          "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=",
-+          "dev": true,
-+          "requires": {
-+            "clone": "1.0.2",
-+            "clone-stats": "0.0.1",
-+            "replace-ext": "0.0.1"
-+          }
-+        }
-+      }
-+    },
-+    "gulp-vinyl-zip": {
-+      "version": "1.4.0",
-+      "resolved": "https://registry.npmjs.org/gulp-vinyl-zip/-/gulp-vinyl-zip-1.4.0.tgz",
-+      "integrity": "sha1-VjgvLMtXIxuwR4x4c3zNVylzvuE=",
-+      "dev": true,
-+      "requires": {
-+        "event-stream": "3.3.4",
-+        "queue": "3.1.0",
-+        "through2": "0.6.5",
-+        "vinyl": "0.4.6",
-+        "vinyl-fs": "2.4.4",
-+        "yauzl": "2.3.1",
-+        "yazl": "2.4.2"
-+      },
-+      "dependencies": {
-+        "isarray": {
-+          "version": "0.0.1",
-+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-+          "dev": true
-+        },
-+        "queue": {
-+          "version": "3.1.0",
-+          "resolved": "https://registry.npmjs.org/queue/-/queue-3.1.0.tgz",
-+          "integrity": "sha1-bEnQHwCeIlZ4h4nyv/rGuLmZBYU=",
-+          "dev": true,
-+          "requires": {
-+            "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-+          }
-+        },
-+        "readable-stream": {
-+          "version": "1.0.34",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-+          "dev": true,
-+          "requires": {
-+            "core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-+            "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-+            "isarray": "0.0.1",
-+            "string_decoder": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-+          }
-+        },
-+        "through2": {
-+          "version": "0.6.5",
-+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-+          "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-+          "dev": true,
-+          "requires": {
-+            "readable-stream": "1.0.34",
-+            "xtend": "4.0.1"
-+          }
-+        }
-+      }
-+    },
-+    "gulplog": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
-+      "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
-+      "dev": true,
-+      "requires": {
-+        "glogg": "1.0.0"
-+      }
-+    },
-+    "handlebars": {
-+      "version": "4.0.10",
-+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.10.tgz",
-+      "integrity": "sha1-PTDHGLCaPZbyPqTMH0A8TTup/08=",
-+      "dev": true,
-+      "requires": {
-+        "async": "1.5.2",
-+        "optimist": "0.6.1",
-+        "source-map": "0.4.4",
-+        "uglify-js": "2.8.29"
-+      },
-+      "dependencies": {
-+        "async": {
-+          "version": "1.5.2",
-+          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-+          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-+          "dev": true
-+        },
-+        "minimist": {
-+          "version": "0.0.10",
-+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
-+          "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
-+          "dev": true
-+        },
-+        "optimist": {
-+          "version": "0.6.1",
-+          "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
-+          "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
-+          "dev": true,
-+          "requires": {
-+            "minimist": "0.0.10",
-+            "wordwrap": "0.0.3"
-+          }
-+        },
-+        "uglify-js": {
-+          "version": "2.8.29",
-+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
-+          "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
-+          "dev": true,
-+          "optional": true,
-+          "requires": {
-+            "source-map": "0.5.6",
-+            "uglify-to-browserify": "1.0.2",
-+            "yargs": "3.10.0"
-+          },
-+          "dependencies": {
-+            "source-map": {
-+              "version": "0.5.6",
-+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-+              "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=",
-+              "dev": true,
-+              "optional": true
-+            }
-+          }
-+        },
-+        "wordwrap": {
-+          "version": "0.0.3",
-+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-+          "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "har-schema": {
-+      "version": "1.0.5",
-+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
-+      "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=",
-+      "dev": true
-+    },
-+    "har-validator": {
-+      "version": "2.0.6",
-+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
-+      "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=",
-+      "dev": true,
-+      "requires": {
-+        "chalk": "1.1.3",
-+        "commander": "2.11.0",
-+        "is-my-json-valid": "2.16.0",
-+        "pinkie-promise": "2.0.1"
-+      },
-+      "dependencies": {
-+        "commander": {
-+          "version": "2.11.0",
-+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
-+          "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "has": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
-+      "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=",
-+      "dev": true,
-+      "requires": {
-+        "function-bind": "1.1.0"
-+      }
-+    },
-+    "has-ansi": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-+      "dev": true,
-+      "requires": {
-+        "ansi-regex": "2.1.1"
-+      }
-+    },
-+    "has-flag": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-+      "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-+      "dev": true
-+    },
-+    "has-gulplog": {
-+      "version": "0.1.0",
-+      "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
-+      "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=",
-+      "dev": true,
-+      "requires": {
-+        "sparkles": "1.0.0"
-+      }
-+    },
-+    "hawk": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz",
-+      "integrity": "sha1-uQuxaYByhUEdp//LjdJZhQLTtS0=",
-+      "dev": true,
-+      "requires": {
-+        "boom": "0.4.2",
-+        "cryptiles": "0.2.2",
-+        "hoek": "0.9.1",
-+        "sntp": "0.2.4"
-+      }
-+    },
-+    "hoek": {
-+      "version": "0.9.1",
-+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz",
-+      "integrity": "sha1-PTIkYrrfB3Fup+uFuviAec3c5QU=",
-+      "dev": true
-+    },
-+    "home-path": {
-+      "version": "1.0.5",
-+      "resolved": "https://registry.npmjs.org/home-path/-/home-path-1.0.5.tgz",
-+      "integrity": "sha1-eIspgVsS1Tus9XVkhHbm+QQdEz8=",
-+      "dev": true
-+    },
-+    "homedir-polyfill": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz",
-+      "integrity": "sha1-TCu8inWJmP7r9e1oWA921GdotLw=",
-+      "dev": true,
-+      "requires": {
-+        "parse-passwd": "1.0.0"
-+      }
-+    },
-+    "hooker": {
-+      "version": "0.2.3",
-+      "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz",
-+      "integrity": "sha1-uDT3I8xKJCqmWWNFnfbZhMXT2Vk=",
-+      "dev": true
-+    },
-+    "hosted-git-info": {
-+      "version": "2.5.0",
-+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz",
-+      "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==",
-+      "dev": true
-+    },
-+    "html-comment-regex": {
-+      "version": "1.1.1",
-+      "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.1.tgz",
-+      "integrity": "sha1-ZouTd26q5V696POtRkswekljYl4=",
-+      "dev": true
-+    },
-+    "htmlparser2": {
-+      "version": "3.9.2",
-+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz",
-+      "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=",
-+      "dev": true,
-+      "requires": {
-+        "domelementtype": "1.3.0",
-+        "domhandler": "2.4.1",
-+        "domutils": "1.6.2",
-+        "entities": "1.1.1",
-+        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-+        "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz"
-+      }
-+    },
-+    "http-errors": {
-+      "version": "1.6.1",
-+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.1.tgz",
-+      "integrity": "sha1-X4uO2YrKVFZWv1cplzh/kEpyIlc=",
-+      "dev": true,
-+      "requires": {
-+        "depd": "1.1.0",
-+        "inherits": "2.0.3",
-+        "setprototypeof": "1.0.3",
-+        "statuses": "1.3.1"
-+      },
-+      "dependencies": {
-+        "inherits": {
-+          "version": "2.0.3",
-+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "http-proxy-agent": {
-+      "version": "0.2.7",
-+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-0.2.7.tgz",
-+      "integrity": "sha1-4X/aZfCQLZUs55IeYsf/iGJlWl4=",
-+      "requires": {
-+        "agent-base": "1.0.2",
-+        "debug": "2.6.8",
-+        "extend": "3.0.1"
-+      },
-+      "dependencies": {
-+        "agent-base": {
-+          "version": "1.0.2",
-+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-1.0.2.tgz",
-+          "integrity": "sha1-aJDT+yFwBLYrcPiSjg+uX4lSpwY="
-+        },
-+        "debug": {
-+          "version": "2.6.8",
-+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-+          "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
-+          "requires": {
-+            "ms": "2.0.0"
-+          }
-+        },
-+        "extend": {
-+          "version": "3.0.1",
-+          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-+          "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
-+        },
-+        "ms": {
-+          "version": "2.0.0",
-+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-+        }
-+      }
-+    },
-+    "http-signature": {
-+      "version": "0.10.1",
-+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
-+      "integrity": "sha1-T72sEyVZqoMjEh5UB3nAoBKyfmY=",
-+      "dev": true,
-+      "requires": {
-+        "asn1": "0.1.11",
-+        "assert-plus": "0.1.5",
-+        "ctype": "0.5.3"
-+      }
-+    },
-+    "https-proxy-agent": {
-+      "version": "0.3.6",
-+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-0.3.6.tgz",
-+      "integrity": "sha1-cT+jjl01P1DrFKNC/r4pAz7RYZs=",
-+      "requires": {
-+        "agent-base": "1.0.2",
-+        "debug": "2.6.8",
-+        "extend": "3.0.1"
-+      },
-+      "dependencies": {
-+        "agent-base": {
-+          "version": "1.0.2",
-+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-1.0.2.tgz",
-+          "integrity": "sha1-aJDT+yFwBLYrcPiSjg+uX4lSpwY="
-+        },
-+        "debug": {
-+          "version": "2.6.8",
-+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-+          "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
-+          "requires": {
-+            "ms": "2.0.0"
-+          }
-+        },
-+        "extend": {
-+          "version": "3.0.1",
-+          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-+          "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
-+        },
-+        "ms": {
-+          "version": "2.0.0",
-+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-+        }
-+      }
-+    },
-+    "husky": {
-+      "version": "0.13.4",
-+      "resolved": "https://registry.npmjs.org/husky/-/husky-0.13.4.tgz",
-+      "integrity": "sha1-SHhcUCjeNFKlHEjBLE+UshJKFAc=",
-+      "dev": true,
-+      "requires": {
-+        "chalk": "1.1.3",
-+        "find-parent-dir": "0.3.0",
-+        "is-ci": "1.0.10",
-+        "normalize-path": "1.0.0"
-+      },
-+      "dependencies": {
-+        "normalize-path": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-1.0.0.tgz",
-+          "integrity": "sha1-MtDkcvkf80VwHBWoMRAY07CpA3k=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "iconv-lite": {
-+      "version": "0.4.15",
-+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz",
-+      "integrity": "sha1-/iZaIYrGpXz+hUkn6dBMGYJe3es="
-+    },
-+    "ignore": {
-+      "version": "3.3.3",
-+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.3.tgz",
-+      "integrity": "sha1-QyNS5XrM2HqzEQ6C0/6g5HgSFW0=",
-+      "dev": true
-+    },
-+    "import-lazy": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
-+      "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=",
-+      "dev": true
-+    },
-+    "imurmurhash": {
-+      "version": "0.1.4",
-+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-+      "dev": true
-+    },
-+    "indent-string": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-+      "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
-+      "dev": true,
-+      "requires": {
-+        "repeating": "2.0.1"
-+      }
-+    },
-+    "indexes-of": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
-+      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
-+      "dev": true
-+    },
-+    "inflight": {
-+      "version": "1.0.6",
-+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-+      "requires": {
-+        "once": "1.4.0",
-+        "wrappy": "1.0.2"
-+      }
-+    },
-+    "inherits": {
-+      "version": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-+      "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE="
-+    },
-+    "ini": {
-+      "version": "1.3.4",
-+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
-+      "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=",
-+      "dev": true
-+    },
-+    "innosetup-compiler": {
-+      "version": "5.5.62",
-+      "resolved": "https://registry.npmjs.org/innosetup-compiler/-/innosetup-compiler-5.5.62.tgz",
-+      "integrity": "sha1-/BLNjRfPdaLjgzsnVKXCvE8mzE4=",
-+      "dev": true
-+    },
-+    "inquirer": {
-+      "version": "0.12.0",
-+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz",
-+      "integrity": "sha1-HvK/1jUE3wvHV4X/+MLEHfEvB34=",
-+      "dev": true,
-+      "requires": {
-+        "ansi-escapes": "1.4.0",
-+        "ansi-regex": "2.1.1",
-+        "chalk": "1.1.3",
-+        "cli-cursor": "1.0.2",
-+        "cli-width": "2.1.0",
-+        "figures": "1.7.0",
-+        "lodash": "4.17.4",
-+        "readline2": "1.0.1",
-+        "run-async": "0.1.0",
-+        "rx-lite": "3.1.2",
-+        "string-width": "1.0.2",
-+        "strip-ansi": "3.0.1",
-+        "through": "2.3.8"
-+      }
-+    },
-+    "interpret": {
-+      "version": "1.0.3",
-+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz",
-+      "integrity": "sha1-y8NcYu7uc/Gat7EKgBURQBr8D5A=",
-+      "dev": true
-+    },
-+    "invert-kv": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-+      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
-+      "dev": true
-+    },
-+    "ipaddr.js": {
-+      "version": "1.3.0",
-+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.3.0.tgz",
-+      "integrity": "sha1-HgOlL9rYOou7KyXL9JmLTP/NPew=",
-+      "dev": true
-+    },
-+    "irregular-plurals": {
-+      "version": "1.3.0",
-+      "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-1.3.0.tgz",
-+      "integrity": "sha512-njf5A+Mxb3kojuHd1DzISjjIl+XhyzovXEOyPPSzdQozq/Lf2tN27mOrAAsxEPZxpn6I4MGzs1oo9TxXxPFpaA==",
-+      "dev": true
-+    },
-+    "is": {
-+      "version": "3.2.1",
-+      "resolved": "https://registry.npmjs.org/is/-/is-3.2.1.tgz",
-+      "integrity": "sha1-0Kwq1V63sL7JJqUmb2xmKqqD3KU=",
-+      "dev": true
-+    },
-+    "is-absolute": {
-+      "version": "0.2.6",
-+      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.2.6.tgz",
-+      "integrity": "sha1-IN5p89uULvLYe5wto28XIjWxtes=",
-+      "dev": true,
-+      "requires": {
-+        "is-relative": "0.2.1",
-+        "is-windows": "0.2.0"
-+      }
-+    },
-+    "is-absolute-url": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
-+      "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=",
-+      "dev": true
-+    },
-+    "is-arrayish": {
-+      "version": "0.2.1",
-+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-+      "dev": true
-+    },
-+    "is-buffer": {
-+      "version": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz",
-+      "integrity": "sha1-z8hszV3FpS+oBIkRHGkgxFfi2Ys=",
-+      "dev": true
-+    },
-+    "is-builtin-module": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
-+      "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
-+      "dev": true,
-+      "requires": {
-+        "builtin-modules": "1.1.1"
-+      }
-+    },
-+    "is-ci": {
-+      "version": "1.0.10",
-+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.0.10.tgz",
-+      "integrity": "sha1-9zkzayYyNlBhqdSCcM1WrjNpMY4=",
-+      "dev": true,
-+      "requires": {
-+        "ci-info": "1.0.0"
-+      }
-+    },
-+    "is-dotfile": {
-+      "version": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.2.tgz",
-+      "integrity": "sha1-LBMjg/ORmfjtwmjKAbmwB9IFzE0=",
-+      "dev": true
-+    },
-+    "is-equal-shallow": {
-+      "version": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
-+      "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
-+      "dev": true,
-+      "requires": {
-+        "is-primitive": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz"
-+      }
-+    },
-+    "is-extendable": {
-+      "version": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-+      "dev": true
-+    },
-+    "is-extglob": {
-+      "version": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-+      "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-+      "dev": true
-+    },
-+    "is-finite": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
-+      "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
-+      "dev": true,
-+      "requires": {
-+        "number-is-nan": "1.0.1"
-+      }
-+    },
-+    "is-fullwidth-code-point": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-+      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-+      "dev": true,
-+      "requires": {
-+        "number-is-nan": "1.0.1"
-+      }
-+    },
-+    "is-glob": {
-+      "version": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-+      "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-+      "dev": true,
-+      "requires": {
-+        "is-extglob": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz"
-+      }
-+    },
-+    "is-my-json-valid": {
-+      "version": "2.16.0",
-+      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz",
-+      "integrity": "sha1-8Hndm/2uZe4gOKrorLyGqxCeNpM=",
-+      "dev": true,
-+      "requires": {
-+        "generate-function": "2.0.0",
-+        "generate-object-property": "1.2.0",
-+        "jsonpointer": "4.0.1",
-+        "xtend": "4.0.1"
-+      }
-+    },
-+    "is-npm": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz",
-+      "integrity": "sha1-8vtjpl5JBbQGyGBydloaTceTufQ=",
-+      "dev": true
-+    },
-+    "is-number": {
-+      "version": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-+      "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
-+      "dev": true,
-+      "requires": {
-+        "kind-of": "https://registry.npmjs.org/kind-of/-/kind-of-3.0.4.tgz"
-+      }
-+    },
-+    "is-obj": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-+      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
-+      "dev": true
-+    },
-+    "is-path-cwd": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
-+      "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
-+      "dev": true
-+    },
-+    "is-path-in-cwd": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz",
-+      "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=",
-+      "dev": true,
-+      "requires": {
-+        "is-path-inside": "1.0.0"
-+      }
-+    },
-+    "is-path-inside": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.0.tgz",
-+      "integrity": "sha1-/AbloWg/vaE95mev9xe7wQpI838=",
-+      "dev": true,
-+      "requires": {
-+        "path-is-inside": "1.0.2"
-+      }
-+    },
-+    "is-plain-obj": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
-+      "dev": true
-+    },
-+    "is-plain-object": {
-+      "version": "2.0.3",
-+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.3.tgz",
-+      "integrity": "sha1-wVvz5LZrYtcu+vKSWEhmPsvGGbY=",
-+      "dev": true,
-+      "requires": {
-+        "isobject": "3.0.1"
-+      },
-+      "dependencies": {
-+        "isobject": {
-+          "version": "3.0.1",
-+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "is-posix-bracket": {
-+      "version": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
-+      "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
-+      "dev": true
-+    },
-+    "is-primitive": {
-+      "version": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
-+      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
-+      "dev": true
-+    },
-+    "is-property": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
-+      "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=",
-+      "dev": true
-+    },
-+    "is-redirect": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
-+      "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
-+      "dev": true
-+    },
-+    "is-relative": {
-+      "version": "0.2.1",
-+      "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.2.1.tgz",
-+      "integrity": "sha1-0n9MfVFtF1+2ENuEu+7yPDvJeqU=",
-+      "dev": true,
-+      "requires": {
-+        "is-unc-path": "0.1.2"
-+      }
-+    },
-+    "is-resolvable": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.0.tgz",
-+      "integrity": "sha1-jfV8YeouPFAUCNEA+wE8+NbgzGI=",
-+      "dev": true,
-+      "requires": {
-+        "tryit": "1.0.3"
-+      }
-+    },
-+    "is-retry-allowed": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
-+      "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=",
-+      "dev": true
-+    },
-+    "is-stream": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
-+      "dev": true
-+    },
-+    "is-svg": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-2.1.0.tgz",
-+      "integrity": "sha1-z2EJDaDZ77yrhyLeum8DIgjbsOk=",
-+      "dev": true,
-+      "requires": {
-+        "html-comment-regex": "1.1.1"
-+      }
-+    },
-+    "is-typedarray": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-+      "dev": true
-+    },
-+    "is-unc-path": {
-+      "version": "0.1.2",
-+      "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.2.tgz",
-+      "integrity": "sha1-arBTpyVzwQJQ/0FqOBTDUXivObk=",
-+      "dev": true,
-+      "requires": {
-+        "unc-path-regex": "0.1.2"
-+      }
-+    },
-+    "is-utf8": {
-+      "version": "0.2.1",
-+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-+      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
-+      "dev": true
-+    },
-+    "is-valid-glob": {
-+      "version": "0.3.0",
-+      "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz",
-+      "integrity": "sha1-1LVcafUYhvm2XHDWwmItN+KfSP4=",
-+      "dev": true
-+    },
-+    "is-windows": {
-+      "version": "0.2.0",
-+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz",
-+      "integrity": "sha1-3hqm1j6indJIc3tp8f+LgALSEIw=",
-+      "dev": true
-+    },
-+    "isarray": {
-+      "version": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-+      "dev": true
-+    },
-+    "isexe": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-+      "dev": true
-+    },
-+    "isobject": {
-+      "version": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-+      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-+      "dev": true,
-+      "requires": {
-+        "isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
-+      }
-+    },
-+    "isstream": {
-+      "version": "0.1.2",
-+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-+      "dev": true
-+    },
-+    "istanbul": {
-+      "version": "0.3.22",
-+      "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.3.22.tgz",
-+      "integrity": "sha1-PhZNhQIf4ZyYXR8OfvDD4i0BLrY=",
-+      "dev": true,
-+      "requires": {
-+        "abbrev": "1.0.9",
-+        "async": "1.5.2",
-+        "escodegen": "1.7.1",
-+        "esprima": "2.5.0",
-+        "fileset": "0.2.1",
-+        "handlebars": "4.0.10",
-+        "js-yaml": "3.6.1",
-+        "mkdirp": "0.5.1",
-+        "nopt": "3.0.6",
-+        "once": "1.4.0",
-+        "resolve": "1.1.7",
-+        "supports-color": "3.2.3",
-+        "which": "1.2.14",
-+        "wordwrap": "1.0.0"
-+      },
-+      "dependencies": {
-+        "abbrev": {
-+          "version": "1.0.9",
-+          "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
-+          "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=",
-+          "dev": true
-+        },
-+        "async": {
-+          "version": "1.5.2",
-+          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-+          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-+          "dev": true
-+        },
-+        "esprima": {
-+          "version": "2.5.0",
-+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.5.0.tgz",
-+          "integrity": "sha1-84ekb9NEwbGjm6+MIL+0O20AWMw=",
-+          "dev": true
-+        },
-+        "nopt": {
-+          "version": "3.0.6",
-+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-+          "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-+          "dev": true,
-+          "requires": {
-+            "abbrev": "1.0.9"
-+          }
-+        },
-+        "resolve": {
-+          "version": "1.1.7",
-+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-+          "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
-+          "dev": true
-+        },
-+        "supports-color": {
-+          "version": "3.2.3",
-+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-+          "dev": true,
-+          "requires": {
-+            "has-flag": "1.0.0"
-+          }
-+        }
-+      }
-+    },
-+    "istextorbinary": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/istextorbinary/-/istextorbinary-1.0.2.tgz",
-+      "integrity": "sha1-rOGTVNGpoBc+/rEITOD4ewrX3s8=",
-+      "dev": true,
-+      "requires": {
-+        "binaryextensions": "1.0.1",
-+        "textextensions": "1.0.2"
-+      }
-+    },
-+    "jade": {
-+      "version": "0.26.3",
-+      "resolved": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz",
-+      "integrity": "sha1-jxDXl32NefL2/4YqgbBRPMslaGw=",
-+      "dev": true,
-+      "requires": {
-+        "commander": "0.6.1",
-+        "mkdirp": "0.3.0"
-+      },
-+      "dependencies": {
-+        "commander": {
-+          "version": "0.6.1",
-+          "resolved": "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz",
-+          "integrity": "sha1-+mihT2qUXVTbvlDYzbMyDp47GgY=",
-+          "dev": true
-+        },
-+        "mkdirp": {
-+          "version": "0.3.0",
-+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz",
-+          "integrity": "sha1-G79asbqCevI1dRQ0kEJkVfSB/h4=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "js-base64": {
-+      "version": "2.1.9",
-+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz",
-+      "integrity": "sha1-8OgK4DmkvWVLXygfyT8EqRSn/M4=",
-+      "dev": true
-+    },
-+    "js-beautify": {
-+      "version": "1.5.10",
-+      "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.5.10.tgz",
-+      "integrity": "sha1-TZU3FwJpk0SlFsomv1nwonu3Vxk=",
-+      "dev": true,
-+      "requires": {
-+        "config-chain": "1.1.11",
-+        "mkdirp": "0.5.1",
-+        "nopt": "3.0.6"
-+      },
-+      "dependencies": {
-+        "nopt": {
-+          "version": "3.0.6",
-+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-+          "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-+          "dev": true,
-+          "requires": {
-+            "abbrev": "1.1.0"
-+          }
-+        }
-+      }
-+    },
-+    "js-tokens": {
-+      "version": "3.0.2",
-+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-+      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
-+      "dev": true
-+    },
-+    "js-yaml": {
-+      "version": "3.6.1",
-+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz",
-+      "integrity": "sha1-bl/mfYsgXOTSL60Ft3geja3MSzA=",
-+      "dev": true,
-+      "requires": {
-+        "argparse": "1.0.9",
-+        "esprima": "2.7.3"
-+      }
-+    },
-+    "jsbn": {
-+      "version": "0.1.1",
-+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-+      "dev": true,
-+      "optional": true
-+    },
-+    "jschardet": {
-+      "version": "1.4.2",
-+      "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-1.4.2.tgz",
-+      "integrity": "sha1-KqEH8UKvQSHRRWWdRPUIMJYeaZo="
-+    },
-+    "jsdom-no-contextify": {
-+      "version": "3.1.0",
-+      "resolved": "https://registry.npmjs.org/jsdom-no-contextify/-/jsdom-no-contextify-3.1.0.tgz",
-+      "integrity": "sha1-DYvq9hDC/yOJT1Tfp/id0i/Q96s=",
-+      "dev": true,
-+      "requires": {
-+        "browser-request": "0.3.3",
-+        "cssom": "0.3.2",
-+        "cssstyle": "0.2.37",
-+        "htmlparser2": "3.9.2",
-+        "nwmatcher": "1.4.1",
-+        "parse5": "1.5.1",
-+        "request": "2.81.0",
-+        "xml-name-validator": "1.0.0",
-+        "xmlhttprequest": "1.8.0"
-+      },
-+      "dependencies": {
-+        "assert-plus": {
-+          "version": "0.2.0",
-+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
-+          "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
-+          "dev": true
-+        },
-+        "boom": {
-+          "version": "2.10.1",
-+          "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
-+          "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
-+          "dev": true,
-+          "requires": {
-+            "hoek": "2.16.3"
-+          }
-+        },
-+        "caseless": {
-+          "version": "0.12.0",
-+          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-+          "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-+          "dev": true
-+        },
-+        "combined-stream": {
-+          "version": "1.0.5",
-+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-+          "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
-+          "dev": true,
-+          "requires": {
-+            "delayed-stream": "1.0.0"
-+          }
-+        },
-+        "cryptiles": {
-+          "version": "2.0.5",
-+          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-+          "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
-+          "dev": true,
-+          "requires": {
-+            "boom": "2.10.1"
-+          }
-+        },
-+        "delayed-stream": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-+          "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-+          "dev": true
-+        },
-+        "forever-agent": {
-+          "version": "0.6.1",
-+          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-+          "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-+          "dev": true
-+        },
-+        "form-data": {
-+          "version": "2.1.4",
-+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
-+          "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
-+          "dev": true,
-+          "requires": {
-+            "asynckit": "0.4.0",
-+            "combined-stream": "1.0.5",
-+            "mime-types": "2.1.15"
-+          }
-+        },
-+        "har-validator": {
-+          "version": "4.2.1",
-+          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
-+          "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
-+          "dev": true,
-+          "requires": {
-+            "ajv": "4.11.8",
-+            "har-schema": "1.0.5"
-+          }
-+        },
-+        "hawk": {
-+          "version": "3.1.3",
-+          "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-+          "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
-+          "dev": true,
-+          "requires": {
-+            "boom": "2.10.1",
-+            "cryptiles": "2.0.5",
-+            "hoek": "2.16.3",
-+            "sntp": "1.0.9"
-+          }
-+        },
-+        "hoek": {
-+          "version": "2.16.3",
-+          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-+          "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-+          "dev": true
-+        },
-+        "http-signature": {
-+          "version": "1.1.1",
-+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
-+          "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
-+          "dev": true,
-+          "requires": {
-+            "assert-plus": "0.2.0",
-+            "jsprim": "1.4.0",
-+            "sshpk": "1.13.1"
-+          }
-+        },
-+        "oauth-sign": {
-+          "version": "0.8.2",
-+          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-+          "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
-+          "dev": true
-+        },
-+        "qs": {
-+          "version": "6.4.0",
-+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
-+          "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
-+          "dev": true
-+        },
-+        "request": {
-+          "version": "2.81.0",
-+          "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
-+          "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
-+          "dev": true,
-+          "requires": {
-+            "aws-sign2": "0.6.0",
-+            "aws4": "1.6.0",
-+            "caseless": "0.12.0",
-+            "combined-stream": "1.0.5",
-+            "extend": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz",
-+            "forever-agent": "0.6.1",
-+            "form-data": "2.1.4",
-+            "har-validator": "4.2.1",
-+            "hawk": "3.1.3",
-+            "http-signature": "1.1.1",
-+            "is-typedarray": "1.0.0",
-+            "isstream": "0.1.2",
-+            "json-stringify-safe": "5.0.1",
-+            "mime-types": "2.1.15",
-+            "oauth-sign": "0.8.2",
-+            "performance-now": "0.2.0",
-+            "qs": "6.4.0",
-+            "safe-buffer": "5.1.1",
-+            "stringstream": "0.0.5",
-+            "tough-cookie": "2.3.2",
-+            "tunnel-agent": "0.6.0",
-+            "uuid": "3.1.0"
-+          }
-+        },
-+        "sntp": {
-+          "version": "1.0.9",
-+          "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
-+          "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
-+          "dev": true,
-+          "requires": {
-+            "hoek": "2.16.3"
-+          }
-+        },
-+        "tunnel-agent": {
-+          "version": "0.6.0",
-+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-+          "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-+          "dev": true,
-+          "requires": {
-+            "safe-buffer": "5.1.1"
-+          }
-+        },
-+        "uuid": {
-+          "version": "3.1.0",
-+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-+          "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "json-edm-parser": {
-+      "version": "0.1.2",
-+      "resolved": "https://registry.npmjs.org/json-edm-parser/-/json-edm-parser-0.1.2.tgz",
-+      "integrity": "sha1-HmCw/vG8CvZ7wNFG393lSGzWFbQ=",
-+      "dev": true,
-+      "requires": {
-+        "jsonparse": "1.2.0"
-+      }
-+    },
-+    "json-schema": {
-+      "version": "0.2.3",
-+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-+      "dev": true
-+    },
-+    "json-stable-stringify": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
-+      "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
-+      "dev": true,
-+      "requires": {
-+        "jsonify": "0.0.0"
-+      }
-+    },
-+    "json-stringify-safe": {
-+      "version": "5.0.1",
-+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-+      "dev": true
-+    },
-+    "jsonfile": {
-+      "version": "2.4.0",
-+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
-+      "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
-+      "requires": {
-+        "graceful-fs": "4.1.11"
-+      }
-+    },
-+    "jsonify": {
-+      "version": "0.0.0",
-+      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-+      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
-+      "dev": true
-+    },
-+    "jsonparse": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.2.0.tgz",
-+      "integrity": "sha1-XAxWhRBxYOcv50ib3eoLRMK8Z70=",
-+      "dev": true
-+    },
-+    "jsonpointer": {
-+      "version": "4.0.1",
-+      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
-+      "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",
-+      "dev": true
-+    },
-+    "jsprim": {
-+      "version": "1.4.0",
-+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz",
-+      "integrity": "sha1-o7h+QCmNjDgFUtjMdiigu5WiKRg=",
-+      "dev": true,
-+      "requires": {
-+        "assert-plus": "1.0.0",
-+        "extsprintf": "1.0.2",
-+        "json-schema": "0.2.3",
-+        "verror": "1.3.6"
-+      },
-+      "dependencies": {
-+        "assert-plus": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "kind-of": {
-+      "version": "https://registry.npmjs.org/kind-of/-/kind-of-3.0.4.tgz",
-+      "integrity": "sha1-e47PGKThf4Jp1ztQHJ8jLJaIenQ=",
-+      "dev": true,
-+      "requires": {
-+        "is-buffer": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz"
-+      }
-+    },
-+    "klaw": {
-+      "version": "1.3.1",
-+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
-+      "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
-+      "requires": {
-+        "graceful-fs": "4.1.11"
-+      }
-+    },
-+    "latest-version": {
-+      "version": "3.1.0",
-+      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz",
-+      "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=",
-+      "dev": true,
-+      "requires": {
-+        "package-json": "4.0.1"
-+      }
-+    },
-+    "lazy-cache": {
-+      "version": "1.0.4",
-+      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
-+      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
-+      "dev": true,
-+      "optional": true
-+    },
-+    "lazy-debug-legacy": {
-+      "version": "0.0.1",
-+      "resolved": "https://registry.npmjs.org/lazy-debug-legacy/-/lazy-debug-legacy-0.0.1.tgz",
-+      "integrity": "sha1-U3cWwHduTPeePtG2IfdljCkRsbE=",
-+      "dev": true
-+    },
-+    "lazy.js": {
-+      "version": "0.4.3",
-+      "resolved": "https://registry.npmjs.org/lazy.js/-/lazy.js-0.4.3.tgz",
-+      "integrity": "sha1-h/Z6B602VVEh5P/xUg3zG+Znhtg=",
-+      "dev": true
-+    },
-+    "lazystream": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
-+      "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
-+      "dev": true,
-+      "requires": {
-+        "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz"
-+      }
-+    },
-+    "lcid": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-+      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-+      "dev": true,
-+      "requires": {
-+        "invert-kv": "1.0.0"
-+      }
-+    },
-+    "lcov-parse": {
-+      "version": "0.0.10",
-+      "resolved": "https://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.10.tgz",
-+      "integrity": "sha1-GwuP+ayceIklBYK3C3ExXZ2m2aM=",
-+      "dev": true
-+    },
-+    "levn": {
-+      "version": "0.3.0",
-+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-+      "dev": true,
-+      "requires": {
-+        "prelude-ls": "1.1.2",
-+        "type-check": "0.3.2"
-+      }
-+    },
-+    "liftoff": {
-+      "version": "2.3.0",
-+      "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-2.3.0.tgz",
-+      "integrity": "sha1-qY8v9nGD2Lp8+soQVIvX/wVQs4U=",
-+      "dev": true,
-+      "requires": {
-+        "extend": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz",
-+        "findup-sync": "0.4.3",
-+        "fined": "1.1.0",
-+        "flagged-respawn": "0.3.2",
-+        "lodash.isplainobject": "4.0.6",
-+        "lodash.isstring": "4.0.1",
-+        "lodash.mapvalues": "4.6.0",
-+        "rechoir": "0.6.2",
-+        "resolve": "1.3.3"
-+      }
-+    },
-+    "linkify-it": {
-+      "version": "2.0.3",
-+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.0.3.tgz",
-+      "integrity": "sha1-2UpGSPmxwXnWT6lykSaL22zpQ08=",
-+      "dev": true,
-+      "requires": {
-+        "uc.micro": "1.0.3"
-+      }
-+    },
-+    "load-json-file": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-+      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-+      "dev": true,
-+      "requires": {
-+        "graceful-fs": "4.1.11",
-+        "parse-json": "2.2.0",
-+        "pify": "2.3.0",
-+        "pinkie-promise": "2.0.1",
-+        "strip-bom": "2.0.0"
-+      }
-+    },
-+    "lodash": {
-+      "version": "4.17.4",
-+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-+      "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4="
-+    },
-+    "lodash._basecopy": {
-+      "version": "3.0.1",
-+      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
-+      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
-+      "dev": true
-+    },
-+    "lodash._basetostring": {
-+      "version": "3.0.1",
-+      "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
-+      "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=",
-+      "dev": true
-+    },
-+    "lodash._basevalues": {
-+      "version": "3.0.0",
-+      "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
-+      "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=",
-+      "dev": true
-+    },
-+    "lodash._escapehtmlchar": {
-+      "version": "2.4.1",
-+      "resolved": "https://registry.npmjs.org/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz",
-+      "integrity": "sha1-32fDu2t+jh6DGrSL+geVuSr+iZ0=",
-+      "dev": true,
-+      "requires": {
-+        "lodash._htmlescapes": "2.4.1"
-+      }
-+    },
-+    "lodash._escapestringchar": {
-+      "version": "2.4.1",
-+      "resolved": "https://registry.npmjs.org/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz",
-+      "integrity": "sha1-7P4iYYoq3lC/7qQ5N+Ud9m8O23I=",
-+      "dev": true
-+    },
-+    "lodash._getnative": {
-+      "version": "3.9.1",
-+      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-+      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
-+      "dev": true
-+    },
-+    "lodash._htmlescapes": {
-+      "version": "2.4.1",
-+      "resolved": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz",
-+      "integrity": "sha1-MtFL8IRLbeb4tioFG09nwii2JMs=",
-+      "dev": true
-+    },
-+    "lodash._isiterateecall": {
-+      "version": "3.0.9",
-+      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
-+      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
-+      "dev": true
-+    },
-+    "lodash._isnative": {
-+      "version": "2.4.1",
-+      "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz",
-+      "integrity": "sha1-PqZAS3hKe+g2x7V1gOHN95sUgyw=",
-+      "dev": true
-+    },
-+    "lodash._objecttypes": {
-+      "version": "2.4.1",
-+      "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz",
-+      "integrity": "sha1-fAt/admKH3ZSn4kLDNsbTf7BHBE=",
-+      "dev": true
-+    },
-+    "lodash._reescape": {
-+      "version": "3.0.0",
-+      "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
-+      "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=",
-+      "dev": true
-+    },
-+    "lodash._reevaluate": {
-+      "version": "3.0.0",
-+      "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
-+      "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=",
-+      "dev": true
-+    },
-+    "lodash._reinterpolate": {
-+      "version": "3.0.0",
-+      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-+      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
-+      "dev": true
-+    },
-+    "lodash._reunescapedhtml": {
-+      "version": "2.4.1",
-+      "resolved": "https://registry.npmjs.org/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz",
-+      "integrity": "sha1-dHxPxAED6zu4oJduVx96JlnpO6c=",
-+      "dev": true,
-+      "requires": {
-+        "lodash._htmlescapes": "2.4.1",
-+        "lodash.keys": "2.4.1"
-+      },
-+      "dependencies": {
-+        "lodash.keys": {
-+          "version": "2.4.1",
-+          "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
-+          "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
-+          "dev": true,
-+          "requires": {
-+            "lodash._isnative": "2.4.1",
-+            "lodash._shimkeys": "2.4.1",
-+            "lodash.isobject": "2.4.1"
-+          }
-+        }
-+      }
-+    },
-+    "lodash._root": {
-+      "version": "3.0.1",
-+      "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
-+      "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=",
-+      "dev": true
-+    },
-+    "lodash._shimkeys": {
-+      "version": "2.4.1",
-+      "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz",
-+      "integrity": "sha1-bpzJZm/wgfC1psl4uD4kLmlJ0gM=",
-+      "dev": true,
-+      "requires": {
-+        "lodash._objecttypes": "2.4.1"
-+      }
-+    },
-+    "lodash.defaults": {
-+      "version": "2.4.1",
-+      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
-+      "integrity": "sha1-p+iIXwXmiFEUS24SqPNngCa8TFQ=",
-+      "dev": true,
-+      "requires": {
-+        "lodash._objecttypes": "2.4.1",
-+        "lodash.keys": "2.4.1"
-+      },
-+      "dependencies": {
-+        "lodash.keys": {
-+          "version": "2.4.1",
-+          "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
-+          "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
-+          "dev": true,
-+          "requires": {
-+            "lodash._isnative": "2.4.1",
-+            "lodash._shimkeys": "2.4.1",
-+            "lodash.isobject": "2.4.1"
-+          }
-+        }
-+      }
-+    },
-+    "lodash.escape": {
-+      "version": "3.2.0",
-+      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
-+      "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=",
-+      "dev": true,
-+      "requires": {
-+        "lodash._root": "3.0.1"
-+      }
-+    },
-+    "lodash.isarguments": {
-+      "version": "3.1.0",
-+      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
-+      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
-+      "dev": true
-+    },
-+    "lodash.isarray": {
-+      "version": "3.0.4",
-+      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-+      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
-+      "dev": true
-+    },
-+    "lodash.isequal": {
-+      "version": "4.5.0",
-+      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-+      "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
-+      "dev": true
-+    },
-+    "lodash.isobject": {
-+      "version": "2.4.1",
-+      "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
-+      "integrity": "sha1-Wi5H/mmVPx7mMafrof5k0tBlWPU=",
-+      "dev": true,
-+      "requires": {
-+        "lodash._objecttypes": "2.4.1"
-+      }
-+    },
-+    "lodash.isplainobject": {
-+      "version": "4.0.6",
-+      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-+      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=",
-+      "dev": true
-+    },
-+    "lodash.isstring": {
-+      "version": "4.0.1",
-+      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
-+      "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=",
-+      "dev": true
-+    },
-+    "lodash.keys": {
-+      "version": "3.1.2",
-+      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
-+      "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
-+      "dev": true,
-+      "requires": {
-+        "lodash._getnative": "3.9.1",
-+        "lodash.isarguments": "3.1.0",
-+        "lodash.isarray": "3.0.4"
-+      }
-+    },
-+    "lodash.mapvalues": {
-+      "version": "4.6.0",
-+      "resolved": "https://registry.npmjs.org/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz",
-+      "integrity": "sha1-G6+lAF3p3W9PJmaMMMo3IwzJaJw=",
-+      "dev": true
-+    },
-+    "lodash.memoize": {
-+      "version": "4.1.2",
-+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-+      "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
-+      "dev": true
-+    },
-+    "lodash.restparam": {
-+      "version": "3.6.1",
-+      "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
-+      "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
-+      "dev": true
-+    },
-+    "lodash.template": {
-+      "version": "3.6.2",
-+      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
-+      "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=",
-+      "dev": true,
-+      "requires": {
-+        "lodash._basecopy": "3.0.1",
-+        "lodash._basetostring": "3.0.1",
-+        "lodash._basevalues": "3.0.0",
-+        "lodash._isiterateecall": "3.0.9",
-+        "lodash._reinterpolate": "3.0.0",
-+        "lodash.escape": "3.2.0",
-+        "lodash.keys": "3.1.2",
-+        "lodash.restparam": "3.6.1",
-+        "lodash.templatesettings": "3.1.1"
-+      }
-+    },
-+    "lodash.templatesettings": {
-+      "version": "3.1.1",
-+      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz",
-+      "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=",
-+      "dev": true,
-+      "requires": {
-+        "lodash._reinterpolate": "3.0.0",
-+        "lodash.escape": "3.2.0"
-+      }
-+    },
-+    "lodash.uniq": {
-+      "version": "4.5.0",
-+      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-+      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
-+      "dev": true
-+    },
-+    "lodash.values": {
-+      "version": "2.4.1",
-+      "resolved": "https://registry.npmjs.org/lodash.values/-/lodash.values-2.4.1.tgz",
-+      "integrity": "sha1-q/UUQ2s8twUAFieXjLzzCxKA7qQ=",
-+      "dev": true,
-+      "requires": {
-+        "lodash.keys": "2.4.1"
-+      },
-+      "dependencies": {
-+        "lodash.keys": {
-+          "version": "2.4.1",
-+          "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
-+          "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
-+          "dev": true,
-+          "requires": {
-+            "lodash._isnative": "2.4.1",
-+            "lodash._shimkeys": "2.4.1",
-+            "lodash.isobject": "2.4.1"
-+          }
-+        }
-+      }
-+    },
-+    "log-driver": {
-+      "version": "1.2.5",
-+      "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.5.tgz",
-+      "integrity": "sha1-euTsJXMC/XkNVXyxDJcQDYV7AFY=",
-+      "dev": true
-+    },
-+    "lolex": {
-+      "version": "1.3.2",
-+      "resolved": "https://registry.npmjs.org/lolex/-/lolex-1.3.2.tgz",
-+      "integrity": "sha1-fD2mL/yzDw9agKJWbKJORdigHzE=",
-+      "dev": true
-+    },
-+    "longest": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
-+      "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
-+      "dev": true
-+    },
-+    "loud-rejection": {
-+      "version": "1.6.0",
-+      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
-+      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
-+      "dev": true,
-+      "requires": {
-+        "currently-unhandled": "0.4.1",
-+        "signal-exit": "3.0.2"
-+      }
-+    },
-+    "lowercase-keys": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz",
-+      "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=",
-+      "dev": true
-+    },
-+    "lru-cache": {
-+      "version": "2.7.3",
-+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
-+      "integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=",
-+      "dev": true
-+    },
-+    "macaddress": {
-+      "version": "0.2.8",
-+      "resolved": "https://registry.npmjs.org/macaddress/-/macaddress-0.2.8.tgz",
-+      "integrity": "sha1-WQTcU3w57G2+/q6QIycTX6hRHxI=",
-+      "dev": true
-+    },
-+    "make-dir": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.0.0.tgz",
-+      "integrity": "sha1-l6ARdR6R3YfPre9Ygy67BJNt6Xg=",
-+      "dev": true,
-+      "requires": {
-+        "pify": "2.3.0"
-+      }
-+    },
-+    "make-error": {
-+      "version": "1.3.0",
-+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.0.tgz",
-+      "integrity": "sha1-Uq06M5zPEM5itAQLcI/nByRLi5Y=",
-+      "dev": true
-+    },
-+    "make-error-cause": {
-+      "version": "1.2.2",
-+      "resolved": "https://registry.npmjs.org/make-error-cause/-/make-error-cause-1.2.2.tgz",
-+      "integrity": "sha1-3wOI/NCzeBbf8KX7gQiTl3fcvJ0=",
-+      "dev": true,
-+      "requires": {
-+        "make-error": "1.3.0"
-+      }
-+    },
-+    "map-cache": {
-+      "version": "0.2.2",
-+      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-+      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
-+      "dev": true
-+    },
-+    "map-obj": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-+      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-+      "dev": true
-+    },
-+    "map-stream": {
-+      "version": "0.1.0",
-+      "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
-+      "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=",
-+      "dev": true
-+    },
-+    "markdown-it": {
-+      "version": "8.3.1",
-+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-8.3.1.tgz",
-+      "integrity": "sha1-L0tiKUjM3Bk9ZvPKLUMSWsSscyM=",
-+      "dev": true,
-+      "requires": {
-+        "argparse": "1.0.9",
-+        "entities": "1.1.1",
-+        "linkify-it": "2.0.3",
-+        "mdurl": "1.0.1",
-+        "uc.micro": "1.0.3"
-+      }
-+    },
-+    "math-expression-evaluator": {
-+      "version": "1.2.17",
-+      "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz",
-+      "integrity": "sha1-3oGf282E3M2PrlnGrreWFbnSZqw=",
-+      "dev": true
-+    },
-+    "mdurl": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-+      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=",
-+      "dev": true
-+    },
-+    "media-typer": {
-+      "version": "0.3.0",
-+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-+      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
-+      "dev": true
-+    },
-+    "meow": {
-+      "version": "3.7.0",
-+      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-+      "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
-+      "dev": true,
-+      "requires": {
-+        "camelcase-keys": "2.1.0",
-+        "decamelize": "1.2.0",
-+        "loud-rejection": "1.6.0",
-+        "map-obj": "1.0.1",
-+        "minimist": "1.2.0",
-+        "normalize-package-data": "2.4.0",
-+        "object-assign": "4.1.1",
-+        "read-pkg-up": "1.0.1",
-+        "redent": "1.0.0",
-+        "trim-newlines": "1.0.0"
-+      }
-+    },
-+    "merge-descriptors": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-+      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
-+      "dev": true
-+    },
-+    "merge-stream": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz",
-+      "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=",
-+      "dev": true,
-+      "requires": {
-+        "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz"
-+      }
-+    },
-+    "methods": {
-+      "version": "1.1.2",
-+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-+      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
-+      "dev": true
-+    },
-+    "micromatch": {
-+      "version": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-+      "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-+      "dev": true,
-+      "requires": {
-+        "arr-diff": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-+        "array-unique": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-+        "braces": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-+        "expand-brackets": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
-+        "extglob": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
-+        "filename-regex": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.0.tgz",
-+        "is-extglob": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-+        "is-glob": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-+        "kind-of": "https://registry.npmjs.org/kind-of/-/kind-of-3.0.4.tgz",
-+        "normalize-path": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.0.1.tgz",
-+        "object.omit": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.0.tgz",
-+        "parse-glob": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
-+        "regex-cache": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz"
-+      }
-+    },
-+    "mime": {
-+      "version": "1.2.11",
-+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
-+      "integrity": "sha1-WCA+7Ybjpe8XrtK32evUfwpg3RA=",
-+      "dev": true
-+    },
-+    "mime-db": {
-+      "version": "1.27.0",
-+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz",
-+      "integrity": "sha1-gg9XIpa70g7CXtVeW13oaeVDbrE=",
-+      "dev": true
-+    },
-+    "mime-types": {
-+      "version": "2.1.15",
-+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz",
-+      "integrity": "sha1-pOv1BkCUVpI3uM9wBGd20J/JKu0=",
-+      "dev": true,
-+      "requires": {
-+        "mime-db": "1.27.0"
-+      }
-+    },
-+    "minimatch": {
-+      "version": "2.0.10",
-+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-+      "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=",
-+      "dev": true,
-+      "requires": {
-+        "brace-expansion": "1.1.8"
-+      },
-+      "dependencies": {
-+        "balanced-match": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-+          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-+          "dev": true
-+        },
-+        "brace-expansion": {
-+          "version": "1.1.8",
-+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
-+          "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
-+          "dev": true,
-+          "requires": {
-+            "balanced-match": "1.0.0",
-+            "concat-map": "0.0.1"
-+          }
-+        },
-+        "concat-map": {
-+          "version": "0.0.1",
-+          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-+          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "minimist": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-+      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
-+    },
-+    "mkdirp": {
-+      "version": "0.5.1",
-+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-+      "dev": true,
-+      "requires": {
-+        "minimist": "0.0.8"
-+      },
-+      "dependencies": {
-+        "minimist": {
-+          "version": "0.0.8",
-+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "mocha": {
-+      "version": "2.5.3",
-+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-2.5.3.tgz",
-+      "integrity": "sha1-FhvlvetJZ3HrmzV0UFC2IrWu/Fg=",
-+      "dev": true,
-+      "requires": {
-+        "commander": "2.3.0",
-+        "debug": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-+        "diff": "1.4.0",
-+        "escape-string-regexp": "1.0.2",
-+        "glob": "3.2.11",
-+        "growl": "1.9.2",
-+        "jade": "0.26.3",
-+        "mkdirp": "0.5.1",
-+        "supports-color": "1.2.0",
-+        "to-iso-string": "0.0.2"
-+      },
-+      "dependencies": {
-+        "commander": {
-+          "version": "2.3.0",
-+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.3.0.tgz",
-+          "integrity": "sha1-/UMOiJgy7DU7ms0d4hfBHLPu+HM=",
-+          "dev": true
-+        },
-+        "escape-string-regexp": {
-+          "version": "1.0.2",
-+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz",
-+          "integrity": "sha1-Tbwv5nTnGUnK8/smlc5/LcHZqNE=",
-+          "dev": true
-+        },
-+        "glob": {
-+          "version": "3.2.11",
-+          "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
-+          "integrity": "sha1-Spc/Y1uRkPcV0QmH1cAP0oFevj0=",
-+          "dev": true,
-+          "requires": {
-+            "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-+            "minimatch": "0.3.0"
-+          }
-+        },
-+        "minimatch": {
-+          "version": "0.3.0",
-+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
-+          "integrity": "sha1-J12O2qxPG7MyZHIInnlJyDlGmd0=",
-+          "dev": true,
-+          "requires": {
-+            "lru-cache": "2.7.3",
-+            "sigmund": "1.0.1"
-+          }
-+        },
-+        "supports-color": {
-+          "version": "1.2.0",
-+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.2.0.tgz",
-+          "integrity": "sha1-/x7R5hFp0Gs88tWI4YixjYhH4X4=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "ms": {
-+      "version": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-+      "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
-+      "dev": true
-+    },
-+    "multimatch": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-2.1.0.tgz",
-+      "integrity": "sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=",
-+      "dev": true,
-+      "requires": {
-+        "array-differ": "1.0.0",
-+        "array-union": "1.0.2",
-+        "arrify": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-+        "minimatch": "3.0.4"
-+      },
-+      "dependencies": {
-+        "balanced-match": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-+          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-+          "dev": true
-+        },
-+        "brace-expansion": {
-+          "version": "1.1.8",
-+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
-+          "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
-+          "dev": true,
-+          "requires": {
-+            "balanced-match": "1.0.0",
-+            "concat-map": "0.0.1"
-+          }
-+        },
-+        "concat-map": {
-+          "version": "0.0.1",
-+          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-+          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-+          "dev": true
-+        },
-+        "minimatch": {
-+          "version": "3.0.4",
-+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-+          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-+          "dev": true,
-+          "requires": {
-+            "brace-expansion": "1.1.8"
-+          }
-+        }
-+      }
-+    },
-+    "multipipe": {
-+      "version": "0.1.2",
-+      "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
-+      "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=",
-+      "dev": true,
-+      "requires": {
-+        "duplexer2": "0.0.2"
-+      }
-+    },
-+    "mute-stream": {
-+      "version": "0.0.5",
-+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz",
-+      "integrity": "sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA=",
-+      "dev": true
-+    },
-+    "nan": {
-+      "version": "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz",
-+      "integrity": "sha1-+zxZ1F/k7/4hXwuJD4rfbrMtIjI=",
-+      "optional": true
-+    },
-+    "native-keymap": {
-+      "version": "1.2.4",
-+      "resolved": "https://registry.npmjs.org/native-keymap/-/native-keymap-1.2.4.tgz",
-+      "integrity": "sha1-idJ3UCCQwSYKBFXhkGXwXfzdfhI="
-+    },
-+    "natives": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.0.tgz",
-+      "integrity": "sha1-6f+EFBimsux6SV6TmYT3jxY+bjE=",
-+      "dev": true
-+    },
-+    "natural-compare": {
-+      "version": "1.4.0",
-+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-+      "dev": true
-+    },
-+    "negotiator": {
-+      "version": "0.6.1",
-+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
-+      "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=",
-+      "dev": true
-+    },
-+    "node-pty": {
-+      "version": "0.6.8",
-+      "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-0.6.8.tgz",
-+      "integrity": "sha1-p7FFOXvvI6cZEop1sg1IIXJt/pA=",
-+      "requires": {
-+        "nan": "2.5.0"
-+      },
-+      "dependencies": {
-+        "nan": {
-+          "version": "2.5.0",
-+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz",
-+          "integrity": "sha1-qo8eNFMdgH6eJ3VbI0tKbsDBUqg="
-+        }
-+      }
-+    },
-+    "node-uuid": {
-+      "version": "1.4.8",
-+      "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz",
-+      "integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc=",
-+      "dev": true
-+    },
-+    "node.extend": {
-+      "version": "1.1.6",
-+      "resolved": "https://registry.npmjs.org/node.extend/-/node.extend-1.1.6.tgz",
-+      "integrity": "sha1-p7iCyC1sk6SGOlUEvV3o7IYli5Y=",
-+      "dev": true,
-+      "requires": {
-+        "is": "3.2.1"
-+      }
-+    },
-+    "nodegit-promise": {
-+      "version": "4.0.0",
-+      "resolved": "https://registry.npmjs.org/nodegit-promise/-/nodegit-promise-4.0.0.tgz",
-+      "integrity": "sha1-VyKxhPLfcycWEGSnkdLoQskWezQ=",
-+      "requires": {
-+        "asap": "2.0.5"
-+      }
-+    },
-+    "nopt": {
-+      "version": "1.0.10",
-+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
-+      "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=",
-+      "dev": true,
-+      "requires": {
-+        "abbrev": "1.1.0"
-+      }
-+    },
-+    "normalize-package-data": {
-+      "version": "2.4.0",
-+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-+      "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
-+      "dev": true,
-+      "requires": {
-+        "hosted-git-info": "2.5.0",
-+        "is-builtin-module": "1.0.0",
-+        "semver": "4.3.6",
-+        "validate-npm-package-license": "3.0.1"
-+      }
-+    },
-+    "normalize-path": {
-+      "version": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.0.1.tgz",
-+      "integrity": "sha1-R4hqwWYnYNQmG32XnSQXCdPOP3o=",
-+      "dev": true
-+    },
-+    "normalize-range": {
-+      "version": "0.1.2",
-+      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-+      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
-+      "dev": true
-+    },
-+    "normalize-url": {
-+      "version": "1.9.1",
-+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz",
-+      "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=",
-+      "dev": true,
-+      "requires": {
-+        "object-assign": "4.1.1",
-+        "prepend-http": "1.0.4",
-+        "query-string": "4.3.4",
-+        "sort-keys": "1.1.2"
-+      }
-+    },
-+    "npm-run-path": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-1.0.0.tgz",
-+      "integrity": "sha1-9cMr9ZX+ga6Sfa7FLoL4sACsPI8=",
-+      "dev": true,
-+      "requires": {
-+        "path-key": "1.0.0"
-+      }
-+    },
-+    "nsfw": {
-+      "version": "1.0.15",
-+      "resolved": "https://registry.npmjs.org/nsfw/-/nsfw-1.0.15.tgz",
-+      "integrity": "sha1-ylZ/SThoGtdWWj2xVTUdhTA1QH8=",
-+      "requires": {
-+        "fs-extra": "0.26.7",
-+        "lodash": "4.17.4",
-+        "nan": "2.6.2",
-+        "promisify-node": "0.3.0"
-+      },
-+      "dependencies": {
-+        "fs-extra": {
-+          "version": "0.26.7",
-+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz",
-+          "integrity": "sha1-muH92UiXeY7at20JGM9C0MMYT6k=",
-+          "requires": {
-+            "graceful-fs": "4.1.11",
-+            "jsonfile": "2.4.0",
-+            "klaw": "1.3.1",
-+            "path-is-absolute": "1.0.1",
-+            "rimraf": "2.6.1"
-+          }
-+        },
-+        "nan": {
-+          "version": "2.6.2",
-+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz",
-+          "integrity": "sha1-5P805slf37WuzAjeZZb0NgWn20U="
-+        },
-+        "path-is-absolute": {
-+          "version": "1.0.1",
-+          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-+          "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
-+        }
-+      }
-+    },
-+    "nth-check": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz",
-+      "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=",
-+      "dev": true,
-+      "requires": {
-+        "boolbase": "1.0.0"
-+      }
-+    },
-+    "nugget": {
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/nugget/-/nugget-2.0.1.tgz",
-+      "integrity": "sha1-IBCVpIfhrTYIGzQy+jytpPjQcbA=",
-+      "dev": true,
-+      "requires": {
-+        "debug": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-+        "minimist": "1.2.0",
-+        "pretty-bytes": "1.0.4",
-+        "progress-stream": "1.2.0",
-+        "request": "2.81.0",
-+        "single-line-log": "1.1.2",
-+        "throttleit": "0.0.2"
-+      },
-+      "dependencies": {
-+        "assert-plus": {
-+          "version": "0.2.0",
-+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
-+          "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
-+          "dev": true
-+        },
-+        "boom": {
-+          "version": "2.10.1",
-+          "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
-+          "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
-+          "dev": true,
-+          "requires": {
-+            "hoek": "2.16.3"
-+          }
-+        },
-+        "caseless": {
-+          "version": "0.12.0",
-+          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-+          "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-+          "dev": true
-+        },
-+        "combined-stream": {
-+          "version": "1.0.5",
-+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-+          "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
-+          "dev": true,
-+          "requires": {
-+            "delayed-stream": "1.0.0"
-+          }
-+        },
-+        "cryptiles": {
-+          "version": "2.0.5",
-+          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-+          "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
-+          "dev": true,
-+          "requires": {
-+            "boom": "2.10.1"
-+          }
-+        },
-+        "delayed-stream": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-+          "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-+          "dev": true
-+        },
-+        "forever-agent": {
-+          "version": "0.6.1",
-+          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-+          "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-+          "dev": true
-+        },
-+        "form-data": {
-+          "version": "2.1.4",
-+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
-+          "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
-+          "dev": true,
-+          "requires": {
-+            "asynckit": "0.4.0",
-+            "combined-stream": "1.0.5",
-+            "mime-types": "2.1.15"
-+          }
-+        },
-+        "har-validator": {
-+          "version": "4.2.1",
-+          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
-+          "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
-+          "dev": true,
-+          "requires": {
-+            "ajv": "4.11.8",
-+            "har-schema": "1.0.5"
-+          }
-+        },
-+        "hawk": {
-+          "version": "3.1.3",
-+          "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-+          "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
-+          "dev": true,
-+          "requires": {
-+            "boom": "2.10.1",
-+            "cryptiles": "2.0.5",
-+            "hoek": "2.16.3",
-+            "sntp": "1.0.9"
-+          }
-+        },
-+        "hoek": {
-+          "version": "2.16.3",
-+          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-+          "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-+          "dev": true
-+        },
-+        "http-signature": {
-+          "version": "1.1.1",
-+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
-+          "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
-+          "dev": true,
-+          "requires": {
-+            "assert-plus": "0.2.0",
-+            "jsprim": "1.4.0",
-+            "sshpk": "1.13.1"
-+          }
-+        },
-+        "oauth-sign": {
-+          "version": "0.8.2",
-+          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-+          "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
-+          "dev": true
-+        },
-+        "qs": {
-+          "version": "6.4.0",
-+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
-+          "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
-+          "dev": true
-+        },
-+        "request": {
-+          "version": "2.81.0",
-+          "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
-+          "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
-+          "dev": true,
-+          "requires": {
-+            "aws-sign2": "0.6.0",
-+            "aws4": "1.6.0",
-+            "caseless": "0.12.0",
-+            "combined-stream": "1.0.5",
-+            "extend": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz",
-+            "forever-agent": "0.6.1",
-+            "form-data": "2.1.4",
-+            "har-validator": "4.2.1",
-+            "hawk": "3.1.3",
-+            "http-signature": "1.1.1",
-+            "is-typedarray": "1.0.0",
-+            "isstream": "0.1.2",
-+            "json-stringify-safe": "5.0.1",
-+            "mime-types": "2.1.15",
-+            "oauth-sign": "0.8.2",
-+            "performance-now": "0.2.0",
-+            "qs": "6.4.0",
-+            "safe-buffer": "5.1.1",
-+            "stringstream": "0.0.5",
-+            "tough-cookie": "2.3.2",
-+            "tunnel-agent": "0.6.0",
-+            "uuid": "3.1.0"
-+          }
-+        },
-+        "sntp": {
-+          "version": "1.0.9",
-+          "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
-+          "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
-+          "dev": true,
-+          "requires": {
-+            "hoek": "2.16.3"
-+          }
-+        },
-+        "tunnel-agent": {
-+          "version": "0.6.0",
-+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-+          "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-+          "dev": true,
-+          "requires": {
-+            "safe-buffer": "5.1.1"
-+          }
-+        },
-+        "uuid": {
-+          "version": "3.1.0",
-+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-+          "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "num2fraction": {
-+      "version": "1.2.2",
-+      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
-+      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
-+      "dev": true
-+    },
-+    "number-is-nan": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-+      "dev": true
-+    },
-+    "nwmatcher": {
-+      "version": "1.4.1",
-+      "resolved": "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.1.tgz",
-+      "integrity": "sha1-eumwew6oBNt+JfBctf5Al9TklJ8=",
-+      "dev": true
-+    },
-+    "oauth-sign": {
-+      "version": "0.3.0",
-+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz",
-+      "integrity": "sha1-y1QPk7srIqfVlBaRoojWDo6pOG4=",
-+      "dev": true
-+    },
-+    "object-assign": {
-+      "version": "4.1.1",
-+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-+      "dev": true
-+    },
-+    "object-keys": {
-+      "version": "0.4.0",
-+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
-+      "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=",
-+      "dev": true
-+    },
-+    "object.defaults": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
-+      "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=",
-+      "dev": true,
-+      "requires": {
-+        "array-each": "1.0.1",
-+        "array-slice": "1.0.0",
-+        "for-own": "1.0.0",
-+        "isobject": "3.0.1"
-+      },
-+      "dependencies": {
-+        "for-in": {
-+          "version": "1.0.2",
-+          "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-+          "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-+          "dev": true
-+        },
-+        "for-own": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
-+          "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
-+          "dev": true,
-+          "requires": {
-+            "for-in": "1.0.2"
-+          }
-+        },
-+        "isobject": {
-+          "version": "3.0.1",
-+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "object.omit": {
-+      "version": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.0.tgz",
-+      "integrity": "sha1-hoWXMz1U5gZilAu0WGBd1q4S/pQ=",
-+      "dev": true,
-+      "requires": {
-+        "for-own": "https://registry.npmjs.org/for-own/-/for-own-0.1.4.tgz",
-+        "is-extendable": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz"
-+      }
-+    },
-+    "object.pick": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.2.0.tgz",
-+      "integrity": "sha1-tTkr7peC2m2ft9avr1OXefEjTCs=",
-+      "dev": true,
-+      "requires": {
-+        "isobject": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz"
-+      }
-+    },
-+    "on-finished": {
-+      "version": "2.3.0",
-+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-+      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-+      "dev": true,
-+      "requires": {
-+        "ee-first": "1.1.1"
-+      }
-+    },
-+    "once": {
-+      "version": "1.4.0",
-+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-+      "requires": {
-+        "wrappy": "1.0.2"
-+      }
-+    },
-+    "onetime": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
-+      "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
-+      "dev": true
-+    },
-+    "optimist": {
-+      "version": "0.3.5",
-+      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.5.tgz",
-+      "integrity": "sha1-A2VLUkFwMDEtEJ85sVmCW2AwkwQ=",
-+      "dev": true,
-+      "requires": {
-+        "wordwrap": "0.0.3"
-+      },
-+      "dependencies": {
-+        "wordwrap": {
-+          "version": "0.0.3",
-+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-+          "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "optionator": {
-+      "version": "0.8.2",
-+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
-+      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
-+      "dev": true,
-+      "requires": {
-+        "deep-is": "0.1.3",
-+        "fast-levenshtein": "2.0.6",
-+        "levn": "0.3.0",
-+        "prelude-ls": "1.1.2",
-+        "type-check": "0.3.2",
-+        "wordwrap": "1.0.0"
-+      }
-+    },
-+    "orchestrator": {
-+      "version": "0.3.8",
-+      "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz",
-+      "integrity": "sha1-FOfp4nZPcxX7rBhOUGx6pt+UrX4=",
-+      "dev": true,
-+      "requires": {
-+        "end-of-stream": "0.1.5",
-+        "sequencify": "0.0.7",
-+        "stream-consume": "0.1.0"
-+      }
-+    },
-+    "ordered-read-streams": {
-+      "version": "0.1.0",
-+      "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz",
-+      "integrity": "sha1-/VZamvjrRHO6abbtijQ1LLVS8SY=",
-+      "dev": true
-+    },
-+    "os-homedir": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-+      "dev": true
-+    },
-+    "os-locale": {
-+      "version": "1.4.0",
-+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-+      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-+      "dev": true,
-+      "requires": {
-+        "lcid": "1.0.0"
-+      }
-+    },
-+    "os-tmpdir": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-+      "dev": true
-+    },
-+    "osenv": {
-+      "version": "0.1.4",
-+      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
-+      "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
-+      "dev": true,
-+      "requires": {
-+        "os-homedir": "1.0.2",
-+        "os-tmpdir": "1.0.2"
-+      }
-+    },
-+    "package-json": {
-+      "version": "4.0.1",
-+      "resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz",
-+      "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=",
-+      "dev": true,
-+      "requires": {
-+        "got": "6.7.1",
-+        "registry-auth-token": "3.3.1",
-+        "registry-url": "3.1.0",
-+        "semver": "5.3.0"
-+      },
-+      "dependencies": {
-+        "semver": {
-+          "version": "5.3.0",
-+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-+          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "parse-filepath": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.1.tgz",
-+      "integrity": "sha1-FZ1hVdQ5BNFsEO9piRHaHpGWm3M=",
-+      "dev": true,
-+      "requires": {
-+        "is-absolute": "0.2.6",
-+        "map-cache": "0.2.2",
-+        "path-root": "0.1.1"
-+      }
-+    },
-+    "parse-glob": {
-+      "version": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
-+      "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
-+      "dev": true,
-+      "requires": {
-+        "glob-base": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
-+        "is-dotfile": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.2.tgz",
-+        "is-extglob": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-+        "is-glob": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz"
-+      }
-+    },
-+    "parse-json": {
-+      "version": "2.2.0",
-+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-+      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-+      "dev": true,
-+      "requires": {
-+        "error-ex": "1.3.1"
-+      }
-+    },
-+    "parse-passwd": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
-+      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
-+      "dev": true
-+    },
-+    "parse5": {
-+      "version": "1.5.1",
-+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz",
-+      "integrity": "sha1-m387DeMr543CQBsXVzzK8Pb1nZQ=",
-+      "dev": true
-+    },
-+    "parseurl": {
-+      "version": "1.3.1",
-+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz",
-+      "integrity": "sha1-yKuMkiO6NIiKpkopeyiFO+wY2lY=",
-+      "dev": true
-+    },
-+    "path-dirname": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-+      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
-+      "dev": true
-+    },
-+    "path-exists": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-+      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-+      "dev": true,
-+      "requires": {
-+        "pinkie-promise": "2.0.1"
-+      }
-+    },
-+    "path-is-absolute": {
-+      "version": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz",
-+      "integrity": "sha1-Jj2tpmqz8vsQv3+dJN2PPlcO+RI="
-+    },
-+    "path-is-inside": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-+      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
-+      "dev": true
-+    },
-+    "path-key": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-1.0.0.tgz",
-+      "integrity": "sha1-XVPVeAGWRsDWiADbThRua9wqx68=",
-+      "dev": true
-+    },
-+    "path-parse": {
-+      "version": "1.0.5",
-+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
-+      "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
-+      "dev": true
-+    },
-+    "path-root": {
-+      "version": "0.1.1",
-+      "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
-+      "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
-+      "dev": true,
-+      "requires": {
-+        "path-root-regex": "0.1.2"
-+      }
-+    },
-+    "path-root-regex": {
-+      "version": "0.1.2",
-+      "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
-+      "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=",
-+      "dev": true
-+    },
-+    "path-to-regexp": {
-+      "version": "0.1.7",
-+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-+      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
-+      "dev": true
-+    },
-+    "path-type": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-+      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-+      "dev": true,
-+      "requires": {
-+        "graceful-fs": "4.1.11",
-+        "pify": "2.3.0",
-+        "pinkie-promise": "2.0.1"
-+      }
-+    },
-+    "pause-stream": {
-+      "version": "0.0.11",
-+      "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
-+      "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
-+      "dev": true,
-+      "requires": {
-+        "through": "2.3.8"
-+      }
-+    },
-+    "pend": {
-+      "version": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-+      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
-+      "dev": true
-+    },
-+    "performance-now": {
-+      "version": "0.2.0",
-+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
-+      "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=",
-+      "dev": true
-+    },
-+    "pify": {
-+      "version": "2.3.0",
-+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-+      "dev": true
-+    },
-+    "pinkie": {
-+      "version": "2.0.4",
-+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-+      "dev": true
-+    },
-+    "pinkie-promise": {
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-+      "dev": true,
-+      "requires": {
-+        "pinkie": "2.0.4"
-+      }
-+    },
-+    "plist": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/plist/-/plist-1.2.0.tgz",
-+      "integrity": "sha1-CEtQk93JJQbiWfh0uNmxr7jHlZM=",
-+      "dev": true,
-+      "requires": {
-+        "base64-js": "0.0.8",
-+        "util-deprecate": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-+        "xmlbuilder": "4.0.0",
-+        "xmldom": "0.1.27"
-+      },
-+      "dependencies": {
-+        "lodash": {
-+          "version": "3.10.1",
-+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
-+          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
-+          "dev": true
-+        },
-+        "xmlbuilder": {
-+          "version": "4.0.0",
-+          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.0.0.tgz",
-+          "integrity": "sha1-mLj2UcowqmJANvEn0RzGbce5B6M=",
-+          "dev": true,
-+          "requires": {
-+            "lodash": "3.10.1"
-+          }
-+        }
-+      }
-+    },
-+    "plur": {
-+      "version": "2.1.2",
-+      "resolved": "https://registry.npmjs.org/plur/-/plur-2.1.2.tgz",
-+      "integrity": "sha1-dIJFLBoPUI4+NE6uwxLJHCncZVo=",
-+      "dev": true,
-+      "requires": {
-+        "irregular-plurals": "1.3.0"
-+      }
-+    },
-+    "pluralize": {
-+      "version": "1.2.1",
-+      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz",
-+      "integrity": "sha1-0aIUg/0iu0HlihL6NCGCMUCJfEU=",
-+      "dev": true
-+    },
-+    "postcss": {
-+      "version": "5.2.17",
-+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-+      "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
-+      "dev": true,
-+      "requires": {
-+        "chalk": "1.1.3",
-+        "js-base64": "2.1.9",
-+        "source-map": "0.5.6",
-+        "supports-color": "3.2.3"
-+      },
-+      "dependencies": {
-+        "source-map": {
-+          "version": "0.5.6",
-+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-+          "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=",
-+          "dev": true
-+        },
-+        "supports-color": {
-+          "version": "3.2.3",
-+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-+          "dev": true,
-+          "requires": {
-+            "has-flag": "1.0.0"
-+          }
-+        }
-+      }
-+    },
-+    "postcss-calc": {
-+      "version": "5.3.1",
-+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.3.1.tgz",
-+      "integrity": "sha1-d7rnypKK2FcW4v2kLyYb98HWW14=",
-+      "dev": true,
-+      "requires": {
-+        "postcss": "5.2.17",
-+        "postcss-message-helpers": "2.0.0",
-+        "reduce-css-calc": "1.3.0"
-+      }
-+    },
-+    "postcss-colormin": {
-+      "version": "2.2.2",
-+      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-2.2.2.tgz",
-+      "integrity": "sha1-ZjFBfV8OkJo9fsJrJMio0eT5bks=",
-+      "dev": true,
-+      "requires": {
-+        "colormin": "1.1.2",
-+        "postcss": "5.2.17",
-+        "postcss-value-parser": "3.3.0"
-+      }
-+    },
-+    "postcss-convert-values": {
-+      "version": "2.6.1",
-+      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz",
-+      "integrity": "sha1-u9hZPFwf0uPRwyK7kl3K6Nrk1i0=",
-+      "dev": true,
-+      "requires": {
-+        "postcss": "5.2.17",
-+        "postcss-value-parser": "3.3.0"
-+      }
-+    },
-+    "postcss-discard-comments": {
-+      "version": "2.0.4",
-+      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz",
-+      "integrity": "sha1-vv6J+v1bPazlzM5Rt2uBUUvgDj0=",
-+      "dev": true,
-+      "requires": {
-+        "postcss": "5.2.17"
-+      }
-+    },
-+    "postcss-discard-duplicates": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz",
-+      "integrity": "sha1-uavye4isGIFYpesSq8riAmO5GTI=",
-+      "dev": true,
-+      "requires": {
-+        "postcss": "5.2.17"
-+      }
-+    },
-+    "postcss-discard-empty": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz",
-+      "integrity": "sha1-0rS9nVztXr2Nyt52QMfXzX9PkrU=",
-+      "dev": true,
-+      "requires": {
-+        "postcss": "5.2.17"
-+      }
-+    },
-+    "postcss-discard-overridden": {
-+      "version": "0.1.1",
-+      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz",
-+      "integrity": "sha1-ix6vVU9ob7KIzYdMVWZ7CqNmjVg=",
-+      "dev": true,
-+      "requires": {
-+        "postcss": "5.2.17"
-+      }
-+    },
-+    "postcss-discard-unused": {
-+      "version": "2.2.3",
-+      "resolved": "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz",
-+      "integrity": "sha1-vOMLLMWR/8Y0Mitfs0ZLbZNPRDM=",
-+      "dev": true,
-+      "requires": {
-+        "postcss": "5.2.17",
-+        "uniqs": "2.0.0"
-+      }
-+    },
-+    "postcss-filter-plugins": {
-+      "version": "2.0.2",
-+      "resolved": "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz",
-+      "integrity": "sha1-bYWGJTTXNaxCDkqFgG4fXUKG2Ew=",
-+      "dev": true,
-+      "requires": {
-+        "postcss": "5.2.17",
-+        "uniqid": "4.1.1"
-+      }
-+    },
-+    "postcss-merge-idents": {
-+      "version": "2.1.7",
-+      "resolved": "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz",
-+      "integrity": "sha1-TFUwMTwI4dWzu/PSu8dH4njuonA=",
-+      "dev": true,
-+      "requires": {
-+        "has": "1.0.1",
-+        "postcss": "5.2.17",
-+        "postcss-value-parser": "3.3.0"
-+      }
-+    },
-+    "postcss-merge-longhand": {
-+      "version": "2.0.2",
-+      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz",
-+      "integrity": "sha1-I9kM0Sewp3mUkVMyc5A0oaTz1lg=",
-+      "dev": true,
-+      "requires": {
-+        "postcss": "5.2.17"
-+      }
-+    },
-+    "postcss-merge-rules": {
-+      "version": "2.1.2",
-+      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz",
-+      "integrity": "sha1-0d9d+qexrMO+VT8OnhDofGG19yE=",
-+      "dev": true,
-+      "requires": {
-+        "browserslist": "1.7.7",
-+        "caniuse-api": "1.6.1",
-+        "postcss": "5.2.17",
-+        "postcss-selector-parser": "2.2.3",
-+        "vendors": "1.0.1"
-+      }
-+    },
-+    "postcss-message-helpers": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz",
-+      "integrity": "sha1-pPL0+rbk/gAvCu0ABHjN9S+bpg4=",
-+      "dev": true
-+    },
-+    "postcss-minify-font-values": {
-+      "version": "1.0.5",
-+      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz",
-+      "integrity": "sha1-S1jttWZB66fIR0qzUmyv17vey2k=",
-+      "dev": true,
-+      "requires": {
-+        "object-assign": "4.1.1",
-+        "postcss": "5.2.17",
-+        "postcss-value-parser": "3.3.0"
-+      }
-+    },
-+    "postcss-minify-gradients": {
-+      "version": "1.0.5",
-+      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz",
-+      "integrity": "sha1-Xb2hE3NwP4PPtKPqOIHY11/15uE=",
-+      "dev": true,
-+      "requires": {
-+        "postcss": "5.2.17",
-+        "postcss-value-parser": "3.3.0"
-+      }
-+    },
-+    "postcss-minify-params": {
-+      "version": "1.2.2",
-+      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz",
-+      "integrity": "sha1-rSzgcTc7lDs9kwo/pZo1jCjW8fM=",
-+      "dev": true,
-+      "requires": {
-+        "alphanum-sort": "1.0.2",
-+        "postcss": "5.2.17",
-+        "postcss-value-parser": "3.3.0",
-+        "uniqs": "2.0.0"
-+      }
-+    },
-+    "postcss-minify-selectors": {
-+      "version": "2.1.1",
-+      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz",
-+      "integrity": "sha1-ssapjAByz5G5MtGkllCBFDEXNb8=",
-+      "dev": true,
-+      "requires": {
-+        "alphanum-sort": "1.0.2",
-+        "has": "1.0.1",
-+        "postcss": "5.2.17",
-+        "postcss-selector-parser": "2.2.3"
-+      }
-+    },
-+    "postcss-normalize-charset": {
-+      "version": "1.1.1",
-+      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz",
-+      "integrity": "sha1-757nEhLX/nWceO0WL2HtYrXLk/E=",
-+      "dev": true,
-+      "requires": {
-+        "postcss": "5.2.17"
-+      }
-+    },
-+    "postcss-normalize-url": {
-+      "version": "3.0.8",
-+      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz",
-+      "integrity": "sha1-EI90s/L82viRov+j6kWSJ5/HgiI=",
-+      "dev": true,
-+      "requires": {
-+        "is-absolute-url": "2.1.0",
-+        "normalize-url": "1.9.1",
-+        "postcss": "5.2.17",
-+        "postcss-value-parser": "3.3.0"
-+      }
-+    },
-+    "postcss-ordered-values": {
-+      "version": "2.2.3",
-+      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz",
-+      "integrity": "sha1-7sbCpntsQSqNsgQud/6NpD+VwR0=",
-+      "dev": true,
-+      "requires": {
-+        "postcss": "5.2.17",
-+        "postcss-value-parser": "3.3.0"
-+      }
-+    },
-+    "postcss-reduce-idents": {
-+      "version": "2.4.0",
-+      "resolved": "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz",
-+      "integrity": "sha1-wsbSDMlYKE9qv75j92Cb9AkFmtM=",
-+      "dev": true,
-+      "requires": {
-+        "postcss": "5.2.17",
-+        "postcss-value-parser": "3.3.0"
-+      }
-+    },
-+    "postcss-reduce-initial": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz",
-+      "integrity": "sha1-aPgGlfBF0IJjqHmtJA343WT2ROo=",
-+      "dev": true,
-+      "requires": {
-+        "postcss": "5.2.17"
-+      }
-+    },
-+    "postcss-reduce-transforms": {
-+      "version": "1.0.4",
-+      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz",
-+      "integrity": "sha1-/3b02CEkN7McKYpC0uFEQCV3GuE=",
-+      "dev": true,
-+      "requires": {
-+        "has": "1.0.1",
-+        "postcss": "5.2.17",
-+        "postcss-value-parser": "3.3.0"
-+      }
-+    },
-+    "postcss-selector-parser": {
-+      "version": "2.2.3",
-+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz",
-+      "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=",
-+      "dev": true,
-+      "requires": {
-+        "flatten": "1.0.2",
-+        "indexes-of": "1.0.1",
-+        "uniq": "1.0.1"
-+      }
-+    },
-+    "postcss-svgo": {
-+      "version": "2.1.6",
-+      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-2.1.6.tgz",
-+      "integrity": "sha1-tt8YqmE7Zm4TPwittSGcJoSsEI0=",
-+      "dev": true,
-+      "requires": {
-+        "is-svg": "2.1.0",
-+        "postcss": "5.2.17",
-+        "postcss-value-parser": "3.3.0",
-+        "svgo": "0.7.2"
-+      }
-+    },
-+    "postcss-unique-selectors": {
-+      "version": "2.0.2",
-+      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz",
-+      "integrity": "sha1-mB1X0p3csz57Hf4f1DuGSfkzyh0=",
-+      "dev": true,
-+      "requires": {
-+        "alphanum-sort": "1.0.2",
-+        "postcss": "5.2.17",
-+        "uniqs": "2.0.0"
-+      }
-+    },
-+    "postcss-value-parser": {
-+      "version": "3.3.0",
-+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz",
-+      "integrity": "sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=",
-+      "dev": true
-+    },
-+    "postcss-zindex": {
-+      "version": "2.2.0",
-+      "resolved": "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-2.2.0.tgz",
-+      "integrity": "sha1-0hCd3AVbka9n/EyzsCWUZjnSryI=",
-+      "dev": true,
-+      "requires": {
-+        "has": "1.0.1",
-+        "postcss": "5.2.17",
-+        "uniqs": "2.0.0"
-+      }
-+    },
-+    "prelude-ls": {
-+      "version": "1.1.2",
-+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-+      "dev": true
-+    },
-+    "prepend-http": {
-+      "version": "1.0.4",
-+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
-+      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
-+      "dev": true
-+    },
-+    "preserve": {
-+      "version": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
-+      "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
-+      "dev": true
-+    },
-+    "pretty-bytes": {
-+      "version": "1.0.4",
-+      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz",
-+      "integrity": "sha1-CiLoIQYJrTVUL4yNXSFZr/B1HIQ=",
-+      "dev": true,
-+      "requires": {
-+        "get-stdin": "4.0.1",
-+        "meow": "3.7.0"
-+      }
-+    },
-+    "pretty-hrtime": {
-+      "version": "1.0.3",
-+      "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
-+      "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
-+      "dev": true
-+    },
-+    "prettyjson": {
-+      "version": "0.8.1",
-+      "resolved": "https://registry.npmjs.org/prettyjson/-/prettyjson-0.8.1.tgz",
-+      "integrity": "sha1-RtZ3PMsDhZAohMpcweUi+s64wsw=",
-+      "dev": true,
-+      "requires": {
-+        "colors": "0.6.0-1"
-+      },
-+      "dependencies": {
-+        "colors": {
-+          "version": "0.6.0-1",
-+          "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.0-1.tgz",
-+          "integrity": "sha1-bbtozri8YPKzE9zFzhWZ8G0Z5no=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "priorityqueuejs": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/priorityqueuejs/-/priorityqueuejs-1.0.0.tgz",
-+      "integrity": "sha1-LuTyPCVgkT4IwHzlzN1t498sWvg=",
-+      "dev": true
-+    },
-+    "process-nextick-args": {
-+      "version": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-+      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
-+      "dev": true
-+    },
-+    "progress": {
-+      "version": "1.1.8",
-+      "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
-+      "integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=",
-+      "dev": true
-+    },
-+    "progress-stream": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/progress-stream/-/progress-stream-1.2.0.tgz",
-+      "integrity": "sha1-LNPP6jO6OonJwSHsM0er6asSX3c=",
-+      "dev": true,
-+      "requires": {
-+        "speedometer": "0.1.4",
-+        "through2": "0.2.3"
-+      }
-+    },
-+    "promisify-node": {
-+      "version": "0.3.0",
-+      "resolved": "https://registry.npmjs.org/promisify-node/-/promisify-node-0.3.0.tgz",
-+      "integrity": "sha1-tLVaz5D6p9K4uQyjlomQhsAwYM8=",
-+      "requires": {
-+        "nodegit-promise": "4.0.0"
-+      }
-+    },
-+    "proto-list": {
-+      "version": "1.2.4",
-+      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
-+      "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=",
-+      "dev": true
-+    },
-+    "proxy-addr": {
-+      "version": "1.1.4",
-+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.4.tgz",
-+      "integrity": "sha1-J+VF9pYKRKYn2bREZ+NcG2tM4vM=",
-+      "dev": true,
-+      "requires": {
-+        "forwarded": "0.1.0",
-+        "ipaddr.js": "1.3.0"
-+      }
-+    },
-+    "pseudomap": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
-+      "dev": true
-+    },
-+    "pump": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz",
-+      "integrity": "sha1-Oz7mUS+U8OV1U4wXmV+fFpkKXVE=",
-+      "dev": true,
-+      "requires": {
-+        "end-of-stream": "1.4.0",
-+        "once": "1.4.0"
-+      },
-+      "dependencies": {
-+        "end-of-stream": {
-+          "version": "1.4.0",
-+          "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz",
-+          "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=",
-+          "dev": true,
-+          "requires": {
-+            "once": "1.4.0"
-+          }
-+        }
-+      }
-+    },
-+    "punycode": {
-+      "version": "1.4.1",
-+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-+      "dev": true
-+    },
-+    "q": {
-+      "version": "1.5.0",
-+      "resolved": "https://registry.npmjs.org/q/-/q-1.5.0.tgz",
-+      "integrity": "sha1-3QG6ydBtMObyGa7LglPunr3DCPE=",
-+      "dev": true
-+    },
-+    "qs": {
-+      "version": "0.6.6",
-+      "resolved": "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz",
-+      "integrity": "sha1-bgFQmP9RlouKPIGQAdXyyJvEsQc=",
-+      "dev": true
-+    },
-+    "query-string": {
-+      "version": "4.3.4",
-+      "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
-+      "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
-+      "dev": true,
-+      "requires": {
-+        "object-assign": "4.1.1",
-+        "strict-uri-encode": "1.1.0"
-+      }
-+    },
-+    "queue": {
-+      "version": "3.0.6",
-+      "resolved": "https://registry.npmjs.org/queue/-/queue-3.0.6.tgz",
-+      "integrity": "sha1-ZsD/0KHZ0oBFrevalmotOUarnxM=",
-+      "dev": true,
-+      "requires": {
-+        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-+      }
-+    },
-+    "randomatic": {
-+      "version": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.5.tgz",
-+      "integrity": "sha1-Xp718tVzxnvSuBJK6QtRVuRXhAs=",
-+      "dev": true,
-+      "requires": {
-+        "is-number": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-+        "kind-of": "https://registry.npmjs.org/kind-of/-/kind-of-3.0.4.tgz"
-+      }
-+    },
-+    "range-parser": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
-+      "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=",
-+      "dev": true
-+    },
-+    "rc": {
-+      "version": "1.2.1",
-+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz",
-+      "integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=",
-+      "dev": true,
-+      "requires": {
-+        "deep-extend": "0.4.2",
-+        "ini": "1.3.4",
-+        "minimist": "1.2.0",
-+        "strip-json-comments": "2.0.1"
-+      }
-+    },
-+    "rcedit": {
-+      "version": "0.3.0",
-+      "resolved": "https://registry.npmjs.org/rcedit/-/rcedit-0.3.0.tgz",
-+      "integrity": "sha1-y17uGF5Ub57aWXwkjJkGGG+pa84=",
-+      "dev": true
-+    },
-+    "read": {
-+      "version": "1.0.7",
-+      "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
-+      "integrity": "sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=",
-+      "dev": true,
-+      "requires": {
-+        "mute-stream": "0.0.5"
-+      }
-+    },
-+    "read-pkg": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-+      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-+      "dev": true,
-+      "requires": {
-+        "load-json-file": "1.1.0",
-+        "normalize-package-data": "2.4.0",
-+        "path-type": "1.1.0"
-+      }
-+    },
-+    "read-pkg-up": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-+      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-+      "dev": true,
-+      "requires": {
-+        "find-up": "1.1.2",
-+        "read-pkg": "1.1.0"
-+      }
-+    },
-+    "readable-stream": {
-+      "version": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz",
-+      "integrity": "sha1-ZvqLcg4UOLNkaB8q0aY8YYRIydA=",
-+      "dev": true,
-+      "requires": {
-+        "buffer-shims": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
-+        "core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-+        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-+        "isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-+        "process-nextick-args": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-+        "string_decoder": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-+        "util-deprecate": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-+      }
-+    },
-+    "readline2": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz",
-+      "integrity": "sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU=",
-+      "dev": true,
-+      "requires": {
-+        "code-point-at": "1.1.0",
-+        "is-fullwidth-code-point": "1.0.0",
-+        "mute-stream": "0.0.5"
-+      }
-+    },
-+    "rechoir": {
-+      "version": "0.6.2",
-+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
-+      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
-+      "dev": true,
-+      "requires": {
-+        "resolve": "1.3.3"
-+      }
-+    },
-+    "redent": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-+      "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
-+      "dev": true,
-+      "requires": {
-+        "indent-string": "2.1.0",
-+        "strip-indent": "1.0.1"
-+      }
-+    },
-+    "reduce-css-calc": {
-+      "version": "1.3.0",
-+      "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz",
-+      "integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=",
-+      "dev": true,
-+      "requires": {
-+        "balanced-match": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-+        "math-expression-evaluator": "1.2.17",
-+        "reduce-function-call": "1.0.2"
-+      }
-+    },
-+    "reduce-function-call": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.2.tgz",
-+      "integrity": "sha1-WiAL+S4ON3UXUv5FsKszD9S2vpk=",
-+      "dev": true,
-+      "requires": {
-+        "balanced-match": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz"
-+      }
-+    },
-+    "regex-cache": {
-+      "version": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz",
-+      "integrity": "sha1-mxpsNdTQ3871cRrmUejp09cRQUU=",
-+      "dev": true,
-+      "requires": {
-+        "is-equal-shallow": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
-+        "is-primitive": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz"
-+      }
-+    },
-+    "registry-auth-token": {
-+      "version": "3.3.1",
-+      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.1.tgz",
-+      "integrity": "sha1-+w0yie4Nmtosu1KvXf5mywcNMAY=",
-+      "dev": true,
-+      "requires": {
-+        "rc": "1.2.1",
-+        "safe-buffer": "5.1.1"
-+      }
-+    },
-+    "registry-url": {
-+      "version": "3.1.0",
-+      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz",
-+      "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=",
-+      "dev": true,
-+      "requires": {
-+        "rc": "1.2.1"
-+      }
-+    },
-+    "remap-istanbul": {
-+      "version": "0.6.4",
-+      "resolved": "https://registry.npmjs.org/remap-istanbul/-/remap-istanbul-0.6.4.tgz",
-+      "integrity": "sha1-rFUe/xqmQVBLTzGNAwPdph47tpU=",
-+      "dev": true,
-+      "requires": {
-+        "amdefine": "1.0.0",
-+        "gulp-util": "3.0.7",
-+        "istanbul": "0.4.3",
-+        "source-map": "0.5.6",
-+        "through2": "2.0.1"
-+      },
-+      "dependencies": {
-+        "abbrev": {
-+          "version": "1.0.9",
-+          "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
-+          "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=",
-+          "dev": true
-+        },
-+        "amdefine": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz",
-+          "integrity": "sha1-/RdHRwDLXMnCtwnwvp0jzjwZjDM=",
-+          "dev": true
-+        },
-+        "async": {
-+          "version": "1.5.2",
-+          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-+          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-+          "dev": true
-+        },
-+        "dateformat": {
-+          "version": "1.0.12",
-+          "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
-+          "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=",
-+          "dev": true,
-+          "requires": {
-+            "get-stdin": "4.0.1",
-+            "meow": "3.7.0"
-+          }
-+        },
-+        "escodegen": {
-+          "version": "1.8.1",
-+          "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz",
-+          "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=",
-+          "dev": true,
-+          "requires": {
-+            "esprima": "2.7.3",
-+            "estraverse": "1.9.3",
-+            "esutils": "2.0.2",
-+            "optionator": "0.8.2",
-+            "source-map": "0.2.0"
-+          },
-+          "dependencies": {
-+            "source-map": {
-+              "version": "0.2.0",
-+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz",
-+              "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=",
-+              "dev": true,
-+              "optional": true,
-+              "requires": {
-+                "amdefine": "1.0.0"
-+              }
-+            }
-+          }
-+        },
-+        "estraverse": {
-+          "version": "1.9.3",
-+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz",
-+          "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=",
-+          "dev": true
-+        },
-+        "gulp-util": {
-+          "version": "3.0.7",
-+          "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.7.tgz",
-+          "integrity": "sha1-eJJcS4+LSQBawBoBHFV+YhiUHLs=",
-+          "dev": true,
-+          "requires": {
-+            "array-differ": "1.0.0",
-+            "array-uniq": "1.0.3",
-+            "beeper": "1.1.1",
-+            "chalk": "1.1.3",
-+            "dateformat": "1.0.12",
-+            "fancy-log": "1.3.0",
-+            "gulplog": "1.0.0",
-+            "has-gulplog": "0.1.0",
-+            "lodash._reescape": "3.0.0",
-+            "lodash._reevaluate": "3.0.0",
-+            "lodash._reinterpolate": "3.0.0",
-+            "lodash.template": "3.6.2",
-+            "minimist": "1.2.0",
-+            "multipipe": "0.1.2",
-+            "object-assign": "3.0.0",
-+            "replace-ext": "0.0.1",
-+            "through2": "2.0.1",
-+            "vinyl": "0.5.3"
-+          }
-+        },
-+        "istanbul": {
-+          "version": "0.4.3",
-+          "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.3.tgz",
-+          "integrity": "sha1-W3FO4K5JOsXvIEuZ84crzu9z1To=",
-+          "dev": true,
-+          "requires": {
-+            "abbrev": "1.0.9",
-+            "async": "1.5.2",
-+            "escodegen": "1.8.1",
-+            "esprima": "2.7.3",
-+            "fileset": "0.2.1",
-+            "handlebars": "4.0.10",
-+            "js-yaml": "3.6.1",
-+            "mkdirp": "0.5.1",
-+            "nopt": "3.0.6",
-+            "once": "1.4.0",
-+            "resolve": "1.1.7",
-+            "supports-color": "3.2.3",
-+            "which": "1.2.14",
-+            "wordwrap": "1.0.0"
-+          }
-+        },
-+        "nopt": {
-+          "version": "3.0.6",
-+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-+          "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-+          "dev": true,
-+          "requires": {
-+            "abbrev": "1.0.9"
-+          }
-+        },
-+        "object-assign": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
-+          "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=",
-+          "dev": true
-+        },
-+        "readable-stream": {
-+          "version": "2.0.6",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
-+          "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
-+          "dev": true,
-+          "requires": {
-+            "core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-+            "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-+            "isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-+            "process-nextick-args": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-+            "string_decoder": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-+            "util-deprecate": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-+          }
-+        },
-+        "resolve": {
-+          "version": "1.1.7",
-+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-+          "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
-+          "dev": true
-+        },
-+        "source-map": {
-+          "version": "0.5.6",
-+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-+          "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=",
-+          "dev": true
-+        },
-+        "supports-color": {
-+          "version": "3.2.3",
-+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-+          "dev": true,
-+          "requires": {
-+            "has-flag": "1.0.0"
-+          }
-+        },
-+        "through2": {
-+          "version": "2.0.1",
-+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.1.tgz",
-+          "integrity": "sha1-OE51MU1J8y3hLuu4E2uOtrXVnak=",
-+          "dev": true,
-+          "requires": {
-+            "readable-stream": "2.0.6",
-+            "xtend": "4.0.1"
-+          }
-+        },
-+        "vinyl": {
-+          "version": "0.5.3",
-+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
-+          "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=",
-+          "dev": true,
-+          "requires": {
-+            "clone": "1.0.2",
-+            "clone-stats": "0.0.1",
-+            "replace-ext": "0.0.1"
-+          }
-+        }
-+      }
-+    },
-+    "remove-trailing-separator": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz",
-+      "integrity": "sha1-abBi2XhyetFNxrVrpKt3L9jXBRE="
-+    },
-+    "repeat-element": {
-+      "version": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz",
-+      "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=",
-+      "dev": true
-+    },
-+    "repeat-string": {
-+      "version": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.4.tgz",
-+      "integrity": "sha1-ZOwMkeD0tHX5DVtkNlHj5uW2wtU=",
-+      "dev": true
-+    },
-+    "repeating": {
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
-+      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
-+      "dev": true,
-+      "requires": {
-+        "is-finite": "1.0.2"
-+      }
-+    },
-+    "replace-ext": {
-+      "version": "0.0.1",
-+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
-+      "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
-+      "dev": true
-+    },
-+    "replacestream": {
-+      "version": "4.0.2",
-+      "resolved": "https://registry.npmjs.org/replacestream/-/replacestream-4.0.2.tgz",
-+      "integrity": "sha1-DEFAcH5PAyP1DeBEhRcIz1i8N70=",
-+      "dev": true,
-+      "requires": {
-+        "escape-string-regexp": "1.0.5",
-+        "object-assign": "4.1.1",
-+        "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz"
-+      }
-+    },
-+    "request": {
-+      "version": "2.27.0",
-+      "resolved": "https://registry.npmjs.org/request/-/request-2.27.0.tgz",
-+      "integrity": "sha1-37GiJN06Wput5DNwElA9cQ5Thmg=",
-+      "dev": true,
-+      "requires": {
-+        "aws-sign": "0.3.0",
-+        "cookie-jar": "0.3.0",
-+        "forever-agent": "0.5.2",
-+        "form-data": "0.1.4",
-+        "hawk": "1.0.0",
-+        "http-signature": "0.10.1",
-+        "json-stringify-safe": "5.0.1",
-+        "mime": "1.2.11",
-+        "node-uuid": "1.4.8",
-+        "oauth-sign": "0.3.0",
-+        "qs": "0.6.6",
-+        "tunnel-agent": "0.3.0"
-+      }
-+    },
-+    "require-uncached": {
-+      "version": "1.0.3",
-+      "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
-+      "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
-+      "dev": true,
-+      "requires": {
-+        "caller-path": "0.1.0",
-+        "resolve-from": "1.0.1"
-+      }
-+    },
-+    "resolve": {
-+      "version": "1.3.3",
-+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.3.3.tgz",
-+      "integrity": "sha1-ZVkHw0aahoDcLeOidaj91paR8OU=",
-+      "dev": true,
-+      "requires": {
-+        "path-parse": "1.0.5"
-+      }
-+    },
-+    "resolve-dir": {
-+      "version": "0.1.1",
-+      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-0.1.1.tgz",
-+      "integrity": "sha1-shklmlYC+sXFxJatiUpujMQwJh4=",
-+      "dev": true,
-+      "requires": {
-+        "expand-tilde": "1.2.2",
-+        "global-modules": "0.2.3"
-+      }
-+    },
-+    "resolve-from": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
-+      "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=",
-+      "dev": true
-+    },
-+    "resolve-url": {
-+      "version": "0.2.1",
-+      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-+      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
-+      "dev": true
-+    },
-+    "restore-cursor": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
-+      "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
-+      "dev": true,
-+      "requires": {
-+        "exit-hook": "1.1.1",
-+        "onetime": "1.1.0"
-+      }
-+    },
-+    "right-align": {
-+      "version": "0.1.3",
-+      "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
-+      "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
-+      "dev": true,
-+      "optional": true,
-+      "requires": {
-+        "align-text": "0.1.4"
-+      }
-+    },
-+    "rimraf": {
-+      "version": "2.6.1",
-+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
-+      "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=",
-+      "requires": {
-+        "glob": "7.1.2"
-+      },
-+      "dependencies": {
-+        "balanced-match": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-+          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
-+        },
-+        "brace-expansion": {
-+          "version": "1.1.8",
-+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
-+          "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
-+          "requires": {
-+            "balanced-match": "1.0.0",
-+            "concat-map": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-+          }
-+        },
-+        "glob": {
-+          "version": "7.1.2",
-+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+          "requires": {
-+            "fs.realpath": "1.0.0",
-+            "inflight": "1.0.6",
-+            "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-+            "minimatch": "3.0.4",
-+            "once": "1.4.0",
-+            "path-is-absolute": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-+          }
-+        },
-+        "minimatch": {
-+          "version": "3.0.4",
-+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-+          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-+          "requires": {
-+            "brace-expansion": "1.1.8"
-+          }
-+        }
-+      }
-+    },
-+    "run-async": {
-+      "version": "0.1.0",
-+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz",
-+      "integrity": "sha1-yK1KXhEGYeQCp9IbUw4AnyX444k=",
-+      "dev": true,
-+      "requires": {
-+        "once": "1.4.0"
-+      }
-+    },
-+    "rx-lite": {
-+      "version": "3.1.2",
-+      "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz",
-+      "integrity": "sha1-Gc5QLKVyZl87ZHsQk5+X/RYV8QI=",
-+      "dev": true
-+    },
-+    "safe-buffer": {
-+      "version": "5.1.1",
-+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-+      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
-+    },
-+    "samsam": {
-+      "version": "1.1.2",
-+      "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz",
-+      "integrity": "sha1-vsEf3IOp/aBjQBIQ5AF2wwJNFWc=",
-+      "dev": true
-+    },
-+    "sax": {
-+      "version": "0.5.2",
-+      "resolved": "https://registry.npmjs.org/sax/-/sax-0.5.2.tgz",
-+      "integrity": "sha1-c1/6o5oc/4/7lZjwIjq9sDqfsuo=",
-+      "dev": true
-+    },
-+    "semaphore": {
-+      "version": "1.0.5",
-+      "resolved": "https://registry.npmjs.org/semaphore/-/semaphore-1.0.5.tgz",
-+      "integrity": "sha1-tJJXbmavGT25XWXiXsU/Xxl5jWA=",
-+      "dev": true
-+    },
-+    "semver": {
-+      "version": "4.3.6",
-+      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
-+      "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto="
-+    },
-+    "semver-diff": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz",
-+      "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=",
-+      "dev": true,
-+      "requires": {
-+        "semver": "5.3.0"
-+      },
-+      "dependencies": {
-+        "semver": {
-+          "version": "5.3.0",
-+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-+          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "send": {
-+      "version": "0.15.3",
-+      "resolved": "https://registry.npmjs.org/send/-/send-0.15.3.tgz",
-+      "integrity": "sha1-UBP5+ZAj31DRvZiSwZ4979HVMwk=",
-+      "dev": true,
-+      "requires": {
-+        "debug": "2.6.7",
-+        "depd": "1.1.0",
-+        "destroy": "1.0.4",
-+        "encodeurl": "1.0.1",
-+        "escape-html": "1.0.3",
-+        "etag": "1.8.0",
-+        "fresh": "0.5.0",
-+        "http-errors": "1.6.1",
-+        "mime": "1.3.4",
-+        "ms": "2.0.0",
-+        "on-finished": "2.3.0",
-+        "range-parser": "1.2.0",
-+        "statuses": "1.3.1"
-+      },
-+      "dependencies": {
-+        "debug": {
-+          "version": "2.6.7",
-+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz",
-+          "integrity": "sha1-krrR9tBbu2u6Isyoi80OyJTChh4=",
-+          "dev": true,
-+          "requires": {
-+            "ms": "2.0.0"
-+          }
-+        },
-+        "mime": {
-+          "version": "1.3.4",
-+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz",
-+          "integrity": "sha1-EV+eO2s9rylZmDyzjxSaLUDrXVM=",
-+          "dev": true
-+        },
-+        "ms": {
-+          "version": "2.0.0",
-+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "sequencify": {
-+      "version": "0.0.7",
-+      "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz",
-+      "integrity": "sha1-kM/xnQLgcCf9dn9erT57ldHnOAw=",
-+      "dev": true
-+    },
-+    "serve-static": {
-+      "version": "1.12.3",
-+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.12.3.tgz",
-+      "integrity": "sha1-n0uhni8wMMVH+K+ZEHg47DjVseI=",
-+      "dev": true,
-+      "requires": {
-+        "encodeurl": "1.0.1",
-+        "escape-html": "1.0.3",
-+        "parseurl": "1.3.1",
-+        "send": "0.15.3"
-+      }
-+    },
-+    "setprototypeof": {
-+      "version": "1.0.3",
-+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz",
-+      "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=",
-+      "dev": true
-+    },
-+    "shelljs": {
-+      "version": "0.7.8",
-+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.8.tgz",
-+      "integrity": "sha1-3svPh0sNHl+3LhSxZKloMEjprLM=",
-+      "dev": true,
-+      "requires": {
-+        "glob": "7.1.2",
-+        "interpret": "1.0.3",
-+        "rechoir": "0.6.2"
-+      },
-+      "dependencies": {
-+        "balanced-match": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-+          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-+          "dev": true
-+        },
-+        "brace-expansion": {
-+          "version": "1.1.8",
-+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
-+          "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
-+          "dev": true,
-+          "requires": {
-+            "balanced-match": "1.0.0",
-+            "concat-map": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-+          }
-+        },
-+        "glob": {
-+          "version": "7.1.2",
-+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+          "dev": true,
-+          "requires": {
-+            "fs.realpath": "1.0.0",
-+            "inflight": "1.0.6",
-+            "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-+            "minimatch": "3.0.4",
-+            "once": "1.4.0",
-+            "path-is-absolute": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-+          }
-+        },
-+        "minimatch": {
-+          "version": "3.0.4",
-+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-+          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-+          "dev": true,
-+          "requires": {
-+            "brace-expansion": "1.1.8"
-+          }
-+        }
-+      }
-+    },
-+    "sigmund": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
-+      "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=",
-+      "dev": true
-+    },
-+    "signal-exit": {
-+      "version": "3.0.2",
-+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
-+      "dev": true
-+    },
-+    "single-line-log": {
-+      "version": "1.1.2",
-+      "resolved": "https://registry.npmjs.org/single-line-log/-/single-line-log-1.1.2.tgz",
-+      "integrity": "sha1-wvg/Jzo+GhbtsJlWYdoO1e8DM2Q=",
-+      "dev": true,
-+      "requires": {
-+        "string-width": "1.0.2"
-+      }
-+    },
-+    "sinon": {
-+      "version": "1.17.7",
-+      "resolved": "https://registry.npmjs.org/sinon/-/sinon-1.17.7.tgz",
-+      "integrity": "sha1-RUKk9JugxFwF6y6d2dID4rjv4L8=",
-+      "dev": true,
-+      "requires": {
-+        "formatio": "1.1.1",
-+        "lolex": "1.3.2",
-+        "samsam": "1.1.2",
-+        "util": "0.10.3"
-+      }
-+    },
-+    "slice-ansi": {
-+      "version": "0.0.4",
-+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz",
-+      "integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=",
-+      "dev": true
-+    },
-+    "slide": {
-+      "version": "1.1.6",
-+      "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz",
-+      "integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=",
-+      "dev": true
-+    },
-+    "sntp": {
-+      "version": "0.2.4",
-+      "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz",
-+      "integrity": "sha1-+4hfGLDzqtGJ+CSGJTa87ux1CQA=",
-+      "dev": true,
-+      "requires": {
-+        "hoek": "0.9.1"
-+      }
-+    },
-+    "sort-keys": {
-+      "version": "1.1.2",
-+      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
-+      "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
-+      "dev": true,
-+      "requires": {
-+        "is-plain-obj": "1.1.0"
-+      }
-+    },
-+    "source-map": {
-+      "version": "0.4.4",
-+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-+      "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
-+      "dev": true,
-+      "requires": {
-+        "amdefine": "1.0.1"
-+      }
-+    },
-+    "source-map-resolve": {
-+      "version": "0.3.1",
-+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.3.1.tgz",
-+      "integrity": "sha1-YQ9hIqRFuN1RU1oqcbeD38Ekh2E=",
-+      "dev": true,
-+      "requires": {
-+        "atob": "1.1.3",
-+        "resolve-url": "0.2.1",
-+        "source-map-url": "0.3.0",
-+        "urix": "0.1.0"
-+      }
-+    },
-+    "source-map-url": {
-+      "version": "0.3.0",
-+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.3.0.tgz",
-+      "integrity": "sha1-fsrxO1e80J2opAxdJp2zN5nUqvk=",
-+      "dev": true
-+    },
-+    "sparkles": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz",
-+      "integrity": "sha1-Gsu/tZJDbRC76PeFt8xvgoFQEsM=",
-+      "dev": true
-+    },
-+    "spdx-correct": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
-+      "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=",
-+      "dev": true,
-+      "requires": {
-+        "spdx-license-ids": "1.2.2"
-+      }
-+    },
-+    "spdx-expression-parse": {
-+      "version": "1.0.4",
-+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz",
-+      "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=",
-+      "dev": true
-+    },
-+    "spdx-license-ids": {
-+      "version": "1.2.2",
-+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz",
-+      "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=",
-+      "dev": true
-+    },
-+    "speedometer": {
-+      "version": "0.1.4",
-+      "resolved": "https://registry.npmjs.org/speedometer/-/speedometer-0.1.4.tgz",
-+      "integrity": "sha1-mHbb0qFp0xFUAtSObqYynIgWpQ0=",
-+      "dev": true
-+    },
-+    "split": {
-+      "version": "0.3.3",
-+      "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
-+      "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=",
-+      "dev": true,
-+      "requires": {
-+        "through": "2.3.8"
-+      }
-+    },
-+    "sprintf-js": {
-+      "version": "1.0.3",
-+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-+      "dev": true
-+    },
-+    "sshpk": {
-+      "version": "1.13.1",
-+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
-+      "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
-+      "dev": true,
-+      "requires": {
-+        "asn1": "0.2.3",
-+        "assert-plus": "1.0.0",
-+        "bcrypt-pbkdf": "1.0.1",
-+        "dashdash": "1.14.1",
-+        "ecc-jsbn": "0.1.1",
-+        "getpass": "0.1.7",
-+        "jsbn": "0.1.1",
-+        "tweetnacl": "0.14.5"
-+      },
-+      "dependencies": {
-+        "asn1": {
-+          "version": "0.2.3",
-+          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-+          "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
-+          "dev": true
-+        },
-+        "assert-plus": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "statuses": {
-+      "version": "1.3.1",
-+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
-+      "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
-+      "dev": true
-+    },
-+    "stream-combiner": {
-+      "version": "0.0.4",
-+      "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
-+      "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=",
-+      "dev": true,
-+      "requires": {
-+        "duplexer": "0.1.1"
-+      }
-+    },
-+    "stream-consume": {
-+      "version": "0.1.0",
-+      "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz",
-+      "integrity": "sha1-pB6tGm1ggc63n2WwYZAbbY89HQ8=",
-+      "dev": true
-+    },
-+    "stream-shift": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
-+      "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
-+      "dev": true
-+    },
-+    "streamfilter": {
-+      "version": "1.0.5",
-+      "resolved": "https://registry.npmjs.org/streamfilter/-/streamfilter-1.0.5.tgz",
-+      "integrity": "sha1-h1BxEb644phFFxe1Ec/tjwAqv1M=",
-+      "dev": true,
-+      "requires": {
-+        "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz"
-+      }
-+    },
-+    "streamifier": {
-+      "version": "0.1.1",
-+      "resolved": "https://registry.npmjs.org/streamifier/-/streamifier-0.1.1.tgz",
-+      "integrity": "sha1-l+mNj6TRBdYqJpHR3AfoINuN/E8=",
-+      "dev": true
-+    },
-+    "strict-uri-encode": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
-+      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
-+      "dev": true
-+    },
-+    "string_decoder": {
-+      "version": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-+      "dev": true
-+    },
-+    "string-width": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-+      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-+      "dev": true,
-+      "requires": {
-+        "code-point-at": "1.1.0",
-+        "is-fullwidth-code-point": "1.0.0",
-+        "strip-ansi": "3.0.1"
-+      }
-+    },
-+    "stringstream": {
-+      "version": "0.0.5",
-+      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-+      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
-+      "dev": true
-+    },
-+    "strip-ansi": {
-+      "version": "3.0.1",
-+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-+      "dev": true,
-+      "requires": {
-+        "ansi-regex": "2.1.1"
-+      }
-+    },
-+    "strip-bom": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-+      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-+      "dev": true,
-+      "requires": {
-+        "is-utf8": "0.2.1"
-+      }
-+    },
-+    "strip-bom-stream": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz",
-+      "integrity": "sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=",
-+      "dev": true,
-+      "requires": {
-+        "first-chunk-stream": "1.0.0",
-+        "strip-bom": "2.0.0"
-+      }
-+    },
-+    "strip-eof": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-+      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
-+      "dev": true
-+    },
-+    "strip-indent": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
-+      "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
-+      "dev": true,
-+      "requires": {
-+        "get-stdin": "4.0.1"
-+      }
-+    },
-+    "strip-json-comments": {
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
-+      "dev": true
-+    },
-+    "sumchecker": {
-+      "version": "1.3.1",
-+      "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-1.3.1.tgz",
-+      "integrity": "sha1-ebs7RFbdBPGOvbwNcDodHa7FEF0=",
-+      "dev": true,
-+      "requires": {
-+        "debug": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-+        "es6-promise": "4.1.1"
-+      }
-+    },
-+    "supports-color": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-+      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-+      "dev": true
-+    },
-+    "svgo": {
-+      "version": "0.7.2",
-+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz",
-+      "integrity": "sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U=",
-+      "dev": true,
-+      "requires": {
-+        "coa": "1.0.3",
-+        "colors": "1.1.2",
-+        "csso": "2.3.2",
-+        "js-yaml": "3.7.0",
-+        "mkdirp": "0.5.1",
-+        "sax": "1.2.4",
-+        "whet.extend": "0.9.9"
-+      },
-+      "dependencies": {
-+        "colors": {
-+          "version": "1.1.2",
-+          "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
-+          "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
-+          "dev": true
-+        },
-+        "js-yaml": {
-+          "version": "3.7.0",
-+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz",
-+          "integrity": "sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=",
-+          "dev": true,
-+          "requires": {
-+            "argparse": "1.0.9",
-+            "esprima": "2.7.3"
-+          }
-+        },
-+        "sax": {
-+          "version": "1.2.4",
-+          "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-+          "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "table": {
-+      "version": "3.8.3",
-+      "resolved": "https://registry.npmjs.org/table/-/table-3.8.3.tgz",
-+      "integrity": "sha1-K7xULw/amGGnVdOUf+/Ys/UThV8=",
-+      "dev": true,
-+      "requires": {
-+        "ajv": "4.11.8",
-+        "ajv-keywords": "1.5.1",
-+        "chalk": "1.1.3",
-+        "lodash": "4.17.4",
-+        "slice-ansi": "0.0.4",
-+        "string-width": "2.1.0"
-+      },
-+      "dependencies": {
-+        "ansi-regex": {
-+          "version": "3.0.0",
-+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-+          "dev": true
-+        },
-+        "is-fullwidth-code-point": {
-+          "version": "2.0.0",
-+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-+          "dev": true
-+        },
-+        "string-width": {
-+          "version": "2.1.0",
-+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.0.tgz",
-+          "integrity": "sha1-AwZkVh/BRslCPsfZeP4kV0N/5tA=",
-+          "dev": true,
-+          "requires": {
-+            "is-fullwidth-code-point": "2.0.0",
-+            "strip-ansi": "4.0.0"
-+          }
-+        },
-+        "strip-ansi": {
-+          "version": "4.0.0",
-+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-+          "dev": true,
-+          "requires": {
-+            "ansi-regex": "3.0.0"
-+          }
-+        }
-+      }
-+    },
-+    "temp": {
-+      "version": "0.8.3",
-+      "resolved": "https://registry.npmjs.org/temp/-/temp-0.8.3.tgz",
-+      "integrity": "sha1-4Ma8TSa5AxJEEOT+2BEDAU38H1k=",
-+      "dev": true,
-+      "requires": {
-+        "os-tmpdir": "1.0.2",
-+        "rimraf": "2.2.8"
-+      },
-+      "dependencies": {
-+        "rimraf": {
-+          "version": "2.2.8",
-+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
-+          "integrity": "sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "term-size": {
-+      "version": "0.1.1",
-+      "resolved": "https://registry.npmjs.org/term-size/-/term-size-0.1.1.tgz",
-+      "integrity": "sha1-hzYLljlsq1dgljcUzaDQy+7K2co=",
-+      "dev": true,
-+      "requires": {
-+        "execa": "0.4.0"
-+      }
-+    },
-+    "text-table": {
-+      "version": "0.2.0",
-+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-+      "dev": true
-+    },
-+    "textextensions": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/textextensions/-/textextensions-1.0.2.tgz",
-+      "integrity": "sha1-ZUhjk+4fK7A5pgy7oFsLaL2VAdI=",
-+      "dev": true
-+    },
-+    "throttleit": {
-+      "version": "0.0.2",
-+      "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz",
-+      "integrity": "sha1-z+34jmDADdlpe2H90qg0OptoDq8=",
-+      "dev": true
-+    },
-+    "through": {
-+      "version": "2.3.8",
-+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-+      "dev": true
-+    },
-+    "through2": {
-+      "version": "0.2.3",
-+      "resolved": "https://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
-+      "integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=",
-+      "dev": true,
-+      "requires": {
-+        "readable-stream": "1.1.14",
-+        "xtend": "2.1.2"
-+      },
-+      "dependencies": {
-+        "isarray": {
-+          "version": "0.0.1",
-+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-+          "dev": true
-+        },
-+        "readable-stream": {
-+          "version": "1.1.14",
-+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-+          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-+          "dev": true,
-+          "requires": {
-+            "core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-+            "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-+            "isarray": "0.0.1",
-+            "string_decoder": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-+          }
-+        },
-+        "xtend": {
-+          "version": "2.1.2",
-+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
-+          "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
-+          "dev": true,
-+          "requires": {
-+            "object-keys": "0.4.0"
-+          }
-+        }
-+      }
-+    },
-+    "through2-filter": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz",
-+      "integrity": "sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=",
-+      "dev": true,
-+      "requires": {
-+        "through2": "2.0.3",
-+        "xtend": "4.0.1"
-+      },
-+      "dependencies": {
-+        "through2": {
-+          "version": "2.0.3",
-+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
-+          "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
-+          "dev": true,
-+          "requires": {
-+            "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz",
-+            "xtend": "4.0.1"
-+          }
-+        }
-+      }
-+    },
-+    "tildify": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz",
-+      "integrity": "sha1-3OwD9V3Km3qj5bBPIYF+tW5jWIo=",
-+      "dev": true,
-+      "requires": {
-+        "os-homedir": "1.0.2"
-+      }
-+    },
-+    "time-stamp": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
-+      "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
-+      "dev": true
-+    },
-+    "timed-out": {
-+      "version": "4.0.1",
-+      "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz",
-+      "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=",
-+      "dev": true
-+    },
-+    "tmp": {
-+      "version": "0.0.29",
-+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.29.tgz",
-+      "integrity": "sha1-8lEl/w3Z2jzLDC3Tce4SiLuRKMA=",
-+      "dev": true,
-+      "requires": {
-+        "os-tmpdir": "1.0.2"
-+      }
-+    },
-+    "to-absolute-glob": {
-+      "version": "0.1.1",
-+      "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz",
-+      "integrity": "sha1-HN+kcqnvUMI57maZm2YsoOs5k38=",
-+      "dev": true,
-+      "requires": {
-+        "extend-shallow": "2.0.1"
-+      }
-+    },
-+    "to-iso-string": {
-+      "version": "0.0.2",
-+      "resolved": "https://registry.npmjs.org/to-iso-string/-/to-iso-string-0.0.2.tgz",
-+      "integrity": "sha1-TcGeZk38y+Jb2NtQiwDG2hWCVdE=",
-+      "dev": true
-+    },
-+    "tough-cookie": {
-+      "version": "2.3.2",
-+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
-+      "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=",
-+      "dev": true,
-+      "requires": {
-+        "punycode": "1.4.1"
-+      }
-+    },
-+    "trim-newlines": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-+      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
-+      "dev": true
-+    },
-+    "tryit": {
-+      "version": "1.0.3",
-+      "resolved": "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz",
-+      "integrity": "sha1-OTvnMKlEb9Hq1tpZoBQwjzbCics=",
-+      "dev": true
-+    },
-+    "tslint": {
-+      "version": "4.5.1",
-+      "resolved": "https://registry.npmjs.org/tslint/-/tslint-4.5.1.tgz",
-+      "integrity": "sha1-BTVocb7yOkNJBnNABvwYgza6gks=",
-+      "dev": true,
-+      "requires": {
-+        "babel-code-frame": "6.22.0",
-+        "colors": "1.1.2",
-+        "diff": "3.2.0",
-+        "findup-sync": "0.3.0",
-+        "glob": "7.1.2",
-+        "optimist": "0.6.1",
-+        "resolve": "1.3.3",
-+        "tsutils": "1.9.1",
-+        "update-notifier": "2.2.0"
-+      },
-+      "dependencies": {
-+        "balanced-match": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-+          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-+          "dev": true
-+        },
-+        "brace-expansion": {
-+          "version": "1.1.8",
-+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
-+          "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
-+          "dev": true,
-+          "requires": {
-+            "balanced-match": "1.0.0",
-+            "concat-map": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-+          }
-+        },
-+        "colors": {
-+          "version": "1.1.2",
-+          "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
-+          "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
-+          "dev": true
-+        },
-+        "diff": {
-+          "version": "3.2.0",
-+          "resolved": "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz",
-+          "integrity": "sha1-yc45Okt8vQsFinJck98pkCeGj/k=",
-+          "dev": true
-+        },
-+        "findup-sync": {
-+          "version": "0.3.0",
-+          "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz",
-+          "integrity": "sha1-N5MKpdgWt3fANEXhlmzGeQpMCxY=",
-+          "dev": true,
-+          "requires": {
-+            "glob": "5.0.15"
-+          },
-+          "dependencies": {
-+            "glob": {
-+              "version": "5.0.15",
-+              "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-+              "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-+              "dev": true,
-+              "requires": {
-+                "inflight": "1.0.6",
-+                "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-+                "minimatch": "2.0.10",
-+                "once": "1.4.0",
-+                "path-is-absolute": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-+              }
-+            }
-+          }
-+        },
-+        "glob": {
-+          "version": "7.1.2",
-+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+          "dev": true,
-+          "requires": {
-+            "fs.realpath": "1.0.0",
-+            "inflight": "1.0.6",
-+            "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-+            "minimatch": "3.0.4",
-+            "once": "1.4.0",
-+            "path-is-absolute": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-+          },
-+          "dependencies": {
-+            "minimatch": {
-+              "version": "3.0.4",
-+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-+              "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-+              "dev": true,
-+              "requires": {
-+                "brace-expansion": "1.1.8"
-+              }
-+            }
-+          }
-+        },
-+        "minimist": {
-+          "version": "0.0.10",
-+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
-+          "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
-+          "dev": true
-+        },
-+        "optimist": {
-+          "version": "0.6.1",
-+          "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
-+          "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
-+          "dev": true,
-+          "requires": {
-+            "minimist": "0.0.10",
-+            "wordwrap": "0.0.3"
-+          }
-+        },
-+        "wordwrap": {
-+          "version": "0.0.3",
-+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-+          "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "tsutils": {
-+      "version": "1.9.1",
-+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-1.9.1.tgz",
-+      "integrity": "sha1-ufmrROVa+WgYMdXyjQrur1x1DLA=",
-+      "dev": true
-+    },
-+    "tunnel": {
-+      "version": "0.0.4",
-+      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.4.tgz",
-+      "integrity": "sha1-LTeFoVjBdMmhbcLARuxfxfF0IhM=",
-+      "dev": true
-+    },
-+    "tunnel-agent": {
-+      "version": "0.3.0",
-+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz",
-+      "integrity": "sha1-rWgbaPUyGtKCfEz7G31d8s/pQu4=",
-+      "dev": true
-+    },
-+    "tweetnacl": {
-+      "version": "0.14.5",
-+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-+      "dev": true,
-+      "optional": true
-+    },
-+    "type-check": {
-+      "version": "0.3.2",
-+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-+      "dev": true,
-+      "requires": {
-+        "prelude-ls": "1.1.2"
-+      }
-+    },
-+    "type-is": {
-+      "version": "1.6.15",
-+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz",
-+      "integrity": "sha1-yrEPtJCeRByChC6v4a1kbIGARBA=",
-+      "dev": true,
-+      "requires": {
-+        "media-typer": "0.3.0",
-+        "mime-types": "2.1.15"
-+      }
-+    },
-+    "typed-rest-client": {
-+      "version": "0.9.0",
-+      "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-0.9.0.tgz",
-+      "integrity": "sha1-92jMDcP06VDwbgSCXDaz54NKofI=",
-+      "dev": true,
-+      "requires": {
-+        "tunnel": "0.0.4",
-+        "underscore": "1.8.3"
-+      }
-+    },
-+    "typedarray": {
-+      "version": "0.0.6",
-+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
-+      "dev": true
-+    },
-+    "typescript": {
-+      "version": "2.3.3",
-+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.3.3.tgz",
-+      "integrity": "sha1-ljnzw7QBSOjKl/4IpR3RiRu2viI=",
-+      "dev": true
-+    },
-+    "typescript-formatter": {
-+      "version": "4.0.1",
-+      "resolved": "https://registry.npmjs.org/typescript-formatter/-/typescript-formatter-4.0.1.tgz",
-+      "integrity": "sha1-7YLa+FbMmjebsWt/Gqya/+4pdM0=",
-+      "dev": true,
-+      "requires": {
-+        "commandpost": "1.1.0",
-+        "editorconfig": "0.13.2",
-+        "glob-expand": "0.2.1"
-+      }
-+    },
-+    "uc.micro": {
-+      "version": "1.0.3",
-+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.3.tgz",
-+      "integrity": "sha1-ftUNXg+an7ClczeSWfKndFjVAZI=",
-+      "dev": true
-+    },
-+    "uglify-es": {
-+      "version": "3.0.23",
-+      "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.0.23.tgz",
-+      "integrity": "sha512-/2wRtzmFqHNPK+GyO2JD828sUdX1zgwHflhmYxuLpjXMysdupAPB0vbmb59NT22uq5+Qm1tizZ1MWqH3mbEpfA==",
-+      "dev": true,
-+      "requires": {
-+        "commander": "2.9.0",
-+        "source-map": "0.5.6"
-+      },
-+      "dependencies": {
-+        "commander": {
-+          "version": "2.9.0",
-+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
-+          "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
-+          "dev": true,
-+          "requires": {
-+            "graceful-readlink": "1.0.1"
-+          }
-+        },
-+        "source-map": {
-+          "version": "0.5.6",
-+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-+          "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "uglify-to-browserify": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
-+      "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
-+      "dev": true,
-+      "optional": true
-+    },
-+    "unc-path-regex": {
-+      "version": "0.1.2",
-+      "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
-+      "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
-+      "dev": true
-+    },
-+    "underscore": {
-+      "version": "1.8.3",
-+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
-+      "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=",
-+      "dev": true
-+    },
-+    "underscore.string": {
-+      "version": "2.2.1",
-+      "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.2.1.tgz",
-+      "integrity": "sha1-18D6KvXVoaZ/QlPa7pgTLnM/Dxk=",
-+      "dev": true
-+    },
-+    "uniq": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
-+      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
-+      "dev": true
-+    },
-+    "uniqid": {
-+      "version": "4.1.1",
-+      "resolved": "https://registry.npmjs.org/uniqid/-/uniqid-4.1.1.tgz",
-+      "integrity": "sha1-iSIN32t1GuUrX3JISGNShZa7hME=",
-+      "dev": true,
-+      "requires": {
-+        "macaddress": "0.2.8"
-+      }
-+    },
-+    "uniqs": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz",
-+      "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=",
-+      "dev": true
-+    },
-+    "unique-stream": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz",
-+      "integrity": "sha1-1ZpKdUJ0R9mqbJHnAmP40mpLEEs=",
-+      "dev": true
-+    },
-+    "unique-string": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
-+      "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
-+      "dev": true,
-+      "requires": {
-+        "crypto-random-string": "1.0.0"
-+      }
-+    },
-+    "unpipe": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-+      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
-+      "dev": true
-+    },
-+    "unzip-response": {
-+      "version": "2.0.1",
-+      "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz",
-+      "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=",
-+      "dev": true
-+    },
-+    "update-notifier": {
-+      "version": "2.2.0",
-+      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.2.0.tgz",
-+      "integrity": "sha1-G1g3z5DAc22IYncytmHBOPht5y8=",
-+      "dev": true,
-+      "requires": {
-+        "boxen": "1.1.0",
-+        "chalk": "1.1.3",
-+        "configstore": "3.1.0",
-+        "import-lazy": "2.1.0",
-+        "is-npm": "1.0.0",
-+        "latest-version": "3.1.0",
-+        "semver-diff": "2.1.0",
-+        "xdg-basedir": "3.0.0"
-+      }
-+    },
-+    "urix": {
-+      "version": "0.1.0",
-+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
-+      "dev": true
-+    },
-+    "url-join": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/url-join/-/url-join-1.1.0.tgz",
-+      "integrity": "sha1-dBxsL0WWxIMNZxhGCSDQySIC3Hg=",
-+      "dev": true
-+    },
-+    "url-parse-lax": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
-+      "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
-+      "dev": true,
-+      "requires": {
-+        "prepend-http": "1.0.4"
-+      }
-+    },
-+    "user-home": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz",
-+      "integrity": "sha1-nHC/2Babwdy/SGBODwS4tJzenp8=",
-+      "dev": true,
-+      "requires": {
-+        "os-homedir": "1.0.2"
-+      }
-+    },
-+    "util": {
-+      "version": "0.10.3",
-+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-+      "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
-+      "dev": true,
-+      "requires": {
-+        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-+      }
-+    },
-+    "util-deprecate": {
-+      "version": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-+      "dev": true
-+    },
-+    "utils-merge": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
-+      "integrity": "sha1-ApT7kiu5N1FTVBxPcJYjHyh8ivg=",
-+      "dev": true
-+    },
-+    "v8-profiler": {
-+      "version": "github:jrieken/v8-profiler#bc0803a4d4b2150b8a1bbffa80270769007036c2",
-+      "requires": {
-+        "nan": "2.6.2"
-+      },
-+      "dependencies": {
-+        "nan": {
-+          "version": "2.6.2",
-+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz",
-+          "integrity": "sha1-5P805slf37WuzAjeZZb0NgWn20U="
-+        }
-+      }
-+    },
-+    "v8flags": {
-+      "version": "2.1.1",
-+      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz",
-+      "integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=",
-+      "dev": true,
-+      "requires": {
-+        "user-home": "1.1.1"
-+      },
-+      "dependencies": {
-+        "user-home": {
-+          "version": "1.1.1",
-+          "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
-+          "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "vali-date": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz",
-+      "integrity": "sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY=",
-+      "dev": true
-+    },
-+    "validate-npm-package-license": {
-+      "version": "3.0.1",
-+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
-+      "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=",
-+      "dev": true,
-+      "requires": {
-+        "spdx-correct": "1.0.2",
-+        "spdx-expression-parse": "1.0.4"
-+      }
-+    },
-+    "validator": {
-+      "version": "3.1.0",
-+      "resolved": "https://registry.npmjs.org/validator/-/validator-3.1.0.tgz",
-+      "integrity": "sha1-LqH/fpIlTWk2fzhfAVKZ5erYdVs=",
-+      "dev": true
-+    },
-+    "vary": {
-+      "version": "1.1.1",
-+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.1.tgz",
-+      "integrity": "sha1-Z1Neu2lMHVIldFeYRmUyP1h+jTc=",
-+      "dev": true
-+    },
-+    "vendors": {
-+      "version": "1.0.1",
-+      "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.1.tgz",
-+      "integrity": "sha1-N61zyO5Bf7PVgOeFMSMH0nSEfyI=",
-+      "dev": true
-+    },
-+    "verror": {
-+      "version": "1.3.6",
-+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz",
-+      "integrity": "sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw=",
-+      "dev": true,
-+      "requires": {
-+        "extsprintf": "1.0.2"
-+      }
-+    },
-+    "vinyl": {
-+      "version": "0.4.6",
-+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
-+      "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
-+      "dev": true,
-+      "requires": {
-+        "clone": "0.2.0",
-+        "clone-stats": "0.0.1"
-+      },
-+      "dependencies": {
-+        "clone": {
-+          "version": "0.2.0",
-+          "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
-+          "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "vinyl-fs": {
-+      "version": "2.4.4",
-+      "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz",
-+      "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=",
-+      "dev": true,
-+      "requires": {
-+        "duplexify": "3.5.0",
-+        "glob-stream": "5.3.5",
-+        "graceful-fs": "4.1.11",
-+        "gulp-sourcemaps": "1.6.0",
-+        "is-valid-glob": "0.3.0",
-+        "lazystream": "1.0.0",
-+        "lodash.isequal": "4.5.0",
-+        "merge-stream": "1.0.1",
-+        "mkdirp": "0.5.1",
-+        "object-assign": "4.1.1",
-+        "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz",
-+        "strip-bom": "2.0.0",
-+        "strip-bom-stream": "1.0.0",
-+        "through2": "2.0.3",
-+        "through2-filter": "2.0.0",
-+        "vali-date": "1.0.0",
-+        "vinyl": "1.2.0"
-+      },
-+      "dependencies": {
-+        "glob-parent": {
-+          "version": "3.1.0",
-+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-+          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-+          "dev": true,
-+          "requires": {
-+            "is-glob": "3.1.0",
-+            "path-dirname": "1.0.2"
-+          }
-+        },
-+        "glob-stream": {
-+          "version": "5.3.5",
-+          "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz",
-+          "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=",
-+          "dev": true,
-+          "requires": {
-+            "extend": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz",
-+            "glob": "5.0.15",
-+            "glob-parent": "3.1.0",
-+            "micromatch": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-+            "ordered-read-streams": "0.3.0",
-+            "through2": "0.6.5",
-+            "to-absolute-glob": "0.1.1",
-+            "unique-stream": "2.2.1"
-+          },
-+          "dependencies": {
-+            "readable-stream": {
-+              "version": "1.0.34",
-+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-+              "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-+              "dev": true,
-+              "requires": {
-+                "core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-+                "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-+                "isarray": "0.0.1",
-+                "string_decoder": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-+              }
-+            },
-+            "through2": {
-+              "version": "0.6.5",
-+              "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-+              "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-+              "dev": true,
-+              "requires": {
-+                "readable-stream": "1.0.34",
-+                "xtend": "4.0.1"
-+              }
-+            }
-+          }
-+        },
-+        "gulp-sourcemaps": {
-+          "version": "1.6.0",
-+          "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz",
-+          "integrity": "sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=",
-+          "dev": true,
-+          "requires": {
-+            "convert-source-map": "1.5.0",
-+            "graceful-fs": "4.1.11",
-+            "strip-bom": "2.0.0",
-+            "through2": "2.0.3",
-+            "vinyl": "1.2.0"
-+          }
-+        },
-+        "is-extglob": {
-+          "version": "2.1.1",
-+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-+          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-+          "dev": true
-+        },
-+        "is-glob": {
-+          "version": "3.1.0",
-+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-+          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-+          "dev": true,
-+          "requires": {
-+            "is-extglob": "2.1.1"
-+          }
-+        },
-+        "isarray": {
-+          "version": "0.0.1",
-+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-+          "dev": true
-+        },
-+        "ordered-read-streams": {
-+          "version": "0.3.0",
-+          "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz",
-+          "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=",
-+          "dev": true,
-+          "requires": {
-+            "is-stream": "1.1.0",
-+            "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz"
-+          }
-+        },
-+        "through2": {
-+          "version": "2.0.3",
-+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
-+          "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
-+          "dev": true,
-+          "requires": {
-+            "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz",
-+            "xtend": "4.0.1"
-+          }
-+        },
-+        "unique-stream": {
-+          "version": "2.2.1",
-+          "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.1.tgz",
-+          "integrity": "sha1-WqADz76Uxf+GbE59ZouxxNuts2k=",
-+          "dev": true,
-+          "requires": {
-+            "json-stable-stringify": "1.0.1",
-+            "through2-filter": "2.0.0"
-+          }
-+        },
-+        "vinyl": {
-+          "version": "1.2.0",
-+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
-+          "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
-+          "dev": true,
-+          "requires": {
-+            "clone": "1.0.2",
-+            "clone-stats": "0.0.1",
-+            "replace-ext": "0.0.1"
-+          }
-+        }
-+      }
-+    },
-+    "vinyl-sourcemaps-apply": {
-+      "version": "0.2.1",
-+      "resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz",
-+      "integrity": "sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=",
-+      "dev": true,
-+      "requires": {
-+        "source-map": "0.5.6"
-+      },
-+      "dependencies": {
-+        "source-map": {
-+          "version": "0.5.6",
-+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-+          "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "vsce": {
-+      "version": "1.29.0",
-+      "resolved": "https://registry.npmjs.org/vsce/-/vsce-1.29.0.tgz",
-+      "integrity": "sha1-2qliVo1qv50iklBkJksDbIvQhys=",
-+      "dev": true,
-+      "requires": {
-+        "cheerio": "1.0.0-rc.2",
-+        "commander": "2.8.1",
-+        "denodeify": "1.2.1",
-+        "glob": "7.1.2",
-+        "lodash": "4.17.4",
-+        "markdown-it": "8.3.1",
-+        "mime": "1.3.6",
-+        "minimatch": "3.0.4",
-+        "osenv": "0.1.4",
-+        "read": "1.0.7",
-+        "semver": "5.3.0",
-+        "tmp": "0.0.29",
-+        "url-join": "1.1.0",
-+        "vso-node-api": "6.1.2-preview",
-+        "yauzl": "2.3.1",
-+        "yazl": "2.4.2"
-+      },
-+      "dependencies": {
-+        "balanced-match": {
-+          "version": "1.0.0",
-+          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-+          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-+          "dev": true
-+        },
-+        "brace-expansion": {
-+          "version": "1.1.8",
-+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
-+          "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
-+          "dev": true,
-+          "requires": {
-+            "balanced-match": "1.0.0",
-+            "concat-map": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-+          }
-+        },
-+        "glob": {
-+          "version": "7.1.2",
-+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-+          "dev": true,
-+          "requires": {
-+            "fs.realpath": "1.0.0",
-+            "inflight": "1.0.6",
-+            "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-+            "minimatch": "3.0.4",
-+            "once": "1.4.0",
-+            "path-is-absolute": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-+          },
-+          "dependencies": {
-+            "minimatch": {
-+              "version": "3.0.4",
-+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-+              "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-+              "dev": true,
-+              "requires": {
-+                "brace-expansion": "1.1.8"
-+              }
-+            }
-+          }
-+        },
-+        "mime": {
-+          "version": "1.3.6",
-+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.6.tgz",
-+          "integrity": "sha1-WR2E02U6awtKO5343lqoEI5y5eA=",
-+          "dev": true
-+        },
-+        "minimatch": {
-+          "version": "3.0.4",
-+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-+          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-+          "dev": true,
-+          "requires": {
-+            "brace-expansion": "1.1.8"
-+          }
-+        },
-+        "semver": {
-+          "version": "5.3.0",
-+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-+          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
-+          "dev": true
-+        }
-+      }
-+    },
-+    "vscode-debugprotocol": {
-+      "version": "1.21.0",
-+      "resolved": "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.21.0.tgz",
-+      "integrity": "sha1-5to7uxSB20WER6ArGbJe/RUGbo8="
-+    },
-+    "vscode-nls-dev": {
-+      "version": "2.1.3",
-+      "resolved": "https://registry.npmjs.org/vscode-nls-dev/-/vscode-nls-dev-2.1.3.tgz",
-+      "integrity": "sha512-e2Iz5xhE1frvsLorKEGHI1rTR9sG/wHm93NtGPsh4XMcTYe3iBjze7hTED0fclRxrNXwjBc2S9CjoDSQzCoV9Q==",
-+      "dev": true,
-+      "requires": {
-+        "clone": "1.0.2",
-+        "event-stream": "3.3.4",
-+        "glob": "6.0.4",
-+        "gulp-util": "3.0.8",
-+        "iconv-lite": "0.4.15",
-+        "is": "3.2.1",
-+        "source-map": "0.5.6",
-+        "typescript": "2.3.3",
-+        "vinyl": "1.2.0",
-+        "xml2js": "0.4.17",
-+        "yargs": "3.32.0"
-+      },
-+      "dependencies": {
-+        "cliui": {
-+          "version": "3.2.0",
-+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-+          "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-+          "dev": true,
-+          "requires": {
-+            "string-width": "1.0.2",
-+            "strip-ansi": "3.0.1",
-+            "wrap-ansi": "2.1.0"
-+          }
-+        },
-+        "glob": {
-+          "version": "6.0.4",
-+          "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
-+          "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
-+          "dev": true,
-+          "requires": {
-+            "inflight": "1.0.6",
-+            "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-+            "minimatch": "2.0.10",
-+            "once": "1.4.0",
-+            "path-is-absolute": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-+          }
-+        },
-+        "sax": {
-+          "version": "1.2.4",
-+          "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-+          "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-+          "dev": true
-+        },
-+        "source-map": {
-+          "version": "0.5.6",
-+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-+          "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=",
-+          "dev": true
-+        },
-+        "vinyl": {
-+          "version": "1.2.0",
-+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
-+          "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
-+          "dev": true,
-+          "requires": {
-+            "clone": "1.0.2",
-+            "clone-stats": "0.0.1",
-+            "replace-ext": "0.0.1"
-+          }
-+        },
-+        "window-size": {
-+          "version": "0.1.4",
-+          "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz",
-+          "integrity": "sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY=",
-+          "dev": true
-+        },
-+        "xml2js": {
-+          "version": "0.4.17",
-+          "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.17.tgz",
-+          "integrity": "sha1-F76T6q4/O3eTWceVtBlwWogX6Gg=",
-+          "dev": true,
-+          "requires": {
-+            "sax": "1.2.4",
-+            "xmlbuilder": "4.2.1"
-+          }
-+        },
-+        "xmlbuilder": {
-+          "version": "4.2.1",
-+          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.2.1.tgz",
-+          "integrity": "sha1-qlijBBoGb5DqoWwvU4n/GfP0YaU=",
-+          "dev": true,
-+          "requires": {
-+            "lodash": "4.17.4"
-+          }
-+        },
-+        "yargs": {
-+          "version": "3.32.0",
-+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz",
-+          "integrity": "sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=",
-+          "dev": true,
-+          "requires": {
-+            "camelcase": "2.1.1",
-+            "cliui": "3.2.0",
-+            "decamelize": "1.2.0",
-+            "os-locale": "1.4.0",
-+            "string-width": "1.0.2",
-+            "window-size": "0.1.4",
-+            "y18n": "3.2.1"
-+          }
-+        }
-+      }
-+    },
-+    "vscode-ripgrep": {
-+      "version": "0.0.12",
-+      "resolved": "https://registry.npmjs.org/vscode-ripgrep/-/vscode-ripgrep-0.0.12.tgz",
-+      "integrity": "sha1-RtM0E0vu9XrMO3vz9bELBaiQOWg="
-+    },
-+    "vscode-textmate": {
-+      "version": "3.1.5",
-+      "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-3.1.5.tgz",
-+      "integrity": "sha1-G4mfwBPzOygr8asFFXwbWRD1vus=",
-+      "requires": {
-+        "fast-plist": "0.1.2",
-+        "oniguruma": "6.2.1"
-+      },
-+      "dependencies": {
-+        "nan": {
-+          "version": "2.6.2",
-+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz",
-+          "integrity": "sha1-5P805slf37WuzAjeZZb0NgWn20U="
-+        },
-+        "oniguruma": {
-+          "version": "6.2.1",
-+          "resolved": "https://registry.npmjs.org/oniguruma/-/oniguruma-6.2.1.tgz",
-+          "integrity": "sha1-pQ7mlkKEStHSUmhaqxhxcbBuzgQ=",
-+          "requires": {
-+            "nan": "2.6.2"
-+          }
-+        }
-+      }
-+    },
-+    "vso-node-api": {
-+      "version": "6.1.2-preview",
-+      "resolved": "https://registry.npmjs.org/vso-node-api/-/vso-node-api-6.1.2-preview.tgz",
-+      "integrity": "sha1-qrNUbfJFHs2JTgcbuZtd8Zxfp48=",
-+      "dev": true,
-+      "requires": {
-+        "q": "1.5.0",
-+        "tunnel": "0.0.4",
-+        "typed-rest-client": "0.9.0",
-+        "underscore": "1.8.3"
-+      }
-+    },
-+    "whet.extend": {
-+      "version": "0.9.9",
-+      "resolved": "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz",
-+      "integrity": "sha1-+HfVv2SMl+WqVC+twW1qJZucEaE=",
-+      "dev": true
-+    },
-+    "which": {
-+      "version": "1.2.14",
-+      "resolved": "https://registry.npmjs.org/which/-/which-1.2.14.tgz",
-+      "integrity": "sha1-mofEN48D6CfOyvGs31bHNsAcFOU=",
-+      "dev": true,
-+      "requires": {
-+        "isexe": "2.0.0"
-+      }
-+    },
-+    "widest-line": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz",
-+      "integrity": "sha1-DAnIXCqUaD0Nfq+O4JfVZL8OEFw=",
-+      "dev": true,
-+      "requires": {
-+        "string-width": "1.0.2"
-+      }
-+    },
-+    "window-size": {
-+      "version": "0.1.0",
-+      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
-+      "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=",
-+      "dev": true,
-+      "optional": true
-+    },
-+    "winreg": {
-+      "version": "1.2.0",
-+      "resolved": "https://registry.npmjs.org/winreg/-/winreg-1.2.0.tgz",
-+      "integrity": "sha1-wEzykcc/AluMZ9hgE7H6oOkmo88="
-+    },
-+    "wordwrap": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-+      "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
-+      "dev": true
-+    },
-+    "wrap-ansi": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-+      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-+      "dev": true,
-+      "requires": {
-+        "string-width": "1.0.2",
-+        "strip-ansi": "3.0.1"
-+      }
-+    },
-+    "wrappy": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-+    },
-+    "write": {
-+      "version": "0.2.1",
-+      "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
-+      "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
-+      "dev": true,
-+      "requires": {
-+        "mkdirp": "0.5.1"
-+      }
-+    },
-+    "write-file-atomic": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.1.0.tgz",
-+      "integrity": "sha512-0TZ20a+xcIl4u0+Mj5xDH2yOWdmQiXlKf9Hm+TgDXjTMsEYb+gDrmb8e8UNAzMCitX8NBqG4Z/FUQIyzv/R1JQ==",
-+      "dev": true,
-+      "requires": {
-+        "graceful-fs": "4.1.11",
-+        "imurmurhash": "0.1.4",
-+        "slide": "1.1.6"
-+      }
-+    },
-+    "xdg-basedir": {
-+      "version": "3.0.0",
-+      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz",
-+      "integrity": "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=",
-+      "dev": true
-+    },
-+    "xml-name-validator": {
-+      "version": "1.0.0",
-+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-1.0.0.tgz",
-+      "integrity": "sha1-3Pgu4JIyKVHvjMG6WWycv9FKg/E=",
-+      "dev": true
-+    },
-+    "xml2js": {
-+      "version": "0.2.7",
-+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.2.7.tgz",
-+      "integrity": "sha1-GDhRi7AXQcrgh4urSRXklMMjBq8=",
-+      "dev": true,
-+      "requires": {
-+        "sax": "0.5.2"
-+      }
-+    },
-+    "xmlbuilder": {
-+      "version": "0.4.3",
-+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.3.tgz",
-+      "integrity": "sha1-xGFLp04K0ZbmCcknLNnh3bKKilg=",
-+      "dev": true
-+    },
-+    "xmldom": {
-+      "version": "0.1.27",
-+      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz",
-+      "integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk=",
-+      "dev": true
-+    },
-+    "xmlhttprequest": {
-+      "version": "1.8.0",
-+      "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz",
-+      "integrity": "sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw=",
-+      "dev": true
-+    },
-+    "xtend": {
-+      "version": "4.0.1",
-+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-+      "dev": true
-+    },
-+    "xterm": {
-+      "version": "github:Tyriar/xterm.js#7d7207a592461f15711f2f5df46eb5b1a7726da4"
-+    },
-+    "y18n": {
-+      "version": "3.2.1",
-+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-+      "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
-+      "dev": true
-+    },
-+    "yallist": {
-+      "version": "2.1.2",
-+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-+      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-+      "dev": true
-+    },
-+    "yargs": {
-+      "version": "3.10.0",
-+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
-+      "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
-+      "dev": true,
-+      "optional": true,
-+      "requires": {
-+        "camelcase": "1.2.1",
-+        "cliui": "2.1.0",
-+        "decamelize": "1.2.0",
-+        "window-size": "0.1.0"
-+      },
-+      "dependencies": {
-+        "camelcase": {
-+          "version": "1.2.1",
-+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
-+          "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
-+          "dev": true,
-+          "optional": true
-+        }
-+      }
-+    },
-+    "yauzl": {
-+      "version": "2.3.1",
-+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.3.1.tgz",
-+      "integrity": "sha1-Zwf+K2pNrJRFzEKb8EoRx97fo2o=",
-+      "requires": {
-+        "fd-slicer": "1.0.1",
-+        "pend": "1.2.0"
-+      },
-+      "dependencies": {
-+        "fd-slicer": {
-+          "version": "1.0.1",
-+          "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
-+          "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
-+          "requires": {
-+            "pend": "1.2.0"
-+          }
-+        },
-+        "pend": {
-+          "version": "1.2.0",
-+          "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-+          "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA="
-+        }
-+      }
-+    },
-+    "yazl": {
-+      "version": "2.4.2",
-+      "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.4.2.tgz",
-+      "integrity": "sha1-FMsZCD4eJacAksFYiqvg9OTdTYg=",
-+      "dev": true,
-+      "requires": {
-+        "buffer-crc32": "0.2.13"
-+      }
-+    }
-+  }
-+}
diff --git a/app/test/fixtures/merge-parser/vscode/merge-joh-log-appender-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-joh-log-appender-into-master.txt
deleted file mode 100644
index a8741c412ec..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-joh-log-appender-into-master.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-changed in both
-  base   100644 d25b0eca0f28fd2eabb7327f5d663d87d1cb6d99 product.json
-  our    100644 ed3ced1c1be38da7c830b702ce373ea369167da8 product.json
-  their  100644 d16dca66ecd0347c83874c2cfec923e64a33d704 product.json
-@@ -4,6 +4,7 @@
- 	"applicationName": "code-oss",
- 	"dataFolderName": ".vscode-oss",
- 	"win32MutexName": "vscodeoss",
-+	"enableTelemetry": true,
- 	"licenseName": "MIT",
- 	"licenseUrl": "https://github.com/Microsoft/vscode/blob/master/LICENSE.txt",
- 	"win32DirName": "Microsoft Code OSS",
-changed in both
-  base   100644 6598053532274c9aa3ff65c32dfb15c0555532e8 src/vs/code/electron-browser/issue/issueReporterMain.ts
-  our    100644 2e25cb33248a3d343edf9a79d532a58614f0a2b1 src/vs/code/electron-browser/issue/issueReporterMain.ts
-  their  100644 cc305121e2cb4e9b767f1a8aae252e28d7391a79 src/vs/code/electron-browser/issue/issueReporterMain.ts
-changed in both
-  base   100644 deaea3955f35171dd3dab9953b3f39544fb44e77 src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
-  our    100644 547d1bd99d6c12bde8243ed7766b2a76f887438c src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
-  their  100644 afe2f1ead7721072f16731fb9ff2f3446a5ad643 src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
-changed in both
-  base   100644 f2a7d0cae04d69b8d02ea27e1f3cb059a923f992 src/vs/code/electron-main/app.ts
-  our    100644 c0185b039e95315e65379ca7cda7ff397219bdf9 src/vs/code/electron-main/app.ts
-  their  100644 37710f8bd07adeb450e65c3f167077e937a9b4fa src/vs/code/electron-main/app.ts
-changed in both
-  base   100644 3d75158aa79394934473d529c90f77b96775b9b9 src/vs/platform/telemetry/common/telemetryUtils.ts
-  our    100644 83a4326ca5e511e1b955212a7929341083ae29ff src/vs/platform/telemetry/common/telemetryUtils.ts
-  their  100644 9f2f46c6ce30ab46e2c05431618b7381bf64e973 src/vs/platform/telemetry/common/telemetryUtils.ts
-@@ -46,7 +46,11 @@
- 
- export class LogAppender implements ITelemetryAppender {
- 
-+<<<<<<< .our
- 	private commonPropertiesRegex = /^sessionID$|^version$|^timestamp$|^commitHash$|^common\./;
-+=======
-+	private commonPropertiesRegex = /^sessionID$|^version$|^timestamp$|^common\./;
-+>>>>>>> .their
- 	constructor(@ILogService private readonly _logService: ILogService) { }
- 
- 	dispose(): TPromise<any> {
-changed in both
-  base   100644 1096104def6f355257642f6d26212c401e031e29 src/vs/workbench/electron-browser/shell.ts
-  our    100644 33bea4a0ca07789e5913902a82c7d187af26b943 src/vs/workbench/electron-browser/shell.ts
-  their  100644 cd65162ae269844cd418aaff7dae8dfda9e85fb3 src/vs/workbench/electron-browser/shell.ts
-changed in both
-  base   100644 4ebfb3a4e5680cb6d7dcf0b7e2e305ad2b2431f7 src/vs/workbench/parts/logs/electron-browser/logsActions.ts
-  our    100644 e9695b3cde05a32f9ebc377de77caf1288e1ff09 src/vs/workbench/parts/logs/electron-browser/logsActions.ts
-  their  100644 2fcdc413e3d8856f2a1f2b374aa8f3fc88475541 src/vs/workbench/parts/logs/electron-browser/logsActions.ts
diff --git a/app/test/fixtures/merge-parser/vscode/merge-joh-next-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-joh-next-into-master.txt
deleted file mode 100644
index 56151628a8f..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-joh-next-into-master.txt
+++ /dev/null
@@ -1,581 +0,0 @@
-removed in local
-  base   100644 fe6200c00a381a228c0a13d80b7b9d01926b6616 extensions/vscode-api-tests/src/languages.test.ts
-  their  100644 4ffb3b1afc7e4453f87233093202ad29fe52bcab extensions/vscode-api-tests/src/languages.test.ts
-removed in local
-  base   100644 8ffd713d0d7dd320cc34b8297519671204531605 src/vs/editor/browser/standalone/standaloneEditor.ts
-  their  100644 f99c9ed5634f47c6270a3038a84f62867a845088 src/vs/editor/browser/standalone/standaloneEditor.ts
-removed in local
-  base   100644 56b322a27b088990fa5ca22b25c8ebc3fc459ad4 src/vs/editor/browser/standalone/standaloneServices.ts
-  their  100644 a312ef552a7a3f1fca598afb5a9426d1168d27b6 src/vs/editor/browser/standalone/standaloneServices.ts
-removed in local
-  base   100644 2510a7ae3ec21f8dbf28ba84ab002cea9b2a7824 src/vs/editor/contrib/links/browser/links.ts
-  their  100644 26e46e5bcebb076c5eae2a6d3f82773833fa3f03 src/vs/editor/contrib/links/browser/links.ts
-added in remote
-  their  100644 45cf63fd7eea46d4bf041328cf6692a89d925b8b src/vs/platform/opener/browser/opener.contribution.ts
-@@ -0,0 +1,12 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+'use strict';
-+
-+import {registerSingleton} from 'vs/platform/instantiation/common/extensions';
-+import {OpenerService} from 'vs/platform/opener/browser/openerService';
-+import {IOpenerService} from 'vs/platform/opener/common/opener';
-+
-+registerSingleton(IOpenerService, OpenerService);
-added in remote
-  their  100644 8fccde385454e5daab4915d7a58210effecf79fe src/vs/platform/opener/browser/openerService.ts
-@@ -0,0 +1,73 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+'use strict';
-+
-+import URI from 'vs/base/common/uri';
-+import {parse} from 'vs/base/common/marshalling';
-+import {Schemas} from 'vs/base/common/network';
-+import {TPromise} from 'vs/base/common/winjs.base';
-+import {IEditorService} from 'vs/platform/editor/common/editor';
-+import {ICommandService, CommandsRegistry} from 'vs/platform/commands/common/commands';
-+import {IOpenerService} from '../common/opener';
-+
-+export class OpenerService implements IOpenerService {
-+
-+	_serviceBrand: any;
-+
-+	constructor(
-+		@IEditorService private _editorService: IEditorService,
-+		@ICommandService private _commandService: ICommandService
-+	) {
-+		//
-+	}
-+
-+	open(resource: URI, options?: { openToSide?: boolean }): TPromise<any> {
-+
-+		const {scheme, path, query, fragment} = resource;
-+		let promise: TPromise<any>;
-+		if (scheme === Schemas.http || scheme === Schemas.https) {
-+			// open http
-+			window.open(resource.toString(true));
-+
-+		} else if (scheme === 'command' && CommandsRegistry.getCommand(path)) {
-+			// execute as command
-+			let args: any = [];
-+			try {
-+				args = parse(query);
-+				if (!Array.isArray(args)) {
-+					args = [args];
-+				}
-+			} catch (e) {
-+				//
-+			}
-+			promise = this._commandService.executeCommand(path, ...args);
-+
-+		} else {
-+			promise = this._editorService.resolveEditorModel({ resource }).then(model => {
-+				if (!model) {
-+					return;
-+				}
-+				let selection: {
-+					startLineNumber: number;
-+					startColumn: number;
-+				};
-+				const match = /^L?(\d+)(?:,(\d+))?/.exec(fragment);
-+				if (match) {
-+					// support file:///some/file.js#73,84
-+					// support file:///some/file.js#L73
-+					selection = {
-+						startLineNumber: parseInt(match[1]),
-+						startColumn: match[2] ? parseInt(match[2]) : 1
-+					};
-+					// remove fragment
-+					resource = resource.with({ fragment: '' });
-+				}
-+				return this._editorService.openEditor({ resource, options: { selection, } }, options && options.openToSide);
-+			});
-+		}
-+
-+		return TPromise.as(promise).then(undefined, err => { }); // !ignores all errors
-+	}
-+}
-changed in both
-  base   100644 046b4f53a63025a47d3508e8ebd03153a722c163 src/vs/platform/opener/common/opener.ts
-  our    100644 44e165950378af40bde0851a71ea2624c9acd83a src/vs/platform/opener/common/opener.ts
-  their  100644 975a8ee2e1a9714edc760fdd60c138f8926111cc src/vs/platform/opener/common/opener.ts
-added in remote
-  their  100644 550890079125c0fd1101c1d702065782873e64d3 src/vs/platform/opener/test/browser/openerService.test.ts
-@@ -0,0 +1,120 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+'use strict';
-+
-+import URI from 'vs/base/common/uri';
-+import * as assert from 'assert';
-+import {TPromise} from 'vs/base/common/winjs.base';
-+import {IEditorService, ITextEditorModel, IResourceInput} from 'vs/platform/editor/common/editor';
-+import {ICommandService, NullCommandService, CommandsRegistry} from 'vs/platform/commands/common/commands';
-+import {OpenerService} from 'vs/platform/opener/browser/openerService';
-+
-+suite('OpenerService', function () {
-+
-+	let lastInput: IResourceInput;
-+
-+	const editorService = new class implements IEditorService {
-+		_serviceBrand: any;
-+		openEditor(input: IResourceInput): any {
-+			lastInput = input;
-+		}
-+		resolveEditorModel(): any {
-+			return TPromise.as(<ITextEditorModel>{});
-+		}
-+	};
-+
-+
-+	let lastCommand: { id: string, args: any[] };
-+
-+	const commandService = new class implements ICommandService {
-+		_serviceBrand: any;
-+		executeCommand(id: string, ...args: any[]): TPromise<any> {
-+			lastCommand = { id, args };
-+			return TPromise.as(undefined);
-+		}
-+	};
-+
-+	setup(function () {
-+		lastInput = undefined;
-+		lastCommand = undefined;
-+	});
-+
-+	test('delegate to editorService, scheme:///fff', function () {
-+		const openerService = new OpenerService(editorService, NullCommandService);
-+		openerService.open(URI.parse('another:///somepath'));
-+		assert.equal(lastInput.options.selection, undefined);
-+	});
-+
-+	test('delegate to editorService, scheme:///fff#L123', function () {
-+
-+		const openerService = new OpenerService(editorService, NullCommandService);
-+
-+		openerService.open(URI.parse('file:///somepath#L23'));
-+		assert.equal(lastInput.options.selection.startLineNumber, 23);
-+		assert.equal(lastInput.options.selection.startColumn, 1);
-+		assert.equal(lastInput.options.selection.endLineNumber, undefined);
-+		assert.equal(lastInput.options.selection.endColumn, undefined);
-+		assert.equal(lastInput.resource.fragment, '');
-+
-+		openerService.open(URI.parse('another:///somepath#L23'));
-+		assert.equal(lastInput.options.selection.startLineNumber, 23);
-+		assert.equal(lastInput.options.selection.startColumn, 1);
-+
-+		openerService.open(URI.parse('another:///somepath#L23,45'));
-+		assert.equal(lastInput.options.selection.startLineNumber, 23);
-+		assert.equal(lastInput.options.selection.startColumn, 45);
-+		assert.equal(lastInput.options.selection.endLineNumber, undefined);
-+		assert.equal(lastInput.options.selection.endColumn, undefined);
-+		assert.equal(lastInput.resource.fragment, '');
-+	});
-+
-+	test('delegate to editorService, scheme:///fff#123,123', function () {
-+
-+		const openerService = new OpenerService(editorService, NullCommandService);
-+
-+		openerService.open(URI.parse('file:///somepath#23'));
-+		assert.equal(lastInput.options.selection.startLineNumber, 23);
-+		assert.equal(lastInput.options.selection.startColumn, 1);
-+		assert.equal(lastInput.options.selection.endLineNumber, undefined);
-+		assert.equal(lastInput.options.selection.endColumn, undefined);
-+		assert.equal(lastInput.resource.fragment, '');
-+
-+		openerService.open(URI.parse('file:///somepath#23,45'));
-+		assert.equal(lastInput.options.selection.startLineNumber, 23);
-+		assert.equal(lastInput.options.selection.startColumn, 45);
-+		assert.equal(lastInput.options.selection.endLineNumber, undefined);
-+		assert.equal(lastInput.options.selection.endColumn, undefined);
-+		assert.equal(lastInput.resource.fragment, '');
-+	});
-+
-+	test('delegate to commandsService, command:someid', function () {
-+
-+		const openerService = new OpenerService(editorService, commandService);
-+
-+		// unknown command
-+		openerService.open(URI.parse('command:foobar'));
-+		assert.equal(lastCommand, undefined);
-+		assert.equal(lastInput.resource.toString(), 'command:foobar');
-+		assert.equal(lastInput.options.selection, undefined);
-+
-+		const id = `aCommand${Math.random()}`;
-+		CommandsRegistry.registerCommand(id, function () { });
-+
-+		openerService.open(URI.parse('command:' + id));
-+		assert.equal(lastCommand.id, id);
-+		assert.equal(lastCommand.args.length, 0);
-+
-+		openerService.open(URI.parse('command:' + id).with({ query: '123' }));
-+		assert.equal(lastCommand.id, id);
-+		assert.equal(lastCommand.args.length, 1);
-+		assert.equal(lastCommand.args[0], '123');
-+
-+		openerService.open(URI.parse('command:' + id).with({ query: JSON.stringify([12, true]) }));
-+		assert.equal(lastCommand.id, id);
-+		assert.equal(lastCommand.args.length, 2);
-+		assert.equal(lastCommand.args[0], 12);
-+		assert.equal(lastCommand.args[1], true);
-+	});
-+});
-\ No newline at end of file
-changed in both
-  base   100644 dab90f9e538d13da9bd35825c8aa12e0b86fb919 src/vs/workbench/api/node/extHostDiagnostics.ts
-  our    100644 75b3d97675283039cfa9e9be38c3fd0ec200e1b7 src/vs/workbench/api/node/extHostDiagnostics.ts
-  their  100644 ed6ca50b7a2f689d0e06a4d76a3cce1fcbebcd15 src/vs/workbench/api/node/extHostDiagnostics.ts
-@@ -4,16 +4,27 @@
-  *--------------------------------------------------------------------------------------------*/
- 'use strict';
- 
-+<<<<<<< .our
- import { localize } from 'vs/nls';
- import { IMarkerData, MarkerSeverity } from 'vs/platform/markers/common/markers';
-+=======
-+import {localize} from 'vs/nls';
-+import {IThreadService} from 'vs/workbench/services/thread/common/threadService';
-+import {IMarkerData} from 'vs/platform/markers/common/markers';
-+>>>>>>> .their
- import URI from 'vs/base/common/uri';
- import * as vscode from 'vscode';
-+<<<<<<< .our
- import { MainContext, MainThreadDiagnosticsShape, ExtHostDiagnosticsShape, IMainContext } from './extHost.protocol';
- import { DiagnosticSeverity } from './extHostTypes';
- import * as converter from './extHostTypeConverters';
- import { mergeSort } from 'vs/base/common/arrays';
- import { Event, Emitter, debounceEvent, mapEvent } from 'vs/base/common/event';
- import { keys } from 'vs/base/common/map';
-+=======
-+import {MainContext, MainThreadDiagnosticsShape, ExtHostDiagnosticsShape} from './extHost.protocol';
-+import {DiagnosticSeverity} from './extHostTypes';
-+>>>>>>> .their
- 
- export class DiagnosticCollection implements vscode.DiagnosticCollection {
- 
-@@ -110,6 +121,7 @@
- 			let diagnostics = this._data.get(uri.toString());
- 			if (diagnostics) {
- 
-+<<<<<<< .our
- 				// no more than N diagnostics per file
- 				if (diagnostics.length > this._maxDiagnosticsPerFile) {
- 					marker = [];
-@@ -119,6 +131,17 @@
- 							if (diagnostic.severity === order[i]) {
- 								const len = marker.push(converter.Diagnostic.from(diagnostic));
- 								if (len === this._maxDiagnosticsPerFile) {
-+=======
-+				// no more than 250 diagnostics per file
-+				if (diagnostics.length > DiagnosticCollection._maxDiagnosticsPerFile) {
-+					marker = [];
-+					const order = [DiagnosticSeverity.Error, DiagnosticSeverity.Warning, DiagnosticSeverity.Information, DiagnosticSeverity.Hint];
-+					orderLoop: for (let i = 0; i < 4; i++) {
-+						for (const diagnostic of diagnostics) {
-+							if (diagnostic.severity === order[i]) {
-+								const len = marker.push(DiagnosticCollection._toMarkerData(diagnostic));
-+								if (len === DiagnosticCollection._maxDiagnosticsPerFile) {
-+>>>>>>> .their
- 									break orderLoop;
- 								}
- 							}
-@@ -127,15 +150,24 @@
- 
- 					// add 'signal' marker for showing omitted errors/warnings
- 					marker.push({
-+<<<<<<< .our
- 						severity: MarkerSeverity.Info,
- 						message: localize({ key: 'limitHit', comment: ['amount of errors/warning skipped due to limits'] }, "Not showing {0} further errors and warnings.", diagnostics.length - this._maxDiagnosticsPerFile),
-+=======
-+						severity: Severity.Error,
-+						message: localize('limitHit', "Not showing {0} further errors and warnings.", diagnostics.length - DiagnosticCollection._maxDiagnosticsPerFile),
-+>>>>>>> .their
- 						startLineNumber: marker[marker.length - 1].startLineNumber,
- 						startColumn: marker[marker.length - 1].startColumn,
- 						endLineNumber: marker[marker.length - 1].endLineNumber,
- 						endColumn: marker[marker.length - 1].endColumn
- 					});
- 				} else {
-+<<<<<<< .our
- 					marker = diagnostics.map(converter.Diagnostic.from);
-+=======
-+					marker = diagnostics.map(DiagnosticCollection._toMarkerData);
-+>>>>>>> .their
- 				}
- 			}
- 
-changed in both
-  base   100644 4d3efd2310fb267e1b146584276716b01c806320 src/vs/workbench/electron-browser/shell.ts
-  our    100644 33bea4a0ca07789e5913902a82c7d187af26b943 src/vs/workbench/electron-browser/shell.ts
-  their  100644 9897ba3accbb8550e5d0bce0c004773f9dd41ce5 src/vs/workbench/electron-browser/shell.ts
-@@ -22,6 +22,7 @@
- import { ITelemetryAppenderChannel, TelemetryAppenderClient } from 'vs/platform/telemetry/common/telemetryIpc';
- import { TelemetryService, ITelemetryServiceConfig } from 'vs/platform/telemetry/common/telemetryService';
- import ErrorTelemetry from 'vs/platform/telemetry/browser/errorTelemetry';
-+<<<<<<< .our
- import { ElectronWindow } from 'vs/workbench/electron-browser/window';
- import { resolveWorkbenchCommonProperties } from 'vs/platform/telemetry/node/workbenchCommonProperties';
- import { IWindowsService, IWindowService, IWindowConfiguration } from 'vs/platform/windows/common/windows';
-@@ -96,6 +97,61 @@
- import { SearchHistoryService } from 'vs/workbench/services/search/node/searchHistoryService';
- import { MulitExtensionManagementService } from 'vs/platform/extensionManagement/common/multiExtensionManagement';
- import { ExtensionManagementServerService } from 'vs/workbench/services/extensions/node/extensionManagementServerService';
-+=======
-+import {resolveWorkbenchCommonProperties} from 'vs/platform/telemetry/node/workbenchCommonProperties';
-+import {ElectronIntegration} from 'vs/workbench/electron-browser/integration';
-+import {Update} from 'vs/workbench/electron-browser/update';
-+import {WorkspaceStats} from 'vs/workbench/services/telemetry/common/workspaceStats';
-+import {IWindowService, WindowService} from 'vs/workbench/services/window/electron-browser/windowService';
-+import {MessageService} from 'vs/workbench/services/message/electron-browser/messageService';
-+import {RequestService} from 'vs/workbench/services/request/node/requestService';
-+import {IConfigurationService} from 'vs/platform/configuration/common/configuration';
-+import {FileService} from 'vs/workbench/services/files/electron-browser/fileService';
-+import {SearchService} from 'vs/workbench/services/search/node/searchService';
-+import {LifecycleService} from 'vs/workbench/services/lifecycle/electron-browser/lifecycleService';
-+import {MainThreadService} from 'vs/workbench/services/thread/electron-browser/threadService';
-+import {MarkerService} from 'vs/platform/markers/common/markerService';
-+import {IModelService} from 'vs/editor/common/services/modelService';
-+import {ModelServiceImpl} from 'vs/editor/common/services/modelServiceImpl';
-+import {ICompatWorkerService} from 'vs/editor/common/services/compatWorkerService';
-+import {MainThreadCompatWorkerService} from 'vs/editor/common/services/compatWorkerServiceMain';
-+import {CodeEditorServiceImpl} from 'vs/editor/browser/services/codeEditorServiceImpl';
-+import {ICodeEditorService} from 'vs/editor/common/services/codeEditorService';
-+import {EditorWorkerServiceImpl} from 'vs/editor/common/services/editorWorkerServiceImpl';
-+import {IEditorWorkerService} from 'vs/editor/common/services/editorWorkerService';
-+import {MainProcessExtensionService} from 'vs/workbench/api/node/mainThreadExtensionService';
-+import {IOptions} from 'vs/workbench/common/options';
-+import {IStorageService} from 'vs/platform/storage/common/storage';
-+import {ServiceCollection} from 'vs/platform/instantiation/common/serviceCollection';
-+import {InstantiationService} from 'vs/platform/instantiation/common/instantiationService';
-+import {IContextViewService} from 'vs/platform/contextview/browser/contextView';
-+import {IEventService} from 'vs/platform/event/common/event';
-+import {IFileService} from 'vs/platform/files/common/files';
-+import {ILifecycleService} from 'vs/platform/lifecycle/common/lifecycle';
-+import {IMarkerService} from 'vs/platform/markers/common/markers';
-+import {IMessageService, Severity} from 'vs/platform/message/common/message';
-+import {IRequestService} from 'vs/platform/request/common/request';
-+import {ISearchService} from 'vs/platform/search/common/search';
-+import {IThreadService} from 'vs/workbench/services/thread/common/threadService';
-+import {ICommandService} from 'vs/platform/commands/common/commands';
-+import {CommandService} from 'vs/platform/commands/common/commandService';
-+import {IWorkspaceContextService, IConfiguration, IWorkspace} from 'vs/platform/workspace/common/workspace';
-+import {IExtensionService} from 'vs/platform/extensions/common/extensions';
-+import {MainThreadModeServiceImpl} from 'vs/editor/common/services/modeServiceImpl';
-+import {IModeService} from 'vs/editor/common/services/modeService';
-+import {IUntitledEditorService, UntitledEditorService} from 'vs/workbench/services/untitled/common/untitledEditorService';
-+import {CrashReporter} from 'vs/workbench/electron-browser/crashReporter';
-+import {IThemeService} from 'vs/workbench/services/themes/common/themeService';
-+import {ThemeService} from 'vs/workbench/services/themes/electron-browser/themeService';
-+import {getDelayedChannel} from 'vs/base/parts/ipc/common/ipc';
-+import {connect} from 'vs/base/parts/ipc/node/ipc.net';
-+import {IExtensionManagementChannel, ExtensionManagementChannelClient} from 'vs/platform/extensionManagement/common/extensionManagementIpc';
-+import {IExtensionManagementService} from 'vs/platform/extensionManagement/common/extensionManagement';
-+import {ReloadWindowAction} from 'vs/workbench/electron-browser/actions';
-+
-+// self registering services
-+import 'vs/platform/opener/browser/opener.contribution';
-+>>>>>>> .their
- 
- /**
-  * Services that we require for the Shell
-added in remote
-  their  100644 999f59de4998d342ce8faebdb86d5e4085ff66c8 src/vs/workbench/test/node/api/extHostDiagnostics.test.ts
-@@ -0,0 +1,189 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+'use strict';
-+
-+import * as assert from 'assert';
-+import URI from 'vs/base/common/uri';
-+import Severity from 'vs/base/common/severity';
-+import {DiagnosticCollection} from 'vs/workbench/api/node/extHostDiagnostics';
-+import {Diagnostic, DiagnosticSeverity, Range} from 'vs/workbench/api/node/extHostTypes';
-+import {MainThreadDiagnosticsShape} from 'vs/workbench/api/node/extHost.protocol';
-+import {TPromise} from 'vs/base/common/winjs.base';
-+import {IMarkerData} from 'vs/platform/markers/common/markers';
-+
-+suite('ExtHostDiagnostics', () => {
-+
-+	class DiagnosticsShape extends MainThreadDiagnosticsShape {
-+		$changeMany(owner: string, entries: [URI, IMarkerData[]][]): TPromise<any> {
-+			return TPromise.as(null);
-+		}
-+		$clear(owner: string): TPromise<any> {
-+			return TPromise.as(null);
-+		}
-+	};
-+
-+	test('disposeCheck', function () {
-+
-+		const collection = new DiagnosticCollection('test', new DiagnosticsShape());
-+
-+		collection.dispose();
-+		collection.dispose(); // that's OK
-+		assert.throws(() => collection.name);
-+		assert.throws(() => collection.clear());
-+		assert.throws(() => collection.delete(URI.parse('aa:bb')));
-+		assert.throws(() => collection.forEach(() => { ; }));
-+		assert.throws(() => collection.get(URI.parse('aa:bb')));
-+		assert.throws(() => collection.has(URI.parse('aa:bb')));
-+		assert.throws(() => collection.set(URI.parse('aa:bb'), []));
-+		assert.throws(() => collection.set(URI.parse('aa:bb'), undefined));
-+	});
-+
-+
-+	test('diagnostic collection, forEach, clear, has', function () {
-+		let collection = new DiagnosticCollection('test', new DiagnosticsShape());
-+		assert.equal(collection.name, 'test');
-+		collection.dispose();
-+		assert.throws(() => collection.name);
-+
-+		let c = 0;
-+		collection = new DiagnosticCollection('test', new DiagnosticsShape());
-+		collection.forEach(() => c++);
-+		assert.equal(c, 0);
-+
-+		collection.set(URI.parse('foo:bar'), [
-+			new Diagnostic(new Range(0, 0, 1, 1), 'message-1'),
-+			new Diagnostic(new Range(0, 0, 1, 1), 'message-2')
-+		]);
-+		collection.forEach(() => c++);
-+		assert.equal(c, 1);
-+
-+		c = 0;
-+		collection.clear();
-+		collection.forEach(() => c++);
-+		assert.equal(c, 0);
-+
-+		collection.set(URI.parse('foo:bar1'), [
-+			new Diagnostic(new Range(0, 0, 1, 1), 'message-1'),
-+			new Diagnostic(new Range(0, 0, 1, 1), 'message-2')
-+		]);
-+		collection.set(URI.parse('foo:bar2'), [
-+			new Diagnostic(new Range(0, 0, 1, 1), 'message-1'),
-+			new Diagnostic(new Range(0, 0, 1, 1), 'message-2')
-+		]);
-+		collection.forEach(() => c++);
-+		assert.equal(c, 2);
-+
-+		assert.ok(collection.has(URI.parse('foo:bar1')));
-+		assert.ok(collection.has(URI.parse('foo:bar2')));
-+		assert.ok(!collection.has(URI.parse('foo:bar3')));
-+		collection.delete(URI.parse('foo:bar1'));
-+		assert.ok(!collection.has(URI.parse('foo:bar1')));
-+
-+		collection.dispose();
-+	});
-+
-+	test('diagnostic collection, immutable read', function () {
-+		let collection = new DiagnosticCollection('test', new DiagnosticsShape());
-+		collection.set(URI.parse('foo:bar'), [
-+			new Diagnostic(new Range(0, 0, 1, 1), 'message-1'),
-+			new Diagnostic(new Range(0, 0, 1, 1), 'message-2')
-+		]);
-+
-+		let array = collection.get(URI.parse('foo:bar'));
-+		assert.throws(() => array.length = 0);
-+		assert.throws(() => array.pop());
-+		assert.throws(() => array[0] = new Diagnostic(new Range(0, 0, 0, 0), 'evil'));
-+
-+		collection.forEach((uri, array) => {
-+			assert.throws(() => array.length = 0);
-+			assert.throws(() => array.pop());
-+			assert.throws(() => array[0] = new Diagnostic(new Range(0, 0, 0, 0), 'evil'));
-+		});
-+
-+		array = collection.get(URI.parse('foo:bar'));
-+		assert.equal(array.length, 2);
-+
-+		collection.dispose();
-+	});
-+
-+
-+	test('diagnostics collection, set with dupliclated tuples', function () {
-+		let collection = new DiagnosticCollection('test', new DiagnosticsShape());
-+		let uri = URI.parse('sc:hightower');
-+		collection.set([
-+			[uri, [new Diagnostic(new Range(0, 0, 0, 1), 'message-1')]],
-+			[URI.parse('some:thing'), [new Diagnostic(new Range(0, 0, 1, 1), 'something')]],
-+			[uri, [new Diagnostic(new Range(0, 0, 0, 1), 'message-2')]],
-+		]);
-+
-+		let array = collection.get(uri);
-+		assert.equal(array.length, 2);
-+		let [first, second] = array;
-+		assert.equal(first.message, 'message-1');
-+		assert.equal(second.message, 'message-2');
-+
-+		// clear
-+		collection.delete(uri);
-+		assert.ok(!collection.has(uri));
-+
-+		// bad tuple clears 1/2
-+		collection.set([
-+			[uri, [new Diagnostic(new Range(0, 0, 0, 1), 'message-1')]],
-+			[URI.parse('some:thing'), [new Diagnostic(new Range(0, 0, 1, 1), 'something')]],
-+			[uri, undefined]
-+		]);
-+		assert.ok(!collection.has(uri));
-+
-+		// clear
-+		collection.delete(uri);
-+		assert.ok(!collection.has(uri));
-+
-+		// bad tuple clears 2/2
-+		collection.set([
-+			[uri, [new Diagnostic(new Range(0, 0, 0, 1), 'message-1')]],
-+			[URI.parse('some:thing'), [new Diagnostic(new Range(0, 0, 1, 1), 'something')]],
-+			[uri, undefined],
-+			[uri, [new Diagnostic(new Range(0, 0, 0, 1), 'message-2')]],
-+			[uri, [new Diagnostic(new Range(0, 0, 0, 1), 'message-3')]],
-+		]);
-+
-+		array = collection.get(uri);
-+		assert.equal(array.length, 2);
-+		[first, second] = array;
-+		assert.equal(first.message, 'message-2');
-+		assert.equal(second.message, 'message-3');
-+
-+		collection.dispose();
-+	});
-+
-+
-+	test('diagnostic capping', function () {
-+
-+		let lastEntries: [URI, IMarkerData[]][];
-+		let collection = new DiagnosticCollection('test', new class extends DiagnosticsShape {
-+			$changeMany(owner: string, entries: [URI, IMarkerData[]][]): TPromise<any> {
-+				lastEntries = entries;
-+				return super.$changeMany(owner, entries);
-+			}
-+		});
-+		let uri = URI.parse('aa:bb');
-+
-+		let diagnostics: Diagnostic[] = [];
-+		for (let i = 0; i < 500; i++) {
-+			diagnostics.push(new Diagnostic(new Range(i, 0, i + 1, 0), `error#${i}`, i < 300
-+				? DiagnosticSeverity.Warning
-+				: DiagnosticSeverity.Error));
-+		}
-+
-+		collection.set(uri, diagnostics);
-+		assert.equal(collection.get(uri).length, 500);
-+		assert.equal(lastEntries.length, 1);
-+		assert.equal(lastEntries[0][1].length, 251);
-+		assert.equal(lastEntries[0][1][0].severity, Severity.Error);
-+		assert.equal(lastEntries[0][1][200].severity, Severity.Warning);
-+		assert.equal(lastEntries[0][1][250].severity, Severity.Error);
-+	});
-+});
-\ No newline at end of file
diff --git a/app/test/fixtures/merge-parser/vscode/merge-kieferrm-errortel-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-kieferrm-errortel-into-master.txt
deleted file mode 100644
index 543b9102b56..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-kieferrm-errortel-into-master.txt
+++ /dev/null
@@ -1,165 +0,0 @@
-changed in both
-  base   100644 c690f0d6e17fc2dc154e96f38f42abb5a176767d src/vs/monaco.d.ts
-  our    100644 76dcf491ff9c1973ad61bf5d423713bb1a3b4e44 src/vs/monaco.d.ts
-  their  100644 0d32ea6887204015d1f73e66885706964293a891 src/vs/monaco.d.ts
-@@ -1241,11 +1241,6 @@
- 		 */
- 		isWholeLine?: boolean;
- 		/**
--		 * Specifies the stack order of a decoration.
--		 * A decoration with greater stack order is always in front of a decoration with a lower stack order.
--		 */
--		zIndex?: number;
--		/**
- 		 * If set, render this decoration in the overview ruler.
- 		 */
- 		overviewRuler?: IModelDecorationOverviewRulerOptions;
-@@ -1540,10 +1535,6 @@
- 		 */
- 		getLineContent(lineNumber: number): string;
- 		/**
--		 * Get the text length for a certain line.
--		 */
--		getLineLength(lineNumber: number): number;
--		/**
- 		 * Get the text for all lines.
- 		 */
- 		getLinesContent(): string[];
-@@ -1993,13 +1984,9 @@
- 	 * A (serializable) state of the view.
- 	 */
- 	export interface IViewState {
--		/** written by previous versions */
--		scrollTop?: number;
--		/** written by previous versions */
--		scrollTopWithoutViewZones?: number;
-+		scrollTop: number;
-+		scrollTopWithoutViewZones: number;
- 		scrollLeft: number;
--		firstPosition: IPosition;
--		firstPositionDeltaTop: number;
- 	}
- 
- 	/**
-@@ -2818,11 +2805,6 @@
- 		 */
- 		multiCursorModifier?: 'ctrlCmd' | 'alt';
- 		/**
--		 * Merge overlapping selections.
--		 * Defaults to true
--		 */
--		multiCursorMergeOverlapping?: boolean;
--		/**
- 		 * Configure the editor's accessibility support.
- 		 * Defaults to 'auto'. It is best to leave this to 'auto'.
- 		 */
-@@ -2953,11 +2935,6 @@
- 		 */
- 		folding?: boolean;
- 		/**
--		 * Selects the folding strategy. 'auto' uses the strategies contributed for the current document, 'indentation' uses the indentation based folding strategy.
--		 * Defaults to 'auto'.
--		 */
--		foldingStrategy?: 'auto' | 'indentation';
--		/**
- 		 * Controls whether the fold actions in the gutter stay always visible or hide unless the mouse is over the gutter.
- 		 * Defaults to 'mouseover'.
- 		 */
-@@ -3268,7 +3245,6 @@
- 		readonly occurrencesHighlight: boolean;
- 		readonly codeLens: boolean;
- 		readonly folding: boolean;
--		readonly foldingStrategy: 'auto' | 'indentation';
- 		readonly showFoldingControls: 'always' | 'mouseover';
- 		readonly matchBrackets: boolean;
- 		readonly find: InternalEditorFindOptions;
-@@ -3289,8 +3265,11 @@
- 		readonly lineHeight: number;
- 		readonly readOnly: boolean;
- 		readonly multiCursorModifier: 'altKey' | 'ctrlKey' | 'metaKey';
-+<<<<<<< .our
- 		readonly multiCursorMergeOverlapping: boolean;
- 		readonly showUnused: boolean;
-+=======
-+>>>>>>> .their
- 		readonly wordSeparators: string;
- 		readonly autoClosingBrackets: boolean;
- 		readonly autoIndent: boolean;
-@@ -3428,7 +3407,6 @@
- 		readonly readOnly: boolean;
- 		readonly accessibilitySupport: boolean;
- 		readonly multiCursorModifier: boolean;
--		readonly multiCursorMergeOverlapping: boolean;
- 		readonly wordSeparators: boolean;
- 		readonly autoClosingBrackets: boolean;
- 		readonly autoIndent: boolean;
-@@ -5311,6 +5289,21 @@
- 		arguments?: any[];
- 	}
- 
-+	export interface CommentThread {
-+		readonly range: IRange;
-+		readonly comments: Comment[];
-+	}
-+
-+	export interface Comment {
-+		readonly body: IMarkdownString;
-+		readonly userName: string;
-+		readonly gravatar: string;
-+	}
-+
-+	export interface CommentProvider {
-+		provideComments(model: editor.ITextModel, token: CancellationToken): CommentThread[];
-+	}
-+
- 	export interface ICodeLensSymbol {
- 		range: IRange;
- 		id?: string;
-changed in both
-  base   100644 abc5a96d2076991b93d4960c521a95d2224279e6 src/vs/platform/telemetry/browser/errorTelemetry.ts
-  our    100644 ec06e2c07eef85a9dbde991083fba2510c62b26e src/vs/platform/telemetry/browser/errorTelemetry.ts
-  their  100644 262c59834cfb39df9143c1bf381846811759c9f1 src/vs/platform/telemetry/browser/errorTelemetry.ts
-@@ -12,6 +12,7 @@
- import * as Errors from 'vs/base/common/errors';
- import { safeStringify } from 'vs/base/common/objects';
- 
-+<<<<<<< .our
- /* __GDPR__FRAGMENT__
- 	"ErrorEvent" : {
- 		"stack": { "classification": "CustomerContent", "purpose": "PerformanceAndHealth" },
-@@ -24,6 +25,23 @@
- 		"column": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth", "isMeasurement": true },
- 		"uncaught_error_name": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
- 		"uncaught_error_msg": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
-+=======
-+
-+/* __GDPR__FRAGMENT__
-+	"ErrorNameAndMessage" : {
-+		"message" : { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
-+		"name": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" }
-+	}
-+ */
-+/* __GDPR__FRAGMENT__
-+	"ErrorEvent" : {
-+		"stack": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
-+		"message" : { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
-+		"filename" : { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
-+		"line": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth", "isMeasurement": true },
-+		"column": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth", "isMeasurement": true },
-+		"error" : { "${inline}": [ "${ErrorNameAndMessage}" ] },
-+>>>>>>> .their
- 		"count": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth", "isMeasurement": true }
- 	}
-  */
-@@ -166,7 +184,11 @@
- 					"${include}": [ "${ErrorEvent}" ]
- 				}
- 			*/
-+<<<<<<< .our
- 			this._telemetryService.publicLog('UnhandledError', error, true);
-+=======
-+			this._telemetryService.publicLog('UnhandledError', error);
-+>>>>>>> .their
- 		}
- 		this._buffer.length = 0;
- 	}
diff --git a/app/test/fixtures/merge-parser/vscode/merge-kieferrm-mainDebug-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-kieferrm-mainDebug-into-master.txt
deleted file mode 100644
index ba685d3b41a..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-kieferrm-mainDebug-into-master.txt
+++ /dev/null
@@ -1,179 +0,0 @@
-changed in both
-  base   100644 7ba536117deff13bd495b1c27209b0da22fdf1fb src/vs/code/electron-main/window.ts
-  our    100644 98a4328213e146b214e8da866ab92dc7f9c449a9 src/vs/code/electron-main/window.ts
-  their  100644 f9d78ca017e9d179f3344ff6fb1a90c3af7fe663 src/vs/code/electron-main/window.ts
-@@ -194,9 +194,32 @@
- 		}
- 
- 		// Create the browser window.
-+		this.logService.info('Opening browser window with options:', options);
- 		this._win = new BrowserWindow(options);
-+		this.logService.info('Acual browser window position [x,y]:', this._win.getPosition());
- 		this._id = this._win.id;
- 
-+<<<<<<< .our
-+=======
-+		// Bug in Electron (https://github.com/electron/electron/issues/10862). On multi-monitor setups,
-+		// it can happen that the position we set to the window is not the correct one on the display.
-+		// To workaround, we ask the window for its position and set it again if not matching.
-+		// This only applies if the window is not fullscreen or maximized and multiple monitors are used.
-+		if (isWindows && !isFullscreenOrMaximized) {
-+			try {
-+				if (screen.getAllDisplays().length > 1) {
-+					const [x, y] = this._win.getPosition();
-+					if (x !== this.windowState.x || y !== this.windowState.y) {
-+						this.logService.info('Resetting browser window position to window state:', this.windowState);
-+						this._win.setPosition(this.windowState.x, this.windowState.y, false);
-+					}
-+				}
-+			} catch (err) {
-+				this.logService.warn(`Unexpected error fixing window position on windows with multiple windows: ${err}\n${err.stack}`);
-+			}
-+		}
-+
-+>>>>>>> .their
- 		if (useCustomTitleStyle) {
- 			this._win.setSheetOffset(22); // offset dialogs by the height of the custom title bar if we have any
- 		}
-@@ -213,6 +236,7 @@
- 			}
- 		}
- 
-+		this.logService.info('Acual browser window position after all adjustments [x,y]:', this._win.getPosition());
- 		this._lastFocusTime = Date.now(); // since we show directly, we need to set the last focus time too
- 	}
- 
-@@ -734,14 +758,17 @@
- 
- 	private validateWindowState(state: IWindowState): IWindowState {
- 		if (!state) {
-+			this.logService.info('validateWindowState: no state');
- 			return null;
- 		}
- 
- 		if ([state.x, state.y, state.width, state.height].some(n => typeof n !== 'number')) {
-+			this.logService.info('validateWindowState: not numbers');
- 			return null;
- 		}
- 
- 		if (state.width <= 0 || state.height <= 0) {
-+			this.logService.info('validateWindowState: height or width less then zero');
- 			return null;
- 		}
- 
-@@ -779,9 +806,11 @@
- 			}
- 
- 			if (state.mode === WindowMode.Maximized) {
-+				this.logService.info('reset window state to default for single display');
- 				return defaultWindowState(WindowMode.Maximized); // when maximized, make sure we have good values when the user restores the window
- 			}
- 
-+			this.logService.info('recomputed window state for single display:', state);
- 			return state;
- 		}
- 
-@@ -793,6 +822,7 @@
- 				defaults.x = display.bounds.x; // carefull to use displays x/y position so that the window ends up on the correct monitor
- 				defaults.y = display.bounds.y;
- 
-+				this.logService.info('recomputed window state for full-screen multi-display:', state);
- 				return defaults;
- 			}
- 		}
-@@ -811,13 +841,15 @@
- 				const defaults = defaultWindowState(WindowMode.Maximized); // when maximized, make sure we have good values when the user restores the window
- 				defaults.x = state.x; // carefull to keep x/y position so that the window ends up on the correct monitor
- 				defaults.y = state.y;
--
-+				this.logService.info('recomputed window state for maximized multi-display:', defaults);
- 				return defaults;
- 			}
- 
-+			this.logService.info('recomputed window state for multi-display', state);
- 			return state;
- 		}
- 
-+		this.logService.info('reset display state to null');
- 		return null;
- 	}
- 
-changed in both
-  base   100644 ec384f0b04cdf07025ccfea2685c74d69ed5a48b src/vs/code/electron-main/windows.ts
-  our    100644 ee30f9a282b84b1fa9b3443b77acf86849589d43 src/vs/code/electron-main/windows.ts
-  their  100644 a85a87b83b645ee9102c12c590f0072d0c370bce src/vs/code/electron-main/windows.ts
-@@ -1229,7 +1229,12 @@
- 				state.mode = WindowMode.Normal;
- 			}
- 
-+<<<<<<< .our
- 			// Create the window
-+=======
-+			this.logService.info('New window state:', state);
-+
-+>>>>>>> .their
- 			window = this.instantiationService.createInstance(CodeWindow, {
- 				state,
- 				extensionDevelopmentPath: configuration.extensionDevelopmentPath,
-@@ -1353,6 +1358,8 @@
- 		let displayToUse: Electron.Display;
- 		const displays = screen.getAllDisplays();
- 
-+		this.logService.info('Displays detected:', displays);
-+
- 		// Single Display
- 		if (displays.length === 1) {
- 			displayToUse = displays[0];
-@@ -1365,16 +1372,19 @@
- 			if (isMacintosh) {
- 				const cursorPoint = screen.getCursorScreenPoint();
- 				displayToUse = screen.getDisplayNearestPoint(cursorPoint);
-+				this.logService.info('Display near cursor:', displayToUse);
- 			}
- 
- 			// if we have a last active window, use that display for the new window
- 			if (!displayToUse && lastActive) {
- 				displayToUse = screen.getDisplayMatching(lastActive.getBounds());
-+				this.logService.info('Last active display:', displayToUse);
- 			}
- 
- 			// fallback to primary display or first display
- 			if (!displayToUse) {
- 				displayToUse = screen.getPrimaryDisplay() || displays[0];
-+				this.logService.info('Fallback display:', displayToUse);
- 			}
- 		}
- 
-changed in both
-  base   100644 0c5a6074797e2f8a8b0aea3d8e9ff396a74ae37e src/vs/code/node/cli.ts
-  our    100644 3ca3fd9ec9479918271b1fd5d7cd262e40dae630 src/vs/code/node/cli.ts
-  their  100644 19181883138c3da2c67b76f6da465cbcf5fcabda src/vs/code/node/cli.ts
-@@ -324,6 +324,12 @@
- 			options['stdio'] = 'ignore';
- 		}
- 
-+		if (args['debugMain']) {
-+			const portMain = await findFreePort(9222, 10, 6000);
-+			console.log(`Main Process debug port: ${portMain}`);
-+			argv.push(`--inspect-brk=${portMain}`);
-+		}
-+
- 		const child = spawn(process.execPath, argv.slice(2), options);
- 
- 		if (args.wait && waitMarkerFilePath) {
-changed in both
-  base   100644 ed297cda684335352fd5fa530fb29043ec72db12 src/vs/platform/environment/node/argv.ts
-  our    100644 7183c2471eb1043a8263fbc1a8a7863b41344622 src/vs/platform/environment/node/argv.ts
-  their  100644 ab55802e9d5ef5b21edc637f0e1f061032bf4a67 src/vs/platform/environment/node/argv.ts
-@@ -67,7 +67,11 @@
- 		'status',
- 		'file-write',
- 		'file-chmod',
-+<<<<<<< .our
- 		'driver-verbose'
-+=======
-+		'debugMain'
-+>>>>>>> .their
- 	],
- 	alias: {
- 		add: 'a',
diff --git a/app/test/fixtures/merge-parser/vscode/merge-loc-1.24.0-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-loc-1.24.0-into-master.txt
deleted file mode 100644
index 61c3f9f0289..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-loc-1.24.0-into-master.txt
+++ /dev/null
@@ -1,79 +0,0 @@
-changed in both
-  base   100644 f7740f6c5a50619c495336b4ecd78310a514522b extensions/typescript-language-features/src/features/updatePathsOnRename.ts
-  our    100644 44c05cd7b4a3cb2ce3e58d0e3c657b60db530ec0 extensions/typescript-language-features/src/features/updatePathsOnRename.ts
-  their  100644 f7c955c5189c7d0d3e0e61bc7cb0cc0592873474 extensions/typescript-language-features/src/features/updatePathsOnRename.ts
-@@ -49,8 +49,12 @@
- 		oldResource: vscode.Uri,
- 		newResource: vscode.Uri,
- 	): Promise<void> {
-+<<<<<<< .our
- 		const targetResource = await this.getTargetResource(newResource);
- 		if (!targetResource) {
-+=======
-+		if (!this.client.apiVersion.has290Features()) {
-+>>>>>>> .their
- 			return;
- 		}
- 
-changed in both
-  base   100644 09d8da09e7b542dd3ca1aabbc647d93df1d57cb9 src/vs/editor/contrib/find/findWidget.ts
-  our    100644 86cac532d3fcfd30096dff7b86c46b48fdf58ad8 src/vs/editor/contrib/find/findWidget.ts
-  their  100644 e430e8bc3a8b63c8dbb991632a5241b6394012ef src/vs/editor/contrib/find/findWidget.ts
-@@ -30,7 +30,10 @@
- import { Color } from 'vs/base/common/color';
- import { IConfigurationChangedEvent } from 'vs/editor/common/config/editorOptions';
- import { editorFindRangeHighlight, editorFindMatch, editorFindMatchHighlight, contrastBorder, inputBackground, editorWidgetBackground, inputActiveOptionBorder, widgetShadow, inputForeground, inputBorder, inputValidationInfoBackground, inputValidationInfoBorder, inputValidationWarningBackground, inputValidationWarningBorder, inputValidationErrorBackground, inputValidationErrorBorder, errorForeground, editorWidgetBorder, editorFindMatchBorder, editorFindMatchHighlightBorder, editorFindRangeHighlightBorder, editorWidgetResizeBorder } from 'vs/platform/theme/common/colorRegistry';
-+<<<<<<< .our
- import { ContextScopedFindInput, ContextScopedHistoryInputBox } from 'vs/platform/widget/browser/contextScopedHistoryWidget';
-+=======
-+>>>>>>> .their
- 
- 
- export interface IFindController {
-changed in both
-  base   100644 2542de4c74b4c68119531ca244d91cfa723987dc src/vs/platform/theme/common/colorRegistry.ts
-  our    100644 674f67411d4ee542ee937fac9146ef0768ec982d src/vs/platform/theme/common/colorRegistry.ts
-  their  100644 81dba81236c08514fbe7bf4ee4b06b614bb30925 src/vs/platform/theme/common/colorRegistry.ts
-changed in both
-  base   100644 e1fb74ff1cc215fc6a46c2d970aa1393f85b2198 src/vs/workbench/browser/parts/quickinput/quickInput.css
-  our    100644 690286ea03324d7f2df24ff450315cac3c7620b3 src/vs/workbench/browser/parts/quickinput/quickInput.css
-  their  100644 630d3d6ba5f7b14b12d49ed0013a3f3315c4aab4 src/vs/workbench/browser/parts/quickinput/quickInput.css
-@@ -178,6 +178,7 @@
- 
- .quick-input-list .monaco-highlighted-label .highlight {
- 	font-weight: bold;
-+<<<<<<< .our
- }
- 
- .quick-input-list .quick-input-list-separator {
-@@ -219,3 +220,6 @@
- .quick-input-list .monaco-list-row.focused .quick-input-list-entry-action-bar {
- 	display: flex;
- }
-+=======
-+}
-+>>>>>>> .their
-changed in both
-  base   100644 26bb02d0714f539097ddcfd3a52172341fc976b1 src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.ts
-  our    100644 052de75c677677d839ae5533561df1d9238d3218 src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.ts
-  their  100644 dbb24061980e2564f0ae3c1b0895244301cec381 src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.ts
-changed in both
-  base   100644 a84fd8ff73d8149d0d3b508741c7d5156ac6c404 src/vs/workbench/parts/outline/electron-browser/outlinePanel.ts
-  our    100644 4c9c93b5db416a94d8f3ef592cd9bb2250cc84fb src/vs/workbench/parts/outline/electron-browser/outlinePanel.ts
-  their  100644 abff8b7c8f71a4075977d5aa785f34e8e2b8e635 src/vs/workbench/parts/outline/electron-browser/outlinePanel.ts
-changed in both
-  base   100644 8106f9cf4837d1af9c2d120f313505b8d401b5ed src/vs/workbench/services/textfile/common/textFileEditorModel.ts
-  our    100644 6faef447dc315ab88c3c3c652840860db088fa46 src/vs/workbench/services/textfile/common/textFileEditorModel.ts
-  their  100644 a625dbdba080f632dc7bcb03189fe99f2b816171 src/vs/workbench/services/textfile/common/textFileEditorModel.ts
-@@ -676,7 +676,11 @@
- 			// be disposed if we are dirty, but if we are not dirty, save() and dispose() can still be triggered
- 			// one after the other without waiting for the save() to complete. If we are disposed(), we risk
- 			// saving contents to disk that are stale (see https://github.com/Microsoft/vscode/issues/50942).
-+<<<<<<< .our
- 			// To fix this issue, we will not store the contents to disk when we got disposed.
-+=======
-+			// To fix this issue, we will not store the contents to disk when we got disposed. 
-+>>>>>>> .their
- 			if (this.disposed) {
- 				return void 0;
- 			}
diff --git a/app/test/fixtures/merge-parser/vscode/merge-misolori-activity-bar-update-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-misolori-activity-bar-update-into-master.txt
deleted file mode 100644
index 451cc364a77..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-misolori-activity-bar-update-into-master.txt
+++ /dev/null
@@ -1,242 +0,0 @@
-changed in both
-  base   100644 6979382b238cfe5314401e6016a0057fb0d3f097 src/vs/workbench/browser/layout.ts
-  our    100644 5089f6ff8af0179aa47698fb717ff2cbe9bb68be src/vs/workbench/browser/layout.ts
-  their  100644 0c562a852c2ceeee00d97a5ec3f7e0eec2c83bb9 src/vs/workbench/browser/layout.ts
-@@ -31,7 +31,7 @@
- 
- const TITLE_BAR_HEIGHT = isMacintosh ? 22 : 30;
- const STATUS_BAR_HEIGHT = 22;
--const ACTIVITY_BAR_WIDTH = 50;
-+const ACTIVITY_BAR_WIDTH = 40;
- 
- const MIN_SIDEBAR_PART_WIDTH = 170;
- const DEFAULT_SIDEBAR_PART_WIDTH = 300;
-changed in both
-  base   100644 5de79ae5dade3a5388795c8292cd9e5c6db1a612 src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
-  our    100644 52d0ff4ccf36e18a9e6bb376e85eb8574851026e src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
-  their  100644 69ebd7d8314400d8de017831e8230c75ca293cfa src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
-@@ -339,6 +339,41 @@
- 	shutdown(): void {
- 		const state = this.viewletService.getViewlets().map(viewlet => ({ id: viewlet.id, iconUrl: viewlet.iconUrl }));
- 		this.storageService.store(ActivitybarPart.PLACEHOLDER_VIEWLETS, JSON.stringify(state), StorageScope.GLOBAL);
-+<<<<<<< .our
-+=======
-+		super.shutdown();
-+	}
-+
-+	public dispose(): void {
-+		if (this.compositeBar) {
-+			this.compositeBar.dispose();
-+			this.compositeBar = null;
-+		}
-+
-+		if (this.globalActionBar) {
-+			this.globalActionBar.dispose();
-+			this.globalActionBar = null;
-+		}
-+
-+		super.dispose();
-+	}
-+}
-+
-+class PlaceHolderViewletActivityAction extends ViewletActivityAction {
-+
-+	constructor(
-+		id: string, iconUrl: URI,
-+		@IViewletService viewletService: IViewletService,
-+		@IPartService partService: IPartService,
-+		@ITelemetryService telemetryService: ITelemetryService
-+	) {
-+		super({ id, name: id, cssClass: `extensionViewlet-placeholder-${id.replace(/\./g, '-')}` }, viewletService, partService, telemetryService);
-+		// Generate Placeholder CSS to show the icon in the activity bar
-+		const iconClass = `.monaco-workbench > .activitybar .monaco-action-bar .action-label.${this.class}`;
-+		createCSSRule(iconClass, `-webkit-mask: url('${iconUrl || ''}') no-repeat 50% 50%; -webkit-mask-size: 18px`);
-+		this.enabled = false;
-+	}
-+>>>>>>> .their
- 
- 		super.shutdown();
- 	}
-merged
-  result 100644 18ab22ac047f4d7bc9c330b954ce14c9137e1b9a src/vs/workbench/browser/parts/activitybar/media/activityaction.css
-  our    100644 3f07bfcb0d04cc8bd2c92452ec7400587647419a src/vs/workbench/browser/parts/activitybar/media/activityaction.css
-@@ -6,7 +6,7 @@
- .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item {
- 	display: block;
- 	position: relative;
--	padding: 5px 0;
-+	padding: 0;
- }
- 
- .monaco-workbench > .activitybar > .content .monaco-action-bar .action-label {
-@@ -15,7 +15,7 @@
- 	height: 40px;
- 	line-height: 40px;
- 	margin-right: 0;
--	padding: 0 0 0 50px;
-+	padding: 0;
- 	box-sizing: border-box;
- 	font-size: 15px;
- }
-@@ -43,22 +43,24 @@
- 
- .monaco-workbench > .activitybar > .content .monaco-action-bar .badge {
- 	position: absolute;
--	top: 5px;
-+	top: 0;
- 	left: 0;
- 	overflow: hidden;
--	width: 50px;
--	height: 40px;
-+	width: 100%;
-+	height: 100%;
- }
- 
- .monaco-workbench > .activitybar > .content .monaco-action-bar .badge .badge-content {
- 	position: absolute;
--	top: 20px;
--	right: 8px;
--	font-size: 11px;
--	min-width: 8px;
--	height: 18px;
--	line-height: 18px;
--	padding: 0 5px;
-+	top: 12px;
-+	bottom: 0;
-+	margin: auto;
-+	right: 6px;
-+	font-size: 9px;
-+	min-width: 7px;
-+	height: 14px;
-+	line-height: 14px;
-+	padding: 0 4px;
- 	border-radius: 20px;
- 	text-align: center;
- }
-merged
-  result 100644 b41e5bb0d76358d3fbab1e53898fbd8afcfe8fa9 src/vs/workbench/browser/parts/activitybar/media/activitybarpart.css
-  our    100644 5a92b2e1f52f2221f3bb176ec29ec3b97debcc6e src/vs/workbench/browser/parts/activitybar/media/activitybarpart.css
-@@ -4,7 +4,7 @@
-  *--------------------------------------------------------------------------------------------*/
- 
- .monaco-workbench > .part.activitybar {
--	width: 50px;
-+	width: 40px;
- }
- 
- .monaco-workbench > .activitybar > .content {
-merged
-  result 100644 086470435f36edf278e97154ff5dd796a8768427 src/vs/workbench/parts/debug/browser/media/debug-dark.svg
-  our    100644 cedddacf03edb2c516a8d00c6aa4e44b3f995bd6 src/vs/workbench/parts/debug/browser/media/debug-dark.svg
-@@ -1 +1 @@
--<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-white{fill:#fff;}</style></defs><title>debug-dark</title><g id="iconBg"><path class="icon-white" d="M8.667,10.325v2.832c0,.308.06.843-.249.843H7.333v-.667H8V11.207l-.115-.12a2.362,2.362,0,0,1-3.113.072C4,10.385,4.079,9.333,4.917,8H2.667v.667H2V7.582c0-.309.535-.249.843-.249H5.579Zm-2-6.992H6V2.667H7.3c.307,0,.7.147.7.455v2.23l.491.583a1.3,1.3,0,0,1,1.276-1.14A.6.6,0,0,1,10,4.821V3.333h.667V5.079a.413.413,0,0,0,.255.255h1.745V6H11.178c.018,0,.028.1.028.2a1.31,1.31,0,0,1-1.141,1.288L10.648,8h2.231c.308,0,.455.389.455.7V10h-.667V9.333h-1.68l-4.32-4.2ZM8,0a8,8,0,1,0,8,8A8,8,0,0,0,8,0Zm6.667,8a6.634,6.634,0,0,1-1.508,4.216L3.784,2.841A6.662,6.662,0,0,1,14.667,8ZM1.333,8A6.633,6.633,0,0,1,2.841,3.784l9.375,9.376A6.663,6.663,0,0,1,1.333,8Z"/></g></svg>
-\ No newline at end of file
-+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 40"><path d="M20.8 22.6v3.2c0 .3.1.9-.3.9h-1.2V26h.7v-2.4l-.1-.1c-1 .9-2.5.9-3.5.1-.9-.9-.8-2.1.2-3.6H14v.8h-.8v-1.2c0-.3.6-.3.9-.3h3.1l3.6 3.3zm-2.3-7.9h-.8V14h1.5c.3 0 .8.2.8.5V17l.6.7c.1-.7.7-1.3 1.4-1.3h.3v-1.7h.7v2c0 .1.2.2.3.3h2v.7h-1.7v.2c0 .7-.6 1.4-1.3 1.4l.7.7h2.5c.3 0 .5.4.5.8v1.5h-.8v-.8h-1.9l-4.9-4.7.1-2.1zM20 11c-5 0-9 4-9 9s4 9 9 9 9-4 9-9-4-9-9-9zm7.5 9c0 1.7-.6 3.4-1.7 4.7L15.3 14.2c3.2-2.6 7.9-2.2 10.5 1 1.1 1.4 1.7 3.1 1.7 4.8zm-15 0c0-1.7.6-3.4 1.7-4.7l10.5 10.5c-3.2 2.6-7.9 2.2-10.5-1.1-1.1-1.3-1.7-3-1.7-4.7z" fill="#fff"/></svg>
-\ No newline at end of file
-merged
-  result 100644 008dbec10eae5dea5f0b38944fc8fcaef568cb36 src/vs/workbench/parts/debug/browser/media/debug.contribution.css
-  our    100644 6637cb84e531d20fe5539f00f525133ab315aa00 src/vs/workbench/parts/debug/browser/media/debug.contribution.css
-@@ -6,7 +6,6 @@
- /* Activity Bar */
- .monaco-workbench > .activitybar .monaco-action-bar .action-label.debug {
- 	-webkit-mask: url('debug-dark.svg') no-repeat 50% 50%;
--	-webkit-mask-size: 28px;
- }
- 
- .monaco-editor .debug-top-stack-frame-line,
-merged
-  result 100644 9ece85da562cd66b53672bb80519cf1f3d994f18 src/vs/workbench/parts/extensions/electron-browser/media/extensions-dark.svg
-  our    100644 4a1571a3c5c9a8badff0f68279b5e8f4c5b9e6bd src/vs/workbench/parts/extensions/electron-browser/media/extensions-dark.svg
-@@ -1,6 +1 @@
--<?xml version="1.0" encoding="utf-8"?>
--<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
--	 viewBox="0 0 60 60" style="enable-background:new 0 0 60 60;" xml:space="preserve">
--	<path class="st0" d="M12.9,47.1H30V60H0V0h25.7v12.9H12.9V47.1z M17.1,42.9h25.7V17.1H17.1V42.9z M30,0v12.9h8.6V8.6h12.9v12.9
--		h-4.3V30H60V0H30z M47.1,47.1H34.3V60H60V34.3H47.1V47.1z" fill="#fff"/>
--</svg>
-+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 40"><path d="M15.4 24.6H20V28h-8V12h6.9v3.4h-3.4v9.2zm1.2-1.2h6.9v-6.9h-6.9v6.9zM20 12v3.4h2.3v-1.1h3.4v3.4h-1.1V20H28v-8h-8zm4.6 12.6h-3.4V28H28v-6.9h-3.4v3.5z" fill="#fff"/></svg>
-\ No newline at end of file
-changed in both
-  base   100644 848c0382f9a5986f291af49fdcb05f63f5d099df src/vs/workbench/parts/extensions/electron-browser/media/extensions.css
-  our    100644 a879a47e71a142625b4f801e010da6e260c16aa0 src/vs/workbench/parts/extensions/electron-browser/media/extensions.css
-  their  100644 8e5cb028358f42b86ead7d131d57c0d04c4695ca src/vs/workbench/parts/extensions/electron-browser/media/extensions.css
-@@ -5,10 +5,13 @@
- 
- .monaco-workbench > .activitybar > .content .monaco-action-bar .action-label.extensions {
- 	-webkit-mask: url('extensions-dark.svg') no-repeat 50% 50%;
-+<<<<<<< .our
- 	-webkit-mask-size: 21px;
- }
- 
- .extensions .split-view-view .panel-header .count-badge-wrapper {
- 	position: absolute;
- 	right: 12px;
-+=======
-+>>>>>>> .their
- }
-\ No newline at end of file
-merged
-  result 100644 01944479a84e34284983f28503649f5456cb4f8f src/vs/workbench/parts/files/electron-browser/media/files-dark.svg
-  our    100644 7e3e59b370b0753d2449d39c761dc4e476f8b3e6 src/vs/workbench/parts/files/electron-browser/media/files-dark.svg
-@@ -1 +1 @@
--<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path d="M17.705 8h-8.705s-2 .078-2 2v15s0 2 2 2l11-.004c2 .004 2-1.996 2-1.996v-11.491l-4.295-5.509zm-1.705 2v5h4v10h-11v-15h7zm5.509-6h-8.493s-2.016.016-2.031 2h8.015v.454l3.931 4.546h1.069v12c2 0 2-1.995 2-1.995v-11.357l-4.491-5.648z" fill="#fff"/></svg>
-\ No newline at end of file
-+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 40"><path d="M21 14.2h-6.9s-1.6.1-1.6 1.6v11.7s0 1.6 1.6 1.6h8.7c1.6 0 1.6-1.6 1.6-1.6v-9c-.1-.1-3.4-4.4-3.4-4.3zm-1.3 1.5v3.9h3.1v7.9h-8.7V15.7h5.6zM24 11h-6.6s-1.6 0-1.6 1.6h6.3v.3l3 3.6h.8v9.3c1.6 0 1.6-1.6 1.6-1.6v-8.9c0 .1-3.5-4.3-3.5-4.3z" fill="#fff"/></svg>
-\ No newline at end of file
-merged
-  result 100644 a4359af4bf9c0292780516e46eff6b2ef5715c38 src/vs/workbench/parts/scm/electron-browser/media/icon-dark.svg
-  our    100644 2b8f14d282b162961d94d085415c7df3e8950aaa src/vs/workbench/parts/scm/electron-browser/media/icon-dark.svg
-@@ -1,12 +1 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<svg width="10px" height="16px" viewBox="0 0 10 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
--    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
--    <title>repo-forked</title>
--    <desc>Created with Sketch.</desc>
--    <defs></defs>
--    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
--        <g id="repo-forked" fill="#fff">
--            <path d="M8,1 C6.89,1 6,1.89 6,3 C6,3.73 6.41,4.38 7,4.72 L7,6 L5,8 L3,6 L3,4.72 C3.59,4.38 4,3.74 4,3 C4,1.89 3.11,1 2,1 C0.89,1 0,1.89 0,3 C0,3.73 0.41,4.38 1,4.72 L1,6.5 L4,9.5 L4,11.28 C3.41,11.62 3,12.26 3,13 C3,14.11 3.89,15 5,15 C6.11,15 7,14.11 7,13 C7,12.27 6.59,11.62 6,11.28 L6,9.5 L9,6.5 L9,4.72 C9.59,4.38 10,3.74 10,3 C10,1.89 9.11,1 8,1 L8,1 Z M2,4.2 C1.34,4.2 0.8,3.65 0.8,3 C0.8,2.35 1.35,1.8 2,1.8 C2.65,1.8 3.2,2.35 3.2,3 C3.2,3.65 2.65,4.2 2,4.2 L2,4.2 Z M5,14.2 C4.34,14.2 3.8,13.65 3.8,13 C3.8,12.35 4.35,11.8 5,11.8 C5.65,11.8 6.2,12.35 6.2,13 C6.2,13.65 5.65,14.2 5,14.2 L5,14.2 Z M8,4.2 C7.34,4.2 6.8,3.65 6.8,3 C6.8,2.35 7.35,1.8 8,1.8 C8.65,1.8 9.2,2.35 9.2,3 C9.2,3.65 8.65,4.2 8,4.2 L8,4.2 Z" id="Shape"></path>
--        </g>
--    </g>
--</svg>
-\ No newline at end of file
-+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 40"><path d="M24.1 10.5c-1.5 0-2.7 1.2-2.7 2.7 0 .9.5 1.9 1.4 2.3v1.7L20 19.9l-2.7-2.7v-1.7c.8-.4 1.4-1.4 1.4-2.3 0-1.5-1.2-2.7-2.7-2.7-1.6 0-2.7 1.2-2.7 2.7 0 .9.5 1.9 1.4 2.3V18l4.1 4.1v2.4c-.8.4-1.4 1.4-1.4 2.3 0 1.5 1.2 2.7 2.7 2.7 1.6 0 2.7-1.2 2.7-2.7 0-.9-.5-1.9-1.4-2.3V22l4.1-4.1v-2.4c.8-.4 1.4-1.4 1.4-2.3-.2-1.5-1.3-2.7-2.8-2.7zm-8.2 4.3c-.8 0-1.6-.7-1.6-1.6 0-.8.7-1.6 1.6-1.6.8 0 1.6.7 1.6 1.6 0 .9-.6 1.6-1.6 1.6zM20 28.3c-.8 0-1.6-.7-1.6-1.6 0-.8.7-1.6 1.6-1.6.8 0 1.6.7 1.6 1.6 0 .9-.8 1.6-1.6 1.6zm4.1-13.5c-.8 0-1.6-.7-1.6-1.6 0-.8.6-1.7 1.6-1.7.8 0 1.6.7 1.6 1.6 0 .9-.8 1.7-1.6 1.7z" fill="#fff"/></svg>
-\ No newline at end of file
-changed in both
-  base   100644 f6e3ec0c18a34cfb173a9a0313b469b55777d98f src/vs/workbench/parts/scm/electron-browser/media/scmViewlet.css
-  our    100644 108bf404719559f73faa5505a09f2babbb1a04f8 src/vs/workbench/parts/scm/electron-browser/media/scmViewlet.css
-  their  100644 e631d80a073176fc2ed1f03abbe794824b417197 src/vs/workbench/parts/scm/electron-browser/media/scmViewlet.css
-@@ -5,7 +5,6 @@
- 
- .monaco-workbench > .activitybar > .content .monaco-action-bar .action-label.scm {
- 	-webkit-mask: url('icon-dark.svg') no-repeat 50% 50%;
--	-webkit-mask-size: 19px;
- }
- 
- .monaco-workbench .viewlet.scm-viewlet .collapsible.header .actions {
-merged
-  result 100644 5f331c9a362bc9f019dcadfb7b5d8fb57bc1e21b src/vs/workbench/parts/search/electron-browser/media/search-dark.svg
-  our    100644 35bda969be727d7cc7ec97f7902d0b4608e12ad7 src/vs/workbench/parts/search/electron-browser/media/search-dark.svg
-@@ -1 +1 @@
--<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path d="M19.23 4.095c-4.842 0-8.769 3.928-8.769 8.771 0 1.781.539 3.43 1.449 4.815 0 0-5.482 5.455-7.102 7.102-1.621 1.646 1.001 4.071 2.602 2.409 1.602-1.659 7.006-7.005 7.006-7.005 1.384.911 3.035 1.45 4.814 1.45 4.845 0 8.772-3.93 8.772-8.771.001-4.844-3.927-8.771-8.772-8.771zm0 15.035c-3.459 0-6.265-2.804-6.265-6.264 0-3.46 2.805-6.265 6.265-6.265 3.462 0 6.266 2.804 6.266 6.265 0 3.46-2.804 6.264-6.266 6.264z" fill="#fff"/></svg>
-\ No newline at end of file
-+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 40"><path d="M22.3 11c-3.7 0-6.7 3-6.7 6.7 0 1.4.5 2.6 1.1 3.7l-5.4 5.4c-1.2 1.2.8 3 2 1.8l5.3-5.3c1 .7 2.3 1.1 3.6 1.1 3.7 0 6.7-3 6.7-6.7C29 14 26 11 22.3 11zm0 11.5c-2.6 0-4.7-2.1-4.7-4.7s2.1-4.7 4.7-4.7 4.7 2.1 4.7 4.7-2.1 4.7-4.7 4.7z" fill="#fff"/></svg>
-\ No newline at end of file
-changed in both
-  base   100644 4e602f932a2a6b35b13311317f0f22efd8c5b98f src/vs/workbench/parts/update/electron-browser/media/update.contribution.css
-  our    100644 54537cdcfa7fcc9af764bd371cd6d8c125e9abc3 src/vs/workbench/parts/update/electron-browser/media/update.contribution.css
-  their  100644 51357eda7eea98700f88593bdb11a676efd56545 src/vs/workbench/parts/update/electron-browser/media/update.contribution.css
-@@ -5,5 +5,4 @@
- 
- .update-activity {
- 	-webkit-mask: url('update.svg') no-repeat 50% 50%;
--	-webkit-mask-size: 22px;
- }
-merged
-  result 100644 42a081a2c3aba37c24c6ce5d2bd4aa92d26cf80f src/vs/workbench/parts/update/electron-browser/media/update.svg
-  our    100644 c97bb48bdcc535015e00a5f3cd2112edd7ca34f8 src/vs/workbench/parts/update/electron-browser/media/update.svg
-@@ -1 +1 @@
--<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#f6f6f6;}.icon-canvas-transparent{opacity:0;}.icon-vs-bg{fill:#424242;}</style></defs><title>configure</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,0V16H0V0Z"/></g><g id="outline" style="display: none;"><path class="icon-vs-out" d="M16,10.015l-2.238.372,1.318,1.847L12.233,15.08l-1.847-1.318L10.013,16H5.986l-.373-2.237L3.767,15.08.919,12.233l1.319-1.847L0,10.013V5.986l2.238-.373L.919,3.767,3.768.919,5.613,2.238,5.986,0h4.028l.372,2.238L12.233.919,15.08,3.768,13.762,5.613,16,5.986Z"/></g><g id="iconBg"><path class="icon-vs-bg" d="M12.876,9.521,15,9.167V6.834L12.879,6.48a5.12,5.12,0,0,0-.354-.854l1.25-1.75-1.65-1.65L10.373,3.477c-.137-.072-.262-.159-.408-.219s-.3-.087-.444-.133L9.167,1H6.834L6.48,3.121a5.118,5.118,0,0,0-.854.354l-1.75-1.25-1.65,1.65L3.477,5.627c-.072.137-.159.262-.219.408s-.087.3-.133.444L1,6.833V9.166l2.121.354a5.122,5.122,0,0,0,.354.854l-1.25,1.75,1.65,1.65,1.752-1.252c.137.072.262.159.408.22s.3.087.444.133L6.833,15H9.166l.354-2.121a5.121,5.121,0,0,0,.854-.354l1.75,1.25,1.65-1.65-1.252-1.752c.072-.137.159-.263.219-.409S12.83,9.669,12.876,9.521ZM8,10.212A2.212,2.212,0,1,1,10.212,8,2.212,2.212,0,0,1,8,10.212Z"/></g></svg>
-\ No newline at end of file
-+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 38 38"><style>.st0{fill:#f6f6f6;fill-opacity:0}.st1{display:none}.st2{display:inline;fill:#f6f6f6}.st3{fill:#424242}</style><title>configure</title><path class="st0" d="M27 11v16H11V11h16z" id="canvas"/><g id="outline" class="st1" style="display: none;"><path class="st2" d="M27 21l-2.2.4 1.3 1.8-2.8 2.8-1.8-1.3L21 27h-4l-.4-2.2-1.8 1.3-2.8-2.8 1.3-1.8L11 21v-4l2.2-.4-1.3-1.8 2.8-2.8 1.8 1.3.5-2.3h4l.4 2.2 1.8-1.3 2.8 2.8-1.3 1.8 2.3.5v4z"/></g><path class="st3" d="M24.6 20.7l2.4-.4v-2.7l-2.4-.4c-.1-.3-.2-.7-.4-1l1.4-2-1.9-1.9-2 1.4c-.2-.1-.3-.2-.5-.3-.2-.1-.3-.1-.5-.2l-.4-2.2h-2.7l-.4 2.4c-.3.1-.7.2-1 .4l-2-1.4-1.9 1.9 1.4 2c-.1.2-.2.3-.3.5-.1.2-.1.3-.2.5l-2.2.4v2.7l2.4.4c.1.3.2.7.4 1l-1.4 2 1.9 1.9 2-1.4c.2.1.3.2.5.3.2.1.3.1.5.2l.4 2.4h2.7l.4-2.4c.3-.1.7-.2 1-.4l2 1.4 1.9-1.9-1.4-2c.1-.2.2-.3.3-.5-.1-.3-.1-.5 0-.7zm-5.6.8c-1.4 0-2.5-1.1-2.5-2.5s1.1-2.5 2.5-2.5 2.5 1.1 2.5 2.5-1.1 2.5-2.5 2.5z" id="iconBg"/></svg>
-\ No newline at end of file
diff --git a/app/test/fixtures/merge-parser/vscode/merge-octref-debug-task-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-octref-debug-task-into-master.txt
deleted file mode 100644
index 9c73b146407..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-octref-debug-task-into-master.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-changed in both
-  base   100644 f6f6922c78da6efeb7fd01f89bc73adb7b4d4fed extensions/css-language-features/.vscode/launch.json
-  our    100644 d6393141c5dfe77bd85296902d4194bc332d0d52 extensions/css-language-features/.vscode/launch.json
-  their  100644 6b0913faf5267e43049c52811bfbfc79f214f5b6 extensions/css-language-features/.vscode/launch.json
-@@ -24,7 +24,7 @@
- 				"${workspaceFolder}/client/out/**/*.js"
- 			],
- 			"smartStep": true,
--			"preLaunchTask": "npm: compile"
-+			"preLaunchTask": "npm: watch"
- 		},
- 		{
- 			"name": "Launch Tests",
-merged
-  result 100644 5d2e06e9ad528c258097eb424ed110bd06346c34 extensions/css-language-features/.vscode/tasks.json
-  our    100644 9984afdba4e8e6b26d6651200e5a8ef98e02f752 extensions/css-language-features/.vscode/tasks.json
-@@ -3,11 +3,11 @@
- 	"tasks": [
- 		{
- 			"type": "npm",
--			"script": "compile",
--			"problemMatcher": "$tsc-watch",
-+			"script": "watch",
-+			"problemMatcher": "$gulp-tsc",
- 			"isBackground": true,
- 			"presentation": {
--				"reveal": "never"
-+				"reveal": "always"
- 			},
- 			"group": {
- 				"kind": "build",
-changed in both
-  base   100644 44a960237e0b54673d80f7e2956208e5f6699e83 extensions/css-language-features/package.json
-  our    100644 cf0903f0a81a63c2988c208743d6ade134006866 extensions/css-language-features/package.json
-  their  100644 e69688e3f59ba8459b559ccaa143dd2024b022ae extensions/css-language-features/package.json
-@@ -17,9 +17,14 @@
-   "enableProposedApi": true,
-   "main": "./client/out/cssMain",
-   "scripts": {
-+<<<<<<< .our
-     "compile": "gulp compile-extension:css-language-features-client compile-extension:css-language-features-server",
-     "watch": "gulp watch-extension:css-language-features-client watch-extension:css-language-features-server",
-     "test": "mocha",
-+=======
-+    "compile": "gulp compile-extension:css-language-features-client && gulp compile-extension:css-language-features-server",
-+    "watch": "gulp watch-extension:css-language-features-client && gulp watch-extension:css-language-features-server",
-+>>>>>>> .their
-     "postinstall": "cd server && yarn install",
-     "install-client-next": "yarn add vscode-languageclient@next"
-   },
diff --git a/app/test/fixtures/merge-parser/vscode/merge-octref-panel-actions-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-octref-panel-actions-into-master.txt
deleted file mode 100644
index 08861fd3039..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-octref-panel-actions-into-master.txt
+++ /dev/null
@@ -1,148 +0,0 @@
-removed in local
-  base   100644 cb576934bacc33ef6392c05f9c438a2bdb2bd3fb src/vs/workbench/browser/parts/compositebar/compositeBar.ts
-  their  100644 22552b5b6e1b948a9fd6a2329deea638932a73ad src/vs/workbench/browser/parts/compositebar/compositeBar.ts
-changed in both
-  base   100644 b1451168b72a5801fbca49637bd60c8552fac425 src/vs/workbench/browser/parts/panel/panelActions.ts
-  our    100644 54d4f61d0407acbc4a8f4db8c3137c1255c96970 src/vs/workbench/browser/parts/panel/panelActions.ts
-  their  100644 d495ca113c65cb64e82c162df27eb612bbe692f2 src/vs/workbench/browser/parts/panel/panelActions.ts
-@@ -170,6 +170,68 @@
- 	}
- }
- 
-+export class SwitchPanelItemAction extends Action {
-+	constructor(id: string,
-+		name: string,
-+		@IPanelService private panelService: IPanelService
-+	) {
-+		super(id, name);
-+	}
-+
-+	public run(offset: number): TPromise<any> {
-+		const pinnedPanels = this.panelService.getPinnedPanels();
-+		const activePanel = this.panelService.getActivePanel();
-+
-+		if (!activePanel) {
-+			return TPromise.as(null);
-+		}
-+
-+		let targetPanelId: string;
-+		for (let i = 0; i < pinnedPanels.length; i++) {
-+			if (pinnedPanels[i].id === activePanel.getId()) {
-+				targetPanelId = pinnedPanels[(i + pinnedPanels.length + offset) % pinnedPanels.length].id;
-+				break;
-+			}
-+		}
-+
-+		return this.panelService.openPanel(targetPanelId, true);
-+	}
-+}
-+
-+export class PreviousPanelItemAction extends SwitchPanelItemAction {
-+	static readonly ID = 'workbench.action.previousPanelItem';
-+	static LABEL = nls.localize('previousPanelItem', 'Previous Panel Item');
-+
-+	constructor(id: string,
-+		name: string,
-+		@IPanelService panelService: IPanelService
-+	) {
-+		super(id, name, panelService);
-+	}
-+
-+	public run(): TPromise<any> {
-+		return super.run(-1);
-+	}
-+}
-+
-+export class NextPanelItemAction extends SwitchPanelItemAction {
-+	static readonly ID = 'workbench.action.nextPanelItem';
-+	static LABEL = nls.localize('nextPanelItem', 'Next Panel Item');
-+
-+	constructor(id: string,
-+		name: string,
-+		@IPanelService panelService: IPanelService
-+	) {
-+		super(id, name, panelService);
-+	}
-+
-+
-+	public run(): TPromise<any> {
-+		return super.run(1);
-+	}
-+}
-+
-+
- const actionRegistry = Registry.as<IWorkbenchActionRegistry>(WorkbenchExtensions.WorkbenchActions);
- actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(TogglePanelAction, TogglePanelAction.ID, TogglePanelAction.LABEL, { primary: KeyMod.CtrlCmd | KeyCode.KEY_J }), 'View: Toggle Panel', nls.localize('view', "View"));
- actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(FocusPanelAction, FocusPanelAction.ID, FocusPanelAction.LABEL), 'View: Focus into Panel', nls.localize('view', "View"));
-@@ -177,6 +239,7 @@
- actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ClosePanelAction, ClosePanelAction.ID, ClosePanelAction.LABEL), 'View: Close Panel', nls.localize('view', "View"));
- actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(TogglePanelPositionAction, TogglePanelPositionAction.ID, TogglePanelPositionAction.LABEL), 'View: Toggle Panel Position', nls.localize('view', "View"));
- actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ToggleMaximizedPanelAction, ToggleMaximizedPanelAction.ID, undefined), 'View: Toggle Panel Position', nls.localize('view', "View"));
-+<<<<<<< .our
- 
- MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
- 	group: '2_workbench_layout',
-@@ -186,3 +249,7 @@
- 	},
- 	order: 5
- });
-+=======
-+actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(PreviousPanelItemAction, PreviousPanelItemAction.ID, PreviousPanelItemAction.LABEL), 'View: Open Previous Panel Item', nls.localize('view', "View"));
-+actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(NextPanelItemAction, NextPanelItemAction.ID, NextPanelItemAction.LABEL), 'View: Open Next Panel Item', nls.localize('view', "View"));
-+>>>>>>> .their
-changed in both
-  base   100644 d339b0cfe04a18464aa673eee0adf62a49fb43a1 src/vs/workbench/browser/parts/panel/panelPart.ts
-  our    100644 13df252c82f39c22db7a098770e83f90233fabb9 src/vs/workbench/browser/parts/panel/panelPart.ts
-  their  100644 beba0391b7f0a8a11f3495493de793ba4512212e src/vs/workbench/browser/parts/panel/panelPart.ts
-@@ -188,7 +188,14 @@
- 	getPanels(): PanelDescriptor[] {
- 		return Registry.as<PanelRegistry>(PanelExtensions.Panels).getPanels()
- 			.filter(p => p.enabled)
--			.sort((v1, v2) => v1.order - v2.order);
-+			.sort((p1, p2) => p1.order - p2.order);
-+	}
-+
-+	public getPinnedPanels(): PanelDescriptor[] {
-+		const pinnedCompositeIds = this.compositeBar.getPinnedComposites();
-+		return this.getPanels()
-+			.filter(p => pinnedCompositeIds.indexOf(p.id) !== -1)
-+			.sort((p1, p2) => pinnedCompositeIds.indexOf(p1.id) - pinnedCompositeIds.indexOf(p2.id));
- 	}
- 
- 	setPanelEnablement(id: string, enabled: boolean): void {
-merged
-  result 100644 a27851e15bed2d93b04f59b14c577b57d0f292ea src/vs/workbench/services/panel/common/panelService.ts
-  our    100644 97179ea7bb87d8b3b05ddb5b24aa443c95049e1a src/vs/workbench/services/panel/common/panelService.ts
-@@ -34,11 +34,16 @@
- 	getActivePanel(): IPanel;
- 
- 	/**
--	 * Returns all enabled panels
-+	 * Returns all built-in panels following the default order (Problems - Output - Debug Console - Terminal)
- 	 */
- 	getPanels(): IPanelIdentifier[];
- 
- 	/**
-+	 * Returns pinned panels following the visual order
-+	 */
-+	getPinnedPanels(): IPanelIdentifier[];
-+
-+	/**
- 	 * Enables or disables a panel. Disabled panels are completly hidden from UI.
- 	 * By default all panels are enabled.
- 	 */
-changed in both
-  base   100644 577d37ad5b3c3dab82e555df46b05f954b8c35f5 src/vs/workbench/services/progress/test/progressService.test.ts
-  our    100644 f1f23e0cea1675e568fd737db6e8614af1d045b5 src/vs/workbench/services/progress/test/progressService.test.ts
-  their  100644 53ae1e10027d27526f10e6bc76d39cab136a9191 src/vs/workbench/services/progress/test/progressService.test.ts
-@@ -75,6 +75,10 @@
- 		return [];
- 	}
- 
-+	public getPinnedPanels(): any[] {
-+		return [];
-+	}
-+
- 	public getActivePanel(): IViewlet {
- 		return activeViewlet;
- 	}
diff --git a/app/test/fixtures/merge-parser/vscode/merge-optout-locale-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-optout-locale-into-master.txt
deleted file mode 100644
index 768e9267c5a..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-optout-locale-into-master.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-changed in both
-  base   100644 3c76c9bedb4020c6d0f9ffd27f085228835a0c62 src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.ts
-  our    100644 62b0d5e5916a6f6112790efcd1f0e99d13ae68e4 src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.ts
-  their  100644 d82683942567c08668fbd5ea4e5d33bc518802a9 src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.ts
-@@ -98,9 +98,15 @@
- 					.then(translation => {
- 						const translationsFromPack = translation && translation.contents ? translation.contents['vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut'] : {};
- 						if (!!translationsFromPack[promptMessageKey] && !!translationsFromPack[yesLabelKey] && !!translationsFromPack[noLabelKey]) {
-+<<<<<<< .our
- 							promptMessage = translationsFromPack[promptMessageKey].replace('{0}', this.privacyUrl) + ' (Please help Microsoft improve Visual Studio Code by allowing the collection of usage data.)';
- 							yesLabel = translationsFromPack[yesLabelKey] + ' (Yes)';
- 							noLabel = translationsFromPack[noLabelKey] + ' (No)';
-+=======
-+							promptMessage = translationsFromPack[promptMessageKey].replace('{0}', this.privacyUrl);
-+							yesLabel = translationsFromPack[yesLabelKey];
-+							noLabel = translationsFromPack[noLabelKey];
-+>>>>>>> .their
- 						}
- 						return undefined;
- 					});
diff --git a/app/test/fixtures/merge-parser/vscode/merge-pr-32164-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-pr-32164-into-master.txt
deleted file mode 100644
index 31c180bb617..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-pr-32164-into-master.txt
+++ /dev/null
@@ -1,766 +0,0 @@
-changed in both
-  base   100644 313e090044b1a07db59c28e930cf5d4b4dcd3571 src/vs/editor/common/editorCommon.ts
-  our    100644 8ab17ce6977a746a13f9fe016e9948d332de49ca src/vs/editor/common/editorCommon.ts
-  their  100644 22bff69581baa9e825895d55985d5e47fda3f2d0 src/vs/editor/common/editorCommon.ts
-@@ -141,6 +141,758 @@
- 	readonly modifiedEndColumn: number;
- }
- /**
-+<<<<<<< .our
-+=======
-+ * A textual read-only model.
-+ */
-+export interface ITextModel {
-+
-+	/**
-+	 * If true, the text model might contain RTL.
-+	 * If false, the text model **contains only** contain LTR.
-+	 * @internal
-+	 */
-+	mightContainRTL(): boolean;
-+
-+	/**
-+	 * If true, the text model might contain non basic ASCII.
-+	 * If false, the text model **contains only** basic ASCII.
-+	 * @internal
-+	 */
-+	mightContainNonBasicASCII(): boolean;
-+
-+	/**
-+	 * Get the resolved options for this model.
-+	 */
-+	getOptions(): TextModelResolvedOptions;
-+
-+	/**
-+	 * Get the current version id of the model.
-+	 * Anytime a change happens to the model (even undo/redo),
-+	 * the version id is incremented.
-+	 */
-+	getVersionId(): number;
-+
-+	/**
-+	 * Get the alternative version id of the model.
-+	 * This alternative version id is not always incremented,
-+	 * it will return the same values in the case of undo-redo.
-+	 */
-+	getAlternativeVersionId(): number;
-+
-+	/**
-+	 * Replace the entire text buffer value contained in this model.
-+	 */
-+	setValue(newValue: string): void;
-+
-+	/**
-+	 * Replace the entire text buffer value contained in this model.
-+	 * @internal
-+	 */
-+	setValueFromTextSource(newValue: ITextSource): void;
-+
-+	/**
-+	 * Get the text stored in this model.
-+	 * @param eol The end of line character preference. Defaults to `EndOfLinePreference.TextDefined`.
-+	 * @param preserverBOM Preserve a BOM character if it was detected when the model was constructed.
-+	 * @return The text.
-+	 */
-+	getValue(eol?: EndOfLinePreference, preserveBOM?: boolean): string;
-+
-+	/**
-+	 * Get the length of the text stored in this model.
-+	 */
-+	getValueLength(eol?: EndOfLinePreference, preserveBOM?: boolean): number;
-+
-+	/**
-+	 * Check if the raw text stored in this model equals another raw text.
-+	 * @internal
-+	 */
-+	equals(other: ITextSource): boolean;
-+
-+	/**
-+	 * Get the text in a certain range.
-+	 * @param range The range describing what text to get.
-+	 * @param eol The end of line character preference. This will only be used for multiline ranges. Defaults to `EndOfLinePreference.TextDefined`.
-+	 * @return The text.
-+	 */
-+	getValueInRange(range: IRange, eol?: EndOfLinePreference): string;
-+
-+	/**
-+	 * Get the length of text in a certain range.
-+	 * @param range The range describing what text length to get.
-+	 * @return The text length.
-+	 */
-+	getValueLengthInRange(range: IRange): number;
-+
-+	/**
-+	 * Splits characters in two buckets. First bucket (A) is of characters that
-+	 * sit in lines with length < `LONG_LINE_BOUNDARY`. Second bucket (B) is of
-+	 * characters that sit in lines with length >= `LONG_LINE_BOUNDARY`.
-+	 * If count(B) > count(A) return true. Returns false otherwise.
-+	 * @internal
-+	 */
-+	isDominatedByLongLines(): boolean;
-+
-+	/**
-+	 * Get the number of lines in the model.
-+	 */
-+	getLineCount(): number;
-+
-+	/**
-+	 * Get the text for a certain line.
-+	 */
-+	getLineContent(lineNumber: number): string;
-+
-+	/**
-+	 * @internal
-+	 */
-+	getIndentLevel(lineNumber: number): number;
-+
-+	/**
-+	 * @internal
-+	 */
-+	getIndentRanges(): IndentRange[];
-+
-+	/**
-+	 * @internal
-+	 */
-+	getLineIndentGuide(lineNumber: number): number;
-+
-+	/**
-+	 * Get the text for all lines.
-+	 */
-+	getLinesContent(): string[];
-+
-+	/**
-+	 * Get the end of line sequence predominantly used in the text buffer.
-+	 * @return EOL char sequence (e.g.: '\n' or '\r\n').
-+	 */
-+	getEOL(): string;
-+
-+	/**
-+	 * Change the end of line sequence used in the text buffer.
-+	 */
-+	setEOL(eol: EndOfLineSequence): void;
-+
-+	/**
-+	 * Get the minimum legal column for line at `lineNumber`
-+	 */
-+	getLineMinColumn(lineNumber: number): number;
-+
-+	/**
-+	 * Get the maximum legal column for line at `lineNumber`
-+	 */
-+	getLineMaxColumn(lineNumber: number): number;
-+
-+	/**
-+	 * Returns the column before the first non whitespace character for line at `lineNumber`.
-+	 * Returns 0 if line is empty or contains only whitespace.
-+	 */
-+	getLineFirstNonWhitespaceColumn(lineNumber: number): number;
-+
-+	/**
-+	 * Returns the column after the last non whitespace character for line at `lineNumber`.
-+	 * Returns 0 if line is empty or contains only whitespace.
-+	 */
-+	getLineLastNonWhitespaceColumn(lineNumber: number): number;
-+
-+	/**
-+	 * Create a valid position,
-+	 */
-+	validatePosition(position: IPosition): Position;
-+
-+	/**
-+	 * Advances the given position by the given offest (negative offsets are also accepted)
-+	 * and returns it as a new valid position.
-+	 *
-+	 * If the offset and position are such that their combination goes beyond the beginning or
-+	 * end of the model, throws an exception.
-+	 *
-+	 * If the ofsset is such that the new position would be in the middle of a multi-byte
-+	 * line terminator, throws an exception.
-+	 */
-+	modifyPosition(position: IPosition, offset: number): Position;
-+
-+	/**
-+	 * Create a valid range.
-+	 */
-+	validateRange(range: IRange): Range;
-+
-+	/**
-+	 * Converts the position to a zero-based offset.
-+	 *
-+	 * The position will be [adjusted](#TextDocument.validatePosition).
-+	 *
-+	 * @param position A position.
-+	 * @return A valid zero-based offset.
-+	 */
-+	getOffsetAt(position: IPosition): number;
-+
-+	/**
-+	 * Converts a zero-based offset to a position.
-+	 *
-+	 * @param offset A zero-based offset.
-+	 * @return A valid [position](#Position).
-+	 */
-+	getPositionAt(offset: number): Position;
-+
-+	/**
-+	 * Get a range covering the entire model
-+	 */
-+	getFullModelRange(): Range;
-+
-+	/**
-+	 * Returns iff the model was disposed or not.
-+	 */
-+	isDisposed(): boolean;
-+
-+	/**
-+	 * Only basic mode supports allowed on this model because it is simply too large.
-+	 * (tokenization is allowed and other basic supports)
-+	 * @internal
-+	 */
-+	isTooLargeForHavingARichMode(): boolean;
-+
-+	/**
-+	 * The file is so large, that even tokenization is disabled.
-+	 * @internal
-+	 */
-+	isTooLargeForTokenization(): boolean;
-+
-+	/**
-+	 * Search the model.
-+	 * @param searchString The string used to search. If it is a regular expression, set `isRegex` to true.
-+	 * @param searchOnlyEditableRange Limit the searching to only search inside the editable range of the model.
-+	 * @param isRegex Used to indicate that `searchString` is a regular expression.
-+	 * @param matchCase Force the matching to match lower/upper case exactly.
-+	 * @param wordSeparators Force the matching to match entire words only. Pass null otherwise.
-+	 * @param captureMatches The result will contain the captured groups.
-+	 * @param limitResultCount Limit the number of results
-+	 * @return The ranges where the matches are. It is empty if not matches have been found.
-+	 */
-+	findMatches(searchString: string, searchOnlyEditableRange: boolean, isRegex: boolean, matchCase: boolean, wordSeparators: string, captureMatches: boolean, limitResultCount?: number): FindMatch[];
-+	/**
-+	 * Search the model.
-+	 * @param searchString The string used to search. If it is a regular expression, set `isRegex` to true.
-+	 * @param searchScope Limit the searching to only search inside this range.
-+	 * @param isRegex Used to indicate that `searchString` is a regular expression.
-+	 * @param matchCase Force the matching to match lower/upper case exactly.
-+	 * @param wordSeparators Force the matching to match entire words only. Pass null otherwise.
-+	 * @param captureMatches The result will contain the captured groups.
-+	 * @param limitResultCount Limit the number of results
-+	 * @return The ranges where the matches are. It is empty if no matches have been found.
-+	 */
-+	findMatches(searchString: string, searchScope: IRange, isRegex: boolean, matchCase: boolean, wordSeparators: string, captureMatches: boolean, limitResultCount?: number): FindMatch[];
-+	/**
-+	 * Search the model for the next match. Loops to the beginning of the model if needed.
-+	 * @param searchString The string used to search. If it is a regular expression, set `isRegex` to true.
-+	 * @param searchStart Start the searching at the specified position.
-+	 * @param isRegex Used to indicate that `searchString` is a regular expression.
-+	 * @param matchCase Force the matching to match lower/upper case exactly.
-+	 * @param wordSeparators Force the matching to match entire words only. Pass null otherwise.
-+	 * @param captureMatches The result will contain the captured groups.
-+	 * @return The range where the next match is. It is null if no next match has been found.
-+	 */
-+	findNextMatch(searchString: string, searchStart: IPosition, isRegex: boolean, matchCase: boolean, wordSeparators: string, captureMatches: boolean): FindMatch;
-+	/**
-+	 * Search the model for the previous match. Loops to the end of the model if needed.
-+	 * @param searchString The string used to search. If it is a regular expression, set `isRegex` to true.
-+	 * @param searchStart Start the searching at the specified position.
-+	 * @param isRegex Used to indicate that `searchString` is a regular expression.
-+	 * @param matchCase Force the matching to match lower/upper case exactly.
-+	 * @param wordSeparators Force the matching to match entire words only. Pass null otherwise.
-+	 * @param captureMatches The result will contain the captured groups.
-+	 * @return The range where the previous match is. It is null if no previous match has been found.
-+	 */
-+	findPreviousMatch(searchString: string, searchStart: IPosition, isRegex: boolean, matchCase: boolean, wordSeparators: string, captureMatches: boolean): FindMatch;
-+}
-+
-+export class FindMatch {
-+	_findMatchBrand: void;
-+
-+	public readonly range: Range;
-+	public readonly matches: string[];
-+
-+	/**
-+	 * @internal
-+	 */
-+	constructor(range: Range, matches: string[]) {
-+		this.range = range;
-+		this.matches = matches;
-+	}
-+}
-+
-+export interface IReadOnlyModel extends ITextModel {
-+	/**
-+	 * Gets the resource associated with this editor model.
-+	 */
-+	readonly uri: URI;
-+
-+	/**
-+	 * Get the language associated with this model.
-+	 * @internal
-+	 */
-+	getLanguageIdentifier(): LanguageIdentifier;
-+
-+	/**
-+	 * Get the language associated with this model.
-+	 */
-+	getModeId(): string;
-+
-+	/**
-+	 * Get the word under or besides `position`.
-+	 * @param position The position to look for a word.
-+	 * @param skipSyntaxTokens Ignore syntax tokens, as identified by the mode.
-+	 * @return The word under or besides `position`. Might be null.
-+	 */
-+	getWordAtPosition(position: IPosition): IWordAtPosition;
-+
-+	/**
-+	 * Get the word under or besides `position` trimmed to `position`.column
-+	 * @param position The position to look for a word.
-+	 * @param skipSyntaxTokens Ignore syntax tokens, as identified by the mode.
-+	 * @return The word under or besides `position`. Will never be null.
-+	 */
-+	getWordUntilPosition(position: IPosition): IWordAtPosition;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface IFoundBracket {
-+	range: Range;
-+	open: string;
-+	close: string;
-+	isOpen: boolean;
-+}
-+
-+/**
-+ * A model that is tokenized.
-+ */
-+export interface ITokenizedModel extends ITextModel {
-+
-+	/**
-+	 * Force tokenization information for `lineNumber` to be accurate.
-+	 * @internal
-+	 */
-+	forceTokenization(lineNumber: number): void;
-+
-+	/**
-+	 * Get the tokens for the line `lineNumber`.
-+	 * The tokens might be inaccurate. Use `forceTokenization` to ensure accurate tokens.
-+	 * @internal
-+	 */
-+	getLineTokens(lineNumber: number): LineTokens;
-+
-+	/**
-+	 * Get the language associated with this model.
-+	 * @internal
-+	 */
-+	getLanguageIdentifier(): LanguageIdentifier;
-+
-+	/**
-+	 * Get the language associated with this model.
-+	 */
-+	getModeId(): string;
-+
-+	/**
-+	 * Set the current language mode associated with the model.
-+	 * @internal
-+	 */
-+	setMode(languageIdentifier: LanguageIdentifier): void;
-+
-+	/**
-+	 * Returns the real (inner-most) language mode at a given position.
-+	 * The result might be inaccurate. Use `forceTokenization` to ensure accurate tokens.
-+	 * @internal
-+	 */
-+	getLanguageIdAtPosition(lineNumber: number, column: number): LanguageId;
-+
-+	/**
-+	 * Get the word under or besides `position`.
-+	 * @param position The position to look for a word.
-+	 * @param skipSyntaxTokens Ignore syntax tokens, as identified by the mode.
-+	 * @return The word under or besides `position`. Might be null.
-+	 */
-+	getWordAtPosition(position: IPosition): IWordAtPosition;
-+
-+	/**
-+	 * Get the word under or besides `position` trimmed to `position`.column
-+	 * @param position The position to look for a word.
-+	 * @param skipSyntaxTokens Ignore syntax tokens, as identified by the mode.
-+	 * @return The word under or besides `position`. Will never be null.
-+	 */
-+	getWordUntilPosition(position: IPosition): IWordAtPosition;
-+
-+	/**
-+	 * Find the matching bracket of `request` up, counting brackets.
-+	 * @param request The bracket we're searching for
-+	 * @param position The position at which to start the search.
-+	 * @return The range of the matching bracket, or null if the bracket match was not found.
-+	 * @internal
-+	 */
-+	findMatchingBracketUp(bracket: string, position: IPosition): Range;
-+
-+	/**
-+	 * Find the first bracket in the model before `position`.
-+	 * @param position The position at which to start the search.
-+	 * @return The info for the first bracket before `position`, or null if there are no more brackets before `positions`.
-+	 * @internal
-+	 */
-+	findPrevBracket(position:IPosition): IFoundBracket;
-+
-+	/**
-+	 * Find the first bracket in the model after `position`.
-+	 * @param position The position at which to start the search.
-+	 * @return The info for the first bracket after `position`, or null if there are no more brackets after `positions`.
-+	 * @internal
-+	 */
-+	findNextBracket(position:IPosition): IFoundBracket;
-+
-+	/**
-+	 * Given a `position`, if the position is on top or near a bracket,
-+	 * find the matching bracket of that bracket and return the ranges of both brackets.
-+	 * @param position The position at which to look for a bracket.
-+	 * @internal
-+	 */
-+	matchBracket(position: IPosition): [Range, Range];
-+}
-+
-+/**
-+ * A model that can track markers.
-+ */
-+export interface ITextModelWithMarkers extends ITextModel {
-+	/**
-+	 * @internal
-+	 */
-+	_addMarker(internalDecorationId: number, lineNumber: number, column: number, stickToPreviousCharacter: boolean): string;
-+	/**
-+	 * @internal
-+	 */
-+	_changeMarker(id: string, newLineNumber: number, newColumn: number): void;
-+	/**
-+	 * @internal
-+	 */
-+	_changeMarkerStickiness(id: string, newStickToPreviousCharacter: boolean): void;
-+	/**
-+	 * @internal
-+	 */
-+	_getMarker(id: string): Position;
-+	/**
-+	 * @internal
-+	 */
-+	_removeMarker(id: string): void;
-+}
-+
-+/**
-+ * Describes the behavior of decorations when typing/editing near their edges.
-+ * Note: Please do not edit the values, as they very carefully match `DecorationRangeBehavior`
-+ */
-+export enum TrackedRangeStickiness {
-+	AlwaysGrowsWhenTypingAtEdges = 0,
-+	NeverGrowsWhenTypingAtEdges = 1,
-+	GrowsOnlyWhenTypingBefore = 2,
-+	GrowsOnlyWhenTypingAfter = 3,
-+}
-+
-+/**
-+ * A model that can have decorations.
-+ */
-+export interface ITextModelWithDecorations {
-+	/**
-+	 * Change the decorations. The callback will be called with a change accessor
-+	 * that becomes invalid as soon as the callback finishes executing.
-+	 * This allows for all events to be queued up until the change
-+	 * is completed. Returns whatever the callback returns.
-+	 * @param ownerId Identifies the editor id in which these decorations should appear. If no `ownerId` is provided, the decorations will appear in all editors that attach this model.
-+	 * @internal
-+	 */
-+	changeDecorations<T>(callback: (changeAccessor: IModelDecorationsChangeAccessor) => T, ownerId?: number): T;
-+
-+	/**
-+	 * Perform a minimum ammount of operations, in order to transform the decorations
-+	 * identified by `oldDecorations` to the decorations described by `newDecorations`
-+	 * and returns the new identifiers associated with the resulting decorations.
-+	 *
-+	 * @param oldDecorations Array containing previous decorations identifiers.
-+	 * @param newDecorations Array describing what decorations should result after the call.
-+	 * @param ownerId Identifies the editor id in which these decorations should appear. If no `ownerId` is provided, the decorations will appear in all editors that attach this model.
-+	 * @return An array containing the new decorations identifiers.
-+	 */
-+	deltaDecorations(oldDecorations: string[], newDecorations: IModelDeltaDecoration[], ownerId?: number): string[];
-+
-+	/**
-+	 * Remove all decorations that have been added with this specific ownerId.
-+	 * @param ownerId The owner id to search for.
-+	 * @internal
-+	 */
-+	removeAllDecorationsWithOwnerId(ownerId: number): void;
-+
-+	/**
-+	 * Get the options associated with a decoration.
-+	 * @param id The decoration id.
-+	 * @return The decoration options or null if the decoration was not found.
-+	 */
-+	getDecorationOptions(id: string): IModelDecorationOptions;
-+
-+	/**
-+	 * Get the range associated with a decoration.
-+	 * @param id The decoration id.
-+	 * @return The decoration range or null if the decoration was not found.
-+	 */
-+	getDecorationRange(id: string): Range;
-+
-+	/**
-+	 * Gets all the decorations for the line `lineNumber` as an array.
-+	 * @param lineNumber The line number
-+	 * @param ownerId If set, it will ignore decorations belonging to other owners.
-+	 * @param filterOutValidation If set, it will ignore decorations specific to validation (i.e. warnings, errors).
-+	 * @return An array with the decorations
-+	 */
-+	getLineDecorations(lineNumber: number, ownerId?: number, filterOutValidation?: boolean): IModelDecoration[];
-+
-+	/**
-+	 * Gets all the decorations for the lines between `startLineNumber` and `endLineNumber` as an array.
-+	 * @param startLineNumber The start line number
-+	 * @param endLineNumber The end line number
-+	 * @param ownerId If set, it will ignore decorations belonging to other owners.
-+	 * @param filterOutValidation If set, it will ignore decorations specific to validation (i.e. warnings, errors).
-+	 * @return An array with the decorations
-+	 */
-+	getLinesDecorations(startLineNumber: number, endLineNumber: number, ownerId?: number, filterOutValidation?: boolean): IModelDecoration[];
-+
-+	/**
-+	 * Gets all the deocorations in a range as an array. Only `startLineNumber` and `endLineNumber` from `range` are used for filtering.
-+	 * So for now it returns all the decorations on the same line as `range`.
-+	 * @param range The range to search in
-+	 * @param ownerId If set, it will ignore decorations belonging to other owners.
-+	 * @param filterOutValidation If set, it will ignore decorations specific to validation (i.e. warnings, errors).
-+	 * @return An array with the decorations
-+	 */
-+	getDecorationsInRange(range: IRange, ownerId?: number, filterOutValidation?: boolean): IModelDecoration[];
-+
-+	/**
-+	 * Gets all the decorations as an array.
-+	 * @param ownerId If set, it will ignore decorations belonging to other owners.
-+	 * @param filterOutValidation If set, it will ignore decorations specific to validation (i.e. warnings, errors).
-+	 */
-+	getAllDecorations(ownerId?: number, filterOutValidation?: boolean): IModelDecoration[];
-+}
-+
-+/**
-+ * An editable text model.
-+ */
-+export interface IEditableTextModel extends ITextModelWithMarkers {
-+
-+	/**
-+	 * Normalize a string containing whitespace according to indentation rules (converts to spaces or to tabs).
-+	 */
-+	normalizeIndentation(str: string): string;
-+
-+	/**
-+	 * Get what is considered to be one indent (e.g. a tab character or 4 spaces, etc.).
-+	 */
-+	getOneIndent(): string;
-+
-+	/**
-+	 * Change the options of this model.
-+	 */
-+	updateOptions(newOpts: ITextModelUpdateOptions): void;
-+
-+	/**
-+	 * Detect the indentation options for this model from its content.
-+	 */
-+	detectIndentation(defaultInsertSpaces: boolean, defaultTabSize: number): void;
-+
-+	/**
-+	 * Push a stack element onto the undo stack. This acts as an undo/redo point.
-+	 * The idea is to use `pushEditOperations` to edit the model and then to
-+	 * `pushStackElement` to create an undo/redo stop point.
-+	 */
-+	pushStackElement(): void;
-+
-+	/**
-+	 * Push edit operations, basically editing the model. This is the preferred way
-+	 * of editing the model. The edit operations will land on the undo stack.
-+	 * @param beforeCursorState The cursor state before the edit operaions. This cursor state will be returned when `undo` or `redo` are invoked.
-+	 * @param editOperations The edit operations.
-+	 * @param cursorStateComputer A callback that can compute the resulting cursors state after the edit operations have been executed.
-+	 * @return The cursor state returned by the `cursorStateComputer`.
-+	 */
-+	pushEditOperations(beforeCursorState: Selection[], editOperations: IIdentifiedSingleEditOperation[], cursorStateComputer: ICursorStateComputer): Selection[];
-+
-+	/**
-+	 * Edit the model without adding the edits to the undo stack.
-+	 * This can have dire consequences on the undo stack! See @pushEditOperations for the preferred way.
-+	 * @param operations The edit operations.
-+	 * @return The inverse edit operations, that, when applied, will bring the model back to the previous state.
-+	 */
-+	applyEdits(operations: IIdentifiedSingleEditOperation[]): IIdentifiedSingleEditOperation[];
-+
-+	/**
-+	 * Undo edit operations until the first previous stop point created by `pushStackElement`.
-+	 * The inverse edit operations will be pushed on the redo stack.
-+	 * @internal
-+	 */
-+	undo(): Selection[];
-+
-+	/**
-+	 * Redo edit operations until the next stop point created by `pushStackElement`.
-+	 * The inverse edit operations will be pushed on the undo stack.
-+	 * @internal
-+	 */
-+	redo(): Selection[];
-+
-+	/**
-+	 * Set an editable range on the model.
-+	 * @internal
-+	 */
-+	setEditableRange(range: IRange): void;
-+
-+	/**
-+	 * Check if the model has an editable range.
-+	 * @internal
-+	 */
-+	hasEditableRange(): boolean;
-+
-+	/**
-+	 * Get the editable range on the model.
-+	 * @internal
-+	 */
-+	getEditableRange(): Range;
-+}
-+
-+/**
-+ * A model.
-+ */
-+export interface IModel extends IReadOnlyModel, IEditableTextModel, ITextModelWithMarkers, ITokenizedModel, ITextModelWithDecorations {
-+	/**
-+	 * @deprecated Please use `onDidChangeContent` instead.
-+	 * An event emitted when the contents of the model have changed.
-+	 * @internal
-+	 * @event
-+	 */
-+	onDidChangeRawContent(listener: (e: ModelRawContentChangedEvent) => void): IDisposable;
-+	/**
-+	 * An event emitted when the contents of the model have changed.
-+	 * @event
-+	 */
-+	onDidChangeContent(listener: (e: IModelContentChangedEvent) => void): IDisposable;
-+	/**
-+	 * An event emitted when decorations of the model have changed.
-+	 * @event
-+	 */
-+	onDidChangeDecorations(listener: (e: IModelDecorationsChangedEvent) => void): IDisposable;
-+	/**
-+	 * An event emitted when the model options have changed.
-+	 * @event
-+	 */
-+	onDidChangeOptions(listener: (e: IModelOptionsChangedEvent) => void): IDisposable;
-+	/**
-+	 * An event emitted when the language associated with the model has changed.
-+	 * @event
-+	 */
-+	onDidChangeLanguage(listener: (e: IModelLanguageChangedEvent) => void): IDisposable;
-+	/**
-+	 * An event emitted right before disposing the model.
-+	 * @event
-+	 */
-+	onWillDispose(listener: () => void): IDisposable;
-+
-+	/**
-+	 * @internal
-+	 */
-+	addBulkListener(listener: BulkListenerCallback): IDisposable;
-+
-+	/**
-+	 * A unique identifier associated with this model.
-+	 */
-+	readonly id: string;
-+
-+	/**
-+	 * Destroy this model. This will unbind the model from the mode
-+	 * and make all necessary clean-up to release this object to the GC.
-+	 * @internal
-+	 */
-+	destroy(): void;
-+
-+	/**
-+	 * Destroy this model. This will unbind the model from the mode
-+	 * and make all necessary clean-up to release this object to the GC.
-+	 */
-+	dispose(): void;
-+
-+	/**
-+	 * @internal
-+	 */
-+	onBeforeAttached(): void;
-+
-+	/**
-+	 * @internal
-+	 */
-+	onBeforeDetached(): void;
-+
-+	/**
-+	 * Returns iff this model is attached to an editor or not.
-+	 * @internal
-+	 */
-+	isAttachedToEditor(): boolean;
-+}
-+
-+/**
-+ * A model for the diff editor.
-+ */
-+export interface IDiffEditorModel {
-+	/**
-+	 * Original model.
-+	 */
-+	original: IModel;
-+	/**
-+	 * Modified model.
-+	 */
-+	modified: IModel;
-+}
-+
-+/**
-+ * An event describing that an editor has had its model reset (i.e. `editor.setModel()`).
-+ */
-+export interface IModelChangedEvent {
-+	/**
-+	 * The `uri` of the previous model or null.
-+	 */
-+	readonly oldModelUrl: URI;
-+	/**
-+	 * The `uri` of the new model or null.
-+	 */
-+	readonly newModelUrl: URI;
-+}
-+
-+export interface IDimension {
-+	width: number;
-+	height: number;
-+}
-+
-+/**
-+ * A change
-+ */
-+export interface IChange {
-+	readonly originalStartLineNumber: number;
-+	readonly originalEndLineNumber: number;
-+	readonly modifiedStartLineNumber: number;
-+	readonly modifiedEndLineNumber: number;
-+}
-+/**
-+ * A character level change.
-+ */
-+export interface ICharChange extends IChange {
-+	readonly originalStartColumn: number;
-+	readonly originalEndColumn: number;
-+	readonly modifiedStartColumn: number;
-+	readonly modifiedEndColumn: number;
-+}
-+/**
-+>>>>>>> .their
-  * A line change
-  */
- export interface ILineChange extends IChange {
-removed in local
-  base   100644 47b9d0f2f0b4a5067ae7f63055b77caca2dd5176 src/vs/editor/contrib/smartSelect/common/smartSelect.ts
-  their  100644 af05efa2df2fc3748af8949e72b8f261f3198076 src/vs/editor/contrib/smartSelect/common/smartSelect.ts
diff --git a/app/test/fixtures/merge-parser/vscode/merge-pr-49730-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-pr-49730-into-master.txt
deleted file mode 100644
index 6cd4e1a2a07..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-pr-49730-into-master.txt
+++ /dev/null
@@ -1,255 +0,0 @@
-changed in both
-  base   100644 f30d884421176e7e698743be9d1664f1593eeb7c src/vs/code/electron-main/windows.ts
-  our    100644 ee30f9a282b84b1fa9b3443b77acf86849589d43 src/vs/code/electron-main/windows.ts
-  their  100644 25f7781bf91dff2e311e6e3e2007d9a059d1bc6c src/vs/code/electron-main/windows.ts
-@@ -20,8 +20,13 @@
- import { ILifecycleService, UnloadReason, IWindowUnloadEvent } from 'vs/platform/lifecycle/electron-main/lifecycleMain';
- import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
- import { ILogService } from 'vs/platform/log/common/log';
-+<<<<<<< .our
- import { IWindowSettings, OpenContext, IPath, IWindowConfiguration, INativeOpenDialogOptions, ReadyState, IPathsToWaitFor, IEnterWorkspaceResult, IMessageBoxResult } from 'vs/platform/windows/common/windows';
- import { getLastActiveWindow, findBestWindowOrFolderForFile, findWindowOnWorkspace, findWindowOnExtensionDevelopmentPath, findWindowOnWorkspaceOrFolderUri } from 'vs/code/node/windowsFinder';
-+=======
-+import { IWindowSettings, OpenContext, IPath, IWindowConfiguration, INativeOpenDialogOptions, ReadyState, IPathsToWaitFor, IEnterWorkspaceResult, IMessageBoxResult, IOpenOptions } from 'vs/platform/windows/common/windows';
-+import { getLastActiveWindow, findBestWindowOrFolderForFile, findWindowOnWorkspace, findWindowOnExtensionDevelopmentPath, findWindowOnWorkspaceOrFolderPath } from 'vs/code/node/windowsFinder';
-+>>>>>>> .their
- import { Event as CommonEvent, Emitter } from 'vs/base/common/event';
- import product from 'vs/platform/node/product';
- import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-@@ -68,24 +73,27 @@
- 
- type RestoreWindowsSetting = 'all' | 'folders' | 'one' | 'none';
- 
--interface IOpenBrowserWindowOptions {
--	userEnv?: IProcessEnvironment;
--	cli?: ParsedArgs;
--
-+interface IOpenBrowserWindowOptions extends IOpenOptions {
- 	workspace?: IWorkspaceIdentifier;
-+<<<<<<< .our
- 	folderUri?: URI;
- 
- 	initialStartup?: boolean;
- 
-+=======
-+	folderPath?: string;
-+>>>>>>> .their
- 	filesToOpen?: IPath[];
- 	filesToCreate?: IPath[];
- 	filesToDiff?: IPath[];
- 	filesToWait?: IPathsToWaitFor;
-+<<<<<<< .our
- 
- 	forceNewWindow?: boolean;
- 	forceNewTabbedWindow?: boolean;
-+=======
-+>>>>>>> .their
- 	windowToUse?: ICodeWindow;
--
- 	emptyWindowBackupFolder?: string;
- }
- 
-@@ -743,10 +751,13 @@
- 	}
- 
- 	private doOpenFolderOrWorkspace(openConfig: IOpenConfiguration, folderOrWorkspace: IPathToOpen, forceNewWindow: boolean, filesToOpen: IPath[], filesToCreate: IPath[], filesToDiff: IPath[], filesToWait: IPathsToWaitFor, windowToUse?: ICodeWindow): ICodeWindow {
-+<<<<<<< .our
- 		if (!forceNewWindow && !windowToUse && typeof openConfig.contextWindowId === 'number') {
- 			windowToUse = this.getWindowById(openConfig.contextWindowId); // fix for https://github.com/Microsoft/vscode/issues/49587
- 		}
- 
-+=======
-+>>>>>>> .their
- 		const browserWindow = this.openInBrowserWindow({
- 			userEnv: openConfig.userEnv,
- 			cli: openConfig.cli,
-@@ -758,8 +769,12 @@
- 			filesToDiff,
- 			filesToWait,
- 			forceNewWindow,
-+<<<<<<< .our
- 			forceNewTabbedWindow: openConfig.forceNewTabbedWindow,
- 			windowToUse
-+=======
-+			windowToUse: windowToUse || this.getWindowById(openConfig.targetWindowId)
-+>>>>>>> .their
- 		});
- 
- 		return browserWindow;
-@@ -1173,11 +1188,14 @@
- 		openConfig.cli['file-uri'] = fileUris;
- 
- 		// Open it
-+<<<<<<< .our
- 		this.open({ context: openConfig.context, cli: openConfig.cli, forceNewWindow: true, forceEmpty: !cliArgs.length && !folderUris.length && !fileUris.length, userEnv: openConfig.userEnv });
-+=======
-+		this.open({ targetWindowId: openConfig.targetWindowId, context: openConfig.context, cli: openConfig.cli, forceNewWindow: true, forceEmpty: openConfig.cli._.length === 0, userEnv: openConfig.userEnv });
-+>>>>>>> .their
- 	}
- 
- 	private openInBrowserWindow(options: IOpenBrowserWindowOptions): ICodeWindow {
--
- 		// Build IWindowConfiguration from config and options
- 		const configuration: IWindowConfiguration = mixin({}, options.cli); // inherit all properties from CLI
- 		configuration.appRoot = this.environmentService.appRoot;
-changed in both
-  base   100644 bb161524a5079839e4046d5a7ec3ab1d5d97a73f src/vs/platform/windows/common/windows.ts
-  our    100644 4b199d0e3e970d59ca6eb0194473ee4a4e86b954 src/vs/platform/windows/common/windows.ts
-  their  100644 ca7a10879d4312c829663641015634b62d55d9df src/vs/platform/windows/common/windows.ts
-@@ -97,6 +97,21 @@
- 	mode: 'right' | 'bottom' | 'undocked' | 'detach';
- }
- 
-+export interface IOpenWindowOptions {
-+	forceNewWindow?: boolean;
-+	forceReuseWindow?: boolean;
-+	forceOpenWorkspaceAsFile?: boolean;
-+	targetWindowId?: number;
-+}
-+
-+export interface IOpenOptions {
-+	cli?: ParsedArgs;
-+	userEnv?: IProcessEnvironment;
-+	targetWindowId?: number;
-+	initialStartup?: boolean;
-+	forceNewWindow?: boolean;
-+}
-+
- export interface IWindowsService {
- 
- 	_serviceBrand: any;
-@@ -158,7 +173,11 @@
- 	toggleSharedProcess(): TPromise<void>;
- 
- 	// Global methods
-+<<<<<<< .our
- 	openWindow(windowId: number, paths: URI[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean, args?: ParsedArgs }): TPromise<void>;
-+=======
-+	openWindow(paths: string[], options?: IOpenWindowOptions): TPromise<void>;
-+>>>>>>> .their
- 	openNewWindow(): TPromise<void>;
- 	showWindow(windowId: number): TPromise<void>;
- 	getWindows(): TPromise<{ id: number; workspace?: IWorkspaceIdentifier; folderUri?: ISingleFolderWorkspaceIdentifier; title: string; filename?: string; }[]>;
-changed in both
-  base   100644 8e3877562be6d9087c8344a302e8fd85d6590efc src/vs/platform/windows/electron-main/windows.ts
-  our    100644 20b7711912c4db633052e4e4941fa5b15b602380 src/vs/platform/windows/electron-main/windows.ts
-  their  100644 ef45bbf388b374104b209ac4edadc9b271415b54 src/vs/platform/windows/electron-main/windows.ts
-@@ -6,7 +6,7 @@
- 'use strict';
- 
- import { TPromise } from 'vs/base/common/winjs.base';
--import { OpenContext, IWindowConfiguration, ReadyState, INativeOpenDialogOptions, IEnterWorkspaceResult, IMessageBoxResult } from 'vs/platform/windows/common/windows';
-+import { OpenContext, IWindowConfiguration, ReadyState, INativeOpenDialogOptions, IEnterWorkspaceResult, IMessageBoxResult, IOpenOptions } from 'vs/platform/windows/common/windows';
- import { ParsedArgs } from 'vs/platform/environment/common/environment';
- import { Event } from 'vs/base/common/event';
- import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-@@ -122,8 +122,9 @@
- 	quit(): void;
- }
- 
--export interface IOpenConfiguration {
-+export interface IOpenConfiguration extends IOpenOptions {
- 	context: OpenContext;
-+<<<<<<< .our
- 	contextWindowId?: number;
- 	cli: ParsedArgs;
- 	userEnv?: IProcessEnvironment;
-@@ -131,14 +132,18 @@
- 	preferNewWindow?: boolean;
- 	forceNewWindow?: boolean;
- 	forceNewTabbedWindow?: boolean;
-+=======
-+	pathsToOpen?: string[];
-+	preferNewWindow?: boolean;
-+>>>>>>> .their
- 	forceReuseWindow?: boolean;
- 	forceEmpty?: boolean;
- 	diffMode?: boolean;
- 	addMode?: boolean;
- 	forceOpenWorkspaceAsFile?: boolean;
--	initialStartup?: boolean;
- }
- 
-+
- export interface ISharedProcess {
- 	whenReady(): TPromise<void>;
- 	toggle(): void;
-changed in both
-  base   100644 24c7924ff9ae9bd30e88888d19c64d8dd123d868 src/vs/platform/windows/electron-main/windowsService.ts
-  our    100644 491a34db33038310851a2457e8f367804d67c299 src/vs/platform/windows/electron-main/windowsService.ts
-  their  100644 96a2b7bce843c657cee3d7d693ceb4d30d98b7a9 src/vs/platform/windows/electron-main/windowsService.ts
-@@ -11,7 +11,7 @@
- import { assign } from 'vs/base/common/objects';
- import URI from 'vs/base/common/uri';
- import product from 'vs/platform/node/product';
--import { IWindowsService, OpenContext, INativeOpenDialogOptions, IEnterWorkspaceResult, IMessageBoxResult, IDevToolsOptions } from 'vs/platform/windows/common/windows';
-+import { IWindowsService, OpenContext, INativeOpenDialogOptions, IEnterWorkspaceResult, IMessageBoxResult, IDevToolsOptions, IOpenWindowOptions } from 'vs/platform/windows/common/windows';
- import { IEnvironmentService, ParsedArgs } from 'vs/platform/environment/common/environment';
- import { shell, crashReporter, app, Menu, clipboard } from 'electron';
- import { Event, fromNodeEventEmitter, mapEvent, filterEvent, anyEvent, latch } from 'vs/base/common/event';
-@@ -400,7 +400,11 @@
- 		return TPromise.as(null);
- 	}
- 
-+<<<<<<< .our
- 	openWindow(windowId: number, paths: URI[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean, args?: ParsedArgs }): TPromise<void> {
-+=======
-+	openWindow(paths: string[], options: IOpenWindowOptions = {}): TPromise<void> {
-+>>>>>>> .their
- 		this.logService.trace('windowsService#openWindow');
- 		if (!paths || !paths.length) {
- 			return TPromise.as(null);
-@@ -408,12 +412,18 @@
- 
- 		this.windowsMainService.open({
- 			context: OpenContext.API,
-+<<<<<<< .our
- 			contextWindowId: windowId,
- 			urisToOpen: paths,
- 			cli: options && options.args ? { ...this.environmentService.args, ...options.args } : this.environmentService.args,
- 			forceNewWindow: options && options.forceNewWindow,
- 			forceReuseWindow: options && options.forceReuseWindow,
- 			forceOpenWorkspaceAsFile: options && options.forceOpenWorkspaceAsFile
-+=======
-+			cli: this.environmentService.args,
-+			pathsToOpen: paths,
-+			...options
-+>>>>>>> .their
- 		});
- 
- 		return TPromise.as(null);
-changed in both
-  base   100644 e43e4f7673e5f8853db6714065fcc1ead3580191 src/vs/workbench/parts/files/electron-browser/fileCommands.ts
-  our    100644 38cb4a1c6b995d502359ecceccc8480e423cd6e0 src/vs/workbench/parts/files/electron-browser/fileCommands.ts
-  their  100644 418f7fa7f4cb7d8eac22b0c691742291b364456d src/vs/workbench/parts/files/electron-browser/fileCommands.ts
-@@ -10,6 +10,11 @@
- import { TPromise } from 'vs/base/common/winjs.base';
- import * as labels from 'vs/base/common/labels';
- import URI from 'vs/base/common/uri';
-+<<<<<<< .our
-+=======
-+import { remote } from 'electron';
-+import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
-+>>>>>>> .their
- import { toResource, IEditorCommandsContext } from 'vs/workbench/common/editor';
- import { IWindowsService, IWindowService } from 'vs/platform/windows/common/windows';
- import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-@@ -79,9 +84,18 @@
- export const REMOVE_ROOT_FOLDER_COMMAND_ID = 'removeRootFolder';
- export const REMOVE_ROOT_FOLDER_LABEL = nls.localize('removeFolderFromWorkspace', "Remove Folder from Workspace");
- 
-+<<<<<<< .our
- export const openWindowCommand = (accessor: ServicesAccessor, paths: (string | URI)[], forceNewWindow: boolean) => {
- 	const windowService = accessor.get(IWindowService);
- 	windowService.openWindow(paths.map(p => typeof p === 'string' ? URI.file(p) : p), { forceNewWindow });
-+=======
-+export const openWindowCommand = (accessor: ServicesAccessor, paths: string[], forceNewWindow: boolean) => {
-+	const windowsService = accessor.get(IWindowsService);
-+	const currentWindow = remote.getCurrentWindow();
-+	const targetWindowId = currentWindow && currentWindow.id;
-+
-+	windowsService.openWindow(paths, { forceNewWindow, targetWindowId });
-+>>>>>>> .their
- };
- 
- function save(
diff --git a/app/test/fixtures/merge-parser/vscode/merge-pr-49764-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-pr-49764-into-master.txt
deleted file mode 100644
index d3b7bff653a..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-pr-49764-into-master.txt
+++ /dev/null
@@ -1,218 +0,0 @@
-changed in both
-  base   100644 15d41d443c931e1c1f4b22b8adb5aebd4d3e0a6a src/vs/workbench/parts/debug/browser/media/repl.css
-  our    100644 639dec3263509c20fe934860c23c7771b36d11df src/vs/workbench/parts/debug/browser/media/repl.css
-  their  100644 074e03874d617230ac0ffd269da2c1a780a09ecf src/vs/workbench/parts/debug/browser/media/repl.css
-@@ -170,6 +170,7 @@
- .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-underline { text-decoration: underline; }
- 
- /* Regular and bright color codes are currently treated the same. */
-+<<<<<<< .our
- .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-foreground-30, .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-foreground-90	{ color: gray; }
- .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-foreground-31, .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-foreground-91	{ color: #BE1717; }
- .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-foreground-32, .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-foreground-92	{ color: #338A2F; }
-@@ -223,6 +224,61 @@
- .hc-black .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-background-45, .hc-black .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-background-105 { background-color: #914191; }
- .hc-black .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-background-46, .hc-black .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-background-106 { background-color: #218D8D; }
- .hc-black .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-background-47, .hc-black .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-background-107 { background-color: #707070; }
-+=======
-+.monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-30, .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-90	{ color: gray; }
-+.monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-31, .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-91	{ color: #BE1717; }
-+.monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-32, .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-92	{ color: #338A2F; }
-+.monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-33, .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-93	{ color: #BEB817; }
-+.monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-34, .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-94	{ color: darkblue; }
-+.monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-35, .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-95	{ color: darkmagenta; }
-+.monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-36, .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-96	{ color: darkcyan; }
-+.monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-37, .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-97	{ color: #BDBDBD; }
-+
-+.monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-40, .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-100 { background-color: gray; }
-+.monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-41, .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-101 { background-color: #BE1717; }
-+.monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-42, .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-102 { background-color: #338A2F; }
-+.monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-43, .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-103 { background-color: #BEB817; }
-+.monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-44, .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-104 { background-color: darkblue; }
-+.monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-45, .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-105 { background-color: darkmagenta; }
-+.monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-46, .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-106 { background-color: darkcyan; }
-+.monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-47, .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-107 { background-color: #BDBDBD; }
-+
-+.vs-dark .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-30, .vs-dark .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-90  { color: #A0A0A0; }
-+.vs-dark .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-31, .vs-dark .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-91  { color: #A74747; }
-+.vs-dark .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-32, .vs-dark .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-92  { color: #348F34; }
-+.vs-dark .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-33, .vs-dark .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-93  { color: #5F4C29; }
-+.vs-dark .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-34, .vs-dark .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-94  { color: #6286BB; }
-+.vs-dark .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-35, .vs-dark .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-95  { color: #914191; }
-+.vs-dark .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-36, .vs-dark .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-96  { color: #218D8D; }
-+.vs-dark .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-37, .vs-dark .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-97  { color: #707070; }
-+
-+.vs-dark .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-40, .vs-dark .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-100 { background-color: #A0A0A0; }
-+.vs-dark .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-41, .vs-dark .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-101 { background-color: #A74747; }
-+.vs-dark .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-42, .vs-dark .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-102 { background-color: #348F34; }
-+.vs-dark .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-43, .vs-dark .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-103 { background-color: #5F4C29; }
-+.vs-dark .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-44, .vs-dark .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-104 { background-color: #6286BB; }
-+.vs-dark .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-45, .vs-dark .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-105 { background-color: #914191; }
-+.vs-dark .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-46, .vs-dark .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-106 { background-color: #218D8D; }
-+.vs-dark .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-47, .vs-dark .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-107 { background-color: #707070; }
-+
-+.hc-black .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-30, .hc-black .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-90	{ color: gray; }
-+.hc-black .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-31, .hc-black .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-91	{ color: #A74747; }
-+.hc-black .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-32, .hc-black .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-92	{ color: #348F34; }
-+.hc-black .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-33, .hc-black .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-93	{ color: #5F4C29; }
-+.hc-black .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-34, .hc-black .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-94	{ color: #6286BB; }
-+.hc-black .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-35, .hc-black .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-95	{ color: #914191; }
-+.hc-black .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-36, .hc-black .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-96	{ color: #218D8D; }
-+.hc-black .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-37, .hc-black .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-fg-97	{ color: #707070; }
-+>>>>>>> .their
-+
-+.hc-black .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-40, .hc-black .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-100 { background-color: gray; }
-+.hc-black .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-41, .hc-black .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-101 { background-color: #A74747; }
-+.hc-black .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-42, .hc-black .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-102 { background-color: #348F34; }
-+.hc-black .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-43, .hc-black .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-103 { background-color: #5F4C29; }
-+.hc-black .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-44, .hc-black .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-104 { background-color: #6286BB; }
-+.hc-black .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-45, .hc-black .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-105 { background-color: #914191; }
-+.hc-black .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-46, .hc-black .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-106 { background-color: #218D8D; }
-+.hc-black .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-47, .hc-black .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression .code-bg-107 { background-color: #707070; }
- 
- /* Links */
- .monaco-workbench .repl .repl-tree .monaco-tree .monaco-tree-row > .content > .output.expression a {
-changed in both
-  base   100644 571e040eee475b637a60e87e311d22d677b50f13 src/vs/workbench/parts/debug/electron-browser/replViewer.ts
-  our    100644 e354f781465123204e048a6f387349cb8b6af9c4 src/vs/workbench/parts/debug/electron-browser/replViewer.ts
-  their  100644 fd5bbbcfe03794932801398032a4ac08423239c1 src/vs/workbench/parts/debug/electron-browser/replViewer.ts
-@@ -288,6 +288,139 @@
- 		}
- 	}
- 
-+<<<<<<< .our
-+=======
-+	/**
-+	 * @param text The content to stylize.
-+	 * @returns An {@link HTMLSpanElement} that contains the potentially stylized text.
-+	 */
-+	private handleANSIOutput(text: string): HTMLSpanElement {
-+
-+		const root: HTMLSpanElement = document.createElement('span');
-+		const textLength: number = text.length;
-+
-+		let styleNames: string[] = [];
-+		let currentPos: number = 0;
-+		let buffer: string = '';
-+
-+		while (currentPos < textLength) {
-+
-+			// Potentially an ANSI escape sequence.
-+			// See http://ascii-table.com/ansi-escape-sequences.php & https://en.wikipedia.org/wiki/ANSI_escape_code
-+			if (text.charCodeAt(currentPos) === 27 && text.charAt(currentPos + 1) === '[') {
-+
-+				const startPos: number = currentPos;
-+				currentPos += 2; // Ignore 'Esc[' as it's in every sequence.
-+
-+				let ansiSequence: string = '';
-+				let sequenceFound: boolean = false;
-+
-+				while (currentPos < textLength) {
-+					const char: string = text.charAt(currentPos);
-+					ansiSequence += char;
-+
-+					currentPos++;
-+
-+					if (char.match(/^[ABCDHIJKfhmpsu]$/)) {
-+						sequenceFound = true;
-+						break;
-+					}
-+
-+				}
-+
-+				if (sequenceFound) {
-+
-+					// Flush buffer with previous styles.
-+					this.appendStylizedStringToContainer(root, buffer, styleNames);
-+					buffer = '';
-+
-+					/*
-+					 * Certain ranges that are matched here do not contain real graphics rendition sequences. For
-+					 * the sake of having a simpler expression, they have been included anyway.
-+					 */
-+					if (ansiSequence.match(/^(?:[349][0-7]|10[0-7]|[0-8]|[34]9)(?:;(?:[349][0-7]|10[0-7]|[0-8]|[34]9))*;?m$/)) {
-+
-+						const styleCodes: number[] = ansiSequence.slice(0, -1)	// Remove final 'm' character.
-+							.split(';')											// Separate style codes.
-+							.filter(elem => elem !== '')						// Filter empty elems as '34;m' -> ['34', ''].
-+							.map(elem => parseInt(elem, 10));					// Convert to numbers.
-+
-+						for (let code of styleCodes) {
-+							if (code === 0) {
-+								styleNames = [];
-+							} else if (code === 1) {
-+								styleNames.push('code-bold');
-+							} else if (code === 4) {
-+								styleNames.push('code-underline');
-+							} else if ((code >= 30 && code <= 37) || (code >= 90 && code <= 97)) {
-+								styleNames.push('code-fg-' + code);
-+							} else if (code === 39) {
-+								styleNames = styleNames.filter(style => !style.match(/^code-fg-\d+$/));
-+							} else if ((code >= 40 && code <= 47) || (code >= 100 && code <= 107)) {
-+								styleNames.push('code-bg-' + code);
-+							} else if (code === 49) {
-+								styleNames = styleNames.filter(style => !style.match(/^code-bg-\d+$/));
-+							}
-+						}
-+
-+					} else if (ansiSequence.match(/^.*[ABCDHIJKfhmpsu]$/)) {
-+						// Unsupported sequence so simply hide it.
-+					} else {
-+						sequenceFound = false;
-+					}
-+
-+				}
-+
-+				if (sequenceFound === false) {
-+					/*
-+					 * Reached end of text without ending the escape sequence,
-+					 * or given sequence is currently unsupported. In either
-+					 * case, treat sequence as regular text.
-+					 */
-+					currentPos = startPos + 1;
-+				}
-+
-+			} else {
-+				buffer += text.charAt(currentPos);
-+				currentPos++;
-+			}
-+
-+		}
-+
-+		// Flush remaining text buffer if not empty.
-+		if (buffer) {
-+			this.appendStylizedStringToContainer(root, buffer, styleNames);
-+		}
-+
-+		return root;
-+
-+	}
-+
-+	/**
-+	 * @param root The {@link HTMLElement} to append the content to.
-+	 * @param stringContent The text content to be appended.
-+	 * @param cssClasses The list of CSS styles to apply to the text content.
-+	 */
-+	private appendStylizedStringToContainer(root: HTMLElement, stringContent: string, cssClasses: string[]): void {
-+		if (!root || !stringContent) {
-+			return;
-+		}
-+
-+		const content: string | HTMLElement = this.linkDetector.handleLinks(stringContent);
-+		let container: HTMLElement;
-+
-+		if (typeof content === 'string') {
-+			container = document.createElement('span');
-+			container.textContent = content;
-+		} else {
-+			container = content;
-+		}
-+
-+		container.className = cssClasses.join(' ');
-+		root.appendChild(container);
-+	}
-+
-+>>>>>>> .their
- 	public disposeTemplate(tree: ITree, templateId: string, templateData: any): void {
- 		if (templateData.toDispose) {
- 			lifecycle.dispose(templateData.toDispose);
diff --git a/app/test/fixtures/merge-parser/vscode/merge-prompt-lang-pack-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-prompt-lang-pack-into-master.txt
deleted file mode 100644
index 0c12c48a637..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-prompt-lang-pack-into-master.txt
+++ /dev/null
@@ -1,211 +0,0 @@
-changed in both
-  base   100644 5f091c4f6f35d3c671cb086a3029226bd27e84b7 src/vs/platform/localizations/common/localizations.ts
-  our    100644 1f85c99a746302613217291b616a908ac2599aba src/vs/platform/localizations/common/localizations.ts
-  their  100644 b6361b620a47cb08b48cbd89e41e3afe10d5e7e0 src/vs/platform/localizations/common/localizations.ts
-added in both
-  our    100644 42e71e0a7253edee827a8852745f75cf277153de src/vs/platform/node/minimalTranslations.ts
-  their  100644 11248d86d88e3dc8cd1d6e0b721a03006019c3d1 src/vs/platform/node/minimalTranslations.ts
-@@ -9,9 +9,17 @@
- // So that they are available for VS Code to use without downloading the entire language pack.
- 
- export const minimumTranslatedStrings = {
-+<<<<<<< .our
- 	showLanguagePackExtensions: localize('showLanguagePackExtensions', "Search language packs in the Marketplace to change the display language to {0}."),
- 	searchMarketplace: localize('searchMarketplace', "Search Marketplace"),
- 	installAndRestartMessage: localize('installAndRestartMessage', "Install language pack to change the display language to {0}."),
- 	installAndRestart: localize('installAndRestart', "Install and Restart")
-+=======
-+	showLanguagePackExtensions: localize('showLanguagePackExtensions', "The Marketplace has extensions that can localize VS Code in the {0} language"),
-+	searchMarketplace: localize('searchMarketplace', "Search Marketplace"),
-+	installAndRestartMessage: localize('installAndRestartMessage', "Install language pack to localize VS Code in {0} language. Restart VS Code after installing for the language to take effect."),
-+	installAndRestart: localize('installAndRestart', "Install and Restart"),
-+	install: localize('install', 'Install')
-+>>>>>>> .their
- };
- 
-changed in both
-  base   100644 8736c448bc0e546bc274130beda41e17b4be9492 src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
-  our    100644 6f9d4a74f5feb07a450341f183980ee0a10455a9 src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
-  their  100644 315700baf842e468b2171ca70e0e1f0e7db502f9 src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
-@@ -47,7 +47,10 @@
- const milliSecondsInADay = 1000 * 60 * 60 * 24;
- const choiceNever = localize('neverShowAgain', "Don't Show Again");
- const searchMarketplace = localize('searchMarketplace', "Search Marketplace");
-+<<<<<<< .our
- const processedFileExtensions: string[] = [];
-+=======
-+>>>>>>> .their
- 
- interface IDynamicWorkspaceRecommendations {
- 	remoteSet: string[];
-@@ -117,7 +120,13 @@
- 			this._extensionsRecommendationsUrl = product.extensionsGallery.recommendationsUrl;
- 		}
- 
-+<<<<<<< .our
- 		this.sessionSeed = +new Date();
-+=======
-+		this.getCachedDynamicWorkspaceRecommendations();
-+		this._suggestFileBasedRecommendations();
-+		this.promptWorkspaceRecommendationsPromise = this._suggestWorkspaceRecommendations();
-+>>>>>>> .their
- 
- 		let globallyIgnored = <string[]>JSON.parse(this.storageService.get('extensionsAssistant/ignored_recommendations', StorageScope.GLOBAL, '[]'));
- 		this._globallyIgnoredRecommendations = globallyIgnored.map(id => id.toLowerCase());
-changed in both
-  base   100644 ff59ed77adfc6768ac025fa199e1504ad19710b7 src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.ts
-  our    100644 052de75c677677d839ae5533561df1d9238d3218 src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.ts
-  their  100644 11ee1e141aa52c77728598cda50a56f37fa452b3 src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.ts
-@@ -101,6 +101,7 @@
- 	private checkAndInstall(): void {
- 		const language = platform.language;
- 		const locale = platform.locale;
-+<<<<<<< .our
- 		const languagePackSuggestionIgnoreList = <string[]>JSON.parse(this.storageService.get('extensionsAssistant/languagePackSuggestionIgnore', StorageScope.GLOBAL, '[]'));
- 
- 		if (!this.galleryService.isEnabled()) {
-@@ -109,6 +110,30 @@
- 		if (language === 'en' || language.indexOf('en-') === 0) {
- 			return;
- 		}
-+=======
-+		if (language !== 'en' && language !== 'en_us') {
-+			this.isLanguageInstalled(language)
-+				.then(installed => {
-+					if (!installed) {
-+						this.getLanguagePackExtension(language)
-+							.then(extension => {
-+								if (extension) {
-+									this.notificationService.prompt(Severity.Warning, localize('install language pack', "In the near future, VS Code will only support language packs in the form of Marketplace extensions. Please install the '{0}' extension in order to continue to use the currently configured language. ", extension.displayName || extension.displayName),
-+										[
-+											{ label: localize('install', "Install"), run: () => this.installExtension(extension) },
-+											{ label: localize('more information', "More Information..."), run: () => window.open('https://go.microsoft.com/fwlink/?linkid=872941') }
-+										]);
-+								}
-+							});
-+					}
-+				});
-+			return;
-+		}
-+
-+		const languagePackSuggestionIgnoreList = <string[]>JSON.parse(this.storageService.get
-+			('extensionsAssistant/languagePackSuggestionIgnore', StorageScope.GLOBAL, '[]'));
-+
-+>>>>>>> .their
- 		if (language === locale || languagePackSuggestionIgnoreList.indexOf(language) > -1) {
- 			return;
- 		}
-@@ -119,6 +144,7 @@
- 					return;
- 				}
- 
-+<<<<<<< .our
- 				this.galleryService.query({ text: `tag:lp-${locale}` }).then(tagResult => {
- 					if (tagResult.total === 0) {
- 						return;
-@@ -148,6 +174,105 @@
- 									translations[key] = `${translationsFromPack[key].replace('{0}', languageDisplayName)} (${minimumTranslatedStrings[key].replace('{0}', languageName)})`;
- 								}
- 							});
-+=======
-+				const ceintlExtensionSearch = this.galleryService.query({ names: [`MS-CEINTL.vscode-language-pack-${locale}`], pageSize: 1 });
-+				const tagSearch = this.galleryService.query({ text: `tag:lp-${locale}`, pageSize: 1 });
-+
-+				TPromise.join([ceintlExtensionSearch, tagSearch]).then(([ceintlResult, tagResult]) => {
-+					if (ceintlResult.total === 0 && tagResult.total === 0) {
-+						return;
-+					}
-+
-+					const extensionToInstall = ceintlResult.total === 1 ? ceintlResult.firstPage[0] : tagResult.total === 1 ? tagResult.firstPage[0] : null;
-+					const extensionToFetchTranslationsFrom = extensionToInstall || tagResult.total > 0 ? tagResult.firstPage[0] : null;
-+
-+					if (!extensionToFetchTranslationsFrom || !extensionToFetchTranslationsFrom.assets.manifest) {
-+						return;
-+					}
-+
-+					this.galleryService.getManifest(extensionToFetchTranslationsFrom).then(x => {
-+						if (!x.contributes || !x.contributes.localizations) {
-+							return;
-+						}
-+						const locContribution = x.contributes.localizations.filter(x => x.languageId.toLowerCase() === locale)[0];
-+						if (!locContribution) {
-+							return;
-+						}
-+
-+						const translations = {
-+							...minimumTranslatedStrings,
-+							...(locContribution.minimalTranslations || {})
-+						};
-+
-+						const logUserReaction = (userReaction: string) => {
-+							/* __GDPR__
-+								"languagePackSuggestion:popup" : {
-+									"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-+									"language": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-+								}
-+							*/
-+							this.telemetryService.publicLog('languagePackSuggestion:popup', { userReaction, language });
-+						};
-+
-+						const searchAction = {
-+							label: translations['searchMarketplace'],
-+							run: () => {
-+								logUserReaction('search');
-+								this.viewletService.openViewlet(EXTENSIONS_VIEWLET_ID, true)
-+									.then(viewlet => viewlet as IExtensionsViewlet)
-+									.then(viewlet => {
-+										viewlet.search(`tag:lp-${locale}`);
-+										viewlet.focus();
-+									});
-+							}
-+						};
-+
-+						const installAction = {
-+							label: translations['install'],
-+							run: () => {
-+								logUserReaction('install');
-+								this.installExtension(extensionToInstall);
-+							}
-+						};
-+
-+						const installAndRestartAction = {
-+							label: translations['installAndRestart'],
-+							run: () => {
-+								logUserReaction('installAndRestart');
-+								this.installExtension(extensionToInstall).then(() => this.windowsService.relaunch({}));
-+							}
-+						};
-+
-+						const mainActions = extensionToInstall ? [installAndRestartAction, installAction] : [searchAction];
-+						const promptMessage = translations[extensionToInstall ? 'installAndRestartMessage' : 'showLanguagePackExtensions']
-+							.replace('{0}', locContribution.languageNameLocalized || locContribution.languageName || locale);
-+
-+						this.notificationService.prompt(
-+							Severity.Info,
-+							promptMessage,
-+							[...mainActions,
-+							{
-+								label: localize('neverAgain', "Don't Show Again"),
-+								isSecondary: true,
-+								run: () => {
-+									languagePackSuggestionIgnoreList.push(language);
-+									this.storageService.store(
-+										'extensionsAssistant/languagePackSuggestionIgnore',
-+										JSON.stringify(languagePackSuggestionIgnoreList),
-+										StorageScope.GLOBAL
-+									);
-+									logUserReaction('neverShowAgain');
-+								}
-+							}],
-+							() => {
-+								logUserReaction('cancelled');
-+							}
-+						);
-+
-+					});
-+				});
-+			});
-+>>>>>>> .their
- 
- 							const logUserReaction = (userReaction: string) => {
- 								/* __GDPR__
diff --git a/app/test/fixtures/merge-parser/vscode/merge-ramyar-auto-check-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-ramyar-auto-check-into-master.txt
deleted file mode 100644
index 5b1ad9f40f2..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-ramyar-auto-check-into-master.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-changed in both
-  base   100644 bf50d9d44ae0c8b2d6956edb5a7fd510254ec68c src/vs/workbench/parts/extensions/common/extensions.ts
-  our    100644 f80eddc2997bb323b4ddc2fa04965332cdf133ab src/vs/workbench/parts/extensions/common/extensions.ts
-  their  100644 4a08d9122f7bb1ade6e791762669cdc51bf9dc17 src/vs/workbench/parts/extensions/common/extensions.ts
-changed in both
-  base   100644 51008b00d240b45bd94745334b74b1f8d6c13fb9 src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts
-  our    100644 5ce89339923c3f8305329edee9c2f811f190aaa7 src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts
-  their  100644 9bd31f7a383846d7d067767d4e4092be7907dcd1 src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts
-@@ -216,6 +216,13 @@
- 				scope: ConfigurationScope.APPLICATION,
- 				tags: ['usesOnlineServices']
- 			},
-+			'extensions.autoCheckUpdates': {
-+				type: 'boolean',
-+				description: localize('extensionsCheckUpdates', "Automatically checks for extension updates. If an extension update is available and the extension auto update feature is disabled, then the extension will appear as outdated in the Extensions view."),
-+				default: true,
-+				scope: ConfigurationScope.APPLICATION,
-+				tags: ['backgroundOnlineFeature']
-+			},
- 			'extensions.ignoreRecommendations': {
- 				type: 'boolean',
- 				description: localize('extensionsIgnoreRecommendations', "When enabled, the notifications for extension recommendations will not be shown."),
-changed in both
-  base   100644 8804517eaa16d5378ca66df3f2945d4644f92ef3 src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
-  our    100644 dde370485c80817a804989c810abe2f1db9c0966 src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
-  their  100644 5930310b95e18f917a88acfaf6160b84a8974345 src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
-changed in both
-  base   100644 eca3169eca8e83f33c8b5d1908950ecc64b86b64 src/vs/workbench/parts/extensions/test/electron-browser/extensionsWorkbenchService.test.ts
-  our    100644 7da387ac880b0ed21957601ffcf9fbb9f1133d6f src/vs/workbench/parts/extensions/test/electron-browser/extensionsWorkbenchService.test.ts
-  their  100644 0ac82bf88a28f708dd2a8ed8061be641750d5a07 src/vs/workbench/parts/extensions/test/electron-browser/extensionsWorkbenchService.test.ts
-@@ -66,6 +66,7 @@
- 		instantiationService.stub(IURLService, URLService);
- 
- 		instantiationService.stub(IWorkspaceContextService, new TestContextService());
-+<<<<<<< .our
- 		instantiationService.stub(IConfigurationService, {
- 			onDidUpdateConfiguration: () => { },
- 			onDidChangeConfiguration: () => { },
-@@ -74,6 +75,9 @@
- 				return (key === AutoCheckUpdatesConfigurationKey || key === AutoUpdateConfigurationKey) ? true : undefined;
- 			}
- 		});
-+=======
-+		instantiationService.stub(IConfigurationService, { onDidUpdateConfiguration: () => { }, onDidChangeConfiguration: () => { }, getConfiguration: () => ({}), getValue: () => { } });
-+>>>>>>> .their
- 
- 		instantiationService.stub(IExtensionManagementService, ExtensionManagementService);
- 		instantiationService.stub(IExtensionManagementService, 'onInstallExtension', installEvent.event);
diff --git a/app/test/fixtures/merge-parser/vscode/merge-ramyar-auto-update-overload-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-ramyar-auto-update-overload-into-master.txt
deleted file mode 100644
index cde4635db91..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-ramyar-auto-update-overload-into-master.txt
+++ /dev/null
@@ -1,160 +0,0 @@
-changed in both
-  base   100644 bf50d9d44ae0c8b2d6956edb5a7fd510254ec68c src/vs/workbench/parts/extensions/common/extensions.ts
-  our    100644 f80eddc2997bb323b4ddc2fa04965332cdf133ab src/vs/workbench/parts/extensions/common/extensions.ts
-  their  100644 06c9fb537670cd8385fa17e8a8722cbf16021283 src/vs/workbench/parts/extensions/common/extensions.ts
-@@ -100,8 +100,12 @@
- export const CloseExtensionDetailsOnViewChangeKey = 'extensions.closeExtensionDetailsOnViewChange';
- 
- export interface IExtensionsConfiguration {
-+<<<<<<< .our
- 	autoUpdate: boolean;
- 	autoCheckUpdates: boolean;
-+=======
-+	autoUpdate: string;
-+>>>>>>> .their
- 	ignoreRecommendations: boolean;
- 	showRecommendationsOnlyOnDemand: boolean;
- 	closeExtensionDetailsOnViewChange: boolean;
-changed in both
-  base   100644 cccfee273b820b18018d92dd3bcb120c3323b062 src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts
-  our    100644 5ce89339923c3f8305329edee9c2f811f190aaa7 src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts
-  their  100644 1c0d5ac939280f96b2b9cd716fe0eddc4929a59b src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts
-@@ -203,6 +203,7 @@
- 		type: 'object',
- 		properties: {
- 			'extensions.autoUpdate': {
-+<<<<<<< .our
- 				type: 'boolean',
- 				description: localize('extensionsAutoUpdate', "When enabled, automatically installs updates for extensions. The updates are fetched from an online service."),
- 				default: true,
-@@ -213,6 +214,17 @@
- 				type: 'boolean',
- 				description: localize('extensionsCheckUpdates', "When enabled, automatically checks extensions for updates. If an extension has an update, it is marked as outdated in the Extensions view. The updates are fetched from an online service."),
- 				default: true,
-+=======
-+				type: 'string',
-+				enum: ['checkAndInstall', 'check', 'off'],
-+				enumDescriptions: [
-+					localize('extensionsAutoUpdateCheckAndInstall', "Install extension updates automatically in the background."),
-+					localize('extensionsAutoUpdateCheck', "Check for extension updates and mark extensions with available updates as outdated in the extensions view."),
-+					localize('extensionsAutoUpdateOff', "No checks are made automatically for extension updates. You can still manually check for updates using the `Extension: Check for Updates` command."),
-+				],
-+				description: localize('extensionsAutoUpdate', "Controls whether VS Code should check for and/or install extension updates in the background."),
-+				default: 'checkAndInstall',
-+>>>>>>> .their
- 				scope: ConfigurationScope.APPLICATION,
- 				tags: ['usesOnlineServices']
- 			},
-changed in both
-  base   100644 ce4e5210290c112bb2ae57c2b69a2e4045cbcff9 src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts
-  our    100644 645a6674587a8dca8742c11040e726c40a9702ff src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts
-  their  100644 1f0adb9254fdfd60c1dff0eac223efeffa1171f2 src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts
-@@ -792,7 +792,6 @@
- }
- 
- export class ToggleAutoUpdateAction extends Action {
--
- 	constructor(
- 		id: string,
- 		label: string,
-@@ -800,16 +799,10 @@
- 		@IConfigurationService private configurationService: IConfigurationService
- 	) {
- 		super(id, label, '', true);
--		this.updateEnablement();
--		configurationService.onDidChangeConfiguration(() => this.updateEnablement());
--	}
--
--	private updateEnablement(): void {
--		this.enabled = this.configurationService.getValue(AutoUpdateConfigurationKey) !== this.autoUpdateValue;
- 	}
- 
- 	run(): TPromise<any> {
--		return this.configurationService.updateValue(AutoUpdateConfigurationKey, this.autoUpdateValue);
-+		return this.configurationService.updateValue(AutoUpdateConfigurationKey, this.autoUpdateValue ? 'checkAndInstall' : 'check');
- 	}
- }
- 
-changed in both
-  base   100644 bc834b46f368612971da5284c0c450f78e65e160 src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
-  our    100644 0deb9a35143336ac44f10debedd6afdf4d47c48d src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
-  their  100644 9b7ab5ff77ee31ee9a4321f09e651291b2849987 src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
-@@ -386,6 +386,7 @@
- 					this.groupByServerAction.enabled = !value || ExtensionsListView.isInstalledExtensionsQuery(value) || ExtensionsListView.isBuiltInExtensionsQuery(value);
- 				}));
- 			}
-+			const autoUpdateConfigValue = this.configurationService.getValue(AutoUpdateConfigurationKey);
- 			this.secondaryActions = [
- 				this.instantiationService.createInstance(ShowInstalledExtensionsAction, ShowInstalledExtensionsAction.ID, ShowInstalledExtensionsAction.LABEL),
- 				this.instantiationService.createInstance(ShowOutdatedExtensionsAction, ShowOutdatedExtensionsAction.ID, ShowOutdatedExtensionsAction.LABEL),
-@@ -401,7 +402,7 @@
- 				new Separator(),
- 				...(this.extensionManagementServerService.extensionManagementServers.length > 1 ? [this.groupByServerAction, new Separator()] : []),
- 				this.instantiationService.createInstance(CheckForUpdatesAction, CheckForUpdatesAction.ID, CheckForUpdatesAction.LABEL),
--				...(this.configurationService.getValue(AutoUpdateConfigurationKey) ? [this.instantiationService.createInstance(DisableAutoUpdateAction, DisableAutoUpdateAction.ID, DisableAutoUpdateAction.LABEL)] : [this.instantiationService.createInstance(UpdateAllAction, UpdateAllAction.ID, UpdateAllAction.LABEL), this.instantiationService.createInstance(EnableAutoUpdateAction, EnableAutoUpdateAction.ID, EnableAutoUpdateAction.LABEL)]),
-+				...((autoUpdateConfigValue === true || autoUpdateConfigValue === 'checkAndInstall') ? [this.instantiationService.createInstance(DisableAutoUpdateAction, DisableAutoUpdateAction.ID, DisableAutoUpdateAction.LABEL)] : [this.instantiationService.createInstance(UpdateAllAction, UpdateAllAction.ID, UpdateAllAction.LABEL), this.instantiationService.createInstance(EnableAutoUpdateAction, EnableAutoUpdateAction.ID, EnableAutoUpdateAction.LABEL)]),
- 				this.instantiationService.createInstance(InstallVSIXAction, InstallVSIXAction.ID, InstallVSIXAction.LABEL),
- 				new Separator(),
- 				this.instantiationService.createInstance(DisableAllAction, DisableAllAction.ID, DisableAllAction.LABEL),
-changed in both
-  base   100644 8804517eaa16d5378ca66df3f2945d4644f92ef3 src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
-  our    100644 dde370485c80817a804989c810abe2f1db9c0966 src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
-  their  100644 a89d960d8458de142fdff1a498beef264dae78e6 src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
-@@ -409,7 +409,7 @@
- 
- 		this.configurationService.onDidChangeConfiguration(e => {
- 			if (e.affectsConfiguration(AutoUpdateConfigurationKey)) {
--				if (this.isAutoUpdateEnabled()) {
-+				if (this.isSyncEnabled()) {
- 					this.checkForUpdates();
- 				}
- 			}
-@@ -601,7 +601,12 @@
- 	}
- 
- 	private isAutoUpdateEnabled(): boolean {
--		return this.configurationService.getValue(AutoUpdateConfigurationKey);
-+		const configValue = this.configurationService.getValue(AutoUpdateConfigurationKey);
-+		return configValue === true || configValue === 'checkAndInstall';
-+	}
-+
-+	private isSyncEnabled(): boolean {
-+		return this.configurationService.getValue(AutoUpdateConfigurationKey) !== 'off';
- 	}
- 
- 	private isAutoCheckUpdatesEnabled(): boolean {
-@@ -609,8 +614,12 @@
- 	}
- 
- 	private eventuallySyncWithGallery(immediate = false): void {
-+<<<<<<< .our
- 		const shouldSync = this.isAutoUpdateEnabled() || this.isAutoCheckUpdatesEnabled();
- 		const loop = () => (shouldSync ? this.syncWithGallery() : TPromise.as(null)).then(() => this.eventuallySyncWithGallery());
-+=======
-+		const loop = () => (this.isSyncEnabled() ? this.syncWithGallery() : TPromise.as(null)).then(() => this.eventuallySyncWithGallery());
-+>>>>>>> .their
- 		const delay = immediate ? 0 : ExtensionsWorkbenchService.SyncPeriod;
- 
- 		this.syncDelayer.trigger(loop, delay)
-changed in both
-  base   100644 eca3169eca8e83f33c8b5d1908950ecc64b86b64 src/vs/workbench/parts/extensions/test/electron-browser/extensionsWorkbenchService.test.ts
-  our    100644 7da387ac880b0ed21957601ffcf9fbb9f1133d6f src/vs/workbench/parts/extensions/test/electron-browser/extensionsWorkbenchService.test.ts
-  their  100644 0ac82bf88a28f708dd2a8ed8061be641750d5a07 src/vs/workbench/parts/extensions/test/electron-browser/extensionsWorkbenchService.test.ts
-@@ -66,6 +66,7 @@
- 		instantiationService.stub(IURLService, URLService);
- 
- 		instantiationService.stub(IWorkspaceContextService, new TestContextService());
-+<<<<<<< .our
- 		instantiationService.stub(IConfigurationService, {
- 			onDidUpdateConfiguration: () => { },
- 			onDidChangeConfiguration: () => { },
-@@ -74,6 +75,9 @@
- 				return (key === AutoCheckUpdatesConfigurationKey || key === AutoUpdateConfigurationKey) ? true : undefined;
- 			}
- 		});
-+=======
-+		instantiationService.stub(IConfigurationService, { onDidUpdateConfiguration: () => { }, onDidChangeConfiguration: () => { }, getConfiguration: () => ({}), getValue: () => { } });
-+>>>>>>> .their
- 
- 		instantiationService.stub(IExtensionManagementService, ExtensionManagementService);
- 		instantiationService.stub(IExtensionManagementService, 'onInstallExtension', installEvent.event);
diff --git a/app/test/fixtures/merge-parser/vscode/merge-ramyar-json-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-ramyar-json-into-master.txt
deleted file mode 100644
index aa292c0b207..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-ramyar-json-into-master.txt
+++ /dev/null
@@ -1,168 +0,0 @@
-changed in both
-  base   100644 8f167afc9049e8db15fd3175ce33a6ad4738b9f1 OSSREADME.json
-  our    100644 e15cccabcadbd5afb0980967f0af53c135710fc0 OSSREADME.json
-  their  100644 ddfe2a1fa05af54ab5c44aeb8a7cdcafcf729f19 OSSREADME.json
-@@ -51,7 +51,11 @@
- },
- {
- 	"name": "electron",
-+<<<<<<< .our
- 	"version": "2.0.7",
-+=======
-+	"version": "2.0.5",
-+>>>>>>> .their
- 	"license": "MIT",
- 	"repositoryURL": "https://github.com/electron/electron",
- 	"isProd": true
-changed in both
-  base   100644 663f81987ccc076e4b3e08e95663fdd475e09b93 build/builtInExtensions.json
-  our    100644 b3efcd2cc657706605008661521b555c93a32c16 build/builtInExtensions.json
-  their  100644 e607dada4f85a5d32fa133c9fb0ea836f3a1d185 build/builtInExtensions.json
-@@ -6,7 +6,11 @@
- 	},
- 	{
- 		"name": "ms-vscode.node-debug2",
-+<<<<<<< .our
- 		"version": "1.27.0",
-+=======
-+		"version": "1.26.8",
-+>>>>>>> .their
- 		"repo": "https://github.com/Microsoft/vscode-node-debug2"
- 	}
- ]
-changed in both
-  base   100644 4a4588e38b35333ba0d79b6b7a3f80a890cbf3bb package.json
-  our    100644 d0e982ce0b76c5b1b5eb02b673e459e47f3353a4 package.json
-  their  100644 00364d94c37986c104539c1b7a0131d5c3d4ff87 package.json
-@@ -1,7 +1,12 @@
- {
-   "name": "code-oss-dev",
-+<<<<<<< .our
-   "version": "1.27.0",
-   "distro": "a4155d9780fbbc94ead6cb3017dd0fc3806c57b8",
-+=======
-+  "version": "1.26.0",
-+  "distro": "3962f36fb9f758cc0c608d0c585d50a1f204de3a",
-+>>>>>>> .their
-   "author": {
-     "name": "Microsoft Corporation"
-   },
-changed in both
-  base   100644 b1543ed3d2f9f297cb6222076ea75e8d4a0186da src/vs/platform/theme/common/colorRegistry.ts
-  our    100644 674f67411d4ee542ee937fac9146ef0768ec982d src/vs/platform/theme/common/colorRegistry.ts
-  their  100644 8d984bd6f21c8450d851a4c038289b73296eec90 src/vs/platform/theme/common/colorRegistry.ts
-@@ -223,6 +223,14 @@
- 
- export const progressBarBackground = registerColor('progressBar.background', { dark: Color.fromHex('#0E70C0'), light: Color.fromHex('#0E70C0'), hc: contrastBorder }, nls.localize('progressBarBackground', "Background color of the progress bar that can show for long running operations."));
- 
-+<<<<<<< .our
-+=======
-+export const breadcrumbsForeground = registerColor('breadcrumb.foreground', { light: Color.fromHex('#6C6C6C').transparent(.7), dark: Color.fromHex('#CCCCCC').transparent(.7), hc: Color.white.transparent(.7) }, nls.localize('breadcrumbsFocusForeground', "Color of focused breadcrumb items."));
-+export const breadcrumbsFocusForeground = registerColor('breadcrumb.focusForeground', { light: '#6C6C6C', dark: '#CCCCCC', hc: Color.white }, nls.localize('breadcrumbsFocusForeground', "Color of focused breadcrumb items."));
-+export const breadcrumbsActiveSelectionForeground = registerColor('breadcrumb.activeSelectionForeground', { light: '#6C6C6C', dark: '#CCCCCC', hc: Color.white }, nls.localize('breadcrumbsSelectedForegound', "Color of selected breadcrumb items."));
-+export const breadcrumbsPickerBackground = registerColor('breadcrumbPicker.background', { light: '#ECECEC', dark: '#252526', hc: Color.black }, nls.localize('breadcrumbsSelectedBackground', "Background color of breadcrumb item picker."));
-+
-+>>>>>>> .their
- /**
-  * Editor background color.
-  * Because of bug https://monacotools.visualstudio.com/DefaultCollection/Monaco/_workitems/edit/13254
-removed in local
-  base   100644 b0cbfbf570f3193ab5f142bbbcca373b9c12cb5c src/vs/workbench/browser/parts/menubar/menubarPart.ts
-  their  100644 00f43d61a1077ad0328717e88e9638c44f09f5fc src/vs/workbench/browser/parts/menubar/menubarPart.ts
-changed in both
-  base   100644 8fc5ed3bca172f911cb941e7aa300e1d97bd1963 src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
-  our    100644 3bfb6cffba943bf68a9fa9c24fb1903c66dd3fad src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
-  their  100644 70edc1d5fabc96d5d5c5cd512c403afdba337619 src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
-changed in both
-  base   100644 849d454f33dac6022061ddd66b34aa49cc0d4a06 src/vs/workbench/parts/splash/electron-browser/partsSplash.contribution.ts
-  our    100644 5f76b802ea5a6e6aafeb989856a8672f1d126c9d src/vs/workbench/parts/splash/electron-browser/partsSplash.contribution.ts
-  their  100644 4632aaf6efb6ed7dc220c62187dbb4c1320cda14 src/vs/workbench/parts/splash/electron-browser/partsSplash.contribution.ts
-@@ -17,8 +17,12 @@
- import { IDisposable, dispose } from 'vs/base/common/lifecycle';
- import { debounceEvent } from 'vs/base/common/event';
- import { DEFAULT_EDITOR_MIN_DIMENSIONS } from 'vs/workbench/browser/parts/editor/editor';
-+<<<<<<< .our
- import { ColorIdentifier, editorBackground, foreground } from 'vs/platform/theme/common/colorRegistry';
- import { Color } from 'vs/base/common/color';
-+=======
-+import { ColorIdentifier } from 'vs/platform/theme/common/colorRegistry';
-+>>>>>>> .their
- 
- class PartsSplash {
- 
-@@ -45,10 +49,14 @@
- 	}
- 
- 	private _savePartsSplash() {
-+<<<<<<< .our
- 		const baseTheme = getThemeTypeSelector(this._themeService.getTheme().type);
- 		const colorInfo = {
- 			foreground: this._getThemeColor(foreground),
- 			editorBackground: this._getThemeColor(editorBackground),
-+=======
-+		const colorInfo = {
-+>>>>>>> .their
- 			titleBarBackground: this._getThemeColor(themes.TITLE_BAR_ACTIVE_BACKGROUND),
- 			activityBarBackground: this._getThemeColor(themes.ACTIVITY_BAR_BACKGROUND),
- 			sideBarBackground: this._getThemeColor(themes.SIDE_BAR_BACKGROUND),
-@@ -82,6 +90,12 @@
- 		return color ? color.toString() : undefined;
- 	}
- 
-+	private _getThemeColor(id: ColorIdentifier): string {
-+		const theme = this._themeService.getTheme();
-+		const color = theme.getColor(id);
-+		return color ? color.toString() : undefined;
-+	}
-+
- 	private _removePartsSplash(): void {
- 		let element = document.getElementById(PartsSplash._splashElementId);
- 		if (element) {
-changed in both
-  base   100644 41e23fc99811fdb6c8d80ca026eef510574e9115 src/vs/workbench/services/textfile/common/textFileEditorModel.ts
-  our    100644 6faef447dc315ab88c3c3c652840860db088fa46 src/vs/workbench/services/textfile/common/textFileEditorModel.ts
-  their  100644 aea7e08e8f002716b37dae617a9cc66c113bbd00 src/vs/workbench/services/textfile/common/textFileEditorModel.ts
-@@ -43,7 +43,10 @@
- 	static DEFAULT_CONTENT_CHANGE_BUFFER_DELAY = CONTENT_CHANGE_EVENT_BUFFER_DELAY;
- 	static DEFAULT_ORPHANED_CHANGE_BUFFER_DELAY = 100;
- 	static WHITELIST_JSON = ['package.json', 'package-lock.json', 'tsconfig.json', 'jsconfig.json', 'bower.json', '.eslintrc.json', 'tslint.json', 'composer.json'];
-+<<<<<<< .our
- 	static WHITELIST_WORKSPACE_JSON = ['settings.json', 'extensions.json', 'tasks.json', 'launch.json'];
-+=======
-+>>>>>>> .their
- 
- 	private static saveErrorHandler: ISaveErrorHandler;
- 	static setSaveErrorHandler(handler: ISaveErrorHandler): void { TextFileEditorModel.saveErrorHandler = handler; }
-@@ -839,6 +842,32 @@
- 		return telemetryData;
- 	}
- 
-+	private getTelemetryData(reason: number): Object {
-+		const ext = path.extname(this.resource.fsPath);
-+		const fileName = path.basename(this.resource.fsPath);
-+		const telemetryData = {
-+			mimeType: guessMimeTypes(this.resource.fsPath).join(', '),
-+			ext,
-+			path: this.hashService.createSHA1(this.resource.fsPath),
-+			reason
-+		};
-+
-+		if (ext === '.json' && TextFileEditorModel.WHITELIST_JSON.indexOf(fileName) > -1) {
-+			telemetryData['whitelistedjson'] = fileName;
-+		}
-+
-+		/* __GDPR__FRAGMENT__
-+			"FileTelemetryData" : {
-+				"mimeType" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-+				"ext": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-+				"path": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-+				"reason": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-+				"whitelistedjson": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-+			}
-+		*/
-+		return telemetryData;
-+	}
-+
- 	private doTouch(versionId: number): TPromise<void> {
- 		return this.saveSequentializer.setPending(versionId, this.fileService.updateContent(this.lastResolvedDiskStat.resource, this.createSnapshot(), {
- 			mtime: this.lastResolvedDiskStat.mtime,
diff --git a/app/test/fixtures/merge-parser/vscode/merge-ramyar-npm-online-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-ramyar-npm-online-into-master.txt
deleted file mode 100644
index dfc5cfc26a1..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-ramyar-npm-online-into-master.txt
+++ /dev/null
@@ -1,102 +0,0 @@
-changed in both
-  base   100644 6c8fa19625d784110351bd4290395f29af5accda extensions/npm/README.md
-  our    100644 a24a7d69d6e00ffa80ddaf5841bb6a5225f2c5cf extensions/npm/README.md
-  their  100644 f4b85999742a23b85f035d1b16b7d20aaa5fb157 extensions/npm/README.md
-@@ -26,6 +26,10 @@
- 
- The extension fetches data from https://registry.npmjs/org and https://registry.bower.io to provide auto-completion and information on hover features on npm dependencies.
- 
-+### Others
-+
-+The extension fetches data from https://registry.npmjs/org and https://registry.bower.io to provide auto-completion and information on hover features on npm dependencies.
-+
- ## Settings
- 
- - `npm.autoDetect` - Enable detecting scripts as tasks, the default is `on`.
-changed in both
-  base   100644 df9c903fcb42721bbf356acd58ad97e8dd63dff3 extensions/npm/package.json
-  our    100644 2e478c09e5ec71a0201c841cd3d23ac312a66662 extensions/npm/package.json
-  their  100644 d5647618a81e4e5cad2be67cb761a14fa23894b1 extensions/npm/package.json
-@@ -235,9 +235,13 @@
-           "description": "%config.npm.fetchOnlinePackageInfo%",
-           "default": true,
-           "scope": "window",
-+<<<<<<< .our
-           "tags": [
-             "usesOnlineServices"
-           ]
-+=======
-+          "tags": ["usesOnlineServices"]
-+>>>>>>> .their
-         }
-       }
-     },
-changed in both
-  base   100644 92665d5f65a560eea6dcd0cd9467ddcb794f25b6 extensions/npm/package.nls.json
-  our    100644 4a33bcc0bc3d1ef2c1ecff5b27436054c1c22de4 extensions/npm/package.nls.json
-  their  100644 3a59c27cad1daac60a23764fc4859d67b84a8e1d extensions/npm/package.nls.json
-@@ -6,7 +6,11 @@
- 	"config.npm.packageManager": "The package manager used to run scripts.",
- 	"config.npm.exclude": "Configure glob patterns for folders that should be excluded from automatic script detection.",
- 	"config.npm.enableScriptExplorer": "Enable an explorer view for npm scripts.",
-+<<<<<<< .our
- 	"config.npm.scriptExplorerAction": "The default click action used in the scripts explorer: `open` or `run`, the default is `open`.",
-+=======
-+	"config.npm.scriptExplorerAction": "The default click action used in the scripts explorer: 'open' or 'run', the default is 'open'.",
-+>>>>>>> .their
- 	"config.npm.fetchOnlinePackageInfo": "Fetch data from https://registry.npmjs/org and https://registry.bower.io to provide auto-completion and information on hover features on npm dependencies.",
- 	"npm.parseError": "Npm task detection: failed to parse the file {0}",
- 	"taskdef.script": "The npm script to customize.",
-changed in both
-  base   100644 a00f347078c36cde0dce1566157630bfa7708cf0 extensions/npm/src/features/bowerJSONContribution.ts
-  our    100644 300d7dad1f080fbd4f7956814d7d96fafa5953f5 extensions/npm/src/features/bowerJSONContribution.ts
-  their  100644 038057bf2b2a246b9fb663c84e29c637a13cadb7 extensions/npm/src/features/bowerJSONContribution.ts
-@@ -27,8 +27,22 @@
- 
- 	private xhr: XHRRequest;
- 
-+<<<<<<< .our
- 	public constructor(xhr: XHRRequest) {
- 		this.xhr = xhr;
-+=======
-+	public constructor(httprequestxhr: XHRRequest) {
-+
-+		const getxhr = () => {
-+			return workspace.getConfiguration('npm').get('fetchOnlinePackageInfo') === false ? xhrDisabled : httprequestxhr;
-+		};
-+		this.xhr = getxhr();
-+		workspace.onDidChangeConfiguration((e) => {
-+			if (e.affectsConfiguration('npm.fetchOnlinePackageInfo')) {
-+				this.xhr = getxhr();
-+			}
-+		});
-+>>>>>>> .their
- 	}
- 
- 	public getDocumentSelector(): DocumentSelector {
-changed in both
-  base   100644 b060290eb515eff59b641da312163468afa62d02 extensions/npm/src/features/packageJSONContribution.ts
-  our    100644 38e4ce05310d5937b1baf1927961f6d043e792ec extensions/npm/src/features/packageJSONContribution.ts
-  their  100644 1576ded6a4d107d786a15863ebe104cc14bbafdd extensions/npm/src/features/packageJSONContribution.ts
-@@ -34,8 +34,21 @@
- 		return [{ language: 'json', scheme: '*', pattern: '**/package.json' }];
- 	}
- 
-+<<<<<<< .our
- 	public constructor(xhr: XHRRequest) {
- 		this.xhr = xhr;
-+=======
-+	public constructor(httprequestxhr: XHRRequest) {
-+		const getxhr = () => {
-+			return workspace.getConfiguration('npm').get('fetchOnlinePackageInfo') === false ? xhrDisabled : httprequestxhr;
-+		};
-+		this.xhr = getxhr();
-+		workspace.onDidChangeConfiguration((e) => {
-+			if (e.affectsConfiguration('npm.fetchOnlinePackageInfo')) {
-+				this.xhr = getxhr();
-+			}
-+		});
-+>>>>>>> .their
- 	}
- 
- 	public collectDefaultSuggestions(_fileName: string, result: ISuggestionsCollector): Thenable<any> {
diff --git a/app/test/fixtures/merge-parser/vscode/merge-ramyar-popular-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-ramyar-popular-into-master.txt
deleted file mode 100644
index 4911ca4a480..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-ramyar-popular-into-master.txt
+++ /dev/null
@@ -1,183 +0,0 @@
-merged
-  result 100644 136c7b40a1264c2a8eb6c7e637c6cafbc42bbbd5 src/vs/workbench/parts/extensions/common/extensionQuery.ts
-  our    100644 5f85a0ee0e02263ae6f108290e3cad55b8051b6b src/vs/workbench/parts/extensions/common/extensionQuery.ts
-@@ -13,7 +13,7 @@
- 	}
- 
- 	static suggestions(query: string): string[] {
--		const commands = ['installed', 'outdated', 'enabled', 'disabled', 'builtin', 'recommended', 'sort', 'category', 'tag', 'ext'];
-+		const commands = ['installed', 'outdated', 'enabled', 'disabled', 'builtin', 'recommended', 'sort', 'category', 'tag', 'ext', 'popular'];
- 		const subcommands = {
- 			'sort': ['installs', 'rating', 'name'],
- 			'category': ['"programming languages"', 'snippets', 'linters', 'themes', 'debuggers', 'formatters', 'keymaps', '"scm providers"', 'other', '"extension packs"', '"language packs"'],
-changed in both
-  base   100644 9900d0d5a7aaa8bc48cd9def72a17edac570482f src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts
-  our    100644 645a6674587a8dca8742c11040e726c40a9702ff src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts
-  their  100644 931fad9f43d00f41ff44b591f4f289f8539eb8d8 src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts
-@@ -1161,6 +1161,7 @@
- 
- 	static readonly ID = 'workbench.extensions.action.showPopularExtensions';
- 	static LABEL = localize('showPopularExtensions', "Show Popular Extensions");
-+	static readonly query = '@popular ';
- 
- 	constructor(
- 		id: string,
-@@ -1174,7 +1175,7 @@
- 		return this.viewletService.openViewlet(VIEWLET_ID, true)
- 			.then(viewlet => viewlet as IExtensionsViewlet)
- 			.then(viewlet => {
--				viewlet.search('@sort:installs ');
-+				viewlet.search(ShowPopularExtensionsAction.query);
- 				viewlet.focus();
- 			});
- 	}
-changed in both
-  base   100644 2ba10ccbf6e08efbab2b9e3666a37e6efdd90a18 src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
-  our    100644 0deb9a35143336ac44f10debedd6afdf4d47c48d src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
-  their  100644 1eb5637816db4b60dea582c8c0ea0fe5acd8affa src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
-@@ -29,7 +29,15 @@
- } from 'vs/workbench/parts/extensions/electron-browser/extensionsActions';
- import { LocalExtensionType, IExtensionManagementService, IExtensionManagementServerService, IExtensionManagementServer } from 'vs/platform/extensionManagement/common/extensionManagement';
- import { ExtensionsInput } from 'vs/workbench/parts/extensions/common/extensionsInput';
-+<<<<<<< .our
- import { ExtensionsListView, EnabledExtensionsView, DisabledExtensionsView, RecommendedExtensionsView, WorkspaceRecommendedExtensionsView, BuiltInExtensionsView, BuiltInThemesExtensionsView, BuiltInBasicsExtensionsView, GroupByServerExtensionsView, DefaultRecommendedExtensionsView } from './extensionsViews';
-+=======
-+import {
-+	ExtensionsListView, InstalledExtensionsView, EnabledExtensionsView, DisabledExtensionsView, RecommendedExtensionsView,
-+	WorkspaceRecommendedExtensionsView, BuiltInExtensionsView, BuiltInThemesExtensionsView, BuiltInBasicsExtensionsView,
-+	GroupByServerExtensionsView, DefaultRecommendedExtensionsView, DefaultRecommendedInPopularExtensionsView
-+} from './extensionsViews';
-+>>>>>>> .their
- import { OpenGlobalSettingsAction } from 'vs/workbench/parts/preferences/browser/preferencesActions';
- import { IProgressService } from 'vs/platform/progress/common/progress';
- import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
-@@ -69,6 +77,7 @@
- const RecommendedExtensionsContext = new RawContextKey<boolean>('recommendedExtensions', false);
- const DefaultRecommendedExtensionsContext = new RawContextKey<boolean>('defaultRecommendedExtensions', false);
- const GroupByServersContext = new RawContextKey<boolean>('groupByServersContext', false);
-+const PopularExtensionsContext = new RawContextKey<boolean>('popularExtensions', false);
- 
- export class ExtensionsViewletViewsContribution implements IWorkbenchContribution {
- 
-@@ -87,6 +96,8 @@
- 		viewDescriptors.push(this.createBuiltInExtensionsListViewDescriptor());
- 		viewDescriptors.push(this.createBuiltInBasicsExtensionsListViewDescriptor());
- 		viewDescriptors.push(this.createBuiltInThemesExtensionsListViewDescriptor());
-+		viewDescriptors.push(this.createPopularExtensionsListViewDescriptor());
-+		viewDescriptors.push(this.createRecommendedInPopularExtensionsListViewDescriptor());
- 		viewDescriptors.push(this.createDefaultRecommendedExtensionsListViewDescriptor());
- 		viewDescriptors.push(this.createOtherRecommendedExtensionsListViewDescriptor());
- 		viewDescriptors.push(this.createWorkspaceRecommendedExtensionsListViewDescriptor());
-@@ -106,7 +117,7 @@
- 			name: localize('marketPlace', "Marketplace"),
- 			container: VIEW_CONTAINER,
- 			ctor: ExtensionsListView,
--			when: ContextKeyExpr.and(ContextKeyExpr.has('searchExtensions'), ContextKeyExpr.not('searchInstalledExtensions'), ContextKeyExpr.not('searchBuiltInExtensions'), ContextKeyExpr.not('recommendedExtensions'), ContextKeyExpr.not('groupByServersContext')),
-+			when: ContextKeyExpr.and(ContextKeyExpr.has('searchExtensions'), ContextKeyExpr.not('searchInstalledExtensions'), ContextKeyExpr.not('searchBuiltInExtensions'), ContextKeyExpr.not('recommendedExtensions'), ContextKeyExpr.not('groupByServersContext'), ContextKeyExpr.not('popularExtensions')),
- 			weight: 100
- 		};
- 	}
-@@ -235,6 +246,30 @@
- 			canToggleVisibility: true
- 		};
- 	}
-+
-+	private createPopularExtensionsListViewDescriptor(): IViewDescriptor {
-+		return {
-+			id: 'extensions.popularExtensionsList',
-+			name: localize('popularExtensions', "Popular"),
-+			container: VIEW_CONTAINER,
-+			ctor: ExtensionsListView,
-+			when: ContextKeyExpr.has('popularExtensions'),
-+			weight: 70,
-+			order: 1
-+		};
-+	}
-+
-+	private createRecommendedInPopularExtensionsListViewDescriptor(): IViewDescriptor {
-+		return {
-+			id: 'extensions.recommendedInPopularExtensionsList',
-+			name: localize('recommendedExtensions', "Recommended"),
-+			container: VIEW_CONTAINER,
-+			ctor: DefaultRecommendedInPopularExtensionsView,
-+			when: ContextKeyExpr.and(ContextKeyExpr.has('popularExtensions'), ContextKeyExpr.has('defaultRecommendedExtensions')),
-+			weight: 30,
-+			order: 2
-+		};
-+	}
- }
- 
- export class ExtensionsViewlet extends ViewContainerViewlet implements IExtensionsViewlet {
-@@ -247,6 +282,7 @@
- 	private groupByServersContextKey: IContextKey<boolean>;
- 	private recommendedExtensionsContextKey: IContextKey<boolean>;
- 	private defaultRecommendedExtensionsContextKey: IContextKey<boolean>;
-+	private popularExtensionsContextKey: IContextKey<boolean>;
- 
- 	private searchDelayer: ThrottledDelayer<any>;
- 	private root: HTMLElement;
-@@ -287,6 +323,7 @@
- 		this.groupByServersContextKey = GroupByServersContext.bindTo(contextKeyService);
- 		this.defaultRecommendedExtensionsContextKey = DefaultRecommendedExtensionsContext.bindTo(contextKeyService);
- 		this.defaultRecommendedExtensionsContextKey.set(!this.configurationService.getValue<boolean>(ShowRecommendationsOnlyOnDemandKey));
-+		this.popularExtensionsContextKey = PopularExtensionsContext.bindTo(contextKeyService);
- 		this.disposables.push(this.viewletService.onDidViewletOpen(this.onViewletOpen, this, this.disposables));
- 
- 		this.extensionManagementService.getInstalled(LocalExtensionType.User).then(result => {
-@@ -335,7 +372,18 @@
- 		this.searchBox.onShouldFocusResults(() => this.focusListView(), this, this.disposables);
- 
- 		this.extensionsBox = append(this.root, $('.extensions'));
-+<<<<<<< .our
- 		return super.create(this.extensionsBox);
-+=======
-+		return super.create(this.extensionsBox)
-+			.then(() => this.extensionManagementService.getInstalled(LocalExtensionType.User))
-+			.then(installed => {
-+				if (installed.length === 0) {
-+					this.searchBox.setValue(ShowPopularExtensionsAction.query);
-+					this.searchExtensionsContextKey.set(true);
-+				}
-+			});
-+>>>>>>> .their
- 	}
- 
- 	public updateStyles(): void {
-@@ -424,10 +472,12 @@
- 	}
- 
- 	private normalizedQuery(): string {
--		return this.searchBox.getValue().replace(/@category/g, 'category').replace(/@tag:/g, 'tag:').replace(/@ext:/g, 'ext:');
-+		return this.searchBox.getValue().replace(/@category/g, 'category').replace(/@tag:/g, 'tag:').replace(/@ext:/g, 'ext:').replace(/@popular/g, '@sort:installs');
- 	}
- 
- 	private doSearch(): TPromise<any> {
-+		this.popularExtensionsContextKey.set(this.searchBox.getValue().trim() === ShowPopularExtensionsAction.query.trim());
-+
- 		const value = this.normalizedQuery();
- 		this.searchExtensionsContextKey.set(!!value);
- 		this.searchBuiltInExtensionsContextKey.set(ExtensionsListView.isBuiltInExtensionsQuery(value));
-changed in both
-  base   100644 9857be0c0cbbdc9cdb8cae5fa1e94625f256916c src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
-  our    100644 3bfb6cffba943bf68a9fa9c24fb1903c66dd3fad src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
-  their  100644 0b9307b94ead07e23a135ceedec34f0db3bbe35c src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
-@@ -692,7 +692,19 @@
- 		}
- 		return model;
- 	}
-+}
-+
-+export class DefaultRecommendedInPopularExtensionsView extends DefaultRecommendedExtensionsView {
-+	private readonly popularExtensionsQuery = '@sort:installs';
- 
-+	async show(query: string): Promise<IPagedModel<IExtension>> {
-+		if ((query && query.trim() !== this.popularExtensionsQuery)) {
-+			return this.showEmptyModel();
-+		}
-+		const model = await super.show('');
-+		this.setExpanded(model.length > 0);
-+		return model;
-+	}
- }
- 
- export class RecommendedExtensionsView extends ExtensionsListView {
diff --git a/app/test/fixtures/merge-parser/vscode/merge-rebornix-ActiveSCMProvider-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-rebornix-ActiveSCMProvider-into-master.txt
deleted file mode 100644
index 4c1c85e9514..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-rebornix-ActiveSCMProvider-into-master.txt
+++ /dev/null
@@ -1,165 +0,0 @@
-changed in both
-  base   100644 7f0634707038962af26042da5fe74792a49844b9 src/vs/vscode.proposed.d.ts
-  our    100644 3de4a7af9dda9e3e523ba4b5774f1667d66b0b9b src/vs/vscode.proposed.d.ts
-  their  100644 c6741f379541de20e4a560e11eb5c47da5d41e0c src/vs/vscode.proposed.d.ts
-@@ -521,6 +521,7 @@
- 
- 	//#endregion
- 
-+<<<<<<< .our
- 	//#region Joao: SCM selected provider
- 
- 	export interface SourceControl {
-@@ -536,6 +537,19 @@
- 		readonly onDidChangeSelection: Event<boolean>;
- 	}
- 
-+=======
-+	//#region scm
-+	export namespace scm {
-+		/**
-+		 * The currently active [source control](#SourceControl).
-+		 */
-+		export let activeSourceControl: SourceControl | undefined;
-+		/**
-+		 * An [event](#Event) which fires when the active [source control](#SourceControl) has changed.
-+		 */
-+		export const onDidChangeActiveSourceControl: Event<SourceControl>;
-+	}
-+>>>>>>> .their
- 	//#endregion
- 
- 	//#region Comments
-changed in both
-  base   100644 6bd43da77dc2adf38cf391222b246b2485da0707 src/vs/workbench/api/electron-browser/mainThreadSCM.ts
-  our    100644 a6c6f1caa699f0897aa58c37f2ec9eb1ed252503 src/vs/workbench/api/electron-browser/mainThreadSCM.ts
-  their  100644 584505b14d73f8208ffaca520c57afe3b63c0d85 src/vs/workbench/api/electron-browser/mainThreadSCM.ts
-@@ -263,6 +263,8 @@
- 	private _proxy: ExtHostSCMShape;
- 	private _repositories: { [handle: number]: ISCMRepository; } = Object.create(null);
- 	private _inputDisposables: { [handle: number]: IDisposable; } = Object.create(null);
-+	private _focusDisposables: { [handle: number]: IDisposable; } = Object.create(null);
-+	private _focusedRepository: ISCMRepository | undefined;
- 	private _disposables: IDisposable[] = [];
- 
- 	constructor(
-@@ -284,6 +286,10 @@
- 			.forEach(id => this._inputDisposables[id].dispose());
- 		this._inputDisposables = Object.create(null);
- 
-+		Object.keys(this._focusDisposables)
-+			.forEach(id => this._focusDisposables[id].dispose());
-+		this._focusDisposables = Object.create(null);
-+
- 		this._disposables = dispose(this._disposables);
- 	}
- 
-@@ -292,8 +298,21 @@
- 		const repository = this.scmService.registerSCMProvider(provider);
- 		this._repositories[handle] = repository;
- 
-+		if (!this._focusedRepository) {
-+			this._focusedRepository = repository;
-+			this._proxy.$acceptActiveSourceControlChange(handle);
-+		}
-+
- 		const inputDisposable = repository.input.onDidChange(value => this._proxy.$onInputBoxValueChange(handle, value));
- 		this._inputDisposables[handle] = inputDisposable;
-+
-+		const focusDisposable = repository.onDidFocus(_ => this.onDidFocus(handle, repository));
-+		this._focusDisposables[handle] = focusDisposable;
-+	}
-+
-+	onDidFocus(handle: number, repository: ISCMRepository) {
-+		this._focusedRepository = repository;
-+		this._proxy.$acceptActiveSourceControlChange(handle);
- 	}
- 
- 	$updateSourceControl(handle: number, features: SCMProviderFeatures): void {
-@@ -317,6 +336,9 @@
- 		this._inputDisposables[handle].dispose();
- 		delete this._inputDisposables[handle];
- 
-+		this._focusDisposables[handle].dispose();
-+		delete this._focusDisposables[handle];
-+
- 		repository.dispose();
- 		delete this._repositories[handle];
- 	}
-changed in both
-  base   100644 50fe2efe1f6d1cb7db92dc7b8ab0f1c7217481c3 src/vs/workbench/api/node/extHost.api.impl.ts
-  our    100644 ea64898c5b15cfae4b4ab32d722f4ae4a68f831a src/vs/workbench/api/node/extHost.api.impl.ts
-  their  100644 f05ac0a73707fa6a2921857e53c69edd627c447f src/vs/workbench/api/node/extHost.api.impl.ts
-@@ -609,6 +609,12 @@
- 			get inputBox() {
- 				return extHostSCM.getLastInputBox(extension);
- 			},
-+			get activeSourceControl() {
-+				return extHostSCM.activeSourceControl;
-+			},
-+			get onDidChangeActiveSourceControl() {
-+				return extHostSCM.onDidChangeActiveSourceControl;
-+			},
- 			createSourceControl(id: string, label: string, rootUri?: vscode.Uri) {
- 				return extHostSCM.createSourceControl(extension, id, label, rootUri);
- 			}
-changed in both
-  base   100644 dfef440283760b78760f0c7329c89abab00d4696 src/vs/workbench/api/node/extHost.protocol.ts
-  our    100644 edb764542adfbf0fba64e1b93de7c309bedf0d12 src/vs/workbench/api/node/extHost.protocol.ts
-  their  100644 8b4e21ca8cc25b20ed820757830f657cab9046cc src/vs/workbench/api/node/extHost.protocol.ts
-@@ -882,6 +882,7 @@
- export interface ExtHostSCMShape {
- 	$provideOriginalResource(sourceControlHandle: number, uri: UriComponents): TPromise<UriComponents>;
- 	$onInputBoxValueChange(sourceControlHandle: number, value: string): TPromise<void>;
-+	$acceptActiveSourceControlChange(sourceControlHandle: number): TPromise<void>;
- 	$executeResourceCommand(sourceControlHandle: number, groupHandle: number, handle: number): TPromise<void>;
- 	$validateInput(sourceControlHandle: number, value: string, cursorPosition: number): TPromise<[string, number] | undefined>;
- 	$setSelectedSourceControls(selectedSourceControlHandles: number[]): TPromise<void>;
-changed in both
-  base   100644 b008b72b086f72199402a37543f11a5b7cf69edd src/vs/workbench/api/node/extHostSCM.ts
-  our    100644 2ce26e505301c7bf67464802924edf770775ef05 src/vs/workbench/api/node/extHostSCM.ts
-  their  100644 a1ee5be3e9da62cc5b9c27ec7b5f2ca2e5760ef8 src/vs/workbench/api/node/extHostSCM.ts
-@@ -481,9 +481,12 @@
- 	private _proxy: MainThreadSCMShape;
- 	private _sourceControls: Map<ProviderHandle, ExtHostSourceControl> = new Map<ProviderHandle, ExtHostSourceControl>();
- 	private _sourceControlsByExtension: Map<string, ExtHostSourceControl[]> = new Map<string, ExtHostSourceControl[]>();
--
--	private _onDidChangeActiveProvider = new Emitter<vscode.SourceControl>();
--	get onDidChangeActiveProvider(): Event<vscode.SourceControl> { return this._onDidChangeActiveProvider.event; }
-+	private _activeSourceControl: vscode.SourceControl | undefined;
-+	get activeSourceControl(): vscode.SourceControl | undefined {
-+		return this._activeSourceControl;
-+	}
-+	private _onDidChangeActiveSourceControl = new Emitter<vscode.SourceControl>();
-+	get onDidChangeActiveSourceControl(): Event<vscode.SourceControl> { return this._onDidChangeActiveSourceControl.event; }
- 
- 	private _selectedSourceControlHandles = new Set<number>();
- 
-@@ -584,7 +587,27 @@
- 		return TPromise.as(null);
- 	}
- 
-+<<<<<<< .our
- 	$executeResourceCommand(sourceControlHandle: number, groupHandle: number, handle: number): TPromise<void> {
-+=======
-+	$acceptActiveSourceControlChange(sourceControlHandle: number): TPromise<void> {
-+		this.logService.trace('ExtHostSCM#$acceptActiveSourceControlChange', sourceControlHandle);
-+		const sourceControl = this._sourceControls.get(sourceControlHandle);
-+
-+		if (!sourceControl) {
-+			return TPromise.as(null);
-+		}
-+
-+		if (this._activeSourceControl !== sourceControl) {
-+			this._activeSourceControl = sourceControl;
-+			this._onDidChangeActiveSourceControl.fire(this.activeSourceControl);
-+		}
-+
-+		return TPromise.as(null);
-+	}
-+
-+	async $executeResourceCommand(sourceControlHandle: number, groupHandle: number, handle: number): TPromise<void> {
-+>>>>>>> .their
- 		this.logService.trace('ExtHostSCM#$executeResourceCommand', sourceControlHandle, groupHandle, handle);
- 
- 		const sourceControl = this._sourceControls.get(sourceControlHandle);
diff --git a/app/test/fixtures/merge-parser/vscode/merge-rebornix-ESM-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-rebornix-ESM-into-master.txt
deleted file mode 100644
index 8e6553dc196..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-rebornix-ESM-into-master.txt
+++ /dev/null
@@ -1,5062 +0,0 @@
-added in remote
-  their  100644 a27c17db4ff7a2850ee29945b068a8566316c525 .babelrc
-@@ -0,0 +1,16 @@
-+{
-+	"plugins": [
-+		"./scripts/babel-monaco-plugin.js",
-+		[
-+			"module-resolver",
-+			{
-+				"root": [
-+					"./out-build-esm"
-+				],
-+				"alias": {
-+					"vs": "./out-build-esm/vs"
-+				}
-+			}
-+		]
-+	]
-+}
-\ No newline at end of file
-changed in both
-  base   100644 2445c0c728869d233681984313f3ef189f79fb33 .eslintrc
-  our    100644 675654b0fa66a844d002d6ef424b56c8aa21ce23 .eslintrc
-  their  100644 539f588bfb721b1db8bdbe0bd163c2f6868926c5 .eslintrc
-@@ -10,10 +10,17 @@
- 		"no-extra-semi": "warn",
- 		"semi": "warn"
- 	},
-+<<<<<<< .our
- 	"extends": "eslint:recommended",
- 	"parserOptions": {
- 		"ecmaFeatures": {
- 			"experimentalObjectRestSpread": true
- 		}
- 	}
-+=======
-+	"parserOptions": {
-+		"sourceType": "module"
-+	},
-+	"extends": "eslint:recommended"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d08f65260d3fc89ce44c49c01766e7d25bfe679f .gitignore
-  our    100644 6a9804cd2373e8051bf7b31a2c4dacc67eb9fb69 .gitignore
-  their  100644 0c9bc895383b0888dcae256ff270b58713e819bf .gitignore
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- .DS_Store
- npm-debug.log
- Thumbs.db
-@@ -19,3 +20,22 @@
- test_data/
- test-results/
- yarn-error.log
-+=======
-+.DS_Store
-+npm-debug.log
-+Thumbs.db
-+node_modules/
-+.build/
-+out/
-+out-build/
-+out-build-esm/
-+out-esm/
-+out-editor/
-+out-editor-min/
-+out-monaco-editor-core/
-+out-vscode/
-+out-vscode-min/
-+build/node_modules
-+coverage/
-+test_data/
-+>>>>>>> .their
-changed in both
-  base   100644 1a09abd4f554043e693e676c248e280b22fc1afa build/gulpfile.editor.js
-  our    100644 52d1f0fcf323631277651ff28381ae49c0fa6558 build/gulpfile.editor.js
-  their  100644 4b5d7aee925c71b7ef3f0e8b842bd0806178205b build/gulpfile.editor.js
-@@ -3,6 +3,7 @@
-  *  Licensed under the MIT License. See License.txt in the project root for license information.
-  *--------------------------------------------------------------------------------------------*/
- 
-+<<<<<<< .our
- const gulp = require('gulp');
- const path = require('path');
- const util = require('./lib/util');
-@@ -15,6 +16,15 @@
- const compilation = require('./lib/compilation');
- const monacoapi = require('./monaco/api');
- const fs = require('fs');
-+=======
-+var gulp = require('gulp');
-+var path = require('path');
-+var util = require('./lib/util');
-+var common = require('./lib/optimize');
-+var es = require('event-stream');
-+var File = require('vinyl');
-+var compilation = require('./lib/compilation');
-+>>>>>>> .their
- 
- var root = path.dirname(__dirname);
- var sha1 = util.getVersion(root);
-@@ -310,6 +320,15 @@
- 	console.log(JSON.stringify(detailed, null, '\t'));
- });
- 
-+const rootDir = path.join(__dirname, '../src');
-+const tsOptions = require('../src/tsconfig.esm.json').compilerOptions;
-+tsOptions.verbose = false;
-+tsOptions.sourceMap = true;
-+tsOptions.rootDir = rootDir;
-+tsOptions.sourceRoot = util.toFileUri(rootDir);
-+gulp.task('clean-client-esm-build', util.rimraf('out-build-esm'));
-+gulp.task('compile-client-esm-build', ['clean-client-esm-build'], compilation.compileEditorTask('out-build-esm', true, tsOptions));
-+
- function filterStream(testFunc) {
- 	return es.through(function (data) {
- 		if (!testFunc(data.relative)) {
-changed in both
-  base   100644 97b1ab8367eae817c39ea22b259b515332682772 build/gulpfile.hygiene.js
-  our    100644 6a4cd05d17fefc0e6fdc6e8d0fd2997f3c2894ff build/gulpfile.hygiene.js
-  their  100644 5ca89cf053aa956862b030557f2cdeb2e4914b5d build/gulpfile.hygiene.js
-@@ -66,9 +66,20 @@
- 
- 	// except multiple specific folders
- 	'!**/octicons/**',
-+<<<<<<< .our
- 	'!**/fixtures/**',
- 	'!**/lib/**',
- 	'!extensions/**/out/**',
-+=======
-+	'!**/vs/base/common/marked/raw.marked.js',
-+	'!**/vs/base/common/marked/raw.marked.esm.js',
-+	'!**/vs/base/common/winjs.base.raw.js',
-+	'!**/vs/base/common/winjs.base.esm.js',
-+	'!**/vs/base/node/terminateProcess.sh',
-+	'!**/vs/nls.js',
-+	'!**/vs/css.js',
-+	'!**/vs/loader.js',
-+>>>>>>> .their
- 	'!extensions/**/snippets/**',
- 	'!extensions/**/syntaxes/**',
- 	'!extensions/**/themes/**',
-@@ -120,8 +131,15 @@
- 	'!src/vs/nls.js',
- 	'!src/vs/css.build.js',
- 	'!src/vs/nls.build.js',
-+<<<<<<< .our
- 	'!src/**/winjs.base.js',
- 	'!src/**/marked.js',
-+=======
-+	'!src/**/winjs.base.raw.js',
-+	'!src/**/winjs.base.esm.js',
-+	'!src/**/raw.marked.js',
-+	'!src/**/raw.marked.esm.js',
-+>>>>>>> .their
- 	'!**/test/**'
- ];
- 
-changed in both
-  base   100644 715ceeb4ede77e7d6cccb35c98ce5dd1efcbd255 build/lib/compilation.js
-  our    100644 ad73e2dcf7309fcc9c63b1c1b73c3f86ecac6dca build/lib/compilation.js
-  their  100644 f22f5479ca23b3b2bd683de907b5d791b7e21d67 build/lib/compilation.js
-@@ -18,6 +18,7 @@
- var monacodts = require("../monaco/api");
- var fs = require("fs");
- var reporter = reporter_1.createReporter();
-+<<<<<<< .our
- function getTypeScriptCompilerOptions(src) {
-     var rootDir = path.join(__dirname, "../../" + src);
-     var options = require("../../" + src + "/tsconfig.json").compilerOptions;
-@@ -36,6 +37,19 @@
-     opts.inlineSources = !!build;
-     opts.noFilesystemLookup = true;
-     var ts = tsb.create(opts, null, null, function (err) { return reporter(err.toString()); });
-+=======
-+var rootDir = path.join(__dirname, '../../src');
-+var tsOptions = require('../../src/tsconfig.json').compilerOptions;
-+tsOptions.verbose = false;
-+tsOptions.sourceMap = true;
-+tsOptions.rootDir = rootDir;
-+tsOptions.sourceRoot = util.toFileUri(rootDir);
-+function createCompile(build, options) {
-+    var tsOpts = _.clone(options.overrideTSOptions ? options.overrideTSOptions : tsOptions);
-+    tsOpts.inlineSources = !!build;
-+    tsOpts.noFilesystemLookup = true;
-+    var ts = tsb.create(tsOpts, null, null, function (err) { return reporter(err.toString()); });
-+>>>>>>> .their
-     return function (token) {
-         var utf8Filter = util.filter(function (data) { return /(\/|\\)test(\/|\\).*utf8/.test(data.path); });
-         var tsFilter = util.filter(function (data) { return /\.ts$/.test(data.path); });
-@@ -54,20 +68,30 @@
-             .pipe(sourcemaps.write('.', {
-             addComment: false,
-             includeContent: !!build,
-+<<<<<<< .our
-             sourceRoot: opts.sourceRoot
-+=======
-+            sourceRoot: tsOptions.sourceRoot
-+>>>>>>> .their
-         }))
-             .pipe(tsFilter.restore)
--            .pipe(reporter.end(emitError));
-+            .pipe(reporter.end(options.emitError));
-         return es.duplex(input, output);
-     };
- }
- function compileTask(src, out, build) {
-     return function () {
-+<<<<<<< .our
-         var compile = createCompile(src, build, true);
-         var srcPipe = es.merge(gulp.src(src + "/**", { base: "" + src }), gulp.src('node_modules/typescript/lib/lib.d.ts'));
-         // Do not write .d.ts files to disk, as they are not needed there.
-         var dtsFilter = util.filter(function (data) { return !/\.d\.ts$/.test(data.path); });
-         return srcPipe
-+=======
-+        var compile = createCompile(build, { emitError: true });
-+        var src = es.merge(gulp.src('src/**', { base: 'src' }), gulp.src('node_modules/typescript/lib/lib.d.ts'));
-+        return src
-+>>>>>>> .their
-             .pipe(compile())
-             .pipe(dtsFilter)
-             .pipe(gulp.dest(out))
-@@ -78,7 +102,11 @@
- exports.compileTask = compileTask;
- function watchTask(out, build) {
-     return function () {
-+<<<<<<< .our
-         var compile = createCompile('src', build);
-+=======
-+        var compile = createCompile(build, {});
-+>>>>>>> .their
-         var src = es.merge(gulp.src('src/**', { base: 'src' }), gulp.src('node_modules/typescript/lib/lib.d.ts'));
-         var watchSrc = watch('src/**', { base: 'src' });
-         // Do not write .d.ts files to disk, as they are not needed there.
-@@ -92,6 +120,69 @@
-     };
- }
- exports.watchTask = watchTask;
-+<<<<<<< .our
-+=======
-+function compileEditorTask(out, build, overrideTSOptions) {
-+    return function () {
-+        var compile = createCompile(build, { emitError: true, overrideTSOptions: overrideTSOptions });
-+        var src = es.merge(gulp.src([
-+            "src/**",
-+            "src/vs/base/**/*",
-+            "!src/vs/code/**/*",
-+            "!src/vs/workbench/**",
-+            "!**/test/**",
-+            "!**/node/**",
-+            "!**/electron-main/**",
-+            "!**/electron-browser/**"
-+        ], { base: 'src' }), gulp.src('node_modules/typescript/lib/lib.d.ts'));
-+        return src
-+            .pipe(compile())
-+            .pipe(gulp.dest(out))
-+            .pipe(monacodtsTask(out, false));
-+    };
-+}
-+exports.compileEditorTask = compileEditorTask;
-+function reloadTypeScriptNodeModule() {
-+    var util = require('gulp-util');
-+    function log(message) {
-+        var rest = [];
-+        for (var _i = 1; _i < arguments.length; _i++) {
-+            rest[_i - 1] = arguments[_i];
-+        }
-+        util.log.apply(util, [util.colors.cyan('[memory watch dog]'), message].concat(rest));
-+    }
-+    function heapUsed() {
-+        return (process.memoryUsage().heapUsed / 1024 / 1024).toFixed(2) + ' MB';
-+    }
-+    return es.through(function (data) {
-+        this.emit('data', data);
-+    }, function () {
-+        log('memory usage after compilation finished: ' + heapUsed());
-+        // It appears we are running into some variant of
-+        // https://bugs.chromium.org/p/v8/issues/detail?id=2073
-+        //
-+        // Even though all references are dropped, some
-+        // optimized methods in the TS compiler end up holding references
-+        // to the entire TypeScript language host (>600MB)
-+        //
-+        // The idea is to force v8 to drop references to these
-+        // optimized methods, by "reloading" the typescript node module
-+        log('Reloading typescript node module...');
-+        var resolvedName = require.resolve('typescript');
-+        var originalModule = require.cache[resolvedName];
-+        delete require.cache[resolvedName];
-+        var newExports = require('typescript');
-+        require.cache[resolvedName] = originalModule;
-+        for (var prop in newExports) {
-+            if (newExports.hasOwnProperty(prop)) {
-+                originalModule.exports[prop] = newExports[prop];
-+            }
-+        }
-+        log('typescript node module reloaded.');
-+        this.emit('end');
-+    });
-+}
-+>>>>>>> .their
- function monacodtsTask(out, isWatch) {
-     var basePath = path.resolve(process.cwd(), out);
-     var neededFiles = {};
-changed in both
-  base   100644 f1ca31f36e8fbefc91f7dda653f3b877cf1b3e15 build/lib/compilation.ts
-  our    100644 33d8c11169093df0fd783c944e15dd2444a1594d build/lib/compilation.ts
-  their  100644 5d1367ece7d3186473e9d692c2eb3af920e73b96 build/lib/compilation.ts
-@@ -21,6 +21,7 @@
- 
- const reporter = createReporter();
- 
-+<<<<<<< .our
- function getTypeScriptCompilerOptions(src: string) {
- 	const rootDir = path.join(__dirname, `../../${src}`);
- 	const options = require(`../../${src}/tsconfig.json`).compilerOptions;
-@@ -39,8 +40,21 @@
- 	const opts = _.clone(getTypeScriptCompilerOptions(src));
- 	opts.inlineSources = !!build;
- 	opts.noFilesystemLookup = true;
-+=======
-+const rootDir = path.join(__dirname, '../../src');
-+const tsOptions = require('../../src/tsconfig.json').compilerOptions;
-+tsOptions.verbose = false;
-+tsOptions.sourceMap = true;
-+tsOptions.rootDir = rootDir;
-+tsOptions.sourceRoot = util.toFileUri(rootDir);
- 
--	const ts = tsb.create(opts, null, null, err => reporter(err.toString()));
-+function createCompile(build: boolean, options: { emitError?: boolean, overrideTSOptions?: any }): (token?: util.ICancellationToken) => NodeJS.ReadWriteStream {
-+	const tsOpts = _.clone(options.overrideTSOptions ? options.overrideTSOptions : tsOptions);
-+	tsOpts.inlineSources = !!build;
-+	tsOpts.noFilesystemLookup = true;
-+>>>>>>> .their
-+
-+	const ts = tsb.create(tsOpts, null, null, err => reporter(err.toString()));
- 
- 	return function (token?: util.ICancellationToken) {
- 
-@@ -62,10 +76,14 @@
- 			.pipe(sourcemaps.write('.', {
- 				addComment: false,
- 				includeContent: !!build,
-+<<<<<<< .our
- 				sourceRoot: opts.sourceRoot
-+=======
-+				sourceRoot: tsOptions.sourceRoot
-+>>>>>>> .their
- 			}))
- 			.pipe(tsFilter.restore)
--			.pipe(reporter.end(emitError));
-+			.pipe(reporter.end(options.emitError));
- 
- 		return es.duplex(input, output);
- 	};
-@@ -74,7 +92,11 @@
- export function compileTask(src: string, out: string, build: boolean): () => NodeJS.ReadWriteStream {
- 
- 	return function () {
-+<<<<<<< .our
- 		const compile = createCompile(src, build, true);
-+=======
-+		const compile = createCompile(build, { emitError: true });
-+>>>>>>> .their
- 
- 		const srcPipe = es.merge(
- 			gulp.src(`${src}/**`, { base: `${src}` }),
-@@ -96,7 +118,11 @@
- export function watchTask(out: string, build: boolean): () => NodeJS.ReadWriteStream {
- 
- 	return function () {
-+<<<<<<< .our
- 		const compile = createCompile('src', build);
-+=======
-+		const compile = createCompile(build, {});
-+>>>>>>> .their
- 
- 		const src = es.merge(
- 			gulp.src('src/**', { base: 'src' }),
-@@ -116,6 +142,81 @@
- 	};
- }
- 
-+<<<<<<< .our
-+=======
-+export function compileEditorTask(out: string, build: boolean, overrideTSOptions: any): () => NodeJS.ReadWriteStream {
-+	return function () {
-+		const compile = createCompile(build, { emitError: true, overrideTSOptions: overrideTSOptions });
-+
-+		const src = es.merge(
-+			gulp.src([
-+				"src/**",
-+				"src/vs/base/**/*",
-+				"!src/vs/code/**/*",
-+				"!src/vs/workbench/**",
-+				"!**/test/**",
-+				"!**/node/**",
-+				"!**/electron-main/**",
-+				"!**/electron-browser/**"
-+			], { base: 'src' }),
-+			gulp.src('node_modules/typescript/lib/lib.d.ts'),
-+		);
-+
-+		return src
-+			.pipe(compile())
-+			.pipe(gulp.dest(out))
-+			.pipe(monacodtsTask(out, false));
-+	};
-+}
-+
-+function reloadTypeScriptNodeModule(): NodeJS.ReadWriteStream {
-+	var util = require('gulp-util');
-+	function log(message: any, ...rest: any[]): void {
-+		util.log(util.colors.cyan('[memory watch dog]'), message, ...rest);
-+	}
-+
-+	function heapUsed(): string {
-+		return (process.memoryUsage().heapUsed / 1024 / 1024).toFixed(2) + ' MB';
-+	}
-+
-+	return es.through(function (data) {
-+		this.emit('data', data);
-+	}, function () {
-+
-+		log('memory usage after compilation finished: ' + heapUsed());
-+
-+		// It appears we are running into some variant of
-+		// https://bugs.chromium.org/p/v8/issues/detail?id=2073
-+		//
-+		// Even though all references are dropped, some
-+		// optimized methods in the TS compiler end up holding references
-+		// to the entire TypeScript language host (>600MB)
-+		//
-+		// The idea is to force v8 to drop references to these
-+		// optimized methods, by "reloading" the typescript node module
-+
-+		log('Reloading typescript node module...');
-+
-+		var resolvedName = require.resolve('typescript');
-+
-+		var originalModule = require.cache[resolvedName];
-+		delete require.cache[resolvedName];
-+		var newExports = require('typescript');
-+		require.cache[resolvedName] = originalModule;
-+
-+		for (var prop in newExports) {
-+			if (newExports.hasOwnProperty(prop)) {
-+				originalModule.exports[prop] = newExports[prop];
-+			}
-+		}
-+
-+		log('typescript node module reloaded.');
-+
-+		this.emit('end');
-+	});
-+}
-+
-+>>>>>>> .their
- function monacodtsTask(out: string, isWatch: boolean): NodeJS.ReadWriteStream {
- 
- 	const basePath = path.resolve(process.cwd(), out);
-changed in both
-  base   100644 53dd90bef39327730e4716d61ad2580f1969028d build/lib/nls.js
-  our    100644 a63d36990143a97c7fb2c24d1ef123dfe5945f3a build/lib/nls.js
-  their  100644 3bcbbb3d63829c14d2fef51a3694a20ba06eabeb build/lib/nls.js
-@@ -1,8 +1,8 @@
--"use strict";
- /*---------------------------------------------------------------------------------------------
-  *  Copyright (c) Microsoft Corporation. All rights reserved.
-  *  Licensed under the MIT License. See License.txt in the project root for license information.
-  *--------------------------------------------------------------------------------------------*/
-+"use strict";
- var ts = require("typescript");
- var lazy = require("lazy.js");
- var event_stream_1 = require("event-stream");
-@@ -44,7 +44,7 @@
-         indent = '\t';
-         wrap = '\n';
-     }
--    return "/*---------------------------------------------------------\n * Copyright (C) Microsoft Corporation. All rights reserved.\n *--------------------------------------------------------*/\ndefine([], [" + (wrap + lines.map(function (l) { return indent + l; }).join(',\n') + wrap) + "]);";
-+    return "var brackets = [" + (wrap + lines.map(function (l) { return indent + l; }).join(',\n') + wrap) + "];\nexport const localize = function(index, params) {\n\treturn brackets[index];\n}";
- }
- /**
-  * Returns a stream containing the patched JavaScript and source maps.
-@@ -94,7 +94,7 @@
-         return { line: position.line - 1, character: position.column };
-     }
-     nls_1.lcFrom = lcFrom;
--    var SingleFileServiceHost = /** @class */ (function () {
-+    var SingleFileServiceHost = (function () {
-         function SingleFileServiceHost(options, filename, contents) {
-             var _this = this;
-             this.options = options;
-@@ -203,7 +203,7 @@
-         };
-     }
-     nls_1.analyze = analyze;
--    var TextModel = /** @class */ (function () {
-+    var TextModel = (function () {
-         function TextModel(contents) {
-             var regex = /\r\n|\r|\n/g;
-             var index = 0;
-changed in both
-  base   100644 856470107eccec0994b82f97f09a0b659c2d2568 build/lib/nls.ts
-  our    100644 cffa53a2bd0ea3a7215cd1e136621a2661dd3670 build/lib/nls.ts
-  their  100644 fbdda22669fa08603fb7655f7bf3c47614426b9f build/lib/nls.ts
-@@ -57,10 +57,10 @@
- 		wrap = '\n';
- 	}
- 
--	return `/*---------------------------------------------------------
-- * Copyright (C) Microsoft Corporation. All rights reserved.
-- *--------------------------------------------------------*/
--define([], [${ wrap + lines.map(l => indent + l).join(',\n') + wrap}]);`;
-+	return `var brackets = [${ wrap + lines.map(l => indent + l).join(',\n') + wrap}];
-+export const localize = function(index, params) {
-+	return brackets[index];
-+}`;
- }
- 
- /**
-changed in both
-  base   100644 ff0d1b329792603437d93343f1239f08e4296a19 package.json
-  our    100644 d0e982ce0b76c5b1b5eb02b673e459e47f3353a4 package.json
-  their  100644 b21cf1e0d5ea6f8004855511a4cafcc98231aa0d package.json
-@@ -55,12 +55,25 @@
-   },
-   "devDependencies": {
-     "7zip": "0.0.6",
-+<<<<<<< .our
-     "@types/keytar": "4.0.1",
-     "@types/minimist": "1.2.0",
-     "@types/mocha": "2.2.39",
-     "@types/sinon": "1.16.34",
-     "asar": "^0.14.0",
-     "chromium-pickle-js": "^0.2.0",
-+=======
-+    "@types/keytar": "^4.0.0",
-+    "@types/minimist": "^1.2.0",
-+    "@types/mocha": "^2.2.39",
-+    "@types/semver": "^5.3.30",
-+    "@types/sinon": "^1.16.34",
-+    "@types/winreg": "^1.2.30",
-+    "azure-storage": "^0.3.1",
-+    "babel-cli": "^6.26.0",
-+    "babel-core": "^6.26.0",
-+    "babel-plugin-module-resolver": "^2.7.1",
-+>>>>>>> .their
-     "clean-css": "3.4.6",
-     "copy-webpack-plugin": "^4.5.2",
-     "coveralls": "^2.11.11",
-@@ -114,12 +127,21 @@
-     "queue": "3.0.6",
-     "remap-istanbul": "^0.6.4",
-     "rimraf": "^2.2.8",
-+    "rollup": "0.50.0",
-+    "rollup-plugin-babel": "3.0.2",
-+    "rollup-plugin-typescript": "^0.8.1",
-     "sinon": "^1.17.2",
-     "source-map": "^0.4.4",
-+<<<<<<< .our
-     "ts-loader": "^4.4.2",
-     "tslint": "^5.9.1",
-     "typescript": "2.9.2",
-     "typescript-formatter": "7.1.0",
-+=======
-+    "tslint": "^4.3.1",
-+	"typescript": "2.5.2",
-+    "typescript-formatter": "4.0.1",
-+>>>>>>> .their
-     "uglify-es": "^3.0.18",
-     "underscore": "^1.8.2",
-     "vinyl": "^0.4.5",
-@@ -142,4 +164,4 @@
-     "windows-mutex": "^0.2.0",
-     "windows-process-tree": "0.2.2"
-   }
--}
-\ No newline at end of file
-+}
-added in remote
-  their  100644 3b3010bd3bfa85ac1f82a5a20c03734c03a87970 rollup.js
-@@ -0,0 +1,17 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+var rollup = require("rollup");
-+var babel = require("rollup-plugin-babel");
-+
-+rollup.rollup({
-+	input: "out-build-esm/vs/editor/editor.esm.js",
-+	plugins: [babel()]
-+}).then(function (bundle) {
-+	bundle.write({
-+		file: "out-build-esm/monaco.mjs",
-+		format: "es"
-+	});
-+});
-added in remote
-  their  100644 0ceb75ca5ad5a1df4a0e6c2fc5faa833bf2a7481 scripts/babel-monaco-plugin.js
-@@ -0,0 +1,39 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+'use strict';
-+
-+Object.defineProperty(exports, "__esModule", {
-+	value: true
-+});
-+
-+module.exports = function ({ types: t }) {
-+	return {
-+		visitor: {
-+
-+			ImportDeclaration: {
-+				exit(nodePath, state) {
-+					var source = nodePath.get('source');
-+					if (source.type === 'StringLiteral') {
-+						// console.log(source.node.value);
-+						var moduleName = source.node.value;
-+						if (moduleName.indexOf('vs/nls') >=0) {
-+							source.node.value = './' + state.file.opts.filename.split('/').pop().replace('.js', '.nls.js');
-+						} else if (moduleName.indexOf('vs/css!') >= 0) {
-+							// source.node.value = moduleName.replace(/vs\/css\!/, '').concat('.css');
-+							source.node.value = 'vs/css.esm.js';
-+						} else if (moduleName.indexOf('winjs.base') >= 0 && moduleName.indexOf('winjs.base.raw') < 0) {
-+							source.node.value = source.node.value.replace('winjs.base', 'winjs.base.esm.js');
-+						} else if (moduleName.indexOf('vs/base/common/marked/marked') >= 0) {
-+							source.node.value = source.node.value.replace('vs/base/common/marked/marked', 'vs/base/common/marked/raw.marked.esm.js');
-+						} else if (moduleName.indexOf('.js') < 0) {
-+							source.node.value = moduleName.concat('.js');
-+						}
-+					}
-+				}
-+			}
-+		}
-+	};
-+};
-\ No newline at end of file
-added in remote
-  their  100644 17aeef35c01ae8b74d0e43e585989be08d5b5e18 src/tsconfig.esm.json
-@@ -0,0 +1,18 @@
-+{
-+	"compilerOptions": {
-+		"module": "es2015",
-+		"moduleResolution": "classic",
-+		"noImplicitAny": false,
-+		"removeComments": true,
-+		"preserveConstEnums": true,
-+		"target": "es5",
-+		"sourceMap": false,
-+		"experimentalDecorators": true,
-+		"declaration": true,
-+		"noImplicitReturns": true,
-+		"baseUrl": ".",
-+		"typeRoots": [
-+			"typings"
-+		]
-+	}
-+}
-\ No newline at end of file
-changed in both
-  base   100644 4ab3711618efcf34220d145b08f9dd0be0cb132b src/vs/base/browser/builder.ts
-  our    100644 9c285274a99474b0a9932d403c37f80d148c1ed1 src/vs/base/browser/builder.ts
-  their  100644 daf03321756a68fefed902af9ed650211400ec9c src/vs/base/browser/builder.ts
-@@ -5,8 +5,14 @@
- 'use strict';
- 
- import 'vs/css!./builder';
-+<<<<<<< .our
- import * as types from 'vs/base/common/types';
- import { IDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
-+=======
-+import { TPromise } from 'vs/base/common/winjs.base';
-+import * as types from 'vs/base/common/types';
-+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-+>>>>>>> .their
- import * as strings from 'vs/base/common/strings';
- import * as assert from 'vs/base/common/assert';
- import * as DOM from 'vs/base/browser/dom';
-changed in both
-  base   100644 095e36f8b4bf4920ffc0f4d42150b8b742c8af16 src/vs/base/browser/touch.ts
-  our    100644 5620c65ccb62664741a70455e07979e62c79461f src/vs/base/browser/touch.ts
-  their  100644 59b33fd589ec1e41163aa69d0e4932221cf56dbe src/vs/base/browser/touch.ts
-@@ -7,7 +7,10 @@
- import * as arrays from 'vs/base/common/arrays';
- import { IDisposable, dispose } from 'vs/base/common/lifecycle';
- import * as DomUtils from 'vs/base/browser/dom';
-+<<<<<<< .our
- import { memoize } from 'vs/base/common/decorators';
-+=======
-+>>>>>>> .their
- 
- export namespace EventType {
- 	export const Tap = '-monaco-gesturetap';
-changed in both
-  base   100644 688cb903a45e4b197344148c6cade6f9ef7c8ae4 src/vs/base/browser/ui/actionbar/actionbar.ts
-  our    100644 0dc7a39304b16126c69b25b0abb4a2effaab717d src/vs/base/browser/ui/actionbar/actionbar.ts
-  their  100644 038eda33c64bc0fe282b33dd04574c0e1149ba33 src/vs/base/browser/ui/actionbar/actionbar.ts
-@@ -6,16 +6,29 @@
- 'use strict';
- 
- import 'vs/css!./actionbar';
-+<<<<<<< .our
- import * as platform from 'vs/base/common/platform';
-+=======
-+>>>>>>> .their
- import * as nls from 'vs/nls';
- import * as lifecycle from 'vs/base/common/lifecycle';
- import { TPromise } from 'vs/base/common/winjs.base';
- import { Builder, $ } from 'vs/base/browser/builder';
-+<<<<<<< .our
- import { SelectBox, ISelectBoxOptions } from 'vs/base/browser/ui/selectBox/selectBox';
- import { IAction, IActionRunner, Action, IActionChangeEvent, ActionRunner, IRunEvent } from 'vs/base/common/actions';
- import * as DOM from 'vs/base/browser/dom';
- import * as types from 'vs/base/common/types';
- import { EventType, Gesture } from 'vs/base/browser/touch';
-+=======
-+import { SelectBox } from 'vs/base/browser/ui/selectBox/selectBox';
-+import { IAction, IActionRunner, Action, IActionChangeEvent, ActionRunner } from 'vs/base/common/actions';
-+import * as DOM from 'vs/base/browser/dom';
-+import { EventType as CommonEventType } from 'vs/base/common/events';
-+import * as types from 'vs/base/common/types';
-+import { IEventEmitter, EventEmitter } from 'vs/base/common/eventEmitter';
-+import { Gesture, EventType } from 'vs/base/browser/touch';
-+>>>>>>> .their
- import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
- import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
- import { IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview';
-changed in both
-  base   100644 40b28f69b443d1599891a75d20f6d02e03e8b398 src/vs/base/browser/ui/aria/aria.ts
-  our    100644 61c7dfd348d863dc44cd2aeeb2a7f5080c3e4e3d src/vs/base/browser/ui/aria/aria.ts
-  their  100644 9d59cecfdce9b46b05dab9af11b30fa8d8804392 src/vs/base/browser/ui/aria/aria.ts
-changed in both
-  base   100644 356692bf76601732194fd4ed1c357a9809f5a84e src/vs/base/browser/ui/button/button.ts
-  our    100644 dec147c543de1506718f37f2c9189430227e8531 src/vs/base/browser/ui/button/button.ts
-  their  100644 57bed01e40f0cdb48b7db2a7fea8168367808b94 src/vs/base/browser/ui/button/button.ts
-@@ -6,6 +6,10 @@
- 'use strict';
- 
- import 'vs/css!./button';
-+<<<<<<< .our
-+=======
-+import { EventEmitter } from 'vs/base/common/eventEmitter';
-+>>>>>>> .their
- import * as DOM from 'vs/base/browser/dom';
- import { Builder, $ } from 'vs/base/browser/builder';
- import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-changed in both
-  base   100644 10144ee2c719a772dc3f45cf3073f39afc52f40d src/vs/base/browser/ui/checkbox/checkbox.ts
-  our    100644 1b1c5df85218f97db807c7df91ace9586a21ff40 src/vs/base/browser/ui/checkbox/checkbox.ts
-  their  100644 d47b562e4fdd58cb000a413f8d80449ef6b3d8c4 src/vs/base/browser/ui/checkbox/checkbox.ts
-@@ -6,7 +6,15 @@
- 'use strict';
- 
- import 'vs/css!./checkbox';
-+<<<<<<< .our
- import * as DOM from 'vs/base/browser/dom';
-+=======
-+
-+import * as DOM from 'vs/base/browser/dom';
-+import * as objects from 'vs/base/common/objects';
-+import { KeyCode } from 'vs/base/common/keyCodes';
-+import { Widget } from 'vs/base/browser/ui/widget';
-+>>>>>>> .their
- import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
- import { Widget } from 'vs/base/browser/ui/widget';
- import { Color } from 'vs/base/common/color';
-changed in both
-  base   100644 dfb187b2ae57d7943dcd2e87b45451ace6228d6c src/vs/base/browser/ui/contextview/contextview.ts
-  our    100644 c16fc27af1115c9c89ef5adcf135320ad583520f src/vs/base/browser/ui/contextview/contextview.ts
-  their  100644 a8581e136728bef1c31234dc8796a536b0dc6e7d src/vs/base/browser/ui/contextview/contextview.ts
-@@ -8,7 +8,12 @@
- import 'vs/css!./contextview';
- import { Builder, $ } from 'vs/base/browser/builder';
- import * as DOM from 'vs/base/browser/dom';
-+<<<<<<< .our
- import { IDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
-+=======
-+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-+import { EventEmitter } from 'vs/base/common/eventEmitter';
-+>>>>>>> .their
- 
- export interface IAnchor {
- 	x: number;
-changed in both
-  base   100644 d13e1c2682ca5ebbcc5db73f8e08f63fe5ccacb3 src/vs/base/browser/ui/iconLabel/iconLabel.ts
-  our    100644 74be56db003defdff09c1fd21cf24585cb53ae54 src/vs/base/browser/ui/iconLabel/iconLabel.ts
-  their  100644 3e7752c7287f534fdbf71ba3cefd5c1cd7ef995f src/vs/base/browser/ui/iconLabel/iconLabel.ts
-@@ -9,7 +9,14 @@
- import * as dom from 'vs/base/browser/dom';
- import { HighlightedLabel } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
- import { IMatch } from 'vs/base/common/filters';
-+<<<<<<< .our
- import { IDisposable, combinedDisposable, Disposable } from 'vs/base/common/lifecycle';
-+=======
-+import uri from 'vs/base/common/uri';
-+import * as paths from 'vs/base/common/paths';
-+import { IRootProvider, getPathLabel, IUserHomeProvider } from 'vs/base/common/labels';
-+import { IDisposable, combinedDisposable } from 'vs/base/common/lifecycle';
-+>>>>>>> .their
- 
- export interface IIconLabelCreationOptions {
- 	supportHighlights?: boolean;
-changed in both
-  base   100644 18b09e697e87723c4a1efc71799e42e9070eeddb src/vs/base/browser/ui/inputbox/inputBox.ts
-  our    100644 1691821da48ae0b80b5cd69d2a3d434a6265f2dc src/vs/base/browser/ui/inputbox/inputBox.ts
-  their  100644 caf34bf5bdfb7b1a79817a5439579ca815262aec src/vs/base/browser/ui/inputbox/inputBox.ts
-changed in both
-  base   100644 1f6285529992e19474b123627a402ce7cdc7e3ac src/vs/base/browser/ui/octiconLabel/octiconLabel.mock.ts
-  our    100644 7fb29670d641afcf239c0548b050fb6e7ca41b01 src/vs/base/browser/ui/octiconLabel/octiconLabel.mock.ts
-  their  100644 36b8d07463d2128193b411fe0c1600f3ff5bcbe8 src/vs/base/browser/ui/octiconLabel/octiconLabel.mock.ts
-@@ -2,7 +2,11 @@
-  *  Copyright (c) Microsoft Corporation. All rights reserved.
-  *  Licensed under the MIT License. See License.txt in the project root for license information.
-  *--------------------------------------------------------------------------------------------*/
-+<<<<<<< .our
- 
-+=======
-+import * as octiconLabel from 'vs/base/browser/ui/octiconLabel/octiconLabel';
-+>>>>>>> .their
- import { escape } from 'vs/base/common/strings';
- 
- export function renderOcticons(text: string): string {
-@@ -22,3 +26,12 @@
- 	}
- 
- }
-+<<<<<<< .our
-+=======
-+
-+export var mock: typeof octiconLabel = {
-+	expand: expand,
-+	OcticonLabel: <any>MockOcticonLabel
-+};
-+// export = mock;
-+>>>>>>> .their
-changed in both
-  base   100644 ea34e06e1cbb94506a82d837e8a1946441911e49 src/vs/base/browser/ui/progressbar/progressbar.ts
-  our    100644 602b7d93dd9f8581041d1e2654381f159993faa3 src/vs/base/browser/ui/progressbar/progressbar.ts
-  their  100644 9ddbd6f0936e6a43d7e645ffbd5b4b4948bd7bd7 src/vs/base/browser/ui/progressbar/progressbar.ts
-@@ -6,9 +6,17 @@
- 'use strict';
- 
- import 'vs/css!./progressbar';
-+<<<<<<< .our
- import * as assert from 'vs/base/common/assert';
- import { Builder, $ } from 'vs/base/browser/builder';
- import { Disposable } from 'vs/base/common/lifecycle';
-+=======
-+import { TPromise, ValueCallback } from 'vs/base/common/winjs.base';
-+import * as assert from 'vs/base/common/assert';
-+import { Builder, $ } from 'vs/base/browser/builder';
-+import * as DOM from 'vs/base/browser/dom';
-+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-+>>>>>>> .their
- import { Color } from 'vs/base/common/color';
- import { mixin } from 'vs/base/common/objects';
- 
-removed in local
-  base   100644 762852ab390fe1690acb8fc84c829a1a4cf7a760 src/vs/base/browser/ui/resourceviewer/resourceViewer.ts
-  their  100644 87bb82400d8cd11a9056986778e97d0061b632db src/vs/base/browser/ui/resourceviewer/resourceViewer.ts
-changed in both
-  base   100644 338d07b4681e24fb83856600c66ea65b95082a42 src/vs/base/browser/ui/sash/sash.ts
-  our    100644 45ce480601b8417948e788935de8182f5fbc1171 src/vs/base/browser/ui/sash/sash.ts
-  their  100644 b3f86631889dd068d56b489218455a8e2d89b8fe src/vs/base/browser/ui/sash/sash.ts
-@@ -10,7 +10,13 @@
- import { isIPad } from 'vs/base/browser/browser';
- import { isMacintosh } from 'vs/base/common/platform';
- import * as types from 'vs/base/common/types';
-+<<<<<<< .our
- import { EventType, GestureEvent, Gesture } from 'vs/base/browser/touch';
-+=======
-+import * as DOM from 'vs/base/browser/dom';
-+import { Gesture, EventType, GestureEvent } from 'vs/base/browser/touch';
-+import { EventEmitter } from 'vs/base/common/eventEmitter';
-+>>>>>>> .their
- import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
- import { Event, Emitter } from 'vs/base/common/event';
- import { getElementsByTagName, EventHelper, createStyleSheet, addDisposableListener, append, $, addClass, removeClass, toggleClass } from 'vs/base/browser/dom';
-changed in both
-  base   100644 6faeda7eb200b325f42cba4482502596729835c0 src/vs/base/browser/ui/splitview/splitview.ts
-  our    100644 3f593b721e0e5f25237d90e4a9b2a29fb3997f1a src/vs/base/browser/ui/splitview/splitview.ts
-  their  100644 4d8eb65d299c849f861a9cc6908b5cad54c3f1c3 src/vs/base/browser/ui/splitview/splitview.ts
-@@ -6,6 +6,7 @@
- 'use strict';
- 
- import 'vs/css!./splitview';
-+<<<<<<< .our
- import { IDisposable, combinedDisposable, toDisposable } from 'vs/base/common/lifecycle';
- import { Event, mapEvent, Emitter } from 'vs/base/common/event';
- import * as types from 'vs/base/common/types';
-@@ -13,6 +14,17 @@
- import { clamp } from 'vs/base/common/numbers';
- import { range, firstIndex, pushToStart, pushToEnd } from 'vs/base/common/arrays';
- import { Sash, Orientation, ISashEvent as IBaseSashEvent, SashState } from 'vs/base/browser/ui/sash/sash';
-+=======
-+import * as lifecycle from 'vs/base/common/lifecycle';
-+import * as ee from 'vs/base/common/eventEmitter';
-+import * as types from 'vs/base/common/types';
-+import * as dom from 'vs/base/browser/dom';
-+import * as numbers from 'vs/base/common/numbers';
-+import * as sash from 'vs/base/browser/ui/sash/sash';
-+import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-+import { KeyCode } from 'vs/base/common/keyCodes';
-+import Event, { Emitter } from 'vs/base/common/event';
-+>>>>>>> .their
- import { Color } from 'vs/base/common/color';
- import { domEvent } from 'vs/base/browser/event';
- export { Orientation } from 'vs/base/browser/ui/sash/sash';
-changed in both
-  base   100644 2565b518f14194e17cc49f0753a71070f9074494 src/vs/base/browser/ui/toolbar/toolbar.ts
-  our    100644 02fcb82fa11db603164c69c9b8d56bba5708737a src/vs/base/browser/ui/toolbar/toolbar.ts
-  their  100644 71a8d4c893f185388c65e9bd60086402dc31ee24 src/vs/base/browser/ui/toolbar/toolbar.ts
-@@ -8,6 +8,12 @@
- import 'vs/css!./toolbar';
- import * as nls from 'vs/nls';
- import { TPromise } from 'vs/base/common/winjs.base';
-+<<<<<<< .our
-+=======
-+import { IDisposable } from 'vs/base/common/lifecycle';
-+import { Builder, $ } from 'vs/base/browser/builder';
-+import * as types from 'vs/base/common/types';
-+>>>>>>> .their
- import { Action, IActionRunner, IAction } from 'vs/base/common/actions';
- import { ActionBar, ActionsOrientation, IActionItemProvider } from 'vs/base/browser/ui/actionbar/actionbar';
- import { IContextMenuProvider, DropdownMenuActionItem } from 'vs/base/browser/ui/dropdown/dropdown';
-changed in both
-  base   100644 67a95a10c866e1e41acd5849733beefaa39749e1 src/vs/base/common/comparers.ts
-  our    100644 c2448ce4dd1e2d49fee9db8908e01977733bd95d src/vs/base/common/comparers.ts
-  their  100644 876b22cf0b4b7a049af43ae9d9f9c987c6b056a0 src/vs/base/common/comparers.ts
-@@ -4,6 +4,10 @@
-  *--------------------------------------------------------------------------------------------*/
- 'use strict';
- 
-+<<<<<<< .our
-+=======
-+import * as scorer from 'vs/base/common/scorer';
-+>>>>>>> .their
- import * as strings from 'vs/base/common/strings';
- import * as paths from 'vs/base/common/paths';
- 
-changed in both
-  base   100644 1f587120c5e1c5225e9e59577ade56dcf0a715f6 src/vs/base/common/errorMessage.ts
-  our    100644 7d2f7b4210d171bf0c817251cf813a62fccae09b src/vs/base/common/errorMessage.ts
-  their  100644 17532c863f48d9769a6e6b21459b88c0a6821481 src/vs/base/common/errorMessage.ts
-@@ -5,8 +5,161 @@
- 'use strict';
- 
- import * as nls from 'vs/nls';
-+<<<<<<< .our
- import * as types from 'vs/base/common/types';
- import * as arrays from 'vs/base/common/arrays';
-+=======
-+import * as objects from 'vs/base/common/objects';
-+import * as types from 'vs/base/common/types';
-+import * as arrays from 'vs/base/common/arrays';
-+import * as strings from 'vs/base/common/strings';
-+
-+export interface IXHRResponse {
-+	responseText: string;
-+	status: number;
-+
-+	readyState: number;
-+	getResponseHeader: (header: string) => string;
-+}
-+
-+export interface IConnectionErrorData {
-+	status: number;
-+	statusText?: string;
-+	responseText?: string;
-+}
-+
-+/**
-+ * The base class for all connection errors originating from XHR requests.
-+ */
-+export class ConnectionError implements Error {
-+	public status: number;
-+	public statusText: string;
-+	public responseText: string;
-+	public errorMessage: string;
-+	public errorCode: string;
-+	public errorObject: any;
-+	public name: string;
-+
-+	constructor(mixin: IConnectionErrorData);
-+	constructor(request: IXHRResponse);
-+	constructor(arg: any) {
-+		this.status = arg.status;
-+		this.statusText = arg.statusText;
-+		this.name = 'ConnectionError';
-+
-+		try {
-+			this.responseText = arg.responseText;
-+		} catch (e) {
-+			this.responseText = '';
-+		}
-+
-+		this.errorMessage = null;
-+		this.errorCode = null;
-+		this.errorObject = null;
-+
-+		if (this.responseText) {
-+			try {
-+				let errorObj = JSON.parse(this.responseText);
-+				this.errorMessage = errorObj.message;
-+				this.errorCode = errorObj.code;
-+				this.errorObject = errorObj;
-+			} catch (error) {
-+				// Ignore
-+			}
-+		}
-+	}
-+
-+	public get message(): string {
-+		return this.connectionErrorToMessage(this, false);
-+	}
-+
-+	public get verboseMessage(): string {
-+		return this.connectionErrorToMessage(this, true);
-+	}
-+
-+	private connectionErrorDetailsToMessage(error: ConnectionError, verbose: boolean): string {
-+		let errorCode = error.errorCode;
-+		let errorMessage = error.errorMessage;
-+
-+		if (errorCode !== null && errorMessage !== null) {
-+			return nls.localize(
-+				{
-+					key: 'message',
-+					comment: [
-+						'{0} represents the error message',
-+						'{1} represents the error code'
-+					]
-+				},
-+				"{0}. Error code: {1}",
-+				strings.rtrim(errorMessage, '.'), errorCode);
-+		}
-+
-+		if (errorMessage !== null) {
-+			return errorMessage;
-+		}
-+
-+		if (verbose && error.responseText !== null) {
-+			return error.responseText;
-+		}
-+
-+		return null;
-+	}
-+
-+	private connectionErrorToMessage(error: ConnectionError, verbose: boolean): string {
-+		let details = this.connectionErrorDetailsToMessage(error, verbose);
-+
-+		// Status Code based Error
-+		if (error.status === 401) {
-+			if (details !== null) {
-+				return nls.localize(
-+					{
-+						key: 'error.permission.verbose',
-+						comment: [
-+							'{0} represents detailed information why the permission got denied'
-+						]
-+					},
-+					"Permission Denied (HTTP {0})",
-+					details);
-+			}
-+
-+			return nls.localize('error.permission', "Permission Denied");
-+		}
-+
-+		// Return error details if present
-+		if (details) {
-+			return details;
-+		}
-+
-+		// Fallback to HTTP Status and Code
-+		if (error.status > 0 && error.statusText !== null) {
-+			if (verbose && error.responseText !== null && error.responseText.length > 0) {
-+				return nls.localize('error.http.verbose', "{0} (HTTP {1}: {2})", error.statusText, error.status, error.responseText);
-+			}
-+
-+			return nls.localize('error.http', "{0} (HTTP {1})", error.statusText, error.status);
-+		}
-+
-+		// Finally its an Unknown Connection Error
-+		if (verbose && error.responseText !== null && error.responseText.length > 0) {
-+			return nls.localize('error.connection.unknown.verbose', "Unknown Connection Error ({0})", error.responseText);
-+		}
-+
-+		return nls.localize('error.connection.unknown', "An unknown connection error occurred. Either you are no longer connected to the internet or the server you are connected to is offline.");
-+	}
-+}
-+
-+// Bug: Can not subclass a JS Type. Do it manually (as done in WinJS.Class.derive)
-+objects.derive(Error, ConnectionError);
-+
-+function xhrToErrorMessage(xhr: IConnectionErrorData, verbose: boolean): string {
-+	let ce = new ConnectionError(xhr);
-+	if (verbose) {
-+		return ce.verboseMessage;
-+	} else {
-+		return ce.message;
-+	}
-+}
-+>>>>>>> .their
- 
- function exceptionToErrorMessage(exception: any, verbose: boolean): string {
- 	if (exception.message) {
-changed in both
-  base   100644 18d8cad519c8fc779ea3ab760282556cb0073d82 src/vs/base/common/errors.ts
-  our    100644 46b7f230ff80d3c03c6159d5c920eb9b2b996ad6 src/vs/base/common/errors.ts
-  their  100644 3ec916c0db8a61f792c64fe46f82d5898d95ade9 src/vs/base/common/errors.ts
-@@ -4,6 +4,11 @@
-  *--------------------------------------------------------------------------------------------*/
- 'use strict';
- 
-+<<<<<<< .our
-+=======
-+import * as platform from 'vs/base/common/platform';
-+import * as types from 'vs/base/common/types';
-+>>>>>>> .their
- import { IAction } from 'vs/base/common/actions';
- import { TPromise, IPromiseError, IPromiseErrorDetail } from 'vs/base/common/winjs.base';
- 
-removed in local
-  base   100644 b9217b1c6795f601957fd1fc6d513229590d49d1 src/vs/base/common/eventEmitter.ts
-  their  100644 0eefed346fb2a110fb47def5f9783691a2a39b63 src/vs/base/common/eventEmitter.ts
-changed in both
-  base   100644 27609764bdbe807e61f0298df3f44dd06fd5fcac src/vs/base/common/filters.ts
-  our    100644 5f052e2e02afab9ec1e2c937a134ee34b1584315 src/vs/base/common/filters.ts
-  their  100644 443135073e1a8909e6197c63cf3680c197d4f990 src/vs/base/common/filters.ts
-@@ -5,7 +5,11 @@
- 'use strict';
- 
- import * as strings from 'vs/base/common/strings';
-+<<<<<<< .our
- import { LRUCache } from 'vs/base/common/map';
-+=======
-+import { BoundedMap } from 'vs/base/common/map';
-+>>>>>>> .their
- import { CharCode } from 'vs/base/common/charCode';
- 
- export interface IFilter {
-changed in both
-  base   100644 cc14eea9d51abe2200644f6cfe97373e1393fbaa src/vs/base/common/glob.ts
-  our    100644 6ec8e429211b4bfe577a5acce697c639e25f14de src/vs/base/common/glob.ts
-  their  100644 8a18be654bf5f6609fd7473abb64a936590dbaaa src/vs/base/common/glob.ts
-@@ -5,9 +5,16 @@
- 'use strict';
- 
- import * as arrays from 'vs/base/common/arrays';
-+<<<<<<< .our
- import * as strings from 'vs/base/common/strings';
- import * as paths from 'vs/base/common/paths';
- import { LRUCache } from 'vs/base/common/map';
-+=======
-+import * as objects from 'vs/base/common/objects';
-+import * as strings from 'vs/base/common/strings';
-+import * as paths from 'vs/base/common/paths';
-+import { BoundedMap } from 'vs/base/common/map';
-+>>>>>>> .their
- import { CharCode } from 'vs/base/common/charCode';
- import { TPromise } from 'vs/base/common/winjs.base';
- import { isThenable } from 'vs/base/common/async';
-changed in both
-  base   100644 63b1c9697abfb2f81f66c550fcfc789be978a5bc src/vs/base/common/labels.ts
-  our    100644 44d9373ab80467fdd436c7aa73c68361fa9fce36 src/vs/base/common/labels.ts
-  their  100644 6bb9c279c04f0eb165982d0020f47cf8089e5d49 src/vs/base/common/labels.ts
-@@ -5,6 +5,7 @@
- 'use strict';
- 
- import URI from 'vs/base/common/uri';
-+<<<<<<< .our
- import { nativeSep, normalize, basename as pathsBasename, sep } from 'vs/base/common/paths';
- import { endsWith, ltrim, startsWithIgnoreCase, rtrim, startsWith } from 'vs/base/common/strings';
- import { Schemas } from 'vs/base/common/network';
-@@ -13,6 +14,22 @@
- 
- export interface IWorkspaceFolderProvider {
- 	getWorkspaceFolder(resource: URI): { uri: URI, name?: string };
-+=======
-+import * as platform from 'vs/base/common/platform';
-+import { nativeSep, normalize, isEqualOrParent, isEqual, basename, join } from 'vs/base/common/paths';
-+import { endsWith, ltrim } from 'vs/base/common/strings';
-+
-+export interface ILabelProvider {
-+
-+	/**
-+	 * Given an element returns a label for it to display in the UI.
-+	 */
-+	getLabel(element: any): string;
-+}
-+
-+export interface IRootProvider {
-+	getRoot(resource: URI): URI;
-+>>>>>>> .their
- 	getWorkspace(): {
- 		folders: { uri: URI, name?: string }[];
- 	};
-added in remote
-  their  100644 91ff6f03aa9f9f14492866d5c2184e4ec6a3ef46 src/vs/base/common/marked/raw.marked.esm.js
-@@ -0,0 +1,1295 @@
-+/**
-+ * marked - a markdown parser
-+ * Copyright (c) 2011-2014, Christopher Jeffrey. (MIT Licensed)
-+ * https://github.com/chjj/marked
-+ */
-+
-+// TODO MonacoChange: we have our own way of defining modules
-+// ;(function() {
-+// END MonacoChange
-+
-+/**
-+ * Block-Level Grammar
-+ */
-+
-+var block = {
-+	newline: /^\n+/,
-+	code: /^( {4}[^\n]+\n*)+/,
-+	fences: noop,
-+	hr: /^( *[-*_]){3,} *(?:\n+|$)/,
-+	heading: /^ *(#{1,6}) *([^\n]+?) *#* *(?:\n+|$)/,
-+	nptable: noop,
-+	lheading: /^([^\n]+)\n *(=|-){2,} *(?:\n+|$)/,
-+	blockquote: /^( *>[^\n]+(\n(?!def)[^\n]+)*\n*)+/,
-+	list: /^( *)(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/,
-+	html: /^ *(?:comment *(?:\n|\s*$)|closed *(?:\n{2,}|\s*$)|closing *(?:\n{2,}|\s*$))/,
-+	def: /^ *\[([^\]]+)\]: *<?([^\s>]+)>?(?: +["(]([^\n]+)[")])? *(?:\n+|$)/,
-+	table: noop,
-+	paragraph: /^((?:[^\n]+\n?(?!hr|heading|lheading|blockquote|tag|def))+)\n*/,
-+	text: /^[^\n]+/
-+};
-+
-+block.bullet = /(?:[*+-]|\d+\.)/;
-+block.item = /^( *)(bull) [^\n]*(?:\n(?!\1bull )[^\n]*)*/;
-+block.item = replace(block.item, 'gm')
-+	(/bull/g, block.bullet)
-+	();
-+
-+block.list = replace(block.list)
-+	(/bull/g, block.bullet)
-+	('hr', '\\n+(?=\\1?(?:[-*_] *){3,}(?:\\n+|$))')
-+	('def', '\\n+(?=' + block.def.source + ')')
-+	();
-+
-+block.blockquote = replace(block.blockquote)
-+	('def', block.def)
-+	();
-+
-+block._tag = '(?!(?:'
-+	+ 'a|em|strong|small|s|cite|q|dfn|abbr|data|time|code'
-+	+ '|var|samp|kbd|sub|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo'
-+	+ '|span|br|wbr|ins|del|img)\\b)\\w+(?!:/|[^\\w\\s@]*@)\\b';
-+
-+block.html = replace(block.html)
-+	('comment', /<!--[\s\S]*?-->/)
-+	('closed', /<(tag)[\s\S]+?<\/\1>/)
-+	('closing', /<tag(?:"[^"]*"|'[^']*'|[^'">])*?>/)
-+	(/tag/g, block._tag)
-+	();
-+
-+block.paragraph = replace(block.paragraph)
-+	('hr', block.hr)
-+	('heading', block.heading)
-+	('lheading', block.lheading)
-+	('blockquote', block.blockquote)
-+	('tag', '<' + block._tag)
-+	('def', block.def)
-+	();
-+
-+/**
-+ * Normal Block Grammar
-+ */
-+
-+block.normal = merge({}, block);
-+
-+/**
-+ * GFM Block Grammar
-+ */
-+
-+block.gfm = merge({}, block.normal, {
-+	fences: /^ *(`{3,}|~{3,})[ \.]*(\S+)? *\n([\s\S]*?)\s*\1 *(?:\n+|$)/,
-+	paragraph: /^/,
-+	heading: /^ *(#{1,6}) +([^\n]+?) *#* *(?:\n+|$)/
-+});
-+
-+block.gfm.paragraph = replace(block.paragraph)
-+	('(?!', '(?!'
-+	+ block.gfm.fences.source.replace('\\1', '\\2') + '|'
-+	+ block.list.source.replace('\\1', '\\3') + '|')
-+	();
-+
-+/**
-+ * GFM + Tables Block Grammar
-+ */
-+
-+block.tables = merge({}, block.gfm, {
-+	nptable: /^ *(\S.*\|.*)\n *([-:]+ *\|[-| :]*)\n((?:.*\|.*(?:\n|$))*)\n*/,
-+	table: /^ *\|(.+)\n *\|( *[-:]+[-| :]*)\n((?: *\|.*(?:\n|$))*)\n*/
-+});
-+
-+/**
-+ * Block Lexer
-+ */
-+
-+function Lexer(options) {
-+	this.tokens = [];
-+	this.tokens.links = {};
-+	this.options = options || marked.defaults;
-+	this.rules = block.normal;
-+
-+	if (this.options.gfm) {
-+		if (this.options.tables) {
-+			this.rules = block.tables;
-+		} else {
-+			this.rules = block.gfm;
-+		}
-+	}
-+}
-+
-+/**
-+ * Expose Block Rules
-+ */
-+
-+Lexer.rules = block;
-+
-+/**
-+ * Static Lex Method
-+ */
-+
-+Lexer.lex = function (src, options) {
-+	var lexer = new Lexer(options);
-+	return lexer.lex(src);
-+};
-+
-+/**
-+ * Preprocessing
-+ */
-+
-+Lexer.prototype.lex = function (src) {
-+	src = src
-+		.replace(/\r\n|\r/g, '\n')
-+		.replace(/\t/g, '    ')
-+		.replace(/\u00a0/g, ' ')
-+		.replace(/\u2424/g, '\n');
-+
-+	return this.token(src, true);
-+};
-+
-+/**
-+ * Lexing
-+ */
-+
-+Lexer.prototype.token = function (src, top, bq) {
-+	var src = src.replace(/^ +$/gm, '')
-+		, next
-+		, loose
-+		, cap
-+		, bull
-+		, b
-+		, item
-+		, space
-+		, i
-+		, l;
-+
-+	while (src) {
-+		// newline
-+		if (cap = this.rules.newline.exec(src)) {
-+			src = src.substring(cap[0].length);
-+			if (cap[0].length > 1) {
-+				this.tokens.push({
-+					type: 'space'
-+				});
-+			}
-+		}
-+
-+		// code
-+		if (cap = this.rules.code.exec(src)) {
-+			src = src.substring(cap[0].length);
-+			cap = cap[0].replace(/^ {4}/gm, '');
-+			this.tokens.push({
-+				type: 'code',
-+				text: !this.options.pedantic
-+					? cap.replace(/\n+$/, '')
-+					: cap
-+			});
-+			continue;
-+		}
-+
-+		// fences (gfm)
-+		if (cap = this.rules.fences.exec(src)) {
-+			src = src.substring(cap[0].length);
-+			this.tokens.push({
-+				type: 'code',
-+				lang: cap[2],
-+				text: cap[3] || ''
-+			});
-+			continue;
-+		}
-+
-+		// heading
-+		if (cap = this.rules.heading.exec(src)) {
-+			src = src.substring(cap[0].length);
-+			this.tokens.push({
-+				type: 'heading',
-+				depth: cap[1].length,
-+				text: cap[2]
-+			});
-+			continue;
-+		}
-+
-+		// table no leading pipe (gfm)
-+		if (top && (cap = this.rules.nptable.exec(src))) {
-+			src = src.substring(cap[0].length);
-+
-+			item = {
-+				type: 'table',
-+				header: cap[1].replace(/^ *| *\| *$/g, '').split(/ *\| */),
-+				align: cap[2].replace(/^ *|\| *$/g, '').split(/ *\| */),
-+				cells: cap[3].replace(/\n$/, '').split('\n')
-+			};
-+
-+			for (i = 0; i < item.align.length; i++) {
-+				if (/^ *-+: *$/.test(item.align[i])) {
-+					item.align[i] = 'right';
-+				} else if (/^ *:-+: *$/.test(item.align[i])) {
-+					item.align[i] = 'center';
-+				} else if (/^ *:-+ *$/.test(item.align[i])) {
-+					item.align[i] = 'left';
-+				} else {
-+					item.align[i] = null;
-+				}
-+			}
-+
-+			for (i = 0; i < item.cells.length; i++) {
-+				item.cells[i] = item.cells[i].split(/ *\| */);
-+			}
-+
-+			this.tokens.push(item);
-+
-+			continue;
-+		}
-+
-+		// lheading
-+		if (cap = this.rules.lheading.exec(src)) {
-+			src = src.substring(cap[0].length);
-+			this.tokens.push({
-+				type: 'heading',
-+				depth: cap[2] === '=' ? 1 : 2,
-+				text: cap[1]
-+			});
-+			continue;
-+		}
-+
-+		// hr
-+		if (cap = this.rules.hr.exec(src)) {
-+			src = src.substring(cap[0].length);
-+			this.tokens.push({
-+				type: 'hr'
-+			});
-+			continue;
-+		}
-+
-+		// blockquote
-+		if (cap = this.rules.blockquote.exec(src)) {
-+			src = src.substring(cap[0].length);
-+
-+			this.tokens.push({
-+				type: 'blockquote_start'
-+			});
-+
-+			cap = cap[0].replace(/^ *> ?/gm, '');
-+
-+			// Pass `top` to keep the current
-+			// "toplevel" state. This is exactly
-+			// how markdown.pl works.
-+			this.token(cap, top, true);
-+
-+			this.tokens.push({
-+				type: 'blockquote_end'
-+			});
-+
-+			continue;
-+		}
-+
-+		// list
-+		if (cap = this.rules.list.exec(src)) {
-+			src = src.substring(cap[0].length);
-+			bull = cap[2];
-+
-+			this.tokens.push({
-+				type: 'list_start',
-+				ordered: bull.length > 1
-+			});
-+
-+			// Get each top-level item.
-+			cap = cap[0].match(this.rules.item);
-+
-+			next = false;
-+			l = cap.length;
-+			i = 0;
-+
-+			for (; i < l; i++) {
-+				item = cap[i];
-+
-+				// Remove the list item's bullet
-+				// so it is seen as the next token.
-+				space = item.length;
-+				item = item.replace(/^ *([*+-]|\d+\.) +/, '');
-+
-+				// Outdent whatever the
-+				// list item contains. Hacky.
-+				if (~item.indexOf('\n ')) {
-+					space -= item.length;
-+					item = !this.options.pedantic
-+						? item.replace(new RegExp('^ {1,' + space + '}', 'gm'), '')
-+						: item.replace(/^ {1,4}/gm, '');
-+				}
-+
-+				// Determine whether the next list item belongs here.
-+				// Backpedal if it does not belong in this list.
-+				if (this.options.smartLists && i !== l - 1) {
-+					b = block.bullet.exec(cap[i + 1])[0];
-+					if (bull !== b && !(bull.length > 1 && b.length > 1)) {
-+						src = cap.slice(i + 1).join('\n') + src;
-+						i = l - 1;
-+					}
-+				}
-+
-+				// Determine whether item is loose or not.
-+				// Use: /(^|\n)(?! )[^\n]+\n\n(?!\s*$)/
-+				// for discount behavior.
-+				loose = next || /\n\n(?!\s*$)/.test(item);
-+				if (i !== l - 1) {
-+					next = item.charAt(item.length - 1) === '\n';
-+					if (!loose) loose = next;
-+				}
-+
-+				this.tokens.push({
-+					type: loose
-+						? 'loose_item_start'
-+						: 'list_item_start'
-+				});
-+
-+				// Recurse.
-+				this.token(item, false, bq);
-+
-+				this.tokens.push({
-+					type: 'list_item_end'
-+				});
-+			}
-+
-+			this.tokens.push({
-+				type: 'list_end'
-+			});
-+
-+			continue;
-+		}
-+
-+		// html
-+		if (cap = this.rules.html.exec(src)) {
-+			src = src.substring(cap[0].length);
-+			this.tokens.push({
-+				type: this.options.sanitize
-+					? 'paragraph'
-+					: 'html',
-+				pre: !this.options.sanitizer
-+				&& (cap[1] === 'pre' || cap[1] === 'script' || cap[1] === 'style'),
-+				text: cap[0]
-+			});
-+			continue;
-+		}
-+
-+		// def
-+		if ((!bq && top) && (cap = this.rules.def.exec(src))) {
-+			src = src.substring(cap[0].length);
-+			this.tokens.links[cap[1].toLowerCase()] = {
-+				href: cap[2],
-+				title: cap[3]
-+			};
-+			continue;
-+		}
-+
-+		// table (gfm)
-+		if (top && (cap = this.rules.table.exec(src))) {
-+			src = src.substring(cap[0].length);
-+
-+			item = {
-+				type: 'table',
-+				header: cap[1].replace(/^ *| *\| *$/g, '').split(/ *\| */),
-+				align: cap[2].replace(/^ *|\| *$/g, '').split(/ *\| */),
-+				cells: cap[3].replace(/(?: *\| *)?\n$/, '').split('\n')
-+			};
-+
-+			for (i = 0; i < item.align.length; i++) {
-+				if (/^ *-+: *$/.test(item.align[i])) {
-+					item.align[i] = 'right';
-+				} else if (/^ *:-+: *$/.test(item.align[i])) {
-+					item.align[i] = 'center';
-+				} else if (/^ *:-+ *$/.test(item.align[i])) {
-+					item.align[i] = 'left';
-+				} else {
-+					item.align[i] = null;
-+				}
-+			}
-+
-+			for (i = 0; i < item.cells.length; i++) {
-+				item.cells[i] = item.cells[i]
-+					.replace(/^ *\| *| *\| *$/g, '')
-+					.split(/ *\| */);
-+			}
-+
-+			this.tokens.push(item);
-+
-+			continue;
-+		}
-+
-+		// top-level paragraph
-+		if (top && (cap = this.rules.paragraph.exec(src))) {
-+			src = src.substring(cap[0].length);
-+			this.tokens.push({
-+				type: 'paragraph',
-+				text: cap[1].charAt(cap[1].length - 1) === '\n'
-+					? cap[1].slice(0, -1)
-+					: cap[1]
-+			});
-+			continue;
-+		}
-+
-+		// text
-+		if (cap = this.rules.text.exec(src)) {
-+			// Top-level should never reach here.
-+			src = src.substring(cap[0].length);
-+			this.tokens.push({
-+				type: 'text',
-+				text: cap[0]
-+			});
-+			continue;
-+		}
-+
-+		if (src) {
-+			throw new
-+				Error('Infinite loop on byte: ' + src.charCodeAt(0));
-+		}
-+	}
-+
-+	return this.tokens;
-+};
-+
-+/**
-+ * Inline-Level Grammar
-+ */
-+
-+var inline = {
-+	escape: /^\\([\\`*{}\[\]()#+\-.!_>])/,
-+	autolink: /^<([^ >]+(@|:\/)[^ >]+)>/,
-+	url: noop,
-+	tag: /^<!--[\s\S]*?-->|^<\/?\w+(?:"[^"]*"|'[^']*'|[^'">])*?>/,
-+	link: /^!?\[(inside)\]\(href\)/,
-+	reflink: /^!?\[(inside)\]\s*\[([^\]]*)\]/,
-+	nolink: /^!?\[((?:\[[^\]]*\]|[^\[\]])*)\]/,
-+	strong: /^__([\s\S]+?)__(?!_)|^\*\*([\s\S]+?)\*\*(?!\*)/,
-+	em: /^\b_((?:[^_]|__)+?)_\b|^\*((?:\*\*|[\s\S])+?)\*(?!\*)/,
-+	code: /^(`+)\s*([\s\S]*?[^`])\s*\1(?!`)/,
-+	br: /^ {2,}\n(?!\s*$)/,
-+	del: noop,
-+	text: /^[\s\S]+?(?=[\\<!\[_*`]| {2,}\n|$)/
-+};
-+
-+inline._inside = /(?:\[[^\]]*\]|[^\[\]]|\](?=[^\[]*\]))*/;
-+inline._href = /\s*<?([\s\S]*?)>?(?:\s+['"]([\s\S]*?)['"])?\s*/;
-+
-+inline.link = replace(inline.link)
-+	('inside', inline._inside)
-+	('href', inline._href)
-+	();
-+
-+inline.reflink = replace(inline.reflink)
-+	('inside', inline._inside)
-+	();
-+
-+/**
-+ * Normal Inline Grammar
-+ */
-+
-+inline.normal = merge({}, inline);
-+
-+/**
-+ * Pedantic Inline Grammar
-+ */
-+
-+inline.pedantic = merge({}, inline.normal, {
-+	strong: /^__(?=\S)([\s\S]*?\S)__(?!_)|^\*\*(?=\S)([\s\S]*?\S)\*\*(?!\*)/,
-+	em: /^_(?=\S)([\s\S]*?\S)_(?!_)|^\*(?=\S)([\s\S]*?\S)\*(?!\*)/
-+});
-+
-+/**
-+ * GFM Inline Grammar
-+ */
-+
-+inline.gfm = merge({}, inline.normal, {
-+	escape: replace(inline.escape)('])', '~|])')(),
-+	url: /^(https?:\/\/[^\s<]+[^<.,:;"')\]\s])/,
-+	del: /^~~(?=\S)([\s\S]*?\S)~~/,
-+	text: replace(inline.text)
-+		(']|', '~]|')
-+		('|', '|https?://|')
-+		()
-+});
-+
-+/**
-+ * GFM + Line Breaks Inline Grammar
-+ */
-+
-+inline.breaks = merge({}, inline.gfm, {
-+	br: replace(inline.br)('{2,}', '*')(),
-+	text: replace(inline.gfm.text)('{2,}', '*')()
-+});
-+
-+/**
-+ * Inline Lexer & Compiler
-+ */
-+
-+function InlineLexer(links, options) {
-+	this.options = options || marked.defaults;
-+	this.links = links;
-+	this.rules = inline.normal;
-+	this.renderer = this.options.renderer || new Renderer;
-+	this.renderer.options = this.options;
-+
-+	if (!this.links) {
-+		throw new
-+			Error('Tokens array requires a `links` property.');
-+	}
-+
-+	if (this.options.gfm) {
-+		if (this.options.breaks) {
-+			this.rules = inline.breaks;
-+		} else {
-+			this.rules = inline.gfm;
-+		}
-+	} else if (this.options.pedantic) {
-+		this.rules = inline.pedantic;
-+	}
-+}
-+
-+/**
-+ * Expose Inline Rules
-+ */
-+
-+InlineLexer.rules = inline;
-+
-+/**
-+ * Static Lexing/Compiling Method
-+ */
-+
-+InlineLexer.output = function (src, links, options) {
-+	var inline = new InlineLexer(links, options);
-+	return inline.output(src);
-+};
-+
-+/**
-+ * Lexing/Compiling
-+ */
-+
-+InlineLexer.prototype.output = function (src) {
-+	var out = ''
-+		, link
-+		, text
-+		, href
-+		, cap;
-+
-+	while (src) {
-+		// escape
-+		if (cap = this.rules.escape.exec(src)) {
-+			src = src.substring(cap[0].length);
-+			out += cap[1];
-+			continue;
-+		}
-+
-+		// autolink
-+		if (cap = this.rules.autolink.exec(src)) {
-+			src = src.substring(cap[0].length);
-+			if (cap[2] === '@') {
-+				text = cap[1].charAt(6) === ':'
-+					? this.mangle(cap[1].substring(7))
-+					: this.mangle(cap[1]);
-+				href = this.mangle('mailto:') + text;
-+			} else {
-+				text = escape(cap[1]);
-+				href = text;
-+			}
-+			out += this.renderer.link(href, null, text);
-+			continue;
-+		}
-+
-+		// url (gfm)
-+		if (!this.inLink && (cap = this.rules.url.exec(src))) {
-+			src = src.substring(cap[0].length);
-+			text = escape(cap[1]);
-+			href = text;
-+			out += this.renderer.link(href, null, text);
-+			continue;
-+		}
-+
-+		// tag
-+		if (cap = this.rules.tag.exec(src)) {
-+			if (!this.inLink && /^<a /i.test(cap[0])) {
-+				this.inLink = true;
-+			} else if (this.inLink && /^<\/a>/i.test(cap[0])) {
-+				this.inLink = false;
-+			}
-+			src = src.substring(cap[0].length);
-+			out += this.options.sanitize
-+				? this.options.sanitizer
-+					? this.options.sanitizer(cap[0])
-+					: escape(cap[0])
-+				: cap[0]
-+			continue;
-+		}
-+
-+		// link
-+		if (cap = this.rules.link.exec(src)) {
-+			src = src.substring(cap[0].length);
-+			this.inLink = true;
-+			out += this.outputLink(cap, {
-+				href: cap[2],
-+				title: cap[3]
-+			});
-+			this.inLink = false;
-+			continue;
-+		}
-+
-+		// reflink, nolink
-+		if ((cap = this.rules.reflink.exec(src))
-+			|| (cap = this.rules.nolink.exec(src))) {
-+			src = src.substring(cap[0].length);
-+			link = (cap[2] || cap[1]).replace(/\s+/g, ' ');
-+			link = this.links[link.toLowerCase()];
-+			if (!link || !link.href) {
-+				out += cap[0].charAt(0);
-+				src = cap[0].substring(1) + src;
-+				continue;
-+			}
-+			this.inLink = true;
-+			out += this.outputLink(cap, link);
-+			this.inLink = false;
-+			continue;
-+		}
-+
-+		// strong
-+		if (cap = this.rules.strong.exec(src)) {
-+			src = src.substring(cap[0].length);
-+			out += this.renderer.strong(this.output(cap[2] || cap[1]));
-+			continue;
-+		}
-+
-+		// em
-+		if (cap = this.rules.em.exec(src)) {
-+			src = src.substring(cap[0].length);
-+			out += this.renderer.em(this.output(cap[2] || cap[1]));
-+			continue;
-+		}
-+
-+		// code
-+		if (cap = this.rules.code.exec(src)) {
-+			src = src.substring(cap[0].length);
-+			out += this.renderer.codespan(escape(cap[2], true));
-+			continue;
-+		}
-+
-+		// br
-+		if (cap = this.rules.br.exec(src)) {
-+			src = src.substring(cap[0].length);
-+			out += this.renderer.br();
-+			continue;
-+		}
-+
-+		// del (gfm)
-+		if (cap = this.rules.del.exec(src)) {
-+			src = src.substring(cap[0].length);
-+			out += this.renderer.del(this.output(cap[1]));
-+			continue;
-+		}
-+
-+		// text
-+		if (cap = this.rules.text.exec(src)) {
-+			src = src.substring(cap[0].length);
-+			out += this.renderer.text(escape(this.smartypants(cap[0])));
-+			continue;
-+		}
-+
-+		if (src) {
-+			throw new
-+				Error('Infinite loop on byte: ' + src.charCodeAt(0));
-+		}
-+	}
-+
-+	return out;
-+};
-+
-+/**
-+ * Compile Link
-+ */
-+
-+InlineLexer.prototype.outputLink = function (cap, link) {
-+	var href = escape(link.href)
-+		, title = link.title ? escape(link.title) : null;
-+
-+	return cap[0].charAt(0) !== '!'
-+		? this.renderer.link(href, title, this.output(cap[1]))
-+		: this.renderer.image(href, title, escape(cap[1]));
-+};
-+
-+/**
-+ * Smartypants Transformations
-+ */
-+
-+InlineLexer.prototype.smartypants = function (text) {
-+	if (!this.options.smartypants) return text;
-+	return text
-+		// em-dashes
-+		.replace(/---/g, '\u2014')
-+		// en-dashes
-+		.replace(/--/g, '\u2013')
-+		// opening singles
-+		.replace(/(^|[-\u2014/(\[{"\s])'/g, '$1\u2018')
-+		// closing singles & apostrophes
-+		.replace(/'/g, '\u2019')
-+		// opening doubles
-+		.replace(/(^|[-\u2014/(\[{\u2018\s])"/g, '$1\u201c')
-+		// closing doubles
-+		.replace(/"/g, '\u201d')
-+		// ellipses
-+		.replace(/\.{3}/g, '\u2026');
-+};
-+
-+/**
-+ * Mangle Links
-+ */
-+
-+InlineLexer.prototype.mangle = function (text) {
-+	if (!this.options.mangle) return text;
-+	var out = ''
-+		, l = text.length
-+		, i = 0
-+		, ch;
-+
-+	for (; i < l; i++) {
-+		ch = text.charCodeAt(i);
-+		if (Math.random() > 0.5) {
-+			ch = 'x' + ch.toString(16);
-+		}
-+		out += '&#' + ch + ';';
-+	}
-+
-+	return out;
-+};
-+
-+/**
-+ * Renderer
-+ */
-+
-+function Renderer(options) {
-+	this.options = options || {};
-+}
-+
-+Renderer.prototype.code = function (code, lang, escaped) {
-+	if (this.options.highlight) {
-+		var out = this.options.highlight(code, lang);
-+		if (out != null && out !== code) {
-+			escaped = true;
-+			code = out;
-+		}
-+	}
-+
-+	if (!lang) {
-+		return '<pre><code>'
-+			+ (escaped ? code : escape(code, true))
-+			+ '\n</code></pre>';
-+	}
-+
-+	return '<pre><code class="'
-+		+ this.options.langPrefix
-+		+ escape(lang, true)
-+		+ '">'
-+		+ (escaped ? code : escape(code, true))
-+		+ '\n</code></pre>\n';
-+};
-+
-+Renderer.prototype.blockquote = function (quote) {
-+	return '<blockquote>\n' + quote + '</blockquote>\n';
-+};
-+
-+Renderer.prototype.html = function (html) {
-+	return html;
-+};
-+
-+Renderer.prototype.heading = function (text, level, raw) {
-+	return '<h'
-+		+ level
-+		+ ' id="'
-+		+ this.options.headerPrefix
-+		+ raw.toLowerCase().replace(/[^\w]+/g, '-')
-+		+ '">'
-+		+ text
-+		+ '</h'
-+		+ level
-+		+ '>\n';
-+};
-+
-+Renderer.prototype.hr = function () {
-+	return this.options.xhtml ? '<hr/>\n' : '<hr>\n';
-+};
-+
-+Renderer.prototype.list = function (body, ordered) {
-+	var type = ordered ? 'ol' : 'ul';
-+	return '<' + type + '>\n' + body + '</' + type + '>\n';
-+};
-+
-+Renderer.prototype.listitem = function (text) {
-+	return '<li>' + text + '</li>\n';
-+};
-+
-+Renderer.prototype.paragraph = function (text) {
-+	return '<p>' + text + '</p>\n';
-+};
-+
-+Renderer.prototype.table = function (header, body) {
-+	return '<table>\n'
-+		+ '<thead>\n'
-+		+ header
-+		+ '</thead>\n'
-+		+ '<tbody>\n'
-+		+ body
-+		+ '</tbody>\n'
-+		+ '</table>\n';
-+};
-+
-+Renderer.prototype.tablerow = function (content) {
-+	return '<tr>\n' + content + '</tr>\n';
-+};
-+
-+Renderer.prototype.tablecell = function (content, flags) {
-+	var type = flags.header ? 'th' : 'td';
-+	var tag = flags.align
-+		? '<' + type + ' style="text-align:' + flags.align + '">'
-+		: '<' + type + '>';
-+	return tag + content + '</' + type + '>\n';
-+};
-+
-+// span level renderer
-+Renderer.prototype.strong = function (text) {
-+	return '<strong>' + text + '</strong>';
-+};
-+
-+Renderer.prototype.em = function (text) {
-+	return '<em>' + text + '</em>';
-+};
-+
-+Renderer.prototype.codespan = function (text) {
-+	return '<code>' + text + '</code>';
-+};
-+
-+Renderer.prototype.br = function () {
-+	return this.options.xhtml ? '<br/>' : '<br>';
-+};
-+
-+Renderer.prototype.del = function (text) {
-+	return '<del>' + text + '</del>';
-+};
-+
-+Renderer.prototype.link = function (href, title, text) {
-+	if (this.options.sanitize) {
-+		try {
-+			var prot = decodeURIComponent(unescape(href))
-+				.replace(/[^\w:]/g, '')
-+				.toLowerCase();
-+		} catch (e) {
-+			return '';
-+		}
-+		if (prot.indexOf('javascript:') === 0 || prot.indexOf('vbscript:') === 0 || prot.indexOf('data:') === 0) {
-+			return '';
-+		}
-+	}
-+	var out = '<a href="' + href + '"';
-+	if (title) {
-+		out += ' title="' + title + '"';
-+	}
-+	out += '>' + text + '</a>';
-+	return out;
-+};
-+
-+Renderer.prototype.image = function (href, title, text) {
-+	var out = '<img src="' + href + '" alt="' + text + '"';
-+	if (title) {
-+		out += ' title="' + title + '"';
-+	}
-+	out += this.options.xhtml ? '/>' : '>';
-+	return out;
-+};
-+
-+Renderer.prototype.text = function (text) {
-+	return text;
-+};
-+
-+/**
-+ * Parsing & Compiling
-+ */
-+
-+function Parser(options) {
-+	this.tokens = [];
-+	this.token = null;
-+	this.options = options || marked.defaults;
-+	this.options.renderer = this.options.renderer || new Renderer;
-+	this.renderer = this.options.renderer;
-+	this.renderer.options = this.options;
-+}
-+
-+/**
-+ * Static Parse Method
-+ */
-+
-+Parser.parse = function (src, options, renderer) {
-+	var parser = new Parser(options, renderer);
-+	return parser.parse(src);
-+};
-+
-+/**
-+ * Parse Loop
-+ */
-+
-+Parser.prototype.parse = function (src) {
-+	this.inline = new InlineLexer(src.links, this.options, this.renderer);
-+	this.tokens = src.reverse();
-+
-+	var out = '';
-+	while (this.next()) {
-+		out += this.tok();
-+	}
-+
-+	return out;
-+};
-+
-+/**
-+ * Next Token
-+ */
-+
-+Parser.prototype.next = function () {
-+	return this.token = this.tokens.pop();
-+};
-+
-+/**
-+ * Preview Next Token
-+ */
-+
-+Parser.prototype.peek = function () {
-+	return this.tokens[this.tokens.length - 1] || 0;
-+};
-+
-+/**
-+ * Parse Text Tokens
-+ */
-+
-+Parser.prototype.parseText = function () {
-+	var body = this.token.text;
-+
-+	while (this.peek().type === 'text') {
-+		body += '\n' + this.next().text;
-+	}
-+
-+	return this.inline.output(body);
-+};
-+
-+/**
-+ * Parse Current Token
-+ */
-+
-+Parser.prototype.tok = function () {
-+	switch (this.token.type) {
-+		case 'space': {
-+			return '';
-+		}
-+		case 'hr': {
-+			return this.renderer.hr();
-+		}
-+		case 'heading': {
-+			return this.renderer.heading(
-+				this.inline.output(this.token.text),
-+				this.token.depth,
-+				this.token.text);
-+		}
-+		case 'code': {
-+			return this.renderer.code(this.token.text,
-+				this.token.lang,
-+				this.token.escaped);
-+		}
-+		case 'table': {
-+			var header = ''
-+				, body = ''
-+				, i
-+				, row
-+				, cell
-+				, flags
-+				, j;
-+
-+			// header
-+			cell = '';
-+			for (i = 0; i < this.token.header.length; i++) {
-+				flags = { header: true, align: this.token.align[i] };
-+				cell += this.renderer.tablecell(
-+					this.inline.output(this.token.header[i]),
-+					{ header: true, align: this.token.align[i] }
-+				);
-+			}
-+			header += this.renderer.tablerow(cell);
-+
-+			for (i = 0; i < this.token.cells.length; i++) {
-+				row = this.token.cells[i];
-+
-+				cell = '';
-+				for (j = 0; j < row.length; j++) {
-+					cell += this.renderer.tablecell(
-+						this.inline.output(row[j]),
-+						{ header: false, align: this.token.align[j] }
-+					);
-+				}
-+
-+				body += this.renderer.tablerow(cell);
-+			}
-+			return this.renderer.table(header, body);
-+		}
-+		case 'blockquote_start': {
-+			var body = '';
-+
-+			while (this.next().type !== 'blockquote_end') {
-+				body += this.tok();
-+			}
-+
-+			return this.renderer.blockquote(body);
-+		}
-+		case 'list_start': {
-+			var body = ''
-+				, ordered = this.token.ordered;
-+
-+			while (this.next().type !== 'list_end') {
-+				body += this.tok();
-+			}
-+
-+			return this.renderer.list(body, ordered);
-+		}
-+		case 'list_item_start': {
-+			var body = '';
-+
-+			while (this.next().type !== 'list_item_end') {
-+				body += this.token.type === 'text'
-+					? this.parseText()
-+					: this.tok();
-+			}
-+
-+			return this.renderer.listitem(body);
-+		}
-+		case 'loose_item_start': {
-+			var body = '';
-+
-+			while (this.next().type !== 'list_item_end') {
-+				body += this.tok();
-+			}
-+
-+			return this.renderer.listitem(body);
-+		}
-+		case 'html': {
-+			var html = !this.token.pre && !this.options.pedantic
-+				? this.inline.output(this.token.text)
-+				: this.token.text;
-+			return this.renderer.html(html);
-+		}
-+		case 'paragraph': {
-+			return this.renderer.paragraph(this.inline.output(this.token.text));
-+		}
-+		case 'text': {
-+			return this.renderer.paragraph(this.parseText());
-+		}
-+	}
-+};
-+
-+/**
-+ * Helpers
-+ */
-+
-+function escape(html, encode) {
-+	return html
-+		.replace(!encode ? /&(?!#?\w+;)/g : /&/g, '&amp;')
-+		.replace(/</g, '&lt;')
-+		.replace(/>/g, '&gt;')
-+		.replace(/"/g, '&quot;')
-+		.replace(/'/g, '&#39;');
-+}
-+
-+function unescape(html) {
-+	// explicitly match decimal, hex, and named HTML entities
-+	return html.replace(/&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/g, function (_, n) {
-+		n = n.toLowerCase();
-+		if (n === 'colon') return ':';
-+		if (n.charAt(0) === '#') {
-+			return n.charAt(1) === 'x'
-+				? String.fromCharCode(parseInt(n.substring(2), 16))
-+				: String.fromCharCode(+n.substring(1));
-+		}
-+		return '';
-+	});
-+}
-+
-+function replace(regex, opt) {
-+	regex = regex.source;
-+	opt = opt || '';
-+	return function self(name, val) {
-+		if (!name) return new RegExp(regex, opt);
-+		val = val.source || val;
-+		val = val.replace(/(^|[^\[])\^/g, '$1');
-+		regex = regex.replace(name, val);
-+		return self;
-+	};
-+}
-+
-+function noop() { }
-+noop.exec = noop;
-+
-+function merge(obj) {
-+	var i = 1
-+		, target
-+		, key;
-+
-+	for (; i < arguments.length; i++) {
-+		target = arguments[i];
-+		for (key in target) {
-+			if (Object.prototype.hasOwnProperty.call(target, key)) {
-+				obj[key] = target[key];
-+			}
-+		}
-+	}
-+
-+	return obj;
-+}
-+
-+
-+/**
-+ * Marked
-+ */
-+
-+export function marked(src, opt, callback) {
-+	if (callback || typeof opt === 'function') {
-+		if (!callback) {
-+			callback = opt;
-+			opt = null;
-+		}
-+
-+		opt = merge({}, marked.defaults, opt || {});
-+
-+		var highlight = opt.highlight
-+			, tokens
-+			, pending
-+			, i = 0;
-+
-+		try {
-+			tokens = Lexer.lex(src, opt)
-+		} catch (e) {
-+			return callback(e);
-+		}
-+
-+		pending = tokens.length;
-+
-+		var done = function (err) {
-+			if (err) {
-+				opt.highlight = highlight;
-+				return callback(err);
-+			}
-+
-+			var out;
-+
-+			try {
-+				out = Parser.parse(tokens, opt);
-+			} catch (e) {
-+				err = e;
-+			}
-+
-+			opt.highlight = highlight;
-+
-+			return err
-+				? callback(err)
-+				: callback(null, out);
-+		};
-+
-+		if (!highlight || highlight.length < 3) {
-+			return done();
-+		}
-+
-+		delete opt.highlight;
-+
-+		if (!pending) return done();
-+
-+		for (; i < tokens.length; i++) {
-+			(function (token) {
-+				if (token.type !== 'code') {
-+					return --pending || done();
-+				}
-+				return highlight(token.text, token.lang, function (err, code) {
-+					if (err) return done(err);
-+					if (code == null || code === token.text) {
-+						return --pending || done();
-+					}
-+					token.text = code;
-+					token.escaped = true;
-+					--pending || done();
-+				});
-+			})(tokens[i]);
-+		}
-+
-+		return;
-+	}
-+	try {
-+		if (opt) opt = merge({}, marked.defaults, opt);
-+		return Parser.parse(Lexer.lex(src, opt), opt);
-+	} catch (e) {
-+		e.message += '\nPlease report this to https://github.com/chjj/marked.';
-+		if ((opt || marked.defaults).silent) {
-+			return '<p>An error occurred:</p><pre>'
-+				+ escape(e.message + '', true)
-+				+ '</pre>';
-+		}
-+		throw e;
-+	}
-+}
-+
-+/**
-+ * Options
-+ */
-+
-+marked.options =
-+	marked.setOptions = function (opt) {
-+		merge(marked.defaults, opt);
-+		return marked;
-+	};
-+
-+marked.defaults = {
-+	gfm: true,
-+	tables: true,
-+	breaks: false,
-+	pedantic: false,
-+	sanitize: false,
-+	sanitizer: null,
-+	mangle: true,
-+	smartLists: false,
-+	silent: false,
-+	highlight: null,
-+	langPrefix: 'lang-',
-+	smartypants: false,
-+	headerPrefix: '',
-+	renderer: new Renderer,
-+	xhtml: false
-+};
-+
-+/**
-+ * Expose
-+ */
-+
-+marked.Parser = Parser;
-+marked.parser = Parser.parse;
-+
-+marked.Renderer = Renderer;
-+
-+marked.Lexer = Lexer;
-+marked.lexer = Lexer.lex;
-+
-+marked.InlineLexer = InlineLexer;
-+marked.inlineLexer = InlineLexer.output;
-+
-+marked.parse = marked;
-+
-+// TODO MonacoChange: we have our own way of defining modules
-+// define([], function() {
-+//   return marked;
-+// });
-+//if (typeof module !== 'undefined' && typeof exports === 'object') {
-+//  module.exports = marked;
-+//} else if (typeof define === 'function' && define.amd) {
-+//  define(function() { return marked; });
-+//} else {
-+//  this.marked = marked;
-+//}
-+//
-+//}).call(function() {
-+//  return this || (typeof window !== 'undefined' ? window : global);
-+//}());
-+// END MonacoChange
-+
-+export default marked;
-\ No newline at end of file
-changed in both
-  base   100644 6868a2989664a5dd6e951047cfb923a147b3b523 src/vs/base/common/mime.ts
-  our    100644 f2eb135794a355007d7c19ba089a4092a9bc9081 src/vs/base/common/mime.ts
-  their  100644 a790195caa2614a96738d0a4cf2f85c3f435043c src/vs/base/common/mime.ts
-@@ -5,6 +5,10 @@
- 'use strict';
- 
- import * as paths from 'vs/base/common/paths';
-+<<<<<<< .our
-+=======
-+import * as types from 'vs/base/common/types';
-+>>>>>>> .their
- import * as strings from 'vs/base/common/strings';
- import { match } from 'vs/base/common/glob';
- 
-changed in both
-  base   100644 65bcbbd79229445d5b414984568db7dc78f0690f src/vs/base/common/numbers.ts
-  our    100644 fa4932e9ec70cf5d433273dc84e88ce78eb5fbc6 src/vs/base/common/numbers.ts
-  their  100644 e040cc2e7912f242dc45ae21addf2402a66d52b9 src/vs/base/common/numbers.ts
-@@ -5,8 +5,36 @@
- 
- 'use strict';
- 
-+<<<<<<< .our
- export function clamp(value: number, min: number, max: number): number {
- 	return Math.min(Math.max(value, min), max);
-+=======
-+import * as types from 'vs/base/common/types';
-+
-+export type NumberCallback = (index: number) => void;
-+
-+export function count(to: number, callback: NumberCallback): void;
-+export function count(from: number, to: number, callback: NumberCallback): void;
-+export function count(fromOrTo: number, toOrCallback?: NumberCallback | number, callback?: NumberCallback): any {
-+	let from: number;
-+	let to: number;
-+
-+	if (types.isNumber(toOrCallback)) {
-+		from = fromOrTo;
-+		to = <number>toOrCallback;
-+	} else {
-+		from = 0;
-+		to = fromOrTo;
-+		callback = <NumberCallback>toOrCallback;
-+	}
-+
-+	const op = from <= to ? (i: number) => i + 1 : (i: number) => i - 1;
-+	const cmp = from <= to ? (a: number, b: number) => a < b : (a: number, b: number) => a > b;
-+
-+	for (let i = from; cmp(i, to); i = op(i)) {
-+		callback(i);
-+	}
-+>>>>>>> .their
- }
- 
- export function rot(index: number, modulo: number): number {
-changed in both
-  base   100644 07da59265e91c2f5e84ef42e922aa3b0cde3b12e src/vs/base/common/processes.ts
-  our    100644 adc3504949efd20369ddaaf5f894545227b0d570 src/vs/base/common/processes.ts
-  their  100644 806aea7310c48671bc2643edcb92d516ba15ec57 src/vs/base/common/processes.ts
-@@ -4,6 +4,18 @@
-  *--------------------------------------------------------------------------------------------*/
- 'use strict';
- 
-+<<<<<<< .our
-+=======
-+import * as NLS from 'vs/nls';
-+
-+import * as Objects from 'vs/base/common/objects';
-+import * as Platform from 'vs/base/common/platform';
-+import { IStringDictionary } from 'vs/base/common/collections';
-+import * as Types from 'vs/base/common/types';
-+
-+import { ValidationState, IProblemReporter, Parser } from 'vs/base/common/parsers';
-+
-+>>>>>>> .their
- /**
-  * Options to be passed to the external program or shell.
-  */
-changed in both
-  base   100644 96d698cb449479b15e77e34af063adfa55e17bc2 src/vs/base/common/severity.ts
-  our    100644 fd6980d689e13219986e4a8a6bf22559bc7efe5a src/vs/base/common/severity.ts
-  their  100644 1dd85bb1712ff98476b802efb102979d18044e58 src/vs/base/common/severity.ts
-added in remote
-  their  100644 958c5e05e5e5a0545501309fa6cdb8a094b22f46 src/vs/base/common/winjs.base.esm.js
-@@ -0,0 +1,2038 @@
-+/**
-+ * Extracted from https://github.com/winjs/winjs
-+ * Version: 4.4.0(ec3258a9f3a36805a187848984e3bb938044178d)
-+ * Copyright (c) Microsoft Corporation.
-+ * All Rights Reserved.
-+ * Licensed under the MIT License.
-+ */
-+
-+var exported;
-+(function () {
-+
-+    var _modules = {};
-+    _modules["WinJS/Core/_WinJS"] = {};
-+
-+    var _winjs = function (moduleId, deps, factory) {
-+        var exports = {};
-+        var exportsPassedIn = false;
-+
-+        var depsValues = deps.map(function (dep) {
-+            if (dep === 'exports') {
-+                exportsPassedIn = true;
-+                return exports;
-+            }
-+            return _modules[dep];
-+        });
-+
-+        var result = factory.apply({}, depsValues);
-+
-+        _modules[moduleId] = exportsPassedIn ? exports : result;
-+    };
-+
-+    _winjs("WinJS/Core/_Global", [], function () {
-+        "use strict";
-+
-+        // Appease jshint
-+        /* global window, self, global */
-+
-+        var globalObject = typeof window !== 'undefined' ? window : typeof self !== 'undefined' ? self : typeof global !== 'undefined' ? global : {};
-+        return globalObject;
-+    });
-+
-+    _winjs("WinJS/Core/_BaseCoreUtils", ["WinJS/Core/_Global"], function baseCoreUtilsInit(_Global) {
-+        "use strict";
-+
-+        var hasWinRT = !!_Global.Windows;
-+
-+        function markSupportedForProcessing(func) {
-+            /// <signature helpKeyword="WinJS.Utilities.markSupportedForProcessing">
-+            /// <summary locid="WinJS.Utilities.markSupportedForProcessing">
-+            /// Marks a function as being compatible with declarative processing, such as WinJS.UI.processAll
-+            /// or WinJS.Binding.processAll.
-+            /// </summary>
-+            /// <param name="func" type="Function" locid="WinJS.Utilities.markSupportedForProcessing_p:func">
-+            /// The function to be marked as compatible with declarative processing.
-+            /// </param>
-+            /// <returns type="Function" locid="WinJS.Utilities.markSupportedForProcessing_returnValue">
-+            /// The input function.
-+            /// </returns>
-+            /// </signature>
-+            func.supportedForProcessing = true;
-+            return func;
-+        }
-+
-+        return {
-+            hasWinRT: hasWinRT,
-+            markSupportedForProcessing: markSupportedForProcessing,
-+            _setImmediate: _Global.setImmediate ? _Global.setImmediate.bind(_Global) : function (handler) {
-+                _Global.setTimeout(handler, 0);
-+            }
-+        };
-+    });
-+    _winjs("WinJS/Core/_WriteProfilerMark", ["WinJS/Core/_Global"], function profilerInit(_Global) {
-+        "use strict";
-+
-+        return _Global.msWriteProfilerMark || function () {};
-+    });
-+    _winjs("WinJS/Core/_Base", ["WinJS/Core/_WinJS", "WinJS/Core/_Global", "WinJS/Core/_BaseCoreUtils", "WinJS/Core/_WriteProfilerMark"], function baseInit(_WinJS, _Global, _BaseCoreUtils, _WriteProfilerMark) {
-+        "use strict";
-+
-+        function initializeProperties(target, members, prefix) {
-+            var keys = Object.keys(members);
-+            var isArray = Array.isArray(target);
-+            var properties;
-+            var i, len;
-+            for (i = 0, len = keys.length; i < len; i++) {
-+                var key = keys[i];
-+                var enumerable = key.charCodeAt(0) !== /*_*/95;
-+                var member = members[key];
-+                if (member && typeof member === 'object') {
-+                    if (member.value !== undefined || typeof member.get === 'function' || typeof member.set === 'function') {
-+                        if (member.enumerable === undefined) {
-+                            member.enumerable = enumerable;
-+                        }
-+                        if (prefix && member.setName && typeof member.setName === 'function') {
-+                            member.setName(prefix + "." + key);
-+                        }
-+                        properties = properties || {};
-+                        properties[key] = member;
-+                        continue;
-+                    }
-+                }
-+                if (!enumerable) {
-+                    properties = properties || {};
-+                    properties[key] = { value: member, enumerable: enumerable, configurable: true, writable: true };
-+                    continue;
-+                }
-+                if (isArray) {
-+                    target.forEach(function (target) {
-+                        target[key] = member;
-+                    });
-+                } else {
-+                    target[key] = member;
-+                }
-+            }
-+            if (properties) {
-+                if (isArray) {
-+                    target.forEach(function (target) {
-+                        Object.defineProperties(target, properties);
-+                    });
-+                } else {
-+                    Object.defineProperties(target, properties);
-+                }
-+            }
-+        }
-+
-+        (function () {
-+
-+            var _rootNamespace = _WinJS;
-+            if (!_rootNamespace.Namespace) {
-+                _rootNamespace.Namespace = Object.create(Object.prototype);
-+            }
-+
-+            function createNamespace(parentNamespace, name) {
-+                var currentNamespace = parentNamespace || {};
-+                if (name) {
-+                    var namespaceFragments = name.split(".");
-+                    if (currentNamespace === _Global && namespaceFragments[0] === "WinJS") {
-+                        currentNamespace = _WinJS;
-+                        namespaceFragments.splice(0, 1);
-+                    }
-+                    for (var i = 0, len = namespaceFragments.length; i < len; i++) {
-+                        var namespaceName = namespaceFragments[i];
-+                        if (!currentNamespace[namespaceName]) {
-+                            Object.defineProperty(currentNamespace, namespaceName, { value: {}, writable: false, enumerable: true, configurable: true });
-+                        }
-+                        currentNamespace = currentNamespace[namespaceName];
-+                    }
-+                }
-+                return currentNamespace;
-+            }
-+
-+            function defineWithParent(parentNamespace, name, members) {
-+                /// <signature helpKeyword="WinJS.Namespace.defineWithParent">
-+                /// <summary locid="WinJS.Namespace.defineWithParent">
-+                /// Defines a new namespace with the specified name under the specified parent namespace.
-+                /// </summary>
-+                /// <param name="parentNamespace" type="Object" locid="WinJS.Namespace.defineWithParent_p:parentNamespace">
-+                /// The parent namespace.
-+                /// </param>
-+                /// <param name="name" type="String" locid="WinJS.Namespace.defineWithParent_p:name">
-+                /// The name of the new namespace.
-+                /// </param>
-+                /// <param name="members" type="Object" locid="WinJS.Namespace.defineWithParent_p:members">
-+                /// The members of the new namespace.
-+                /// </param>
-+                /// <returns type="Object" locid="WinJS.Namespace.defineWithParent_returnValue">
-+                /// The newly-defined namespace.
-+                /// </returns>
-+                /// </signature>
-+                var currentNamespace = createNamespace(parentNamespace, name);
-+
-+                if (members) {
-+                    initializeProperties(currentNamespace, members, name || "<ANONYMOUS>");
-+                }
-+
-+                return currentNamespace;
-+            }
-+
-+            function define(name, members) {
-+                /// <signature helpKeyword="WinJS.Namespace.define">
-+                /// <summary locid="WinJS.Namespace.define">
-+                /// Defines a new namespace with the specified name.
-+                /// </summary>
-+                /// <param name="name" type="String" locid="WinJS.Namespace.define_p:name">
-+                /// The name of the namespace. This could be a dot-separated name for nested namespaces.
-+                /// </param>
-+                /// <param name="members" type="Object" locid="WinJS.Namespace.define_p:members">
-+                /// The members of the new namespace.
-+                /// </param>
-+                /// <returns type="Object" locid="WinJS.Namespace.define_returnValue">
-+                /// The newly-defined namespace.
-+                /// </returns>
-+                /// </signature>
-+                return defineWithParent(_Global, name, members);
-+            }
-+
-+            var LazyStates = {
-+                uninitialized: 1,
-+                working: 2,
-+                initialized: 3
-+            };
-+
-+            function lazy(f) {
-+                var name;
-+                var state = LazyStates.uninitialized;
-+                var result;
-+                return {
-+                    setName: function (value) {
-+                        name = value;
-+                    },
-+                    get: function () {
-+                        switch (state) {
-+                            case LazyStates.initialized:
-+                                return result;
-+
-+                            case LazyStates.uninitialized:
-+                                state = LazyStates.working;
-+                                try {
-+                                    _WriteProfilerMark("WinJS.Namespace._lazy:" + name + ",StartTM");
-+                                    result = f();
-+                                } finally {
-+                                    _WriteProfilerMark("WinJS.Namespace._lazy:" + name + ",StopTM");
-+                                    state = LazyStates.uninitialized;
-+                                }
-+                                f = null;
-+                                state = LazyStates.initialized;
-+                                return result;
-+
-+                            case LazyStates.working:
-+                                throw "Illegal: reentrancy on initialization";
-+
-+                            default:
-+                                throw "Illegal";
-+                        }
-+                    },
-+                    set: function (value) {
-+                        switch (state) {
-+                            case LazyStates.working:
-+                                throw "Illegal: reentrancy on initialization";
-+
-+                            default:
-+                                state = LazyStates.initialized;
-+                                result = value;
-+                                break;
-+                        }
-+                    },
-+                    enumerable: true,
-+                    configurable: true
-+                };
-+            }
-+
-+            // helper for defining AMD module members
-+            function moduleDefine(exports, name, members) {
-+                var target = [exports];
-+                var publicNS = null;
-+                if (name) {
-+                    publicNS = createNamespace(_Global, name);
-+                    target.push(publicNS);
-+                }
-+                initializeProperties(target, members, name || "<ANONYMOUS>");
-+                return publicNS;
-+            }
-+
-+            // Establish members of the "WinJS.Namespace" namespace
-+            Object.defineProperties(_rootNamespace.Namespace, {
-+
-+                defineWithParent: { value: defineWithParent, writable: true, enumerable: true, configurable: true },
-+
-+                define: { value: define, writable: true, enumerable: true, configurable: true },
-+
-+                _lazy: { value: lazy, writable: true, enumerable: true, configurable: true },
-+
-+                _moduleDefine: { value: moduleDefine, writable: true, enumerable: true, configurable: true }
-+
-+            });
-+        })();
-+
-+        (function () {
-+
-+            function define(constructor, instanceMembers, staticMembers) {
-+                /// <signature helpKeyword="WinJS.Class.define">
-+                /// <summary locid="WinJS.Class.define">
-+                /// Defines a class using the given constructor and the specified instance members.
-+                /// </summary>
-+                /// <param name="constructor" type="Function" locid="WinJS.Class.define_p:constructor">
-+                /// A constructor function that is used to instantiate this class.
-+                /// </param>
-+                /// <param name="instanceMembers" type="Object" locid="WinJS.Class.define_p:instanceMembers">
-+                /// The set of instance fields, properties, and methods made available on the class.
-+                /// </param>
-+                /// <param name="staticMembers" type="Object" locid="WinJS.Class.define_p:staticMembers">
-+                /// The set of static fields, properties, and methods made available on the class.
-+                /// </param>
-+                /// <returns type="Function" locid="WinJS.Class.define_returnValue">
-+                /// The newly-defined class.
-+                /// </returns>
-+                /// </signature>
-+                constructor = constructor || function () {};
-+                _BaseCoreUtils.markSupportedForProcessing(constructor);
-+                if (instanceMembers) {
-+                    initializeProperties(constructor.prototype, instanceMembers);
-+                }
-+                if (staticMembers) {
-+                    initializeProperties(constructor, staticMembers);
-+                }
-+                return constructor;
-+            }
-+
-+            function derive(baseClass, constructor, instanceMembers, staticMembers) {
-+                /// <signature helpKeyword="WinJS.Class.derive">
-+                /// <summary locid="WinJS.Class.derive">
-+                /// Creates a sub-class based on the supplied baseClass parameter, using prototypal inheritance.
-+                /// </summary>
-+                /// <param name="baseClass" type="Function" locid="WinJS.Class.derive_p:baseClass">
-+                /// The class to inherit from.
-+                /// </param>
-+                /// <param name="constructor" type="Function" locid="WinJS.Class.derive_p:constructor">
-+                /// A constructor function that is used to instantiate this class.
-+                /// </param>
-+                /// <param name="instanceMembers" type="Object" locid="WinJS.Class.derive_p:instanceMembers">
-+                /// The set of instance fields, properties, and methods to be made available on the class.
-+                /// </param>
-+                /// <param name="staticMembers" type="Object" locid="WinJS.Class.derive_p:staticMembers">
-+                /// The set of static fields, properties, and methods to be made available on the class.
-+                /// </param>
-+                /// <returns type="Function" locid="WinJS.Class.derive_returnValue">
-+                /// The newly-defined class.
-+                /// </returns>
-+                /// </signature>
-+                if (baseClass) {
-+                    constructor = constructor || function () {};
-+                    var basePrototype = baseClass.prototype;
-+                    constructor.prototype = Object.create(basePrototype);
-+                    _BaseCoreUtils.markSupportedForProcessing(constructor);
-+                    Object.defineProperty(constructor.prototype, "constructor", { value: constructor, writable: true, configurable: true, enumerable: true });
-+                    if (instanceMembers) {
-+                        initializeProperties(constructor.prototype, instanceMembers);
-+                    }
-+                    if (staticMembers) {
-+                        initializeProperties(constructor, staticMembers);
-+                    }
-+                    return constructor;
-+                } else {
-+                    return define(constructor, instanceMembers, staticMembers);
-+                }
-+            }
-+
-+            function mix(constructor) {
-+                /// <signature helpKeyword="WinJS.Class.mix">
-+                /// <summary locid="WinJS.Class.mix">
-+                /// Defines a class using the given constructor and the union of the set of instance members
-+                /// specified by all the mixin objects. The mixin parameter list is of variable length.
-+                /// </summary>
-+                /// <param name="constructor" locid="WinJS.Class.mix_p:constructor">
-+                /// A constructor function that is used to instantiate this class.
-+                /// </param>
-+                /// <returns type="Function" locid="WinJS.Class.mix_returnValue">
-+                /// The newly-defined class.
-+                /// </returns>
-+                /// </signature>
-+                constructor = constructor || function () {};
-+                var i, len;
-+                for (i = 1, len = arguments.length; i < len; i++) {
-+                    initializeProperties(constructor.prototype, arguments[i]);
-+                }
-+                return constructor;
-+            }
-+
-+            // Establish members of "WinJS.Class" namespace
-+            _WinJS.Namespace.define("WinJS.Class", {
-+                define: define,
-+                derive: derive,
-+                mix: mix
-+            });
-+        })();
-+
-+        return {
-+            Namespace: _WinJS.Namespace,
-+            Class: _WinJS.Class
-+        };
-+    });
-+    _winjs("WinJS/Core/_ErrorFromName", ["WinJS/Core/_Base"], function errorsInit(_Base) {
-+        "use strict";
-+
-+        var ErrorFromName = _Base.Class.derive(Error, function (name, message) {
-+            /// <signature helpKeyword="WinJS.ErrorFromName">
-+            /// <summary locid="WinJS.ErrorFromName">
-+            /// Creates an Error object with the specified name and message properties.
-+            /// </summary>
-+            /// <param name="name" type="String" locid="WinJS.ErrorFromName_p:name">The name of this error. The name is meant to be consumed programmatically and should not be localized.</param>
-+            /// <param name="message" type="String" optional="true" locid="WinJS.ErrorFromName_p:message">The message for this error. The message is meant to be consumed by humans and should be localized.</param>
-+            /// <returns type="Error" locid="WinJS.ErrorFromName_returnValue">Error instance with .name and .message properties populated</returns>
-+            /// </signature>
-+            this.name = name;
-+            this.message = message || name;
-+        }, {
-+            /* empty */
-+        }, {
-+            supportedForProcessing: false
-+        });
-+
-+        _Base.Namespace.define("WinJS", {
-+            // ErrorFromName establishes a simple pattern for returning error codes.
-+            //
-+            ErrorFromName: ErrorFromName
-+        });
-+
-+        return ErrorFromName;
-+    });
-+
-+    _winjs("WinJS/Core/_Events", ["exports", "WinJS/Core/_Base"], function eventsInit(exports, _Base) {
-+        "use strict";
-+
-+        function createEventProperty(name) {
-+            var eventPropStateName = "_on" + name + "state";
-+
-+            return {
-+                get: function () {
-+                    var state = this[eventPropStateName];
-+                    return state && state.userHandler;
-+                },
-+                set: function (handler) {
-+                    var state = this[eventPropStateName];
-+                    if (handler) {
-+                        if (!state) {
-+                            state = { wrapper: function (evt) {
-+                                    return state.userHandler(evt);
-+                                }, userHandler: handler };
-+                            Object.defineProperty(this, eventPropStateName, { value: state, enumerable: false, writable: true, configurable: true });
-+                            this.addEventListener(name, state.wrapper, false);
-+                        }
-+                        state.userHandler = handler;
-+                    } else if (state) {
-+                        this.removeEventListener(name, state.wrapper, false);
-+                        this[eventPropStateName] = null;
-+                    }
-+                },
-+                enumerable: true
-+            };
-+        }
-+
-+        function createEventProperties() {
-+            /// <signature helpKeyword="WinJS.Utilities.createEventProperties">
-+            /// <summary locid="WinJS.Utilities.createEventProperties">
-+            /// Creates an object that has one property for each name passed to the function.
-+            /// </summary>
-+            /// <param name="events" locid="WinJS.Utilities.createEventProperties_p:events">
-+            /// A variable list of property names.
-+            /// </param>
-+            /// <returns type="Object" locid="WinJS.Utilities.createEventProperties_returnValue">
-+            /// The object with the specified properties. The names of the properties are prefixed with 'on'.
-+            /// </returns>
-+            /// </signature>
-+            var props = {};
-+            for (var i = 0, len = arguments.length; i < len; i++) {
-+                var name = arguments[i];
-+                props["on" + name] = createEventProperty(name);
-+            }
-+            return props;
-+        }
-+
-+        var EventMixinEvent = _Base.Class.define(function EventMixinEvent_ctor(type, detail, target) {
-+            this.detail = detail;
-+            this.target = target;
-+            this.timeStamp = Date.now();
-+            this.type = type;
-+        }, {
-+            bubbles: { value: false, writable: false },
-+            cancelable: { value: false, writable: false },
-+            currentTarget: {
-+                get: function () {
-+                    return this.target;
-+                }
-+            },
-+            defaultPrevented: {
-+                get: function () {
-+                    return this._preventDefaultCalled;
-+                }
-+            },
-+            trusted: { value: false, writable: false },
-+            eventPhase: { value: 0, writable: false },
-+            target: null,
-+            timeStamp: null,
-+            type: null,
-+
-+            preventDefault: function () {
-+                this._preventDefaultCalled = true;
-+            },
-+            stopImmediatePropagation: function () {
-+                this._stopImmediatePropagationCalled = true;
-+            },
-+            stopPropagation: function () {}
-+        }, {
-+            supportedForProcessing: false
-+        });
-+
-+        var eventMixin = {
-+            _listeners: null,
-+
-+            addEventListener: function (type, listener, useCapture) {
-+                /// <signature helpKeyword="WinJS.Utilities.eventMixin.addEventListener">
-+                /// <summary locid="WinJS.Utilities.eventMixin.addEventListener">
-+                /// Adds an event listener to the control.
-+                /// </summary>
-+                /// <param name="type" locid="WinJS.Utilities.eventMixin.addEventListener_p:type">
-+                /// The type (name) of the event.
-+                /// </param>
-+                /// <param name="listener" locid="WinJS.Utilities.eventMixin.addEventListener_p:listener">
-+                /// The listener to invoke when the event is raised.
-+                /// </param>
-+                /// <param name="useCapture" locid="WinJS.Utilities.eventMixin.addEventListener_p:useCapture">
-+                /// if true initiates capture, otherwise false.
-+                /// </param>
-+                /// </signature>
-+                useCapture = useCapture || false;
-+                this._listeners = this._listeners || {};
-+                var eventListeners = this._listeners[type] = this._listeners[type] || [];
-+                for (var i = 0, len = eventListeners.length; i < len; i++) {
-+                    var l = eventListeners[i];
-+                    if (l.useCapture === useCapture && l.listener === listener) {
-+                        return;
-+                    }
-+                }
-+                eventListeners.push({ listener: listener, useCapture: useCapture });
-+            },
-+            dispatchEvent: function (type, details) {
-+                /// <signature helpKeyword="WinJS.Utilities.eventMixin.dispatchEvent">
-+                /// <summary locid="WinJS.Utilities.eventMixin.dispatchEvent">
-+                /// Raises an event of the specified type and with the specified additional properties.
-+                /// </summary>
-+                /// <param name="type" locid="WinJS.Utilities.eventMixin.dispatchEvent_p:type">
-+                /// The type (name) of the event.
-+                /// </param>
-+                /// <param name="details" locid="WinJS.Utilities.eventMixin.dispatchEvent_p:details">
-+                /// The set of additional properties to be attached to the event object when the event is raised.
-+                /// </param>
-+                /// <returns type="Boolean" locid="WinJS.Utilities.eventMixin.dispatchEvent_returnValue">
-+                /// true if preventDefault was called on the event.
-+                /// </returns>
-+                /// </signature>
-+                var listeners = this._listeners && this._listeners[type];
-+                if (listeners) {
-+                    var eventValue = new EventMixinEvent(type, details, this);
-+                    // Need to copy the array to protect against people unregistering while we are dispatching
-+                    listeners = listeners.slice(0, listeners.length);
-+                    for (var i = 0, len = listeners.length; i < len && !eventValue._stopImmediatePropagationCalled; i++) {
-+                        listeners[i].listener(eventValue);
-+                    }
-+                    return eventValue.defaultPrevented || false;
-+                }
-+                return false;
-+            },
-+            removeEventListener: function (type, listener, useCapture) {
-+                /// <signature helpKeyword="WinJS.Utilities.eventMixin.removeEventListener">
-+                /// <summary locid="WinJS.Utilities.eventMixin.removeEventListener">
-+                /// Removes an event listener from the control.
-+                /// </summary>
-+                /// <param name="type" locid="WinJS.Utilities.eventMixin.removeEventListener_p:type">
-+                /// The type (name) of the event.
-+                /// </param>
-+                /// <param name="listener" locid="WinJS.Utilities.eventMixin.removeEventListener_p:listener">
-+                /// The listener to remove.
-+                /// </param>
-+                /// <param name="useCapture" locid="WinJS.Utilities.eventMixin.removeEventListener_p:useCapture">
-+                /// Specifies whether to initiate capture.
-+                /// </param>
-+                /// </signature>
-+                useCapture = useCapture || false;
-+                var listeners = this._listeners && this._listeners[type];
-+                if (listeners) {
-+                    for (var i = 0, len = listeners.length; i < len; i++) {
-+                        var l = listeners[i];
-+                        if (l.listener === listener && l.useCapture === useCapture) {
-+                            listeners.splice(i, 1);
-+                            if (listeners.length === 0) {
-+                                delete this._listeners[type];
-+                            }
-+                            // Only want to remove one element for each call to removeEventListener
-+                            break;
-+                        }
-+                    }
-+                }
-+            }
-+        };
-+
-+        _Base.Namespace._moduleDefine(exports, "WinJS.Utilities", {
-+            _createEventProperty: createEventProperty,
-+            createEventProperties: createEventProperties,
-+            eventMixin: eventMixin
-+        });
-+    });
-+
-+    _winjs("WinJS/Core/_Trace", ["WinJS/Core/_Global"], function traceInit(_Global) {
-+        "use strict";
-+
-+        function nop(v) {
-+            return v;
-+        }
-+
-+        return {
-+            _traceAsyncOperationStarting: _Global.Debug && _Global.Debug.msTraceAsyncOperationStarting && _Global.Debug.msTraceAsyncOperationStarting.bind(_Global.Debug) || nop,
-+            _traceAsyncOperationCompleted: _Global.Debug && _Global.Debug.msTraceAsyncOperationCompleted && _Global.Debug.msTraceAsyncOperationCompleted.bind(_Global.Debug) || nop,
-+            _traceAsyncCallbackStarting: _Global.Debug && _Global.Debug.msTraceAsyncCallbackStarting && _Global.Debug.msTraceAsyncCallbackStarting.bind(_Global.Debug) || nop,
-+            _traceAsyncCallbackCompleted: _Global.Debug && _Global.Debug.msTraceAsyncCallbackCompleted && _Global.Debug.msTraceAsyncCallbackCompleted.bind(_Global.Debug) || nop
-+        };
-+    });
-+    _winjs("WinJS/Promise/_StateMachine", ["WinJS/Core/_Global", "WinJS/Core/_BaseCoreUtils", "WinJS/Core/_Base", "WinJS/Core/_ErrorFromName", "WinJS/Core/_Events", "WinJS/Core/_Trace"], function promiseStateMachineInit(_Global, _BaseCoreUtils, _Base, _ErrorFromName, _Events, _Trace) {
-+        "use strict";
-+
-+        _Global.Debug && (_Global.Debug.setNonUserCodeExceptions = true);
-+
-+        var ListenerType = _Base.Class.mix(_Base.Class.define(null, {/*empty*/}, { supportedForProcessing: false }), _Events.eventMixin);
-+        var promiseEventListeners = new ListenerType();
-+        // make sure there is a listeners collection so that we can do a more trivial check below
-+        promiseEventListeners._listeners = {};
-+        var errorET = "error";
-+        var canceledName = "Canceled";
-+        var tagWithStack = false;
-+        var tag = {
-+            promise: 0x01,
-+            thenPromise: 0x02,
-+            errorPromise: 0x04,
-+            exceptionPromise: 0x08,
-+            completePromise: 0x10
-+        };
-+        tag.all = tag.promise | tag.thenPromise | tag.errorPromise | tag.exceptionPromise | tag.completePromise;
-+
-+        //
-+        // Global error counter, for each error which enters the system we increment this once and then
-+        // the error number travels with the error as it traverses the tree of potential handlers.
-+        //
-+        // When someone has registered to be told about errors (WinJS.Promise.callonerror) promises
-+        // which are in error will get tagged with a ._errorId field. This tagged field is the
-+        // contract by which nested promises with errors will be identified as chaining for the
-+        // purposes of the callonerror semantics. If a nested promise in error is encountered without
-+        // a ._errorId it will be assumed to be foreign and treated as an interop boundary and
-+        // a new error id will be minted.
-+        //
-+        var error_number = 1;
-+
-+        //
-+        // The state machine has a interesting hiccup in it with regards to notification, in order
-+        // to flatten out notification and avoid recursion for synchronous completion we have an
-+        // explicit set of *_notify states which are responsible for notifying their entire tree
-+        // of children. They can do this because they know that immediate children are always
-+        // ThenPromise instances and we can therefore reach into their state to access the
-+        // _listeners collection.
-+        //
-+        // So, what happens is that a Promise will be fulfilled through the _completed or _error
-+        // messages at which point it will enter a *_notify state and be responsible for to move
-+        // its children into an (as appropriate) success or error state and also notify that child's
-+        // listeners of the state transition, until leaf notes are reached.
-+        //
-+
-+        var state_created, // -> working
-+        state_working, // -> error | error_notify | success | success_notify | canceled | waiting
-+        state_waiting, // -> error | error_notify | success | success_notify | waiting_canceled
-+        state_waiting_canceled, // -> error | error_notify | success | success_notify | canceling
-+        state_canceled, // -> error | error_notify | success | success_notify | canceling
-+        state_canceling, // -> error_notify
-+        state_success_notify, // -> success
-+        state_success, // -> .
-+        state_error_notify, // -> error
-+        state_error; // -> .
-+
-+        // Noop function, used in the various states to indicate that they don't support a given
-+        // message. Named with the somewhat cute name '_' because it reads really well in the states.
-+
-+        function _() {}
-+
-+        // Initial state
-+        //
-+        state_created = {
-+            name: "created",
-+            enter: function (promise) {
-+                promise._setState(state_working);
-+            },
-+            cancel: _,
-+            done: _,
-+            then: _,
-+            _completed: _,
-+            _error: _,
-+            _notify: _,
-+            _progress: _,
-+            _setCompleteValue: _,
-+            _setErrorValue: _
-+        };
-+
-+        // Ready state, waiting for a message (completed/error/progress), able to be canceled
-+        //
-+        state_working = {
-+            name: "working",
-+            enter: _,
-+            cancel: function (promise) {
-+                promise._setState(state_canceled);
-+            },
-+            done: done,
-+            then: then,
-+            _completed: completed,
-+            _error: error,
-+            _notify: _,
-+            _progress: progress,
-+            _setCompleteValue: setCompleteValue,
-+            _setErrorValue: setErrorValue
-+        };
-+
-+        // Waiting state, if a promise is completed with a value which is itself a promise
-+        // (has a then() method) it signs up to be informed when that child promise is
-+        // fulfilled at which point it will be fulfilled with that value.
-+        //
-+        state_waiting = {
-+            name: "waiting",
-+            enter: function (promise) {
-+                var waitedUpon = promise._value;
-+                // We can special case our own intermediate promises which are not in a
-+                //  terminal state by just pushing this promise as a listener without
-+                //  having to create new indirection functions
-+                if (waitedUpon instanceof ThenPromise && waitedUpon._state !== state_error && waitedUpon._state !== state_success) {
-+                    pushListener(waitedUpon, { promise: promise });
-+                } else {
-+                    var error = function (value) {
-+                        if (waitedUpon._errorId) {
-+                            promise._chainedError(value, waitedUpon);
-+                        } else {
-+                            // Because this is an interop boundary we want to indicate that this
-+                            //  error has been handled by the promise infrastructure before we
-+                            //  begin a new handling chain.
-+                            //
-+                            callonerror(promise, value, detailsForHandledError, waitedUpon, error);
-+                            promise._error(value);
-+                        }
-+                    };
-+                    error.handlesOnError = true;
-+                    waitedUpon.then(promise._completed.bind(promise), error, promise._progress.bind(promise));
-+                }
-+            },
-+            cancel: function (promise) {
-+                promise._setState(state_waiting_canceled);
-+            },
-+            done: done,
-+            then: then,
-+            _completed: completed,
-+            _error: error,
-+            _notify: _,
-+            _progress: progress,
-+            _setCompleteValue: setCompleteValue,
-+            _setErrorValue: setErrorValue
-+        };
-+
-+        // Waiting canceled state, when a promise has been in a waiting state and receives a
-+        // request to cancel its pending work it will forward that request to the child promise
-+        // and then waits to be informed of the result. This promise moves itself into the
-+        // canceling state but understands that the child promise may instead push it to a
-+        // different state.
-+        //
-+        state_waiting_canceled = {
-+            name: "waiting_canceled",
-+            enter: function (promise) {
-+                // Initiate a transition to canceling. Triggering a cancel on the promise
-+                // that we are waiting upon may result in a different state transition
-+                // before the state machine pump runs again.
-+                promise._setState(state_canceling);
-+                var waitedUpon = promise._value;
-+                if (waitedUpon.cancel) {
-+                    waitedUpon.cancel();
-+                }
-+            },
-+            cancel: _,
-+            done: done,
-+            then: then,
-+            _completed: completed,
-+            _error: error,
-+            _notify: _,
-+            _progress: progress,
-+            _setCompleteValue: setCompleteValue,
-+            _setErrorValue: setErrorValue
-+        };
-+
-+        // Canceled state, moves to the canceling state and then tells the promise to do
-+        // whatever it might need to do on cancelation.
-+        //
-+        state_canceled = {
-+            name: "canceled",
-+            enter: function (promise) {
-+                // Initiate a transition to canceling. The _cancelAction may change the state
-+                // before the state machine pump runs again.
-+                promise._setState(state_canceling);
-+                promise._cancelAction();
-+            },
-+            cancel: _,
-+            done: done,
-+            then: then,
-+            _completed: completed,
-+            _error: error,
-+            _notify: _,
-+            _progress: progress,
-+            _setCompleteValue: setCompleteValue,
-+            _setErrorValue: setErrorValue
-+        };
-+
-+        // Canceling state, commits to the promise moving to an error state with an error
-+        // object whose 'name' and 'message' properties contain the string "Canceled"
-+        //
-+        state_canceling = {
-+            name: "canceling",
-+            enter: function (promise) {
-+                var error = new Error(canceledName);
-+                error.name = error.message;
-+                promise._value = error;
-+                promise._setState(state_error_notify);
-+            },
-+            cancel: _,
-+            done: _,
-+            then: _,
-+            _completed: _,
-+            _error: _,
-+            _notify: _,
-+            _progress: _,
-+            _setCompleteValue: _,
-+            _setErrorValue: _
-+        };
-+
-+        // Success notify state, moves a promise to the success state and notifies all children
-+        //
-+        state_success_notify = {
-+            name: "complete_notify",
-+            enter: function (promise) {
-+                promise.done = CompletePromise.prototype.done;
-+                promise.then = CompletePromise.prototype.then;
-+                if (promise._listeners) {
-+                    var queue = [promise];
-+                    var p;
-+                    while (queue.length) {
-+                        p = queue.shift();
-+                        p._state._notify(p, queue);
-+                    }
-+                }
-+                promise._setState(state_success);
-+            },
-+            cancel: _,
-+            done: null, /*error to get here */
-+            then: null, /*error to get here */
-+            _completed: _,
-+            _error: _,
-+            _notify: notifySuccess,
-+            _progress: _,
-+            _setCompleteValue: _,
-+            _setErrorValue: _
-+        };
-+
-+        // Success state, moves a promise to the success state and does NOT notify any children.
-+        // Some upstream promise is owning the notification pass.
-+        //
-+        state_success = {
-+            name: "success",
-+            enter: function (promise) {
-+                promise.done = CompletePromise.prototype.done;
-+                promise.then = CompletePromise.prototype.then;
-+                promise._cleanupAction();
-+            },
-+            cancel: _,
-+            done: null, /*error to get here */
-+            then: null, /*error to get here */
-+            _completed: _,
-+            _error: _,
-+            _notify: notifySuccess,
-+            _progress: _,
-+            _setCompleteValue: _,
-+            _setErrorValue: _
-+        };
-+
-+        // Error notify state, moves a promise to the error state and notifies all children
-+        //
-+        state_error_notify = {
-+            name: "error_notify",
-+            enter: function (promise) {
-+                promise.done = ErrorPromise.prototype.done;
-+                promise.then = ErrorPromise.prototype.then;
-+                if (promise._listeners) {
-+                    var queue = [promise];
-+                    var p;
-+                    while (queue.length) {
-+                        p = queue.shift();
-+                        p._state._notify(p, queue);
-+                    }
-+                }
-+                promise._setState(state_error);
-+            },
-+            cancel: _,
-+            done: null, /*error to get here*/
-+            then: null, /*error to get here*/
-+            _completed: _,
-+            _error: _,
-+            _notify: notifyError,
-+            _progress: _,
-+            _setCompleteValue: _,
-+            _setErrorValue: _
-+        };
-+
-+        // Error state, moves a promise to the error state and does NOT notify any children.
-+        // Some upstream promise is owning the notification pass.
-+        //
-+        state_error = {
-+            name: "error",
-+            enter: function (promise) {
-+                promise.done = ErrorPromise.prototype.done;
-+                promise.then = ErrorPromise.prototype.then;
-+                promise._cleanupAction();
-+            },
-+            cancel: _,
-+            done: null, /*error to get here*/
-+            then: null, /*error to get here*/
-+            _completed: _,
-+            _error: _,
-+            _notify: notifyError,
-+            _progress: _,
-+            _setCompleteValue: _,
-+            _setErrorValue: _
-+        };
-+
-+        //
-+        // The statemachine implementation follows a very particular pattern, the states are specified
-+        // as static stateless bags of functions which are then indirected through the state machine
-+        // instance (a Promise). As such all of the functions on each state have the promise instance
-+        // passed to them explicitly as a parameter and the Promise instance members do a little
-+        // dance where they indirect through the state and insert themselves in the argument list.
-+        //
-+        // We could instead call directly through the promise states however then every caller
-+        // would have to remember to do things like pumping the state machine to catch state transitions.
-+        //
-+
-+        var PromiseStateMachine = _Base.Class.define(null, {
-+            _listeners: null,
-+            _nextState: null,
-+            _state: null,
-+            _value: null,
-+
-+            cancel: function () {
-+                /// <signature helpKeyword="WinJS.PromiseStateMachine.cancel">
-+                /// <summary locid="WinJS.PromiseStateMachine.cancel">
-+                /// Attempts to cancel the fulfillment of a promised value. If the promise hasn't
-+                /// already been fulfilled and cancellation is supported, the promise enters
-+                /// the error state with a value of Error("Canceled").
-+                /// </summary>
-+                /// </signature>
-+                this._state.cancel(this);
-+                this._run();
-+            },
-+            done: function Promise_done(onComplete, onError, onProgress) {
-+                /// <signature helpKeyword="WinJS.PromiseStateMachine.done">
-+                /// <summary locid="WinJS.PromiseStateMachine.done">
-+                /// Allows you to specify the work to be done on the fulfillment of the promised value,
-+                /// the error handling to be performed if the promise fails to fulfill
-+                /// a value, and the handling of progress notifications along the way.
-+                ///
-+                /// After the handlers have finished executing, this function throws any error that would have been returned
-+                /// from then() as a promise in the error state.
-+                /// </summary>
-+                /// <param name='onComplete' type='Function' locid="WinJS.PromiseStateMachine.done_p:onComplete">
-+                /// The function to be called if the promise is fulfilled successfully with a value.
-+                /// The fulfilled value is passed as the single argument. If the value is null,
-+                /// the fulfilled value is returned. The value returned
-+                /// from the function becomes the fulfilled value of the promise returned by
-+                /// then(). If an exception is thrown while executing the function, the promise returned
-+                /// by then() moves into the error state.
-+                /// </param>
-+                /// <param name='onError' type='Function' optional='true' locid="WinJS.PromiseStateMachine.done_p:onError">
-+                /// The function to be called if the promise is fulfilled with an error. The error
-+                /// is passed as the single argument. If it is null, the error is forwarded.
-+                /// The value returned from the function is the fulfilled value of the promise returned by then().
-+                /// </param>
-+                /// <param name='onProgress' type='Function' optional='true' locid="WinJS.PromiseStateMachine.done_p:onProgress">
-+                /// the function to be called if the promise reports progress. Data about the progress
-+                /// is passed as the single argument. Promises are not required to support
-+                /// progress.
-+                /// </param>
-+                /// </signature>
-+                this._state.done(this, onComplete, onError, onProgress);
-+            },
-+            then: function Promise_then(onComplete, onError, onProgress) {
-+                /// <signature helpKeyword="WinJS.PromiseStateMachine.then">
-+                /// <summary locid="WinJS.PromiseStateMachine.then">
-+                /// Allows you to specify the work to be done on the fulfillment of the promised value,
-+                /// the error handling to be performed if the promise fails to fulfill
-+                /// a value, and the handling of progress notifications along the way.
-+                /// </summary>
-+                /// <param name='onComplete' type='Function' locid="WinJS.PromiseStateMachine.then_p:onComplete">
-+                /// The function to be called if the promise is fulfilled successfully with a value.
-+                /// The value is passed as the single argument. If the value is null, the value is returned.
-+                /// The value returned from the function becomes the fulfilled value of the promise returned by
-+                /// then(). If an exception is thrown while this function is being executed, the promise returned
-+                /// by then() moves into the error state.
-+                /// </param>
-+                /// <param name='onError' type='Function' optional='true' locid="WinJS.PromiseStateMachine.then_p:onError">
-+                /// The function to be called if the promise is fulfilled with an error. The error
-+                /// is passed as the single argument. If it is null, the error is forwarded.
-+                /// The value returned from the function becomes the fulfilled value of the promise returned by then().
-+                /// </param>
-+                /// <param name='onProgress' type='Function' optional='true' locid="WinJS.PromiseStateMachine.then_p:onProgress">
-+                /// The function to be called if the promise reports progress. Data about the progress
-+                /// is passed as the single argument. Promises are not required to support
-+                /// progress.
-+                /// </param>
-+                /// <returns type="WinJS.Promise" locid="WinJS.PromiseStateMachine.then_returnValue">
-+                /// The promise whose value is the result of executing the complete or
-+                /// error function.
-+                /// </returns>
-+                /// </signature>
-+                return this._state.then(this, onComplete, onError, onProgress);
-+            },
-+
-+            _chainedError: function (value, context) {
-+                var result = this._state._error(this, value, detailsForChainedError, context);
-+                this._run();
-+                return result;
-+            },
-+            _completed: function (value) {
-+                var result = this._state._completed(this, value);
-+                this._run();
-+                return result;
-+            },
-+            _error: function (value) {
-+                var result = this._state._error(this, value, detailsForError);
-+                this._run();
-+                return result;
-+            },
-+            _progress: function (value) {
-+                this._state._progress(this, value);
-+            },
-+            _setState: function (state) {
-+                this._nextState = state;
-+            },
-+            _setCompleteValue: function (value) {
-+                this._state._setCompleteValue(this, value);
-+                this._run();
-+            },
-+            _setChainedErrorValue: function (value, context) {
-+                var result = this._state._setErrorValue(this, value, detailsForChainedError, context);
-+                this._run();
-+                return result;
-+            },
-+            _setExceptionValue: function (value) {
-+                var result = this._state._setErrorValue(this, value, detailsForException);
-+                this._run();
-+                return result;
-+            },
-+            _run: function () {
-+                while (this._nextState) {
-+                    this._state = this._nextState;
-+                    this._nextState = null;
-+                    this._state.enter(this);
-+                }
-+            }
-+        }, {
-+            supportedForProcessing: false
-+        });
-+
-+        //
-+        // Implementations of shared state machine code.
-+        //
-+
-+        function completed(promise, value) {
-+            var targetState;
-+            if (value && typeof value === "object" && typeof value.then === "function") {
-+                targetState = state_waiting;
-+            } else {
-+                targetState = state_success_notify;
-+            }
-+            promise._value = value;
-+            promise._setState(targetState);
-+        }
-+        function createErrorDetails(exception, error, promise, id, parent, handler) {
-+            return {
-+                exception: exception,
-+                error: error,
-+                promise: promise,
-+                handler: handler,
-+                id: id,
-+                parent: parent
-+            };
-+        }
-+        function detailsForHandledError(promise, errorValue, context, handler) {
-+            var exception = context._isException;
-+            var errorId = context._errorId;
-+            return createErrorDetails(exception ? errorValue : null, exception ? null : errorValue, promise, errorId, context, handler);
-+        }
-+        function detailsForChainedError(promise, errorValue, context) {
-+            var exception = context._isException;
-+            var errorId = context._errorId;
-+            setErrorInfo(promise, errorId, exception);
-+            return createErrorDetails(exception ? errorValue : null, exception ? null : errorValue, promise, errorId, context);
-+        }
-+        function detailsForError(promise, errorValue) {
-+            var errorId = ++error_number;
-+            setErrorInfo(promise, errorId);
-+            return createErrorDetails(null, errorValue, promise, errorId);
-+        }
-+        function detailsForException(promise, exceptionValue) {
-+            var errorId = ++error_number;
-+            setErrorInfo(promise, errorId, true);
-+            return createErrorDetails(exceptionValue, null, promise, errorId);
-+        }
-+        function done(promise, onComplete, onError, onProgress) {
-+            var asyncOpID = _Trace._traceAsyncOperationStarting("WinJS.Promise.done");
-+            pushListener(promise, { c: onComplete, e: onError, p: onProgress, asyncOpID: asyncOpID });
-+        }
-+        function error(promise, value, onerrorDetails, context) {
-+            promise._value = value;
-+            callonerror(promise, value, onerrorDetails, context);
-+            promise._setState(state_error_notify);
-+        }
-+        function notifySuccess(promise, queue) {
-+            var value = promise._value;
-+            var listeners = promise._listeners;
-+            if (!listeners) {
-+                return;
-+            }
-+            promise._listeners = null;
-+            var i, len;
-+            for (i = 0, len = Array.isArray(listeners) ? listeners.length : 1; i < len; i++) {
-+                var listener = len === 1 ? listeners : listeners[i];
-+                var onComplete = listener.c;
-+                var target = listener.promise;
-+
-+                _Trace._traceAsyncOperationCompleted(listener.asyncOpID, _Global.Debug && _Global.Debug.MS_ASYNC_OP_STATUS_SUCCESS);
-+
-+                if (target) {
-+                    _Trace._traceAsyncCallbackStarting(listener.asyncOpID);
-+                    try {
-+                        target._setCompleteValue(onComplete ? onComplete(value) : value);
-+                    } catch (ex) {
-+                        target._setExceptionValue(ex);
-+                    } finally {
-+                        _Trace._traceAsyncCallbackCompleted();
-+                    }
-+                    if (target._state !== state_waiting && target._listeners) {
-+                        queue.push(target);
-+                    }
-+                } else {
-+                    CompletePromise.prototype.done.call(promise, onComplete);
-+                }
-+            }
-+        }
-+        function notifyError(promise, queue) {
-+            var value = promise._value;
-+            var listeners = promise._listeners;
-+            if (!listeners) {
-+                return;
-+            }
-+            promise._listeners = null;
-+            var i, len;
-+            for (i = 0, len = Array.isArray(listeners) ? listeners.length : 1; i < len; i++) {
-+                var listener = len === 1 ? listeners : listeners[i];
-+                var onError = listener.e;
-+                var target = listener.promise;
-+
-+                var errorID = _Global.Debug && (value && value.name === canceledName ? _Global.Debug.MS_ASYNC_OP_STATUS_CANCELED : _Global.Debug.MS_ASYNC_OP_STATUS_ERROR);
-+                _Trace._traceAsyncOperationCompleted(listener.asyncOpID, errorID);
-+
-+                if (target) {
-+                    var asyncCallbackStarted = false;
-+                    try {
-+                        if (onError) {
-+                            _Trace._traceAsyncCallbackStarting(listener.asyncOpID);
-+                            asyncCallbackStarted = true;
-+                            if (!onError.handlesOnError) {
-+                                callonerror(target, value, detailsForHandledError, promise, onError);
-+                            }
-+                            target._setCompleteValue(onError(value));
-+                        } else {
-+                            target._setChainedErrorValue(value, promise);
-+                        }
-+                    } catch (ex) {
-+                        target._setExceptionValue(ex);
-+                    } finally {
-+                        if (asyncCallbackStarted) {
-+                            _Trace._traceAsyncCallbackCompleted();
-+                        }
-+                    }
-+                    if (target._state !== state_waiting && target._listeners) {
-+                        queue.push(target);
-+                    }
-+                } else {
-+                    ErrorPromise.prototype.done.call(promise, null, onError);
-+                }
-+            }
-+        }
-+        function callonerror(promise, value, onerrorDetailsGenerator, context, handler) {
-+            if (promiseEventListeners._listeners[errorET]) {
-+                if (value instanceof Error && value.message === canceledName) {
-+                    return;
-+                }
-+                promiseEventListeners.dispatchEvent(errorET, onerrorDetailsGenerator(promise, value, context, handler));
-+            }
-+        }
-+        function progress(promise, value) {
-+            var listeners = promise._listeners;
-+            if (listeners) {
-+                var i, len;
-+                for (i = 0, len = Array.isArray(listeners) ? listeners.length : 1; i < len; i++) {
-+                    var listener = len === 1 ? listeners : listeners[i];
-+                    var onProgress = listener.p;
-+                    if (onProgress) {
-+                        try {
-+                            onProgress(value);
-+                        } catch (ex) {}
-+                    }
-+                    if (!(listener.c || listener.e) && listener.promise) {
-+                        listener.promise._progress(value);
-+                    }
-+                }
-+            }
-+        }
-+        function pushListener(promise, listener) {
-+            var listeners = promise._listeners;
-+            if (listeners) {
-+                // We may have either a single listener (which will never be wrapped in an array)
-+                // or 2+ listeners (which will be wrapped). Since we are now adding one more listener
-+                // we may have to wrap the single listener before adding the second.
-+                listeners = Array.isArray(listeners) ? listeners : [listeners];
-+                listeners.push(listener);
-+            } else {
-+                listeners = listener;
-+            }
-+            promise._listeners = listeners;
-+        }
-+        // The difference beween setCompleteValue()/setErrorValue() and complete()/error() is that setXXXValue() moves
-+        // a promise directly to the success/error state without starting another notification pass (because one
-+        // is already ongoing).
-+        function setErrorInfo(promise, errorId, isException) {
-+            promise._isException = isException || false;
-+            promise._errorId = errorId;
-+        }
-+        function setErrorValue(promise, value, onerrorDetails, context) {
-+            promise._value = value;
-+            callonerror(promise, value, onerrorDetails, context);
-+            promise._setState(state_error);
-+        }
-+        function setCompleteValue(promise, value) {
-+            var targetState;
-+            if (value && typeof value === "object" && typeof value.then === "function") {
-+                targetState = state_waiting;
-+            } else {
-+                targetState = state_success;
-+            }
-+            promise._value = value;
-+            promise._setState(targetState);
-+        }
-+        function then(promise, onComplete, onError, onProgress) {
-+            var result = new ThenPromise(promise);
-+            var asyncOpID = _Trace._traceAsyncOperationStarting("WinJS.Promise.then");
-+            pushListener(promise, { promise: result, c: onComplete, e: onError, p: onProgress, asyncOpID: asyncOpID });
-+            return result;
-+        }
-+
-+        //
-+        // Internal implementation detail promise, ThenPromise is created when a promise needs
-+        // to be returned from a then() method.
-+        //
-+        var ThenPromise = _Base.Class.derive(PromiseStateMachine, function (creator) {
-+
-+            if (tagWithStack && (tagWithStack === true || tagWithStack & tag.thenPromise)) {
-+                this._stack = Promise._getStack();
-+            }
-+
-+            this._creator = creator;
-+            this._setState(state_created);
-+            this._run();
-+        }, {
-+            _creator: null,
-+
-+            _cancelAction: function () {
-+                if (this._creator) {
-+                    this._creator.cancel();
-+                }
-+            },
-+            _cleanupAction: function () {
-+                this._creator = null;
-+            }
-+        }, {
-+            supportedForProcessing: false
-+        });
-+
-+        //
-+        // Slim promise implementations for already completed promises, these are created
-+        // under the hood on synchronous completion paths as well as by WinJS.Promise.wrap
-+        // and WinJS.Promise.wrapError.
-+        //
-+
-+        var ErrorPromise = _Base.Class.define(function ErrorPromise_ctor(value) {
-+
-+            if (tagWithStack && (tagWithStack === true || tagWithStack & tag.errorPromise)) {
-+                this._stack = Promise._getStack();
-+            }
-+
-+            this._value = value;
-+            callonerror(this, value, detailsForError);
-+        }, {
-+            cancel: function () {
-+                /// <signature helpKeyword="WinJS.PromiseStateMachine.cancel">
-+                /// <summary locid="WinJS.PromiseStateMachine.cancel">
-+                /// Attempts to cancel the fulfillment of a promised value. If the promise hasn't
-+                /// already been fulfilled and cancellation is supported, the promise enters
-+                /// the error state with a value of Error("Canceled").
-+                /// </summary>
-+                /// </signature>
-+            },
-+            done: function ErrorPromise_done(unused, onError) {
-+                /// <signature helpKeyword="WinJS.PromiseStateMachine.done">
-+                /// <summary locid="WinJS.PromiseStateMachine.done">
-+                /// Allows you to specify the work to be done on the fulfillment of the promised value,
-+                /// the error handling to be performed if the promise fails to fulfill
-+                /// a value, and the handling of progress notifications along the way.
-+                ///
-+                /// After the handlers have finished executing, this function throws any error that would have been returned
-+                /// from then() as a promise in the error state.
-+                /// </summary>
-+                /// <param name='onComplete' type='Function' locid="WinJS.PromiseStateMachine.done_p:onComplete">
-+                /// The function to be called if the promise is fulfilled successfully with a value.
-+                /// The fulfilled value is passed as the single argument. If the value is null,
-+                /// the fulfilled value is returned. The value returned
-+                /// from the function becomes the fulfilled value of the promise returned by
-+                /// then(). If an exception is thrown while executing the function, the promise returned
-+                /// by then() moves into the error state.
-+                /// </param>
-+                /// <param name='onError' type='Function' optional='true' locid="WinJS.PromiseStateMachine.done_p:onError">
-+                /// The function to be called if the promise is fulfilled with an error. The error
-+                /// is passed as the single argument. If it is null, the error is forwarded.
-+                /// The value returned from the function is the fulfilled value of the promise returned by then().
-+                /// </param>
-+                /// <param name='onProgress' type='Function' optional='true' locid="WinJS.PromiseStateMachine.done_p:onProgress">
-+                /// the function to be called if the promise reports progress. Data about the progress
-+                /// is passed as the single argument. Promises are not required to support
-+                /// progress.
-+                /// </param>
-+                /// </signature>
-+                var value = this._value;
-+                if (onError) {
-+                    try {
-+                        if (!onError.handlesOnError) {
-+                            callonerror(null, value, detailsForHandledError, this, onError);
-+                        }
-+                        var result = onError(value);
-+                        if (result && typeof result === "object" && typeof result.done === "function") {
-+                            // If a promise is returned we need to wait on it.
-+                            result.done();
-+                        }
-+                        return;
-+                    } catch (ex) {
-+                        value = ex;
-+                    }
-+                }
-+                if (value instanceof Error && value.message === canceledName) {
-+                    // suppress cancel
-+                    return;
-+                }
-+                // force the exception to be thrown asyncronously to avoid any try/catch blocks
-+                //
-+                Promise._doneHandler(value);
-+            },
-+            then: function ErrorPromise_then(unused, onError) {
-+                /// <signature helpKeyword="WinJS.PromiseStateMachine.then">
-+                /// <summary locid="WinJS.PromiseStateMachine.then">
-+                /// Allows you to specify the work to be done on the fulfillment of the promised value,
-+                /// the error handling to be performed if the promise fails to fulfill
-+                /// a value, and the handling of progress notifications along the way.
-+                /// </summary>
-+                /// <param name='onComplete' type='Function' locid="WinJS.PromiseStateMachine.then_p:onComplete">
-+                /// The function to be called if the promise is fulfilled successfully with a value.
-+                /// The value is passed as the single argument. If the value is null, the value is returned.
-+                /// The value returned from the function becomes the fulfilled value of the promise returned by
-+                /// then(). If an exception is thrown while this function is being executed, the promise returned
-+                /// by then() moves into the error state.
-+                /// </param>
-+                /// <param name='onError' type='Function' optional='true' locid="WinJS.PromiseStateMachine.then_p:onError">
-+                /// The function to be called if the promise is fulfilled with an error. The error
-+                /// is passed as the single argument. If it is null, the error is forwarded.
-+                /// The value returned from the function becomes the fulfilled value of the promise returned by then().
-+                /// </param>
-+                /// <param name='onProgress' type='Function' optional='true' locid="WinJS.PromiseStateMachine.then_p:onProgress">
-+                /// The function to be called if the promise reports progress. Data about the progress
-+                /// is passed as the single argument. Promises are not required to support
-+                /// progress.
-+                /// </param>
-+                /// <returns type="WinJS.Promise" locid="WinJS.PromiseStateMachine.then_returnValue">
-+                /// The promise whose value is the result of executing the complete or
-+                /// error function.
-+                /// </returns>
-+                /// </signature>
-+
-+                // If the promise is already in a error state and no error handler is provided
-+                // we optimize by simply returning the promise instead of creating a new one.
-+                //
-+                if (!onError) {
-+                    return this;
-+                }
-+                var result;
-+                var value = this._value;
-+                try {
-+                    if (!onError.handlesOnError) {
-+                        callonerror(null, value, detailsForHandledError, this, onError);
-+                    }
-+                    result = new CompletePromise(onError(value));
-+                } catch (ex) {
-+                    // If the value throw from the error handler is the same as the value
-+                    // provided to the error handler then there is no need for a new promise.
-+                    //
-+                    if (ex === value) {
-+                        result = this;
-+                    } else {
-+                        result = new ExceptionPromise(ex);
-+                    }
-+                }
-+                return result;
-+            }
-+        }, {
-+            supportedForProcessing: false
-+        });
-+
-+        var ExceptionPromise = _Base.Class.derive(ErrorPromise, function ExceptionPromise_ctor(value) {
-+
-+            if (tagWithStack && (tagWithStack === true || tagWithStack & tag.exceptionPromise)) {
-+                this._stack = Promise._getStack();
-+            }
-+
-+            this._value = value;
-+            callonerror(this, value, detailsForException);
-+        }, {
-+            /* empty */
-+        }, {
-+            supportedForProcessing: false
-+        });
-+
-+        var CompletePromise = _Base.Class.define(function CompletePromise_ctor(value) {
-+
-+            if (tagWithStack && (tagWithStack === true || tagWithStack & tag.completePromise)) {
-+                this._stack = Promise._getStack();
-+            }
-+
-+            if (value && typeof value === "object" && typeof value.then === "function") {
-+                var result = new ThenPromise(null);
-+                result._setCompleteValue(value);
-+                return result;
-+            }
-+            this._value = value;
-+        }, {
-+            cancel: function () {
-+                /// <signature helpKeyword="WinJS.PromiseStateMachine.cancel">
-+                /// <summary locid="WinJS.PromiseStateMachine.cancel">
-+                /// Attempts to cancel the fulfillment of a promised value. If the promise hasn't
-+                /// already been fulfilled and cancellation is supported, the promise enters
-+                /// the error state with a value of Error("Canceled").
-+                /// </summary>
-+                /// </signature>
-+            },
-+            done: function CompletePromise_done(onComplete) {
-+                /// <signature helpKeyword="WinJS.PromiseStateMachine.done">
-+                /// <summary locid="WinJS.PromiseStateMachine.done">
-+                /// Allows you to specify the work to be done on the fulfillment of the promised value,
-+                /// the error handling to be performed if the promise fails to fulfill
-+                /// a value, and the handling of progress notifications along the way.
-+                ///
-+                /// After the handlers have finished executing, this function throws any error that would have been returned
-+                /// from then() as a promise in the error state.
-+                /// </summary>
-+                /// <param name='onComplete' type='Function' locid="WinJS.PromiseStateMachine.done_p:onComplete">
-+                /// The function to be called if the promise is fulfilled successfully with a value.
-+                /// The fulfilled value is passed as the single argument. If the value is null,
-+                /// the fulfilled value is returned. The value returned
-+                /// from the function becomes the fulfilled value of the promise returned by
-+                /// then(). If an exception is thrown while executing the function, the promise returned
-+                /// by then() moves into the error state.
-+                /// </param>
-+                /// <param name='onError' type='Function' optional='true' locid="WinJS.PromiseStateMachine.done_p:onError">
-+                /// The function to be called if the promise is fulfilled with an error. The error
-+                /// is passed as the single argument. If it is null, the error is forwarded.
-+                /// The value returned from the function is the fulfilled value of the promise returned by then().
-+                /// </param>
-+                /// <param name='onProgress' type='Function' optional='true' locid="WinJS.PromiseStateMachine.done_p:onProgress">
-+                /// the function to be called if the promise reports progress. Data about the progress
-+                /// is passed as the single argument. Promises are not required to support
-+                /// progress.
-+                /// </param>
-+                /// </signature>
-+                if (!onComplete) {
-+                    return;
-+                }
-+                try {
-+                    var result = onComplete(this._value);
-+                    if (result && typeof result === "object" && typeof result.done === "function") {
-+                        result.done();
-+                    }
-+                } catch (ex) {
-+                    // force the exception to be thrown asynchronously to avoid any try/catch blocks
-+                    Promise._doneHandler(ex);
-+                }
-+            },
-+            then: function CompletePromise_then(onComplete) {
-+                /// <signature helpKeyword="WinJS.PromiseStateMachine.then">
-+                /// <summary locid="WinJS.PromiseStateMachine.then">
-+                /// Allows you to specify the work to be done on the fulfillment of the promised value,
-+                /// the error handling to be performed if the promise fails to fulfill
-+                /// a value, and the handling of progress notifications along the way.
-+                /// </summary>
-+                /// <param name='onComplete' type='Function' locid="WinJS.PromiseStateMachine.then_p:onComplete">
-+                /// The function to be called if the promise is fulfilled successfully with a value.
-+                /// The value is passed as the single argument. If the value is null, the value is returned.
-+                /// The value returned from the function becomes the fulfilled value of the promise returned by
-+                /// then(). If an exception is thrown while this function is being executed, the promise returned
-+                /// by then() moves into the error state.
-+                /// </param>
-+                /// <param name='onError' type='Function' optional='true' locid="WinJS.PromiseStateMachine.then_p:onError">
-+                /// The function to be called if the promise is fulfilled with an error. The error
-+                /// is passed as the single argument. If it is null, the error is forwarded.
-+                /// The value returned from the function becomes the fulfilled value of the promise returned by then().
-+                /// </param>
-+                /// <param name='onProgress' type='Function' optional='true' locid="WinJS.PromiseStateMachine.then_p:onProgress">
-+                /// The function to be called if the promise reports progress. Data about the progress
-+                /// is passed as the single argument. Promises are not required to support
-+                /// progress.
-+                /// </param>
-+                /// <returns type="WinJS.Promise" locid="WinJS.PromiseStateMachine.then_returnValue">
-+                /// The promise whose value is the result of executing the complete or
-+                /// error function.
-+                /// </returns>
-+                /// </signature>
-+                try {
-+                    // If the value returned from the completion handler is the same as the value
-+                    // provided to the completion handler then there is no need for a new promise.
-+                    //
-+                    var newValue = onComplete ? onComplete(this._value) : this._value;
-+                    return newValue === this._value ? this : new CompletePromise(newValue);
-+                } catch (ex) {
-+                    return new ExceptionPromise(ex);
-+                }
-+            }
-+        }, {
-+            supportedForProcessing: false
-+        });
-+
-+        //
-+        // Promise is the user-creatable WinJS.Promise object.
-+        //
-+
-+        function timeout(timeoutMS) {
-+            var id;
-+            return new Promise(function (c) {
-+                if (timeoutMS) {
-+                    id = _Global.setTimeout(c, timeoutMS);
-+                } else {
-+                    _BaseCoreUtils._setImmediate(c);
-+                }
-+            }, function () {
-+                if (id) {
-+                    _Global.clearTimeout(id);
-+                }
-+            });
-+        }
-+
-+        function timeoutWithPromise(timeout, promise) {
-+            var cancelPromise = function () {
-+                promise.cancel();
-+            };
-+            var cancelTimeout = function () {
-+                timeout.cancel();
-+            };
-+            timeout.then(cancelPromise);
-+            promise.then(cancelTimeout, cancelTimeout);
-+            return promise;
-+        }
-+
-+        var staticCanceledPromise;
-+
-+        var Promise = _Base.Class.derive(PromiseStateMachine, function Promise_ctor(init, oncancel) {
-+            /// <signature helpKeyword="WinJS.Promise">
-+            /// <summary locid="WinJS.Promise">
-+            /// A promise provides a mechanism to schedule work to be done on a value that
-+            /// has not yet been computed. It is a convenient abstraction for managing
-+            /// interactions with asynchronous APIs.
-+            /// </summary>
-+            /// <param name="init" type="Function" locid="WinJS.Promise_p:init">
-+            /// The function that is called during construction of the  promise. The function
-+            /// is given three arguments (complete, error, progress). Inside this function
-+            /// you should add event listeners for the notifications supported by this value.
-+            /// </param>
-+            /// <param name="oncancel" optional="true" locid="WinJS.Promise_p:oncancel">
-+            /// The function to call if a consumer of this promise wants
-+            /// to cancel its undone work. Promises are not required to
-+            /// support cancellation.
-+            /// </param>
-+            /// </signature>
-+
-+            if (tagWithStack && (tagWithStack === true || tagWithStack & tag.promise)) {
-+                this._stack = Promise._getStack();
-+            }
-+
-+            this._oncancel = oncancel;
-+            this._setState(state_created);
-+            this._run();
-+
-+            try {
-+                var complete = this._completed.bind(this);
-+                var error = this._error.bind(this);
-+                var progress = this._progress.bind(this);
-+                init(complete, error, progress);
-+            } catch (ex) {
-+                this._setExceptionValue(ex);
-+            }
-+        }, {
-+            _oncancel: null,
-+
-+            _cancelAction: function () {
-+                // BEGIN monaco change
-+                try {
-+                    if (this._oncancel) {
-+                        this._oncancel();
-+                    } else {
-+                        throw new Error('Promise did not implement oncancel');
-+                    }
-+                } catch (ex) {
-+                    // Access fields to get them created
-+                    var msg = ex.message;
-+                    var stack = ex.stack;
-+                    promiseEventListeners.dispatchEvent('error', ex);
-+                }
-+                // END monaco change
-+            },
-+            _cleanupAction: function () {
-+                this._oncancel = null;
-+            }
-+        }, {
-+
-+            addEventListener: function Promise_addEventListener(eventType, listener, capture) {
-+                /// <signature helpKeyword="WinJS.Promise.addEventListener">
-+                /// <summary locid="WinJS.Promise.addEventListener">
-+                /// Adds an event listener to the control.
-+                /// </summary>
-+                /// <param name="eventType" locid="WinJS.Promise.addEventListener_p:eventType">
-+                /// The type (name) of the event.
-+                /// </param>
-+                /// <param name="listener" locid="WinJS.Promise.addEventListener_p:listener">
-+                /// The listener to invoke when the event is raised.
-+                /// </param>
-+                /// <param name="capture" locid="WinJS.Promise.addEventListener_p:capture">
-+                /// Specifies whether or not to initiate capture.
-+                /// </param>
-+                /// </signature>
-+                promiseEventListeners.addEventListener(eventType, listener, capture);
-+            },
-+            any: function Promise_any(values) {
-+                /// <signature helpKeyword="WinJS.Promise.any">
-+                /// <summary locid="WinJS.Promise.any">
-+                /// Returns a promise that is fulfilled when one of the input promises
-+                /// has been fulfilled.
-+                /// </summary>
-+                /// <param name="values" type="Array" locid="WinJS.Promise.any_p:values">
-+                /// An array that contains promise objects or objects whose property
-+                /// values include promise objects.
-+                /// </param>
-+                /// <returns type="WinJS.Promise" locid="WinJS.Promise.any_returnValue">
-+                /// A promise that on fulfillment yields the value of the input (complete or error).
-+                /// </returns>
-+                /// </signature>
-+                return new Promise(function (complete, error) {
-+                    var keys = Object.keys(values);
-+                    if (keys.length === 0) {
-+                        complete();
-+                    }
-+                    var canceled = 0;
-+                    keys.forEach(function (key) {
-+                        Promise.as(values[key]).then(function () {
-+                            complete({ key: key, value: values[key] });
-+                        }, function (e) {
-+                            if (e instanceof Error && e.name === canceledName) {
-+                                if (++canceled === keys.length) {
-+                                    complete(Promise.cancel);
-+                                }
-+                                return;
-+                            }
-+                            error({ key: key, value: values[key] });
-+                        });
-+                    });
-+                }, function () {
-+                    var keys = Object.keys(values);
-+                    keys.forEach(function (key) {
-+                        var promise = Promise.as(values[key]);
-+                        if (typeof promise.cancel === "function") {
-+                            promise.cancel();
-+                        }
-+                    });
-+                });
-+            },
-+            as: function Promise_as(value) {
-+                /// <signature helpKeyword="WinJS.Promise.as">
-+                /// <summary locid="WinJS.Promise.as">
-+                /// Returns a promise. If the object is already a promise it is returned;
-+                /// otherwise the object is wrapped in a promise.
-+                /// </summary>
-+                /// <param name="value" locid="WinJS.Promise.as_p:value">
-+                /// The value to be treated as a promise.
-+                /// </param>
-+                /// <returns type="WinJS.Promise" locid="WinJS.Promise.as_returnValue">
-+                /// A promise.
-+                /// </returns>
-+                /// </signature>
-+                if (value && typeof value === "object" && typeof value.then === "function") {
-+                    return value;
-+                }
-+                return new CompletePromise(value);
-+            },
-+            /// <field type="WinJS.Promise" helpKeyword="WinJS.Promise.cancel" locid="WinJS.Promise.cancel">
-+            /// Canceled promise value, can be returned from a promise completion handler
-+            /// to indicate cancelation of the promise chain.
-+            /// </field>
-+            cancel: {
-+                get: function () {
-+                    return staticCanceledPromise = staticCanceledPromise || new ErrorPromise(new _ErrorFromName(canceledName));
-+                }
-+            },
-+            dispatchEvent: function Promise_dispatchEvent(eventType, details) {
-+                /// <signature helpKeyword="WinJS.Promise.dispatchEvent">
-+                /// <summary locid="WinJS.Promise.dispatchEvent">
-+                /// Raises an event of the specified type and properties.
-+                /// </summary>
-+                /// <param name="eventType" locid="WinJS.Promise.dispatchEvent_p:eventType">
-+                /// The type (name) of the event.
-+                /// </param>
-+                /// <param name="details" locid="WinJS.Promise.dispatchEvent_p:details">
-+                /// The set of additional properties to be attached to the event object.
-+                /// </param>
-+                /// <returns type="Boolean" locid="WinJS.Promise.dispatchEvent_returnValue">
-+                /// Specifies whether preventDefault was called on the event.
-+                /// </returns>
-+                /// </signature>
-+                return promiseEventListeners.dispatchEvent(eventType, details);
-+            },
-+            is: function Promise_is(value) {
-+                /// <signature helpKeyword="WinJS.Promise.is">
-+                /// <summary locid="WinJS.Promise.is">
-+                /// Determines whether a value fulfills the promise contract.
-+                /// </summary>
-+                /// <param name="value" locid="WinJS.Promise.is_p:value">
-+                /// A value that may be a promise.
-+                /// </param>
-+                /// <returns type="Boolean" locid="WinJS.Promise.is_returnValue">
-+                /// true if the specified value is a promise, otherwise false.
-+                /// </returns>
-+                /// </signature>
-+                return value && typeof value === "object" && typeof value.then === "function";
-+            },
-+            join: function Promise_join(values) {
-+                /// <signature helpKeyword="WinJS.Promise.join">
-+                /// <summary locid="WinJS.Promise.join">
-+                /// Creates a promise that is fulfilled when all the values are fulfilled.
-+                /// </summary>
-+                /// <param name="values" type="Object" locid="WinJS.Promise.join_p:values">
-+                /// An object whose fields contain values, some of which may be promises.
-+                /// </param>
-+                /// <returns type="WinJS.Promise" locid="WinJS.Promise.join_returnValue">
-+                /// A promise whose value is an object with the same field names as those of the object in the values parameter, where
-+                /// each field value is the fulfilled value of a promise.
-+                /// </returns>
-+                /// </signature>
-+                return new Promise(function (complete, error, progress) {
-+                    var keys = Object.keys(values);
-+                    var errors = Array.isArray(values) ? [] : {};
-+                    var results = Array.isArray(values) ? [] : {};
-+                    var undefineds = 0;
-+                    var pending = keys.length;
-+                    var argDone = function (key) {
-+                        if (--pending === 0) {
-+                            var errorCount = Object.keys(errors).length;
-+                            if (errorCount === 0) {
-+                                complete(results);
-+                            } else {
-+                                var canceledCount = 0;
-+                                keys.forEach(function (key) {
-+                                    var e = errors[key];
-+                                    if (e instanceof Error && e.name === canceledName) {
-+                                        canceledCount++;
-+                                    }
-+                                });
-+                                if (canceledCount === errorCount) {
-+                                    complete(Promise.cancel);
-+                                } else {
-+                                    error(errors);
-+                                }
-+                            }
-+                        } else {
-+                            progress({ Key: key, Done: true });
-+                        }
-+                    };
-+                    keys.forEach(function (key) {
-+                        var value = values[key];
-+                        if (value === undefined) {
-+                            undefineds++;
-+                        } else {
-+                            Promise.then(value, function (value) {
-+                                results[key] = value;argDone(key);
-+                            }, function (value) {
-+                                errors[key] = value;argDone(key);
-+                            });
-+                        }
-+                    });
-+                    pending -= undefineds;
-+                    if (pending === 0) {
-+                        complete(results);
-+                        return;
-+                    }
-+                }, function () {
-+                    Object.keys(values).forEach(function (key) {
-+                        var promise = Promise.as(values[key]);
-+                        if (typeof promise.cancel === "function") {
-+                            promise.cancel();
-+                        }
-+                    });
-+                });
-+            },
-+            removeEventListener: function Promise_removeEventListener(eventType, listener, capture) {
-+                /// <signature helpKeyword="WinJS.Promise.removeEventListener">
-+                /// <summary locid="WinJS.Promise.removeEventListener">
-+                /// Removes an event listener from the control.
-+                /// </summary>
-+                /// <param name='eventType' locid="WinJS.Promise.removeEventListener_eventType">
-+                /// The type (name) of the event.
-+                /// </param>
-+                /// <param name='listener' locid="WinJS.Promise.removeEventListener_listener">
-+                /// The listener to remove.
-+                /// </param>
-+                /// <param name='capture' locid="WinJS.Promise.removeEventListener_capture">
-+                /// Specifies whether or not to initiate capture.
-+                /// </param>
-+                /// </signature>
-+                promiseEventListeners.removeEventListener(eventType, listener, capture);
-+            },
-+            supportedForProcessing: false,
-+            then: function Promise_then(value, onComplete, onError, onProgress) {
-+                /// <signature helpKeyword="WinJS.Promise.then">
-+                /// <summary locid="WinJS.Promise.then">
-+                /// A static version of the promise instance method then().
-+                /// </summary>
-+                /// <param name="value" locid="WinJS.Promise.then_p:value">
-+                /// the value to be treated as a promise.
-+                /// </param>
-+                /// <param name="onComplete" type="Function" locid="WinJS.Promise.then_p:complete">
-+                /// The function to be called if the promise is fulfilled with a value.
-+                /// If it is null, the promise simply
-+                /// returns the value. The value is passed as the single argument.
-+                /// </param>
-+                /// <param name="onError" type="Function" optional="true" locid="WinJS.Promise.then_p:error">
-+                /// The function to be called if the promise is fulfilled with an error. The error
-+                /// is passed as the single argument.
-+                /// </param>
-+                /// <param name="onProgress" type="Function" optional="true" locid="WinJS.Promise.then_p:progress">
-+                /// The function to be called if the promise reports progress. Data about the progress
-+                /// is passed as the single argument. Promises are not required to support
-+                /// progress.
-+                /// </param>
-+                /// <returns type="WinJS.Promise" locid="WinJS.Promise.then_returnValue">
-+                /// A promise whose value is the result of executing the provided complete function.
-+                /// </returns>
-+                /// </signature>
-+                return Promise.as(value).then(onComplete, onError, onProgress);
-+            },
-+            thenEach: function Promise_thenEach(values, onComplete, onError, onProgress) {
-+                /// <signature helpKeyword="WinJS.Promise.thenEach">
-+                /// <summary locid="WinJS.Promise.thenEach">
-+                /// Performs an operation on all the input promises and returns a promise
-+                /// that has the shape of the input and contains the result of the operation
-+                /// that has been performed on each input.
-+                /// </summary>
-+                /// <param name="values" locid="WinJS.Promise.thenEach_p:values">
-+                /// A set of values (which could be either an array or an object) of which some or all are promises.
-+                /// </param>
-+                /// <param name="onComplete" type="Function" locid="WinJS.Promise.thenEach_p:complete">
-+                /// The function to be called if the promise is fulfilled with a value.
-+                /// If the value is null, the promise returns the value.
-+                /// The value is passed as the single argument.
-+                /// </param>
-+                /// <param name="onError" type="Function" optional="true" locid="WinJS.Promise.thenEach_p:error">
-+                /// The function to be called if the promise is fulfilled with an error. The error
-+                /// is passed as the single argument.
-+                /// </param>
-+                /// <param name="onProgress" type="Function" optional="true" locid="WinJS.Promise.thenEach_p:progress">
-+                /// The function to be called if the promise reports progress. Data about the progress
-+                /// is passed as the single argument. Promises are not required to support
-+                /// progress.
-+                /// </param>
-+                /// <returns type="WinJS.Promise" locid="WinJS.Promise.thenEach_returnValue">
-+                /// A promise that is the result of calling Promise.join on the values parameter.
-+                /// </returns>
-+                /// </signature>
-+                var result = Array.isArray(values) ? [] : {};
-+                Object.keys(values).forEach(function (key) {
-+                    result[key] = Promise.as(values[key]).then(onComplete, onError, onProgress);
-+                });
-+                return Promise.join(result);
-+            },
-+            timeout: function Promise_timeout(time, promise) {
-+                /// <signature helpKeyword="WinJS.Promise.timeout">
-+                /// <summary locid="WinJS.Promise.timeout">
-+                /// Creates a promise that is fulfilled after a timeout.
-+                /// </summary>
-+                /// <param name="timeout" type="Number" optional="true" locid="WinJS.Promise.timeout_p:timeout">
-+                /// The timeout period in milliseconds. If this value is zero or not specified
-+                /// setImmediate is called, otherwise setTimeout is called.
-+                /// </param>
-+                /// <param name="promise" type="Promise" optional="true" locid="WinJS.Promise.timeout_p:promise">
-+                /// A promise that will be canceled if it doesn't complete before the
-+                /// timeout has expired.
-+                /// </param>
-+                /// <returns type="WinJS.Promise" locid="WinJS.Promise.timeout_returnValue">
-+                /// A promise that is completed asynchronously after the specified timeout.
-+                /// </returns>
-+                /// </signature>
-+                var to = timeout(time);
-+                return promise ? timeoutWithPromise(to, promise) : to;
-+            },
-+            wrap: function Promise_wrap(value) {
-+                /// <signature helpKeyword="WinJS.Promise.wrap">
-+                /// <summary locid="WinJS.Promise.wrap">
-+                /// Wraps a non-promise value in a promise. You can use this function if you need
-+                /// to pass a value to a function that requires a promise.
-+                /// </summary>
-+                /// <param name="value" locid="WinJS.Promise.wrap_p:value">
-+                /// Some non-promise value to be wrapped in a promise.
-+                /// </param>
-+                /// <returns type="WinJS.Promise" locid="WinJS.Promise.wrap_returnValue">
-+                /// A promise that is successfully fulfilled with the specified value
-+                /// </returns>
-+                /// </signature>
-+                return new CompletePromise(value);
-+            },
-+            wrapError: function Promise_wrapError(error) {
-+                /// <signature helpKeyword="WinJS.Promise.wrapError">
-+                /// <summary locid="WinJS.Promise.wrapError">
-+                /// Wraps a non-promise error value in a promise. You can use this function if you need
-+                /// to pass an error to a function that requires a promise.
-+                /// </summary>
-+                /// <param name="error" locid="WinJS.Promise.wrapError_p:error">
-+                /// A non-promise error value to be wrapped in a promise.
-+                /// </param>
-+                /// <returns type="WinJS.Promise" locid="WinJS.Promise.wrapError_returnValue">
-+                /// A promise that is in an error state with the specified value.
-+                /// </returns>
-+                /// </signature>
-+                return new ErrorPromise(error);
-+            },
-+
-+            _veryExpensiveTagWithStack: {
-+                get: function () {
-+                    return tagWithStack;
-+                },
-+                set: function (value) {
-+                    tagWithStack = value;
-+                }
-+            },
-+            _veryExpensiveTagWithStack_tag: tag,
-+            _getStack: function () {
-+                if (_Global.Debug && _Global.Debug.debuggerEnabled) {
-+                    try {
-+                        throw new Error();
-+                    } catch (e) {
-+                        return e.stack;
-+                    }
-+                }
-+            },
-+
-+            _cancelBlocker: function Promise__cancelBlocker(input, oncancel) {
-+                //
-+                // Returns a promise which on cancelation will still result in downstream cancelation while
-+                //  protecting the promise 'input' from being  canceled which has the effect of allowing
-+                //  'input' to be shared amoung various consumers.
-+                //
-+                if (!Promise.is(input)) {
-+                    return Promise.wrap(input);
-+                }
-+                var complete;
-+                var error;
-+                var output = new Promise(function (c, e) {
-+                    complete = c;
-+                    error = e;
-+                }, function () {
-+                    complete = null;
-+                    error = null;
-+                    oncancel && oncancel();
-+                });
-+                input.then(function (v) {
-+                    complete && complete(v);
-+                }, function (e) {
-+                    error && error(e);
-+                });
-+                return output;
-+            }
-+
-+        });
-+        Object.defineProperties(Promise, _Events.createEventProperties(errorET));
-+
-+        Promise._doneHandler = function (value) {
-+            _BaseCoreUtils._setImmediate(function Promise_done_rethrow() {
-+                throw value;
-+            });
-+        };
-+
-+        return {
-+            PromiseStateMachine: PromiseStateMachine,
-+            Promise: Promise,
-+            state_created: state_created
-+        };
-+    });
-+
-+    _winjs("WinJS/Promise", ["WinJS/Core/_Base", "WinJS/Promise/_StateMachine"], function promiseInit(_Base, _StateMachine) {
-+        "use strict";
-+
-+        _Base.Namespace.define("WinJS", {
-+            Promise: _StateMachine.Promise
-+        });
-+
-+        return _StateMachine.Promise;
-+    });
-+
-+    exported = _modules["WinJS/Core/_WinJS"];
-+    if (typeof exports === 'undefined' && typeof define === 'function' && define.amd) {
-+        define(exported);
-+    } else {
-+		// module.exports = exported;
-+    }
-+
-+    if (typeof process !== 'undefined' && typeof process.nextTick === 'function') {
-+        _modules["WinJS/Core/_BaseCoreUtils"]._setImmediate = function (handler) {
-+            return process.nextTick(handler);
-+        };
-+    }
-+})();
-+
-+export const Promise = exported.Promise;
-+export const TPromise = exported.Promise;
-+export const PPromise = exported.Promise;
-\ No newline at end of file
-changed in both
-  base   100644 24bb80a1fb211857e4e4d92449f98b414e60788e src/vs/base/parts/quickopen/browser/quickOpenModel.ts
-  our    100644 08e0701b8476b0e21642522cba5b49079d402eed src/vs/base/parts/quickopen/browser/quickOpenModel.ts
-  their  100644 7408be3fa6c4cc5039ccc170be59278f93fdea2b src/vs/base/parts/quickopen/browser/quickOpenModel.ts
-@@ -10,7 +10,14 @@
- import * as types from 'vs/base/common/types';
- import URI from 'vs/base/common/uri';
- import { ITree, IActionProvider } from 'vs/base/parts/tree/browser/tree';
-+<<<<<<< .our
- import { IconLabel, IIconLabelValueOptions } from 'vs/base/browser/ui/iconLabel/iconLabel';
-+=======
-+import * as filters from 'vs/base/common/filters';
-+import * as strings from 'vs/base/common/strings';
-+import * as paths from 'vs/base/common/paths';
-+import { IconLabel, IIconLabelOptions } from 'vs/base/browser/ui/iconLabel/iconLabel';
-+>>>>>>> .their
- import { IQuickNavigateConfiguration, IModel, IDataSource, IFilter, IAccessiblityProvider, IRenderer, IRunner, Mode } from 'vs/base/parts/quickopen/common/quickOpen';
- import { Action, IAction, IActionRunner } from 'vs/base/common/actions';
- import { compareAnything } from 'vs/base/common/comparers';
-changed in both
-  base   100644 63d07bf6c35a090686add18a4e370db8b04c2798 src/vs/base/parts/quickopen/browser/quickOpenWidget.ts
-  our    100644 0b73a95911391c4873434ba6f7cfad646ef99f86 src/vs/base/parts/quickopen/browser/quickOpenWidget.ts
-  their  100644 0f7054cc90621f7f8da52a7b048c9e108f513259 src/vs/base/parts/quickopen/browser/quickOpenWidget.ts
-@@ -6,10 +6,19 @@
- 
- import 'vs/css!./quickopen';
- import * as nls from 'vs/nls';
-+<<<<<<< .our
- import * as platform from 'vs/base/common/platform';
- import * as types from 'vs/base/common/types';
- import * as errors from 'vs/base/common/errors';
- import { IQuickNavigateConfiguration, IAutoFocus, IEntryRunContext, IModel, Mode, IKeyMods } from 'vs/base/parts/quickopen/common/quickOpen';
-+=======
-+import { TPromise } from 'vs/base/common/winjs.base';
-+import * as platform from 'vs/base/common/platform';
-+import { EventType } from 'vs/base/common/events';
-+import * as types from 'vs/base/common/types';
-+import * as errors from 'vs/base/common/errors';
-+import { IQuickNavigateConfiguration, IAutoFocus, IEntryRunContext, IModel, Mode } from 'vs/base/parts/quickopen/common/quickOpen';
-+>>>>>>> .their
- import { Filter, Renderer, DataSource, IModelProvider, AccessibilityProvider } from 'vs/base/parts/quickopen/browser/quickOpenViewer';
- import { Builder, $ } from 'vs/base/browser/builder';
- import { ITree, ContextMenuEvent, IActionProvider, ITreeStyles, ITreeOptions, ITreeConfiguration } from 'vs/base/parts/tree/browser/tree';
-@@ -20,8 +29,13 @@
- import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
- import { DefaultController, ClickBehavior } from 'vs/base/parts/tree/browser/treeDefaults';
- import * as DOM from 'vs/base/browser/dom';
-+<<<<<<< .our
- import { KeyCode } from 'vs/base/common/keyCodes';
- import { Disposable } from 'vs/base/common/lifecycle';
-+=======
-+import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-+>>>>>>> .their
- import { ScrollbarVisibility } from 'vs/base/common/scrollable';
- import { Color } from 'vs/base/common/color';
- import { mixin } from 'vs/base/common/objects';
-changed in both
-  base   100644 e8bae236d8d754ce1c4b80f6dcdeeb0e41e3b16c src/vs/base/parts/tree/browser/tree.ts
-  our    100644 64e2f7152f0f5abd08b9d0878661a6eaf7081f29 src/vs/base/parts/tree/browser/tree.ts
-  their  100644 ea36b3df2697283a3754c0cf16d946053377382c src/vs/base/parts/tree/browser/tree.ts
-@@ -6,6 +6,10 @@
- 
- import * as WinJS from 'vs/base/common/winjs.base';
- import * as Touch from 'vs/base/browser/touch';
-+<<<<<<< .our
-+=======
-+import * as Events from 'vs/base/common/eventEmitter';
-+>>>>>>> .their
- import * as Mouse from 'vs/base/browser/mouseEvent';
- import * as Keyboard from 'vs/base/browser/keyboardEvent';
- import { INavigator } from 'vs/base/common/iterator';
-changed in both
-  base   100644 05e19027d4f2143d8a56c2f8c7da2a26d1750467 src/vs/base/parts/tree/browser/treeDefaults.ts
-  our    100644 ec975e735e2211d7851919a99745080668119cca src/vs/base/parts/tree/browser/treeDefaults.ts
-  their  100644 e248f1398f69555b66505a9289118d5a8d25fe6e src/vs/base/parts/tree/browser/treeDefaults.ts
-@@ -14,7 +14,11 @@
- import * as mouse from 'vs/base/browser/mouseEvent';
- import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
- import * as _ from 'vs/base/parts/tree/browser/tree';
-+<<<<<<< .our
- import { KeyCode, KeyMod, Keybinding, createKeybinding, SimpleKeybinding, createSimpleKeybinding } from 'vs/base/common/keyCodes';
-+=======
-+import { KeyCode, KeyMod, Keybinding, createKeybinding, SimpleKeybinding } from 'vs/base/common/keyCodes';
-+>>>>>>> .their
- 
- export interface IKeyBindingCallback {
- 	(tree: _.ITree, event: IKeyboardEvent): void;
-changed in both
-  base   100644 abae2bcfd18b13388299de7f32b488f2648094c7 src/vs/base/parts/tree/browser/treeDnd.ts
-  our    100644 768a47c6a441da775412998d3a6bab94bd1e7f98 src/vs/base/parts/tree/browser/treeDnd.ts
-  their  100644 91f11a9d7be76494716f21bf83a9c3e46b8e8fb5 src/vs/base/parts/tree/browser/treeDnd.ts
-@@ -6,6 +6,13 @@
- 
- import * as _ from 'vs/base/parts/tree/browser/tree';
- import * as Mouse from 'vs/base/browser/mouseEvent';
-+<<<<<<< .our
-+=======
-+import { DefaultDragAndDrop } from 'vs/base/parts/tree/browser/treeDefaults';
-+import URI from 'vs/base/common/uri';
-+import { basename } from 'vs/base/common/paths';
-+import { getPathLabel } from 'vs/base/common/labels';
-+>>>>>>> .their
- 
- export class ElementsDragAndDropData implements _.IDragAndDropData {
- 
-changed in both
-  base   100644 2c18c5700fb8f9230f24daa2c0d787c174a0eadd src/vs/base/parts/tree/browser/treeImpl.ts
-  our    100644 dc008d1eedea30e04540f327da75b3af449d6ff9 src/vs/base/parts/tree/browser/treeImpl.ts
-  their  100644 5587cf321b0eebccdd0c74b74f0f94e06e9011b6 src/vs/base/parts/tree/browser/treeImpl.ts
-@@ -7,11 +7,20 @@
- import 'vs/css!./tree';
- import * as WinJS from 'vs/base/common/winjs.base';
- import * as TreeDefaults from 'vs/base/parts/tree/browser/treeDefaults';
-+<<<<<<< .our
-+=======
-+import * as Events from 'vs/base/common/eventEmitter';
-+>>>>>>> .their
- import * as Model from 'vs/base/parts/tree/browser/treeModel';
- import * as View from './treeView';
- import * as _ from 'vs/base/parts/tree/browser/tree';
- import { INavigator, MappedNavigator } from 'vs/base/common/iterator';
-+<<<<<<< .our
- import { Event, Emitter, Relay } from 'vs/base/common/event';
-+=======
-+import Event, { Emitter } from 'vs/base/common/event';
-+import * as Lifecycle from 'vs/base/common/lifecycle';
-+>>>>>>> .their
- import { Color } from 'vs/base/common/color';
- import { mixin } from 'vs/base/common/objects';
- 
-changed in both
-  base   100644 1c5623fab9ef194cd686fa251a70225529eeab5e src/vs/base/parts/tree/browser/treeModel.ts
-  our    100644 38abf8eca456faf80f8d46d7809724f48f82a14b src/vs/base/parts/tree/browser/treeModel.ts
-  their  100644 3104125d031064078ad92374b06b0fb14866b50e src/vs/base/parts/tree/browser/treeModel.ts
-@@ -9,9 +9,15 @@
- import { IDisposable, combinedDisposable } from 'vs/base/common/lifecycle';
- import * as arrays from 'vs/base/common/arrays';
- import { INavigator } from 'vs/base/common/iterator';
-+<<<<<<< .our
- import * as WinJS from 'vs/base/common/winjs.base';
- import * as _ from './tree';
- import { Event, Emitter, once, EventMultiplexer, Relay } from 'vs/base/common/event';
-+=======
-+import * as Events from 'vs/base/common/eventEmitter';
-+import * as WinJS from 'vs/base/common/winjs.base';
-+import * as _ from './tree';
-+>>>>>>> .their
- 
- interface IMap<T> { [id: string]: T; }
- interface IItemMap extends IMap<Item> { }
-changed in both
-  base   100644 ac5ba32ad5c7c4e45947bc171691388268151fb1 src/vs/base/parts/tree/browser/treeView.ts
-  our    100644 6b1e97a1a7f247863b6e4867e10351a2ef228606 src/vs/base/parts/tree/browser/treeView.ts
-  their  100644 d65f32d4c085049142a55d73e44ac3d6bc79a41a src/vs/base/parts/tree/browser/treeView.ts
-added in remote
-  their  100644 5dce2499714454af8b18fdf00fd00dd035934000 src/vs/css.esm.js
-@@ -0,0 +1,6 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+export var css = '';
-\ No newline at end of file
-changed in both
-  base   100644 3436b8653c48afc448fbb3ab97d85865b5de2432 src/vs/editor/common/services/modelServiceImpl.ts
-  our    100644 1a1202dde3c4f6f0ea6c3ead333eb6957cfba556 src/vs/editor/common/services/modelServiceImpl.ts
-  their  100644 40482d9b5836e7f7b7c2492fbc0faa926f37f89e src/vs/editor/common/services/modelServiceImpl.ts
-@@ -6,7 +6,12 @@
- 
- import * as nls from 'vs/nls';
- import * as network from 'vs/base/common/network';
-+<<<<<<< .our
- import { Event, Emitter } from 'vs/base/common/event';
-+=======
-+import Event, { Emitter } from 'vs/base/common/event';
-+import { EmitterEvent } from 'vs/base/common/eventEmitter';
-+>>>>>>> .their
- import { MarkdownString } from 'vs/base/common/htmlContent';
- import { IDisposable, dispose } from 'vs/base/common/lifecycle';
- import URI from 'vs/base/common/uri';
-changed in both
-  base   100644 794b815d4fd7ecce51f9148f7264d30a62acd17e src/vs/editor/common/view/editorColorRegistry.ts
-  our    100644 c4c369cb0d295c59da893a5750489215aaa2a50d src/vs/editor/common/view/editorColorRegistry.ts
-  their  100644 c59a36bc3ee40ed5560ce7f9196f5204b9337351 src/vs/editor/common/view/editorColorRegistry.ts
-removed in local
-  base   100644 bacb7f633f8217441d296cea3bba24ba933e0484 src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.ts
-  their  100644 c2ebbc4ade34297893c25c95f2ac88cf88f627f9 src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.ts
-removed in local
-  base   100644 2cd8cab8f8cc038694e275a15bbcc17d7a58990d src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.ts
-  their  100644 5b26d5046997209f02275ee6a11e0d4111118c2c src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.ts
-added in remote
-  their  100644 1c4d9430c7c42cdf7addcd77d6f58884bb349d1e src/vs/editor/editor.esm.ts
-@@ -0,0 +1,41 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+'use strict';
-+
-+import 'vs/editor/editor.all';
-+import 'vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp';
-+import 'vs/editor/standalone/browser/inspectTokens/inspectTokens';
-+import 'vs/editor/standalone/browser/iPadShowKeyboard/iPadShowKeyboard';
-+import 'vs/editor/standalone/browser/quickOpen/quickOutline';
-+import 'vs/editor/standalone/browser/quickOpen/gotoLine';
-+import 'vs/editor/standalone/browser/quickOpen/quickCommand';
-+import 'vs/editor/standalone/browser/toggleHighContrast/toggleHighContrast';
-+
-+import { createMonacoBaseAPI } from 'vs/editor/common/standalone/standaloneBase';
-+import { createMonacoEditorAPI } from 'vs/editor/standalone/browser/standaloneEditor';
-+import { createMonacoLanguagesAPI } from 'vs/editor/standalone/browser/standaloneLanguages';
-+import { EDITOR_DEFAULTS, WrappingIndent } from 'vs/editor/common/config/editorOptions';
-+
-+// Set defaults for standalone editor
-+(<any>EDITOR_DEFAULTS).wrappingIndent = WrappingIndent.None;
-+(<any>EDITOR_DEFAULTS.contribInfo).folding = false;
-+(<any>EDITOR_DEFAULTS.viewInfo).glyphMargin = false;
-+(<any>EDITOR_DEFAULTS).autoIndent = false;
-+
-+let exported = {};
-+let base = createMonacoBaseAPI();
-+for (let prop in base) {
-+	if (base.hasOwnProperty(prop)) {
-+		exported[prop] = base[prop];
-+	}
-+}
-+exported['editor'] = createMonacoEditorAPI();
-+exported['languages'] = createMonacoLanguagesAPI();
-+
-+var global: any = self;
-+global.monaco = exported;
-+export const monaco = exported;
-+
-changed in both
-  base   100644 063ebe91c6a190d6febbd516c03073fd70a2c625 src/vs/platform/backup/test/electron-main/backupMainService.test.ts
-  our    100644 ab249bac7dc33cec2c79cad93399b7624782e22d src/vs/platform/backup/test/electron-main/backupMainService.test.ts
-  their  100644 0f6fea8656b5d2b083645aec616aa8d6d7e3a70c src/vs/platform/backup/test/electron-main/backupMainService.test.ts
-@@ -10,6 +10,10 @@
- import * as fs from 'fs';
- import * as os from 'os';
- import * as path from 'path';
-+<<<<<<< .our
-+=======
-+import * as extfs from 'vs/base/node/extfs';
-+>>>>>>> .their
- import * as pfs from 'vs/base/node/pfs';
- import Uri from 'vs/base/common/uri';
- import { EnvironmentService } from 'vs/platform/environment/node/environmentService';
-changed in both
-  base   100644 d2495cce311a89cc3f9dba69a0f7f4edb4037efb src/vs/platform/configuration/common/configurationRegistry.ts
-  our    100644 0c63a065226bc399535e1e3f1044565e6f486734 src/vs/platform/configuration/common/configurationRegistry.ts
-  their  100644 f6e82ef0be2f0d84273ada55d912f119d91f5e5d src/vs/platform/configuration/common/configurationRegistry.ts
-@@ -5,7 +5,11 @@
- 'use strict';
- 
- import * as nls from 'vs/nls';
-+<<<<<<< .our
- import { Event, Emitter } from 'vs/base/common/event';
-+=======
-+import Event, { Emitter } from 'vs/base/common/event';
-+>>>>>>> .their
- import { IJSONSchema } from 'vs/base/common/jsonSchema';
- import { Registry } from 'vs/platform/registry/common/platform';
- import * as types from 'vs/base/common/types';
-changed in both
-  base   100644 594a6eb52871a2f426630f8cbeba77130da189b2 src/vs/platform/configuration/test/node/configurationService.test.ts
-  our    100644 2a03ed6f1533bdff7c2594ca33f1b37d92334a4c src/vs/platform/configuration/test/node/configurationService.test.ts
-  their  100644 58b546fba728fb8fd769ad58602b59983a97d04a src/vs/platform/configuration/test/node/configurationService.test.ts
-@@ -15,6 +15,10 @@
- import { ParsedArgs } from 'vs/platform/environment/common/environment';
- import { parseArgs } from 'vs/platform/environment/node/argv';
- import { EnvironmentService } from 'vs/platform/environment/node/environmentService';
-+<<<<<<< .our
-+=======
-+import * as extfs from 'vs/base/node/extfs';
-+>>>>>>> .their
- import * as uuid from 'vs/base/common/uuid';
- import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
- import { testFile } from 'vs/base/test/node/utils';
-changed in both
-  base   100644 e019353ebcec5f82897d5a19c483b6b431593ed3 src/vs/platform/extensionManagement/node/extensionManagementService.ts
-  our    100644 fca1b8fcc1eedca233bd95ef59ad6d0d3904e895 src/vs/platform/extensionManagement/node/extensionManagementService.ts
-  their  100644 96ec0d7ab578c0e7167a922508ab51f4b965fdda src/vs/platform/extensionManagement/node/extensionManagementService.ts
-@@ -30,6 +30,7 @@
- import { Event, Emitter } from 'vs/base/common/event';
- import * as semver from 'semver';
- import URI from 'vs/base/common/uri';
-+<<<<<<< .our
- import pkg from 'vs/platform/node/package';
- import { isMacintosh, isWindows } from 'vs/base/common/platform';
- import { ILogService } from 'vs/platform/log/common/log';
-@@ -62,6 +63,12 @@
- 		super(message);
- 	}
- }
-+=======
-+import { IChoiceService } from 'vs/platform/message/common/message';
-+import Severity from 'vs/base/common/severity';
-+
-+const SystemExtensionsRoot = path.normalize(path.join(URI.parse(require.toUrl('')).fsPath, '..', 'extensions'));
-+>>>>>>> .their
- 
- function parseManifest(raw: string): TPromise<{ manifest: IExtensionManifest; metadata: IGalleryMetadata; }> {
- 	return new TPromise((c, e) => {
-changed in both
-  base   100644 455db1408ecef7f6774a15b2b85710c28cd21749 src/vs/platform/files/common/files.ts
-  our    100644 72b73ed86d2a2250bc747d5e4821c82038379d3b src/vs/platform/files/common/files.ts
-  their  100644 fdf49c32bc97fcc6661561242fd6a5880267a425 src/vs/platform/files/common/files.ts
-@@ -8,6 +8,10 @@
- import * as paths from 'vs/base/common/paths';
- import URI from 'vs/base/common/uri';
- import * as glob from 'vs/base/common/glob';
-+<<<<<<< .our
-+=======
-+import * as events from 'vs/base/common/events';
-+>>>>>>> .their
- import { isLinux } from 'vs/base/common/platform';
- import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
- import { Event } from 'vs/base/common/event';
-changed in both
-  base   100644 21234877c10df52286ccc947eae86fe3bb83047c src/vs/platform/instantiation/test/common/instantiationService.test.ts
-  our    100644 db042a9cc4ffc87fcd6a942dabac732cff408a3e src/vs/platform/instantiation/test/common/instantiationService.test.ts
-  their  100644 28b8056982e6d5557d16f7fcdeacbaa84c6de74d src/vs/platform/instantiation/test/common/instantiationService.test.ts
-changed in both
-  base   100644 5d4f91c0dff10502bd2cbd821a50d3cc87f467ec src/vs/platform/jsonschemas/common/jsonContributionRegistry.ts
-  our    100644 4b89524ac9f9d6105d5e410d5b74245e3d7b0b6c src/vs/platform/jsonschemas/common/jsonContributionRegistry.ts
-  their  100644 c5336744ea5b75f3c0450c47a82b66b9e58358a7 src/vs/platform/jsonschemas/common/jsonContributionRegistry.ts
-@@ -6,7 +6,12 @@
- 
- import { IJSONSchema } from 'vs/base/common/jsonSchema';
- import * as platform from 'vs/platform/registry/common/platform';
-+<<<<<<< .our
- import { Event, Emitter } from 'vs/base/common/event';
-+=======
-+import { EventEmitter } from 'vs/base/common/eventEmitter';
-+import { IDisposable } from 'vs/base/common/lifecycle';
-+>>>>>>> .their
- 
- export const Extensions = {
- 	JSONContribution: 'base.contributions.json'
-removed in local
-  base   100644 748d7a37ba156df32bec17833af3824025477a96 src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.ts
-  their  100644 4f835bd874be79ee3ee792621ecf5181496a7f80 src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.ts
-changed in both
-  base   100644 abdd2247405f2ff315ae736e56b7644297e5dd6a src/vs/platform/markers/test/common/markerService.test.ts
-  our    100644 25cb2e933a2be12aa3b8b474b9365c80ff77bb4d src/vs/platform/markers/test/common/markerService.test.ts
-  their  100644 4ca4cde415c06a7f5b07fe80d6834808823701d4 src/vs/platform/markers/test/common/markerService.test.ts
-@@ -8,7 +8,11 @@
- import * as assert from 'assert';
- import URI from 'vs/base/common/uri';
- import * as markerService from 'vs/platform/markers/common/markerService';
-+<<<<<<< .our
- import { IMarkerData, MarkerSeverity } from 'vs/platform/markers/common/markers';
-+=======
-+import { IMarkerData } from 'vs/platform/markers/common/markers';
-+>>>>>>> .their
- 
- function randomMarkerData(severity = MarkerSeverity.Error): IMarkerData {
- 	return {
-removed in local
-  base   100644 627bbe0900b0f5c9aef6212e85c6efea0889149e src/vs/platform/message/common/message.ts
-  their  100644 4eb6b351fdab966548d628d8a1096528e2e1b8f7 src/vs/platform/message/common/message.ts
-removed in local
-  base   100644 069ca25321df5ec6bc45a8ef1f2fe20a0a6f66af src/vs/platform/message/common/messageIpc.ts
-  their  100644 c62572a11f8facdb29e49d1a4242e8bd11d4ada2 src/vs/platform/message/common/messageIpc.ts
-removed in local
-  base   100644 846261e957482ae5712f4afef39244fa543c833c src/vs/platform/message/node/messageCli.ts
-  their  100644 5302ef533e22f916b730edd7c19ce673ee25a297 src/vs/platform/message/node/messageCli.ts
-changed in both
-  base   100644 5ddc3f336bc0f95bcf81ae82126d49c81d64e4c2 src/vs/platform/registry/common/platform.ts
-  our    100644 db2569b9bd3f326db2bd920b788dd6fae547edb2 src/vs/platform/registry/common/platform.ts
-  their  100644 ce502207c23fde9f29a4062228e2b7af0eea2720 src/vs/platform/registry/common/platform.ts
-@@ -6,6 +6,10 @@
- 
- import * as Types from 'vs/base/common/types';
- import * as Assert from 'vs/base/common/assert';
-+<<<<<<< .our
-+=======
-+import { IInstantiationService, IConstructorSignature0 } from 'vs/platform/instantiation/common/instantiation';
-+>>>>>>> .their
- 
- export interface IRegistry {
- 
-changed in both
-  base   100644 4a26fd2eb363fcb1082f2d19ba7a4e32897ff04e src/vs/platform/registry/test/common/platform.test.ts
-  our    100644 d3e653af565764ca6fa5d456590e9c2c114c6cc0 src/vs/platform/registry/test/common/platform.test.ts
-  their  100644 158b418346812d701b0abd41d5a53c87545e12a0 src/vs/platform/registry/test/common/platform.test.ts
-changed in both
-  base   100644 199ba0c9dcf17e0c23177a37b23c3e39045c3642 src/vs/platform/storage/common/storageService.ts
-  our    100644 cd60f29cd2e18e562c5c4d0c446ca1c079822aea src/vs/platform/storage/common/storageService.ts
-  their  100644 b2ea4e5e578962b8b69ef833f3b64df866a9a8c5 src/vs/platform/storage/common/storageService.ts
-changed in both
-  base   100644 5bf022e190c15120b8ef5dbb91d5ec818a1739b1 src/vs/platform/telemetry/browser/errorTelemetry.ts
-  our    100644 ec06e2c07eef85a9dbde991083fba2510c62b26e src/vs/platform/telemetry/browser/errorTelemetry.ts
-  their  100644 3a811fe2834c838a11e67571e54c102c9179f990 src/vs/platform/telemetry/browser/errorTelemetry.ts
-changed in both
-  base   100644 d1c8b3db1563c33fc4a0208c2f594851a45aca10 src/vs/platform/telemetry/common/telemetryUtils.ts
-  our    100644 83a4326ca5e511e1b955212a7929341083ae29ff src/vs/platform/telemetry/common/telemetryUtils.ts
-  their  100644 527ffda07f87b53d8d5d50e1429554a676af3bb6 src/vs/platform/telemetry/common/telemetryUtils.ts
-changed in both
-  base   100644 494159a5f564e0c88f21d718e4dd179d483eff2e src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts
-  our    100644 8cd91f0803bf07a93c03212bd1183b3d09b5419f src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts
-  their  100644 f02f2f19841a36c5dddf9753436774cde0bc4cb9 src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts
-removed in local
-  base   100644 f42ffb926a309b6f0f4df13edfb534883e35e581 src/vs/platform/theme/common/colorExtensionPoint.ts
-  their  100644 6c79c0ef896119cd27239e0330f7f1eb10fffe31 src/vs/platform/theme/common/colorExtensionPoint.ts
-changed in both
-  base   100644 0d21ee0e7a9caf1febef5c320519012dc557e21d src/vs/platform/theme/common/colorRegistry.ts
-  our    100644 674f67411d4ee542ee937fac9146ef0768ec982d src/vs/platform/theme/common/colorRegistry.ts
-  their  100644 80683cc51b20db99d5e6521698bcfe3e4ad484c1 src/vs/platform/theme/common/colorRegistry.ts
-changed in both
-  base   100644 1ae17c0ac90d52f4857f96a634226b4bca2e0744 src/vs/platform/theme/common/themeService.ts
-  our    100644 7c1e2f9bae64abc3e50a713fddc1308d4989648c src/vs/platform/theme/common/themeService.ts
-  their  100644 e61baef43c9d073700b6c98114f2acb38a0a29b5 src/vs/platform/theme/common/themeService.ts
-@@ -6,7 +6,11 @@
- 
- import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
- import { Color } from 'vs/base/common/color';
-+<<<<<<< .our
- import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-+=======
-+import { IDisposable } from 'vs/base/common/lifecycle';
-+>>>>>>> .their
- import * as platform from 'vs/platform/registry/common/platform';
- import { ColorIdentifier } from 'vs/platform/theme/common/colorRegistry';
- import { Event, Emitter } from 'vs/base/common/event';
-changed in both
-  base   100644 ec0683890ca84792f6e8f0be0298ca3f9a56710b src/vs/platform/workspaces/test/electron-main/workspacesMainService.test.ts
-  our    100644 b49fa1f295e8bc18af9f9fb9b3975f7eda229d64 src/vs/platform/workspaces/test/electron-main/workspacesMainService.test.ts
-  their  100644 4fdb55ad4f088080b81220cc7d6622224702d9af src/vs/platform/workspaces/test/electron-main/workspacesMainService.test.ts
diff --git a/app/test/fixtures/merge-parser/vscode/merge-rebornix-FastTokenization-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-rebornix-FastTokenization-into-master.txt
deleted file mode 100644
index 7783d9f5566..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-rebornix-FastTokenization-into-master.txt
+++ /dev/null
@@ -1,195 +0,0 @@
-changed in both
-  base   100644 e446465273863afd8bd06bc50f91067e16aea112 src/vs/editor/browser/widget/codeEditorWidget.ts
-  our    100644 6f588e16445e2740e0f36730ce132f1ff91e44d8 src/vs/editor/browser/widget/codeEditorWidget.ts
-  their  100644 0ac7250c85ee715991dae118322fb50fe74b804a src/vs/editor/browser/widget/codeEditorWidget.ts
-@@ -44,7 +44,12 @@
- import { IEditorContributionCtor, EditorExtensionsRegistry } from 'vs/editor/browser/editorExtensions';
- import { IMouseEvent } from 'vs/base/browser/mouseEvent';
- import { InternalEditorAction } from 'vs/editor/common/editorAction';
-+<<<<<<< .our
- import { ICommandDelegate } from 'vs/editor/browser/view/viewController';
-+=======
-+import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
-+import { IPosition, Position } from 'vs/editor/common/core/position';
-+>>>>>>> .their
- import { CoreEditorCommand } from 'vs/editor/browser/controller/coreCommands';
- import { editorErrorForeground, editorErrorBorder, editorWarningForeground, editorWarningBorder, editorInfoBorder, editorInfoForeground, editorHintForeground, editorHintBorder, editorUnnecessaryCodeOpacity, editorUnnecessaryCodeBorder } from 'vs/editor/common/view/editorColorRegistry';
- import { Color } from 'vs/base/common/color';
-@@ -1454,9 +1459,24 @@
- 		viewEventBus.onKeyDown = (e) => this._onKeyDown.fire(e);
- 	}
- 
-+<<<<<<< .our
- 	protected _postDetachModelCleanup(detachedModel: ITextModel): void {
- 		if (detachedModel) {
- 			detachedModel.removeAllDecorationsWithOwnerId(this.id);
-+=======
-+	public restoreViewState(s: editorCommon.ICodeEditorViewState): void {
-+		super.restoreViewState(s);
-+		if (!this.cursor || !this.hasView) {
-+			return;
-+		}
-+		if (s && s.cursorState && s.viewState) {
-+			const reducedState = this.viewModel.viewLayout.reduceRestoreState(s.viewState);
-+			const linesViewportData = this.viewModel.viewLayout.getLinesViewportDataAtScrollTop(reducedState.scrollTop);
-+			const startViewPosition = this.viewModel.coordinatesConverter.convertViewPositionToModelPosition(new Position(linesViewportData.startLineNumber, 1));
-+			const endViewPosition = this.viewModel.coordinatesConverter.convertViewPositionToModelPosition(new Position(linesViewportData.endLineNumber, 1));
-+			this.model.tokenizeViewport(startViewPosition.lineNumber, endViewPosition.lineNumber);
-+			this._view.restoreState(reducedState);
-+>>>>>>> .their
- 		}
- 	}
- 
-changed in both
-  base   100644 45fd9bd7642c9c5b258f30544696e807ac390bdf src/vs/editor/common/model.ts
-  our    100644 d37319c25b5e71dd40306946eded5114625db617 src/vs/editor/common/model.ts
-  their  100644 f25360e9e83fe2e811fb68431e50128555388d87 src/vs/editor/common/model.ts
-@@ -669,6 +669,16 @@
- 	isDisposed(): boolean;
- 
- 	/**
-+<<<<<<< .our
-+=======
-+	 * @internal
-+	 */
-+	tokenizeViewport(startLineNumber: number, endLineNumber: number): void;
-+
-+	/**
-+	 * Only basic mode supports allowed on this model because it is simply too large.
-+	 * (tokenization is allowed and other basic supports)
-+>>>>>>> .their
- 	 * @internal
- 	 */
- 	tokenizeViewport(startLineNumber: number, endLineNumber: number): void;
-changed in both
-  base   100644 70a0ce610a16771e49300bfd767d906bf9c8dd85 src/vs/editor/common/model/textModel.ts
-  our    100644 7bddfeb4441c40816473a53ecd1cea58bfc814c4 src/vs/editor/common/model/textModel.ts
-  their  100644 405c389cd83ee78972d7bfa2e56054ba93ab67e5 src/vs/editor/common/model/textModel.ts
-@@ -1754,6 +1754,7 @@
- 			return;
- 		}
- 
-+<<<<<<< .our
- 		// we tokenize `this._tokens.inValidLineStartIndex` lines in around 20ms so it's a good baseline.
- 		const contextBefore = Math.floor(this._tokens.inValidLineStartIndex * 0.3);
- 		startLineNumber = Math.max(1, startLineNumber - contextBefore);
-@@ -1768,6 +1769,16 @@
- 		let fakeLines = [];
- 		let i = startLineNumber - 1;
- 		let initialState = null;
-+=======
-+		const eventBuilder = new ModelTokensChangedEventBuilder();
-+		const viewPortLimit = 120;
-+		const context = Math.floor(Math.max(viewPortLimit - (endLineNumber - startLineNumber), 0) / 2);
-+		startLineNumber = Math.max(1, startLineNumber - context);
-+		let nonWhitespaceColumn = this.getLineFirstNonWhitespaceColumn(startLineNumber);
-+
-+		let fakeLines = [];
-+		let i = startLineNumber - 1;
-+>>>>>>> .their
- 		if (nonWhitespaceColumn > 0) {
- 			while (nonWhitespaceColumn > 0 && i >= 1) {
- 				let newNonWhitespaceIndex = this.getLineFirstNonWhitespaceColumn(i);
-@@ -1778,10 +1789,13 @@
- 				}
- 
- 				if (newNonWhitespaceIndex < nonWhitespaceColumn) {
-+<<<<<<< .our
- 					initialState = this._tokens._getState(i - 1);
- 					if (initialState) {
- 						break;
- 					}
-+=======
-+>>>>>>> .their
- 					fakeLines.push(this.getLineContent(i));
- 					nonWhitespaceColumn = newNonWhitespaceIndex;
- 				}
-@@ -1790,6 +1804,7 @@
- 			}
- 		}
- 
-+<<<<<<< .our
- 		if (!initialState) {
- 			initialState = this._tokens.tokenizationSupport.getInitialState();
- 		}
-@@ -1797,6 +1812,12 @@
- 		let state = initialState.clone();
- 		for (let i = fakeLines.length - 1; i >= 0; i--) {
- 			let r = this._tokens._tokenizeText(this._buffer, fakeLines[i], state);
-+=======
-+		const initialState = this._tokens.tokenizationSupport.getInitialState();
-+		let state = initialState.clone();
-+		for (let i = fakeLines.length - 1; i >= 0; i--) {
-+			let r = this._tokens._tokenizeOneLine2(this._buffer, fakeLines[i], state, eventBuilder);
-+>>>>>>> .their
- 			if (r) {
- 				state = r.endState.clone();
- 			} else {
-@@ -1804,6 +1825,7 @@
- 			}
- 		}
- 
-+<<<<<<< .our
- 		const contextAfter = Math.floor(this._tokens.inValidLineStartIndex * 0.4);
- 		endLineNumber = Math.min(this.getLineCount(), endLineNumber + contextAfter);
- 		for (let i = startLineNumber; i <= endLineNumber; i++) {
-@@ -1819,6 +1841,15 @@
- 				this._tokens._setIsInvalid(i - 1, false);
- 				this._tokens._setState(i - 1, state);
- 				state = r.endState.clone();
-+=======
-+		endLineNumber = Math.min(this.getLineCount(), endLineNumber + context);
-+		for (let i = startLineNumber; i <= endLineNumber; i++) {
-+			let text = this.getLineContent(i);
-+			let r = this._tokens._tokenizeOneLine2(this._buffer, text, state, eventBuilder);
-+			if (r) {
-+				state = r.endState.clone();
-+				this._tokens._setTokens(this._tokens.languageIdentifier.id, i - 1, text.length, r.tokens);
-+>>>>>>> .their
- 				eventBuilder.registerChangedTokens(i);
- 			} else {
- 				state = initialState.clone();
-changed in both
-  base   100644 cb7c7bf2c7d18ed36d62ab2066f351d3c74b38de src/vs/editor/common/model/textModelTokens.ts
-  our    100644 ab4e221927f80cd5f52953dce3c0e93b35c70b88 src/vs/editor/common/model/textModelTokens.ts
-  their  100644 72c589287393d21dba1f5cb1db9e8e498f82bd55 src/vs/editor/common/model/textModelTokens.ts
-@@ -233,7 +233,11 @@
- 		}
- 	}
- 
-+<<<<<<< .our
- 	_setIsInvalid(lineIndex: number, invalid: boolean): void {
-+=======
-+	private _setIsInvalid(lineIndex: number, invalid: boolean): void {
-+>>>>>>> .their
- 		if (lineIndex < this._tokens.length && this._tokens[lineIndex]) {
- 			this._tokens[lineIndex]._invalid = invalid;
- 		}
-@@ -278,7 +282,11 @@
- 		target._lineTokens = tokens.buffer;
- 	}
- 
-+<<<<<<< .our
- 	_setState(lineIndex: number, state: IState): void {
-+=======
-+	private _setState(lineIndex: number, state: IState): void {
-+>>>>>>> .their
- 		if (lineIndex < this._tokens.length && this._tokens[lineIndex]) {
- 			this._tokens[lineIndex]._state = state;
- 		} else {
-@@ -380,7 +388,15 @@
- 		return lineNumber;
- 	}
- 
-+<<<<<<< .our
- 	public _tokenizeText(buffer: ITextBuffer, text: string, state: IState): TokenizationResult2 {
-+=======
-+	public _tokenizeOneLine2(buffer: ITextBuffer, text: string, state: IState, eventBuilder: ModelTokensChangedEventBuilder): TokenizationResult2 {
-+		if (!this.hasLinesToTokenize(buffer)) {
-+			return null;
-+		}
-+
-+>>>>>>> .their
- 		let r: TokenizationResult2 = null;
- 
- 		try {
diff --git a/app/test/fixtures/merge-parser/vscode/merge-rebornix-review-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-rebornix-review-into-master.txt
deleted file mode 100644
index 8b7a9db7f04..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-rebornix-review-into-master.txt
+++ /dev/null
@@ -1,39251 +0,0 @@
-changed in both
-  base   100644 f8880c0e02b155d8468bc556e654102af466ceb3 build/gulpfile.hygiene.js
-  our    100644 6a4cd05d17fefc0e6fdc6e8d0fd2997f3c2894ff build/gulpfile.hygiene.js
-  their  100644 0217078fbb7e4c276b5dbdf969f183af43dfb42e build/gulpfile.hygiene.js
-@@ -84,7 +84,8 @@
- 	'!build/tfs/**/*.js',
- 	'!build/tfs/**/*.config',
- 	'!**/Dockerfile',
--	'!extensions/markdown-language-features/media/*.js'
-+	'!extensions/markdown-language-features/media/*.js',
-+	'!extensions/git-extended/media/*.js'
- ];
- 
- const copyrightFilter = [
-@@ -313,7 +314,7 @@
- 				return e(err);
- 			}
- 
--			cp.exec(`git show :${relativePath}`, { maxBuffer: 2000 * 1024, encoding: 'buffer' }, (err, out) => {
-+			cp.exec(`git show :${relativePath}`, { maxBuffer: 5000 * 1024, encoding: 'buffer' }, (err, out) => {
- 				if (err) {
- 					return e(err);
- 				}
-changed in both
-  base   100644 336995ff70b75f1c3ef0f0b38619091b5ac8e074 build/lib/i18n.resources.json
-  our    100644 81fda4c4e9ebad89e54fa997c5d551b3f33d7e1a build/lib/i18n.resources.json
-  their  100644 87da5e9bb0d91579cb40ec25b31d164d844da65c build/lib/i18n.resources.json
-added in remote
-  their  100644 d9611277792449b445430ccd2ff973d14d545cd2 extensions/git-extended/.vscode/launch.json
-@@ -0,0 +1,20 @@
-+{
-+	"version": "0.2.0",
-+	"configurations": [
-+		{
-+			"name": "Launch Extension",
-+			"type": "extensionHost",
-+			"request": "launch",
-+			"runtimeExecutable": "/Users/penlv/code/vscode/scripts/code.sh",
-+			"args": [
-+				"--extensionDevelopmentPath=${workspaceFolder}"
-+			],
-+			"trace": true,
-+			"protocol": "inspector",
-+			"stopOnEntry": false,
-+			"sourceMaps": true,
-+			"outFiles": ["${workspaceFolder}/client/out/**/*.js"],
-+			"preLaunchTask": "npm"
-+		}
-+	]
-+}
-\ No newline at end of file
-added in remote
-  their  100644 0a411c1c867dadab3874ab6647cf4cc0b37babcb extensions/git-extended/.vscode/tasks.json
-@@ -0,0 +1,9 @@
-+{
-+	"version": "0.1.0",
-+	"command": "npm",
-+	"isShellCommand": true,
-+	"showOutput": "silent",
-+	"args": ["run", "compile"],
-+	"isBackground": true,
-+	"problemMatcher": "$tsc-watch"
-+}
-\ No newline at end of file
-added in remote
-  their  100644 d43a539fddf5b4f3cc2950970f42a6d5238219b6 extensions/git-extended/.vscodeignore
-@@ -0,0 +1,2 @@
-+src/**
-+tsconfig.json
-\ No newline at end of file
-added in remote
-  their  100644 23d190b0e989cdfae7377b18476c117091c2fca3 extensions/git-extended/README.md
-@@ -0,0 +1,3 @@
-+# VSCode Pull Request Support for GitHub
-+
-+Experimental enhanced Git/Review/PR experience.
-\ No newline at end of file
-added in remote
-  their  100644 f7f18b560eebe76c23162dd2ac9fdd7fae13851b extensions/git-extended/images/npm_icon.png
-@@ -0,0 +1,13 @@
-+�PNG
-+
-++CiCCPICC profile+V�HU�
-+H���(�gA��Z�U\8�ܧ�}z�����������y��&��j++�z��y8�@��P�<
-+�%b��0�>�3�o�~��@��z�+��AT�:��������18
��\��p`����	A�a!:�b��"���"aH4��� �Q"��r��Bj�]H#�-r9�\@���� 2����G1���Q�u@���Ơs�t4]���k��=�����K�ut+!%�2IIkH�H-�S�>�i�L&�m������ �����O�����:ň�L	�$R��J5e?���2B���Qͩ����:�ZIm�vP/S��4u�%͛Cˤ-��Кigi�h/�t�	݃E�З�k�����w
�
��Hb(k{��/�L�ӗ��T0�2�g��oUX*�*|���:�V�~��TUsU?�y�T�U�^V}�FU�P�	��թU��6��RwR�P�Q_��_���c
���F��H�Tc���!�2e�XB�rV�,k�Mb[���Lv�v/{LSCs�f�f�f��q�
Ʊ��9ٜJ�!�
�{--?-��j�f�~�7�zھ�b�r�����up�@�,��:m:�u	�6�Q����u��>�c�y�	������G�m�������7046�l18c�̐c�k�i�����h���h��I�'�&�g�5x>f�ob�4�e�k<abi2ۤĤ��)͔k�f�Ѵ�t���,ܬج��9՜k�a�ټ�����E��J�6�ǖږ|��M����V>VyV�V׬I�\�,�m�WlPW��:�˶�����v�m���)�)�Sn�1���
-+���9�a�%�m����;t;|rtu�vlp���4éĩ��Wgg�s��5�K���v�Sm���n�z˕��ҵ������ܭ�m���=�}��M.��]�=�A���X�q�㝧�����/^v^Y^��O��&��0m���[��{`:>=e���>�>�z�����"�=�#~�~�~���;�������y��N`
�
�
����k��5��/>B	
Yr�o���c3�g,����Z�0�&L�����~o��L�̶��Gl��i��})*2�.�Q�Stqt�,֬�Y�g��񏩌�;�j�rvg�jlRlc웸�����x��E�t$	�����=��s�l�3��T�tc��ܢ����˞w<Y5Y�|8����?� BP/O�nM򄛅OE����Q���J<��V��8�;}C�h�OFu�3	OR+y���#�MVD�ެ��q�-9�����R
i��+�0�(�Of++�
�y�m������#�s��l�Lѣ�R�PL/�+x[[x�H�HZ�3�f���#�|���P���ظxY��"�E�#�Sw.1]R�dxi��}�h˲��P�XRU�jy��R�ҥ�C+�W4�����n��Z�ca�dU�j��[V*�_�p�����F���WN_�|�ym���J����H��n��Y��J�jA�І�
���_mJ�t�zj��ʹ���5a5�[̶���6��z�]�V������&�ֿ�w{��;��켵+xWk�E}�n��ݏb���~ݸGwOŞ�{�{�E��jtolܯ���	mR6�H:p囀oڛ�w�pZ*�A��'ߦ|{�P������ߙ���Hy+�:�u�-�m�=���茣�^G���~�1�cu�5�W���(=��䂓�d���N?=ԙ�y�L��k]Q]�gCϞ?t�L�_�����]�p�"�b�%�K�=�=G~p��H�[o�e���W<�t�M�;����j��s���.]�y�����n&��%���v��w
-+�L�]z�x�����������e�m��`�`��Y�	�����Ӈ��G�G�#F#���
��dΓ᧲���~V�y�s������K�X�����Ͽ�y��r﫩�:�#���y=�����}���ǽ�(�@�P���cǧ�O�>�|��/�����9%
-\ No newline at end of file
-added in remote
-  their  100644 3825a3c185da2bde784ebc7fa74c4a0cd23e17b2 extensions/git-extended/media/index.css
-@@ -0,0 +1,360 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+.title {
-+	display: flex;
-+	align-items: flex-start;
-+	margin: 20px 0;
-+}
-+
-+h2 {
-+	margin: 0;
-+}
-+
-+body hr {
-+	display: block;
-+	height: 1px;
-+	border: 0;
-+	border-top: 1px solid #555;
-+	margin: 0 !important;
-+	padding: 0;
-+
-+}
-+body .review-comment {
-+	padding: 10px;
-+	display: flex;
-+}
-+
-+body .review-comment .avatar-container {
-+	padding: 4px;
-+}
-+
-+body img.avatar {
-+	height: 28px;
-+	width: 28px;
-+	max-width: 28px;
-+	max-height: 28px;
-+	display: inline-block;
-+	overflow: hidden;
-+	line-height: 1;
-+	vertical-align: middle;
-+	border-radius: 3px;
-+	border-style: none;
-+	margin-right: 5px;
-+}
-+
-+body .review-comment .review-comment-contents {
-+	margin-left: 20px;
-+	width: 100%;
-+	border-top: 1px solid var(--vscode-activityBar-background);
-+}
-+
-+body .review-comment .review-comment-header {
-+	display: flex;
-+	align-items: center;
-+	width: 100%;
-+	padding: 4px;
-+	box-sizing: border-box;
-+	background-color: var(--vscode-editor-background);
-+}
-+
-+body .review-comment .review-comment-contents .comment-body {
-+	padding: 10px;
-+}
-+
-+body {
-+	margin: auto;
-+	width: 100%;
-+	max-width: 1200px;
-+	box-sizing: border-box;
-+}
-+
-+.prIcon {
-+	display: flex;
-+	border-radius: 10px;
-+	margin-right: 5px;
-+	margin-top: 18px;
-+}
-+
-+.overview-title {
-+	display: flex;
-+}
-+
-+#checkout {
-+	align-self: center;
-+	margin-left: auto;
-+	padding: 4px 8px;
-+	background-color: var(--vscode-button-background);
-+	color: var(--vscode-button-foreground);
-+	border-radius: 0px;
-+	border: 1px solid transparent;
-+	outline: none;
-+	display: flex;
-+}
-+
-+#checkout .octicon {
-+	margin-right: 8px;
-+}
-+
-+#checkout:hover:enabled, #checkout:focus:enabled {
-+	background-color: var(--vscode-button-hoverBackground);
-+	cursor: pointer;
-+}
-+
-+.status {
-+	display: inline-block;
-+	height: 28px;
-+	box-sizing: border-box;
-+	line-height: 20px;
-+	border-radius: 3px;
-+	color: white;
-+	padding: 4px 8px;
-+	margin-right: 5px;
-+}
-+
-+.commit, .review {
-+	display: flex;
-+	padding: 14px 4px 14px 10px;
-+	background-color: var(--vscode-editor-background);
-+}
-+
-+.timestamp {
-+	margin-left: auto;
-+}
-+
-+.details {
-+	display: flex;
-+	flex-direction: column;
-+	width: 100%;
-+}
-+
-+body .comment-form {
-+	padding: 10px 10px 10px 30px;
-+}
-+
-+body .comment-form textarea {
-+	display: block;
-+	box-sizing: border-box;
-+	padding: 10px;
-+	width: 100%;
-+	min-height: 100px;
-+	max-height: 500px;
-+	resize: vertical;
-+	border-radius: 3px;
-+	border: 2px;
-+	border-color: var(--vscode-activityBar-background);
-+	background-color: var(--vscode-peekViewEditor-background);
-+	color: var(--vscode-editor-foreground);
-+}
-+
-+body .comment-form .form-actions {
-+	overflow: auto;
-+	padding: 10px 0;
-+}
-+body .comment-form .form-actions {
-+	overflow: auto;
-+	padding: 10px 0;
-+}
-+
-+body .comment-form .form-actions button {
-+	width: auto;
-+	padding: 4px 10px;
-+	background-color: var(--vscode-button-background);
-+	color: var(--vscode-button-foreground);
-+	border-radius: 0px;
-+	border: 1px solid transparent;
-+	outline: none;
-+}
-+
-+body .comment-form .form-actions button.close-button {
-+	float: left;
-+}
-+
-+body .comment-form .form-actions button.reply-button {
-+	float: right;
-+}
-+
-+body .comment-form .form-actions button:hover:enabled,
-+body .comment-form .form-actions button:focus:enabled {
-+	background-color: var(--vscode-button-hoverBackground);
-+	cursor: pointer;
-+}
-+
-+.comment-body img {
-+	max-width: 100%;
-+	max-height: 100%;
-+}
-+
-+.comment-body a {
-+	text-decoration: none;
-+}
-+
-+.comment-body a:hover {
-+	text-decoration: underline;
-+}
-+
-+.comment-body a:focus,
-+.comment-body input:focus,
-+.comment-body select:focus,
-+.comment-body textarea:focus {
-+	outline: 1px solid -webkit-focus-ring-color;
-+	outline-offset: -1px;
-+}
-+
-+.comment-body hr {
-+	border: 0;
-+	height: 2px;
-+	border-bottom: 2px solid;
-+}
-+
-+.comment-body h1 {
-+	padding-bottom: 0.3em;
-+	line-height: 1.2;
-+	border-bottom-width: 1px;
-+	border-bottom-style: solid;
-+}
-+
-+.comment-body h1, h2, h3 {
-+	font-weight: normal;
-+}
-+
-+.comment-body h1 code,
-+.comment-body h2 code,
-+.comment-body h3 code,
-+.comment-body h4 code,
-+.comment-body h5 code,
-+.comment-body h6 code {
-+	font-size: inherit;
-+	line-height: auto;
-+}
-+
-+.comment-body table {
-+	border-collapse: collapse;
-+}
-+
-+.comment-body table > thead > tr > th {
-+	text-align: left;
-+	border-bottom: 1px solid;
-+}
-+
-+.comment-body table > thead > tr > th,
-+.comment-body table > thead > tr > td,
-+.comment-body table > tbody > tr > th,
-+.comment-body table > tbody > tr > td {
-+	padding: 5px 10px;
-+}
-+
-+.comment-body table > tbody > tr + tr > td {
-+	border-top: 1px solid;
-+}
-+
-+.comment-body blockquote {
-+	margin: 0 7px 0 5px;
-+	padding: 0 16px 0 10px;
-+	border-left-width: 5px;
-+	border-left-style: solid;
-+}
-+
-+.comment-body code {
-+	font-family: Menlo, Monaco, Consolas, "Droid Sans Mono", "Courier New", monospace, "Droid Sans Fallback";
-+	font-size: 14px;
-+	line-height: 19px;
-+}
-+
-+.comment-body body.wordWrap pre {
-+	white-space: pre-wrap;
-+}
-+
-+.comment-body .mac code {
-+	font-size: 12px;
-+	line-height: 18px;
-+}
-+
-+.comment-body pre:not(.hljs),
-+.comment-body pre.hljs code > div {
-+	padding: 16px;
-+	border-radius: 3px;
-+	overflow: auto;
-+}
-+
-+/** Theming */
-+
-+.comment-body pre code {
-+	color: var(--vscode-editor-foreground);
-+}
-+
-+
-+.vscode-light .comment-body pre:not(.hljs),
-+.vscode-light .comment-body code > div {
-+	background-color: rgba(220, 220, 220, 0.4);
-+}
-+
-+.vscode-dark .comment-body pre:not(.hljs),
-+.vscode-dark .comment-body code > div {
-+	background-color: rgba(10, 10, 10, 0.4);
-+}
-+
-+.vscode-high-contrast .comment-body pre:not(.hljs),
-+.vscode-high-contrast .comment-body code > div {
-+	background-color: rgb(0, 0, 0);
-+}
-+
-+.vscode-high-contrast .comment-body h1 {
-+	border-color: rgb(0, 0, 0);
-+}
-+
-+.vscode-light .comment-body table > thead > tr > th {
-+	border-color: rgba(0, 0, 0, 0.69);
-+}
-+
-+.vscode-dark .comment-body table > thead > tr > th {
-+	border-color: rgba(255, 255, 255, 0.69);
-+}
-+
-+.vscode-light .comment-body h1,
-+.vscode-light .comment-body hr,
-+.vscode-light .comment-body table > tbody > tr + tr > td {
-+	border-color: rgba(0, 0, 0, 0.18);
-+}
-+
-+.vscode-dark .comment-body h1,
-+.vscode-dark .comment-body hr,
-+.vscode-dark .comment-body table > tbody > tr + tr > td {
-+	border-color: rgba(255, 255, 255, 0.18);
-+}
-+
-+.diff {
-+	background-color: var(--vscode-peekViewEditor-background);
-+	margin: 8px;
-+	border: 1px;
-+}
-+
-+.diff .diffHeader {
-+	padding: 2px 12px;
-+	border-bottom: solid 1px;
-+	line-height: 1.5;
-+}
-+
-+.diff .diffLine.add {
-+	background-color: var(--vscode-diffEditor-insertedTextBackground);
-+}
-+
-+.diff .diffLine.delete {
-+	background-color: var(--vscode-diffEditor-removedTextBackground);
-+}
-+
-+.diff .diffLine .lineNumber {
-+	width: 1%;
-+	min-width: 50px;
-+	padding-right: 10px;
-+	padding-left: 10px;
-+	font-size: 12px;
-+	line-height: 20px;
-+	text-align: right;
-+	white-space: nowrap;
-+	vertical-align: top;
-+	box-sizing: border-box;
-+	display: inline-block;
-+}
-\ No newline at end of file
-added in remote
-  their  100644 42f7316c710065793b23d3b595b10b5fc48ed373 extensions/git-extended/media/index.js
-@@ -0,0 +1,26230 @@
-+/******/ (function(modules) { // webpackBootstrap
-+/******/ 	// The module cache
-+/******/ 	var installedModules = {};
-+/******/
-+/******/ 	// The require function
-+/******/ 	function __webpack_require__(moduleId) {
-+/******/
-+/******/ 		// Check if module is in cache
-+/******/ 		if(installedModules[moduleId]) {
-+/******/ 			return installedModules[moduleId].exports;
-+/******/ 		}
-+/******/ 		// Create a new module (and put it into the cache)
-+/******/ 		var module = installedModules[moduleId] = {
-+/******/ 			i: moduleId,
-+/******/ 			l: false,
-+/******/ 			exports: {}
-+/******/ 		};
-+/******/
-+/******/ 		// Execute the module function
-+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
-+/******/
-+/******/ 		// Flag the module as loaded
-+/******/ 		module.l = true;
-+/******/
-+/******/ 		// Return the exports of the module
-+/******/ 		return module.exports;
-+/******/ 	}
-+/******/
-+/******/
-+/******/ 	// expose the modules object (__webpack_modules__)
-+/******/ 	__webpack_require__.m = modules;
-+/******/
-+/******/ 	// expose the module cache
-+/******/ 	__webpack_require__.c = installedModules;
-+/******/
-+/******/ 	// define getter function for harmony exports
-+/******/ 	__webpack_require__.d = function(exports, name, getter) {
-+/******/ 		if(!__webpack_require__.o(exports, name)) {
-+/******/ 			Object.defineProperty(exports, name, {
-+/******/ 				configurable: false,
-+/******/ 				enumerable: true,
-+/******/ 				get: getter
-+/******/ 			});
-+/******/ 		}
-+/******/ 	};
-+/******/
-+/******/ 	// define __esModule on exports
-+/******/ 	__webpack_require__.r = function(exports) {
-+/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
-+/******/ 	};
-+/******/
-+/******/ 	// getDefaultExport function for compatibility with non-harmony modules
-+/******/ 	__webpack_require__.n = function(module) {
-+/******/ 		var getter = module && module.__esModule ?
-+/******/ 			function getDefault() { return module['default']; } :
-+/******/ 			function getModuleExports() { return module; };
-+/******/ 		__webpack_require__.d(getter, 'a', getter);
-+/******/ 		return getter;
-+/******/ 	};
-+/******/
-+/******/ 	// Object.prototype.hasOwnProperty.call
-+/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
-+/******/
-+/******/ 	// __webpack_public_path__
-+/******/ 	__webpack_require__.p = "";
-+/******/
-+/******/
-+/******/ 	// Load entry module and return exports
-+/******/ 	return __webpack_require__(__webpack_require__.s = "./preview-src/index.ts");
-+/******/ })
-+/************************************************************************/
-+/******/ ({
-+
-+/***/ "./node_modules/entities/maps/entities.json":
-+/*!**************************************************!*\
-+  !*** ./node_modules/entities/maps/entities.json ***!
-+  \**************************************************/
-+/*! exports provided: Aacute, aacute, Abreve, abreve, ac, acd, acE, Acirc, acirc, acute, Acy, acy, AElig, aelig, af, Afr, afr, Agrave, agrave, alefsym, aleph, Alpha, alpha, Amacr, amacr, amalg, amp, AMP, andand, And, and, andd, andslope, andv, ang, ange, angle, angmsdaa, angmsdab, angmsdac, angmsdad, angmsdae, angmsdaf, angmsdag, angmsdah, angmsd, angrt, angrtvb, angrtvbd, angsph, angst, angzarr, Aogon, aogon, Aopf, aopf, apacir, ap, apE, ape, apid, apos, ApplyFunction, approx, approxeq, Aring, aring, Ascr, ascr, Assign, ast, asymp, asympeq, Atilde, atilde, Auml, auml, awconint, awint, backcong, backepsilon, backprime, backsim, backsimeq, Backslash, Barv, barvee, barwed, Barwed, barwedge, bbrk, bbrktbrk, bcong, Bcy, bcy, bdquo, becaus, because, Because, bemptyv, bepsi, bernou, Bernoullis, Beta, beta, beth, between, Bfr, bfr, bigcap, bigcirc, bigcup, bigodot, bigoplus, bigotimes, bigsqcup, bigstar, bigtriangledown, bigtriangleup, biguplus, bigvee, bigwedge, bkarow, blacklozenge, blacksquare, blacktriangle, blacktriangledown, blacktriangleleft, blacktriangleright, blank, blk12, blk14, blk34, block, bne, bnequiv, bNot, bnot, Bopf, bopf, bot, bottom, bowtie, boxbox, boxdl, boxdL, boxDl, boxDL, boxdr, boxdR, boxDr, boxDR, boxh, boxH, boxhd, boxHd, boxhD, boxHD, boxhu, boxHu, boxhU, boxHU, boxminus, boxplus, boxtimes, boxul, boxuL, boxUl, boxUL, boxur, boxuR, boxUr, boxUR, boxv, boxV, boxvh, boxvH, boxVh, boxVH, boxvl, boxvL, boxVl, boxVL, boxvr, boxvR, boxVr, boxVR, bprime, breve, Breve, brvbar, bscr, Bscr, bsemi, bsim, bsime, bsolb, bsol, bsolhsub, bull, bullet, bump, bumpE, bumpe, Bumpeq, bumpeq, Cacute, cacute, capand, capbrcup, capcap, cap, Cap, capcup, capdot, CapitalDifferentialD, caps, caret, caron, Cayleys, ccaps, Ccaron, ccaron, Ccedil, ccedil, Ccirc, ccirc, Cconint, ccups, ccupssm, Cdot, cdot, cedil, Cedilla, cemptyv, cent, centerdot, CenterDot, cfr, Cfr, CHcy, chcy, check, checkmark, Chi, chi, circ, circeq, circlearrowleft, circlearrowright, circledast, circledcirc, circleddash, CircleDot, circledR, circledS, CircleMinus, CirclePlus, CircleTimes, cir, cirE, cire, cirfnint, cirmid, cirscir, ClockwiseContourIntegral, CloseCurlyDoubleQuote, CloseCurlyQuote, clubs, clubsuit, colon, Colon, Colone, colone, coloneq, comma, commat, comp, compfn, complement, complexes, cong, congdot, Congruent, conint, Conint, ContourIntegral, copf, Copf, coprod, Coproduct, copy, COPY, copysr, CounterClockwiseContourIntegral, crarr, cross, Cross, Cscr, cscr, csub, csube, csup, csupe, ctdot, cudarrl, cudarrr, cuepr, cuesc, cularr, cularrp, cupbrcap, cupcap, CupCap, cup, Cup, cupcup, cupdot, cupor, cups, curarr, curarrm, curlyeqprec, curlyeqsucc, curlyvee, curlywedge, curren, curvearrowleft, curvearrowright, cuvee, cuwed, cwconint, cwint, cylcty, dagger, Dagger, daleth, darr, Darr, dArr, dash, Dashv, dashv, dbkarow, dblac, Dcaron, dcaron, Dcy, dcy, ddagger, ddarr, DD, dd, DDotrahd, ddotseq, deg, Del, Delta, delta, demptyv, dfisht, Dfr, dfr, dHar, dharl, dharr, DiacriticalAcute, DiacriticalDot, DiacriticalDoubleAcute, DiacriticalGrave, DiacriticalTilde, diam, diamond, Diamond, diamondsuit, diams, die, DifferentialD, digamma, disin, div, divide, divideontimes, divonx, DJcy, djcy, dlcorn, dlcrop, dollar, Dopf, dopf, Dot, dot, DotDot, doteq, doteqdot, DotEqual, dotminus, dotplus, dotsquare, doublebarwedge, DoubleContourIntegral, DoubleDot, DoubleDownArrow, DoubleLeftArrow, DoubleLeftRightArrow, DoubleLeftTee, DoubleLongLeftArrow, DoubleLongLeftRightArrow, DoubleLongRightArrow, DoubleRightArrow, DoubleRightTee, DoubleUpArrow, DoubleUpDownArrow, DoubleVerticalBar, DownArrowBar, downarrow, DownArrow, Downarrow, DownArrowUpArrow, DownBreve, downdownarrows, downharpoonleft, downharpoonright, DownLeftRightVector, DownLeftTeeVector, DownLeftVectorBar, DownLeftVector, DownRightTeeVector, DownRightVectorBar, DownRightVector, DownTeeArrow, DownTee, drbkarow, drcorn, drcrop, Dscr, dscr, DScy, dscy, dsol, Dstrok, dstrok, dtdot, dtri, dtrif, duarr, duhar, dwangle, DZcy, dzcy, dzigrarr, Eacute, eacute, easter, Ecaron, ecaron, Ecirc, ecirc, ecir, ecolon, Ecy, ecy, eDDot, Edot, edot, eDot, ee, efDot, Efr, efr, eg, Egrave, egrave, egs, egsdot, el, Element, elinters, ell, els, elsdot, Emacr, emacr, empty, emptyset, EmptySmallSquare, emptyv, EmptyVerySmallSquare, emsp13, emsp14, emsp, ENG, eng, ensp, Eogon, eogon, Eopf, eopf, epar, eparsl, eplus, epsi, Epsilon, epsilon, epsiv, eqcirc, eqcolon, eqsim, eqslantgtr, eqslantless, Equal, equals, EqualTilde, equest, Equilibrium, equiv, equivDD, eqvparsl, erarr, erDot, escr, Escr, esdot, Esim, esim, Eta, eta, ETH, eth, Euml, euml, euro, excl, exist, Exists, expectation, exponentiale, ExponentialE, fallingdotseq, Fcy, fcy, female, ffilig, fflig, ffllig, Ffr, ffr, filig, FilledSmallSquare, FilledVerySmallSquare, fjlig, flat, fllig, fltns, fnof, Fopf, fopf, forall, ForAll, fork, forkv, Fouriertrf, fpartint, frac12, frac13, frac14, frac15, frac16, frac18, frac23, frac25, frac34, frac35, frac38, frac45, frac56, frac58, frac78, frasl, frown, fscr, Fscr, gacute, Gamma, gamma, Gammad, gammad, gap, Gbreve, gbreve, Gcedil, Gcirc, gcirc, Gcy, gcy, Gdot, gdot, ge, gE, gEl, gel, geq, geqq, geqslant, gescc, ges, gesdot, gesdoto, gesdotol, gesl, gesles, Gfr, gfr, gg, Gg, ggg, gimel, GJcy, gjcy, gla, gl, glE, glj, gnap, gnapprox, gne, gnE, gneq, gneqq, gnsim, Gopf, gopf, grave, GreaterEqual, GreaterEqualLess, GreaterFullEqual, GreaterGreater, GreaterLess, GreaterSlantEqual, GreaterTilde, Gscr, gscr, gsim, gsime, gsiml, gtcc, gtcir, gt, GT, Gt, gtdot, gtlPar, gtquest, gtrapprox, gtrarr, gtrdot, gtreqless, gtreqqless, gtrless, gtrsim, gvertneqq, gvnE, Hacek, hairsp, half, hamilt, HARDcy, hardcy, harrcir, harr, hArr, harrw, Hat, hbar, Hcirc, hcirc, hearts, heartsuit, hellip, hercon, hfr, Hfr, HilbertSpace, hksearow, hkswarow, hoarr, homtht, hookleftarrow, hookrightarrow, hopf, Hopf, horbar, HorizontalLine, hscr, Hscr, hslash, Hstrok, hstrok, HumpDownHump, HumpEqual, hybull, hyphen, Iacute, iacute, ic, Icirc, icirc, Icy, icy, Idot, IEcy, iecy, iexcl, iff, ifr, Ifr, Igrave, igrave, ii, iiiint, iiint, iinfin, iiota, IJlig, ijlig, Imacr, imacr, image, ImaginaryI, imagline, imagpart, imath, Im, imof, imped, Implies, incare, in, infin, infintie, inodot, intcal, int, Int, integers, Integral, intercal, Intersection, intlarhk, intprod, InvisibleComma, InvisibleTimes, IOcy, iocy, Iogon, iogon, Iopf, iopf, Iota, iota, iprod, iquest, iscr, Iscr, isin, isindot, isinE, isins, isinsv, isinv, it, Itilde, itilde, Iukcy, iukcy, Iuml, iuml, Jcirc, jcirc, Jcy, jcy, Jfr, jfr, jmath, Jopf, jopf, Jscr, jscr, Jsercy, jsercy, Jukcy, jukcy, Kappa, kappa, kappav, Kcedil, kcedil, Kcy, kcy, Kfr, kfr, kgreen, KHcy, khcy, KJcy, kjcy, Kopf, kopf, Kscr, kscr, lAarr, Lacute, lacute, laemptyv, lagran, Lambda, lambda, lang, Lang, langd, langle, lap, Laplacetrf, laquo, larrb, larrbfs, larr, Larr, lArr, larrfs, larrhk, larrlp, larrpl, larrsim, larrtl, latail, lAtail, lat, late, lates, lbarr, lBarr, lbbrk, lbrace, lbrack, lbrke, lbrksld, lbrkslu, Lcaron, lcaron, Lcedil, lcedil, lceil, lcub, Lcy, lcy, ldca, ldquo, ldquor, ldrdhar, ldrushar, ldsh, le, lE, LeftAngleBracket, LeftArrowBar, leftarrow, LeftArrow, Leftarrow, LeftArrowRightArrow, leftarrowtail, LeftCeiling, LeftDoubleBracket, LeftDownTeeVector, LeftDownVectorBar, LeftDownVector, LeftFloor, leftharpoondown, leftharpoonup, leftleftarrows, leftrightarrow, LeftRightArrow, Leftrightarrow, leftrightarrows, leftrightharpoons, leftrightsquigarrow, LeftRightVector, LeftTeeArrow, LeftTee, LeftTeeVector, leftthreetimes, LeftTriangleBar, LeftTriangle, LeftTriangleEqual, LeftUpDownVector, LeftUpTeeVector, LeftUpVectorBar, LeftUpVector, LeftVectorBar, LeftVector, lEg, leg, leq, leqq, leqslant, lescc, les, lesdot, lesdoto, lesdotor, lesg, lesges, lessapprox, lessdot, lesseqgtr, lesseqqgtr, LessEqualGreater, LessFullEqual, LessGreater, lessgtr, LessLess, lesssim, LessSlantEqual, LessTilde, lfisht, lfloor, Lfr, lfr, lg, lgE, lHar, lhard, lharu, lharul, lhblk, LJcy, ljcy, llarr, ll, Ll, llcorner, Lleftarrow, llhard, lltri, Lmidot, lmidot, lmoustache, lmoust, lnap, lnapprox, lne, lnE, lneq, lneqq, lnsim, loang, loarr, lobrk, longleftarrow, LongLeftArrow, Longleftarrow, longleftrightarrow, LongLeftRightArrow, Longleftrightarrow, longmapsto, longrightarrow, LongRightArrow, Longrightarrow, looparrowleft, looparrowright, lopar, Lopf, lopf, loplus, lotimes, lowast, lowbar, LowerLeftArrow, LowerRightArrow, loz, lozenge, lozf, lpar, lparlt, lrarr, lrcorner, lrhar, lrhard, lrm, lrtri, lsaquo, lscr, Lscr, lsh, Lsh, lsim, lsime, lsimg, lsqb, lsquo, lsquor, Lstrok, lstrok, ltcc, ltcir, lt, LT, Lt, ltdot, lthree, ltimes, ltlarr, ltquest, ltri, ltrie, ltrif, ltrPar, lurdshar, luruhar, lvertneqq, lvnE, macr, male, malt, maltese, Map, map, mapsto, mapstodown, mapstoleft, mapstoup, marker, mcomma, Mcy, mcy, mdash, mDDot, measuredangle, MediumSpace, Mellintrf, Mfr, mfr, mho, micro, midast, midcir, mid, middot, minusb, minus, minusd, minusdu, MinusPlus, mlcp, mldr, mnplus, models, Mopf, mopf, mp, mscr, Mscr, mstpos, Mu, mu, multimap, mumap, nabla, Nacute, nacute, nang, nap, napE, napid, napos, napprox, natural, naturals, natur, nbsp, nbump, nbumpe, ncap, Ncaron, ncaron, Ncedil, ncedil, ncong, ncongdot, ncup, Ncy, ncy, ndash, nearhk, nearr, neArr, nearrow, ne, nedot, NegativeMediumSpace, NegativeThickSpace, NegativeThinSpace, NegativeVeryThinSpace, nequiv, nesear, nesim, NestedGreaterGreater, NestedLessLess, NewLine, nexist, nexists, Nfr, nfr, ngE, nge, ngeq, ngeqq, ngeqslant, nges, nGg, ngsim, nGt, ngt, ngtr, nGtv, nharr, nhArr, nhpar, ni, nis, nisd, niv, NJcy, njcy, nlarr, nlArr, nldr, nlE, nle, nleftarrow, nLeftarrow, nleftrightarrow, nLeftrightarrow, nleq, nleqq, nleqslant, nles, nless, nLl, nlsim, nLt, nlt, nltri, nltrie, nLtv, nmid, NoBreak, NonBreakingSpace, nopf, Nopf, Not, not, NotCongruent, NotCupCap, NotDoubleVerticalBar, NotElement, NotEqual, NotEqualTilde, NotExists, NotGreater, NotGreaterEqual, NotGreaterFullEqual, NotGreaterGreater, NotGreaterLess, NotGreaterSlantEqual, NotGreaterTilde, NotHumpDownHump, NotHumpEqual, notin, notindot, notinE, notinva, notinvb, notinvc, NotLeftTriangleBar, NotLeftTriangle, NotLeftTriangleEqual, NotLess, NotLessEqual, NotLessGreater, NotLessLess, NotLessSlantEqual, NotLessTilde, NotNestedGreaterGreater, NotNestedLessLess, notni, notniva, notnivb, notnivc, NotPrecedes, NotPrecedesEqual, NotPrecedesSlantEqual, NotReverseElement, NotRightTriangleBar, NotRightTriangle, NotRightTriangleEqual, NotSquareSubset, NotSquareSubsetEqual, NotSquareSuperset, NotSquareSupersetEqual, NotSubset, NotSubsetEqual, NotSucceeds, NotSucceedsEqual, NotSucceedsSlantEqual, NotSucceedsTilde, NotSuperset, NotSupersetEqual, NotTilde, NotTildeEqual, NotTildeFullEqual, NotTildeTilde, NotVerticalBar, nparallel, npar, nparsl, npart, npolint, npr, nprcue, nprec, npreceq, npre, nrarrc, nrarr, nrArr, nrarrw, nrightarrow, nRightarrow, nrtri, nrtrie, nsc, nsccue, nsce, Nscr, nscr, nshortmid, nshortparallel, nsim, nsime, nsimeq, nsmid, nspar, nsqsube, nsqsupe, nsub, nsubE, nsube, nsubset, nsubseteq, nsubseteqq, nsucc, nsucceq, nsup, nsupE, nsupe, nsupset, nsupseteq, nsupseteqq, ntgl, Ntilde, ntilde, ntlg, ntriangleleft, ntrianglelefteq, ntriangleright, ntrianglerighteq, Nu, nu, num, numero, numsp, nvap, nvdash, nvDash, nVdash, nVDash, nvge, nvgt, nvHarr, nvinfin, nvlArr, nvle, nvlt, nvltrie, nvrArr, nvrtrie, nvsim, nwarhk, nwarr, nwArr, nwarrow, nwnear, Oacute, oacute, oast, Ocirc, ocirc, ocir, Ocy, ocy, odash, Odblac, odblac, odiv, odot, odsold, OElig, oelig, ofcir, Ofr, ofr, ogon, Ograve, ograve, ogt, ohbar, ohm, oint, olarr, olcir, olcross, oline, olt, Omacr, omacr, Omega, omega, Omicron, omicron, omid, ominus, Oopf, oopf, opar, OpenCurlyDoubleQuote, OpenCurlyQuote, operp, oplus, orarr, Or, or, ord, order, orderof, ordf, ordm, origof, oror, orslope, orv, oS, Oscr, oscr, Oslash, oslash, osol, Otilde, otilde, otimesas, Otimes, otimes, Ouml, ouml, ovbar, OverBar, OverBrace, OverBracket, OverParenthesis, para, parallel, par, parsim, parsl, part, PartialD, Pcy, pcy, percnt, period, permil, perp, pertenk, Pfr, pfr, Phi, phi, phiv, phmmat, phone, Pi, pi, pitchfork, piv, planck, planckh, plankv, plusacir, plusb, pluscir, plus, plusdo, plusdu, pluse, PlusMinus, plusmn, plussim, plustwo, pm, Poincareplane, pointint, popf, Popf, pound, prap, Pr, pr, prcue, precapprox, prec, preccurlyeq, Precedes, PrecedesEqual, PrecedesSlantEqual, PrecedesTilde, preceq, precnapprox, precneqq, precnsim, pre, prE, precsim, prime, Prime, primes, prnap, prnE, prnsim, prod, Product, profalar, profline, profsurf, prop, Proportional, Proportion, propto, prsim, prurel, Pscr, pscr, Psi, psi, puncsp, Qfr, qfr, qint, qopf, Qopf, qprime, Qscr, qscr, quaternions, quatint, quest, questeq, quot, QUOT, rAarr, race, Racute, racute, radic, raemptyv, rang, Rang, rangd, range, rangle, raquo, rarrap, rarrb, rarrbfs, rarrc, rarr, Rarr, rArr, rarrfs, rarrhk, rarrlp, rarrpl, rarrsim, Rarrtl, rarrtl, rarrw, ratail, rAtail, ratio, rationals, rbarr, rBarr, RBarr, rbbrk, rbrace, rbrack, rbrke, rbrksld, rbrkslu, Rcaron, rcaron, Rcedil, rcedil, rceil, rcub, Rcy, rcy, rdca, rdldhar, rdquo, rdquor, rdsh, real, realine, realpart, reals, Re, rect, reg, REG, ReverseElement, ReverseEquilibrium, ReverseUpEquilibrium, rfisht, rfloor, rfr, Rfr, rHar, rhard, rharu, rharul, Rho, rho, rhov, RightAngleBracket, RightArrowBar, rightarrow, RightArrow, Rightarrow, RightArrowLeftArrow, rightarrowtail, RightCeiling, RightDoubleBracket, RightDownTeeVector, RightDownVectorBar, RightDownVector, RightFloor, rightharpoondown, rightharpoonup, rightleftarrows, rightleftharpoons, rightrightarrows, rightsquigarrow, RightTeeArrow, RightTee, RightTeeVector, rightthreetimes, RightTriangleBar, RightTriangle, RightTriangleEqual, RightUpDownVector, RightUpTeeVector, RightUpVectorBar, RightUpVector, RightVectorBar, RightVector, ring, risingdotseq, rlarr, rlhar, rlm, rmoustache, rmoust, rnmid, roang, roarr, robrk, ropar, ropf, Ropf, roplus, rotimes, RoundImplies, rpar, rpargt, rppolint, rrarr, Rrightarrow, rsaquo, rscr, Rscr, rsh, Rsh, rsqb, rsquo, rsquor, rthree, rtimes, rtri, rtrie, rtrif, rtriltri, RuleDelayed, ruluhar, rx, Sacute, sacute, sbquo, scap, Scaron, scaron, Sc, sc, sccue, sce, scE, Scedil, scedil, Scirc, scirc, scnap, scnE, scnsim, scpolint, scsim, Scy, scy, sdotb, sdot, sdote, searhk, searr, seArr, searrow, sect, semi, seswar, setminus, setmn, sext, Sfr, sfr, sfrown, sharp, SHCHcy, shchcy, SHcy, shcy, ShortDownArrow, ShortLeftArrow, shortmid, shortparallel, ShortRightArrow, ShortUpArrow, shy, Sigma, sigma, sigmaf, sigmav, sim, simdot, sime, simeq, simg, simgE, siml, simlE, simne, simplus, simrarr, slarr, SmallCircle, smallsetminus, smashp, smeparsl, smid, smile, smt, smte, smtes, SOFTcy, softcy, solbar, solb, sol, Sopf, sopf, spades, spadesuit, spar, sqcap, sqcaps, sqcup, sqcups, Sqrt, sqsub, sqsube, sqsubset, sqsubseteq, sqsup, sqsupe, sqsupset, sqsupseteq, square, Square, SquareIntersection, SquareSubset, SquareSubsetEqual, SquareSuperset, SquareSupersetEqual, SquareUnion, squarf, squ, squf, srarr, Sscr, sscr, ssetmn, ssmile, sstarf, Star, star, starf, straightepsilon, straightphi, strns, sub, Sub, subdot, subE, sube, subedot, submult, subnE, subne, subplus, subrarr, subset, Subset, subseteq, subseteqq, SubsetEqual, subsetneq, subsetneqq, subsim, subsub, subsup, succapprox, succ, succcurlyeq, Succeeds, SucceedsEqual, SucceedsSlantEqual, SucceedsTilde, succeq, succnapprox, succneqq, succnsim, succsim, SuchThat, sum, Sum, sung, sup1, sup2, sup3, sup, Sup, supdot, supdsub, supE, supe, supedot, Superset, SupersetEqual, suphsol, suphsub, suplarr, supmult, supnE, supne, supplus, supset, Supset, supseteq, supseteqq, supsetneq, supsetneqq, supsim, supsub, supsup, swarhk, swarr, swArr, swarrow, swnwar, szlig, Tab, target, Tau, tau, tbrk, Tcaron, tcaron, Tcedil, tcedil, Tcy, tcy, tdot, telrec, Tfr, tfr, there4, therefore, Therefore, Theta, theta, thetasym, thetav, thickapprox, thicksim, ThickSpace, ThinSpace, thinsp, thkap, thksim, THORN, thorn, tilde, Tilde, TildeEqual, TildeFullEqual, TildeTilde, timesbar, timesb, times, timesd, tint, toea, topbot, topcir, top, Topf, topf, topfork, tosa, tprime, trade, TRADE, triangle, triangledown, triangleleft, trianglelefteq, triangleq, triangleright, trianglerighteq, tridot, trie, triminus, TripleDot, triplus, trisb, tritime, trpezium, Tscr, tscr, TScy, tscy, TSHcy, tshcy, Tstrok, tstrok, twixt, twoheadleftarrow, twoheadrightarrow, Uacute, uacute, uarr, Uarr, uArr, Uarrocir, Ubrcy, ubrcy, Ubreve, ubreve, Ucirc, ucirc, Ucy, ucy, udarr, Udblac, udblac, udhar, ufisht, Ufr, ufr, Ugrave, ugrave, uHar, uharl, uharr, uhblk, ulcorn, ulcorner, ulcrop, ultri, Umacr, umacr, uml, UnderBar, UnderBrace, UnderBracket, UnderParenthesis, Union, UnionPlus, Uogon, uogon, Uopf, uopf, UpArrowBar, uparrow, UpArrow, Uparrow, UpArrowDownArrow, updownarrow, UpDownArrow, Updownarrow, UpEquilibrium, upharpoonleft, upharpoonright, uplus, UpperLeftArrow, UpperRightArrow, upsi, Upsi, upsih, Upsilon, upsilon, UpTeeArrow, UpTee, upuparrows, urcorn, urcorner, urcrop, Uring, uring, urtri, Uscr, uscr, utdot, Utilde, utilde, utri, utrif, uuarr, Uuml, uuml, uwangle, vangrt, varepsilon, varkappa, varnothing, varphi, varpi, varpropto, varr, vArr, varrho, varsigma, varsubsetneq, varsubsetneqq, varsupsetneq, varsupsetneqq, vartheta, vartriangleleft, vartriangleright, vBar, Vbar, vBarv, Vcy, vcy, vdash, vDash, Vdash, VDash, Vdashl, veebar, vee, Vee, veeeq, vellip, verbar, Verbar, vert, Vert, VerticalBar, VerticalLine, VerticalSeparator, VerticalTilde, VeryThinSpace, Vfr, vfr, vltri, vnsub, vnsup, Vopf, vopf, vprop, vrtri, Vscr, vscr, vsubnE, vsubne, vsupnE, vsupne, Vvdash, vzigzag, Wcirc, wcirc, wedbar, wedge, Wedge, wedgeq, weierp, Wfr, wfr, Wopf, wopf, wp, wr, wreath, Wscr, wscr, xcap, xcirc, xcup, xdtri, Xfr, xfr, xharr, xhArr, Xi, xi, xlarr, xlArr, xmap, xnis, xodot, Xopf, xopf, xoplus, xotime, xrarr, xrArr, Xscr, xscr, xsqcup, xuplus, xutri, xvee, xwedge, Yacute, yacute, YAcy, yacy, Ycirc, ycirc, Ycy, ycy, yen, Yfr, yfr, YIcy, yicy, Yopf, yopf, Yscr, yscr, YUcy, yucy, yuml, Yuml, Zacute, zacute, Zcaron, zcaron, Zcy, zcy, Zdot, zdot, zeetrf, ZeroWidthSpace, Zeta, zeta, zfr, Zfr, ZHcy, zhcy, zigrarr, zopf, Zopf, Zscr, zscr, zwj, zwnj, default */
-+/***/ (function(module) {
-+
-+module.exports = {"Aacute":"Á","aacute":"á","Abreve":"Ă","abreve":"ă","ac":"∾","acd":"∿","acE":"∾̳","Acirc":"Â","acirc":"â","acute":"´","Acy":"А","acy":"а","AElig":"Æ","aelig":"æ","af":"⁡","Afr":"𝔄","afr":"𝔞","Agrave":"À","agrave":"à","alefsym":"ℵ","aleph":"ℵ","Alpha":"Α","alpha":"α","Amacr":"Ā","amacr":"ā","amalg":"⨿","amp":"&","AMP":"&","andand":"⩕","And":"⩓","and":"∧","andd":"⩜","andslope":"⩘","andv":"⩚","ang":"∠","ange":"⦤","angle":"∠","angmsdaa":"⦨","angmsdab":"⦩","angmsdac":"⦪","angmsdad":"⦫","angmsdae":"⦬","angmsdaf":"⦭","angmsdag":"⦮","angmsdah":"⦯","angmsd":"∡","angrt":"∟","angrtvb":"⊾","angrtvbd":"⦝","angsph":"∢","angst":"Å","angzarr":"⍼","Aogon":"Ą","aogon":"ą","Aopf":"𝔸","aopf":"𝕒","apacir":"⩯","ap":"≈","apE":"⩰","ape":"≊","apid":"≋","apos":"'","ApplyFunction":"⁡","approx":"≈","approxeq":"≊","Aring":"Å","aring":"å","Ascr":"𝒜","ascr":"𝒶","Assign":"≔","ast":"*","asymp":"≈","asympeq":"≍","Atilde":"Ã","atilde":"ã","Auml":"Ä","auml":"ä","awconint":"∳","awint":"⨑","backcong":"≌","backepsilon":"϶","backprime":"‵","backsim":"∽","backsimeq":"⋍","Backslash":"∖","Barv":"⫧","barvee":"⊽","barwed":"⌅","Barwed":"⌆","barwedge":"⌅","bbrk":"⎵","bbrktbrk":"⎶","bcong":"≌","Bcy":"Б","bcy":"б","bdquo":"„","becaus":"∵","because":"∵","Because":"∵","bemptyv":"⦰","bepsi":"϶","bernou":"ℬ","Bernoullis":"ℬ","Beta":"Β","beta":"β","beth":"ℶ","between":"≬","Bfr":"𝔅","bfr":"𝔟","bigcap":"⋂","bigcirc":"◯","bigcup":"⋃","bigodot":"⨀","bigoplus":"⨁","bigotimes":"⨂","bigsqcup":"⨆","bigstar":"★","bigtriangledown":"▽","bigtriangleup":"△","biguplus":"⨄","bigvee":"⋁","bigwedge":"⋀","bkarow":"⤍","blacklozenge":"⧫","blacksquare":"▪","blacktriangle":"▴","blacktriangledown":"▾","blacktriangleleft":"◂","blacktriangleright":"▸","blank":"␣","blk12":"▒","blk14":"░","blk34":"▓","block":"█","bne":"=⃥","bnequiv":"≡⃥","bNot":"⫭","bnot":"⌐","Bopf":"𝔹","bopf":"𝕓","bot":"⊥","bottom":"⊥","bowtie":"⋈","boxbox":"⧉","boxdl":"┐","boxdL":"╕","boxDl":"╖","boxDL":"╗","boxdr":"┌","boxdR":"╒","boxDr":"╓","boxDR":"╔","boxh":"─","boxH":"═","boxhd":"┬","boxHd":"╤","boxhD":"╥","boxHD":"╦","boxhu":"┴","boxHu":"╧","boxhU":"╨","boxHU":"╩","boxminus":"⊟","boxplus":"⊞","boxtimes":"⊠","boxul":"┘","boxuL":"╛","boxUl":"╜","boxUL":"╝","boxur":"└","boxuR":"╘","boxUr":"╙","boxUR":"╚","boxv":"│","boxV":"║","boxvh":"┼","boxvH":"╪","boxVh":"╫","boxVH":"╬","boxvl":"┤","boxvL":"╡","boxVl":"╢","boxVL":"╣","boxvr":"├","boxvR":"╞","boxVr":"╟","boxVR":"╠","bprime":"‵","breve":"˘","Breve":"˘","brvbar":"¦","bscr":"𝒷","Bscr":"ℬ","bsemi":"⁏","bsim":"∽","bsime":"⋍","bsolb":"⧅","bsol":"\\","bsolhsub":"⟈","bull":"•","bullet":"•","bump":"≎","bumpE":"⪮","bumpe":"≏","Bumpeq":"≎","bumpeq":"≏","Cacute":"Ć","cacute":"ć","capand":"⩄","capbrcup":"⩉","capcap":"⩋","cap":"∩","Cap":"⋒","capcup":"⩇","capdot":"⩀","CapitalDifferentialD":"ⅅ","caps":"∩︀","caret":"⁁","caron":"ˇ","Cayleys":"ℭ","ccaps":"⩍","Ccaron":"Č","ccaron":"č","Ccedil":"Ç","ccedil":"ç","Ccirc":"Ĉ","ccirc":"ĉ","Cconint":"∰","ccups":"⩌","ccupssm":"⩐","Cdot":"Ċ","cdot":"ċ","cedil":"¸","Cedilla":"¸","cemptyv":"⦲","cent":"¢","centerdot":"·","CenterDot":"·","cfr":"𝔠","Cfr":"ℭ","CHcy":"Ч","chcy":"ч","check":"✓","checkmark":"✓","Chi":"Χ","chi":"χ","circ":"ˆ","circeq":"≗","circlearrowleft":"↺","circlearrowright":"↻","circledast":"⊛","circledcirc":"⊚","circleddash":"⊝","CircleDot":"⊙","circledR":"®","circledS":"Ⓢ","CircleMinus":"⊖","CirclePlus":"⊕","CircleTimes":"⊗","cir":"○","cirE":"⧃","cire":"≗","cirfnint":"⨐","cirmid":"⫯","cirscir":"⧂","ClockwiseContourIntegral":"∲","CloseCurlyDoubleQuote":"”","CloseCurlyQuote":"’","clubs":"♣","clubsuit":"♣","colon":":","Colon":"∷","Colone":"⩴","colone":"≔","coloneq":"≔","comma":",","commat":"@","comp":"∁","compfn":"∘","complement":"∁","complexes":"ℂ","cong":"≅","congdot":"⩭","Congruent":"≡","conint":"∮","Conint":"∯","ContourIntegral":"∮","copf":"𝕔","Copf":"ℂ","coprod":"∐","Coproduct":"∐","copy":"©","COPY":"©","copysr":"℗","CounterClockwiseContourIntegral":"∳","crarr":"↵","cross":"✗","Cross":"⨯","Cscr":"𝒞","cscr":"𝒸","csub":"⫏","csube":"⫑","csup":"⫐","csupe":"⫒","ctdot":"⋯","cudarrl":"⤸","cudarrr":"⤵","cuepr":"⋞","cuesc":"⋟","cularr":"↶","cularrp":"⤽","cupbrcap":"⩈","cupcap":"⩆","CupCap":"≍","cup":"∪","Cup":"⋓","cupcup":"⩊","cupdot":"⊍","cupor":"⩅","cups":"∪︀","curarr":"↷","curarrm":"⤼","curlyeqprec":"⋞","curlyeqsucc":"⋟","curlyvee":"⋎","curlywedge":"⋏","curren":"¤","curvearrowleft":"↶","curvearrowright":"↷","cuvee":"⋎","cuwed":"⋏","cwconint":"∲","cwint":"∱","cylcty":"⌭","dagger":"†","Dagger":"‡","daleth":"ℸ","darr":"↓","Darr":"↡","dArr":"⇓","dash":"‐","Dashv":"⫤","dashv":"⊣","dbkarow":"⤏","dblac":"˝","Dcaron":"Ď","dcaron":"ď","Dcy":"Д","dcy":"д","ddagger":"‡","ddarr":"⇊","DD":"ⅅ","dd":"ⅆ","DDotrahd":"⤑","ddotseq":"⩷","deg":"°","Del":"∇","Delta":"Δ","delta":"δ","demptyv":"⦱","dfisht":"⥿","Dfr":"𝔇","dfr":"𝔡","dHar":"⥥","dharl":"⇃","dharr":"⇂","DiacriticalAcute":"´","DiacriticalDot":"˙","DiacriticalDoubleAcute":"˝","DiacriticalGrave":"`","DiacriticalTilde":"˜","diam":"⋄","diamond":"⋄","Diamond":"⋄","diamondsuit":"♦","diams":"♦","die":"¨","DifferentialD":"ⅆ","digamma":"ϝ","disin":"⋲","div":"÷","divide":"÷","divideontimes":"⋇","divonx":"⋇","DJcy":"Ђ","djcy":"ђ","dlcorn":"⌞","dlcrop":"⌍","dollar":"$","Dopf":"𝔻","dopf":"𝕕","Dot":"¨","dot":"˙","DotDot":"⃜","doteq":"≐","doteqdot":"≑","DotEqual":"≐","dotminus":"∸","dotplus":"∔","dotsquare":"⊡","doublebarwedge":"⌆","DoubleContourIntegral":"∯","DoubleDot":"¨","DoubleDownArrow":"⇓","DoubleLeftArrow":"⇐","DoubleLeftRightArrow":"⇔","DoubleLeftTee":"⫤","DoubleLongLeftArrow":"⟸","DoubleLongLeftRightArrow":"⟺","DoubleLongRightArrow":"⟹","DoubleRightArrow":"⇒","DoubleRightTee":"⊨","DoubleUpArrow":"⇑","DoubleUpDownArrow":"⇕","DoubleVerticalBar":"∥","DownArrowBar":"⤓","downarrow":"↓","DownArrow":"↓","Downarrow":"⇓","DownArrowUpArrow":"⇵","DownBreve":"̑","downdownarrows":"⇊","downharpoonleft":"⇃","downharpoonright":"⇂","DownLeftRightVector":"⥐","DownLeftTeeVector":"⥞","DownLeftVectorBar":"⥖","DownLeftVector":"↽","DownRightTeeVector":"⥟","DownRightVectorBar":"⥗","DownRightVector":"⇁","DownTeeArrow":"↧","DownTee":"⊤","drbkarow":"⤐","drcorn":"⌟","drcrop":"⌌","Dscr":"𝒟","dscr":"𝒹","DScy":"Ѕ","dscy":"ѕ","dsol":"⧶","Dstrok":"Đ","dstrok":"đ","dtdot":"⋱","dtri":"▿","dtrif":"▾","duarr":"⇵","duhar":"⥯","dwangle":"⦦","DZcy":"Џ","dzcy":"џ","dzigrarr":"⟿","Eacute":"É","eacute":"é","easter":"⩮","Ecaron":"Ě","ecaron":"ě","Ecirc":"Ê","ecirc":"ê","ecir":"≖","ecolon":"≕","Ecy":"Э","ecy":"э","eDDot":"⩷","Edot":"Ė","edot":"ė","eDot":"≑","ee":"ⅇ","efDot":"≒","Efr":"𝔈","efr":"𝔢","eg":"⪚","Egrave":"È","egrave":"è","egs":"⪖","egsdot":"⪘","el":"⪙","Element":"∈","elinters":"⏧","ell":"ℓ","els":"⪕","elsdot":"⪗","Emacr":"Ē","emacr":"ē","empty":"∅","emptyset":"∅","EmptySmallSquare":"◻","emptyv":"∅","EmptyVerySmallSquare":"▫","emsp13":" ","emsp14":" ","emsp":" ","ENG":"Ŋ","eng":"ŋ","ensp":" ","Eogon":"Ę","eogon":"ę","Eopf":"𝔼","eopf":"𝕖","epar":"⋕","eparsl":"⧣","eplus":"⩱","epsi":"ε","Epsilon":"Ε","epsilon":"ε","epsiv":"ϵ","eqcirc":"≖","eqcolon":"≕","eqsim":"≂","eqslantgtr":"⪖","eqslantless":"⪕","Equal":"⩵","equals":"=","EqualTilde":"≂","equest":"≟","Equilibrium":"⇌","equiv":"≡","equivDD":"⩸","eqvparsl":"⧥","erarr":"⥱","erDot":"≓","escr":"ℯ","Escr":"ℰ","esdot":"≐","Esim":"⩳","esim":"≂","Eta":"Η","eta":"η","ETH":"Ð","eth":"ð","Euml":"Ë","euml":"ë","euro":"€","excl":"!","exist":"∃","Exists":"∃","expectation":"ℰ","exponentiale":"ⅇ","ExponentialE":"ⅇ","fallingdotseq":"≒","Fcy":"Ф","fcy":"ф","female":"♀","ffilig":"ffi","fflig":"ff","ffllig":"ffl","Ffr":"𝔉","ffr":"𝔣","filig":"fi","FilledSmallSquare":"◼","FilledVerySmallSquare":"▪","fjlig":"fj","flat":"♭","fllig":"fl","fltns":"▱","fnof":"ƒ","Fopf":"𝔽","fopf":"𝕗","forall":"∀","ForAll":"∀","fork":"⋔","forkv":"⫙","Fouriertrf":"ℱ","fpartint":"⨍","frac12":"½","frac13":"⅓","frac14":"¼","frac15":"⅕","frac16":"⅙","frac18":"⅛","frac23":"⅔","frac25":"⅖","frac34":"¾","frac35":"⅗","frac38":"⅜","frac45":"⅘","frac56":"⅚","frac58":"⅝","frac78":"⅞","frasl":"⁄","frown":"⌢","fscr":"𝒻","Fscr":"ℱ","gacute":"ǵ","Gamma":"Γ","gamma":"γ","Gammad":"Ϝ","gammad":"ϝ","gap":"⪆","Gbreve":"Ğ","gbreve":"ğ","Gcedil":"Ģ","Gcirc":"Ĝ","gcirc":"ĝ","Gcy":"Г","gcy":"г","Gdot":"Ġ","gdot":"ġ","ge":"≥","gE":"≧","gEl":"⪌","gel":"⋛","geq":"≥","geqq":"≧","geqslant":"⩾","gescc":"⪩","ges":"⩾","gesdot":"⪀","gesdoto":"⪂","gesdotol":"⪄","gesl":"⋛︀","gesles":"⪔","Gfr":"𝔊","gfr":"𝔤","gg":"≫","Gg":"⋙","ggg":"⋙","gimel":"ℷ","GJcy":"Ѓ","gjcy":"ѓ","gla":"⪥","gl":"≷","glE":"⪒","glj":"⪤","gnap":"⪊","gnapprox":"⪊","gne":"⪈","gnE":"≩","gneq":"⪈","gneqq":"≩","gnsim":"⋧","Gopf":"𝔾","gopf":"𝕘","grave":"`","GreaterEqual":"≥","GreaterEqualLess":"⋛","GreaterFullEqual":"≧","GreaterGreater":"⪢","GreaterLess":"≷","GreaterSlantEqual":"⩾","GreaterTilde":"≳","Gscr":"𝒢","gscr":"ℊ","gsim":"≳","gsime":"⪎","gsiml":"⪐","gtcc":"⪧","gtcir":"⩺","gt":">","GT":">","Gt":"≫","gtdot":"⋗","gtlPar":"⦕","gtquest":"⩼","gtrapprox":"⪆","gtrarr":"⥸","gtrdot":"⋗","gtreqless":"⋛","gtreqqless":"⪌","gtrless":"≷","gtrsim":"≳","gvertneqq":"≩︀","gvnE":"≩︀","Hacek":"ˇ","hairsp":" ","half":"½","hamilt":"ℋ","HARDcy":"Ъ","hardcy":"ъ","harrcir":"⥈","harr":"↔","hArr":"⇔","harrw":"↭","Hat":"^","hbar":"ℏ","Hcirc":"Ĥ","hcirc":"ĥ","hearts":"♥","heartsuit":"♥","hellip":"…","hercon":"⊹","hfr":"𝔥","Hfr":"ℌ","HilbertSpace":"ℋ","hksearow":"⤥","hkswarow":"⤦","hoarr":"⇿","homtht":"∻","hookleftarrow":"↩","hookrightarrow":"↪","hopf":"𝕙","Hopf":"ℍ","horbar":"―","HorizontalLine":"─","hscr":"𝒽","Hscr":"ℋ","hslash":"ℏ","Hstrok":"Ħ","hstrok":"ħ","HumpDownHump":"≎","HumpEqual":"≏","hybull":"⁃","hyphen":"‐","Iacute":"Í","iacute":"í","ic":"⁣","Icirc":"Î","icirc":"î","Icy":"И","icy":"и","Idot":"İ","IEcy":"Е","iecy":"е","iexcl":"¡","iff":"⇔","ifr":"𝔦","Ifr":"ℑ","Igrave":"Ì","igrave":"ì","ii":"ⅈ","iiiint":"⨌","iiint":"∭","iinfin":"⧜","iiota":"℩","IJlig":"IJ","ijlig":"ij","Imacr":"Ī","imacr":"ī","image":"ℑ","ImaginaryI":"ⅈ","imagline":"ℐ","imagpart":"ℑ","imath":"ı","Im":"ℑ","imof":"⊷","imped":"Ƶ","Implies":"⇒","incare":"℅","in":"∈","infin":"∞","infintie":"⧝","inodot":"ı","intcal":"⊺","int":"∫","Int":"∬","integers":"ℤ","Integral":"∫","intercal":"⊺","Intersection":"⋂","intlarhk":"⨗","intprod":"⨼","InvisibleComma":"⁣","InvisibleTimes":"⁢","IOcy":"Ё","iocy":"ё","Iogon":"Į","iogon":"į","Iopf":"𝕀","iopf":"𝕚","Iota":"Ι","iota":"ι","iprod":"⨼","iquest":"¿","iscr":"𝒾","Iscr":"ℐ","isin":"∈","isindot":"⋵","isinE":"⋹","isins":"⋴","isinsv":"⋳","isinv":"∈","it":"⁢","Itilde":"Ĩ","itilde":"ĩ","Iukcy":"І","iukcy":"і","Iuml":"Ï","iuml":"ï","Jcirc":"Ĵ","jcirc":"ĵ","Jcy":"Й","jcy":"й","Jfr":"𝔍","jfr":"𝔧","jmath":"ȷ","Jopf":"𝕁","jopf":"𝕛","Jscr":"𝒥","jscr":"𝒿","Jsercy":"Ј","jsercy":"ј","Jukcy":"Є","jukcy":"є","Kappa":"Κ","kappa":"κ","kappav":"ϰ","Kcedil":"Ķ","kcedil":"ķ","Kcy":"К","kcy":"к","Kfr":"𝔎","kfr":"𝔨","kgreen":"ĸ","KHcy":"Х","khcy":"х","KJcy":"Ќ","kjcy":"ќ","Kopf":"𝕂","kopf":"𝕜","Kscr":"𝒦","kscr":"𝓀","lAarr":"⇚","Lacute":"Ĺ","lacute":"ĺ","laemptyv":"⦴","lagran":"ℒ","Lambda":"Λ","lambda":"λ","lang":"⟨","Lang":"⟪","langd":"⦑","langle":"⟨","lap":"⪅","Laplacetrf":"ℒ","laquo":"«","larrb":"⇤","larrbfs":"⤟","larr":"←","Larr":"↞","lArr":"⇐","larrfs":"⤝","larrhk":"↩","larrlp":"↫","larrpl":"⤹","larrsim":"⥳","larrtl":"↢","latail":"⤙","lAtail":"⤛","lat":"⪫","late":"⪭","lates":"⪭︀","lbarr":"⤌","lBarr":"⤎","lbbrk":"❲","lbrace":"{","lbrack":"[","lbrke":"⦋","lbrksld":"⦏","lbrkslu":"⦍","Lcaron":"Ľ","lcaron":"ľ","Lcedil":"Ļ","lcedil":"ļ","lceil":"⌈","lcub":"{","Lcy":"Л","lcy":"л","ldca":"⤶","ldquo":"“","ldquor":"„","ldrdhar":"⥧","ldrushar":"⥋","ldsh":"↲","le":"≤","lE":"≦","LeftAngleBracket":"⟨","LeftArrowBar":"⇤","leftarrow":"←","LeftArrow":"←","Leftarrow":"⇐","LeftArrowRightArrow":"⇆","leftarrowtail":"↢","LeftCeiling":"⌈","LeftDoubleBracket":"⟦","LeftDownTeeVector":"⥡","LeftDownVectorBar":"⥙","LeftDownVector":"⇃","LeftFloor":"⌊","leftharpoondown":"↽","leftharpoonup":"↼","leftleftarrows":"⇇","leftrightarrow":"↔","LeftRightArrow":"↔","Leftrightarrow":"⇔","leftrightarrows":"⇆","leftrightharpoons":"⇋","leftrightsquigarrow":"↭","LeftRightVector":"⥎","LeftTeeArrow":"↤","LeftTee":"⊣","LeftTeeVector":"⥚","leftthreetimes":"⋋","LeftTriangleBar":"⧏","LeftTriangle":"⊲","LeftTriangleEqual":"⊴","LeftUpDownVector":"⥑","LeftUpTeeVector":"⥠","LeftUpVectorBar":"⥘","LeftUpVector":"↿","LeftVectorBar":"⥒","LeftVector":"↼","lEg":"⪋","leg":"⋚","leq":"≤","leqq":"≦","leqslant":"⩽","lescc":"⪨","les":"⩽","lesdot":"⩿","lesdoto":"⪁","lesdotor":"⪃","lesg":"⋚︀","lesges":"⪓","lessapprox":"⪅","lessdot":"⋖","lesseqgtr":"⋚","lesseqqgtr":"⪋","LessEqualGreater":"⋚","LessFullEqual":"≦","LessGreater":"≶","lessgtr":"≶","LessLess":"⪡","lesssim":"≲","LessSlantEqual":"⩽","LessTilde":"≲","lfisht":"⥼","lfloor":"⌊","Lfr":"𝔏","lfr":"𝔩","lg":"≶","lgE":"⪑","lHar":"⥢","lhard":"↽","lharu":"↼","lharul":"⥪","lhblk":"▄","LJcy":"Љ","ljcy":"љ","llarr":"⇇","ll":"≪","Ll":"⋘","llcorner":"⌞","Lleftarrow":"⇚","llhard":"⥫","lltri":"◺","Lmidot":"Ŀ","lmidot":"ŀ","lmoustache":"⎰","lmoust":"⎰","lnap":"⪉","lnapprox":"⪉","lne":"⪇","lnE":"≨","lneq":"⪇","lneqq":"≨","lnsim":"⋦","loang":"⟬","loarr":"⇽","lobrk":"⟦","longleftarrow":"⟵","LongLeftArrow":"⟵","Longleftarrow":"⟸","longleftrightarrow":"⟷","LongLeftRightArrow":"⟷","Longleftrightarrow":"⟺","longmapsto":"⟼","longrightarrow":"⟶","LongRightArrow":"⟶","Longrightarrow":"⟹","looparrowleft":"↫","looparrowright":"↬","lopar":"⦅","Lopf":"𝕃","lopf":"𝕝","loplus":"⨭","lotimes":"⨴","lowast":"∗","lowbar":"_","LowerLeftArrow":"↙","LowerRightArrow":"↘","loz":"◊","lozenge":"◊","lozf":"⧫","lpar":"(","lparlt":"⦓","lrarr":"⇆","lrcorner":"⌟","lrhar":"⇋","lrhard":"⥭","lrm":"‎","lrtri":"⊿","lsaquo":"‹","lscr":"𝓁","Lscr":"ℒ","lsh":"↰","Lsh":"↰","lsim":"≲","lsime":"⪍","lsimg":"⪏","lsqb":"[","lsquo":"‘","lsquor":"‚","Lstrok":"Ł","lstrok":"ł","ltcc":"⪦","ltcir":"⩹","lt":"<","LT":"<","Lt":"≪","ltdot":"⋖","lthree":"⋋","ltimes":"⋉","ltlarr":"⥶","ltquest":"⩻","ltri":"◃","ltrie":"⊴","ltrif":"◂","ltrPar":"⦖","lurdshar":"⥊","luruhar":"⥦","lvertneqq":"≨︀","lvnE":"≨︀","macr":"¯","male":"♂","malt":"✠","maltese":"✠","Map":"⤅","map":"↦","mapsto":"↦","mapstodown":"↧","mapstoleft":"↤","mapstoup":"↥","marker":"▮","mcomma":"⨩","Mcy":"М","mcy":"м","mdash":"—","mDDot":"∺","measuredangle":"∡","MediumSpace":" ","Mellintrf":"ℳ","Mfr":"𝔐","mfr":"𝔪","mho":"℧","micro":"µ","midast":"*","midcir":"⫰","mid":"∣","middot":"·","minusb":"⊟","minus":"−","minusd":"∸","minusdu":"⨪","MinusPlus":"∓","mlcp":"⫛","mldr":"…","mnplus":"∓","models":"⊧","Mopf":"𝕄","mopf":"𝕞","mp":"∓","mscr":"𝓂","Mscr":"ℳ","mstpos":"∾","Mu":"Μ","mu":"μ","multimap":"⊸","mumap":"⊸","nabla":"∇","Nacute":"Ń","nacute":"ń","nang":"∠⃒","nap":"≉","napE":"⩰̸","napid":"≋̸","napos":"ʼn","napprox":"≉","natural":"♮","naturals":"ℕ","natur":"♮","nbsp":" ","nbump":"≎̸","nbumpe":"≏̸","ncap":"⩃","Ncaron":"Ň","ncaron":"ň","Ncedil":"Ņ","ncedil":"ņ","ncong":"≇","ncongdot":"⩭̸","ncup":"⩂","Ncy":"Н","ncy":"н","ndash":"–","nearhk":"⤤","nearr":"↗","neArr":"⇗","nearrow":"↗","ne":"≠","nedot":"≐̸","NegativeMediumSpace":"​","NegativeThickSpace":"​","NegativeThinSpace":"​","NegativeVeryThinSpace":"​","nequiv":"≢","nesear":"⤨","nesim":"≂̸","NestedGreaterGreater":"≫","NestedLessLess":"≪","NewLine":"\n","nexist":"∄","nexists":"∄","Nfr":"𝔑","nfr":"𝔫","ngE":"≧̸","nge":"≱","ngeq":"≱","ngeqq":"≧̸","ngeqslant":"⩾̸","nges":"⩾̸","nGg":"⋙̸","ngsim":"≵","nGt":"≫⃒","ngt":"≯","ngtr":"≯","nGtv":"≫̸","nharr":"↮","nhArr":"⇎","nhpar":"⫲","ni":"∋","nis":"⋼","nisd":"⋺","niv":"∋","NJcy":"Њ","njcy":"њ","nlarr":"↚","nlArr":"⇍","nldr":"‥","nlE":"≦̸","nle":"≰","nleftarrow":"↚","nLeftarrow":"⇍","nleftrightarrow":"↮","nLeftrightarrow":"⇎","nleq":"≰","nleqq":"≦̸","nleqslant":"⩽̸","nles":"⩽̸","nless":"≮","nLl":"⋘̸","nlsim":"≴","nLt":"≪⃒","nlt":"≮","nltri":"⋪","nltrie":"⋬","nLtv":"≪̸","nmid":"∤","NoBreak":"⁠","NonBreakingSpace":" ","nopf":"𝕟","Nopf":"ℕ","Not":"⫬","not":"¬","NotCongruent":"≢","NotCupCap":"≭","NotDoubleVerticalBar":"∦","NotElement":"∉","NotEqual":"≠","NotEqualTilde":"≂̸","NotExists":"∄","NotGreater":"≯","NotGreaterEqual":"≱","NotGreaterFullEqual":"≧̸","NotGreaterGreater":"≫̸","NotGreaterLess":"≹","NotGreaterSlantEqual":"⩾̸","NotGreaterTilde":"≵","NotHumpDownHump":"≎̸","NotHumpEqual":"≏̸","notin":"∉","notindot":"⋵̸","notinE":"⋹̸","notinva":"∉","notinvb":"⋷","notinvc":"⋶","NotLeftTriangleBar":"⧏̸","NotLeftTriangle":"⋪","NotLeftTriangleEqual":"⋬","NotLess":"≮","NotLessEqual":"≰","NotLessGreater":"≸","NotLessLess":"≪̸","NotLessSlantEqual":"⩽̸","NotLessTilde":"≴","NotNestedGreaterGreater":"⪢̸","NotNestedLessLess":"⪡̸","notni":"∌","notniva":"∌","notnivb":"⋾","notnivc":"⋽","NotPrecedes":"⊀","NotPrecedesEqual":"⪯̸","NotPrecedesSlantEqual":"⋠","NotReverseElement":"∌","NotRightTriangleBar":"⧐̸","NotRightTriangle":"⋫","NotRightTriangleEqual":"⋭","NotSquareSubset":"⊏̸","NotSquareSubsetEqual":"⋢","NotSquareSuperset":"⊐̸","NotSquareSupersetEqual":"⋣","NotSubset":"⊂⃒","NotSubsetEqual":"⊈","NotSucceeds":"⊁","NotSucceedsEqual":"⪰̸","NotSucceedsSlantEqual":"⋡","NotSucceedsTilde":"≿̸","NotSuperset":"⊃⃒","NotSupersetEqual":"⊉","NotTilde":"≁","NotTildeEqual":"≄","NotTildeFullEqual":"≇","NotTildeTilde":"≉","NotVerticalBar":"∤","nparallel":"∦","npar":"∦","nparsl":"⫽⃥","npart":"∂̸","npolint":"⨔","npr":"⊀","nprcue":"⋠","nprec":"⊀","npreceq":"⪯̸","npre":"⪯̸","nrarrc":"⤳̸","nrarr":"↛","nrArr":"⇏","nrarrw":"↝̸","nrightarrow":"↛","nRightarrow":"⇏","nrtri":"⋫","nrtrie":"⋭","nsc":"⊁","nsccue":"⋡","nsce":"⪰̸","Nscr":"𝒩","nscr":"𝓃","nshortmid":"∤","nshortparallel":"∦","nsim":"≁","nsime":"≄","nsimeq":"≄","nsmid":"∤","nspar":"∦","nsqsube":"⋢","nsqsupe":"⋣","nsub":"⊄","nsubE":"⫅̸","nsube":"⊈","nsubset":"⊂⃒","nsubseteq":"⊈","nsubseteqq":"⫅̸","nsucc":"⊁","nsucceq":"⪰̸","nsup":"⊅","nsupE":"⫆̸","nsupe":"⊉","nsupset":"⊃⃒","nsupseteq":"⊉","nsupseteqq":"⫆̸","ntgl":"≹","Ntilde":"Ñ","ntilde":"ñ","ntlg":"≸","ntriangleleft":"⋪","ntrianglelefteq":"⋬","ntriangleright":"⋫","ntrianglerighteq":"⋭","Nu":"Ν","nu":"ν","num":"#","numero":"№","numsp":" ","nvap":"≍⃒","nvdash":"⊬","nvDash":"⊭","nVdash":"⊮","nVDash":"⊯","nvge":"≥⃒","nvgt":">⃒","nvHarr":"⤄","nvinfin":"⧞","nvlArr":"⤂","nvle":"≤⃒","nvlt":"<⃒","nvltrie":"⊴⃒","nvrArr":"⤃","nvrtrie":"⊵⃒","nvsim":"∼⃒","nwarhk":"⤣","nwarr":"↖","nwArr":"⇖","nwarrow":"↖","nwnear":"⤧","Oacute":"Ó","oacute":"ó","oast":"⊛","Ocirc":"Ô","ocirc":"ô","ocir":"⊚","Ocy":"О","ocy":"о","odash":"⊝","Odblac":"Ő","odblac":"ő","odiv":"⨸","odot":"⊙","odsold":"⦼","OElig":"Œ","oelig":"œ","ofcir":"⦿","Ofr":"𝔒","ofr":"𝔬","ogon":"˛","Ograve":"Ò","ograve":"ò","ogt":"⧁","ohbar":"⦵","ohm":"Ω","oint":"∮","olarr":"↺","olcir":"⦾","olcross":"⦻","oline":"‾","olt":"⧀","Omacr":"Ō","omacr":"ō","Omega":"Ω","omega":"ω","Omicron":"Ο","omicron":"ο","omid":"⦶","ominus":"⊖","Oopf":"𝕆","oopf":"𝕠","opar":"⦷","OpenCurlyDoubleQuote":"“","OpenCurlyQuote":"‘","operp":"⦹","oplus":"⊕","orarr":"↻","Or":"⩔","or":"∨","ord":"⩝","order":"ℴ","orderof":"ℴ","ordf":"ª","ordm":"º","origof":"⊶","oror":"⩖","orslope":"⩗","orv":"⩛","oS":"Ⓢ","Oscr":"𝒪","oscr":"ℴ","Oslash":"Ø","oslash":"ø","osol":"⊘","Otilde":"Õ","otilde":"õ","otimesas":"⨶","Otimes":"⨷","otimes":"⊗","Ouml":"Ö","ouml":"ö","ovbar":"⌽","OverBar":"‾","OverBrace":"⏞","OverBracket":"⎴","OverParenthesis":"⏜","para":"¶","parallel":"∥","par":"∥","parsim":"⫳","parsl":"⫽","part":"∂","PartialD":"∂","Pcy":"П","pcy":"п","percnt":"%","period":".","permil":"‰","perp":"⊥","pertenk":"‱","Pfr":"𝔓","pfr":"𝔭","Phi":"Φ","phi":"φ","phiv":"ϕ","phmmat":"ℳ","phone":"☎","Pi":"Π","pi":"π","pitchfork":"⋔","piv":"ϖ","planck":"ℏ","planckh":"ℎ","plankv":"ℏ","plusacir":"⨣","plusb":"⊞","pluscir":"⨢","plus":"+","plusdo":"∔","plusdu":"⨥","pluse":"⩲","PlusMinus":"±","plusmn":"±","plussim":"⨦","plustwo":"⨧","pm":"±","Poincareplane":"ℌ","pointint":"⨕","popf":"𝕡","Popf":"ℙ","pound":"£","prap":"⪷","Pr":"⪻","pr":"≺","prcue":"≼","precapprox":"⪷","prec":"≺","preccurlyeq":"≼","Precedes":"≺","PrecedesEqual":"⪯","PrecedesSlantEqual":"≼","PrecedesTilde":"≾","preceq":"⪯","precnapprox":"⪹","precneqq":"⪵","precnsim":"⋨","pre":"⪯","prE":"⪳","precsim":"≾","prime":"′","Prime":"″","primes":"ℙ","prnap":"⪹","prnE":"⪵","prnsim":"⋨","prod":"∏","Product":"∏","profalar":"⌮","profline":"⌒","profsurf":"⌓","prop":"∝","Proportional":"∝","Proportion":"∷","propto":"∝","prsim":"≾","prurel":"⊰","Pscr":"𝒫","pscr":"𝓅","Psi":"Ψ","psi":"ψ","puncsp":" ","Qfr":"𝔔","qfr":"𝔮","qint":"⨌","qopf":"𝕢","Qopf":"ℚ","qprime":"⁗","Qscr":"𝒬","qscr":"𝓆","quaternions":"ℍ","quatint":"⨖","quest":"?","questeq":"≟","quot":"\"","QUOT":"\"","rAarr":"⇛","race":"∽̱","Racute":"Ŕ","racute":"ŕ","radic":"√","raemptyv":"⦳","rang":"⟩","Rang":"⟫","rangd":"⦒","range":"⦥","rangle":"⟩","raquo":"»","rarrap":"⥵","rarrb":"⇥","rarrbfs":"⤠","rarrc":"⤳","rarr":"→","Rarr":"↠","rArr":"⇒","rarrfs":"⤞","rarrhk":"↪","rarrlp":"↬","rarrpl":"⥅","rarrsim":"⥴","Rarrtl":"⤖","rarrtl":"↣","rarrw":"↝","ratail":"⤚","rAtail":"⤜","ratio":"∶","rationals":"ℚ","rbarr":"⤍","rBarr":"⤏","RBarr":"⤐","rbbrk":"❳","rbrace":"}","rbrack":"]","rbrke":"⦌","rbrksld":"⦎","rbrkslu":"⦐","Rcaron":"Ř","rcaron":"ř","Rcedil":"Ŗ","rcedil":"ŗ","rceil":"⌉","rcub":"}","Rcy":"Р","rcy":"р","rdca":"⤷","rdldhar":"⥩","rdquo":"”","rdquor":"”","rdsh":"↳","real":"ℜ","realine":"ℛ","realpart":"ℜ","reals":"ℝ","Re":"ℜ","rect":"▭","reg":"®","REG":"®","ReverseElement":"∋","ReverseEquilibrium":"⇋","ReverseUpEquilibrium":"⥯","rfisht":"⥽","rfloor":"⌋","rfr":"𝔯","Rfr":"ℜ","rHar":"⥤","rhard":"⇁","rharu":"⇀","rharul":"⥬","Rho":"Ρ","rho":"ρ","rhov":"ϱ","RightAngleBracket":"⟩","RightArrowBar":"⇥","rightarrow":"→","RightArrow":"→","Rightarrow":"⇒","RightArrowLeftArrow":"⇄","rightarrowtail":"↣","RightCeiling":"⌉","RightDoubleBracket":"⟧","RightDownTeeVector":"⥝","RightDownVectorBar":"⥕","RightDownVector":"⇂","RightFloor":"⌋","rightharpoondown":"⇁","rightharpoonup":"⇀","rightleftarrows":"⇄","rightleftharpoons":"⇌","rightrightarrows":"⇉","rightsquigarrow":"↝","RightTeeArrow":"↦","RightTee":"⊢","RightTeeVector":"⥛","rightthreetimes":"⋌","RightTriangleBar":"⧐","RightTriangle":"⊳","RightTriangleEqual":"⊵","RightUpDownVector":"⥏","RightUpTeeVector":"⥜","RightUpVectorBar":"⥔","RightUpVector":"↾","RightVectorBar":"⥓","RightVector":"⇀","ring":"˚","risingdotseq":"≓","rlarr":"⇄","rlhar":"⇌","rlm":"‏","rmoustache":"⎱","rmoust":"⎱","rnmid":"⫮","roang":"⟭","roarr":"⇾","robrk":"⟧","ropar":"⦆","ropf":"𝕣","Ropf":"ℝ","roplus":"⨮","rotimes":"⨵","RoundImplies":"⥰","rpar":")","rpargt":"⦔","rppolint":"⨒","rrarr":"⇉","Rrightarrow":"⇛","rsaquo":"›","rscr":"𝓇","Rscr":"ℛ","rsh":"↱","Rsh":"↱","rsqb":"]","rsquo":"’","rsquor":"’","rthree":"⋌","rtimes":"⋊","rtri":"▹","rtrie":"⊵","rtrif":"▸","rtriltri":"⧎","RuleDelayed":"⧴","ruluhar":"⥨","rx":"℞","Sacute":"Ś","sacute":"ś","sbquo":"‚","scap":"⪸","Scaron":"Š","scaron":"š","Sc":"⪼","sc":"≻","sccue":"≽","sce":"⪰","scE":"⪴","Scedil":"Ş","scedil":"ş","Scirc":"Ŝ","scirc":"ŝ","scnap":"⪺","scnE":"⪶","scnsim":"⋩","scpolint":"⨓","scsim":"≿","Scy":"С","scy":"с","sdotb":"⊡","sdot":"⋅","sdote":"⩦","searhk":"⤥","searr":"↘","seArr":"⇘","searrow":"↘","sect":"§","semi":";","seswar":"⤩","setminus":"∖","setmn":"∖","sext":"✶","Sfr":"𝔖","sfr":"𝔰","sfrown":"⌢","sharp":"♯","SHCHcy":"Щ","shchcy":"щ","SHcy":"Ш","shcy":"ш","ShortDownArrow":"↓","ShortLeftArrow":"←","shortmid":"∣","shortparallel":"∥","ShortRightArrow":"→","ShortUpArrow":"↑","shy":"­","Sigma":"Σ","sigma":"σ","sigmaf":"ς","sigmav":"ς","sim":"∼","simdot":"⩪","sime":"≃","simeq":"≃","simg":"⪞","simgE":"⪠","siml":"⪝","simlE":"⪟","simne":"≆","simplus":"⨤","simrarr":"⥲","slarr":"←","SmallCircle":"∘","smallsetminus":"∖","smashp":"⨳","smeparsl":"⧤","smid":"∣","smile":"⌣","smt":"⪪","smte":"⪬","smtes":"⪬︀","SOFTcy":"Ь","softcy":"ь","solbar":"⌿","solb":"⧄","sol":"/","Sopf":"𝕊","sopf":"𝕤","spades":"♠","spadesuit":"♠","spar":"∥","sqcap":"⊓","sqcaps":"⊓︀","sqcup":"⊔","sqcups":"⊔︀","Sqrt":"√","sqsub":"⊏","sqsube":"⊑","sqsubset":"⊏","sqsubseteq":"⊑","sqsup":"⊐","sqsupe":"⊒","sqsupset":"⊐","sqsupseteq":"⊒","square":"□","Square":"□","SquareIntersection":"⊓","SquareSubset":"⊏","SquareSubsetEqual":"⊑","SquareSuperset":"⊐","SquareSupersetEqual":"⊒","SquareUnion":"⊔","squarf":"▪","squ":"□","squf":"▪","srarr":"→","Sscr":"𝒮","sscr":"𝓈","ssetmn":"∖","ssmile":"⌣","sstarf":"⋆","Star":"⋆","star":"☆","starf":"★","straightepsilon":"ϵ","straightphi":"ϕ","strns":"¯","sub":"⊂","Sub":"⋐","subdot":"⪽","subE":"⫅","sube":"⊆","subedot":"⫃","submult":"⫁","subnE":"⫋","subne":"⊊","subplus":"⪿","subrarr":"⥹","subset":"⊂","Subset":"⋐","subseteq":"⊆","subseteqq":"⫅","SubsetEqual":"⊆","subsetneq":"⊊","subsetneqq":"⫋","subsim":"⫇","subsub":"⫕","subsup":"⫓","succapprox":"⪸","succ":"≻","succcurlyeq":"≽","Succeeds":"≻","SucceedsEqual":"⪰","SucceedsSlantEqual":"≽","SucceedsTilde":"≿","succeq":"⪰","succnapprox":"⪺","succneqq":"⪶","succnsim":"⋩","succsim":"≿","SuchThat":"∋","sum":"∑","Sum":"∑","sung":"♪","sup1":"¹","sup2":"²","sup3":"³","sup":"⊃","Sup":"⋑","supdot":"⪾","supdsub":"⫘","supE":"⫆","supe":"⊇","supedot":"⫄","Superset":"⊃","SupersetEqual":"⊇","suphsol":"⟉","suphsub":"⫗","suplarr":"⥻","supmult":"⫂","supnE":"⫌","supne":"⊋","supplus":"⫀","supset":"⊃","Supset":"⋑","supseteq":"⊇","supseteqq":"⫆","supsetneq":"⊋","supsetneqq":"⫌","supsim":"⫈","supsub":"⫔","supsup":"⫖","swarhk":"⤦","swarr":"↙","swArr":"⇙","swarrow":"↙","swnwar":"⤪","szlig":"ß","Tab":"\t","target":"⌖","Tau":"Τ","tau":"τ","tbrk":"⎴","Tcaron":"Ť","tcaron":"ť","Tcedil":"Ţ","tcedil":"ţ","Tcy":"Т","tcy":"т","tdot":"⃛","telrec":"⌕","Tfr":"𝔗","tfr":"𝔱","there4":"∴","therefore":"∴","Therefore":"∴","Theta":"Θ","theta":"θ","thetasym":"ϑ","thetav":"ϑ","thickapprox":"≈","thicksim":"∼","ThickSpace":"  ","ThinSpace":" ","thinsp":" ","thkap":"≈","thksim":"∼","THORN":"Þ","thorn":"þ","tilde":"˜","Tilde":"∼","TildeEqual":"≃","TildeFullEqual":"≅","TildeTilde":"≈","timesbar":"⨱","timesb":"⊠","times":"×","timesd":"⨰","tint":"∭","toea":"⤨","topbot":"⌶","topcir":"⫱","top":"⊤","Topf":"𝕋","topf":"𝕥","topfork":"⫚","tosa":"⤩","tprime":"‴","trade":"™","TRADE":"™","triangle":"▵","triangledown":"▿","triangleleft":"◃","trianglelefteq":"⊴","triangleq":"≜","triangleright":"▹","trianglerighteq":"⊵","tridot":"◬","trie":"≜","triminus":"⨺","TripleDot":"⃛","triplus":"⨹","trisb":"⧍","tritime":"⨻","trpezium":"⏢","Tscr":"𝒯","tscr":"𝓉","TScy":"Ц","tscy":"ц","TSHcy":"Ћ","tshcy":"ћ","Tstrok":"Ŧ","tstrok":"ŧ","twixt":"≬","twoheadleftarrow":"↞","twoheadrightarrow":"↠","Uacute":"Ú","uacute":"ú","uarr":"↑","Uarr":"↟","uArr":"⇑","Uarrocir":"⥉","Ubrcy":"Ў","ubrcy":"ў","Ubreve":"Ŭ","ubreve":"ŭ","Ucirc":"Û","ucirc":"û","Ucy":"У","ucy":"у","udarr":"⇅","Udblac":"Ű","udblac":"ű","udhar":"⥮","ufisht":"⥾","Ufr":"𝔘","ufr":"𝔲","Ugrave":"Ù","ugrave":"ù","uHar":"⥣","uharl":"↿","uharr":"↾","uhblk":"▀","ulcorn":"⌜","ulcorner":"⌜","ulcrop":"⌏","ultri":"◸","Umacr":"Ū","umacr":"ū","uml":"¨","UnderBar":"_","UnderBrace":"⏟","UnderBracket":"⎵","UnderParenthesis":"⏝","Union":"⋃","UnionPlus":"⊎","Uogon":"Ų","uogon":"ų","Uopf":"𝕌","uopf":"𝕦","UpArrowBar":"⤒","uparrow":"↑","UpArrow":"↑","Uparrow":"⇑","UpArrowDownArrow":"⇅","updownarrow":"↕","UpDownArrow":"↕","Updownarrow":"⇕","UpEquilibrium":"⥮","upharpoonleft":"↿","upharpoonright":"↾","uplus":"⊎","UpperLeftArrow":"↖","UpperRightArrow":"↗","upsi":"υ","Upsi":"ϒ","upsih":"ϒ","Upsilon":"Υ","upsilon":"υ","UpTeeArrow":"↥","UpTee":"⊥","upuparrows":"⇈","urcorn":"⌝","urcorner":"⌝","urcrop":"⌎","Uring":"Ů","uring":"ů","urtri":"◹","Uscr":"𝒰","uscr":"𝓊","utdot":"⋰","Utilde":"Ũ","utilde":"ũ","utri":"▵","utrif":"▴","uuarr":"⇈","Uuml":"Ü","uuml":"ü","uwangle":"⦧","vangrt":"⦜","varepsilon":"ϵ","varkappa":"ϰ","varnothing":"∅","varphi":"ϕ","varpi":"ϖ","varpropto":"∝","varr":"↕","vArr":"⇕","varrho":"ϱ","varsigma":"ς","varsubsetneq":"⊊︀","varsubsetneqq":"⫋︀","varsupsetneq":"⊋︀","varsupsetneqq":"⫌︀","vartheta":"ϑ","vartriangleleft":"⊲","vartriangleright":"⊳","vBar":"⫨","Vbar":"⫫","vBarv":"⫩","Vcy":"В","vcy":"в","vdash":"⊢","vDash":"⊨","Vdash":"⊩","VDash":"⊫","Vdashl":"⫦","veebar":"⊻","vee":"∨","Vee":"⋁","veeeq":"≚","vellip":"⋮","verbar":"|","Verbar":"‖","vert":"|","Vert":"‖","VerticalBar":"∣","VerticalLine":"|","VerticalSeparator":"❘","VerticalTilde":"≀","VeryThinSpace":" ","Vfr":"𝔙","vfr":"𝔳","vltri":"⊲","vnsub":"⊂⃒","vnsup":"⊃⃒","Vopf":"𝕍","vopf":"𝕧","vprop":"∝","vrtri":"⊳","Vscr":"𝒱","vscr":"𝓋","vsubnE":"⫋︀","vsubne":"⊊︀","vsupnE":"⫌︀","vsupne":"⊋︀","Vvdash":"⊪","vzigzag":"⦚","Wcirc":"Ŵ","wcirc":"ŵ","wedbar":"⩟","wedge":"∧","Wedge":"⋀","wedgeq":"≙","weierp":"℘","Wfr":"𝔚","wfr":"𝔴","Wopf":"𝕎","wopf":"𝕨","wp":"℘","wr":"≀","wreath":"≀","Wscr":"𝒲","wscr":"𝓌","xcap":"⋂","xcirc":"◯","xcup":"⋃","xdtri":"▽","Xfr":"𝔛","xfr":"𝔵","xharr":"⟷","xhArr":"⟺","Xi":"Ξ","xi":"ξ","xlarr":"⟵","xlArr":"⟸","xmap":"⟼","xnis":"⋻","xodot":"⨀","Xopf":"𝕏","xopf":"𝕩","xoplus":"⨁","xotime":"⨂","xrarr":"⟶","xrArr":"⟹","Xscr":"𝒳","xscr":"𝓍","xsqcup":"⨆","xuplus":"⨄","xutri":"△","xvee":"⋁","xwedge":"⋀","Yacute":"Ý","yacute":"ý","YAcy":"Я","yacy":"я","Ycirc":"Ŷ","ycirc":"ŷ","Ycy":"Ы","ycy":"ы","yen":"¥","Yfr":"𝔜","yfr":"𝔶","YIcy":"Ї","yicy":"ї","Yopf":"𝕐","yopf":"𝕪","Yscr":"𝒴","yscr":"𝓎","YUcy":"Ю","yucy":"ю","yuml":"ÿ","Yuml":"Ÿ","Zacute":"Ź","zacute":"ź","Zcaron":"Ž","zcaron":"ž","Zcy":"З","zcy":"з","Zdot":"Ż","zdot":"ż","zeetrf":"ℨ","ZeroWidthSpace":"​","Zeta":"Ζ","zeta":"ζ","zfr":"𝔷","Zfr":"ℨ","ZHcy":"Ж","zhcy":"ж","zigrarr":"⇝","zopf":"𝕫","Zopf":"ℤ","Zscr":"𝒵","zscr":"𝓏","zwj":"‍","zwnj":"‌"};
-+
-+/***/ }),
-+
-+/***/ "./node_modules/linkify-it/index.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/linkify-it/index.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+
-+
-+
-+////////////////////////////////////////////////////////////////////////////////
-+// Helpers
-+
-+// Merge objects
-+//
-+function assign(obj /*from1, from2, from3, ...*/) {
-+  var sources = Array.prototype.slice.call(arguments, 1);
-+
-+  sources.forEach(function (source) {
-+    if (!source) { return; }
-+
-+    Object.keys(source).forEach(function (key) {
-+      obj[key] = source[key];
-+    });
-+  });
-+
-+  return obj;
-+}
-+
-+function _class(obj) { return Object.prototype.toString.call(obj); }
-+function isString(obj) { return _class(obj) === '[object String]'; }
-+function isObject(obj) { return _class(obj) === '[object Object]'; }
-+function isRegExp(obj) { return _class(obj) === '[object RegExp]'; }
-+function isFunction(obj) { return _class(obj) === '[object Function]'; }
-+
-+
-+function escapeRE(str) { return str.replace(/[.?*+^$[\]\\(){}|-]/g, '\\$&'); }
-+
-+////////////////////////////////////////////////////////////////////////////////
-+
-+
-+var defaultOptions = {
-+  fuzzyLink: true,
-+  fuzzyEmail: true,
-+  fuzzyIP: false
-+};
-+
-+
-+function isOptionsObj(obj) {
-+  return Object.keys(obj || {}).reduce(function (acc, k) {
-+    return acc || defaultOptions.hasOwnProperty(k);
-+  }, false);
-+}
-+
-+
-+var defaultSchemas = {
-+  'http:': {
-+    validate: function (text, pos, self) {
-+      var tail = text.slice(pos);
-+
-+      if (!self.re.http) {
-+        // compile lazily, because "host"-containing variables can change on tlds update.
-+        self.re.http =  new RegExp(
-+          '^\\/\\/' + self.re.src_auth + self.re.src_host_port_strict + self.re.src_path, 'i'
-+        );
-+      }
-+      if (self.re.http.test(tail)) {
-+        return tail.match(self.re.http)[0].length;
-+      }
-+      return 0;
-+    }
-+  },
-+  'https:':  'http:',
-+  'ftp:':    'http:',
-+  '//':      {
-+    validate: function (text, pos, self) {
-+      var tail = text.slice(pos);
-+
-+      if (!self.re.no_http) {
-+      // compile lazily, because "host"-containing variables can change on tlds update.
-+        self.re.no_http =  new RegExp(
-+          '^' +
-+          self.re.src_auth +
-+          // Don't allow single-level domains, because of false positives like '//test'
-+          // with code comments
-+          '(?:localhost|(?:(?:' + self.re.src_domain + ')\\.)+' + self.re.src_domain_root + ')' +
-+          self.re.src_port +
-+          self.re.src_host_terminator +
-+          self.re.src_path,
-+
-+          'i'
-+        );
-+      }
-+
-+      if (self.re.no_http.test(tail)) {
-+        // should not be `://` & `///`, that protects from errors in protocol name
-+        if (pos >= 3 && text[pos - 3] === ':') { return 0; }
-+        if (pos >= 3 && text[pos - 3] === '/') { return 0; }
-+        return tail.match(self.re.no_http)[0].length;
-+      }
-+      return 0;
-+    }
-+  },
-+  'mailto:': {
-+    validate: function (text, pos, self) {
-+      var tail = text.slice(pos);
-+
-+      if (!self.re.mailto) {
-+        self.re.mailto =  new RegExp(
-+          '^' + self.re.src_email_name + '@' + self.re.src_host_strict, 'i'
-+        );
-+      }
-+      if (self.re.mailto.test(tail)) {
-+        return tail.match(self.re.mailto)[0].length;
-+      }
-+      return 0;
-+    }
-+  }
-+};
-+
-+/*eslint-disable max-len*/
-+
-+// RE pattern for 2-character tlds (autogenerated by ./support/tlds_2char_gen.js)
-+var tlds_2ch_src_re = 'a[cdefgilmnoqrstuwxz]|b[abdefghijmnorstvwyz]|c[acdfghiklmnoruvwxyz]|d[ejkmoz]|e[cegrstu]|f[ijkmor]|g[abdefghilmnpqrstuwy]|h[kmnrtu]|i[delmnoqrst]|j[emop]|k[eghimnprwyz]|l[abcikrstuvy]|m[acdeghklmnopqrstuvwxyz]|n[acefgilopruz]|om|p[aefghklmnrstwy]|qa|r[eosuw]|s[abcdeghijklmnortuvxyz]|t[cdfghjklmnortvwz]|u[agksyz]|v[aceginu]|w[fs]|y[et]|z[amw]';
-+
-+// DON'T try to make PRs with changes. Extend TLDs with LinkifyIt.tlds() instead
-+var tlds_default = 'biz|com|edu|gov|net|org|pro|web|xxx|aero|asia|coop|info|museum|name|shop|рф'.split('|');
-+
-+/*eslint-enable max-len*/
-+
-+////////////////////////////////////////////////////////////////////////////////
-+
-+function resetScanCache(self) {
-+  self.__index__ = -1;
-+  self.__text_cache__   = '';
-+}
-+
-+function createValidator(re) {
-+  return function (text, pos) {
-+    var tail = text.slice(pos);
-+
-+    if (re.test(tail)) {
-+      return tail.match(re)[0].length;
-+    }
-+    return 0;
-+  };
-+}
-+
-+function createNormalizer() {
-+  return function (match, self) {
-+    self.normalize(match);
-+  };
-+}
-+
-+// Schemas compiler. Build regexps.
-+//
-+function compile(self) {
-+
-+  // Load & clone RE patterns.
-+  var re = self.re = __webpack_require__(/*! ./lib/re */ "./node_modules/linkify-it/lib/re.js")(self.__opts__);
-+
-+  // Define dynamic patterns
-+  var tlds = self.__tlds__.slice();
-+
-+  self.onCompile();
-+
-+  if (!self.__tlds_replaced__) {
-+    tlds.push(tlds_2ch_src_re);
-+  }
-+  tlds.push(re.src_xn);
-+
-+  re.src_tlds = tlds.join('|');
-+
-+  function untpl(tpl) { return tpl.replace('%TLDS%', re.src_tlds); }
-+
-+  re.email_fuzzy      = RegExp(untpl(re.tpl_email_fuzzy), 'i');
-+  re.link_fuzzy       = RegExp(untpl(re.tpl_link_fuzzy), 'i');
-+  re.link_no_ip_fuzzy = RegExp(untpl(re.tpl_link_no_ip_fuzzy), 'i');
-+  re.host_fuzzy_test  = RegExp(untpl(re.tpl_host_fuzzy_test), 'i');
-+
-+  //
-+  // Compile each schema
-+  //
-+
-+  var aliases = [];
-+
-+  self.__compiled__ = {}; // Reset compiled data
-+
-+  function schemaError(name, val) {
-+    throw new Error('(LinkifyIt) Invalid schema "' + name + '": ' + val);
-+  }
-+
-+  Object.keys(self.__schemas__).forEach(function (name) {
-+    var val = self.__schemas__[name];
-+
-+    // skip disabled methods
-+    if (val === null) { return; }
-+
-+    var compiled = { validate: null, link: null };
-+
-+    self.__compiled__[name] = compiled;
-+
-+    if (isObject(val)) {
-+      if (isRegExp(val.validate)) {
-+        compiled.validate = createValidator(val.validate);
-+      } else if (isFunction(val.validate)) {
-+        compiled.validate = val.validate;
-+      } else {
-+        schemaError(name, val);
-+      }
-+
-+      if (isFunction(val.normalize)) {
-+        compiled.normalize = val.normalize;
-+      } else if (!val.normalize) {
-+        compiled.normalize = createNormalizer();
-+      } else {
-+        schemaError(name, val);
-+      }
-+
-+      return;
-+    }
-+
-+    if (isString(val)) {
-+      aliases.push(name);
-+      return;
-+    }
-+
-+    schemaError(name, val);
-+  });
-+
-+  //
-+  // Compile postponed aliases
-+  //
-+
-+  aliases.forEach(function (alias) {
-+    if (!self.__compiled__[self.__schemas__[alias]]) {
-+      // Silently fail on missed schemas to avoid errons on disable.
-+      // schemaError(alias, self.__schemas__[alias]);
-+      return;
-+    }
-+
-+    self.__compiled__[alias].validate =
-+      self.__compiled__[self.__schemas__[alias]].validate;
-+    self.__compiled__[alias].normalize =
-+      self.__compiled__[self.__schemas__[alias]].normalize;
-+  });
-+
-+  //
-+  // Fake record for guessed links
-+  //
-+  self.__compiled__[''] = { validate: null, normalize: createNormalizer() };
-+
-+  //
-+  // Build schema condition
-+  //
-+  var slist = Object.keys(self.__compiled__)
-+                      .filter(function (name) {
-+                        // Filter disabled & fake schemas
-+                        return name.length > 0 && self.__compiled__[name];
-+                      })
-+                      .map(escapeRE)
-+                      .join('|');
-+  // (?!_) cause 1.5x slowdown
-+  self.re.schema_test   = RegExp('(^|(?!_)(?:[><\uff5c]|' + re.src_ZPCc + '))(' + slist + ')', 'i');
-+  self.re.schema_search = RegExp('(^|(?!_)(?:[><\uff5c]|' + re.src_ZPCc + '))(' + slist + ')', 'ig');
-+
-+  self.re.pretest       = RegExp(
-+                            '(' + self.re.schema_test.source + ')|' +
-+                            '(' + self.re.host_fuzzy_test.source + ')|' +
-+                            '@',
-+                            'i');
-+
-+  //
-+  // Cleanup
-+  //
-+
-+  resetScanCache(self);
-+}
-+
-+/**
-+ * class Match
-+ *
-+ * Match result. Single element of array, returned by [[LinkifyIt#match]]
-+ **/
-+function Match(self, shift) {
-+  var start = self.__index__,
-+      end   = self.__last_index__,
-+      text  = self.__text_cache__.slice(start, end);
-+
-+  /**
-+   * Match#schema -> String
-+   *
-+   * Prefix (protocol) for matched string.
-+   **/
-+  this.schema    = self.__schema__.toLowerCase();
-+  /**
-+   * Match#index -> Number
-+   *
-+   * First position of matched string.
-+   **/
-+  this.index     = start + shift;
-+  /**
-+   * Match#lastIndex -> Number
-+   *
-+   * Next position after matched string.
-+   **/
-+  this.lastIndex = end + shift;
-+  /**
-+   * Match#raw -> String
-+   *
-+   * Matched string.
-+   **/
-+  this.raw       = text;
-+  /**
-+   * Match#text -> String
-+   *
-+   * Notmalized text of matched string.
-+   **/
-+  this.text      = text;
-+  /**
-+   * Match#url -> String
-+   *
-+   * Normalized url of matched string.
-+   **/
-+  this.url       = text;
-+}
-+
-+function createMatch(self, shift) {
-+  var match = new Match(self, shift);
-+
-+  self.__compiled__[match.schema].normalize(match, self);
-+
-+  return match;
-+}
-+
-+
-+/**
-+ * class LinkifyIt
-+ **/
-+
-+/**
-+ * new LinkifyIt(schemas, options)
-+ * - schemas (Object): Optional. Additional schemas to validate (prefix/validator)
-+ * - options (Object): { fuzzyLink|fuzzyEmail|fuzzyIP: true|false }
-+ *
-+ * Creates new linkifier instance with optional additional schemas.
-+ * Can be called without `new` keyword for convenience.
-+ *
-+ * By default understands:
-+ *
-+ * - `http(s)://...` , `ftp://...`, `mailto:...` & `//...` links
-+ * - "fuzzy" links and emails (example.com, foo@bar.com).
-+ *
-+ * `schemas` is an object, where each key/value describes protocol/rule:
-+ *
-+ * - __key__ - link prefix (usually, protocol name with `:` at the end, `skype:`
-+ *   for example). `linkify-it` makes shure that prefix is not preceeded with
-+ *   alphanumeric char and symbols. Only whitespaces and punctuation allowed.
-+ * - __value__ - rule to check tail after link prefix
-+ *   - _String_ - just alias to existing rule
-+ *   - _Object_
-+ *     - _validate_ - validator function (should return matched length on success),
-+ *       or `RegExp`.
-+ *     - _normalize_ - optional function to normalize text & url of matched result
-+ *       (for example, for @twitter mentions).
-+ *
-+ * `options`:
-+ *
-+ * - __fuzzyLink__ - recognige URL-s without `http(s):` prefix. Default `true`.
-+ * - __fuzzyIP__ - allow IPs in fuzzy links above. Can conflict with some texts
-+ *   like version numbers. Default `false`.
-+ * - __fuzzyEmail__ - recognize emails without `mailto:` prefix.
-+ *
-+ **/
-+function LinkifyIt(schemas, options) {
-+  if (!(this instanceof LinkifyIt)) {
-+    return new LinkifyIt(schemas, options);
-+  }
-+
-+  if (!options) {
-+    if (isOptionsObj(schemas)) {
-+      options = schemas;
-+      schemas = {};
-+    }
-+  }
-+
-+  this.__opts__           = assign({}, defaultOptions, options);
-+
-+  // Cache last tested result. Used to skip repeating steps on next `match` call.
-+  this.__index__          = -1;
-+  this.__last_index__     = -1; // Next scan position
-+  this.__schema__         = '';
-+  this.__text_cache__     = '';
-+
-+  this.__schemas__        = assign({}, defaultSchemas, schemas);
-+  this.__compiled__       = {};
-+
-+  this.__tlds__           = tlds_default;
-+  this.__tlds_replaced__  = false;
-+
-+  this.re = {};
-+
-+  compile(this);
-+}
-+
-+
-+/** chainable
-+ * LinkifyIt#add(schema, definition)
-+ * - schema (String): rule name (fixed pattern prefix)
-+ * - definition (String|RegExp|Object): schema definition
-+ *
-+ * Add new rule definition. See constructor description for details.
-+ **/
-+LinkifyIt.prototype.add = function add(schema, definition) {
-+  this.__schemas__[schema] = definition;
-+  compile(this);
-+  return this;
-+};
-+
-+
-+/** chainable
-+ * LinkifyIt#set(options)
-+ * - options (Object): { fuzzyLink|fuzzyEmail|fuzzyIP: true|false }
-+ *
-+ * Set recognition options for links without schema.
-+ **/
-+LinkifyIt.prototype.set = function set(options) {
-+  this.__opts__ = assign(this.__opts__, options);
-+  return this;
-+};
-+
-+
-+/**
-+ * LinkifyIt#test(text) -> Boolean
-+ *
-+ * Searches linkifiable pattern and returns `true` on success or `false` on fail.
-+ **/
-+LinkifyIt.prototype.test = function test(text) {
-+  // Reset scan cache
-+  this.__text_cache__ = text;
-+  this.__index__      = -1;
-+
-+  if (!text.length) { return false; }
-+
-+  var m, ml, me, len, shift, next, re, tld_pos, at_pos;
-+
-+  // try to scan for link with schema - that's the most simple rule
-+  if (this.re.schema_test.test(text)) {
-+    re = this.re.schema_search;
-+    re.lastIndex = 0;
-+    while ((m = re.exec(text)) !== null) {
-+      len = this.testSchemaAt(text, m[2], re.lastIndex);
-+      if (len) {
-+        this.__schema__     = m[2];
-+        this.__index__      = m.index + m[1].length;
-+        this.__last_index__ = m.index + m[0].length + len;
-+        break;
-+      }
-+    }
-+  }
-+
-+  if (this.__opts__.fuzzyLink && this.__compiled__['http:']) {
-+    // guess schemaless links
-+    tld_pos = text.search(this.re.host_fuzzy_test);
-+    if (tld_pos >= 0) {
-+      // if tld is located after found link - no need to check fuzzy pattern
-+      if (this.__index__ < 0 || tld_pos < this.__index__) {
-+        if ((ml = text.match(this.__opts__.fuzzyIP ? this.re.link_fuzzy : this.re.link_no_ip_fuzzy)) !== null) {
-+
-+          shift = ml.index + ml[1].length;
-+
-+          if (this.__index__ < 0 || shift < this.__index__) {
-+            this.__schema__     = '';
-+            this.__index__      = shift;
-+            this.__last_index__ = ml.index + ml[0].length;
-+          }
-+        }
-+      }
-+    }
-+  }
-+
-+  if (this.__opts__.fuzzyEmail && this.__compiled__['mailto:']) {
-+    // guess schemaless emails
-+    at_pos = text.indexOf('@');
-+    if (at_pos >= 0) {
-+      // We can't skip this check, because this cases are possible:
-+      // 192.168.1.1@gmail.com, my.in@example.com
-+      if ((me = text.match(this.re.email_fuzzy)) !== null) {
-+
-+        shift = me.index + me[1].length;
-+        next  = me.index + me[0].length;
-+
-+        if (this.__index__ < 0 || shift < this.__index__ ||
-+            (shift === this.__index__ && next > this.__last_index__)) {
-+          this.__schema__     = 'mailto:';
-+          this.__index__      = shift;
-+          this.__last_index__ = next;
-+        }
-+      }
-+    }
-+  }
-+
-+  return this.__index__ >= 0;
-+};
-+
-+
-+/**
-+ * LinkifyIt#pretest(text) -> Boolean
-+ *
-+ * Very quick check, that can give false positives. Returns true if link MAY BE
-+ * can exists. Can be used for speed optimization, when you need to check that
-+ * link NOT exists.
-+ **/
-+LinkifyIt.prototype.pretest = function pretest(text) {
-+  return this.re.pretest.test(text);
-+};
-+
-+
-+/**
-+ * LinkifyIt#testSchemaAt(text, name, position) -> Number
-+ * - text (String): text to scan
-+ * - name (String): rule (schema) name
-+ * - position (Number): text offset to check from
-+ *
-+ * Similar to [[LinkifyIt#test]] but checks only specific protocol tail exactly
-+ * at given position. Returns length of found pattern (0 on fail).
-+ **/
-+LinkifyIt.prototype.testSchemaAt = function testSchemaAt(text, schema, pos) {
-+  // If not supported schema check requested - terminate
-+  if (!this.__compiled__[schema.toLowerCase()]) {
-+    return 0;
-+  }
-+  return this.__compiled__[schema.toLowerCase()].validate(text, pos, this);
-+};
-+
-+
-+/**
-+ * LinkifyIt#match(text) -> Array|null
-+ *
-+ * Returns array of found link descriptions or `null` on fail. We strongly
-+ * recommend to use [[LinkifyIt#test]] first, for best speed.
-+ *
-+ * ##### Result match description
-+ *
-+ * - __schema__ - link schema, can be empty for fuzzy links, or `//` for
-+ *   protocol-neutral  links.
-+ * - __index__ - offset of matched text
-+ * - __lastIndex__ - index of next char after mathch end
-+ * - __raw__ - matched text
-+ * - __text__ - normalized text
-+ * - __url__ - link, generated from matched text
-+ **/
-+LinkifyIt.prototype.match = function match(text) {
-+  var shift = 0, result = [];
-+
-+  // Try to take previous element from cache, if .test() called before
-+  if (this.__index__ >= 0 && this.__text_cache__ === text) {
-+    result.push(createMatch(this, shift));
-+    shift = this.__last_index__;
-+  }
-+
-+  // Cut head if cache was used
-+  var tail = shift ? text.slice(shift) : text;
-+
-+  // Scan string until end reached
-+  while (this.test(tail)) {
-+    result.push(createMatch(this, shift));
-+
-+    tail = tail.slice(this.__last_index__);
-+    shift += this.__last_index__;
-+  }
-+
-+  if (result.length) {
-+    return result;
-+  }
-+
-+  return null;
-+};
-+
-+
-+/** chainable
-+ * LinkifyIt#tlds(list [, keepOld]) -> this
-+ * - list (Array): list of tlds
-+ * - keepOld (Boolean): merge with current list if `true` (`false` by default)
-+ *
-+ * Load (or merge) new tlds list. Those are user for fuzzy links (without prefix)
-+ * to avoid false positives. By default this algorythm used:
-+ *
-+ * - hostname with any 2-letter root zones are ok.
-+ * - biz|com|edu|gov|net|org|pro|web|xxx|aero|asia|coop|info|museum|name|shop|рф
-+ *   are ok.
-+ * - encoded (`xn--...`) root zones are ok.
-+ *
-+ * If list is replaced, then exact match for 2-chars root zones will be checked.
-+ **/
-+LinkifyIt.prototype.tlds = function tlds(list, keepOld) {
-+  list = Array.isArray(list) ? list : [ list ];
-+
-+  if (!keepOld) {
-+    this.__tlds__ = list.slice();
-+    this.__tlds_replaced__ = true;
-+    compile(this);
-+    return this;
-+  }
-+
-+  this.__tlds__ = this.__tlds__.concat(list)
-+                                  .sort()
-+                                  .filter(function (el, idx, arr) {
-+                                    return el !== arr[idx - 1];
-+                                  })
-+                                  .reverse();
-+
-+  compile(this);
-+  return this;
-+};
-+
-+/**
-+ * LinkifyIt#normalize(match)
-+ *
-+ * Default normalizer (if schema does not define it's own).
-+ **/
-+LinkifyIt.prototype.normalize = function normalize(match) {
-+
-+  // Do minimal possible changes by default. Need to collect feedback prior
-+  // to move forward https://github.com/markdown-it/linkify-it/issues/1
-+
-+  if (!match.schema) { match.url = 'http://' + match.url; }
-+
-+  if (match.schema === 'mailto:' && !/^mailto:/i.test(match.url)) {
-+    match.url = 'mailto:' + match.url;
-+  }
-+};
-+
-+
-+/**
-+ * LinkifyIt#onCompile()
-+ *
-+ * Override to modify basic RegExp-s.
-+ **/
-+LinkifyIt.prototype.onCompile = function onCompile() {
-+};
-+
-+
-+module.exports = LinkifyIt;
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/linkify-it/lib/re.js":
-+/*!*******************************************!*\
-+  !*** ./node_modules/linkify-it/lib/re.js ***!
-+  \*******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+
-+
-+
-+module.exports = function (opts) {
-+  var re = {};
-+
-+  // Use direct extract instead of `regenerate` to reduse browserified size
-+  re.src_Any = __webpack_require__(/*! uc.micro/properties/Any/regex */ "./node_modules/uc.micro/properties/Any/regex.js").source;
-+  re.src_Cc  = __webpack_require__(/*! uc.micro/categories/Cc/regex */ "./node_modules/uc.micro/categories/Cc/regex.js").source;
-+  re.src_Z   = __webpack_require__(/*! uc.micro/categories/Z/regex */ "./node_modules/uc.micro/categories/Z/regex.js").source;
-+  re.src_P   = __webpack_require__(/*! uc.micro/categories/P/regex */ "./node_modules/uc.micro/categories/P/regex.js").source;
-+
-+  // \p{\Z\P\Cc\CF} (white spaces + control + format + punctuation)
-+  re.src_ZPCc = [ re.src_Z, re.src_P, re.src_Cc ].join('|');
-+
-+  // \p{\Z\Cc} (white spaces + control)
-+  re.src_ZCc = [ re.src_Z, re.src_Cc ].join('|');
-+
-+  // Experimental. List of chars, completely prohibited in links
-+  // because can separate it from other part of text
-+  var text_separators = '[><\uff5c]';
-+
-+  // All possible word characters (everything without punctuation, spaces & controls)
-+  // Defined via punctuation & spaces to save space
-+  // Should be something like \p{\L\N\S\M} (\w but without `_`)
-+  re.src_pseudo_letter       = '(?:(?!' + text_separators + '|' + re.src_ZPCc + ')' + re.src_Any + ')';
-+  // The same as abothe but without [0-9]
-+  // var src_pseudo_letter_non_d = '(?:(?![0-9]|' + src_ZPCc + ')' + src_Any + ')';
-+
-+  ////////////////////////////////////////////////////////////////////////////////
-+
-+  re.src_ip4 =
-+
-+    '(?:(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)';
-+
-+  // Prohibit any of "@/[]()" in user/pass to avoid wrong domain fetch.
-+  re.src_auth    = '(?:(?:(?!' + re.src_ZCc + '|[@/\\[\\]()]).)+@)?';
-+
-+  re.src_port =
-+
-+    '(?::(?:6(?:[0-4]\\d{3}|5(?:[0-4]\\d{2}|5(?:[0-2]\\d|3[0-5])))|[1-5]?\\d{1,4}))?';
-+
-+  re.src_host_terminator =
-+
-+    '(?=$|' + text_separators + '|' + re.src_ZPCc + ')(?!-|_|:\\d|\\.-|\\.(?!$|' + re.src_ZPCc + '))';
-+
-+  re.src_path =
-+
-+    '(?:' +
-+      '[/?#]' +
-+        '(?:' +
-+          '(?!' + re.src_ZCc + '|' + text_separators + '|[()[\\]{}.,"\'?!\\-]).|' +
-+          '\\[(?:(?!' + re.src_ZCc + '|\\]).)*\\]|' +
-+          '\\((?:(?!' + re.src_ZCc + '|[)]).)*\\)|' +
-+          '\\{(?:(?!' + re.src_ZCc + '|[}]).)*\\}|' +
-+          '\\"(?:(?!' + re.src_ZCc + '|["]).)+\\"|' +
-+          "\\'(?:(?!" + re.src_ZCc + "|[']).)+\\'|" +
-+          "\\'(?=" + re.src_pseudo_letter + '|[-]).|' +  // allow `I'm_king` if no pair found
-+          '\\.{2,3}[a-zA-Z0-9%/]|' + // github has ... in commit range links. Restrict to
-+                                     // - english
-+                                     // - percent-encoded
-+                                     // - parts of file path
-+                                     // until more examples found.
-+          '\\.(?!' + re.src_ZCc + '|[.]).|' +
-+          (opts && opts['---'] ?
-+            '\\-(?!--(?:[^-]|$))(?:-*)|' // `---` => long dash, terminate
-+          :
-+            '\\-+|'
-+          ) +
-+          '\\,(?!' + re.src_ZCc + ').|' +      // allow `,,,` in paths
-+          '\\!(?!' + re.src_ZCc + '|[!]).|' +
-+          '\\?(?!' + re.src_ZCc + '|[?]).' +
-+        ')+' +
-+      '|\\/' +
-+    ')?';
-+
-+  re.src_email_name =
-+
-+    '[\\-;:&=\\+\\$,\\"\\.a-zA-Z0-9_]+';
-+
-+  re.src_xn =
-+
-+    'xn--[a-z0-9\\-]{1,59}';
-+
-+  // More to read about domain names
-+  // http://serverfault.com/questions/638260/
-+
-+  re.src_domain_root =
-+
-+    // Allow letters & digits (http://test1)
-+    '(?:' +
-+      re.src_xn +
-+      '|' +
-+      re.src_pseudo_letter + '{1,63}' +
-+    ')';
-+
-+  re.src_domain =
-+
-+    '(?:' +
-+      re.src_xn +
-+      '|' +
-+      '(?:' + re.src_pseudo_letter + ')' +
-+      '|' +
-+      // don't allow `--` in domain names, because:
-+      // - that can conflict with markdown &mdash; / &ndash;
-+      // - nobody use those anyway
-+      '(?:' + re.src_pseudo_letter + '(?:-(?!-)|' + re.src_pseudo_letter + '){0,61}' + re.src_pseudo_letter + ')' +
-+    ')';
-+
-+  re.src_host =
-+
-+    '(?:' +
-+    // Don't need IP check, because digits are already allowed in normal domain names
-+    //   src_ip4 +
-+    // '|' +
-+      '(?:(?:(?:' + re.src_domain + ')\\.)*' + re.src_domain/*_root*/ + ')' +
-+    ')';
-+
-+  re.tpl_host_fuzzy =
-+
-+    '(?:' +
-+      re.src_ip4 +
-+    '|' +
-+      '(?:(?:(?:' + re.src_domain + ')\\.)+(?:%TLDS%))' +
-+    ')';
-+
-+  re.tpl_host_no_ip_fuzzy =
-+
-+    '(?:(?:(?:' + re.src_domain + ')\\.)+(?:%TLDS%))';
-+
-+  re.src_host_strict =
-+
-+    re.src_host + re.src_host_terminator;
-+
-+  re.tpl_host_fuzzy_strict =
-+
-+    re.tpl_host_fuzzy + re.src_host_terminator;
-+
-+  re.src_host_port_strict =
-+
-+    re.src_host + re.src_port + re.src_host_terminator;
-+
-+  re.tpl_host_port_fuzzy_strict =
-+
-+    re.tpl_host_fuzzy + re.src_port + re.src_host_terminator;
-+
-+  re.tpl_host_port_no_ip_fuzzy_strict =
-+
-+    re.tpl_host_no_ip_fuzzy + re.src_port + re.src_host_terminator;
-+
-+
-+  ////////////////////////////////////////////////////////////////////////////////
-+  // Main rules
-+
-+  // Rude test fuzzy links by host, for quick deny
-+  re.tpl_host_fuzzy_test =
-+
-+    'localhost|www\\.|\\.\\d{1,3}\\.|(?:\\.(?:%TLDS%)(?:' + re.src_ZPCc + '|>|$))';
-+
-+  re.tpl_email_fuzzy =
-+
-+      '(^|' + text_separators + '|\\(|' + re.src_ZCc + ')(' + re.src_email_name + '@' + re.tpl_host_fuzzy_strict + ')';
-+
-+  re.tpl_link_fuzzy =
-+      // Fuzzy link can't be prepended with .:/\- and non punctuation.
-+      // but can start with > (markdown blockquote)
-+      '(^|(?![.:/\\-_@])(?:[$+<=>^`|\uff5c]|' + re.src_ZPCc + '))' +
-+      '((?![$+<=>^`|\uff5c])' + re.tpl_host_port_fuzzy_strict + re.src_path + ')';
-+
-+  re.tpl_link_no_ip_fuzzy =
-+      // Fuzzy link can't be prepended with .:/\- and non punctuation.
-+      // but can start with > (markdown blockquote)
-+      '(^|(?![.:/\\-_@])(?:[$+<=>^`|\uff5c]|' + re.src_ZPCc + '))' +
-+      '((?![$+<=>^`|\uff5c])' + re.tpl_host_port_no_ip_fuzzy_strict + re.src_path + ')';
-+
-+  return re;
-+};
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/index.js":
-+/*!*******************************************!*\
-+  !*** ./node_modules/markdown-it/index.js ***!
-+  \*******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+
-+
-+
-+module.exports = __webpack_require__(/*! ./lib/ */ "./node_modules/markdown-it/lib/index.js");
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/common/entities.js":
-+/*!*********************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/common/entities.js ***!
-+  \*********************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// HTML5 entities map: { name -> utf16string }
-+//
-+
-+
-+/*eslint quotes:0*/
-+module.exports = __webpack_require__(/*! entities/maps/entities.json */ "./node_modules/entities/maps/entities.json");
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/common/html_blocks.js":
-+/*!************************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/common/html_blocks.js ***!
-+  \************************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// List of valid html blocks names, accorting to commonmark spec
-+// http://jgm.github.io/CommonMark/spec.html#html-blocks
-+
-+
-+
-+
-+module.exports = [
-+  'address',
-+  'article',
-+  'aside',
-+  'base',
-+  'basefont',
-+  'blockquote',
-+  'body',
-+  'caption',
-+  'center',
-+  'col',
-+  'colgroup',
-+  'dd',
-+  'details',
-+  'dialog',
-+  'dir',
-+  'div',
-+  'dl',
-+  'dt',
-+  'fieldset',
-+  'figcaption',
-+  'figure',
-+  'footer',
-+  'form',
-+  'frame',
-+  'frameset',
-+  'h1',
-+  'h2',
-+  'h3',
-+  'h4',
-+  'h5',
-+  'h6',
-+  'head',
-+  'header',
-+  'hr',
-+  'html',
-+  'iframe',
-+  'legend',
-+  'li',
-+  'link',
-+  'main',
-+  'menu',
-+  'menuitem',
-+  'meta',
-+  'nav',
-+  'noframes',
-+  'ol',
-+  'optgroup',
-+  'option',
-+  'p',
-+  'param',
-+  'section',
-+  'source',
-+  'summary',
-+  'table',
-+  'tbody',
-+  'td',
-+  'tfoot',
-+  'th',
-+  'thead',
-+  'title',
-+  'tr',
-+  'track',
-+  'ul'
-+];
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/common/html_re.js":
-+/*!********************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/common/html_re.js ***!
-+  \********************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// Regexps to match html elements
-+
-+
-+
-+var attr_name     = '[a-zA-Z_:][a-zA-Z0-9:._-]*';
-+
-+var unquoted      = '[^"\'=<>`\\x00-\\x20]+';
-+var single_quoted = "'[^']*'";
-+var double_quoted = '"[^"]*"';
-+
-+var attr_value  = '(?:' + unquoted + '|' + single_quoted + '|' + double_quoted + ')';
-+
-+var attribute   = '(?:\\s+' + attr_name + '(?:\\s*=\\s*' + attr_value + ')?)';
-+
-+var open_tag    = '<[A-Za-z][A-Za-z0-9\\-]*' + attribute + '*\\s*\\/?>';
-+
-+var close_tag   = '<\\/[A-Za-z][A-Za-z0-9\\-]*\\s*>';
-+var comment     = '<!---->|<!--(?:-?[^>-])(?:-?[^-])*-->';
-+var processing  = '<[?].*?[?]>';
-+var declaration = '<![A-Z]+\\s+[^>]*>';
-+var cdata       = '<!\\[CDATA\\[[\\s\\S]*?\\]\\]>';
-+
-+var HTML_TAG_RE = new RegExp('^(?:' + open_tag + '|' + close_tag + '|' + comment +
-+                        '|' + processing + '|' + declaration + '|' + cdata + ')');
-+var HTML_OPEN_CLOSE_TAG_RE = new RegExp('^(?:' + open_tag + '|' + close_tag + ')');
-+
-+module.exports.HTML_TAG_RE = HTML_TAG_RE;
-+module.exports.HTML_OPEN_CLOSE_TAG_RE = HTML_OPEN_CLOSE_TAG_RE;
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/common/utils.js":
-+/*!******************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/common/utils.js ***!
-+  \******************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// Utilities
-+//
-+
-+
-+
-+function _class(obj) { return Object.prototype.toString.call(obj); }
-+
-+function isString(obj) { return _class(obj) === '[object String]'; }
-+
-+var _hasOwnProperty = Object.prototype.hasOwnProperty;
-+
-+function has(object, key) {
-+  return _hasOwnProperty.call(object, key);
-+}
-+
-+// Merge objects
-+//
-+function assign(obj /*from1, from2, from3, ...*/) {
-+  var sources = Array.prototype.slice.call(arguments, 1);
-+
-+  sources.forEach(function (source) {
-+    if (!source) { return; }
-+
-+    if (typeof source !== 'object') {
-+      throw new TypeError(source + 'must be object');
-+    }
-+
-+    Object.keys(source).forEach(function (key) {
-+      obj[key] = source[key];
-+    });
-+  });
-+
-+  return obj;
-+}
-+
-+// Remove element from array and put another array at those position.
-+// Useful for some operations with tokens
-+function arrayReplaceAt(src, pos, newElements) {
-+  return [].concat(src.slice(0, pos), newElements, src.slice(pos + 1));
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+
-+function isValidEntityCode(c) {
-+  /*eslint no-bitwise:0*/
-+  // broken sequence
-+  if (c >= 0xD800 && c <= 0xDFFF) { return false; }
-+  // never used
-+  if (c >= 0xFDD0 && c <= 0xFDEF) { return false; }
-+  if ((c & 0xFFFF) === 0xFFFF || (c & 0xFFFF) === 0xFFFE) { return false; }
-+  // control codes
-+  if (c >= 0x00 && c <= 0x08) { return false; }
-+  if (c === 0x0B) { return false; }
-+  if (c >= 0x0E && c <= 0x1F) { return false; }
-+  if (c >= 0x7F && c <= 0x9F) { return false; }
-+  // out of range
-+  if (c > 0x10FFFF) { return false; }
-+  return true;
-+}
-+
-+function fromCodePoint(c) {
-+  /*eslint no-bitwise:0*/
-+  if (c > 0xffff) {
-+    c -= 0x10000;
-+    var surrogate1 = 0xd800 + (c >> 10),
-+        surrogate2 = 0xdc00 + (c & 0x3ff);
-+
-+    return String.fromCharCode(surrogate1, surrogate2);
-+  }
-+  return String.fromCharCode(c);
-+}
-+
-+
-+var UNESCAPE_MD_RE  = /\\([!"#$%&'()*+,\-.\/:;<=>?@[\\\]^_`{|}~])/g;
-+var ENTITY_RE       = /&([a-z#][a-z0-9]{1,31});/gi;
-+var UNESCAPE_ALL_RE = new RegExp(UNESCAPE_MD_RE.source + '|' + ENTITY_RE.source, 'gi');
-+
-+var DIGITAL_ENTITY_TEST_RE = /^#((?:x[a-f0-9]{1,8}|[0-9]{1,8}))/i;
-+
-+var entities = __webpack_require__(/*! ./entities */ "./node_modules/markdown-it/lib/common/entities.js");
-+
-+function replaceEntityPattern(match, name) {
-+  var code = 0;
-+
-+  if (has(entities, name)) {
-+    return entities[name];
-+  }
-+
-+  if (name.charCodeAt(0) === 0x23/* # */ && DIGITAL_ENTITY_TEST_RE.test(name)) {
-+    code = name[1].toLowerCase() === 'x' ?
-+      parseInt(name.slice(2), 16)
-+    :
-+      parseInt(name.slice(1), 10);
-+    if (isValidEntityCode(code)) {
-+      return fromCodePoint(code);
-+    }
-+  }
-+
-+  return match;
-+}
-+
-+/*function replaceEntities(str) {
-+  if (str.indexOf('&') < 0) { return str; }
-+
-+  return str.replace(ENTITY_RE, replaceEntityPattern);
-+}*/
-+
-+function unescapeMd(str) {
-+  if (str.indexOf('\\') < 0) { return str; }
-+  return str.replace(UNESCAPE_MD_RE, '$1');
-+}
-+
-+function unescapeAll(str) {
-+  if (str.indexOf('\\') < 0 && str.indexOf('&') < 0) { return str; }
-+
-+  return str.replace(UNESCAPE_ALL_RE, function (match, escaped, entity) {
-+    if (escaped) { return escaped; }
-+    return replaceEntityPattern(match, entity);
-+  });
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+
-+var HTML_ESCAPE_TEST_RE = /[&<>"]/;
-+var HTML_ESCAPE_REPLACE_RE = /[&<>"]/g;
-+var HTML_REPLACEMENTS = {
-+  '&': '&amp;',
-+  '<': '&lt;',
-+  '>': '&gt;',
-+  '"': '&quot;'
-+};
-+
-+function replaceUnsafeChar(ch) {
-+  return HTML_REPLACEMENTS[ch];
-+}
-+
-+function escapeHtml(str) {
-+  if (HTML_ESCAPE_TEST_RE.test(str)) {
-+    return str.replace(HTML_ESCAPE_REPLACE_RE, replaceUnsafeChar);
-+  }
-+  return str;
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+
-+var REGEXP_ESCAPE_RE = /[.?*+^$[\]\\(){}|-]/g;
-+
-+function escapeRE(str) {
-+  return str.replace(REGEXP_ESCAPE_RE, '\\$&');
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+
-+function isSpace(code) {
-+  switch (code) {
-+    case 0x09:
-+    case 0x20:
-+      return true;
-+  }
-+  return false;
-+}
-+
-+// Zs (unicode class) || [\t\f\v\r\n]
-+function isWhiteSpace(code) {
-+  if (code >= 0x2000 && code <= 0x200A) { return true; }
-+  switch (code) {
-+    case 0x09: // \t
-+    case 0x0A: // \n
-+    case 0x0B: // \v
-+    case 0x0C: // \f
-+    case 0x0D: // \r
-+    case 0x20:
-+    case 0xA0:
-+    case 0x1680:
-+    case 0x202F:
-+    case 0x205F:
-+    case 0x3000:
-+      return true;
-+  }
-+  return false;
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+
-+/*eslint-disable max-len*/
-+var UNICODE_PUNCT_RE = __webpack_require__(/*! uc.micro/categories/P/regex */ "./node_modules/uc.micro/categories/P/regex.js");
-+
-+// Currently without astral characters support.
-+function isPunctChar(ch) {
-+  return UNICODE_PUNCT_RE.test(ch);
-+}
-+
-+
-+// Markdown ASCII punctuation characters.
-+//
-+// !, ", #, $, %, &, ', (, ), *, +, ,, -, ., /, :, ;, <, =, >, ?, @, [, \, ], ^, _, `, {, |, }, or ~
-+// http://spec.commonmark.org/0.15/#ascii-punctuation-character
-+//
-+// Don't confuse with unicode punctuation !!! It lacks some chars in ascii range.
-+//
-+function isMdAsciiPunct(ch) {
-+  switch (ch) {
-+    case 0x21/* ! */:
-+    case 0x22/* " */:
-+    case 0x23/* # */:
-+    case 0x24/* $ */:
-+    case 0x25/* % */:
-+    case 0x26/* & */:
-+    case 0x27/* ' */:
-+    case 0x28/* ( */:
-+    case 0x29/* ) */:
-+    case 0x2A/* * */:
-+    case 0x2B/* + */:
-+    case 0x2C/* , */:
-+    case 0x2D/* - */:
-+    case 0x2E/* . */:
-+    case 0x2F/* / */:
-+    case 0x3A/* : */:
-+    case 0x3B/* ; */:
-+    case 0x3C/* < */:
-+    case 0x3D/* = */:
-+    case 0x3E/* > */:
-+    case 0x3F/* ? */:
-+    case 0x40/* @ */:
-+    case 0x5B/* [ */:
-+    case 0x5C/* \ */:
-+    case 0x5D/* ] */:
-+    case 0x5E/* ^ */:
-+    case 0x5F/* _ */:
-+    case 0x60/* ` */:
-+    case 0x7B/* { */:
-+    case 0x7C/* | */:
-+    case 0x7D/* } */:
-+    case 0x7E/* ~ */:
-+      return true;
-+    default:
-+      return false;
-+  }
-+}
-+
-+// Hepler to unify [reference labels].
-+//
-+function normalizeReference(str) {
-+  // use .toUpperCase() instead of .toLowerCase()
-+  // here to avoid a conflict with Object.prototype
-+  // members (most notably, `__proto__`)
-+  return str.trim().replace(/\s+/g, ' ').toUpperCase();
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+
-+// Re-export libraries commonly used in both markdown-it and its plugins,
-+// so plugins won't have to depend on them explicitly, which reduces their
-+// bundled size (e.g. a browser build).
-+//
-+exports.lib                 = {};
-+exports.lib.mdurl           = __webpack_require__(/*! mdurl */ "./node_modules/mdurl/index.js");
-+exports.lib.ucmicro         = __webpack_require__(/*! uc.micro */ "./node_modules/uc.micro/index.js");
-+
-+exports.assign              = assign;
-+exports.isString            = isString;
-+exports.has                 = has;
-+exports.unescapeMd          = unescapeMd;
-+exports.unescapeAll         = unescapeAll;
-+exports.isValidEntityCode   = isValidEntityCode;
-+exports.fromCodePoint       = fromCodePoint;
-+// exports.replaceEntities     = replaceEntities;
-+exports.escapeHtml          = escapeHtml;
-+exports.arrayReplaceAt      = arrayReplaceAt;
-+exports.isSpace             = isSpace;
-+exports.isWhiteSpace        = isWhiteSpace;
-+exports.isMdAsciiPunct      = isMdAsciiPunct;
-+exports.isPunctChar         = isPunctChar;
-+exports.escapeRE            = escapeRE;
-+exports.normalizeReference  = normalizeReference;
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/helpers/index.js":
-+/*!*******************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/helpers/index.js ***!
-+  \*******************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// Just a shortcut for bulk export
-+
-+
-+
-+exports.parseLinkLabel       = __webpack_require__(/*! ./parse_link_label */ "./node_modules/markdown-it/lib/helpers/parse_link_label.js");
-+exports.parseLinkDestination = __webpack_require__(/*! ./parse_link_destination */ "./node_modules/markdown-it/lib/helpers/parse_link_destination.js");
-+exports.parseLinkTitle       = __webpack_require__(/*! ./parse_link_title */ "./node_modules/markdown-it/lib/helpers/parse_link_title.js");
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/helpers/parse_link_destination.js":
-+/*!************************************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/helpers/parse_link_destination.js ***!
-+  \************************************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// Parse link destination
-+//
-+
-+
-+
-+var isSpace     = __webpack_require__(/*! ../common/utils */ "./node_modules/markdown-it/lib/common/utils.js").isSpace;
-+var unescapeAll = __webpack_require__(/*! ../common/utils */ "./node_modules/markdown-it/lib/common/utils.js").unescapeAll;
-+
-+
-+module.exports = function parseLinkDestination(str, pos, max) {
-+  var code, level,
-+      lines = 0,
-+      start = pos,
-+      result = {
-+        ok: false,
-+        pos: 0,
-+        lines: 0,
-+        str: ''
-+      };
-+
-+  if (str.charCodeAt(pos) === 0x3C /* < */) {
-+    pos++;
-+    while (pos < max) {
-+      code = str.charCodeAt(pos);
-+      if (code === 0x0A /* \n */ || isSpace(code)) { return result; }
-+      if (code === 0x3E /* > */) {
-+        result.pos = pos + 1;
-+        result.str = unescapeAll(str.slice(start + 1, pos));
-+        result.ok = true;
-+        return result;
-+      }
-+      if (code === 0x5C /* \ */ && pos + 1 < max) {
-+        pos += 2;
-+        continue;
-+      }
-+
-+      pos++;
-+    }
-+
-+    // no closing '>'
-+    return result;
-+  }
-+
-+  // this should be ... } else { ... branch
-+
-+  level = 0;
-+  while (pos < max) {
-+    code = str.charCodeAt(pos);
-+
-+    if (code === 0x20) { break; }
-+
-+    // ascii control characters
-+    if (code < 0x20 || code === 0x7F) { break; }
-+
-+    if (code === 0x5C /* \ */ && pos + 1 < max) {
-+      pos += 2;
-+      continue;
-+    }
-+
-+    if (code === 0x28 /* ( */) {
-+      level++;
-+    }
-+
-+    if (code === 0x29 /* ) */) {
-+      if (level === 0) { break; }
-+      level--;
-+    }
-+
-+    pos++;
-+  }
-+
-+  if (start === pos) { return result; }
-+  if (level !== 0) { return result; }
-+
-+  result.str = unescapeAll(str.slice(start, pos));
-+  result.lines = lines;
-+  result.pos = pos;
-+  result.ok = true;
-+  return result;
-+};
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/helpers/parse_link_label.js":
-+/*!******************************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/helpers/parse_link_label.js ***!
-+  \******************************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// Parse link label
-+//
-+// this function assumes that first character ("[") already matches;
-+// returns the end of the label
-+//
-+
-+
-+module.exports = function parseLinkLabel(state, start, disableNested) {
-+  var level, found, marker, prevPos,
-+      labelEnd = -1,
-+      max = state.posMax,
-+      oldPos = state.pos;
-+
-+  state.pos = start + 1;
-+  level = 1;
-+
-+  while (state.pos < max) {
-+    marker = state.src.charCodeAt(state.pos);
-+    if (marker === 0x5D /* ] */) {
-+      level--;
-+      if (level === 0) {
-+        found = true;
-+        break;
-+      }
-+    }
-+
-+    prevPos = state.pos;
-+    state.md.inline.skipToken(state);
-+    if (marker === 0x5B /* [ */) {
-+      if (prevPos === state.pos - 1) {
-+        // increase level if we find text `[`, which is not a part of any token
-+        level++;
-+      } else if (disableNested) {
-+        state.pos = oldPos;
-+        return -1;
-+      }
-+    }
-+  }
-+
-+  if (found) {
-+    labelEnd = state.pos;
-+  }
-+
-+  // restore old state
-+  state.pos = oldPos;
-+
-+  return labelEnd;
-+};
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/helpers/parse_link_title.js":
-+/*!******************************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/helpers/parse_link_title.js ***!
-+  \******************************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// Parse link title
-+//
-+
-+
-+
-+var unescapeAll = __webpack_require__(/*! ../common/utils */ "./node_modules/markdown-it/lib/common/utils.js").unescapeAll;
-+
-+
-+module.exports = function parseLinkTitle(str, pos, max) {
-+  var code,
-+      marker,
-+      lines = 0,
-+      start = pos,
-+      result = {
-+        ok: false,
-+        pos: 0,
-+        lines: 0,
-+        str: ''
-+      };
-+
-+  if (pos >= max) { return result; }
-+
-+  marker = str.charCodeAt(pos);
-+
-+  if (marker !== 0x22 /* " */ && marker !== 0x27 /* ' */ && marker !== 0x28 /* ( */) { return result; }
-+
-+  pos++;
-+
-+  // if opening marker is "(", switch it to closing marker ")"
-+  if (marker === 0x28) { marker = 0x29; }
-+
-+  while (pos < max) {
-+    code = str.charCodeAt(pos);
-+    if (code === marker) {
-+      result.pos = pos + 1;
-+      result.lines = lines;
-+      result.str = unescapeAll(str.slice(start + 1, pos));
-+      result.ok = true;
-+      return result;
-+    } else if (code === 0x0A) {
-+      lines++;
-+    } else if (code === 0x5C /* \ */ && pos + 1 < max) {
-+      pos++;
-+      if (str.charCodeAt(pos) === 0x0A) {
-+        lines++;
-+      }
-+    }
-+
-+    pos++;
-+  }
-+
-+  return result;
-+};
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/index.js":
-+/*!***********************************************!*\
-+  !*** ./node_modules/markdown-it/lib/index.js ***!
-+  \***********************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// Main parser class
-+
-+
-+
-+
-+var utils        = __webpack_require__(/*! ./common/utils */ "./node_modules/markdown-it/lib/common/utils.js");
-+var helpers      = __webpack_require__(/*! ./helpers */ "./node_modules/markdown-it/lib/helpers/index.js");
-+var Renderer     = __webpack_require__(/*! ./renderer */ "./node_modules/markdown-it/lib/renderer.js");
-+var ParserCore   = __webpack_require__(/*! ./parser_core */ "./node_modules/markdown-it/lib/parser_core.js");
-+var ParserBlock  = __webpack_require__(/*! ./parser_block */ "./node_modules/markdown-it/lib/parser_block.js");
-+var ParserInline = __webpack_require__(/*! ./parser_inline */ "./node_modules/markdown-it/lib/parser_inline.js");
-+var LinkifyIt    = __webpack_require__(/*! linkify-it */ "./node_modules/linkify-it/index.js");
-+var mdurl        = __webpack_require__(/*! mdurl */ "./node_modules/mdurl/index.js");
-+var punycode     = __webpack_require__(/*! punycode */ "./node_modules/punycode/punycode.js");
-+
-+
-+var config = {
-+  'default': __webpack_require__(/*! ./presets/default */ "./node_modules/markdown-it/lib/presets/default.js"),
-+  zero: __webpack_require__(/*! ./presets/zero */ "./node_modules/markdown-it/lib/presets/zero.js"),
-+  commonmark: __webpack_require__(/*! ./presets/commonmark */ "./node_modules/markdown-it/lib/presets/commonmark.js")
-+};
-+
-+////////////////////////////////////////////////////////////////////////////////
-+//
-+// This validator can prohibit more than really needed to prevent XSS. It's a
-+// tradeoff to keep code simple and to be secure by default.
-+//
-+// If you need different setup - override validator method as you wish. Or
-+// replace it with dummy function and use external sanitizer.
-+//
-+
-+var BAD_PROTO_RE = /^(vbscript|javascript|file|data):/;
-+var GOOD_DATA_RE = /^data:image\/(gif|png|jpeg|webp);/;
-+
-+function validateLink(url) {
-+  // url should be normalized at this point, and existing entities are decoded
-+  var str = url.trim().toLowerCase();
-+
-+  return BAD_PROTO_RE.test(str) ? (GOOD_DATA_RE.test(str) ? true : false) : true;
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+
-+
-+var RECODE_HOSTNAME_FOR = [ 'http:', 'https:', 'mailto:' ];
-+
-+function normalizeLink(url) {
-+  var parsed = mdurl.parse(url, true);
-+
-+  if (parsed.hostname) {
-+    // Encode hostnames in urls like:
-+    // `http://host/`, `https://host/`, `mailto:user@host`, `//host/`
-+    //
-+    // We don't encode unknown schemas, because it's likely that we encode
-+    // something we shouldn't (e.g. `skype:name` treated as `skype:host`)
-+    //
-+    if (!parsed.protocol || RECODE_HOSTNAME_FOR.indexOf(parsed.protocol) >= 0) {
-+      try {
-+        parsed.hostname = punycode.toASCII(parsed.hostname);
-+      } catch (er) { /**/ }
-+    }
-+  }
-+
-+  return mdurl.encode(mdurl.format(parsed));
-+}
-+
-+function normalizeLinkText(url) {
-+  var parsed = mdurl.parse(url, true);
-+
-+  if (parsed.hostname) {
-+    // Encode hostnames in urls like:
-+    // `http://host/`, `https://host/`, `mailto:user@host`, `//host/`
-+    //
-+    // We don't encode unknown schemas, because it's likely that we encode
-+    // something we shouldn't (e.g. `skype:name` treated as `skype:host`)
-+    //
-+    if (!parsed.protocol || RECODE_HOSTNAME_FOR.indexOf(parsed.protocol) >= 0) {
-+      try {
-+        parsed.hostname = punycode.toUnicode(parsed.hostname);
-+      } catch (er) { /**/ }
-+    }
-+  }
-+
-+  return mdurl.decode(mdurl.format(parsed));
-+}
-+
-+
-+/**
-+ * class MarkdownIt
-+ *
-+ * Main parser/renderer class.
-+ *
-+ * ##### Usage
-+ *
-+ * ```javascript
-+ * // node.js, "classic" way:
-+ * var MarkdownIt = require('markdown-it'),
-+ *     md = new MarkdownIt();
-+ * var result = md.render('# markdown-it rulezz!');
-+ *
-+ * // node.js, the same, but with sugar:
-+ * var md = require('markdown-it')();
-+ * var result = md.render('# markdown-it rulezz!');
-+ *
-+ * // browser without AMD, added to "window" on script load
-+ * // Note, there are no dash.
-+ * var md = window.markdownit();
-+ * var result = md.render('# markdown-it rulezz!');
-+ * ```
-+ *
-+ * Single line rendering, without paragraph wrap:
-+ *
-+ * ```javascript
-+ * var md = require('markdown-it')();
-+ * var result = md.renderInline('__markdown-it__ rulezz!');
-+ * ```
-+ **/
-+
-+/**
-+ * new MarkdownIt([presetName, options])
-+ * - presetName (String): optional, `commonmark` / `zero`
-+ * - options (Object)
-+ *
-+ * Creates parser instanse with given config. Can be called without `new`.
-+ *
-+ * ##### presetName
-+ *
-+ * MarkdownIt provides named presets as a convenience to quickly
-+ * enable/disable active syntax rules and options for common use cases.
-+ *
-+ * - ["commonmark"](https://github.com/markdown-it/markdown-it/blob/master/lib/presets/commonmark.js) -
-+ *   configures parser to strict [CommonMark](http://commonmark.org/) mode.
-+ * - [default](https://github.com/markdown-it/markdown-it/blob/master/lib/presets/default.js) -
-+ *   similar to GFM, used when no preset name given. Enables all available rules,
-+ *   but still without html, typographer & autolinker.
-+ * - ["zero"](https://github.com/markdown-it/markdown-it/blob/master/lib/presets/zero.js) -
-+ *   all rules disabled. Useful to quickly setup your config via `.enable()`.
-+ *   For example, when you need only `bold` and `italic` markup and nothing else.
-+ *
-+ * ##### options:
-+ *
-+ * - __html__ - `false`. Set `true` to enable HTML tags in source. Be careful!
-+ *   That's not safe! You may need external sanitizer to protect output from XSS.
-+ *   It's better to extend features via plugins, instead of enabling HTML.
-+ * - __xhtmlOut__ - `false`. Set `true` to add '/' when closing single tags
-+ *   (`<br />`). This is needed only for full CommonMark compatibility. In real
-+ *   world you will need HTML output.
-+ * - __breaks__ - `false`. Set `true` to convert `\n` in paragraphs into `<br>`.
-+ * - __langPrefix__ - `language-`. CSS language class prefix for fenced blocks.
-+ *   Can be useful for external highlighters.
-+ * - __linkify__ - `false`. Set `true` to autoconvert URL-like text to links.
-+ * - __typographer__  - `false`. Set `true` to enable [some language-neutral
-+ *   replacement](https://github.com/markdown-it/markdown-it/blob/master/lib/rules_core/replacements.js) +
-+ *   quotes beautification (smartquotes).
-+ * - __quotes__ - `“”‘’`, String or Array. Double + single quotes replacement
-+ *   pairs, when typographer enabled and smartquotes on. For example, you can
-+ *   use `'«»„“'` for Russian, `'„“‚‘'` for German, and
-+ *   `['«\xA0', '\xA0»', '‹\xA0', '\xA0›']` for French (including nbsp).
-+ * - __highlight__ - `null`. Highlighter function for fenced code blocks.
-+ *   Highlighter `function (str, lang)` should return escaped HTML. It can also
-+ *   return empty string if the source was not changed and should be escaped
-+ *   externaly. If result starts with <pre... internal wrapper is skipped.
-+ *
-+ * ##### Example
-+ *
-+ * ```javascript
-+ * // commonmark mode
-+ * var md = require('markdown-it')('commonmark');
-+ *
-+ * // default mode
-+ * var md = require('markdown-it')();
-+ *
-+ * // enable everything
-+ * var md = require('markdown-it')({
-+ *   html: true,
-+ *   linkify: true,
-+ *   typographer: true
-+ * });
-+ * ```
-+ *
-+ * ##### Syntax highlighting
-+ *
-+ * ```js
-+ * var hljs = require('highlight.js') // https://highlightjs.org/
-+ *
-+ * var md = require('markdown-it')({
-+ *   highlight: function (str, lang) {
-+ *     if (lang && hljs.getLanguage(lang)) {
-+ *       try {
-+ *         return hljs.highlight(lang, str, true).value;
-+ *       } catch (__) {}
-+ *     }
-+ *
-+ *     return ''; // use external default escaping
-+ *   }
-+ * });
-+ * ```
-+ *
-+ * Or with full wrapper override (if you need assign class to `<pre>`):
-+ *
-+ * ```javascript
-+ * var hljs = require('highlight.js') // https://highlightjs.org/
-+ *
-+ * // Actual default values
-+ * var md = require('markdown-it')({
-+ *   highlight: function (str, lang) {
-+ *     if (lang && hljs.getLanguage(lang)) {
-+ *       try {
-+ *         return '<pre class="hljs"><code>' +
-+ *                hljs.highlight(lang, str, true).value +
-+ *                '</code></pre>';
-+ *       } catch (__) {}
-+ *     }
-+ *
-+ *     return '<pre class="hljs"><code>' + md.utils.escapeHtml(str) + '</code></pre>';
-+ *   }
-+ * });
-+ * ```
-+ *
-+ **/
-+function MarkdownIt(presetName, options) {
-+  if (!(this instanceof MarkdownIt)) {
-+    return new MarkdownIt(presetName, options);
-+  }
-+
-+  if (!options) {
-+    if (!utils.isString(presetName)) {
-+      options = presetName || {};
-+      presetName = 'default';
-+    }
-+  }
-+
-+  /**
-+   * MarkdownIt#inline -> ParserInline
-+   *
-+   * Instance of [[ParserInline]]. You may need it to add new rules when
-+   * writing plugins. For simple rules control use [[MarkdownIt.disable]] and
-+   * [[MarkdownIt.enable]].
-+   **/
-+  this.inline = new ParserInline();
-+
-+  /**
-+   * MarkdownIt#block -> ParserBlock
-+   *
-+   * Instance of [[ParserBlock]]. You may need it to add new rules when
-+   * writing plugins. For simple rules control use [[MarkdownIt.disable]] and
-+   * [[MarkdownIt.enable]].
-+   **/
-+  this.block = new ParserBlock();
-+
-+  /**
-+   * MarkdownIt#core -> Core
-+   *
-+   * Instance of [[Core]] chain executor. You may need it to add new rules when
-+   * writing plugins. For simple rules control use [[MarkdownIt.disable]] and
-+   * [[MarkdownIt.enable]].
-+   **/
-+  this.core = new ParserCore();
-+
-+  /**
-+   * MarkdownIt#renderer -> Renderer
-+   *
-+   * Instance of [[Renderer]]. Use it to modify output look. Or to add rendering
-+   * rules for new token types, generated by plugins.
-+   *
-+   * ##### Example
-+   *
-+   * ```javascript
-+   * var md = require('markdown-it')();
-+   *
-+   * function myToken(tokens, idx, options, env, self) {
-+   *   //...
-+   *   return result;
-+   * };
-+   *
-+   * md.renderer.rules['my_token'] = myToken
-+   * ```
-+   *
-+   * See [[Renderer]] docs and [source code](https://github.com/markdown-it/markdown-it/blob/master/lib/renderer.js).
-+   **/
-+  this.renderer = new Renderer();
-+
-+  /**
-+   * MarkdownIt#linkify -> LinkifyIt
-+   *
-+   * [linkify-it](https://github.com/markdown-it/linkify-it) instance.
-+   * Used by [linkify](https://github.com/markdown-it/markdown-it/blob/master/lib/rules_core/linkify.js)
-+   * rule.
-+   **/
-+  this.linkify = new LinkifyIt();
-+
-+  /**
-+   * MarkdownIt#validateLink(url) -> Boolean
-+   *
-+   * Link validation function. CommonMark allows too much in links. By default
-+   * we disable `javascript:`, `vbscript:`, `file:` schemas, and almost all `data:...` schemas
-+   * except some embedded image types.
-+   *
-+   * You can change this behaviour:
-+   *
-+   * ```javascript
-+   * var md = require('markdown-it')();
-+   * // enable everything
-+   * md.validateLink = function () { return true; }
-+   * ```
-+   **/
-+  this.validateLink = validateLink;
-+
-+  /**
-+   * MarkdownIt#normalizeLink(url) -> String
-+   *
-+   * Function used to encode link url to a machine-readable format,
-+   * which includes url-encoding, punycode, etc.
-+   **/
-+  this.normalizeLink = normalizeLink;
-+
-+  /**
-+   * MarkdownIt#normalizeLinkText(url) -> String
-+   *
-+   * Function used to decode link url to a human-readable format`
-+   **/
-+  this.normalizeLinkText = normalizeLinkText;
-+
-+
-+  // Expose utils & helpers for easy acces from plugins
-+
-+  /**
-+   * MarkdownIt#utils -> utils
-+   *
-+   * Assorted utility functions, useful to write plugins. See details
-+   * [here](https://github.com/markdown-it/markdown-it/blob/master/lib/common/utils.js).
-+   **/
-+  this.utils = utils;
-+
-+  /**
-+   * MarkdownIt#helpers -> helpers
-+   *
-+   * Link components parser functions, useful to write plugins. See details
-+   * [here](https://github.com/markdown-it/markdown-it/blob/master/lib/helpers).
-+   **/
-+  this.helpers = utils.assign({}, helpers);
-+
-+
-+  this.options = {};
-+  this.configure(presetName);
-+
-+  if (options) { this.set(options); }
-+}
-+
-+
-+/** chainable
-+ * MarkdownIt.set(options)
-+ *
-+ * Set parser options (in the same format as in constructor). Probably, you
-+ * will never need it, but you can change options after constructor call.
-+ *
-+ * ##### Example
-+ *
-+ * ```javascript
-+ * var md = require('markdown-it')()
-+ *             .set({ html: true, breaks: true })
-+ *             .set({ typographer, true });
-+ * ```
-+ *
-+ * __Note:__ To achieve the best possible performance, don't modify a
-+ * `markdown-it` instance options on the fly. If you need multiple configurations
-+ * it's best to create multiple instances and initialize each with separate
-+ * config.
-+ **/
-+MarkdownIt.prototype.set = function (options) {
-+  utils.assign(this.options, options);
-+  return this;
-+};
-+
-+
-+/** chainable, internal
-+ * MarkdownIt.configure(presets)
-+ *
-+ * Batch load of all options and compenent settings. This is internal method,
-+ * and you probably will not need it. But if you with - see available presets
-+ * and data structure [here](https://github.com/markdown-it/markdown-it/tree/master/lib/presets)
-+ *
-+ * We strongly recommend to use presets instead of direct config loads. That
-+ * will give better compatibility with next versions.
-+ **/
-+MarkdownIt.prototype.configure = function (presets) {
-+  var self = this, presetName;
-+
-+  if (utils.isString(presets)) {
-+    presetName = presets;
-+    presets = config[presetName];
-+    if (!presets) { throw new Error('Wrong `markdown-it` preset "' + presetName + '", check name'); }
-+  }
-+
-+  if (!presets) { throw new Error('Wrong `markdown-it` preset, can\'t be empty'); }
-+
-+  if (presets.options) { self.set(presets.options); }
-+
-+  if (presets.components) {
-+    Object.keys(presets.components).forEach(function (name) {
-+      if (presets.components[name].rules) {
-+        self[name].ruler.enableOnly(presets.components[name].rules);
-+      }
-+      if (presets.components[name].rules2) {
-+        self[name].ruler2.enableOnly(presets.components[name].rules2);
-+      }
-+    });
-+  }
-+  return this;
-+};
-+
-+
-+/** chainable
-+ * MarkdownIt.enable(list, ignoreInvalid)
-+ * - list (String|Array): rule name or list of rule names to enable
-+ * - ignoreInvalid (Boolean): set `true` to ignore errors when rule not found.
-+ *
-+ * Enable list or rules. It will automatically find appropriate components,
-+ * containing rules with given names. If rule not found, and `ignoreInvalid`
-+ * not set - throws exception.
-+ *
-+ * ##### Example
-+ *
-+ * ```javascript
-+ * var md = require('markdown-it')()
-+ *             .enable(['sub', 'sup'])
-+ *             .disable('smartquotes');
-+ * ```
-+ **/
-+MarkdownIt.prototype.enable = function (list, ignoreInvalid) {
-+  var result = [];
-+
-+  if (!Array.isArray(list)) { list = [ list ]; }
-+
-+  [ 'core', 'block', 'inline' ].forEach(function (chain) {
-+    result = result.concat(this[chain].ruler.enable(list, true));
-+  }, this);
-+
-+  result = result.concat(this.inline.ruler2.enable(list, true));
-+
-+  var missed = list.filter(function (name) { return result.indexOf(name) < 0; });
-+
-+  if (missed.length && !ignoreInvalid) {
-+    throw new Error('MarkdownIt. Failed to enable unknown rule(s): ' + missed);
-+  }
-+
-+  return this;
-+};
-+
-+
-+/** chainable
-+ * MarkdownIt.disable(list, ignoreInvalid)
-+ * - list (String|Array): rule name or list of rule names to disable.
-+ * - ignoreInvalid (Boolean): set `true` to ignore errors when rule not found.
-+ *
-+ * The same as [[MarkdownIt.enable]], but turn specified rules off.
-+ **/
-+MarkdownIt.prototype.disable = function (list, ignoreInvalid) {
-+  var result = [];
-+
-+  if (!Array.isArray(list)) { list = [ list ]; }
-+
-+  [ 'core', 'block', 'inline' ].forEach(function (chain) {
-+    result = result.concat(this[chain].ruler.disable(list, true));
-+  }, this);
-+
-+  result = result.concat(this.inline.ruler2.disable(list, true));
-+
-+  var missed = list.filter(function (name) { return result.indexOf(name) < 0; });
-+
-+  if (missed.length && !ignoreInvalid) {
-+    throw new Error('MarkdownIt. Failed to disable unknown rule(s): ' + missed);
-+  }
-+  return this;
-+};
-+
-+
-+/** chainable
-+ * MarkdownIt.use(plugin, params)
-+ *
-+ * Load specified plugin with given params into current parser instance.
-+ * It's just a sugar to call `plugin(md, params)` with curring.
-+ *
-+ * ##### Example
-+ *
-+ * ```javascript
-+ * var iterator = require('markdown-it-for-inline');
-+ * var md = require('markdown-it')()
-+ *             .use(iterator, 'foo_replace', 'text', function (tokens, idx) {
-+ *               tokens[idx].content = tokens[idx].content.replace(/foo/g, 'bar');
-+ *             });
-+ * ```
-+ **/
-+MarkdownIt.prototype.use = function (plugin /*, params, ... */) {
-+  var args = [ this ].concat(Array.prototype.slice.call(arguments, 1));
-+  plugin.apply(plugin, args);
-+  return this;
-+};
-+
-+
-+/** internal
-+ * MarkdownIt.parse(src, env) -> Array
-+ * - src (String): source string
-+ * - env (Object): environment sandbox
-+ *
-+ * Parse input string and returns list of block tokens (special token type
-+ * "inline" will contain list of inline tokens). You should not call this
-+ * method directly, until you write custom renderer (for example, to produce
-+ * AST).
-+ *
-+ * `env` is used to pass data between "distributed" rules and return additional
-+ * metadata like reference info, needed for the renderer. It also can be used to
-+ * inject data in specific cases. Usually, you will be ok to pass `{}`,
-+ * and then pass updated object to renderer.
-+ **/
-+MarkdownIt.prototype.parse = function (src, env) {
-+  if (typeof src !== 'string') {
-+    throw new Error('Input data should be a String');
-+  }
-+
-+  var state = new this.core.State(src, this, env);
-+
-+  this.core.process(state);
-+
-+  return state.tokens;
-+};
-+
-+
-+/**
-+ * MarkdownIt.render(src [, env]) -> String
-+ * - src (String): source string
-+ * - env (Object): environment sandbox
-+ *
-+ * Render markdown string into html. It does all magic for you :).
-+ *
-+ * `env` can be used to inject additional metadata (`{}` by default).
-+ * But you will not need it with high probability. See also comment
-+ * in [[MarkdownIt.parse]].
-+ **/
-+MarkdownIt.prototype.render = function (src, env) {
-+  env = env || {};
-+
-+  return this.renderer.render(this.parse(src, env), this.options, env);
-+};
-+
-+
-+/** internal
-+ * MarkdownIt.parseInline(src, env) -> Array
-+ * - src (String): source string
-+ * - env (Object): environment sandbox
-+ *
-+ * The same as [[MarkdownIt.parse]] but skip all block rules. It returns the
-+ * block tokens list with the single `inline` element, containing parsed inline
-+ * tokens in `children` property. Also updates `env` object.
-+ **/
-+MarkdownIt.prototype.parseInline = function (src, env) {
-+  var state = new this.core.State(src, this, env);
-+
-+  state.inlineMode = true;
-+  this.core.process(state);
-+
-+  return state.tokens;
-+};
-+
-+
-+/**
-+ * MarkdownIt.renderInline(src [, env]) -> String
-+ * - src (String): source string
-+ * - env (Object): environment sandbox
-+ *
-+ * Similar to [[MarkdownIt.render]] but for single paragraph content. Result
-+ * will NOT be wrapped into `<p>` tags.
-+ **/
-+MarkdownIt.prototype.renderInline = function (src, env) {
-+  env = env || {};
-+
-+  return this.renderer.render(this.parseInline(src, env), this.options, env);
-+};
-+
-+
-+module.exports = MarkdownIt;
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/parser_block.js":
-+/*!******************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/parser_block.js ***!
-+  \******************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+/** internal
-+ * class ParserBlock
-+ *
-+ * Block-level tokenizer.
-+ **/
-+
-+
-+
-+var Ruler           = __webpack_require__(/*! ./ruler */ "./node_modules/markdown-it/lib/ruler.js");
-+
-+
-+var _rules = [
-+  // First 2 params - rule name & source. Secondary array - list of rules,
-+  // which can be terminated by this one.
-+  [ 'table',      __webpack_require__(/*! ./rules_block/table */ "./node_modules/markdown-it/lib/rules_block/table.js"),      [ 'paragraph', 'reference' ] ],
-+  [ 'code',       __webpack_require__(/*! ./rules_block/code */ "./node_modules/markdown-it/lib/rules_block/code.js") ],
-+  [ 'fence',      __webpack_require__(/*! ./rules_block/fence */ "./node_modules/markdown-it/lib/rules_block/fence.js"),      [ 'paragraph', 'reference', 'blockquote', 'list' ] ],
-+  [ 'blockquote', __webpack_require__(/*! ./rules_block/blockquote */ "./node_modules/markdown-it/lib/rules_block/blockquote.js"), [ 'paragraph', 'reference', 'blockquote', 'list' ] ],
-+  [ 'hr',         __webpack_require__(/*! ./rules_block/hr */ "./node_modules/markdown-it/lib/rules_block/hr.js"),         [ 'paragraph', 'reference', 'blockquote', 'list' ] ],
-+  [ 'list',       __webpack_require__(/*! ./rules_block/list */ "./node_modules/markdown-it/lib/rules_block/list.js"),       [ 'paragraph', 'reference', 'blockquote' ] ],
-+  [ 'reference',  __webpack_require__(/*! ./rules_block/reference */ "./node_modules/markdown-it/lib/rules_block/reference.js") ],
-+  [ 'heading',    __webpack_require__(/*! ./rules_block/heading */ "./node_modules/markdown-it/lib/rules_block/heading.js"),    [ 'paragraph', 'reference', 'blockquote' ] ],
-+  [ 'lheading',   __webpack_require__(/*! ./rules_block/lheading */ "./node_modules/markdown-it/lib/rules_block/lheading.js") ],
-+  [ 'html_block', __webpack_require__(/*! ./rules_block/html_block */ "./node_modules/markdown-it/lib/rules_block/html_block.js"), [ 'paragraph', 'reference', 'blockquote' ] ],
-+  [ 'paragraph',  __webpack_require__(/*! ./rules_block/paragraph */ "./node_modules/markdown-it/lib/rules_block/paragraph.js") ]
-+];
-+
-+
-+/**
-+ * new ParserBlock()
-+ **/
-+function ParserBlock() {
-+  /**
-+   * ParserBlock#ruler -> Ruler
-+   *
-+   * [[Ruler]] instance. Keep configuration of block rules.
-+   **/
-+  this.ruler = new Ruler();
-+
-+  for (var i = 0; i < _rules.length; i++) {
-+    this.ruler.push(_rules[i][0], _rules[i][1], { alt: (_rules[i][2] || []).slice() });
-+  }
-+}
-+
-+
-+// Generate tokens for input range
-+//
-+ParserBlock.prototype.tokenize = function (state, startLine, endLine) {
-+  var ok, i,
-+      rules = this.ruler.getRules(''),
-+      len = rules.length,
-+      line = startLine,
-+      hasEmptyLines = false,
-+      maxNesting = state.md.options.maxNesting;
-+
-+  while (line < endLine) {
-+    state.line = line = state.skipEmptyLines(line);
-+    if (line >= endLine) { break; }
-+
-+    // Termination condition for nested calls.
-+    // Nested calls currently used for blockquotes & lists
-+    if (state.sCount[line] < state.blkIndent) { break; }
-+
-+    // If nesting level exceeded - skip tail to the end. That's not ordinary
-+    // situation and we should not care about content.
-+    if (state.level >= maxNesting) {
-+      state.line = endLine;
-+      break;
-+    }
-+
-+    // Try all possible rules.
-+    // On success, rule should:
-+    //
-+    // - update `state.line`
-+    // - update `state.tokens`
-+    // - return true
-+
-+    for (i = 0; i < len; i++) {
-+      ok = rules[i](state, line, endLine, false);
-+      if (ok) { break; }
-+    }
-+
-+    // set state.tight if we had an empty line before current tag
-+    // i.e. latest empty line should not count
-+    state.tight = !hasEmptyLines;
-+
-+    // paragraph might "eat" one newline after it in nested lists
-+    if (state.isEmpty(state.line - 1)) {
-+      hasEmptyLines = true;
-+    }
-+
-+    line = state.line;
-+
-+    if (line < endLine && state.isEmpty(line)) {
-+      hasEmptyLines = true;
-+      line++;
-+      state.line = line;
-+    }
-+  }
-+};
-+
-+
-+/**
-+ * ParserBlock.parse(str, md, env, outTokens)
-+ *
-+ * Process input string and push block tokens into `outTokens`
-+ **/
-+ParserBlock.prototype.parse = function (src, md, env, outTokens) {
-+  var state;
-+
-+  if (!src) { return; }
-+
-+  state = new this.State(src, md, env, outTokens);
-+
-+  this.tokenize(state, state.line, state.lineMax);
-+};
-+
-+
-+ParserBlock.prototype.State = __webpack_require__(/*! ./rules_block/state_block */ "./node_modules/markdown-it/lib/rules_block/state_block.js");
-+
-+
-+module.exports = ParserBlock;
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/parser_core.js":
-+/*!*****************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/parser_core.js ***!
-+  \*****************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+/** internal
-+ * class Core
-+ *
-+ * Top-level rules executor. Glues block/inline parsers and does intermediate
-+ * transformations.
-+ **/
-+
-+
-+
-+var Ruler  = __webpack_require__(/*! ./ruler */ "./node_modules/markdown-it/lib/ruler.js");
-+
-+
-+var _rules = [
-+  [ 'normalize',      __webpack_require__(/*! ./rules_core/normalize */ "./node_modules/markdown-it/lib/rules_core/normalize.js")      ],
-+  [ 'block',          __webpack_require__(/*! ./rules_core/block */ "./node_modules/markdown-it/lib/rules_core/block.js")          ],
-+  [ 'inline',         __webpack_require__(/*! ./rules_core/inline */ "./node_modules/markdown-it/lib/rules_core/inline.js")         ],
-+  [ 'linkify',        __webpack_require__(/*! ./rules_core/linkify */ "./node_modules/markdown-it/lib/rules_core/linkify.js")        ],
-+  [ 'replacements',   __webpack_require__(/*! ./rules_core/replacements */ "./node_modules/markdown-it/lib/rules_core/replacements.js")   ],
-+  [ 'smartquotes',    __webpack_require__(/*! ./rules_core/smartquotes */ "./node_modules/markdown-it/lib/rules_core/smartquotes.js")    ]
-+];
-+
-+
-+/**
-+ * new Core()
-+ **/
-+function Core() {
-+  /**
-+   * Core#ruler -> Ruler
-+   *
-+   * [[Ruler]] instance. Keep configuration of core rules.
-+   **/
-+  this.ruler = new Ruler();
-+
-+  for (var i = 0; i < _rules.length; i++) {
-+    this.ruler.push(_rules[i][0], _rules[i][1]);
-+  }
-+}
-+
-+
-+/**
-+ * Core.process(state)
-+ *
-+ * Executes core chain rules.
-+ **/
-+Core.prototype.process = function (state) {
-+  var i, l, rules;
-+
-+  rules = this.ruler.getRules('');
-+
-+  for (i = 0, l = rules.length; i < l; i++) {
-+    rules[i](state);
-+  }
-+};
-+
-+Core.prototype.State = __webpack_require__(/*! ./rules_core/state_core */ "./node_modules/markdown-it/lib/rules_core/state_core.js");
-+
-+
-+module.exports = Core;
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/parser_inline.js":
-+/*!*******************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/parser_inline.js ***!
-+  \*******************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+/** internal
-+ * class ParserInline
-+ *
-+ * Tokenizes paragraph content.
-+ **/
-+
-+
-+
-+var Ruler           = __webpack_require__(/*! ./ruler */ "./node_modules/markdown-it/lib/ruler.js");
-+
-+
-+////////////////////////////////////////////////////////////////////////////////
-+// Parser rules
-+
-+var _rules = [
-+  [ 'text',            __webpack_require__(/*! ./rules_inline/text */ "./node_modules/markdown-it/lib/rules_inline/text.js") ],
-+  [ 'newline',         __webpack_require__(/*! ./rules_inline/newline */ "./node_modules/markdown-it/lib/rules_inline/newline.js") ],
-+  [ 'escape',          __webpack_require__(/*! ./rules_inline/escape */ "./node_modules/markdown-it/lib/rules_inline/escape.js") ],
-+  [ 'backticks',       __webpack_require__(/*! ./rules_inline/backticks */ "./node_modules/markdown-it/lib/rules_inline/backticks.js") ],
-+  [ 'strikethrough',   __webpack_require__(/*! ./rules_inline/strikethrough */ "./node_modules/markdown-it/lib/rules_inline/strikethrough.js").tokenize ],
-+  [ 'emphasis',        __webpack_require__(/*! ./rules_inline/emphasis */ "./node_modules/markdown-it/lib/rules_inline/emphasis.js").tokenize ],
-+  [ 'link',            __webpack_require__(/*! ./rules_inline/link */ "./node_modules/markdown-it/lib/rules_inline/link.js") ],
-+  [ 'image',           __webpack_require__(/*! ./rules_inline/image */ "./node_modules/markdown-it/lib/rules_inline/image.js") ],
-+  [ 'autolink',        __webpack_require__(/*! ./rules_inline/autolink */ "./node_modules/markdown-it/lib/rules_inline/autolink.js") ],
-+  [ 'html_inline',     __webpack_require__(/*! ./rules_inline/html_inline */ "./node_modules/markdown-it/lib/rules_inline/html_inline.js") ],
-+  [ 'entity',          __webpack_require__(/*! ./rules_inline/entity */ "./node_modules/markdown-it/lib/rules_inline/entity.js") ]
-+];
-+
-+var _rules2 = [
-+  [ 'balance_pairs',   __webpack_require__(/*! ./rules_inline/balance_pairs */ "./node_modules/markdown-it/lib/rules_inline/balance_pairs.js") ],
-+  [ 'strikethrough',   __webpack_require__(/*! ./rules_inline/strikethrough */ "./node_modules/markdown-it/lib/rules_inline/strikethrough.js").postProcess ],
-+  [ 'emphasis',        __webpack_require__(/*! ./rules_inline/emphasis */ "./node_modules/markdown-it/lib/rules_inline/emphasis.js").postProcess ],
-+  [ 'text_collapse',   __webpack_require__(/*! ./rules_inline/text_collapse */ "./node_modules/markdown-it/lib/rules_inline/text_collapse.js") ]
-+];
-+
-+
-+/**
-+ * new ParserInline()
-+ **/
-+function ParserInline() {
-+  var i;
-+
-+  /**
-+   * ParserInline#ruler -> Ruler
-+   *
-+   * [[Ruler]] instance. Keep configuration of inline rules.
-+   **/
-+  this.ruler = new Ruler();
-+
-+  for (i = 0; i < _rules.length; i++) {
-+    this.ruler.push(_rules[i][0], _rules[i][1]);
-+  }
-+
-+  /**
-+   * ParserInline#ruler2 -> Ruler
-+   *
-+   * [[Ruler]] instance. Second ruler used for post-processing
-+   * (e.g. in emphasis-like rules).
-+   **/
-+  this.ruler2 = new Ruler();
-+
-+  for (i = 0; i < _rules2.length; i++) {
-+    this.ruler2.push(_rules2[i][0], _rules2[i][1]);
-+  }
-+}
-+
-+
-+// Skip single token by running all rules in validation mode;
-+// returns `true` if any rule reported success
-+//
-+ParserInline.prototype.skipToken = function (state) {
-+  var ok, i, pos = state.pos,
-+      rules = this.ruler.getRules(''),
-+      len = rules.length,
-+      maxNesting = state.md.options.maxNesting,
-+      cache = state.cache;
-+
-+
-+  if (typeof cache[pos] !== 'undefined') {
-+    state.pos = cache[pos];
-+    return;
-+  }
-+
-+  if (state.level < maxNesting) {
-+    for (i = 0; i < len; i++) {
-+      // Increment state.level and decrement it later to limit recursion.
-+      // It's harmless to do here, because no tokens are created. But ideally,
-+      // we'd need a separate private state variable for this purpose.
-+      //
-+      state.level++;
-+      ok = rules[i](state, true);
-+      state.level--;
-+
-+      if (ok) { break; }
-+    }
-+  } else {
-+    // Too much nesting, just skip until the end of the paragraph.
-+    //
-+    // NOTE: this will cause links to behave incorrectly in the following case,
-+    //       when an amount of `[` is exactly equal to `maxNesting + 1`:
-+    //
-+    //       [[[[[[[[[[[[[[[[[[[[[foo]()
-+    //
-+    // TODO: remove this workaround when CM standard will allow nested links
-+    //       (we can replace it by preventing links from being parsed in
-+    //       validation mode)
-+    //
-+    state.pos = state.posMax;
-+  }
-+
-+  if (!ok) { state.pos++; }
-+  cache[pos] = state.pos;
-+};
-+
-+
-+// Generate tokens for input range
-+//
-+ParserInline.prototype.tokenize = function (state) {
-+  var ok, i,
-+      rules = this.ruler.getRules(''),
-+      len = rules.length,
-+      end = state.posMax,
-+      maxNesting = state.md.options.maxNesting;
-+
-+  while (state.pos < end) {
-+    // Try all possible rules.
-+    // On success, rule should:
-+    //
-+    // - update `state.pos`
-+    // - update `state.tokens`
-+    // - return true
-+
-+    if (state.level < maxNesting) {
-+      for (i = 0; i < len; i++) {
-+        ok = rules[i](state, false);
-+        if (ok) { break; }
-+      }
-+    }
-+
-+    if (ok) {
-+      if (state.pos >= end) { break; }
-+      continue;
-+    }
-+
-+    state.pending += state.src[state.pos++];
-+  }
-+
-+  if (state.pending) {
-+    state.pushPending();
-+  }
-+};
-+
-+
-+/**
-+ * ParserInline.parse(str, md, env, outTokens)
-+ *
-+ * Process input string and push inline tokens into `outTokens`
-+ **/
-+ParserInline.prototype.parse = function (str, md, env, outTokens) {
-+  var i, rules, len;
-+  var state = new this.State(str, md, env, outTokens);
-+
-+  this.tokenize(state);
-+
-+  rules = this.ruler2.getRules('');
-+  len = rules.length;
-+
-+  for (i = 0; i < len; i++) {
-+    rules[i](state);
-+  }
-+};
-+
-+
-+ParserInline.prototype.State = __webpack_require__(/*! ./rules_inline/state_inline */ "./node_modules/markdown-it/lib/rules_inline/state_inline.js");
-+
-+
-+module.exports = ParserInline;
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/presets/commonmark.js":
-+/*!************************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/presets/commonmark.js ***!
-+  \************************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// Commonmark default options
-+
-+
-+
-+
-+module.exports = {
-+  options: {
-+    html:         true,         // Enable HTML tags in source
-+    xhtmlOut:     true,         // Use '/' to close single tags (<br />)
-+    breaks:       false,        // Convert '\n' in paragraphs into <br>
-+    langPrefix:   'language-',  // CSS language prefix for fenced blocks
-+    linkify:      false,        // autoconvert URL-like texts to links
-+
-+    // Enable some language-neutral replacements + quotes beautification
-+    typographer:  false,
-+
-+    // Double + single quotes replacement pairs, when typographer enabled,
-+    // and smartquotes on. Could be either a String or an Array.
-+    //
-+    // For example, you can use '«»„“' for Russian, '„“‚‘' for German,
-+    // and ['«\xA0', '\xA0»', '‹\xA0', '\xA0›'] for French (including nbsp).
-+    quotes: '\u201c\u201d\u2018\u2019', /* “”‘’ */
-+
-+    // Highlighter function. Should return escaped HTML,
-+    // or '' if the source string is not changed and should be escaped externaly.
-+    // If result starts with <pre... internal wrapper is skipped.
-+    //
-+    // function (/*str, lang*/) { return ''; }
-+    //
-+    highlight: null,
-+
-+    maxNesting:   20            // Internal protection, recursion limit
-+  },
-+
-+  components: {
-+
-+    core: {
-+      rules: [
-+        'normalize',
-+        'block',
-+        'inline'
-+      ]
-+    },
-+
-+    block: {
-+      rules: [
-+        'blockquote',
-+        'code',
-+        'fence',
-+        'heading',
-+        'hr',
-+        'html_block',
-+        'lheading',
-+        'list',
-+        'reference',
-+        'paragraph'
-+      ]
-+    },
-+
-+    inline: {
-+      rules: [
-+        'autolink',
-+        'backticks',
-+        'emphasis',
-+        'entity',
-+        'escape',
-+        'html_inline',
-+        'image',
-+        'link',
-+        'newline',
-+        'text'
-+      ],
-+      rules2: [
-+        'balance_pairs',
-+        'emphasis',
-+        'text_collapse'
-+      ]
-+    }
-+  }
-+};
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/presets/default.js":
-+/*!*********************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/presets/default.js ***!
-+  \*********************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// markdown-it default options
-+
-+
-+
-+
-+module.exports = {
-+  options: {
-+    html:         false,        // Enable HTML tags in source
-+    xhtmlOut:     false,        // Use '/' to close single tags (<br />)
-+    breaks:       false,        // Convert '\n' in paragraphs into <br>
-+    langPrefix:   'language-',  // CSS language prefix for fenced blocks
-+    linkify:      false,        // autoconvert URL-like texts to links
-+
-+    // Enable some language-neutral replacements + quotes beautification
-+    typographer:  false,
-+
-+    // Double + single quotes replacement pairs, when typographer enabled,
-+    // and smartquotes on. Could be either a String or an Array.
-+    //
-+    // For example, you can use '«»„“' for Russian, '„“‚‘' for German,
-+    // and ['«\xA0', '\xA0»', '‹\xA0', '\xA0›'] for French (including nbsp).
-+    quotes: '\u201c\u201d\u2018\u2019', /* “”‘’ */
-+
-+    // Highlighter function. Should return escaped HTML,
-+    // or '' if the source string is not changed and should be escaped externaly.
-+    // If result starts with <pre... internal wrapper is skipped.
-+    //
-+    // function (/*str, lang*/) { return ''; }
-+    //
-+    highlight: null,
-+
-+    maxNesting:   100            // Internal protection, recursion limit
-+  },
-+
-+  components: {
-+
-+    core: {},
-+    block: {},
-+    inline: {}
-+  }
-+};
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/presets/zero.js":
-+/*!******************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/presets/zero.js ***!
-+  \******************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// "Zero" preset, with nothing enabled. Useful for manual configuring of simple
-+// modes. For example, to parse bold/italic only.
-+
-+
-+
-+
-+module.exports = {
-+  options: {
-+    html:         false,        // Enable HTML tags in source
-+    xhtmlOut:     false,        // Use '/' to close single tags (<br />)
-+    breaks:       false,        // Convert '\n' in paragraphs into <br>
-+    langPrefix:   'language-',  // CSS language prefix for fenced blocks
-+    linkify:      false,        // autoconvert URL-like texts to links
-+
-+    // Enable some language-neutral replacements + quotes beautification
-+    typographer:  false,
-+
-+    // Double + single quotes replacement pairs, when typographer enabled,
-+    // and smartquotes on. Could be either a String or an Array.
-+    //
-+    // For example, you can use '«»„“' for Russian, '„“‚‘' for German,
-+    // and ['«\xA0', '\xA0»', '‹\xA0', '\xA0›'] for French (including nbsp).
-+    quotes: '\u201c\u201d\u2018\u2019', /* “”‘’ */
-+
-+    // Highlighter function. Should return escaped HTML,
-+    // or '' if the source string is not changed and should be escaped externaly.
-+    // If result starts with <pre... internal wrapper is skipped.
-+    //
-+    // function (/*str, lang*/) { return ''; }
-+    //
-+    highlight: null,
-+
-+    maxNesting:   20            // Internal protection, recursion limit
-+  },
-+
-+  components: {
-+
-+    core: {
-+      rules: [
-+        'normalize',
-+        'block',
-+        'inline'
-+      ]
-+    },
-+
-+    block: {
-+      rules: [
-+        'paragraph'
-+      ]
-+    },
-+
-+    inline: {
-+      rules: [
-+        'text'
-+      ],
-+      rules2: [
-+        'balance_pairs',
-+        'text_collapse'
-+      ]
-+    }
-+  }
-+};
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/renderer.js":
-+/*!**************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/renderer.js ***!
-+  \**************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+/**
-+ * class Renderer
-+ *
-+ * Generates HTML from parsed token stream. Each instance has independent
-+ * copy of rules. Those can be rewritten with ease. Also, you can add new
-+ * rules if you create plugin and adds new token types.
-+ **/
-+
-+
-+
-+var assign          = __webpack_require__(/*! ./common/utils */ "./node_modules/markdown-it/lib/common/utils.js").assign;
-+var unescapeAll     = __webpack_require__(/*! ./common/utils */ "./node_modules/markdown-it/lib/common/utils.js").unescapeAll;
-+var escapeHtml      = __webpack_require__(/*! ./common/utils */ "./node_modules/markdown-it/lib/common/utils.js").escapeHtml;
-+
-+
-+////////////////////////////////////////////////////////////////////////////////
-+
-+var default_rules = {};
-+
-+
-+default_rules.code_inline = function (tokens, idx, options, env, slf) {
-+  var token = tokens[idx];
-+
-+  return  '<code' + slf.renderAttrs(token) + '>' +
-+          escapeHtml(tokens[idx].content) +
-+          '</code>';
-+};
-+
-+
-+default_rules.code_block = function (tokens, idx, options, env, slf) {
-+  var token = tokens[idx];
-+
-+  return  '<pre' + slf.renderAttrs(token) + '><code>' +
-+          escapeHtml(tokens[idx].content) +
-+          '</code></pre>\n';
-+};
-+
-+
-+default_rules.fence = function (tokens, idx, options, env, slf) {
-+  var token = tokens[idx],
-+      info = token.info ? unescapeAll(token.info).trim() : '',
-+      langName = '',
-+      highlighted, i, tmpAttrs, tmpToken;
-+
-+  if (info) {
-+    langName = info.split(/\s+/g)[0];
-+  }
-+
-+  if (options.highlight) {
-+    highlighted = options.highlight(token.content, langName) || escapeHtml(token.content);
-+  } else {
-+    highlighted = escapeHtml(token.content);
-+  }
-+
-+  if (highlighted.indexOf('<pre') === 0) {
-+    return highlighted + '\n';
-+  }
-+
-+  // If language exists, inject class gently, without modifying original token.
-+  // May be, one day we will add .clone() for token and simplify this part, but
-+  // now we prefer to keep things local.
-+  if (info) {
-+    i        = token.attrIndex('class');
-+    tmpAttrs = token.attrs ? token.attrs.slice() : [];
-+
-+    if (i < 0) {
-+      tmpAttrs.push([ 'class', options.langPrefix + langName ]);
-+    } else {
-+      tmpAttrs[i][1] += ' ' + options.langPrefix + langName;
-+    }
-+
-+    // Fake token just to render attributes
-+    tmpToken = {
-+      attrs: tmpAttrs
-+    };
-+
-+    return  '<pre><code' + slf.renderAttrs(tmpToken) + '>'
-+          + highlighted
-+          + '</code></pre>\n';
-+  }
-+
-+
-+  return  '<pre><code' + slf.renderAttrs(token) + '>'
-+        + highlighted
-+        + '</code></pre>\n';
-+};
-+
-+
-+default_rules.image = function (tokens, idx, options, env, slf) {
-+  var token = tokens[idx];
-+
-+  // "alt" attr MUST be set, even if empty. Because it's mandatory and
-+  // should be placed on proper position for tests.
-+  //
-+  // Replace content with actual value
-+
-+  token.attrs[token.attrIndex('alt')][1] =
-+    slf.renderInlineAsText(token.children, options, env);
-+
-+  return slf.renderToken(tokens, idx, options);
-+};
-+
-+
-+default_rules.hardbreak = function (tokens, idx, options /*, env */) {
-+  return options.xhtmlOut ? '<br />\n' : '<br>\n';
-+};
-+default_rules.softbreak = function (tokens, idx, options /*, env */) {
-+  return options.breaks ? (options.xhtmlOut ? '<br />\n' : '<br>\n') : '\n';
-+};
-+
-+
-+default_rules.text = function (tokens, idx /*, options, env */) {
-+  return escapeHtml(tokens[idx].content);
-+};
-+
-+
-+default_rules.html_block = function (tokens, idx /*, options, env */) {
-+  return tokens[idx].content;
-+};
-+default_rules.html_inline = function (tokens, idx /*, options, env */) {
-+  return tokens[idx].content;
-+};
-+
-+
-+/**
-+ * new Renderer()
-+ *
-+ * Creates new [[Renderer]] instance and fill [[Renderer#rules]] with defaults.
-+ **/
-+function Renderer() {
-+
-+  /**
-+   * Renderer#rules -> Object
-+   *
-+   * Contains render rules for tokens. Can be updated and extended.
-+   *
-+   * ##### Example
-+   *
-+   * ```javascript
-+   * var md = require('markdown-it')();
-+   *
-+   * md.renderer.rules.strong_open  = function () { return '<b>'; };
-+   * md.renderer.rules.strong_close = function () { return '</b>'; };
-+   *
-+   * var result = md.renderInline(...);
-+   * ```
-+   *
-+   * Each rule is called as independent static function with fixed signature:
-+   *
-+   * ```javascript
-+   * function my_token_render(tokens, idx, options, env, renderer) {
-+   *   // ...
-+   *   return renderedHTML;
-+   * }
-+   * ```
-+   *
-+   * See [source code](https://github.com/markdown-it/markdown-it/blob/master/lib/renderer.js)
-+   * for more details and examples.
-+   **/
-+  this.rules = assign({}, default_rules);
-+}
-+
-+
-+/**
-+ * Renderer.renderAttrs(token) -> String
-+ *
-+ * Render token attributes to string.
-+ **/
-+Renderer.prototype.renderAttrs = function renderAttrs(token) {
-+  var i, l, result;
-+
-+  if (!token.attrs) { return ''; }
-+
-+  result = '';
-+
-+  for (i = 0, l = token.attrs.length; i < l; i++) {
-+    result += ' ' + escapeHtml(token.attrs[i][0]) + '="' + escapeHtml(token.attrs[i][1]) + '"';
-+  }
-+
-+  return result;
-+};
-+
-+
-+/**
-+ * Renderer.renderToken(tokens, idx, options) -> String
-+ * - tokens (Array): list of tokens
-+ * - idx (Numbed): token index to render
-+ * - options (Object): params of parser instance
-+ *
-+ * Default token renderer. Can be overriden by custom function
-+ * in [[Renderer#rules]].
-+ **/
-+Renderer.prototype.renderToken = function renderToken(tokens, idx, options) {
-+  var nextToken,
-+      result = '',
-+      needLf = false,
-+      token = tokens[idx];
-+
-+  // Tight list paragraphs
-+  if (token.hidden) {
-+    return '';
-+  }
-+
-+  // Insert a newline between hidden paragraph and subsequent opening
-+  // block-level tag.
-+  //
-+  // For example, here we should insert a newline before blockquote:
-+  //  - a
-+  //    >
-+  //
-+  if (token.block && token.nesting !== -1 && idx && tokens[idx - 1].hidden) {
-+    result += '\n';
-+  }
-+
-+  // Add token name, e.g. `<img`
-+  result += (token.nesting === -1 ? '</' : '<') + token.tag;
-+
-+  // Encode attributes, e.g. `<img src="foo"`
-+  result += this.renderAttrs(token);
-+
-+  // Add a slash for self-closing tags, e.g. `<img src="foo" /`
-+  if (token.nesting === 0 && options.xhtmlOut) {
-+    result += ' /';
-+  }
-+
-+  // Check if we need to add a newline after this tag
-+  if (token.block) {
-+    needLf = true;
-+
-+    if (token.nesting === 1) {
-+      if (idx + 1 < tokens.length) {
-+        nextToken = tokens[idx + 1];
-+
-+        if (nextToken.type === 'inline' || nextToken.hidden) {
-+          // Block-level tag containing an inline tag.
-+          //
-+          needLf = false;
-+
-+        } else if (nextToken.nesting === -1 && nextToken.tag === token.tag) {
-+          // Opening tag + closing tag of the same type. E.g. `<li></li>`.
-+          //
-+          needLf = false;
-+        }
-+      }
-+    }
-+  }
-+
-+  result += needLf ? '>\n' : '>';
-+
-+  return result;
-+};
-+
-+
-+/**
-+ * Renderer.renderInline(tokens, options, env) -> String
-+ * - tokens (Array): list on block tokens to renter
-+ * - options (Object): params of parser instance
-+ * - env (Object): additional data from parsed input (references, for example)
-+ *
-+ * The same as [[Renderer.render]], but for single token of `inline` type.
-+ **/
-+Renderer.prototype.renderInline = function (tokens, options, env) {
-+  var type,
-+      result = '',
-+      rules = this.rules;
-+
-+  for (var i = 0, len = tokens.length; i < len; i++) {
-+    type = tokens[i].type;
-+
-+    if (typeof rules[type] !== 'undefined') {
-+      result += rules[type](tokens, i, options, env, this);
-+    } else {
-+      result += this.renderToken(tokens, i, options);
-+    }
-+  }
-+
-+  return result;
-+};
-+
-+
-+/** internal
-+ * Renderer.renderInlineAsText(tokens, options, env) -> String
-+ * - tokens (Array): list on block tokens to renter
-+ * - options (Object): params of parser instance
-+ * - env (Object): additional data from parsed input (references, for example)
-+ *
-+ * Special kludge for image `alt` attributes to conform CommonMark spec.
-+ * Don't try to use it! Spec requires to show `alt` content with stripped markup,
-+ * instead of simple escaping.
-+ **/
-+Renderer.prototype.renderInlineAsText = function (tokens, options, env) {
-+  var result = '';
-+
-+  for (var i = 0, len = tokens.length; i < len; i++) {
-+    if (tokens[i].type === 'text') {
-+      result += tokens[i].content;
-+    } else if (tokens[i].type === 'image') {
-+      result += this.renderInlineAsText(tokens[i].children, options, env);
-+    }
-+  }
-+
-+  return result;
-+};
-+
-+
-+/**
-+ * Renderer.render(tokens, options, env) -> String
-+ * - tokens (Array): list on block tokens to renter
-+ * - options (Object): params of parser instance
-+ * - env (Object): additional data from parsed input (references, for example)
-+ *
-+ * Takes token stream and generates HTML. Probably, you will never need to call
-+ * this method directly.
-+ **/
-+Renderer.prototype.render = function (tokens, options, env) {
-+  var i, len, type,
-+      result = '',
-+      rules = this.rules;
-+
-+  for (i = 0, len = tokens.length; i < len; i++) {
-+    type = tokens[i].type;
-+
-+    if (type === 'inline') {
-+      result += this.renderInline(tokens[i].children, options, env);
-+    } else if (typeof rules[type] !== 'undefined') {
-+      result += rules[tokens[i].type](tokens, i, options, env, this);
-+    } else {
-+      result += this.renderToken(tokens, i, options, env);
-+    }
-+  }
-+
-+  return result;
-+};
-+
-+module.exports = Renderer;
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/ruler.js":
-+/*!***********************************************!*\
-+  !*** ./node_modules/markdown-it/lib/ruler.js ***!
-+  \***********************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+/**
-+ * class Ruler
-+ *
-+ * Helper class, used by [[MarkdownIt#core]], [[MarkdownIt#block]] and
-+ * [[MarkdownIt#inline]] to manage sequences of functions (rules):
-+ *
-+ * - keep rules in defined order
-+ * - assign the name to each rule
-+ * - enable/disable rules
-+ * - add/replace rules
-+ * - allow assign rules to additional named chains (in the same)
-+ * - cacheing lists of active rules
-+ *
-+ * You will not need use this class directly until write plugins. For simple
-+ * rules control use [[MarkdownIt.disable]], [[MarkdownIt.enable]] and
-+ * [[MarkdownIt.use]].
-+ **/
-+
-+
-+
-+/**
-+ * new Ruler()
-+ **/
-+function Ruler() {
-+  // List of added rules. Each element is:
-+  //
-+  // {
-+  //   name: XXX,
-+  //   enabled: Boolean,
-+  //   fn: Function(),
-+  //   alt: [ name2, name3 ]
-+  // }
-+  //
-+  this.__rules__ = [];
-+
-+  // Cached rule chains.
-+  //
-+  // First level - chain name, '' for default.
-+  // Second level - diginal anchor for fast filtering by charcodes.
-+  //
-+  this.__cache__ = null;
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////
-+// Helper methods, should not be used directly
-+
-+
-+// Find rule index by name
-+//
-+Ruler.prototype.__find__ = function (name) {
-+  for (var i = 0; i < this.__rules__.length; i++) {
-+    if (this.__rules__[i].name === name) {
-+      return i;
-+    }
-+  }
-+  return -1;
-+};
-+
-+
-+// Build rules lookup cache
-+//
-+Ruler.prototype.__compile__ = function () {
-+  var self = this;
-+  var chains = [ '' ];
-+
-+  // collect unique names
-+  self.__rules__.forEach(function (rule) {
-+    if (!rule.enabled) { return; }
-+
-+    rule.alt.forEach(function (altName) {
-+      if (chains.indexOf(altName) < 0) {
-+        chains.push(altName);
-+      }
-+    });
-+  });
-+
-+  self.__cache__ = {};
-+
-+  chains.forEach(function (chain) {
-+    self.__cache__[chain] = [];
-+    self.__rules__.forEach(function (rule) {
-+      if (!rule.enabled) { return; }
-+
-+      if (chain && rule.alt.indexOf(chain) < 0) { return; }
-+
-+      self.__cache__[chain].push(rule.fn);
-+    });
-+  });
-+};
-+
-+
-+/**
-+ * Ruler.at(name, fn [, options])
-+ * - name (String): rule name to replace.
-+ * - fn (Function): new rule function.
-+ * - options (Object): new rule options (not mandatory).
-+ *
-+ * Replace rule by name with new function & options. Throws error if name not
-+ * found.
-+ *
-+ * ##### Options:
-+ *
-+ * - __alt__ - array with names of "alternate" chains.
-+ *
-+ * ##### Example
-+ *
-+ * Replace existing typorgapher replacement rule with new one:
-+ *
-+ * ```javascript
-+ * var md = require('markdown-it')();
-+ *
-+ * md.core.ruler.at('replacements', function replace(state) {
-+ *   //...
-+ * });
-+ * ```
-+ **/
-+Ruler.prototype.at = function (name, fn, options) {
-+  var index = this.__find__(name);
-+  var opt = options || {};
-+
-+  if (index === -1) { throw new Error('Parser rule not found: ' + name); }
-+
-+  this.__rules__[index].fn = fn;
-+  this.__rules__[index].alt = opt.alt || [];
-+  this.__cache__ = null;
-+};
-+
-+
-+/**
-+ * Ruler.before(beforeName, ruleName, fn [, options])
-+ * - beforeName (String): new rule will be added before this one.
-+ * - ruleName (String): name of added rule.
-+ * - fn (Function): rule function.
-+ * - options (Object): rule options (not mandatory).
-+ *
-+ * Add new rule to chain before one with given name. See also
-+ * [[Ruler.after]], [[Ruler.push]].
-+ *
-+ * ##### Options:
-+ *
-+ * - __alt__ - array with names of "alternate" chains.
-+ *
-+ * ##### Example
-+ *
-+ * ```javascript
-+ * var md = require('markdown-it')();
-+ *
-+ * md.block.ruler.before('paragraph', 'my_rule', function replace(state) {
-+ *   //...
-+ * });
-+ * ```
-+ **/
-+Ruler.prototype.before = function (beforeName, ruleName, fn, options) {
-+  var index = this.__find__(beforeName);
-+  var opt = options || {};
-+
-+  if (index === -1) { throw new Error('Parser rule not found: ' + beforeName); }
-+
-+  this.__rules__.splice(index, 0, {
-+    name: ruleName,
-+    enabled: true,
-+    fn: fn,
-+    alt: opt.alt || []
-+  });
-+
-+  this.__cache__ = null;
-+};
-+
-+
-+/**
-+ * Ruler.after(afterName, ruleName, fn [, options])
-+ * - afterName (String): new rule will be added after this one.
-+ * - ruleName (String): name of added rule.
-+ * - fn (Function): rule function.
-+ * - options (Object): rule options (not mandatory).
-+ *
-+ * Add new rule to chain after one with given name. See also
-+ * [[Ruler.before]], [[Ruler.push]].
-+ *
-+ * ##### Options:
-+ *
-+ * - __alt__ - array with names of "alternate" chains.
-+ *
-+ * ##### Example
-+ *
-+ * ```javascript
-+ * var md = require('markdown-it')();
-+ *
-+ * md.inline.ruler.after('text', 'my_rule', function replace(state) {
-+ *   //...
-+ * });
-+ * ```
-+ **/
-+Ruler.prototype.after = function (afterName, ruleName, fn, options) {
-+  var index = this.__find__(afterName);
-+  var opt = options || {};
-+
-+  if (index === -1) { throw new Error('Parser rule not found: ' + afterName); }
-+
-+  this.__rules__.splice(index + 1, 0, {
-+    name: ruleName,
-+    enabled: true,
-+    fn: fn,
-+    alt: opt.alt || []
-+  });
-+
-+  this.__cache__ = null;
-+};
-+
-+/**
-+ * Ruler.push(ruleName, fn [, options])
-+ * - ruleName (String): name of added rule.
-+ * - fn (Function): rule function.
-+ * - options (Object): rule options (not mandatory).
-+ *
-+ * Push new rule to the end of chain. See also
-+ * [[Ruler.before]], [[Ruler.after]].
-+ *
-+ * ##### Options:
-+ *
-+ * - __alt__ - array with names of "alternate" chains.
-+ *
-+ * ##### Example
-+ *
-+ * ```javascript
-+ * var md = require('markdown-it')();
-+ *
-+ * md.core.ruler.push('my_rule', function replace(state) {
-+ *   //...
-+ * });
-+ * ```
-+ **/
-+Ruler.prototype.push = function (ruleName, fn, options) {
-+  var opt = options || {};
-+
-+  this.__rules__.push({
-+    name: ruleName,
-+    enabled: true,
-+    fn: fn,
-+    alt: opt.alt || []
-+  });
-+
-+  this.__cache__ = null;
-+};
-+
-+
-+/**
-+ * Ruler.enable(list [, ignoreInvalid]) -> Array
-+ * - list (String|Array): list of rule names to enable.
-+ * - ignoreInvalid (Boolean): set `true` to ignore errors when rule not found.
-+ *
-+ * Enable rules with given names. If any rule name not found - throw Error.
-+ * Errors can be disabled by second param.
-+ *
-+ * Returns list of found rule names (if no exception happened).
-+ *
-+ * See also [[Ruler.disable]], [[Ruler.enableOnly]].
-+ **/
-+Ruler.prototype.enable = function (list, ignoreInvalid) {
-+  if (!Array.isArray(list)) { list = [ list ]; }
-+
-+  var result = [];
-+
-+  // Search by name and enable
-+  list.forEach(function (name) {
-+    var idx = this.__find__(name);
-+
-+    if (idx < 0) {
-+      if (ignoreInvalid) { return; }
-+      throw new Error('Rules manager: invalid rule name ' + name);
-+    }
-+    this.__rules__[idx].enabled = true;
-+    result.push(name);
-+  }, this);
-+
-+  this.__cache__ = null;
-+  return result;
-+};
-+
-+
-+/**
-+ * Ruler.enableOnly(list [, ignoreInvalid])
-+ * - list (String|Array): list of rule names to enable (whitelist).
-+ * - ignoreInvalid (Boolean): set `true` to ignore errors when rule not found.
-+ *
-+ * Enable rules with given names, and disable everything else. If any rule name
-+ * not found - throw Error. Errors can be disabled by second param.
-+ *
-+ * See also [[Ruler.disable]], [[Ruler.enable]].
-+ **/
-+Ruler.prototype.enableOnly = function (list, ignoreInvalid) {
-+  if (!Array.isArray(list)) { list = [ list ]; }
-+
-+  this.__rules__.forEach(function (rule) { rule.enabled = false; });
-+
-+  this.enable(list, ignoreInvalid);
-+};
-+
-+
-+/**
-+ * Ruler.disable(list [, ignoreInvalid]) -> Array
-+ * - list (String|Array): list of rule names to disable.
-+ * - ignoreInvalid (Boolean): set `true` to ignore errors when rule not found.
-+ *
-+ * Disable rules with given names. If any rule name not found - throw Error.
-+ * Errors can be disabled by second param.
-+ *
-+ * Returns list of found rule names (if no exception happened).
-+ *
-+ * See also [[Ruler.enable]], [[Ruler.enableOnly]].
-+ **/
-+Ruler.prototype.disable = function (list, ignoreInvalid) {
-+  if (!Array.isArray(list)) { list = [ list ]; }
-+
-+  var result = [];
-+
-+  // Search by name and disable
-+  list.forEach(function (name) {
-+    var idx = this.__find__(name);
-+
-+    if (idx < 0) {
-+      if (ignoreInvalid) { return; }
-+      throw new Error('Rules manager: invalid rule name ' + name);
-+    }
-+    this.__rules__[idx].enabled = false;
-+    result.push(name);
-+  }, this);
-+
-+  this.__cache__ = null;
-+  return result;
-+};
-+
-+
-+/**
-+ * Ruler.getRules(chainName) -> Array
-+ *
-+ * Return array of active functions (rules) for given chain name. It analyzes
-+ * rules configuration, compiles caches if not exists and returns result.
-+ *
-+ * Default chain name is `''` (empty string). It can't be skipped. That's
-+ * done intentionally, to keep signature monomorphic for high speed.
-+ **/
-+Ruler.prototype.getRules = function (chainName) {
-+  if (this.__cache__ === null) {
-+    this.__compile__();
-+  }
-+
-+  // Chain can be empty, if rules disabled. But we still have to return Array.
-+  return this.__cache__[chainName] || [];
-+};
-+
-+module.exports = Ruler;
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/rules_block/blockquote.js":
-+/*!****************************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/rules_block/blockquote.js ***!
-+  \****************************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// Block quotes
-+
-+
-+
-+var isSpace = __webpack_require__(/*! ../common/utils */ "./node_modules/markdown-it/lib/common/utils.js").isSpace;
-+
-+
-+module.exports = function blockquote(state, startLine, endLine, silent) {
-+  var adjustTab,
-+      ch,
-+      i,
-+      initial,
-+      l,
-+      lastLineEmpty,
-+      lines,
-+      nextLine,
-+      offset,
-+      oldBMarks,
-+      oldBSCount,
-+      oldIndent,
-+      oldParentType,
-+      oldSCount,
-+      oldTShift,
-+      spaceAfterMarker,
-+      terminate,
-+      terminatorRules,
-+      token,
-+      wasOutdented,
-+      oldLineMax = state.lineMax,
-+      pos = state.bMarks[startLine] + state.tShift[startLine],
-+      max = state.eMarks[startLine];
-+
-+  // if it's indented more than 3 spaces, it should be a code block
-+  if (state.sCount[startLine] - state.blkIndent >= 4) { return false; }
-+
-+  // check the block quote marker
-+  if (state.src.charCodeAt(pos++) !== 0x3E/* > */) { return false; }
-+
-+  // we know that it's going to be a valid blockquote,
-+  // so no point trying to find the end of it in silent mode
-+  if (silent) { return true; }
-+
-+  // skip spaces after ">" and re-calculate offset
-+  initial = offset = state.sCount[startLine] + pos - (state.bMarks[startLine] + state.tShift[startLine]);
-+
-+  // skip one optional space after '>'
-+  if (state.src.charCodeAt(pos) === 0x20 /* space */) {
-+    // ' >   test '
-+    //     ^ -- position start of line here:
-+    pos++;
-+    initial++;
-+    offset++;
-+    adjustTab = false;
-+    spaceAfterMarker = true;
-+  } else if (state.src.charCodeAt(pos) === 0x09 /* tab */) {
-+    spaceAfterMarker = true;
-+
-+    if ((state.bsCount[startLine] + offset) % 4 === 3) {
-+      // '  >\t  test '
-+      //       ^ -- position start of line here (tab has width===1)
-+      pos++;
-+      initial++;
-+      offset++;
-+      adjustTab = false;
-+    } else {
-+      // ' >\t  test '
-+      //    ^ -- position start of line here + shift bsCount slightly
-+      //         to make extra space appear
-+      adjustTab = true;
-+    }
-+  } else {
-+    spaceAfterMarker = false;
-+  }
-+
-+  oldBMarks = [ state.bMarks[startLine] ];
-+  state.bMarks[startLine] = pos;
-+
-+  while (pos < max) {
-+    ch = state.src.charCodeAt(pos);
-+
-+    if (isSpace(ch)) {
-+      if (ch === 0x09) {
-+        offset += 4 - (offset + state.bsCount[startLine] + (adjustTab ? 1 : 0)) % 4;
-+      } else {
-+        offset++;
-+      }
-+    } else {
-+      break;
-+    }
-+
-+    pos++;
-+  }
-+
-+  oldBSCount = [ state.bsCount[startLine] ];
-+  state.bsCount[startLine] = state.sCount[startLine] + 1 + (spaceAfterMarker ? 1 : 0);
-+
-+  lastLineEmpty = pos >= max;
-+
-+  oldSCount = [ state.sCount[startLine] ];
-+  state.sCount[startLine] = offset - initial;
-+
-+  oldTShift = [ state.tShift[startLine] ];
-+  state.tShift[startLine] = pos - state.bMarks[startLine];
-+
-+  terminatorRules = state.md.block.ruler.getRules('blockquote');
-+
-+  oldParentType = state.parentType;
-+  state.parentType = 'blockquote';
-+  wasOutdented = false;
-+
-+  // Search the end of the block
-+  //
-+  // Block ends with either:
-+  //  1. an empty line outside:
-+  //     ```
-+  //     > test
-+  //
-+  //     ```
-+  //  2. an empty line inside:
-+  //     ```
-+  //     >
-+  //     test
-+  //     ```
-+  //  3. another tag:
-+  //     ```
-+  //     > test
-+  //      - - -
-+  //     ```
-+  for (nextLine = startLine + 1; nextLine < endLine; nextLine++) {
-+    // check if it's outdented, i.e. it's inside list item and indented
-+    // less than said list item:
-+    //
-+    // ```
-+    // 1. anything
-+    //    > current blockquote
-+    // 2. checking this line
-+    // ```
-+    if (state.sCount[nextLine] < state.blkIndent) wasOutdented = true;
-+
-+    pos = state.bMarks[nextLine] + state.tShift[nextLine];
-+    max = state.eMarks[nextLine];
-+
-+    if (pos >= max) {
-+      // Case 1: line is not inside the blockquote, and this line is empty.
-+      break;
-+    }
-+
-+    if (state.src.charCodeAt(pos++) === 0x3E/* > */ && !wasOutdented) {
-+      // This line is inside the blockquote.
-+
-+      // skip spaces after ">" and re-calculate offset
-+      initial = offset = state.sCount[nextLine] + pos - (state.bMarks[nextLine] + state.tShift[nextLine]);
-+
-+      // skip one optional space after '>'
-+      if (state.src.charCodeAt(pos) === 0x20 /* space */) {
-+        // ' >   test '
-+        //     ^ -- position start of line here:
-+        pos++;
-+        initial++;
-+        offset++;
-+        adjustTab = false;
-+        spaceAfterMarker = true;
-+      } else if (state.src.charCodeAt(pos) === 0x09 /* tab */) {
-+        spaceAfterMarker = true;
-+
-+        if ((state.bsCount[nextLine] + offset) % 4 === 3) {
-+          // '  >\t  test '
-+          //       ^ -- position start of line here (tab has width===1)
-+          pos++;
-+          initial++;
-+          offset++;
-+          adjustTab = false;
-+        } else {
-+          // ' >\t  test '
-+          //    ^ -- position start of line here + shift bsCount slightly
-+          //         to make extra space appear
-+          adjustTab = true;
-+        }
-+      } else {
-+        spaceAfterMarker = false;
-+      }
-+
-+      oldBMarks.push(state.bMarks[nextLine]);
-+      state.bMarks[nextLine] = pos;
-+
-+      while (pos < max) {
-+        ch = state.src.charCodeAt(pos);
-+
-+        if (isSpace(ch)) {
-+          if (ch === 0x09) {
-+            offset += 4 - (offset + state.bsCount[nextLine] + (adjustTab ? 1 : 0)) % 4;
-+          } else {
-+            offset++;
-+          }
-+        } else {
-+          break;
-+        }
-+
-+        pos++;
-+      }
-+
-+      lastLineEmpty = pos >= max;
-+
-+      oldBSCount.push(state.bsCount[nextLine]);
-+      state.bsCount[nextLine] = state.sCount[nextLine] + 1 + (spaceAfterMarker ? 1 : 0);
-+
-+      oldSCount.push(state.sCount[nextLine]);
-+      state.sCount[nextLine] = offset - initial;
-+
-+      oldTShift.push(state.tShift[nextLine]);
-+      state.tShift[nextLine] = pos - state.bMarks[nextLine];
-+      continue;
-+    }
-+
-+    // Case 2: line is not inside the blockquote, and the last line was empty.
-+    if (lastLineEmpty) { break; }
-+
-+    // Case 3: another tag found.
-+    terminate = false;
-+    for (i = 0, l = terminatorRules.length; i < l; i++) {
-+      if (terminatorRules[i](state, nextLine, endLine, true)) {
-+        terminate = true;
-+        break;
-+      }
-+    }
-+
-+    if (terminate) {
-+      // Quirk to enforce "hard termination mode" for paragraphs;
-+      // normally if you call `tokenize(state, startLine, nextLine)`,
-+      // paragraphs will look below nextLine for paragraph continuation,
-+      // but if blockquote is terminated by another tag, they shouldn't
-+      state.lineMax = nextLine;
-+
-+      if (state.blkIndent !== 0) {
-+        // state.blkIndent was non-zero, we now set it to zero,
-+        // so we need to re-calculate all offsets to appear as
-+        // if indent wasn't changed
-+        oldBMarks.push(state.bMarks[nextLine]);
-+        oldBSCount.push(state.bsCount[nextLine]);
-+        oldTShift.push(state.tShift[nextLine]);
-+        oldSCount.push(state.sCount[nextLine]);
-+        state.sCount[nextLine] -= state.blkIndent;
-+      }
-+
-+      break;
-+    }
-+
-+    oldBMarks.push(state.bMarks[nextLine]);
-+    oldBSCount.push(state.bsCount[nextLine]);
-+    oldTShift.push(state.tShift[nextLine]);
-+    oldSCount.push(state.sCount[nextLine]);
-+
-+    // A negative indentation means that this is a paragraph continuation
-+    //
-+    state.sCount[nextLine] = -1;
-+  }
-+
-+  oldIndent = state.blkIndent;
-+  state.blkIndent = 0;
-+
-+  token        = state.push('blockquote_open', 'blockquote', 1);
-+  token.markup = '>';
-+  token.map    = lines = [ startLine, 0 ];
-+
-+  state.md.block.tokenize(state, startLine, nextLine);
-+
-+  token        = state.push('blockquote_close', 'blockquote', -1);
-+  token.markup = '>';
-+
-+  state.lineMax = oldLineMax;
-+  state.parentType = oldParentType;
-+  lines[1] = state.line;
-+
-+  // Restore original tShift; this might not be necessary since the parser
-+  // has already been here, but just to make sure we can do that.
-+  for (i = 0; i < oldTShift.length; i++) {
-+    state.bMarks[i + startLine] = oldBMarks[i];
-+    state.tShift[i + startLine] = oldTShift[i];
-+    state.sCount[i + startLine] = oldSCount[i];
-+    state.bsCount[i + startLine] = oldBSCount[i];
-+  }
-+  state.blkIndent = oldIndent;
-+
-+  return true;
-+};
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/rules_block/code.js":
-+/*!**********************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/rules_block/code.js ***!
-+  \**********************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// Code block (4 spaces padded)
-+
-+
-+
-+
-+module.exports = function code(state, startLine, endLine/*, silent*/) {
-+  var nextLine, last, token;
-+
-+  if (state.sCount[startLine] - state.blkIndent < 4) { return false; }
-+
-+  last = nextLine = startLine + 1;
-+
-+  while (nextLine < endLine) {
-+    if (state.isEmpty(nextLine)) {
-+      nextLine++;
-+      continue;
-+    }
-+
-+    if (state.sCount[nextLine] - state.blkIndent >= 4) {
-+      nextLine++;
-+      last = nextLine;
-+      continue;
-+    }
-+    break;
-+  }
-+
-+  state.line = last;
-+
-+  token         = state.push('code_block', 'code', 0);
-+  token.content = state.getLines(startLine, last, 4 + state.blkIndent, true);
-+  token.map     = [ startLine, state.line ];
-+
-+  return true;
-+};
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/rules_block/fence.js":
-+/*!***********************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/rules_block/fence.js ***!
-+  \***********************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// fences (``` lang, ~~~ lang)
-+
-+
-+
-+
-+module.exports = function fence(state, startLine, endLine, silent) {
-+  var marker, len, params, nextLine, mem, token, markup,
-+      haveEndMarker = false,
-+      pos = state.bMarks[startLine] + state.tShift[startLine],
-+      max = state.eMarks[startLine];
-+
-+  // if it's indented more than 3 spaces, it should be a code block
-+  if (state.sCount[startLine] - state.blkIndent >= 4) { return false; }
-+
-+  if (pos + 3 > max) { return false; }
-+
-+  marker = state.src.charCodeAt(pos);
-+
-+  if (marker !== 0x7E/* ~ */ && marker !== 0x60 /* ` */) {
-+    return false;
-+  }
-+
-+  // scan marker length
-+  mem = pos;
-+  pos = state.skipChars(pos, marker);
-+
-+  len = pos - mem;
-+
-+  if (len < 3) { return false; }
-+
-+  markup = state.src.slice(mem, pos);
-+  params = state.src.slice(pos, max);
-+
-+  if (params.indexOf(String.fromCharCode(marker)) >= 0) { return false; }
-+
-+  // Since start is found, we can report success here in validation mode
-+  if (silent) { return true; }
-+
-+  // search end of block
-+  nextLine = startLine;
-+
-+  for (;;) {
-+    nextLine++;
-+    if (nextLine >= endLine) {
-+      // unclosed block should be autoclosed by end of document.
-+      // also block seems to be autoclosed by end of parent
-+      break;
-+    }
-+
-+    pos = mem = state.bMarks[nextLine] + state.tShift[nextLine];
-+    max = state.eMarks[nextLine];
-+
-+    if (pos < max && state.sCount[nextLine] < state.blkIndent) {
-+      // non-empty line with negative indent should stop the list:
-+      // - ```
-+      //  test
-+      break;
-+    }
-+
-+    if (state.src.charCodeAt(pos) !== marker) { continue; }
-+
-+    if (state.sCount[nextLine] - state.blkIndent >= 4) {
-+      // closing fence should be indented less than 4 spaces
-+      continue;
-+    }
-+
-+    pos = state.skipChars(pos, marker);
-+
-+    // closing code fence must be at least as long as the opening one
-+    if (pos - mem < len) { continue; }
-+
-+    // make sure tail has spaces only
-+    pos = state.skipSpaces(pos);
-+
-+    if (pos < max) { continue; }
-+
-+    haveEndMarker = true;
-+    // found!
-+    break;
-+  }
-+
-+  // If a fence has heading spaces, they should be removed from its inner block
-+  len = state.sCount[startLine];
-+
-+  state.line = nextLine + (haveEndMarker ? 1 : 0);
-+
-+  token         = state.push('fence', 'code', 0);
-+  token.info    = params;
-+  token.content = state.getLines(startLine + 1, nextLine, len, true);
-+  token.markup  = markup;
-+  token.map     = [ startLine, state.line ];
-+
-+  return true;
-+};
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/rules_block/heading.js":
-+/*!*************************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/rules_block/heading.js ***!
-+  \*************************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// heading (#, ##, ...)
-+
-+
-+
-+var isSpace = __webpack_require__(/*! ../common/utils */ "./node_modules/markdown-it/lib/common/utils.js").isSpace;
-+
-+
-+module.exports = function heading(state, startLine, endLine, silent) {
-+  var ch, level, tmp, token,
-+      pos = state.bMarks[startLine] + state.tShift[startLine],
-+      max = state.eMarks[startLine];
-+
-+  // if it's indented more than 3 spaces, it should be a code block
-+  if (state.sCount[startLine] - state.blkIndent >= 4) { return false; }
-+
-+  ch  = state.src.charCodeAt(pos);
-+
-+  if (ch !== 0x23/* # */ || pos >= max) { return false; }
-+
-+  // count heading level
-+  level = 1;
-+  ch = state.src.charCodeAt(++pos);
-+  while (ch === 0x23/* # */ && pos < max && level <= 6) {
-+    level++;
-+    ch = state.src.charCodeAt(++pos);
-+  }
-+
-+  if (level > 6 || (pos < max && !isSpace(ch))) { return false; }
-+
-+  if (silent) { return true; }
-+
-+  // Let's cut tails like '    ###  ' from the end of string
-+
-+  max = state.skipSpacesBack(max, pos);
-+  tmp = state.skipCharsBack(max, 0x23, pos); // #
-+  if (tmp > pos && isSpace(state.src.charCodeAt(tmp - 1))) {
-+    max = tmp;
-+  }
-+
-+  state.line = startLine + 1;
-+
-+  token        = state.push('heading_open', 'h' + String(level), 1);
-+  token.markup = '########'.slice(0, level);
-+  token.map    = [ startLine, state.line ];
-+
-+  token          = state.push('inline', '', 0);
-+  token.content  = state.src.slice(pos, max).trim();
-+  token.map      = [ startLine, state.line ];
-+  token.children = [];
-+
-+  token        = state.push('heading_close', 'h' + String(level), -1);
-+  token.markup = '########'.slice(0, level);
-+
-+  return true;
-+};
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/rules_block/hr.js":
-+/*!********************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/rules_block/hr.js ***!
-+  \********************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// Horizontal rule
-+
-+
-+
-+var isSpace = __webpack_require__(/*! ../common/utils */ "./node_modules/markdown-it/lib/common/utils.js").isSpace;
-+
-+
-+module.exports = function hr(state, startLine, endLine, silent) {
-+  var marker, cnt, ch, token,
-+      pos = state.bMarks[startLine] + state.tShift[startLine],
-+      max = state.eMarks[startLine];
-+
-+  // if it's indented more than 3 spaces, it should be a code block
-+  if (state.sCount[startLine] - state.blkIndent >= 4) { return false; }
-+
-+  marker = state.src.charCodeAt(pos++);
-+
-+  // Check hr marker
-+  if (marker !== 0x2A/* * */ &&
-+      marker !== 0x2D/* - */ &&
-+      marker !== 0x5F/* _ */) {
-+    return false;
-+  }
-+
-+  // markers can be mixed with spaces, but there should be at least 3 of them
-+
-+  cnt = 1;
-+  while (pos < max) {
-+    ch = state.src.charCodeAt(pos++);
-+    if (ch !== marker && !isSpace(ch)) { return false; }
-+    if (ch === marker) { cnt++; }
-+  }
-+
-+  if (cnt < 3) { return false; }
-+
-+  if (silent) { return true; }
-+
-+  state.line = startLine + 1;
-+
-+  token        = state.push('hr', 'hr', 0);
-+  token.map    = [ startLine, state.line ];
-+  token.markup = Array(cnt + 1).join(String.fromCharCode(marker));
-+
-+  return true;
-+};
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/rules_block/html_block.js":
-+/*!****************************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/rules_block/html_block.js ***!
-+  \****************************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// HTML block
-+
-+
-+
-+
-+var block_names = __webpack_require__(/*! ../common/html_blocks */ "./node_modules/markdown-it/lib/common/html_blocks.js");
-+var HTML_OPEN_CLOSE_TAG_RE = __webpack_require__(/*! ../common/html_re */ "./node_modules/markdown-it/lib/common/html_re.js").HTML_OPEN_CLOSE_TAG_RE;
-+
-+// An array of opening and corresponding closing sequences for html tags,
-+// last argument defines whether it can terminate a paragraph or not
-+//
-+var HTML_SEQUENCES = [
-+  [ /^<(script|pre|style)(?=(\s|>|$))/i, /<\/(script|pre|style)>/i, true ],
-+  [ /^<!--/,        /-->/,   true ],
-+  [ /^<\?/,         /\?>/,   true ],
-+  [ /^<![A-Z]/,     />/,     true ],
-+  [ /^<!\[CDATA\[/, /\]\]>/, true ],
-+  [ new RegExp('^</?(' + block_names.join('|') + ')(?=(\\s|/?>|$))', 'i'), /^$/, true ],
-+  [ new RegExp(HTML_OPEN_CLOSE_TAG_RE.source + '\\s*$'),  /^$/, false ]
-+];
-+
-+
-+module.exports = function html_block(state, startLine, endLine, silent) {
-+  var i, nextLine, token, lineText,
-+      pos = state.bMarks[startLine] + state.tShift[startLine],
-+      max = state.eMarks[startLine];
-+
-+  // if it's indented more than 3 spaces, it should be a code block
-+  if (state.sCount[startLine] - state.blkIndent >= 4) { return false; }
-+
-+  if (!state.md.options.html) { return false; }
-+
-+  if (state.src.charCodeAt(pos) !== 0x3C/* < */) { return false; }
-+
-+  lineText = state.src.slice(pos, max);
-+
-+  for (i = 0; i < HTML_SEQUENCES.length; i++) {
-+    if (HTML_SEQUENCES[i][0].test(lineText)) { break; }
-+  }
-+
-+  if (i === HTML_SEQUENCES.length) { return false; }
-+
-+  if (silent) {
-+    // true if this sequence can be a terminator, false otherwise
-+    return HTML_SEQUENCES[i][2];
-+  }
-+
-+  nextLine = startLine + 1;
-+
-+  // If we are here - we detected HTML block.
-+  // Let's roll down till block end.
-+  if (!HTML_SEQUENCES[i][1].test(lineText)) {
-+    for (; nextLine < endLine; nextLine++) {
-+      if (state.sCount[nextLine] < state.blkIndent) { break; }
-+
-+      pos = state.bMarks[nextLine] + state.tShift[nextLine];
-+      max = state.eMarks[nextLine];
-+      lineText = state.src.slice(pos, max);
-+
-+      if (HTML_SEQUENCES[i][1].test(lineText)) {
-+        if (lineText.length !== 0) { nextLine++; }
-+        break;
-+      }
-+    }
-+  }
-+
-+  state.line = nextLine;
-+
-+  token         = state.push('html_block', '', 0);
-+  token.map     = [ startLine, nextLine ];
-+  token.content = state.getLines(startLine, nextLine, state.blkIndent, true);
-+
-+  return true;
-+};
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/rules_block/lheading.js":
-+/*!**************************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/rules_block/lheading.js ***!
-+  \**************************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// lheading (---, ===)
-+
-+
-+
-+
-+module.exports = function lheading(state, startLine, endLine/*, silent*/) {
-+  var content, terminate, i, l, token, pos, max, level, marker,
-+      nextLine = startLine + 1, oldParentType,
-+      terminatorRules = state.md.block.ruler.getRules('paragraph');
-+
-+  // if it's indented more than 3 spaces, it should be a code block
-+  if (state.sCount[startLine] - state.blkIndent >= 4) { return false; }
-+
-+  oldParentType = state.parentType;
-+  state.parentType = 'paragraph'; // use paragraph to match terminatorRules
-+
-+  // jump line-by-line until empty one or EOF
-+  for (; nextLine < endLine && !state.isEmpty(nextLine); nextLine++) {
-+    // this would be a code block normally, but after paragraph
-+    // it's considered a lazy continuation regardless of what's there
-+    if (state.sCount[nextLine] - state.blkIndent > 3) { continue; }
-+
-+    //
-+    // Check for underline in setext header
-+    //
-+    if (state.sCount[nextLine] >= state.blkIndent) {
-+      pos = state.bMarks[nextLine] + state.tShift[nextLine];
-+      max = state.eMarks[nextLine];
-+
-+      if (pos < max) {
-+        marker = state.src.charCodeAt(pos);
-+
-+        if (marker === 0x2D/* - */ || marker === 0x3D/* = */) {
-+          pos = state.skipChars(pos, marker);
-+          pos = state.skipSpaces(pos);
-+
-+          if (pos >= max) {
-+            level = (marker === 0x3D/* = */ ? 1 : 2);
-+            break;
-+          }
-+        }
-+      }
-+    }
-+
-+    // quirk for blockquotes, this line should already be checked by that rule
-+    if (state.sCount[nextLine] < 0) { continue; }
-+
-+    // Some tags can terminate paragraph without empty line.
-+    terminate = false;
-+    for (i = 0, l = terminatorRules.length; i < l; i++) {
-+      if (terminatorRules[i](state, nextLine, endLine, true)) {
-+        terminate = true;
-+        break;
-+      }
-+    }
-+    if (terminate) { break; }
-+  }
-+
-+  if (!level) {
-+    // Didn't find valid underline
-+    return false;
-+  }
-+
-+  content = state.getLines(startLine, nextLine, state.blkIndent, false).trim();
-+
-+  state.line = nextLine + 1;
-+
-+  token          = state.push('heading_open', 'h' + String(level), 1);
-+  token.markup   = String.fromCharCode(marker);
-+  token.map      = [ startLine, state.line ];
-+
-+  token          = state.push('inline', '', 0);
-+  token.content  = content;
-+  token.map      = [ startLine, state.line - 1 ];
-+  token.children = [];
-+
-+  token          = state.push('heading_close', 'h' + String(level), -1);
-+  token.markup   = String.fromCharCode(marker);
-+
-+  state.parentType = oldParentType;
-+
-+  return true;
-+};
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/rules_block/list.js":
-+/*!**********************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/rules_block/list.js ***!
-+  \**********************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// Lists
-+
-+
-+
-+var isSpace = __webpack_require__(/*! ../common/utils */ "./node_modules/markdown-it/lib/common/utils.js").isSpace;
-+
-+
-+// Search `[-+*][\n ]`, returns next pos after marker on success
-+// or -1 on fail.
-+function skipBulletListMarker(state, startLine) {
-+  var marker, pos, max, ch;
-+
-+  pos = state.bMarks[startLine] + state.tShift[startLine];
-+  max = state.eMarks[startLine];
-+
-+  marker = state.src.charCodeAt(pos++);
-+  // Check bullet
-+  if (marker !== 0x2A/* * */ &&
-+      marker !== 0x2D/* - */ &&
-+      marker !== 0x2B/* + */) {
-+    return -1;
-+  }
-+
-+  if (pos < max) {
-+    ch = state.src.charCodeAt(pos);
-+
-+    if (!isSpace(ch)) {
-+      // " -test " - is not a list item
-+      return -1;
-+    }
-+  }
-+
-+  return pos;
-+}
-+
-+// Search `\d+[.)][\n ]`, returns next pos after marker on success
-+// or -1 on fail.
-+function skipOrderedListMarker(state, startLine) {
-+  var ch,
-+      start = state.bMarks[startLine] + state.tShift[startLine],
-+      pos = start,
-+      max = state.eMarks[startLine];
-+
-+  // List marker should have at least 2 chars (digit + dot)
-+  if (pos + 1 >= max) { return -1; }
-+
-+  ch = state.src.charCodeAt(pos++);
-+
-+  if (ch < 0x30/* 0 */ || ch > 0x39/* 9 */) { return -1; }
-+
-+  for (;;) {
-+    // EOL -> fail
-+    if (pos >= max) { return -1; }
-+
-+    ch = state.src.charCodeAt(pos++);
-+
-+    if (ch >= 0x30/* 0 */ && ch <= 0x39/* 9 */) {
-+
-+      // List marker should have no more than 9 digits
-+      // (prevents integer overflow in browsers)
-+      if (pos - start >= 10) { return -1; }
-+
-+      continue;
-+    }
-+
-+    // found valid marker
-+    if (ch === 0x29/* ) */ || ch === 0x2e/* . */) {
-+      break;
-+    }
-+
-+    return -1;
-+  }
-+
-+
-+  if (pos < max) {
-+    ch = state.src.charCodeAt(pos);
-+
-+    if (!isSpace(ch)) {
-+      // " 1.test " - is not a list item
-+      return -1;
-+    }
-+  }
-+  return pos;
-+}
-+
-+function markTightParagraphs(state, idx) {
-+  var i, l,
-+      level = state.level + 2;
-+
-+  for (i = idx + 2, l = state.tokens.length - 2; i < l; i++) {
-+    if (state.tokens[i].level === level && state.tokens[i].type === 'paragraph_open') {
-+      state.tokens[i + 2].hidden = true;
-+      state.tokens[i].hidden = true;
-+      i += 2;
-+    }
-+  }
-+}
-+
-+
-+module.exports = function list(state, startLine, endLine, silent) {
-+  var ch,
-+      contentStart,
-+      i,
-+      indent,
-+      indentAfterMarker,
-+      initial,
-+      isOrdered,
-+      itemLines,
-+      l,
-+      listLines,
-+      listTokIdx,
-+      markerCharCode,
-+      markerValue,
-+      max,
-+      nextLine,
-+      offset,
-+      oldIndent,
-+      oldLIndent,
-+      oldParentType,
-+      oldTShift,
-+      oldTight,
-+      pos,
-+      posAfterMarker,
-+      prevEmptyEnd,
-+      start,
-+      terminate,
-+      terminatorRules,
-+      token,
-+      isTerminatingParagraph = false,
-+      tight = true;
-+
-+  // if it's indented more than 3 spaces, it should be a code block
-+  if (state.sCount[startLine] - state.blkIndent >= 4) { return false; }
-+
-+  // limit conditions when list can interrupt
-+  // a paragraph (validation mode only)
-+  if (silent && state.parentType === 'paragraph') {
-+    // Next list item should still terminate previous list item;
-+    //
-+    // This code can fail if plugins use blkIndent as well as lists,
-+    // but I hope the spec gets fixed long before that happens.
-+    //
-+    if (state.tShift[startLine] >= state.blkIndent) {
-+      isTerminatingParagraph = true;
-+    }
-+  }
-+
-+  // Detect list type and position after marker
-+  if ((posAfterMarker = skipOrderedListMarker(state, startLine)) >= 0) {
-+    isOrdered = true;
-+    start = state.bMarks[startLine] + state.tShift[startLine];
-+    markerValue = Number(state.src.substr(start, posAfterMarker - start - 1));
-+
-+    // If we're starting a new ordered list right after
-+    // a paragraph, it should start with 1.
-+    if (isTerminatingParagraph && markerValue !== 1) return false;
-+
-+  } else if ((posAfterMarker = skipBulletListMarker(state, startLine)) >= 0) {
-+    isOrdered = false;
-+
-+  } else {
-+    return false;
-+  }
-+
-+  // If we're starting a new unordered list right after
-+  // a paragraph, first line should not be empty.
-+  if (isTerminatingParagraph) {
-+    if (state.skipSpaces(posAfterMarker) >= state.eMarks[startLine]) return false;
-+  }
-+
-+  // We should terminate list on style change. Remember first one to compare.
-+  markerCharCode = state.src.charCodeAt(posAfterMarker - 1);
-+
-+  // For validation mode we can terminate immediately
-+  if (silent) { return true; }
-+
-+  // Start list
-+  listTokIdx = state.tokens.length;
-+
-+  if (isOrdered) {
-+    token       = state.push('ordered_list_open', 'ol', 1);
-+    if (markerValue !== 1) {
-+      token.attrs = [ [ 'start', markerValue ] ];
-+    }
-+
-+  } else {
-+    token       = state.push('bullet_list_open', 'ul', 1);
-+  }
-+
-+  token.map    = listLines = [ startLine, 0 ];
-+  token.markup = String.fromCharCode(markerCharCode);
-+
-+  //
-+  // Iterate list items
-+  //
-+
-+  nextLine = startLine;
-+  prevEmptyEnd = false;
-+  terminatorRules = state.md.block.ruler.getRules('list');
-+
-+  oldParentType = state.parentType;
-+  state.parentType = 'list';
-+
-+  while (nextLine < endLine) {
-+    pos = posAfterMarker;
-+    max = state.eMarks[nextLine];
-+
-+    initial = offset = state.sCount[nextLine] + posAfterMarker - (state.bMarks[startLine] + state.tShift[startLine]);
-+
-+    while (pos < max) {
-+      ch = state.src.charCodeAt(pos);
-+
-+      if (ch === 0x09) {
-+        offset += 4 - (offset + state.bsCount[nextLine]) % 4;
-+      } else if (ch === 0x20) {
-+        offset++;
-+      } else {
-+        break;
-+      }
-+
-+      pos++;
-+    }
-+
-+    contentStart = pos;
-+
-+    if (contentStart >= max) {
-+      // trimming space in "-    \n  3" case, indent is 1 here
-+      indentAfterMarker = 1;
-+    } else {
-+      indentAfterMarker = offset - initial;
-+    }
-+
-+    // If we have more than 4 spaces, the indent is 1
-+    // (the rest is just indented code block)
-+    if (indentAfterMarker > 4) { indentAfterMarker = 1; }
-+
-+    // "  -  test"
-+    //  ^^^^^ - calculating total length of this thing
-+    indent = initial + indentAfterMarker;
-+
-+    // Run subparser & write tokens
-+    token        = state.push('list_item_open', 'li', 1);
-+    token.markup = String.fromCharCode(markerCharCode);
-+    token.map    = itemLines = [ startLine, 0 ];
-+
-+    oldIndent = state.blkIndent;
-+    oldTight = state.tight;
-+    oldTShift = state.tShift[startLine];
-+    oldLIndent = state.sCount[startLine];
-+    state.blkIndent = indent;
-+    state.tight = true;
-+    state.tShift[startLine] = contentStart - state.bMarks[startLine];
-+    state.sCount[startLine] = offset;
-+
-+    if (contentStart >= max && state.isEmpty(startLine + 1)) {
-+      // workaround for this case
-+      // (list item is empty, list terminates before "foo"):
-+      // ~~~~~~~~
-+      //   -
-+      //
-+      //     foo
-+      // ~~~~~~~~
-+      state.line = Math.min(state.line + 2, endLine);
-+    } else {
-+      state.md.block.tokenize(state, startLine, endLine, true);
-+    }
-+
-+    // If any of list item is tight, mark list as tight
-+    if (!state.tight || prevEmptyEnd) {
-+      tight = false;
-+    }
-+    // Item become loose if finish with empty line,
-+    // but we should filter last element, because it means list finish
-+    prevEmptyEnd = (state.line - startLine) > 1 && state.isEmpty(state.line - 1);
-+
-+    state.blkIndent = oldIndent;
-+    state.tShift[startLine] = oldTShift;
-+    state.sCount[startLine] = oldLIndent;
-+    state.tight = oldTight;
-+
-+    token        = state.push('list_item_close', 'li', -1);
-+    token.markup = String.fromCharCode(markerCharCode);
-+
-+    nextLine = startLine = state.line;
-+    itemLines[1] = nextLine;
-+    contentStart = state.bMarks[startLine];
-+
-+    if (nextLine >= endLine) { break; }
-+
-+    //
-+    // Try to check if list is terminated or continued.
-+    //
-+    if (state.sCount[nextLine] < state.blkIndent) { break; }
-+
-+    // fail if terminating block found
-+    terminate = false;
-+    for (i = 0, l = terminatorRules.length; i < l; i++) {
-+      if (terminatorRules[i](state, nextLine, endLine, true)) {
-+        terminate = true;
-+        break;
-+      }
-+    }
-+    if (terminate) { break; }
-+
-+    // fail if list has another type
-+    if (isOrdered) {
-+      posAfterMarker = skipOrderedListMarker(state, nextLine);
-+      if (posAfterMarker < 0) { break; }
-+    } else {
-+      posAfterMarker = skipBulletListMarker(state, nextLine);
-+      if (posAfterMarker < 0) { break; }
-+    }
-+
-+    if (markerCharCode !== state.src.charCodeAt(posAfterMarker - 1)) { break; }
-+  }
-+
-+  // Finalize list
-+  if (isOrdered) {
-+    token = state.push('ordered_list_close', 'ol', -1);
-+  } else {
-+    token = state.push('bullet_list_close', 'ul', -1);
-+  }
-+  token.markup = String.fromCharCode(markerCharCode);
-+
-+  listLines[1] = nextLine;
-+  state.line = nextLine;
-+
-+  state.parentType = oldParentType;
-+
-+  // mark paragraphs tight if needed
-+  if (tight) {
-+    markTightParagraphs(state, listTokIdx);
-+  }
-+
-+  return true;
-+};
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/rules_block/paragraph.js":
-+/*!***************************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/rules_block/paragraph.js ***!
-+  \***************************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// Paragraph
-+
-+
-+
-+
-+module.exports = function paragraph(state, startLine/*, endLine*/) {
-+  var content, terminate, i, l, token, oldParentType,
-+      nextLine = startLine + 1,
-+      terminatorRules = state.md.block.ruler.getRules('paragraph'),
-+      endLine = state.lineMax;
-+
-+  oldParentType = state.parentType;
-+  state.parentType = 'paragraph';
-+
-+  // jump line-by-line until empty one or EOF
-+  for (; nextLine < endLine && !state.isEmpty(nextLine); nextLine++) {
-+    // this would be a code block normally, but after paragraph
-+    // it's considered a lazy continuation regardless of what's there
-+    if (state.sCount[nextLine] - state.blkIndent > 3) { continue; }
-+
-+    // quirk for blockquotes, this line should already be checked by that rule
-+    if (state.sCount[nextLine] < 0) { continue; }
-+
-+    // Some tags can terminate paragraph without empty line.
-+    terminate = false;
-+    for (i = 0, l = terminatorRules.length; i < l; i++) {
-+      if (terminatorRules[i](state, nextLine, endLine, true)) {
-+        terminate = true;
-+        break;
-+      }
-+    }
-+    if (terminate) { break; }
-+  }
-+
-+  content = state.getLines(startLine, nextLine, state.blkIndent, false).trim();
-+
-+  state.line = nextLine;
-+
-+  token          = state.push('paragraph_open', 'p', 1);
-+  token.map      = [ startLine, state.line ];
-+
-+  token          = state.push('inline', '', 0);
-+  token.content  = content;
-+  token.map      = [ startLine, state.line ];
-+  token.children = [];
-+
-+  token          = state.push('paragraph_close', 'p', -1);
-+
-+  state.parentType = oldParentType;
-+
-+  return true;
-+};
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/rules_block/reference.js":
-+/*!***************************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/rules_block/reference.js ***!
-+  \***************************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+
-+
-+
-+var normalizeReference   = __webpack_require__(/*! ../common/utils */ "./node_modules/markdown-it/lib/common/utils.js").normalizeReference;
-+var isSpace              = __webpack_require__(/*! ../common/utils */ "./node_modules/markdown-it/lib/common/utils.js").isSpace;
-+
-+
-+module.exports = function reference(state, startLine, _endLine, silent) {
-+  var ch,
-+      destEndPos,
-+      destEndLineNo,
-+      endLine,
-+      href,
-+      i,
-+      l,
-+      label,
-+      labelEnd,
-+      oldParentType,
-+      res,
-+      start,
-+      str,
-+      terminate,
-+      terminatorRules,
-+      title,
-+      lines = 0,
-+      pos = state.bMarks[startLine] + state.tShift[startLine],
-+      max = state.eMarks[startLine],
-+      nextLine = startLine + 1;
-+
-+  // if it's indented more than 3 spaces, it should be a code block
-+  if (state.sCount[startLine] - state.blkIndent >= 4) { return false; }
-+
-+  if (state.src.charCodeAt(pos) !== 0x5B/* [ */) { return false; }
-+
-+  // Simple check to quickly interrupt scan on [link](url) at the start of line.
-+  // Can be useful on practice: https://github.com/markdown-it/markdown-it/issues/54
-+  while (++pos < max) {
-+    if (state.src.charCodeAt(pos) === 0x5D /* ] */ &&
-+        state.src.charCodeAt(pos - 1) !== 0x5C/* \ */) {
-+      if (pos + 1 === max) { return false; }
-+      if (state.src.charCodeAt(pos + 1) !== 0x3A/* : */) { return false; }
-+      break;
-+    }
-+  }
-+
-+  endLine = state.lineMax;
-+
-+  // jump line-by-line until empty one or EOF
-+  terminatorRules = state.md.block.ruler.getRules('reference');
-+
-+  oldParentType = state.parentType;
-+  state.parentType = 'reference';
-+
-+  for (; nextLine < endLine && !state.isEmpty(nextLine); nextLine++) {
-+    // this would be a code block normally, but after paragraph
-+    // it's considered a lazy continuation regardless of what's there
-+    if (state.sCount[nextLine] - state.blkIndent > 3) { continue; }
-+
-+    // quirk for blockquotes, this line should already be checked by that rule
-+    if (state.sCount[nextLine] < 0) { continue; }
-+
-+    // Some tags can terminate paragraph without empty line.
-+    terminate = false;
-+    for (i = 0, l = terminatorRules.length; i < l; i++) {
-+      if (terminatorRules[i](state, nextLine, endLine, true)) {
-+        terminate = true;
-+        break;
-+      }
-+    }
-+    if (terminate) { break; }
-+  }
-+
-+  str = state.getLines(startLine, nextLine, state.blkIndent, false).trim();
-+  max = str.length;
-+
-+  for (pos = 1; pos < max; pos++) {
-+    ch = str.charCodeAt(pos);
-+    if (ch === 0x5B /* [ */) {
-+      return false;
-+    } else if (ch === 0x5D /* ] */) {
-+      labelEnd = pos;
-+      break;
-+    } else if (ch === 0x0A /* \n */) {
-+      lines++;
-+    } else if (ch === 0x5C /* \ */) {
-+      pos++;
-+      if (pos < max && str.charCodeAt(pos) === 0x0A) {
-+        lines++;
-+      }
-+    }
-+  }
-+
-+  if (labelEnd < 0 || str.charCodeAt(labelEnd + 1) !== 0x3A/* : */) { return false; }
-+
-+  // [label]:   destination   'title'
-+  //         ^^^ skip optional whitespace here
-+  for (pos = labelEnd + 2; pos < max; pos++) {
-+    ch = str.charCodeAt(pos);
-+    if (ch === 0x0A) {
-+      lines++;
-+    } else if (isSpace(ch)) {
-+      /*eslint no-empty:0*/
-+    } else {
-+      break;
-+    }
-+  }
-+
-+  // [label]:   destination   'title'
-+  //            ^^^^^^^^^^^ parse this
-+  res = state.md.helpers.parseLinkDestination(str, pos, max);
-+  if (!res.ok) { return false; }
-+
-+  href = state.md.normalizeLink(res.str);
-+  if (!state.md.validateLink(href)) { return false; }
-+
-+  pos = res.pos;
-+  lines += res.lines;
-+
-+  // save cursor state, we could require to rollback later
-+  destEndPos = pos;
-+  destEndLineNo = lines;
-+
-+  // [label]:   destination   'title'
-+  //                       ^^^ skipping those spaces
-+  start = pos;
-+  for (; pos < max; pos++) {
-+    ch = str.charCodeAt(pos);
-+    if (ch === 0x0A) {
-+      lines++;
-+    } else if (isSpace(ch)) {
-+      /*eslint no-empty:0*/
-+    } else {
-+      break;
-+    }
-+  }
-+
-+  // [label]:   destination   'title'
-+  //                          ^^^^^^^ parse this
-+  res = state.md.helpers.parseLinkTitle(str, pos, max);
-+  if (pos < max && start !== pos && res.ok) {
-+    title = res.str;
-+    pos = res.pos;
-+    lines += res.lines;
-+  } else {
-+    title = '';
-+    pos = destEndPos;
-+    lines = destEndLineNo;
-+  }
-+
-+  // skip trailing spaces until the rest of the line
-+  while (pos < max) {
-+    ch = str.charCodeAt(pos);
-+    if (!isSpace(ch)) { break; }
-+    pos++;
-+  }
-+
-+  if (pos < max && str.charCodeAt(pos) !== 0x0A) {
-+    if (title) {
-+      // garbage at the end of the line after title,
-+      // but it could still be a valid reference if we roll back
-+      title = '';
-+      pos = destEndPos;
-+      lines = destEndLineNo;
-+      while (pos < max) {
-+        ch = str.charCodeAt(pos);
-+        if (!isSpace(ch)) { break; }
-+        pos++;
-+      }
-+    }
-+  }
-+
-+  if (pos < max && str.charCodeAt(pos) !== 0x0A) {
-+    // garbage at the end of the line
-+    return false;
-+  }
-+
-+  label = normalizeReference(str.slice(1, labelEnd));
-+  if (!label) {
-+    // CommonMark 0.20 disallows empty labels
-+    return false;
-+  }
-+
-+  // Reference can not terminate anything. This check is for safety only.
-+  /*istanbul ignore if*/
-+  if (silent) { return true; }
-+
-+  if (typeof state.env.references === 'undefined') {
-+    state.env.references = {};
-+  }
-+  if (typeof state.env.references[label] === 'undefined') {
-+    state.env.references[label] = { title: title, href: href };
-+  }
-+
-+  state.parentType = oldParentType;
-+
-+  state.line = startLine + lines + 1;
-+  return true;
-+};
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/rules_block/state_block.js":
-+/*!*****************************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/rules_block/state_block.js ***!
-+  \*****************************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// Parser state class
-+
-+
-+
-+var Token = __webpack_require__(/*! ../token */ "./node_modules/markdown-it/lib/token.js");
-+var isSpace = __webpack_require__(/*! ../common/utils */ "./node_modules/markdown-it/lib/common/utils.js").isSpace;
-+
-+
-+function StateBlock(src, md, env, tokens) {
-+  var ch, s, start, pos, len, indent, offset, indent_found;
-+
-+  this.src = src;
-+
-+  // link to parser instance
-+  this.md     = md;
-+
-+  this.env = env;
-+
-+  //
-+  // Internal state vartiables
-+  //
-+
-+  this.tokens = tokens;
-+
-+  this.bMarks = [];  // line begin offsets for fast jumps
-+  this.eMarks = [];  // line end offsets for fast jumps
-+  this.tShift = [];  // offsets of the first non-space characters (tabs not expanded)
-+  this.sCount = [];  // indents for each line (tabs expanded)
-+
-+  // An amount of virtual spaces (tabs expanded) between beginning
-+  // of each line (bMarks) and real beginning of that line.
-+  //
-+  // It exists only as a hack because blockquotes override bMarks
-+  // losing information in the process.
-+  //
-+  // It's used only when expanding tabs, you can think about it as
-+  // an initial tab length, e.g. bsCount=21 applied to string `\t123`
-+  // means first tab should be expanded to 4-21%4 === 3 spaces.
-+  //
-+  this.bsCount = [];
-+
-+  // block parser variables
-+  this.blkIndent  = 0; // required block content indent
-+                       // (for example, if we are in list)
-+  this.line       = 0; // line index in src
-+  this.lineMax    = 0; // lines count
-+  this.tight      = false;  // loose/tight mode for lists
-+  this.ddIndent   = -1; // indent of the current dd block (-1 if there isn't any)
-+
-+  // can be 'blockquote', 'list', 'root', 'paragraph' or 'reference'
-+  // used in lists to determine if they interrupt a paragraph
-+  this.parentType = 'root';
-+
-+  this.level = 0;
-+
-+  // renderer
-+  this.result = '';
-+
-+  // Create caches
-+  // Generate markers.
-+  s = this.src;
-+  indent_found = false;
-+
-+  for (start = pos = indent = offset = 0, len = s.length; pos < len; pos++) {
-+    ch = s.charCodeAt(pos);
-+
-+    if (!indent_found) {
-+      if (isSpace(ch)) {
-+        indent++;
-+
-+        if (ch === 0x09) {
-+          offset += 4 - offset % 4;
-+        } else {
-+          offset++;
-+        }
-+        continue;
-+      } else {
-+        indent_found = true;
-+      }
-+    }
-+
-+    if (ch === 0x0A || pos === len - 1) {
-+      if (ch !== 0x0A) { pos++; }
-+      this.bMarks.push(start);
-+      this.eMarks.push(pos);
-+      this.tShift.push(indent);
-+      this.sCount.push(offset);
-+      this.bsCount.push(0);
-+
-+      indent_found = false;
-+      indent = 0;
-+      offset = 0;
-+      start = pos + 1;
-+    }
-+  }
-+
-+  // Push fake entry to simplify cache bounds checks
-+  this.bMarks.push(s.length);
-+  this.eMarks.push(s.length);
-+  this.tShift.push(0);
-+  this.sCount.push(0);
-+  this.bsCount.push(0);
-+
-+  this.lineMax = this.bMarks.length - 1; // don't count last fake line
-+}
-+
-+// Push new token to "stream".
-+//
-+StateBlock.prototype.push = function (type, tag, nesting) {
-+  var token = new Token(type, tag, nesting);
-+  token.block = true;
-+
-+  if (nesting < 0) { this.level--; }
-+  token.level = this.level;
-+  if (nesting > 0) { this.level++; }
-+
-+  this.tokens.push(token);
-+  return token;
-+};
-+
-+StateBlock.prototype.isEmpty = function isEmpty(line) {
-+  return this.bMarks[line] + this.tShift[line] >= this.eMarks[line];
-+};
-+
-+StateBlock.prototype.skipEmptyLines = function skipEmptyLines(from) {
-+  for (var max = this.lineMax; from < max; from++) {
-+    if (this.bMarks[from] + this.tShift[from] < this.eMarks[from]) {
-+      break;
-+    }
-+  }
-+  return from;
-+};
-+
-+// Skip spaces from given position.
-+StateBlock.prototype.skipSpaces = function skipSpaces(pos) {
-+  var ch;
-+
-+  for (var max = this.src.length; pos < max; pos++) {
-+    ch = this.src.charCodeAt(pos);
-+    if (!isSpace(ch)) { break; }
-+  }
-+  return pos;
-+};
-+
-+// Skip spaces from given position in reverse.
-+StateBlock.prototype.skipSpacesBack = function skipSpacesBack(pos, min) {
-+  if (pos <= min) { return pos; }
-+
-+  while (pos > min) {
-+    if (!isSpace(this.src.charCodeAt(--pos))) { return pos + 1; }
-+  }
-+  return pos;
-+};
-+
-+// Skip char codes from given position
-+StateBlock.prototype.skipChars = function skipChars(pos, code) {
-+  for (var max = this.src.length; pos < max; pos++) {
-+    if (this.src.charCodeAt(pos) !== code) { break; }
-+  }
-+  return pos;
-+};
-+
-+// Skip char codes reverse from given position - 1
-+StateBlock.prototype.skipCharsBack = function skipCharsBack(pos, code, min) {
-+  if (pos <= min) { return pos; }
-+
-+  while (pos > min) {
-+    if (code !== this.src.charCodeAt(--pos)) { return pos + 1; }
-+  }
-+  return pos;
-+};
-+
-+// cut lines range from source.
-+StateBlock.prototype.getLines = function getLines(begin, end, indent, keepLastLF) {
-+  var i, lineIndent, ch, first, last, queue, lineStart,
-+      line = begin;
-+
-+  if (begin >= end) {
-+    return '';
-+  }
-+
-+  queue = new Array(end - begin);
-+
-+  for (i = 0; line < end; line++, i++) {
-+    lineIndent = 0;
-+    lineStart = first = this.bMarks[line];
-+
-+    if (line + 1 < end || keepLastLF) {
-+      // No need for bounds check because we have fake entry on tail.
-+      last = this.eMarks[line] + 1;
-+    } else {
-+      last = this.eMarks[line];
-+    }
-+
-+    while (first < last && lineIndent < indent) {
-+      ch = this.src.charCodeAt(first);
-+
-+      if (isSpace(ch)) {
-+        if (ch === 0x09) {
-+          lineIndent += 4 - (lineIndent + this.bsCount[line]) % 4;
-+        } else {
-+          lineIndent++;
-+        }
-+      } else if (first - lineStart < this.tShift[line]) {
-+        // patched tShift masked characters to look like spaces (blockquotes, list markers)
-+        lineIndent++;
-+      } else {
-+        break;
-+      }
-+
-+      first++;
-+    }
-+
-+    if (lineIndent > indent) {
-+      // partially expanding tabs in code blocks, e.g '\t\tfoobar'
-+      // with indent=2 becomes '  \tfoobar'
-+      queue[i] = new Array(lineIndent - indent + 1).join(' ') + this.src.slice(first, last);
-+    } else {
-+      queue[i] = this.src.slice(first, last);
-+    }
-+  }
-+
-+  return queue.join('');
-+};
-+
-+// re-export Token class to use in block rules
-+StateBlock.prototype.Token = Token;
-+
-+
-+module.exports = StateBlock;
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/rules_block/table.js":
-+/*!***********************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/rules_block/table.js ***!
-+  \***********************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// GFM table, non-standard
-+
-+
-+
-+var isSpace = __webpack_require__(/*! ../common/utils */ "./node_modules/markdown-it/lib/common/utils.js").isSpace;
-+
-+
-+function getLine(state, line) {
-+  var pos = state.bMarks[line] + state.blkIndent,
-+      max = state.eMarks[line];
-+
-+  return state.src.substr(pos, max - pos);
-+}
-+
-+function escapedSplit(str) {
-+  var result = [],
-+      pos = 0,
-+      max = str.length,
-+      ch,
-+      escapes = 0,
-+      lastPos = 0,
-+      backTicked = false,
-+      lastBackTick = 0;
-+
-+  ch  = str.charCodeAt(pos);
-+
-+  while (pos < max) {
-+    if (ch === 0x60/* ` */) {
-+      if (backTicked) {
-+        // make \` close code sequence, but not open it;
-+        // the reason is: `\` is correct code block
-+        backTicked = false;
-+        lastBackTick = pos;
-+      } else if (escapes % 2 === 0) {
-+        backTicked = true;
-+        lastBackTick = pos;
-+      }
-+    } else if (ch === 0x7c/* | */ && (escapes % 2 === 0) && !backTicked) {
-+      result.push(str.substring(lastPos, pos));
-+      lastPos = pos + 1;
-+    }
-+
-+    if (ch === 0x5c/* \ */) {
-+      escapes++;
-+    } else {
-+      escapes = 0;
-+    }
-+
-+    pos++;
-+
-+    // If there was an un-closed backtick, go back to just after
-+    // the last backtick, but as if it was a normal character
-+    if (pos === max && backTicked) {
-+      backTicked = false;
-+      pos = lastBackTick + 1;
-+    }
-+
-+    ch = str.charCodeAt(pos);
-+  }
-+
-+  result.push(str.substring(lastPos));
-+
-+  return result;
-+}
-+
-+
-+module.exports = function table(state, startLine, endLine, silent) {
-+  var ch, lineText, pos, i, nextLine, columns, columnCount, token,
-+      aligns, t, tableLines, tbodyLines;
-+
-+  // should have at least two lines
-+  if (startLine + 2 > endLine) { return false; }
-+
-+  nextLine = startLine + 1;
-+
-+  if (state.sCount[nextLine] < state.blkIndent) { return false; }
-+
-+  // if it's indented more than 3 spaces, it should be a code block
-+  if (state.sCount[nextLine] - state.blkIndent >= 4) { return false; }
-+
-+  // first character of the second line should be '|', '-', ':',
-+  // and no other characters are allowed but spaces;
-+  // basically, this is the equivalent of /^[-:|][-:|\s]*$/ regexp
-+
-+  pos = state.bMarks[nextLine] + state.tShift[nextLine];
-+  if (pos >= state.eMarks[nextLine]) { return false; }
-+
-+  ch = state.src.charCodeAt(pos++);
-+  if (ch !== 0x7C/* | */ && ch !== 0x2D/* - */ && ch !== 0x3A/* : */) { return false; }
-+
-+  while (pos < state.eMarks[nextLine]) {
-+    ch = state.src.charCodeAt(pos);
-+
-+    if (ch !== 0x7C/* | */ && ch !== 0x2D/* - */ && ch !== 0x3A/* : */ && !isSpace(ch)) { return false; }
-+
-+    pos++;
-+  }
-+
-+  lineText = getLine(state, startLine + 1);
-+
-+  columns = lineText.split('|');
-+  aligns = [];
-+  for (i = 0; i < columns.length; i++) {
-+    t = columns[i].trim();
-+    if (!t) {
-+      // allow empty columns before and after table, but not in between columns;
-+      // e.g. allow ` |---| `, disallow ` ---||--- `
-+      if (i === 0 || i === columns.length - 1) {
-+        continue;
-+      } else {
-+        return false;
-+      }
-+    }
-+
-+    if (!/^:?-+:?$/.test(t)) { return false; }
-+    if (t.charCodeAt(t.length - 1) === 0x3A/* : */) {
-+      aligns.push(t.charCodeAt(0) === 0x3A/* : */ ? 'center' : 'right');
-+    } else if (t.charCodeAt(0) === 0x3A/* : */) {
-+      aligns.push('left');
-+    } else {
-+      aligns.push('');
-+    }
-+  }
-+
-+  lineText = getLine(state, startLine).trim();
-+  if (lineText.indexOf('|') === -1) { return false; }
-+  if (state.sCount[startLine] - state.blkIndent >= 4) { return false; }
-+  columns = escapedSplit(lineText.replace(/^\||\|$/g, ''));
-+
-+  // header row will define an amount of columns in the entire table,
-+  // and align row shouldn't be smaller than that (the rest of the rows can)
-+  columnCount = columns.length;
-+  if (columnCount > aligns.length) { return false; }
-+
-+  if (silent) { return true; }
-+
-+  token     = state.push('table_open', 'table', 1);
-+  token.map = tableLines = [ startLine, 0 ];
-+
-+  token     = state.push('thead_open', 'thead', 1);
-+  token.map = [ startLine, startLine + 1 ];
-+
-+  token     = state.push('tr_open', 'tr', 1);
-+  token.map = [ startLine, startLine + 1 ];
-+
-+  for (i = 0; i < columns.length; i++) {
-+    token          = state.push('th_open', 'th', 1);
-+    token.map      = [ startLine, startLine + 1 ];
-+    if (aligns[i]) {
-+      token.attrs  = [ [ 'style', 'text-align:' + aligns[i] ] ];
-+    }
-+
-+    token          = state.push('inline', '', 0);
-+    token.content  = columns[i].trim();
-+    token.map      = [ startLine, startLine + 1 ];
-+    token.children = [];
-+
-+    token          = state.push('th_close', 'th', -1);
-+  }
-+
-+  token     = state.push('tr_close', 'tr', -1);
-+  token     = state.push('thead_close', 'thead', -1);
-+
-+  token     = state.push('tbody_open', 'tbody', 1);
-+  token.map = tbodyLines = [ startLine + 2, 0 ];
-+
-+  for (nextLine = startLine + 2; nextLine < endLine; nextLine++) {
-+    if (state.sCount[nextLine] < state.blkIndent) { break; }
-+
-+    lineText = getLine(state, nextLine).trim();
-+    if (lineText.indexOf('|') === -1) { break; }
-+    if (state.sCount[nextLine] - state.blkIndent >= 4) { break; }
-+    columns = escapedSplit(lineText.replace(/^\||\|$/g, ''));
-+
-+    token = state.push('tr_open', 'tr', 1);
-+    for (i = 0; i < columnCount; i++) {
-+      token          = state.push('td_open', 'td', 1);
-+      if (aligns[i]) {
-+        token.attrs  = [ [ 'style', 'text-align:' + aligns[i] ] ];
-+      }
-+
-+      token          = state.push('inline', '', 0);
-+      token.content  = columns[i] ? columns[i].trim() : '';
-+      token.children = [];
-+
-+      token          = state.push('td_close', 'td', -1);
-+    }
-+    token = state.push('tr_close', 'tr', -1);
-+  }
-+  token = state.push('tbody_close', 'tbody', -1);
-+  token = state.push('table_close', 'table', -1);
-+
-+  tableLines[1] = tbodyLines[1] = nextLine;
-+  state.line = nextLine;
-+  return true;
-+};
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/rules_core/block.js":
-+/*!**********************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/rules_core/block.js ***!
-+  \**********************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+
-+
-+
-+module.exports = function block(state) {
-+  var token;
-+
-+  if (state.inlineMode) {
-+    token          = new state.Token('inline', '', 0);
-+    token.content  = state.src;
-+    token.map      = [ 0, 1 ];
-+    token.children = [];
-+    state.tokens.push(token);
-+  } else {
-+    state.md.block.parse(state.src, state.md, state.env, state.tokens);
-+  }
-+};
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/rules_core/inline.js":
-+/*!***********************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/rules_core/inline.js ***!
-+  \***********************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+
-+
-+module.exports = function inline(state) {
-+  var tokens = state.tokens, tok, i, l;
-+
-+  // Parse inlines
-+  for (i = 0, l = tokens.length; i < l; i++) {
-+    tok = tokens[i];
-+    if (tok.type === 'inline') {
-+      state.md.inline.parse(tok.content, state.md, state.env, tok.children);
-+    }
-+  }
-+};
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/rules_core/linkify.js":
-+/*!************************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/rules_core/linkify.js ***!
-+  \************************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// Replace link-like texts with link nodes.
-+//
-+// Currently restricted by `md.validateLink()` to http/https/ftp
-+//
-+
-+
-+
-+var arrayReplaceAt = __webpack_require__(/*! ../common/utils */ "./node_modules/markdown-it/lib/common/utils.js").arrayReplaceAt;
-+
-+
-+function isLinkOpen(str) {
-+  return /^<a[>\s]/i.test(str);
-+}
-+function isLinkClose(str) {
-+  return /^<\/a\s*>/i.test(str);
-+}
-+
-+
-+module.exports = function linkify(state) {
-+  var i, j, l, tokens, token, currentToken, nodes, ln, text, pos, lastPos,
-+      level, htmlLinkLevel, url, fullUrl, urlText,
-+      blockTokens = state.tokens,
-+      links;
-+
-+  if (!state.md.options.linkify) { return; }
-+
-+  for (j = 0, l = blockTokens.length; j < l; j++) {
-+    if (blockTokens[j].type !== 'inline' ||
-+        !state.md.linkify.pretest(blockTokens[j].content)) {
-+      continue;
-+    }
-+
-+    tokens = blockTokens[j].children;
-+
-+    htmlLinkLevel = 0;
-+
-+    // We scan from the end, to keep position when new tags added.
-+    // Use reversed logic in links start/end match
-+    for (i = tokens.length - 1; i >= 0; i--) {
-+      currentToken = tokens[i];
-+
-+      // Skip content of markdown links
-+      if (currentToken.type === 'link_close') {
-+        i--;
-+        while (tokens[i].level !== currentToken.level && tokens[i].type !== 'link_open') {
-+          i--;
-+        }
-+        continue;
-+      }
-+
-+      // Skip content of html tag links
-+      if (currentToken.type === 'html_inline') {
-+        if (isLinkOpen(currentToken.content) && htmlLinkLevel > 0) {
-+          htmlLinkLevel--;
-+        }
-+        if (isLinkClose(currentToken.content)) {
-+          htmlLinkLevel++;
-+        }
-+      }
-+      if (htmlLinkLevel > 0) { continue; }
-+
-+      if (currentToken.type === 'text' && state.md.linkify.test(currentToken.content)) {
-+
-+        text = currentToken.content;
-+        links = state.md.linkify.match(text);
-+
-+        // Now split string to nodes
-+        nodes = [];
-+        level = currentToken.level;
-+        lastPos = 0;
-+
-+        for (ln = 0; ln < links.length; ln++) {
-+
-+          url = links[ln].url;
-+          fullUrl = state.md.normalizeLink(url);
-+          if (!state.md.validateLink(fullUrl)) { continue; }
-+
-+          urlText = links[ln].text;
-+
-+          // Linkifier might send raw hostnames like "example.com", where url
-+          // starts with domain name. So we prepend http:// in those cases,
-+          // and remove it afterwards.
-+          //
-+          if (!links[ln].schema) {
-+            urlText = state.md.normalizeLinkText('http://' + urlText).replace(/^http:\/\//, '');
-+          } else if (links[ln].schema === 'mailto:' && !/^mailto:/i.test(urlText)) {
-+            urlText = state.md.normalizeLinkText('mailto:' + urlText).replace(/^mailto:/, '');
-+          } else {
-+            urlText = state.md.normalizeLinkText(urlText);
-+          }
-+
-+          pos = links[ln].index;
-+
-+          if (pos > lastPos) {
-+            token         = new state.Token('text', '', 0);
-+            token.content = text.slice(lastPos, pos);
-+            token.level   = level;
-+            nodes.push(token);
-+          }
-+
-+          token         = new state.Token('link_open', 'a', 1);
-+          token.attrs   = [ [ 'href', fullUrl ] ];
-+          token.level   = level++;
-+          token.markup  = 'linkify';
-+          token.info    = 'auto';
-+          nodes.push(token);
-+
-+          token         = new state.Token('text', '', 0);
-+          token.content = urlText;
-+          token.level   = level;
-+          nodes.push(token);
-+
-+          token         = new state.Token('link_close', 'a', -1);
-+          token.level   = --level;
-+          token.markup  = 'linkify';
-+          token.info    = 'auto';
-+          nodes.push(token);
-+
-+          lastPos = links[ln].lastIndex;
-+        }
-+        if (lastPos < text.length) {
-+          token         = new state.Token('text', '', 0);
-+          token.content = text.slice(lastPos);
-+          token.level   = level;
-+          nodes.push(token);
-+        }
-+
-+        // replace current node
-+        blockTokens[j].children = tokens = arrayReplaceAt(tokens, i, nodes);
-+      }
-+    }
-+  }
-+};
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/rules_core/normalize.js":
-+/*!**************************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/rules_core/normalize.js ***!
-+  \**************************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// Normalize input string
-+
-+
-+
-+
-+var NEWLINES_RE  = /\r[\n\u0085]?|[\u2424\u2028\u0085]/g;
-+var NULL_RE      = /\u0000/g;
-+
-+
-+module.exports = function inline(state) {
-+  var str;
-+
-+  // Normalize newlines
-+  str = state.src.replace(NEWLINES_RE, '\n');
-+
-+  // Replace NULL characters
-+  str = str.replace(NULL_RE, '\uFFFD');
-+
-+  state.src = str;
-+};
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/rules_core/replacements.js":
-+/*!*****************************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/rules_core/replacements.js ***!
-+  \*****************************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// Simple typographyc replacements
-+//
-+// (c) (C) → ©
-+// (tm) (TM) → ™
-+// (r) (R) → ®
-+// +- → ±
-+// (p) (P) -> §
-+// ... → … (also ?.... → ?.., !.... → !..)
-+// ???????? → ???, !!!!! → !!!, `,,` → `,`
-+// -- → &ndash;, --- → &mdash;
-+//
-+
-+
-+// TODO:
-+// - fractionals 1/2, 1/4, 3/4 -> ½, ¼, ¾
-+// - miltiplication 2 x 4 -> 2 × 4
-+
-+var RARE_RE = /\+-|\.\.|\?\?\?\?|!!!!|,,|--/;
-+
-+// Workaround for phantomjs - need regex without /g flag,
-+// or root check will fail every second time
-+var SCOPED_ABBR_TEST_RE = /\((c|tm|r|p)\)/i;
-+
-+var SCOPED_ABBR_RE = /\((c|tm|r|p)\)/ig;
-+var SCOPED_ABBR = {
-+  c: '©',
-+  r: '®',
-+  p: '§',
-+  tm: '™'
-+};
-+
-+function replaceFn(match, name) {
-+  return SCOPED_ABBR[name.toLowerCase()];
-+}
-+
-+function replace_scoped(inlineTokens) {
-+  var i, token, inside_autolink = 0;
-+
-+  for (i = inlineTokens.length - 1; i >= 0; i--) {
-+    token = inlineTokens[i];
-+
-+    if (token.type === 'text' && !inside_autolink) {
-+      token.content = token.content.replace(SCOPED_ABBR_RE, replaceFn);
-+    }
-+
-+    if (token.type === 'link_open' && token.info === 'auto') {
-+      inside_autolink--;
-+    }
-+
-+    if (token.type === 'link_close' && token.info === 'auto') {
-+      inside_autolink++;
-+    }
-+  }
-+}
-+
-+function replace_rare(inlineTokens) {
-+  var i, token, inside_autolink = 0;
-+
-+  for (i = inlineTokens.length - 1; i >= 0; i--) {
-+    token = inlineTokens[i];
-+
-+    if (token.type === 'text' && !inside_autolink) {
-+      if (RARE_RE.test(token.content)) {
-+        token.content = token.content
-+                    .replace(/\+-/g, '±')
-+                    // .., ..., ....... -> …
-+                    // but ?..... & !..... -> ?.. & !..
-+                    .replace(/\.{2,}/g, '…').replace(/([?!])…/g, '$1..')
-+                    .replace(/([?!]){4,}/g, '$1$1$1').replace(/,{2,}/g, ',')
-+                    // em-dash
-+                    .replace(/(^|[^-])---([^-]|$)/mg, '$1\u2014$2')
-+                    // en-dash
-+                    .replace(/(^|\s)--(\s|$)/mg, '$1\u2013$2')
-+                    .replace(/(^|[^-\s])--([^-\s]|$)/mg, '$1\u2013$2');
-+      }
-+    }
-+
-+    if (token.type === 'link_open' && token.info === 'auto') {
-+      inside_autolink--;
-+    }
-+
-+    if (token.type === 'link_close' && token.info === 'auto') {
-+      inside_autolink++;
-+    }
-+  }
-+}
-+
-+
-+module.exports = function replace(state) {
-+  var blkIdx;
-+
-+  if (!state.md.options.typographer) { return; }
-+
-+  for (blkIdx = state.tokens.length - 1; blkIdx >= 0; blkIdx--) {
-+
-+    if (state.tokens[blkIdx].type !== 'inline') { continue; }
-+
-+    if (SCOPED_ABBR_TEST_RE.test(state.tokens[blkIdx].content)) {
-+      replace_scoped(state.tokens[blkIdx].children);
-+    }
-+
-+    if (RARE_RE.test(state.tokens[blkIdx].content)) {
-+      replace_rare(state.tokens[blkIdx].children);
-+    }
-+
-+  }
-+};
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/rules_core/smartquotes.js":
-+/*!****************************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/rules_core/smartquotes.js ***!
-+  \****************************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// Convert straight quotation marks to typographic ones
-+//
-+
-+
-+
-+var isWhiteSpace   = __webpack_require__(/*! ../common/utils */ "./node_modules/markdown-it/lib/common/utils.js").isWhiteSpace;
-+var isPunctChar    = __webpack_require__(/*! ../common/utils */ "./node_modules/markdown-it/lib/common/utils.js").isPunctChar;
-+var isMdAsciiPunct = __webpack_require__(/*! ../common/utils */ "./node_modules/markdown-it/lib/common/utils.js").isMdAsciiPunct;
-+
-+var QUOTE_TEST_RE = /['"]/;
-+var QUOTE_RE = /['"]/g;
-+var APOSTROPHE = '\u2019'; /* ’ */
-+
-+
-+function replaceAt(str, index, ch) {
-+  return str.substr(0, index) + ch + str.substr(index + 1);
-+}
-+
-+function process_inlines(tokens, state) {
-+  var i, token, text, t, pos, max, thisLevel, item, lastChar, nextChar,
-+      isLastPunctChar, isNextPunctChar, isLastWhiteSpace, isNextWhiteSpace,
-+      canOpen, canClose, j, isSingle, stack, openQuote, closeQuote;
-+
-+  stack = [];
-+
-+  for (i = 0; i < tokens.length; i++) {
-+    token = tokens[i];
-+
-+    thisLevel = tokens[i].level;
-+
-+    for (j = stack.length - 1; j >= 0; j--) {
-+      if (stack[j].level <= thisLevel) { break; }
-+    }
-+    stack.length = j + 1;
-+
-+    if (token.type !== 'text') { continue; }
-+
-+    text = token.content;
-+    pos = 0;
-+    max = text.length;
-+
-+    /*eslint no-labels:0,block-scoped-var:0*/
-+    OUTER:
-+    while (pos < max) {
-+      QUOTE_RE.lastIndex = pos;
-+      t = QUOTE_RE.exec(text);
-+      if (!t) { break; }
-+
-+      canOpen = canClose = true;
-+      pos = t.index + 1;
-+      isSingle = (t[0] === "'");
-+
-+      // Find previous character,
-+      // default to space if it's the beginning of the line
-+      //
-+      lastChar = 0x20;
-+
-+      if (t.index - 1 >= 0) {
-+        lastChar = text.charCodeAt(t.index - 1);
-+      } else {
-+        for (j = i - 1; j >= 0; j--) {
-+          if (tokens[j].type === 'softbreak' || tokens[j].type === 'hardbreak') break; // lastChar defaults to 0x20
-+          if (tokens[j].type !== 'text') continue;
-+
-+          lastChar = tokens[j].content.charCodeAt(tokens[j].content.length - 1);
-+          break;
-+        }
-+      }
-+
-+      // Find next character,
-+      // default to space if it's the end of the line
-+      //
-+      nextChar = 0x20;
-+
-+      if (pos < max) {
-+        nextChar = text.charCodeAt(pos);
-+      } else {
-+        for (j = i + 1; j < tokens.length; j++) {
-+          if (tokens[j].type === 'softbreak' || tokens[j].type === 'hardbreak') break; // nextChar defaults to 0x20
-+          if (tokens[j].type !== 'text') continue;
-+
-+          nextChar = tokens[j].content.charCodeAt(0);
-+          break;
-+        }
-+      }
-+
-+      isLastPunctChar = isMdAsciiPunct(lastChar) || isPunctChar(String.fromCharCode(lastChar));
-+      isNextPunctChar = isMdAsciiPunct(nextChar) || isPunctChar(String.fromCharCode(nextChar));
-+
-+      isLastWhiteSpace = isWhiteSpace(lastChar);
-+      isNextWhiteSpace = isWhiteSpace(nextChar);
-+
-+      if (isNextWhiteSpace) {
-+        canOpen = false;
-+      } else if (isNextPunctChar) {
-+        if (!(isLastWhiteSpace || isLastPunctChar)) {
-+          canOpen = false;
-+        }
-+      }
-+
-+      if (isLastWhiteSpace) {
-+        canClose = false;
-+      } else if (isLastPunctChar) {
-+        if (!(isNextWhiteSpace || isNextPunctChar)) {
-+          canClose = false;
-+        }
-+      }
-+
-+      if (nextChar === 0x22 /* " */ && t[0] === '"') {
-+        if (lastChar >= 0x30 /* 0 */ && lastChar <= 0x39 /* 9 */) {
-+          // special case: 1"" - count first quote as an inch
-+          canClose = canOpen = false;
-+        }
-+      }
-+
-+      if (canOpen && canClose) {
-+        // treat this as the middle of the word
-+        canOpen = false;
-+        canClose = isNextPunctChar;
-+      }
-+
-+      if (!canOpen && !canClose) {
-+        // middle of word
-+        if (isSingle) {
-+          token.content = replaceAt(token.content, t.index, APOSTROPHE);
-+        }
-+        continue;
-+      }
-+
-+      if (canClose) {
-+        // this could be a closing quote, rewind the stack to get a match
-+        for (j = stack.length - 1; j >= 0; j--) {
-+          item = stack[j];
-+          if (stack[j].level < thisLevel) { break; }
-+          if (item.single === isSingle && stack[j].level === thisLevel) {
-+            item = stack[j];
-+
-+            if (isSingle) {
-+              openQuote = state.md.options.quotes[2];
-+              closeQuote = state.md.options.quotes[3];
-+            } else {
-+              openQuote = state.md.options.quotes[0];
-+              closeQuote = state.md.options.quotes[1];
-+            }
-+
-+            // replace token.content *before* tokens[item.token].content,
-+            // because, if they are pointing at the same token, replaceAt
-+            // could mess up indices when quote length != 1
-+            token.content = replaceAt(token.content, t.index, closeQuote);
-+            tokens[item.token].content = replaceAt(
-+              tokens[item.token].content, item.pos, openQuote);
-+
-+            pos += closeQuote.length - 1;
-+            if (item.token === i) { pos += openQuote.length - 1; }
-+
-+            text = token.content;
-+            max = text.length;
-+
-+            stack.length = j;
-+            continue OUTER;
-+          }
-+        }
-+      }
-+
-+      if (canOpen) {
-+        stack.push({
-+          token: i,
-+          pos: t.index,
-+          single: isSingle,
-+          level: thisLevel
-+        });
-+      } else if (canClose && isSingle) {
-+        token.content = replaceAt(token.content, t.index, APOSTROPHE);
-+      }
-+    }
-+  }
-+}
-+
-+
-+module.exports = function smartquotes(state) {
-+  /*eslint max-depth:0*/
-+  var blkIdx;
-+
-+  if (!state.md.options.typographer) { return; }
-+
-+  for (blkIdx = state.tokens.length - 1; blkIdx >= 0; blkIdx--) {
-+
-+    if (state.tokens[blkIdx].type !== 'inline' ||
-+        !QUOTE_TEST_RE.test(state.tokens[blkIdx].content)) {
-+      continue;
-+    }
-+
-+    process_inlines(state.tokens[blkIdx].children, state);
-+  }
-+};
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/rules_core/state_core.js":
-+/*!***************************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/rules_core/state_core.js ***!
-+  \***************************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// Core state object
-+//
-+
-+
-+var Token = __webpack_require__(/*! ../token */ "./node_modules/markdown-it/lib/token.js");
-+
-+
-+function StateCore(src, md, env) {
-+  this.src = src;
-+  this.env = env;
-+  this.tokens = [];
-+  this.inlineMode = false;
-+  this.md = md; // link to parser instance
-+}
-+
-+// re-export Token class to use in core rules
-+StateCore.prototype.Token = Token;
-+
-+
-+module.exports = StateCore;
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/rules_inline/autolink.js":
-+/*!***************************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/rules_inline/autolink.js ***!
-+  \***************************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// Process autolinks '<protocol:...>'
-+
-+
-+
-+
-+/*eslint max-len:0*/
-+var EMAIL_RE    = /^<([a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*)>/;
-+var AUTOLINK_RE = /^<([a-zA-Z][a-zA-Z0-9+.\-]{1,31}):([^<>\x00-\x20]*)>/;
-+
-+
-+module.exports = function autolink(state, silent) {
-+  var tail, linkMatch, emailMatch, url, fullUrl, token,
-+      pos = state.pos;
-+
-+  if (state.src.charCodeAt(pos) !== 0x3C/* < */) { return false; }
-+
-+  tail = state.src.slice(pos);
-+
-+  if (tail.indexOf('>') < 0) { return false; }
-+
-+  if (AUTOLINK_RE.test(tail)) {
-+    linkMatch = tail.match(AUTOLINK_RE);
-+
-+    url = linkMatch[0].slice(1, -1);
-+    fullUrl = state.md.normalizeLink(url);
-+    if (!state.md.validateLink(fullUrl)) { return false; }
-+
-+    if (!silent) {
-+      token         = state.push('link_open', 'a', 1);
-+      token.attrs   = [ [ 'href', fullUrl ] ];
-+      token.markup  = 'autolink';
-+      token.info    = 'auto';
-+
-+      token         = state.push('text', '', 0);
-+      token.content = state.md.normalizeLinkText(url);
-+
-+      token         = state.push('link_close', 'a', -1);
-+      token.markup  = 'autolink';
-+      token.info    = 'auto';
-+    }
-+
-+    state.pos += linkMatch[0].length;
-+    return true;
-+  }
-+
-+  if (EMAIL_RE.test(tail)) {
-+    emailMatch = tail.match(EMAIL_RE);
-+
-+    url = emailMatch[0].slice(1, -1);
-+    fullUrl = state.md.normalizeLink('mailto:' + url);
-+    if (!state.md.validateLink(fullUrl)) { return false; }
-+
-+    if (!silent) {
-+      token         = state.push('link_open', 'a', 1);
-+      token.attrs   = [ [ 'href', fullUrl ] ];
-+      token.markup  = 'autolink';
-+      token.info    = 'auto';
-+
-+      token         = state.push('text', '', 0);
-+      token.content = state.md.normalizeLinkText(url);
-+
-+      token         = state.push('link_close', 'a', -1);
-+      token.markup  = 'autolink';
-+      token.info    = 'auto';
-+    }
-+
-+    state.pos += emailMatch[0].length;
-+    return true;
-+  }
-+
-+  return false;
-+};
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/rules_inline/backticks.js":
-+/*!****************************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/rules_inline/backticks.js ***!
-+  \****************************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// Parse backticks
-+
-+
-+
-+module.exports = function backtick(state, silent) {
-+  var start, max, marker, matchStart, matchEnd, token,
-+      pos = state.pos,
-+      ch = state.src.charCodeAt(pos);
-+
-+  if (ch !== 0x60/* ` */) { return false; }
-+
-+  start = pos;
-+  pos++;
-+  max = state.posMax;
-+
-+  while (pos < max && state.src.charCodeAt(pos) === 0x60/* ` */) { pos++; }
-+
-+  marker = state.src.slice(start, pos);
-+
-+  matchStart = matchEnd = pos;
-+
-+  while ((matchStart = state.src.indexOf('`', matchEnd)) !== -1) {
-+    matchEnd = matchStart + 1;
-+
-+    while (matchEnd < max && state.src.charCodeAt(matchEnd) === 0x60/* ` */) { matchEnd++; }
-+
-+    if (matchEnd - matchStart === marker.length) {
-+      if (!silent) {
-+        token         = state.push('code_inline', 'code', 0);
-+        token.markup  = marker;
-+        token.content = state.src.slice(pos, matchStart)
-+                                 .replace(/[ \n]+/g, ' ')
-+                                 .trim();
-+      }
-+      state.pos = matchEnd;
-+      return true;
-+    }
-+  }
-+
-+  if (!silent) { state.pending += marker; }
-+  state.pos += marker.length;
-+  return true;
-+};
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/rules_inline/balance_pairs.js":
-+/*!********************************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/rules_inline/balance_pairs.js ***!
-+  \********************************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// For each opening emphasis-like marker find a matching closing one
-+//
-+
-+
-+
-+module.exports = function link_pairs(state) {
-+  var i, j, lastDelim, currDelim,
-+      delimiters = state.delimiters,
-+      max = state.delimiters.length;
-+
-+  for (i = 0; i < max; i++) {
-+    lastDelim = delimiters[i];
-+
-+    if (!lastDelim.close) { continue; }
-+
-+    j = i - lastDelim.jump - 1;
-+
-+    while (j >= 0) {
-+      currDelim = delimiters[j];
-+
-+      if (currDelim.open &&
-+          currDelim.marker === lastDelim.marker &&
-+          currDelim.end < 0 &&
-+          currDelim.level === lastDelim.level) {
-+
-+        // typeofs are for backward compatibility with plugins
-+        var odd_match = (currDelim.close || lastDelim.open) &&
-+                        typeof currDelim.length !== 'undefined' &&
-+                        typeof lastDelim.length !== 'undefined' &&
-+                        (currDelim.length + lastDelim.length) % 3 === 0;
-+
-+        if (!odd_match) {
-+          lastDelim.jump = i - j;
-+          lastDelim.open = false;
-+          currDelim.end  = i;
-+          currDelim.jump = 0;
-+          break;
-+        }
-+      }
-+
-+      j -= currDelim.jump + 1;
-+    }
-+  }
-+};
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/rules_inline/emphasis.js":
-+/*!***************************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/rules_inline/emphasis.js ***!
-+  \***************************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// Process *this* and _that_
-+//
-+
-+
-+
-+// Insert each marker as a separate text token, and add it to delimiter list
-+//
-+module.exports.tokenize = function emphasis(state, silent) {
-+  var i, scanned, token,
-+      start = state.pos,
-+      marker = state.src.charCodeAt(start);
-+
-+  if (silent) { return false; }
-+
-+  if (marker !== 0x5F /* _ */ && marker !== 0x2A /* * */) { return false; }
-+
-+  scanned = state.scanDelims(state.pos, marker === 0x2A);
-+
-+  for (i = 0; i < scanned.length; i++) {
-+    token         = state.push('text', '', 0);
-+    token.content = String.fromCharCode(marker);
-+
-+    state.delimiters.push({
-+      // Char code of the starting marker (number).
-+      //
-+      marker: marker,
-+
-+      // Total length of these series of delimiters.
-+      //
-+      length: scanned.length,
-+
-+      // An amount of characters before this one that's equivalent to
-+      // current one. In plain English: if this delimiter does not open
-+      // an emphasis, neither do previous `jump` characters.
-+      //
-+      // Used to skip sequences like "*****" in one step, for 1st asterisk
-+      // value will be 0, for 2nd it's 1 and so on.
-+      //
-+      jump:   i,
-+
-+      // A position of the token this delimiter corresponds to.
-+      //
-+      token:  state.tokens.length - 1,
-+
-+      // Token level.
-+      //
-+      level:  state.level,
-+
-+      // If this delimiter is matched as a valid opener, `end` will be
-+      // equal to its position, otherwise it's `-1`.
-+      //
-+      end:    -1,
-+
-+      // Boolean flags that determine if this delimiter could open or close
-+      // an emphasis.
-+      //
-+      open:   scanned.can_open,
-+      close:  scanned.can_close
-+    });
-+  }
-+
-+  state.pos += scanned.length;
-+
-+  return true;
-+};
-+
-+
-+// Walk through delimiter list and replace text tokens with tags
-+//
-+module.exports.postProcess = function emphasis(state) {
-+  var i,
-+      startDelim,
-+      endDelim,
-+      token,
-+      ch,
-+      isStrong,
-+      delimiters = state.delimiters,
-+      max = state.delimiters.length;
-+
-+  for (i = max - 1; i >= 0; i--) {
-+    startDelim = delimiters[i];
-+
-+    if (startDelim.marker !== 0x5F/* _ */ && startDelim.marker !== 0x2A/* * */) {
-+      continue;
-+    }
-+
-+    // Process only opening markers
-+    if (startDelim.end === -1) {
-+      continue;
-+    }
-+
-+    endDelim = delimiters[startDelim.end];
-+
-+    // If the previous delimiter has the same marker and is adjacent to this one,
-+    // merge those into one strong delimiter.
-+    //
-+    // `<em><em>whatever</em></em>` -> `<strong>whatever</strong>`
-+    //
-+    isStrong = i > 0 &&
-+               delimiters[i - 1].end === startDelim.end + 1 &&
-+               delimiters[i - 1].token === startDelim.token - 1 &&
-+               delimiters[startDelim.end + 1].token === endDelim.token + 1 &&
-+               delimiters[i - 1].marker === startDelim.marker;
-+
-+    ch = String.fromCharCode(startDelim.marker);
-+
-+    token         = state.tokens[startDelim.token];
-+    token.type    = isStrong ? 'strong_open' : 'em_open';
-+    token.tag     = isStrong ? 'strong' : 'em';
-+    token.nesting = 1;
-+    token.markup  = isStrong ? ch + ch : ch;
-+    token.content = '';
-+
-+    token         = state.tokens[endDelim.token];
-+    token.type    = isStrong ? 'strong_close' : 'em_close';
-+    token.tag     = isStrong ? 'strong' : 'em';
-+    token.nesting = -1;
-+    token.markup  = isStrong ? ch + ch : ch;
-+    token.content = '';
-+
-+    if (isStrong) {
-+      state.tokens[delimiters[i - 1].token].content = '';
-+      state.tokens[delimiters[startDelim.end + 1].token].content = '';
-+      i--;
-+    }
-+  }
-+};
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/rules_inline/entity.js":
-+/*!*************************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/rules_inline/entity.js ***!
-+  \*************************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// Process html entity - &#123;, &#xAF;, &quot;, ...
-+
-+
-+
-+var entities          = __webpack_require__(/*! ../common/entities */ "./node_modules/markdown-it/lib/common/entities.js");
-+var has               = __webpack_require__(/*! ../common/utils */ "./node_modules/markdown-it/lib/common/utils.js").has;
-+var isValidEntityCode = __webpack_require__(/*! ../common/utils */ "./node_modules/markdown-it/lib/common/utils.js").isValidEntityCode;
-+var fromCodePoint     = __webpack_require__(/*! ../common/utils */ "./node_modules/markdown-it/lib/common/utils.js").fromCodePoint;
-+
-+
-+var DIGITAL_RE = /^&#((?:x[a-f0-9]{1,8}|[0-9]{1,8}));/i;
-+var NAMED_RE   = /^&([a-z][a-z0-9]{1,31});/i;
-+
-+
-+module.exports = function entity(state, silent) {
-+  var ch, code, match, pos = state.pos, max = state.posMax;
-+
-+  if (state.src.charCodeAt(pos) !== 0x26/* & */) { return false; }
-+
-+  if (pos + 1 < max) {
-+    ch = state.src.charCodeAt(pos + 1);
-+
-+    if (ch === 0x23 /* # */) {
-+      match = state.src.slice(pos).match(DIGITAL_RE);
-+      if (match) {
-+        if (!silent) {
-+          code = match[1][0].toLowerCase() === 'x' ? parseInt(match[1].slice(1), 16) : parseInt(match[1], 10);
-+          state.pending += isValidEntityCode(code) ? fromCodePoint(code) : fromCodePoint(0xFFFD);
-+        }
-+        state.pos += match[0].length;
-+        return true;
-+      }
-+    } else {
-+      match = state.src.slice(pos).match(NAMED_RE);
-+      if (match) {
-+        if (has(entities, match[1])) {
-+          if (!silent) { state.pending += entities[match[1]]; }
-+          state.pos += match[0].length;
-+          return true;
-+        }
-+      }
-+    }
-+  }
-+
-+  if (!silent) { state.pending += '&'; }
-+  state.pos++;
-+  return true;
-+};
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/rules_inline/escape.js":
-+/*!*************************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/rules_inline/escape.js ***!
-+  \*************************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// Process escaped chars and hardbreaks
-+
-+
-+
-+var isSpace = __webpack_require__(/*! ../common/utils */ "./node_modules/markdown-it/lib/common/utils.js").isSpace;
-+
-+var ESCAPED = [];
-+
-+for (var i = 0; i < 256; i++) { ESCAPED.push(0); }
-+
-+'\\!"#$%&\'()*+,./:;<=>?@[]^_`{|}~-'
-+  .split('').forEach(function (ch) { ESCAPED[ch.charCodeAt(0)] = 1; });
-+
-+
-+module.exports = function escape(state, silent) {
-+  var ch, pos = state.pos, max = state.posMax;
-+
-+  if (state.src.charCodeAt(pos) !== 0x5C/* \ */) { return false; }
-+
-+  pos++;
-+
-+  if (pos < max) {
-+    ch = state.src.charCodeAt(pos);
-+
-+    if (ch < 256 && ESCAPED[ch] !== 0) {
-+      if (!silent) { state.pending += state.src[pos]; }
-+      state.pos += 2;
-+      return true;
-+    }
-+
-+    if (ch === 0x0A) {
-+      if (!silent) {
-+        state.push('hardbreak', 'br', 0);
-+      }
-+
-+      pos++;
-+      // skip leading whitespaces from next line
-+      while (pos < max) {
-+        ch = state.src.charCodeAt(pos);
-+        if (!isSpace(ch)) { break; }
-+        pos++;
-+      }
-+
-+      state.pos = pos;
-+      return true;
-+    }
-+  }
-+
-+  if (!silent) { state.pending += '\\'; }
-+  state.pos++;
-+  return true;
-+};
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/rules_inline/html_inline.js":
-+/*!******************************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/rules_inline/html_inline.js ***!
-+  \******************************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// Process html tags
-+
-+
-+
-+
-+var HTML_TAG_RE = __webpack_require__(/*! ../common/html_re */ "./node_modules/markdown-it/lib/common/html_re.js").HTML_TAG_RE;
-+
-+
-+function isLetter(ch) {
-+  /*eslint no-bitwise:0*/
-+  var lc = ch | 0x20; // to lower case
-+  return (lc >= 0x61/* a */) && (lc <= 0x7a/* z */);
-+}
-+
-+
-+module.exports = function html_inline(state, silent) {
-+  var ch, match, max, token,
-+      pos = state.pos;
-+
-+  if (!state.md.options.html) { return false; }
-+
-+  // Check start
-+  max = state.posMax;
-+  if (state.src.charCodeAt(pos) !== 0x3C/* < */ ||
-+      pos + 2 >= max) {
-+    return false;
-+  }
-+
-+  // Quick fail on second char
-+  ch = state.src.charCodeAt(pos + 1);
-+  if (ch !== 0x21/* ! */ &&
-+      ch !== 0x3F/* ? */ &&
-+      ch !== 0x2F/* / */ &&
-+      !isLetter(ch)) {
-+    return false;
-+  }
-+
-+  match = state.src.slice(pos).match(HTML_TAG_RE);
-+  if (!match) { return false; }
-+
-+  if (!silent) {
-+    token         = state.push('html_inline', '', 0);
-+    token.content = state.src.slice(pos, pos + match[0].length);
-+  }
-+  state.pos += match[0].length;
-+  return true;
-+};
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/rules_inline/image.js":
-+/*!************************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/rules_inline/image.js ***!
-+  \************************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// Process ![image](<src> "title")
-+
-+
-+
-+var normalizeReference   = __webpack_require__(/*! ../common/utils */ "./node_modules/markdown-it/lib/common/utils.js").normalizeReference;
-+var isSpace              = __webpack_require__(/*! ../common/utils */ "./node_modules/markdown-it/lib/common/utils.js").isSpace;
-+
-+
-+module.exports = function image(state, silent) {
-+  var attrs,
-+      code,
-+      content,
-+      label,
-+      labelEnd,
-+      labelStart,
-+      pos,
-+      ref,
-+      res,
-+      title,
-+      token,
-+      tokens,
-+      start,
-+      href = '',
-+      oldPos = state.pos,
-+      max = state.posMax;
-+
-+  if (state.src.charCodeAt(state.pos) !== 0x21/* ! */) { return false; }
-+  if (state.src.charCodeAt(state.pos + 1) !== 0x5B/* [ */) { return false; }
-+
-+  labelStart = state.pos + 2;
-+  labelEnd = state.md.helpers.parseLinkLabel(state, state.pos + 1, false);
-+
-+  // parser failed to find ']', so it's not a valid link
-+  if (labelEnd < 0) { return false; }
-+
-+  pos = labelEnd + 1;
-+  if (pos < max && state.src.charCodeAt(pos) === 0x28/* ( */) {
-+    //
-+    // Inline link
-+    //
-+
-+    // [link](  <href>  "title"  )
-+    //        ^^ skipping these spaces
-+    pos++;
-+    for (; pos < max; pos++) {
-+      code = state.src.charCodeAt(pos);
-+      if (!isSpace(code) && code !== 0x0A) { break; }
-+    }
-+    if (pos >= max) { return false; }
-+
-+    // [link](  <href>  "title"  )
-+    //          ^^^^^^ parsing link destination
-+    start = pos;
-+    res = state.md.helpers.parseLinkDestination(state.src, pos, state.posMax);
-+    if (res.ok) {
-+      href = state.md.normalizeLink(res.str);
-+      if (state.md.validateLink(href)) {
-+        pos = res.pos;
-+      } else {
-+        href = '';
-+      }
-+    }
-+
-+    // [link](  <href>  "title"  )
-+    //                ^^ skipping these spaces
-+    start = pos;
-+    for (; pos < max; pos++) {
-+      code = state.src.charCodeAt(pos);
-+      if (!isSpace(code) && code !== 0x0A) { break; }
-+    }
-+
-+    // [link](  <href>  "title"  )
-+    //                  ^^^^^^^ parsing link title
-+    res = state.md.helpers.parseLinkTitle(state.src, pos, state.posMax);
-+    if (pos < max && start !== pos && res.ok) {
-+      title = res.str;
-+      pos = res.pos;
-+
-+      // [link](  <href>  "title"  )
-+      //                         ^^ skipping these spaces
-+      for (; pos < max; pos++) {
-+        code = state.src.charCodeAt(pos);
-+        if (!isSpace(code) && code !== 0x0A) { break; }
-+      }
-+    } else {
-+      title = '';
-+    }
-+
-+    if (pos >= max || state.src.charCodeAt(pos) !== 0x29/* ) */) {
-+      state.pos = oldPos;
-+      return false;
-+    }
-+    pos++;
-+  } else {
-+    //
-+    // Link reference
-+    //
-+    if (typeof state.env.references === 'undefined') { return false; }
-+
-+    if (pos < max && state.src.charCodeAt(pos) === 0x5B/* [ */) {
-+      start = pos + 1;
-+      pos = state.md.helpers.parseLinkLabel(state, pos);
-+      if (pos >= 0) {
-+        label = state.src.slice(start, pos++);
-+      } else {
-+        pos = labelEnd + 1;
-+      }
-+    } else {
-+      pos = labelEnd + 1;
-+    }
-+
-+    // covers label === '' and label === undefined
-+    // (collapsed reference link and shortcut reference link respectively)
-+    if (!label) { label = state.src.slice(labelStart, labelEnd); }
-+
-+    ref = state.env.references[normalizeReference(label)];
-+    if (!ref) {
-+      state.pos = oldPos;
-+      return false;
-+    }
-+    href = ref.href;
-+    title = ref.title;
-+  }
-+
-+  //
-+  // We found the end of the link, and know for a fact it's a valid link;
-+  // so all that's left to do is to call tokenizer.
-+  //
-+  if (!silent) {
-+    content = state.src.slice(labelStart, labelEnd);
-+
-+    state.md.inline.parse(
-+      content,
-+      state.md,
-+      state.env,
-+      tokens = []
-+    );
-+
-+    token          = state.push('image', 'img', 0);
-+    token.attrs    = attrs = [ [ 'src', href ], [ 'alt', '' ] ];
-+    token.children = tokens;
-+    token.content  = content;
-+
-+    if (title) {
-+      attrs.push([ 'title', title ]);
-+    }
-+  }
-+
-+  state.pos = pos;
-+  state.posMax = max;
-+  return true;
-+};
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/rules_inline/link.js":
-+/*!***********************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/rules_inline/link.js ***!
-+  \***********************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// Process [link](<to> "stuff")
-+
-+
-+
-+var normalizeReference   = __webpack_require__(/*! ../common/utils */ "./node_modules/markdown-it/lib/common/utils.js").normalizeReference;
-+var isSpace              = __webpack_require__(/*! ../common/utils */ "./node_modules/markdown-it/lib/common/utils.js").isSpace;
-+
-+
-+module.exports = function link(state, silent) {
-+  var attrs,
-+      code,
-+      label,
-+      labelEnd,
-+      labelStart,
-+      pos,
-+      res,
-+      ref,
-+      title,
-+      token,
-+      href = '',
-+      oldPos = state.pos,
-+      max = state.posMax,
-+      start = state.pos,
-+      parseReference = true;
-+
-+  if (state.src.charCodeAt(state.pos) !== 0x5B/* [ */) { return false; }
-+
-+  labelStart = state.pos + 1;
-+  labelEnd = state.md.helpers.parseLinkLabel(state, state.pos, true);
-+
-+  // parser failed to find ']', so it's not a valid link
-+  if (labelEnd < 0) { return false; }
-+
-+  pos = labelEnd + 1;
-+  if (pos < max && state.src.charCodeAt(pos) === 0x28/* ( */) {
-+    //
-+    // Inline link
-+    //
-+
-+    // might have found a valid shortcut link, disable reference parsing
-+    parseReference = false;
-+
-+    // [link](  <href>  "title"  )
-+    //        ^^ skipping these spaces
-+    pos++;
-+    for (; pos < max; pos++) {
-+      code = state.src.charCodeAt(pos);
-+      if (!isSpace(code) && code !== 0x0A) { break; }
-+    }
-+    if (pos >= max) { return false; }
-+
-+    // [link](  <href>  "title"  )
-+    //          ^^^^^^ parsing link destination
-+    start = pos;
-+    res = state.md.helpers.parseLinkDestination(state.src, pos, state.posMax);
-+    if (res.ok) {
-+      href = state.md.normalizeLink(res.str);
-+      if (state.md.validateLink(href)) {
-+        pos = res.pos;
-+      } else {
-+        href = '';
-+      }
-+    }
-+
-+    // [link](  <href>  "title"  )
-+    //                ^^ skipping these spaces
-+    start = pos;
-+    for (; pos < max; pos++) {
-+      code = state.src.charCodeAt(pos);
-+      if (!isSpace(code) && code !== 0x0A) { break; }
-+    }
-+
-+    // [link](  <href>  "title"  )
-+    //                  ^^^^^^^ parsing link title
-+    res = state.md.helpers.parseLinkTitle(state.src, pos, state.posMax);
-+    if (pos < max && start !== pos && res.ok) {
-+      title = res.str;
-+      pos = res.pos;
-+
-+      // [link](  <href>  "title"  )
-+      //                         ^^ skipping these spaces
-+      for (; pos < max; pos++) {
-+        code = state.src.charCodeAt(pos);
-+        if (!isSpace(code) && code !== 0x0A) { break; }
-+      }
-+    } else {
-+      title = '';
-+    }
-+
-+    if (pos >= max || state.src.charCodeAt(pos) !== 0x29/* ) */) {
-+      // parsing a valid shortcut link failed, fallback to reference
-+      parseReference = true;
-+    }
-+    pos++;
-+  }
-+
-+  if (parseReference) {
-+    //
-+    // Link reference
-+    //
-+    if (typeof state.env.references === 'undefined') { return false; }
-+
-+    if (pos < max && state.src.charCodeAt(pos) === 0x5B/* [ */) {
-+      start = pos + 1;
-+      pos = state.md.helpers.parseLinkLabel(state, pos);
-+      if (pos >= 0) {
-+        label = state.src.slice(start, pos++);
-+      } else {
-+        pos = labelEnd + 1;
-+      }
-+    } else {
-+      pos = labelEnd + 1;
-+    }
-+
-+    // covers label === '' and label === undefined
-+    // (collapsed reference link and shortcut reference link respectively)
-+    if (!label) { label = state.src.slice(labelStart, labelEnd); }
-+
-+    ref = state.env.references[normalizeReference(label)];
-+    if (!ref) {
-+      state.pos = oldPos;
-+      return false;
-+    }
-+    href = ref.href;
-+    title = ref.title;
-+  }
-+
-+  //
-+  // We found the end of the link, and know for a fact it's a valid link;
-+  // so all that's left to do is to call tokenizer.
-+  //
-+  if (!silent) {
-+    state.pos = labelStart;
-+    state.posMax = labelEnd;
-+
-+    token        = state.push('link_open', 'a', 1);
-+    token.attrs  = attrs = [ [ 'href', href ] ];
-+    if (title) {
-+      attrs.push([ 'title', title ]);
-+    }
-+
-+    state.md.inline.tokenize(state);
-+
-+    token        = state.push('link_close', 'a', -1);
-+  }
-+
-+  state.pos = pos;
-+  state.posMax = max;
-+  return true;
-+};
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/rules_inline/newline.js":
-+/*!**************************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/rules_inline/newline.js ***!
-+  \**************************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// Proceess '\n'
-+
-+
-+
-+var isSpace = __webpack_require__(/*! ../common/utils */ "./node_modules/markdown-it/lib/common/utils.js").isSpace;
-+
-+
-+module.exports = function newline(state, silent) {
-+  var pmax, max, pos = state.pos;
-+
-+  if (state.src.charCodeAt(pos) !== 0x0A/* \n */) { return false; }
-+
-+  pmax = state.pending.length - 1;
-+  max = state.posMax;
-+
-+  // '  \n' -> hardbreak
-+  // Lookup in pending chars is bad practice! Don't copy to other rules!
-+  // Pending string is stored in concat mode, indexed lookups will cause
-+  // convertion to flat mode.
-+  if (!silent) {
-+    if (pmax >= 0 && state.pending.charCodeAt(pmax) === 0x20) {
-+      if (pmax >= 1 && state.pending.charCodeAt(pmax - 1) === 0x20) {
-+        state.pending = state.pending.replace(/ +$/, '');
-+        state.push('hardbreak', 'br', 0);
-+      } else {
-+        state.pending = state.pending.slice(0, -1);
-+        state.push('softbreak', 'br', 0);
-+      }
-+
-+    } else {
-+      state.push('softbreak', 'br', 0);
-+    }
-+  }
-+
-+  pos++;
-+
-+  // skip heading spaces for next line
-+  while (pos < max && isSpace(state.src.charCodeAt(pos))) { pos++; }
-+
-+  state.pos = pos;
-+  return true;
-+};
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/rules_inline/state_inline.js":
-+/*!*******************************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/rules_inline/state_inline.js ***!
-+  \*******************************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// Inline parser state
-+
-+
-+
-+
-+var Token          = __webpack_require__(/*! ../token */ "./node_modules/markdown-it/lib/token.js");
-+var isWhiteSpace   = __webpack_require__(/*! ../common/utils */ "./node_modules/markdown-it/lib/common/utils.js").isWhiteSpace;
-+var isPunctChar    = __webpack_require__(/*! ../common/utils */ "./node_modules/markdown-it/lib/common/utils.js").isPunctChar;
-+var isMdAsciiPunct = __webpack_require__(/*! ../common/utils */ "./node_modules/markdown-it/lib/common/utils.js").isMdAsciiPunct;
-+
-+
-+function StateInline(src, md, env, outTokens) {
-+  this.src = src;
-+  this.env = env;
-+  this.md = md;
-+  this.tokens = outTokens;
-+
-+  this.pos = 0;
-+  this.posMax = this.src.length;
-+  this.level = 0;
-+  this.pending = '';
-+  this.pendingLevel = 0;
-+
-+  this.cache = {};        // Stores { start: end } pairs. Useful for backtrack
-+                          // optimization of pairs parse (emphasis, strikes).
-+
-+  this.delimiters = [];   // Emphasis-like delimiters
-+}
-+
-+
-+// Flush pending text
-+//
-+StateInline.prototype.pushPending = function () {
-+  var token = new Token('text', '', 0);
-+  token.content = this.pending;
-+  token.level = this.pendingLevel;
-+  this.tokens.push(token);
-+  this.pending = '';
-+  return token;
-+};
-+
-+
-+// Push new token to "stream".
-+// If pending text exists - flush it as text token
-+//
-+StateInline.prototype.push = function (type, tag, nesting) {
-+  if (this.pending) {
-+    this.pushPending();
-+  }
-+
-+  var token = new Token(type, tag, nesting);
-+
-+  if (nesting < 0) { this.level--; }
-+  token.level = this.level;
-+  if (nesting > 0) { this.level++; }
-+
-+  this.pendingLevel = this.level;
-+  this.tokens.push(token);
-+  return token;
-+};
-+
-+
-+// Scan a sequence of emphasis-like markers, and determine whether
-+// it can start an emphasis sequence or end an emphasis sequence.
-+//
-+//  - start - position to scan from (it should point at a valid marker);
-+//  - canSplitWord - determine if these markers can be found inside a word
-+//
-+StateInline.prototype.scanDelims = function (start, canSplitWord) {
-+  var pos = start, lastChar, nextChar, count, can_open, can_close,
-+      isLastWhiteSpace, isLastPunctChar,
-+      isNextWhiteSpace, isNextPunctChar,
-+      left_flanking = true,
-+      right_flanking = true,
-+      max = this.posMax,
-+      marker = this.src.charCodeAt(start);
-+
-+  // treat beginning of the line as a whitespace
-+  lastChar = start > 0 ? this.src.charCodeAt(start - 1) : 0x20;
-+
-+  while (pos < max && this.src.charCodeAt(pos) === marker) { pos++; }
-+
-+  count = pos - start;
-+
-+  // treat end of the line as a whitespace
-+  nextChar = pos < max ? this.src.charCodeAt(pos) : 0x20;
-+
-+  isLastPunctChar = isMdAsciiPunct(lastChar) || isPunctChar(String.fromCharCode(lastChar));
-+  isNextPunctChar = isMdAsciiPunct(nextChar) || isPunctChar(String.fromCharCode(nextChar));
-+
-+  isLastWhiteSpace = isWhiteSpace(lastChar);
-+  isNextWhiteSpace = isWhiteSpace(nextChar);
-+
-+  if (isNextWhiteSpace) {
-+    left_flanking = false;
-+  } else if (isNextPunctChar) {
-+    if (!(isLastWhiteSpace || isLastPunctChar)) {
-+      left_flanking = false;
-+    }
-+  }
-+
-+  if (isLastWhiteSpace) {
-+    right_flanking = false;
-+  } else if (isLastPunctChar) {
-+    if (!(isNextWhiteSpace || isNextPunctChar)) {
-+      right_flanking = false;
-+    }
-+  }
-+
-+  if (!canSplitWord) {
-+    can_open  = left_flanking  && (!right_flanking || isLastPunctChar);
-+    can_close = right_flanking && (!left_flanking  || isNextPunctChar);
-+  } else {
-+    can_open  = left_flanking;
-+    can_close = right_flanking;
-+  }
-+
-+  return {
-+    can_open:  can_open,
-+    can_close: can_close,
-+    length:    count
-+  };
-+};
-+
-+
-+// re-export Token class to use in block rules
-+StateInline.prototype.Token = Token;
-+
-+
-+module.exports = StateInline;
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/rules_inline/strikethrough.js":
-+/*!********************************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/rules_inline/strikethrough.js ***!
-+  \********************************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// ~~strike through~~
-+//
-+
-+
-+
-+// Insert each marker as a separate text token, and add it to delimiter list
-+//
-+module.exports.tokenize = function strikethrough(state, silent) {
-+  var i, scanned, token, len, ch,
-+      start = state.pos,
-+      marker = state.src.charCodeAt(start);
-+
-+  if (silent) { return false; }
-+
-+  if (marker !== 0x7E/* ~ */) { return false; }
-+
-+  scanned = state.scanDelims(state.pos, true);
-+  len = scanned.length;
-+  ch = String.fromCharCode(marker);
-+
-+  if (len < 2) { return false; }
-+
-+  if (len % 2) {
-+    token         = state.push('text', '', 0);
-+    token.content = ch;
-+    len--;
-+  }
-+
-+  for (i = 0; i < len; i += 2) {
-+    token         = state.push('text', '', 0);
-+    token.content = ch + ch;
-+
-+    state.delimiters.push({
-+      marker: marker,
-+      jump:   i,
-+      token:  state.tokens.length - 1,
-+      level:  state.level,
-+      end:    -1,
-+      open:   scanned.can_open,
-+      close:  scanned.can_close
-+    });
-+  }
-+
-+  state.pos += scanned.length;
-+
-+  return true;
-+};
-+
-+
-+// Walk through delimiter list and replace text tokens with tags
-+//
-+module.exports.postProcess = function strikethrough(state) {
-+  var i, j,
-+      startDelim,
-+      endDelim,
-+      token,
-+      loneMarkers = [],
-+      delimiters = state.delimiters,
-+      max = state.delimiters.length;
-+
-+  for (i = 0; i < max; i++) {
-+    startDelim = delimiters[i];
-+
-+    if (startDelim.marker !== 0x7E/* ~ */) {
-+      continue;
-+    }
-+
-+    if (startDelim.end === -1) {
-+      continue;
-+    }
-+
-+    endDelim = delimiters[startDelim.end];
-+
-+    token         = state.tokens[startDelim.token];
-+    token.type    = 's_open';
-+    token.tag     = 's';
-+    token.nesting = 1;
-+    token.markup  = '~~';
-+    token.content = '';
-+
-+    token         = state.tokens[endDelim.token];
-+    token.type    = 's_close';
-+    token.tag     = 's';
-+    token.nesting = -1;
-+    token.markup  = '~~';
-+    token.content = '';
-+
-+    if (state.tokens[endDelim.token - 1].type === 'text' &&
-+        state.tokens[endDelim.token - 1].content === '~') {
-+
-+      loneMarkers.push(endDelim.token - 1);
-+    }
-+  }
-+
-+  // If a marker sequence has an odd number of characters, it's splitted
-+  // like this: `~~~~~` -> `~` + `~~` + `~~`, leaving one marker at the
-+  // start of the sequence.
-+  //
-+  // So, we have to move all those markers after subsequent s_close tags.
-+  //
-+  while (loneMarkers.length) {
-+    i = loneMarkers.pop();
-+    j = i + 1;
-+
-+    while (j < state.tokens.length && state.tokens[j].type === 's_close') {
-+      j++;
-+    }
-+
-+    j--;
-+
-+    if (i !== j) {
-+      token = state.tokens[j];
-+      state.tokens[j] = state.tokens[i];
-+      state.tokens[i] = token;
-+    }
-+  }
-+};
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/rules_inline/text.js":
-+/*!***********************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/rules_inline/text.js ***!
-+  \***********************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// Skip text characters for text token, place those to pending buffer
-+// and increment current pos
-+
-+
-+
-+
-+// Rule to skip pure text
-+// '{}$%@~+=:' reserved for extentions
-+
-+// !, ", #, $, %, &, ', (, ), *, +, ,, -, ., /, :, ;, <, =, >, ?, @, [, \, ], ^, _, `, {, |, }, or ~
-+
-+// !!!! Don't confuse with "Markdown ASCII Punctuation" chars
-+// http://spec.commonmark.org/0.15/#ascii-punctuation-character
-+function isTerminatorChar(ch) {
-+  switch (ch) {
-+    case 0x0A/* \n */:
-+    case 0x21/* ! */:
-+    case 0x23/* # */:
-+    case 0x24/* $ */:
-+    case 0x25/* % */:
-+    case 0x26/* & */:
-+    case 0x2A/* * */:
-+    case 0x2B/* + */:
-+    case 0x2D/* - */:
-+    case 0x3A/* : */:
-+    case 0x3C/* < */:
-+    case 0x3D/* = */:
-+    case 0x3E/* > */:
-+    case 0x40/* @ */:
-+    case 0x5B/* [ */:
-+    case 0x5C/* \ */:
-+    case 0x5D/* ] */:
-+    case 0x5E/* ^ */:
-+    case 0x5F/* _ */:
-+    case 0x60/* ` */:
-+    case 0x7B/* { */:
-+    case 0x7D/* } */:
-+    case 0x7E/* ~ */:
-+      return true;
-+    default:
-+      return false;
-+  }
-+}
-+
-+module.exports = function text(state, silent) {
-+  var pos = state.pos;
-+
-+  while (pos < state.posMax && !isTerminatorChar(state.src.charCodeAt(pos))) {
-+    pos++;
-+  }
-+
-+  if (pos === state.pos) { return false; }
-+
-+  if (!silent) { state.pending += state.src.slice(state.pos, pos); }
-+
-+  state.pos = pos;
-+
-+  return true;
-+};
-+
-+// Alternative implementation, for memory.
-+//
-+// It costs 10% of performance, but allows extend terminators list, if place it
-+// to `ParcerInline` property. Probably, will switch to it sometime, such
-+// flexibility required.
-+
-+/*
-+var TERMINATOR_RE = /[\n!#$%&*+\-:<=>@[\\\]^_`{}~]/;
-+
-+module.exports = function text(state, silent) {
-+  var pos = state.pos,
-+      idx = state.src.slice(pos).search(TERMINATOR_RE);
-+
-+  // first char is terminator -> empty text
-+  if (idx === 0) { return false; }
-+
-+  // no terminator -> text till end of string
-+  if (idx < 0) {
-+    if (!silent) { state.pending += state.src.slice(pos); }
-+    state.pos = state.src.length;
-+    return true;
-+  }
-+
-+  if (!silent) { state.pending += state.src.slice(pos, pos + idx); }
-+
-+  state.pos += idx;
-+
-+  return true;
-+};*/
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/rules_inline/text_collapse.js":
-+/*!********************************************************************!*\
-+  !*** ./node_modules/markdown-it/lib/rules_inline/text_collapse.js ***!
-+  \********************************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// Merge adjacent text nodes into one, and re-calculate all token levels
-+//
-+
-+
-+
-+module.exports = function text_collapse(state) {
-+  var curr, last,
-+      level = 0,
-+      tokens = state.tokens,
-+      max = state.tokens.length;
-+
-+  for (curr = last = 0; curr < max; curr++) {
-+    // re-calculate levels
-+    level += tokens[curr].nesting;
-+    tokens[curr].level = level;
-+
-+    if (tokens[curr].type === 'text' &&
-+        curr + 1 < max &&
-+        tokens[curr + 1].type === 'text') {
-+
-+      // collapse two adjacent text nodes
-+      tokens[curr + 1].content = tokens[curr].content + tokens[curr + 1].content;
-+    } else {
-+      if (curr !== last) { tokens[last] = tokens[curr]; }
-+
-+      last++;
-+    }
-+  }
-+
-+  if (curr !== last) {
-+    tokens.length = last;
-+  }
-+};
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/markdown-it/lib/token.js":
-+/*!***********************************************!*\
-+  !*** ./node_modules/markdown-it/lib/token.js ***!
-+  \***********************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// Token class
-+
-+
-+
-+
-+/**
-+ * class Token
-+ **/
-+
-+/**
-+ * new Token(type, tag, nesting)
-+ *
-+ * Create new token and fill passed properties.
-+ **/
-+function Token(type, tag, nesting) {
-+  /**
-+   * Token#type -> String
-+   *
-+   * Type of the token (string, e.g. "paragraph_open")
-+   **/
-+  this.type     = type;
-+
-+  /**
-+   * Token#tag -> String
-+   *
-+   * html tag name, e.g. "p"
-+   **/
-+  this.tag      = tag;
-+
-+  /**
-+   * Token#attrs -> Array
-+   *
-+   * Html attributes. Format: `[ [ name1, value1 ], [ name2, value2 ] ]`
-+   **/
-+  this.attrs    = null;
-+
-+  /**
-+   * Token#map -> Array
-+   *
-+   * Source map info. Format: `[ line_begin, line_end ]`
-+   **/
-+  this.map      = null;
-+
-+  /**
-+   * Token#nesting -> Number
-+   *
-+   * Level change (number in {-1, 0, 1} set), where:
-+   *
-+   * -  `1` means the tag is opening
-+   * -  `0` means the tag is self-closing
-+   * - `-1` means the tag is closing
-+   **/
-+  this.nesting  = nesting;
-+
-+  /**
-+   * Token#level -> Number
-+   *
-+   * nesting level, the same as `state.level`
-+   **/
-+  this.level    = 0;
-+
-+  /**
-+   * Token#children -> Array
-+   *
-+   * An array of child nodes (inline and img tokens)
-+   **/
-+  this.children = null;
-+
-+  /**
-+   * Token#content -> String
-+   *
-+   * In a case of self-closing tag (code, html, fence, etc.),
-+   * it has contents of this tag.
-+   **/
-+  this.content  = '';
-+
-+  /**
-+   * Token#markup -> String
-+   *
-+   * '*' or '_' for emphasis, fence string for fence, etc.
-+   **/
-+  this.markup   = '';
-+
-+  /**
-+   * Token#info -> String
-+   *
-+   * fence infostring
-+   **/
-+  this.info     = '';
-+
-+  /**
-+   * Token#meta -> Object
-+   *
-+   * A place for plugins to store an arbitrary data
-+   **/
-+  this.meta     = null;
-+
-+  /**
-+   * Token#block -> Boolean
-+   *
-+   * True for block-level tokens, false for inline tokens.
-+   * Used in renderer to calculate line breaks
-+   **/
-+  this.block    = false;
-+
-+  /**
-+   * Token#hidden -> Boolean
-+   *
-+   * If it's true, ignore this element when rendering. Used for tight lists
-+   * to hide paragraphs.
-+   **/
-+  this.hidden   = false;
-+}
-+
-+
-+/**
-+ * Token.attrIndex(name) -> Number
-+ *
-+ * Search attribute index by name.
-+ **/
-+Token.prototype.attrIndex = function attrIndex(name) {
-+  var attrs, i, len;
-+
-+  if (!this.attrs) { return -1; }
-+
-+  attrs = this.attrs;
-+
-+  for (i = 0, len = attrs.length; i < len; i++) {
-+    if (attrs[i][0] === name) { return i; }
-+  }
-+  return -1;
-+};
-+
-+
-+/**
-+ * Token.attrPush(attrData)
-+ *
-+ * Add `[ name, value ]` attribute to list. Init attrs if necessary
-+ **/
-+Token.prototype.attrPush = function attrPush(attrData) {
-+  if (this.attrs) {
-+    this.attrs.push(attrData);
-+  } else {
-+    this.attrs = [ attrData ];
-+  }
-+};
-+
-+
-+/**
-+ * Token.attrSet(name, value)
-+ *
-+ * Set `name` attribute to `value`. Override old value if exists.
-+ **/
-+Token.prototype.attrSet = function attrSet(name, value) {
-+  var idx = this.attrIndex(name),
-+      attrData = [ name, value ];
-+
-+  if (idx < 0) {
-+    this.attrPush(attrData);
-+  } else {
-+    this.attrs[idx] = attrData;
-+  }
-+};
-+
-+
-+/**
-+ * Token.attrGet(name)
-+ *
-+ * Get the value of attribute `name`, or null if it does not exist.
-+ **/
-+Token.prototype.attrGet = function attrGet(name) {
-+  var idx = this.attrIndex(name), value = null;
-+  if (idx >= 0) {
-+    value = this.attrs[idx][1];
-+  }
-+  return value;
-+};
-+
-+
-+/**
-+ * Token.attrJoin(name, value)
-+ *
-+ * Join value to existing attribute via space. Or create new attribute if not
-+ * exists. Useful to operate with token classes.
-+ **/
-+Token.prototype.attrJoin = function attrJoin(name, value) {
-+  var idx = this.attrIndex(name);
-+
-+  if (idx < 0) {
-+    this.attrPush([ name, value ]);
-+  } else {
-+    this.attrs[idx][1] = this.attrs[idx][1] + ' ' + value;
-+  }
-+};
-+
-+
-+module.exports = Token;
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/mdurl/decode.js":
-+/*!**************************************!*\
-+  !*** ./node_modules/mdurl/decode.js ***!
-+  \**************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+
-+
-+
-+
-+/* eslint-disable no-bitwise */
-+
-+var decodeCache = {};
-+
-+function getDecodeCache(exclude) {
-+  var i, ch, cache = decodeCache[exclude];
-+  if (cache) { return cache; }
-+
-+  cache = decodeCache[exclude] = [];
-+
-+  for (i = 0; i < 128; i++) {
-+    ch = String.fromCharCode(i);
-+    cache.push(ch);
-+  }
-+
-+  for (i = 0; i < exclude.length; i++) {
-+    ch = exclude.charCodeAt(i);
-+    cache[ch] = '%' + ('0' + ch.toString(16).toUpperCase()).slice(-2);
-+  }
-+
-+  return cache;
-+}
-+
-+
-+// Decode percent-encoded string.
-+//
-+function decode(string, exclude) {
-+  var cache;
-+
-+  if (typeof exclude !== 'string') {
-+    exclude = decode.defaultChars;
-+  }
-+
-+  cache = getDecodeCache(exclude);
-+
-+  return string.replace(/(%[a-f0-9]{2})+/gi, function(seq) {
-+    var i, l, b1, b2, b3, b4, chr,
-+        result = '';
-+
-+    for (i = 0, l = seq.length; i < l; i += 3) {
-+      b1 = parseInt(seq.slice(i + 1, i + 3), 16);
-+
-+      if (b1 < 0x80) {
-+        result += cache[b1];
-+        continue;
-+      }
-+
-+      if ((b1 & 0xE0) === 0xC0 && (i + 3 < l)) {
-+        // 110xxxxx 10xxxxxx
-+        b2 = parseInt(seq.slice(i + 4, i + 6), 16);
-+
-+        if ((b2 & 0xC0) === 0x80) {
-+          chr = ((b1 << 6) & 0x7C0) | (b2 & 0x3F);
-+
-+          if (chr < 0x80) {
-+            result += '\ufffd\ufffd';
-+          } else {
-+            result += String.fromCharCode(chr);
-+          }
-+
-+          i += 3;
-+          continue;
-+        }
-+      }
-+
-+      if ((b1 & 0xF0) === 0xE0 && (i + 6 < l)) {
-+        // 1110xxxx 10xxxxxx 10xxxxxx
-+        b2 = parseInt(seq.slice(i + 4, i + 6), 16);
-+        b3 = parseInt(seq.slice(i + 7, i + 9), 16);
-+
-+        if ((b2 & 0xC0) === 0x80 && (b3 & 0xC0) === 0x80) {
-+          chr = ((b1 << 12) & 0xF000) | ((b2 << 6) & 0xFC0) | (b3 & 0x3F);
-+
-+          if (chr < 0x800 || (chr >= 0xD800 && chr <= 0xDFFF)) {
-+            result += '\ufffd\ufffd\ufffd';
-+          } else {
-+            result += String.fromCharCode(chr);
-+          }
-+
-+          i += 6;
-+          continue;
-+        }
-+      }
-+
-+      if ((b1 & 0xF8) === 0xF0 && (i + 9 < l)) {
-+        // 111110xx 10xxxxxx 10xxxxxx 10xxxxxx
-+        b2 = parseInt(seq.slice(i + 4, i + 6), 16);
-+        b3 = parseInt(seq.slice(i + 7, i + 9), 16);
-+        b4 = parseInt(seq.slice(i + 10, i + 12), 16);
-+
-+        if ((b2 & 0xC0) === 0x80 && (b3 & 0xC0) === 0x80 && (b4 & 0xC0) === 0x80) {
-+          chr = ((b1 << 18) & 0x1C0000) | ((b2 << 12) & 0x3F000) | ((b3 << 6) & 0xFC0) | (b4 & 0x3F);
-+
-+          if (chr < 0x10000 || chr > 0x10FFFF) {
-+            result += '\ufffd\ufffd\ufffd\ufffd';
-+          } else {
-+            chr -= 0x10000;
-+            result += String.fromCharCode(0xD800 + (chr >> 10), 0xDC00 + (chr & 0x3FF));
-+          }
-+
-+          i += 9;
-+          continue;
-+        }
-+      }
-+
-+      result += '\ufffd';
-+    }
-+
-+    return result;
-+  });
-+}
-+
-+
-+decode.defaultChars   = ';/?:@&=+$,#';
-+decode.componentChars = '';
-+
-+
-+module.exports = decode;
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/mdurl/encode.js":
-+/*!**************************************!*\
-+  !*** ./node_modules/mdurl/encode.js ***!
-+  \**************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+
-+
-+
-+
-+var encodeCache = {};
-+
-+
-+// Create a lookup array where anything but characters in `chars` string
-+// and alphanumeric chars is percent-encoded.
-+//
-+function getEncodeCache(exclude) {
-+  var i, ch, cache = encodeCache[exclude];
-+  if (cache) { return cache; }
-+
-+  cache = encodeCache[exclude] = [];
-+
-+  for (i = 0; i < 128; i++) {
-+    ch = String.fromCharCode(i);
-+
-+    if (/^[0-9a-z]$/i.test(ch)) {
-+      // always allow unencoded alphanumeric characters
-+      cache.push(ch);
-+    } else {
-+      cache.push('%' + ('0' + i.toString(16).toUpperCase()).slice(-2));
-+    }
-+  }
-+
-+  for (i = 0; i < exclude.length; i++) {
-+    cache[exclude.charCodeAt(i)] = exclude[i];
-+  }
-+
-+  return cache;
-+}
-+
-+
-+// Encode unsafe characters with percent-encoding, skipping already
-+// encoded sequences.
-+//
-+//  - string       - string to encode
-+//  - exclude      - list of characters to ignore (in addition to a-zA-Z0-9)
-+//  - keepEscaped  - don't encode '%' in a correct escape sequence (default: true)
-+//
-+function encode(string, exclude, keepEscaped) {
-+  var i, l, code, nextCode, cache,
-+      result = '';
-+
-+  if (typeof exclude !== 'string') {
-+    // encode(string, keepEscaped)
-+    keepEscaped  = exclude;
-+    exclude = encode.defaultChars;
-+  }
-+
-+  if (typeof keepEscaped === 'undefined') {
-+    keepEscaped = true;
-+  }
-+
-+  cache = getEncodeCache(exclude);
-+
-+  for (i = 0, l = string.length; i < l; i++) {
-+    code = string.charCodeAt(i);
-+
-+    if (keepEscaped && code === 0x25 /* % */ && i + 2 < l) {
-+      if (/^[0-9a-f]{2}$/i.test(string.slice(i + 1, i + 3))) {
-+        result += string.slice(i, i + 3);
-+        i += 2;
-+        continue;
-+      }
-+    }
-+
-+    if (code < 128) {
-+      result += cache[code];
-+      continue;
-+    }
-+
-+    if (code >= 0xD800 && code <= 0xDFFF) {
-+      if (code >= 0xD800 && code <= 0xDBFF && i + 1 < l) {
-+        nextCode = string.charCodeAt(i + 1);
-+        if (nextCode >= 0xDC00 && nextCode <= 0xDFFF) {
-+          result += encodeURIComponent(string[i] + string[i + 1]);
-+          i++;
-+          continue;
-+        }
-+      }
-+      result += '%EF%BF%BD';
-+      continue;
-+    }
-+
-+    result += encodeURIComponent(string[i]);
-+  }
-+
-+  return result;
-+}
-+
-+encode.defaultChars   = ";/?:@&=+$,-_.!~*'()#";
-+encode.componentChars = "-_.!~*'()";
-+
-+
-+module.exports = encode;
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/mdurl/format.js":
-+/*!**************************************!*\
-+  !*** ./node_modules/mdurl/format.js ***!
-+  \**************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+
-+
-+
-+
-+module.exports = function format(url) {
-+  var result = '';
-+
-+  result += url.protocol || '';
-+  result += url.slashes ? '//' : '';
-+  result += url.auth ? url.auth + '@' : '';
-+
-+  if (url.hostname && url.hostname.indexOf(':') !== -1) {
-+    // ipv6 address
-+    result += '[' + url.hostname + ']';
-+  } else {
-+    result += url.hostname || '';
-+  }
-+
-+  result += url.port ? ':' + url.port : '';
-+  result += url.pathname || '';
-+  result += url.search || '';
-+  result += url.hash || '';
-+
-+  return result;
-+};
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/mdurl/index.js":
-+/*!*************************************!*\
-+  !*** ./node_modules/mdurl/index.js ***!
-+  \*************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+
-+
-+
-+module.exports.encode = __webpack_require__(/*! ./encode */ "./node_modules/mdurl/encode.js");
-+module.exports.decode = __webpack_require__(/*! ./decode */ "./node_modules/mdurl/decode.js");
-+module.exports.format = __webpack_require__(/*! ./format */ "./node_modules/mdurl/format.js");
-+module.exports.parse  = __webpack_require__(/*! ./parse */ "./node_modules/mdurl/parse.js");
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/mdurl/parse.js":
-+/*!*************************************!*\
-+  !*** ./node_modules/mdurl/parse.js ***!
-+  \*************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+// Copyright Joyent, Inc. and other Node contributors.
-+//
-+// Permission is hereby granted, free of charge, to any person obtaining a
-+// copy of this software and associated documentation files (the
-+// "Software"), to deal in the Software without restriction, including
-+// without limitation the rights to use, copy, modify, merge, publish,
-+// distribute, sublicense, and/or sell copies of the Software, and to permit
-+// persons to whom the Software is furnished to do so, subject to the
-+// following conditions:
-+//
-+// The above copyright notice and this permission notice shall be included
-+// in all copies or substantial portions of the Software.
-+//
-+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-+// USE OR OTHER DEALINGS IN THE SOFTWARE.
-+
-+
-+
-+//
-+// Changes from joyent/node:
-+//
-+// 1. No leading slash in paths,
-+//    e.g. in `url.parse('http://foo?bar')` pathname is ``, not `/`
-+//
-+// 2. Backslashes are not replaced with slashes,
-+//    so `http:\\example.org\` is treated like a relative path
-+//
-+// 3. Trailing colon is treated like a part of the path,
-+//    i.e. in `http://example.org:foo` pathname is `:foo`
-+//
-+// 4. Nothing is URL-encoded in the resulting object,
-+//    (in joyent/node some chars in auth and paths are encoded)
-+//
-+// 5. `url.parse()` does not have `parseQueryString` argument
-+//
-+// 6. Removed extraneous result properties: `host`, `path`, `query`, etc.,
-+//    which can be constructed using other parts of the url.
-+//
-+
-+
-+function Url() {
-+  this.protocol = null;
-+  this.slashes = null;
-+  this.auth = null;
-+  this.port = null;
-+  this.hostname = null;
-+  this.hash = null;
-+  this.search = null;
-+  this.pathname = null;
-+}
-+
-+// Reference: RFC 3986, RFC 1808, RFC 2396
-+
-+// define these here so at least they only have to be
-+// compiled once on the first module load.
-+var protocolPattern = /^([a-z0-9.+-]+:)/i,
-+    portPattern = /:[0-9]*$/,
-+
-+    // Special case for a simple path URL
-+    simplePathPattern = /^(\/\/?(?!\/)[^\?\s]*)(\?[^\s]*)?$/,
-+
-+    // RFC 2396: characters reserved for delimiting URLs.
-+    // We actually just auto-escape these.
-+    delims = [ '<', '>', '"', '`', ' ', '\r', '\n', '\t' ],
-+
-+    // RFC 2396: characters not allowed for various reasons.
-+    unwise = [ '{', '}', '|', '\\', '^', '`' ].concat(delims),
-+
-+    // Allowed by RFCs, but cause of XSS attacks.  Always escape these.
-+    autoEscape = [ '\'' ].concat(unwise),
-+    // Characters that are never ever allowed in a hostname.
-+    // Note that any invalid chars are also handled, but these
-+    // are the ones that are *expected* to be seen, so we fast-path
-+    // them.
-+    nonHostChars = [ '%', '/', '?', ';', '#' ].concat(autoEscape),
-+    hostEndingChars = [ '/', '?', '#' ],
-+    hostnameMaxLen = 255,
-+    hostnamePartPattern = /^[+a-z0-9A-Z_-]{0,63}$/,
-+    hostnamePartStart = /^([+a-z0-9A-Z_-]{0,63})(.*)$/,
-+    // protocols that can allow "unsafe" and "unwise" chars.
-+    /* eslint-disable no-script-url */
-+    // protocols that never have a hostname.
-+    hostlessProtocol = {
-+      'javascript': true,
-+      'javascript:': true
-+    },
-+    // protocols that always contain a // bit.
-+    slashedProtocol = {
-+      'http': true,
-+      'https': true,
-+      'ftp': true,
-+      'gopher': true,
-+      'file': true,
-+      'http:': true,
-+      'https:': true,
-+      'ftp:': true,
-+      'gopher:': true,
-+      'file:': true
-+    };
-+    /* eslint-enable no-script-url */
-+
-+function urlParse(url, slashesDenoteHost) {
-+  if (url && url instanceof Url) { return url; }
-+
-+  var u = new Url();
-+  u.parse(url, slashesDenoteHost);
-+  return u;
-+}
-+
-+Url.prototype.parse = function(url, slashesDenoteHost) {
-+  var i, l, lowerProto, hec, slashes,
-+      rest = url;
-+
-+  // trim before proceeding.
-+  // This is to support parse stuff like "  http://foo.com  \n"
-+  rest = rest.trim();
-+
-+  if (!slashesDenoteHost && url.split('#').length === 1) {
-+    // Try fast path regexp
-+    var simplePath = simplePathPattern.exec(rest);
-+    if (simplePath) {
-+      this.pathname = simplePath[1];
-+      if (simplePath[2]) {
-+        this.search = simplePath[2];
-+      }
-+      return this;
-+    }
-+  }
-+
-+  var proto = protocolPattern.exec(rest);
-+  if (proto) {
-+    proto = proto[0];
-+    lowerProto = proto.toLowerCase();
-+    this.protocol = proto;
-+    rest = rest.substr(proto.length);
-+  }
-+
-+  // figure out if it's got a host
-+  // user@server is *always* interpreted as a hostname, and url
-+  // resolution will treat //foo/bar as host=foo,path=bar because that's
-+  // how the browser resolves relative URLs.
-+  if (slashesDenoteHost || proto || rest.match(/^\/\/[^@\/]+@[^@\/]+/)) {
-+    slashes = rest.substr(0, 2) === '//';
-+    if (slashes && !(proto && hostlessProtocol[proto])) {
-+      rest = rest.substr(2);
-+      this.slashes = true;
-+    }
-+  }
-+
-+  if (!hostlessProtocol[proto] &&
-+      (slashes || (proto && !slashedProtocol[proto]))) {
-+
-+    // there's a hostname.
-+    // the first instance of /, ?, ;, or # ends the host.
-+    //
-+    // If there is an @ in the hostname, then non-host chars *are* allowed
-+    // to the left of the last @ sign, unless some host-ending character
-+    // comes *before* the @-sign.
-+    // URLs are obnoxious.
-+    //
-+    // ex:
-+    // http://a@b@c/ => user:a@b host:c
-+    // http://a@b?@c => user:a host:c path:/?@c
-+
-+    // v0.12 TODO(isaacs): This is not quite how Chrome does things.
-+    // Review our test case against browsers more comprehensively.
-+
-+    // find the first instance of any hostEndingChars
-+    var hostEnd = -1;
-+    for (i = 0; i < hostEndingChars.length; i++) {
-+      hec = rest.indexOf(hostEndingChars[i]);
-+      if (hec !== -1 && (hostEnd === -1 || hec < hostEnd)) {
-+        hostEnd = hec;
-+      }
-+    }
-+
-+    // at this point, either we have an explicit point where the
-+    // auth portion cannot go past, or the last @ char is the decider.
-+    var auth, atSign;
-+    if (hostEnd === -1) {
-+      // atSign can be anywhere.
-+      atSign = rest.lastIndexOf('@');
-+    } else {
-+      // atSign must be in auth portion.
-+      // http://a@b/c@d => host:b auth:a path:/c@d
-+      atSign = rest.lastIndexOf('@', hostEnd);
-+    }
-+
-+    // Now we have a portion which is definitely the auth.
-+    // Pull that off.
-+    if (atSign !== -1) {
-+      auth = rest.slice(0, atSign);
-+      rest = rest.slice(atSign + 1);
-+      this.auth = auth;
-+    }
-+
-+    // the host is the remaining to the left of the first non-host char
-+    hostEnd = -1;
-+    for (i = 0; i < nonHostChars.length; i++) {
-+      hec = rest.indexOf(nonHostChars[i]);
-+      if (hec !== -1 && (hostEnd === -1 || hec < hostEnd)) {
-+        hostEnd = hec;
-+      }
-+    }
-+    // if we still have not hit it, then the entire thing is a host.
-+    if (hostEnd === -1) {
-+      hostEnd = rest.length;
-+    }
-+
-+    if (rest[hostEnd - 1] === ':') { hostEnd--; }
-+    var host = rest.slice(0, hostEnd);
-+    rest = rest.slice(hostEnd);
-+
-+    // pull out port.
-+    this.parseHost(host);
-+
-+    // we've indicated that there is a hostname,
-+    // so even if it's empty, it has to be present.
-+    this.hostname = this.hostname || '';
-+
-+    // if hostname begins with [ and ends with ]
-+    // assume that it's an IPv6 address.
-+    var ipv6Hostname = this.hostname[0] === '[' &&
-+        this.hostname[this.hostname.length - 1] === ']';
-+
-+    // validate a little.
-+    if (!ipv6Hostname) {
-+      var hostparts = this.hostname.split(/\./);
-+      for (i = 0, l = hostparts.length; i < l; i++) {
-+        var part = hostparts[i];
-+        if (!part) { continue; }
-+        if (!part.match(hostnamePartPattern)) {
-+          var newpart = '';
-+          for (var j = 0, k = part.length; j < k; j++) {
-+            if (part.charCodeAt(j) > 127) {
-+              // we replace non-ASCII char with a temporary placeholder
-+              // we need this to make sure size of hostname is not
-+              // broken by replacing non-ASCII by nothing
-+              newpart += 'x';
-+            } else {
-+              newpart += part[j];
-+            }
-+          }
-+          // we test again with ASCII char only
-+          if (!newpart.match(hostnamePartPattern)) {
-+            var validParts = hostparts.slice(0, i);
-+            var notHost = hostparts.slice(i + 1);
-+            var bit = part.match(hostnamePartStart);
-+            if (bit) {
-+              validParts.push(bit[1]);
-+              notHost.unshift(bit[2]);
-+            }
-+            if (notHost.length) {
-+              rest = notHost.join('.') + rest;
-+            }
-+            this.hostname = validParts.join('.');
-+            break;
-+          }
-+        }
-+      }
-+    }
-+
-+    if (this.hostname.length > hostnameMaxLen) {
-+      this.hostname = '';
-+    }
-+
-+    // strip [ and ] from the hostname
-+    // the host field still retains them, though
-+    if (ipv6Hostname) {
-+      this.hostname = this.hostname.substr(1, this.hostname.length - 2);
-+    }
-+  }
-+
-+  // chop off from the tail first.
-+  var hash = rest.indexOf('#');
-+  if (hash !== -1) {
-+    // got a fragment string.
-+    this.hash = rest.substr(hash);
-+    rest = rest.slice(0, hash);
-+  }
-+  var qm = rest.indexOf('?');
-+  if (qm !== -1) {
-+    this.search = rest.substr(qm);
-+    rest = rest.slice(0, qm);
-+  }
-+  if (rest) { this.pathname = rest; }
-+  if (slashedProtocol[lowerProto] &&
-+      this.hostname && !this.pathname) {
-+    this.pathname = '';
-+  }
-+
-+  return this;
-+};
-+
-+Url.prototype.parseHost = function(host) {
-+  var port = portPattern.exec(host);
-+  if (port) {
-+    port = port[0];
-+    if (port !== ':') {
-+      this.port = port.substr(1);
-+    }
-+    host = host.substr(0, host.length - port.length);
-+  }
-+  if (host) { this.hostname = host; }
-+};
-+
-+module.exports = urlParse;
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale sync recursive ^\\.\\/.*$":
-+/*!**************************************************!*\
-+  !*** ./node_modules/moment/locale sync ^\.\/.*$ ***!
-+  \**************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+var map = {
-+	"./af": "./node_modules/moment/locale/af.js",
-+	"./af.js": "./node_modules/moment/locale/af.js",
-+	"./ar": "./node_modules/moment/locale/ar.js",
-+	"./ar-dz": "./node_modules/moment/locale/ar-dz.js",
-+	"./ar-dz.js": "./node_modules/moment/locale/ar-dz.js",
-+	"./ar-kw": "./node_modules/moment/locale/ar-kw.js",
-+	"./ar-kw.js": "./node_modules/moment/locale/ar-kw.js",
-+	"./ar-ly": "./node_modules/moment/locale/ar-ly.js",
-+	"./ar-ly.js": "./node_modules/moment/locale/ar-ly.js",
-+	"./ar-ma": "./node_modules/moment/locale/ar-ma.js",
-+	"./ar-ma.js": "./node_modules/moment/locale/ar-ma.js",
-+	"./ar-sa": "./node_modules/moment/locale/ar-sa.js",
-+	"./ar-sa.js": "./node_modules/moment/locale/ar-sa.js",
-+	"./ar-tn": "./node_modules/moment/locale/ar-tn.js",
-+	"./ar-tn.js": "./node_modules/moment/locale/ar-tn.js",
-+	"./ar.js": "./node_modules/moment/locale/ar.js",
-+	"./az": "./node_modules/moment/locale/az.js",
-+	"./az.js": "./node_modules/moment/locale/az.js",
-+	"./be": "./node_modules/moment/locale/be.js",
-+	"./be.js": "./node_modules/moment/locale/be.js",
-+	"./bg": "./node_modules/moment/locale/bg.js",
-+	"./bg.js": "./node_modules/moment/locale/bg.js",
-+	"./bm": "./node_modules/moment/locale/bm.js",
-+	"./bm.js": "./node_modules/moment/locale/bm.js",
-+	"./bn": "./node_modules/moment/locale/bn.js",
-+	"./bn.js": "./node_modules/moment/locale/bn.js",
-+	"./bo": "./node_modules/moment/locale/bo.js",
-+	"./bo.js": "./node_modules/moment/locale/bo.js",
-+	"./br": "./node_modules/moment/locale/br.js",
-+	"./br.js": "./node_modules/moment/locale/br.js",
-+	"./bs": "./node_modules/moment/locale/bs.js",
-+	"./bs.js": "./node_modules/moment/locale/bs.js",
-+	"./ca": "./node_modules/moment/locale/ca.js",
-+	"./ca.js": "./node_modules/moment/locale/ca.js",
-+	"./cs": "./node_modules/moment/locale/cs.js",
-+	"./cs.js": "./node_modules/moment/locale/cs.js",
-+	"./cv": "./node_modules/moment/locale/cv.js",
-+	"./cv.js": "./node_modules/moment/locale/cv.js",
-+	"./cy": "./node_modules/moment/locale/cy.js",
-+	"./cy.js": "./node_modules/moment/locale/cy.js",
-+	"./da": "./node_modules/moment/locale/da.js",
-+	"./da.js": "./node_modules/moment/locale/da.js",
-+	"./de": "./node_modules/moment/locale/de.js",
-+	"./de-at": "./node_modules/moment/locale/de-at.js",
-+	"./de-at.js": "./node_modules/moment/locale/de-at.js",
-+	"./de-ch": "./node_modules/moment/locale/de-ch.js",
-+	"./de-ch.js": "./node_modules/moment/locale/de-ch.js",
-+	"./de.js": "./node_modules/moment/locale/de.js",
-+	"./dv": "./node_modules/moment/locale/dv.js",
-+	"./dv.js": "./node_modules/moment/locale/dv.js",
-+	"./el": "./node_modules/moment/locale/el.js",
-+	"./el.js": "./node_modules/moment/locale/el.js",
-+	"./en-au": "./node_modules/moment/locale/en-au.js",
-+	"./en-au.js": "./node_modules/moment/locale/en-au.js",
-+	"./en-ca": "./node_modules/moment/locale/en-ca.js",
-+	"./en-ca.js": "./node_modules/moment/locale/en-ca.js",
-+	"./en-gb": "./node_modules/moment/locale/en-gb.js",
-+	"./en-gb.js": "./node_modules/moment/locale/en-gb.js",
-+	"./en-ie": "./node_modules/moment/locale/en-ie.js",
-+	"./en-ie.js": "./node_modules/moment/locale/en-ie.js",
-+	"./en-il": "./node_modules/moment/locale/en-il.js",
-+	"./en-il.js": "./node_modules/moment/locale/en-il.js",
-+	"./en-nz": "./node_modules/moment/locale/en-nz.js",
-+	"./en-nz.js": "./node_modules/moment/locale/en-nz.js",
-+	"./eo": "./node_modules/moment/locale/eo.js",
-+	"./eo.js": "./node_modules/moment/locale/eo.js",
-+	"./es": "./node_modules/moment/locale/es.js",
-+	"./es-do": "./node_modules/moment/locale/es-do.js",
-+	"./es-do.js": "./node_modules/moment/locale/es-do.js",
-+	"./es-us": "./node_modules/moment/locale/es-us.js",
-+	"./es-us.js": "./node_modules/moment/locale/es-us.js",
-+	"./es.js": "./node_modules/moment/locale/es.js",
-+	"./et": "./node_modules/moment/locale/et.js",
-+	"./et.js": "./node_modules/moment/locale/et.js",
-+	"./eu": "./node_modules/moment/locale/eu.js",
-+	"./eu.js": "./node_modules/moment/locale/eu.js",
-+	"./fa": "./node_modules/moment/locale/fa.js",
-+	"./fa.js": "./node_modules/moment/locale/fa.js",
-+	"./fi": "./node_modules/moment/locale/fi.js",
-+	"./fi.js": "./node_modules/moment/locale/fi.js",
-+	"./fo": "./node_modules/moment/locale/fo.js",
-+	"./fo.js": "./node_modules/moment/locale/fo.js",
-+	"./fr": "./node_modules/moment/locale/fr.js",
-+	"./fr-ca": "./node_modules/moment/locale/fr-ca.js",
-+	"./fr-ca.js": "./node_modules/moment/locale/fr-ca.js",
-+	"./fr-ch": "./node_modules/moment/locale/fr-ch.js",
-+	"./fr-ch.js": "./node_modules/moment/locale/fr-ch.js",
-+	"./fr.js": "./node_modules/moment/locale/fr.js",
-+	"./fy": "./node_modules/moment/locale/fy.js",
-+	"./fy.js": "./node_modules/moment/locale/fy.js",
-+	"./gd": "./node_modules/moment/locale/gd.js",
-+	"./gd.js": "./node_modules/moment/locale/gd.js",
-+	"./gl": "./node_modules/moment/locale/gl.js",
-+	"./gl.js": "./node_modules/moment/locale/gl.js",
-+	"./gom-latn": "./node_modules/moment/locale/gom-latn.js",
-+	"./gom-latn.js": "./node_modules/moment/locale/gom-latn.js",
-+	"./gu": "./node_modules/moment/locale/gu.js",
-+	"./gu.js": "./node_modules/moment/locale/gu.js",
-+	"./he": "./node_modules/moment/locale/he.js",
-+	"./he.js": "./node_modules/moment/locale/he.js",
-+	"./hi": "./node_modules/moment/locale/hi.js",
-+	"./hi.js": "./node_modules/moment/locale/hi.js",
-+	"./hr": "./node_modules/moment/locale/hr.js",
-+	"./hr.js": "./node_modules/moment/locale/hr.js",
-+	"./hu": "./node_modules/moment/locale/hu.js",
-+	"./hu.js": "./node_modules/moment/locale/hu.js",
-+	"./hy-am": "./node_modules/moment/locale/hy-am.js",
-+	"./hy-am.js": "./node_modules/moment/locale/hy-am.js",
-+	"./id": "./node_modules/moment/locale/id.js",
-+	"./id.js": "./node_modules/moment/locale/id.js",
-+	"./is": "./node_modules/moment/locale/is.js",
-+	"./is.js": "./node_modules/moment/locale/is.js",
-+	"./it": "./node_modules/moment/locale/it.js",
-+	"./it.js": "./node_modules/moment/locale/it.js",
-+	"./ja": "./node_modules/moment/locale/ja.js",
-+	"./ja.js": "./node_modules/moment/locale/ja.js",
-+	"./jv": "./node_modules/moment/locale/jv.js",
-+	"./jv.js": "./node_modules/moment/locale/jv.js",
-+	"./ka": "./node_modules/moment/locale/ka.js",
-+	"./ka.js": "./node_modules/moment/locale/ka.js",
-+	"./kk": "./node_modules/moment/locale/kk.js",
-+	"./kk.js": "./node_modules/moment/locale/kk.js",
-+	"./km": "./node_modules/moment/locale/km.js",
-+	"./km.js": "./node_modules/moment/locale/km.js",
-+	"./kn": "./node_modules/moment/locale/kn.js",
-+	"./kn.js": "./node_modules/moment/locale/kn.js",
-+	"./ko": "./node_modules/moment/locale/ko.js",
-+	"./ko.js": "./node_modules/moment/locale/ko.js",
-+	"./ky": "./node_modules/moment/locale/ky.js",
-+	"./ky.js": "./node_modules/moment/locale/ky.js",
-+	"./lb": "./node_modules/moment/locale/lb.js",
-+	"./lb.js": "./node_modules/moment/locale/lb.js",
-+	"./lo": "./node_modules/moment/locale/lo.js",
-+	"./lo.js": "./node_modules/moment/locale/lo.js",
-+	"./lt": "./node_modules/moment/locale/lt.js",
-+	"./lt.js": "./node_modules/moment/locale/lt.js",
-+	"./lv": "./node_modules/moment/locale/lv.js",
-+	"./lv.js": "./node_modules/moment/locale/lv.js",
-+	"./me": "./node_modules/moment/locale/me.js",
-+	"./me.js": "./node_modules/moment/locale/me.js",
-+	"./mi": "./node_modules/moment/locale/mi.js",
-+	"./mi.js": "./node_modules/moment/locale/mi.js",
-+	"./mk": "./node_modules/moment/locale/mk.js",
-+	"./mk.js": "./node_modules/moment/locale/mk.js",
-+	"./ml": "./node_modules/moment/locale/ml.js",
-+	"./ml.js": "./node_modules/moment/locale/ml.js",
-+	"./mn": "./node_modules/moment/locale/mn.js",
-+	"./mn.js": "./node_modules/moment/locale/mn.js",
-+	"./mr": "./node_modules/moment/locale/mr.js",
-+	"./mr.js": "./node_modules/moment/locale/mr.js",
-+	"./ms": "./node_modules/moment/locale/ms.js",
-+	"./ms-my": "./node_modules/moment/locale/ms-my.js",
-+	"./ms-my.js": "./node_modules/moment/locale/ms-my.js",
-+	"./ms.js": "./node_modules/moment/locale/ms.js",
-+	"./mt": "./node_modules/moment/locale/mt.js",
-+	"./mt.js": "./node_modules/moment/locale/mt.js",
-+	"./my": "./node_modules/moment/locale/my.js",
-+	"./my.js": "./node_modules/moment/locale/my.js",
-+	"./nb": "./node_modules/moment/locale/nb.js",
-+	"./nb.js": "./node_modules/moment/locale/nb.js",
-+	"./ne": "./node_modules/moment/locale/ne.js",
-+	"./ne.js": "./node_modules/moment/locale/ne.js",
-+	"./nl": "./node_modules/moment/locale/nl.js",
-+	"./nl-be": "./node_modules/moment/locale/nl-be.js",
-+	"./nl-be.js": "./node_modules/moment/locale/nl-be.js",
-+	"./nl.js": "./node_modules/moment/locale/nl.js",
-+	"./nn": "./node_modules/moment/locale/nn.js",
-+	"./nn.js": "./node_modules/moment/locale/nn.js",
-+	"./pa-in": "./node_modules/moment/locale/pa-in.js",
-+	"./pa-in.js": "./node_modules/moment/locale/pa-in.js",
-+	"./pl": "./node_modules/moment/locale/pl.js",
-+	"./pl.js": "./node_modules/moment/locale/pl.js",
-+	"./pt": "./node_modules/moment/locale/pt.js",
-+	"./pt-br": "./node_modules/moment/locale/pt-br.js",
-+	"./pt-br.js": "./node_modules/moment/locale/pt-br.js",
-+	"./pt.js": "./node_modules/moment/locale/pt.js",
-+	"./ro": "./node_modules/moment/locale/ro.js",
-+	"./ro.js": "./node_modules/moment/locale/ro.js",
-+	"./ru": "./node_modules/moment/locale/ru.js",
-+	"./ru.js": "./node_modules/moment/locale/ru.js",
-+	"./sd": "./node_modules/moment/locale/sd.js",
-+	"./sd.js": "./node_modules/moment/locale/sd.js",
-+	"./se": "./node_modules/moment/locale/se.js",
-+	"./se.js": "./node_modules/moment/locale/se.js",
-+	"./si": "./node_modules/moment/locale/si.js",
-+	"./si.js": "./node_modules/moment/locale/si.js",
-+	"./sk": "./node_modules/moment/locale/sk.js",
-+	"./sk.js": "./node_modules/moment/locale/sk.js",
-+	"./sl": "./node_modules/moment/locale/sl.js",
-+	"./sl.js": "./node_modules/moment/locale/sl.js",
-+	"./sq": "./node_modules/moment/locale/sq.js",
-+	"./sq.js": "./node_modules/moment/locale/sq.js",
-+	"./sr": "./node_modules/moment/locale/sr.js",
-+	"./sr-cyrl": "./node_modules/moment/locale/sr-cyrl.js",
-+	"./sr-cyrl.js": "./node_modules/moment/locale/sr-cyrl.js",
-+	"./sr.js": "./node_modules/moment/locale/sr.js",
-+	"./ss": "./node_modules/moment/locale/ss.js",
-+	"./ss.js": "./node_modules/moment/locale/ss.js",
-+	"./sv": "./node_modules/moment/locale/sv.js",
-+	"./sv.js": "./node_modules/moment/locale/sv.js",
-+	"./sw": "./node_modules/moment/locale/sw.js",
-+	"./sw.js": "./node_modules/moment/locale/sw.js",
-+	"./ta": "./node_modules/moment/locale/ta.js",
-+	"./ta.js": "./node_modules/moment/locale/ta.js",
-+	"./te": "./node_modules/moment/locale/te.js",
-+	"./te.js": "./node_modules/moment/locale/te.js",
-+	"./tet": "./node_modules/moment/locale/tet.js",
-+	"./tet.js": "./node_modules/moment/locale/tet.js",
-+	"./tg": "./node_modules/moment/locale/tg.js",
-+	"./tg.js": "./node_modules/moment/locale/tg.js",
-+	"./th": "./node_modules/moment/locale/th.js",
-+	"./th.js": "./node_modules/moment/locale/th.js",
-+	"./tl-ph": "./node_modules/moment/locale/tl-ph.js",
-+	"./tl-ph.js": "./node_modules/moment/locale/tl-ph.js",
-+	"./tlh": "./node_modules/moment/locale/tlh.js",
-+	"./tlh.js": "./node_modules/moment/locale/tlh.js",
-+	"./tr": "./node_modules/moment/locale/tr.js",
-+	"./tr.js": "./node_modules/moment/locale/tr.js",
-+	"./tzl": "./node_modules/moment/locale/tzl.js",
-+	"./tzl.js": "./node_modules/moment/locale/tzl.js",
-+	"./tzm": "./node_modules/moment/locale/tzm.js",
-+	"./tzm-latn": "./node_modules/moment/locale/tzm-latn.js",
-+	"./tzm-latn.js": "./node_modules/moment/locale/tzm-latn.js",
-+	"./tzm.js": "./node_modules/moment/locale/tzm.js",
-+	"./ug-cn": "./node_modules/moment/locale/ug-cn.js",
-+	"./ug-cn.js": "./node_modules/moment/locale/ug-cn.js",
-+	"./uk": "./node_modules/moment/locale/uk.js",
-+	"./uk.js": "./node_modules/moment/locale/uk.js",
-+	"./ur": "./node_modules/moment/locale/ur.js",
-+	"./ur.js": "./node_modules/moment/locale/ur.js",
-+	"./uz": "./node_modules/moment/locale/uz.js",
-+	"./uz-latn": "./node_modules/moment/locale/uz-latn.js",
-+	"./uz-latn.js": "./node_modules/moment/locale/uz-latn.js",
-+	"./uz.js": "./node_modules/moment/locale/uz.js",
-+	"./vi": "./node_modules/moment/locale/vi.js",
-+	"./vi.js": "./node_modules/moment/locale/vi.js",
-+	"./x-pseudo": "./node_modules/moment/locale/x-pseudo.js",
-+	"./x-pseudo.js": "./node_modules/moment/locale/x-pseudo.js",
-+	"./yo": "./node_modules/moment/locale/yo.js",
-+	"./yo.js": "./node_modules/moment/locale/yo.js",
-+	"./zh-cn": "./node_modules/moment/locale/zh-cn.js",
-+	"./zh-cn.js": "./node_modules/moment/locale/zh-cn.js",
-+	"./zh-hk": "./node_modules/moment/locale/zh-hk.js",
-+	"./zh-hk.js": "./node_modules/moment/locale/zh-hk.js",
-+	"./zh-tw": "./node_modules/moment/locale/zh-tw.js",
-+	"./zh-tw.js": "./node_modules/moment/locale/zh-tw.js"
-+};
-+
-+
-+function webpackContext(req) {
-+	var id = webpackContextResolve(req);
-+	var module = __webpack_require__(id);
-+	return module;
-+}
-+function webpackContextResolve(req) {
-+	var id = map[req];
-+	if(!(id + 1)) { // check for number or string
-+		var e = new Error('Cannot find module "' + req + '".');
-+		e.code = 'MODULE_NOT_FOUND';
-+		throw e;
-+	}
-+	return id;
-+}
-+webpackContext.keys = function webpackContextKeys() {
-+	return Object.keys(map);
-+};
-+webpackContext.resolve = webpackContextResolve;
-+module.exports = webpackContext;
-+webpackContext.id = "./node_modules/moment/locale sync recursive ^\\.\\/.*$";
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/af.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/af.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var af = moment.defineLocale('af', {
-+        months : 'Januarie_Februarie_Maart_April_Mei_Junie_Julie_Augustus_September_Oktober_November_Desember'.split('_'),
-+        monthsShort : 'Jan_Feb_Mrt_Apr_Mei_Jun_Jul_Aug_Sep_Okt_Nov_Des'.split('_'),
-+        weekdays : 'Sondag_Maandag_Dinsdag_Woensdag_Donderdag_Vrydag_Saterdag'.split('_'),
-+        weekdaysShort : 'Son_Maa_Din_Woe_Don_Vry_Sat'.split('_'),
-+        weekdaysMin : 'So_Ma_Di_Wo_Do_Vr_Sa'.split('_'),
-+        meridiemParse: /vm|nm/i,
-+        isPM : function (input) {
-+            return /^nm$/i.test(input);
-+        },
-+        meridiem : function (hours, minutes, isLower) {
-+            if (hours < 12) {
-+                return isLower ? 'vm' : 'VM';
-+            } else {
-+                return isLower ? 'nm' : 'NM';
-+            }
-+        },
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY HH:mm',
-+            LLLL : 'dddd, D MMMM YYYY HH:mm'
-+        },
-+        calendar : {
-+            sameDay : '[Vandag om] LT',
-+            nextDay : '[Môre om] LT',
-+            nextWeek : 'dddd [om] LT',
-+            lastDay : '[Gister om] LT',
-+            lastWeek : '[Laas] dddd [om] LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'oor %s',
-+            past : '%s gelede',
-+            s : '\'n paar sekondes',
-+            ss : '%d sekondes',
-+            m : '\'n minuut',
-+            mm : '%d minute',
-+            h : '\'n uur',
-+            hh : '%d ure',
-+            d : '\'n dag',
-+            dd : '%d dae',
-+            M : '\'n maand',
-+            MM : '%d maande',
-+            y : '\'n jaar',
-+            yy : '%d jaar'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}(ste|de)/,
-+        ordinal : function (number) {
-+            return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de'); // Thanks to Joris Röling : https://github.com/jjupiter
-+        },
-+        week : {
-+            dow : 1, // Maandag is die eerste dag van die week.
-+            doy : 4  // Die week wat die 4de Januarie bevat is die eerste week van die jaar.
-+        }
-+    });
-+
-+    return af;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/ar-dz.js":
-+/*!*********************************************!*\
-+  !*** ./node_modules/moment/locale/ar-dz.js ***!
-+  \*********************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var arDz = moment.defineLocale('ar-dz', {
-+        months : 'جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
-+        monthsShort : 'جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
-+        weekdays : 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
-+        weekdaysShort : 'احد_اثنين_ثلاثاء_اربعاء_خميس_جمعة_سبت'.split('_'),
-+        weekdaysMin : 'أح_إث_ثلا_أر_خم_جم_سب'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY HH:mm',
-+            LLLL : 'dddd D MMMM YYYY HH:mm'
-+        },
-+        calendar : {
-+            sameDay: '[اليوم على الساعة] LT',
-+            nextDay: '[غدا على الساعة] LT',
-+            nextWeek: 'dddd [على الساعة] LT',
-+            lastDay: '[أمس على الساعة] LT',
-+            lastWeek: 'dddd [على الساعة] LT',
-+            sameElse: 'L'
-+        },
-+        relativeTime : {
-+            future : 'في %s',
-+            past : 'منذ %s',
-+            s : 'ثوان',
-+            ss : '%d ثانية',
-+            m : 'دقيقة',
-+            mm : '%d دقائق',
-+            h : 'ساعة',
-+            hh : '%d ساعات',
-+            d : 'يوم',
-+            dd : '%d أيام',
-+            M : 'شهر',
-+            MM : '%d أشهر',
-+            y : 'سنة',
-+            yy : '%d سنوات'
-+        },
-+        week : {
-+            dow : 0, // Sunday is the first day of the week.
-+            doy : 4  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return arDz;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/ar-kw.js":
-+/*!*********************************************!*\
-+  !*** ./node_modules/moment/locale/ar-kw.js ***!
-+  \*********************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var arKw = moment.defineLocale('ar-kw', {
-+        months : 'يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر'.split('_'),
-+        monthsShort : 'يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر'.split('_'),
-+        weekdays : 'الأحد_الإتنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
-+        weekdaysShort : 'احد_اتنين_ثلاثاء_اربعاء_خميس_جمعة_سبت'.split('_'),
-+        weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY HH:mm',
-+            LLLL : 'dddd D MMMM YYYY HH:mm'
-+        },
-+        calendar : {
-+            sameDay: '[اليوم على الساعة] LT',
-+            nextDay: '[غدا على الساعة] LT',
-+            nextWeek: 'dddd [على الساعة] LT',
-+            lastDay: '[أمس على الساعة] LT',
-+            lastWeek: 'dddd [على الساعة] LT',
-+            sameElse: 'L'
-+        },
-+        relativeTime : {
-+            future : 'في %s',
-+            past : 'منذ %s',
-+            s : 'ثوان',
-+            ss : '%d ثانية',
-+            m : 'دقيقة',
-+            mm : '%d دقائق',
-+            h : 'ساعة',
-+            hh : '%d ساعات',
-+            d : 'يوم',
-+            dd : '%d أيام',
-+            M : 'شهر',
-+            MM : '%d أشهر',
-+            y : 'سنة',
-+            yy : '%d سنوات'
-+        },
-+        week : {
-+            dow : 0, // Sunday is the first day of the week.
-+            doy : 12  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return arKw;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/ar-ly.js":
-+/*!*********************************************!*\
-+  !*** ./node_modules/moment/locale/ar-ly.js ***!
-+  \*********************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var symbolMap = {
-+        '1': '1',
-+        '2': '2',
-+        '3': '3',
-+        '4': '4',
-+        '5': '5',
-+        '6': '6',
-+        '7': '7',
-+        '8': '8',
-+        '9': '9',
-+        '0': '0'
-+    }, pluralForm = function (n) {
-+        return n === 0 ? 0 : n === 1 ? 1 : n === 2 ? 2 : n % 100 >= 3 && n % 100 <= 10 ? 3 : n % 100 >= 11 ? 4 : 5;
-+    }, plurals = {
-+        s : ['أقل من ثانية', 'ثانية واحدة', ['ثانيتان', 'ثانيتين'], '%d ثوان', '%d ثانية', '%d ثانية'],
-+        m : ['أقل من دقيقة', 'دقيقة واحدة', ['دقيقتان', 'دقيقتين'], '%d دقائق', '%d دقيقة', '%d دقيقة'],
-+        h : ['أقل من ساعة', 'ساعة واحدة', ['ساعتان', 'ساعتين'], '%d ساعات', '%d ساعة', '%d ساعة'],
-+        d : ['أقل من يوم', 'يوم واحد', ['يومان', 'يومين'], '%d أيام', '%d يومًا', '%d يوم'],
-+        M : ['أقل من شهر', 'شهر واحد', ['شهران', 'شهرين'], '%d أشهر', '%d شهرا', '%d شهر'],
-+        y : ['أقل من عام', 'عام واحد', ['عامان', 'عامين'], '%d أعوام', '%d عامًا', '%d عام']
-+    }, pluralize = function (u) {
-+        return function (number, withoutSuffix, string, isFuture) {
-+            var f = pluralForm(number),
-+                str = plurals[u][pluralForm(number)];
-+            if (f === 2) {
-+                str = str[withoutSuffix ? 0 : 1];
-+            }
-+            return str.replace(/%d/i, number);
-+        };
-+    }, months = [
-+        'يناير',
-+        'فبراير',
-+        'مارس',
-+        'أبريل',
-+        'مايو',
-+        'يونيو',
-+        'يوليو',
-+        'أغسطس',
-+        'سبتمبر',
-+        'أكتوبر',
-+        'نوفمبر',
-+        'ديسمبر'
-+    ];
-+
-+    var arLy = moment.defineLocale('ar-ly', {
-+        months : months,
-+        monthsShort : months,
-+        weekdays : 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
-+        weekdaysShort : 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'),
-+        weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'D/\u200FM/\u200FYYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY HH:mm',
-+            LLLL : 'dddd D MMMM YYYY HH:mm'
-+        },
-+        meridiemParse: /ص|م/,
-+        isPM : function (input) {
-+            return 'م' === input;
-+        },
-+        meridiem : function (hour, minute, isLower) {
-+            if (hour < 12) {
-+                return 'ص';
-+            } else {
-+                return 'م';
-+            }
-+        },
-+        calendar : {
-+            sameDay: '[اليوم عند الساعة] LT',
-+            nextDay: '[غدًا عند الساعة] LT',
-+            nextWeek: 'dddd [عند الساعة] LT',
-+            lastDay: '[أمس عند الساعة] LT',
-+            lastWeek: 'dddd [عند الساعة] LT',
-+            sameElse: 'L'
-+        },
-+        relativeTime : {
-+            future : 'بعد %s',
-+            past : 'منذ %s',
-+            s : pluralize('s'),
-+            ss : pluralize('s'),
-+            m : pluralize('m'),
-+            mm : pluralize('m'),
-+            h : pluralize('h'),
-+            hh : pluralize('h'),
-+            d : pluralize('d'),
-+            dd : pluralize('d'),
-+            M : pluralize('M'),
-+            MM : pluralize('M'),
-+            y : pluralize('y'),
-+            yy : pluralize('y')
-+        },
-+        preparse: function (string) {
-+            return string.replace(/،/g, ',');
-+        },
-+        postformat: function (string) {
-+            return string.replace(/\d/g, function (match) {
-+                return symbolMap[match];
-+            }).replace(/,/g, '،');
-+        },
-+        week : {
-+            dow : 6, // Saturday is the first day of the week.
-+            doy : 12  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return arLy;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/ar-ma.js":
-+/*!*********************************************!*\
-+  !*** ./node_modules/moment/locale/ar-ma.js ***!
-+  \*********************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var arMa = moment.defineLocale('ar-ma', {
-+        months : 'يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر'.split('_'),
-+        monthsShort : 'يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر'.split('_'),
-+        weekdays : 'الأحد_الإتنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
-+        weekdaysShort : 'احد_اتنين_ثلاثاء_اربعاء_خميس_جمعة_سبت'.split('_'),
-+        weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY HH:mm',
-+            LLLL : 'dddd D MMMM YYYY HH:mm'
-+        },
-+        calendar : {
-+            sameDay: '[اليوم على الساعة] LT',
-+            nextDay: '[غدا على الساعة] LT',
-+            nextWeek: 'dddd [على الساعة] LT',
-+            lastDay: '[أمس على الساعة] LT',
-+            lastWeek: 'dddd [على الساعة] LT',
-+            sameElse: 'L'
-+        },
-+        relativeTime : {
-+            future : 'في %s',
-+            past : 'منذ %s',
-+            s : 'ثوان',
-+            ss : '%d ثانية',
-+            m : 'دقيقة',
-+            mm : '%d دقائق',
-+            h : 'ساعة',
-+            hh : '%d ساعات',
-+            d : 'يوم',
-+            dd : '%d أيام',
-+            M : 'شهر',
-+            MM : '%d أشهر',
-+            y : 'سنة',
-+            yy : '%d سنوات'
-+        },
-+        week : {
-+            dow : 6, // Saturday is the first day of the week.
-+            doy : 12  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return arMa;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/ar-sa.js":
-+/*!*********************************************!*\
-+  !*** ./node_modules/moment/locale/ar-sa.js ***!
-+  \*********************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var symbolMap = {
-+        '1': '١',
-+        '2': '٢',
-+        '3': '٣',
-+        '4': '٤',
-+        '5': '٥',
-+        '6': '٦',
-+        '7': '٧',
-+        '8': '٨',
-+        '9': '٩',
-+        '0': '٠'
-+    }, numberMap = {
-+        '١': '1',
-+        '٢': '2',
-+        '٣': '3',
-+        '٤': '4',
-+        '٥': '5',
-+        '٦': '6',
-+        '٧': '7',
-+        '٨': '8',
-+        '٩': '9',
-+        '٠': '0'
-+    };
-+
-+    var arSa = moment.defineLocale('ar-sa', {
-+        months : 'يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
-+        monthsShort : 'يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
-+        weekdays : 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
-+        weekdaysShort : 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'),
-+        weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY HH:mm',
-+            LLLL : 'dddd D MMMM YYYY HH:mm'
-+        },
-+        meridiemParse: /ص|م/,
-+        isPM : function (input) {
-+            return 'م' === input;
-+        },
-+        meridiem : function (hour, minute, isLower) {
-+            if (hour < 12) {
-+                return 'ص';
-+            } else {
-+                return 'م';
-+            }
-+        },
-+        calendar : {
-+            sameDay: '[اليوم على الساعة] LT',
-+            nextDay: '[غدا على الساعة] LT',
-+            nextWeek: 'dddd [على الساعة] LT',
-+            lastDay: '[أمس على الساعة] LT',
-+            lastWeek: 'dddd [على الساعة] LT',
-+            sameElse: 'L'
-+        },
-+        relativeTime : {
-+            future : 'في %s',
-+            past : 'منذ %s',
-+            s : 'ثوان',
-+            ss : '%d ثانية',
-+            m : 'دقيقة',
-+            mm : '%d دقائق',
-+            h : 'ساعة',
-+            hh : '%d ساعات',
-+            d : 'يوم',
-+            dd : '%d أيام',
-+            M : 'شهر',
-+            MM : '%d أشهر',
-+            y : 'سنة',
-+            yy : '%d سنوات'
-+        },
-+        preparse: function (string) {
-+            return string.replace(/[١٢٣٤٥٦٧٨٩٠]/g, function (match) {
-+                return numberMap[match];
-+            }).replace(/،/g, ',');
-+        },
-+        postformat: function (string) {
-+            return string.replace(/\d/g, function (match) {
-+                return symbolMap[match];
-+            }).replace(/,/g, '،');
-+        },
-+        week : {
-+            dow : 0, // Sunday is the first day of the week.
-+            doy : 6  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return arSa;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/ar-tn.js":
-+/*!*********************************************!*\
-+  !*** ./node_modules/moment/locale/ar-tn.js ***!
-+  \*********************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var arTn = moment.defineLocale('ar-tn', {
-+        months: 'جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
-+        monthsShort: 'جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
-+        weekdays: 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
-+        weekdaysShort: 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'),
-+        weekdaysMin: 'ح_ن_ث_ر_خ_ج_س'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat: {
-+            LT: 'HH:mm',
-+            LTS: 'HH:mm:ss',
-+            L: 'DD/MM/YYYY',
-+            LL: 'D MMMM YYYY',
-+            LLL: 'D MMMM YYYY HH:mm',
-+            LLLL: 'dddd D MMMM YYYY HH:mm'
-+        },
-+        calendar: {
-+            sameDay: '[اليوم على الساعة] LT',
-+            nextDay: '[غدا على الساعة] LT',
-+            nextWeek: 'dddd [على الساعة] LT',
-+            lastDay: '[أمس على الساعة] LT',
-+            lastWeek: 'dddd [على الساعة] LT',
-+            sameElse: 'L'
-+        },
-+        relativeTime: {
-+            future: 'في %s',
-+            past: 'منذ %s',
-+            s: 'ثوان',
-+            ss : '%d ثانية',
-+            m: 'دقيقة',
-+            mm: '%d دقائق',
-+            h: 'ساعة',
-+            hh: '%d ساعات',
-+            d: 'يوم',
-+            dd: '%d أيام',
-+            M: 'شهر',
-+            MM: '%d أشهر',
-+            y: 'سنة',
-+            yy: '%d سنوات'
-+        },
-+        week: {
-+            dow: 1, // Monday is the first day of the week.
-+            doy: 4 // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return arTn;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/ar.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/ar.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var symbolMap = {
-+        '1': '١',
-+        '2': '٢',
-+        '3': '٣',
-+        '4': '٤',
-+        '5': '٥',
-+        '6': '٦',
-+        '7': '٧',
-+        '8': '٨',
-+        '9': '٩',
-+        '0': '٠'
-+    }, numberMap = {
-+        '١': '1',
-+        '٢': '2',
-+        '٣': '3',
-+        '٤': '4',
-+        '٥': '5',
-+        '٦': '6',
-+        '٧': '7',
-+        '٨': '8',
-+        '٩': '9',
-+        '٠': '0'
-+    }, pluralForm = function (n) {
-+        return n === 0 ? 0 : n === 1 ? 1 : n === 2 ? 2 : n % 100 >= 3 && n % 100 <= 10 ? 3 : n % 100 >= 11 ? 4 : 5;
-+    }, plurals = {
-+        s : ['أقل من ثانية', 'ثانية واحدة', ['ثانيتان', 'ثانيتين'], '%d ثوان', '%d ثانية', '%d ثانية'],
-+        m : ['أقل من دقيقة', 'دقيقة واحدة', ['دقيقتان', 'دقيقتين'], '%d دقائق', '%d دقيقة', '%d دقيقة'],
-+        h : ['أقل من ساعة', 'ساعة واحدة', ['ساعتان', 'ساعتين'], '%d ساعات', '%d ساعة', '%d ساعة'],
-+        d : ['أقل من يوم', 'يوم واحد', ['يومان', 'يومين'], '%d أيام', '%d يومًا', '%d يوم'],
-+        M : ['أقل من شهر', 'شهر واحد', ['شهران', 'شهرين'], '%d أشهر', '%d شهرا', '%d شهر'],
-+        y : ['أقل من عام', 'عام واحد', ['عامان', 'عامين'], '%d أعوام', '%d عامًا', '%d عام']
-+    }, pluralize = function (u) {
-+        return function (number, withoutSuffix, string, isFuture) {
-+            var f = pluralForm(number),
-+                str = plurals[u][pluralForm(number)];
-+            if (f === 2) {
-+                str = str[withoutSuffix ? 0 : 1];
-+            }
-+            return str.replace(/%d/i, number);
-+        };
-+    }, months = [
-+        'يناير',
-+        'فبراير',
-+        'مارس',
-+        'أبريل',
-+        'مايو',
-+        'يونيو',
-+        'يوليو',
-+        'أغسطس',
-+        'سبتمبر',
-+        'أكتوبر',
-+        'نوفمبر',
-+        'ديسمبر'
-+    ];
-+
-+    var ar = moment.defineLocale('ar', {
-+        months : months,
-+        monthsShort : months,
-+        weekdays : 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
-+        weekdaysShort : 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'),
-+        weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'D/\u200FM/\u200FYYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY HH:mm',
-+            LLLL : 'dddd D MMMM YYYY HH:mm'
-+        },
-+        meridiemParse: /ص|م/,
-+        isPM : function (input) {
-+            return 'م' === input;
-+        },
-+        meridiem : function (hour, minute, isLower) {
-+            if (hour < 12) {
-+                return 'ص';
-+            } else {
-+                return 'م';
-+            }
-+        },
-+        calendar : {
-+            sameDay: '[اليوم عند الساعة] LT',
-+            nextDay: '[غدًا عند الساعة] LT',
-+            nextWeek: 'dddd [عند الساعة] LT',
-+            lastDay: '[أمس عند الساعة] LT',
-+            lastWeek: 'dddd [عند الساعة] LT',
-+            sameElse: 'L'
-+        },
-+        relativeTime : {
-+            future : 'بعد %s',
-+            past : 'منذ %s',
-+            s : pluralize('s'),
-+            ss : pluralize('s'),
-+            m : pluralize('m'),
-+            mm : pluralize('m'),
-+            h : pluralize('h'),
-+            hh : pluralize('h'),
-+            d : pluralize('d'),
-+            dd : pluralize('d'),
-+            M : pluralize('M'),
-+            MM : pluralize('M'),
-+            y : pluralize('y'),
-+            yy : pluralize('y')
-+        },
-+        preparse: function (string) {
-+            return string.replace(/[١٢٣٤٥٦٧٨٩٠]/g, function (match) {
-+                return numberMap[match];
-+            }).replace(/،/g, ',');
-+        },
-+        postformat: function (string) {
-+            return string.replace(/\d/g, function (match) {
-+                return symbolMap[match];
-+            }).replace(/,/g, '،');
-+        },
-+        week : {
-+            dow : 6, // Saturday is the first day of the week.
-+            doy : 12  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return ar;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/az.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/az.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var suffixes = {
-+        1: '-inci',
-+        5: '-inci',
-+        8: '-inci',
-+        70: '-inci',
-+        80: '-inci',
-+        2: '-nci',
-+        7: '-nci',
-+        20: '-nci',
-+        50: '-nci',
-+        3: '-üncü',
-+        4: '-üncü',
-+        100: '-üncü',
-+        6: '-ncı',
-+        9: '-uncu',
-+        10: '-uncu',
-+        30: '-uncu',
-+        60: '-ıncı',
-+        90: '-ıncı'
-+    };
-+
-+    var az = moment.defineLocale('az', {
-+        months : 'yanvar_fevral_mart_aprel_may_iyun_iyul_avqust_sentyabr_oktyabr_noyabr_dekabr'.split('_'),
-+        monthsShort : 'yan_fev_mar_apr_may_iyn_iyl_avq_sen_okt_noy_dek'.split('_'),
-+        weekdays : 'Bazar_Bazar ertəsi_Çərşənbə axşamı_Çərşənbə_Cümə axşamı_Cümə_Şənbə'.split('_'),
-+        weekdaysShort : 'Baz_BzE_ÇAx_Çər_CAx_Cüm_Şən'.split('_'),
-+        weekdaysMin : 'Bz_BE_ÇA_Çə_CA_Cü_Şə'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD.MM.YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY HH:mm',
-+            LLLL : 'dddd, D MMMM YYYY HH:mm'
-+        },
-+        calendar : {
-+            sameDay : '[bugün saat] LT',
-+            nextDay : '[sabah saat] LT',
-+            nextWeek : '[gələn həftə] dddd [saat] LT',
-+            lastDay : '[dünən] LT',
-+            lastWeek : '[keçən həftə] dddd [saat] LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : '%s sonra',
-+            past : '%s əvvəl',
-+            s : 'birneçə saniyyə',
-+            ss : '%d saniyə',
-+            m : 'bir dəqiqə',
-+            mm : '%d dəqiqə',
-+            h : 'bir saat',
-+            hh : '%d saat',
-+            d : 'bir gün',
-+            dd : '%d gün',
-+            M : 'bir ay',
-+            MM : '%d ay',
-+            y : 'bir il',
-+            yy : '%d il'
-+        },
-+        meridiemParse: /gecə|səhər|gündüz|axşam/,
-+        isPM : function (input) {
-+            return /^(gündüz|axşam)$/.test(input);
-+        },
-+        meridiem : function (hour, minute, isLower) {
-+            if (hour < 4) {
-+                return 'gecə';
-+            } else if (hour < 12) {
-+                return 'səhər';
-+            } else if (hour < 17) {
-+                return 'gündüz';
-+            } else {
-+                return 'axşam';
-+            }
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}-(ıncı|inci|nci|üncü|ncı|uncu)/,
-+        ordinal : function (number) {
-+            if (number === 0) {  // special case for zero
-+                return number + '-ıncı';
-+            }
-+            var a = number % 10,
-+                b = number % 100 - a,
-+                c = number >= 100 ? 100 : null;
-+            return number + (suffixes[a] || suffixes[b] || suffixes[c]);
-+        },
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 7  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return az;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/be.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/be.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    function plural(word, num) {
-+        var forms = word.split('_');
-+        return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]);
-+    }
-+    function relativeTimeWithPlural(number, withoutSuffix, key) {
-+        var format = {
-+            'ss': withoutSuffix ? 'секунда_секунды_секунд' : 'секунду_секунды_секунд',
-+            'mm': withoutSuffix ? 'хвіліна_хвіліны_хвілін' : 'хвіліну_хвіліны_хвілін',
-+            'hh': withoutSuffix ? 'гадзіна_гадзіны_гадзін' : 'гадзіну_гадзіны_гадзін',
-+            'dd': 'дзень_дні_дзён',
-+            'MM': 'месяц_месяцы_месяцаў',
-+            'yy': 'год_гады_гадоў'
-+        };
-+        if (key === 'm') {
-+            return withoutSuffix ? 'хвіліна' : 'хвіліну';
-+        }
-+        else if (key === 'h') {
-+            return withoutSuffix ? 'гадзіна' : 'гадзіну';
-+        }
-+        else {
-+            return number + ' ' + plural(format[key], +number);
-+        }
-+    }
-+
-+    var be = moment.defineLocale('be', {
-+        months : {
-+            format: 'студзеня_лютага_сакавіка_красавіка_траўня_чэрвеня_ліпеня_жніўня_верасня_кастрычніка_лістапада_снежня'.split('_'),
-+            standalone: 'студзень_люты_сакавік_красавік_травень_чэрвень_ліпень_жнівень_верасень_кастрычнік_лістапад_снежань'.split('_')
-+        },
-+        monthsShort : 'студ_лют_сак_крас_трав_чэрв_ліп_жнів_вер_каст_ліст_снеж'.split('_'),
-+        weekdays : {
-+            format: 'нядзелю_панядзелак_аўторак_сераду_чацвер_пятніцу_суботу'.split('_'),
-+            standalone: 'нядзеля_панядзелак_аўторак_серада_чацвер_пятніца_субота'.split('_'),
-+            isFormat: /\[ ?[Вв] ?(?:мінулую|наступную)? ?\] ?dddd/
-+        },
-+        weekdaysShort : 'нд_пн_ат_ср_чц_пт_сб'.split('_'),
-+        weekdaysMin : 'нд_пн_ат_ср_чц_пт_сб'.split('_'),
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD.MM.YYYY',
-+            LL : 'D MMMM YYYY г.',
-+            LLL : 'D MMMM YYYY г., HH:mm',
-+            LLLL : 'dddd, D MMMM YYYY г., HH:mm'
-+        },
-+        calendar : {
-+            sameDay: '[Сёння ў] LT',
-+            nextDay: '[Заўтра ў] LT',
-+            lastDay: '[Учора ў] LT',
-+            nextWeek: function () {
-+                return '[У] dddd [ў] LT';
-+            },
-+            lastWeek: function () {
-+                switch (this.day()) {
-+                    case 0:
-+                    case 3:
-+                    case 5:
-+                    case 6:
-+                        return '[У мінулую] dddd [ў] LT';
-+                    case 1:
-+                    case 2:
-+                    case 4:
-+                        return '[У мінулы] dddd [ў] LT';
-+                }
-+            },
-+            sameElse: 'L'
-+        },
-+        relativeTime : {
-+            future : 'праз %s',
-+            past : '%s таму',
-+            s : 'некалькі секунд',
-+            m : relativeTimeWithPlural,
-+            mm : relativeTimeWithPlural,
-+            h : relativeTimeWithPlural,
-+            hh : relativeTimeWithPlural,
-+            d : 'дзень',
-+            dd : relativeTimeWithPlural,
-+            M : 'месяц',
-+            MM : relativeTimeWithPlural,
-+            y : 'год',
-+            yy : relativeTimeWithPlural
-+        },
-+        meridiemParse: /ночы|раніцы|дня|вечара/,
-+        isPM : function (input) {
-+            return /^(дня|вечара)$/.test(input);
-+        },
-+        meridiem : function (hour, minute, isLower) {
-+            if (hour < 4) {
-+                return 'ночы';
-+            } else if (hour < 12) {
-+                return 'раніцы';
-+            } else if (hour < 17) {
-+                return 'дня';
-+            } else {
-+                return 'вечара';
-+            }
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}-(і|ы|га)/,
-+        ordinal: function (number, period) {
-+            switch (period) {
-+                case 'M':
-+                case 'd':
-+                case 'DDD':
-+                case 'w':
-+                case 'W':
-+                    return (number % 10 === 2 || number % 10 === 3) && (number % 100 !== 12 && number % 100 !== 13) ? number + '-і' : number + '-ы';
-+                case 'D':
-+                    return number + '-га';
-+                default:
-+                    return number;
-+            }
-+        },
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 7  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return be;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/bg.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/bg.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var bg = moment.defineLocale('bg', {
-+        months : 'януари_февруари_март_април_май_юни_юли_август_септември_октомври_ноември_декември'.split('_'),
-+        monthsShort : 'янр_фев_мар_апр_май_юни_юли_авг_сеп_окт_ное_дек'.split('_'),
-+        weekdays : 'неделя_понеделник_вторник_сряда_четвъртък_петък_събота'.split('_'),
-+        weekdaysShort : 'нед_пон_вто_сря_чет_пет_съб'.split('_'),
-+        weekdaysMin : 'нд_пн_вт_ср_чт_пт_сб'.split('_'),
-+        longDateFormat : {
-+            LT : 'H:mm',
-+            LTS : 'H:mm:ss',
-+            L : 'D.MM.YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY H:mm',
-+            LLLL : 'dddd, D MMMM YYYY H:mm'
-+        },
-+        calendar : {
-+            sameDay : '[Днес в] LT',
-+            nextDay : '[Утре в] LT',
-+            nextWeek : 'dddd [в] LT',
-+            lastDay : '[Вчера в] LT',
-+            lastWeek : function () {
-+                switch (this.day()) {
-+                    case 0:
-+                    case 3:
-+                    case 6:
-+                        return '[В изминалата] dddd [в] LT';
-+                    case 1:
-+                    case 2:
-+                    case 4:
-+                    case 5:
-+                        return '[В изминалия] dddd [в] LT';
-+                }
-+            },
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'след %s',
-+            past : 'преди %s',
-+            s : 'няколко секунди',
-+            ss : '%d секунди',
-+            m : 'минута',
-+            mm : '%d минути',
-+            h : 'час',
-+            hh : '%d часа',
-+            d : 'ден',
-+            dd : '%d дни',
-+            M : 'месец',
-+            MM : '%d месеца',
-+            y : 'година',
-+            yy : '%d години'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}-(ев|ен|ти|ви|ри|ми)/,
-+        ordinal : function (number) {
-+            var lastDigit = number % 10,
-+                last2Digits = number % 100;
-+            if (number === 0) {
-+                return number + '-ев';
-+            } else if (last2Digits === 0) {
-+                return number + '-ен';
-+            } else if (last2Digits > 10 && last2Digits < 20) {
-+                return number + '-ти';
-+            } else if (lastDigit === 1) {
-+                return number + '-ви';
-+            } else if (lastDigit === 2) {
-+                return number + '-ри';
-+            } else if (lastDigit === 7 || lastDigit === 8) {
-+                return number + '-ми';
-+            } else {
-+                return number + '-ти';
-+            }
-+        },
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 7  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return bg;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/bm.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/bm.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var bm = moment.defineLocale('bm', {
-+        months : 'Zanwuyekalo_Fewuruyekalo_Marisikalo_Awirilikalo_Mɛkalo_Zuwɛnkalo_Zuluyekalo_Utikalo_Sɛtanburukalo_ɔkutɔburukalo_Nowanburukalo_Desanburukalo'.split('_'),
-+        monthsShort : 'Zan_Few_Mar_Awi_Mɛ_Zuw_Zul_Uti_Sɛt_ɔku_Now_Des'.split('_'),
-+        weekdays : 'Kari_Ntɛnɛn_Tarata_Araba_Alamisa_Juma_Sibiri'.split('_'),
-+        weekdaysShort : 'Kar_Ntɛ_Tar_Ara_Ala_Jum_Sib'.split('_'),
-+        weekdaysMin : 'Ka_Nt_Ta_Ar_Al_Ju_Si'.split('_'),
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD/MM/YYYY',
-+            LL : 'MMMM [tile] D [san] YYYY',
-+            LLL : 'MMMM [tile] D [san] YYYY [lɛrɛ] HH:mm',
-+            LLLL : 'dddd MMMM [tile] D [san] YYYY [lɛrɛ] HH:mm'
-+        },
-+        calendar : {
-+            sameDay : '[Bi lɛrɛ] LT',
-+            nextDay : '[Sini lɛrɛ] LT',
-+            nextWeek : 'dddd [don lɛrɛ] LT',
-+            lastDay : '[Kunu lɛrɛ] LT',
-+            lastWeek : 'dddd [tɛmɛnen lɛrɛ] LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : '%s kɔnɔ',
-+            past : 'a bɛ %s bɔ',
-+            s : 'sanga dama dama',
-+            ss : 'sekondi %d',
-+            m : 'miniti kelen',
-+            mm : 'miniti %d',
-+            h : 'lɛrɛ kelen',
-+            hh : 'lɛrɛ %d',
-+            d : 'tile kelen',
-+            dd : 'tile %d',
-+            M : 'kalo kelen',
-+            MM : 'kalo %d',
-+            y : 'san kelen',
-+            yy : 'san %d'
-+        },
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return bm;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/bn.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/bn.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var symbolMap = {
-+        '1': '১',
-+        '2': '২',
-+        '3': '৩',
-+        '4': '৪',
-+        '5': '৫',
-+        '6': '৬',
-+        '7': '৭',
-+        '8': '৮',
-+        '9': '৯',
-+        '0': '০'
-+    },
-+    numberMap = {
-+        '১': '1',
-+        '২': '2',
-+        '৩': '3',
-+        '৪': '4',
-+        '৫': '5',
-+        '৬': '6',
-+        '৭': '7',
-+        '৮': '8',
-+        '৯': '9',
-+        '০': '0'
-+    };
-+
-+    var bn = moment.defineLocale('bn', {
-+        months : 'জানুয়ারী_ফেব্রুয়ারি_মার্চ_এপ্রিল_মে_জুন_জুলাই_আগস্ট_সেপ্টেম্বর_অক্টোবর_নভেম্বর_ডিসেম্বর'.split('_'),
-+        monthsShort : 'জানু_ফেব_মার্চ_এপ্র_মে_জুন_জুল_আগ_সেপ্ট_অক্টো_নভে_ডিসে'.split('_'),
-+        weekdays : 'রবিবার_সোমবার_মঙ্গলবার_বুধবার_বৃহস্পতিবার_শুক্রবার_শনিবার'.split('_'),
-+        weekdaysShort : 'রবি_সোম_মঙ্গল_বুধ_বৃহস্পতি_শুক্র_শনি'.split('_'),
-+        weekdaysMin : 'রবি_সোম_মঙ্গ_বুধ_বৃহঃ_শুক্র_শনি'.split('_'),
-+        longDateFormat : {
-+            LT : 'A h:mm সময়',
-+            LTS : 'A h:mm:ss সময়',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY, A h:mm সময়',
-+            LLLL : 'dddd, D MMMM YYYY, A h:mm সময়'
-+        },
-+        calendar : {
-+            sameDay : '[আজ] LT',
-+            nextDay : '[আগামীকাল] LT',
-+            nextWeek : 'dddd, LT',
-+            lastDay : '[গতকাল] LT',
-+            lastWeek : '[গত] dddd, LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : '%s পরে',
-+            past : '%s আগে',
-+            s : 'কয়েক সেকেন্ড',
-+            ss : '%d সেকেন্ড',
-+            m : 'এক মিনিট',
-+            mm : '%d মিনিট',
-+            h : 'এক ঘন্টা',
-+            hh : '%d ঘন্টা',
-+            d : 'এক দিন',
-+            dd : '%d দিন',
-+            M : 'এক মাস',
-+            MM : '%d মাস',
-+            y : 'এক বছর',
-+            yy : '%d বছর'
-+        },
-+        preparse: function (string) {
-+            return string.replace(/[১২৩৪৫৬৭৮৯০]/g, function (match) {
-+                return numberMap[match];
-+            });
-+        },
-+        postformat: function (string) {
-+            return string.replace(/\d/g, function (match) {
-+                return symbolMap[match];
-+            });
-+        },
-+        meridiemParse: /রাত|সকাল|দুপুর|বিকাল|রাত/,
-+        meridiemHour : function (hour, meridiem) {
-+            if (hour === 12) {
-+                hour = 0;
-+            }
-+            if ((meridiem === 'রাত' && hour >= 4) ||
-+                    (meridiem === 'দুপুর' && hour < 5) ||
-+                    meridiem === 'বিকাল') {
-+                return hour + 12;
-+            } else {
-+                return hour;
-+            }
-+        },
-+        meridiem : function (hour, minute, isLower) {
-+            if (hour < 4) {
-+                return 'রাত';
-+            } else if (hour < 10) {
-+                return 'সকাল';
-+            } else if (hour < 17) {
-+                return 'দুপুর';
-+            } else if (hour < 20) {
-+                return 'বিকাল';
-+            } else {
-+                return 'রাত';
-+            }
-+        },
-+        week : {
-+            dow : 0, // Sunday is the first day of the week.
-+            doy : 6  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return bn;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/bo.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/bo.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var symbolMap = {
-+        '1': '༡',
-+        '2': '༢',
-+        '3': '༣',
-+        '4': '༤',
-+        '5': '༥',
-+        '6': '༦',
-+        '7': '༧',
-+        '8': '༨',
-+        '9': '༩',
-+        '0': '༠'
-+    },
-+    numberMap = {
-+        '༡': '1',
-+        '༢': '2',
-+        '༣': '3',
-+        '༤': '4',
-+        '༥': '5',
-+        '༦': '6',
-+        '༧': '7',
-+        '༨': '8',
-+        '༩': '9',
-+        '༠': '0'
-+    };
-+
-+    var bo = moment.defineLocale('bo', {
-+        months : 'ཟླ་བ་དང་པོ_ཟླ་བ་གཉིས་པ_ཟླ་བ་གསུམ་པ_ཟླ་བ་བཞི་པ_ཟླ་བ་ལྔ་པ_ཟླ་བ་དྲུག་པ_ཟླ་བ་བདུན་པ_ཟླ་བ་བརྒྱད་པ_ཟླ་བ་དགུ་པ_ཟླ་བ་བཅུ་པ_ཟླ་བ་བཅུ་གཅིག་པ_ཟླ་བ་བཅུ་གཉིས་པ'.split('_'),
-+        monthsShort : 'ཟླ་བ་དང་པོ_ཟླ་བ་གཉིས་པ_ཟླ་བ་གསུམ་པ_ཟླ་བ་བཞི་པ_ཟླ་བ་ལྔ་པ_ཟླ་བ་དྲུག་པ_ཟླ་བ་བདུན་པ_ཟླ་བ་བརྒྱད་པ_ཟླ་བ་དགུ་པ_ཟླ་བ་བཅུ་པ_ཟླ་བ་བཅུ་གཅིག་པ_ཟླ་བ་བཅུ་གཉིས་པ'.split('_'),
-+        weekdays : 'གཟའ་ཉི་མ་_གཟའ་ཟླ་བ་_གཟའ་མིག་དམར་_གཟའ་ལྷག་པ་_གཟའ་ཕུར་བུ_གཟའ་པ་སངས་_གཟའ་སྤེན་པ་'.split('_'),
-+        weekdaysShort : 'ཉི་མ་_ཟླ་བ་_མིག་དམར་_ལྷག་པ་_ཕུར་བུ_པ་སངས་_སྤེན་པ་'.split('_'),
-+        weekdaysMin : 'ཉི་མ་_ཟླ་བ་_མིག་དམར་_ལྷག་པ་_ཕུར་བུ_པ་སངས་_སྤེན་པ་'.split('_'),
-+        longDateFormat : {
-+            LT : 'A h:mm',
-+            LTS : 'A h:mm:ss',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY, A h:mm',
-+            LLLL : 'dddd, D MMMM YYYY, A h:mm'
-+        },
-+        calendar : {
-+            sameDay : '[དི་རིང] LT',
-+            nextDay : '[སང་ཉིན] LT',
-+            nextWeek : '[བདུན་ཕྲག་རྗེས་མ], LT',
-+            lastDay : '[ཁ་སང] LT',
-+            lastWeek : '[བདུན་ཕྲག་མཐའ་མ] dddd, LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : '%s ལ་',
-+            past : '%s སྔན་ལ',
-+            s : 'ལམ་སང',
-+            ss : '%d སྐར་ཆ།',
-+            m : 'སྐར་མ་གཅིག',
-+            mm : '%d སྐར་མ',
-+            h : 'ཆུ་ཚོད་གཅིག',
-+            hh : '%d ཆུ་ཚོད',
-+            d : 'ཉིན་གཅིག',
-+            dd : '%d ཉིན་',
-+            M : 'ཟླ་བ་གཅིག',
-+            MM : '%d ཟླ་བ',
-+            y : 'ལོ་གཅིག',
-+            yy : '%d ལོ'
-+        },
-+        preparse: function (string) {
-+            return string.replace(/[༡༢༣༤༥༦༧༨༩༠]/g, function (match) {
-+                return numberMap[match];
-+            });
-+        },
-+        postformat: function (string) {
-+            return string.replace(/\d/g, function (match) {
-+                return symbolMap[match];
-+            });
-+        },
-+        meridiemParse: /མཚན་མོ|ཞོགས་ཀས|ཉིན་གུང|དགོང་དག|མཚན་མོ/,
-+        meridiemHour : function (hour, meridiem) {
-+            if (hour === 12) {
-+                hour = 0;
-+            }
-+            if ((meridiem === 'མཚན་མོ' && hour >= 4) ||
-+                    (meridiem === 'ཉིན་གུང' && hour < 5) ||
-+                    meridiem === 'དགོང་དག') {
-+                return hour + 12;
-+            } else {
-+                return hour;
-+            }
-+        },
-+        meridiem : function (hour, minute, isLower) {
-+            if (hour < 4) {
-+                return 'མཚན་མོ';
-+            } else if (hour < 10) {
-+                return 'ཞོགས་ཀས';
-+            } else if (hour < 17) {
-+                return 'ཉིན་གུང';
-+            } else if (hour < 20) {
-+                return 'དགོང་དག';
-+            } else {
-+                return 'མཚན་མོ';
-+            }
-+        },
-+        week : {
-+            dow : 0, // Sunday is the first day of the week.
-+            doy : 6  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return bo;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/br.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/br.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    function relativeTimeWithMutation(number, withoutSuffix, key) {
-+        var format = {
-+            'mm': 'munutenn',
-+            'MM': 'miz',
-+            'dd': 'devezh'
-+        };
-+        return number + ' ' + mutation(format[key], number);
-+    }
-+    function specialMutationForYears(number) {
-+        switch (lastNumber(number)) {
-+            case 1:
-+            case 3:
-+            case 4:
-+            case 5:
-+            case 9:
-+                return number + ' bloaz';
-+            default:
-+                return number + ' vloaz';
-+        }
-+    }
-+    function lastNumber(number) {
-+        if (number > 9) {
-+            return lastNumber(number % 10);
-+        }
-+        return number;
-+    }
-+    function mutation(text, number) {
-+        if (number === 2) {
-+            return softMutation(text);
-+        }
-+        return text;
-+    }
-+    function softMutation(text) {
-+        var mutationTable = {
-+            'm': 'v',
-+            'b': 'v',
-+            'd': 'z'
-+        };
-+        if (mutationTable[text.charAt(0)] === undefined) {
-+            return text;
-+        }
-+        return mutationTable[text.charAt(0)] + text.substring(1);
-+    }
-+
-+    var br = moment.defineLocale('br', {
-+        months : 'Genver_C\'hwevrer_Meurzh_Ebrel_Mae_Mezheven_Gouere_Eost_Gwengolo_Here_Du_Kerzu'.split('_'),
-+        monthsShort : 'Gen_C\'hwe_Meu_Ebr_Mae_Eve_Gou_Eos_Gwe_Her_Du_Ker'.split('_'),
-+        weekdays : 'Sul_Lun_Meurzh_Merc\'her_Yaou_Gwener_Sadorn'.split('_'),
-+        weekdaysShort : 'Sul_Lun_Meu_Mer_Yao_Gwe_Sad'.split('_'),
-+        weekdaysMin : 'Su_Lu_Me_Mer_Ya_Gw_Sa'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat : {
-+            LT : 'h[e]mm A',
-+            LTS : 'h[e]mm:ss A',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D [a viz] MMMM YYYY',
-+            LLL : 'D [a viz] MMMM YYYY h[e]mm A',
-+            LLLL : 'dddd, D [a viz] MMMM YYYY h[e]mm A'
-+        },
-+        calendar : {
-+            sameDay : '[Hiziv da] LT',
-+            nextDay : '[Warc\'hoazh da] LT',
-+            nextWeek : 'dddd [da] LT',
-+            lastDay : '[Dec\'h da] LT',
-+            lastWeek : 'dddd [paset da] LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'a-benn %s',
-+            past : '%s \'zo',
-+            s : 'un nebeud segondennoù',
-+            ss : '%d eilenn',
-+            m : 'ur vunutenn',
-+            mm : relativeTimeWithMutation,
-+            h : 'un eur',
-+            hh : '%d eur',
-+            d : 'un devezh',
-+            dd : relativeTimeWithMutation,
-+            M : 'ur miz',
-+            MM : relativeTimeWithMutation,
-+            y : 'ur bloaz',
-+            yy : specialMutationForYears
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}(añ|vet)/,
-+        ordinal : function (number) {
-+            var output = (number === 1) ? 'añ' : 'vet';
-+            return number + output;
-+        },
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return br;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/bs.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/bs.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    function translate(number, withoutSuffix, key) {
-+        var result = number + ' ';
-+        switch (key) {
-+            case 'ss':
-+                if (number === 1) {
-+                    result += 'sekunda';
-+                } else if (number === 2 || number === 3 || number === 4) {
-+                    result += 'sekunde';
-+                } else {
-+                    result += 'sekundi';
-+                }
-+                return result;
-+            case 'm':
-+                return withoutSuffix ? 'jedna minuta' : 'jedne minute';
-+            case 'mm':
-+                if (number === 1) {
-+                    result += 'minuta';
-+                } else if (number === 2 || number === 3 || number === 4) {
-+                    result += 'minute';
-+                } else {
-+                    result += 'minuta';
-+                }
-+                return result;
-+            case 'h':
-+                return withoutSuffix ? 'jedan sat' : 'jednog sata';
-+            case 'hh':
-+                if (number === 1) {
-+                    result += 'sat';
-+                } else if (number === 2 || number === 3 || number === 4) {
-+                    result += 'sata';
-+                } else {
-+                    result += 'sati';
-+                }
-+                return result;
-+            case 'dd':
-+                if (number === 1) {
-+                    result += 'dan';
-+                } else {
-+                    result += 'dana';
-+                }
-+                return result;
-+            case 'MM':
-+                if (number === 1) {
-+                    result += 'mjesec';
-+                } else if (number === 2 || number === 3 || number === 4) {
-+                    result += 'mjeseca';
-+                } else {
-+                    result += 'mjeseci';
-+                }
-+                return result;
-+            case 'yy':
-+                if (number === 1) {
-+                    result += 'godina';
-+                } else if (number === 2 || number === 3 || number === 4) {
-+                    result += 'godine';
-+                } else {
-+                    result += 'godina';
-+                }
-+                return result;
-+        }
-+    }
-+
-+    var bs = moment.defineLocale('bs', {
-+        months : 'januar_februar_mart_april_maj_juni_juli_august_septembar_oktobar_novembar_decembar'.split('_'),
-+        monthsShort : 'jan._feb._mar._apr._maj._jun._jul._aug._sep._okt._nov._dec.'.split('_'),
-+        monthsParseExact: true,
-+        weekdays : 'nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota'.split('_'),
-+        weekdaysShort : 'ned._pon._uto._sri._čet._pet._sub.'.split('_'),
-+        weekdaysMin : 'ne_po_ut_sr_če_pe_su'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat : {
-+            LT : 'H:mm',
-+            LTS : 'H:mm:ss',
-+            L : 'DD.MM.YYYY',
-+            LL : 'D. MMMM YYYY',
-+            LLL : 'D. MMMM YYYY H:mm',
-+            LLLL : 'dddd, D. MMMM YYYY H:mm'
-+        },
-+        calendar : {
-+            sameDay  : '[danas u] LT',
-+            nextDay  : '[sutra u] LT',
-+            nextWeek : function () {
-+                switch (this.day()) {
-+                    case 0:
-+                        return '[u] [nedjelju] [u] LT';
-+                    case 3:
-+                        return '[u] [srijedu] [u] LT';
-+                    case 6:
-+                        return '[u] [subotu] [u] LT';
-+                    case 1:
-+                    case 2:
-+                    case 4:
-+                    case 5:
-+                        return '[u] dddd [u] LT';
-+                }
-+            },
-+            lastDay  : '[jučer u] LT',
-+            lastWeek : function () {
-+                switch (this.day()) {
-+                    case 0:
-+                    case 3:
-+                        return '[prošlu] dddd [u] LT';
-+                    case 6:
-+                        return '[prošle] [subote] [u] LT';
-+                    case 1:
-+                    case 2:
-+                    case 4:
-+                    case 5:
-+                        return '[prošli] dddd [u] LT';
-+                }
-+            },
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'za %s',
-+            past   : 'prije %s',
-+            s      : 'par sekundi',
-+            ss     : translate,
-+            m      : translate,
-+            mm     : translate,
-+            h      : translate,
-+            hh     : translate,
-+            d      : 'dan',
-+            dd     : translate,
-+            M      : 'mjesec',
-+            MM     : translate,
-+            y      : 'godinu',
-+            yy     : translate
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}\./,
-+        ordinal : '%d.',
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 7  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return bs;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/ca.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/ca.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var ca = moment.defineLocale('ca', {
-+        months : {
-+            standalone: 'gener_febrer_març_abril_maig_juny_juliol_agost_setembre_octubre_novembre_desembre'.split('_'),
-+            format: 'de gener_de febrer_de març_d\'abril_de maig_de juny_de juliol_d\'agost_de setembre_d\'octubre_de novembre_de desembre'.split('_'),
-+            isFormat: /D[oD]?(\s)+MMMM/
-+        },
-+        monthsShort : 'gen._febr._març_abr._maig_juny_jul._ag._set._oct._nov._des.'.split('_'),
-+        monthsParseExact : true,
-+        weekdays : 'diumenge_dilluns_dimarts_dimecres_dijous_divendres_dissabte'.split('_'),
-+        weekdaysShort : 'dg._dl._dt._dc._dj._dv._ds.'.split('_'),
-+        weekdaysMin : 'dg_dl_dt_dc_dj_dv_ds'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat : {
-+            LT : 'H:mm',
-+            LTS : 'H:mm:ss',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM [de] YYYY',
-+            ll : 'D MMM YYYY',
-+            LLL : 'D MMMM [de] YYYY [a les] H:mm',
-+            lll : 'D MMM YYYY, H:mm',
-+            LLLL : 'dddd D MMMM [de] YYYY [a les] H:mm',
-+            llll : 'ddd D MMM YYYY, H:mm'
-+        },
-+        calendar : {
-+            sameDay : function () {
-+                return '[avui a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
-+            },
-+            nextDay : function () {
-+                return '[demà a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
-+            },
-+            nextWeek : function () {
-+                return 'dddd [a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
-+            },
-+            lastDay : function () {
-+                return '[ahir a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
-+            },
-+            lastWeek : function () {
-+                return '[el] dddd [passat a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
-+            },
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'd\'aquí %s',
-+            past : 'fa %s',
-+            s : 'uns segons',
-+            ss : '%d segons',
-+            m : 'un minut',
-+            mm : '%d minuts',
-+            h : 'una hora',
-+            hh : '%d hores',
-+            d : 'un dia',
-+            dd : '%d dies',
-+            M : 'un mes',
-+            MM : '%d mesos',
-+            y : 'un any',
-+            yy : '%d anys'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}(r|n|t|è|a)/,
-+        ordinal : function (number, period) {
-+            var output = (number === 1) ? 'r' :
-+                (number === 2) ? 'n' :
-+                (number === 3) ? 'r' :
-+                (number === 4) ? 't' : 'è';
-+            if (period === 'w' || period === 'W') {
-+                output = 'a';
-+            }
-+            return number + output;
-+        },
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return ca;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/cs.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/cs.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var months = 'leden_únor_březen_duben_květen_červen_červenec_srpen_září_říjen_listopad_prosinec'.split('_'),
-+        monthsShort = 'led_úno_bře_dub_kvě_čvn_čvc_srp_zář_říj_lis_pro'.split('_');
-+    function plural(n) {
-+        return (n > 1) && (n < 5) && (~~(n / 10) !== 1);
-+    }
-+    function translate(number, withoutSuffix, key, isFuture) {
-+        var result = number + ' ';
-+        switch (key) {
-+            case 's':  // a few seconds / in a few seconds / a few seconds ago
-+                return (withoutSuffix || isFuture) ? 'pár sekund' : 'pár sekundami';
-+            case 'ss': // 9 seconds / in 9 seconds / 9 seconds ago
-+                if (withoutSuffix || isFuture) {
-+                    return result + (plural(number) ? 'sekundy' : 'sekund');
-+                } else {
-+                    return result + 'sekundami';
-+                }
-+                break;
-+            case 'm':  // a minute / in a minute / a minute ago
-+                return withoutSuffix ? 'minuta' : (isFuture ? 'minutu' : 'minutou');
-+            case 'mm': // 9 minutes / in 9 minutes / 9 minutes ago
-+                if (withoutSuffix || isFuture) {
-+                    return result + (plural(number) ? 'minuty' : 'minut');
-+                } else {
-+                    return result + 'minutami';
-+                }
-+                break;
-+            case 'h':  // an hour / in an hour / an hour ago
-+                return withoutSuffix ? 'hodina' : (isFuture ? 'hodinu' : 'hodinou');
-+            case 'hh': // 9 hours / in 9 hours / 9 hours ago
-+                if (withoutSuffix || isFuture) {
-+                    return result + (plural(number) ? 'hodiny' : 'hodin');
-+                } else {
-+                    return result + 'hodinami';
-+                }
-+                break;
-+            case 'd':  // a day / in a day / a day ago
-+                return (withoutSuffix || isFuture) ? 'den' : 'dnem';
-+            case 'dd': // 9 days / in 9 days / 9 days ago
-+                if (withoutSuffix || isFuture) {
-+                    return result + (plural(number) ? 'dny' : 'dní');
-+                } else {
-+                    return result + 'dny';
-+                }
-+                break;
-+            case 'M':  // a month / in a month / a month ago
-+                return (withoutSuffix || isFuture) ? 'měsíc' : 'měsícem';
-+            case 'MM': // 9 months / in 9 months / 9 months ago
-+                if (withoutSuffix || isFuture) {
-+                    return result + (plural(number) ? 'měsíce' : 'měsíců');
-+                } else {
-+                    return result + 'měsíci';
-+                }
-+                break;
-+            case 'y':  // a year / in a year / a year ago
-+                return (withoutSuffix || isFuture) ? 'rok' : 'rokem';
-+            case 'yy': // 9 years / in 9 years / 9 years ago
-+                if (withoutSuffix || isFuture) {
-+                    return result + (plural(number) ? 'roky' : 'let');
-+                } else {
-+                    return result + 'lety';
-+                }
-+                break;
-+        }
-+    }
-+
-+    var cs = moment.defineLocale('cs', {
-+        months : months,
-+        monthsShort : monthsShort,
-+        monthsParse : (function (months, monthsShort) {
-+            var i, _monthsParse = [];
-+            for (i = 0; i < 12; i++) {
-+                // use custom parser to solve problem with July (červenec)
-+                _monthsParse[i] = new RegExp('^' + months[i] + '$|^' + monthsShort[i] + '$', 'i');
-+            }
-+            return _monthsParse;
-+        }(months, monthsShort)),
-+        shortMonthsParse : (function (monthsShort) {
-+            var i, _shortMonthsParse = [];
-+            for (i = 0; i < 12; i++) {
-+                _shortMonthsParse[i] = new RegExp('^' + monthsShort[i] + '$', 'i');
-+            }
-+            return _shortMonthsParse;
-+        }(monthsShort)),
-+        longMonthsParse : (function (months) {
-+            var i, _longMonthsParse = [];
-+            for (i = 0; i < 12; i++) {
-+                _longMonthsParse[i] = new RegExp('^' + months[i] + '$', 'i');
-+            }
-+            return _longMonthsParse;
-+        }(months)),
-+        weekdays : 'neděle_pondělí_úterý_středa_čtvrtek_pátek_sobota'.split('_'),
-+        weekdaysShort : 'ne_po_út_st_čt_pá_so'.split('_'),
-+        weekdaysMin : 'ne_po_út_st_čt_pá_so'.split('_'),
-+        longDateFormat : {
-+            LT: 'H:mm',
-+            LTS : 'H:mm:ss',
-+            L : 'DD.MM.YYYY',
-+            LL : 'D. MMMM YYYY',
-+            LLL : 'D. MMMM YYYY H:mm',
-+            LLLL : 'dddd D. MMMM YYYY H:mm',
-+            l : 'D. M. YYYY'
-+        },
-+        calendar : {
-+            sameDay: '[dnes v] LT',
-+            nextDay: '[zítra v] LT',
-+            nextWeek: function () {
-+                switch (this.day()) {
-+                    case 0:
-+                        return '[v neděli v] LT';
-+                    case 1:
-+                    case 2:
-+                        return '[v] dddd [v] LT';
-+                    case 3:
-+                        return '[ve středu v] LT';
-+                    case 4:
-+                        return '[ve čtvrtek v] LT';
-+                    case 5:
-+                        return '[v pátek v] LT';
-+                    case 6:
-+                        return '[v sobotu v] LT';
-+                }
-+            },
-+            lastDay: '[včera v] LT',
-+            lastWeek: function () {
-+                switch (this.day()) {
-+                    case 0:
-+                        return '[minulou neděli v] LT';
-+                    case 1:
-+                    case 2:
-+                        return '[minulé] dddd [v] LT';
-+                    case 3:
-+                        return '[minulou středu v] LT';
-+                    case 4:
-+                    case 5:
-+                        return '[minulý] dddd [v] LT';
-+                    case 6:
-+                        return '[minulou sobotu v] LT';
-+                }
-+            },
-+            sameElse: 'L'
-+        },
-+        relativeTime : {
-+            future : 'za %s',
-+            past : 'před %s',
-+            s : translate,
-+            ss : translate,
-+            m : translate,
-+            mm : translate,
-+            h : translate,
-+            hh : translate,
-+            d : translate,
-+            dd : translate,
-+            M : translate,
-+            MM : translate,
-+            y : translate,
-+            yy : translate
-+        },
-+        dayOfMonthOrdinalParse : /\d{1,2}\./,
-+        ordinal : '%d.',
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return cs;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/cv.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/cv.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var cv = moment.defineLocale('cv', {
-+        months : 'кӑрлач_нарӑс_пуш_ака_май_ҫӗртме_утӑ_ҫурла_авӑн_юпа_чӳк_раштав'.split('_'),
-+        monthsShort : 'кӑр_нар_пуш_ака_май_ҫӗр_утӑ_ҫур_авн_юпа_чӳк_раш'.split('_'),
-+        weekdays : 'вырсарникун_тунтикун_ытларикун_юнкун_кӗҫнерникун_эрнекун_шӑматкун'.split('_'),
-+        weekdaysShort : 'выр_тун_ытл_юн_кӗҫ_эрн_шӑм'.split('_'),
-+        weekdaysMin : 'вр_тн_ыт_юн_кҫ_эр_шм'.split('_'),
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD-MM-YYYY',
-+            LL : 'YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ]',
-+            LLL : 'YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ], HH:mm',
-+            LLLL : 'dddd, YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ], HH:mm'
-+        },
-+        calendar : {
-+            sameDay: '[Паян] LT [сехетре]',
-+            nextDay: '[Ыран] LT [сехетре]',
-+            lastDay: '[Ӗнер] LT [сехетре]',
-+            nextWeek: '[Ҫитес] dddd LT [сехетре]',
-+            lastWeek: '[Иртнӗ] dddd LT [сехетре]',
-+            sameElse: 'L'
-+        },
-+        relativeTime : {
-+            future : function (output) {
-+                var affix = /сехет$/i.exec(output) ? 'рен' : /ҫул$/i.exec(output) ? 'тан' : 'ран';
-+                return output + affix;
-+            },
-+            past : '%s каялла',
-+            s : 'пӗр-ик ҫеккунт',
-+            ss : '%d ҫеккунт',
-+            m : 'пӗр минут',
-+            mm : '%d минут',
-+            h : 'пӗр сехет',
-+            hh : '%d сехет',
-+            d : 'пӗр кун',
-+            dd : '%d кун',
-+            M : 'пӗр уйӑх',
-+            MM : '%d уйӑх',
-+            y : 'пӗр ҫул',
-+            yy : '%d ҫул'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}-мӗш/,
-+        ordinal : '%d-мӗш',
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 7  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return cv;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/cy.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/cy.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var cy = moment.defineLocale('cy', {
-+        months: 'Ionawr_Chwefror_Mawrth_Ebrill_Mai_Mehefin_Gorffennaf_Awst_Medi_Hydref_Tachwedd_Rhagfyr'.split('_'),
-+        monthsShort: 'Ion_Chwe_Maw_Ebr_Mai_Meh_Gor_Aws_Med_Hyd_Tach_Rhag'.split('_'),
-+        weekdays: 'Dydd Sul_Dydd Llun_Dydd Mawrth_Dydd Mercher_Dydd Iau_Dydd Gwener_Dydd Sadwrn'.split('_'),
-+        weekdaysShort: 'Sul_Llun_Maw_Mer_Iau_Gwe_Sad'.split('_'),
-+        weekdaysMin: 'Su_Ll_Ma_Me_Ia_Gw_Sa'.split('_'),
-+        weekdaysParseExact : true,
-+        // time formats are the same as en-gb
-+        longDateFormat: {
-+            LT: 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L: 'DD/MM/YYYY',
-+            LL: 'D MMMM YYYY',
-+            LLL: 'D MMMM YYYY HH:mm',
-+            LLLL: 'dddd, D MMMM YYYY HH:mm'
-+        },
-+        calendar: {
-+            sameDay: '[Heddiw am] LT',
-+            nextDay: '[Yfory am] LT',
-+            nextWeek: 'dddd [am] LT',
-+            lastDay: '[Ddoe am] LT',
-+            lastWeek: 'dddd [diwethaf am] LT',
-+            sameElse: 'L'
-+        },
-+        relativeTime: {
-+            future: 'mewn %s',
-+            past: '%s yn ôl',
-+            s: 'ychydig eiliadau',
-+            ss: '%d eiliad',
-+            m: 'munud',
-+            mm: '%d munud',
-+            h: 'awr',
-+            hh: '%d awr',
-+            d: 'diwrnod',
-+            dd: '%d diwrnod',
-+            M: 'mis',
-+            MM: '%d mis',
-+            y: 'blwyddyn',
-+            yy: '%d flynedd'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}(fed|ain|af|il|ydd|ed|eg)/,
-+        // traditional ordinal numbers above 31 are not commonly used in colloquial Welsh
-+        ordinal: function (number) {
-+            var b = number,
-+                output = '',
-+                lookup = [
-+                    '', 'af', 'il', 'ydd', 'ydd', 'ed', 'ed', 'ed', 'fed', 'fed', 'fed', // 1af to 10fed
-+                    'eg', 'fed', 'eg', 'eg', 'fed', 'eg', 'eg', 'fed', 'eg', 'fed' // 11eg to 20fed
-+                ];
-+            if (b > 20) {
-+                if (b === 40 || b === 50 || b === 60 || b === 80 || b === 100) {
-+                    output = 'fed'; // not 30ain, 70ain or 90ain
-+                } else {
-+                    output = 'ain';
-+                }
-+            } else if (b > 0) {
-+                output = lookup[b];
-+            }
-+            return number + output;
-+        },
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return cy;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/da.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/da.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var da = moment.defineLocale('da', {
-+        months : 'januar_februar_marts_april_maj_juni_juli_august_september_oktober_november_december'.split('_'),
-+        monthsShort : 'jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec'.split('_'),
-+        weekdays : 'søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag'.split('_'),
-+        weekdaysShort : 'søn_man_tir_ons_tor_fre_lør'.split('_'),
-+        weekdaysMin : 'sø_ma_ti_on_to_fr_lø'.split('_'),
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD.MM.YYYY',
-+            LL : 'D. MMMM YYYY',
-+            LLL : 'D. MMMM YYYY HH:mm',
-+            LLLL : 'dddd [d.] D. MMMM YYYY [kl.] HH:mm'
-+        },
-+        calendar : {
-+            sameDay : '[i dag kl.] LT',
-+            nextDay : '[i morgen kl.] LT',
-+            nextWeek : 'på dddd [kl.] LT',
-+            lastDay : '[i går kl.] LT',
-+            lastWeek : '[i] dddd[s kl.] LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'om %s',
-+            past : '%s siden',
-+            s : 'få sekunder',
-+            ss : '%d sekunder',
-+            m : 'et minut',
-+            mm : '%d minutter',
-+            h : 'en time',
-+            hh : '%d timer',
-+            d : 'en dag',
-+            dd : '%d dage',
-+            M : 'en måned',
-+            MM : '%d måneder',
-+            y : 'et år',
-+            yy : '%d år'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}\./,
-+        ordinal : '%d.',
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return da;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/de-at.js":
-+/*!*********************************************!*\
-+  !*** ./node_modules/moment/locale/de-at.js ***!
-+  \*********************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    function processRelativeTime(number, withoutSuffix, key, isFuture) {
-+        var format = {
-+            'm': ['eine Minute', 'einer Minute'],
-+            'h': ['eine Stunde', 'einer Stunde'],
-+            'd': ['ein Tag', 'einem Tag'],
-+            'dd': [number + ' Tage', number + ' Tagen'],
-+            'M': ['ein Monat', 'einem Monat'],
-+            'MM': [number + ' Monate', number + ' Monaten'],
-+            'y': ['ein Jahr', 'einem Jahr'],
-+            'yy': [number + ' Jahre', number + ' Jahren']
-+        };
-+        return withoutSuffix ? format[key][0] : format[key][1];
-+    }
-+
-+    var deAt = moment.defineLocale('de-at', {
-+        months : 'Jänner_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),
-+        monthsShort : 'Jän._Feb._März_Apr._Mai_Juni_Juli_Aug._Sep._Okt._Nov._Dez.'.split('_'),
-+        monthsParseExact : true,
-+        weekdays : 'Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag'.split('_'),
-+        weekdaysShort : 'So._Mo._Di._Mi._Do._Fr._Sa.'.split('_'),
-+        weekdaysMin : 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat : {
-+            LT: 'HH:mm',
-+            LTS: 'HH:mm:ss',
-+            L : 'DD.MM.YYYY',
-+            LL : 'D. MMMM YYYY',
-+            LLL : 'D. MMMM YYYY HH:mm',
-+            LLLL : 'dddd, D. MMMM YYYY HH:mm'
-+        },
-+        calendar : {
-+            sameDay: '[heute um] LT [Uhr]',
-+            sameElse: 'L',
-+            nextDay: '[morgen um] LT [Uhr]',
-+            nextWeek: 'dddd [um] LT [Uhr]',
-+            lastDay: '[gestern um] LT [Uhr]',
-+            lastWeek: '[letzten] dddd [um] LT [Uhr]'
-+        },
-+        relativeTime : {
-+            future : 'in %s',
-+            past : 'vor %s',
-+            s : 'ein paar Sekunden',
-+            ss : '%d Sekunden',
-+            m : processRelativeTime,
-+            mm : '%d Minuten',
-+            h : processRelativeTime,
-+            hh : '%d Stunden',
-+            d : processRelativeTime,
-+            dd : processRelativeTime,
-+            M : processRelativeTime,
-+            MM : processRelativeTime,
-+            y : processRelativeTime,
-+            yy : processRelativeTime
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}\./,
-+        ordinal : '%d.',
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return deAt;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/de-ch.js":
-+/*!*********************************************!*\
-+  !*** ./node_modules/moment/locale/de-ch.js ***!
-+  \*********************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    function processRelativeTime(number, withoutSuffix, key, isFuture) {
-+        var format = {
-+            'm': ['eine Minute', 'einer Minute'],
-+            'h': ['eine Stunde', 'einer Stunde'],
-+            'd': ['ein Tag', 'einem Tag'],
-+            'dd': [number + ' Tage', number + ' Tagen'],
-+            'M': ['ein Monat', 'einem Monat'],
-+            'MM': [number + ' Monate', number + ' Monaten'],
-+            'y': ['ein Jahr', 'einem Jahr'],
-+            'yy': [number + ' Jahre', number + ' Jahren']
-+        };
-+        return withoutSuffix ? format[key][0] : format[key][1];
-+    }
-+
-+    var deCh = moment.defineLocale('de-ch', {
-+        months : 'Januar_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),
-+        monthsShort : 'Jan._Feb._März_Apr._Mai_Juni_Juli_Aug._Sep._Okt._Nov._Dez.'.split('_'),
-+        monthsParseExact : true,
-+        weekdays : 'Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag'.split('_'),
-+        weekdaysShort : 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'),
-+        weekdaysMin : 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat : {
-+            LT: 'HH:mm',
-+            LTS: 'HH:mm:ss',
-+            L : 'DD.MM.YYYY',
-+            LL : 'D. MMMM YYYY',
-+            LLL : 'D. MMMM YYYY HH:mm',
-+            LLLL : 'dddd, D. MMMM YYYY HH:mm'
-+        },
-+        calendar : {
-+            sameDay: '[heute um] LT [Uhr]',
-+            sameElse: 'L',
-+            nextDay: '[morgen um] LT [Uhr]',
-+            nextWeek: 'dddd [um] LT [Uhr]',
-+            lastDay: '[gestern um] LT [Uhr]',
-+            lastWeek: '[letzten] dddd [um] LT [Uhr]'
-+        },
-+        relativeTime : {
-+            future : 'in %s',
-+            past : 'vor %s',
-+            s : 'ein paar Sekunden',
-+            ss : '%d Sekunden',
-+            m : processRelativeTime,
-+            mm : '%d Minuten',
-+            h : processRelativeTime,
-+            hh : '%d Stunden',
-+            d : processRelativeTime,
-+            dd : processRelativeTime,
-+            M : processRelativeTime,
-+            MM : processRelativeTime,
-+            y : processRelativeTime,
-+            yy : processRelativeTime
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}\./,
-+        ordinal : '%d.',
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return deCh;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/de.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/de.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    function processRelativeTime(number, withoutSuffix, key, isFuture) {
-+        var format = {
-+            'm': ['eine Minute', 'einer Minute'],
-+            'h': ['eine Stunde', 'einer Stunde'],
-+            'd': ['ein Tag', 'einem Tag'],
-+            'dd': [number + ' Tage', number + ' Tagen'],
-+            'M': ['ein Monat', 'einem Monat'],
-+            'MM': [number + ' Monate', number + ' Monaten'],
-+            'y': ['ein Jahr', 'einem Jahr'],
-+            'yy': [number + ' Jahre', number + ' Jahren']
-+        };
-+        return withoutSuffix ? format[key][0] : format[key][1];
-+    }
-+
-+    var de = moment.defineLocale('de', {
-+        months : 'Januar_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),
-+        monthsShort : 'Jan._Feb._März_Apr._Mai_Juni_Juli_Aug._Sep._Okt._Nov._Dez.'.split('_'),
-+        monthsParseExact : true,
-+        weekdays : 'Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag'.split('_'),
-+        weekdaysShort : 'So._Mo._Di._Mi._Do._Fr._Sa.'.split('_'),
-+        weekdaysMin : 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat : {
-+            LT: 'HH:mm',
-+            LTS: 'HH:mm:ss',
-+            L : 'DD.MM.YYYY',
-+            LL : 'D. MMMM YYYY',
-+            LLL : 'D. MMMM YYYY HH:mm',
-+            LLLL : 'dddd, D. MMMM YYYY HH:mm'
-+        },
-+        calendar : {
-+            sameDay: '[heute um] LT [Uhr]',
-+            sameElse: 'L',
-+            nextDay: '[morgen um] LT [Uhr]',
-+            nextWeek: 'dddd [um] LT [Uhr]',
-+            lastDay: '[gestern um] LT [Uhr]',
-+            lastWeek: '[letzten] dddd [um] LT [Uhr]'
-+        },
-+        relativeTime : {
-+            future : 'in %s',
-+            past : 'vor %s',
-+            s : 'ein paar Sekunden',
-+            ss : '%d Sekunden',
-+            m : processRelativeTime,
-+            mm : '%d Minuten',
-+            h : processRelativeTime,
-+            hh : '%d Stunden',
-+            d : processRelativeTime,
-+            dd : processRelativeTime,
-+            M : processRelativeTime,
-+            MM : processRelativeTime,
-+            y : processRelativeTime,
-+            yy : processRelativeTime
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}\./,
-+        ordinal : '%d.',
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return de;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/dv.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/dv.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var months = [
-+        'ޖެނުއަރީ',
-+        'ފެބްރުއަރީ',
-+        'މާރިޗު',
-+        'އޭޕްރީލު',
-+        'މޭ',
-+        'ޖޫން',
-+        'ޖުލައި',
-+        'އޯގަސްޓު',
-+        'ސެޕްޓެމްބަރު',
-+        'އޮކްޓޯބަރު',
-+        'ނޮވެމްބަރު',
-+        'ޑިސެމްބަރު'
-+    ], weekdays = [
-+        'އާދިއްތަ',
-+        'ހޯމަ',
-+        'އަންގާރަ',
-+        'ބުދަ',
-+        'ބުރާސްފަތި',
-+        'ހުކުރު',
-+        'ހޮނިހިރު'
-+    ];
-+
-+    var dv = moment.defineLocale('dv', {
-+        months : months,
-+        monthsShort : months,
-+        weekdays : weekdays,
-+        weekdaysShort : weekdays,
-+        weekdaysMin : 'އާދި_ހޯމަ_އަން_ބުދަ_ބުރާ_ހުކު_ހޮނި'.split('_'),
-+        longDateFormat : {
-+
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'D/M/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY HH:mm',
-+            LLLL : 'dddd D MMMM YYYY HH:mm'
-+        },
-+        meridiemParse: /މކ|މފ/,
-+        isPM : function (input) {
-+            return 'މފ' === input;
-+        },
-+        meridiem : function (hour, minute, isLower) {
-+            if (hour < 12) {
-+                return 'މކ';
-+            } else {
-+                return 'މފ';
-+            }
-+        },
-+        calendar : {
-+            sameDay : '[މިއަދު] LT',
-+            nextDay : '[މާދަމާ] LT',
-+            nextWeek : 'dddd LT',
-+            lastDay : '[އިއްޔެ] LT',
-+            lastWeek : '[ފާއިތުވި] dddd LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'ތެރޭގައި %s',
-+            past : 'ކުރިން %s',
-+            s : 'ސިކުންތުކޮޅެއް',
-+            ss : 'd% ސިކުންތު',
-+            m : 'މިނިޓެއް',
-+            mm : 'މިނިޓު %d',
-+            h : 'ގަޑިއިރެއް',
-+            hh : 'ގަޑިއިރު %d',
-+            d : 'ދުވަހެއް',
-+            dd : 'ދުވަސް %d',
-+            M : 'މަހެއް',
-+            MM : 'މަސް %d',
-+            y : 'އަހަރެއް',
-+            yy : 'އަހަރު %d'
-+        },
-+        preparse: function (string) {
-+            return string.replace(/،/g, ',');
-+        },
-+        postformat: function (string) {
-+            return string.replace(/,/g, '،');
-+        },
-+        week : {
-+            dow : 7,  // Sunday is the first day of the week.
-+            doy : 12  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return dv;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/el.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/el.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+    function isFunction(input) {
-+        return input instanceof Function || Object.prototype.toString.call(input) === '[object Function]';
-+    }
-+
-+
-+    var el = moment.defineLocale('el', {
-+        monthsNominativeEl : 'Ιανουάριος_Φεβρουάριος_Μάρτιος_Απρίλιος_Μάιος_Ιούνιος_Ιούλιος_Αύγουστος_Σεπτέμβριος_Οκτώβριος_Νοέμβριος_Δεκέμβριος'.split('_'),
-+        monthsGenitiveEl : 'Ιανουαρίου_Φεβρουαρίου_Μαρτίου_Απριλίου_Μαΐου_Ιουνίου_Ιουλίου_Αυγούστου_Σεπτεμβρίου_Οκτωβρίου_Νοεμβρίου_Δεκεμβρίου'.split('_'),
-+        months : function (momentToFormat, format) {
-+            if (!momentToFormat) {
-+                return this._monthsNominativeEl;
-+            } else if (typeof format === 'string' && /D/.test(format.substring(0, format.indexOf('MMMM')))) { // if there is a day number before 'MMMM'
-+                return this._monthsGenitiveEl[momentToFormat.month()];
-+            } else {
-+                return this._monthsNominativeEl[momentToFormat.month()];
-+            }
-+        },
-+        monthsShort : 'Ιαν_Φεβ_Μαρ_Απρ_Μαϊ_Ιουν_Ιουλ_Αυγ_Σεπ_Οκτ_Νοε_Δεκ'.split('_'),
-+        weekdays : 'Κυριακή_Δευτέρα_Τρίτη_Τετάρτη_Πέμπτη_Παρασκευή_Σάββατο'.split('_'),
-+        weekdaysShort : 'Κυρ_Δευ_Τρι_Τετ_Πεμ_Παρ_Σαβ'.split('_'),
-+        weekdaysMin : 'Κυ_Δε_Τρ_Τε_Πε_Πα_Σα'.split('_'),
-+        meridiem : function (hours, minutes, isLower) {
-+            if (hours > 11) {
-+                return isLower ? 'μμ' : 'ΜΜ';
-+            } else {
-+                return isLower ? 'πμ' : 'ΠΜ';
-+            }
-+        },
-+        isPM : function (input) {
-+            return ((input + '').toLowerCase()[0] === 'μ');
-+        },
-+        meridiemParse : /[ΠΜ]\.?Μ?\.?/i,
-+        longDateFormat : {
-+            LT : 'h:mm A',
-+            LTS : 'h:mm:ss A',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY h:mm A',
-+            LLLL : 'dddd, D MMMM YYYY h:mm A'
-+        },
-+        calendarEl : {
-+            sameDay : '[Σήμερα {}] LT',
-+            nextDay : '[Αύριο {}] LT',
-+            nextWeek : 'dddd [{}] LT',
-+            lastDay : '[Χθες {}] LT',
-+            lastWeek : function () {
-+                switch (this.day()) {
-+                    case 6:
-+                        return '[το προηγούμενο] dddd [{}] LT';
-+                    default:
-+                        return '[την προηγούμενη] dddd [{}] LT';
-+                }
-+            },
-+            sameElse : 'L'
-+        },
-+        calendar : function (key, mom) {
-+            var output = this._calendarEl[key],
-+                hours = mom && mom.hours();
-+            if (isFunction(output)) {
-+                output = output.apply(mom);
-+            }
-+            return output.replace('{}', (hours % 12 === 1 ? 'στη' : 'στις'));
-+        },
-+        relativeTime : {
-+            future : 'σε %s',
-+            past : '%s πριν',
-+            s : 'λίγα δευτερόλεπτα',
-+            ss : '%d δευτερόλεπτα',
-+            m : 'ένα λεπτό',
-+            mm : '%d λεπτά',
-+            h : 'μία ώρα',
-+            hh : '%d ώρες',
-+            d : 'μία μέρα',
-+            dd : '%d μέρες',
-+            M : 'ένας μήνας',
-+            MM : '%d μήνες',
-+            y : 'ένας χρόνος',
-+            yy : '%d χρόνια'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}η/,
-+        ordinal: '%dη',
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4st is the first week of the year.
-+        }
-+    });
-+
-+    return el;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/en-au.js":
-+/*!*********************************************!*\
-+  !*** ./node_modules/moment/locale/en-au.js ***!
-+  \*********************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var enAu = moment.defineLocale('en-au', {
-+        months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
-+        monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
-+        weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
-+        weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
-+        weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
-+        longDateFormat : {
-+            LT : 'h:mm A',
-+            LTS : 'h:mm:ss A',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY h:mm A',
-+            LLLL : 'dddd, D MMMM YYYY h:mm A'
-+        },
-+        calendar : {
-+            sameDay : '[Today at] LT',
-+            nextDay : '[Tomorrow at] LT',
-+            nextWeek : 'dddd [at] LT',
-+            lastDay : '[Yesterday at] LT',
-+            lastWeek : '[Last] dddd [at] LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'in %s',
-+            past : '%s ago',
-+            s : 'a few seconds',
-+            ss : '%d seconds',
-+            m : 'a minute',
-+            mm : '%d minutes',
-+            h : 'an hour',
-+            hh : '%d hours',
-+            d : 'a day',
-+            dd : '%d days',
-+            M : 'a month',
-+            MM : '%d months',
-+            y : 'a year',
-+            yy : '%d years'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
-+        ordinal : function (number) {
-+            var b = number % 10,
-+                output = (~~(number % 100 / 10) === 1) ? 'th' :
-+                (b === 1) ? 'st' :
-+                (b === 2) ? 'nd' :
-+                (b === 3) ? 'rd' : 'th';
-+            return number + output;
-+        },
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return enAu;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/en-ca.js":
-+/*!*********************************************!*\
-+  !*** ./node_modules/moment/locale/en-ca.js ***!
-+  \*********************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var enCa = moment.defineLocale('en-ca', {
-+        months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
-+        monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
-+        weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
-+        weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
-+        weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
-+        longDateFormat : {
-+            LT : 'h:mm A',
-+            LTS : 'h:mm:ss A',
-+            L : 'YYYY-MM-DD',
-+            LL : 'MMMM D, YYYY',
-+            LLL : 'MMMM D, YYYY h:mm A',
-+            LLLL : 'dddd, MMMM D, YYYY h:mm A'
-+        },
-+        calendar : {
-+            sameDay : '[Today at] LT',
-+            nextDay : '[Tomorrow at] LT',
-+            nextWeek : 'dddd [at] LT',
-+            lastDay : '[Yesterday at] LT',
-+            lastWeek : '[Last] dddd [at] LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'in %s',
-+            past : '%s ago',
-+            s : 'a few seconds',
-+            ss : '%d seconds',
-+            m : 'a minute',
-+            mm : '%d minutes',
-+            h : 'an hour',
-+            hh : '%d hours',
-+            d : 'a day',
-+            dd : '%d days',
-+            M : 'a month',
-+            MM : '%d months',
-+            y : 'a year',
-+            yy : '%d years'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
-+        ordinal : function (number) {
-+            var b = number % 10,
-+                output = (~~(number % 100 / 10) === 1) ? 'th' :
-+                (b === 1) ? 'st' :
-+                (b === 2) ? 'nd' :
-+                (b === 3) ? 'rd' : 'th';
-+            return number + output;
-+        }
-+    });
-+
-+    return enCa;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/en-gb.js":
-+/*!*********************************************!*\
-+  !*** ./node_modules/moment/locale/en-gb.js ***!
-+  \*********************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var enGb = moment.defineLocale('en-gb', {
-+        months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
-+        monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
-+        weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
-+        weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
-+        weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY HH:mm',
-+            LLLL : 'dddd, D MMMM YYYY HH:mm'
-+        },
-+        calendar : {
-+            sameDay : '[Today at] LT',
-+            nextDay : '[Tomorrow at] LT',
-+            nextWeek : 'dddd [at] LT',
-+            lastDay : '[Yesterday at] LT',
-+            lastWeek : '[Last] dddd [at] LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'in %s',
-+            past : '%s ago',
-+            s : 'a few seconds',
-+            ss : '%d seconds',
-+            m : 'a minute',
-+            mm : '%d minutes',
-+            h : 'an hour',
-+            hh : '%d hours',
-+            d : 'a day',
-+            dd : '%d days',
-+            M : 'a month',
-+            MM : '%d months',
-+            y : 'a year',
-+            yy : '%d years'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
-+        ordinal : function (number) {
-+            var b = number % 10,
-+                output = (~~(number % 100 / 10) === 1) ? 'th' :
-+                (b === 1) ? 'st' :
-+                (b === 2) ? 'nd' :
-+                (b === 3) ? 'rd' : 'th';
-+            return number + output;
-+        },
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return enGb;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/en-ie.js":
-+/*!*********************************************!*\
-+  !*** ./node_modules/moment/locale/en-ie.js ***!
-+  \*********************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var enIe = moment.defineLocale('en-ie', {
-+        months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
-+        monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
-+        weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
-+        weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
-+        weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD-MM-YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY HH:mm',
-+            LLLL : 'dddd D MMMM YYYY HH:mm'
-+        },
-+        calendar : {
-+            sameDay : '[Today at] LT',
-+            nextDay : '[Tomorrow at] LT',
-+            nextWeek : 'dddd [at] LT',
-+            lastDay : '[Yesterday at] LT',
-+            lastWeek : '[Last] dddd [at] LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'in %s',
-+            past : '%s ago',
-+            s : 'a few seconds',
-+            ss : '%d seconds',
-+            m : 'a minute',
-+            mm : '%d minutes',
-+            h : 'an hour',
-+            hh : '%d hours',
-+            d : 'a day',
-+            dd : '%d days',
-+            M : 'a month',
-+            MM : '%d months',
-+            y : 'a year',
-+            yy : '%d years'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
-+        ordinal : function (number) {
-+            var b = number % 10,
-+                output = (~~(number % 100 / 10) === 1) ? 'th' :
-+                (b === 1) ? 'st' :
-+                (b === 2) ? 'nd' :
-+                (b === 3) ? 'rd' : 'th';
-+            return number + output;
-+        },
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return enIe;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/en-il.js":
-+/*!*********************************************!*\
-+  !*** ./node_modules/moment/locale/en-il.js ***!
-+  \*********************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var enIl = moment.defineLocale('en-il', {
-+        months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
-+        monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
-+        weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
-+        weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
-+        weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY HH:mm',
-+            LLLL : 'dddd, D MMMM YYYY HH:mm'
-+        },
-+        calendar : {
-+            sameDay : '[Today at] LT',
-+            nextDay : '[Tomorrow at] LT',
-+            nextWeek : 'dddd [at] LT',
-+            lastDay : '[Yesterday at] LT',
-+            lastWeek : '[Last] dddd [at] LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'in %s',
-+            past : '%s ago',
-+            s : 'a few seconds',
-+            m : 'a minute',
-+            mm : '%d minutes',
-+            h : 'an hour',
-+            hh : '%d hours',
-+            d : 'a day',
-+            dd : '%d days',
-+            M : 'a month',
-+            MM : '%d months',
-+            y : 'a year',
-+            yy : '%d years'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
-+        ordinal : function (number) {
-+            var b = number % 10,
-+                output = (~~(number % 100 / 10) === 1) ? 'th' :
-+                (b === 1) ? 'st' :
-+                (b === 2) ? 'nd' :
-+                (b === 3) ? 'rd' : 'th';
-+            return number + output;
-+        }
-+    });
-+
-+    return enIl;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/en-nz.js":
-+/*!*********************************************!*\
-+  !*** ./node_modules/moment/locale/en-nz.js ***!
-+  \*********************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var enNz = moment.defineLocale('en-nz', {
-+        months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
-+        monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
-+        weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
-+        weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
-+        weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
-+        longDateFormat : {
-+            LT : 'h:mm A',
-+            LTS : 'h:mm:ss A',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY h:mm A',
-+            LLLL : 'dddd, D MMMM YYYY h:mm A'
-+        },
-+        calendar : {
-+            sameDay : '[Today at] LT',
-+            nextDay : '[Tomorrow at] LT',
-+            nextWeek : 'dddd [at] LT',
-+            lastDay : '[Yesterday at] LT',
-+            lastWeek : '[Last] dddd [at] LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'in %s',
-+            past : '%s ago',
-+            s : 'a few seconds',
-+            ss : '%d seconds',
-+            m : 'a minute',
-+            mm : '%d minutes',
-+            h : 'an hour',
-+            hh : '%d hours',
-+            d : 'a day',
-+            dd : '%d days',
-+            M : 'a month',
-+            MM : '%d months',
-+            y : 'a year',
-+            yy : '%d years'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
-+        ordinal : function (number) {
-+            var b = number % 10,
-+                output = (~~(number % 100 / 10) === 1) ? 'th' :
-+                (b === 1) ? 'st' :
-+                (b === 2) ? 'nd' :
-+                (b === 3) ? 'rd' : 'th';
-+            return number + output;
-+        },
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return enNz;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/eo.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/eo.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var eo = moment.defineLocale('eo', {
-+        months : 'januaro_februaro_marto_aprilo_majo_junio_julio_aŭgusto_septembro_oktobro_novembro_decembro'.split('_'),
-+        monthsShort : 'jan_feb_mar_apr_maj_jun_jul_aŭg_sep_okt_nov_dec'.split('_'),
-+        weekdays : 'dimanĉo_lundo_mardo_merkredo_ĵaŭdo_vendredo_sabato'.split('_'),
-+        weekdaysShort : 'dim_lun_mard_merk_ĵaŭ_ven_sab'.split('_'),
-+        weekdaysMin : 'di_lu_ma_me_ĵa_ve_sa'.split('_'),
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'YYYY-MM-DD',
-+            LL : 'D[-a de] MMMM, YYYY',
-+            LLL : 'D[-a de] MMMM, YYYY HH:mm',
-+            LLLL : 'dddd, [la] D[-a de] MMMM, YYYY HH:mm'
-+        },
-+        meridiemParse: /[ap]\.t\.m/i,
-+        isPM: function (input) {
-+            return input.charAt(0).toLowerCase() === 'p';
-+        },
-+        meridiem : function (hours, minutes, isLower) {
-+            if (hours > 11) {
-+                return isLower ? 'p.t.m.' : 'P.T.M.';
-+            } else {
-+                return isLower ? 'a.t.m.' : 'A.T.M.';
-+            }
-+        },
-+        calendar : {
-+            sameDay : '[Hodiaŭ je] LT',
-+            nextDay : '[Morgaŭ je] LT',
-+            nextWeek : 'dddd [je] LT',
-+            lastDay : '[Hieraŭ je] LT',
-+            lastWeek : '[pasinta] dddd [je] LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'post %s',
-+            past : 'antaŭ %s',
-+            s : 'sekundoj',
-+            ss : '%d sekundoj',
-+            m : 'minuto',
-+            mm : '%d minutoj',
-+            h : 'horo',
-+            hh : '%d horoj',
-+            d : 'tago',//ne 'diurno', ĉar estas uzita por proksimumo
-+            dd : '%d tagoj',
-+            M : 'monato',
-+            MM : '%d monatoj',
-+            y : 'jaro',
-+            yy : '%d jaroj'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}a/,
-+        ordinal : '%da',
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 7  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return eo;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/es-do.js":
-+/*!*********************************************!*\
-+  !*** ./node_modules/moment/locale/es-do.js ***!
-+  \*********************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var monthsShortDot = 'ene._feb._mar._abr._may._jun._jul._ago._sep._oct._nov._dic.'.split('_'),
-+        monthsShort = 'ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic'.split('_');
-+
-+    var monthsParse = [/^ene/i, /^feb/i, /^mar/i, /^abr/i, /^may/i, /^jun/i, /^jul/i, /^ago/i, /^sep/i, /^oct/i, /^nov/i, /^dic/i];
-+    var monthsRegex = /^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre|ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i;
-+
-+    var esDo = moment.defineLocale('es-do', {
-+        months : 'enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre'.split('_'),
-+        monthsShort : function (m, format) {
-+            if (!m) {
-+                return monthsShortDot;
-+            } else if (/-MMM-/.test(format)) {
-+                return monthsShort[m.month()];
-+            } else {
-+                return monthsShortDot[m.month()];
-+            }
-+        },
-+        monthsRegex: monthsRegex,
-+        monthsShortRegex: monthsRegex,
-+        monthsStrictRegex: /^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre)/i,
-+        monthsShortStrictRegex: /^(ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i,
-+        monthsParse: monthsParse,
-+        longMonthsParse: monthsParse,
-+        shortMonthsParse: monthsParse,
-+        weekdays : 'domingo_lunes_martes_miércoles_jueves_viernes_sábado'.split('_'),
-+        weekdaysShort : 'dom._lun._mar._mié._jue._vie._sáb.'.split('_'),
-+        weekdaysMin : 'do_lu_ma_mi_ju_vi_sá'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat : {
-+            LT : 'h:mm A',
-+            LTS : 'h:mm:ss A',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D [de] MMMM [de] YYYY',
-+            LLL : 'D [de] MMMM [de] YYYY h:mm A',
-+            LLLL : 'dddd, D [de] MMMM [de] YYYY h:mm A'
-+        },
-+        calendar : {
-+            sameDay : function () {
-+                return '[hoy a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-+            },
-+            nextDay : function () {
-+                return '[mañana a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-+            },
-+            nextWeek : function () {
-+                return 'dddd [a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-+            },
-+            lastDay : function () {
-+                return '[ayer a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-+            },
-+            lastWeek : function () {
-+                return '[el] dddd [pasado a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-+            },
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'en %s',
-+            past : 'hace %s',
-+            s : 'unos segundos',
-+            ss : '%d segundos',
-+            m : 'un minuto',
-+            mm : '%d minutos',
-+            h : 'una hora',
-+            hh : '%d horas',
-+            d : 'un día',
-+            dd : '%d días',
-+            M : 'un mes',
-+            MM : '%d meses',
-+            y : 'un año',
-+            yy : '%d años'
-+        },
-+        dayOfMonthOrdinalParse : /\d{1,2}º/,
-+        ordinal : '%dº',
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return esDo;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/es-us.js":
-+/*!*********************************************!*\
-+  !*** ./node_modules/moment/locale/es-us.js ***!
-+  \*********************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var monthsShortDot = 'ene._feb._mar._abr._may._jun._jul._ago._sep._oct._nov._dic.'.split('_'),
-+        monthsShort = 'ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic'.split('_');
-+
-+    var esUs = moment.defineLocale('es-us', {
-+        months : 'enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre'.split('_'),
-+        monthsShort : function (m, format) {
-+            if (!m) {
-+                return monthsShortDot;
-+            } else if (/-MMM-/.test(format)) {
-+                return monthsShort[m.month()];
-+            } else {
-+                return monthsShortDot[m.month()];
-+            }
-+        },
-+        monthsParseExact : true,
-+        weekdays : 'domingo_lunes_martes_miércoles_jueves_viernes_sábado'.split('_'),
-+        weekdaysShort : 'dom._lun._mar._mié._jue._vie._sáb.'.split('_'),
-+        weekdaysMin : 'do_lu_ma_mi_ju_vi_sá'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat : {
-+            LT : 'h:mm A',
-+            LTS : 'h:mm:ss A',
-+            L : 'MM/DD/YYYY',
-+            LL : 'MMMM [de] D [de] YYYY',
-+            LLL : 'MMMM [de] D [de] YYYY h:mm A',
-+            LLLL : 'dddd, MMMM [de] D [de] YYYY h:mm A'
-+        },
-+        calendar : {
-+            sameDay : function () {
-+                return '[hoy a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-+            },
-+            nextDay : function () {
-+                return '[mañana a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-+            },
-+            nextWeek : function () {
-+                return 'dddd [a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-+            },
-+            lastDay : function () {
-+                return '[ayer a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-+            },
-+            lastWeek : function () {
-+                return '[el] dddd [pasado a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-+            },
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'en %s',
-+            past : 'hace %s',
-+            s : 'unos segundos',
-+            ss : '%d segundos',
-+            m : 'un minuto',
-+            mm : '%d minutos',
-+            h : 'una hora',
-+            hh : '%d horas',
-+            d : 'un día',
-+            dd : '%d días',
-+            M : 'un mes',
-+            MM : '%d meses',
-+            y : 'un año',
-+            yy : '%d años'
-+        },
-+        dayOfMonthOrdinalParse : /\d{1,2}º/,
-+        ordinal : '%dº',
-+        week : {
-+            dow : 0, // Sunday is the first day of the week.
-+            doy : 6  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return esUs;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/es.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/es.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var monthsShortDot = 'ene._feb._mar._abr._may._jun._jul._ago._sep._oct._nov._dic.'.split('_'),
-+        monthsShort = 'ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic'.split('_');
-+
-+    var monthsParse = [/^ene/i, /^feb/i, /^mar/i, /^abr/i, /^may/i, /^jun/i, /^jul/i, /^ago/i, /^sep/i, /^oct/i, /^nov/i, /^dic/i];
-+    var monthsRegex = /^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre|ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i;
-+
-+    var es = moment.defineLocale('es', {
-+        months : 'enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre'.split('_'),
-+        monthsShort : function (m, format) {
-+            if (!m) {
-+                return monthsShortDot;
-+            } else if (/-MMM-/.test(format)) {
-+                return monthsShort[m.month()];
-+            } else {
-+                return monthsShortDot[m.month()];
-+            }
-+        },
-+        monthsRegex : monthsRegex,
-+        monthsShortRegex : monthsRegex,
-+        monthsStrictRegex : /^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre)/i,
-+        monthsShortStrictRegex : /^(ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i,
-+        monthsParse : monthsParse,
-+        longMonthsParse : monthsParse,
-+        shortMonthsParse : monthsParse,
-+        weekdays : 'domingo_lunes_martes_miércoles_jueves_viernes_sábado'.split('_'),
-+        weekdaysShort : 'dom._lun._mar._mié._jue._vie._sáb.'.split('_'),
-+        weekdaysMin : 'do_lu_ma_mi_ju_vi_sá'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat : {
-+            LT : 'H:mm',
-+            LTS : 'H:mm:ss',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D [de] MMMM [de] YYYY',
-+            LLL : 'D [de] MMMM [de] YYYY H:mm',
-+            LLLL : 'dddd, D [de] MMMM [de] YYYY H:mm'
-+        },
-+        calendar : {
-+            sameDay : function () {
-+                return '[hoy a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-+            },
-+            nextDay : function () {
-+                return '[mañana a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-+            },
-+            nextWeek : function () {
-+                return 'dddd [a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-+            },
-+            lastDay : function () {
-+                return '[ayer a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-+            },
-+            lastWeek : function () {
-+                return '[el] dddd [pasado a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-+            },
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'en %s',
-+            past : 'hace %s',
-+            s : 'unos segundos',
-+            ss : '%d segundos',
-+            m : 'un minuto',
-+            mm : '%d minutos',
-+            h : 'una hora',
-+            hh : '%d horas',
-+            d : 'un día',
-+            dd : '%d días',
-+            M : 'un mes',
-+            MM : '%d meses',
-+            y : 'un año',
-+            yy : '%d años'
-+        },
-+        dayOfMonthOrdinalParse : /\d{1,2}º/,
-+        ordinal : '%dº',
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return es;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/et.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/et.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    function processRelativeTime(number, withoutSuffix, key, isFuture) {
-+        var format = {
-+            's' : ['mõne sekundi', 'mõni sekund', 'paar sekundit'],
-+            'ss': [number + 'sekundi', number + 'sekundit'],
-+            'm' : ['ühe minuti', 'üks minut'],
-+            'mm': [number + ' minuti', number + ' minutit'],
-+            'h' : ['ühe tunni', 'tund aega', 'üks tund'],
-+            'hh': [number + ' tunni', number + ' tundi'],
-+            'd' : ['ühe päeva', 'üks päev'],
-+            'M' : ['kuu aja', 'kuu aega', 'üks kuu'],
-+            'MM': [number + ' kuu', number + ' kuud'],
-+            'y' : ['ühe aasta', 'aasta', 'üks aasta'],
-+            'yy': [number + ' aasta', number + ' aastat']
-+        };
-+        if (withoutSuffix) {
-+            return format[key][2] ? format[key][2] : format[key][1];
-+        }
-+        return isFuture ? format[key][0] : format[key][1];
-+    }
-+
-+    var et = moment.defineLocale('et', {
-+        months        : 'jaanuar_veebruar_märts_aprill_mai_juuni_juuli_august_september_oktoober_november_detsember'.split('_'),
-+        monthsShort   : 'jaan_veebr_märts_apr_mai_juuni_juuli_aug_sept_okt_nov_dets'.split('_'),
-+        weekdays      : 'pühapäev_esmaspäev_teisipäev_kolmapäev_neljapäev_reede_laupäev'.split('_'),
-+        weekdaysShort : 'P_E_T_K_N_R_L'.split('_'),
-+        weekdaysMin   : 'P_E_T_K_N_R_L'.split('_'),
-+        longDateFormat : {
-+            LT   : 'H:mm',
-+            LTS : 'H:mm:ss',
-+            L    : 'DD.MM.YYYY',
-+            LL   : 'D. MMMM YYYY',
-+            LLL  : 'D. MMMM YYYY H:mm',
-+            LLLL : 'dddd, D. MMMM YYYY H:mm'
-+        },
-+        calendar : {
-+            sameDay  : '[Täna,] LT',
-+            nextDay  : '[Homme,] LT',
-+            nextWeek : '[Järgmine] dddd LT',
-+            lastDay  : '[Eile,] LT',
-+            lastWeek : '[Eelmine] dddd LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : '%s pärast',
-+            past   : '%s tagasi',
-+            s      : processRelativeTime,
-+            ss     : processRelativeTime,
-+            m      : processRelativeTime,
-+            mm     : processRelativeTime,
-+            h      : processRelativeTime,
-+            hh     : processRelativeTime,
-+            d      : processRelativeTime,
-+            dd     : '%d päeva',
-+            M      : processRelativeTime,
-+            MM     : processRelativeTime,
-+            y      : processRelativeTime,
-+            yy     : processRelativeTime
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}\./,
-+        ordinal : '%d.',
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return et;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/eu.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/eu.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var eu = moment.defineLocale('eu', {
-+        months : 'urtarrila_otsaila_martxoa_apirila_maiatza_ekaina_uztaila_abuztua_iraila_urria_azaroa_abendua'.split('_'),
-+        monthsShort : 'urt._ots._mar._api._mai._eka._uzt._abu._ira._urr._aza._abe.'.split('_'),
-+        monthsParseExact : true,
-+        weekdays : 'igandea_astelehena_asteartea_asteazkena_osteguna_ostirala_larunbata'.split('_'),
-+        weekdaysShort : 'ig._al._ar._az._og._ol._lr.'.split('_'),
-+        weekdaysMin : 'ig_al_ar_az_og_ol_lr'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'YYYY-MM-DD',
-+            LL : 'YYYY[ko] MMMM[ren] D[a]',
-+            LLL : 'YYYY[ko] MMMM[ren] D[a] HH:mm',
-+            LLLL : 'dddd, YYYY[ko] MMMM[ren] D[a] HH:mm',
-+            l : 'YYYY-M-D',
-+            ll : 'YYYY[ko] MMM D[a]',
-+            lll : 'YYYY[ko] MMM D[a] HH:mm',
-+            llll : 'ddd, YYYY[ko] MMM D[a] HH:mm'
-+        },
-+        calendar : {
-+            sameDay : '[gaur] LT[etan]',
-+            nextDay : '[bihar] LT[etan]',
-+            nextWeek : 'dddd LT[etan]',
-+            lastDay : '[atzo] LT[etan]',
-+            lastWeek : '[aurreko] dddd LT[etan]',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : '%s barru',
-+            past : 'duela %s',
-+            s : 'segundo batzuk',
-+            ss : '%d segundo',
-+            m : 'minutu bat',
-+            mm : '%d minutu',
-+            h : 'ordu bat',
-+            hh : '%d ordu',
-+            d : 'egun bat',
-+            dd : '%d egun',
-+            M : 'hilabete bat',
-+            MM : '%d hilabete',
-+            y : 'urte bat',
-+            yy : '%d urte'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}\./,
-+        ordinal : '%d.',
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 7  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return eu;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/fa.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/fa.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var symbolMap = {
-+        '1': '۱',
-+        '2': '۲',
-+        '3': '۳',
-+        '4': '۴',
-+        '5': '۵',
-+        '6': '۶',
-+        '7': '۷',
-+        '8': '۸',
-+        '9': '۹',
-+        '0': '۰'
-+    }, numberMap = {
-+        '۱': '1',
-+        '۲': '2',
-+        '۳': '3',
-+        '۴': '4',
-+        '۵': '5',
-+        '۶': '6',
-+        '۷': '7',
-+        '۸': '8',
-+        '۹': '9',
-+        '۰': '0'
-+    };
-+
-+    var fa = moment.defineLocale('fa', {
-+        months : 'ژانویه_فوریه_مارس_آوریل_مه_ژوئن_ژوئیه_اوت_سپتامبر_اکتبر_نوامبر_دسامبر'.split('_'),
-+        monthsShort : 'ژانویه_فوریه_مارس_آوریل_مه_ژوئن_ژوئیه_اوت_سپتامبر_اکتبر_نوامبر_دسامبر'.split('_'),
-+        weekdays : 'یک\u200cشنبه_دوشنبه_سه\u200cشنبه_چهارشنبه_پنج\u200cشنبه_جمعه_شنبه'.split('_'),
-+        weekdaysShort : 'یک\u200cشنبه_دوشنبه_سه\u200cشنبه_چهارشنبه_پنج\u200cشنبه_جمعه_شنبه'.split('_'),
-+        weekdaysMin : 'ی_د_س_چ_پ_ج_ش'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY HH:mm',
-+            LLLL : 'dddd, D MMMM YYYY HH:mm'
-+        },
-+        meridiemParse: /قبل از ظهر|بعد از ظهر/,
-+        isPM: function (input) {
-+            return /بعد از ظهر/.test(input);
-+        },
-+        meridiem : function (hour, minute, isLower) {
-+            if (hour < 12) {
-+                return 'قبل از ظهر';
-+            } else {
-+                return 'بعد از ظهر';
-+            }
-+        },
-+        calendar : {
-+            sameDay : '[امروز ساعت] LT',
-+            nextDay : '[فردا ساعت] LT',
-+            nextWeek : 'dddd [ساعت] LT',
-+            lastDay : '[دیروز ساعت] LT',
-+            lastWeek : 'dddd [پیش] [ساعت] LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'در %s',
-+            past : '%s پیش',
-+            s : 'چند ثانیه',
-+            ss : 'ثانیه d%',
-+            m : 'یک دقیقه',
-+            mm : '%d دقیقه',
-+            h : 'یک ساعت',
-+            hh : '%d ساعت',
-+            d : 'یک روز',
-+            dd : '%d روز',
-+            M : 'یک ماه',
-+            MM : '%d ماه',
-+            y : 'یک سال',
-+            yy : '%d سال'
-+        },
-+        preparse: function (string) {
-+            return string.replace(/[۰-۹]/g, function (match) {
-+                return numberMap[match];
-+            }).replace(/،/g, ',');
-+        },
-+        postformat: function (string) {
-+            return string.replace(/\d/g, function (match) {
-+                return symbolMap[match];
-+            }).replace(/,/g, '،');
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}م/,
-+        ordinal : '%dم',
-+        week : {
-+            dow : 6, // Saturday is the first day of the week.
-+            doy : 12 // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return fa;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/fi.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/fi.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var numbersPast = 'nolla yksi kaksi kolme neljä viisi kuusi seitsemän kahdeksan yhdeksän'.split(' '),
-+        numbersFuture = [
-+            'nolla', 'yhden', 'kahden', 'kolmen', 'neljän', 'viiden', 'kuuden',
-+            numbersPast[7], numbersPast[8], numbersPast[9]
-+        ];
-+    function translate(number, withoutSuffix, key, isFuture) {
-+        var result = '';
-+        switch (key) {
-+            case 's':
-+                return isFuture ? 'muutaman sekunnin' : 'muutama sekunti';
-+            case 'ss':
-+                return isFuture ? 'sekunnin' : 'sekuntia';
-+            case 'm':
-+                return isFuture ? 'minuutin' : 'minuutti';
-+            case 'mm':
-+                result = isFuture ? 'minuutin' : 'minuuttia';
-+                break;
-+            case 'h':
-+                return isFuture ? 'tunnin' : 'tunti';
-+            case 'hh':
-+                result = isFuture ? 'tunnin' : 'tuntia';
-+                break;
-+            case 'd':
-+                return isFuture ? 'päivän' : 'päivä';
-+            case 'dd':
-+                result = isFuture ? 'päivän' : 'päivää';
-+                break;
-+            case 'M':
-+                return isFuture ? 'kuukauden' : 'kuukausi';
-+            case 'MM':
-+                result = isFuture ? 'kuukauden' : 'kuukautta';
-+                break;
-+            case 'y':
-+                return isFuture ? 'vuoden' : 'vuosi';
-+            case 'yy':
-+                result = isFuture ? 'vuoden' : 'vuotta';
-+                break;
-+        }
-+        result = verbalNumber(number, isFuture) + ' ' + result;
-+        return result;
-+    }
-+    function verbalNumber(number, isFuture) {
-+        return number < 10 ? (isFuture ? numbersFuture[number] : numbersPast[number]) : number;
-+    }
-+
-+    var fi = moment.defineLocale('fi', {
-+        months : 'tammikuu_helmikuu_maaliskuu_huhtikuu_toukokuu_kesäkuu_heinäkuu_elokuu_syyskuu_lokakuu_marraskuu_joulukuu'.split('_'),
-+        monthsShort : 'tammi_helmi_maalis_huhti_touko_kesä_heinä_elo_syys_loka_marras_joulu'.split('_'),
-+        weekdays : 'sunnuntai_maanantai_tiistai_keskiviikko_torstai_perjantai_lauantai'.split('_'),
-+        weekdaysShort : 'su_ma_ti_ke_to_pe_la'.split('_'),
-+        weekdaysMin : 'su_ma_ti_ke_to_pe_la'.split('_'),
-+        longDateFormat : {
-+            LT : 'HH.mm',
-+            LTS : 'HH.mm.ss',
-+            L : 'DD.MM.YYYY',
-+            LL : 'Do MMMM[ta] YYYY',
-+            LLL : 'Do MMMM[ta] YYYY, [klo] HH.mm',
-+            LLLL : 'dddd, Do MMMM[ta] YYYY, [klo] HH.mm',
-+            l : 'D.M.YYYY',
-+            ll : 'Do MMM YYYY',
-+            lll : 'Do MMM YYYY, [klo] HH.mm',
-+            llll : 'ddd, Do MMM YYYY, [klo] HH.mm'
-+        },
-+        calendar : {
-+            sameDay : '[tänään] [klo] LT',
-+            nextDay : '[huomenna] [klo] LT',
-+            nextWeek : 'dddd [klo] LT',
-+            lastDay : '[eilen] [klo] LT',
-+            lastWeek : '[viime] dddd[na] [klo] LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : '%s päästä',
-+            past : '%s sitten',
-+            s : translate,
-+            ss : translate,
-+            m : translate,
-+            mm : translate,
-+            h : translate,
-+            hh : translate,
-+            d : translate,
-+            dd : translate,
-+            M : translate,
-+            MM : translate,
-+            y : translate,
-+            yy : translate
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}\./,
-+        ordinal : '%d.',
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return fi;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/fo.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/fo.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var fo = moment.defineLocale('fo', {
-+        months : 'januar_februar_mars_apríl_mai_juni_juli_august_september_oktober_november_desember'.split('_'),
-+        monthsShort : 'jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_'),
-+        weekdays : 'sunnudagur_mánadagur_týsdagur_mikudagur_hósdagur_fríggjadagur_leygardagur'.split('_'),
-+        weekdaysShort : 'sun_mán_týs_mik_hós_frí_ley'.split('_'),
-+        weekdaysMin : 'su_má_tý_mi_hó_fr_le'.split('_'),
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY HH:mm',
-+            LLLL : 'dddd D. MMMM, YYYY HH:mm'
-+        },
-+        calendar : {
-+            sameDay : '[Í dag kl.] LT',
-+            nextDay : '[Í morgin kl.] LT',
-+            nextWeek : 'dddd [kl.] LT',
-+            lastDay : '[Í gjár kl.] LT',
-+            lastWeek : '[síðstu] dddd [kl] LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'um %s',
-+            past : '%s síðani',
-+            s : 'fá sekund',
-+            ss : '%d sekundir',
-+            m : 'ein minutt',
-+            mm : '%d minuttir',
-+            h : 'ein tími',
-+            hh : '%d tímar',
-+            d : 'ein dagur',
-+            dd : '%d dagar',
-+            M : 'ein mánaði',
-+            MM : '%d mánaðir',
-+            y : 'eitt ár',
-+            yy : '%d ár'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}\./,
-+        ordinal : '%d.',
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return fo;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/fr-ca.js":
-+/*!*********************************************!*\
-+  !*** ./node_modules/moment/locale/fr-ca.js ***!
-+  \*********************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var frCa = moment.defineLocale('fr-ca', {
-+        months : 'janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre'.split('_'),
-+        monthsShort : 'janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.'.split('_'),
-+        monthsParseExact : true,
-+        weekdays : 'dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi'.split('_'),
-+        weekdaysShort : 'dim._lun._mar._mer._jeu._ven._sam.'.split('_'),
-+        weekdaysMin : 'di_lu_ma_me_je_ve_sa'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'YYYY-MM-DD',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY HH:mm',
-+            LLLL : 'dddd D MMMM YYYY HH:mm'
-+        },
-+        calendar : {
-+            sameDay : '[Aujourd’hui à] LT',
-+            nextDay : '[Demain à] LT',
-+            nextWeek : 'dddd [à] LT',
-+            lastDay : '[Hier à] LT',
-+            lastWeek : 'dddd [dernier à] LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'dans %s',
-+            past : 'il y a %s',
-+            s : 'quelques secondes',
-+            ss : '%d secondes',
-+            m : 'une minute',
-+            mm : '%d minutes',
-+            h : 'une heure',
-+            hh : '%d heures',
-+            d : 'un jour',
-+            dd : '%d jours',
-+            M : 'un mois',
-+            MM : '%d mois',
-+            y : 'un an',
-+            yy : '%d ans'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}(er|e)/,
-+        ordinal : function (number, period) {
-+            switch (period) {
-+                // Words with masculine grammatical gender: mois, trimestre, jour
-+                default:
-+                case 'M':
-+                case 'Q':
-+                case 'D':
-+                case 'DDD':
-+                case 'd':
-+                    return number + (number === 1 ? 'er' : 'e');
-+
-+                // Words with feminine grammatical gender: semaine
-+                case 'w':
-+                case 'W':
-+                    return number + (number === 1 ? 're' : 'e');
-+            }
-+        }
-+    });
-+
-+    return frCa;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/fr-ch.js":
-+/*!*********************************************!*\
-+  !*** ./node_modules/moment/locale/fr-ch.js ***!
-+  \*********************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var frCh = moment.defineLocale('fr-ch', {
-+        months : 'janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre'.split('_'),
-+        monthsShort : 'janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.'.split('_'),
-+        monthsParseExact : true,
-+        weekdays : 'dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi'.split('_'),
-+        weekdaysShort : 'dim._lun._mar._mer._jeu._ven._sam.'.split('_'),
-+        weekdaysMin : 'di_lu_ma_me_je_ve_sa'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD.MM.YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY HH:mm',
-+            LLLL : 'dddd D MMMM YYYY HH:mm'
-+        },
-+        calendar : {
-+            sameDay : '[Aujourd’hui à] LT',
-+            nextDay : '[Demain à] LT',
-+            nextWeek : 'dddd [à] LT',
-+            lastDay : '[Hier à] LT',
-+            lastWeek : 'dddd [dernier à] LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'dans %s',
-+            past : 'il y a %s',
-+            s : 'quelques secondes',
-+            ss : '%d secondes',
-+            m : 'une minute',
-+            mm : '%d minutes',
-+            h : 'une heure',
-+            hh : '%d heures',
-+            d : 'un jour',
-+            dd : '%d jours',
-+            M : 'un mois',
-+            MM : '%d mois',
-+            y : 'un an',
-+            yy : '%d ans'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}(er|e)/,
-+        ordinal : function (number, period) {
-+            switch (period) {
-+                // Words with masculine grammatical gender: mois, trimestre, jour
-+                default:
-+                case 'M':
-+                case 'Q':
-+                case 'D':
-+                case 'DDD':
-+                case 'd':
-+                    return number + (number === 1 ? 'er' : 'e');
-+
-+                // Words with feminine grammatical gender: semaine
-+                case 'w':
-+                case 'W':
-+                    return number + (number === 1 ? 're' : 'e');
-+            }
-+        },
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return frCh;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/fr.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/fr.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var fr = moment.defineLocale('fr', {
-+        months : 'janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre'.split('_'),
-+        monthsShort : 'janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.'.split('_'),
-+        monthsParseExact : true,
-+        weekdays : 'dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi'.split('_'),
-+        weekdaysShort : 'dim._lun._mar._mer._jeu._ven._sam.'.split('_'),
-+        weekdaysMin : 'di_lu_ma_me_je_ve_sa'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY HH:mm',
-+            LLLL : 'dddd D MMMM YYYY HH:mm'
-+        },
-+        calendar : {
-+            sameDay : '[Aujourd’hui à] LT',
-+            nextDay : '[Demain à] LT',
-+            nextWeek : 'dddd [à] LT',
-+            lastDay : '[Hier à] LT',
-+            lastWeek : 'dddd [dernier à] LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'dans %s',
-+            past : 'il y a %s',
-+            s : 'quelques secondes',
-+            ss : '%d secondes',
-+            m : 'une minute',
-+            mm : '%d minutes',
-+            h : 'une heure',
-+            hh : '%d heures',
-+            d : 'un jour',
-+            dd : '%d jours',
-+            M : 'un mois',
-+            MM : '%d mois',
-+            y : 'un an',
-+            yy : '%d ans'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}(er|)/,
-+        ordinal : function (number, period) {
-+            switch (period) {
-+                // TODO: Return 'e' when day of month > 1. Move this case inside
-+                // block for masculine words below.
-+                // See https://github.com/moment/moment/issues/3375
-+                case 'D':
-+                    return number + (number === 1 ? 'er' : '');
-+
-+                // Words with masculine grammatical gender: mois, trimestre, jour
-+                default:
-+                case 'M':
-+                case 'Q':
-+                case 'DDD':
-+                case 'd':
-+                    return number + (number === 1 ? 'er' : 'e');
-+
-+                // Words with feminine grammatical gender: semaine
-+                case 'w':
-+                case 'W':
-+                    return number + (number === 1 ? 're' : 'e');
-+            }
-+        },
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return fr;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/fy.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/fy.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var monthsShortWithDots = 'jan._feb._mrt._apr._mai_jun._jul._aug._sep._okt._nov._des.'.split('_'),
-+        monthsShortWithoutDots = 'jan_feb_mrt_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_');
-+
-+    var fy = moment.defineLocale('fy', {
-+        months : 'jannewaris_febrewaris_maart_april_maaie_juny_july_augustus_septimber_oktober_novimber_desimber'.split('_'),
-+        monthsShort : function (m, format) {
-+            if (!m) {
-+                return monthsShortWithDots;
-+            } else if (/-MMM-/.test(format)) {
-+                return monthsShortWithoutDots[m.month()];
-+            } else {
-+                return monthsShortWithDots[m.month()];
-+            }
-+        },
-+        monthsParseExact : true,
-+        weekdays : 'snein_moandei_tiisdei_woansdei_tongersdei_freed_sneon'.split('_'),
-+        weekdaysShort : 'si._mo._ti._wo._to._fr._so.'.split('_'),
-+        weekdaysMin : 'Si_Mo_Ti_Wo_To_Fr_So'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD-MM-YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY HH:mm',
-+            LLLL : 'dddd D MMMM YYYY HH:mm'
-+        },
-+        calendar : {
-+            sameDay: '[hjoed om] LT',
-+            nextDay: '[moarn om] LT',
-+            nextWeek: 'dddd [om] LT',
-+            lastDay: '[juster om] LT',
-+            lastWeek: '[ôfrûne] dddd [om] LT',
-+            sameElse: 'L'
-+        },
-+        relativeTime : {
-+            future : 'oer %s',
-+            past : '%s lyn',
-+            s : 'in pear sekonden',
-+            ss : '%d sekonden',
-+            m : 'ien minút',
-+            mm : '%d minuten',
-+            h : 'ien oere',
-+            hh : '%d oeren',
-+            d : 'ien dei',
-+            dd : '%d dagen',
-+            M : 'ien moanne',
-+            MM : '%d moannen',
-+            y : 'ien jier',
-+            yy : '%d jierren'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}(ste|de)/,
-+        ordinal : function (number) {
-+            return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de');
-+        },
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return fy;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/gd.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/gd.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var months = [
-+        'Am Faoilleach', 'An Gearran', 'Am Màrt', 'An Giblean', 'An Cèitean', 'An t-Ògmhios', 'An t-Iuchar', 'An Lùnastal', 'An t-Sultain', 'An Dàmhair', 'An t-Samhain', 'An Dùbhlachd'
-+    ];
-+
-+    var monthsShort = ['Faoi', 'Gear', 'Màrt', 'Gibl', 'Cèit', 'Ògmh', 'Iuch', 'Lùn', 'Sult', 'Dàmh', 'Samh', 'Dùbh'];
-+
-+    var weekdays = ['Didòmhnaich', 'Diluain', 'Dimàirt', 'Diciadain', 'Diardaoin', 'Dihaoine', 'Disathairne'];
-+
-+    var weekdaysShort = ['Did', 'Dil', 'Dim', 'Dic', 'Dia', 'Dih', 'Dis'];
-+
-+    var weekdaysMin = ['Dò', 'Lu', 'Mà', 'Ci', 'Ar', 'Ha', 'Sa'];
-+
-+    var gd = moment.defineLocale('gd', {
-+        months : months,
-+        monthsShort : monthsShort,
-+        monthsParseExact : true,
-+        weekdays : weekdays,
-+        weekdaysShort : weekdaysShort,
-+        weekdaysMin : weekdaysMin,
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY HH:mm',
-+            LLLL : 'dddd, D MMMM YYYY HH:mm'
-+        },
-+        calendar : {
-+            sameDay : '[An-diugh aig] LT',
-+            nextDay : '[A-màireach aig] LT',
-+            nextWeek : 'dddd [aig] LT',
-+            lastDay : '[An-dè aig] LT',
-+            lastWeek : 'dddd [seo chaidh] [aig] LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'ann an %s',
-+            past : 'bho chionn %s',
-+            s : 'beagan diogan',
-+            ss : '%d diogan',
-+            m : 'mionaid',
-+            mm : '%d mionaidean',
-+            h : 'uair',
-+            hh : '%d uairean',
-+            d : 'latha',
-+            dd : '%d latha',
-+            M : 'mìos',
-+            MM : '%d mìosan',
-+            y : 'bliadhna',
-+            yy : '%d bliadhna'
-+        },
-+        dayOfMonthOrdinalParse : /\d{1,2}(d|na|mh)/,
-+        ordinal : function (number) {
-+            var output = number === 1 ? 'd' : number % 10 === 2 ? 'na' : 'mh';
-+            return number + output;
-+        },
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return gd;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/gl.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/gl.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var gl = moment.defineLocale('gl', {
-+        months : 'xaneiro_febreiro_marzo_abril_maio_xuño_xullo_agosto_setembro_outubro_novembro_decembro'.split('_'),
-+        monthsShort : 'xan._feb._mar._abr._mai._xuñ._xul._ago._set._out._nov._dec.'.split('_'),
-+        monthsParseExact: true,
-+        weekdays : 'domingo_luns_martes_mércores_xoves_venres_sábado'.split('_'),
-+        weekdaysShort : 'dom._lun._mar._mér._xov._ven._sáb.'.split('_'),
-+        weekdaysMin : 'do_lu_ma_mé_xo_ve_sá'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat : {
-+            LT : 'H:mm',
-+            LTS : 'H:mm:ss',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D [de] MMMM [de] YYYY',
-+            LLL : 'D [de] MMMM [de] YYYY H:mm',
-+            LLLL : 'dddd, D [de] MMMM [de] YYYY H:mm'
-+        },
-+        calendar : {
-+            sameDay : function () {
-+                return '[hoxe ' + ((this.hours() !== 1) ? 'ás' : 'á') + '] LT';
-+            },
-+            nextDay : function () {
-+                return '[mañá ' + ((this.hours() !== 1) ? 'ás' : 'á') + '] LT';
-+            },
-+            nextWeek : function () {
-+                return 'dddd [' + ((this.hours() !== 1) ? 'ás' : 'a') + '] LT';
-+            },
-+            lastDay : function () {
-+                return '[onte ' + ((this.hours() !== 1) ? 'á' : 'a') + '] LT';
-+            },
-+            lastWeek : function () {
-+                return '[o] dddd [pasado ' + ((this.hours() !== 1) ? 'ás' : 'a') + '] LT';
-+            },
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : function (str) {
-+                if (str.indexOf('un') === 0) {
-+                    return 'n' + str;
-+                }
-+                return 'en ' + str;
-+            },
-+            past : 'hai %s',
-+            s : 'uns segundos',
-+            ss : '%d segundos',
-+            m : 'un minuto',
-+            mm : '%d minutos',
-+            h : 'unha hora',
-+            hh : '%d horas',
-+            d : 'un día',
-+            dd : '%d días',
-+            M : 'un mes',
-+            MM : '%d meses',
-+            y : 'un ano',
-+            yy : '%d anos'
-+        },
-+        dayOfMonthOrdinalParse : /\d{1,2}º/,
-+        ordinal : '%dº',
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return gl;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/gom-latn.js":
-+/*!************************************************!*\
-+  !*** ./node_modules/moment/locale/gom-latn.js ***!
-+  \************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    function processRelativeTime(number, withoutSuffix, key, isFuture) {
-+        var format = {
-+            's': ['thodde secondanim', 'thodde second'],
-+            'ss': [number + ' secondanim', number + ' second'],
-+            'm': ['eka mintan', 'ek minute'],
-+            'mm': [number + ' mintanim', number + ' mintam'],
-+            'h': ['eka horan', 'ek hor'],
-+            'hh': [number + ' horanim', number + ' horam'],
-+            'd': ['eka disan', 'ek dis'],
-+            'dd': [number + ' disanim', number + ' dis'],
-+            'M': ['eka mhoinean', 'ek mhoino'],
-+            'MM': [number + ' mhoineanim', number + ' mhoine'],
-+            'y': ['eka vorsan', 'ek voros'],
-+            'yy': [number + ' vorsanim', number + ' vorsam']
-+        };
-+        return withoutSuffix ? format[key][0] : format[key][1];
-+    }
-+
-+    var gomLatn = moment.defineLocale('gom-latn', {
-+        months : 'Janer_Febrer_Mars_Abril_Mai_Jun_Julai_Agost_Setembr_Otubr_Novembr_Dezembr'.split('_'),
-+        monthsShort : 'Jan._Feb._Mars_Abr._Mai_Jun_Jul._Ago._Set._Otu._Nov._Dez.'.split('_'),
-+        monthsParseExact : true,
-+        weekdays : 'Aitar_Somar_Mongllar_Budvar_Brestar_Sukrar_Son\'var'.split('_'),
-+        weekdaysShort : 'Ait._Som._Mon._Bud._Bre._Suk._Son.'.split('_'),
-+        weekdaysMin : 'Ai_Sm_Mo_Bu_Br_Su_Sn'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat : {
-+            LT : 'A h:mm [vazta]',
-+            LTS : 'A h:mm:ss [vazta]',
-+            L : 'DD-MM-YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY A h:mm [vazta]',
-+            LLLL : 'dddd, MMMM[achea] Do, YYYY, A h:mm [vazta]',
-+            llll: 'ddd, D MMM YYYY, A h:mm [vazta]'
-+        },
-+        calendar : {
-+            sameDay: '[Aiz] LT',
-+            nextDay: '[Faleam] LT',
-+            nextWeek: '[Ieta to] dddd[,] LT',
-+            lastDay: '[Kal] LT',
-+            lastWeek: '[Fatlo] dddd[,] LT',
-+            sameElse: 'L'
-+        },
-+        relativeTime : {
-+            future : '%s',
-+            past : '%s adim',
-+            s : processRelativeTime,
-+            ss : processRelativeTime,
-+            m : processRelativeTime,
-+            mm : processRelativeTime,
-+            h : processRelativeTime,
-+            hh : processRelativeTime,
-+            d : processRelativeTime,
-+            dd : processRelativeTime,
-+            M : processRelativeTime,
-+            MM : processRelativeTime,
-+            y : processRelativeTime,
-+            yy : processRelativeTime
-+        },
-+        dayOfMonthOrdinalParse : /\d{1,2}(er)/,
-+        ordinal : function (number, period) {
-+            switch (period) {
-+                // the ordinal 'er' only applies to day of the month
-+                case 'D':
-+                    return number + 'er';
-+                default:
-+                case 'M':
-+                case 'Q':
-+                case 'DDD':
-+                case 'd':
-+                case 'w':
-+                case 'W':
-+                    return number;
-+            }
-+        },
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        },
-+        meridiemParse: /rati|sokalli|donparam|sanje/,
-+        meridiemHour : function (hour, meridiem) {
-+            if (hour === 12) {
-+                hour = 0;
-+            }
-+            if (meridiem === 'rati') {
-+                return hour < 4 ? hour : hour + 12;
-+            } else if (meridiem === 'sokalli') {
-+                return hour;
-+            } else if (meridiem === 'donparam') {
-+                return hour > 12 ? hour : hour + 12;
-+            } else if (meridiem === 'sanje') {
-+                return hour + 12;
-+            }
-+        },
-+        meridiem : function (hour, minute, isLower) {
-+            if (hour < 4) {
-+                return 'rati';
-+            } else if (hour < 12) {
-+                return 'sokalli';
-+            } else if (hour < 16) {
-+                return 'donparam';
-+            } else if (hour < 20) {
-+                return 'sanje';
-+            } else {
-+                return 'rati';
-+            }
-+        }
-+    });
-+
-+    return gomLatn;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/gu.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/gu.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var symbolMap = {
-+            '1': '૧',
-+            '2': '૨',
-+            '3': '૩',
-+            '4': '૪',
-+            '5': '૫',
-+            '6': '૬',
-+            '7': '૭',
-+            '8': '૮',
-+            '9': '૯',
-+            '0': '૦'
-+        },
-+        numberMap = {
-+            '૧': '1',
-+            '૨': '2',
-+            '૩': '3',
-+            '૪': '4',
-+            '૫': '5',
-+            '૬': '6',
-+            '૭': '7',
-+            '૮': '8',
-+            '૯': '9',
-+            '૦': '0'
-+        };
-+
-+    var gu = moment.defineLocale('gu', {
-+        months: 'જાન્યુઆરી_ફેબ્રુઆરી_માર્ચ_એપ્રિલ_મે_જૂન_જુલાઈ_ઑગસ્ટ_સપ્ટેમ્બર_ઑક્ટ્બર_નવેમ્બર_ડિસેમ્બર'.split('_'),
-+        monthsShort: 'જાન્યુ._ફેબ્રુ._માર્ચ_એપ્રિ._મે_જૂન_જુલા._ઑગ._સપ્ટે._ઑક્ટ્._નવે._ડિસે.'.split('_'),
-+        monthsParseExact: true,
-+        weekdays: 'રવિવાર_સોમવાર_મંગળવાર_બુધ્વાર_ગુરુવાર_શુક્રવાર_શનિવાર'.split('_'),
-+        weekdaysShort: 'રવિ_સોમ_મંગળ_બુધ્_ગુરુ_શુક્ર_શનિ'.split('_'),
-+        weekdaysMin: 'ર_સો_મં_બુ_ગુ_શુ_શ'.split('_'),
-+        longDateFormat: {
-+            LT: 'A h:mm વાગ્યે',
-+            LTS: 'A h:mm:ss વાગ્યે',
-+            L: 'DD/MM/YYYY',
-+            LL: 'D MMMM YYYY',
-+            LLL: 'D MMMM YYYY, A h:mm વાગ્યે',
-+            LLLL: 'dddd, D MMMM YYYY, A h:mm વાગ્યે'
-+        },
-+        calendar: {
-+            sameDay: '[આજ] LT',
-+            nextDay: '[કાલે] LT',
-+            nextWeek: 'dddd, LT',
-+            lastDay: '[ગઇકાલે] LT',
-+            lastWeek: '[પાછલા] dddd, LT',
-+            sameElse: 'L'
-+        },
-+        relativeTime: {
-+            future: '%s મા',
-+            past: '%s પેહલા',
-+            s: 'અમુક પળો',
-+            ss: '%d સેકંડ',
-+            m: 'એક મિનિટ',
-+            mm: '%d મિનિટ',
-+            h: 'એક કલાક',
-+            hh: '%d કલાક',
-+            d: 'એક દિવસ',
-+            dd: '%d દિવસ',
-+            M: 'એક મહિનો',
-+            MM: '%d મહિનો',
-+            y: 'એક વર્ષ',
-+            yy: '%d વર્ષ'
-+        },
-+        preparse: function (string) {
-+            return string.replace(/[૧૨૩૪૫૬૭૮૯૦]/g, function (match) {
-+                return numberMap[match];
-+            });
-+        },
-+        postformat: function (string) {
-+            return string.replace(/\d/g, function (match) {
-+                return symbolMap[match];
-+            });
-+        },
-+        // Gujarati notation for meridiems are quite fuzzy in practice. While there exists
-+        // a rigid notion of a 'Pahar' it is not used as rigidly in modern Gujarati.
-+        meridiemParse: /રાત|બપોર|સવાર|સાંજ/,
-+        meridiemHour: function (hour, meridiem) {
-+            if (hour === 12) {
-+                hour = 0;
-+            }
-+            if (meridiem === 'રાત') {
-+                return hour < 4 ? hour : hour + 12;
-+            } else if (meridiem === 'સવાર') {
-+                return hour;
-+            } else if (meridiem === 'બપોર') {
-+                return hour >= 10 ? hour : hour + 12;
-+            } else if (meridiem === 'સાંજ') {
-+                return hour + 12;
-+            }
-+        },
-+        meridiem: function (hour, minute, isLower) {
-+            if (hour < 4) {
-+                return 'રાત';
-+            } else if (hour < 10) {
-+                return 'સવાર';
-+            } else if (hour < 17) {
-+                return 'બપોર';
-+            } else if (hour < 20) {
-+                return 'સાંજ';
-+            } else {
-+                return 'રાત';
-+            }
-+        },
-+        week: {
-+            dow: 0, // Sunday is the first day of the week.
-+            doy: 6 // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return gu;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/he.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/he.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var he = moment.defineLocale('he', {
-+        months : 'ינואר_פברואר_מרץ_אפריל_מאי_יוני_יולי_אוגוסט_ספטמבר_אוקטובר_נובמבר_דצמבר'.split('_'),
-+        monthsShort : 'ינו׳_פבר׳_מרץ_אפר׳_מאי_יוני_יולי_אוג׳_ספט׳_אוק׳_נוב׳_דצמ׳'.split('_'),
-+        weekdays : 'ראשון_שני_שלישי_רביעי_חמישי_שישי_שבת'.split('_'),
-+        weekdaysShort : 'א׳_ב׳_ג׳_ד׳_ה׳_ו׳_ש׳'.split('_'),
-+        weekdaysMin : 'א_ב_ג_ד_ה_ו_ש'.split('_'),
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D [ב]MMMM YYYY',
-+            LLL : 'D [ב]MMMM YYYY HH:mm',
-+            LLLL : 'dddd, D [ב]MMMM YYYY HH:mm',
-+            l : 'D/M/YYYY',
-+            ll : 'D MMM YYYY',
-+            lll : 'D MMM YYYY HH:mm',
-+            llll : 'ddd, D MMM YYYY HH:mm'
-+        },
-+        calendar : {
-+            sameDay : '[היום ב־]LT',
-+            nextDay : '[מחר ב־]LT',
-+            nextWeek : 'dddd [בשעה] LT',
-+            lastDay : '[אתמול ב־]LT',
-+            lastWeek : '[ביום] dddd [האחרון בשעה] LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'בעוד %s',
-+            past : 'לפני %s',
-+            s : 'מספר שניות',
-+            ss : '%d שניות',
-+            m : 'דקה',
-+            mm : '%d דקות',
-+            h : 'שעה',
-+            hh : function (number) {
-+                if (number === 2) {
-+                    return 'שעתיים';
-+                }
-+                return number + ' שעות';
-+            },
-+            d : 'יום',
-+            dd : function (number) {
-+                if (number === 2) {
-+                    return 'יומיים';
-+                }
-+                return number + ' ימים';
-+            },
-+            M : 'חודש',
-+            MM : function (number) {
-+                if (number === 2) {
-+                    return 'חודשיים';
-+                }
-+                return number + ' חודשים';
-+            },
-+            y : 'שנה',
-+            yy : function (number) {
-+                if (number === 2) {
-+                    return 'שנתיים';
-+                } else if (number % 10 === 0 && number !== 10) {
-+                    return number + ' שנה';
-+                }
-+                return number + ' שנים';
-+            }
-+        },
-+        meridiemParse: /אחה"צ|לפנה"צ|אחרי הצהריים|לפני הצהריים|לפנות בוקר|בבוקר|בערב/i,
-+        isPM : function (input) {
-+            return /^(אחה"צ|אחרי הצהריים|בערב)$/.test(input);
-+        },
-+        meridiem : function (hour, minute, isLower) {
-+            if (hour < 5) {
-+                return 'לפנות בוקר';
-+            } else if (hour < 10) {
-+                return 'בבוקר';
-+            } else if (hour < 12) {
-+                return isLower ? 'לפנה"צ' : 'לפני הצהריים';
-+            } else if (hour < 18) {
-+                return isLower ? 'אחה"צ' : 'אחרי הצהריים';
-+            } else {
-+                return 'בערב';
-+            }
-+        }
-+    });
-+
-+    return he;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/hi.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/hi.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var symbolMap = {
-+        '1': '१',
-+        '2': '२',
-+        '3': '३',
-+        '4': '४',
-+        '5': '५',
-+        '6': '६',
-+        '7': '७',
-+        '8': '८',
-+        '9': '९',
-+        '0': '०'
-+    },
-+    numberMap = {
-+        '१': '1',
-+        '२': '2',
-+        '३': '3',
-+        '४': '4',
-+        '५': '5',
-+        '६': '6',
-+        '७': '7',
-+        '८': '8',
-+        '९': '9',
-+        '०': '0'
-+    };
-+
-+    var hi = moment.defineLocale('hi', {
-+        months : 'जनवरी_फ़रवरी_मार्च_अप्रैल_मई_जून_जुलाई_अगस्त_सितम्बर_अक्टूबर_नवम्बर_दिसम्बर'.split('_'),
-+        monthsShort : 'जन._फ़र._मार्च_अप्रै._मई_जून_जुल._अग._सित._अक्टू._नव._दिस.'.split('_'),
-+        monthsParseExact: true,
-+        weekdays : 'रविवार_सोमवार_मंगलवार_बुधवार_गुरूवार_शुक्रवार_शनिवार'.split('_'),
-+        weekdaysShort : 'रवि_सोम_मंगल_बुध_गुरू_शुक्र_शनि'.split('_'),
-+        weekdaysMin : 'र_सो_मं_बु_गु_शु_श'.split('_'),
-+        longDateFormat : {
-+            LT : 'A h:mm बजे',
-+            LTS : 'A h:mm:ss बजे',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY, A h:mm बजे',
-+            LLLL : 'dddd, D MMMM YYYY, A h:mm बजे'
-+        },
-+        calendar : {
-+            sameDay : '[आज] LT',
-+            nextDay : '[कल] LT',
-+            nextWeek : 'dddd, LT',
-+            lastDay : '[कल] LT',
-+            lastWeek : '[पिछले] dddd, LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : '%s में',
-+            past : '%s पहले',
-+            s : 'कुछ ही क्षण',
-+            ss : '%d सेकंड',
-+            m : 'एक मिनट',
-+            mm : '%d मिनट',
-+            h : 'एक घंटा',
-+            hh : '%d घंटे',
-+            d : 'एक दिन',
-+            dd : '%d दिन',
-+            M : 'एक महीने',
-+            MM : '%d महीने',
-+            y : 'एक वर्ष',
-+            yy : '%d वर्ष'
-+        },
-+        preparse: function (string) {
-+            return string.replace(/[१२३४५६७८९०]/g, function (match) {
-+                return numberMap[match];
-+            });
-+        },
-+        postformat: function (string) {
-+            return string.replace(/\d/g, function (match) {
-+                return symbolMap[match];
-+            });
-+        },
-+        // Hindi notation for meridiems are quite fuzzy in practice. While there exists
-+        // a rigid notion of a 'Pahar' it is not used as rigidly in modern Hindi.
-+        meridiemParse: /रात|सुबह|दोपहर|शाम/,
-+        meridiemHour : function (hour, meridiem) {
-+            if (hour === 12) {
-+                hour = 0;
-+            }
-+            if (meridiem === 'रात') {
-+                return hour < 4 ? hour : hour + 12;
-+            } else if (meridiem === 'सुबह') {
-+                return hour;
-+            } else if (meridiem === 'दोपहर') {
-+                return hour >= 10 ? hour : hour + 12;
-+            } else if (meridiem === 'शाम') {
-+                return hour + 12;
-+            }
-+        },
-+        meridiem : function (hour, minute, isLower) {
-+            if (hour < 4) {
-+                return 'रात';
-+            } else if (hour < 10) {
-+                return 'सुबह';
-+            } else if (hour < 17) {
-+                return 'दोपहर';
-+            } else if (hour < 20) {
-+                return 'शाम';
-+            } else {
-+                return 'रात';
-+            }
-+        },
-+        week : {
-+            dow : 0, // Sunday is the first day of the week.
-+            doy : 6  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return hi;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/hr.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/hr.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    function translate(number, withoutSuffix, key) {
-+        var result = number + ' ';
-+        switch (key) {
-+            case 'ss':
-+                if (number === 1) {
-+                    result += 'sekunda';
-+                } else if (number === 2 || number === 3 || number === 4) {
-+                    result += 'sekunde';
-+                } else {
-+                    result += 'sekundi';
-+                }
-+                return result;
-+            case 'm':
-+                return withoutSuffix ? 'jedna minuta' : 'jedne minute';
-+            case 'mm':
-+                if (number === 1) {
-+                    result += 'minuta';
-+                } else if (number === 2 || number === 3 || number === 4) {
-+                    result += 'minute';
-+                } else {
-+                    result += 'minuta';
-+                }
-+                return result;
-+            case 'h':
-+                return withoutSuffix ? 'jedan sat' : 'jednog sata';
-+            case 'hh':
-+                if (number === 1) {
-+                    result += 'sat';
-+                } else if (number === 2 || number === 3 || number === 4) {
-+                    result += 'sata';
-+                } else {
-+                    result += 'sati';
-+                }
-+                return result;
-+            case 'dd':
-+                if (number === 1) {
-+                    result += 'dan';
-+                } else {
-+                    result += 'dana';
-+                }
-+                return result;
-+            case 'MM':
-+                if (number === 1) {
-+                    result += 'mjesec';
-+                } else if (number === 2 || number === 3 || number === 4) {
-+                    result += 'mjeseca';
-+                } else {
-+                    result += 'mjeseci';
-+                }
-+                return result;
-+            case 'yy':
-+                if (number === 1) {
-+                    result += 'godina';
-+                } else if (number === 2 || number === 3 || number === 4) {
-+                    result += 'godine';
-+                } else {
-+                    result += 'godina';
-+                }
-+                return result;
-+        }
-+    }
-+
-+    var hr = moment.defineLocale('hr', {
-+        months : {
-+            format: 'siječnja_veljače_ožujka_travnja_svibnja_lipnja_srpnja_kolovoza_rujna_listopada_studenoga_prosinca'.split('_'),
-+            standalone: 'siječanj_veljača_ožujak_travanj_svibanj_lipanj_srpanj_kolovoz_rujan_listopad_studeni_prosinac'.split('_')
-+        },
-+        monthsShort : 'sij._velj._ožu._tra._svi._lip._srp._kol._ruj._lis._stu._pro.'.split('_'),
-+        monthsParseExact: true,
-+        weekdays : 'nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota'.split('_'),
-+        weekdaysShort : 'ned._pon._uto._sri._čet._pet._sub.'.split('_'),
-+        weekdaysMin : 'ne_po_ut_sr_če_pe_su'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat : {
-+            LT : 'H:mm',
-+            LTS : 'H:mm:ss',
-+            L : 'DD.MM.YYYY',
-+            LL : 'D. MMMM YYYY',
-+            LLL : 'D. MMMM YYYY H:mm',
-+            LLLL : 'dddd, D. MMMM YYYY H:mm'
-+        },
-+        calendar : {
-+            sameDay  : '[danas u] LT',
-+            nextDay  : '[sutra u] LT',
-+            nextWeek : function () {
-+                switch (this.day()) {
-+                    case 0:
-+                        return '[u] [nedjelju] [u] LT';
-+                    case 3:
-+                        return '[u] [srijedu] [u] LT';
-+                    case 6:
-+                        return '[u] [subotu] [u] LT';
-+                    case 1:
-+                    case 2:
-+                    case 4:
-+                    case 5:
-+                        return '[u] dddd [u] LT';
-+                }
-+            },
-+            lastDay  : '[jučer u] LT',
-+            lastWeek : function () {
-+                switch (this.day()) {
-+                    case 0:
-+                    case 3:
-+                        return '[prošlu] dddd [u] LT';
-+                    case 6:
-+                        return '[prošle] [subote] [u] LT';
-+                    case 1:
-+                    case 2:
-+                    case 4:
-+                    case 5:
-+                        return '[prošli] dddd [u] LT';
-+                }
-+            },
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'za %s',
-+            past   : 'prije %s',
-+            s      : 'par sekundi',
-+            ss     : translate,
-+            m      : translate,
-+            mm     : translate,
-+            h      : translate,
-+            hh     : translate,
-+            d      : 'dan',
-+            dd     : translate,
-+            M      : 'mjesec',
-+            MM     : translate,
-+            y      : 'godinu',
-+            yy     : translate
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}\./,
-+        ordinal : '%d.',
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 7  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return hr;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/hu.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/hu.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var weekEndings = 'vasárnap hétfőn kedden szerdán csütörtökön pénteken szombaton'.split(' ');
-+    function translate(number, withoutSuffix, key, isFuture) {
-+        var num = number;
-+        switch (key) {
-+            case 's':
-+                return (isFuture || withoutSuffix) ? 'néhány másodperc' : 'néhány másodperce';
-+            case 'ss':
-+                return num + (isFuture || withoutSuffix) ? ' másodperc' : ' másodperce';
-+            case 'm':
-+                return 'egy' + (isFuture || withoutSuffix ? ' perc' : ' perce');
-+            case 'mm':
-+                return num + (isFuture || withoutSuffix ? ' perc' : ' perce');
-+            case 'h':
-+                return 'egy' + (isFuture || withoutSuffix ? ' óra' : ' órája');
-+            case 'hh':
-+                return num + (isFuture || withoutSuffix ? ' óra' : ' órája');
-+            case 'd':
-+                return 'egy' + (isFuture || withoutSuffix ? ' nap' : ' napja');
-+            case 'dd':
-+                return num + (isFuture || withoutSuffix ? ' nap' : ' napja');
-+            case 'M':
-+                return 'egy' + (isFuture || withoutSuffix ? ' hónap' : ' hónapja');
-+            case 'MM':
-+                return num + (isFuture || withoutSuffix ? ' hónap' : ' hónapja');
-+            case 'y':
-+                return 'egy' + (isFuture || withoutSuffix ? ' év' : ' éve');
-+            case 'yy':
-+                return num + (isFuture || withoutSuffix ? ' év' : ' éve');
-+        }
-+        return '';
-+    }
-+    function week(isFuture) {
-+        return (isFuture ? '' : '[múlt] ') + '[' + weekEndings[this.day()] + '] LT[-kor]';
-+    }
-+
-+    var hu = moment.defineLocale('hu', {
-+        months : 'január_február_március_április_május_június_július_augusztus_szeptember_október_november_december'.split('_'),
-+        monthsShort : 'jan_feb_márc_ápr_máj_jún_júl_aug_szept_okt_nov_dec'.split('_'),
-+        weekdays : 'vasárnap_hétfő_kedd_szerda_csütörtök_péntek_szombat'.split('_'),
-+        weekdaysShort : 'vas_hét_kedd_sze_csüt_pén_szo'.split('_'),
-+        weekdaysMin : 'v_h_k_sze_cs_p_szo'.split('_'),
-+        longDateFormat : {
-+            LT : 'H:mm',
-+            LTS : 'H:mm:ss',
-+            L : 'YYYY.MM.DD.',
-+            LL : 'YYYY. MMMM D.',
-+            LLL : 'YYYY. MMMM D. H:mm',
-+            LLLL : 'YYYY. MMMM D., dddd H:mm'
-+        },
-+        meridiemParse: /de|du/i,
-+        isPM: function (input) {
-+            return input.charAt(1).toLowerCase() === 'u';
-+        },
-+        meridiem : function (hours, minutes, isLower) {
-+            if (hours < 12) {
-+                return isLower === true ? 'de' : 'DE';
-+            } else {
-+                return isLower === true ? 'du' : 'DU';
-+            }
-+        },
-+        calendar : {
-+            sameDay : '[ma] LT[-kor]',
-+            nextDay : '[holnap] LT[-kor]',
-+            nextWeek : function () {
-+                return week.call(this, true);
-+            },
-+            lastDay : '[tegnap] LT[-kor]',
-+            lastWeek : function () {
-+                return week.call(this, false);
-+            },
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : '%s múlva',
-+            past : '%s',
-+            s : translate,
-+            ss : translate,
-+            m : translate,
-+            mm : translate,
-+            h : translate,
-+            hh : translate,
-+            d : translate,
-+            dd : translate,
-+            M : translate,
-+            MM : translate,
-+            y : translate,
-+            yy : translate
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}\./,
-+        ordinal : '%d.',
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return hu;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/hy-am.js":
-+/*!*********************************************!*\
-+  !*** ./node_modules/moment/locale/hy-am.js ***!
-+  \*********************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var hyAm = moment.defineLocale('hy-am', {
-+        months : {
-+            format: 'հունվարի_փետրվարի_մարտի_ապրիլի_մայիսի_հունիսի_հուլիսի_օգոստոսի_սեպտեմբերի_հոկտեմբերի_նոյեմբերի_դեկտեմբերի'.split('_'),
-+            standalone: 'հունվար_փետրվար_մարտ_ապրիլ_մայիս_հունիս_հուլիս_օգոստոս_սեպտեմբեր_հոկտեմբեր_նոյեմբեր_դեկտեմբեր'.split('_')
-+        },
-+        monthsShort : 'հնվ_փտր_մրտ_ապր_մյս_հնս_հլս_օգս_սպտ_հկտ_նմբ_դկտ'.split('_'),
-+        weekdays : 'կիրակի_երկուշաբթի_երեքշաբթի_չորեքշաբթի_հինգշաբթի_ուրբաթ_շաբաթ'.split('_'),
-+        weekdaysShort : 'կրկ_երկ_երք_չրք_հնգ_ուրբ_շբթ'.split('_'),
-+        weekdaysMin : 'կրկ_երկ_երք_չրք_հնգ_ուրբ_շբթ'.split('_'),
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD.MM.YYYY',
-+            LL : 'D MMMM YYYY թ.',
-+            LLL : 'D MMMM YYYY թ., HH:mm',
-+            LLLL : 'dddd, D MMMM YYYY թ., HH:mm'
-+        },
-+        calendar : {
-+            sameDay: '[այսօր] LT',
-+            nextDay: '[վաղը] LT',
-+            lastDay: '[երեկ] LT',
-+            nextWeek: function () {
-+                return 'dddd [օրը ժամը] LT';
-+            },
-+            lastWeek: function () {
-+                return '[անցած] dddd [օրը ժամը] LT';
-+            },
-+            sameElse: 'L'
-+        },
-+        relativeTime : {
-+            future : '%s հետո',
-+            past : '%s առաջ',
-+            s : 'մի քանի վայրկյան',
-+            ss : '%d վայրկյան',
-+            m : 'րոպե',
-+            mm : '%d րոպե',
-+            h : 'ժամ',
-+            hh : '%d ժամ',
-+            d : 'օր',
-+            dd : '%d օր',
-+            M : 'ամիս',
-+            MM : '%d ամիս',
-+            y : 'տարի',
-+            yy : '%d տարի'
-+        },
-+        meridiemParse: /գիշերվա|առավոտվա|ցերեկվա|երեկոյան/,
-+        isPM: function (input) {
-+            return /^(ցերեկվա|երեկոյան)$/.test(input);
-+        },
-+        meridiem : function (hour) {
-+            if (hour < 4) {
-+                return 'գիշերվա';
-+            } else if (hour < 12) {
-+                return 'առավոտվա';
-+            } else if (hour < 17) {
-+                return 'ցերեկվա';
-+            } else {
-+                return 'երեկոյան';
-+            }
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}|\d{1,2}-(ին|րդ)/,
-+        ordinal: function (number, period) {
-+            switch (period) {
-+                case 'DDD':
-+                case 'w':
-+                case 'W':
-+                case 'DDDo':
-+                    if (number === 1) {
-+                        return number + '-ին';
-+                    }
-+                    return number + '-րդ';
-+                default:
-+                    return number;
-+            }
-+        },
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 7  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return hyAm;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/id.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/id.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var id = moment.defineLocale('id', {
-+        months : 'Januari_Februari_Maret_April_Mei_Juni_Juli_Agustus_September_Oktober_November_Desember'.split('_'),
-+        monthsShort : 'Jan_Feb_Mar_Apr_Mei_Jun_Jul_Agt_Sep_Okt_Nov_Des'.split('_'),
-+        weekdays : 'Minggu_Senin_Selasa_Rabu_Kamis_Jumat_Sabtu'.split('_'),
-+        weekdaysShort : 'Min_Sen_Sel_Rab_Kam_Jum_Sab'.split('_'),
-+        weekdaysMin : 'Mg_Sn_Sl_Rb_Km_Jm_Sb'.split('_'),
-+        longDateFormat : {
-+            LT : 'HH.mm',
-+            LTS : 'HH.mm.ss',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY [pukul] HH.mm',
-+            LLLL : 'dddd, D MMMM YYYY [pukul] HH.mm'
-+        },
-+        meridiemParse: /pagi|siang|sore|malam/,
-+        meridiemHour : function (hour, meridiem) {
-+            if (hour === 12) {
-+                hour = 0;
-+            }
-+            if (meridiem === 'pagi') {
-+                return hour;
-+            } else if (meridiem === 'siang') {
-+                return hour >= 11 ? hour : hour + 12;
-+            } else if (meridiem === 'sore' || meridiem === 'malam') {
-+                return hour + 12;
-+            }
-+        },
-+        meridiem : function (hours, minutes, isLower) {
-+            if (hours < 11) {
-+                return 'pagi';
-+            } else if (hours < 15) {
-+                return 'siang';
-+            } else if (hours < 19) {
-+                return 'sore';
-+            } else {
-+                return 'malam';
-+            }
-+        },
-+        calendar : {
-+            sameDay : '[Hari ini pukul] LT',
-+            nextDay : '[Besok pukul] LT',
-+            nextWeek : 'dddd [pukul] LT',
-+            lastDay : '[Kemarin pukul] LT',
-+            lastWeek : 'dddd [lalu pukul] LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'dalam %s',
-+            past : '%s yang lalu',
-+            s : 'beberapa detik',
-+            ss : '%d detik',
-+            m : 'semenit',
-+            mm : '%d menit',
-+            h : 'sejam',
-+            hh : '%d jam',
-+            d : 'sehari',
-+            dd : '%d hari',
-+            M : 'sebulan',
-+            MM : '%d bulan',
-+            y : 'setahun',
-+            yy : '%d tahun'
-+        },
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 7  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return id;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/is.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/is.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    function plural(n) {
-+        if (n % 100 === 11) {
-+            return true;
-+        } else if (n % 10 === 1) {
-+            return false;
-+        }
-+        return true;
-+    }
-+    function translate(number, withoutSuffix, key, isFuture) {
-+        var result = number + ' ';
-+        switch (key) {
-+            case 's':
-+                return withoutSuffix || isFuture ? 'nokkrar sekúndur' : 'nokkrum sekúndum';
-+            case 'ss':
-+                if (plural(number)) {
-+                    return result + (withoutSuffix || isFuture ? 'sekúndur' : 'sekúndum');
-+                }
-+                return result + 'sekúnda';
-+            case 'm':
-+                return withoutSuffix ? 'mínúta' : 'mínútu';
-+            case 'mm':
-+                if (plural(number)) {
-+                    return result + (withoutSuffix || isFuture ? 'mínútur' : 'mínútum');
-+                } else if (withoutSuffix) {
-+                    return result + 'mínúta';
-+                }
-+                return result + 'mínútu';
-+            case 'hh':
-+                if (plural(number)) {
-+                    return result + (withoutSuffix || isFuture ? 'klukkustundir' : 'klukkustundum');
-+                }
-+                return result + 'klukkustund';
-+            case 'd':
-+                if (withoutSuffix) {
-+                    return 'dagur';
-+                }
-+                return isFuture ? 'dag' : 'degi';
-+            case 'dd':
-+                if (plural(number)) {
-+                    if (withoutSuffix) {
-+                        return result + 'dagar';
-+                    }
-+                    return result + (isFuture ? 'daga' : 'dögum');
-+                } else if (withoutSuffix) {
-+                    return result + 'dagur';
-+                }
-+                return result + (isFuture ? 'dag' : 'degi');
-+            case 'M':
-+                if (withoutSuffix) {
-+                    return 'mánuður';
-+                }
-+                return isFuture ? 'mánuð' : 'mánuði';
-+            case 'MM':
-+                if (plural(number)) {
-+                    if (withoutSuffix) {
-+                        return result + 'mánuðir';
-+                    }
-+                    return result + (isFuture ? 'mánuði' : 'mánuðum');
-+                } else if (withoutSuffix) {
-+                    return result + 'mánuður';
-+                }
-+                return result + (isFuture ? 'mánuð' : 'mánuði');
-+            case 'y':
-+                return withoutSuffix || isFuture ? 'ár' : 'ári';
-+            case 'yy':
-+                if (plural(number)) {
-+                    return result + (withoutSuffix || isFuture ? 'ár' : 'árum');
-+                }
-+                return result + (withoutSuffix || isFuture ? 'ár' : 'ári');
-+        }
-+    }
-+
-+    var is = moment.defineLocale('is', {
-+        months : 'janúar_febrúar_mars_apríl_maí_júní_júlí_ágúst_september_október_nóvember_desember'.split('_'),
-+        monthsShort : 'jan_feb_mar_apr_maí_jún_júl_ágú_sep_okt_nóv_des'.split('_'),
-+        weekdays : 'sunnudagur_mánudagur_þriðjudagur_miðvikudagur_fimmtudagur_föstudagur_laugardagur'.split('_'),
-+        weekdaysShort : 'sun_mán_þri_mið_fim_fös_lau'.split('_'),
-+        weekdaysMin : 'Su_Má_Þr_Mi_Fi_Fö_La'.split('_'),
-+        longDateFormat : {
-+            LT : 'H:mm',
-+            LTS : 'H:mm:ss',
-+            L : 'DD.MM.YYYY',
-+            LL : 'D. MMMM YYYY',
-+            LLL : 'D. MMMM YYYY [kl.] H:mm',
-+            LLLL : 'dddd, D. MMMM YYYY [kl.] H:mm'
-+        },
-+        calendar : {
-+            sameDay : '[í dag kl.] LT',
-+            nextDay : '[á morgun kl.] LT',
-+            nextWeek : 'dddd [kl.] LT',
-+            lastDay : '[í gær kl.] LT',
-+            lastWeek : '[síðasta] dddd [kl.] LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'eftir %s',
-+            past : 'fyrir %s síðan',
-+            s : translate,
-+            ss : translate,
-+            m : translate,
-+            mm : translate,
-+            h : 'klukkustund',
-+            hh : translate,
-+            d : translate,
-+            dd : translate,
-+            M : translate,
-+            MM : translate,
-+            y : translate,
-+            yy : translate
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}\./,
-+        ordinal : '%d.',
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return is;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/it.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/it.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var it = moment.defineLocale('it', {
-+        months : 'gennaio_febbraio_marzo_aprile_maggio_giugno_luglio_agosto_settembre_ottobre_novembre_dicembre'.split('_'),
-+        monthsShort : 'gen_feb_mar_apr_mag_giu_lug_ago_set_ott_nov_dic'.split('_'),
-+        weekdays : 'domenica_lunedì_martedì_mercoledì_giovedì_venerdì_sabato'.split('_'),
-+        weekdaysShort : 'dom_lun_mar_mer_gio_ven_sab'.split('_'),
-+        weekdaysMin : 'do_lu_ma_me_gi_ve_sa'.split('_'),
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY HH:mm',
-+            LLLL : 'dddd D MMMM YYYY HH:mm'
-+        },
-+        calendar : {
-+            sameDay: '[Oggi alle] LT',
-+            nextDay: '[Domani alle] LT',
-+            nextWeek: 'dddd [alle] LT',
-+            lastDay: '[Ieri alle] LT',
-+            lastWeek: function () {
-+                switch (this.day()) {
-+                    case 0:
-+                        return '[la scorsa] dddd [alle] LT';
-+                    default:
-+                        return '[lo scorso] dddd [alle] LT';
-+                }
-+            },
-+            sameElse: 'L'
-+        },
-+        relativeTime : {
-+            future : function (s) {
-+                return ((/^[0-9].+$/).test(s) ? 'tra' : 'in') + ' ' + s;
-+            },
-+            past : '%s fa',
-+            s : 'alcuni secondi',
-+            ss : '%d secondi',
-+            m : 'un minuto',
-+            mm : '%d minuti',
-+            h : 'un\'ora',
-+            hh : '%d ore',
-+            d : 'un giorno',
-+            dd : '%d giorni',
-+            M : 'un mese',
-+            MM : '%d mesi',
-+            y : 'un anno',
-+            yy : '%d anni'
-+        },
-+        dayOfMonthOrdinalParse : /\d{1,2}º/,
-+        ordinal: '%dº',
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return it;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/ja.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/ja.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var ja = moment.defineLocale('ja', {
-+        months : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
-+        monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
-+        weekdays : '日曜日_月曜日_火曜日_水曜日_木曜日_金曜日_土曜日'.split('_'),
-+        weekdaysShort : '日_月_火_水_木_金_土'.split('_'),
-+        weekdaysMin : '日_月_火_水_木_金_土'.split('_'),
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'YYYY/MM/DD',
-+            LL : 'YYYY年M月D日',
-+            LLL : 'YYYY年M月D日 HH:mm',
-+            LLLL : 'YYYY年M月D日 dddd HH:mm',
-+            l : 'YYYY/MM/DD',
-+            ll : 'YYYY年M月D日',
-+            lll : 'YYYY年M月D日 HH:mm',
-+            llll : 'YYYY年M月D日(ddd) HH:mm'
-+        },
-+        meridiemParse: /午前|午後/i,
-+        isPM : function (input) {
-+            return input === '午後';
-+        },
-+        meridiem : function (hour, minute, isLower) {
-+            if (hour < 12) {
-+                return '午前';
-+            } else {
-+                return '午後';
-+            }
-+        },
-+        calendar : {
-+            sameDay : '[今日] LT',
-+            nextDay : '[明日] LT',
-+            nextWeek : function (now) {
-+                if (now.week() < this.week()) {
-+                    return '[来週]dddd LT';
-+                } else {
-+                    return 'dddd LT';
-+                }
-+            },
-+            lastDay : '[昨日] LT',
-+            lastWeek : function (now) {
-+                if (this.week() < now.week()) {
-+                    return '[先週]dddd LT';
-+                } else {
-+                    return 'dddd LT';
-+                }
-+            },
-+            sameElse : 'L'
-+        },
-+        dayOfMonthOrdinalParse : /\d{1,2}日/,
-+        ordinal : function (number, period) {
-+            switch (period) {
-+                case 'd':
-+                case 'D':
-+                case 'DDD':
-+                    return number + '日';
-+                default:
-+                    return number;
-+            }
-+        },
-+        relativeTime : {
-+            future : '%s後',
-+            past : '%s前',
-+            s : '数秒',
-+            ss : '%d秒',
-+            m : '1分',
-+            mm : '%d分',
-+            h : '1時間',
-+            hh : '%d時間',
-+            d : '1日',
-+            dd : '%d日',
-+            M : '1ヶ月',
-+            MM : '%dヶ月',
-+            y : '1年',
-+            yy : '%d年'
-+        }
-+    });
-+
-+    return ja;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/jv.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/jv.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var jv = moment.defineLocale('jv', {
-+        months : 'Januari_Februari_Maret_April_Mei_Juni_Juli_Agustus_September_Oktober_Nopember_Desember'.split('_'),
-+        monthsShort : 'Jan_Feb_Mar_Apr_Mei_Jun_Jul_Ags_Sep_Okt_Nop_Des'.split('_'),
-+        weekdays : 'Minggu_Senen_Seloso_Rebu_Kemis_Jemuwah_Septu'.split('_'),
-+        weekdaysShort : 'Min_Sen_Sel_Reb_Kem_Jem_Sep'.split('_'),
-+        weekdaysMin : 'Mg_Sn_Sl_Rb_Km_Jm_Sp'.split('_'),
-+        longDateFormat : {
-+            LT : 'HH.mm',
-+            LTS : 'HH.mm.ss',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY [pukul] HH.mm',
-+            LLLL : 'dddd, D MMMM YYYY [pukul] HH.mm'
-+        },
-+        meridiemParse: /enjing|siyang|sonten|ndalu/,
-+        meridiemHour : function (hour, meridiem) {
-+            if (hour === 12) {
-+                hour = 0;
-+            }
-+            if (meridiem === 'enjing') {
-+                return hour;
-+            } else if (meridiem === 'siyang') {
-+                return hour >= 11 ? hour : hour + 12;
-+            } else if (meridiem === 'sonten' || meridiem === 'ndalu') {
-+                return hour + 12;
-+            }
-+        },
-+        meridiem : function (hours, minutes, isLower) {
-+            if (hours < 11) {
-+                return 'enjing';
-+            } else if (hours < 15) {
-+                return 'siyang';
-+            } else if (hours < 19) {
-+                return 'sonten';
-+            } else {
-+                return 'ndalu';
-+            }
-+        },
-+        calendar : {
-+            sameDay : '[Dinten puniko pukul] LT',
-+            nextDay : '[Mbenjang pukul] LT',
-+            nextWeek : 'dddd [pukul] LT',
-+            lastDay : '[Kala wingi pukul] LT',
-+            lastWeek : 'dddd [kepengker pukul] LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'wonten ing %s',
-+            past : '%s ingkang kepengker',
-+            s : 'sawetawis detik',
-+            ss : '%d detik',
-+            m : 'setunggal menit',
-+            mm : '%d menit',
-+            h : 'setunggal jam',
-+            hh : '%d jam',
-+            d : 'sedinten',
-+            dd : '%d dinten',
-+            M : 'sewulan',
-+            MM : '%d wulan',
-+            y : 'setaun',
-+            yy : '%d taun'
-+        },
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 7  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return jv;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/ka.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/ka.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var ka = moment.defineLocale('ka', {
-+        months : {
-+            standalone: 'იანვარი_თებერვალი_მარტი_აპრილი_მაისი_ივნისი_ივლისი_აგვისტო_სექტემბერი_ოქტომბერი_ნოემბერი_დეკემბერი'.split('_'),
-+            format: 'იანვარს_თებერვალს_მარტს_აპრილის_მაისს_ივნისს_ივლისს_აგვისტს_სექტემბერს_ოქტომბერს_ნოემბერს_დეკემბერს'.split('_')
-+        },
-+        monthsShort : 'იან_თებ_მარ_აპრ_მაი_ივნ_ივლ_აგვ_სექ_ოქტ_ნოე_დეკ'.split('_'),
-+        weekdays : {
-+            standalone: 'კვირა_ორშაბათი_სამშაბათი_ოთხშაბათი_ხუთშაბათი_პარასკევი_შაბათი'.split('_'),
-+            format: 'კვირას_ორშაბათს_სამშაბათს_ოთხშაბათს_ხუთშაბათს_პარასკევს_შაბათს'.split('_'),
-+            isFormat: /(წინა|შემდეგ)/
-+        },
-+        weekdaysShort : 'კვი_ორშ_სამ_ოთხ_ხუთ_პარ_შაბ'.split('_'),
-+        weekdaysMin : 'კვ_ორ_სა_ოთ_ხუ_პა_შა'.split('_'),
-+        longDateFormat : {
-+            LT : 'h:mm A',
-+            LTS : 'h:mm:ss A',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY h:mm A',
-+            LLLL : 'dddd, D MMMM YYYY h:mm A'
-+        },
-+        calendar : {
-+            sameDay : '[დღეს] LT[-ზე]',
-+            nextDay : '[ხვალ] LT[-ზე]',
-+            lastDay : '[გუშინ] LT[-ზე]',
-+            nextWeek : '[შემდეგ] dddd LT[-ზე]',
-+            lastWeek : '[წინა] dddd LT-ზე',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : function (s) {
-+                return (/(წამი|წუთი|საათი|წელი)/).test(s) ?
-+                    s.replace(/ი$/, 'ში') :
-+                    s + 'ში';
-+            },
-+            past : function (s) {
-+                if ((/(წამი|წუთი|საათი|დღე|თვე)/).test(s)) {
-+                    return s.replace(/(ი|ე)$/, 'ის წინ');
-+                }
-+                if ((/წელი/).test(s)) {
-+                    return s.replace(/წელი$/, 'წლის წინ');
-+                }
-+            },
-+            s : 'რამდენიმე წამი',
-+            ss : '%d წამი',
-+            m : 'წუთი',
-+            mm : '%d წუთი',
-+            h : 'საათი',
-+            hh : '%d საათი',
-+            d : 'დღე',
-+            dd : '%d დღე',
-+            M : 'თვე',
-+            MM : '%d თვე',
-+            y : 'წელი',
-+            yy : '%d წელი'
-+        },
-+        dayOfMonthOrdinalParse: /0|1-ლი|მე-\d{1,2}|\d{1,2}-ე/,
-+        ordinal : function (number) {
-+            if (number === 0) {
-+                return number;
-+            }
-+            if (number === 1) {
-+                return number + '-ლი';
-+            }
-+            if ((number < 20) || (number <= 100 && (number % 20 === 0)) || (number % 100 === 0)) {
-+                return 'მე-' + number;
-+            }
-+            return number + '-ე';
-+        },
-+        week : {
-+            dow : 1,
-+            doy : 7
-+        }
-+    });
-+
-+    return ka;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/kk.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/kk.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var suffixes = {
-+        0: '-ші',
-+        1: '-ші',
-+        2: '-ші',
-+        3: '-ші',
-+        4: '-ші',
-+        5: '-ші',
-+        6: '-шы',
-+        7: '-ші',
-+        8: '-ші',
-+        9: '-шы',
-+        10: '-шы',
-+        20: '-шы',
-+        30: '-шы',
-+        40: '-шы',
-+        50: '-ші',
-+        60: '-шы',
-+        70: '-ші',
-+        80: '-ші',
-+        90: '-шы',
-+        100: '-ші'
-+    };
-+
-+    var kk = moment.defineLocale('kk', {
-+        months : 'қаңтар_ақпан_наурыз_сәуір_мамыр_маусым_шілде_тамыз_қыркүйек_қазан_қараша_желтоқсан'.split('_'),
-+        monthsShort : 'қаң_ақп_нау_сәу_мам_мау_шіл_там_қыр_қаз_қар_жел'.split('_'),
-+        weekdays : 'жексенбі_дүйсенбі_сейсенбі_сәрсенбі_бейсенбі_жұма_сенбі'.split('_'),
-+        weekdaysShort : 'жек_дүй_сей_сәр_бей_жұм_сен'.split('_'),
-+        weekdaysMin : 'жк_дй_сй_ср_бй_жм_сн'.split('_'),
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD.MM.YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY HH:mm',
-+            LLLL : 'dddd, D MMMM YYYY HH:mm'
-+        },
-+        calendar : {
-+            sameDay : '[Бүгін сағат] LT',
-+            nextDay : '[Ертең сағат] LT',
-+            nextWeek : 'dddd [сағат] LT',
-+            lastDay : '[Кеше сағат] LT',
-+            lastWeek : '[Өткен аптаның] dddd [сағат] LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : '%s ішінде',
-+            past : '%s бұрын',
-+            s : 'бірнеше секунд',
-+            ss : '%d секунд',
-+            m : 'бір минут',
-+            mm : '%d минут',
-+            h : 'бір сағат',
-+            hh : '%d сағат',
-+            d : 'бір күн',
-+            dd : '%d күн',
-+            M : 'бір ай',
-+            MM : '%d ай',
-+            y : 'бір жыл',
-+            yy : '%d жыл'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}-(ші|шы)/,
-+        ordinal : function (number) {
-+            var a = number % 10,
-+                b = number >= 100 ? 100 : null;
-+            return number + (suffixes[number] || suffixes[a] || suffixes[b]);
-+        },
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 7  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return kk;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/km.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/km.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var symbolMap = {
-+        '1': '១',
-+        '2': '២',
-+        '3': '៣',
-+        '4': '៤',
-+        '5': '៥',
-+        '6': '៦',
-+        '7': '៧',
-+        '8': '៨',
-+        '9': '៩',
-+        '0': '០'
-+    }, numberMap = {
-+        '១': '1',
-+        '២': '2',
-+        '៣': '3',
-+        '៤': '4',
-+        '៥': '5',
-+        '៦': '6',
-+        '៧': '7',
-+        '៨': '8',
-+        '៩': '9',
-+        '០': '0'
-+    };
-+
-+    var km = moment.defineLocale('km', {
-+        months: 'មករា_កុម្ភៈ_មីនា_មេសា_ឧសភា_មិថុនា_កក្កដា_សីហា_កញ្ញា_តុលា_វិច្ឆិកា_ធ្នូ'.split(
-+            '_'
-+        ),
-+        monthsShort: 'មករា_កុម្ភៈ_មីនា_មេសា_ឧសភា_មិថុនា_កក្កដា_សីហា_កញ្ញា_តុលា_វិច្ឆិកា_ធ្នូ'.split(
-+            '_'
-+        ),
-+        weekdays: 'អាទិត្យ_ច័ន្ទ_អង្គារ_ពុធ_ព្រហស្បតិ៍_សុក្រ_សៅរ៍'.split('_'),
-+        weekdaysShort: 'អា_ច_អ_ព_ព្រ_សុ_ស'.split('_'),
-+        weekdaysMin: 'អា_ច_អ_ព_ព្រ_សុ_ស'.split('_'),
-+        weekdaysParseExact: true,
-+        longDateFormat: {
-+            LT: 'HH:mm',
-+            LTS: 'HH:mm:ss',
-+            L: 'DD/MM/YYYY',
-+            LL: 'D MMMM YYYY',
-+            LLL: 'D MMMM YYYY HH:mm',
-+            LLLL: 'dddd, D MMMM YYYY HH:mm'
-+        },
-+        meridiemParse: /ព្រឹក|ល្ងាច/,
-+        isPM: function (input) {
-+            return input === 'ល្ងាច';
-+        },
-+        meridiem: function (hour, minute, isLower) {
-+            if (hour < 12) {
-+                return 'ព្រឹក';
-+            } else {
-+                return 'ល្ងាច';
-+            }
-+        },
-+        calendar: {
-+            sameDay: '[ថ្ងៃនេះ ម៉ោង] LT',
-+            nextDay: '[ស្អែក ម៉ោង] LT',
-+            nextWeek: 'dddd [ម៉ោង] LT',
-+            lastDay: '[ម្សិលមិញ ម៉ោង] LT',
-+            lastWeek: 'dddd [សប្តាហ៍មុន] [ម៉ោង] LT',
-+            sameElse: 'L'
-+        },
-+        relativeTime: {
-+            future: '%sទៀត',
-+            past: '%sមុន',
-+            s: 'ប៉ុន្មានវិនាទី',
-+            ss: '%d វិនាទី',
-+            m: 'មួយនាទី',
-+            mm: '%d នាទី',
-+            h: 'មួយម៉ោង',
-+            hh: '%d ម៉ោង',
-+            d: 'មួយថ្ងៃ',
-+            dd: '%d ថ្ងៃ',
-+            M: 'មួយខែ',
-+            MM: '%d ខែ',
-+            y: 'មួយឆ្នាំ',
-+            yy: '%d ឆ្នាំ'
-+        },
-+        dayOfMonthOrdinalParse : /ទី\d{1,2}/,
-+        ordinal : 'ទី%d',
-+        preparse: function (string) {
-+            return string.replace(/[១២៣៤៥៦៧៨៩០]/g, function (match) {
-+                return numberMap[match];
-+            });
-+        },
-+        postformat: function (string) {
-+            return string.replace(/\d/g, function (match) {
-+                return symbolMap[match];
-+            });
-+        },
-+        week: {
-+            dow: 1, // Monday is the first day of the week.
-+            doy: 4 // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return km;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/kn.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/kn.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var symbolMap = {
-+        '1': '೧',
-+        '2': '೨',
-+        '3': '೩',
-+        '4': '೪',
-+        '5': '೫',
-+        '6': '೬',
-+        '7': '೭',
-+        '8': '೮',
-+        '9': '೯',
-+        '0': '೦'
-+    },
-+    numberMap = {
-+        '೧': '1',
-+        '೨': '2',
-+        '೩': '3',
-+        '೪': '4',
-+        '೫': '5',
-+        '೬': '6',
-+        '೭': '7',
-+        '೮': '8',
-+        '೯': '9',
-+        '೦': '0'
-+    };
-+
-+    var kn = moment.defineLocale('kn', {
-+        months : 'ಜನವರಿ_ಫೆಬ್ರವರಿ_ಮಾರ್ಚ್_ಏಪ್ರಿಲ್_ಮೇ_ಜೂನ್_ಜುಲೈ_ಆಗಸ್ಟ್_ಸೆಪ್ಟೆಂಬರ್_ಅಕ್ಟೋಬರ್_ನವೆಂಬರ್_ಡಿಸೆಂಬರ್'.split('_'),
-+        monthsShort : 'ಜನ_ಫೆಬ್ರ_ಮಾರ್ಚ್_ಏಪ್ರಿಲ್_ಮೇ_ಜೂನ್_ಜುಲೈ_ಆಗಸ್ಟ್_ಸೆಪ್ಟೆಂ_ಅಕ್ಟೋ_ನವೆಂ_ಡಿಸೆಂ'.split('_'),
-+        monthsParseExact: true,
-+        weekdays : 'ಭಾನುವಾರ_ಸೋಮವಾರ_ಮಂಗಳವಾರ_ಬುಧವಾರ_ಗುರುವಾರ_ಶುಕ್ರವಾರ_ಶನಿವಾರ'.split('_'),
-+        weekdaysShort : 'ಭಾನು_ಸೋಮ_ಮಂಗಳ_ಬುಧ_ಗುರು_ಶುಕ್ರ_ಶನಿ'.split('_'),
-+        weekdaysMin : 'ಭಾ_ಸೋ_ಮಂ_ಬು_ಗು_ಶು_ಶ'.split('_'),
-+        longDateFormat : {
-+            LT : 'A h:mm',
-+            LTS : 'A h:mm:ss',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY, A h:mm',
-+            LLLL : 'dddd, D MMMM YYYY, A h:mm'
-+        },
-+        calendar : {
-+            sameDay : '[ಇಂದು] LT',
-+            nextDay : '[ನಾಳೆ] LT',
-+            nextWeek : 'dddd, LT',
-+            lastDay : '[ನಿನ್ನೆ] LT',
-+            lastWeek : '[ಕೊನೆಯ] dddd, LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : '%s ನಂತರ',
-+            past : '%s ಹಿಂದೆ',
-+            s : 'ಕೆಲವು ಕ್ಷಣಗಳು',
-+            ss : '%d ಸೆಕೆಂಡುಗಳು',
-+            m : 'ಒಂದು ನಿಮಿಷ',
-+            mm : '%d ನಿಮಿಷ',
-+            h : 'ಒಂದು ಗಂಟೆ',
-+            hh : '%d ಗಂಟೆ',
-+            d : 'ಒಂದು ದಿನ',
-+            dd : '%d ದಿನ',
-+            M : 'ಒಂದು ತಿಂಗಳು',
-+            MM : '%d ತಿಂಗಳು',
-+            y : 'ಒಂದು ವರ್ಷ',
-+            yy : '%d ವರ್ಷ'
-+        },
-+        preparse: function (string) {
-+            return string.replace(/[೧೨೩೪೫೬೭೮೯೦]/g, function (match) {
-+                return numberMap[match];
-+            });
-+        },
-+        postformat: function (string) {
-+            return string.replace(/\d/g, function (match) {
-+                return symbolMap[match];
-+            });
-+        },
-+        meridiemParse: /ರಾತ್ರಿ|ಬೆಳಿಗ್ಗೆ|ಮಧ್ಯಾಹ್ನ|ಸಂಜೆ/,
-+        meridiemHour : function (hour, meridiem) {
-+            if (hour === 12) {
-+                hour = 0;
-+            }
-+            if (meridiem === 'ರಾತ್ರಿ') {
-+                return hour < 4 ? hour : hour + 12;
-+            } else if (meridiem === 'ಬೆಳಿಗ್ಗೆ') {
-+                return hour;
-+            } else if (meridiem === 'ಮಧ್ಯಾಹ್ನ') {
-+                return hour >= 10 ? hour : hour + 12;
-+            } else if (meridiem === 'ಸಂಜೆ') {
-+                return hour + 12;
-+            }
-+        },
-+        meridiem : function (hour, minute, isLower) {
-+            if (hour < 4) {
-+                return 'ರಾತ್ರಿ';
-+            } else if (hour < 10) {
-+                return 'ಬೆಳಿಗ್ಗೆ';
-+            } else if (hour < 17) {
-+                return 'ಮಧ್ಯಾಹ್ನ';
-+            } else if (hour < 20) {
-+                return 'ಸಂಜೆ';
-+            } else {
-+                return 'ರಾತ್ರಿ';
-+            }
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}(ನೇ)/,
-+        ordinal : function (number) {
-+            return number + 'ನೇ';
-+        },
-+        week : {
-+            dow : 0, // Sunday is the first day of the week.
-+            doy : 6  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return kn;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/ko.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/ko.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var ko = moment.defineLocale('ko', {
-+        months : '1월_2월_3월_4월_5월_6월_7월_8월_9월_10월_11월_12월'.split('_'),
-+        monthsShort : '1월_2월_3월_4월_5월_6월_7월_8월_9월_10월_11월_12월'.split('_'),
-+        weekdays : '일요일_월요일_화요일_수요일_목요일_금요일_토요일'.split('_'),
-+        weekdaysShort : '일_월_화_수_목_금_토'.split('_'),
-+        weekdaysMin : '일_월_화_수_목_금_토'.split('_'),
-+        longDateFormat : {
-+            LT : 'A h:mm',
-+            LTS : 'A h:mm:ss',
-+            L : 'YYYY.MM.DD.',
-+            LL : 'YYYY년 MMMM D일',
-+            LLL : 'YYYY년 MMMM D일 A h:mm',
-+            LLLL : 'YYYY년 MMMM D일 dddd A h:mm',
-+            l : 'YYYY.MM.DD.',
-+            ll : 'YYYY년 MMMM D일',
-+            lll : 'YYYY년 MMMM D일 A h:mm',
-+            llll : 'YYYY년 MMMM D일 dddd A h:mm'
-+        },
-+        calendar : {
-+            sameDay : '오늘 LT',
-+            nextDay : '내일 LT',
-+            nextWeek : 'dddd LT',
-+            lastDay : '어제 LT',
-+            lastWeek : '지난주 dddd LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : '%s 후',
-+            past : '%s 전',
-+            s : '몇 초',
-+            ss : '%d초',
-+            m : '1분',
-+            mm : '%d분',
-+            h : '한 시간',
-+            hh : '%d시간',
-+            d : '하루',
-+            dd : '%d일',
-+            M : '한 달',
-+            MM : '%d달',
-+            y : '일 년',
-+            yy : '%d년'
-+        },
-+        dayOfMonthOrdinalParse : /\d{1,2}(일|월|주)/,
-+        ordinal : function (number, period) {
-+            switch (period) {
-+                case 'd':
-+                case 'D':
-+                case 'DDD':
-+                    return number + '일';
-+                case 'M':
-+                    return number + '월';
-+                case 'w':
-+                case 'W':
-+                    return number + '주';
-+                default:
-+                    return number;
-+            }
-+        },
-+        meridiemParse : /오전|오후/,
-+        isPM : function (token) {
-+            return token === '오후';
-+        },
-+        meridiem : function (hour, minute, isUpper) {
-+            return hour < 12 ? '오전' : '오후';
-+        }
-+    });
-+
-+    return ko;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/ky.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/ky.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var suffixes = {
-+        0: '-чү',
-+        1: '-чи',
-+        2: '-чи',
-+        3: '-чү',
-+        4: '-чү',
-+        5: '-чи',
-+        6: '-чы',
-+        7: '-чи',
-+        8: '-чи',
-+        9: '-чу',
-+        10: '-чу',
-+        20: '-чы',
-+        30: '-чу',
-+        40: '-чы',
-+        50: '-чү',
-+        60: '-чы',
-+        70: '-чи',
-+        80: '-чи',
-+        90: '-чу',
-+        100: '-чү'
-+    };
-+
-+    var ky = moment.defineLocale('ky', {
-+        months : 'январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь'.split('_'),
-+        monthsShort : 'янв_фев_март_апр_май_июнь_июль_авг_сен_окт_ноя_дек'.split('_'),
-+        weekdays : 'Жекшемби_Дүйшөмбү_Шейшемби_Шаршемби_Бейшемби_Жума_Ишемби'.split('_'),
-+        weekdaysShort : 'Жек_Дүй_Шей_Шар_Бей_Жум_Ише'.split('_'),
-+        weekdaysMin : 'Жк_Дй_Шй_Шр_Бй_Жм_Иш'.split('_'),
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD.MM.YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY HH:mm',
-+            LLLL : 'dddd, D MMMM YYYY HH:mm'
-+        },
-+        calendar : {
-+            sameDay : '[Бүгүн саат] LT',
-+            nextDay : '[Эртең саат] LT',
-+            nextWeek : 'dddd [саат] LT',
-+            lastDay : '[Кече саат] LT',
-+            lastWeek : '[Өткен аптанын] dddd [күнү] [саат] LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : '%s ичинде',
-+            past : '%s мурун',
-+            s : 'бирнече секунд',
-+            ss : '%d секунд',
-+            m : 'бир мүнөт',
-+            mm : '%d мүнөт',
-+            h : 'бир саат',
-+            hh : '%d саат',
-+            d : 'бир күн',
-+            dd : '%d күн',
-+            M : 'бир ай',
-+            MM : '%d ай',
-+            y : 'бир жыл',
-+            yy : '%d жыл'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}-(чи|чы|чү|чу)/,
-+        ordinal : function (number) {
-+            var a = number % 10,
-+                b = number >= 100 ? 100 : null;
-+            return number + (suffixes[number] || suffixes[a] || suffixes[b]);
-+        },
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 7  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return ky;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/lb.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/lb.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    function processRelativeTime(number, withoutSuffix, key, isFuture) {
-+        var format = {
-+            'm': ['eng Minutt', 'enger Minutt'],
-+            'h': ['eng Stonn', 'enger Stonn'],
-+            'd': ['een Dag', 'engem Dag'],
-+            'M': ['ee Mount', 'engem Mount'],
-+            'y': ['ee Joer', 'engem Joer']
-+        };
-+        return withoutSuffix ? format[key][0] : format[key][1];
-+    }
-+    function processFutureTime(string) {
-+        var number = string.substr(0, string.indexOf(' '));
-+        if (eifelerRegelAppliesToNumber(number)) {
-+            return 'a ' + string;
-+        }
-+        return 'an ' + string;
-+    }
-+    function processPastTime(string) {
-+        var number = string.substr(0, string.indexOf(' '));
-+        if (eifelerRegelAppliesToNumber(number)) {
-+            return 'viru ' + string;
-+        }
-+        return 'virun ' + string;
-+    }
-+    /**
-+     * Returns true if the word before the given number loses the '-n' ending.
-+     * e.g. 'an 10 Deeg' but 'a 5 Deeg'
-+     *
-+     * @param number {integer}
-+     * @returns {boolean}
-+     */
-+    function eifelerRegelAppliesToNumber(number) {
-+        number = parseInt(number, 10);
-+        if (isNaN(number)) {
-+            return false;
-+        }
-+        if (number < 0) {
-+            // Negative Number --> always true
-+            return true;
-+        } else if (number < 10) {
-+            // Only 1 digit
-+            if (4 <= number && number <= 7) {
-+                return true;
-+            }
-+            return false;
-+        } else if (number < 100) {
-+            // 2 digits
-+            var lastDigit = number % 10, firstDigit = number / 10;
-+            if (lastDigit === 0) {
-+                return eifelerRegelAppliesToNumber(firstDigit);
-+            }
-+            return eifelerRegelAppliesToNumber(lastDigit);
-+        } else if (number < 10000) {
-+            // 3 or 4 digits --> recursively check first digit
-+            while (number >= 10) {
-+                number = number / 10;
-+            }
-+            return eifelerRegelAppliesToNumber(number);
-+        } else {
-+            // Anything larger than 4 digits: recursively check first n-3 digits
-+            number = number / 1000;
-+            return eifelerRegelAppliesToNumber(number);
-+        }
-+    }
-+
-+    var lb = moment.defineLocale('lb', {
-+        months: 'Januar_Februar_Mäerz_Abrëll_Mee_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),
-+        monthsShort: 'Jan._Febr._Mrz._Abr._Mee_Jun._Jul._Aug._Sept._Okt._Nov._Dez.'.split('_'),
-+        monthsParseExact : true,
-+        weekdays: 'Sonndeg_Méindeg_Dënschdeg_Mëttwoch_Donneschdeg_Freideg_Samschdeg'.split('_'),
-+        weekdaysShort: 'So._Mé._Dë._Më._Do._Fr._Sa.'.split('_'),
-+        weekdaysMin: 'So_Mé_Dë_Më_Do_Fr_Sa'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat: {
-+            LT: 'H:mm [Auer]',
-+            LTS: 'H:mm:ss [Auer]',
-+            L: 'DD.MM.YYYY',
-+            LL: 'D. MMMM YYYY',
-+            LLL: 'D. MMMM YYYY H:mm [Auer]',
-+            LLLL: 'dddd, D. MMMM YYYY H:mm [Auer]'
-+        },
-+        calendar: {
-+            sameDay: '[Haut um] LT',
-+            sameElse: 'L',
-+            nextDay: '[Muer um] LT',
-+            nextWeek: 'dddd [um] LT',
-+            lastDay: '[Gëschter um] LT',
-+            lastWeek: function () {
-+                // Different date string for 'Dënschdeg' (Tuesday) and 'Donneschdeg' (Thursday) due to phonological rule
-+                switch (this.day()) {
-+                    case 2:
-+                    case 4:
-+                        return '[Leschten] dddd [um] LT';
-+                    default:
-+                        return '[Leschte] dddd [um] LT';
-+                }
-+            }
-+        },
-+        relativeTime : {
-+            future : processFutureTime,
-+            past : processPastTime,
-+            s : 'e puer Sekonnen',
-+            ss : '%d Sekonnen',
-+            m : processRelativeTime,
-+            mm : '%d Minutten',
-+            h : processRelativeTime,
-+            hh : '%d Stonnen',
-+            d : processRelativeTime,
-+            dd : '%d Deeg',
-+            M : processRelativeTime,
-+            MM : '%d Méint',
-+            y : processRelativeTime,
-+            yy : '%d Joer'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}\./,
-+        ordinal: '%d.',
-+        week: {
-+            dow: 1, // Monday is the first day of the week.
-+            doy: 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return lb;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/lo.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/lo.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var lo = moment.defineLocale('lo', {
-+        months : 'ມັງກອນ_ກຸມພາ_ມີນາ_ເມສາ_ພຶດສະພາ_ມິຖຸນາ_ກໍລະກົດ_ສິງຫາ_ກັນຍາ_ຕຸລາ_ພະຈິກ_ທັນວາ'.split('_'),
-+        monthsShort : 'ມັງກອນ_ກຸມພາ_ມີນາ_ເມສາ_ພຶດສະພາ_ມິຖຸນາ_ກໍລະກົດ_ສິງຫາ_ກັນຍາ_ຕຸລາ_ພະຈິກ_ທັນວາ'.split('_'),
-+        weekdays : 'ອາທິດ_ຈັນ_ອັງຄານ_ພຸດ_ພະຫັດ_ສຸກ_ເສົາ'.split('_'),
-+        weekdaysShort : 'ທິດ_ຈັນ_ອັງຄານ_ພຸດ_ພະຫັດ_ສຸກ_ເສົາ'.split('_'),
-+        weekdaysMin : 'ທ_ຈ_ອຄ_ພ_ພຫ_ສກ_ສ'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY HH:mm',
-+            LLLL : 'ວັນdddd D MMMM YYYY HH:mm'
-+        },
-+        meridiemParse: /ຕອນເຊົ້າ|ຕອນແລງ/,
-+        isPM: function (input) {
-+            return input === 'ຕອນແລງ';
-+        },
-+        meridiem : function (hour, minute, isLower) {
-+            if (hour < 12) {
-+                return 'ຕອນເຊົ້າ';
-+            } else {
-+                return 'ຕອນແລງ';
-+            }
-+        },
-+        calendar : {
-+            sameDay : '[ມື້ນີ້ເວລາ] LT',
-+            nextDay : '[ມື້ອື່ນເວລາ] LT',
-+            nextWeek : '[ວັນ]dddd[ໜ້າເວລາ] LT',
-+            lastDay : '[ມື້ວານນີ້ເວລາ] LT',
-+            lastWeek : '[ວັນ]dddd[ແລ້ວນີ້ເວລາ] LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'ອີກ %s',
-+            past : '%sຜ່ານມາ',
-+            s : 'ບໍ່ເທົ່າໃດວິນາທີ',
-+            ss : '%d ວິນາທີ' ,
-+            m : '1 ນາທີ',
-+            mm : '%d ນາທີ',
-+            h : '1 ຊົ່ວໂມງ',
-+            hh : '%d ຊົ່ວໂມງ',
-+            d : '1 ມື້',
-+            dd : '%d ມື້',
-+            M : '1 ເດືອນ',
-+            MM : '%d ເດືອນ',
-+            y : '1 ປີ',
-+            yy : '%d ປີ'
-+        },
-+        dayOfMonthOrdinalParse: /(ທີ່)\d{1,2}/,
-+        ordinal : function (number) {
-+            return 'ທີ່' + number;
-+        }
-+    });
-+
-+    return lo;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/lt.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/lt.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var units = {
-+        'ss' : 'sekundė_sekundžių_sekundes',
-+        'm' : 'minutė_minutės_minutę',
-+        'mm': 'minutės_minučių_minutes',
-+        'h' : 'valanda_valandos_valandą',
-+        'hh': 'valandos_valandų_valandas',
-+        'd' : 'diena_dienos_dieną',
-+        'dd': 'dienos_dienų_dienas',
-+        'M' : 'mėnuo_mėnesio_mėnesį',
-+        'MM': 'mėnesiai_mėnesių_mėnesius',
-+        'y' : 'metai_metų_metus',
-+        'yy': 'metai_metų_metus'
-+    };
-+    function translateSeconds(number, withoutSuffix, key, isFuture) {
-+        if (withoutSuffix) {
-+            return 'kelios sekundės';
-+        } else {
-+            return isFuture ? 'kelių sekundžių' : 'kelias sekundes';
-+        }
-+    }
-+    function translateSingular(number, withoutSuffix, key, isFuture) {
-+        return withoutSuffix ? forms(key)[0] : (isFuture ? forms(key)[1] : forms(key)[2]);
-+    }
-+    function special(number) {
-+        return number % 10 === 0 || (number > 10 && number < 20);
-+    }
-+    function forms(key) {
-+        return units[key].split('_');
-+    }
-+    function translate(number, withoutSuffix, key, isFuture) {
-+        var result = number + ' ';
-+        if (number === 1) {
-+            return result + translateSingular(number, withoutSuffix, key[0], isFuture);
-+        } else if (withoutSuffix) {
-+            return result + (special(number) ? forms(key)[1] : forms(key)[0]);
-+        } else {
-+            if (isFuture) {
-+                return result + forms(key)[1];
-+            } else {
-+                return result + (special(number) ? forms(key)[1] : forms(key)[2]);
-+            }
-+        }
-+    }
-+    var lt = moment.defineLocale('lt', {
-+        months : {
-+            format: 'sausio_vasario_kovo_balandžio_gegužės_birželio_liepos_rugpjūčio_rugsėjo_spalio_lapkričio_gruodžio'.split('_'),
-+            standalone: 'sausis_vasaris_kovas_balandis_gegužė_birželis_liepa_rugpjūtis_rugsėjis_spalis_lapkritis_gruodis'.split('_'),
-+            isFormat: /D[oD]?(\[[^\[\]]*\]|\s)+MMMM?|MMMM?(\[[^\[\]]*\]|\s)+D[oD]?/
-+        },
-+        monthsShort : 'sau_vas_kov_bal_geg_bir_lie_rgp_rgs_spa_lap_grd'.split('_'),
-+        weekdays : {
-+            format: 'sekmadienį_pirmadienį_antradienį_trečiadienį_ketvirtadienį_penktadienį_šeštadienį'.split('_'),
-+            standalone: 'sekmadienis_pirmadienis_antradienis_trečiadienis_ketvirtadienis_penktadienis_šeštadienis'.split('_'),
-+            isFormat: /dddd HH:mm/
-+        },
-+        weekdaysShort : 'Sek_Pir_Ant_Tre_Ket_Pen_Šeš'.split('_'),
-+        weekdaysMin : 'S_P_A_T_K_Pn_Š'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'YYYY-MM-DD',
-+            LL : 'YYYY [m.] MMMM D [d.]',
-+            LLL : 'YYYY [m.] MMMM D [d.], HH:mm [val.]',
-+            LLLL : 'YYYY [m.] MMMM D [d.], dddd, HH:mm [val.]',
-+            l : 'YYYY-MM-DD',
-+            ll : 'YYYY [m.] MMMM D [d.]',
-+            lll : 'YYYY [m.] MMMM D [d.], HH:mm [val.]',
-+            llll : 'YYYY [m.] MMMM D [d.], ddd, HH:mm [val.]'
-+        },
-+        calendar : {
-+            sameDay : '[Šiandien] LT',
-+            nextDay : '[Rytoj] LT',
-+            nextWeek : 'dddd LT',
-+            lastDay : '[Vakar] LT',
-+            lastWeek : '[Praėjusį] dddd LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'po %s',
-+            past : 'prieš %s',
-+            s : translateSeconds,
-+            ss : translate,
-+            m : translateSingular,
-+            mm : translate,
-+            h : translateSingular,
-+            hh : translate,
-+            d : translateSingular,
-+            dd : translate,
-+            M : translateSingular,
-+            MM : translate,
-+            y : translateSingular,
-+            yy : translate
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}-oji/,
-+        ordinal : function (number) {
-+            return number + '-oji';
-+        },
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return lt;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/lv.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/lv.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var units = {
-+        'ss': 'sekundes_sekundēm_sekunde_sekundes'.split('_'),
-+        'm': 'minūtes_minūtēm_minūte_minūtes'.split('_'),
-+        'mm': 'minūtes_minūtēm_minūte_minūtes'.split('_'),
-+        'h': 'stundas_stundām_stunda_stundas'.split('_'),
-+        'hh': 'stundas_stundām_stunda_stundas'.split('_'),
-+        'd': 'dienas_dienām_diena_dienas'.split('_'),
-+        'dd': 'dienas_dienām_diena_dienas'.split('_'),
-+        'M': 'mēneša_mēnešiem_mēnesis_mēneši'.split('_'),
-+        'MM': 'mēneša_mēnešiem_mēnesis_mēneši'.split('_'),
-+        'y': 'gada_gadiem_gads_gadi'.split('_'),
-+        'yy': 'gada_gadiem_gads_gadi'.split('_')
-+    };
-+    /**
-+     * @param withoutSuffix boolean true = a length of time; false = before/after a period of time.
-+     */
-+    function format(forms, number, withoutSuffix) {
-+        if (withoutSuffix) {
-+            // E.g. "21 minūte", "3 minūtes".
-+            return number % 10 === 1 && number % 100 !== 11 ? forms[2] : forms[3];
-+        } else {
-+            // E.g. "21 minūtes" as in "pēc 21 minūtes".
-+            // E.g. "3 minūtēm" as in "pēc 3 minūtēm".
-+            return number % 10 === 1 && number % 100 !== 11 ? forms[0] : forms[1];
-+        }
-+    }
-+    function relativeTimeWithPlural(number, withoutSuffix, key) {
-+        return number + ' ' + format(units[key], number, withoutSuffix);
-+    }
-+    function relativeTimeWithSingular(number, withoutSuffix, key) {
-+        return format(units[key], number, withoutSuffix);
-+    }
-+    function relativeSeconds(number, withoutSuffix) {
-+        return withoutSuffix ? 'dažas sekundes' : 'dažām sekundēm';
-+    }
-+
-+    var lv = moment.defineLocale('lv', {
-+        months : 'janvāris_februāris_marts_aprīlis_maijs_jūnijs_jūlijs_augusts_septembris_oktobris_novembris_decembris'.split('_'),
-+        monthsShort : 'jan_feb_mar_apr_mai_jūn_jūl_aug_sep_okt_nov_dec'.split('_'),
-+        weekdays : 'svētdiena_pirmdiena_otrdiena_trešdiena_ceturtdiena_piektdiena_sestdiena'.split('_'),
-+        weekdaysShort : 'Sv_P_O_T_C_Pk_S'.split('_'),
-+        weekdaysMin : 'Sv_P_O_T_C_Pk_S'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD.MM.YYYY.',
-+            LL : 'YYYY. [gada] D. MMMM',
-+            LLL : 'YYYY. [gada] D. MMMM, HH:mm',
-+            LLLL : 'YYYY. [gada] D. MMMM, dddd, HH:mm'
-+        },
-+        calendar : {
-+            sameDay : '[Šodien pulksten] LT',
-+            nextDay : '[Rīt pulksten] LT',
-+            nextWeek : 'dddd [pulksten] LT',
-+            lastDay : '[Vakar pulksten] LT',
-+            lastWeek : '[Pagājušā] dddd [pulksten] LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'pēc %s',
-+            past : 'pirms %s',
-+            s : relativeSeconds,
-+            ss : relativeTimeWithPlural,
-+            m : relativeTimeWithSingular,
-+            mm : relativeTimeWithPlural,
-+            h : relativeTimeWithSingular,
-+            hh : relativeTimeWithPlural,
-+            d : relativeTimeWithSingular,
-+            dd : relativeTimeWithPlural,
-+            M : relativeTimeWithSingular,
-+            MM : relativeTimeWithPlural,
-+            y : relativeTimeWithSingular,
-+            yy : relativeTimeWithPlural
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}\./,
-+        ordinal : '%d.',
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return lv;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/me.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/me.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var translator = {
-+        words: { //Different grammatical cases
-+            ss: ['sekund', 'sekunda', 'sekundi'],
-+            m: ['jedan minut', 'jednog minuta'],
-+            mm: ['minut', 'minuta', 'minuta'],
-+            h: ['jedan sat', 'jednog sata'],
-+            hh: ['sat', 'sata', 'sati'],
-+            dd: ['dan', 'dana', 'dana'],
-+            MM: ['mjesec', 'mjeseca', 'mjeseci'],
-+            yy: ['godina', 'godine', 'godina']
-+        },
-+        correctGrammaticalCase: function (number, wordKey) {
-+            return number === 1 ? wordKey[0] : (number >= 2 && number <= 4 ? wordKey[1] : wordKey[2]);
-+        },
-+        translate: function (number, withoutSuffix, key) {
-+            var wordKey = translator.words[key];
-+            if (key.length === 1) {
-+                return withoutSuffix ? wordKey[0] : wordKey[1];
-+            } else {
-+                return number + ' ' + translator.correctGrammaticalCase(number, wordKey);
-+            }
-+        }
-+    };
-+
-+    var me = moment.defineLocale('me', {
-+        months: 'januar_februar_mart_april_maj_jun_jul_avgust_septembar_oktobar_novembar_decembar'.split('_'),
-+        monthsShort: 'jan._feb._mar._apr._maj_jun_jul_avg._sep._okt._nov._dec.'.split('_'),
-+        monthsParseExact : true,
-+        weekdays: 'nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota'.split('_'),
-+        weekdaysShort: 'ned._pon._uto._sri._čet._pet._sub.'.split('_'),
-+        weekdaysMin: 'ne_po_ut_sr_če_pe_su'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat: {
-+            LT: 'H:mm',
-+            LTS : 'H:mm:ss',
-+            L: 'DD.MM.YYYY',
-+            LL: 'D. MMMM YYYY',
-+            LLL: 'D. MMMM YYYY H:mm',
-+            LLLL: 'dddd, D. MMMM YYYY H:mm'
-+        },
-+        calendar: {
-+            sameDay: '[danas u] LT',
-+            nextDay: '[sjutra u] LT',
-+
-+            nextWeek: function () {
-+                switch (this.day()) {
-+                    case 0:
-+                        return '[u] [nedjelju] [u] LT';
-+                    case 3:
-+                        return '[u] [srijedu] [u] LT';
-+                    case 6:
-+                        return '[u] [subotu] [u] LT';
-+                    case 1:
-+                    case 2:
-+                    case 4:
-+                    case 5:
-+                        return '[u] dddd [u] LT';
-+                }
-+            },
-+            lastDay  : '[juče u] LT',
-+            lastWeek : function () {
-+                var lastWeekDays = [
-+                    '[prošle] [nedjelje] [u] LT',
-+                    '[prošlog] [ponedjeljka] [u] LT',
-+                    '[prošlog] [utorka] [u] LT',
-+                    '[prošle] [srijede] [u] LT',
-+                    '[prošlog] [četvrtka] [u] LT',
-+                    '[prošlog] [petka] [u] LT',
-+                    '[prošle] [subote] [u] LT'
-+                ];
-+                return lastWeekDays[this.day()];
-+            },
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'za %s',
-+            past   : 'prije %s',
-+            s      : 'nekoliko sekundi',
-+            ss     : translator.translate,
-+            m      : translator.translate,
-+            mm     : translator.translate,
-+            h      : translator.translate,
-+            hh     : translator.translate,
-+            d      : 'dan',
-+            dd     : translator.translate,
-+            M      : 'mjesec',
-+            MM     : translator.translate,
-+            y      : 'godinu',
-+            yy     : translator.translate
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}\./,
-+        ordinal : '%d.',
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 7  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return me;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/mi.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/mi.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var mi = moment.defineLocale('mi', {
-+        months: 'Kohi-tāte_Hui-tanguru_Poutū-te-rangi_Paenga-whāwhā_Haratua_Pipiri_Hōngoingoi_Here-turi-kōkā_Mahuru_Whiringa-ā-nuku_Whiringa-ā-rangi_Hakihea'.split('_'),
-+        monthsShort: 'Kohi_Hui_Pou_Pae_Hara_Pipi_Hōngoi_Here_Mahu_Whi-nu_Whi-ra_Haki'.split('_'),
-+        monthsRegex: /(?:['a-z\u0101\u014D\u016B]+\-?){1,3}/i,
-+        monthsStrictRegex: /(?:['a-z\u0101\u014D\u016B]+\-?){1,3}/i,
-+        monthsShortRegex: /(?:['a-z\u0101\u014D\u016B]+\-?){1,3}/i,
-+        monthsShortStrictRegex: /(?:['a-z\u0101\u014D\u016B]+\-?){1,2}/i,
-+        weekdays: 'Rātapu_Mane_Tūrei_Wenerei_Tāite_Paraire_Hātarei'.split('_'),
-+        weekdaysShort: 'Ta_Ma_Tū_We_Tāi_Pa_Hā'.split('_'),
-+        weekdaysMin: 'Ta_Ma_Tū_We_Tāi_Pa_Hā'.split('_'),
-+        longDateFormat: {
-+            LT: 'HH:mm',
-+            LTS: 'HH:mm:ss',
-+            L: 'DD/MM/YYYY',
-+            LL: 'D MMMM YYYY',
-+            LLL: 'D MMMM YYYY [i] HH:mm',
-+            LLLL: 'dddd, D MMMM YYYY [i] HH:mm'
-+        },
-+        calendar: {
-+            sameDay: '[i teie mahana, i] LT',
-+            nextDay: '[apopo i] LT',
-+            nextWeek: 'dddd [i] LT',
-+            lastDay: '[inanahi i] LT',
-+            lastWeek: 'dddd [whakamutunga i] LT',
-+            sameElse: 'L'
-+        },
-+        relativeTime: {
-+            future: 'i roto i %s',
-+            past: '%s i mua',
-+            s: 'te hēkona ruarua',
-+            ss: '%d hēkona',
-+            m: 'he meneti',
-+            mm: '%d meneti',
-+            h: 'te haora',
-+            hh: '%d haora',
-+            d: 'he ra',
-+            dd: '%d ra',
-+            M: 'he marama',
-+            MM: '%d marama',
-+            y: 'he tau',
-+            yy: '%d tau'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}º/,
-+        ordinal: '%dº',
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return mi;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/mk.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/mk.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var mk = moment.defineLocale('mk', {
-+        months : 'јануари_февруари_март_април_мај_јуни_јули_август_септември_октомври_ноември_декември'.split('_'),
-+        monthsShort : 'јан_фев_мар_апр_мај_јун_јул_авг_сеп_окт_ное_дек'.split('_'),
-+        weekdays : 'недела_понеделник_вторник_среда_четврток_петок_сабота'.split('_'),
-+        weekdaysShort : 'нед_пон_вто_сре_чет_пет_саб'.split('_'),
-+        weekdaysMin : 'нe_пo_вт_ср_че_пе_сa'.split('_'),
-+        longDateFormat : {
-+            LT : 'H:mm',
-+            LTS : 'H:mm:ss',
-+            L : 'D.MM.YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY H:mm',
-+            LLLL : 'dddd, D MMMM YYYY H:mm'
-+        },
-+        calendar : {
-+            sameDay : '[Денес во] LT',
-+            nextDay : '[Утре во] LT',
-+            nextWeek : '[Во] dddd [во] LT',
-+            lastDay : '[Вчера во] LT',
-+            lastWeek : function () {
-+                switch (this.day()) {
-+                    case 0:
-+                    case 3:
-+                    case 6:
-+                        return '[Изминатата] dddd [во] LT';
-+                    case 1:
-+                    case 2:
-+                    case 4:
-+                    case 5:
-+                        return '[Изминатиот] dddd [во] LT';
-+                }
-+            },
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'после %s',
-+            past : 'пред %s',
-+            s : 'неколку секунди',
-+            ss : '%d секунди',
-+            m : 'минута',
-+            mm : '%d минути',
-+            h : 'час',
-+            hh : '%d часа',
-+            d : 'ден',
-+            dd : '%d дена',
-+            M : 'месец',
-+            MM : '%d месеци',
-+            y : 'година',
-+            yy : '%d години'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}-(ев|ен|ти|ви|ри|ми)/,
-+        ordinal : function (number) {
-+            var lastDigit = number % 10,
-+                last2Digits = number % 100;
-+            if (number === 0) {
-+                return number + '-ев';
-+            } else if (last2Digits === 0) {
-+                return number + '-ен';
-+            } else if (last2Digits > 10 && last2Digits < 20) {
-+                return number + '-ти';
-+            } else if (lastDigit === 1) {
-+                return number + '-ви';
-+            } else if (lastDigit === 2) {
-+                return number + '-ри';
-+            } else if (lastDigit === 7 || lastDigit === 8) {
-+                return number + '-ми';
-+            } else {
-+                return number + '-ти';
-+            }
-+        },
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 7  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return mk;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/ml.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/ml.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var ml = moment.defineLocale('ml', {
-+        months : 'ജനുവരി_ഫെബ്രുവരി_മാർച്ച്_ഏപ്രിൽ_മേയ്_ജൂൺ_ജൂലൈ_ഓഗസ്റ്റ്_സെപ്റ്റംബർ_ഒക്ടോബർ_നവംബർ_ഡിസംബർ'.split('_'),
-+        monthsShort : 'ജനു._ഫെബ്രു._മാർ._ഏപ്രി._മേയ്_ജൂൺ_ജൂലൈ._ഓഗ._സെപ്റ്റ._ഒക്ടോ._നവം._ഡിസം.'.split('_'),
-+        monthsParseExact : true,
-+        weekdays : 'ഞായറാഴ്ച_തിങ്കളാഴ്ച_ചൊവ്വാഴ്ച_ബുധനാഴ്ച_വ്യാഴാഴ്ച_വെള്ളിയാഴ്ച_ശനിയാഴ്ച'.split('_'),
-+        weekdaysShort : 'ഞായർ_തിങ്കൾ_ചൊവ്വ_ബുധൻ_വ്യാഴം_വെള്ളി_ശനി'.split('_'),
-+        weekdaysMin : 'ഞാ_തി_ചൊ_ബു_വ്യാ_വെ_ശ'.split('_'),
-+        longDateFormat : {
-+            LT : 'A h:mm -നു',
-+            LTS : 'A h:mm:ss -നു',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY, A h:mm -നു',
-+            LLLL : 'dddd, D MMMM YYYY, A h:mm -നു'
-+        },
-+        calendar : {
-+            sameDay : '[ഇന്ന്] LT',
-+            nextDay : '[നാളെ] LT',
-+            nextWeek : 'dddd, LT',
-+            lastDay : '[ഇന്നലെ] LT',
-+            lastWeek : '[കഴിഞ്ഞ] dddd, LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : '%s കഴിഞ്ഞ്',
-+            past : '%s മുൻപ്',
-+            s : 'അൽപ നിമിഷങ്ങൾ',
-+            ss : '%d സെക്കൻഡ്',
-+            m : 'ഒരു മിനിറ്റ്',
-+            mm : '%d മിനിറ്റ്',
-+            h : 'ഒരു മണിക്കൂർ',
-+            hh : '%d മണിക്കൂർ',
-+            d : 'ഒരു ദിവസം',
-+            dd : '%d ദിവസം',
-+            M : 'ഒരു മാസം',
-+            MM : '%d മാസം',
-+            y : 'ഒരു വർഷം',
-+            yy : '%d വർഷം'
-+        },
-+        meridiemParse: /രാത്രി|രാവിലെ|ഉച്ച കഴിഞ്ഞ്|വൈകുന്നേരം|രാത്രി/i,
-+        meridiemHour : function (hour, meridiem) {
-+            if (hour === 12) {
-+                hour = 0;
-+            }
-+            if ((meridiem === 'രാത്രി' && hour >= 4) ||
-+                    meridiem === 'ഉച്ച കഴിഞ്ഞ്' ||
-+                    meridiem === 'വൈകുന്നേരം') {
-+                return hour + 12;
-+            } else {
-+                return hour;
-+            }
-+        },
-+        meridiem : function (hour, minute, isLower) {
-+            if (hour < 4) {
-+                return 'രാത്രി';
-+            } else if (hour < 12) {
-+                return 'രാവിലെ';
-+            } else if (hour < 17) {
-+                return 'ഉച്ച കഴിഞ്ഞ്';
-+            } else if (hour < 20) {
-+                return 'വൈകുന്നേരം';
-+            } else {
-+                return 'രാത്രി';
-+            }
-+        }
-+    });
-+
-+    return ml;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/mn.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/mn.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    function translate(number, withoutSuffix, key, isFuture) {
-+        switch (key) {
-+            case 's':
-+                return withoutSuffix ? 'хэдхэн секунд' : 'хэдхэн секундын';
-+            case 'ss':
-+                return number + (withoutSuffix ? ' секунд' : ' секундын');
-+            case 'm':
-+            case 'mm':
-+                return number + (withoutSuffix ? ' минут' : ' минутын');
-+            case 'h':
-+            case 'hh':
-+                return number + (withoutSuffix ? ' цаг' : ' цагийн');
-+            case 'd':
-+            case 'dd':
-+                return number + (withoutSuffix ? ' өдөр' : ' өдрийн');
-+            case 'M':
-+            case 'MM':
-+                return number + (withoutSuffix ? ' сар' : ' сарын');
-+            case 'y':
-+            case 'yy':
-+                return number + (withoutSuffix ? ' жил' : ' жилийн');
-+            default:
-+                return number;
-+        }
-+    }
-+
-+    var mn = moment.defineLocale('mn', {
-+        months : 'Нэгдүгээр сар_Хоёрдугаар сар_Гуравдугаар сар_Дөрөвдүгээр сар_Тавдугаар сар_Зургадугаар сар_Долдугаар сар_Наймдугаар сар_Есдүгээр сар_Аравдугаар сар_Арван нэгдүгээр сар_Арван хоёрдугаар сар'.split('_'),
-+        monthsShort : '1 сар_2 сар_3 сар_4 сар_5 сар_6 сар_7 сар_8 сар_9 сар_10 сар_11 сар_12 сар'.split('_'),
-+        monthsParseExact : true,
-+        weekdays : 'Ням_Даваа_Мягмар_Лхагва_Пүрэв_Баасан_Бямба'.split('_'),
-+        weekdaysShort : 'Ням_Дав_Мяг_Лха_Пүр_Баа_Бям'.split('_'),
-+        weekdaysMin : 'Ня_Да_Мя_Лх_Пү_Ба_Бя'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'YYYY-MM-DD',
-+            LL : 'YYYY оны MMMMын D',
-+            LLL : 'YYYY оны MMMMын D HH:mm',
-+            LLLL : 'dddd, YYYY оны MMMMын D HH:mm'
-+        },
-+        meridiemParse: /ҮӨ|ҮХ/i,
-+        isPM : function (input) {
-+            return input === 'ҮХ';
-+        },
-+        meridiem : function (hour, minute, isLower) {
-+            if (hour < 12) {
-+                return 'ҮӨ';
-+            } else {
-+                return 'ҮХ';
-+            }
-+        },
-+        calendar : {
-+            sameDay : '[Өнөөдөр] LT',
-+            nextDay : '[Маргааш] LT',
-+            nextWeek : '[Ирэх] dddd LT',
-+            lastDay : '[Өчигдөр] LT',
-+            lastWeek : '[Өнгөрсөн] dddd LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : '%s дараа',
-+            past : '%s өмнө',
-+            s : translate,
-+            ss : translate,
-+            m : translate,
-+            mm : translate,
-+            h : translate,
-+            hh : translate,
-+            d : translate,
-+            dd : translate,
-+            M : translate,
-+            MM : translate,
-+            y : translate,
-+            yy : translate
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2} өдөр/,
-+        ordinal : function (number, period) {
-+            switch (period) {
-+                case 'd':
-+                case 'D':
-+                case 'DDD':
-+                    return number + ' өдөр';
-+                default:
-+                    return number;
-+            }
-+        }
-+    });
-+
-+    return mn;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/mr.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/mr.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var symbolMap = {
-+        '1': '१',
-+        '2': '२',
-+        '3': '३',
-+        '4': '४',
-+        '5': '५',
-+        '6': '६',
-+        '7': '७',
-+        '8': '८',
-+        '9': '९',
-+        '0': '०'
-+    },
-+    numberMap = {
-+        '१': '1',
-+        '२': '2',
-+        '३': '3',
-+        '४': '4',
-+        '५': '5',
-+        '६': '6',
-+        '७': '7',
-+        '८': '8',
-+        '९': '9',
-+        '०': '0'
-+    };
-+
-+    function relativeTimeMr(number, withoutSuffix, string, isFuture)
-+    {
-+        var output = '';
-+        if (withoutSuffix) {
-+            switch (string) {
-+                case 's': output = 'काही सेकंद'; break;
-+                case 'ss': output = '%d सेकंद'; break;
-+                case 'm': output = 'एक मिनिट'; break;
-+                case 'mm': output = '%d मिनिटे'; break;
-+                case 'h': output = 'एक तास'; break;
-+                case 'hh': output = '%d तास'; break;
-+                case 'd': output = 'एक दिवस'; break;
-+                case 'dd': output = '%d दिवस'; break;
-+                case 'M': output = 'एक महिना'; break;
-+                case 'MM': output = '%d महिने'; break;
-+                case 'y': output = 'एक वर्ष'; break;
-+                case 'yy': output = '%d वर्षे'; break;
-+            }
-+        }
-+        else {
-+            switch (string) {
-+                case 's': output = 'काही सेकंदां'; break;
-+                case 'ss': output = '%d सेकंदां'; break;
-+                case 'm': output = 'एका मिनिटा'; break;
-+                case 'mm': output = '%d मिनिटां'; break;
-+                case 'h': output = 'एका तासा'; break;
-+                case 'hh': output = '%d तासां'; break;
-+                case 'd': output = 'एका दिवसा'; break;
-+                case 'dd': output = '%d दिवसां'; break;
-+                case 'M': output = 'एका महिन्या'; break;
-+                case 'MM': output = '%d महिन्यां'; break;
-+                case 'y': output = 'एका वर्षा'; break;
-+                case 'yy': output = '%d वर्षां'; break;
-+            }
-+        }
-+        return output.replace(/%d/i, number);
-+    }
-+
-+    var mr = moment.defineLocale('mr', {
-+        months : 'जानेवारी_फेब्रुवारी_मार्च_एप्रिल_मे_जून_जुलै_ऑगस्ट_सप्टेंबर_ऑक्टोबर_नोव्हेंबर_डिसेंबर'.split('_'),
-+        monthsShort: 'जाने._फेब्रु._मार्च._एप्रि._मे._जून._जुलै._ऑग._सप्टें._ऑक्टो._नोव्हें._डिसें.'.split('_'),
-+        monthsParseExact : true,
-+        weekdays : 'रविवार_सोमवार_मंगळवार_बुधवार_गुरूवार_शुक्रवार_शनिवार'.split('_'),
-+        weekdaysShort : 'रवि_सोम_मंगळ_बुध_गुरू_शुक्र_शनि'.split('_'),
-+        weekdaysMin : 'र_सो_मं_बु_गु_शु_श'.split('_'),
-+        longDateFormat : {
-+            LT : 'A h:mm वाजता',
-+            LTS : 'A h:mm:ss वाजता',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY, A h:mm वाजता',
-+            LLLL : 'dddd, D MMMM YYYY, A h:mm वाजता'
-+        },
-+        calendar : {
-+            sameDay : '[आज] LT',
-+            nextDay : '[उद्या] LT',
-+            nextWeek : 'dddd, LT',
-+            lastDay : '[काल] LT',
-+            lastWeek: '[मागील] dddd, LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future: '%sमध्ये',
-+            past: '%sपूर्वी',
-+            s: relativeTimeMr,
-+            ss: relativeTimeMr,
-+            m: relativeTimeMr,
-+            mm: relativeTimeMr,
-+            h: relativeTimeMr,
-+            hh: relativeTimeMr,
-+            d: relativeTimeMr,
-+            dd: relativeTimeMr,
-+            M: relativeTimeMr,
-+            MM: relativeTimeMr,
-+            y: relativeTimeMr,
-+            yy: relativeTimeMr
-+        },
-+        preparse: function (string) {
-+            return string.replace(/[१२३४५६७८९०]/g, function (match) {
-+                return numberMap[match];
-+            });
-+        },
-+        postformat: function (string) {
-+            return string.replace(/\d/g, function (match) {
-+                return symbolMap[match];
-+            });
-+        },
-+        meridiemParse: /रात्री|सकाळी|दुपारी|सायंकाळी/,
-+        meridiemHour : function (hour, meridiem) {
-+            if (hour === 12) {
-+                hour = 0;
-+            }
-+            if (meridiem === 'रात्री') {
-+                return hour < 4 ? hour : hour + 12;
-+            } else if (meridiem === 'सकाळी') {
-+                return hour;
-+            } else if (meridiem === 'दुपारी') {
-+                return hour >= 10 ? hour : hour + 12;
-+            } else if (meridiem === 'सायंकाळी') {
-+                return hour + 12;
-+            }
-+        },
-+        meridiem: function (hour, minute, isLower) {
-+            if (hour < 4) {
-+                return 'रात्री';
-+            } else if (hour < 10) {
-+                return 'सकाळी';
-+            } else if (hour < 17) {
-+                return 'दुपारी';
-+            } else if (hour < 20) {
-+                return 'सायंकाळी';
-+            } else {
-+                return 'रात्री';
-+            }
-+        },
-+        week : {
-+            dow : 0, // Sunday is the first day of the week.
-+            doy : 6  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return mr;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/ms-my.js":
-+/*!*********************************************!*\
-+  !*** ./node_modules/moment/locale/ms-my.js ***!
-+  \*********************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var msMy = moment.defineLocale('ms-my', {
-+        months : 'Januari_Februari_Mac_April_Mei_Jun_Julai_Ogos_September_Oktober_November_Disember'.split('_'),
-+        monthsShort : 'Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ogs_Sep_Okt_Nov_Dis'.split('_'),
-+        weekdays : 'Ahad_Isnin_Selasa_Rabu_Khamis_Jumaat_Sabtu'.split('_'),
-+        weekdaysShort : 'Ahd_Isn_Sel_Rab_Kha_Jum_Sab'.split('_'),
-+        weekdaysMin : 'Ah_Is_Sl_Rb_Km_Jm_Sb'.split('_'),
-+        longDateFormat : {
-+            LT : 'HH.mm',
-+            LTS : 'HH.mm.ss',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY [pukul] HH.mm',
-+            LLLL : 'dddd, D MMMM YYYY [pukul] HH.mm'
-+        },
-+        meridiemParse: /pagi|tengahari|petang|malam/,
-+        meridiemHour: function (hour, meridiem) {
-+            if (hour === 12) {
-+                hour = 0;
-+            }
-+            if (meridiem === 'pagi') {
-+                return hour;
-+            } else if (meridiem === 'tengahari') {
-+                return hour >= 11 ? hour : hour + 12;
-+            } else if (meridiem === 'petang' || meridiem === 'malam') {
-+                return hour + 12;
-+            }
-+        },
-+        meridiem : function (hours, minutes, isLower) {
-+            if (hours < 11) {
-+                return 'pagi';
-+            } else if (hours < 15) {
-+                return 'tengahari';
-+            } else if (hours < 19) {
-+                return 'petang';
-+            } else {
-+                return 'malam';
-+            }
-+        },
-+        calendar : {
-+            sameDay : '[Hari ini pukul] LT',
-+            nextDay : '[Esok pukul] LT',
-+            nextWeek : 'dddd [pukul] LT',
-+            lastDay : '[Kelmarin pukul] LT',
-+            lastWeek : 'dddd [lepas pukul] LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'dalam %s',
-+            past : '%s yang lepas',
-+            s : 'beberapa saat',
-+            ss : '%d saat',
-+            m : 'seminit',
-+            mm : '%d minit',
-+            h : 'sejam',
-+            hh : '%d jam',
-+            d : 'sehari',
-+            dd : '%d hari',
-+            M : 'sebulan',
-+            MM : '%d bulan',
-+            y : 'setahun',
-+            yy : '%d tahun'
-+        },
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 7  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return msMy;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/ms.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/ms.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var ms = moment.defineLocale('ms', {
-+        months : 'Januari_Februari_Mac_April_Mei_Jun_Julai_Ogos_September_Oktober_November_Disember'.split('_'),
-+        monthsShort : 'Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ogs_Sep_Okt_Nov_Dis'.split('_'),
-+        weekdays : 'Ahad_Isnin_Selasa_Rabu_Khamis_Jumaat_Sabtu'.split('_'),
-+        weekdaysShort : 'Ahd_Isn_Sel_Rab_Kha_Jum_Sab'.split('_'),
-+        weekdaysMin : 'Ah_Is_Sl_Rb_Km_Jm_Sb'.split('_'),
-+        longDateFormat : {
-+            LT : 'HH.mm',
-+            LTS : 'HH.mm.ss',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY [pukul] HH.mm',
-+            LLLL : 'dddd, D MMMM YYYY [pukul] HH.mm'
-+        },
-+        meridiemParse: /pagi|tengahari|petang|malam/,
-+        meridiemHour: function (hour, meridiem) {
-+            if (hour === 12) {
-+                hour = 0;
-+            }
-+            if (meridiem === 'pagi') {
-+                return hour;
-+            } else if (meridiem === 'tengahari') {
-+                return hour >= 11 ? hour : hour + 12;
-+            } else if (meridiem === 'petang' || meridiem === 'malam') {
-+                return hour + 12;
-+            }
-+        },
-+        meridiem : function (hours, minutes, isLower) {
-+            if (hours < 11) {
-+                return 'pagi';
-+            } else if (hours < 15) {
-+                return 'tengahari';
-+            } else if (hours < 19) {
-+                return 'petang';
-+            } else {
-+                return 'malam';
-+            }
-+        },
-+        calendar : {
-+            sameDay : '[Hari ini pukul] LT',
-+            nextDay : '[Esok pukul] LT',
-+            nextWeek : 'dddd [pukul] LT',
-+            lastDay : '[Kelmarin pukul] LT',
-+            lastWeek : 'dddd [lepas pukul] LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'dalam %s',
-+            past : '%s yang lepas',
-+            s : 'beberapa saat',
-+            ss : '%d saat',
-+            m : 'seminit',
-+            mm : '%d minit',
-+            h : 'sejam',
-+            hh : '%d jam',
-+            d : 'sehari',
-+            dd : '%d hari',
-+            M : 'sebulan',
-+            MM : '%d bulan',
-+            y : 'setahun',
-+            yy : '%d tahun'
-+        },
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 7  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return ms;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/mt.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/mt.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var mt = moment.defineLocale('mt', {
-+        months : 'Jannar_Frar_Marzu_April_Mejju_Ġunju_Lulju_Awwissu_Settembru_Ottubru_Novembru_Diċembru'.split('_'),
-+        monthsShort : 'Jan_Fra_Mar_Apr_Mej_Ġun_Lul_Aww_Set_Ott_Nov_Diċ'.split('_'),
-+        weekdays : 'Il-Ħadd_It-Tnejn_It-Tlieta_L-Erbgħa_Il-Ħamis_Il-Ġimgħa_Is-Sibt'.split('_'),
-+        weekdaysShort : 'Ħad_Tne_Tli_Erb_Ħam_Ġim_Sib'.split('_'),
-+        weekdaysMin : 'Ħa_Tn_Tl_Er_Ħa_Ġi_Si'.split('_'),
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY HH:mm',
-+            LLLL : 'dddd, D MMMM YYYY HH:mm'
-+        },
-+        calendar : {
-+            sameDay : '[Illum fil-]LT',
-+            nextDay : '[Għada fil-]LT',
-+            nextWeek : 'dddd [fil-]LT',
-+            lastDay : '[Il-bieraħ fil-]LT',
-+            lastWeek : 'dddd [li għadda] [fil-]LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'f’ %s',
-+            past : '%s ilu',
-+            s : 'ftit sekondi',
-+            ss : '%d sekondi',
-+            m : 'minuta',
-+            mm : '%d minuti',
-+            h : 'siegħa',
-+            hh : '%d siegħat',
-+            d : 'ġurnata',
-+            dd : '%d ġranet',
-+            M : 'xahar',
-+            MM : '%d xhur',
-+            y : 'sena',
-+            yy : '%d sni'
-+        },
-+        dayOfMonthOrdinalParse : /\d{1,2}º/,
-+        ordinal: '%dº',
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return mt;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/my.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/my.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var symbolMap = {
-+        '1': '၁',
-+        '2': '၂',
-+        '3': '၃',
-+        '4': '၄',
-+        '5': '၅',
-+        '6': '၆',
-+        '7': '၇',
-+        '8': '၈',
-+        '9': '၉',
-+        '0': '၀'
-+    }, numberMap = {
-+        '၁': '1',
-+        '၂': '2',
-+        '၃': '3',
-+        '၄': '4',
-+        '၅': '5',
-+        '၆': '6',
-+        '၇': '7',
-+        '၈': '8',
-+        '၉': '9',
-+        '၀': '0'
-+    };
-+
-+    var my = moment.defineLocale('my', {
-+        months: 'ဇန်နဝါရီ_ဖေဖော်ဝါရီ_မတ်_ဧပြီ_မေ_ဇွန်_ဇူလိုင်_သြဂုတ်_စက်တင်ဘာ_အောက်တိုဘာ_နိုဝင်ဘာ_ဒီဇင်ဘာ'.split('_'),
-+        monthsShort: 'ဇန်_ဖေ_မတ်_ပြီ_မေ_ဇွန်_လိုင်_သြ_စက်_အောက်_နို_ဒီ'.split('_'),
-+        weekdays: 'တနင်္ဂနွေ_တနင်္လာ_အင်္ဂါ_ဗုဒ္ဓဟူး_ကြာသပတေး_သောကြာ_စနေ'.split('_'),
-+        weekdaysShort: 'နွေ_လာ_ဂါ_ဟူး_ကြာ_သော_နေ'.split('_'),
-+        weekdaysMin: 'နွေ_လာ_ဂါ_ဟူး_ကြာ_သော_နေ'.split('_'),
-+
-+        longDateFormat: {
-+            LT: 'HH:mm',
-+            LTS: 'HH:mm:ss',
-+            L: 'DD/MM/YYYY',
-+            LL: 'D MMMM YYYY',
-+            LLL: 'D MMMM YYYY HH:mm',
-+            LLLL: 'dddd D MMMM YYYY HH:mm'
-+        },
-+        calendar: {
-+            sameDay: '[ယနေ.] LT [မှာ]',
-+            nextDay: '[မနက်ဖြန်] LT [မှာ]',
-+            nextWeek: 'dddd LT [မှာ]',
-+            lastDay: '[မနေ.က] LT [မှာ]',
-+            lastWeek: '[ပြီးခဲ့သော] dddd LT [မှာ]',
-+            sameElse: 'L'
-+        },
-+        relativeTime: {
-+            future: 'လာမည့် %s မှာ',
-+            past: 'လွန်ခဲ့သော %s က',
-+            s: 'စက္ကန်.အနည်းငယ်',
-+            ss : '%d စက္ကန့်',
-+            m: 'တစ်မိနစ်',
-+            mm: '%d မိနစ်',
-+            h: 'တစ်နာရီ',
-+            hh: '%d နာရီ',
-+            d: 'တစ်ရက်',
-+            dd: '%d ရက်',
-+            M: 'တစ်လ',
-+            MM: '%d လ',
-+            y: 'တစ်နှစ်',
-+            yy: '%d နှစ်'
-+        },
-+        preparse: function (string) {
-+            return string.replace(/[၁၂၃၄၅၆၇၈၉၀]/g, function (match) {
-+                return numberMap[match];
-+            });
-+        },
-+        postformat: function (string) {
-+            return string.replace(/\d/g, function (match) {
-+                return symbolMap[match];
-+            });
-+        },
-+        week: {
-+            dow: 1, // Monday is the first day of the week.
-+            doy: 4 // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return my;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/nb.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/nb.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var nb = moment.defineLocale('nb', {
-+        months : 'januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember'.split('_'),
-+        monthsShort : 'jan._feb._mars_april_mai_juni_juli_aug._sep._okt._nov._des.'.split('_'),
-+        monthsParseExact : true,
-+        weekdays : 'søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag'.split('_'),
-+        weekdaysShort : 'sø._ma._ti._on._to._fr._lø.'.split('_'),
-+        weekdaysMin : 'sø_ma_ti_on_to_fr_lø'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD.MM.YYYY',
-+            LL : 'D. MMMM YYYY',
-+            LLL : 'D. MMMM YYYY [kl.] HH:mm',
-+            LLLL : 'dddd D. MMMM YYYY [kl.] HH:mm'
-+        },
-+        calendar : {
-+            sameDay: '[i dag kl.] LT',
-+            nextDay: '[i morgen kl.] LT',
-+            nextWeek: 'dddd [kl.] LT',
-+            lastDay: '[i går kl.] LT',
-+            lastWeek: '[forrige] dddd [kl.] LT',
-+            sameElse: 'L'
-+        },
-+        relativeTime : {
-+            future : 'om %s',
-+            past : '%s siden',
-+            s : 'noen sekunder',
-+            ss : '%d sekunder',
-+            m : 'ett minutt',
-+            mm : '%d minutter',
-+            h : 'en time',
-+            hh : '%d timer',
-+            d : 'en dag',
-+            dd : '%d dager',
-+            M : 'en måned',
-+            MM : '%d måneder',
-+            y : 'ett år',
-+            yy : '%d år'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}\./,
-+        ordinal : '%d.',
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return nb;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/ne.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/ne.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var symbolMap = {
-+        '1': '१',
-+        '2': '२',
-+        '3': '३',
-+        '4': '४',
-+        '5': '५',
-+        '6': '६',
-+        '7': '७',
-+        '8': '८',
-+        '9': '९',
-+        '0': '०'
-+    },
-+    numberMap = {
-+        '१': '1',
-+        '२': '2',
-+        '३': '3',
-+        '४': '4',
-+        '५': '5',
-+        '६': '6',
-+        '७': '7',
-+        '८': '8',
-+        '९': '9',
-+        '०': '0'
-+    };
-+
-+    var ne = moment.defineLocale('ne', {
-+        months : 'जनवरी_फेब्रुवरी_मार्च_अप्रिल_मई_जुन_जुलाई_अगष्ट_सेप्टेम्बर_अक्टोबर_नोभेम्बर_डिसेम्बर'.split('_'),
-+        monthsShort : 'जन._फेब्रु._मार्च_अप्रि._मई_जुन_जुलाई._अग._सेप्ट._अक्टो._नोभे._डिसे.'.split('_'),
-+        monthsParseExact : true,
-+        weekdays : 'आइतबार_सोमबार_मङ्गलबार_बुधबार_बिहिबार_शुक्रबार_शनिबार'.split('_'),
-+        weekdaysShort : 'आइत._सोम._मङ्गल._बुध._बिहि._शुक्र._शनि.'.split('_'),
-+        weekdaysMin : 'आ._सो._मं._बु._बि._शु._श.'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat : {
-+            LT : 'Aको h:mm बजे',
-+            LTS : 'Aको h:mm:ss बजे',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY, Aको h:mm बजे',
-+            LLLL : 'dddd, D MMMM YYYY, Aको h:mm बजे'
-+        },
-+        preparse: function (string) {
-+            return string.replace(/[१२३४५६७८९०]/g, function (match) {
-+                return numberMap[match];
-+            });
-+        },
-+        postformat: function (string) {
-+            return string.replace(/\d/g, function (match) {
-+                return symbolMap[match];
-+            });
-+        },
-+        meridiemParse: /राति|बिहान|दिउँसो|साँझ/,
-+        meridiemHour : function (hour, meridiem) {
-+            if (hour === 12) {
-+                hour = 0;
-+            }
-+            if (meridiem === 'राति') {
-+                return hour < 4 ? hour : hour + 12;
-+            } else if (meridiem === 'बिहान') {
-+                return hour;
-+            } else if (meridiem === 'दिउँसो') {
-+                return hour >= 10 ? hour : hour + 12;
-+            } else if (meridiem === 'साँझ') {
-+                return hour + 12;
-+            }
-+        },
-+        meridiem : function (hour, minute, isLower) {
-+            if (hour < 3) {
-+                return 'राति';
-+            } else if (hour < 12) {
-+                return 'बिहान';
-+            } else if (hour < 16) {
-+                return 'दिउँसो';
-+            } else if (hour < 20) {
-+                return 'साँझ';
-+            } else {
-+                return 'राति';
-+            }
-+        },
-+        calendar : {
-+            sameDay : '[आज] LT',
-+            nextDay : '[भोलि] LT',
-+            nextWeek : '[आउँदो] dddd[,] LT',
-+            lastDay : '[हिजो] LT',
-+            lastWeek : '[गएको] dddd[,] LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : '%sमा',
-+            past : '%s अगाडि',
-+            s : 'केही क्षण',
-+            ss : '%d सेकेण्ड',
-+            m : 'एक मिनेट',
-+            mm : '%d मिनेट',
-+            h : 'एक घण्टा',
-+            hh : '%d घण्टा',
-+            d : 'एक दिन',
-+            dd : '%d दिन',
-+            M : 'एक महिना',
-+            MM : '%d महिना',
-+            y : 'एक बर्ष',
-+            yy : '%d बर्ष'
-+        },
-+        week : {
-+            dow : 0, // Sunday is the first day of the week.
-+            doy : 6  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return ne;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/nl-be.js":
-+/*!*********************************************!*\
-+  !*** ./node_modules/moment/locale/nl-be.js ***!
-+  \*********************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var monthsShortWithDots = 'jan._feb._mrt._apr._mei_jun._jul._aug._sep._okt._nov._dec.'.split('_'),
-+        monthsShortWithoutDots = 'jan_feb_mrt_apr_mei_jun_jul_aug_sep_okt_nov_dec'.split('_');
-+
-+    var monthsParse = [/^jan/i, /^feb/i, /^maart|mrt.?$/i, /^apr/i, /^mei$/i, /^jun[i.]?$/i, /^jul[i.]?$/i, /^aug/i, /^sep/i, /^okt/i, /^nov/i, /^dec/i];
-+    var monthsRegex = /^(januari|februari|maart|april|mei|april|ju[nl]i|augustus|september|oktober|november|december|jan\.?|feb\.?|mrt\.?|apr\.?|ju[nl]\.?|aug\.?|sep\.?|okt\.?|nov\.?|dec\.?)/i;
-+
-+    var nlBe = moment.defineLocale('nl-be', {
-+        months : 'januari_februari_maart_april_mei_juni_juli_augustus_september_oktober_november_december'.split('_'),
-+        monthsShort : function (m, format) {
-+            if (!m) {
-+                return monthsShortWithDots;
-+            } else if (/-MMM-/.test(format)) {
-+                return monthsShortWithoutDots[m.month()];
-+            } else {
-+                return monthsShortWithDots[m.month()];
-+            }
-+        },
-+
-+        monthsRegex: monthsRegex,
-+        monthsShortRegex: monthsRegex,
-+        monthsStrictRegex: /^(januari|februari|maart|mei|ju[nl]i|april|augustus|september|oktober|november|december)/i,
-+        monthsShortStrictRegex: /^(jan\.?|feb\.?|mrt\.?|apr\.?|mei|ju[nl]\.?|aug\.?|sep\.?|okt\.?|nov\.?|dec\.?)/i,
-+
-+        monthsParse : monthsParse,
-+        longMonthsParse : monthsParse,
-+        shortMonthsParse : monthsParse,
-+
-+        weekdays : 'zondag_maandag_dinsdag_woensdag_donderdag_vrijdag_zaterdag'.split('_'),
-+        weekdaysShort : 'zo._ma._di._wo._do._vr._za.'.split('_'),
-+        weekdaysMin : 'zo_ma_di_wo_do_vr_za'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY HH:mm',
-+            LLLL : 'dddd D MMMM YYYY HH:mm'
-+        },
-+        calendar : {
-+            sameDay: '[vandaag om] LT',
-+            nextDay: '[morgen om] LT',
-+            nextWeek: 'dddd [om] LT',
-+            lastDay: '[gisteren om] LT',
-+            lastWeek: '[afgelopen] dddd [om] LT',
-+            sameElse: 'L'
-+        },
-+        relativeTime : {
-+            future : 'over %s',
-+            past : '%s geleden',
-+            s : 'een paar seconden',
-+            ss : '%d seconden',
-+            m : 'één minuut',
-+            mm : '%d minuten',
-+            h : 'één uur',
-+            hh : '%d uur',
-+            d : 'één dag',
-+            dd : '%d dagen',
-+            M : 'één maand',
-+            MM : '%d maanden',
-+            y : 'één jaar',
-+            yy : '%d jaar'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}(ste|de)/,
-+        ordinal : function (number) {
-+            return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de');
-+        },
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return nlBe;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/nl.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/nl.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var monthsShortWithDots = 'jan._feb._mrt._apr._mei_jun._jul._aug._sep._okt._nov._dec.'.split('_'),
-+        monthsShortWithoutDots = 'jan_feb_mrt_apr_mei_jun_jul_aug_sep_okt_nov_dec'.split('_');
-+
-+    var monthsParse = [/^jan/i, /^feb/i, /^maart|mrt.?$/i, /^apr/i, /^mei$/i, /^jun[i.]?$/i, /^jul[i.]?$/i, /^aug/i, /^sep/i, /^okt/i, /^nov/i, /^dec/i];
-+    var monthsRegex = /^(januari|februari|maart|april|mei|april|ju[nl]i|augustus|september|oktober|november|december|jan\.?|feb\.?|mrt\.?|apr\.?|ju[nl]\.?|aug\.?|sep\.?|okt\.?|nov\.?|dec\.?)/i;
-+
-+    var nl = moment.defineLocale('nl', {
-+        months : 'januari_februari_maart_april_mei_juni_juli_augustus_september_oktober_november_december'.split('_'),
-+        monthsShort : function (m, format) {
-+            if (!m) {
-+                return monthsShortWithDots;
-+            } else if (/-MMM-/.test(format)) {
-+                return monthsShortWithoutDots[m.month()];
-+            } else {
-+                return monthsShortWithDots[m.month()];
-+            }
-+        },
-+
-+        monthsRegex: monthsRegex,
-+        monthsShortRegex: monthsRegex,
-+        monthsStrictRegex: /^(januari|februari|maart|mei|ju[nl]i|april|augustus|september|oktober|november|december)/i,
-+        monthsShortStrictRegex: /^(jan\.?|feb\.?|mrt\.?|apr\.?|mei|ju[nl]\.?|aug\.?|sep\.?|okt\.?|nov\.?|dec\.?)/i,
-+
-+        monthsParse : monthsParse,
-+        longMonthsParse : monthsParse,
-+        shortMonthsParse : monthsParse,
-+
-+        weekdays : 'zondag_maandag_dinsdag_woensdag_donderdag_vrijdag_zaterdag'.split('_'),
-+        weekdaysShort : 'zo._ma._di._wo._do._vr._za.'.split('_'),
-+        weekdaysMin : 'zo_ma_di_wo_do_vr_za'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD-MM-YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY HH:mm',
-+            LLLL : 'dddd D MMMM YYYY HH:mm'
-+        },
-+        calendar : {
-+            sameDay: '[vandaag om] LT',
-+            nextDay: '[morgen om] LT',
-+            nextWeek: 'dddd [om] LT',
-+            lastDay: '[gisteren om] LT',
-+            lastWeek: '[afgelopen] dddd [om] LT',
-+            sameElse: 'L'
-+        },
-+        relativeTime : {
-+            future : 'over %s',
-+            past : '%s geleden',
-+            s : 'een paar seconden',
-+            ss : '%d seconden',
-+            m : 'één minuut',
-+            mm : '%d minuten',
-+            h : 'één uur',
-+            hh : '%d uur',
-+            d : 'één dag',
-+            dd : '%d dagen',
-+            M : 'één maand',
-+            MM : '%d maanden',
-+            y : 'één jaar',
-+            yy : '%d jaar'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}(ste|de)/,
-+        ordinal : function (number) {
-+            return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de');
-+        },
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return nl;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/nn.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/nn.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var nn = moment.defineLocale('nn', {
-+        months : 'januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember'.split('_'),
-+        monthsShort : 'jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_'),
-+        weekdays : 'sundag_måndag_tysdag_onsdag_torsdag_fredag_laurdag'.split('_'),
-+        weekdaysShort : 'sun_mån_tys_ons_tor_fre_lau'.split('_'),
-+        weekdaysMin : 'su_må_ty_on_to_fr_lø'.split('_'),
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD.MM.YYYY',
-+            LL : 'D. MMMM YYYY',
-+            LLL : 'D. MMMM YYYY [kl.] H:mm',
-+            LLLL : 'dddd D. MMMM YYYY [kl.] HH:mm'
-+        },
-+        calendar : {
-+            sameDay: '[I dag klokka] LT',
-+            nextDay: '[I morgon klokka] LT',
-+            nextWeek: 'dddd [klokka] LT',
-+            lastDay: '[I går klokka] LT',
-+            lastWeek: '[Føregåande] dddd [klokka] LT',
-+            sameElse: 'L'
-+        },
-+        relativeTime : {
-+            future : 'om %s',
-+            past : '%s sidan',
-+            s : 'nokre sekund',
-+            ss : '%d sekund',
-+            m : 'eit minutt',
-+            mm : '%d minutt',
-+            h : 'ein time',
-+            hh : '%d timar',
-+            d : 'ein dag',
-+            dd : '%d dagar',
-+            M : 'ein månad',
-+            MM : '%d månader',
-+            y : 'eit år',
-+            yy : '%d år'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}\./,
-+        ordinal : '%d.',
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return nn;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/pa-in.js":
-+/*!*********************************************!*\
-+  !*** ./node_modules/moment/locale/pa-in.js ***!
-+  \*********************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var symbolMap = {
-+        '1': '੧',
-+        '2': '੨',
-+        '3': '੩',
-+        '4': '੪',
-+        '5': '੫',
-+        '6': '੬',
-+        '7': '੭',
-+        '8': '੮',
-+        '9': '੯',
-+        '0': '੦'
-+    },
-+    numberMap = {
-+        '੧': '1',
-+        '੨': '2',
-+        '੩': '3',
-+        '੪': '4',
-+        '੫': '5',
-+        '੬': '6',
-+        '੭': '7',
-+        '੮': '8',
-+        '੯': '9',
-+        '੦': '0'
-+    };
-+
-+    var paIn = moment.defineLocale('pa-in', {
-+        // There are months name as per Nanakshahi Calender but they are not used as rigidly in modern Punjabi.
-+        months : 'ਜਨਵਰੀ_ਫ਼ਰਵਰੀ_ਮਾਰਚ_ਅਪ੍ਰੈਲ_ਮਈ_ਜੂਨ_ਜੁਲਾਈ_ਅਗਸਤ_ਸਤੰਬਰ_ਅਕਤੂਬਰ_ਨਵੰਬਰ_ਦਸੰਬਰ'.split('_'),
-+        monthsShort : 'ਜਨਵਰੀ_ਫ਼ਰਵਰੀ_ਮਾਰਚ_ਅਪ੍ਰੈਲ_ਮਈ_ਜੂਨ_ਜੁਲਾਈ_ਅਗਸਤ_ਸਤੰਬਰ_ਅਕਤੂਬਰ_ਨਵੰਬਰ_ਦਸੰਬਰ'.split('_'),
-+        weekdays : 'ਐਤਵਾਰ_ਸੋਮਵਾਰ_ਮੰਗਲਵਾਰ_ਬੁਧਵਾਰ_ਵੀਰਵਾਰ_ਸ਼ੁੱਕਰਵਾਰ_ਸ਼ਨੀਚਰਵਾਰ'.split('_'),
-+        weekdaysShort : 'ਐਤ_ਸੋਮ_ਮੰਗਲ_ਬੁਧ_ਵੀਰ_ਸ਼ੁਕਰ_ਸ਼ਨੀ'.split('_'),
-+        weekdaysMin : 'ਐਤ_ਸੋਮ_ਮੰਗਲ_ਬੁਧ_ਵੀਰ_ਸ਼ੁਕਰ_ਸ਼ਨੀ'.split('_'),
-+        longDateFormat : {
-+            LT : 'A h:mm ਵਜੇ',
-+            LTS : 'A h:mm:ss ਵਜੇ',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY, A h:mm ਵਜੇ',
-+            LLLL : 'dddd, D MMMM YYYY, A h:mm ਵਜੇ'
-+        },
-+        calendar : {
-+            sameDay : '[ਅਜ] LT',
-+            nextDay : '[ਕਲ] LT',
-+            nextWeek : 'dddd, LT',
-+            lastDay : '[ਕਲ] LT',
-+            lastWeek : '[ਪਿਛਲੇ] dddd, LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : '%s ਵਿੱਚ',
-+            past : '%s ਪਿਛਲੇ',
-+            s : 'ਕੁਝ ਸਕਿੰਟ',
-+            ss : '%d ਸਕਿੰਟ',
-+            m : 'ਇਕ ਮਿੰਟ',
-+            mm : '%d ਮਿੰਟ',
-+            h : 'ਇੱਕ ਘੰਟਾ',
-+            hh : '%d ਘੰਟੇ',
-+            d : 'ਇੱਕ ਦਿਨ',
-+            dd : '%d ਦਿਨ',
-+            M : 'ਇੱਕ ਮਹੀਨਾ',
-+            MM : '%d ਮਹੀਨੇ',
-+            y : 'ਇੱਕ ਸਾਲ',
-+            yy : '%d ਸਾਲ'
-+        },
-+        preparse: function (string) {
-+            return string.replace(/[੧੨੩੪੫੬੭੮੯੦]/g, function (match) {
-+                return numberMap[match];
-+            });
-+        },
-+        postformat: function (string) {
-+            return string.replace(/\d/g, function (match) {
-+                return symbolMap[match];
-+            });
-+        },
-+        // Punjabi notation for meridiems are quite fuzzy in practice. While there exists
-+        // a rigid notion of a 'Pahar' it is not used as rigidly in modern Punjabi.
-+        meridiemParse: /ਰਾਤ|ਸਵੇਰ|ਦੁਪਹਿਰ|ਸ਼ਾਮ/,
-+        meridiemHour : function (hour, meridiem) {
-+            if (hour === 12) {
-+                hour = 0;
-+            }
-+            if (meridiem === 'ਰਾਤ') {
-+                return hour < 4 ? hour : hour + 12;
-+            } else if (meridiem === 'ਸਵੇਰ') {
-+                return hour;
-+            } else if (meridiem === 'ਦੁਪਹਿਰ') {
-+                return hour >= 10 ? hour : hour + 12;
-+            } else if (meridiem === 'ਸ਼ਾਮ') {
-+                return hour + 12;
-+            }
-+        },
-+        meridiem : function (hour, minute, isLower) {
-+            if (hour < 4) {
-+                return 'ਰਾਤ';
-+            } else if (hour < 10) {
-+                return 'ਸਵੇਰ';
-+            } else if (hour < 17) {
-+                return 'ਦੁਪਹਿਰ';
-+            } else if (hour < 20) {
-+                return 'ਸ਼ਾਮ';
-+            } else {
-+                return 'ਰਾਤ';
-+            }
-+        },
-+        week : {
-+            dow : 0, // Sunday is the first day of the week.
-+            doy : 6  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return paIn;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/pl.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/pl.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var monthsNominative = 'styczeń_luty_marzec_kwiecień_maj_czerwiec_lipiec_sierpień_wrzesień_październik_listopad_grudzień'.split('_'),
-+        monthsSubjective = 'stycznia_lutego_marca_kwietnia_maja_czerwca_lipca_sierpnia_września_października_listopada_grudnia'.split('_');
-+    function plural(n) {
-+        return (n % 10 < 5) && (n % 10 > 1) && ((~~(n / 10) % 10) !== 1);
-+    }
-+    function translate(number, withoutSuffix, key) {
-+        var result = number + ' ';
-+        switch (key) {
-+            case 'ss':
-+                return result + (plural(number) ? 'sekundy' : 'sekund');
-+            case 'm':
-+                return withoutSuffix ? 'minuta' : 'minutę';
-+            case 'mm':
-+                return result + (plural(number) ? 'minuty' : 'minut');
-+            case 'h':
-+                return withoutSuffix  ? 'godzina'  : 'godzinę';
-+            case 'hh':
-+                return result + (plural(number) ? 'godziny' : 'godzin');
-+            case 'MM':
-+                return result + (plural(number) ? 'miesiące' : 'miesięcy');
-+            case 'yy':
-+                return result + (plural(number) ? 'lata' : 'lat');
-+        }
-+    }
-+
-+    var pl = moment.defineLocale('pl', {
-+        months : function (momentToFormat, format) {
-+            if (!momentToFormat) {
-+                return monthsNominative;
-+            } else if (format === '') {
-+                // Hack: if format empty we know this is used to generate
-+                // RegExp by moment. Give then back both valid forms of months
-+                // in RegExp ready format.
-+                return '(' + monthsSubjective[momentToFormat.month()] + '|' + monthsNominative[momentToFormat.month()] + ')';
-+            } else if (/D MMMM/.test(format)) {
-+                return monthsSubjective[momentToFormat.month()];
-+            } else {
-+                return monthsNominative[momentToFormat.month()];
-+            }
-+        },
-+        monthsShort : 'sty_lut_mar_kwi_maj_cze_lip_sie_wrz_paź_lis_gru'.split('_'),
-+        weekdays : 'niedziela_poniedziałek_wtorek_środa_czwartek_piątek_sobota'.split('_'),
-+        weekdaysShort : 'ndz_pon_wt_śr_czw_pt_sob'.split('_'),
-+        weekdaysMin : 'Nd_Pn_Wt_Śr_Cz_Pt_So'.split('_'),
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD.MM.YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY HH:mm',
-+            LLLL : 'dddd, D MMMM YYYY HH:mm'
-+        },
-+        calendar : {
-+            sameDay: '[Dziś o] LT',
-+            nextDay: '[Jutro o] LT',
-+            nextWeek: function () {
-+                switch (this.day()) {
-+                    case 0:
-+                        return '[W niedzielę o] LT';
-+
-+                    case 2:
-+                        return '[We wtorek o] LT';
-+
-+                    case 3:
-+                        return '[W środę o] LT';
-+
-+                    case 6:
-+                        return '[W sobotę o] LT';
-+
-+                    default:
-+                        return '[W] dddd [o] LT';
-+                }
-+            },
-+            lastDay: '[Wczoraj o] LT',
-+            lastWeek: function () {
-+                switch (this.day()) {
-+                    case 0:
-+                        return '[W zeszłą niedzielę o] LT';
-+                    case 3:
-+                        return '[W zeszłą środę o] LT';
-+                    case 6:
-+                        return '[W zeszłą sobotę o] LT';
-+                    default:
-+                        return '[W zeszły] dddd [o] LT';
-+                }
-+            },
-+            sameElse: 'L'
-+        },
-+        relativeTime : {
-+            future : 'za %s',
-+            past : '%s temu',
-+            s : 'kilka sekund',
-+            ss : translate,
-+            m : translate,
-+            mm : translate,
-+            h : translate,
-+            hh : translate,
-+            d : '1 dzień',
-+            dd : '%d dni',
-+            M : 'miesiąc',
-+            MM : translate,
-+            y : 'rok',
-+            yy : translate
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}\./,
-+        ordinal : '%d.',
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return pl;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/pt-br.js":
-+/*!*********************************************!*\
-+  !*** ./node_modules/moment/locale/pt-br.js ***!
-+  \*********************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var ptBr = moment.defineLocale('pt-br', {
-+        months : 'janeiro_fevereiro_março_abril_maio_junho_julho_agosto_setembro_outubro_novembro_dezembro'.split('_'),
-+        monthsShort : 'jan_fev_mar_abr_mai_jun_jul_ago_set_out_nov_dez'.split('_'),
-+        weekdays : 'Domingo_Segunda-feira_Terça-feira_Quarta-feira_Quinta-feira_Sexta-feira_Sábado'.split('_'),
-+        weekdaysShort : 'Dom_Seg_Ter_Qua_Qui_Sex_Sáb'.split('_'),
-+        weekdaysMin : 'Do_2ª_3ª_4ª_5ª_6ª_Sá'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D [de] MMMM [de] YYYY',
-+            LLL : 'D [de] MMMM [de] YYYY [às] HH:mm',
-+            LLLL : 'dddd, D [de] MMMM [de] YYYY [às] HH:mm'
-+        },
-+        calendar : {
-+            sameDay: '[Hoje às] LT',
-+            nextDay: '[Amanhã às] LT',
-+            nextWeek: 'dddd [às] LT',
-+            lastDay: '[Ontem às] LT',
-+            lastWeek: function () {
-+                return (this.day() === 0 || this.day() === 6) ?
-+                    '[Último] dddd [às] LT' : // Saturday + Sunday
-+                    '[Última] dddd [às] LT'; // Monday - Friday
-+            },
-+            sameElse: 'L'
-+        },
-+        relativeTime : {
-+            future : 'em %s',
-+            past : 'há %s',
-+            s : 'poucos segundos',
-+            ss : '%d segundos',
-+            m : 'um minuto',
-+            mm : '%d minutos',
-+            h : 'uma hora',
-+            hh : '%d horas',
-+            d : 'um dia',
-+            dd : '%d dias',
-+            M : 'um mês',
-+            MM : '%d meses',
-+            y : 'um ano',
-+            yy : '%d anos'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}º/,
-+        ordinal : '%dº'
-+    });
-+
-+    return ptBr;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/pt.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/pt.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var pt = moment.defineLocale('pt', {
-+        months : 'janeiro_fevereiro_março_abril_maio_junho_julho_agosto_setembro_outubro_novembro_dezembro'.split('_'),
-+        monthsShort : 'jan_fev_mar_abr_mai_jun_jul_ago_set_out_nov_dez'.split('_'),
-+        weekdays : 'Domingo_Segunda-feira_Terça-feira_Quarta-feira_Quinta-feira_Sexta-feira_Sábado'.split('_'),
-+        weekdaysShort : 'Dom_Seg_Ter_Qua_Qui_Sex_Sáb'.split('_'),
-+        weekdaysMin : 'Do_2ª_3ª_4ª_5ª_6ª_Sá'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D [de] MMMM [de] YYYY',
-+            LLL : 'D [de] MMMM [de] YYYY HH:mm',
-+            LLLL : 'dddd, D [de] MMMM [de] YYYY HH:mm'
-+        },
-+        calendar : {
-+            sameDay: '[Hoje às] LT',
-+            nextDay: '[Amanhã às] LT',
-+            nextWeek: 'dddd [às] LT',
-+            lastDay: '[Ontem às] LT',
-+            lastWeek: function () {
-+                return (this.day() === 0 || this.day() === 6) ?
-+                    '[Último] dddd [às] LT' : // Saturday + Sunday
-+                    '[Última] dddd [às] LT'; // Monday - Friday
-+            },
-+            sameElse: 'L'
-+        },
-+        relativeTime : {
-+            future : 'em %s',
-+            past : 'há %s',
-+            s : 'segundos',
-+            ss : '%d segundos',
-+            m : 'um minuto',
-+            mm : '%d minutos',
-+            h : 'uma hora',
-+            hh : '%d horas',
-+            d : 'um dia',
-+            dd : '%d dias',
-+            M : 'um mês',
-+            MM : '%d meses',
-+            y : 'um ano',
-+            yy : '%d anos'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}º/,
-+        ordinal : '%dº',
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return pt;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/ro.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/ro.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    function relativeTimeWithPlural(number, withoutSuffix, key) {
-+        var format = {
-+                'ss': 'secunde',
-+                'mm': 'minute',
-+                'hh': 'ore',
-+                'dd': 'zile',
-+                'MM': 'luni',
-+                'yy': 'ani'
-+            },
-+            separator = ' ';
-+        if (number % 100 >= 20 || (number >= 100 && number % 100 === 0)) {
-+            separator = ' de ';
-+        }
-+        return number + separator + format[key];
-+    }
-+
-+    var ro = moment.defineLocale('ro', {
-+        months : 'ianuarie_februarie_martie_aprilie_mai_iunie_iulie_august_septembrie_octombrie_noiembrie_decembrie'.split('_'),
-+        monthsShort : 'ian._febr._mart._apr._mai_iun._iul._aug._sept._oct._nov._dec.'.split('_'),
-+        monthsParseExact: true,
-+        weekdays : 'duminică_luni_marți_miercuri_joi_vineri_sâmbătă'.split('_'),
-+        weekdaysShort : 'Dum_Lun_Mar_Mie_Joi_Vin_Sâm'.split('_'),
-+        weekdaysMin : 'Du_Lu_Ma_Mi_Jo_Vi_Sâ'.split('_'),
-+        longDateFormat : {
-+            LT : 'H:mm',
-+            LTS : 'H:mm:ss',
-+            L : 'DD.MM.YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY H:mm',
-+            LLLL : 'dddd, D MMMM YYYY H:mm'
-+        },
-+        calendar : {
-+            sameDay: '[azi la] LT',
-+            nextDay: '[mâine la] LT',
-+            nextWeek: 'dddd [la] LT',
-+            lastDay: '[ieri la] LT',
-+            lastWeek: '[fosta] dddd [la] LT',
-+            sameElse: 'L'
-+        },
-+        relativeTime : {
-+            future : 'peste %s',
-+            past : '%s în urmă',
-+            s : 'câteva secunde',
-+            ss : relativeTimeWithPlural,
-+            m : 'un minut',
-+            mm : relativeTimeWithPlural,
-+            h : 'o oră',
-+            hh : relativeTimeWithPlural,
-+            d : 'o zi',
-+            dd : relativeTimeWithPlural,
-+            M : 'o lună',
-+            MM : relativeTimeWithPlural,
-+            y : 'un an',
-+            yy : relativeTimeWithPlural
-+        },
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 7  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return ro;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/ru.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/ru.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    function plural(word, num) {
-+        var forms = word.split('_');
-+        return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]);
-+    }
-+    function relativeTimeWithPlural(number, withoutSuffix, key) {
-+        var format = {
-+            'ss': withoutSuffix ? 'секунда_секунды_секунд' : 'секунду_секунды_секунд',
-+            'mm': withoutSuffix ? 'минута_минуты_минут' : 'минуту_минуты_минут',
-+            'hh': 'час_часа_часов',
-+            'dd': 'день_дня_дней',
-+            'MM': 'месяц_месяца_месяцев',
-+            'yy': 'год_года_лет'
-+        };
-+        if (key === 'm') {
-+            return withoutSuffix ? 'минута' : 'минуту';
-+        }
-+        else {
-+            return number + ' ' + plural(format[key], +number);
-+        }
-+    }
-+    var monthsParse = [/^янв/i, /^фев/i, /^мар/i, /^апр/i, /^ма[йя]/i, /^июн/i, /^июл/i, /^авг/i, /^сен/i, /^окт/i, /^ноя/i, /^дек/i];
-+
-+    // http://new.gramota.ru/spravka/rules/139-prop : § 103
-+    // Сокращения месяцев: http://new.gramota.ru/spravka/buro/search-answer?s=242637
-+    // CLDR data:          http://www.unicode.org/cldr/charts/28/summary/ru.html#1753
-+    var ru = moment.defineLocale('ru', {
-+        months : {
-+            format: 'января_февраля_марта_апреля_мая_июня_июля_августа_сентября_октября_ноября_декабря'.split('_'),
-+            standalone: 'январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь'.split('_')
-+        },
-+        monthsShort : {
-+            // по CLDR именно "июл." и "июн.", но какой смысл менять букву на точку ?
-+            format: 'янв._февр._мар._апр._мая_июня_июля_авг._сент._окт._нояб._дек.'.split('_'),
-+            standalone: 'янв._февр._март_апр._май_июнь_июль_авг._сент._окт._нояб._дек.'.split('_')
-+        },
-+        weekdays : {
-+            standalone: 'воскресенье_понедельник_вторник_среда_четверг_пятница_суббота'.split('_'),
-+            format: 'воскресенье_понедельник_вторник_среду_четверг_пятницу_субботу'.split('_'),
-+            isFormat: /\[ ?[Вв] ?(?:прошлую|следующую|эту)? ?\] ?dddd/
-+        },
-+        weekdaysShort : 'вс_пн_вт_ср_чт_пт_сб'.split('_'),
-+        weekdaysMin : 'вс_пн_вт_ср_чт_пт_сб'.split('_'),
-+        monthsParse : monthsParse,
-+        longMonthsParse : monthsParse,
-+        shortMonthsParse : monthsParse,
-+
-+        // полные названия с падежами, по три буквы, для некоторых, по 4 буквы, сокращения с точкой и без точки
-+        monthsRegex: /^(январ[ья]|янв\.?|феврал[ья]|февр?\.?|марта?|мар\.?|апрел[ья]|апр\.?|ма[йя]|июн[ья]|июн\.?|июл[ья]|июл\.?|августа?|авг\.?|сентябр[ья]|сент?\.?|октябр[ья]|окт\.?|ноябр[ья]|нояб?\.?|декабр[ья]|дек\.?)/i,
-+
-+        // копия предыдущего
-+        monthsShortRegex: /^(январ[ья]|янв\.?|феврал[ья]|февр?\.?|марта?|мар\.?|апрел[ья]|апр\.?|ма[йя]|июн[ья]|июн\.?|июл[ья]|июл\.?|августа?|авг\.?|сентябр[ья]|сент?\.?|октябр[ья]|окт\.?|ноябр[ья]|нояб?\.?|декабр[ья]|дек\.?)/i,
-+
-+        // полные названия с падежами
-+        monthsStrictRegex: /^(январ[яь]|феврал[яь]|марта?|апрел[яь]|ма[яй]|июн[яь]|июл[яь]|августа?|сентябр[яь]|октябр[яь]|ноябр[яь]|декабр[яь])/i,
-+
-+        // Выражение, которое соотвествует только сокращённым формам
-+        monthsShortStrictRegex: /^(янв\.|февр?\.|мар[т.]|апр\.|ма[яй]|июн[ья.]|июл[ья.]|авг\.|сент?\.|окт\.|нояб?\.|дек\.)/i,
-+        longDateFormat : {
-+            LT : 'H:mm',
-+            LTS : 'H:mm:ss',
-+            L : 'DD.MM.YYYY',
-+            LL : 'D MMMM YYYY г.',
-+            LLL : 'D MMMM YYYY г., H:mm',
-+            LLLL : 'dddd, D MMMM YYYY г., H:mm'
-+        },
-+        calendar : {
-+            sameDay: '[Сегодня, в] LT',
-+            nextDay: '[Завтра, в] LT',
-+            lastDay: '[Вчера, в] LT',
-+            nextWeek: function (now) {
-+                if (now.week() !== this.week()) {
-+                    switch (this.day()) {
-+                        case 0:
-+                            return '[В следующее] dddd, [в] LT';
-+                        case 1:
-+                        case 2:
-+                        case 4:
-+                            return '[В следующий] dddd, [в] LT';
-+                        case 3:
-+                        case 5:
-+                        case 6:
-+                            return '[В следующую] dddd, [в] LT';
-+                    }
-+                } else {
-+                    if (this.day() === 2) {
-+                        return '[Во] dddd, [в] LT';
-+                    } else {
-+                        return '[В] dddd, [в] LT';
-+                    }
-+                }
-+            },
-+            lastWeek: function (now) {
-+                if (now.week() !== this.week()) {
-+                    switch (this.day()) {
-+                        case 0:
-+                            return '[В прошлое] dddd, [в] LT';
-+                        case 1:
-+                        case 2:
-+                        case 4:
-+                            return '[В прошлый] dddd, [в] LT';
-+                        case 3:
-+                        case 5:
-+                        case 6:
-+                            return '[В прошлую] dddd, [в] LT';
-+                    }
-+                } else {
-+                    if (this.day() === 2) {
-+                        return '[Во] dddd, [в] LT';
-+                    } else {
-+                        return '[В] dddd, [в] LT';
-+                    }
-+                }
-+            },
-+            sameElse: 'L'
-+        },
-+        relativeTime : {
-+            future : 'через %s',
-+            past : '%s назад',
-+            s : 'несколько секунд',
-+            ss : relativeTimeWithPlural,
-+            m : relativeTimeWithPlural,
-+            mm : relativeTimeWithPlural,
-+            h : 'час',
-+            hh : relativeTimeWithPlural,
-+            d : 'день',
-+            dd : relativeTimeWithPlural,
-+            M : 'месяц',
-+            MM : relativeTimeWithPlural,
-+            y : 'год',
-+            yy : relativeTimeWithPlural
-+        },
-+        meridiemParse: /ночи|утра|дня|вечера/i,
-+        isPM : function (input) {
-+            return /^(дня|вечера)$/.test(input);
-+        },
-+        meridiem : function (hour, minute, isLower) {
-+            if (hour < 4) {
-+                return 'ночи';
-+            } else if (hour < 12) {
-+                return 'утра';
-+            } else if (hour < 17) {
-+                return 'дня';
-+            } else {
-+                return 'вечера';
-+            }
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}-(й|го|я)/,
-+        ordinal: function (number, period) {
-+            switch (period) {
-+                case 'M':
-+                case 'd':
-+                case 'DDD':
-+                    return number + '-й';
-+                case 'D':
-+                    return number + '-го';
-+                case 'w':
-+                case 'W':
-+                    return number + '-я';
-+                default:
-+                    return number;
-+            }
-+        },
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return ru;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/sd.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/sd.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var months = [
-+        'جنوري',
-+        'فيبروري',
-+        'مارچ',
-+        'اپريل',
-+        'مئي',
-+        'جون',
-+        'جولاءِ',
-+        'آگسٽ',
-+        'سيپٽمبر',
-+        'آڪٽوبر',
-+        'نومبر',
-+        'ڊسمبر'
-+    ];
-+    var days = [
-+        'آچر',
-+        'سومر',
-+        'اڱارو',
-+        'اربع',
-+        'خميس',
-+        'جمع',
-+        'ڇنڇر'
-+    ];
-+
-+    var sd = moment.defineLocale('sd', {
-+        months : months,
-+        monthsShort : months,
-+        weekdays : days,
-+        weekdaysShort : days,
-+        weekdaysMin : days,
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY HH:mm',
-+            LLLL : 'dddd، D MMMM YYYY HH:mm'
-+        },
-+        meridiemParse: /صبح|شام/,
-+        isPM : function (input) {
-+            return 'شام' === input;
-+        },
-+        meridiem : function (hour, minute, isLower) {
-+            if (hour < 12) {
-+                return 'صبح';
-+            }
-+            return 'شام';
-+        },
-+        calendar : {
-+            sameDay : '[اڄ] LT',
-+            nextDay : '[سڀاڻي] LT',
-+            nextWeek : 'dddd [اڳين هفتي تي] LT',
-+            lastDay : '[ڪالهه] LT',
-+            lastWeek : '[گزريل هفتي] dddd [تي] LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : '%s پوء',
-+            past : '%s اڳ',
-+            s : 'چند سيڪنڊ',
-+            ss : '%d سيڪنڊ',
-+            m : 'هڪ منٽ',
-+            mm : '%d منٽ',
-+            h : 'هڪ ڪلاڪ',
-+            hh : '%d ڪلاڪ',
-+            d : 'هڪ ڏينهن',
-+            dd : '%d ڏينهن',
-+            M : 'هڪ مهينو',
-+            MM : '%d مهينا',
-+            y : 'هڪ سال',
-+            yy : '%d سال'
-+        },
-+        preparse: function (string) {
-+            return string.replace(/،/g, ',');
-+        },
-+        postformat: function (string) {
-+            return string.replace(/,/g, '،');
-+        },
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return sd;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/se.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/se.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var se = moment.defineLocale('se', {
-+        months : 'ođđajagemánnu_guovvamánnu_njukčamánnu_cuoŋománnu_miessemánnu_geassemánnu_suoidnemánnu_borgemánnu_čakčamánnu_golggotmánnu_skábmamánnu_juovlamánnu'.split('_'),
-+        monthsShort : 'ođđj_guov_njuk_cuo_mies_geas_suoi_borg_čakč_golg_skáb_juov'.split('_'),
-+        weekdays : 'sotnabeaivi_vuossárga_maŋŋebárga_gaskavahkku_duorastat_bearjadat_lávvardat'.split('_'),
-+        weekdaysShort : 'sotn_vuos_maŋ_gask_duor_bear_láv'.split('_'),
-+        weekdaysMin : 's_v_m_g_d_b_L'.split('_'),
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD.MM.YYYY',
-+            LL : 'MMMM D. [b.] YYYY',
-+            LLL : 'MMMM D. [b.] YYYY [ti.] HH:mm',
-+            LLLL : 'dddd, MMMM D. [b.] YYYY [ti.] HH:mm'
-+        },
-+        calendar : {
-+            sameDay: '[otne ti] LT',
-+            nextDay: '[ihttin ti] LT',
-+            nextWeek: 'dddd [ti] LT',
-+            lastDay: '[ikte ti] LT',
-+            lastWeek: '[ovddit] dddd [ti] LT',
-+            sameElse: 'L'
-+        },
-+        relativeTime : {
-+            future : '%s geažes',
-+            past : 'maŋit %s',
-+            s : 'moadde sekunddat',
-+            ss: '%d sekunddat',
-+            m : 'okta minuhta',
-+            mm : '%d minuhtat',
-+            h : 'okta diimmu',
-+            hh : '%d diimmut',
-+            d : 'okta beaivi',
-+            dd : '%d beaivvit',
-+            M : 'okta mánnu',
-+            MM : '%d mánut',
-+            y : 'okta jahki',
-+            yy : '%d jagit'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}\./,
-+        ordinal : '%d.',
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return se;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/si.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/si.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    /*jshint -W100*/
-+    var si = moment.defineLocale('si', {
-+        months : 'ජනවාරි_පෙබරවාරි_මාර්තු_අප්‍රේල්_මැයි_ජූනි_ජූලි_අගෝස්තු_සැප්තැම්බර්_ඔක්තෝබර්_නොවැම්බර්_දෙසැම්බර්'.split('_'),
-+        monthsShort : 'ජන_පෙබ_මාර්_අප්_මැයි_ජූනි_ජූලි_අගෝ_සැප්_ඔක්_නොවැ_දෙසැ'.split('_'),
-+        weekdays : 'ඉරිදා_සඳුදා_අඟහරුවාදා_බදාදා_බ්‍රහස්පතින්දා_සිකුරාදා_සෙනසුරාදා'.split('_'),
-+        weekdaysShort : 'ඉරි_සඳු_අඟ_බදා_බ්‍රහ_සිකු_සෙන'.split('_'),
-+        weekdaysMin : 'ඉ_ස_අ_බ_බ්‍ර_සි_සෙ'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat : {
-+            LT : 'a h:mm',
-+            LTS : 'a h:mm:ss',
-+            L : 'YYYY/MM/DD',
-+            LL : 'YYYY MMMM D',
-+            LLL : 'YYYY MMMM D, a h:mm',
-+            LLLL : 'YYYY MMMM D [වැනි] dddd, a h:mm:ss'
-+        },
-+        calendar : {
-+            sameDay : '[අද] LT[ට]',
-+            nextDay : '[හෙට] LT[ට]',
-+            nextWeek : 'dddd LT[ට]',
-+            lastDay : '[ඊයේ] LT[ට]',
-+            lastWeek : '[පසුගිය] dddd LT[ට]',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : '%sකින්',
-+            past : '%sකට පෙර',
-+            s : 'තත්පර කිහිපය',
-+            ss : 'තත්පර %d',
-+            m : 'මිනිත්තුව',
-+            mm : 'මිනිත්තු %d',
-+            h : 'පැය',
-+            hh : 'පැය %d',
-+            d : 'දිනය',
-+            dd : 'දින %d',
-+            M : 'මාසය',
-+            MM : 'මාස %d',
-+            y : 'වසර',
-+            yy : 'වසර %d'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2} වැනි/,
-+        ordinal : function (number) {
-+            return number + ' වැනි';
-+        },
-+        meridiemParse : /පෙර වරු|පස් වරු|පෙ.ව|ප.ව./,
-+        isPM : function (input) {
-+            return input === 'ප.ව.' || input === 'පස් වරු';
-+        },
-+        meridiem : function (hours, minutes, isLower) {
-+            if (hours > 11) {
-+                return isLower ? 'ප.ව.' : 'පස් වරු';
-+            } else {
-+                return isLower ? 'පෙ.ව.' : 'පෙර වරු';
-+            }
-+        }
-+    });
-+
-+    return si;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/sk.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/sk.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var months = 'január_február_marec_apríl_máj_jún_júl_august_september_október_november_december'.split('_'),
-+        monthsShort = 'jan_feb_mar_apr_máj_jún_júl_aug_sep_okt_nov_dec'.split('_');
-+    function plural(n) {
-+        return (n > 1) && (n < 5);
-+    }
-+    function translate(number, withoutSuffix, key, isFuture) {
-+        var result = number + ' ';
-+        switch (key) {
-+            case 's':  // a few seconds / in a few seconds / a few seconds ago
-+                return (withoutSuffix || isFuture) ? 'pár sekúnd' : 'pár sekundami';
-+            case 'ss': // 9 seconds / in 9 seconds / 9 seconds ago
-+                if (withoutSuffix || isFuture) {
-+                    return result + (plural(number) ? 'sekundy' : 'sekúnd');
-+                } else {
-+                    return result + 'sekundami';
-+                }
-+                break;
-+            case 'm':  // a minute / in a minute / a minute ago
-+                return withoutSuffix ? 'minúta' : (isFuture ? 'minútu' : 'minútou');
-+            case 'mm': // 9 minutes / in 9 minutes / 9 minutes ago
-+                if (withoutSuffix || isFuture) {
-+                    return result + (plural(number) ? 'minúty' : 'minút');
-+                } else {
-+                    return result + 'minútami';
-+                }
-+                break;
-+            case 'h':  // an hour / in an hour / an hour ago
-+                return withoutSuffix ? 'hodina' : (isFuture ? 'hodinu' : 'hodinou');
-+            case 'hh': // 9 hours / in 9 hours / 9 hours ago
-+                if (withoutSuffix || isFuture) {
-+                    return result + (plural(number) ? 'hodiny' : 'hodín');
-+                } else {
-+                    return result + 'hodinami';
-+                }
-+                break;
-+            case 'd':  // a day / in a day / a day ago
-+                return (withoutSuffix || isFuture) ? 'deň' : 'dňom';
-+            case 'dd': // 9 days / in 9 days / 9 days ago
-+                if (withoutSuffix || isFuture) {
-+                    return result + (plural(number) ? 'dni' : 'dní');
-+                } else {
-+                    return result + 'dňami';
-+                }
-+                break;
-+            case 'M':  // a month / in a month / a month ago
-+                return (withoutSuffix || isFuture) ? 'mesiac' : 'mesiacom';
-+            case 'MM': // 9 months / in 9 months / 9 months ago
-+                if (withoutSuffix || isFuture) {
-+                    return result + (plural(number) ? 'mesiace' : 'mesiacov');
-+                } else {
-+                    return result + 'mesiacmi';
-+                }
-+                break;
-+            case 'y':  // a year / in a year / a year ago
-+                return (withoutSuffix || isFuture) ? 'rok' : 'rokom';
-+            case 'yy': // 9 years / in 9 years / 9 years ago
-+                if (withoutSuffix || isFuture) {
-+                    return result + (plural(number) ? 'roky' : 'rokov');
-+                } else {
-+                    return result + 'rokmi';
-+                }
-+                break;
-+        }
-+    }
-+
-+    var sk = moment.defineLocale('sk', {
-+        months : months,
-+        monthsShort : monthsShort,
-+        weekdays : 'nedeľa_pondelok_utorok_streda_štvrtok_piatok_sobota'.split('_'),
-+        weekdaysShort : 'ne_po_ut_st_št_pi_so'.split('_'),
-+        weekdaysMin : 'ne_po_ut_st_št_pi_so'.split('_'),
-+        longDateFormat : {
-+            LT: 'H:mm',
-+            LTS : 'H:mm:ss',
-+            L : 'DD.MM.YYYY',
-+            LL : 'D. MMMM YYYY',
-+            LLL : 'D. MMMM YYYY H:mm',
-+            LLLL : 'dddd D. MMMM YYYY H:mm'
-+        },
-+        calendar : {
-+            sameDay: '[dnes o] LT',
-+            nextDay: '[zajtra o] LT',
-+            nextWeek: function () {
-+                switch (this.day()) {
-+                    case 0:
-+                        return '[v nedeľu o] LT';
-+                    case 1:
-+                    case 2:
-+                        return '[v] dddd [o] LT';
-+                    case 3:
-+                        return '[v stredu o] LT';
-+                    case 4:
-+                        return '[vo štvrtok o] LT';
-+                    case 5:
-+                        return '[v piatok o] LT';
-+                    case 6:
-+                        return '[v sobotu o] LT';
-+                }
-+            },
-+            lastDay: '[včera o] LT',
-+            lastWeek: function () {
-+                switch (this.day()) {
-+                    case 0:
-+                        return '[minulú nedeľu o] LT';
-+                    case 1:
-+                    case 2:
-+                        return '[minulý] dddd [o] LT';
-+                    case 3:
-+                        return '[minulú stredu o] LT';
-+                    case 4:
-+                    case 5:
-+                        return '[minulý] dddd [o] LT';
-+                    case 6:
-+                        return '[minulú sobotu o] LT';
-+                }
-+            },
-+            sameElse: 'L'
-+        },
-+        relativeTime : {
-+            future : 'za %s',
-+            past : 'pred %s',
-+            s : translate,
-+            ss : translate,
-+            m : translate,
-+            mm : translate,
-+            h : translate,
-+            hh : translate,
-+            d : translate,
-+            dd : translate,
-+            M : translate,
-+            MM : translate,
-+            y : translate,
-+            yy : translate
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}\./,
-+        ordinal : '%d.',
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return sk;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/sl.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/sl.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    function processRelativeTime(number, withoutSuffix, key, isFuture) {
-+        var result = number + ' ';
-+        switch (key) {
-+            case 's':
-+                return withoutSuffix || isFuture ? 'nekaj sekund' : 'nekaj sekundami';
-+            case 'ss':
-+                if (number === 1) {
-+                    result += withoutSuffix ? 'sekundo' : 'sekundi';
-+                } else if (number === 2) {
-+                    result += withoutSuffix || isFuture ? 'sekundi' : 'sekundah';
-+                } else if (number < 5) {
-+                    result += withoutSuffix || isFuture ? 'sekunde' : 'sekundah';
-+                } else {
-+                    result += withoutSuffix || isFuture ? 'sekund' : 'sekund';
-+                }
-+                return result;
-+            case 'm':
-+                return withoutSuffix ? 'ena minuta' : 'eno minuto';
-+            case 'mm':
-+                if (number === 1) {
-+                    result += withoutSuffix ? 'minuta' : 'minuto';
-+                } else if (number === 2) {
-+                    result += withoutSuffix || isFuture ? 'minuti' : 'minutama';
-+                } else if (number < 5) {
-+                    result += withoutSuffix || isFuture ? 'minute' : 'minutami';
-+                } else {
-+                    result += withoutSuffix || isFuture ? 'minut' : 'minutami';
-+                }
-+                return result;
-+            case 'h':
-+                return withoutSuffix ? 'ena ura' : 'eno uro';
-+            case 'hh':
-+                if (number === 1) {
-+                    result += withoutSuffix ? 'ura' : 'uro';
-+                } else if (number === 2) {
-+                    result += withoutSuffix || isFuture ? 'uri' : 'urama';
-+                } else if (number < 5) {
-+                    result += withoutSuffix || isFuture ? 'ure' : 'urami';
-+                } else {
-+                    result += withoutSuffix || isFuture ? 'ur' : 'urami';
-+                }
-+                return result;
-+            case 'd':
-+                return withoutSuffix || isFuture ? 'en dan' : 'enim dnem';
-+            case 'dd':
-+                if (number === 1) {
-+                    result += withoutSuffix || isFuture ? 'dan' : 'dnem';
-+                } else if (number === 2) {
-+                    result += withoutSuffix || isFuture ? 'dni' : 'dnevoma';
-+                } else {
-+                    result += withoutSuffix || isFuture ? 'dni' : 'dnevi';
-+                }
-+                return result;
-+            case 'M':
-+                return withoutSuffix || isFuture ? 'en mesec' : 'enim mesecem';
-+            case 'MM':
-+                if (number === 1) {
-+                    result += withoutSuffix || isFuture ? 'mesec' : 'mesecem';
-+                } else if (number === 2) {
-+                    result += withoutSuffix || isFuture ? 'meseca' : 'mesecema';
-+                } else if (number < 5) {
-+                    result += withoutSuffix || isFuture ? 'mesece' : 'meseci';
-+                } else {
-+                    result += withoutSuffix || isFuture ? 'mesecev' : 'meseci';
-+                }
-+                return result;
-+            case 'y':
-+                return withoutSuffix || isFuture ? 'eno leto' : 'enim letom';
-+            case 'yy':
-+                if (number === 1) {
-+                    result += withoutSuffix || isFuture ? 'leto' : 'letom';
-+                } else if (number === 2) {
-+                    result += withoutSuffix || isFuture ? 'leti' : 'letoma';
-+                } else if (number < 5) {
-+                    result += withoutSuffix || isFuture ? 'leta' : 'leti';
-+                } else {
-+                    result += withoutSuffix || isFuture ? 'let' : 'leti';
-+                }
-+                return result;
-+        }
-+    }
-+
-+    var sl = moment.defineLocale('sl', {
-+        months : 'januar_februar_marec_april_maj_junij_julij_avgust_september_oktober_november_december'.split('_'),
-+        monthsShort : 'jan._feb._mar._apr._maj._jun._jul._avg._sep._okt._nov._dec.'.split('_'),
-+        monthsParseExact: true,
-+        weekdays : 'nedelja_ponedeljek_torek_sreda_četrtek_petek_sobota'.split('_'),
-+        weekdaysShort : 'ned._pon._tor._sre._čet._pet._sob.'.split('_'),
-+        weekdaysMin : 'ne_po_to_sr_če_pe_so'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat : {
-+            LT : 'H:mm',
-+            LTS : 'H:mm:ss',
-+            L : 'DD.MM.YYYY',
-+            LL : 'D. MMMM YYYY',
-+            LLL : 'D. MMMM YYYY H:mm',
-+            LLLL : 'dddd, D. MMMM YYYY H:mm'
-+        },
-+        calendar : {
-+            sameDay  : '[danes ob] LT',
-+            nextDay  : '[jutri ob] LT',
-+
-+            nextWeek : function () {
-+                switch (this.day()) {
-+                    case 0:
-+                        return '[v] [nedeljo] [ob] LT';
-+                    case 3:
-+                        return '[v] [sredo] [ob] LT';
-+                    case 6:
-+                        return '[v] [soboto] [ob] LT';
-+                    case 1:
-+                    case 2:
-+                    case 4:
-+                    case 5:
-+                        return '[v] dddd [ob] LT';
-+                }
-+            },
-+            lastDay  : '[včeraj ob] LT',
-+            lastWeek : function () {
-+                switch (this.day()) {
-+                    case 0:
-+                        return '[prejšnjo] [nedeljo] [ob] LT';
-+                    case 3:
-+                        return '[prejšnjo] [sredo] [ob] LT';
-+                    case 6:
-+                        return '[prejšnjo] [soboto] [ob] LT';
-+                    case 1:
-+                    case 2:
-+                    case 4:
-+                    case 5:
-+                        return '[prejšnji] dddd [ob] LT';
-+                }
-+            },
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'čez %s',
-+            past   : 'pred %s',
-+            s      : processRelativeTime,
-+            ss     : processRelativeTime,
-+            m      : processRelativeTime,
-+            mm     : processRelativeTime,
-+            h      : processRelativeTime,
-+            hh     : processRelativeTime,
-+            d      : processRelativeTime,
-+            dd     : processRelativeTime,
-+            M      : processRelativeTime,
-+            MM     : processRelativeTime,
-+            y      : processRelativeTime,
-+            yy     : processRelativeTime
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}\./,
-+        ordinal : '%d.',
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 7  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return sl;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/sq.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/sq.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var sq = moment.defineLocale('sq', {
-+        months : 'Janar_Shkurt_Mars_Prill_Maj_Qershor_Korrik_Gusht_Shtator_Tetor_Nëntor_Dhjetor'.split('_'),
-+        monthsShort : 'Jan_Shk_Mar_Pri_Maj_Qer_Kor_Gus_Sht_Tet_Nën_Dhj'.split('_'),
-+        weekdays : 'E Diel_E Hënë_E Martë_E Mërkurë_E Enjte_E Premte_E Shtunë'.split('_'),
-+        weekdaysShort : 'Die_Hën_Mar_Mër_Enj_Pre_Sht'.split('_'),
-+        weekdaysMin : 'D_H_Ma_Më_E_P_Sh'.split('_'),
-+        weekdaysParseExact : true,
-+        meridiemParse: /PD|MD/,
-+        isPM: function (input) {
-+            return input.charAt(0) === 'M';
-+        },
-+        meridiem : function (hours, minutes, isLower) {
-+            return hours < 12 ? 'PD' : 'MD';
-+        },
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY HH:mm',
-+            LLLL : 'dddd, D MMMM YYYY HH:mm'
-+        },
-+        calendar : {
-+            sameDay : '[Sot në] LT',
-+            nextDay : '[Nesër në] LT',
-+            nextWeek : 'dddd [në] LT',
-+            lastDay : '[Dje në] LT',
-+            lastWeek : 'dddd [e kaluar në] LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'në %s',
-+            past : '%s më parë',
-+            s : 'disa sekonda',
-+            ss : '%d sekonda',
-+            m : 'një minutë',
-+            mm : '%d minuta',
-+            h : 'një orë',
-+            hh : '%d orë',
-+            d : 'një ditë',
-+            dd : '%d ditë',
-+            M : 'një muaj',
-+            MM : '%d muaj',
-+            y : 'një vit',
-+            yy : '%d vite'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}\./,
-+        ordinal : '%d.',
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return sq;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/sr-cyrl.js":
-+/*!***********************************************!*\
-+  !*** ./node_modules/moment/locale/sr-cyrl.js ***!
-+  \***********************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var translator = {
-+        words: { //Different grammatical cases
-+            ss: ['секунда', 'секунде', 'секунди'],
-+            m: ['један минут', 'једне минуте'],
-+            mm: ['минут', 'минуте', 'минута'],
-+            h: ['један сат', 'једног сата'],
-+            hh: ['сат', 'сата', 'сати'],
-+            dd: ['дан', 'дана', 'дана'],
-+            MM: ['месец', 'месеца', 'месеци'],
-+            yy: ['година', 'године', 'година']
-+        },
-+        correctGrammaticalCase: function (number, wordKey) {
-+            return number === 1 ? wordKey[0] : (number >= 2 && number <= 4 ? wordKey[1] : wordKey[2]);
-+        },
-+        translate: function (number, withoutSuffix, key) {
-+            var wordKey = translator.words[key];
-+            if (key.length === 1) {
-+                return withoutSuffix ? wordKey[0] : wordKey[1];
-+            } else {
-+                return number + ' ' + translator.correctGrammaticalCase(number, wordKey);
-+            }
-+        }
-+    };
-+
-+    var srCyrl = moment.defineLocale('sr-cyrl', {
-+        months: 'јануар_фебруар_март_април_мај_јун_јул_август_септембар_октобар_новембар_децембар'.split('_'),
-+        monthsShort: 'јан._феб._мар._апр._мај_јун_јул_авг._сеп._окт._нов._дец.'.split('_'),
-+        monthsParseExact: true,
-+        weekdays: 'недеља_понедељак_уторак_среда_четвртак_петак_субота'.split('_'),
-+        weekdaysShort: 'нед._пон._уто._сре._чет._пет._суб.'.split('_'),
-+        weekdaysMin: 'не_по_ут_ср_че_пе_су'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat: {
-+            LT: 'H:mm',
-+            LTS : 'H:mm:ss',
-+            L: 'DD.MM.YYYY',
-+            LL: 'D. MMMM YYYY',
-+            LLL: 'D. MMMM YYYY H:mm',
-+            LLLL: 'dddd, D. MMMM YYYY H:mm'
-+        },
-+        calendar: {
-+            sameDay: '[данас у] LT',
-+            nextDay: '[сутра у] LT',
-+            nextWeek: function () {
-+                switch (this.day()) {
-+                    case 0:
-+                        return '[у] [недељу] [у] LT';
-+                    case 3:
-+                        return '[у] [среду] [у] LT';
-+                    case 6:
-+                        return '[у] [суботу] [у] LT';
-+                    case 1:
-+                    case 2:
-+                    case 4:
-+                    case 5:
-+                        return '[у] dddd [у] LT';
-+                }
-+            },
-+            lastDay  : '[јуче у] LT',
-+            lastWeek : function () {
-+                var lastWeekDays = [
-+                    '[прошле] [недеље] [у] LT',
-+                    '[прошлог] [понедељка] [у] LT',
-+                    '[прошлог] [уторка] [у] LT',
-+                    '[прошле] [среде] [у] LT',
-+                    '[прошлог] [четвртка] [у] LT',
-+                    '[прошлог] [петка] [у] LT',
-+                    '[прошле] [суботе] [у] LT'
-+                ];
-+                return lastWeekDays[this.day()];
-+            },
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'за %s',
-+            past   : 'пре %s',
-+            s      : 'неколико секунди',
-+            ss     : translator.translate,
-+            m      : translator.translate,
-+            mm     : translator.translate,
-+            h      : translator.translate,
-+            hh     : translator.translate,
-+            d      : 'дан',
-+            dd     : translator.translate,
-+            M      : 'месец',
-+            MM     : translator.translate,
-+            y      : 'годину',
-+            yy     : translator.translate
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}\./,
-+        ordinal : '%d.',
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 7  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return srCyrl;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/sr.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/sr.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var translator = {
-+        words: { //Different grammatical cases
-+            ss: ['sekunda', 'sekunde', 'sekundi'],
-+            m: ['jedan minut', 'jedne minute'],
-+            mm: ['minut', 'minute', 'minuta'],
-+            h: ['jedan sat', 'jednog sata'],
-+            hh: ['sat', 'sata', 'sati'],
-+            dd: ['dan', 'dana', 'dana'],
-+            MM: ['mesec', 'meseca', 'meseci'],
-+            yy: ['godina', 'godine', 'godina']
-+        },
-+        correctGrammaticalCase: function (number, wordKey) {
-+            return number === 1 ? wordKey[0] : (number >= 2 && number <= 4 ? wordKey[1] : wordKey[2]);
-+        },
-+        translate: function (number, withoutSuffix, key) {
-+            var wordKey = translator.words[key];
-+            if (key.length === 1) {
-+                return withoutSuffix ? wordKey[0] : wordKey[1];
-+            } else {
-+                return number + ' ' + translator.correctGrammaticalCase(number, wordKey);
-+            }
-+        }
-+    };
-+
-+    var sr = moment.defineLocale('sr', {
-+        months: 'januar_februar_mart_april_maj_jun_jul_avgust_septembar_oktobar_novembar_decembar'.split('_'),
-+        monthsShort: 'jan._feb._mar._apr._maj_jun_jul_avg._sep._okt._nov._dec.'.split('_'),
-+        monthsParseExact: true,
-+        weekdays: 'nedelja_ponedeljak_utorak_sreda_četvrtak_petak_subota'.split('_'),
-+        weekdaysShort: 'ned._pon._uto._sre._čet._pet._sub.'.split('_'),
-+        weekdaysMin: 'ne_po_ut_sr_če_pe_su'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat: {
-+            LT: 'H:mm',
-+            LTS : 'H:mm:ss',
-+            L: 'DD.MM.YYYY',
-+            LL: 'D. MMMM YYYY',
-+            LLL: 'D. MMMM YYYY H:mm',
-+            LLLL: 'dddd, D. MMMM YYYY H:mm'
-+        },
-+        calendar: {
-+            sameDay: '[danas u] LT',
-+            nextDay: '[sutra u] LT',
-+            nextWeek: function () {
-+                switch (this.day()) {
-+                    case 0:
-+                        return '[u] [nedelju] [u] LT';
-+                    case 3:
-+                        return '[u] [sredu] [u] LT';
-+                    case 6:
-+                        return '[u] [subotu] [u] LT';
-+                    case 1:
-+                    case 2:
-+                    case 4:
-+                    case 5:
-+                        return '[u] dddd [u] LT';
-+                }
-+            },
-+            lastDay  : '[juče u] LT',
-+            lastWeek : function () {
-+                var lastWeekDays = [
-+                    '[prošle] [nedelje] [u] LT',
-+                    '[prošlog] [ponedeljka] [u] LT',
-+                    '[prošlog] [utorka] [u] LT',
-+                    '[prošle] [srede] [u] LT',
-+                    '[prošlog] [četvrtka] [u] LT',
-+                    '[prošlog] [petka] [u] LT',
-+                    '[prošle] [subote] [u] LT'
-+                ];
-+                return lastWeekDays[this.day()];
-+            },
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'za %s',
-+            past   : 'pre %s',
-+            s      : 'nekoliko sekundi',
-+            ss     : translator.translate,
-+            m      : translator.translate,
-+            mm     : translator.translate,
-+            h      : translator.translate,
-+            hh     : translator.translate,
-+            d      : 'dan',
-+            dd     : translator.translate,
-+            M      : 'mesec',
-+            MM     : translator.translate,
-+            y      : 'godinu',
-+            yy     : translator.translate
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}\./,
-+        ordinal : '%d.',
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 7  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return sr;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/ss.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/ss.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var ss = moment.defineLocale('ss', {
-+        months : "Bhimbidvwane_Indlovana_Indlov'lenkhulu_Mabasa_Inkhwekhweti_Inhlaba_Kholwane_Ingci_Inyoni_Imphala_Lweti_Ingongoni".split('_'),
-+        monthsShort : 'Bhi_Ina_Inu_Mab_Ink_Inh_Kho_Igc_Iny_Imp_Lwe_Igo'.split('_'),
-+        weekdays : 'Lisontfo_Umsombuluko_Lesibili_Lesitsatfu_Lesine_Lesihlanu_Umgcibelo'.split('_'),
-+        weekdaysShort : 'Lis_Umb_Lsb_Les_Lsi_Lsh_Umg'.split('_'),
-+        weekdaysMin : 'Li_Us_Lb_Lt_Ls_Lh_Ug'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat : {
-+            LT : 'h:mm A',
-+            LTS : 'h:mm:ss A',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY h:mm A',
-+            LLLL : 'dddd, D MMMM YYYY h:mm A'
-+        },
-+        calendar : {
-+            sameDay : '[Namuhla nga] LT',
-+            nextDay : '[Kusasa nga] LT',
-+            nextWeek : 'dddd [nga] LT',
-+            lastDay : '[Itolo nga] LT',
-+            lastWeek : 'dddd [leliphelile] [nga] LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'nga %s',
-+            past : 'wenteka nga %s',
-+            s : 'emizuzwana lomcane',
-+            ss : '%d mzuzwana',
-+            m : 'umzuzu',
-+            mm : '%d emizuzu',
-+            h : 'lihora',
-+            hh : '%d emahora',
-+            d : 'lilanga',
-+            dd : '%d emalanga',
-+            M : 'inyanga',
-+            MM : '%d tinyanga',
-+            y : 'umnyaka',
-+            yy : '%d iminyaka'
-+        },
-+        meridiemParse: /ekuseni|emini|entsambama|ebusuku/,
-+        meridiem : function (hours, minutes, isLower) {
-+            if (hours < 11) {
-+                return 'ekuseni';
-+            } else if (hours < 15) {
-+                return 'emini';
-+            } else if (hours < 19) {
-+                return 'entsambama';
-+            } else {
-+                return 'ebusuku';
-+            }
-+        },
-+        meridiemHour : function (hour, meridiem) {
-+            if (hour === 12) {
-+                hour = 0;
-+            }
-+            if (meridiem === 'ekuseni') {
-+                return hour;
-+            } else if (meridiem === 'emini') {
-+                return hour >= 11 ? hour : hour + 12;
-+            } else if (meridiem === 'entsambama' || meridiem === 'ebusuku') {
-+                if (hour === 0) {
-+                    return 0;
-+                }
-+                return hour + 12;
-+            }
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}/,
-+        ordinal : '%d',
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return ss;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/sv.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/sv.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var sv = moment.defineLocale('sv', {
-+        months : 'januari_februari_mars_april_maj_juni_juli_augusti_september_oktober_november_december'.split('_'),
-+        monthsShort : 'jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec'.split('_'),
-+        weekdays : 'söndag_måndag_tisdag_onsdag_torsdag_fredag_lördag'.split('_'),
-+        weekdaysShort : 'sön_mån_tis_ons_tor_fre_lör'.split('_'),
-+        weekdaysMin : 'sö_må_ti_on_to_fr_lö'.split('_'),
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'YYYY-MM-DD',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY [kl.] HH:mm',
-+            LLLL : 'dddd D MMMM YYYY [kl.] HH:mm',
-+            lll : 'D MMM YYYY HH:mm',
-+            llll : 'ddd D MMM YYYY HH:mm'
-+        },
-+        calendar : {
-+            sameDay: '[Idag] LT',
-+            nextDay: '[Imorgon] LT',
-+            lastDay: '[Igår] LT',
-+            nextWeek: '[På] dddd LT',
-+            lastWeek: '[I] dddd[s] LT',
-+            sameElse: 'L'
-+        },
-+        relativeTime : {
-+            future : 'om %s',
-+            past : 'för %s sedan',
-+            s : 'några sekunder',
-+            ss : '%d sekunder',
-+            m : 'en minut',
-+            mm : '%d minuter',
-+            h : 'en timme',
-+            hh : '%d timmar',
-+            d : 'en dag',
-+            dd : '%d dagar',
-+            M : 'en månad',
-+            MM : '%d månader',
-+            y : 'ett år',
-+            yy : '%d år'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}(e|a)/,
-+        ordinal : function (number) {
-+            var b = number % 10,
-+                output = (~~(number % 100 / 10) === 1) ? 'e' :
-+                (b === 1) ? 'a' :
-+                (b === 2) ? 'a' :
-+                (b === 3) ? 'e' : 'e';
-+            return number + output;
-+        },
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return sv;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/sw.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/sw.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var sw = moment.defineLocale('sw', {
-+        months : 'Januari_Februari_Machi_Aprili_Mei_Juni_Julai_Agosti_Septemba_Oktoba_Novemba_Desemba'.split('_'),
-+        monthsShort : 'Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ago_Sep_Okt_Nov_Des'.split('_'),
-+        weekdays : 'Jumapili_Jumatatu_Jumanne_Jumatano_Alhamisi_Ijumaa_Jumamosi'.split('_'),
-+        weekdaysShort : 'Jpl_Jtat_Jnne_Jtan_Alh_Ijm_Jmos'.split('_'),
-+        weekdaysMin : 'J2_J3_J4_J5_Al_Ij_J1'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD.MM.YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY HH:mm',
-+            LLLL : 'dddd, D MMMM YYYY HH:mm'
-+        },
-+        calendar : {
-+            sameDay : '[leo saa] LT',
-+            nextDay : '[kesho saa] LT',
-+            nextWeek : '[wiki ijayo] dddd [saat] LT',
-+            lastDay : '[jana] LT',
-+            lastWeek : '[wiki iliyopita] dddd [saat] LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : '%s baadaye',
-+            past : 'tokea %s',
-+            s : 'hivi punde',
-+            ss : 'sekunde %d',
-+            m : 'dakika moja',
-+            mm : 'dakika %d',
-+            h : 'saa limoja',
-+            hh : 'masaa %d',
-+            d : 'siku moja',
-+            dd : 'masiku %d',
-+            M : 'mwezi mmoja',
-+            MM : 'miezi %d',
-+            y : 'mwaka mmoja',
-+            yy : 'miaka %d'
-+        },
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 7  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return sw;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/ta.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/ta.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var symbolMap = {
-+        '1': '௧',
-+        '2': '௨',
-+        '3': '௩',
-+        '4': '௪',
-+        '5': '௫',
-+        '6': '௬',
-+        '7': '௭',
-+        '8': '௮',
-+        '9': '௯',
-+        '0': '௦'
-+    }, numberMap = {
-+        '௧': '1',
-+        '௨': '2',
-+        '௩': '3',
-+        '௪': '4',
-+        '௫': '5',
-+        '௬': '6',
-+        '௭': '7',
-+        '௮': '8',
-+        '௯': '9',
-+        '௦': '0'
-+    };
-+
-+    var ta = moment.defineLocale('ta', {
-+        months : 'ஜனவரி_பிப்ரவரி_மார்ச்_ஏப்ரல்_மே_ஜூன்_ஜூலை_ஆகஸ்ட்_செப்டெம்பர்_அக்டோபர்_நவம்பர்_டிசம்பர்'.split('_'),
-+        monthsShort : 'ஜனவரி_பிப்ரவரி_மார்ச்_ஏப்ரல்_மே_ஜூன்_ஜூலை_ஆகஸ்ட்_செப்டெம்பர்_அக்டோபர்_நவம்பர்_டிசம்பர்'.split('_'),
-+        weekdays : 'ஞாயிற்றுக்கிழமை_திங்கட்கிழமை_செவ்வாய்கிழமை_புதன்கிழமை_வியாழக்கிழமை_வெள்ளிக்கிழமை_சனிக்கிழமை'.split('_'),
-+        weekdaysShort : 'ஞாயிறு_திங்கள்_செவ்வாய்_புதன்_வியாழன்_வெள்ளி_சனி'.split('_'),
-+        weekdaysMin : 'ஞா_தி_செ_பு_வி_வெ_ச'.split('_'),
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY, HH:mm',
-+            LLLL : 'dddd, D MMMM YYYY, HH:mm'
-+        },
-+        calendar : {
-+            sameDay : '[இன்று] LT',
-+            nextDay : '[நாளை] LT',
-+            nextWeek : 'dddd, LT',
-+            lastDay : '[நேற்று] LT',
-+            lastWeek : '[கடந்த வாரம்] dddd, LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : '%s இல்',
-+            past : '%s முன்',
-+            s : 'ஒரு சில விநாடிகள்',
-+            ss : '%d விநாடிகள்',
-+            m : 'ஒரு நிமிடம்',
-+            mm : '%d நிமிடங்கள்',
-+            h : 'ஒரு மணி நேரம்',
-+            hh : '%d மணி நேரம்',
-+            d : 'ஒரு நாள்',
-+            dd : '%d நாட்கள்',
-+            M : 'ஒரு மாதம்',
-+            MM : '%d மாதங்கள்',
-+            y : 'ஒரு வருடம்',
-+            yy : '%d ஆண்டுகள்'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}வது/,
-+        ordinal : function (number) {
-+            return number + 'வது';
-+        },
-+        preparse: function (string) {
-+            return string.replace(/[௧௨௩௪௫௬௭௮௯௦]/g, function (match) {
-+                return numberMap[match];
-+            });
-+        },
-+        postformat: function (string) {
-+            return string.replace(/\d/g, function (match) {
-+                return symbolMap[match];
-+            });
-+        },
-+        // refer http://ta.wikipedia.org/s/1er1
-+        meridiemParse: /யாமம்|வைகறை|காலை|நண்பகல்|எற்பாடு|மாலை/,
-+        meridiem : function (hour, minute, isLower) {
-+            if (hour < 2) {
-+                return ' யாமம்';
-+            } else if (hour < 6) {
-+                return ' வைகறை';  // வைகறை
-+            } else if (hour < 10) {
-+                return ' காலை'; // காலை
-+            } else if (hour < 14) {
-+                return ' நண்பகல்'; // நண்பகல்
-+            } else if (hour < 18) {
-+                return ' எற்பாடு'; // எற்பாடு
-+            } else if (hour < 22) {
-+                return ' மாலை'; // மாலை
-+            } else {
-+                return ' யாமம்';
-+            }
-+        },
-+        meridiemHour : function (hour, meridiem) {
-+            if (hour === 12) {
-+                hour = 0;
-+            }
-+            if (meridiem === 'யாமம்') {
-+                return hour < 2 ? hour : hour + 12;
-+            } else if (meridiem === 'வைகறை' || meridiem === 'காலை') {
-+                return hour;
-+            } else if (meridiem === 'நண்பகல்') {
-+                return hour >= 10 ? hour : hour + 12;
-+            } else {
-+                return hour + 12;
-+            }
-+        },
-+        week : {
-+            dow : 0, // Sunday is the first day of the week.
-+            doy : 6  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return ta;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/te.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/te.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var te = moment.defineLocale('te', {
-+        months : 'జనవరి_ఫిబ్రవరి_మార్చి_ఏప్రిల్_మే_జూన్_జూలై_ఆగస్టు_సెప్టెంబర్_అక్టోబర్_నవంబర్_డిసెంబర్'.split('_'),
-+        monthsShort : 'జన._ఫిబ్ర._మార్చి_ఏప్రి._మే_జూన్_జూలై_ఆగ._సెప్._అక్టో._నవ._డిసె.'.split('_'),
-+        monthsParseExact : true,
-+        weekdays : 'ఆదివారం_సోమవారం_మంగళవారం_బుధవారం_గురువారం_శుక్రవారం_శనివారం'.split('_'),
-+        weekdaysShort : 'ఆది_సోమ_మంగళ_బుధ_గురు_శుక్ర_శని'.split('_'),
-+        weekdaysMin : 'ఆ_సో_మం_బు_గు_శు_శ'.split('_'),
-+        longDateFormat : {
-+            LT : 'A h:mm',
-+            LTS : 'A h:mm:ss',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY, A h:mm',
-+            LLLL : 'dddd, D MMMM YYYY, A h:mm'
-+        },
-+        calendar : {
-+            sameDay : '[నేడు] LT',
-+            nextDay : '[రేపు] LT',
-+            nextWeek : 'dddd, LT',
-+            lastDay : '[నిన్న] LT',
-+            lastWeek : '[గత] dddd, LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : '%s లో',
-+            past : '%s క్రితం',
-+            s : 'కొన్ని క్షణాలు',
-+            ss : '%d సెకన్లు',
-+            m : 'ఒక నిమిషం',
-+            mm : '%d నిమిషాలు',
-+            h : 'ఒక గంట',
-+            hh : '%d గంటలు',
-+            d : 'ఒక రోజు',
-+            dd : '%d రోజులు',
-+            M : 'ఒక నెల',
-+            MM : '%d నెలలు',
-+            y : 'ఒక సంవత్సరం',
-+            yy : '%d సంవత్సరాలు'
-+        },
-+        dayOfMonthOrdinalParse : /\d{1,2}వ/,
-+        ordinal : '%dవ',
-+        meridiemParse: /రాత్రి|ఉదయం|మధ్యాహ్నం|సాయంత్రం/,
-+        meridiemHour : function (hour, meridiem) {
-+            if (hour === 12) {
-+                hour = 0;
-+            }
-+            if (meridiem === 'రాత్రి') {
-+                return hour < 4 ? hour : hour + 12;
-+            } else if (meridiem === 'ఉదయం') {
-+                return hour;
-+            } else if (meridiem === 'మధ్యాహ్నం') {
-+                return hour >= 10 ? hour : hour + 12;
-+            } else if (meridiem === 'సాయంత్రం') {
-+                return hour + 12;
-+            }
-+        },
-+        meridiem : function (hour, minute, isLower) {
-+            if (hour < 4) {
-+                return 'రాత్రి';
-+            } else if (hour < 10) {
-+                return 'ఉదయం';
-+            } else if (hour < 17) {
-+                return 'మధ్యాహ్నం';
-+            } else if (hour < 20) {
-+                return 'సాయంత్రం';
-+            } else {
-+                return 'రాత్రి';
-+            }
-+        },
-+        week : {
-+            dow : 0, // Sunday is the first day of the week.
-+            doy : 6  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return te;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/tet.js":
-+/*!*******************************************!*\
-+  !*** ./node_modules/moment/locale/tet.js ***!
-+  \*******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var tet = moment.defineLocale('tet', {
-+        months : 'Janeiru_Fevereiru_Marsu_Abril_Maiu_Juñu_Jullu_Agustu_Setembru_Outubru_Novembru_Dezembru'.split('_'),
-+        monthsShort : 'Jan_Fev_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez'.split('_'),
-+        weekdays : 'Domingu_Segunda_Tersa_Kuarta_Kinta_Sesta_Sabadu'.split('_'),
-+        weekdaysShort : 'Dom_Seg_Ters_Kua_Kint_Sest_Sab'.split('_'),
-+        weekdaysMin : 'Do_Seg_Te_Ku_Ki_Ses_Sa'.split('_'),
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY HH:mm',
-+            LLLL : 'dddd, D MMMM YYYY HH:mm'
-+        },
-+        calendar : {
-+            sameDay: '[Ohin iha] LT',
-+            nextDay: '[Aban iha] LT',
-+            nextWeek: 'dddd [iha] LT',
-+            lastDay: '[Horiseik iha] LT',
-+            lastWeek: 'dddd [semana kotuk] [iha] LT',
-+            sameElse: 'L'
-+        },
-+        relativeTime : {
-+            future : 'iha %s',
-+            past : '%s liuba',
-+            s : 'minutu balun',
-+            ss : 'minutu %d',
-+            m : 'minutu ida',
-+            mm : 'minutu %d',
-+            h : 'oras ida',
-+            hh : 'oras %d',
-+            d : 'loron ida',
-+            dd : 'loron %d',
-+            M : 'fulan ida',
-+            MM : 'fulan %d',
-+            y : 'tinan ida',
-+            yy : 'tinan %d'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
-+        ordinal : function (number) {
-+            var b = number % 10,
-+                output = (~~(number % 100 / 10) === 1) ? 'th' :
-+                (b === 1) ? 'st' :
-+                (b === 2) ? 'nd' :
-+                (b === 3) ? 'rd' : 'th';
-+            return number + output;
-+        },
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return tet;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/tg.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/tg.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var suffixes = {
-+        0: '-ум',
-+        1: '-ум',
-+        2: '-юм',
-+        3: '-юм',
-+        4: '-ум',
-+        5: '-ум',
-+        6: '-ум',
-+        7: '-ум',
-+        8: '-ум',
-+        9: '-ум',
-+        10: '-ум',
-+        12: '-ум',
-+        13: '-ум',
-+        20: '-ум',
-+        30: '-юм',
-+        40: '-ум',
-+        50: '-ум',
-+        60: '-ум',
-+        70: '-ум',
-+        80: '-ум',
-+        90: '-ум',
-+        100: '-ум'
-+    };
-+
-+    var tg = moment.defineLocale('tg', {
-+        months : 'январ_феврал_март_апрел_май_июн_июл_август_сентябр_октябр_ноябр_декабр'.split('_'),
-+        monthsShort : 'янв_фев_мар_апр_май_июн_июл_авг_сен_окт_ноя_дек'.split('_'),
-+        weekdays : 'якшанбе_душанбе_сешанбе_чоршанбе_панҷшанбе_ҷумъа_шанбе'.split('_'),
-+        weekdaysShort : 'яшб_дшб_сшб_чшб_пшб_ҷум_шнб'.split('_'),
-+        weekdaysMin : 'яш_дш_сш_чш_пш_ҷм_шб'.split('_'),
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY HH:mm',
-+            LLLL : 'dddd, D MMMM YYYY HH:mm'
-+        },
-+        calendar : {
-+            sameDay : '[Имрӯз соати] LT',
-+            nextDay : '[Пагоҳ соати] LT',
-+            lastDay : '[Дирӯз соати] LT',
-+            nextWeek : 'dddd[и] [ҳафтаи оянда соати] LT',
-+            lastWeek : 'dddd[и] [ҳафтаи гузашта соати] LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'баъди %s',
-+            past : '%s пеш',
-+            s : 'якчанд сония',
-+            m : 'як дақиқа',
-+            mm : '%d дақиқа',
-+            h : 'як соат',
-+            hh : '%d соат',
-+            d : 'як рӯз',
-+            dd : '%d рӯз',
-+            M : 'як моҳ',
-+            MM : '%d моҳ',
-+            y : 'як сол',
-+            yy : '%d сол'
-+        },
-+        meridiemParse: /шаб|субҳ|рӯз|бегоҳ/,
-+        meridiemHour: function (hour, meridiem) {
-+            if (hour === 12) {
-+                hour = 0;
-+            }
-+            if (meridiem === 'шаб') {
-+                return hour < 4 ? hour : hour + 12;
-+            } else if (meridiem === 'субҳ') {
-+                return hour;
-+            } else if (meridiem === 'рӯз') {
-+                return hour >= 11 ? hour : hour + 12;
-+            } else if (meridiem === 'бегоҳ') {
-+                return hour + 12;
-+            }
-+        },
-+        meridiem: function (hour, minute, isLower) {
-+            if (hour < 4) {
-+                return 'шаб';
-+            } else if (hour < 11) {
-+                return 'субҳ';
-+            } else if (hour < 16) {
-+                return 'рӯз';
-+            } else if (hour < 19) {
-+                return 'бегоҳ';
-+            } else {
-+                return 'шаб';
-+            }
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}-(ум|юм)/,
-+        ordinal: function (number) {
-+            var a = number % 10,
-+                b = number >= 100 ? 100 : null;
-+            return number + (suffixes[number] || suffixes[a] || suffixes[b]);
-+        },
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 7  // The week that contains Jan 1th is the first week of the year.
-+        }
-+    });
-+
-+    return tg;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/th.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/th.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var th = moment.defineLocale('th', {
-+        months : 'มกราคม_กุมภาพันธ์_มีนาคม_เมษายน_พฤษภาคม_มิถุนายน_กรกฎาคม_สิงหาคม_กันยายน_ตุลาคม_พฤศจิกายน_ธันวาคม'.split('_'),
-+        monthsShort : 'ม.ค._ก.พ._มี.ค._เม.ย._พ.ค._มิ.ย._ก.ค._ส.ค._ก.ย._ต.ค._พ.ย._ธ.ค.'.split('_'),
-+        monthsParseExact: true,
-+        weekdays : 'อาทิตย์_จันทร์_อังคาร_พุธ_พฤหัสบดี_ศุกร์_เสาร์'.split('_'),
-+        weekdaysShort : 'อาทิตย์_จันทร์_อังคาร_พุธ_พฤหัส_ศุกร์_เสาร์'.split('_'), // yes, three characters difference
-+        weekdaysMin : 'อา._จ._อ._พ._พฤ._ศ._ส.'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat : {
-+            LT : 'H:mm',
-+            LTS : 'H:mm:ss',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY เวลา H:mm',
-+            LLLL : 'วันddddที่ D MMMM YYYY เวลา H:mm'
-+        },
-+        meridiemParse: /ก่อนเที่ยง|หลังเที่ยง/,
-+        isPM: function (input) {
-+            return input === 'หลังเที่ยง';
-+        },
-+        meridiem : function (hour, minute, isLower) {
-+            if (hour < 12) {
-+                return 'ก่อนเที่ยง';
-+            } else {
-+                return 'หลังเที่ยง';
-+            }
-+        },
-+        calendar : {
-+            sameDay : '[วันนี้ เวลา] LT',
-+            nextDay : '[พรุ่งนี้ เวลา] LT',
-+            nextWeek : 'dddd[หน้า เวลา] LT',
-+            lastDay : '[เมื่อวานนี้ เวลา] LT',
-+            lastWeek : '[วัน]dddd[ที่แล้ว เวลา] LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'อีก %s',
-+            past : '%sที่แล้ว',
-+            s : 'ไม่กี่วินาที',
-+            ss : '%d วินาที',
-+            m : '1 นาที',
-+            mm : '%d นาที',
-+            h : '1 ชั่วโมง',
-+            hh : '%d ชั่วโมง',
-+            d : '1 วัน',
-+            dd : '%d วัน',
-+            M : '1 เดือน',
-+            MM : '%d เดือน',
-+            y : '1 ปี',
-+            yy : '%d ปี'
-+        }
-+    });
-+
-+    return th;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/tl-ph.js":
-+/*!*********************************************!*\
-+  !*** ./node_modules/moment/locale/tl-ph.js ***!
-+  \*********************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var tlPh = moment.defineLocale('tl-ph', {
-+        months : 'Enero_Pebrero_Marso_Abril_Mayo_Hunyo_Hulyo_Agosto_Setyembre_Oktubre_Nobyembre_Disyembre'.split('_'),
-+        monthsShort : 'Ene_Peb_Mar_Abr_May_Hun_Hul_Ago_Set_Okt_Nob_Dis'.split('_'),
-+        weekdays : 'Linggo_Lunes_Martes_Miyerkules_Huwebes_Biyernes_Sabado'.split('_'),
-+        weekdaysShort : 'Lin_Lun_Mar_Miy_Huw_Biy_Sab'.split('_'),
-+        weekdaysMin : 'Li_Lu_Ma_Mi_Hu_Bi_Sab'.split('_'),
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'MM/D/YYYY',
-+            LL : 'MMMM D, YYYY',
-+            LLL : 'MMMM D, YYYY HH:mm',
-+            LLLL : 'dddd, MMMM DD, YYYY HH:mm'
-+        },
-+        calendar : {
-+            sameDay: 'LT [ngayong araw]',
-+            nextDay: '[Bukas ng] LT',
-+            nextWeek: 'LT [sa susunod na] dddd',
-+            lastDay: 'LT [kahapon]',
-+            lastWeek: 'LT [noong nakaraang] dddd',
-+            sameElse: 'L'
-+        },
-+        relativeTime : {
-+            future : 'sa loob ng %s',
-+            past : '%s ang nakalipas',
-+            s : 'ilang segundo',
-+            ss : '%d segundo',
-+            m : 'isang minuto',
-+            mm : '%d minuto',
-+            h : 'isang oras',
-+            hh : '%d oras',
-+            d : 'isang araw',
-+            dd : '%d araw',
-+            M : 'isang buwan',
-+            MM : '%d buwan',
-+            y : 'isang taon',
-+            yy : '%d taon'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}/,
-+        ordinal : function (number) {
-+            return number;
-+        },
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return tlPh;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/tlh.js":
-+/*!*******************************************!*\
-+  !*** ./node_modules/moment/locale/tlh.js ***!
-+  \*******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var numbersNouns = 'pagh_wa’_cha’_wej_loS_vagh_jav_Soch_chorgh_Hut'.split('_');
-+
-+    function translateFuture(output) {
-+        var time = output;
-+        time = (output.indexOf('jaj') !== -1) ?
-+        time.slice(0, -3) + 'leS' :
-+        (output.indexOf('jar') !== -1) ?
-+        time.slice(0, -3) + 'waQ' :
-+        (output.indexOf('DIS') !== -1) ?
-+        time.slice(0, -3) + 'nem' :
-+        time + ' pIq';
-+        return time;
-+    }
-+
-+    function translatePast(output) {
-+        var time = output;
-+        time = (output.indexOf('jaj') !== -1) ?
-+        time.slice(0, -3) + 'Hu’' :
-+        (output.indexOf('jar') !== -1) ?
-+        time.slice(0, -3) + 'wen' :
-+        (output.indexOf('DIS') !== -1) ?
-+        time.slice(0, -3) + 'ben' :
-+        time + ' ret';
-+        return time;
-+    }
-+
-+    function translate(number, withoutSuffix, string, isFuture) {
-+        var numberNoun = numberAsNoun(number);
-+        switch (string) {
-+            case 'ss':
-+                return numberNoun + ' lup';
-+            case 'mm':
-+                return numberNoun + ' tup';
-+            case 'hh':
-+                return numberNoun + ' rep';
-+            case 'dd':
-+                return numberNoun + ' jaj';
-+            case 'MM':
-+                return numberNoun + ' jar';
-+            case 'yy':
-+                return numberNoun + ' DIS';
-+        }
-+    }
-+
-+    function numberAsNoun(number) {
-+        var hundred = Math.floor((number % 1000) / 100),
-+        ten = Math.floor((number % 100) / 10),
-+        one = number % 10,
-+        word = '';
-+        if (hundred > 0) {
-+            word += numbersNouns[hundred] + 'vatlh';
-+        }
-+        if (ten > 0) {
-+            word += ((word !== '') ? ' ' : '') + numbersNouns[ten] + 'maH';
-+        }
-+        if (one > 0) {
-+            word += ((word !== '') ? ' ' : '') + numbersNouns[one];
-+        }
-+        return (word === '') ? 'pagh' : word;
-+    }
-+
-+    var tlh = moment.defineLocale('tlh', {
-+        months : 'tera’ jar wa’_tera’ jar cha’_tera’ jar wej_tera’ jar loS_tera’ jar vagh_tera’ jar jav_tera’ jar Soch_tera’ jar chorgh_tera’ jar Hut_tera’ jar wa’maH_tera’ jar wa’maH wa’_tera’ jar wa’maH cha’'.split('_'),
-+        monthsShort : 'jar wa’_jar cha’_jar wej_jar loS_jar vagh_jar jav_jar Soch_jar chorgh_jar Hut_jar wa’maH_jar wa’maH wa’_jar wa’maH cha’'.split('_'),
-+        monthsParseExact : true,
-+        weekdays : 'lojmItjaj_DaSjaj_povjaj_ghItlhjaj_loghjaj_buqjaj_ghInjaj'.split('_'),
-+        weekdaysShort : 'lojmItjaj_DaSjaj_povjaj_ghItlhjaj_loghjaj_buqjaj_ghInjaj'.split('_'),
-+        weekdaysMin : 'lojmItjaj_DaSjaj_povjaj_ghItlhjaj_loghjaj_buqjaj_ghInjaj'.split('_'),
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD.MM.YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY HH:mm',
-+            LLLL : 'dddd, D MMMM YYYY HH:mm'
-+        },
-+        calendar : {
-+            sameDay: '[DaHjaj] LT',
-+            nextDay: '[wa’leS] LT',
-+            nextWeek: 'LLL',
-+            lastDay: '[wa’Hu’] LT',
-+            lastWeek: 'LLL',
-+            sameElse: 'L'
-+        },
-+        relativeTime : {
-+            future : translateFuture,
-+            past : translatePast,
-+            s : 'puS lup',
-+            ss : translate,
-+            m : 'wa’ tup',
-+            mm : translate,
-+            h : 'wa’ rep',
-+            hh : translate,
-+            d : 'wa’ jaj',
-+            dd : translate,
-+            M : 'wa’ jar',
-+            MM : translate,
-+            y : 'wa’ DIS',
-+            yy : translate
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}\./,
-+        ordinal : '%d.',
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return tlh;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/tr.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/tr.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+    var suffixes = {
-+        1: '\'inci',
-+        5: '\'inci',
-+        8: '\'inci',
-+        70: '\'inci',
-+        80: '\'inci',
-+        2: '\'nci',
-+        7: '\'nci',
-+        20: '\'nci',
-+        50: '\'nci',
-+        3: '\'üncü',
-+        4: '\'üncü',
-+        100: '\'üncü',
-+        6: '\'ncı',
-+        9: '\'uncu',
-+        10: '\'uncu',
-+        30: '\'uncu',
-+        60: '\'ıncı',
-+        90: '\'ıncı'
-+    };
-+
-+    var tr = moment.defineLocale('tr', {
-+        months : 'Ocak_Şubat_Mart_Nisan_Mayıs_Haziran_Temmuz_Ağustos_Eylül_Ekim_Kasım_Aralık'.split('_'),
-+        monthsShort : 'Oca_Şub_Mar_Nis_May_Haz_Tem_Ağu_Eyl_Eki_Kas_Ara'.split('_'),
-+        weekdays : 'Pazar_Pazartesi_Salı_Çarşamba_Perşembe_Cuma_Cumartesi'.split('_'),
-+        weekdaysShort : 'Paz_Pts_Sal_Çar_Per_Cum_Cts'.split('_'),
-+        weekdaysMin : 'Pz_Pt_Sa_Ça_Pe_Cu_Ct'.split('_'),
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD.MM.YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY HH:mm',
-+            LLLL : 'dddd, D MMMM YYYY HH:mm'
-+        },
-+        calendar : {
-+            sameDay : '[bugün saat] LT',
-+            nextDay : '[yarın saat] LT',
-+            nextWeek : '[gelecek] dddd [saat] LT',
-+            lastDay : '[dün] LT',
-+            lastWeek : '[geçen] dddd [saat] LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : '%s sonra',
-+            past : '%s önce',
-+            s : 'birkaç saniye',
-+            ss : '%d saniye',
-+            m : 'bir dakika',
-+            mm : '%d dakika',
-+            h : 'bir saat',
-+            hh : '%d saat',
-+            d : 'bir gün',
-+            dd : '%d gün',
-+            M : 'bir ay',
-+            MM : '%d ay',
-+            y : 'bir yıl',
-+            yy : '%d yıl'
-+        },
-+        ordinal: function (number, period) {
-+            switch (period) {
-+                case 'd':
-+                case 'D':
-+                case 'Do':
-+                case 'DD':
-+                    return number;
-+                default:
-+                    if (number === 0) {  // special case for zero
-+                        return number + '\'ıncı';
-+                    }
-+                    var a = number % 10,
-+                        b = number % 100 - a,
-+                        c = number >= 100 ? 100 : null;
-+                    return number + (suffixes[a] || suffixes[b] || suffixes[c]);
-+            }
-+        },
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 7  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return tr;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/tzl.js":
-+/*!*******************************************!*\
-+  !*** ./node_modules/moment/locale/tzl.js ***!
-+  \*******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    // After the year there should be a slash and the amount of years since December 26, 1979 in Roman numerals.
-+    // This is currently too difficult (maybe even impossible) to add.
-+    var tzl = moment.defineLocale('tzl', {
-+        months : 'Januar_Fevraglh_Març_Avrïu_Mai_Gün_Julia_Guscht_Setemvar_Listopäts_Noemvar_Zecemvar'.split('_'),
-+        monthsShort : 'Jan_Fev_Mar_Avr_Mai_Gün_Jul_Gus_Set_Lis_Noe_Zec'.split('_'),
-+        weekdays : 'Súladi_Lúneçi_Maitzi_Márcuri_Xhúadi_Viénerçi_Sáturi'.split('_'),
-+        weekdaysShort : 'Súl_Lún_Mai_Már_Xhú_Vié_Sát'.split('_'),
-+        weekdaysMin : 'Sú_Lú_Ma_Má_Xh_Vi_Sá'.split('_'),
-+        longDateFormat : {
-+            LT : 'HH.mm',
-+            LTS : 'HH.mm.ss',
-+            L : 'DD.MM.YYYY',
-+            LL : 'D. MMMM [dallas] YYYY',
-+            LLL : 'D. MMMM [dallas] YYYY HH.mm',
-+            LLLL : 'dddd, [li] D. MMMM [dallas] YYYY HH.mm'
-+        },
-+        meridiemParse: /d\'o|d\'a/i,
-+        isPM : function (input) {
-+            return 'd\'o' === input.toLowerCase();
-+        },
-+        meridiem : function (hours, minutes, isLower) {
-+            if (hours > 11) {
-+                return isLower ? 'd\'o' : 'D\'O';
-+            } else {
-+                return isLower ? 'd\'a' : 'D\'A';
-+            }
-+        },
-+        calendar : {
-+            sameDay : '[oxhi à] LT',
-+            nextDay : '[demà à] LT',
-+            nextWeek : 'dddd [à] LT',
-+            lastDay : '[ieiri à] LT',
-+            lastWeek : '[sür el] dddd [lasteu à] LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'osprei %s',
-+            past : 'ja%s',
-+            s : processRelativeTime,
-+            ss : processRelativeTime,
-+            m : processRelativeTime,
-+            mm : processRelativeTime,
-+            h : processRelativeTime,
-+            hh : processRelativeTime,
-+            d : processRelativeTime,
-+            dd : processRelativeTime,
-+            M : processRelativeTime,
-+            MM : processRelativeTime,
-+            y : processRelativeTime,
-+            yy : processRelativeTime
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}\./,
-+        ordinal : '%d.',
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    function processRelativeTime(number, withoutSuffix, key, isFuture) {
-+        var format = {
-+            's': ['viensas secunds', '\'iensas secunds'],
-+            'ss': [number + ' secunds', '' + number + ' secunds'],
-+            'm': ['\'n míut', '\'iens míut'],
-+            'mm': [number + ' míuts', '' + number + ' míuts'],
-+            'h': ['\'n þora', '\'iensa þora'],
-+            'hh': [number + ' þoras', '' + number + ' þoras'],
-+            'd': ['\'n ziua', '\'iensa ziua'],
-+            'dd': [number + ' ziuas', '' + number + ' ziuas'],
-+            'M': ['\'n mes', '\'iens mes'],
-+            'MM': [number + ' mesen', '' + number + ' mesen'],
-+            'y': ['\'n ar', '\'iens ar'],
-+            'yy': [number + ' ars', '' + number + ' ars']
-+        };
-+        return isFuture ? format[key][0] : (withoutSuffix ? format[key][0] : format[key][1]);
-+    }
-+
-+    return tzl;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/tzm-latn.js":
-+/*!************************************************!*\
-+  !*** ./node_modules/moment/locale/tzm-latn.js ***!
-+  \************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var tzmLatn = moment.defineLocale('tzm-latn', {
-+        months : 'innayr_brˤayrˤ_marˤsˤ_ibrir_mayyw_ywnyw_ywlywz_ɣwšt_šwtanbir_ktˤwbrˤ_nwwanbir_dwjnbir'.split('_'),
-+        monthsShort : 'innayr_brˤayrˤ_marˤsˤ_ibrir_mayyw_ywnyw_ywlywz_ɣwšt_šwtanbir_ktˤwbrˤ_nwwanbir_dwjnbir'.split('_'),
-+        weekdays : 'asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas'.split('_'),
-+        weekdaysShort : 'asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas'.split('_'),
-+        weekdaysMin : 'asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas'.split('_'),
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY HH:mm',
-+            LLLL : 'dddd D MMMM YYYY HH:mm'
-+        },
-+        calendar : {
-+            sameDay: '[asdkh g] LT',
-+            nextDay: '[aska g] LT',
-+            nextWeek: 'dddd [g] LT',
-+            lastDay: '[assant g] LT',
-+            lastWeek: 'dddd [g] LT',
-+            sameElse: 'L'
-+        },
-+        relativeTime : {
-+            future : 'dadkh s yan %s',
-+            past : 'yan %s',
-+            s : 'imik',
-+            ss : '%d imik',
-+            m : 'minuḍ',
-+            mm : '%d minuḍ',
-+            h : 'saɛa',
-+            hh : '%d tassaɛin',
-+            d : 'ass',
-+            dd : '%d ossan',
-+            M : 'ayowr',
-+            MM : '%d iyyirn',
-+            y : 'asgas',
-+            yy : '%d isgasn'
-+        },
-+        week : {
-+            dow : 6, // Saturday is the first day of the week.
-+            doy : 12  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return tzmLatn;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/tzm.js":
-+/*!*******************************************!*\
-+  !*** ./node_modules/moment/locale/tzm.js ***!
-+  \*******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var tzm = moment.defineLocale('tzm', {
-+        months : 'ⵉⵏⵏⴰⵢⵔ_ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ_ⵢⵓⵏⵢⵓ_ⵢⵓⵍⵢⵓⵣ_ⵖⵓⵛⵜ_ⵛⵓⵜⴰⵏⴱⵉⵔ_ⴽⵟⵓⴱⵕ_ⵏⵓⵡⴰⵏⴱⵉⵔ_ⴷⵓⵊⵏⴱⵉⵔ'.split('_'),
-+        monthsShort : 'ⵉⵏⵏⴰⵢⵔ_ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ_ⵢⵓⵏⵢⵓ_ⵢⵓⵍⵢⵓⵣ_ⵖⵓⵛⵜ_ⵛⵓⵜⴰⵏⴱⵉⵔ_ⴽⵟⵓⴱⵕ_ⵏⵓⵡⴰⵏⴱⵉⵔ_ⴷⵓⵊⵏⴱⵉⵔ'.split('_'),
-+        weekdays : 'ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ'.split('_'),
-+        weekdaysShort : 'ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ'.split('_'),
-+        weekdaysMin : 'ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ'.split('_'),
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS: 'HH:mm:ss',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY HH:mm',
-+            LLLL : 'dddd D MMMM YYYY HH:mm'
-+        },
-+        calendar : {
-+            sameDay: '[ⴰⵙⴷⵅ ⴴ] LT',
-+            nextDay: '[ⴰⵙⴽⴰ ⴴ] LT',
-+            nextWeek: 'dddd [ⴴ] LT',
-+            lastDay: '[ⴰⵚⴰⵏⵜ ⴴ] LT',
-+            lastWeek: 'dddd [ⴴ] LT',
-+            sameElse: 'L'
-+        },
-+        relativeTime : {
-+            future : 'ⴷⴰⴷⵅ ⵙ ⵢⴰⵏ %s',
-+            past : 'ⵢⴰⵏ %s',
-+            s : 'ⵉⵎⵉⴽ',
-+            ss : '%d ⵉⵎⵉⴽ',
-+            m : 'ⵎⵉⵏⵓⴺ',
-+            mm : '%d ⵎⵉⵏⵓⴺ',
-+            h : 'ⵙⴰⵄⴰ',
-+            hh : '%d ⵜⴰⵙⵙⴰⵄⵉⵏ',
-+            d : 'ⴰⵙⵙ',
-+            dd : '%d oⵙⵙⴰⵏ',
-+            M : 'ⴰⵢoⵓⵔ',
-+            MM : '%d ⵉⵢⵢⵉⵔⵏ',
-+            y : 'ⴰⵙⴳⴰⵙ',
-+            yy : '%d ⵉⵙⴳⴰⵙⵏ'
-+        },
-+        week : {
-+            dow : 6, // Saturday is the first day of the week.
-+            doy : 12  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return tzm;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/ug-cn.js":
-+/*!*********************************************!*\
-+  !*** ./node_modules/moment/locale/ug-cn.js ***!
-+  \*********************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js language configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var ugCn = moment.defineLocale('ug-cn', {
-+        months: 'يانۋار_فېۋرال_مارت_ئاپرېل_ماي_ئىيۇن_ئىيۇل_ئاۋغۇست_سېنتەبىر_ئۆكتەبىر_نويابىر_دېكابىر'.split(
-+            '_'
-+        ),
-+        monthsShort: 'يانۋار_فېۋرال_مارت_ئاپرېل_ماي_ئىيۇن_ئىيۇل_ئاۋغۇست_سېنتەبىر_ئۆكتەبىر_نويابىر_دېكابىر'.split(
-+            '_'
-+        ),
-+        weekdays: 'يەكشەنبە_دۈشەنبە_سەيشەنبە_چارشەنبە_پەيشەنبە_جۈمە_شەنبە'.split(
-+            '_'
-+        ),
-+        weekdaysShort: 'يە_دۈ_سە_چا_پە_جۈ_شە'.split('_'),
-+        weekdaysMin: 'يە_دۈ_سە_چا_پە_جۈ_شە'.split('_'),
-+        longDateFormat: {
-+            LT: 'HH:mm',
-+            LTS: 'HH:mm:ss',
-+            L: 'YYYY-MM-DD',
-+            LL: 'YYYY-يىلىM-ئاينىڭD-كۈنى',
-+            LLL: 'YYYY-يىلىM-ئاينىڭD-كۈنى، HH:mm',
-+            LLLL: 'dddd، YYYY-يىلىM-ئاينىڭD-كۈنى، HH:mm'
-+        },
-+        meridiemParse: /يېرىم كېچە|سەھەر|چۈشتىن بۇرۇن|چۈش|چۈشتىن كېيىن|كەچ/,
-+        meridiemHour: function (hour, meridiem) {
-+            if (hour === 12) {
-+                hour = 0;
-+            }
-+            if (
-+                meridiem === 'يېرىم كېچە' ||
-+                meridiem === 'سەھەر' ||
-+                meridiem === 'چۈشتىن بۇرۇن'
-+            ) {
-+                return hour;
-+            } else if (meridiem === 'چۈشتىن كېيىن' || meridiem === 'كەچ') {
-+                return hour + 12;
-+            } else {
-+                return hour >= 11 ? hour : hour + 12;
-+            }
-+        },
-+        meridiem: function (hour, minute, isLower) {
-+            var hm = hour * 100 + minute;
-+            if (hm < 600) {
-+                return 'يېرىم كېچە';
-+            } else if (hm < 900) {
-+                return 'سەھەر';
-+            } else if (hm < 1130) {
-+                return 'چۈشتىن بۇرۇن';
-+            } else if (hm < 1230) {
-+                return 'چۈش';
-+            } else if (hm < 1800) {
-+                return 'چۈشتىن كېيىن';
-+            } else {
-+                return 'كەچ';
-+            }
-+        },
-+        calendar: {
-+            sameDay: '[بۈگۈن سائەت] LT',
-+            nextDay: '[ئەتە سائەت] LT',
-+            nextWeek: '[كېلەركى] dddd [سائەت] LT',
-+            lastDay: '[تۆنۈگۈن] LT',
-+            lastWeek: '[ئالدىنقى] dddd [سائەت] LT',
-+            sameElse: 'L'
-+        },
-+        relativeTime: {
-+            future: '%s كېيىن',
-+            past: '%s بۇرۇن',
-+            s: 'نەچچە سېكونت',
-+            ss: '%d سېكونت',
-+            m: 'بىر مىنۇت',
-+            mm: '%d مىنۇت',
-+            h: 'بىر سائەت',
-+            hh: '%d سائەت',
-+            d: 'بىر كۈن',
-+            dd: '%d كۈن',
-+            M: 'بىر ئاي',
-+            MM: '%d ئاي',
-+            y: 'بىر يىل',
-+            yy: '%d يىل'
-+        },
-+
-+        dayOfMonthOrdinalParse: /\d{1,2}(-كۈنى|-ئاي|-ھەپتە)/,
-+        ordinal: function (number, period) {
-+            switch (period) {
-+                case 'd':
-+                case 'D':
-+                case 'DDD':
-+                    return number + '-كۈنى';
-+                case 'w':
-+                case 'W':
-+                    return number + '-ھەپتە';
-+                default:
-+                    return number;
-+            }
-+        },
-+        preparse: function (string) {
-+            return string.replace(/،/g, ',');
-+        },
-+        postformat: function (string) {
-+            return string.replace(/,/g, '،');
-+        },
-+        week: {
-+            // GB/T 7408-1994《数据元和交换格式·信息交换·日期和时间表示法》与ISO 8601:1988等效
-+            dow: 1, // Monday is the first day of the week.
-+            doy: 7 // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return ugCn;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/uk.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/uk.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    function plural(word, num) {
-+        var forms = word.split('_');
-+        return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]);
-+    }
-+    function relativeTimeWithPlural(number, withoutSuffix, key) {
-+        var format = {
-+            'ss': withoutSuffix ? 'секунда_секунди_секунд' : 'секунду_секунди_секунд',
-+            'mm': withoutSuffix ? 'хвилина_хвилини_хвилин' : 'хвилину_хвилини_хвилин',
-+            'hh': withoutSuffix ? 'година_години_годин' : 'годину_години_годин',
-+            'dd': 'день_дні_днів',
-+            'MM': 'місяць_місяці_місяців',
-+            'yy': 'рік_роки_років'
-+        };
-+        if (key === 'm') {
-+            return withoutSuffix ? 'хвилина' : 'хвилину';
-+        }
-+        else if (key === 'h') {
-+            return withoutSuffix ? 'година' : 'годину';
-+        }
-+        else {
-+            return number + ' ' + plural(format[key], +number);
-+        }
-+    }
-+    function weekdaysCaseReplace(m, format) {
-+        var weekdays = {
-+            'nominative': 'неділя_понеділок_вівторок_середа_четвер_п’ятниця_субота'.split('_'),
-+            'accusative': 'неділю_понеділок_вівторок_середу_четвер_п’ятницю_суботу'.split('_'),
-+            'genitive': 'неділі_понеділка_вівторка_середи_четверга_п’ятниці_суботи'.split('_')
-+        };
-+
-+        if (!m) {
-+            return weekdays['nominative'];
-+        }
-+
-+        var nounCase = (/(\[[ВвУу]\]) ?dddd/).test(format) ?
-+            'accusative' :
-+            ((/\[?(?:минулої|наступної)? ?\] ?dddd/).test(format) ?
-+                'genitive' :
-+                'nominative');
-+        return weekdays[nounCase][m.day()];
-+    }
-+    function processHoursFunction(str) {
-+        return function () {
-+            return str + 'о' + (this.hours() === 11 ? 'б' : '') + '] LT';
-+        };
-+    }
-+
-+    var uk = moment.defineLocale('uk', {
-+        months : {
-+            'format': 'січня_лютого_березня_квітня_травня_червня_липня_серпня_вересня_жовтня_листопада_грудня'.split('_'),
-+            'standalone': 'січень_лютий_березень_квітень_травень_червень_липень_серпень_вересень_жовтень_листопад_грудень'.split('_')
-+        },
-+        monthsShort : 'січ_лют_бер_квіт_трав_черв_лип_серп_вер_жовт_лист_груд'.split('_'),
-+        weekdays : weekdaysCaseReplace,
-+        weekdaysShort : 'нд_пн_вт_ср_чт_пт_сб'.split('_'),
-+        weekdaysMin : 'нд_пн_вт_ср_чт_пт_сб'.split('_'),
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD.MM.YYYY',
-+            LL : 'D MMMM YYYY р.',
-+            LLL : 'D MMMM YYYY р., HH:mm',
-+            LLLL : 'dddd, D MMMM YYYY р., HH:mm'
-+        },
-+        calendar : {
-+            sameDay: processHoursFunction('[Сьогодні '),
-+            nextDay: processHoursFunction('[Завтра '),
-+            lastDay: processHoursFunction('[Вчора '),
-+            nextWeek: processHoursFunction('[У] dddd ['),
-+            lastWeek: function () {
-+                switch (this.day()) {
-+                    case 0:
-+                    case 3:
-+                    case 5:
-+                    case 6:
-+                        return processHoursFunction('[Минулої] dddd [').call(this);
-+                    case 1:
-+                    case 2:
-+                    case 4:
-+                        return processHoursFunction('[Минулого] dddd [').call(this);
-+                }
-+            },
-+            sameElse: 'L'
-+        },
-+        relativeTime : {
-+            future : 'за %s',
-+            past : '%s тому',
-+            s : 'декілька секунд',
-+            ss : relativeTimeWithPlural,
-+            m : relativeTimeWithPlural,
-+            mm : relativeTimeWithPlural,
-+            h : 'годину',
-+            hh : relativeTimeWithPlural,
-+            d : 'день',
-+            dd : relativeTimeWithPlural,
-+            M : 'місяць',
-+            MM : relativeTimeWithPlural,
-+            y : 'рік',
-+            yy : relativeTimeWithPlural
-+        },
-+        // M. E.: those two are virtually unused but a user might want to implement them for his/her website for some reason
-+        meridiemParse: /ночі|ранку|дня|вечора/,
-+        isPM: function (input) {
-+            return /^(дня|вечора)$/.test(input);
-+        },
-+        meridiem : function (hour, minute, isLower) {
-+            if (hour < 4) {
-+                return 'ночі';
-+            } else if (hour < 12) {
-+                return 'ранку';
-+            } else if (hour < 17) {
-+                return 'дня';
-+            } else {
-+                return 'вечора';
-+            }
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}-(й|го)/,
-+        ordinal: function (number, period) {
-+            switch (period) {
-+                case 'M':
-+                case 'd':
-+                case 'DDD':
-+                case 'w':
-+                case 'W':
-+                    return number + '-й';
-+                case 'D':
-+                    return number + '-го';
-+                default:
-+                    return number;
-+            }
-+        },
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 7  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return uk;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/ur.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/ur.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var months = [
-+        'جنوری',
-+        'فروری',
-+        'مارچ',
-+        'اپریل',
-+        'مئی',
-+        'جون',
-+        'جولائی',
-+        'اگست',
-+        'ستمبر',
-+        'اکتوبر',
-+        'نومبر',
-+        'دسمبر'
-+    ];
-+    var days = [
-+        'اتوار',
-+        'پیر',
-+        'منگل',
-+        'بدھ',
-+        'جمعرات',
-+        'جمعہ',
-+        'ہفتہ'
-+    ];
-+
-+    var ur = moment.defineLocale('ur', {
-+        months : months,
-+        monthsShort : months,
-+        weekdays : days,
-+        weekdaysShort : days,
-+        weekdaysMin : days,
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY HH:mm',
-+            LLLL : 'dddd، D MMMM YYYY HH:mm'
-+        },
-+        meridiemParse: /صبح|شام/,
-+        isPM : function (input) {
-+            return 'شام' === input;
-+        },
-+        meridiem : function (hour, minute, isLower) {
-+            if (hour < 12) {
-+                return 'صبح';
-+            }
-+            return 'شام';
-+        },
-+        calendar : {
-+            sameDay : '[آج بوقت] LT',
-+            nextDay : '[کل بوقت] LT',
-+            nextWeek : 'dddd [بوقت] LT',
-+            lastDay : '[گذشتہ روز بوقت] LT',
-+            lastWeek : '[گذشتہ] dddd [بوقت] LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : '%s بعد',
-+            past : '%s قبل',
-+            s : 'چند سیکنڈ',
-+            ss : '%d سیکنڈ',
-+            m : 'ایک منٹ',
-+            mm : '%d منٹ',
-+            h : 'ایک گھنٹہ',
-+            hh : '%d گھنٹے',
-+            d : 'ایک دن',
-+            dd : '%d دن',
-+            M : 'ایک ماہ',
-+            MM : '%d ماہ',
-+            y : 'ایک سال',
-+            yy : '%d سال'
-+        },
-+        preparse: function (string) {
-+            return string.replace(/،/g, ',');
-+        },
-+        postformat: function (string) {
-+            return string.replace(/,/g, '،');
-+        },
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return ur;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/uz-latn.js":
-+/*!***********************************************!*\
-+  !*** ./node_modules/moment/locale/uz-latn.js ***!
-+  \***********************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var uzLatn = moment.defineLocale('uz-latn', {
-+        months : 'Yanvar_Fevral_Mart_Aprel_May_Iyun_Iyul_Avgust_Sentabr_Oktabr_Noyabr_Dekabr'.split('_'),
-+        monthsShort : 'Yan_Fev_Mar_Apr_May_Iyun_Iyul_Avg_Sen_Okt_Noy_Dek'.split('_'),
-+        weekdays : 'Yakshanba_Dushanba_Seshanba_Chorshanba_Payshanba_Juma_Shanba'.split('_'),
-+        weekdaysShort : 'Yak_Dush_Sesh_Chor_Pay_Jum_Shan'.split('_'),
-+        weekdaysMin : 'Ya_Du_Se_Cho_Pa_Ju_Sha'.split('_'),
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY HH:mm',
-+            LLLL : 'D MMMM YYYY, dddd HH:mm'
-+        },
-+        calendar : {
-+            sameDay : '[Bugun soat] LT [da]',
-+            nextDay : '[Ertaga] LT [da]',
-+            nextWeek : 'dddd [kuni soat] LT [da]',
-+            lastDay : '[Kecha soat] LT [da]',
-+            lastWeek : '[O\'tgan] dddd [kuni soat] LT [da]',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'Yaqin %s ichida',
-+            past : 'Bir necha %s oldin',
-+            s : 'soniya',
-+            ss : '%d soniya',
-+            m : 'bir daqiqa',
-+            mm : '%d daqiqa',
-+            h : 'bir soat',
-+            hh : '%d soat',
-+            d : 'bir kun',
-+            dd : '%d kun',
-+            M : 'bir oy',
-+            MM : '%d oy',
-+            y : 'bir yil',
-+            yy : '%d yil'
-+        },
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 7  // The week that contains Jan 1st is the first week of the year.
-+        }
-+    });
-+
-+    return uzLatn;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/uz.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/uz.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var uz = moment.defineLocale('uz', {
-+        months : 'январ_феврал_март_апрел_май_июн_июл_август_сентябр_октябр_ноябр_декабр'.split('_'),
-+        monthsShort : 'янв_фев_мар_апр_май_июн_июл_авг_сен_окт_ноя_дек'.split('_'),
-+        weekdays : 'Якшанба_Душанба_Сешанба_Чоршанба_Пайшанба_Жума_Шанба'.split('_'),
-+        weekdaysShort : 'Якш_Душ_Сеш_Чор_Пай_Жум_Шан'.split('_'),
-+        weekdaysMin : 'Як_Ду_Се_Чо_Па_Жу_Ша'.split('_'),
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY HH:mm',
-+            LLLL : 'D MMMM YYYY, dddd HH:mm'
-+        },
-+        calendar : {
-+            sameDay : '[Бугун соат] LT [да]',
-+            nextDay : '[Эртага] LT [да]',
-+            nextWeek : 'dddd [куни соат] LT [да]',
-+            lastDay : '[Кеча соат] LT [да]',
-+            lastWeek : '[Утган] dddd [куни соат] LT [да]',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'Якин %s ичида',
-+            past : 'Бир неча %s олдин',
-+            s : 'фурсат',
-+            ss : '%d фурсат',
-+            m : 'бир дакика',
-+            mm : '%d дакика',
-+            h : 'бир соат',
-+            hh : '%d соат',
-+            d : 'бир кун',
-+            dd : '%d кун',
-+            M : 'бир ой',
-+            MM : '%d ой',
-+            y : 'бир йил',
-+            yy : '%d йил'
-+        },
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 7  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return uz;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/vi.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/vi.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var vi = moment.defineLocale('vi', {
-+        months : 'tháng 1_tháng 2_tháng 3_tháng 4_tháng 5_tháng 6_tháng 7_tháng 8_tháng 9_tháng 10_tháng 11_tháng 12'.split('_'),
-+        monthsShort : 'Th01_Th02_Th03_Th04_Th05_Th06_Th07_Th08_Th09_Th10_Th11_Th12'.split('_'),
-+        monthsParseExact : true,
-+        weekdays : 'chủ nhật_thứ hai_thứ ba_thứ tư_thứ năm_thứ sáu_thứ bảy'.split('_'),
-+        weekdaysShort : 'CN_T2_T3_T4_T5_T6_T7'.split('_'),
-+        weekdaysMin : 'CN_T2_T3_T4_T5_T6_T7'.split('_'),
-+        weekdaysParseExact : true,
-+        meridiemParse: /sa|ch/i,
-+        isPM : function (input) {
-+            return /^ch$/i.test(input);
-+        },
-+        meridiem : function (hours, minutes, isLower) {
-+            if (hours < 12) {
-+                return isLower ? 'sa' : 'SA';
-+            } else {
-+                return isLower ? 'ch' : 'CH';
-+            }
-+        },
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM [năm] YYYY',
-+            LLL : 'D MMMM [năm] YYYY HH:mm',
-+            LLLL : 'dddd, D MMMM [năm] YYYY HH:mm',
-+            l : 'DD/M/YYYY',
-+            ll : 'D MMM YYYY',
-+            lll : 'D MMM YYYY HH:mm',
-+            llll : 'ddd, D MMM YYYY HH:mm'
-+        },
-+        calendar : {
-+            sameDay: '[Hôm nay lúc] LT',
-+            nextDay: '[Ngày mai lúc] LT',
-+            nextWeek: 'dddd [tuần tới lúc] LT',
-+            lastDay: '[Hôm qua lúc] LT',
-+            lastWeek: 'dddd [tuần rồi lúc] LT',
-+            sameElse: 'L'
-+        },
-+        relativeTime : {
-+            future : '%s tới',
-+            past : '%s trước',
-+            s : 'vài giây',
-+            ss : '%d giây' ,
-+            m : 'một phút',
-+            mm : '%d phút',
-+            h : 'một giờ',
-+            hh : '%d giờ',
-+            d : 'một ngày',
-+            dd : '%d ngày',
-+            M : 'một tháng',
-+            MM : '%d tháng',
-+            y : 'một năm',
-+            yy : '%d năm'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}/,
-+        ordinal : function (number) {
-+            return number;
-+        },
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return vi;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/x-pseudo.js":
-+/*!************************************************!*\
-+  !*** ./node_modules/moment/locale/x-pseudo.js ***!
-+  \************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var xPseudo = moment.defineLocale('x-pseudo', {
-+        months : 'J~áñúá~rý_F~ébrú~árý_~Márc~h_Áp~ríl_~Máý_~Júñé~_Júl~ý_Áú~gúst~_Sép~témb~ér_Ó~ctób~ér_Ñ~óvém~bér_~Décé~mbér'.split('_'),
-+        monthsShort : 'J~áñ_~Féb_~Már_~Ápr_~Máý_~Júñ_~Júl_~Áúg_~Sép_~Óct_~Ñóv_~Déc'.split('_'),
-+        monthsParseExact : true,
-+        weekdays : 'S~úñdá~ý_Mó~ñdáý~_Túé~sdáý~_Wéd~ñésd~áý_T~húrs~dáý_~Fríd~áý_S~átúr~dáý'.split('_'),
-+        weekdaysShort : 'S~úñ_~Móñ_~Túé_~Wéd_~Thú_~Frí_~Sát'.split('_'),
-+        weekdaysMin : 'S~ú_Mó~_Tú_~Wé_T~h_Fr~_Sá'.split('_'),
-+        weekdaysParseExact : true,
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY HH:mm',
-+            LLLL : 'dddd, D MMMM YYYY HH:mm'
-+        },
-+        calendar : {
-+            sameDay : '[T~ódá~ý át] LT',
-+            nextDay : '[T~ómó~rró~w át] LT',
-+            nextWeek : 'dddd [át] LT',
-+            lastDay : '[Ý~ést~érdá~ý át] LT',
-+            lastWeek : '[L~ást] dddd [át] LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'í~ñ %s',
-+            past : '%s á~gó',
-+            s : 'á ~féw ~sécó~ñds',
-+            ss : '%d s~écóñ~ds',
-+            m : 'á ~míñ~úté',
-+            mm : '%d m~íñú~tés',
-+            h : 'á~ñ hó~úr',
-+            hh : '%d h~óúrs',
-+            d : 'á ~dáý',
-+            dd : '%d d~áýs',
-+            M : 'á ~móñ~th',
-+            MM : '%d m~óñt~hs',
-+            y : 'á ~ýéár',
-+            yy : '%d ý~éárs'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}(th|st|nd|rd)/,
-+        ordinal : function (number) {
-+            var b = number % 10,
-+                output = (~~(number % 100 / 10) === 1) ? 'th' :
-+                (b === 1) ? 'st' :
-+                (b === 2) ? 'nd' :
-+                (b === 3) ? 'rd' : 'th';
-+            return number + output;
-+        },
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return xPseudo;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/yo.js":
-+/*!******************************************!*\
-+  !*** ./node_modules/moment/locale/yo.js ***!
-+  \******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var yo = moment.defineLocale('yo', {
-+        months : 'Sẹ́rẹ́_Èrèlè_Ẹrẹ̀nà_Ìgbé_Èbibi_Òkùdu_Agẹmo_Ògún_Owewe_Ọ̀wàrà_Bélú_Ọ̀pẹ̀̀'.split('_'),
-+        monthsShort : 'Sẹ́r_Èrl_Ẹrn_Ìgb_Èbi_Òkù_Agẹ_Ògú_Owe_Ọ̀wà_Bél_Ọ̀pẹ̀̀'.split('_'),
-+        weekdays : 'Àìkú_Ajé_Ìsẹ́gun_Ọjọ́rú_Ọjọ́bọ_Ẹtì_Àbámẹ́ta'.split('_'),
-+        weekdaysShort : 'Àìk_Ajé_Ìsẹ́_Ọjr_Ọjb_Ẹtì_Àbá'.split('_'),
-+        weekdaysMin : 'Àì_Aj_Ìs_Ọr_Ọb_Ẹt_Àb'.split('_'),
-+        longDateFormat : {
-+            LT : 'h:mm A',
-+            LTS : 'h:mm:ss A',
-+            L : 'DD/MM/YYYY',
-+            LL : 'D MMMM YYYY',
-+            LLL : 'D MMMM YYYY h:mm A',
-+            LLLL : 'dddd, D MMMM YYYY h:mm A'
-+        },
-+        calendar : {
-+            sameDay : '[Ònì ni] LT',
-+            nextDay : '[Ọ̀la ni] LT',
-+            nextWeek : 'dddd [Ọsẹ̀ tón\'bọ] [ni] LT',
-+            lastDay : '[Àna ni] LT',
-+            lastWeek : 'dddd [Ọsẹ̀ tólọ́] [ni] LT',
-+            sameElse : 'L'
-+        },
-+        relativeTime : {
-+            future : 'ní %s',
-+            past : '%s kọjá',
-+            s : 'ìsẹjú aayá die',
-+            ss :'aayá %d',
-+            m : 'ìsẹjú kan',
-+            mm : 'ìsẹjú %d',
-+            h : 'wákati kan',
-+            hh : 'wákati %d',
-+            d : 'ọjọ́ kan',
-+            dd : 'ọjọ́ %d',
-+            M : 'osù kan',
-+            MM : 'osù %d',
-+            y : 'ọdún kan',
-+            yy : 'ọdún %d'
-+        },
-+        dayOfMonthOrdinalParse : /ọjọ́\s\d{1,2}/,
-+        ordinal : 'ọjọ́ %d',
-+        week : {
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4 // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return yo;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/zh-cn.js":
-+/*!*********************************************!*\
-+  !*** ./node_modules/moment/locale/zh-cn.js ***!
-+  \*********************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var zhCn = moment.defineLocale('zh-cn', {
-+        months : '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'),
-+        monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
-+        weekdays : '星期日_星期一_星期二_星期三_星期四_星期五_星期六'.split('_'),
-+        weekdaysShort : '周日_周一_周二_周三_周四_周五_周六'.split('_'),
-+        weekdaysMin : '日_一_二_三_四_五_六'.split('_'),
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'YYYY/MM/DD',
-+            LL : 'YYYY年M月D日',
-+            LLL : 'YYYY年M月D日Ah点mm分',
-+            LLLL : 'YYYY年M月D日ddddAh点mm分',
-+            l : 'YYYY/M/D',
-+            ll : 'YYYY年M月D日',
-+            lll : 'YYYY年M月D日 HH:mm',
-+            llll : 'YYYY年M月D日dddd HH:mm'
-+        },
-+        meridiemParse: /凌晨|早上|上午|中午|下午|晚上/,
-+        meridiemHour: function (hour, meridiem) {
-+            if (hour === 12) {
-+                hour = 0;
-+            }
-+            if (meridiem === '凌晨' || meridiem === '早上' ||
-+                    meridiem === '上午') {
-+                return hour;
-+            } else if (meridiem === '下午' || meridiem === '晚上') {
-+                return hour + 12;
-+            } else {
-+                // '中午'
-+                return hour >= 11 ? hour : hour + 12;
-+            }
-+        },
-+        meridiem : function (hour, minute, isLower) {
-+            var hm = hour * 100 + minute;
-+            if (hm < 600) {
-+                return '凌晨';
-+            } else if (hm < 900) {
-+                return '早上';
-+            } else if (hm < 1130) {
-+                return '上午';
-+            } else if (hm < 1230) {
-+                return '中午';
-+            } else if (hm < 1800) {
-+                return '下午';
-+            } else {
-+                return '晚上';
-+            }
-+        },
-+        calendar : {
-+            sameDay : '[今天]LT',
-+            nextDay : '[明天]LT',
-+            nextWeek : '[下]ddddLT',
-+            lastDay : '[昨天]LT',
-+            lastWeek : '[上]ddddLT',
-+            sameElse : 'L'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}(日|月|周)/,
-+        ordinal : function (number, period) {
-+            switch (period) {
-+                case 'd':
-+                case 'D':
-+                case 'DDD':
-+                    return number + '日';
-+                case 'M':
-+                    return number + '月';
-+                case 'w':
-+                case 'W':
-+                    return number + '周';
-+                default:
-+                    return number;
-+            }
-+        },
-+        relativeTime : {
-+            future : '%s内',
-+            past : '%s前',
-+            s : '几秒',
-+            ss : '%d 秒',
-+            m : '1 分钟',
-+            mm : '%d 分钟',
-+            h : '1 小时',
-+            hh : '%d 小时',
-+            d : '1 天',
-+            dd : '%d 天',
-+            M : '1 个月',
-+            MM : '%d 个月',
-+            y : '1 年',
-+            yy : '%d 年'
-+        },
-+        week : {
-+            // GB/T 7408-1994《数据元和交换格式·信息交换·日期和时间表示法》与ISO 8601:1988等效
-+            dow : 1, // Monday is the first day of the week.
-+            doy : 4  // The week that contains Jan 4th is the first week of the year.
-+        }
-+    });
-+
-+    return zhCn;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/zh-hk.js":
-+/*!*********************************************!*\
-+  !*** ./node_modules/moment/locale/zh-hk.js ***!
-+  \*********************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var zhHk = moment.defineLocale('zh-hk', {
-+        months : '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'),
-+        monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
-+        weekdays : '星期日_星期一_星期二_星期三_星期四_星期五_星期六'.split('_'),
-+        weekdaysShort : '週日_週一_週二_週三_週四_週五_週六'.split('_'),
-+        weekdaysMin : '日_一_二_三_四_五_六'.split('_'),
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'YYYY/MM/DD',
-+            LL : 'YYYY年M月D日',
-+            LLL : 'YYYY年M月D日 HH:mm',
-+            LLLL : 'YYYY年M月D日dddd HH:mm',
-+            l : 'YYYY/M/D',
-+            ll : 'YYYY年M月D日',
-+            lll : 'YYYY年M月D日 HH:mm',
-+            llll : 'YYYY年M月D日dddd HH:mm'
-+        },
-+        meridiemParse: /凌晨|早上|上午|中午|下午|晚上/,
-+        meridiemHour : function (hour, meridiem) {
-+            if (hour === 12) {
-+                hour = 0;
-+            }
-+            if (meridiem === '凌晨' || meridiem === '早上' || meridiem === '上午') {
-+                return hour;
-+            } else if (meridiem === '中午') {
-+                return hour >= 11 ? hour : hour + 12;
-+            } else if (meridiem === '下午' || meridiem === '晚上') {
-+                return hour + 12;
-+            }
-+        },
-+        meridiem : function (hour, minute, isLower) {
-+            var hm = hour * 100 + minute;
-+            if (hm < 600) {
-+                return '凌晨';
-+            } else if (hm < 900) {
-+                return '早上';
-+            } else if (hm < 1130) {
-+                return '上午';
-+            } else if (hm < 1230) {
-+                return '中午';
-+            } else if (hm < 1800) {
-+                return '下午';
-+            } else {
-+                return '晚上';
-+            }
-+        },
-+        calendar : {
-+            sameDay : '[今天]LT',
-+            nextDay : '[明天]LT',
-+            nextWeek : '[下]ddddLT',
-+            lastDay : '[昨天]LT',
-+            lastWeek : '[上]ddddLT',
-+            sameElse : 'L'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}(日|月|週)/,
-+        ordinal : function (number, period) {
-+            switch (period) {
-+                case 'd' :
-+                case 'D' :
-+                case 'DDD' :
-+                    return number + '日';
-+                case 'M' :
-+                    return number + '月';
-+                case 'w' :
-+                case 'W' :
-+                    return number + '週';
-+                default :
-+                    return number;
-+            }
-+        },
-+        relativeTime : {
-+            future : '%s內',
-+            past : '%s前',
-+            s : '幾秒',
-+            ss : '%d 秒',
-+            m : '1 分鐘',
-+            mm : '%d 分鐘',
-+            h : '1 小時',
-+            hh : '%d 小時',
-+            d : '1 天',
-+            dd : '%d 天',
-+            M : '1 個月',
-+            MM : '%d 個月',
-+            y : '1 年',
-+            yy : '%d 年'
-+        }
-+    });
-+
-+    return zhHk;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/locale/zh-tw.js":
-+/*!*********************************************!*\
-+  !*** ./node_modules/moment/locale/zh-tw.js ***!
-+  \*********************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+//! moment.js locale configuration
-+
-+;(function (global, factory) {
-+    true ? factory(__webpack_require__(/*! ../moment */ "./node_modules/moment/moment.js")) :
-+   undefined
-+}(this, (function (moment) { 'use strict';
-+
-+
-+    var zhTw = moment.defineLocale('zh-tw', {
-+        months : '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'),
-+        monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
-+        weekdays : '星期日_星期一_星期二_星期三_星期四_星期五_星期六'.split('_'),
-+        weekdaysShort : '週日_週一_週二_週三_週四_週五_週六'.split('_'),
-+        weekdaysMin : '日_一_二_三_四_五_六'.split('_'),
-+        longDateFormat : {
-+            LT : 'HH:mm',
-+            LTS : 'HH:mm:ss',
-+            L : 'YYYY/MM/DD',
-+            LL : 'YYYY年M月D日',
-+            LLL : 'YYYY年M月D日 HH:mm',
-+            LLLL : 'YYYY年M月D日dddd HH:mm',
-+            l : 'YYYY/M/D',
-+            ll : 'YYYY年M月D日',
-+            lll : 'YYYY年M月D日 HH:mm',
-+            llll : 'YYYY年M月D日dddd HH:mm'
-+        },
-+        meridiemParse: /凌晨|早上|上午|中午|下午|晚上/,
-+        meridiemHour : function (hour, meridiem) {
-+            if (hour === 12) {
-+                hour = 0;
-+            }
-+            if (meridiem === '凌晨' || meridiem === '早上' || meridiem === '上午') {
-+                return hour;
-+            } else if (meridiem === '中午') {
-+                return hour >= 11 ? hour : hour + 12;
-+            } else if (meridiem === '下午' || meridiem === '晚上') {
-+                return hour + 12;
-+            }
-+        },
-+        meridiem : function (hour, minute, isLower) {
-+            var hm = hour * 100 + minute;
-+            if (hm < 600) {
-+                return '凌晨';
-+            } else if (hm < 900) {
-+                return '早上';
-+            } else if (hm < 1130) {
-+                return '上午';
-+            } else if (hm < 1230) {
-+                return '中午';
-+            } else if (hm < 1800) {
-+                return '下午';
-+            } else {
-+                return '晚上';
-+            }
-+        },
-+        calendar : {
-+            sameDay : '[今天] LT',
-+            nextDay : '[明天] LT',
-+            nextWeek : '[下]dddd LT',
-+            lastDay : '[昨天] LT',
-+            lastWeek : '[上]dddd LT',
-+            sameElse : 'L'
-+        },
-+        dayOfMonthOrdinalParse: /\d{1,2}(日|月|週)/,
-+        ordinal : function (number, period) {
-+            switch (period) {
-+                case 'd' :
-+                case 'D' :
-+                case 'DDD' :
-+                    return number + '日';
-+                case 'M' :
-+                    return number + '月';
-+                case 'w' :
-+                case 'W' :
-+                    return number + '週';
-+                default :
-+                    return number;
-+            }
-+        },
-+        relativeTime : {
-+            future : '%s內',
-+            past : '%s前',
-+            s : '幾秒',
-+            ss : '%d 秒',
-+            m : '1 分鐘',
-+            mm : '%d 分鐘',
-+            h : '1 小時',
-+            hh : '%d 小時',
-+            d : '1 天',
-+            dd : '%d 天',
-+            M : '1 個月',
-+            MM : '%d 個月',
-+            y : '1 年',
-+            yy : '%d 年'
-+        }
-+    });
-+
-+    return zhTw;
-+
-+})));
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/moment/moment.js":
-+/*!***************************************!*\
-+  !*** ./node_modules/moment/moment.js ***!
-+  \***************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+/* WEBPACK VAR INJECTION */(function(module) {var require;//! moment.js
-+
-+;(function (global, factory) {
-+     true ? module.exports = factory() :
-+    undefined
-+}(this, (function () { 'use strict';
-+
-+    var hookCallback;
-+
-+    function hooks () {
-+        return hookCallback.apply(null, arguments);
-+    }
-+
-+    // This is done to register the method called with moment()
-+    // without creating circular dependencies.
-+    function setHookCallback (callback) {
-+        hookCallback = callback;
-+    }
-+
-+    function isArray(input) {
-+        return input instanceof Array || Object.prototype.toString.call(input) === '[object Array]';
-+    }
-+
-+    function isObject(input) {
-+        // IE8 will treat undefined and null as object if it wasn't for
-+        // input != null
-+        return input != null && Object.prototype.toString.call(input) === '[object Object]';
-+    }
-+
-+    function isObjectEmpty(obj) {
-+        if (Object.getOwnPropertyNames) {
-+            return (Object.getOwnPropertyNames(obj).length === 0);
-+        } else {
-+            var k;
-+            for (k in obj) {
-+                if (obj.hasOwnProperty(k)) {
-+                    return false;
-+                }
-+            }
-+            return true;
-+        }
-+    }
-+
-+    function isUndefined(input) {
-+        return input === void 0;
-+    }
-+
-+    function isNumber(input) {
-+        return typeof input === 'number' || Object.prototype.toString.call(input) === '[object Number]';
-+    }
-+
-+    function isDate(input) {
-+        return input instanceof Date || Object.prototype.toString.call(input) === '[object Date]';
-+    }
-+
-+    function map(arr, fn) {
-+        var res = [], i;
-+        for (i = 0; i < arr.length; ++i) {
-+            res.push(fn(arr[i], i));
-+        }
-+        return res;
-+    }
-+
-+    function hasOwnProp(a, b) {
-+        return Object.prototype.hasOwnProperty.call(a, b);
-+    }
-+
-+    function extend(a, b) {
-+        for (var i in b) {
-+            if (hasOwnProp(b, i)) {
-+                a[i] = b[i];
-+            }
-+        }
-+
-+        if (hasOwnProp(b, 'toString')) {
-+            a.toString = b.toString;
-+        }
-+
-+        if (hasOwnProp(b, 'valueOf')) {
-+            a.valueOf = b.valueOf;
-+        }
-+
-+        return a;
-+    }
-+
-+    function createUTC (input, format, locale, strict) {
-+        return createLocalOrUTC(input, format, locale, strict, true).utc();
-+    }
-+
-+    function defaultParsingFlags() {
-+        // We need to deep clone this object.
-+        return {
-+            empty           : false,
-+            unusedTokens    : [],
-+            unusedInput     : [],
-+            overflow        : -2,
-+            charsLeftOver   : 0,
-+            nullInput       : false,
-+            invalidMonth    : null,
-+            invalidFormat   : false,
-+            userInvalidated : false,
-+            iso             : false,
-+            parsedDateParts : [],
-+            meridiem        : null,
-+            rfc2822         : false,
-+            weekdayMismatch : false
-+        };
-+    }
-+
-+    function getParsingFlags(m) {
-+        if (m._pf == null) {
-+            m._pf = defaultParsingFlags();
-+        }
-+        return m._pf;
-+    }
-+
-+    var some;
-+    if (Array.prototype.some) {
-+        some = Array.prototype.some;
-+    } else {
-+        some = function (fun) {
-+            var t = Object(this);
-+            var len = t.length >>> 0;
-+
-+            for (var i = 0; i < len; i++) {
-+                if (i in t && fun.call(this, t[i], i, t)) {
-+                    return true;
-+                }
-+            }
-+
-+            return false;
-+        };
-+    }
-+
-+    function isValid(m) {
-+        if (m._isValid == null) {
-+            var flags = getParsingFlags(m);
-+            var parsedParts = some.call(flags.parsedDateParts, function (i) {
-+                return i != null;
-+            });
-+            var isNowValid = !isNaN(m._d.getTime()) &&
-+                flags.overflow < 0 &&
-+                !flags.empty &&
-+                !flags.invalidMonth &&
-+                !flags.invalidWeekday &&
-+                !flags.weekdayMismatch &&
-+                !flags.nullInput &&
-+                !flags.invalidFormat &&
-+                !flags.userInvalidated &&
-+                (!flags.meridiem || (flags.meridiem && parsedParts));
-+
-+            if (m._strict) {
-+                isNowValid = isNowValid &&
-+                    flags.charsLeftOver === 0 &&
-+                    flags.unusedTokens.length === 0 &&
-+                    flags.bigHour === undefined;
-+            }
-+
-+            if (Object.isFrozen == null || !Object.isFrozen(m)) {
-+                m._isValid = isNowValid;
-+            }
-+            else {
-+                return isNowValid;
-+            }
-+        }
-+        return m._isValid;
-+    }
-+
-+    function createInvalid (flags) {
-+        var m = createUTC(NaN);
-+        if (flags != null) {
-+            extend(getParsingFlags(m), flags);
-+        }
-+        else {
-+            getParsingFlags(m).userInvalidated = true;
-+        }
-+
-+        return m;
-+    }
-+
-+    // Plugins that add properties should also add the key here (null value),
-+    // so we can properly clone ourselves.
-+    var momentProperties = hooks.momentProperties = [];
-+
-+    function copyConfig(to, from) {
-+        var i, prop, val;
-+
-+        if (!isUndefined(from._isAMomentObject)) {
-+            to._isAMomentObject = from._isAMomentObject;
-+        }
-+        if (!isUndefined(from._i)) {
-+            to._i = from._i;
-+        }
-+        if (!isUndefined(from._f)) {
-+            to._f = from._f;
-+        }
-+        if (!isUndefined(from._l)) {
-+            to._l = from._l;
-+        }
-+        if (!isUndefined(from._strict)) {
-+            to._strict = from._strict;
-+        }
-+        if (!isUndefined(from._tzm)) {
-+            to._tzm = from._tzm;
-+        }
-+        if (!isUndefined(from._isUTC)) {
-+            to._isUTC = from._isUTC;
-+        }
-+        if (!isUndefined(from._offset)) {
-+            to._offset = from._offset;
-+        }
-+        if (!isUndefined(from._pf)) {
-+            to._pf = getParsingFlags(from);
-+        }
-+        if (!isUndefined(from._locale)) {
-+            to._locale = from._locale;
-+        }
-+
-+        if (momentProperties.length > 0) {
-+            for (i = 0; i < momentProperties.length; i++) {
-+                prop = momentProperties[i];
-+                val = from[prop];
-+                if (!isUndefined(val)) {
-+                    to[prop] = val;
-+                }
-+            }
-+        }
-+
-+        return to;
-+    }
-+
-+    var updateInProgress = false;
-+
-+    // Moment prototype object
-+    function Moment(config) {
-+        copyConfig(this, config);
-+        this._d = new Date(config._d != null ? config._d.getTime() : NaN);
-+        if (!this.isValid()) {
-+            this._d = new Date(NaN);
-+        }
-+        // Prevent infinite loop in case updateOffset creates new moment
-+        // objects.
-+        if (updateInProgress === false) {
-+            updateInProgress = true;
-+            hooks.updateOffset(this);
-+            updateInProgress = false;
-+        }
-+    }
-+
-+    function isMoment (obj) {
-+        return obj instanceof Moment || (obj != null && obj._isAMomentObject != null);
-+    }
-+
-+    function absFloor (number) {
-+        if (number < 0) {
-+            // -0 -> 0
-+            return Math.ceil(number) || 0;
-+        } else {
-+            return Math.floor(number);
-+        }
-+    }
-+
-+    function toInt(argumentForCoercion) {
-+        var coercedNumber = +argumentForCoercion,
-+            value = 0;
-+
-+        if (coercedNumber !== 0 && isFinite(coercedNumber)) {
-+            value = absFloor(coercedNumber);
-+        }
-+
-+        return value;
-+    }
-+
-+    // compare two arrays, return the number of differences
-+    function compareArrays(array1, array2, dontConvert) {
-+        var len = Math.min(array1.length, array2.length),
-+            lengthDiff = Math.abs(array1.length - array2.length),
-+            diffs = 0,
-+            i;
-+        for (i = 0; i < len; i++) {
-+            if ((dontConvert && array1[i] !== array2[i]) ||
-+                (!dontConvert && toInt(array1[i]) !== toInt(array2[i]))) {
-+                diffs++;
-+            }
-+        }
-+        return diffs + lengthDiff;
-+    }
-+
-+    function warn(msg) {
-+        if (hooks.suppressDeprecationWarnings === false &&
-+                (typeof console !==  'undefined') && console.warn) {
-+            console.warn('Deprecation warning: ' + msg);
-+        }
-+    }
-+
-+    function deprecate(msg, fn) {
-+        var firstTime = true;
-+
-+        return extend(function () {
-+            if (hooks.deprecationHandler != null) {
-+                hooks.deprecationHandler(null, msg);
-+            }
-+            if (firstTime) {
-+                var args = [];
-+                var arg;
-+                for (var i = 0; i < arguments.length; i++) {
-+                    arg = '';
-+                    if (typeof arguments[i] === 'object') {
-+                        arg += '\n[' + i + '] ';
-+                        for (var key in arguments[0]) {
-+                            arg += key + ': ' + arguments[0][key] + ', ';
-+                        }
-+                        arg = arg.slice(0, -2); // Remove trailing comma and space
-+                    } else {
-+                        arg = arguments[i];
-+                    }
-+                    args.push(arg);
-+                }
-+                warn(msg + '\nArguments: ' + Array.prototype.slice.call(args).join('') + '\n' + (new Error()).stack);
-+                firstTime = false;
-+            }
-+            return fn.apply(this, arguments);
-+        }, fn);
-+    }
-+
-+    var deprecations = {};
-+
-+    function deprecateSimple(name, msg) {
-+        if (hooks.deprecationHandler != null) {
-+            hooks.deprecationHandler(name, msg);
-+        }
-+        if (!deprecations[name]) {
-+            warn(msg);
-+            deprecations[name] = true;
-+        }
-+    }
-+
-+    hooks.suppressDeprecationWarnings = false;
-+    hooks.deprecationHandler = null;
-+
-+    function isFunction(input) {
-+        return input instanceof Function || Object.prototype.toString.call(input) === '[object Function]';
-+    }
-+
-+    function set (config) {
-+        var prop, i;
-+        for (i in config) {
-+            prop = config[i];
-+            if (isFunction(prop)) {
-+                this[i] = prop;
-+            } else {
-+                this['_' + i] = prop;
-+            }
-+        }
-+        this._config = config;
-+        // Lenient ordinal parsing accepts just a number in addition to
-+        // number + (possibly) stuff coming from _dayOfMonthOrdinalParse.
-+        // TODO: Remove "ordinalParse" fallback in next major release.
-+        this._dayOfMonthOrdinalParseLenient = new RegExp(
-+            (this._dayOfMonthOrdinalParse.source || this._ordinalParse.source) +
-+                '|' + (/\d{1,2}/).source);
-+    }
-+
-+    function mergeConfigs(parentConfig, childConfig) {
-+        var res = extend({}, parentConfig), prop;
-+        for (prop in childConfig) {
-+            if (hasOwnProp(childConfig, prop)) {
-+                if (isObject(parentConfig[prop]) && isObject(childConfig[prop])) {
-+                    res[prop] = {};
-+                    extend(res[prop], parentConfig[prop]);
-+                    extend(res[prop], childConfig[prop]);
-+                } else if (childConfig[prop] != null) {
-+                    res[prop] = childConfig[prop];
-+                } else {
-+                    delete res[prop];
-+                }
-+            }
-+        }
-+        for (prop in parentConfig) {
-+            if (hasOwnProp(parentConfig, prop) &&
-+                    !hasOwnProp(childConfig, prop) &&
-+                    isObject(parentConfig[prop])) {
-+                // make sure changes to properties don't modify parent config
-+                res[prop] = extend({}, res[prop]);
-+            }
-+        }
-+        return res;
-+    }
-+
-+    function Locale(config) {
-+        if (config != null) {
-+            this.set(config);
-+        }
-+    }
-+
-+    var keys;
-+
-+    if (Object.keys) {
-+        keys = Object.keys;
-+    } else {
-+        keys = function (obj) {
-+            var i, res = [];
-+            for (i in obj) {
-+                if (hasOwnProp(obj, i)) {
-+                    res.push(i);
-+                }
-+            }
-+            return res;
-+        };
-+    }
-+
-+    var defaultCalendar = {
-+        sameDay : '[Today at] LT',
-+        nextDay : '[Tomorrow at] LT',
-+        nextWeek : 'dddd [at] LT',
-+        lastDay : '[Yesterday at] LT',
-+        lastWeek : '[Last] dddd [at] LT',
-+        sameElse : 'L'
-+    };
-+
-+    function calendar (key, mom, now) {
-+        var output = this._calendar[key] || this._calendar['sameElse'];
-+        return isFunction(output) ? output.call(mom, now) : output;
-+    }
-+
-+    var defaultLongDateFormat = {
-+        LTS  : 'h:mm:ss A',
-+        LT   : 'h:mm A',
-+        L    : 'MM/DD/YYYY',
-+        LL   : 'MMMM D, YYYY',
-+        LLL  : 'MMMM D, YYYY h:mm A',
-+        LLLL : 'dddd, MMMM D, YYYY h:mm A'
-+    };
-+
-+    function longDateFormat (key) {
-+        var format = this._longDateFormat[key],
-+            formatUpper = this._longDateFormat[key.toUpperCase()];
-+
-+        if (format || !formatUpper) {
-+            return format;
-+        }
-+
-+        this._longDateFormat[key] = formatUpper.replace(/MMMM|MM|DD|dddd/g, function (val) {
-+            return val.slice(1);
-+        });
-+
-+        return this._longDateFormat[key];
-+    }
-+
-+    var defaultInvalidDate = 'Invalid date';
-+
-+    function invalidDate () {
-+        return this._invalidDate;
-+    }
-+
-+    var defaultOrdinal = '%d';
-+    var defaultDayOfMonthOrdinalParse = /\d{1,2}/;
-+
-+    function ordinal (number) {
-+        return this._ordinal.replace('%d', number);
-+    }
-+
-+    var defaultRelativeTime = {
-+        future : 'in %s',
-+        past   : '%s ago',
-+        s  : 'a few seconds',
-+        ss : '%d seconds',
-+        m  : 'a minute',
-+        mm : '%d minutes',
-+        h  : 'an hour',
-+        hh : '%d hours',
-+        d  : 'a day',
-+        dd : '%d days',
-+        M  : 'a month',
-+        MM : '%d months',
-+        y  : 'a year',
-+        yy : '%d years'
-+    };
-+
-+    function relativeTime (number, withoutSuffix, string, isFuture) {
-+        var output = this._relativeTime[string];
-+        return (isFunction(output)) ?
-+            output(number, withoutSuffix, string, isFuture) :
-+            output.replace(/%d/i, number);
-+    }
-+
-+    function pastFuture (diff, output) {
-+        var format = this._relativeTime[diff > 0 ? 'future' : 'past'];
-+        return isFunction(format) ? format(output) : format.replace(/%s/i, output);
-+    }
-+
-+    var aliases = {};
-+
-+    function addUnitAlias (unit, shorthand) {
-+        var lowerCase = unit.toLowerCase();
-+        aliases[lowerCase] = aliases[lowerCase + 's'] = aliases[shorthand] = unit;
-+    }
-+
-+    function normalizeUnits(units) {
-+        return typeof units === 'string' ? aliases[units] || aliases[units.toLowerCase()] : undefined;
-+    }
-+
-+    function normalizeObjectUnits(inputObject) {
-+        var normalizedInput = {},
-+            normalizedProp,
-+            prop;
-+
-+        for (prop in inputObject) {
-+            if (hasOwnProp(inputObject, prop)) {
-+                normalizedProp = normalizeUnits(prop);
-+                if (normalizedProp) {
-+                    normalizedInput[normalizedProp] = inputObject[prop];
-+                }
-+            }
-+        }
-+
-+        return normalizedInput;
-+    }
-+
-+    var priorities = {};
-+
-+    function addUnitPriority(unit, priority) {
-+        priorities[unit] = priority;
-+    }
-+
-+    function getPrioritizedUnits(unitsObj) {
-+        var units = [];
-+        for (var u in unitsObj) {
-+            units.push({unit: u, priority: priorities[u]});
-+        }
-+        units.sort(function (a, b) {
-+            return a.priority - b.priority;
-+        });
-+        return units;
-+    }
-+
-+    function zeroFill(number, targetLength, forceSign) {
-+        var absNumber = '' + Math.abs(number),
-+            zerosToFill = targetLength - absNumber.length,
-+            sign = number >= 0;
-+        return (sign ? (forceSign ? '+' : '') : '-') +
-+            Math.pow(10, Math.max(0, zerosToFill)).toString().substr(1) + absNumber;
-+    }
-+
-+    var formattingTokens = /(\[[^\[]*\])|(\\)?([Hh]mm(ss)?|Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Qo?|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|kk?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g;
-+
-+    var localFormattingTokens = /(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g;
-+
-+    var formatFunctions = {};
-+
-+    var formatTokenFunctions = {};
-+
-+    // token:    'M'
-+    // padded:   ['MM', 2]
-+    // ordinal:  'Mo'
-+    // callback: function () { this.month() + 1 }
-+    function addFormatToken (token, padded, ordinal, callback) {
-+        var func = callback;
-+        if (typeof callback === 'string') {
-+            func = function () {
-+                return this[callback]();
-+            };
-+        }
-+        if (token) {
-+            formatTokenFunctions[token] = func;
-+        }
-+        if (padded) {
-+            formatTokenFunctions[padded[0]] = function () {
-+                return zeroFill(func.apply(this, arguments), padded[1], padded[2]);
-+            };
-+        }
-+        if (ordinal) {
-+            formatTokenFunctions[ordinal] = function () {
-+                return this.localeData().ordinal(func.apply(this, arguments), token);
-+            };
-+        }
-+    }
-+
-+    function removeFormattingTokens(input) {
-+        if (input.match(/\[[\s\S]/)) {
-+            return input.replace(/^\[|\]$/g, '');
-+        }
-+        return input.replace(/\\/g, '');
-+    }
-+
-+    function makeFormatFunction(format) {
-+        var array = format.match(formattingTokens), i, length;
-+
-+        for (i = 0, length = array.length; i < length; i++) {
-+            if (formatTokenFunctions[array[i]]) {
-+                array[i] = formatTokenFunctions[array[i]];
-+            } else {
-+                array[i] = removeFormattingTokens(array[i]);
-+            }
-+        }
-+
-+        return function (mom) {
-+            var output = '', i;
-+            for (i = 0; i < length; i++) {
-+                output += isFunction(array[i]) ? array[i].call(mom, format) : array[i];
-+            }
-+            return output;
-+        };
-+    }
-+
-+    // format date using native date object
-+    function formatMoment(m, format) {
-+        if (!m.isValid()) {
-+            return m.localeData().invalidDate();
-+        }
-+
-+        format = expandFormat(format, m.localeData());
-+        formatFunctions[format] = formatFunctions[format] || makeFormatFunction(format);
-+
-+        return formatFunctions[format](m);
-+    }
-+
-+    function expandFormat(format, locale) {
-+        var i = 5;
-+
-+        function replaceLongDateFormatTokens(input) {
-+            return locale.longDateFormat(input) || input;
-+        }
-+
-+        localFormattingTokens.lastIndex = 0;
-+        while (i >= 0 && localFormattingTokens.test(format)) {
-+            format = format.replace(localFormattingTokens, replaceLongDateFormatTokens);
-+            localFormattingTokens.lastIndex = 0;
-+            i -= 1;
-+        }
-+
-+        return format;
-+    }
-+
-+    var match1         = /\d/;            //       0 - 9
-+    var match2         = /\d\d/;          //      00 - 99
-+    var match3         = /\d{3}/;         //     000 - 999
-+    var match4         = /\d{4}/;         //    0000 - 9999
-+    var match6         = /[+-]?\d{6}/;    // -999999 - 999999
-+    var match1to2      = /\d\d?/;         //       0 - 99
-+    var match3to4      = /\d\d\d\d?/;     //     999 - 9999
-+    var match5to6      = /\d\d\d\d\d\d?/; //   99999 - 999999
-+    var match1to3      = /\d{1,3}/;       //       0 - 999
-+    var match1to4      = /\d{1,4}/;       //       0 - 9999
-+    var match1to6      = /[+-]?\d{1,6}/;  // -999999 - 999999
-+
-+    var matchUnsigned  = /\d+/;           //       0 - inf
-+    var matchSigned    = /[+-]?\d+/;      //    -inf - inf
-+
-+    var matchOffset    = /Z|[+-]\d\d:?\d\d/gi; // +00:00 -00:00 +0000 -0000 or Z
-+    var matchShortOffset = /Z|[+-]\d\d(?::?\d\d)?/gi; // +00 -00 +00:00 -00:00 +0000 -0000 or Z
-+
-+    var matchTimestamp = /[+-]?\d+(\.\d{1,3})?/; // 123456789 123456789.123
-+
-+    // any word (or two) characters or numbers including two/three word month in arabic.
-+    // includes scottish gaelic two word and hyphenated months
-+    var matchWord = /[0-9]{0,256}['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFF07\uFF10-\uFFEF]{1,256}|[\u0600-\u06FF\/]{1,256}(\s*?[\u0600-\u06FF]{1,256}){1,2}/i;
-+
-+    var regexes = {};
-+
-+    function addRegexToken (token, regex, strictRegex) {
-+        regexes[token] = isFunction(regex) ? regex : function (isStrict, localeData) {
-+            return (isStrict && strictRegex) ? strictRegex : regex;
-+        };
-+    }
-+
-+    function getParseRegexForToken (token, config) {
-+        if (!hasOwnProp(regexes, token)) {
-+            return new RegExp(unescapeFormat(token));
-+        }
-+
-+        return regexes[token](config._strict, config._locale);
-+    }
-+
-+    // Code from http://stackoverflow.com/questions/3561493/is-there-a-regexp-escape-function-in-javascript
-+    function unescapeFormat(s) {
-+        return regexEscape(s.replace('\\', '').replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g, function (matched, p1, p2, p3, p4) {
-+            return p1 || p2 || p3 || p4;
-+        }));
-+    }
-+
-+    function regexEscape(s) {
-+        return s.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
-+    }
-+
-+    var tokens = {};
-+
-+    function addParseToken (token, callback) {
-+        var i, func = callback;
-+        if (typeof token === 'string') {
-+            token = [token];
-+        }
-+        if (isNumber(callback)) {
-+            func = function (input, array) {
-+                array[callback] = toInt(input);
-+            };
-+        }
-+        for (i = 0; i < token.length; i++) {
-+            tokens[token[i]] = func;
-+        }
-+    }
-+
-+    function addWeekParseToken (token, callback) {
-+        addParseToken(token, function (input, array, config, token) {
-+            config._w = config._w || {};
-+            callback(input, config._w, config, token);
-+        });
-+    }
-+
-+    function addTimeToArrayFromToken(token, input, config) {
-+        if (input != null && hasOwnProp(tokens, token)) {
-+            tokens[token](input, config._a, config, token);
-+        }
-+    }
-+
-+    var YEAR = 0;
-+    var MONTH = 1;
-+    var DATE = 2;
-+    var HOUR = 3;
-+    var MINUTE = 4;
-+    var SECOND = 5;
-+    var MILLISECOND = 6;
-+    var WEEK = 7;
-+    var WEEKDAY = 8;
-+
-+    // FORMATTING
-+
-+    addFormatToken('Y', 0, 0, function () {
-+        var y = this.year();
-+        return y <= 9999 ? '' + y : '+' + y;
-+    });
-+
-+    addFormatToken(0, ['YY', 2], 0, function () {
-+        return this.year() % 100;
-+    });
-+
-+    addFormatToken(0, ['YYYY',   4],       0, 'year');
-+    addFormatToken(0, ['YYYYY',  5],       0, 'year');
-+    addFormatToken(0, ['YYYYYY', 6, true], 0, 'year');
-+
-+    // ALIASES
-+
-+    addUnitAlias('year', 'y');
-+
-+    // PRIORITIES
-+
-+    addUnitPriority('year', 1);
-+
-+    // PARSING
-+
-+    addRegexToken('Y',      matchSigned);
-+    addRegexToken('YY',     match1to2, match2);
-+    addRegexToken('YYYY',   match1to4, match4);
-+    addRegexToken('YYYYY',  match1to6, match6);
-+    addRegexToken('YYYYYY', match1to6, match6);
-+
-+    addParseToken(['YYYYY', 'YYYYYY'], YEAR);
-+    addParseToken('YYYY', function (input, array) {
-+        array[YEAR] = input.length === 2 ? hooks.parseTwoDigitYear(input) : toInt(input);
-+    });
-+    addParseToken('YY', function (input, array) {
-+        array[YEAR] = hooks.parseTwoDigitYear(input);
-+    });
-+    addParseToken('Y', function (input, array) {
-+        array[YEAR] = parseInt(input, 10);
-+    });
-+
-+    // HELPERS
-+
-+    function daysInYear(year) {
-+        return isLeapYear(year) ? 366 : 365;
-+    }
-+
-+    function isLeapYear(year) {
-+        return (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0;
-+    }
-+
-+    // HOOKS
-+
-+    hooks.parseTwoDigitYear = function (input) {
-+        return toInt(input) + (toInt(input) > 68 ? 1900 : 2000);
-+    };
-+
-+    // MOMENTS
-+
-+    var getSetYear = makeGetSet('FullYear', true);
-+
-+    function getIsLeapYear () {
-+        return isLeapYear(this.year());
-+    }
-+
-+    function makeGetSet (unit, keepTime) {
-+        return function (value) {
-+            if (value != null) {
-+                set$1(this, unit, value);
-+                hooks.updateOffset(this, keepTime);
-+                return this;
-+            } else {
-+                return get(this, unit);
-+            }
-+        };
-+    }
-+
-+    function get (mom, unit) {
-+        return mom.isValid() ?
-+            mom._d['get' + (mom._isUTC ? 'UTC' : '') + unit]() : NaN;
-+    }
-+
-+    function set$1 (mom, unit, value) {
-+        if (mom.isValid() && !isNaN(value)) {
-+            if (unit === 'FullYear' && isLeapYear(mom.year()) && mom.month() === 1 && mom.date() === 29) {
-+                mom._d['set' + (mom._isUTC ? 'UTC' : '') + unit](value, mom.month(), daysInMonth(value, mom.month()));
-+            }
-+            else {
-+                mom._d['set' + (mom._isUTC ? 'UTC' : '') + unit](value);
-+            }
-+        }
-+    }
-+
-+    // MOMENTS
-+
-+    function stringGet (units) {
-+        units = normalizeUnits(units);
-+        if (isFunction(this[units])) {
-+            return this[units]();
-+        }
-+        return this;
-+    }
-+
-+
-+    function stringSet (units, value) {
-+        if (typeof units === 'object') {
-+            units = normalizeObjectUnits(units);
-+            var prioritized = getPrioritizedUnits(units);
-+            for (var i = 0; i < prioritized.length; i++) {
-+                this[prioritized[i].unit](units[prioritized[i].unit]);
-+            }
-+        } else {
-+            units = normalizeUnits(units);
-+            if (isFunction(this[units])) {
-+                return this[units](value);
-+            }
-+        }
-+        return this;
-+    }
-+
-+    function mod(n, x) {
-+        return ((n % x) + x) % x;
-+    }
-+
-+    var indexOf;
-+
-+    if (Array.prototype.indexOf) {
-+        indexOf = Array.prototype.indexOf;
-+    } else {
-+        indexOf = function (o) {
-+            // I know
-+            var i;
-+            for (i = 0; i < this.length; ++i) {
-+                if (this[i] === o) {
-+                    return i;
-+                }
-+            }
-+            return -1;
-+        };
-+    }
-+
-+    function daysInMonth(year, month) {
-+        if (isNaN(year) || isNaN(month)) {
-+            return NaN;
-+        }
-+        var modMonth = mod(month, 12);
-+        year += (month - modMonth) / 12;
-+        return modMonth === 1 ? (isLeapYear(year) ? 29 : 28) : (31 - modMonth % 7 % 2);
-+    }
-+
-+    // FORMATTING
-+
-+    addFormatToken('M', ['MM', 2], 'Mo', function () {
-+        return this.month() + 1;
-+    });
-+
-+    addFormatToken('MMM', 0, 0, function (format) {
-+        return this.localeData().monthsShort(this, format);
-+    });
-+
-+    addFormatToken('MMMM', 0, 0, function (format) {
-+        return this.localeData().months(this, format);
-+    });
-+
-+    // ALIASES
-+
-+    addUnitAlias('month', 'M');
-+
-+    // PRIORITY
-+
-+    addUnitPriority('month', 8);
-+
-+    // PARSING
-+
-+    addRegexToken('M',    match1to2);
-+    addRegexToken('MM',   match1to2, match2);
-+    addRegexToken('MMM',  function (isStrict, locale) {
-+        return locale.monthsShortRegex(isStrict);
-+    });
-+    addRegexToken('MMMM', function (isStrict, locale) {
-+        return locale.monthsRegex(isStrict);
-+    });
-+
-+    addParseToken(['M', 'MM'], function (input, array) {
-+        array[MONTH] = toInt(input) - 1;
-+    });
-+
-+    addParseToken(['MMM', 'MMMM'], function (input, array, config, token) {
-+        var month = config._locale.monthsParse(input, token, config._strict);
-+        // if we didn't find a month name, mark the date as invalid.
-+        if (month != null) {
-+            array[MONTH] = month;
-+        } else {
-+            getParsingFlags(config).invalidMonth = input;
-+        }
-+    });
-+
-+    // LOCALES
-+
-+    var MONTHS_IN_FORMAT = /D[oD]?(\[[^\[\]]*\]|\s)+MMMM?/;
-+    var defaultLocaleMonths = 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_');
-+    function localeMonths (m, format) {
-+        if (!m) {
-+            return isArray(this._months) ? this._months :
-+                this._months['standalone'];
-+        }
-+        return isArray(this._months) ? this._months[m.month()] :
-+            this._months[(this._months.isFormat || MONTHS_IN_FORMAT).test(format) ? 'format' : 'standalone'][m.month()];
-+    }
-+
-+    var defaultLocaleMonthsShort = 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_');
-+    function localeMonthsShort (m, format) {
-+        if (!m) {
-+            return isArray(this._monthsShort) ? this._monthsShort :
-+                this._monthsShort['standalone'];
-+        }
-+        return isArray(this._monthsShort) ? this._monthsShort[m.month()] :
-+            this._monthsShort[MONTHS_IN_FORMAT.test(format) ? 'format' : 'standalone'][m.month()];
-+    }
-+
-+    function handleStrictParse(monthName, format, strict) {
-+        var i, ii, mom, llc = monthName.toLocaleLowerCase();
-+        if (!this._monthsParse) {
-+            // this is not used
-+            this._monthsParse = [];
-+            this._longMonthsParse = [];
-+            this._shortMonthsParse = [];
-+            for (i = 0; i < 12; ++i) {
-+                mom = createUTC([2000, i]);
-+                this._shortMonthsParse[i] = this.monthsShort(mom, '').toLocaleLowerCase();
-+                this._longMonthsParse[i] = this.months(mom, '').toLocaleLowerCase();
-+            }
-+        }
-+
-+        if (strict) {
-+            if (format === 'MMM') {
-+                ii = indexOf.call(this._shortMonthsParse, llc);
-+                return ii !== -1 ? ii : null;
-+            } else {
-+                ii = indexOf.call(this._longMonthsParse, llc);
-+                return ii !== -1 ? ii : null;
-+            }
-+        } else {
-+            if (format === 'MMM') {
-+                ii = indexOf.call(this._shortMonthsParse, llc);
-+                if (ii !== -1) {
-+                    return ii;
-+                }
-+                ii = indexOf.call(this._longMonthsParse, llc);
-+                return ii !== -1 ? ii : null;
-+            } else {
-+                ii = indexOf.call(this._longMonthsParse, llc);
-+                if (ii !== -1) {
-+                    return ii;
-+                }
-+                ii = indexOf.call(this._shortMonthsParse, llc);
-+                return ii !== -1 ? ii : null;
-+            }
-+        }
-+    }
-+
-+    function localeMonthsParse (monthName, format, strict) {
-+        var i, mom, regex;
-+
-+        if (this._monthsParseExact) {
-+            return handleStrictParse.call(this, monthName, format, strict);
-+        }
-+
-+        if (!this._monthsParse) {
-+            this._monthsParse = [];
-+            this._longMonthsParse = [];
-+            this._shortMonthsParse = [];
-+        }
-+
-+        // TODO: add sorting
-+        // Sorting makes sure if one month (or abbr) is a prefix of another
-+        // see sorting in computeMonthsParse
-+        for (i = 0; i < 12; i++) {
-+            // make the regex if we don't have it already
-+            mom = createUTC([2000, i]);
-+            if (strict && !this._longMonthsParse[i]) {
-+                this._longMonthsParse[i] = new RegExp('^' + this.months(mom, '').replace('.', '') + '$', 'i');
-+                this._shortMonthsParse[i] = new RegExp('^' + this.monthsShort(mom, '').replace('.', '') + '$', 'i');
-+            }
-+            if (!strict && !this._monthsParse[i]) {
-+                regex = '^' + this.months(mom, '') + '|^' + this.monthsShort(mom, '');
-+                this._monthsParse[i] = new RegExp(regex.replace('.', ''), 'i');
-+            }
-+            // test the regex
-+            if (strict && format === 'MMMM' && this._longMonthsParse[i].test(monthName)) {
-+                return i;
-+            } else if (strict && format === 'MMM' && this._shortMonthsParse[i].test(monthName)) {
-+                return i;
-+            } else if (!strict && this._monthsParse[i].test(monthName)) {
-+                return i;
-+            }
-+        }
-+    }
-+
-+    // MOMENTS
-+
-+    function setMonth (mom, value) {
-+        var dayOfMonth;
-+
-+        if (!mom.isValid()) {
-+            // No op
-+            return mom;
-+        }
-+
-+        if (typeof value === 'string') {
-+            if (/^\d+$/.test(value)) {
-+                value = toInt(value);
-+            } else {
-+                value = mom.localeData().monthsParse(value);
-+                // TODO: Another silent failure?
-+                if (!isNumber(value)) {
-+                    return mom;
-+                }
-+            }
-+        }
-+
-+        dayOfMonth = Math.min(mom.date(), daysInMonth(mom.year(), value));
-+        mom._d['set' + (mom._isUTC ? 'UTC' : '') + 'Month'](value, dayOfMonth);
-+        return mom;
-+    }
-+
-+    function getSetMonth (value) {
-+        if (value != null) {
-+            setMonth(this, value);
-+            hooks.updateOffset(this, true);
-+            return this;
-+        } else {
-+            return get(this, 'Month');
-+        }
-+    }
-+
-+    function getDaysInMonth () {
-+        return daysInMonth(this.year(), this.month());
-+    }
-+
-+    var defaultMonthsShortRegex = matchWord;
-+    function monthsShortRegex (isStrict) {
-+        if (this._monthsParseExact) {
-+            if (!hasOwnProp(this, '_monthsRegex')) {
-+                computeMonthsParse.call(this);
-+            }
-+            if (isStrict) {
-+                return this._monthsShortStrictRegex;
-+            } else {
-+                return this._monthsShortRegex;
-+            }
-+        } else {
-+            if (!hasOwnProp(this, '_monthsShortRegex')) {
-+                this._monthsShortRegex = defaultMonthsShortRegex;
-+            }
-+            return this._monthsShortStrictRegex && isStrict ?
-+                this._monthsShortStrictRegex : this._monthsShortRegex;
-+        }
-+    }
-+
-+    var defaultMonthsRegex = matchWord;
-+    function monthsRegex (isStrict) {
-+        if (this._monthsParseExact) {
-+            if (!hasOwnProp(this, '_monthsRegex')) {
-+                computeMonthsParse.call(this);
-+            }
-+            if (isStrict) {
-+                return this._monthsStrictRegex;
-+            } else {
-+                return this._monthsRegex;
-+            }
-+        } else {
-+            if (!hasOwnProp(this, '_monthsRegex')) {
-+                this._monthsRegex = defaultMonthsRegex;
-+            }
-+            return this._monthsStrictRegex && isStrict ?
-+                this._monthsStrictRegex : this._monthsRegex;
-+        }
-+    }
-+
-+    function computeMonthsParse () {
-+        function cmpLenRev(a, b) {
-+            return b.length - a.length;
-+        }
-+
-+        var shortPieces = [], longPieces = [], mixedPieces = [],
-+            i, mom;
-+        for (i = 0; i < 12; i++) {
-+            // make the regex if we don't have it already
-+            mom = createUTC([2000, i]);
-+            shortPieces.push(this.monthsShort(mom, ''));
-+            longPieces.push(this.months(mom, ''));
-+            mixedPieces.push(this.months(mom, ''));
-+            mixedPieces.push(this.monthsShort(mom, ''));
-+        }
-+        // Sorting makes sure if one month (or abbr) is a prefix of another it
-+        // will match the longer piece.
-+        shortPieces.sort(cmpLenRev);
-+        longPieces.sort(cmpLenRev);
-+        mixedPieces.sort(cmpLenRev);
-+        for (i = 0; i < 12; i++) {
-+            shortPieces[i] = regexEscape(shortPieces[i]);
-+            longPieces[i] = regexEscape(longPieces[i]);
-+        }
-+        for (i = 0; i < 24; i++) {
-+            mixedPieces[i] = regexEscape(mixedPieces[i]);
-+        }
-+
-+        this._monthsRegex = new RegExp('^(' + mixedPieces.join('|') + ')', 'i');
-+        this._monthsShortRegex = this._monthsRegex;
-+        this._monthsStrictRegex = new RegExp('^(' + longPieces.join('|') + ')', 'i');
-+        this._monthsShortStrictRegex = new RegExp('^(' + shortPieces.join('|') + ')', 'i');
-+    }
-+
-+    function createDate (y, m, d, h, M, s, ms) {
-+        // can't just apply() to create a date:
-+        // https://stackoverflow.com/q/181348
-+        var date = new Date(y, m, d, h, M, s, ms);
-+
-+        // the date constructor remaps years 0-99 to 1900-1999
-+        if (y < 100 && y >= 0 && isFinite(date.getFullYear())) {
-+            date.setFullYear(y);
-+        }
-+        return date;
-+    }
-+
-+    function createUTCDate (y) {
-+        var date = new Date(Date.UTC.apply(null, arguments));
-+
-+        // the Date.UTC function remaps years 0-99 to 1900-1999
-+        if (y < 100 && y >= 0 && isFinite(date.getUTCFullYear())) {
-+            date.setUTCFullYear(y);
-+        }
-+        return date;
-+    }
-+
-+    // start-of-first-week - start-of-year
-+    function firstWeekOffset(year, dow, doy) {
-+        var // first-week day -- which january is always in the first week (4 for iso, 1 for other)
-+            fwd = 7 + dow - doy,
-+            // first-week day local weekday -- which local weekday is fwd
-+            fwdlw = (7 + createUTCDate(year, 0, fwd).getUTCDay() - dow) % 7;
-+
-+        return -fwdlw + fwd - 1;
-+    }
-+
-+    // https://en.wikipedia.org/wiki/ISO_week_date#Calculating_a_date_given_the_year.2C_week_number_and_weekday
-+    function dayOfYearFromWeeks(year, week, weekday, dow, doy) {
-+        var localWeekday = (7 + weekday - dow) % 7,
-+            weekOffset = firstWeekOffset(year, dow, doy),
-+            dayOfYear = 1 + 7 * (week - 1) + localWeekday + weekOffset,
-+            resYear, resDayOfYear;
-+
-+        if (dayOfYear <= 0) {
-+            resYear = year - 1;
-+            resDayOfYear = daysInYear(resYear) + dayOfYear;
-+        } else if (dayOfYear > daysInYear(year)) {
-+            resYear = year + 1;
-+            resDayOfYear = dayOfYear - daysInYear(year);
-+        } else {
-+            resYear = year;
-+            resDayOfYear = dayOfYear;
-+        }
-+
-+        return {
-+            year: resYear,
-+            dayOfYear: resDayOfYear
-+        };
-+    }
-+
-+    function weekOfYear(mom, dow, doy) {
-+        var weekOffset = firstWeekOffset(mom.year(), dow, doy),
-+            week = Math.floor((mom.dayOfYear() - weekOffset - 1) / 7) + 1,
-+            resWeek, resYear;
-+
-+        if (week < 1) {
-+            resYear = mom.year() - 1;
-+            resWeek = week + weeksInYear(resYear, dow, doy);
-+        } else if (week > weeksInYear(mom.year(), dow, doy)) {
-+            resWeek = week - weeksInYear(mom.year(), dow, doy);
-+            resYear = mom.year() + 1;
-+        } else {
-+            resYear = mom.year();
-+            resWeek = week;
-+        }
-+
-+        return {
-+            week: resWeek,
-+            year: resYear
-+        };
-+    }
-+
-+    function weeksInYear(year, dow, doy) {
-+        var weekOffset = firstWeekOffset(year, dow, doy),
-+            weekOffsetNext = firstWeekOffset(year + 1, dow, doy);
-+        return (daysInYear(year) - weekOffset + weekOffsetNext) / 7;
-+    }
-+
-+    // FORMATTING
-+
-+    addFormatToken('w', ['ww', 2], 'wo', 'week');
-+    addFormatToken('W', ['WW', 2], 'Wo', 'isoWeek');
-+
-+    // ALIASES
-+
-+    addUnitAlias('week', 'w');
-+    addUnitAlias('isoWeek', 'W');
-+
-+    // PRIORITIES
-+
-+    addUnitPriority('week', 5);
-+    addUnitPriority('isoWeek', 5);
-+
-+    // PARSING
-+
-+    addRegexToken('w',  match1to2);
-+    addRegexToken('ww', match1to2, match2);
-+    addRegexToken('W',  match1to2);
-+    addRegexToken('WW', match1to2, match2);
-+
-+    addWeekParseToken(['w', 'ww', 'W', 'WW'], function (input, week, config, token) {
-+        week[token.substr(0, 1)] = toInt(input);
-+    });
-+
-+    // HELPERS
-+
-+    // LOCALES
-+
-+    function localeWeek (mom) {
-+        return weekOfYear(mom, this._week.dow, this._week.doy).week;
-+    }
-+
-+    var defaultLocaleWeek = {
-+        dow : 0, // Sunday is the first day of the week.
-+        doy : 6  // The week that contains Jan 1st is the first week of the year.
-+    };
-+
-+    function localeFirstDayOfWeek () {
-+        return this._week.dow;
-+    }
-+
-+    function localeFirstDayOfYear () {
-+        return this._week.doy;
-+    }
-+
-+    // MOMENTS
-+
-+    function getSetWeek (input) {
-+        var week = this.localeData().week(this);
-+        return input == null ? week : this.add((input - week) * 7, 'd');
-+    }
-+
-+    function getSetISOWeek (input) {
-+        var week = weekOfYear(this, 1, 4).week;
-+        return input == null ? week : this.add((input - week) * 7, 'd');
-+    }
-+
-+    // FORMATTING
-+
-+    addFormatToken('d', 0, 'do', 'day');
-+
-+    addFormatToken('dd', 0, 0, function (format) {
-+        return this.localeData().weekdaysMin(this, format);
-+    });
-+
-+    addFormatToken('ddd', 0, 0, function (format) {
-+        return this.localeData().weekdaysShort(this, format);
-+    });
-+
-+    addFormatToken('dddd', 0, 0, function (format) {
-+        return this.localeData().weekdays(this, format);
-+    });
-+
-+    addFormatToken('e', 0, 0, 'weekday');
-+    addFormatToken('E', 0, 0, 'isoWeekday');
-+
-+    // ALIASES
-+
-+    addUnitAlias('day', 'd');
-+    addUnitAlias('weekday', 'e');
-+    addUnitAlias('isoWeekday', 'E');
-+
-+    // PRIORITY
-+    addUnitPriority('day', 11);
-+    addUnitPriority('weekday', 11);
-+    addUnitPriority('isoWeekday', 11);
-+
-+    // PARSING
-+
-+    addRegexToken('d',    match1to2);
-+    addRegexToken('e',    match1to2);
-+    addRegexToken('E',    match1to2);
-+    addRegexToken('dd',   function (isStrict, locale) {
-+        return locale.weekdaysMinRegex(isStrict);
-+    });
-+    addRegexToken('ddd',   function (isStrict, locale) {
-+        return locale.weekdaysShortRegex(isStrict);
-+    });
-+    addRegexToken('dddd',   function (isStrict, locale) {
-+        return locale.weekdaysRegex(isStrict);
-+    });
-+
-+    addWeekParseToken(['dd', 'ddd', 'dddd'], function (input, week, config, token) {
-+        var weekday = config._locale.weekdaysParse(input, token, config._strict);
-+        // if we didn't get a weekday name, mark the date as invalid
-+        if (weekday != null) {
-+            week.d = weekday;
-+        } else {
-+            getParsingFlags(config).invalidWeekday = input;
-+        }
-+    });
-+
-+    addWeekParseToken(['d', 'e', 'E'], function (input, week, config, token) {
-+        week[token] = toInt(input);
-+    });
-+
-+    // HELPERS
-+
-+    function parseWeekday(input, locale) {
-+        if (typeof input !== 'string') {
-+            return input;
-+        }
-+
-+        if (!isNaN(input)) {
-+            return parseInt(input, 10);
-+        }
-+
-+        input = locale.weekdaysParse(input);
-+        if (typeof input === 'number') {
-+            return input;
-+        }
-+
-+        return null;
-+    }
-+
-+    function parseIsoWeekday(input, locale) {
-+        if (typeof input === 'string') {
-+            return locale.weekdaysParse(input) % 7 || 7;
-+        }
-+        return isNaN(input) ? null : input;
-+    }
-+
-+    // LOCALES
-+
-+    var defaultLocaleWeekdays = 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_');
-+    function localeWeekdays (m, format) {
-+        if (!m) {
-+            return isArray(this._weekdays) ? this._weekdays :
-+                this._weekdays['standalone'];
-+        }
-+        return isArray(this._weekdays) ? this._weekdays[m.day()] :
-+            this._weekdays[this._weekdays.isFormat.test(format) ? 'format' : 'standalone'][m.day()];
-+    }
-+
-+    var defaultLocaleWeekdaysShort = 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_');
-+    function localeWeekdaysShort (m) {
-+        return (m) ? this._weekdaysShort[m.day()] : this._weekdaysShort;
-+    }
-+
-+    var defaultLocaleWeekdaysMin = 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_');
-+    function localeWeekdaysMin (m) {
-+        return (m) ? this._weekdaysMin[m.day()] : this._weekdaysMin;
-+    }
-+
-+    function handleStrictParse$1(weekdayName, format, strict) {
-+        var i, ii, mom, llc = weekdayName.toLocaleLowerCase();
-+        if (!this._weekdaysParse) {
-+            this._weekdaysParse = [];
-+            this._shortWeekdaysParse = [];
-+            this._minWeekdaysParse = [];
-+
-+            for (i = 0; i < 7; ++i) {
-+                mom = createUTC([2000, 1]).day(i);
-+                this._minWeekdaysParse[i] = this.weekdaysMin(mom, '').toLocaleLowerCase();
-+                this._shortWeekdaysParse[i] = this.weekdaysShort(mom, '').toLocaleLowerCase();
-+                this._weekdaysParse[i] = this.weekdays(mom, '').toLocaleLowerCase();
-+            }
-+        }
-+
-+        if (strict) {
-+            if (format === 'dddd') {
-+                ii = indexOf.call(this._weekdaysParse, llc);
-+                return ii !== -1 ? ii : null;
-+            } else if (format === 'ddd') {
-+                ii = indexOf.call(this._shortWeekdaysParse, llc);
-+                return ii !== -1 ? ii : null;
-+            } else {
-+                ii = indexOf.call(this._minWeekdaysParse, llc);
-+                return ii !== -1 ? ii : null;
-+            }
-+        } else {
-+            if (format === 'dddd') {
-+                ii = indexOf.call(this._weekdaysParse, llc);
-+                if (ii !== -1) {
-+                    return ii;
-+                }
-+                ii = indexOf.call(this._shortWeekdaysParse, llc);
-+                if (ii !== -1) {
-+                    return ii;
-+                }
-+                ii = indexOf.call(this._minWeekdaysParse, llc);
-+                return ii !== -1 ? ii : null;
-+            } else if (format === 'ddd') {
-+                ii = indexOf.call(this._shortWeekdaysParse, llc);
-+                if (ii !== -1) {
-+                    return ii;
-+                }
-+                ii = indexOf.call(this._weekdaysParse, llc);
-+                if (ii !== -1) {
-+                    return ii;
-+                }
-+                ii = indexOf.call(this._minWeekdaysParse, llc);
-+                return ii !== -1 ? ii : null;
-+            } else {
-+                ii = indexOf.call(this._minWeekdaysParse, llc);
-+                if (ii !== -1) {
-+                    return ii;
-+                }
-+                ii = indexOf.call(this._weekdaysParse, llc);
-+                if (ii !== -1) {
-+                    return ii;
-+                }
-+                ii = indexOf.call(this._shortWeekdaysParse, llc);
-+                return ii !== -1 ? ii : null;
-+            }
-+        }
-+    }
-+
-+    function localeWeekdaysParse (weekdayName, format, strict) {
-+        var i, mom, regex;
-+
-+        if (this._weekdaysParseExact) {
-+            return handleStrictParse$1.call(this, weekdayName, format, strict);
-+        }
-+
-+        if (!this._weekdaysParse) {
-+            this._weekdaysParse = [];
-+            this._minWeekdaysParse = [];
-+            this._shortWeekdaysParse = [];
-+            this._fullWeekdaysParse = [];
-+        }
-+
-+        for (i = 0; i < 7; i++) {
-+            // make the regex if we don't have it already
-+
-+            mom = createUTC([2000, 1]).day(i);
-+            if (strict && !this._fullWeekdaysParse[i]) {
-+                this._fullWeekdaysParse[i] = new RegExp('^' + this.weekdays(mom, '').replace('.', '\.?') + '$', 'i');
-+                this._shortWeekdaysParse[i] = new RegExp('^' + this.weekdaysShort(mom, '').replace('.', '\.?') + '$', 'i');
-+                this._minWeekdaysParse[i] = new RegExp('^' + this.weekdaysMin(mom, '').replace('.', '\.?') + '$', 'i');
-+            }
-+            if (!this._weekdaysParse[i]) {
-+                regex = '^' + this.weekdays(mom, '') + '|^' + this.weekdaysShort(mom, '') + '|^' + this.weekdaysMin(mom, '');
-+                this._weekdaysParse[i] = new RegExp(regex.replace('.', ''), 'i');
-+            }
-+            // test the regex
-+            if (strict && format === 'dddd' && this._fullWeekdaysParse[i].test(weekdayName)) {
-+                return i;
-+            } else if (strict && format === 'ddd' && this._shortWeekdaysParse[i].test(weekdayName)) {
-+                return i;
-+            } else if (strict && format === 'dd' && this._minWeekdaysParse[i].test(weekdayName)) {
-+                return i;
-+            } else if (!strict && this._weekdaysParse[i].test(weekdayName)) {
-+                return i;
-+            }
-+        }
-+    }
-+
-+    // MOMENTS
-+
-+    function getSetDayOfWeek (input) {
-+        if (!this.isValid()) {
-+            return input != null ? this : NaN;
-+        }
-+        var day = this._isUTC ? this._d.getUTCDay() : this._d.getDay();
-+        if (input != null) {
-+            input = parseWeekday(input, this.localeData());
-+            return this.add(input - day, 'd');
-+        } else {
-+            return day;
-+        }
-+    }
-+
-+    function getSetLocaleDayOfWeek (input) {
-+        if (!this.isValid()) {
-+            return input != null ? this : NaN;
-+        }
-+        var weekday = (this.day() + 7 - this.localeData()._week.dow) % 7;
-+        return input == null ? weekday : this.add(input - weekday, 'd');
-+    }
-+
-+    function getSetISODayOfWeek (input) {
-+        if (!this.isValid()) {
-+            return input != null ? this : NaN;
-+        }
-+
-+        // behaves the same as moment#day except
-+        // as a getter, returns 7 instead of 0 (1-7 range instead of 0-6)
-+        // as a setter, sunday should belong to the previous week.
-+
-+        if (input != null) {
-+            var weekday = parseIsoWeekday(input, this.localeData());
-+            return this.day(this.day() % 7 ? weekday : weekday - 7);
-+        } else {
-+            return this.day() || 7;
-+        }
-+    }
-+
-+    var defaultWeekdaysRegex = matchWord;
-+    function weekdaysRegex (isStrict) {
-+        if (this._weekdaysParseExact) {
-+            if (!hasOwnProp(this, '_weekdaysRegex')) {
-+                computeWeekdaysParse.call(this);
-+            }
-+            if (isStrict) {
-+                return this._weekdaysStrictRegex;
-+            } else {
-+                return this._weekdaysRegex;
-+            }
-+        } else {
-+            if (!hasOwnProp(this, '_weekdaysRegex')) {
-+                this._weekdaysRegex = defaultWeekdaysRegex;
-+            }
-+            return this._weekdaysStrictRegex && isStrict ?
-+                this._weekdaysStrictRegex : this._weekdaysRegex;
-+        }
-+    }
-+
-+    var defaultWeekdaysShortRegex = matchWord;
-+    function weekdaysShortRegex (isStrict) {
-+        if (this._weekdaysParseExact) {
-+            if (!hasOwnProp(this, '_weekdaysRegex')) {
-+                computeWeekdaysParse.call(this);
-+            }
-+            if (isStrict) {
-+                return this._weekdaysShortStrictRegex;
-+            } else {
-+                return this._weekdaysShortRegex;
-+            }
-+        } else {
-+            if (!hasOwnProp(this, '_weekdaysShortRegex')) {
-+                this._weekdaysShortRegex = defaultWeekdaysShortRegex;
-+            }
-+            return this._weekdaysShortStrictRegex && isStrict ?
-+                this._weekdaysShortStrictRegex : this._weekdaysShortRegex;
-+        }
-+    }
-+
-+    var defaultWeekdaysMinRegex = matchWord;
-+    function weekdaysMinRegex (isStrict) {
-+        if (this._weekdaysParseExact) {
-+            if (!hasOwnProp(this, '_weekdaysRegex')) {
-+                computeWeekdaysParse.call(this);
-+            }
-+            if (isStrict) {
-+                return this._weekdaysMinStrictRegex;
-+            } else {
-+                return this._weekdaysMinRegex;
-+            }
-+        } else {
-+            if (!hasOwnProp(this, '_weekdaysMinRegex')) {
-+                this._weekdaysMinRegex = defaultWeekdaysMinRegex;
-+            }
-+            return this._weekdaysMinStrictRegex && isStrict ?
-+                this._weekdaysMinStrictRegex : this._weekdaysMinRegex;
-+        }
-+    }
-+
-+
-+    function computeWeekdaysParse () {
-+        function cmpLenRev(a, b) {
-+            return b.length - a.length;
-+        }
-+
-+        var minPieces = [], shortPieces = [], longPieces = [], mixedPieces = [],
-+            i, mom, minp, shortp, longp;
-+        for (i = 0; i < 7; i++) {
-+            // make the regex if we don't have it already
-+            mom = createUTC([2000, 1]).day(i);
-+            minp = this.weekdaysMin(mom, '');
-+            shortp = this.weekdaysShort(mom, '');
-+            longp = this.weekdays(mom, '');
-+            minPieces.push(minp);
-+            shortPieces.push(shortp);
-+            longPieces.push(longp);
-+            mixedPieces.push(minp);
-+            mixedPieces.push(shortp);
-+            mixedPieces.push(longp);
-+        }
-+        // Sorting makes sure if one weekday (or abbr) is a prefix of another it
-+        // will match the longer piece.
-+        minPieces.sort(cmpLenRev);
-+        shortPieces.sort(cmpLenRev);
-+        longPieces.sort(cmpLenRev);
-+        mixedPieces.sort(cmpLenRev);
-+        for (i = 0; i < 7; i++) {
-+            shortPieces[i] = regexEscape(shortPieces[i]);
-+            longPieces[i] = regexEscape(longPieces[i]);
-+            mixedPieces[i] = regexEscape(mixedPieces[i]);
-+        }
-+
-+        this._weekdaysRegex = new RegExp('^(' + mixedPieces.join('|') + ')', 'i');
-+        this._weekdaysShortRegex = this._weekdaysRegex;
-+        this._weekdaysMinRegex = this._weekdaysRegex;
-+
-+        this._weekdaysStrictRegex = new RegExp('^(' + longPieces.join('|') + ')', 'i');
-+        this._weekdaysShortStrictRegex = new RegExp('^(' + shortPieces.join('|') + ')', 'i');
-+        this._weekdaysMinStrictRegex = new RegExp('^(' + minPieces.join('|') + ')', 'i');
-+    }
-+
-+    // FORMATTING
-+
-+    function hFormat() {
-+        return this.hours() % 12 || 12;
-+    }
-+
-+    function kFormat() {
-+        return this.hours() || 24;
-+    }
-+
-+    addFormatToken('H', ['HH', 2], 0, 'hour');
-+    addFormatToken('h', ['hh', 2], 0, hFormat);
-+    addFormatToken('k', ['kk', 2], 0, kFormat);
-+
-+    addFormatToken('hmm', 0, 0, function () {
-+        return '' + hFormat.apply(this) + zeroFill(this.minutes(), 2);
-+    });
-+
-+    addFormatToken('hmmss', 0, 0, function () {
-+        return '' + hFormat.apply(this) + zeroFill(this.minutes(), 2) +
-+            zeroFill(this.seconds(), 2);
-+    });
-+
-+    addFormatToken('Hmm', 0, 0, function () {
-+        return '' + this.hours() + zeroFill(this.minutes(), 2);
-+    });
-+
-+    addFormatToken('Hmmss', 0, 0, function () {
-+        return '' + this.hours() + zeroFill(this.minutes(), 2) +
-+            zeroFill(this.seconds(), 2);
-+    });
-+
-+    function meridiem (token, lowercase) {
-+        addFormatToken(token, 0, 0, function () {
-+            return this.localeData().meridiem(this.hours(), this.minutes(), lowercase);
-+        });
-+    }
-+
-+    meridiem('a', true);
-+    meridiem('A', false);
-+
-+    // ALIASES
-+
-+    addUnitAlias('hour', 'h');
-+
-+    // PRIORITY
-+    addUnitPriority('hour', 13);
-+
-+    // PARSING
-+
-+    function matchMeridiem (isStrict, locale) {
-+        return locale._meridiemParse;
-+    }
-+
-+    addRegexToken('a',  matchMeridiem);
-+    addRegexToken('A',  matchMeridiem);
-+    addRegexToken('H',  match1to2);
-+    addRegexToken('h',  match1to2);
-+    addRegexToken('k',  match1to2);
-+    addRegexToken('HH', match1to2, match2);
-+    addRegexToken('hh', match1to2, match2);
-+    addRegexToken('kk', match1to2, match2);
-+
-+    addRegexToken('hmm', match3to4);
-+    addRegexToken('hmmss', match5to6);
-+    addRegexToken('Hmm', match3to4);
-+    addRegexToken('Hmmss', match5to6);
-+
-+    addParseToken(['H', 'HH'], HOUR);
-+    addParseToken(['k', 'kk'], function (input, array, config) {
-+        var kInput = toInt(input);
-+        array[HOUR] = kInput === 24 ? 0 : kInput;
-+    });
-+    addParseToken(['a', 'A'], function (input, array, config) {
-+        config._isPm = config._locale.isPM(input);
-+        config._meridiem = input;
-+    });
-+    addParseToken(['h', 'hh'], function (input, array, config) {
-+        array[HOUR] = toInt(input);
-+        getParsingFlags(config).bigHour = true;
-+    });
-+    addParseToken('hmm', function (input, array, config) {
-+        var pos = input.length - 2;
-+        array[HOUR] = toInt(input.substr(0, pos));
-+        array[MINUTE] = toInt(input.substr(pos));
-+        getParsingFlags(config).bigHour = true;
-+    });
-+    addParseToken('hmmss', function (input, array, config) {
-+        var pos1 = input.length - 4;
-+        var pos2 = input.length - 2;
-+        array[HOUR] = toInt(input.substr(0, pos1));
-+        array[MINUTE] = toInt(input.substr(pos1, 2));
-+        array[SECOND] = toInt(input.substr(pos2));
-+        getParsingFlags(config).bigHour = true;
-+    });
-+    addParseToken('Hmm', function (input, array, config) {
-+        var pos = input.length - 2;
-+        array[HOUR] = toInt(input.substr(0, pos));
-+        array[MINUTE] = toInt(input.substr(pos));
-+    });
-+    addParseToken('Hmmss', function (input, array, config) {
-+        var pos1 = input.length - 4;
-+        var pos2 = input.length - 2;
-+        array[HOUR] = toInt(input.substr(0, pos1));
-+        array[MINUTE] = toInt(input.substr(pos1, 2));
-+        array[SECOND] = toInt(input.substr(pos2));
-+    });
-+
-+    // LOCALES
-+
-+    function localeIsPM (input) {
-+        // IE8 Quirks Mode & IE7 Standards Mode do not allow accessing strings like arrays
-+        // Using charAt should be more compatible.
-+        return ((input + '').toLowerCase().charAt(0) === 'p');
-+    }
-+
-+    var defaultLocaleMeridiemParse = /[ap]\.?m?\.?/i;
-+    function localeMeridiem (hours, minutes, isLower) {
-+        if (hours > 11) {
-+            return isLower ? 'pm' : 'PM';
-+        } else {
-+            return isLower ? 'am' : 'AM';
-+        }
-+    }
-+
-+
-+    // MOMENTS
-+
-+    // Setting the hour should keep the time, because the user explicitly
-+    // specified which hour they want. So trying to maintain the same hour (in
-+    // a new timezone) makes sense. Adding/subtracting hours does not follow
-+    // this rule.
-+    var getSetHour = makeGetSet('Hours', true);
-+
-+    var baseConfig = {
-+        calendar: defaultCalendar,
-+        longDateFormat: defaultLongDateFormat,
-+        invalidDate: defaultInvalidDate,
-+        ordinal: defaultOrdinal,
-+        dayOfMonthOrdinalParse: defaultDayOfMonthOrdinalParse,
-+        relativeTime: defaultRelativeTime,
-+
-+        months: defaultLocaleMonths,
-+        monthsShort: defaultLocaleMonthsShort,
-+
-+        week: defaultLocaleWeek,
-+
-+        weekdays: defaultLocaleWeekdays,
-+        weekdaysMin: defaultLocaleWeekdaysMin,
-+        weekdaysShort: defaultLocaleWeekdaysShort,
-+
-+        meridiemParse: defaultLocaleMeridiemParse
-+    };
-+
-+    // internal storage for locale config files
-+    var locales = {};
-+    var localeFamilies = {};
-+    var globalLocale;
-+
-+    function normalizeLocale(key) {
-+        return key ? key.toLowerCase().replace('_', '-') : key;
-+    }
-+
-+    // pick the locale from the array
-+    // try ['en-au', 'en-gb'] as 'en-au', 'en-gb', 'en', as in move through the list trying each
-+    // substring from most specific to least, but move to the next array item if it's a more specific variant than the current root
-+    function chooseLocale(names) {
-+        var i = 0, j, next, locale, split;
-+
-+        while (i < names.length) {
-+            split = normalizeLocale(names[i]).split('-');
-+            j = split.length;
-+            next = normalizeLocale(names[i + 1]);
-+            next = next ? next.split('-') : null;
-+            while (j > 0) {
-+                locale = loadLocale(split.slice(0, j).join('-'));
-+                if (locale) {
-+                    return locale;
-+                }
-+                if (next && next.length >= j && compareArrays(split, next, true) >= j - 1) {
-+                    //the next array item is better than a shallower substring of this one
-+                    break;
-+                }
-+                j--;
-+            }
-+            i++;
-+        }
-+        return globalLocale;
-+    }
-+
-+    function loadLocale(name) {
-+        var oldLocale = null;
-+        // TODO: Find a better way to register and load all the locales in Node
-+        if (!locales[name] && (typeof module !== 'undefined') &&
-+                module && module.exports) {
-+            try {
-+                oldLocale = globalLocale._abbr;
-+                var aliasedRequire = require;
-+                __webpack_require__("./node_modules/moment/locale sync recursive ^\\.\\/.*$")("./" + name);
-+                getSetGlobalLocale(oldLocale);
-+            } catch (e) {}
-+        }
-+        return locales[name];
-+    }
-+
-+    // This function will load locale and then set the global locale.  If
-+    // no arguments are passed in, it will simply return the current global
-+    // locale key.
-+    function getSetGlobalLocale (key, values) {
-+        var data;
-+        if (key) {
-+            if (isUndefined(values)) {
-+                data = getLocale(key);
-+            }
-+            else {
-+                data = defineLocale(key, values);
-+            }
-+
-+            if (data) {
-+                // moment.duration._locale = moment._locale = data;
-+                globalLocale = data;
-+            }
-+            else {
-+                if ((typeof console !==  'undefined') && console.warn) {
-+                    //warn user if arguments are passed but the locale could not be set
-+                    console.warn('Locale ' + key +  ' not found. Did you forget to load it?');
-+                }
-+            }
-+        }
-+
-+        return globalLocale._abbr;
-+    }
-+
-+    function defineLocale (name, config) {
-+        if (config !== null) {
-+            var locale, parentConfig = baseConfig;
-+            config.abbr = name;
-+            if (locales[name] != null) {
-+                deprecateSimple('defineLocaleOverride',
-+                        'use moment.updateLocale(localeName, config) to change ' +
-+                        'an existing locale. moment.defineLocale(localeName, ' +
-+                        'config) should only be used for creating a new locale ' +
-+                        'See http://momentjs.com/guides/#/warnings/define-locale/ for more info.');
-+                parentConfig = locales[name]._config;
-+            } else if (config.parentLocale != null) {
-+                if (locales[config.parentLocale] != null) {
-+                    parentConfig = locales[config.parentLocale]._config;
-+                } else {
-+                    locale = loadLocale(config.parentLocale);
-+                    if (locale != null) {
-+                        parentConfig = locale._config;
-+                    } else {
-+                        if (!localeFamilies[config.parentLocale]) {
-+                            localeFamilies[config.parentLocale] = [];
-+                        }
-+                        localeFamilies[config.parentLocale].push({
-+                            name: name,
-+                            config: config
-+                        });
-+                        return null;
-+                    }
-+                }
-+            }
-+            locales[name] = new Locale(mergeConfigs(parentConfig, config));
-+
-+            if (localeFamilies[name]) {
-+                localeFamilies[name].forEach(function (x) {
-+                    defineLocale(x.name, x.config);
-+                });
-+            }
-+
-+            // backwards compat for now: also set the locale
-+            // make sure we set the locale AFTER all child locales have been
-+            // created, so we won't end up with the child locale set.
-+            getSetGlobalLocale(name);
-+
-+
-+            return locales[name];
-+        } else {
-+            // useful for testing
-+            delete locales[name];
-+            return null;
-+        }
-+    }
-+
-+    function updateLocale(name, config) {
-+        if (config != null) {
-+            var locale, tmpLocale, parentConfig = baseConfig;
-+            // MERGE
-+            tmpLocale = loadLocale(name);
-+            if (tmpLocale != null) {
-+                parentConfig = tmpLocale._config;
-+            }
-+            config = mergeConfigs(parentConfig, config);
-+            locale = new Locale(config);
-+            locale.parentLocale = locales[name];
-+            locales[name] = locale;
-+
-+            // backwards compat for now: also set the locale
-+            getSetGlobalLocale(name);
-+        } else {
-+            // pass null for config to unupdate, useful for tests
-+            if (locales[name] != null) {
-+                if (locales[name].parentLocale != null) {
-+                    locales[name] = locales[name].parentLocale;
-+                } else if (locales[name] != null) {
-+                    delete locales[name];
-+                }
-+            }
-+        }
-+        return locales[name];
-+    }
-+
-+    // returns locale data
-+    function getLocale (key) {
-+        var locale;
-+
-+        if (key && key._locale && key._locale._abbr) {
-+            key = key._locale._abbr;
-+        }
-+
-+        if (!key) {
-+            return globalLocale;
-+        }
-+
-+        if (!isArray(key)) {
-+            //short-circuit everything else
-+            locale = loadLocale(key);
-+            if (locale) {
-+                return locale;
-+            }
-+            key = [key];
-+        }
-+
-+        return chooseLocale(key);
-+    }
-+
-+    function listLocales() {
-+        return keys(locales);
-+    }
-+
-+    function checkOverflow (m) {
-+        var overflow;
-+        var a = m._a;
-+
-+        if (a && getParsingFlags(m).overflow === -2) {
-+            overflow =
-+                a[MONTH]       < 0 || a[MONTH]       > 11  ? MONTH :
-+                a[DATE]        < 1 || a[DATE]        > daysInMonth(a[YEAR], a[MONTH]) ? DATE :
-+                a[HOUR]        < 0 || a[HOUR]        > 24 || (a[HOUR] === 24 && (a[MINUTE] !== 0 || a[SECOND] !== 0 || a[MILLISECOND] !== 0)) ? HOUR :
-+                a[MINUTE]      < 0 || a[MINUTE]      > 59  ? MINUTE :
-+                a[SECOND]      < 0 || a[SECOND]      > 59  ? SECOND :
-+                a[MILLISECOND] < 0 || a[MILLISECOND] > 999 ? MILLISECOND :
-+                -1;
-+
-+            if (getParsingFlags(m)._overflowDayOfYear && (overflow < YEAR || overflow > DATE)) {
-+                overflow = DATE;
-+            }
-+            if (getParsingFlags(m)._overflowWeeks && overflow === -1) {
-+                overflow = WEEK;
-+            }
-+            if (getParsingFlags(m)._overflowWeekday && overflow === -1) {
-+                overflow = WEEKDAY;
-+            }
-+
-+            getParsingFlags(m).overflow = overflow;
-+        }
-+
-+        return m;
-+    }
-+
-+    // Pick the first defined of two or three arguments.
-+    function defaults(a, b, c) {
-+        if (a != null) {
-+            return a;
-+        }
-+        if (b != null) {
-+            return b;
-+        }
-+        return c;
-+    }
-+
-+    function currentDateArray(config) {
-+        // hooks is actually the exported moment object
-+        var nowValue = new Date(hooks.now());
-+        if (config._useUTC) {
-+            return [nowValue.getUTCFullYear(), nowValue.getUTCMonth(), nowValue.getUTCDate()];
-+        }
-+        return [nowValue.getFullYear(), nowValue.getMonth(), nowValue.getDate()];
-+    }
-+
-+    // convert an array to a date.
-+    // the array should mirror the parameters below
-+    // note: all values past the year are optional and will default to the lowest possible value.
-+    // [year, month, day , hour, minute, second, millisecond]
-+    function configFromArray (config) {
-+        var i, date, input = [], currentDate, expectedWeekday, yearToUse;
-+
-+        if (config._d) {
-+            return;
-+        }
-+
-+        currentDate = currentDateArray(config);
-+
-+        //compute day of the year from weeks and weekdays
-+        if (config._w && config._a[DATE] == null && config._a[MONTH] == null) {
-+            dayOfYearFromWeekInfo(config);
-+        }
-+
-+        //if the day of the year is set, figure out what it is
-+        if (config._dayOfYear != null) {
-+            yearToUse = defaults(config._a[YEAR], currentDate[YEAR]);
-+
-+            if (config._dayOfYear > daysInYear(yearToUse) || config._dayOfYear === 0) {
-+                getParsingFlags(config)._overflowDayOfYear = true;
-+            }
-+
-+            date = createUTCDate(yearToUse, 0, config._dayOfYear);
-+            config._a[MONTH] = date.getUTCMonth();
-+            config._a[DATE] = date.getUTCDate();
-+        }
-+
-+        // Default to current date.
-+        // * if no year, month, day of month are given, default to today
-+        // * if day of month is given, default month and year
-+        // * if month is given, default only year
-+        // * if year is given, don't default anything
-+        for (i = 0; i < 3 && config._a[i] == null; ++i) {
-+            config._a[i] = input[i] = currentDate[i];
-+        }
-+
-+        // Zero out whatever was not defaulted, including time
-+        for (; i < 7; i++) {
-+            config._a[i] = input[i] = (config._a[i] == null) ? (i === 2 ? 1 : 0) : config._a[i];
-+        }
-+
-+        // Check for 24:00:00.000
-+        if (config._a[HOUR] === 24 &&
-+                config._a[MINUTE] === 0 &&
-+                config._a[SECOND] === 0 &&
-+                config._a[MILLISECOND] === 0) {
-+            config._nextDay = true;
-+            config._a[HOUR] = 0;
-+        }
-+
-+        config._d = (config._useUTC ? createUTCDate : createDate).apply(null, input);
-+        expectedWeekday = config._useUTC ? config._d.getUTCDay() : config._d.getDay();
-+
-+        // Apply timezone offset from input. The actual utcOffset can be changed
-+        // with parseZone.
-+        if (config._tzm != null) {
-+            config._d.setUTCMinutes(config._d.getUTCMinutes() - config._tzm);
-+        }
-+
-+        if (config._nextDay) {
-+            config._a[HOUR] = 24;
-+        }
-+
-+        // check for mismatching day of week
-+        if (config._w && typeof config._w.d !== 'undefined' && config._w.d !== expectedWeekday) {
-+            getParsingFlags(config).weekdayMismatch = true;
-+        }
-+    }
-+
-+    function dayOfYearFromWeekInfo(config) {
-+        var w, weekYear, week, weekday, dow, doy, temp, weekdayOverflow;
-+
-+        w = config._w;
-+        if (w.GG != null || w.W != null || w.E != null) {
-+            dow = 1;
-+            doy = 4;
-+
-+            // TODO: We need to take the current isoWeekYear, but that depends on
-+            // how we interpret now (local, utc, fixed offset). So create
-+            // a now version of current config (take local/utc/offset flags, and
-+            // create now).
-+            weekYear = defaults(w.GG, config._a[YEAR], weekOfYear(createLocal(), 1, 4).year);
-+            week = defaults(w.W, 1);
-+            weekday = defaults(w.E, 1);
-+            if (weekday < 1 || weekday > 7) {
-+                weekdayOverflow = true;
-+            }
-+        } else {
-+            dow = config._locale._week.dow;
-+            doy = config._locale._week.doy;
-+
-+            var curWeek = weekOfYear(createLocal(), dow, doy);
-+
-+            weekYear = defaults(w.gg, config._a[YEAR], curWeek.year);
-+
-+            // Default to current week.
-+            week = defaults(w.w, curWeek.week);
-+
-+            if (w.d != null) {
-+                // weekday -- low day numbers are considered next week
-+                weekday = w.d;
-+                if (weekday < 0 || weekday > 6) {
-+                    weekdayOverflow = true;
-+                }
-+            } else if (w.e != null) {
-+                // local weekday -- counting starts from begining of week
-+                weekday = w.e + dow;
-+                if (w.e < 0 || w.e > 6) {
-+                    weekdayOverflow = true;
-+                }
-+            } else {
-+                // default to begining of week
-+                weekday = dow;
-+            }
-+        }
-+        if (week < 1 || week > weeksInYear(weekYear, dow, doy)) {
-+            getParsingFlags(config)._overflowWeeks = true;
-+        } else if (weekdayOverflow != null) {
-+            getParsingFlags(config)._overflowWeekday = true;
-+        } else {
-+            temp = dayOfYearFromWeeks(weekYear, week, weekday, dow, doy);
-+            config._a[YEAR] = temp.year;
-+            config._dayOfYear = temp.dayOfYear;
-+        }
-+    }
-+
-+    // iso 8601 regex
-+    // 0000-00-00 0000-W00 or 0000-W00-0 + T + 00 or 00:00 or 00:00:00 or 00:00:00.000 + +00:00 or +0000 or +00)
-+    var extendedIsoRegex = /^\s*((?:[+-]\d{6}|\d{4})-(?:\d\d-\d\d|W\d\d-\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?::\d\d(?::\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/;
-+    var basicIsoRegex = /^\s*((?:[+-]\d{6}|\d{4})(?:\d\d\d\d|W\d\d\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?:\d\d(?:\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/;
-+
-+    var tzRegex = /Z|[+-]\d\d(?::?\d\d)?/;
-+
-+    var isoDates = [
-+        ['YYYYYY-MM-DD', /[+-]\d{6}-\d\d-\d\d/],
-+        ['YYYY-MM-DD', /\d{4}-\d\d-\d\d/],
-+        ['GGGG-[W]WW-E', /\d{4}-W\d\d-\d/],
-+        ['GGGG-[W]WW', /\d{4}-W\d\d/, false],
-+        ['YYYY-DDD', /\d{4}-\d{3}/],
-+        ['YYYY-MM', /\d{4}-\d\d/, false],
-+        ['YYYYYYMMDD', /[+-]\d{10}/],
-+        ['YYYYMMDD', /\d{8}/],
-+        // YYYYMM is NOT allowed by the standard
-+        ['GGGG[W]WWE', /\d{4}W\d{3}/],
-+        ['GGGG[W]WW', /\d{4}W\d{2}/, false],
-+        ['YYYYDDD', /\d{7}/]
-+    ];
-+
-+    // iso time formats and regexes
-+    var isoTimes = [
-+        ['HH:mm:ss.SSSS', /\d\d:\d\d:\d\d\.\d+/],
-+        ['HH:mm:ss,SSSS', /\d\d:\d\d:\d\d,\d+/],
-+        ['HH:mm:ss', /\d\d:\d\d:\d\d/],
-+        ['HH:mm', /\d\d:\d\d/],
-+        ['HHmmss.SSSS', /\d\d\d\d\d\d\.\d+/],
-+        ['HHmmss,SSSS', /\d\d\d\d\d\d,\d+/],
-+        ['HHmmss', /\d\d\d\d\d\d/],
-+        ['HHmm', /\d\d\d\d/],
-+        ['HH', /\d\d/]
-+    ];
-+
-+    var aspNetJsonRegex = /^\/?Date\((\-?\d+)/i;
-+
-+    // date from iso format
-+    function configFromISO(config) {
-+        var i, l,
-+            string = config._i,
-+            match = extendedIsoRegex.exec(string) || basicIsoRegex.exec(string),
-+            allowTime, dateFormat, timeFormat, tzFormat;
-+
-+        if (match) {
-+            getParsingFlags(config).iso = true;
-+
-+            for (i = 0, l = isoDates.length; i < l; i++) {
-+                if (isoDates[i][1].exec(match[1])) {
-+                    dateFormat = isoDates[i][0];
-+                    allowTime = isoDates[i][2] !== false;
-+                    break;
-+                }
-+            }
-+            if (dateFormat == null) {
-+                config._isValid = false;
-+                return;
-+            }
-+            if (match[3]) {
-+                for (i = 0, l = isoTimes.length; i < l; i++) {
-+                    if (isoTimes[i][1].exec(match[3])) {
-+                        // match[2] should be 'T' or space
-+                        timeFormat = (match[2] || ' ') + isoTimes[i][0];
-+                        break;
-+                    }
-+                }
-+                if (timeFormat == null) {
-+                    config._isValid = false;
-+                    return;
-+                }
-+            }
-+            if (!allowTime && timeFormat != null) {
-+                config._isValid = false;
-+                return;
-+            }
-+            if (match[4]) {
-+                if (tzRegex.exec(match[4])) {
-+                    tzFormat = 'Z';
-+                } else {
-+                    config._isValid = false;
-+                    return;
-+                }
-+            }
-+            config._f = dateFormat + (timeFormat || '') + (tzFormat || '');
-+            configFromStringAndFormat(config);
-+        } else {
-+            config._isValid = false;
-+        }
-+    }
-+
-+    // RFC 2822 regex: For details see https://tools.ietf.org/html/rfc2822#section-3.3
-+    var rfc2822 = /^(?:(Mon|Tue|Wed|Thu|Fri|Sat|Sun),?\s)?(\d{1,2})\s(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s(\d{2,4})\s(\d\d):(\d\d)(?::(\d\d))?\s(?:(UT|GMT|[ECMP][SD]T)|([Zz])|([+-]\d{4}))$/;
-+
-+    function extractFromRFC2822Strings(yearStr, monthStr, dayStr, hourStr, minuteStr, secondStr) {
-+        var result = [
-+            untruncateYear(yearStr),
-+            defaultLocaleMonthsShort.indexOf(monthStr),
-+            parseInt(dayStr, 10),
-+            parseInt(hourStr, 10),
-+            parseInt(minuteStr, 10)
-+        ];
-+
-+        if (secondStr) {
-+            result.push(parseInt(secondStr, 10));
-+        }
-+
-+        return result;
-+    }
-+
-+    function untruncateYear(yearStr) {
-+        var year = parseInt(yearStr, 10);
-+        if (year <= 49) {
-+            return 2000 + year;
-+        } else if (year <= 999) {
-+            return 1900 + year;
-+        }
-+        return year;
-+    }
-+
-+    function preprocessRFC2822(s) {
-+        // Remove comments and folding whitespace and replace multiple-spaces with a single space
-+        return s.replace(/\([^)]*\)|[\n\t]/g, ' ').replace(/(\s\s+)/g, ' ').trim();
-+    }
-+
-+    function checkWeekday(weekdayStr, parsedInput, config) {
-+        if (weekdayStr) {
-+            // TODO: Replace the vanilla JS Date object with an indepentent day-of-week check.
-+            var weekdayProvided = defaultLocaleWeekdaysShort.indexOf(weekdayStr),
-+                weekdayActual = new Date(parsedInput[0], parsedInput[1], parsedInput[2]).getDay();
-+            if (weekdayProvided !== weekdayActual) {
-+                getParsingFlags(config).weekdayMismatch = true;
-+                config._isValid = false;
-+                return false;
-+            }
-+        }
-+        return true;
-+    }
-+
-+    var obsOffsets = {
-+        UT: 0,
-+        GMT: 0,
-+        EDT: -4 * 60,
-+        EST: -5 * 60,
-+        CDT: -5 * 60,
-+        CST: -6 * 60,
-+        MDT: -6 * 60,
-+        MST: -7 * 60,
-+        PDT: -7 * 60,
-+        PST: -8 * 60
-+    };
-+
-+    function calculateOffset(obsOffset, militaryOffset, numOffset) {
-+        if (obsOffset) {
-+            return obsOffsets[obsOffset];
-+        } else if (militaryOffset) {
-+            // the only allowed military tz is Z
-+            return 0;
-+        } else {
-+            var hm = parseInt(numOffset, 10);
-+            var m = hm % 100, h = (hm - m) / 100;
-+            return h * 60 + m;
-+        }
-+    }
-+
-+    // date and time from ref 2822 format
-+    function configFromRFC2822(config) {
-+        var match = rfc2822.exec(preprocessRFC2822(config._i));
-+        if (match) {
-+            var parsedArray = extractFromRFC2822Strings(match[4], match[3], match[2], match[5], match[6], match[7]);
-+            if (!checkWeekday(match[1], parsedArray, config)) {
-+                return;
-+            }
-+
-+            config._a = parsedArray;
-+            config._tzm = calculateOffset(match[8], match[9], match[10]);
-+
-+            config._d = createUTCDate.apply(null, config._a);
-+            config._d.setUTCMinutes(config._d.getUTCMinutes() - config._tzm);
-+
-+            getParsingFlags(config).rfc2822 = true;
-+        } else {
-+            config._isValid = false;
-+        }
-+    }
-+
-+    // date from iso format or fallback
-+    function configFromString(config) {
-+        var matched = aspNetJsonRegex.exec(config._i);
-+
-+        if (matched !== null) {
-+            config._d = new Date(+matched[1]);
-+            return;
-+        }
-+
-+        configFromISO(config);
-+        if (config._isValid === false) {
-+            delete config._isValid;
-+        } else {
-+            return;
-+        }
-+
-+        configFromRFC2822(config);
-+        if (config._isValid === false) {
-+            delete config._isValid;
-+        } else {
-+            return;
-+        }
-+
-+        // Final attempt, use Input Fallback
-+        hooks.createFromInputFallback(config);
-+    }
-+
-+    hooks.createFromInputFallback = deprecate(
-+        'value provided is not in a recognized RFC2822 or ISO format. moment construction falls back to js Date(), ' +
-+        'which is not reliable across all browsers and versions. Non RFC2822/ISO date formats are ' +
-+        'discouraged and will be removed in an upcoming major release. Please refer to ' +
-+        'http://momentjs.com/guides/#/warnings/js-date/ for more info.',
-+        function (config) {
-+            config._d = new Date(config._i + (config._useUTC ? ' UTC' : ''));
-+        }
-+    );
-+
-+    // constant that refers to the ISO standard
-+    hooks.ISO_8601 = function () {};
-+
-+    // constant that refers to the RFC 2822 form
-+    hooks.RFC_2822 = function () {};
-+
-+    // date from string and format string
-+    function configFromStringAndFormat(config) {
-+        // TODO: Move this to another part of the creation flow to prevent circular deps
-+        if (config._f === hooks.ISO_8601) {
-+            configFromISO(config);
-+            return;
-+        }
-+        if (config._f === hooks.RFC_2822) {
-+            configFromRFC2822(config);
-+            return;
-+        }
-+        config._a = [];
-+        getParsingFlags(config).empty = true;
-+
-+        // This array is used to make a Date, either with `new Date` or `Date.UTC`
-+        var string = '' + config._i,
-+            i, parsedInput, tokens, token, skipped,
-+            stringLength = string.length,
-+            totalParsedInputLength = 0;
-+
-+        tokens = expandFormat(config._f, config._locale).match(formattingTokens) || [];
-+
-+        for (i = 0; i < tokens.length; i++) {
-+            token = tokens[i];
-+            parsedInput = (string.match(getParseRegexForToken(token, config)) || [])[0];
-+            // console.log('token', token, 'parsedInput', parsedInput,
-+            //         'regex', getParseRegexForToken(token, config));
-+            if (parsedInput) {
-+                skipped = string.substr(0, string.indexOf(parsedInput));
-+                if (skipped.length > 0) {
-+                    getParsingFlags(config).unusedInput.push(skipped);
-+                }
-+                string = string.slice(string.indexOf(parsedInput) + parsedInput.length);
-+                totalParsedInputLength += parsedInput.length;
-+            }
-+            // don't parse if it's not a known token
-+            if (formatTokenFunctions[token]) {
-+                if (parsedInput) {
-+                    getParsingFlags(config).empty = false;
-+                }
-+                else {
-+                    getParsingFlags(config).unusedTokens.push(token);
-+                }
-+                addTimeToArrayFromToken(token, parsedInput, config);
-+            }
-+            else if (config._strict && !parsedInput) {
-+                getParsingFlags(config).unusedTokens.push(token);
-+            }
-+        }
-+
-+        // add remaining unparsed input length to the string
-+        getParsingFlags(config).charsLeftOver = stringLength - totalParsedInputLength;
-+        if (string.length > 0) {
-+            getParsingFlags(config).unusedInput.push(string);
-+        }
-+
-+        // clear _12h flag if hour is <= 12
-+        if (config._a[HOUR] <= 12 &&
-+            getParsingFlags(config).bigHour === true &&
-+            config._a[HOUR] > 0) {
-+            getParsingFlags(config).bigHour = undefined;
-+        }
-+
-+        getParsingFlags(config).parsedDateParts = config._a.slice(0);
-+        getParsingFlags(config).meridiem = config._meridiem;
-+        // handle meridiem
-+        config._a[HOUR] = meridiemFixWrap(config._locale, config._a[HOUR], config._meridiem);
-+
-+        configFromArray(config);
-+        checkOverflow(config);
-+    }
-+
-+
-+    function meridiemFixWrap (locale, hour, meridiem) {
-+        var isPm;
-+
-+        if (meridiem == null) {
-+            // nothing to do
-+            return hour;
-+        }
-+        if (locale.meridiemHour != null) {
-+            return locale.meridiemHour(hour, meridiem);
-+        } else if (locale.isPM != null) {
-+            // Fallback
-+            isPm = locale.isPM(meridiem);
-+            if (isPm && hour < 12) {
-+                hour += 12;
-+            }
-+            if (!isPm && hour === 12) {
-+                hour = 0;
-+            }
-+            return hour;
-+        } else {
-+            // this is not supposed to happen
-+            return hour;
-+        }
-+    }
-+
-+    // date from string and array of format strings
-+    function configFromStringAndArray(config) {
-+        var tempConfig,
-+            bestMoment,
-+
-+            scoreToBeat,
-+            i,
-+            currentScore;
-+
-+        if (config._f.length === 0) {
-+            getParsingFlags(config).invalidFormat = true;
-+            config._d = new Date(NaN);
-+            return;
-+        }
-+
-+        for (i = 0; i < config._f.length; i++) {
-+            currentScore = 0;
-+            tempConfig = copyConfig({}, config);
-+            if (config._useUTC != null) {
-+                tempConfig._useUTC = config._useUTC;
-+            }
-+            tempConfig._f = config._f[i];
-+            configFromStringAndFormat(tempConfig);
-+
-+            if (!isValid(tempConfig)) {
-+                continue;
-+            }
-+
-+            // if there is any input that was not parsed add a penalty for that format
-+            currentScore += getParsingFlags(tempConfig).charsLeftOver;
-+
-+            //or tokens
-+            currentScore += getParsingFlags(tempConfig).unusedTokens.length * 10;
-+
-+            getParsingFlags(tempConfig).score = currentScore;
-+
-+            if (scoreToBeat == null || currentScore < scoreToBeat) {
-+                scoreToBeat = currentScore;
-+                bestMoment = tempConfig;
-+            }
-+        }
-+
-+        extend(config, bestMoment || tempConfig);
-+    }
-+
-+    function configFromObject(config) {
-+        if (config._d) {
-+            return;
-+        }
-+
-+        var i = normalizeObjectUnits(config._i);
-+        config._a = map([i.year, i.month, i.day || i.date, i.hour, i.minute, i.second, i.millisecond], function (obj) {
-+            return obj && parseInt(obj, 10);
-+        });
-+
-+        configFromArray(config);
-+    }
-+
-+    function createFromConfig (config) {
-+        var res = new Moment(checkOverflow(prepareConfig(config)));
-+        if (res._nextDay) {
-+            // Adding is smart enough around DST
-+            res.add(1, 'd');
-+            res._nextDay = undefined;
-+        }
-+
-+        return res;
-+    }
-+
-+    function prepareConfig (config) {
-+        var input = config._i,
-+            format = config._f;
-+
-+        config._locale = config._locale || getLocale(config._l);
-+
-+        if (input === null || (format === undefined && input === '')) {
-+            return createInvalid({nullInput: true});
-+        }
-+
-+        if (typeof input === 'string') {
-+            config._i = input = config._locale.preparse(input);
-+        }
-+
-+        if (isMoment(input)) {
-+            return new Moment(checkOverflow(input));
-+        } else if (isDate(input)) {
-+            config._d = input;
-+        } else if (isArray(format)) {
-+            configFromStringAndArray(config);
-+        } else if (format) {
-+            configFromStringAndFormat(config);
-+        }  else {
-+            configFromInput(config);
-+        }
-+
-+        if (!isValid(config)) {
-+            config._d = null;
-+        }
-+
-+        return config;
-+    }
-+
-+    function configFromInput(config) {
-+        var input = config._i;
-+        if (isUndefined(input)) {
-+            config._d = new Date(hooks.now());
-+        } else if (isDate(input)) {
-+            config._d = new Date(input.valueOf());
-+        } else if (typeof input === 'string') {
-+            configFromString(config);
-+        } else if (isArray(input)) {
-+            config._a = map(input.slice(0), function (obj) {
-+                return parseInt(obj, 10);
-+            });
-+            configFromArray(config);
-+        } else if (isObject(input)) {
-+            configFromObject(config);
-+        } else if (isNumber(input)) {
-+            // from milliseconds
-+            config._d = new Date(input);
-+        } else {
-+            hooks.createFromInputFallback(config);
-+        }
-+    }
-+
-+    function createLocalOrUTC (input, format, locale, strict, isUTC) {
-+        var c = {};
-+
-+        if (locale === true || locale === false) {
-+            strict = locale;
-+            locale = undefined;
-+        }
-+
-+        if ((isObject(input) && isObjectEmpty(input)) ||
-+                (isArray(input) && input.length === 0)) {
-+            input = undefined;
-+        }
-+        // object construction must be done this way.
-+        // https://github.com/moment/moment/issues/1423
-+        c._isAMomentObject = true;
-+        c._useUTC = c._isUTC = isUTC;
-+        c._l = locale;
-+        c._i = input;
-+        c._f = format;
-+        c._strict = strict;
-+
-+        return createFromConfig(c);
-+    }
-+
-+    function createLocal (input, format, locale, strict) {
-+        return createLocalOrUTC(input, format, locale, strict, false);
-+    }
-+
-+    var prototypeMin = deprecate(
-+        'moment().min is deprecated, use moment.max instead. http://momentjs.com/guides/#/warnings/min-max/',
-+        function () {
-+            var other = createLocal.apply(null, arguments);
-+            if (this.isValid() && other.isValid()) {
-+                return other < this ? this : other;
-+            } else {
-+                return createInvalid();
-+            }
-+        }
-+    );
-+
-+    var prototypeMax = deprecate(
-+        'moment().max is deprecated, use moment.min instead. http://momentjs.com/guides/#/warnings/min-max/',
-+        function () {
-+            var other = createLocal.apply(null, arguments);
-+            if (this.isValid() && other.isValid()) {
-+                return other > this ? this : other;
-+            } else {
-+                return createInvalid();
-+            }
-+        }
-+    );
-+
-+    // Pick a moment m from moments so that m[fn](other) is true for all
-+    // other. This relies on the function fn to be transitive.
-+    //
-+    // moments should either be an array of moment objects or an array, whose
-+    // first element is an array of moment objects.
-+    function pickBy(fn, moments) {
-+        var res, i;
-+        if (moments.length === 1 && isArray(moments[0])) {
-+            moments = moments[0];
-+        }
-+        if (!moments.length) {
-+            return createLocal();
-+        }
-+        res = moments[0];
-+        for (i = 1; i < moments.length; ++i) {
-+            if (!moments[i].isValid() || moments[i][fn](res)) {
-+                res = moments[i];
-+            }
-+        }
-+        return res;
-+    }
-+
-+    // TODO: Use [].sort instead?
-+    function min () {
-+        var args = [].slice.call(arguments, 0);
-+
-+        return pickBy('isBefore', args);
-+    }
-+
-+    function max () {
-+        var args = [].slice.call(arguments, 0);
-+
-+        return pickBy('isAfter', args);
-+    }
-+
-+    var now = function () {
-+        return Date.now ? Date.now() : +(new Date());
-+    };
-+
-+    var ordering = ['year', 'quarter', 'month', 'week', 'day', 'hour', 'minute', 'second', 'millisecond'];
-+
-+    function isDurationValid(m) {
-+        for (var key in m) {
-+            if (!(indexOf.call(ordering, key) !== -1 && (m[key] == null || !isNaN(m[key])))) {
-+                return false;
-+            }
-+        }
-+
-+        var unitHasDecimal = false;
-+        for (var i = 0; i < ordering.length; ++i) {
-+            if (m[ordering[i]]) {
-+                if (unitHasDecimal) {
-+                    return false; // only allow non-integers for smallest unit
-+                }
-+                if (parseFloat(m[ordering[i]]) !== toInt(m[ordering[i]])) {
-+                    unitHasDecimal = true;
-+                }
-+            }
-+        }
-+
-+        return true;
-+    }
-+
-+    function isValid$1() {
-+        return this._isValid;
-+    }
-+
-+    function createInvalid$1() {
-+        return createDuration(NaN);
-+    }
-+
-+    function Duration (duration) {
-+        var normalizedInput = normalizeObjectUnits(duration),
-+            years = normalizedInput.year || 0,
-+            quarters = normalizedInput.quarter || 0,
-+            months = normalizedInput.month || 0,
-+            weeks = normalizedInput.week || 0,
-+            days = normalizedInput.day || 0,
-+            hours = normalizedInput.hour || 0,
-+            minutes = normalizedInput.minute || 0,
-+            seconds = normalizedInput.second || 0,
-+            milliseconds = normalizedInput.millisecond || 0;
-+
-+        this._isValid = isDurationValid(normalizedInput);
-+
-+        // representation for dateAddRemove
-+        this._milliseconds = +milliseconds +
-+            seconds * 1e3 + // 1000
-+            minutes * 6e4 + // 1000 * 60
-+            hours * 1000 * 60 * 60; //using 1000 * 60 * 60 instead of 36e5 to avoid floating point rounding errors https://github.com/moment/moment/issues/2978
-+        // Because of dateAddRemove treats 24 hours as different from a
-+        // day when working around DST, we need to store them separately
-+        this._days = +days +
-+            weeks * 7;
-+        // It is impossible to translate months into days without knowing
-+        // which months you are are talking about, so we have to store
-+        // it separately.
-+        this._months = +months +
-+            quarters * 3 +
-+            years * 12;
-+
-+        this._data = {};
-+
-+        this._locale = getLocale();
-+
-+        this._bubble();
-+    }
-+
-+    function isDuration (obj) {
-+        return obj instanceof Duration;
-+    }
-+
-+    function absRound (number) {
-+        if (number < 0) {
-+            return Math.round(-1 * number) * -1;
-+        } else {
-+            return Math.round(number);
-+        }
-+    }
-+
-+    // FORMATTING
-+
-+    function offset (token, separator) {
-+        addFormatToken(token, 0, 0, function () {
-+            var offset = this.utcOffset();
-+            var sign = '+';
-+            if (offset < 0) {
-+                offset = -offset;
-+                sign = '-';
-+            }
-+            return sign + zeroFill(~~(offset / 60), 2) + separator + zeroFill(~~(offset) % 60, 2);
-+        });
-+    }
-+
-+    offset('Z', ':');
-+    offset('ZZ', '');
-+
-+    // PARSING
-+
-+    addRegexToken('Z',  matchShortOffset);
-+    addRegexToken('ZZ', matchShortOffset);
-+    addParseToken(['Z', 'ZZ'], function (input, array, config) {
-+        config._useUTC = true;
-+        config._tzm = offsetFromString(matchShortOffset, input);
-+    });
-+
-+    // HELPERS
-+
-+    // timezone chunker
-+    // '+10:00' > ['10',  '00']
-+    // '-1530'  > ['-15', '30']
-+    var chunkOffset = /([\+\-]|\d\d)/gi;
-+
-+    function offsetFromString(matcher, string) {
-+        var matches = (string || '').match(matcher);
-+
-+        if (matches === null) {
-+            return null;
-+        }
-+
-+        var chunk   = matches[matches.length - 1] || [];
-+        var parts   = (chunk + '').match(chunkOffset) || ['-', 0, 0];
-+        var minutes = +(parts[1] * 60) + toInt(parts[2]);
-+
-+        return minutes === 0 ?
-+          0 :
-+          parts[0] === '+' ? minutes : -minutes;
-+    }
-+
-+    // Return a moment from input, that is local/utc/zone equivalent to model.
-+    function cloneWithOffset(input, model) {
-+        var res, diff;
-+        if (model._isUTC) {
-+            res = model.clone();
-+            diff = (isMoment(input) || isDate(input) ? input.valueOf() : createLocal(input).valueOf()) - res.valueOf();
-+            // Use low-level api, because this fn is low-level api.
-+            res._d.setTime(res._d.valueOf() + diff);
-+            hooks.updateOffset(res, false);
-+            return res;
-+        } else {
-+            return createLocal(input).local();
-+        }
-+    }
-+
-+    function getDateOffset (m) {
-+        // On Firefox.24 Date#getTimezoneOffset returns a floating point.
-+        // https://github.com/moment/moment/pull/1871
-+        return -Math.round(m._d.getTimezoneOffset() / 15) * 15;
-+    }
-+
-+    // HOOKS
-+
-+    // This function will be called whenever a moment is mutated.
-+    // It is intended to keep the offset in sync with the timezone.
-+    hooks.updateOffset = function () {};
-+
-+    // MOMENTS
-+
-+    // keepLocalTime = true means only change the timezone, without
-+    // affecting the local hour. So 5:31:26 +0300 --[utcOffset(2, true)]-->
-+    // 5:31:26 +0200 It is possible that 5:31:26 doesn't exist with offset
-+    // +0200, so we adjust the time as needed, to be valid.
-+    //
-+    // Keeping the time actually adds/subtracts (one hour)
-+    // from the actual represented time. That is why we call updateOffset
-+    // a second time. In case it wants us to change the offset again
-+    // _changeInProgress == true case, then we have to adjust, because
-+    // there is no such time in the given timezone.
-+    function getSetOffset (input, keepLocalTime, keepMinutes) {
-+        var offset = this._offset || 0,
-+            localAdjust;
-+        if (!this.isValid()) {
-+            return input != null ? this : NaN;
-+        }
-+        if (input != null) {
-+            if (typeof input === 'string') {
-+                input = offsetFromString(matchShortOffset, input);
-+                if (input === null) {
-+                    return this;
-+                }
-+            } else if (Math.abs(input) < 16 && !keepMinutes) {
-+                input = input * 60;
-+            }
-+            if (!this._isUTC && keepLocalTime) {
-+                localAdjust = getDateOffset(this);
-+            }
-+            this._offset = input;
-+            this._isUTC = true;
-+            if (localAdjust != null) {
-+                this.add(localAdjust, 'm');
-+            }
-+            if (offset !== input) {
-+                if (!keepLocalTime || this._changeInProgress) {
-+                    addSubtract(this, createDuration(input - offset, 'm'), 1, false);
-+                } else if (!this._changeInProgress) {
-+                    this._changeInProgress = true;
-+                    hooks.updateOffset(this, true);
-+                    this._changeInProgress = null;
-+                }
-+            }
-+            return this;
-+        } else {
-+            return this._isUTC ? offset : getDateOffset(this);
-+        }
-+    }
-+
-+    function getSetZone (input, keepLocalTime) {
-+        if (input != null) {
-+            if (typeof input !== 'string') {
-+                input = -input;
-+            }
-+
-+            this.utcOffset(input, keepLocalTime);
-+
-+            return this;
-+        } else {
-+            return -this.utcOffset();
-+        }
-+    }
-+
-+    function setOffsetToUTC (keepLocalTime) {
-+        return this.utcOffset(0, keepLocalTime);
-+    }
-+
-+    function setOffsetToLocal (keepLocalTime) {
-+        if (this._isUTC) {
-+            this.utcOffset(0, keepLocalTime);
-+            this._isUTC = false;
-+
-+            if (keepLocalTime) {
-+                this.subtract(getDateOffset(this), 'm');
-+            }
-+        }
-+        return this;
-+    }
-+
-+    function setOffsetToParsedOffset () {
-+        if (this._tzm != null) {
-+            this.utcOffset(this._tzm, false, true);
-+        } else if (typeof this._i === 'string') {
-+            var tZone = offsetFromString(matchOffset, this._i);
-+            if (tZone != null) {
-+                this.utcOffset(tZone);
-+            }
-+            else {
-+                this.utcOffset(0, true);
-+            }
-+        }
-+        return this;
-+    }
-+
-+    function hasAlignedHourOffset (input) {
-+        if (!this.isValid()) {
-+            return false;
-+        }
-+        input = input ? createLocal(input).utcOffset() : 0;
-+
-+        return (this.utcOffset() - input) % 60 === 0;
-+    }
-+
-+    function isDaylightSavingTime () {
-+        return (
-+            this.utcOffset() > this.clone().month(0).utcOffset() ||
-+            this.utcOffset() > this.clone().month(5).utcOffset()
-+        );
-+    }
-+
-+    function isDaylightSavingTimeShifted () {
-+        if (!isUndefined(this._isDSTShifted)) {
-+            return this._isDSTShifted;
-+        }
-+
-+        var c = {};
-+
-+        copyConfig(c, this);
-+        c = prepareConfig(c);
-+
-+        if (c._a) {
-+            var other = c._isUTC ? createUTC(c._a) : createLocal(c._a);
-+            this._isDSTShifted = this.isValid() &&
-+                compareArrays(c._a, other.toArray()) > 0;
-+        } else {
-+            this._isDSTShifted = false;
-+        }
-+
-+        return this._isDSTShifted;
-+    }
-+
-+    function isLocal () {
-+        return this.isValid() ? !this._isUTC : false;
-+    }
-+
-+    function isUtcOffset () {
-+        return this.isValid() ? this._isUTC : false;
-+    }
-+
-+    function isUtc () {
-+        return this.isValid() ? this._isUTC && this._offset === 0 : false;
-+    }
-+
-+    // ASP.NET json date format regex
-+    var aspNetRegex = /^(\-|\+)?(?:(\d*)[. ])?(\d+)\:(\d+)(?:\:(\d+)(\.\d*)?)?$/;
-+
-+    // from http://docs.closure-library.googlecode.com/git/closure_goog_date_date.js.source.html
-+    // somewhat more in line with 4.4.3.2 2004 spec, but allows decimal anywhere
-+    // and further modified to allow for strings containing both week and day
-+    var isoRegex = /^(-|\+)?P(?:([-+]?[0-9,.]*)Y)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)W)?(?:([-+]?[0-9,.]*)D)?(?:T(?:([-+]?[0-9,.]*)H)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)S)?)?$/;
-+
-+    function createDuration (input, key) {
-+        var duration = input,
-+            // matching against regexp is expensive, do it on demand
-+            match = null,
-+            sign,
-+            ret,
-+            diffRes;
-+
-+        if (isDuration(input)) {
-+            duration = {
-+                ms : input._milliseconds,
-+                d  : input._days,
-+                M  : input._months
-+            };
-+        } else if (isNumber(input)) {
-+            duration = {};
-+            if (key) {
-+                duration[key] = input;
-+            } else {
-+                duration.milliseconds = input;
-+            }
-+        } else if (!!(match = aspNetRegex.exec(input))) {
-+            sign = (match[1] === '-') ? -1 : 1;
-+            duration = {
-+                y  : 0,
-+                d  : toInt(match[DATE])                         * sign,
-+                h  : toInt(match[HOUR])                         * sign,
-+                m  : toInt(match[MINUTE])                       * sign,
-+                s  : toInt(match[SECOND])                       * sign,
-+                ms : toInt(absRound(match[MILLISECOND] * 1000)) * sign // the millisecond decimal point is included in the match
-+            };
-+        } else if (!!(match = isoRegex.exec(input))) {
-+            sign = (match[1] === '-') ? -1 : (match[1] === '+') ? 1 : 1;
-+            duration = {
-+                y : parseIso(match[2], sign),
-+                M : parseIso(match[3], sign),
-+                w : parseIso(match[4], sign),
-+                d : parseIso(match[5], sign),
-+                h : parseIso(match[6], sign),
-+                m : parseIso(match[7], sign),
-+                s : parseIso(match[8], sign)
-+            };
-+        } else if (duration == null) {// checks for null or undefined
-+            duration = {};
-+        } else if (typeof duration === 'object' && ('from' in duration || 'to' in duration)) {
-+            diffRes = momentsDifference(createLocal(duration.from), createLocal(duration.to));
-+
-+            duration = {};
-+            duration.ms = diffRes.milliseconds;
-+            duration.M = diffRes.months;
-+        }
-+
-+        ret = new Duration(duration);
-+
-+        if (isDuration(input) && hasOwnProp(input, '_locale')) {
-+            ret._locale = input._locale;
-+        }
-+
-+        return ret;
-+    }
-+
-+    createDuration.fn = Duration.prototype;
-+    createDuration.invalid = createInvalid$1;
-+
-+    function parseIso (inp, sign) {
-+        // We'd normally use ~~inp for this, but unfortunately it also
-+        // converts floats to ints.
-+        // inp may be undefined, so careful calling replace on it.
-+        var res = inp && parseFloat(inp.replace(',', '.'));
-+        // apply sign while we're at it
-+        return (isNaN(res) ? 0 : res) * sign;
-+    }
-+
-+    function positiveMomentsDifference(base, other) {
-+        var res = {milliseconds: 0, months: 0};
-+
-+        res.months = other.month() - base.month() +
-+            (other.year() - base.year()) * 12;
-+        if (base.clone().add(res.months, 'M').isAfter(other)) {
-+            --res.months;
-+        }
-+
-+        res.milliseconds = +other - +(base.clone().add(res.months, 'M'));
-+
-+        return res;
-+    }
-+
-+    function momentsDifference(base, other) {
-+        var res;
-+        if (!(base.isValid() && other.isValid())) {
-+            return {milliseconds: 0, months: 0};
-+        }
-+
-+        other = cloneWithOffset(other, base);
-+        if (base.isBefore(other)) {
-+            res = positiveMomentsDifference(base, other);
-+        } else {
-+            res = positiveMomentsDifference(other, base);
-+            res.milliseconds = -res.milliseconds;
-+            res.months = -res.months;
-+        }
-+
-+        return res;
-+    }
-+
-+    // TODO: remove 'name' arg after deprecation is removed
-+    function createAdder(direction, name) {
-+        return function (val, period) {
-+            var dur, tmp;
-+            //invert the arguments, but complain about it
-+            if (period !== null && !isNaN(+period)) {
-+                deprecateSimple(name, 'moment().' + name  + '(period, number) is deprecated. Please use moment().' + name + '(number, period). ' +
-+                'See http://momentjs.com/guides/#/warnings/add-inverted-param/ for more info.');
-+                tmp = val; val = period; period = tmp;
-+            }
-+
-+            val = typeof val === 'string' ? +val : val;
-+            dur = createDuration(val, period);
-+            addSubtract(this, dur, direction);
-+            return this;
-+        };
-+    }
-+
-+    function addSubtract (mom, duration, isAdding, updateOffset) {
-+        var milliseconds = duration._milliseconds,
-+            days = absRound(duration._days),
-+            months = absRound(duration._months);
-+
-+        if (!mom.isValid()) {
-+            // No op
-+            return;
-+        }
-+
-+        updateOffset = updateOffset == null ? true : updateOffset;
-+
-+        if (months) {
-+            setMonth(mom, get(mom, 'Month') + months * isAdding);
-+        }
-+        if (days) {
-+            set$1(mom, 'Date', get(mom, 'Date') + days * isAdding);
-+        }
-+        if (milliseconds) {
-+            mom._d.setTime(mom._d.valueOf() + milliseconds * isAdding);
-+        }
-+        if (updateOffset) {
-+            hooks.updateOffset(mom, days || months);
-+        }
-+    }
-+
-+    var add      = createAdder(1, 'add');
-+    var subtract = createAdder(-1, 'subtract');
-+
-+    function getCalendarFormat(myMoment, now) {
-+        var diff = myMoment.diff(now, 'days', true);
-+        return diff < -6 ? 'sameElse' :
-+                diff < -1 ? 'lastWeek' :
-+                diff < 0 ? 'lastDay' :
-+                diff < 1 ? 'sameDay' :
-+                diff < 2 ? 'nextDay' :
-+                diff < 7 ? 'nextWeek' : 'sameElse';
-+    }
-+
-+    function calendar$1 (time, formats) {
-+        // We want to compare the start of today, vs this.
-+        // Getting start-of-today depends on whether we're local/utc/offset or not.
-+        var now = time || createLocal(),
-+            sod = cloneWithOffset(now, this).startOf('day'),
-+            format = hooks.calendarFormat(this, sod) || 'sameElse';
-+
-+        var output = formats && (isFunction(formats[format]) ? formats[format].call(this, now) : formats[format]);
-+
-+        return this.format(output || this.localeData().calendar(format, this, createLocal(now)));
-+    }
-+
-+    function clone () {
-+        return new Moment(this);
-+    }
-+
-+    function isAfter (input, units) {
-+        var localInput = isMoment(input) ? input : createLocal(input);
-+        if (!(this.isValid() && localInput.isValid())) {
-+            return false;
-+        }
-+        units = normalizeUnits(!isUndefined(units) ? units : 'millisecond');
-+        if (units === 'millisecond') {
-+            return this.valueOf() > localInput.valueOf();
-+        } else {
-+            return localInput.valueOf() < this.clone().startOf(units).valueOf();
-+        }
-+    }
-+
-+    function isBefore (input, units) {
-+        var localInput = isMoment(input) ? input : createLocal(input);
-+        if (!(this.isValid() && localInput.isValid())) {
-+            return false;
-+        }
-+        units = normalizeUnits(!isUndefined(units) ? units : 'millisecond');
-+        if (units === 'millisecond') {
-+            return this.valueOf() < localInput.valueOf();
-+        } else {
-+            return this.clone().endOf(units).valueOf() < localInput.valueOf();
-+        }
-+    }
-+
-+    function isBetween (from, to, units, inclusivity) {
-+        inclusivity = inclusivity || '()';
-+        return (inclusivity[0] === '(' ? this.isAfter(from, units) : !this.isBefore(from, units)) &&
-+            (inclusivity[1] === ')' ? this.isBefore(to, units) : !this.isAfter(to, units));
-+    }
-+
-+    function isSame (input, units) {
-+        var localInput = isMoment(input) ? input : createLocal(input),
-+            inputMs;
-+        if (!(this.isValid() && localInput.isValid())) {
-+            return false;
-+        }
-+        units = normalizeUnits(units || 'millisecond');
-+        if (units === 'millisecond') {
-+            return this.valueOf() === localInput.valueOf();
-+        } else {
-+            inputMs = localInput.valueOf();
-+            return this.clone().startOf(units).valueOf() <= inputMs && inputMs <= this.clone().endOf(units).valueOf();
-+        }
-+    }
-+
-+    function isSameOrAfter (input, units) {
-+        return this.isSame(input, units) || this.isAfter(input,units);
-+    }
-+
-+    function isSameOrBefore (input, units) {
-+        return this.isSame(input, units) || this.isBefore(input,units);
-+    }
-+
-+    function diff (input, units, asFloat) {
-+        var that,
-+            zoneDelta,
-+            output;
-+
-+        if (!this.isValid()) {
-+            return NaN;
-+        }
-+
-+        that = cloneWithOffset(input, this);
-+
-+        if (!that.isValid()) {
-+            return NaN;
-+        }
-+
-+        zoneDelta = (that.utcOffset() - this.utcOffset()) * 6e4;
-+
-+        units = normalizeUnits(units);
-+
-+        switch (units) {
-+            case 'year': output = monthDiff(this, that) / 12; break;
-+            case 'month': output = monthDiff(this, that); break;
-+            case 'quarter': output = monthDiff(this, that) / 3; break;
-+            case 'second': output = (this - that) / 1e3; break; // 1000
-+            case 'minute': output = (this - that) / 6e4; break; // 1000 * 60
-+            case 'hour': output = (this - that) / 36e5; break; // 1000 * 60 * 60
-+            case 'day': output = (this - that - zoneDelta) / 864e5; break; // 1000 * 60 * 60 * 24, negate dst
-+            case 'week': output = (this - that - zoneDelta) / 6048e5; break; // 1000 * 60 * 60 * 24 * 7, negate dst
-+            default: output = this - that;
-+        }
-+
-+        return asFloat ? output : absFloor(output);
-+    }
-+
-+    function monthDiff (a, b) {
-+        // difference in months
-+        var wholeMonthDiff = ((b.year() - a.year()) * 12) + (b.month() - a.month()),
-+            // b is in (anchor - 1 month, anchor + 1 month)
-+            anchor = a.clone().add(wholeMonthDiff, 'months'),
-+            anchor2, adjust;
-+
-+        if (b - anchor < 0) {
-+            anchor2 = a.clone().add(wholeMonthDiff - 1, 'months');
-+            // linear across the month
-+            adjust = (b - anchor) / (anchor - anchor2);
-+        } else {
-+            anchor2 = a.clone().add(wholeMonthDiff + 1, 'months');
-+            // linear across the month
-+            adjust = (b - anchor) / (anchor2 - anchor);
-+        }
-+
-+        //check for negative zero, return zero if negative zero
-+        return -(wholeMonthDiff + adjust) || 0;
-+    }
-+
-+    hooks.defaultFormat = 'YYYY-MM-DDTHH:mm:ssZ';
-+    hooks.defaultFormatUtc = 'YYYY-MM-DDTHH:mm:ss[Z]';
-+
-+    function toString () {
-+        return this.clone().locale('en').format('ddd MMM DD YYYY HH:mm:ss [GMT]ZZ');
-+    }
-+
-+    function toISOString(keepOffset) {
-+        if (!this.isValid()) {
-+            return null;
-+        }
-+        var utc = keepOffset !== true;
-+        var m = utc ? this.clone().utc() : this;
-+        if (m.year() < 0 || m.year() > 9999) {
-+            return formatMoment(m, utc ? 'YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]' : 'YYYYYY-MM-DD[T]HH:mm:ss.SSSZ');
-+        }
-+        if (isFunction(Date.prototype.toISOString)) {
-+            // native implementation is ~50x faster, use it when we can
-+            if (utc) {
-+                return this.toDate().toISOString();
-+            } else {
-+                return new Date(this.valueOf() + this.utcOffset() * 60 * 1000).toISOString().replace('Z', formatMoment(m, 'Z'));
-+            }
-+        }
-+        return formatMoment(m, utc ? 'YYYY-MM-DD[T]HH:mm:ss.SSS[Z]' : 'YYYY-MM-DD[T]HH:mm:ss.SSSZ');
-+    }
-+
-+    /**
-+     * Return a human readable representation of a moment that can
-+     * also be evaluated to get a new moment which is the same
-+     *
-+     * @link https://nodejs.org/dist/latest/docs/api/util.html#util_custom_inspect_function_on_objects
-+     */
-+    function inspect () {
-+        if (!this.isValid()) {
-+            return 'moment.invalid(/* ' + this._i + ' */)';
-+        }
-+        var func = 'moment';
-+        var zone = '';
-+        if (!this.isLocal()) {
-+            func = this.utcOffset() === 0 ? 'moment.utc' : 'moment.parseZone';
-+            zone = 'Z';
-+        }
-+        var prefix = '[' + func + '("]';
-+        var year = (0 <= this.year() && this.year() <= 9999) ? 'YYYY' : 'YYYYYY';
-+        var datetime = '-MM-DD[T]HH:mm:ss.SSS';
-+        var suffix = zone + '[")]';
-+
-+        return this.format(prefix + year + datetime + suffix);
-+    }
-+
-+    function format (inputString) {
-+        if (!inputString) {
-+            inputString = this.isUtc() ? hooks.defaultFormatUtc : hooks.defaultFormat;
-+        }
-+        var output = formatMoment(this, inputString);
-+        return this.localeData().postformat(output);
-+    }
-+
-+    function from (time, withoutSuffix) {
-+        if (this.isValid() &&
-+                ((isMoment(time) && time.isValid()) ||
-+                 createLocal(time).isValid())) {
-+            return createDuration({to: this, from: time}).locale(this.locale()).humanize(!withoutSuffix);
-+        } else {
-+            return this.localeData().invalidDate();
-+        }
-+    }
-+
-+    function fromNow (withoutSuffix) {
-+        return this.from(createLocal(), withoutSuffix);
-+    }
-+
-+    function to (time, withoutSuffix) {
-+        if (this.isValid() &&
-+                ((isMoment(time) && time.isValid()) ||
-+                 createLocal(time).isValid())) {
-+            return createDuration({from: this, to: time}).locale(this.locale()).humanize(!withoutSuffix);
-+        } else {
-+            return this.localeData().invalidDate();
-+        }
-+    }
-+
-+    function toNow (withoutSuffix) {
-+        return this.to(createLocal(), withoutSuffix);
-+    }
-+
-+    // If passed a locale key, it will set the locale for this
-+    // instance.  Otherwise, it will return the locale configuration
-+    // variables for this instance.
-+    function locale (key) {
-+        var newLocaleData;
-+
-+        if (key === undefined) {
-+            return this._locale._abbr;
-+        } else {
-+            newLocaleData = getLocale(key);
-+            if (newLocaleData != null) {
-+                this._locale = newLocaleData;
-+            }
-+            return this;
-+        }
-+    }
-+
-+    var lang = deprecate(
-+        'moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.',
-+        function (key) {
-+            if (key === undefined) {
-+                return this.localeData();
-+            } else {
-+                return this.locale(key);
-+            }
-+        }
-+    );
-+
-+    function localeData () {
-+        return this._locale;
-+    }
-+
-+    function startOf (units) {
-+        units = normalizeUnits(units);
-+        // the following switch intentionally omits break keywords
-+        // to utilize falling through the cases.
-+        switch (units) {
-+            case 'year':
-+                this.month(0);
-+                /* falls through */
-+            case 'quarter':
-+            case 'month':
-+                this.date(1);
-+                /* falls through */
-+            case 'week':
-+            case 'isoWeek':
-+            case 'day':
-+            case 'date':
-+                this.hours(0);
-+                /* falls through */
-+            case 'hour':
-+                this.minutes(0);
-+                /* falls through */
-+            case 'minute':
-+                this.seconds(0);
-+                /* falls through */
-+            case 'second':
-+                this.milliseconds(0);
-+        }
-+
-+        // weeks are a special case
-+        if (units === 'week') {
-+            this.weekday(0);
-+        }
-+        if (units === 'isoWeek') {
-+            this.isoWeekday(1);
-+        }
-+
-+        // quarters are also special
-+        if (units === 'quarter') {
-+            this.month(Math.floor(this.month() / 3) * 3);
-+        }
-+
-+        return this;
-+    }
-+
-+    function endOf (units) {
-+        units = normalizeUnits(units);
-+        if (units === undefined || units === 'millisecond') {
-+            return this;
-+        }
-+
-+        // 'date' is an alias for 'day', so it should be considered as such.
-+        if (units === 'date') {
-+            units = 'day';
-+        }
-+
-+        return this.startOf(units).add(1, (units === 'isoWeek' ? 'week' : units)).subtract(1, 'ms');
-+    }
-+
-+    function valueOf () {
-+        return this._d.valueOf() - ((this._offset || 0) * 60000);
-+    }
-+
-+    function unix () {
-+        return Math.floor(this.valueOf() / 1000);
-+    }
-+
-+    function toDate () {
-+        return new Date(this.valueOf());
-+    }
-+
-+    function toArray () {
-+        var m = this;
-+        return [m.year(), m.month(), m.date(), m.hour(), m.minute(), m.second(), m.millisecond()];
-+    }
-+
-+    function toObject () {
-+        var m = this;
-+        return {
-+            years: m.year(),
-+            months: m.month(),
-+            date: m.date(),
-+            hours: m.hours(),
-+            minutes: m.minutes(),
-+            seconds: m.seconds(),
-+            milliseconds: m.milliseconds()
-+        };
-+    }
-+
-+    function toJSON () {
-+        // new Date(NaN).toJSON() === null
-+        return this.isValid() ? this.toISOString() : null;
-+    }
-+
-+    function isValid$2 () {
-+        return isValid(this);
-+    }
-+
-+    function parsingFlags () {
-+        return extend({}, getParsingFlags(this));
-+    }
-+
-+    function invalidAt () {
-+        return getParsingFlags(this).overflow;
-+    }
-+
-+    function creationData() {
-+        return {
-+            input: this._i,
-+            format: this._f,
-+            locale: this._locale,
-+            isUTC: this._isUTC,
-+            strict: this._strict
-+        };
-+    }
-+
-+    // FORMATTING
-+
-+    addFormatToken(0, ['gg', 2], 0, function () {
-+        return this.weekYear() % 100;
-+    });
-+
-+    addFormatToken(0, ['GG', 2], 0, function () {
-+        return this.isoWeekYear() % 100;
-+    });
-+
-+    function addWeekYearFormatToken (token, getter) {
-+        addFormatToken(0, [token, token.length], 0, getter);
-+    }
-+
-+    addWeekYearFormatToken('gggg',     'weekYear');
-+    addWeekYearFormatToken('ggggg',    'weekYear');
-+    addWeekYearFormatToken('GGGG',  'isoWeekYear');
-+    addWeekYearFormatToken('GGGGG', 'isoWeekYear');
-+
-+    // ALIASES
-+
-+    addUnitAlias('weekYear', 'gg');
-+    addUnitAlias('isoWeekYear', 'GG');
-+
-+    // PRIORITY
-+
-+    addUnitPriority('weekYear', 1);
-+    addUnitPriority('isoWeekYear', 1);
-+
-+
-+    // PARSING
-+
-+    addRegexToken('G',      matchSigned);
-+    addRegexToken('g',      matchSigned);
-+    addRegexToken('GG',     match1to2, match2);
-+    addRegexToken('gg',     match1to2, match2);
-+    addRegexToken('GGGG',   match1to4, match4);
-+    addRegexToken('gggg',   match1to4, match4);
-+    addRegexToken('GGGGG',  match1to6, match6);
-+    addRegexToken('ggggg',  match1to6, match6);
-+
-+    addWeekParseToken(['gggg', 'ggggg', 'GGGG', 'GGGGG'], function (input, week, config, token) {
-+        week[token.substr(0, 2)] = toInt(input);
-+    });
-+
-+    addWeekParseToken(['gg', 'GG'], function (input, week, config, token) {
-+        week[token] = hooks.parseTwoDigitYear(input);
-+    });
-+
-+    // MOMENTS
-+
-+    function getSetWeekYear (input) {
-+        return getSetWeekYearHelper.call(this,
-+                input,
-+                this.week(),
-+                this.weekday(),
-+                this.localeData()._week.dow,
-+                this.localeData()._week.doy);
-+    }
-+
-+    function getSetISOWeekYear (input) {
-+        return getSetWeekYearHelper.call(this,
-+                input, this.isoWeek(), this.isoWeekday(), 1, 4);
-+    }
-+
-+    function getISOWeeksInYear () {
-+        return weeksInYear(this.year(), 1, 4);
-+    }
-+
-+    function getWeeksInYear () {
-+        var weekInfo = this.localeData()._week;
-+        return weeksInYear(this.year(), weekInfo.dow, weekInfo.doy);
-+    }
-+
-+    function getSetWeekYearHelper(input, week, weekday, dow, doy) {
-+        var weeksTarget;
-+        if (input == null) {
-+            return weekOfYear(this, dow, doy).year;
-+        } else {
-+            weeksTarget = weeksInYear(input, dow, doy);
-+            if (week > weeksTarget) {
-+                week = weeksTarget;
-+            }
-+            return setWeekAll.call(this, input, week, weekday, dow, doy);
-+        }
-+    }
-+
-+    function setWeekAll(weekYear, week, weekday, dow, doy) {
-+        var dayOfYearData = dayOfYearFromWeeks(weekYear, week, weekday, dow, doy),
-+            date = createUTCDate(dayOfYearData.year, 0, dayOfYearData.dayOfYear);
-+
-+        this.year(date.getUTCFullYear());
-+        this.month(date.getUTCMonth());
-+        this.date(date.getUTCDate());
-+        return this;
-+    }
-+
-+    // FORMATTING
-+
-+    addFormatToken('Q', 0, 'Qo', 'quarter');
-+
-+    // ALIASES
-+
-+    addUnitAlias('quarter', 'Q');
-+
-+    // PRIORITY
-+
-+    addUnitPriority('quarter', 7);
-+
-+    // PARSING
-+
-+    addRegexToken('Q', match1);
-+    addParseToken('Q', function (input, array) {
-+        array[MONTH] = (toInt(input) - 1) * 3;
-+    });
-+
-+    // MOMENTS
-+
-+    function getSetQuarter (input) {
-+        return input == null ? Math.ceil((this.month() + 1) / 3) : this.month((input - 1) * 3 + this.month() % 3);
-+    }
-+
-+    // FORMATTING
-+
-+    addFormatToken('D', ['DD', 2], 'Do', 'date');
-+
-+    // ALIASES
-+
-+    addUnitAlias('date', 'D');
-+
-+    // PRIORITY
-+    addUnitPriority('date', 9);
-+
-+    // PARSING
-+
-+    addRegexToken('D',  match1to2);
-+    addRegexToken('DD', match1to2, match2);
-+    addRegexToken('Do', function (isStrict, locale) {
-+        // TODO: Remove "ordinalParse" fallback in next major release.
-+        return isStrict ?
-+          (locale._dayOfMonthOrdinalParse || locale._ordinalParse) :
-+          locale._dayOfMonthOrdinalParseLenient;
-+    });
-+
-+    addParseToken(['D', 'DD'], DATE);
-+    addParseToken('Do', function (input, array) {
-+        array[DATE] = toInt(input.match(match1to2)[0]);
-+    });
-+
-+    // MOMENTS
-+
-+    var getSetDayOfMonth = makeGetSet('Date', true);
-+
-+    // FORMATTING
-+
-+    addFormatToken('DDD', ['DDDD', 3], 'DDDo', 'dayOfYear');
-+
-+    // ALIASES
-+
-+    addUnitAlias('dayOfYear', 'DDD');
-+
-+    // PRIORITY
-+    addUnitPriority('dayOfYear', 4);
-+
-+    // PARSING
-+
-+    addRegexToken('DDD',  match1to3);
-+    addRegexToken('DDDD', match3);
-+    addParseToken(['DDD', 'DDDD'], function (input, array, config) {
-+        config._dayOfYear = toInt(input);
-+    });
-+
-+    // HELPERS
-+
-+    // MOMENTS
-+
-+    function getSetDayOfYear (input) {
-+        var dayOfYear = Math.round((this.clone().startOf('day') - this.clone().startOf('year')) / 864e5) + 1;
-+        return input == null ? dayOfYear : this.add((input - dayOfYear), 'd');
-+    }
-+
-+    // FORMATTING
-+
-+    addFormatToken('m', ['mm', 2], 0, 'minute');
-+
-+    // ALIASES
-+
-+    addUnitAlias('minute', 'm');
-+
-+    // PRIORITY
-+
-+    addUnitPriority('minute', 14);
-+
-+    // PARSING
-+
-+    addRegexToken('m',  match1to2);
-+    addRegexToken('mm', match1to2, match2);
-+    addParseToken(['m', 'mm'], MINUTE);
-+
-+    // MOMENTS
-+
-+    var getSetMinute = makeGetSet('Minutes', false);
-+
-+    // FORMATTING
-+
-+    addFormatToken('s', ['ss', 2], 0, 'second');
-+
-+    // ALIASES
-+
-+    addUnitAlias('second', 's');
-+
-+    // PRIORITY
-+
-+    addUnitPriority('second', 15);
-+
-+    // PARSING
-+
-+    addRegexToken('s',  match1to2);
-+    addRegexToken('ss', match1to2, match2);
-+    addParseToken(['s', 'ss'], SECOND);
-+
-+    // MOMENTS
-+
-+    var getSetSecond = makeGetSet('Seconds', false);
-+
-+    // FORMATTING
-+
-+    addFormatToken('S', 0, 0, function () {
-+        return ~~(this.millisecond() / 100);
-+    });
-+
-+    addFormatToken(0, ['SS', 2], 0, function () {
-+        return ~~(this.millisecond() / 10);
-+    });
-+
-+    addFormatToken(0, ['SSS', 3], 0, 'millisecond');
-+    addFormatToken(0, ['SSSS', 4], 0, function () {
-+        return this.millisecond() * 10;
-+    });
-+    addFormatToken(0, ['SSSSS', 5], 0, function () {
-+        return this.millisecond() * 100;
-+    });
-+    addFormatToken(0, ['SSSSSS', 6], 0, function () {
-+        return this.millisecond() * 1000;
-+    });
-+    addFormatToken(0, ['SSSSSSS', 7], 0, function () {
-+        return this.millisecond() * 10000;
-+    });
-+    addFormatToken(0, ['SSSSSSSS', 8], 0, function () {
-+        return this.millisecond() * 100000;
-+    });
-+    addFormatToken(0, ['SSSSSSSSS', 9], 0, function () {
-+        return this.millisecond() * 1000000;
-+    });
-+
-+
-+    // ALIASES
-+
-+    addUnitAlias('millisecond', 'ms');
-+
-+    // PRIORITY
-+
-+    addUnitPriority('millisecond', 16);
-+
-+    // PARSING
-+
-+    addRegexToken('S',    match1to3, match1);
-+    addRegexToken('SS',   match1to3, match2);
-+    addRegexToken('SSS',  match1to3, match3);
-+
-+    var token;
-+    for (token = 'SSSS'; token.length <= 9; token += 'S') {
-+        addRegexToken(token, matchUnsigned);
-+    }
-+
-+    function parseMs(input, array) {
-+        array[MILLISECOND] = toInt(('0.' + input) * 1000);
-+    }
-+
-+    for (token = 'S'; token.length <= 9; token += 'S') {
-+        addParseToken(token, parseMs);
-+    }
-+    // MOMENTS
-+
-+    var getSetMillisecond = makeGetSet('Milliseconds', false);
-+
-+    // FORMATTING
-+
-+    addFormatToken('z',  0, 0, 'zoneAbbr');
-+    addFormatToken('zz', 0, 0, 'zoneName');
-+
-+    // MOMENTS
-+
-+    function getZoneAbbr () {
-+        return this._isUTC ? 'UTC' : '';
-+    }
-+
-+    function getZoneName () {
-+        return this._isUTC ? 'Coordinated Universal Time' : '';
-+    }
-+
-+    var proto = Moment.prototype;
-+
-+    proto.add               = add;
-+    proto.calendar          = calendar$1;
-+    proto.clone             = clone;
-+    proto.diff              = diff;
-+    proto.endOf             = endOf;
-+    proto.format            = format;
-+    proto.from              = from;
-+    proto.fromNow           = fromNow;
-+    proto.to                = to;
-+    proto.toNow             = toNow;
-+    proto.get               = stringGet;
-+    proto.invalidAt         = invalidAt;
-+    proto.isAfter           = isAfter;
-+    proto.isBefore          = isBefore;
-+    proto.isBetween         = isBetween;
-+    proto.isSame            = isSame;
-+    proto.isSameOrAfter     = isSameOrAfter;
-+    proto.isSameOrBefore    = isSameOrBefore;
-+    proto.isValid           = isValid$2;
-+    proto.lang              = lang;
-+    proto.locale            = locale;
-+    proto.localeData        = localeData;
-+    proto.max               = prototypeMax;
-+    proto.min               = prototypeMin;
-+    proto.parsingFlags      = parsingFlags;
-+    proto.set               = stringSet;
-+    proto.startOf           = startOf;
-+    proto.subtract          = subtract;
-+    proto.toArray           = toArray;
-+    proto.toObject          = toObject;
-+    proto.toDate            = toDate;
-+    proto.toISOString       = toISOString;
-+    proto.inspect           = inspect;
-+    proto.toJSON            = toJSON;
-+    proto.toString          = toString;
-+    proto.unix              = unix;
-+    proto.valueOf           = valueOf;
-+    proto.creationData      = creationData;
-+    proto.year       = getSetYear;
-+    proto.isLeapYear = getIsLeapYear;
-+    proto.weekYear    = getSetWeekYear;
-+    proto.isoWeekYear = getSetISOWeekYear;
-+    proto.quarter = proto.quarters = getSetQuarter;
-+    proto.month       = getSetMonth;
-+    proto.daysInMonth = getDaysInMonth;
-+    proto.week           = proto.weeks        = getSetWeek;
-+    proto.isoWeek        = proto.isoWeeks     = getSetISOWeek;
-+    proto.weeksInYear    = getWeeksInYear;
-+    proto.isoWeeksInYear = getISOWeeksInYear;
-+    proto.date       = getSetDayOfMonth;
-+    proto.day        = proto.days             = getSetDayOfWeek;
-+    proto.weekday    = getSetLocaleDayOfWeek;
-+    proto.isoWeekday = getSetISODayOfWeek;
-+    proto.dayOfYear  = getSetDayOfYear;
-+    proto.hour = proto.hours = getSetHour;
-+    proto.minute = proto.minutes = getSetMinute;
-+    proto.second = proto.seconds = getSetSecond;
-+    proto.millisecond = proto.milliseconds = getSetMillisecond;
-+    proto.utcOffset            = getSetOffset;
-+    proto.utc                  = setOffsetToUTC;
-+    proto.local                = setOffsetToLocal;
-+    proto.parseZone            = setOffsetToParsedOffset;
-+    proto.hasAlignedHourOffset = hasAlignedHourOffset;
-+    proto.isDST                = isDaylightSavingTime;
-+    proto.isLocal              = isLocal;
-+    proto.isUtcOffset          = isUtcOffset;
-+    proto.isUtc                = isUtc;
-+    proto.isUTC                = isUtc;
-+    proto.zoneAbbr = getZoneAbbr;
-+    proto.zoneName = getZoneName;
-+    proto.dates  = deprecate('dates accessor is deprecated. Use date instead.', getSetDayOfMonth);
-+    proto.months = deprecate('months accessor is deprecated. Use month instead', getSetMonth);
-+    proto.years  = deprecate('years accessor is deprecated. Use year instead', getSetYear);
-+    proto.zone   = deprecate('moment().zone is deprecated, use moment().utcOffset instead. http://momentjs.com/guides/#/warnings/zone/', getSetZone);
-+    proto.isDSTShifted = deprecate('isDSTShifted is deprecated. See http://momentjs.com/guides/#/warnings/dst-shifted/ for more information', isDaylightSavingTimeShifted);
-+
-+    function createUnix (input) {
-+        return createLocal(input * 1000);
-+    }
-+
-+    function createInZone () {
-+        return createLocal.apply(null, arguments).parseZone();
-+    }
-+
-+    function preParsePostFormat (string) {
-+        return string;
-+    }
-+
-+    var proto$1 = Locale.prototype;
-+
-+    proto$1.calendar        = calendar;
-+    proto$1.longDateFormat  = longDateFormat;
-+    proto$1.invalidDate     = invalidDate;
-+    proto$1.ordinal         = ordinal;
-+    proto$1.preparse        = preParsePostFormat;
-+    proto$1.postformat      = preParsePostFormat;
-+    proto$1.relativeTime    = relativeTime;
-+    proto$1.pastFuture      = pastFuture;
-+    proto$1.set             = set;
-+
-+    proto$1.months            =        localeMonths;
-+    proto$1.monthsShort       =        localeMonthsShort;
-+    proto$1.monthsParse       =        localeMonthsParse;
-+    proto$1.monthsRegex       = monthsRegex;
-+    proto$1.monthsShortRegex  = monthsShortRegex;
-+    proto$1.week = localeWeek;
-+    proto$1.firstDayOfYear = localeFirstDayOfYear;
-+    proto$1.firstDayOfWeek = localeFirstDayOfWeek;
-+
-+    proto$1.weekdays       =        localeWeekdays;
-+    proto$1.weekdaysMin    =        localeWeekdaysMin;
-+    proto$1.weekdaysShort  =        localeWeekdaysShort;
-+    proto$1.weekdaysParse  =        localeWeekdaysParse;
-+
-+    proto$1.weekdaysRegex       =        weekdaysRegex;
-+    proto$1.weekdaysShortRegex  =        weekdaysShortRegex;
-+    proto$1.weekdaysMinRegex    =        weekdaysMinRegex;
-+
-+    proto$1.isPM = localeIsPM;
-+    proto$1.meridiem = localeMeridiem;
-+
-+    function get$1 (format, index, field, setter) {
-+        var locale = getLocale();
-+        var utc = createUTC().set(setter, index);
-+        return locale[field](utc, format);
-+    }
-+
-+    function listMonthsImpl (format, index, field) {
-+        if (isNumber(format)) {
-+            index = format;
-+            format = undefined;
-+        }
-+
-+        format = format || '';
-+
-+        if (index != null) {
-+            return get$1(format, index, field, 'month');
-+        }
-+
-+        var i;
-+        var out = [];
-+        for (i = 0; i < 12; i++) {
-+            out[i] = get$1(format, i, field, 'month');
-+        }
-+        return out;
-+    }
-+
-+    // ()
-+    // (5)
-+    // (fmt, 5)
-+    // (fmt)
-+    // (true)
-+    // (true, 5)
-+    // (true, fmt, 5)
-+    // (true, fmt)
-+    function listWeekdaysImpl (localeSorted, format, index, field) {
-+        if (typeof localeSorted === 'boolean') {
-+            if (isNumber(format)) {
-+                index = format;
-+                format = undefined;
-+            }
-+
-+            format = format || '';
-+        } else {
-+            format = localeSorted;
-+            index = format;
-+            localeSorted = false;
-+
-+            if (isNumber(format)) {
-+                index = format;
-+                format = undefined;
-+            }
-+
-+            format = format || '';
-+        }
-+
-+        var locale = getLocale(),
-+            shift = localeSorted ? locale._week.dow : 0;
-+
-+        if (index != null) {
-+            return get$1(format, (index + shift) % 7, field, 'day');
-+        }
-+
-+        var i;
-+        var out = [];
-+        for (i = 0; i < 7; i++) {
-+            out[i] = get$1(format, (i + shift) % 7, field, 'day');
-+        }
-+        return out;
-+    }
-+
-+    function listMonths (format, index) {
-+        return listMonthsImpl(format, index, 'months');
-+    }
-+
-+    function listMonthsShort (format, index) {
-+        return listMonthsImpl(format, index, 'monthsShort');
-+    }
-+
-+    function listWeekdays (localeSorted, format, index) {
-+        return listWeekdaysImpl(localeSorted, format, index, 'weekdays');
-+    }
-+
-+    function listWeekdaysShort (localeSorted, format, index) {
-+        return listWeekdaysImpl(localeSorted, format, index, 'weekdaysShort');
-+    }
-+
-+    function listWeekdaysMin (localeSorted, format, index) {
-+        return listWeekdaysImpl(localeSorted, format, index, 'weekdaysMin');
-+    }
-+
-+    getSetGlobalLocale('en', {
-+        dayOfMonthOrdinalParse: /\d{1,2}(th|st|nd|rd)/,
-+        ordinal : function (number) {
-+            var b = number % 10,
-+                output = (toInt(number % 100 / 10) === 1) ? 'th' :
-+                (b === 1) ? 'st' :
-+                (b === 2) ? 'nd' :
-+                (b === 3) ? 'rd' : 'th';
-+            return number + output;
-+        }
-+    });
-+
-+    // Side effect imports
-+
-+    hooks.lang = deprecate('moment.lang is deprecated. Use moment.locale instead.', getSetGlobalLocale);
-+    hooks.langData = deprecate('moment.langData is deprecated. Use moment.localeData instead.', getLocale);
-+
-+    var mathAbs = Math.abs;
-+
-+    function abs () {
-+        var data           = this._data;
-+
-+        this._milliseconds = mathAbs(this._milliseconds);
-+        this._days         = mathAbs(this._days);
-+        this._months       = mathAbs(this._months);
-+
-+        data.milliseconds  = mathAbs(data.milliseconds);
-+        data.seconds       = mathAbs(data.seconds);
-+        data.minutes       = mathAbs(data.minutes);
-+        data.hours         = mathAbs(data.hours);
-+        data.months        = mathAbs(data.months);
-+        data.years         = mathAbs(data.years);
-+
-+        return this;
-+    }
-+
-+    function addSubtract$1 (duration, input, value, direction) {
-+        var other = createDuration(input, value);
-+
-+        duration._milliseconds += direction * other._milliseconds;
-+        duration._days         += direction * other._days;
-+        duration._months       += direction * other._months;
-+
-+        return duration._bubble();
-+    }
-+
-+    // supports only 2.0-style add(1, 's') or add(duration)
-+    function add$1 (input, value) {
-+        return addSubtract$1(this, input, value, 1);
-+    }
-+
-+    // supports only 2.0-style subtract(1, 's') or subtract(duration)
-+    function subtract$1 (input, value) {
-+        return addSubtract$1(this, input, value, -1);
-+    }
-+
-+    function absCeil (number) {
-+        if (number < 0) {
-+            return Math.floor(number);
-+        } else {
-+            return Math.ceil(number);
-+        }
-+    }
-+
-+    function bubble () {
-+        var milliseconds = this._milliseconds;
-+        var days         = this._days;
-+        var months       = this._months;
-+        var data         = this._data;
-+        var seconds, minutes, hours, years, monthsFromDays;
-+
-+        // if we have a mix of positive and negative values, bubble down first
-+        // check: https://github.com/moment/moment/issues/2166
-+        if (!((milliseconds >= 0 && days >= 0 && months >= 0) ||
-+                (milliseconds <= 0 && days <= 0 && months <= 0))) {
-+            milliseconds += absCeil(monthsToDays(months) + days) * 864e5;
-+            days = 0;
-+            months = 0;
-+        }
-+
-+        // The following code bubbles up values, see the tests for
-+        // examples of what that means.
-+        data.milliseconds = milliseconds % 1000;
-+
-+        seconds           = absFloor(milliseconds / 1000);
-+        data.seconds      = seconds % 60;
-+
-+        minutes           = absFloor(seconds / 60);
-+        data.minutes      = minutes % 60;
-+
-+        hours             = absFloor(minutes / 60);
-+        data.hours        = hours % 24;
-+
-+        days += absFloor(hours / 24);
-+
-+        // convert days to months
-+        monthsFromDays = absFloor(daysToMonths(days));
-+        months += monthsFromDays;
-+        days -= absCeil(monthsToDays(monthsFromDays));
-+
-+        // 12 months -> 1 year
-+        years = absFloor(months / 12);
-+        months %= 12;
-+
-+        data.days   = days;
-+        data.months = months;
-+        data.years  = years;
-+
-+        return this;
-+    }
-+
-+    function daysToMonths (days) {
-+        // 400 years have 146097 days (taking into account leap year rules)
-+        // 400 years have 12 months === 4800
-+        return days * 4800 / 146097;
-+    }
-+
-+    function monthsToDays (months) {
-+        // the reverse of daysToMonths
-+        return months * 146097 / 4800;
-+    }
-+
-+    function as (units) {
-+        if (!this.isValid()) {
-+            return NaN;
-+        }
-+        var days;
-+        var months;
-+        var milliseconds = this._milliseconds;
-+
-+        units = normalizeUnits(units);
-+
-+        if (units === 'month' || units === 'year') {
-+            days   = this._days   + milliseconds / 864e5;
-+            months = this._months + daysToMonths(days);
-+            return units === 'month' ? months : months / 12;
-+        } else {
-+            // handle milliseconds separately because of floating point math errors (issue #1867)
-+            days = this._days + Math.round(monthsToDays(this._months));
-+            switch (units) {
-+                case 'week'   : return days / 7     + milliseconds / 6048e5;
-+                case 'day'    : return days         + milliseconds / 864e5;
-+                case 'hour'   : return days * 24    + milliseconds / 36e5;
-+                case 'minute' : return days * 1440  + milliseconds / 6e4;
-+                case 'second' : return days * 86400 + milliseconds / 1000;
-+                // Math.floor prevents floating point math errors here
-+                case 'millisecond': return Math.floor(days * 864e5) + milliseconds;
-+                default: throw new Error('Unknown unit ' + units);
-+            }
-+        }
-+    }
-+
-+    // TODO: Use this.as('ms')?
-+    function valueOf$1 () {
-+        if (!this.isValid()) {
-+            return NaN;
-+        }
-+        return (
-+            this._milliseconds +
-+            this._days * 864e5 +
-+            (this._months % 12) * 2592e6 +
-+            toInt(this._months / 12) * 31536e6
-+        );
-+    }
-+
-+    function makeAs (alias) {
-+        return function () {
-+            return this.as(alias);
-+        };
-+    }
-+
-+    var asMilliseconds = makeAs('ms');
-+    var asSeconds      = makeAs('s');
-+    var asMinutes      = makeAs('m');
-+    var asHours        = makeAs('h');
-+    var asDays         = makeAs('d');
-+    var asWeeks        = makeAs('w');
-+    var asMonths       = makeAs('M');
-+    var asYears        = makeAs('y');
-+
-+    function clone$1 () {
-+        return createDuration(this);
-+    }
-+
-+    function get$2 (units) {
-+        units = normalizeUnits(units);
-+        return this.isValid() ? this[units + 's']() : NaN;
-+    }
-+
-+    function makeGetter(name) {
-+        return function () {
-+            return this.isValid() ? this._data[name] : NaN;
-+        };
-+    }
-+
-+    var milliseconds = makeGetter('milliseconds');
-+    var seconds      = makeGetter('seconds');
-+    var minutes      = makeGetter('minutes');
-+    var hours        = makeGetter('hours');
-+    var days         = makeGetter('days');
-+    var months       = makeGetter('months');
-+    var years        = makeGetter('years');
-+
-+    function weeks () {
-+        return absFloor(this.days() / 7);
-+    }
-+
-+    var round = Math.round;
-+    var thresholds = {
-+        ss: 44,         // a few seconds to seconds
-+        s : 45,         // seconds to minute
-+        m : 45,         // minutes to hour
-+        h : 22,         // hours to day
-+        d : 26,         // days to month
-+        M : 11          // months to year
-+    };
-+
-+    // helper function for moment.fn.from, moment.fn.fromNow, and moment.duration.fn.humanize
-+    function substituteTimeAgo(string, number, withoutSuffix, isFuture, locale) {
-+        return locale.relativeTime(number || 1, !!withoutSuffix, string, isFuture);
-+    }
-+
-+    function relativeTime$1 (posNegDuration, withoutSuffix, locale) {
-+        var duration = createDuration(posNegDuration).abs();
-+        var seconds  = round(duration.as('s'));
-+        var minutes  = round(duration.as('m'));
-+        var hours    = round(duration.as('h'));
-+        var days     = round(duration.as('d'));
-+        var months   = round(duration.as('M'));
-+        var years    = round(duration.as('y'));
-+
-+        var a = seconds <= thresholds.ss && ['s', seconds]  ||
-+                seconds < thresholds.s   && ['ss', seconds] ||
-+                minutes <= 1             && ['m']           ||
-+                minutes < thresholds.m   && ['mm', minutes] ||
-+                hours   <= 1             && ['h']           ||
-+                hours   < thresholds.h   && ['hh', hours]   ||
-+                days    <= 1             && ['d']           ||
-+                days    < thresholds.d   && ['dd', days]    ||
-+                months  <= 1             && ['M']           ||
-+                months  < thresholds.M   && ['MM', months]  ||
-+                years   <= 1             && ['y']           || ['yy', years];
-+
-+        a[2] = withoutSuffix;
-+        a[3] = +posNegDuration > 0;
-+        a[4] = locale;
-+        return substituteTimeAgo.apply(null, a);
-+    }
-+
-+    // This function allows you to set the rounding function for relative time strings
-+    function getSetRelativeTimeRounding (roundingFunction) {
-+        if (roundingFunction === undefined) {
-+            return round;
-+        }
-+        if (typeof(roundingFunction) === 'function') {
-+            round = roundingFunction;
-+            return true;
-+        }
-+        return false;
-+    }
-+
-+    // This function allows you to set a threshold for relative time strings
-+    function getSetRelativeTimeThreshold (threshold, limit) {
-+        if (thresholds[threshold] === undefined) {
-+            return false;
-+        }
-+        if (limit === undefined) {
-+            return thresholds[threshold];
-+        }
-+        thresholds[threshold] = limit;
-+        if (threshold === 's') {
-+            thresholds.ss = limit - 1;
-+        }
-+        return true;
-+    }
-+
-+    function humanize (withSuffix) {
-+        if (!this.isValid()) {
-+            return this.localeData().invalidDate();
-+        }
-+
-+        var locale = this.localeData();
-+        var output = relativeTime$1(this, !withSuffix, locale);
-+
-+        if (withSuffix) {
-+            output = locale.pastFuture(+this, output);
-+        }
-+
-+        return locale.postformat(output);
-+    }
-+
-+    var abs$1 = Math.abs;
-+
-+    function sign(x) {
-+        return ((x > 0) - (x < 0)) || +x;
-+    }
-+
-+    function toISOString$1() {
-+        // for ISO strings we do not use the normal bubbling rules:
-+        //  * milliseconds bubble up until they become hours
-+        //  * days do not bubble at all
-+        //  * months bubble up until they become years
-+        // This is because there is no context-free conversion between hours and days
-+        // (think of clock changes)
-+        // and also not between days and months (28-31 days per month)
-+        if (!this.isValid()) {
-+            return this.localeData().invalidDate();
-+        }
-+
-+        var seconds = abs$1(this._milliseconds) / 1000;
-+        var days         = abs$1(this._days);
-+        var months       = abs$1(this._months);
-+        var minutes, hours, years;
-+
-+        // 3600 seconds -> 60 minutes -> 1 hour
-+        minutes           = absFloor(seconds / 60);
-+        hours             = absFloor(minutes / 60);
-+        seconds %= 60;
-+        minutes %= 60;
-+
-+        // 12 months -> 1 year
-+        years  = absFloor(months / 12);
-+        months %= 12;
-+
-+
-+        // inspired by https://github.com/dordille/moment-isoduration/blob/master/moment.isoduration.js
-+        var Y = years;
-+        var M = months;
-+        var D = days;
-+        var h = hours;
-+        var m = minutes;
-+        var s = seconds ? seconds.toFixed(3).replace(/\.?0+$/, '') : '';
-+        var total = this.asSeconds();
-+
-+        if (!total) {
-+            // this is the same as C#'s (Noda) and python (isodate)...
-+            // but not other JS (goog.date)
-+            return 'P0D';
-+        }
-+
-+        var totalSign = total < 0 ? '-' : '';
-+        var ymSign = sign(this._months) !== sign(total) ? '-' : '';
-+        var daysSign = sign(this._days) !== sign(total) ? '-' : '';
-+        var hmsSign = sign(this._milliseconds) !== sign(total) ? '-' : '';
-+
-+        return totalSign + 'P' +
-+            (Y ? ymSign + Y + 'Y' : '') +
-+            (M ? ymSign + M + 'M' : '') +
-+            (D ? daysSign + D + 'D' : '') +
-+            ((h || m || s) ? 'T' : '') +
-+            (h ? hmsSign + h + 'H' : '') +
-+            (m ? hmsSign + m + 'M' : '') +
-+            (s ? hmsSign + s + 'S' : '');
-+    }
-+
-+    var proto$2 = Duration.prototype;
-+
-+    proto$2.isValid        = isValid$1;
-+    proto$2.abs            = abs;
-+    proto$2.add            = add$1;
-+    proto$2.subtract       = subtract$1;
-+    proto$2.as             = as;
-+    proto$2.asMilliseconds = asMilliseconds;
-+    proto$2.asSeconds      = asSeconds;
-+    proto$2.asMinutes      = asMinutes;
-+    proto$2.asHours        = asHours;
-+    proto$2.asDays         = asDays;
-+    proto$2.asWeeks        = asWeeks;
-+    proto$2.asMonths       = asMonths;
-+    proto$2.asYears        = asYears;
-+    proto$2.valueOf        = valueOf$1;
-+    proto$2._bubble        = bubble;
-+    proto$2.clone          = clone$1;
-+    proto$2.get            = get$2;
-+    proto$2.milliseconds   = milliseconds;
-+    proto$2.seconds        = seconds;
-+    proto$2.minutes        = minutes;
-+    proto$2.hours          = hours;
-+    proto$2.days           = days;
-+    proto$2.weeks          = weeks;
-+    proto$2.months         = months;
-+    proto$2.years          = years;
-+    proto$2.humanize       = humanize;
-+    proto$2.toISOString    = toISOString$1;
-+    proto$2.toString       = toISOString$1;
-+    proto$2.toJSON         = toISOString$1;
-+    proto$2.locale         = locale;
-+    proto$2.localeData     = localeData;
-+
-+    proto$2.toIsoString = deprecate('toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)', toISOString$1);
-+    proto$2.lang = lang;
-+
-+    // Side effect imports
-+
-+    // FORMATTING
-+
-+    addFormatToken('X', 0, 0, 'unix');
-+    addFormatToken('x', 0, 0, 'valueOf');
-+
-+    // PARSING
-+
-+    addRegexToken('x', matchSigned);
-+    addRegexToken('X', matchTimestamp);
-+    addParseToken('X', function (input, array, config) {
-+        config._d = new Date(parseFloat(input, 10) * 1000);
-+    });
-+    addParseToken('x', function (input, array, config) {
-+        config._d = new Date(toInt(input));
-+    });
-+
-+    // Side effect imports
-+
-+
-+    hooks.version = '2.22.1';
-+
-+    setHookCallback(createLocal);
-+
-+    hooks.fn                    = proto;
-+    hooks.min                   = min;
-+    hooks.max                   = max;
-+    hooks.now                   = now;
-+    hooks.utc                   = createUTC;
-+    hooks.unix                  = createUnix;
-+    hooks.months                = listMonths;
-+    hooks.isDate                = isDate;
-+    hooks.locale                = getSetGlobalLocale;
-+    hooks.invalid               = createInvalid;
-+    hooks.duration              = createDuration;
-+    hooks.isMoment              = isMoment;
-+    hooks.weekdays              = listWeekdays;
-+    hooks.parseZone             = createInZone;
-+    hooks.localeData            = getLocale;
-+    hooks.isDuration            = isDuration;
-+    hooks.monthsShort           = listMonthsShort;
-+    hooks.weekdaysMin           = listWeekdaysMin;
-+    hooks.defineLocale          = defineLocale;
-+    hooks.updateLocale          = updateLocale;
-+    hooks.locales               = listLocales;
-+    hooks.weekdaysShort         = listWeekdaysShort;
-+    hooks.normalizeUnits        = normalizeUnits;
-+    hooks.relativeTimeRounding  = getSetRelativeTimeRounding;
-+    hooks.relativeTimeThreshold = getSetRelativeTimeThreshold;
-+    hooks.calendarFormat        = getCalendarFormat;
-+    hooks.prototype             = proto;
-+
-+    // currently HTML5 input type only supports 24-hour formats
-+    hooks.HTML5_FMT = {
-+        DATETIME_LOCAL: 'YYYY-MM-DDTHH:mm',             // <input type="datetime-local" />
-+        DATETIME_LOCAL_SECONDS: 'YYYY-MM-DDTHH:mm:ss',  // <input type="datetime-local" step="1" />
-+        DATETIME_LOCAL_MS: 'YYYY-MM-DDTHH:mm:ss.SSS',   // <input type="datetime-local" step="0.001" />
-+        DATE: 'YYYY-MM-DD',                             // <input type="date" />
-+        TIME: 'HH:mm',                                  // <input type="time" />
-+        TIME_SECONDS: 'HH:mm:ss',                       // <input type="time" step="1" />
-+        TIME_MS: 'HH:mm:ss.SSS',                        // <input type="time" step="0.001" />
-+        WEEK: 'YYYY-[W]WW',                             // <input type="week" />
-+        MONTH: 'YYYY-MM'                                // <input type="month" />
-+    };
-+
-+    return hooks;
-+
-+})));
-+
-+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../webpack/buildin/module.js */ "./node_modules/webpack/buildin/module.js")(module)))
-+
-+/***/ }),
-+
-+/***/ "./node_modules/punycode/punycode.js":
-+/*!*******************************************!*\
-+  !*** ./node_modules/punycode/punycode.js ***!
-+  \*******************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+/* WEBPACK VAR INJECTION */(function(module, global) {var __WEBPACK_AMD_DEFINE_RESULT__;/*! https://mths.be/punycode v1.4.1 by @mathias */
-+;(function(root) {
-+
-+	/** Detect free variables */
-+	var freeExports = typeof exports == 'object' && exports &&
-+		!exports.nodeType && exports;
-+	var freeModule = typeof module == 'object' && module &&
-+		!module.nodeType && module;
-+	var freeGlobal = typeof global == 'object' && global;
-+	if (
-+		freeGlobal.global === freeGlobal ||
-+		freeGlobal.window === freeGlobal ||
-+		freeGlobal.self === freeGlobal
-+	) {
-+		root = freeGlobal;
-+	}
-+
-+	/**
-+	 * The `punycode` object.
-+	 * @name punycode
-+	 * @type Object
-+	 */
-+	var punycode,
-+
-+	/** Highest positive signed 32-bit float value */
-+	maxInt = 2147483647, // aka. 0x7FFFFFFF or 2^31-1
-+
-+	/** Bootstring parameters */
-+	base = 36,
-+	tMin = 1,
-+	tMax = 26,
-+	skew = 38,
-+	damp = 700,
-+	initialBias = 72,
-+	initialN = 128, // 0x80
-+	delimiter = '-', // '\x2D'
-+
-+	/** Regular expressions */
-+	regexPunycode = /^xn--/,
-+	regexNonASCII = /[^\x20-\x7E]/, // unprintable ASCII chars + non-ASCII chars
-+	regexSeparators = /[\x2E\u3002\uFF0E\uFF61]/g, // RFC 3490 separators
-+
-+	/** Error messages */
-+	errors = {
-+		'overflow': 'Overflow: input needs wider integers to process',
-+		'not-basic': 'Illegal input >= 0x80 (not a basic code point)',
-+		'invalid-input': 'Invalid input'
-+	},
-+
-+	/** Convenience shortcuts */
-+	baseMinusTMin = base - tMin,
-+	floor = Math.floor,
-+	stringFromCharCode = String.fromCharCode,
-+
-+	/** Temporary variable */
-+	key;
-+
-+	/*--------------------------------------------------------------------------*/
-+
-+	/**
-+	 * A generic error utility function.
-+	 * @private
-+	 * @param {String} type The error type.
-+	 * @returns {Error} Throws a `RangeError` with the applicable error message.
-+	 */
-+	function error(type) {
-+		throw new RangeError(errors[type]);
-+	}
-+
-+	/**
-+	 * A generic `Array#map` utility function.
-+	 * @private
-+	 * @param {Array} array The array to iterate over.
-+	 * @param {Function} callback The function that gets called for every array
-+	 * item.
-+	 * @returns {Array} A new array of values returned by the callback function.
-+	 */
-+	function map(array, fn) {
-+		var length = array.length;
-+		var result = [];
-+		while (length--) {
-+			result[length] = fn(array[length]);
-+		}
-+		return result;
-+	}
-+
-+	/**
-+	 * A simple `Array#map`-like wrapper to work with domain name strings or email
-+	 * addresses.
-+	 * @private
-+	 * @param {String} domain The domain name or email address.
-+	 * @param {Function} callback The function that gets called for every
-+	 * character.
-+	 * @returns {Array} A new string of characters returned by the callback
-+	 * function.
-+	 */
-+	function mapDomain(string, fn) {
-+		var parts = string.split('@');
-+		var result = '';
-+		if (parts.length > 1) {
-+			// In email addresses, only the domain name should be punycoded. Leave
-+			// the local part (i.e. everything up to `@`) intact.
-+			result = parts[0] + '@';
-+			string = parts[1];
-+		}
-+		// Avoid `split(regex)` for IE8 compatibility. See #17.
-+		string = string.replace(regexSeparators, '\x2E');
-+		var labels = string.split('.');
-+		var encoded = map(labels, fn).join('.');
-+		return result + encoded;
-+	}
-+
-+	/**
-+	 * Creates an array containing the numeric code points of each Unicode
-+	 * character in the string. While JavaScript uses UCS-2 internally,
-+	 * this function will convert a pair of surrogate halves (each of which
-+	 * UCS-2 exposes as separate characters) into a single code point,
-+	 * matching UTF-16.
-+	 * @see `punycode.ucs2.encode`
-+	 * @see <https://mathiasbynens.be/notes/javascript-encoding>
-+	 * @memberOf punycode.ucs2
-+	 * @name decode
-+	 * @param {String} string The Unicode input string (UCS-2).
-+	 * @returns {Array} The new array of code points.
-+	 */
-+	function ucs2decode(string) {
-+		var output = [],
-+		    counter = 0,
-+		    length = string.length,
-+		    value,
-+		    extra;
-+		while (counter < length) {
-+			value = string.charCodeAt(counter++);
-+			if (value >= 0xD800 && value <= 0xDBFF && counter < length) {
-+				// high surrogate, and there is a next character
-+				extra = string.charCodeAt(counter++);
-+				if ((extra & 0xFC00) == 0xDC00) { // low surrogate
-+					output.push(((value & 0x3FF) << 10) + (extra & 0x3FF) + 0x10000);
-+				} else {
-+					// unmatched surrogate; only append this code unit, in case the next
-+					// code unit is the high surrogate of a surrogate pair
-+					output.push(value);
-+					counter--;
-+				}
-+			} else {
-+				output.push(value);
-+			}
-+		}
-+		return output;
-+	}
-+
-+	/**
-+	 * Creates a string based on an array of numeric code points.
-+	 * @see `punycode.ucs2.decode`
-+	 * @memberOf punycode.ucs2
-+	 * @name encode
-+	 * @param {Array} codePoints The array of numeric code points.
-+	 * @returns {String} The new Unicode string (UCS-2).
-+	 */
-+	function ucs2encode(array) {
-+		return map(array, function(value) {
-+			var output = '';
-+			if (value > 0xFFFF) {
-+				value -= 0x10000;
-+				output += stringFromCharCode(value >>> 10 & 0x3FF | 0xD800);
-+				value = 0xDC00 | value & 0x3FF;
-+			}
-+			output += stringFromCharCode(value);
-+			return output;
-+		}).join('');
-+	}
-+
-+	/**
-+	 * Converts a basic code point into a digit/integer.
-+	 * @see `digitToBasic()`
-+	 * @private
-+	 * @param {Number} codePoint The basic numeric code point value.
-+	 * @returns {Number} The numeric value of a basic code point (for use in
-+	 * representing integers) in the range `0` to `base - 1`, or `base` if
-+	 * the code point does not represent a value.
-+	 */
-+	function basicToDigit(codePoint) {
-+		if (codePoint - 48 < 10) {
-+			return codePoint - 22;
-+		}
-+		if (codePoint - 65 < 26) {
-+			return codePoint - 65;
-+		}
-+		if (codePoint - 97 < 26) {
-+			return codePoint - 97;
-+		}
-+		return base;
-+	}
-+
-+	/**
-+	 * Converts a digit/integer into a basic code point.
-+	 * @see `basicToDigit()`
-+	 * @private
-+	 * @param {Number} digit The numeric value of a basic code point.
-+	 * @returns {Number} The basic code point whose value (when used for
-+	 * representing integers) is `digit`, which needs to be in the range
-+	 * `0` to `base - 1`. If `flag` is non-zero, the uppercase form is
-+	 * used; else, the lowercase form is used. The behavior is undefined
-+	 * if `flag` is non-zero and `digit` has no uppercase form.
-+	 */
-+	function digitToBasic(digit, flag) {
-+		//  0..25 map to ASCII a..z or A..Z
-+		// 26..35 map to ASCII 0..9
-+		return digit + 22 + 75 * (digit < 26) - ((flag != 0) << 5);
-+	}
-+
-+	/**
-+	 * Bias adaptation function as per section 3.4 of RFC 3492.
-+	 * https://tools.ietf.org/html/rfc3492#section-3.4
-+	 * @private
-+	 */
-+	function adapt(delta, numPoints, firstTime) {
-+		var k = 0;
-+		delta = firstTime ? floor(delta / damp) : delta >> 1;
-+		delta += floor(delta / numPoints);
-+		for (/* no initialization */; delta > baseMinusTMin * tMax >> 1; k += base) {
-+			delta = floor(delta / baseMinusTMin);
-+		}
-+		return floor(k + (baseMinusTMin + 1) * delta / (delta + skew));
-+	}
-+
-+	/**
-+	 * Converts a Punycode string of ASCII-only symbols to a string of Unicode
-+	 * symbols.
-+	 * @memberOf punycode
-+	 * @param {String} input The Punycode string of ASCII-only symbols.
-+	 * @returns {String} The resulting string of Unicode symbols.
-+	 */
-+	function decode(input) {
-+		// Don't use UCS-2
-+		var output = [],
-+		    inputLength = input.length,
-+		    out,
-+		    i = 0,
-+		    n = initialN,
-+		    bias = initialBias,
-+		    basic,
-+		    j,
-+		    index,
-+		    oldi,
-+		    w,
-+		    k,
-+		    digit,
-+		    t,
-+		    /** Cached calculation results */
-+		    baseMinusT;
-+
-+		// Handle the basic code points: let `basic` be the number of input code
-+		// points before the last delimiter, or `0` if there is none, then copy
-+		// the first basic code points to the output.
-+
-+		basic = input.lastIndexOf(delimiter);
-+		if (basic < 0) {
-+			basic = 0;
-+		}
-+
-+		for (j = 0; j < basic; ++j) {
-+			// if it's not a basic code point
-+			if (input.charCodeAt(j) >= 0x80) {
-+				error('not-basic');
-+			}
-+			output.push(input.charCodeAt(j));
-+		}
-+
-+		// Main decoding loop: start just after the last delimiter if any basic code
-+		// points were copied; start at the beginning otherwise.
-+
-+		for (index = basic > 0 ? basic + 1 : 0; index < inputLength; /* no final expression */) {
-+
-+			// `index` is the index of the next character to be consumed.
-+			// Decode a generalized variable-length integer into `delta`,
-+			// which gets added to `i`. The overflow checking is easier
-+			// if we increase `i` as we go, then subtract off its starting
-+			// value at the end to obtain `delta`.
-+			for (oldi = i, w = 1, k = base; /* no condition */; k += base) {
-+
-+				if (index >= inputLength) {
-+					error('invalid-input');
-+				}
-+
-+				digit = basicToDigit(input.charCodeAt(index++));
-+
-+				if (digit >= base || digit > floor((maxInt - i) / w)) {
-+					error('overflow');
-+				}
-+
-+				i += digit * w;
-+				t = k <= bias ? tMin : (k >= bias + tMax ? tMax : k - bias);
-+
-+				if (digit < t) {
-+					break;
-+				}
-+
-+				baseMinusT = base - t;
-+				if (w > floor(maxInt / baseMinusT)) {
-+					error('overflow');
-+				}
-+
-+				w *= baseMinusT;
-+
-+			}
-+
-+			out = output.length + 1;
-+			bias = adapt(i - oldi, out, oldi == 0);
-+
-+			// `i` was supposed to wrap around from `out` to `0`,
-+			// incrementing `n` each time, so we'll fix that now:
-+			if (floor(i / out) > maxInt - n) {
-+				error('overflow');
-+			}
-+
-+			n += floor(i / out);
-+			i %= out;
-+
-+			// Insert `n` at position `i` of the output
-+			output.splice(i++, 0, n);
-+
-+		}
-+
-+		return ucs2encode(output);
-+	}
-+
-+	/**
-+	 * Converts a string of Unicode symbols (e.g. a domain name label) to a
-+	 * Punycode string of ASCII-only symbols.
-+	 * @memberOf punycode
-+	 * @param {String} input The string of Unicode symbols.
-+	 * @returns {String} The resulting Punycode string of ASCII-only symbols.
-+	 */
-+	function encode(input) {
-+		var n,
-+		    delta,
-+		    handledCPCount,
-+		    basicLength,
-+		    bias,
-+		    j,
-+		    m,
-+		    q,
-+		    k,
-+		    t,
-+		    currentValue,
-+		    output = [],
-+		    /** `inputLength` will hold the number of code points in `input`. */
-+		    inputLength,
-+		    /** Cached calculation results */
-+		    handledCPCountPlusOne,
-+		    baseMinusT,
-+		    qMinusT;
-+
-+		// Convert the input in UCS-2 to Unicode
-+		input = ucs2decode(input);
-+
-+		// Cache the length
-+		inputLength = input.length;
-+
-+		// Initialize the state
-+		n = initialN;
-+		delta = 0;
-+		bias = initialBias;
-+
-+		// Handle the basic code points
-+		for (j = 0; j < inputLength; ++j) {
-+			currentValue = input[j];
-+			if (currentValue < 0x80) {
-+				output.push(stringFromCharCode(currentValue));
-+			}
-+		}
-+
-+		handledCPCount = basicLength = output.length;
-+
-+		// `handledCPCount` is the number of code points that have been handled;
-+		// `basicLength` is the number of basic code points.
-+
-+		// Finish the basic string - if it is not empty - with a delimiter
-+		if (basicLength) {
-+			output.push(delimiter);
-+		}
-+
-+		// Main encoding loop:
-+		while (handledCPCount < inputLength) {
-+
-+			// All non-basic code points < n have been handled already. Find the next
-+			// larger one:
-+			for (m = maxInt, j = 0; j < inputLength; ++j) {
-+				currentValue = input[j];
-+				if (currentValue >= n && currentValue < m) {
-+					m = currentValue;
-+				}
-+			}
-+
-+			// Increase `delta` enough to advance the decoder's <n,i> state to <m,0>,
-+			// but guard against overflow
-+			handledCPCountPlusOne = handledCPCount + 1;
-+			if (m - n > floor((maxInt - delta) / handledCPCountPlusOne)) {
-+				error('overflow');
-+			}
-+
-+			delta += (m - n) * handledCPCountPlusOne;
-+			n = m;
-+
-+			for (j = 0; j < inputLength; ++j) {
-+				currentValue = input[j];
-+
-+				if (currentValue < n && ++delta > maxInt) {
-+					error('overflow');
-+				}
-+
-+				if (currentValue == n) {
-+					// Represent delta as a generalized variable-length integer
-+					for (q = delta, k = base; /* no condition */; k += base) {
-+						t = k <= bias ? tMin : (k >= bias + tMax ? tMax : k - bias);
-+						if (q < t) {
-+							break;
-+						}
-+						qMinusT = q - t;
-+						baseMinusT = base - t;
-+						output.push(
-+							stringFromCharCode(digitToBasic(t + qMinusT % baseMinusT, 0))
-+						);
-+						q = floor(qMinusT / baseMinusT);
-+					}
-+
-+					output.push(stringFromCharCode(digitToBasic(q, 0)));
-+					bias = adapt(delta, handledCPCountPlusOne, handledCPCount == basicLength);
-+					delta = 0;
-+					++handledCPCount;
-+				}
-+			}
-+
-+			++delta;
-+			++n;
-+
-+		}
-+		return output.join('');
-+	}
-+
-+	/**
-+	 * Converts a Punycode string representing a domain name or an email address
-+	 * to Unicode. Only the Punycoded parts of the input will be converted, i.e.
-+	 * it doesn't matter if you call it on a string that has already been
-+	 * converted to Unicode.
-+	 * @memberOf punycode
-+	 * @param {String} input The Punycoded domain name or email address to
-+	 * convert to Unicode.
-+	 * @returns {String} The Unicode representation of the given Punycode
-+	 * string.
-+	 */
-+	function toUnicode(input) {
-+		return mapDomain(input, function(string) {
-+			return regexPunycode.test(string)
-+				? decode(string.slice(4).toLowerCase())
-+				: string;
-+		});
-+	}
-+
-+	/**
-+	 * Converts a Unicode string representing a domain name or an email address to
-+	 * Punycode. Only the non-ASCII parts of the domain name will be converted,
-+	 * i.e. it doesn't matter if you call it with a domain that's already in
-+	 * ASCII.
-+	 * @memberOf punycode
-+	 * @param {String} input The domain name or email address to convert, as a
-+	 * Unicode string.
-+	 * @returns {String} The Punycode representation of the given domain name or
-+	 * email address.
-+	 */
-+	function toASCII(input) {
-+		return mapDomain(input, function(string) {
-+			return regexNonASCII.test(string)
-+				? 'xn--' + encode(string)
-+				: string;
-+		});
-+	}
-+
-+	/*--------------------------------------------------------------------------*/
-+
-+	/** Define the public API */
-+	punycode = {
-+		/**
-+		 * A string representing the current Punycode.js version number.
-+		 * @memberOf punycode
-+		 * @type String
-+		 */
-+		'version': '1.4.1',
-+		/**
-+		 * An object of methods to convert from JavaScript's internal character
-+		 * representation (UCS-2) to Unicode code points, and back.
-+		 * @see <https://mathiasbynens.be/notes/javascript-encoding>
-+		 * @memberOf punycode
-+		 * @type Object
-+		 */
-+		'ucs2': {
-+			'decode': ucs2decode,
-+			'encode': ucs2encode
-+		},
-+		'decode': decode,
-+		'encode': encode,
-+		'toASCII': toASCII,
-+		'toUnicode': toUnicode
-+	};
-+
-+	/** Expose `punycode` */
-+	// Some AMD build optimizers, like r.js, check for specific condition patterns
-+	// like the following:
-+	if (
-+		true
-+	) {
-+		!(__WEBPACK_AMD_DEFINE_RESULT__ = (function() {
-+			return punycode;
-+		}).call(exports, __webpack_require__, exports, module),
-+				__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
-+	} else {}
-+
-+}(this));
-+
-+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../webpack/buildin/module.js */ "./node_modules/webpack/buildin/module.js")(module), __webpack_require__(/*! ./../webpack/buildin/global.js */ "./node_modules/webpack/buildin/global.js")))
-+
-+/***/ }),
-+
-+/***/ "./node_modules/uc.micro/categories/Cc/regex.js":
-+/*!******************************************************!*\
-+  !*** ./node_modules/uc.micro/categories/Cc/regex.js ***!
-+  \******************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports) {
-+
-+module.exports=/[\0-\x1F\x7F-\x9F]/
-+
-+/***/ }),
-+
-+/***/ "./node_modules/uc.micro/categories/Cf/regex.js":
-+/*!******************************************************!*\
-+  !*** ./node_modules/uc.micro/categories/Cf/regex.js ***!
-+  \******************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports) {
-+
-+module.exports=/[\xAD\u0600-\u0605\u061C\u06DD\u070F\u08E2\u180E\u200B-\u200F\u202A-\u202E\u2060-\u2064\u2066-\u206F\uFEFF\uFFF9-\uFFFB]|\uD804\uDCBD|\uD82F[\uDCA0-\uDCA3]|\uD834[\uDD73-\uDD7A]|\uDB40[\uDC01\uDC20-\uDC7F]/
-+
-+/***/ }),
-+
-+/***/ "./node_modules/uc.micro/categories/P/regex.js":
-+/*!*****************************************************!*\
-+  !*** ./node_modules/uc.micro/categories/P/regex.js ***!
-+  \*****************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports) {
-+
-+module.exports=/[!-#%-\*,-/:;\?@\[-\]_\{\}\xA1\xA7\xAB\xB6\xB7\xBB\xBF\u037E\u0387\u055A-\u055F\u0589\u058A\u05BE\u05C0\u05C3\u05C6\u05F3\u05F4\u0609\u060A\u060C\u060D\u061B\u061E\u061F\u066A-\u066D\u06D4\u0700-\u070D\u07F7-\u07F9\u0830-\u083E\u085E\u0964\u0965\u0970\u09FD\u0AF0\u0DF4\u0E4F\u0E5A\u0E5B\u0F04-\u0F12\u0F14\u0F3A-\u0F3D\u0F85\u0FD0-\u0FD4\u0FD9\u0FDA\u104A-\u104F\u10FB\u1360-\u1368\u1400\u166D\u166E\u169B\u169C\u16EB-\u16ED\u1735\u1736\u17D4-\u17D6\u17D8-\u17DA\u1800-\u180A\u1944\u1945\u1A1E\u1A1F\u1AA0-\u1AA6\u1AA8-\u1AAD\u1B5A-\u1B60\u1BFC-\u1BFF\u1C3B-\u1C3F\u1C7E\u1C7F\u1CC0-\u1CC7\u1CD3\u2010-\u2027\u2030-\u2043\u2045-\u2051\u2053-\u205E\u207D\u207E\u208D\u208E\u2308-\u230B\u2329\u232A\u2768-\u2775\u27C5\u27C6\u27E6-\u27EF\u2983-\u2998\u29D8-\u29DB\u29FC\u29FD\u2CF9-\u2CFC\u2CFE\u2CFF\u2D70\u2E00-\u2E2E\u2E30-\u2E49\u3001-\u3003\u3008-\u3011\u3014-\u301F\u3030\u303D\u30A0\u30FB\uA4FE\uA4FF\uA60D-\uA60F\uA673\uA67E\uA6F2-\uA6F7\uA874-\uA877\uA8CE\uA8CF\uA8F8-\uA8FA\uA8FC\uA92E\uA92F\uA95F\uA9C1-\uA9CD\uA9DE\uA9DF\uAA5C-\uAA5F\uAADE\uAADF\uAAF0\uAAF1\uABEB\uFD3E\uFD3F\uFE10-\uFE19\uFE30-\uFE52\uFE54-\uFE61\uFE63\uFE68\uFE6A\uFE6B\uFF01-\uFF03\uFF05-\uFF0A\uFF0C-\uFF0F\uFF1A\uFF1B\uFF1F\uFF20\uFF3B-\uFF3D\uFF3F\uFF5B\uFF5D\uFF5F-\uFF65]|\uD800[\uDD00-\uDD02\uDF9F\uDFD0]|\uD801\uDD6F|\uD802[\uDC57\uDD1F\uDD3F\uDE50-\uDE58\uDE7F\uDEF0-\uDEF6\uDF39-\uDF3F\uDF99-\uDF9C]|\uD804[\uDC47-\uDC4D\uDCBB\uDCBC\uDCBE-\uDCC1\uDD40-\uDD43\uDD74\uDD75\uDDC5-\uDDC9\uDDCD\uDDDB\uDDDD-\uDDDF\uDE38-\uDE3D\uDEA9]|\uD805[\uDC4B-\uDC4F\uDC5B\uDC5D\uDCC6\uDDC1-\uDDD7\uDE41-\uDE43\uDE60-\uDE6C\uDF3C-\uDF3E]|\uD806[\uDE3F-\uDE46\uDE9A-\uDE9C\uDE9E-\uDEA2]|\uD807[\uDC41-\uDC45\uDC70\uDC71]|\uD809[\uDC70-\uDC74]|\uD81A[\uDE6E\uDE6F\uDEF5\uDF37-\uDF3B\uDF44]|\uD82F\uDC9F|\uD836[\uDE87-\uDE8B]|\uD83A[\uDD5E\uDD5F]/
-+
-+/***/ }),
-+
-+/***/ "./node_modules/uc.micro/categories/Z/regex.js":
-+/*!*****************************************************!*\
-+  !*** ./node_modules/uc.micro/categories/Z/regex.js ***!
-+  \*****************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports) {
-+
-+module.exports=/[ \xA0\u1680\u2000-\u200A\u202F\u205F\u3000]/
-+
-+/***/ }),
-+
-+/***/ "./node_modules/uc.micro/index.js":
-+/*!****************************************!*\
-+  !*** ./node_modules/uc.micro/index.js ***!
-+  \****************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+
-+
-+exports.Any = __webpack_require__(/*! ./properties/Any/regex */ "./node_modules/uc.micro/properties/Any/regex.js");
-+exports.Cc  = __webpack_require__(/*! ./categories/Cc/regex */ "./node_modules/uc.micro/categories/Cc/regex.js");
-+exports.Cf  = __webpack_require__(/*! ./categories/Cf/regex */ "./node_modules/uc.micro/categories/Cf/regex.js");
-+exports.P   = __webpack_require__(/*! ./categories/P/regex */ "./node_modules/uc.micro/categories/P/regex.js");
-+exports.Z   = __webpack_require__(/*! ./categories/Z/regex */ "./node_modules/uc.micro/categories/Z/regex.js");
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/uc.micro/properties/Any/regex.js":
-+/*!*******************************************************!*\
-+  !*** ./node_modules/uc.micro/properties/Any/regex.js ***!
-+  \*******************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports) {
-+
-+module.exports=/[\0-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]/
-+
-+/***/ }),
-+
-+/***/ "./node_modules/webpack/buildin/global.js":
-+/*!***********************************!*\
-+  !*** (webpack)/buildin/global.js ***!
-+  \***********************************/
-+/*! no static exports found */
-+/***/ (function(module, exports) {
-+
-+var g;
-+
-+// This works in non-strict mode
-+g = (function() {
-+	return this;
-+})();
-+
-+try {
-+	// This works if eval is allowed (see CSP)
-+	g = g || Function("return this")() || (1, eval)("this");
-+} catch (e) {
-+	// This works if the window reference is available
-+	if (typeof window === "object") g = window;
-+}
-+
-+// g can still be undefined, but nothing to do about it...
-+// We return undefined, instead of nothing here, so it's
-+// easier to handle this case. if(!global) { ...}
-+
-+module.exports = g;
-+
-+
-+/***/ }),
-+
-+/***/ "./node_modules/webpack/buildin/module.js":
-+/*!***********************************!*\
-+  !*** (webpack)/buildin/module.js ***!
-+  \***********************************/
-+/*! no static exports found */
-+/***/ (function(module, exports) {
-+
-+module.exports = function(module) {
-+	if (!module.webpackPolyfill) {
-+		module.deprecate = function() {};
-+		module.paths = [];
-+		// module.parent = undefined by default
-+		if (!module.children) module.children = [];
-+		Object.defineProperty(module, "loaded", {
-+			enumerable: true,
-+			get: function() {
-+				return module.l;
-+			}
-+		});
-+		Object.defineProperty(module, "id", {
-+			enumerable: true,
-+			get: function() {
-+				return module.i;
-+			}
-+		});
-+		module.webpackPolyfill = 1;
-+	}
-+	return module;
-+};
-+
-+
-+/***/ }),
-+
-+/***/ "./preview-src/index.ts":
-+/*!******************************!*\
-+  !*** ./preview-src/index.ts ***!
-+  \******************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+Object.defineProperty(exports, "__esModule", { value: true });
-+const pullRequestOverviewRenderer_1 = __webpack_require__(/*! ./pullRequestOverviewRenderer */ "./preview-src/pullRequestOverviewRenderer.ts");
-+const mdRenderer_1 = __webpack_require__(/*! ./mdRenderer */ "./preview-src/mdRenderer.ts");
-+const vscode = acquireVsCodeApi();
-+function handleMessage(event) {
-+    const message = event.data; // The json data that the extension sent
-+    switch (message.command) {
-+        case 'pr.initialize':
-+            renderPullRequest(message.pullrequest);
-+            break;
-+        case 'pr.update':
-+            updatePullRequest(message.pullrequest);
-+            break;
-+        case 'checked-out':
-+            updateCheckoutButton(true);
-+            break;
-+        case 'append-comment':
-+            appendComment(message.value);
-+        default:
-+            break;
-+    }
-+}
-+window.addEventListener('message', handleMessage);
-+function renderPullRequest(pullRequest) {
-+    document.getElementById('pullrequest').innerHTML = pullRequest.events.map(pullRequestOverviewRenderer_1.renderTimelineEvent).join('');
-+    setTitleHTML(pullRequest);
-+    setTextArea();
-+    updateCheckoutButton(pullRequest.isCurrentlyCheckedOut);
-+    addEventListeners();
-+}
-+function updatePullRequest(pullRequest) {
-+    if (pullRequest.state || pullRequest.body || pullRequest.author || pullRequest.title) {
-+        setTitleHTML(pullRequest);
-+    }
-+}
-+function setTitleHTML(pr) {
-+    document.getElementById('title').innerHTML = `
-+			<div class="prIcon"><svg width="64" height="64" class="octicon octicon-git-compare" viewBox="0 0 14 16" version="1.1" aria-hidden="true"><path fill="#FFFFFF" fill-rule="evenodd" d="M5 12H4c-.27-.02-.48-.11-.69-.31-.21-.2-.3-.42-.31-.69V4.72A1.993 1.993 0 0 0 2 1a1.993 1.993 0 0 0-1 3.72V11c.03.78.34 1.47.94 2.06.6.59 1.28.91 2.06.94h1v2l3-3-3-3v2zM2 1.8c.66 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2C1.35 4.2.8 3.65.8 3c0-.65.55-1.2 1.2-1.2zm11 9.48V5c-.03-.78-.34-1.47-.94-2.06-.6-.59-1.28-.91-2.06-.94H9V0L6 3l3 3V4h1c.27.02.48.11.69.31.21.2.3.42.31.69v6.28A1.993 1.993 0 0 0 12 15a1.993 1.993 0 0 0 1-3.72zm-1 2.92c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2z"></path></svg></div>
-+			<div class="details">
-+				<div class="overview-title">
-+					<h2>${pr.title} (<a href=${pr.url}>#${pr.number}</a>) </h2> <button id="checkout" aria-live="polite"><svg class="octicon octicon-desktop-download" viewBox="0 0 16 16" version="1.1" width="16" height="16" aria-hidden="true"><path fill-rule="evenodd" d="M4 6h3V0h2v6h3l-4 4-4-4zm11-4h-4v1h4v8H1V3h4V2H1c-.55 0-1 .45-1 1v9c0 .55.45 1 1 1h5.34c-.25.61-.86 1.39-2.34 2h8c-1.48-.61-2.09-1.39-2.34-2H15c.55 0 1-.45 1-1V3c0-.55-.45-1-1-1z"></path></svg>Checkout Pull Request</button>
-+				</div>
-+				<div>
-+					<div class="status">${pullRequestOverviewRenderer_1.getStatus(pr.state)}</div>
-+					<img class="avatar" src="${pr.author.avatarUrl}" alt="">
-+					<strong class="author"><a href="${pr.author.htmlUrl}">${pr.author.login}</a></strong>
-+				</div>
-+				<div class="comment-body">
-+					${mdRenderer_1.default.render(pr.body)}
-+				</div>
-+			</div>
-+		`;
-+}
-+function addEventListeners() {
-+    document.getElementById('checkout').addEventListener('click', () => {
-+        document.getElementById('checkout').disabled = true;
-+        vscode.postMessage({
-+            command: 'pr.checkout'
-+        });
-+    });
-+    document.getElementById('reply-button').addEventListener('click', () => {
-+        document.getElementById('reply-button').disabled = true;
-+        vscode.postMessage({
-+            command: 'pr.comment',
-+            text: document.getElementById('commentTextArea').value
-+        });
-+        document.getElementById('commentTextArea').value = '';
-+    });
-+    document.getElementById('close-button').addEventListener('click', () => {
-+        document.getElementById('close-button').disabled = true;
-+        vscode.postMessage({
-+            command: 'pr.close'
-+        });
-+    });
-+}
-+function appendComment(comment) {
-+    let newComment = pullRequestOverviewRenderer_1.renderComment(comment);
-+    document.getElementById('pullrequest').insertAdjacentHTML('beforeend', newComment);
-+}
-+function updateCheckoutButton(isCheckedOut) {
-+    const checkoutButton = document.getElementById('checkout');
-+    checkoutButton.disabled = isCheckedOut;
-+    const checkoutIcon = '<svg class="octicon octicon-desktop-download" viewBox="0 0 16 16" version="1.1" width="16" height="16" aria-hidden="true"><path fill-rule="evenodd" d="M4 6h3V0h2v6h3l-4 4-4-4zm11-4h-4v1h4v8H1V3h4V2H1c-.55 0-1 .45-1 1v9c0 .55.45 1 1 1h5.34c-.25.61-.86 1.39-2.34 2h8c-1.48-.61-2.09-1.39-2.34-2H15c.55 0 1-.45 1-1V3c0-.55-.45-1-1-1z"></path></svg>';
-+    const activeIcon = '<svg class="octicon octicon-check" viewBox="0 0 12 16" version="1.1" width="12" height="16" aria-hidden="true"><path fill-rule="evenodd" d="M12 5l-8 8-4-4 1.5-1.5L4 10l6.5-6.5L12 5z"></path></svg>';
-+    checkoutButton.innerHTML = isCheckedOut ? `${activeIcon} Currently Active` : `${checkoutIcon} Checkout Pull Request`;
-+}
-+function setTextArea() {
-+    document.getElementById('comment-form').innerHTML = `<textarea id="commentTextArea"></textarea>
-+		<div class="form-actions">
-+			<button class="close-button" id="close-button"></button>
-+			<button class="reply-button" id="reply-button"></button>
-+		</div>`;
-+    document.getElementById('commentTextArea').placeholder = 'Leave a comment';
-+    document.getElementById('commentTextArea').addEventListener('keydown', e => {
-+        if (e.keyCode === 65 && e.metaKey) {
-+            document.getElementById('commentTextArea').select();
-+        }
-+    });
-+    document.getElementById('reply-button').textContent = 'Comment';
-+    document.getElementById('close-button').textContent = 'Close pull request';
-+}
-+
-+
-+/***/ }),
-+
-+/***/ "./preview-src/mdRenderer.ts":
-+/*!***********************************!*\
-+  !*** ./preview-src/mdRenderer.ts ***!
-+  \***********************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+Object.defineProperty(exports, "__esModule", { value: true });
-+const MarkdownIt = __webpack_require__(/*! markdown-it */ "./node_modules/markdown-it/index.js");
-+const md = MarkdownIt();
-+exports.default = md;
-+
-+
-+/***/ }),
-+
-+/***/ "./preview-src/pullRequestOverviewRenderer.ts":
-+/*!****************************************************!*\
-+  !*** ./preview-src/pullRequestOverviewRenderer.ts ***!
-+  \****************************************************/
-+/*! no static exports found */
-+/***/ (function(module, exports, __webpack_require__) {
-+
-+"use strict";
-+
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+Object.defineProperty(exports, "__esModule", { value: true });
-+const moment = __webpack_require__(/*! moment */ "./node_modules/moment/moment.js");
-+const mdRenderer_1 = __webpack_require__(/*! ./mdRenderer */ "./preview-src/mdRenderer.ts");
-+var DiffChangeType;
-+(function (DiffChangeType) {
-+    DiffChangeType[DiffChangeType["Context"] = 0] = "Context";
-+    DiffChangeType[DiffChangeType["Add"] = 1] = "Add";
-+    DiffChangeType[DiffChangeType["Delete"] = 2] = "Delete";
-+    DiffChangeType[DiffChangeType["Control"] = 3] = "Control";
-+})(DiffChangeType = exports.DiffChangeType || (exports.DiffChangeType = {}));
-+class DiffLine {
-+    constructor(type, oldLineNumber, /* 1 based */ newLineNumber, /* 1 based */ positionInHunk, _raw) {
-+        this.type = type;
-+        this.oldLineNumber = oldLineNumber;
-+        this.newLineNumber = newLineNumber;
-+        this.positionInHunk = positionInHunk;
-+        this._raw = _raw;
-+        this.endwithLineBreak = true;
-+    }
-+    get raw() {
-+        return this._raw;
-+    }
-+    get text() {
-+        return this._raw.substr(1);
-+    }
-+}
-+exports.DiffLine = DiffLine;
-+function getDiffChangeType(text) {
-+    let c = text[0];
-+    switch (c) {
-+        case ' ': return DiffChangeType.Context;
-+        case '+': return DiffChangeType.Add;
-+        case '-': return DiffChangeType.Delete;
-+        default: return DiffChangeType.Control;
-+    }
-+}
-+exports.getDiffChangeType = getDiffChangeType;
-+class DiffHunk {
-+    constructor(oldLineNumber, oldLength, newLineNumber, newLength, positionInHunk) {
-+        this.oldLineNumber = oldLineNumber;
-+        this.oldLength = oldLength;
-+        this.newLineNumber = newLineNumber;
-+        this.newLength = newLength;
-+        this.positionInHunk = positionInHunk;
-+        this.diffLines = [];
-+    }
-+}
-+exports.DiffHunk = DiffHunk;
-+var EventType;
-+(function (EventType) {
-+    EventType[EventType["Committed"] = 0] = "Committed";
-+    EventType[EventType["Mentioned"] = 1] = "Mentioned";
-+    EventType[EventType["Subscribed"] = 2] = "Subscribed";
-+    EventType[EventType["Commented"] = 3] = "Commented";
-+    EventType[EventType["Reviewed"] = 4] = "Reviewed";
-+    EventType[EventType["Other"] = 5] = "Other";
-+})(EventType = exports.EventType || (exports.EventType = {}));
-+var PullRequestStateEnum;
-+(function (PullRequestStateEnum) {
-+    PullRequestStateEnum[PullRequestStateEnum["Open"] = 0] = "Open";
-+    PullRequestStateEnum[PullRequestStateEnum["Merged"] = 1] = "Merged";
-+    PullRequestStateEnum[PullRequestStateEnum["Closed"] = 2] = "Closed";
-+})(PullRequestStateEnum = exports.PullRequestStateEnum || (exports.PullRequestStateEnum = {}));
-+function renderCommentBody(comment) {
-+    return `
-+			<div class="comment-body">
-+				${mdRenderer_1.default.render(comment.body)}
-+			</div>`;
-+}
-+exports.renderCommentBody = renderCommentBody;
-+function renderComment(comment) {
-+    return `<div class="comment-container">
-+
-+	<div class="review-comment" role="treeitem">
-+		<div class="review-comment-contents">
-+			<div class="review-comment-header">
-+				<div class="avatar-container">
-+					<img class="avatar" src="${comment.user.avatar_url}">
-+				</div>
-+				<strong class="author"><a href="${comment.user.html_url}">${comment.user.login}</a></strong>
-+				<div class="timestamp">${moment(comment.created_at).fromNow()}</div>
-+			</div>
-+			<div class="comment-body">
-+				${mdRenderer_1.default.render(comment.body)}
-+			</div>
-+		</div>
-+	</div>
-+</div>`;
-+}
-+exports.renderComment = renderComment;
-+function renderCommit(timelineEvent) {
-+    return `<div class="comment-container">
-+
-+	<div class="review-comment" role="treeitem">
-+		<div class="review-comment-contents">
-+			<div class="commit">
-+				<strong>${timelineEvent.author.name} commit: <a href="${timelineEvent.html_url}">${timelineEvent.message} (${timelineEvent.sha})</a></strong>
-+			</div>
-+		</div>
-+	</div>
-+</div>`;
-+}
-+exports.renderCommit = renderCommit;
-+function getDiffChangeClass(type) {
-+    switch (type) {
-+        case DiffChangeType.Add:
-+            return 'add';
-+        case DiffChangeType.Delete:
-+            return 'delete';
-+        case DiffChangeType.Context:
-+            return 'context';
-+        case DiffChangeType.Context:
-+            return 'context';
-+        default:
-+            return 'control';
-+    }
-+}
-+function renderReview(timelineEvent) {
-+    let comments = timelineEvent.comments;
-+    let avatar = '';
-+    let diffView = '';
-+    let diffLines = [];
-+    if (comments && comments.length) {
-+        avatar = `<div class="avatar-container">
-+			<img class="avatar" src="${timelineEvent.comments[0].user.avatar_url}">
-+		</div>`;
-+        for (let i = 0; i < comments[0].diff_hunks.length; i++) {
-+            diffLines.push(comments[0].diff_hunks[i].diffLines.slice(-4).map(diffLine => `<div class="diffLine ${getDiffChangeClass(diffLine.type)}">
-+				<span class="lineNumber old">${diffLine.oldLineNumber > 0 ? diffLine.oldLineNumber : ' '}</span>
-+				<span class="lineNumber new">${diffLine.newLineNumber > 0 ? diffLine.newLineNumber : ' '}</span>
-+				<span class="lineContent">${diffLine._raw}</span>
-+				</div>`).join(''));
-+        }
-+        diffView = `<div class="diff">
-+			<div class="diffHeader">${comments[0].path}</div>
-+			${diffLines.join('')}
-+		</div>`;
-+    }
-+    return `<div class="comment-container">
-+
-+	<div class="review-comment" role="treeitem">
-+		<div class="review-comment-contents">
-+			<div class="review-comment-header">
-+				${avatar}
-+				<strong class="author">${timelineEvent.user.login} left a <a href="${timelineEvent.html_url}">review </a></strong><span></span>
-+				<div class="timestamp">${moment(timelineEvent.submitted_at).fromNow()}</div>
-+			</div>
-+			${diffView}
-+			<div>${timelineEvent.comments && timelineEvent.comments.length ? timelineEvent.comments.map(comment => renderCommentBody(comment)) : ''}</div>
-+		</div>
-+	</div>
-+</div>`;
-+}
-+exports.renderReview = renderReview;
-+function renderTimelineEvent(timelineEvent) {
-+    switch (timelineEvent.event) {
-+        case EventType.Committed:
-+            return renderCommit(timelineEvent);
-+        case EventType.Commented:
-+            return renderComment(timelineEvent);
-+        case EventType.Reviewed:
-+            return renderReview(timelineEvent);
-+    }
-+    return '';
-+}
-+exports.renderTimelineEvent = renderTimelineEvent;
-+function getStatusBGCoor(state) {
-+    if (state === PullRequestStateEnum.Merged) {
-+        return '#6f42c1';
-+    }
-+    else if (state === PullRequestStateEnum.Open) {
-+        return '#2cbe4e';
-+    }
-+    else {
-+        return '#cb2431';
-+    }
-+}
-+exports.getStatusBGCoor = getStatusBGCoor;
-+function getStatus(state) {
-+    if (state === PullRequestStateEnum.Merged) {
-+        return 'Merged';
-+    }
-+    else if (state === PullRequestStateEnum.Open) {
-+        return 'Open';
-+    }
-+    else {
-+        return 'Closed';
-+    }
-+}
-+exports.getStatus = getStatus;
-+
-+
-+/***/ })
-+
-+/******/ });
-+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["webpack:///webpack/bootstrap","webpack:///./node_modules/linkify-it/index.js","webpack:///./node_modules/linkify-it/lib/re.js","webpack:///./node_modules/markdown-it/index.js","webpack:///./node_modules/markdown-it/lib/common/entities.js","webpack:///./node_modules/markdown-it/lib/common/html_blocks.js","webpack:///./node_modules/markdown-it/lib/common/html_re.js","webpack:///./node_modules/markdown-it/lib/common/utils.js","webpack:///./node_modules/markdown-it/lib/helpers/index.js","webpack:///./node_modules/markdown-it/lib/helpers/parse_link_destination.js","webpack:///./node_modules/markdown-it/lib/helpers/parse_link_label.js","webpack:///./node_modules/markdown-it/lib/helpers/parse_link_title.js","webpack:///./node_modules/markdown-it/lib/index.js","webpack:///./node_modules/markdown-it/lib/parser_block.js","webpack:///./node_modules/markdown-it/lib/parser_core.js","webpack:///./node_modules/markdown-it/lib/parser_inline.js","webpack:///./node_modules/markdown-it/lib/presets/commonmark.js","webpack:///./node_modules/markdown-it/lib/presets/default.js","webpack:///./node_modules/markdown-it/lib/presets/zero.js","webpack:///./node_modules/markdown-it/lib/renderer.js","webpack:///./node_modules/markdown-it/lib/ruler.js","webpack:///./node_modules/markdown-it/lib/rules_block/blockquote.js","webpack:///./node_modules/markdown-it/lib/rules_block/code.js","webpack:///./node_modules/markdown-it/lib/rules_block/fence.js","webpack:///./node_modules/markdown-it/lib/rules_block/heading.js","webpack:///./node_modules/markdown-it/lib/rules_block/hr.js","webpack:///./node_modules/markdown-it/lib/rules_block/html_block.js","webpack:///./node_modules/markdown-it/lib/rules_block/lheading.js","webpack:///./node_modules/markdown-it/lib/rules_block/list.js","webpack:///./node_modules/markdown-it/lib/rules_block/paragraph.js","webpack:///./node_modules/markdown-it/lib/rules_block/reference.js","webpack:///./node_modules/markdown-it/lib/rules_block/state_block.js","webpack:///./node_modules/markdown-it/lib/rules_block/table.js","webpack:///./node_modules/markdown-it/lib/rules_core/block.js","webpack:///./node_modules/markdown-it/lib/rules_core/inline.js","webpack:///./node_modules/markdown-it/lib/rules_core/linkify.js","webpack:///./node_modules/markdown-it/lib/rules_core/normalize.js","webpack:///./node_modules/markdown-it/lib/rules_core/replacements.js","webpack:///./node_modules/markdown-it/lib/rules_core/smartquotes.js","webpack:///./node_modules/markdown-it/lib/rules_core/state_core.js","webpack:///./node_modules/markdown-it/lib/rules_inline/autolink.js","webpack:///./node_modules/markdown-it/lib/rules_inline/backticks.js","webpack:///./node_modules/markdown-it/lib/rules_inline/balance_pairs.js","webpack:///./node_modules/markdown-it/lib/rules_inline/emphasis.js","webpack:///./node_modules/markdown-it/lib/rules_inline/entity.js","webpack:///./node_modules/markdown-it/lib/rules_inline/escape.js","webpack:///./node_modules/markdown-it/lib/rules_inline/html_inline.js","webpack:///./node_modules/markdown-it/lib/rules_inline/image.js","webpack:///./node_modules/markdown-it/lib/rules_inline/link.js","webpack:///./node_modules/markdown-it/lib/rules_inline/newline.js","webpack:///./node_modules/markdown-it/lib/rules_inline/state_inline.js","webpack:///./node_modules/markdown-it/lib/rules_inline/strikethrough.js","webpack:///./node_modules/markdown-it/lib/rules_inline/text.js","webpack:///./node_modules/markdown-it/lib/rules_inline/text_collapse.js","webpack:///./node_modules/markdown-it/lib/token.js","webpack:///./node_modules/mdurl/decode.js","webpack:///./node_modules/mdurl/encode.js","webpack:///./node_modules/mdurl/format.js","webpack:///./node_modules/mdurl/index.js","webpack:///./node_modules/mdurl/parse.js","webpack:///./node_modules/moment/locale sync ^\\.\\/.*$","webpack:///./node_modules/moment/locale/af.js","webpack:///./node_modules/moment/locale/ar-dz.js","webpack:///./node_modules/moment/locale/ar-kw.js","webpack:///./node_modules/moment/locale/ar-ly.js","webpack:///./node_modules/moment/locale/ar-ma.js","webpack:///./node_modules/moment/locale/ar-sa.js","webpack:///./node_modules/moment/locale/ar-tn.js","webpack:///./node_modules/moment/locale/ar.js","webpack:///./node_modules/moment/locale/az.js","webpack:///./node_modules/moment/locale/be.js","webpack:///./node_modules/moment/locale/bg.js","webpack:///./node_modules/moment/locale/bm.js","webpack:///./node_modules/moment/locale/bn.js","webpack:///./node_modules/moment/locale/bo.js","webpack:///./node_modules/moment/locale/br.js","webpack:///./node_modules/moment/locale/bs.js","webpack:///./node_modules/moment/locale/ca.js","webpack:///./node_modules/moment/locale/cs.js","webpack:///./node_modules/moment/locale/cv.js","webpack:///./node_modules/moment/locale/cy.js","webpack:///./node_modules/moment/locale/da.js","webpack:///./node_modules/moment/locale/de-at.js","webpack:///./node_modules/moment/locale/de-ch.js","webpack:///./node_modules/moment/locale/de.js","webpack:///./node_modules/moment/locale/dv.js","webpack:///./node_modules/moment/locale/el.js","webpack:///./node_modules/moment/locale/en-au.js","webpack:///./node_modules/moment/locale/en-ca.js","webpack:///./node_modules/moment/locale/en-gb.js","webpack:///./node_modules/moment/locale/en-ie.js","webpack:///./node_modules/moment/locale/en-il.js","webpack:///./node_modules/moment/locale/en-nz.js","webpack:///./node_modules/moment/locale/eo.js","webpack:///./node_modules/moment/locale/es-do.js","webpack:///./node_modules/moment/locale/es-us.js","webpack:///./node_modules/moment/locale/es.js","webpack:///./node_modules/moment/locale/et.js","webpack:///./node_modules/moment/locale/eu.js","webpack:///./node_modules/moment/locale/fa.js","webpack:///./node_modules/moment/locale/fi.js","webpack:///./node_modules/moment/locale/fo.js","webpack:///./node_modules/moment/locale/fr-ca.js","webpack:///./node_modules/moment/locale/fr-ch.js","webpack:///./node_modules/moment/locale/fr.js","webpack:///./node_modules/moment/locale/fy.js","webpack:///./node_modules/moment/locale/gd.js","webpack:///./node_modules/moment/locale/gl.js","webpack:///./node_modules/moment/locale/gom-latn.js","webpack:///./node_modules/moment/locale/gu.js","webpack:///./node_modules/moment/locale/he.js","webpack:///./node_modules/moment/locale/hi.js","webpack:///./node_modules/moment/locale/hr.js","webpack:///./node_modules/moment/locale/hu.js","webpack:///./node_modules/moment/locale/hy-am.js","webpack:///./node_modules/moment/locale/id.js","webpack:///./node_modules/moment/locale/is.js","webpack:///./node_modules/moment/locale/it.js","webpack:///./node_modules/moment/locale/ja.js","webpack:///./node_modules/moment/locale/jv.js","webpack:///./node_modules/moment/locale/ka.js","webpack:///./node_modules/moment/locale/kk.js","webpack:///./node_modules/moment/locale/km.js","webpack:///./node_modules/moment/locale/kn.js","webpack:///./node_modules/moment/locale/ko.js","webpack:///./node_modules/moment/locale/ky.js","webpack:///./node_modules/moment/locale/lb.js","webpack:///./node_modules/moment/locale/lo.js","webpack:///./node_modules/moment/locale/lt.js","webpack:///./node_modules/moment/locale/lv.js","webpack:///./node_modules/moment/locale/me.js","webpack:///./node_modules/moment/locale/mi.js","webpack:///./node_modules/moment/locale/mk.js","webpack:///./node_modules/moment/locale/ml.js","webpack:///./node_modules/moment/locale/mn.js","webpack:///./node_modules/moment/locale/mr.js","webpack:///./node_modules/moment/locale/ms-my.js","webpack:///./node_modules/moment/locale/ms.js","webpack:///./node_modules/moment/locale/mt.js","webpack:///./node_modules/moment/locale/my.js","webpack:///./node_modules/moment/locale/nb.js","webpack:///./node_modules/moment/locale/ne.js","webpack:///./node_modules/moment/locale/nl-be.js","webpack:///./node_modules/moment/locale/nl.js","webpack:///./node_modules/moment/locale/nn.js","webpack:///./node_modules/moment/locale/pa-in.js","webpack:///./node_modules/moment/locale/pl.js","webpack:///./node_modules/moment/locale/pt-br.js","webpack:///./node_modules/moment/locale/pt.js","webpack:///./node_modules/moment/locale/ro.js","webpack:///./node_modules/moment/locale/ru.js","webpack:///./node_modules/moment/locale/sd.js","webpack:///./node_modules/moment/locale/se.js","webpack:///./node_modules/moment/locale/si.js","webpack:///./node_modules/moment/locale/sk.js","webpack:///./node_modules/moment/locale/sl.js","webpack:///./node_modules/moment/locale/sq.js","webpack:///./node_modules/moment/locale/sr-cyrl.js","webpack:///./node_modules/moment/locale/sr.js","webpack:///./node_modules/moment/locale/ss.js","webpack:///./node_modules/moment/locale/sv.js","webpack:///./node_modules/moment/locale/sw.js","webpack:///./node_modules/moment/locale/ta.js","webpack:///./node_modules/moment/locale/te.js","webpack:///./node_modules/moment/locale/tet.js","webpack:///./node_modules/moment/locale/tg.js","webpack:///./node_modules/moment/locale/th.js","webpack:///./node_modules/moment/locale/tl-ph.js","webpack:///./node_modules/moment/locale/tlh.js","webpack:///./node_modules/moment/locale/tr.js","webpack:///./node_modules/moment/locale/tzl.js","webpack:///./node_modules/moment/locale/tzm-latn.js","webpack:///./node_modules/moment/locale/tzm.js","webpack:///./node_modules/moment/locale/ug-cn.js","webpack:///./node_modules/moment/locale/uk.js","webpack:///./node_modules/moment/locale/ur.js","webpack:///./node_modules/moment/locale/uz-latn.js","webpack:///./node_modules/moment/locale/uz.js","webpack:///./node_modules/moment/locale/vi.js","webpack:///./node_modules/moment/locale/x-pseudo.js","webpack:///./node_modules/moment/locale/yo.js","webpack:///./node_modules/moment/locale/zh-cn.js","webpack:///./node_modules/moment/locale/zh-hk.js","webpack:///./node_modules/moment/locale/zh-tw.js","webpack:///./node_modules/moment/moment.js","webpack:///./node_modules/punycode/punycode.js","webpack:///./node_modules/uc.micro/categories/Cc/regex.js","webpack:///./node_modules/uc.micro/categories/Cf/regex.js","webpack:///./node_modules/uc.micro/categories/P/regex.js","webpack:///./node_modules/uc.micro/categories/Z/regex.js","webpack:///./node_modules/uc.micro/index.js","webpack:///./node_modules/uc.micro/properties/Any/regex.js","webpack:///(webpack)/buildin/global.js","webpack:///(webpack)/buildin/module.js","webpack:///./preview-src/index.ts","webpack:///./preview-src/mdRenderer.ts","webpack:///./preview-src/pullRequestOverviewRenderer.ts"],"names":[],"mappings":";AAAA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;;AAGA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAK;AACL;AACA;;AAEA;AACA;AACA,yDAAiD,cAAc;AAC/D;;AAEA;AACA;AACA;AACA,mCAA2B,0BAA0B,EAAE;AACvD,yCAAiC,eAAe;AAChD;AACA;AACA;;AAEA;AACA,8DAAsD,+DAA+D;;AAErH;AACA;;;AAGA;AACA;;;;;;;;;;;;;;;;;;;;;;;;ACnEA;;;AAGA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA,kBAAkB,QAAQ;;AAE1B;AACA;AACA,KAAK;AACL,GAAG;;AAEH;AACA;;AAEA,sBAAsB,4CAA4C;AAClE,wBAAwB,0CAA0C;AAClE,wBAAwB,0CAA0C;AAClE,wBAAwB,0CAA0C;AAClE,0BAA0B,4CAA4C;;;AAGtE,wBAAwB,qCAAqC,eAAe;;AAE5E;;;AAGA;AACA;AACA;AACA;AACA;;;AAGA;AACA,8BAA8B;AAC9B;AACA,GAAG;AACH;;;AAGA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,GAAG;AACH;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA,gDAAgD,UAAU;AAC1D,gDAAgD,UAAU;AAC1D;AACA;AACA;AACA;AACA,GAAG;AACH;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;;AAEA;AACA;;AAEA;;AAEA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;;AAEA;;AAEA,uBAAuB,2CAA2C;;AAElE;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;;AAEA,yBAAyB;;AAEzB;AACA;AACA;;AAEA;AACA;;AAEA;AACA,uBAAuB,QAAQ;;AAE/B,oBAAoB;;AAEpB;;AAEA;AACA;AACA;AACA,OAAO;AACP;AACA,OAAO;AACP;AACA;;AAEA;AACA;AACA,OAAO;AACP;AACA,OAAO;AACP;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA,GAAG;;AAEH;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA,GAAG;;AAEH;AACA;AACA;AACA,2BAA2B;;AAE3B;AACA;AACA;AACA;AACA;AACA;AACA;AACA,uBAAuB;AACvB;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;;AAEA;AACA;;;AAGA;AACA;AACA;;AAEA;AACA;AACA;AACA,wBAAwB;AACxB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA,qCAAqC;;AAErC;AACA;AACA,+BAA+B;AAC/B;AACA;;AAEA,qCAAqC;AACrC;;AAEA;AACA;;AAEA;;AAEA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;AAGA;AACA;AACA,wBAAwB;AACxB;AACA;AACA;AACA;AACA;AACA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,qBAAqB,cAAc;;AAEnC;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA,mCAAmC;AACnC;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA,sBAAsB,mCAAmC;;AAEzD;AACA;AACA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;;;AAGA;;;;;;;;;;;;;AC5nBA;;;AAGA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA,QAAQ,WAAW;AACnB;;AAEA,QAAQ,MAAM;AACd;;AAEA;AACA;AACA;;AAEA;AACA;AACA,iCAAiC,SAAS;AAC1C;AACA;AACA;;AAEA;;AAEA;;AAEA,mDAAmD,EAAE;;AAErD;AACA;;AAEA;;AAEA,yBAAyB,EAAE,cAAc,EAAE,kCAAkC,IAAI;;AAEjF;;AAEA;;AAEA;;AAEA;AACA;AACA;AACA,kEAAkE;AAClE;AACA;AACA,cAAc,2BAA2B,QAAQ;AACjD;AACA;AACA;AACA,eAAe,IAAI;AACnB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;;AAEA,UAAU;;AAEV;;AAEA,qBAAqB,KAAK;;AAE1B;AACA;;AAEA;;AAEA;AACA;AACA;AACA;AACA,+BAA+B,KAAK;AACpC;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,kDAAkD;AAClD;AACA,8EAA8E,KAAK;AACnF;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;;AAEA;;AAEA;;AAEA;;AAEA;;AAEA;;AAEA;;AAEA;;AAEA;;AAEA;;AAEA;;AAEA;;;AAGA;AACA;;AAEA;AACA;;AAEA,6BAA6B,IAAI;;AAEjC;;AAEA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;;;;;;;;;;;;;AChLA;;;AAGA;;;;;;;;;;;;;ACHA,wBAAwB;AACxB;AACA;;AAEA;AACA;;;;;;;;;;;;;ACLA;AACA;;AAEA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;;;;;;;ACtEA;;AAEA;;AAEA;;AAEA;AACA;AACA;;AAEA;;AAEA;;AAEA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;;;;;;;;;;;;;AC3BA;AACA;AACA;;;AAGA,sBAAsB,4CAA4C;;AAElE,wBAAwB,0CAA0C;;AAElE;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA,kBAAkB,QAAQ;;AAE1B;AACA;AACA;;AAEA;AACA;AACA,KAAK;AACL,GAAG;;AAEH;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;AACA,mCAAmC,cAAc;AACjD;AACA,mCAAmC,cAAc;AACjD,2DAA2D,cAAc;AACzE;AACA,+BAA+B,cAAc;AAC7C,mBAAmB,cAAc;AACjC,+BAA+B,cAAc;AAC7C,+BAA+B,cAAc;AAC7C;AACA,qBAAqB,cAAc;AACnC;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;;AAGA,8CAA8C,cAAc,EAAE;AAC9D,wCAAwC,KAAK,EAAE;AAC/C;;AAEA,8CAA8C,IAAI,OAAO,IAAI;;AAE7D;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA,6BAA6B,YAAY;;AAEzC;AACA,CAAC;;AAED;AACA,8BAA8B,YAAY;AAC1C;AACA;;AAEA;AACA,sDAAsD,YAAY;;AAElE;AACA,kBAAkB,gBAAgB;AAClC;AACA,GAAG;AACH;;AAEA;;AAEA;AACA;AACA;AACA,aAAa;AACb,YAAY;AACZ,YAAY;AACZ,cAAc;AACd;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;;AAEA,wCAAwC;;AAExC;AACA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA,yCAAyC,aAAa;AACtD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;;;AAGA;AACA;AACA,oDAAoD,oCAAoC,MAAM;AAC9F;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA,iBAAiB;AACjB;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;;;;;;;AClRA;AACA;;;AAGA;AACA;AACA;;;;;;;;;;;;;ACNA;AACA;AACA;;;AAGA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA,oDAAoD,eAAe;AACnE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA,yBAAyB,OAAO;;AAEhC;AACA;AACA;;AAEA,wBAAwB,OAAO;;AAE/B;AACA,uCAAuC,OAAO;;AAE9C;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA,wBAAwB,OAAO;AAC/B;AACA;;AAEA;AACA;;AAEA,sBAAsB,eAAe;AACrC,oBAAoB,eAAe;;AAEnC;AACA;AACA;AACA;AACA;AACA;;;;;;;;;;;;;AC/EA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO;AACP;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;;;;;;;;;;;;AC/CA;AACA;AACA;;;AAGA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,mBAAmB,eAAe;;AAElC;;AAEA,sFAAsF,eAAe;;AAErG;;AAEA;AACA,wBAAwB,eAAe;;AAEvC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;AACL;AACA,KAAK;AACL;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;;;;;;;;;;;;ACpDA;;AAEA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;AAGA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA,qDAAqD;;AAErD;AACA;AACA;;AAEA;AACA;;AAEA;;;AAGA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,aAAa;AACpB;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,aAAa;AACpB;AACA;;AAEA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,IAAI;AACJ;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,UAAU;AACV;AACA;AACA,iBAAiB;AACjB;AACA,IAAI;AACJ;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,UAAU;AACV;AACA;AACA;AACA;AACA,IAAI;AACJ;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,oCAAoC,aAAa;AACjD;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;;AAGA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,gCAAgC;;;AAGhC;AACA;;AAEA,gBAAgB,mBAAmB;AACnC;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,qBAAqB,2BAA2B;AAChD,qBAAqB,oBAAoB;AACzC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA,mBAAmB,gFAAgF;AACnG;;AAEA,iBAAiB,gEAAgE;;AAEjF,wBAAwB,2BAA2B;;AAEnD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;AACL;AACA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,6BAA6B,iBAAiB;;AAE9C;AACA;AACA,GAAG;;AAEH;;AAEA,4CAA4C,iCAAiC,EAAE;;AAE/E;AACA;AACA;;AAEA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,6BAA6B,iBAAiB;;AAE9C;AACA;AACA,GAAG;;AAEH;;AAEA,4CAA4C,iCAAiC,EAAE;;AAE/E;AACA;AACA;AACA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,gBAAgB;AAChB;AACA;AACA;AACA;AACA;AACA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,qEAAqE;AACrE;AACA;AACA;AACA;AACA;AACA;;AAEA;;AAEA;;AAEA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,uDAAuD;AACvD;AACA;AACA;AACA;AACA;;AAEA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;;AAGA;;;;;;;;;;;;;ACpkBA;AACA;AACA;AACA;AACA;AACA;;;AAGA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,iBAAiB,mBAAmB;AACpC,iDAAiD,oCAAoC;AACrF;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA,0BAA0B,OAAO;;AAEjC;AACA;AACA,+CAA+C,OAAO;;AAEtD;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA,eAAe,SAAS;AACxB;AACA,eAAe,OAAO;AACtB;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,aAAa,QAAQ;;AAErB;;AAEA;AACA;;;AAGA;;;AAGA;;;;;;;;;;;;;ACzHA;AACA;AACA;AACA;AACA;AACA;AACA;;;AAGA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,iBAAiB,mBAAmB;AACpC;AACA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;;AAEA,+BAA+B,OAAO;AACtC;AACA;AACA;;AAEA;;;AAGA;;;;;;;;;;;;;ACzDA;AACA;AACA;AACA;AACA;AACA;;;AAGA;;;AAGA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;;AAGA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA,aAAa,mBAAmB;AAChC;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,aAAa,oBAAoB;AACjC;AACA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;AAGA;AACA;AACA;AACA;;AAEA;AACA,eAAe,SAAS;AACxB;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,eAAe,OAAO;AACtB;AACA,GAAG;AACH;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,YAAY,aAAa;AACzB;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA,iBAAiB,SAAS;AAC1B;AACA,iBAAiB,OAAO;AACxB;AACA;;AAEA;AACA,6BAA6B,OAAO;AACpC;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;;AAEA,aAAa,SAAS;AACtB;AACA;AACA;;;AAGA;;;AAGA;;;;;;;;;;;;;AChLA;;AAEA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA,iCAAiC,WAAW;AAC5C;AACA;;AAEA;AACA,GAAG;;AAEH;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;;;;;;;AC/EA;;AAEA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA,iCAAiC,WAAW;AAC5C;AACA;;AAEA;AACA,GAAG;;AAEH;;AAEA,YAAY;AACZ,aAAa;AACb;AACA;AACA;;;;;;;;;;;;;ACxCA;AACA;;AAEA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA,iCAAiC,WAAW;AAC5C;AACA;;AAEA;AACA,GAAG;;AAEH;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;AACA;AACA;AACA;AACA,KAAK;;AAEL;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;;;;;;;AC7DA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;AAGA;AACA;AACA;;;AAGA;;AAEA;;;AAGA;AACA;;AAEA;AACA;AACA;AACA;;;AAGA;AACA;;AAEA;AACA;AACA;AACA;;;AAGA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA,GAAG;AACH;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA,KAAK;AACL;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;;AAGA;AACA;AACA;AACA;;;AAGA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;;;AAGA;AACA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,mDAAmD,cAAc;AACjE,mDAAmD,eAAe;AAClE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,wBAAwB;AACxB;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,qBAAqB,WAAW;;AAEhC;;AAEA,qCAAqC,OAAO;AAC5C;AACA;;AAEA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,sCAAsC,SAAS;AAC/C;;AAEA;AACA;AACA,KAAK;AACL;AACA;AACA;;AAEA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,sCAAsC,SAAS;AAC/C;AACA;AACA,KAAK;AACL;AACA;AACA;;AAEA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,kCAAkC,SAAS;AAC3C;;AAEA;AACA;AACA,KAAK;AACL;AACA,KAAK;AACL;AACA;AACA;;AAEA;AACA;;AAEA;;;;;;;;;;;;;AC9UA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;;AAGA;AACA;AACA;AACA,iBAAiB,2BAA2B;AAC5C;AACA;AACA;AACA;AACA;AACA;;;AAGA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA,wBAAwB,QAAQ;;AAEhC;AACA;AACA;AACA;AACA,KAAK;AACL,GAAG;;AAEH;;AAEA;AACA;AACA;AACA,0BAA0B,QAAQ;;AAElC,iDAAiD,QAAQ;;AAEzD;AACA,KAAK;AACL,GAAG;AACH;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,IAAI;AACJ;AACA;AACA;AACA;AACA;;AAEA,qBAAqB,mDAAmD;;AAExE;AACA;AACA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,IAAI;AACJ;AACA;AACA;AACA;AACA;;AAEA,qBAAqB,yDAAyD;;AAE9E;AACA;AACA;AACA;AACA;AACA,GAAG;;AAEH;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,IAAI;AACJ;AACA;AACA;AACA;AACA;;AAEA,qBAAqB,wDAAwD;;AAE7E;AACA;AACA;AACA;AACA;AACA,GAAG;;AAEH;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,IAAI;AACJ;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA,GAAG;;AAEH;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,6BAA6B,iBAAiB;;AAE9C;;AAEA;AACA;AACA;;AAEA;AACA,0BAA0B,QAAQ;AAClC;AACA;AACA;AACA;AACA,GAAG;;AAEH;AACA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,6BAA6B,iBAAiB;;AAE9C,0CAA0C,sBAAsB,EAAE;;AAElE;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,6BAA6B,iBAAiB;;AAE9C;;AAEA;AACA;AACA;;AAEA;AACA,0BAA0B,QAAQ;AAClC;AACA;AACA;AACA;AACA,GAAG;;AAEH;AACA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;;;;;;;;;;;;;AC/VA;;AAEA;;AAEA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA,uDAAuD,cAAc;;AAErE;AACA,oDAAoD,cAAc;;AAElE;AACA;AACA,eAAe,aAAa;;AAE5B;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,GAAG;AACH;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;AACL;AACA;AACA;AACA;AACA;AACA,GAAG;AACH;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA,OAAO;AACP;AACA;AACA,KAAK;AACL;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;;AAEA;AACA;;AAEA;AACA;;AAEA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,gCAAgC,oBAAoB;AACpD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO;AACP;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA,OAAO;AACP;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA,WAAW;AACX;AACA;AACA,SAAS;AACT;AACA;;AAEA;AACA;;AAEA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA,wBAAwB,OAAO;;AAE/B;AACA;AACA,2CAA2C,OAAO;AAClD;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA,6BAA6B;AAC7B;AACA,aAAa,sBAAsB;AACnC;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;;;;;;;;;;;;AC5RA;;AAEA;;;AAGA;AACA;;AAEA,sDAAsD,cAAc;;AAEpE;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;;AAEA;AACA;;;;;;;;;;;;;ACjCA;;AAEA;;;AAGA;AACA;AACA;AACA;AACA;;AAEA;AACA,uDAAuD,cAAc;;AAErE,sBAAsB,cAAc;;AAEpC;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;;AAEA,gBAAgB,cAAc;;AAE9B;AACA;;AAEA,yDAAyD,cAAc;;AAEvE;AACA,eAAe,aAAa;;AAE5B;AACA;;AAEA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA,+CAA+C,UAAU;;AAEzD;AACA;AACA;AACA;;AAEA;;AAEA;AACA,0BAA0B,UAAU;;AAEpC;AACA;;AAEA,oBAAoB,UAAU;;AAE9B;AACA;AACA;AACA;;AAEA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;;;;;;;;;;;;;AC7FA;;AAEA;;AAEA;;;AAGA;AACA;AACA;AACA;;AAEA;AACA,uDAAuD,cAAc;;AAErE;;AAEA,yCAAyC,cAAc;;AAEvD;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,iDAAiD,cAAc;;AAE/D,eAAe,aAAa;;AAE5B;;AAEA;AACA,4CAA4C;AAC5C;AACA;AACA;;AAEA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;;;;;;;;;;;;ACtDA;;AAEA;;AAEA;;;AAGA;AACA;AACA;AACA;;AAEA;AACA,uDAAuD,cAAc;;AAErE;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;AACA,wCAAwC,cAAc;AACtD,wBAAwB,OAAO;AAC/B;;AAEA,gBAAgB,cAAc;;AAE9B,eAAe,aAAa;;AAE5B;;AAEA;AACA;AACA;;AAEA;AACA;;;;;;;;;;;;;AC5CA;;AAEA;;;AAGA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;AAGA;AACA;AACA;AACA;;AAEA;AACA,uDAAuD,cAAc;;AAErE,+BAA+B,cAAc;;AAE7C,kDAAkD,cAAc;;AAEhE;;AAEA,aAAa,2BAA2B;AACxC,8CAA8C,OAAO;AACrD;;AAEA,oCAAoC,cAAc;;AAElD;AACA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;AACA,UAAU,oBAAoB;AAC9B,qDAAqD,OAAO;;AAE5D;AACA;AACA;;AAEA;AACA,oCAAoC,YAAY;AAChD;AACA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;;AAEA;AACA;;;;;;;;;;;;;ACzEA;;AAEA;;;AAGA;AACA;AACA;AACA;;AAEA;AACA,uDAAuD,cAAc;;AAErE;AACA,iCAAiC;;AAEjC;AACA,QAAQ,gDAAgD;AACxD;AACA;AACA,uDAAuD,UAAU;;AAEjE;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA,qCAAqC,UAAU;;AAE/C;AACA;AACA,2CAA2C,OAAO;AAClD;AACA;AACA;AACA;AACA;AACA,oBAAoB,OAAO;AAC3B;;AAEA;AACA;AACA;AACA;;AAEA;;AAEA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;;AAEA;AACA;;;;;;;;;;;;;AClFA;;AAEA;;AAEA;;;AAGA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA,uBAAuB,WAAW;;AAElC;;AAEA,6CAA6C,WAAW;;AAExD,SAAS;AACT;AACA,qBAAqB,WAAW;;AAEhC;;AAEA;;AAEA;AACA;AACA,8BAA8B,WAAW;;AAEzC;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;;;AAGA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA,gDAAgD,OAAO;AACvD;AACA;AACA;AACA;AACA;AACA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA,uDAAuD,cAAc;;AAErE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA,GAAG;AACH;;AAEA,GAAG;AACH;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA,eAAe,aAAa;;AAE5B;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA,GAAG;AACH;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA;;AAEA;AACA;;AAEA;AACA;AACA,OAAO;AACP;AACA,OAAO;AACP;AACA;;AAEA;AACA;;AAEA;;AAEA;AACA;AACA;AACA,KAAK;AACL;AACA;;AAEA;AACA;AACA,gCAAgC,uBAAuB;;AAEvD;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;AACL;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA,8BAA8B,OAAO;;AAErC;AACA;AACA;AACA,mDAAmD,OAAO;;AAE1D;AACA;AACA,2CAA2C,OAAO;AAClD;AACA;AACA;AACA;AACA;AACA,oBAAoB,OAAO;;AAE3B;AACA;AACA;AACA,+BAA+B,OAAO;AACtC,KAAK;AACL;AACA,+BAA+B,OAAO;AACtC;;AAEA,sEAAsE,OAAO;AAC7E;;AAEA;AACA;AACA;AACA,GAAG;AACH;AACA;AACA;;AAEA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;;;;;;;;;;;;;AC/UA;;AAEA;;;AAGA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA,QAAQ,gDAAgD;AACxD;AACA;AACA,uDAAuD,UAAU;;AAEjE;AACA,qCAAqC,UAAU;;AAE/C;AACA;AACA,2CAA2C,OAAO;AAClD;AACA;AACA;AACA;AACA;AACA,oBAAoB,OAAO;AAC3B;;AAEA;;AAEA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;;AAEA;;AAEA;AACA;;;;;;;;;;;;;ACnDA;;;AAGA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA,uDAAuD,cAAc;;AAErE,kDAAkD,cAAc;;AAEhE;AACA;AACA;AACA;AACA;AACA,4BAA4B,cAAc;AAC1C,0DAA0D,cAAc;AACxE;AACA;AACA;;AAEA;;AAEA;AACA;;AAEA;AACA;;AAEA,QAAQ,gDAAgD;AACxD;AACA;AACA,uDAAuD,UAAU;;AAEjE;AACA,qCAAqC,UAAU;;AAE/C;AACA;AACA,2CAA2C,OAAO;AAClD;AACA;AACA;AACA;AACA;AACA,oBAAoB,OAAO;AAC3B;;AAEA;AACA;;AAEA,eAAe,WAAW;AAC1B;AACA;AACA;AACA,KAAK;AACL;AACA;AACA,KAAK;AACL;AACA,KAAK;AACL;AACA;AACA;AACA;AACA;AACA;;AAEA,qEAAqE,cAAc;;AAEnF;AACA;AACA,0BAA0B,WAAW;AACrC;AACA;AACA;AACA,KAAK;AACL;AACA,KAAK;AACL;AACA;AACA;;AAEA;AACA;AACA;AACA,gBAAgB,cAAc;;AAE9B;AACA,qCAAqC,cAAc;;AAEnD;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA,QAAQ,WAAW;AACnB;AACA;AACA;AACA,KAAK;AACL;AACA,KAAK;AACL;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,GAAG;AACH;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA,uBAAuB,OAAO;AAC9B;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,2BAA2B,OAAO;AAClC;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA,eAAe,aAAa;;AAE5B;AACA;AACA;AACA;AACA,mCAAmC;AACnC;;AAEA;;AAEA;AACA;AACA;;;;;;;;;;;;;ACrMA;;AAEA;;AAEA;AACA;;;AAGA;AACA;;AAEA;;AAEA;AACA;;AAEA;;AAEA;AACA;AACA;;AAEA;;AAEA,mBAAmB;AACnB,mBAAmB;AACnB,mBAAmB;AACnB,mBAAmB;;AAEnB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA,sBAAsB;AACtB;AACA,sBAAsB;AACtB,sBAAsB;AACtB,0BAA0B;AAC1B,uBAAuB;;AAEvB;AACA;AACA;;AAEA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;;AAEA,yDAAyD,WAAW;AACpE;;AAEA;AACA;AACA;;AAEA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,OAAO;AACP;AACA;AACA;;AAEA;AACA,wBAAwB,OAAO;AAC/B;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA,wCAAwC;AACxC;;AAEA;AACA;AACA;AACA;AACA;;AAEA,oBAAoB,cAAc;AAClC;AACA,oBAAoB,cAAc;;AAElC;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA,8BAA8B,YAAY;AAC1C;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA,iCAAiC,WAAW;AAC5C;AACA,uBAAuB,OAAO;AAC9B;AACA;AACA;;AAEA;AACA;AACA,mBAAmB,YAAY;;AAE/B;AACA,+CAA+C,gBAAgB;AAC/D;AACA;AACA;;AAEA;AACA;AACA,iCAAiC,WAAW;AAC5C,4CAA4C,OAAO;AACnD;AACA;AACA;;AAEA;AACA;AACA,mBAAmB,YAAY;;AAE/B;AACA,8CAA8C,gBAAgB;AAC9D;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;;AAEA,aAAa,YAAY;AACzB;AACA;;AAEA;AACA;AACA;AACA,KAAK;AACL;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA,OAAO;AACP;AACA;AACA,OAAO;AACP;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA,KAAK;AACL;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;;AAGA;;;;;;;;;;;;;ACrOA;;AAEA;;AAEA;;;AAGA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO;AACP;AACA;AACA;AACA,KAAK;AACL;AACA;AACA;;AAEA;AACA;AACA,KAAK;AACL;AACA;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;;AAEA;AACA;;;AAGA;AACA;AACA;;AAEA;AACA,gCAAgC,cAAc;;AAE9C;;AAEA,iDAAiD,cAAc;;AAE/D;AACA,sDAAsD,cAAc;;AAEpE;AACA;AACA;;AAEA;AACA,sCAAsC,cAAc;;AAEpD;AACA,uEAAuE,cAAc;;AAErF;AACA;;AAEA,yFAAyF,cAAc;;AAEvG;AACA;;AAEA;;AAEA;AACA;AACA,aAAa,oBAAoB;AACjC;AACA;AACA;AACA;AACA;AACA;AACA,OAAO;AACP;AACA;AACA;;AAEA,8BAA8B,cAAc;AAC5C;AACA;AACA,KAAK;AACL;AACA,KAAK;AACL;AACA;AACA;;AAEA;AACA,qCAAqC,cAAc;AACnD,uDAAuD,cAAc;AACrE;;AAEA;AACA;AACA;AACA,oCAAoC,cAAc;;AAElD,eAAe,aAAa;;AAE5B;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA,aAAa,oBAAoB;AACjC;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA,gCAAgC,oBAAoB;AACpD,mDAAmD,OAAO;;AAE1D;AACA,uCAAuC,OAAO;AAC9C,wDAAwD,OAAO;AAC/D;;AAEA;AACA,eAAe,iBAAiB;AAChC;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;;;;;;;;;;;;ACnMA;;;AAGA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,GAAG;AACH;AACA;AACA;;;;;;;;;;;;;ACfA;;AAEA;AACA;;AAEA;AACA,gCAAgC,OAAO;AACvC;AACA;AACA;AACA;AACA;AACA;;;;;;;;;;;;;ACZA;AACA;AACA;AACA;AACA;;;AAGA;;;AAGA;AACA;AACA;AACA;AACA;AACA;;;AAGA;AACA;AACA;AACA;AACA;;AAEA,kCAAkC,QAAQ;;AAE1C,qCAAqC,OAAO;AAC5C;AACA;AACA;AACA;;AAEA;;AAEA;;AAEA;AACA;AACA,+BAA+B,QAAQ;AACvC;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,8BAA8B,UAAU;;AAExC;;AAEA;AACA;;AAEA;AACA;AACA;AACA;;AAEA,oBAAoB,mBAAmB;;AAEvC;AACA;AACA,gDAAgD,UAAU;;AAE1D;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,WAAW;AACX;AACA,WAAW;AACX;AACA;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;;;;;;;;;;;;ACpIA;;AAEA;;;AAGA;AACA;;;AAGA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;;;;;;;;;;;;ACnBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,eAAe;AACf;AACA;;AAEA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;;AAEA,mCAAmC,QAAQ;AAC3C;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA,mCAAmC,QAAQ;AAC3C;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,iCAAiC,GAAG;AACpC,qCAAqC,GAAG,yBAAyB,GAAG;AACpE;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;;AAGA;AACA;;AAEA,sCAAsC,QAAQ;;AAE9C,wCAAwC,aAAa;;AAErD,iDAAiD,UAAU;;AAE3D;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;;;;;;;;;;;;;AC1GA;AACA;AACA;;;AAGA;AACA;AACA;;AAEA;AACA;AACA,0BAA0B;;;AAG1B;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;;AAEA,aAAa,mBAAmB;AAChC;;AAEA;;AAEA,8BAA8B,QAAQ;AACtC,wCAAwC,OAAO;AAC/C;AACA;;AAEA,gCAAgC,UAAU;;AAE1C;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA,eAAe,OAAO;;AAEtB;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA,OAAO;AACP,uBAAuB,QAAQ;AAC/B,sFAAsF;AACtF;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA,OAAO;AACP,uBAAuB,mBAAmB;AAC1C,sFAAsF;AACtF;;AAEA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;AACA,OAAO;AACP;AACA;AACA;AACA;;AAEA;AACA;AACA,OAAO;AACP;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA,kCAAkC,QAAQ;AAC1C;AACA,2CAA2C,OAAO;AAClD;AACA;;AAEA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA,mCAAmC,6BAA6B;;AAEhE;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,OAAO;AACP;AACA;AACA;AACA;AACA;;;AAGA;AACA;AACA;;AAEA,sCAAsC,QAAQ;;AAE9C,wCAAwC,aAAa;;AAErD;AACA;AACA;AACA;;AAEA;AACA;AACA;;;;;;;;;;;;;AClMA;AACA;AACA;;AAEA;;;AAGA;AACA;AACA;AACA;AACA;AACA,eAAe;AACf;;AAEA;AACA;;;AAGA;;;;;;;;;;;;;ACnBA;;AAEA;;;AAGA;AACA,iDAAiD,EAAE,gCAAgC,KAAK,6CAA6C,KAAK;AAC1I,8CAA8C,KAAK;;;AAGnD;AACA;AACA;;AAEA,kDAAkD,cAAc;;AAEhE;;AAEA,8BAA8B,cAAc;;AAE5C;AACA;;AAEA;AACA;AACA,0CAA0C,cAAc;;AAExD;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA,0CAA0C,cAAc;;AAExD;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;;;;;;;;;;;;;ACvEA;;AAEA;;AAEA;AACA;AACA;AACA;;AAEA,2BAA2B,cAAc;;AAEzC;AACA;AACA;;AAEA,kEAAkE,OAAO;;AAEzE;;AAEA;;AAEA;AACA;;AAEA,8EAA8E,YAAY;;AAE1F;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,gBAAgB,yBAAyB;AACzC;AACA;AACA;;;;;;;;;;;;;AC1CA;AACA;AACA;;;AAGA;AACA;AACA;AACA;;AAEA,aAAa,SAAS;AACtB;;AAEA,2BAA2B,UAAU;;AAErC;;AAEA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;;;;;;;;;;;;AC3CA;AACA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;;AAEA,eAAe,cAAc;;AAE7B,2DAA2D,cAAc;;AAEzE;;AAEA,aAAa,oBAAoB;AACjC;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA,KAAK;AACL;;AAEA;;AAEA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,mBAAmB,QAAQ;AAC3B;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;;;;;;;AC9HA,+BAA+B,QAAQ,QAAQ;;AAE/C;;AAEA;AACA;AACA;AACA;;;AAGA,mCAAmC,IAAI,OAAO,IAAI,GAAG;AACrD,mCAAmC,KAAK,EAAE;;;AAG1C;AACA;;AAEA,kDAAkD,cAAc;;AAEhE;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;AACL;AACA;AACA;AACA,wBAAwB,qCAAqC;AAC7D;AACA;AACA;AACA;AACA;AACA;;AAEA,gBAAgB,sBAAsB;AACtC;AACA;AACA;;;;;;;;;;;;;AC/CA;;AAEA;;AAEA;;AAEA;;AAEA,eAAe,SAAS,OAAO,iBAAiB;;AAEhD,oBAAoB,WAAW,EAAE;AACjC,oCAAoC,+BAA+B,EAAE;;;AAGrE;AACA;;AAEA,kDAAkD,cAAc;;AAEhE;;AAEA;AACA;;AAEA;AACA,oBAAoB,iCAAiC;AACrD;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA,2BAA2B,OAAO;AAClC;AACA;;AAEA;AACA;AACA;AACA;;AAEA,gBAAgB,uBAAuB;AACvC;AACA;AACA;;;;;;;;;;;;;ACnDA;;AAEA;;;AAGA;;;AAGA;AACA;AACA,qBAAqB;AACrB;AACA;;;AAGA;AACA;AACA;;AAEA,+BAA+B,cAAc;;AAE7C;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA,eAAe,cAAc;;AAE7B;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;;;;;;;AC9CA;;AAEA;;AAEA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,wDAAwD,cAAc;AACtE,4DAA4D,cAAc;;AAE1E;AACA;;AAEA;AACA,qBAAqB,cAAc;;AAEnC;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA,UAAU,WAAW;AACrB;AACA,4CAA4C,OAAO;AACnD;AACA,qBAAqB,cAAc;;AAEnC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO;AACP;AACA;AACA;;AAEA;AACA;AACA;AACA,UAAU,WAAW;AACrB;AACA,4CAA4C,OAAO;AACnD;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA,YAAY,WAAW;AACvB;AACA,8CAA8C,OAAO;AACrD;AACA,KAAK;AACL;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA,GAAG;AACH;AACA;AACA;AACA,sDAAsD,cAAc;;AAEpE;AACA;AACA;AACA;AACA;AACA,OAAO;AACP;AACA;AACA,KAAK;AACL;AACA;;AAEA;AACA;AACA,iBAAiB,+CAA+C;;AAEhE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;;;;;;;;;;;;ACvJA;;AAEA;;AAEA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,wDAAwD,cAAc;;AAEtE;AACA;;AAEA;AACA,qBAAqB,cAAc;;AAEnC;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA,UAAU,WAAW;AACrB;AACA,4CAA4C,OAAO;AACnD;AACA,qBAAqB,cAAc;;AAEnC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO;AACP;AACA;AACA;;AAEA;AACA;AACA;AACA,UAAU,WAAW;AACrB;AACA,4CAA4C,OAAO;AACnD;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA,YAAY,WAAW;AACvB;AACA,8CAA8C,OAAO;AACrD;AACA,KAAK;AACL;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA,sDAAsD,cAAc;;AAEpE;AACA;AACA;AACA;AACA;AACA,OAAO;AACP;AACA;AACA,KAAK;AACL;AACA;;AAEA;AACA;AACA,iBAAiB,+CAA+C;;AAEhE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;;;;;;;;;;;;;ACrJA;;AAEA;;AAEA;;;AAGA;AACA;;AAEA,mDAAmD,cAAc;;AAEjE;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO;AACP;AACA;AACA;;AAEA,KAAK;AACL;AACA;AACA;;AAEA;;AAEA;AACA,2DAA2D,OAAO;;AAElE;AACA;AACA;;;;;;;;;;;;;ACzCA;;AAEA;;;AAGA;AACA;AACA;AACA;;;AAGA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA,kBAAkB,mBAAmB,aAAa;AAClD;;AAEA,uBAAuB;AACvB;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;;AAEA,oBAAoB,cAAc;AAClC;AACA,oBAAoB,cAAc;;AAElC;AACA;AACA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA,4DAA4D,OAAO;;AAEnE;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;AACA,GAAG;AACH;AACA;AACA;AACA;;AAEA;AACA;AACA,GAAG;AACH;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA,GAAG;AACH;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;;AAGA;AACA;;;AAGA;;;;;;;;;;;;;ACjIA;AACA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;;AAEA,eAAe,cAAc;;AAE7B,+BAA+B,cAAc;;AAE7C;AACA;AACA;;AAEA,gBAAgB,cAAc;;AAE9B;AACA;AACA;AACA;AACA;;AAEA,aAAa,SAAS;AACtB;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;AACL;;AAEA;;AAEA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,aAAa,SAAS;AACtB;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;;;;;;;ACpHA;AACA;;AAEA;;;AAGA;AACA,MAAM;;AAEN,oDAAoD,oCAAoC,MAAM;;AAE9F;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB;AACjB,iBAAiB;AACjB;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA,0BAA0B,cAAc;;AAExC,gBAAgB,kDAAkD;;AAElE;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA,gDAAgD;;AAEhD;AACA;AACA;;AAEA;AACA,kBAAkB,cAAc;;AAEhC;AACA;AACA,kBAAkB,uCAAuC;AACzD;AACA;AACA;;AAEA,gBAAgB,kDAAkD;;AAElE;;AAEA;AACA,EAAE;;;;;;;;;;;;;ACxFF;AACA;AACA;;;AAGA;AACA;AACA;AACA;AACA;;AAEA,uBAAuB,YAAY;AACnC;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA,KAAK;AACL,0BAA0B,6BAA6B;;AAEvD;AACA;AACA;;AAEA;AACA;AACA;AACA;;;;;;;;;;;;;AChCA;;AAEA;;;AAGA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA,8BAA8B,SAAS;AACvC;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,oBAAoB,WAAW;;AAE/B;;AAEA,iCAAiC,SAAS;AAC1C,+BAA+B,UAAU;AACzC;AACA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,GAAG;AACH;AACA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA,GAAG;AACH;AACA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA,GAAG;AACH;AACA;AACA;;;AAGA;;;;;;;;;;;;;;ACnMA;;;AAGA;;AAEA;;AAEA;AACA;AACA,cAAc,cAAc;;AAE5B;;AAEA,aAAa,SAAS;AACtB;AACA;AACA;;AAEA,aAAa,oBAAoB;AACjC;AACA;AACA;;AAEA;AACA;;;AAGA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;;AAEA,oCAAoC,EAAE;AACtC;AACA;;AAEA,+BAA+B,OAAO;AACtC;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA,WAAW;AACX;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA,WAAW;AACX;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA,WAAW;AACX;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA,GAAG;AACH;;;AAGA,0BAA0B;AAC1B;;;AAGA;;;;;;;;;;;;;;ACxHA;;;AAGA;;;AAGA;AACA;AACA;AACA;AACA;AACA,cAAc,cAAc;;AAE5B;;AAEA,aAAa,SAAS;AACtB;;AAEA;AACA;AACA;AACA,KAAK;AACL;AACA;AACA;;AAEA,aAAa,oBAAoB;AACjC;AACA;;AAEA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;;AAEA,gCAAgC,OAAO;AACvC;;AAEA;AACA,qBAAqB,EAAE;AACvB;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA,0BAA0B;AAC1B;;;AAGA;;;;;;;;;;;;;;AChGA;;;AAGA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA,GAAG;AACH;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;;;;;;;;;;;;;ACxBA;;;AAGA;AACA;AACA;AACA;;;;;;;;;;;;;ACNA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA;AACA,iBAAiB,KAAK;;AAEtB;AACA;AACA;AACA;AACA;AACA;AACA,sCAAsC;AACtC;AACA;AACA,2CAA2C,KAAK;AAChD,0CAA0C,KAAK;AAC/C;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;AACL;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA,kCAAkC,YAAY;;AAE9C;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA,oCAAoC;AACpC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA,eAAe,4BAA4B;AAC3C;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;AACL;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA,eAAe,yBAAyB;AACxC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,oCAAoC,WAAW;AAC/C;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA,uCAAuC,OAAO;AAC9C;AACA,oBAAoB,UAAU;AAC9B;AACA;AACA,0CAA0C,OAAO;AACjD;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa,sBAAsB;AACnC;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa,sBAAsB;AACnC;;AAEA;;;;;;;;;;;;ACvTA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,gBAAgB;AAChB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,6E;;;;;;;;;;;AC7QA;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA,4FAA4F;AAC5F,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACvED;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACzDD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACzDD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;AACL;AACA,KAAK;AACL;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;AACL;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;AACL;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACxHD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACzDD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;AACL;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACtGD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACzDD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;AACL;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;AACL;AACA,KAAK;AACL;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;AACL;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;AACL;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACrID;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA,+BAA+B;AAC/B;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACvGD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AClID;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACxFD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACxDD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;AACL;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACrHD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;AACL;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACrHD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC1GD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA,iBAAiB;AACjB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA,iBAAiB;AACjB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA,iBAAiB;AACjB;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA,iBAAiB;AACjB;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA,iBAAiB;AACjB;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACrJD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA;AACA,aAAa;AACb;AACA;AACA,aAAa;AACb;AACA;AACA,aAAa;AACb;AACA;AACA,aAAa;AACb;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACtFD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA,uBAAuB,QAAQ;AAC/B;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA,uBAAuB,QAAQ;AAC/B;AACA;AACA;AACA,SAAS;AACT;AACA;AACA,uBAAuB,QAAQ;AAC/B;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,qCAAqC,IAAI;AACzC;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACjLD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC7DD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,mCAAmC;AACnC,iBAAiB;AACjB;AACA;AACA,aAAa;AACb;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC9ED;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC1DD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC1ED;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC1ED;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC1ED;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA,SAAS;AACT;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACjGD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;AAE5B;AACA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa,gGAAgG;AAC7G;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA,iCAAiC;AACjC,gCAAgC;AAChC,gCAAgC;AAChC,+BAA+B;AAC/B;AACA;AACA;AACA,yDAAyD;AACzD;AACA,0DAA0D;AAC1D;AACA,aAAa;AACb;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA,qCAAqC;AACrC,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AClGD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACjED;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC7DD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACjED;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACjED;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC5DD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACjED;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACrED;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA;AACA,aAAa;AACb;AACA;AACA,aAAa;AACb;AACA;AACA,aAAa;AACb;AACA;AACA,aAAa;AACb;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,qCAAqC,IAAI;AACzC;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC1FD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA;AACA,aAAa;AACb;AACA;AACA,aAAa;AACb;AACA;AACA,aAAa;AACb;AACA;AACA,aAAa;AACb;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,qCAAqC,IAAI;AACzC;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACjFD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA;AACA,aAAa;AACb;AACA;AACA,aAAa;AACb;AACA;AACA,aAAa;AACb;AACA;AACA,aAAa;AACb;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,qCAAqC,IAAI;AACzC;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC1FD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC9ED;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AChED;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;AACL;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACxGD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC3GD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC1DD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACxED;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC5ED;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACjFD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACzED;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;;AAEA;;AAEA;;AAEA;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,qCAAqC,IAAI;AACzC;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC1ED;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA;AACA,aAAa;AACb;AACA;AACA,aAAa;AACb;AACA;AACA,aAAa;AACb;AACA;AACA,aAAa;AACb;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,qCAAqC,IAAI;AACzC;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC3ED;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,qCAAqC,IAAI;AACzC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACzHD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC1HD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC/FD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;AACL;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC1HD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA,iBAAiB;AACjB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA,iBAAiB;AACjB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA,iBAAiB;AACjB;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA,iBAAiB;AACjB;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA,iBAAiB;AACjB;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACxJD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA,aAAa;AACb;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC5GD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA,aAAa;AACb;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT,oCAAoC,IAAI,IAAI,IAAI;AAChD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC7FD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AChFD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AClID;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,qCAAqC,IAAI;AACzC;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACnED;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA;AACA,aAAa;AACb;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA;AACA,aAAa;AACb;AACA,SAAS;AACT,qCAAqC,IAAI;AACzC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC1FD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AChFD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,8CAA8C,IAAI,IAAI,IAAI;AAC1D;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACvFD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACrFD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;AACL;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,uCAAuC,IAAI;AAC3C;AACA;AACA;AACA;AACA,aAAa;AACb,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC5GD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;AACL;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC5HD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,qCAAqC,IAAI;AACzC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC/ED;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACrFD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,sBAAsB;AACtB,iBAAiB;AACjB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACtID;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,yCAAyC,IAAI;AAC7C;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACpED;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA,SAAS;AACT;AACA;AACA,aAAa;AACb;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACpHD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,4DAA4D;AAC5D;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC/FD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA,gBAAgB;AAChB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC9GD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA,uDAAuD,IAAI;AAC3D,6DAA6D,IAAI;AACjE,4DAA4D,IAAI;AAChE,kEAAkE,IAAI;AACtE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC9DD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACxFD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC/ED;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACtGD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;AACL;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA,gDAAgD;AAChD,+CAA+C;AAC/C,8CAA8C;AAC9C,gDAAgD;AAChD,4CAA4C;AAC5C,6CAA6C;AAC7C,6CAA6C;AAC7C,8CAA8C;AAC9C,8CAA8C;AAC9C,+CAA+C;AAC/C,6CAA6C;AAC7C,+CAA+C;AAC/C;AACA;AACA;AACA;AACA,kDAAkD;AAClD,iDAAiD;AACjD,gDAAgD;AAChD,iDAAiD;AACjD,8CAA8C;AAC9C,+CAA+C;AAC/C,+CAA+C;AAC/C,gDAAgD;AAChD,iDAAiD;AACjD,kDAAkD;AAClD,+CAA+C;AAC/C,gDAAgD;AAChD;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC9JD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AChFD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AChFD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,qCAAqC,IAAI;AACzC;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC1DD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;AACL;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC3FD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC5DD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;AACL;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACzHD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;;AAET;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACrFD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;;AAET;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACrFD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC1DD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;AACL;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC1HD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC5HD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,4CAA4C;AAC5C,aAAa;AACb;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC3DD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,4CAA4C;AAC5C,aAAa;AACb;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC/DD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACzED;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA;AACA,qBAAqB;AACrB;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA;AACA,qBAAqB;AACrB;AACA;AACA;AACA,aAAa;AACb;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACpLD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA,SAAS;AACT;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AChGD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC1DD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACrED;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC1JD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA,iBAAiB;AACjB;AACA,iBAAiB;AACjB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA,iBAAiB;AACjB;AACA,iBAAiB;AACjB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA,iBAAiB;AACjB;AACA,iBAAiB;AACjB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA,iBAAiB;AACjB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA,iBAAiB;AACjB;AACA,iBAAiB;AACjB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA,iBAAiB;AACjB;AACA,iBAAiB;AACjB;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC3KD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AClED;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA,gBAAgB;AAChB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC7GD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA,gBAAgB;AAChB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC7GD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACtFD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACnED;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACzDD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;AACL;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb,SAAS;AACT;AACA;AACA;AACA;AACA;AACA,aAAa;AACb,gCAAgC;AAChC,aAAa;AACb,+BAA+B;AAC/B,aAAa;AACb,kCAAkC;AAClC,aAAa;AACb,kCAAkC;AAClC,aAAa;AACb,+BAA+B;AAC/B,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC/HD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,qCAAqC,IAAI;AACzC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACvFD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACjED;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AClHD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACjED;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC5DD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;;ACvHD,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;AAE5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,uCAAuC;AACvC;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC5FD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;;AAEA,CAAC;;;;;;;;;;;;ACzFD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACxDD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACxDD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;;AAET,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA,SAAS;AACT;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACrHD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACrJD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA,SAAS;AACT;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AChGD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACxDD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACxDD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC7ED;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AClED;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,2CAA2C,IAAI;AAC/C;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC1DD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;AC5GD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;ACrGD;;AAEA,CAAC;AACD,QACA;AACA,YACA;AACA,CAAC,2BAA2B;;;AAG5B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA,CAAC;;;;;;;;;;;;8CCrGD;;AAEA,CAAC;AACD;AACA,aACA;AACA,CAAC,qBAAqB;;AAEtB;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA,mBAAmB,gBAAgB;AACnC;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA,KAAK;AACL;AACA;AACA;;AAEA,2BAA2B,SAAS;AACpC;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA,uBAAuB,6BAA6B;AACpD;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,mBAAmB,SAAS;AAC5B;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,+BAA+B,sBAAsB;AACrD;AACA;AACA;AACA;AACA;AACA;AACA,+CAA+C;AAC/C,qBAAqB;AACrB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,2BAA2B,IAAI;AAC/B;;AAEA;AACA,2BAA2B;AAC3B;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA,iBAAiB;AACjB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,qCAAqC;AACrC;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;AACA,KAAK;AACL;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA,SAAS;;AAET;AACA;;AAEA;;AAEA;AACA;AACA;;AAEA;AACA,4CAA4C,IAAI;;AAEhD;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA,gCAAgC;AAChC;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA,wBAAwB,iCAAiC;AACzD;AACA;AACA;AACA,SAAS;AACT;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,4LAA4L,IAAI;;AAEhM,qEAAqE,IAAI;;AAEzE;;AAEA;;AAEA;AACA;AACA;AACA,8BAA8B;AAC9B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA,0CAA0C,YAAY;AACtD;AACA;AACA,aAAa;AACb;AACA;AACA;;AAEA;AACA;AACA,uBAAuB,YAAY;AACnC;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA,8BAA8B;AAC9B,gCAAgC;AAChC,6BAA6B,EAAE,EAAE;AACjC,6BAA6B,EAAE,EAAE;AACjC,kCAAkC,EAAE,EAAE;AACtC,iCAAiC;AACjC,qCAAqC;AACrC,yCAAyC;AACzC,6BAA6B,IAAI,EAAE;AACnC,6BAA6B,IAAI,EAAE;AACnC,kCAAkC,IAAI,EAAE;;AAExC,+BAA+B;AAC/B,oCAAoC;;AAEpC,8CAA8C;AAC9C,qDAAqD;;AAErD,wCAAwC,IAAI,IAAI;;AAEhD;AACA;AACA,2BAA2B,MAAM,wEAAwE,MAAM,mBAAmB,MAAM,qBAAqB,MAAM,EAAE,IAAI;;AAEzK;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA,SAAS;AACT;;AAEA;AACA,8CAA8C;AAC9C;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,mBAAmB,kBAAkB;AACrC;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA,SAAS;AACT;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;AACA,KAAK;;AAEL;AACA;AACA,KAAK;;AAEL;AACA;AACA;;AAEA;;AAEA;;AAEA;;AAEA;;AAEA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA,KAAK;AACL;AACA;AACA,KAAK;AACL;AACA;AACA,KAAK;;AAEL;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;;AAEA;;AAEA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;;AAGA;AACA;AACA;AACA;AACA,2BAA2B,wBAAwB;AACnD;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;;AAEA;AACA;AACA,KAAK;AACL;AACA;AACA;AACA,uBAAuB,iBAAiB;AACxC;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;AACA,KAAK;;AAEL;AACA;AACA,KAAK;;AAEL;AACA;AACA,KAAK;;AAEL;;AAEA;;AAEA;;AAEA;;AAEA;;AAEA;AACA;AACA;AACA;AACA,KAAK;AACL;AACA;AACA,KAAK;;AAEL;AACA;AACA,KAAK;;AAEL;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA,KAAK;;AAEL;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,uBAAuB,QAAQ;AAC/B;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA,mBAAmB,QAAQ;AAC3B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA;AACA;;AAEA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA,mBAAmB,QAAQ;AAC3B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,mBAAmB,QAAQ;AAC3B;AACA;AACA;AACA,mBAAmB,QAAQ;AAC3B;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA,SAAS;AACT;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA,SAAS;AACT;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;;AAEA;;AAEA;AACA;;AAEA;;AAEA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA,KAAK;;AAEL;;AAEA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;;AAEA;;AAEA;AACA;AACA,KAAK;;AAEL;AACA;AACA,KAAK;;AAEL;AACA;AACA,KAAK;;AAEL;AACA;;AAEA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA,KAAK;AACL;AACA;AACA,KAAK;AACL;AACA;AACA,KAAK;;AAEL;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA,KAAK;;AAEL;AACA;AACA,KAAK;;AAEL;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA,uBAAuB,OAAO;AAC9B;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA,aAAa;AACb;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA,mBAAmB,OAAO;AAC1B;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA,aAAa;AACb;AACA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;;;AAGA;AACA;AACA;AACA;;AAEA;AACA;AACA,mBAAmB,OAAO;AAC1B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,mBAAmB,OAAO;AAC1B;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA,KAAK;;AAEL;AACA;AACA;AACA,KAAK;;AAEL;AACA;AACA,KAAK;;AAEL;AACA;AACA;AACA,KAAK;;AAEL;AACA;AACA;AACA,SAAS;AACT;;AAEA;AACA;;AAEA;;AAEA;;AAEA;AACA;;AAEA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA,KAAK;AACL;AACA;AACA;AACA,KAAK;AACL;AACA;AACA;AACA,KAAK;AACL;AACA;AACA;AACA;AACA;AACA,KAAK;AACL;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;AACL;AACA;AACA;AACA;AACA,KAAK;AACL;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;;;AAGA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;;AAEA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA,iBAAiB;AACjB;AACA;AACA;AACA,qBAAqB;AACrB;AACA;AACA;AACA;AACA;AACA;AACA,yBAAyB;AACzB;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA,iBAAiB;AACjB;;AAEA;AACA;AACA;AACA;;;AAGA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA,mBAAmB,+BAA+B;AAClD;AACA;;AAEA;AACA,cAAc,OAAO;AACrB;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;;AAEA;;AAEA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA,2CAA2C,EAAE,IAAI,EAAE;AACnD,wCAAwC,EAAE,IAAI,EAAE;;AAEhD;;AAEA;AACA,iCAAiC,EAAE;AACnC,2BAA2B,EAAE;AAC7B,6BAA6B,EAAE;AAC/B,2BAA2B,EAAE;AAC7B,yBAAyB,EAAE,IAAI,EAAE;AACjC,wBAAwB,EAAE;AAC1B,+BAA+B,GAAG;AAClC,yBAAyB,EAAE;AAC3B;AACA,2BAA2B,EAAE,IAAI,EAAE;AACnC,0BAA0B,EAAE,IAAI,EAAE;AAClC,wBAAwB,EAAE;AAC1B;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA,4CAA4C,OAAO;AACnD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,gDAAgD,OAAO;AACvD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;;AAEA;AACA,8DAA8D,IAAI,0DAA0D,IAAI,qEAAqE,EAAE;;AAEvM;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA,SAAS;AACT;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA,SAAS;AACT;AACA;;AAEA;AACA;AACA;AACA,SAAS;AACT;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;;AAEA,mBAAmB,mBAAmB;AACtC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;;;AAGA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA,mBAAmB,sBAAsB;AACzC;AACA,sCAAsC;AACtC;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA,SAAS;;AAET;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA;;AAEA;AACA,kCAAkC,gBAAgB;AAClD;;AAEA;AACA;AACA;;AAEA;AACA;AACA,SAAS;AACT;AACA,SAAS;AACT;AACA,SAAS;AACT;AACA,SAAS;AACT;AACA;;AAEA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA,SAAS;AACT;AACA,SAAS;AACT;AACA;AACA,aAAa;AACb;AACA,SAAS;AACT;AACA,SAAS;AACT;AACA;AACA,SAAS;AACT;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,mBAAmB,oBAAoB;AACvC;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA,uBAAuB,qBAAqB;AAC5C;AACA;AACA,iCAAiC;AACjC;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;AACA,mCAAmC;AACnC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;;AAEA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;;AAEA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB;AACjB;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;;AAEA;AACA,SAAS;AACT;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA,aAAa;AACb;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS,6BAA6B;AACtC;AACA,SAAS;AACT;;AAEA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA,mBAAmB;;AAEnB;AACA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;;AAEA;AACA;AACA;AACA,oBAAoB;AACpB;;AAEA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,0BAA0B,cAAc;AACxC;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;;AAEA;;AAEA;;AAEA;AACA,6DAA6D;AAC7D,yDAAyD;AACzD,+DAA+D;AAC/D,wDAAwD,OAAO;AAC/D,wDAAwD,OAAO;AAC/D,uDAAuD,OAAO;AAC9D,mEAAmE,OAAO;AAC1E,qEAAqE,OAAO;AAC5E;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA,mCAAmC,qBAAqB;AACxD,SAAS;AACT;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA,mCAAmC,qBAAqB;AACxD,SAAS;AACT;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA,aAAa;AACb;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA,wBAAwB;AACxB;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;AACA,KAAK;;AAEL;AACA;AACA,KAAK;;AAEL;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;;AAEA;;AAEA;AACA;;;AAGA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA,KAAK;;AAEL;AACA;AACA,KAAK;;AAEL;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;;AAEA;;AAEA;;AAEA;;AAEA;;AAEA;;AAEA;;AAEA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA;AACA;AACA;;AAEA;;AAEA;;AAEA;;AAEA;;AAEA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;AACA;AACA;AACA,KAAK;;AAEL;;AAEA;;AAEA;;AAEA;;AAEA;;AAEA;;AAEA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA;;AAEA;AACA;AACA;AACA;;AAEA;;AAEA;;AAEA;;AAEA;;AAEA;;AAEA;;AAEA;;AAEA;AACA;AACA;;AAEA;;AAEA;;AAEA;;AAEA;;AAEA;;AAEA;;AAEA;;AAEA;;AAEA;;AAEA;AACA;AACA;;AAEA;;AAEA;;AAEA;;AAEA;AACA;AACA,KAAK;;AAEL;AACA;AACA,KAAK;;AAEL;AACA;AACA;AACA,KAAK;AACL;AACA;AACA,KAAK;AACL;AACA;AACA,KAAK;AACL;AACA;AACA,KAAK;AACL;AACA;AACA,KAAK;AACL;AACA;AACA,KAAK;;;AAGL;;AAEA;;AAEA;;AAEA;;AAEA;;AAEA;AACA;AACA;;AAEA;AACA,wBAAwB,mBAAmB;AAC3C;AACA;;AAEA;AACA;AACA;;AAEA,qBAAqB,mBAAmB;AACxC;AACA;AACA;;AAEA;;AAEA;;AAEA;AACA;;AAEA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;;AAEA;AACA;AACA,mBAAmB,QAAQ;AAC3B;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA,SAAS;AACT;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA,mBAAmB,OAAO;AAC1B;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA,oCAAoC,IAAI;AACxC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;;AAEL;;AAEA;AACA;;AAEA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;;AAEA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;;AAEA;;AAEA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;AACA,KAAK;AACL;AACA;AACA,KAAK;;AAEL;;;AAGA;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;;AAEA,CAAC;;;;;;;;;;;;;sDCz5ID;AACA,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA,EAAE;;AAEF;AACA;AACA;AACA;;AAEA;AACA;;AAEA;;AAEA;AACA;AACA;AACA,YAAY,OAAO;AACnB,cAAc,MAAM;AACpB;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA,YAAY,MAAM;AAClB,YAAY,SAAS;AACrB;AACA,cAAc,MAAM;AACpB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA,YAAY,OAAO;AACnB,YAAY,SAAS;AACrB;AACA,cAAc,MAAM;AACpB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,YAAY,OAAO;AACnB,cAAc,MAAM;AACpB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,qCAAqC;AACrC;AACA,KAAK;AACL,4BAA4B;AAC5B;AACA;AACA;AACA;AACA,IAAI;AACJ;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA,YAAY,MAAM;AAClB,cAAc,OAAO;AACrB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,GAAG;AACH;;AAEA;AACA;AACA;AACA;AACA,YAAY,OAAO;AACnB,cAAc,OAAO;AACrB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA,YAAY,OAAO;AACnB,cAAc,OAAO;AACrB;AACA;AACA,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,+BAA+B,mCAAmC;AAClE;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA,YAAY,OAAO;AACnB,cAAc,OAAO;AACrB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA,aAAa,WAAW;AACxB;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA,wBAAwB;;AAExB,yCAAyC,qBAAqB;;AAE9D;AACA;AACA;AACA;AACA;AACA,kCAAkC,oBAAoB;;AAEtD;AACA;AACA;;AAEA;;AAEA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;;AAEA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA,YAAY,OAAO;AACnB,cAAc,OAAO;AACrB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA,aAAa,iBAAiB;AAC9B;AACA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA,0BAA0B,iBAAiB;AAC3C;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA,cAAc,iBAAiB;AAC/B;;AAEA;AACA;AACA;;AAEA;AACA;AACA,8BAA8B,oBAAoB;AAClD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,YAAY,OAAO;AACnB;AACA,cAAc,OAAO;AACrB;AACA;AACA;AACA;AACA;AACA;AACA;AACA,GAAG;AACH;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,YAAY,OAAO;AACnB;AACA,cAAc,OAAO;AACrB;AACA;AACA;AACA;AACA;AACA;AACA;AACA,GAAG;AACH;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,GAAG;AACH;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA,MAEA;AACA;AACA;AACA;AACA,GAAG;AAAA;AACH,EAAE,QAaF;;AAEA,CAAC;;;;;;;;;;;;;ACphBD,mC;;;;;;;;;;;ACAA,8N;;;;;;;;;;;ACAA,6BAA6B,WAAW,EAAE,8vD;;;;;;;;;;;ACA1C,6D;;;;;;;;;;;;ACAA;;AAEA;AACA;AACA;AACA;AACA;;;;;;;;;;;;ACNA,iJ;;;;;;;;;;;ACAA;;AAEA;AACA;AACA;AACA,CAAC;;AAED;AACA;AACA;AACA,CAAC;AACD;AACA;AACA;;AAEA;AACA;AACA,4CAA4C;;AAE5C;;;;;;;;;;;;ACnBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,GAAG;AACH;AACA;AACA;AACA;AACA;AACA,GAAG;AACH;AACA;AACA;AACA;;;;;;;;;;;;;;ACrBA;;;gGAGgG;;AAEhG,+IAA8F;AAC9F,4FAA8B;AAG9B,MAAM,MAAM,GAAG,gBAAgB,EAAE,CAAC;AAElC,uBAAuB,KAAU;IAChC,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,wCAAwC;IACpE,QAAQ,OAAO,CAAC,OAAO,EAAE;QACxB,KAAK,eAAe;YACnB,iBAAiB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YACvC,MAAM;QACP,KAAK,WAAW;YACf,iBAAiB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YACvC,MAAM;QACP,KAAK,aAAa;YACjB,oBAAoB,CAAC,IAAI,CAAC,CAAC;YAC3B,MAAM;QACP,KAAK,gBAAgB;YACpB,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC9B;YACC,MAAM;KACP;AACF,CAAC;AAED,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;AAElD,2BAA2B,WAAgB;IAC1C,QAAQ,CAAC,cAAc,CAAC,aAAa,CAAE,CAAC,SAAS,GAAG,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,iDAAmB,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACzG,YAAY,CAAC,WAAW,CAAC,CAAC;IAC1B,WAAW,EAAE,CAAC;IACd,oBAAoB,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC;IAExD,iBAAiB,EAAE,CAAC;AACrB,CAAC;AAED,2BAA2B,WAAgB;IAC1C,IAAI,WAAW,CAAC,KAAK,IAAI,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,MAAM,IAAI,WAAW,CAAC,KAAK,EAAE;QACrF,YAAY,CAAC,WAAW,CAAC,CAAC;KAC1B;AACF,CAAC;AAED,sBAAsB,EAAO;IAC5B,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAE,CAAC,SAAS,GAAG;;;;WAIpC,EAAE,CAAC,KAAK,aAAa,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,MAAM;;;2BAGzB,uCAAS,CAAC,EAAE,CAAC,KAAK,CAAC;gCACd,EAAE,CAAC,MAAM,CAAC,SAAS;uCACZ,EAAE,CAAC,MAAM,CAAC,OAAO,KAAK,EAAE,CAAC,MAAM,CAAC,KAAK;;;OAGrE,oBAAE,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC;;;GAGtB,CAAC;AACJ,CAAC;AAED;IACC,QAAQ,CAAC,cAAc,CAAC,UAAU,CAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE;QAC/C,QAAQ,CAAC,cAAc,CAAC,UAAU,CAAE,CAAC,QAAQ,GAAG,IAAI,CAAC;QACzE,MAAM,CAAC,WAAW,CAAC;YAClB,OAAO,EAAE,aAAa;SACtB,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE;QACnD,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAE,CAAC,QAAQ,GAAG,IAAI,CAAC;QAC7E,MAAM,CAAC,WAAW,CAAC;YAClB,OAAO,EAAE,YAAY;YACrB,IAAI,EAAwB,QAAQ,CAAC,cAAc,CAAC,iBAAiB,CAAG,CAAC,KAAK;SAC9E,CAAC,CAAC;QACmB,QAAQ,CAAC,cAAc,CAAC,iBAAiB,CAAG,CAAC,KAAK,GAAG,EAAE,CAAC;IAC/E,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE;QACnD,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAE,CAAC,QAAQ,GAAG,IAAI,CAAC;QAC7E,MAAM,CAAC,WAAW,CAAC;YAClB,OAAO,EAAE,UAAU;SACnB,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,uBAAuB,OAAY;IAClC,IAAI,UAAU,GAAG,2CAAa,CAAC,OAAO,CAAC,CAAC;IACxC,QAAQ,CAAC,cAAc,CAAC,aAAa,CAAE,CAAC,kBAAkB,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;AACrF,CAAC;AAED,8BAA8B,YAAqB;IAClD,MAAM,cAAc,GAAuB,QAAQ,CAAC,cAAc,CAAC,UAAU,CAAE,CAAC;IAChF,cAAc,CAAC,QAAQ,GAAG,YAAY,CAAC;IACvC,MAAM,YAAY,GAAG,0VAA0V,CAAC;IAChX,MAAM,UAAU,GAAG,sMAAsM,CAAC;IAC1N,cAAc,CAAC,SAAS,GAAG,YAAY,CAAC,CAAC,CAAC,GAAG,UAAU,mBAAmB,CAAC,CAAC,CAAC,GAAG,YAAY,wBAAwB,CAAC;AACtH,CAAC;AAED;IACC,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAE,CAAC,SAAS,GAAG;;;;SAI7C,CAAC;IAEa,QAAQ,CAAC,cAAc,CAAC,iBAAiB,CAAG,CAAC,WAAW,GAAG,iBAAiB,CAAC;IAC7E,QAAQ,CAAC,cAAc,CAAC,iBAAiB,CAAG,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE;QAClG,IAAI,CAAC,CAAC,OAAO,KAAK,EAAE,IAAI,CAAC,CAAC,OAAO,EAAE;YACZ,QAAQ,CAAC,cAAc,CAAC,iBAAiB,CAAG,CAAC,MAAM,EAAE,CAAC;SAC5E;IACF,CAAC,CAAC,CAAC;IACiB,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAG,CAAC,WAAW,GAAG,SAAS,CAAC;IAClE,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAG,CAAC,WAAW,GAAG,oBAAoB,CAAC;AAClG,CAAC;;;;;;;;;;;;;;ACvHD;;;gGAGgG;;AAEhG,MAAM,UAAU,GAAG,mBAAO,CAAC,wDAAa,CAAC,CAAC;AAC1C,MAAM,EAAE,GAAG,UAAU,EAAE,CAAC;AAExB,kBAAe,EAAE,CAAC;;;;;;;;;;;;;;ACRlB;;;gGAGgG;;AAEhG,oFAAiC;AACjC,4FAA8B;AAG9B,IAAY,cAKX;AALD,WAAY,cAAc;IACzB,yDAAO;IACP,iDAAG;IACH,uDAAM;IACN,yDAAO;AACR,CAAC,EALW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAKzB;AAED;IAWC,YACQ,IAAoB,EACpB,aAAqB,EAAE,aAAa,CACpC,aAAqB,EAAE,aAAa,CACpC,cAAsB,EACrB,IAAY;QAJb,SAAI,GAAJ,IAAI,CAAgB;QACpB,kBAAa,GAAb,aAAa,CAAQ;QACrB,kBAAa,GAAb,aAAa,CAAQ;QACrB,mBAAc,GAAd,cAAc,CAAQ;QACrB,SAAI,GAAJ,IAAI,CAAQ;QAPd,qBAAgB,GAAY,IAAI,CAAC;IAQpC,CAAC;IAhBL,IAAW,GAAG;QACb,OAAO,IAAI,CAAC,IAAI,CAAC;IAClB,CAAC;IAED,IAAW,IAAI;QACd,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAC5B,CAAC;CAWD;AAlBD,4BAkBC;AAED,2BAAkC,IAAY;IAC7C,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IAChB,QAAQ,CAAC,EAAE;QACV,KAAK,GAAG,CAAC,CAAC,OAAO,cAAc,CAAC,OAAO,CAAC;QACxC,KAAK,GAAG,CAAC,CAAC,OAAO,cAAc,CAAC,GAAG,CAAC;QACpC,KAAK,GAAG,CAAC,CAAC,OAAO,cAAc,CAAC,MAAM,CAAC;QACvC,OAAO,CAAC,CAAC,OAAO,cAAc,CAAC,OAAO,CAAC;KACvC;AACF,CAAC;AARD,8CAQC;AAED;IAGC,YACQ,aAAqB,EACrB,SAAiB,EACjB,aAAqB,EACrB,SAAiB,EACjB,cAAsB;QAJtB,kBAAa,GAAb,aAAa,CAAQ;QACrB,cAAS,GAAT,SAAS,CAAQ;QACjB,kBAAa,GAAb,aAAa,CAAQ;QACrB,cAAS,GAAT,SAAS,CAAQ;QACjB,mBAAc,GAAd,cAAc,CAAQ;QAPvB,cAAS,GAAe,EAAE,CAAC;IAQ9B,CAAC;CACL;AAVD,4BAUC;AAqBD,IAAY,SAOX;AAPD,WAAY,SAAS;IACpB,mDAAS;IACT,mDAAS;IACT,qDAAU;IACV,mDAAS;IACT,iDAAQ;IACR,2CAAK;AACN,CAAC,EAPW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAOpB;AA+HD,IAAY,oBAIX;AAJD,WAAY,oBAAoB;IAC/B,+DAAI;IACJ,mEAAM;IACN,mEAAM;AACP,CAAC,EAJW,oBAAoB,GAApB,4BAAoB,KAApB,4BAAoB,QAI/B;AAID,2BAAkC,OAAgB;IACjD,OAAO;;MAEF,oBAAE,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;UACnB,CAAC;AACX,CAAC;AALD,8CAKC;AAGD,uBAA8B,OAAqB;IAClD,OAAO;;;;;;gCAMwB,OAAO,CAAC,IAAI,CAAC,UAAU;;sCAEjB,OAAO,CAAC,IAAI,CAAC,QAAQ,KAAK,OAAO,CAAC,IAAI,CAAC,KAAK;6BACrD,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,EAAE;;;MAG3D,oBAAE,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;;;;OAItB,CAAC;AACR,CAAC;AAlBD,sCAkBC;AAED,sBAA6B,aAA0B;IACtD,OAAO;;;;;cAKM,aAAa,CAAC,MAAM,CAAC,IAAI,qBAAqB,aAAa,CAAC,QAAQ,KAAK,aAAa,CAAC,OAAO,KAAK,aAAa,CAAC,GAAG;;;;OAI3H,CAAC;AACR,CAAC;AAXD,oCAWC;AAED,4BAA4B,IAAoB;IAC/C,QAAQ,IAAI,EAAE;QACb,KAAK,cAAc,CAAC,GAAG;YACtB,OAAO,KAAK,CAAC;QACd,KAAK,cAAc,CAAC,MAAM;YACzB,OAAO,QAAQ,CAAC;QACjB,KAAK,cAAc,CAAC,OAAO;YAC1B,OAAO,SAAS,CAAC;QAClB,KAAK,cAAc,CAAC,OAAO;YAC1B,OAAO,SAAS,CAAC;QAClB;YACC,OAAO,SAAS,CAAC;KAClB;AACF,CAAC;AAED,sBAA6B,aAA0B;IACtD,IAAI,QAAQ,GAAG,aAAa,CAAC,QAAQ,CAAC;IACtC,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,IAAI,QAAQ,GAAG,EAAE,CAAC;IAClB,IAAI,SAAS,GAAG,EAAE,CAAC;IACnB,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,EAAE;QAChC,MAAM,GAAG;8BACmB,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU;SAC9D,CAAC;QACR,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACvD,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,wBAAwB,kBAAkB,CAAC,QAAQ,CAAC,IAAI,CAAC;mCACtG,QAAQ,CAAC,aAAa,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,GAAG;mCACzD,QAAQ,CAAC,aAAa,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,GAAG;gCAC3D,QAAgB,CAAC,IAAI;WAC3C,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;SACpB;QAED,QAAQ,GAAG;6BACgB,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI;KACxC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;SACd,CAAC;KACR;IACD,OAAO;;;;;MAKF,MAAM;6BACiB,aAAa,CAAC,IAAI,CAAC,KAAK,oBAAoB,aAAa,CAAC,QAAQ;6BAClE,MAAM,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE;;KAEpE,QAAQ;UACF,aAAa,CAAC,QAAQ,IAAI,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;;;OAGpI,CAAC;AACR,CAAC;AApCD,oCAoCC;AAED,6BAAoC,aAA4B;IAC/D,QAAQ,aAAa,CAAC,KAAK,EAAE;QAC5B,KAAK,SAAS,CAAC,SAAS;YACvB,OAAO,YAAY,CAAe,aAAc,CAAC,CAAC;QACnD,KAAK,SAAS,CAAC,SAAS;YACvB,OAAO,aAAa,CAAgB,aAAc,CAAC,CAAC;QACrD,KAAK,SAAS,CAAC,QAAQ;YACtB,OAAO,YAAY,CAAe,aAAc,CAAC,CAAC;KACnD;IACD,OAAO,EAAE,CAAC;AACX,CAAC;AAVD,kDAUC;AAED,yBAAgC,KAA2B;IAC1D,IAAI,KAAK,KAAK,oBAAoB,CAAC,MAAM,EAAE;QAC1C,OAAO,SAAS,CAAC;KACjB;SAAM,IAAI,KAAK,KAAK,oBAAoB,CAAC,IAAI,EAAE;QAC/C,OAAO,SAAS,CAAC;KACjB;SAAM;QACN,OAAO,SAAS,CAAC;KACjB;AACF,CAAC;AARD,0CAQC;AAED,mBAA0B,KAA2B;IACpD,IAAI,KAAK,KAAK,oBAAoB,CAAC,MAAM,EAAE;QAC1C,OAAO,QAAQ,CAAC;KAChB;SAAM,IAAI,KAAK,KAAK,oBAAoB,CAAC,IAAI,EAAE;QAC/C,OAAO,MAAM,CAAC;KACd;SAAM;QACN,OAAO,QAAQ,CAAC;KAChB;AACF,CAAC;AARD,8BAQC","file":"index.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// define __esModule on exports\n \t__webpack_require__.r = function(exports) {\n \t\tObject.defineProperty(exports, '__esModule', { value: true });\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = \"./preview-src/index.ts\");\n","'use strict';\n\n\n////////////////////////////////////////////////////////////////////////////////\n// Helpers\n\n// Merge objects\n//\nfunction assign(obj /*from1, from2, from3, ...*/) {\n  var sources = Array.prototype.slice.call(arguments, 1);\n\n  sources.forEach(function (source) {\n    if (!source) { return; }\n\n    Object.keys(source).forEach(function (key) {\n      obj[key] = source[key];\n    });\n  });\n\n  return obj;\n}\n\nfunction _class(obj) { return Object.prototype.toString.call(obj); }\nfunction isString(obj) { return _class(obj) === '[object String]'; }\nfunction isObject(obj) { return _class(obj) === '[object Object]'; }\nfunction isRegExp(obj) { return _class(obj) === '[object RegExp]'; }\nfunction isFunction(obj) { return _class(obj) === '[object Function]'; }\n\n\nfunction escapeRE(str) { return str.replace(/[.?*+^$[\\]\\\\(){}|-]/g, '\\\\$&'); }\n\n////////////////////////////////////////////////////////////////////////////////\n\n\nvar defaultOptions = {\n  fuzzyLink: true,\n  fuzzyEmail: true,\n  fuzzyIP: false\n};\n\n\nfunction isOptionsObj(obj) {\n  return Object.keys(obj || {}).reduce(function (acc, k) {\n    return acc || defaultOptions.hasOwnProperty(k);\n  }, false);\n}\n\n\nvar defaultSchemas = {\n  'http:': {\n    validate: function (text, pos, self) {\n      var tail = text.slice(pos);\n\n      if (!self.re.http) {\n        // compile lazily, because \"host\"-containing variables can change on tlds update.\n        self.re.http =  new RegExp(\n          '^\\\\/\\\\/' + self.re.src_auth + self.re.src_host_port_strict + self.re.src_path, 'i'\n        );\n      }\n      if (self.re.http.test(tail)) {\n        return tail.match(self.re.http)[0].length;\n      }\n      return 0;\n    }\n  },\n  'https:':  'http:',\n  'ftp:':    'http:',\n  '//':      {\n    validate: function (text, pos, self) {\n      var tail = text.slice(pos);\n\n      if (!self.re.no_http) {\n      // compile lazily, because \"host\"-containing variables can change on tlds update.\n        self.re.no_http =  new RegExp(\n          '^' +\n          self.re.src_auth +\n          // Don't allow single-level domains, because of false positives like '//test'\n          // with code comments\n          '(?:localhost|(?:(?:' + self.re.src_domain + ')\\\\.)+' + self.re.src_domain_root + ')' +\n          self.re.src_port +\n          self.re.src_host_terminator +\n          self.re.src_path,\n\n          'i'\n        );\n      }\n\n      if (self.re.no_http.test(tail)) {\n        // should not be `://` & `///`, that protects from errors in protocol name\n        if (pos >= 3 && text[pos - 3] === ':') { return 0; }\n        if (pos >= 3 && text[pos - 3] === '/') { return 0; }\n        return tail.match(self.re.no_http)[0].length;\n      }\n      return 0;\n    }\n  },\n  'mailto:': {\n    validate: function (text, pos, self) {\n      var tail = text.slice(pos);\n\n      if (!self.re.mailto) {\n        self.re.mailto =  new RegExp(\n          '^' + self.re.src_email_name + '@' + self.re.src_host_strict, 'i'\n        );\n      }\n      if (self.re.mailto.test(tail)) {\n        return tail.match(self.re.mailto)[0].length;\n      }\n      return 0;\n    }\n  }\n};\n\n/*eslint-disable max-len*/\n\n// RE pattern for 2-character tlds (autogenerated by ./support/tlds_2char_gen.js)\nvar tlds_2ch_src_re = 'a[cdefgilmnoqrstuwxz]|b[abdefghijmnorstvwyz]|c[acdfghiklmnoruvwxyz]|d[ejkmoz]|e[cegrstu]|f[ijkmor]|g[abdefghilmnpqrstuwy]|h[kmnrtu]|i[delmnoqrst]|j[emop]|k[eghimnprwyz]|l[abcikrstuvy]|m[acdeghklmnopqrstuvwxyz]|n[acefgilopruz]|om|p[aefghklmnrstwy]|qa|r[eosuw]|s[abcdeghijklmnortuvxyz]|t[cdfghjklmnortvwz]|u[agksyz]|v[aceginu]|w[fs]|y[et]|z[amw]';\n\n// DON'T try to make PRs with changes. Extend TLDs with LinkifyIt.tlds() instead\nvar tlds_default = 'biz|com|edu|gov|net|org|pro|web|xxx|aero|asia|coop|info|museum|name|shop|рф'.split('|');\n\n/*eslint-enable max-len*/\n\n////////////////////////////////////////////////////////////////////////////////\n\nfunction resetScanCache(self) {\n  self.__index__ = -1;\n  self.__text_cache__   = '';\n}\n\nfunction createValidator(re) {\n  return function (text, pos) {\n    var tail = text.slice(pos);\n\n    if (re.test(tail)) {\n      return tail.match(re)[0].length;\n    }\n    return 0;\n  };\n}\n\nfunction createNormalizer() {\n  return function (match, self) {\n    self.normalize(match);\n  };\n}\n\n// Schemas compiler. Build regexps.\n//\nfunction compile(self) {\n\n  // Load & clone RE patterns.\n  var re = self.re = require('./lib/re')(self.__opts__);\n\n  // Define dynamic patterns\n  var tlds = self.__tlds__.slice();\n\n  self.onCompile();\n\n  if (!self.__tlds_replaced__) {\n    tlds.push(tlds_2ch_src_re);\n  }\n  tlds.push(re.src_xn);\n\n  re.src_tlds = tlds.join('|');\n\n  function untpl(tpl) { return tpl.replace('%TLDS%', re.src_tlds); }\n\n  re.email_fuzzy      = RegExp(untpl(re.tpl_email_fuzzy), 'i');\n  re.link_fuzzy       = RegExp(untpl(re.tpl_link_fuzzy), 'i');\n  re.link_no_ip_fuzzy = RegExp(untpl(re.tpl_link_no_ip_fuzzy), 'i');\n  re.host_fuzzy_test  = RegExp(untpl(re.tpl_host_fuzzy_test), 'i');\n\n  //\n  // Compile each schema\n  //\n\n  var aliases = [];\n\n  self.__compiled__ = {}; // Reset compiled data\n\n  function schemaError(name, val) {\n    throw new Error('(LinkifyIt) Invalid schema \"' + name + '\": ' + val);\n  }\n\n  Object.keys(self.__schemas__).forEach(function (name) {\n    var val = self.__schemas__[name];\n\n    // skip disabled methods\n    if (val === null) { return; }\n\n    var compiled = { validate: null, link: null };\n\n    self.__compiled__[name] = compiled;\n\n    if (isObject(val)) {\n      if (isRegExp(val.validate)) {\n        compiled.validate = createValidator(val.validate);\n      } else if (isFunction(val.validate)) {\n        compiled.validate = val.validate;\n      } else {\n        schemaError(name, val);\n      }\n\n      if (isFunction(val.normalize)) {\n        compiled.normalize = val.normalize;\n      } else if (!val.normalize) {\n        compiled.normalize = createNormalizer();\n      } else {\n        schemaError(name, val);\n      }\n\n      return;\n    }\n\n    if (isString(val)) {\n      aliases.push(name);\n      return;\n    }\n\n    schemaError(name, val);\n  });\n\n  //\n  // Compile postponed aliases\n  //\n\n  aliases.forEach(function (alias) {\n    if (!self.__compiled__[self.__schemas__[alias]]) {\n      // Silently fail on missed schemas to avoid errons on disable.\n      // schemaError(alias, self.__schemas__[alias]);\n      return;\n    }\n\n    self.__compiled__[alias].validate =\n      self.__compiled__[self.__schemas__[alias]].validate;\n    self.__compiled__[alias].normalize =\n      self.__compiled__[self.__schemas__[alias]].normalize;\n  });\n\n  //\n  // Fake record for guessed links\n  //\n  self.__compiled__[''] = { validate: null, normalize: createNormalizer() };\n\n  //\n  // Build schema condition\n  //\n  var slist = Object.keys(self.__compiled__)\n                      .filter(function (name) {\n                        // Filter disabled & fake schemas\n                        return name.length > 0 && self.__compiled__[name];\n                      })\n                      .map(escapeRE)\n                      .join('|');\n  // (?!_) cause 1.5x slowdown\n  self.re.schema_test   = RegExp('(^|(?!_)(?:[><\\uff5c]|' + re.src_ZPCc + '))(' + slist + ')', 'i');\n  self.re.schema_search = RegExp('(^|(?!_)(?:[><\\uff5c]|' + re.src_ZPCc + '))(' + slist + ')', 'ig');\n\n  self.re.pretest       = RegExp(\n                            '(' + self.re.schema_test.source + ')|' +\n                            '(' + self.re.host_fuzzy_test.source + ')|' +\n                            '@',\n                            'i');\n\n  //\n  // Cleanup\n  //\n\n  resetScanCache(self);\n}\n\n/**\n * class Match\n *\n * Match result. Single element of array, returned by [[LinkifyIt#match]]\n **/\nfunction Match(self, shift) {\n  var start = self.__index__,\n      end   = self.__last_index__,\n      text  = self.__text_cache__.slice(start, end);\n\n  /**\n   * Match#schema -> String\n   *\n   * Prefix (protocol) for matched string.\n   **/\n  this.schema    = self.__schema__.toLowerCase();\n  /**\n   * Match#index -> Number\n   *\n   * First position of matched string.\n   **/\n  this.index     = start + shift;\n  /**\n   * Match#lastIndex -> Number\n   *\n   * Next position after matched string.\n   **/\n  this.lastIndex = end + shift;\n  /**\n   * Match#raw -> String\n   *\n   * Matched string.\n   **/\n  this.raw       = text;\n  /**\n   * Match#text -> String\n   *\n   * Notmalized text of matched string.\n   **/\n  this.text      = text;\n  /**\n   * Match#url -> String\n   *\n   * Normalized url of matched string.\n   **/\n  this.url       = text;\n}\n\nfunction createMatch(self, shift) {\n  var match = new Match(self, shift);\n\n  self.__compiled__[match.schema].normalize(match, self);\n\n  return match;\n}\n\n\n/**\n * class LinkifyIt\n **/\n\n/**\n * new LinkifyIt(schemas, options)\n * - schemas (Object): Optional. Additional schemas to validate (prefix/validator)\n * - options (Object): { fuzzyLink|fuzzyEmail|fuzzyIP: true|false }\n *\n * Creates new linkifier instance with optional additional schemas.\n * Can be called without `new` keyword for convenience.\n *\n * By default understands:\n *\n * - `http(s)://...` , `ftp://...`, `mailto:...` & `//...` links\n * - \"fuzzy\" links and emails (example.com, foo@bar.com).\n *\n * `schemas` is an object, where each key/value describes protocol/rule:\n *\n * - __key__ - link prefix (usually, protocol name with `:` at the end, `skype:`\n *   for example). `linkify-it` makes shure that prefix is not preceeded with\n *   alphanumeric char and symbols. Only whitespaces and punctuation allowed.\n * - __value__ - rule to check tail after link prefix\n *   - _String_ - just alias to existing rule\n *   - _Object_\n *     - _validate_ - validator function (should return matched length on success),\n *       or `RegExp`.\n *     - _normalize_ - optional function to normalize text & url of matched result\n *       (for example, for @twitter mentions).\n *\n * `options`:\n *\n * - __fuzzyLink__ - recognige URL-s without `http(s):` prefix. Default `true`.\n * - __fuzzyIP__ - allow IPs in fuzzy links above. Can conflict with some texts\n *   like version numbers. Default `false`.\n * - __fuzzyEmail__ - recognize emails without `mailto:` prefix.\n *\n **/\nfunction LinkifyIt(schemas, options) {\n  if (!(this instanceof LinkifyIt)) {\n    return new LinkifyIt(schemas, options);\n  }\n\n  if (!options) {\n    if (isOptionsObj(schemas)) {\n      options = schemas;\n      schemas = {};\n    }\n  }\n\n  this.__opts__           = assign({}, defaultOptions, options);\n\n  // Cache last tested result. Used to skip repeating steps on next `match` call.\n  this.__index__          = -1;\n  this.__last_index__     = -1; // Next scan position\n  this.__schema__         = '';\n  this.__text_cache__     = '';\n\n  this.__schemas__        = assign({}, defaultSchemas, schemas);\n  this.__compiled__       = {};\n\n  this.__tlds__           = tlds_default;\n  this.__tlds_replaced__  = false;\n\n  this.re = {};\n\n  compile(this);\n}\n\n\n/** chainable\n * LinkifyIt#add(schema, definition)\n * - schema (String): rule name (fixed pattern prefix)\n * - definition (String|RegExp|Object): schema definition\n *\n * Add new rule definition. See constructor description for details.\n **/\nLinkifyIt.prototype.add = function add(schema, definition) {\n  this.__schemas__[schema] = definition;\n  compile(this);\n  return this;\n};\n\n\n/** chainable\n * LinkifyIt#set(options)\n * - options (Object): { fuzzyLink|fuzzyEmail|fuzzyIP: true|false }\n *\n * Set recognition options for links without schema.\n **/\nLinkifyIt.prototype.set = function set(options) {\n  this.__opts__ = assign(this.__opts__, options);\n  return this;\n};\n\n\n/**\n * LinkifyIt#test(text) -> Boolean\n *\n * Searches linkifiable pattern and returns `true` on success or `false` on fail.\n **/\nLinkifyIt.prototype.test = function test(text) {\n  // Reset scan cache\n  this.__text_cache__ = text;\n  this.__index__      = -1;\n\n  if (!text.length) { return false; }\n\n  var m, ml, me, len, shift, next, re, tld_pos, at_pos;\n\n  // try to scan for link with schema - that's the most simple rule\n  if (this.re.schema_test.test(text)) {\n    re = this.re.schema_search;\n    re.lastIndex = 0;\n    while ((m = re.exec(text)) !== null) {\n      len = this.testSchemaAt(text, m[2], re.lastIndex);\n      if (len) {\n        this.__schema__     = m[2];\n        this.__index__      = m.index + m[1].length;\n        this.__last_index__ = m.index + m[0].length + len;\n        break;\n      }\n    }\n  }\n\n  if (this.__opts__.fuzzyLink && this.__compiled__['http:']) {\n    // guess schemaless links\n    tld_pos = text.search(this.re.host_fuzzy_test);\n    if (tld_pos >= 0) {\n      // if tld is located after found link - no need to check fuzzy pattern\n      if (this.__index__ < 0 || tld_pos < this.__index__) {\n        if ((ml = text.match(this.__opts__.fuzzyIP ? this.re.link_fuzzy : this.re.link_no_ip_fuzzy)) !== null) {\n\n          shift = ml.index + ml[1].length;\n\n          if (this.__index__ < 0 || shift < this.__index__) {\n            this.__schema__     = '';\n            this.__index__      = shift;\n            this.__last_index__ = ml.index + ml[0].length;\n          }\n        }\n      }\n    }\n  }\n\n  if (this.__opts__.fuzzyEmail && this.__compiled__['mailto:']) {\n    // guess schemaless emails\n    at_pos = text.indexOf('@');\n    if (at_pos >= 0) {\n      // We can't skip this check, because this cases are possible:\n      // 192.168.1.1@gmail.com, my.in@example.com\n      if ((me = text.match(this.re.email_fuzzy)) !== null) {\n\n        shift = me.index + me[1].length;\n        next  = me.index + me[0].length;\n\n        if (this.__index__ < 0 || shift < this.__index__ ||\n            (shift === this.__index__ && next > this.__last_index__)) {\n          this.__schema__     = 'mailto:';\n          this.__index__      = shift;\n          this.__last_index__ = next;\n        }\n      }\n    }\n  }\n\n  return this.__index__ >= 0;\n};\n\n\n/**\n * LinkifyIt#pretest(text) -> Boolean\n *\n * Very quick check, that can give false positives. Returns true if link MAY BE\n * can exists. Can be used for speed optimization, when you need to check that\n * link NOT exists.\n **/\nLinkifyIt.prototype.pretest = function pretest(text) {\n  return this.re.pretest.test(text);\n};\n\n\n/**\n * LinkifyIt#testSchemaAt(text, name, position) -> Number\n * - text (String): text to scan\n * - name (String): rule (schema) name\n * - position (Number): text offset to check from\n *\n * Similar to [[LinkifyIt#test]] but checks only specific protocol tail exactly\n * at given position. Returns length of found pattern (0 on fail).\n **/\nLinkifyIt.prototype.testSchemaAt = function testSchemaAt(text, schema, pos) {\n  // If not supported schema check requested - terminate\n  if (!this.__compiled__[schema.toLowerCase()]) {\n    return 0;\n  }\n  return this.__compiled__[schema.toLowerCase()].validate(text, pos, this);\n};\n\n\n/**\n * LinkifyIt#match(text) -> Array|null\n *\n * Returns array of found link descriptions or `null` on fail. We strongly\n * recommend to use [[LinkifyIt#test]] first, for best speed.\n *\n * ##### Result match description\n *\n * - __schema__ - link schema, can be empty for fuzzy links, or `//` for\n *   protocol-neutral  links.\n * - __index__ - offset of matched text\n * - __lastIndex__ - index of next char after mathch end\n * - __raw__ - matched text\n * - __text__ - normalized text\n * - __url__ - link, generated from matched text\n **/\nLinkifyIt.prototype.match = function match(text) {\n  var shift = 0, result = [];\n\n  // Try to take previous element from cache, if .test() called before\n  if (this.__index__ >= 0 && this.__text_cache__ === text) {\n    result.push(createMatch(this, shift));\n    shift = this.__last_index__;\n  }\n\n  // Cut head if cache was used\n  var tail = shift ? text.slice(shift) : text;\n\n  // Scan string until end reached\n  while (this.test(tail)) {\n    result.push(createMatch(this, shift));\n\n    tail = tail.slice(this.__last_index__);\n    shift += this.__last_index__;\n  }\n\n  if (result.length) {\n    return result;\n  }\n\n  return null;\n};\n\n\n/** chainable\n * LinkifyIt#tlds(list [, keepOld]) -> this\n * - list (Array): list of tlds\n * - keepOld (Boolean): merge with current list if `true` (`false` by default)\n *\n * Load (or merge) new tlds list. Those are user for fuzzy links (without prefix)\n * to avoid false positives. By default this algorythm used:\n *\n * - hostname with any 2-letter root zones are ok.\n * - biz|com|edu|gov|net|org|pro|web|xxx|aero|asia|coop|info|museum|name|shop|рф\n *   are ok.\n * - encoded (`xn--...`) root zones are ok.\n *\n * If list is replaced, then exact match for 2-chars root zones will be checked.\n **/\nLinkifyIt.prototype.tlds = function tlds(list, keepOld) {\n  list = Array.isArray(list) ? list : [ list ];\n\n  if (!keepOld) {\n    this.__tlds__ = list.slice();\n    this.__tlds_replaced__ = true;\n    compile(this);\n    return this;\n  }\n\n  this.__tlds__ = this.__tlds__.concat(list)\n                                  .sort()\n                                  .filter(function (el, idx, arr) {\n                                    return el !== arr[idx - 1];\n                                  })\n                                  .reverse();\n\n  compile(this);\n  return this;\n};\n\n/**\n * LinkifyIt#normalize(match)\n *\n * Default normalizer (if schema does not define it's own).\n **/\nLinkifyIt.prototype.normalize = function normalize(match) {\n\n  // Do minimal possible changes by default. Need to collect feedback prior\n  // to move forward https://github.com/markdown-it/linkify-it/issues/1\n\n  if (!match.schema) { match.url = 'http://' + match.url; }\n\n  if (match.schema === 'mailto:' && !/^mailto:/i.test(match.url)) {\n    match.url = 'mailto:' + match.url;\n  }\n};\n\n\n/**\n * LinkifyIt#onCompile()\n *\n * Override to modify basic RegExp-s.\n **/\nLinkifyIt.prototype.onCompile = function onCompile() {\n};\n\n\nmodule.exports = LinkifyIt;\n","'use strict';\n\n\nmodule.exports = function (opts) {\n  var re = {};\n\n  // Use direct extract instead of `regenerate` to reduse browserified size\n  re.src_Any = require('uc.micro/properties/Any/regex').source;\n  re.src_Cc  = require('uc.micro/categories/Cc/regex').source;\n  re.src_Z   = require('uc.micro/categories/Z/regex').source;\n  re.src_P   = require('uc.micro/categories/P/regex').source;\n\n  // \\p{\\Z\\P\\Cc\\CF} (white spaces + control + format + punctuation)\n  re.src_ZPCc = [ re.src_Z, re.src_P, re.src_Cc ].join('|');\n\n  // \\p{\\Z\\Cc} (white spaces + control)\n  re.src_ZCc = [ re.src_Z, re.src_Cc ].join('|');\n\n  // Experimental. List of chars, completely prohibited in links\n  // because can separate it from other part of text\n  var text_separators = '[><\\uff5c]';\n\n  // All possible word characters (everything without punctuation, spaces & controls)\n  // Defined via punctuation & spaces to save space\n  // Should be something like \\p{\\L\\N\\S\\M} (\\w but without `_`)\n  re.src_pseudo_letter       = '(?:(?!' + text_separators + '|' + re.src_ZPCc + ')' + re.src_Any + ')';\n  // The same as abothe but without [0-9]\n  // var src_pseudo_letter_non_d = '(?:(?![0-9]|' + src_ZPCc + ')' + src_Any + ')';\n\n  ////////////////////////////////////////////////////////////////////////////////\n\n  re.src_ip4 =\n\n    '(?:(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)';\n\n  // Prohibit any of \"@/[]()\" in user/pass to avoid wrong domain fetch.\n  re.src_auth    = '(?:(?:(?!' + re.src_ZCc + '|[@/\\\\[\\\\]()]).)+@)?';\n\n  re.src_port =\n\n    '(?::(?:6(?:[0-4]\\\\d{3}|5(?:[0-4]\\\\d{2}|5(?:[0-2]\\\\d|3[0-5])))|[1-5]?\\\\d{1,4}))?';\n\n  re.src_host_terminator =\n\n    '(?=$|' + text_separators + '|' + re.src_ZPCc + ')(?!-|_|:\\\\d|\\\\.-|\\\\.(?!$|' + re.src_ZPCc + '))';\n\n  re.src_path =\n\n    '(?:' +\n      '[/?#]' +\n        '(?:' +\n          '(?!' + re.src_ZCc + '|' + text_separators + '|[()[\\\\]{}.,\"\\'?!\\\\-]).|' +\n          '\\\\[(?:(?!' + re.src_ZCc + '|\\\\]).)*\\\\]|' +\n          '\\\\((?:(?!' + re.src_ZCc + '|[)]).)*\\\\)|' +\n          '\\\\{(?:(?!' + re.src_ZCc + '|[}]).)*\\\\}|' +\n          '\\\\\"(?:(?!' + re.src_ZCc + '|[\"]).)+\\\\\"|' +\n          \"\\\\'(?:(?!\" + re.src_ZCc + \"|[']).)+\\\\'|\" +\n          \"\\\\'(?=\" + re.src_pseudo_letter + '|[-]).|' +  // allow `I'm_king` if no pair found\n          '\\\\.{2,3}[a-zA-Z0-9%/]|' + // github has ... in commit range links. Restrict to\n                                     // - english\n                                     // - percent-encoded\n                                     // - parts of file path\n                                     // until more examples found.\n          '\\\\.(?!' + re.src_ZCc + '|[.]).|' +\n          (opts && opts['---'] ?\n            '\\\\-(?!--(?:[^-]|$))(?:-*)|' // `---` => long dash, terminate\n          :\n            '\\\\-+|'\n          ) +\n          '\\\\,(?!' + re.src_ZCc + ').|' +      // allow `,,,` in paths\n          '\\\\!(?!' + re.src_ZCc + '|[!]).|' +\n          '\\\\?(?!' + re.src_ZCc + '|[?]).' +\n        ')+' +\n      '|\\\\/' +\n    ')?';\n\n  re.src_email_name =\n\n    '[\\\\-;:&=\\\\+\\\\$,\\\\\"\\\\.a-zA-Z0-9_]+';\n\n  re.src_xn =\n\n    'xn--[a-z0-9\\\\-]{1,59}';\n\n  // More to read about domain names\n  // http://serverfault.com/questions/638260/\n\n  re.src_domain_root =\n\n    // Allow letters & digits (http://test1)\n    '(?:' +\n      re.src_xn +\n      '|' +\n      re.src_pseudo_letter + '{1,63}' +\n    ')';\n\n  re.src_domain =\n\n    '(?:' +\n      re.src_xn +\n      '|' +\n      '(?:' + re.src_pseudo_letter + ')' +\n      '|' +\n      // don't allow `--` in domain names, because:\n      // - that can conflict with markdown &mdash; / &ndash;\n      // - nobody use those anyway\n      '(?:' + re.src_pseudo_letter + '(?:-(?!-)|' + re.src_pseudo_letter + '){0,61}' + re.src_pseudo_letter + ')' +\n    ')';\n\n  re.src_host =\n\n    '(?:' +\n    // Don't need IP check, because digits are already allowed in normal domain names\n    //   src_ip4 +\n    // '|' +\n      '(?:(?:(?:' + re.src_domain + ')\\\\.)*' + re.src_domain/*_root*/ + ')' +\n    ')';\n\n  re.tpl_host_fuzzy =\n\n    '(?:' +\n      re.src_ip4 +\n    '|' +\n      '(?:(?:(?:' + re.src_domain + ')\\\\.)+(?:%TLDS%))' +\n    ')';\n\n  re.tpl_host_no_ip_fuzzy =\n\n    '(?:(?:(?:' + re.src_domain + ')\\\\.)+(?:%TLDS%))';\n\n  re.src_host_strict =\n\n    re.src_host + re.src_host_terminator;\n\n  re.tpl_host_fuzzy_strict =\n\n    re.tpl_host_fuzzy + re.src_host_terminator;\n\n  re.src_host_port_strict =\n\n    re.src_host + re.src_port + re.src_host_terminator;\n\n  re.tpl_host_port_fuzzy_strict =\n\n    re.tpl_host_fuzzy + re.src_port + re.src_host_terminator;\n\n  re.tpl_host_port_no_ip_fuzzy_strict =\n\n    re.tpl_host_no_ip_fuzzy + re.src_port + re.src_host_terminator;\n\n\n  ////////////////////////////////////////////////////////////////////////////////\n  // Main rules\n\n  // Rude test fuzzy links by host, for quick deny\n  re.tpl_host_fuzzy_test =\n\n    'localhost|www\\\\.|\\\\.\\\\d{1,3}\\\\.|(?:\\\\.(?:%TLDS%)(?:' + re.src_ZPCc + '|>|$))';\n\n  re.tpl_email_fuzzy =\n\n      '(^|' + text_separators + '|\\\\(|' + re.src_ZCc + ')(' + re.src_email_name + '@' + re.tpl_host_fuzzy_strict + ')';\n\n  re.tpl_link_fuzzy =\n      // Fuzzy link can't be prepended with .:/\\- and non punctuation.\n      // but can start with > (markdown blockquote)\n      '(^|(?![.:/\\\\-_@])(?:[$+<=>^`|\\uff5c]|' + re.src_ZPCc + '))' +\n      '((?![$+<=>^`|\\uff5c])' + re.tpl_host_port_fuzzy_strict + re.src_path + ')';\n\n  re.tpl_link_no_ip_fuzzy =\n      // Fuzzy link can't be prepended with .:/\\- and non punctuation.\n      // but can start with > (markdown blockquote)\n      '(^|(?![.:/\\\\-_@])(?:[$+<=>^`|\\uff5c]|' + re.src_ZPCc + '))' +\n      '((?![$+<=>^`|\\uff5c])' + re.tpl_host_port_no_ip_fuzzy_strict + re.src_path + ')';\n\n  return re;\n};\n","'use strict';\n\n\nmodule.exports = require('./lib/');\n","// HTML5 entities map: { name -> utf16string }\n//\n'use strict';\n\n/*eslint quotes:0*/\nmodule.exports = require('entities/maps/entities.json');\n","// List of valid html blocks names, accorting to commonmark spec\n// http://jgm.github.io/CommonMark/spec.html#html-blocks\n\n'use strict';\n\n\nmodule.exports = [\n  'address',\n  'article',\n  'aside',\n  'base',\n  'basefont',\n  'blockquote',\n  'body',\n  'caption',\n  'center',\n  'col',\n  'colgroup',\n  'dd',\n  'details',\n  'dialog',\n  'dir',\n  'div',\n  'dl',\n  'dt',\n  'fieldset',\n  'figcaption',\n  'figure',\n  'footer',\n  'form',\n  'frame',\n  'frameset',\n  'h1',\n  'h2',\n  'h3',\n  'h4',\n  'h5',\n  'h6',\n  'head',\n  'header',\n  'hr',\n  'html',\n  'iframe',\n  'legend',\n  'li',\n  'link',\n  'main',\n  'menu',\n  'menuitem',\n  'meta',\n  'nav',\n  'noframes',\n  'ol',\n  'optgroup',\n  'option',\n  'p',\n  'param',\n  'section',\n  'source',\n  'summary',\n  'table',\n  'tbody',\n  'td',\n  'tfoot',\n  'th',\n  'thead',\n  'title',\n  'tr',\n  'track',\n  'ul'\n];\n","// Regexps to match html elements\n\n'use strict';\n\nvar attr_name     = '[a-zA-Z_:][a-zA-Z0-9:._-]*';\n\nvar unquoted      = '[^\"\\'=<>`\\\\x00-\\\\x20]+';\nvar single_quoted = \"'[^']*'\";\nvar double_quoted = '\"[^\"]*\"';\n\nvar attr_value  = '(?:' + unquoted + '|' + single_quoted + '|' + double_quoted + ')';\n\nvar attribute   = '(?:\\\\s+' + attr_name + '(?:\\\\s*=\\\\s*' + attr_value + ')?)';\n\nvar open_tag    = '<[A-Za-z][A-Za-z0-9\\\\-]*' + attribute + '*\\\\s*\\\\/?>';\n\nvar close_tag   = '<\\\\/[A-Za-z][A-Za-z0-9\\\\-]*\\\\s*>';\nvar comment     = '<!---->|<!--(?:-?[^>-])(?:-?[^-])*-->';\nvar processing  = '<[?].*?[?]>';\nvar declaration = '<![A-Z]+\\\\s+[^>]*>';\nvar cdata       = '<!\\\\[CDATA\\\\[[\\\\s\\\\S]*?\\\\]\\\\]>';\n\nvar HTML_TAG_RE = new RegExp('^(?:' + open_tag + '|' + close_tag + '|' + comment +\n                        '|' + processing + '|' + declaration + '|' + cdata + ')');\nvar HTML_OPEN_CLOSE_TAG_RE = new RegExp('^(?:' + open_tag + '|' + close_tag + ')');\n\nmodule.exports.HTML_TAG_RE = HTML_TAG_RE;\nmodule.exports.HTML_OPEN_CLOSE_TAG_RE = HTML_OPEN_CLOSE_TAG_RE;\n","// Utilities\n//\n'use strict';\n\n\nfunction _class(obj) { return Object.prototype.toString.call(obj); }\n\nfunction isString(obj) { return _class(obj) === '[object String]'; }\n\nvar _hasOwnProperty = Object.prototype.hasOwnProperty;\n\nfunction has(object, key) {\n  return _hasOwnProperty.call(object, key);\n}\n\n// Merge objects\n//\nfunction assign(obj /*from1, from2, from3, ...*/) {\n  var sources = Array.prototype.slice.call(arguments, 1);\n\n  sources.forEach(function (source) {\n    if (!source) { return; }\n\n    if (typeof source !== 'object') {\n      throw new TypeError(source + 'must be object');\n    }\n\n    Object.keys(source).forEach(function (key) {\n      obj[key] = source[key];\n    });\n  });\n\n  return obj;\n}\n\n// Remove element from array and put another array at those position.\n// Useful for some operations with tokens\nfunction arrayReplaceAt(src, pos, newElements) {\n  return [].concat(src.slice(0, pos), newElements, src.slice(pos + 1));\n}\n\n////////////////////////////////////////////////////////////////////////////////\n\nfunction isValidEntityCode(c) {\n  /*eslint no-bitwise:0*/\n  // broken sequence\n  if (c >= 0xD800 && c <= 0xDFFF) { return false; }\n  // never used\n  if (c >= 0xFDD0 && c <= 0xFDEF) { return false; }\n  if ((c & 0xFFFF) === 0xFFFF || (c & 0xFFFF) === 0xFFFE) { return false; }\n  // control codes\n  if (c >= 0x00 && c <= 0x08) { return false; }\n  if (c === 0x0B) { return false; }\n  if (c >= 0x0E && c <= 0x1F) { return false; }\n  if (c >= 0x7F && c <= 0x9F) { return false; }\n  // out of range\n  if (c > 0x10FFFF) { return false; }\n  return true;\n}\n\nfunction fromCodePoint(c) {\n  /*eslint no-bitwise:0*/\n  if (c > 0xffff) {\n    c -= 0x10000;\n    var surrogate1 = 0xd800 + (c >> 10),\n        surrogate2 = 0xdc00 + (c & 0x3ff);\n\n    return String.fromCharCode(surrogate1, surrogate2);\n  }\n  return String.fromCharCode(c);\n}\n\n\nvar UNESCAPE_MD_RE  = /\\\\([!\"#$%&'()*+,\\-.\\/:;<=>?@[\\\\\\]^_`{|}~])/g;\nvar ENTITY_RE       = /&([a-z#][a-z0-9]{1,31});/gi;\nvar UNESCAPE_ALL_RE = new RegExp(UNESCAPE_MD_RE.source + '|' + ENTITY_RE.source, 'gi');\n\nvar DIGITAL_ENTITY_TEST_RE = /^#((?:x[a-f0-9]{1,8}|[0-9]{1,8}))/i;\n\nvar entities = require('./entities');\n\nfunction replaceEntityPattern(match, name) {\n  var code = 0;\n\n  if (has(entities, name)) {\n    return entities[name];\n  }\n\n  if (name.charCodeAt(0) === 0x23/* # */ && DIGITAL_ENTITY_TEST_RE.test(name)) {\n    code = name[1].toLowerCase() === 'x' ?\n      parseInt(name.slice(2), 16)\n    :\n      parseInt(name.slice(1), 10);\n    if (isValidEntityCode(code)) {\n      return fromCodePoint(code);\n    }\n  }\n\n  return match;\n}\n\n/*function replaceEntities(str) {\n  if (str.indexOf('&') < 0) { return str; }\n\n  return str.replace(ENTITY_RE, replaceEntityPattern);\n}*/\n\nfunction unescapeMd(str) {\n  if (str.indexOf('\\\\') < 0) { return str; }\n  return str.replace(UNESCAPE_MD_RE, '$1');\n}\n\nfunction unescapeAll(str) {\n  if (str.indexOf('\\\\') < 0 && str.indexOf('&') < 0) { return str; }\n\n  return str.replace(UNESCAPE_ALL_RE, function (match, escaped, entity) {\n    if (escaped) { return escaped; }\n    return replaceEntityPattern(match, entity);\n  });\n}\n\n////////////////////////////////////////////////////////////////////////////////\n\nvar HTML_ESCAPE_TEST_RE = /[&<>\"]/;\nvar HTML_ESCAPE_REPLACE_RE = /[&<>\"]/g;\nvar HTML_REPLACEMENTS = {\n  '&': '&amp;',\n  '<': '&lt;',\n  '>': '&gt;',\n  '\"': '&quot;'\n};\n\nfunction replaceUnsafeChar(ch) {\n  return HTML_REPLACEMENTS[ch];\n}\n\nfunction escapeHtml(str) {\n  if (HTML_ESCAPE_TEST_RE.test(str)) {\n    return str.replace(HTML_ESCAPE_REPLACE_RE, replaceUnsafeChar);\n  }\n  return str;\n}\n\n////////////////////////////////////////////////////////////////////////////////\n\nvar REGEXP_ESCAPE_RE = /[.?*+^$[\\]\\\\(){}|-]/g;\n\nfunction escapeRE(str) {\n  return str.replace(REGEXP_ESCAPE_RE, '\\\\$&');\n}\n\n////////////////////////////////////////////////////////////////////////////////\n\nfunction isSpace(code) {\n  switch (code) {\n    case 0x09:\n    case 0x20:\n      return true;\n  }\n  return false;\n}\n\n// Zs (unicode class) || [\\t\\f\\v\\r\\n]\nfunction isWhiteSpace(code) {\n  if (code >= 0x2000 && code <= 0x200A) { return true; }\n  switch (code) {\n    case 0x09: // \\t\n    case 0x0A: // \\n\n    case 0x0B: // \\v\n    case 0x0C: // \\f\n    case 0x0D: // \\r\n    case 0x20:\n    case 0xA0:\n    case 0x1680:\n    case 0x202F:\n    case 0x205F:\n    case 0x3000:\n      return true;\n  }\n  return false;\n}\n\n////////////////////////////////////////////////////////////////////////////////\n\n/*eslint-disable max-len*/\nvar UNICODE_PUNCT_RE = require('uc.micro/categories/P/regex');\n\n// Currently without astral characters support.\nfunction isPunctChar(ch) {\n  return UNICODE_PUNCT_RE.test(ch);\n}\n\n\n// Markdown ASCII punctuation characters.\n//\n// !, \", #, $, %, &, ', (, ), *, +, ,, -, ., /, :, ;, <, =, >, ?, @, [, \\, ], ^, _, `, {, |, }, or ~\n// http://spec.commonmark.org/0.15/#ascii-punctuation-character\n//\n// Don't confuse with unicode punctuation !!! It lacks some chars in ascii range.\n//\nfunction isMdAsciiPunct(ch) {\n  switch (ch) {\n    case 0x21/* ! */:\n    case 0x22/* \" */:\n    case 0x23/* # */:\n    case 0x24/* $ */:\n    case 0x25/* % */:\n    case 0x26/* & */:\n    case 0x27/* ' */:\n    case 0x28/* ( */:\n    case 0x29/* ) */:\n    case 0x2A/* * */:\n    case 0x2B/* + */:\n    case 0x2C/* , */:\n    case 0x2D/* - */:\n    case 0x2E/* . */:\n    case 0x2F/* / */:\n    case 0x3A/* : */:\n    case 0x3B/* ; */:\n    case 0x3C/* < */:\n    case 0x3D/* = */:\n    case 0x3E/* > */:\n    case 0x3F/* ? */:\n    case 0x40/* @ */:\n    case 0x5B/* [ */:\n    case 0x5C/* \\ */:\n    case 0x5D/* ] */:\n    case 0x5E/* ^ */:\n    case 0x5F/* _ */:\n    case 0x60/* ` */:\n    case 0x7B/* { */:\n    case 0x7C/* | */:\n    case 0x7D/* } */:\n    case 0x7E/* ~ */:\n      return true;\n    default:\n      return false;\n  }\n}\n\n// Hepler to unify [reference labels].\n//\nfunction normalizeReference(str) {\n  // use .toUpperCase() instead of .toLowerCase()\n  // here to avoid a conflict with Object.prototype\n  // members (most notably, `__proto__`)\n  return str.trim().replace(/\\s+/g, ' ').toUpperCase();\n}\n\n////////////////////////////////////////////////////////////////////////////////\n\n// Re-export libraries commonly used in both markdown-it and its plugins,\n// so plugins won't have to depend on them explicitly, which reduces their\n// bundled size (e.g. a browser build).\n//\nexports.lib                 = {};\nexports.lib.mdurl           = require('mdurl');\nexports.lib.ucmicro         = require('uc.micro');\n\nexports.assign              = assign;\nexports.isString            = isString;\nexports.has                 = has;\nexports.unescapeMd          = unescapeMd;\nexports.unescapeAll         = unescapeAll;\nexports.isValidEntityCode   = isValidEntityCode;\nexports.fromCodePoint       = fromCodePoint;\n// exports.replaceEntities     = replaceEntities;\nexports.escapeHtml          = escapeHtml;\nexports.arrayReplaceAt      = arrayReplaceAt;\nexports.isSpace             = isSpace;\nexports.isWhiteSpace        = isWhiteSpace;\nexports.isMdAsciiPunct      = isMdAsciiPunct;\nexports.isPunctChar         = isPunctChar;\nexports.escapeRE            = escapeRE;\nexports.normalizeReference  = normalizeReference;\n","// Just a shortcut for bulk export\n'use strict';\n\n\nexports.parseLinkLabel       = require('./parse_link_label');\nexports.parseLinkDestination = require('./parse_link_destination');\nexports.parseLinkTitle       = require('./parse_link_title');\n","// Parse link destination\n//\n'use strict';\n\n\nvar isSpace     = require('../common/utils').isSpace;\nvar unescapeAll = require('../common/utils').unescapeAll;\n\n\nmodule.exports = function parseLinkDestination(str, pos, max) {\n  var code, level,\n      lines = 0,\n      start = pos,\n      result = {\n        ok: false,\n        pos: 0,\n        lines: 0,\n        str: ''\n      };\n\n  if (str.charCodeAt(pos) === 0x3C /* < */) {\n    pos++;\n    while (pos < max) {\n      code = str.charCodeAt(pos);\n      if (code === 0x0A /* \\n */ || isSpace(code)) { return result; }\n      if (code === 0x3E /* > */) {\n        result.pos = pos + 1;\n        result.str = unescapeAll(str.slice(start + 1, pos));\n        result.ok = true;\n        return result;\n      }\n      if (code === 0x5C /* \\ */ && pos + 1 < max) {\n        pos += 2;\n        continue;\n      }\n\n      pos++;\n    }\n\n    // no closing '>'\n    return result;\n  }\n\n  // this should be ... } else { ... branch\n\n  level = 0;\n  while (pos < max) {\n    code = str.charCodeAt(pos);\n\n    if (code === 0x20) { break; }\n\n    // ascii control characters\n    if (code < 0x20 || code === 0x7F) { break; }\n\n    if (code === 0x5C /* \\ */ && pos + 1 < max) {\n      pos += 2;\n      continue;\n    }\n\n    if (code === 0x28 /* ( */) {\n      level++;\n    }\n\n    if (code === 0x29 /* ) */) {\n      if (level === 0) { break; }\n      level--;\n    }\n\n    pos++;\n  }\n\n  if (start === pos) { return result; }\n  if (level !== 0) { return result; }\n\n  result.str = unescapeAll(str.slice(start, pos));\n  result.lines = lines;\n  result.pos = pos;\n  result.ok = true;\n  return result;\n};\n","// Parse link label\n//\n// this function assumes that first character (\"[\") already matches;\n// returns the end of the label\n//\n'use strict';\n\nmodule.exports = function parseLinkLabel(state, start, disableNested) {\n  var level, found, marker, prevPos,\n      labelEnd = -1,\n      max = state.posMax,\n      oldPos = state.pos;\n\n  state.pos = start + 1;\n  level = 1;\n\n  while (state.pos < max) {\n    marker = state.src.charCodeAt(state.pos);\n    if (marker === 0x5D /* ] */) {\n      level--;\n      if (level === 0) {\n        found = true;\n        break;\n      }\n    }\n\n    prevPos = state.pos;\n    state.md.inline.skipToken(state);\n    if (marker === 0x5B /* [ */) {\n      if (prevPos === state.pos - 1) {\n        // increase level if we find text `[`, which is not a part of any token\n        level++;\n      } else if (disableNested) {\n        state.pos = oldPos;\n        return -1;\n      }\n    }\n  }\n\n  if (found) {\n    labelEnd = state.pos;\n  }\n\n  // restore old state\n  state.pos = oldPos;\n\n  return labelEnd;\n};\n","// Parse link title\n//\n'use strict';\n\n\nvar unescapeAll = require('../common/utils').unescapeAll;\n\n\nmodule.exports = function parseLinkTitle(str, pos, max) {\n  var code,\n      marker,\n      lines = 0,\n      start = pos,\n      result = {\n        ok: false,\n        pos: 0,\n        lines: 0,\n        str: ''\n      };\n\n  if (pos >= max) { return result; }\n\n  marker = str.charCodeAt(pos);\n\n  if (marker !== 0x22 /* \" */ && marker !== 0x27 /* ' */ && marker !== 0x28 /* ( */) { return result; }\n\n  pos++;\n\n  // if opening marker is \"(\", switch it to closing marker \")\"\n  if (marker === 0x28) { marker = 0x29; }\n\n  while (pos < max) {\n    code = str.charCodeAt(pos);\n    if (code === marker) {\n      result.pos = pos + 1;\n      result.lines = lines;\n      result.str = unescapeAll(str.slice(start + 1, pos));\n      result.ok = true;\n      return result;\n    } else if (code === 0x0A) {\n      lines++;\n    } else if (code === 0x5C /* \\ */ && pos + 1 < max) {\n      pos++;\n      if (str.charCodeAt(pos) === 0x0A) {\n        lines++;\n      }\n    }\n\n    pos++;\n  }\n\n  return result;\n};\n","// Main parser class\n\n'use strict';\n\n\nvar utils        = require('./common/utils');\nvar helpers      = require('./helpers');\nvar Renderer     = require('./renderer');\nvar ParserCore   = require('./parser_core');\nvar ParserBlock  = require('./parser_block');\nvar ParserInline = require('./parser_inline');\nvar LinkifyIt    = require('linkify-it');\nvar mdurl        = require('mdurl');\nvar punycode     = require('punycode');\n\n\nvar config = {\n  'default': require('./presets/default'),\n  zero: require('./presets/zero'),\n  commonmark: require('./presets/commonmark')\n};\n\n////////////////////////////////////////////////////////////////////////////////\n//\n// This validator can prohibit more than really needed to prevent XSS. It's a\n// tradeoff to keep code simple and to be secure by default.\n//\n// If you need different setup - override validator method as you wish. Or\n// replace it with dummy function and use external sanitizer.\n//\n\nvar BAD_PROTO_RE = /^(vbscript|javascript|file|data):/;\nvar GOOD_DATA_RE = /^data:image\\/(gif|png|jpeg|webp);/;\n\nfunction validateLink(url) {\n  // url should be normalized at this point, and existing entities are decoded\n  var str = url.trim().toLowerCase();\n\n  return BAD_PROTO_RE.test(str) ? (GOOD_DATA_RE.test(str) ? true : false) : true;\n}\n\n////////////////////////////////////////////////////////////////////////////////\n\n\nvar RECODE_HOSTNAME_FOR = [ 'http:', 'https:', 'mailto:' ];\n\nfunction normalizeLink(url) {\n  var parsed = mdurl.parse(url, true);\n\n  if (parsed.hostname) {\n    // Encode hostnames in urls like:\n    // `http://host/`, `https://host/`, `mailto:user@host`, `//host/`\n    //\n    // We don't encode unknown schemas, because it's likely that we encode\n    // something we shouldn't (e.g. `skype:name` treated as `skype:host`)\n    //\n    if (!parsed.protocol || RECODE_HOSTNAME_FOR.indexOf(parsed.protocol) >= 0) {\n      try {\n        parsed.hostname = punycode.toASCII(parsed.hostname);\n      } catch (er) { /**/ }\n    }\n  }\n\n  return mdurl.encode(mdurl.format(parsed));\n}\n\nfunction normalizeLinkText(url) {\n  var parsed = mdurl.parse(url, true);\n\n  if (parsed.hostname) {\n    // Encode hostnames in urls like:\n    // `http://host/`, `https://host/`, `mailto:user@host`, `//host/`\n    //\n    // We don't encode unknown schemas, because it's likely that we encode\n    // something we shouldn't (e.g. `skype:name` treated as `skype:host`)\n    //\n    if (!parsed.protocol || RECODE_HOSTNAME_FOR.indexOf(parsed.protocol) >= 0) {\n      try {\n        parsed.hostname = punycode.toUnicode(parsed.hostname);\n      } catch (er) { /**/ }\n    }\n  }\n\n  return mdurl.decode(mdurl.format(parsed));\n}\n\n\n/**\n * class MarkdownIt\n *\n * Main parser/renderer class.\n *\n * ##### Usage\n *\n * ```javascript\n * // node.js, \"classic\" way:\n * var MarkdownIt = require('markdown-it'),\n *     md = new MarkdownIt();\n * var result = md.render('# markdown-it rulezz!');\n *\n * // node.js, the same, but with sugar:\n * var md = require('markdown-it')();\n * var result = md.render('# markdown-it rulezz!');\n *\n * // browser without AMD, added to \"window\" on script load\n * // Note, there are no dash.\n * var md = window.markdownit();\n * var result = md.render('# markdown-it rulezz!');\n * ```\n *\n * Single line rendering, without paragraph wrap:\n *\n * ```javascript\n * var md = require('markdown-it')();\n * var result = md.renderInline('__markdown-it__ rulezz!');\n * ```\n **/\n\n/**\n * new MarkdownIt([presetName, options])\n * - presetName (String): optional, `commonmark` / `zero`\n * - options (Object)\n *\n * Creates parser instanse with given config. Can be called without `new`.\n *\n * ##### presetName\n *\n * MarkdownIt provides named presets as a convenience to quickly\n * enable/disable active syntax rules and options for common use cases.\n *\n * - [\"commonmark\"](https://github.com/markdown-it/markdown-it/blob/master/lib/presets/commonmark.js) -\n *   configures parser to strict [CommonMark](http://commonmark.org/) mode.\n * - [default](https://github.com/markdown-it/markdown-it/blob/master/lib/presets/default.js) -\n *   similar to GFM, used when no preset name given. Enables all available rules,\n *   but still without html, typographer & autolinker.\n * - [\"zero\"](https://github.com/markdown-it/markdown-it/blob/master/lib/presets/zero.js) -\n *   all rules disabled. Useful to quickly setup your config via `.enable()`.\n *   For example, when you need only `bold` and `italic` markup and nothing else.\n *\n * ##### options:\n *\n * - __html__ - `false`. Set `true` to enable HTML tags in source. Be careful!\n *   That's not safe! You may need external sanitizer to protect output from XSS.\n *   It's better to extend features via plugins, instead of enabling HTML.\n * - __xhtmlOut__ - `false`. Set `true` to add '/' when closing single tags\n *   (`<br />`). This is needed only for full CommonMark compatibility. In real\n *   world you will need HTML output.\n * - __breaks__ - `false`. Set `true` to convert `\\n` in paragraphs into `<br>`.\n * - __langPrefix__ - `language-`. CSS language class prefix for fenced blocks.\n *   Can be useful for external highlighters.\n * - __linkify__ - `false`. Set `true` to autoconvert URL-like text to links.\n * - __typographer__  - `false`. Set `true` to enable [some language-neutral\n *   replacement](https://github.com/markdown-it/markdown-it/blob/master/lib/rules_core/replacements.js) +\n *   quotes beautification (smartquotes).\n * - __quotes__ - `“”‘’`, String or Array. Double + single quotes replacement\n *   pairs, when typographer enabled and smartquotes on. For example, you can\n *   use `'«»„“'` for Russian, `'„“‚‘'` for German, and\n *   `['«\\xA0', '\\xA0»', '‹\\xA0', '\\xA0›']` for French (including nbsp).\n * - __highlight__ - `null`. Highlighter function for fenced code blocks.\n *   Highlighter `function (str, lang)` should return escaped HTML. It can also\n *   return empty string if the source was not changed and should be escaped\n *   externaly. If result starts with <pre... internal wrapper is skipped.\n *\n * ##### Example\n *\n * ```javascript\n * // commonmark mode\n * var md = require('markdown-it')('commonmark');\n *\n * // default mode\n * var md = require('markdown-it')();\n *\n * // enable everything\n * var md = require('markdown-it')({\n *   html: true,\n *   linkify: true,\n *   typographer: true\n * });\n * ```\n *\n * ##### Syntax highlighting\n *\n * ```js\n * var hljs = require('highlight.js') // https://highlightjs.org/\n *\n * var md = require('markdown-it')({\n *   highlight: function (str, lang) {\n *     if (lang && hljs.getLanguage(lang)) {\n *       try {\n *         return hljs.highlight(lang, str, true).value;\n *       } catch (__) {}\n *     }\n *\n *     return ''; // use external default escaping\n *   }\n * });\n * ```\n *\n * Or with full wrapper override (if you need assign class to `<pre>`):\n *\n * ```javascript\n * var hljs = require('highlight.js') // https://highlightjs.org/\n *\n * // Actual default values\n * var md = require('markdown-it')({\n *   highlight: function (str, lang) {\n *     if (lang && hljs.getLanguage(lang)) {\n *       try {\n *         return '<pre class=\"hljs\"><code>' +\n *                hljs.highlight(lang, str, true).value +\n *                '</code></pre>';\n *       } catch (__) {}\n *     }\n *\n *     return '<pre class=\"hljs\"><code>' + md.utils.escapeHtml(str) + '</code></pre>';\n *   }\n * });\n * ```\n *\n **/\nfunction MarkdownIt(presetName, options) {\n  if (!(this instanceof MarkdownIt)) {\n    return new MarkdownIt(presetName, options);\n  }\n\n  if (!options) {\n    if (!utils.isString(presetName)) {\n      options = presetName || {};\n      presetName = 'default';\n    }\n  }\n\n  /**\n   * MarkdownIt#inline -> ParserInline\n   *\n   * Instance of [[ParserInline]]. You may need it to add new rules when\n   * writing plugins. For simple rules control use [[MarkdownIt.disable]] and\n   * [[MarkdownIt.enable]].\n   **/\n  this.inline = new ParserInline();\n\n  /**\n   * MarkdownIt#block -> ParserBlock\n   *\n   * Instance of [[ParserBlock]]. You may need it to add new rules when\n   * writing plugins. For simple rules control use [[MarkdownIt.disable]] and\n   * [[MarkdownIt.enable]].\n   **/\n  this.block = new ParserBlock();\n\n  /**\n   * MarkdownIt#core -> Core\n   *\n   * Instance of [[Core]] chain executor. You may need it to add new rules when\n   * writing plugins. For simple rules control use [[MarkdownIt.disable]] and\n   * [[MarkdownIt.enable]].\n   **/\n  this.core = new ParserCore();\n\n  /**\n   * MarkdownIt#renderer -> Renderer\n   *\n   * Instance of [[Renderer]]. Use it to modify output look. Or to add rendering\n   * rules for new token types, generated by plugins.\n   *\n   * ##### Example\n   *\n   * ```javascript\n   * var md = require('markdown-it')();\n   *\n   * function myToken(tokens, idx, options, env, self) {\n   *   //...\n   *   return result;\n   * };\n   *\n   * md.renderer.rules['my_token'] = myToken\n   * ```\n   *\n   * See [[Renderer]] docs and [source code](https://github.com/markdown-it/markdown-it/blob/master/lib/renderer.js).\n   **/\n  this.renderer = new Renderer();\n\n  /**\n   * MarkdownIt#linkify -> LinkifyIt\n   *\n   * [linkify-it](https://github.com/markdown-it/linkify-it) instance.\n   * Used by [linkify](https://github.com/markdown-it/markdown-it/blob/master/lib/rules_core/linkify.js)\n   * rule.\n   **/\n  this.linkify = new LinkifyIt();\n\n  /**\n   * MarkdownIt#validateLink(url) -> Boolean\n   *\n   * Link validation function. CommonMark allows too much in links. By default\n   * we disable `javascript:`, `vbscript:`, `file:` schemas, and almost all `data:...` schemas\n   * except some embedded image types.\n   *\n   * You can change this behaviour:\n   *\n   * ```javascript\n   * var md = require('markdown-it')();\n   * // enable everything\n   * md.validateLink = function () { return true; }\n   * ```\n   **/\n  this.validateLink = validateLink;\n\n  /**\n   * MarkdownIt#normalizeLink(url) -> String\n   *\n   * Function used to encode link url to a machine-readable format,\n   * which includes url-encoding, punycode, etc.\n   **/\n  this.normalizeLink = normalizeLink;\n\n  /**\n   * MarkdownIt#normalizeLinkText(url) -> String\n   *\n   * Function used to decode link url to a human-readable format`\n   **/\n  this.normalizeLinkText = normalizeLinkText;\n\n\n  // Expose utils & helpers for easy acces from plugins\n\n  /**\n   * MarkdownIt#utils -> utils\n   *\n   * Assorted utility functions, useful to write plugins. See details\n   * [here](https://github.com/markdown-it/markdown-it/blob/master/lib/common/utils.js).\n   **/\n  this.utils = utils;\n\n  /**\n   * MarkdownIt#helpers -> helpers\n   *\n   * Link components parser functions, useful to write plugins. See details\n   * [here](https://github.com/markdown-it/markdown-it/blob/master/lib/helpers).\n   **/\n  this.helpers = utils.assign({}, helpers);\n\n\n  this.options = {};\n  this.configure(presetName);\n\n  if (options) { this.set(options); }\n}\n\n\n/** chainable\n * MarkdownIt.set(options)\n *\n * Set parser options (in the same format as in constructor). Probably, you\n * will never need it, but you can change options after constructor call.\n *\n * ##### Example\n *\n * ```javascript\n * var md = require('markdown-it')()\n *             .set({ html: true, breaks: true })\n *             .set({ typographer, true });\n * ```\n *\n * __Note:__ To achieve the best possible performance, don't modify a\n * `markdown-it` instance options on the fly. If you need multiple configurations\n * it's best to create multiple instances and initialize each with separate\n * config.\n **/\nMarkdownIt.prototype.set = function (options) {\n  utils.assign(this.options, options);\n  return this;\n};\n\n\n/** chainable, internal\n * MarkdownIt.configure(presets)\n *\n * Batch load of all options and compenent settings. This is internal method,\n * and you probably will not need it. But if you with - see available presets\n * and data structure [here](https://github.com/markdown-it/markdown-it/tree/master/lib/presets)\n *\n * We strongly recommend to use presets instead of direct config loads. That\n * will give better compatibility with next versions.\n **/\nMarkdownIt.prototype.configure = function (presets) {\n  var self = this, presetName;\n\n  if (utils.isString(presets)) {\n    presetName = presets;\n    presets = config[presetName];\n    if (!presets) { throw new Error('Wrong `markdown-it` preset \"' + presetName + '\", check name'); }\n  }\n\n  if (!presets) { throw new Error('Wrong `markdown-it` preset, can\\'t be empty'); }\n\n  if (presets.options) { self.set(presets.options); }\n\n  if (presets.components) {\n    Object.keys(presets.components).forEach(function (name) {\n      if (presets.components[name].rules) {\n        self[name].ruler.enableOnly(presets.components[name].rules);\n      }\n      if (presets.components[name].rules2) {\n        self[name].ruler2.enableOnly(presets.components[name].rules2);\n      }\n    });\n  }\n  return this;\n};\n\n\n/** chainable\n * MarkdownIt.enable(list, ignoreInvalid)\n * - list (String|Array): rule name or list of rule names to enable\n * - ignoreInvalid (Boolean): set `true` to ignore errors when rule not found.\n *\n * Enable list or rules. It will automatically find appropriate components,\n * containing rules with given names. If rule not found, and `ignoreInvalid`\n * not set - throws exception.\n *\n * ##### Example\n *\n * ```javascript\n * var md = require('markdown-it')()\n *             .enable(['sub', 'sup'])\n *             .disable('smartquotes');\n * ```\n **/\nMarkdownIt.prototype.enable = function (list, ignoreInvalid) {\n  var result = [];\n\n  if (!Array.isArray(list)) { list = [ list ]; }\n\n  [ 'core', 'block', 'inline' ].forEach(function (chain) {\n    result = result.concat(this[chain].ruler.enable(list, true));\n  }, this);\n\n  result = result.concat(this.inline.ruler2.enable(list, true));\n\n  var missed = list.filter(function (name) { return result.indexOf(name) < 0; });\n\n  if (missed.length && !ignoreInvalid) {\n    throw new Error('MarkdownIt. Failed to enable unknown rule(s): ' + missed);\n  }\n\n  return this;\n};\n\n\n/** chainable\n * MarkdownIt.disable(list, ignoreInvalid)\n * - list (String|Array): rule name or list of rule names to disable.\n * - ignoreInvalid (Boolean): set `true` to ignore errors when rule not found.\n *\n * The same as [[MarkdownIt.enable]], but turn specified rules off.\n **/\nMarkdownIt.prototype.disable = function (list, ignoreInvalid) {\n  var result = [];\n\n  if (!Array.isArray(list)) { list = [ list ]; }\n\n  [ 'core', 'block', 'inline' ].forEach(function (chain) {\n    result = result.concat(this[chain].ruler.disable(list, true));\n  }, this);\n\n  result = result.concat(this.inline.ruler2.disable(list, true));\n\n  var missed = list.filter(function (name) { return result.indexOf(name) < 0; });\n\n  if (missed.length && !ignoreInvalid) {\n    throw new Error('MarkdownIt. Failed to disable unknown rule(s): ' + missed);\n  }\n  return this;\n};\n\n\n/** chainable\n * MarkdownIt.use(plugin, params)\n *\n * Load specified plugin with given params into current parser instance.\n * It's just a sugar to call `plugin(md, params)` with curring.\n *\n * ##### Example\n *\n * ```javascript\n * var iterator = require('markdown-it-for-inline');\n * var md = require('markdown-it')()\n *             .use(iterator, 'foo_replace', 'text', function (tokens, idx) {\n *               tokens[idx].content = tokens[idx].content.replace(/foo/g, 'bar');\n *             });\n * ```\n **/\nMarkdownIt.prototype.use = function (plugin /*, params, ... */) {\n  var args = [ this ].concat(Array.prototype.slice.call(arguments, 1));\n  plugin.apply(plugin, args);\n  return this;\n};\n\n\n/** internal\n * MarkdownIt.parse(src, env) -> Array\n * - src (String): source string\n * - env (Object): environment sandbox\n *\n * Parse input string and returns list of block tokens (special token type\n * \"inline\" will contain list of inline tokens). You should not call this\n * method directly, until you write custom renderer (for example, to produce\n * AST).\n *\n * `env` is used to pass data between \"distributed\" rules and return additional\n * metadata like reference info, needed for the renderer. It also can be used to\n * inject data in specific cases. Usually, you will be ok to pass `{}`,\n * and then pass updated object to renderer.\n **/\nMarkdownIt.prototype.parse = function (src, env) {\n  if (typeof src !== 'string') {\n    throw new Error('Input data should be a String');\n  }\n\n  var state = new this.core.State(src, this, env);\n\n  this.core.process(state);\n\n  return state.tokens;\n};\n\n\n/**\n * MarkdownIt.render(src [, env]) -> String\n * - src (String): source string\n * - env (Object): environment sandbox\n *\n * Render markdown string into html. It does all magic for you :).\n *\n * `env` can be used to inject additional metadata (`{}` by default).\n * But you will not need it with high probability. See also comment\n * in [[MarkdownIt.parse]].\n **/\nMarkdownIt.prototype.render = function (src, env) {\n  env = env || {};\n\n  return this.renderer.render(this.parse(src, env), this.options, env);\n};\n\n\n/** internal\n * MarkdownIt.parseInline(src, env) -> Array\n * - src (String): source string\n * - env (Object): environment sandbox\n *\n * The same as [[MarkdownIt.parse]] but skip all block rules. It returns the\n * block tokens list with the single `inline` element, containing parsed inline\n * tokens in `children` property. Also updates `env` object.\n **/\nMarkdownIt.prototype.parseInline = function (src, env) {\n  var state = new this.core.State(src, this, env);\n\n  state.inlineMode = true;\n  this.core.process(state);\n\n  return state.tokens;\n};\n\n\n/**\n * MarkdownIt.renderInline(src [, env]) -> String\n * - src (String): source string\n * - env (Object): environment sandbox\n *\n * Similar to [[MarkdownIt.render]] but for single paragraph content. Result\n * will NOT be wrapped into `<p>` tags.\n **/\nMarkdownIt.prototype.renderInline = function (src, env) {\n  env = env || {};\n\n  return this.renderer.render(this.parseInline(src, env), this.options, env);\n};\n\n\nmodule.exports = MarkdownIt;\n","/** internal\n * class ParserBlock\n *\n * Block-level tokenizer.\n **/\n'use strict';\n\n\nvar Ruler           = require('./ruler');\n\n\nvar _rules = [\n  // First 2 params - rule name & source. Secondary array - list of rules,\n  // which can be terminated by this one.\n  [ 'table',      require('./rules_block/table'),      [ 'paragraph', 'reference' ] ],\n  [ 'code',       require('./rules_block/code') ],\n  [ 'fence',      require('./rules_block/fence'),      [ 'paragraph', 'reference', 'blockquote', 'list' ] ],\n  [ 'blockquote', require('./rules_block/blockquote'), [ 'paragraph', 'reference', 'blockquote', 'list' ] ],\n  [ 'hr',         require('./rules_block/hr'),         [ 'paragraph', 'reference', 'blockquote', 'list' ] ],\n  [ 'list',       require('./rules_block/list'),       [ 'paragraph', 'reference', 'blockquote' ] ],\n  [ 'reference',  require('./rules_block/reference') ],\n  [ 'heading',    require('./rules_block/heading'),    [ 'paragraph', 'reference', 'blockquote' ] ],\n  [ 'lheading',   require('./rules_block/lheading') ],\n  [ 'html_block', require('./rules_block/html_block'), [ 'paragraph', 'reference', 'blockquote' ] ],\n  [ 'paragraph',  require('./rules_block/paragraph') ]\n];\n\n\n/**\n * new ParserBlock()\n **/\nfunction ParserBlock() {\n  /**\n   * ParserBlock#ruler -> Ruler\n   *\n   * [[Ruler]] instance. Keep configuration of block rules.\n   **/\n  this.ruler = new Ruler();\n\n  for (var i = 0; i < _rules.length; i++) {\n    this.ruler.push(_rules[i][0], _rules[i][1], { alt: (_rules[i][2] || []).slice() });\n  }\n}\n\n\n// Generate tokens for input range\n//\nParserBlock.prototype.tokenize = function (state, startLine, endLine) {\n  var ok, i,\n      rules = this.ruler.getRules(''),\n      len = rules.length,\n      line = startLine,\n      hasEmptyLines = false,\n      maxNesting = state.md.options.maxNesting;\n\n  while (line < endLine) {\n    state.line = line = state.skipEmptyLines(line);\n    if (line >= endLine) { break; }\n\n    // Termination condition for nested calls.\n    // Nested calls currently used for blockquotes & lists\n    if (state.sCount[line] < state.blkIndent) { break; }\n\n    // If nesting level exceeded - skip tail to the end. That's not ordinary\n    // situation and we should not care about content.\n    if (state.level >= maxNesting) {\n      state.line = endLine;\n      break;\n    }\n\n    // Try all possible rules.\n    // On success, rule should:\n    //\n    // - update `state.line`\n    // - update `state.tokens`\n    // - return true\n\n    for (i = 0; i < len; i++) {\n      ok = rules[i](state, line, endLine, false);\n      if (ok) { break; }\n    }\n\n    // set state.tight if we had an empty line before current tag\n    // i.e. latest empty line should not count\n    state.tight = !hasEmptyLines;\n\n    // paragraph might \"eat\" one newline after it in nested lists\n    if (state.isEmpty(state.line - 1)) {\n      hasEmptyLines = true;\n    }\n\n    line = state.line;\n\n    if (line < endLine && state.isEmpty(line)) {\n      hasEmptyLines = true;\n      line++;\n      state.line = line;\n    }\n  }\n};\n\n\n/**\n * ParserBlock.parse(str, md, env, outTokens)\n *\n * Process input string and push block tokens into `outTokens`\n **/\nParserBlock.prototype.parse = function (src, md, env, outTokens) {\n  var state;\n\n  if (!src) { return; }\n\n  state = new this.State(src, md, env, outTokens);\n\n  this.tokenize(state, state.line, state.lineMax);\n};\n\n\nParserBlock.prototype.State = require('./rules_block/state_block');\n\n\nmodule.exports = ParserBlock;\n","/** internal\n * class Core\n *\n * Top-level rules executor. Glues block/inline parsers and does intermediate\n * transformations.\n **/\n'use strict';\n\n\nvar Ruler  = require('./ruler');\n\n\nvar _rules = [\n  [ 'normalize',      require('./rules_core/normalize')      ],\n  [ 'block',          require('./rules_core/block')          ],\n  [ 'inline',         require('./rules_core/inline')         ],\n  [ 'linkify',        require('./rules_core/linkify')        ],\n  [ 'replacements',   require('./rules_core/replacements')   ],\n  [ 'smartquotes',    require('./rules_core/smartquotes')    ]\n];\n\n\n/**\n * new Core()\n **/\nfunction Core() {\n  /**\n   * Core#ruler -> Ruler\n   *\n   * [[Ruler]] instance. Keep configuration of core rules.\n   **/\n  this.ruler = new Ruler();\n\n  for (var i = 0; i < _rules.length; i++) {\n    this.ruler.push(_rules[i][0], _rules[i][1]);\n  }\n}\n\n\n/**\n * Core.process(state)\n *\n * Executes core chain rules.\n **/\nCore.prototype.process = function (state) {\n  var i, l, rules;\n\n  rules = this.ruler.getRules('');\n\n  for (i = 0, l = rules.length; i < l; i++) {\n    rules[i](state);\n  }\n};\n\nCore.prototype.State = require('./rules_core/state_core');\n\n\nmodule.exports = Core;\n","/** internal\n * class ParserInline\n *\n * Tokenizes paragraph content.\n **/\n'use strict';\n\n\nvar Ruler           = require('./ruler');\n\n\n////////////////////////////////////////////////////////////////////////////////\n// Parser rules\n\nvar _rules = [\n  [ 'text',            require('./rules_inline/text') ],\n  [ 'newline',         require('./rules_inline/newline') ],\n  [ 'escape',          require('./rules_inline/escape') ],\n  [ 'backticks',       require('./rules_inline/backticks') ],\n  [ 'strikethrough',   require('./rules_inline/strikethrough').tokenize ],\n  [ 'emphasis',        require('./rules_inline/emphasis').tokenize ],\n  [ 'link',            require('./rules_inline/link') ],\n  [ 'image',           require('./rules_inline/image') ],\n  [ 'autolink',        require('./rules_inline/autolink') ],\n  [ 'html_inline',     require('./rules_inline/html_inline') ],\n  [ 'entity',          require('./rules_inline/entity') ]\n];\n\nvar _rules2 = [\n  [ 'balance_pairs',   require('./rules_inline/balance_pairs') ],\n  [ 'strikethrough',   require('./rules_inline/strikethrough').postProcess ],\n  [ 'emphasis',        require('./rules_inline/emphasis').postProcess ],\n  [ 'text_collapse',   require('./rules_inline/text_collapse') ]\n];\n\n\n/**\n * new ParserInline()\n **/\nfunction ParserInline() {\n  var i;\n\n  /**\n   * ParserInline#ruler -> Ruler\n   *\n   * [[Ruler]] instance. Keep configuration of inline rules.\n   **/\n  this.ruler = new Ruler();\n\n  for (i = 0; i < _rules.length; i++) {\n    this.ruler.push(_rules[i][0], _rules[i][1]);\n  }\n\n  /**\n   * ParserInline#ruler2 -> Ruler\n   *\n   * [[Ruler]] instance. Second ruler used for post-processing\n   * (e.g. in emphasis-like rules).\n   **/\n  this.ruler2 = new Ruler();\n\n  for (i = 0; i < _rules2.length; i++) {\n    this.ruler2.push(_rules2[i][0], _rules2[i][1]);\n  }\n}\n\n\n// Skip single token by running all rules in validation mode;\n// returns `true` if any rule reported success\n//\nParserInline.prototype.skipToken = function (state) {\n  var ok, i, pos = state.pos,\n      rules = this.ruler.getRules(''),\n      len = rules.length,\n      maxNesting = state.md.options.maxNesting,\n      cache = state.cache;\n\n\n  if (typeof cache[pos] !== 'undefined') {\n    state.pos = cache[pos];\n    return;\n  }\n\n  if (state.level < maxNesting) {\n    for (i = 0; i < len; i++) {\n      // Increment state.level and decrement it later to limit recursion.\n      // It's harmless to do here, because no tokens are created. But ideally,\n      // we'd need a separate private state variable for this purpose.\n      //\n      state.level++;\n      ok = rules[i](state, true);\n      state.level--;\n\n      if (ok) { break; }\n    }\n  } else {\n    // Too much nesting, just skip until the end of the paragraph.\n    //\n    // NOTE: this will cause links to behave incorrectly in the following case,\n    //       when an amount of `[` is exactly equal to `maxNesting + 1`:\n    //\n    //       [[[[[[[[[[[[[[[[[[[[[foo]()\n    //\n    // TODO: remove this workaround when CM standard will allow nested links\n    //       (we can replace it by preventing links from being parsed in\n    //       validation mode)\n    //\n    state.pos = state.posMax;\n  }\n\n  if (!ok) { state.pos++; }\n  cache[pos] = state.pos;\n};\n\n\n// Generate tokens for input range\n//\nParserInline.prototype.tokenize = function (state) {\n  var ok, i,\n      rules = this.ruler.getRules(''),\n      len = rules.length,\n      end = state.posMax,\n      maxNesting = state.md.options.maxNesting;\n\n  while (state.pos < end) {\n    // Try all possible rules.\n    // On success, rule should:\n    //\n    // - update `state.pos`\n    // - update `state.tokens`\n    // - return true\n\n    if (state.level < maxNesting) {\n      for (i = 0; i < len; i++) {\n        ok = rules[i](state, false);\n        if (ok) { break; }\n      }\n    }\n\n    if (ok) {\n      if (state.pos >= end) { break; }\n      continue;\n    }\n\n    state.pending += state.src[state.pos++];\n  }\n\n  if (state.pending) {\n    state.pushPending();\n  }\n};\n\n\n/**\n * ParserInline.parse(str, md, env, outTokens)\n *\n * Process input string and push inline tokens into `outTokens`\n **/\nParserInline.prototype.parse = function (str, md, env, outTokens) {\n  var i, rules, len;\n  var state = new this.State(str, md, env, outTokens);\n\n  this.tokenize(state);\n\n  rules = this.ruler2.getRules('');\n  len = rules.length;\n\n  for (i = 0; i < len; i++) {\n    rules[i](state);\n  }\n};\n\n\nParserInline.prototype.State = require('./rules_inline/state_inline');\n\n\nmodule.exports = ParserInline;\n","// Commonmark default options\n\n'use strict';\n\n\nmodule.exports = {\n  options: {\n    html:         true,         // Enable HTML tags in source\n    xhtmlOut:     true,         // Use '/' to close single tags (<br />)\n    breaks:       false,        // Convert '\\n' in paragraphs into <br>\n    langPrefix:   'language-',  // CSS language prefix for fenced blocks\n    linkify:      false,        // autoconvert URL-like texts to links\n\n    // Enable some language-neutral replacements + quotes beautification\n    typographer:  false,\n\n    // Double + single quotes replacement pairs, when typographer enabled,\n    // and smartquotes on. Could be either a String or an Array.\n    //\n    // For example, you can use '«»„“' for Russian, '„“‚‘' for German,\n    // and ['«\\xA0', '\\xA0»', '‹\\xA0', '\\xA0›'] for French (including nbsp).\n    quotes: '\\u201c\\u201d\\u2018\\u2019', /* “”‘’ */\n\n    // Highlighter function. Should return escaped HTML,\n    // or '' if the source string is not changed and should be escaped externaly.\n    // If result starts with <pre... internal wrapper is skipped.\n    //\n    // function (/*str, lang*/) { return ''; }\n    //\n    highlight: null,\n\n    maxNesting:   20            // Internal protection, recursion limit\n  },\n\n  components: {\n\n    core: {\n      rules: [\n        'normalize',\n        'block',\n        'inline'\n      ]\n    },\n\n    block: {\n      rules: [\n        'blockquote',\n        'code',\n        'fence',\n        'heading',\n        'hr',\n        'html_block',\n        'lheading',\n        'list',\n        'reference',\n        'paragraph'\n      ]\n    },\n\n    inline: {\n      rules: [\n        'autolink',\n        'backticks',\n        'emphasis',\n        'entity',\n        'escape',\n        'html_inline',\n        'image',\n        'link',\n        'newline',\n        'text'\n      ],\n      rules2: [\n        'balance_pairs',\n        'emphasis',\n        'text_collapse'\n      ]\n    }\n  }\n};\n","// markdown-it default options\n\n'use strict';\n\n\nmodule.exports = {\n  options: {\n    html:         false,        // Enable HTML tags in source\n    xhtmlOut:     false,        // Use '/' to close single tags (<br />)\n    breaks:       false,        // Convert '\\n' in paragraphs into <br>\n    langPrefix:   'language-',  // CSS language prefix for fenced blocks\n    linkify:      false,        // autoconvert URL-like texts to links\n\n    // Enable some language-neutral replacements + quotes beautification\n    typographer:  false,\n\n    // Double + single quotes replacement pairs, when typographer enabled,\n    // and smartquotes on. Could be either a String or an Array.\n    //\n    // For example, you can use '«»„“' for Russian, '„“‚‘' for German,\n    // and ['«\\xA0', '\\xA0»', '‹\\xA0', '\\xA0›'] for French (including nbsp).\n    quotes: '\\u201c\\u201d\\u2018\\u2019', /* “”‘’ */\n\n    // Highlighter function. Should return escaped HTML,\n    // or '' if the source string is not changed and should be escaped externaly.\n    // If result starts with <pre... internal wrapper is skipped.\n    //\n    // function (/*str, lang*/) { return ''; }\n    //\n    highlight: null,\n\n    maxNesting:   100            // Internal protection, recursion limit\n  },\n\n  components: {\n\n    core: {},\n    block: {},\n    inline: {}\n  }\n};\n","// \"Zero\" preset, with nothing enabled. Useful for manual configuring of simple\n// modes. For example, to parse bold/italic only.\n\n'use strict';\n\n\nmodule.exports = {\n  options: {\n    html:         false,        // Enable HTML tags in source\n    xhtmlOut:     false,        // Use '/' to close single tags (<br />)\n    breaks:       false,        // Convert '\\n' in paragraphs into <br>\n    langPrefix:   'language-',  // CSS language prefix for fenced blocks\n    linkify:      false,        // autoconvert URL-like texts to links\n\n    // Enable some language-neutral replacements + quotes beautification\n    typographer:  false,\n\n    // Double + single quotes replacement pairs, when typographer enabled,\n    // and smartquotes on. Could be either a String or an Array.\n    //\n    // For example, you can use '«»„“' for Russian, '„“‚‘' for German,\n    // and ['«\\xA0', '\\xA0»', '‹\\xA0', '\\xA0›'] for French (including nbsp).\n    quotes: '\\u201c\\u201d\\u2018\\u2019', /* “”‘’ */\n\n    // Highlighter function. Should return escaped HTML,\n    // or '' if the source string is not changed and should be escaped externaly.\n    // If result starts with <pre... internal wrapper is skipped.\n    //\n    // function (/*str, lang*/) { return ''; }\n    //\n    highlight: null,\n\n    maxNesting:   20            // Internal protection, recursion limit\n  },\n\n  components: {\n\n    core: {\n      rules: [\n        'normalize',\n        'block',\n        'inline'\n      ]\n    },\n\n    block: {\n      rules: [\n        'paragraph'\n      ]\n    },\n\n    inline: {\n      rules: [\n        'text'\n      ],\n      rules2: [\n        'balance_pairs',\n        'text_collapse'\n      ]\n    }\n  }\n};\n","/**\n * class Renderer\n *\n * Generates HTML from parsed token stream. Each instance has independent\n * copy of rules. Those can be rewritten with ease. Also, you can add new\n * rules if you create plugin and adds new token types.\n **/\n'use strict';\n\n\nvar assign          = require('./common/utils').assign;\nvar unescapeAll     = require('./common/utils').unescapeAll;\nvar escapeHtml      = require('./common/utils').escapeHtml;\n\n\n////////////////////////////////////////////////////////////////////////////////\n\nvar default_rules = {};\n\n\ndefault_rules.code_inline = function (tokens, idx, options, env, slf) {\n  var token = tokens[idx];\n\n  return  '<code' + slf.renderAttrs(token) + '>' +\n          escapeHtml(tokens[idx].content) +\n          '</code>';\n};\n\n\ndefault_rules.code_block = function (tokens, idx, options, env, slf) {\n  var token = tokens[idx];\n\n  return  '<pre' + slf.renderAttrs(token) + '><code>' +\n          escapeHtml(tokens[idx].content) +\n          '</code></pre>\\n';\n};\n\n\ndefault_rules.fence = function (tokens, idx, options, env, slf) {\n  var token = tokens[idx],\n      info = token.info ? unescapeAll(token.info).trim() : '',\n      langName = '',\n      highlighted, i, tmpAttrs, tmpToken;\n\n  if (info) {\n    langName = info.split(/\\s+/g)[0];\n  }\n\n  if (options.highlight) {\n    highlighted = options.highlight(token.content, langName) || escapeHtml(token.content);\n  } else {\n    highlighted = escapeHtml(token.content);\n  }\n\n  if (highlighted.indexOf('<pre') === 0) {\n    return highlighted + '\\n';\n  }\n\n  // If language exists, inject class gently, without modifying original token.\n  // May be, one day we will add .clone() for token and simplify this part, but\n  // now we prefer to keep things local.\n  if (info) {\n    i        = token.attrIndex('class');\n    tmpAttrs = token.attrs ? token.attrs.slice() : [];\n\n    if (i < 0) {\n      tmpAttrs.push([ 'class', options.langPrefix + langName ]);\n    } else {\n      tmpAttrs[i][1] += ' ' + options.langPrefix + langName;\n    }\n\n    // Fake token just to render attributes\n    tmpToken = {\n      attrs: tmpAttrs\n    };\n\n    return  '<pre><code' + slf.renderAttrs(tmpToken) + '>'\n          + highlighted\n          + '</code></pre>\\n';\n  }\n\n\n  return  '<pre><code' + slf.renderAttrs(token) + '>'\n        + highlighted\n        + '</code></pre>\\n';\n};\n\n\ndefault_rules.image = function (tokens, idx, options, env, slf) {\n  var token = tokens[idx];\n\n  // \"alt\" attr MUST be set, even if empty. Because it's mandatory and\n  // should be placed on proper position for tests.\n  //\n  // Replace content with actual value\n\n  token.attrs[token.attrIndex('alt')][1] =\n    slf.renderInlineAsText(token.children, options, env);\n\n  return slf.renderToken(tokens, idx, options);\n};\n\n\ndefault_rules.hardbreak = function (tokens, idx, options /*, env */) {\n  return options.xhtmlOut ? '<br />\\n' : '<br>\\n';\n};\ndefault_rules.softbreak = function (tokens, idx, options /*, env */) {\n  return options.breaks ? (options.xhtmlOut ? '<br />\\n' : '<br>\\n') : '\\n';\n};\n\n\ndefault_rules.text = function (tokens, idx /*, options, env */) {\n  return escapeHtml(tokens[idx].content);\n};\n\n\ndefault_rules.html_block = function (tokens, idx /*, options, env */) {\n  return tokens[idx].content;\n};\ndefault_rules.html_inline = function (tokens, idx /*, options, env */) {\n  return tokens[idx].content;\n};\n\n\n/**\n * new Renderer()\n *\n * Creates new [[Renderer]] instance and fill [[Renderer#rules]] with defaults.\n **/\nfunction Renderer() {\n\n  /**\n   * Renderer#rules -> Object\n   *\n   * Contains render rules for tokens. Can be updated and extended.\n   *\n   * ##### Example\n   *\n   * ```javascript\n   * var md = require('markdown-it')();\n   *\n   * md.renderer.rules.strong_open  = function () { return '<b>'; };\n   * md.renderer.rules.strong_close = function () { return '</b>'; };\n   *\n   * var result = md.renderInline(...);\n   * ```\n   *\n   * Each rule is called as independent static function with fixed signature:\n   *\n   * ```javascript\n   * function my_token_render(tokens, idx, options, env, renderer) {\n   *   // ...\n   *   return renderedHTML;\n   * }\n   * ```\n   *\n   * See [source code](https://github.com/markdown-it/markdown-it/blob/master/lib/renderer.js)\n   * for more details and examples.\n   **/\n  this.rules = assign({}, default_rules);\n}\n\n\n/**\n * Renderer.renderAttrs(token) -> String\n *\n * Render token attributes to string.\n **/\nRenderer.prototype.renderAttrs = function renderAttrs(token) {\n  var i, l, result;\n\n  if (!token.attrs) { return ''; }\n\n  result = '';\n\n  for (i = 0, l = token.attrs.length; i < l; i++) {\n    result += ' ' + escapeHtml(token.attrs[i][0]) + '=\"' + escapeHtml(token.attrs[i][1]) + '\"';\n  }\n\n  return result;\n};\n\n\n/**\n * Renderer.renderToken(tokens, idx, options) -> String\n * - tokens (Array): list of tokens\n * - idx (Numbed): token index to render\n * - options (Object): params of parser instance\n *\n * Default token renderer. Can be overriden by custom function\n * in [[Renderer#rules]].\n **/\nRenderer.prototype.renderToken = function renderToken(tokens, idx, options) {\n  var nextToken,\n      result = '',\n      needLf = false,\n      token = tokens[idx];\n\n  // Tight list paragraphs\n  if (token.hidden) {\n    return '';\n  }\n\n  // Insert a newline between hidden paragraph and subsequent opening\n  // block-level tag.\n  //\n  // For example, here we should insert a newline before blockquote:\n  //  - a\n  //    >\n  //\n  if (token.block && token.nesting !== -1 && idx && tokens[idx - 1].hidden) {\n    result += '\\n';\n  }\n\n  // Add token name, e.g. `<img`\n  result += (token.nesting === -1 ? '</' : '<') + token.tag;\n\n  // Encode attributes, e.g. `<img src=\"foo\"`\n  result += this.renderAttrs(token);\n\n  // Add a slash for self-closing tags, e.g. `<img src=\"foo\" /`\n  if (token.nesting === 0 && options.xhtmlOut) {\n    result += ' /';\n  }\n\n  // Check if we need to add a newline after this tag\n  if (token.block) {\n    needLf = true;\n\n    if (token.nesting === 1) {\n      if (idx + 1 < tokens.length) {\n        nextToken = tokens[idx + 1];\n\n        if (nextToken.type === 'inline' || nextToken.hidden) {\n          // Block-level tag containing an inline tag.\n          //\n          needLf = false;\n\n        } else if (nextToken.nesting === -1 && nextToken.tag === token.tag) {\n          // Opening tag + closing tag of the same type. E.g. `<li></li>`.\n          //\n          needLf = false;\n        }\n      }\n    }\n  }\n\n  result += needLf ? '>\\n' : '>';\n\n  return result;\n};\n\n\n/**\n * Renderer.renderInline(tokens, options, env) -> String\n * - tokens (Array): list on block tokens to renter\n * - options (Object): params of parser instance\n * - env (Object): additional data from parsed input (references, for example)\n *\n * The same as [[Renderer.render]], but for single token of `inline` type.\n **/\nRenderer.prototype.renderInline = function (tokens, options, env) {\n  var type,\n      result = '',\n      rules = this.rules;\n\n  for (var i = 0, len = tokens.length; i < len; i++) {\n    type = tokens[i].type;\n\n    if (typeof rules[type] !== 'undefined') {\n      result += rules[type](tokens, i, options, env, this);\n    } else {\n      result += this.renderToken(tokens, i, options);\n    }\n  }\n\n  return result;\n};\n\n\n/** internal\n * Renderer.renderInlineAsText(tokens, options, env) -> String\n * - tokens (Array): list on block tokens to renter\n * - options (Object): params of parser instance\n * - env (Object): additional data from parsed input (references, for example)\n *\n * Special kludge for image `alt` attributes to conform CommonMark spec.\n * Don't try to use it! Spec requires to show `alt` content with stripped markup,\n * instead of simple escaping.\n **/\nRenderer.prototype.renderInlineAsText = function (tokens, options, env) {\n  var result = '';\n\n  for (var i = 0, len = tokens.length; i < len; i++) {\n    if (tokens[i].type === 'text') {\n      result += tokens[i].content;\n    } else if (tokens[i].type === 'image') {\n      result += this.renderInlineAsText(tokens[i].children, options, env);\n    }\n  }\n\n  return result;\n};\n\n\n/**\n * Renderer.render(tokens, options, env) -> String\n * - tokens (Array): list on block tokens to renter\n * - options (Object): params of parser instance\n * - env (Object): additional data from parsed input (references, for example)\n *\n * Takes token stream and generates HTML. Probably, you will never need to call\n * this method directly.\n **/\nRenderer.prototype.render = function (tokens, options, env) {\n  var i, len, type,\n      result = '',\n      rules = this.rules;\n\n  for (i = 0, len = tokens.length; i < len; i++) {\n    type = tokens[i].type;\n\n    if (type === 'inline') {\n      result += this.renderInline(tokens[i].children, options, env);\n    } else if (typeof rules[type] !== 'undefined') {\n      result += rules[tokens[i].type](tokens, i, options, env, this);\n    } else {\n      result += this.renderToken(tokens, i, options, env);\n    }\n  }\n\n  return result;\n};\n\nmodule.exports = Renderer;\n","/**\n * class Ruler\n *\n * Helper class, used by [[MarkdownIt#core]], [[MarkdownIt#block]] and\n * [[MarkdownIt#inline]] to manage sequences of functions (rules):\n *\n * - keep rules in defined order\n * - assign the name to each rule\n * - enable/disable rules\n * - add/replace rules\n * - allow assign rules to additional named chains (in the same)\n * - cacheing lists of active rules\n *\n * You will not need use this class directly until write plugins. For simple\n * rules control use [[MarkdownIt.disable]], [[MarkdownIt.enable]] and\n * [[MarkdownIt.use]].\n **/\n'use strict';\n\n\n/**\n * new Ruler()\n **/\nfunction Ruler() {\n  // List of added rules. Each element is:\n  //\n  // {\n  //   name: XXX,\n  //   enabled: Boolean,\n  //   fn: Function(),\n  //   alt: [ name2, name3 ]\n  // }\n  //\n  this.__rules__ = [];\n\n  // Cached rule chains.\n  //\n  // First level - chain name, '' for default.\n  // Second level - diginal anchor for fast filtering by charcodes.\n  //\n  this.__cache__ = null;\n}\n\n////////////////////////////////////////////////////////////////////////////////\n// Helper methods, should not be used directly\n\n\n// Find rule index by name\n//\nRuler.prototype.__find__ = function (name) {\n  for (var i = 0; i < this.__rules__.length; i++) {\n    if (this.__rules__[i].name === name) {\n      return i;\n    }\n  }\n  return -1;\n};\n\n\n// Build rules lookup cache\n//\nRuler.prototype.__compile__ = function () {\n  var self = this;\n  var chains = [ '' ];\n\n  // collect unique names\n  self.__rules__.forEach(function (rule) {\n    if (!rule.enabled) { return; }\n\n    rule.alt.forEach(function (altName) {\n      if (chains.indexOf(altName) < 0) {\n        chains.push(altName);\n      }\n    });\n  });\n\n  self.__cache__ = {};\n\n  chains.forEach(function (chain) {\n    self.__cache__[chain] = [];\n    self.__rules__.forEach(function (rule) {\n      if (!rule.enabled) { return; }\n\n      if (chain && rule.alt.indexOf(chain) < 0) { return; }\n\n      self.__cache__[chain].push(rule.fn);\n    });\n  });\n};\n\n\n/**\n * Ruler.at(name, fn [, options])\n * - name (String): rule name to replace.\n * - fn (Function): new rule function.\n * - options (Object): new rule options (not mandatory).\n *\n * Replace rule by name with new function & options. Throws error if name not\n * found.\n *\n * ##### Options:\n *\n * - __alt__ - array with names of \"alternate\" chains.\n *\n * ##### Example\n *\n * Replace existing typorgapher replacement rule with new one:\n *\n * ```javascript\n * var md = require('markdown-it')();\n *\n * md.core.ruler.at('replacements', function replace(state) {\n *   //...\n * });\n * ```\n **/\nRuler.prototype.at = function (name, fn, options) {\n  var index = this.__find__(name);\n  var opt = options || {};\n\n  if (index === -1) { throw new Error('Parser rule not found: ' + name); }\n\n  this.__rules__[index].fn = fn;\n  this.__rules__[index].alt = opt.alt || [];\n  this.__cache__ = null;\n};\n\n\n/**\n * Ruler.before(beforeName, ruleName, fn [, options])\n * - beforeName (String): new rule will be added before this one.\n * - ruleName (String): name of added rule.\n * - fn (Function): rule function.\n * - options (Object): rule options (not mandatory).\n *\n * Add new rule to chain before one with given name. See also\n * [[Ruler.after]], [[Ruler.push]].\n *\n * ##### Options:\n *\n * - __alt__ - array with names of \"alternate\" chains.\n *\n * ##### Example\n *\n * ```javascript\n * var md = require('markdown-it')();\n *\n * md.block.ruler.before('paragraph', 'my_rule', function replace(state) {\n *   //...\n * });\n * ```\n **/\nRuler.prototype.before = function (beforeName, ruleName, fn, options) {\n  var index = this.__find__(beforeName);\n  var opt = options || {};\n\n  if (index === -1) { throw new Error('Parser rule not found: ' + beforeName); }\n\n  this.__rules__.splice(index, 0, {\n    name: ruleName,\n    enabled: true,\n    fn: fn,\n    alt: opt.alt || []\n  });\n\n  this.__cache__ = null;\n};\n\n\n/**\n * Ruler.after(afterName, ruleName, fn [, options])\n * - afterName (String): new rule will be added after this one.\n * - ruleName (String): name of added rule.\n * - fn (Function): rule function.\n * - options (Object): rule options (not mandatory).\n *\n * Add new rule to chain after one with given name. See also\n * [[Ruler.before]], [[Ruler.push]].\n *\n * ##### Options:\n *\n * - __alt__ - array with names of \"alternate\" chains.\n *\n * ##### Example\n *\n * ```javascript\n * var md = require('markdown-it')();\n *\n * md.inline.ruler.after('text', 'my_rule', function replace(state) {\n *   //...\n * });\n * ```\n **/\nRuler.prototype.after = function (afterName, ruleName, fn, options) {\n  var index = this.__find__(afterName);\n  var opt = options || {};\n\n  if (index === -1) { throw new Error('Parser rule not found: ' + afterName); }\n\n  this.__rules__.splice(index + 1, 0, {\n    name: ruleName,\n    enabled: true,\n    fn: fn,\n    alt: opt.alt || []\n  });\n\n  this.__cache__ = null;\n};\n\n/**\n * Ruler.push(ruleName, fn [, options])\n * - ruleName (String): name of added rule.\n * - fn (Function): rule function.\n * - options (Object): rule options (not mandatory).\n *\n * Push new rule to the end of chain. See also\n * [[Ruler.before]], [[Ruler.after]].\n *\n * ##### Options:\n *\n * - __alt__ - array with names of \"alternate\" chains.\n *\n * ##### Example\n *\n * ```javascript\n * var md = require('markdown-it')();\n *\n * md.core.ruler.push('my_rule', function replace(state) {\n *   //...\n * });\n * ```\n **/\nRuler.prototype.push = function (ruleName, fn, options) {\n  var opt = options || {};\n\n  this.__rules__.push({\n    name: ruleName,\n    enabled: true,\n    fn: fn,\n    alt: opt.alt || []\n  });\n\n  this.__cache__ = null;\n};\n\n\n/**\n * Ruler.enable(list [, ignoreInvalid]) -> Array\n * - list (String|Array): list of rule names to enable.\n * - ignoreInvalid (Boolean): set `true` to ignore errors when rule not found.\n *\n * Enable rules with given names. If any rule name not found - throw Error.\n * Errors can be disabled by second param.\n *\n * Returns list of found rule names (if no exception happened).\n *\n * See also [[Ruler.disable]], [[Ruler.enableOnly]].\n **/\nRuler.prototype.enable = function (list, ignoreInvalid) {\n  if (!Array.isArray(list)) { list = [ list ]; }\n\n  var result = [];\n\n  // Search by name and enable\n  list.forEach(function (name) {\n    var idx = this.__find__(name);\n\n    if (idx < 0) {\n      if (ignoreInvalid) { return; }\n      throw new Error('Rules manager: invalid rule name ' + name);\n    }\n    this.__rules__[idx].enabled = true;\n    result.push(name);\n  }, this);\n\n  this.__cache__ = null;\n  return result;\n};\n\n\n/**\n * Ruler.enableOnly(list [, ignoreInvalid])\n * - list (String|Array): list of rule names to enable (whitelist).\n * - ignoreInvalid (Boolean): set `true` to ignore errors when rule not found.\n *\n * Enable rules with given names, and disable everything else. If any rule name\n * not found - throw Error. Errors can be disabled by second param.\n *\n * See also [[Ruler.disable]], [[Ruler.enable]].\n **/\nRuler.prototype.enableOnly = function (list, ignoreInvalid) {\n  if (!Array.isArray(list)) { list = [ list ]; }\n\n  this.__rules__.forEach(function (rule) { rule.enabled = false; });\n\n  this.enable(list, ignoreInvalid);\n};\n\n\n/**\n * Ruler.disable(list [, ignoreInvalid]) -> Array\n * - list (String|Array): list of rule names to disable.\n * - ignoreInvalid (Boolean): set `true` to ignore errors when rule not found.\n *\n * Disable rules with given names. If any rule name not found - throw Error.\n * Errors can be disabled by second param.\n *\n * Returns list of found rule names (if no exception happened).\n *\n * See also [[Ruler.enable]], [[Ruler.enableOnly]].\n **/\nRuler.prototype.disable = function (list, ignoreInvalid) {\n  if (!Array.isArray(list)) { list = [ list ]; }\n\n  var result = [];\n\n  // Search by name and disable\n  list.forEach(function (name) {\n    var idx = this.__find__(name);\n\n    if (idx < 0) {\n      if (ignoreInvalid) { return; }\n      throw new Error('Rules manager: invalid rule name ' + name);\n    }\n    this.__rules__[idx].enabled = false;\n    result.push(name);\n  }, this);\n\n  this.__cache__ = null;\n  return result;\n};\n\n\n/**\n * Ruler.getRules(chainName) -> Array\n *\n * Return array of active functions (rules) for given chain name. It analyzes\n * rules configuration, compiles caches if not exists and returns result.\n *\n * Default chain name is `''` (empty string). It can't be skipped. That's\n * done intentionally, to keep signature monomorphic for high speed.\n **/\nRuler.prototype.getRules = function (chainName) {\n  if (this.__cache__ === null) {\n    this.__compile__();\n  }\n\n  // Chain can be empty, if rules disabled. But we still have to return Array.\n  return this.__cache__[chainName] || [];\n};\n\nmodule.exports = Ruler;\n","// Block quotes\n\n'use strict';\n\nvar isSpace = require('../common/utils').isSpace;\n\n\nmodule.exports = function blockquote(state, startLine, endLine, silent) {\n  var adjustTab,\n      ch,\n      i,\n      initial,\n      l,\n      lastLineEmpty,\n      lines,\n      nextLine,\n      offset,\n      oldBMarks,\n      oldBSCount,\n      oldIndent,\n      oldParentType,\n      oldSCount,\n      oldTShift,\n      spaceAfterMarker,\n      terminate,\n      terminatorRules,\n      token,\n      wasOutdented,\n      oldLineMax = state.lineMax,\n      pos = state.bMarks[startLine] + state.tShift[startLine],\n      max = state.eMarks[startLine];\n\n  // if it's indented more than 3 spaces, it should be a code block\n  if (state.sCount[startLine] - state.blkIndent >= 4) { return false; }\n\n  // check the block quote marker\n  if (state.src.charCodeAt(pos++) !== 0x3E/* > */) { return false; }\n\n  // we know that it's going to be a valid blockquote,\n  // so no point trying to find the end of it in silent mode\n  if (silent) { return true; }\n\n  // skip spaces after \">\" and re-calculate offset\n  initial = offset = state.sCount[startLine] + pos - (state.bMarks[startLine] + state.tShift[startLine]);\n\n  // skip one optional space after '>'\n  if (state.src.charCodeAt(pos) === 0x20 /* space */) {\n    // ' >   test '\n    //     ^ -- position start of line here:\n    pos++;\n    initial++;\n    offset++;\n    adjustTab = false;\n    spaceAfterMarker = true;\n  } else if (state.src.charCodeAt(pos) === 0x09 /* tab */) {\n    spaceAfterMarker = true;\n\n    if ((state.bsCount[startLine] + offset) % 4 === 3) {\n      // '  >\\t  test '\n      //       ^ -- position start of line here (tab has width===1)\n      pos++;\n      initial++;\n      offset++;\n      adjustTab = false;\n    } else {\n      // ' >\\t  test '\n      //    ^ -- position start of line here + shift bsCount slightly\n      //         to make extra space appear\n      adjustTab = true;\n    }\n  } else {\n    spaceAfterMarker = false;\n  }\n\n  oldBMarks = [ state.bMarks[startLine] ];\n  state.bMarks[startLine] = pos;\n\n  while (pos < max) {\n    ch = state.src.charCodeAt(pos);\n\n    if (isSpace(ch)) {\n      if (ch === 0x09) {\n        offset += 4 - (offset + state.bsCount[startLine] + (adjustTab ? 1 : 0)) % 4;\n      } else {\n        offset++;\n      }\n    } else {\n      break;\n    }\n\n    pos++;\n  }\n\n  oldBSCount = [ state.bsCount[startLine] ];\n  state.bsCount[startLine] = state.sCount[startLine] + 1 + (spaceAfterMarker ? 1 : 0);\n\n  lastLineEmpty = pos >= max;\n\n  oldSCount = [ state.sCount[startLine] ];\n  state.sCount[startLine] = offset - initial;\n\n  oldTShift = [ state.tShift[startLine] ];\n  state.tShift[startLine] = pos - state.bMarks[startLine];\n\n  terminatorRules = state.md.block.ruler.getRules('blockquote');\n\n  oldParentType = state.parentType;\n  state.parentType = 'blockquote';\n  wasOutdented = false;\n\n  // Search the end of the block\n  //\n  // Block ends with either:\n  //  1. an empty line outside:\n  //     ```\n  //     > test\n  //\n  //     ```\n  //  2. an empty line inside:\n  //     ```\n  //     >\n  //     test\n  //     ```\n  //  3. another tag:\n  //     ```\n  //     > test\n  //      - - -\n  //     ```\n  for (nextLine = startLine + 1; nextLine < endLine; nextLine++) {\n    // check if it's outdented, i.e. it's inside list item and indented\n    // less than said list item:\n    //\n    // ```\n    // 1. anything\n    //    > current blockquote\n    // 2. checking this line\n    // ```\n    if (state.sCount[nextLine] < state.blkIndent) wasOutdented = true;\n\n    pos = state.bMarks[nextLine] + state.tShift[nextLine];\n    max = state.eMarks[nextLine];\n\n    if (pos >= max) {\n      // Case 1: line is not inside the blockquote, and this line is empty.\n      break;\n    }\n\n    if (state.src.charCodeAt(pos++) === 0x3E/* > */ && !wasOutdented) {\n      // This line is inside the blockquote.\n\n      // skip spaces after \">\" and re-calculate offset\n      initial = offset = state.sCount[nextLine] + pos - (state.bMarks[nextLine] + state.tShift[nextLine]);\n\n      // skip one optional space after '>'\n      if (state.src.charCodeAt(pos) === 0x20 /* space */) {\n        // ' >   test '\n        //     ^ -- position start of line here:\n        pos++;\n        initial++;\n        offset++;\n        adjustTab = false;\n        spaceAfterMarker = true;\n      } else if (state.src.charCodeAt(pos) === 0x09 /* tab */) {\n        spaceAfterMarker = true;\n\n        if ((state.bsCount[nextLine] + offset) % 4 === 3) {\n          // '  >\\t  test '\n          //       ^ -- position start of line here (tab has width===1)\n          pos++;\n          initial++;\n          offset++;\n          adjustTab = false;\n        } else {\n          // ' >\\t  test '\n          //    ^ -- position start of line here + shift bsCount slightly\n          //         to make extra space appear\n          adjustTab = true;\n        }\n      } else {\n        spaceAfterMarker = false;\n      }\n\n      oldBMarks.push(state.bMarks[nextLine]);\n      state.bMarks[nextLine] = pos;\n\n      while (pos < max) {\n        ch = state.src.charCodeAt(pos);\n\n        if (isSpace(ch)) {\n          if (ch === 0x09) {\n            offset += 4 - (offset + state.bsCount[nextLine] + (adjustTab ? 1 : 0)) % 4;\n          } else {\n            offset++;\n          }\n        } else {\n          break;\n        }\n\n        pos++;\n      }\n\n      lastLineEmpty = pos >= max;\n\n      oldBSCount.push(state.bsCount[nextLine]);\n      state.bsCount[nextLine] = state.sCount[nextLine] + 1 + (spaceAfterMarker ? 1 : 0);\n\n      oldSCount.push(state.sCount[nextLine]);\n      state.sCount[nextLine] = offset - initial;\n\n      oldTShift.push(state.tShift[nextLine]);\n      state.tShift[nextLine] = pos - state.bMarks[nextLine];\n      continue;\n    }\n\n    // Case 2: line is not inside the blockquote, and the last line was empty.\n    if (lastLineEmpty) { break; }\n\n    // Case 3: another tag found.\n    terminate = false;\n    for (i = 0, l = terminatorRules.length; i < l; i++) {\n      if (terminatorRules[i](state, nextLine, endLine, true)) {\n        terminate = true;\n        break;\n      }\n    }\n\n    if (terminate) {\n      // Quirk to enforce \"hard termination mode\" for paragraphs;\n      // normally if you call `tokenize(state, startLine, nextLine)`,\n      // paragraphs will look below nextLine for paragraph continuation,\n      // but if blockquote is terminated by another tag, they shouldn't\n      state.lineMax = nextLine;\n\n      if (state.blkIndent !== 0) {\n        // state.blkIndent was non-zero, we now set it to zero,\n        // so we need to re-calculate all offsets to appear as\n        // if indent wasn't changed\n        oldBMarks.push(state.bMarks[nextLine]);\n        oldBSCount.push(state.bsCount[nextLine]);\n        oldTShift.push(state.tShift[nextLine]);\n        oldSCount.push(state.sCount[nextLine]);\n        state.sCount[nextLine] -= state.blkIndent;\n      }\n\n      break;\n    }\n\n    oldBMarks.push(state.bMarks[nextLine]);\n    oldBSCount.push(state.bsCount[nextLine]);\n    oldTShift.push(state.tShift[nextLine]);\n    oldSCount.push(state.sCount[nextLine]);\n\n    // A negative indentation means that this is a paragraph continuation\n    //\n    state.sCount[nextLine] = -1;\n  }\n\n  oldIndent = state.blkIndent;\n  state.blkIndent = 0;\n\n  token        = state.push('blockquote_open', 'blockquote', 1);\n  token.markup = '>';\n  token.map    = lines = [ startLine, 0 ];\n\n  state.md.block.tokenize(state, startLine, nextLine);\n\n  token        = state.push('blockquote_close', 'blockquote', -1);\n  token.markup = '>';\n\n  state.lineMax = oldLineMax;\n  state.parentType = oldParentType;\n  lines[1] = state.line;\n\n  // Restore original tShift; this might not be necessary since the parser\n  // has already been here, but just to make sure we can do that.\n  for (i = 0; i < oldTShift.length; i++) {\n    state.bMarks[i + startLine] = oldBMarks[i];\n    state.tShift[i + startLine] = oldTShift[i];\n    state.sCount[i + startLine] = oldSCount[i];\n    state.bsCount[i + startLine] = oldBSCount[i];\n  }\n  state.blkIndent = oldIndent;\n\n  return true;\n};\n","// Code block (4 spaces padded)\n\n'use strict';\n\n\nmodule.exports = function code(state, startLine, endLine/*, silent*/) {\n  var nextLine, last, token;\n\n  if (state.sCount[startLine] - state.blkIndent < 4) { return false; }\n\n  last = nextLine = startLine + 1;\n\n  while (nextLine < endLine) {\n    if (state.isEmpty(nextLine)) {\n      nextLine++;\n      continue;\n    }\n\n    if (state.sCount[nextLine] - state.blkIndent >= 4) {\n      nextLine++;\n      last = nextLine;\n      continue;\n    }\n    break;\n  }\n\n  state.line = last;\n\n  token         = state.push('code_block', 'code', 0);\n  token.content = state.getLines(startLine, last, 4 + state.blkIndent, true);\n  token.map     = [ startLine, state.line ];\n\n  return true;\n};\n","// fences (``` lang, ~~~ lang)\n\n'use strict';\n\n\nmodule.exports = function fence(state, startLine, endLine, silent) {\n  var marker, len, params, nextLine, mem, token, markup,\n      haveEndMarker = false,\n      pos = state.bMarks[startLine] + state.tShift[startLine],\n      max = state.eMarks[startLine];\n\n  // if it's indented more than 3 spaces, it should be a code block\n  if (state.sCount[startLine] - state.blkIndent >= 4) { return false; }\n\n  if (pos + 3 > max) { return false; }\n\n  marker = state.src.charCodeAt(pos);\n\n  if (marker !== 0x7E/* ~ */ && marker !== 0x60 /* ` */) {\n    return false;\n  }\n\n  // scan marker length\n  mem = pos;\n  pos = state.skipChars(pos, marker);\n\n  len = pos - mem;\n\n  if (len < 3) { return false; }\n\n  markup = state.src.slice(mem, pos);\n  params = state.src.slice(pos, max);\n\n  if (params.indexOf(String.fromCharCode(marker)) >= 0) { return false; }\n\n  // Since start is found, we can report success here in validation mode\n  if (silent) { return true; }\n\n  // search end of block\n  nextLine = startLine;\n\n  for (;;) {\n    nextLine++;\n    if (nextLine >= endLine) {\n      // unclosed block should be autoclosed by end of document.\n      // also block seems to be autoclosed by end of parent\n      break;\n    }\n\n    pos = mem = state.bMarks[nextLine] + state.tShift[nextLine];\n    max = state.eMarks[nextLine];\n\n    if (pos < max && state.sCount[nextLine] < state.blkIndent) {\n      // non-empty line with negative indent should stop the list:\n      // - ```\n      //  test\n      break;\n    }\n\n    if (state.src.charCodeAt(pos) !== marker) { continue; }\n\n    if (state.sCount[nextLine] - state.blkIndent >= 4) {\n      // closing fence should be indented less than 4 spaces\n      continue;\n    }\n\n    pos = state.skipChars(pos, marker);\n\n    // closing code fence must be at least as long as the opening one\n    if (pos - mem < len) { continue; }\n\n    // make sure tail has spaces only\n    pos = state.skipSpaces(pos);\n\n    if (pos < max) { continue; }\n\n    haveEndMarker = true;\n    // found!\n    break;\n  }\n\n  // If a fence has heading spaces, they should be removed from its inner block\n  len = state.sCount[startLine];\n\n  state.line = nextLine + (haveEndMarker ? 1 : 0);\n\n  token         = state.push('fence', 'code', 0);\n  token.info    = params;\n  token.content = state.getLines(startLine + 1, nextLine, len, true);\n  token.markup  = markup;\n  token.map     = [ startLine, state.line ];\n\n  return true;\n};\n","// heading (#, ##, ...)\n\n'use strict';\n\nvar isSpace = require('../common/utils').isSpace;\n\n\nmodule.exports = function heading(state, startLine, endLine, silent) {\n  var ch, level, tmp, token,\n      pos = state.bMarks[startLine] + state.tShift[startLine],\n      max = state.eMarks[startLine];\n\n  // if it's indented more than 3 spaces, it should be a code block\n  if (state.sCount[startLine] - state.blkIndent >= 4) { return false; }\n\n  ch  = state.src.charCodeAt(pos);\n\n  if (ch !== 0x23/* # */ || pos >= max) { return false; }\n\n  // count heading level\n  level = 1;\n  ch = state.src.charCodeAt(++pos);\n  while (ch === 0x23/* # */ && pos < max && level <= 6) {\n    level++;\n    ch = state.src.charCodeAt(++pos);\n  }\n\n  if (level > 6 || (pos < max && !isSpace(ch))) { return false; }\n\n  if (silent) { return true; }\n\n  // Let's cut tails like '    ###  ' from the end of string\n\n  max = state.skipSpacesBack(max, pos);\n  tmp = state.skipCharsBack(max, 0x23, pos); // #\n  if (tmp > pos && isSpace(state.src.charCodeAt(tmp - 1))) {\n    max = tmp;\n  }\n\n  state.line = startLine + 1;\n\n  token        = state.push('heading_open', 'h' + String(level), 1);\n  token.markup = '########'.slice(0, level);\n  token.map    = [ startLine, state.line ];\n\n  token          = state.push('inline', '', 0);\n  token.content  = state.src.slice(pos, max).trim();\n  token.map      = [ startLine, state.line ];\n  token.children = [];\n\n  token        = state.push('heading_close', 'h' + String(level), -1);\n  token.markup = '########'.slice(0, level);\n\n  return true;\n};\n","// Horizontal rule\n\n'use strict';\n\nvar isSpace = require('../common/utils').isSpace;\n\n\nmodule.exports = function hr(state, startLine, endLine, silent) {\n  var marker, cnt, ch, token,\n      pos = state.bMarks[startLine] + state.tShift[startLine],\n      max = state.eMarks[startLine];\n\n  // if it's indented more than 3 spaces, it should be a code block\n  if (state.sCount[startLine] - state.blkIndent >= 4) { return false; }\n\n  marker = state.src.charCodeAt(pos++);\n\n  // Check hr marker\n  if (marker !== 0x2A/* * */ &&\n      marker !== 0x2D/* - */ &&\n      marker !== 0x5F/* _ */) {\n    return false;\n  }\n\n  // markers can be mixed with spaces, but there should be at least 3 of them\n\n  cnt = 1;\n  while (pos < max) {\n    ch = state.src.charCodeAt(pos++);\n    if (ch !== marker && !isSpace(ch)) { return false; }\n    if (ch === marker) { cnt++; }\n  }\n\n  if (cnt < 3) { return false; }\n\n  if (silent) { return true; }\n\n  state.line = startLine + 1;\n\n  token        = state.push('hr', 'hr', 0);\n  token.map    = [ startLine, state.line ];\n  token.markup = Array(cnt + 1).join(String.fromCharCode(marker));\n\n  return true;\n};\n","// HTML block\n\n'use strict';\n\n\nvar block_names = require('../common/html_blocks');\nvar HTML_OPEN_CLOSE_TAG_RE = require('../common/html_re').HTML_OPEN_CLOSE_TAG_RE;\n\n// An array of opening and corresponding closing sequences for html tags,\n// last argument defines whether it can terminate a paragraph or not\n//\nvar HTML_SEQUENCES = [\n  [ /^<(script|pre|style)(?=(\\s|>|$))/i, /<\\/(script|pre|style)>/i, true ],\n  [ /^<!--/,        /-->/,   true ],\n  [ /^<\\?/,         /\\?>/,   true ],\n  [ /^<![A-Z]/,     />/,     true ],\n  [ /^<!\\[CDATA\\[/, /\\]\\]>/, true ],\n  [ new RegExp('^</?(' + block_names.join('|') + ')(?=(\\\\s|/?>|$))', 'i'), /^$/, true ],\n  [ new RegExp(HTML_OPEN_CLOSE_TAG_RE.source + '\\\\s*$'),  /^$/, false ]\n];\n\n\nmodule.exports = function html_block(state, startLine, endLine, silent) {\n  var i, nextLine, token, lineText,\n      pos = state.bMarks[startLine] + state.tShift[startLine],\n      max = state.eMarks[startLine];\n\n  // if it's indented more than 3 spaces, it should be a code block\n  if (state.sCount[startLine] - state.blkIndent >= 4) { return false; }\n\n  if (!state.md.options.html) { return false; }\n\n  if (state.src.charCodeAt(pos) !== 0x3C/* < */) { return false; }\n\n  lineText = state.src.slice(pos, max);\n\n  for (i = 0; i < HTML_SEQUENCES.length; i++) {\n    if (HTML_SEQUENCES[i][0].test(lineText)) { break; }\n  }\n\n  if (i === HTML_SEQUENCES.length) { return false; }\n\n  if (silent) {\n    // true if this sequence can be a terminator, false otherwise\n    return HTML_SEQUENCES[i][2];\n  }\n\n  nextLine = startLine + 1;\n\n  // If we are here - we detected HTML block.\n  // Let's roll down till block end.\n  if (!HTML_SEQUENCES[i][1].test(lineText)) {\n    for (; nextLine < endLine; nextLine++) {\n      if (state.sCount[nextLine] < state.blkIndent) { break; }\n\n      pos = state.bMarks[nextLine] + state.tShift[nextLine];\n      max = state.eMarks[nextLine];\n      lineText = state.src.slice(pos, max);\n\n      if (HTML_SEQUENCES[i][1].test(lineText)) {\n        if (lineText.length !== 0) { nextLine++; }\n        break;\n      }\n    }\n  }\n\n  state.line = nextLine;\n\n  token         = state.push('html_block', '', 0);\n  token.map     = [ startLine, nextLine ];\n  token.content = state.getLines(startLine, nextLine, state.blkIndent, true);\n\n  return true;\n};\n","// lheading (---, ===)\n\n'use strict';\n\n\nmodule.exports = function lheading(state, startLine, endLine/*, silent*/) {\n  var content, terminate, i, l, token, pos, max, level, marker,\n      nextLine = startLine + 1, oldParentType,\n      terminatorRules = state.md.block.ruler.getRules('paragraph');\n\n  // if it's indented more than 3 spaces, it should be a code block\n  if (state.sCount[startLine] - state.blkIndent >= 4) { return false; }\n\n  oldParentType = state.parentType;\n  state.parentType = 'paragraph'; // use paragraph to match terminatorRules\n\n  // jump line-by-line until empty one or EOF\n  for (; nextLine < endLine && !state.isEmpty(nextLine); nextLine++) {\n    // this would be a code block normally, but after paragraph\n    // it's considered a lazy continuation regardless of what's there\n    if (state.sCount[nextLine] - state.blkIndent > 3) { continue; }\n\n    //\n    // Check for underline in setext header\n    //\n    if (state.sCount[nextLine] >= state.blkIndent) {\n      pos = state.bMarks[nextLine] + state.tShift[nextLine];\n      max = state.eMarks[nextLine];\n\n      if (pos < max) {\n        marker = state.src.charCodeAt(pos);\n\n        if (marker === 0x2D/* - */ || marker === 0x3D/* = */) {\n          pos = state.skipChars(pos, marker);\n          pos = state.skipSpaces(pos);\n\n          if (pos >= max) {\n            level = (marker === 0x3D/* = */ ? 1 : 2);\n            break;\n          }\n        }\n      }\n    }\n\n    // quirk for blockquotes, this line should already be checked by that rule\n    if (state.sCount[nextLine] < 0) { continue; }\n\n    // Some tags can terminate paragraph without empty line.\n    terminate = false;\n    for (i = 0, l = terminatorRules.length; i < l; i++) {\n      if (terminatorRules[i](state, nextLine, endLine, true)) {\n        terminate = true;\n        break;\n      }\n    }\n    if (terminate) { break; }\n  }\n\n  if (!level) {\n    // Didn't find valid underline\n    return false;\n  }\n\n  content = state.getLines(startLine, nextLine, state.blkIndent, false).trim();\n\n  state.line = nextLine + 1;\n\n  token          = state.push('heading_open', 'h' + String(level), 1);\n  token.markup   = String.fromCharCode(marker);\n  token.map      = [ startLine, state.line ];\n\n  token          = state.push('inline', '', 0);\n  token.content  = content;\n  token.map      = [ startLine, state.line - 1 ];\n  token.children = [];\n\n  token          = state.push('heading_close', 'h' + String(level), -1);\n  token.markup   = String.fromCharCode(marker);\n\n  state.parentType = oldParentType;\n\n  return true;\n};\n","// Lists\n\n'use strict';\n\nvar isSpace = require('../common/utils').isSpace;\n\n\n// Search `[-+*][\\n ]`, returns next pos after marker on success\n// or -1 on fail.\nfunction skipBulletListMarker(state, startLine) {\n  var marker, pos, max, ch;\n\n  pos = state.bMarks[startLine] + state.tShift[startLine];\n  max = state.eMarks[startLine];\n\n  marker = state.src.charCodeAt(pos++);\n  // Check bullet\n  if (marker !== 0x2A/* * */ &&\n      marker !== 0x2D/* - */ &&\n      marker !== 0x2B/* + */) {\n    return -1;\n  }\n\n  if (pos < max) {\n    ch = state.src.charCodeAt(pos);\n\n    if (!isSpace(ch)) {\n      // \" -test \" - is not a list item\n      return -1;\n    }\n  }\n\n  return pos;\n}\n\n// Search `\\d+[.)][\\n ]`, returns next pos after marker on success\n// or -1 on fail.\nfunction skipOrderedListMarker(state, startLine) {\n  var ch,\n      start = state.bMarks[startLine] + state.tShift[startLine],\n      pos = start,\n      max = state.eMarks[startLine];\n\n  // List marker should have at least 2 chars (digit + dot)\n  if (pos + 1 >= max) { return -1; }\n\n  ch = state.src.charCodeAt(pos++);\n\n  if (ch < 0x30/* 0 */ || ch > 0x39/* 9 */) { return -1; }\n\n  for (;;) {\n    // EOL -> fail\n    if (pos >= max) { return -1; }\n\n    ch = state.src.charCodeAt(pos++);\n\n    if (ch >= 0x30/* 0 */ && ch <= 0x39/* 9 */) {\n\n      // List marker should have no more than 9 digits\n      // (prevents integer overflow in browsers)\n      if (pos - start >= 10) { return -1; }\n\n      continue;\n    }\n\n    // found valid marker\n    if (ch === 0x29/* ) */ || ch === 0x2e/* . */) {\n      break;\n    }\n\n    return -1;\n  }\n\n\n  if (pos < max) {\n    ch = state.src.charCodeAt(pos);\n\n    if (!isSpace(ch)) {\n      // \" 1.test \" - is not a list item\n      return -1;\n    }\n  }\n  return pos;\n}\n\nfunction markTightParagraphs(state, idx) {\n  var i, l,\n      level = state.level + 2;\n\n  for (i = idx + 2, l = state.tokens.length - 2; i < l; i++) {\n    if (state.tokens[i].level === level && state.tokens[i].type === 'paragraph_open') {\n      state.tokens[i + 2].hidden = true;\n      state.tokens[i].hidden = true;\n      i += 2;\n    }\n  }\n}\n\n\nmodule.exports = function list(state, startLine, endLine, silent) {\n  var ch,\n      contentStart,\n      i,\n      indent,\n      indentAfterMarker,\n      initial,\n      isOrdered,\n      itemLines,\n      l,\n      listLines,\n      listTokIdx,\n      markerCharCode,\n      markerValue,\n      max,\n      nextLine,\n      offset,\n      oldIndent,\n      oldLIndent,\n      oldParentType,\n      oldTShift,\n      oldTight,\n      pos,\n      posAfterMarker,\n      prevEmptyEnd,\n      start,\n      terminate,\n      terminatorRules,\n      token,\n      isTerminatingParagraph = false,\n      tight = true;\n\n  // if it's indented more than 3 spaces, it should be a code block\n  if (state.sCount[startLine] - state.blkIndent >= 4) { return false; }\n\n  // limit conditions when list can interrupt\n  // a paragraph (validation mode only)\n  if (silent && state.parentType === 'paragraph') {\n    // Next list item should still terminate previous list item;\n    //\n    // This code can fail if plugins use blkIndent as well as lists,\n    // but I hope the spec gets fixed long before that happens.\n    //\n    if (state.tShift[startLine] >= state.blkIndent) {\n      isTerminatingParagraph = true;\n    }\n  }\n\n  // Detect list type and position after marker\n  if ((posAfterMarker = skipOrderedListMarker(state, startLine)) >= 0) {\n    isOrdered = true;\n    start = state.bMarks[startLine] + state.tShift[startLine];\n    markerValue = Number(state.src.substr(start, posAfterMarker - start - 1));\n\n    // If we're starting a new ordered list right after\n    // a paragraph, it should start with 1.\n    if (isTerminatingParagraph && markerValue !== 1) return false;\n\n  } else if ((posAfterMarker = skipBulletListMarker(state, startLine)) >= 0) {\n    isOrdered = false;\n\n  } else {\n    return false;\n  }\n\n  // If we're starting a new unordered list right after\n  // a paragraph, first line should not be empty.\n  if (isTerminatingParagraph) {\n    if (state.skipSpaces(posAfterMarker) >= state.eMarks[startLine]) return false;\n  }\n\n  // We should terminate list on style change. Remember first one to compare.\n  markerCharCode = state.src.charCodeAt(posAfterMarker - 1);\n\n  // For validation mode we can terminate immediately\n  if (silent) { return true; }\n\n  // Start list\n  listTokIdx = state.tokens.length;\n\n  if (isOrdered) {\n    token       = state.push('ordered_list_open', 'ol', 1);\n    if (markerValue !== 1) {\n      token.attrs = [ [ 'start', markerValue ] ];\n    }\n\n  } else {\n    token       = state.push('bullet_list_open', 'ul', 1);\n  }\n\n  token.map    = listLines = [ startLine, 0 ];\n  token.markup = String.fromCharCode(markerCharCode);\n\n  //\n  // Iterate list items\n  //\n\n  nextLine = startLine;\n  prevEmptyEnd = false;\n  terminatorRules = state.md.block.ruler.getRules('list');\n\n  oldParentType = state.parentType;\n  state.parentType = 'list';\n\n  while (nextLine < endLine) {\n    pos = posAfterMarker;\n    max = state.eMarks[nextLine];\n\n    initial = offset = state.sCount[nextLine] + posAfterMarker - (state.bMarks[startLine] + state.tShift[startLine]);\n\n    while (pos < max) {\n      ch = state.src.charCodeAt(pos);\n\n      if (ch === 0x09) {\n        offset += 4 - (offset + state.bsCount[nextLine]) % 4;\n      } else if (ch === 0x20) {\n        offset++;\n      } else {\n        break;\n      }\n\n      pos++;\n    }\n\n    contentStart = pos;\n\n    if (contentStart >= max) {\n      // trimming space in \"-    \\n  3\" case, indent is 1 here\n      indentAfterMarker = 1;\n    } else {\n      indentAfterMarker = offset - initial;\n    }\n\n    // If we have more than 4 spaces, the indent is 1\n    // (the rest is just indented code block)\n    if (indentAfterMarker > 4) { indentAfterMarker = 1; }\n\n    // \"  -  test\"\n    //  ^^^^^ - calculating total length of this thing\n    indent = initial + indentAfterMarker;\n\n    // Run subparser & write tokens\n    token        = state.push('list_item_open', 'li', 1);\n    token.markup = String.fromCharCode(markerCharCode);\n    token.map    = itemLines = [ startLine, 0 ];\n\n    oldIndent = state.blkIndent;\n    oldTight = state.tight;\n    oldTShift = state.tShift[startLine];\n    oldLIndent = state.sCount[startLine];\n    state.blkIndent = indent;\n    state.tight = true;\n    state.tShift[startLine] = contentStart - state.bMarks[startLine];\n    state.sCount[startLine] = offset;\n\n    if (contentStart >= max && state.isEmpty(startLine + 1)) {\n      // workaround for this case\n      // (list item is empty, list terminates before \"foo\"):\n      // ~~~~~~~~\n      //   -\n      //\n      //     foo\n      // ~~~~~~~~\n      state.line = Math.min(state.line + 2, endLine);\n    } else {\n      state.md.block.tokenize(state, startLine, endLine, true);\n    }\n\n    // If any of list item is tight, mark list as tight\n    if (!state.tight || prevEmptyEnd) {\n      tight = false;\n    }\n    // Item become loose if finish with empty line,\n    // but we should filter last element, because it means list finish\n    prevEmptyEnd = (state.line - startLine) > 1 && state.isEmpty(state.line - 1);\n\n    state.blkIndent = oldIndent;\n    state.tShift[startLine] = oldTShift;\n    state.sCount[startLine] = oldLIndent;\n    state.tight = oldTight;\n\n    token        = state.push('list_item_close', 'li', -1);\n    token.markup = String.fromCharCode(markerCharCode);\n\n    nextLine = startLine = state.line;\n    itemLines[1] = nextLine;\n    contentStart = state.bMarks[startLine];\n\n    if (nextLine >= endLine) { break; }\n\n    //\n    // Try to check if list is terminated or continued.\n    //\n    if (state.sCount[nextLine] < state.blkIndent) { break; }\n\n    // fail if terminating block found\n    terminate = false;\n    for (i = 0, l = terminatorRules.length; i < l; i++) {\n      if (terminatorRules[i](state, nextLine, endLine, true)) {\n        terminate = true;\n        break;\n      }\n    }\n    if (terminate) { break; }\n\n    // fail if list has another type\n    if (isOrdered) {\n      posAfterMarker = skipOrderedListMarker(state, nextLine);\n      if (posAfterMarker < 0) { break; }\n    } else {\n      posAfterMarker = skipBulletListMarker(state, nextLine);\n      if (posAfterMarker < 0) { break; }\n    }\n\n    if (markerCharCode !== state.src.charCodeAt(posAfterMarker - 1)) { break; }\n  }\n\n  // Finalize list\n  if (isOrdered) {\n    token = state.push('ordered_list_close', 'ol', -1);\n  } else {\n    token = state.push('bullet_list_close', 'ul', -1);\n  }\n  token.markup = String.fromCharCode(markerCharCode);\n\n  listLines[1] = nextLine;\n  state.line = nextLine;\n\n  state.parentType = oldParentType;\n\n  // mark paragraphs tight if needed\n  if (tight) {\n    markTightParagraphs(state, listTokIdx);\n  }\n\n  return true;\n};\n","// Paragraph\n\n'use strict';\n\n\nmodule.exports = function paragraph(state, startLine/*, endLine*/) {\n  var content, terminate, i, l, token, oldParentType,\n      nextLine = startLine + 1,\n      terminatorRules = state.md.block.ruler.getRules('paragraph'),\n      endLine = state.lineMax;\n\n  oldParentType = state.parentType;\n  state.parentType = 'paragraph';\n\n  // jump line-by-line until empty one or EOF\n  for (; nextLine < endLine && !state.isEmpty(nextLine); nextLine++) {\n    // this would be a code block normally, but after paragraph\n    // it's considered a lazy continuation regardless of what's there\n    if (state.sCount[nextLine] - state.blkIndent > 3) { continue; }\n\n    // quirk for blockquotes, this line should already be checked by that rule\n    if (state.sCount[nextLine] < 0) { continue; }\n\n    // Some tags can terminate paragraph without empty line.\n    terminate = false;\n    for (i = 0, l = terminatorRules.length; i < l; i++) {\n      if (terminatorRules[i](state, nextLine, endLine, true)) {\n        terminate = true;\n        break;\n      }\n    }\n    if (terminate) { break; }\n  }\n\n  content = state.getLines(startLine, nextLine, state.blkIndent, false).trim();\n\n  state.line = nextLine;\n\n  token          = state.push('paragraph_open', 'p', 1);\n  token.map      = [ startLine, state.line ];\n\n  token          = state.push('inline', '', 0);\n  token.content  = content;\n  token.map      = [ startLine, state.line ];\n  token.children = [];\n\n  token          = state.push('paragraph_close', 'p', -1);\n\n  state.parentType = oldParentType;\n\n  return true;\n};\n","'use strict';\n\n\nvar normalizeReference   = require('../common/utils').normalizeReference;\nvar isSpace              = require('../common/utils').isSpace;\n\n\nmodule.exports = function reference(state, startLine, _endLine, silent) {\n  var ch,\n      destEndPos,\n      destEndLineNo,\n      endLine,\n      href,\n      i,\n      l,\n      label,\n      labelEnd,\n      oldParentType,\n      res,\n      start,\n      str,\n      terminate,\n      terminatorRules,\n      title,\n      lines = 0,\n      pos = state.bMarks[startLine] + state.tShift[startLine],\n      max = state.eMarks[startLine],\n      nextLine = startLine + 1;\n\n  // if it's indented more than 3 spaces, it should be a code block\n  if (state.sCount[startLine] - state.blkIndent >= 4) { return false; }\n\n  if (state.src.charCodeAt(pos) !== 0x5B/* [ */) { return false; }\n\n  // Simple check to quickly interrupt scan on [link](url) at the start of line.\n  // Can be useful on practice: https://github.com/markdown-it/markdown-it/issues/54\n  while (++pos < max) {\n    if (state.src.charCodeAt(pos) === 0x5D /* ] */ &&\n        state.src.charCodeAt(pos - 1) !== 0x5C/* \\ */) {\n      if (pos + 1 === max) { return false; }\n      if (state.src.charCodeAt(pos + 1) !== 0x3A/* : */) { return false; }\n      break;\n    }\n  }\n\n  endLine = state.lineMax;\n\n  // jump line-by-line until empty one or EOF\n  terminatorRules = state.md.block.ruler.getRules('reference');\n\n  oldParentType = state.parentType;\n  state.parentType = 'reference';\n\n  for (; nextLine < endLine && !state.isEmpty(nextLine); nextLine++) {\n    // this would be a code block normally, but after paragraph\n    // it's considered a lazy continuation regardless of what's there\n    if (state.sCount[nextLine] - state.blkIndent > 3) { continue; }\n\n    // quirk for blockquotes, this line should already be checked by that rule\n    if (state.sCount[nextLine] < 0) { continue; }\n\n    // Some tags can terminate paragraph without empty line.\n    terminate = false;\n    for (i = 0, l = terminatorRules.length; i < l; i++) {\n      if (terminatorRules[i](state, nextLine, endLine, true)) {\n        terminate = true;\n        break;\n      }\n    }\n    if (terminate) { break; }\n  }\n\n  str = state.getLines(startLine, nextLine, state.blkIndent, false).trim();\n  max = str.length;\n\n  for (pos = 1; pos < max; pos++) {\n    ch = str.charCodeAt(pos);\n    if (ch === 0x5B /* [ */) {\n      return false;\n    } else if (ch === 0x5D /* ] */) {\n      labelEnd = pos;\n      break;\n    } else if (ch === 0x0A /* \\n */) {\n      lines++;\n    } else if (ch === 0x5C /* \\ */) {\n      pos++;\n      if (pos < max && str.charCodeAt(pos) === 0x0A) {\n        lines++;\n      }\n    }\n  }\n\n  if (labelEnd < 0 || str.charCodeAt(labelEnd + 1) !== 0x3A/* : */) { return false; }\n\n  // [label]:   destination   'title'\n  //         ^^^ skip optional whitespace here\n  for (pos = labelEnd + 2; pos < max; pos++) {\n    ch = str.charCodeAt(pos);\n    if (ch === 0x0A) {\n      lines++;\n    } else if (isSpace(ch)) {\n      /*eslint no-empty:0*/\n    } else {\n      break;\n    }\n  }\n\n  // [label]:   destination   'title'\n  //            ^^^^^^^^^^^ parse this\n  res = state.md.helpers.parseLinkDestination(str, pos, max);\n  if (!res.ok) { return false; }\n\n  href = state.md.normalizeLink(res.str);\n  if (!state.md.validateLink(href)) { return false; }\n\n  pos = res.pos;\n  lines += res.lines;\n\n  // save cursor state, we could require to rollback later\n  destEndPos = pos;\n  destEndLineNo = lines;\n\n  // [label]:   destination   'title'\n  //                       ^^^ skipping those spaces\n  start = pos;\n  for (; pos < max; pos++) {\n    ch = str.charCodeAt(pos);\n    if (ch === 0x0A) {\n      lines++;\n    } else if (isSpace(ch)) {\n      /*eslint no-empty:0*/\n    } else {\n      break;\n    }\n  }\n\n  // [label]:   destination   'title'\n  //                          ^^^^^^^ parse this\n  res = state.md.helpers.parseLinkTitle(str, pos, max);\n  if (pos < max && start !== pos && res.ok) {\n    title = res.str;\n    pos = res.pos;\n    lines += res.lines;\n  } else {\n    title = '';\n    pos = destEndPos;\n    lines = destEndLineNo;\n  }\n\n  // skip trailing spaces until the rest of the line\n  while (pos < max) {\n    ch = str.charCodeAt(pos);\n    if (!isSpace(ch)) { break; }\n    pos++;\n  }\n\n  if (pos < max && str.charCodeAt(pos) !== 0x0A) {\n    if (title) {\n      // garbage at the end of the line after title,\n      // but it could still be a valid reference if we roll back\n      title = '';\n      pos = destEndPos;\n      lines = destEndLineNo;\n      while (pos < max) {\n        ch = str.charCodeAt(pos);\n        if (!isSpace(ch)) { break; }\n        pos++;\n      }\n    }\n  }\n\n  if (pos < max && str.charCodeAt(pos) !== 0x0A) {\n    // garbage at the end of the line\n    return false;\n  }\n\n  label = normalizeReference(str.slice(1, labelEnd));\n  if (!label) {\n    // CommonMark 0.20 disallows empty labels\n    return false;\n  }\n\n  // Reference can not terminate anything. This check is for safety only.\n  /*istanbul ignore if*/\n  if (silent) { return true; }\n\n  if (typeof state.env.references === 'undefined') {\n    state.env.references = {};\n  }\n  if (typeof state.env.references[label] === 'undefined') {\n    state.env.references[label] = { title: title, href: href };\n  }\n\n  state.parentType = oldParentType;\n\n  state.line = startLine + lines + 1;\n  return true;\n};\n","// Parser state class\n\n'use strict';\n\nvar Token = require('../token');\nvar isSpace = require('../common/utils').isSpace;\n\n\nfunction StateBlock(src, md, env, tokens) {\n  var ch, s, start, pos, len, indent, offset, indent_found;\n\n  this.src = src;\n\n  // link to parser instance\n  this.md     = md;\n\n  this.env = env;\n\n  //\n  // Internal state vartiables\n  //\n\n  this.tokens = tokens;\n\n  this.bMarks = [];  // line begin offsets for fast jumps\n  this.eMarks = [];  // line end offsets for fast jumps\n  this.tShift = [];  // offsets of the first non-space characters (tabs not expanded)\n  this.sCount = [];  // indents for each line (tabs expanded)\n\n  // An amount of virtual spaces (tabs expanded) between beginning\n  // of each line (bMarks) and real beginning of that line.\n  //\n  // It exists only as a hack because blockquotes override bMarks\n  // losing information in the process.\n  //\n  // It's used only when expanding tabs, you can think about it as\n  // an initial tab length, e.g. bsCount=21 applied to string `\\t123`\n  // means first tab should be expanded to 4-21%4 === 3 spaces.\n  //\n  this.bsCount = [];\n\n  // block parser variables\n  this.blkIndent  = 0; // required block content indent\n                       // (for example, if we are in list)\n  this.line       = 0; // line index in src\n  this.lineMax    = 0; // lines count\n  this.tight      = false;  // loose/tight mode for lists\n  this.ddIndent   = -1; // indent of the current dd block (-1 if there isn't any)\n\n  // can be 'blockquote', 'list', 'root', 'paragraph' or 'reference'\n  // used in lists to determine if they interrupt a paragraph\n  this.parentType = 'root';\n\n  this.level = 0;\n\n  // renderer\n  this.result = '';\n\n  // Create caches\n  // Generate markers.\n  s = this.src;\n  indent_found = false;\n\n  for (start = pos = indent = offset = 0, len = s.length; pos < len; pos++) {\n    ch = s.charCodeAt(pos);\n\n    if (!indent_found) {\n      if (isSpace(ch)) {\n        indent++;\n\n        if (ch === 0x09) {\n          offset += 4 - offset % 4;\n        } else {\n          offset++;\n        }\n        continue;\n      } else {\n        indent_found = true;\n      }\n    }\n\n    if (ch === 0x0A || pos === len - 1) {\n      if (ch !== 0x0A) { pos++; }\n      this.bMarks.push(start);\n      this.eMarks.push(pos);\n      this.tShift.push(indent);\n      this.sCount.push(offset);\n      this.bsCount.push(0);\n\n      indent_found = false;\n      indent = 0;\n      offset = 0;\n      start = pos + 1;\n    }\n  }\n\n  // Push fake entry to simplify cache bounds checks\n  this.bMarks.push(s.length);\n  this.eMarks.push(s.length);\n  this.tShift.push(0);\n  this.sCount.push(0);\n  this.bsCount.push(0);\n\n  this.lineMax = this.bMarks.length - 1; // don't count last fake line\n}\n\n// Push new token to \"stream\".\n//\nStateBlock.prototype.push = function (type, tag, nesting) {\n  var token = new Token(type, tag, nesting);\n  token.block = true;\n\n  if (nesting < 0) { this.level--; }\n  token.level = this.level;\n  if (nesting > 0) { this.level++; }\n\n  this.tokens.push(token);\n  return token;\n};\n\nStateBlock.prototype.isEmpty = function isEmpty(line) {\n  return this.bMarks[line] + this.tShift[line] >= this.eMarks[line];\n};\n\nStateBlock.prototype.skipEmptyLines = function skipEmptyLines(from) {\n  for (var max = this.lineMax; from < max; from++) {\n    if (this.bMarks[from] + this.tShift[from] < this.eMarks[from]) {\n      break;\n    }\n  }\n  return from;\n};\n\n// Skip spaces from given position.\nStateBlock.prototype.skipSpaces = function skipSpaces(pos) {\n  var ch;\n\n  for (var max = this.src.length; pos < max; pos++) {\n    ch = this.src.charCodeAt(pos);\n    if (!isSpace(ch)) { break; }\n  }\n  return pos;\n};\n\n// Skip spaces from given position in reverse.\nStateBlock.prototype.skipSpacesBack = function skipSpacesBack(pos, min) {\n  if (pos <= min) { return pos; }\n\n  while (pos > min) {\n    if (!isSpace(this.src.charCodeAt(--pos))) { return pos + 1; }\n  }\n  return pos;\n};\n\n// Skip char codes from given position\nStateBlock.prototype.skipChars = function skipChars(pos, code) {\n  for (var max = this.src.length; pos < max; pos++) {\n    if (this.src.charCodeAt(pos) !== code) { break; }\n  }\n  return pos;\n};\n\n// Skip char codes reverse from given position - 1\nStateBlock.prototype.skipCharsBack = function skipCharsBack(pos, code, min) {\n  if (pos <= min) { return pos; }\n\n  while (pos > min) {\n    if (code !== this.src.charCodeAt(--pos)) { return pos + 1; }\n  }\n  return pos;\n};\n\n// cut lines range from source.\nStateBlock.prototype.getLines = function getLines(begin, end, indent, keepLastLF) {\n  var i, lineIndent, ch, first, last, queue, lineStart,\n      line = begin;\n\n  if (begin >= end) {\n    return '';\n  }\n\n  queue = new Array(end - begin);\n\n  for (i = 0; line < end; line++, i++) {\n    lineIndent = 0;\n    lineStart = first = this.bMarks[line];\n\n    if (line + 1 < end || keepLastLF) {\n      // No need for bounds check because we have fake entry on tail.\n      last = this.eMarks[line] + 1;\n    } else {\n      last = this.eMarks[line];\n    }\n\n    while (first < last && lineIndent < indent) {\n      ch = this.src.charCodeAt(first);\n\n      if (isSpace(ch)) {\n        if (ch === 0x09) {\n          lineIndent += 4 - (lineIndent + this.bsCount[line]) % 4;\n        } else {\n          lineIndent++;\n        }\n      } else if (first - lineStart < this.tShift[line]) {\n        // patched tShift masked characters to look like spaces (blockquotes, list markers)\n        lineIndent++;\n      } else {\n        break;\n      }\n\n      first++;\n    }\n\n    if (lineIndent > indent) {\n      // partially expanding tabs in code blocks, e.g '\\t\\tfoobar'\n      // with indent=2 becomes '  \\tfoobar'\n      queue[i] = new Array(lineIndent - indent + 1).join(' ') + this.src.slice(first, last);\n    } else {\n      queue[i] = this.src.slice(first, last);\n    }\n  }\n\n  return queue.join('');\n};\n\n// re-export Token class to use in block rules\nStateBlock.prototype.Token = Token;\n\n\nmodule.exports = StateBlock;\n","// GFM table, non-standard\n\n'use strict';\n\nvar isSpace = require('../common/utils').isSpace;\n\n\nfunction getLine(state, line) {\n  var pos = state.bMarks[line] + state.blkIndent,\n      max = state.eMarks[line];\n\n  return state.src.substr(pos, max - pos);\n}\n\nfunction escapedSplit(str) {\n  var result = [],\n      pos = 0,\n      max = str.length,\n      ch,\n      escapes = 0,\n      lastPos = 0,\n      backTicked = false,\n      lastBackTick = 0;\n\n  ch  = str.charCodeAt(pos);\n\n  while (pos < max) {\n    if (ch === 0x60/* ` */) {\n      if (backTicked) {\n        // make \\` close code sequence, but not open it;\n        // the reason is: `\\` is correct code block\n        backTicked = false;\n        lastBackTick = pos;\n      } else if (escapes % 2 === 0) {\n        backTicked = true;\n        lastBackTick = pos;\n      }\n    } else if (ch === 0x7c/* | */ && (escapes % 2 === 0) && !backTicked) {\n      result.push(str.substring(lastPos, pos));\n      lastPos = pos + 1;\n    }\n\n    if (ch === 0x5c/* \\ */) {\n      escapes++;\n    } else {\n      escapes = 0;\n    }\n\n    pos++;\n\n    // If there was an un-closed backtick, go back to just after\n    // the last backtick, but as if it was a normal character\n    if (pos === max && backTicked) {\n      backTicked = false;\n      pos = lastBackTick + 1;\n    }\n\n    ch = str.charCodeAt(pos);\n  }\n\n  result.push(str.substring(lastPos));\n\n  return result;\n}\n\n\nmodule.exports = function table(state, startLine, endLine, silent) {\n  var ch, lineText, pos, i, nextLine, columns, columnCount, token,\n      aligns, t, tableLines, tbodyLines;\n\n  // should have at least two lines\n  if (startLine + 2 > endLine) { return false; }\n\n  nextLine = startLine + 1;\n\n  if (state.sCount[nextLine] < state.blkIndent) { return false; }\n\n  // if it's indented more than 3 spaces, it should be a code block\n  if (state.sCount[nextLine] - state.blkIndent >= 4) { return false; }\n\n  // first character of the second line should be '|', '-', ':',\n  // and no other characters are allowed but spaces;\n  // basically, this is the equivalent of /^[-:|][-:|\\s]*$/ regexp\n\n  pos = state.bMarks[nextLine] + state.tShift[nextLine];\n  if (pos >= state.eMarks[nextLine]) { return false; }\n\n  ch = state.src.charCodeAt(pos++);\n  if (ch !== 0x7C/* | */ && ch !== 0x2D/* - */ && ch !== 0x3A/* : */) { return false; }\n\n  while (pos < state.eMarks[nextLine]) {\n    ch = state.src.charCodeAt(pos);\n\n    if (ch !== 0x7C/* | */ && ch !== 0x2D/* - */ && ch !== 0x3A/* : */ && !isSpace(ch)) { return false; }\n\n    pos++;\n  }\n\n  lineText = getLine(state, startLine + 1);\n\n  columns = lineText.split('|');\n  aligns = [];\n  for (i = 0; i < columns.length; i++) {\n    t = columns[i].trim();\n    if (!t) {\n      // allow empty columns before and after table, but not in between columns;\n      // e.g. allow ` |---| `, disallow ` ---||--- `\n      if (i === 0 || i === columns.length - 1) {\n        continue;\n      } else {\n        return false;\n      }\n    }\n\n    if (!/^:?-+:?$/.test(t)) { return false; }\n    if (t.charCodeAt(t.length - 1) === 0x3A/* : */) {\n      aligns.push(t.charCodeAt(0) === 0x3A/* : */ ? 'center' : 'right');\n    } else if (t.charCodeAt(0) === 0x3A/* : */) {\n      aligns.push('left');\n    } else {\n      aligns.push('');\n    }\n  }\n\n  lineText = getLine(state, startLine).trim();\n  if (lineText.indexOf('|') === -1) { return false; }\n  if (state.sCount[startLine] - state.blkIndent >= 4) { return false; }\n  columns = escapedSplit(lineText.replace(/^\\||\\|$/g, ''));\n\n  // header row will define an amount of columns in the entire table,\n  // and align row shouldn't be smaller than that (the rest of the rows can)\n  columnCount = columns.length;\n  if (columnCount > aligns.length) { return false; }\n\n  if (silent) { return true; }\n\n  token     = state.push('table_open', 'table', 1);\n  token.map = tableLines = [ startLine, 0 ];\n\n  token     = state.push('thead_open', 'thead', 1);\n  token.map = [ startLine, startLine + 1 ];\n\n  token     = state.push('tr_open', 'tr', 1);\n  token.map = [ startLine, startLine + 1 ];\n\n  for (i = 0; i < columns.length; i++) {\n    token          = state.push('th_open', 'th', 1);\n    token.map      = [ startLine, startLine + 1 ];\n    if (aligns[i]) {\n      token.attrs  = [ [ 'style', 'text-align:' + aligns[i] ] ];\n    }\n\n    token          = state.push('inline', '', 0);\n    token.content  = columns[i].trim();\n    token.map      = [ startLine, startLine + 1 ];\n    token.children = [];\n\n    token          = state.push('th_close', 'th', -1);\n  }\n\n  token     = state.push('tr_close', 'tr', -1);\n  token     = state.push('thead_close', 'thead', -1);\n\n  token     = state.push('tbody_open', 'tbody', 1);\n  token.map = tbodyLines = [ startLine + 2, 0 ];\n\n  for (nextLine = startLine + 2; nextLine < endLine; nextLine++) {\n    if (state.sCount[nextLine] < state.blkIndent) { break; }\n\n    lineText = getLine(state, nextLine).trim();\n    if (lineText.indexOf('|') === -1) { break; }\n    if (state.sCount[nextLine] - state.blkIndent >= 4) { break; }\n    columns = escapedSplit(lineText.replace(/^\\||\\|$/g, ''));\n\n    token = state.push('tr_open', 'tr', 1);\n    for (i = 0; i < columnCount; i++) {\n      token          = state.push('td_open', 'td', 1);\n      if (aligns[i]) {\n        token.attrs  = [ [ 'style', 'text-align:' + aligns[i] ] ];\n      }\n\n      token          = state.push('inline', '', 0);\n      token.content  = columns[i] ? columns[i].trim() : '';\n      token.children = [];\n\n      token          = state.push('td_close', 'td', -1);\n    }\n    token = state.push('tr_close', 'tr', -1);\n  }\n  token = state.push('tbody_close', 'tbody', -1);\n  token = state.push('table_close', 'table', -1);\n\n  tableLines[1] = tbodyLines[1] = nextLine;\n  state.line = nextLine;\n  return true;\n};\n","'use strict';\n\n\nmodule.exports = function block(state) {\n  var token;\n\n  if (state.inlineMode) {\n    token          = new state.Token('inline', '', 0);\n    token.content  = state.src;\n    token.map      = [ 0, 1 ];\n    token.children = [];\n    state.tokens.push(token);\n  } else {\n    state.md.block.parse(state.src, state.md, state.env, state.tokens);\n  }\n};\n","'use strict';\n\nmodule.exports = function inline(state) {\n  var tokens = state.tokens, tok, i, l;\n\n  // Parse inlines\n  for (i = 0, l = tokens.length; i < l; i++) {\n    tok = tokens[i];\n    if (tok.type === 'inline') {\n      state.md.inline.parse(tok.content, state.md, state.env, tok.children);\n    }\n  }\n};\n","// Replace link-like texts with link nodes.\n//\n// Currently restricted by `md.validateLink()` to http/https/ftp\n//\n'use strict';\n\n\nvar arrayReplaceAt = require('../common/utils').arrayReplaceAt;\n\n\nfunction isLinkOpen(str) {\n  return /^<a[>\\s]/i.test(str);\n}\nfunction isLinkClose(str) {\n  return /^<\\/a\\s*>/i.test(str);\n}\n\n\nmodule.exports = function linkify(state) {\n  var i, j, l, tokens, token, currentToken, nodes, ln, text, pos, lastPos,\n      level, htmlLinkLevel, url, fullUrl, urlText,\n      blockTokens = state.tokens,\n      links;\n\n  if (!state.md.options.linkify) { return; }\n\n  for (j = 0, l = blockTokens.length; j < l; j++) {\n    if (blockTokens[j].type !== 'inline' ||\n        !state.md.linkify.pretest(blockTokens[j].content)) {\n      continue;\n    }\n\n    tokens = blockTokens[j].children;\n\n    htmlLinkLevel = 0;\n\n    // We scan from the end, to keep position when new tags added.\n    // Use reversed logic in links start/end match\n    for (i = tokens.length - 1; i >= 0; i--) {\n      currentToken = tokens[i];\n\n      // Skip content of markdown links\n      if (currentToken.type === 'link_close') {\n        i--;\n        while (tokens[i].level !== currentToken.level && tokens[i].type !== 'link_open') {\n          i--;\n        }\n        continue;\n      }\n\n      // Skip content of html tag links\n      if (currentToken.type === 'html_inline') {\n        if (isLinkOpen(currentToken.content) && htmlLinkLevel > 0) {\n          htmlLinkLevel--;\n        }\n        if (isLinkClose(currentToken.content)) {\n          htmlLinkLevel++;\n        }\n      }\n      if (htmlLinkLevel > 0) { continue; }\n\n      if (currentToken.type === 'text' && state.md.linkify.test(currentToken.content)) {\n\n        text = currentToken.content;\n        links = state.md.linkify.match(text);\n\n        // Now split string to nodes\n        nodes = [];\n        level = currentToken.level;\n        lastPos = 0;\n\n        for (ln = 0; ln < links.length; ln++) {\n\n          url = links[ln].url;\n          fullUrl = state.md.normalizeLink(url);\n          if (!state.md.validateLink(fullUrl)) { continue; }\n\n          urlText = links[ln].text;\n\n          // Linkifier might send raw hostnames like \"example.com\", where url\n          // starts with domain name. So we prepend http:// in those cases,\n          // and remove it afterwards.\n          //\n          if (!links[ln].schema) {\n            urlText = state.md.normalizeLinkText('http://' + urlText).replace(/^http:\\/\\//, '');\n          } else if (links[ln].schema === 'mailto:' && !/^mailto:/i.test(urlText)) {\n            urlText = state.md.normalizeLinkText('mailto:' + urlText).replace(/^mailto:/, '');\n          } else {\n            urlText = state.md.normalizeLinkText(urlText);\n          }\n\n          pos = links[ln].index;\n\n          if (pos > lastPos) {\n            token         = new state.Token('text', '', 0);\n            token.content = text.slice(lastPos, pos);\n            token.level   = level;\n            nodes.push(token);\n          }\n\n          token         = new state.Token('link_open', 'a', 1);\n          token.attrs   = [ [ 'href', fullUrl ] ];\n          token.level   = level++;\n          token.markup  = 'linkify';\n          token.info    = 'auto';\n          nodes.push(token);\n\n          token         = new state.Token('text', '', 0);\n          token.content = urlText;\n          token.level   = level;\n          nodes.push(token);\n\n          token         = new state.Token('link_close', 'a', -1);\n          token.level   = --level;\n          token.markup  = 'linkify';\n          token.info    = 'auto';\n          nodes.push(token);\n\n          lastPos = links[ln].lastIndex;\n        }\n        if (lastPos < text.length) {\n          token         = new state.Token('text', '', 0);\n          token.content = text.slice(lastPos);\n          token.level   = level;\n          nodes.push(token);\n        }\n\n        // replace current node\n        blockTokens[j].children = tokens = arrayReplaceAt(tokens, i, nodes);\n      }\n    }\n  }\n};\n","// Normalize input string\n\n'use strict';\n\n\nvar NEWLINES_RE  = /\\r[\\n\\u0085]?|[\\u2424\\u2028\\u0085]/g;\nvar NULL_RE      = /\\u0000/g;\n\n\nmodule.exports = function inline(state) {\n  var str;\n\n  // Normalize newlines\n  str = state.src.replace(NEWLINES_RE, '\\n');\n\n  // Replace NULL characters\n  str = str.replace(NULL_RE, '\\uFFFD');\n\n  state.src = str;\n};\n","// Simple typographyc replacements\n//\n// (c) (C) → ©\n// (tm) (TM) → ™\n// (r) (R) → ®\n// +- → ±\n// (p) (P) -> §\n// ... → … (also ?.... → ?.., !.... → !..)\n// ???????? → ???, !!!!! → !!!, `,,` → `,`\n// -- → &ndash;, --- → &mdash;\n//\n'use strict';\n\n// TODO:\n// - fractionals 1/2, 1/4, 3/4 -> ½, ¼, ¾\n// - miltiplication 2 x 4 -> 2 × 4\n\nvar RARE_RE = /\\+-|\\.\\.|\\?\\?\\?\\?|!!!!|,,|--/;\n\n// Workaround for phantomjs - need regex without /g flag,\n// or root check will fail every second time\nvar SCOPED_ABBR_TEST_RE = /\\((c|tm|r|p)\\)/i;\n\nvar SCOPED_ABBR_RE = /\\((c|tm|r|p)\\)/ig;\nvar SCOPED_ABBR = {\n  c: '©',\n  r: '®',\n  p: '§',\n  tm: '™'\n};\n\nfunction replaceFn(match, name) {\n  return SCOPED_ABBR[name.toLowerCase()];\n}\n\nfunction replace_scoped(inlineTokens) {\n  var i, token, inside_autolink = 0;\n\n  for (i = inlineTokens.length - 1; i >= 0; i--) {\n    token = inlineTokens[i];\n\n    if (token.type === 'text' && !inside_autolink) {\n      token.content = token.content.replace(SCOPED_ABBR_RE, replaceFn);\n    }\n\n    if (token.type === 'link_open' && token.info === 'auto') {\n      inside_autolink--;\n    }\n\n    if (token.type === 'link_close' && token.info === 'auto') {\n      inside_autolink++;\n    }\n  }\n}\n\nfunction replace_rare(inlineTokens) {\n  var i, token, inside_autolink = 0;\n\n  for (i = inlineTokens.length - 1; i >= 0; i--) {\n    token = inlineTokens[i];\n\n    if (token.type === 'text' && !inside_autolink) {\n      if (RARE_RE.test(token.content)) {\n        token.content = token.content\n                    .replace(/\\+-/g, '±')\n                    // .., ..., ....... -> …\n                    // but ?..... & !..... -> ?.. & !..\n                    .replace(/\\.{2,}/g, '…').replace(/([?!])…/g, '$1..')\n                    .replace(/([?!]){4,}/g, '$1$1$1').replace(/,{2,}/g, ',')\n                    // em-dash\n                    .replace(/(^|[^-])---([^-]|$)/mg, '$1\\u2014$2')\n                    // en-dash\n                    .replace(/(^|\\s)--(\\s|$)/mg, '$1\\u2013$2')\n                    .replace(/(^|[^-\\s])--([^-\\s]|$)/mg, '$1\\u2013$2');\n      }\n    }\n\n    if (token.type === 'link_open' && token.info === 'auto') {\n      inside_autolink--;\n    }\n\n    if (token.type === 'link_close' && token.info === 'auto') {\n      inside_autolink++;\n    }\n  }\n}\n\n\nmodule.exports = function replace(state) {\n  var blkIdx;\n\n  if (!state.md.options.typographer) { return; }\n\n  for (blkIdx = state.tokens.length - 1; blkIdx >= 0; blkIdx--) {\n\n    if (state.tokens[blkIdx].type !== 'inline') { continue; }\n\n    if (SCOPED_ABBR_TEST_RE.test(state.tokens[blkIdx].content)) {\n      replace_scoped(state.tokens[blkIdx].children);\n    }\n\n    if (RARE_RE.test(state.tokens[blkIdx].content)) {\n      replace_rare(state.tokens[blkIdx].children);\n    }\n\n  }\n};\n","// Convert straight quotation marks to typographic ones\n//\n'use strict';\n\n\nvar isWhiteSpace   = require('../common/utils').isWhiteSpace;\nvar isPunctChar    = require('../common/utils').isPunctChar;\nvar isMdAsciiPunct = require('../common/utils').isMdAsciiPunct;\n\nvar QUOTE_TEST_RE = /['\"]/;\nvar QUOTE_RE = /['\"]/g;\nvar APOSTROPHE = '\\u2019'; /* ’ */\n\n\nfunction replaceAt(str, index, ch) {\n  return str.substr(0, index) + ch + str.substr(index + 1);\n}\n\nfunction process_inlines(tokens, state) {\n  var i, token, text, t, pos, max, thisLevel, item, lastChar, nextChar,\n      isLastPunctChar, isNextPunctChar, isLastWhiteSpace, isNextWhiteSpace,\n      canOpen, canClose, j, isSingle, stack, openQuote, closeQuote;\n\n  stack = [];\n\n  for (i = 0; i < tokens.length; i++) {\n    token = tokens[i];\n\n    thisLevel = tokens[i].level;\n\n    for (j = stack.length - 1; j >= 0; j--) {\n      if (stack[j].level <= thisLevel) { break; }\n    }\n    stack.length = j + 1;\n\n    if (token.type !== 'text') { continue; }\n\n    text = token.content;\n    pos = 0;\n    max = text.length;\n\n    /*eslint no-labels:0,block-scoped-var:0*/\n    OUTER:\n    while (pos < max) {\n      QUOTE_RE.lastIndex = pos;\n      t = QUOTE_RE.exec(text);\n      if (!t) { break; }\n\n      canOpen = canClose = true;\n      pos = t.index + 1;\n      isSingle = (t[0] === \"'\");\n\n      // Find previous character,\n      // default to space if it's the beginning of the line\n      //\n      lastChar = 0x20;\n\n      if (t.index - 1 >= 0) {\n        lastChar = text.charCodeAt(t.index - 1);\n      } else {\n        for (j = i - 1; j >= 0; j--) {\n          if (tokens[j].type === 'softbreak' || tokens[j].type === 'hardbreak') break; // lastChar defaults to 0x20\n          if (tokens[j].type !== 'text') continue;\n\n          lastChar = tokens[j].content.charCodeAt(tokens[j].content.length - 1);\n          break;\n        }\n      }\n\n      // Find next character,\n      // default to space if it's the end of the line\n      //\n      nextChar = 0x20;\n\n      if (pos < max) {\n        nextChar = text.charCodeAt(pos);\n      } else {\n        for (j = i + 1; j < tokens.length; j++) {\n          if (tokens[j].type === 'softbreak' || tokens[j].type === 'hardbreak') break; // nextChar defaults to 0x20\n          if (tokens[j].type !== 'text') continue;\n\n          nextChar = tokens[j].content.charCodeAt(0);\n          break;\n        }\n      }\n\n      isLastPunctChar = isMdAsciiPunct(lastChar) || isPunctChar(String.fromCharCode(lastChar));\n      isNextPunctChar = isMdAsciiPunct(nextChar) || isPunctChar(String.fromCharCode(nextChar));\n\n      isLastWhiteSpace = isWhiteSpace(lastChar);\n      isNextWhiteSpace = isWhiteSpace(nextChar);\n\n      if (isNextWhiteSpace) {\n        canOpen = false;\n      } else if (isNextPunctChar) {\n        if (!(isLastWhiteSpace || isLastPunctChar)) {\n          canOpen = false;\n        }\n      }\n\n      if (isLastWhiteSpace) {\n        canClose = false;\n      } else if (isLastPunctChar) {\n        if (!(isNextWhiteSpace || isNextPunctChar)) {\n          canClose = false;\n        }\n      }\n\n      if (nextChar === 0x22 /* \" */ && t[0] === '\"') {\n        if (lastChar >= 0x30 /* 0 */ && lastChar <= 0x39 /* 9 */) {\n          // special case: 1\"\" - count first quote as an inch\n          canClose = canOpen = false;\n        }\n      }\n\n      if (canOpen && canClose) {\n        // treat this as the middle of the word\n        canOpen = false;\n        canClose = isNextPunctChar;\n      }\n\n      if (!canOpen && !canClose) {\n        // middle of word\n        if (isSingle) {\n          token.content = replaceAt(token.content, t.index, APOSTROPHE);\n        }\n        continue;\n      }\n\n      if (canClose) {\n        // this could be a closing quote, rewind the stack to get a match\n        for (j = stack.length - 1; j >= 0; j--) {\n          item = stack[j];\n          if (stack[j].level < thisLevel) { break; }\n          if (item.single === isSingle && stack[j].level === thisLevel) {\n            item = stack[j];\n\n            if (isSingle) {\n              openQuote = state.md.options.quotes[2];\n              closeQuote = state.md.options.quotes[3];\n            } else {\n              openQuote = state.md.options.quotes[0];\n              closeQuote = state.md.options.quotes[1];\n            }\n\n            // replace token.content *before* tokens[item.token].content,\n            // because, if they are pointing at the same token, replaceAt\n            // could mess up indices when quote length != 1\n            token.content = replaceAt(token.content, t.index, closeQuote);\n            tokens[item.token].content = replaceAt(\n              tokens[item.token].content, item.pos, openQuote);\n\n            pos += closeQuote.length - 1;\n            if (item.token === i) { pos += openQuote.length - 1; }\n\n            text = token.content;\n            max = text.length;\n\n            stack.length = j;\n            continue OUTER;\n          }\n        }\n      }\n\n      if (canOpen) {\n        stack.push({\n          token: i,\n          pos: t.index,\n          single: isSingle,\n          level: thisLevel\n        });\n      } else if (canClose && isSingle) {\n        token.content = replaceAt(token.content, t.index, APOSTROPHE);\n      }\n    }\n  }\n}\n\n\nmodule.exports = function smartquotes(state) {\n  /*eslint max-depth:0*/\n  var blkIdx;\n\n  if (!state.md.options.typographer) { return; }\n\n  for (blkIdx = state.tokens.length - 1; blkIdx >= 0; blkIdx--) {\n\n    if (state.tokens[blkIdx].type !== 'inline' ||\n        !QUOTE_TEST_RE.test(state.tokens[blkIdx].content)) {\n      continue;\n    }\n\n    process_inlines(state.tokens[blkIdx].children, state);\n  }\n};\n","// Core state object\n//\n'use strict';\n\nvar Token = require('../token');\n\n\nfunction StateCore(src, md, env) {\n  this.src = src;\n  this.env = env;\n  this.tokens = [];\n  this.inlineMode = false;\n  this.md = md; // link to parser instance\n}\n\n// re-export Token class to use in core rules\nStateCore.prototype.Token = Token;\n\n\nmodule.exports = StateCore;\n","// Process autolinks '<protocol:...>'\n\n'use strict';\n\n\n/*eslint max-len:0*/\nvar EMAIL_RE    = /^<([a-zA-Z0-9.!#$%&'*+\\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*)>/;\nvar AUTOLINK_RE = /^<([a-zA-Z][a-zA-Z0-9+.\\-]{1,31}):([^<>\\x00-\\x20]*)>/;\n\n\nmodule.exports = function autolink(state, silent) {\n  var tail, linkMatch, emailMatch, url, fullUrl, token,\n      pos = state.pos;\n\n  if (state.src.charCodeAt(pos) !== 0x3C/* < */) { return false; }\n\n  tail = state.src.slice(pos);\n\n  if (tail.indexOf('>') < 0) { return false; }\n\n  if (AUTOLINK_RE.test(tail)) {\n    linkMatch = tail.match(AUTOLINK_RE);\n\n    url = linkMatch[0].slice(1, -1);\n    fullUrl = state.md.normalizeLink(url);\n    if (!state.md.validateLink(fullUrl)) { return false; }\n\n    if (!silent) {\n      token         = state.push('link_open', 'a', 1);\n      token.attrs   = [ [ 'href', fullUrl ] ];\n      token.markup  = 'autolink';\n      token.info    = 'auto';\n\n      token         = state.push('text', '', 0);\n      token.content = state.md.normalizeLinkText(url);\n\n      token         = state.push('link_close', 'a', -1);\n      token.markup  = 'autolink';\n      token.info    = 'auto';\n    }\n\n    state.pos += linkMatch[0].length;\n    return true;\n  }\n\n  if (EMAIL_RE.test(tail)) {\n    emailMatch = tail.match(EMAIL_RE);\n\n    url = emailMatch[0].slice(1, -1);\n    fullUrl = state.md.normalizeLink('mailto:' + url);\n    if (!state.md.validateLink(fullUrl)) { return false; }\n\n    if (!silent) {\n      token         = state.push('link_open', 'a', 1);\n      token.attrs   = [ [ 'href', fullUrl ] ];\n      token.markup  = 'autolink';\n      token.info    = 'auto';\n\n      token         = state.push('text', '', 0);\n      token.content = state.md.normalizeLinkText(url);\n\n      token         = state.push('link_close', 'a', -1);\n      token.markup  = 'autolink';\n      token.info    = 'auto';\n    }\n\n    state.pos += emailMatch[0].length;\n    return true;\n  }\n\n  return false;\n};\n","// Parse backticks\n\n'use strict';\n\nmodule.exports = function backtick(state, silent) {\n  var start, max, marker, matchStart, matchEnd, token,\n      pos = state.pos,\n      ch = state.src.charCodeAt(pos);\n\n  if (ch !== 0x60/* ` */) { return false; }\n\n  start = pos;\n  pos++;\n  max = state.posMax;\n\n  while (pos < max && state.src.charCodeAt(pos) === 0x60/* ` */) { pos++; }\n\n  marker = state.src.slice(start, pos);\n\n  matchStart = matchEnd = pos;\n\n  while ((matchStart = state.src.indexOf('`', matchEnd)) !== -1) {\n    matchEnd = matchStart + 1;\n\n    while (matchEnd < max && state.src.charCodeAt(matchEnd) === 0x60/* ` */) { matchEnd++; }\n\n    if (matchEnd - matchStart === marker.length) {\n      if (!silent) {\n        token         = state.push('code_inline', 'code', 0);\n        token.markup  = marker;\n        token.content = state.src.slice(pos, matchStart)\n                                 .replace(/[ \\n]+/g, ' ')\n                                 .trim();\n      }\n      state.pos = matchEnd;\n      return true;\n    }\n  }\n\n  if (!silent) { state.pending += marker; }\n  state.pos += marker.length;\n  return true;\n};\n","// For each opening emphasis-like marker find a matching closing one\n//\n'use strict';\n\n\nmodule.exports = function link_pairs(state) {\n  var i, j, lastDelim, currDelim,\n      delimiters = state.delimiters,\n      max = state.delimiters.length;\n\n  for (i = 0; i < max; i++) {\n    lastDelim = delimiters[i];\n\n    if (!lastDelim.close) { continue; }\n\n    j = i - lastDelim.jump - 1;\n\n    while (j >= 0) {\n      currDelim = delimiters[j];\n\n      if (currDelim.open &&\n          currDelim.marker === lastDelim.marker &&\n          currDelim.end < 0 &&\n          currDelim.level === lastDelim.level) {\n\n        // typeofs are for backward compatibility with plugins\n        var odd_match = (currDelim.close || lastDelim.open) &&\n                        typeof currDelim.length !== 'undefined' &&\n                        typeof lastDelim.length !== 'undefined' &&\n                        (currDelim.length + lastDelim.length) % 3 === 0;\n\n        if (!odd_match) {\n          lastDelim.jump = i - j;\n          lastDelim.open = false;\n          currDelim.end  = i;\n          currDelim.jump = 0;\n          break;\n        }\n      }\n\n      j -= currDelim.jump + 1;\n    }\n  }\n};\n","// Process *this* and _that_\n//\n'use strict';\n\n\n// Insert each marker as a separate text token, and add it to delimiter list\n//\nmodule.exports.tokenize = function emphasis(state, silent) {\n  var i, scanned, token,\n      start = state.pos,\n      marker = state.src.charCodeAt(start);\n\n  if (silent) { return false; }\n\n  if (marker !== 0x5F /* _ */ && marker !== 0x2A /* * */) { return false; }\n\n  scanned = state.scanDelims(state.pos, marker === 0x2A);\n\n  for (i = 0; i < scanned.length; i++) {\n    token         = state.push('text', '', 0);\n    token.content = String.fromCharCode(marker);\n\n    state.delimiters.push({\n      // Char code of the starting marker (number).\n      //\n      marker: marker,\n\n      // Total length of these series of delimiters.\n      //\n      length: scanned.length,\n\n      // An amount of characters before this one that's equivalent to\n      // current one. In plain English: if this delimiter does not open\n      // an emphasis, neither do previous `jump` characters.\n      //\n      // Used to skip sequences like \"*****\" in one step, for 1st asterisk\n      // value will be 0, for 2nd it's 1 and so on.\n      //\n      jump:   i,\n\n      // A position of the token this delimiter corresponds to.\n      //\n      token:  state.tokens.length - 1,\n\n      // Token level.\n      //\n      level:  state.level,\n\n      // If this delimiter is matched as a valid opener, `end` will be\n      // equal to its position, otherwise it's `-1`.\n      //\n      end:    -1,\n\n      // Boolean flags that determine if this delimiter could open or close\n      // an emphasis.\n      //\n      open:   scanned.can_open,\n      close:  scanned.can_close\n    });\n  }\n\n  state.pos += scanned.length;\n\n  return true;\n};\n\n\n// Walk through delimiter list and replace text tokens with tags\n//\nmodule.exports.postProcess = function emphasis(state) {\n  var i,\n      startDelim,\n      endDelim,\n      token,\n      ch,\n      isStrong,\n      delimiters = state.delimiters,\n      max = state.delimiters.length;\n\n  for (i = max - 1; i >= 0; i--) {\n    startDelim = delimiters[i];\n\n    if (startDelim.marker !== 0x5F/* _ */ && startDelim.marker !== 0x2A/* * */) {\n      continue;\n    }\n\n    // Process only opening markers\n    if (startDelim.end === -1) {\n      continue;\n    }\n\n    endDelim = delimiters[startDelim.end];\n\n    // If the previous delimiter has the same marker and is adjacent to this one,\n    // merge those into one strong delimiter.\n    //\n    // `<em><em>whatever</em></em>` -> `<strong>whatever</strong>`\n    //\n    isStrong = i > 0 &&\n               delimiters[i - 1].end === startDelim.end + 1 &&\n               delimiters[i - 1].token === startDelim.token - 1 &&\n               delimiters[startDelim.end + 1].token === endDelim.token + 1 &&\n               delimiters[i - 1].marker === startDelim.marker;\n\n    ch = String.fromCharCode(startDelim.marker);\n\n    token         = state.tokens[startDelim.token];\n    token.type    = isStrong ? 'strong_open' : 'em_open';\n    token.tag     = isStrong ? 'strong' : 'em';\n    token.nesting = 1;\n    token.markup  = isStrong ? ch + ch : ch;\n    token.content = '';\n\n    token         = state.tokens[endDelim.token];\n    token.type    = isStrong ? 'strong_close' : 'em_close';\n    token.tag     = isStrong ? 'strong' : 'em';\n    token.nesting = -1;\n    token.markup  = isStrong ? ch + ch : ch;\n    token.content = '';\n\n    if (isStrong) {\n      state.tokens[delimiters[i - 1].token].content = '';\n      state.tokens[delimiters[startDelim.end + 1].token].content = '';\n      i--;\n    }\n  }\n};\n","// Process html entity - &#123;, &#xAF;, &quot;, ...\n\n'use strict';\n\nvar entities          = require('../common/entities');\nvar has               = require('../common/utils').has;\nvar isValidEntityCode = require('../common/utils').isValidEntityCode;\nvar fromCodePoint     = require('../common/utils').fromCodePoint;\n\n\nvar DIGITAL_RE = /^&#((?:x[a-f0-9]{1,8}|[0-9]{1,8}));/i;\nvar NAMED_RE   = /^&([a-z][a-z0-9]{1,31});/i;\n\n\nmodule.exports = function entity(state, silent) {\n  var ch, code, match, pos = state.pos, max = state.posMax;\n\n  if (state.src.charCodeAt(pos) !== 0x26/* & */) { return false; }\n\n  if (pos + 1 < max) {\n    ch = state.src.charCodeAt(pos + 1);\n\n    if (ch === 0x23 /* # */) {\n      match = state.src.slice(pos).match(DIGITAL_RE);\n      if (match) {\n        if (!silent) {\n          code = match[1][0].toLowerCase() === 'x' ? parseInt(match[1].slice(1), 16) : parseInt(match[1], 10);\n          state.pending += isValidEntityCode(code) ? fromCodePoint(code) : fromCodePoint(0xFFFD);\n        }\n        state.pos += match[0].length;\n        return true;\n      }\n    } else {\n      match = state.src.slice(pos).match(NAMED_RE);\n      if (match) {\n        if (has(entities, match[1])) {\n          if (!silent) { state.pending += entities[match[1]]; }\n          state.pos += match[0].length;\n          return true;\n        }\n      }\n    }\n  }\n\n  if (!silent) { state.pending += '&'; }\n  state.pos++;\n  return true;\n};\n","// Process escaped chars and hardbreaks\n\n'use strict';\n\nvar isSpace = require('../common/utils').isSpace;\n\nvar ESCAPED = [];\n\nfor (var i = 0; i < 256; i++) { ESCAPED.push(0); }\n\n'\\\\!\"#$%&\\'()*+,./:;<=>?@[]^_`{|}~-'\n  .split('').forEach(function (ch) { ESCAPED[ch.charCodeAt(0)] = 1; });\n\n\nmodule.exports = function escape(state, silent) {\n  var ch, pos = state.pos, max = state.posMax;\n\n  if (state.src.charCodeAt(pos) !== 0x5C/* \\ */) { return false; }\n\n  pos++;\n\n  if (pos < max) {\n    ch = state.src.charCodeAt(pos);\n\n    if (ch < 256 && ESCAPED[ch] !== 0) {\n      if (!silent) { state.pending += state.src[pos]; }\n      state.pos += 2;\n      return true;\n    }\n\n    if (ch === 0x0A) {\n      if (!silent) {\n        state.push('hardbreak', 'br', 0);\n      }\n\n      pos++;\n      // skip leading whitespaces from next line\n      while (pos < max) {\n        ch = state.src.charCodeAt(pos);\n        if (!isSpace(ch)) { break; }\n        pos++;\n      }\n\n      state.pos = pos;\n      return true;\n    }\n  }\n\n  if (!silent) { state.pending += '\\\\'; }\n  state.pos++;\n  return true;\n};\n","// Process html tags\n\n'use strict';\n\n\nvar HTML_TAG_RE = require('../common/html_re').HTML_TAG_RE;\n\n\nfunction isLetter(ch) {\n  /*eslint no-bitwise:0*/\n  var lc = ch | 0x20; // to lower case\n  return (lc >= 0x61/* a */) && (lc <= 0x7a/* z */);\n}\n\n\nmodule.exports = function html_inline(state, silent) {\n  var ch, match, max, token,\n      pos = state.pos;\n\n  if (!state.md.options.html) { return false; }\n\n  // Check start\n  max = state.posMax;\n  if (state.src.charCodeAt(pos) !== 0x3C/* < */ ||\n      pos + 2 >= max) {\n    return false;\n  }\n\n  // Quick fail on second char\n  ch = state.src.charCodeAt(pos + 1);\n  if (ch !== 0x21/* ! */ &&\n      ch !== 0x3F/* ? */ &&\n      ch !== 0x2F/* / */ &&\n      !isLetter(ch)) {\n    return false;\n  }\n\n  match = state.src.slice(pos).match(HTML_TAG_RE);\n  if (!match) { return false; }\n\n  if (!silent) {\n    token         = state.push('html_inline', '', 0);\n    token.content = state.src.slice(pos, pos + match[0].length);\n  }\n  state.pos += match[0].length;\n  return true;\n};\n","// Process ![image](<src> \"title\")\n\n'use strict';\n\nvar normalizeReference   = require('../common/utils').normalizeReference;\nvar isSpace              = require('../common/utils').isSpace;\n\n\nmodule.exports = function image(state, silent) {\n  var attrs,\n      code,\n      content,\n      label,\n      labelEnd,\n      labelStart,\n      pos,\n      ref,\n      res,\n      title,\n      token,\n      tokens,\n      start,\n      href = '',\n      oldPos = state.pos,\n      max = state.posMax;\n\n  if (state.src.charCodeAt(state.pos) !== 0x21/* ! */) { return false; }\n  if (state.src.charCodeAt(state.pos + 1) !== 0x5B/* [ */) { return false; }\n\n  labelStart = state.pos + 2;\n  labelEnd = state.md.helpers.parseLinkLabel(state, state.pos + 1, false);\n\n  // parser failed to find ']', so it's not a valid link\n  if (labelEnd < 0) { return false; }\n\n  pos = labelEnd + 1;\n  if (pos < max && state.src.charCodeAt(pos) === 0x28/* ( */) {\n    //\n    // Inline link\n    //\n\n    // [link](  <href>  \"title\"  )\n    //        ^^ skipping these spaces\n    pos++;\n    for (; pos < max; pos++) {\n      code = state.src.charCodeAt(pos);\n      if (!isSpace(code) && code !== 0x0A) { break; }\n    }\n    if (pos >= max) { return false; }\n\n    // [link](  <href>  \"title\"  )\n    //          ^^^^^^ parsing link destination\n    start = pos;\n    res = state.md.helpers.parseLinkDestination(state.src, pos, state.posMax);\n    if (res.ok) {\n      href = state.md.normalizeLink(res.str);\n      if (state.md.validateLink(href)) {\n        pos = res.pos;\n      } else {\n        href = '';\n      }\n    }\n\n    // [link](  <href>  \"title\"  )\n    //                ^^ skipping these spaces\n    start = pos;\n    for (; pos < max; pos++) {\n      code = state.src.charCodeAt(pos);\n      if (!isSpace(code) && code !== 0x0A) { break; }\n    }\n\n    // [link](  <href>  \"title\"  )\n    //                  ^^^^^^^ parsing link title\n    res = state.md.helpers.parseLinkTitle(state.src, pos, state.posMax);\n    if (pos < max && start !== pos && res.ok) {\n      title = res.str;\n      pos = res.pos;\n\n      // [link](  <href>  \"title\"  )\n      //                         ^^ skipping these spaces\n      for (; pos < max; pos++) {\n        code = state.src.charCodeAt(pos);\n        if (!isSpace(code) && code !== 0x0A) { break; }\n      }\n    } else {\n      title = '';\n    }\n\n    if (pos >= max || state.src.charCodeAt(pos) !== 0x29/* ) */) {\n      state.pos = oldPos;\n      return false;\n    }\n    pos++;\n  } else {\n    //\n    // Link reference\n    //\n    if (typeof state.env.references === 'undefined') { return false; }\n\n    if (pos < max && state.src.charCodeAt(pos) === 0x5B/* [ */) {\n      start = pos + 1;\n      pos = state.md.helpers.parseLinkLabel(state, pos);\n      if (pos >= 0) {\n        label = state.src.slice(start, pos++);\n      } else {\n        pos = labelEnd + 1;\n      }\n    } else {\n      pos = labelEnd + 1;\n    }\n\n    // covers label === '' and label === undefined\n    // (collapsed reference link and shortcut reference link respectively)\n    if (!label) { label = state.src.slice(labelStart, labelEnd); }\n\n    ref = state.env.references[normalizeReference(label)];\n    if (!ref) {\n      state.pos = oldPos;\n      return false;\n    }\n    href = ref.href;\n    title = ref.title;\n  }\n\n  //\n  // We found the end of the link, and know for a fact it's a valid link;\n  // so all that's left to do is to call tokenizer.\n  //\n  if (!silent) {\n    content = state.src.slice(labelStart, labelEnd);\n\n    state.md.inline.parse(\n      content,\n      state.md,\n      state.env,\n      tokens = []\n    );\n\n    token          = state.push('image', 'img', 0);\n    token.attrs    = attrs = [ [ 'src', href ], [ 'alt', '' ] ];\n    token.children = tokens;\n    token.content  = content;\n\n    if (title) {\n      attrs.push([ 'title', title ]);\n    }\n  }\n\n  state.pos = pos;\n  state.posMax = max;\n  return true;\n};\n","// Process [link](<to> \"stuff\")\n\n'use strict';\n\nvar normalizeReference   = require('../common/utils').normalizeReference;\nvar isSpace              = require('../common/utils').isSpace;\n\n\nmodule.exports = function link(state, silent) {\n  var attrs,\n      code,\n      label,\n      labelEnd,\n      labelStart,\n      pos,\n      res,\n      ref,\n      title,\n      token,\n      href = '',\n      oldPos = state.pos,\n      max = state.posMax,\n      start = state.pos,\n      parseReference = true;\n\n  if (state.src.charCodeAt(state.pos) !== 0x5B/* [ */) { return false; }\n\n  labelStart = state.pos + 1;\n  labelEnd = state.md.helpers.parseLinkLabel(state, state.pos, true);\n\n  // parser failed to find ']', so it's not a valid link\n  if (labelEnd < 0) { return false; }\n\n  pos = labelEnd + 1;\n  if (pos < max && state.src.charCodeAt(pos) === 0x28/* ( */) {\n    //\n    // Inline link\n    //\n\n    // might have found a valid shortcut link, disable reference parsing\n    parseReference = false;\n\n    // [link](  <href>  \"title\"  )\n    //        ^^ skipping these spaces\n    pos++;\n    for (; pos < max; pos++) {\n      code = state.src.charCodeAt(pos);\n      if (!isSpace(code) && code !== 0x0A) { break; }\n    }\n    if (pos >= max) { return false; }\n\n    // [link](  <href>  \"title\"  )\n    //          ^^^^^^ parsing link destination\n    start = pos;\n    res = state.md.helpers.parseLinkDestination(state.src, pos, state.posMax);\n    if (res.ok) {\n      href = state.md.normalizeLink(res.str);\n      if (state.md.validateLink(href)) {\n        pos = res.pos;\n      } else {\n        href = '';\n      }\n    }\n\n    // [link](  <href>  \"title\"  )\n    //                ^^ skipping these spaces\n    start = pos;\n    for (; pos < max; pos++) {\n      code = state.src.charCodeAt(pos);\n      if (!isSpace(code) && code !== 0x0A) { break; }\n    }\n\n    // [link](  <href>  \"title\"  )\n    //                  ^^^^^^^ parsing link title\n    res = state.md.helpers.parseLinkTitle(state.src, pos, state.posMax);\n    if (pos < max && start !== pos && res.ok) {\n      title = res.str;\n      pos = res.pos;\n\n      // [link](  <href>  \"title\"  )\n      //                         ^^ skipping these spaces\n      for (; pos < max; pos++) {\n        code = state.src.charCodeAt(pos);\n        if (!isSpace(code) && code !== 0x0A) { break; }\n      }\n    } else {\n      title = '';\n    }\n\n    if (pos >= max || state.src.charCodeAt(pos) !== 0x29/* ) */) {\n      // parsing a valid shortcut link failed, fallback to reference\n      parseReference = true;\n    }\n    pos++;\n  }\n\n  if (parseReference) {\n    //\n    // Link reference\n    //\n    if (typeof state.env.references === 'undefined') { return false; }\n\n    if (pos < max && state.src.charCodeAt(pos) === 0x5B/* [ */) {\n      start = pos + 1;\n      pos = state.md.helpers.parseLinkLabel(state, pos);\n      if (pos >= 0) {\n        label = state.src.slice(start, pos++);\n      } else {\n        pos = labelEnd + 1;\n      }\n    } else {\n      pos = labelEnd + 1;\n    }\n\n    // covers label === '' and label === undefined\n    // (collapsed reference link and shortcut reference link respectively)\n    if (!label) { label = state.src.slice(labelStart, labelEnd); }\n\n    ref = state.env.references[normalizeReference(label)];\n    if (!ref) {\n      state.pos = oldPos;\n      return false;\n    }\n    href = ref.href;\n    title = ref.title;\n  }\n\n  //\n  // We found the end of the link, and know for a fact it's a valid link;\n  // so all that's left to do is to call tokenizer.\n  //\n  if (!silent) {\n    state.pos = labelStart;\n    state.posMax = labelEnd;\n\n    token        = state.push('link_open', 'a', 1);\n    token.attrs  = attrs = [ [ 'href', href ] ];\n    if (title) {\n      attrs.push([ 'title', title ]);\n    }\n\n    state.md.inline.tokenize(state);\n\n    token        = state.push('link_close', 'a', -1);\n  }\n\n  state.pos = pos;\n  state.posMax = max;\n  return true;\n};\n","// Proceess '\\n'\n\n'use strict';\n\nvar isSpace = require('../common/utils').isSpace;\n\n\nmodule.exports = function newline(state, silent) {\n  var pmax, max, pos = state.pos;\n\n  if (state.src.charCodeAt(pos) !== 0x0A/* \\n */) { return false; }\n\n  pmax = state.pending.length - 1;\n  max = state.posMax;\n\n  // '  \\n' -> hardbreak\n  // Lookup in pending chars is bad practice! Don't copy to other rules!\n  // Pending string is stored in concat mode, indexed lookups will cause\n  // convertion to flat mode.\n  if (!silent) {\n    if (pmax >= 0 && state.pending.charCodeAt(pmax) === 0x20) {\n      if (pmax >= 1 && state.pending.charCodeAt(pmax - 1) === 0x20) {\n        state.pending = state.pending.replace(/ +$/, '');\n        state.push('hardbreak', 'br', 0);\n      } else {\n        state.pending = state.pending.slice(0, -1);\n        state.push('softbreak', 'br', 0);\n      }\n\n    } else {\n      state.push('softbreak', 'br', 0);\n    }\n  }\n\n  pos++;\n\n  // skip heading spaces for next line\n  while (pos < max && isSpace(state.src.charCodeAt(pos))) { pos++; }\n\n  state.pos = pos;\n  return true;\n};\n","// Inline parser state\n\n'use strict';\n\n\nvar Token          = require('../token');\nvar isWhiteSpace   = require('../common/utils').isWhiteSpace;\nvar isPunctChar    = require('../common/utils').isPunctChar;\nvar isMdAsciiPunct = require('../common/utils').isMdAsciiPunct;\n\n\nfunction StateInline(src, md, env, outTokens) {\n  this.src = src;\n  this.env = env;\n  this.md = md;\n  this.tokens = outTokens;\n\n  this.pos = 0;\n  this.posMax = this.src.length;\n  this.level = 0;\n  this.pending = '';\n  this.pendingLevel = 0;\n\n  this.cache = {};        // Stores { start: end } pairs. Useful for backtrack\n                          // optimization of pairs parse (emphasis, strikes).\n\n  this.delimiters = [];   // Emphasis-like delimiters\n}\n\n\n// Flush pending text\n//\nStateInline.prototype.pushPending = function () {\n  var token = new Token('text', '', 0);\n  token.content = this.pending;\n  token.level = this.pendingLevel;\n  this.tokens.push(token);\n  this.pending = '';\n  return token;\n};\n\n\n// Push new token to \"stream\".\n// If pending text exists - flush it as text token\n//\nStateInline.prototype.push = function (type, tag, nesting) {\n  if (this.pending) {\n    this.pushPending();\n  }\n\n  var token = new Token(type, tag, nesting);\n\n  if (nesting < 0) { this.level--; }\n  token.level = this.level;\n  if (nesting > 0) { this.level++; }\n\n  this.pendingLevel = this.level;\n  this.tokens.push(token);\n  return token;\n};\n\n\n// Scan a sequence of emphasis-like markers, and determine whether\n// it can start an emphasis sequence or end an emphasis sequence.\n//\n//  - start - position to scan from (it should point at a valid marker);\n//  - canSplitWord - determine if these markers can be found inside a word\n//\nStateInline.prototype.scanDelims = function (start, canSplitWord) {\n  var pos = start, lastChar, nextChar, count, can_open, can_close,\n      isLastWhiteSpace, isLastPunctChar,\n      isNextWhiteSpace, isNextPunctChar,\n      left_flanking = true,\n      right_flanking = true,\n      max = this.posMax,\n      marker = this.src.charCodeAt(start);\n\n  // treat beginning of the line as a whitespace\n  lastChar = start > 0 ? this.src.charCodeAt(start - 1) : 0x20;\n\n  while (pos < max && this.src.charCodeAt(pos) === marker) { pos++; }\n\n  count = pos - start;\n\n  // treat end of the line as a whitespace\n  nextChar = pos < max ? this.src.charCodeAt(pos) : 0x20;\n\n  isLastPunctChar = isMdAsciiPunct(lastChar) || isPunctChar(String.fromCharCode(lastChar));\n  isNextPunctChar = isMdAsciiPunct(nextChar) || isPunctChar(String.fromCharCode(nextChar));\n\n  isLastWhiteSpace = isWhiteSpace(lastChar);\n  isNextWhiteSpace = isWhiteSpace(nextChar);\n\n  if (isNextWhiteSpace) {\n    left_flanking = false;\n  } else if (isNextPunctChar) {\n    if (!(isLastWhiteSpace || isLastPunctChar)) {\n      left_flanking = false;\n    }\n  }\n\n  if (isLastWhiteSpace) {\n    right_flanking = false;\n  } else if (isLastPunctChar) {\n    if (!(isNextWhiteSpace || isNextPunctChar)) {\n      right_flanking = false;\n    }\n  }\n\n  if (!canSplitWord) {\n    can_open  = left_flanking  && (!right_flanking || isLastPunctChar);\n    can_close = right_flanking && (!left_flanking  || isNextPunctChar);\n  } else {\n    can_open  = left_flanking;\n    can_close = right_flanking;\n  }\n\n  return {\n    can_open:  can_open,\n    can_close: can_close,\n    length:    count\n  };\n};\n\n\n// re-export Token class to use in block rules\nStateInline.prototype.Token = Token;\n\n\nmodule.exports = StateInline;\n","// ~~strike through~~\n//\n'use strict';\n\n\n// Insert each marker as a separate text token, and add it to delimiter list\n//\nmodule.exports.tokenize = function strikethrough(state, silent) {\n  var i, scanned, token, len, ch,\n      start = state.pos,\n      marker = state.src.charCodeAt(start);\n\n  if (silent) { return false; }\n\n  if (marker !== 0x7E/* ~ */) { return false; }\n\n  scanned = state.scanDelims(state.pos, true);\n  len = scanned.length;\n  ch = String.fromCharCode(marker);\n\n  if (len < 2) { return false; }\n\n  if (len % 2) {\n    token         = state.push('text', '', 0);\n    token.content = ch;\n    len--;\n  }\n\n  for (i = 0; i < len; i += 2) {\n    token         = state.push('text', '', 0);\n    token.content = ch + ch;\n\n    state.delimiters.push({\n      marker: marker,\n      jump:   i,\n      token:  state.tokens.length - 1,\n      level:  state.level,\n      end:    -1,\n      open:   scanned.can_open,\n      close:  scanned.can_close\n    });\n  }\n\n  state.pos += scanned.length;\n\n  return true;\n};\n\n\n// Walk through delimiter list and replace text tokens with tags\n//\nmodule.exports.postProcess = function strikethrough(state) {\n  var i, j,\n      startDelim,\n      endDelim,\n      token,\n      loneMarkers = [],\n      delimiters = state.delimiters,\n      max = state.delimiters.length;\n\n  for (i = 0; i < max; i++) {\n    startDelim = delimiters[i];\n\n    if (startDelim.marker !== 0x7E/* ~ */) {\n      continue;\n    }\n\n    if (startDelim.end === -1) {\n      continue;\n    }\n\n    endDelim = delimiters[startDelim.end];\n\n    token         = state.tokens[startDelim.token];\n    token.type    = 's_open';\n    token.tag     = 's';\n    token.nesting = 1;\n    token.markup  = '~~';\n    token.content = '';\n\n    token         = state.tokens[endDelim.token];\n    token.type    = 's_close';\n    token.tag     = 's';\n    token.nesting = -1;\n    token.markup  = '~~';\n    token.content = '';\n\n    if (state.tokens[endDelim.token - 1].type === 'text' &&\n        state.tokens[endDelim.token - 1].content === '~') {\n\n      loneMarkers.push(endDelim.token - 1);\n    }\n  }\n\n  // If a marker sequence has an odd number of characters, it's splitted\n  // like this: `~~~~~` -> `~` + `~~` + `~~`, leaving one marker at the\n  // start of the sequence.\n  //\n  // So, we have to move all those markers after subsequent s_close tags.\n  //\n  while (loneMarkers.length) {\n    i = loneMarkers.pop();\n    j = i + 1;\n\n    while (j < state.tokens.length && state.tokens[j].type === 's_close') {\n      j++;\n    }\n\n    j--;\n\n    if (i !== j) {\n      token = state.tokens[j];\n      state.tokens[j] = state.tokens[i];\n      state.tokens[i] = token;\n    }\n  }\n};\n","// Skip text characters for text token, place those to pending buffer\n// and increment current pos\n\n'use strict';\n\n\n// Rule to skip pure text\n// '{}$%@~+=:' reserved for extentions\n\n// !, \", #, $, %, &, ', (, ), *, +, ,, -, ., /, :, ;, <, =, >, ?, @, [, \\, ], ^, _, `, {, |, }, or ~\n\n// !!!! Don't confuse with \"Markdown ASCII Punctuation\" chars\n// http://spec.commonmark.org/0.15/#ascii-punctuation-character\nfunction isTerminatorChar(ch) {\n  switch (ch) {\n    case 0x0A/* \\n */:\n    case 0x21/* ! */:\n    case 0x23/* # */:\n    case 0x24/* $ */:\n    case 0x25/* % */:\n    case 0x26/* & */:\n    case 0x2A/* * */:\n    case 0x2B/* + */:\n    case 0x2D/* - */:\n    case 0x3A/* : */:\n    case 0x3C/* < */:\n    case 0x3D/* = */:\n    case 0x3E/* > */:\n    case 0x40/* @ */:\n    case 0x5B/* [ */:\n    case 0x5C/* \\ */:\n    case 0x5D/* ] */:\n    case 0x5E/* ^ */:\n    case 0x5F/* _ */:\n    case 0x60/* ` */:\n    case 0x7B/* { */:\n    case 0x7D/* } */:\n    case 0x7E/* ~ */:\n      return true;\n    default:\n      return false;\n  }\n}\n\nmodule.exports = function text(state, silent) {\n  var pos = state.pos;\n\n  while (pos < state.posMax && !isTerminatorChar(state.src.charCodeAt(pos))) {\n    pos++;\n  }\n\n  if (pos === state.pos) { return false; }\n\n  if (!silent) { state.pending += state.src.slice(state.pos, pos); }\n\n  state.pos = pos;\n\n  return true;\n};\n\n// Alternative implementation, for memory.\n//\n// It costs 10% of performance, but allows extend terminators list, if place it\n// to `ParcerInline` property. Probably, will switch to it sometime, such\n// flexibility required.\n\n/*\nvar TERMINATOR_RE = /[\\n!#$%&*+\\-:<=>@[\\\\\\]^_`{}~]/;\n\nmodule.exports = function text(state, silent) {\n  var pos = state.pos,\n      idx = state.src.slice(pos).search(TERMINATOR_RE);\n\n  // first char is terminator -> empty text\n  if (idx === 0) { return false; }\n\n  // no terminator -> text till end of string\n  if (idx < 0) {\n    if (!silent) { state.pending += state.src.slice(pos); }\n    state.pos = state.src.length;\n    return true;\n  }\n\n  if (!silent) { state.pending += state.src.slice(pos, pos + idx); }\n\n  state.pos += idx;\n\n  return true;\n};*/\n","// Merge adjacent text nodes into one, and re-calculate all token levels\n//\n'use strict';\n\n\nmodule.exports = function text_collapse(state) {\n  var curr, last,\n      level = 0,\n      tokens = state.tokens,\n      max = state.tokens.length;\n\n  for (curr = last = 0; curr < max; curr++) {\n    // re-calculate levels\n    level += tokens[curr].nesting;\n    tokens[curr].level = level;\n\n    if (tokens[curr].type === 'text' &&\n        curr + 1 < max &&\n        tokens[curr + 1].type === 'text') {\n\n      // collapse two adjacent text nodes\n      tokens[curr + 1].content = tokens[curr].content + tokens[curr + 1].content;\n    } else {\n      if (curr !== last) { tokens[last] = tokens[curr]; }\n\n      last++;\n    }\n  }\n\n  if (curr !== last) {\n    tokens.length = last;\n  }\n};\n","// Token class\n\n'use strict';\n\n\n/**\n * class Token\n **/\n\n/**\n * new Token(type, tag, nesting)\n *\n * Create new token and fill passed properties.\n **/\nfunction Token(type, tag, nesting) {\n  /**\n   * Token#type -> String\n   *\n   * Type of the token (string, e.g. \"paragraph_open\")\n   **/\n  this.type     = type;\n\n  /**\n   * Token#tag -> String\n   *\n   * html tag name, e.g. \"p\"\n   **/\n  this.tag      = tag;\n\n  /**\n   * Token#attrs -> Array\n   *\n   * Html attributes. Format: `[ [ name1, value1 ], [ name2, value2 ] ]`\n   **/\n  this.attrs    = null;\n\n  /**\n   * Token#map -> Array\n   *\n   * Source map info. Format: `[ line_begin, line_end ]`\n   **/\n  this.map      = null;\n\n  /**\n   * Token#nesting -> Number\n   *\n   * Level change (number in {-1, 0, 1} set), where:\n   *\n   * -  `1` means the tag is opening\n   * -  `0` means the tag is self-closing\n   * - `-1` means the tag is closing\n   **/\n  this.nesting  = nesting;\n\n  /**\n   * Token#level -> Number\n   *\n   * nesting level, the same as `state.level`\n   **/\n  this.level    = 0;\n\n  /**\n   * Token#children -> Array\n   *\n   * An array of child nodes (inline and img tokens)\n   **/\n  this.children = null;\n\n  /**\n   * Token#content -> String\n   *\n   * In a case of self-closing tag (code, html, fence, etc.),\n   * it has contents of this tag.\n   **/\n  this.content  = '';\n\n  /**\n   * Token#markup -> String\n   *\n   * '*' or '_' for emphasis, fence string for fence, etc.\n   **/\n  this.markup   = '';\n\n  /**\n   * Token#info -> String\n   *\n   * fence infostring\n   **/\n  this.info     = '';\n\n  /**\n   * Token#meta -> Object\n   *\n   * A place for plugins to store an arbitrary data\n   **/\n  this.meta     = null;\n\n  /**\n   * Token#block -> Boolean\n   *\n   * True for block-level tokens, false for inline tokens.\n   * Used in renderer to calculate line breaks\n   **/\n  this.block    = false;\n\n  /**\n   * Token#hidden -> Boolean\n   *\n   * If it's true, ignore this element when rendering. Used for tight lists\n   * to hide paragraphs.\n   **/\n  this.hidden   = false;\n}\n\n\n/**\n * Token.attrIndex(name) -> Number\n *\n * Search attribute index by name.\n **/\nToken.prototype.attrIndex = function attrIndex(name) {\n  var attrs, i, len;\n\n  if (!this.attrs) { return -1; }\n\n  attrs = this.attrs;\n\n  for (i = 0, len = attrs.length; i < len; i++) {\n    if (attrs[i][0] === name) { return i; }\n  }\n  return -1;\n};\n\n\n/**\n * Token.attrPush(attrData)\n *\n * Add `[ name, value ]` attribute to list. Init attrs if necessary\n **/\nToken.prototype.attrPush = function attrPush(attrData) {\n  if (this.attrs) {\n    this.attrs.push(attrData);\n  } else {\n    this.attrs = [ attrData ];\n  }\n};\n\n\n/**\n * Token.attrSet(name, value)\n *\n * Set `name` attribute to `value`. Override old value if exists.\n **/\nToken.prototype.attrSet = function attrSet(name, value) {\n  var idx = this.attrIndex(name),\n      attrData = [ name, value ];\n\n  if (idx < 0) {\n    this.attrPush(attrData);\n  } else {\n    this.attrs[idx] = attrData;\n  }\n};\n\n\n/**\n * Token.attrGet(name)\n *\n * Get the value of attribute `name`, or null if it does not exist.\n **/\nToken.prototype.attrGet = function attrGet(name) {\n  var idx = this.attrIndex(name), value = null;\n  if (idx >= 0) {\n    value = this.attrs[idx][1];\n  }\n  return value;\n};\n\n\n/**\n * Token.attrJoin(name, value)\n *\n * Join value to existing attribute via space. Or create new attribute if not\n * exists. Useful to operate with token classes.\n **/\nToken.prototype.attrJoin = function attrJoin(name, value) {\n  var idx = this.attrIndex(name);\n\n  if (idx < 0) {\n    this.attrPush([ name, value ]);\n  } else {\n    this.attrs[idx][1] = this.attrs[idx][1] + ' ' + value;\n  }\n};\n\n\nmodule.exports = Token;\n","\n'use strict';\n\n\n/* eslint-disable no-bitwise */\n\nvar decodeCache = {};\n\nfunction getDecodeCache(exclude) {\n  var i, ch, cache = decodeCache[exclude];\n  if (cache) { return cache; }\n\n  cache = decodeCache[exclude] = [];\n\n  for (i = 0; i < 128; i++) {\n    ch = String.fromCharCode(i);\n    cache.push(ch);\n  }\n\n  for (i = 0; i < exclude.length; i++) {\n    ch = exclude.charCodeAt(i);\n    cache[ch] = '%' + ('0' + ch.toString(16).toUpperCase()).slice(-2);\n  }\n\n  return cache;\n}\n\n\n// Decode percent-encoded string.\n//\nfunction decode(string, exclude) {\n  var cache;\n\n  if (typeof exclude !== 'string') {\n    exclude = decode.defaultChars;\n  }\n\n  cache = getDecodeCache(exclude);\n\n  return string.replace(/(%[a-f0-9]{2})+/gi, function(seq) {\n    var i, l, b1, b2, b3, b4, chr,\n        result = '';\n\n    for (i = 0, l = seq.length; i < l; i += 3) {\n      b1 = parseInt(seq.slice(i + 1, i + 3), 16);\n\n      if (b1 < 0x80) {\n        result += cache[b1];\n        continue;\n      }\n\n      if ((b1 & 0xE0) === 0xC0 && (i + 3 < l)) {\n        // 110xxxxx 10xxxxxx\n        b2 = parseInt(seq.slice(i + 4, i + 6), 16);\n\n        if ((b2 & 0xC0) === 0x80) {\n          chr = ((b1 << 6) & 0x7C0) | (b2 & 0x3F);\n\n          if (chr < 0x80) {\n            result += '\\ufffd\\ufffd';\n          } else {\n            result += String.fromCharCode(chr);\n          }\n\n          i += 3;\n          continue;\n        }\n      }\n\n      if ((b1 & 0xF0) === 0xE0 && (i + 6 < l)) {\n        // 1110xxxx 10xxxxxx 10xxxxxx\n        b2 = parseInt(seq.slice(i + 4, i + 6), 16);\n        b3 = parseInt(seq.slice(i + 7, i + 9), 16);\n\n        if ((b2 & 0xC0) === 0x80 && (b3 & 0xC0) === 0x80) {\n          chr = ((b1 << 12) & 0xF000) | ((b2 << 6) & 0xFC0) | (b3 & 0x3F);\n\n          if (chr < 0x800 || (chr >= 0xD800 && chr <= 0xDFFF)) {\n            result += '\\ufffd\\ufffd\\ufffd';\n          } else {\n            result += String.fromCharCode(chr);\n          }\n\n          i += 6;\n          continue;\n        }\n      }\n\n      if ((b1 & 0xF8) === 0xF0 && (i + 9 < l)) {\n        // 111110xx 10xxxxxx 10xxxxxx 10xxxxxx\n        b2 = parseInt(seq.slice(i + 4, i + 6), 16);\n        b3 = parseInt(seq.slice(i + 7, i + 9), 16);\n        b4 = parseInt(seq.slice(i + 10, i + 12), 16);\n\n        if ((b2 & 0xC0) === 0x80 && (b3 & 0xC0) === 0x80 && (b4 & 0xC0) === 0x80) {\n          chr = ((b1 << 18) & 0x1C0000) | ((b2 << 12) & 0x3F000) | ((b3 << 6) & 0xFC0) | (b4 & 0x3F);\n\n          if (chr < 0x10000 || chr > 0x10FFFF) {\n            result += '\\ufffd\\ufffd\\ufffd\\ufffd';\n          } else {\n            chr -= 0x10000;\n            result += String.fromCharCode(0xD800 + (chr >> 10), 0xDC00 + (chr & 0x3FF));\n          }\n\n          i += 9;\n          continue;\n        }\n      }\n\n      result += '\\ufffd';\n    }\n\n    return result;\n  });\n}\n\n\ndecode.defaultChars   = ';/?:@&=+$,#';\ndecode.componentChars = '';\n\n\nmodule.exports = decode;\n","\n'use strict';\n\n\nvar encodeCache = {};\n\n\n// Create a lookup array where anything but characters in `chars` string\n// and alphanumeric chars is percent-encoded.\n//\nfunction getEncodeCache(exclude) {\n  var i, ch, cache = encodeCache[exclude];\n  if (cache) { return cache; }\n\n  cache = encodeCache[exclude] = [];\n\n  for (i = 0; i < 128; i++) {\n    ch = String.fromCharCode(i);\n\n    if (/^[0-9a-z]$/i.test(ch)) {\n      // always allow unencoded alphanumeric characters\n      cache.push(ch);\n    } else {\n      cache.push('%' + ('0' + i.toString(16).toUpperCase()).slice(-2));\n    }\n  }\n\n  for (i = 0; i < exclude.length; i++) {\n    cache[exclude.charCodeAt(i)] = exclude[i];\n  }\n\n  return cache;\n}\n\n\n// Encode unsafe characters with percent-encoding, skipping already\n// encoded sequences.\n//\n//  - string       - string to encode\n//  - exclude      - list of characters to ignore (in addition to a-zA-Z0-9)\n//  - keepEscaped  - don't encode '%' in a correct escape sequence (default: true)\n//\nfunction encode(string, exclude, keepEscaped) {\n  var i, l, code, nextCode, cache,\n      result = '';\n\n  if (typeof exclude !== 'string') {\n    // encode(string, keepEscaped)\n    keepEscaped  = exclude;\n    exclude = encode.defaultChars;\n  }\n\n  if (typeof keepEscaped === 'undefined') {\n    keepEscaped = true;\n  }\n\n  cache = getEncodeCache(exclude);\n\n  for (i = 0, l = string.length; i < l; i++) {\n    code = string.charCodeAt(i);\n\n    if (keepEscaped && code === 0x25 /* % */ && i + 2 < l) {\n      if (/^[0-9a-f]{2}$/i.test(string.slice(i + 1, i + 3))) {\n        result += string.slice(i, i + 3);\n        i += 2;\n        continue;\n      }\n    }\n\n    if (code < 128) {\n      result += cache[code];\n      continue;\n    }\n\n    if (code >= 0xD800 && code <= 0xDFFF) {\n      if (code >= 0xD800 && code <= 0xDBFF && i + 1 < l) {\n        nextCode = string.charCodeAt(i + 1);\n        if (nextCode >= 0xDC00 && nextCode <= 0xDFFF) {\n          result += encodeURIComponent(string[i] + string[i + 1]);\n          i++;\n          continue;\n        }\n      }\n      result += '%EF%BF%BD';\n      continue;\n    }\n\n    result += encodeURIComponent(string[i]);\n  }\n\n  return result;\n}\n\nencode.defaultChars   = \";/?:@&=+$,-_.!~*'()#\";\nencode.componentChars = \"-_.!~*'()\";\n\n\nmodule.exports = encode;\n","\n'use strict';\n\n\nmodule.exports = function format(url) {\n  var result = '';\n\n  result += url.protocol || '';\n  result += url.slashes ? '//' : '';\n  result += url.auth ? url.auth + '@' : '';\n\n  if (url.hostname && url.hostname.indexOf(':') !== -1) {\n    // ipv6 address\n    result += '[' + url.hostname + ']';\n  } else {\n    result += url.hostname || '';\n  }\n\n  result += url.port ? ':' + url.port : '';\n  result += url.pathname || '';\n  result += url.search || '';\n  result += url.hash || '';\n\n  return result;\n};\n","'use strict';\n\n\nmodule.exports.encode = require('./encode');\nmodule.exports.decode = require('./decode');\nmodule.exports.format = require('./format');\nmodule.exports.parse  = require('./parse');\n","// Copyright Joyent, Inc. and other Node contributors.\n//\n// Permission is hereby granted, free of charge, to any person obtaining a\n// copy of this software and associated documentation files (the\n// \"Software\"), to deal in the Software without restriction, including\n// without limitation the rights to use, copy, modify, merge, publish,\n// distribute, sublicense, and/or sell copies of the Software, and to permit\n// persons to whom the Software is furnished to do so, subject to the\n// following conditions:\n//\n// The above copyright notice and this permission notice shall be included\n// in all copies or substantial portions of the Software.\n//\n// THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS\n// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\n// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN\n// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,\n// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR\n// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE\n// USE OR OTHER DEALINGS IN THE SOFTWARE.\n\n'use strict';\n\n//\n// Changes from joyent/node:\n//\n// 1. No leading slash in paths,\n//    e.g. in `url.parse('http://foo?bar')` pathname is ``, not `/`\n//\n// 2. Backslashes are not replaced with slashes,\n//    so `http:\\\\example.org\\` is treated like a relative path\n//\n// 3. Trailing colon is treated like a part of the path,\n//    i.e. in `http://example.org:foo` pathname is `:foo`\n//\n// 4. Nothing is URL-encoded in the resulting object,\n//    (in joyent/node some chars in auth and paths are encoded)\n//\n// 5. `url.parse()` does not have `parseQueryString` argument\n//\n// 6. Removed extraneous result properties: `host`, `path`, `query`, etc.,\n//    which can be constructed using other parts of the url.\n//\n\n\nfunction Url() {\n  this.protocol = null;\n  this.slashes = null;\n  this.auth = null;\n  this.port = null;\n  this.hostname = null;\n  this.hash = null;\n  this.search = null;\n  this.pathname = null;\n}\n\n// Reference: RFC 3986, RFC 1808, RFC 2396\n\n// define these here so at least they only have to be\n// compiled once on the first module load.\nvar protocolPattern = /^([a-z0-9.+-]+:)/i,\n    portPattern = /:[0-9]*$/,\n\n    // Special case for a simple path URL\n    simplePathPattern = /^(\\/\\/?(?!\\/)[^\\?\\s]*)(\\?[^\\s]*)?$/,\n\n    // RFC 2396: characters reserved for delimiting URLs.\n    // We actually just auto-escape these.\n    delims = [ '<', '>', '\"', '`', ' ', '\\r', '\\n', '\\t' ],\n\n    // RFC 2396: characters not allowed for various reasons.\n    unwise = [ '{', '}', '|', '\\\\', '^', '`' ].concat(delims),\n\n    // Allowed by RFCs, but cause of XSS attacks.  Always escape these.\n    autoEscape = [ '\\'' ].concat(unwise),\n    // Characters that are never ever allowed in a hostname.\n    // Note that any invalid chars are also handled, but these\n    // are the ones that are *expected* to be seen, so we fast-path\n    // them.\n    nonHostChars = [ '%', '/', '?', ';', '#' ].concat(autoEscape),\n    hostEndingChars = [ '/', '?', '#' ],\n    hostnameMaxLen = 255,\n    hostnamePartPattern = /^[+a-z0-9A-Z_-]{0,63}$/,\n    hostnamePartStart = /^([+a-z0-9A-Z_-]{0,63})(.*)$/,\n    // protocols that can allow \"unsafe\" and \"unwise\" chars.\n    /* eslint-disable no-script-url */\n    // protocols that never have a hostname.\n    hostlessProtocol = {\n      'javascript': true,\n      'javascript:': true\n    },\n    // protocols that always contain a // bit.\n    slashedProtocol = {\n      'http': true,\n      'https': true,\n      'ftp': true,\n      'gopher': true,\n      'file': true,\n      'http:': true,\n      'https:': true,\n      'ftp:': true,\n      'gopher:': true,\n      'file:': true\n    };\n    /* eslint-enable no-script-url */\n\nfunction urlParse(url, slashesDenoteHost) {\n  if (url && url instanceof Url) { return url; }\n\n  var u = new Url();\n  u.parse(url, slashesDenoteHost);\n  return u;\n}\n\nUrl.prototype.parse = function(url, slashesDenoteHost) {\n  var i, l, lowerProto, hec, slashes,\n      rest = url;\n\n  // trim before proceeding.\n  // This is to support parse stuff like \"  http://foo.com  \\n\"\n  rest = rest.trim();\n\n  if (!slashesDenoteHost && url.split('#').length === 1) {\n    // Try fast path regexp\n    var simplePath = simplePathPattern.exec(rest);\n    if (simplePath) {\n      this.pathname = simplePath[1];\n      if (simplePath[2]) {\n        this.search = simplePath[2];\n      }\n      return this;\n    }\n  }\n\n  var proto = protocolPattern.exec(rest);\n  if (proto) {\n    proto = proto[0];\n    lowerProto = proto.toLowerCase();\n    this.protocol = proto;\n    rest = rest.substr(proto.length);\n  }\n\n  // figure out if it's got a host\n  // user@server is *always* interpreted as a hostname, and url\n  // resolution will treat //foo/bar as host=foo,path=bar because that's\n  // how the browser resolves relative URLs.\n  if (slashesDenoteHost || proto || rest.match(/^\\/\\/[^@\\/]+@[^@\\/]+/)) {\n    slashes = rest.substr(0, 2) === '//';\n    if (slashes && !(proto && hostlessProtocol[proto])) {\n      rest = rest.substr(2);\n      this.slashes = true;\n    }\n  }\n\n  if (!hostlessProtocol[proto] &&\n      (slashes || (proto && !slashedProtocol[proto]))) {\n\n    // there's a hostname.\n    // the first instance of /, ?, ;, or # ends the host.\n    //\n    // If there is an @ in the hostname, then non-host chars *are* allowed\n    // to the left of the last @ sign, unless some host-ending character\n    // comes *before* the @-sign.\n    // URLs are obnoxious.\n    //\n    // ex:\n    // http://a@b@c/ => user:a@b host:c\n    // http://a@b?@c => user:a host:c path:/?@c\n\n    // v0.12 TODO(isaacs): This is not quite how Chrome does things.\n    // Review our test case against browsers more comprehensively.\n\n    // find the first instance of any hostEndingChars\n    var hostEnd = -1;\n    for (i = 0; i < hostEndingChars.length; i++) {\n      hec = rest.indexOf(hostEndingChars[i]);\n      if (hec !== -1 && (hostEnd === -1 || hec < hostEnd)) {\n        hostEnd = hec;\n      }\n    }\n\n    // at this point, either we have an explicit point where the\n    // auth portion cannot go past, or the last @ char is the decider.\n    var auth, atSign;\n    if (hostEnd === -1) {\n      // atSign can be anywhere.\n      atSign = rest.lastIndexOf('@');\n    } else {\n      // atSign must be in auth portion.\n      // http://a@b/c@d => host:b auth:a path:/c@d\n      atSign = rest.lastIndexOf('@', hostEnd);\n    }\n\n    // Now we have a portion which is definitely the auth.\n    // Pull that off.\n    if (atSign !== -1) {\n      auth = rest.slice(0, atSign);\n      rest = rest.slice(atSign + 1);\n      this.auth = auth;\n    }\n\n    // the host is the remaining to the left of the first non-host char\n    hostEnd = -1;\n    for (i = 0; i < nonHostChars.length; i++) {\n      hec = rest.indexOf(nonHostChars[i]);\n      if (hec !== -1 && (hostEnd === -1 || hec < hostEnd)) {\n        hostEnd = hec;\n      }\n    }\n    // if we still have not hit it, then the entire thing is a host.\n    if (hostEnd === -1) {\n      hostEnd = rest.length;\n    }\n\n    if (rest[hostEnd - 1] === ':') { hostEnd--; }\n    var host = rest.slice(0, hostEnd);\n    rest = rest.slice(hostEnd);\n\n    // pull out port.\n    this.parseHost(host);\n\n    // we've indicated that there is a hostname,\n    // so even if it's empty, it has to be present.\n    this.hostname = this.hostname || '';\n\n    // if hostname begins with [ and ends with ]\n    // assume that it's an IPv6 address.\n    var ipv6Hostname = this.hostname[0] === '[' &&\n        this.hostname[this.hostname.length - 1] === ']';\n\n    // validate a little.\n    if (!ipv6Hostname) {\n      var hostparts = this.hostname.split(/\\./);\n      for (i = 0, l = hostparts.length; i < l; i++) {\n        var part = hostparts[i];\n        if (!part) { continue; }\n        if (!part.match(hostnamePartPattern)) {\n          var newpart = '';\n          for (var j = 0, k = part.length; j < k; j++) {\n            if (part.charCodeAt(j) > 127) {\n              // we replace non-ASCII char with a temporary placeholder\n              // we need this to make sure size of hostname is not\n              // broken by replacing non-ASCII by nothing\n              newpart += 'x';\n            } else {\n              newpart += part[j];\n            }\n          }\n          // we test again with ASCII char only\n          if (!newpart.match(hostnamePartPattern)) {\n            var validParts = hostparts.slice(0, i);\n            var notHost = hostparts.slice(i + 1);\n            var bit = part.match(hostnamePartStart);\n            if (bit) {\n              validParts.push(bit[1]);\n              notHost.unshift(bit[2]);\n            }\n            if (notHost.length) {\n              rest = notHost.join('.') + rest;\n            }\n            this.hostname = validParts.join('.');\n            break;\n          }\n        }\n      }\n    }\n\n    if (this.hostname.length > hostnameMaxLen) {\n      this.hostname = '';\n    }\n\n    // strip [ and ] from the hostname\n    // the host field still retains them, though\n    if (ipv6Hostname) {\n      this.hostname = this.hostname.substr(1, this.hostname.length - 2);\n    }\n  }\n\n  // chop off from the tail first.\n  var hash = rest.indexOf('#');\n  if (hash !== -1) {\n    // got a fragment string.\n    this.hash = rest.substr(hash);\n    rest = rest.slice(0, hash);\n  }\n  var qm = rest.indexOf('?');\n  if (qm !== -1) {\n    this.search = rest.substr(qm);\n    rest = rest.slice(0, qm);\n  }\n  if (rest) { this.pathname = rest; }\n  if (slashedProtocol[lowerProto] &&\n      this.hostname && !this.pathname) {\n    this.pathname = '';\n  }\n\n  return this;\n};\n\nUrl.prototype.parseHost = function(host) {\n  var port = portPattern.exec(host);\n  if (port) {\n    port = port[0];\n    if (port !== ':') {\n      this.port = port.substr(1);\n    }\n    host = host.substr(0, host.length - port.length);\n  }\n  if (host) { this.hostname = host; }\n};\n\nmodule.exports = urlParse;\n","var map = {\n\t\"./af\": \"./node_modules/moment/locale/af.js\",\n\t\"./af.js\": \"./node_modules/moment/locale/af.js\",\n\t\"./ar\": \"./node_modules/moment/locale/ar.js\",\n\t\"./ar-dz\": \"./node_modules/moment/locale/ar-dz.js\",\n\t\"./ar-dz.js\": \"./node_modules/moment/locale/ar-dz.js\",\n\t\"./ar-kw\": \"./node_modules/moment/locale/ar-kw.js\",\n\t\"./ar-kw.js\": \"./node_modules/moment/locale/ar-kw.js\",\n\t\"./ar-ly\": \"./node_modules/moment/locale/ar-ly.js\",\n\t\"./ar-ly.js\": \"./node_modules/moment/locale/ar-ly.js\",\n\t\"./ar-ma\": \"./node_modules/moment/locale/ar-ma.js\",\n\t\"./ar-ma.js\": \"./node_modules/moment/locale/ar-ma.js\",\n\t\"./ar-sa\": \"./node_modules/moment/locale/ar-sa.js\",\n\t\"./ar-sa.js\": \"./node_modules/moment/locale/ar-sa.js\",\n\t\"./ar-tn\": \"./node_modules/moment/locale/ar-tn.js\",\n\t\"./ar-tn.js\": \"./node_modules/moment/locale/ar-tn.js\",\n\t\"./ar.js\": \"./node_modules/moment/locale/ar.js\",\n\t\"./az\": \"./node_modules/moment/locale/az.js\",\n\t\"./az.js\": \"./node_modules/moment/locale/az.js\",\n\t\"./be\": \"./node_modules/moment/locale/be.js\",\n\t\"./be.js\": \"./node_modules/moment/locale/be.js\",\n\t\"./bg\": \"./node_modules/moment/locale/bg.js\",\n\t\"./bg.js\": \"./node_modules/moment/locale/bg.js\",\n\t\"./bm\": \"./node_modules/moment/locale/bm.js\",\n\t\"./bm.js\": \"./node_modules/moment/locale/bm.js\",\n\t\"./bn\": \"./node_modules/moment/locale/bn.js\",\n\t\"./bn.js\": \"./node_modules/moment/locale/bn.js\",\n\t\"./bo\": \"./node_modules/moment/locale/bo.js\",\n\t\"./bo.js\": \"./node_modules/moment/locale/bo.js\",\n\t\"./br\": \"./node_modules/moment/locale/br.js\",\n\t\"./br.js\": \"./node_modules/moment/locale/br.js\",\n\t\"./bs\": \"./node_modules/moment/locale/bs.js\",\n\t\"./bs.js\": \"./node_modules/moment/locale/bs.js\",\n\t\"./ca\": \"./node_modules/moment/locale/ca.js\",\n\t\"./ca.js\": \"./node_modules/moment/locale/ca.js\",\n\t\"./cs\": \"./node_modules/moment/locale/cs.js\",\n\t\"./cs.js\": \"./node_modules/moment/locale/cs.js\",\n\t\"./cv\": \"./node_modules/moment/locale/cv.js\",\n\t\"./cv.js\": \"./node_modules/moment/locale/cv.js\",\n\t\"./cy\": \"./node_modules/moment/locale/cy.js\",\n\t\"./cy.js\": \"./node_modules/moment/locale/cy.js\",\n\t\"./da\": \"./node_modules/moment/locale/da.js\",\n\t\"./da.js\": \"./node_modules/moment/locale/da.js\",\n\t\"./de\": \"./node_modules/moment/locale/de.js\",\n\t\"./de-at\": \"./node_modules/moment/locale/de-at.js\",\n\t\"./de-at.js\": \"./node_modules/moment/locale/de-at.js\",\n\t\"./de-ch\": \"./node_modules/moment/locale/de-ch.js\",\n\t\"./de-ch.js\": \"./node_modules/moment/locale/de-ch.js\",\n\t\"./de.js\": \"./node_modules/moment/locale/de.js\",\n\t\"./dv\": \"./node_modules/moment/locale/dv.js\",\n\t\"./dv.js\": \"./node_modules/moment/locale/dv.js\",\n\t\"./el\": \"./node_modules/moment/locale/el.js\",\n\t\"./el.js\": \"./node_modules/moment/locale/el.js\",\n\t\"./en-au\": \"./node_modules/moment/locale/en-au.js\",\n\t\"./en-au.js\": \"./node_modules/moment/locale/en-au.js\",\n\t\"./en-ca\": \"./node_modules/moment/locale/en-ca.js\",\n\t\"./en-ca.js\": \"./node_modules/moment/locale/en-ca.js\",\n\t\"./en-gb\": \"./node_modules/moment/locale/en-gb.js\",\n\t\"./en-gb.js\": \"./node_modules/moment/locale/en-gb.js\",\n\t\"./en-ie\": \"./node_modules/moment/locale/en-ie.js\",\n\t\"./en-ie.js\": \"./node_modules/moment/locale/en-ie.js\",\n\t\"./en-il\": \"./node_modules/moment/locale/en-il.js\",\n\t\"./en-il.js\": \"./node_modules/moment/locale/en-il.js\",\n\t\"./en-nz\": \"./node_modules/moment/locale/en-nz.js\",\n\t\"./en-nz.js\": \"./node_modules/moment/locale/en-nz.js\",\n\t\"./eo\": \"./node_modules/moment/locale/eo.js\",\n\t\"./eo.js\": \"./node_modules/moment/locale/eo.js\",\n\t\"./es\": \"./node_modules/moment/locale/es.js\",\n\t\"./es-do\": \"./node_modules/moment/locale/es-do.js\",\n\t\"./es-do.js\": \"./node_modules/moment/locale/es-do.js\",\n\t\"./es-us\": \"./node_modules/moment/locale/es-us.js\",\n\t\"./es-us.js\": \"./node_modules/moment/locale/es-us.js\",\n\t\"./es.js\": \"./node_modules/moment/locale/es.js\",\n\t\"./et\": \"./node_modules/moment/locale/et.js\",\n\t\"./et.js\": \"./node_modules/moment/locale/et.js\",\n\t\"./eu\": \"./node_modules/moment/locale/eu.js\",\n\t\"./eu.js\": \"./node_modules/moment/locale/eu.js\",\n\t\"./fa\": \"./node_modules/moment/locale/fa.js\",\n\t\"./fa.js\": \"./node_modules/moment/locale/fa.js\",\n\t\"./fi\": \"./node_modules/moment/locale/fi.js\",\n\t\"./fi.js\": \"./node_modules/moment/locale/fi.js\",\n\t\"./fo\": \"./node_modules/moment/locale/fo.js\",\n\t\"./fo.js\": \"./node_modules/moment/locale/fo.js\",\n\t\"./fr\": \"./node_modules/moment/locale/fr.js\",\n\t\"./fr-ca\": \"./node_modules/moment/locale/fr-ca.js\",\n\t\"./fr-ca.js\": \"./node_modules/moment/locale/fr-ca.js\",\n\t\"./fr-ch\": \"./node_modules/moment/locale/fr-ch.js\",\n\t\"./fr-ch.js\": \"./node_modules/moment/locale/fr-ch.js\",\n\t\"./fr.js\": \"./node_modules/moment/locale/fr.js\",\n\t\"./fy\": \"./node_modules/moment/locale/fy.js\",\n\t\"./fy.js\": \"./node_modules/moment/locale/fy.js\",\n\t\"./gd\": \"./node_modules/moment/locale/gd.js\",\n\t\"./gd.js\": \"./node_modules/moment/locale/gd.js\",\n\t\"./gl\": \"./node_modules/moment/locale/gl.js\",\n\t\"./gl.js\": \"./node_modules/moment/locale/gl.js\",\n\t\"./gom-latn\": \"./node_modules/moment/locale/gom-latn.js\",\n\t\"./gom-latn.js\": \"./node_modules/moment/locale/gom-latn.js\",\n\t\"./gu\": \"./node_modules/moment/locale/gu.js\",\n\t\"./gu.js\": \"./node_modules/moment/locale/gu.js\",\n\t\"./he\": \"./node_modules/moment/locale/he.js\",\n\t\"./he.js\": \"./node_modules/moment/locale/he.js\",\n\t\"./hi\": \"./node_modules/moment/locale/hi.js\",\n\t\"./hi.js\": \"./node_modules/moment/locale/hi.js\",\n\t\"./hr\": \"./node_modules/moment/locale/hr.js\",\n\t\"./hr.js\": \"./node_modules/moment/locale/hr.js\",\n\t\"./hu\": \"./node_modules/moment/locale/hu.js\",\n\t\"./hu.js\": \"./node_modules/moment/locale/hu.js\",\n\t\"./hy-am\": \"./node_modules/moment/locale/hy-am.js\",\n\t\"./hy-am.js\": \"./node_modules/moment/locale/hy-am.js\",\n\t\"./id\": \"./node_modules/moment/locale/id.js\",\n\t\"./id.js\": \"./node_modules/moment/locale/id.js\",\n\t\"./is\": \"./node_modules/moment/locale/is.js\",\n\t\"./is.js\": \"./node_modules/moment/locale/is.js\",\n\t\"./it\": \"./node_modules/moment/locale/it.js\",\n\t\"./it.js\": \"./node_modules/moment/locale/it.js\",\n\t\"./ja\": \"./node_modules/moment/locale/ja.js\",\n\t\"./ja.js\": \"./node_modules/moment/locale/ja.js\",\n\t\"./jv\": \"./node_modules/moment/locale/jv.js\",\n\t\"./jv.js\": \"./node_modules/moment/locale/jv.js\",\n\t\"./ka\": \"./node_modules/moment/locale/ka.js\",\n\t\"./ka.js\": \"./node_modules/moment/locale/ka.js\",\n\t\"./kk\": \"./node_modules/moment/locale/kk.js\",\n\t\"./kk.js\": \"./node_modules/moment/locale/kk.js\",\n\t\"./km\": \"./node_modules/moment/locale/km.js\",\n\t\"./km.js\": \"./node_modules/moment/locale/km.js\",\n\t\"./kn\": \"./node_modules/moment/locale/kn.js\",\n\t\"./kn.js\": \"./node_modules/moment/locale/kn.js\",\n\t\"./ko\": \"./node_modules/moment/locale/ko.js\",\n\t\"./ko.js\": \"./node_modules/moment/locale/ko.js\",\n\t\"./ky\": \"./node_modules/moment/locale/ky.js\",\n\t\"./ky.js\": \"./node_modules/moment/locale/ky.js\",\n\t\"./lb\": \"./node_modules/moment/locale/lb.js\",\n\t\"./lb.js\": \"./node_modules/moment/locale/lb.js\",\n\t\"./lo\": \"./node_modules/moment/locale/lo.js\",\n\t\"./lo.js\": \"./node_modules/moment/locale/lo.js\",\n\t\"./lt\": \"./node_modules/moment/locale/lt.js\",\n\t\"./lt.js\": \"./node_modules/moment/locale/lt.js\",\n\t\"./lv\": \"./node_modules/moment/locale/lv.js\",\n\t\"./lv.js\": \"./node_modules/moment/locale/lv.js\",\n\t\"./me\": \"./node_modules/moment/locale/me.js\",\n\t\"./me.js\": \"./node_modules/moment/locale/me.js\",\n\t\"./mi\": \"./node_modules/moment/locale/mi.js\",\n\t\"./mi.js\": \"./node_modules/moment/locale/mi.js\",\n\t\"./mk\": \"./node_modules/moment/locale/mk.js\",\n\t\"./mk.js\": \"./node_modules/moment/locale/mk.js\",\n\t\"./ml\": \"./node_modules/moment/locale/ml.js\",\n\t\"./ml.js\": \"./node_modules/moment/locale/ml.js\",\n\t\"./mn\": \"./node_modules/moment/locale/mn.js\",\n\t\"./mn.js\": \"./node_modules/moment/locale/mn.js\",\n\t\"./mr\": \"./node_modules/moment/locale/mr.js\",\n\t\"./mr.js\": \"./node_modules/moment/locale/mr.js\",\n\t\"./ms\": \"./node_modules/moment/locale/ms.js\",\n\t\"./ms-my\": \"./node_modules/moment/locale/ms-my.js\",\n\t\"./ms-my.js\": \"./node_modules/moment/locale/ms-my.js\",\n\t\"./ms.js\": \"./node_modules/moment/locale/ms.js\",\n\t\"./mt\": \"./node_modules/moment/locale/mt.js\",\n\t\"./mt.js\": \"./node_modules/moment/locale/mt.js\",\n\t\"./my\": \"./node_modules/moment/locale/my.js\",\n\t\"./my.js\": \"./node_modules/moment/locale/my.js\",\n\t\"./nb\": \"./node_modules/moment/locale/nb.js\",\n\t\"./nb.js\": \"./node_modules/moment/locale/nb.js\",\n\t\"./ne\": \"./node_modules/moment/locale/ne.js\",\n\t\"./ne.js\": \"./node_modules/moment/locale/ne.js\",\n\t\"./nl\": \"./node_modules/moment/locale/nl.js\",\n\t\"./nl-be\": \"./node_modules/moment/locale/nl-be.js\",\n\t\"./nl-be.js\": \"./node_modules/moment/locale/nl-be.js\",\n\t\"./nl.js\": \"./node_modules/moment/locale/nl.js\",\n\t\"./nn\": \"./node_modules/moment/locale/nn.js\",\n\t\"./nn.js\": \"./node_modules/moment/locale/nn.js\",\n\t\"./pa-in\": \"./node_modules/moment/locale/pa-in.js\",\n\t\"./pa-in.js\": \"./node_modules/moment/locale/pa-in.js\",\n\t\"./pl\": \"./node_modules/moment/locale/pl.js\",\n\t\"./pl.js\": \"./node_modules/moment/locale/pl.js\",\n\t\"./pt\": \"./node_modules/moment/locale/pt.js\",\n\t\"./pt-br\": \"./node_modules/moment/locale/pt-br.js\",\n\t\"./pt-br.js\": \"./node_modules/moment/locale/pt-br.js\",\n\t\"./pt.js\": \"./node_modules/moment/locale/pt.js\",\n\t\"./ro\": \"./node_modules/moment/locale/ro.js\",\n\t\"./ro.js\": \"./node_modules/moment/locale/ro.js\",\n\t\"./ru\": \"./node_modules/moment/locale/ru.js\",\n\t\"./ru.js\": \"./node_modules/moment/locale/ru.js\",\n\t\"./sd\": \"./node_modules/moment/locale/sd.js\",\n\t\"./sd.js\": \"./node_modules/moment/locale/sd.js\",\n\t\"./se\": \"./node_modules/moment/locale/se.js\",\n\t\"./se.js\": \"./node_modules/moment/locale/se.js\",\n\t\"./si\": \"./node_modules/moment/locale/si.js\",\n\t\"./si.js\": \"./node_modules/moment/locale/si.js\",\n\t\"./sk\": \"./node_modules/moment/locale/sk.js\",\n\t\"./sk.js\": \"./node_modules/moment/locale/sk.js\",\n\t\"./sl\": \"./node_modules/moment/locale/sl.js\",\n\t\"./sl.js\": \"./node_modules/moment/locale/sl.js\",\n\t\"./sq\": \"./node_modules/moment/locale/sq.js\",\n\t\"./sq.js\": \"./node_modules/moment/locale/sq.js\",\n\t\"./sr\": \"./node_modules/moment/locale/sr.js\",\n\t\"./sr-cyrl\": \"./node_modules/moment/locale/sr-cyrl.js\",\n\t\"./sr-cyrl.js\": \"./node_modules/moment/locale/sr-cyrl.js\",\n\t\"./sr.js\": \"./node_modules/moment/locale/sr.js\",\n\t\"./ss\": \"./node_modules/moment/locale/ss.js\",\n\t\"./ss.js\": \"./node_modules/moment/locale/ss.js\",\n\t\"./sv\": \"./node_modules/moment/locale/sv.js\",\n\t\"./sv.js\": \"./node_modules/moment/locale/sv.js\",\n\t\"./sw\": \"./node_modules/moment/locale/sw.js\",\n\t\"./sw.js\": \"./node_modules/moment/locale/sw.js\",\n\t\"./ta\": \"./node_modules/moment/locale/ta.js\",\n\t\"./ta.js\": \"./node_modules/moment/locale/ta.js\",\n\t\"./te\": \"./node_modules/moment/locale/te.js\",\n\t\"./te.js\": \"./node_modules/moment/locale/te.js\",\n\t\"./tet\": \"./node_modules/moment/locale/tet.js\",\n\t\"./tet.js\": \"./node_modules/moment/locale/tet.js\",\n\t\"./tg\": \"./node_modules/moment/locale/tg.js\",\n\t\"./tg.js\": \"./node_modules/moment/locale/tg.js\",\n\t\"./th\": \"./node_modules/moment/locale/th.js\",\n\t\"./th.js\": \"./node_modules/moment/locale/th.js\",\n\t\"./tl-ph\": \"./node_modules/moment/locale/tl-ph.js\",\n\t\"./tl-ph.js\": \"./node_modules/moment/locale/tl-ph.js\",\n\t\"./tlh\": \"./node_modules/moment/locale/tlh.js\",\n\t\"./tlh.js\": \"./node_modules/moment/locale/tlh.js\",\n\t\"./tr\": \"./node_modules/moment/locale/tr.js\",\n\t\"./tr.js\": \"./node_modules/moment/locale/tr.js\",\n\t\"./tzl\": \"./node_modules/moment/locale/tzl.js\",\n\t\"./tzl.js\": \"./node_modules/moment/locale/tzl.js\",\n\t\"./tzm\": \"./node_modules/moment/locale/tzm.js\",\n\t\"./tzm-latn\": \"./node_modules/moment/locale/tzm-latn.js\",\n\t\"./tzm-latn.js\": \"./node_modules/moment/locale/tzm-latn.js\",\n\t\"./tzm.js\": \"./node_modules/moment/locale/tzm.js\",\n\t\"./ug-cn\": \"./node_modules/moment/locale/ug-cn.js\",\n\t\"./ug-cn.js\": \"./node_modules/moment/locale/ug-cn.js\",\n\t\"./uk\": \"./node_modules/moment/locale/uk.js\",\n\t\"./uk.js\": \"./node_modules/moment/locale/uk.js\",\n\t\"./ur\": \"./node_modules/moment/locale/ur.js\",\n\t\"./ur.js\": \"./node_modules/moment/locale/ur.js\",\n\t\"./uz\": \"./node_modules/moment/locale/uz.js\",\n\t\"./uz-latn\": \"./node_modules/moment/locale/uz-latn.js\",\n\t\"./uz-latn.js\": \"./node_modules/moment/locale/uz-latn.js\",\n\t\"./uz.js\": \"./node_modules/moment/locale/uz.js\",\n\t\"./vi\": \"./node_modules/moment/locale/vi.js\",\n\t\"./vi.js\": \"./node_modules/moment/locale/vi.js\",\n\t\"./x-pseudo\": \"./node_modules/moment/locale/x-pseudo.js\",\n\t\"./x-pseudo.js\": \"./node_modules/moment/locale/x-pseudo.js\",\n\t\"./yo\": \"./node_modules/moment/locale/yo.js\",\n\t\"./yo.js\": \"./node_modules/moment/locale/yo.js\",\n\t\"./zh-cn\": \"./node_modules/moment/locale/zh-cn.js\",\n\t\"./zh-cn.js\": \"./node_modules/moment/locale/zh-cn.js\",\n\t\"./zh-hk\": \"./node_modules/moment/locale/zh-hk.js\",\n\t\"./zh-hk.js\": \"./node_modules/moment/locale/zh-hk.js\",\n\t\"./zh-tw\": \"./node_modules/moment/locale/zh-tw.js\",\n\t\"./zh-tw.js\": \"./node_modules/moment/locale/zh-tw.js\"\n};\n\n\nfunction webpackContext(req) {\n\tvar id = webpackContextResolve(req);\n\tvar module = __webpack_require__(id);\n\treturn module;\n}\nfunction webpackContextResolve(req) {\n\tvar id = map[req];\n\tif(!(id + 1)) { // check for number or string\n\t\tvar e = new Error('Cannot find module \"' + req + '\".');\n\t\te.code = 'MODULE_NOT_FOUND';\n\t\tthrow e;\n\t}\n\treturn id;\n}\nwebpackContext.keys = function webpackContextKeys() {\n\treturn Object.keys(map);\n};\nwebpackContext.resolve = webpackContextResolve;\nmodule.exports = webpackContext;\nwebpackContext.id = \"./node_modules/moment/locale sync recursive ^\\\\.\\\\/.*$\";","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var af = moment.defineLocale('af', {\n        months : 'Januarie_Februarie_Maart_April_Mei_Junie_Julie_Augustus_September_Oktober_November_Desember'.split('_'),\n        monthsShort : 'Jan_Feb_Mrt_Apr_Mei_Jun_Jul_Aug_Sep_Okt_Nov_Des'.split('_'),\n        weekdays : 'Sondag_Maandag_Dinsdag_Woensdag_Donderdag_Vrydag_Saterdag'.split('_'),\n        weekdaysShort : 'Son_Maa_Din_Woe_Don_Vry_Sat'.split('_'),\n        weekdaysMin : 'So_Ma_Di_Wo_Do_Vr_Sa'.split('_'),\n        meridiemParse: /vm|nm/i,\n        isPM : function (input) {\n            return /^nm$/i.test(input);\n        },\n        meridiem : function (hours, minutes, isLower) {\n            if (hours < 12) {\n                return isLower ? 'vm' : 'VM';\n            } else {\n                return isLower ? 'nm' : 'NM';\n            }\n        },\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY HH:mm',\n            LLLL : 'dddd, D MMMM YYYY HH:mm'\n        },\n        calendar : {\n            sameDay : '[Vandag om] LT',\n            nextDay : '[Môre om] LT',\n            nextWeek : 'dddd [om] LT',\n            lastDay : '[Gister om] LT',\n            lastWeek : '[Laas] dddd [om] LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'oor %s',\n            past : '%s gelede',\n            s : '\\'n paar sekondes',\n            ss : '%d sekondes',\n            m : '\\'n minuut',\n            mm : '%d minute',\n            h : '\\'n uur',\n            hh : '%d ure',\n            d : '\\'n dag',\n            dd : '%d dae',\n            M : '\\'n maand',\n            MM : '%d maande',\n            y : '\\'n jaar',\n            yy : '%d jaar'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}(ste|de)/,\n        ordinal : function (number) {\n            return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de'); // Thanks to Joris Röling : https://github.com/jjupiter\n        },\n        week : {\n            dow : 1, // Maandag is die eerste dag van die week.\n            doy : 4  // Die week wat die 4de Januarie bevat is die eerste week van die jaar.\n        }\n    });\n\n    return af;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var arDz = moment.defineLocale('ar-dz', {\n        months : 'جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),\n        monthsShort : 'جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),\n        weekdays : 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),\n        weekdaysShort : 'احد_اثنين_ثلاثاء_اربعاء_خميس_جمعة_سبت'.split('_'),\n        weekdaysMin : 'أح_إث_ثلا_أر_خم_جم_سب'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY HH:mm',\n            LLLL : 'dddd D MMMM YYYY HH:mm'\n        },\n        calendar : {\n            sameDay: '[اليوم على الساعة] LT',\n            nextDay: '[غدا على الساعة] LT',\n            nextWeek: 'dddd [على الساعة] LT',\n            lastDay: '[أمس على الساعة] LT',\n            lastWeek: 'dddd [على الساعة] LT',\n            sameElse: 'L'\n        },\n        relativeTime : {\n            future : 'في %s',\n            past : 'منذ %s',\n            s : 'ثوان',\n            ss : '%d ثانية',\n            m : 'دقيقة',\n            mm : '%d دقائق',\n            h : 'ساعة',\n            hh : '%d ساعات',\n            d : 'يوم',\n            dd : '%d أيام',\n            M : 'شهر',\n            MM : '%d أشهر',\n            y : 'سنة',\n            yy : '%d سنوات'\n        },\n        week : {\n            dow : 0, // Sunday is the first day of the week.\n            doy : 4  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return arDz;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var arKw = moment.defineLocale('ar-kw', {\n        months : 'يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر'.split('_'),\n        monthsShort : 'يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر'.split('_'),\n        weekdays : 'الأحد_الإتنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),\n        weekdaysShort : 'احد_اتنين_ثلاثاء_اربعاء_خميس_جمعة_سبت'.split('_'),\n        weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY HH:mm',\n            LLLL : 'dddd D MMMM YYYY HH:mm'\n        },\n        calendar : {\n            sameDay: '[اليوم على الساعة] LT',\n            nextDay: '[غدا على الساعة] LT',\n            nextWeek: 'dddd [على الساعة] LT',\n            lastDay: '[أمس على الساعة] LT',\n            lastWeek: 'dddd [على الساعة] LT',\n            sameElse: 'L'\n        },\n        relativeTime : {\n            future : 'في %s',\n            past : 'منذ %s',\n            s : 'ثوان',\n            ss : '%d ثانية',\n            m : 'دقيقة',\n            mm : '%d دقائق',\n            h : 'ساعة',\n            hh : '%d ساعات',\n            d : 'يوم',\n            dd : '%d أيام',\n            M : 'شهر',\n            MM : '%d أشهر',\n            y : 'سنة',\n            yy : '%d سنوات'\n        },\n        week : {\n            dow : 0, // Sunday is the first day of the week.\n            doy : 12  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return arKw;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var symbolMap = {\n        '1': '1',\n        '2': '2',\n        '3': '3',\n        '4': '4',\n        '5': '5',\n        '6': '6',\n        '7': '7',\n        '8': '8',\n        '9': '9',\n        '0': '0'\n    }, pluralForm = function (n) {\n        return n === 0 ? 0 : n === 1 ? 1 : n === 2 ? 2 : n % 100 >= 3 && n % 100 <= 10 ? 3 : n % 100 >= 11 ? 4 : 5;\n    }, plurals = {\n        s : ['أقل من ثانية', 'ثانية واحدة', ['ثانيتان', 'ثانيتين'], '%d ثوان', '%d ثانية', '%d ثانية'],\n        m : ['أقل من دقيقة', 'دقيقة واحدة', ['دقيقتان', 'دقيقتين'], '%d دقائق', '%d دقيقة', '%d دقيقة'],\n        h : ['أقل من ساعة', 'ساعة واحدة', ['ساعتان', 'ساعتين'], '%d ساعات', '%d ساعة', '%d ساعة'],\n        d : ['أقل من يوم', 'يوم واحد', ['يومان', 'يومين'], '%d أيام', '%d يومًا', '%d يوم'],\n        M : ['أقل من شهر', 'شهر واحد', ['شهران', 'شهرين'], '%d أشهر', '%d شهرا', '%d شهر'],\n        y : ['أقل من عام', 'عام واحد', ['عامان', 'عامين'], '%d أعوام', '%d عامًا', '%d عام']\n    }, pluralize = function (u) {\n        return function (number, withoutSuffix, string, isFuture) {\n            var f = pluralForm(number),\n                str = plurals[u][pluralForm(number)];\n            if (f === 2) {\n                str = str[withoutSuffix ? 0 : 1];\n            }\n            return str.replace(/%d/i, number);\n        };\n    }, months = [\n        'يناير',\n        'فبراير',\n        'مارس',\n        'أبريل',\n        'مايو',\n        'يونيو',\n        'يوليو',\n        'أغسطس',\n        'سبتمبر',\n        'أكتوبر',\n        'نوفمبر',\n        'ديسمبر'\n    ];\n\n    var arLy = moment.defineLocale('ar-ly', {\n        months : months,\n        monthsShort : months,\n        weekdays : 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),\n        weekdaysShort : 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'),\n        weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'D/\\u200FM/\\u200FYYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY HH:mm',\n            LLLL : 'dddd D MMMM YYYY HH:mm'\n        },\n        meridiemParse: /ص|م/,\n        isPM : function (input) {\n            return 'م' === input;\n        },\n        meridiem : function (hour, minute, isLower) {\n            if (hour < 12) {\n                return 'ص';\n            } else {\n                return 'م';\n            }\n        },\n        calendar : {\n            sameDay: '[اليوم عند الساعة] LT',\n            nextDay: '[غدًا عند الساعة] LT',\n            nextWeek: 'dddd [عند الساعة] LT',\n            lastDay: '[أمس عند الساعة] LT',\n            lastWeek: 'dddd [عند الساعة] LT',\n            sameElse: 'L'\n        },\n        relativeTime : {\n            future : 'بعد %s',\n            past : 'منذ %s',\n            s : pluralize('s'),\n            ss : pluralize('s'),\n            m : pluralize('m'),\n            mm : pluralize('m'),\n            h : pluralize('h'),\n            hh : pluralize('h'),\n            d : pluralize('d'),\n            dd : pluralize('d'),\n            M : pluralize('M'),\n            MM : pluralize('M'),\n            y : pluralize('y'),\n            yy : pluralize('y')\n        },\n        preparse: function (string) {\n            return string.replace(/،/g, ',');\n        },\n        postformat: function (string) {\n            return string.replace(/\\d/g, function (match) {\n                return symbolMap[match];\n            }).replace(/,/g, '،');\n        },\n        week : {\n            dow : 6, // Saturday is the first day of the week.\n            doy : 12  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return arLy;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var arMa = moment.defineLocale('ar-ma', {\n        months : 'يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر'.split('_'),\n        monthsShort : 'يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر'.split('_'),\n        weekdays : 'الأحد_الإتنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),\n        weekdaysShort : 'احد_اتنين_ثلاثاء_اربعاء_خميس_جمعة_سبت'.split('_'),\n        weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY HH:mm',\n            LLLL : 'dddd D MMMM YYYY HH:mm'\n        },\n        calendar : {\n            sameDay: '[اليوم على الساعة] LT',\n            nextDay: '[غدا على الساعة] LT',\n            nextWeek: 'dddd [على الساعة] LT',\n            lastDay: '[أمس على الساعة] LT',\n            lastWeek: 'dddd [على الساعة] LT',\n            sameElse: 'L'\n        },\n        relativeTime : {\n            future : 'في %s',\n            past : 'منذ %s',\n            s : 'ثوان',\n            ss : '%d ثانية',\n            m : 'دقيقة',\n            mm : '%d دقائق',\n            h : 'ساعة',\n            hh : '%d ساعات',\n            d : 'يوم',\n            dd : '%d أيام',\n            M : 'شهر',\n            MM : '%d أشهر',\n            y : 'سنة',\n            yy : '%d سنوات'\n        },\n        week : {\n            dow : 6, // Saturday is the first day of the week.\n            doy : 12  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return arMa;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var symbolMap = {\n        '1': '١',\n        '2': '٢',\n        '3': '٣',\n        '4': '٤',\n        '5': '٥',\n        '6': '٦',\n        '7': '٧',\n        '8': '٨',\n        '9': '٩',\n        '0': '٠'\n    }, numberMap = {\n        '١': '1',\n        '٢': '2',\n        '٣': '3',\n        '٤': '4',\n        '٥': '5',\n        '٦': '6',\n        '٧': '7',\n        '٨': '8',\n        '٩': '9',\n        '٠': '0'\n    };\n\n    var arSa = moment.defineLocale('ar-sa', {\n        months : 'يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),\n        monthsShort : 'يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),\n        weekdays : 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),\n        weekdaysShort : 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'),\n        weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY HH:mm',\n            LLLL : 'dddd D MMMM YYYY HH:mm'\n        },\n        meridiemParse: /ص|م/,\n        isPM : function (input) {\n            return 'م' === input;\n        },\n        meridiem : function (hour, minute, isLower) {\n            if (hour < 12) {\n                return 'ص';\n            } else {\n                return 'م';\n            }\n        },\n        calendar : {\n            sameDay: '[اليوم على الساعة] LT',\n            nextDay: '[غدا على الساعة] LT',\n            nextWeek: 'dddd [على الساعة] LT',\n            lastDay: '[أمس على الساعة] LT',\n            lastWeek: 'dddd [على الساعة] LT',\n            sameElse: 'L'\n        },\n        relativeTime : {\n            future : 'في %s',\n            past : 'منذ %s',\n            s : 'ثوان',\n            ss : '%d ثانية',\n            m : 'دقيقة',\n            mm : '%d دقائق',\n            h : 'ساعة',\n            hh : '%d ساعات',\n            d : 'يوم',\n            dd : '%d أيام',\n            M : 'شهر',\n            MM : '%d أشهر',\n            y : 'سنة',\n            yy : '%d سنوات'\n        },\n        preparse: function (string) {\n            return string.replace(/[١٢٣٤٥٦٧٨٩٠]/g, function (match) {\n                return numberMap[match];\n            }).replace(/،/g, ',');\n        },\n        postformat: function (string) {\n            return string.replace(/\\d/g, function (match) {\n                return symbolMap[match];\n            }).replace(/,/g, '،');\n        },\n        week : {\n            dow : 0, // Sunday is the first day of the week.\n            doy : 6  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return arSa;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var arTn = moment.defineLocale('ar-tn', {\n        months: 'جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),\n        monthsShort: 'جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),\n        weekdays: 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),\n        weekdaysShort: 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'),\n        weekdaysMin: 'ح_ن_ث_ر_خ_ج_س'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat: {\n            LT: 'HH:mm',\n            LTS: 'HH:mm:ss',\n            L: 'DD/MM/YYYY',\n            LL: 'D MMMM YYYY',\n            LLL: 'D MMMM YYYY HH:mm',\n            LLLL: 'dddd D MMMM YYYY HH:mm'\n        },\n        calendar: {\n            sameDay: '[اليوم على الساعة] LT',\n            nextDay: '[غدا على الساعة] LT',\n            nextWeek: 'dddd [على الساعة] LT',\n            lastDay: '[أمس على الساعة] LT',\n            lastWeek: 'dddd [على الساعة] LT',\n            sameElse: 'L'\n        },\n        relativeTime: {\n            future: 'في %s',\n            past: 'منذ %s',\n            s: 'ثوان',\n            ss : '%d ثانية',\n            m: 'دقيقة',\n            mm: '%d دقائق',\n            h: 'ساعة',\n            hh: '%d ساعات',\n            d: 'يوم',\n            dd: '%d أيام',\n            M: 'شهر',\n            MM: '%d أشهر',\n            y: 'سنة',\n            yy: '%d سنوات'\n        },\n        week: {\n            dow: 1, // Monday is the first day of the week.\n            doy: 4 // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return arTn;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var symbolMap = {\n        '1': '١',\n        '2': '٢',\n        '3': '٣',\n        '4': '٤',\n        '5': '٥',\n        '6': '٦',\n        '7': '٧',\n        '8': '٨',\n        '9': '٩',\n        '0': '٠'\n    }, numberMap = {\n        '١': '1',\n        '٢': '2',\n        '٣': '3',\n        '٤': '4',\n        '٥': '5',\n        '٦': '6',\n        '٧': '7',\n        '٨': '8',\n        '٩': '9',\n        '٠': '0'\n    }, pluralForm = function (n) {\n        return n === 0 ? 0 : n === 1 ? 1 : n === 2 ? 2 : n % 100 >= 3 && n % 100 <= 10 ? 3 : n % 100 >= 11 ? 4 : 5;\n    }, plurals = {\n        s : ['أقل من ثانية', 'ثانية واحدة', ['ثانيتان', 'ثانيتين'], '%d ثوان', '%d ثانية', '%d ثانية'],\n        m : ['أقل من دقيقة', 'دقيقة واحدة', ['دقيقتان', 'دقيقتين'], '%d دقائق', '%d دقيقة', '%d دقيقة'],\n        h : ['أقل من ساعة', 'ساعة واحدة', ['ساعتان', 'ساعتين'], '%d ساعات', '%d ساعة', '%d ساعة'],\n        d : ['أقل من يوم', 'يوم واحد', ['يومان', 'يومين'], '%d أيام', '%d يومًا', '%d يوم'],\n        M : ['أقل من شهر', 'شهر واحد', ['شهران', 'شهرين'], '%d أشهر', '%d شهرا', '%d شهر'],\n        y : ['أقل من عام', 'عام واحد', ['عامان', 'عامين'], '%d أعوام', '%d عامًا', '%d عام']\n    }, pluralize = function (u) {\n        return function (number, withoutSuffix, string, isFuture) {\n            var f = pluralForm(number),\n                str = plurals[u][pluralForm(number)];\n            if (f === 2) {\n                str = str[withoutSuffix ? 0 : 1];\n            }\n            return str.replace(/%d/i, number);\n        };\n    }, months = [\n        'يناير',\n        'فبراير',\n        'مارس',\n        'أبريل',\n        'مايو',\n        'يونيو',\n        'يوليو',\n        'أغسطس',\n        'سبتمبر',\n        'أكتوبر',\n        'نوفمبر',\n        'ديسمبر'\n    ];\n\n    var ar = moment.defineLocale('ar', {\n        months : months,\n        monthsShort : months,\n        weekdays : 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),\n        weekdaysShort : 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'),\n        weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'D/\\u200FM/\\u200FYYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY HH:mm',\n            LLLL : 'dddd D MMMM YYYY HH:mm'\n        },\n        meridiemParse: /ص|م/,\n        isPM : function (input) {\n            return 'م' === input;\n        },\n        meridiem : function (hour, minute, isLower) {\n            if (hour < 12) {\n                return 'ص';\n            } else {\n                return 'م';\n            }\n        },\n        calendar : {\n            sameDay: '[اليوم عند الساعة] LT',\n            nextDay: '[غدًا عند الساعة] LT',\n            nextWeek: 'dddd [عند الساعة] LT',\n            lastDay: '[أمس عند الساعة] LT',\n            lastWeek: 'dddd [عند الساعة] LT',\n            sameElse: 'L'\n        },\n        relativeTime : {\n            future : 'بعد %s',\n            past : 'منذ %s',\n            s : pluralize('s'),\n            ss : pluralize('s'),\n            m : pluralize('m'),\n            mm : pluralize('m'),\n            h : pluralize('h'),\n            hh : pluralize('h'),\n            d : pluralize('d'),\n            dd : pluralize('d'),\n            M : pluralize('M'),\n            MM : pluralize('M'),\n            y : pluralize('y'),\n            yy : pluralize('y')\n        },\n        preparse: function (string) {\n            return string.replace(/[١٢٣٤٥٦٧٨٩٠]/g, function (match) {\n                return numberMap[match];\n            }).replace(/،/g, ',');\n        },\n        postformat: function (string) {\n            return string.replace(/\\d/g, function (match) {\n                return symbolMap[match];\n            }).replace(/,/g, '،');\n        },\n        week : {\n            dow : 6, // Saturday is the first day of the week.\n            doy : 12  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return ar;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var suffixes = {\n        1: '-inci',\n        5: '-inci',\n        8: '-inci',\n        70: '-inci',\n        80: '-inci',\n        2: '-nci',\n        7: '-nci',\n        20: '-nci',\n        50: '-nci',\n        3: '-üncü',\n        4: '-üncü',\n        100: '-üncü',\n        6: '-ncı',\n        9: '-uncu',\n        10: '-uncu',\n        30: '-uncu',\n        60: '-ıncı',\n        90: '-ıncı'\n    };\n\n    var az = moment.defineLocale('az', {\n        months : 'yanvar_fevral_mart_aprel_may_iyun_iyul_avqust_sentyabr_oktyabr_noyabr_dekabr'.split('_'),\n        monthsShort : 'yan_fev_mar_apr_may_iyn_iyl_avq_sen_okt_noy_dek'.split('_'),\n        weekdays : 'Bazar_Bazar ertəsi_Çərşənbə axşamı_Çərşənbə_Cümə axşamı_Cümə_Şənbə'.split('_'),\n        weekdaysShort : 'Baz_BzE_ÇAx_Çər_CAx_Cüm_Şən'.split('_'),\n        weekdaysMin : 'Bz_BE_ÇA_Çə_CA_Cü_Şə'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD.MM.YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY HH:mm',\n            LLLL : 'dddd, D MMMM YYYY HH:mm'\n        },\n        calendar : {\n            sameDay : '[bugün saat] LT',\n            nextDay : '[sabah saat] LT',\n            nextWeek : '[gələn həftə] dddd [saat] LT',\n            lastDay : '[dünən] LT',\n            lastWeek : '[keçən həftə] dddd [saat] LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : '%s sonra',\n            past : '%s əvvəl',\n            s : 'birneçə saniyyə',\n            ss : '%d saniyə',\n            m : 'bir dəqiqə',\n            mm : '%d dəqiqə',\n            h : 'bir saat',\n            hh : '%d saat',\n            d : 'bir gün',\n            dd : '%d gün',\n            M : 'bir ay',\n            MM : '%d ay',\n            y : 'bir il',\n            yy : '%d il'\n        },\n        meridiemParse: /gecə|səhər|gündüz|axşam/,\n        isPM : function (input) {\n            return /^(gündüz|axşam)$/.test(input);\n        },\n        meridiem : function (hour, minute, isLower) {\n            if (hour < 4) {\n                return 'gecə';\n            } else if (hour < 12) {\n                return 'səhər';\n            } else if (hour < 17) {\n                return 'gündüz';\n            } else {\n                return 'axşam';\n            }\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}-(ıncı|inci|nci|üncü|ncı|uncu)/,\n        ordinal : function (number) {\n            if (number === 0) {  // special case for zero\n                return number + '-ıncı';\n            }\n            var a = number % 10,\n                b = number % 100 - a,\n                c = number >= 100 ? 100 : null;\n            return number + (suffixes[a] || suffixes[b] || suffixes[c]);\n        },\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 7  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return az;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    function plural(word, num) {\n        var forms = word.split('_');\n        return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]);\n    }\n    function relativeTimeWithPlural(number, withoutSuffix, key) {\n        var format = {\n            'ss': withoutSuffix ? 'секунда_секунды_секунд' : 'секунду_секунды_секунд',\n            'mm': withoutSuffix ? 'хвіліна_хвіліны_хвілін' : 'хвіліну_хвіліны_хвілін',\n            'hh': withoutSuffix ? 'гадзіна_гадзіны_гадзін' : 'гадзіну_гадзіны_гадзін',\n            'dd': 'дзень_дні_дзён',\n            'MM': 'месяц_месяцы_месяцаў',\n            'yy': 'год_гады_гадоў'\n        };\n        if (key === 'm') {\n            return withoutSuffix ? 'хвіліна' : 'хвіліну';\n        }\n        else if (key === 'h') {\n            return withoutSuffix ? 'гадзіна' : 'гадзіну';\n        }\n        else {\n            return number + ' ' + plural(format[key], +number);\n        }\n    }\n\n    var be = moment.defineLocale('be', {\n        months : {\n            format: 'студзеня_лютага_сакавіка_красавіка_траўня_чэрвеня_ліпеня_жніўня_верасня_кастрычніка_лістапада_снежня'.split('_'),\n            standalone: 'студзень_люты_сакавік_красавік_травень_чэрвень_ліпень_жнівень_верасень_кастрычнік_лістапад_снежань'.split('_')\n        },\n        monthsShort : 'студ_лют_сак_крас_трав_чэрв_ліп_жнів_вер_каст_ліст_снеж'.split('_'),\n        weekdays : {\n            format: 'нядзелю_панядзелак_аўторак_сераду_чацвер_пятніцу_суботу'.split('_'),\n            standalone: 'нядзеля_панядзелак_аўторак_серада_чацвер_пятніца_субота'.split('_'),\n            isFormat: /\\[ ?[Вв] ?(?:мінулую|наступную)? ?\\] ?dddd/\n        },\n        weekdaysShort : 'нд_пн_ат_ср_чц_пт_сб'.split('_'),\n        weekdaysMin : 'нд_пн_ат_ср_чц_пт_сб'.split('_'),\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD.MM.YYYY',\n            LL : 'D MMMM YYYY г.',\n            LLL : 'D MMMM YYYY г., HH:mm',\n            LLLL : 'dddd, D MMMM YYYY г., HH:mm'\n        },\n        calendar : {\n            sameDay: '[Сёння ў] LT',\n            nextDay: '[Заўтра ў] LT',\n            lastDay: '[Учора ў] LT',\n            nextWeek: function () {\n                return '[У] dddd [ў] LT';\n            },\n            lastWeek: function () {\n                switch (this.day()) {\n                    case 0:\n                    case 3:\n                    case 5:\n                    case 6:\n                        return '[У мінулую] dddd [ў] LT';\n                    case 1:\n                    case 2:\n                    case 4:\n                        return '[У мінулы] dddd [ў] LT';\n                }\n            },\n            sameElse: 'L'\n        },\n        relativeTime : {\n            future : 'праз %s',\n            past : '%s таму',\n            s : 'некалькі секунд',\n            m : relativeTimeWithPlural,\n            mm : relativeTimeWithPlural,\n            h : relativeTimeWithPlural,\n            hh : relativeTimeWithPlural,\n            d : 'дзень',\n            dd : relativeTimeWithPlural,\n            M : 'месяц',\n            MM : relativeTimeWithPlural,\n            y : 'год',\n            yy : relativeTimeWithPlural\n        },\n        meridiemParse: /ночы|раніцы|дня|вечара/,\n        isPM : function (input) {\n            return /^(дня|вечара)$/.test(input);\n        },\n        meridiem : function (hour, minute, isLower) {\n            if (hour < 4) {\n                return 'ночы';\n            } else if (hour < 12) {\n                return 'раніцы';\n            } else if (hour < 17) {\n                return 'дня';\n            } else {\n                return 'вечара';\n            }\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}-(і|ы|га)/,\n        ordinal: function (number, period) {\n            switch (period) {\n                case 'M':\n                case 'd':\n                case 'DDD':\n                case 'w':\n                case 'W':\n                    return (number % 10 === 2 || number % 10 === 3) && (number % 100 !== 12 && number % 100 !== 13) ? number + '-і' : number + '-ы';\n                case 'D':\n                    return number + '-га';\n                default:\n                    return number;\n            }\n        },\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 7  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return be;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var bg = moment.defineLocale('bg', {\n        months : 'януари_февруари_март_април_май_юни_юли_август_септември_октомври_ноември_декември'.split('_'),\n        monthsShort : 'янр_фев_мар_апр_май_юни_юли_авг_сеп_окт_ное_дек'.split('_'),\n        weekdays : 'неделя_понеделник_вторник_сряда_четвъртък_петък_събота'.split('_'),\n        weekdaysShort : 'нед_пон_вто_сря_чет_пет_съб'.split('_'),\n        weekdaysMin : 'нд_пн_вт_ср_чт_пт_сб'.split('_'),\n        longDateFormat : {\n            LT : 'H:mm',\n            LTS : 'H:mm:ss',\n            L : 'D.MM.YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY H:mm',\n            LLLL : 'dddd, D MMMM YYYY H:mm'\n        },\n        calendar : {\n            sameDay : '[Днес в] LT',\n            nextDay : '[Утре в] LT',\n            nextWeek : 'dddd [в] LT',\n            lastDay : '[Вчера в] LT',\n            lastWeek : function () {\n                switch (this.day()) {\n                    case 0:\n                    case 3:\n                    case 6:\n                        return '[В изминалата] dddd [в] LT';\n                    case 1:\n                    case 2:\n                    case 4:\n                    case 5:\n                        return '[В изминалия] dddd [в] LT';\n                }\n            },\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'след %s',\n            past : 'преди %s',\n            s : 'няколко секунди',\n            ss : '%d секунди',\n            m : 'минута',\n            mm : '%d минути',\n            h : 'час',\n            hh : '%d часа',\n            d : 'ден',\n            dd : '%d дни',\n            M : 'месец',\n            MM : '%d месеца',\n            y : 'година',\n            yy : '%d години'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}-(ев|ен|ти|ви|ри|ми)/,\n        ordinal : function (number) {\n            var lastDigit = number % 10,\n                last2Digits = number % 100;\n            if (number === 0) {\n                return number + '-ев';\n            } else if (last2Digits === 0) {\n                return number + '-ен';\n            } else if (last2Digits > 10 && last2Digits < 20) {\n                return number + '-ти';\n            } else if (lastDigit === 1) {\n                return number + '-ви';\n            } else if (lastDigit === 2) {\n                return number + '-ри';\n            } else if (lastDigit === 7 || lastDigit === 8) {\n                return number + '-ми';\n            } else {\n                return number + '-ти';\n            }\n        },\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 7  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return bg;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var bm = moment.defineLocale('bm', {\n        months : 'Zanwuyekalo_Fewuruyekalo_Marisikalo_Awirilikalo_Mɛkalo_Zuwɛnkalo_Zuluyekalo_Utikalo_Sɛtanburukalo_ɔkutɔburukalo_Nowanburukalo_Desanburukalo'.split('_'),\n        monthsShort : 'Zan_Few_Mar_Awi_Mɛ_Zuw_Zul_Uti_Sɛt_ɔku_Now_Des'.split('_'),\n        weekdays : 'Kari_Ntɛnɛn_Tarata_Araba_Alamisa_Juma_Sibiri'.split('_'),\n        weekdaysShort : 'Kar_Ntɛ_Tar_Ara_Ala_Jum_Sib'.split('_'),\n        weekdaysMin : 'Ka_Nt_Ta_Ar_Al_Ju_Si'.split('_'),\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD/MM/YYYY',\n            LL : 'MMMM [tile] D [san] YYYY',\n            LLL : 'MMMM [tile] D [san] YYYY [lɛrɛ] HH:mm',\n            LLLL : 'dddd MMMM [tile] D [san] YYYY [lɛrɛ] HH:mm'\n        },\n        calendar : {\n            sameDay : '[Bi lɛrɛ] LT',\n            nextDay : '[Sini lɛrɛ] LT',\n            nextWeek : 'dddd [don lɛrɛ] LT',\n            lastDay : '[Kunu lɛrɛ] LT',\n            lastWeek : 'dddd [tɛmɛnen lɛrɛ] LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : '%s kɔnɔ',\n            past : 'a bɛ %s bɔ',\n            s : 'sanga dama dama',\n            ss : 'sekondi %d',\n            m : 'miniti kelen',\n            mm : 'miniti %d',\n            h : 'lɛrɛ kelen',\n            hh : 'lɛrɛ %d',\n            d : 'tile kelen',\n            dd : 'tile %d',\n            M : 'kalo kelen',\n            MM : 'kalo %d',\n            y : 'san kelen',\n            yy : 'san %d'\n        },\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return bm;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var symbolMap = {\n        '1': '১',\n        '2': '২',\n        '3': '৩',\n        '4': '৪',\n        '5': '৫',\n        '6': '৬',\n        '7': '৭',\n        '8': '৮',\n        '9': '৯',\n        '0': '০'\n    },\n    numberMap = {\n        '১': '1',\n        '২': '2',\n        '৩': '3',\n        '৪': '4',\n        '৫': '5',\n        '৬': '6',\n        '৭': '7',\n        '৮': '8',\n        '৯': '9',\n        '০': '0'\n    };\n\n    var bn = moment.defineLocale('bn', {\n        months : 'জানুয়ারী_ফেব্রুয়ারি_মার্চ_এপ্রিল_মে_জুন_জুলাই_আগস্ট_সেপ্টেম্বর_অক্টোবর_নভেম্বর_ডিসেম্বর'.split('_'),\n        monthsShort : 'জানু_ফেব_মার্চ_এপ্র_মে_জুন_জুল_আগ_সেপ্ট_অক্টো_নভে_ডিসে'.split('_'),\n        weekdays : 'রবিবার_সোমবার_মঙ্গলবার_বুধবার_বৃহস্পতিবার_শুক্রবার_শনিবার'.split('_'),\n        weekdaysShort : 'রবি_সোম_মঙ্গল_বুধ_বৃহস্পতি_শুক্র_শনি'.split('_'),\n        weekdaysMin : 'রবি_সোম_মঙ্গ_বুধ_বৃহঃ_শুক্র_শনি'.split('_'),\n        longDateFormat : {\n            LT : 'A h:mm সময়',\n            LTS : 'A h:mm:ss সময়',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY, A h:mm সময়',\n            LLLL : 'dddd, D MMMM YYYY, A h:mm সময়'\n        },\n        calendar : {\n            sameDay : '[আজ] LT',\n            nextDay : '[আগামীকাল] LT',\n            nextWeek : 'dddd, LT',\n            lastDay : '[গতকাল] LT',\n            lastWeek : '[গত] dddd, LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : '%s পরে',\n            past : '%s আগে',\n            s : 'কয়েক সেকেন্ড',\n            ss : '%d সেকেন্ড',\n            m : 'এক মিনিট',\n            mm : '%d মিনিট',\n            h : 'এক ঘন্টা',\n            hh : '%d ঘন্টা',\n            d : 'এক দিন',\n            dd : '%d দিন',\n            M : 'এক মাস',\n            MM : '%d মাস',\n            y : 'এক বছর',\n            yy : '%d বছর'\n        },\n        preparse: function (string) {\n            return string.replace(/[১২৩৪৫৬৭৮৯০]/g, function (match) {\n                return numberMap[match];\n            });\n        },\n        postformat: function (string) {\n            return string.replace(/\\d/g, function (match) {\n                return symbolMap[match];\n            });\n        },\n        meridiemParse: /রাত|সকাল|দুপুর|বিকাল|রাত/,\n        meridiemHour : function (hour, meridiem) {\n            if (hour === 12) {\n                hour = 0;\n            }\n            if ((meridiem === 'রাত' && hour >= 4) ||\n                    (meridiem === 'দুপুর' && hour < 5) ||\n                    meridiem === 'বিকাল') {\n                return hour + 12;\n            } else {\n                return hour;\n            }\n        },\n        meridiem : function (hour, minute, isLower) {\n            if (hour < 4) {\n                return 'রাত';\n            } else if (hour < 10) {\n                return 'সকাল';\n            } else if (hour < 17) {\n                return 'দুপুর';\n            } else if (hour < 20) {\n                return 'বিকাল';\n            } else {\n                return 'রাত';\n            }\n        },\n        week : {\n            dow : 0, // Sunday is the first day of the week.\n            doy : 6  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return bn;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var symbolMap = {\n        '1': '༡',\n        '2': '༢',\n        '3': '༣',\n        '4': '༤',\n        '5': '༥',\n        '6': '༦',\n        '7': '༧',\n        '8': '༨',\n        '9': '༩',\n        '0': '༠'\n    },\n    numberMap = {\n        '༡': '1',\n        '༢': '2',\n        '༣': '3',\n        '༤': '4',\n        '༥': '5',\n        '༦': '6',\n        '༧': '7',\n        '༨': '8',\n        '༩': '9',\n        '༠': '0'\n    };\n\n    var bo = moment.defineLocale('bo', {\n        months : 'ཟླ་བ་དང་པོ_ཟླ་བ་གཉིས་པ_ཟླ་བ་གསུམ་པ_ཟླ་བ་བཞི་པ_ཟླ་བ་ལྔ་པ_ཟླ་བ་དྲུག་པ_ཟླ་བ་བདུན་པ_ཟླ་བ་བརྒྱད་པ_ཟླ་བ་དགུ་པ_ཟླ་བ་བཅུ་པ_ཟླ་བ་བཅུ་གཅིག་པ_ཟླ་བ་བཅུ་གཉིས་པ'.split('_'),\n        monthsShort : 'ཟླ་བ་དང་པོ_ཟླ་བ་གཉིས་པ_ཟླ་བ་གསུམ་པ_ཟླ་བ་བཞི་པ_ཟླ་བ་ལྔ་པ_ཟླ་བ་དྲུག་པ_ཟླ་བ་བདུན་པ_ཟླ་བ་བརྒྱད་པ_ཟླ་བ་དགུ་པ_ཟླ་བ་བཅུ་པ_ཟླ་བ་བཅུ་གཅིག་པ_ཟླ་བ་བཅུ་གཉིས་པ'.split('_'),\n        weekdays : 'གཟའ་ཉི་མ་_གཟའ་ཟླ་བ་_གཟའ་མིག་དམར་_གཟའ་ལྷག་པ་_གཟའ་ཕུར་བུ_གཟའ་པ་སངས་_གཟའ་སྤེན་པ་'.split('_'),\n        weekdaysShort : 'ཉི་མ་_ཟླ་བ་_མིག་དམར་_ལྷག་པ་_ཕུར་བུ_པ་སངས་_སྤེན་པ་'.split('_'),\n        weekdaysMin : 'ཉི་མ་_ཟླ་བ་_མིག་དམར་_ལྷག་པ་_ཕུར་བུ_པ་སངས་_སྤེན་པ་'.split('_'),\n        longDateFormat : {\n            LT : 'A h:mm',\n            LTS : 'A h:mm:ss',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY, A h:mm',\n            LLLL : 'dddd, D MMMM YYYY, A h:mm'\n        },\n        calendar : {\n            sameDay : '[དི་རིང] LT',\n            nextDay : '[སང་ཉིན] LT',\n            nextWeek : '[བདུན་ཕྲག་རྗེས་མ], LT',\n            lastDay : '[ཁ་སང] LT',\n            lastWeek : '[བདུན་ཕྲག་མཐའ་མ] dddd, LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : '%s ལ་',\n            past : '%s སྔན་ལ',\n            s : 'ལམ་སང',\n            ss : '%d སྐར་ཆ།',\n            m : 'སྐར་མ་གཅིག',\n            mm : '%d སྐར་མ',\n            h : 'ཆུ་ཚོད་གཅིག',\n            hh : '%d ཆུ་ཚོད',\n            d : 'ཉིན་གཅིག',\n            dd : '%d ཉིན་',\n            M : 'ཟླ་བ་གཅིག',\n            MM : '%d ཟླ་བ',\n            y : 'ལོ་གཅིག',\n            yy : '%d ལོ'\n        },\n        preparse: function (string) {\n            return string.replace(/[༡༢༣༤༥༦༧༨༩༠]/g, function (match) {\n                return numberMap[match];\n            });\n        },\n        postformat: function (string) {\n            return string.replace(/\\d/g, function (match) {\n                return symbolMap[match];\n            });\n        },\n        meridiemParse: /མཚན་མོ|ཞོགས་ཀས|ཉིན་གུང|དགོང་དག|མཚན་མོ/,\n        meridiemHour : function (hour, meridiem) {\n            if (hour === 12) {\n                hour = 0;\n            }\n            if ((meridiem === 'མཚན་མོ' && hour >= 4) ||\n                    (meridiem === 'ཉིན་གུང' && hour < 5) ||\n                    meridiem === 'དགོང་དག') {\n                return hour + 12;\n            } else {\n                return hour;\n            }\n        },\n        meridiem : function (hour, minute, isLower) {\n            if (hour < 4) {\n                return 'མཚན་མོ';\n            } else if (hour < 10) {\n                return 'ཞོགས་ཀས';\n            } else if (hour < 17) {\n                return 'ཉིན་གུང';\n            } else if (hour < 20) {\n                return 'དགོང་དག';\n            } else {\n                return 'མཚན་མོ';\n            }\n        },\n        week : {\n            dow : 0, // Sunday is the first day of the week.\n            doy : 6  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return bo;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    function relativeTimeWithMutation(number, withoutSuffix, key) {\n        var format = {\n            'mm': 'munutenn',\n            'MM': 'miz',\n            'dd': 'devezh'\n        };\n        return number + ' ' + mutation(format[key], number);\n    }\n    function specialMutationForYears(number) {\n        switch (lastNumber(number)) {\n            case 1:\n            case 3:\n            case 4:\n            case 5:\n            case 9:\n                return number + ' bloaz';\n            default:\n                return number + ' vloaz';\n        }\n    }\n    function lastNumber(number) {\n        if (number > 9) {\n            return lastNumber(number % 10);\n        }\n        return number;\n    }\n    function mutation(text, number) {\n        if (number === 2) {\n            return softMutation(text);\n        }\n        return text;\n    }\n    function softMutation(text) {\n        var mutationTable = {\n            'm': 'v',\n            'b': 'v',\n            'd': 'z'\n        };\n        if (mutationTable[text.charAt(0)] === undefined) {\n            return text;\n        }\n        return mutationTable[text.charAt(0)] + text.substring(1);\n    }\n\n    var br = moment.defineLocale('br', {\n        months : 'Genver_C\\'hwevrer_Meurzh_Ebrel_Mae_Mezheven_Gouere_Eost_Gwengolo_Here_Du_Kerzu'.split('_'),\n        monthsShort : 'Gen_C\\'hwe_Meu_Ebr_Mae_Eve_Gou_Eos_Gwe_Her_Du_Ker'.split('_'),\n        weekdays : 'Sul_Lun_Meurzh_Merc\\'her_Yaou_Gwener_Sadorn'.split('_'),\n        weekdaysShort : 'Sul_Lun_Meu_Mer_Yao_Gwe_Sad'.split('_'),\n        weekdaysMin : 'Su_Lu_Me_Mer_Ya_Gw_Sa'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat : {\n            LT : 'h[e]mm A',\n            LTS : 'h[e]mm:ss A',\n            L : 'DD/MM/YYYY',\n            LL : 'D [a viz] MMMM YYYY',\n            LLL : 'D [a viz] MMMM YYYY h[e]mm A',\n            LLLL : 'dddd, D [a viz] MMMM YYYY h[e]mm A'\n        },\n        calendar : {\n            sameDay : '[Hiziv da] LT',\n            nextDay : '[Warc\\'hoazh da] LT',\n            nextWeek : 'dddd [da] LT',\n            lastDay : '[Dec\\'h da] LT',\n            lastWeek : 'dddd [paset da] LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'a-benn %s',\n            past : '%s \\'zo',\n            s : 'un nebeud segondennoù',\n            ss : '%d eilenn',\n            m : 'ur vunutenn',\n            mm : relativeTimeWithMutation,\n            h : 'un eur',\n            hh : '%d eur',\n            d : 'un devezh',\n            dd : relativeTimeWithMutation,\n            M : 'ur miz',\n            MM : relativeTimeWithMutation,\n            y : 'ur bloaz',\n            yy : specialMutationForYears\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}(añ|vet)/,\n        ordinal : function (number) {\n            var output = (number === 1) ? 'añ' : 'vet';\n            return number + output;\n        },\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return br;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    function translate(number, withoutSuffix, key) {\n        var result = number + ' ';\n        switch (key) {\n            case 'ss':\n                if (number === 1) {\n                    result += 'sekunda';\n                } else if (number === 2 || number === 3 || number === 4) {\n                    result += 'sekunde';\n                } else {\n                    result += 'sekundi';\n                }\n                return result;\n            case 'm':\n                return withoutSuffix ? 'jedna minuta' : 'jedne minute';\n            case 'mm':\n                if (number === 1) {\n                    result += 'minuta';\n                } else if (number === 2 || number === 3 || number === 4) {\n                    result += 'minute';\n                } else {\n                    result += 'minuta';\n                }\n                return result;\n            case 'h':\n                return withoutSuffix ? 'jedan sat' : 'jednog sata';\n            case 'hh':\n                if (number === 1) {\n                    result += 'sat';\n                } else if (number === 2 || number === 3 || number === 4) {\n                    result += 'sata';\n                } else {\n                    result += 'sati';\n                }\n                return result;\n            case 'dd':\n                if (number === 1) {\n                    result += 'dan';\n                } else {\n                    result += 'dana';\n                }\n                return result;\n            case 'MM':\n                if (number === 1) {\n                    result += 'mjesec';\n                } else if (number === 2 || number === 3 || number === 4) {\n                    result += 'mjeseca';\n                } else {\n                    result += 'mjeseci';\n                }\n                return result;\n            case 'yy':\n                if (number === 1) {\n                    result += 'godina';\n                } else if (number === 2 || number === 3 || number === 4) {\n                    result += 'godine';\n                } else {\n                    result += 'godina';\n                }\n                return result;\n        }\n    }\n\n    var bs = moment.defineLocale('bs', {\n        months : 'januar_februar_mart_april_maj_juni_juli_august_septembar_oktobar_novembar_decembar'.split('_'),\n        monthsShort : 'jan._feb._mar._apr._maj._jun._jul._aug._sep._okt._nov._dec.'.split('_'),\n        monthsParseExact: true,\n        weekdays : 'nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota'.split('_'),\n        weekdaysShort : 'ned._pon._uto._sri._čet._pet._sub.'.split('_'),\n        weekdaysMin : 'ne_po_ut_sr_če_pe_su'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat : {\n            LT : 'H:mm',\n            LTS : 'H:mm:ss',\n            L : 'DD.MM.YYYY',\n            LL : 'D. MMMM YYYY',\n            LLL : 'D. MMMM YYYY H:mm',\n            LLLL : 'dddd, D. MMMM YYYY H:mm'\n        },\n        calendar : {\n            sameDay  : '[danas u] LT',\n            nextDay  : '[sutra u] LT',\n            nextWeek : function () {\n                switch (this.day()) {\n                    case 0:\n                        return '[u] [nedjelju] [u] LT';\n                    case 3:\n                        return '[u] [srijedu] [u] LT';\n                    case 6:\n                        return '[u] [subotu] [u] LT';\n                    case 1:\n                    case 2:\n                    case 4:\n                    case 5:\n                        return '[u] dddd [u] LT';\n                }\n            },\n            lastDay  : '[jučer u] LT',\n            lastWeek : function () {\n                switch (this.day()) {\n                    case 0:\n                    case 3:\n                        return '[prošlu] dddd [u] LT';\n                    case 6:\n                        return '[prošle] [subote] [u] LT';\n                    case 1:\n                    case 2:\n                    case 4:\n                    case 5:\n                        return '[prošli] dddd [u] LT';\n                }\n            },\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'za %s',\n            past   : 'prije %s',\n            s      : 'par sekundi',\n            ss     : translate,\n            m      : translate,\n            mm     : translate,\n            h      : translate,\n            hh     : translate,\n            d      : 'dan',\n            dd     : translate,\n            M      : 'mjesec',\n            MM     : translate,\n            y      : 'godinu',\n            yy     : translate\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}\\./,\n        ordinal : '%d.',\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 7  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return bs;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var ca = moment.defineLocale('ca', {\n        months : {\n            standalone: 'gener_febrer_març_abril_maig_juny_juliol_agost_setembre_octubre_novembre_desembre'.split('_'),\n            format: 'de gener_de febrer_de març_d\\'abril_de maig_de juny_de juliol_d\\'agost_de setembre_d\\'octubre_de novembre_de desembre'.split('_'),\n            isFormat: /D[oD]?(\\s)+MMMM/\n        },\n        monthsShort : 'gen._febr._març_abr._maig_juny_jul._ag._set._oct._nov._des.'.split('_'),\n        monthsParseExact : true,\n        weekdays : 'diumenge_dilluns_dimarts_dimecres_dijous_divendres_dissabte'.split('_'),\n        weekdaysShort : 'dg._dl._dt._dc._dj._dv._ds.'.split('_'),\n        weekdaysMin : 'dg_dl_dt_dc_dj_dv_ds'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat : {\n            LT : 'H:mm',\n            LTS : 'H:mm:ss',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM [de] YYYY',\n            ll : 'D MMM YYYY',\n            LLL : 'D MMMM [de] YYYY [a les] H:mm',\n            lll : 'D MMM YYYY, H:mm',\n            LLLL : 'dddd D MMMM [de] YYYY [a les] H:mm',\n            llll : 'ddd D MMM YYYY, H:mm'\n        },\n        calendar : {\n            sameDay : function () {\n                return '[avui a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';\n            },\n            nextDay : function () {\n                return '[demà a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';\n            },\n            nextWeek : function () {\n                return 'dddd [a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';\n            },\n            lastDay : function () {\n                return '[ahir a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';\n            },\n            lastWeek : function () {\n                return '[el] dddd [passat a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';\n            },\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'd\\'aquí %s',\n            past : 'fa %s',\n            s : 'uns segons',\n            ss : '%d segons',\n            m : 'un minut',\n            mm : '%d minuts',\n            h : 'una hora',\n            hh : '%d hores',\n            d : 'un dia',\n            dd : '%d dies',\n            M : 'un mes',\n            MM : '%d mesos',\n            y : 'un any',\n            yy : '%d anys'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}(r|n|t|è|a)/,\n        ordinal : function (number, period) {\n            var output = (number === 1) ? 'r' :\n                (number === 2) ? 'n' :\n                (number === 3) ? 'r' :\n                (number === 4) ? 't' : 'è';\n            if (period === 'w' || period === 'W') {\n                output = 'a';\n            }\n            return number + output;\n        },\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return ca;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var months = 'leden_únor_březen_duben_květen_červen_červenec_srpen_září_říjen_listopad_prosinec'.split('_'),\n        monthsShort = 'led_úno_bře_dub_kvě_čvn_čvc_srp_zář_říj_lis_pro'.split('_');\n    function plural(n) {\n        return (n > 1) && (n < 5) && (~~(n / 10) !== 1);\n    }\n    function translate(number, withoutSuffix, key, isFuture) {\n        var result = number + ' ';\n        switch (key) {\n            case 's':  // a few seconds / in a few seconds / a few seconds ago\n                return (withoutSuffix || isFuture) ? 'pár sekund' : 'pár sekundami';\n            case 'ss': // 9 seconds / in 9 seconds / 9 seconds ago\n                if (withoutSuffix || isFuture) {\n                    return result + (plural(number) ? 'sekundy' : 'sekund');\n                } else {\n                    return result + 'sekundami';\n                }\n                break;\n            case 'm':  // a minute / in a minute / a minute ago\n                return withoutSuffix ? 'minuta' : (isFuture ? 'minutu' : 'minutou');\n            case 'mm': // 9 minutes / in 9 minutes / 9 minutes ago\n                if (withoutSuffix || isFuture) {\n                    return result + (plural(number) ? 'minuty' : 'minut');\n                } else {\n                    return result + 'minutami';\n                }\n                break;\n            case 'h':  // an hour / in an hour / an hour ago\n                return withoutSuffix ? 'hodina' : (isFuture ? 'hodinu' : 'hodinou');\n            case 'hh': // 9 hours / in 9 hours / 9 hours ago\n                if (withoutSuffix || isFuture) {\n                    return result + (plural(number) ? 'hodiny' : 'hodin');\n                } else {\n                    return result + 'hodinami';\n                }\n                break;\n            case 'd':  // a day / in a day / a day ago\n                return (withoutSuffix || isFuture) ? 'den' : 'dnem';\n            case 'dd': // 9 days / in 9 days / 9 days ago\n                if (withoutSuffix || isFuture) {\n                    return result + (plural(number) ? 'dny' : 'dní');\n                } else {\n                    return result + 'dny';\n                }\n                break;\n            case 'M':  // a month / in a month / a month ago\n                return (withoutSuffix || isFuture) ? 'měsíc' : 'měsícem';\n            case 'MM': // 9 months / in 9 months / 9 months ago\n                if (withoutSuffix || isFuture) {\n                    return result + (plural(number) ? 'měsíce' : 'měsíců');\n                } else {\n                    return result + 'měsíci';\n                }\n                break;\n            case 'y':  // a year / in a year / a year ago\n                return (withoutSuffix || isFuture) ? 'rok' : 'rokem';\n            case 'yy': // 9 years / in 9 years / 9 years ago\n                if (withoutSuffix || isFuture) {\n                    return result + (plural(number) ? 'roky' : 'let');\n                } else {\n                    return result + 'lety';\n                }\n                break;\n        }\n    }\n\n    var cs = moment.defineLocale('cs', {\n        months : months,\n        monthsShort : monthsShort,\n        monthsParse : (function (months, monthsShort) {\n            var i, _monthsParse = [];\n            for (i = 0; i < 12; i++) {\n                // use custom parser to solve problem with July (červenec)\n                _monthsParse[i] = new RegExp('^' + months[i] + '$|^' + monthsShort[i] + '$', 'i');\n            }\n            return _monthsParse;\n        }(months, monthsShort)),\n        shortMonthsParse : (function (monthsShort) {\n            var i, _shortMonthsParse = [];\n            for (i = 0; i < 12; i++) {\n                _shortMonthsParse[i] = new RegExp('^' + monthsShort[i] + '$', 'i');\n            }\n            return _shortMonthsParse;\n        }(monthsShort)),\n        longMonthsParse : (function (months) {\n            var i, _longMonthsParse = [];\n            for (i = 0; i < 12; i++) {\n                _longMonthsParse[i] = new RegExp('^' + months[i] + '$', 'i');\n            }\n            return _longMonthsParse;\n        }(months)),\n        weekdays : 'neděle_pondělí_úterý_středa_čtvrtek_pátek_sobota'.split('_'),\n        weekdaysShort : 'ne_po_út_st_čt_pá_so'.split('_'),\n        weekdaysMin : 'ne_po_út_st_čt_pá_so'.split('_'),\n        longDateFormat : {\n            LT: 'H:mm',\n            LTS : 'H:mm:ss',\n            L : 'DD.MM.YYYY',\n            LL : 'D. MMMM YYYY',\n            LLL : 'D. MMMM YYYY H:mm',\n            LLLL : 'dddd D. MMMM YYYY H:mm',\n            l : 'D. M. YYYY'\n        },\n        calendar : {\n            sameDay: '[dnes v] LT',\n            nextDay: '[zítra v] LT',\n            nextWeek: function () {\n                switch (this.day()) {\n                    case 0:\n                        return '[v neděli v] LT';\n                    case 1:\n                    case 2:\n                        return '[v] dddd [v] LT';\n                    case 3:\n                        return '[ve středu v] LT';\n                    case 4:\n                        return '[ve čtvrtek v] LT';\n                    case 5:\n                        return '[v pátek v] LT';\n                    case 6:\n                        return '[v sobotu v] LT';\n                }\n            },\n            lastDay: '[včera v] LT',\n            lastWeek: function () {\n                switch (this.day()) {\n                    case 0:\n                        return '[minulou neděli v] LT';\n                    case 1:\n                    case 2:\n                        return '[minulé] dddd [v] LT';\n                    case 3:\n                        return '[minulou středu v] LT';\n                    case 4:\n                    case 5:\n                        return '[minulý] dddd [v] LT';\n                    case 6:\n                        return '[minulou sobotu v] LT';\n                }\n            },\n            sameElse: 'L'\n        },\n        relativeTime : {\n            future : 'za %s',\n            past : 'před %s',\n            s : translate,\n            ss : translate,\n            m : translate,\n            mm : translate,\n            h : translate,\n            hh : translate,\n            d : translate,\n            dd : translate,\n            M : translate,\n            MM : translate,\n            y : translate,\n            yy : translate\n        },\n        dayOfMonthOrdinalParse : /\\d{1,2}\\./,\n        ordinal : '%d.',\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return cs;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var cv = moment.defineLocale('cv', {\n        months : 'кӑрлач_нарӑс_пуш_ака_май_ҫӗртме_утӑ_ҫурла_авӑн_юпа_чӳк_раштав'.split('_'),\n        monthsShort : 'кӑр_нар_пуш_ака_май_ҫӗр_утӑ_ҫур_авн_юпа_чӳк_раш'.split('_'),\n        weekdays : 'вырсарникун_тунтикун_ытларикун_юнкун_кӗҫнерникун_эрнекун_шӑматкун'.split('_'),\n        weekdaysShort : 'выр_тун_ытл_юн_кӗҫ_эрн_шӑм'.split('_'),\n        weekdaysMin : 'вр_тн_ыт_юн_кҫ_эр_шм'.split('_'),\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD-MM-YYYY',\n            LL : 'YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ]',\n            LLL : 'YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ], HH:mm',\n            LLLL : 'dddd, YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ], HH:mm'\n        },\n        calendar : {\n            sameDay: '[Паян] LT [сехетре]',\n            nextDay: '[Ыран] LT [сехетре]',\n            lastDay: '[Ӗнер] LT [сехетре]',\n            nextWeek: '[Ҫитес] dddd LT [сехетре]',\n            lastWeek: '[Иртнӗ] dddd LT [сехетре]',\n            sameElse: 'L'\n        },\n        relativeTime : {\n            future : function (output) {\n                var affix = /сехет$/i.exec(output) ? 'рен' : /ҫул$/i.exec(output) ? 'тан' : 'ран';\n                return output + affix;\n            },\n            past : '%s каялла',\n            s : 'пӗр-ик ҫеккунт',\n            ss : '%d ҫеккунт',\n            m : 'пӗр минут',\n            mm : '%d минут',\n            h : 'пӗр сехет',\n            hh : '%d сехет',\n            d : 'пӗр кун',\n            dd : '%d кун',\n            M : 'пӗр уйӑх',\n            MM : '%d уйӑх',\n            y : 'пӗр ҫул',\n            yy : '%d ҫул'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}-мӗш/,\n        ordinal : '%d-мӗш',\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 7  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return cv;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var cy = moment.defineLocale('cy', {\n        months: 'Ionawr_Chwefror_Mawrth_Ebrill_Mai_Mehefin_Gorffennaf_Awst_Medi_Hydref_Tachwedd_Rhagfyr'.split('_'),\n        monthsShort: 'Ion_Chwe_Maw_Ebr_Mai_Meh_Gor_Aws_Med_Hyd_Tach_Rhag'.split('_'),\n        weekdays: 'Dydd Sul_Dydd Llun_Dydd Mawrth_Dydd Mercher_Dydd Iau_Dydd Gwener_Dydd Sadwrn'.split('_'),\n        weekdaysShort: 'Sul_Llun_Maw_Mer_Iau_Gwe_Sad'.split('_'),\n        weekdaysMin: 'Su_Ll_Ma_Me_Ia_Gw_Sa'.split('_'),\n        weekdaysParseExact : true,\n        // time formats are the same as en-gb\n        longDateFormat: {\n            LT: 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L: 'DD/MM/YYYY',\n            LL: 'D MMMM YYYY',\n            LLL: 'D MMMM YYYY HH:mm',\n            LLLL: 'dddd, D MMMM YYYY HH:mm'\n        },\n        calendar: {\n            sameDay: '[Heddiw am] LT',\n            nextDay: '[Yfory am] LT',\n            nextWeek: 'dddd [am] LT',\n            lastDay: '[Ddoe am] LT',\n            lastWeek: 'dddd [diwethaf am] LT',\n            sameElse: 'L'\n        },\n        relativeTime: {\n            future: 'mewn %s',\n            past: '%s yn ôl',\n            s: 'ychydig eiliadau',\n            ss: '%d eiliad',\n            m: 'munud',\n            mm: '%d munud',\n            h: 'awr',\n            hh: '%d awr',\n            d: 'diwrnod',\n            dd: '%d diwrnod',\n            M: 'mis',\n            MM: '%d mis',\n            y: 'blwyddyn',\n            yy: '%d flynedd'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}(fed|ain|af|il|ydd|ed|eg)/,\n        // traditional ordinal numbers above 31 are not commonly used in colloquial Welsh\n        ordinal: function (number) {\n            var b = number,\n                output = '',\n                lookup = [\n                    '', 'af', 'il', 'ydd', 'ydd', 'ed', 'ed', 'ed', 'fed', 'fed', 'fed', // 1af to 10fed\n                    'eg', 'fed', 'eg', 'eg', 'fed', 'eg', 'eg', 'fed', 'eg', 'fed' // 11eg to 20fed\n                ];\n            if (b > 20) {\n                if (b === 40 || b === 50 || b === 60 || b === 80 || b === 100) {\n                    output = 'fed'; // not 30ain, 70ain or 90ain\n                } else {\n                    output = 'ain';\n                }\n            } else if (b > 0) {\n                output = lookup[b];\n            }\n            return number + output;\n        },\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return cy;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var da = moment.defineLocale('da', {\n        months : 'januar_februar_marts_april_maj_juni_juli_august_september_oktober_november_december'.split('_'),\n        monthsShort : 'jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec'.split('_'),\n        weekdays : 'søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag'.split('_'),\n        weekdaysShort : 'søn_man_tir_ons_tor_fre_lør'.split('_'),\n        weekdaysMin : 'sø_ma_ti_on_to_fr_lø'.split('_'),\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD.MM.YYYY',\n            LL : 'D. MMMM YYYY',\n            LLL : 'D. MMMM YYYY HH:mm',\n            LLLL : 'dddd [d.] D. MMMM YYYY [kl.] HH:mm'\n        },\n        calendar : {\n            sameDay : '[i dag kl.] LT',\n            nextDay : '[i morgen kl.] LT',\n            nextWeek : 'på dddd [kl.] LT',\n            lastDay : '[i går kl.] LT',\n            lastWeek : '[i] dddd[s kl.] LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'om %s',\n            past : '%s siden',\n            s : 'få sekunder',\n            ss : '%d sekunder',\n            m : 'et minut',\n            mm : '%d minutter',\n            h : 'en time',\n            hh : '%d timer',\n            d : 'en dag',\n            dd : '%d dage',\n            M : 'en måned',\n            MM : '%d måneder',\n            y : 'et år',\n            yy : '%d år'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}\\./,\n        ordinal : '%d.',\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return da;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    function processRelativeTime(number, withoutSuffix, key, isFuture) {\n        var format = {\n            'm': ['eine Minute', 'einer Minute'],\n            'h': ['eine Stunde', 'einer Stunde'],\n            'd': ['ein Tag', 'einem Tag'],\n            'dd': [number + ' Tage', number + ' Tagen'],\n            'M': ['ein Monat', 'einem Monat'],\n            'MM': [number + ' Monate', number + ' Monaten'],\n            'y': ['ein Jahr', 'einem Jahr'],\n            'yy': [number + ' Jahre', number + ' Jahren']\n        };\n        return withoutSuffix ? format[key][0] : format[key][1];\n    }\n\n    var deAt = moment.defineLocale('de-at', {\n        months : 'Jänner_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),\n        monthsShort : 'Jän._Feb._März_Apr._Mai_Juni_Juli_Aug._Sep._Okt._Nov._Dez.'.split('_'),\n        monthsParseExact : true,\n        weekdays : 'Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag'.split('_'),\n        weekdaysShort : 'So._Mo._Di._Mi._Do._Fr._Sa.'.split('_'),\n        weekdaysMin : 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat : {\n            LT: 'HH:mm',\n            LTS: 'HH:mm:ss',\n            L : 'DD.MM.YYYY',\n            LL : 'D. MMMM YYYY',\n            LLL : 'D. MMMM YYYY HH:mm',\n            LLLL : 'dddd, D. MMMM YYYY HH:mm'\n        },\n        calendar : {\n            sameDay: '[heute um] LT [Uhr]',\n            sameElse: 'L',\n            nextDay: '[morgen um] LT [Uhr]',\n            nextWeek: 'dddd [um] LT [Uhr]',\n            lastDay: '[gestern um] LT [Uhr]',\n            lastWeek: '[letzten] dddd [um] LT [Uhr]'\n        },\n        relativeTime : {\n            future : 'in %s',\n            past : 'vor %s',\n            s : 'ein paar Sekunden',\n            ss : '%d Sekunden',\n            m : processRelativeTime,\n            mm : '%d Minuten',\n            h : processRelativeTime,\n            hh : '%d Stunden',\n            d : processRelativeTime,\n            dd : processRelativeTime,\n            M : processRelativeTime,\n            MM : processRelativeTime,\n            y : processRelativeTime,\n            yy : processRelativeTime\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}\\./,\n        ordinal : '%d.',\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return deAt;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    function processRelativeTime(number, withoutSuffix, key, isFuture) {\n        var format = {\n            'm': ['eine Minute', 'einer Minute'],\n            'h': ['eine Stunde', 'einer Stunde'],\n            'd': ['ein Tag', 'einem Tag'],\n            'dd': [number + ' Tage', number + ' Tagen'],\n            'M': ['ein Monat', 'einem Monat'],\n            'MM': [number + ' Monate', number + ' Monaten'],\n            'y': ['ein Jahr', 'einem Jahr'],\n            'yy': [number + ' Jahre', number + ' Jahren']\n        };\n        return withoutSuffix ? format[key][0] : format[key][1];\n    }\n\n    var deCh = moment.defineLocale('de-ch', {\n        months : 'Januar_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),\n        monthsShort : 'Jan._Feb._März_Apr._Mai_Juni_Juli_Aug._Sep._Okt._Nov._Dez.'.split('_'),\n        monthsParseExact : true,\n        weekdays : 'Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag'.split('_'),\n        weekdaysShort : 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'),\n        weekdaysMin : 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat : {\n            LT: 'HH:mm',\n            LTS: 'HH:mm:ss',\n            L : 'DD.MM.YYYY',\n            LL : 'D. MMMM YYYY',\n            LLL : 'D. MMMM YYYY HH:mm',\n            LLLL : 'dddd, D. MMMM YYYY HH:mm'\n        },\n        calendar : {\n            sameDay: '[heute um] LT [Uhr]',\n            sameElse: 'L',\n            nextDay: '[morgen um] LT [Uhr]',\n            nextWeek: 'dddd [um] LT [Uhr]',\n            lastDay: '[gestern um] LT [Uhr]',\n            lastWeek: '[letzten] dddd [um] LT [Uhr]'\n        },\n        relativeTime : {\n            future : 'in %s',\n            past : 'vor %s',\n            s : 'ein paar Sekunden',\n            ss : '%d Sekunden',\n            m : processRelativeTime,\n            mm : '%d Minuten',\n            h : processRelativeTime,\n            hh : '%d Stunden',\n            d : processRelativeTime,\n            dd : processRelativeTime,\n            M : processRelativeTime,\n            MM : processRelativeTime,\n            y : processRelativeTime,\n            yy : processRelativeTime\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}\\./,\n        ordinal : '%d.',\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return deCh;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    function processRelativeTime(number, withoutSuffix, key, isFuture) {\n        var format = {\n            'm': ['eine Minute', 'einer Minute'],\n            'h': ['eine Stunde', 'einer Stunde'],\n            'd': ['ein Tag', 'einem Tag'],\n            'dd': [number + ' Tage', number + ' Tagen'],\n            'M': ['ein Monat', 'einem Monat'],\n            'MM': [number + ' Monate', number + ' Monaten'],\n            'y': ['ein Jahr', 'einem Jahr'],\n            'yy': [number + ' Jahre', number + ' Jahren']\n        };\n        return withoutSuffix ? format[key][0] : format[key][1];\n    }\n\n    var de = moment.defineLocale('de', {\n        months : 'Januar_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),\n        monthsShort : 'Jan._Feb._März_Apr._Mai_Juni_Juli_Aug._Sep._Okt._Nov._Dez.'.split('_'),\n        monthsParseExact : true,\n        weekdays : 'Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag'.split('_'),\n        weekdaysShort : 'So._Mo._Di._Mi._Do._Fr._Sa.'.split('_'),\n        weekdaysMin : 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat : {\n            LT: 'HH:mm',\n            LTS: 'HH:mm:ss',\n            L : 'DD.MM.YYYY',\n            LL : 'D. MMMM YYYY',\n            LLL : 'D. MMMM YYYY HH:mm',\n            LLLL : 'dddd, D. MMMM YYYY HH:mm'\n        },\n        calendar : {\n            sameDay: '[heute um] LT [Uhr]',\n            sameElse: 'L',\n            nextDay: '[morgen um] LT [Uhr]',\n            nextWeek: 'dddd [um] LT [Uhr]',\n            lastDay: '[gestern um] LT [Uhr]',\n            lastWeek: '[letzten] dddd [um] LT [Uhr]'\n        },\n        relativeTime : {\n            future : 'in %s',\n            past : 'vor %s',\n            s : 'ein paar Sekunden',\n            ss : '%d Sekunden',\n            m : processRelativeTime,\n            mm : '%d Minuten',\n            h : processRelativeTime,\n            hh : '%d Stunden',\n            d : processRelativeTime,\n            dd : processRelativeTime,\n            M : processRelativeTime,\n            MM : processRelativeTime,\n            y : processRelativeTime,\n            yy : processRelativeTime\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}\\./,\n        ordinal : '%d.',\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return de;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var months = [\n        'ޖެނުއަރީ',\n        'ފެބްރުއަރީ',\n        'މާރިޗު',\n        'އޭޕްރީލު',\n        'މޭ',\n        'ޖޫން',\n        'ޖުލައި',\n        'އޯގަސްޓު',\n        'ސެޕްޓެމްބަރު',\n        'އޮކްޓޯބަރު',\n        'ނޮވެމްބަރު',\n        'ޑިސެމްބަރު'\n    ], weekdays = [\n        'އާދިއްތަ',\n        'ހޯމަ',\n        'އަންގާރަ',\n        'ބުދަ',\n        'ބުރާސްފަތި',\n        'ހުކުރު',\n        'ހޮނިހިރު'\n    ];\n\n    var dv = moment.defineLocale('dv', {\n        months : months,\n        monthsShort : months,\n        weekdays : weekdays,\n        weekdaysShort : weekdays,\n        weekdaysMin : 'އާދި_ހޯމަ_އަން_ބުދަ_ބުރާ_ހުކު_ހޮނި'.split('_'),\n        longDateFormat : {\n\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'D/M/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY HH:mm',\n            LLLL : 'dddd D MMMM YYYY HH:mm'\n        },\n        meridiemParse: /މކ|މފ/,\n        isPM : function (input) {\n            return 'މފ' === input;\n        },\n        meridiem : function (hour, minute, isLower) {\n            if (hour < 12) {\n                return 'މކ';\n            } else {\n                return 'މފ';\n            }\n        },\n        calendar : {\n            sameDay : '[މިއަދު] LT',\n            nextDay : '[މާދަމާ] LT',\n            nextWeek : 'dddd LT',\n            lastDay : '[އިއްޔެ] LT',\n            lastWeek : '[ފާއިތުވި] dddd LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'ތެރޭގައި %s',\n            past : 'ކުރިން %s',\n            s : 'ސިކުންތުކޮޅެއް',\n            ss : 'd% ސިކުންތު',\n            m : 'މިނިޓެއް',\n            mm : 'މިނިޓު %d',\n            h : 'ގަޑިއިރެއް',\n            hh : 'ގަޑިއިރު %d',\n            d : 'ދުވަހެއް',\n            dd : 'ދުވަސް %d',\n            M : 'މަހެއް',\n            MM : 'މަސް %d',\n            y : 'އަހަރެއް',\n            yy : 'އަހަރު %d'\n        },\n        preparse: function (string) {\n            return string.replace(/،/g, ',');\n        },\n        postformat: function (string) {\n            return string.replace(/,/g, '،');\n        },\n        week : {\n            dow : 7,  // Sunday is the first day of the week.\n            doy : 12  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return dv;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n    function isFunction(input) {\n        return input instanceof Function || Object.prototype.toString.call(input) === '[object Function]';\n    }\n\n\n    var el = moment.defineLocale('el', {\n        monthsNominativeEl : 'Ιανουάριος_Φεβρουάριος_Μάρτιος_Απρίλιος_Μάιος_Ιούνιος_Ιούλιος_Αύγουστος_Σεπτέμβριος_Οκτώβριος_Νοέμβριος_Δεκέμβριος'.split('_'),\n        monthsGenitiveEl : 'Ιανουαρίου_Φεβρουαρίου_Μαρτίου_Απριλίου_Μαΐου_Ιουνίου_Ιουλίου_Αυγούστου_Σεπτεμβρίου_Οκτωβρίου_Νοεμβρίου_Δεκεμβρίου'.split('_'),\n        months : function (momentToFormat, format) {\n            if (!momentToFormat) {\n                return this._monthsNominativeEl;\n            } else if (typeof format === 'string' && /D/.test(format.substring(0, format.indexOf('MMMM')))) { // if there is a day number before 'MMMM'\n                return this._monthsGenitiveEl[momentToFormat.month()];\n            } else {\n                return this._monthsNominativeEl[momentToFormat.month()];\n            }\n        },\n        monthsShort : 'Ιαν_Φεβ_Μαρ_Απρ_Μαϊ_Ιουν_Ιουλ_Αυγ_Σεπ_Οκτ_Νοε_Δεκ'.split('_'),\n        weekdays : 'Κυριακή_Δευτέρα_Τρίτη_Τετάρτη_Πέμπτη_Παρασκευή_Σάββατο'.split('_'),\n        weekdaysShort : 'Κυρ_Δευ_Τρι_Τετ_Πεμ_Παρ_Σαβ'.split('_'),\n        weekdaysMin : 'Κυ_Δε_Τρ_Τε_Πε_Πα_Σα'.split('_'),\n        meridiem : function (hours, minutes, isLower) {\n            if (hours > 11) {\n                return isLower ? 'μμ' : 'ΜΜ';\n            } else {\n                return isLower ? 'πμ' : 'ΠΜ';\n            }\n        },\n        isPM : function (input) {\n            return ((input + '').toLowerCase()[0] === 'μ');\n        },\n        meridiemParse : /[ΠΜ]\\.?Μ?\\.?/i,\n        longDateFormat : {\n            LT : 'h:mm A',\n            LTS : 'h:mm:ss A',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY h:mm A',\n            LLLL : 'dddd, D MMMM YYYY h:mm A'\n        },\n        calendarEl : {\n            sameDay : '[Σήμερα {}] LT',\n            nextDay : '[Αύριο {}] LT',\n            nextWeek : 'dddd [{}] LT',\n            lastDay : '[Χθες {}] LT',\n            lastWeek : function () {\n                switch (this.day()) {\n                    case 6:\n                        return '[το προηγούμενο] dddd [{}] LT';\n                    default:\n                        return '[την προηγούμενη] dddd [{}] LT';\n                }\n            },\n            sameElse : 'L'\n        },\n        calendar : function (key, mom) {\n            var output = this._calendarEl[key],\n                hours = mom && mom.hours();\n            if (isFunction(output)) {\n                output = output.apply(mom);\n            }\n            return output.replace('{}', (hours % 12 === 1 ? 'στη' : 'στις'));\n        },\n        relativeTime : {\n            future : 'σε %s',\n            past : '%s πριν',\n            s : 'λίγα δευτερόλεπτα',\n            ss : '%d δευτερόλεπτα',\n            m : 'ένα λεπτό',\n            mm : '%d λεπτά',\n            h : 'μία ώρα',\n            hh : '%d ώρες',\n            d : 'μία μέρα',\n            dd : '%d μέρες',\n            M : 'ένας μήνας',\n            MM : '%d μήνες',\n            y : 'ένας χρόνος',\n            yy : '%d χρόνια'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}η/,\n        ordinal: '%dη',\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4st is the first week of the year.\n        }\n    });\n\n    return el;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var enAu = moment.defineLocale('en-au', {\n        months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),\n        monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),\n        weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),\n        weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),\n        weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),\n        longDateFormat : {\n            LT : 'h:mm A',\n            LTS : 'h:mm:ss A',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY h:mm A',\n            LLLL : 'dddd, D MMMM YYYY h:mm A'\n        },\n        calendar : {\n            sameDay : '[Today at] LT',\n            nextDay : '[Tomorrow at] LT',\n            nextWeek : 'dddd [at] LT',\n            lastDay : '[Yesterday at] LT',\n            lastWeek : '[Last] dddd [at] LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'in %s',\n            past : '%s ago',\n            s : 'a few seconds',\n            ss : '%d seconds',\n            m : 'a minute',\n            mm : '%d minutes',\n            h : 'an hour',\n            hh : '%d hours',\n            d : 'a day',\n            dd : '%d days',\n            M : 'a month',\n            MM : '%d months',\n            y : 'a year',\n            yy : '%d years'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}(st|nd|rd|th)/,\n        ordinal : function (number) {\n            var b = number % 10,\n                output = (~~(number % 100 / 10) === 1) ? 'th' :\n                (b === 1) ? 'st' :\n                (b === 2) ? 'nd' :\n                (b === 3) ? 'rd' : 'th';\n            return number + output;\n        },\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return enAu;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var enCa = moment.defineLocale('en-ca', {\n        months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),\n        monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),\n        weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),\n        weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),\n        weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),\n        longDateFormat : {\n            LT : 'h:mm A',\n            LTS : 'h:mm:ss A',\n            L : 'YYYY-MM-DD',\n            LL : 'MMMM D, YYYY',\n            LLL : 'MMMM D, YYYY h:mm A',\n            LLLL : 'dddd, MMMM D, YYYY h:mm A'\n        },\n        calendar : {\n            sameDay : '[Today at] LT',\n            nextDay : '[Tomorrow at] LT',\n            nextWeek : 'dddd [at] LT',\n            lastDay : '[Yesterday at] LT',\n            lastWeek : '[Last] dddd [at] LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'in %s',\n            past : '%s ago',\n            s : 'a few seconds',\n            ss : '%d seconds',\n            m : 'a minute',\n            mm : '%d minutes',\n            h : 'an hour',\n            hh : '%d hours',\n            d : 'a day',\n            dd : '%d days',\n            M : 'a month',\n            MM : '%d months',\n            y : 'a year',\n            yy : '%d years'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}(st|nd|rd|th)/,\n        ordinal : function (number) {\n            var b = number % 10,\n                output = (~~(number % 100 / 10) === 1) ? 'th' :\n                (b === 1) ? 'st' :\n                (b === 2) ? 'nd' :\n                (b === 3) ? 'rd' : 'th';\n            return number + output;\n        }\n    });\n\n    return enCa;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var enGb = moment.defineLocale('en-gb', {\n        months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),\n        monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),\n        weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),\n        weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),\n        weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY HH:mm',\n            LLLL : 'dddd, D MMMM YYYY HH:mm'\n        },\n        calendar : {\n            sameDay : '[Today at] LT',\n            nextDay : '[Tomorrow at] LT',\n            nextWeek : 'dddd [at] LT',\n            lastDay : '[Yesterday at] LT',\n            lastWeek : '[Last] dddd [at] LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'in %s',\n            past : '%s ago',\n            s : 'a few seconds',\n            ss : '%d seconds',\n            m : 'a minute',\n            mm : '%d minutes',\n            h : 'an hour',\n            hh : '%d hours',\n            d : 'a day',\n            dd : '%d days',\n            M : 'a month',\n            MM : '%d months',\n            y : 'a year',\n            yy : '%d years'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}(st|nd|rd|th)/,\n        ordinal : function (number) {\n            var b = number % 10,\n                output = (~~(number % 100 / 10) === 1) ? 'th' :\n                (b === 1) ? 'st' :\n                (b === 2) ? 'nd' :\n                (b === 3) ? 'rd' : 'th';\n            return number + output;\n        },\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return enGb;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var enIe = moment.defineLocale('en-ie', {\n        months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),\n        monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),\n        weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),\n        weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),\n        weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD-MM-YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY HH:mm',\n            LLLL : 'dddd D MMMM YYYY HH:mm'\n        },\n        calendar : {\n            sameDay : '[Today at] LT',\n            nextDay : '[Tomorrow at] LT',\n            nextWeek : 'dddd [at] LT',\n            lastDay : '[Yesterday at] LT',\n            lastWeek : '[Last] dddd [at] LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'in %s',\n            past : '%s ago',\n            s : 'a few seconds',\n            ss : '%d seconds',\n            m : 'a minute',\n            mm : '%d minutes',\n            h : 'an hour',\n            hh : '%d hours',\n            d : 'a day',\n            dd : '%d days',\n            M : 'a month',\n            MM : '%d months',\n            y : 'a year',\n            yy : '%d years'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}(st|nd|rd|th)/,\n        ordinal : function (number) {\n            var b = number % 10,\n                output = (~~(number % 100 / 10) === 1) ? 'th' :\n                (b === 1) ? 'st' :\n                (b === 2) ? 'nd' :\n                (b === 3) ? 'rd' : 'th';\n            return number + output;\n        },\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return enIe;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var enIl = moment.defineLocale('en-il', {\n        months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),\n        monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),\n        weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),\n        weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),\n        weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY HH:mm',\n            LLLL : 'dddd, D MMMM YYYY HH:mm'\n        },\n        calendar : {\n            sameDay : '[Today at] LT',\n            nextDay : '[Tomorrow at] LT',\n            nextWeek : 'dddd [at] LT',\n            lastDay : '[Yesterday at] LT',\n            lastWeek : '[Last] dddd [at] LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'in %s',\n            past : '%s ago',\n            s : 'a few seconds',\n            m : 'a minute',\n            mm : '%d minutes',\n            h : 'an hour',\n            hh : '%d hours',\n            d : 'a day',\n            dd : '%d days',\n            M : 'a month',\n            MM : '%d months',\n            y : 'a year',\n            yy : '%d years'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}(st|nd|rd|th)/,\n        ordinal : function (number) {\n            var b = number % 10,\n                output = (~~(number % 100 / 10) === 1) ? 'th' :\n                (b === 1) ? 'st' :\n                (b === 2) ? 'nd' :\n                (b === 3) ? 'rd' : 'th';\n            return number + output;\n        }\n    });\n\n    return enIl;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var enNz = moment.defineLocale('en-nz', {\n        months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),\n        monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),\n        weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),\n        weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),\n        weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),\n        longDateFormat : {\n            LT : 'h:mm A',\n            LTS : 'h:mm:ss A',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY h:mm A',\n            LLLL : 'dddd, D MMMM YYYY h:mm A'\n        },\n        calendar : {\n            sameDay : '[Today at] LT',\n            nextDay : '[Tomorrow at] LT',\n            nextWeek : 'dddd [at] LT',\n            lastDay : '[Yesterday at] LT',\n            lastWeek : '[Last] dddd [at] LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'in %s',\n            past : '%s ago',\n            s : 'a few seconds',\n            ss : '%d seconds',\n            m : 'a minute',\n            mm : '%d minutes',\n            h : 'an hour',\n            hh : '%d hours',\n            d : 'a day',\n            dd : '%d days',\n            M : 'a month',\n            MM : '%d months',\n            y : 'a year',\n            yy : '%d years'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}(st|nd|rd|th)/,\n        ordinal : function (number) {\n            var b = number % 10,\n                output = (~~(number % 100 / 10) === 1) ? 'th' :\n                (b === 1) ? 'st' :\n                (b === 2) ? 'nd' :\n                (b === 3) ? 'rd' : 'th';\n            return number + output;\n        },\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return enNz;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var eo = moment.defineLocale('eo', {\n        months : 'januaro_februaro_marto_aprilo_majo_junio_julio_aŭgusto_septembro_oktobro_novembro_decembro'.split('_'),\n        monthsShort : 'jan_feb_mar_apr_maj_jun_jul_aŭg_sep_okt_nov_dec'.split('_'),\n        weekdays : 'dimanĉo_lundo_mardo_merkredo_ĵaŭdo_vendredo_sabato'.split('_'),\n        weekdaysShort : 'dim_lun_mard_merk_ĵaŭ_ven_sab'.split('_'),\n        weekdaysMin : 'di_lu_ma_me_ĵa_ve_sa'.split('_'),\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'YYYY-MM-DD',\n            LL : 'D[-a de] MMMM, YYYY',\n            LLL : 'D[-a de] MMMM, YYYY HH:mm',\n            LLLL : 'dddd, [la] D[-a de] MMMM, YYYY HH:mm'\n        },\n        meridiemParse: /[ap]\\.t\\.m/i,\n        isPM: function (input) {\n            return input.charAt(0).toLowerCase() === 'p';\n        },\n        meridiem : function (hours, minutes, isLower) {\n            if (hours > 11) {\n                return isLower ? 'p.t.m.' : 'P.T.M.';\n            } else {\n                return isLower ? 'a.t.m.' : 'A.T.M.';\n            }\n        },\n        calendar : {\n            sameDay : '[Hodiaŭ je] LT',\n            nextDay : '[Morgaŭ je] LT',\n            nextWeek : 'dddd [je] LT',\n            lastDay : '[Hieraŭ je] LT',\n            lastWeek : '[pasinta] dddd [je] LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'post %s',\n            past : 'antaŭ %s',\n            s : 'sekundoj',\n            ss : '%d sekundoj',\n            m : 'minuto',\n            mm : '%d minutoj',\n            h : 'horo',\n            hh : '%d horoj',\n            d : 'tago',//ne 'diurno', ĉar estas uzita por proksimumo\n            dd : '%d tagoj',\n            M : 'monato',\n            MM : '%d monatoj',\n            y : 'jaro',\n            yy : '%d jaroj'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}a/,\n        ordinal : '%da',\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 7  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return eo;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var monthsShortDot = 'ene._feb._mar._abr._may._jun._jul._ago._sep._oct._nov._dic.'.split('_'),\n        monthsShort = 'ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic'.split('_');\n\n    var monthsParse = [/^ene/i, /^feb/i, /^mar/i, /^abr/i, /^may/i, /^jun/i, /^jul/i, /^ago/i, /^sep/i, /^oct/i, /^nov/i, /^dic/i];\n    var monthsRegex = /^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre|ene\\.?|feb\\.?|mar\\.?|abr\\.?|may\\.?|jun\\.?|jul\\.?|ago\\.?|sep\\.?|oct\\.?|nov\\.?|dic\\.?)/i;\n\n    var esDo = moment.defineLocale('es-do', {\n        months : 'enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre'.split('_'),\n        monthsShort : function (m, format) {\n            if (!m) {\n                return monthsShortDot;\n            } else if (/-MMM-/.test(format)) {\n                return monthsShort[m.month()];\n            } else {\n                return monthsShortDot[m.month()];\n            }\n        },\n        monthsRegex: monthsRegex,\n        monthsShortRegex: monthsRegex,\n        monthsStrictRegex: /^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre)/i,\n        monthsShortStrictRegex: /^(ene\\.?|feb\\.?|mar\\.?|abr\\.?|may\\.?|jun\\.?|jul\\.?|ago\\.?|sep\\.?|oct\\.?|nov\\.?|dic\\.?)/i,\n        monthsParse: monthsParse,\n        longMonthsParse: monthsParse,\n        shortMonthsParse: monthsParse,\n        weekdays : 'domingo_lunes_martes_miércoles_jueves_viernes_sábado'.split('_'),\n        weekdaysShort : 'dom._lun._mar._mié._jue._vie._sáb.'.split('_'),\n        weekdaysMin : 'do_lu_ma_mi_ju_vi_sá'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat : {\n            LT : 'h:mm A',\n            LTS : 'h:mm:ss A',\n            L : 'DD/MM/YYYY',\n            LL : 'D [de] MMMM [de] YYYY',\n            LLL : 'D [de] MMMM [de] YYYY h:mm A',\n            LLLL : 'dddd, D [de] MMMM [de] YYYY h:mm A'\n        },\n        calendar : {\n            sameDay : function () {\n                return '[hoy a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';\n            },\n            nextDay : function () {\n                return '[mañana a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';\n            },\n            nextWeek : function () {\n                return 'dddd [a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';\n            },\n            lastDay : function () {\n                return '[ayer a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';\n            },\n            lastWeek : function () {\n                return '[el] dddd [pasado a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';\n            },\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'en %s',\n            past : 'hace %s',\n            s : 'unos segundos',\n            ss : '%d segundos',\n            m : 'un minuto',\n            mm : '%d minutos',\n            h : 'una hora',\n            hh : '%d horas',\n            d : 'un día',\n            dd : '%d días',\n            M : 'un mes',\n            MM : '%d meses',\n            y : 'un año',\n            yy : '%d años'\n        },\n        dayOfMonthOrdinalParse : /\\d{1,2}º/,\n        ordinal : '%dº',\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return esDo;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var monthsShortDot = 'ene._feb._mar._abr._may._jun._jul._ago._sep._oct._nov._dic.'.split('_'),\n        monthsShort = 'ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic'.split('_');\n\n    var esUs = moment.defineLocale('es-us', {\n        months : 'enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre'.split('_'),\n        monthsShort : function (m, format) {\n            if (!m) {\n                return monthsShortDot;\n            } else if (/-MMM-/.test(format)) {\n                return monthsShort[m.month()];\n            } else {\n                return monthsShortDot[m.month()];\n            }\n        },\n        monthsParseExact : true,\n        weekdays : 'domingo_lunes_martes_miércoles_jueves_viernes_sábado'.split('_'),\n        weekdaysShort : 'dom._lun._mar._mié._jue._vie._sáb.'.split('_'),\n        weekdaysMin : 'do_lu_ma_mi_ju_vi_sá'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat : {\n            LT : 'h:mm A',\n            LTS : 'h:mm:ss A',\n            L : 'MM/DD/YYYY',\n            LL : 'MMMM [de] D [de] YYYY',\n            LLL : 'MMMM [de] D [de] YYYY h:mm A',\n            LLLL : 'dddd, MMMM [de] D [de] YYYY h:mm A'\n        },\n        calendar : {\n            sameDay : function () {\n                return '[hoy a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';\n            },\n            nextDay : function () {\n                return '[mañana a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';\n            },\n            nextWeek : function () {\n                return 'dddd [a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';\n            },\n            lastDay : function () {\n                return '[ayer a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';\n            },\n            lastWeek : function () {\n                return '[el] dddd [pasado a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';\n            },\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'en %s',\n            past : 'hace %s',\n            s : 'unos segundos',\n            ss : '%d segundos',\n            m : 'un minuto',\n            mm : '%d minutos',\n            h : 'una hora',\n            hh : '%d horas',\n            d : 'un día',\n            dd : '%d días',\n            M : 'un mes',\n            MM : '%d meses',\n            y : 'un año',\n            yy : '%d años'\n        },\n        dayOfMonthOrdinalParse : /\\d{1,2}º/,\n        ordinal : '%dº',\n        week : {\n            dow : 0, // Sunday is the first day of the week.\n            doy : 6  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return esUs;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var monthsShortDot = 'ene._feb._mar._abr._may._jun._jul._ago._sep._oct._nov._dic.'.split('_'),\n        monthsShort = 'ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic'.split('_');\n\n    var monthsParse = [/^ene/i, /^feb/i, /^mar/i, /^abr/i, /^may/i, /^jun/i, /^jul/i, /^ago/i, /^sep/i, /^oct/i, /^nov/i, /^dic/i];\n    var monthsRegex = /^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre|ene\\.?|feb\\.?|mar\\.?|abr\\.?|may\\.?|jun\\.?|jul\\.?|ago\\.?|sep\\.?|oct\\.?|nov\\.?|dic\\.?)/i;\n\n    var es = moment.defineLocale('es', {\n        months : 'enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre'.split('_'),\n        monthsShort : function (m, format) {\n            if (!m) {\n                return monthsShortDot;\n            } else if (/-MMM-/.test(format)) {\n                return monthsShort[m.month()];\n            } else {\n                return monthsShortDot[m.month()];\n            }\n        },\n        monthsRegex : monthsRegex,\n        monthsShortRegex : monthsRegex,\n        monthsStrictRegex : /^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre)/i,\n        monthsShortStrictRegex : /^(ene\\.?|feb\\.?|mar\\.?|abr\\.?|may\\.?|jun\\.?|jul\\.?|ago\\.?|sep\\.?|oct\\.?|nov\\.?|dic\\.?)/i,\n        monthsParse : monthsParse,\n        longMonthsParse : monthsParse,\n        shortMonthsParse : monthsParse,\n        weekdays : 'domingo_lunes_martes_miércoles_jueves_viernes_sábado'.split('_'),\n        weekdaysShort : 'dom._lun._mar._mié._jue._vie._sáb.'.split('_'),\n        weekdaysMin : 'do_lu_ma_mi_ju_vi_sá'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat : {\n            LT : 'H:mm',\n            LTS : 'H:mm:ss',\n            L : 'DD/MM/YYYY',\n            LL : 'D [de] MMMM [de] YYYY',\n            LLL : 'D [de] MMMM [de] YYYY H:mm',\n            LLLL : 'dddd, D [de] MMMM [de] YYYY H:mm'\n        },\n        calendar : {\n            sameDay : function () {\n                return '[hoy a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';\n            },\n            nextDay : function () {\n                return '[mañana a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';\n            },\n            nextWeek : function () {\n                return 'dddd [a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';\n            },\n            lastDay : function () {\n                return '[ayer a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';\n            },\n            lastWeek : function () {\n                return '[el] dddd [pasado a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';\n            },\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'en %s',\n            past : 'hace %s',\n            s : 'unos segundos',\n            ss : '%d segundos',\n            m : 'un minuto',\n            mm : '%d minutos',\n            h : 'una hora',\n            hh : '%d horas',\n            d : 'un día',\n            dd : '%d días',\n            M : 'un mes',\n            MM : '%d meses',\n            y : 'un año',\n            yy : '%d años'\n        },\n        dayOfMonthOrdinalParse : /\\d{1,2}º/,\n        ordinal : '%dº',\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return es;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    function processRelativeTime(number, withoutSuffix, key, isFuture) {\n        var format = {\n            's' : ['mõne sekundi', 'mõni sekund', 'paar sekundit'],\n            'ss': [number + 'sekundi', number + 'sekundit'],\n            'm' : ['ühe minuti', 'üks minut'],\n            'mm': [number + ' minuti', number + ' minutit'],\n            'h' : ['ühe tunni', 'tund aega', 'üks tund'],\n            'hh': [number + ' tunni', number + ' tundi'],\n            'd' : ['ühe päeva', 'üks päev'],\n            'M' : ['kuu aja', 'kuu aega', 'üks kuu'],\n            'MM': [number + ' kuu', number + ' kuud'],\n            'y' : ['ühe aasta', 'aasta', 'üks aasta'],\n            'yy': [number + ' aasta', number + ' aastat']\n        };\n        if (withoutSuffix) {\n            return format[key][2] ? format[key][2] : format[key][1];\n        }\n        return isFuture ? format[key][0] : format[key][1];\n    }\n\n    var et = moment.defineLocale('et', {\n        months        : 'jaanuar_veebruar_märts_aprill_mai_juuni_juuli_august_september_oktoober_november_detsember'.split('_'),\n        monthsShort   : 'jaan_veebr_märts_apr_mai_juuni_juuli_aug_sept_okt_nov_dets'.split('_'),\n        weekdays      : 'pühapäev_esmaspäev_teisipäev_kolmapäev_neljapäev_reede_laupäev'.split('_'),\n        weekdaysShort : 'P_E_T_K_N_R_L'.split('_'),\n        weekdaysMin   : 'P_E_T_K_N_R_L'.split('_'),\n        longDateFormat : {\n            LT   : 'H:mm',\n            LTS : 'H:mm:ss',\n            L    : 'DD.MM.YYYY',\n            LL   : 'D. MMMM YYYY',\n            LLL  : 'D. MMMM YYYY H:mm',\n            LLLL : 'dddd, D. MMMM YYYY H:mm'\n        },\n        calendar : {\n            sameDay  : '[Täna,] LT',\n            nextDay  : '[Homme,] LT',\n            nextWeek : '[Järgmine] dddd LT',\n            lastDay  : '[Eile,] LT',\n            lastWeek : '[Eelmine] dddd LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : '%s pärast',\n            past   : '%s tagasi',\n            s      : processRelativeTime,\n            ss     : processRelativeTime,\n            m      : processRelativeTime,\n            mm     : processRelativeTime,\n            h      : processRelativeTime,\n            hh     : processRelativeTime,\n            d      : processRelativeTime,\n            dd     : '%d päeva',\n            M      : processRelativeTime,\n            MM     : processRelativeTime,\n            y      : processRelativeTime,\n            yy     : processRelativeTime\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}\\./,\n        ordinal : '%d.',\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return et;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var eu = moment.defineLocale('eu', {\n        months : 'urtarrila_otsaila_martxoa_apirila_maiatza_ekaina_uztaila_abuztua_iraila_urria_azaroa_abendua'.split('_'),\n        monthsShort : 'urt._ots._mar._api._mai._eka._uzt._abu._ira._urr._aza._abe.'.split('_'),\n        monthsParseExact : true,\n        weekdays : 'igandea_astelehena_asteartea_asteazkena_osteguna_ostirala_larunbata'.split('_'),\n        weekdaysShort : 'ig._al._ar._az._og._ol._lr.'.split('_'),\n        weekdaysMin : 'ig_al_ar_az_og_ol_lr'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'YYYY-MM-DD',\n            LL : 'YYYY[ko] MMMM[ren] D[a]',\n            LLL : 'YYYY[ko] MMMM[ren] D[a] HH:mm',\n            LLLL : 'dddd, YYYY[ko] MMMM[ren] D[a] HH:mm',\n            l : 'YYYY-M-D',\n            ll : 'YYYY[ko] MMM D[a]',\n            lll : 'YYYY[ko] MMM D[a] HH:mm',\n            llll : 'ddd, YYYY[ko] MMM D[a] HH:mm'\n        },\n        calendar : {\n            sameDay : '[gaur] LT[etan]',\n            nextDay : '[bihar] LT[etan]',\n            nextWeek : 'dddd LT[etan]',\n            lastDay : '[atzo] LT[etan]',\n            lastWeek : '[aurreko] dddd LT[etan]',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : '%s barru',\n            past : 'duela %s',\n            s : 'segundo batzuk',\n            ss : '%d segundo',\n            m : 'minutu bat',\n            mm : '%d minutu',\n            h : 'ordu bat',\n            hh : '%d ordu',\n            d : 'egun bat',\n            dd : '%d egun',\n            M : 'hilabete bat',\n            MM : '%d hilabete',\n            y : 'urte bat',\n            yy : '%d urte'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}\\./,\n        ordinal : '%d.',\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 7  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return eu;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var symbolMap = {\n        '1': '۱',\n        '2': '۲',\n        '3': '۳',\n        '4': '۴',\n        '5': '۵',\n        '6': '۶',\n        '7': '۷',\n        '8': '۸',\n        '9': '۹',\n        '0': '۰'\n    }, numberMap = {\n        '۱': '1',\n        '۲': '2',\n        '۳': '3',\n        '۴': '4',\n        '۵': '5',\n        '۶': '6',\n        '۷': '7',\n        '۸': '8',\n        '۹': '9',\n        '۰': '0'\n    };\n\n    var fa = moment.defineLocale('fa', {\n        months : 'ژانویه_فوریه_مارس_آوریل_مه_ژوئن_ژوئیه_اوت_سپتامبر_اکتبر_نوامبر_دسامبر'.split('_'),\n        monthsShort : 'ژانویه_فوریه_مارس_آوریل_مه_ژوئن_ژوئیه_اوت_سپتامبر_اکتبر_نوامبر_دسامبر'.split('_'),\n        weekdays : 'یک\\u200cشنبه_دوشنبه_سه\\u200cشنبه_چهارشنبه_پنج\\u200cشنبه_جمعه_شنبه'.split('_'),\n        weekdaysShort : 'یک\\u200cشنبه_دوشنبه_سه\\u200cشنبه_چهارشنبه_پنج\\u200cشنبه_جمعه_شنبه'.split('_'),\n        weekdaysMin : 'ی_د_س_چ_پ_ج_ش'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY HH:mm',\n            LLLL : 'dddd, D MMMM YYYY HH:mm'\n        },\n        meridiemParse: /قبل از ظهر|بعد از ظهر/,\n        isPM: function (input) {\n            return /بعد از ظهر/.test(input);\n        },\n        meridiem : function (hour, minute, isLower) {\n            if (hour < 12) {\n                return 'قبل از ظهر';\n            } else {\n                return 'بعد از ظهر';\n            }\n        },\n        calendar : {\n            sameDay : '[امروز ساعت] LT',\n            nextDay : '[فردا ساعت] LT',\n            nextWeek : 'dddd [ساعت] LT',\n            lastDay : '[دیروز ساعت] LT',\n            lastWeek : 'dddd [پیش] [ساعت] LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'در %s',\n            past : '%s پیش',\n            s : 'چند ثانیه',\n            ss : 'ثانیه d%',\n            m : 'یک دقیقه',\n            mm : '%d دقیقه',\n            h : 'یک ساعت',\n            hh : '%d ساعت',\n            d : 'یک روز',\n            dd : '%d روز',\n            M : 'یک ماه',\n            MM : '%d ماه',\n            y : 'یک سال',\n            yy : '%d سال'\n        },\n        preparse: function (string) {\n            return string.replace(/[۰-۹]/g, function (match) {\n                return numberMap[match];\n            }).replace(/،/g, ',');\n        },\n        postformat: function (string) {\n            return string.replace(/\\d/g, function (match) {\n                return symbolMap[match];\n            }).replace(/,/g, '،');\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}م/,\n        ordinal : '%dم',\n        week : {\n            dow : 6, // Saturday is the first day of the week.\n            doy : 12 // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return fa;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var numbersPast = 'nolla yksi kaksi kolme neljä viisi kuusi seitsemän kahdeksan yhdeksän'.split(' '),\n        numbersFuture = [\n            'nolla', 'yhden', 'kahden', 'kolmen', 'neljän', 'viiden', 'kuuden',\n            numbersPast[7], numbersPast[8], numbersPast[9]\n        ];\n    function translate(number, withoutSuffix, key, isFuture) {\n        var result = '';\n        switch (key) {\n            case 's':\n                return isFuture ? 'muutaman sekunnin' : 'muutama sekunti';\n            case 'ss':\n                return isFuture ? 'sekunnin' : 'sekuntia';\n            case 'm':\n                return isFuture ? 'minuutin' : 'minuutti';\n            case 'mm':\n                result = isFuture ? 'minuutin' : 'minuuttia';\n                break;\n            case 'h':\n                return isFuture ? 'tunnin' : 'tunti';\n            case 'hh':\n                result = isFuture ? 'tunnin' : 'tuntia';\n                break;\n            case 'd':\n                return isFuture ? 'päivän' : 'päivä';\n            case 'dd':\n                result = isFuture ? 'päivän' : 'päivää';\n                break;\n            case 'M':\n                return isFuture ? 'kuukauden' : 'kuukausi';\n            case 'MM':\n                result = isFuture ? 'kuukauden' : 'kuukautta';\n                break;\n            case 'y':\n                return isFuture ? 'vuoden' : 'vuosi';\n            case 'yy':\n                result = isFuture ? 'vuoden' : 'vuotta';\n                break;\n        }\n        result = verbalNumber(number, isFuture) + ' ' + result;\n        return result;\n    }\n    function verbalNumber(number, isFuture) {\n        return number < 10 ? (isFuture ? numbersFuture[number] : numbersPast[number]) : number;\n    }\n\n    var fi = moment.defineLocale('fi', {\n        months : 'tammikuu_helmikuu_maaliskuu_huhtikuu_toukokuu_kesäkuu_heinäkuu_elokuu_syyskuu_lokakuu_marraskuu_joulukuu'.split('_'),\n        monthsShort : 'tammi_helmi_maalis_huhti_touko_kesä_heinä_elo_syys_loka_marras_joulu'.split('_'),\n        weekdays : 'sunnuntai_maanantai_tiistai_keskiviikko_torstai_perjantai_lauantai'.split('_'),\n        weekdaysShort : 'su_ma_ti_ke_to_pe_la'.split('_'),\n        weekdaysMin : 'su_ma_ti_ke_to_pe_la'.split('_'),\n        longDateFormat : {\n            LT : 'HH.mm',\n            LTS : 'HH.mm.ss',\n            L : 'DD.MM.YYYY',\n            LL : 'Do MMMM[ta] YYYY',\n            LLL : 'Do MMMM[ta] YYYY, [klo] HH.mm',\n            LLLL : 'dddd, Do MMMM[ta] YYYY, [klo] HH.mm',\n            l : 'D.M.YYYY',\n            ll : 'Do MMM YYYY',\n            lll : 'Do MMM YYYY, [klo] HH.mm',\n            llll : 'ddd, Do MMM YYYY, [klo] HH.mm'\n        },\n        calendar : {\n            sameDay : '[tänään] [klo] LT',\n            nextDay : '[huomenna] [klo] LT',\n            nextWeek : 'dddd [klo] LT',\n            lastDay : '[eilen] [klo] LT',\n            lastWeek : '[viime] dddd[na] [klo] LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : '%s päästä',\n            past : '%s sitten',\n            s : translate,\n            ss : translate,\n            m : translate,\n            mm : translate,\n            h : translate,\n            hh : translate,\n            d : translate,\n            dd : translate,\n            M : translate,\n            MM : translate,\n            y : translate,\n            yy : translate\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}\\./,\n        ordinal : '%d.',\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return fi;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var fo = moment.defineLocale('fo', {\n        months : 'januar_februar_mars_apríl_mai_juni_juli_august_september_oktober_november_desember'.split('_'),\n        monthsShort : 'jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_'),\n        weekdays : 'sunnudagur_mánadagur_týsdagur_mikudagur_hósdagur_fríggjadagur_leygardagur'.split('_'),\n        weekdaysShort : 'sun_mán_týs_mik_hós_frí_ley'.split('_'),\n        weekdaysMin : 'su_má_tý_mi_hó_fr_le'.split('_'),\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY HH:mm',\n            LLLL : 'dddd D. MMMM, YYYY HH:mm'\n        },\n        calendar : {\n            sameDay : '[Í dag kl.] LT',\n            nextDay : '[Í morgin kl.] LT',\n            nextWeek : 'dddd [kl.] LT',\n            lastDay : '[Í gjár kl.] LT',\n            lastWeek : '[síðstu] dddd [kl] LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'um %s',\n            past : '%s síðani',\n            s : 'fá sekund',\n            ss : '%d sekundir',\n            m : 'ein minutt',\n            mm : '%d minuttir',\n            h : 'ein tími',\n            hh : '%d tímar',\n            d : 'ein dagur',\n            dd : '%d dagar',\n            M : 'ein mánaði',\n            MM : '%d mánaðir',\n            y : 'eitt ár',\n            yy : '%d ár'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}\\./,\n        ordinal : '%d.',\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return fo;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var frCa = moment.defineLocale('fr-ca', {\n        months : 'janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre'.split('_'),\n        monthsShort : 'janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.'.split('_'),\n        monthsParseExact : true,\n        weekdays : 'dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi'.split('_'),\n        weekdaysShort : 'dim._lun._mar._mer._jeu._ven._sam.'.split('_'),\n        weekdaysMin : 'di_lu_ma_me_je_ve_sa'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'YYYY-MM-DD',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY HH:mm',\n            LLLL : 'dddd D MMMM YYYY HH:mm'\n        },\n        calendar : {\n            sameDay : '[Aujourd’hui à] LT',\n            nextDay : '[Demain à] LT',\n            nextWeek : 'dddd [à] LT',\n            lastDay : '[Hier à] LT',\n            lastWeek : 'dddd [dernier à] LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'dans %s',\n            past : 'il y a %s',\n            s : 'quelques secondes',\n            ss : '%d secondes',\n            m : 'une minute',\n            mm : '%d minutes',\n            h : 'une heure',\n            hh : '%d heures',\n            d : 'un jour',\n            dd : '%d jours',\n            M : 'un mois',\n            MM : '%d mois',\n            y : 'un an',\n            yy : '%d ans'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}(er|e)/,\n        ordinal : function (number, period) {\n            switch (period) {\n                // Words with masculine grammatical gender: mois, trimestre, jour\n                default:\n                case 'M':\n                case 'Q':\n                case 'D':\n                case 'DDD':\n                case 'd':\n                    return number + (number === 1 ? 'er' : 'e');\n\n                // Words with feminine grammatical gender: semaine\n                case 'w':\n                case 'W':\n                    return number + (number === 1 ? 're' : 'e');\n            }\n        }\n    });\n\n    return frCa;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var frCh = moment.defineLocale('fr-ch', {\n        months : 'janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre'.split('_'),\n        monthsShort : 'janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.'.split('_'),\n        monthsParseExact : true,\n        weekdays : 'dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi'.split('_'),\n        weekdaysShort : 'dim._lun._mar._mer._jeu._ven._sam.'.split('_'),\n        weekdaysMin : 'di_lu_ma_me_je_ve_sa'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD.MM.YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY HH:mm',\n            LLLL : 'dddd D MMMM YYYY HH:mm'\n        },\n        calendar : {\n            sameDay : '[Aujourd’hui à] LT',\n            nextDay : '[Demain à] LT',\n            nextWeek : 'dddd [à] LT',\n            lastDay : '[Hier à] LT',\n            lastWeek : 'dddd [dernier à] LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'dans %s',\n            past : 'il y a %s',\n            s : 'quelques secondes',\n            ss : '%d secondes',\n            m : 'une minute',\n            mm : '%d minutes',\n            h : 'une heure',\n            hh : '%d heures',\n            d : 'un jour',\n            dd : '%d jours',\n            M : 'un mois',\n            MM : '%d mois',\n            y : 'un an',\n            yy : '%d ans'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}(er|e)/,\n        ordinal : function (number, period) {\n            switch (period) {\n                // Words with masculine grammatical gender: mois, trimestre, jour\n                default:\n                case 'M':\n                case 'Q':\n                case 'D':\n                case 'DDD':\n                case 'd':\n                    return number + (number === 1 ? 'er' : 'e');\n\n                // Words with feminine grammatical gender: semaine\n                case 'w':\n                case 'W':\n                    return number + (number === 1 ? 're' : 'e');\n            }\n        },\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return frCh;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var fr = moment.defineLocale('fr', {\n        months : 'janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre'.split('_'),\n        monthsShort : 'janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.'.split('_'),\n        monthsParseExact : true,\n        weekdays : 'dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi'.split('_'),\n        weekdaysShort : 'dim._lun._mar._mer._jeu._ven._sam.'.split('_'),\n        weekdaysMin : 'di_lu_ma_me_je_ve_sa'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY HH:mm',\n            LLLL : 'dddd D MMMM YYYY HH:mm'\n        },\n        calendar : {\n            sameDay : '[Aujourd’hui à] LT',\n            nextDay : '[Demain à] LT',\n            nextWeek : 'dddd [à] LT',\n            lastDay : '[Hier à] LT',\n            lastWeek : 'dddd [dernier à] LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'dans %s',\n            past : 'il y a %s',\n            s : 'quelques secondes',\n            ss : '%d secondes',\n            m : 'une minute',\n            mm : '%d minutes',\n            h : 'une heure',\n            hh : '%d heures',\n            d : 'un jour',\n            dd : '%d jours',\n            M : 'un mois',\n            MM : '%d mois',\n            y : 'un an',\n            yy : '%d ans'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}(er|)/,\n        ordinal : function (number, period) {\n            switch (period) {\n                // TODO: Return 'e' when day of month > 1. Move this case inside\n                // block for masculine words below.\n                // See https://github.com/moment/moment/issues/3375\n                case 'D':\n                    return number + (number === 1 ? 'er' : '');\n\n                // Words with masculine grammatical gender: mois, trimestre, jour\n                default:\n                case 'M':\n                case 'Q':\n                case 'DDD':\n                case 'd':\n                    return number + (number === 1 ? 'er' : 'e');\n\n                // Words with feminine grammatical gender: semaine\n                case 'w':\n                case 'W':\n                    return number + (number === 1 ? 're' : 'e');\n            }\n        },\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return fr;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var monthsShortWithDots = 'jan._feb._mrt._apr._mai_jun._jul._aug._sep._okt._nov._des.'.split('_'),\n        monthsShortWithoutDots = 'jan_feb_mrt_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_');\n\n    var fy = moment.defineLocale('fy', {\n        months : 'jannewaris_febrewaris_maart_april_maaie_juny_july_augustus_septimber_oktober_novimber_desimber'.split('_'),\n        monthsShort : function (m, format) {\n            if (!m) {\n                return monthsShortWithDots;\n            } else if (/-MMM-/.test(format)) {\n                return monthsShortWithoutDots[m.month()];\n            } else {\n                return monthsShortWithDots[m.month()];\n            }\n        },\n        monthsParseExact : true,\n        weekdays : 'snein_moandei_tiisdei_woansdei_tongersdei_freed_sneon'.split('_'),\n        weekdaysShort : 'si._mo._ti._wo._to._fr._so.'.split('_'),\n        weekdaysMin : 'Si_Mo_Ti_Wo_To_Fr_So'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD-MM-YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY HH:mm',\n            LLLL : 'dddd D MMMM YYYY HH:mm'\n        },\n        calendar : {\n            sameDay: '[hjoed om] LT',\n            nextDay: '[moarn om] LT',\n            nextWeek: 'dddd [om] LT',\n            lastDay: '[juster om] LT',\n            lastWeek: '[ôfrûne] dddd [om] LT',\n            sameElse: 'L'\n        },\n        relativeTime : {\n            future : 'oer %s',\n            past : '%s lyn',\n            s : 'in pear sekonden',\n            ss : '%d sekonden',\n            m : 'ien minút',\n            mm : '%d minuten',\n            h : 'ien oere',\n            hh : '%d oeren',\n            d : 'ien dei',\n            dd : '%d dagen',\n            M : 'ien moanne',\n            MM : '%d moannen',\n            y : 'ien jier',\n            yy : '%d jierren'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}(ste|de)/,\n        ordinal : function (number) {\n            return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de');\n        },\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return fy;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var months = [\n        'Am Faoilleach', 'An Gearran', 'Am Màrt', 'An Giblean', 'An Cèitean', 'An t-Ògmhios', 'An t-Iuchar', 'An Lùnastal', 'An t-Sultain', 'An Dàmhair', 'An t-Samhain', 'An Dùbhlachd'\n    ];\n\n    var monthsShort = ['Faoi', 'Gear', 'Màrt', 'Gibl', 'Cèit', 'Ògmh', 'Iuch', 'Lùn', 'Sult', 'Dàmh', 'Samh', 'Dùbh'];\n\n    var weekdays = ['Didòmhnaich', 'Diluain', 'Dimàirt', 'Diciadain', 'Diardaoin', 'Dihaoine', 'Disathairne'];\n\n    var weekdaysShort = ['Did', 'Dil', 'Dim', 'Dic', 'Dia', 'Dih', 'Dis'];\n\n    var weekdaysMin = ['Dò', 'Lu', 'Mà', 'Ci', 'Ar', 'Ha', 'Sa'];\n\n    var gd = moment.defineLocale('gd', {\n        months : months,\n        monthsShort : monthsShort,\n        monthsParseExact : true,\n        weekdays : weekdays,\n        weekdaysShort : weekdaysShort,\n        weekdaysMin : weekdaysMin,\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY HH:mm',\n            LLLL : 'dddd, D MMMM YYYY HH:mm'\n        },\n        calendar : {\n            sameDay : '[An-diugh aig] LT',\n            nextDay : '[A-màireach aig] LT',\n            nextWeek : 'dddd [aig] LT',\n            lastDay : '[An-dè aig] LT',\n            lastWeek : 'dddd [seo chaidh] [aig] LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'ann an %s',\n            past : 'bho chionn %s',\n            s : 'beagan diogan',\n            ss : '%d diogan',\n            m : 'mionaid',\n            mm : '%d mionaidean',\n            h : 'uair',\n            hh : '%d uairean',\n            d : 'latha',\n            dd : '%d latha',\n            M : 'mìos',\n            MM : '%d mìosan',\n            y : 'bliadhna',\n            yy : '%d bliadhna'\n        },\n        dayOfMonthOrdinalParse : /\\d{1,2}(d|na|mh)/,\n        ordinal : function (number) {\n            var output = number === 1 ? 'd' : number % 10 === 2 ? 'na' : 'mh';\n            return number + output;\n        },\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return gd;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var gl = moment.defineLocale('gl', {\n        months : 'xaneiro_febreiro_marzo_abril_maio_xuño_xullo_agosto_setembro_outubro_novembro_decembro'.split('_'),\n        monthsShort : 'xan._feb._mar._abr._mai._xuñ._xul._ago._set._out._nov._dec.'.split('_'),\n        monthsParseExact: true,\n        weekdays : 'domingo_luns_martes_mércores_xoves_venres_sábado'.split('_'),\n        weekdaysShort : 'dom._lun._mar._mér._xov._ven._sáb.'.split('_'),\n        weekdaysMin : 'do_lu_ma_mé_xo_ve_sá'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat : {\n            LT : 'H:mm',\n            LTS : 'H:mm:ss',\n            L : 'DD/MM/YYYY',\n            LL : 'D [de] MMMM [de] YYYY',\n            LLL : 'D [de] MMMM [de] YYYY H:mm',\n            LLLL : 'dddd, D [de] MMMM [de] YYYY H:mm'\n        },\n        calendar : {\n            sameDay : function () {\n                return '[hoxe ' + ((this.hours() !== 1) ? 'ás' : 'á') + '] LT';\n            },\n            nextDay : function () {\n                return '[mañá ' + ((this.hours() !== 1) ? 'ás' : 'á') + '] LT';\n            },\n            nextWeek : function () {\n                return 'dddd [' + ((this.hours() !== 1) ? 'ás' : 'a') + '] LT';\n            },\n            lastDay : function () {\n                return '[onte ' + ((this.hours() !== 1) ? 'á' : 'a') + '] LT';\n            },\n            lastWeek : function () {\n                return '[o] dddd [pasado ' + ((this.hours() !== 1) ? 'ás' : 'a') + '] LT';\n            },\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : function (str) {\n                if (str.indexOf('un') === 0) {\n                    return 'n' + str;\n                }\n                return 'en ' + str;\n            },\n            past : 'hai %s',\n            s : 'uns segundos',\n            ss : '%d segundos',\n            m : 'un minuto',\n            mm : '%d minutos',\n            h : 'unha hora',\n            hh : '%d horas',\n            d : 'un día',\n            dd : '%d días',\n            M : 'un mes',\n            MM : '%d meses',\n            y : 'un ano',\n            yy : '%d anos'\n        },\n        dayOfMonthOrdinalParse : /\\d{1,2}º/,\n        ordinal : '%dº',\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return gl;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    function processRelativeTime(number, withoutSuffix, key, isFuture) {\n        var format = {\n            's': ['thodde secondanim', 'thodde second'],\n            'ss': [number + ' secondanim', number + ' second'],\n            'm': ['eka mintan', 'ek minute'],\n            'mm': [number + ' mintanim', number + ' mintam'],\n            'h': ['eka horan', 'ek hor'],\n            'hh': [number + ' horanim', number + ' horam'],\n            'd': ['eka disan', 'ek dis'],\n            'dd': [number + ' disanim', number + ' dis'],\n            'M': ['eka mhoinean', 'ek mhoino'],\n            'MM': [number + ' mhoineanim', number + ' mhoine'],\n            'y': ['eka vorsan', 'ek voros'],\n            'yy': [number + ' vorsanim', number + ' vorsam']\n        };\n        return withoutSuffix ? format[key][0] : format[key][1];\n    }\n\n    var gomLatn = moment.defineLocale('gom-latn', {\n        months : 'Janer_Febrer_Mars_Abril_Mai_Jun_Julai_Agost_Setembr_Otubr_Novembr_Dezembr'.split('_'),\n        monthsShort : 'Jan._Feb._Mars_Abr._Mai_Jun_Jul._Ago._Set._Otu._Nov._Dez.'.split('_'),\n        monthsParseExact : true,\n        weekdays : 'Aitar_Somar_Mongllar_Budvar_Brestar_Sukrar_Son\\'var'.split('_'),\n        weekdaysShort : 'Ait._Som._Mon._Bud._Bre._Suk._Son.'.split('_'),\n        weekdaysMin : 'Ai_Sm_Mo_Bu_Br_Su_Sn'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat : {\n            LT : 'A h:mm [vazta]',\n            LTS : 'A h:mm:ss [vazta]',\n            L : 'DD-MM-YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY A h:mm [vazta]',\n            LLLL : 'dddd, MMMM[achea] Do, YYYY, A h:mm [vazta]',\n            llll: 'ddd, D MMM YYYY, A h:mm [vazta]'\n        },\n        calendar : {\n            sameDay: '[Aiz] LT',\n            nextDay: '[Faleam] LT',\n            nextWeek: '[Ieta to] dddd[,] LT',\n            lastDay: '[Kal] LT',\n            lastWeek: '[Fatlo] dddd[,] LT',\n            sameElse: 'L'\n        },\n        relativeTime : {\n            future : '%s',\n            past : '%s adim',\n            s : processRelativeTime,\n            ss : processRelativeTime,\n            m : processRelativeTime,\n            mm : processRelativeTime,\n            h : processRelativeTime,\n            hh : processRelativeTime,\n            d : processRelativeTime,\n            dd : processRelativeTime,\n            M : processRelativeTime,\n            MM : processRelativeTime,\n            y : processRelativeTime,\n            yy : processRelativeTime\n        },\n        dayOfMonthOrdinalParse : /\\d{1,2}(er)/,\n        ordinal : function (number, period) {\n            switch (period) {\n                // the ordinal 'er' only applies to day of the month\n                case 'D':\n                    return number + 'er';\n                default:\n                case 'M':\n                case 'Q':\n                case 'DDD':\n                case 'd':\n                case 'w':\n                case 'W':\n                    return number;\n            }\n        },\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        },\n        meridiemParse: /rati|sokalli|donparam|sanje/,\n        meridiemHour : function (hour, meridiem) {\n            if (hour === 12) {\n                hour = 0;\n            }\n            if (meridiem === 'rati') {\n                return hour < 4 ? hour : hour + 12;\n            } else if (meridiem === 'sokalli') {\n                return hour;\n            } else if (meridiem === 'donparam') {\n                return hour > 12 ? hour : hour + 12;\n            } else if (meridiem === 'sanje') {\n                return hour + 12;\n            }\n        },\n        meridiem : function (hour, minute, isLower) {\n            if (hour < 4) {\n                return 'rati';\n            } else if (hour < 12) {\n                return 'sokalli';\n            } else if (hour < 16) {\n                return 'donparam';\n            } else if (hour < 20) {\n                return 'sanje';\n            } else {\n                return 'rati';\n            }\n        }\n    });\n\n    return gomLatn;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var symbolMap = {\n            '1': '૧',\n            '2': '૨',\n            '3': '૩',\n            '4': '૪',\n            '5': '૫',\n            '6': '૬',\n            '7': '૭',\n            '8': '૮',\n            '9': '૯',\n            '0': '૦'\n        },\n        numberMap = {\n            '૧': '1',\n            '૨': '2',\n            '૩': '3',\n            '૪': '4',\n            '૫': '5',\n            '૬': '6',\n            '૭': '7',\n            '૮': '8',\n            '૯': '9',\n            '૦': '0'\n        };\n\n    var gu = moment.defineLocale('gu', {\n        months: 'જાન્યુઆરી_ફેબ્રુઆરી_માર્ચ_એપ્રિલ_મે_જૂન_જુલાઈ_ઑગસ્ટ_સપ્ટેમ્બર_ઑક્ટ્બર_નવેમ્બર_ડિસેમ્બર'.split('_'),\n        monthsShort: 'જાન્યુ._ફેબ્રુ._માર્ચ_એપ્રિ._મે_જૂન_જુલા._ઑગ._સપ્ટે._ઑક્ટ્._નવે._ડિસે.'.split('_'),\n        monthsParseExact: true,\n        weekdays: 'રવિવાર_સોમવાર_મંગળવાર_બુધ્વાર_ગુરુવાર_શુક્રવાર_શનિવાર'.split('_'),\n        weekdaysShort: 'રવિ_સોમ_મંગળ_બુધ્_ગુરુ_શુક્ર_શનિ'.split('_'),\n        weekdaysMin: 'ર_સો_મં_બુ_ગુ_શુ_શ'.split('_'),\n        longDateFormat: {\n            LT: 'A h:mm વાગ્યે',\n            LTS: 'A h:mm:ss વાગ્યે',\n            L: 'DD/MM/YYYY',\n            LL: 'D MMMM YYYY',\n            LLL: 'D MMMM YYYY, A h:mm વાગ્યે',\n            LLLL: 'dddd, D MMMM YYYY, A h:mm વાગ્યે'\n        },\n        calendar: {\n            sameDay: '[આજ] LT',\n            nextDay: '[કાલે] LT',\n            nextWeek: 'dddd, LT',\n            lastDay: '[ગઇકાલે] LT',\n            lastWeek: '[પાછલા] dddd, LT',\n            sameElse: 'L'\n        },\n        relativeTime: {\n            future: '%s મા',\n            past: '%s પેહલા',\n            s: 'અમુક પળો',\n            ss: '%d સેકંડ',\n            m: 'એક મિનિટ',\n            mm: '%d મિનિટ',\n            h: 'એક કલાક',\n            hh: '%d કલાક',\n            d: 'એક દિવસ',\n            dd: '%d દિવસ',\n            M: 'એક મહિનો',\n            MM: '%d મહિનો',\n            y: 'એક વર્ષ',\n            yy: '%d વર્ષ'\n        },\n        preparse: function (string) {\n            return string.replace(/[૧૨૩૪૫૬૭૮૯૦]/g, function (match) {\n                return numberMap[match];\n            });\n        },\n        postformat: function (string) {\n            return string.replace(/\\d/g, function (match) {\n                return symbolMap[match];\n            });\n        },\n        // Gujarati notation for meridiems are quite fuzzy in practice. While there exists\n        // a rigid notion of a 'Pahar' it is not used as rigidly in modern Gujarati.\n        meridiemParse: /રાત|બપોર|સવાર|સાંજ/,\n        meridiemHour: function (hour, meridiem) {\n            if (hour === 12) {\n                hour = 0;\n            }\n            if (meridiem === 'રાત') {\n                return hour < 4 ? hour : hour + 12;\n            } else if (meridiem === 'સવાર') {\n                return hour;\n            } else if (meridiem === 'બપોર') {\n                return hour >= 10 ? hour : hour + 12;\n            } else if (meridiem === 'સાંજ') {\n                return hour + 12;\n            }\n        },\n        meridiem: function (hour, minute, isLower) {\n            if (hour < 4) {\n                return 'રાત';\n            } else if (hour < 10) {\n                return 'સવાર';\n            } else if (hour < 17) {\n                return 'બપોર';\n            } else if (hour < 20) {\n                return 'સાંજ';\n            } else {\n                return 'રાત';\n            }\n        },\n        week: {\n            dow: 0, // Sunday is the first day of the week.\n            doy: 6 // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return gu;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var he = moment.defineLocale('he', {\n        months : 'ינואר_פברואר_מרץ_אפריל_מאי_יוני_יולי_אוגוסט_ספטמבר_אוקטובר_נובמבר_דצמבר'.split('_'),\n        monthsShort : 'ינו׳_פבר׳_מרץ_אפר׳_מאי_יוני_יולי_אוג׳_ספט׳_אוק׳_נוב׳_דצמ׳'.split('_'),\n        weekdays : 'ראשון_שני_שלישי_רביעי_חמישי_שישי_שבת'.split('_'),\n        weekdaysShort : 'א׳_ב׳_ג׳_ד׳_ה׳_ו׳_ש׳'.split('_'),\n        weekdaysMin : 'א_ב_ג_ד_ה_ו_ש'.split('_'),\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD/MM/YYYY',\n            LL : 'D [ב]MMMM YYYY',\n            LLL : 'D [ב]MMMM YYYY HH:mm',\n            LLLL : 'dddd, D [ב]MMMM YYYY HH:mm',\n            l : 'D/M/YYYY',\n            ll : 'D MMM YYYY',\n            lll : 'D MMM YYYY HH:mm',\n            llll : 'ddd, D MMM YYYY HH:mm'\n        },\n        calendar : {\n            sameDay : '[היום ב־]LT',\n            nextDay : '[מחר ב־]LT',\n            nextWeek : 'dddd [בשעה] LT',\n            lastDay : '[אתמול ב־]LT',\n            lastWeek : '[ביום] dddd [האחרון בשעה] LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'בעוד %s',\n            past : 'לפני %s',\n            s : 'מספר שניות',\n            ss : '%d שניות',\n            m : 'דקה',\n            mm : '%d דקות',\n            h : 'שעה',\n            hh : function (number) {\n                if (number === 2) {\n                    return 'שעתיים';\n                }\n                return number + ' שעות';\n            },\n            d : 'יום',\n            dd : function (number) {\n                if (number === 2) {\n                    return 'יומיים';\n                }\n                return number + ' ימים';\n            },\n            M : 'חודש',\n            MM : function (number) {\n                if (number === 2) {\n                    return 'חודשיים';\n                }\n                return number + ' חודשים';\n            },\n            y : 'שנה',\n            yy : function (number) {\n                if (number === 2) {\n                    return 'שנתיים';\n                } else if (number % 10 === 0 && number !== 10) {\n                    return number + ' שנה';\n                }\n                return number + ' שנים';\n            }\n        },\n        meridiemParse: /אחה\"צ|לפנה\"צ|אחרי הצהריים|לפני הצהריים|לפנות בוקר|בבוקר|בערב/i,\n        isPM : function (input) {\n            return /^(אחה\"צ|אחרי הצהריים|בערב)$/.test(input);\n        },\n        meridiem : function (hour, minute, isLower) {\n            if (hour < 5) {\n                return 'לפנות בוקר';\n            } else if (hour < 10) {\n                return 'בבוקר';\n            } else if (hour < 12) {\n                return isLower ? 'לפנה\"צ' : 'לפני הצהריים';\n            } else if (hour < 18) {\n                return isLower ? 'אחה\"צ' : 'אחרי הצהריים';\n            } else {\n                return 'בערב';\n            }\n        }\n    });\n\n    return he;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var symbolMap = {\n        '1': '१',\n        '2': '२',\n        '3': '३',\n        '4': '४',\n        '5': '५',\n        '6': '६',\n        '7': '७',\n        '8': '८',\n        '9': '९',\n        '0': '०'\n    },\n    numberMap = {\n        '१': '1',\n        '२': '2',\n        '३': '3',\n        '४': '4',\n        '५': '5',\n        '६': '6',\n        '७': '7',\n        '८': '8',\n        '९': '9',\n        '०': '0'\n    };\n\n    var hi = moment.defineLocale('hi', {\n        months : 'जनवरी_फ़रवरी_मार्च_अप्रैल_मई_जून_जुलाई_अगस्त_सितम्बर_अक्टूबर_नवम्बर_दिसम्बर'.split('_'),\n        monthsShort : 'जन._फ़र._मार्च_अप्रै._मई_जून_जुल._अग._सित._अक्टू._नव._दिस.'.split('_'),\n        monthsParseExact: true,\n        weekdays : 'रविवार_सोमवार_मंगलवार_बुधवार_गुरूवार_शुक्रवार_शनिवार'.split('_'),\n        weekdaysShort : 'रवि_सोम_मंगल_बुध_गुरू_शुक्र_शनि'.split('_'),\n        weekdaysMin : 'र_सो_मं_बु_गु_शु_श'.split('_'),\n        longDateFormat : {\n            LT : 'A h:mm बजे',\n            LTS : 'A h:mm:ss बजे',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY, A h:mm बजे',\n            LLLL : 'dddd, D MMMM YYYY, A h:mm बजे'\n        },\n        calendar : {\n            sameDay : '[आज] LT',\n            nextDay : '[कल] LT',\n            nextWeek : 'dddd, LT',\n            lastDay : '[कल] LT',\n            lastWeek : '[पिछले] dddd, LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : '%s में',\n            past : '%s पहले',\n            s : 'कुछ ही क्षण',\n            ss : '%d सेकंड',\n            m : 'एक मिनट',\n            mm : '%d मिनट',\n            h : 'एक घंटा',\n            hh : '%d घंटे',\n            d : 'एक दिन',\n            dd : '%d दिन',\n            M : 'एक महीने',\n            MM : '%d महीने',\n            y : 'एक वर्ष',\n            yy : '%d वर्ष'\n        },\n        preparse: function (string) {\n            return string.replace(/[१२३४५६७८९०]/g, function (match) {\n                return numberMap[match];\n            });\n        },\n        postformat: function (string) {\n            return string.replace(/\\d/g, function (match) {\n                return symbolMap[match];\n            });\n        },\n        // Hindi notation for meridiems are quite fuzzy in practice. While there exists\n        // a rigid notion of a 'Pahar' it is not used as rigidly in modern Hindi.\n        meridiemParse: /रात|सुबह|दोपहर|शाम/,\n        meridiemHour : function (hour, meridiem) {\n            if (hour === 12) {\n                hour = 0;\n            }\n            if (meridiem === 'रात') {\n                return hour < 4 ? hour : hour + 12;\n            } else if (meridiem === 'सुबह') {\n                return hour;\n            } else if (meridiem === 'दोपहर') {\n                return hour >= 10 ? hour : hour + 12;\n            } else if (meridiem === 'शाम') {\n                return hour + 12;\n            }\n        },\n        meridiem : function (hour, minute, isLower) {\n            if (hour < 4) {\n                return 'रात';\n            } else if (hour < 10) {\n                return 'सुबह';\n            } else if (hour < 17) {\n                return 'दोपहर';\n            } else if (hour < 20) {\n                return 'शाम';\n            } else {\n                return 'रात';\n            }\n        },\n        week : {\n            dow : 0, // Sunday is the first day of the week.\n            doy : 6  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return hi;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    function translate(number, withoutSuffix, key) {\n        var result = number + ' ';\n        switch (key) {\n            case 'ss':\n                if (number === 1) {\n                    result += 'sekunda';\n                } else if (number === 2 || number === 3 || number === 4) {\n                    result += 'sekunde';\n                } else {\n                    result += 'sekundi';\n                }\n                return result;\n            case 'm':\n                return withoutSuffix ? 'jedna minuta' : 'jedne minute';\n            case 'mm':\n                if (number === 1) {\n                    result += 'minuta';\n                } else if (number === 2 || number === 3 || number === 4) {\n                    result += 'minute';\n                } else {\n                    result += 'minuta';\n                }\n                return result;\n            case 'h':\n                return withoutSuffix ? 'jedan sat' : 'jednog sata';\n            case 'hh':\n                if (number === 1) {\n                    result += 'sat';\n                } else if (number === 2 || number === 3 || number === 4) {\n                    result += 'sata';\n                } else {\n                    result += 'sati';\n                }\n                return result;\n            case 'dd':\n                if (number === 1) {\n                    result += 'dan';\n                } else {\n                    result += 'dana';\n                }\n                return result;\n            case 'MM':\n                if (number === 1) {\n                    result += 'mjesec';\n                } else if (number === 2 || number === 3 || number === 4) {\n                    result += 'mjeseca';\n                } else {\n                    result += 'mjeseci';\n                }\n                return result;\n            case 'yy':\n                if (number === 1) {\n                    result += 'godina';\n                } else if (number === 2 || number === 3 || number === 4) {\n                    result += 'godine';\n                } else {\n                    result += 'godina';\n                }\n                return result;\n        }\n    }\n\n    var hr = moment.defineLocale('hr', {\n        months : {\n            format: 'siječnja_veljače_ožujka_travnja_svibnja_lipnja_srpnja_kolovoza_rujna_listopada_studenoga_prosinca'.split('_'),\n            standalone: 'siječanj_veljača_ožujak_travanj_svibanj_lipanj_srpanj_kolovoz_rujan_listopad_studeni_prosinac'.split('_')\n        },\n        monthsShort : 'sij._velj._ožu._tra._svi._lip._srp._kol._ruj._lis._stu._pro.'.split('_'),\n        monthsParseExact: true,\n        weekdays : 'nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota'.split('_'),\n        weekdaysShort : 'ned._pon._uto._sri._čet._pet._sub.'.split('_'),\n        weekdaysMin : 'ne_po_ut_sr_če_pe_su'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat : {\n            LT : 'H:mm',\n            LTS : 'H:mm:ss',\n            L : 'DD.MM.YYYY',\n            LL : 'D. MMMM YYYY',\n            LLL : 'D. MMMM YYYY H:mm',\n            LLLL : 'dddd, D. MMMM YYYY H:mm'\n        },\n        calendar : {\n            sameDay  : '[danas u] LT',\n            nextDay  : '[sutra u] LT',\n            nextWeek : function () {\n                switch (this.day()) {\n                    case 0:\n                        return '[u] [nedjelju] [u] LT';\n                    case 3:\n                        return '[u] [srijedu] [u] LT';\n                    case 6:\n                        return '[u] [subotu] [u] LT';\n                    case 1:\n                    case 2:\n                    case 4:\n                    case 5:\n                        return '[u] dddd [u] LT';\n                }\n            },\n            lastDay  : '[jučer u] LT',\n            lastWeek : function () {\n                switch (this.day()) {\n                    case 0:\n                    case 3:\n                        return '[prošlu] dddd [u] LT';\n                    case 6:\n                        return '[prošle] [subote] [u] LT';\n                    case 1:\n                    case 2:\n                    case 4:\n                    case 5:\n                        return '[prošli] dddd [u] LT';\n                }\n            },\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'za %s',\n            past   : 'prije %s',\n            s      : 'par sekundi',\n            ss     : translate,\n            m      : translate,\n            mm     : translate,\n            h      : translate,\n            hh     : translate,\n            d      : 'dan',\n            dd     : translate,\n            M      : 'mjesec',\n            MM     : translate,\n            y      : 'godinu',\n            yy     : translate\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}\\./,\n        ordinal : '%d.',\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 7  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return hr;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var weekEndings = 'vasárnap hétfőn kedden szerdán csütörtökön pénteken szombaton'.split(' ');\n    function translate(number, withoutSuffix, key, isFuture) {\n        var num = number;\n        switch (key) {\n            case 's':\n                return (isFuture || withoutSuffix) ? 'néhány másodperc' : 'néhány másodperce';\n            case 'ss':\n                return num + (isFuture || withoutSuffix) ? ' másodperc' : ' másodperce';\n            case 'm':\n                return 'egy' + (isFuture || withoutSuffix ? ' perc' : ' perce');\n            case 'mm':\n                return num + (isFuture || withoutSuffix ? ' perc' : ' perce');\n            case 'h':\n                return 'egy' + (isFuture || withoutSuffix ? ' óra' : ' órája');\n            case 'hh':\n                return num + (isFuture || withoutSuffix ? ' óra' : ' órája');\n            case 'd':\n                return 'egy' + (isFuture || withoutSuffix ? ' nap' : ' napja');\n            case 'dd':\n                return num + (isFuture || withoutSuffix ? ' nap' : ' napja');\n            case 'M':\n                return 'egy' + (isFuture || withoutSuffix ? ' hónap' : ' hónapja');\n            case 'MM':\n                return num + (isFuture || withoutSuffix ? ' hónap' : ' hónapja');\n            case 'y':\n                return 'egy' + (isFuture || withoutSuffix ? ' év' : ' éve');\n            case 'yy':\n                return num + (isFuture || withoutSuffix ? ' év' : ' éve');\n        }\n        return '';\n    }\n    function week(isFuture) {\n        return (isFuture ? '' : '[múlt] ') + '[' + weekEndings[this.day()] + '] LT[-kor]';\n    }\n\n    var hu = moment.defineLocale('hu', {\n        months : 'január_február_március_április_május_június_július_augusztus_szeptember_október_november_december'.split('_'),\n        monthsShort : 'jan_feb_márc_ápr_máj_jún_júl_aug_szept_okt_nov_dec'.split('_'),\n        weekdays : 'vasárnap_hétfő_kedd_szerda_csütörtök_péntek_szombat'.split('_'),\n        weekdaysShort : 'vas_hét_kedd_sze_csüt_pén_szo'.split('_'),\n        weekdaysMin : 'v_h_k_sze_cs_p_szo'.split('_'),\n        longDateFormat : {\n            LT : 'H:mm',\n            LTS : 'H:mm:ss',\n            L : 'YYYY.MM.DD.',\n            LL : 'YYYY. MMMM D.',\n            LLL : 'YYYY. MMMM D. H:mm',\n            LLLL : 'YYYY. MMMM D., dddd H:mm'\n        },\n        meridiemParse: /de|du/i,\n        isPM: function (input) {\n            return input.charAt(1).toLowerCase() === 'u';\n        },\n        meridiem : function (hours, minutes, isLower) {\n            if (hours < 12) {\n                return isLower === true ? 'de' : 'DE';\n            } else {\n                return isLower === true ? 'du' : 'DU';\n            }\n        },\n        calendar : {\n            sameDay : '[ma] LT[-kor]',\n            nextDay : '[holnap] LT[-kor]',\n            nextWeek : function () {\n                return week.call(this, true);\n            },\n            lastDay : '[tegnap] LT[-kor]',\n            lastWeek : function () {\n                return week.call(this, false);\n            },\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : '%s múlva',\n            past : '%s',\n            s : translate,\n            ss : translate,\n            m : translate,\n            mm : translate,\n            h : translate,\n            hh : translate,\n            d : translate,\n            dd : translate,\n            M : translate,\n            MM : translate,\n            y : translate,\n            yy : translate\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}\\./,\n        ordinal : '%d.',\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return hu;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var hyAm = moment.defineLocale('hy-am', {\n        months : {\n            format: 'հունվարի_փետրվարի_մարտի_ապրիլի_մայիսի_հունիսի_հուլիսի_օգոստոսի_սեպտեմբերի_հոկտեմբերի_նոյեմբերի_դեկտեմբերի'.split('_'),\n            standalone: 'հունվար_փետրվար_մարտ_ապրիլ_մայիս_հունիս_հուլիս_օգոստոս_սեպտեմբեր_հոկտեմբեր_նոյեմբեր_դեկտեմբեր'.split('_')\n        },\n        monthsShort : 'հնվ_փտր_մրտ_ապր_մյս_հնս_հլս_օգս_սպտ_հկտ_նմբ_դկտ'.split('_'),\n        weekdays : 'կիրակի_երկուշաբթի_երեքշաբթի_չորեքշաբթի_հինգշաբթի_ուրբաթ_շաբաթ'.split('_'),\n        weekdaysShort : 'կրկ_երկ_երք_չրք_հնգ_ուրբ_շբթ'.split('_'),\n        weekdaysMin : 'կրկ_երկ_երք_չրք_հնգ_ուրբ_շբթ'.split('_'),\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD.MM.YYYY',\n            LL : 'D MMMM YYYY թ.',\n            LLL : 'D MMMM YYYY թ., HH:mm',\n            LLLL : 'dddd, D MMMM YYYY թ., HH:mm'\n        },\n        calendar : {\n            sameDay: '[այսօր] LT',\n            nextDay: '[վաղը] LT',\n            lastDay: '[երեկ] LT',\n            nextWeek: function () {\n                return 'dddd [օրը ժամը] LT';\n            },\n            lastWeek: function () {\n                return '[անցած] dddd [օրը ժամը] LT';\n            },\n            sameElse: 'L'\n        },\n        relativeTime : {\n            future : '%s հետո',\n            past : '%s առաջ',\n            s : 'մի քանի վայրկյան',\n            ss : '%d վայրկյան',\n            m : 'րոպե',\n            mm : '%d րոպե',\n            h : 'ժամ',\n            hh : '%d ժամ',\n            d : 'օր',\n            dd : '%d օր',\n            M : 'ամիս',\n            MM : '%d ամիս',\n            y : 'տարի',\n            yy : '%d տարի'\n        },\n        meridiemParse: /գիշերվա|առավոտվա|ցերեկվա|երեկոյան/,\n        isPM: function (input) {\n            return /^(ցերեկվա|երեկոյան)$/.test(input);\n        },\n        meridiem : function (hour) {\n            if (hour < 4) {\n                return 'գիշերվա';\n            } else if (hour < 12) {\n                return 'առավոտվա';\n            } else if (hour < 17) {\n                return 'ցերեկվա';\n            } else {\n                return 'երեկոյան';\n            }\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}|\\d{1,2}-(ին|րդ)/,\n        ordinal: function (number, period) {\n            switch (period) {\n                case 'DDD':\n                case 'w':\n                case 'W':\n                case 'DDDo':\n                    if (number === 1) {\n                        return number + '-ին';\n                    }\n                    return number + '-րդ';\n                default:\n                    return number;\n            }\n        },\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 7  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return hyAm;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var id = moment.defineLocale('id', {\n        months : 'Januari_Februari_Maret_April_Mei_Juni_Juli_Agustus_September_Oktober_November_Desember'.split('_'),\n        monthsShort : 'Jan_Feb_Mar_Apr_Mei_Jun_Jul_Agt_Sep_Okt_Nov_Des'.split('_'),\n        weekdays : 'Minggu_Senin_Selasa_Rabu_Kamis_Jumat_Sabtu'.split('_'),\n        weekdaysShort : 'Min_Sen_Sel_Rab_Kam_Jum_Sab'.split('_'),\n        weekdaysMin : 'Mg_Sn_Sl_Rb_Km_Jm_Sb'.split('_'),\n        longDateFormat : {\n            LT : 'HH.mm',\n            LTS : 'HH.mm.ss',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY [pukul] HH.mm',\n            LLLL : 'dddd, D MMMM YYYY [pukul] HH.mm'\n        },\n        meridiemParse: /pagi|siang|sore|malam/,\n        meridiemHour : function (hour, meridiem) {\n            if (hour === 12) {\n                hour = 0;\n            }\n            if (meridiem === 'pagi') {\n                return hour;\n            } else if (meridiem === 'siang') {\n                return hour >= 11 ? hour : hour + 12;\n            } else if (meridiem === 'sore' || meridiem === 'malam') {\n                return hour + 12;\n            }\n        },\n        meridiem : function (hours, minutes, isLower) {\n            if (hours < 11) {\n                return 'pagi';\n            } else if (hours < 15) {\n                return 'siang';\n            } else if (hours < 19) {\n                return 'sore';\n            } else {\n                return 'malam';\n            }\n        },\n        calendar : {\n            sameDay : '[Hari ini pukul] LT',\n            nextDay : '[Besok pukul] LT',\n            nextWeek : 'dddd [pukul] LT',\n            lastDay : '[Kemarin pukul] LT',\n            lastWeek : 'dddd [lalu pukul] LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'dalam %s',\n            past : '%s yang lalu',\n            s : 'beberapa detik',\n            ss : '%d detik',\n            m : 'semenit',\n            mm : '%d menit',\n            h : 'sejam',\n            hh : '%d jam',\n            d : 'sehari',\n            dd : '%d hari',\n            M : 'sebulan',\n            MM : '%d bulan',\n            y : 'setahun',\n            yy : '%d tahun'\n        },\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 7  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return id;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    function plural(n) {\n        if (n % 100 === 11) {\n            return true;\n        } else if (n % 10 === 1) {\n            return false;\n        }\n        return true;\n    }\n    function translate(number, withoutSuffix, key, isFuture) {\n        var result = number + ' ';\n        switch (key) {\n            case 's':\n                return withoutSuffix || isFuture ? 'nokkrar sekúndur' : 'nokkrum sekúndum';\n            case 'ss':\n                if (plural(number)) {\n                    return result + (withoutSuffix || isFuture ? 'sekúndur' : 'sekúndum');\n                }\n                return result + 'sekúnda';\n            case 'm':\n                return withoutSuffix ? 'mínúta' : 'mínútu';\n            case 'mm':\n                if (plural(number)) {\n                    return result + (withoutSuffix || isFuture ? 'mínútur' : 'mínútum');\n                } else if (withoutSuffix) {\n                    return result + 'mínúta';\n                }\n                return result + 'mínútu';\n            case 'hh':\n                if (plural(number)) {\n                    return result + (withoutSuffix || isFuture ? 'klukkustundir' : 'klukkustundum');\n                }\n                return result + 'klukkustund';\n            case 'd':\n                if (withoutSuffix) {\n                    return 'dagur';\n                }\n                return isFuture ? 'dag' : 'degi';\n            case 'dd':\n                if (plural(number)) {\n                    if (withoutSuffix) {\n                        return result + 'dagar';\n                    }\n                    return result + (isFuture ? 'daga' : 'dögum');\n                } else if (withoutSuffix) {\n                    return result + 'dagur';\n                }\n                return result + (isFuture ? 'dag' : 'degi');\n            case 'M':\n                if (withoutSuffix) {\n                    return 'mánuður';\n                }\n                return isFuture ? 'mánuð' : 'mánuði';\n            case 'MM':\n                if (plural(number)) {\n                    if (withoutSuffix) {\n                        return result + 'mánuðir';\n                    }\n                    return result + (isFuture ? 'mánuði' : 'mánuðum');\n                } else if (withoutSuffix) {\n                    return result + 'mánuður';\n                }\n                return result + (isFuture ? 'mánuð' : 'mánuði');\n            case 'y':\n                return withoutSuffix || isFuture ? 'ár' : 'ári';\n            case 'yy':\n                if (plural(number)) {\n                    return result + (withoutSuffix || isFuture ? 'ár' : 'árum');\n                }\n                return result + (withoutSuffix || isFuture ? 'ár' : 'ári');\n        }\n    }\n\n    var is = moment.defineLocale('is', {\n        months : 'janúar_febrúar_mars_apríl_maí_júní_júlí_ágúst_september_október_nóvember_desember'.split('_'),\n        monthsShort : 'jan_feb_mar_apr_maí_jún_júl_ágú_sep_okt_nóv_des'.split('_'),\n        weekdays : 'sunnudagur_mánudagur_þriðjudagur_miðvikudagur_fimmtudagur_föstudagur_laugardagur'.split('_'),\n        weekdaysShort : 'sun_mán_þri_mið_fim_fös_lau'.split('_'),\n        weekdaysMin : 'Su_Má_Þr_Mi_Fi_Fö_La'.split('_'),\n        longDateFormat : {\n            LT : 'H:mm',\n            LTS : 'H:mm:ss',\n            L : 'DD.MM.YYYY',\n            LL : 'D. MMMM YYYY',\n            LLL : 'D. MMMM YYYY [kl.] H:mm',\n            LLLL : 'dddd, D. MMMM YYYY [kl.] H:mm'\n        },\n        calendar : {\n            sameDay : '[í dag kl.] LT',\n            nextDay : '[á morgun kl.] LT',\n            nextWeek : 'dddd [kl.] LT',\n            lastDay : '[í gær kl.] LT',\n            lastWeek : '[síðasta] dddd [kl.] LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'eftir %s',\n            past : 'fyrir %s síðan',\n            s : translate,\n            ss : translate,\n            m : translate,\n            mm : translate,\n            h : 'klukkustund',\n            hh : translate,\n            d : translate,\n            dd : translate,\n            M : translate,\n            MM : translate,\n            y : translate,\n            yy : translate\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}\\./,\n        ordinal : '%d.',\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return is;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var it = moment.defineLocale('it', {\n        months : 'gennaio_febbraio_marzo_aprile_maggio_giugno_luglio_agosto_settembre_ottobre_novembre_dicembre'.split('_'),\n        monthsShort : 'gen_feb_mar_apr_mag_giu_lug_ago_set_ott_nov_dic'.split('_'),\n        weekdays : 'domenica_lunedì_martedì_mercoledì_giovedì_venerdì_sabato'.split('_'),\n        weekdaysShort : 'dom_lun_mar_mer_gio_ven_sab'.split('_'),\n        weekdaysMin : 'do_lu_ma_me_gi_ve_sa'.split('_'),\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY HH:mm',\n            LLLL : 'dddd D MMMM YYYY HH:mm'\n        },\n        calendar : {\n            sameDay: '[Oggi alle] LT',\n            nextDay: '[Domani alle] LT',\n            nextWeek: 'dddd [alle] LT',\n            lastDay: '[Ieri alle] LT',\n            lastWeek: function () {\n                switch (this.day()) {\n                    case 0:\n                        return '[la scorsa] dddd [alle] LT';\n                    default:\n                        return '[lo scorso] dddd [alle] LT';\n                }\n            },\n            sameElse: 'L'\n        },\n        relativeTime : {\n            future : function (s) {\n                return ((/^[0-9].+$/).test(s) ? 'tra' : 'in') + ' ' + s;\n            },\n            past : '%s fa',\n            s : 'alcuni secondi',\n            ss : '%d secondi',\n            m : 'un minuto',\n            mm : '%d minuti',\n            h : 'un\\'ora',\n            hh : '%d ore',\n            d : 'un giorno',\n            dd : '%d giorni',\n            M : 'un mese',\n            MM : '%d mesi',\n            y : 'un anno',\n            yy : '%d anni'\n        },\n        dayOfMonthOrdinalParse : /\\d{1,2}º/,\n        ordinal: '%dº',\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return it;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var ja = moment.defineLocale('ja', {\n        months : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),\n        monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),\n        weekdays : '日曜日_月曜日_火曜日_水曜日_木曜日_金曜日_土曜日'.split('_'),\n        weekdaysShort : '日_月_火_水_木_金_土'.split('_'),\n        weekdaysMin : '日_月_火_水_木_金_土'.split('_'),\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'YYYY/MM/DD',\n            LL : 'YYYY年M月D日',\n            LLL : 'YYYY年M月D日 HH:mm',\n            LLLL : 'YYYY年M月D日 dddd HH:mm',\n            l : 'YYYY/MM/DD',\n            ll : 'YYYY年M月D日',\n            lll : 'YYYY年M月D日 HH:mm',\n            llll : 'YYYY年M月D日(ddd) HH:mm'\n        },\n        meridiemParse: /午前|午後/i,\n        isPM : function (input) {\n            return input === '午後';\n        },\n        meridiem : function (hour, minute, isLower) {\n            if (hour < 12) {\n                return '午前';\n            } else {\n                return '午後';\n            }\n        },\n        calendar : {\n            sameDay : '[今日] LT',\n            nextDay : '[明日] LT',\n            nextWeek : function (now) {\n                if (now.week() < this.week()) {\n                    return '[来週]dddd LT';\n                } else {\n                    return 'dddd LT';\n                }\n            },\n            lastDay : '[昨日] LT',\n            lastWeek : function (now) {\n                if (this.week() < now.week()) {\n                    return '[先週]dddd LT';\n                } else {\n                    return 'dddd LT';\n                }\n            },\n            sameElse : 'L'\n        },\n        dayOfMonthOrdinalParse : /\\d{1,2}日/,\n        ordinal : function (number, period) {\n            switch (period) {\n                case 'd':\n                case 'D':\n                case 'DDD':\n                    return number + '日';\n                default:\n                    return number;\n            }\n        },\n        relativeTime : {\n            future : '%s後',\n            past : '%s前',\n            s : '数秒',\n            ss : '%d秒',\n            m : '1分',\n            mm : '%d分',\n            h : '1時間',\n            hh : '%d時間',\n            d : '1日',\n            dd : '%d日',\n            M : '1ヶ月',\n            MM : '%dヶ月',\n            y : '1年',\n            yy : '%d年'\n        }\n    });\n\n    return ja;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var jv = moment.defineLocale('jv', {\n        months : 'Januari_Februari_Maret_April_Mei_Juni_Juli_Agustus_September_Oktober_Nopember_Desember'.split('_'),\n        monthsShort : 'Jan_Feb_Mar_Apr_Mei_Jun_Jul_Ags_Sep_Okt_Nop_Des'.split('_'),\n        weekdays : 'Minggu_Senen_Seloso_Rebu_Kemis_Jemuwah_Septu'.split('_'),\n        weekdaysShort : 'Min_Sen_Sel_Reb_Kem_Jem_Sep'.split('_'),\n        weekdaysMin : 'Mg_Sn_Sl_Rb_Km_Jm_Sp'.split('_'),\n        longDateFormat : {\n            LT : 'HH.mm',\n            LTS : 'HH.mm.ss',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY [pukul] HH.mm',\n            LLLL : 'dddd, D MMMM YYYY [pukul] HH.mm'\n        },\n        meridiemParse: /enjing|siyang|sonten|ndalu/,\n        meridiemHour : function (hour, meridiem) {\n            if (hour === 12) {\n                hour = 0;\n            }\n            if (meridiem === 'enjing') {\n                return hour;\n            } else if (meridiem === 'siyang') {\n                return hour >= 11 ? hour : hour + 12;\n            } else if (meridiem === 'sonten' || meridiem === 'ndalu') {\n                return hour + 12;\n            }\n        },\n        meridiem : function (hours, minutes, isLower) {\n            if (hours < 11) {\n                return 'enjing';\n            } else if (hours < 15) {\n                return 'siyang';\n            } else if (hours < 19) {\n                return 'sonten';\n            } else {\n                return 'ndalu';\n            }\n        },\n        calendar : {\n            sameDay : '[Dinten puniko pukul] LT',\n            nextDay : '[Mbenjang pukul] LT',\n            nextWeek : 'dddd [pukul] LT',\n            lastDay : '[Kala wingi pukul] LT',\n            lastWeek : 'dddd [kepengker pukul] LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'wonten ing %s',\n            past : '%s ingkang kepengker',\n            s : 'sawetawis detik',\n            ss : '%d detik',\n            m : 'setunggal menit',\n            mm : '%d menit',\n            h : 'setunggal jam',\n            hh : '%d jam',\n            d : 'sedinten',\n            dd : '%d dinten',\n            M : 'sewulan',\n            MM : '%d wulan',\n            y : 'setaun',\n            yy : '%d taun'\n        },\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 7  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return jv;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var ka = moment.defineLocale('ka', {\n        months : {\n            standalone: 'იანვარი_თებერვალი_მარტი_აპრილი_მაისი_ივნისი_ივლისი_აგვისტო_სექტემბერი_ოქტომბერი_ნოემბერი_დეკემბერი'.split('_'),\n            format: 'იანვარს_თებერვალს_მარტს_აპრილის_მაისს_ივნისს_ივლისს_აგვისტს_სექტემბერს_ოქტომბერს_ნოემბერს_დეკემბერს'.split('_')\n        },\n        monthsShort : 'იან_თებ_მარ_აპრ_მაი_ივნ_ივლ_აგვ_სექ_ოქტ_ნოე_დეკ'.split('_'),\n        weekdays : {\n            standalone: 'კვირა_ორშაბათი_სამშაბათი_ოთხშაბათი_ხუთშაბათი_პარასკევი_შაბათი'.split('_'),\n            format: 'კვირას_ორშაბათს_სამშაბათს_ოთხშაბათს_ხუთშაბათს_პარასკევს_შაბათს'.split('_'),\n            isFormat: /(წინა|შემდეგ)/\n        },\n        weekdaysShort : 'კვი_ორშ_სამ_ოთხ_ხუთ_პარ_შაბ'.split('_'),\n        weekdaysMin : 'კვ_ორ_სა_ოთ_ხუ_პა_შა'.split('_'),\n        longDateFormat : {\n            LT : 'h:mm A',\n            LTS : 'h:mm:ss A',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY h:mm A',\n            LLLL : 'dddd, D MMMM YYYY h:mm A'\n        },\n        calendar : {\n            sameDay : '[დღეს] LT[-ზე]',\n            nextDay : '[ხვალ] LT[-ზე]',\n            lastDay : '[გუშინ] LT[-ზე]',\n            nextWeek : '[შემდეგ] dddd LT[-ზე]',\n            lastWeek : '[წინა] dddd LT-ზე',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : function (s) {\n                return (/(წამი|წუთი|საათი|წელი)/).test(s) ?\n                    s.replace(/ი$/, 'ში') :\n                    s + 'ში';\n            },\n            past : function (s) {\n                if ((/(წამი|წუთი|საათი|დღე|თვე)/).test(s)) {\n                    return s.replace(/(ი|ე)$/, 'ის წინ');\n                }\n                if ((/წელი/).test(s)) {\n                    return s.replace(/წელი$/, 'წლის წინ');\n                }\n            },\n            s : 'რამდენიმე წამი',\n            ss : '%d წამი',\n            m : 'წუთი',\n            mm : '%d წუთი',\n            h : 'საათი',\n            hh : '%d საათი',\n            d : 'დღე',\n            dd : '%d დღე',\n            M : 'თვე',\n            MM : '%d თვე',\n            y : 'წელი',\n            yy : '%d წელი'\n        },\n        dayOfMonthOrdinalParse: /0|1-ლი|მე-\\d{1,2}|\\d{1,2}-ე/,\n        ordinal : function (number) {\n            if (number === 0) {\n                return number;\n            }\n            if (number === 1) {\n                return number + '-ლი';\n            }\n            if ((number < 20) || (number <= 100 && (number % 20 === 0)) || (number % 100 === 0)) {\n                return 'მე-' + number;\n            }\n            return number + '-ე';\n        },\n        week : {\n            dow : 1,\n            doy : 7\n        }\n    });\n\n    return ka;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var suffixes = {\n        0: '-ші',\n        1: '-ші',\n        2: '-ші',\n        3: '-ші',\n        4: '-ші',\n        5: '-ші',\n        6: '-шы',\n        7: '-ші',\n        8: '-ші',\n        9: '-шы',\n        10: '-шы',\n        20: '-шы',\n        30: '-шы',\n        40: '-шы',\n        50: '-ші',\n        60: '-шы',\n        70: '-ші',\n        80: '-ші',\n        90: '-шы',\n        100: '-ші'\n    };\n\n    var kk = moment.defineLocale('kk', {\n        months : 'қаңтар_ақпан_наурыз_сәуір_мамыр_маусым_шілде_тамыз_қыркүйек_қазан_қараша_желтоқсан'.split('_'),\n        monthsShort : 'қаң_ақп_нау_сәу_мам_мау_шіл_там_қыр_қаз_қар_жел'.split('_'),\n        weekdays : 'жексенбі_дүйсенбі_сейсенбі_сәрсенбі_бейсенбі_жұма_сенбі'.split('_'),\n        weekdaysShort : 'жек_дүй_сей_сәр_бей_жұм_сен'.split('_'),\n        weekdaysMin : 'жк_дй_сй_ср_бй_жм_сн'.split('_'),\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD.MM.YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY HH:mm',\n            LLLL : 'dddd, D MMMM YYYY HH:mm'\n        },\n        calendar : {\n            sameDay : '[Бүгін сағат] LT',\n            nextDay : '[Ертең сағат] LT',\n            nextWeek : 'dddd [сағат] LT',\n            lastDay : '[Кеше сағат] LT',\n            lastWeek : '[Өткен аптаның] dddd [сағат] LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : '%s ішінде',\n            past : '%s бұрын',\n            s : 'бірнеше секунд',\n            ss : '%d секунд',\n            m : 'бір минут',\n            mm : '%d минут',\n            h : 'бір сағат',\n            hh : '%d сағат',\n            d : 'бір күн',\n            dd : '%d күн',\n            M : 'бір ай',\n            MM : '%d ай',\n            y : 'бір жыл',\n            yy : '%d жыл'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}-(ші|шы)/,\n        ordinal : function (number) {\n            var a = number % 10,\n                b = number >= 100 ? 100 : null;\n            return number + (suffixes[number] || suffixes[a] || suffixes[b]);\n        },\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 7  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return kk;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var symbolMap = {\n        '1': '១',\n        '2': '២',\n        '3': '៣',\n        '4': '៤',\n        '5': '៥',\n        '6': '៦',\n        '7': '៧',\n        '8': '៨',\n        '9': '៩',\n        '0': '០'\n    }, numberMap = {\n        '១': '1',\n        '២': '2',\n        '៣': '3',\n        '៤': '4',\n        '៥': '5',\n        '៦': '6',\n        '៧': '7',\n        '៨': '8',\n        '៩': '9',\n        '០': '0'\n    };\n\n    var km = moment.defineLocale('km', {\n        months: 'មករា_កុម្ភៈ_មីនា_មេសា_ឧសភា_មិថុនា_កក្កដា_សីហា_កញ្ញា_តុលា_វិច្ឆិកា_ធ្នូ'.split(\n            '_'\n        ),\n        monthsShort: 'មករា_កុម្ភៈ_មីនា_មេសា_ឧសភា_មិថុនា_កក្កដា_សីហា_កញ្ញា_តុលា_វិច្ឆិកា_ធ្នូ'.split(\n            '_'\n        ),\n        weekdays: 'អាទិត្យ_ច័ន្ទ_អង្គារ_ពុធ_ព្រហស្បតិ៍_សុក្រ_សៅរ៍'.split('_'),\n        weekdaysShort: 'អា_ច_អ_ព_ព្រ_សុ_ស'.split('_'),\n        weekdaysMin: 'អា_ច_អ_ព_ព្រ_សុ_ស'.split('_'),\n        weekdaysParseExact: true,\n        longDateFormat: {\n            LT: 'HH:mm',\n            LTS: 'HH:mm:ss',\n            L: 'DD/MM/YYYY',\n            LL: 'D MMMM YYYY',\n            LLL: 'D MMMM YYYY HH:mm',\n            LLLL: 'dddd, D MMMM YYYY HH:mm'\n        },\n        meridiemParse: /ព្រឹក|ល្ងាច/,\n        isPM: function (input) {\n            return input === 'ល្ងាច';\n        },\n        meridiem: function (hour, minute, isLower) {\n            if (hour < 12) {\n                return 'ព្រឹក';\n            } else {\n                return 'ល្ងាច';\n            }\n        },\n        calendar: {\n            sameDay: '[ថ្ងៃនេះ ម៉ោង] LT',\n            nextDay: '[ស្អែក ម៉ោង] LT',\n            nextWeek: 'dddd [ម៉ោង] LT',\n            lastDay: '[ម្សិលមិញ ម៉ោង] LT',\n            lastWeek: 'dddd [សប្តាហ៍មុន] [ម៉ោង] LT',\n            sameElse: 'L'\n        },\n        relativeTime: {\n            future: '%sទៀត',\n            past: '%sមុន',\n            s: 'ប៉ុន្មានវិនាទី',\n            ss: '%d វិនាទី',\n            m: 'មួយនាទី',\n            mm: '%d នាទី',\n            h: 'មួយម៉ោង',\n            hh: '%d ម៉ោង',\n            d: 'មួយថ្ងៃ',\n            dd: '%d ថ្ងៃ',\n            M: 'មួយខែ',\n            MM: '%d ខែ',\n            y: 'មួយឆ្នាំ',\n            yy: '%d ឆ្នាំ'\n        },\n        dayOfMonthOrdinalParse : /ទី\\d{1,2}/,\n        ordinal : 'ទី%d',\n        preparse: function (string) {\n            return string.replace(/[១២៣៤៥៦៧៨៩០]/g, function (match) {\n                return numberMap[match];\n            });\n        },\n        postformat: function (string) {\n            return string.replace(/\\d/g, function (match) {\n                return symbolMap[match];\n            });\n        },\n        week: {\n            dow: 1, // Monday is the first day of the week.\n            doy: 4 // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return km;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var symbolMap = {\n        '1': '೧',\n        '2': '೨',\n        '3': '೩',\n        '4': '೪',\n        '5': '೫',\n        '6': '೬',\n        '7': '೭',\n        '8': '೮',\n        '9': '೯',\n        '0': '೦'\n    },\n    numberMap = {\n        '೧': '1',\n        '೨': '2',\n        '೩': '3',\n        '೪': '4',\n        '೫': '5',\n        '೬': '6',\n        '೭': '7',\n        '೮': '8',\n        '೯': '9',\n        '೦': '0'\n    };\n\n    var kn = moment.defineLocale('kn', {\n        months : 'ಜನವರಿ_ಫೆಬ್ರವರಿ_ಮಾರ್ಚ್_ಏಪ್ರಿಲ್_ಮೇ_ಜೂನ್_ಜುಲೈ_ಆಗಸ್ಟ್_ಸೆಪ್ಟೆಂಬರ್_ಅಕ್ಟೋಬರ್_ನವೆಂಬರ್_ಡಿಸೆಂಬರ್'.split('_'),\n        monthsShort : 'ಜನ_ಫೆಬ್ರ_ಮಾರ್ಚ್_ಏಪ್ರಿಲ್_ಮೇ_ಜೂನ್_ಜುಲೈ_ಆಗಸ್ಟ್_ಸೆಪ್ಟೆಂ_ಅಕ್ಟೋ_ನವೆಂ_ಡಿಸೆಂ'.split('_'),\n        monthsParseExact: true,\n        weekdays : 'ಭಾನುವಾರ_ಸೋಮವಾರ_ಮಂಗಳವಾರ_ಬುಧವಾರ_ಗುರುವಾರ_ಶುಕ್ರವಾರ_ಶನಿವಾರ'.split('_'),\n        weekdaysShort : 'ಭಾನು_ಸೋಮ_ಮಂಗಳ_ಬುಧ_ಗುರು_ಶುಕ್ರ_ಶನಿ'.split('_'),\n        weekdaysMin : 'ಭಾ_ಸೋ_ಮಂ_ಬು_ಗು_ಶು_ಶ'.split('_'),\n        longDateFormat : {\n            LT : 'A h:mm',\n            LTS : 'A h:mm:ss',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY, A h:mm',\n            LLLL : 'dddd, D MMMM YYYY, A h:mm'\n        },\n        calendar : {\n            sameDay : '[ಇಂದು] LT',\n            nextDay : '[ನಾಳೆ] LT',\n            nextWeek : 'dddd, LT',\n            lastDay : '[ನಿನ್ನೆ] LT',\n            lastWeek : '[ಕೊನೆಯ] dddd, LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : '%s ನಂತರ',\n            past : '%s ಹಿಂದೆ',\n            s : 'ಕೆಲವು ಕ್ಷಣಗಳು',\n            ss : '%d ಸೆಕೆಂಡುಗಳು',\n            m : 'ಒಂದು ನಿಮಿಷ',\n            mm : '%d ನಿಮಿಷ',\n            h : 'ಒಂದು ಗಂಟೆ',\n            hh : '%d ಗಂಟೆ',\n            d : 'ಒಂದು ದಿನ',\n            dd : '%d ದಿನ',\n            M : 'ಒಂದು ತಿಂಗಳು',\n            MM : '%d ತಿಂಗಳು',\n            y : 'ಒಂದು ವರ್ಷ',\n            yy : '%d ವರ್ಷ'\n        },\n        preparse: function (string) {\n            return string.replace(/[೧೨೩೪೫೬೭೮೯೦]/g, function (match) {\n                return numberMap[match];\n            });\n        },\n        postformat: function (string) {\n            return string.replace(/\\d/g, function (match) {\n                return symbolMap[match];\n            });\n        },\n        meridiemParse: /ರಾತ್ರಿ|ಬೆಳಿಗ್ಗೆ|ಮಧ್ಯಾಹ್ನ|ಸಂಜೆ/,\n        meridiemHour : function (hour, meridiem) {\n            if (hour === 12) {\n                hour = 0;\n            }\n            if (meridiem === 'ರಾತ್ರಿ') {\n                return hour < 4 ? hour : hour + 12;\n            } else if (meridiem === 'ಬೆಳಿಗ್ಗೆ') {\n                return hour;\n            } else if (meridiem === 'ಮಧ್ಯಾಹ್ನ') {\n                return hour >= 10 ? hour : hour + 12;\n            } else if (meridiem === 'ಸಂಜೆ') {\n                return hour + 12;\n            }\n        },\n        meridiem : function (hour, minute, isLower) {\n            if (hour < 4) {\n                return 'ರಾತ್ರಿ';\n            } else if (hour < 10) {\n                return 'ಬೆಳಿಗ್ಗೆ';\n            } else if (hour < 17) {\n                return 'ಮಧ್ಯಾಹ್ನ';\n            } else if (hour < 20) {\n                return 'ಸಂಜೆ';\n            } else {\n                return 'ರಾತ್ರಿ';\n            }\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}(ನೇ)/,\n        ordinal : function (number) {\n            return number + 'ನೇ';\n        },\n        week : {\n            dow : 0, // Sunday is the first day of the week.\n            doy : 6  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return kn;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var ko = moment.defineLocale('ko', {\n        months : '1월_2월_3월_4월_5월_6월_7월_8월_9월_10월_11월_12월'.split('_'),\n        monthsShort : '1월_2월_3월_4월_5월_6월_7월_8월_9월_10월_11월_12월'.split('_'),\n        weekdays : '일요일_월요일_화요일_수요일_목요일_금요일_토요일'.split('_'),\n        weekdaysShort : '일_월_화_수_목_금_토'.split('_'),\n        weekdaysMin : '일_월_화_수_목_금_토'.split('_'),\n        longDateFormat : {\n            LT : 'A h:mm',\n            LTS : 'A h:mm:ss',\n            L : 'YYYY.MM.DD.',\n            LL : 'YYYY년 MMMM D일',\n            LLL : 'YYYY년 MMMM D일 A h:mm',\n            LLLL : 'YYYY년 MMMM D일 dddd A h:mm',\n            l : 'YYYY.MM.DD.',\n            ll : 'YYYY년 MMMM D일',\n            lll : 'YYYY년 MMMM D일 A h:mm',\n            llll : 'YYYY년 MMMM D일 dddd A h:mm'\n        },\n        calendar : {\n            sameDay : '오늘 LT',\n            nextDay : '내일 LT',\n            nextWeek : 'dddd LT',\n            lastDay : '어제 LT',\n            lastWeek : '지난주 dddd LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : '%s 후',\n            past : '%s 전',\n            s : '몇 초',\n            ss : '%d초',\n            m : '1분',\n            mm : '%d분',\n            h : '한 시간',\n            hh : '%d시간',\n            d : '하루',\n            dd : '%d일',\n            M : '한 달',\n            MM : '%d달',\n            y : '일 년',\n            yy : '%d년'\n        },\n        dayOfMonthOrdinalParse : /\\d{1,2}(일|월|주)/,\n        ordinal : function (number, period) {\n            switch (period) {\n                case 'd':\n                case 'D':\n                case 'DDD':\n                    return number + '일';\n                case 'M':\n                    return number + '월';\n                case 'w':\n                case 'W':\n                    return number + '주';\n                default:\n                    return number;\n            }\n        },\n        meridiemParse : /오전|오후/,\n        isPM : function (token) {\n            return token === '오후';\n        },\n        meridiem : function (hour, minute, isUpper) {\n            return hour < 12 ? '오전' : '오후';\n        }\n    });\n\n    return ko;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var suffixes = {\n        0: '-чү',\n        1: '-чи',\n        2: '-чи',\n        3: '-чү',\n        4: '-чү',\n        5: '-чи',\n        6: '-чы',\n        7: '-чи',\n        8: '-чи',\n        9: '-чу',\n        10: '-чу',\n        20: '-чы',\n        30: '-чу',\n        40: '-чы',\n        50: '-чү',\n        60: '-чы',\n        70: '-чи',\n        80: '-чи',\n        90: '-чу',\n        100: '-чү'\n    };\n\n    var ky = moment.defineLocale('ky', {\n        months : 'январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь'.split('_'),\n        monthsShort : 'янв_фев_март_апр_май_июнь_июль_авг_сен_окт_ноя_дек'.split('_'),\n        weekdays : 'Жекшемби_Дүйшөмбү_Шейшемби_Шаршемби_Бейшемби_Жума_Ишемби'.split('_'),\n        weekdaysShort : 'Жек_Дүй_Шей_Шар_Бей_Жум_Ише'.split('_'),\n        weekdaysMin : 'Жк_Дй_Шй_Шр_Бй_Жм_Иш'.split('_'),\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD.MM.YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY HH:mm',\n            LLLL : 'dddd, D MMMM YYYY HH:mm'\n        },\n        calendar : {\n            sameDay : '[Бүгүн саат] LT',\n            nextDay : '[Эртең саат] LT',\n            nextWeek : 'dddd [саат] LT',\n            lastDay : '[Кече саат] LT',\n            lastWeek : '[Өткен аптанын] dddd [күнү] [саат] LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : '%s ичинде',\n            past : '%s мурун',\n            s : 'бирнече секунд',\n            ss : '%d секунд',\n            m : 'бир мүнөт',\n            mm : '%d мүнөт',\n            h : 'бир саат',\n            hh : '%d саат',\n            d : 'бир күн',\n            dd : '%d күн',\n            M : 'бир ай',\n            MM : '%d ай',\n            y : 'бир жыл',\n            yy : '%d жыл'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}-(чи|чы|чү|чу)/,\n        ordinal : function (number) {\n            var a = number % 10,\n                b = number >= 100 ? 100 : null;\n            return number + (suffixes[number] || suffixes[a] || suffixes[b]);\n        },\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 7  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return ky;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    function processRelativeTime(number, withoutSuffix, key, isFuture) {\n        var format = {\n            'm': ['eng Minutt', 'enger Minutt'],\n            'h': ['eng Stonn', 'enger Stonn'],\n            'd': ['een Dag', 'engem Dag'],\n            'M': ['ee Mount', 'engem Mount'],\n            'y': ['ee Joer', 'engem Joer']\n        };\n        return withoutSuffix ? format[key][0] : format[key][1];\n    }\n    function processFutureTime(string) {\n        var number = string.substr(0, string.indexOf(' '));\n        if (eifelerRegelAppliesToNumber(number)) {\n            return 'a ' + string;\n        }\n        return 'an ' + string;\n    }\n    function processPastTime(string) {\n        var number = string.substr(0, string.indexOf(' '));\n        if (eifelerRegelAppliesToNumber(number)) {\n            return 'viru ' + string;\n        }\n        return 'virun ' + string;\n    }\n    /**\n     * Returns true if the word before the given number loses the '-n' ending.\n     * e.g. 'an 10 Deeg' but 'a 5 Deeg'\n     *\n     * @param number {integer}\n     * @returns {boolean}\n     */\n    function eifelerRegelAppliesToNumber(number) {\n        number = parseInt(number, 10);\n        if (isNaN(number)) {\n            return false;\n        }\n        if (number < 0) {\n            // Negative Number --> always true\n            return true;\n        } else if (number < 10) {\n            // Only 1 digit\n            if (4 <= number && number <= 7) {\n                return true;\n            }\n            return false;\n        } else if (number < 100) {\n            // 2 digits\n            var lastDigit = number % 10, firstDigit = number / 10;\n            if (lastDigit === 0) {\n                return eifelerRegelAppliesToNumber(firstDigit);\n            }\n            return eifelerRegelAppliesToNumber(lastDigit);\n        } else if (number < 10000) {\n            // 3 or 4 digits --> recursively check first digit\n            while (number >= 10) {\n                number = number / 10;\n            }\n            return eifelerRegelAppliesToNumber(number);\n        } else {\n            // Anything larger than 4 digits: recursively check first n-3 digits\n            number = number / 1000;\n            return eifelerRegelAppliesToNumber(number);\n        }\n    }\n\n    var lb = moment.defineLocale('lb', {\n        months: 'Januar_Februar_Mäerz_Abrëll_Mee_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),\n        monthsShort: 'Jan._Febr._Mrz._Abr._Mee_Jun._Jul._Aug._Sept._Okt._Nov._Dez.'.split('_'),\n        monthsParseExact : true,\n        weekdays: 'Sonndeg_Méindeg_Dënschdeg_Mëttwoch_Donneschdeg_Freideg_Samschdeg'.split('_'),\n        weekdaysShort: 'So._Mé._Dë._Më._Do._Fr._Sa.'.split('_'),\n        weekdaysMin: 'So_Mé_Dë_Më_Do_Fr_Sa'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat: {\n            LT: 'H:mm [Auer]',\n            LTS: 'H:mm:ss [Auer]',\n            L: 'DD.MM.YYYY',\n            LL: 'D. MMMM YYYY',\n            LLL: 'D. MMMM YYYY H:mm [Auer]',\n            LLLL: 'dddd, D. MMMM YYYY H:mm [Auer]'\n        },\n        calendar: {\n            sameDay: '[Haut um] LT',\n            sameElse: 'L',\n            nextDay: '[Muer um] LT',\n            nextWeek: 'dddd [um] LT',\n            lastDay: '[Gëschter um] LT',\n            lastWeek: function () {\n                // Different date string for 'Dënschdeg' (Tuesday) and 'Donneschdeg' (Thursday) due to phonological rule\n                switch (this.day()) {\n                    case 2:\n                    case 4:\n                        return '[Leschten] dddd [um] LT';\n                    default:\n                        return '[Leschte] dddd [um] LT';\n                }\n            }\n        },\n        relativeTime : {\n            future : processFutureTime,\n            past : processPastTime,\n            s : 'e puer Sekonnen',\n            ss : '%d Sekonnen',\n            m : processRelativeTime,\n            mm : '%d Minutten',\n            h : processRelativeTime,\n            hh : '%d Stonnen',\n            d : processRelativeTime,\n            dd : '%d Deeg',\n            M : processRelativeTime,\n            MM : '%d Méint',\n            y : processRelativeTime,\n            yy : '%d Joer'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}\\./,\n        ordinal: '%d.',\n        week: {\n            dow: 1, // Monday is the first day of the week.\n            doy: 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return lb;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var lo = moment.defineLocale('lo', {\n        months : 'ມັງກອນ_ກຸມພາ_ມີນາ_ເມສາ_ພຶດສະພາ_ມິຖຸນາ_ກໍລະກົດ_ສິງຫາ_ກັນຍາ_ຕຸລາ_ພະຈິກ_ທັນວາ'.split('_'),\n        monthsShort : 'ມັງກອນ_ກຸມພາ_ມີນາ_ເມສາ_ພຶດສະພາ_ມິຖຸນາ_ກໍລະກົດ_ສິງຫາ_ກັນຍາ_ຕຸລາ_ພະຈິກ_ທັນວາ'.split('_'),\n        weekdays : 'ອາທິດ_ຈັນ_ອັງຄານ_ພຸດ_ພະຫັດ_ສຸກ_ເສົາ'.split('_'),\n        weekdaysShort : 'ທິດ_ຈັນ_ອັງຄານ_ພຸດ_ພະຫັດ_ສຸກ_ເສົາ'.split('_'),\n        weekdaysMin : 'ທ_ຈ_ອຄ_ພ_ພຫ_ສກ_ສ'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY HH:mm',\n            LLLL : 'ວັນdddd D MMMM YYYY HH:mm'\n        },\n        meridiemParse: /ຕອນເຊົ້າ|ຕອນແລງ/,\n        isPM: function (input) {\n            return input === 'ຕອນແລງ';\n        },\n        meridiem : function (hour, minute, isLower) {\n            if (hour < 12) {\n                return 'ຕອນເຊົ້າ';\n            } else {\n                return 'ຕອນແລງ';\n            }\n        },\n        calendar : {\n            sameDay : '[ມື້ນີ້ເວລາ] LT',\n            nextDay : '[ມື້ອື່ນເວລາ] LT',\n            nextWeek : '[ວັນ]dddd[ໜ້າເວລາ] LT',\n            lastDay : '[ມື້ວານນີ້ເວລາ] LT',\n            lastWeek : '[ວັນ]dddd[ແລ້ວນີ້ເວລາ] LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'ອີກ %s',\n            past : '%sຜ່ານມາ',\n            s : 'ບໍ່ເທົ່າໃດວິນາທີ',\n            ss : '%d ວິນາທີ' ,\n            m : '1 ນາທີ',\n            mm : '%d ນາທີ',\n            h : '1 ຊົ່ວໂມງ',\n            hh : '%d ຊົ່ວໂມງ',\n            d : '1 ມື້',\n            dd : '%d ມື້',\n            M : '1 ເດືອນ',\n            MM : '%d ເດືອນ',\n            y : '1 ປີ',\n            yy : '%d ປີ'\n        },\n        dayOfMonthOrdinalParse: /(ທີ່)\\d{1,2}/,\n        ordinal : function (number) {\n            return 'ທີ່' + number;\n        }\n    });\n\n    return lo;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var units = {\n        'ss' : 'sekundė_sekundžių_sekundes',\n        'm' : 'minutė_minutės_minutę',\n        'mm': 'minutės_minučių_minutes',\n        'h' : 'valanda_valandos_valandą',\n        'hh': 'valandos_valandų_valandas',\n        'd' : 'diena_dienos_dieną',\n        'dd': 'dienos_dienų_dienas',\n        'M' : 'mėnuo_mėnesio_mėnesį',\n        'MM': 'mėnesiai_mėnesių_mėnesius',\n        'y' : 'metai_metų_metus',\n        'yy': 'metai_metų_metus'\n    };\n    function translateSeconds(number, withoutSuffix, key, isFuture) {\n        if (withoutSuffix) {\n            return 'kelios sekundės';\n        } else {\n            return isFuture ? 'kelių sekundžių' : 'kelias sekundes';\n        }\n    }\n    function translateSingular(number, withoutSuffix, key, isFuture) {\n        return withoutSuffix ? forms(key)[0] : (isFuture ? forms(key)[1] : forms(key)[2]);\n    }\n    function special(number) {\n        return number % 10 === 0 || (number > 10 && number < 20);\n    }\n    function forms(key) {\n        return units[key].split('_');\n    }\n    function translate(number, withoutSuffix, key, isFuture) {\n        var result = number + ' ';\n        if (number === 1) {\n            return result + translateSingular(number, withoutSuffix, key[0], isFuture);\n        } else if (withoutSuffix) {\n            return result + (special(number) ? forms(key)[1] : forms(key)[0]);\n        } else {\n            if (isFuture) {\n                return result + forms(key)[1];\n            } else {\n                return result + (special(number) ? forms(key)[1] : forms(key)[2]);\n            }\n        }\n    }\n    var lt = moment.defineLocale('lt', {\n        months : {\n            format: 'sausio_vasario_kovo_balandžio_gegužės_birželio_liepos_rugpjūčio_rugsėjo_spalio_lapkričio_gruodžio'.split('_'),\n            standalone: 'sausis_vasaris_kovas_balandis_gegužė_birželis_liepa_rugpjūtis_rugsėjis_spalis_lapkritis_gruodis'.split('_'),\n            isFormat: /D[oD]?(\\[[^\\[\\]]*\\]|\\s)+MMMM?|MMMM?(\\[[^\\[\\]]*\\]|\\s)+D[oD]?/\n        },\n        monthsShort : 'sau_vas_kov_bal_geg_bir_lie_rgp_rgs_spa_lap_grd'.split('_'),\n        weekdays : {\n            format: 'sekmadienį_pirmadienį_antradienį_trečiadienį_ketvirtadienį_penktadienį_šeštadienį'.split('_'),\n            standalone: 'sekmadienis_pirmadienis_antradienis_trečiadienis_ketvirtadienis_penktadienis_šeštadienis'.split('_'),\n            isFormat: /dddd HH:mm/\n        },\n        weekdaysShort : 'Sek_Pir_Ant_Tre_Ket_Pen_Šeš'.split('_'),\n        weekdaysMin : 'S_P_A_T_K_Pn_Š'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'YYYY-MM-DD',\n            LL : 'YYYY [m.] MMMM D [d.]',\n            LLL : 'YYYY [m.] MMMM D [d.], HH:mm [val.]',\n            LLLL : 'YYYY [m.] MMMM D [d.], dddd, HH:mm [val.]',\n            l : 'YYYY-MM-DD',\n            ll : 'YYYY [m.] MMMM D [d.]',\n            lll : 'YYYY [m.] MMMM D [d.], HH:mm [val.]',\n            llll : 'YYYY [m.] MMMM D [d.], ddd, HH:mm [val.]'\n        },\n        calendar : {\n            sameDay : '[Šiandien] LT',\n            nextDay : '[Rytoj] LT',\n            nextWeek : 'dddd LT',\n            lastDay : '[Vakar] LT',\n            lastWeek : '[Praėjusį] dddd LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'po %s',\n            past : 'prieš %s',\n            s : translateSeconds,\n            ss : translate,\n            m : translateSingular,\n            mm : translate,\n            h : translateSingular,\n            hh : translate,\n            d : translateSingular,\n            dd : translate,\n            M : translateSingular,\n            MM : translate,\n            y : translateSingular,\n            yy : translate\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}-oji/,\n        ordinal : function (number) {\n            return number + '-oji';\n        },\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return lt;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var units = {\n        'ss': 'sekundes_sekundēm_sekunde_sekundes'.split('_'),\n        'm': 'minūtes_minūtēm_minūte_minūtes'.split('_'),\n        'mm': 'minūtes_minūtēm_minūte_minūtes'.split('_'),\n        'h': 'stundas_stundām_stunda_stundas'.split('_'),\n        'hh': 'stundas_stundām_stunda_stundas'.split('_'),\n        'd': 'dienas_dienām_diena_dienas'.split('_'),\n        'dd': 'dienas_dienām_diena_dienas'.split('_'),\n        'M': 'mēneša_mēnešiem_mēnesis_mēneši'.split('_'),\n        'MM': 'mēneša_mēnešiem_mēnesis_mēneši'.split('_'),\n        'y': 'gada_gadiem_gads_gadi'.split('_'),\n        'yy': 'gada_gadiem_gads_gadi'.split('_')\n    };\n    /**\n     * @param withoutSuffix boolean true = a length of time; false = before/after a period of time.\n     */\n    function format(forms, number, withoutSuffix) {\n        if (withoutSuffix) {\n            // E.g. \"21 minūte\", \"3 minūtes\".\n            return number % 10 === 1 && number % 100 !== 11 ? forms[2] : forms[3];\n        } else {\n            // E.g. \"21 minūtes\" as in \"pēc 21 minūtes\".\n            // E.g. \"3 minūtēm\" as in \"pēc 3 minūtēm\".\n            return number % 10 === 1 && number % 100 !== 11 ? forms[0] : forms[1];\n        }\n    }\n    function relativeTimeWithPlural(number, withoutSuffix, key) {\n        return number + ' ' + format(units[key], number, withoutSuffix);\n    }\n    function relativeTimeWithSingular(number, withoutSuffix, key) {\n        return format(units[key], number, withoutSuffix);\n    }\n    function relativeSeconds(number, withoutSuffix) {\n        return withoutSuffix ? 'dažas sekundes' : 'dažām sekundēm';\n    }\n\n    var lv = moment.defineLocale('lv', {\n        months : 'janvāris_februāris_marts_aprīlis_maijs_jūnijs_jūlijs_augusts_septembris_oktobris_novembris_decembris'.split('_'),\n        monthsShort : 'jan_feb_mar_apr_mai_jūn_jūl_aug_sep_okt_nov_dec'.split('_'),\n        weekdays : 'svētdiena_pirmdiena_otrdiena_trešdiena_ceturtdiena_piektdiena_sestdiena'.split('_'),\n        weekdaysShort : 'Sv_P_O_T_C_Pk_S'.split('_'),\n        weekdaysMin : 'Sv_P_O_T_C_Pk_S'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD.MM.YYYY.',\n            LL : 'YYYY. [gada] D. MMMM',\n            LLL : 'YYYY. [gada] D. MMMM, HH:mm',\n            LLLL : 'YYYY. [gada] D. MMMM, dddd, HH:mm'\n        },\n        calendar : {\n            sameDay : '[Šodien pulksten] LT',\n            nextDay : '[Rīt pulksten] LT',\n            nextWeek : 'dddd [pulksten] LT',\n            lastDay : '[Vakar pulksten] LT',\n            lastWeek : '[Pagājušā] dddd [pulksten] LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'pēc %s',\n            past : 'pirms %s',\n            s : relativeSeconds,\n            ss : relativeTimeWithPlural,\n            m : relativeTimeWithSingular,\n            mm : relativeTimeWithPlural,\n            h : relativeTimeWithSingular,\n            hh : relativeTimeWithPlural,\n            d : relativeTimeWithSingular,\n            dd : relativeTimeWithPlural,\n            M : relativeTimeWithSingular,\n            MM : relativeTimeWithPlural,\n            y : relativeTimeWithSingular,\n            yy : relativeTimeWithPlural\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}\\./,\n        ordinal : '%d.',\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return lv;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var translator = {\n        words: { //Different grammatical cases\n            ss: ['sekund', 'sekunda', 'sekundi'],\n            m: ['jedan minut', 'jednog minuta'],\n            mm: ['minut', 'minuta', 'minuta'],\n            h: ['jedan sat', 'jednog sata'],\n            hh: ['sat', 'sata', 'sati'],\n            dd: ['dan', 'dana', 'dana'],\n            MM: ['mjesec', 'mjeseca', 'mjeseci'],\n            yy: ['godina', 'godine', 'godina']\n        },\n        correctGrammaticalCase: function (number, wordKey) {\n            return number === 1 ? wordKey[0] : (number >= 2 && number <= 4 ? wordKey[1] : wordKey[2]);\n        },\n        translate: function (number, withoutSuffix, key) {\n            var wordKey = translator.words[key];\n            if (key.length === 1) {\n                return withoutSuffix ? wordKey[0] : wordKey[1];\n            } else {\n                return number + ' ' + translator.correctGrammaticalCase(number, wordKey);\n            }\n        }\n    };\n\n    var me = moment.defineLocale('me', {\n        months: 'januar_februar_mart_april_maj_jun_jul_avgust_septembar_oktobar_novembar_decembar'.split('_'),\n        monthsShort: 'jan._feb._mar._apr._maj_jun_jul_avg._sep._okt._nov._dec.'.split('_'),\n        monthsParseExact : true,\n        weekdays: 'nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota'.split('_'),\n        weekdaysShort: 'ned._pon._uto._sri._čet._pet._sub.'.split('_'),\n        weekdaysMin: 'ne_po_ut_sr_če_pe_su'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat: {\n            LT: 'H:mm',\n            LTS : 'H:mm:ss',\n            L: 'DD.MM.YYYY',\n            LL: 'D. MMMM YYYY',\n            LLL: 'D. MMMM YYYY H:mm',\n            LLLL: 'dddd, D. MMMM YYYY H:mm'\n        },\n        calendar: {\n            sameDay: '[danas u] LT',\n            nextDay: '[sjutra u] LT',\n\n            nextWeek: function () {\n                switch (this.day()) {\n                    case 0:\n                        return '[u] [nedjelju] [u] LT';\n                    case 3:\n                        return '[u] [srijedu] [u] LT';\n                    case 6:\n                        return '[u] [subotu] [u] LT';\n                    case 1:\n                    case 2:\n                    case 4:\n                    case 5:\n                        return '[u] dddd [u] LT';\n                }\n            },\n            lastDay  : '[juče u] LT',\n            lastWeek : function () {\n                var lastWeekDays = [\n                    '[prošle] [nedjelje] [u] LT',\n                    '[prošlog] [ponedjeljka] [u] LT',\n                    '[prošlog] [utorka] [u] LT',\n                    '[prošle] [srijede] [u] LT',\n                    '[prošlog] [četvrtka] [u] LT',\n                    '[prošlog] [petka] [u] LT',\n                    '[prošle] [subote] [u] LT'\n                ];\n                return lastWeekDays[this.day()];\n            },\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'za %s',\n            past   : 'prije %s',\n            s      : 'nekoliko sekundi',\n            ss     : translator.translate,\n            m      : translator.translate,\n            mm     : translator.translate,\n            h      : translator.translate,\n            hh     : translator.translate,\n            d      : 'dan',\n            dd     : translator.translate,\n            M      : 'mjesec',\n            MM     : translator.translate,\n            y      : 'godinu',\n            yy     : translator.translate\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}\\./,\n        ordinal : '%d.',\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 7  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return me;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var mi = moment.defineLocale('mi', {\n        months: 'Kohi-tāte_Hui-tanguru_Poutū-te-rangi_Paenga-whāwhā_Haratua_Pipiri_Hōngoingoi_Here-turi-kōkā_Mahuru_Whiringa-ā-nuku_Whiringa-ā-rangi_Hakihea'.split('_'),\n        monthsShort: 'Kohi_Hui_Pou_Pae_Hara_Pipi_Hōngoi_Here_Mahu_Whi-nu_Whi-ra_Haki'.split('_'),\n        monthsRegex: /(?:['a-z\\u0101\\u014D\\u016B]+\\-?){1,3}/i,\n        monthsStrictRegex: /(?:['a-z\\u0101\\u014D\\u016B]+\\-?){1,3}/i,\n        monthsShortRegex: /(?:['a-z\\u0101\\u014D\\u016B]+\\-?){1,3}/i,\n        monthsShortStrictRegex: /(?:['a-z\\u0101\\u014D\\u016B]+\\-?){1,2}/i,\n        weekdays: 'Rātapu_Mane_Tūrei_Wenerei_Tāite_Paraire_Hātarei'.split('_'),\n        weekdaysShort: 'Ta_Ma_Tū_We_Tāi_Pa_Hā'.split('_'),\n        weekdaysMin: 'Ta_Ma_Tū_We_Tāi_Pa_Hā'.split('_'),\n        longDateFormat: {\n            LT: 'HH:mm',\n            LTS: 'HH:mm:ss',\n            L: 'DD/MM/YYYY',\n            LL: 'D MMMM YYYY',\n            LLL: 'D MMMM YYYY [i] HH:mm',\n            LLLL: 'dddd, D MMMM YYYY [i] HH:mm'\n        },\n        calendar: {\n            sameDay: '[i teie mahana, i] LT',\n            nextDay: '[apopo i] LT',\n            nextWeek: 'dddd [i] LT',\n            lastDay: '[inanahi i] LT',\n            lastWeek: 'dddd [whakamutunga i] LT',\n            sameElse: 'L'\n        },\n        relativeTime: {\n            future: 'i roto i %s',\n            past: '%s i mua',\n            s: 'te hēkona ruarua',\n            ss: '%d hēkona',\n            m: 'he meneti',\n            mm: '%d meneti',\n            h: 'te haora',\n            hh: '%d haora',\n            d: 'he ra',\n            dd: '%d ra',\n            M: 'he marama',\n            MM: '%d marama',\n            y: 'he tau',\n            yy: '%d tau'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}º/,\n        ordinal: '%dº',\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return mi;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var mk = moment.defineLocale('mk', {\n        months : 'јануари_февруари_март_април_мај_јуни_јули_август_септември_октомври_ноември_декември'.split('_'),\n        monthsShort : 'јан_фев_мар_апр_мај_јун_јул_авг_сеп_окт_ное_дек'.split('_'),\n        weekdays : 'недела_понеделник_вторник_среда_четврток_петок_сабота'.split('_'),\n        weekdaysShort : 'нед_пон_вто_сре_чет_пет_саб'.split('_'),\n        weekdaysMin : 'нe_пo_вт_ср_че_пе_сa'.split('_'),\n        longDateFormat : {\n            LT : 'H:mm',\n            LTS : 'H:mm:ss',\n            L : 'D.MM.YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY H:mm',\n            LLLL : 'dddd, D MMMM YYYY H:mm'\n        },\n        calendar : {\n            sameDay : '[Денес во] LT',\n            nextDay : '[Утре во] LT',\n            nextWeek : '[Во] dddd [во] LT',\n            lastDay : '[Вчера во] LT',\n            lastWeek : function () {\n                switch (this.day()) {\n                    case 0:\n                    case 3:\n                    case 6:\n                        return '[Изминатата] dddd [во] LT';\n                    case 1:\n                    case 2:\n                    case 4:\n                    case 5:\n                        return '[Изминатиот] dddd [во] LT';\n                }\n            },\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'после %s',\n            past : 'пред %s',\n            s : 'неколку секунди',\n            ss : '%d секунди',\n            m : 'минута',\n            mm : '%d минути',\n            h : 'час',\n            hh : '%d часа',\n            d : 'ден',\n            dd : '%d дена',\n            M : 'месец',\n            MM : '%d месеци',\n            y : 'година',\n            yy : '%d години'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}-(ев|ен|ти|ви|ри|ми)/,\n        ordinal : function (number) {\n            var lastDigit = number % 10,\n                last2Digits = number % 100;\n            if (number === 0) {\n                return number + '-ев';\n            } else if (last2Digits === 0) {\n                return number + '-ен';\n            } else if (last2Digits > 10 && last2Digits < 20) {\n                return number + '-ти';\n            } else if (lastDigit === 1) {\n                return number + '-ви';\n            } else if (lastDigit === 2) {\n                return number + '-ри';\n            } else if (lastDigit === 7 || lastDigit === 8) {\n                return number + '-ми';\n            } else {\n                return number + '-ти';\n            }\n        },\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 7  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return mk;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var ml = moment.defineLocale('ml', {\n        months : 'ജനുവരി_ഫെബ്രുവരി_മാർച്ച്_ഏപ്രിൽ_മേയ്_ജൂൺ_ജൂലൈ_ഓഗസ്റ്റ്_സെപ്റ്റംബർ_ഒക്ടോബർ_നവംബർ_ഡിസംബർ'.split('_'),\n        monthsShort : 'ജനു._ഫെബ്രു._മാർ._ഏപ്രി._മേയ്_ജൂൺ_ജൂലൈ._ഓഗ._സെപ്റ്റ._ഒക്ടോ._നവം._ഡിസം.'.split('_'),\n        monthsParseExact : true,\n        weekdays : 'ഞായറാഴ്ച_തിങ്കളാഴ്ച_ചൊവ്വാഴ്ച_ബുധനാഴ്ച_വ്യാഴാഴ്ച_വെള്ളിയാഴ്ച_ശനിയാഴ്ച'.split('_'),\n        weekdaysShort : 'ഞായർ_തിങ്കൾ_ചൊവ്വ_ബുധൻ_വ്യാഴം_വെള്ളി_ശനി'.split('_'),\n        weekdaysMin : 'ഞാ_തി_ചൊ_ബു_വ്യാ_വെ_ശ'.split('_'),\n        longDateFormat : {\n            LT : 'A h:mm -നു',\n            LTS : 'A h:mm:ss -നു',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY, A h:mm -നു',\n            LLLL : 'dddd, D MMMM YYYY, A h:mm -നു'\n        },\n        calendar : {\n            sameDay : '[ഇന്ന്] LT',\n            nextDay : '[നാളെ] LT',\n            nextWeek : 'dddd, LT',\n            lastDay : '[ഇന്നലെ] LT',\n            lastWeek : '[കഴിഞ്ഞ] dddd, LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : '%s കഴിഞ്ഞ്',\n            past : '%s മുൻപ്',\n            s : 'അൽപ നിമിഷങ്ങൾ',\n            ss : '%d സെക്കൻഡ്',\n            m : 'ഒരു മിനിറ്റ്',\n            mm : '%d മിനിറ്റ്',\n            h : 'ഒരു മണിക്കൂർ',\n            hh : '%d മണിക്കൂർ',\n            d : 'ഒരു ദിവസം',\n            dd : '%d ദിവസം',\n            M : 'ഒരു മാസം',\n            MM : '%d മാസം',\n            y : 'ഒരു വർഷം',\n            yy : '%d വർഷം'\n        },\n        meridiemParse: /രാത്രി|രാവിലെ|ഉച്ച കഴിഞ്ഞ്|വൈകുന്നേരം|രാത്രി/i,\n        meridiemHour : function (hour, meridiem) {\n            if (hour === 12) {\n                hour = 0;\n            }\n            if ((meridiem === 'രാത്രി' && hour >= 4) ||\n                    meridiem === 'ഉച്ച കഴിഞ്ഞ്' ||\n                    meridiem === 'വൈകുന്നേരം') {\n                return hour + 12;\n            } else {\n                return hour;\n            }\n        },\n        meridiem : function (hour, minute, isLower) {\n            if (hour < 4) {\n                return 'രാത്രി';\n            } else if (hour < 12) {\n                return 'രാവിലെ';\n            } else if (hour < 17) {\n                return 'ഉച്ച കഴിഞ്ഞ്';\n            } else if (hour < 20) {\n                return 'വൈകുന്നേരം';\n            } else {\n                return 'രാത്രി';\n            }\n        }\n    });\n\n    return ml;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    function translate(number, withoutSuffix, key, isFuture) {\n        switch (key) {\n            case 's':\n                return withoutSuffix ? 'хэдхэн секунд' : 'хэдхэн секундын';\n            case 'ss':\n                return number + (withoutSuffix ? ' секунд' : ' секундын');\n            case 'm':\n            case 'mm':\n                return number + (withoutSuffix ? ' минут' : ' минутын');\n            case 'h':\n            case 'hh':\n                return number + (withoutSuffix ? ' цаг' : ' цагийн');\n            case 'd':\n            case 'dd':\n                return number + (withoutSuffix ? ' өдөр' : ' өдрийн');\n            case 'M':\n            case 'MM':\n                return number + (withoutSuffix ? ' сар' : ' сарын');\n            case 'y':\n            case 'yy':\n                return number + (withoutSuffix ? ' жил' : ' жилийн');\n            default:\n                return number;\n        }\n    }\n\n    var mn = moment.defineLocale('mn', {\n        months : 'Нэгдүгээр сар_Хоёрдугаар сар_Гуравдугаар сар_Дөрөвдүгээр сар_Тавдугаар сар_Зургадугаар сар_Долдугаар сар_Наймдугаар сар_Есдүгээр сар_Аравдугаар сар_Арван нэгдүгээр сар_Арван хоёрдугаар сар'.split('_'),\n        monthsShort : '1 сар_2 сар_3 сар_4 сар_5 сар_6 сар_7 сар_8 сар_9 сар_10 сар_11 сар_12 сар'.split('_'),\n        monthsParseExact : true,\n        weekdays : 'Ням_Даваа_Мягмар_Лхагва_Пүрэв_Баасан_Бямба'.split('_'),\n        weekdaysShort : 'Ням_Дав_Мяг_Лха_Пүр_Баа_Бям'.split('_'),\n        weekdaysMin : 'Ня_Да_Мя_Лх_Пү_Ба_Бя'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'YYYY-MM-DD',\n            LL : 'YYYY оны MMMMын D',\n            LLL : 'YYYY оны MMMMын D HH:mm',\n            LLLL : 'dddd, YYYY оны MMMMын D HH:mm'\n        },\n        meridiemParse: /ҮӨ|ҮХ/i,\n        isPM : function (input) {\n            return input === 'ҮХ';\n        },\n        meridiem : function (hour, minute, isLower) {\n            if (hour < 12) {\n                return 'ҮӨ';\n            } else {\n                return 'ҮХ';\n            }\n        },\n        calendar : {\n            sameDay : '[Өнөөдөр] LT',\n            nextDay : '[Маргааш] LT',\n            nextWeek : '[Ирэх] dddd LT',\n            lastDay : '[Өчигдөр] LT',\n            lastWeek : '[Өнгөрсөн] dddd LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : '%s дараа',\n            past : '%s өмнө',\n            s : translate,\n            ss : translate,\n            m : translate,\n            mm : translate,\n            h : translate,\n            hh : translate,\n            d : translate,\n            dd : translate,\n            M : translate,\n            MM : translate,\n            y : translate,\n            yy : translate\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2} өдөр/,\n        ordinal : function (number, period) {\n            switch (period) {\n                case 'd':\n                case 'D':\n                case 'DDD':\n                    return number + ' өдөр';\n                default:\n                    return number;\n            }\n        }\n    });\n\n    return mn;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var symbolMap = {\n        '1': '१',\n        '2': '२',\n        '3': '३',\n        '4': '४',\n        '5': '५',\n        '6': '६',\n        '7': '७',\n        '8': '८',\n        '9': '९',\n        '0': '०'\n    },\n    numberMap = {\n        '१': '1',\n        '२': '2',\n        '३': '3',\n        '४': '4',\n        '५': '5',\n        '६': '6',\n        '७': '7',\n        '८': '8',\n        '९': '9',\n        '०': '0'\n    };\n\n    function relativeTimeMr(number, withoutSuffix, string, isFuture)\n    {\n        var output = '';\n        if (withoutSuffix) {\n            switch (string) {\n                case 's': output = 'काही सेकंद'; break;\n                case 'ss': output = '%d सेकंद'; break;\n                case 'm': output = 'एक मिनिट'; break;\n                case 'mm': output = '%d मिनिटे'; break;\n                case 'h': output = 'एक तास'; break;\n                case 'hh': output = '%d तास'; break;\n                case 'd': output = 'एक दिवस'; break;\n                case 'dd': output = '%d दिवस'; break;\n                case 'M': output = 'एक महिना'; break;\n                case 'MM': output = '%d महिने'; break;\n                case 'y': output = 'एक वर्ष'; break;\n                case 'yy': output = '%d वर्षे'; break;\n            }\n        }\n        else {\n            switch (string) {\n                case 's': output = 'काही सेकंदां'; break;\n                case 'ss': output = '%d सेकंदां'; break;\n                case 'm': output = 'एका मिनिटा'; break;\n                case 'mm': output = '%d मिनिटां'; break;\n                case 'h': output = 'एका तासा'; break;\n                case 'hh': output = '%d तासां'; break;\n                case 'd': output = 'एका दिवसा'; break;\n                case 'dd': output = '%d दिवसां'; break;\n                case 'M': output = 'एका महिन्या'; break;\n                case 'MM': output = '%d महिन्यां'; break;\n                case 'y': output = 'एका वर्षा'; break;\n                case 'yy': output = '%d वर्षां'; break;\n            }\n        }\n        return output.replace(/%d/i, number);\n    }\n\n    var mr = moment.defineLocale('mr', {\n        months : 'जानेवारी_फेब्रुवारी_मार्च_एप्रिल_मे_जून_जुलै_ऑगस्ट_सप्टेंबर_ऑक्टोबर_नोव्हेंबर_डिसेंबर'.split('_'),\n        monthsShort: 'जाने._फेब्रु._मार्च._एप्रि._मे._जून._जुलै._ऑग._सप्टें._ऑक्टो._नोव्हें._डिसें.'.split('_'),\n        monthsParseExact : true,\n        weekdays : 'रविवार_सोमवार_मंगळवार_बुधवार_गुरूवार_शुक्रवार_शनिवार'.split('_'),\n        weekdaysShort : 'रवि_सोम_मंगळ_बुध_गुरू_शुक्र_शनि'.split('_'),\n        weekdaysMin : 'र_सो_मं_बु_गु_शु_श'.split('_'),\n        longDateFormat : {\n            LT : 'A h:mm वाजता',\n            LTS : 'A h:mm:ss वाजता',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY, A h:mm वाजता',\n            LLLL : 'dddd, D MMMM YYYY, A h:mm वाजता'\n        },\n        calendar : {\n            sameDay : '[आज] LT',\n            nextDay : '[उद्या] LT',\n            nextWeek : 'dddd, LT',\n            lastDay : '[काल] LT',\n            lastWeek: '[मागील] dddd, LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future: '%sमध्ये',\n            past: '%sपूर्वी',\n            s: relativeTimeMr,\n            ss: relativeTimeMr,\n            m: relativeTimeMr,\n            mm: relativeTimeMr,\n            h: relativeTimeMr,\n            hh: relativeTimeMr,\n            d: relativeTimeMr,\n            dd: relativeTimeMr,\n            M: relativeTimeMr,\n            MM: relativeTimeMr,\n            y: relativeTimeMr,\n            yy: relativeTimeMr\n        },\n        preparse: function (string) {\n            return string.replace(/[१२३४५६७८९०]/g, function (match) {\n                return numberMap[match];\n            });\n        },\n        postformat: function (string) {\n            return string.replace(/\\d/g, function (match) {\n                return symbolMap[match];\n            });\n        },\n        meridiemParse: /रात्री|सकाळी|दुपारी|सायंकाळी/,\n        meridiemHour : function (hour, meridiem) {\n            if (hour === 12) {\n                hour = 0;\n            }\n            if (meridiem === 'रात्री') {\n                return hour < 4 ? hour : hour + 12;\n            } else if (meridiem === 'सकाळी') {\n                return hour;\n            } else if (meridiem === 'दुपारी') {\n                return hour >= 10 ? hour : hour + 12;\n            } else if (meridiem === 'सायंकाळी') {\n                return hour + 12;\n            }\n        },\n        meridiem: function (hour, minute, isLower) {\n            if (hour < 4) {\n                return 'रात्री';\n            } else if (hour < 10) {\n                return 'सकाळी';\n            } else if (hour < 17) {\n                return 'दुपारी';\n            } else if (hour < 20) {\n                return 'सायंकाळी';\n            } else {\n                return 'रात्री';\n            }\n        },\n        week : {\n            dow : 0, // Sunday is the first day of the week.\n            doy : 6  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return mr;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var msMy = moment.defineLocale('ms-my', {\n        months : 'Januari_Februari_Mac_April_Mei_Jun_Julai_Ogos_September_Oktober_November_Disember'.split('_'),\n        monthsShort : 'Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ogs_Sep_Okt_Nov_Dis'.split('_'),\n        weekdays : 'Ahad_Isnin_Selasa_Rabu_Khamis_Jumaat_Sabtu'.split('_'),\n        weekdaysShort : 'Ahd_Isn_Sel_Rab_Kha_Jum_Sab'.split('_'),\n        weekdaysMin : 'Ah_Is_Sl_Rb_Km_Jm_Sb'.split('_'),\n        longDateFormat : {\n            LT : 'HH.mm',\n            LTS : 'HH.mm.ss',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY [pukul] HH.mm',\n            LLLL : 'dddd, D MMMM YYYY [pukul] HH.mm'\n        },\n        meridiemParse: /pagi|tengahari|petang|malam/,\n        meridiemHour: function (hour, meridiem) {\n            if (hour === 12) {\n                hour = 0;\n            }\n            if (meridiem === 'pagi') {\n                return hour;\n            } else if (meridiem === 'tengahari') {\n                return hour >= 11 ? hour : hour + 12;\n            } else if (meridiem === 'petang' || meridiem === 'malam') {\n                return hour + 12;\n            }\n        },\n        meridiem : function (hours, minutes, isLower) {\n            if (hours < 11) {\n                return 'pagi';\n            } else if (hours < 15) {\n                return 'tengahari';\n            } else if (hours < 19) {\n                return 'petang';\n            } else {\n                return 'malam';\n            }\n        },\n        calendar : {\n            sameDay : '[Hari ini pukul] LT',\n            nextDay : '[Esok pukul] LT',\n            nextWeek : 'dddd [pukul] LT',\n            lastDay : '[Kelmarin pukul] LT',\n            lastWeek : 'dddd [lepas pukul] LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'dalam %s',\n            past : '%s yang lepas',\n            s : 'beberapa saat',\n            ss : '%d saat',\n            m : 'seminit',\n            mm : '%d minit',\n            h : 'sejam',\n            hh : '%d jam',\n            d : 'sehari',\n            dd : '%d hari',\n            M : 'sebulan',\n            MM : '%d bulan',\n            y : 'setahun',\n            yy : '%d tahun'\n        },\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 7  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return msMy;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var ms = moment.defineLocale('ms', {\n        months : 'Januari_Februari_Mac_April_Mei_Jun_Julai_Ogos_September_Oktober_November_Disember'.split('_'),\n        monthsShort : 'Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ogs_Sep_Okt_Nov_Dis'.split('_'),\n        weekdays : 'Ahad_Isnin_Selasa_Rabu_Khamis_Jumaat_Sabtu'.split('_'),\n        weekdaysShort : 'Ahd_Isn_Sel_Rab_Kha_Jum_Sab'.split('_'),\n        weekdaysMin : 'Ah_Is_Sl_Rb_Km_Jm_Sb'.split('_'),\n        longDateFormat : {\n            LT : 'HH.mm',\n            LTS : 'HH.mm.ss',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY [pukul] HH.mm',\n            LLLL : 'dddd, D MMMM YYYY [pukul] HH.mm'\n        },\n        meridiemParse: /pagi|tengahari|petang|malam/,\n        meridiemHour: function (hour, meridiem) {\n            if (hour === 12) {\n                hour = 0;\n            }\n            if (meridiem === 'pagi') {\n                return hour;\n            } else if (meridiem === 'tengahari') {\n                return hour >= 11 ? hour : hour + 12;\n            } else if (meridiem === 'petang' || meridiem === 'malam') {\n                return hour + 12;\n            }\n        },\n        meridiem : function (hours, minutes, isLower) {\n            if (hours < 11) {\n                return 'pagi';\n            } else if (hours < 15) {\n                return 'tengahari';\n            } else if (hours < 19) {\n                return 'petang';\n            } else {\n                return 'malam';\n            }\n        },\n        calendar : {\n            sameDay : '[Hari ini pukul] LT',\n            nextDay : '[Esok pukul] LT',\n            nextWeek : 'dddd [pukul] LT',\n            lastDay : '[Kelmarin pukul] LT',\n            lastWeek : 'dddd [lepas pukul] LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'dalam %s',\n            past : '%s yang lepas',\n            s : 'beberapa saat',\n            ss : '%d saat',\n            m : 'seminit',\n            mm : '%d minit',\n            h : 'sejam',\n            hh : '%d jam',\n            d : 'sehari',\n            dd : '%d hari',\n            M : 'sebulan',\n            MM : '%d bulan',\n            y : 'setahun',\n            yy : '%d tahun'\n        },\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 7  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return ms;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var mt = moment.defineLocale('mt', {\n        months : 'Jannar_Frar_Marzu_April_Mejju_Ġunju_Lulju_Awwissu_Settembru_Ottubru_Novembru_Diċembru'.split('_'),\n        monthsShort : 'Jan_Fra_Mar_Apr_Mej_Ġun_Lul_Aww_Set_Ott_Nov_Diċ'.split('_'),\n        weekdays : 'Il-Ħadd_It-Tnejn_It-Tlieta_L-Erbgħa_Il-Ħamis_Il-Ġimgħa_Is-Sibt'.split('_'),\n        weekdaysShort : 'Ħad_Tne_Tli_Erb_Ħam_Ġim_Sib'.split('_'),\n        weekdaysMin : 'Ħa_Tn_Tl_Er_Ħa_Ġi_Si'.split('_'),\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY HH:mm',\n            LLLL : 'dddd, D MMMM YYYY HH:mm'\n        },\n        calendar : {\n            sameDay : '[Illum fil-]LT',\n            nextDay : '[Għada fil-]LT',\n            nextWeek : 'dddd [fil-]LT',\n            lastDay : '[Il-bieraħ fil-]LT',\n            lastWeek : 'dddd [li għadda] [fil-]LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'f’ %s',\n            past : '%s ilu',\n            s : 'ftit sekondi',\n            ss : '%d sekondi',\n            m : 'minuta',\n            mm : '%d minuti',\n            h : 'siegħa',\n            hh : '%d siegħat',\n            d : 'ġurnata',\n            dd : '%d ġranet',\n            M : 'xahar',\n            MM : '%d xhur',\n            y : 'sena',\n            yy : '%d sni'\n        },\n        dayOfMonthOrdinalParse : /\\d{1,2}º/,\n        ordinal: '%dº',\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return mt;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var symbolMap = {\n        '1': '၁',\n        '2': '၂',\n        '3': '၃',\n        '4': '၄',\n        '5': '၅',\n        '6': '၆',\n        '7': '၇',\n        '8': '၈',\n        '9': '၉',\n        '0': '၀'\n    }, numberMap = {\n        '၁': '1',\n        '၂': '2',\n        '၃': '3',\n        '၄': '4',\n        '၅': '5',\n        '၆': '6',\n        '၇': '7',\n        '၈': '8',\n        '၉': '9',\n        '၀': '0'\n    };\n\n    var my = moment.defineLocale('my', {\n        months: 'ဇန်နဝါရီ_ဖေဖော်ဝါရီ_မတ်_ဧပြီ_မေ_ဇွန်_ဇူလိုင်_သြဂုတ်_စက်တင်ဘာ_အောက်တိုဘာ_နိုဝင်ဘာ_ဒီဇင်ဘာ'.split('_'),\n        monthsShort: 'ဇန်_ဖေ_မတ်_ပြီ_မေ_ဇွန်_လိုင်_သြ_စက်_အောက်_နို_ဒီ'.split('_'),\n        weekdays: 'တနင်္ဂနွေ_တနင်္လာ_အင်္ဂါ_ဗုဒ္ဓဟူး_ကြာသပတေး_သောကြာ_စနေ'.split('_'),\n        weekdaysShort: 'နွေ_လာ_ဂါ_ဟူး_ကြာ_သော_နေ'.split('_'),\n        weekdaysMin: 'နွေ_လာ_ဂါ_ဟူး_ကြာ_သော_နေ'.split('_'),\n\n        longDateFormat: {\n            LT: 'HH:mm',\n            LTS: 'HH:mm:ss',\n            L: 'DD/MM/YYYY',\n            LL: 'D MMMM YYYY',\n            LLL: 'D MMMM YYYY HH:mm',\n            LLLL: 'dddd D MMMM YYYY HH:mm'\n        },\n        calendar: {\n            sameDay: '[ယနေ.] LT [မှာ]',\n            nextDay: '[မနက်ဖြန်] LT [မှာ]',\n            nextWeek: 'dddd LT [မှာ]',\n            lastDay: '[မနေ.က] LT [မှာ]',\n            lastWeek: '[ပြီးခဲ့သော] dddd LT [မှာ]',\n            sameElse: 'L'\n        },\n        relativeTime: {\n            future: 'လာမည့် %s မှာ',\n            past: 'လွန်ခဲ့သော %s က',\n            s: 'စက္ကန်.အနည်းငယ်',\n            ss : '%d စက္ကန့်',\n            m: 'တစ်မိနစ်',\n            mm: '%d မိနစ်',\n            h: 'တစ်နာရီ',\n            hh: '%d နာရီ',\n            d: 'တစ်ရက်',\n            dd: '%d ရက်',\n            M: 'တစ်လ',\n            MM: '%d လ',\n            y: 'တစ်နှစ်',\n            yy: '%d နှစ်'\n        },\n        preparse: function (string) {\n            return string.replace(/[၁၂၃၄၅၆၇၈၉၀]/g, function (match) {\n                return numberMap[match];\n            });\n        },\n        postformat: function (string) {\n            return string.replace(/\\d/g, function (match) {\n                return symbolMap[match];\n            });\n        },\n        week: {\n            dow: 1, // Monday is the first day of the week.\n            doy: 4 // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return my;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var nb = moment.defineLocale('nb', {\n        months : 'januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember'.split('_'),\n        monthsShort : 'jan._feb._mars_april_mai_juni_juli_aug._sep._okt._nov._des.'.split('_'),\n        monthsParseExact : true,\n        weekdays : 'søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag'.split('_'),\n        weekdaysShort : 'sø._ma._ti._on._to._fr._lø.'.split('_'),\n        weekdaysMin : 'sø_ma_ti_on_to_fr_lø'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD.MM.YYYY',\n            LL : 'D. MMMM YYYY',\n            LLL : 'D. MMMM YYYY [kl.] HH:mm',\n            LLLL : 'dddd D. MMMM YYYY [kl.] HH:mm'\n        },\n        calendar : {\n            sameDay: '[i dag kl.] LT',\n            nextDay: '[i morgen kl.] LT',\n            nextWeek: 'dddd [kl.] LT',\n            lastDay: '[i går kl.] LT',\n            lastWeek: '[forrige] dddd [kl.] LT',\n            sameElse: 'L'\n        },\n        relativeTime : {\n            future : 'om %s',\n            past : '%s siden',\n            s : 'noen sekunder',\n            ss : '%d sekunder',\n            m : 'ett minutt',\n            mm : '%d minutter',\n            h : 'en time',\n            hh : '%d timer',\n            d : 'en dag',\n            dd : '%d dager',\n            M : 'en måned',\n            MM : '%d måneder',\n            y : 'ett år',\n            yy : '%d år'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}\\./,\n        ordinal : '%d.',\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return nb;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var symbolMap = {\n        '1': '१',\n        '2': '२',\n        '3': '३',\n        '4': '४',\n        '5': '५',\n        '6': '६',\n        '7': '७',\n        '8': '८',\n        '9': '९',\n        '0': '०'\n    },\n    numberMap = {\n        '१': '1',\n        '२': '2',\n        '३': '3',\n        '४': '4',\n        '५': '5',\n        '६': '6',\n        '७': '7',\n        '८': '8',\n        '९': '9',\n        '०': '0'\n    };\n\n    var ne = moment.defineLocale('ne', {\n        months : 'जनवरी_फेब्रुवरी_मार्च_अप्रिल_मई_जुन_जुलाई_अगष्ट_सेप्टेम्बर_अक्टोबर_नोभेम्बर_डिसेम्बर'.split('_'),\n        monthsShort : 'जन._फेब्रु._मार्च_अप्रि._मई_जुन_जुलाई._अग._सेप्ट._अक्टो._नोभे._डिसे.'.split('_'),\n        monthsParseExact : true,\n        weekdays : 'आइतबार_सोमबार_मङ्गलबार_बुधबार_बिहिबार_शुक्रबार_शनिबार'.split('_'),\n        weekdaysShort : 'आइत._सोम._मङ्गल._बुध._बिहि._शुक्र._शनि.'.split('_'),\n        weekdaysMin : 'आ._सो._मं._बु._बि._शु._श.'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat : {\n            LT : 'Aको h:mm बजे',\n            LTS : 'Aको h:mm:ss बजे',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY, Aको h:mm बजे',\n            LLLL : 'dddd, D MMMM YYYY, Aको h:mm बजे'\n        },\n        preparse: function (string) {\n            return string.replace(/[१२३४५६७८९०]/g, function (match) {\n                return numberMap[match];\n            });\n        },\n        postformat: function (string) {\n            return string.replace(/\\d/g, function (match) {\n                return symbolMap[match];\n            });\n        },\n        meridiemParse: /राति|बिहान|दिउँसो|साँझ/,\n        meridiemHour : function (hour, meridiem) {\n            if (hour === 12) {\n                hour = 0;\n            }\n            if (meridiem === 'राति') {\n                return hour < 4 ? hour : hour + 12;\n            } else if (meridiem === 'बिहान') {\n                return hour;\n            } else if (meridiem === 'दिउँसो') {\n                return hour >= 10 ? hour : hour + 12;\n            } else if (meridiem === 'साँझ') {\n                return hour + 12;\n            }\n        },\n        meridiem : function (hour, minute, isLower) {\n            if (hour < 3) {\n                return 'राति';\n            } else if (hour < 12) {\n                return 'बिहान';\n            } else if (hour < 16) {\n                return 'दिउँसो';\n            } else if (hour < 20) {\n                return 'साँझ';\n            } else {\n                return 'राति';\n            }\n        },\n        calendar : {\n            sameDay : '[आज] LT',\n            nextDay : '[भोलि] LT',\n            nextWeek : '[आउँदो] dddd[,] LT',\n            lastDay : '[हिजो] LT',\n            lastWeek : '[गएको] dddd[,] LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : '%sमा',\n            past : '%s अगाडि',\n            s : 'केही क्षण',\n            ss : '%d सेकेण्ड',\n            m : 'एक मिनेट',\n            mm : '%d मिनेट',\n            h : 'एक घण्टा',\n            hh : '%d घण्टा',\n            d : 'एक दिन',\n            dd : '%d दिन',\n            M : 'एक महिना',\n            MM : '%d महिना',\n            y : 'एक बर्ष',\n            yy : '%d बर्ष'\n        },\n        week : {\n            dow : 0, // Sunday is the first day of the week.\n            doy : 6  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return ne;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var monthsShortWithDots = 'jan._feb._mrt._apr._mei_jun._jul._aug._sep._okt._nov._dec.'.split('_'),\n        monthsShortWithoutDots = 'jan_feb_mrt_apr_mei_jun_jul_aug_sep_okt_nov_dec'.split('_');\n\n    var monthsParse = [/^jan/i, /^feb/i, /^maart|mrt.?$/i, /^apr/i, /^mei$/i, /^jun[i.]?$/i, /^jul[i.]?$/i, /^aug/i, /^sep/i, /^okt/i, /^nov/i, /^dec/i];\n    var monthsRegex = /^(januari|februari|maart|april|mei|april|ju[nl]i|augustus|september|oktober|november|december|jan\\.?|feb\\.?|mrt\\.?|apr\\.?|ju[nl]\\.?|aug\\.?|sep\\.?|okt\\.?|nov\\.?|dec\\.?)/i;\n\n    var nlBe = moment.defineLocale('nl-be', {\n        months : 'januari_februari_maart_april_mei_juni_juli_augustus_september_oktober_november_december'.split('_'),\n        monthsShort : function (m, format) {\n            if (!m) {\n                return monthsShortWithDots;\n            } else if (/-MMM-/.test(format)) {\n                return monthsShortWithoutDots[m.month()];\n            } else {\n                return monthsShortWithDots[m.month()];\n            }\n        },\n\n        monthsRegex: monthsRegex,\n        monthsShortRegex: monthsRegex,\n        monthsStrictRegex: /^(januari|februari|maart|mei|ju[nl]i|april|augustus|september|oktober|november|december)/i,\n        monthsShortStrictRegex: /^(jan\\.?|feb\\.?|mrt\\.?|apr\\.?|mei|ju[nl]\\.?|aug\\.?|sep\\.?|okt\\.?|nov\\.?|dec\\.?)/i,\n\n        monthsParse : monthsParse,\n        longMonthsParse : monthsParse,\n        shortMonthsParse : monthsParse,\n\n        weekdays : 'zondag_maandag_dinsdag_woensdag_donderdag_vrijdag_zaterdag'.split('_'),\n        weekdaysShort : 'zo._ma._di._wo._do._vr._za.'.split('_'),\n        weekdaysMin : 'zo_ma_di_wo_do_vr_za'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY HH:mm',\n            LLLL : 'dddd D MMMM YYYY HH:mm'\n        },\n        calendar : {\n            sameDay: '[vandaag om] LT',\n            nextDay: '[morgen om] LT',\n            nextWeek: 'dddd [om] LT',\n            lastDay: '[gisteren om] LT',\n            lastWeek: '[afgelopen] dddd [om] LT',\n            sameElse: 'L'\n        },\n        relativeTime : {\n            future : 'over %s',\n            past : '%s geleden',\n            s : 'een paar seconden',\n            ss : '%d seconden',\n            m : 'één minuut',\n            mm : '%d minuten',\n            h : 'één uur',\n            hh : '%d uur',\n            d : 'één dag',\n            dd : '%d dagen',\n            M : 'één maand',\n            MM : '%d maanden',\n            y : 'één jaar',\n            yy : '%d jaar'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}(ste|de)/,\n        ordinal : function (number) {\n            return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de');\n        },\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return nlBe;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var monthsShortWithDots = 'jan._feb._mrt._apr._mei_jun._jul._aug._sep._okt._nov._dec.'.split('_'),\n        monthsShortWithoutDots = 'jan_feb_mrt_apr_mei_jun_jul_aug_sep_okt_nov_dec'.split('_');\n\n    var monthsParse = [/^jan/i, /^feb/i, /^maart|mrt.?$/i, /^apr/i, /^mei$/i, /^jun[i.]?$/i, /^jul[i.]?$/i, /^aug/i, /^sep/i, /^okt/i, /^nov/i, /^dec/i];\n    var monthsRegex = /^(januari|februari|maart|april|mei|april|ju[nl]i|augustus|september|oktober|november|december|jan\\.?|feb\\.?|mrt\\.?|apr\\.?|ju[nl]\\.?|aug\\.?|sep\\.?|okt\\.?|nov\\.?|dec\\.?)/i;\n\n    var nl = moment.defineLocale('nl', {\n        months : 'januari_februari_maart_april_mei_juni_juli_augustus_september_oktober_november_december'.split('_'),\n        monthsShort : function (m, format) {\n            if (!m) {\n                return monthsShortWithDots;\n            } else if (/-MMM-/.test(format)) {\n                return monthsShortWithoutDots[m.month()];\n            } else {\n                return monthsShortWithDots[m.month()];\n            }\n        },\n\n        monthsRegex: monthsRegex,\n        monthsShortRegex: monthsRegex,\n        monthsStrictRegex: /^(januari|februari|maart|mei|ju[nl]i|april|augustus|september|oktober|november|december)/i,\n        monthsShortStrictRegex: /^(jan\\.?|feb\\.?|mrt\\.?|apr\\.?|mei|ju[nl]\\.?|aug\\.?|sep\\.?|okt\\.?|nov\\.?|dec\\.?)/i,\n\n        monthsParse : monthsParse,\n        longMonthsParse : monthsParse,\n        shortMonthsParse : monthsParse,\n\n        weekdays : 'zondag_maandag_dinsdag_woensdag_donderdag_vrijdag_zaterdag'.split('_'),\n        weekdaysShort : 'zo._ma._di._wo._do._vr._za.'.split('_'),\n        weekdaysMin : 'zo_ma_di_wo_do_vr_za'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD-MM-YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY HH:mm',\n            LLLL : 'dddd D MMMM YYYY HH:mm'\n        },\n        calendar : {\n            sameDay: '[vandaag om] LT',\n            nextDay: '[morgen om] LT',\n            nextWeek: 'dddd [om] LT',\n            lastDay: '[gisteren om] LT',\n            lastWeek: '[afgelopen] dddd [om] LT',\n            sameElse: 'L'\n        },\n        relativeTime : {\n            future : 'over %s',\n            past : '%s geleden',\n            s : 'een paar seconden',\n            ss : '%d seconden',\n            m : 'één minuut',\n            mm : '%d minuten',\n            h : 'één uur',\n            hh : '%d uur',\n            d : 'één dag',\n            dd : '%d dagen',\n            M : 'één maand',\n            MM : '%d maanden',\n            y : 'één jaar',\n            yy : '%d jaar'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}(ste|de)/,\n        ordinal : function (number) {\n            return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de');\n        },\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return nl;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var nn = moment.defineLocale('nn', {\n        months : 'januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember'.split('_'),\n        monthsShort : 'jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_'),\n        weekdays : 'sundag_måndag_tysdag_onsdag_torsdag_fredag_laurdag'.split('_'),\n        weekdaysShort : 'sun_mån_tys_ons_tor_fre_lau'.split('_'),\n        weekdaysMin : 'su_må_ty_on_to_fr_lø'.split('_'),\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD.MM.YYYY',\n            LL : 'D. MMMM YYYY',\n            LLL : 'D. MMMM YYYY [kl.] H:mm',\n            LLLL : 'dddd D. MMMM YYYY [kl.] HH:mm'\n        },\n        calendar : {\n            sameDay: '[I dag klokka] LT',\n            nextDay: '[I morgon klokka] LT',\n            nextWeek: 'dddd [klokka] LT',\n            lastDay: '[I går klokka] LT',\n            lastWeek: '[Føregåande] dddd [klokka] LT',\n            sameElse: 'L'\n        },\n        relativeTime : {\n            future : 'om %s',\n            past : '%s sidan',\n            s : 'nokre sekund',\n            ss : '%d sekund',\n            m : 'eit minutt',\n            mm : '%d minutt',\n            h : 'ein time',\n            hh : '%d timar',\n            d : 'ein dag',\n            dd : '%d dagar',\n            M : 'ein månad',\n            MM : '%d månader',\n            y : 'eit år',\n            yy : '%d år'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}\\./,\n        ordinal : '%d.',\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return nn;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var symbolMap = {\n        '1': '੧',\n        '2': '੨',\n        '3': '੩',\n        '4': '੪',\n        '5': '੫',\n        '6': '੬',\n        '7': '੭',\n        '8': '੮',\n        '9': '੯',\n        '0': '੦'\n    },\n    numberMap = {\n        '੧': '1',\n        '੨': '2',\n        '੩': '3',\n        '੪': '4',\n        '੫': '5',\n        '੬': '6',\n        '੭': '7',\n        '੮': '8',\n        '੯': '9',\n        '੦': '0'\n    };\n\n    var paIn = moment.defineLocale('pa-in', {\n        // There are months name as per Nanakshahi Calender but they are not used as rigidly in modern Punjabi.\n        months : 'ਜਨਵਰੀ_ਫ਼ਰਵਰੀ_ਮਾਰਚ_ਅਪ੍ਰੈਲ_ਮਈ_ਜੂਨ_ਜੁਲਾਈ_ਅਗਸਤ_ਸਤੰਬਰ_ਅਕਤੂਬਰ_ਨਵੰਬਰ_ਦਸੰਬਰ'.split('_'),\n        monthsShort : 'ਜਨਵਰੀ_ਫ਼ਰਵਰੀ_ਮਾਰਚ_ਅਪ੍ਰੈਲ_ਮਈ_ਜੂਨ_ਜੁਲਾਈ_ਅਗਸਤ_ਸਤੰਬਰ_ਅਕਤੂਬਰ_ਨਵੰਬਰ_ਦਸੰਬਰ'.split('_'),\n        weekdays : 'ਐਤਵਾਰ_ਸੋਮਵਾਰ_ਮੰਗਲਵਾਰ_ਬੁਧਵਾਰ_ਵੀਰਵਾਰ_ਸ਼ੁੱਕਰਵਾਰ_ਸ਼ਨੀਚਰਵਾਰ'.split('_'),\n        weekdaysShort : 'ਐਤ_ਸੋਮ_ਮੰਗਲ_ਬੁਧ_ਵੀਰ_ਸ਼ੁਕਰ_ਸ਼ਨੀ'.split('_'),\n        weekdaysMin : 'ਐਤ_ਸੋਮ_ਮੰਗਲ_ਬੁਧ_ਵੀਰ_ਸ਼ੁਕਰ_ਸ਼ਨੀ'.split('_'),\n        longDateFormat : {\n            LT : 'A h:mm ਵਜੇ',\n            LTS : 'A h:mm:ss ਵਜੇ',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY, A h:mm ਵਜੇ',\n            LLLL : 'dddd, D MMMM YYYY, A h:mm ਵਜੇ'\n        },\n        calendar : {\n            sameDay : '[ਅਜ] LT',\n            nextDay : '[ਕਲ] LT',\n            nextWeek : 'dddd, LT',\n            lastDay : '[ਕਲ] LT',\n            lastWeek : '[ਪਿਛਲੇ] dddd, LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : '%s ਵਿੱਚ',\n            past : '%s ਪਿਛਲੇ',\n            s : 'ਕੁਝ ਸਕਿੰਟ',\n            ss : '%d ਸਕਿੰਟ',\n            m : 'ਇਕ ਮਿੰਟ',\n            mm : '%d ਮਿੰਟ',\n            h : 'ਇੱਕ ਘੰਟਾ',\n            hh : '%d ਘੰਟੇ',\n            d : 'ਇੱਕ ਦਿਨ',\n            dd : '%d ਦਿਨ',\n            M : 'ਇੱਕ ਮਹੀਨਾ',\n            MM : '%d ਮਹੀਨੇ',\n            y : 'ਇੱਕ ਸਾਲ',\n            yy : '%d ਸਾਲ'\n        },\n        preparse: function (string) {\n            return string.replace(/[੧੨੩੪੫੬੭੮੯੦]/g, function (match) {\n                return numberMap[match];\n            });\n        },\n        postformat: function (string) {\n            return string.replace(/\\d/g, function (match) {\n                return symbolMap[match];\n            });\n        },\n        // Punjabi notation for meridiems are quite fuzzy in practice. While there exists\n        // a rigid notion of a 'Pahar' it is not used as rigidly in modern Punjabi.\n        meridiemParse: /ਰਾਤ|ਸਵੇਰ|ਦੁਪਹਿਰ|ਸ਼ਾਮ/,\n        meridiemHour : function (hour, meridiem) {\n            if (hour === 12) {\n                hour = 0;\n            }\n            if (meridiem === 'ਰਾਤ') {\n                return hour < 4 ? hour : hour + 12;\n            } else if (meridiem === 'ਸਵੇਰ') {\n                return hour;\n            } else if (meridiem === 'ਦੁਪਹਿਰ') {\n                return hour >= 10 ? hour : hour + 12;\n            } else if (meridiem === 'ਸ਼ਾਮ') {\n                return hour + 12;\n            }\n        },\n        meridiem : function (hour, minute, isLower) {\n            if (hour < 4) {\n                return 'ਰਾਤ';\n            } else if (hour < 10) {\n                return 'ਸਵੇਰ';\n            } else if (hour < 17) {\n                return 'ਦੁਪਹਿਰ';\n            } else if (hour < 20) {\n                return 'ਸ਼ਾਮ';\n            } else {\n                return 'ਰਾਤ';\n            }\n        },\n        week : {\n            dow : 0, // Sunday is the first day of the week.\n            doy : 6  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return paIn;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var monthsNominative = 'styczeń_luty_marzec_kwiecień_maj_czerwiec_lipiec_sierpień_wrzesień_październik_listopad_grudzień'.split('_'),\n        monthsSubjective = 'stycznia_lutego_marca_kwietnia_maja_czerwca_lipca_sierpnia_września_października_listopada_grudnia'.split('_');\n    function plural(n) {\n        return (n % 10 < 5) && (n % 10 > 1) && ((~~(n / 10) % 10) !== 1);\n    }\n    function translate(number, withoutSuffix, key) {\n        var result = number + ' ';\n        switch (key) {\n            case 'ss':\n                return result + (plural(number) ? 'sekundy' : 'sekund');\n            case 'm':\n                return withoutSuffix ? 'minuta' : 'minutę';\n            case 'mm':\n                return result + (plural(number) ? 'minuty' : 'minut');\n            case 'h':\n                return withoutSuffix  ? 'godzina'  : 'godzinę';\n            case 'hh':\n                return result + (plural(number) ? 'godziny' : 'godzin');\n            case 'MM':\n                return result + (plural(number) ? 'miesiące' : 'miesięcy');\n            case 'yy':\n                return result + (plural(number) ? 'lata' : 'lat');\n        }\n    }\n\n    var pl = moment.defineLocale('pl', {\n        months : function (momentToFormat, format) {\n            if (!momentToFormat) {\n                return monthsNominative;\n            } else if (format === '') {\n                // Hack: if format empty we know this is used to generate\n                // RegExp by moment. Give then back both valid forms of months\n                // in RegExp ready format.\n                return '(' + monthsSubjective[momentToFormat.month()] + '|' + monthsNominative[momentToFormat.month()] + ')';\n            } else if (/D MMMM/.test(format)) {\n                return monthsSubjective[momentToFormat.month()];\n            } else {\n                return monthsNominative[momentToFormat.month()];\n            }\n        },\n        monthsShort : 'sty_lut_mar_kwi_maj_cze_lip_sie_wrz_paź_lis_gru'.split('_'),\n        weekdays : 'niedziela_poniedziałek_wtorek_środa_czwartek_piątek_sobota'.split('_'),\n        weekdaysShort : 'ndz_pon_wt_śr_czw_pt_sob'.split('_'),\n        weekdaysMin : 'Nd_Pn_Wt_Śr_Cz_Pt_So'.split('_'),\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD.MM.YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY HH:mm',\n            LLLL : 'dddd, D MMMM YYYY HH:mm'\n        },\n        calendar : {\n            sameDay: '[Dziś o] LT',\n            nextDay: '[Jutro o] LT',\n            nextWeek: function () {\n                switch (this.day()) {\n                    case 0:\n                        return '[W niedzielę o] LT';\n\n                    case 2:\n                        return '[We wtorek o] LT';\n\n                    case 3:\n                        return '[W środę o] LT';\n\n                    case 6:\n                        return '[W sobotę o] LT';\n\n                    default:\n                        return '[W] dddd [o] LT';\n                }\n            },\n            lastDay: '[Wczoraj o] LT',\n            lastWeek: function () {\n                switch (this.day()) {\n                    case 0:\n                        return '[W zeszłą niedzielę o] LT';\n                    case 3:\n                        return '[W zeszłą środę o] LT';\n                    case 6:\n                        return '[W zeszłą sobotę o] LT';\n                    default:\n                        return '[W zeszły] dddd [o] LT';\n                }\n            },\n            sameElse: 'L'\n        },\n        relativeTime : {\n            future : 'za %s',\n            past : '%s temu',\n            s : 'kilka sekund',\n            ss : translate,\n            m : translate,\n            mm : translate,\n            h : translate,\n            hh : translate,\n            d : '1 dzień',\n            dd : '%d dni',\n            M : 'miesiąc',\n            MM : translate,\n            y : 'rok',\n            yy : translate\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}\\./,\n        ordinal : '%d.',\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return pl;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var ptBr = moment.defineLocale('pt-br', {\n        months : 'janeiro_fevereiro_março_abril_maio_junho_julho_agosto_setembro_outubro_novembro_dezembro'.split('_'),\n        monthsShort : 'jan_fev_mar_abr_mai_jun_jul_ago_set_out_nov_dez'.split('_'),\n        weekdays : 'Domingo_Segunda-feira_Terça-feira_Quarta-feira_Quinta-feira_Sexta-feira_Sábado'.split('_'),\n        weekdaysShort : 'Dom_Seg_Ter_Qua_Qui_Sex_Sáb'.split('_'),\n        weekdaysMin : 'Do_2ª_3ª_4ª_5ª_6ª_Sá'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD/MM/YYYY',\n            LL : 'D [de] MMMM [de] YYYY',\n            LLL : 'D [de] MMMM [de] YYYY [às] HH:mm',\n            LLLL : 'dddd, D [de] MMMM [de] YYYY [às] HH:mm'\n        },\n        calendar : {\n            sameDay: '[Hoje às] LT',\n            nextDay: '[Amanhã às] LT',\n            nextWeek: 'dddd [às] LT',\n            lastDay: '[Ontem às] LT',\n            lastWeek: function () {\n                return (this.day() === 0 || this.day() === 6) ?\n                    '[Último] dddd [às] LT' : // Saturday + Sunday\n                    '[Última] dddd [às] LT'; // Monday - Friday\n            },\n            sameElse: 'L'\n        },\n        relativeTime : {\n            future : 'em %s',\n            past : 'há %s',\n            s : 'poucos segundos',\n            ss : '%d segundos',\n            m : 'um minuto',\n            mm : '%d minutos',\n            h : 'uma hora',\n            hh : '%d horas',\n            d : 'um dia',\n            dd : '%d dias',\n            M : 'um mês',\n            MM : '%d meses',\n            y : 'um ano',\n            yy : '%d anos'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}º/,\n        ordinal : '%dº'\n    });\n\n    return ptBr;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var pt = moment.defineLocale('pt', {\n        months : 'janeiro_fevereiro_março_abril_maio_junho_julho_agosto_setembro_outubro_novembro_dezembro'.split('_'),\n        monthsShort : 'jan_fev_mar_abr_mai_jun_jul_ago_set_out_nov_dez'.split('_'),\n        weekdays : 'Domingo_Segunda-feira_Terça-feira_Quarta-feira_Quinta-feira_Sexta-feira_Sábado'.split('_'),\n        weekdaysShort : 'Dom_Seg_Ter_Qua_Qui_Sex_Sáb'.split('_'),\n        weekdaysMin : 'Do_2ª_3ª_4ª_5ª_6ª_Sá'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD/MM/YYYY',\n            LL : 'D [de] MMMM [de] YYYY',\n            LLL : 'D [de] MMMM [de] YYYY HH:mm',\n            LLLL : 'dddd, D [de] MMMM [de] YYYY HH:mm'\n        },\n        calendar : {\n            sameDay: '[Hoje às] LT',\n            nextDay: '[Amanhã às] LT',\n            nextWeek: 'dddd [às] LT',\n            lastDay: '[Ontem às] LT',\n            lastWeek: function () {\n                return (this.day() === 0 || this.day() === 6) ?\n                    '[Último] dddd [às] LT' : // Saturday + Sunday\n                    '[Última] dddd [às] LT'; // Monday - Friday\n            },\n            sameElse: 'L'\n        },\n        relativeTime : {\n            future : 'em %s',\n            past : 'há %s',\n            s : 'segundos',\n            ss : '%d segundos',\n            m : 'um minuto',\n            mm : '%d minutos',\n            h : 'uma hora',\n            hh : '%d horas',\n            d : 'um dia',\n            dd : '%d dias',\n            M : 'um mês',\n            MM : '%d meses',\n            y : 'um ano',\n            yy : '%d anos'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}º/,\n        ordinal : '%dº',\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return pt;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    function relativeTimeWithPlural(number, withoutSuffix, key) {\n        var format = {\n                'ss': 'secunde',\n                'mm': 'minute',\n                'hh': 'ore',\n                'dd': 'zile',\n                'MM': 'luni',\n                'yy': 'ani'\n            },\n            separator = ' ';\n        if (number % 100 >= 20 || (number >= 100 && number % 100 === 0)) {\n            separator = ' de ';\n        }\n        return number + separator + format[key];\n    }\n\n    var ro = moment.defineLocale('ro', {\n        months : 'ianuarie_februarie_martie_aprilie_mai_iunie_iulie_august_septembrie_octombrie_noiembrie_decembrie'.split('_'),\n        monthsShort : 'ian._febr._mart._apr._mai_iun._iul._aug._sept._oct._nov._dec.'.split('_'),\n        monthsParseExact: true,\n        weekdays : 'duminică_luni_marți_miercuri_joi_vineri_sâmbătă'.split('_'),\n        weekdaysShort : 'Dum_Lun_Mar_Mie_Joi_Vin_Sâm'.split('_'),\n        weekdaysMin : 'Du_Lu_Ma_Mi_Jo_Vi_Sâ'.split('_'),\n        longDateFormat : {\n            LT : 'H:mm',\n            LTS : 'H:mm:ss',\n            L : 'DD.MM.YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY H:mm',\n            LLLL : 'dddd, D MMMM YYYY H:mm'\n        },\n        calendar : {\n            sameDay: '[azi la] LT',\n            nextDay: '[mâine la] LT',\n            nextWeek: 'dddd [la] LT',\n            lastDay: '[ieri la] LT',\n            lastWeek: '[fosta] dddd [la] LT',\n            sameElse: 'L'\n        },\n        relativeTime : {\n            future : 'peste %s',\n            past : '%s în urmă',\n            s : 'câteva secunde',\n            ss : relativeTimeWithPlural,\n            m : 'un minut',\n            mm : relativeTimeWithPlural,\n            h : 'o oră',\n            hh : relativeTimeWithPlural,\n            d : 'o zi',\n            dd : relativeTimeWithPlural,\n            M : 'o lună',\n            MM : relativeTimeWithPlural,\n            y : 'un an',\n            yy : relativeTimeWithPlural\n        },\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 7  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return ro;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    function plural(word, num) {\n        var forms = word.split('_');\n        return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]);\n    }\n    function relativeTimeWithPlural(number, withoutSuffix, key) {\n        var format = {\n            'ss': withoutSuffix ? 'секунда_секунды_секунд' : 'секунду_секунды_секунд',\n            'mm': withoutSuffix ? 'минута_минуты_минут' : 'минуту_минуты_минут',\n            'hh': 'час_часа_часов',\n            'dd': 'день_дня_дней',\n            'MM': 'месяц_месяца_месяцев',\n            'yy': 'год_года_лет'\n        };\n        if (key === 'm') {\n            return withoutSuffix ? 'минута' : 'минуту';\n        }\n        else {\n            return number + ' ' + plural(format[key], +number);\n        }\n    }\n    var monthsParse = [/^янв/i, /^фев/i, /^мар/i, /^апр/i, /^ма[йя]/i, /^июн/i, /^июл/i, /^авг/i, /^сен/i, /^окт/i, /^ноя/i, /^дек/i];\n\n    // http://new.gramota.ru/spravka/rules/139-prop : § 103\n    // Сокращения месяцев: http://new.gramota.ru/spravka/buro/search-answer?s=242637\n    // CLDR data:          http://www.unicode.org/cldr/charts/28/summary/ru.html#1753\n    var ru = moment.defineLocale('ru', {\n        months : {\n            format: 'января_февраля_марта_апреля_мая_июня_июля_августа_сентября_октября_ноября_декабря'.split('_'),\n            standalone: 'январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь'.split('_')\n        },\n        monthsShort : {\n            // по CLDR именно \"июл.\" и \"июн.\", но какой смысл менять букву на точку ?\n            format: 'янв._февр._мар._апр._мая_июня_июля_авг._сент._окт._нояб._дек.'.split('_'),\n            standalone: 'янв._февр._март_апр._май_июнь_июль_авг._сент._окт._нояб._дек.'.split('_')\n        },\n        weekdays : {\n            standalone: 'воскресенье_понедельник_вторник_среда_четверг_пятница_суббота'.split('_'),\n            format: 'воскресенье_понедельник_вторник_среду_четверг_пятницу_субботу'.split('_'),\n            isFormat: /\\[ ?[Вв] ?(?:прошлую|следующую|эту)? ?\\] ?dddd/\n        },\n        weekdaysShort : 'вс_пн_вт_ср_чт_пт_сб'.split('_'),\n        weekdaysMin : 'вс_пн_вт_ср_чт_пт_сб'.split('_'),\n        monthsParse : monthsParse,\n        longMonthsParse : monthsParse,\n        shortMonthsParse : monthsParse,\n\n        // полные названия с падежами, по три буквы, для некоторых, по 4 буквы, сокращения с точкой и без точки\n        monthsRegex: /^(январ[ья]|янв\\.?|феврал[ья]|февр?\\.?|марта?|мар\\.?|апрел[ья]|апр\\.?|ма[йя]|июн[ья]|июн\\.?|июл[ья]|июл\\.?|августа?|авг\\.?|сентябр[ья]|сент?\\.?|октябр[ья]|окт\\.?|ноябр[ья]|нояб?\\.?|декабр[ья]|дек\\.?)/i,\n\n        // копия предыдущего\n        monthsShortRegex: /^(январ[ья]|янв\\.?|феврал[ья]|февр?\\.?|марта?|мар\\.?|апрел[ья]|апр\\.?|ма[йя]|июн[ья]|июн\\.?|июл[ья]|июл\\.?|августа?|авг\\.?|сентябр[ья]|сент?\\.?|октябр[ья]|окт\\.?|ноябр[ья]|нояб?\\.?|декабр[ья]|дек\\.?)/i,\n\n        // полные названия с падежами\n        monthsStrictRegex: /^(январ[яь]|феврал[яь]|марта?|апрел[яь]|ма[яй]|июн[яь]|июл[яь]|августа?|сентябр[яь]|октябр[яь]|ноябр[яь]|декабр[яь])/i,\n\n        // Выражение, которое соотвествует только сокращённым формам\n        monthsShortStrictRegex: /^(янв\\.|февр?\\.|мар[т.]|апр\\.|ма[яй]|июн[ья.]|июл[ья.]|авг\\.|сент?\\.|окт\\.|нояб?\\.|дек\\.)/i,\n        longDateFormat : {\n            LT : 'H:mm',\n            LTS : 'H:mm:ss',\n            L : 'DD.MM.YYYY',\n            LL : 'D MMMM YYYY г.',\n            LLL : 'D MMMM YYYY г., H:mm',\n            LLLL : 'dddd, D MMMM YYYY г., H:mm'\n        },\n        calendar : {\n            sameDay: '[Сегодня, в] LT',\n            nextDay: '[Завтра, в] LT',\n            lastDay: '[Вчера, в] LT',\n            nextWeek: function (now) {\n                if (now.week() !== this.week()) {\n                    switch (this.day()) {\n                        case 0:\n                            return '[В следующее] dddd, [в] LT';\n                        case 1:\n                        case 2:\n                        case 4:\n                            return '[В следующий] dddd, [в] LT';\n                        case 3:\n                        case 5:\n                        case 6:\n                            return '[В следующую] dddd, [в] LT';\n                    }\n                } else {\n                    if (this.day() === 2) {\n                        return '[Во] dddd, [в] LT';\n                    } else {\n                        return '[В] dddd, [в] LT';\n                    }\n                }\n            },\n            lastWeek: function (now) {\n                if (now.week() !== this.week()) {\n                    switch (this.day()) {\n                        case 0:\n                            return '[В прошлое] dddd, [в] LT';\n                        case 1:\n                        case 2:\n                        case 4:\n                            return '[В прошлый] dddd, [в] LT';\n                        case 3:\n                        case 5:\n                        case 6:\n                            return '[В прошлую] dddd, [в] LT';\n                    }\n                } else {\n                    if (this.day() === 2) {\n                        return '[Во] dddd, [в] LT';\n                    } else {\n                        return '[В] dddd, [в] LT';\n                    }\n                }\n            },\n            sameElse: 'L'\n        },\n        relativeTime : {\n            future : 'через %s',\n            past : '%s назад',\n            s : 'несколько секунд',\n            ss : relativeTimeWithPlural,\n            m : relativeTimeWithPlural,\n            mm : relativeTimeWithPlural,\n            h : 'час',\n            hh : relativeTimeWithPlural,\n            d : 'день',\n            dd : relativeTimeWithPlural,\n            M : 'месяц',\n            MM : relativeTimeWithPlural,\n            y : 'год',\n            yy : relativeTimeWithPlural\n        },\n        meridiemParse: /ночи|утра|дня|вечера/i,\n        isPM : function (input) {\n            return /^(дня|вечера)$/.test(input);\n        },\n        meridiem : function (hour, minute, isLower) {\n            if (hour < 4) {\n                return 'ночи';\n            } else if (hour < 12) {\n                return 'утра';\n            } else if (hour < 17) {\n                return 'дня';\n            } else {\n                return 'вечера';\n            }\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}-(й|го|я)/,\n        ordinal: function (number, period) {\n            switch (period) {\n                case 'M':\n                case 'd':\n                case 'DDD':\n                    return number + '-й';\n                case 'D':\n                    return number + '-го';\n                case 'w':\n                case 'W':\n                    return number + '-я';\n                default:\n                    return number;\n            }\n        },\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return ru;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var months = [\n        'جنوري',\n        'فيبروري',\n        'مارچ',\n        'اپريل',\n        'مئي',\n        'جون',\n        'جولاءِ',\n        'آگسٽ',\n        'سيپٽمبر',\n        'آڪٽوبر',\n        'نومبر',\n        'ڊسمبر'\n    ];\n    var days = [\n        'آچر',\n        'سومر',\n        'اڱارو',\n        'اربع',\n        'خميس',\n        'جمع',\n        'ڇنڇر'\n    ];\n\n    var sd = moment.defineLocale('sd', {\n        months : months,\n        monthsShort : months,\n        weekdays : days,\n        weekdaysShort : days,\n        weekdaysMin : days,\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY HH:mm',\n            LLLL : 'dddd، D MMMM YYYY HH:mm'\n        },\n        meridiemParse: /صبح|شام/,\n        isPM : function (input) {\n            return 'شام' === input;\n        },\n        meridiem : function (hour, minute, isLower) {\n            if (hour < 12) {\n                return 'صبح';\n            }\n            return 'شام';\n        },\n        calendar : {\n            sameDay : '[اڄ] LT',\n            nextDay : '[سڀاڻي] LT',\n            nextWeek : 'dddd [اڳين هفتي تي] LT',\n            lastDay : '[ڪالهه] LT',\n            lastWeek : '[گزريل هفتي] dddd [تي] LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : '%s پوء',\n            past : '%s اڳ',\n            s : 'چند سيڪنڊ',\n            ss : '%d سيڪنڊ',\n            m : 'هڪ منٽ',\n            mm : '%d منٽ',\n            h : 'هڪ ڪلاڪ',\n            hh : '%d ڪلاڪ',\n            d : 'هڪ ڏينهن',\n            dd : '%d ڏينهن',\n            M : 'هڪ مهينو',\n            MM : '%d مهينا',\n            y : 'هڪ سال',\n            yy : '%d سال'\n        },\n        preparse: function (string) {\n            return string.replace(/،/g, ',');\n        },\n        postformat: function (string) {\n            return string.replace(/,/g, '،');\n        },\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return sd;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var se = moment.defineLocale('se', {\n        months : 'ođđajagemánnu_guovvamánnu_njukčamánnu_cuoŋománnu_miessemánnu_geassemánnu_suoidnemánnu_borgemánnu_čakčamánnu_golggotmánnu_skábmamánnu_juovlamánnu'.split('_'),\n        monthsShort : 'ođđj_guov_njuk_cuo_mies_geas_suoi_borg_čakč_golg_skáb_juov'.split('_'),\n        weekdays : 'sotnabeaivi_vuossárga_maŋŋebárga_gaskavahkku_duorastat_bearjadat_lávvardat'.split('_'),\n        weekdaysShort : 'sotn_vuos_maŋ_gask_duor_bear_láv'.split('_'),\n        weekdaysMin : 's_v_m_g_d_b_L'.split('_'),\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD.MM.YYYY',\n            LL : 'MMMM D. [b.] YYYY',\n            LLL : 'MMMM D. [b.] YYYY [ti.] HH:mm',\n            LLLL : 'dddd, MMMM D. [b.] YYYY [ti.] HH:mm'\n        },\n        calendar : {\n            sameDay: '[otne ti] LT',\n            nextDay: '[ihttin ti] LT',\n            nextWeek: 'dddd [ti] LT',\n            lastDay: '[ikte ti] LT',\n            lastWeek: '[ovddit] dddd [ti] LT',\n            sameElse: 'L'\n        },\n        relativeTime : {\n            future : '%s geažes',\n            past : 'maŋit %s',\n            s : 'moadde sekunddat',\n            ss: '%d sekunddat',\n            m : 'okta minuhta',\n            mm : '%d minuhtat',\n            h : 'okta diimmu',\n            hh : '%d diimmut',\n            d : 'okta beaivi',\n            dd : '%d beaivvit',\n            M : 'okta mánnu',\n            MM : '%d mánut',\n            y : 'okta jahki',\n            yy : '%d jagit'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}\\./,\n        ordinal : '%d.',\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return se;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    /*jshint -W100*/\n    var si = moment.defineLocale('si', {\n        months : 'ජනවාරි_පෙබරවාරි_මාර්තු_අප්‍රේල්_මැයි_ජූනි_ජූලි_අගෝස්තු_සැප්තැම්බර්_ඔක්තෝබර්_නොවැම්බර්_දෙසැම්බර්'.split('_'),\n        monthsShort : 'ජන_පෙබ_මාර්_අප්_මැයි_ජූනි_ජූලි_අගෝ_සැප්_ඔක්_නොවැ_දෙසැ'.split('_'),\n        weekdays : 'ඉරිදා_සඳුදා_අඟහරුවාදා_බදාදා_බ්‍රහස්පතින්දා_සිකුරාදා_සෙනසුරාදා'.split('_'),\n        weekdaysShort : 'ඉරි_සඳු_අඟ_බදා_බ්‍රහ_සිකු_සෙන'.split('_'),\n        weekdaysMin : 'ඉ_ස_අ_බ_බ්‍ර_සි_සෙ'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat : {\n            LT : 'a h:mm',\n            LTS : 'a h:mm:ss',\n            L : 'YYYY/MM/DD',\n            LL : 'YYYY MMMM D',\n            LLL : 'YYYY MMMM D, a h:mm',\n            LLLL : 'YYYY MMMM D [වැනි] dddd, a h:mm:ss'\n        },\n        calendar : {\n            sameDay : '[අද] LT[ට]',\n            nextDay : '[හෙට] LT[ට]',\n            nextWeek : 'dddd LT[ට]',\n            lastDay : '[ඊයේ] LT[ට]',\n            lastWeek : '[පසුගිය] dddd LT[ට]',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : '%sකින්',\n            past : '%sකට පෙර',\n            s : 'තත්පර කිහිපය',\n            ss : 'තත්පර %d',\n            m : 'මිනිත්තුව',\n            mm : 'මිනිත්තු %d',\n            h : 'පැය',\n            hh : 'පැය %d',\n            d : 'දිනය',\n            dd : 'දින %d',\n            M : 'මාසය',\n            MM : 'මාස %d',\n            y : 'වසර',\n            yy : 'වසර %d'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2} වැනි/,\n        ordinal : function (number) {\n            return number + ' වැනි';\n        },\n        meridiemParse : /පෙර වරු|පස් වරු|පෙ.ව|ප.ව./,\n        isPM : function (input) {\n            return input === 'ප.ව.' || input === 'පස් වරු';\n        },\n        meridiem : function (hours, minutes, isLower) {\n            if (hours > 11) {\n                return isLower ? 'ප.ව.' : 'පස් වරු';\n            } else {\n                return isLower ? 'පෙ.ව.' : 'පෙර වරු';\n            }\n        }\n    });\n\n    return si;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var months = 'január_február_marec_apríl_máj_jún_júl_august_september_október_november_december'.split('_'),\n        monthsShort = 'jan_feb_mar_apr_máj_jún_júl_aug_sep_okt_nov_dec'.split('_');\n    function plural(n) {\n        return (n > 1) && (n < 5);\n    }\n    function translate(number, withoutSuffix, key, isFuture) {\n        var result = number + ' ';\n        switch (key) {\n            case 's':  // a few seconds / in a few seconds / a few seconds ago\n                return (withoutSuffix || isFuture) ? 'pár sekúnd' : 'pár sekundami';\n            case 'ss': // 9 seconds / in 9 seconds / 9 seconds ago\n                if (withoutSuffix || isFuture) {\n                    return result + (plural(number) ? 'sekundy' : 'sekúnd');\n                } else {\n                    return result + 'sekundami';\n                }\n                break;\n            case 'm':  // a minute / in a minute / a minute ago\n                return withoutSuffix ? 'minúta' : (isFuture ? 'minútu' : 'minútou');\n            case 'mm': // 9 minutes / in 9 minutes / 9 minutes ago\n                if (withoutSuffix || isFuture) {\n                    return result + (plural(number) ? 'minúty' : 'minút');\n                } else {\n                    return result + 'minútami';\n                }\n                break;\n            case 'h':  // an hour / in an hour / an hour ago\n                return withoutSuffix ? 'hodina' : (isFuture ? 'hodinu' : 'hodinou');\n            case 'hh': // 9 hours / in 9 hours / 9 hours ago\n                if (withoutSuffix || isFuture) {\n                    return result + (plural(number) ? 'hodiny' : 'hodín');\n                } else {\n                    return result + 'hodinami';\n                }\n                break;\n            case 'd':  // a day / in a day / a day ago\n                return (withoutSuffix || isFuture) ? 'deň' : 'dňom';\n            case 'dd': // 9 days / in 9 days / 9 days ago\n                if (withoutSuffix || isFuture) {\n                    return result + (plural(number) ? 'dni' : 'dní');\n                } else {\n                    return result + 'dňami';\n                }\n                break;\n            case 'M':  // a month / in a month / a month ago\n                return (withoutSuffix || isFuture) ? 'mesiac' : 'mesiacom';\n            case 'MM': // 9 months / in 9 months / 9 months ago\n                if (withoutSuffix || isFuture) {\n                    return result + (plural(number) ? 'mesiace' : 'mesiacov');\n                } else {\n                    return result + 'mesiacmi';\n                }\n                break;\n            case 'y':  // a year / in a year / a year ago\n                return (withoutSuffix || isFuture) ? 'rok' : 'rokom';\n            case 'yy': // 9 years / in 9 years / 9 years ago\n                if (withoutSuffix || isFuture) {\n                    return result + (plural(number) ? 'roky' : 'rokov');\n                } else {\n                    return result + 'rokmi';\n                }\n                break;\n        }\n    }\n\n    var sk = moment.defineLocale('sk', {\n        months : months,\n        monthsShort : monthsShort,\n        weekdays : 'nedeľa_pondelok_utorok_streda_štvrtok_piatok_sobota'.split('_'),\n        weekdaysShort : 'ne_po_ut_st_št_pi_so'.split('_'),\n        weekdaysMin : 'ne_po_ut_st_št_pi_so'.split('_'),\n        longDateFormat : {\n            LT: 'H:mm',\n            LTS : 'H:mm:ss',\n            L : 'DD.MM.YYYY',\n            LL : 'D. MMMM YYYY',\n            LLL : 'D. MMMM YYYY H:mm',\n            LLLL : 'dddd D. MMMM YYYY H:mm'\n        },\n        calendar : {\n            sameDay: '[dnes o] LT',\n            nextDay: '[zajtra o] LT',\n            nextWeek: function () {\n                switch (this.day()) {\n                    case 0:\n                        return '[v nedeľu o] LT';\n                    case 1:\n                    case 2:\n                        return '[v] dddd [o] LT';\n                    case 3:\n                        return '[v stredu o] LT';\n                    case 4:\n                        return '[vo štvrtok o] LT';\n                    case 5:\n                        return '[v piatok o] LT';\n                    case 6:\n                        return '[v sobotu o] LT';\n                }\n            },\n            lastDay: '[včera o] LT',\n            lastWeek: function () {\n                switch (this.day()) {\n                    case 0:\n                        return '[minulú nedeľu o] LT';\n                    case 1:\n                    case 2:\n                        return '[minulý] dddd [o] LT';\n                    case 3:\n                        return '[minulú stredu o] LT';\n                    case 4:\n                    case 5:\n                        return '[minulý] dddd [o] LT';\n                    case 6:\n                        return '[minulú sobotu o] LT';\n                }\n            },\n            sameElse: 'L'\n        },\n        relativeTime : {\n            future : 'za %s',\n            past : 'pred %s',\n            s : translate,\n            ss : translate,\n            m : translate,\n            mm : translate,\n            h : translate,\n            hh : translate,\n            d : translate,\n            dd : translate,\n            M : translate,\n            MM : translate,\n            y : translate,\n            yy : translate\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}\\./,\n        ordinal : '%d.',\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return sk;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    function processRelativeTime(number, withoutSuffix, key, isFuture) {\n        var result = number + ' ';\n        switch (key) {\n            case 's':\n                return withoutSuffix || isFuture ? 'nekaj sekund' : 'nekaj sekundami';\n            case 'ss':\n                if (number === 1) {\n                    result += withoutSuffix ? 'sekundo' : 'sekundi';\n                } else if (number === 2) {\n                    result += withoutSuffix || isFuture ? 'sekundi' : 'sekundah';\n                } else if (number < 5) {\n                    result += withoutSuffix || isFuture ? 'sekunde' : 'sekundah';\n                } else {\n                    result += withoutSuffix || isFuture ? 'sekund' : 'sekund';\n                }\n                return result;\n            case 'm':\n                return withoutSuffix ? 'ena minuta' : 'eno minuto';\n            case 'mm':\n                if (number === 1) {\n                    result += withoutSuffix ? 'minuta' : 'minuto';\n                } else if (number === 2) {\n                    result += withoutSuffix || isFuture ? 'minuti' : 'minutama';\n                } else if (number < 5) {\n                    result += withoutSuffix || isFuture ? 'minute' : 'minutami';\n                } else {\n                    result += withoutSuffix || isFuture ? 'minut' : 'minutami';\n                }\n                return result;\n            case 'h':\n                return withoutSuffix ? 'ena ura' : 'eno uro';\n            case 'hh':\n                if (number === 1) {\n                    result += withoutSuffix ? 'ura' : 'uro';\n                } else if (number === 2) {\n                    result += withoutSuffix || isFuture ? 'uri' : 'urama';\n                } else if (number < 5) {\n                    result += withoutSuffix || isFuture ? 'ure' : 'urami';\n                } else {\n                    result += withoutSuffix || isFuture ? 'ur' : 'urami';\n                }\n                return result;\n            case 'd':\n                return withoutSuffix || isFuture ? 'en dan' : 'enim dnem';\n            case 'dd':\n                if (number === 1) {\n                    result += withoutSuffix || isFuture ? 'dan' : 'dnem';\n                } else if (number === 2) {\n                    result += withoutSuffix || isFuture ? 'dni' : 'dnevoma';\n                } else {\n                    result += withoutSuffix || isFuture ? 'dni' : 'dnevi';\n                }\n                return result;\n            case 'M':\n                return withoutSuffix || isFuture ? 'en mesec' : 'enim mesecem';\n            case 'MM':\n                if (number === 1) {\n                    result += withoutSuffix || isFuture ? 'mesec' : 'mesecem';\n                } else if (number === 2) {\n                    result += withoutSuffix || isFuture ? 'meseca' : 'mesecema';\n                } else if (number < 5) {\n                    result += withoutSuffix || isFuture ? 'mesece' : 'meseci';\n                } else {\n                    result += withoutSuffix || isFuture ? 'mesecev' : 'meseci';\n                }\n                return result;\n            case 'y':\n                return withoutSuffix || isFuture ? 'eno leto' : 'enim letom';\n            case 'yy':\n                if (number === 1) {\n                    result += withoutSuffix || isFuture ? 'leto' : 'letom';\n                } else if (number === 2) {\n                    result += withoutSuffix || isFuture ? 'leti' : 'letoma';\n                } else if (number < 5) {\n                    result += withoutSuffix || isFuture ? 'leta' : 'leti';\n                } else {\n                    result += withoutSuffix || isFuture ? 'let' : 'leti';\n                }\n                return result;\n        }\n    }\n\n    var sl = moment.defineLocale('sl', {\n        months : 'januar_februar_marec_april_maj_junij_julij_avgust_september_oktober_november_december'.split('_'),\n        monthsShort : 'jan._feb._mar._apr._maj._jun._jul._avg._sep._okt._nov._dec.'.split('_'),\n        monthsParseExact: true,\n        weekdays : 'nedelja_ponedeljek_torek_sreda_četrtek_petek_sobota'.split('_'),\n        weekdaysShort : 'ned._pon._tor._sre._čet._pet._sob.'.split('_'),\n        weekdaysMin : 'ne_po_to_sr_če_pe_so'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat : {\n            LT : 'H:mm',\n            LTS : 'H:mm:ss',\n            L : 'DD.MM.YYYY',\n            LL : 'D. MMMM YYYY',\n            LLL : 'D. MMMM YYYY H:mm',\n            LLLL : 'dddd, D. MMMM YYYY H:mm'\n        },\n        calendar : {\n            sameDay  : '[danes ob] LT',\n            nextDay  : '[jutri ob] LT',\n\n            nextWeek : function () {\n                switch (this.day()) {\n                    case 0:\n                        return '[v] [nedeljo] [ob] LT';\n                    case 3:\n                        return '[v] [sredo] [ob] LT';\n                    case 6:\n                        return '[v] [soboto] [ob] LT';\n                    case 1:\n                    case 2:\n                    case 4:\n                    case 5:\n                        return '[v] dddd [ob] LT';\n                }\n            },\n            lastDay  : '[včeraj ob] LT',\n            lastWeek : function () {\n                switch (this.day()) {\n                    case 0:\n                        return '[prejšnjo] [nedeljo] [ob] LT';\n                    case 3:\n                        return '[prejšnjo] [sredo] [ob] LT';\n                    case 6:\n                        return '[prejšnjo] [soboto] [ob] LT';\n                    case 1:\n                    case 2:\n                    case 4:\n                    case 5:\n                        return '[prejšnji] dddd [ob] LT';\n                }\n            },\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'čez %s',\n            past   : 'pred %s',\n            s      : processRelativeTime,\n            ss     : processRelativeTime,\n            m      : processRelativeTime,\n            mm     : processRelativeTime,\n            h      : processRelativeTime,\n            hh     : processRelativeTime,\n            d      : processRelativeTime,\n            dd     : processRelativeTime,\n            M      : processRelativeTime,\n            MM     : processRelativeTime,\n            y      : processRelativeTime,\n            yy     : processRelativeTime\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}\\./,\n        ordinal : '%d.',\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 7  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return sl;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var sq = moment.defineLocale('sq', {\n        months : 'Janar_Shkurt_Mars_Prill_Maj_Qershor_Korrik_Gusht_Shtator_Tetor_Nëntor_Dhjetor'.split('_'),\n        monthsShort : 'Jan_Shk_Mar_Pri_Maj_Qer_Kor_Gus_Sht_Tet_Nën_Dhj'.split('_'),\n        weekdays : 'E Diel_E Hënë_E Martë_E Mërkurë_E Enjte_E Premte_E Shtunë'.split('_'),\n        weekdaysShort : 'Die_Hën_Mar_Mër_Enj_Pre_Sht'.split('_'),\n        weekdaysMin : 'D_H_Ma_Më_E_P_Sh'.split('_'),\n        weekdaysParseExact : true,\n        meridiemParse: /PD|MD/,\n        isPM: function (input) {\n            return input.charAt(0) === 'M';\n        },\n        meridiem : function (hours, minutes, isLower) {\n            return hours < 12 ? 'PD' : 'MD';\n        },\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY HH:mm',\n            LLLL : 'dddd, D MMMM YYYY HH:mm'\n        },\n        calendar : {\n            sameDay : '[Sot në] LT',\n            nextDay : '[Nesër në] LT',\n            nextWeek : 'dddd [në] LT',\n            lastDay : '[Dje në] LT',\n            lastWeek : 'dddd [e kaluar në] LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'në %s',\n            past : '%s më parë',\n            s : 'disa sekonda',\n            ss : '%d sekonda',\n            m : 'një minutë',\n            mm : '%d minuta',\n            h : 'një orë',\n            hh : '%d orë',\n            d : 'një ditë',\n            dd : '%d ditë',\n            M : 'një muaj',\n            MM : '%d muaj',\n            y : 'një vit',\n            yy : '%d vite'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}\\./,\n        ordinal : '%d.',\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return sq;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var translator = {\n        words: { //Different grammatical cases\n            ss: ['секунда', 'секунде', 'секунди'],\n            m: ['један минут', 'једне минуте'],\n            mm: ['минут', 'минуте', 'минута'],\n            h: ['један сат', 'једног сата'],\n            hh: ['сат', 'сата', 'сати'],\n            dd: ['дан', 'дана', 'дана'],\n            MM: ['месец', 'месеца', 'месеци'],\n            yy: ['година', 'године', 'година']\n        },\n        correctGrammaticalCase: function (number, wordKey) {\n            return number === 1 ? wordKey[0] : (number >= 2 && number <= 4 ? wordKey[1] : wordKey[2]);\n        },\n        translate: function (number, withoutSuffix, key) {\n            var wordKey = translator.words[key];\n            if (key.length === 1) {\n                return withoutSuffix ? wordKey[0] : wordKey[1];\n            } else {\n                return number + ' ' + translator.correctGrammaticalCase(number, wordKey);\n            }\n        }\n    };\n\n    var srCyrl = moment.defineLocale('sr-cyrl', {\n        months: 'јануар_фебруар_март_април_мај_јун_јул_август_септембар_октобар_новембар_децембар'.split('_'),\n        monthsShort: 'јан._феб._мар._апр._мај_јун_јул_авг._сеп._окт._нов._дец.'.split('_'),\n        monthsParseExact: true,\n        weekdays: 'недеља_понедељак_уторак_среда_четвртак_петак_субота'.split('_'),\n        weekdaysShort: 'нед._пон._уто._сре._чет._пет._суб.'.split('_'),\n        weekdaysMin: 'не_по_ут_ср_че_пе_су'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat: {\n            LT: 'H:mm',\n            LTS : 'H:mm:ss',\n            L: 'DD.MM.YYYY',\n            LL: 'D. MMMM YYYY',\n            LLL: 'D. MMMM YYYY H:mm',\n            LLLL: 'dddd, D. MMMM YYYY H:mm'\n        },\n        calendar: {\n            sameDay: '[данас у] LT',\n            nextDay: '[сутра у] LT',\n            nextWeek: function () {\n                switch (this.day()) {\n                    case 0:\n                        return '[у] [недељу] [у] LT';\n                    case 3:\n                        return '[у] [среду] [у] LT';\n                    case 6:\n                        return '[у] [суботу] [у] LT';\n                    case 1:\n                    case 2:\n                    case 4:\n                    case 5:\n                        return '[у] dddd [у] LT';\n                }\n            },\n            lastDay  : '[јуче у] LT',\n            lastWeek : function () {\n                var lastWeekDays = [\n                    '[прошле] [недеље] [у] LT',\n                    '[прошлог] [понедељка] [у] LT',\n                    '[прошлог] [уторка] [у] LT',\n                    '[прошле] [среде] [у] LT',\n                    '[прошлог] [четвртка] [у] LT',\n                    '[прошлог] [петка] [у] LT',\n                    '[прошле] [суботе] [у] LT'\n                ];\n                return lastWeekDays[this.day()];\n            },\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'за %s',\n            past   : 'пре %s',\n            s      : 'неколико секунди',\n            ss     : translator.translate,\n            m      : translator.translate,\n            mm     : translator.translate,\n            h      : translator.translate,\n            hh     : translator.translate,\n            d      : 'дан',\n            dd     : translator.translate,\n            M      : 'месец',\n            MM     : translator.translate,\n            y      : 'годину',\n            yy     : translator.translate\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}\\./,\n        ordinal : '%d.',\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 7  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return srCyrl;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var translator = {\n        words: { //Different grammatical cases\n            ss: ['sekunda', 'sekunde', 'sekundi'],\n            m: ['jedan minut', 'jedne minute'],\n            mm: ['minut', 'minute', 'minuta'],\n            h: ['jedan sat', 'jednog sata'],\n            hh: ['sat', 'sata', 'sati'],\n            dd: ['dan', 'dana', 'dana'],\n            MM: ['mesec', 'meseca', 'meseci'],\n            yy: ['godina', 'godine', 'godina']\n        },\n        correctGrammaticalCase: function (number, wordKey) {\n            return number === 1 ? wordKey[0] : (number >= 2 && number <= 4 ? wordKey[1] : wordKey[2]);\n        },\n        translate: function (number, withoutSuffix, key) {\n            var wordKey = translator.words[key];\n            if (key.length === 1) {\n                return withoutSuffix ? wordKey[0] : wordKey[1];\n            } else {\n                return number + ' ' + translator.correctGrammaticalCase(number, wordKey);\n            }\n        }\n    };\n\n    var sr = moment.defineLocale('sr', {\n        months: 'januar_februar_mart_april_maj_jun_jul_avgust_septembar_oktobar_novembar_decembar'.split('_'),\n        monthsShort: 'jan._feb._mar._apr._maj_jun_jul_avg._sep._okt._nov._dec.'.split('_'),\n        monthsParseExact: true,\n        weekdays: 'nedelja_ponedeljak_utorak_sreda_četvrtak_petak_subota'.split('_'),\n        weekdaysShort: 'ned._pon._uto._sre._čet._pet._sub.'.split('_'),\n        weekdaysMin: 'ne_po_ut_sr_če_pe_su'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat: {\n            LT: 'H:mm',\n            LTS : 'H:mm:ss',\n            L: 'DD.MM.YYYY',\n            LL: 'D. MMMM YYYY',\n            LLL: 'D. MMMM YYYY H:mm',\n            LLLL: 'dddd, D. MMMM YYYY H:mm'\n        },\n        calendar: {\n            sameDay: '[danas u] LT',\n            nextDay: '[sutra u] LT',\n            nextWeek: function () {\n                switch (this.day()) {\n                    case 0:\n                        return '[u] [nedelju] [u] LT';\n                    case 3:\n                        return '[u] [sredu] [u] LT';\n                    case 6:\n                        return '[u] [subotu] [u] LT';\n                    case 1:\n                    case 2:\n                    case 4:\n                    case 5:\n                        return '[u] dddd [u] LT';\n                }\n            },\n            lastDay  : '[juče u] LT',\n            lastWeek : function () {\n                var lastWeekDays = [\n                    '[prošle] [nedelje] [u] LT',\n                    '[prošlog] [ponedeljka] [u] LT',\n                    '[prošlog] [utorka] [u] LT',\n                    '[prošle] [srede] [u] LT',\n                    '[prošlog] [četvrtka] [u] LT',\n                    '[prošlog] [petka] [u] LT',\n                    '[prošle] [subote] [u] LT'\n                ];\n                return lastWeekDays[this.day()];\n            },\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'za %s',\n            past   : 'pre %s',\n            s      : 'nekoliko sekundi',\n            ss     : translator.translate,\n            m      : translator.translate,\n            mm     : translator.translate,\n            h      : translator.translate,\n            hh     : translator.translate,\n            d      : 'dan',\n            dd     : translator.translate,\n            M      : 'mesec',\n            MM     : translator.translate,\n            y      : 'godinu',\n            yy     : translator.translate\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}\\./,\n        ordinal : '%d.',\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 7  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return sr;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var ss = moment.defineLocale('ss', {\n        months : \"Bhimbidvwane_Indlovana_Indlov'lenkhulu_Mabasa_Inkhwekhweti_Inhlaba_Kholwane_Ingci_Inyoni_Imphala_Lweti_Ingongoni\".split('_'),\n        monthsShort : 'Bhi_Ina_Inu_Mab_Ink_Inh_Kho_Igc_Iny_Imp_Lwe_Igo'.split('_'),\n        weekdays : 'Lisontfo_Umsombuluko_Lesibili_Lesitsatfu_Lesine_Lesihlanu_Umgcibelo'.split('_'),\n        weekdaysShort : 'Lis_Umb_Lsb_Les_Lsi_Lsh_Umg'.split('_'),\n        weekdaysMin : 'Li_Us_Lb_Lt_Ls_Lh_Ug'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat : {\n            LT : 'h:mm A',\n            LTS : 'h:mm:ss A',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY h:mm A',\n            LLLL : 'dddd, D MMMM YYYY h:mm A'\n        },\n        calendar : {\n            sameDay : '[Namuhla nga] LT',\n            nextDay : '[Kusasa nga] LT',\n            nextWeek : 'dddd [nga] LT',\n            lastDay : '[Itolo nga] LT',\n            lastWeek : 'dddd [leliphelile] [nga] LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'nga %s',\n            past : 'wenteka nga %s',\n            s : 'emizuzwana lomcane',\n            ss : '%d mzuzwana',\n            m : 'umzuzu',\n            mm : '%d emizuzu',\n            h : 'lihora',\n            hh : '%d emahora',\n            d : 'lilanga',\n            dd : '%d emalanga',\n            M : 'inyanga',\n            MM : '%d tinyanga',\n            y : 'umnyaka',\n            yy : '%d iminyaka'\n        },\n        meridiemParse: /ekuseni|emini|entsambama|ebusuku/,\n        meridiem : function (hours, minutes, isLower) {\n            if (hours < 11) {\n                return 'ekuseni';\n            } else if (hours < 15) {\n                return 'emini';\n            } else if (hours < 19) {\n                return 'entsambama';\n            } else {\n                return 'ebusuku';\n            }\n        },\n        meridiemHour : function (hour, meridiem) {\n            if (hour === 12) {\n                hour = 0;\n            }\n            if (meridiem === 'ekuseni') {\n                return hour;\n            } else if (meridiem === 'emini') {\n                return hour >= 11 ? hour : hour + 12;\n            } else if (meridiem === 'entsambama' || meridiem === 'ebusuku') {\n                if (hour === 0) {\n                    return 0;\n                }\n                return hour + 12;\n            }\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}/,\n        ordinal : '%d',\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return ss;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var sv = moment.defineLocale('sv', {\n        months : 'januari_februari_mars_april_maj_juni_juli_augusti_september_oktober_november_december'.split('_'),\n        monthsShort : 'jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec'.split('_'),\n        weekdays : 'söndag_måndag_tisdag_onsdag_torsdag_fredag_lördag'.split('_'),\n        weekdaysShort : 'sön_mån_tis_ons_tor_fre_lör'.split('_'),\n        weekdaysMin : 'sö_må_ti_on_to_fr_lö'.split('_'),\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'YYYY-MM-DD',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY [kl.] HH:mm',\n            LLLL : 'dddd D MMMM YYYY [kl.] HH:mm',\n            lll : 'D MMM YYYY HH:mm',\n            llll : 'ddd D MMM YYYY HH:mm'\n        },\n        calendar : {\n            sameDay: '[Idag] LT',\n            nextDay: '[Imorgon] LT',\n            lastDay: '[Igår] LT',\n            nextWeek: '[På] dddd LT',\n            lastWeek: '[I] dddd[s] LT',\n            sameElse: 'L'\n        },\n        relativeTime : {\n            future : 'om %s',\n            past : 'för %s sedan',\n            s : 'några sekunder',\n            ss : '%d sekunder',\n            m : 'en minut',\n            mm : '%d minuter',\n            h : 'en timme',\n            hh : '%d timmar',\n            d : 'en dag',\n            dd : '%d dagar',\n            M : 'en månad',\n            MM : '%d månader',\n            y : 'ett år',\n            yy : '%d år'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}(e|a)/,\n        ordinal : function (number) {\n            var b = number % 10,\n                output = (~~(number % 100 / 10) === 1) ? 'e' :\n                (b === 1) ? 'a' :\n                (b === 2) ? 'a' :\n                (b === 3) ? 'e' : 'e';\n            return number + output;\n        },\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return sv;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var sw = moment.defineLocale('sw', {\n        months : 'Januari_Februari_Machi_Aprili_Mei_Juni_Julai_Agosti_Septemba_Oktoba_Novemba_Desemba'.split('_'),\n        monthsShort : 'Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ago_Sep_Okt_Nov_Des'.split('_'),\n        weekdays : 'Jumapili_Jumatatu_Jumanne_Jumatano_Alhamisi_Ijumaa_Jumamosi'.split('_'),\n        weekdaysShort : 'Jpl_Jtat_Jnne_Jtan_Alh_Ijm_Jmos'.split('_'),\n        weekdaysMin : 'J2_J3_J4_J5_Al_Ij_J1'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD.MM.YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY HH:mm',\n            LLLL : 'dddd, D MMMM YYYY HH:mm'\n        },\n        calendar : {\n            sameDay : '[leo saa] LT',\n            nextDay : '[kesho saa] LT',\n            nextWeek : '[wiki ijayo] dddd [saat] LT',\n            lastDay : '[jana] LT',\n            lastWeek : '[wiki iliyopita] dddd [saat] LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : '%s baadaye',\n            past : 'tokea %s',\n            s : 'hivi punde',\n            ss : 'sekunde %d',\n            m : 'dakika moja',\n            mm : 'dakika %d',\n            h : 'saa limoja',\n            hh : 'masaa %d',\n            d : 'siku moja',\n            dd : 'masiku %d',\n            M : 'mwezi mmoja',\n            MM : 'miezi %d',\n            y : 'mwaka mmoja',\n            yy : 'miaka %d'\n        },\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 7  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return sw;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var symbolMap = {\n        '1': '௧',\n        '2': '௨',\n        '3': '௩',\n        '4': '௪',\n        '5': '௫',\n        '6': '௬',\n        '7': '௭',\n        '8': '௮',\n        '9': '௯',\n        '0': '௦'\n    }, numberMap = {\n        '௧': '1',\n        '௨': '2',\n        '௩': '3',\n        '௪': '4',\n        '௫': '5',\n        '௬': '6',\n        '௭': '7',\n        '௮': '8',\n        '௯': '9',\n        '௦': '0'\n    };\n\n    var ta = moment.defineLocale('ta', {\n        months : 'ஜனவரி_பிப்ரவரி_மார்ச்_ஏப்ரல்_மே_ஜூன்_ஜூலை_ஆகஸ்ட்_செப்டெம்பர்_அக்டோபர்_நவம்பர்_டிசம்பர்'.split('_'),\n        monthsShort : 'ஜனவரி_பிப்ரவரி_மார்ச்_ஏப்ரல்_மே_ஜூன்_ஜூலை_ஆகஸ்ட்_செப்டெம்பர்_அக்டோபர்_நவம்பர்_டிசம்பர்'.split('_'),\n        weekdays : 'ஞாயிற்றுக்கிழமை_திங்கட்கிழமை_செவ்வாய்கிழமை_புதன்கிழமை_வியாழக்கிழமை_வெள்ளிக்கிழமை_சனிக்கிழமை'.split('_'),\n        weekdaysShort : 'ஞாயிறு_திங்கள்_செவ்வாய்_புதன்_வியாழன்_வெள்ளி_சனி'.split('_'),\n        weekdaysMin : 'ஞா_தி_செ_பு_வி_வெ_ச'.split('_'),\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY, HH:mm',\n            LLLL : 'dddd, D MMMM YYYY, HH:mm'\n        },\n        calendar : {\n            sameDay : '[இன்று] LT',\n            nextDay : '[நாளை] LT',\n            nextWeek : 'dddd, LT',\n            lastDay : '[நேற்று] LT',\n            lastWeek : '[கடந்த வாரம்] dddd, LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : '%s இல்',\n            past : '%s முன்',\n            s : 'ஒரு சில விநாடிகள்',\n            ss : '%d விநாடிகள்',\n            m : 'ஒரு நிமிடம்',\n            mm : '%d நிமிடங்கள்',\n            h : 'ஒரு மணி நேரம்',\n            hh : '%d மணி நேரம்',\n            d : 'ஒரு நாள்',\n            dd : '%d நாட்கள்',\n            M : 'ஒரு மாதம்',\n            MM : '%d மாதங்கள்',\n            y : 'ஒரு வருடம்',\n            yy : '%d ஆண்டுகள்'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}வது/,\n        ordinal : function (number) {\n            return number + 'வது';\n        },\n        preparse: function (string) {\n            return string.replace(/[௧௨௩௪௫௬௭௮௯௦]/g, function (match) {\n                return numberMap[match];\n            });\n        },\n        postformat: function (string) {\n            return string.replace(/\\d/g, function (match) {\n                return symbolMap[match];\n            });\n        },\n        // refer http://ta.wikipedia.org/s/1er1\n        meridiemParse: /யாமம்|வைகறை|காலை|நண்பகல்|எற்பாடு|மாலை/,\n        meridiem : function (hour, minute, isLower) {\n            if (hour < 2) {\n                return ' யாமம்';\n            } else if (hour < 6) {\n                return ' வைகறை';  // வைகறை\n            } else if (hour < 10) {\n                return ' காலை'; // காலை\n            } else if (hour < 14) {\n                return ' நண்பகல்'; // நண்பகல்\n            } else if (hour < 18) {\n                return ' எற்பாடு'; // எற்பாடு\n            } else if (hour < 22) {\n                return ' மாலை'; // மாலை\n            } else {\n                return ' யாமம்';\n            }\n        },\n        meridiemHour : function (hour, meridiem) {\n            if (hour === 12) {\n                hour = 0;\n            }\n            if (meridiem === 'யாமம்') {\n                return hour < 2 ? hour : hour + 12;\n            } else if (meridiem === 'வைகறை' || meridiem === 'காலை') {\n                return hour;\n            } else if (meridiem === 'நண்பகல்') {\n                return hour >= 10 ? hour : hour + 12;\n            } else {\n                return hour + 12;\n            }\n        },\n        week : {\n            dow : 0, // Sunday is the first day of the week.\n            doy : 6  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return ta;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var te = moment.defineLocale('te', {\n        months : 'జనవరి_ఫిబ్రవరి_మార్చి_ఏప్రిల్_మే_జూన్_జూలై_ఆగస్టు_సెప్టెంబర్_అక్టోబర్_నవంబర్_డిసెంబర్'.split('_'),\n        monthsShort : 'జన._ఫిబ్ర._మార్చి_ఏప్రి._మే_జూన్_జూలై_ఆగ._సెప్._అక్టో._నవ._డిసె.'.split('_'),\n        monthsParseExact : true,\n        weekdays : 'ఆదివారం_సోమవారం_మంగళవారం_బుధవారం_గురువారం_శుక్రవారం_శనివారం'.split('_'),\n        weekdaysShort : 'ఆది_సోమ_మంగళ_బుధ_గురు_శుక్ర_శని'.split('_'),\n        weekdaysMin : 'ఆ_సో_మం_బు_గు_శు_శ'.split('_'),\n        longDateFormat : {\n            LT : 'A h:mm',\n            LTS : 'A h:mm:ss',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY, A h:mm',\n            LLLL : 'dddd, D MMMM YYYY, A h:mm'\n        },\n        calendar : {\n            sameDay : '[నేడు] LT',\n            nextDay : '[రేపు] LT',\n            nextWeek : 'dddd, LT',\n            lastDay : '[నిన్న] LT',\n            lastWeek : '[గత] dddd, LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : '%s లో',\n            past : '%s క్రితం',\n            s : 'కొన్ని క్షణాలు',\n            ss : '%d సెకన్లు',\n            m : 'ఒక నిమిషం',\n            mm : '%d నిమిషాలు',\n            h : 'ఒక గంట',\n            hh : '%d గంటలు',\n            d : 'ఒక రోజు',\n            dd : '%d రోజులు',\n            M : 'ఒక నెల',\n            MM : '%d నెలలు',\n            y : 'ఒక సంవత్సరం',\n            yy : '%d సంవత్సరాలు'\n        },\n        dayOfMonthOrdinalParse : /\\d{1,2}వ/,\n        ordinal : '%dవ',\n        meridiemParse: /రాత్రి|ఉదయం|మధ్యాహ్నం|సాయంత్రం/,\n        meridiemHour : function (hour, meridiem) {\n            if (hour === 12) {\n                hour = 0;\n            }\n            if (meridiem === 'రాత్రి') {\n                return hour < 4 ? hour : hour + 12;\n            } else if (meridiem === 'ఉదయం') {\n                return hour;\n            } else if (meridiem === 'మధ్యాహ్నం') {\n                return hour >= 10 ? hour : hour + 12;\n            } else if (meridiem === 'సాయంత్రం') {\n                return hour + 12;\n            }\n        },\n        meridiem : function (hour, minute, isLower) {\n            if (hour < 4) {\n                return 'రాత్రి';\n            } else if (hour < 10) {\n                return 'ఉదయం';\n            } else if (hour < 17) {\n                return 'మధ్యాహ్నం';\n            } else if (hour < 20) {\n                return 'సాయంత్రం';\n            } else {\n                return 'రాత్రి';\n            }\n        },\n        week : {\n            dow : 0, // Sunday is the first day of the week.\n            doy : 6  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return te;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var tet = moment.defineLocale('tet', {\n        months : 'Janeiru_Fevereiru_Marsu_Abril_Maiu_Juñu_Jullu_Agustu_Setembru_Outubru_Novembru_Dezembru'.split('_'),\n        monthsShort : 'Jan_Fev_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez'.split('_'),\n        weekdays : 'Domingu_Segunda_Tersa_Kuarta_Kinta_Sesta_Sabadu'.split('_'),\n        weekdaysShort : 'Dom_Seg_Ters_Kua_Kint_Sest_Sab'.split('_'),\n        weekdaysMin : 'Do_Seg_Te_Ku_Ki_Ses_Sa'.split('_'),\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY HH:mm',\n            LLLL : 'dddd, D MMMM YYYY HH:mm'\n        },\n        calendar : {\n            sameDay: '[Ohin iha] LT',\n            nextDay: '[Aban iha] LT',\n            nextWeek: 'dddd [iha] LT',\n            lastDay: '[Horiseik iha] LT',\n            lastWeek: 'dddd [semana kotuk] [iha] LT',\n            sameElse: 'L'\n        },\n        relativeTime : {\n            future : 'iha %s',\n            past : '%s liuba',\n            s : 'minutu balun',\n            ss : 'minutu %d',\n            m : 'minutu ida',\n            mm : 'minutu %d',\n            h : 'oras ida',\n            hh : 'oras %d',\n            d : 'loron ida',\n            dd : 'loron %d',\n            M : 'fulan ida',\n            MM : 'fulan %d',\n            y : 'tinan ida',\n            yy : 'tinan %d'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}(st|nd|rd|th)/,\n        ordinal : function (number) {\n            var b = number % 10,\n                output = (~~(number % 100 / 10) === 1) ? 'th' :\n                (b === 1) ? 'st' :\n                (b === 2) ? 'nd' :\n                (b === 3) ? 'rd' : 'th';\n            return number + output;\n        },\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return tet;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var suffixes = {\n        0: '-ум',\n        1: '-ум',\n        2: '-юм',\n        3: '-юм',\n        4: '-ум',\n        5: '-ум',\n        6: '-ум',\n        7: '-ум',\n        8: '-ум',\n        9: '-ум',\n        10: '-ум',\n        12: '-ум',\n        13: '-ум',\n        20: '-ум',\n        30: '-юм',\n        40: '-ум',\n        50: '-ум',\n        60: '-ум',\n        70: '-ум',\n        80: '-ум',\n        90: '-ум',\n        100: '-ум'\n    };\n\n    var tg = moment.defineLocale('tg', {\n        months : 'январ_феврал_март_апрел_май_июн_июл_август_сентябр_октябр_ноябр_декабр'.split('_'),\n        monthsShort : 'янв_фев_мар_апр_май_июн_июл_авг_сен_окт_ноя_дек'.split('_'),\n        weekdays : 'якшанбе_душанбе_сешанбе_чоршанбе_панҷшанбе_ҷумъа_шанбе'.split('_'),\n        weekdaysShort : 'яшб_дшб_сшб_чшб_пшб_ҷум_шнб'.split('_'),\n        weekdaysMin : 'яш_дш_сш_чш_пш_ҷм_шб'.split('_'),\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY HH:mm',\n            LLLL : 'dddd, D MMMM YYYY HH:mm'\n        },\n        calendar : {\n            sameDay : '[Имрӯз соати] LT',\n            nextDay : '[Пагоҳ соати] LT',\n            lastDay : '[Дирӯз соати] LT',\n            nextWeek : 'dddd[и] [ҳафтаи оянда соати] LT',\n            lastWeek : 'dddd[и] [ҳафтаи гузашта соати] LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'баъди %s',\n            past : '%s пеш',\n            s : 'якчанд сония',\n            m : 'як дақиқа',\n            mm : '%d дақиқа',\n            h : 'як соат',\n            hh : '%d соат',\n            d : 'як рӯз',\n            dd : '%d рӯз',\n            M : 'як моҳ',\n            MM : '%d моҳ',\n            y : 'як сол',\n            yy : '%d сол'\n        },\n        meridiemParse: /шаб|субҳ|рӯз|бегоҳ/,\n        meridiemHour: function (hour, meridiem) {\n            if (hour === 12) {\n                hour = 0;\n            }\n            if (meridiem === 'шаб') {\n                return hour < 4 ? hour : hour + 12;\n            } else if (meridiem === 'субҳ') {\n                return hour;\n            } else if (meridiem === 'рӯз') {\n                return hour >= 11 ? hour : hour + 12;\n            } else if (meridiem === 'бегоҳ') {\n                return hour + 12;\n            }\n        },\n        meridiem: function (hour, minute, isLower) {\n            if (hour < 4) {\n                return 'шаб';\n            } else if (hour < 11) {\n                return 'субҳ';\n            } else if (hour < 16) {\n                return 'рӯз';\n            } else if (hour < 19) {\n                return 'бегоҳ';\n            } else {\n                return 'шаб';\n            }\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}-(ум|юм)/,\n        ordinal: function (number) {\n            var a = number % 10,\n                b = number >= 100 ? 100 : null;\n            return number + (suffixes[number] || suffixes[a] || suffixes[b]);\n        },\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 7  // The week that contains Jan 1th is the first week of the year.\n        }\n    });\n\n    return tg;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var th = moment.defineLocale('th', {\n        months : 'มกราคม_กุมภาพันธ์_มีนาคม_เมษายน_พฤษภาคม_มิถุนายน_กรกฎาคม_สิงหาคม_กันยายน_ตุลาคม_พฤศจิกายน_ธันวาคม'.split('_'),\n        monthsShort : 'ม.ค._ก.พ._มี.ค._เม.ย._พ.ค._มิ.ย._ก.ค._ส.ค._ก.ย._ต.ค._พ.ย._ธ.ค.'.split('_'),\n        monthsParseExact: true,\n        weekdays : 'อาทิตย์_จันทร์_อังคาร_พุธ_พฤหัสบดี_ศุกร์_เสาร์'.split('_'),\n        weekdaysShort : 'อาทิตย์_จันทร์_อังคาร_พุธ_พฤหัส_ศุกร์_เสาร์'.split('_'), // yes, three characters difference\n        weekdaysMin : 'อา._จ._อ._พ._พฤ._ศ._ส.'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat : {\n            LT : 'H:mm',\n            LTS : 'H:mm:ss',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY เวลา H:mm',\n            LLLL : 'วันddddที่ D MMMM YYYY เวลา H:mm'\n        },\n        meridiemParse: /ก่อนเที่ยง|หลังเที่ยง/,\n        isPM: function (input) {\n            return input === 'หลังเที่ยง';\n        },\n        meridiem : function (hour, minute, isLower) {\n            if (hour < 12) {\n                return 'ก่อนเที่ยง';\n            } else {\n                return 'หลังเที่ยง';\n            }\n        },\n        calendar : {\n            sameDay : '[วันนี้ เวลา] LT',\n            nextDay : '[พรุ่งนี้ เวลา] LT',\n            nextWeek : 'dddd[หน้า เวลา] LT',\n            lastDay : '[เมื่อวานนี้ เวลา] LT',\n            lastWeek : '[วัน]dddd[ที่แล้ว เวลา] LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'อีก %s',\n            past : '%sที่แล้ว',\n            s : 'ไม่กี่วินาที',\n            ss : '%d วินาที',\n            m : '1 นาที',\n            mm : '%d นาที',\n            h : '1 ชั่วโมง',\n            hh : '%d ชั่วโมง',\n            d : '1 วัน',\n            dd : '%d วัน',\n            M : '1 เดือน',\n            MM : '%d เดือน',\n            y : '1 ปี',\n            yy : '%d ปี'\n        }\n    });\n\n    return th;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var tlPh = moment.defineLocale('tl-ph', {\n        months : 'Enero_Pebrero_Marso_Abril_Mayo_Hunyo_Hulyo_Agosto_Setyembre_Oktubre_Nobyembre_Disyembre'.split('_'),\n        monthsShort : 'Ene_Peb_Mar_Abr_May_Hun_Hul_Ago_Set_Okt_Nob_Dis'.split('_'),\n        weekdays : 'Linggo_Lunes_Martes_Miyerkules_Huwebes_Biyernes_Sabado'.split('_'),\n        weekdaysShort : 'Lin_Lun_Mar_Miy_Huw_Biy_Sab'.split('_'),\n        weekdaysMin : 'Li_Lu_Ma_Mi_Hu_Bi_Sab'.split('_'),\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'MM/D/YYYY',\n            LL : 'MMMM D, YYYY',\n            LLL : 'MMMM D, YYYY HH:mm',\n            LLLL : 'dddd, MMMM DD, YYYY HH:mm'\n        },\n        calendar : {\n            sameDay: 'LT [ngayong araw]',\n            nextDay: '[Bukas ng] LT',\n            nextWeek: 'LT [sa susunod na] dddd',\n            lastDay: 'LT [kahapon]',\n            lastWeek: 'LT [noong nakaraang] dddd',\n            sameElse: 'L'\n        },\n        relativeTime : {\n            future : 'sa loob ng %s',\n            past : '%s ang nakalipas',\n            s : 'ilang segundo',\n            ss : '%d segundo',\n            m : 'isang minuto',\n            mm : '%d minuto',\n            h : 'isang oras',\n            hh : '%d oras',\n            d : 'isang araw',\n            dd : '%d araw',\n            M : 'isang buwan',\n            MM : '%d buwan',\n            y : 'isang taon',\n            yy : '%d taon'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}/,\n        ordinal : function (number) {\n            return number;\n        },\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return tlPh;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var numbersNouns = 'pagh_wa’_cha’_wej_loS_vagh_jav_Soch_chorgh_Hut'.split('_');\n\n    function translateFuture(output) {\n        var time = output;\n        time = (output.indexOf('jaj') !== -1) ?\n        time.slice(0, -3) + 'leS' :\n        (output.indexOf('jar') !== -1) ?\n        time.slice(0, -3) + 'waQ' :\n        (output.indexOf('DIS') !== -1) ?\n        time.slice(0, -3) + 'nem' :\n        time + ' pIq';\n        return time;\n    }\n\n    function translatePast(output) {\n        var time = output;\n        time = (output.indexOf('jaj') !== -1) ?\n        time.slice(0, -3) + 'Hu’' :\n        (output.indexOf('jar') !== -1) ?\n        time.slice(0, -3) + 'wen' :\n        (output.indexOf('DIS') !== -1) ?\n        time.slice(0, -3) + 'ben' :\n        time + ' ret';\n        return time;\n    }\n\n    function translate(number, withoutSuffix, string, isFuture) {\n        var numberNoun = numberAsNoun(number);\n        switch (string) {\n            case 'ss':\n                return numberNoun + ' lup';\n            case 'mm':\n                return numberNoun + ' tup';\n            case 'hh':\n                return numberNoun + ' rep';\n            case 'dd':\n                return numberNoun + ' jaj';\n            case 'MM':\n                return numberNoun + ' jar';\n            case 'yy':\n                return numberNoun + ' DIS';\n        }\n    }\n\n    function numberAsNoun(number) {\n        var hundred = Math.floor((number % 1000) / 100),\n        ten = Math.floor((number % 100) / 10),\n        one = number % 10,\n        word = '';\n        if (hundred > 0) {\n            word += numbersNouns[hundred] + 'vatlh';\n        }\n        if (ten > 0) {\n            word += ((word !== '') ? ' ' : '') + numbersNouns[ten] + 'maH';\n        }\n        if (one > 0) {\n            word += ((word !== '') ? ' ' : '') + numbersNouns[one];\n        }\n        return (word === '') ? 'pagh' : word;\n    }\n\n    var tlh = moment.defineLocale('tlh', {\n        months : 'tera’ jar wa’_tera’ jar cha’_tera’ jar wej_tera’ jar loS_tera’ jar vagh_tera’ jar jav_tera’ jar Soch_tera’ jar chorgh_tera’ jar Hut_tera’ jar wa’maH_tera’ jar wa’maH wa’_tera’ jar wa’maH cha’'.split('_'),\n        monthsShort : 'jar wa’_jar cha’_jar wej_jar loS_jar vagh_jar jav_jar Soch_jar chorgh_jar Hut_jar wa’maH_jar wa’maH wa’_jar wa’maH cha’'.split('_'),\n        monthsParseExact : true,\n        weekdays : 'lojmItjaj_DaSjaj_povjaj_ghItlhjaj_loghjaj_buqjaj_ghInjaj'.split('_'),\n        weekdaysShort : 'lojmItjaj_DaSjaj_povjaj_ghItlhjaj_loghjaj_buqjaj_ghInjaj'.split('_'),\n        weekdaysMin : 'lojmItjaj_DaSjaj_povjaj_ghItlhjaj_loghjaj_buqjaj_ghInjaj'.split('_'),\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD.MM.YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY HH:mm',\n            LLLL : 'dddd, D MMMM YYYY HH:mm'\n        },\n        calendar : {\n            sameDay: '[DaHjaj] LT',\n            nextDay: '[wa’leS] LT',\n            nextWeek: 'LLL',\n            lastDay: '[wa’Hu’] LT',\n            lastWeek: 'LLL',\n            sameElse: 'L'\n        },\n        relativeTime : {\n            future : translateFuture,\n            past : translatePast,\n            s : 'puS lup',\n            ss : translate,\n            m : 'wa’ tup',\n            mm : translate,\n            h : 'wa’ rep',\n            hh : translate,\n            d : 'wa’ jaj',\n            dd : translate,\n            M : 'wa’ jar',\n            MM : translate,\n            y : 'wa’ DIS',\n            yy : translate\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}\\./,\n        ordinal : '%d.',\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return tlh;\n\n})));\n","\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n    var suffixes = {\n        1: '\\'inci',\n        5: '\\'inci',\n        8: '\\'inci',\n        70: '\\'inci',\n        80: '\\'inci',\n        2: '\\'nci',\n        7: '\\'nci',\n        20: '\\'nci',\n        50: '\\'nci',\n        3: '\\'üncü',\n        4: '\\'üncü',\n        100: '\\'üncü',\n        6: '\\'ncı',\n        9: '\\'uncu',\n        10: '\\'uncu',\n        30: '\\'uncu',\n        60: '\\'ıncı',\n        90: '\\'ıncı'\n    };\n\n    var tr = moment.defineLocale('tr', {\n        months : 'Ocak_Şubat_Mart_Nisan_Mayıs_Haziran_Temmuz_Ağustos_Eylül_Ekim_Kasım_Aralık'.split('_'),\n        monthsShort : 'Oca_Şub_Mar_Nis_May_Haz_Tem_Ağu_Eyl_Eki_Kas_Ara'.split('_'),\n        weekdays : 'Pazar_Pazartesi_Salı_Çarşamba_Perşembe_Cuma_Cumartesi'.split('_'),\n        weekdaysShort : 'Paz_Pts_Sal_Çar_Per_Cum_Cts'.split('_'),\n        weekdaysMin : 'Pz_Pt_Sa_Ça_Pe_Cu_Ct'.split('_'),\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD.MM.YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY HH:mm',\n            LLLL : 'dddd, D MMMM YYYY HH:mm'\n        },\n        calendar : {\n            sameDay : '[bugün saat] LT',\n            nextDay : '[yarın saat] LT',\n            nextWeek : '[gelecek] dddd [saat] LT',\n            lastDay : '[dün] LT',\n            lastWeek : '[geçen] dddd [saat] LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : '%s sonra',\n            past : '%s önce',\n            s : 'birkaç saniye',\n            ss : '%d saniye',\n            m : 'bir dakika',\n            mm : '%d dakika',\n            h : 'bir saat',\n            hh : '%d saat',\n            d : 'bir gün',\n            dd : '%d gün',\n            M : 'bir ay',\n            MM : '%d ay',\n            y : 'bir yıl',\n            yy : '%d yıl'\n        },\n        ordinal: function (number, period) {\n            switch (period) {\n                case 'd':\n                case 'D':\n                case 'Do':\n                case 'DD':\n                    return number;\n                default:\n                    if (number === 0) {  // special case for zero\n                        return number + '\\'ıncı';\n                    }\n                    var a = number % 10,\n                        b = number % 100 - a,\n                        c = number >= 100 ? 100 : null;\n                    return number + (suffixes[a] || suffixes[b] || suffixes[c]);\n            }\n        },\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 7  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return tr;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    // After the year there should be a slash and the amount of years since December 26, 1979 in Roman numerals.\n    // This is currently too difficult (maybe even impossible) to add.\n    var tzl = moment.defineLocale('tzl', {\n        months : 'Januar_Fevraglh_Març_Avrïu_Mai_Gün_Julia_Guscht_Setemvar_Listopäts_Noemvar_Zecemvar'.split('_'),\n        monthsShort : 'Jan_Fev_Mar_Avr_Mai_Gün_Jul_Gus_Set_Lis_Noe_Zec'.split('_'),\n        weekdays : 'Súladi_Lúneçi_Maitzi_Márcuri_Xhúadi_Viénerçi_Sáturi'.split('_'),\n        weekdaysShort : 'Súl_Lún_Mai_Már_Xhú_Vié_Sát'.split('_'),\n        weekdaysMin : 'Sú_Lú_Ma_Má_Xh_Vi_Sá'.split('_'),\n        longDateFormat : {\n            LT : 'HH.mm',\n            LTS : 'HH.mm.ss',\n            L : 'DD.MM.YYYY',\n            LL : 'D. MMMM [dallas] YYYY',\n            LLL : 'D. MMMM [dallas] YYYY HH.mm',\n            LLLL : 'dddd, [li] D. MMMM [dallas] YYYY HH.mm'\n        },\n        meridiemParse: /d\\'o|d\\'a/i,\n        isPM : function (input) {\n            return 'd\\'o' === input.toLowerCase();\n        },\n        meridiem : function (hours, minutes, isLower) {\n            if (hours > 11) {\n                return isLower ? 'd\\'o' : 'D\\'O';\n            } else {\n                return isLower ? 'd\\'a' : 'D\\'A';\n            }\n        },\n        calendar : {\n            sameDay : '[oxhi à] LT',\n            nextDay : '[demà à] LT',\n            nextWeek : 'dddd [à] LT',\n            lastDay : '[ieiri à] LT',\n            lastWeek : '[sür el] dddd [lasteu à] LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'osprei %s',\n            past : 'ja%s',\n            s : processRelativeTime,\n            ss : processRelativeTime,\n            m : processRelativeTime,\n            mm : processRelativeTime,\n            h : processRelativeTime,\n            hh : processRelativeTime,\n            d : processRelativeTime,\n            dd : processRelativeTime,\n            M : processRelativeTime,\n            MM : processRelativeTime,\n            y : processRelativeTime,\n            yy : processRelativeTime\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}\\./,\n        ordinal : '%d.',\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    function processRelativeTime(number, withoutSuffix, key, isFuture) {\n        var format = {\n            's': ['viensas secunds', '\\'iensas secunds'],\n            'ss': [number + ' secunds', '' + number + ' secunds'],\n            'm': ['\\'n míut', '\\'iens míut'],\n            'mm': [number + ' míuts', '' + number + ' míuts'],\n            'h': ['\\'n þora', '\\'iensa þora'],\n            'hh': [number + ' þoras', '' + number + ' þoras'],\n            'd': ['\\'n ziua', '\\'iensa ziua'],\n            'dd': [number + ' ziuas', '' + number + ' ziuas'],\n            'M': ['\\'n mes', '\\'iens mes'],\n            'MM': [number + ' mesen', '' + number + ' mesen'],\n            'y': ['\\'n ar', '\\'iens ar'],\n            'yy': [number + ' ars', '' + number + ' ars']\n        };\n        return isFuture ? format[key][0] : (withoutSuffix ? format[key][0] : format[key][1]);\n    }\n\n    return tzl;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var tzmLatn = moment.defineLocale('tzm-latn', {\n        months : 'innayr_brˤayrˤ_marˤsˤ_ibrir_mayyw_ywnyw_ywlywz_ɣwšt_šwtanbir_ktˤwbrˤ_nwwanbir_dwjnbir'.split('_'),\n        monthsShort : 'innayr_brˤayrˤ_marˤsˤ_ibrir_mayyw_ywnyw_ywlywz_ɣwšt_šwtanbir_ktˤwbrˤ_nwwanbir_dwjnbir'.split('_'),\n        weekdays : 'asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas'.split('_'),\n        weekdaysShort : 'asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas'.split('_'),\n        weekdaysMin : 'asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas'.split('_'),\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY HH:mm',\n            LLLL : 'dddd D MMMM YYYY HH:mm'\n        },\n        calendar : {\n            sameDay: '[asdkh g] LT',\n            nextDay: '[aska g] LT',\n            nextWeek: 'dddd [g] LT',\n            lastDay: '[assant g] LT',\n            lastWeek: 'dddd [g] LT',\n            sameElse: 'L'\n        },\n        relativeTime : {\n            future : 'dadkh s yan %s',\n            past : 'yan %s',\n            s : 'imik',\n            ss : '%d imik',\n            m : 'minuḍ',\n            mm : '%d minuḍ',\n            h : 'saɛa',\n            hh : '%d tassaɛin',\n            d : 'ass',\n            dd : '%d ossan',\n            M : 'ayowr',\n            MM : '%d iyyirn',\n            y : 'asgas',\n            yy : '%d isgasn'\n        },\n        week : {\n            dow : 6, // Saturday is the first day of the week.\n            doy : 12  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return tzmLatn;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var tzm = moment.defineLocale('tzm', {\n        months : 'ⵉⵏⵏⴰⵢⵔ_ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ_ⵢⵓⵏⵢⵓ_ⵢⵓⵍⵢⵓⵣ_ⵖⵓⵛⵜ_ⵛⵓⵜⴰⵏⴱⵉⵔ_ⴽⵟⵓⴱⵕ_ⵏⵓⵡⴰⵏⴱⵉⵔ_ⴷⵓⵊⵏⴱⵉⵔ'.split('_'),\n        monthsShort : 'ⵉⵏⵏⴰⵢⵔ_ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ_ⵢⵓⵏⵢⵓ_ⵢⵓⵍⵢⵓⵣ_ⵖⵓⵛⵜ_ⵛⵓⵜⴰⵏⴱⵉⵔ_ⴽⵟⵓⴱⵕ_ⵏⵓⵡⴰⵏⴱⵉⵔ_ⴷⵓⵊⵏⴱⵉⵔ'.split('_'),\n        weekdays : 'ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ'.split('_'),\n        weekdaysShort : 'ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ'.split('_'),\n        weekdaysMin : 'ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ'.split('_'),\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS: 'HH:mm:ss',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY HH:mm',\n            LLLL : 'dddd D MMMM YYYY HH:mm'\n        },\n        calendar : {\n            sameDay: '[ⴰⵙⴷⵅ ⴴ] LT',\n            nextDay: '[ⴰⵙⴽⴰ ⴴ] LT',\n            nextWeek: 'dddd [ⴴ] LT',\n            lastDay: '[ⴰⵚⴰⵏⵜ ⴴ] LT',\n            lastWeek: 'dddd [ⴴ] LT',\n            sameElse: 'L'\n        },\n        relativeTime : {\n            future : 'ⴷⴰⴷⵅ ⵙ ⵢⴰⵏ %s',\n            past : 'ⵢⴰⵏ %s',\n            s : 'ⵉⵎⵉⴽ',\n            ss : '%d ⵉⵎⵉⴽ',\n            m : 'ⵎⵉⵏⵓⴺ',\n            mm : '%d ⵎⵉⵏⵓⴺ',\n            h : 'ⵙⴰⵄⴰ',\n            hh : '%d ⵜⴰⵙⵙⴰⵄⵉⵏ',\n            d : 'ⴰⵙⵙ',\n            dd : '%d oⵙⵙⴰⵏ',\n            M : 'ⴰⵢoⵓⵔ',\n            MM : '%d ⵉⵢⵢⵉⵔⵏ',\n            y : 'ⴰⵙⴳⴰⵙ',\n            yy : '%d ⵉⵙⴳⴰⵙⵏ'\n        },\n        week : {\n            dow : 6, // Saturday is the first day of the week.\n            doy : 12  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return tzm;\n\n})));\n","//! moment.js language configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var ugCn = moment.defineLocale('ug-cn', {\n        months: 'يانۋار_فېۋرال_مارت_ئاپرېل_ماي_ئىيۇن_ئىيۇل_ئاۋغۇست_سېنتەبىر_ئۆكتەبىر_نويابىر_دېكابىر'.split(\n            '_'\n        ),\n        monthsShort: 'يانۋار_فېۋرال_مارت_ئاپرېل_ماي_ئىيۇن_ئىيۇل_ئاۋغۇست_سېنتەبىر_ئۆكتەبىر_نويابىر_دېكابىر'.split(\n            '_'\n        ),\n        weekdays: 'يەكشەنبە_دۈشەنبە_سەيشەنبە_چارشەنبە_پەيشەنبە_جۈمە_شەنبە'.split(\n            '_'\n        ),\n        weekdaysShort: 'يە_دۈ_سە_چا_پە_جۈ_شە'.split('_'),\n        weekdaysMin: 'يە_دۈ_سە_چا_پە_جۈ_شە'.split('_'),\n        longDateFormat: {\n            LT: 'HH:mm',\n            LTS: 'HH:mm:ss',\n            L: 'YYYY-MM-DD',\n            LL: 'YYYY-يىلىM-ئاينىڭD-كۈنى',\n            LLL: 'YYYY-يىلىM-ئاينىڭD-كۈنى، HH:mm',\n            LLLL: 'dddd، YYYY-يىلىM-ئاينىڭD-كۈنى، HH:mm'\n        },\n        meridiemParse: /يېرىم كېچە|سەھەر|چۈشتىن بۇرۇن|چۈش|چۈشتىن كېيىن|كەچ/,\n        meridiemHour: function (hour, meridiem) {\n            if (hour === 12) {\n                hour = 0;\n            }\n            if (\n                meridiem === 'يېرىم كېچە' ||\n                meridiem === 'سەھەر' ||\n                meridiem === 'چۈشتىن بۇرۇن'\n            ) {\n                return hour;\n            } else if (meridiem === 'چۈشتىن كېيىن' || meridiem === 'كەچ') {\n                return hour + 12;\n            } else {\n                return hour >= 11 ? hour : hour + 12;\n            }\n        },\n        meridiem: function (hour, minute, isLower) {\n            var hm = hour * 100 + minute;\n            if (hm < 600) {\n                return 'يېرىم كېچە';\n            } else if (hm < 900) {\n                return 'سەھەر';\n            } else if (hm < 1130) {\n                return 'چۈشتىن بۇرۇن';\n            } else if (hm < 1230) {\n                return 'چۈش';\n            } else if (hm < 1800) {\n                return 'چۈشتىن كېيىن';\n            } else {\n                return 'كەچ';\n            }\n        },\n        calendar: {\n            sameDay: '[بۈگۈن سائەت] LT',\n            nextDay: '[ئەتە سائەت] LT',\n            nextWeek: '[كېلەركى] dddd [سائەت] LT',\n            lastDay: '[تۆنۈگۈن] LT',\n            lastWeek: '[ئالدىنقى] dddd [سائەت] LT',\n            sameElse: 'L'\n        },\n        relativeTime: {\n            future: '%s كېيىن',\n            past: '%s بۇرۇن',\n            s: 'نەچچە سېكونت',\n            ss: '%d سېكونت',\n            m: 'بىر مىنۇت',\n            mm: '%d مىنۇت',\n            h: 'بىر سائەت',\n            hh: '%d سائەت',\n            d: 'بىر كۈن',\n            dd: '%d كۈن',\n            M: 'بىر ئاي',\n            MM: '%d ئاي',\n            y: 'بىر يىل',\n            yy: '%d يىل'\n        },\n\n        dayOfMonthOrdinalParse: /\\d{1,2}(-كۈنى|-ئاي|-ھەپتە)/,\n        ordinal: function (number, period) {\n            switch (period) {\n                case 'd':\n                case 'D':\n                case 'DDD':\n                    return number + '-كۈنى';\n                case 'w':\n                case 'W':\n                    return number + '-ھەپتە';\n                default:\n                    return number;\n            }\n        },\n        preparse: function (string) {\n            return string.replace(/،/g, ',');\n        },\n        postformat: function (string) {\n            return string.replace(/,/g, '،');\n        },\n        week: {\n            // GB/T 7408-1994《数据元和交换格式·信息交换·日期和时间表示法》与ISO 8601:1988等效\n            dow: 1, // Monday is the first day of the week.\n            doy: 7 // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return ugCn;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    function plural(word, num) {\n        var forms = word.split('_');\n        return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]);\n    }\n    function relativeTimeWithPlural(number, withoutSuffix, key) {\n        var format = {\n            'ss': withoutSuffix ? 'секунда_секунди_секунд' : 'секунду_секунди_секунд',\n            'mm': withoutSuffix ? 'хвилина_хвилини_хвилин' : 'хвилину_хвилини_хвилин',\n            'hh': withoutSuffix ? 'година_години_годин' : 'годину_години_годин',\n            'dd': 'день_дні_днів',\n            'MM': 'місяць_місяці_місяців',\n            'yy': 'рік_роки_років'\n        };\n        if (key === 'm') {\n            return withoutSuffix ? 'хвилина' : 'хвилину';\n        }\n        else if (key === 'h') {\n            return withoutSuffix ? 'година' : 'годину';\n        }\n        else {\n            return number + ' ' + plural(format[key], +number);\n        }\n    }\n    function weekdaysCaseReplace(m, format) {\n        var weekdays = {\n            'nominative': 'неділя_понеділок_вівторок_середа_четвер_п’ятниця_субота'.split('_'),\n            'accusative': 'неділю_понеділок_вівторок_середу_четвер_п’ятницю_суботу'.split('_'),\n            'genitive': 'неділі_понеділка_вівторка_середи_четверга_п’ятниці_суботи'.split('_')\n        };\n\n        if (!m) {\n            return weekdays['nominative'];\n        }\n\n        var nounCase = (/(\\[[ВвУу]\\]) ?dddd/).test(format) ?\n            'accusative' :\n            ((/\\[?(?:минулої|наступної)? ?\\] ?dddd/).test(format) ?\n                'genitive' :\n                'nominative');\n        return weekdays[nounCase][m.day()];\n    }\n    function processHoursFunction(str) {\n        return function () {\n            return str + 'о' + (this.hours() === 11 ? 'б' : '') + '] LT';\n        };\n    }\n\n    var uk = moment.defineLocale('uk', {\n        months : {\n            'format': 'січня_лютого_березня_квітня_травня_червня_липня_серпня_вересня_жовтня_листопада_грудня'.split('_'),\n            'standalone': 'січень_лютий_березень_квітень_травень_червень_липень_серпень_вересень_жовтень_листопад_грудень'.split('_')\n        },\n        monthsShort : 'січ_лют_бер_квіт_трав_черв_лип_серп_вер_жовт_лист_груд'.split('_'),\n        weekdays : weekdaysCaseReplace,\n        weekdaysShort : 'нд_пн_вт_ср_чт_пт_сб'.split('_'),\n        weekdaysMin : 'нд_пн_вт_ср_чт_пт_сб'.split('_'),\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD.MM.YYYY',\n            LL : 'D MMMM YYYY р.',\n            LLL : 'D MMMM YYYY р., HH:mm',\n            LLLL : 'dddd, D MMMM YYYY р., HH:mm'\n        },\n        calendar : {\n            sameDay: processHoursFunction('[Сьогодні '),\n            nextDay: processHoursFunction('[Завтра '),\n            lastDay: processHoursFunction('[Вчора '),\n            nextWeek: processHoursFunction('[У] dddd ['),\n            lastWeek: function () {\n                switch (this.day()) {\n                    case 0:\n                    case 3:\n                    case 5:\n                    case 6:\n                        return processHoursFunction('[Минулої] dddd [').call(this);\n                    case 1:\n                    case 2:\n                    case 4:\n                        return processHoursFunction('[Минулого] dddd [').call(this);\n                }\n            },\n            sameElse: 'L'\n        },\n        relativeTime : {\n            future : 'за %s',\n            past : '%s тому',\n            s : 'декілька секунд',\n            ss : relativeTimeWithPlural,\n            m : relativeTimeWithPlural,\n            mm : relativeTimeWithPlural,\n            h : 'годину',\n            hh : relativeTimeWithPlural,\n            d : 'день',\n            dd : relativeTimeWithPlural,\n            M : 'місяць',\n            MM : relativeTimeWithPlural,\n            y : 'рік',\n            yy : relativeTimeWithPlural\n        },\n        // M. E.: those two are virtually unused but a user might want to implement them for his/her website for some reason\n        meridiemParse: /ночі|ранку|дня|вечора/,\n        isPM: function (input) {\n            return /^(дня|вечора)$/.test(input);\n        },\n        meridiem : function (hour, minute, isLower) {\n            if (hour < 4) {\n                return 'ночі';\n            } else if (hour < 12) {\n                return 'ранку';\n            } else if (hour < 17) {\n                return 'дня';\n            } else {\n                return 'вечора';\n            }\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}-(й|го)/,\n        ordinal: function (number, period) {\n            switch (period) {\n                case 'M':\n                case 'd':\n                case 'DDD':\n                case 'w':\n                case 'W':\n                    return number + '-й';\n                case 'D':\n                    return number + '-го';\n                default:\n                    return number;\n            }\n        },\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 7  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return uk;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var months = [\n        'جنوری',\n        'فروری',\n        'مارچ',\n        'اپریل',\n        'مئی',\n        'جون',\n        'جولائی',\n        'اگست',\n        'ستمبر',\n        'اکتوبر',\n        'نومبر',\n        'دسمبر'\n    ];\n    var days = [\n        'اتوار',\n        'پیر',\n        'منگل',\n        'بدھ',\n        'جمعرات',\n        'جمعہ',\n        'ہفتہ'\n    ];\n\n    var ur = moment.defineLocale('ur', {\n        months : months,\n        monthsShort : months,\n        weekdays : days,\n        weekdaysShort : days,\n        weekdaysMin : days,\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY HH:mm',\n            LLLL : 'dddd، D MMMM YYYY HH:mm'\n        },\n        meridiemParse: /صبح|شام/,\n        isPM : function (input) {\n            return 'شام' === input;\n        },\n        meridiem : function (hour, minute, isLower) {\n            if (hour < 12) {\n                return 'صبح';\n            }\n            return 'شام';\n        },\n        calendar : {\n            sameDay : '[آج بوقت] LT',\n            nextDay : '[کل بوقت] LT',\n            nextWeek : 'dddd [بوقت] LT',\n            lastDay : '[گذشتہ روز بوقت] LT',\n            lastWeek : '[گذشتہ] dddd [بوقت] LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : '%s بعد',\n            past : '%s قبل',\n            s : 'چند سیکنڈ',\n            ss : '%d سیکنڈ',\n            m : 'ایک منٹ',\n            mm : '%d منٹ',\n            h : 'ایک گھنٹہ',\n            hh : '%d گھنٹے',\n            d : 'ایک دن',\n            dd : '%d دن',\n            M : 'ایک ماہ',\n            MM : '%d ماہ',\n            y : 'ایک سال',\n            yy : '%d سال'\n        },\n        preparse: function (string) {\n            return string.replace(/،/g, ',');\n        },\n        postformat: function (string) {\n            return string.replace(/,/g, '،');\n        },\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return ur;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var uzLatn = moment.defineLocale('uz-latn', {\n        months : 'Yanvar_Fevral_Mart_Aprel_May_Iyun_Iyul_Avgust_Sentabr_Oktabr_Noyabr_Dekabr'.split('_'),\n        monthsShort : 'Yan_Fev_Mar_Apr_May_Iyun_Iyul_Avg_Sen_Okt_Noy_Dek'.split('_'),\n        weekdays : 'Yakshanba_Dushanba_Seshanba_Chorshanba_Payshanba_Juma_Shanba'.split('_'),\n        weekdaysShort : 'Yak_Dush_Sesh_Chor_Pay_Jum_Shan'.split('_'),\n        weekdaysMin : 'Ya_Du_Se_Cho_Pa_Ju_Sha'.split('_'),\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY HH:mm',\n            LLLL : 'D MMMM YYYY, dddd HH:mm'\n        },\n        calendar : {\n            sameDay : '[Bugun soat] LT [da]',\n            nextDay : '[Ertaga] LT [da]',\n            nextWeek : 'dddd [kuni soat] LT [da]',\n            lastDay : '[Kecha soat] LT [da]',\n            lastWeek : '[O\\'tgan] dddd [kuni soat] LT [da]',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'Yaqin %s ichida',\n            past : 'Bir necha %s oldin',\n            s : 'soniya',\n            ss : '%d soniya',\n            m : 'bir daqiqa',\n            mm : '%d daqiqa',\n            h : 'bir soat',\n            hh : '%d soat',\n            d : 'bir kun',\n            dd : '%d kun',\n            M : 'bir oy',\n            MM : '%d oy',\n            y : 'bir yil',\n            yy : '%d yil'\n        },\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 7  // The week that contains Jan 1st is the first week of the year.\n        }\n    });\n\n    return uzLatn;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var uz = moment.defineLocale('uz', {\n        months : 'январ_феврал_март_апрел_май_июн_июл_август_сентябр_октябр_ноябр_декабр'.split('_'),\n        monthsShort : 'янв_фев_мар_апр_май_июн_июл_авг_сен_окт_ноя_дек'.split('_'),\n        weekdays : 'Якшанба_Душанба_Сешанба_Чоршанба_Пайшанба_Жума_Шанба'.split('_'),\n        weekdaysShort : 'Якш_Душ_Сеш_Чор_Пай_Жум_Шан'.split('_'),\n        weekdaysMin : 'Як_Ду_Се_Чо_Па_Жу_Ша'.split('_'),\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY HH:mm',\n            LLLL : 'D MMMM YYYY, dddd HH:mm'\n        },\n        calendar : {\n            sameDay : '[Бугун соат] LT [да]',\n            nextDay : '[Эртага] LT [да]',\n            nextWeek : 'dddd [куни соат] LT [да]',\n            lastDay : '[Кеча соат] LT [да]',\n            lastWeek : '[Утган] dddd [куни соат] LT [да]',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'Якин %s ичида',\n            past : 'Бир неча %s олдин',\n            s : 'фурсат',\n            ss : '%d фурсат',\n            m : 'бир дакика',\n            mm : '%d дакика',\n            h : 'бир соат',\n            hh : '%d соат',\n            d : 'бир кун',\n            dd : '%d кун',\n            M : 'бир ой',\n            MM : '%d ой',\n            y : 'бир йил',\n            yy : '%d йил'\n        },\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 7  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return uz;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var vi = moment.defineLocale('vi', {\n        months : 'tháng 1_tháng 2_tháng 3_tháng 4_tháng 5_tháng 6_tháng 7_tháng 8_tháng 9_tháng 10_tháng 11_tháng 12'.split('_'),\n        monthsShort : 'Th01_Th02_Th03_Th04_Th05_Th06_Th07_Th08_Th09_Th10_Th11_Th12'.split('_'),\n        monthsParseExact : true,\n        weekdays : 'chủ nhật_thứ hai_thứ ba_thứ tư_thứ năm_thứ sáu_thứ bảy'.split('_'),\n        weekdaysShort : 'CN_T2_T3_T4_T5_T6_T7'.split('_'),\n        weekdaysMin : 'CN_T2_T3_T4_T5_T6_T7'.split('_'),\n        weekdaysParseExact : true,\n        meridiemParse: /sa|ch/i,\n        isPM : function (input) {\n            return /^ch$/i.test(input);\n        },\n        meridiem : function (hours, minutes, isLower) {\n            if (hours < 12) {\n                return isLower ? 'sa' : 'SA';\n            } else {\n                return isLower ? 'ch' : 'CH';\n            }\n        },\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM [năm] YYYY',\n            LLL : 'D MMMM [năm] YYYY HH:mm',\n            LLLL : 'dddd, D MMMM [năm] YYYY HH:mm',\n            l : 'DD/M/YYYY',\n            ll : 'D MMM YYYY',\n            lll : 'D MMM YYYY HH:mm',\n            llll : 'ddd, D MMM YYYY HH:mm'\n        },\n        calendar : {\n            sameDay: '[Hôm nay lúc] LT',\n            nextDay: '[Ngày mai lúc] LT',\n            nextWeek: 'dddd [tuần tới lúc] LT',\n            lastDay: '[Hôm qua lúc] LT',\n            lastWeek: 'dddd [tuần rồi lúc] LT',\n            sameElse: 'L'\n        },\n        relativeTime : {\n            future : '%s tới',\n            past : '%s trước',\n            s : 'vài giây',\n            ss : '%d giây' ,\n            m : 'một phút',\n            mm : '%d phút',\n            h : 'một giờ',\n            hh : '%d giờ',\n            d : 'một ngày',\n            dd : '%d ngày',\n            M : 'một tháng',\n            MM : '%d tháng',\n            y : 'một năm',\n            yy : '%d năm'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}/,\n        ordinal : function (number) {\n            return number;\n        },\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return vi;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var xPseudo = moment.defineLocale('x-pseudo', {\n        months : 'J~áñúá~rý_F~ébrú~árý_~Márc~h_Áp~ríl_~Máý_~Júñé~_Júl~ý_Áú~gúst~_Sép~témb~ér_Ó~ctób~ér_Ñ~óvém~bér_~Décé~mbér'.split('_'),\n        monthsShort : 'J~áñ_~Féb_~Már_~Ápr_~Máý_~Júñ_~Júl_~Áúg_~Sép_~Óct_~Ñóv_~Déc'.split('_'),\n        monthsParseExact : true,\n        weekdays : 'S~úñdá~ý_Mó~ñdáý~_Túé~sdáý~_Wéd~ñésd~áý_T~húrs~dáý_~Fríd~áý_S~átúr~dáý'.split('_'),\n        weekdaysShort : 'S~úñ_~Móñ_~Túé_~Wéd_~Thú_~Frí_~Sát'.split('_'),\n        weekdaysMin : 'S~ú_Mó~_Tú_~Wé_T~h_Fr~_Sá'.split('_'),\n        weekdaysParseExact : true,\n        longDateFormat : {\n            LT : 'HH:mm',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY HH:mm',\n            LLLL : 'dddd, D MMMM YYYY HH:mm'\n        },\n        calendar : {\n            sameDay : '[T~ódá~ý át] LT',\n            nextDay : '[T~ómó~rró~w át] LT',\n            nextWeek : 'dddd [át] LT',\n            lastDay : '[Ý~ést~érdá~ý át] LT',\n            lastWeek : '[L~ást] dddd [át] LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'í~ñ %s',\n            past : '%s á~gó',\n            s : 'á ~féw ~sécó~ñds',\n            ss : '%d s~écóñ~ds',\n            m : 'á ~míñ~úté',\n            mm : '%d m~íñú~tés',\n            h : 'á~ñ hó~úr',\n            hh : '%d h~óúrs',\n            d : 'á ~dáý',\n            dd : '%d d~áýs',\n            M : 'á ~móñ~th',\n            MM : '%d m~óñt~hs',\n            y : 'á ~ýéár',\n            yy : '%d ý~éárs'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}(th|st|nd|rd)/,\n        ordinal : function (number) {\n            var b = number % 10,\n                output = (~~(number % 100 / 10) === 1) ? 'th' :\n                (b === 1) ? 'st' :\n                (b === 2) ? 'nd' :\n                (b === 3) ? 'rd' : 'th';\n            return number + output;\n        },\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return xPseudo;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var yo = moment.defineLocale('yo', {\n        months : 'Sẹ́rẹ́_Èrèlè_Ẹrẹ̀nà_Ìgbé_Èbibi_Òkùdu_Agẹmo_Ògún_Owewe_Ọ̀wàrà_Bélú_Ọ̀pẹ̀̀'.split('_'),\n        monthsShort : 'Sẹ́r_Èrl_Ẹrn_Ìgb_Èbi_Òkù_Agẹ_Ògú_Owe_Ọ̀wà_Bél_Ọ̀pẹ̀̀'.split('_'),\n        weekdays : 'Àìkú_Ajé_Ìsẹ́gun_Ọjọ́rú_Ọjọ́bọ_Ẹtì_Àbámẹ́ta'.split('_'),\n        weekdaysShort : 'Àìk_Ajé_Ìsẹ́_Ọjr_Ọjb_Ẹtì_Àbá'.split('_'),\n        weekdaysMin : 'Àì_Aj_Ìs_Ọr_Ọb_Ẹt_Àb'.split('_'),\n        longDateFormat : {\n            LT : 'h:mm A',\n            LTS : 'h:mm:ss A',\n            L : 'DD/MM/YYYY',\n            LL : 'D MMMM YYYY',\n            LLL : 'D MMMM YYYY h:mm A',\n            LLLL : 'dddd, D MMMM YYYY h:mm A'\n        },\n        calendar : {\n            sameDay : '[Ònì ni] LT',\n            nextDay : '[Ọ̀la ni] LT',\n            nextWeek : 'dddd [Ọsẹ̀ tón\\'bọ] [ni] LT',\n            lastDay : '[Àna ni] LT',\n            lastWeek : 'dddd [Ọsẹ̀ tólọ́] [ni] LT',\n            sameElse : 'L'\n        },\n        relativeTime : {\n            future : 'ní %s',\n            past : '%s kọjá',\n            s : 'ìsẹjú aayá die',\n            ss :'aayá %d',\n            m : 'ìsẹjú kan',\n            mm : 'ìsẹjú %d',\n            h : 'wákati kan',\n            hh : 'wákati %d',\n            d : 'ọjọ́ kan',\n            dd : 'ọjọ́ %d',\n            M : 'osù kan',\n            MM : 'osù %d',\n            y : 'ọdún kan',\n            yy : 'ọdún %d'\n        },\n        dayOfMonthOrdinalParse : /ọjọ́\\s\\d{1,2}/,\n        ordinal : 'ọjọ́ %d',\n        week : {\n            dow : 1, // Monday is the first day of the week.\n            doy : 4 // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return yo;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var zhCn = moment.defineLocale('zh-cn', {\n        months : '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'),\n        monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),\n        weekdays : '星期日_星期一_星期二_星期三_星期四_星期五_星期六'.split('_'),\n        weekdaysShort : '周日_周一_周二_周三_周四_周五_周六'.split('_'),\n        weekdaysMin : '日_一_二_三_四_五_六'.split('_'),\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'YYYY/MM/DD',\n            LL : 'YYYY年M月D日',\n            LLL : 'YYYY年M月D日Ah点mm分',\n            LLLL : 'YYYY年M月D日ddddAh点mm分',\n            l : 'YYYY/M/D',\n            ll : 'YYYY年M月D日',\n            lll : 'YYYY年M月D日 HH:mm',\n            llll : 'YYYY年M月D日dddd HH:mm'\n        },\n        meridiemParse: /凌晨|早上|上午|中午|下午|晚上/,\n        meridiemHour: function (hour, meridiem) {\n            if (hour === 12) {\n                hour = 0;\n            }\n            if (meridiem === '凌晨' || meridiem === '早上' ||\n                    meridiem === '上午') {\n                return hour;\n            } else if (meridiem === '下午' || meridiem === '晚上') {\n                return hour + 12;\n            } else {\n                // '中午'\n                return hour >= 11 ? hour : hour + 12;\n            }\n        },\n        meridiem : function (hour, minute, isLower) {\n            var hm = hour * 100 + minute;\n            if (hm < 600) {\n                return '凌晨';\n            } else if (hm < 900) {\n                return '早上';\n            } else if (hm < 1130) {\n                return '上午';\n            } else if (hm < 1230) {\n                return '中午';\n            } else if (hm < 1800) {\n                return '下午';\n            } else {\n                return '晚上';\n            }\n        },\n        calendar : {\n            sameDay : '[今天]LT',\n            nextDay : '[明天]LT',\n            nextWeek : '[下]ddddLT',\n            lastDay : '[昨天]LT',\n            lastWeek : '[上]ddddLT',\n            sameElse : 'L'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}(日|月|周)/,\n        ordinal : function (number, period) {\n            switch (period) {\n                case 'd':\n                case 'D':\n                case 'DDD':\n                    return number + '日';\n                case 'M':\n                    return number + '月';\n                case 'w':\n                case 'W':\n                    return number + '周';\n                default:\n                    return number;\n            }\n        },\n        relativeTime : {\n            future : '%s内',\n            past : '%s前',\n            s : '几秒',\n            ss : '%d 秒',\n            m : '1 分钟',\n            mm : '%d 分钟',\n            h : '1 小时',\n            hh : '%d 小时',\n            d : '1 天',\n            dd : '%d 天',\n            M : '1 个月',\n            MM : '%d 个月',\n            y : '1 年',\n            yy : '%d 年'\n        },\n        week : {\n            // GB/T 7408-1994《数据元和交换格式·信息交换·日期和时间表示法》与ISO 8601:1988等效\n            dow : 1, // Monday is the first day of the week.\n            doy : 4  // The week that contains Jan 4th is the first week of the year.\n        }\n    });\n\n    return zhCn;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var zhHk = moment.defineLocale('zh-hk', {\n        months : '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'),\n        monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),\n        weekdays : '星期日_星期一_星期二_星期三_星期四_星期五_星期六'.split('_'),\n        weekdaysShort : '週日_週一_週二_週三_週四_週五_週六'.split('_'),\n        weekdaysMin : '日_一_二_三_四_五_六'.split('_'),\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'YYYY/MM/DD',\n            LL : 'YYYY年M月D日',\n            LLL : 'YYYY年M月D日 HH:mm',\n            LLLL : 'YYYY年M月D日dddd HH:mm',\n            l : 'YYYY/M/D',\n            ll : 'YYYY年M月D日',\n            lll : 'YYYY年M月D日 HH:mm',\n            llll : 'YYYY年M月D日dddd HH:mm'\n        },\n        meridiemParse: /凌晨|早上|上午|中午|下午|晚上/,\n        meridiemHour : function (hour, meridiem) {\n            if (hour === 12) {\n                hour = 0;\n            }\n            if (meridiem === '凌晨' || meridiem === '早上' || meridiem === '上午') {\n                return hour;\n            } else if (meridiem === '中午') {\n                return hour >= 11 ? hour : hour + 12;\n            } else if (meridiem === '下午' || meridiem === '晚上') {\n                return hour + 12;\n            }\n        },\n        meridiem : function (hour, minute, isLower) {\n            var hm = hour * 100 + minute;\n            if (hm < 600) {\n                return '凌晨';\n            } else if (hm < 900) {\n                return '早上';\n            } else if (hm < 1130) {\n                return '上午';\n            } else if (hm < 1230) {\n                return '中午';\n            } else if (hm < 1800) {\n                return '下午';\n            } else {\n                return '晚上';\n            }\n        },\n        calendar : {\n            sameDay : '[今天]LT',\n            nextDay : '[明天]LT',\n            nextWeek : '[下]ddddLT',\n            lastDay : '[昨天]LT',\n            lastWeek : '[上]ddddLT',\n            sameElse : 'L'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}(日|月|週)/,\n        ordinal : function (number, period) {\n            switch (period) {\n                case 'd' :\n                case 'D' :\n                case 'DDD' :\n                    return number + '日';\n                case 'M' :\n                    return number + '月';\n                case 'w' :\n                case 'W' :\n                    return number + '週';\n                default :\n                    return number;\n            }\n        },\n        relativeTime : {\n            future : '%s內',\n            past : '%s前',\n            s : '幾秒',\n            ss : '%d 秒',\n            m : '1 分鐘',\n            mm : '%d 分鐘',\n            h : '1 小時',\n            hh : '%d 小時',\n            d : '1 天',\n            dd : '%d 天',\n            M : '1 個月',\n            MM : '%d 個月',\n            y : '1 年',\n            yy : '%d 年'\n        }\n    });\n\n    return zhHk;\n\n})));\n","//! moment.js locale configuration\n\n;(function (global, factory) {\n   typeof exports === 'object' && typeof module !== 'undefined'\n       && typeof require === 'function' ? factory(require('../moment')) :\n   typeof define === 'function' && define.amd ? define(['../moment'], factory) :\n   factory(global.moment)\n}(this, (function (moment) { 'use strict';\n\n\n    var zhTw = moment.defineLocale('zh-tw', {\n        months : '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'),\n        monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),\n        weekdays : '星期日_星期一_星期二_星期三_星期四_星期五_星期六'.split('_'),\n        weekdaysShort : '週日_週一_週二_週三_週四_週五_週六'.split('_'),\n        weekdaysMin : '日_一_二_三_四_五_六'.split('_'),\n        longDateFormat : {\n            LT : 'HH:mm',\n            LTS : 'HH:mm:ss',\n            L : 'YYYY/MM/DD',\n            LL : 'YYYY年M月D日',\n            LLL : 'YYYY年M月D日 HH:mm',\n            LLLL : 'YYYY年M月D日dddd HH:mm',\n            l : 'YYYY/M/D',\n            ll : 'YYYY年M月D日',\n            lll : 'YYYY年M月D日 HH:mm',\n            llll : 'YYYY年M月D日dddd HH:mm'\n        },\n        meridiemParse: /凌晨|早上|上午|中午|下午|晚上/,\n        meridiemHour : function (hour, meridiem) {\n            if (hour === 12) {\n                hour = 0;\n            }\n            if (meridiem === '凌晨' || meridiem === '早上' || meridiem === '上午') {\n                return hour;\n            } else if (meridiem === '中午') {\n                return hour >= 11 ? hour : hour + 12;\n            } else if (meridiem === '下午' || meridiem === '晚上') {\n                return hour + 12;\n            }\n        },\n        meridiem : function (hour, minute, isLower) {\n            var hm = hour * 100 + minute;\n            if (hm < 600) {\n                return '凌晨';\n            } else if (hm < 900) {\n                return '早上';\n            } else if (hm < 1130) {\n                return '上午';\n            } else if (hm < 1230) {\n                return '中午';\n            } else if (hm < 1800) {\n                return '下午';\n            } else {\n                return '晚上';\n            }\n        },\n        calendar : {\n            sameDay : '[今天] LT',\n            nextDay : '[明天] LT',\n            nextWeek : '[下]dddd LT',\n            lastDay : '[昨天] LT',\n            lastWeek : '[上]dddd LT',\n            sameElse : 'L'\n        },\n        dayOfMonthOrdinalParse: /\\d{1,2}(日|月|週)/,\n        ordinal : function (number, period) {\n            switch (period) {\n                case 'd' :\n                case 'D' :\n                case 'DDD' :\n                    return number + '日';\n                case 'M' :\n                    return number + '月';\n                case 'w' :\n                case 'W' :\n                    return number + '週';\n                default :\n                    return number;\n            }\n        },\n        relativeTime : {\n            future : '%s內',\n            past : '%s前',\n            s : '幾秒',\n            ss : '%d 秒',\n            m : '1 分鐘',\n            mm : '%d 分鐘',\n            h : '1 小時',\n            hh : '%d 小時',\n            d : '1 天',\n            dd : '%d 天',\n            M : '1 個月',\n            MM : '%d 個月',\n            y : '1 年',\n            yy : '%d 年'\n        }\n    });\n\n    return zhTw;\n\n})));\n","//! moment.js\n\n;(function (global, factory) {\n    typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :\n    typeof define === 'function' && define.amd ? define(factory) :\n    global.moment = factory()\n}(this, (function () { 'use strict';\n\n    var hookCallback;\n\n    function hooks () {\n        return hookCallback.apply(null, arguments);\n    }\n\n    // This is done to register the method called with moment()\n    // without creating circular dependencies.\n    function setHookCallback (callback) {\n        hookCallback = callback;\n    }\n\n    function isArray(input) {\n        return input instanceof Array || Object.prototype.toString.call(input) === '[object Array]';\n    }\n\n    function isObject(input) {\n        // IE8 will treat undefined and null as object if it wasn't for\n        // input != null\n        return input != null && Object.prototype.toString.call(input) === '[object Object]';\n    }\n\n    function isObjectEmpty(obj) {\n        if (Object.getOwnPropertyNames) {\n            return (Object.getOwnPropertyNames(obj).length === 0);\n        } else {\n            var k;\n            for (k in obj) {\n                if (obj.hasOwnProperty(k)) {\n                    return false;\n                }\n            }\n            return true;\n        }\n    }\n\n    function isUndefined(input) {\n        return input === void 0;\n    }\n\n    function isNumber(input) {\n        return typeof input === 'number' || Object.prototype.toString.call(input) === '[object Number]';\n    }\n\n    function isDate(input) {\n        return input instanceof Date || Object.prototype.toString.call(input) === '[object Date]';\n    }\n\n    function map(arr, fn) {\n        var res = [], i;\n        for (i = 0; i < arr.length; ++i) {\n            res.push(fn(arr[i], i));\n        }\n        return res;\n    }\n\n    function hasOwnProp(a, b) {\n        return Object.prototype.hasOwnProperty.call(a, b);\n    }\n\n    function extend(a, b) {\n        for (var i in b) {\n            if (hasOwnProp(b, i)) {\n                a[i] = b[i];\n            }\n        }\n\n        if (hasOwnProp(b, 'toString')) {\n            a.toString = b.toString;\n        }\n\n        if (hasOwnProp(b, 'valueOf')) {\n            a.valueOf = b.valueOf;\n        }\n\n        return a;\n    }\n\n    function createUTC (input, format, locale, strict) {\n        return createLocalOrUTC(input, format, locale, strict, true).utc();\n    }\n\n    function defaultParsingFlags() {\n        // We need to deep clone this object.\n        return {\n            empty           : false,\n            unusedTokens    : [],\n            unusedInput     : [],\n            overflow        : -2,\n            charsLeftOver   : 0,\n            nullInput       : false,\n            invalidMonth    : null,\n            invalidFormat   : false,\n            userInvalidated : false,\n            iso             : false,\n            parsedDateParts : [],\n            meridiem        : null,\n            rfc2822         : false,\n            weekdayMismatch : false\n        };\n    }\n\n    function getParsingFlags(m) {\n        if (m._pf == null) {\n            m._pf = defaultParsingFlags();\n        }\n        return m._pf;\n    }\n\n    var some;\n    if (Array.prototype.some) {\n        some = Array.prototype.some;\n    } else {\n        some = function (fun) {\n            var t = Object(this);\n            var len = t.length >>> 0;\n\n            for (var i = 0; i < len; i++) {\n                if (i in t && fun.call(this, t[i], i, t)) {\n                    return true;\n                }\n            }\n\n            return false;\n        };\n    }\n\n    function isValid(m) {\n        if (m._isValid == null) {\n            var flags = getParsingFlags(m);\n            var parsedParts = some.call(flags.parsedDateParts, function (i) {\n                return i != null;\n            });\n            var isNowValid = !isNaN(m._d.getTime()) &&\n                flags.overflow < 0 &&\n                !flags.empty &&\n                !flags.invalidMonth &&\n                !flags.invalidWeekday &&\n                !flags.weekdayMismatch &&\n                !flags.nullInput &&\n                !flags.invalidFormat &&\n                !flags.userInvalidated &&\n                (!flags.meridiem || (flags.meridiem && parsedParts));\n\n            if (m._strict) {\n                isNowValid = isNowValid &&\n                    flags.charsLeftOver === 0 &&\n                    flags.unusedTokens.length === 0 &&\n                    flags.bigHour === undefined;\n            }\n\n            if (Object.isFrozen == null || !Object.isFrozen(m)) {\n                m._isValid = isNowValid;\n            }\n            else {\n                return isNowValid;\n            }\n        }\n        return m._isValid;\n    }\n\n    function createInvalid (flags) {\n        var m = createUTC(NaN);\n        if (flags != null) {\n            extend(getParsingFlags(m), flags);\n        }\n        else {\n            getParsingFlags(m).userInvalidated = true;\n        }\n\n        return m;\n    }\n\n    // Plugins that add properties should also add the key here (null value),\n    // so we can properly clone ourselves.\n    var momentProperties = hooks.momentProperties = [];\n\n    function copyConfig(to, from) {\n        var i, prop, val;\n\n        if (!isUndefined(from._isAMomentObject)) {\n            to._isAMomentObject = from._isAMomentObject;\n        }\n        if (!isUndefined(from._i)) {\n            to._i = from._i;\n        }\n        if (!isUndefined(from._f)) {\n            to._f = from._f;\n        }\n        if (!isUndefined(from._l)) {\n            to._l = from._l;\n        }\n        if (!isUndefined(from._strict)) {\n            to._strict = from._strict;\n        }\n        if (!isUndefined(from._tzm)) {\n            to._tzm = from._tzm;\n        }\n        if (!isUndefined(from._isUTC)) {\n            to._isUTC = from._isUTC;\n        }\n        if (!isUndefined(from._offset)) {\n            to._offset = from._offset;\n        }\n        if (!isUndefined(from._pf)) {\n            to._pf = getParsingFlags(from);\n        }\n        if (!isUndefined(from._locale)) {\n            to._locale = from._locale;\n        }\n\n        if (momentProperties.length > 0) {\n            for (i = 0; i < momentProperties.length; i++) {\n                prop = momentProperties[i];\n                val = from[prop];\n                if (!isUndefined(val)) {\n                    to[prop] = val;\n                }\n            }\n        }\n\n        return to;\n    }\n\n    var updateInProgress = false;\n\n    // Moment prototype object\n    function Moment(config) {\n        copyConfig(this, config);\n        this._d = new Date(config._d != null ? config._d.getTime() : NaN);\n        if (!this.isValid()) {\n            this._d = new Date(NaN);\n        }\n        // Prevent infinite loop in case updateOffset creates new moment\n        // objects.\n        if (updateInProgress === false) {\n            updateInProgress = true;\n            hooks.updateOffset(this);\n            updateInProgress = false;\n        }\n    }\n\n    function isMoment (obj) {\n        return obj instanceof Moment || (obj != null && obj._isAMomentObject != null);\n    }\n\n    function absFloor (number) {\n        if (number < 0) {\n            // -0 -> 0\n            return Math.ceil(number) || 0;\n        } else {\n            return Math.floor(number);\n        }\n    }\n\n    function toInt(argumentForCoercion) {\n        var coercedNumber = +argumentForCoercion,\n            value = 0;\n\n        if (coercedNumber !== 0 && isFinite(coercedNumber)) {\n            value = absFloor(coercedNumber);\n        }\n\n        return value;\n    }\n\n    // compare two arrays, return the number of differences\n    function compareArrays(array1, array2, dontConvert) {\n        var len = Math.min(array1.length, array2.length),\n            lengthDiff = Math.abs(array1.length - array2.length),\n            diffs = 0,\n            i;\n        for (i = 0; i < len; i++) {\n            if ((dontConvert && array1[i] !== array2[i]) ||\n                (!dontConvert && toInt(array1[i]) !== toInt(array2[i]))) {\n                diffs++;\n            }\n        }\n        return diffs + lengthDiff;\n    }\n\n    function warn(msg) {\n        if (hooks.suppressDeprecationWarnings === false &&\n                (typeof console !==  'undefined') && console.warn) {\n            console.warn('Deprecation warning: ' + msg);\n        }\n    }\n\n    function deprecate(msg, fn) {\n        var firstTime = true;\n\n        return extend(function () {\n            if (hooks.deprecationHandler != null) {\n                hooks.deprecationHandler(null, msg);\n            }\n            if (firstTime) {\n                var args = [];\n                var arg;\n                for (var i = 0; i < arguments.length; i++) {\n                    arg = '';\n                    if (typeof arguments[i] === 'object') {\n                        arg += '\\n[' + i + '] ';\n                        for (var key in arguments[0]) {\n                            arg += key + ': ' + arguments[0][key] + ', ';\n                        }\n                        arg = arg.slice(0, -2); // Remove trailing comma and space\n                    } else {\n                        arg = arguments[i];\n                    }\n                    args.push(arg);\n                }\n                warn(msg + '\\nArguments: ' + Array.prototype.slice.call(args).join('') + '\\n' + (new Error()).stack);\n                firstTime = false;\n            }\n            return fn.apply(this, arguments);\n        }, fn);\n    }\n\n    var deprecations = {};\n\n    function deprecateSimple(name, msg) {\n        if (hooks.deprecationHandler != null) {\n            hooks.deprecationHandler(name, msg);\n        }\n        if (!deprecations[name]) {\n            warn(msg);\n            deprecations[name] = true;\n        }\n    }\n\n    hooks.suppressDeprecationWarnings = false;\n    hooks.deprecationHandler = null;\n\n    function isFunction(input) {\n        return input instanceof Function || Object.prototype.toString.call(input) === '[object Function]';\n    }\n\n    function set (config) {\n        var prop, i;\n        for (i in config) {\n            prop = config[i];\n            if (isFunction(prop)) {\n                this[i] = prop;\n            } else {\n                this['_' + i] = prop;\n            }\n        }\n        this._config = config;\n        // Lenient ordinal parsing accepts just a number in addition to\n        // number + (possibly) stuff coming from _dayOfMonthOrdinalParse.\n        // TODO: Remove \"ordinalParse\" fallback in next major release.\n        this._dayOfMonthOrdinalParseLenient = new RegExp(\n            (this._dayOfMonthOrdinalParse.source || this._ordinalParse.source) +\n                '|' + (/\\d{1,2}/).source);\n    }\n\n    function mergeConfigs(parentConfig, childConfig) {\n        var res = extend({}, parentConfig), prop;\n        for (prop in childConfig) {\n            if (hasOwnProp(childConfig, prop)) {\n                if (isObject(parentConfig[prop]) && isObject(childConfig[prop])) {\n                    res[prop] = {};\n                    extend(res[prop], parentConfig[prop]);\n                    extend(res[prop], childConfig[prop]);\n                } else if (childConfig[prop] != null) {\n                    res[prop] = childConfig[prop];\n                } else {\n                    delete res[prop];\n                }\n            }\n        }\n        for (prop in parentConfig) {\n            if (hasOwnProp(parentConfig, prop) &&\n                    !hasOwnProp(childConfig, prop) &&\n                    isObject(parentConfig[prop])) {\n                // make sure changes to properties don't modify parent config\n                res[prop] = extend({}, res[prop]);\n            }\n        }\n        return res;\n    }\n\n    function Locale(config) {\n        if (config != null) {\n            this.set(config);\n        }\n    }\n\n    var keys;\n\n    if (Object.keys) {\n        keys = Object.keys;\n    } else {\n        keys = function (obj) {\n            var i, res = [];\n            for (i in obj) {\n                if (hasOwnProp(obj, i)) {\n                    res.push(i);\n                }\n            }\n            return res;\n        };\n    }\n\n    var defaultCalendar = {\n        sameDay : '[Today at] LT',\n        nextDay : '[Tomorrow at] LT',\n        nextWeek : 'dddd [at] LT',\n        lastDay : '[Yesterday at] LT',\n        lastWeek : '[Last] dddd [at] LT',\n        sameElse : 'L'\n    };\n\n    function calendar (key, mom, now) {\n        var output = this._calendar[key] || this._calendar['sameElse'];\n        return isFunction(output) ? output.call(mom, now) : output;\n    }\n\n    var defaultLongDateFormat = {\n        LTS  : 'h:mm:ss A',\n        LT   : 'h:mm A',\n        L    : 'MM/DD/YYYY',\n        LL   : 'MMMM D, YYYY',\n        LLL  : 'MMMM D, YYYY h:mm A',\n        LLLL : 'dddd, MMMM D, YYYY h:mm A'\n    };\n\n    function longDateFormat (key) {\n        var format = this._longDateFormat[key],\n            formatUpper = this._longDateFormat[key.toUpperCase()];\n\n        if (format || !formatUpper) {\n            return format;\n        }\n\n        this._longDateFormat[key] = formatUpper.replace(/MMMM|MM|DD|dddd/g, function (val) {\n            return val.slice(1);\n        });\n\n        return this._longDateFormat[key];\n    }\n\n    var defaultInvalidDate = 'Invalid date';\n\n    function invalidDate () {\n        return this._invalidDate;\n    }\n\n    var defaultOrdinal = '%d';\n    var defaultDayOfMonthOrdinalParse = /\\d{1,2}/;\n\n    function ordinal (number) {\n        return this._ordinal.replace('%d', number);\n    }\n\n    var defaultRelativeTime = {\n        future : 'in %s',\n        past   : '%s ago',\n        s  : 'a few seconds',\n        ss : '%d seconds',\n        m  : 'a minute',\n        mm : '%d minutes',\n        h  : 'an hour',\n        hh : '%d hours',\n        d  : 'a day',\n        dd : '%d days',\n        M  : 'a month',\n        MM : '%d months',\n        y  : 'a year',\n        yy : '%d years'\n    };\n\n    function relativeTime (number, withoutSuffix, string, isFuture) {\n        var output = this._relativeTime[string];\n        return (isFunction(output)) ?\n            output(number, withoutSuffix, string, isFuture) :\n            output.replace(/%d/i, number);\n    }\n\n    function pastFuture (diff, output) {\n        var format = this._relativeTime[diff > 0 ? 'future' : 'past'];\n        return isFunction(format) ? format(output) : format.replace(/%s/i, output);\n    }\n\n    var aliases = {};\n\n    function addUnitAlias (unit, shorthand) {\n        var lowerCase = unit.toLowerCase();\n        aliases[lowerCase] = aliases[lowerCase + 's'] = aliases[shorthand] = unit;\n    }\n\n    function normalizeUnits(units) {\n        return typeof units === 'string' ? aliases[units] || aliases[units.toLowerCase()] : undefined;\n    }\n\n    function normalizeObjectUnits(inputObject) {\n        var normalizedInput = {},\n            normalizedProp,\n            prop;\n\n        for (prop in inputObject) {\n            if (hasOwnProp(inputObject, prop)) {\n                normalizedProp = normalizeUnits(prop);\n                if (normalizedProp) {\n                    normalizedInput[normalizedProp] = inputObject[prop];\n                }\n            }\n        }\n\n        return normalizedInput;\n    }\n\n    var priorities = {};\n\n    function addUnitPriority(unit, priority) {\n        priorities[unit] = priority;\n    }\n\n    function getPrioritizedUnits(unitsObj) {\n        var units = [];\n        for (var u in unitsObj) {\n            units.push({unit: u, priority: priorities[u]});\n        }\n        units.sort(function (a, b) {\n            return a.priority - b.priority;\n        });\n        return units;\n    }\n\n    function zeroFill(number, targetLength, forceSign) {\n        var absNumber = '' + Math.abs(number),\n            zerosToFill = targetLength - absNumber.length,\n            sign = number >= 0;\n        return (sign ? (forceSign ? '+' : '') : '-') +\n            Math.pow(10, Math.max(0, zerosToFill)).toString().substr(1) + absNumber;\n    }\n\n    var formattingTokens = /(\\[[^\\[]*\\])|(\\\\)?([Hh]mm(ss)?|Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Qo?|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|kk?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g;\n\n    var localFormattingTokens = /(\\[[^\\[]*\\])|(\\\\)?(LTS|LT|LL?L?L?|l{1,4})/g;\n\n    var formatFunctions = {};\n\n    var formatTokenFunctions = {};\n\n    // token:    'M'\n    // padded:   ['MM', 2]\n    // ordinal:  'Mo'\n    // callback: function () { this.month() + 1 }\n    function addFormatToken (token, padded, ordinal, callback) {\n        var func = callback;\n        if (typeof callback === 'string') {\n            func = function () {\n                return this[callback]();\n            };\n        }\n        if (token) {\n            formatTokenFunctions[token] = func;\n        }\n        if (padded) {\n            formatTokenFunctions[padded[0]] = function () {\n                return zeroFill(func.apply(this, arguments), padded[1], padded[2]);\n            };\n        }\n        if (ordinal) {\n            formatTokenFunctions[ordinal] = function () {\n                return this.localeData().ordinal(func.apply(this, arguments), token);\n            };\n        }\n    }\n\n    function removeFormattingTokens(input) {\n        if (input.match(/\\[[\\s\\S]/)) {\n            return input.replace(/^\\[|\\]$/g, '');\n        }\n        return input.replace(/\\\\/g, '');\n    }\n\n    function makeFormatFunction(format) {\n        var array = format.match(formattingTokens), i, length;\n\n        for (i = 0, length = array.length; i < length; i++) {\n            if (formatTokenFunctions[array[i]]) {\n                array[i] = formatTokenFunctions[array[i]];\n            } else {\n                array[i] = removeFormattingTokens(array[i]);\n            }\n        }\n\n        return function (mom) {\n            var output = '', i;\n            for (i = 0; i < length; i++) {\n                output += isFunction(array[i]) ? array[i].call(mom, format) : array[i];\n            }\n            return output;\n        };\n    }\n\n    // format date using native date object\n    function formatMoment(m, format) {\n        if (!m.isValid()) {\n            return m.localeData().invalidDate();\n        }\n\n        format = expandFormat(format, m.localeData());\n        formatFunctions[format] = formatFunctions[format] || makeFormatFunction(format);\n\n        return formatFunctions[format](m);\n    }\n\n    function expandFormat(format, locale) {\n        var i = 5;\n\n        function replaceLongDateFormatTokens(input) {\n            return locale.longDateFormat(input) || input;\n        }\n\n        localFormattingTokens.lastIndex = 0;\n        while (i >= 0 && localFormattingTokens.test(format)) {\n            format = format.replace(localFormattingTokens, replaceLongDateFormatTokens);\n            localFormattingTokens.lastIndex = 0;\n            i -= 1;\n        }\n\n        return format;\n    }\n\n    var match1         = /\\d/;            //       0 - 9\n    var match2         = /\\d\\d/;          //      00 - 99\n    var match3         = /\\d{3}/;         //     000 - 999\n    var match4         = /\\d{4}/;         //    0000 - 9999\n    var match6         = /[+-]?\\d{6}/;    // -999999 - 999999\n    var match1to2      = /\\d\\d?/;         //       0 - 99\n    var match3to4      = /\\d\\d\\d\\d?/;     //     999 - 9999\n    var match5to6      = /\\d\\d\\d\\d\\d\\d?/; //   99999 - 999999\n    var match1to3      = /\\d{1,3}/;       //       0 - 999\n    var match1to4      = /\\d{1,4}/;       //       0 - 9999\n    var match1to6      = /[+-]?\\d{1,6}/;  // -999999 - 999999\n\n    var matchUnsigned  = /\\d+/;           //       0 - inf\n    var matchSigned    = /[+-]?\\d+/;      //    -inf - inf\n\n    var matchOffset    = /Z|[+-]\\d\\d:?\\d\\d/gi; // +00:00 -00:00 +0000 -0000 or Z\n    var matchShortOffset = /Z|[+-]\\d\\d(?::?\\d\\d)?/gi; // +00 -00 +00:00 -00:00 +0000 -0000 or Z\n\n    var matchTimestamp = /[+-]?\\d+(\\.\\d{1,3})?/; // 123456789 123456789.123\n\n    // any word (or two) characters or numbers including two/three word month in arabic.\n    // includes scottish gaelic two word and hyphenated months\n    var matchWord = /[0-9]{0,256}['a-z\\u00A0-\\u05FF\\u0700-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFF07\\uFF10-\\uFFEF]{1,256}|[\\u0600-\\u06FF\\/]{1,256}(\\s*?[\\u0600-\\u06FF]{1,256}){1,2}/i;\n\n    var regexes = {};\n\n    function addRegexToken (token, regex, strictRegex) {\n        regexes[token] = isFunction(regex) ? regex : function (isStrict, localeData) {\n            return (isStrict && strictRegex) ? strictRegex : regex;\n        };\n    }\n\n    function getParseRegexForToken (token, config) {\n        if (!hasOwnProp(regexes, token)) {\n            return new RegExp(unescapeFormat(token));\n        }\n\n        return regexes[token](config._strict, config._locale);\n    }\n\n    // Code from http://stackoverflow.com/questions/3561493/is-there-a-regexp-escape-function-in-javascript\n    function unescapeFormat(s) {\n        return regexEscape(s.replace('\\\\', '').replace(/\\\\(\\[)|\\\\(\\])|\\[([^\\]\\[]*)\\]|\\\\(.)/g, function (matched, p1, p2, p3, p4) {\n            return p1 || p2 || p3 || p4;\n        }));\n    }\n\n    function regexEscape(s) {\n        return s.replace(/[-\\/\\\\^$*+?.()|[\\]{}]/g, '\\\\$&');\n    }\n\n    var tokens = {};\n\n    function addParseToken (token, callback) {\n        var i, func = callback;\n        if (typeof token === 'string') {\n            token = [token];\n        }\n        if (isNumber(callback)) {\n            func = function (input, array) {\n                array[callback] = toInt(input);\n            };\n        }\n        for (i = 0; i < token.length; i++) {\n            tokens[token[i]] = func;\n        }\n    }\n\n    function addWeekParseToken (token, callback) {\n        addParseToken(token, function (input, array, config, token) {\n            config._w = config._w || {};\n            callback(input, config._w, config, token);\n        });\n    }\n\n    function addTimeToArrayFromToken(token, input, config) {\n        if (input != null && hasOwnProp(tokens, token)) {\n            tokens[token](input, config._a, config, token);\n        }\n    }\n\n    var YEAR = 0;\n    var MONTH = 1;\n    var DATE = 2;\n    var HOUR = 3;\n    var MINUTE = 4;\n    var SECOND = 5;\n    var MILLISECOND = 6;\n    var WEEK = 7;\n    var WEEKDAY = 8;\n\n    // FORMATTING\n\n    addFormatToken('Y', 0, 0, function () {\n        var y = this.year();\n        return y <= 9999 ? '' + y : '+' + y;\n    });\n\n    addFormatToken(0, ['YY', 2], 0, function () {\n        return this.year() % 100;\n    });\n\n    addFormatToken(0, ['YYYY',   4],       0, 'year');\n    addFormatToken(0, ['YYYYY',  5],       0, 'year');\n    addFormatToken(0, ['YYYYYY', 6, true], 0, 'year');\n\n    // ALIASES\n\n    addUnitAlias('year', 'y');\n\n    // PRIORITIES\n\n    addUnitPriority('year', 1);\n\n    // PARSING\n\n    addRegexToken('Y',      matchSigned);\n    addRegexToken('YY',     match1to2, match2);\n    addRegexToken('YYYY',   match1to4, match4);\n    addRegexToken('YYYYY',  match1to6, match6);\n    addRegexToken('YYYYYY', match1to6, match6);\n\n    addParseToken(['YYYYY', 'YYYYYY'], YEAR);\n    addParseToken('YYYY', function (input, array) {\n        array[YEAR] = input.length === 2 ? hooks.parseTwoDigitYear(input) : toInt(input);\n    });\n    addParseToken('YY', function (input, array) {\n        array[YEAR] = hooks.parseTwoDigitYear(input);\n    });\n    addParseToken('Y', function (input, array) {\n        array[YEAR] = parseInt(input, 10);\n    });\n\n    // HELPERS\n\n    function daysInYear(year) {\n        return isLeapYear(year) ? 366 : 365;\n    }\n\n    function isLeapYear(year) {\n        return (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0;\n    }\n\n    // HOOKS\n\n    hooks.parseTwoDigitYear = function (input) {\n        return toInt(input) + (toInt(input) > 68 ? 1900 : 2000);\n    };\n\n    // MOMENTS\n\n    var getSetYear = makeGetSet('FullYear', true);\n\n    function getIsLeapYear () {\n        return isLeapYear(this.year());\n    }\n\n    function makeGetSet (unit, keepTime) {\n        return function (value) {\n            if (value != null) {\n                set$1(this, unit, value);\n                hooks.updateOffset(this, keepTime);\n                return this;\n            } else {\n                return get(this, unit);\n            }\n        };\n    }\n\n    function get (mom, unit) {\n        return mom.isValid() ?\n            mom._d['get' + (mom._isUTC ? 'UTC' : '') + unit]() : NaN;\n    }\n\n    function set$1 (mom, unit, value) {\n        if (mom.isValid() && !isNaN(value)) {\n            if (unit === 'FullYear' && isLeapYear(mom.year()) && mom.month() === 1 && mom.date() === 29) {\n                mom._d['set' + (mom._isUTC ? 'UTC' : '') + unit](value, mom.month(), daysInMonth(value, mom.month()));\n            }\n            else {\n                mom._d['set' + (mom._isUTC ? 'UTC' : '') + unit](value);\n            }\n        }\n    }\n\n    // MOMENTS\n\n    function stringGet (units) {\n        units = normalizeUnits(units);\n        if (isFunction(this[units])) {\n            return this[units]();\n        }\n        return this;\n    }\n\n\n    function stringSet (units, value) {\n        if (typeof units === 'object') {\n            units = normalizeObjectUnits(units);\n            var prioritized = getPrioritizedUnits(units);\n            for (var i = 0; i < prioritized.length; i++) {\n                this[prioritized[i].unit](units[prioritized[i].unit]);\n            }\n        } else {\n            units = normalizeUnits(units);\n            if (isFunction(this[units])) {\n                return this[units](value);\n            }\n        }\n        return this;\n    }\n\n    function mod(n, x) {\n        return ((n % x) + x) % x;\n    }\n\n    var indexOf;\n\n    if (Array.prototype.indexOf) {\n        indexOf = Array.prototype.indexOf;\n    } else {\n        indexOf = function (o) {\n            // I know\n            var i;\n            for (i = 0; i < this.length; ++i) {\n                if (this[i] === o) {\n                    return i;\n                }\n            }\n            return -1;\n        };\n    }\n\n    function daysInMonth(year, month) {\n        if (isNaN(year) || isNaN(month)) {\n            return NaN;\n        }\n        var modMonth = mod(month, 12);\n        year += (month - modMonth) / 12;\n        return modMonth === 1 ? (isLeapYear(year) ? 29 : 28) : (31 - modMonth % 7 % 2);\n    }\n\n    // FORMATTING\n\n    addFormatToken('M', ['MM', 2], 'Mo', function () {\n        return this.month() + 1;\n    });\n\n    addFormatToken('MMM', 0, 0, function (format) {\n        return this.localeData().monthsShort(this, format);\n    });\n\n    addFormatToken('MMMM', 0, 0, function (format) {\n        return this.localeData().months(this, format);\n    });\n\n    // ALIASES\n\n    addUnitAlias('month', 'M');\n\n    // PRIORITY\n\n    addUnitPriority('month', 8);\n\n    // PARSING\n\n    addRegexToken('M',    match1to2);\n    addRegexToken('MM',   match1to2, match2);\n    addRegexToken('MMM',  function (isStrict, locale) {\n        return locale.monthsShortRegex(isStrict);\n    });\n    addRegexToken('MMMM', function (isStrict, locale) {\n        return locale.monthsRegex(isStrict);\n    });\n\n    addParseToken(['M', 'MM'], function (input, array) {\n        array[MONTH] = toInt(input) - 1;\n    });\n\n    addParseToken(['MMM', 'MMMM'], function (input, array, config, token) {\n        var month = config._locale.monthsParse(input, token, config._strict);\n        // if we didn't find a month name, mark the date as invalid.\n        if (month != null) {\n            array[MONTH] = month;\n        } else {\n            getParsingFlags(config).invalidMonth = input;\n        }\n    });\n\n    // LOCALES\n\n    var MONTHS_IN_FORMAT = /D[oD]?(\\[[^\\[\\]]*\\]|\\s)+MMMM?/;\n    var defaultLocaleMonths = 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_');\n    function localeMonths (m, format) {\n        if (!m) {\n            return isArray(this._months) ? this._months :\n                this._months['standalone'];\n        }\n        return isArray(this._months) ? this._months[m.month()] :\n            this._months[(this._months.isFormat || MONTHS_IN_FORMAT).test(format) ? 'format' : 'standalone'][m.month()];\n    }\n\n    var defaultLocaleMonthsShort = 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_');\n    function localeMonthsShort (m, format) {\n        if (!m) {\n            return isArray(this._monthsShort) ? this._monthsShort :\n                this._monthsShort['standalone'];\n        }\n        return isArray(this._monthsShort) ? this._monthsShort[m.month()] :\n            this._monthsShort[MONTHS_IN_FORMAT.test(format) ? 'format' : 'standalone'][m.month()];\n    }\n\n    function handleStrictParse(monthName, format, strict) {\n        var i, ii, mom, llc = monthName.toLocaleLowerCase();\n        if (!this._monthsParse) {\n            // this is not used\n            this._monthsParse = [];\n            this._longMonthsParse = [];\n            this._shortMonthsParse = [];\n            for (i = 0; i < 12; ++i) {\n                mom = createUTC([2000, i]);\n                this._shortMonthsParse[i] = this.monthsShort(mom, '').toLocaleLowerCase();\n                this._longMonthsParse[i] = this.months(mom, '').toLocaleLowerCase();\n            }\n        }\n\n        if (strict) {\n            if (format === 'MMM') {\n                ii = indexOf.call(this._shortMonthsParse, llc);\n                return ii !== -1 ? ii : null;\n            } else {\n                ii = indexOf.call(this._longMonthsParse, llc);\n                return ii !== -1 ? ii : null;\n            }\n        } else {\n            if (format === 'MMM') {\n                ii = indexOf.call(this._shortMonthsParse, llc);\n                if (ii !== -1) {\n                    return ii;\n                }\n                ii = indexOf.call(this._longMonthsParse, llc);\n                return ii !== -1 ? ii : null;\n            } else {\n                ii = indexOf.call(this._longMonthsParse, llc);\n                if (ii !== -1) {\n                    return ii;\n                }\n                ii = indexOf.call(this._shortMonthsParse, llc);\n                return ii !== -1 ? ii : null;\n            }\n        }\n    }\n\n    function localeMonthsParse (monthName, format, strict) {\n        var i, mom, regex;\n\n        if (this._monthsParseExact) {\n            return handleStrictParse.call(this, monthName, format, strict);\n        }\n\n        if (!this._monthsParse) {\n            this._monthsParse = [];\n            this._longMonthsParse = [];\n            this._shortMonthsParse = [];\n        }\n\n        // TODO: add sorting\n        // Sorting makes sure if one month (or abbr) is a prefix of another\n        // see sorting in computeMonthsParse\n        for (i = 0; i < 12; i++) {\n            // make the regex if we don't have it already\n            mom = createUTC([2000, i]);\n            if (strict && !this._longMonthsParse[i]) {\n                this._longMonthsParse[i] = new RegExp('^' + this.months(mom, '').replace('.', '') + '$', 'i');\n                this._shortMonthsParse[i] = new RegExp('^' + this.monthsShort(mom, '').replace('.', '') + '$', 'i');\n            }\n            if (!strict && !this._monthsParse[i]) {\n                regex = '^' + this.months(mom, '') + '|^' + this.monthsShort(mom, '');\n                this._monthsParse[i] = new RegExp(regex.replace('.', ''), 'i');\n            }\n            // test the regex\n            if (strict && format === 'MMMM' && this._longMonthsParse[i].test(monthName)) {\n                return i;\n            } else if (strict && format === 'MMM' && this._shortMonthsParse[i].test(monthName)) {\n                return i;\n            } else if (!strict && this._monthsParse[i].test(monthName)) {\n                return i;\n            }\n        }\n    }\n\n    // MOMENTS\n\n    function setMonth (mom, value) {\n        var dayOfMonth;\n\n        if (!mom.isValid()) {\n            // No op\n            return mom;\n        }\n\n        if (typeof value === 'string') {\n            if (/^\\d+$/.test(value)) {\n                value = toInt(value);\n            } else {\n                value = mom.localeData().monthsParse(value);\n                // TODO: Another silent failure?\n                if (!isNumber(value)) {\n                    return mom;\n                }\n            }\n        }\n\n        dayOfMonth = Math.min(mom.date(), daysInMonth(mom.year(), value));\n        mom._d['set' + (mom._isUTC ? 'UTC' : '') + 'Month'](value, dayOfMonth);\n        return mom;\n    }\n\n    function getSetMonth (value) {\n        if (value != null) {\n            setMonth(this, value);\n            hooks.updateOffset(this, true);\n            return this;\n        } else {\n            return get(this, 'Month');\n        }\n    }\n\n    function getDaysInMonth () {\n        return daysInMonth(this.year(), this.month());\n    }\n\n    var defaultMonthsShortRegex = matchWord;\n    function monthsShortRegex (isStrict) {\n        if (this._monthsParseExact) {\n            if (!hasOwnProp(this, '_monthsRegex')) {\n                computeMonthsParse.call(this);\n            }\n            if (isStrict) {\n                return this._monthsShortStrictRegex;\n            } else {\n                return this._monthsShortRegex;\n            }\n        } else {\n            if (!hasOwnProp(this, '_monthsShortRegex')) {\n                this._monthsShortRegex = defaultMonthsShortRegex;\n            }\n            return this._monthsShortStrictRegex && isStrict ?\n                this._monthsShortStrictRegex : this._monthsShortRegex;\n        }\n    }\n\n    var defaultMonthsRegex = matchWord;\n    function monthsRegex (isStrict) {\n        if (this._monthsParseExact) {\n            if (!hasOwnProp(this, '_monthsRegex')) {\n                computeMonthsParse.call(this);\n            }\n            if (isStrict) {\n                return this._monthsStrictRegex;\n            } else {\n                return this._monthsRegex;\n            }\n        } else {\n            if (!hasOwnProp(this, '_monthsRegex')) {\n                this._monthsRegex = defaultMonthsRegex;\n            }\n            return this._monthsStrictRegex && isStrict ?\n                this._monthsStrictRegex : this._monthsRegex;\n        }\n    }\n\n    function computeMonthsParse () {\n        function cmpLenRev(a, b) {\n            return b.length - a.length;\n        }\n\n        var shortPieces = [], longPieces = [], mixedPieces = [],\n            i, mom;\n        for (i = 0; i < 12; i++) {\n            // make the regex if we don't have it already\n            mom = createUTC([2000, i]);\n            shortPieces.push(this.monthsShort(mom, ''));\n            longPieces.push(this.months(mom, ''));\n            mixedPieces.push(this.months(mom, ''));\n            mixedPieces.push(this.monthsShort(mom, ''));\n        }\n        // Sorting makes sure if one month (or abbr) is a prefix of another it\n        // will match the longer piece.\n        shortPieces.sort(cmpLenRev);\n        longPieces.sort(cmpLenRev);\n        mixedPieces.sort(cmpLenRev);\n        for (i = 0; i < 12; i++) {\n            shortPieces[i] = regexEscape(shortPieces[i]);\n            longPieces[i] = regexEscape(longPieces[i]);\n        }\n        for (i = 0; i < 24; i++) {\n            mixedPieces[i] = regexEscape(mixedPieces[i]);\n        }\n\n        this._monthsRegex = new RegExp('^(' + mixedPieces.join('|') + ')', 'i');\n        this._monthsShortRegex = this._monthsRegex;\n        this._monthsStrictRegex = new RegExp('^(' + longPieces.join('|') + ')', 'i');\n        this._monthsShortStrictRegex = new RegExp('^(' + shortPieces.join('|') + ')', 'i');\n    }\n\n    function createDate (y, m, d, h, M, s, ms) {\n        // can't just apply() to create a date:\n        // https://stackoverflow.com/q/181348\n        var date = new Date(y, m, d, h, M, s, ms);\n\n        // the date constructor remaps years 0-99 to 1900-1999\n        if (y < 100 && y >= 0 && isFinite(date.getFullYear())) {\n            date.setFullYear(y);\n        }\n        return date;\n    }\n\n    function createUTCDate (y) {\n        var date = new Date(Date.UTC.apply(null, arguments));\n\n        // the Date.UTC function remaps years 0-99 to 1900-1999\n        if (y < 100 && y >= 0 && isFinite(date.getUTCFullYear())) {\n            date.setUTCFullYear(y);\n        }\n        return date;\n    }\n\n    // start-of-first-week - start-of-year\n    function firstWeekOffset(year, dow, doy) {\n        var // first-week day -- which january is always in the first week (4 for iso, 1 for other)\n            fwd = 7 + dow - doy,\n            // first-week day local weekday -- which local weekday is fwd\n            fwdlw = (7 + createUTCDate(year, 0, fwd).getUTCDay() - dow) % 7;\n\n        return -fwdlw + fwd - 1;\n    }\n\n    // https://en.wikipedia.org/wiki/ISO_week_date#Calculating_a_date_given_the_year.2C_week_number_and_weekday\n    function dayOfYearFromWeeks(year, week, weekday, dow, doy) {\n        var localWeekday = (7 + weekday - dow) % 7,\n            weekOffset = firstWeekOffset(year, dow, doy),\n            dayOfYear = 1 + 7 * (week - 1) + localWeekday + weekOffset,\n            resYear, resDayOfYear;\n\n        if (dayOfYear <= 0) {\n            resYear = year - 1;\n            resDayOfYear = daysInYear(resYear) + dayOfYear;\n        } else if (dayOfYear > daysInYear(year)) {\n            resYear = year + 1;\n            resDayOfYear = dayOfYear - daysInYear(year);\n        } else {\n            resYear = year;\n            resDayOfYear = dayOfYear;\n        }\n\n        return {\n            year: resYear,\n            dayOfYear: resDayOfYear\n        };\n    }\n\n    function weekOfYear(mom, dow, doy) {\n        var weekOffset = firstWeekOffset(mom.year(), dow, doy),\n            week = Math.floor((mom.dayOfYear() - weekOffset - 1) / 7) + 1,\n            resWeek, resYear;\n\n        if (week < 1) {\n            resYear = mom.year() - 1;\n            resWeek = week + weeksInYear(resYear, dow, doy);\n        } else if (week > weeksInYear(mom.year(), dow, doy)) {\n            resWeek = week - weeksInYear(mom.year(), dow, doy);\n            resYear = mom.year() + 1;\n        } else {\n            resYear = mom.year();\n            resWeek = week;\n        }\n\n        return {\n            week: resWeek,\n            year: resYear\n        };\n    }\n\n    function weeksInYear(year, dow, doy) {\n        var weekOffset = firstWeekOffset(year, dow, doy),\n            weekOffsetNext = firstWeekOffset(year + 1, dow, doy);\n        return (daysInYear(year) - weekOffset + weekOffsetNext) / 7;\n    }\n\n    // FORMATTING\n\n    addFormatToken('w', ['ww', 2], 'wo', 'week');\n    addFormatToken('W', ['WW', 2], 'Wo', 'isoWeek');\n\n    // ALIASES\n\n    addUnitAlias('week', 'w');\n    addUnitAlias('isoWeek', 'W');\n\n    // PRIORITIES\n\n    addUnitPriority('week', 5);\n    addUnitPriority('isoWeek', 5);\n\n    // PARSING\n\n    addRegexToken('w',  match1to2);\n    addRegexToken('ww', match1to2, match2);\n    addRegexToken('W',  match1to2);\n    addRegexToken('WW', match1to2, match2);\n\n    addWeekParseToken(['w', 'ww', 'W', 'WW'], function (input, week, config, token) {\n        week[token.substr(0, 1)] = toInt(input);\n    });\n\n    // HELPERS\n\n    // LOCALES\n\n    function localeWeek (mom) {\n        return weekOfYear(mom, this._week.dow, this._week.doy).week;\n    }\n\n    var defaultLocaleWeek = {\n        dow : 0, // Sunday is the first day of the week.\n        doy : 6  // The week that contains Jan 1st is the first week of the year.\n    };\n\n    function localeFirstDayOfWeek () {\n        return this._week.dow;\n    }\n\n    function localeFirstDayOfYear () {\n        return this._week.doy;\n    }\n\n    // MOMENTS\n\n    function getSetWeek (input) {\n        var week = this.localeData().week(this);\n        return input == null ? week : this.add((input - week) * 7, 'd');\n    }\n\n    function getSetISOWeek (input) {\n        var week = weekOfYear(this, 1, 4).week;\n        return input == null ? week : this.add((input - week) * 7, 'd');\n    }\n\n    // FORMATTING\n\n    addFormatToken('d', 0, 'do', 'day');\n\n    addFormatToken('dd', 0, 0, function (format) {\n        return this.localeData().weekdaysMin(this, format);\n    });\n\n    addFormatToken('ddd', 0, 0, function (format) {\n        return this.localeData().weekdaysShort(this, format);\n    });\n\n    addFormatToken('dddd', 0, 0, function (format) {\n        return this.localeData().weekdays(this, format);\n    });\n\n    addFormatToken('e', 0, 0, 'weekday');\n    addFormatToken('E', 0, 0, 'isoWeekday');\n\n    // ALIASES\n\n    addUnitAlias('day', 'd');\n    addUnitAlias('weekday', 'e');\n    addUnitAlias('isoWeekday', 'E');\n\n    // PRIORITY\n    addUnitPriority('day', 11);\n    addUnitPriority('weekday', 11);\n    addUnitPriority('isoWeekday', 11);\n\n    // PARSING\n\n    addRegexToken('d',    match1to2);\n    addRegexToken('e',    match1to2);\n    addRegexToken('E',    match1to2);\n    addRegexToken('dd',   function (isStrict, locale) {\n        return locale.weekdaysMinRegex(isStrict);\n    });\n    addRegexToken('ddd',   function (isStrict, locale) {\n        return locale.weekdaysShortRegex(isStrict);\n    });\n    addRegexToken('dddd',   function (isStrict, locale) {\n        return locale.weekdaysRegex(isStrict);\n    });\n\n    addWeekParseToken(['dd', 'ddd', 'dddd'], function (input, week, config, token) {\n        var weekday = config._locale.weekdaysParse(input, token, config._strict);\n        // if we didn't get a weekday name, mark the date as invalid\n        if (weekday != null) {\n            week.d = weekday;\n        } else {\n            getParsingFlags(config).invalidWeekday = input;\n        }\n    });\n\n    addWeekParseToken(['d', 'e', 'E'], function (input, week, config, token) {\n        week[token] = toInt(input);\n    });\n\n    // HELPERS\n\n    function parseWeekday(input, locale) {\n        if (typeof input !== 'string') {\n            return input;\n        }\n\n        if (!isNaN(input)) {\n            return parseInt(input, 10);\n        }\n\n        input = locale.weekdaysParse(input);\n        if (typeof input === 'number') {\n            return input;\n        }\n\n        return null;\n    }\n\n    function parseIsoWeekday(input, locale) {\n        if (typeof input === 'string') {\n            return locale.weekdaysParse(input) % 7 || 7;\n        }\n        return isNaN(input) ? null : input;\n    }\n\n    // LOCALES\n\n    var defaultLocaleWeekdays = 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_');\n    function localeWeekdays (m, format) {\n        if (!m) {\n            return isArray(this._weekdays) ? this._weekdays :\n                this._weekdays['standalone'];\n        }\n        return isArray(this._weekdays) ? this._weekdays[m.day()] :\n            this._weekdays[this._weekdays.isFormat.test(format) ? 'format' : 'standalone'][m.day()];\n    }\n\n    var defaultLocaleWeekdaysShort = 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_');\n    function localeWeekdaysShort (m) {\n        return (m) ? this._weekdaysShort[m.day()] : this._weekdaysShort;\n    }\n\n    var defaultLocaleWeekdaysMin = 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_');\n    function localeWeekdaysMin (m) {\n        return (m) ? this._weekdaysMin[m.day()] : this._weekdaysMin;\n    }\n\n    function handleStrictParse$1(weekdayName, format, strict) {\n        var i, ii, mom, llc = weekdayName.toLocaleLowerCase();\n        if (!this._weekdaysParse) {\n            this._weekdaysParse = [];\n            this._shortWeekdaysParse = [];\n            this._minWeekdaysParse = [];\n\n            for (i = 0; i < 7; ++i) {\n                mom = createUTC([2000, 1]).day(i);\n                this._minWeekdaysParse[i] = this.weekdaysMin(mom, '').toLocaleLowerCase();\n                this._shortWeekdaysParse[i] = this.weekdaysShort(mom, '').toLocaleLowerCase();\n                this._weekdaysParse[i] = this.weekdays(mom, '').toLocaleLowerCase();\n            }\n        }\n\n        if (strict) {\n            if (format === 'dddd') {\n                ii = indexOf.call(this._weekdaysParse, llc);\n                return ii !== -1 ? ii : null;\n            } else if (format === 'ddd') {\n                ii = indexOf.call(this._shortWeekdaysParse, llc);\n                return ii !== -1 ? ii : null;\n            } else {\n                ii = indexOf.call(this._minWeekdaysParse, llc);\n                return ii !== -1 ? ii : null;\n            }\n        } else {\n            if (format === 'dddd') {\n                ii = indexOf.call(this._weekdaysParse, llc);\n                if (ii !== -1) {\n                    return ii;\n                }\n                ii = indexOf.call(this._shortWeekdaysParse, llc);\n                if (ii !== -1) {\n                    return ii;\n                }\n                ii = indexOf.call(this._minWeekdaysParse, llc);\n                return ii !== -1 ? ii : null;\n            } else if (format === 'ddd') {\n                ii = indexOf.call(this._shortWeekdaysParse, llc);\n                if (ii !== -1) {\n                    return ii;\n                }\n                ii = indexOf.call(this._weekdaysParse, llc);\n                if (ii !== -1) {\n                    return ii;\n                }\n                ii = indexOf.call(this._minWeekdaysParse, llc);\n                return ii !== -1 ? ii : null;\n            } else {\n                ii = indexOf.call(this._minWeekdaysParse, llc);\n                if (ii !== -1) {\n                    return ii;\n                }\n                ii = indexOf.call(this._weekdaysParse, llc);\n                if (ii !== -1) {\n                    return ii;\n                }\n                ii = indexOf.call(this._shortWeekdaysParse, llc);\n                return ii !== -1 ? ii : null;\n            }\n        }\n    }\n\n    function localeWeekdaysParse (weekdayName, format, strict) {\n        var i, mom, regex;\n\n        if (this._weekdaysParseExact) {\n            return handleStrictParse$1.call(this, weekdayName, format, strict);\n        }\n\n        if (!this._weekdaysParse) {\n            this._weekdaysParse = [];\n            this._minWeekdaysParse = [];\n            this._shortWeekdaysParse = [];\n            this._fullWeekdaysParse = [];\n        }\n\n        for (i = 0; i < 7; i++) {\n            // make the regex if we don't have it already\n\n            mom = createUTC([2000, 1]).day(i);\n            if (strict && !this._fullWeekdaysParse[i]) {\n                this._fullWeekdaysParse[i] = new RegExp('^' + this.weekdays(mom, '').replace('.', '\\.?') + '$', 'i');\n                this._shortWeekdaysParse[i] = new RegExp('^' + this.weekdaysShort(mom, '').replace('.', '\\.?') + '$', 'i');\n                this._minWeekdaysParse[i] = new RegExp('^' + this.weekdaysMin(mom, '').replace('.', '\\.?') + '$', 'i');\n            }\n            if (!this._weekdaysParse[i]) {\n                regex = '^' + this.weekdays(mom, '') + '|^' + this.weekdaysShort(mom, '') + '|^' + this.weekdaysMin(mom, '');\n                this._weekdaysParse[i] = new RegExp(regex.replace('.', ''), 'i');\n            }\n            // test the regex\n            if (strict && format === 'dddd' && this._fullWeekdaysParse[i].test(weekdayName)) {\n                return i;\n            } else if (strict && format === 'ddd' && this._shortWeekdaysParse[i].test(weekdayName)) {\n                return i;\n            } else if (strict && format === 'dd' && this._minWeekdaysParse[i].test(weekdayName)) {\n                return i;\n            } else if (!strict && this._weekdaysParse[i].test(weekdayName)) {\n                return i;\n            }\n        }\n    }\n\n    // MOMENTS\n\n    function getSetDayOfWeek (input) {\n        if (!this.isValid()) {\n            return input != null ? this : NaN;\n        }\n        var day = this._isUTC ? this._d.getUTCDay() : this._d.getDay();\n        if (input != null) {\n            input = parseWeekday(input, this.localeData());\n            return this.add(input - day, 'd');\n        } else {\n            return day;\n        }\n    }\n\n    function getSetLocaleDayOfWeek (input) {\n        if (!this.isValid()) {\n            return input != null ? this : NaN;\n        }\n        var weekday = (this.day() + 7 - this.localeData()._week.dow) % 7;\n        return input == null ? weekday : this.add(input - weekday, 'd');\n    }\n\n    function getSetISODayOfWeek (input) {\n        if (!this.isValid()) {\n            return input != null ? this : NaN;\n        }\n\n        // behaves the same as moment#day except\n        // as a getter, returns 7 instead of 0 (1-7 range instead of 0-6)\n        // as a setter, sunday should belong to the previous week.\n\n        if (input != null) {\n            var weekday = parseIsoWeekday(input, this.localeData());\n            return this.day(this.day() % 7 ? weekday : weekday - 7);\n        } else {\n            return this.day() || 7;\n        }\n    }\n\n    var defaultWeekdaysRegex = matchWord;\n    function weekdaysRegex (isStrict) {\n        if (this._weekdaysParseExact) {\n            if (!hasOwnProp(this, '_weekdaysRegex')) {\n                computeWeekdaysParse.call(this);\n            }\n            if (isStrict) {\n                return this._weekdaysStrictRegex;\n            } else {\n                return this._weekdaysRegex;\n            }\n        } else {\n            if (!hasOwnProp(this, '_weekdaysRegex')) {\n                this._weekdaysRegex = defaultWeekdaysRegex;\n            }\n            return this._weekdaysStrictRegex && isStrict ?\n                this._weekdaysStrictRegex : this._weekdaysRegex;\n        }\n    }\n\n    var defaultWeekdaysShortRegex = matchWord;\n    function weekdaysShortRegex (isStrict) {\n        if (this._weekdaysParseExact) {\n            if (!hasOwnProp(this, '_weekdaysRegex')) {\n                computeWeekdaysParse.call(this);\n            }\n            if (isStrict) {\n                return this._weekdaysShortStrictRegex;\n            } else {\n                return this._weekdaysShortRegex;\n            }\n        } else {\n            if (!hasOwnProp(this, '_weekdaysShortRegex')) {\n                this._weekdaysShortRegex = defaultWeekdaysShortRegex;\n            }\n            return this._weekdaysShortStrictRegex && isStrict ?\n                this._weekdaysShortStrictRegex : this._weekdaysShortRegex;\n        }\n    }\n\n    var defaultWeekdaysMinRegex = matchWord;\n    function weekdaysMinRegex (isStrict) {\n        if (this._weekdaysParseExact) {\n            if (!hasOwnProp(this, '_weekdaysRegex')) {\n                computeWeekdaysParse.call(this);\n            }\n            if (isStrict) {\n                return this._weekdaysMinStrictRegex;\n            } else {\n                return this._weekdaysMinRegex;\n            }\n        } else {\n            if (!hasOwnProp(this, '_weekdaysMinRegex')) {\n                this._weekdaysMinRegex = defaultWeekdaysMinRegex;\n            }\n            return this._weekdaysMinStrictRegex && isStrict ?\n                this._weekdaysMinStrictRegex : this._weekdaysMinRegex;\n        }\n    }\n\n\n    function computeWeekdaysParse () {\n        function cmpLenRev(a, b) {\n            return b.length - a.length;\n        }\n\n        var minPieces = [], shortPieces = [], longPieces = [], mixedPieces = [],\n            i, mom, minp, shortp, longp;\n        for (i = 0; i < 7; i++) {\n            // make the regex if we don't have it already\n            mom = createUTC([2000, 1]).day(i);\n            minp = this.weekdaysMin(mom, '');\n            shortp = this.weekdaysShort(mom, '');\n            longp = this.weekdays(mom, '');\n            minPieces.push(minp);\n            shortPieces.push(shortp);\n            longPieces.push(longp);\n            mixedPieces.push(minp);\n            mixedPieces.push(shortp);\n            mixedPieces.push(longp);\n        }\n        // Sorting makes sure if one weekday (or abbr) is a prefix of another it\n        // will match the longer piece.\n        minPieces.sort(cmpLenRev);\n        shortPieces.sort(cmpLenRev);\n        longPieces.sort(cmpLenRev);\n        mixedPieces.sort(cmpLenRev);\n        for (i = 0; i < 7; i++) {\n            shortPieces[i] = regexEscape(shortPieces[i]);\n            longPieces[i] = regexEscape(longPieces[i]);\n            mixedPieces[i] = regexEscape(mixedPieces[i]);\n        }\n\n        this._weekdaysRegex = new RegExp('^(' + mixedPieces.join('|') + ')', 'i');\n        this._weekdaysShortRegex = this._weekdaysRegex;\n        this._weekdaysMinRegex = this._weekdaysRegex;\n\n        this._weekdaysStrictRegex = new RegExp('^(' + longPieces.join('|') + ')', 'i');\n        this._weekdaysShortStrictRegex = new RegExp('^(' + shortPieces.join('|') + ')', 'i');\n        this._weekdaysMinStrictRegex = new RegExp('^(' + minPieces.join('|') + ')', 'i');\n    }\n\n    // FORMATTING\n\n    function hFormat() {\n        return this.hours() % 12 || 12;\n    }\n\n    function kFormat() {\n        return this.hours() || 24;\n    }\n\n    addFormatToken('H', ['HH', 2], 0, 'hour');\n    addFormatToken('h', ['hh', 2], 0, hFormat);\n    addFormatToken('k', ['kk', 2], 0, kFormat);\n\n    addFormatToken('hmm', 0, 0, function () {\n        return '' + hFormat.apply(this) + zeroFill(this.minutes(), 2);\n    });\n\n    addFormatToken('hmmss', 0, 0, function () {\n        return '' + hFormat.apply(this) + zeroFill(this.minutes(), 2) +\n            zeroFill(this.seconds(), 2);\n    });\n\n    addFormatToken('Hmm', 0, 0, function () {\n        return '' + this.hours() + zeroFill(this.minutes(), 2);\n    });\n\n    addFormatToken('Hmmss', 0, 0, function () {\n        return '' + this.hours() + zeroFill(this.minutes(), 2) +\n            zeroFill(this.seconds(), 2);\n    });\n\n    function meridiem (token, lowercase) {\n        addFormatToken(token, 0, 0, function () {\n            return this.localeData().meridiem(this.hours(), this.minutes(), lowercase);\n        });\n    }\n\n    meridiem('a', true);\n    meridiem('A', false);\n\n    // ALIASES\n\n    addUnitAlias('hour', 'h');\n\n    // PRIORITY\n    addUnitPriority('hour', 13);\n\n    // PARSING\n\n    function matchMeridiem (isStrict, locale) {\n        return locale._meridiemParse;\n    }\n\n    addRegexToken('a',  matchMeridiem);\n    addRegexToken('A',  matchMeridiem);\n    addRegexToken('H',  match1to2);\n    addRegexToken('h',  match1to2);\n    addRegexToken('k',  match1to2);\n    addRegexToken('HH', match1to2, match2);\n    addRegexToken('hh', match1to2, match2);\n    addRegexToken('kk', match1to2, match2);\n\n    addRegexToken('hmm', match3to4);\n    addRegexToken('hmmss', match5to6);\n    addRegexToken('Hmm', match3to4);\n    addRegexToken('Hmmss', match5to6);\n\n    addParseToken(['H', 'HH'], HOUR);\n    addParseToken(['k', 'kk'], function (input, array, config) {\n        var kInput = toInt(input);\n        array[HOUR] = kInput === 24 ? 0 : kInput;\n    });\n    addParseToken(['a', 'A'], function (input, array, config) {\n        config._isPm = config._locale.isPM(input);\n        config._meridiem = input;\n    });\n    addParseToken(['h', 'hh'], function (input, array, config) {\n        array[HOUR] = toInt(input);\n        getParsingFlags(config).bigHour = true;\n    });\n    addParseToken('hmm', function (input, array, config) {\n        var pos = input.length - 2;\n        array[HOUR] = toInt(input.substr(0, pos));\n        array[MINUTE] = toInt(input.substr(pos));\n        getParsingFlags(config).bigHour = true;\n    });\n    addParseToken('hmmss', function (input, array, config) {\n        var pos1 = input.length - 4;\n        var pos2 = input.length - 2;\n        array[HOUR] = toInt(input.substr(0, pos1));\n        array[MINUTE] = toInt(input.substr(pos1, 2));\n        array[SECOND] = toInt(input.substr(pos2));\n        getParsingFlags(config).bigHour = true;\n    });\n    addParseToken('Hmm', function (input, array, config) {\n        var pos = input.length - 2;\n        array[HOUR] = toInt(input.substr(0, pos));\n        array[MINUTE] = toInt(input.substr(pos));\n    });\n    addParseToken('Hmmss', function (input, array, config) {\n        var pos1 = input.length - 4;\n        var pos2 = input.length - 2;\n        array[HOUR] = toInt(input.substr(0, pos1));\n        array[MINUTE] = toInt(input.substr(pos1, 2));\n        array[SECOND] = toInt(input.substr(pos2));\n    });\n\n    // LOCALES\n\n    function localeIsPM (input) {\n        // IE8 Quirks Mode & IE7 Standards Mode do not allow accessing strings like arrays\n        // Using charAt should be more compatible.\n        return ((input + '').toLowerCase().charAt(0) === 'p');\n    }\n\n    var defaultLocaleMeridiemParse = /[ap]\\.?m?\\.?/i;\n    function localeMeridiem (hours, minutes, isLower) {\n        if (hours > 11) {\n            return isLower ? 'pm' : 'PM';\n        } else {\n            return isLower ? 'am' : 'AM';\n        }\n    }\n\n\n    // MOMENTS\n\n    // Setting the hour should keep the time, because the user explicitly\n    // specified which hour they want. So trying to maintain the same hour (in\n    // a new timezone) makes sense. Adding/subtracting hours does not follow\n    // this rule.\n    var getSetHour = makeGetSet('Hours', true);\n\n    var baseConfig = {\n        calendar: defaultCalendar,\n        longDateFormat: defaultLongDateFormat,\n        invalidDate: defaultInvalidDate,\n        ordinal: defaultOrdinal,\n        dayOfMonthOrdinalParse: defaultDayOfMonthOrdinalParse,\n        relativeTime: defaultRelativeTime,\n\n        months: defaultLocaleMonths,\n        monthsShort: defaultLocaleMonthsShort,\n\n        week: defaultLocaleWeek,\n\n        weekdays: defaultLocaleWeekdays,\n        weekdaysMin: defaultLocaleWeekdaysMin,\n        weekdaysShort: defaultLocaleWeekdaysShort,\n\n        meridiemParse: defaultLocaleMeridiemParse\n    };\n\n    // internal storage for locale config files\n    var locales = {};\n    var localeFamilies = {};\n    var globalLocale;\n\n    function normalizeLocale(key) {\n        return key ? key.toLowerCase().replace('_', '-') : key;\n    }\n\n    // pick the locale from the array\n    // try ['en-au', 'en-gb'] as 'en-au', 'en-gb', 'en', as in move through the list trying each\n    // substring from most specific to least, but move to the next array item if it's a more specific variant than the current root\n    function chooseLocale(names) {\n        var i = 0, j, next, locale, split;\n\n        while (i < names.length) {\n            split = normalizeLocale(names[i]).split('-');\n            j = split.length;\n            next = normalizeLocale(names[i + 1]);\n            next = next ? next.split('-') : null;\n            while (j > 0) {\n                locale = loadLocale(split.slice(0, j).join('-'));\n                if (locale) {\n                    return locale;\n                }\n                if (next && next.length >= j && compareArrays(split, next, true) >= j - 1) {\n                    //the next array item is better than a shallower substring of this one\n                    break;\n                }\n                j--;\n            }\n            i++;\n        }\n        return globalLocale;\n    }\n\n    function loadLocale(name) {\n        var oldLocale = null;\n        // TODO: Find a better way to register and load all the locales in Node\n        if (!locales[name] && (typeof module !== 'undefined') &&\n                module && module.exports) {\n            try {\n                oldLocale = globalLocale._abbr;\n                var aliasedRequire = require;\n                aliasedRequire('./locale/' + name);\n                getSetGlobalLocale(oldLocale);\n            } catch (e) {}\n        }\n        return locales[name];\n    }\n\n    // This function will load locale and then set the global locale.  If\n    // no arguments are passed in, it will simply return the current global\n    // locale key.\n    function getSetGlobalLocale (key, values) {\n        var data;\n        if (key) {\n            if (isUndefined(values)) {\n                data = getLocale(key);\n            }\n            else {\n                data = defineLocale(key, values);\n            }\n\n            if (data) {\n                // moment.duration._locale = moment._locale = data;\n                globalLocale = data;\n            }\n            else {\n                if ((typeof console !==  'undefined') && console.warn) {\n                    //warn user if arguments are passed but the locale could not be set\n                    console.warn('Locale ' + key +  ' not found. Did you forget to load it?');\n                }\n            }\n        }\n\n        return globalLocale._abbr;\n    }\n\n    function defineLocale (name, config) {\n        if (config !== null) {\n            var locale, parentConfig = baseConfig;\n            config.abbr = name;\n            if (locales[name] != null) {\n                deprecateSimple('defineLocaleOverride',\n                        'use moment.updateLocale(localeName, config) to change ' +\n                        'an existing locale. moment.defineLocale(localeName, ' +\n                        'config) should only be used for creating a new locale ' +\n                        'See http://momentjs.com/guides/#/warnings/define-locale/ for more info.');\n                parentConfig = locales[name]._config;\n            } else if (config.parentLocale != null) {\n                if (locales[config.parentLocale] != null) {\n                    parentConfig = locales[config.parentLocale]._config;\n                } else {\n                    locale = loadLocale(config.parentLocale);\n                    if (locale != null) {\n                        parentConfig = locale._config;\n                    } else {\n                        if (!localeFamilies[config.parentLocale]) {\n                            localeFamilies[config.parentLocale] = [];\n                        }\n                        localeFamilies[config.parentLocale].push({\n                            name: name,\n                            config: config\n                        });\n                        return null;\n                    }\n                }\n            }\n            locales[name] = new Locale(mergeConfigs(parentConfig, config));\n\n            if (localeFamilies[name]) {\n                localeFamilies[name].forEach(function (x) {\n                    defineLocale(x.name, x.config);\n                });\n            }\n\n            // backwards compat for now: also set the locale\n            // make sure we set the locale AFTER all child locales have been\n            // created, so we won't end up with the child locale set.\n            getSetGlobalLocale(name);\n\n\n            return locales[name];\n        } else {\n            // useful for testing\n            delete locales[name];\n            return null;\n        }\n    }\n\n    function updateLocale(name, config) {\n        if (config != null) {\n            var locale, tmpLocale, parentConfig = baseConfig;\n            // MERGE\n            tmpLocale = loadLocale(name);\n            if (tmpLocale != null) {\n                parentConfig = tmpLocale._config;\n            }\n            config = mergeConfigs(parentConfig, config);\n            locale = new Locale(config);\n            locale.parentLocale = locales[name];\n            locales[name] = locale;\n\n            // backwards compat for now: also set the locale\n            getSetGlobalLocale(name);\n        } else {\n            // pass null for config to unupdate, useful for tests\n            if (locales[name] != null) {\n                if (locales[name].parentLocale != null) {\n                    locales[name] = locales[name].parentLocale;\n                } else if (locales[name] != null) {\n                    delete locales[name];\n                }\n            }\n        }\n        return locales[name];\n    }\n\n    // returns locale data\n    function getLocale (key) {\n        var locale;\n\n        if (key && key._locale && key._locale._abbr) {\n            key = key._locale._abbr;\n        }\n\n        if (!key) {\n            return globalLocale;\n        }\n\n        if (!isArray(key)) {\n            //short-circuit everything else\n            locale = loadLocale(key);\n            if (locale) {\n                return locale;\n            }\n            key = [key];\n        }\n\n        return chooseLocale(key);\n    }\n\n    function listLocales() {\n        return keys(locales);\n    }\n\n    function checkOverflow (m) {\n        var overflow;\n        var a = m._a;\n\n        if (a && getParsingFlags(m).overflow === -2) {\n            overflow =\n                a[MONTH]       < 0 || a[MONTH]       > 11  ? MONTH :\n                a[DATE]        < 1 || a[DATE]        > daysInMonth(a[YEAR], a[MONTH]) ? DATE :\n                a[HOUR]        < 0 || a[HOUR]        > 24 || (a[HOUR] === 24 && (a[MINUTE] !== 0 || a[SECOND] !== 0 || a[MILLISECOND] !== 0)) ? HOUR :\n                a[MINUTE]      < 0 || a[MINUTE]      > 59  ? MINUTE :\n                a[SECOND]      < 0 || a[SECOND]      > 59  ? SECOND :\n                a[MILLISECOND] < 0 || a[MILLISECOND] > 999 ? MILLISECOND :\n                -1;\n\n            if (getParsingFlags(m)._overflowDayOfYear && (overflow < YEAR || overflow > DATE)) {\n                overflow = DATE;\n            }\n            if (getParsingFlags(m)._overflowWeeks && overflow === -1) {\n                overflow = WEEK;\n            }\n            if (getParsingFlags(m)._overflowWeekday && overflow === -1) {\n                overflow = WEEKDAY;\n            }\n\n            getParsingFlags(m).overflow = overflow;\n        }\n\n        return m;\n    }\n\n    // Pick the first defined of two or three arguments.\n    function defaults(a, b, c) {\n        if (a != null) {\n            return a;\n        }\n        if (b != null) {\n            return b;\n        }\n        return c;\n    }\n\n    function currentDateArray(config) {\n        // hooks is actually the exported moment object\n        var nowValue = new Date(hooks.now());\n        if (config._useUTC) {\n            return [nowValue.getUTCFullYear(), nowValue.getUTCMonth(), nowValue.getUTCDate()];\n        }\n        return [nowValue.getFullYear(), nowValue.getMonth(), nowValue.getDate()];\n    }\n\n    // convert an array to a date.\n    // the array should mirror the parameters below\n    // note: all values past the year are optional and will default to the lowest possible value.\n    // [year, month, day , hour, minute, second, millisecond]\n    function configFromArray (config) {\n        var i, date, input = [], currentDate, expectedWeekday, yearToUse;\n\n        if (config._d) {\n            return;\n        }\n\n        currentDate = currentDateArray(config);\n\n        //compute day of the year from weeks and weekdays\n        if (config._w && config._a[DATE] == null && config._a[MONTH] == null) {\n            dayOfYearFromWeekInfo(config);\n        }\n\n        //if the day of the year is set, figure out what it is\n        if (config._dayOfYear != null) {\n            yearToUse = defaults(config._a[YEAR], currentDate[YEAR]);\n\n            if (config._dayOfYear > daysInYear(yearToUse) || config._dayOfYear === 0) {\n                getParsingFlags(config)._overflowDayOfYear = true;\n            }\n\n            date = createUTCDate(yearToUse, 0, config._dayOfYear);\n            config._a[MONTH] = date.getUTCMonth();\n            config._a[DATE] = date.getUTCDate();\n        }\n\n        // Default to current date.\n        // * if no year, month, day of month are given, default to today\n        // * if day of month is given, default month and year\n        // * if month is given, default only year\n        // * if year is given, don't default anything\n        for (i = 0; i < 3 && config._a[i] == null; ++i) {\n            config._a[i] = input[i] = currentDate[i];\n        }\n\n        // Zero out whatever was not defaulted, including time\n        for (; i < 7; i++) {\n            config._a[i] = input[i] = (config._a[i] == null) ? (i === 2 ? 1 : 0) : config._a[i];\n        }\n\n        // Check for 24:00:00.000\n        if (config._a[HOUR] === 24 &&\n                config._a[MINUTE] === 0 &&\n                config._a[SECOND] === 0 &&\n                config._a[MILLISECOND] === 0) {\n            config._nextDay = true;\n            config._a[HOUR] = 0;\n        }\n\n        config._d = (config._useUTC ? createUTCDate : createDate).apply(null, input);\n        expectedWeekday = config._useUTC ? config._d.getUTCDay() : config._d.getDay();\n\n        // Apply timezone offset from input. The actual utcOffset can be changed\n        // with parseZone.\n        if (config._tzm != null) {\n            config._d.setUTCMinutes(config._d.getUTCMinutes() - config._tzm);\n        }\n\n        if (config._nextDay) {\n            config._a[HOUR] = 24;\n        }\n\n        // check for mismatching day of week\n        if (config._w && typeof config._w.d !== 'undefined' && config._w.d !== expectedWeekday) {\n            getParsingFlags(config).weekdayMismatch = true;\n        }\n    }\n\n    function dayOfYearFromWeekInfo(config) {\n        var w, weekYear, week, weekday, dow, doy, temp, weekdayOverflow;\n\n        w = config._w;\n        if (w.GG != null || w.W != null || w.E != null) {\n            dow = 1;\n            doy = 4;\n\n            // TODO: We need to take the current isoWeekYear, but that depends on\n            // how we interpret now (local, utc, fixed offset). So create\n            // a now version of current config (take local/utc/offset flags, and\n            // create now).\n            weekYear = defaults(w.GG, config._a[YEAR], weekOfYear(createLocal(), 1, 4).year);\n            week = defaults(w.W, 1);\n            weekday = defaults(w.E, 1);\n            if (weekday < 1 || weekday > 7) {\n                weekdayOverflow = true;\n            }\n        } else {\n            dow = config._locale._week.dow;\n            doy = config._locale._week.doy;\n\n            var curWeek = weekOfYear(createLocal(), dow, doy);\n\n            weekYear = defaults(w.gg, config._a[YEAR], curWeek.year);\n\n            // Default to current week.\n            week = defaults(w.w, curWeek.week);\n\n            if (w.d != null) {\n                // weekday -- low day numbers are considered next week\n                weekday = w.d;\n                if (weekday < 0 || weekday > 6) {\n                    weekdayOverflow = true;\n                }\n            } else if (w.e != null) {\n                // local weekday -- counting starts from begining of week\n                weekday = w.e + dow;\n                if (w.e < 0 || w.e > 6) {\n                    weekdayOverflow = true;\n                }\n            } else {\n                // default to begining of week\n                weekday = dow;\n            }\n        }\n        if (week < 1 || week > weeksInYear(weekYear, dow, doy)) {\n            getParsingFlags(config)._overflowWeeks = true;\n        } else if (weekdayOverflow != null) {\n            getParsingFlags(config)._overflowWeekday = true;\n        } else {\n            temp = dayOfYearFromWeeks(weekYear, week, weekday, dow, doy);\n            config._a[YEAR] = temp.year;\n            config._dayOfYear = temp.dayOfYear;\n        }\n    }\n\n    // iso 8601 regex\n    // 0000-00-00 0000-W00 or 0000-W00-0 + T + 00 or 00:00 or 00:00:00 or 00:00:00.000 + +00:00 or +0000 or +00)\n    var extendedIsoRegex = /^\\s*((?:[+-]\\d{6}|\\d{4})-(?:\\d\\d-\\d\\d|W\\d\\d-\\d|W\\d\\d|\\d\\d\\d|\\d\\d))(?:(T| )(\\d\\d(?::\\d\\d(?::\\d\\d(?:[.,]\\d+)?)?)?)([\\+\\-]\\d\\d(?::?\\d\\d)?|\\s*Z)?)?$/;\n    var basicIsoRegex = /^\\s*((?:[+-]\\d{6}|\\d{4})(?:\\d\\d\\d\\d|W\\d\\d\\d|W\\d\\d|\\d\\d\\d|\\d\\d))(?:(T| )(\\d\\d(?:\\d\\d(?:\\d\\d(?:[.,]\\d+)?)?)?)([\\+\\-]\\d\\d(?::?\\d\\d)?|\\s*Z)?)?$/;\n\n    var tzRegex = /Z|[+-]\\d\\d(?::?\\d\\d)?/;\n\n    var isoDates = [\n        ['YYYYYY-MM-DD', /[+-]\\d{6}-\\d\\d-\\d\\d/],\n        ['YYYY-MM-DD', /\\d{4}-\\d\\d-\\d\\d/],\n        ['GGGG-[W]WW-E', /\\d{4}-W\\d\\d-\\d/],\n        ['GGGG-[W]WW', /\\d{4}-W\\d\\d/, false],\n        ['YYYY-DDD', /\\d{4}-\\d{3}/],\n        ['YYYY-MM', /\\d{4}-\\d\\d/, false],\n        ['YYYYYYMMDD', /[+-]\\d{10}/],\n        ['YYYYMMDD', /\\d{8}/],\n        // YYYYMM is NOT allowed by the standard\n        ['GGGG[W]WWE', /\\d{4}W\\d{3}/],\n        ['GGGG[W]WW', /\\d{4}W\\d{2}/, false],\n        ['YYYYDDD', /\\d{7}/]\n    ];\n\n    // iso time formats and regexes\n    var isoTimes = [\n        ['HH:mm:ss.SSSS', /\\d\\d:\\d\\d:\\d\\d\\.\\d+/],\n        ['HH:mm:ss,SSSS', /\\d\\d:\\d\\d:\\d\\d,\\d+/],\n        ['HH:mm:ss', /\\d\\d:\\d\\d:\\d\\d/],\n        ['HH:mm', /\\d\\d:\\d\\d/],\n        ['HHmmss.SSSS', /\\d\\d\\d\\d\\d\\d\\.\\d+/],\n        ['HHmmss,SSSS', /\\d\\d\\d\\d\\d\\d,\\d+/],\n        ['HHmmss', /\\d\\d\\d\\d\\d\\d/],\n        ['HHmm', /\\d\\d\\d\\d/],\n        ['HH', /\\d\\d/]\n    ];\n\n    var aspNetJsonRegex = /^\\/?Date\\((\\-?\\d+)/i;\n\n    // date from iso format\n    function configFromISO(config) {\n        var i, l,\n            string = config._i,\n            match = extendedIsoRegex.exec(string) || basicIsoRegex.exec(string),\n            allowTime, dateFormat, timeFormat, tzFormat;\n\n        if (match) {\n            getParsingFlags(config).iso = true;\n\n            for (i = 0, l = isoDates.length; i < l; i++) {\n                if (isoDates[i][1].exec(match[1])) {\n                    dateFormat = isoDates[i][0];\n                    allowTime = isoDates[i][2] !== false;\n                    break;\n                }\n            }\n            if (dateFormat == null) {\n                config._isValid = false;\n                return;\n            }\n            if (match[3]) {\n                for (i = 0, l = isoTimes.length; i < l; i++) {\n                    if (isoTimes[i][1].exec(match[3])) {\n                        // match[2] should be 'T' or space\n                        timeFormat = (match[2] || ' ') + isoTimes[i][0];\n                        break;\n                    }\n                }\n                if (timeFormat == null) {\n                    config._isValid = false;\n                    return;\n                }\n            }\n            if (!allowTime && timeFormat != null) {\n                config._isValid = false;\n                return;\n            }\n            if (match[4]) {\n                if (tzRegex.exec(match[4])) {\n                    tzFormat = 'Z';\n                } else {\n                    config._isValid = false;\n                    return;\n                }\n            }\n            config._f = dateFormat + (timeFormat || '') + (tzFormat || '');\n            configFromStringAndFormat(config);\n        } else {\n            config._isValid = false;\n        }\n    }\n\n    // RFC 2822 regex: For details see https://tools.ietf.org/html/rfc2822#section-3.3\n    var rfc2822 = /^(?:(Mon|Tue|Wed|Thu|Fri|Sat|Sun),?\\s)?(\\d{1,2})\\s(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\\s(\\d{2,4})\\s(\\d\\d):(\\d\\d)(?::(\\d\\d))?\\s(?:(UT|GMT|[ECMP][SD]T)|([Zz])|([+-]\\d{4}))$/;\n\n    function extractFromRFC2822Strings(yearStr, monthStr, dayStr, hourStr, minuteStr, secondStr) {\n        var result = [\n            untruncateYear(yearStr),\n            defaultLocaleMonthsShort.indexOf(monthStr),\n            parseInt(dayStr, 10),\n            parseInt(hourStr, 10),\n            parseInt(minuteStr, 10)\n        ];\n\n        if (secondStr) {\n            result.push(parseInt(secondStr, 10));\n        }\n\n        return result;\n    }\n\n    function untruncateYear(yearStr) {\n        var year = parseInt(yearStr, 10);\n        if (year <= 49) {\n            return 2000 + year;\n        } else if (year <= 999) {\n            return 1900 + year;\n        }\n        return year;\n    }\n\n    function preprocessRFC2822(s) {\n        // Remove comments and folding whitespace and replace multiple-spaces with a single space\n        return s.replace(/\\([^)]*\\)|[\\n\\t]/g, ' ').replace(/(\\s\\s+)/g, ' ').trim();\n    }\n\n    function checkWeekday(weekdayStr, parsedInput, config) {\n        if (weekdayStr) {\n            // TODO: Replace the vanilla JS Date object with an indepentent day-of-week check.\n            var weekdayProvided = defaultLocaleWeekdaysShort.indexOf(weekdayStr),\n                weekdayActual = new Date(parsedInput[0], parsedInput[1], parsedInput[2]).getDay();\n            if (weekdayProvided !== weekdayActual) {\n                getParsingFlags(config).weekdayMismatch = true;\n                config._isValid = false;\n                return false;\n            }\n        }\n        return true;\n    }\n\n    var obsOffsets = {\n        UT: 0,\n        GMT: 0,\n        EDT: -4 * 60,\n        EST: -5 * 60,\n        CDT: -5 * 60,\n        CST: -6 * 60,\n        MDT: -6 * 60,\n        MST: -7 * 60,\n        PDT: -7 * 60,\n        PST: -8 * 60\n    };\n\n    function calculateOffset(obsOffset, militaryOffset, numOffset) {\n        if (obsOffset) {\n            return obsOffsets[obsOffset];\n        } else if (militaryOffset) {\n            // the only allowed military tz is Z\n            return 0;\n        } else {\n            var hm = parseInt(numOffset, 10);\n            var m = hm % 100, h = (hm - m) / 100;\n            return h * 60 + m;\n        }\n    }\n\n    // date and time from ref 2822 format\n    function configFromRFC2822(config) {\n        var match = rfc2822.exec(preprocessRFC2822(config._i));\n        if (match) {\n            var parsedArray = extractFromRFC2822Strings(match[4], match[3], match[2], match[5], match[6], match[7]);\n            if (!checkWeekday(match[1], parsedArray, config)) {\n                return;\n            }\n\n            config._a = parsedArray;\n            config._tzm = calculateOffset(match[8], match[9], match[10]);\n\n            config._d = createUTCDate.apply(null, config._a);\n            config._d.setUTCMinutes(config._d.getUTCMinutes() - config._tzm);\n\n            getParsingFlags(config).rfc2822 = true;\n        } else {\n            config._isValid = false;\n        }\n    }\n\n    // date from iso format or fallback\n    function configFromString(config) {\n        var matched = aspNetJsonRegex.exec(config._i);\n\n        if (matched !== null) {\n            config._d = new Date(+matched[1]);\n            return;\n        }\n\n        configFromISO(config);\n        if (config._isValid === false) {\n            delete config._isValid;\n        } else {\n            return;\n        }\n\n        configFromRFC2822(config);\n        if (config._isValid === false) {\n            delete config._isValid;\n        } else {\n            return;\n        }\n\n        // Final attempt, use Input Fallback\n        hooks.createFromInputFallback(config);\n    }\n\n    hooks.createFromInputFallback = deprecate(\n        'value provided is not in a recognized RFC2822 or ISO format. moment construction falls back to js Date(), ' +\n        'which is not reliable across all browsers and versions. Non RFC2822/ISO date formats are ' +\n        'discouraged and will be removed in an upcoming major release. Please refer to ' +\n        'http://momentjs.com/guides/#/warnings/js-date/ for more info.',\n        function (config) {\n            config._d = new Date(config._i + (config._useUTC ? ' UTC' : ''));\n        }\n    );\n\n    // constant that refers to the ISO standard\n    hooks.ISO_8601 = function () {};\n\n    // constant that refers to the RFC 2822 form\n    hooks.RFC_2822 = function () {};\n\n    // date from string and format string\n    function configFromStringAndFormat(config) {\n        // TODO: Move this to another part of the creation flow to prevent circular deps\n        if (config._f === hooks.ISO_8601) {\n            configFromISO(config);\n            return;\n        }\n        if (config._f === hooks.RFC_2822) {\n            configFromRFC2822(config);\n            return;\n        }\n        config._a = [];\n        getParsingFlags(config).empty = true;\n\n        // This array is used to make a Date, either with `new Date` or `Date.UTC`\n        var string = '' + config._i,\n            i, parsedInput, tokens, token, skipped,\n            stringLength = string.length,\n            totalParsedInputLength = 0;\n\n        tokens = expandFormat(config._f, config._locale).match(formattingTokens) || [];\n\n        for (i = 0; i < tokens.length; i++) {\n            token = tokens[i];\n            parsedInput = (string.match(getParseRegexForToken(token, config)) || [])[0];\n            // console.log('token', token, 'parsedInput', parsedInput,\n            //         'regex', getParseRegexForToken(token, config));\n            if (parsedInput) {\n                skipped = string.substr(0, string.indexOf(parsedInput));\n                if (skipped.length > 0) {\n                    getParsingFlags(config).unusedInput.push(skipped);\n                }\n                string = string.slice(string.indexOf(parsedInput) + parsedInput.length);\n                totalParsedInputLength += parsedInput.length;\n            }\n            // don't parse if it's not a known token\n            if (formatTokenFunctions[token]) {\n                if (parsedInput) {\n                    getParsingFlags(config).empty = false;\n                }\n                else {\n                    getParsingFlags(config).unusedTokens.push(token);\n                }\n                addTimeToArrayFromToken(token, parsedInput, config);\n            }\n            else if (config._strict && !parsedInput) {\n                getParsingFlags(config).unusedTokens.push(token);\n            }\n        }\n\n        // add remaining unparsed input length to the string\n        getParsingFlags(config).charsLeftOver = stringLength - totalParsedInputLength;\n        if (string.length > 0) {\n            getParsingFlags(config).unusedInput.push(string);\n        }\n\n        // clear _12h flag if hour is <= 12\n        if (config._a[HOUR] <= 12 &&\n            getParsingFlags(config).bigHour === true &&\n            config._a[HOUR] > 0) {\n            getParsingFlags(config).bigHour = undefined;\n        }\n\n        getParsingFlags(config).parsedDateParts = config._a.slice(0);\n        getParsingFlags(config).meridiem = config._meridiem;\n        // handle meridiem\n        config._a[HOUR] = meridiemFixWrap(config._locale, config._a[HOUR], config._meridiem);\n\n        configFromArray(config);\n        checkOverflow(config);\n    }\n\n\n    function meridiemFixWrap (locale, hour, meridiem) {\n        var isPm;\n\n        if (meridiem == null) {\n            // nothing to do\n            return hour;\n        }\n        if (locale.meridiemHour != null) {\n            return locale.meridiemHour(hour, meridiem);\n        } else if (locale.isPM != null) {\n            // Fallback\n            isPm = locale.isPM(meridiem);\n            if (isPm && hour < 12) {\n                hour += 12;\n            }\n            if (!isPm && hour === 12) {\n                hour = 0;\n            }\n            return hour;\n        } else {\n            // this is not supposed to happen\n            return hour;\n        }\n    }\n\n    // date from string and array of format strings\n    function configFromStringAndArray(config) {\n        var tempConfig,\n            bestMoment,\n\n            scoreToBeat,\n            i,\n            currentScore;\n\n        if (config._f.length === 0) {\n            getParsingFlags(config).invalidFormat = true;\n            config._d = new Date(NaN);\n            return;\n        }\n\n        for (i = 0; i < config._f.length; i++) {\n            currentScore = 0;\n            tempConfig = copyConfig({}, config);\n            if (config._useUTC != null) {\n                tempConfig._useUTC = config._useUTC;\n            }\n            tempConfig._f = config._f[i];\n            configFromStringAndFormat(tempConfig);\n\n            if (!isValid(tempConfig)) {\n                continue;\n            }\n\n            // if there is any input that was not parsed add a penalty for that format\n            currentScore += getParsingFlags(tempConfig).charsLeftOver;\n\n            //or tokens\n            currentScore += getParsingFlags(tempConfig).unusedTokens.length * 10;\n\n            getParsingFlags(tempConfig).score = currentScore;\n\n            if (scoreToBeat == null || currentScore < scoreToBeat) {\n                scoreToBeat = currentScore;\n                bestMoment = tempConfig;\n            }\n        }\n\n        extend(config, bestMoment || tempConfig);\n    }\n\n    function configFromObject(config) {\n        if (config._d) {\n            return;\n        }\n\n        var i = normalizeObjectUnits(config._i);\n        config._a = map([i.year, i.month, i.day || i.date, i.hour, i.minute, i.second, i.millisecond], function (obj) {\n            return obj && parseInt(obj, 10);\n        });\n\n        configFromArray(config);\n    }\n\n    function createFromConfig (config) {\n        var res = new Moment(checkOverflow(prepareConfig(config)));\n        if (res._nextDay) {\n            // Adding is smart enough around DST\n            res.add(1, 'd');\n            res._nextDay = undefined;\n        }\n\n        return res;\n    }\n\n    function prepareConfig (config) {\n        var input = config._i,\n            format = config._f;\n\n        config._locale = config._locale || getLocale(config._l);\n\n        if (input === null || (format === undefined && input === '')) {\n            return createInvalid({nullInput: true});\n        }\n\n        if (typeof input === 'string') {\n            config._i = input = config._locale.preparse(input);\n        }\n\n        if (isMoment(input)) {\n            return new Moment(checkOverflow(input));\n        } else if (isDate(input)) {\n            config._d = input;\n        } else if (isArray(format)) {\n            configFromStringAndArray(config);\n        } else if (format) {\n            configFromStringAndFormat(config);\n        }  else {\n            configFromInput(config);\n        }\n\n        if (!isValid(config)) {\n            config._d = null;\n        }\n\n        return config;\n    }\n\n    function configFromInput(config) {\n        var input = config._i;\n        if (isUndefined(input)) {\n            config._d = new Date(hooks.now());\n        } else if (isDate(input)) {\n            config._d = new Date(input.valueOf());\n        } else if (typeof input === 'string') {\n            configFromString(config);\n        } else if (isArray(input)) {\n            config._a = map(input.slice(0), function (obj) {\n                return parseInt(obj, 10);\n            });\n            configFromArray(config);\n        } else if (isObject(input)) {\n            configFromObject(config);\n        } else if (isNumber(input)) {\n            // from milliseconds\n            config._d = new Date(input);\n        } else {\n            hooks.createFromInputFallback(config);\n        }\n    }\n\n    function createLocalOrUTC (input, format, locale, strict, isUTC) {\n        var c = {};\n\n        if (locale === true || locale === false) {\n            strict = locale;\n            locale = undefined;\n        }\n\n        if ((isObject(input) && isObjectEmpty(input)) ||\n                (isArray(input) && input.length === 0)) {\n            input = undefined;\n        }\n        // object construction must be done this way.\n        // https://github.com/moment/moment/issues/1423\n        c._isAMomentObject = true;\n        c._useUTC = c._isUTC = isUTC;\n        c._l = locale;\n        c._i = input;\n        c._f = format;\n        c._strict = strict;\n\n        return createFromConfig(c);\n    }\n\n    function createLocal (input, format, locale, strict) {\n        return createLocalOrUTC(input, format, locale, strict, false);\n    }\n\n    var prototypeMin = deprecate(\n        'moment().min is deprecated, use moment.max instead. http://momentjs.com/guides/#/warnings/min-max/',\n        function () {\n            var other = createLocal.apply(null, arguments);\n            if (this.isValid() && other.isValid()) {\n                return other < this ? this : other;\n            } else {\n                return createInvalid();\n            }\n        }\n    );\n\n    var prototypeMax = deprecate(\n        'moment().max is deprecated, use moment.min instead. http://momentjs.com/guides/#/warnings/min-max/',\n        function () {\n            var other = createLocal.apply(null, arguments);\n            if (this.isValid() && other.isValid()) {\n                return other > this ? this : other;\n            } else {\n                return createInvalid();\n            }\n        }\n    );\n\n    // Pick a moment m from moments so that m[fn](other) is true for all\n    // other. This relies on the function fn to be transitive.\n    //\n    // moments should either be an array of moment objects or an array, whose\n    // first element is an array of moment objects.\n    function pickBy(fn, moments) {\n        var res, i;\n        if (moments.length === 1 && isArray(moments[0])) {\n            moments = moments[0];\n        }\n        if (!moments.length) {\n            return createLocal();\n        }\n        res = moments[0];\n        for (i = 1; i < moments.length; ++i) {\n            if (!moments[i].isValid() || moments[i][fn](res)) {\n                res = moments[i];\n            }\n        }\n        return res;\n    }\n\n    // TODO: Use [].sort instead?\n    function min () {\n        var args = [].slice.call(arguments, 0);\n\n        return pickBy('isBefore', args);\n    }\n\n    function max () {\n        var args = [].slice.call(arguments, 0);\n\n        return pickBy('isAfter', args);\n    }\n\n    var now = function () {\n        return Date.now ? Date.now() : +(new Date());\n    };\n\n    var ordering = ['year', 'quarter', 'month', 'week', 'day', 'hour', 'minute', 'second', 'millisecond'];\n\n    function isDurationValid(m) {\n        for (var key in m) {\n            if (!(indexOf.call(ordering, key) !== -1 && (m[key] == null || !isNaN(m[key])))) {\n                return false;\n            }\n        }\n\n        var unitHasDecimal = false;\n        for (var i = 0; i < ordering.length; ++i) {\n            if (m[ordering[i]]) {\n                if (unitHasDecimal) {\n                    return false; // only allow non-integers for smallest unit\n                }\n                if (parseFloat(m[ordering[i]]) !== toInt(m[ordering[i]])) {\n                    unitHasDecimal = true;\n                }\n            }\n        }\n\n        return true;\n    }\n\n    function isValid$1() {\n        return this._isValid;\n    }\n\n    function createInvalid$1() {\n        return createDuration(NaN);\n    }\n\n    function Duration (duration) {\n        var normalizedInput = normalizeObjectUnits(duration),\n            years = normalizedInput.year || 0,\n            quarters = normalizedInput.quarter || 0,\n            months = normalizedInput.month || 0,\n            weeks = normalizedInput.week || 0,\n            days = normalizedInput.day || 0,\n            hours = normalizedInput.hour || 0,\n            minutes = normalizedInput.minute || 0,\n            seconds = normalizedInput.second || 0,\n            milliseconds = normalizedInput.millisecond || 0;\n\n        this._isValid = isDurationValid(normalizedInput);\n\n        // representation for dateAddRemove\n        this._milliseconds = +milliseconds +\n            seconds * 1e3 + // 1000\n            minutes * 6e4 + // 1000 * 60\n            hours * 1000 * 60 * 60; //using 1000 * 60 * 60 instead of 36e5 to avoid floating point rounding errors https://github.com/moment/moment/issues/2978\n        // Because of dateAddRemove treats 24 hours as different from a\n        // day when working around DST, we need to store them separately\n        this._days = +days +\n            weeks * 7;\n        // It is impossible to translate months into days without knowing\n        // which months you are are talking about, so we have to store\n        // it separately.\n        this._months = +months +\n            quarters * 3 +\n            years * 12;\n\n        this._data = {};\n\n        this._locale = getLocale();\n\n        this._bubble();\n    }\n\n    function isDuration (obj) {\n        return obj instanceof Duration;\n    }\n\n    function absRound (number) {\n        if (number < 0) {\n            return Math.round(-1 * number) * -1;\n        } else {\n            return Math.round(number);\n        }\n    }\n\n    // FORMATTING\n\n    function offset (token, separator) {\n        addFormatToken(token, 0, 0, function () {\n            var offset = this.utcOffset();\n            var sign = '+';\n            if (offset < 0) {\n                offset = -offset;\n                sign = '-';\n            }\n            return sign + zeroFill(~~(offset / 60), 2) + separator + zeroFill(~~(offset) % 60, 2);\n        });\n    }\n\n    offset('Z', ':');\n    offset('ZZ', '');\n\n    // PARSING\n\n    addRegexToken('Z',  matchShortOffset);\n    addRegexToken('ZZ', matchShortOffset);\n    addParseToken(['Z', 'ZZ'], function (input, array, config) {\n        config._useUTC = true;\n        config._tzm = offsetFromString(matchShortOffset, input);\n    });\n\n    // HELPERS\n\n    // timezone chunker\n    // '+10:00' > ['10',  '00']\n    // '-1530'  > ['-15', '30']\n    var chunkOffset = /([\\+\\-]|\\d\\d)/gi;\n\n    function offsetFromString(matcher, string) {\n        var matches = (string || '').match(matcher);\n\n        if (matches === null) {\n            return null;\n        }\n\n        var chunk   = matches[matches.length - 1] || [];\n        var parts   = (chunk + '').match(chunkOffset) || ['-', 0, 0];\n        var minutes = +(parts[1] * 60) + toInt(parts[2]);\n\n        return minutes === 0 ?\n          0 :\n          parts[0] === '+' ? minutes : -minutes;\n    }\n\n    // Return a moment from input, that is local/utc/zone equivalent to model.\n    function cloneWithOffset(input, model) {\n        var res, diff;\n        if (model._isUTC) {\n            res = model.clone();\n            diff = (isMoment(input) || isDate(input) ? input.valueOf() : createLocal(input).valueOf()) - res.valueOf();\n            // Use low-level api, because this fn is low-level api.\n            res._d.setTime(res._d.valueOf() + diff);\n            hooks.updateOffset(res, false);\n            return res;\n        } else {\n            return createLocal(input).local();\n        }\n    }\n\n    function getDateOffset (m) {\n        // On Firefox.24 Date#getTimezoneOffset returns a floating point.\n        // https://github.com/moment/moment/pull/1871\n        return -Math.round(m._d.getTimezoneOffset() / 15) * 15;\n    }\n\n    // HOOKS\n\n    // This function will be called whenever a moment is mutated.\n    // It is intended to keep the offset in sync with the timezone.\n    hooks.updateOffset = function () {};\n\n    // MOMENTS\n\n    // keepLocalTime = true means only change the timezone, without\n    // affecting the local hour. So 5:31:26 +0300 --[utcOffset(2, true)]-->\n    // 5:31:26 +0200 It is possible that 5:31:26 doesn't exist with offset\n    // +0200, so we adjust the time as needed, to be valid.\n    //\n    // Keeping the time actually adds/subtracts (one hour)\n    // from the actual represented time. That is why we call updateOffset\n    // a second time. In case it wants us to change the offset again\n    // _changeInProgress == true case, then we have to adjust, because\n    // there is no such time in the given timezone.\n    function getSetOffset (input, keepLocalTime, keepMinutes) {\n        var offset = this._offset || 0,\n            localAdjust;\n        if (!this.isValid()) {\n            return input != null ? this : NaN;\n        }\n        if (input != null) {\n            if (typeof input === 'string') {\n                input = offsetFromString(matchShortOffset, input);\n                if (input === null) {\n                    return this;\n                }\n            } else if (Math.abs(input) < 16 && !keepMinutes) {\n                input = input * 60;\n            }\n            if (!this._isUTC && keepLocalTime) {\n                localAdjust = getDateOffset(this);\n            }\n            this._offset = input;\n            this._isUTC = true;\n            if (localAdjust != null) {\n                this.add(localAdjust, 'm');\n            }\n            if (offset !== input) {\n                if (!keepLocalTime || this._changeInProgress) {\n                    addSubtract(this, createDuration(input - offset, 'm'), 1, false);\n                } else if (!this._changeInProgress) {\n                    this._changeInProgress = true;\n                    hooks.updateOffset(this, true);\n                    this._changeInProgress = null;\n                }\n            }\n            return this;\n        } else {\n            return this._isUTC ? offset : getDateOffset(this);\n        }\n    }\n\n    function getSetZone (input, keepLocalTime) {\n        if (input != null) {\n            if (typeof input !== 'string') {\n                input = -input;\n            }\n\n            this.utcOffset(input, keepLocalTime);\n\n            return this;\n        } else {\n            return -this.utcOffset();\n        }\n    }\n\n    function setOffsetToUTC (keepLocalTime) {\n        return this.utcOffset(0, keepLocalTime);\n    }\n\n    function setOffsetToLocal (keepLocalTime) {\n        if (this._isUTC) {\n            this.utcOffset(0, keepLocalTime);\n            this._isUTC = false;\n\n            if (keepLocalTime) {\n                this.subtract(getDateOffset(this), 'm');\n            }\n        }\n        return this;\n    }\n\n    function setOffsetToParsedOffset () {\n        if (this._tzm != null) {\n            this.utcOffset(this._tzm, false, true);\n        } else if (typeof this._i === 'string') {\n            var tZone = offsetFromString(matchOffset, this._i);\n            if (tZone != null) {\n                this.utcOffset(tZone);\n            }\n            else {\n                this.utcOffset(0, true);\n            }\n        }\n        return this;\n    }\n\n    function hasAlignedHourOffset (input) {\n        if (!this.isValid()) {\n            return false;\n        }\n        input = input ? createLocal(input).utcOffset() : 0;\n\n        return (this.utcOffset() - input) % 60 === 0;\n    }\n\n    function isDaylightSavingTime () {\n        return (\n            this.utcOffset() > this.clone().month(0).utcOffset() ||\n            this.utcOffset() > this.clone().month(5).utcOffset()\n        );\n    }\n\n    function isDaylightSavingTimeShifted () {\n        if (!isUndefined(this._isDSTShifted)) {\n            return this._isDSTShifted;\n        }\n\n        var c = {};\n\n        copyConfig(c, this);\n        c = prepareConfig(c);\n\n        if (c._a) {\n            var other = c._isUTC ? createUTC(c._a) : createLocal(c._a);\n            this._isDSTShifted = this.isValid() &&\n                compareArrays(c._a, other.toArray()) > 0;\n        } else {\n            this._isDSTShifted = false;\n        }\n\n        return this._isDSTShifted;\n    }\n\n    function isLocal () {\n        return this.isValid() ? !this._isUTC : false;\n    }\n\n    function isUtcOffset () {\n        return this.isValid() ? this._isUTC : false;\n    }\n\n    function isUtc () {\n        return this.isValid() ? this._isUTC && this._offset === 0 : false;\n    }\n\n    // ASP.NET json date format regex\n    var aspNetRegex = /^(\\-|\\+)?(?:(\\d*)[. ])?(\\d+)\\:(\\d+)(?:\\:(\\d+)(\\.\\d*)?)?$/;\n\n    // from http://docs.closure-library.googlecode.com/git/closure_goog_date_date.js.source.html\n    // somewhat more in line with 4.4.3.2 2004 spec, but allows decimal anywhere\n    // and further modified to allow for strings containing both week and day\n    var isoRegex = /^(-|\\+)?P(?:([-+]?[0-9,.]*)Y)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)W)?(?:([-+]?[0-9,.]*)D)?(?:T(?:([-+]?[0-9,.]*)H)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)S)?)?$/;\n\n    function createDuration (input, key) {\n        var duration = input,\n            // matching against regexp is expensive, do it on demand\n            match = null,\n            sign,\n            ret,\n            diffRes;\n\n        if (isDuration(input)) {\n            duration = {\n                ms : input._milliseconds,\n                d  : input._days,\n                M  : input._months\n            };\n        } else if (isNumber(input)) {\n            duration = {};\n            if (key) {\n                duration[key] = input;\n            } else {\n                duration.milliseconds = input;\n            }\n        } else if (!!(match = aspNetRegex.exec(input))) {\n            sign = (match[1] === '-') ? -1 : 1;\n            duration = {\n                y  : 0,\n                d  : toInt(match[DATE])                         * sign,\n                h  : toInt(match[HOUR])                         * sign,\n                m  : toInt(match[MINUTE])                       * sign,\n                s  : toInt(match[SECOND])                       * sign,\n                ms : toInt(absRound(match[MILLISECOND] * 1000)) * sign // the millisecond decimal point is included in the match\n            };\n        } else if (!!(match = isoRegex.exec(input))) {\n            sign = (match[1] === '-') ? -1 : (match[1] === '+') ? 1 : 1;\n            duration = {\n                y : parseIso(match[2], sign),\n                M : parseIso(match[3], sign),\n                w : parseIso(match[4], sign),\n                d : parseIso(match[5], sign),\n                h : parseIso(match[6], sign),\n                m : parseIso(match[7], sign),\n                s : parseIso(match[8], sign)\n            };\n        } else if (duration == null) {// checks for null or undefined\n            duration = {};\n        } else if (typeof duration === 'object' && ('from' in duration || 'to' in duration)) {\n            diffRes = momentsDifference(createLocal(duration.from), createLocal(duration.to));\n\n            duration = {};\n            duration.ms = diffRes.milliseconds;\n            duration.M = diffRes.months;\n        }\n\n        ret = new Duration(duration);\n\n        if (isDuration(input) && hasOwnProp(input, '_locale')) {\n            ret._locale = input._locale;\n        }\n\n        return ret;\n    }\n\n    createDuration.fn = Duration.prototype;\n    createDuration.invalid = createInvalid$1;\n\n    function parseIso (inp, sign) {\n        // We'd normally use ~~inp for this, but unfortunately it also\n        // converts floats to ints.\n        // inp may be undefined, so careful calling replace on it.\n        var res = inp && parseFloat(inp.replace(',', '.'));\n        // apply sign while we're at it\n        return (isNaN(res) ? 0 : res) * sign;\n    }\n\n    function positiveMomentsDifference(base, other) {\n        var res = {milliseconds: 0, months: 0};\n\n        res.months = other.month() - base.month() +\n            (other.year() - base.year()) * 12;\n        if (base.clone().add(res.months, 'M').isAfter(other)) {\n            --res.months;\n        }\n\n        res.milliseconds = +other - +(base.clone().add(res.months, 'M'));\n\n        return res;\n    }\n\n    function momentsDifference(base, other) {\n        var res;\n        if (!(base.isValid() && other.isValid())) {\n            return {milliseconds: 0, months: 0};\n        }\n\n        other = cloneWithOffset(other, base);\n        if (base.isBefore(other)) {\n            res = positiveMomentsDifference(base, other);\n        } else {\n            res = positiveMomentsDifference(other, base);\n            res.milliseconds = -res.milliseconds;\n            res.months = -res.months;\n        }\n\n        return res;\n    }\n\n    // TODO: remove 'name' arg after deprecation is removed\n    function createAdder(direction, name) {\n        return function (val, period) {\n            var dur, tmp;\n            //invert the arguments, but complain about it\n            if (period !== null && !isNaN(+period)) {\n                deprecateSimple(name, 'moment().' + name  + '(period, number) is deprecated. Please use moment().' + name + '(number, period). ' +\n                'See http://momentjs.com/guides/#/warnings/add-inverted-param/ for more info.');\n                tmp = val; val = period; period = tmp;\n            }\n\n            val = typeof val === 'string' ? +val : val;\n            dur = createDuration(val, period);\n            addSubtract(this, dur, direction);\n            return this;\n        };\n    }\n\n    function addSubtract (mom, duration, isAdding, updateOffset) {\n        var milliseconds = duration._milliseconds,\n            days = absRound(duration._days),\n            months = absRound(duration._months);\n\n        if (!mom.isValid()) {\n            // No op\n            return;\n        }\n\n        updateOffset = updateOffset == null ? true : updateOffset;\n\n        if (months) {\n            setMonth(mom, get(mom, 'Month') + months * isAdding);\n        }\n        if (days) {\n            set$1(mom, 'Date', get(mom, 'Date') + days * isAdding);\n        }\n        if (milliseconds) {\n            mom._d.setTime(mom._d.valueOf() + milliseconds * isAdding);\n        }\n        if (updateOffset) {\n            hooks.updateOffset(mom, days || months);\n        }\n    }\n\n    var add      = createAdder(1, 'add');\n    var subtract = createAdder(-1, 'subtract');\n\n    function getCalendarFormat(myMoment, now) {\n        var diff = myMoment.diff(now, 'days', true);\n        return diff < -6 ? 'sameElse' :\n                diff < -1 ? 'lastWeek' :\n                diff < 0 ? 'lastDay' :\n                diff < 1 ? 'sameDay' :\n                diff < 2 ? 'nextDay' :\n                diff < 7 ? 'nextWeek' : 'sameElse';\n    }\n\n    function calendar$1 (time, formats) {\n        // We want to compare the start of today, vs this.\n        // Getting start-of-today depends on whether we're local/utc/offset or not.\n        var now = time || createLocal(),\n            sod = cloneWithOffset(now, this).startOf('day'),\n            format = hooks.calendarFormat(this, sod) || 'sameElse';\n\n        var output = formats && (isFunction(formats[format]) ? formats[format].call(this, now) : formats[format]);\n\n        return this.format(output || this.localeData().calendar(format, this, createLocal(now)));\n    }\n\n    function clone () {\n        return new Moment(this);\n    }\n\n    function isAfter (input, units) {\n        var localInput = isMoment(input) ? input : createLocal(input);\n        if (!(this.isValid() && localInput.isValid())) {\n            return false;\n        }\n        units = normalizeUnits(!isUndefined(units) ? units : 'millisecond');\n        if (units === 'millisecond') {\n            return this.valueOf() > localInput.valueOf();\n        } else {\n            return localInput.valueOf() < this.clone().startOf(units).valueOf();\n        }\n    }\n\n    function isBefore (input, units) {\n        var localInput = isMoment(input) ? input : createLocal(input);\n        if (!(this.isValid() && localInput.isValid())) {\n            return false;\n        }\n        units = normalizeUnits(!isUndefined(units) ? units : 'millisecond');\n        if (units === 'millisecond') {\n            return this.valueOf() < localInput.valueOf();\n        } else {\n            return this.clone().endOf(units).valueOf() < localInput.valueOf();\n        }\n    }\n\n    function isBetween (from, to, units, inclusivity) {\n        inclusivity = inclusivity || '()';\n        return (inclusivity[0] === '(' ? this.isAfter(from, units) : !this.isBefore(from, units)) &&\n            (inclusivity[1] === ')' ? this.isBefore(to, units) : !this.isAfter(to, units));\n    }\n\n    function isSame (input, units) {\n        var localInput = isMoment(input) ? input : createLocal(input),\n            inputMs;\n        if (!(this.isValid() && localInput.isValid())) {\n            return false;\n        }\n        units = normalizeUnits(units || 'millisecond');\n        if (units === 'millisecond') {\n            return this.valueOf() === localInput.valueOf();\n        } else {\n            inputMs = localInput.valueOf();\n            return this.clone().startOf(units).valueOf() <= inputMs && inputMs <= this.clone().endOf(units).valueOf();\n        }\n    }\n\n    function isSameOrAfter (input, units) {\n        return this.isSame(input, units) || this.isAfter(input,units);\n    }\n\n    function isSameOrBefore (input, units) {\n        return this.isSame(input, units) || this.isBefore(input,units);\n    }\n\n    function diff (input, units, asFloat) {\n        var that,\n            zoneDelta,\n            output;\n\n        if (!this.isValid()) {\n            return NaN;\n        }\n\n        that = cloneWithOffset(input, this);\n\n        if (!that.isValid()) {\n            return NaN;\n        }\n\n        zoneDelta = (that.utcOffset() - this.utcOffset()) * 6e4;\n\n        units = normalizeUnits(units);\n\n        switch (units) {\n            case 'year': output = monthDiff(this, that) / 12; break;\n            case 'month': output = monthDiff(this, that); break;\n            case 'quarter': output = monthDiff(this, that) / 3; break;\n            case 'second': output = (this - that) / 1e3; break; // 1000\n            case 'minute': output = (this - that) / 6e4; break; // 1000 * 60\n            case 'hour': output = (this - that) / 36e5; break; // 1000 * 60 * 60\n            case 'day': output = (this - that - zoneDelta) / 864e5; break; // 1000 * 60 * 60 * 24, negate dst\n            case 'week': output = (this - that - zoneDelta) / 6048e5; break; // 1000 * 60 * 60 * 24 * 7, negate dst\n            default: output = this - that;\n        }\n\n        return asFloat ? output : absFloor(output);\n    }\n\n    function monthDiff (a, b) {\n        // difference in months\n        var wholeMonthDiff = ((b.year() - a.year()) * 12) + (b.month() - a.month()),\n            // b is in (anchor - 1 month, anchor + 1 month)\n            anchor = a.clone().add(wholeMonthDiff, 'months'),\n            anchor2, adjust;\n\n        if (b - anchor < 0) {\n            anchor2 = a.clone().add(wholeMonthDiff - 1, 'months');\n            // linear across the month\n            adjust = (b - anchor) / (anchor - anchor2);\n        } else {\n            anchor2 = a.clone().add(wholeMonthDiff + 1, 'months');\n            // linear across the month\n            adjust = (b - anchor) / (anchor2 - anchor);\n        }\n\n        //check for negative zero, return zero if negative zero\n        return -(wholeMonthDiff + adjust) || 0;\n    }\n\n    hooks.defaultFormat = 'YYYY-MM-DDTHH:mm:ssZ';\n    hooks.defaultFormatUtc = 'YYYY-MM-DDTHH:mm:ss[Z]';\n\n    function toString () {\n        return this.clone().locale('en').format('ddd MMM DD YYYY HH:mm:ss [GMT]ZZ');\n    }\n\n    function toISOString(keepOffset) {\n        if (!this.isValid()) {\n            return null;\n        }\n        var utc = keepOffset !== true;\n        var m = utc ? this.clone().utc() : this;\n        if (m.year() < 0 || m.year() > 9999) {\n            return formatMoment(m, utc ? 'YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]' : 'YYYYYY-MM-DD[T]HH:mm:ss.SSSZ');\n        }\n        if (isFunction(Date.prototype.toISOString)) {\n            // native implementation is ~50x faster, use it when we can\n            if (utc) {\n                return this.toDate().toISOString();\n            } else {\n                return new Date(this.valueOf() + this.utcOffset() * 60 * 1000).toISOString().replace('Z', formatMoment(m, 'Z'));\n            }\n        }\n        return formatMoment(m, utc ? 'YYYY-MM-DD[T]HH:mm:ss.SSS[Z]' : 'YYYY-MM-DD[T]HH:mm:ss.SSSZ');\n    }\n\n    /**\n     * Return a human readable representation of a moment that can\n     * also be evaluated to get a new moment which is the same\n     *\n     * @link https://nodejs.org/dist/latest/docs/api/util.html#util_custom_inspect_function_on_objects\n     */\n    function inspect () {\n        if (!this.isValid()) {\n            return 'moment.invalid(/* ' + this._i + ' */)';\n        }\n        var func = 'moment';\n        var zone = '';\n        if (!this.isLocal()) {\n            func = this.utcOffset() === 0 ? 'moment.utc' : 'moment.parseZone';\n            zone = 'Z';\n        }\n        var prefix = '[' + func + '(\"]';\n        var year = (0 <= this.year() && this.year() <= 9999) ? 'YYYY' : 'YYYYYY';\n        var datetime = '-MM-DD[T]HH:mm:ss.SSS';\n        var suffix = zone + '[\")]';\n\n        return this.format(prefix + year + datetime + suffix);\n    }\n\n    function format (inputString) {\n        if (!inputString) {\n            inputString = this.isUtc() ? hooks.defaultFormatUtc : hooks.defaultFormat;\n        }\n        var output = formatMoment(this, inputString);\n        return this.localeData().postformat(output);\n    }\n\n    function from (time, withoutSuffix) {\n        if (this.isValid() &&\n                ((isMoment(time) && time.isValid()) ||\n                 createLocal(time).isValid())) {\n            return createDuration({to: this, from: time}).locale(this.locale()).humanize(!withoutSuffix);\n        } else {\n            return this.localeData().invalidDate();\n        }\n    }\n\n    function fromNow (withoutSuffix) {\n        return this.from(createLocal(), withoutSuffix);\n    }\n\n    function to (time, withoutSuffix) {\n        if (this.isValid() &&\n                ((isMoment(time) && time.isValid()) ||\n                 createLocal(time).isValid())) {\n            return createDuration({from: this, to: time}).locale(this.locale()).humanize(!withoutSuffix);\n        } else {\n            return this.localeData().invalidDate();\n        }\n    }\n\n    function toNow (withoutSuffix) {\n        return this.to(createLocal(), withoutSuffix);\n    }\n\n    // If passed a locale key, it will set the locale for this\n    // instance.  Otherwise, it will return the locale configuration\n    // variables for this instance.\n    function locale (key) {\n        var newLocaleData;\n\n        if (key === undefined) {\n            return this._locale._abbr;\n        } else {\n            newLocaleData = getLocale(key);\n            if (newLocaleData != null) {\n                this._locale = newLocaleData;\n            }\n            return this;\n        }\n    }\n\n    var lang = deprecate(\n        'moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.',\n        function (key) {\n            if (key === undefined) {\n                return this.localeData();\n            } else {\n                return this.locale(key);\n            }\n        }\n    );\n\n    function localeData () {\n        return this._locale;\n    }\n\n    function startOf (units) {\n        units = normalizeUnits(units);\n        // the following switch intentionally omits break keywords\n        // to utilize falling through the cases.\n        switch (units) {\n            case 'year':\n                this.month(0);\n                /* falls through */\n            case 'quarter':\n            case 'month':\n                this.date(1);\n                /* falls through */\n            case 'week':\n            case 'isoWeek':\n            case 'day':\n            case 'date':\n                this.hours(0);\n                /* falls through */\n            case 'hour':\n                this.minutes(0);\n                /* falls through */\n            case 'minute':\n                this.seconds(0);\n                /* falls through */\n            case 'second':\n                this.milliseconds(0);\n        }\n\n        // weeks are a special case\n        if (units === 'week') {\n            this.weekday(0);\n        }\n        if (units === 'isoWeek') {\n            this.isoWeekday(1);\n        }\n\n        // quarters are also special\n        if (units === 'quarter') {\n            this.month(Math.floor(this.month() / 3) * 3);\n        }\n\n        return this;\n    }\n\n    function endOf (units) {\n        units = normalizeUnits(units);\n        if (units === undefined || units === 'millisecond') {\n            return this;\n        }\n\n        // 'date' is an alias for 'day', so it should be considered as such.\n        if (units === 'date') {\n            units = 'day';\n        }\n\n        return this.startOf(units).add(1, (units === 'isoWeek' ? 'week' : units)).subtract(1, 'ms');\n    }\n\n    function valueOf () {\n        return this._d.valueOf() - ((this._offset || 0) * 60000);\n    }\n\n    function unix () {\n        return Math.floor(this.valueOf() / 1000);\n    }\n\n    function toDate () {\n        return new Date(this.valueOf());\n    }\n\n    function toArray () {\n        var m = this;\n        return [m.year(), m.month(), m.date(), m.hour(), m.minute(), m.second(), m.millisecond()];\n    }\n\n    function toObject () {\n        var m = this;\n        return {\n            years: m.year(),\n            months: m.month(),\n            date: m.date(),\n            hours: m.hours(),\n            minutes: m.minutes(),\n            seconds: m.seconds(),\n            milliseconds: m.milliseconds()\n        };\n    }\n\n    function toJSON () {\n        // new Date(NaN).toJSON() === null\n        return this.isValid() ? this.toISOString() : null;\n    }\n\n    function isValid$2 () {\n        return isValid(this);\n    }\n\n    function parsingFlags () {\n        return extend({}, getParsingFlags(this));\n    }\n\n    function invalidAt () {\n        return getParsingFlags(this).overflow;\n    }\n\n    function creationData() {\n        return {\n            input: this._i,\n            format: this._f,\n            locale: this._locale,\n            isUTC: this._isUTC,\n            strict: this._strict\n        };\n    }\n\n    // FORMATTING\n\n    addFormatToken(0, ['gg', 2], 0, function () {\n        return this.weekYear() % 100;\n    });\n\n    addFormatToken(0, ['GG', 2], 0, function () {\n        return this.isoWeekYear() % 100;\n    });\n\n    function addWeekYearFormatToken (token, getter) {\n        addFormatToken(0, [token, token.length], 0, getter);\n    }\n\n    addWeekYearFormatToken('gggg',     'weekYear');\n    addWeekYearFormatToken('ggggg',    'weekYear');\n    addWeekYearFormatToken('GGGG',  'isoWeekYear');\n    addWeekYearFormatToken('GGGGG', 'isoWeekYear');\n\n    // ALIASES\n\n    addUnitAlias('weekYear', 'gg');\n    addUnitAlias('isoWeekYear', 'GG');\n\n    // PRIORITY\n\n    addUnitPriority('weekYear', 1);\n    addUnitPriority('isoWeekYear', 1);\n\n\n    // PARSING\n\n    addRegexToken('G',      matchSigned);\n    addRegexToken('g',      matchSigned);\n    addRegexToken('GG',     match1to2, match2);\n    addRegexToken('gg',     match1to2, match2);\n    addRegexToken('GGGG',   match1to4, match4);\n    addRegexToken('gggg',   match1to4, match4);\n    addRegexToken('GGGGG',  match1to6, match6);\n    addRegexToken('ggggg',  match1to6, match6);\n\n    addWeekParseToken(['gggg', 'ggggg', 'GGGG', 'GGGGG'], function (input, week, config, token) {\n        week[token.substr(0, 2)] = toInt(input);\n    });\n\n    addWeekParseToken(['gg', 'GG'], function (input, week, config, token) {\n        week[token] = hooks.parseTwoDigitYear(input);\n    });\n\n    // MOMENTS\n\n    function getSetWeekYear (input) {\n        return getSetWeekYearHelper.call(this,\n                input,\n                this.week(),\n                this.weekday(),\n                this.localeData()._week.dow,\n                this.localeData()._week.doy);\n    }\n\n    function getSetISOWeekYear (input) {\n        return getSetWeekYearHelper.call(this,\n                input, this.isoWeek(), this.isoWeekday(), 1, 4);\n    }\n\n    function getISOWeeksInYear () {\n        return weeksInYear(this.year(), 1, 4);\n    }\n\n    function getWeeksInYear () {\n        var weekInfo = this.localeData()._week;\n        return weeksInYear(this.year(), weekInfo.dow, weekInfo.doy);\n    }\n\n    function getSetWeekYearHelper(input, week, weekday, dow, doy) {\n        var weeksTarget;\n        if (input == null) {\n            return weekOfYear(this, dow, doy).year;\n        } else {\n            weeksTarget = weeksInYear(input, dow, doy);\n            if (week > weeksTarget) {\n                week = weeksTarget;\n            }\n            return setWeekAll.call(this, input, week, weekday, dow, doy);\n        }\n    }\n\n    function setWeekAll(weekYear, week, weekday, dow, doy) {\n        var dayOfYearData = dayOfYearFromWeeks(weekYear, week, weekday, dow, doy),\n            date = createUTCDate(dayOfYearData.year, 0, dayOfYearData.dayOfYear);\n\n        this.year(date.getUTCFullYear());\n        this.month(date.getUTCMonth());\n        this.date(date.getUTCDate());\n        return this;\n    }\n\n    // FORMATTING\n\n    addFormatToken('Q', 0, 'Qo', 'quarter');\n\n    // ALIASES\n\n    addUnitAlias('quarter', 'Q');\n\n    // PRIORITY\n\n    addUnitPriority('quarter', 7);\n\n    // PARSING\n\n    addRegexToken('Q', match1);\n    addParseToken('Q', function (input, array) {\n        array[MONTH] = (toInt(input) - 1) * 3;\n    });\n\n    // MOMENTS\n\n    function getSetQuarter (input) {\n        return input == null ? Math.ceil((this.month() + 1) / 3) : this.month((input - 1) * 3 + this.month() % 3);\n    }\n\n    // FORMATTING\n\n    addFormatToken('D', ['DD', 2], 'Do', 'date');\n\n    // ALIASES\n\n    addUnitAlias('date', 'D');\n\n    // PRIORITY\n    addUnitPriority('date', 9);\n\n    // PARSING\n\n    addRegexToken('D',  match1to2);\n    addRegexToken('DD', match1to2, match2);\n    addRegexToken('Do', function (isStrict, locale) {\n        // TODO: Remove \"ordinalParse\" fallback in next major release.\n        return isStrict ?\n          (locale._dayOfMonthOrdinalParse || locale._ordinalParse) :\n          locale._dayOfMonthOrdinalParseLenient;\n    });\n\n    addParseToken(['D', 'DD'], DATE);\n    addParseToken('Do', function (input, array) {\n        array[DATE] = toInt(input.match(match1to2)[0]);\n    });\n\n    // MOMENTS\n\n    var getSetDayOfMonth = makeGetSet('Date', true);\n\n    // FORMATTING\n\n    addFormatToken('DDD', ['DDDD', 3], 'DDDo', 'dayOfYear');\n\n    // ALIASES\n\n    addUnitAlias('dayOfYear', 'DDD');\n\n    // PRIORITY\n    addUnitPriority('dayOfYear', 4);\n\n    // PARSING\n\n    addRegexToken('DDD',  match1to3);\n    addRegexToken('DDDD', match3);\n    addParseToken(['DDD', 'DDDD'], function (input, array, config) {\n        config._dayOfYear = toInt(input);\n    });\n\n    // HELPERS\n\n    // MOMENTS\n\n    function getSetDayOfYear (input) {\n        var dayOfYear = Math.round((this.clone().startOf('day') - this.clone().startOf('year')) / 864e5) + 1;\n        return input == null ? dayOfYear : this.add((input - dayOfYear), 'd');\n    }\n\n    // FORMATTING\n\n    addFormatToken('m', ['mm', 2], 0, 'minute');\n\n    // ALIASES\n\n    addUnitAlias('minute', 'm');\n\n    // PRIORITY\n\n    addUnitPriority('minute', 14);\n\n    // PARSING\n\n    addRegexToken('m',  match1to2);\n    addRegexToken('mm', match1to2, match2);\n    addParseToken(['m', 'mm'], MINUTE);\n\n    // MOMENTS\n\n    var getSetMinute = makeGetSet('Minutes', false);\n\n    // FORMATTING\n\n    addFormatToken('s', ['ss', 2], 0, 'second');\n\n    // ALIASES\n\n    addUnitAlias('second', 's');\n\n    // PRIORITY\n\n    addUnitPriority('second', 15);\n\n    // PARSING\n\n    addRegexToken('s',  match1to2);\n    addRegexToken('ss', match1to2, match2);\n    addParseToken(['s', 'ss'], SECOND);\n\n    // MOMENTS\n\n    var getSetSecond = makeGetSet('Seconds', false);\n\n    // FORMATTING\n\n    addFormatToken('S', 0, 0, function () {\n        return ~~(this.millisecond() / 100);\n    });\n\n    addFormatToken(0, ['SS', 2], 0, function () {\n        return ~~(this.millisecond() / 10);\n    });\n\n    addFormatToken(0, ['SSS', 3], 0, 'millisecond');\n    addFormatToken(0, ['SSSS', 4], 0, function () {\n        return this.millisecond() * 10;\n    });\n    addFormatToken(0, ['SSSSS', 5], 0, function () {\n        return this.millisecond() * 100;\n    });\n    addFormatToken(0, ['SSSSSS', 6], 0, function () {\n        return this.millisecond() * 1000;\n    });\n    addFormatToken(0, ['SSSSSSS', 7], 0, function () {\n        return this.millisecond() * 10000;\n    });\n    addFormatToken(0, ['SSSSSSSS', 8], 0, function () {\n        return this.millisecond() * 100000;\n    });\n    addFormatToken(0, ['SSSSSSSSS', 9], 0, function () {\n        return this.millisecond() * 1000000;\n    });\n\n\n    // ALIASES\n\n    addUnitAlias('millisecond', 'ms');\n\n    // PRIORITY\n\n    addUnitPriority('millisecond', 16);\n\n    // PARSING\n\n    addRegexToken('S',    match1to3, match1);\n    addRegexToken('SS',   match1to3, match2);\n    addRegexToken('SSS',  match1to3, match3);\n\n    var token;\n    for (token = 'SSSS'; token.length <= 9; token += 'S') {\n        addRegexToken(token, matchUnsigned);\n    }\n\n    function parseMs(input, array) {\n        array[MILLISECOND] = toInt(('0.' + input) * 1000);\n    }\n\n    for (token = 'S'; token.length <= 9; token += 'S') {\n        addParseToken(token, parseMs);\n    }\n    // MOMENTS\n\n    var getSetMillisecond = makeGetSet('Milliseconds', false);\n\n    // FORMATTING\n\n    addFormatToken('z',  0, 0, 'zoneAbbr');\n    addFormatToken('zz', 0, 0, 'zoneName');\n\n    // MOMENTS\n\n    function getZoneAbbr () {\n        return this._isUTC ? 'UTC' : '';\n    }\n\n    function getZoneName () {\n        return this._isUTC ? 'Coordinated Universal Time' : '';\n    }\n\n    var proto = Moment.prototype;\n\n    proto.add               = add;\n    proto.calendar          = calendar$1;\n    proto.clone             = clone;\n    proto.diff              = diff;\n    proto.endOf             = endOf;\n    proto.format            = format;\n    proto.from              = from;\n    proto.fromNow           = fromNow;\n    proto.to                = to;\n    proto.toNow             = toNow;\n    proto.get               = stringGet;\n    proto.invalidAt         = invalidAt;\n    proto.isAfter           = isAfter;\n    proto.isBefore          = isBefore;\n    proto.isBetween         = isBetween;\n    proto.isSame            = isSame;\n    proto.isSameOrAfter     = isSameOrAfter;\n    proto.isSameOrBefore    = isSameOrBefore;\n    proto.isValid           = isValid$2;\n    proto.lang              = lang;\n    proto.locale            = locale;\n    proto.localeData        = localeData;\n    proto.max               = prototypeMax;\n    proto.min               = prototypeMin;\n    proto.parsingFlags      = parsingFlags;\n    proto.set               = stringSet;\n    proto.startOf           = startOf;\n    proto.subtract          = subtract;\n    proto.toArray           = toArray;\n    proto.toObject          = toObject;\n    proto.toDate            = toDate;\n    proto.toISOString       = toISOString;\n    proto.inspect           = inspect;\n    proto.toJSON            = toJSON;\n    proto.toString          = toString;\n    proto.unix              = unix;\n    proto.valueOf           = valueOf;\n    proto.creationData      = creationData;\n    proto.year       = getSetYear;\n    proto.isLeapYear = getIsLeapYear;\n    proto.weekYear    = getSetWeekYear;\n    proto.isoWeekYear = getSetISOWeekYear;\n    proto.quarter = proto.quarters = getSetQuarter;\n    proto.month       = getSetMonth;\n    proto.daysInMonth = getDaysInMonth;\n    proto.week           = proto.weeks        = getSetWeek;\n    proto.isoWeek        = proto.isoWeeks     = getSetISOWeek;\n    proto.weeksInYear    = getWeeksInYear;\n    proto.isoWeeksInYear = getISOWeeksInYear;\n    proto.date       = getSetDayOfMonth;\n    proto.day        = proto.days             = getSetDayOfWeek;\n    proto.weekday    = getSetLocaleDayOfWeek;\n    proto.isoWeekday = getSetISODayOfWeek;\n    proto.dayOfYear  = getSetDayOfYear;\n    proto.hour = proto.hours = getSetHour;\n    proto.minute = proto.minutes = getSetMinute;\n    proto.second = proto.seconds = getSetSecond;\n    proto.millisecond = proto.milliseconds = getSetMillisecond;\n    proto.utcOffset            = getSetOffset;\n    proto.utc                  = setOffsetToUTC;\n    proto.local                = setOffsetToLocal;\n    proto.parseZone            = setOffsetToParsedOffset;\n    proto.hasAlignedHourOffset = hasAlignedHourOffset;\n    proto.isDST                = isDaylightSavingTime;\n    proto.isLocal              = isLocal;\n    proto.isUtcOffset          = isUtcOffset;\n    proto.isUtc                = isUtc;\n    proto.isUTC                = isUtc;\n    proto.zoneAbbr = getZoneAbbr;\n    proto.zoneName = getZoneName;\n    proto.dates  = deprecate('dates accessor is deprecated. Use date instead.', getSetDayOfMonth);\n    proto.months = deprecate('months accessor is deprecated. Use month instead', getSetMonth);\n    proto.years  = deprecate('years accessor is deprecated. Use year instead', getSetYear);\n    proto.zone   = deprecate('moment().zone is deprecated, use moment().utcOffset instead. http://momentjs.com/guides/#/warnings/zone/', getSetZone);\n    proto.isDSTShifted = deprecate('isDSTShifted is deprecated. See http://momentjs.com/guides/#/warnings/dst-shifted/ for more information', isDaylightSavingTimeShifted);\n\n    function createUnix (input) {\n        return createLocal(input * 1000);\n    }\n\n    function createInZone () {\n        return createLocal.apply(null, arguments).parseZone();\n    }\n\n    function preParsePostFormat (string) {\n        return string;\n    }\n\n    var proto$1 = Locale.prototype;\n\n    proto$1.calendar        = calendar;\n    proto$1.longDateFormat  = longDateFormat;\n    proto$1.invalidDate     = invalidDate;\n    proto$1.ordinal         = ordinal;\n    proto$1.preparse        = preParsePostFormat;\n    proto$1.postformat      = preParsePostFormat;\n    proto$1.relativeTime    = relativeTime;\n    proto$1.pastFuture      = pastFuture;\n    proto$1.set             = set;\n\n    proto$1.months            =        localeMonths;\n    proto$1.monthsShort       =        localeMonthsShort;\n    proto$1.monthsParse       =        localeMonthsParse;\n    proto$1.monthsRegex       = monthsRegex;\n    proto$1.monthsShortRegex  = monthsShortRegex;\n    proto$1.week = localeWeek;\n    proto$1.firstDayOfYear = localeFirstDayOfYear;\n    proto$1.firstDayOfWeek = localeFirstDayOfWeek;\n\n    proto$1.weekdays       =        localeWeekdays;\n    proto$1.weekdaysMin    =        localeWeekdaysMin;\n    proto$1.weekdaysShort  =        localeWeekdaysShort;\n    proto$1.weekdaysParse  =        localeWeekdaysParse;\n\n    proto$1.weekdaysRegex       =        weekdaysRegex;\n    proto$1.weekdaysShortRegex  =        weekdaysShortRegex;\n    proto$1.weekdaysMinRegex    =        weekdaysMinRegex;\n\n    proto$1.isPM = localeIsPM;\n    proto$1.meridiem = localeMeridiem;\n\n    function get$1 (format, index, field, setter) {\n        var locale = getLocale();\n        var utc = createUTC().set(setter, index);\n        return locale[field](utc, format);\n    }\n\n    function listMonthsImpl (format, index, field) {\n        if (isNumber(format)) {\n            index = format;\n            format = undefined;\n        }\n\n        format = format || '';\n\n        if (index != null) {\n            return get$1(format, index, field, 'month');\n        }\n\n        var i;\n        var out = [];\n        for (i = 0; i < 12; i++) {\n            out[i] = get$1(format, i, field, 'month');\n        }\n        return out;\n    }\n\n    // ()\n    // (5)\n    // (fmt, 5)\n    // (fmt)\n    // (true)\n    // (true, 5)\n    // (true, fmt, 5)\n    // (true, fmt)\n    function listWeekdaysImpl (localeSorted, format, index, field) {\n        if (typeof localeSorted === 'boolean') {\n            if (isNumber(format)) {\n                index = format;\n                format = undefined;\n            }\n\n            format = format || '';\n        } else {\n            format = localeSorted;\n            index = format;\n            localeSorted = false;\n\n            if (isNumber(format)) {\n                index = format;\n                format = undefined;\n            }\n\n            format = format || '';\n        }\n\n        var locale = getLocale(),\n            shift = localeSorted ? locale._week.dow : 0;\n\n        if (index != null) {\n            return get$1(format, (index + shift) % 7, field, 'day');\n        }\n\n        var i;\n        var out = [];\n        for (i = 0; i < 7; i++) {\n            out[i] = get$1(format, (i + shift) % 7, field, 'day');\n        }\n        return out;\n    }\n\n    function listMonths (format, index) {\n        return listMonthsImpl(format, index, 'months');\n    }\n\n    function listMonthsShort (format, index) {\n        return listMonthsImpl(format, index, 'monthsShort');\n    }\n\n    function listWeekdays (localeSorted, format, index) {\n        return listWeekdaysImpl(localeSorted, format, index, 'weekdays');\n    }\n\n    function listWeekdaysShort (localeSorted, format, index) {\n        return listWeekdaysImpl(localeSorted, format, index, 'weekdaysShort');\n    }\n\n    function listWeekdaysMin (localeSorted, format, index) {\n        return listWeekdaysImpl(localeSorted, format, index, 'weekdaysMin');\n    }\n\n    getSetGlobalLocale('en', {\n        dayOfMonthOrdinalParse: /\\d{1,2}(th|st|nd|rd)/,\n        ordinal : function (number) {\n            var b = number % 10,\n                output = (toInt(number % 100 / 10) === 1) ? 'th' :\n                (b === 1) ? 'st' :\n                (b === 2) ? 'nd' :\n                (b === 3) ? 'rd' : 'th';\n            return number + output;\n        }\n    });\n\n    // Side effect imports\n\n    hooks.lang = deprecate('moment.lang is deprecated. Use moment.locale instead.', getSetGlobalLocale);\n    hooks.langData = deprecate('moment.langData is deprecated. Use moment.localeData instead.', getLocale);\n\n    var mathAbs = Math.abs;\n\n    function abs () {\n        var data           = this._data;\n\n        this._milliseconds = mathAbs(this._milliseconds);\n        this._days         = mathAbs(this._days);\n        this._months       = mathAbs(this._months);\n\n        data.milliseconds  = mathAbs(data.milliseconds);\n        data.seconds       = mathAbs(data.seconds);\n        data.minutes       = mathAbs(data.minutes);\n        data.hours         = mathAbs(data.hours);\n        data.months        = mathAbs(data.months);\n        data.years         = mathAbs(data.years);\n\n        return this;\n    }\n\n    function addSubtract$1 (duration, input, value, direction) {\n        var other = createDuration(input, value);\n\n        duration._milliseconds += direction * other._milliseconds;\n        duration._days         += direction * other._days;\n        duration._months       += direction * other._months;\n\n        return duration._bubble();\n    }\n\n    // supports only 2.0-style add(1, 's') or add(duration)\n    function add$1 (input, value) {\n        return addSubtract$1(this, input, value, 1);\n    }\n\n    // supports only 2.0-style subtract(1, 's') or subtract(duration)\n    function subtract$1 (input, value) {\n        return addSubtract$1(this, input, value, -1);\n    }\n\n    function absCeil (number) {\n        if (number < 0) {\n            return Math.floor(number);\n        } else {\n            return Math.ceil(number);\n        }\n    }\n\n    function bubble () {\n        var milliseconds = this._milliseconds;\n        var days         = this._days;\n        var months       = this._months;\n        var data         = this._data;\n        var seconds, minutes, hours, years, monthsFromDays;\n\n        // if we have a mix of positive and negative values, bubble down first\n        // check: https://github.com/moment/moment/issues/2166\n        if (!((milliseconds >= 0 && days >= 0 && months >= 0) ||\n                (milliseconds <= 0 && days <= 0 && months <= 0))) {\n            milliseconds += absCeil(monthsToDays(months) + days) * 864e5;\n            days = 0;\n            months = 0;\n        }\n\n        // The following code bubbles up values, see the tests for\n        // examples of what that means.\n        data.milliseconds = milliseconds % 1000;\n\n        seconds           = absFloor(milliseconds / 1000);\n        data.seconds      = seconds % 60;\n\n        minutes           = absFloor(seconds / 60);\n        data.minutes      = minutes % 60;\n\n        hours             = absFloor(minutes / 60);\n        data.hours        = hours % 24;\n\n        days += absFloor(hours / 24);\n\n        // convert days to months\n        monthsFromDays = absFloor(daysToMonths(days));\n        months += monthsFromDays;\n        days -= absCeil(monthsToDays(monthsFromDays));\n\n        // 12 months -> 1 year\n        years = absFloor(months / 12);\n        months %= 12;\n\n        data.days   = days;\n        data.months = months;\n        data.years  = years;\n\n        return this;\n    }\n\n    function daysToMonths (days) {\n        // 400 years have 146097 days (taking into account leap year rules)\n        // 400 years have 12 months === 4800\n        return days * 4800 / 146097;\n    }\n\n    function monthsToDays (months) {\n        // the reverse of daysToMonths\n        return months * 146097 / 4800;\n    }\n\n    function as (units) {\n        if (!this.isValid()) {\n            return NaN;\n        }\n        var days;\n        var months;\n        var milliseconds = this._milliseconds;\n\n        units = normalizeUnits(units);\n\n        if (units === 'month' || units === 'year') {\n            days   = this._days   + milliseconds / 864e5;\n            months = this._months + daysToMonths(days);\n            return units === 'month' ? months : months / 12;\n        } else {\n            // handle milliseconds separately because of floating point math errors (issue #1867)\n            days = this._days + Math.round(monthsToDays(this._months));\n            switch (units) {\n                case 'week'   : return days / 7     + milliseconds / 6048e5;\n                case 'day'    : return days         + milliseconds / 864e5;\n                case 'hour'   : return days * 24    + milliseconds / 36e5;\n                case 'minute' : return days * 1440  + milliseconds / 6e4;\n                case 'second' : return days * 86400 + milliseconds / 1000;\n                // Math.floor prevents floating point math errors here\n                case 'millisecond': return Math.floor(days * 864e5) + milliseconds;\n                default: throw new Error('Unknown unit ' + units);\n            }\n        }\n    }\n\n    // TODO: Use this.as('ms')?\n    function valueOf$1 () {\n        if (!this.isValid()) {\n            return NaN;\n        }\n        return (\n            this._milliseconds +\n            this._days * 864e5 +\n            (this._months % 12) * 2592e6 +\n            toInt(this._months / 12) * 31536e6\n        );\n    }\n\n    function makeAs (alias) {\n        return function () {\n            return this.as(alias);\n        };\n    }\n\n    var asMilliseconds = makeAs('ms');\n    var asSeconds      = makeAs('s');\n    var asMinutes      = makeAs('m');\n    var asHours        = makeAs('h');\n    var asDays         = makeAs('d');\n    var asWeeks        = makeAs('w');\n    var asMonths       = makeAs('M');\n    var asYears        = makeAs('y');\n\n    function clone$1 () {\n        return createDuration(this);\n    }\n\n    function get$2 (units) {\n        units = normalizeUnits(units);\n        return this.isValid() ? this[units + 's']() : NaN;\n    }\n\n    function makeGetter(name) {\n        return function () {\n            return this.isValid() ? this._data[name] : NaN;\n        };\n    }\n\n    var milliseconds = makeGetter('milliseconds');\n    var seconds      = makeGetter('seconds');\n    var minutes      = makeGetter('minutes');\n    var hours        = makeGetter('hours');\n    var days         = makeGetter('days');\n    var months       = makeGetter('months');\n    var years        = makeGetter('years');\n\n    function weeks () {\n        return absFloor(this.days() / 7);\n    }\n\n    var round = Math.round;\n    var thresholds = {\n        ss: 44,         // a few seconds to seconds\n        s : 45,         // seconds to minute\n        m : 45,         // minutes to hour\n        h : 22,         // hours to day\n        d : 26,         // days to month\n        M : 11          // months to year\n    };\n\n    // helper function for moment.fn.from, moment.fn.fromNow, and moment.duration.fn.humanize\n    function substituteTimeAgo(string, number, withoutSuffix, isFuture, locale) {\n        return locale.relativeTime(number || 1, !!withoutSuffix, string, isFuture);\n    }\n\n    function relativeTime$1 (posNegDuration, withoutSuffix, locale) {\n        var duration = createDuration(posNegDuration).abs();\n        var seconds  = round(duration.as('s'));\n        var minutes  = round(duration.as('m'));\n        var hours    = round(duration.as('h'));\n        var days     = round(duration.as('d'));\n        var months   = round(duration.as('M'));\n        var years    = round(duration.as('y'));\n\n        var a = seconds <= thresholds.ss && ['s', seconds]  ||\n                seconds < thresholds.s   && ['ss', seconds] ||\n                minutes <= 1             && ['m']           ||\n                minutes < thresholds.m   && ['mm', minutes] ||\n                hours   <= 1             && ['h']           ||\n                hours   < thresholds.h   && ['hh', hours]   ||\n                days    <= 1             && ['d']           ||\n                days    < thresholds.d   && ['dd', days]    ||\n                months  <= 1             && ['M']           ||\n                months  < thresholds.M   && ['MM', months]  ||\n                years   <= 1             && ['y']           || ['yy', years];\n\n        a[2] = withoutSuffix;\n        a[3] = +posNegDuration > 0;\n        a[4] = locale;\n        return substituteTimeAgo.apply(null, a);\n    }\n\n    // This function allows you to set the rounding function for relative time strings\n    function getSetRelativeTimeRounding (roundingFunction) {\n        if (roundingFunction === undefined) {\n            return round;\n        }\n        if (typeof(roundingFunction) === 'function') {\n            round = roundingFunction;\n            return true;\n        }\n        return false;\n    }\n\n    // This function allows you to set a threshold for relative time strings\n    function getSetRelativeTimeThreshold (threshold, limit) {\n        if (thresholds[threshold] === undefined) {\n            return false;\n        }\n        if (limit === undefined) {\n            return thresholds[threshold];\n        }\n        thresholds[threshold] = limit;\n        if (threshold === 's') {\n            thresholds.ss = limit - 1;\n        }\n        return true;\n    }\n\n    function humanize (withSuffix) {\n        if (!this.isValid()) {\n            return this.localeData().invalidDate();\n        }\n\n        var locale = this.localeData();\n        var output = relativeTime$1(this, !withSuffix, locale);\n\n        if (withSuffix) {\n            output = locale.pastFuture(+this, output);\n        }\n\n        return locale.postformat(output);\n    }\n\n    var abs$1 = Math.abs;\n\n    function sign(x) {\n        return ((x > 0) - (x < 0)) || +x;\n    }\n\n    function toISOString$1() {\n        // for ISO strings we do not use the normal bubbling rules:\n        //  * milliseconds bubble up until they become hours\n        //  * days do not bubble at all\n        //  * months bubble up until they become years\n        // This is because there is no context-free conversion between hours and days\n        // (think of clock changes)\n        // and also not between days and months (28-31 days per month)\n        if (!this.isValid()) {\n            return this.localeData().invalidDate();\n        }\n\n        var seconds = abs$1(this._milliseconds) / 1000;\n        var days         = abs$1(this._days);\n        var months       = abs$1(this._months);\n        var minutes, hours, years;\n\n        // 3600 seconds -> 60 minutes -> 1 hour\n        minutes           = absFloor(seconds / 60);\n        hours             = absFloor(minutes / 60);\n        seconds %= 60;\n        minutes %= 60;\n\n        // 12 months -> 1 year\n        years  = absFloor(months / 12);\n        months %= 12;\n\n\n        // inspired by https://github.com/dordille/moment-isoduration/blob/master/moment.isoduration.js\n        var Y = years;\n        var M = months;\n        var D = days;\n        var h = hours;\n        var m = minutes;\n        var s = seconds ? seconds.toFixed(3).replace(/\\.?0+$/, '') : '';\n        var total = this.asSeconds();\n\n        if (!total) {\n            // this is the same as C#'s (Noda) and python (isodate)...\n            // but not other JS (goog.date)\n            return 'P0D';\n        }\n\n        var totalSign = total < 0 ? '-' : '';\n        var ymSign = sign(this._months) !== sign(total) ? '-' : '';\n        var daysSign = sign(this._days) !== sign(total) ? '-' : '';\n        var hmsSign = sign(this._milliseconds) !== sign(total) ? '-' : '';\n\n        return totalSign + 'P' +\n            (Y ? ymSign + Y + 'Y' : '') +\n            (M ? ymSign + M + 'M' : '') +\n            (D ? daysSign + D + 'D' : '') +\n            ((h || m || s) ? 'T' : '') +\n            (h ? hmsSign + h + 'H' : '') +\n            (m ? hmsSign + m + 'M' : '') +\n            (s ? hmsSign + s + 'S' : '');\n    }\n\n    var proto$2 = Duration.prototype;\n\n    proto$2.isValid        = isValid$1;\n    proto$2.abs            = abs;\n    proto$2.add            = add$1;\n    proto$2.subtract       = subtract$1;\n    proto$2.as             = as;\n    proto$2.asMilliseconds = asMilliseconds;\n    proto$2.asSeconds      = asSeconds;\n    proto$2.asMinutes      = asMinutes;\n    proto$2.asHours        = asHours;\n    proto$2.asDays         = asDays;\n    proto$2.asWeeks        = asWeeks;\n    proto$2.asMonths       = asMonths;\n    proto$2.asYears        = asYears;\n    proto$2.valueOf        = valueOf$1;\n    proto$2._bubble        = bubble;\n    proto$2.clone          = clone$1;\n    proto$2.get            = get$2;\n    proto$2.milliseconds   = milliseconds;\n    proto$2.seconds        = seconds;\n    proto$2.minutes        = minutes;\n    proto$2.hours          = hours;\n    proto$2.days           = days;\n    proto$2.weeks          = weeks;\n    proto$2.months         = months;\n    proto$2.years          = years;\n    proto$2.humanize       = humanize;\n    proto$2.toISOString    = toISOString$1;\n    proto$2.toString       = toISOString$1;\n    proto$2.toJSON         = toISOString$1;\n    proto$2.locale         = locale;\n    proto$2.localeData     = localeData;\n\n    proto$2.toIsoString = deprecate('toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)', toISOString$1);\n    proto$2.lang = lang;\n\n    // Side effect imports\n\n    // FORMATTING\n\n    addFormatToken('X', 0, 0, 'unix');\n    addFormatToken('x', 0, 0, 'valueOf');\n\n    // PARSING\n\n    addRegexToken('x', matchSigned);\n    addRegexToken('X', matchTimestamp);\n    addParseToken('X', function (input, array, config) {\n        config._d = new Date(parseFloat(input, 10) * 1000);\n    });\n    addParseToken('x', function (input, array, config) {\n        config._d = new Date(toInt(input));\n    });\n\n    // Side effect imports\n\n\n    hooks.version = '2.22.1';\n\n    setHookCallback(createLocal);\n\n    hooks.fn                    = proto;\n    hooks.min                   = min;\n    hooks.max                   = max;\n    hooks.now                   = now;\n    hooks.utc                   = createUTC;\n    hooks.unix                  = createUnix;\n    hooks.months                = listMonths;\n    hooks.isDate                = isDate;\n    hooks.locale                = getSetGlobalLocale;\n    hooks.invalid               = createInvalid;\n    hooks.duration              = createDuration;\n    hooks.isMoment              = isMoment;\n    hooks.weekdays              = listWeekdays;\n    hooks.parseZone             = createInZone;\n    hooks.localeData            = getLocale;\n    hooks.isDuration            = isDuration;\n    hooks.monthsShort           = listMonthsShort;\n    hooks.weekdaysMin           = listWeekdaysMin;\n    hooks.defineLocale          = defineLocale;\n    hooks.updateLocale          = updateLocale;\n    hooks.locales               = listLocales;\n    hooks.weekdaysShort         = listWeekdaysShort;\n    hooks.normalizeUnits        = normalizeUnits;\n    hooks.relativeTimeRounding  = getSetRelativeTimeRounding;\n    hooks.relativeTimeThreshold = getSetRelativeTimeThreshold;\n    hooks.calendarFormat        = getCalendarFormat;\n    hooks.prototype             = proto;\n\n    // currently HTML5 input type only supports 24-hour formats\n    hooks.HTML5_FMT = {\n        DATETIME_LOCAL: 'YYYY-MM-DDTHH:mm',             // <input type=\"datetime-local\" />\n        DATETIME_LOCAL_SECONDS: 'YYYY-MM-DDTHH:mm:ss',  // <input type=\"datetime-local\" step=\"1\" />\n        DATETIME_LOCAL_MS: 'YYYY-MM-DDTHH:mm:ss.SSS',   // <input type=\"datetime-local\" step=\"0.001\" />\n        DATE: 'YYYY-MM-DD',                             // <input type=\"date\" />\n        TIME: 'HH:mm',                                  // <input type=\"time\" />\n        TIME_SECONDS: 'HH:mm:ss',                       // <input type=\"time\" step=\"1\" />\n        TIME_MS: 'HH:mm:ss.SSS',                        // <input type=\"time\" step=\"0.001\" />\n        WEEK: 'YYYY-[W]WW',                             // <input type=\"week\" />\n        MONTH: 'YYYY-MM'                                // <input type=\"month\" />\n    };\n\n    return hooks;\n\n})));\n","/*! https://mths.be/punycode v1.4.1 by @mathias */\n;(function(root) {\n\n\t/** Detect free variables */\n\tvar freeExports = typeof exports == 'object' && exports &&\n\t\t!exports.nodeType && exports;\n\tvar freeModule = typeof module == 'object' && module &&\n\t\t!module.nodeType && module;\n\tvar freeGlobal = typeof global == 'object' && global;\n\tif (\n\t\tfreeGlobal.global === freeGlobal ||\n\t\tfreeGlobal.window === freeGlobal ||\n\t\tfreeGlobal.self === freeGlobal\n\t) {\n\t\troot = freeGlobal;\n\t}\n\n\t/**\n\t * The `punycode` object.\n\t * @name punycode\n\t * @type Object\n\t */\n\tvar punycode,\n\n\t/** Highest positive signed 32-bit float value */\n\tmaxInt = 2147483647, // aka. 0x7FFFFFFF or 2^31-1\n\n\t/** Bootstring parameters */\n\tbase = 36,\n\ttMin = 1,\n\ttMax = 26,\n\tskew = 38,\n\tdamp = 700,\n\tinitialBias = 72,\n\tinitialN = 128, // 0x80\n\tdelimiter = '-', // '\\x2D'\n\n\t/** Regular expressions */\n\tregexPunycode = /^xn--/,\n\tregexNonASCII = /[^\\x20-\\x7E]/, // unprintable ASCII chars + non-ASCII chars\n\tregexSeparators = /[\\x2E\\u3002\\uFF0E\\uFF61]/g, // RFC 3490 separators\n\n\t/** Error messages */\n\terrors = {\n\t\t'overflow': 'Overflow: input needs wider integers to process',\n\t\t'not-basic': 'Illegal input >= 0x80 (not a basic code point)',\n\t\t'invalid-input': 'Invalid input'\n\t},\n\n\t/** Convenience shortcuts */\n\tbaseMinusTMin = base - tMin,\n\tfloor = Math.floor,\n\tstringFromCharCode = String.fromCharCode,\n\n\t/** Temporary variable */\n\tkey;\n\n\t/*--------------------------------------------------------------------------*/\n\n\t/**\n\t * A generic error utility function.\n\t * @private\n\t * @param {String} type The error type.\n\t * @returns {Error} Throws a `RangeError` with the applicable error message.\n\t */\n\tfunction error(type) {\n\t\tthrow new RangeError(errors[type]);\n\t}\n\n\t/**\n\t * A generic `Array#map` utility function.\n\t * @private\n\t * @param {Array} array The array to iterate over.\n\t * @param {Function} callback The function that gets called for every array\n\t * item.\n\t * @returns {Array} A new array of values returned by the callback function.\n\t */\n\tfunction map(array, fn) {\n\t\tvar length = array.length;\n\t\tvar result = [];\n\t\twhile (length--) {\n\t\t\tresult[length] = fn(array[length]);\n\t\t}\n\t\treturn result;\n\t}\n\n\t/**\n\t * A simple `Array#map`-like wrapper to work with domain name strings or email\n\t * addresses.\n\t * @private\n\t * @param {String} domain The domain name or email address.\n\t * @param {Function} callback The function that gets called for every\n\t * character.\n\t * @returns {Array} A new string of characters returned by the callback\n\t * function.\n\t */\n\tfunction mapDomain(string, fn) {\n\t\tvar parts = string.split('@');\n\t\tvar result = '';\n\t\tif (parts.length > 1) {\n\t\t\t// In email addresses, only the domain name should be punycoded. Leave\n\t\t\t// the local part (i.e. everything up to `@`) intact.\n\t\t\tresult = parts[0] + '@';\n\t\t\tstring = parts[1];\n\t\t}\n\t\t// Avoid `split(regex)` for IE8 compatibility. See #17.\n\t\tstring = string.replace(regexSeparators, '\\x2E');\n\t\tvar labels = string.split('.');\n\t\tvar encoded = map(labels, fn).join('.');\n\t\treturn result + encoded;\n\t}\n\n\t/**\n\t * Creates an array containing the numeric code points of each Unicode\n\t * character in the string. While JavaScript uses UCS-2 internally,\n\t * this function will convert a pair of surrogate halves (each of which\n\t * UCS-2 exposes as separate characters) into a single code point,\n\t * matching UTF-16.\n\t * @see `punycode.ucs2.encode`\n\t * @see <https://mathiasbynens.be/notes/javascript-encoding>\n\t * @memberOf punycode.ucs2\n\t * @name decode\n\t * @param {String} string The Unicode input string (UCS-2).\n\t * @returns {Array} The new array of code points.\n\t */\n\tfunction ucs2decode(string) {\n\t\tvar output = [],\n\t\t    counter = 0,\n\t\t    length = string.length,\n\t\t    value,\n\t\t    extra;\n\t\twhile (counter < length) {\n\t\t\tvalue = string.charCodeAt(counter++);\n\t\t\tif (value >= 0xD800 && value <= 0xDBFF && counter < length) {\n\t\t\t\t// high surrogate, and there is a next character\n\t\t\t\textra = string.charCodeAt(counter++);\n\t\t\t\tif ((extra & 0xFC00) == 0xDC00) { // low surrogate\n\t\t\t\t\toutput.push(((value & 0x3FF) << 10) + (extra & 0x3FF) + 0x10000);\n\t\t\t\t} else {\n\t\t\t\t\t// unmatched surrogate; only append this code unit, in case the next\n\t\t\t\t\t// code unit is the high surrogate of a surrogate pair\n\t\t\t\t\toutput.push(value);\n\t\t\t\t\tcounter--;\n\t\t\t\t}\n\t\t\t} else {\n\t\t\t\toutput.push(value);\n\t\t\t}\n\t\t}\n\t\treturn output;\n\t}\n\n\t/**\n\t * Creates a string based on an array of numeric code points.\n\t * @see `punycode.ucs2.decode`\n\t * @memberOf punycode.ucs2\n\t * @name encode\n\t * @param {Array} codePoints The array of numeric code points.\n\t * @returns {String} The new Unicode string (UCS-2).\n\t */\n\tfunction ucs2encode(array) {\n\t\treturn map(array, function(value) {\n\t\t\tvar output = '';\n\t\t\tif (value > 0xFFFF) {\n\t\t\t\tvalue -= 0x10000;\n\t\t\t\toutput += stringFromCharCode(value >>> 10 & 0x3FF | 0xD800);\n\t\t\t\tvalue = 0xDC00 | value & 0x3FF;\n\t\t\t}\n\t\t\toutput += stringFromCharCode(value);\n\t\t\treturn output;\n\t\t}).join('');\n\t}\n\n\t/**\n\t * Converts a basic code point into a digit/integer.\n\t * @see `digitToBasic()`\n\t * @private\n\t * @param {Number} codePoint The basic numeric code point value.\n\t * @returns {Number} The numeric value of a basic code point (for use in\n\t * representing integers) in the range `0` to `base - 1`, or `base` if\n\t * the code point does not represent a value.\n\t */\n\tfunction basicToDigit(codePoint) {\n\t\tif (codePoint - 48 < 10) {\n\t\t\treturn codePoint - 22;\n\t\t}\n\t\tif (codePoint - 65 < 26) {\n\t\t\treturn codePoint - 65;\n\t\t}\n\t\tif (codePoint - 97 < 26) {\n\t\t\treturn codePoint - 97;\n\t\t}\n\t\treturn base;\n\t}\n\n\t/**\n\t * Converts a digit/integer into a basic code point.\n\t * @see `basicToDigit()`\n\t * @private\n\t * @param {Number} digit The numeric value of a basic code point.\n\t * @returns {Number} The basic code point whose value (when used for\n\t * representing integers) is `digit`, which needs to be in the range\n\t * `0` to `base - 1`. If `flag` is non-zero, the uppercase form is\n\t * used; else, the lowercase form is used. The behavior is undefined\n\t * if `flag` is non-zero and `digit` has no uppercase form.\n\t */\n\tfunction digitToBasic(digit, flag) {\n\t\t//  0..25 map to ASCII a..z or A..Z\n\t\t// 26..35 map to ASCII 0..9\n\t\treturn digit + 22 + 75 * (digit < 26) - ((flag != 0) << 5);\n\t}\n\n\t/**\n\t * Bias adaptation function as per section 3.4 of RFC 3492.\n\t * https://tools.ietf.org/html/rfc3492#section-3.4\n\t * @private\n\t */\n\tfunction adapt(delta, numPoints, firstTime) {\n\t\tvar k = 0;\n\t\tdelta = firstTime ? floor(delta / damp) : delta >> 1;\n\t\tdelta += floor(delta / numPoints);\n\t\tfor (/* no initialization */; delta > baseMinusTMin * tMax >> 1; k += base) {\n\t\t\tdelta = floor(delta / baseMinusTMin);\n\t\t}\n\t\treturn floor(k + (baseMinusTMin + 1) * delta / (delta + skew));\n\t}\n\n\t/**\n\t * Converts a Punycode string of ASCII-only symbols to a string of Unicode\n\t * symbols.\n\t * @memberOf punycode\n\t * @param {String} input The Punycode string of ASCII-only symbols.\n\t * @returns {String} The resulting string of Unicode symbols.\n\t */\n\tfunction decode(input) {\n\t\t// Don't use UCS-2\n\t\tvar output = [],\n\t\t    inputLength = input.length,\n\t\t    out,\n\t\t    i = 0,\n\t\t    n = initialN,\n\t\t    bias = initialBias,\n\t\t    basic,\n\t\t    j,\n\t\t    index,\n\t\t    oldi,\n\t\t    w,\n\t\t    k,\n\t\t    digit,\n\t\t    t,\n\t\t    /** Cached calculation results */\n\t\t    baseMinusT;\n\n\t\t// Handle the basic code points: let `basic` be the number of input code\n\t\t// points before the last delimiter, or `0` if there is none, then copy\n\t\t// the first basic code points to the output.\n\n\t\tbasic = input.lastIndexOf(delimiter);\n\t\tif (basic < 0) {\n\t\t\tbasic = 0;\n\t\t}\n\n\t\tfor (j = 0; j < basic; ++j) {\n\t\t\t// if it's not a basic code point\n\t\t\tif (input.charCodeAt(j) >= 0x80) {\n\t\t\t\terror('not-basic');\n\t\t\t}\n\t\t\toutput.push(input.charCodeAt(j));\n\t\t}\n\n\t\t// Main decoding loop: start just after the last delimiter if any basic code\n\t\t// points were copied; start at the beginning otherwise.\n\n\t\tfor (index = basic > 0 ? basic + 1 : 0; index < inputLength; /* no final expression */) {\n\n\t\t\t// `index` is the index of the next character to be consumed.\n\t\t\t// Decode a generalized variable-length integer into `delta`,\n\t\t\t// which gets added to `i`. The overflow checking is easier\n\t\t\t// if we increase `i` as we go, then subtract off its starting\n\t\t\t// value at the end to obtain `delta`.\n\t\t\tfor (oldi = i, w = 1, k = base; /* no condition */; k += base) {\n\n\t\t\t\tif (index >= inputLength) {\n\t\t\t\t\terror('invalid-input');\n\t\t\t\t}\n\n\t\t\t\tdigit = basicToDigit(input.charCodeAt(index++));\n\n\t\t\t\tif (digit >= base || digit > floor((maxInt - i) / w)) {\n\t\t\t\t\terror('overflow');\n\t\t\t\t}\n\n\t\t\t\ti += digit * w;\n\t\t\t\tt = k <= bias ? tMin : (k >= bias + tMax ? tMax : k - bias);\n\n\t\t\t\tif (digit < t) {\n\t\t\t\t\tbreak;\n\t\t\t\t}\n\n\t\t\t\tbaseMinusT = base - t;\n\t\t\t\tif (w > floor(maxInt / baseMinusT)) {\n\t\t\t\t\terror('overflow');\n\t\t\t\t}\n\n\t\t\t\tw *= baseMinusT;\n\n\t\t\t}\n\n\t\t\tout = output.length + 1;\n\t\t\tbias = adapt(i - oldi, out, oldi == 0);\n\n\t\t\t// `i` was supposed to wrap around from `out` to `0`,\n\t\t\t// incrementing `n` each time, so we'll fix that now:\n\t\t\tif (floor(i / out) > maxInt - n) {\n\t\t\t\terror('overflow');\n\t\t\t}\n\n\t\t\tn += floor(i / out);\n\t\t\ti %= out;\n\n\t\t\t// Insert `n` at position `i` of the output\n\t\t\toutput.splice(i++, 0, n);\n\n\t\t}\n\n\t\treturn ucs2encode(output);\n\t}\n\n\t/**\n\t * Converts a string of Unicode symbols (e.g. a domain name label) to a\n\t * Punycode string of ASCII-only symbols.\n\t * @memberOf punycode\n\t * @param {String} input The string of Unicode symbols.\n\t * @returns {String} The resulting Punycode string of ASCII-only symbols.\n\t */\n\tfunction encode(input) {\n\t\tvar n,\n\t\t    delta,\n\t\t    handledCPCount,\n\t\t    basicLength,\n\t\t    bias,\n\t\t    j,\n\t\t    m,\n\t\t    q,\n\t\t    k,\n\t\t    t,\n\t\t    currentValue,\n\t\t    output = [],\n\t\t    /** `inputLength` will hold the number of code points in `input`. */\n\t\t    inputLength,\n\t\t    /** Cached calculation results */\n\t\t    handledCPCountPlusOne,\n\t\t    baseMinusT,\n\t\t    qMinusT;\n\n\t\t// Convert the input in UCS-2 to Unicode\n\t\tinput = ucs2decode(input);\n\n\t\t// Cache the length\n\t\tinputLength = input.length;\n\n\t\t// Initialize the state\n\t\tn = initialN;\n\t\tdelta = 0;\n\t\tbias = initialBias;\n\n\t\t// Handle the basic code points\n\t\tfor (j = 0; j < inputLength; ++j) {\n\t\t\tcurrentValue = input[j];\n\t\t\tif (currentValue < 0x80) {\n\t\t\t\toutput.push(stringFromCharCode(currentValue));\n\t\t\t}\n\t\t}\n\n\t\thandledCPCount = basicLength = output.length;\n\n\t\t// `handledCPCount` is the number of code points that have been handled;\n\t\t// `basicLength` is the number of basic code points.\n\n\t\t// Finish the basic string - if it is not empty - with a delimiter\n\t\tif (basicLength) {\n\t\t\toutput.push(delimiter);\n\t\t}\n\n\t\t// Main encoding loop:\n\t\twhile (handledCPCount < inputLength) {\n\n\t\t\t// All non-basic code points < n have been handled already. Find the next\n\t\t\t// larger one:\n\t\t\tfor (m = maxInt, j = 0; j < inputLength; ++j) {\n\t\t\t\tcurrentValue = input[j];\n\t\t\t\tif (currentValue >= n && currentValue < m) {\n\t\t\t\t\tm = currentValue;\n\t\t\t\t}\n\t\t\t}\n\n\t\t\t// Increase `delta` enough to advance the decoder's <n,i> state to <m,0>,\n\t\t\t// but guard against overflow\n\t\t\thandledCPCountPlusOne = handledCPCount + 1;\n\t\t\tif (m - n > floor((maxInt - delta) / handledCPCountPlusOne)) {\n\t\t\t\terror('overflow');\n\t\t\t}\n\n\t\t\tdelta += (m - n) * handledCPCountPlusOne;\n\t\t\tn = m;\n\n\t\t\tfor (j = 0; j < inputLength; ++j) {\n\t\t\t\tcurrentValue = input[j];\n\n\t\t\t\tif (currentValue < n && ++delta > maxInt) {\n\t\t\t\t\terror('overflow');\n\t\t\t\t}\n\n\t\t\t\tif (currentValue == n) {\n\t\t\t\t\t// Represent delta as a generalized variable-length integer\n\t\t\t\t\tfor (q = delta, k = base; /* no condition */; k += base) {\n\t\t\t\t\t\tt = k <= bias ? tMin : (k >= bias + tMax ? tMax : k - bias);\n\t\t\t\t\t\tif (q < t) {\n\t\t\t\t\t\t\tbreak;\n\t\t\t\t\t\t}\n\t\t\t\t\t\tqMinusT = q - t;\n\t\t\t\t\t\tbaseMinusT = base - t;\n\t\t\t\t\t\toutput.push(\n\t\t\t\t\t\t\tstringFromCharCode(digitToBasic(t + qMinusT % baseMinusT, 0))\n\t\t\t\t\t\t);\n\t\t\t\t\t\tq = floor(qMinusT / baseMinusT);\n\t\t\t\t\t}\n\n\t\t\t\t\toutput.push(stringFromCharCode(digitToBasic(q, 0)));\n\t\t\t\t\tbias = adapt(delta, handledCPCountPlusOne, handledCPCount == basicLength);\n\t\t\t\t\tdelta = 0;\n\t\t\t\t\t++handledCPCount;\n\t\t\t\t}\n\t\t\t}\n\n\t\t\t++delta;\n\t\t\t++n;\n\n\t\t}\n\t\treturn output.join('');\n\t}\n\n\t/**\n\t * Converts a Punycode string representing a domain name or an email address\n\t * to Unicode. Only the Punycoded parts of the input will be converted, i.e.\n\t * it doesn't matter if you call it on a string that has already been\n\t * converted to Unicode.\n\t * @memberOf punycode\n\t * @param {String} input The Punycoded domain name or email address to\n\t * convert to Unicode.\n\t * @returns {String} The Unicode representation of the given Punycode\n\t * string.\n\t */\n\tfunction toUnicode(input) {\n\t\treturn mapDomain(input, function(string) {\n\t\t\treturn regexPunycode.test(string)\n\t\t\t\t? decode(string.slice(4).toLowerCase())\n\t\t\t\t: string;\n\t\t});\n\t}\n\n\t/**\n\t * Converts a Unicode string representing a domain name or an email address to\n\t * Punycode. Only the non-ASCII parts of the domain name will be converted,\n\t * i.e. it doesn't matter if you call it with a domain that's already in\n\t * ASCII.\n\t * @memberOf punycode\n\t * @param {String} input The domain name or email address to convert, as a\n\t * Unicode string.\n\t * @returns {String} The Punycode representation of the given domain name or\n\t * email address.\n\t */\n\tfunction toASCII(input) {\n\t\treturn mapDomain(input, function(string) {\n\t\t\treturn regexNonASCII.test(string)\n\t\t\t\t? 'xn--' + encode(string)\n\t\t\t\t: string;\n\t\t});\n\t}\n\n\t/*--------------------------------------------------------------------------*/\n\n\t/** Define the public API */\n\tpunycode = {\n\t\t/**\n\t\t * A string representing the current Punycode.js version number.\n\t\t * @memberOf punycode\n\t\t * @type String\n\t\t */\n\t\t'version': '1.4.1',\n\t\t/**\n\t\t * An object of methods to convert from JavaScript's internal character\n\t\t * representation (UCS-2) to Unicode code points, and back.\n\t\t * @see <https://mathiasbynens.be/notes/javascript-encoding>\n\t\t * @memberOf punycode\n\t\t * @type Object\n\t\t */\n\t\t'ucs2': {\n\t\t\t'decode': ucs2decode,\n\t\t\t'encode': ucs2encode\n\t\t},\n\t\t'decode': decode,\n\t\t'encode': encode,\n\t\t'toASCII': toASCII,\n\t\t'toUnicode': toUnicode\n\t};\n\n\t/** Expose `punycode` */\n\t// Some AMD build optimizers, like r.js, check for specific condition patterns\n\t// like the following:\n\tif (\n\t\ttypeof define == 'function' &&\n\t\ttypeof define.amd == 'object' &&\n\t\tdefine.amd\n\t) {\n\t\tdefine('punycode', function() {\n\t\t\treturn punycode;\n\t\t});\n\t} else if (freeExports && freeModule) {\n\t\tif (module.exports == freeExports) {\n\t\t\t// in Node.js, io.js, or RingoJS v0.8.0+\n\t\t\tfreeModule.exports = punycode;\n\t\t} else {\n\t\t\t// in Narwhal or RingoJS v0.7.0-\n\t\t\tfor (key in punycode) {\n\t\t\t\tpunycode.hasOwnProperty(key) && (freeExports[key] = punycode[key]);\n\t\t\t}\n\t\t}\n\t} else {\n\t\t// in Rhino or a web browser\n\t\troot.punycode = punycode;\n\t}\n\n}(this));\n","module.exports=/[\\0-\\x1F\\x7F-\\x9F]/","module.exports=/[\\xAD\\u0600-\\u0605\\u061C\\u06DD\\u070F\\u08E2\\u180E\\u200B-\\u200F\\u202A-\\u202E\\u2060-\\u2064\\u2066-\\u206F\\uFEFF\\uFFF9-\\uFFFB]|\\uD804\\uDCBD|\\uD82F[\\uDCA0-\\uDCA3]|\\uD834[\\uDD73-\\uDD7A]|\\uDB40[\\uDC01\\uDC20-\\uDC7F]/","module.exports=/[!-#%-\\*,-/:;\\?@\\[-\\]_\\{\\}\\xA1\\xA7\\xAB\\xB6\\xB7\\xBB\\xBF\\u037E\\u0387\\u055A-\\u055F\\u0589\\u058A\\u05BE\\u05C0\\u05C3\\u05C6\\u05F3\\u05F4\\u0609\\u060A\\u060C\\u060D\\u061B\\u061E\\u061F\\u066A-\\u066D\\u06D4\\u0700-\\u070D\\u07F7-\\u07F9\\u0830-\\u083E\\u085E\\u0964\\u0965\\u0970\\u09FD\\u0AF0\\u0DF4\\u0E4F\\u0E5A\\u0E5B\\u0F04-\\u0F12\\u0F14\\u0F3A-\\u0F3D\\u0F85\\u0FD0-\\u0FD4\\u0FD9\\u0FDA\\u104A-\\u104F\\u10FB\\u1360-\\u1368\\u1400\\u166D\\u166E\\u169B\\u169C\\u16EB-\\u16ED\\u1735\\u1736\\u17D4-\\u17D6\\u17D8-\\u17DA\\u1800-\\u180A\\u1944\\u1945\\u1A1E\\u1A1F\\u1AA0-\\u1AA6\\u1AA8-\\u1AAD\\u1B5A-\\u1B60\\u1BFC-\\u1BFF\\u1C3B-\\u1C3F\\u1C7E\\u1C7F\\u1CC0-\\u1CC7\\u1CD3\\u2010-\\u2027\\u2030-\\u2043\\u2045-\\u2051\\u2053-\\u205E\\u207D\\u207E\\u208D\\u208E\\u2308-\\u230B\\u2329\\u232A\\u2768-\\u2775\\u27C5\\u27C6\\u27E6-\\u27EF\\u2983-\\u2998\\u29D8-\\u29DB\\u29FC\\u29FD\\u2CF9-\\u2CFC\\u2CFE\\u2CFF\\u2D70\\u2E00-\\u2E2E\\u2E30-\\u2E49\\u3001-\\u3003\\u3008-\\u3011\\u3014-\\u301F\\u3030\\u303D\\u30A0\\u30FB\\uA4FE\\uA4FF\\uA60D-\\uA60F\\uA673\\uA67E\\uA6F2-\\uA6F7\\uA874-\\uA877\\uA8CE\\uA8CF\\uA8F8-\\uA8FA\\uA8FC\\uA92E\\uA92F\\uA95F\\uA9C1-\\uA9CD\\uA9DE\\uA9DF\\uAA5C-\\uAA5F\\uAADE\\uAADF\\uAAF0\\uAAF1\\uABEB\\uFD3E\\uFD3F\\uFE10-\\uFE19\\uFE30-\\uFE52\\uFE54-\\uFE61\\uFE63\\uFE68\\uFE6A\\uFE6B\\uFF01-\\uFF03\\uFF05-\\uFF0A\\uFF0C-\\uFF0F\\uFF1A\\uFF1B\\uFF1F\\uFF20\\uFF3B-\\uFF3D\\uFF3F\\uFF5B\\uFF5D\\uFF5F-\\uFF65]|\\uD800[\\uDD00-\\uDD02\\uDF9F\\uDFD0]|\\uD801\\uDD6F|\\uD802[\\uDC57\\uDD1F\\uDD3F\\uDE50-\\uDE58\\uDE7F\\uDEF0-\\uDEF6\\uDF39-\\uDF3F\\uDF99-\\uDF9C]|\\uD804[\\uDC47-\\uDC4D\\uDCBB\\uDCBC\\uDCBE-\\uDCC1\\uDD40-\\uDD43\\uDD74\\uDD75\\uDDC5-\\uDDC9\\uDDCD\\uDDDB\\uDDDD-\\uDDDF\\uDE38-\\uDE3D\\uDEA9]|\\uD805[\\uDC4B-\\uDC4F\\uDC5B\\uDC5D\\uDCC6\\uDDC1-\\uDDD7\\uDE41-\\uDE43\\uDE60-\\uDE6C\\uDF3C-\\uDF3E]|\\uD806[\\uDE3F-\\uDE46\\uDE9A-\\uDE9C\\uDE9E-\\uDEA2]|\\uD807[\\uDC41-\\uDC45\\uDC70\\uDC71]|\\uD809[\\uDC70-\\uDC74]|\\uD81A[\\uDE6E\\uDE6F\\uDEF5\\uDF37-\\uDF3B\\uDF44]|\\uD82F\\uDC9F|\\uD836[\\uDE87-\\uDE8B]|\\uD83A[\\uDD5E\\uDD5F]/","module.exports=/[ \\xA0\\u1680\\u2000-\\u200A\\u202F\\u205F\\u3000]/","'use strict';\n\nexports.Any = require('./properties/Any/regex');\nexports.Cc  = require('./categories/Cc/regex');\nexports.Cf  = require('./categories/Cf/regex');\nexports.P   = require('./categories/P/regex');\nexports.Z   = require('./categories/Z/regex');\n","module.exports=/[\\0-\\uD7FF\\uE000-\\uFFFF]|[\\uD800-\\uDBFF][\\uDC00-\\uDFFF]|[\\uD800-\\uDBFF](?![\\uDC00-\\uDFFF])|(?:[^\\uD800-\\uDBFF]|^)[\\uDC00-\\uDFFF]/","var g;\r\n\r\n// This works in non-strict mode\r\ng = (function() {\r\n\treturn this;\r\n})();\r\n\r\ntry {\r\n\t// This works if eval is allowed (see CSP)\r\n\tg = g || Function(\"return this\")() || (1, eval)(\"this\");\r\n} catch (e) {\r\n\t// This works if the window reference is available\r\n\tif (typeof window === \"object\") g = window;\r\n}\r\n\r\n// g can still be undefined, but nothing to do about it...\r\n// We return undefined, instead of nothing here, so it's\r\n// easier to handle this case. if(!global) { ...}\r\n\r\nmodule.exports = g;\r\n","module.exports = function(module) {\r\n\tif (!module.webpackPolyfill) {\r\n\t\tmodule.deprecate = function() {};\r\n\t\tmodule.paths = [];\r\n\t\t// module.parent = undefined by default\r\n\t\tif (!module.children) module.children = [];\r\n\t\tObject.defineProperty(module, \"loaded\", {\r\n\t\t\tenumerable: true,\r\n\t\t\tget: function() {\r\n\t\t\t\treturn module.l;\r\n\t\t\t}\r\n\t\t});\r\n\t\tObject.defineProperty(module, \"id\", {\r\n\t\t\tenumerable: true,\r\n\t\t\tget: function() {\r\n\t\t\t\treturn module.i;\r\n\t\t\t}\r\n\t\t});\r\n\t\tmodule.webpackPolyfill = 1;\r\n\t}\r\n\treturn module;\r\n};\r\n","/*---------------------------------------------------------------------------------------------\n *  Copyright (c) Microsoft Corporation. All rights reserved.\n *  Licensed under the MIT License. See License.txt in the project root for license information.\n *--------------------------------------------------------------------------------------------*/\n\nimport { renderTimelineEvent, getStatus, renderComment } from './pullRequestOverviewRenderer';\nimport md from './mdRenderer';\n\ndeclare var acquireVsCodeApi: any;\nconst vscode = acquireVsCodeApi();\n\nfunction handleMessage(event: any) {\n\tconst message = event.data; // The json data that the extension sent\n\tswitch (message.command) {\n\t\tcase 'pr.initialize':\n\t\t\trenderPullRequest(message.pullrequest);\n\t\t\tbreak;\n\t\tcase 'pr.update':\n\t\t\tupdatePullRequest(message.pullrequest);\n\t\t\tbreak;\n\t\tcase 'checked-out':\n\t\t\tupdateCheckoutButton(true);\n\t\t\tbreak;\n\t\tcase 'append-comment':\n\t\t\tappendComment(message.value);\n\t\tdefault:\n\t\t\tbreak;\n\t}\n}\n\nwindow.addEventListener('message', handleMessage);\n\nfunction renderPullRequest(pullRequest: any) {\n\tdocument.getElementById('pullrequest')!.innerHTML = pullRequest.events.map(renderTimelineEvent).join('');\n\tsetTitleHTML(pullRequest);\n\tsetTextArea();\n\tupdateCheckoutButton(pullRequest.isCurrentlyCheckedOut);\n\n\taddEventListeners();\n}\n\nfunction updatePullRequest(pullRequest: any) {\n\tif (pullRequest.state || pullRequest.body || pullRequest.author || pullRequest.title) {\n\t\tsetTitleHTML(pullRequest);\n\t}\n}\n\nfunction setTitleHTML(pr: any) {\n\tdocument.getElementById('title')!.innerHTML = `\n\t\t\t<div class=\"prIcon\"><svg width=\"64\" height=\"64\" class=\"octicon octicon-git-compare\" viewBox=\"0 0 14 16\" version=\"1.1\" aria-hidden=\"true\"><path fill=\"#FFFFFF\" fill-rule=\"evenodd\" d=\"M5 12H4c-.27-.02-.48-.11-.69-.31-.21-.2-.3-.42-.31-.69V4.72A1.993 1.993 0 0 0 2 1a1.993 1.993 0 0 0-1 3.72V11c.03.78.34 1.47.94 2.06.6.59 1.28.91 2.06.94h1v2l3-3-3-3v2zM2 1.8c.66 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2C1.35 4.2.8 3.65.8 3c0-.65.55-1.2 1.2-1.2zm11 9.48V5c-.03-.78-.34-1.47-.94-2.06-.6-.59-1.28-.91-2.06-.94H9V0L6 3l3 3V4h1c.27.02.48.11.69.31.21.2.3.42.31.69v6.28A1.993 1.993 0 0 0 12 15a1.993 1.993 0 0 0 1-3.72zm-1 2.92c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2z\"></path></svg></div>\n\t\t\t<div class=\"details\">\n\t\t\t\t<div class=\"overview-title\">\n\t\t\t\t\t<h2>${pr.title} (<a href=${pr.url}>#${pr.number}</a>) </h2> <button id=\"checkout\" aria-live=\"polite\"><svg class=\"octicon octicon-desktop-download\" viewBox=\"0 0 16 16\" version=\"1.1\" width=\"16\" height=\"16\" aria-hidden=\"true\"><path fill-rule=\"evenodd\" d=\"M4 6h3V0h2v6h3l-4 4-4-4zm11-4h-4v1h4v8H1V3h4V2H1c-.55 0-1 .45-1 1v9c0 .55.45 1 1 1h5.34c-.25.61-.86 1.39-2.34 2h8c-1.48-.61-2.09-1.39-2.34-2H15c.55 0 1-.45 1-1V3c0-.55-.45-1-1-1z\"></path></svg>Checkout Pull Request</button>\n\t\t\t\t</div>\n\t\t\t\t<div>\n\t\t\t\t\t<div class=\"status\">${getStatus(pr.state)}</div>\n\t\t\t\t\t<img class=\"avatar\" src=\"${pr.author.avatarUrl}\" alt=\"\">\n\t\t\t\t\t<strong class=\"author\"><a href=\"${pr.author.htmlUrl}\">${pr.author.login}</a></strong>\n\t\t\t\t</div>\n\t\t\t\t<div class=\"comment-body\">\n\t\t\t\t\t${md.render(pr.body)}\n\t\t\t\t</div>\n\t\t\t</div>\n\t\t`;\n}\n\nfunction addEventListeners() {\n\tdocument.getElementById('checkout')!.addEventListener('click', () => {\n\t\t(<HTMLButtonElement>document.getElementById('checkout')).disabled = true;\n\t\tvscode.postMessage({\n\t\t\tcommand: 'pr.checkout'\n\t\t});\n\t});\n\n\tdocument.getElementById('reply-button')!.addEventListener('click', () => {\n\t\t(<HTMLButtonElement>document.getElementById('reply-button')).disabled = true;\n\t\tvscode.postMessage({\n\t\t\tcommand: 'pr.comment',\n\t\t\ttext: (<HTMLTextAreaElement>document.getElementById('commentTextArea')!).value\n\t\t});\n\t\t(<HTMLTextAreaElement>document.getElementById('commentTextArea')!).value = '';\n\t});\n\n\tdocument.getElementById('close-button')!.addEventListener('click', () => {\n\t\t(<HTMLButtonElement>document.getElementById('close-button')).disabled = true;\n\t\tvscode.postMessage({\n\t\t\tcommand: 'pr.close'\n\t\t});\n\t});\n}\n\nfunction appendComment(comment: any) {\n\tlet newComment = renderComment(comment);\n\tdocument.getElementById('pullrequest')!.insertAdjacentHTML('beforeend', newComment);\n}\n\nfunction updateCheckoutButton(isCheckedOut: boolean) {\n\tconst checkoutButton = (<HTMLButtonElement>document.getElementById('checkout'));\n\tcheckoutButton.disabled = isCheckedOut;\n\tconst checkoutIcon = '<svg class=\"octicon octicon-desktop-download\" viewBox=\"0 0 16 16\" version=\"1.1\" width=\"16\" height=\"16\" aria-hidden=\"true\"><path fill-rule=\"evenodd\" d=\"M4 6h3V0h2v6h3l-4 4-4-4zm11-4h-4v1h4v8H1V3h4V2H1c-.55 0-1 .45-1 1v9c0 .55.45 1 1 1h5.34c-.25.61-.86 1.39-2.34 2h8c-1.48-.61-2.09-1.39-2.34-2H15c.55 0 1-.45 1-1V3c0-.55-.45-1-1-1z\"></path></svg>';\n\tconst activeIcon = '<svg class=\"octicon octicon-check\" viewBox=\"0 0 12 16\" version=\"1.1\" width=\"12\" height=\"16\" aria-hidden=\"true\"><path fill-rule=\"evenodd\" d=\"M12 5l-8 8-4-4 1.5-1.5L4 10l6.5-6.5L12 5z\"></path></svg>';\n\tcheckoutButton.innerHTML = isCheckedOut ? `${activeIcon} Currently Active` : `${checkoutIcon} Checkout Pull Request`;\n}\n\nfunction setTextArea() {\n\tdocument.getElementById('comment-form')!.innerHTML = `<textarea id=\"commentTextArea\"></textarea>\n\t\t<div class=\"form-actions\">\n\t\t\t<button class=\"close-button\" id=\"close-button\"></button>\n\t\t\t<button class=\"reply-button\" id=\"reply-button\"></button>\n\t\t</div>`;\n\n\t(<HTMLTextAreaElement>document.getElementById('commentTextArea')!).placeholder = 'Leave a comment';\n\t(<HTMLTextAreaElement>document.getElementById('commentTextArea')!).addEventListener('keydown', e => {\n\t\tif (e.keyCode === 65 && e.metaKey) {\n\t\t\t(<HTMLTextAreaElement>document.getElementById('commentTextArea')!).select();\n\t\t}\n\t});\n\t(<HTMLButtonElement>document.getElementById('reply-button')!).textContent = 'Comment';\n\t(<HTMLButtonElement>document.getElementById('close-button')!).textContent = 'Close pull request';\n}","/*---------------------------------------------------------------------------------------------\n *  Copyright (c) Microsoft Corporation. All rights reserved.\n *  Licensed under the MIT License. See License.txt in the project root for license information.\n *--------------------------------------------------------------------------------------------*/\n\nconst MarkdownIt = require('markdown-it');\nconst md = MarkdownIt();\n\nexport default md;","/*---------------------------------------------------------------------------------------------\n *  Copyright (c) Microsoft Corporation. All rights reserved.\n *  Licensed under the MIT License. See License.txt in the project root for license information.\n *--------------------------------------------------------------------------------------------*/\n\nimport * as moment from 'moment';\nimport md from './mdRenderer';\n\n\nexport enum DiffChangeType {\n\tContext,\n\tAdd,\n\tDelete,\n\tControl\n}\n\nexport class DiffLine {\n\tpublic get raw(): string {\n\t\treturn this._raw;\n\t}\n\n\tpublic get text(): string {\n\t\treturn this._raw.substr(1);\n\t}\n\n\tpublic endwithLineBreak: boolean = true;\n\n\tconstructor(\n\t\tpublic type: DiffChangeType,\n\t\tpublic oldLineNumber: number, /* 1 based */\n\t\tpublic newLineNumber: number, /* 1 based */\n\t\tpublic positionInHunk: number,\n\t\tprivate _raw: string\n\t) { }\n}\n\nexport function getDiffChangeType(text: string) {\n\tlet c = text[0];\n\tswitch (c) {\n\t\tcase ' ': return DiffChangeType.Context;\n\t\tcase '+': return DiffChangeType.Add;\n\t\tcase '-': return DiffChangeType.Delete;\n\t\tdefault: return DiffChangeType.Control;\n\t}\n}\n\nexport class DiffHunk {\n\tpublic diffLines: DiffLine[] = [];\n\n\tconstructor(\n\t\tpublic oldLineNumber: number,\n\t\tpublic oldLength: number,\n\t\tpublic newLineNumber: number,\n\t\tpublic newLength: number,\n\t\tpublic positionInHunk: number\n\t) { }\n}\nexport interface Comment {\n\turl: string;\n\tid: string;\n\tpath: string;\n\tpull_request_review_id: string;\n\tdiff_hunk: string;\n\tdiff_hunks: DiffHunk[];\n\tposition: number;\n\toriginal_position: number;\n\tcommit_id: string;\n\toriginal_commit_id: string;\n\tuser: User;\n\tbody: string;\n\tcreated_at: string;\n\tupdated_at: string;\n\thtml_url: string;\n\tabsolutePosition?: number;\n}\n\n\nexport enum EventType {\n\tCommitted,\n\tMentioned,\n\tSubscribed,\n\tCommented,\n\tReviewed,\n\tOther\n}\n\nexport interface Author {\n\tname: string;\n\temail: string;\n\tdate: Date;\n}\n\nexport interface Committer {\n\tname: string;\n\temail: string;\n\tdate: Date;\n}\n\nexport interface Tree {\n\tsha: string;\n\turl: string;\n}\n\nexport interface Parent {\n\tsha: string;\n\turl: string;\n\thtml_url: string;\n}\n\nexport interface Verification {\n\tverified: boolean;\n\treason: string;\n\tsignature?: any;\n\tpayload?: any;\n}\n\nexport interface User {\n\tlogin: string;\n\tid: number;\n\tavatar_url: string;\n\tgravatar_id: string;\n\turl: string;\n\thtml_url: string;\n\tfollowers_url: string;\n\tfollowing_url: string;\n\tgists_url: string;\n\tstarred_url: string;\n\tsubscriptions_url: string;\n\torganizations_url: string;\n\trepos_url: string;\n\tevents_url: string;\n\treceived_events_url: string;\n\ttype: string;\n\tsite_admin: boolean;\n}\n\nexport interface Html {\n\thref: string;\n}\n\nexport interface PullRequest {\n\thref: string;\n}\n\nexport interface Links {\n\thtml: Html;\n\tpull_request: PullRequest;\n}\n\nexport interface MentionEvent {\n\tid: number;\n\turl: string;\n\tactor: User;\n\tevent: EventType;\n\tcommit_id: string;\n\tcommit_url: string;\n\tcreated_at: Date;\n}\n\nexport interface SubscribeEvent {\n\tid: number;\n\turl: string;\n\tactor: User;\n\tevent: EventType;\n\tcommit_id: string;\n\tcommit_url: string;\n\tcreated_at: Date;\n}\n\nexport interface CommentEvent {\n\turl: string;\n\thtml_url: string;\n\tauthor: Author;\n\tuser: User;\n\tcreated_at: Date;\n\tupdated_at: Date;\n\tid: number;\n\tevent: EventType;\n\tactor: User;\n\tauthor_association: string;\n\tbody: string;\n}\n\nexport interface ReviewEvent {\n\tid: number;\n\tuser: User;\n\tbody: string;\n\tcommit_id: string;\n\tsubmitted_at: Date;\n\tstate: string;\n\thtml_url: string;\n\tpull_request_url: string;\n\tauthor_association: string;\n\t_links: Links;\n\tevent: EventType;\n\tcomments: Comment[];\n}\n\nexport interface CommitEvent {\n\tsha: string;\n\turl: string;\n\thtml_url: string;\n\tauthor: Author;\n\tcommitter: Committer;\n\ttree: Tree;\n\tmessage: string;\n\tparents: Parent[];\n\tverification: Verification;\n\tevent: EventType;\n}\n\nexport enum PullRequestStateEnum {\n\tOpen,\n\tMerged,\n\tClosed,\n}\n\nexport type TimelineEvent = CommitEvent | ReviewEvent | SubscribeEvent | CommentEvent | MentionEvent;\n\nexport function renderCommentBody(comment: Comment): string {\n\treturn `\n\t\t\t<div class=\"comment-body\">\n\t\t\t\t${md.render(comment.body)}\n\t\t\t</div>`;\n}\n\n\nexport function renderComment(comment: CommentEvent): string {\n\treturn `<div class=\"comment-container\">\n\n\t<div class=\"review-comment\" role=\"treeitem\">\n\t\t<div class=\"review-comment-contents\">\n\t\t\t<div class=\"review-comment-header\">\n\t\t\t\t<div class=\"avatar-container\">\n\t\t\t\t\t<img class=\"avatar\" src=\"${comment.user.avatar_url}\">\n\t\t\t\t</div>\n\t\t\t\t<strong class=\"author\"><a href=\"${comment.user.html_url}\">${comment.user.login}</a></strong>\n\t\t\t\t<div class=\"timestamp\">${moment(comment.created_at).fromNow()}</div>\n\t\t\t</div>\n\t\t\t<div class=\"comment-body\">\n\t\t\t\t${md.render(comment.body)}\n\t\t\t</div>\n\t\t</div>\n\t</div>\n</div>`;\n}\n\nexport function renderCommit(timelineEvent: CommitEvent): string {\n\treturn `<div class=\"comment-container\">\n\n\t<div class=\"review-comment\" role=\"treeitem\">\n\t\t<div class=\"review-comment-contents\">\n\t\t\t<div class=\"commit\">\n\t\t\t\t<strong>${timelineEvent.author.name} commit: <a href=\"${timelineEvent.html_url}\">${timelineEvent.message} (${timelineEvent.sha})</a></strong>\n\t\t\t</div>\n\t\t</div>\n\t</div>\n</div>`;\n}\n\nfunction getDiffChangeClass(type: DiffChangeType) {\n\tswitch (type) {\n\t\tcase DiffChangeType.Add:\n\t\t\treturn 'add';\n\t\tcase DiffChangeType.Delete:\n\t\t\treturn 'delete';\n\t\tcase DiffChangeType.Context:\n\t\t\treturn 'context';\n\t\tcase DiffChangeType.Context:\n\t\t\treturn 'context';\n\t\tdefault:\n\t\t\treturn 'control';\n\t}\n}\n\nexport function renderReview(timelineEvent: ReviewEvent): string {\n\tlet comments = timelineEvent.comments;\n\tlet avatar = '';\n\tlet diffView = '';\n\tlet diffLines = [];\n\tif (comments && comments.length) {\n\t\tavatar = `<div class=\"avatar-container\">\n\t\t\t<img class=\"avatar\" src=\"${timelineEvent.comments[0].user.avatar_url}\">\n\t\t</div>`;\n\t\tfor (let i = 0; i < comments[0].diff_hunks.length; i++) {\n\t\t\tdiffLines.push(comments[0].diff_hunks[i].diffLines.slice(-4).map(diffLine => `<div class=\"diffLine ${getDiffChangeClass(diffLine.type)}\">\n\t\t\t\t<span class=\"lineNumber old\">${diffLine.oldLineNumber > 0 ? diffLine.oldLineNumber : ' '}</span>\n\t\t\t\t<span class=\"lineNumber new\">${diffLine.newLineNumber > 0 ? diffLine.newLineNumber : ' '}</span>\n\t\t\t\t<span class=\"lineContent\">${(diffLine as any)._raw}</span>\n\t\t\t\t</div>`).join(''));\n\t\t}\n\n\t\tdiffView = `<div class=\"diff\">\n\t\t\t<div class=\"diffHeader\">${comments[0].path}</div>\n\t\t\t${diffLines.join('')}\n\t\t</div>`;\n\t}\n\treturn `<div class=\"comment-container\">\n\n\t<div class=\"review-comment\" role=\"treeitem\">\n\t\t<div class=\"review-comment-contents\">\n\t\t\t<div class=\"review-comment-header\">\n\t\t\t\t${avatar}\n\t\t\t\t<strong class=\"author\">${timelineEvent.user.login} left a <a href=\"${timelineEvent.html_url}\">review </a></strong><span></span>\n\t\t\t\t<div class=\"timestamp\">${moment(timelineEvent.submitted_at).fromNow()}</div>\n\t\t\t</div>\n\t\t\t${diffView}\n\t\t\t<div>${ timelineEvent.comments && timelineEvent.comments.length ? timelineEvent.comments.map(comment => renderCommentBody(comment)) : ''}</div>\n\t\t</div>\n\t</div>\n</div>`;\n}\n\nexport function renderTimelineEvent(timelineEvent: TimelineEvent): string {\n\tswitch (timelineEvent.event) {\n\t\tcase EventType.Committed:\n\t\t\treturn renderCommit((<CommitEvent>timelineEvent));\n\t\tcase EventType.Commented:\n\t\t\treturn renderComment((<CommentEvent>timelineEvent));\n\t\tcase EventType.Reviewed:\n\t\t\treturn renderReview((<ReviewEvent>timelineEvent));\n\t}\n\treturn '';\n}\n\nexport function getStatusBGCoor(state: PullRequestStateEnum) {\n\tif (state === PullRequestStateEnum.Merged) {\n\t\treturn '#6f42c1';\n\t} else if (state === PullRequestStateEnum.Open) {\n\t\treturn '#2cbe4e';\n\t} else {\n\t\treturn '#cb2431';\n\t}\n}\n\nexport function getStatus(state: PullRequestStateEnum) {\n\tif (state === PullRequestStateEnum.Merged) {\n\t\treturn 'Merged';\n\t} else if (state === PullRequestStateEnum.Open) {\n\t\treturn 'Open';\n\t} else {\n\t\treturn 'Closed';\n\t}\n}"],"sourceRoot":""}
-\ No newline at end of file
-added in remote
-  their  100644 94dc7cd2625f5b48f8098b66d43cf5bdaec7280b extensions/git-extended/package.json
-@@ -0,0 +1,157 @@
-+{
-+  "name": "git-extended",
-+  "displayName": "Git Extended",
-+  "description": "Git Extended",
-+  "enableProposedApi": true,
-+  "version": "0.0.1",
-+  "publisher": "rebornix",
-+  "engines": {
-+    "vscode": "^1.13.0"
-+  },
-+  "categories": [
-+    "Other"
-+  ],
-+  "activationEvents": [
-+    "*"
-+  ],
-+  "extensionDependencies": [
-+    "vscode.git"
-+  ],
-+  "main": "./out/extension",
-+  "contributes": {
-+    "configuration": {
-+      "type": "object",
-+      "title": "GitHub configuration",
-+      "properties": {
-+        "github.username": {
-+          "type": [
-+            "string",
-+            "null"
-+          ],
-+          "default": null,
-+          "description": "The username to use when accessing GitHub. The default is to consult the Git credential manager."
-+        },
-+        "github.host": {
-+          "type": "string",
-+          "default": "github.com",
-+          "description": "The host name to access GitHub. Change this to your GitHub Enterprise host."
-+        },
-+        "github.accessToken": {
-+          "type": [
-+            "string",
-+            "null"
-+          ],
-+          "default": null,
-+          "description": "GitHub access token."
-+        }
-+      }
-+    },
-+    "views": {
-+      "scm": [
-+        {
-+          "id": "pr",
-+          "name": "GitHub Pull Requests"
-+        },
-+        {
-+          "id": "prStatus",
-+          "name": "Changes In Pull Request",
-+          "when": "git:ispr"
-+        }
-+      ]
-+    },
-+    "commands": [
-+      {
-+        "command": "pr.refreshList",
-+        "title": "Refresh",
-+        "icon": {
-+          "dark": "resources/icons/dark/refresh.svg",
-+          "light": "resources/icons/light/refresh.svg"
-+        }
-+      },
-+      {
-+        "command": "pr.pick",
-+        "title": "Checkout Pull Request"
-+      },
-+      {
-+        "command": "pr.close",
-+        "title": "Close Pull Request"
-+      },
-+      {
-+        "command": "pr.openInGitHub",
-+        "title": "Open in GitHub"
-+      },
-+      {
-+        "command": "pr.openDescription",
-+        "title": "View Pull Request Description"
-+      },
-+      {
-+        "command": "pr.viewChanges",
-+        "title": "View Changes"
-+      },
-+      {
-+        "command": "review.openFile",
-+        "title": "Open File",
-+        "icon": {
-+          "light": "resources/icons/light/open-file.svg",
-+          "dark": "resources/icons/dark/open-file.svg"
-+        }
-+      }
-+    ],
-+    "menus": {
-+      "view/title": [
-+        {
-+          "command": "pr.refreshList",
-+          "when": "view == pr",
-+          "group": "navigation"
-+        }
-+      ],
-+      "view/item/context": [
-+        {
-+          "command": "pr.pick",
-+          "when": "view == pr && viewItem =~ /pullrequest:nonactive/"
-+        },
-+        {
-+          "command": "pr.openInGitHub",
-+          "when": "view == pr && viewItem =~ /pullrequest/"
-+        },
-+        {
-+          "command": "pr.close",
-+          "when": "view == pr && viewItem =~ /pullrequest/"
-+        },
-+        {
-+          "command": "pr.openInGitHub",
-+          "when": "view =~ /(pr|prStatus)/ && viewItem == filechange"
-+        }
-+      ],
-+      "editor/title": [
-+        {
-+          "command": "review.openFile",
-+          "group": "navigation",
-+          "when": "resourceScheme =~ /^review$/"
-+        }
-+      ]
-+    }
-+  },
-+  "scripts": {
-+    "vscode:prepublish": "tsc -p ./",
-+    "compile": "tsc -watch -p ./",
-+    "watch-preview": "npm run build-preview",
-+    "build-preview": "webpack --watch --mode development"
-+  },
-+  "devDependencies": {
-+    "@types/lodash": "^4.14.106",
-+    "@types/node": "*",
-+    "typescript": "^2.1.4",
-+    "webpack": "^4.1.0",
-+    "webpack-cli": "^2.0.10",
-+    "ts-loader": "^4.0.1"
-+  },
-+  "dependencies": {
-+    "@octokit/rest": "^15.2.6",
-+    "dugite": "^1.63.0",
-+    "markdown-it": "^8.4.0",
-+    "git-credential-node": "^1.1.0",
-+    "tmp": "^0.0.31",
-+    "moment": "^2.22.1"
-+  }
-+}
-\ No newline at end of file
-added in remote
-  their  100644 0a9ece35f6ea7b3da6c16ea815bbf7cdf6ebb4af extensions/git-extended/package.nls.json
-@@ -0,0 +1,11 @@
-+{
-+	"description": "Extension to add task support for npm scripts.",
-+	"displayName": "Npm support for VSCode",
-+	"config.npm.autoDetect": "Controls whether auto detection of npm scripts is on or off. Default is on.",
-+	"config.npm.runSilent": "Run npm commands with the `--silent` option.",
-+	"config.npm.packageManager": "The package manager used to run scripts.",
-+	"config.npm.exclude": "Configure glob patterns for folders that should be excluded from automatic script detection.",
-+	"npm.parseError": "Npm task detection: failed to parse the file {0}",
-+	"taskdef.script": "The npm script to customize.",
-+	"taskdef.path": "The path to the folder of the package.json file that provides the script. Can be ommitted."
-+}
-added in remote
-  their  100644 cde05ccbd0ebb03d0ebc33a6c0ee96665c78ea4f extensions/git-extended/preview-src/index.ts
-@@ -0,0 +1,120 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+import { renderTimelineEvent, getStatus, renderComment } from './pullRequestOverviewRenderer';
-+import md from './mdRenderer';
-+
-+declare var acquireVsCodeApi: any;
-+const vscode = acquireVsCodeApi();
-+
-+function handleMessage(event: any) {
-+	const message = event.data; // The json data that the extension sent
-+	switch (message.command) {
-+		case 'pr.initialize':
-+			renderPullRequest(message.pullrequest);
-+			break;
-+		case 'pr.update':
-+			updatePullRequest(message.pullrequest);
-+			break;
-+		case 'checked-out':
-+			updateCheckoutButton(true);
-+			break;
-+		case 'append-comment':
-+			appendComment(message.value);
-+		default:
-+			break;
-+	}
-+}
-+
-+window.addEventListener('message', handleMessage);
-+
-+function renderPullRequest(pullRequest: any) {
-+	document.getElementById('pullrequest')!.innerHTML = pullRequest.events.map(renderTimelineEvent).join('');
-+	setTitleHTML(pullRequest);
-+	setTextArea();
-+	updateCheckoutButton(pullRequest.isCurrentlyCheckedOut);
-+
-+	addEventListeners();
-+}
-+
-+function updatePullRequest(pullRequest: any) {
-+	if (pullRequest.state || pullRequest.body || pullRequest.author || pullRequest.title) {
-+		setTitleHTML(pullRequest);
-+	}
-+}
-+
-+function setTitleHTML(pr: any) {
-+	document.getElementById('title')!.innerHTML = `
-+			<div class="prIcon"><svg width="64" height="64" class="octicon octicon-git-compare" viewBox="0 0 14 16" version="1.1" aria-hidden="true"><path fill="#FFFFFF" fill-rule="evenodd" d="M5 12H4c-.27-.02-.48-.11-.69-.31-.21-.2-.3-.42-.31-.69V4.72A1.993 1.993 0 0 0 2 1a1.993 1.993 0 0 0-1 3.72V11c.03.78.34 1.47.94 2.06.6.59 1.28.91 2.06.94h1v2l3-3-3-3v2zM2 1.8c.66 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2C1.35 4.2.8 3.65.8 3c0-.65.55-1.2 1.2-1.2zm11 9.48V5c-.03-.78-.34-1.47-.94-2.06-.6-.59-1.28-.91-2.06-.94H9V0L6 3l3 3V4h1c.27.02.48.11.69.31.21.2.3.42.31.69v6.28A1.993 1.993 0 0 0 12 15a1.993 1.993 0 0 0 1-3.72zm-1 2.92c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2z"></path></svg></div>
-+			<div class="details">
-+				<div class="overview-title">
-+					<h2>${pr.title} (<a href=${pr.url}>#${pr.number}</a>) </h2> <button id="checkout" aria-live="polite"><svg class="octicon octicon-desktop-download" viewBox="0 0 16 16" version="1.1" width="16" height="16" aria-hidden="true"><path fill-rule="evenodd" d="M4 6h3V0h2v6h3l-4 4-4-4zm11-4h-4v1h4v8H1V3h4V2H1c-.55 0-1 .45-1 1v9c0 .55.45 1 1 1h5.34c-.25.61-.86 1.39-2.34 2h8c-1.48-.61-2.09-1.39-2.34-2H15c.55 0 1-.45 1-1V3c0-.55-.45-1-1-1z"></path></svg>Checkout Pull Request</button>
-+				</div>
-+				<div>
-+					<div class="status">${getStatus(pr.state)}</div>
-+					<img class="avatar" src="${pr.author.avatarUrl}" alt="">
-+					<strong class="author"><a href="${pr.author.htmlUrl}">${pr.author.login}</a></strong>
-+				</div>
-+				<div class="comment-body">
-+					${md.render(pr.body)}
-+				</div>
-+			</div>
-+		`;
-+}
-+
-+function addEventListeners() {
-+	document.getElementById('checkout')!.addEventListener('click', () => {
-+		(<HTMLButtonElement>document.getElementById('checkout')).disabled = true;
-+		vscode.postMessage({
-+			command: 'pr.checkout'
-+		});
-+	});
-+
-+	document.getElementById('reply-button')!.addEventListener('click', () => {
-+		(<HTMLButtonElement>document.getElementById('reply-button')).disabled = true;
-+		vscode.postMessage({
-+			command: 'pr.comment',
-+			text: (<HTMLTextAreaElement>document.getElementById('commentTextArea')!).value
-+		});
-+		(<HTMLTextAreaElement>document.getElementById('commentTextArea')!).value = '';
-+	});
-+
-+	document.getElementById('close-button')!.addEventListener('click', () => {
-+		(<HTMLButtonElement>document.getElementById('close-button')).disabled = true;
-+		vscode.postMessage({
-+			command: 'pr.close'
-+		});
-+	});
-+}
-+
-+function appendComment(comment: any) {
-+	let newComment = renderComment(comment);
-+	document.getElementById('pullrequest')!.insertAdjacentHTML('beforeend', newComment);
-+}
-+
-+function updateCheckoutButton(isCheckedOut: boolean) {
-+	const checkoutButton = (<HTMLButtonElement>document.getElementById('checkout'));
-+	checkoutButton.disabled = isCheckedOut;
-+	const checkoutIcon = '<svg class="octicon octicon-desktop-download" viewBox="0 0 16 16" version="1.1" width="16" height="16" aria-hidden="true"><path fill-rule="evenodd" d="M4 6h3V0h2v6h3l-4 4-4-4zm11-4h-4v1h4v8H1V3h4V2H1c-.55 0-1 .45-1 1v9c0 .55.45 1 1 1h5.34c-.25.61-.86 1.39-2.34 2h8c-1.48-.61-2.09-1.39-2.34-2H15c.55 0 1-.45 1-1V3c0-.55-.45-1-1-1z"></path></svg>';
-+	const activeIcon = '<svg class="octicon octicon-check" viewBox="0 0 12 16" version="1.1" width="12" height="16" aria-hidden="true"><path fill-rule="evenodd" d="M12 5l-8 8-4-4 1.5-1.5L4 10l6.5-6.5L12 5z"></path></svg>';
-+	checkoutButton.innerHTML = isCheckedOut ? `${activeIcon} Currently Active` : `${checkoutIcon} Checkout Pull Request`;
-+}
-+
-+function setTextArea() {
-+	document.getElementById('comment-form')!.innerHTML = `<textarea id="commentTextArea"></textarea>
-+		<div class="form-actions">
-+			<button class="close-button" id="close-button"></button>
-+			<button class="reply-button" id="reply-button"></button>
-+		</div>`;
-+
-+	(<HTMLTextAreaElement>document.getElementById('commentTextArea')!).placeholder = 'Leave a comment';
-+	(<HTMLTextAreaElement>document.getElementById('commentTextArea')!).addEventListener('keydown', e => {
-+		if (e.keyCode === 65 && e.metaKey) {
-+			(<HTMLTextAreaElement>document.getElementById('commentTextArea')!).select();
-+		}
-+	});
-+	(<HTMLButtonElement>document.getElementById('reply-button')!).textContent = 'Comment';
-+	(<HTMLButtonElement>document.getElementById('close-button')!).textContent = 'Close pull request';
-+}
-\ No newline at end of file
-added in remote
-  their  100644 63ecb33b0026e1797f753b79a0341948e4b09101 extensions/git-extended/preview-src/mdRenderer.ts
-@@ -0,0 +1,9 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+const MarkdownIt = require('markdown-it');
-+const md = MarkdownIt();
-+
-+export default md;
-\ No newline at end of file
-added in remote
-  their  100644 60ff6536bbbaca7bfbfb9b744e7ea393cc2c8758 extensions/git-extended/preview-src/pullRequestOverviewRenderer.ts
-@@ -0,0 +1,344 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+import * as moment from 'moment';
-+import md from './mdRenderer';
-+
-+
-+export enum DiffChangeType {
-+	Context,
-+	Add,
-+	Delete,
-+	Control
-+}
-+
-+export class DiffLine {
-+	public get raw(): string {
-+		return this._raw;
-+	}
-+
-+	public get text(): string {
-+		return this._raw.substr(1);
-+	}
-+
-+	public endwithLineBreak: boolean = true;
-+
-+	constructor(
-+		public type: DiffChangeType,
-+		public oldLineNumber: number, /* 1 based */
-+		public newLineNumber: number, /* 1 based */
-+		public positionInHunk: number,
-+		private _raw: string
-+	) { }
-+}
-+
-+export function getDiffChangeType(text: string) {
-+	let c = text[0];
-+	switch (c) {
-+		case ' ': return DiffChangeType.Context;
-+		case '+': return DiffChangeType.Add;
-+		case '-': return DiffChangeType.Delete;
-+		default: return DiffChangeType.Control;
-+	}
-+}
-+
-+export class DiffHunk {
-+	public diffLines: DiffLine[] = [];
-+
-+	constructor(
-+		public oldLineNumber: number,
-+		public oldLength: number,
-+		public newLineNumber: number,
-+		public newLength: number,
-+		public positionInHunk: number
-+	) { }
-+}
-+export interface Comment {
-+	url: string;
-+	id: string;
-+	path: string;
-+	pull_request_review_id: string;
-+	diff_hunk: string;
-+	diff_hunks: DiffHunk[];
-+	position: number;
-+	original_position: number;
-+	commit_id: string;
-+	original_commit_id: string;
-+	user: User;
-+	body: string;
-+	created_at: string;
-+	updated_at: string;
-+	html_url: string;
-+	absolutePosition?: number;
-+}
-+
-+
-+export enum EventType {
-+	Committed,
-+	Mentioned,
-+	Subscribed,
-+	Commented,
-+	Reviewed,
-+	Other
-+}
-+
-+export interface Author {
-+	name: string;
-+	email: string;
-+	date: Date;
-+}
-+
-+export interface Committer {
-+	name: string;
-+	email: string;
-+	date: Date;
-+}
-+
-+export interface Tree {
-+	sha: string;
-+	url: string;
-+}
-+
-+export interface Parent {
-+	sha: string;
-+	url: string;
-+	html_url: string;
-+}
-+
-+export interface Verification {
-+	verified: boolean;
-+	reason: string;
-+	signature?: any;
-+	payload?: any;
-+}
-+
-+export interface User {
-+	login: string;
-+	id: number;
-+	avatar_url: string;
-+	gravatar_id: string;
-+	url: string;
-+	html_url: string;
-+	followers_url: string;
-+	following_url: string;
-+	gists_url: string;
-+	starred_url: string;
-+	subscriptions_url: string;
-+	organizations_url: string;
-+	repos_url: string;
-+	events_url: string;
-+	received_events_url: string;
-+	type: string;
-+	site_admin: boolean;
-+}
-+
-+export interface Html {
-+	href: string;
-+}
-+
-+export interface PullRequest {
-+	href: string;
-+}
-+
-+export interface Links {
-+	html: Html;
-+	pull_request: PullRequest;
-+}
-+
-+export interface MentionEvent {
-+	id: number;
-+	url: string;
-+	actor: User;
-+	event: EventType;
-+	commit_id: string;
-+	commit_url: string;
-+	created_at: Date;
-+}
-+
-+export interface SubscribeEvent {
-+	id: number;
-+	url: string;
-+	actor: User;
-+	event: EventType;
-+	commit_id: string;
-+	commit_url: string;
-+	created_at: Date;
-+}
-+
-+export interface CommentEvent {
-+	url: string;
-+	html_url: string;
-+	author: Author;
-+	user: User;
-+	created_at: Date;
-+	updated_at: Date;
-+	id: number;
-+	event: EventType;
-+	actor: User;
-+	author_association: string;
-+	body: string;
-+}
-+
-+export interface ReviewEvent {
-+	id: number;
-+	user: User;
-+	body: string;
-+	commit_id: string;
-+	submitted_at: Date;
-+	state: string;
-+	html_url: string;
-+	pull_request_url: string;
-+	author_association: string;
-+	_links: Links;
-+	event: EventType;
-+	comments: Comment[];
-+}
-+
-+export interface CommitEvent {
-+	sha: string;
-+	url: string;
-+	html_url: string;
-+	author: Author;
-+	committer: Committer;
-+	tree: Tree;
-+	message: string;
-+	parents: Parent[];
-+	verification: Verification;
-+	event: EventType;
-+}
-+
-+export enum PullRequestStateEnum {
-+	Open,
-+	Merged,
-+	Closed,
-+}
-+
-+export type TimelineEvent = CommitEvent | ReviewEvent | SubscribeEvent | CommentEvent | MentionEvent;
-+
-+export function renderCommentBody(comment: Comment): string {
-+	return `
-+			<div class="comment-body">
-+				${md.render(comment.body)}
-+			</div>`;
-+}
-+
-+
-+export function renderComment(comment: CommentEvent): string {
-+	return `<div class="comment-container">
-+
-+	<div class="review-comment" role="treeitem">
-+		<div class="review-comment-contents">
-+			<div class="review-comment-header">
-+				<div class="avatar-container">
-+					<img class="avatar" src="${comment.user.avatar_url}">
-+				</div>
-+				<strong class="author"><a href="${comment.user.html_url}">${comment.user.login}</a></strong>
-+				<div class="timestamp">${moment(comment.created_at).fromNow()}</div>
-+			</div>
-+			<div class="comment-body">
-+				${md.render(comment.body)}
-+			</div>
-+		</div>
-+	</div>
-+</div>`;
-+}
-+
-+export function renderCommit(timelineEvent: CommitEvent): string {
-+	return `<div class="comment-container">
-+
-+	<div class="review-comment" role="treeitem">
-+		<div class="review-comment-contents">
-+			<div class="commit">
-+				<strong>${timelineEvent.author.name} commit: <a href="${timelineEvent.html_url}">${timelineEvent.message} (${timelineEvent.sha})</a></strong>
-+			</div>
-+		</div>
-+	</div>
-+</div>`;
-+}
-+
-+function getDiffChangeClass(type: DiffChangeType) {
-+	switch (type) {
-+		case DiffChangeType.Add:
-+			return 'add';
-+		case DiffChangeType.Delete:
-+			return 'delete';
-+		case DiffChangeType.Context:
-+			return 'context';
-+		case DiffChangeType.Context:
-+			return 'context';
-+		default:
-+			return 'control';
-+	}
-+}
-+
-+export function renderReview(timelineEvent: ReviewEvent): string {
-+	let comments = timelineEvent.comments;
-+	let avatar = '';
-+	let diffView = '';
-+	let diffLines = [];
-+	if (comments && comments.length) {
-+		avatar = `<div class="avatar-container">
-+			<img class="avatar" src="${timelineEvent.comments[0].user.avatar_url}">
-+		</div>`;
-+		for (let i = 0; i < comments[0].diff_hunks.length; i++) {
-+			diffLines.push(comments[0].diff_hunks[i].diffLines.slice(-4).map(diffLine => `<div class="diffLine ${getDiffChangeClass(diffLine.type)}">
-+				<span class="lineNumber old">${diffLine.oldLineNumber > 0 ? diffLine.oldLineNumber : ' '}</span>
-+				<span class="lineNumber new">${diffLine.newLineNumber > 0 ? diffLine.newLineNumber : ' '}</span>
-+				<span class="lineContent">${(diffLine as any)._raw}</span>
-+				</div>`).join(''));
-+		}
-+
-+		diffView = `<div class="diff">
-+			<div class="diffHeader">${comments[0].path}</div>
-+			${diffLines.join('')}
-+		</div>`;
-+	}
-+	return `<div class="comment-container">
-+
-+	<div class="review-comment" role="treeitem">
-+		<div class="review-comment-contents">
-+			<div class="review-comment-header">
-+				${avatar}
-+				<strong class="author">${timelineEvent.user.login} left a <a href="${timelineEvent.html_url}">review </a></strong><span></span>
-+				<div class="timestamp">${moment(timelineEvent.submitted_at).fromNow()}</div>
-+			</div>
-+			${diffView}
-+			<div>${ timelineEvent.comments && timelineEvent.comments.length ? timelineEvent.comments.map(comment => renderCommentBody(comment)) : ''}</div>
-+		</div>
-+	</div>
-+</div>`;
-+}
-+
-+export function renderTimelineEvent(timelineEvent: TimelineEvent): string {
-+	switch (timelineEvent.event) {
-+		case EventType.Committed:
-+			return renderCommit((<CommitEvent>timelineEvent));
-+		case EventType.Commented:
-+			return renderComment((<CommentEvent>timelineEvent));
-+		case EventType.Reviewed:
-+			return renderReview((<ReviewEvent>timelineEvent));
-+	}
-+	return '';
-+}
-+
-+export function getStatusBGCoor(state: PullRequestStateEnum) {
-+	if (state === PullRequestStateEnum.Merged) {
-+		return '#6f42c1';
-+	} else if (state === PullRequestStateEnum.Open) {
-+		return '#2cbe4e';
-+	} else {
-+		return '#cb2431';
-+	}
-+}
-+
-+export function getStatus(state: PullRequestStateEnum) {
-+	if (state === PullRequestStateEnum.Merged) {
-+		return 'Merged';
-+	} else if (state === PullRequestStateEnum.Open) {
-+		return 'Open';
-+	} else {
-+		return 'Closed';
-+	}
-+}
-\ No newline at end of file
-added in remote
-  their  100644 bf039f52791f788187ec92c58ce0a0a845d1c553 extensions/git-extended/preview-src/tsconfig.json
-@@ -0,0 +1,15 @@
-+{
-+	"compilerOptions": {
-+		"outDir": "./dist/",
-+		"module": "commonjs",
-+		"target": "es6",
-+		"jsx": "react",
-+		"sourceMap": true,
-+		"strict": true,
-+		"noImplicitAny": true,
-+		"noUnusedLocals": true
-+	},
-+	"include": [
-+		"./**/*"
-+	]
-+}
-\ No newline at end of file
-added in remote
-  their  100644 f8280bdfc32458e7130631440309c17f11188c3c extensions/git-extended/resources/icons/checked_checkbox.png
-@@ -0,0 +1,3 @@
-+�PNG
-+
-+
-\ No newline at end of file
-added in remote
-  their  100644 1a0a7e6a61a9f837f2e4d3eb07b3ab716f7fd060 extensions/git-extended/resources/icons/comment.svg
-@@ -0,0 +1,9 @@
-+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-+	 viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
-+<path fill="#C5C5C5" class="st0" d="M13.3,2H2.7C2.2,2,1.8,2.4,1.8,2.9V10c0,0.4,0.4,0.9,0.9,0.9h1.8V14l3.1-3.1h5.8c0.4,0,0.9-0.4,0.9-0.9V2.9
-+	C14.2,2.4,13.9,2,13.3,2z M9.2,9.7C9,9.7,8.9,9.6,8.9,9.6s0-0.5,0-1C8.9,8.2,8.8,8,8.6,8c0.8-0.1,1.6-0.4,1.6-1.8
-+	c0-0.4-0.2-0.7-0.4-1c0-0.1,0.2-0.4,0-1c0,0-0.3-0.1-1,0.4C8.6,4.6,8.3,4.5,8,4.5c-0.3,0-0.6,0-0.9,0.1c-0.7-0.4-1-0.3-1-0.3
-+	C6,4.8,6,5.2,6.1,5.3C5.9,5.5,5.7,5.8,5.7,6.2c0,1.3,0.8,1.7,1.6,1.8c0,0.1-0.1,0.2-0.2,0.4c-0.2,0.1-0.7,0.3-1-0.3
-+	c0,0-0.2-0.4-0.5-0.4c0,0-0.4,0,0,0.2C5.6,8,5.9,8,6,8.5c0,0,0.2,0.7,1.2,0.4c0,0.3,0,0.5,0,0.6c0,0.1-0.1,0.2-0.3,0.2
-+	C5.4,9.3,4.4,8,4.4,6.4c0-2,1.6-3.6,3.6-3.6s3.6,1.6,3.6,3.6C11.6,8,10.6,9.3,9.2,9.7z"/>
-+</svg>
-added in remote
-  their  100644 c0acf6cdd360cbccac4a153d6636dfba78351c9f extensions/git-extended/resources/icons/dark/book.svg
-@@ -0,0 +1 @@
-+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path style="fill:#FFFFFF;" fill-rule="evenodd" d="M3 5h4v1H3V5zm0 3h4V7H3v1zm0 2h4V9H3v1zm11-5h-4v1h4V5zm0 2h-4v1h4V7zm0 2h-4v1h4V9zm2-6v9c0 .55-.45 1-1 1H9.5l-1 1-1-1H2c-.55 0-1-.45-1-1V3c0-.55.45-1 1-1h5.5l1 1 1-1H15c.55 0 1 .45 1 1zm-8 .5L7.5 3H2v9h6V3.5zm7-.5H9.5l-.5.5V12h6V3z"></path></svg>
-\ No newline at end of file
-added in remote
-  their  100644 c225b2f597f343c63e6817ab7a44c987a7106c98 extensions/git-extended/resources/icons/dark/check.svg
-@@ -0,0 +1 @@
-+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="-2 -2 16 16" enable-background="new -2 -2 16 16"><polygon fill="#C5C5C5" points="9,0 4.5,9 3,6 0,6 3,12 6,12 12,0"/></svg>
-\ No newline at end of file
-added in remote
-  their  100644 9f1756333891d95aeda2374d484d11fdc9e5fd6b extensions/git-extended/resources/icons/dark/clean.svg
-@@ -0,0 +1 @@
-+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="-0.994 0 16 16" enable-background="new -0.994 0 16 16"><path fill="#C5C5C5" d="M13 6c0 1.461-.636 2.846-1.746 3.797l-5.584 4.951-1.324-1.496 5.595-4.962c.678-.582 1.061-1.413 1.061-2.29 0-1.654-1.345-3-2.997-3-.71 0-1.399.253-1.938.713l-1.521 1.287h2.448l-1.998 2h-3.996v-4l1.998-2v2.692l1.775-1.504c.899-.766 2.047-1.188 3.232-1.188 2.754 0 4.995 2.243 4.995 5z"/></svg>
-\ No newline at end of file
-added in remote
-  their  100644 63f17cd44d3b9376ea921e354e4e001459b9f2d6 extensions/git-extended/resources/icons/dark/fold.svg
-@@ -0,0 +1 @@
-+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M7 9l3 3H8v3H6v-3H4l3-3zm3-6H8V0H6v3H4l3 3 3-3zm4 2c0-.55-.45-1-1-1h-2.5l-1 1h3l-2 2h-7l-2-2h3l-1-1H1c-.55 0-1 .45-1 1l2.5 2.5L0 10c0 .55.45 1 1 1h2.5l1-1h-3l2-2h7l2 2h-3l1 1H13c.55 0 1-.45 1-1l-2.5-2.5L14 5z"></path></svg>
-\ No newline at end of file
-added in remote
-  their  100644 c08b1c2e403058d58e9871d881e336bbaf500b46 extensions/git-extended/resources/icons/dark/git.svg
-@@ -0,0 +1 @@
-+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path d="M27.459 14.902l-10.439-10.439c-.296-.294-.672-.452-1.089-.452-.417 0-.793.157-1.089.452l-2.248 2.247 2.549 2.549c.249-.112.522-.177.813-.177 1.106 0 2.002.896 2.002 2.002 0 .291-.064.565-.176.814l2.311 2.336c.25-.111.633-.234.923-.234 1.106 0 2 .911 2 2.016s-.894 1.969-2 1.969c-1.105-.001-2.016-.751-2.016-1.985 0-.28.016-.462.119-.704l-2.373-2.374-.023.007v6.274c.747.295 1.277 1.026 1.277 1.875 0 1.105-.878 2.016-1.984 2.016-1.104 0-2.031-.926-2.031-2.031 0-.846.535-1.564 1.28-1.857l.001-6.25c-.762-.282-1.309-1.009-1.309-1.871 0-.28.059-.546.162-.788l-2.555-2.557-7.115 7.114c-.599.601-.601 1.576.001 2.178l10.44 10.518c.296.295.671.45 1.089.45.415 0 .796-.159 1.089-.45l10.391-10.471c.601-.599.599-1.576 0-2.177z" fill="#fff"/></svg>
-\ No newline at end of file
-added in remote
-  their  100644 c951728abac47b5979fdc6a3bd52889a71e6dc08 extensions/git-extended/resources/icons/dark/open-change.svg
-@@ -0,0 +1 @@
-+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#C5C5C5" d="M15 4v6h-2.276c.113-.318.187-.653.226-1h1.05v-5h-2v-2h-4v2.051c-.347.038-.681.112-1 .225v-3.276h5l3 3zm-7 8.949v1.051h-6v-7h2.276c.126-.354.28-.693.485-1h-3.761v9h8v-2.051c-.166.02-.329.051-.5.051l-.5-.051z"/><path fill="#75BEFF" d="M12 8.5c0-1.933-1.567-3.5-3.5-3.5s-3.5 1.567-3.5 3.5 1.567 3.5 3.5 3.5c.711 0 1.369-.215 1.922-.578l3.578 3.578 1-1-3.578-3.578c.363-.553.578-1.211.578-1.922zm-3.5 2.5c-1.381 0-2.5-1.119-2.5-2.5s1.119-2.5 2.5-2.5 2.5 1.119 2.5 2.5-1.119 2.5-2.5 2.5z"/></svg>
-\ No newline at end of file
-added in remote
-  their  100644 f6302185aa4b39012a35d7ff5336b350d5801582 extensions/git-extended/resources/icons/dark/open-file.svg
-@@ -0,0 +1 @@
-+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><polygon fill="#C5C5C5" points="10,2 7.414,2 8.414,3 9,3 9,3.586 9,4 9,4.414 9,6 12,6 12,13 4,13 4,8 3,8 3,14 13,14 13,5"/><polygon fill="#75BEFF" points="5,1 3,1 5,3 1,3 1,5 5,5 3,7 5,7 8,4"/></svg>
-\ No newline at end of file
-added in remote
-  their  100644 d79fdaa4e8e4d285ab006f3c4d9612a2c7a52100 extensions/git-extended/resources/icons/dark/refresh.svg
-@@ -0,0 +1 @@
-+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M13.451 5.609l-.579-.939-1.068.812-.076.094c-.335.415-.927 1.341-1.124 2.876l-.021.165.033.163.071.345c0 1.654-1.346 3-3 3-.795 0-1.545-.311-2.107-.868-.563-.567-.873-1.317-.873-2.111 0-1.431 1.007-2.632 2.351-2.929v2.926s2.528-2.087 2.984-2.461h.012l3.061-2.582-4.919-4.1h-1.137v2.404c-3.429.318-6.121 3.211-6.121 6.721 0 1.809.707 3.508 1.986 4.782 1.277 1.282 2.976 1.988 4.784 1.988 3.722 0 6.75-3.028 6.75-6.75 0-1.245-.349-2.468-1.007-3.536z" fill="#2D2D30"/><path d="M12.6 6.134l-.094.071c-.269.333-.746 1.096-.91 2.375.057.277.092.495.092.545 0 2.206-1.794 4-4 4-1.098 0-2.093-.445-2.817-1.164-.718-.724-1.163-1.718-1.163-2.815 0-2.206 1.794-4 4-4l.351.025v1.85s1.626-1.342 1.631-1.339l1.869-1.577-3.5-2.917v2.218l-.371-.03c-3.176 0-5.75 2.574-5.75 5.75 0 1.593.648 3.034 1.695 4.076 1.042 1.046 2.482 1.694 4.076 1.694 3.176 0 5.75-2.574 5.75-5.75-.001-1.106-.318-2.135-.859-3.012z" fill="#C5C5C5"/></svg>
-\ No newline at end of file
-added in remote
-  their  100644 3475c1e1963edde993fa947f11581820cc1d9aca extensions/git-extended/resources/icons/dark/stage.svg
-@@ -0,0 +1 @@
-+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg"><title>Layer 1</title><rect height="11" width="3" y="3" x="7" fill="#C5C5C5"/><rect height="3" width="11" y="7" x="3" fill="#C5C5C5"/></svg>
-\ No newline at end of file
-added in remote
-  their  100644 cdc40f45f1630c11f44bdac213d326c853818711 extensions/git-extended/resources/icons/dark/status-added.svg
-@@ -0,0 +1,6 @@
-+<svg width="14px" height="14px" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
-+  <rect fill="#3c8746" x="0" y="0" width="100" height="100" rx="35" ry="35"/>
-+  <text x="50" y="75" font-size="75" text-anchor="middle" style="font-family: Menlo, Monaco, Consolas, &quot;Droid Sans Mono&quot;, &quot;Inconsolata&quot;, &quot;Courier New&quot;, monospace, &quot;Droid Sans Fallback&quot;;" fill="white">
-+    A
-+  </text>
-+</svg>
-\ No newline at end of file
-added in remote
-  their  100644 53b243c8b9fdf9370ac8f392a8e37ac57b37df05 extensions/git-extended/resources/icons/dark/status-conflict.svg
-@@ -0,0 +1,6 @@
-+<svg width="14px" height="14px" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
-+  <rect fill="#7F4E7E" x="0" y="0" width="100" height="100" rx="35" ry="35"/>
-+  <text x="50" y="75" font-size="75" text-anchor="middle" style="font-family: Menlo, Monaco, Consolas, &quot;Droid Sans Mono&quot;, &quot;Inconsolata&quot;, &quot;Courier New&quot;, monospace, &quot;Droid Sans Fallback&quot;;" fill="white">
-+    C
-+  </text>
-+</svg>
-\ No newline at end of file
-added in remote
-  their  100644 7bd78c9427e196a408fbe14c0bd415adb5c0938b extensions/git-extended/resources/icons/dark/status-copied.svg
-@@ -0,0 +1,6 @@
-+<svg width="14px" height="14px" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
-+  <rect fill="#692C77" x="0" y="0" width="100" height="100" rx="35" ry="35"/>
-+  <text x="50" y="75" font-size="75" text-anchor="middle" style="font-family: Menlo, Monaco, Consolas, &quot;Droid Sans Mono&quot;, &quot;Inconsolata&quot;, &quot;Courier New&quot;, monospace, &quot;Droid Sans Fallback&quot;;" fill="white">
-+    C
-+  </text>
-+</svg>
-\ No newline at end of file
-added in remote
-  their  100644 e7596e2e2adb2336f7407aaae4e9a66aeb6e7dd8 extensions/git-extended/resources/icons/dark/status-deleted.svg
-@@ -0,0 +1,6 @@
-+<svg width="14px" height="14px" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
-+  <rect fill="#9E121D" x="0" y="0" width="100" height="100" rx="35" ry="35"/>
-+  <text x="50" y="75" font-size="75" text-anchor="middle" style="font-family: Menlo, Monaco, Consolas, &quot;Droid Sans Mono&quot;, &quot;Inconsolata&quot;, &quot;Courier New&quot;, monospace, &quot;Droid Sans Fallback&quot;;" fill="white">
-+    D
-+  </text>
-+</svg>
-\ No newline at end of file
-added in remote
-  their  100644 85abc367a29112eb0ef4470174d28076553857a0 extensions/git-extended/resources/icons/dark/status-ignored.svg
-@@ -0,0 +1,6 @@
-+<svg width="14px" height="14px" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
-+  <rect fill="#969696" x="0" y="0" width="100" height="100" rx="35" ry="35"/>
-+  <text x="50" y="75" font-size="75" text-anchor="middle" style="font-family: Menlo, Monaco, Consolas, &quot;Droid Sans Mono&quot;, &quot;Inconsolata&quot;, &quot;Courier New&quot;, monospace, &quot;Droid Sans Fallback&quot;;" fill="white">
-+    I
-+  </text>
-+</svg>
-\ No newline at end of file
-added in remote
-  their  100644 d0de37d34688b72ca35ab34ee9371763a54c283c extensions/git-extended/resources/icons/dark/status-modified.svg
-@@ -0,0 +1,6 @@
-+<svg width="14px" height="14px" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
-+  <rect fill="#1B80B2" x="0" y="0" width="100" height="100" rx="35" ry="35"/>
-+  <text x="50" y="75" font-size="75" text-anchor="middle" style="font-family: Menlo, Monaco, Consolas, &quot;Droid Sans Mono&quot;, &quot;Inconsolata&quot;, &quot;Courier New&quot;, monospace, &quot;Droid Sans Fallback&quot;;" fill="white">
-+    M
-+  </text>
-+</svg>
-\ No newline at end of file
-added in remote
-  their  100644 a77fb41179a10a5316dcc70b33453775a8bed92c extensions/git-extended/resources/icons/dark/status-renamed.svg
-@@ -0,0 +1,6 @@
-+<svg width="14px" height="14px" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
-+  <rect fill="#CC6633" x="0" y="0" width="100" height="100" rx="35" ry="35"/>
-+  <text x="50" y="75" font-size="75" text-anchor="middle" style="font-family: Menlo, Monaco, Consolas, &quot;Droid Sans Mono&quot;, &quot;Inconsolata&quot;, &quot;Courier New&quot;, monospace, &quot;Droid Sans Fallback&quot;;" fill="white">
-+    R
-+  </text>
-+</svg>
-\ No newline at end of file
-added in remote
-  their  100644 c6a48e14f0862eda35f1beee30aad6898b29accc extensions/git-extended/resources/icons/dark/status-untracked.svg
-@@ -0,0 +1,6 @@
-+<svg width="14px" height="14px" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
-+  <rect fill="#6C6C6C" x="0" y="0" width="100" height="100" rx="35" ry="35"/>
-+  <text x="50" y="75" font-size="75" text-anchor="middle" style="font-family: Menlo, Monaco, Consolas, &quot;Droid Sans Mono&quot;, &quot;Inconsolata&quot;, &quot;Courier New&quot;, monospace, &quot;Droid Sans Fallback&quot;;" fill="white">
-+    U
-+  </text>
-+</svg>
-\ No newline at end of file
-added in remote
-  their  100644 2de46fcf5b506d1405ff730264523d1ce1c7b521 extensions/git-extended/resources/icons/dark/unstage.svg
-@@ -0,0 +1 @@
-+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg"><title>Layer 1</title><rect height="3" width="11" y="7" x="3" fill="#C5C5C5"/></svg>
-\ No newline at end of file
-added in remote
-  their  100644 bc97987a95ca3a4eef2f2b85239164b26acc701c extensions/git-extended/resources/icons/light/book.svg
-@@ -0,0 +1 @@
-+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M3 5h4v1H3V5zm0 3h4V7H3v1zm0 2h4V9H3v1zm11-5h-4v1h4V5zm0 2h-4v1h4V7zm0 2h-4v1h4V9zm2-6v9c0 .55-.45 1-1 1H9.5l-1 1-1-1H2c-.55 0-1-.45-1-1V3c0-.55.45-1 1-1h5.5l1 1 1-1H15c.55 0 1 .45 1 1zm-8 .5L7.5 3H2v9h6V3.5zm7-.5H9.5l-.5.5V12h6V3z"></path></svg>
-\ No newline at end of file
-added in remote
-  their  100644 d45df06edf8100df8309b86611114779c61b09e7 extensions/git-extended/resources/icons/light/check.svg
-@@ -0,0 +1 @@
-+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><polygon points="5.382,13 2.382,7 6.618,7 7,7.764 9.382,3 13.618,3 8.618,13" fill="#F6F6F6"/><path d="M12 4l-4 8h-2l-2-4h2l1 2 3-6h2z" fill="#424242"/></svg>
-\ No newline at end of file
-added in remote
-  their  100644 1fa6ba48a19e6d113ced3cf61983286806b4ea0a extensions/git-extended/resources/icons/light/clean.svg
-@@ -0,0 +1 @@
-+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="-0.994 0 16 16" enable-background="new -0.994 0 16 16"><path fill="#424242" d="M13 6c0 1.461-.636 2.846-1.746 3.797l-5.584 4.951-1.324-1.496 5.595-4.962c.678-.582 1.061-1.413 1.061-2.29 0-1.654-1.345-3-2.997-3-.71 0-1.399.253-1.938.713l-1.521 1.287h2.448l-1.998 2h-3.996v-4l1.998-2v2.692l1.775-1.504c.899-.766 2.047-1.188 3.232-1.188 2.754 0 4.995 2.243 4.995 5z"/></svg>
-\ No newline at end of file
-added in remote
-  their  100644 63f17cd44d3b9376ea921e354e4e001459b9f2d6 extensions/git-extended/resources/icons/light/fold.svg
-@@ -0,0 +1 @@
-+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M7 9l3 3H8v3H6v-3H4l3-3zm3-6H8V0H6v3H4l3 3 3-3zm4 2c0-.55-.45-1-1-1h-2.5l-1 1h3l-2 2h-7l-2-2h3l-1-1H1c-.55 0-1 .45-1 1l2.5 2.5L0 10c0 .55.45 1 1 1h2.5l1-1h-3l2-2h7l2 2h-3l1 1H13c.55 0 1-.45 1-1l-2.5-2.5L14 5z"></path></svg>
-\ No newline at end of file
-added in remote
-  their  100644 d1049a44d0d3e7997394e0c184f0b6237de1739e extensions/git-extended/resources/icons/light/git.svg
-@@ -0,0 +1 @@
-+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><defs><clipPath><path d="M.06 91.886h91.828v-91.886h-91.828v91.886z"/></clipPath><clipPath id="a"><path d="M0 0h92v92h-92v-92z"/></clipPath></defs><path d="M28.497 14.84l-11.354-11.353c-.653-.654-1.714-.654-2.368 0l-2.357 2.358 2.99 2.991c.695-.235 1.492-.077 2.046.477.557.558.713 1.361.473 2.059l2.882 2.882c.698-.241 1.502-.085 2.059.473.778.778.778 2.039 0 2.818-.779.779-2.04.779-2.819 0-.586-.586-.73-1.446-.434-2.167l-2.688-2.688v7.074c.19.094.369.219.527.377.778.778.778 2.039 0 2.819-.778.778-2.04.778-2.818 0-.778-.779-.778-2.04 0-2.819.192-.192.415-.338.653-.435v-7.14c-.237-.097-.46-.241-.653-.435-.589-.589-.731-1.455-.429-2.179l-2.948-2.949-7.785 7.785c-.654.655-.654 1.715 0 2.369l11.354 11.353c.654.654 1.714.654 2.369 0l11.3-11.301c.654-.654.654-1.715 0-2.369" fill="#424242" clip-path="url(#a)"/></svg>
-\ No newline at end of file
-added in remote
-  their  100644 3a205509bca81587f53a82b15afdae8109c4ab8e extensions/git-extended/resources/icons/light/open-change.svg
-@@ -0,0 +1 @@
-+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#656565" d="M15 4v6h-2.276c.113-.318.187-.653.226-1h1.05v-5h-2v-2h-4v2.051c-.347.038-.681.112-1 .225v-3.276h5l3 3zm-7 8.949v1.051h-6v-7h2.276c.126-.354.28-.693.485-1h-3.761v9h8v-2.051c-.166.02-.329.051-.5.051l-.5-.051z"/><path fill="#00539C" d="M12 8.5c0-1.933-1.567-3.5-3.5-3.5s-3.5 1.567-3.5 3.5 1.567 3.5 3.5 3.5c.711 0 1.369-.215 1.922-.578l3.578 3.578 1-1-3.578-3.578c.363-.553.578-1.211.578-1.922zm-3.5 2.5c-1.381 0-2.5-1.119-2.5-2.5s1.119-2.5 2.5-2.5 2.5 1.119 2.5 2.5-1.119 2.5-2.5 2.5z"/></svg>
-\ No newline at end of file
-added in remote
-  their  100644 fccdf83d467613d6aebe5786d4f617b53a81e33b extensions/git-extended/resources/icons/light/open-file.svg
-@@ -0,0 +1,3 @@
-+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-+]><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><polygon fill="#656565" points="10,2 7.414,2 8.414,3 9,3 9,3.586 9,4 9,4.414 9,6 12,6 12,13 4,13 4,8 3,8 3,14 13,14 13,5"/><polygon fill="#00539C" points="5,1 3,1 5,3 1,3 1,5 5,5 3,7 5,7 8,4"/></svg>
-\ No newline at end of file
-added in remote
-  their  100644 e0345748192eeb97633b33feb5cd8997a98c9edc extensions/git-extended/resources/icons/light/refresh.svg
-@@ -0,0 +1 @@
-+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M13.451 5.609l-.579-.939-1.068.812-.076.094c-.335.415-.927 1.341-1.124 2.876l-.021.165.033.163.071.345c0 1.654-1.346 3-3 3-.795 0-1.545-.311-2.107-.868-.563-.567-.873-1.317-.873-2.111 0-1.431 1.007-2.632 2.351-2.929v2.926s2.528-2.087 2.984-2.461h.012l3.061-2.582-4.919-4.1h-1.137v2.404c-3.429.318-6.121 3.211-6.121 6.721 0 1.809.707 3.508 1.986 4.782 1.277 1.282 2.976 1.988 4.784 1.988 3.722 0 6.75-3.028 6.75-6.75 0-1.245-.349-2.468-1.007-3.536z" fill="#F6F6F6"/><path d="M12.6 6.134l-.094.071c-.269.333-.746 1.096-.91 2.375.057.277.092.495.092.545 0 2.206-1.794 4-4 4-1.098 0-2.093-.445-2.817-1.164-.718-.724-1.163-1.718-1.163-2.815 0-2.206 1.794-4 4-4l.351.025v1.85s1.626-1.342 1.631-1.339l1.869-1.577-3.5-2.917v2.218l-.371-.03c-3.176 0-5.75 2.574-5.75 5.75 0 1.593.648 3.034 1.695 4.076 1.042 1.046 2.482 1.694 4.076 1.694 3.176 0 5.75-2.574 5.75-5.75-.001-1.106-.318-2.135-.859-3.012z" fill="#424242"/></svg>
-\ No newline at end of file
-added in remote
-  their  100644 bdecdb0e45bfbc83f69fe22de4c0d98fc1889d80 extensions/git-extended/resources/icons/light/stage.svg
-@@ -0,0 +1 @@
-+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg"><title>Layer 1</title><rect height="11" width="3" y="3" x="7" fill="#424242"/><rect height="3" width="11" y="7" x="3" fill="#424242"/></svg>
-\ No newline at end of file
-added in remote
-  their  100644 587fc08f5f50f5070c5e469931fa62e9d6ee5dc9 extensions/git-extended/resources/icons/light/status-added.svg
-@@ -0,0 +1,6 @@
-+<svg width="14px" height="14px" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
-+  <rect fill="#2d883e" x="0" y="0" width="100" height="100" rx="35" ry="35"/>
-+  <text x="50" y="75" font-size="75" text-anchor="middle" style="font-family: Menlo, Monaco, Consolas, &quot;Droid Sans Mono&quot;, &quot;Inconsolata&quot;, &quot;Courier New&quot;, monospace, &quot;Droid Sans Fallback&quot;;" fill="white">
-+    A
-+  </text>
-+</svg>
-\ No newline at end of file
-added in remote
-  their  100644 b6088ecd0837e42ef364d4bbe4a8090c5683ab48 extensions/git-extended/resources/icons/light/status-conflict.svg
-@@ -0,0 +1,6 @@
-+<svg width="14px" height="14px" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
-+  <rect fill="#9B4F96" x="0" y="0" width="100" height="100" rx="35" ry="35"/>
-+  <text x="50" y="75" font-size="75" text-anchor="middle" style="font-family: Menlo, Monaco, Consolas, &quot;Droid Sans Mono&quot;, &quot;Inconsolata&quot;, &quot;Courier New&quot;, monospace, &quot;Droid Sans Fallback&quot;;" fill="white">
-+    C
-+  </text>
-+</svg>
-\ No newline at end of file
-added in remote
-  their  100644 151fdb2cdbe529485ba2bccf997b86f202fb360a extensions/git-extended/resources/icons/light/status-copied.svg
-@@ -0,0 +1,6 @@
-+<svg width="14px" height="14px" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
-+  <rect fill="#682079" x="0" y="0" width="100" height="100" rx="35" ry="35"/>
-+  <text x="50" y="75" font-size="75" text-anchor="middle" style="font-family: Menlo, Monaco, Consolas, &quot;Droid Sans Mono&quot;, &quot;Inconsolata&quot;, &quot;Courier New&quot;, monospace, &quot;Droid Sans Fallback&quot;;" fill="white">
-+    C
-+  </text>
-+</svg>
-\ No newline at end of file
-added in remote
-  their  100644 7ed166accfe05f18fda8e48a5c3e9f9381eb5284 extensions/git-extended/resources/icons/light/status-deleted.svg
-@@ -0,0 +1,6 @@
-+<svg width="14px" height="14px" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
-+  <rect fill="#B9131A" x="0" y="0" width="100" height="100" rx="35" ry="35"/>
-+  <text x="50" y="75" font-size="75" text-anchor="middle" style="font-family: Menlo, Monaco, Consolas, &quot;Droid Sans Mono&quot;, &quot;Inconsolata&quot;, &quot;Courier New&quot;, monospace, &quot;Droid Sans Fallback&quot;;" fill="white">
-+    D
-+  </text>
-+</svg>
-\ No newline at end of file
-added in remote
-  their  100644 85abc367a29112eb0ef4470174d28076553857a0 extensions/git-extended/resources/icons/light/status-ignored.svg
-@@ -0,0 +1,6 @@
-+<svg width="14px" height="14px" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
-+  <rect fill="#969696" x="0" y="0" width="100" height="100" rx="35" ry="35"/>
-+  <text x="50" y="75" font-size="75" text-anchor="middle" style="font-family: Menlo, Monaco, Consolas, &quot;Droid Sans Mono&quot;, &quot;Inconsolata&quot;, &quot;Courier New&quot;, monospace, &quot;Droid Sans Fallback&quot;;" fill="white">
-+    I
-+  </text>
-+</svg>
-\ No newline at end of file
-added in remote
-  their  100644 ff338b814106fba31512b780797c897bc940b5e6 extensions/git-extended/resources/icons/light/status-modified.svg
-@@ -0,0 +1,6 @@
-+<svg width="14px" height="14px" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
-+  <rect fill="#007ACC" x="0" y="0" width="100" height="100" rx="35" ry="35"/>
-+  <text x="50" y="75" font-size="75" text-anchor="middle" style="font-family: Menlo, Monaco, Consolas, &quot;Droid Sans Mono&quot;, &quot;Inconsolata&quot;, &quot;Courier New&quot;, monospace, &quot;Droid Sans Fallback&quot;;" fill="white">
-+    M
-+  </text>
-+</svg>
-\ No newline at end of file
-added in remote
-  their  100644 a77fb41179a10a5316dcc70b33453775a8bed92c extensions/git-extended/resources/icons/light/status-renamed.svg
-@@ -0,0 +1,6 @@
-+<svg width="14px" height="14px" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
-+  <rect fill="#CC6633" x="0" y="0" width="100" height="100" rx="35" ry="35"/>
-+  <text x="50" y="75" font-size="75" text-anchor="middle" style="font-family: Menlo, Monaco, Consolas, &quot;Droid Sans Mono&quot;, &quot;Inconsolata&quot;, &quot;Courier New&quot;, monospace, &quot;Droid Sans Fallback&quot;;" fill="white">
-+    R
-+  </text>
-+</svg>
-\ No newline at end of file
-added in remote
-  their  100644 c6a48e14f0862eda35f1beee30aad6898b29accc extensions/git-extended/resources/icons/light/status-untracked.svg
-@@ -0,0 +1,6 @@
-+<svg width="14px" height="14px" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
-+  <rect fill="#6C6C6C" x="0" y="0" width="100" height="100" rx="35" ry="35"/>
-+  <text x="50" y="75" font-size="75" text-anchor="middle" style="font-family: Menlo, Monaco, Consolas, &quot;Droid Sans Mono&quot;, &quot;Inconsolata&quot;, &quot;Courier New&quot;, monospace, &quot;Droid Sans Fallback&quot;;" fill="white">
-+    U
-+  </text>
-+</svg>
-\ No newline at end of file
-added in remote
-  their  100644 f5d128b2df8c1a0062f188d039c061a9f9d30783 extensions/git-extended/resources/icons/light/unstage.svg
-@@ -0,0 +1 @@
-+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg"><title>Layer 1</title><rect height="3" width="11" y="7" x="3" fill="#424242"/></svg>
-\ No newline at end of file
-added in remote
-  their  100644 849e857eb9bdd466f3ae03df68eaa13806068123 extensions/git-extended/resources/icons/unchecked_checkbox.png
-@@ -0,0 +1,4 @@
-+�PNG
-+
-++}b
-\ No newline at end of file
-added in remote
-  their  100644 89aca6ec81012979889f34e812128beab134c882 extensions/git-extended/src/commands.ts
-@@ -0,0 +1,69 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+'use strict';
-+
-+import * as vscode from 'vscode';
-+import { PullRequestModel } from './models/pullRequestModel';
-+import { ReviewManager } from './review/reviewManager';
-+import { PullRequestOverviewPanel } from './common/pullRequestOverview';
-+import { fromGitUri } from './common/uri';
-+import { PRFileChangeNode } from './tree/prFileChangeNode';
-+import { PRNode } from './tree/prNode';
-+
-+export function registerCommands(context: vscode.ExtensionContext) {
-+	// initialize resources
-+	context.subscriptions.push(vscode.commands.registerCommand('pr.openInGitHub', (e: PRNode | PRFileChangeNode) => {
-+		if (!e) {
-+			if (ReviewManager.instance.currentPullRequest) {
-+				vscode.commands.executeCommand('vscode.open', vscode.Uri.parse(ReviewManager.instance.currentPullRequest.html_url));
-+			}
-+			return;
-+		}
-+		if (e instanceof PRNode) {
-+			vscode.commands.executeCommand('vscode.open', vscode.Uri.parse(e.element.html_url));
-+		} else {
-+			vscode.commands.executeCommand('vscode.open', vscode.Uri.parse(e.blobUrl));
-+		}
-+	}));
-+
-+	context.subscriptions.push(vscode.commands.registerCommand('pr.pick', async (pr: PRNode) => {
-+		vscode.window.withProgress({
-+			location: vscode.ProgressLocation.SourceControl,
-+			title: `Switching to Pull Request #${pr.element.prNumber}`,
-+		}, async (progress, token) => {
-+			await ReviewManager.instance.switch(pr.element);
-+		});
-+	}));
-+
-+	context.subscriptions.push(vscode.commands.registerCommand('pr.close', async (pr: PRNode) => {
-+		vscode.window.showWarningMessage(`Are you sure you want to close PR`, 'Yes', 'No').then(async value => {
-+			if (value === 'Yes') {
-+				let newPR = await pr.element.close();
-+				return newPR;
-+			}
-+
-+			return null;
-+		});
-+	}));
-+
-+	context.subscriptions.push(vscode.commands.registerCommand('pr.openDescription', async (pr: PullRequestModel) => {
-+		// Create and show a new webview
-+		PullRequestOverviewPanel.createOrShow(context.extensionPath, pr);
-+	}));
-+
-+	context.subscriptions.push(vscode.commands.registerCommand('pr.viewChanges', async (fileChange: PRFileChangeNode) => {
-+		// Show the file change in a diff view.
-+		let { path, ref, commit } = fromGitUri(fileChange.filePath);
-+		let previousCommit = `${commit}^`;
-+		let previousFileUri = fileChange.filePath.with({
-+			query: JSON.stringify({
-+				path: path,
-+				ref: ref,
-+				commit: previousCommit
-+			})
-+		});
-+		return vscode.commands.executeCommand('vscode.diff', previousFileUri, fileChange.filePath, `${fileChange.fileName} from ${commit.substr(0, 8)}`);
-+	}));
-+}
-added in remote
-  their  100644 2f819b68c910dc11be885f4fc8304b0a01719c9e extensions/git-extended/src/common/comment.ts
-@@ -0,0 +1,25 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+import { Comment } from '../models/comment';
-+import { parseDiffHunk } from './diff';
-+
-+export function parseComments(comments: any[]): Comment[] {
-+	for (let i = 0; i < comments.length; i++) {
-+		let diffHunks = [];
-+		let diffHunkReader = parseDiffHunk(comments[i].diff_hunk);
-+		let diffHunkIter = diffHunkReader.next();
-+
-+		while (!diffHunkIter.done) {
-+			let diffHunk = diffHunkIter.value;
-+			diffHunks.push(diffHunk);
-+			diffHunkIter = diffHunkReader.next();
-+		}
-+
-+		comments[i].diff_hunks = diffHunks;
-+	}
-+
-+	return comments;
-+}
-\ No newline at end of file
-added in remote
-  their  100644 a42a101622ad8f29f16bf7354162d00d54a8a80d extensions/git-extended/src/common/diff.ts
-@@ -0,0 +1,263 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+import * as path from 'path';
-+import { getFileContent, writeTmpFile } from './file';
-+import { GitChangeType, RichFileChange } from '../models/file';
-+import { Repository } from '../models/repository';
-+import { DiffHunk, getDiffChangeType, DiffLine, DiffChangeType } from '../models/diffHunk';
-+
-+export const DIFF_HUNK_HEADER = /@@ \-(\d+)(,(\d+))?( \+(\d+)(,(\d+)?))? @@/;
-+
-+export function countCarriageReturns(text: string): number {
-+	let count = 0;
-+	let index = 0;
-+	while ((index = text.indexOf('\r', index)) !== -1) {
-+		index++;
-+		count++;
-+	}
-+
-+	return count;
-+}
-+
-+export function* LineReader(text: string): IterableIterator<string> {
-+	let index = 0;
-+
-+	while (index !== -1 && index < text.length) {
-+		let startIndex = index;
-+		index = text.indexOf('\n', index);
-+		let endIndex = index !== -1 ? index : text.length;
-+		let length = endIndex - startIndex;
-+
-+		if (index !== -1) {
-+			if (index > 0 && text[index - 1] === '\r') {
-+				length--;
-+			}
-+
-+			index++;
-+		}
-+
-+		yield text.substr(startIndex, length);
-+	}
-+}
-+
-+export function* parseDiffHunk(diffHunkPatch: string): IterableIterator<DiffHunk> {
-+	let lineReader = LineReader(diffHunkPatch);
-+
-+	let itr = lineReader.next();
-+	let diffHunk: DiffHunk = null;
-+	let positionInHunk = -1;
-+	let oldLine = -1;
-+	let newLine = -1;
-+
-+	while (!itr.done) {
-+		const line = itr.value;
-+		if (DIFF_HUNK_HEADER.test(line)) {
-+			if (diffHunk) {
-+				yield diffHunk;
-+				diffHunk = null;
-+			}
-+
-+			if (positionInHunk === -1) {
-+				positionInHunk = 0;
-+			}
-+
-+			const matches = DIFF_HUNK_HEADER.exec(line);
-+			const oriStartLine = oldLine = Number(matches[1]);
-+			const oriLen = Number(matches[3]) | 0;
-+			const newStartLine = newLine = Number(matches[5]);
-+			const newLen = Number(matches[7]) | 0;
-+
-+			diffHunk = new DiffHunk(oriStartLine, oriLen, newStartLine, newLen, positionInHunk);
-+			diffHunk.diffLines.push(new DiffLine(DiffChangeType.Control, oriStartLine, newStartLine, positionInHunk, line));
-+		} else if (diffHunk !== null) {
-+			let type = getDiffChangeType(line);
-+
-+			if (type === DiffChangeType.Control) {
-+				if (diffHunk.diffLines && diffHunk.diffLines.length) {
-+					diffHunk.diffLines[diffHunk.diffLines.length - 1].endwithLineBreak = false;
-+				}
-+			} else {
-+				diffHunk.diffLines.push(new DiffLine(type, type !== DiffChangeType.Add ? oldLine : -1,
-+					type !== DiffChangeType.Delete ? newLine : -1,
-+					positionInHunk,
-+					line
-+				));
-+
-+				let lineCount = 1 + countCarriageReturns(line);
-+
-+				switch (type) {
-+					case DiffChangeType.Context:
-+						oldLine += lineCount;
-+						newLine += lineCount;
-+						break;
-+					case DiffChangeType.Delete:
-+						oldLine += lineCount;
-+						break;
-+					case DiffChangeType.Add:
-+						newLine += lineCount;
-+						break;
-+				}
-+			}
-+		}
-+
-+		if (positionInHunk !== -1) {
-+			++positionInHunk;
-+		}
-+		itr = lineReader.next();
-+	}
-+
-+	if (diffHunk) {
-+		yield diffHunk;
-+	}
-+}
-+
-+async function parseModifiedHunkComplete(originalContent, patch, a, b) {
-+	let left = originalContent.split(/\r|\n|\r\n/);
-+	let diffHunkReader = parseDiffHunk(patch);
-+	let diffHunkIter = diffHunkReader.next();
-+	let diffHunks = [];
-+
-+	let right = [];
-+	let lastCommonLine = 0;
-+	while (!diffHunkIter.done) {
-+		let diffHunk = diffHunkIter.value;
-+		diffHunks.push(diffHunk);
-+
-+		let oriStartLine = diffHunk.oldLineNumber;
-+
-+		for (let j = lastCommonLine + 1; j < oriStartLine; j++) {
-+			right.push(left[j - 1]);
-+		}
-+
-+		lastCommonLine = oriStartLine + diffHunk.oldLength - 1;
-+
-+		for (let j = 0; j < diffHunk.diffLines.length; j++) {
-+			let diffLine = diffHunk.diffLines[j];
-+			if (diffLine.type === DiffChangeType.Delete || diffLine.type === DiffChangeType.Control) {
-+			} else if (diffLine.type === DiffChangeType.Add) {
-+				right.push(diffLine.text);
-+			} else {
-+				let codeInFirstLine = diffLine.text;
-+				right.push(codeInFirstLine);
-+			}
-+		}
-+
-+		diffHunkIter = diffHunkReader.next();
-+	}
-+
-+	if (lastCommonLine < left.length) {
-+		for (let j = lastCommonLine + 1; j <= left.length; j++) {
-+			right.push(left[j - 1]);
-+		}
-+	}
-+
-+	let contentPath = await writeTmpFile(right.join('\n'), path.extname(b));
-+	let originalContentPath = await writeTmpFile(left.join('\n'), path.extname(a));
-+
-+	return new RichFileChange(contentPath, originalContentPath, GitChangeType.MODIFY, b, diffHunks);
-+}
-+
-+async function parseModifiedHunkFast(modifyDiffInfo, a, b) {
-+	let left = [];
-+	let right = [];
-+
-+	let diffHunkReader = parseDiffHunk(modifyDiffInfo);
-+	let diffHunkIter = diffHunkReader.next();
-+	let diffHunks = [];
-+
-+	while (!diffHunkIter.done) {
-+		let diffHunk = diffHunkIter.value;
-+		diffHunks.push(diffHunk);
-+		for (let i = 0, len = diffHunk.diffLines.length; i < len; i++) {
-+			let diffLine = diffHunk.diffLines[i];
-+			if (diffLine.type === DiffChangeType.Add) {
-+				right.push(diffLine.text);
-+			} else if (diffLine.type === DiffChangeType.Delete) {
-+				left.push(diffLine.text);
-+			} else if (diffLine.type === DiffChangeType.Control) {
-+				// nothing
-+			} else {
-+				left.push(diffLine.text);
-+				right.push(diffLine.text);
-+			}
-+		}
-+
-+		diffHunkIter = diffHunkReader.next();
-+	}
-+
-+	let contentPath = await writeTmpFile(right.join('\n'), path.extname(b));
-+	let originalContentPath = await writeTmpFile(left.join('\n'), path.extname(a));
-+
-+	return new RichFileChange(contentPath, originalContentPath, GitChangeType.MODIFY, b, diffHunks);
-+}
-+
-+export async function parseDiff(reviews: any[], repository: Repository, parentCommit: string): Promise<RichFileChange[]> {
-+	let richFileChanges: RichFileChange[] = [];
-+	for (let i = 0; i < reviews.length; i++) {
-+		let review = reviews[i];
-+		if (review.status === 'modified') {
-+			let fileName = review.filename;
-+
-+			try {
-+				let originalContent = await getFileContent(repository.path, parentCommit, fileName);
-+				let richFileChange = await parseModifiedHunkComplete(originalContent, review.patch, fileName, fileName);
-+				richFileChange.blobUrl = review.blob_url;
-+				richFileChanges.push(richFileChange);
-+			} catch (e) {
-+				let richFileChange = await parseModifiedHunkFast(review.patch, fileName, fileName);
-+				richFileChange.blobUrl = review.blob_url;
-+				richFileChanges.push(richFileChange);
-+			}
-+		} else if (review.status === 'removed' || review.status === 'added' || review.status === 'renamed') {
-+			if (!review.patch) {
-+				continue;
-+			}
-+
-+			let gitChangeType = GitChangeType.UNKNOWN;
-+			switch (review.status) {
-+				case 'removed':
-+					gitChangeType = GitChangeType.DELETE;
-+					break;
-+				case 'added':
-+					gitChangeType = GitChangeType.ADD;
-+					break;
-+				case 'renamed':
-+					gitChangeType = GitChangeType.RENAME;
-+					break;
-+				default:
-+					break;
-+			}
-+
-+			let contentArray = [];
-+			let fileName = review.filename;
-+			let prDiffReader = parseDiffHunk(review.patch);
-+			let prDiffIter = prDiffReader.next();
-+			let diffHunks = [];
-+
-+			while (!prDiffIter.done) {
-+				let diffHunk = prDiffIter.value;
-+				diffHunks.push(diffHunk);
-+				for (let j = 0, len = diffHunk.diffLines.length; j < len; j++) {
-+					let diffLine = diffHunk.diffLines[j];
-+					if (diffLine.type !== DiffChangeType.Control) {
-+						contentArray.push(diffLine.text);
-+					}
-+				}
-+				prDiffIter = prDiffReader.next();
-+			}
-+
-+			let contentFilePath = await writeTmpFile(contentArray.join('\n'), path.extname(fileName));
-+			let emptyContentFilePath = await writeTmpFile('', path.extname(fileName));
-+			let richFileChange = review.status === 'removed' ?
-+				new RichFileChange(emptyContentFilePath, contentFilePath, gitChangeType, fileName, diffHunks) :
-+				new RichFileChange(contentFilePath, emptyContentFilePath, gitChangeType, fileName, diffHunks);
-+			richFileChange.blobUrl = review.blob_url;
-+			richFileChanges.push(richFileChange);
-+		}
-+	}
-+	return richFileChanges;
-+}
-+
-added in remote
-  their  100644 24d8068c05a8607ffa98b7d6e9b68bb528596c45 extensions/git-extended/src/common/diffPositionMapping.ts
-@@ -0,0 +1,107 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+import { DiffLine, DiffHunk } from '../models/diffHunk';
-+import { parseDiffHunk } from './diff';
-+import { Comment } from '../models/comment';
-+export function getLastDiffLine(prPatch: string): DiffLine {
-+	let lastDiffLine = null;
-+	let prDiffReader = parseDiffHunk(prPatch);
-+	let prDiffIter = prDiffReader.next();
-+
-+	while (!prDiffIter.done) {
-+		let diffHunk = prDiffIter.value;
-+		lastDiffLine = diffHunk.diffLines[diffHunk.diffLines.length - 1];
-+
-+		prDiffIter = prDiffReader.next();
-+	}
-+
-+	return lastDiffLine;
-+}
-+
-+export function getDiffLineByPosition(diffHunks: DiffHunk[], diffLineNumber: number): DiffLine {
-+	for (let i = 0; i < diffHunks.length; i++) {
-+		let diffHunk = diffHunks[i];
-+		for (let i = 0; i < diffHunk.diffLines.length; i++) {
-+			if (diffHunk.diffLines[i].positionInHunk === diffLineNumber) {
-+				return diffHunk.diffLines[i];
-+			}
-+		}
-+	}
-+
-+	return null;
-+}
-+
-+export function mapHeadLineToDiffHunkPosition(diffHunks: DiffHunk[], localDiff: string, line: number): number {
-+	let delta = 0;
-+
-+	let localDiffReader = parseDiffHunk(localDiff);
-+	let localDiffIter = localDiffReader.next();
-+	let lineInPRDiff = line;
-+
-+	while (!localDiffIter.done) {
-+		let diffHunk = localDiffIter.value;
-+		if (diffHunk.newLineNumber + diffHunk.newLength - 1 < line) {
-+			delta += diffHunk.oldLength - diffHunk.newLength;
-+		} else {
-+			lineInPRDiff = line + delta;
-+			break;
-+		}
-+
-+		localDiffIter = localDiffReader.next();
-+	}
-+
-+	let positionInDiffHunk = -1;
-+
-+	for (let i = 0; i < diffHunks.length; i++) {
-+		let diffHunk = diffHunks[i];
-+
-+		if (diffHunk.newLineNumber <= lineInPRDiff && diffHunk.newLineNumber + diffHunk.newLength - 1 >= lineInPRDiff) {
-+			positionInDiffHunk = lineInPRDiff - diffHunk.newLineNumber + diffHunk.positionInHunk + 1;
-+			break;
-+		}
-+	}
-+
-+	return positionInDiffHunk;
-+}
-+
-+export function mapOldPositionToNew(patch: string, line: number): number {
-+	let diffReader = parseDiffHunk(patch);
-+	let diffIter = diffReader.next();
-+
-+	let delta = 0;
-+	while (!diffIter.done) {
-+		let diffHunk = diffIter.value;
-+
-+		if (diffHunk.oldLineNumber > line) {
-+			// No-op
-+		} else if (diffHunk.oldLineNumber + diffHunk.oldLength - 1 < line) {
-+			delta += diffHunk.newLength - diffHunk.oldLength;
-+		} else {
-+			delta += diffHunk.newLength - diffHunk.oldLength;
-+			return line + delta;
-+		}
-+
-+		diffIter = diffReader.next();
-+	}
-+
-+	return line + delta;
-+}
-+
-+export function mapCommentsToHead(diffHunks: DiffHunk[], localDiff: string, comments: Comment[]) {
-+	for (let i = 0; i < comments.length; i++) {
-+		const comment = comments[i];
-+
-+		// Diff line is null when the original line the comment was on has been removed
-+		const diffLine = getDiffLineByPosition(diffHunks, comment.position | comment.original_position);
-+		if (diffLine) {
-+			const positionInPr = diffLine.newLineNumber;
-+			const newPosition = mapOldPositionToNew(localDiff, positionInPr);
-+			comment.absolutePosition = newPosition;
-+		}
-+	}
-+
-+	return comments;
-+}
-\ No newline at end of file
-added in remote
-  their  100644 96629cd4e4707d47438c72494f3dfe344aa83c9a extensions/git-extended/src/common/file.ts
-@@ -0,0 +1,42 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+import { GitProcess } from 'dugite';
-+import * as fs from 'fs';
-+import * as tmp from 'tmp';
-+
-+export async function writeTmpFile(content: string, ext: string): Promise<string> {
-+	return new Promise<string>((resolve, reject) => {
-+		tmp.file({ postfix: ext }, async (err: any, tmpFilePath: string) => {
-+			if (err) {
-+				reject(err);
-+				return;
-+			}
-+
-+			try {
-+				fs.appendFileSync(tmpFilePath, content);
-+				resolve(tmpFilePath);
-+			} catch (ex) {
-+				reject(ex);
-+			}
-+		});
-+	});
-+}
-+
-+export async function getFileContent(rootDir: string, commitSha: string, sourceFilePath: string): Promise<string> {
-+	const result = await GitProcess.exec([
-+		'show',
-+		`${commitSha}:` + sourceFilePath.replace(/\\/g, '/')
-+	], rootDir);
-+
-+	const out = result.stdout;
-+	const error = result.stderr;
-+
-+	if (result.exitCode === 0) {
-+		return out;
-+	} else {
-+		throw error;
-+	}
-+}
-added in remote
-  their  100644 7e55023bb624db1084ae398bfa64abe5e35808cf extensions/git-extended/src/common/pullRequestGitHelper.ts
-@@ -0,0 +1,214 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+import { Repository } from '../models/repository';
-+import { PullRequestModel } from '../models/pullRequestModel';
-+import { Protocol } from '../models/protocol';
-+import { Remote } from '../models/remote';
-+
-+const PullRequestRemoteMetadataKey = 'github-pr-remote';
-+const PullRequestMetadataKey = 'github-pr-owner-number';
-+const PullRequestBranchRegex = /branch\.(.+)\.github-pr-owner-number/;
-+
-+export class PullRequestGitHelper {
-+	static async createAndCheckout(repository: Repository, pullRequest: PullRequestModel) {
-+		let localBranchName = await PullRequestGitHelper.getBranchNameForPullRequest(repository, pullRequest);
-+
-+		let existing = await repository.getBranch(localBranchName);
-+		if (existing) {
-+			// already exist but the metadata is missing.
-+			await repository.checkout(localBranchName);
-+		} else {
-+			// the branch is from a fork
-+			// create remote for this fork
-+			let remoteName = await PullRequestGitHelper.createRemote(repository, pullRequest.head.repositoryCloneUrl);
-+			// fetch the branch
-+			let ref = `${pullRequest.head.ref}:${localBranchName}`;
-+			await repository.fetch(remoteName, ref);
-+			await repository.checkout(localBranchName);
-+			// set remote tracking branch for the local branch
-+			await repository.setTrackingBranch(localBranchName, `refs/remotes/${remoteName}/${pullRequest.head.ref}`);
-+		}
-+
-+		let prBranchMetadataKey = `branch.${localBranchName}.${PullRequestMetadataKey}`;
-+		await repository.setConfig(prBranchMetadataKey, PullRequestGitHelper.buildPullRequestMetadata(pullRequest));
-+	}
-+
-+	static async checkout(repository: Repository, remote: Remote, branchName: string, pullRequest: PullRequestModel): Promise<void> {
-+		let remoteName = remote.remoteName;
-+		await repository.fetch(remoteName);
-+		let branch = await repository.getBranch(branchName);
-+
-+		if (!branch) {
-+			await PullRequestGitHelper.fetchAndCreateBranch(repository, remote, branchName, pullRequest);
-+		}
-+
-+		await repository.checkout(branchName);
-+		await PullRequestGitHelper.markBranchAsPullRequest(repository, pullRequest, branchName);
-+	}
-+
-+	static async getBranchForPullRequestFromExistingRemotes(repository: Repository, pullRequest: PullRequestModel) {
-+		let headRemote = PullRequestGitHelper.getHeadRemoteForPullRequest(repository, pullRequest);
-+		if (headRemote) {
-+			// the head of the PR is in this repository (not fork), we can just fetch
-+			return {
-+				remote: headRemote,
-+				branch: pullRequest.head.ref
-+			};
-+		} else {
-+			let key = PullRequestGitHelper.buildPullRequestMetadata(pullRequest);
-+			let configs = await repository.getConfigs();
-+
-+			let branchInfos = configs.map(config => {
-+				let matches = PullRequestBranchRegex.exec(config.key);
-+				return {
-+					branch: matches && matches.length ? matches[1] : null,
-+					value: config.value
-+				};
-+			}).filter(c => c.branch && c.value === key);
-+
-+			if (branchInfos && branchInfos.length) {
-+				let remoteName = await repository.getConfig(`branch.${branchInfos[0].branch}.remote`);
-+				let headRemote = repository.remotes.filter(remote => remote.remoteName === remoteName);
-+				if (headRemote && headRemote.length) {
-+					return {
-+						remote: headRemote[0],
-+						branch: branchInfos[0].branch
-+					};
-+				}
-+			}
-+
-+			return null;
-+		}
-+	}
-+
-+	static async fetchAndCreateBranch(repository: Repository, remote: Remote, branchName: string, pullRequest: PullRequestModel) {
-+		let remoteName = remote.remoteName;
-+		const trackedBranchName = `refs/remotes/${remoteName}/${branchName}`;
-+		const trackedBranch = await repository.getBranch(trackedBranchName);
-+
-+		if (trackedBranch) {
-+			// create branch
-+			await repository.createBranch(branchName, trackedBranch.commit);
-+			await repository.setTrackingBranch(branchName, trackedBranchName);
-+		} else {
-+			throw new Error(`Could not find branch '${trackedBranchName}'.`);
-+		}
-+	}
-+
-+	static buildPullRequestMetadata(pullRequest: PullRequestModel) {
-+		return pullRequest.base.repositoryCloneUrl.owner + '#' + pullRequest.prNumber;
-+	}
-+
-+	static parsePullRequestMetadata(value: string) {
-+		if (value) {
-+			let separator = value.indexOf('#');
-+			if (separator !== -1) {
-+				let owner = value.substring(0, separator);
-+				let prNumber = Number(value.substr(separator + 1));
-+
-+				if (prNumber) {
-+					return {
-+						owner: owner,
-+						prNumber: prNumber
-+					};
-+				}
-+			}
-+		}
-+
-+		return null;
-+	}
-+
-+	static async getMatchingPullRequestMetadataForBranch(repository: Repository, branchName: string) {
-+		let configKey = `branch.${branchName}.${PullRequestMetadataKey}`;
-+		let configValue = await repository.getConfig(configKey);
-+		return PullRequestGitHelper.parsePullRequestMetadata(configValue);
-+	}
-+
-+	static async createRemote(repository: Repository, cloneUrl: Protocol) {
-+		let remotes = repository.remotes;
-+
-+		remotes.forEach(remote => {
-+			if (new Protocol(remote.url).equals(cloneUrl)) {
-+				return remote.repositoryName;
-+			}
-+		});
-+
-+		let remoteName = PullRequestGitHelper.getUniqueRemoteName(repository, cloneUrl.owner);
-+		await repository.addRemote(remoteName, cloneUrl.normalizeUri().toString());
-+		await repository.setConfig(`remote.${remoteName}.${PullRequestRemoteMetadataKey}`, 'true');
-+		return remoteName;
-+	}
-+
-+	static async isRemoteCreatedForPullRequest(repository: Repository, remoteName: string) {
-+		let isForPR = await repository.getConfig(`remote.${remoteName}.${PullRequestRemoteMetadataKey}`);
-+
-+		if (isForPR === 'true') {
-+			return true;
-+		} else {
-+			return false;
-+		}
-+	}
-+
-+	static async getBranchNameForPullRequest(repository: Repository, pullRequest: PullRequestModel): Promise<string> {
-+		let branchName = `pr/${pullRequest.author.login}/${pullRequest.prNumber}`;
-+		let result = branchName;
-+		let number = 1;
-+
-+		while (true) {
-+			let currentBranch = await repository.getBranch(result);
-+
-+			if (currentBranch) {
-+				result = branchName + '-' + number++;
-+			} else {
-+				break;
-+			}
-+		}
-+
-+		return result;
-+	}
-+
-+	static getUniqueRemoteName(repository: Repository, name: string) {
-+		let uniqueName = name;
-+		let number = 1;
-+
-+		while (repository.remotes.find(e => e.remoteName === uniqueName)) {
-+			uniqueName = name + number++;
-+		}
-+
-+		return uniqueName;
-+	}
-+
-+	static getHeadRemoteForPullRequest(repository: Repository, pullRequest: PullRequestModel): Remote {
-+		let repos = repository.githubRepositories;
-+		for (let i = 0; i < repos.length; i++) {
-+			let remote = repos[i].remote;
-+			if (remote.gitProtocol && remote.gitProtocol.equals(pullRequest.head.repositoryCloneUrl)) {
-+				return remote;
-+			}
-+		}
-+
-+		return null;
-+	}
-+
-+	static async markBranchAsPullRequest(repository: Repository, pullRequest: PullRequestModel, branchName: string) {
-+		let prConfigKey = `branch.${branchName}.${PullRequestMetadataKey}`;
-+		await repository.setConfig(prConfigKey, PullRequestGitHelper.buildPullRequestMetadata(pullRequest));
-+	}
-+
-+	static async getLocalBranchesMarkedAsPullRequest(repository: Repository) {
-+		let branches = await repository.getLocalBranches();
-+
-+		let ret = [];
-+		for (let i = 0; i < branches.length; i++) {
-+			let matchingPRMetadata = await PullRequestGitHelper.getMatchingPullRequestMetadataForBranch(repository, branches[i]);
-+			if (matchingPRMetadata) {
-+				ret.push(matchingPRMetadata);
-+			}
-+		}
-+
-+		return ret;
-+	}
-+}
-\ No newline at end of file
-added in remote
-  their  100644 3c746f3814a1d1248813c10b0e5f724b02e252ec extensions/git-extended/src/common/pullRequestOverview.ts
-@@ -0,0 +1,187 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+'use strict';
-+
-+import * as vscode from 'vscode';
-+import * as path from 'path';
-+import { PullRequestModel, PullRequest } from '../models/pullRequestModel';
-+import { ReviewManager } from '../review/reviewManager';
-+
-+export class PullRequestOverviewPanel {
-+	/**
-+	 * Track the currently panel. Only allow a single panel to exist at a time.
-+	 */
-+	public static currentPanel: PullRequestOverviewPanel | undefined;
-+
-+	private static readonly viewType = 'PullRequestOverview';
-+
-+	private readonly _panel: vscode.WebviewPanel;
-+	private readonly _extensionPath: string;
-+	private _disposables: vscode.Disposable[] = [];
-+	private _pullRequest: PullRequestModel;
-+
-+	public static createOrShow(extensionPath: string, pullRequestModel: PullRequestModel) {
-+		const column = vscode.window.activeTextEditor ? vscode.window.activeTextEditor.viewColumn : undefined;
-+		const title = `Pull Request #${pullRequestModel.prNumber.toString()}`;
-+
-+		// If we already have a panel, show it.
-+		// Otherwise, create a new panel.
-+		if (PullRequestOverviewPanel.currentPanel) {
-+			PullRequestOverviewPanel.currentPanel._panel.reveal(column);
-+			PullRequestOverviewPanel.currentPanel._panel.title = title;
-+		} else {
-+			PullRequestOverviewPanel.currentPanel = new PullRequestOverviewPanel(extensionPath, column || vscode.ViewColumn.One, title);
-+		}
-+
-+		PullRequestOverviewPanel.currentPanel.update(pullRequestModel);
-+	}
-+
-+	private constructor(extensionPath: string, column: vscode.ViewColumn, title: string) {
-+		this._extensionPath = extensionPath;
-+
-+		// Create and show a new webview panel
-+		this._panel = vscode.window.createWebviewPanel(PullRequestOverviewPanel.viewType, title, column, {
-+			// Enable javascript in the webview
-+			enableScripts: true,
-+
-+			// And restric the webview to only loading content from our extension's `media` directory.
-+			localResourceRoots: [
-+				vscode.Uri.file(path.join(this._extensionPath, 'media'))
-+			]
-+		});
-+
-+		// Listen for when the panel is disposed
-+		// This happens when the user closes the panel or when the panel is closed programatically
-+		this._panel.onDidDispose(() => this.dispose(), null, this._disposables);
-+
-+		// Listen for changes to panel visibility, if the webview comes into view resubmit data
-+		this._panel.onDidChangeViewState(e => {
-+			if (e.webviewPanel.visible) {
-+				this.update(this._pullRequest);
-+			}
-+		}, this, this._disposables);
-+
-+		// Handle messages from the webview
-+		this._panel.webview.onDidReceiveMessage(message => {
-+			console.log(message);
-+			this._onDidReceiveMessage(message);
-+		}, null, this._disposables);
-+	}
-+
-+	public async update(pullRequestModel: PullRequestModel) {
-+		this._pullRequest = pullRequestModel;
-+		this._panel.webview.html = this.getHtmlForWebview(pullRequestModel.prNumber.toString());
-+		const isCurrentlyCheckedOut = pullRequestModel.equals(ReviewManager.instance.currentPullRequest);
-+		const timelineEvents = await pullRequestModel.getTimelineEvents();
-+		this._panel.webview.postMessage({
-+			command: 'pr.initialize',
-+			pullrequest: {
-+				number: pullRequestModel.prNumber,
-+				title: pullRequestModel.title,
-+				url: pullRequestModel.html_url,
-+				body: pullRequestModel.prItem.body,
-+				author: pullRequestModel.author,
-+				state: pullRequestModel.state,
-+				events: timelineEvents,
-+				isCurrentlyCheckedOut: isCurrentlyCheckedOut
-+			}
-+		});
-+	}
-+
-+	private _onDidReceiveMessage(message) {
-+		switch (message.command) {
-+			case 'alert':
-+				vscode.window.showErrorMessage(message.text);
-+				return;
-+			case 'pr.checkout':
-+				vscode.commands.executeCommand('pr.pick', this._pullRequest).then(() => {
-+					this._panel.webview.postMessage({
-+						command: 'checked-out'
-+					});
-+				}, () => {
-+					this._panel.webview.postMessage({
-+						command: 'checked-out'
-+					});
-+				});
-+				return;
-+			case 'pr.close':
-+				vscode.commands.executeCommand<PullRequest>('pr.close', this._pullRequest).then(pr => {
-+					if (pr) {
-+						this._pullRequest.update(pr);
-+						this._panel.webview.postMessage({
-+							command: 'pr-update',
-+							pullrequest: {
-+								title: this._pullRequest.title,
-+								body: this._pullRequest.prItem.body,
-+								author: this._pullRequest.author,
-+								state: this._pullRequest.state,
-+							}
-+						});
-+					}
-+				});
-+			case 'pr.comment':
-+				const text = message.text;
-+				this._pullRequest.createDiscussionComment(text).then(comment => {
-+					this._panel.webview.postMessage({
-+						command: 'append-comment',
-+						value: comment
-+					});
-+				});
-+				return;
-+		}
-+	}
-+
-+	public dispose() {
-+		PullRequestOverviewPanel.currentPanel = undefined;
-+
-+		// Clean up our resources
-+		this._panel.dispose();
-+
-+		while (this._disposables.length) {
-+			const x = this._disposables.pop();
-+			if (x) {
-+				x.dispose();
-+			}
-+		}
-+	}
-+
-+	private getHtmlForWebview(number: string) {
-+		const scriptPathOnDisk = vscode.Uri.file(path.join(this._extensionPath, 'media', 'index.js'));
-+		const scriptUri = scriptPathOnDisk.with({ scheme: 'vscode-resource' });
-+		const stylePathOnDisk = vscode.Uri.file(path.join(this._extensionPath, 'media', 'index.css'));
-+		const styleUri = stylePathOnDisk.with({ scheme: 'vscode-resource' });
-+		const baseStyles = `<link rel="stylesheet" type="text/css" href="${styleUri}">`;
-+
-+		const nonce = getNonce();
-+
-+		return `<!DOCTYPE html>
-+			<html lang="en">
-+			<head>
-+				<meta charset="UTF-8">
-+				<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src vscode-resource: https:; script-src 'nonce-${nonce}'; style-src vscode-resource: 'unsafe-inline' http: https: data:;">
-+				${baseStyles}
-+
-+				<meta name="viewport" content="width=device-width, initial-scale=1.0">
-+				<title>Pull Request #${number}</title>
-+			</head>
-+			<body>
-+				<script nonce="${nonce}" src="${scriptUri}"></script>
-+				<div id="title" class="title"></div>
-+				<div id="pullrequest" class="discussion" aria-live="polite"></div>
-+				<div id="comment-form" class="comment-form">
-+				</div>
-+			</body>
-+			</html>`;
-+	}
-+}
-+
-+function getNonce() {
-+	let text = '';
-+	const possible = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-+	for (let i = 0; i < 32; i++) {
-+		text += possible.charAt(Math.floor(Math.random() * possible.length));
-+	}
-+	return text;
-+}
-\ No newline at end of file
-added in remote
-  their  100644 615ea40130da5e056de344287f5934a1028483b5 extensions/git-extended/src/common/resources.ts
-@@ -0,0 +1,91 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+import * as vscode from 'vscode';
-+import * as path from 'path';
-+import { GitChangeType } from '../models/file';
-+import { PullRequestModel } from '../models/pullRequestModel';
-+import { PRFileChangeNode } from '../tree/prFileChangeNode';
-+
-+export class Resource {
-+	static icons: any;
-+
-+	static initialize(context: vscode.ExtensionContext) {
-+		Resource.icons = {
-+			light: {
-+				Modified: context.asAbsolutePath(path.join('resources', 'icons', 'light', 'status-modified.svg')),
-+				Added: context.asAbsolutePath(path.join('resources', 'icons', 'light', 'status-added.svg')),
-+				Deleted: context.asAbsolutePath(path.join('resources', 'icons', 'light', 'status-deleted.svg')),
-+				Renamed: context.asAbsolutePath(path.join('resources', 'icons', 'light', 'status-renamed.svg')),
-+				Copied: context.asAbsolutePath(path.join('resources', 'icons', 'light', 'status-copied.svg')),
-+				Untracked: context.asAbsolutePath(path.join('resources', 'icons', 'light', 'status-untrackedt.svg')),
-+				Ignored: context.asAbsolutePath(path.join('resources', 'icons', 'light', 'status-ignored.svg')),
-+				Conflict: context.asAbsolutePath(path.join('resources', 'icons', 'light', 'status-conflict.svg')),
-+				Comment: context.asAbsolutePath(path.join('resources', 'icons', 'comment.svg')),
-+				Fold: context.asAbsolutePath(path.join('resources', 'icons', 'light', 'fold.svg')),
-+				Description: context.asAbsolutePath(path.join('resources', 'icons', 'light', 'book.svg'))
-+			},
-+			dark: {
-+				Modified: context.asAbsolutePath(path.join('resources', 'icons', 'dark', 'status-modified.svg')),
-+				Added: context.asAbsolutePath(path.join('resources', 'icons', 'dark', 'status-added.svg')),
-+				Deleted: context.asAbsolutePath(path.join('resources', 'icons', 'dark', 'status-deleted.svg')),
-+				Renamed: context.asAbsolutePath(path.join('resources', 'icons', 'dark', 'status-renamed.svg')),
-+				Copied: context.asAbsolutePath(path.join('resources', 'icons', 'dark', 'status-copied.svg')),
-+				Untracked: context.asAbsolutePath(path.join('resources', 'icons', 'dark', 'status-untracked.svg')),
-+				Ignored: context.asAbsolutePath(path.join('resources', 'icons', 'dark', 'status-ignored.svg')),
-+				Conflict: context.asAbsolutePath(path.join('resources', 'icons', 'dark', 'status-conflict.svg')),
-+				Comment: context.asAbsolutePath(path.join('resources', 'icons', 'comment.svg')),
-+				Fold: context.asAbsolutePath(path.join('resources', 'icons', 'dark', 'fold.svg')),
-+				Description: context.asAbsolutePath(path.join('resources', 'icons', 'dark', 'book.svg'))
-+			}
-+		};
-+	}
-+
-+	static getFileStatusUri(element: PRFileChangeNode): vscode.Uri | { light: vscode.Uri, dark: vscode.Uri } {
-+		let iconUri: vscode.Uri;
-+		let iconDarkUri: vscode.Uri;
-+
-+		switch (element.status) {
-+			case GitChangeType.ADD:
-+				iconUri = vscode.Uri.file(Resource.icons.light.Added);
-+				iconDarkUri = vscode.Uri.file(Resource.icons.dark.Added);
-+				break;
-+			case GitChangeType.COPY:
-+				iconUri = vscode.Uri.file(Resource.icons.light.Copied);
-+				iconDarkUri = vscode.Uri.file(Resource.icons.dark.Copied);
-+				break;
-+			case GitChangeType.DELETE:
-+				iconUri = vscode.Uri.file(Resource.icons.light.Deleted);
-+				iconDarkUri = vscode.Uri.file(Resource.icons.dark.Deleted);
-+				break;
-+			case GitChangeType.MODIFY:
-+				iconUri = vscode.Uri.file(Resource.icons.light.Modified);
-+				iconDarkUri = vscode.Uri.file(Resource.icons.dark.Modified);
-+				break;
-+			case GitChangeType.RENAME:
-+				iconUri = vscode.Uri.file(Resource.icons.light.Renamed);
-+				iconDarkUri = vscode.Uri.file(Resource.icons.dark.Renamed);
-+				break;
-+		}
-+
-+		return {
-+			light: iconUri,
-+			dark: iconDarkUri
-+		};
-+	}
-+
-+	static getGravatarUri(pr: PullRequestModel, size: number = 64): vscode.Uri {
-+		let key = pr.getUserGravatar();
-+		let gravatar = vscode.Uri.parse(`${key}&s=${size}`);
-+
-+		// hack, to ensure queries are not wrongly encoded.
-+		const originalToStringFn = gravatar.toString;
-+		gravatar.toString = function (skipEncoding?: boolean | undefined) {
-+			return originalToStringFn.call(gravatar, true);
-+		};
-+
-+		return gravatar;
-+	}
-+}
-added in remote
-  their  100644 b723d97ae30c93a7ba182bd2fa846b55108a0a32 extensions/git-extended/src/common/uri.ts
-@@ -0,0 +1,65 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+'use strict';
-+
-+import { Uri } from 'vscode';
-+
-+export interface GitUriParams {
-+	path: string;
-+	ref?: string;
-+	commit?: string;
-+}
-+
-+export function fromGitUri(uri: Uri): GitUriParams {
-+	return JSON.parse(uri.query);
-+}
-+
-+export interface GitUriOptions {
-+	replaceFileExtension?: boolean;
-+	submoduleOf?: string;
-+}
-+
-+// As a mitigation for extensions like ESLint showing warnings and errors
-+// for git URIs, let's change the file extension of these uris to .git,
-+// when `replaceFileExtension` is true.
-+export function toGitUri(uri: Uri, filePath: string, ref: string, commit: string, options: GitUriOptions = {}): Uri {
-+	const params: GitUriParams = {
-+		path: filePath ? filePath : uri.path,
-+		ref,
-+		commit: commit
-+	};
-+
-+	let path = uri.path;
-+
-+	if (options.replaceFileExtension) {
-+		path = `${path}.git`;
-+	}
-+
-+	return uri.with({
-+		scheme: 'review',
-+		path,
-+		query: JSON.stringify(params)
-+	});
-+}
-+
-+export function toPRUri(uri: Uri, fileInRepo: string, fileName: string, base: boolean): Uri {
-+	const params = {
-+		path: uri.path,
-+		base: base,
-+		fileName: fileName
-+	};
-+
-+	let path = uri.path;
-+
-+	// path = `${path}.git`;
-+
-+	return uri.with({
-+		scheme: 'pr',
-+		path,
-+		query: JSON.stringify(params),
-+	});
-+}
-+
-added in remote
-  their  100644 63be70cc4f470d0c70da0c50bb28b58713456484 extensions/git-extended/src/common/util.ts
-@@ -0,0 +1,86 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+'use strict';
-+import { Event } from 'vscode';
-+import { sep } from 'path';
-+
-+export function uniqBy<T>(arr: T[], fn: (el: T) => string): T[] {
-+	const seen = Object.create(null);
-+
-+	return arr.filter(el => {
-+		const key = fn(el);
-+
-+		if (seen[key]) {
-+			return false;
-+		}
-+
-+		seen[key] = true;
-+		return true;
-+	});
-+}
-+
-+export interface IDisposable {
-+	dispose(): void;
-+}
-+
-+export function dispose<T extends IDisposable>(disposables: T[]): T[] {
-+	disposables.forEach(d => d.dispose());
-+	return [];
-+}
-+
-+export function toDisposable(dispose: () => void): IDisposable {
-+	return { dispose };
-+}
-+
-+export function combinedDisposable(disposables: IDisposable[]): IDisposable {
-+	return toDisposable(() => dispose(disposables));
-+}
-+
-+export function anyEvent<T>(...events: Event<T>[]): Event<T> {
-+	return (listener, thisArgs = null, disposables?) => {
-+		const result = combinedDisposable(events.map(event => event(i => listener.call(thisArgs, i))));
-+
-+		if (disposables) {
-+			disposables.push(result);
-+		}
-+
-+		return result;
-+	};
-+}
-+
-+export function filterEvent<T>(event: Event<T>, filter: (e: T) => boolean): Event<T> {
-+	return (listener, thisArgs = null, disposables?) => event(e => filter(e) && listener.call(thisArgs, e), null, disposables);
-+}
-+
-+function isWindowsPath(path: string): boolean {
-+	return /^[a-zA-Z]:\\/.test(path);
-+}
-+
-+export function isDescendant(parent: string, descendant: string): boolean {
-+	if (parent === descendant) {
-+		return true;
-+	}
-+
-+	if (parent.charAt(parent.length - 1) !== sep) {
-+		parent += sep;
-+	}
-+
-+	// Windows is case insensitive
-+	if (isWindowsPath(parent)) {
-+		parent = parent.toLowerCase();
-+		descendant = descendant.toLowerCase();
-+	}
-+
-+	return descendant.startsWith(parent);
-+}
-+
-+export function groupBy<T>(arr: T[], fn: (el: T) => string): { [key: string]: T[] } {
-+	return arr.reduce((result, el) => {
-+		const key = fn(el);
-+		result[key] = [...(result[key] || []), el];
-+		return result;
-+	}, Object.create(null));
-+}
-\ No newline at end of file
-added in remote
-  their  100644 637f43f665db91112c7697ab1f426e42377b059e extensions/git-extended/src/configuration.ts
-@@ -0,0 +1,41 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+import * as vscode from 'vscode';
-+
-+export interface IConfiguration {
-+	username: string | undefined;
-+	host: string;
-+	accessToken: string | undefined;
-+	onDidChange: vscode.Event<IConfiguration>;
-+}
-+
-+export class Configuration implements IConfiguration {
-+	onDidChange: vscode.Event<IConfiguration>;
-+
-+	private emitter: vscode.EventEmitter<IConfiguration>;
-+
-+	constructor(
-+		public username: string | undefined,
-+		public host: string = 'github.com',
-+		public accessToken: string
-+	) {
-+		this.emitter = new vscode.EventEmitter<IConfiguration>();
-+		this.onDidChange = this.emitter.event;
-+	}
-+
-+	update(username, host = 'github.com', accessToken) {
-+		if (
-+			username !== this.username ||
-+			host !== this.host ||
-+			accessToken !== this.accessToken
-+		) {
-+			this.username = username;
-+			this.host = host;
-+			this.accessToken = accessToken;
-+			this.emitter.fire(this);
-+		}
-+	}
-+}
-added in remote
-  their  100644 733e484f4c1ab69a1a80eba171a53bdfe64b1195 extensions/git-extended/src/credentials.ts
-@@ -0,0 +1,46 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+import { Configuration } from './configuration';
-+import { Remote } from './models/remote';
-+import { fill } from 'git-credential-node';
-+const Octokit = require('@octokit/rest');
-+
-+export class CredentialStore {
-+	private octokits: { [key: string]: any };
-+	private configuration: Configuration;
-+	constructor(configuration: Configuration) {
-+		this.configuration = configuration;
-+		this.octokits = [];
-+	}
-+
-+	async getOctokit(remote: Remote) {
-+		if (this.octokits[remote.url]) {
-+			return this.octokits[remote.url];
-+		}
-+
-+		if (this.configuration.host === remote.host && this.configuration.accessToken) {
-+			this.octokits[remote.url] = Octokit({});
-+			this.octokits[remote.url].authenticate({
-+				type: 'token',
-+				token: this.configuration.accessToken
-+			});
-+			return this.octokits[remote.url];
-+		} else {
-+			const data = await fill(remote.url);
-+			if (!data) {
-+				return null;
-+			}
-+			this.octokits[remote.url] = Octokit({});
-+			this.octokits[remote.url].authenticate({
-+				type: 'basic',
-+				username: data.username,
-+				password: data.password
-+			});
-+
-+			return this.octokits[remote.url];
-+		}
-+	}
-+}
-added in remote
-  their  100644 56d3105844c92c46be5e4f3736b4968453c5e131 extensions/git-extended/src/extension.ts
-@@ -0,0 +1,52 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+'use strict';
-+
-+import * as vscode from 'vscode';
-+import { PRProvider } from './prView/prProvider';
-+import { Repository } from './models/repository';
-+import { Configuration } from './configuration';
-+import { Resource } from './common/resources';
-+import { ReviewManager } from './review/reviewManager';
-+import { CredentialStore } from './credentials';
-+import { registerCommands } from './commands';
-+
-+export async function activate(context: vscode.ExtensionContext) {
-+	// initialize resources
-+	Resource.initialize(context);
-+
-+	const rootPath = vscode.workspace.rootPath;
-+
-+	const config = vscode.workspace.getConfiguration('github');
-+	const configuration = new Configuration(
-+		config.get<string>('username'),
-+		config.get<string>('host'),
-+		config.get<string>('accessToken')
-+	);
-+	context.subscriptions.push(
-+		vscode.workspace.onDidChangeConfiguration(() => {
-+			const config = vscode.workspace.getConfiguration('github');
-+			configuration.update(
-+				config.get<string>('username'),
-+				config.get<string>('host'),
-+				config.get<string>('accessToken')
-+			);
-+		})
-+	);
-+
-+	const repository = new Repository(rootPath);
-+	let repositoryInitialized = false;
-+	repository.onDidRunGitStatus(async e => {
-+		if (repositoryInitialized) {
-+			return;
-+		}
-+		repositoryInitialized = true;
-+		let credentialStore = new CredentialStore(configuration);
-+		await repository.connectGitHub(credentialStore);
-+		ReviewManager.initialize(context, repository);
-+		PRProvider.initialize(context, configuration, repository);
-+		registerCommands(context);
-+	});
-+}
-added in remote
-  their  100644 e95fac8778cbf76c5ddd7cc45b29605874d461f9 extensions/git-extended/src/models/comment.ts
-@@ -0,0 +1,32 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+import { DiffHunk } from './diffHunk';
-+
-+export interface User {
-+	id: string;
-+	login: string;
-+	avatar_url: string;
-+}
-+
-+export interface Comment {
-+	url: string;
-+	id: string;
-+	path: string;
-+	pull_request_review_id: string;
-+	diff_hunk: string;
-+	diff_hunks: DiffHunk[];
-+	position: number;
-+	original_position: number;
-+	commit_id: string;
-+	original_commit_id: string;
-+	user: User;
-+	body: string;
-+	created_at: string;
-+	updated_at: string;
-+	html_url: string;
-+	absolutePosition?: number;
-+}
-+
-added in remote
-  their  100644 52cc2806e06710d5410bf60d7a0f2a7e3834c5ce extensions/git-extended/src/models/diffHunk.ts
-@@ -0,0 +1,53 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+export enum DiffChangeType {
-+	Context,
-+	Add,
-+	Delete,
-+	Control
-+}
-+
-+export class DiffLine {
-+	public get raw(): string {
-+		return this._raw;
-+	}
-+
-+	public get text(): string {
-+		return this._raw.substr(1);
-+	}
-+
-+	public endwithLineBreak: boolean = true;
-+
-+	constructor(
-+		public type: DiffChangeType,
-+		public oldLineNumber: number, /* 1 based */
-+		public newLineNumber: number, /* 1 based */
-+		public positionInHunk: number,
-+		private _raw: string
-+	) { }
-+}
-+
-+export function getDiffChangeType(text: string) {
-+	let c = text[0];
-+	switch (c) {
-+		case ' ': return DiffChangeType.Context;
-+		case '+': return DiffChangeType.Add;
-+		case '-': return DiffChangeType.Delete;
-+		default: return DiffChangeType.Control;
-+	}
-+}
-+
-+export class DiffHunk {
-+	public diffLines: DiffLine[] = [];
-+
-+	constructor(
-+		public oldLineNumber: number,
-+		public oldLength: number,
-+		public newLineNumber: number,
-+		public newLength: number,
-+		public positionInHunk: number
-+	) { }
-+}
-\ No newline at end of file
-added in remote
-  their  100644 8402568d44f5af01cec1fbd6818141485d2004a1 extensions/git-extended/src/models/file.ts
-@@ -0,0 +1,28 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+import { DiffHunk } from './diffHunk';
-+
-+export enum GitChangeType {
-+	ADD,
-+	COPY,
-+	DELETE,
-+	MODIFY,
-+	RENAME,
-+	TYPE,
-+	UNKNOWN,
-+	UNMERGED
-+}
-+
-+export class RichFileChange {
-+	public blobUrl: string;
-+	constructor(
-+		public readonly filePath: string,
-+		public readonly originalFilePath: string,
-+		public readonly status: GitChangeType,
-+		public readonly fileName: string,
-+		public readonly diffHunks: DiffHunk[]
-+	) { }
-+}
-\ No newline at end of file
-added in remote
-  their  100644 7853c70c61d2fb9a861d6171f82b5fc5ccdab6cd extensions/git-extended/src/models/gitError.ts
-@@ -0,0 +1,88 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+export const GitErrorCodes = {
-+	BadConfigFile: 'BadConfigFile',
-+	AuthenticationFailed: 'AuthenticationFailed',
-+	NoUserNameConfigured: 'NoUserNameConfigured',
-+	NoUserEmailConfigured: 'NoUserEmailConfigured',
-+	NoRemoteRepositorySpecified: 'NoRemoteRepositorySpecified',
-+	NotAGitRepository: 'NotAGitRepository',
-+	NotAtRepositoryRoot: 'NotAtRepositoryRoot',
-+	Conflict: 'Conflict',
-+	UnmergedChanges: 'UnmergedChanges',
-+	PushRejected: 'PushRejected',
-+	RemoteConnectionError: 'RemoteConnectionError',
-+	DirtyWorkTree: 'DirtyWorkTree',
-+	CantOpenResource: 'CantOpenResource',
-+	GitNotFound: 'GitNotFound',
-+	CantCreatePipe: 'CantCreatePipe',
-+	CantAccessRemote: 'CantAccessRemote',
-+	RepositoryNotFound: 'RepositoryNotFound',
-+	RepositoryIsLocked: 'RepositoryIsLocked',
-+	BranchNotFullyMerged: 'BranchNotFullyMerged',
-+	NoRemoteReference: 'NoRemoteReference',
-+	InvalidBranchName: 'InvalidBranchName',
-+	BranchAlreadyExists: 'BranchAlreadyExists',
-+	NoLocalChanges: 'NoLocalChanges',
-+	NoStashFound: 'NoStashFound',
-+	LocalChangesOverwritten: 'LocalChangesOverwritten',
-+	NoUpstreamBranch: 'NoUpstreamBranch',
-+	IsInSubmodule: 'IsInSubmodule'
-+};
-+
-+export interface IGitErrorData {
-+	error?: Error;
-+	message?: string;
-+	stdout?: string;
-+	stderr?: string;
-+	exitCode?: number;
-+	gitErrorCode?: string;
-+	gitCommand?: string;
-+}
-+
-+export class GitError {
-+
-+	error?: Error;
-+	message: string;
-+	stdout?: string;
-+	stderr?: string;
-+	exitCode?: number;
-+	gitErrorCode?: string;
-+	gitCommand?: string;
-+
-+	constructor(data: IGitErrorData) {
-+		if (data.error) {
-+			this.error = data.error;
-+			this.message = data.error.message;
-+		} else {
-+			this.error = void 0;
-+			this.message = '';
-+		}
-+
-+		this.message = this.message || data.message || 'Git error';
-+		this.stdout = data.stdout;
-+		this.stderr = data.stderr;
-+		this.exitCode = data.exitCode;
-+		this.gitErrorCode = data.gitErrorCode;
-+		this.gitCommand = data.gitCommand;
-+	}
-+
-+	toString(): string {
-+		let result = this.message + ' ' + JSON.stringify({
-+			exitCode: this.exitCode,
-+			gitErrorCode: this.gitErrorCode,
-+			gitCommand: this.gitCommand,
-+			stdout: this.stdout,
-+			stderr: this.stderr
-+		}, null, 2);
-+
-+		if (this.error) {
-+			result += (<any>this.error).stack;
-+		}
-+
-+		return result;
-+	}
-+}
-\ No newline at end of file
-added in remote
-  their  100644 0dc33c6c56cff769ca30736e6b33a5eb9da9e13d extensions/git-extended/src/models/githubRef.ts
-@@ -0,0 +1,18 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+import { Protocol } from './protocol';
-+
-+export class GitHubRef {
-+	public repositoryCloneUrl: Protocol;
-+	constructor(
-+		public ref: string,
-+		public label: string,
-+		public sha: string,
-+		repositoryCloneUrl: string
-+	) {
-+		this.repositoryCloneUrl = new Protocol(repositoryCloneUrl);
-+	}
-+}
-added in remote
-  their  100644 e53a09b79708d52a28a5e8800bf8b700caa30589 extensions/git-extended/src/models/protocol.ts
-@@ -0,0 +1,132 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+import * as vscode from 'vscode';
-+
-+export enum ProtocolType {
-+	Local,
-+	HTTP,
-+	SSH,
-+	GIT,
-+	OTHER
-+}
-+
-+const gitProtocolRegex = [
-+	new RegExp('^git@(.+):(.+)/(.+?)(?:/|.git)?$'),
-+	new RegExp('^git:(.+)/(.+)/(.+?)(?:/|.git)?$')
-+];
-+const sshProtocolRegex = [
-+	new RegExp('^ssh://git@(.+)/(.+)/(.+?)(?:/|.git)?$')
-+];
-+
-+export class Protocol {
-+	public type: ProtocolType = ProtocolType.OTHER;
-+	public host: string = '';
-+
-+	public owner: string = '';
-+
-+	public repositoryName: string = '';
-+
-+	public get nameWithOwner(): string {
-+		return this.owner ? `${this.owner}/${this.repositoryName}` : this.repositoryName;
-+	}
-+
-+	public readonly url: vscode.Uri;
-+	constructor(
-+		uriString: string
-+	) {
-+		try {
-+			this.url = vscode.Uri.parse(uriString);
-+
-+			if (this.url.scheme === 'file') {
-+				this.type = ProtocolType.Local;
-+				this.repositoryName = this.getRepositoryName(this.url.path);
-+				return;
-+			}
-+
-+			if (this.url.scheme === 'https' || this.url.scheme === 'http') {
-+				this.type = ProtocolType.HTTP;
-+				this.host = this.url.authority;
-+				this.repositoryName = this.getRepositoryName(this.url.path);
-+				this.owner = this.getOwnerName(this.url.path);
-+				return;
-+			}
-+		} catch (e) { }
-+
-+		try {
-+			for (const regex of gitProtocolRegex) {
-+				const result = uriString.match(regex);
-+				if (!result) {
-+					continue;
-+				}
-+
-+				this.host = result[1];
-+				this.owner = result[2];
-+				this.repositoryName = result[3];
-+				this.type = ProtocolType.GIT;
-+				return;
-+			}
-+
-+			for (const regex of sshProtocolRegex) {
-+				const result = uriString.match(regex);
-+				if (!result) {
-+					continue;
-+				}
-+
-+				this.host = result[1];
-+				this.owner = result[2];
-+				this.repositoryName = result[3];
-+				this.type = ProtocolType.SSH;
-+				return;
-+			}
-+		} catch (e) { }
-+	}
-+
-+	getRepositoryName(path: string) {
-+		let normalized = path.replace('\\', '/');
-+		let lastIndex = normalized.lastIndexOf('/');
-+		let lastSegment = normalized.substr(lastIndex + 1);
-+		if (lastSegment === '' || lastSegment === '/') {
-+			return null;
-+		}
-+
-+		return lastSegment.replace(/\/$/, '').replace(/\.git$/, '');
-+	}
-+
-+	getOwnerName(path: string) {
-+		let normalized = path.replace('\\', '/');
-+		let fragments = normalized.split('/');
-+		if (fragments.length > 1) {
-+			return fragments[fragments.length - 2];
-+		}
-+
-+		return null;
-+	}
-+
-+	normalizeUri(): vscode.Uri {
-+		if (this.type === ProtocolType.OTHER && !this.url) {
-+			return null;
-+		}
-+
-+		if (this.type === ProtocolType.Local) {
-+			return this.url;
-+		}
-+
-+		let scheme = 'https';
-+		if (this.url && (this.url.scheme === 'http' || this.url.scheme === 'https')) {
-+			scheme = this.url.scheme;
-+		}
-+
-+		try {
-+			return vscode.Uri.parse(`${scheme}://${this.host}/${this.nameWithOwner}`);
-+		} catch (e) {
-+			return null;
-+		}
-+	}
-+
-+	equals(other: Protocol) {
-+		return this.normalizeUri().toString().toLocaleLowerCase() === other.normalizeUri().toString().toLocaleLowerCase();
-+	}
-+}
-\ No newline at end of file
-added in remote
-  their  100644 e3033378321ef62feda6facfc021fd85fbd71fe1 extensions/git-extended/src/models/pullRequestModel.ts
-@@ -0,0 +1,275 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+import { Remote } from './remote';
-+import { parseComments } from '../common/comment';
-+import { Comment } from './comment';
-+import { GitHubRef } from './githubRef';
-+import { TimelineEvent, parseTimelineEvents } from './timelineEvent';
-+
-+export enum PRType {
-+	RequestReview = 0,
-+	ReviewedByMe = 1,
-+	Mine = 2,
-+	Mention = 3,
-+	All = 4,
-+	LocalPullRequest = 5
-+}
-+
-+export enum PullRequestStateEnum {
-+	Open,
-+	Merged,
-+	Closed,
-+}
-+
-+export interface IAccount {
-+	login: string;
-+	isUser: boolean;
-+	isEnterprise: boolean;
-+	avatarUrl: string;
-+	htmlUrl: string;
-+	ownedPrivateRepositoryCount?: number;
-+	privateRepositoryInPlanCount?: number;
-+}
-+
-+export interface Repo {
-+	label: string;
-+	ref: string;
-+	repo: any;
-+	sha: string;
-+}
-+
-+// This interface is incomplete
-+export interface PullRequest {
-+	additions: number;
-+	assignee: any;
-+	assignees: any[];
-+	author_association: string;
-+	base: Repo;
-+	body: string;
-+	changed_files: number;
-+	closed_at: string;
-+	comments: number;
-+	commits: number;
-+	created_at: string;
-+	head: Repo;
-+	html_url: string;
-+	id: number;
-+	labels: any[];
-+	locked: boolean;
-+	maintainer_can_modify: boolean;
-+	merge_commit_sha; boolean;
-+	mergable: boolean;
-+	number: number;
-+	rebaseable: boolean;
-+	state: string;
-+	title: string;
-+	updated_at: string;
-+	user: any;
-+}
-+
-+export class PullRequestModel {
-+	public prNumber: number;
-+	public title: string;
-+	public html_url: string;
-+	public state: PullRequestStateEnum = PullRequestStateEnum.Open;
-+	public commentCount: number;
-+	public commitCount: number;
-+	public author: IAccount;
-+	public assignee: IAccount;
-+	public createdAt: string;
-+	public updatedAt: string;
-+
-+	public get isOpen(): boolean {
-+		return this.state === PullRequestStateEnum.Open;
-+	}
-+	public get isMerged(): boolean {
-+		return this.state === PullRequestStateEnum.Merged;
-+	}
-+
-+	public head: GitHubRef;
-+	public base: GitHubRef;
-+
-+	constructor(public readonly otcokit: any, public readonly remote: Remote, public prItem: PullRequest) {
-+		this.update(prItem);
-+	}
-+
-+	update(prItem: PullRequest) {
-+		this.prNumber = prItem.number;
-+		this.title = prItem.title;
-+		this.html_url = prItem.html_url;
-+		this.author = {
-+			login: prItem.user.login,
-+			isUser: prItem.user.type === 'User',
-+			isEnterprise: prItem.user.type === 'Enterprise',
-+			avatarUrl: prItem.user.avatar_url,
-+			htmlUrl: prItem.user.html_url
-+		};
-+		switch (prItem.state) {
-+			case 'open':
-+				this.state = PullRequestStateEnum.Open;
-+				break;
-+			case 'merged':
-+				this.state = PullRequestStateEnum.Merged;
-+				break;
-+			case 'closed':
-+				this.state = PullRequestStateEnum.Closed;
-+				break;
-+		}
-+		if (prItem.assignee) {
-+			this.assignee = {
-+				login: prItem.assignee.login,
-+				isUser: prItem.assignee.type === 'User',
-+				isEnterprise: prItem.assignee.type === 'Enterprise',
-+				avatarUrl: prItem.assignee.avatar_url,
-+				htmlUrl: prItem.assignee.html_url
-+			};
-+		}
-+
-+		this.createdAt = prItem.created_at;
-+		this.updatedAt = prItem.updated_at ? prItem.updated_at : this.createdAt;
-+		this.commentCount = prItem.comments;
-+		this.commitCount = prItem.commits;
-+
-+		this.head = new GitHubRef(prItem.head.ref, prItem.head.label, prItem.head.sha, prItem.head.repo.clone_url);
-+		this.base = new GitHubRef(prItem.base.ref, prItem.base.label, prItem.base.sha, prItem.base.repo.clone_url);
-+	}
-+
-+	async getFiles() {
-+		const { data } = await this.otcokit.pullRequests.getFiles({
-+			owner: this.remote.owner,
-+			repo: this.remote.repositoryName,
-+			number: this.prItem.number
-+		});
-+
-+		return data;
-+	}
-+
-+	async fetchBaseCommitSha() {
-+		if (!this.prItem.base) {
-+			// this one is from search results, which is not complete.
-+			const { data } = await this.otcokit.pullRequests.get({
-+				owner: this.remote.owner,
-+				repo: this.remote.repositoryName,
-+				number: this.prItem.number
-+			});
-+			this.update(data);
-+		}
-+	}
-+
-+	async getReviewComments(reviewId: string): Promise<Comment[]> {
-+		const reviewData = await this.otcokit.pullRequests.getReviewComments({
-+			owner: this.remote.owner,
-+			repo: this.remote.repositoryName,
-+			number: this.prItem.number,
-+			id: reviewId
-+		});
-+
-+		const rawComments = reviewData.data;
-+		return parseComments(rawComments);
-+	}
-+
-+	async getComments(): Promise<Comment[]> {
-+		const reviewData = await this.otcokit.pullRequests.getComments({
-+			owner: this.remote.owner,
-+			repo: this.remote.repositoryName,
-+			number: this.prItem.number,
-+			per_page: 100
-+		});
-+		const rawComments = reviewData.data;
-+		return parseComments(rawComments);
-+	}
-+
-+	async getTimelineEvents(): Promise<TimelineEvent[]> {
-+		let ret = await this.otcokit.issues.getEventsTimeline({
-+			owner: this.remote.owner,
-+			repo: this.remote.repositoryName,
-+			issue_number: this.prItem.number,
-+			number: this.prItem.number,
-+			per_page: 100
-+		});
-+
-+		return await parseTimelineEvents(this, ret.data);
-+	}
-+
-+	async getDiscussionComments(): Promise<Comment[]> {
-+		const promise = await this.otcokit.issues.getComments({
-+			owner: this.remote.owner,
-+			repo: this.remote.repositoryName,
-+			number: this.prItem.number,
-+			per_page: 100
-+		});
-+
-+		return promise.data;
-+	}
-+
-+	async createDiscussionComment(text: string): Promise<Comment> {
-+		const promise = await this.otcokit.issues.createComment({
-+			body: text,
-+			number: this.prNumber,
-+			owner: this.remote.owner,
-+			repo: this.remote.repositoryName
-+		});
-+
-+		return promise.data;
-+	}
-+
-+	async createCommentReply(body: string, reply_to: string) {
-+		let ret = await this.otcokit.pullRequests.createCommentReply({
-+			owner: this.remote.owner,
-+			repo: this.remote.repositoryName,
-+			number: this.prItem.number,
-+			body: body,
-+			in_reply_to: reply_to
-+		});
-+
-+		return ret;
-+	}
-+
-+	async createComment(body: string, path: string, position: number) {
-+		let ret = await this.otcokit.pullRequests.createComment({
-+			owner: this.remote.owner,
-+			repo: this.remote.repositoryName,
-+			number: this.prItem.number,
-+			body: body,
-+			commit_id: this.prItem.head.sha,
-+			path: path,
-+			position: position
-+		});
-+
-+		return ret;
-+	}
-+
-+	getUserGravatar(): string {
-+		return this.prItem.user.avatar_url;
-+	}
-+
-+	async close() {
-+		let ret = await this.otcokit.pullRequests.update({
-+			owner: this.remote.owner,
-+			repo: this.remote.repositoryName,
-+			number: this.prItem.number,
-+			state: 'closed'
-+		});
-+
-+		return ret.data;
-+	}
-+
-+	equals(other: PullRequestModel): boolean {
-+		if (!other) {
-+			return false;
-+		}
-+
-+		if (this.prNumber !== other.prNumber) {
-+			return false;
-+		}
-+
-+		if (this.html_url !== other.html_url) {
-+			return false;
-+		}
-+
-+		return true;
-+	}
-+}
-added in remote
-  their  100644 d36d73e3e870d29fb731f82d09406a733ef93a2f extensions/git-extended/src/models/remote.ts
-@@ -0,0 +1,40 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+import { Protocol } from './protocol';
-+export class Remote {
-+	public get host(): string {
-+		return this.gitProtocol.host;
-+	}
-+	public get owner(): string {
-+		return this.gitProtocol.owner;
-+	}
-+	public get repositoryName(): string {
-+		return this.gitProtocol.repositoryName;
-+	}
-+
-+	constructor(
-+		public readonly remoteName: string,
-+		public readonly url: string,
-+		public readonly gitProtocol: Protocol,
-+	) { }
-+
-+	equals(remote: Remote): boolean {
-+		if (this.remoteName !== remote.remoteName) {
-+			return false;
-+		}
-+		if (this.host !== remote.host) {
-+			return false;
-+		}
-+		if (this.owner !== remote.owner) {
-+			return false;
-+		}
-+		if (this.repositoryName !== remote.repositoryName) {
-+			return false;
-+		}
-+
-+		return true;
-+	}
-+}
-added in remote
-  their  100644 c702016c1d4714dd20df10b473cfe523acbca304 extensions/git-extended/src/models/repository.ts
-@@ -0,0 +1,495 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+import * as vscode from 'vscode';
-+import { Remote } from './remote';
-+import { GitProcess } from 'dugite';
-+import { uniqBy, anyEvent, filterEvent, isDescendant } from '../common/util';
-+import { CredentialStore } from '../credentials';
-+import { PullRequestModel, PRType } from './pullRequestModel';
-+import { Protocol } from './protocol';
-+import { GitError, GitErrorCodes } from './gitError';
-+import { PullRequestGitHelper } from '../common/pullRequestGitHelper';
-+
-+export enum RefType {
-+	Head,
-+	RemoteHead,
-+	Tag
-+}
-+
-+export interface Ref {
-+	type: RefType;
-+	name?: string;
-+	commit?: string;
-+	remote?: string;
-+}
-+
-+export interface UpstreamRef {
-+	remote: string;
-+	name: string;
-+}
-+
-+export interface Branch extends Ref {
-+	upstream?: UpstreamRef;
-+	ahead?: number;
-+	behind?: number;
-+}
-+
-+export class Repository {
-+	public path: string;
-+
-+	private _onDidRunGitStatus = new vscode.EventEmitter<void>();
-+	readonly onDidRunGitStatus: vscode.Event<void> = this._onDidRunGitStatus.event;
-+
-+	public githubRepositories?: GitHubRepository[] = [];
-+
-+	private _HEAD: Branch | undefined;
-+	get HEAD(): Branch | undefined {
-+		return this._HEAD;
-+	}
-+
-+	private _refs: Ref[] = [];
-+	get refs(): Ref[] {
-+		return this._refs;
-+	}
-+
-+	private _remotes: Remote[] = [];
-+	get remotes(): Remote[] {
-+		return this._remotes;
-+	}
-+
-+	private statusTimeout: any;
-+	private disposables: vscode.Disposable[] = [];
-+
-+	constructor(path: string) {
-+		this.path = path;
-+
-+		const fsWatcher = vscode.workspace.createFileSystemWatcher('**');
-+		this.disposables.push(fsWatcher);
-+
-+		const onWorkspaceChange = anyEvent(fsWatcher.onDidChange, fsWatcher.onDidCreate, fsWatcher.onDidDelete);
-+		const onRepositoryChange = filterEvent(onWorkspaceChange, uri => isDescendant(this.path, uri.fsPath));
-+		const onRelevantRepositoryChange = filterEvent(onRepositoryChange, uri => !/\/\.git(\/index\.lock)?$/.test(uri.path));
-+		onRelevantRepositoryChange(this.onFSChange, this, this.disposables);
-+
-+		this.status();
-+	}
-+
-+	onFSChange() {
-+		clearTimeout(this.statusTimeout);
-+
-+		this.statusTimeout = setTimeout(() => {
-+			this.status();
-+		}, 1000);
-+	}
-+
-+	async status() {
-+		let HEAD: Branch | undefined;
-+
-+		try {
-+			HEAD = await this.getHEAD();
-+
-+			if (HEAD.name) {
-+				try {
-+					HEAD = await this.getBranch(HEAD.name);
-+				} catch (err) {
-+					// noop
-+				}
-+			}
-+		} catch (err) {
-+			// noop
-+		}
-+
-+		const [refs, remotes] = await Promise.all([this.getRefs(), this.getRemotes()]);
-+		this._HEAD = HEAD;
-+		this._refs = refs;
-+		this._remotes = remotes;
-+		this._onDidRunGitStatus.fire();
-+	}
-+
-+	async connectGitHub(credentialStore: CredentialStore) {
-+		let ret: GitHubRepository[] = [];
-+		await Promise.all(this.remotes.map(async remote => {
-+			let isRemoteForPR = await PullRequestGitHelper.isRemoteCreatedForPullRequest(this, remote.remoteName);
-+			if (isRemoteForPR) {
-+				return;
-+			}
-+
-+			let octo = await credentialStore.getOctokit(remote);
-+
-+			if (octo) {
-+				ret.push(new GitHubRepository(remote, octo));
-+			}
-+		}));
-+
-+		this.githubRepositories = ret;
-+	}
-+
-+	async fetch(remoteName: string, branch?: string) {
-+		let args = [
-+			'fetch',
-+			remoteName
-+		];
-+
-+		if (branch) {
-+			args.push(branch);
-+		}
-+
-+		const result = await GitProcess.exec(args, this.path);
-+
-+		if (result.exitCode !== 0) {
-+			throw (result.stderr);
-+		}
-+	}
-+
-+	async checkout(branch: string) {
-+		const result = await GitProcess.exec(
-+			[
-+				'checkout',
-+				branch
-+			],
-+			this.path
-+		);
-+
-+		if (result.exitCode !== 0) {
-+			let rej = new GitError({
-+				stdout: result.stdout,
-+				stderr: result.stderr,
-+			});
-+			if (/error: Your local changes to the following files would be overwritten/.test(result.stderr || '')) {
-+				rej.gitErrorCode = GitErrorCodes.LocalChangesOverwritten;
-+			}
-+			throw rej;
-+		}
-+	}
-+
-+	async getHEAD(): Promise<Ref> {
-+		try {
-+			const result = await GitProcess.exec(['symbolic-ref', '--short', 'HEAD'], this.path);
-+
-+			if (!result.stdout) {
-+				throw new Error('Not in a branch');
-+			}
-+
-+			return { name: result.stdout.trim(), commit: void 0, type: RefType.Head };
-+		} catch (err) {
-+			const result = await GitProcess.exec(['rev-parse', 'HEAD'], this.path);
-+
-+			if (!result.stdout) {
-+				throw new Error('Error parsing HEAD');
-+			}
-+
-+			return { name: void 0, commit: result.stdout.trim(), type: RefType.Head };
-+		}
-+	}
-+
-+	async createBranch(branchName: string, tip?: string) {
-+		const result = await GitProcess.exec(['branch', branchName, tip ? tip : ''], this.path);
-+
-+		if (result.exitCode !== 0) {
-+			throw new Error(result.stderr);
-+		}
-+	}
-+
-+	async getBranch(name: string): Promise<Branch> {
-+		if (name === 'HEAD') {
-+			return this.getHEAD();
-+		}
-+
-+		const result = await GitProcess.exec(['rev-parse', name], this.path);
-+
-+		if (result.exitCode !== 0 || !result.stdout) {
-+			return null;
-+		}
-+
-+		const commit = result.stdout.trim();
-+
-+		try {
-+			const res2 = await GitProcess.exec(['rev-parse', '--symbolic-full-name', name + '@{u}'], this.path);
-+			const fullUpstream = res2.stdout.trim();
-+			const match = /^refs\/remotes\/([^/]+)\/(.+)$/.exec(fullUpstream);
-+
-+			if (!match) {
-+				throw new Error(`Could not parse upstream branch: ${fullUpstream}`);
-+			}
-+
-+			const upstream = { remote: match[1], name: match[2] };
-+			const res3 = await GitProcess.exec(['rev-list', '--left-right', name + '...' + fullUpstream], this.path);
-+
-+			let ahead = 0, behind = 0;
-+			let i = 0;
-+
-+			while (i < res3.stdout.length) {
-+				switch (res3.stdout.charAt(i)) {
-+					case '<': ahead++; break;
-+					case '>': behind++; break;
-+					default: i++; break;
-+				}
-+
-+				while (res3.stdout.charAt(i++) !== '\n') { /* no-op */ }
-+			}
-+
-+			return { name, type: RefType.Head, commit, upstream, ahead, behind };
-+		} catch (err) {
-+			return { name, type: RefType.Head, commit };
-+		}
-+	}
-+
-+	async getLocalBranches(): Promise<string[]> {
-+		let result = await GitProcess.exec(['branch'], this.path);
-+
-+		if (result.exitCode !== 0) {
-+			return [];
-+		}
-+
-+		return result.stdout.trim().split(/\r|\n|\r\n/).map(branchName => {
-+			return branchName.substr(2);
-+		});
-+	}
-+
-+	async getRefs(): Promise<Ref[]> {
-+		const result = await GitProcess.exec(['for-each-ref', '--format', '%(refname) %(objectname)', '--sort', '-committerdate'], this.path);
-+
-+		const fn = (line: string): Ref | null => {
-+			let match: RegExpExecArray | null;
-+
-+			if (match = /^refs\/heads\/([^ ]+) ([0-9a-f]{40})$/.exec(line)) {
-+				return { name: match[1], commit: match[2], type: RefType.Head };
-+			} else if (match = /^refs\/remotes\/([^/]+)\/([^ ]+) ([0-9a-f]{40})$/.exec(line)) {
-+				return { name: `${match[1]}/${match[2]}`, commit: match[3], type: RefType.RemoteHead, remote: match[1] };
-+			} else if (match = /^refs\/tags\/([^ ]+) ([0-9a-f]{40})$/.exec(line)) {
-+				return { name: match[1], commit: match[2], type: RefType.Tag };
-+			}
-+
-+			return null;
-+		};
-+
-+		return result.stdout.trim().split('\n')
-+			.filter(line => !!line)
-+			.map(fn)
-+			.filter(ref => !!ref) as Ref[];
-+	}
-+
-+	async getRemotes(): Promise<Remote[]> {
-+		const result = await GitProcess.exec(['remote', '--verbose'], this.path);
-+		const regex = /^([^\s]+)\s+([^\s]+)\s/;
-+		const rawRemotes = result.stdout.trim().split('\n')
-+			.filter(b => !!b)
-+			.map(line => regex.exec(line) as RegExpExecArray)
-+			.filter(g => !!g)
-+			.map((groups: RegExpExecArray) => ({ name: groups[1], url: groups[2] }));
-+
-+		return uniqBy(rawRemotes, remote => remote.name).map(remote => parseRemote(remote.name, remote.url));
-+	}
-+
-+	async show(filePath: string): Promise<string> {
-+		try {
-+			const result = await GitProcess.exec(['show', filePath], this.path);
-+			return result.stdout.trim();
-+		} catch (e) {
-+			return null;
-+		}
-+	}
-+
-+	async getFileObjectId(commit: string, path: string): Promise<string> {
-+		try {
-+			const args = ['rev-parse', `${commit}:${path}`];
-+
-+			const result = await GitProcess.exec(args, this.path);
-+			return result.stdout.trim();
-+		} catch (e) {
-+			return '';
-+		}
-+	}
-+
-+	async hashObject(text: string): Promise<string> {
-+		try {
-+
-+			const args = ['hash-object', '-w', '--stdin'];
-+
-+			const result = await GitProcess.exec(args, this.path, {
-+				stdin: text
-+			});
-+			return result.stdout.trim();
-+		} catch (e) {
-+			return '';
-+		}
-+	}
-+
-+	async diffHashed(hash0: string, hash1: string) {
-+		try {
-+			const args = ['diff', hash0, hash1];
-+			const result = await GitProcess.exec(args, this.path);
-+			return result.stdout.trim();
-+		} catch (e) {
-+			return '';
-+		}
-+	}
-+
-+	async diff(filePath: string, compareWithCommit: string): Promise<string> {
-+		try {
-+			let args = ['diff', filePath];
-+			if (compareWithCommit) {
-+				args = ['diff', compareWithCommit, '--', filePath];
-+			}
-+
-+			const result = await GitProcess.exec(args, this.path);
-+			return result.stdout.trim();
-+		} catch (e) {
-+			return '';
-+		}
-+	}
-+
-+	async setConfig(key: string, value: string) {
-+		await GitProcess.exec(['config', '--local', key, value], this.path);
-+	}
-+
-+	async getConfig(key: string) {
-+		let result = await GitProcess.exec(['config', '--local', '--get', key], this.path);
-+
-+		if (result.exitCode !== 0) {
-+			return null;
-+		}
-+
-+		return result.stdout.trim();
-+	}
-+
-+	async getConfigs() {
-+		let result = await GitProcess.exec(['config', '--local', '-l'], this.path);
-+
-+		if (result.exitCode !== 0) {
-+			return [];
-+		}
-+
-+		let entries = result.stdout.trim().split(/\r|\r\n|\n/);
-+
-+		return entries.map(entry => {
-+			let ret = entry.split('=');
-+			return {
-+				key: ret[0],
-+				value: ret[1]
-+			};
-+		});
-+	}
-+
-+	async setTrackingBranch(localBranchName: string, trackedBranchName: string) {
-+		let result = await GitProcess.exec(['branch', `--set-upstream-to=${trackedBranchName}`, localBranchName], this.path);
-+
-+		if (result.exitCode !== 0) {
-+			throw (result.exitCode);
-+		}
-+	}
-+
-+	async addRemote(name: string, remoteUrl: string) {
-+		let result = await GitProcess.exec(['remote', 'add', name, remoteUrl], this.path);
-+
-+		if (result.exitCode !== 0) {
-+			throw (result.exitCode);
-+		}
-+	}
-+
-+	async isDirty(): Promise<boolean> {
-+		let result = await GitProcess.exec(['diff', '--no-ext-diff', '--exit-code'], this.path);
-+		return result.exitCode !== 0;
-+	}
-+}
-+
-+export class GitHubRepository {
-+	constructor(public readonly remote: Remote, public readonly octokit: any) {
-+	}
-+
-+	async getPullRequests(prType: PRType) {
-+		if (prType === PRType.All) {
-+			let result = await this.octokit.pullRequests.getAll({
-+				owner: this.remote.owner,
-+				repo: this.remote.repositoryName,
-+			});
-+			let ret = result.data.map(item => {
-+				if (!item.head.repo) {
-+					console.log('The remote branch for this PR was already deleted.');
-+					return null;
-+				}
-+				return new PullRequestModel(this.octokit, this.remote, item);
-+			}).filter(item => item !== null);
-+			return ret;
-+		} else {
-+
-+			const user = await this.octokit.users.get();
-+			const { data } = await this.octokit.search.issues({
-+				q: this.getPRFetchQuery(this.remote.owner, this.remote.repositoryName, user.data.login, prType)
-+			});
-+			let promises = [];
-+
-+			data.items.forEach(item => {
-+				promises.push(new Promise(async (resolve, reject) => {
-+					let prData = await this.octokit.pullRequests.get({
-+						owner: this.remote.owner,
-+						repo: this.remote.repositoryName,
-+						number: item.number
-+					});
-+					resolve(prData);
-+				}));
-+			});
-+
-+			return Promise.all(promises).then(values => {
-+				return values.map(item => {
-+					if (!item.data.head.repo) {
-+						console.log('The remote branch for this PR was already deleted.');
-+						return null;
-+					}
-+					return new PullRequestModel(this.octokit, this.remote, item.data);
-+				}).filter(item => item !== null);
-+			});
-+		}
-+	}
-+
-+	async getPullRequest(id: number) {
-+		let { data } = await this.octokit.pullRequests.get({
-+			owner: this.remote.owner,
-+			repo: this.remote.repositoryName,
-+			number: id
-+		});
-+		if (!data.head.repo) {
-+			console.log('The remote branch for this PR was already deleted.');
-+			return null;
-+		}
-+
-+		let ret = new PullRequestModel(this.octokit, this.remote, data);
-+		return ret;
-+	}
-+
-+	async getUser() {
-+		return await this.octokit.users.get();
-+	}
-+
-+	private getPRFetchQuery(owner: string, repo: string, user: string, type: PRType) {
-+		let filter = '';
-+		switch (type) {
-+			case PRType.RequestReview:
-+				filter = `review-requested:${user}`;
-+				break;
-+			case PRType.ReviewedByMe:
-+				filter = `reviewed-by:${user}`;
-+				break;
-+			case PRType.Mine:
-+				filter = `author:${user}`;
-+				break;
-+			default:
-+				break;
-+		}
-+
-+		return `is:open ${filter} type:pr repo:${owner}/${repo}`;
-+	}
-+}
-+
-+function parseRemote(remoteName: string, url: string): Remote | null {
-+	let gitProtocol = new Protocol(url);
-+
-+	if (gitProtocol.host) {
-+		return new Remote(remoteName, url, gitProtocol);
-+	}
-+
-+	return null;
-+}
-added in remote
-  their  100644 02f80b400329868ba5f4d5c6a64234e7177b1423 extensions/git-extended/src/models/timelineEvent.ts
-@@ -0,0 +1,174 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+import { PullRequestModel } from './pullRequestModel';
-+
-+export enum EventType {
-+	Committed,
-+	Mentioned,
-+	Subscribed,
-+	Commented,
-+	Reviewed,
-+	Other
-+}
-+
-+export interface Author {
-+	name: string;
-+	email: string;
-+	date: Date;
-+}
-+
-+export interface Committer {
-+	name: string;
-+	email: string;
-+	date: Date;
-+}
-+
-+export interface Tree {
-+	sha: string;
-+	url: string;
-+}
-+
-+export interface Parent {
-+	sha: string;
-+	url: string;
-+	html_url: string;
-+}
-+
-+export interface Verification {
-+	verified: boolean;
-+	reason: string;
-+	signature?: any;
-+	payload?: any;
-+}
-+
-+export interface User {
-+	login: string;
-+	id: number;
-+	avatar_url: string;
-+	gravatar_id: string;
-+	url: string;
-+	html_url: string;
-+	followers_url: string;
-+	following_url: string;
-+	gists_url: string;
-+	starred_url: string;
-+	subscriptions_url: string;
-+	organizations_url: string;
-+	repos_url: string;
-+	events_url: string;
-+	received_events_url: string;
-+	type: string;
-+	site_admin: boolean;
-+}
-+
-+export interface Html {
-+	href: string;
-+}
-+
-+export interface PullRequest {
-+	href: string;
-+}
-+
-+export interface Links {
-+	html: Html;
-+	pull_request: PullRequest;
-+}
-+
-+export interface MentionEvent {
-+	id: number;
-+	url: string;
-+	actor: User;
-+	event: EventType;
-+	commit_id: string;
-+	commit_url: string;
-+	created_at: Date;
-+}
-+
-+export interface SubscribeEvent {
-+	id: number;
-+	url: string;
-+	actor: User;
-+	event: EventType;
-+	commit_id: string;
-+	commit_url: string;
-+	created_at: Date;
-+}
-+
-+export interface CommentEvent {
-+	url: string;
-+	html_url: string;
-+	author: Author;
-+	user: User;
-+	created_at: Date;
-+	updated_at: Date;
-+	id: number;
-+	event: EventType;
-+	actor: User;
-+	author_association: string;
-+	body: string;
-+}
-+
-+export interface ReviewEvent {
-+	id: number;
-+	user: User;
-+	body: string;
-+	commit_id: string;
-+	submitted_at: Date;
-+	state: string;
-+	html_url: string;
-+	pull_request_url: string;
-+	author_association: string;
-+	_links: Links;
-+	event: EventType;
-+}
-+
-+export interface CommitEvent {
-+	sha: string;
-+	url: string;
-+	html_url: string;
-+	author: Author;
-+	committer: Committer;
-+	tree: Tree;
-+	message: string;
-+	parents: Parent[];
-+	verification: Verification;
-+	event: EventType;
-+}
-+
-+export type TimelineEvent = CommitEvent | ReviewEvent | SubscribeEvent | CommentEvent | MentionEvent;
-+
-+export function getEventType(text: string) {
-+	switch (text) {
-+		case 'committed':
-+			return EventType.Committed;
-+		case 'mentioned':
-+			return EventType.Mentioned;
-+		case 'subscribed':
-+			return EventType.Subscribed;
-+		case 'commented':
-+			return EventType.Commented;
-+		case 'reviewed':
-+			return EventType.Reviewed;
-+		default:
-+			return EventType.Other;
-+	}
-+}
-+
-+export async function parseTimelineEvents(pullRequest: PullRequestModel, events: any[]): Promise<TimelineEvent[]> {
-+	events.forEach(event => {
-+		let type = getEventType(event.event);
-+		event.event = type;
-+		return event;
-+	});
-+
-+	await Promise.all(
-+		events.filter(event => event.event === EventType.Reviewed)
-+			.map(event => pullRequest.getReviewComments(event.id).then(result => {
-+				event.comments = result;
-+			})));
-+
-+	return events;
-+}
-\ No newline at end of file
-added in remote
-  their  100644 74d6b8b483c9ab6ab485932bdc8c8d5bd082f242 extensions/git-extended/src/prView/prProvider.ts
-@@ -0,0 +1,93 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+import * as fs from 'fs';
-+import * as vscode from 'vscode';
-+import { Configuration } from '../configuration';
-+import { PRType } from '../models/pullRequestModel';
-+import { Repository } from '../models/repository';
-+import { TreeNode } from '../tree/TreeNode';
-+import { PRGroupActionNode, PRGroupTreeNode, PRGroupActionType } from '../tree/prGroupNode';
-+
-+export class PRProvider implements vscode.TreeDataProvider<TreeNode>, vscode.TextDocumentContentProvider, vscode.DecorationProvider {
-+	private static _instance: PRProvider;
-+	private _onDidChangeTreeData = new vscode.EventEmitter<TreeNode>();
-+	readonly onDidChangeTreeData = this._onDidChangeTreeData.event;
-+	private _onDidChange = new vscode.EventEmitter<vscode.Uri>();
-+	get onDidChange(): vscode.Event<vscode.Uri> { return this._onDidChange.event; }
-+
-+	private constructor(
-+		private context: vscode.ExtensionContext,
-+		private configuration: Configuration,
-+		private repository: Repository
-+	) {
-+		context.subscriptions.push(vscode.workspace.registerTextDocumentContentProvider('pr', this));
-+		context.subscriptions.push(vscode.window.registerDecorationProvider(this));
-+		context.subscriptions.push(vscode.commands.registerCommand('pr.refreshList', _ => {
-+			this._onDidChangeTreeData.fire();
-+		}));
-+		this.context.subscriptions.push(vscode.window.registerTreeDataProvider<TreeNode>('pr', this));
-+		this.context.subscriptions.push(this.configuration.onDidChange(e => {
-+			this._onDidChangeTreeData.fire();
-+		}));
-+	}
-+
-+	static initialize(
-+		context: vscode.ExtensionContext,
-+		configuration: Configuration,
-+		repository: Repository) {
-+		PRProvider._instance = new PRProvider(context, configuration, repository);
-+	}
-+
-+	static get instance() {
-+		return PRProvider._instance;
-+	}
-+
-+	getTreeItem(element: TreeNode): vscode.TreeItem {
-+		return element.getTreeItem();
-+	}
-+
-+	async getChildren(element?: TreeNode): Promise<TreeNode[]> {
-+		if (!element) {
-+			return Promise.resolve([
-+				new PRGroupTreeNode(this.repository, PRType.LocalPullRequest),
-+				new PRGroupTreeNode(this.repository, PRType.RequestReview),
-+				new PRGroupTreeNode(this.repository, PRType.ReviewedByMe),
-+				new PRGroupTreeNode(this.repository, PRType.Mine),
-+				new PRGroupTreeNode(this.repository, PRType.All)
-+			]);
-+		}
-+		if (!this.repository.remotes || !this.repository.remotes.length) {
-+			return Promise.resolve([new PRGroupActionNode(PRGroupActionType.Empty)]);
-+		}
-+
-+		return element.getChildren();
-+	}
-+
-+	_onDidChangeDecorations: vscode.EventEmitter<vscode.Uri | vscode.Uri[]> = new vscode.EventEmitter<vscode.Uri | vscode.Uri[]>();
-+	onDidChangeDecorations: vscode.Event<vscode.Uri | vscode.Uri[]> = this._onDidChangeDecorations.event;
-+	provideDecoration(uri: vscode.Uri, token: vscode.CancellationToken): vscode.ProviderResult<vscode.DecorationData> {
-+		if (uri.scheme === 'pr') {
-+			return {
-+				bubble: true,
-+				abbreviation: '♪♪',
-+				title: '♪♪'
-+			};
-+		} else {
-+			return {};
-+		}
-+	}
-+
-+	async provideTextDocumentContent(uri: vscode.Uri, token: vscode.CancellationToken): Promise<string> {
-+		let { path } = JSON.parse(uri.query);
-+		try {
-+			let content = fs.readFileSync(vscode.Uri.file(path).fsPath);
-+			return content.toString();
-+		} catch (e) {
-+			return '';
-+		}
-+	}
-+
-+}
-added in remote
-  their  100644 630e51df5888bb17784ebd082c8fab3adae91bfd extensions/git-extended/src/review/fileChangesProvider.ts
-@@ -0,0 +1,66 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+import * as vscode from 'vscode';
-+import { Resource } from '../common/resources';
-+import { PullRequestModel } from '../models/pullRequestModel';
-+import { PRFileChangeNode } from '../tree/prFileChangeNode';
-+import { PRDescriptionNode } from '../tree/prDescNode';
-+
-+export class FileChangesProvider extends vscode.Disposable implements vscode.TreeDataProvider<PRFileChangeNode | PRDescriptionNode> {
-+	private _onDidChangeTreeData = new vscode.EventEmitter<PRFileChangeNode | PRDescriptionNode>();
-+	readonly onDidChangeTreeData = this._onDidChangeTreeData.event;
-+
-+	private _localFileChanges: PRFileChangeNode[] = [];
-+	private _pullrequest: PullRequestModel = null;
-+	constructor(private context: vscode.ExtensionContext) {
-+		super(() => this.dispose());
-+		this.context.subscriptions.push(vscode.window.registerTreeDataProvider<PRFileChangeNode | PRDescriptionNode>('prStatus', this));
-+	}
-+
-+	async showPullRequestFileChanges(pullrequest: PullRequestModel, fileChanges: PRFileChangeNode[]) {
-+		this._pullrequest = pullrequest;
-+		await vscode.commands.executeCommand(
-+			'setContext',
-+			'git:ispr',
-+			true
-+		);
-+		this._localFileChanges = fileChanges;
-+		this._onDidChangeTreeData.fire();
-+	}
-+
-+	async hide() {
-+		await vscode.commands.executeCommand(
-+			'setContext',
-+			'git:ispr',
-+			false
-+		);
-+	}
-+
-+	getTreeItem(element: PRFileChangeNode | PRDescriptionNode): vscode.TreeItem | Thenable<vscode.TreeItem> {
-+		if (element instanceof PRDescriptionNode) {
-+			return element;
-+		}
-+
-+		if (element.comments && element.comments.length) {
-+			element.iconPath = Resource.icons.light.Comment;
-+		} else {
-+			element.iconPath = Resource.getFileStatusUri(element);
-+		}
-+		element.resourceUri = element.filePath;
-+		return element;
-+	}
-+
-+	getChildren(element?: PRFileChangeNode): vscode.ProviderResult<(PRFileChangeNode | PRDescriptionNode)[]> {
-+		if (!element) {
-+			return [new PRDescriptionNode('Description', {
-+				light: Resource.icons.light.Description,
-+				dark: Resource.icons.dark.Description
-+			}, this._pullrequest), ...this._localFileChanges];
-+		} else {
-+			return [];
-+		}
-+	}
-+}
-\ No newline at end of file
-added in remote
-  their  100644 6301455f0b1f010461a929bea663af3eb006a211 extensions/git-extended/src/review/gitContentProvider.ts
-@@ -0,0 +1,39 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+'use strict';
-+
-+import * as vscode from 'vscode';
-+import { Repository } from '../models/repository';
-+import { fromGitUri } from '../common/uri';
-+
-+export class GitContentProvider implements vscode.TextDocumentContentProvider {
-+	private _onDidChange = new vscode.EventEmitter<vscode.Uri>();
-+	get onDidChange(): vscode.Event<vscode.Uri> { return this._onDidChange.event; }
-+
-+	private _fallback: (uri: vscode.Uri) => Promise<string> = null;
-+
-+	constructor(private repository: Repository) { }
-+
-+	async provideTextDocumentContent(uri: vscode.Uri, token: vscode.CancellationToken): Promise<string> {
-+		let { path, commit } = fromGitUri(uri);
-+
-+		if (!path || !commit) {
-+			return '';
-+		}
-+
-+		let ret = await this.repository.show(`${commit}:${path}`);
-+
-+		if (!ret) {
-+			vscode.window.showErrorMessage(`We couldn't find commit ${commit} locally. You may want to sync the branch with remote. Sometimes commits can disappear after a force-push`);
-+			ret = await this._fallback(uri);
-+		}
-+
-+		return ret || '';
-+	}
-+
-+	registerTextDocumentContentFallback(provider: (uri: vscode.Uri) => Promise<string>) {
-+		this._fallback = provider;
-+	}
-+}
-added in remote
-  their  100644 2c999e9de128da5762be19fb4ad3a6b0ff556604 extensions/git-extended/src/review/reviewManager.ts
-@@ -0,0 +1,765 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+import * as path from 'path';
-+import * as vscode from 'vscode';
-+import { parseDiff } from '../common/diff';
-+import { getDiffLineByPosition, getLastDiffLine, mapCommentsToHead, mapHeadLineToDiffHunkPosition, mapOldPositionToNew } from '../common/diffPositionMapping';
-+import { PullRequestGitHelper } from '../common/pullRequestGitHelper';
-+import { toGitUri, fromGitUri } from '../common/uri';
-+import { groupBy } from '../common/util';
-+import { Comment } from '../models/comment';
-+import { GitChangeType } from '../models/file';
-+import { GitErrorCodes } from '../models/gitError';
-+import { PullRequestModel } from '../models/pullRequestModel';
-+import { Repository } from '../models/repository';
-+import { FileChangesProvider } from './fileChangesProvider';
-+import { GitContentProvider } from './gitContentProvider';
-+import { DiffChangeType } from '../models/diffHunk';
-+import { PRFileChangeNode } from '../tree/prFileChangeNode';
-+
-+
-+export class ReviewManager implements vscode.DecorationProvider {
-+	private static _instance: ReviewManager;
-+	private _documentCommentProvider: vscode.Disposable;
-+	private _workspaceCommentProvider: vscode.Disposable;
-+	private _disposables: vscode.Disposable[];
-+
-+	private _comments: Comment[] = [];
-+	private _localFileChanges: PRFileChangeNode[] = [];
-+	private _obsoleteFileChanges: PRFileChangeNode[] = [];
-+	private _lastCommitSha: string;
-+	private _updateMessageShown: boolean = false;
-+
-+	private _onDidChangeCommentThreads = new vscode.EventEmitter<vscode.CommentThreadChangedEvent>();
-+
-+	private _prFileChangesProvider: FileChangesProvider;
-+	private _statusBarItem: vscode.StatusBarItem;
-+	private _prNumber: number;
-+	private _pr: PullRequestModel;
-+
-+	private constructor(
-+		private _context: vscode.ExtensionContext,
-+		private _repository: Repository
-+	) {
-+		this._documentCommentProvider = null;
-+		this._workspaceCommentProvider = null;
-+		this._disposables = [];
-+		let gitContentProvider = new GitContentProvider(_repository);
-+		gitContentProvider.registerTextDocumentContentFallback(this.provideTextDocumentContent.bind(this));
-+		this._disposables.push(vscode.workspace.registerTextDocumentContentProvider('review', gitContentProvider));
-+		this._disposables.push(vscode.commands.registerCommand('review.openFile', (uri: vscode.Uri) => {
-+			let params = JSON.parse(uri.query);
-+			vscode.commands.executeCommand('vscode.open', vscode.Uri.file(path.resolve(this._repository.path, params.path)), {});
-+		}));
-+		this._disposables.push(_repository.onDidRunGitStatus(e => {
-+			// todo, validate state only when state changes.
-+			this.validateState();
-+		}));
-+		this._disposables.push(vscode.window.registerDecorationProvider(this));
-+		this.validateState();
-+		this.pollForStatusChange();
-+	}
-+
-+	static initialize(
-+		_context: vscode.ExtensionContext,
-+		_repository: Repository
-+	) {
-+		ReviewManager._instance = new ReviewManager(_context, _repository);
-+	}
-+
-+	static get instance() {
-+		return ReviewManager._instance;
-+	}
-+
-+	get prFileChangesProvider() {
-+		if (!this._prFileChangesProvider) {
-+			this._prFileChangesProvider = new FileChangesProvider(this._context);
-+			this._disposables.push(this._prFileChangesProvider);
-+		}
-+
-+		return this._prFileChangesProvider;
-+	}
-+
-+	get statusBarItem() {
-+		if (!this._statusBarItem) {
-+			this._statusBarItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left);
-+		}
-+
-+		return this._statusBarItem;
-+	}
-+
-+	get currentPullRequest(): PullRequestModel {
-+		return this._pr;
-+	}
-+
-+	private pollForStatusChange() {
-+		setTimeout(async () => {
-+			await this.updateComments();
-+			this.pollForStatusChange();
-+		}, 1000 * 10);
-+	}
-+
-+	private async validateState() {
-+		let matchingPullRequestMetadata = await PullRequestGitHelper.getMatchingPullRequestMetadataForBranch(this._repository, this._repository.HEAD.name);
-+
-+		if (!matchingPullRequestMetadata) {
-+			this.clear(true);
-+			return;
-+		}
-+
-+		if (this._prNumber === matchingPullRequestMetadata.prNumber) {
-+			return;
-+		}
-+
-+		let branch = this._repository.HEAD;
-+		if (!branch) {
-+			this.clear(true);
-+			return;
-+		}
-+
-+		let remote = branch.upstream ? branch.upstream.remote : null;
-+		if (!remote) {
-+			this.clear(true);
-+			return;
-+		}
-+
-+		// we switch to another PR, let's clean up first.
-+		this.clear(false);
-+		this._prNumber = matchingPullRequestMetadata.prNumber;
-+		this._lastCommitSha = null;
-+		let githubRepo = this._repository.githubRepositories.find(repo =>
-+			repo.remote.owner.toLocaleLowerCase() === matchingPullRequestMetadata.owner.toLocaleLowerCase()
-+		);
-+
-+		if (!githubRepo) {
-+			return; // todo, should show warning
-+		}
-+
-+		const pr = await githubRepo.getPullRequest(this._prNumber);
-+		if (!pr) {
-+			console.log('This PR is no longer valid');
-+			return;
-+		}
-+		this._pr = pr;
-+		if (!this._lastCommitSha) {
-+			this._lastCommitSha = pr.head.sha;
-+		}
-+
-+		await this.getPullRequestData(pr);
-+		await this.prFileChangesProvider.showPullRequestFileChanges(pr, this._localFileChanges);
-+
-+		this._onDidChangeDecorations.fire();
-+		this.registerCommentProvider();
-+
-+		this.statusBarItem.text = '$(git-branch) Pull Request #' + this._prNumber;
-+		this.statusBarItem.command = 'pr.openInGitHub';
-+		this.statusBarItem.show();
-+		vscode.commands.executeCommand('pr.refreshList');
-+	}
-+
-+	private async replyToCommentThread(document: vscode.TextDocument, range: vscode.Range, thread: vscode.CommentThread, text: string) {
-+		try {
-+			let ret = await this._pr.createCommentReply(text, thread.threadId);
-+			thread.comments.push({
-+				commentId: ret.data.id,
-+				body: new vscode.MarkdownString(ret.data.body),
-+				userName: ret.data.user.login,
-+				gravatar: ret.data.user.avatar_url
-+			});
-+			return thread;
-+		} catch (e) {
-+			return null;
-+		}
-+	}
-+	private async createNewCommentThread(document: vscode.TextDocument, range: vscode.Range, text: string) {
-+		try {
-+			let uri = document.uri;
-+			let fileName = uri.path;
-+			let matchedFiles = this._localFileChanges.filter(fileChange => path.resolve(this._repository.path, fileChange.fileName) === fileName);
-+			if (matchedFiles && matchedFiles.length) {
-+				let matchedFile = matchedFiles[0];
-+				// git diff sha -- fileName
-+				let contentDiff = await this._repository.diff(matchedFile.fileName, this._lastCommitSha);
-+				let position = mapHeadLineToDiffHunkPosition(matchedFile.diffHunks, contentDiff, range.start.line);
-+
-+				if (position < 0) {
-+					return;
-+				}
-+
-+				// there is no thread Id, which means it's a new thread
-+				let ret = await this._pr.createComment(text, matchedFile.fileName, position);
-+
-+				let comment = {
-+					commentId: ret.data.id,
-+					body: new vscode.MarkdownString(ret.data.body),
-+					userName: ret.data.user.login,
-+					gravatar: ret.data.user.avatar_url
-+				};
-+
-+				let commentThread: vscode.CommentThread = {
-+					threadId: comment.commentId,
-+					resource: uri,
-+					range: range,
-+					comments: [comment]
-+				};
-+
-+				return commentThread;
-+			}
-+		} catch (e) {
-+			return null;
-+		}
-+	}
-+
-+	private async updateComments(): Promise<void> {
-+		const matchingPullRequestMetadata = await PullRequestGitHelper.getMatchingPullRequestMetadataForBranch(this._repository, this._repository.HEAD.name);
-+		if (!matchingPullRequestMetadata) { return; }
-+
-+		const branch = this._repository.HEAD;
-+		if (!branch) { return; }
-+
-+		const remote = branch.upstream ? branch.upstream.remote : null;
-+		if (!remote) { return; }
-+
-+		const githubRepo = this._repository.githubRepositories.find(repo =>
-+			repo.remote.owner.toLocaleLowerCase() === matchingPullRequestMetadata.owner.toLocaleLowerCase()
-+		);
-+
-+		if (!githubRepo) {
-+			return;
-+		}
-+
-+		const pr = await githubRepo.getPullRequest(this._prNumber);
-+		if (!pr) {
-+			console.log('This PR is no longer valid');
-+			return;
-+		}
-+
-+		if (pr.prItem.head.sha !== this._lastCommitSha && !this._updateMessageShown) {
-+			this._updateMessageShown = true;
-+			let result = await vscode.window.showInformationMessage('There are updates available for this branch.', {}, 'Pull');
-+
-+			if (result === 'Pull') {
-+				await vscode.commands.executeCommand('git.pull');
-+				this._updateMessageShown = false;
-+			}
-+		}
-+
-+		const comments = await pr.getComments();
-+
-+		let added: vscode.CommentThread[] = [];
-+		let removed: vscode.CommentThread[] = [];
-+		let changed: vscode.CommentThread[] = [];
-+
-+		const oldCommentThreads = this.commentsToCommentThreads(this._comments);
-+		const newCommentThreads = this.commentsToCommentThreads(comments);
-+
-+		oldCommentThreads.forEach(thread => {
-+			// No current threads match old thread, it has been removed
-+			const matchingThreads = newCommentThreads.filter(newThread => newThread.threadId === thread.threadId);
-+			if (matchingThreads.length === 0) {
-+				removed.push(thread);
-+			}
-+		});
-+
-+		function commentsEditedInThread(oldComments: vscode.Comment[], newComments: vscode.Comment[]): boolean {
-+			oldComments.forEach(oldComment => {
-+				const matchingComment = newComments.filter(newComment => newComment.commentId === oldComment.commentId);
-+				if (matchingComment.length !== 1) {
-+					return true;
-+				}
-+
-+				if (matchingComment[0].body.value !== oldComment.body.value) {
-+					return true;
-+				}
-+			});
-+
-+			return false;
-+		}
-+
-+		newCommentThreads.forEach(thread => {
-+			const matchingCommentThread = oldCommentThreads.filter(oldComment => oldComment.threadId === thread.threadId);
-+
-+			// No old threads match this thread, it is new
-+			if (matchingCommentThread.length === 0) {
-+				added.push(thread);
-+				if (thread.resource.scheme === 'file') {
-+					thread.collapsibleState = vscode.CommentThreadCollapsibleState.Collapsed;
-+				}
-+			}
-+
-+			// Check if comment has been updated
-+			matchingCommentThread.forEach(match => {
-+				if (match.comments.length !== thread.comments.length || commentsEditedInThread(matchingCommentThread[0].comments, thread.comments)) {
-+					changed.push(thread);
-+				}
-+			});
-+		});
-+
-+		if (added.length || removed.length || changed.length) {
-+			this._onDidChangeCommentThreads.fire({
-+				added: added,
-+				removed: removed,
-+				changed: changed
-+			});
-+
-+			this._comments = comments;
-+			this._onDidChangeDecorations.fire();
-+		}
-+
-+
-+		return Promise.resolve(null);
-+	}
-+
-+	private async getPullRequestData(pr: PullRequestModel): Promise<void> {
-+		try {
-+			this._comments = await pr.getComments();
-+			let activeComments = this._comments.filter(comment => comment.position);
-+			let outdatedComments = this._comments.filter(comment => !comment.position);
-+
-+			const data = await pr.getFiles();
-+			await pr.fetchBaseCommitSha();
-+			let baseSha = pr.base.sha;
-+			let headSha = pr.head.sha;
-+			const richContentChanges = await parseDiff(data, this._repository, baseSha);
-+			this._localFileChanges = richContentChanges.map(change => {
-+				let changedItem = new PRFileChangeNode(
-+					pr,
-+					change.fileName,
-+					change.status,
-+					change.fileName,
-+					change.blobUrl,
-+					toGitUri(vscode.Uri.parse(change.fileName), null, null, change.status === GitChangeType.DELETE ? '' : pr.prItem.head.sha, {}),
-+					toGitUri(vscode.Uri.parse(change.fileName), null, null, change.status === GitChangeType.ADD ? '' : pr.prItem.base.sha, {}),
-+					this._repository.path,
-+					change.diffHunks
-+				);
-+				changedItem.sha = headSha;
-+				changedItem.comments = activeComments.filter(comment => comment.path === changedItem.fileName);
-+				return changedItem;
-+			});
-+
-+			let commitsGroup = groupBy(outdatedComments, comment => comment.original_commit_id);
-+			this._obsoleteFileChanges = [];
-+			for (let commit in commitsGroup) {
-+				let commentsForCommit = commitsGroup[commit];
-+				let commentsForFile = groupBy(commentsForCommit, comment => comment.path);
-+				for (let fileName in commentsForFile) {
-+					let oldComments = commentsForFile[fileName];
-+					let obsoleteFileChange = new PRFileChangeNode(
-+						pr,
-+						fileName,
-+						GitChangeType.MODIFY,
-+						fileName,
-+						null,
-+						toGitUri(vscode.Uri.parse(path.join(`commit~${commit.substr(0, 8)}`, fileName)), fileName, null, oldComments[0].original_commit_id, {}),
-+						toGitUri(vscode.Uri.parse(path.join(`commit~${commit.substr(0, 8)}`, fileName)), fileName, null, oldComments[0].original_commit_id, {}),
-+						this._repository.path,
-+						[] // @todo Peng.
-+					);
-+
-+					obsoleteFileChange.sha = commit;
-+
-+					obsoleteFileChange.comments = oldComments;
-+					this._obsoleteFileChanges.push(obsoleteFileChange);
-+				}
-+			}
-+
-+			return Promise.resolve(null);
-+		} catch (e) {
-+			console.log(e);
-+		}
-+
-+	}
-+
-+	private outdatedCommentsToCommentThreads(fileChange: PRFileChangeNode, comments: Comment[], collapsibleState: vscode.CommentThreadCollapsibleState = vscode.CommentThreadCollapsibleState.Expanded): vscode.CommentThread[] {
-+		if (!comments || !comments.length) {
-+			return [];
-+		}
-+
-+		let fileCommentGroups = groupBy(comments, comment => comment.path);
-+		let ret: vscode.CommentThread[] = [];
-+
-+		for (let file in fileCommentGroups) {
-+			let fileComments = fileCommentGroups[file];
-+			let sections = groupBy(fileComments, comment => String(comment.position));
-+
-+			for (let i in sections) {
-+				let comments = sections[i];
-+
-+				const comment = comments[0];
-+				let diffLine = getDiffLineByPosition(comment.diff_hunks, comment.position === null ? comment.original_position : comment.position);
-+
-+				if (diffLine) {
-+					comment.absolutePosition = diffLine.newLineNumber;
-+				}
-+
-+				const pos = new vscode.Position(comment.absolutePosition ? comment.absolutePosition - 1 : 0, 0);
-+				const range = new vscode.Range(pos, pos);
-+
-+				ret.push({
-+					threadId: comment.id,
-+					resource: fileChange.filePath,
-+					range,
-+					comments: comments.map(comment => {
-+						return {
-+							commentId: comment.id,
-+							body: new vscode.MarkdownString(comment.body),
-+							userName: comment.user.login,
-+							gravatar: comment.user.avatar_url,
-+							command: {
-+								title: 'View Changes',
-+								command: 'pr.viewChanges',
-+								arguments: [
-+									fileChange
-+								]
-+							}
-+						};
-+					}),
-+					collapsibleState: collapsibleState
-+				});
-+			}
-+
-+		}
-+		return ret;
-+	}
-+
-+	private commentsToCommentThreads(comments: Comment[], collapsibleState: vscode.CommentThreadCollapsibleState = vscode.CommentThreadCollapsibleState.Expanded): vscode.CommentThread[] {
-+		if (!comments || !comments.length) {
-+			return [];
-+		}
-+
-+		let fileCommentGroups = groupBy(comments, comment => comment.path);
-+		let ret: vscode.CommentThread[] = [];
-+
-+		for (let file in fileCommentGroups) {
-+			let fileComments = fileCommentGroups[file];
-+			let sections = groupBy(fileComments, comment => String(comment.position));
-+
-+			for (let i in sections) {
-+				let comments = sections[i];
-+
-+				const comment = comments[0];
-+				const pos = new vscode.Position(comment.absolutePosition ? comment.absolutePosition - 1 : 0, 0);
-+				const range = new vscode.Range(pos, pos);
-+
-+				ret.push({
-+					threadId: comment.id,
-+					resource: vscode.Uri.file(path.resolve(this._repository.path, comment.path)),
-+					range,
-+					comments: comments.map(comment => {
-+						return {
-+							commentId: comment.id,
-+							body: new vscode.MarkdownString(comment.body),
-+							userName: comment.user.login,
-+							gravatar: comment.user.avatar_url
-+						};
-+					}),
-+					collapsibleState: collapsibleState
-+				});
-+			}
-+
-+		}
-+		return ret;
-+	}
-+
-+	_onDidChangeDecorations: vscode.EventEmitter<vscode.Uri | vscode.Uri[]> = new vscode.EventEmitter<vscode.Uri | vscode.Uri[]>();
-+	onDidChangeDecorations: vscode.Event<vscode.Uri | vscode.Uri[]> = this._onDidChangeDecorations.event;
-+	provideDecoration(uri: vscode.Uri, token: vscode.CancellationToken): vscode.ProviderResult<vscode.DecorationData> {
-+		if (uri.scheme === 'review') {
-+			let query = JSON.parse(uri.query);
-+			let matchingComments = this._comments.filter(comment => comment.path === query.path);
-+			if (matchingComments && matchingComments.length) {
-+				return {
-+					bubble: true,
-+					abbreviation: '♪♪',
-+					title: '♪♪'
-+				};
-+			}
-+		} else if (uri.scheme === 'file') {
-+			// local file
-+			let fileName = uri.path;
-+			let matchingComments = this._comments.filter(comment => path.resolve(this._repository.path, comment.path) === fileName);
-+			if (matchingComments && matchingComments.length) {
-+				return {
-+					bubble: true,
-+					abbreviation: '♪♪',
-+					title: '♪♪'
-+				};
-+			}
-+		}
-+
-+		return {};
-+	}
-+
-+	private registerCommentProvider() {
-+		this._documentCommentProvider = vscode.workspace.registerDocumentCommentProvider({
-+			onDidChangeCommentThreads: this._onDidChangeCommentThreads.event,
-+			provideDocumentComments: async (document: vscode.TextDocument, token: vscode.CancellationToken): Promise<vscode.CommentInfo> => {
-+				let ranges: vscode.Range[] = [];
-+				let matchingComments: Comment[];
-+
-+				if (document.uri.scheme === 'file') {
-+					// local file, we only provide active comments.
-+					const fileName = document.uri.fsPath;
-+					const matchedFiles = this._localFileChanges.filter(fileChange => path.resolve(this._repository.path, fileChange.fileName) === fileName);
-+					if (matchedFiles && matchedFiles.length) {
-+						const matchedFile = matchedFiles[0];
-+
-+						let contentDiff: string;
-+						if (document.isDirty) {
-+							const documentText = document.getText();
-+							const idAtLastCommit = await this._repository.getFileObjectId(this._lastCommitSha, matchedFile.fileName);
-+							const idOfCurrentText = await this._repository.hashObject(documentText);
-+
-+							// git diff <blobid> <blobid>
-+							contentDiff = await this._repository.diffHashed(idAtLastCommit, idOfCurrentText);
-+						} else {
-+							// git diff sha -- fileName
-+							contentDiff = await this._repository.diff(matchedFile.fileName, this._lastCommitSha);
-+						}
-+
-+						matchingComments = this._comments.filter(comment => path.resolve(this._repository.path, comment.path) === fileName);
-+						matchingComments = mapCommentsToHead(matchedFile.diffHunks, contentDiff, matchingComments);
-+
-+						let diffHunks = matchedFile.diffHunks;
-+
-+						for (let i = 0; i < diffHunks.length; i++) {
-+							let diffHunk = diffHunks[i];
-+							let start = mapOldPositionToNew(contentDiff, diffHunk.newLineNumber);
-+							let end = mapOldPositionToNew(contentDiff, diffHunk.newLineNumber + diffHunk.newLength - 1);
-+							if (start > 0 && end > 0) {
-+								ranges.push(new vscode.Range(start - 1, 0, end - 1, 0));
-+							}
-+						}
-+					}
-+
-+					return {
-+						threads: this.commentsToCommentThreads(matchingComments, vscode.CommentThreadCollapsibleState.Collapsed),
-+						commentingRanges: ranges,
-+					};
-+				}
-+
-+				if (document.uri.scheme === 'review') {
-+					let matchedFile = this.findMatchedFileChange(this._localFileChanges, document.uri);
-+
-+					if (matchedFile) {
-+						let matchingComments = matchedFile.comments;
-+						matchingComments.forEach(comment => {
-+							let diffLine = getDiffLineByPosition(matchedFile.diffHunks, comment.position === null ? comment.original_position : comment.position);
-+
-+							if (diffLine) {
-+								comment.absolutePosition = diffLine.newLineNumber;
-+							}
-+						});
-+
-+						let diffHunks = matchedFile.diffHunks;
-+
-+						for (let i = 0; i < diffHunks.length; i++) {
-+							let diffHunk = diffHunks[i];
-+							ranges.push(new vscode.Range(diffHunk.newLineNumber, 1, diffHunk.newLineNumber + diffHunk.newLength - 1, 1));
-+						}
-+
-+						return {
-+							threads: this.commentsToCommentThreads(matchingComments, vscode.CommentThreadCollapsibleState.Expanded),
-+							commentingRanges: ranges,
-+						};
-+					}
-+
-+					// comments are outdated
-+					matchedFile = this.findMatchedFileChange(this._obsoleteFileChanges, document.uri);
-+					if (!matchedFile) {
-+						return null;
-+					}
-+
-+
-+					let sections = groupBy(matchedFile.comments, comment => comment.original_position); // comment.position is null in this case.
-+					let ret: vscode.CommentThread[] = [];
-+					for (let i in sections) {
-+						let comments = sections[i];
-+						const comment = comments[0];
-+						let diffLine = getLastDiffLine(comment.diff_hunk);
-+						const pos = new vscode.Position(diffLine.newLineNumber - 1, 0);
-+						const range = new vscode.Range(pos, pos);
-+
-+						ret.push({
-+							threadId: comment.id,
-+							resource: matchedFile.filePath,
-+							range,
-+							comments: comments.map(comment => {
-+								return {
-+									commentId: comment.id,
-+									body: new vscode.MarkdownString(comment.body),
-+									userName: comment.user.login,
-+									gravatar: comment.user.avatar_url
-+								};
-+							}),
-+							collapsibleState: vscode.CommentThreadCollapsibleState.Expanded
-+						});
-+
-+
-+						return {
-+							threads: ret
-+						};
-+					}
-+				}
-+			},
-+			createNewCommentThread: this.createNewCommentThread.bind(this),
-+			replyToCommentThread: this.replyToCommentThread.bind(this)
-+		});
-+
-+		this._workspaceCommentProvider = vscode.workspace.registerWorkspaceCommentProvider({
-+			onDidChangeCommentThreads: this._onDidChangeCommentThreads.event,
-+			provideWorkspaceComments: async (token: vscode.CancellationToken) => {
-+				const comments = await Promise.all(this._localFileChanges.map(async fileChange => {
-+					return this.commentsToCommentThreads(fileChange.comments);
-+				}));
-+				const outdatedComments = this._obsoleteFileChanges.map(fileChange => {
-+					return this.outdatedCommentsToCommentThreads(fileChange, fileChange.comments);
-+				});
-+				return [...comments, ...outdatedComments].reduce((prev, curr) => prev.concat(curr), []);
-+			},
-+			createNewCommentThread: this.createNewCommentThread.bind(this),
-+			replyToCommentThread: this.replyToCommentThread.bind(this)
-+		});
-+	}
-+
-+	private findMatchedFileChange(fileChanges: PRFileChangeNode[], uri: vscode.Uri) {
-+		let query = JSON.parse(uri.query);
-+		let matchedFiles = fileChanges.filter(fileChange => {
-+			if (fileChange.fileName !== query.path) {
-+				return false;
-+			}
-+
-+			let q = JSON.parse(fileChange.filePath.query);
-+
-+			if (q.commit !== query.commit) {
-+				return false;
-+			}
-+			return true;
-+		});
-+
-+		if (matchedFiles && matchedFiles.length) {
-+			return matchedFiles[0];
-+		}
-+
-+		return null;
-+	}
-+
-+	public async switch(pr: PullRequestModel): Promise<void> {
-+		let isDirty = await this._repository.isDirty();
-+		if (isDirty) {
-+			vscode.window.showErrorMessage('Your local changes would be overwritten by checkout, please commit your changes or stash them before you switch branches');
-+			return;
-+		}
-+
-+		this.statusBarItem.text = '$(sync~spin) Switching to Review Mode';
-+		this.statusBarItem.command = null;
-+		this.statusBarItem.show();
-+
-+		try {
-+			let localBranchInfo = await PullRequestGitHelper.getBranchForPullRequestFromExistingRemotes(this._repository, pr);
-+
-+			if (localBranchInfo) {
-+				await PullRequestGitHelper.checkout(this._repository, localBranchInfo.remote, localBranchInfo.branch, pr);
-+			} else {
-+				await PullRequestGitHelper.createAndCheckout(this._repository, pr);
-+			}
-+		} catch (e) {
-+			if (e.gitErrorCode) {
-+				// for known git errors, we should provide actions for users to continue.
-+				if (e.gitErrorCode === GitErrorCodes.LocalChangesOverwritten) {
-+					vscode.window.showErrorMessage('Your local changes would be overwritten by checkout, please commit your changes or stash them before you switch branches');
-+					return;
-+				}
-+			}
-+
-+			vscode.window.showErrorMessage(e);
-+			// todo, we should try to recover, for example, git checkout succeeds but set config fails.
-+			return;
-+		}
-+
-+		await this._repository.status();
-+		await this.validateState();
-+	}
-+
-+	private clear(quitReviewMode: boolean) {
-+		this._prNumber = null;
-+		this._pr = null;
-+		this._updateMessageShown = false;
-+
-+		if (this._documentCommentProvider) {
-+			this._documentCommentProvider.dispose();
-+		}
-+
-+		if (this._workspaceCommentProvider) {
-+			this._workspaceCommentProvider.dispose();
-+		}
-+
-+		if (quitReviewMode) {
-+			if (this._statusBarItem) {
-+				this._statusBarItem.hide();
-+			}
-+
-+			if (this._prFileChangesProvider) {
-+				this.prFileChangesProvider.hide();
-+			}
-+
-+			// Ensure file explorer decorations are removed. When switching to a different PR branch,
-+			// comments are recalculated when getting the data and the change decoration fired then,
-+			// so comments only needs to be emptied in this case.
-+			this._comments = [];
-+			this._onDidChangeDecorations.fire();
-+		}
-+
-+		vscode.commands.executeCommand('pr.refreshList');
-+	}
-+
-+	async provideTextDocumentContent(uri: vscode.Uri): Promise<string> {
-+		let { path, commit } = fromGitUri(uri);
-+		let changedItems = this._localFileChanges
-+			.filter(change => change.fileName === path)
-+			.filter(fileChange => fileChange.sha === commit || (fileChange.parentSha ? fileChange.parentSha : `${fileChange.sha}^`) === commit);
-+
-+		if (changedItems.length) {
-+			let changedItem = changedItems[0];
-+			let diffChangeTypeFilter = commit === changedItem.sha ? DiffChangeType.Delete : DiffChangeType.Add;
-+			let ret = changedItem.diffHunks.map(diffHunk => diffHunk.diffLines.filter(diffLine => diffLine.type !== diffChangeTypeFilter).map(diffLine => diffLine.text));
-+			return ret.reduce((prev, curr) => prev.concat(...curr), []).join('\n');
-+		}
-+
-+		changedItems = this._obsoleteFileChanges
-+			.filter(change => change.fileName === path)
-+			.filter(fileChange => fileChange.sha === commit || (fileChange.parentSha ? fileChange.parentSha : `${fileChange.sha}^`) === commit);
-+
-+		if (changedItems.length) {
-+			// it's from obsolete file changes, which means the content is in complete.
-+			let changedItem = changedItems[0];
-+			let diffChangeTypeFilter = commit === changedItem.sha ? DiffChangeType.Delete : DiffChangeType.Add;
-+			let ret = [];
-+			let commentGroups = groupBy(changedItem.comments, comment => comment.original_position);
-+
-+			for (let comment_position in commentGroups) {
-+				let lines = commentGroups[comment_position][0].diff_hunks
-+					.map(diffHunk =>
-+						diffHunk.diffLines.filter(diffLine => diffLine.type !== diffChangeTypeFilter)
-+							.map(diffLine => diffLine.text)
-+					).reduce((prev, curr) => prev.concat(...curr), []);
-+				ret.push(...lines);
-+			}
-+
-+			return ret.join('\n');
-+		}
-+
-+		return null;
-+	}
-+
-+	dispose() {
-+		this.clear(true);
-+		this._disposables.forEach(dispose => {
-+			dispose.dispose();
-+		});
-+	}
-+}
-\ No newline at end of file
-added in remote
-  their  100644 374ba7001a889633b534d76120ad68c23eac342e extensions/git-extended/src/tree/prDescNode.ts
-@@ -0,0 +1,28 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+import * as vscode from 'vscode';
-+import { TreeNode } from './TreeNode';
-+import { PullRequestModel } from '../models/pullRequestModel';
-+
-+export class PRDescriptionNode extends TreeNode implements vscode.TreeItem {
-+	public command?: vscode.Command;
-+
-+	constructor(public label: string, public iconPath: string | vscode.Uri | { light: string | vscode.Uri; dark: string | vscode.Uri }, public prModel: PullRequestModel) {
-+		super();
-+
-+		this.command = {
-+			title: 'View Pull Request Description',
-+			command: 'pr.openDescription',
-+			arguments: [
-+				this.prModel
-+			]
-+		};
-+	}
-+
-+	getTreeItem(): vscode.TreeItem {
-+		return this;
-+	}
-+}
-added in remote
-  their  100644 fa9f19e9c2e7a11120378296973eae2d4c1afa23 extensions/git-extended/src/tree/prFileChangeNode.ts
-@@ -0,0 +1,73 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+import * as vscode from 'vscode';
-+import { TreeNode } from './TreeNode';
-+import { GitChangeType } from '../models/file';
-+import { PullRequestModel } from '../models/pullRequestModel';
-+import { DiffHunk } from '../models/diffHunk';
-+import { Resource } from '../common/resources';
-+
-+export class PRFileChangeNode extends TreeNode implements vscode.TreeItem {
-+	public iconPath?: string | vscode.Uri | { light: string | vscode.Uri; dark: string | vscode.Uri };
-+	public resourceUri: vscode.Uri;
-+	public sha: string;
-+	public parentSha: string;
-+	public command?: vscode.Command;
-+	public comments?: any[];
-+	public contextValue: string;
-+
-+	get letter(): string {
-+		switch (this.status) {
-+			case GitChangeType.MODIFY:
-+				return 'M';
-+			case GitChangeType.ADD:
-+				return 'A';
-+			case GitChangeType.DELETE:
-+				return 'D';
-+			case GitChangeType.RENAME:
-+				return 'R';
-+			case GitChangeType.UNKNOWN:
-+				return 'U';
-+			default:
-+				return 'C';
-+		}
-+	}
-+
-+	constructor(
-+		public readonly pullRequest: PullRequestModel,
-+		public readonly label: string,
-+		public readonly status: GitChangeType,
-+		public readonly fileName: string,
-+		public blobUrl: string,
-+		public readonly filePath: vscode.Uri,
-+		public readonly parentFilePath: vscode.Uri,
-+		public readonly workspaceRoot: string,
-+		public readonly diffHunks: DiffHunk[]
-+	) {
-+		super();
-+		this.contextValue = 'filechange';
-+		this.command = {
-+			title: 'show diff',
-+			command: 'vscode.diff',
-+			arguments: [
-+				this.parentFilePath,
-+				this.filePath,
-+				this.fileName
-+			]
-+		};
-+	}
-+
-+	getTreeItem(): vscode.TreeItem {
-+		if (this.comments && this.comments.length) {
-+			this.iconPath = Resource.icons.light.Comment;
-+		} else {
-+			this.iconPath = Resource.getFileStatusUri(this);
-+		}
-+		this.resourceUri = this.filePath;
-+		return this;
-+	}
-+
-+}
-\ No newline at end of file
-added in remote
-  their  100644 678375a1367f20459abaeb08e68f3e83e11722d8 extensions/git-extended/src/tree/prGroupNode.ts
-@@ -0,0 +1,131 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+import * as vscode from 'vscode';
-+import { TreeNode } from './TreeNode';
-+import { PRType, PullRequestModel } from '../models/pullRequestModel';
-+import { PullRequestGitHelper } from '../common/pullRequestGitHelper';
-+import { Repository } from '../models/repository';
-+import { Resource } from '../common/resources';
-+import { PRNode } from './prNode';
-+
-+export enum PRGroupActionType {
-+	Empty,
-+	More
-+}
-+
-+export class PRGroupActionNode extends TreeNode implements vscode.TreeItem {
-+	public readonly label: string;
-+	public collapsibleState: vscode.TreeItemCollapsibleState;
-+	public iconPath?: { light: string | vscode.Uri; dark: string | vscode.Uri };
-+	public type: PRGroupActionType;
-+	constructor(type: PRGroupActionType) {
-+		super();
-+		this.type = type;
-+		this.collapsibleState = vscode.TreeItemCollapsibleState.None;
-+		switch (type) {
-+			case PRGroupActionType.Empty:
-+				this.label = '0 pull request in this category';
-+				break;
-+			case PRGroupActionType.More:
-+				this.label = 'Load more';
-+				this.iconPath = {
-+					light: Resource.icons.light.fold,
-+					dark: Resource.icons.dark.fold
-+				};
-+				break;
-+			default:
-+				break;
-+		}
-+	}
-+
-+	getTreeItem(): vscode.TreeItem {
-+		return this;
-+	}
-+}
-+
-+export class PRGroupTreeNode extends TreeNode implements vscode.TreeItem {
-+	public readonly label: string;
-+	public collapsibleState: vscode.TreeItemCollapsibleState;
-+	public prs: PullRequestModel[];
-+	public type: PRType;
-+
-+	constructor(
-+		private repository: Repository,
-+		type: PRType
-+	) {
-+		super();
-+
-+		this.prs = [];
-+		this.collapsibleState = vscode.TreeItemCollapsibleState.Collapsed;
-+		this.type = type;
-+		switch (type) {
-+			case PRType.All:
-+				this.label = 'All';
-+				break;
-+			case PRType.RequestReview:
-+				this.label = 'Waiting For My Review';
-+				break;
-+			case PRType.ReviewedByMe:
-+				this.label = 'Reviewed By Me';
-+				break;
-+			case PRType.Mine:
-+				this.label = 'Created By Me';
-+				break;
-+			case PRType.LocalPullRequest:
-+				this.label = 'Local Pull Request Branches';
-+				break;
-+			default:
-+				break;
-+		}
-+	}
-+
-+	async getChildren(): Promise<TreeNode[]> {
-+		let prItems = await this.getPRs();
-+		if (prItems && prItems.length) {
-+			return prItems.map(prItem => new PRNode(this.repository, prItem));
-+		} else {
-+			return [new PRGroupActionNode(PRGroupActionType.Empty)];
-+		}
-+	}
-+
-+	getTreeItem(): vscode.TreeItem {
-+		return this;
-+	}
-+
-+	async getPRs(): Promise<PullRequestModel[]> {
-+		if (this.type === PRType.LocalPullRequest) {
-+			let infos = await PullRequestGitHelper.getLocalBranchesMarkedAsPullRequest(this.repository);
-+			let promises = infos.map(async info => {
-+				let owner = info.owner;
-+				let prNumber = info.prNumber;
-+				let githubRepo = this.repository.githubRepositories.find(repo => repo.remote.owner.toLocaleLowerCase() === owner.toLocaleLowerCase());
-+
-+				if (!githubRepo) {
-+					return Promise.resolve([]);
-+				}
-+
-+				return [await githubRepo.getPullRequest(prNumber)];
-+			});
-+
-+			return Promise.all(promises).then(values => {
-+				return values.reduce((prev, curr) => prev.concat(...curr), []).filter(value => value !== null);
-+			});
-+		}
-+
-+		let promises = this.repository.githubRepositories.map(async githubRepository => {
-+			let remote = githubRepository.remote.remoteName;
-+			let isRemoteForPR = await PullRequestGitHelper.isRemoteCreatedForPullRequest(this.repository, remote);
-+			if (isRemoteForPR) {
-+				return Promise.resolve([]);
-+			}
-+			return [await githubRepository.getPullRequests(this.type)];
-+		});
-+
-+		return Promise.all(promises).then(values => {
-+			return values.reduce((prev, curr) => prev.concat(...curr), []);
-+		});
-+	}
-+}
-added in remote
-  their  100644 80be8114db3b364c851177e8f9b858a28c416a5d extensions/git-extended/src/tree/prNode.ts
-@@ -0,0 +1,193 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+import * as path from 'path';
-+import * as vscode from 'vscode';
-+import { Repository } from '../models/repository';
-+import { PullRequestModel } from '../models/pullRequestModel';
-+import { TreeNode } from './TreeNode';
-+import { Resource } from '../common/resources';
-+import { parseDiff } from '../common/diff';
-+import { Comment } from '../models/comment';
-+import { toPRUri } from '../common/uri';
-+import { mapHeadLineToDiffHunkPosition, getDiffLineByPosition } from '../common/diffPositionMapping';
-+import { groupBy } from '../common/util';
-+import { PRDescriptionNode } from './prDescNode';
-+import { ReviewManager } from '../review/reviewManager';
-+import { PRFileChangeNode } from './prFileChangeNode';
-+
-+export class PRNode extends TreeNode {
-+	constructor(
-+		private repository: Repository,
-+		public element: PullRequestModel
-+	) {
-+		super();
-+	}
-+
-+	async getChildren(): Promise<TreeNode[]> {
-+
-+		const comments = await this.element.getComments();
-+		const data = await this.element.getFiles();
-+		await this.element.fetchBaseCommitSha();
-+		const richContentChanges = await parseDiff(data, this.repository, this.element.base.sha);
-+		const commentsCache = new Map<String, Comment[]>();
-+		let fileChanges = richContentChanges.map(change => {
-+			let fileInRepo = path.resolve(this.repository.path, change.fileName);
-+			let changedItem = new PRFileChangeNode(
-+				this.element,
-+				change.fileName,
-+				change.status,
-+				change.fileName,
-+				change.blobUrl,
-+				toPRUri(vscode.Uri.file(change.filePath), fileInRepo, change.fileName, true),
-+				toPRUri(vscode.Uri.file(change.originalFilePath), fileInRepo, change.fileName, false),
-+				this.repository.path,
-+				change.diffHunks
-+			);
-+			changedItem.comments = comments.filter(comment => comment.path === changedItem.fileName);
-+			commentsCache.set(changedItem.filePath.toString(), changedItem.comments);
-+			return changedItem;
-+		});
-+
-+		let createNewCommentThread = async (document: vscode.TextDocument, range: vscode.Range, text: string) => {
-+			let uri = document.uri;
-+			let params = JSON.parse(uri.query);
-+
-+			let fileChange = richContentChanges.find(change => change.fileName === params.fileName);
-+
-+			if (!fileChange) {
-+				return null;
-+			}
-+
-+			let position = mapHeadLineToDiffHunkPosition(fileChange.diffHunks, '', range.start.line);
-+
-+			if (position < 0) {
-+				return;
-+			}
-+
-+			// there is no thread Id, which means it's a new thread
-+			let ret = await this.element.createComment(text, params.fileName, position);
-+			let comment: vscode.Comment = {
-+				commentId: ret.data.id,
-+				body: new vscode.MarkdownString(ret.data.body),
-+				userName: ret.data.user.login,
-+				gravatar: ret.data.user.avatar_url
-+			};
-+
-+			let commentThread: vscode.CommentThread = {
-+				threadId: comment.commentId,
-+				resource: uri,
-+				range: range,
-+				comments: [comment]
-+			};
-+
-+			return commentThread;
-+		};
-+
-+		let replyToCommentThread = async (uri: vscode.Uri, range: vscode.Range, thread: vscode.CommentThread, text: string) => {
-+			try {
-+				let ret = await this.element.createCommentReply(text, thread.threadId);
-+				thread.comments.push({
-+					commentId: ret.data.id,
-+					body: new vscode.MarkdownString(ret.data.body),
-+					userName: ret.data.user.login,
-+					gravatar: ret.data.user.avatar_url
-+				});
-+				return thread;
-+			} catch (e) {
-+				return null;
-+			}
-+		};
-+
-+		const _onDidChangeCommentThreads = new vscode.EventEmitter<vscode.CommentThreadChangedEvent>();
-+		vscode.workspace.registerDocumentCommentProvider({
-+			onDidChangeCommentThreads: _onDidChangeCommentThreads.event,
-+			provideDocumentComments: async (document: vscode.TextDocument, token: vscode.CancellationToken): Promise<vscode.CommentInfo> => {
-+				if (document.uri.scheme === 'pr') {
-+					let params = JSON.parse(document.uri.query);
-+					let fileChange = richContentChanges.find(change => change.fileName === params.fileName);
-+					if (!fileChange) {
-+						return null;
-+					}
-+
-+					let commentingRanges: vscode.Range[] = [];
-+					let diffHunks = fileChange.diffHunks;
-+
-+					for (let i = 0; i < diffHunks.length; i++) {
-+						let diffHunk = diffHunks[i];
-+						commentingRanges.push(new vscode.Range(diffHunk.newLineNumber - 1, 0, diffHunk.newLineNumber + diffHunk.newLength - 1 - 1, 0));
-+					}
-+
-+					let matchingComments = commentsCache.get(document.uri.toString());
-+
-+					if (!matchingComments || !matchingComments.length) {
-+						return {
-+							threads: [],
-+							commentingRanges,
-+						};
-+					}
-+
-+					let sections = groupBy(matchingComments, comment => String(comment.position));
-+					let threads: vscode.CommentThread[] = [];
-+
-+					for (let i in sections) {
-+						let comments = sections[i];
-+
-+						const comment = comments[0];
-+						let diffLine = getDiffLineByPosition(fileChange.diffHunks, comment.position === null ? comment.original_position : comment.position);
-+						let commentAbsolutePosition = 1;
-+						if (diffLine) {
-+							commentAbsolutePosition = diffLine.newLineNumber;
-+						}
-+						// If the position is null, the comment is on a line that has been changed. Fall back to using original position.
-+						const pos = new vscode.Position(commentAbsolutePosition - 1, 0);
-+						const range = new vscode.Range(pos, pos);
-+
-+						threads.push({
-+							threadId: comment.id,
-+							resource: document.uri,
-+							range,
-+							comments: comments.map(comment => {
-+								return {
-+									commentId: comment.id,
-+									body: new vscode.MarkdownString(comment.body),
-+									userName: comment.user.login,
-+									gravatar: comment.user.avatar_url
-+								};
-+							}),
-+							collapsibleState: vscode.CommentThreadCollapsibleState.Expanded,
-+						});
-+					}
-+
-+					return {
-+						threads,
-+						commentingRanges,
-+					};
-+
-+				}
-+
-+				return null;
-+			},
-+			createNewCommentThread: createNewCommentThread.bind(this),
-+			replyToCommentThread: replyToCommentThread.bind(this)
-+		});
-+
-+		return [new PRDescriptionNode('Description', {
-+			light: Resource.icons.light.Description,
-+			dark: Resource.icons.dark.Description
-+		}, this.element), ...fileChanges];
-+	}
-+
-+	getTreeItem(): vscode.TreeItem {
-+		let currentBranchIsForThisPR = this.element.equals(ReviewManager.instance.currentPullRequest);
-+		return {
-+			label: (currentBranchIsForThisPR ? ' * ' : '') + this.element.title,
-+			tooltip: (currentBranchIsForThisPR ? 'Current Branch * ' : '') + this.element.title,
-+			collapsibleState: 1,
-+			contextValue: 'pullrequest' + (currentBranchIsForThisPR ? ':active' : ':nonactive'),
-+			iconPath: Resource.getGravatarUri(this.element)
-+		};
-+	}
-+}
-\ No newline at end of file
-added in remote
-  their  100644 353c85636ecfbe336976646cd310de42b9b2df8e extensions/git-extended/src/tree/treeNode.ts
-@@ -0,0 +1,15 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+import * as vscode from 'vscode';
-+
-+export abstract class TreeNode {
-+	constructor() { }
-+	abstract getTreeItem(): vscode.TreeItem;
-+
-+	async getChildren(): Promise<TreeNode[]> {
-+		return [];
-+	}
-+}
-\ No newline at end of file
-added in remote
-  their  100644 f64d3e8cbd7f144730577f81d1adcbc1be52811f extensions/git-extended/src/typings/git-credential-node.d.ts
-@@ -0,0 +1,14 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+declare module 'git-credential-node' {
-+
-+	interface Credentials {
-+		username: string;
-+		password: string;
-+	}
-+
-+	function fill(url: string): Promise<Credentials | null>;
-+}
-\ No newline at end of file
-added in remote
-  their  100644 175df7f9cf86446d1d688ead8b45414c039cc230 extensions/git-extended/src/typings/ref.d.ts
-@@ -0,0 +1,8 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+/// <reference path='../../../../src/vs/vscode.d.ts'/>
-+/// <reference path='../../../../src/vs/vscode.proposed.d.ts'/>
-+/// <reference path='./git-credential-node.d.ts'/>
-added in remote
-  their  100644 36a3c1ca47b3d858000339fe9f0b91043451337c extensions/git-extended/tsconfig.json
-@@ -0,0 +1,21 @@
-+{
-+	"compilerOptions": {
-+		"module": "commonjs",
-+		"target": "es6",
-+		"outDir": "out",
-+		"noUnusedLocals": true,
-+		"lib": [
-+			"es6"
-+		],
-+		"sourceMap": true,
-+		"rootDir": "./src",
-+		"jsx": "react"
-+	},
-+	"include": [
-+		"src/**/*"
-+	],
-+	"exclude": [
-+		"node_modules",
-+		".vscode-test"
-+	]
-+}
-added in remote
-  their  100644 e9337d7a85646ac42d14eac04fbd653c8b51da00 extensions/git-extended/webpack.config.js
-@@ -0,0 +1,28 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+const path = require('path');
-+
-+module.exports = {
-+	entry: {
-+		index: './preview-src/index.ts'
-+	},
-+	module: {
-+		rules: [
-+			{
-+				test: /\.tsx?$/,
-+				use: 'ts-loader',
-+				exclude: /node_modules/
-+			}
-+		]
-+	},
-+	resolve: {
-+		extensions: ['.tsx', '.ts', '.js']
-+	},
-+	devtool: 'inline-source-map',
-+	output: {
-+		filename: '[name].js',
-+		path: path.resolve(__dirname, 'media')
-+	}
-+};
-\ No newline at end of file
-added in remote
-  their  100644 18bb27976ed661402c559dff854dd38a3340ba82 extensions/git-extended/yarn.lock
-@@ -0,0 +1,4979 @@
-+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-+# yarn lockfile v1
-+
-+
-+"@mrmlnc/readdir-enhanced@^2.2.1":
-+  version "2.2.1"
-+  resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
-+  dependencies:
-+    call-me-maybe "^1.0.1"
-+    glob-to-regexp "^0.3.0"
-+
-+"@nodelib/fs.stat@^1.0.1":
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.0.2.tgz#d056b68999769728a1cff8d643bc59eb6f0be436"
-+
-+"@octokit/rest@^15.2.6":
-+  version "15.2.6"
-+  resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-15.2.6.tgz#16226f58fbf0ba88f631848fb622dfe0ad410c0c"
-+  dependencies:
-+    before-after-hook "^1.1.0"
-+    btoa-lite "^1.0.0"
-+    debug "^3.1.0"
-+    http-proxy-agent "^2.1.0"
-+    https-proxy-agent "^2.2.0"
-+    lodash "^4.17.4"
-+    node-fetch "^2.1.1"
-+    url-template "^2.0.8"
-+
-+"@sindresorhus/is@^0.7.0":
-+  version "0.7.0"
-+  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
-+
-+"@types/lodash@^4.14.106":
-+  version "4.14.106"
-+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.106.tgz#6093e9a02aa567ddecfe9afadca89e53e5dce4dd"
-+
-+"@types/node@*":
-+  version "9.6.2"
-+  resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.2.tgz#e49ac1adb458835e95ca6487bc20f916b37aff23"
-+
-+"@webassemblyjs/ast@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.4.3.tgz#3b3f6fced944d8660273347533e6d4d315b5934a"
-+  dependencies:
-+    "@webassemblyjs/helper-wasm-bytecode" "1.4.3"
-+    "@webassemblyjs/wast-parser" "1.4.3"
-+    debug "^3.1.0"
-+    webassemblyjs "1.4.3"
-+
-+"@webassemblyjs/floating-point-hex-parser@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.4.3.tgz#f5aee4c376a717c74264d7bacada981e7e44faad"
-+
-+"@webassemblyjs/helper-buffer@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.4.3.tgz#0434b55958519bf503697d3824857b1dea80b729"
-+  dependencies:
-+    debug "^3.1.0"
-+
-+"@webassemblyjs/helper-code-frame@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.4.3.tgz#f1349ca3e01a8e29ee2098c770773ef97af43641"
-+  dependencies:
-+    "@webassemblyjs/wast-printer" "1.4.3"
-+
-+"@webassemblyjs/helper-fsm@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.4.3.tgz#65a921db48fb43e868f17b27497870bdcae22b79"
-+
-+"@webassemblyjs/helper-wasm-bytecode@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.4.3.tgz#0e5b4b5418e33f8a26e940b7809862828c3721a5"
-+
-+"@webassemblyjs/helper-wasm-section@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.4.3.tgz#9ceedd53a3f152c3412e072887ade668d0b1acbf"
-+  dependencies:
-+    "@webassemblyjs/ast" "1.4.3"
-+    "@webassemblyjs/helper-buffer" "1.4.3"
-+    "@webassemblyjs/helper-wasm-bytecode" "1.4.3"
-+    "@webassemblyjs/wasm-gen" "1.4.3"
-+    debug "^3.1.0"
-+
-+"@webassemblyjs/leb128@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.4.3.tgz#5a5e5949dbb5adfe3ae95664d0439927ac557fb8"
-+  dependencies:
-+    leb "^0.3.0"
-+
-+"@webassemblyjs/validation@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/validation/-/validation-1.4.3.tgz#9e66c9b3079d7bbcf2070c1bf52a54af2a09aac9"
-+  dependencies:
-+    "@webassemblyjs/ast" "1.4.3"
-+
-+"@webassemblyjs/wasm-edit@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.4.3.tgz#87febd565e0ffb5ae25f6495bb3958d17aa0a779"
-+  dependencies:
-+    "@webassemblyjs/ast" "1.4.3"
-+    "@webassemblyjs/helper-buffer" "1.4.3"
-+    "@webassemblyjs/helper-wasm-bytecode" "1.4.3"
-+    "@webassemblyjs/helper-wasm-section" "1.4.3"
-+    "@webassemblyjs/wasm-gen" "1.4.3"
-+    "@webassemblyjs/wasm-opt" "1.4.3"
-+    "@webassemblyjs/wasm-parser" "1.4.3"
-+    "@webassemblyjs/wast-printer" "1.4.3"
-+    debug "^3.1.0"
-+
-+"@webassemblyjs/wasm-gen@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.4.3.tgz#8553164d0154a6be8f74d653d7ab355f73240aa4"
-+  dependencies:
-+    "@webassemblyjs/ast" "1.4.3"
-+    "@webassemblyjs/helper-wasm-bytecode" "1.4.3"
-+    "@webassemblyjs/leb128" "1.4.3"
-+
-+"@webassemblyjs/wasm-opt@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.4.3.tgz#26c7a23bfb136aa405b1d3410e63408ec60894b8"
-+  dependencies:
-+    "@webassemblyjs/ast" "1.4.3"
-+    "@webassemblyjs/helper-buffer" "1.4.3"
-+    "@webassemblyjs/wasm-gen" "1.4.3"
-+    "@webassemblyjs/wasm-parser" "1.4.3"
-+    debug "^3.1.0"
-+
-+"@webassemblyjs/wasm-parser@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.4.3.tgz#7ddd3e408f8542647ed612019cfb780830993698"
-+  dependencies:
-+    "@webassemblyjs/ast" "1.4.3"
-+    "@webassemblyjs/helper-wasm-bytecode" "1.4.3"
-+    "@webassemblyjs/leb128" "1.4.3"
-+    "@webassemblyjs/wasm-parser" "1.4.3"
-+    webassemblyjs "1.4.3"
-+
-+"@webassemblyjs/wast-parser@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.4.3.tgz#3250402e2c5ed53dbe2233c9de1fe1f9f0d51745"
-+  dependencies:
-+    "@webassemblyjs/ast" "1.4.3"
-+    "@webassemblyjs/floating-point-hex-parser" "1.4.3"
-+    "@webassemblyjs/helper-code-frame" "1.4.3"
-+    "@webassemblyjs/helper-fsm" "1.4.3"
-+    long "^3.2.0"
-+    webassemblyjs "1.4.3"
-+
-+"@webassemblyjs/wast-printer@1.4.3":
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.4.3.tgz#3d59aa8d0252d6814a3ef4e6d2a34c9ded3904e0"
-+  dependencies:
-+    "@webassemblyjs/ast" "1.4.3"
-+    "@webassemblyjs/wast-parser" "1.4.3"
-+    long "^3.2.0"
-+
-+abbrev@1:
-+  version "1.1.1"
-+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-+
-+acorn-dynamic-import@^3.0.0:
-+  version "3.0.0"
-+  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz#901ceee4c7faaef7e07ad2a47e890675da50a278"
-+  dependencies:
-+    acorn "^5.0.0"
-+
-+acorn@^5.0.0:
-+  version "5.5.3"
-+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.3.tgz#f473dd47e0277a08e28e9bec5aeeb04751f0b8c9"
-+
-+agent-base@4, agent-base@^4.1.0:
-+  version "4.2.0"
-+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.0.tgz#9838b5c3392b962bad031e6a4c5e1024abec45ce"
-+  dependencies:
-+    es6-promisify "^5.0.0"
-+
-+ajv-keywords@^3.1.0:
-+  version "3.2.0"
-+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
-+
-+ajv@^5.1.0:
-+  version "5.5.2"
-+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
-+  dependencies:
-+    co "^4.6.0"
-+    fast-deep-equal "^1.0.0"
-+    fast-json-stable-stringify "^2.0.0"
-+    json-schema-traverse "^0.3.0"
-+
-+ajv@^6.1.0:
-+  version "6.5.0"
-+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.0.tgz#4c8affdf80887d8f132c9c52ab8a2dc4d0b7b24c"
-+  dependencies:
-+    fast-deep-equal "^2.0.1"
-+    fast-json-stable-stringify "^2.0.0"
-+    json-schema-traverse "^0.3.0"
-+    uri-js "^4.2.1"
-+
-+ansi-escapes@^1.0.0:
-+  version "1.4.0"
-+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
-+
-+ansi-escapes@^3.0.0:
-+  version "3.1.0"
-+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
-+
-+ansi-regex@^2.0.0:
-+  version "2.1.1"
-+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-+
-+ansi-regex@^3.0.0:
-+  version "3.0.0"
-+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-+
-+ansi-styles@^2.2.1:
-+  version "2.2.1"
-+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-+
-+ansi-styles@^3.2.1:
-+  version "3.2.1"
-+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-+  dependencies:
-+    color-convert "^1.9.0"
-+
-+ansi-styles@~1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz#cb102df1c56f5123eab8b67cd7b98027a0279178"
-+
-+any-observable@^0.2.0:
-+  version "0.2.0"
-+  resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.2.0.tgz#c67870058003579009083f54ac0abafb5c33d242"
-+
-+anymatch@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
-+  dependencies:
-+    micromatch "^3.1.4"
-+    normalize-path "^2.1.1"
-+
-+aproba@^1.0.3, aproba@^1.1.1:
-+  version "1.2.0"
-+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
-+
-+are-we-there-yet@~1.1.2:
-+  version "1.1.4"
-+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d"
-+  dependencies:
-+    delegates "^1.0.0"
-+    readable-stream "^2.0.6"
-+
-+argparse@^1.0.7:
-+  version "1.0.10"
-+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-+  dependencies:
-+    sprintf-js "~1.0.2"
-+
-+arr-diff@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
-+  dependencies:
-+    arr-flatten "^1.0.1"
-+
-+arr-diff@^4.0.0:
-+  version "4.0.0"
-+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
-+
-+arr-flatten@^1.0.1, arr-flatten@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
-+
-+arr-union@^3.1.0:
-+  version "3.1.0"
-+  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
-+
-+array-differ@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
-+
-+array-union@^1.0.1:
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
-+  dependencies:
-+    array-uniq "^1.0.1"
-+
-+array-uniq@^1.0.1:
-+  version "1.0.3"
-+  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-+
-+array-unique@^0.2.1:
-+  version "0.2.1"
-+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
-+
-+array-unique@^0.3.2:
-+  version "0.3.2"
-+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
-+
-+arrify@^1.0.0, arrify@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
-+
-+asn1.js@^4.0.0:
-+  version "4.10.1"
-+  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
-+  dependencies:
-+    bn.js "^4.0.0"
-+    inherits "^2.0.1"
-+    minimalistic-assert "^1.0.0"
-+
-+asn1@~0.2.3:
-+  version "0.2.3"
-+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
-+
-+assert-plus@1.0.0, assert-plus@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-+
-+assert@^1.1.1:
-+  version "1.4.1"
-+  resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
-+  dependencies:
-+    util "0.10.3"
-+
-+assign-symbols@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
-+
-+ast-types@0.10.1:
-+  version "0.10.1"
-+  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.10.1.tgz#f52fca9715579a14f841d67d7f8d25432ab6a3dd"
-+
-+ast-types@0.11.3:
-+  version "0.11.3"
-+  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.11.3.tgz#c20757fe72ee71278ea0ff3d87e5c2ca30d9edf8"
-+
-+async-each@^1.0.0:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
-+
-+async@^1.5.0:
-+  version "1.5.2"
-+  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
-+
-+async@^2.6.0:
-+  version "2.6.0"
-+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
-+  dependencies:
-+    lodash "^4.14.0"
-+
-+asynckit@^0.4.0:
-+  version "0.4.0"
-+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-+
-+atob@^2.1.1:
-+  version "2.1.1"
-+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.1.tgz#ae2d5a729477f289d60dd7f96a6314a22dd6c22a"
-+
-+aws-sign2@~0.7.0:
-+  version "0.7.0"
-+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
-+
-+aws4@^1.6.0:
-+  version "1.6.0"
-+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
-+
-+babel-code-frame@^6.26.0:
-+  version "6.26.0"
-+  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
-+  dependencies:
-+    chalk "^1.1.3"
-+    esutils "^2.0.2"
-+    js-tokens "^3.0.2"
-+
-+babel-core@^6.26.0:
-+  version "6.26.3"
-+  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207"
-+  dependencies:
-+    babel-code-frame "^6.26.0"
-+    babel-generator "^6.26.0"
-+    babel-helpers "^6.24.1"
-+    babel-messages "^6.23.0"
-+    babel-register "^6.26.0"
-+    babel-runtime "^6.26.0"
-+    babel-template "^6.26.0"
-+    babel-traverse "^6.26.0"
-+    babel-types "^6.26.0"
-+    babylon "^6.18.0"
-+    convert-source-map "^1.5.1"
-+    debug "^2.6.9"
-+    json5 "^0.5.1"
-+    lodash "^4.17.4"
-+    minimatch "^3.0.4"
-+    path-is-absolute "^1.0.1"
-+    private "^0.1.8"
-+    slash "^1.0.0"
-+    source-map "^0.5.7"
-+
-+babel-generator@^6.26.0:
-+  version "6.26.1"
-+  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
-+  dependencies:
-+    babel-messages "^6.23.0"
-+    babel-runtime "^6.26.0"
-+    babel-types "^6.26.0"
-+    detect-indent "^4.0.0"
-+    jsesc "^1.3.0"
-+    lodash "^4.17.4"
-+    source-map "^0.5.7"
-+    trim-right "^1.0.1"
-+
-+babel-helper-bindify-decorators@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.24.1.tgz#14c19e5f142d7b47f19a52431e52b1ccbc40a330"
-+  dependencies:
-+    babel-runtime "^6.22.0"
-+    babel-traverse "^6.24.1"
-+    babel-types "^6.24.1"
-+
-+babel-helper-builder-binary-assignment-operator-visitor@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664"
-+  dependencies:
-+    babel-helper-explode-assignable-expression "^6.24.1"
-+    babel-runtime "^6.22.0"
-+    babel-types "^6.24.1"
-+
-+babel-helper-call-delegate@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d"
-+  dependencies:
-+    babel-helper-hoist-variables "^6.24.1"
-+    babel-runtime "^6.22.0"
-+    babel-traverse "^6.24.1"
-+    babel-types "^6.24.1"
-+
-+babel-helper-define-map@^6.24.1:
-+  version "6.26.0"
-+  resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz#a5f56dab41a25f97ecb498c7ebaca9819f95be5f"
-+  dependencies:
-+    babel-helper-function-name "^6.24.1"
-+    babel-runtime "^6.26.0"
-+    babel-types "^6.26.0"
-+    lodash "^4.17.4"
-+
-+babel-helper-explode-assignable-expression@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa"
-+  dependencies:
-+    babel-runtime "^6.22.0"
-+    babel-traverse "^6.24.1"
-+    babel-types "^6.24.1"
-+
-+babel-helper-explode-class@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-helper-explode-class/-/babel-helper-explode-class-6.24.1.tgz#7dc2a3910dee007056e1e31d640ced3d54eaa9eb"
-+  dependencies:
-+    babel-helper-bindify-decorators "^6.24.1"
-+    babel-runtime "^6.22.0"
-+    babel-traverse "^6.24.1"
-+    babel-types "^6.24.1"
-+
-+babel-helper-function-name@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9"
-+  dependencies:
-+    babel-helper-get-function-arity "^6.24.1"
-+    babel-runtime "^6.22.0"
-+    babel-template "^6.24.1"
-+    babel-traverse "^6.24.1"
-+    babel-types "^6.24.1"
-+
-+babel-helper-get-function-arity@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d"
-+  dependencies:
-+    babel-runtime "^6.22.0"
-+    babel-types "^6.24.1"
-+
-+babel-helper-hoist-variables@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76"
-+  dependencies:
-+    babel-runtime "^6.22.0"
-+    babel-types "^6.24.1"
-+
-+babel-helper-optimise-call-expression@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257"
-+  dependencies:
-+    babel-runtime "^6.22.0"
-+    babel-types "^6.24.1"
-+
-+babel-helper-regex@^6.24.1:
-+  version "6.26.0"
-+  resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz#325c59f902f82f24b74faceed0363954f6495e72"
-+  dependencies:
-+    babel-runtime "^6.26.0"
-+    babel-types "^6.26.0"
-+    lodash "^4.17.4"
-+
-+babel-helper-remap-async-to-generator@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b"
-+  dependencies:
-+    babel-helper-function-name "^6.24.1"
-+    babel-runtime "^6.22.0"
-+    babel-template "^6.24.1"
-+    babel-traverse "^6.24.1"
-+    babel-types "^6.24.1"
-+
-+babel-helper-replace-supers@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a"
-+  dependencies:
-+    babel-helper-optimise-call-expression "^6.24.1"
-+    babel-messages "^6.23.0"
-+    babel-runtime "^6.22.0"
-+    babel-template "^6.24.1"
-+    babel-traverse "^6.24.1"
-+    babel-types "^6.24.1"
-+
-+babel-helpers@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
-+  dependencies:
-+    babel-runtime "^6.22.0"
-+    babel-template "^6.24.1"
-+
-+babel-messages@^6.23.0:
-+  version "6.23.0"
-+  resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
-+  dependencies:
-+    babel-runtime "^6.22.0"
-+
-+babel-plugin-check-es2015-constants@^6.22.0:
-+  version "6.22.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a"
-+  dependencies:
-+    babel-runtime "^6.22.0"
-+
-+babel-plugin-syntax-async-functions@^6.8.0:
-+  version "6.13.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
-+
-+babel-plugin-syntax-async-generators@^6.5.0:
-+  version "6.13.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz#6bc963ebb16eccbae6b92b596eb7f35c342a8b9a"
-+
-+babel-plugin-syntax-class-constructor-call@^6.18.0:
-+  version "6.18.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-class-constructor-call/-/babel-plugin-syntax-class-constructor-call-6.18.0.tgz#9cb9d39fe43c8600bec8146456ddcbd4e1a76416"
-+
-+babel-plugin-syntax-class-properties@^6.8.0:
-+  version "6.13.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz#d7eb23b79a317f8543962c505b827c7d6cac27de"
-+
-+babel-plugin-syntax-decorators@^6.13.0:
-+  version "6.13.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz#312563b4dbde3cc806cee3e416cceeaddd11ac0b"
-+
-+babel-plugin-syntax-dynamic-import@^6.18.0:
-+  version "6.18.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz#8d6a26229c83745a9982a441051572caa179b1da"
-+
-+babel-plugin-syntax-exponentiation-operator@^6.8.0:
-+  version "6.13.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de"
-+
-+babel-plugin-syntax-export-extensions@^6.8.0:
-+  version "6.13.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-export-extensions/-/babel-plugin-syntax-export-extensions-6.13.0.tgz#70a1484f0f9089a4e84ad44bac353c95b9b12721"
-+
-+babel-plugin-syntax-flow@^6.18.0:
-+  version "6.18.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz#4c3ab20a2af26aa20cd25995c398c4eb70310c8d"
-+
-+babel-plugin-syntax-object-rest-spread@^6.8.0:
-+  version "6.13.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
-+
-+babel-plugin-syntax-trailing-function-commas@^6.22.0:
-+  version "6.22.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3"
-+
-+babel-plugin-transform-async-generator-functions@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz#f058900145fd3e9907a6ddf28da59f215258a5db"
-+  dependencies:
-+    babel-helper-remap-async-to-generator "^6.24.1"
-+    babel-plugin-syntax-async-generators "^6.5.0"
-+    babel-runtime "^6.22.0"
-+
-+babel-plugin-transform-async-to-generator@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761"
-+  dependencies:
-+    babel-helper-remap-async-to-generator "^6.24.1"
-+    babel-plugin-syntax-async-functions "^6.8.0"
-+    babel-runtime "^6.22.0"
-+
-+babel-plugin-transform-class-constructor-call@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-constructor-call/-/babel-plugin-transform-class-constructor-call-6.24.1.tgz#80dc285505ac067dcb8d6c65e2f6f11ab7765ef9"
-+  dependencies:
-+    babel-plugin-syntax-class-constructor-call "^6.18.0"
-+    babel-runtime "^6.22.0"
-+    babel-template "^6.24.1"
-+
-+babel-plugin-transform-class-properties@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz#6a79763ea61d33d36f37b611aa9def81a81b46ac"
-+  dependencies:
-+    babel-helper-function-name "^6.24.1"
-+    babel-plugin-syntax-class-properties "^6.8.0"
-+    babel-runtime "^6.22.0"
-+    babel-template "^6.24.1"
-+
-+babel-plugin-transform-decorators@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.24.1.tgz#788013d8f8c6b5222bdf7b344390dfd77569e24d"
-+  dependencies:
-+    babel-helper-explode-class "^6.24.1"
-+    babel-plugin-syntax-decorators "^6.13.0"
-+    babel-runtime "^6.22.0"
-+    babel-template "^6.24.1"
-+    babel-types "^6.24.1"
-+
-+babel-plugin-transform-es2015-arrow-functions@^6.22.0:
-+  version "6.22.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221"
-+  dependencies:
-+    babel-runtime "^6.22.0"
-+
-+babel-plugin-transform-es2015-block-scoped-functions@^6.22.0:
-+  version "6.22.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141"
-+  dependencies:
-+    babel-runtime "^6.22.0"
-+
-+babel-plugin-transform-es2015-block-scoping@^6.24.1:
-+  version "6.26.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f"
-+  dependencies:
-+    babel-runtime "^6.26.0"
-+    babel-template "^6.26.0"
-+    babel-traverse "^6.26.0"
-+    babel-types "^6.26.0"
-+    lodash "^4.17.4"
-+
-+babel-plugin-transform-es2015-classes@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db"
-+  dependencies:
-+    babel-helper-define-map "^6.24.1"
-+    babel-helper-function-name "^6.24.1"
-+    babel-helper-optimise-call-expression "^6.24.1"
-+    babel-helper-replace-supers "^6.24.1"
-+    babel-messages "^6.23.0"
-+    babel-runtime "^6.22.0"
-+    babel-template "^6.24.1"
-+    babel-traverse "^6.24.1"
-+    babel-types "^6.24.1"
-+
-+babel-plugin-transform-es2015-computed-properties@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3"
-+  dependencies:
-+    babel-runtime "^6.22.0"
-+    babel-template "^6.24.1"
-+
-+babel-plugin-transform-es2015-destructuring@^6.22.0:
-+  version "6.23.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d"
-+  dependencies:
-+    babel-runtime "^6.22.0"
-+
-+babel-plugin-transform-es2015-duplicate-keys@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e"
-+  dependencies:
-+    babel-runtime "^6.22.0"
-+    babel-types "^6.24.1"
-+
-+babel-plugin-transform-es2015-for-of@^6.22.0:
-+  version "6.23.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691"
-+  dependencies:
-+    babel-runtime "^6.22.0"
-+
-+babel-plugin-transform-es2015-function-name@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b"
-+  dependencies:
-+    babel-helper-function-name "^6.24.1"
-+    babel-runtime "^6.22.0"
-+    babel-types "^6.24.1"
-+
-+babel-plugin-transform-es2015-literals@^6.22.0:
-+  version "6.22.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e"
-+  dependencies:
-+    babel-runtime "^6.22.0"
-+
-+babel-plugin-transform-es2015-modules-amd@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154"
-+  dependencies:
-+    babel-plugin-transform-es2015-modules-commonjs "^6.24.1"
-+    babel-runtime "^6.22.0"
-+    babel-template "^6.24.1"
-+
-+babel-plugin-transform-es2015-modules-commonjs@^6.24.1:
-+  version "6.26.2"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz#58a793863a9e7ca870bdc5a881117ffac27db6f3"
-+  dependencies:
-+    babel-plugin-transform-strict-mode "^6.24.1"
-+    babel-runtime "^6.26.0"
-+    babel-template "^6.26.0"
-+    babel-types "^6.26.0"
-+
-+babel-plugin-transform-es2015-modules-systemjs@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23"
-+  dependencies:
-+    babel-helper-hoist-variables "^6.24.1"
-+    babel-runtime "^6.22.0"
-+    babel-template "^6.24.1"
-+
-+babel-plugin-transform-es2015-modules-umd@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468"
-+  dependencies:
-+    babel-plugin-transform-es2015-modules-amd "^6.24.1"
-+    babel-runtime "^6.22.0"
-+    babel-template "^6.24.1"
-+
-+babel-plugin-transform-es2015-object-super@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d"
-+  dependencies:
-+    babel-helper-replace-supers "^6.24.1"
-+    babel-runtime "^6.22.0"
-+
-+babel-plugin-transform-es2015-parameters@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b"
-+  dependencies:
-+    babel-helper-call-delegate "^6.24.1"
-+    babel-helper-get-function-arity "^6.24.1"
-+    babel-runtime "^6.22.0"
-+    babel-template "^6.24.1"
-+    babel-traverse "^6.24.1"
-+    babel-types "^6.24.1"
-+
-+babel-plugin-transform-es2015-shorthand-properties@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0"
-+  dependencies:
-+    babel-runtime "^6.22.0"
-+    babel-types "^6.24.1"
-+
-+babel-plugin-transform-es2015-spread@^6.22.0:
-+  version "6.22.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1"
-+  dependencies:
-+    babel-runtime "^6.22.0"
-+
-+babel-plugin-transform-es2015-sticky-regex@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc"
-+  dependencies:
-+    babel-helper-regex "^6.24.1"
-+    babel-runtime "^6.22.0"
-+    babel-types "^6.24.1"
-+
-+babel-plugin-transform-es2015-template-literals@^6.22.0:
-+  version "6.22.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d"
-+  dependencies:
-+    babel-runtime "^6.22.0"
-+
-+babel-plugin-transform-es2015-typeof-symbol@^6.22.0:
-+  version "6.23.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372"
-+  dependencies:
-+    babel-runtime "^6.22.0"
-+
-+babel-plugin-transform-es2015-unicode-regex@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9"
-+  dependencies:
-+    babel-helper-regex "^6.24.1"
-+    babel-runtime "^6.22.0"
-+    regexpu-core "^2.0.0"
-+
-+babel-plugin-transform-exponentiation-operator@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e"
-+  dependencies:
-+    babel-helper-builder-binary-assignment-operator-visitor "^6.24.1"
-+    babel-plugin-syntax-exponentiation-operator "^6.8.0"
-+    babel-runtime "^6.22.0"
-+
-+babel-plugin-transform-export-extensions@^6.22.0:
-+  version "6.22.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-export-extensions/-/babel-plugin-transform-export-extensions-6.22.0.tgz#53738b47e75e8218589eea946cbbd39109bbe653"
-+  dependencies:
-+    babel-plugin-syntax-export-extensions "^6.8.0"
-+    babel-runtime "^6.22.0"
-+
-+babel-plugin-transform-flow-strip-types@^6.8.0:
-+  version "6.22.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz#84cb672935d43714fdc32bce84568d87441cf7cf"
-+  dependencies:
-+    babel-plugin-syntax-flow "^6.18.0"
-+    babel-runtime "^6.22.0"
-+
-+babel-plugin-transform-object-rest-spread@^6.22.0:
-+  version "6.26.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz#0f36692d50fef6b7e2d4b3ac1478137a963b7b06"
-+  dependencies:
-+    babel-plugin-syntax-object-rest-spread "^6.8.0"
-+    babel-runtime "^6.26.0"
-+
-+babel-plugin-transform-regenerator@^6.24.1:
-+  version "6.26.0"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f"
-+  dependencies:
-+    regenerator-transform "^0.10.0"
-+
-+babel-plugin-transform-strict-mode@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758"
-+  dependencies:
-+    babel-runtime "^6.22.0"
-+    babel-types "^6.24.1"
-+
-+babel-preset-es2015@^6.9.0:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz#d44050d6bc2c9feea702aaf38d727a0210538939"
-+  dependencies:
-+    babel-plugin-check-es2015-constants "^6.22.0"
-+    babel-plugin-transform-es2015-arrow-functions "^6.22.0"
-+    babel-plugin-transform-es2015-block-scoped-functions "^6.22.0"
-+    babel-plugin-transform-es2015-block-scoping "^6.24.1"
-+    babel-plugin-transform-es2015-classes "^6.24.1"
-+    babel-plugin-transform-es2015-computed-properties "^6.24.1"
-+    babel-plugin-transform-es2015-destructuring "^6.22.0"
-+    babel-plugin-transform-es2015-duplicate-keys "^6.24.1"
-+    babel-plugin-transform-es2015-for-of "^6.22.0"
-+    babel-plugin-transform-es2015-function-name "^6.24.1"
-+    babel-plugin-transform-es2015-literals "^6.22.0"
-+    babel-plugin-transform-es2015-modules-amd "^6.24.1"
-+    babel-plugin-transform-es2015-modules-commonjs "^6.24.1"
-+    babel-plugin-transform-es2015-modules-systemjs "^6.24.1"
-+    babel-plugin-transform-es2015-modules-umd "^6.24.1"
-+    babel-plugin-transform-es2015-object-super "^6.24.1"
-+    babel-plugin-transform-es2015-parameters "^6.24.1"
-+    babel-plugin-transform-es2015-shorthand-properties "^6.24.1"
-+    babel-plugin-transform-es2015-spread "^6.22.0"
-+    babel-plugin-transform-es2015-sticky-regex "^6.24.1"
-+    babel-plugin-transform-es2015-template-literals "^6.22.0"
-+    babel-plugin-transform-es2015-typeof-symbol "^6.22.0"
-+    babel-plugin-transform-es2015-unicode-regex "^6.24.1"
-+    babel-plugin-transform-regenerator "^6.24.1"
-+
-+babel-preset-stage-1@^6.5.0:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-preset-stage-1/-/babel-preset-stage-1-6.24.1.tgz#7692cd7dcd6849907e6ae4a0a85589cfb9e2bfb0"
-+  dependencies:
-+    babel-plugin-transform-class-constructor-call "^6.24.1"
-+    babel-plugin-transform-export-extensions "^6.22.0"
-+    babel-preset-stage-2 "^6.24.1"
-+
-+babel-preset-stage-2@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz#d9e2960fb3d71187f0e64eec62bc07767219bdc1"
-+  dependencies:
-+    babel-plugin-syntax-dynamic-import "^6.18.0"
-+    babel-plugin-transform-class-properties "^6.24.1"
-+    babel-plugin-transform-decorators "^6.24.1"
-+    babel-preset-stage-3 "^6.24.1"
-+
-+babel-preset-stage-3@^6.24.1:
-+  version "6.24.1"
-+  resolved "https://registry.yarnpkg.com/babel-preset-stage-3/-/babel-preset-stage-3-6.24.1.tgz#836ada0a9e7a7fa37cb138fb9326f87934a48395"
-+  dependencies:
-+    babel-plugin-syntax-trailing-function-commas "^6.22.0"
-+    babel-plugin-transform-async-generator-functions "^6.24.1"
-+    babel-plugin-transform-async-to-generator "^6.24.1"
-+    babel-plugin-transform-exponentiation-operator "^6.24.1"
-+    babel-plugin-transform-object-rest-spread "^6.22.0"
-+
-+babel-register@^6.26.0, babel-register@^6.9.0:
-+  version "6.26.0"
-+  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
-+  dependencies:
-+    babel-core "^6.26.0"
-+    babel-runtime "^6.26.0"
-+    core-js "^2.5.0"
-+    home-or-tmp "^2.0.0"
-+    lodash "^4.17.4"
-+    mkdirp "^0.5.1"
-+    source-map-support "^0.4.15"
-+
-+babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0:
-+  version "6.26.0"
-+  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
-+  dependencies:
-+    core-js "^2.4.0"
-+    regenerator-runtime "^0.11.0"
-+
-+babel-template@^6.24.1, babel-template@^6.26.0:
-+  version "6.26.0"
-+  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
-+  dependencies:
-+    babel-runtime "^6.26.0"
-+    babel-traverse "^6.26.0"
-+    babel-types "^6.26.0"
-+    babylon "^6.18.0"
-+    lodash "^4.17.4"
-+
-+babel-traverse@^6.24.1, babel-traverse@^6.26.0:
-+  version "6.26.0"
-+  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
-+  dependencies:
-+    babel-code-frame "^6.26.0"
-+    babel-messages "^6.23.0"
-+    babel-runtime "^6.26.0"
-+    babel-types "^6.26.0"
-+    babylon "^6.18.0"
-+    debug "^2.6.8"
-+    globals "^9.18.0"
-+    invariant "^2.2.2"
-+    lodash "^4.17.4"
-+
-+babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0:
-+  version "6.26.0"
-+  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
-+  dependencies:
-+    babel-runtime "^6.26.0"
-+    esutils "^2.0.2"
-+    lodash "^4.17.4"
-+    to-fast-properties "^1.0.3"
-+
-+babylon@^6.17.3, babylon@^6.18.0:
-+  version "6.18.0"
-+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
-+
-+babylon@^7.0.0-beta.30:
-+  version "7.0.0-beta.47"
-+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.47.tgz#6d1fa44f0abec41ab7c780481e62fd9aafbdea80"
-+
-+balanced-match@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-+
-+base64-js@^1.0.2:
-+  version "1.3.0"
-+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
-+
-+base@^0.11.1:
-+  version "0.11.2"
-+  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
-+  dependencies:
-+    cache-base "^1.0.1"
-+    class-utils "^0.3.5"
-+    component-emitter "^1.2.1"
-+    define-property "^1.0.0"
-+    isobject "^3.0.1"
-+    mixin-deep "^1.2.0"
-+    pascalcase "^0.1.1"
-+
-+bcrypt-pbkdf@^1.0.0:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
-+  dependencies:
-+    tweetnacl "^0.14.3"
-+
-+before-after-hook@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-1.1.0.tgz#83165e15a59460d13702cb8febd6a1807896db5a"
-+
-+big.js@^3.1.3:
-+  version "3.2.0"
-+  resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
-+
-+binary-extensions@^1.0.0:
-+  version "1.11.0"
-+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
-+
-+binaryextensions@2:
-+  version "2.1.1"
-+  resolved "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-2.1.1.tgz#3209a51ca4a4ad541a3b8d3d6a6d5b83a2485935"
-+
-+bluebird@^3.5.1:
-+  version "3.5.1"
-+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
-+
-+bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
-+  version "4.11.8"
-+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
-+
-+boom@4.x.x:
-+  version "4.3.1"
-+  resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31"
-+  dependencies:
-+    hoek "4.x.x"
-+
-+boom@5.x.x:
-+  version "5.2.0"
-+  resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02"
-+  dependencies:
-+    hoek "4.x.x"
-+
-+brace-expansion@^1.1.7:
-+  version "1.1.11"
-+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-+  dependencies:
-+    balanced-match "^1.0.0"
-+    concat-map "0.0.1"
-+
-+braces@^1.8.2:
-+  version "1.8.5"
-+  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
-+  dependencies:
-+    expand-range "^1.8.1"
-+    preserve "^0.2.0"
-+    repeat-element "^1.1.2"
-+
-+braces@^2.3.0, braces@^2.3.1:
-+  version "2.3.2"
-+  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
-+  dependencies:
-+    arr-flatten "^1.1.0"
-+    array-unique "^0.3.2"
-+    extend-shallow "^2.0.1"
-+    fill-range "^4.0.0"
-+    isobject "^3.0.1"
-+    repeat-element "^1.1.2"
-+    snapdragon "^0.8.1"
-+    snapdragon-node "^2.0.1"
-+    split-string "^3.0.2"
-+    to-regex "^3.0.1"
-+
-+brorand@^1.0.1:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
-+
-+browserify-aes@^1.0.0, browserify-aes@^1.0.4:
-+  version "1.2.0"
-+  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
-+  dependencies:
-+    buffer-xor "^1.0.3"
-+    cipher-base "^1.0.0"
-+    create-hash "^1.1.0"
-+    evp_bytestokey "^1.0.3"
-+    inherits "^2.0.1"
-+    safe-buffer "^5.0.1"
-+
-+browserify-cipher@^1.0.0:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
-+  dependencies:
-+    browserify-aes "^1.0.4"
-+    browserify-des "^1.0.0"
-+    evp_bytestokey "^1.0.0"
-+
-+browserify-des@^1.0.0:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.1.tgz#3343124db6d7ad53e26a8826318712bdc8450f9c"
-+  dependencies:
-+    cipher-base "^1.0.1"
-+    des.js "^1.0.0"
-+    inherits "^2.0.1"
-+
-+browserify-rsa@^4.0.0:
-+  version "4.0.1"
-+  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
-+  dependencies:
-+    bn.js "^4.1.0"
-+    randombytes "^2.0.1"
-+
-+browserify-sign@^4.0.0:
-+  version "4.0.4"
-+  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"
-+  dependencies:
-+    bn.js "^4.1.1"
-+    browserify-rsa "^4.0.0"
-+    create-hash "^1.1.0"
-+    create-hmac "^1.1.2"
-+    elliptic "^6.0.0"
-+    inherits "^2.0.1"
-+    parse-asn1 "^5.0.0"
-+
-+browserify-zlib@^0.2.0:
-+  version "0.2.0"
-+  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
-+  dependencies:
-+    pako "~1.0.5"
-+
-+btoa-lite@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/btoa-lite/-/btoa-lite-1.0.0.tgz#337766da15801210fdd956c22e9c6891ab9d0337"
-+
-+buffer-from@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.0.0.tgz#4cb8832d23612589b0406e9e2956c17f06fdf531"
-+
-+buffer-xor@^1.0.3:
-+  version "1.0.3"
-+  resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
-+
-+buffer@^4.3.0:
-+  version "4.9.1"
-+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
-+  dependencies:
-+    base64-js "^1.0.2"
-+    ieee754 "^1.1.4"
-+    isarray "^1.0.0"
-+
-+builtin-modules@^1.0.0:
-+  version "1.1.1"
-+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
-+
-+builtin-status-codes@^3.0.0:
-+  version "3.0.0"
-+  resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
-+
-+cacache@^10.0.4:
-+  version "10.0.4"
-+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460"
-+  dependencies:
-+    bluebird "^3.5.1"
-+    chownr "^1.0.1"
-+    glob "^7.1.2"
-+    graceful-fs "^4.1.11"
-+    lru-cache "^4.1.1"
-+    mississippi "^2.0.0"
-+    mkdirp "^0.5.1"
-+    move-concurrently "^1.0.1"
-+    promise-inflight "^1.0.1"
-+    rimraf "^2.6.2"
-+    ssri "^5.2.4"
-+    unique-filename "^1.1.0"
-+    y18n "^4.0.0"
-+
-+cache-base@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
-+  dependencies:
-+    collection-visit "^1.0.0"
-+    component-emitter "^1.2.1"
-+    get-value "^2.0.6"
-+    has-value "^1.0.0"
-+    isobject "^3.0.1"
-+    set-value "^2.0.0"
-+    to-object-path "^0.3.0"
-+    union-value "^1.0.0"
-+    unset-value "^1.0.0"
-+
-+cacheable-request@^2.1.1:
-+  version "2.1.4"
-+  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-2.1.4.tgz#0d808801b6342ad33c91df9d0b44dc09b91e5c3d"
-+  dependencies:
-+    clone-response "1.0.2"
-+    get-stream "3.0.0"
-+    http-cache-semantics "3.8.1"
-+    keyv "3.0.0"
-+    lowercase-keys "1.0.0"
-+    normalize-url "2.0.1"
-+    responselike "1.0.2"
-+
-+call-me-maybe@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
-+
-+camelcase@^4.1.0:
-+  version "4.1.0"
-+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
-+
-+caseless@~0.12.0:
-+  version "0.12.0"
-+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-+
-+chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
-+  version "1.1.3"
-+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-+  dependencies:
-+    ansi-styles "^2.2.1"
-+    escape-string-regexp "^1.0.2"
-+    has-ansi "^2.0.0"
-+    strip-ansi "^3.0.0"
-+    supports-color "^2.0.0"
-+
-+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.2:
-+  version "2.4.1"
-+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
-+  dependencies:
-+    ansi-styles "^3.2.1"
-+    escape-string-regexp "^1.0.5"
-+    supports-color "^5.3.0"
-+
-+chalk@~0.4.0:
-+  version "0.4.0"
-+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"
-+  dependencies:
-+    ansi-styles "~1.0.0"
-+    has-color "~0.1.0"
-+    strip-ansi "~0.1.0"
-+
-+chardet@^0.4.0:
-+  version "0.4.2"
-+  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
-+
-+checksum@^0.1.1:
-+  version "0.1.1"
-+  resolved "https://registry.yarnpkg.com/checksum/-/checksum-0.1.1.tgz#dc6527d4c90be8560dbd1ed4cecf3297d528e9e9"
-+  dependencies:
-+    optimist "~0.3.5"
-+
-+chokidar@^2.0.2:
-+  version "2.0.3"
-+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.3.tgz#dcbd4f6cbb2a55b4799ba8a840ac527e5f4b1176"
-+  dependencies:
-+    anymatch "^2.0.0"
-+    async-each "^1.0.0"
-+    braces "^2.3.0"
-+    glob-parent "^3.1.0"
-+    inherits "^2.0.1"
-+    is-binary-path "^1.0.0"
-+    is-glob "^4.0.0"
-+    normalize-path "^2.1.1"
-+    path-is-absolute "^1.0.0"
-+    readdirp "^2.0.0"
-+    upath "^1.0.0"
-+  optionalDependencies:
-+    fsevents "^1.1.2"
-+
-+chownr@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
-+
-+chrome-trace-event@^0.1.1:
-+  version "0.1.3"
-+  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-0.1.3.tgz#d395af2d31c87b90a716c831fe326f69768ec084"
-+
-+cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
-+  version "1.0.4"
-+  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
-+  dependencies:
-+    inherits "^2.0.1"
-+    safe-buffer "^5.0.1"
-+
-+class-utils@^0.3.5:
-+  version "0.3.6"
-+  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
-+  dependencies:
-+    arr-union "^3.1.0"
-+    define-property "^0.2.5"
-+    isobject "^3.0.0"
-+    static-extend "^0.1.1"
-+
-+cli-cursor@^1.0.2:
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987"
-+  dependencies:
-+    restore-cursor "^1.0.1"
-+
-+cli-cursor@^2.1.0:
-+  version "2.1.0"
-+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
-+  dependencies:
-+    restore-cursor "^2.0.0"
-+
-+cli-spinners@^0.1.2:
-+  version "0.1.2"
-+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-0.1.2.tgz#bb764d88e185fb9e1e6a2a1f19772318f605e31c"
-+
-+cli-table@^0.3.1:
-+  version "0.3.1"
-+  resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.1.tgz#f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"
-+  dependencies:
-+    colors "1.0.3"
-+
-+cli-truncate@^0.2.1:
-+  version "0.2.1"
-+  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz#9f15cfbb0705005369216c626ac7d05ab90dd574"
-+  dependencies:
-+    slice-ansi "0.0.4"
-+    string-width "^1.0.1"
-+
-+cli-width@^2.0.0:
-+  version "2.2.0"
-+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
-+
-+cliui@^4.0.0:
-+  version "4.1.0"
-+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
-+  dependencies:
-+    string-width "^2.1.1"
-+    strip-ansi "^4.0.0"
-+    wrap-ansi "^2.0.0"
-+
-+clone-buffer@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
-+
-+clone-response@1.0.2:
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
-+  dependencies:
-+    mimic-response "^1.0.0"
-+
-+clone-stats@^0.0.1:
-+  version "0.0.1"
-+  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1"
-+
-+clone-stats@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680"
-+
-+clone@^1.0.0:
-+  version "1.0.4"
-+  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
-+
-+clone@^2.1.1:
-+  version "2.1.1"
-+  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.1.tgz#d217d1e961118e3ac9a4b8bba3285553bf647cdb"
-+
-+cloneable-readable@^1.0.0:
-+  version "1.1.2"
-+  resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.2.tgz#d591dee4a8f8bc15da43ce97dceeba13d43e2a65"
-+  dependencies:
-+    inherits "^2.0.1"
-+    process-nextick-args "^2.0.0"
-+    readable-stream "^2.3.5"
-+
-+co@^4.6.0:
-+  version "4.6.0"
-+  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
-+
-+code-point-at@^1.0.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-+
-+collection-visit@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
-+  dependencies:
-+    map-visit "^1.0.0"
-+    object-visit "^1.0.0"
-+
-+color-convert@^1.9.0:
-+  version "1.9.1"
-+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed"
-+  dependencies:
-+    color-name "^1.1.1"
-+
-+color-name@^1.1.1:
-+  version "1.1.3"
-+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-+
-+colors@1.0.3:
-+  version "1.0.3"
-+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
-+
-+colors@^1.1.2:
-+  version "1.2.5"
-+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.2.5.tgz#89c7ad9a374bc030df8013241f68136ed8835afc"
-+
-+combined-stream@1.0.6, combined-stream@~1.0.5:
-+  version "1.0.6"
-+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
-+  dependencies:
-+    delayed-stream "~1.0.0"
-+
-+commander@~2.13.0:
-+  version "2.13.0"
-+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
-+
-+commondir@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
-+
-+component-emitter@^1.2.1:
-+  version "1.2.1"
-+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
-+
-+concat-map@0.0.1:
-+  version "0.0.1"
-+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-+
-+concat-stream@^1.5.0:
-+  version "1.6.2"
-+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
-+  dependencies:
-+    buffer-from "^1.0.0"
-+    inherits "^2.0.3"
-+    readable-stream "^2.2.2"
-+    typedarray "^0.0.6"
-+
-+console-browserify@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
-+  dependencies:
-+    date-now "^0.1.4"
-+
-+console-control-strings@^1.0.0, console-control-strings@~1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-+
-+constants-browserify@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
-+
-+convert-source-map@^1.5.1:
-+  version "1.5.1"
-+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
-+
-+copy-concurrently@^1.0.0:
-+  version "1.0.5"
-+  resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
-+  dependencies:
-+    aproba "^1.1.1"
-+    fs-write-stream-atomic "^1.0.8"
-+    iferr "^0.1.5"
-+    mkdirp "^0.5.1"
-+    rimraf "^2.5.4"
-+    run-queue "^1.0.0"
-+
-+copy-descriptor@^0.1.0:
-+  version "0.1.1"
-+  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
-+
-+core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0:
-+  version "2.5.6"
-+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.6.tgz#0fe6d45bf3cac3ac364a9d72de7576f4eb221b9d"
-+
-+core-util-is@1.0.2, core-util-is@~1.0.0:
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-+
-+create-ecdh@^4.0.0:
-+  version "4.0.3"
-+  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
-+  dependencies:
-+    bn.js "^4.1.0"
-+    elliptic "^6.0.0"
-+
-+create-hash@^1.1.0, create-hash@^1.1.2:
-+  version "1.2.0"
-+  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
-+  dependencies:
-+    cipher-base "^1.0.1"
-+    inherits "^2.0.1"
-+    md5.js "^1.3.4"
-+    ripemd160 "^2.0.1"
-+    sha.js "^2.4.0"
-+
-+create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
-+  version "1.1.7"
-+  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
-+  dependencies:
-+    cipher-base "^1.0.3"
-+    create-hash "^1.1.0"
-+    inherits "^2.0.1"
-+    ripemd160 "^2.0.0"
-+    safe-buffer "^5.0.1"
-+    sha.js "^2.4.8"
-+
-+cross-spawn@^5.0.1:
-+  version "5.1.0"
-+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
-+  dependencies:
-+    lru-cache "^4.0.1"
-+    shebang-command "^1.2.0"
-+    which "^1.2.9"
-+
-+cross-spawn@^6.0.5:
-+  version "6.0.5"
-+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
-+  dependencies:
-+    nice-try "^1.0.4"
-+    path-key "^2.0.1"
-+    semver "^5.5.0"
-+    shebang-command "^1.2.0"
-+    which "^1.2.9"
-+
-+cryptiles@3.x.x:
-+  version "3.1.2"
-+  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"
-+  dependencies:
-+    boom "5.x.x"
-+
-+crypto-browserify@^3.11.0:
-+  version "3.12.0"
-+  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
-+  dependencies:
-+    browserify-cipher "^1.0.0"
-+    browserify-sign "^4.0.0"
-+    create-ecdh "^4.0.0"
-+    create-hash "^1.1.0"
-+    create-hmac "^1.1.0"
-+    diffie-hellman "^5.0.0"
-+    inherits "^2.0.1"
-+    pbkdf2 "^3.0.3"
-+    public-encrypt "^4.0.0"
-+    randombytes "^2.0.0"
-+    randomfill "^1.0.3"
-+
-+cyclist@~0.2.2:
-+  version "0.2.2"
-+  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
-+
-+dargs@^5.1.0:
-+  version "5.1.0"
-+  resolved "https://registry.yarnpkg.com/dargs/-/dargs-5.1.0.tgz#ec7ea50c78564cd36c9d5ec18f66329fade27829"
-+
-+dashdash@^1.12.0:
-+  version "1.14.1"
-+  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-+  dependencies:
-+    assert-plus "^1.0.0"
-+
-+date-fns@^1.27.2:
-+  version "1.29.0"
-+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.29.0.tgz#12e609cdcb935127311d04d33334e2960a2a54e6"
-+
-+date-now@^0.1.4:
-+  version "0.1.4"
-+  resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
-+
-+dateformat@^3.0.3:
-+  version "3.0.3"
-+  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
-+
-+debug@3.1.0, debug@^3.1.0:
-+  version "3.1.0"
-+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-+  dependencies:
-+    ms "2.0.0"
-+
-+debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
-+  version "2.6.9"
-+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-+  dependencies:
-+    ms "2.0.0"
-+
-+decamelize@^1.1.1:
-+  version "1.2.0"
-+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-+
-+decode-uri-component@^0.2.0:
-+  version "0.2.0"
-+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
-+
-+decompress-response@^3.2.0, decompress-response@^3.3.0:
-+  version "3.3.0"
-+  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
-+  dependencies:
-+    mimic-response "^1.0.0"
-+
-+deep-extend@^0.5.1:
-+  version "0.5.1"
-+  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.5.1.tgz#b894a9dd90d3023fbf1c55a394fb858eb2066f1f"
-+
-+define-property@^0.2.5:
-+  version "0.2.5"
-+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
-+  dependencies:
-+    is-descriptor "^0.1.0"
-+
-+define-property@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
-+  dependencies:
-+    is-descriptor "^1.0.0"
-+
-+define-property@^2.0.2:
-+  version "2.0.2"
-+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
-+  dependencies:
-+    is-descriptor "^1.0.2"
-+    isobject "^3.0.1"
-+
-+delayed-stream@~1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-+
-+delegates@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-+
-+des.js@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
-+  dependencies:
-+    inherits "^2.0.1"
-+    minimalistic-assert "^1.0.0"
-+
-+detect-conflict@^1.0.0:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/detect-conflict/-/detect-conflict-1.0.1.tgz#088657a66a961c05019db7c4230883b1c6b4176e"
-+
-+detect-indent@^4.0.0:
-+  version "4.0.0"
-+  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
-+  dependencies:
-+    repeating "^2.0.0"
-+
-+detect-libc@^1.0.2:
-+  version "1.0.3"
-+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
-+
-+diff@^3.3.1, diff@^3.5.0:
-+  version "3.5.0"
-+  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
-+
-+diffie-hellman@^5.0.0:
-+  version "5.0.3"
-+  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
-+  dependencies:
-+    bn.js "^4.1.0"
-+    miller-rabin "^4.0.0"
-+    randombytes "^2.0.0"
-+
-+dir-glob@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034"
-+  dependencies:
-+    arrify "^1.0.1"
-+    path-type "^3.0.0"
-+
-+domain-browser@^1.1.1:
-+  version "1.2.0"
-+  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
-+
-+dugite@^1.63.0:
-+  version "1.63.0"
-+  resolved "https://registry.yarnpkg.com/dugite/-/dugite-1.63.0.tgz#6c3915629d70068277d29cd2ea6165e0bd7e1f05"
-+  dependencies:
-+    checksum "^0.1.1"
-+    mkdirp "^0.5.1"
-+    progress "^2.0.0"
-+    request "^2.85.0"
-+    rimraf "^2.5.4"
-+    tar "^4.0.2"
-+
-+duplexer3@^0.1.4:
-+  version "0.1.4"
-+  resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
-+
-+duplexify@^3.4.2, duplexify@^3.6.0:
-+  version "3.6.0"
-+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.6.0.tgz#592903f5d80b38d037220541264d69a198fb3410"
-+  dependencies:
-+    end-of-stream "^1.0.0"
-+    inherits "^2.0.1"
-+    readable-stream "^2.0.0"
-+    stream-shift "^1.0.0"
-+
-+ecc-jsbn@~0.1.1:
-+  version "0.1.1"
-+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
-+  dependencies:
-+    jsbn "~0.1.0"
-+
-+editions@^1.3.3:
-+  version "1.3.4"
-+  resolved "https://registry.yarnpkg.com/editions/-/editions-1.3.4.tgz#3662cb592347c3168eb8e498a0ff73271d67f50b"
-+
-+ejs@^2.5.9:
-+  version "2.6.1"
-+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0"
-+
-+elegant-spinner@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
-+
-+elliptic@^6.0.0:
-+  version "6.4.0"
-+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df"
-+  dependencies:
-+    bn.js "^4.4.0"
-+    brorand "^1.0.1"
-+    hash.js "^1.0.0"
-+    hmac-drbg "^1.0.0"
-+    inherits "^2.0.1"
-+    minimalistic-assert "^1.0.0"
-+    minimalistic-crypto-utils "^1.0.0"
-+
-+emojis-list@^2.0.0:
-+  version "2.1.0"
-+  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
-+
-+end-of-stream@^1.0.0, end-of-stream@^1.1.0:
-+  version "1.4.1"
-+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
-+  dependencies:
-+    once "^1.4.0"
-+
-+enhanced-resolve@^4.0.0:
-+  version "4.0.0"
-+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.0.0.tgz#e34a6eaa790f62fccd71d93959f56b2b432db10a"
-+  dependencies:
-+    graceful-fs "^4.1.2"
-+    memory-fs "^0.4.0"
-+    tapable "^1.0.0"
-+
-+entities@~1.1.1:
-+  version "1.1.1"
-+  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
-+
-+envinfo@^4.4.2:
-+  version "4.4.2"
-+  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-4.4.2.tgz#472c49f3a8b9bca73962641ce7cb692bf623cd1c"
-+
-+errno@^0.1.3, errno@~0.1.7:
-+  version "0.1.7"
-+  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
-+  dependencies:
-+    prr "~1.0.1"
-+
-+error-ex@^1.3.1:
-+  version "1.3.1"
-+  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
-+  dependencies:
-+    is-arrayish "^0.2.1"
-+
-+error@^7.0.2:
-+  version "7.0.2"
-+  resolved "https://registry.yarnpkg.com/error/-/error-7.0.2.tgz#a5f75fff4d9926126ddac0ea5dc38e689153cb02"
-+  dependencies:
-+    string-template "~0.2.1"
-+    xtend "~4.0.0"
-+
-+es6-promise@^4.0.3:
-+  version "4.2.4"
-+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.4.tgz#dc4221c2b16518760bd8c39a52d8f356fc00ed29"
-+
-+es6-promisify@^5.0.0:
-+  version "5.0.0"
-+  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
-+  dependencies:
-+    es6-promise "^4.0.3"
-+
-+escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
-+  version "1.0.5"
-+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-+
-+eslint-scope@^3.7.1:
-+  version "3.7.1"
-+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"
-+  dependencies:
-+    esrecurse "^4.1.0"
-+    estraverse "^4.1.1"
-+
-+esprima@~4.0.0:
-+  version "4.0.0"
-+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
-+
-+esrecurse@^4.1.0:
-+  version "4.2.1"
-+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
-+  dependencies:
-+    estraverse "^4.1.0"
-+
-+estraverse@^4.1.0, estraverse@^4.1.1:
-+  version "4.2.0"
-+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
-+
-+esutils@^2.0.2:
-+  version "2.0.2"
-+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
-+
-+events@^1.0.0:
-+  version "1.1.1"
-+  resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
-+
-+evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
-+  version "1.0.3"
-+  resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
-+  dependencies:
-+    md5.js "^1.3.4"
-+    safe-buffer "^5.1.1"
-+
-+execa@^0.6.0:
-+  version "0.6.3"
-+  resolved "https://registry.yarnpkg.com/execa/-/execa-0.6.3.tgz#57b69a594f081759c69e5370f0d17b9cb11658fe"
-+  dependencies:
-+    cross-spawn "^5.0.1"
-+    get-stream "^3.0.0"
-+    is-stream "^1.1.0"
-+    npm-run-path "^2.0.0"
-+    p-finally "^1.0.0"
-+    signal-exit "^3.0.0"
-+    strip-eof "^1.0.0"
-+
-+execa@^0.7.0:
-+  version "0.7.0"
-+  resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
-+  dependencies:
-+    cross-spawn "^5.0.1"
-+    get-stream "^3.0.0"
-+    is-stream "^1.1.0"
-+    npm-run-path "^2.0.0"
-+    p-finally "^1.0.0"
-+    signal-exit "^3.0.0"
-+    strip-eof "^1.0.0"
-+
-+exit-hook@^1.0.0:
-+  version "1.1.1"
-+  resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
-+
-+expand-brackets@^0.1.4:
-+  version "0.1.5"
-+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
-+  dependencies:
-+    is-posix-bracket "^0.1.0"
-+
-+expand-brackets@^2.1.4:
-+  version "2.1.4"
-+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
-+  dependencies:
-+    debug "^2.3.3"
-+    define-property "^0.2.5"
-+    extend-shallow "^2.0.1"
-+    posix-character-classes "^0.1.0"
-+    regex-not "^1.0.0"
-+    snapdragon "^0.8.1"
-+    to-regex "^3.0.1"
-+
-+expand-range@^1.8.1:
-+  version "1.8.2"
-+  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
-+  dependencies:
-+    fill-range "^2.1.0"
-+
-+expand-tilde@^2.0.0, expand-tilde@^2.0.2:
-+  version "2.0.2"
-+  resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
-+  dependencies:
-+    homedir-polyfill "^1.0.1"
-+
-+extend-shallow@^2.0.1:
-+  version "2.0.1"
-+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
-+  dependencies:
-+    is-extendable "^0.1.0"
-+
-+extend-shallow@^3.0.0, extend-shallow@^3.0.2:
-+  version "3.0.2"
-+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
-+  dependencies:
-+    assign-symbols "^1.0.0"
-+    is-extendable "^1.0.1"
-+
-+extend@~3.0.1:
-+  version "3.0.1"
-+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
-+
-+external-editor@^2.1.0:
-+  version "2.2.0"
-+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5"
-+  dependencies:
-+    chardet "^0.4.0"
-+    iconv-lite "^0.4.17"
-+    tmp "^0.0.33"
-+
-+extglob@^0.3.1:
-+  version "0.3.2"
-+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
-+  dependencies:
-+    is-extglob "^1.0.0"
-+
-+extglob@^2.0.4:
-+  version "2.0.4"
-+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
-+  dependencies:
-+    array-unique "^0.3.2"
-+    define-property "^1.0.0"
-+    expand-brackets "^2.1.4"
-+    extend-shallow "^2.0.1"
-+    fragment-cache "^0.2.1"
-+    regex-not "^1.0.0"
-+    snapdragon "^0.8.1"
-+    to-regex "^3.0.1"
-+
-+extsprintf@1.3.0:
-+  version "1.3.0"
-+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-+
-+extsprintf@^1.2.0:
-+  version "1.4.0"
-+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
-+
-+fast-deep-equal@^1.0.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
-+
-+fast-deep-equal@^2.0.1:
-+  version "2.0.1"
-+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
-+
-+fast-glob@^2.0.2:
-+  version "2.2.2"
-+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.2.tgz#71723338ac9b4e0e2fff1d6748a2a13d5ed352bf"
-+  dependencies:
-+    "@mrmlnc/readdir-enhanced" "^2.2.1"
-+    "@nodelib/fs.stat" "^1.0.1"
-+    glob-parent "^3.1.0"
-+    is-glob "^4.0.0"
-+    merge2 "^1.2.1"
-+    micromatch "^3.1.10"
-+
-+fast-json-stable-stringify@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
-+
-+figures@^1.7.0:
-+  version "1.7.0"
-+  resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
-+  dependencies:
-+    escape-string-regexp "^1.0.5"
-+    object-assign "^4.1.0"
-+
-+figures@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
-+  dependencies:
-+    escape-string-regexp "^1.0.5"
-+
-+filename-regex@^2.0.0:
-+  version "2.0.1"
-+  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
-+
-+fill-range@^2.1.0:
-+  version "2.2.4"
-+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565"
-+  dependencies:
-+    is-number "^2.1.0"
-+    isobject "^2.0.0"
-+    randomatic "^3.0.0"
-+    repeat-element "^1.1.2"
-+    repeat-string "^1.5.2"
-+
-+fill-range@^4.0.0:
-+  version "4.0.0"
-+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
-+  dependencies:
-+    extend-shallow "^2.0.1"
-+    is-number "^3.0.0"
-+    repeat-string "^1.6.1"
-+    to-regex-range "^2.1.0"
-+
-+find-cache-dir@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
-+  dependencies:
-+    commondir "^1.0.1"
-+    make-dir "^1.0.0"
-+    pkg-dir "^2.0.0"
-+
-+find-up@^2.0.0, find-up@^2.1.0:
-+  version "2.1.0"
-+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
-+  dependencies:
-+    locate-path "^2.0.0"
-+
-+first-chunk-stream@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz#1bdecdb8e083c0664b91945581577a43a9f31d70"
-+  dependencies:
-+    readable-stream "^2.0.2"
-+
-+flow-parser@^0.*:
-+  version "0.72.0"
-+  resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.72.0.tgz#6c8041e76ac7d0be1a71ce29c00cd1435fb6013c"
-+
-+flush-write-stream@^1.0.0:
-+  version "1.0.3"
-+  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.3.tgz#c5d586ef38af6097650b49bc41b55fabb19f35bd"
-+  dependencies:
-+    inherits "^2.0.1"
-+    readable-stream "^2.0.4"
-+
-+for-in@^1.0.1, for-in@^1.0.2:
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-+
-+for-own@^0.1.4:
-+  version "0.1.5"
-+  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
-+  dependencies:
-+    for-in "^1.0.1"
-+
-+forever-agent@~0.6.1:
-+  version "0.6.1"
-+  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-+
-+form-data@~2.3.1:
-+  version "2.3.2"
-+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
-+  dependencies:
-+    asynckit "^0.4.0"
-+    combined-stream "1.0.6"
-+    mime-types "^2.1.12"
-+
-+fragment-cache@^0.2.1:
-+  version "0.2.1"
-+  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
-+  dependencies:
-+    map-cache "^0.2.2"
-+
-+from2@^2.1.0, from2@^2.1.1:
-+  version "2.3.0"
-+  resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
-+  dependencies:
-+    inherits "^2.0.1"
-+    readable-stream "^2.0.0"
-+
-+fs-minipass@^1.2.5:
-+  version "1.2.5"
-+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
-+  dependencies:
-+    minipass "^2.2.1"
-+
-+fs-write-stream-atomic@^1.0.8:
-+  version "1.0.10"
-+  resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
-+  dependencies:
-+    graceful-fs "^4.1.2"
-+    iferr "^0.1.5"
-+    imurmurhash "^0.1.4"
-+    readable-stream "1 || 2"
-+
-+fs.realpath@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-+
-+fsevents@^1.1.2:
-+  version "1.2.4"
-+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426"
-+  dependencies:
-+    nan "^2.9.2"
-+    node-pre-gyp "^0.10.0"
-+
-+gauge@~2.7.3:
-+  version "2.7.4"
-+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
-+  dependencies:
-+    aproba "^1.0.3"
-+    console-control-strings "^1.0.0"
-+    has-unicode "^2.0.0"
-+    object-assign "^4.1.0"
-+    signal-exit "^3.0.0"
-+    string-width "^1.0.1"
-+    strip-ansi "^3.0.1"
-+    wide-align "^1.1.0"
-+
-+get-caller-file@^1.0.1:
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
-+
-+get-stream@3.0.0, get-stream@^3.0.0:
-+  version "3.0.0"
-+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
-+
-+get-value@^2.0.3, get-value@^2.0.6:
-+  version "2.0.6"
-+  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
-+
-+getpass@^0.1.1:
-+  version "0.1.7"
-+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-+  dependencies:
-+    assert-plus "^1.0.0"
-+
-+gh-got@^6.0.0:
-+  version "6.0.0"
-+  resolved "https://registry.yarnpkg.com/gh-got/-/gh-got-6.0.0.tgz#d74353004c6ec466647520a10bd46f7299d268d0"
-+  dependencies:
-+    got "^7.0.0"
-+    is-plain-obj "^1.1.0"
-+
-+git-credential-node@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/git-credential-node/-/git-credential-node-1.1.0.tgz#2507544ac031d0082cd9e0f833aac758f15fd80d"
-+  dependencies:
-+    execa "^0.6.0"
-+
-+github-username@^4.0.0:
-+  version "4.1.0"
-+  resolved "https://registry.yarnpkg.com/github-username/-/github-username-4.1.0.tgz#cbe280041883206da4212ae9e4b5f169c30bf417"
-+  dependencies:
-+    gh-got "^6.0.0"
-+
-+glob-all@^3.1.0:
-+  version "3.1.0"
-+  resolved "https://registry.yarnpkg.com/glob-all/-/glob-all-3.1.0.tgz#8913ddfb5ee1ac7812656241b03d5217c64b02ab"
-+  dependencies:
-+    glob "^7.0.5"
-+    yargs "~1.2.6"
-+
-+glob-base@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
-+  dependencies:
-+    glob-parent "^2.0.0"
-+    is-glob "^2.0.0"
-+
-+glob-parent@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
-+  dependencies:
-+    is-glob "^2.0.0"
-+
-+glob-parent@^3.1.0:
-+  version "3.1.0"
-+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
-+  dependencies:
-+    is-glob "^3.1.0"
-+    path-dirname "^1.0.0"
-+
-+glob-to-regexp@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
-+
-+glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.2:
-+  version "7.1.2"
-+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
-+  dependencies:
-+    fs.realpath "^1.0.0"
-+    inflight "^1.0.4"
-+    inherits "2"
-+    minimatch "^3.0.4"
-+    once "^1.3.0"
-+    path-is-absolute "^1.0.0"
-+
-+global-modules@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
-+  dependencies:
-+    global-prefix "^1.0.1"
-+    is-windows "^1.0.1"
-+    resolve-dir "^1.0.0"
-+
-+global-prefix@^1.0.1:
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
-+  dependencies:
-+    expand-tilde "^2.0.2"
-+    homedir-polyfill "^1.0.1"
-+    ini "^1.3.4"
-+    is-windows "^1.0.1"
-+    which "^1.2.14"
-+
-+globals@^9.18.0:
-+  version "9.18.0"
-+  resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
-+
-+globby@^8.0.0, globby@^8.0.1:
-+  version "8.0.1"
-+  resolved "https://registry.yarnpkg.com/globby/-/globby-8.0.1.tgz#b5ad48b8aa80b35b814fc1281ecc851f1d2b5b50"
-+  dependencies:
-+    array-union "^1.0.1"
-+    dir-glob "^2.0.0"
-+    fast-glob "^2.0.2"
-+    glob "^7.1.2"
-+    ignore "^3.3.5"
-+    pify "^3.0.0"
-+    slash "^1.0.0"
-+
-+got@^7.0.0:
-+  version "7.1.0"
-+  resolved "https://registry.yarnpkg.com/got/-/got-7.1.0.tgz#05450fd84094e6bbea56f451a43a9c289166385a"
-+  dependencies:
-+    decompress-response "^3.2.0"
-+    duplexer3 "^0.1.4"
-+    get-stream "^3.0.0"
-+    is-plain-obj "^1.1.0"
-+    is-retry-allowed "^1.0.0"
-+    is-stream "^1.0.0"
-+    isurl "^1.0.0-alpha5"
-+    lowercase-keys "^1.0.0"
-+    p-cancelable "^0.3.0"
-+    p-timeout "^1.1.1"
-+    safe-buffer "^5.0.1"
-+    timed-out "^4.0.0"
-+    url-parse-lax "^1.0.0"
-+    url-to-options "^1.0.1"
-+
-+got@^8.2.0:
-+  version "8.3.1"
-+  resolved "https://registry.yarnpkg.com/got/-/got-8.3.1.tgz#093324403d4d955f5a16a7a8d39955d055ae10ed"
-+  dependencies:
-+    "@sindresorhus/is" "^0.7.0"
-+    cacheable-request "^2.1.1"
-+    decompress-response "^3.3.0"
-+    duplexer3 "^0.1.4"
-+    get-stream "^3.0.0"
-+    into-stream "^3.1.0"
-+    is-retry-allowed "^1.1.0"
-+    isurl "^1.0.0-alpha5"
-+    lowercase-keys "^1.0.0"
-+    mimic-response "^1.0.0"
-+    p-cancelable "^0.4.0"
-+    p-timeout "^2.0.1"
-+    pify "^3.0.0"
-+    safe-buffer "^5.1.1"
-+    timed-out "^4.0.1"
-+    url-parse-lax "^3.0.0"
-+    url-to-options "^1.0.1"
-+
-+graceful-fs@^4.1.11, graceful-fs@^4.1.2:
-+  version "4.1.11"
-+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
-+
-+grouped-queue@^0.3.3:
-+  version "0.3.3"
-+  resolved "https://registry.yarnpkg.com/grouped-queue/-/grouped-queue-0.3.3.tgz#c167d2a5319c5a0e0964ef6a25b7c2df8996c85c"
-+  dependencies:
-+    lodash "^4.17.2"
-+
-+har-schema@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-+
-+har-validator@~5.0.3:
-+  version "5.0.3"
-+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
-+  dependencies:
-+    ajv "^5.1.0"
-+    har-schema "^2.0.0"
-+
-+has-ansi@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-+  dependencies:
-+    ansi-regex "^2.0.0"
-+
-+has-color@~0.1.0:
-+  version "0.1.7"
-+  resolved "https://registry.yarnpkg.com/has-color/-/has-color-0.1.7.tgz#67144a5260c34fc3cca677d041daf52fe7b78b2f"
-+
-+has-flag@^3.0.0:
-+  version "3.0.0"
-+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-+
-+has-symbol-support-x@^1.4.1:
-+  version "1.4.2"
-+  resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455"
-+
-+has-to-string-tag-x@^1.2.0:
-+  version "1.4.1"
-+  resolved "https://registry.yarnpkg.com/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz#a045ab383d7b4b2012a00148ab0aa5f290044d4d"
-+  dependencies:
-+    has-symbol-support-x "^1.4.1"
-+
-+has-unicode@^2.0.0:
-+  version "2.0.1"
-+  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-+
-+has-value@^0.3.1:
-+  version "0.3.1"
-+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
-+  dependencies:
-+    get-value "^2.0.3"
-+    has-values "^0.1.4"
-+    isobject "^2.0.0"
-+
-+has-value@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
-+  dependencies:
-+    get-value "^2.0.6"
-+    has-values "^1.0.0"
-+    isobject "^3.0.0"
-+
-+has-values@^0.1.4:
-+  version "0.1.4"
-+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
-+
-+has-values@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
-+  dependencies:
-+    is-number "^3.0.0"
-+    kind-of "^4.0.0"
-+
-+hash-base@^3.0.0:
-+  version "3.0.4"
-+  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
-+  dependencies:
-+    inherits "^2.0.1"
-+    safe-buffer "^5.0.1"
-+
-+hash.js@^1.0.0, hash.js@^1.0.3:
-+  version "1.1.3"
-+  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.3.tgz#340dedbe6290187151c1ea1d777a3448935df846"
-+  dependencies:
-+    inherits "^2.0.3"
-+    minimalistic-assert "^1.0.0"
-+
-+hawk@~6.0.2:
-+  version "6.0.2"
-+  resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038"
-+  dependencies:
-+    boom "4.x.x"
-+    cryptiles "3.x.x"
-+    hoek "4.x.x"
-+    sntp "2.x.x"
-+
-+hmac-drbg@^1.0.0:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
-+  dependencies:
-+    hash.js "^1.0.3"
-+    minimalistic-assert "^1.0.0"
-+    minimalistic-crypto-utils "^1.0.1"
-+
-+hoek@4.x.x:
-+  version "4.2.1"
-+  resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb"
-+
-+home-or-tmp@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
-+  dependencies:
-+    os-homedir "^1.0.0"
-+    os-tmpdir "^1.0.1"
-+
-+homedir-polyfill@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz#4c2bbc8a758998feebf5ed68580f76d46768b4bc"
-+  dependencies:
-+    parse-passwd "^1.0.0"
-+
-+hosted-git-info@^2.1.4:
-+  version "2.6.0"
-+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.6.0.tgz#23235b29ab230c576aab0d4f13fc046b0b038222"
-+
-+http-cache-semantics@3.8.1:
-+  version "3.8.1"
-+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
-+
-+http-proxy-agent@^2.1.0:
-+  version "2.1.0"
-+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
-+  dependencies:
-+    agent-base "4"
-+    debug "3.1.0"
-+
-+http-signature@~1.2.0:
-+  version "1.2.0"
-+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-+  dependencies:
-+    assert-plus "^1.0.0"
-+    jsprim "^1.2.2"
-+    sshpk "^1.7.0"
-+
-+https-browserify@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
-+
-+https-proxy-agent@^2.2.0:
-+  version "2.2.1"
-+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0"
-+  dependencies:
-+    agent-base "^4.1.0"
-+    debug "^3.1.0"
-+
-+iconv-lite@^0.4.17, iconv-lite@^0.4.4:
-+  version "0.4.23"
-+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
-+  dependencies:
-+    safer-buffer ">= 2.1.2 < 3"
-+
-+ieee754@^1.1.4:
-+  version "1.1.11"
-+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.11.tgz#c16384ffe00f5b7835824e67b6f2bd44a5229455"
-+
-+iferr@^0.1.5:
-+  version "0.1.5"
-+  resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
-+
-+ignore-walk@^3.0.1:
-+  version "3.0.1"
-+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
-+  dependencies:
-+    minimatch "^3.0.4"
-+
-+ignore@^3.3.5:
-+  version "3.3.8"
-+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.8.tgz#3f8e9c35d38708a3a7e0e9abb6c73e7ee7707b2b"
-+
-+import-local@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-1.0.0.tgz#5e4ffdc03f4fe6c009c6729beb29631c2f8227bc"
-+  dependencies:
-+    pkg-dir "^2.0.0"
-+    resolve-cwd "^2.0.0"
-+
-+imurmurhash@^0.1.4:
-+  version "0.1.4"
-+  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-+
-+indent-string@^2.1.0:
-+  version "2.1.0"
-+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
-+  dependencies:
-+    repeating "^2.0.0"
-+
-+indent-string@^3.0.0:
-+  version "3.2.0"
-+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
-+
-+indexof@0.0.1:
-+  version "0.0.1"
-+  resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
-+
-+inflight@^1.0.4:
-+  version "1.0.6"
-+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-+  dependencies:
-+    once "^1.3.0"
-+    wrappy "1"
-+
-+inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
-+  version "2.0.3"
-+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-+
-+inherits@2.0.1:
-+  version "2.0.1"
-+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
-+
-+ini@^1.3.4, ini@~1.3.0:
-+  version "1.3.5"
-+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-+
-+inquirer@^5.1.0, inquirer@^5.2.0:
-+  version "5.2.0"
-+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-5.2.0.tgz#db350c2b73daca77ff1243962e9f22f099685726"
-+  dependencies:
-+    ansi-escapes "^3.0.0"
-+    chalk "^2.0.0"
-+    cli-cursor "^2.1.0"
-+    cli-width "^2.0.0"
-+    external-editor "^2.1.0"
-+    figures "^2.0.0"
-+    lodash "^4.3.0"
-+    mute-stream "0.0.7"
-+    run-async "^2.2.0"
-+    rxjs "^5.5.2"
-+    string-width "^2.1.0"
-+    strip-ansi "^4.0.0"
-+    through "^2.3.6"
-+
-+interpret@^1.0.0, interpret@^1.0.4:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
-+
-+into-stream@^3.1.0:
-+  version "3.1.0"
-+  resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-3.1.0.tgz#96fb0a936c12babd6ff1752a17d05616abd094c6"
-+  dependencies:
-+    from2 "^2.1.1"
-+    p-is-promise "^1.1.0"
-+
-+invariant@^2.2.2:
-+  version "2.2.4"
-+  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
-+  dependencies:
-+    loose-envify "^1.0.0"
-+
-+invert-kv@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
-+
-+is-accessor-descriptor@^0.1.6:
-+  version "0.1.6"
-+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
-+  dependencies:
-+    kind-of "^3.0.2"
-+
-+is-accessor-descriptor@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
-+  dependencies:
-+    kind-of "^6.0.0"
-+
-+is-arrayish@^0.2.1:
-+  version "0.2.1"
-+  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-+
-+is-binary-path@^1.0.0:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
-+  dependencies:
-+    binary-extensions "^1.0.0"
-+
-+is-buffer@^1.1.5:
-+  version "1.1.6"
-+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-+
-+is-builtin-module@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
-+  dependencies:
-+    builtin-modules "^1.0.0"
-+
-+is-data-descriptor@^0.1.4:
-+  version "0.1.4"
-+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
-+  dependencies:
-+    kind-of "^3.0.2"
-+
-+is-data-descriptor@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
-+  dependencies:
-+    kind-of "^6.0.0"
-+
-+is-descriptor@^0.1.0:
-+  version "0.1.6"
-+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
-+  dependencies:
-+    is-accessor-descriptor "^0.1.6"
-+    is-data-descriptor "^0.1.4"
-+    kind-of "^5.0.0"
-+
-+is-descriptor@^1.0.0, is-descriptor@^1.0.2:
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
-+  dependencies:
-+    is-accessor-descriptor "^1.0.0"
-+    is-data-descriptor "^1.0.0"
-+    kind-of "^6.0.2"
-+
-+is-dotfile@^1.0.0:
-+  version "1.0.3"
-+  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
-+
-+is-equal-shallow@^0.1.3:
-+  version "0.1.3"
-+  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
-+  dependencies:
-+    is-primitive "^2.0.0"
-+
-+is-extendable@^0.1.0, is-extendable@^0.1.1:
-+  version "0.1.1"
-+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
-+
-+is-extendable@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
-+  dependencies:
-+    is-plain-object "^2.0.4"
-+
-+is-extglob@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
-+
-+is-extglob@^2.1.0, is-extglob@^2.1.1:
-+  version "2.1.1"
-+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-+
-+is-finite@^1.0.0:
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
-+  dependencies:
-+    number-is-nan "^1.0.0"
-+
-+is-fullwidth-code-point@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-+  dependencies:
-+    number-is-nan "^1.0.0"
-+
-+is-fullwidth-code-point@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-+
-+is-glob@^2.0.0, is-glob@^2.0.1:
-+  version "2.0.1"
-+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
-+  dependencies:
-+    is-extglob "^1.0.0"
-+
-+is-glob@^3.1.0:
-+  version "3.1.0"
-+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
-+  dependencies:
-+    is-extglob "^2.1.0"
-+
-+is-glob@^4.0.0:
-+  version "4.0.0"
-+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0"
-+  dependencies:
-+    is-extglob "^2.1.1"
-+
-+is-number@^2.1.0:
-+  version "2.1.0"
-+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
-+  dependencies:
-+    kind-of "^3.0.2"
-+
-+is-number@^3.0.0:
-+  version "3.0.0"
-+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
-+  dependencies:
-+    kind-of "^3.0.2"
-+
-+is-number@^4.0.0:
-+  version "4.0.0"
-+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
-+
-+is-object@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470"
-+
-+is-observable@^0.2.0:
-+  version "0.2.0"
-+  resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-0.2.0.tgz#b361311d83c6e5d726cabf5e250b0237106f5ae2"
-+  dependencies:
-+    symbol-observable "^0.2.2"
-+
-+is-odd@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-2.0.0.tgz#7646624671fd7ea558ccd9a2795182f2958f1b24"
-+  dependencies:
-+    is-number "^4.0.0"
-+
-+is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
-+
-+is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
-+  version "2.0.4"
-+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
-+  dependencies:
-+    isobject "^3.0.1"
-+
-+is-posix-bracket@^0.1.0:
-+  version "0.1.1"
-+  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
-+
-+is-primitive@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
-+
-+is-promise@^2.1.0:
-+  version "2.1.0"
-+  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
-+
-+is-retry-allowed@^1.0.0, is-retry-allowed@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
-+
-+is-scoped@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/is-scoped/-/is-scoped-1.0.0.tgz#449ca98299e713038256289ecb2b540dc437cb30"
-+  dependencies:
-+    scoped-regex "^1.0.0"
-+
-+is-stream@^1.0.0, is-stream@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-+
-+is-typedarray@~1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-+
-+is-utf8@^0.2.0:
-+  version "0.2.1"
-+  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
-+
-+is-windows@^1.0.1, is-windows@^1.0.2:
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
-+
-+isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-+
-+isbinaryfile@^3.0.2:
-+  version "3.0.2"
-+  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.2.tgz#4a3e974ec0cba9004d3fc6cde7209ea69368a621"
-+
-+isexe@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-+
-+isobject@^2.0.0:
-+  version "2.1.0"
-+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
-+  dependencies:
-+    isarray "1.0.0"
-+
-+isobject@^3.0.0, isobject@^3.0.1:
-+  version "3.0.1"
-+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
-+
-+isstream@~0.1.2:
-+  version "0.1.2"
-+  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-+
-+istextorbinary@^2.2.1:
-+  version "2.2.1"
-+  resolved "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-2.2.1.tgz#a5231a08ef6dd22b268d0895084cf8d58b5bec53"
-+  dependencies:
-+    binaryextensions "2"
-+    editions "^1.3.3"
-+    textextensions "2"
-+
-+isurl@^1.0.0-alpha5:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz#b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67"
-+  dependencies:
-+    has-to-string-tag-x "^1.2.0"
-+    is-object "^1.0.1"
-+
-+js-tokens@^3.0.0, js-tokens@^3.0.2:
-+  version "3.0.2"
-+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
-+
-+jsbn@~0.1.0:
-+  version "0.1.1"
-+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-+
-+jscodeshift@^0.4.0:
-+  version "0.4.1"
-+  resolved "https://registry.yarnpkg.com/jscodeshift/-/jscodeshift-0.4.1.tgz#da91a1c2eccfa03a3387a21d39948e251ced444a"
-+  dependencies:
-+    async "^1.5.0"
-+    babel-plugin-transform-flow-strip-types "^6.8.0"
-+    babel-preset-es2015 "^6.9.0"
-+    babel-preset-stage-1 "^6.5.0"
-+    babel-register "^6.9.0"
-+    babylon "^6.17.3"
-+    colors "^1.1.2"
-+    flow-parser "^0.*"
-+    lodash "^4.13.1"
-+    micromatch "^2.3.7"
-+    node-dir "0.1.8"
-+    nomnom "^1.8.1"
-+    recast "^0.12.5"
-+    temp "^0.8.1"
-+    write-file-atomic "^1.2.0"
-+
-+jscodeshift@^0.5.0:
-+  version "0.5.0"
-+  resolved "https://registry.yarnpkg.com/jscodeshift/-/jscodeshift-0.5.0.tgz#bdb7b6cc20dd62c16aa728c3fa2d2fe66ca7c748"
-+  dependencies:
-+    babel-plugin-transform-flow-strip-types "^6.8.0"
-+    babel-preset-es2015 "^6.9.0"
-+    babel-preset-stage-1 "^6.5.0"
-+    babel-register "^6.9.0"
-+    babylon "^7.0.0-beta.30"
-+    colors "^1.1.2"
-+    flow-parser "^0.*"
-+    lodash "^4.13.1"
-+    micromatch "^2.3.7"
-+    neo-async "^2.5.0"
-+    node-dir "0.1.8"
-+    nomnom "^1.8.1"
-+    recast "^0.14.1"
-+    temp "^0.8.1"
-+    write-file-atomic "^1.2.0"
-+
-+jsesc@^1.3.0:
-+  version "1.3.0"
-+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
-+
-+jsesc@~0.5.0:
-+  version "0.5.0"
-+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
-+
-+json-buffer@3.0.0:
-+  version "3.0.0"
-+  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
-+
-+json-parse-better-errors@^1.0.1:
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
-+
-+json-schema-traverse@^0.3.0:
-+  version "0.3.1"
-+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
-+
-+json-schema@0.2.3:
-+  version "0.2.3"
-+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
-+
-+json-stringify-safe@~5.0.1:
-+  version "5.0.1"
-+  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-+
-+json5@^0.5.0, json5@^0.5.1:
-+  version "0.5.1"
-+  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
-+
-+jsprim@^1.2.2:
-+  version "1.4.1"
-+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
-+  dependencies:
-+    assert-plus "1.0.0"
-+    extsprintf "1.3.0"
-+    json-schema "0.2.3"
-+    verror "1.10.0"
-+
-+keyv@3.0.0:
-+  version "3.0.0"
-+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.0.0.tgz#44923ba39e68b12a7cec7df6c3268c031f2ef373"
-+  dependencies:
-+    json-buffer "3.0.0"
-+
-+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
-+  version "3.2.2"
-+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
-+  dependencies:
-+    is-buffer "^1.1.5"
-+
-+kind-of@^4.0.0:
-+  version "4.0.0"
-+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
-+  dependencies:
-+    is-buffer "^1.1.5"
-+
-+kind-of@^5.0.0:
-+  version "5.1.0"
-+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
-+
-+kind-of@^6.0.0, kind-of@^6.0.2:
-+  version "6.0.2"
-+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
-+
-+lcid@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
-+  dependencies:
-+    invert-kv "^1.0.0"
-+
-+leb@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/leb/-/leb-0.3.0.tgz#32bee9fad168328d6aea8522d833f4180eed1da3"
-+
-+linkify-it@^2.0.0:
-+  version "2.0.3"
-+  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.0.3.tgz#d94a4648f9b1c179d64fa97291268bdb6ce9434f"
-+  dependencies:
-+    uc.micro "^1.0.1"
-+
-+listr-silent-renderer@^1.1.1:
-+  version "1.1.1"
-+  resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e"
-+
-+listr-update-renderer@^0.4.0:
-+  version "0.4.0"
-+  resolved "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.4.0.tgz#344d980da2ca2e8b145ba305908f32ae3f4cc8a7"
-+  dependencies:
-+    chalk "^1.1.3"
-+    cli-truncate "^0.2.1"
-+    elegant-spinner "^1.0.1"
-+    figures "^1.7.0"
-+    indent-string "^3.0.0"
-+    log-symbols "^1.0.2"
-+    log-update "^1.0.2"
-+    strip-ansi "^3.0.1"
-+
-+listr-verbose-renderer@^0.4.0:
-+  version "0.4.1"
-+  resolved "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz#8206f4cf6d52ddc5827e5fd14989e0e965933a35"
-+  dependencies:
-+    chalk "^1.1.3"
-+    cli-cursor "^1.0.2"
-+    date-fns "^1.27.2"
-+    figures "^1.7.0"
-+
-+listr@^0.13.0:
-+  version "0.13.0"
-+  resolved "https://registry.yarnpkg.com/listr/-/listr-0.13.0.tgz#20bb0ba30bae660ee84cc0503df4be3d5623887d"
-+  dependencies:
-+    chalk "^1.1.3"
-+    cli-truncate "^0.2.1"
-+    figures "^1.7.0"
-+    indent-string "^2.1.0"
-+    is-observable "^0.2.0"
-+    is-promise "^2.1.0"
-+    is-stream "^1.1.0"
-+    listr-silent-renderer "^1.1.1"
-+    listr-update-renderer "^0.4.0"
-+    listr-verbose-renderer "^0.4.0"
-+    log-symbols "^1.0.2"
-+    log-update "^1.0.2"
-+    ora "^0.2.3"
-+    p-map "^1.1.1"
-+    rxjs "^5.4.2"
-+    stream-to-observable "^0.2.0"
-+    strip-ansi "^3.0.1"
-+
-+load-json-file@^4.0.0:
-+  version "4.0.0"
-+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
-+  dependencies:
-+    graceful-fs "^4.1.2"
-+    parse-json "^4.0.0"
-+    pify "^3.0.0"
-+    strip-bom "^3.0.0"
-+
-+loader-runner@^2.3.0:
-+  version "2.3.0"
-+  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
-+
-+loader-utils@^1.0.2, loader-utils@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
-+  dependencies:
-+    big.js "^3.1.3"
-+    emojis-list "^2.0.0"
-+    json5 "^0.5.0"
-+
-+locate-path@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
-+  dependencies:
-+    p-locate "^2.0.0"
-+    path-exists "^3.0.0"
-+
-+lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.10, lodash@^4.17.2, lodash@^4.17.5, lodash@^4.3.0:
-+  version "4.17.10"
-+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
-+
-+lodash@^4.17.4:
-+  version "4.17.5"
-+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
-+
-+log-symbols@^1.0.2:
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
-+  dependencies:
-+    chalk "^1.0.0"
-+
-+log-symbols@^2.1.0, log-symbols@^2.2.0:
-+  version "2.2.0"
-+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
-+  dependencies:
-+    chalk "^2.0.1"
-+
-+log-update@^1.0.2:
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/log-update/-/log-update-1.0.2.tgz#19929f64c4093d2d2e7075a1dad8af59c296b8d1"
-+  dependencies:
-+    ansi-escapes "^1.0.0"
-+    cli-cursor "^1.0.2"
-+
-+long@^3.2.0:
-+  version "3.2.0"
-+  resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b"
-+
-+loose-envify@^1.0.0:
-+  version "1.3.1"
-+  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
-+  dependencies:
-+    js-tokens "^3.0.0"
-+
-+lowercase-keys@1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
-+
-+lowercase-keys@^1.0.0:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
-+
-+lru-cache@^4.0.1:
-+  version "4.1.2"
-+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.2.tgz#45234b2e6e2f2b33da125624c4664929a0224c3f"
-+  dependencies:
-+    pseudomap "^1.0.2"
-+    yallist "^2.1.2"
-+
-+lru-cache@^4.1.1:
-+  version "4.1.3"
-+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
-+  dependencies:
-+    pseudomap "^1.0.2"
-+    yallist "^2.1.2"
-+
-+make-dir@^1.0.0, make-dir@^1.1.0:
-+  version "1.3.0"
-+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
-+  dependencies:
-+    pify "^3.0.0"
-+
-+map-cache@^0.2.2:
-+  version "0.2.2"
-+  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
-+
-+map-visit@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
-+  dependencies:
-+    object-visit "^1.0.0"
-+
-+markdown-it@^8.4.0:
-+  version "8.4.1"
-+  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.1.tgz#206fe59b0e4e1b78a7c73250af9b34a4ad0aaf44"
-+  dependencies:
-+    argparse "^1.0.7"
-+    entities "~1.1.1"
-+    linkify-it "^2.0.0"
-+    mdurl "^1.0.1"
-+    uc.micro "^1.0.5"
-+
-+math-random@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac"
-+
-+md5.js@^1.3.4:
-+  version "1.3.4"
-+  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d"
-+  dependencies:
-+    hash-base "^3.0.0"
-+    inherits "^2.0.1"
-+
-+mdurl@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
-+
-+mem-fs-editor@^4.0.0:
-+  version "4.0.2"
-+  resolved "https://registry.yarnpkg.com/mem-fs-editor/-/mem-fs-editor-4.0.2.tgz#55a79b1e824da631254c4c95ba6366602c77af90"
-+  dependencies:
-+    commondir "^1.0.1"
-+    deep-extend "^0.5.1"
-+    ejs "^2.5.9"
-+    glob "^7.0.3"
-+    globby "^8.0.0"
-+    isbinaryfile "^3.0.2"
-+    mkdirp "^0.5.0"
-+    multimatch "^2.0.0"
-+    rimraf "^2.2.8"
-+    through2 "^2.0.0"
-+    vinyl "^2.0.1"
-+
-+mem-fs@^1.1.0:
-+  version "1.1.3"
-+  resolved "https://registry.yarnpkg.com/mem-fs/-/mem-fs-1.1.3.tgz#b8ae8d2e3fcb6f5d3f9165c12d4551a065d989cc"
-+  dependencies:
-+    through2 "^2.0.0"
-+    vinyl "^1.1.0"
-+    vinyl-file "^2.0.0"
-+
-+mem@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
-+  dependencies:
-+    mimic-fn "^1.0.0"
-+
-+memory-fs@^0.4.0, memory-fs@~0.4.1:
-+  version "0.4.1"
-+  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
-+  dependencies:
-+    errno "^0.1.3"
-+    readable-stream "^2.0.1"
-+
-+merge2@^1.2.1:
-+  version "1.2.2"
-+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.2.tgz#03212e3da8d86c4d8523cebd6318193414f94e34"
-+
-+micromatch@^2.3.7:
-+  version "2.3.11"
-+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
-+  dependencies:
-+    arr-diff "^2.0.0"
-+    array-unique "^0.2.1"
-+    braces "^1.8.2"
-+    expand-brackets "^0.1.4"
-+    extglob "^0.3.1"
-+    filename-regex "^2.0.0"
-+    is-extglob "^1.0.0"
-+    is-glob "^2.0.1"
-+    kind-of "^3.0.2"
-+    normalize-path "^2.0.1"
-+    object.omit "^2.0.0"
-+    parse-glob "^3.0.4"
-+    regex-cache "^0.4.2"
-+
-+micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8:
-+  version "3.1.10"
-+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
-+  dependencies:
-+    arr-diff "^4.0.0"
-+    array-unique "^0.3.2"
-+    braces "^2.3.1"
-+    define-property "^2.0.2"
-+    extend-shallow "^3.0.2"
-+    extglob "^2.0.4"
-+    fragment-cache "^0.2.1"
-+    kind-of "^6.0.2"
-+    nanomatch "^1.2.9"
-+    object.pick "^1.3.0"
-+    regex-not "^1.0.0"
-+    snapdragon "^0.8.1"
-+    to-regex "^3.0.2"
-+
-+miller-rabin@^4.0.0:
-+  version "4.0.1"
-+  resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
-+  dependencies:
-+    bn.js "^4.0.0"
-+    brorand "^1.0.1"
-+
-+mime-db@~1.33.0:
-+  version "1.33.0"
-+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
-+
-+mime-types@^2.1.12, mime-types@~2.1.17:
-+  version "2.1.18"
-+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
-+  dependencies:
-+    mime-db "~1.33.0"
-+
-+mimic-fn@^1.0.0:
-+  version "1.2.0"
-+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
-+
-+mimic-response@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.0.tgz#df3d3652a73fded6b9b0b24146e6fd052353458e"
-+
-+minimalistic-assert@^1.0.0:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
-+
-+minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
-+
-+minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4:
-+  version "3.0.4"
-+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-+  dependencies:
-+    brace-expansion "^1.1.7"
-+
-+minimist@0.0.8:
-+  version "0.0.8"
-+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-+
-+minimist@^0.1.0:
-+  version "0.1.0"
-+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.1.0.tgz#99df657a52574c21c9057497df742790b2b4c0de"
-+
-+minimist@^1.2.0:
-+  version "1.2.0"
-+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-+
-+minipass@^2.2.1, minipass@^2.2.4:
-+  version "2.2.4"
-+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.2.4.tgz#03c824d84551ec38a8d1bb5bc350a5a30a354a40"
-+  dependencies:
-+    safe-buffer "^5.1.1"
-+    yallist "^3.0.0"
-+
-+minizlib@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb"
-+  dependencies:
-+    minipass "^2.2.1"
-+
-+mississippi@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
-+  dependencies:
-+    concat-stream "^1.5.0"
-+    duplexify "^3.4.2"
-+    end-of-stream "^1.1.0"
-+    flush-write-stream "^1.0.0"
-+    from2 "^2.1.0"
-+    parallel-transform "^1.1.0"
-+    pump "^2.0.1"
-+    pumpify "^1.3.3"
-+    stream-each "^1.1.0"
-+    through2 "^2.0.0"
-+
-+mixin-deep@^1.2.0:
-+  version "1.3.1"
-+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
-+  dependencies:
-+    for-in "^1.0.2"
-+    is-extendable "^1.0.1"
-+
-+mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
-+  version "0.5.1"
-+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-+  dependencies:
-+    minimist "0.0.8"
-+
-+moment@^2.22.1:
-+  version "2.22.1"
-+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.1.tgz#529a2e9bf973f259c9643d237fda84de3a26e8ad"
-+
-+move-concurrently@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
-+  dependencies:
-+    aproba "^1.1.1"
-+    copy-concurrently "^1.0.0"
-+    fs-write-stream-atomic "^1.0.8"
-+    mkdirp "^0.5.1"
-+    rimraf "^2.5.4"
-+    run-queue "^1.0.3"
-+
-+ms@2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-+
-+multimatch@^2.0.0:
-+  version "2.1.0"
-+  resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
-+  dependencies:
-+    array-differ "^1.0.0"
-+    array-union "^1.0.1"
-+    arrify "^1.0.0"
-+    minimatch "^3.0.0"
-+
-+mute-stream@0.0.7:
-+  version "0.0.7"
-+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
-+
-+nan@^2.9.2:
-+  version "2.10.0"
-+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
-+
-+nanomatch@^1.2.9:
-+  version "1.2.9"
-+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.9.tgz#879f7150cb2dab7a471259066c104eee6e0fa7c2"
-+  dependencies:
-+    arr-diff "^4.0.0"
-+    array-unique "^0.3.2"
-+    define-property "^2.0.2"
-+    extend-shallow "^3.0.2"
-+    fragment-cache "^0.2.1"
-+    is-odd "^2.0.0"
-+    is-windows "^1.0.2"
-+    kind-of "^6.0.2"
-+    object.pick "^1.3.0"
-+    regex-not "^1.0.0"
-+    snapdragon "^0.8.1"
-+    to-regex "^3.0.1"
-+
-+needle@^2.2.0:
-+  version "2.2.1"
-+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.1.tgz#b5e325bd3aae8c2678902fa296f729455d1d3a7d"
-+  dependencies:
-+    debug "^2.1.2"
-+    iconv-lite "^0.4.4"
-+    sax "^1.2.4"
-+
-+neo-async@^2.5.0:
-+  version "2.5.1"
-+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.1.tgz#acb909e327b1e87ec9ef15f41b8a269512ad41ee"
-+
-+nice-try@^1.0.4:
-+  version "1.0.4"
-+  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.4.tgz#d93962f6c52f2c1558c0fbda6d512819f1efe1c4"
-+
-+node-dir@0.1.8:
-+  version "0.1.8"
-+  resolved "https://registry.yarnpkg.com/node-dir/-/node-dir-0.1.8.tgz#55fb8deb699070707fb67f91a460f0448294c77d"
-+
-+node-fetch@^2.1.1:
-+  version "2.1.2"
-+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.1.2.tgz#ab884e8e7e57e38a944753cec706f788d1768bb5"
-+
-+node-libs-browser@^2.0.0:
-+  version "2.1.0"
-+  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.1.0.tgz#5f94263d404f6e44767d726901fff05478d600df"
-+  dependencies:
-+    assert "^1.1.1"
-+    browserify-zlib "^0.2.0"
-+    buffer "^4.3.0"
-+    console-browserify "^1.1.0"
-+    constants-browserify "^1.0.0"
-+    crypto-browserify "^3.11.0"
-+    domain-browser "^1.1.1"
-+    events "^1.0.0"
-+    https-browserify "^1.0.0"
-+    os-browserify "^0.3.0"
-+    path-browserify "0.0.0"
-+    process "^0.11.10"
-+    punycode "^1.2.4"
-+    querystring-es3 "^0.2.0"
-+    readable-stream "^2.3.3"
-+    stream-browserify "^2.0.1"
-+    stream-http "^2.7.2"
-+    string_decoder "^1.0.0"
-+    timers-browserify "^2.0.4"
-+    tty-browserify "0.0.0"
-+    url "^0.11.0"
-+    util "^0.10.3"
-+    vm-browserify "0.0.4"
-+
-+node-pre-gyp@^0.10.0:
-+  version "0.10.0"
-+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.0.tgz#6e4ef5bb5c5203c6552448828c852c40111aac46"
-+  dependencies:
-+    detect-libc "^1.0.2"
-+    mkdirp "^0.5.1"
-+    needle "^2.2.0"
-+    nopt "^4.0.1"
-+    npm-packlist "^1.1.6"
-+    npmlog "^4.0.2"
-+    rc "^1.1.7"
-+    rimraf "^2.6.1"
-+    semver "^5.3.0"
-+    tar "^4"
-+
-+nomnom@^1.8.1:
-+  version "1.8.1"
-+  resolved "https://registry.yarnpkg.com/nomnom/-/nomnom-1.8.1.tgz#2151f722472ba79e50a76fc125bb8c8f2e4dc2a7"
-+  dependencies:
-+    chalk "~0.4.0"
-+    underscore "~1.6.0"
-+
-+nopt@^4.0.1:
-+  version "4.0.1"
-+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
-+  dependencies:
-+    abbrev "1"
-+    osenv "^0.1.4"
-+
-+normalize-package-data@^2.3.2:
-+  version "2.4.0"
-+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
-+  dependencies:
-+    hosted-git-info "^2.1.4"
-+    is-builtin-module "^1.0.0"
-+    semver "2 || 3 || 4 || 5"
-+    validate-npm-package-license "^3.0.1"
-+
-+normalize-path@^2.0.1, normalize-path@^2.1.1:
-+  version "2.1.1"
-+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
-+  dependencies:
-+    remove-trailing-separator "^1.0.1"
-+
-+normalize-url@2.0.1:
-+  version "2.0.1"
-+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-2.0.1.tgz#835a9da1551fa26f70e92329069a23aa6574d7e6"
-+  dependencies:
-+    prepend-http "^2.0.0"
-+    query-string "^5.0.1"
-+    sort-keys "^2.0.0"
-+
-+npm-bundled@^1.0.1:
-+  version "1.0.3"
-+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.3.tgz#7e71703d973af3370a9591bafe3a63aca0be2308"
-+
-+npm-packlist@^1.1.6:
-+  version "1.1.10"
-+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.10.tgz#1039db9e985727e464df066f4cf0ab6ef85c398a"
-+  dependencies:
-+    ignore-walk "^3.0.1"
-+    npm-bundled "^1.0.1"
-+
-+npm-run-path@^2.0.0:
-+  version "2.0.2"
-+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
-+  dependencies:
-+    path-key "^2.0.0"
-+
-+npmlog@^4.0.2:
-+  version "4.1.2"
-+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
-+  dependencies:
-+    are-we-there-yet "~1.1.2"
-+    console-control-strings "~1.1.0"
-+    gauge "~2.7.3"
-+    set-blocking "~2.0.0"
-+
-+number-is-nan@^1.0.0:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-+
-+oauth-sign@~0.8.2:
-+  version "0.8.2"
-+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
-+
-+object-assign@^4.0.1, object-assign@^4.1.0:
-+  version "4.1.1"
-+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-+
-+object-copy@^0.1.0:
-+  version "0.1.0"
-+  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
-+  dependencies:
-+    copy-descriptor "^0.1.0"
-+    define-property "^0.2.5"
-+    kind-of "^3.0.3"
-+
-+object-visit@^1.0.0:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
-+  dependencies:
-+    isobject "^3.0.0"
-+
-+object.omit@^2.0.0:
-+  version "2.0.1"
-+  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
-+  dependencies:
-+    for-own "^0.1.4"
-+    is-extendable "^0.1.1"
-+
-+object.pick@^1.3.0:
-+  version "1.3.0"
-+  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
-+  dependencies:
-+    isobject "^3.0.1"
-+
-+once@^1.3.0, once@^1.3.1, once@^1.4.0:
-+  version "1.4.0"
-+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-+  dependencies:
-+    wrappy "1"
-+
-+onetime@^1.0.0:
-+  version "1.1.0"
-+  resolved "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
-+
-+onetime@^2.0.0:
-+  version "2.0.1"
-+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
-+  dependencies:
-+    mimic-fn "^1.0.0"
-+
-+optimist@~0.3.5:
-+  version "0.3.7"
-+  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.3.7.tgz#c90941ad59e4273328923074d2cf2e7cbc6ec0d9"
-+  dependencies:
-+    wordwrap "~0.0.2"
-+
-+ora@^0.2.3:
-+  version "0.2.3"
-+  resolved "https://registry.yarnpkg.com/ora/-/ora-0.2.3.tgz#37527d220adcd53c39b73571d754156d5db657a4"
-+  dependencies:
-+    chalk "^1.1.1"
-+    cli-cursor "^1.0.2"
-+    cli-spinners "^0.1.2"
-+    object-assign "^4.0.1"
-+
-+os-browserify@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
-+
-+os-homedir@^1.0.0:
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-+
-+os-locale@^2.0.0:
-+  version "2.1.0"
-+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
-+  dependencies:
-+    execa "^0.7.0"
-+    lcid "^1.0.0"
-+    mem "^1.1.0"
-+
-+os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-+
-+osenv@^0.1.4:
-+  version "0.1.5"
-+  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
-+  dependencies:
-+    os-homedir "^1.0.0"
-+    os-tmpdir "^1.0.0"
-+
-+p-cancelable@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.3.0.tgz#b9e123800bcebb7ac13a479be195b507b98d30fa"
-+
-+p-cancelable@^0.4.0:
-+  version "0.4.1"
-+  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.4.1.tgz#35f363d67d52081c8d9585e37bcceb7e0bbcb2a0"
-+
-+p-each-series@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-1.0.0.tgz#930f3d12dd1f50e7434457a22cd6f04ac6ad7f71"
-+  dependencies:
-+    p-reduce "^1.0.0"
-+
-+p-finally@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
-+
-+p-is-promise@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
-+
-+p-lazy@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/p-lazy/-/p-lazy-1.0.0.tgz#ec53c802f2ee3ac28f166cc82d0b2b02de27a835"
-+
-+p-limit@^1.1.0:
-+  version "1.2.0"
-+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.2.0.tgz#0e92b6bedcb59f022c13d0f1949dc82d15909f1c"
-+  dependencies:
-+    p-try "^1.0.0"
-+
-+p-locate@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
-+  dependencies:
-+    p-limit "^1.1.0"
-+
-+p-map@^1.1.1:
-+  version "1.2.0"
-+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
-+
-+p-reduce@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"
-+
-+p-timeout@^1.1.1:
-+  version "1.2.1"
-+  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-1.2.1.tgz#5eb3b353b7fce99f101a1038880bb054ebbea386"
-+  dependencies:
-+    p-finally "^1.0.0"
-+
-+p-timeout@^2.0.1:
-+  version "2.0.1"
-+  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-2.0.1.tgz#d8dd1979595d2dc0139e1fe46b8b646cb3cdf038"
-+  dependencies:
-+    p-finally "^1.0.0"
-+
-+p-try@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
-+
-+pako@~1.0.5:
-+  version "1.0.6"
-+  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
-+
-+parallel-transform@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz#d410f065b05da23081fcd10f28854c29bda33b06"
-+  dependencies:
-+    cyclist "~0.2.2"
-+    inherits "^2.0.3"
-+    readable-stream "^2.1.5"
-+
-+parse-asn1@^5.0.0:
-+  version "5.1.1"
-+  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.1.tgz#f6bf293818332bd0dab54efb16087724745e6ca8"
-+  dependencies:
-+    asn1.js "^4.0.0"
-+    browserify-aes "^1.0.0"
-+    create-hash "^1.1.0"
-+    evp_bytestokey "^1.0.0"
-+    pbkdf2 "^3.0.3"
-+
-+parse-glob@^3.0.4:
-+  version "3.0.4"
-+  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
-+  dependencies:
-+    glob-base "^0.3.0"
-+    is-dotfile "^1.0.0"
-+    is-extglob "^1.0.0"
-+    is-glob "^2.0.0"
-+
-+parse-json@^4.0.0:
-+  version "4.0.0"
-+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
-+  dependencies:
-+    error-ex "^1.3.1"
-+    json-parse-better-errors "^1.0.1"
-+
-+parse-passwd@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
-+
-+pascalcase@^0.1.1:
-+  version "0.1.1"
-+  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
-+
-+path-browserify@0.0.0:
-+  version "0.0.0"
-+  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
-+
-+path-dirname@^1.0.0:
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
-+
-+path-exists@^3.0.0:
-+  version "3.0.0"
-+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
-+
-+path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-+
-+path-key@^2.0.0, path-key@^2.0.1:
-+  version "2.0.1"
-+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-+
-+path-parse@^1.0.5:
-+  version "1.0.5"
-+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
-+
-+path-type@^3.0.0:
-+  version "3.0.0"
-+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
-+  dependencies:
-+    pify "^3.0.0"
-+
-+pbkdf2@^3.0.3:
-+  version "3.0.16"
-+  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.16.tgz#7404208ec6b01b62d85bf83853a8064f8d9c2a5c"
-+  dependencies:
-+    create-hash "^1.1.2"
-+    create-hmac "^1.1.4"
-+    ripemd160 "^2.0.1"
-+    safe-buffer "^5.0.1"
-+    sha.js "^2.4.8"
-+
-+performance-now@^2.1.0:
-+  version "2.1.0"
-+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-+
-+pify@^2.3.0:
-+  version "2.3.0"
-+  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-+
-+pify@^3.0.0:
-+  version "3.0.0"
-+  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-+
-+pinkie-promise@^2.0.0:
-+  version "2.0.1"
-+  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-+  dependencies:
-+    pinkie "^2.0.0"
-+
-+pinkie@^2.0.0:
-+  version "2.0.4"
-+  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-+
-+pkg-dir@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
-+  dependencies:
-+    find-up "^2.1.0"
-+
-+posix-character-classes@^0.1.0:
-+  version "0.1.1"
-+  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
-+
-+prepend-http@^1.0.1:
-+  version "1.0.4"
-+  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
-+
-+prepend-http@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
-+
-+preserve@^0.2.0:
-+  version "0.2.0"
-+  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
-+
-+prettier@^1.5.3:
-+  version "1.12.1"
-+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.12.1.tgz#c1ad20e803e7749faf905a409d2367e06bbe7325"
-+
-+pretty-bytes@^4.0.2:
-+  version "4.0.2"
-+  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-4.0.2.tgz#b2bf82e7350d65c6c33aa95aaa5a4f6327f61cd9"
-+
-+private@^0.1.6, private@^0.1.8, private@~0.1.5:
-+  version "0.1.8"
-+  resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
-+
-+process-nextick-args@^2.0.0, process-nextick-args@~2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
-+
-+process@^0.11.10:
-+  version "0.11.10"
-+  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
-+
-+progress@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz#8a1be366bf8fc23db2bd23f10c6fe920b4389d1f"
-+
-+promise-inflight@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
-+
-+prr@~1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
-+
-+pseudomap@^1.0.2:
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
-+
-+public-encrypt@^4.0.0:
-+  version "4.0.2"
-+  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.2.tgz#46eb9107206bf73489f8b85b69d91334c6610994"
-+  dependencies:
-+    bn.js "^4.1.0"
-+    browserify-rsa "^4.0.0"
-+    create-hash "^1.1.0"
-+    parse-asn1 "^5.0.0"
-+    randombytes "^2.0.1"
-+
-+pump@^2.0.0, pump@^2.0.1:
-+  version "2.0.1"
-+  resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
-+  dependencies:
-+    end-of-stream "^1.1.0"
-+    once "^1.3.1"
-+
-+pumpify@^1.3.3:
-+  version "1.5.1"
-+  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
-+  dependencies:
-+    duplexify "^3.6.0"
-+    inherits "^2.0.3"
-+    pump "^2.0.0"
-+
-+punycode@1.3.2:
-+  version "1.3.2"
-+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
-+
-+punycode@^1.2.4, punycode@^1.4.1:
-+  version "1.4.1"
-+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-+
-+punycode@^2.1.0:
-+  version "2.1.0"
-+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.0.tgz#5f863edc89b96db09074bad7947bf09056ca4e7d"
-+
-+qs@~6.5.1:
-+  version "6.5.1"
-+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
-+
-+query-string@^5.0.1:
-+  version "5.1.1"
-+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb"
-+  dependencies:
-+    decode-uri-component "^0.2.0"
-+    object-assign "^4.1.0"
-+    strict-uri-encode "^1.0.0"
-+
-+querystring-es3@^0.2.0:
-+  version "0.2.1"
-+  resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
-+
-+querystring@0.2.0:
-+  version "0.2.0"
-+  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
-+
-+randomatic@^3.0.0:
-+  version "3.0.0"
-+  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.0.0.tgz#d35490030eb4f7578de292ce6dfb04a91a128923"
-+  dependencies:
-+    is-number "^4.0.0"
-+    kind-of "^6.0.0"
-+    math-random "^1.0.1"
-+
-+randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
-+  version "2.0.6"
-+  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80"
-+  dependencies:
-+    safe-buffer "^5.1.0"
-+
-+randomfill@^1.0.3:
-+  version "1.0.4"
-+  resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
-+  dependencies:
-+    randombytes "^2.0.5"
-+    safe-buffer "^5.1.0"
-+
-+rc@^1.1.7:
-+  version "1.2.7"
-+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.7.tgz#8a10ca30d588d00464360372b890d06dacd02297"
-+  dependencies:
-+    deep-extend "^0.5.1"
-+    ini "~1.3.0"
-+    minimist "^1.2.0"
-+    strip-json-comments "~2.0.1"
-+
-+read-chunk@^2.1.0:
-+  version "2.1.0"
-+  resolved "https://registry.yarnpkg.com/read-chunk/-/read-chunk-2.1.0.tgz#6a04c0928005ed9d42e1a6ac5600e19cbc7ff655"
-+  dependencies:
-+    pify "^3.0.0"
-+    safe-buffer "^5.1.1"
-+
-+read-pkg-up@^3.0.0:
-+  version "3.0.0"
-+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
-+  dependencies:
-+    find-up "^2.0.0"
-+    read-pkg "^3.0.0"
-+
-+read-pkg@^3.0.0:
-+  version "3.0.0"
-+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
-+  dependencies:
-+    load-json-file "^4.0.0"
-+    normalize-package-data "^2.3.2"
-+    path-type "^3.0.0"
-+
-+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6:
-+  version "2.3.6"
-+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
-+  dependencies:
-+    core-util-is "~1.0.0"
-+    inherits "~2.0.3"
-+    isarray "~1.0.0"
-+    process-nextick-args "~2.0.0"
-+    safe-buffer "~5.1.1"
-+    string_decoder "~1.1.1"
-+    util-deprecate "~1.0.1"
-+
-+readdirp@^2.0.0:
-+  version "2.1.0"
-+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
-+  dependencies:
-+    graceful-fs "^4.1.2"
-+    minimatch "^3.0.2"
-+    readable-stream "^2.0.2"
-+    set-immediate-shim "^1.0.1"
-+
-+recast@^0.12.5:
-+  version "0.12.9"
-+  resolved "https://registry.yarnpkg.com/recast/-/recast-0.12.9.tgz#e8e52bdb9691af462ccbd7c15d5a5113647a15f1"
-+  dependencies:
-+    ast-types "0.10.1"
-+    core-js "^2.4.1"
-+    esprima "~4.0.0"
-+    private "~0.1.5"
-+    source-map "~0.6.1"
-+
-+recast@^0.14.1:
-+  version "0.14.7"
-+  resolved "https://registry.yarnpkg.com/recast/-/recast-0.14.7.tgz#4f1497c2b5826d42a66e8e3c9d80c512983ff61d"
-+  dependencies:
-+    ast-types "0.11.3"
-+    esprima "~4.0.0"
-+    private "~0.1.5"
-+    source-map "~0.6.1"
-+
-+rechoir@^0.6.2:
-+  version "0.6.2"
-+  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
-+  dependencies:
-+    resolve "^1.1.6"
-+
-+regenerate@^1.2.1:
-+  version "1.4.0"
-+  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
-+
-+regenerator-runtime@^0.11.0:
-+  version "0.11.1"
-+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
-+
-+regenerator-transform@^0.10.0:
-+  version "0.10.1"
-+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd"
-+  dependencies:
-+    babel-runtime "^6.18.0"
-+    babel-types "^6.19.0"
-+    private "^0.1.6"
-+
-+regex-cache@^0.4.2:
-+  version "0.4.4"
-+  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
-+  dependencies:
-+    is-equal-shallow "^0.1.3"
-+
-+regex-not@^1.0.0, regex-not@^1.0.2:
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
-+  dependencies:
-+    extend-shallow "^3.0.2"
-+    safe-regex "^1.1.0"
-+
-+regexpu-core@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240"
-+  dependencies:
-+    regenerate "^1.2.1"
-+    regjsgen "^0.2.0"
-+    regjsparser "^0.1.4"
-+
-+regjsgen@^0.2.0:
-+  version "0.2.0"
-+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
-+
-+regjsparser@^0.1.4:
-+  version "0.1.5"
-+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
-+  dependencies:
-+    jsesc "~0.5.0"
-+
-+remove-trailing-separator@^1.0.1:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
-+
-+repeat-element@^1.1.2:
-+  version "1.1.2"
-+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
-+
-+repeat-string@^1.5.2, repeat-string@^1.6.1:
-+  version "1.6.1"
-+  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-+
-+repeating@^2.0.0:
-+  version "2.0.1"
-+  resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
-+  dependencies:
-+    is-finite "^1.0.0"
-+
-+replace-ext@0.0.1:
-+  version "0.0.1"
-+  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924"
-+
-+replace-ext@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
-+
-+request@^2.85.0:
-+  version "2.85.0"
-+  resolved "https://registry.yarnpkg.com/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa"
-+  dependencies:
-+    aws-sign2 "~0.7.0"
-+    aws4 "^1.6.0"
-+    caseless "~0.12.0"
-+    combined-stream "~1.0.5"
-+    extend "~3.0.1"
-+    forever-agent "~0.6.1"
-+    form-data "~2.3.1"
-+    har-validator "~5.0.3"
-+    hawk "~6.0.2"
-+    http-signature "~1.2.0"
-+    is-typedarray "~1.0.0"
-+    isstream "~0.1.2"
-+    json-stringify-safe "~5.0.1"
-+    mime-types "~2.1.17"
-+    oauth-sign "~0.8.2"
-+    performance-now "^2.1.0"
-+    qs "~6.5.1"
-+    safe-buffer "^5.1.1"
-+    stringstream "~0.0.5"
-+    tough-cookie "~2.3.3"
-+    tunnel-agent "^0.6.0"
-+    uuid "^3.1.0"
-+
-+require-directory@^2.1.1:
-+  version "2.1.1"
-+  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-+
-+require-main-filename@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
-+
-+resolve-cwd@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
-+  dependencies:
-+    resolve-from "^3.0.0"
-+
-+resolve-dir@^1.0.0:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
-+  dependencies:
-+    expand-tilde "^2.0.0"
-+    global-modules "^1.0.0"
-+
-+resolve-from@^3.0.0:
-+  version "3.0.0"
-+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
-+
-+resolve-url@^0.2.1:
-+  version "0.2.1"
-+  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
-+
-+resolve@^1.1.6:
-+  version "1.7.1"
-+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3"
-+  dependencies:
-+    path-parse "^1.0.5"
-+
-+responselike@1.0.2:
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
-+  dependencies:
-+    lowercase-keys "^1.0.0"
-+
-+restore-cursor@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
-+  dependencies:
-+    exit-hook "^1.0.0"
-+    onetime "^1.0.0"
-+
-+restore-cursor@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
-+  dependencies:
-+    onetime "^2.0.0"
-+    signal-exit "^3.0.2"
-+
-+ret@~0.1.10:
-+  version "0.1.15"
-+  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
-+
-+rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
-+  version "2.6.2"
-+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
-+  dependencies:
-+    glob "^7.0.5"
-+
-+rimraf@~2.2.6:
-+  version "2.2.8"
-+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582"
-+
-+ripemd160@^2.0.0, ripemd160@^2.0.1:
-+  version "2.0.2"
-+  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
-+  dependencies:
-+    hash-base "^3.0.0"
-+    inherits "^2.0.1"
-+
-+run-async@^2.0.0, run-async@^2.2.0:
-+  version "2.3.0"
-+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
-+  dependencies:
-+    is-promise "^2.1.0"
-+
-+run-queue@^1.0.0, run-queue@^1.0.3:
-+  version "1.0.3"
-+  resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
-+  dependencies:
-+    aproba "^1.1.1"
-+
-+rxjs@^5.4.2, rxjs@^5.5.2:
-+  version "5.5.10"
-+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.10.tgz#fde02d7a614f6c8683d0d1957827f492e09db045"
-+  dependencies:
-+    symbol-observable "1.0.1"
-+
-+safe-buffer@^5.0.1, safe-buffer@^5.1.1:
-+  version "5.1.1"
-+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
-+
-+safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-+  version "5.1.2"
-+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-+
-+safe-regex@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
-+  dependencies:
-+    ret "~0.1.10"
-+
-+"safer-buffer@>= 2.1.2 < 3":
-+  version "2.1.2"
-+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-+
-+sax@^1.2.4:
-+  version "1.2.4"
-+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
-+
-+schema-utils@^0.4.4, schema-utils@^0.4.5:
-+  version "0.4.5"
-+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.5.tgz#21836f0608aac17b78f9e3e24daff14a5ca13a3e"
-+  dependencies:
-+    ajv "^6.1.0"
-+    ajv-keywords "^3.1.0"
-+
-+scoped-regex@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/scoped-regex/-/scoped-regex-1.0.0.tgz#a346bb1acd4207ae70bd7c0c7ca9e566b6baddb8"
-+
-+"semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.3.0, semver@^5.5.0:
-+  version "5.5.0"
-+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
-+
-+serialize-javascript@^1.4.0:
-+  version "1.5.0"
-+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.5.0.tgz#1aa336162c88a890ddad5384baebc93a655161fe"
-+
-+set-blocking@^2.0.0, set-blocking@~2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-+
-+set-immediate-shim@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
-+
-+set-value@^0.4.3:
-+  version "0.4.3"
-+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
-+  dependencies:
-+    extend-shallow "^2.0.1"
-+    is-extendable "^0.1.1"
-+    is-plain-object "^2.0.1"
-+    to-object-path "^0.3.0"
-+
-+set-value@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
-+  dependencies:
-+    extend-shallow "^2.0.1"
-+    is-extendable "^0.1.1"
-+    is-plain-object "^2.0.3"
-+    split-string "^3.0.1"
-+
-+setimmediate@^1.0.4:
-+  version "1.0.5"
-+  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
-+
-+sha.js@^2.4.0, sha.js@^2.4.8:
-+  version "2.4.11"
-+  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
-+  dependencies:
-+    inherits "^2.0.1"
-+    safe-buffer "^5.0.1"
-+
-+shebang-command@^1.2.0:
-+  version "1.2.0"
-+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
-+  dependencies:
-+    shebang-regex "^1.0.0"
-+
-+shebang-regex@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-+
-+shelljs@^0.8.0:
-+  version "0.8.2"
-+  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.2.tgz#345b7df7763f4c2340d584abb532c5f752ca9e35"
-+  dependencies:
-+    glob "^7.0.0"
-+    interpret "^1.0.0"
-+    rechoir "^0.6.2"
-+
-+signal-exit@^3.0.0, signal-exit@^3.0.2:
-+  version "3.0.2"
-+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
-+
-+slash@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
-+
-+slice-ansi@0.0.4:
-+  version "0.0.4"
-+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
-+
-+slide@^1.1.5:
-+  version "1.1.6"
-+  resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
-+
-+snapdragon-node@^2.0.1:
-+  version "2.1.1"
-+  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
-+  dependencies:
-+    define-property "^1.0.0"
-+    isobject "^3.0.0"
-+    snapdragon-util "^3.0.1"
-+
-+snapdragon-util@^3.0.1:
-+  version "3.0.1"
-+  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
-+  dependencies:
-+    kind-of "^3.2.0"
-+
-+snapdragon@^0.8.1:
-+  version "0.8.2"
-+  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
-+  dependencies:
-+    base "^0.11.1"
-+    debug "^2.2.0"
-+    define-property "^0.2.5"
-+    extend-shallow "^2.0.1"
-+    map-cache "^0.2.2"
-+    source-map "^0.5.6"
-+    source-map-resolve "^0.5.0"
-+    use "^3.1.0"
-+
-+sntp@2.x.x:
-+  version "2.1.0"
-+  resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8"
-+  dependencies:
-+    hoek "4.x.x"
-+
-+sort-keys@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
-+  dependencies:
-+    is-plain-obj "^1.0.0"
-+
-+source-list-map@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
-+
-+source-map-resolve@^0.5.0:
-+  version "0.5.2"
-+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
-+  dependencies:
-+    atob "^2.1.1"
-+    decode-uri-component "^0.2.0"
-+    resolve-url "^0.2.1"
-+    source-map-url "^0.4.0"
-+    urix "^0.1.0"
-+
-+source-map-support@^0.4.15:
-+  version "0.4.18"
-+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
-+  dependencies:
-+    source-map "^0.5.6"
-+
-+source-map-url@^0.4.0:
-+  version "0.4.0"
-+  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
-+
-+source-map@^0.5.6, source-map@^0.5.7:
-+  version "0.5.7"
-+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-+
-+source-map@^0.6.1, source-map@~0.6.1:
-+  version "0.6.1"
-+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-+
-+spdx-correct@^3.0.0:
-+  version "3.0.0"
-+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.0.tgz#05a5b4d7153a195bc92c3c425b69f3b2a9524c82"
-+  dependencies:
-+    spdx-expression-parse "^3.0.0"
-+    spdx-license-ids "^3.0.0"
-+
-+spdx-exceptions@^2.1.0:
-+  version "2.1.0"
-+  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz#2c7ae61056c714a5b9b9b2b2af7d311ef5c78fe9"
-+
-+spdx-expression-parse@^3.0.0:
-+  version "3.0.0"
-+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0"
-+  dependencies:
-+    spdx-exceptions "^2.1.0"
-+    spdx-license-ids "^3.0.0"
-+
-+spdx-license-ids@^3.0.0:
-+  version "3.0.0"
-+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz#7a7cd28470cc6d3a1cfe6d66886f6bc430d3ac87"
-+
-+split-string@^3.0.1, split-string@^3.0.2:
-+  version "3.1.0"
-+  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
-+  dependencies:
-+    extend-shallow "^3.0.0"
-+
-+sprintf-js@~1.0.2:
-+  version "1.0.3"
-+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-+
-+sshpk@^1.7.0:
-+  version "1.14.1"
-+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.1.tgz#130f5975eddad963f1d56f92b9ac6c51fa9f83eb"
-+  dependencies:
-+    asn1 "~0.2.3"
-+    assert-plus "^1.0.0"
-+    dashdash "^1.12.0"
-+    getpass "^0.1.1"
-+  optionalDependencies:
-+    bcrypt-pbkdf "^1.0.0"
-+    ecc-jsbn "~0.1.1"
-+    jsbn "~0.1.0"
-+    tweetnacl "~0.14.0"
-+
-+ssri@^5.2.4:
-+  version "5.3.0"
-+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.3.0.tgz#ba3872c9c6d33a0704a7d71ff045e5ec48999d06"
-+  dependencies:
-+    safe-buffer "^5.1.1"
-+
-+static-extend@^0.1.1:
-+  version "0.1.2"
-+  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
-+  dependencies:
-+    define-property "^0.2.5"
-+    object-copy "^0.1.0"
-+
-+stream-browserify@^2.0.1:
-+  version "2.0.1"
-+  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
-+  dependencies:
-+    inherits "~2.0.1"
-+    readable-stream "^2.0.2"
-+
-+stream-each@^1.1.0:
-+  version "1.2.2"
-+  resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.2.tgz#8e8c463f91da8991778765873fe4d960d8f616bd"
-+  dependencies:
-+    end-of-stream "^1.1.0"
-+    stream-shift "^1.0.0"
-+
-+stream-http@^2.7.2:
-+  version "2.8.2"
-+  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.2.tgz#4126e8c6b107004465918aa2fc35549e77402c87"
-+  dependencies:
-+    builtin-status-codes "^3.0.0"
-+    inherits "^2.0.1"
-+    readable-stream "^2.3.6"
-+    to-arraybuffer "^1.0.0"
-+    xtend "^4.0.0"
-+
-+stream-shift@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
-+
-+stream-to-observable@^0.2.0:
-+  version "0.2.0"
-+  resolved "https://registry.yarnpkg.com/stream-to-observable/-/stream-to-observable-0.2.0.tgz#59d6ea393d87c2c0ddac10aa0d561bc6ba6f0e10"
-+  dependencies:
-+    any-observable "^0.2.0"
-+
-+strict-uri-encode@^1.0.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
-+
-+string-template@~0.2.1:
-+  version "0.2.1"
-+  resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
-+
-+string-width@^1.0.1, string-width@^1.0.2:
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-+  dependencies:
-+    code-point-at "^1.0.0"
-+    is-fullwidth-code-point "^1.0.0"
-+    strip-ansi "^3.0.0"
-+
-+string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
-+  version "2.1.1"
-+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
-+  dependencies:
-+    is-fullwidth-code-point "^2.0.0"
-+    strip-ansi "^4.0.0"
-+
-+string_decoder@^1.0.0, string_decoder@~1.1.1:
-+  version "1.1.1"
-+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-+  dependencies:
-+    safe-buffer "~5.1.0"
-+
-+stringstream@~0.0.5:
-+  version "0.0.5"
-+  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
-+
-+strip-ansi@^3.0.0, strip-ansi@^3.0.1:
-+  version "3.0.1"
-+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-+  dependencies:
-+    ansi-regex "^2.0.0"
-+
-+strip-ansi@^4.0.0:
-+  version "4.0.0"
-+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-+  dependencies:
-+    ansi-regex "^3.0.0"
-+
-+strip-ansi@~0.1.0:
-+  version "0.1.1"
-+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.1.1.tgz#39e8a98d044d150660abe4a6808acf70bb7bc991"
-+
-+strip-bom-stream@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/strip-bom-stream/-/strip-bom-stream-2.0.0.tgz#f87db5ef2613f6968aa545abfe1ec728b6a829ca"
-+  dependencies:
-+    first-chunk-stream "^2.0.0"
-+    strip-bom "^2.0.0"
-+
-+strip-bom@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
-+  dependencies:
-+    is-utf8 "^0.2.0"
-+
-+strip-bom@^3.0.0:
-+  version "3.0.0"
-+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-+
-+strip-eof@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
-+
-+strip-json-comments@~2.0.1:
-+  version "2.0.1"
-+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-+
-+supports-color@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-+
-+supports-color@^5.3.0:
-+  version "5.4.0"
-+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
-+  dependencies:
-+    has-flag "^3.0.0"
-+
-+symbol-observable@1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4"
-+
-+symbol-observable@^0.2.2:
-+  version "0.2.4"
-+  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-0.2.4.tgz#95a83db26186d6af7e7a18dbd9760a2f86d08f40"
-+
-+tapable@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.0.0.tgz#cbb639d9002eed9c6b5975eb20598d7936f1f9f2"
-+
-+tar@^4:
-+  version "4.4.2"
-+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.2.tgz#60685211ba46b38847b1ae7ee1a24d744a2cd462"
-+  dependencies:
-+    chownr "^1.0.1"
-+    fs-minipass "^1.2.5"
-+    minipass "^2.2.4"
-+    minizlib "^1.1.0"
-+    mkdirp "^0.5.0"
-+    safe-buffer "^5.1.2"
-+    yallist "^3.0.2"
-+
-+tar@^4.0.2:
-+  version "4.4.1"
-+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.1.tgz#b25d5a8470c976fd7a9a8a350f42c59e9fa81749"
-+  dependencies:
-+    chownr "^1.0.1"
-+    fs-minipass "^1.2.5"
-+    minipass "^2.2.4"
-+    minizlib "^1.1.0"
-+    mkdirp "^0.5.0"
-+    safe-buffer "^5.1.1"
-+    yallist "^3.0.2"
-+
-+temp@^0.8.1:
-+  version "0.8.3"
-+  resolved "https://registry.yarnpkg.com/temp/-/temp-0.8.3.tgz#e0c6bc4d26b903124410e4fed81103014dfc1f59"
-+  dependencies:
-+    os-tmpdir "^1.0.0"
-+    rimraf "~2.2.6"
-+
-+text-table@^0.2.0:
-+  version "0.2.0"
-+  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
-+
-+textextensions@2:
-+  version "2.2.0"
-+  resolved "https://registry.yarnpkg.com/textextensions/-/textextensions-2.2.0.tgz#38ac676151285b658654581987a0ce1a4490d286"
-+
-+through2@^2.0.0:
-+  version "2.0.3"
-+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
-+  dependencies:
-+    readable-stream "^2.1.5"
-+    xtend "~4.0.1"
-+
-+through@^2.3.6:
-+  version "2.3.8"
-+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-+
-+timed-out@^4.0.0, timed-out@^4.0.1:
-+  version "4.0.1"
-+  resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
-+
-+timers-browserify@^2.0.4:
-+  version "2.0.10"
-+  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.10.tgz#1d28e3d2aadf1d5a5996c4e9f95601cd053480ae"
-+  dependencies:
-+    setimmediate "^1.0.4"
-+
-+tmp@^0.0.31:
-+  version "0.0.31"
-+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.31.tgz#8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"
-+  dependencies:
-+    os-tmpdir "~1.0.1"
-+
-+tmp@^0.0.33:
-+  version "0.0.33"
-+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
-+  dependencies:
-+    os-tmpdir "~1.0.2"
-+
-+to-arraybuffer@^1.0.0:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
-+
-+to-fast-properties@^1.0.3:
-+  version "1.0.3"
-+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
-+
-+to-object-path@^0.3.0:
-+  version "0.3.0"
-+  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
-+  dependencies:
-+    kind-of "^3.0.2"
-+
-+to-regex-range@^2.1.0:
-+  version "2.1.1"
-+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
-+  dependencies:
-+    is-number "^3.0.0"
-+    repeat-string "^1.6.1"
-+
-+to-regex@^3.0.1, to-regex@^3.0.2:
-+  version "3.0.2"
-+  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
-+  dependencies:
-+    define-property "^2.0.2"
-+    extend-shallow "^3.0.2"
-+    regex-not "^1.0.2"
-+    safe-regex "^1.1.0"
-+
-+tough-cookie@~2.3.3:
-+  version "2.3.4"
-+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
-+  dependencies:
-+    punycode "^1.4.1"
-+
-+trim-right@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
-+
-+ts-loader@^4.0.1:
-+  version "4.3.0"
-+  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-4.3.0.tgz#4e3ba172783d1256d3a23bdfadde011a795fae9e"
-+  dependencies:
-+    chalk "^2.3.0"
-+    enhanced-resolve "^4.0.0"
-+    loader-utils "^1.0.2"
-+    micromatch "^3.1.4"
-+    semver "^5.0.1"
-+
-+tty-browserify@0.0.0:
-+  version "0.0.0"
-+  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
-+
-+tunnel-agent@^0.6.0:
-+  version "0.6.0"
-+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-+  dependencies:
-+    safe-buffer "^5.0.1"
-+
-+tweetnacl@^0.14.3, tweetnacl@~0.14.0:
-+  version "0.14.5"
-+  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-+
-+typedarray@^0.0.6:
-+  version "0.0.6"
-+  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
-+
-+typescript@^2.1.4:
-+  version "2.8.1"
-+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.8.1.tgz#6160e4f8f195d5ba81d4876f9c0cc1fbc0820624"
-+
-+uc.micro@^1.0.1, uc.micro@^1.0.5:
-+  version "1.0.5"
-+  resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.5.tgz#0c65f15f815aa08b560a61ce8b4db7ffc3f45376"
-+
-+uglify-es@^3.3.4:
-+  version "3.3.9"
-+  resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677"
-+  dependencies:
-+    commander "~2.13.0"
-+    source-map "~0.6.1"
-+
-+uglifyjs-webpack-plugin@^1.2.4:
-+  version "1.2.5"
-+  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.5.tgz#2ef8387c8f1a903ec5e44fa36f9f3cbdcea67641"
-+  dependencies:
-+    cacache "^10.0.4"
-+    find-cache-dir "^1.0.0"
-+    schema-utils "^0.4.5"
-+    serialize-javascript "^1.4.0"
-+    source-map "^0.6.1"
-+    uglify-es "^3.3.4"
-+    webpack-sources "^1.1.0"
-+    worker-farm "^1.5.2"
-+
-+underscore@~1.6.0:
-+  version "1.6.0"
-+  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8"
-+
-+union-value@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
-+  dependencies:
-+    arr-union "^3.1.0"
-+    get-value "^2.0.6"
-+    is-extendable "^0.1.1"
-+    set-value "^0.4.3"
-+
-+unique-filename@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.0.tgz#d05f2fe4032560871f30e93cbe735eea201514f3"
-+  dependencies:
-+    unique-slug "^2.0.0"
-+
-+unique-slug@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.0.tgz#db6676e7c7cc0629878ff196097c78855ae9f4ab"
-+  dependencies:
-+    imurmurhash "^0.1.4"
-+
-+unset-value@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
-+  dependencies:
-+    has-value "^0.3.1"
-+    isobject "^3.0.0"
-+
-+untildify@^3.0.2:
-+  version "3.0.2"
-+  resolved "https://registry.yarnpkg.com/untildify/-/untildify-3.0.2.tgz#7f1f302055b3fea0f3e81dc78eb36766cb65e3f1"
-+
-+upath@^1.0.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
-+
-+uri-js@^4.2.1:
-+  version "4.2.1"
-+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.1.tgz#4595a80a51f356164e22970df64c7abd6ade9850"
-+  dependencies:
-+    punycode "^2.1.0"
-+
-+urix@^0.1.0:
-+  version "0.1.0"
-+  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
-+
-+url-parse-lax@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73"
-+  dependencies:
-+    prepend-http "^1.0.1"
-+
-+url-parse-lax@^3.0.0:
-+  version "3.0.0"
-+  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
-+  dependencies:
-+    prepend-http "^2.0.0"
-+
-+url-template@^2.0.8:
-+  version "2.0.8"
-+  resolved "https://registry.yarnpkg.com/url-template/-/url-template-2.0.8.tgz#fc565a3cccbff7730c775f5641f9555791439f21"
-+
-+url-to-options@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9"
-+
-+url@^0.11.0:
-+  version "0.11.0"
-+  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
-+  dependencies:
-+    punycode "1.3.2"
-+    querystring "0.2.0"
-+
-+use@^3.1.0:
-+  version "3.1.0"
-+  resolved "https://registry.yarnpkg.com/use/-/use-3.1.0.tgz#14716bf03fdfefd03040aef58d8b4b85f3a7c544"
-+  dependencies:
-+    kind-of "^6.0.2"
-+
-+util-deprecate@~1.0.1:
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-+
-+util@0.10.3, util@^0.10.3:
-+  version "0.10.3"
-+  resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
-+  dependencies:
-+    inherits "2.0.1"
-+
-+uuid@^3.1.0:
-+  version "3.2.1"
-+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"
-+
-+v8-compile-cache@^1.1.2:
-+  version "1.1.2"
-+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-1.1.2.tgz#8d32e4f16974654657e676e0e467a348e89b0dc4"
-+
-+validate-npm-package-license@^3.0.1:
-+  version "3.0.3"
-+  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz#81643bcbef1bdfecd4623793dc4648948ba98338"
-+  dependencies:
-+    spdx-correct "^3.0.0"
-+    spdx-expression-parse "^3.0.0"
-+
-+verror@1.10.0:
-+  version "1.10.0"
-+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
-+  dependencies:
-+    assert-plus "^1.0.0"
-+    core-util-is "1.0.2"
-+    extsprintf "^1.2.0"
-+
-+vinyl-file@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/vinyl-file/-/vinyl-file-2.0.0.tgz#a7ebf5ffbefda1b7d18d140fcb07b223efb6751a"
-+  dependencies:
-+    graceful-fs "^4.1.2"
-+    pify "^2.3.0"
-+    pinkie-promise "^2.0.0"
-+    strip-bom "^2.0.0"
-+    strip-bom-stream "^2.0.0"
-+    vinyl "^1.1.0"
-+
-+vinyl@^1.1.0:
-+  version "1.2.0"
-+  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-1.2.0.tgz#5c88036cf565e5df05558bfc911f8656df218884"
-+  dependencies:
-+    clone "^1.0.0"
-+    clone-stats "^0.0.1"
-+    replace-ext "0.0.1"
-+
-+vinyl@^2.0.1:
-+  version "2.1.0"
-+  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.1.0.tgz#021f9c2cf951d6b939943c89eb5ee5add4fd924c"
-+  dependencies:
-+    clone "^2.1.1"
-+    clone-buffer "^1.0.0"
-+    clone-stats "^1.0.0"
-+    cloneable-readable "^1.0.0"
-+    remove-trailing-separator "^1.0.1"
-+    replace-ext "^1.0.0"
-+
-+vm-browserify@0.0.4:
-+  version "0.0.4"
-+  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
-+  dependencies:
-+    indexof "0.0.1"
-+
-+watchpack@^1.5.0:
-+  version "1.6.0"
-+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
-+  dependencies:
-+    chokidar "^2.0.2"
-+    graceful-fs "^4.1.2"
-+    neo-async "^2.5.0"
-+
-+webassemblyjs@1.4.3:
-+  version "1.4.3"
-+  resolved "https://registry.yarnpkg.com/webassemblyjs/-/webassemblyjs-1.4.3.tgz#0591893efb8fbde74498251cbe4b2d83df9239cb"
-+  dependencies:
-+    "@webassemblyjs/ast" "1.4.3"
-+    "@webassemblyjs/validation" "1.4.3"
-+    "@webassemblyjs/wasm-parser" "1.4.3"
-+    "@webassemblyjs/wast-parser" "1.4.3"
-+    long "^3.2.0"
-+
-+webpack-addons@^1.1.5:
-+  version "1.1.5"
-+  resolved "https://registry.yarnpkg.com/webpack-addons/-/webpack-addons-1.1.5.tgz#2b178dfe873fb6e75e40a819fa5c26e4a9bc837a"
-+  dependencies:
-+    jscodeshift "^0.4.0"
-+
-+webpack-cli@^2.0.10:
-+  version "2.1.3"
-+  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-2.1.3.tgz#65d166851abaa56067ef3f716b02a97ba6bbe84d"
-+  dependencies:
-+    chalk "^2.3.2"
-+    cross-spawn "^6.0.5"
-+    diff "^3.5.0"
-+    enhanced-resolve "^4.0.0"
-+    envinfo "^4.4.2"
-+    glob-all "^3.1.0"
-+    global-modules "^1.0.0"
-+    got "^8.2.0"
-+    import-local "^1.0.0"
-+    inquirer "^5.1.0"
-+    interpret "^1.0.4"
-+    jscodeshift "^0.5.0"
-+    listr "^0.13.0"
-+    loader-utils "^1.1.0"
-+    lodash "^4.17.5"
-+    log-symbols "^2.2.0"
-+    mkdirp "^0.5.1"
-+    p-each-series "^1.0.0"
-+    p-lazy "^1.0.0"
-+    prettier "^1.5.3"
-+    supports-color "^5.3.0"
-+    v8-compile-cache "^1.1.2"
-+    webpack-addons "^1.1.5"
-+    yargs "^11.1.0"
-+    yeoman-environment "^2.0.0"
-+    yeoman-generator "^2.0.4"
-+
-+webpack-sources@^1.0.1, webpack-sources@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.1.0.tgz#a101ebae59d6507354d71d8013950a3a8b7a5a54"
-+  dependencies:
-+    source-list-map "^2.0.0"
-+    source-map "~0.6.1"
-+
-+webpack@^4.1.0:
-+  version "4.8.3"
-+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.8.3.tgz#957c8e80000f9e5cc03d775e78b472d8954f4eeb"
-+  dependencies:
-+    "@webassemblyjs/ast" "1.4.3"
-+    "@webassemblyjs/wasm-edit" "1.4.3"
-+    "@webassemblyjs/wasm-parser" "1.4.3"
-+    acorn "^5.0.0"
-+    acorn-dynamic-import "^3.0.0"
-+    ajv "^6.1.0"
-+    ajv-keywords "^3.1.0"
-+    chrome-trace-event "^0.1.1"
-+    enhanced-resolve "^4.0.0"
-+    eslint-scope "^3.7.1"
-+    loader-runner "^2.3.0"
-+    loader-utils "^1.1.0"
-+    memory-fs "~0.4.1"
-+    micromatch "^3.1.8"
-+    mkdirp "~0.5.0"
-+    neo-async "^2.5.0"
-+    node-libs-browser "^2.0.0"
-+    schema-utils "^0.4.4"
-+    tapable "^1.0.0"
-+    uglifyjs-webpack-plugin "^1.2.4"
-+    watchpack "^1.5.0"
-+    webpack-sources "^1.0.1"
-+
-+which-module@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
-+
-+which@^1.2.14, which@^1.2.9:
-+  version "1.3.0"
-+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
-+  dependencies:
-+    isexe "^2.0.0"
-+
-+wide-align@^1.1.0:
-+  version "1.1.2"
-+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710"
-+  dependencies:
-+    string-width "^1.0.2"
-+
-+wordwrap@~0.0.2:
-+  version "0.0.3"
-+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
-+
-+worker-farm@^1.5.2:
-+  version "1.6.0"
-+  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0"
-+  dependencies:
-+    errno "~0.1.7"
-+
-+wrap-ansi@^2.0.0:
-+  version "2.1.0"
-+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
-+  dependencies:
-+    string-width "^1.0.1"
-+    strip-ansi "^3.0.1"
-+
-+wrappy@1:
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-+
-+write-file-atomic@^1.2.0:
-+  version "1.3.4"
-+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-1.3.4.tgz#f807a4f0b1d9e913ae7a48112e6cc3af1991b45f"
-+  dependencies:
-+    graceful-fs "^4.1.11"
-+    imurmurhash "^0.1.4"
-+    slide "^1.1.5"
-+
-+xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1:
-+  version "4.0.1"
-+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
-+
-+y18n@^3.2.1:
-+  version "3.2.1"
-+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
-+
-+y18n@^4.0.0:
-+  version "4.0.0"
-+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
-+
-+yallist@^2.1.2:
-+  version "2.1.2"
-+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
-+
-+yallist@^3.0.0, yallist@^3.0.2:
-+  version "3.0.2"
-+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
-+
-+yargs-parser@^9.0.2:
-+  version "9.0.2"
-+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"
-+  dependencies:
-+    camelcase "^4.1.0"
-+
-+yargs@^11.1.0:
-+  version "11.1.0"
-+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.0.tgz#90b869934ed6e871115ea2ff58b03f4724ed2d77"
-+  dependencies:
-+    cliui "^4.0.0"
-+    decamelize "^1.1.1"
-+    find-up "^2.1.0"
-+    get-caller-file "^1.0.1"
-+    os-locale "^2.0.0"
-+    require-directory "^2.1.1"
-+    require-main-filename "^1.0.1"
-+    set-blocking "^2.0.0"
-+    string-width "^2.0.0"
-+    which-module "^2.0.0"
-+    y18n "^3.2.1"
-+    yargs-parser "^9.0.2"
-+
-+yargs@~1.2.6:
-+  version "1.2.6"
-+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-1.2.6.tgz#9c7b4a82fd5d595b2bf17ab6dcc43135432fe34b"
-+  dependencies:
-+    minimist "^0.1.0"
-+
-+yeoman-environment@^2.0.0, yeoman-environment@^2.0.5:
-+  version "2.1.1"
-+  resolved "https://registry.yarnpkg.com/yeoman-environment/-/yeoman-environment-2.1.1.tgz#10a045f7fc4397873764882eae055a33e56ee1c5"
-+  dependencies:
-+    chalk "^2.1.0"
-+    cross-spawn "^6.0.5"
-+    debug "^3.1.0"
-+    diff "^3.3.1"
-+    escape-string-regexp "^1.0.2"
-+    globby "^8.0.1"
-+    grouped-queue "^0.3.3"
-+    inquirer "^5.2.0"
-+    is-scoped "^1.0.0"
-+    lodash "^4.17.10"
-+    log-symbols "^2.1.0"
-+    mem-fs "^1.1.0"
-+    strip-ansi "^4.0.0"
-+    text-table "^0.2.0"
-+    untildify "^3.0.2"
-+
-+yeoman-generator@^2.0.4:
-+  version "2.0.5"
-+  resolved "https://registry.yarnpkg.com/yeoman-generator/-/yeoman-generator-2.0.5.tgz#57b0b3474701293cc9ec965288f3400b00887c81"
-+  dependencies:
-+    async "^2.6.0"
-+    chalk "^2.3.0"
-+    cli-table "^0.3.1"
-+    cross-spawn "^6.0.5"
-+    dargs "^5.1.0"
-+    dateformat "^3.0.3"
-+    debug "^3.1.0"
-+    detect-conflict "^1.0.0"
-+    error "^7.0.2"
-+    find-up "^2.1.0"
-+    github-username "^4.0.0"
-+    istextorbinary "^2.2.1"
-+    lodash "^4.17.10"
-+    make-dir "^1.1.0"
-+    mem-fs-editor "^4.0.0"
-+    minimist "^1.2.0"
-+    pretty-bytes "^4.0.2"
-+    read-chunk "^2.1.0"
-+    read-pkg-up "^3.0.0"
-+    rimraf "^2.6.2"
-+    run-async "^2.0.0"
-+    shelljs "^0.8.0"
-+    text-table "^0.2.0"
-+    through2 "^2.0.0"
-+    yeoman-environment "^2.0.5"
-changed in both
-  base   100644 338e1a3a6bec1114384914e1c93aaa9d73174537 src/vs/code/electron-main/window.ts
-  our    100644 98a4328213e146b214e8da866ab92dc7f9c449a9 src/vs/code/electron-main/window.ts
-  their  100644 063a7a4172e00055a6806ac6fca6ba3f94055fdc src/vs/code/electron-main/window.ts
-@@ -140,12 +140,18 @@
- 			show: !isFullscreenOrMaximized,
- 			title: product.nameLong,
- 			webPreferences: {
-+<<<<<<< .our
- 				// By default if Code is in the background, intervals and timeouts get throttled, so we
- 				// want to enforce that Code stays in the foreground. This triggers a disable_hidden_
- 				// flag that Electron provides via patch:
- 				// https://github.com/electron/libchromiumcontent/blob/master/patches/common/chromium/disable_hidden.patch
- 				'backgroundThrottling': false,
- 				disableBlinkFeatures: 'Auxclick' // disable auxclick events (see https://developers.google.com/web/updates/2016/10/auxclick)
-+=======
-+				'backgroundThrottling': false, // by default if Code is in the background, intervals and timeouts get throttled,
-+				disableBlinkFeatures: 'Auxclick', // disable auxclick events (see https://developers.google.com/web/updates/2016/10/auxclick)
-+				experimentalFeatures: true
-+>>>>>>> .their
- 			}
- 		};
- 
-changed in both
-  base   100644 47659e8c7c21b0e2b60836a075a68751c46749bc src/vs/editor/browser/controller/coreCommands.ts
-  our    100644 46a8671d6f43fcf41fb5f2dd9c2ef8a681069f88 src/vs/editor/browser/controller/coreCommands.ts
-  their  100644 05c024d8d8c0eba2659a14fe3f495fb1638fd49a src/vs/editor/browser/controller/coreCommands.ts
-@@ -1706,7 +1706,11 @@
- 	editorHandler: CoreNavigationCommands.SelectAll,
- 	inputHandler: 'selectAll',
- 	id: 'editor.action.selectAll',
-+<<<<<<< .our
- 	precondition: EditorContextKeys.textInputFocus,
-+=======
-+	precondition: EditorContextKeys.focus,
-+>>>>>>> .their
- 	kbOpts: {
- 		weight: CORE_WEIGHT,
- 		kbExpr: null,
-changed in both
-  base   100644 cce71452cd7040ef27fc1905d438df83353fe2d1 src/vs/editor/common/modes.ts
-  our    100644 6a4abcffa36b7f9a6c04481717a06e065e5b528a src/vs/editor/common/modes.ts
-  their  100644 2aa69522f6bdc4194abe61e66705d22a9bf8a507 src/vs/editor/common/modes.ts
-@@ -938,9 +938,12 @@
- 	arguments?: any[];
- }
- 
-+<<<<<<< .our
- /**
-  * @internal
-  */
-+=======
-+>>>>>>> .their
- export interface CommentInfo {
- 	owner: number;
- 	threads: CommentThread[];
-@@ -948,9 +951,12 @@
- 	reply?: Command;
- }
- 
-+<<<<<<< .our
- /**
-  * @internal
-  */
-+=======
-+>>>>>>> .their
- export enum CommentThreadCollapsibleState {
- 	/**
- 	 * Determines an item is collapsed
-@@ -962,9 +968,12 @@
- 	Expanded = 1
- }
- 
-+<<<<<<< .our
- /**
-  * @internal
-  */
-+=======
-+>>>>>>> .their
- export interface CommentThread {
- 	threadId: string;
- 	resource: string;
-@@ -974,17 +983,23 @@
- 	reply?: Command;
- }
- 
-+<<<<<<< .our
- /**
-  * @internal
-  */
-+=======
-+>>>>>>> .their
- export interface NewCommentAction {
- 	ranges: IRange[];
- 	actions: Command[];
- }
- 
-+<<<<<<< .our
- /**
-  * @internal
-  */
-+=======
-+>>>>>>> .their
- export interface Comment {
- 	readonly commentId: string;
- 	readonly body: IMarkdownString;
-@@ -993,9 +1008,12 @@
- 	readonly command?: Command;
- }
- 
-+<<<<<<< .our
- /**
-  * @internal
-  */
-+=======
-+>>>>>>> .their
- export interface CommentThreadChangedEvent {
- 	readonly owner: number;
- 	/**
-@@ -1014,9 +1032,13 @@
- 	readonly changed: CommentThread[];
- }
- 
-+<<<<<<< .our
- /**
-  * @internal
-  */
-+=======
-+
-+>>>>>>> .their
- export interface DocumentCommentProvider {
- 	provideDocumentComments(resource: URI, token: CancellationToken): Promise<CommentInfo>;
- 	createNewCommentThread(resource: URI, range: Range, text: string, token: CancellationToken): Promise<CommentThread>;
-@@ -1024,9 +1046,13 @@
- 	onDidChangeCommentThreads(): Event<CommentThreadChangedEvent>;
- }
- 
-+<<<<<<< .our
- /**
-  * @internal
-  */
-+=======
-+
-+>>>>>>> .their
- export interface WorkspaceCommentProvider {
- 	provideWorkspaceComments(token: CancellationToken): Promise<CommentThread[]>;
- 	createNewCommentThread(resource: URI, range: Range, text: string, token: CancellationToken): Promise<CommentThread>;
-changed in both
-  base   100644 eaa070aeda89e0740a2019df182662966b9015f3 src/vs/editor/standalone/browser/standaloneLanguages.ts
-  our    100644 b0287953b31b42b550a9fccdb465b02666dae70f src/vs/editor/standalone/browser/standaloneLanguages.ts
-  their  100644 533087ed7b0032921a9c8a930bf38e25b1e470af src/vs/editor/standalone/browser/standaloneLanguages.ts
-@@ -880,6 +880,7 @@
- 		SymbolKind: modes.SymbolKind,
- 		IndentAction: IndentAction,
- 		SuggestTriggerKind: modes.SuggestTriggerKind,
-+		CommentThreadCollapsibleState: modes.CommentThreadCollapsibleState,
- 		FoldingRangeKind: modes.FoldingRangeKind
- 	};
- }
-changed in both
-  base   100644 2b42db1f6e97d3b8dd8d91a4e849c82d4afc9839 src/vs/monaco.d.ts
-  our    100644 76dcf491ff9c1973ad61bf5d423713bb1a3b4e44 src/vs/monaco.d.ts
-  their  100644 7f507fbc7b2a5e9e9d8b027f1a458093e0756278 src/vs/monaco.d.ts
-@@ -5311,6 +5311,76 @@
- 		arguments?: any[];
- 	}
- 
-+	export interface CommentInfo {
-+		owner: number;
-+		threads: CommentThread[];
-+		commentingRanges?: IRange[];
-+		reply?: Command;
-+	}
-+
-+	export enum CommentThreadCollapsibleState {
-+		/**
-+		 * Determines an item is collapsed
-+		 */
-+		Collapsed = 0,
-+		/**
-+		 * Determines an item is expanded
-+		 */
-+		Expanded = 1,
-+	}
-+
-+	export interface CommentThread {
-+		threadId: string;
-+		resource: string;
-+		range: IRange;
-+		comments: Comment[];
-+		collapsibleState?: CommentThreadCollapsibleState;
-+		reply?: Command;
-+	}
-+
-+	export interface NewCommentAction {
-+		ranges: IRange[];
-+		actions: Command[];
-+	}
-+
-+	export interface Comment {
-+		readonly commentId: string;
-+		readonly body: IMarkdownString;
-+		readonly userName: string;
-+		readonly gravatar: string;
-+		readonly command?: Command;
-+	}
-+
-+	export interface CommentThreadChangedEvent {
-+		readonly owner: number;
-+		/**
-+		 * Added comment threads.
-+		 */
-+		readonly added: CommentThread[];
-+		/**
-+		 * Removed comment threads.
-+		 */
-+		readonly removed: CommentThread[];
-+		/**
-+		 * Changed comment threads.
-+		 */
-+		readonly changed: CommentThread[];
-+	}
-+
-+	export interface DocumentCommentProvider {
-+		provideDocumentComments(resource: Uri, token: CancellationToken): Promise<CommentInfo>;
-+		createNewCommentThread(resource: Uri, range: Range, text: string, token: CancellationToken): Promise<CommentThread>;
-+		replyToCommentThread(resource: Uri, range: Range, thread: CommentThread, text: string, token: CancellationToken): Promise<CommentThread>;
-+		onDidChangeCommentThreads(): IEvent<CommentThreadChangedEvent>;
-+	}
-+
-+	export interface WorkspaceCommentProvider {
-+		provideWorkspaceComments(token: CancellationToken): Promise<CommentThread[]>;
-+		createNewCommentThread(resource: Uri, range: Range, text: string, token: CancellationToken): Promise<CommentThread>;
-+		replyToCommentThread(resource: Uri, range: Range, thread: CommentThread, text: string, token: CancellationToken): Promise<CommentThread>;
-+		onDidChangeCommentThreads(): IEvent<CommentThreadChangedEvent>;
-+	}
-+
- 	export interface ICodeLensSymbol {
- 		range: IRange;
- 		id?: string;
-changed in both
-  base   100644 e5de379f7acf83befd829c7c721aee962bc17af3 src/vs/vscode.d.ts
-  our    100644 6000b0300db361418bc31c0585263a9d663705f5 src/vs/vscode.d.ts
-  their  100644 b06b636587d9f3728658d5b9920e711f86bda03b src/vs/vscode.d.ts
-@@ -5351,7 +5351,7 @@
- 	 *
- 	 * * *Note 1:* The filesystem provider API works with [uris](#Uri) and assumes hierarchical
- 	 * paths, e.g. `foo:/my/path` is a child of `foo:/my/` and a parent of `foo:/my/path/deeper`.
--	 * * *Note 2:* There is an activation event `onFileSystem:<scheme>` that fires when a file
-+	 * * *Note 2:* There is an activation event `onFileSystem:<-scheme>` that fires when a file
- 	 * or folder is being accessed.
- 	 * * *Note 3:* The word 'file' is often used to denote all [kinds](#FileType) of files, e.g.
- 	 * folders, symbolic links, and regular files.
-changed in both
-  base   100644 d2580a04439d987167c07f600ffebd36caee57cc src/vs/vscode.proposed.d.ts
-  our    100644 3de4a7af9dda9e3e523ba4b5774f1667d66b0b9b src/vs/vscode.proposed.d.ts
-  their  100644 7b97866ad75c3fffeefb66f395f3e85db7688081 src/vs/vscode.proposed.d.ts
-@@ -542,6 +542,79 @@
- 	/**
- 	 * Comments provider related APIs are still in early stages, they may be changed significantly during our API experiments.
- 	 */
-+<<<<<<< .our
-+=======
-+
-+	interface CommentInfo {
-+		threads: CommentThread[];
-+		commentingRanges?: Range[];
-+	}
-+
-+	export enum CommentThreadCollapsibleState {
-+		/**
-+		 * Determines an item is collapsed
-+		 */
-+		Collapsed = 0,
-+		/**
-+		* Determines an item is expanded
-+		*/
-+		Expanded = 1
-+	}
-+
-+	interface CommentThread {
-+		threadId: string;
-+		resource: Uri;
-+		range: Range;
-+		comments: Comment[];
-+		collapsibleState?: CommentThreadCollapsibleState;
-+	}
-+
-+	interface Comment {
-+		commentId: string;
-+		body: MarkdownString;
-+		userName: string;
-+		gravatar: string;
-+		command?: Command;
-+	}
-+
-+	export interface CommentThreadChangedEvent {
-+		/**
-+		 * Added comment threads.
-+		 */
-+		readonly added: CommentThread[];
-+
-+		/**
-+		 * Removed comment threads.
-+		 */
-+		readonly removed: CommentThread[];
-+
-+		/**
-+		 * Changed comment threads.
-+		 */
-+		readonly changed: CommentThread[];
-+	}
-+
-+	interface DocumentCommentProvider {
-+		provideDocumentComments(document: TextDocument, token: CancellationToken): Promise<CommentInfo>;
-+		createNewCommentThread?(document: TextDocument, range: Range, text: string, token: CancellationToken): Promise<CommentThread>;
-+		replyToCommentThread?(document: TextDocument, range: Range, commentThread: CommentThread, text: string, token: CancellationToken): Promise<CommentThread>;
-+		onDidChangeCommentThreads?: Event<CommentThreadChangedEvent>;
-+	}
-+
-+	interface WorkspaceCommentProvider {
-+		provideWorkspaceComments(token: CancellationToken): Promise<CommentThread[]>;
-+		createNewCommentThread?(document: TextDocument, range: Range, text: string, token: CancellationToken): Promise<CommentThread>;
-+		replyToCommentThread?(document: TextDocument, range: Range, commentThread: CommentThread, text: string, token: CancellationToken): Promise<CommentThread>;
-+
-+		onDidChangeCommentThreads?: Event<CommentThreadChangedEvent>;
-+	}
-+
-+	namespace workspace {
-+		export function registerDocumentCommentProvider(provider: DocumentCommentProvider): Disposable;
-+		export function registerWorkspaceCommentProvider(provider: WorkspaceCommentProvider): Disposable;
-+	}
-+	//#endregion
-+>>>>>>> .their
- 
- 	interface CommentInfo {
- 		threads: CommentThread[];
-@@ -759,6 +832,7 @@
- 	}
- 
- 	//#endregion
-+<<<<<<< .our
- 
- 	//#region Joh -> exclusive document filters
- 
-@@ -786,3 +860,6 @@
- 	}
- 	//#endregion
- }
-+=======
-+}
-+>>>>>>> .their
-added in both
-  our    100644 0a1889d6a5fc1d1da919164ff4db59311009246e src/vs/workbench/api/electron-browser/mainThreadComments.ts
-  their  100644 beab44517bdc5bb2ace384be510405dc12338b9b src/vs/workbench/api/electron-browser/mainThreadComments.ts
-@@ -4,12 +4,21 @@
-  *--------------------------------------------------------------------------------------------*/
- 'use strict';
- 
-+<<<<<<< .our
- import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
- import { ICodeEditor, isCodeEditor, isDiffEditor, IDiffEditor } from 'vs/editor/browser/editorBrowser';
- import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
- import * as modes from 'vs/editor/common/modes';
- import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
- import { keys } from 'vs/base/common/map';
-+=======
-+import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-+import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-+import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-+import * as modes from 'vs/editor/common/modes';
-+import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
-+import { keys } from '../../../base/common/map';
-+>>>>>>> .their
- import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
- import { ExtHostCommentsShape, ExtHostContext, IExtHostContext, MainContext, MainThreadCommentsShape } from '../node/extHost.protocol';
- 
-@@ -21,7 +30,11 @@
- 
- @extHostNamedCustomer(MainContext.MainThreadComments)
- export class MainThreadComments extends Disposable implements MainThreadCommentsShape {
-+<<<<<<< .our
- 	private _disposables: IDisposable[];
-+=======
-+
-+>>>>>>> .their
- 	private _proxy: ExtHostCommentsShape;
- 	private _documentProviders = new Map<number, IDisposable>();
- 	private _workspaceProviders = new Map<number, IDisposable>();
-@@ -34,6 +47,7 @@
- 		@ICodeEditorService private _codeEditorService: ICodeEditorService
- 	) {
- 		super();
-+<<<<<<< .our
- 		this._disposables = [];
- 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostComments);
- 		this._disposables.push(this._editorService.onDidActiveEditorChange(e => {
-@@ -58,6 +72,30 @@
- 				});
- 			});
- 		}));
-+=======
-+		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostComments);
-+		this._editorService.onDidActiveEditorChange(e => {
-+			const outerEditor = this.getFocusedEditor();
-+			if (!outerEditor) {
-+				return;
-+			}
-+
-+			const controller = ReviewController.get(outerEditor);
-+			if (!controller) {
-+				return;
-+			}
-+
-+			if (!outerEditor.getModel()) {
-+				return;
-+			}
-+
-+			const outerEditorURI = outerEditor.getModel().uri;
-+			this.provideDocumentComments(outerEditorURI).then(commentInfos => {
-+				this._commentService.setComments(outerEditorURI, commentInfos.filter(info => info !== null));
-+			});
-+
-+		});
-+>>>>>>> .their
- 	}
- 
- 	$registerDocumentCommentProvider(handle: number): void {
-@@ -86,7 +124,11 @@
- 		this._panelService.openPanel(COMMENTS_PANEL_ID);
- 		this._proxy.$provideWorkspaceComments(handle).then(commentThreads => {
- 			if (commentThreads) {
-+<<<<<<< .our
- 				this._commentService.setWorkspaceComments(handle, commentThreads);
-+=======
-+				this._commentService.setAllComments(commentThreads);
-+>>>>>>> .their
- 			}
- 		});
- 	}
-@@ -98,10 +140,15 @@
- 
- 	$unregisterWorkspaceCommentProvider(handle: number): void {
- 		this._workspaceProviders.delete(handle);
-+<<<<<<< .our
- 		if (this._workspaceProviders.size === 0) {
- 			this._panelService.setPanelEnablement(COMMENTS_PANEL_ID, false);
- 		}
- 		this._commentService.removeWorkspaceComments(handle);
-+=======
-+		this._panelService.setPanelEnablement(COMMENTS_PANEL_ID, false);
-+		this._commentService.removeAllComments();
-+>>>>>>> .their
- 	}
- 
- 	$onDidCommentThreadsChange(handle: number, event: modes.CommentThreadChangedEvent) {
-@@ -110,6 +157,7 @@
- 	}
- 
- 	dispose(): void {
-+<<<<<<< .our
- 		this._disposables = dispose(this._disposables);
- 		this._workspaceProviders.forEach(value => dispose(value));
- 		this._workspaceProviders.clear();
-@@ -136,6 +184,18 @@
- 			return [editor];
- 		}
- 		return [];
-+=======
-+		throw new Error('Method not implemented.');
-+	}
-+
-+	getFocusedEditor(): ICodeEditor {
-+		let editor = this._codeEditorService.getFocusedCodeEditor();
-+		if (!editor) {
-+			return this._editorService.activeTextEditorWidget as ICodeEditor;
-+		}
-+
-+		return editor;
-+>>>>>>> .their
- 	}
- 
- 	async provideWorkspaceComments(): Promise<modes.CommentThread[]> {
-changed in both
-  base   100644 b8dba6902ed47ca6d17b1d47ea4616771a6fac07 src/vs/workbench/api/electron-browser/mainThreadWebview.ts
-  our    100644 e671f1e86b33c9a0ce5f7feaf60a7047d2878ebe src/vs/workbench/api/electron-browser/mainThreadWebview.ts
-  their  100644 04fc18370074188402cda5a2307cab5e796b6f47 src/vs/workbench/api/electron-browser/mainThreadWebview.ts
-@@ -83,7 +83,6 @@
- 		};
- 
- 		this._webviews.set(handle, webview);
--		this._activeWebview = handle;
- 	}
- 
- 	public $disposeWebview(handle: WebviewPanelHandle): void {
-@@ -214,12 +213,16 @@
- 		}
- 
- 		if (newActiveWebview && newActiveWebview.handle === this._activeWebview) {
-+<<<<<<< .our
- 			// Webview itself unchanged but position may have changed
- 			this._proxy.$onDidChangeWebviewPanelViewState(newActiveWebview.handle, {
- 				active: true,
- 				visible: true,
- 				position: editorGroupToViewColumn(this._editorGroupService, newActiveWebview.input.group)
- 			});
-+=======
-+			// No change
-+>>>>>>> .their
- 			return;
- 		}
- 
-@@ -297,6 +300,7 @@
- 			<body>${localize('errorMessage', "An error occurred while restoring view:{0}", viewType)}</body>
- 		</html>`;
- 	}
-+<<<<<<< .our
- }
- 
- function reviveWebviewOptions(options: WebviewInputOptions): WebviewInputOptions {
-@@ -317,4 +321,6 @@
- 		light: URI.revive(value.light),
- 		dark: URI.revive(value.dark)
- 	};
-+=======
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 cc5ebbc10fc0d4f6dd48bb0f462a256dd2ce0f6d src/vs/workbench/api/node/extHost.api.impl.ts
-  our    100644 ea64898c5b15cfae4b4ab32d722f4ae4a68f831a src/vs/workbench/api/node/extHost.api.impl.ts
-  their  100644 d3888d4a1f222ca16df3b826d23fe83a4629d20d src/vs/workbench/api/node/extHost.api.impl.ts
-@@ -593,8 +593,19 @@
- 			registerDocumentCommentProvider: proposedApiFunction(extension, (provider: vscode.DocumentCommentProvider) => {
- 				return exthostCommentProviders.registerDocumentCommentProvider(provider);
- 			}),
-+<<<<<<< .our
- 			registerWorkspaceCommentProvider: proposedApiFunction(extension, (provider: vscode.WorkspaceCommentProvider) => {
- 				return exthostCommentProviders.registerWorkspaceCommentProvider(provider);
-+=======
-+			registerDocumentCommentProvider: proposedApiFunction(extension, (provider: vscode.DocumentCommentProvider) => {
-+				return exthostCommentProviders.registerDocumentCommentProvider(provider);
-+			}),
-+			registerWorkspaceCommentProvider: proposedApiFunction(extension, (provider: vscode.WorkspaceCommentProvider) => {
-+				return exthostCommentProviders.registerWorkspaceCommentProvider(provider);
-+			}),
-+			onDidRenameResource: proposedApiFunction(extension, (listener, thisArg?, disposables?) => {
-+				return extHostDocuments.onDidRenameResource(listener, thisArg, disposables);
-+>>>>>>> .their
- 			}),
- 			onDidRenameFile: proposedApiFunction(extension, (listener, thisArg?, disposables?) => {
- 				return extHostFileSystemEvent.onDidRenameFile(listener, thisArg, disposables);
-@@ -771,6 +782,28 @@
- 			ViewColumn: extHostTypes.ViewColumn,
- 			WorkspaceEdit: extHostTypes.WorkspaceEdit,
- 			// functions
-+<<<<<<< .our
-+=======
-+			TaskRevealKind: extHostTypes.TaskRevealKind,
-+			TaskPanelKind: extHostTypes.TaskPanelKind,
-+			TaskGroup: extHostTypes.TaskGroup,
-+			ProcessExecution: extHostTypes.ProcessExecution,
-+			ShellExecution: extHostTypes.ShellExecution,
-+			ShellQuoting: extHostTypes.ShellQuoting,
-+			TaskScope: extHostTypes.TaskScope,
-+			Task: extHostTypes.Task,
-+			ConfigurationTarget: extHostTypes.ConfigurationTarget,
-+			RelativePattern: extHostTypes.RelativePattern,
-+
-+			DeprecatedFileChangeType: extHostTypes.DeprecatedFileChangeType,
-+			DeprecatedFileType: extHostTypes.DeprecatedFileType,
-+			FileChangeType: extHostTypes.FileChangeType,
-+			FileType: files.FileType,
-+			FileSystemError: extHostTypes.FileSystemError,
-+			FoldingRange: extHostTypes.FoldingRange,
-+			FoldingRangeKind: extHostTypes.FoldingRangeKind,
-+			CommentThreadCollapsibleState: extHostTypes.CommentThreadCollapsibleState
-+>>>>>>> .their
- 		};
- 	};
- }
-@@ -868,4 +901,4 @@
- 	isUnderDevelopment: false,
- 	main: undefined,
- 	version: undefined
--};
-+};
-\ No newline at end of file
-changed in both
-  base   100644 8da4c2552f59d1c60fc63dd06970c61041fe5671 src/vs/workbench/api/node/extHost.protocol.ts
-  our    100644 edb764542adfbf0fba64e1b93de7c309bedf0d12 src/vs/workbench/api/node/extHost.protocol.ts
-  their  100644 fc54283a008c08ecfdb91926ce92a91a786c93ec src/vs/workbench/api/node/extHost.protocol.ts
-changed in both
-  base   100644 d8285ea3893ef0dab59cdf56751b20727505839a src/vs/workbench/api/node/extHostTypes.ts
-  our    100644 7e7572fe66c624d470c8506c4a3ebf35efe8320a src/vs/workbench/api/node/extHostTypes.ts
-  their  100644 99fbe38deb513766ae99edaf4976758f63ddfeb3 src/vs/workbench/api/node/extHostTypes.ts
-@@ -1955,6 +1955,7 @@
- 	 * Determines an item is expanded
- 	 */
- 	Expanded = 1
-+<<<<<<< .our
- }
- 
- export class QuickInputButtons {
-@@ -1963,3 +1964,6 @@
- 
- 	private constructor() { }
- }
-+=======
-+}
-+>>>>>>> .their
-changed in both
-  base   100644 cee26a2323fb81c5ed1d0c389262ebec5ab2fbb0 src/vs/workbench/electron-browser/workbench.ts
-  our    100644 78add76eb65984b5c27c1721cb6482b45327e839 src/vs/workbench/electron-browser/workbench.ts
-  their  100644 305300b04950800b0b7276b09c2609c0dde1aaa2 src/vs/workbench/electron-browser/workbench.ts
-@@ -415,7 +415,6 @@
- 		this.titlebarPart = this.instantiationService.createInstance(TitlebarPart, Identifiers.TITLEBAR_PART);
- 		this._register(toDisposable(() => this.titlebarPart.shutdown()));
- 		serviceCollection.set(ITitleService, this.titlebarPart);
--
- 		// History
- 		serviceCollection.set(IHistoryService, new SyncDescriptor(HistoryService));
- 
-added in both
-  our    100644 305acad3ce425dfee3dabd9dff8603b54a968792 src/vs/workbench/parts/comments/common/commentModel.ts
-  their  100644 ed6bceab1f2efc6aa5e23b7e15033d4a584c74ab src/vs/workbench/parts/comments/common/commentModel.ts
-@@ -8,9 +8,14 @@
- import URI from 'vs/base/common/uri';
- import { IRange } from 'vs/editor/common/core/range';
- import { Comment, CommentThread, CommentThreadChangedEvent } from 'vs/editor/common/modes';
-+<<<<<<< .our
- import { groupBy, firstIndex, flatten } from 'vs/base/common/arrays';
- import { localize } from 'vs/nls';
- import { values } from 'vs/base/common/map';
-+=======
-+import { groupBy, firstIndex } from 'vs/base/common/arrays';
-+import { localize } from 'vs/nls';
-+>>>>>>> .their
- 
- export class CommentNode {
- 	threadId: string;
-@@ -55,6 +60,7 @@
- 
- export class CommentsModel {
- 	resourceCommentThreads: ResourceWithCommentThreads[];
-+<<<<<<< .our
- 	commentThreadsMap: Map<number, ResourceWithCommentThreads[]>;
- 
- 	constructor() {
-@@ -79,6 +85,23 @@
- 			// Find resource that has the comment thread
- 			const matchingResourceIndex = firstIndex(threadsForOwner, (resourceData) => resourceData.id === thread.resource);
- 			const matchingResourceData = threadsForOwner[matchingResourceIndex];
-+=======
-+
-+	constructor() {
-+		this.resourceCommentThreads = [];
-+	}
-+
-+	public setCommentThreads(commentThreads: CommentThread[]): void {
-+		this.resourceCommentThreads = [];
-+		this.addCommentThreads(commentThreads);
-+	}
-+
-+	public updateCommentThreads(event: CommentThreadChangedEvent): void {
-+		event.removed.forEach(thread => {
-+			// Find resource that has the comment thread
-+			const matchingResourceIndex = firstIndex(this.resourceCommentThreads, (resourceData) => resourceData.id === thread.resource);
-+			const matchingResourceData = this.resourceCommentThreads[matchingResourceIndex];
-+>>>>>>> .their
- 
- 			// Find comment node on resource that is that thread and remove it
- 			const index = firstIndex(matchingResourceData.commentThreads, (commentThread) => commentThread.threadId === thread.threadId);
-@@ -86,6 +109,7 @@
- 
- 			// If the comment thread was the last thread for a resource, remove that resource from the list
- 			if (matchingResourceData.commentThreads.length === 0) {
-+<<<<<<< .our
- 				threadsForOwner.splice(matchingResourceIndex, 1);
- 			}
- 		});
-@@ -94,12 +118,23 @@
- 			// Find resource that has the comment thread
- 			const matchingResourceIndex = firstIndex(threadsForOwner, (resourceData) => resourceData.id === thread.resource);
- 			const matchingResourceData = threadsForOwner[matchingResourceIndex];
-+=======
-+				this.resourceCommentThreads.splice(matchingResourceIndex, 1);
-+			}
-+		});
-+
-+		event.changed.forEach(thread => {
-+			// Find resource that has the comment thread
-+			const matchingResourceIndex = firstIndex(this.resourceCommentThreads, (resourceData) => resourceData.id === thread.resource);
-+			const matchingResourceData = this.resourceCommentThreads[matchingResourceIndex];
-+>>>>>>> .their
- 
- 			// Find comment node on resource that is that thread and replace it
- 			const index = firstIndex(matchingResourceData.commentThreads, (commentThread) => commentThread.threadId === thread.threadId);
- 			matchingResourceData.commentThreads[index] = ResourceWithCommentThreads.createCommentNode(URI.parse(matchingResourceData.id), thread);
- 		});
- 
-+<<<<<<< .our
- 		added.forEach(thread => {
- 			const existingResource = threadsForOwner.filter(resourceWithThreads => resourceWithThreads.resource.toString() === thread.resource);
- 			if (existingResource.length) {
-@@ -114,6 +149,9 @@
- 		this.resourceCommentThreads = flatten(values(this.commentThreadsMap));
- 
- 		return removed.length > 0 || changed.length > 0 || added.length > 0;
-+=======
-+		this.addCommentThreads(event.added);
-+>>>>>>> .their
- 	}
- 
- 	public hasCommentThreads(): boolean {
-@@ -128,18 +166,39 @@
- 		}
- 	}
- 
-+<<<<<<< .our
- 	private groupByResource(commentThreads: CommentThread[]): ResourceWithCommentThreads[] {
- 		const resourceCommentThreads = [];
-+=======
-+	public getCommentsCount(): number {
-+		let numComments = 0;
-+		this.resourceCommentThreads.forEach(resource => {
-+			numComments += resource.commentThreads.length;
-+			resource.commentThreads.forEach(thread => {
-+				numComments += thread.replies.length;
-+			});
-+		});
-+
-+		return numComments;
-+	}
-+
-+	private addCommentThreads(commentThreads: CommentThread[]): void {
-+>>>>>>> .their
- 		const commentThreadsByResource = new Map<string, ResourceWithCommentThreads>();
- 		for (const group of groupBy(commentThreads, CommentsModel._compareURIs)) {
- 			commentThreadsByResource.set(group[0].resource, new ResourceWithCommentThreads(URI.parse(group[0].resource), group));
- 		}
- 
- 		commentThreadsByResource.forEach((v, i, m) => {
-+<<<<<<< .our
- 			resourceCommentThreads.push(v);
- 		});
- 
- 		return resourceCommentThreads;
-+=======
-+			this.resourceCommentThreads.push(v);
-+		});
-+>>>>>>> .their
- 	}
- 
- 	private static _compareURIs(a: CommentThread, b: CommentThread) {
-added in both
-  our    100644 b05c049300e112ad63982337d33d98425f6bfbf7 src/vs/workbench/parts/comments/electron-browser/commentGlyphWidget.ts
-  their  100644 44d7a10810ed4c77b750a454b40e10736c0f569a src/vs/workbench/parts/comments/electron-browser/commentGlyphWidget.ts
-@@ -4,6 +4,7 @@
-  *--------------------------------------------------------------------------------------------*/
- 'use strict';
- 
-+<<<<<<< .our
- import { ICodeEditor, IContentWidgetPosition, ContentWidgetPositionPreference } from 'vs/editor/browser/editorBrowser';
- import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
- 
-@@ -31,11 +32,43 @@
- 		}];
- 
- 		this.commentsDecorations = this._editor.getModel().deltaDecorations(this.commentsDecorations, commentsDecorations);
-+=======
-+import { ICodeEditor, IContentWidget, IContentWidgetPosition, ContentWidgetPositionPreference } from 'vs/editor/browser/editorBrowser';
-+
-+export class CommentGlyphWidget implements IContentWidget {
-+	private _id: string;
-+	private _lineNumber: number;
-+	private _domNode: HTMLDivElement;
-+	private _editor: ICodeEditor;
-+
-+	constructor(id: string, editor: ICodeEditor, lineNumber: number, disabled: boolean, onClick: () => void) {
-+		this._id = id;
-+		this._domNode = document.createElement('div');
-+		this._domNode.className = disabled ? 'comment-hint commenting-disabled' : 'comment-hint';
-+		this._domNode.addEventListener('click', onClick);
-+
-+		this._lineNumber = lineNumber;
-+
-+		this._editor = editor;
-+		this._editor.addContentWidget(this);
-+
-+	}
-+
-+	getDomNode(): HTMLElement {
-+		return this._domNode;
-+	}
-+
-+	getId(): string {
-+		return this._id;
-+>>>>>>> .their
- 	}
- 
- 	setLineNumber(lineNumber: number): void {
- 		this._lineNumber = lineNumber;
-+<<<<<<< .our
- 		this.update();
-+=======
-+>>>>>>> .their
- 	}
- 
- 	getPosition(): IContentWidgetPosition {
-@@ -47,10 +80,13 @@
- 			preference: [ContentWidgetPositionPreference.EXACT]
- 		};
- 	}
-+<<<<<<< .our
- 
- 	dispose() {
- 		if (this.commentsDecorations) {
- 			this._editor.deltaDecorations(this.commentsDecorations, []);
- 		}
- 	}
-+=======
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 ff0fe6655d1314d9b0bc23d4067cd4e0db69f078 src/vs/workbench/parts/comments/electron-browser/commentService.ts
-  their  100644 427fbb6f33854ebde35dabe477a50496f8c7f36c src/vs/workbench/parts/comments/electron-browser/commentService.ts
-@@ -22,6 +22,7 @@
- 	commentInfos: CommentInfo[];
- }
- 
-+<<<<<<< .our
- export interface IWorkspaceCommentThreadsEvent {
- 	ownerId: number;
- 	commentThreads: CommentThread[];
-@@ -41,6 +42,22 @@
- 	unregisterDataProvider(owner: number): void;
- 	updateComments(event: CommentThreadChangedEvent): void;
- 	createNewCommentThread(owner: number, resource: URI, range: Range, text: string): TPromise<CommentThread>;
-+=======
-+export interface ICommentService {
-+	_serviceBrand: any;
-+	readonly onDidSetResourceCommentInfos: Event<IResourceCommentThreadEvent>;
-+	readonly onDidSetAllCommentThreads: Event<CommentThread[]>;
-+	readonly onDidUpdateCommentThreads: Event<CommentThreadChangedEvent>;
-+	readonly onDidSetDataProvider: Event<void>;
-+	readonly onDidDeleteDataProvider: Event<number>;
-+	setComments(resource: URI, commentInfos: CommentInfo[]): void;
-+	setAllComments(commentsByResource: CommentThread[]): void;
-+	removeAllComments(): void;
-+	registerDataProvider(owner: number, commentProvider: DocumentCommentProvider | WorkspaceCommentProvider): void;
-+	unregisterDataProvider(owner: number): void;
-+	updateComments(event: CommentThreadChangedEvent): void;
-+	createNewCommenThread(owner: number, resource: URI, range: Range, text: string): TPromise<CommentThread>;
-+>>>>>>> .their
- 	replyToCommentThread(owner: number, resource: URI, range: Range, thread: CommentThread, text: string): TPromise<CommentThread>;
- 	getComments(resource: URI): TPromise<CommentInfo[]>;
- }
-@@ -57,18 +74,28 @@
- 	private readonly _onDidSetResourceCommentInfos: Emitter<IResourceCommentThreadEvent> = this._register(new Emitter<IResourceCommentThreadEvent>());
- 	readonly onDidSetResourceCommentInfos: Event<IResourceCommentThreadEvent> = this._onDidSetResourceCommentInfos.event;
- 
-+<<<<<<< .our
- 	private readonly _onDidSetAllCommentThreads: Emitter<IWorkspaceCommentThreadsEvent> = this._register(new Emitter<IWorkspaceCommentThreadsEvent>());
- 	readonly onDidSetAllCommentThreads: Event<IWorkspaceCommentThreadsEvent> = this._onDidSetAllCommentThreads.event;
-+=======
-+	private readonly _onDidSetAllCommentThreads: Emitter<CommentThread[]> = this._register(new Emitter<CommentThread[]>());
-+	readonly onDidSetAllCommentThreads: Event<CommentThread[]> = this._onDidSetAllCommentThreads.event;
-+>>>>>>> .their
- 
- 	private readonly _onDidUpdateCommentThreads: Emitter<CommentThreadChangedEvent> = this._register(new Emitter<CommentThreadChangedEvent>());
- 	readonly onDidUpdateCommentThreads: Event<CommentThreadChangedEvent> = this._onDidUpdateCommentThreads.event;
- 
-+<<<<<<< .our
- 	private _commentProviders = new Map<number, DocumentCommentProvider>();
-+=======
-+	private _commentProviders = new Map<number, (DocumentCommentProvider | WorkspaceCommentProvider)>();
-+>>>>>>> .their
- 
- 	constructor() {
- 		super();
- 	}
- 
-+<<<<<<< .our
- 	setDocumentComments(resource: URI, commentInfos: CommentInfo[]): void {
- 		this._onDidSetResourceCommentInfos.fire({ resource, commentInfos });
- 	}
-@@ -82,6 +109,21 @@
- 	}
- 
- 	registerDataProvider(owner: number, commentProvider: DocumentCommentProvider) {
-+=======
-+	setComments(resource: URI, commentInfos: CommentInfo[]): void {
-+		this._onDidSetResourceCommentInfos.fire({ resource, commentInfos });
-+	}
-+
-+	setAllComments(commentsByResource: CommentThread[]): void {
-+		this._onDidSetAllCommentThreads.fire(commentsByResource);
-+	}
-+
-+	removeAllComments(): void {
-+		this._onDidSetAllCommentThreads.fire([]);
-+	}
-+
-+	registerDataProvider(owner: number, commentProvider: DocumentCommentProvider | WorkspaceCommentProvider) {
-+>>>>>>> .their
- 		this._commentProviders.set(owner, commentProvider);
- 		this._onDidSetDataProvider.fire();
- 	}
-@@ -95,7 +137,11 @@
- 		this._onDidUpdateCommentThreads.fire(event);
- 	}
- 
-+<<<<<<< .our
- 	createNewCommentThread(owner: number, resource: URI, range: Range, text: string): TPromise<CommentThread> {
-+=======
-+	createNewCommenThread(owner: number, resource: URI, range: Range, text: string): TPromise<CommentThread> {
-+>>>>>>> .their
- 		const commentProvider = this._commentProviders.get(owner);
- 
- 		if (commentProvider) {
-@@ -115,7 +161,11 @@
- 		return null;
- 	}
- 
-+<<<<<<< .our
- 	getComments(resource: URI): TPromise<CommentInfo[]> {
-+=======
-+	async getComments(resource: URI): TPromise<CommentInfo[]> {
-+>>>>>>> .their
- 		const result = [];
- 		for (const handle of keys(this._commentProviders)) {
- 			const provider = this._commentProviders.get(handle);
-added in both
-  our    100644 7b3b6262081e41bf411341317b00ebfcc3be548c src/vs/workbench/parts/comments/electron-browser/commentThreadWidget.ts
-  their  100644 da24f1bb0df8ac77797bf073296584317d5c7e38 src/vs/workbench/parts/comments/electron-browser/commentThreadWidget.ts
-@@ -20,33 +20,49 @@
- import { IOptions, ZoneWidget } from 'vs/editor/contrib/zoneWidget/zoneWidget';
- import { attachButtonStyler } from 'vs/platform/theme/common/styler';
- import { ITheme, IThemeService } from 'vs/platform/theme/common/themeService';
-+<<<<<<< .our
-+=======
-+import { renderMarkdown } from 'vs/base/browser/htmlContentRenderer';
-+>>>>>>> .their
- import { CommentGlyphWidget } from 'vs/workbench/parts/comments/electron-browser/commentGlyphWidget';
- import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
- import { IModelService } from 'vs/editor/common/services/modelService';
- import { SimpleCommentEditor } from './simpleCommentEditor';
- import URI from 'vs/base/common/uri';
-+<<<<<<< .our
- import { transparent, editorForeground, textLinkActiveForeground, textLinkForeground, focusBorder, textBlockQuoteBackground, textBlockQuoteBorder, contrastBorder, inputValidationErrorBorder, inputValidationErrorBackground } from 'vs/platform/theme/common/colorRegistry';
-+=======
-+import { transparent, editorForeground } from 'vs/platform/theme/common/colorRegistry';
-+>>>>>>> .their
- import { IModeService } from 'vs/editor/common/services/modeService';
- import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
- import { KeyCode } from 'vs/base/common/keyCodes';
- import { ICommentService } from 'vs/workbench/parts/comments/electron-browser/commentService';
- import { Range, IRange } from 'vs/editor/common/core/range';
- import { IPosition } from 'vs/editor/common/core/position';
-+<<<<<<< .our
- import { IOpenerService } from 'vs/platform/opener/common/opener';
- import { MarkdownRenderer } from 'vs/editor/contrib/markdown/markdownRenderer';
- import { IMarginData } from 'vs/editor/browser/controller/mouseTarget';
- import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
-+=======
-+>>>>>>> .their
- 
- export const COMMENTEDITOR_DECORATION_KEY = 'commenteditordecoration';
- const EXPAND_ACTION_CLASS = 'expand-review-action octicon octicon-chevron-down';
- const COLLAPSE_ACTION_CLASS = 'expand-review-action octicon octicon-chevron-up';
- const COMMENT_SCHEME = 'comment';
- 
-+<<<<<<< .our
-+=======
-+declare var ResizeObserver: any;
-+>>>>>>> .their
- export class CommentNode {
- 	private _domNode: HTMLElement;
- 	private _body: HTMLElement;
- 	private _md: HTMLElement;
- 	private _clearTimeout: any;
-+<<<<<<< .our
- 
- 	public get domNode(): HTMLElement {
- 		return this._domNode;
-@@ -56,6 +72,12 @@
- 		public comment: modes.Comment,
- 		private markdownRenderer: MarkdownRenderer,
- 	) {
-+=======
-+	public get domNode(): HTMLElement {
-+		return this._domNode;
-+	}
-+	constructor(public comment: modes.Comment) {
-+>>>>>>> .their
- 		this._domNode = $('div.review-comment').getHTMLElement();
- 		this._domNode.tabIndex = 0;
- 		let avatar = $('div.avatar-container').appendTo(this._domNode).getHTMLElement();
-@@ -67,18 +89,30 @@
- 		let author = $('strong.author').appendTo(header).getHTMLElement();
- 		author.innerText = comment.userName;
- 		this._body = $('div.comment-body').appendTo(commentDetailsContainer).getHTMLElement();
-+<<<<<<< .our
- 		this._md = this.markdownRenderer.render(comment.body).element;
-+=======
-+		this._md = renderMarkdown(comment.body);
-+>>>>>>> .their
- 		this._body.appendChild(this._md);
- 
- 		this._domNode.setAttribute('aria-label', `${comment.userName}, ${comment.body.value}`);
- 		this._domNode.setAttribute('role', 'treeitem');
-+<<<<<<< .our
-+=======
-+		this._domNode.title = `${comment.userName}, ${comment.body.value}`;
-+>>>>>>> .their
- 		this._clearTimeout = null;
- 	}
- 
- 	update(newComment: modes.Comment) {
- 		if (newComment.body !== this.comment.body) {
- 			this._body.removeChild(this._md);
-+<<<<<<< .our
- 			this._md = this.markdownRenderer.render(newComment.body).element;
-+=======
-+			this._md = renderMarkdown(newComment.body);
-+>>>>>>> .their
- 			this._body.appendChild(this._md);
- 		}
- 
-@@ -116,11 +150,16 @@
- 	private _commentThread: modes.CommentThread;
- 	private _commentGlyph: CommentGlyphWidget;
- 	private _owner: number;
-+<<<<<<< .our
- 	private _localToDispose: IDisposable[];
- 	private _globalToDispose: IDisposable[];
- 	private _markdownRenderer: MarkdownRenderer;
- 	private _styleElement: HTMLStyleElement;
- 	private _error: HTMLElement;
-+=======
-+	private _decorationIDs: string[];
-+	private _localToDispose: IDisposable[];
-+>>>>>>> .their
- 
- 	public get owner(): number {
- 		return this._owner;
-@@ -135,7 +174,10 @@
- 		private modelService: IModelService,
- 		private themeService: IThemeService,
- 		private commentService: ICommentService,
-+<<<<<<< .our
- 		private openerService: IOpenerService,
-+=======
-+>>>>>>> .their
- 		editor: ICodeEditor,
- 		owner: number,
- 		commentThread: modes.CommentThread,
-@@ -146,6 +188,7 @@
- 		this._owner = owner;
- 		this._commentThread = commentThread;
- 		this._isCollapsed = commentThread.collapsibleState !== modes.CommentThreadCollapsibleState.Expanded;
-+<<<<<<< .our
- 		this._globalToDispose = [];
- 		this._localToDispose = [];
- 		this.create();
-@@ -160,6 +203,12 @@
- 		this._applyTheme(this.themeService.getTheme());
- 
- 		this._markdownRenderer = new MarkdownRenderer(editor, this.modeService, this.openerService);
-+=======
-+		this._decorationIDs = [];
-+		this._localToDispose = [];
-+		this.create();
-+		this.themeService.onThemeChange(this._applyTheme, this);
-+>>>>>>> .their
- 	}
- 
- 	public get onDidClose(): Event<ReviewZoneWidget> {
-@@ -172,7 +221,16 @@
- 
- 	public reveal(commentId?: string) {
- 		if (this._isCollapsed) {
-+<<<<<<< .our
- 			this.show({ lineNumber: this._commentThread.range.startLineNumber, column: 1 }, 2);
-+=======
-+			if (this._decorationIDs && this._decorationIDs.length) {
-+				let range = this.editor.getModel().getDecorationRange(this._decorationIDs[0]);
-+				this.show(range, 2);
-+			} else {
-+				this.show({ lineNumber: this._commentThread.range.startLineNumber, column: 1 }, 2);
-+			}
-+>>>>>>> .their
- 		}
- 
- 		this._bodyElement.focus();
-@@ -212,18 +270,34 @@
- 		this._secondaryHeading = $('span.dirname').appendTo(titleElement).getHTMLElement();
- 		this._metaHeading = $('span.meta').appendTo(titleElement).getHTMLElement();
- 
-+<<<<<<< .our
- 		if (this._commentThread.comments.length) {
- 			this.createParticipantsLabel();
- 		}
-+=======
-+		let primaryHeading = 'Participants:';
-+		$(this._primaryHeading).safeInnerHtml(primaryHeading);
-+		this._primaryHeading.setAttribute('aria-label', primaryHeading);
-+
-+		let secondaryHeading = this._commentThread.comments.filter(arrays.uniqueFilter(comment => comment.userName)).map(comment => `@${comment.userName}`).join(', ');
-+		$(this._secondaryHeading).safeInnerHtml(secondaryHeading);
-+		this._secondaryHeading.setAttribute('aria-label', secondaryHeading);
-+>>>>>>> .their
- 
- 		const actionsContainer = $('.review-actions').appendTo(this._headElement);
- 		this._actionbarWidget = new ActionBar(actionsContainer.getHTMLElement(), {});
- 		this._disposables.push(this._actionbarWidget);
- 
-+<<<<<<< .our
- 		this._toggleAction = new Action('review.expand', nls.localize('label.collapse', "Collapse"), this._isCollapsed ? EXPAND_ACTION_CLASS : COLLAPSE_ACTION_CLASS, true, () => {
- 			if (this._isCollapsed) {
- 				this.show({ lineNumber: this._commentThread.range.startLineNumber, column: 1 }, 2);
- 				this._toggleAction.label = nls.localize('label.collapse', "Collapse");
-+=======
-+		this._toggleAction = new Action('review.expand', nls.localize('label.expand', "Expand"), this._isCollapsed ? EXPAND_ACTION_CLASS : COLLAPSE_ACTION_CLASS, true, () => {
-+			if (this._isCollapsed) {
-+				this.show({ lineNumber: this._commentThread.range.startLineNumber, column: 1 }, 2);
-+>>>>>>> .their
- 			}
- 			else {
- 				if (this._commentThread.comments.length === 0) {
-@@ -232,7 +306,10 @@
- 				}
- 				this._isCollapsed = true;
- 				this.hide();
-+<<<<<<< .our
- 				this._toggleAction.label = nls.localize('label.expand', "Expand");
-+=======
-+>>>>>>> .their
- 			}
- 			return null;
- 		});
-@@ -268,6 +345,19 @@
- 			this._commentsElement.removeChild(commentElementsToDel[i].domNode);
- 		}
- 
-+<<<<<<< .our
-+=======
-+		if (this._commentElements.length === 0) {
-+			this._commentThread = commentThread;
-+			commentThread.comments.forEach(comment => {
-+				let newElement = new CommentNode(comment);
-+				this._commentElements.push(newElement);
-+				this._commentsElement.appendChild(newElement.domNode);
-+			});
-+			return;
-+		}
-+
-+>>>>>>> .their
- 		let lastCommentElement: HTMLElement = null;
- 		let newCommentNodeList: CommentNode[] = [];
- 		for (let i = newCommentsLen - 1; i >= 0; i--) {
-@@ -277,7 +367,11 @@
- 				lastCommentElement = oldCommentNode[0].domNode;
- 				newCommentNodeList.unshift(oldCommentNode[0]);
- 			} else {
-+<<<<<<< .our
- 				let newElement = new CommentNode(currentComment, this._markdownRenderer);
-+=======
-+				let newElement = new CommentNode(currentComment);
-+>>>>>>> .their
- 				newCommentNodeList.unshift(newElement);
- 				if (lastCommentElement) {
- 					this._commentsElement.insertBefore(newElement.domNode, lastCommentElement);
-@@ -296,6 +390,7 @@
- 	}
- 
- 	protected _doLayout(heightInPixel: number, widthInPixel: number): void {
-+<<<<<<< .our
- 		this._commentEditor.layout({ height: (this._commentEditor.hasWidgetFocus() ? 5 : 1) * 18, width: widthInPixel - 42 /* margin */ });
- 	}
- 
-@@ -306,6 +401,39 @@
- 
- 		this._localToDispose.push(this.editor.onMouseDown(e => this.onEditorMouseDown(e)));
- 		this._localToDispose.push(this.editor.onMouseUp(e => this.onEditorMouseUp(e)));
-+=======
-+		this._commentEditor.layout({ height: (this._commentEditor.hasWidgetFocus() ? 5 : 1) * 18, width: widthInPixel - 20 /* margin */ });
-+	}
-+
-+	display(lineNumber: number) {
-+		this._commentGlyph = new CommentGlyphWidget(`review_${lineNumber}`, this.editor, lineNumber, false, () => {
-+			this.toggleExpand();
-+		});
-+		this.editor.layoutContentWidget(this._commentGlyph);
-+
-+		this._localToDispose.push(this.editor.onMouseDown(e => this.onEditorMouseDown(e)));
-+		this._localToDispose.push(this.editor.onMouseUp(e => this.onEditorMouseUp(e)));
-+		this._localToDispose.push(this.editor.onDidChangeModelContent((e) => {
-+			// If the widget has been opened, the position is set and can be relied on for updating the glyph position
-+			if (this.position) {
-+				if (this.position.lineNumber !== this._commentGlyph.getPosition().position.lineNumber) {
-+					this._commentGlyph.setLineNumber(this.position.lineNumber);
-+					this.editor.layoutContentWidget(this._commentGlyph);
-+				}
-+			} else {
-+				// Otherwise manually calculate position change :(
-+				const positionChange = e.changes.map(change => {
-+					if (change.range.startLineNumber < change.range.endLineNumber) {
-+						return change.range.startLineNumber - change.range.endLineNumber;
-+					} else {
-+						return change.text.split(e.eol).length - 1;
-+					}
-+				}).reduce((prev, curr) => prev + curr, 0);
-+				this._commentGlyph.setLineNumber(this._commentGlyph.getPosition().position.lineNumber + positionChange);
-+				this.editor.layoutContentWidget(this._commentGlyph);
-+			}
-+		}));
-+>>>>>>> .their
- 		var headHeight = Math.ceil(this.editor.getConfiguration().lineHeight * 1.2);
- 		this._headElement.style.height = `${headHeight}px`;
- 		this._headElement.style.lineHeight = this._headElement.style.height;
-@@ -315,7 +443,11 @@
- 
- 		this._commentElements = [];
- 		for (let i = 0; i < this._commentThread.comments.length; i++) {
-+<<<<<<< .our
- 			let newCommentNode = new CommentNode(this._commentThread.comments[i], this._markdownRenderer);
-+=======
-+			let newCommentNode = new CommentNode(this._commentThread.comments[i]);
-+>>>>>>> .their
- 			this._commentElements.push(newCommentNode);
- 			this._commentsElement.appendChild(newCommentNode.domNode);
- 		}
-@@ -333,6 +465,7 @@
- 		this.setCommentEditorDecorations();
- 
- 		// Only add the additional step of clicking a reply button to expand the textarea when there are existing comments
-+<<<<<<< .our
- 		if (hasExistingComments) {
- 			this.createReplyButton();
- 		} else {
-@@ -364,11 +497,25 @@
- 
- 		this._error = $('.validation-error.hidden').appendTo(this._commentForm).getHTMLElement();
- 
-+=======
-+		this.createCommentButton();
-+
-+		this._localToDispose.push(this._commentEditor.onKeyDown((ev: IKeyboardEvent) => {
-+			const hasExistingComments = this._commentThread.comments.length > 0;
-+			if (this._commentEditor.getModel().getValueLength() === 0 && ev.keyCode === KeyCode.Escape && hasExistingComments) {
-+				if (dom.hasClass(this._commentForm, 'expand')) {
-+					dom.removeClass(this._commentForm, 'expand');
-+				}
-+			}
-+		}));
-+
-+>>>>>>> .their
- 		const formActions = $('.form-actions').appendTo(this._commentForm).getHTMLElement();
- 
- 		const button = new Button(formActions);
- 		attachButtonStyler(button, this.themeService);
- 		button.label = 'Add comment';
-+<<<<<<< .our
- 
- 		button.enabled = false;
- 		this._localToDispose.push(this._commentEditor.onDidChangeModelContent(_ => {
-@@ -407,6 +554,10 @@
- 		try {
- 			let newCommentThread;
- 
-+=======
-+		button.onDidClick(async () => {
-+			let newCommentThread;
-+>>>>>>> .their
- 			if (this._commentThread.threadId) {
- 				// reply
- 				newCommentThread = await this.commentService.replyToCommentThread(
-@@ -417,12 +568,17 @@
- 					this._commentEditor.getValue()
- 				);
- 			} else {
-+<<<<<<< .our
- 				newCommentThread = await this.commentService.createNewCommentThread(
-+=======
-+				newCommentThread = await this.commentService.createNewCommenThread(
-+>>>>>>> .their
- 					this._owner,
- 					this.editor.getModel().uri,
- 					new Range(lineNumber, 1, lineNumber, 1),
- 					this._commentEditor.getValue()
- 				);
-+<<<<<<< .our
- 
- 				if (newCommentThread) {
- 					this.createReplyButton();
-@@ -527,10 +683,99 @@
- 			return;
- 		}
- 
-+=======
-+			}
-+
-+			this._commentEditor.setValue('');
-+			if (dom.hasClass(this._commentForm, 'expand')) {
-+				dom.removeClass(this._commentForm, 'expand');
-+			}
-+
-+			if (newCommentThread) {
-+				this.update(newCommentThread);
-+			}
-+		});
-+
-+
-+		this._resizeObserver = new ResizeObserver(entries => {
-+			if (entries[0].target === this._bodyElement && !this._isCollapsed) {
-+				const lineHeight = this.editor.getConfiguration().lineHeight;
-+				const arrowHeight = Math.round(lineHeight / 3);
-+				const frameThickness = Math.round(lineHeight / 9) * 2;
-+
-+				const computedLinesNumber = Math.ceil((headHeight + entries[0].contentRect.height + arrowHeight + frameThickness) / lineHeight);
-+				this._relayout(computedLinesNumber);
-+			}
-+		});
-+
-+		this._resizeObserver.observe(this._bodyElement);
-+
-+		if (this._commentThread.collapsibleState === modes.CommentThreadCollapsibleState.Expanded) {
-+			this.show({ lineNumber: lineNumber, column: 1 }, 2);
-+		}
-+
-+		// If there are no existing comments, place focus on the text area. This must be done after show, which also moves focus.
-+		if (this._commentThread.reply && !this._commentThread.comments.length) {
-+			this._commentEditor.focus();
-+		}
-+	}
-+
-+	createCommentButton() {
-+		const hasExistingComments = this._commentThread.comments.length > 0;
-+		if (hasExistingComments) {
-+			this._reviewThreadReplyButton = <HTMLButtonElement>$('button.review-thread-reply-button').appendTo(this._commentForm).getHTMLElement();
-+			this._reviewThreadReplyButton.title = 'Reply...';
-+			this._reviewThreadReplyButton.textContent = 'Reply...';
-+			// bind click/escape actions for reviewThreadReplyButton and textArea
-+			this._reviewThreadReplyButton.onclick = () => {
-+				if (!dom.hasClass(this._commentForm, 'expand')) {
-+					dom.addClass(this._commentForm, 'expand');
-+					this._commentEditor.focus();
-+				}
-+			};
-+
-+			this._commentEditor.onDidBlurEditorWidget(() => {
-+				if (this._commentEditor.getModel().getValueLength() === 0 && dom.hasClass(this._commentForm, 'expand')) {
-+					dom.removeClass(this._commentForm, 'expand');
-+				}
-+			});
-+		} else {
-+			dom.addClass(this._commentForm, 'expand');
-+		}
-+	}
-+
-+	private setCommentEditorDecorations() {
-+		let model = this._commentEditor.getModel();
-+		let valueLength = model.getValueLength();
-+		const hasExistingComments = this._commentThread.comments.length > 0;
-+		let placeholder = valueLength > 0 ? '' : (hasExistingComments ? 'Reply...' : 'Type a new comment');
-+		const decorations = [{
-+			range: {
-+				startLineNumber: 0,
-+				endLineNumber: 0,
-+				startColumn: 0,
-+				endColumn: 1
-+			},
-+			renderOptions: {
-+				after: {
-+					contentText: placeholder,
-+					color: transparent(editorForeground, 0.4)(this.themeService.getTheme()).toString()
-+				}
-+			}
-+		}];
-+
-+		this._commentEditor.setDecorations(COMMENTEDITOR_DECORATION_KEY, decorations);
-+	}
-+
-+	private mouseDownInfo: { lineNumber: number, iconClicked: boolean };
-+
-+	private onEditorMouseDown(e: IEditorMouseEvent): void {
-+>>>>>>> .their
- 		if (!e.event.leftButton) {
- 			return;
- 		}
- 
-+<<<<<<< .our
- 		if (e.target.type !== MouseTargetType.GUTTER_LINE_DECORATIONS) {
- 			return;
- 		}
-@@ -544,22 +789,47 @@
- 		}
- 
- 		this.mouseDownInfo = { lineNumber: range.startLineNumber };
-+=======
-+		let range = e.target.range;
-+		if (!range) {
-+			return;
-+		}
-+
-+		let iconClicked = false;
-+		switch (e.target.type) {
-+			case MouseTargetType.GUTTER_GLYPH_MARGIN:
-+				iconClicked = true;
-+				break;
-+			default:
-+				return;
-+		}
-+
-+		this.mouseDownInfo = { lineNumber: range.startLineNumber, iconClicked };
-+>>>>>>> .their
- 	}
- 
- 	private onEditorMouseUp(e: IEditorMouseEvent): void {
- 		if (!this.mouseDownInfo) {
- 			return;
- 		}
-+<<<<<<< .our
- 
- 		const { lineNumber } = this.mouseDownInfo;
- 		this.mouseDownInfo = null;
- 
- 		const range = e.target.range;
- 
-+=======
-+		let lineNumber = this.mouseDownInfo.lineNumber;
-+		let iconClicked = this.mouseDownInfo.iconClicked;
-+
-+		let range = e.target.range;
-+>>>>>>> .their
- 		if (!range || range.startLineNumber !== lineNumber) {
- 			return;
- 		}
- 
-+<<<<<<< .our
- 		if (e.target.type !== MouseTargetType.GUTTER_LINE_DECORATIONS) {
- 			return;
- 		}
-@@ -581,6 +851,26 @@
- 					this.dispose();
- 				}
- 			}
-+=======
-+		if (this.position && this.position.lineNumber !== lineNumber) {
-+			return;
-+		}
-+
-+		if (!this.position && lineNumber !== this._commentThread.range.startLineNumber) {
-+			return;
-+		}
-+
-+		if (iconClicked) {
-+			if (e.target.type !== MouseTargetType.GUTTER_GLYPH_MARGIN) {
-+				return;
-+			}
-+		}
-+
-+		if (this._isCollapsed) {
-+			this.show({ lineNumber: lineNumber, column: 1 }, 2);
-+		} else {
-+			this.hide();
-+>>>>>>> .their
- 		}
- 	}
- 
-@@ -590,6 +880,7 @@
- 			arrowColor: borderColor,
- 			frameColor: borderColor
- 		});
-+<<<<<<< .our
- 
- 		const content: string[] = [];
- 		const linkColor = theme.getColor(textLinkForeground);
-@@ -645,12 +936,17 @@
- 
- 		// Editor decorations should also be responsive to theme changes
- 		this.setCommentEditorDecorations();
-+=======
-+>>>>>>> .their
- 	}
- 
- 	show(rangeOrPos: IRange | IPosition, heightInLines: number): void {
- 		this._isCollapsed = false;
- 		super.show(rangeOrPos, heightInLines);
-+<<<<<<< .our
- 		this._refresh();
-+=======
-+>>>>>>> .their
- 	}
- 
- 	hide() {
-@@ -664,6 +960,7 @@
- 			this._resizeObserver.disconnect();
- 			this._resizeObserver = null;
- 		}
-+<<<<<<< .our
- 
- 		if (this._commentGlyph) {
- 			this._commentGlyph.dispose();
-@@ -671,6 +968,15 @@
- 		}
- 
- 		this._globalToDispose.forEach(global => global.dispose());
-+=======
-+		this.editor.changeDecorations(accessor => {
-+			accessor.deltaDecorations(this._decorationIDs, []);
-+		});
-+		if (this._commentGlyph) {
-+			this.editor.removeContentWidget(this._commentGlyph);
-+			this._commentGlyph = null;
-+		}
-+>>>>>>> .their
- 		this._localToDispose.forEach(local => local.dispose());
- 		this._onDidClose.fire();
- 	}
-added in both
-  our    100644 80bdf78ac19325b0e4e41eb57caa247a2e3dbc8d src/vs/workbench/parts/comments/electron-browser/comments.contribution.ts
-  their  100644 751fd1a1371414c0054a4e69acce2ac4a41e7acb src/vs/workbench/parts/comments/electron-browser/comments.contribution.ts
-@@ -36,6 +36,10 @@
- ));
- 
- // Register view location updater
-+<<<<<<< .our
- Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(CommentPanelVisibilityUpdater, LifecyclePhase.Restoring);
-+=======
-+Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(CommentPanelVisibilityUpdater, LifecyclePhase.Running);
-+>>>>>>> .their
- 
- registerSingleton(ICommentService, CommentService);
-added in both
-  our    100644 db8cb6ebef0a0461d8141ec3fab4f2e3ad8fd6f5 src/vs/workbench/parts/comments/electron-browser/commentsEditorContribution.ts
-  their  100644 a61caf0eaf12194b04a49c63ada7b1e33484966d src/vs/workbench/parts/comments/electron-browser/commentsEditorContribution.ts
-@@ -5,6 +5,7 @@
- 'use strict';
- 
- import 'vs/css!./media/review';
-+<<<<<<< .our
- import * as nls from 'vs/nls';
- import { $ } from 'vs/base/browser/builder';
- import { findFirstInSorted } from 'vs/base/common/arrays';
-@@ -25,16 +26,40 @@
- import { IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
- import { CommentThreadCollapsibleState } from 'vs/workbench/api/node/extHostTypes';
- import { ReviewModel } from 'vs/workbench/parts/comments/common/reviewModel';
-+=======
-+import { $ } from 'vs/base/browser/builder';
-+import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-+import { ICodeEditor, IEditorMouseEvent, IViewZone } from 'vs/editor/browser/editorBrowser';
-+import { registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-+import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-+import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/embeddedCodeEditorWidget';
-+import { IEditorContribution } from 'vs/editor/common/editorCommon';
-+import * as modes from 'vs/editor/common/modes';
-+import { peekViewEditorBackground, peekViewResultsBackground, peekViewResultsSelectionBackground } from 'vs/editor/contrib/referenceSearch/referencesWidget';
-+import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-+import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-+import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
-+import { INotificationService } from 'vs/platform/notification/common/notification';
-+import { editorForeground } from 'vs/platform/theme/common/colorRegistry';
-+import { IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-+import { CommentThreadCollapsibleState } from 'vs/workbench/api/node/extHostTypes';
-+import { ReviewModel } from 'vs/workbench/parts/comments/common/reviewModel';
-+import { CommentGlyphWidget } from 'vs/workbench/parts/comments/electron-browser/commentGlyphWidget';
-+>>>>>>> .their
- import { ReviewZoneWidget, COMMENTEDITOR_DECORATION_KEY } from 'vs/workbench/parts/comments/electron-browser/commentThreadWidget';
- import { ICommentService } from 'vs/workbench/parts/comments/electron-browser/commentService';
- import { IModelService } from 'vs/editor/common/services/modelService';
- import { IModeService } from 'vs/editor/common/services/modeService';
-+<<<<<<< .our
- import { IOpenerService } from 'vs/platform/opener/common/opener';
- import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
- import { IModelDecorationOptions } from 'vs/editor/common/model';
- import { Color, RGBA } from 'vs/base/common/color';
- import { IMarginData } from 'vs/editor/browser/controller/mouseTarget';
- import { INotificationService } from 'vs/platform/notification/common/notification';
-+=======
-+>>>>>>> .their
- 
- export const ctxReviewPanelVisible = new RawContextKey<boolean>('reviewPanelVisible', false);
- 
-@@ -57,6 +82,7 @@
- 	}
- }
- 
-+<<<<<<< .our
- const overviewRulerDefault = new Color(new RGBA(197, 197, 197, 1));
- 
- export const overviewRulerCommentingRangeForeground = registerColor('editorGutter.commentRangeForeground', { dark: overviewRulerDefault, light: overviewRulerDefault, hc: overviewRulerDefault }, nls.localize('editorGutterCommentRangeForeground', 'Editor gutter decoration color for commenting ranges.'));
-@@ -161,6 +187,8 @@
- 	}
- }
- 
-+=======
-+>>>>>>> .their
- export class ReviewController implements IEditorContribution {
- 	private globalToDispose: IDisposable[];
- 	private localToDispose: IDisposable[];
-@@ -170,11 +198,16 @@
- 	private _reviewPanelVisible: IContextKey<boolean>;
- 	private _commentInfos: modes.CommentInfo[];
- 	private _reviewModel: ReviewModel;
-+<<<<<<< .our
- 	// private _hasSetComments: boolean;
- 	private _commentingRangeDecorator: CommentingRangeDecorator;
- 	private mouseDownInfo: { lineNumber: number } | null = null;
- 	private _commentingRangeSpaceReserved = false;
- 
-+=======
-+	private _newCommentGlyph: CommentGlyphWidget;
-+	private _hasSetComments: boolean;
-+>>>>>>> .their
- 
- 	constructor(
- 		editor: ICodeEditor,
-@@ -186,7 +219,11 @@
- 		@IModeService private modeService: IModeService,
- 		@IModelService private modelService: IModelService,
- 		@ICodeEditorService private codeEditorService: ICodeEditorService,
-+<<<<<<< .our
- 		@IOpenerService private openerService: IOpenerService
-+=======
-+
-+>>>>>>> .their
- 	) {
- 		this.editor = editor;
- 		this.globalToDispose = [];
-@@ -194,11 +231,19 @@
- 		this._commentInfos = [];
- 		this._commentWidgets = [];
- 		this._newCommentWidget = null;
-+<<<<<<< .our
- 		// this._hasSetComments = false;
- 
- 		this._reviewPanelVisible = ctxReviewPanelVisible.bindTo(contextKeyService);
- 		this._reviewModel = new ReviewModel();
- 		this._commentingRangeDecorator = new CommentingRangeDecorator();
-+=======
-+		this._newCommentGlyph = null;
-+		this._hasSetComments = false;
-+
-+		this._reviewPanelVisible = ctxReviewPanelVisible.bindTo(contextKeyService);
-+		this._reviewModel = new ReviewModel();
-+>>>>>>> .their
- 
- 		this._reviewModel.onDidChangeStyle(style => {
- 			if (this._newCommentWidget) {
-@@ -212,8 +257,13 @@
- 
- 			this._commentInfos.forEach(info => {
- 				info.threads.forEach(thread => {
-+<<<<<<< .our
- 					let zoneWidget = new ReviewZoneWidget(this.instantiationService, this.modeService, this.modelService, this.themeService, this.commentService, this.openerService, this.editor, info.owner, thread, {});
- 					zoneWidget.display(thread.range.startLineNumber, this._commentingRangeDecorator.commentsOptions);
-+=======
-+					let zoneWidget = new ReviewZoneWidget(this.instantiationService, this.modeService, this.modelService, this.themeService, this.commentService, this.editor, info.owner, thread, {});
-+					zoneWidget.display(thread.range.startLineNumber);
-+>>>>>>> .their
- 					this._commentWidgets.push(zoneWidget);
- 				});
- 			});
-@@ -226,6 +276,14 @@
- 				this._newCommentWidget = null;
- 			}
- 
-+<<<<<<< .our
-+=======
-+			if (this._newCommentGlyph) {
-+				this.editor.removeContentWidget(this._newCommentGlyph);
-+				this._newCommentGlyph = null;
-+			}
-+
-+>>>>>>> .their
- 			this.getComments();
- 		}));
- 
-@@ -263,6 +321,7 @@
- 		}
- 	}
- 
-+<<<<<<< .our
- 	public nextCommentThread(): void {
- 		if (!this._commentWidgets.length) {
- 			return;
-@@ -313,6 +372,8 @@
- 		}
- 	}
- 
-+=======
-+>>>>>>> .their
- 	getId(): string {
- 		return ID;
- 	}
-@@ -333,19 +394,40 @@
- 	public onModelChanged(): void {
- 		this.localToDispose = dispose(this.localToDispose);
- 		if (this._newCommentWidget) {
-+<<<<<<< .our
- 			// todo@peng store view state.
-+=======
-+			// todo store view state.
-+>>>>>>> .their
- 			this._newCommentWidget.dispose();
- 			this._newCommentWidget = null;
- 		}
- 
-+<<<<<<< .our
-+=======
-+		if (this._newCommentGlyph) {
-+			this.editor.removeContentWidget(this._newCommentGlyph);
-+			this._newCommentGlyph = null;
-+		}
-+
-+>>>>>>> .their
- 		this._commentWidgets.forEach(zone => {
- 			zone.dispose();
- 		});
- 		this._commentWidgets = [];
- 
-+<<<<<<< .our
- 		this.localToDispose.push(this.editor.onMouseDown(e => this.onEditorMouseDown(e)));
- 		this.localToDispose.push(this.editor.onMouseUp(e => this.onEditorMouseUp(e)));
- 		this.localToDispose.push(this.editor.onDidChangeModelContent(() => {
-+=======
-+		this.localToDispose.push(this.editor.onMouseMove(e => this.onEditorMouseMove(e)));
-+		this.localToDispose.push(this.editor.onDidChangeModelContent(() => {
-+			if (this._newCommentGlyph) {
-+				this.editor.removeContentWidget(this._newCommentGlyph);
-+				this._newCommentGlyph = null;
-+			}
-+>>>>>>> .their
- 		}));
- 		this.localToDispose.push(this.commentService.onDidUpdateCommentThreads(e => {
- 			const editorURI = this.editor && this.editor.getModel() && this.editor.getModel().uri;
-@@ -373,8 +455,13 @@
- 				}
- 			});
- 			added.forEach(thread => {
-+<<<<<<< .our
- 				let zoneWidget = new ReviewZoneWidget(this.instantiationService, this.modeService, this.modelService, this.themeService, this.commentService, this.openerService, this.editor, e.owner, thread, {});
- 				zoneWidget.display(thread.range.startLineNumber, this._commentingRangeDecorator.commentsOptions);
-+=======
-+				let zoneWidget = new ReviewZoneWidget(this.instantiationService, this.modeService, this.modelService, this.themeService, this.commentService, this.editor, e.owner, thread, {});
-+				zoneWidget.display(thread.range.startLineNumber);
-+>>>>>>> .their
- 				this._commentWidgets.push(zoneWidget);
- 				this._commentInfos.filter(info => info.owner === e.owner)[0].threads.push(thread);
- 			});
-@@ -382,12 +469,16 @@
- 	}
- 
- 	private addComment(lineNumber: number) {
-+<<<<<<< .our
- 		if (this._newCommentWidget !== null) {
- 			this.notificationService.warn(`Please submit the comment at line ${this._newCommentWidget.position.lineNumber} before creating a new one.`);
- 			return;
- 		}
- 
- 		let newCommentInfo = this._commentingRangeDecorator.getMatchedCommentAction(lineNumber);
-+=======
-+		let newCommentInfo = this.getNewCommentAction(lineNumber);
-+>>>>>>> .their
- 		if (!newCommentInfo) {
- 			return;
- 		}
-@@ -395,7 +486,11 @@
- 		// add new comment
- 		this._reviewPanelVisible.set(true);
- 		const { replyCommand, ownerId } = newCommentInfo;
-+<<<<<<< .our
- 		this._newCommentWidget = new ReviewZoneWidget(this.instantiationService, this.modeService, this.modelService, this.themeService, this.commentService, this.openerService, this.editor, ownerId, {
-+=======
-+		this._newCommentWidget = new ReviewZoneWidget(this.instantiationService, this.modeService, this.modelService, this.themeService, this.commentService, this.editor, ownerId, {
-+>>>>>>> .their
- 			threadId: null,
- 			resource: null,
- 			comments: [],
-@@ -412,6 +507,7 @@
- 		this._newCommentWidget.onDidClose(e => {
- 			this._newCommentWidget = null;
- 		});
-+<<<<<<< .our
- 		this._newCommentWidget.display(lineNumber, this._commentingRangeDecorator.commentsOptions);
- 	}
- 
-@@ -469,10 +565,78 @@
- 			const lineNumber = e.target.position.lineNumber;
- 			this.addComment(lineNumber);
- 		}
-+=======
-+		this._newCommentWidget.display(lineNumber);
-+	}
-+
-+	private onEditorMouseMove(e: IEditorMouseEvent): void {
-+		if (!this._hasSetComments) {
-+			return;
-+		}
-+
-+		const hasCommentingRanges = this._commentInfos.length && this._commentInfos.some(info => !!info.commentingRanges.length);
-+		if (hasCommentingRanges && e.target.position && e.target.position.lineNumber !== undefined) {
-+			if (this._newCommentGlyph && e.target.element.className !== 'comment-hint') {
-+				this.editor.removeContentWidget(this._newCommentGlyph);
-+			}
-+
-+			const lineNumber = e.target.position.lineNumber;
-+			if (!this.isExistingCommentThreadAtLine(lineNumber)) {
-+				this._newCommentGlyph = this.isLineInCommentingRange(lineNumber)
-+					? this._newCommentGlyph = new CommentGlyphWidget('comment-hint', this.editor, lineNumber, false, () => {
-+						this.addComment(lineNumber);
-+					})
-+					: this._newCommentGlyph = new CommentGlyphWidget('comment-hint', this.editor, lineNumber, true, () => {
-+						this.notificationService.warn('Commenting is not supported outside of diff hunk areas.');
-+					});
-+
-+				this.editor.layoutContentWidget(this._newCommentGlyph);
-+			}
-+		}
-+	}
-+
-+	private getNewCommentAction(line: number): { replyCommand: modes.Command, ownerId: number } {
-+		for (let i = 0; i < this._commentInfos.length; i++) {
-+			const commentInfo = this._commentInfos[i];
-+			const lineWithinRange = commentInfo.commentingRanges.some(range =>
-+				range.startLineNumber <= line && line <= range.endLineNumber
-+			);
-+
-+			if (lineWithinRange) {
-+				return {
-+					replyCommand: commentInfo.reply,
-+					ownerId: commentInfo.owner
-+				};
-+			}
-+		}
-+
-+		return null;
-+	}
-+
-+	private isLineInCommentingRange(line: number): boolean {
-+		return this._commentInfos.some(commentInfo => {
-+			return commentInfo.commentingRanges.some(range =>
-+				range.startLineNumber <= line && line <= range.endLineNumber
-+			);
-+		});
-+	}
-+
-+	private isExistingCommentThreadAtLine(line: number): boolean {
-+		const existingThread = this._commentInfos.some(commentInfo => {
-+			return commentInfo.threads.some(thread =>
-+				thread.range.startLineNumber === line
-+			);
-+		});
-+
-+		const existingNewComment = this._newCommentWidget && this._newCommentWidget.position && this._newCommentWidget.position.lineNumber === line;
-+
-+		return existingThread || existingNewComment;
-+>>>>>>> .their
- 	}
- 
- 	setComments(commentInfos: modes.CommentInfo[]): void {
- 		this._commentInfos = commentInfos;
-+<<<<<<< .our
- 		let lineDecorationsWidth: number = this.editor.getConfiguration().layoutInfo.decorationsWidth;
- 
- 		if (this._commentInfos.some(info => Boolean(info.commentingRanges && info.commentingRanges.length))) {
-@@ -497,12 +661,16 @@
- 		}
- 
- 		// this._hasSetComments = true;
-+=======
-+		this._hasSetComments = true;
-+>>>>>>> .their
- 
- 		// create viewzones
- 		this._commentWidgets.forEach(zone => {
- 			zone.dispose();
- 		});
- 
-+<<<<<<< .our
- 		this._commentWidgets = [];
- 
- 		this._commentInfos.forEach(info => {
-@@ -520,6 +688,18 @@
- 		this._commentingRangeDecorator.update(this.editor, this._commentInfos);
- 	}
- 
-+=======
-+		this._commentInfos.forEach(info => {
-+			info.threads.forEach(thread => {
-+				let zoneWidget = new ReviewZoneWidget(this.instantiationService, this.modeService, this.modelService, this.themeService, this.commentService, this.editor, info.owner, thread, {});
-+				zoneWidget.display(thread.range.startLineNumber);
-+				this._commentWidgets.push(zoneWidget);
-+			});
-+		});
-+	}
-+
-+
-+>>>>>>> .their
- 	public closeWidget(): void {
- 		this._reviewPanelVisible.reset();
- 
-@@ -537,6 +717,7 @@
- 	}
- }
- 
-+<<<<<<< .our
- export class NextCommentThreadAction extends EditorAction {
- 
- 	constructor() {
-@@ -562,6 +743,14 @@
- KeybindingsRegistry.registerCommandAndKeybindingRule({
- 	id: 'closeReviewPanel',
- 	weight: KeybindingWeight.EditorContrib,
-+=======
-+registerEditorContribution(ReviewController);
-+
-+
-+KeybindingsRegistry.registerCommandAndKeybindingRule({
-+	id: 'closeReviewPanel',
-+	weight: KeybindingsRegistry.WEIGHT.editorContrib(),
-+>>>>>>> .their
- 	primary: KeyCode.Escape,
- 	secondary: [KeyMod.Shift | KeyCode.Escape],
- 	when: ctxReviewPanelVisible,
-@@ -602,7 +791,11 @@
- 			`}`);
- 	}
- 
-+<<<<<<< .our
- 	let monacoEditorBackground = theme.getColor(peekViewTitleBackground);
-+=======
-+	let monacoEditorBackground = theme.getColor(peekViewEditorBackground);
-+>>>>>>> .their
- 	if (monacoEditorBackground) {
- 		collector.addRule(
- 			`.monaco-editor .review-widget .body .comment-form .review-thread-reply-button {` +
-@@ -636,6 +829,7 @@
- 			`}`
- 		);
- 	}
-+<<<<<<< .our
- 
- 	const commentingRangeForeground = theme.getColor(overviewRulerCommentingRangeForeground);
- 	if (commentingRangeForeground) {
-@@ -654,4 +848,6 @@
- 			}
- 		`);
- 	}
-+=======
-+>>>>>>> .their
- });
-added in both
-  our    100644 4701e5529873b4bda8d02fd21d1cc4749ca24a2f src/vs/workbench/parts/comments/electron-browser/commentsPanel.ts
-  their  100644 64844ff47c05d2095ce4a65fb59230957d2c0ab6 src/vs/workbench/parts/comments/electron-browser/commentsPanel.ts
-@@ -10,7 +10,11 @@
- import { TPromise } from 'vs/base/common/winjs.base';
- import { CollapseAllAction, DefaultAccessibilityProvider, DefaultController, DefaultDragAndDrop } from 'vs/base/parts/tree/browser/treeDefaults';
- import { isCodeEditor, isDiffEditor } from 'vs/editor/browser/editorBrowser';
-+<<<<<<< .our
- import { CommentThreadChangedEvent } from 'vs/editor/common/modes';
-+=======
-+import { CommentThread, CommentThreadChangedEvent } from 'vs/editor/common/modes';
-+>>>>>>> .their
- import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
- import { TreeResourceNavigator, WorkbenchTree } from 'vs/platform/list/browser/listService';
- import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-@@ -19,11 +23,17 @@
- import { CommentNode, CommentsModel, ResourceWithCommentThreads } from 'vs/workbench/parts/comments/common/commentModel';
- import { ReviewController } from 'vs/workbench/parts/comments/electron-browser/commentsEditorContribution';
- import { CommentsDataFilter, CommentsDataSource, CommentsModelRenderer } from 'vs/workbench/parts/comments/electron-browser/commentsTreeViewer';
-+<<<<<<< .our
- import { ICommentService, IWorkspaceCommentThreadsEvent } from 'vs/workbench/parts/comments/electron-browser/commentService';
- import { IEditorService, ACTIVE_GROUP, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
- import { ICommandService } from 'vs/platform/commands/common/commands';
- import { textLinkForeground, textLinkActiveForeground, focusBorder } from 'vs/platform/theme/common/colorRegistry';
- import { IOpenerService } from 'vs/platform/opener/common/opener';
-+=======
-+import { ICommentService } from 'vs/workbench/parts/comments/electron-browser/commentService';
-+import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-+import { ICommandService } from 'vs/platform/commands/common/commands';
-+>>>>>>> .their
- 
- export const COMMENTS_PANEL_ID = 'workbench.panel.comments';
- export const COMMENTS_PANEL_TITLE = 'Comments';
-@@ -41,7 +51,10 @@
- 		@ICommentService private commentService: ICommentService,
- 		@IEditorService private editorService: IEditorService,
- 		@ICommandService private commandService: ICommandService,
-+<<<<<<< .our
- 		@IOpenerService private openerService: IOpenerService,
-+=======
-+>>>>>>> .their
- 		@ITelemetryService telemetryService: ITelemetryService,
- 		@IThemeService themeService: IThemeService
- 	) {
-@@ -63,6 +76,7 @@
- 		this.commentService.onDidSetAllCommentThreads(this.onAllCommentsChanged, this);
- 		this.commentService.onDidUpdateCommentThreads(this.onCommentsUpdated, this);
- 
-+<<<<<<< .our
- 		const styleElement = dom.createStyleSheet(parent);
- 		this.applyStyles(styleElement);
- 		this.themeService.onThemeChange(_ => {
-@@ -94,6 +108,11 @@
- 		styleElement.innerHTML = content.join('\n');
- 	}
- 
-+=======
-+		return this.render();
-+	}
-+
-+>>>>>>> .their
- 	private render(): TPromise<void> {
- 		dom.toggleClass(this.treeContainer, 'hidden', !this.commentsModel.hasCommentThreads());
- 		return this.tree.setInput(this.commentsModel).then(() => {
-@@ -104,7 +123,11 @@
- 	public getActions(): IAction[] {
- 		if (!this.collapseAllAction) {
- 			this.collapseAllAction = this.instantiationService.createInstance(CollapseAllAction, this.tree, this.commentsModel.hasCommentThreads());
-+<<<<<<< .our
- 			this._register(this.collapseAllAction);
-+=======
-+			this.toUnbind.push(this.collapseAllAction);
-+>>>>>>> .their
- 		}
- 
- 		return [this.collapseAllAction];
-@@ -132,7 +155,11 @@
- 	private createTree(): void {
- 		this.tree = this.instantiationService.createInstance(WorkbenchTree, this.treeContainer, {
- 			dataSource: new CommentsDataSource(),
-+<<<<<<< .our
- 			renderer: new CommentsModelRenderer(this.instantiationService, this.openerService),
-+=======
-+			renderer: new CommentsModelRenderer(this.instantiationService),
-+>>>>>>> .their
- 			accessibilityProvider: new DefaultAccessibilityProvider,
- 			controller: new DefaultController(),
- 			dnd: new DefaultDragAndDrop(),
-@@ -256,15 +283,25 @@
- 		}
- 	}
- 
-+<<<<<<< .our
- 	private onAllCommentsChanged(e: IWorkspaceCommentThreadsEvent): void {
- 		this.commentsModel.setCommentThreads(e.ownerId, e.commentThreads);
-+=======
-+	private onAllCommentsChanged(e: CommentThread[]): void {
-+		this.commentsModel.setCommentThreads(e);
-+>>>>>>> .their
- 		this.refresh();
- 	}
- 
- 	private onCommentsUpdated(e: CommentThreadChangedEvent): void {
-+<<<<<<< .our
- 		const didUpdate = this.commentsModel.updateCommentThreads(e);
- 		if (didUpdate) {
- 			this.refresh();
- 		}
-+=======
-+		this.commentsModel.updateCommentThreads(e);
-+		this.refresh();
-+>>>>>>> .their
- 	}
- }
-added in both
-  our    100644 d8672d23d57ada9a84a1ce2e3047b656926249e1 src/vs/workbench/parts/comments/electron-browser/commentsTreeViewer.ts
-  their  100644 df16d6514253f026c509b41d88442b30a842f429 src/vs/workbench/parts/comments/electron-browser/commentsTreeViewer.ts
-@@ -5,6 +5,7 @@
- 
- import * as dom from 'vs/base/browser/dom';
- import { renderMarkdown } from 'vs/base/browser/htmlContentRenderer';
-+<<<<<<< .our
- import { onUnexpectedError } from 'vs/base/common/errors';
- import { Disposable } from 'vs/base/common/lifecycle';
- import URI from 'vs/base/common/uri';
-@@ -12,6 +13,11 @@
- import { IDataSource, IFilter, IRenderer as ITreeRenderer, ITree } from 'vs/base/parts/tree/browser/tree';
- import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
- import { IOpenerService } from 'vs/platform/opener/common/opener';
-+=======
-+import { Promise, TPromise } from 'vs/base/common/winjs.base';
-+import { IDataSource, IFilter, IRenderer as ITreeRenderer, ITree } from 'vs/base/parts/tree/browser/tree';
-+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-+>>>>>>> .their
- import { FileLabel } from 'vs/workbench/browser/labels';
- import { CommentNode, CommentsModel, ResourceWithCommentThreads } from 'vs/workbench/parts/comments/common/commentModel';
- 
-@@ -63,7 +69,10 @@
- 	icon: HTMLImageElement;
- 	userName: HTMLSpanElement;
- 	commentText: HTMLElement;
-+<<<<<<< .our
- 	disposables: Disposable[];
-+=======
-+>>>>>>> .their
- }
- 
- export class CommentsModelRenderer implements ITreeRenderer {
-@@ -72,8 +81,12 @@
- 
- 
- 	constructor(
-+<<<<<<< .our
- 		@IInstantiationService private instantiationService: IInstantiationService,
- 		@IOpenerService private openerService: IOpenerService
-+=======
-+		@IInstantiationService private instantiationService: IInstantiationService
-+>>>>>>> .their
- 	) {
- 	}
- 
-@@ -105,10 +118,13 @@
- 		switch (templateId) {
- 			case CommentsModelRenderer.RESOURCE_ID:
- 				(<IResourceTemplateData>templateData).resourceLabel.dispose();
-+<<<<<<< .our
- 				break;
- 			case CommentsModelRenderer.COMMENT_ID:
- 				(<ICommentThreadTemplateData>templateData).disposables.forEach(disposeable => disposeable.dispose());
- 				break;
-+=======
-+>>>>>>> .their
- 		}
- 	}
- 
-@@ -134,7 +150,10 @@
- 		const labelContainer = dom.append(container, dom.$('.comment-container'));
- 		data.userName = dom.append(labelContainer, dom.$('.user'));
- 		data.commentText = dom.append(labelContainer, dom.$('.text'));
-+<<<<<<< .our
- 		data.disposables = [];
-+=======
-+>>>>>>> .their
- 
- 		return data;
- 	}
-@@ -145,6 +164,7 @@
- 
- 	private renderCommentElement(tree: ITree, element: CommentNode, templateData: ICommentThreadTemplateData) {
- 		templateData.userName.textContent = element.comment.userName;
-+<<<<<<< .our
- 		templateData.commentText.innerHTML = '';
- 		const renderedComment = renderMarkdown(element.comment.body, {
- 			inline: true,
-@@ -157,6 +177,9 @@
- 		});
- 
- 		templateData.commentText.appendChild(renderedComment);
-+=======
-+		templateData.commentText.innerHTML = renderMarkdown(element.comment.body, { inline: true }).innerHTML;
-+>>>>>>> .their
- 	}
- }
- 
-added in both
-  our    100644 3c2b37bcf3f859c2c76ff18928840eae691b7f86 src/vs/workbench/parts/comments/electron-browser/media/panel.css
-  their  100644 45268e182f1b2de5e199987e3e5cd36b442362a3 src/vs/workbench/parts/comments/electron-browser/media/panel.css
-@@ -30,6 +30,7 @@
- 	opacity: 0.5;
- }
- 
-+<<<<<<< .our
- .comments-panel .comments-panel-container .tree-container .comment-container .text {
- 	flex: 1;
- 	min-width: 0;
-@@ -39,6 +40,10 @@
- 	margin: 0;
- 	text-overflow: ellipsis;
- 	overflow: hidden;
-+=======
-+.comments-panel .comments-panel-container .tree-container .comment-container .text * {
-+	margin: 0;
-+>>>>>>> .their
- }
- 
- .comments-panel .comments-panel-container .message-box-container {
-@@ -56,5 +61,10 @@
- 
- .comments-panel .comments-panel-container .tree-container .comment-container {
- 	line-height: 22px;
-+<<<<<<< .our
- 	margin-right: 5px;
-+=======
-+	text-overflow: ellipsis;
-+	overflow: hidden;
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 6a3d41dd41d6010180d586ce4d0a7e7ec461d4d9 src/vs/workbench/parts/comments/electron-browser/media/review.css
-  their  100644 9854ade18983d5a67559292e53f7894346ba2f80 src/vs/workbench/parts/comments/electron-browser/media/review.css
-@@ -10,8 +10,16 @@
- 	background-position: center center;
- }
- 
-+<<<<<<< .our
- .monaco-editor .comment-hint {
- 	height: 20px;
-+=======
-+.monaco-editor .comment-hint{
-+	display: flex;
-+	align-items: center;
-+	justify-content: center;
-+	height: 16px;
-+>>>>>>> .their
- 	width: 20px;
- 	padding-left: 2px;
- 	background: url('comment.svg') center center no-repeat;
-@@ -35,6 +43,7 @@
- 	display: flex;
- }
- 
-+<<<<<<< .our
- .monaco-editor .review-widget .body .review-comment blockquote {
- 	margin: 0 7px 0 5px;
- 	padding: 0 16px 0 10px;
-@@ -42,6 +51,8 @@
- 	border-left-style: solid;
- }
- 
-+=======
-+>>>>>>> .their
- .monaco-editor .review-widget .body .review-comment .avatar-container {
- 	margin-top: 4px !important;
- }
-@@ -59,7 +70,10 @@
- 
- .monaco-editor .review-widget .body .review-comment .review-comment-contents {
- 	margin-left: 20px;
-+<<<<<<< .our
- 	user-select: text;
-+=======
-+>>>>>>> .their
- }
- 
- .monaco-editor .review-widget .body pre {
-@@ -117,10 +131,13 @@
- 	padding: 0 0.4em;
- }
- 
-+<<<<<<< .our
- .monaco-editor .review-widget .body span {
- 	white-space: pre;
- }
- 
-+=======
-+>>>>>>> .their
- .monaco-editor .review-widget .body .comment-body img {
- 	max-width: 100%;
- }
-@@ -130,6 +147,7 @@
- 	padding: 8px 0;
- }
- 
-+<<<<<<< .our
- .monaco-editor .review-widget .body .comment-form .validation-error {
- 	display: inline-block;
- 	overflow: hidden;
-@@ -153,6 +171,8 @@
- 	display: none;
- }
- 
-+=======
-+>>>>>>> .their
- .monaco-editor .review-widget .body .comment-form.expand .review-thread-reply-button {
- 	display: none;
- }
-@@ -160,7 +180,11 @@
- .monaco-editor .review-widget .body .comment-form.expand .monaco-editor,
- .monaco-editor .review-widget .body .comment-form.expand .form-actions {
- 	display: block;
-+<<<<<<< .our
- 	box-sizing: content-box;
-+=======
-+	box-sizing: border-box;
-+>>>>>>> .their
- }
- 
- .monaco-editor .review-widget .body .comment-form .review-thread-reply-button {
-@@ -168,7 +192,11 @@
- 	display: block;
- 	width: 100%;
- 	resize: vertical;
-+<<<<<<< .our
- 	border-radius: 0;
-+=======
-+	border-radius: 3px;
-+>>>>>>> .their
- 	box-sizing: border-box;
- 	padding: 6px 12px;
- 	font-weight: 600;
-@@ -176,7 +204,10 @@
- 	white-space: nowrap;
- 	border: 0px;
- 	cursor: text;
-+<<<<<<< .our
- 	outline: 1px solid transparent;
-+=======
-+>>>>>>> .their
- }
- 
- .monaco-editor .review-widget .body .comment-form .review-thread-reply-button:focus {
-@@ -191,7 +222,10 @@
- 	max-height: 500px;
- 	border-radius: 3px;
- 	border: 0px;
-+<<<<<<< .our
- 	padding: 6px 0 6px 12px;
-+=======
-+>>>>>>> .their
- }
- 
- .monaco-editor .review-widget .body .comment-form .form-actions {
-@@ -223,10 +257,13 @@
- 	cursor: pointer;
- }
- 
-+<<<<<<< .our
- .monaco-editor .review-widget .head .review-title .filename:empty::after {
- 	content: "Start discussion";
- }
- 
-+=======
-+>>>>>>> .their
- .monaco-editor .review-widget .head .review-title .dirname:not(:empty) {
- 	font-size: 0.9em;
- 	margin-left: 0.5em;
-@@ -271,6 +308,7 @@
- .monaco-editor .review-widget>.body {
- 	border-top: 1px solid;
- 	position: relative;
-+<<<<<<< .our
- }
- 
- .monaco-editor .comment-range-glyph {
-@@ -320,3 +358,6 @@
- .monaco-editor.inline-comment .margin-view-overlays .dirty-diff-glyph {
- 	margin-left: 14px;
- }
-+=======
-+}
-+>>>>>>> .their
-added in both
-  our    100644 a103105c6412e441e602d7b1b61213cfb87d2ae6 src/vs/workbench/parts/comments/electron-browser/simpleCommentEditor.ts
-  their  100644 3bbb410d3f52805330ec13b941c95579538d33d1 src/vs/workbench/parts/comments/electron-browser/simpleCommentEditor.ts
-@@ -12,7 +12,11 @@
- import { ICommandService } from 'vs/platform/commands/common/commands';
- 
- // Allowed Editor Contributions:
-+<<<<<<< .our
- import { MenuPreventer } from 'vs/workbench/parts/codeEditor/browser/menuPreventer';
-+=======
-+import { MenuPreventer } from 'vs/workbench/parts/codeEditor/electron-browser/menuPreventer';
-+>>>>>>> .their
- import { SelectionClipboard } from 'vs/workbench/parts/codeEditor/electron-browser/selectionClipboard';
- import { ContextMenuController } from 'vs/editor/contrib/contextmenu/contextmenu';
- import { SuggestController } from 'vs/editor/contrib/suggest/suggestController';
-added in remote
-  their  100644 e6c1bd94c7d44441bc32f7f3a22ca7d4324faee1 src/vs/workbench/parts/webview/common/webview.ts
-@@ -0,0 +1,7 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-+
-+export const CONTEXT_WEBVIEW_WIDGET_VISIBLE = new RawContextKey<boolean>('webviewWidgetVisible', false);
-changed in both
-  base   100644 ec7e540b07f7ba68d94942a7be1ec193cd61cfeb src/vs/workbench/parts/webview/electron-browser/webviewElement.ts
-  our    100644 a82c36d8793f3379277319554df1f2ce4b3daa29 src/vs/workbench/parts/webview/electron-browser/webviewElement.ts
-  their  100644 3c5d58dc406ef3aeb676e4e4ff07101210bfab20 src/vs/workbench/parts/webview/electron-browser/webviewElement.ts
-@@ -196,6 +196,10 @@
- 		parent.appendChild(this._webview);
- 	}
- 
-+	public getDomNode() {
-+		return this._webview;
-+	}
-+
- 	public notifyFindWidgetFocusChanged(isFocused: boolean) {
- 		this._contextKey.set(isFocused || document.activeElement === this._webview);
- 	}
-changed in both
-  base   100644 8df9ffe15438898db2e61d5d65aa8f9327e21de0 src/vs/workbench/workbench.main.ts
-  our    100644 184ccb27ce759508b970ffbffaf64adb3d96ca2f src/vs/workbench/workbench.main.ts
-  their  100644 938aafcedab7f5fa8561df63abc39661bd92f01a src/vs/workbench/workbench.main.ts
diff --git a/app/test/fixtures/merge-parser/vscode/merge-recieve-updates-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-recieve-updates-into-master.txt
deleted file mode 100644
index ed917daddad..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-recieve-updates-into-master.txt
+++ /dev/null
@@ -1,149 +0,0 @@
-changed in both
-  base   100644 bf50d9d44ae0c8b2d6956edb5a7fd510254ec68c src/vs/workbench/parts/extensions/common/extensions.ts
-  our    100644 f80eddc2997bb323b4ddc2fa04965332cdf133ab src/vs/workbench/parts/extensions/common/extensions.ts
-  their  100644 266966b0f0c0ced0d5f724819f2cc6aa02ed910f src/vs/workbench/parts/extensions/common/extensions.ts
-@@ -98,6 +98,7 @@
- export const AutoCheckUpdatesConfigurationKey = 'extensions.autoCheckUpdates';
- export const ShowRecommendationsOnlyOnDemandKey = 'extensions.showRecommendationsOnlyOnDemand';
- export const CloseExtensionDetailsOnViewChangeKey = 'extensions.closeExtensionDetailsOnViewChange';
-+export const ReceivesUpdatesConfigurationKey = 'extensions.receiveUpdates';
- 
- export interface IExtensionsConfiguration {
- 	autoUpdate: boolean;
-@@ -105,4 +106,5 @@
- 	ignoreRecommendations: boolean;
- 	showRecommendationsOnlyOnDemand: boolean;
- 	closeExtensionDetailsOnViewChange: boolean;
-+	receiveUpdates: boolean;
- }
-changed in both
-  base   100644 ea4c3874785354035a44794c1910f8b3068b0959 src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts
-  our    100644 5ce89339923c3f8305329edee9c2f811f190aaa7 src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts
-  their  100644 a5052bccb01d57aaa74d0b661627a5865817bef5 src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts
-@@ -204,6 +204,7 @@
- 		properties: {
- 			'extensions.autoUpdate': {
- 				type: 'boolean',
-+<<<<<<< .our
- 				description: localize('extensionsAutoUpdate', "When enabled, automatically installs updates for extensions. The updates are fetched from an online service."),
- 				default: true,
- 				scope: ConfigurationScope.APPLICATION,
-@@ -212,6 +213,9 @@
- 			'extensions.autoCheckUpdates': {
- 				type: 'boolean',
- 				description: localize('extensionsCheckUpdates', "When enabled, automatically checks extensions for updates. If an extension has an update, it is marked as outdated in the Extensions view. The updates are fetched from an online service."),
-+=======
-+				description: localize('extensionsAutoUpdate', "Automatically update extensions. If the setting 'extensions.receiveUpdates' is set to false, then extensions will not be updated, regardless of this setting."),
-+>>>>>>> .their
- 				default: true,
- 				scope: ConfigurationScope.APPLICATION,
- 				tags: ['usesOnlineServices']
-@@ -231,6 +235,11 @@
- 				type: 'boolean',
- 				description: localize('extensionsCloseExtensionDetailsOnViewChange', "When enabled, editors with extension details will be automatically closed upon navigating away from the Extensions View."),
- 				default: false
-+			},
-+			'extensions.receiveUpdates': {
-+				type: 'boolean',
-+				description: localize('extensionsReceiveUpdates', "Receive updates for outdated extensions, but not automatically update them. If set to false, extension auto-update feature is disabled regardless of the value for the 'extensions.autoUpdate' setting"),
-+				default: true
- 			}
- 		}
- 	});
-changed in both
-  base   100644 e7ccaedb3f64eec3f4d09c5a6642058c13bbfdc3 src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
-  our    100644 dde370485c80817a804989c810abe2f1db9c0966 src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
-  their  100644 0a3a9580348a97afc7f51f960065fa262cde8903 src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
-@@ -26,7 +26,11 @@
- import { IWindowService } from 'vs/platform/windows/common/windows';
- import Severity from 'vs/base/common/severity';
- import URI from 'vs/base/common/uri';
-+<<<<<<< .our
- import { IExtension, IExtensionDependencies, ExtensionState, IExtensionsWorkbenchService, AutoUpdateConfigurationKey, AutoCheckUpdatesConfigurationKey } from 'vs/workbench/parts/extensions/common/extensions';
-+=======
-+import { IExtension, IExtensionDependencies, ExtensionState, IExtensionsWorkbenchService, AutoUpdateConfigurationKey, ReceivesUpdatesConfigurationKey } from 'vs/workbench/parts/extensions/common/extensions';
-+>>>>>>> .their
- import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
- import { IURLService, IURLHandler } from 'vs/platform/url/common/url';
- import { ExtensionsInput } from 'vs/workbench/parts/extensions/common/extensionsInput';
-@@ -408,15 +412,20 @@
- 		urlService.registerHandler(this);
- 
- 		this.configurationService.onDidChangeConfiguration(e => {
--			if (e.affectsConfiguration(AutoUpdateConfigurationKey)) {
-+			if (e.affectsConfiguration(AutoUpdateConfigurationKey) || e.affectsConfiguration(ReceivesUpdatesConfigurationKey)) {
- 				if (this.isAutoUpdateEnabled()) {
- 					this.checkForUpdates();
- 				}
- 			}
-+<<<<<<< .our
- 			if (e.affectsConfiguration(AutoCheckUpdatesConfigurationKey)) {
- 				if (this.isAutoCheckUpdatesEnabled()) {
- 					this.checkForUpdates();
- 				}
-+=======
-+			if (e.affectsConfiguration(ReceivesUpdatesConfigurationKey)) {
-+				this.eventuallySyncWithGallery(true);
-+>>>>>>> .their
- 			}
- 		}, this, this.disposables);
- 
-@@ -601,7 +610,11 @@
- 	}
- 
- 	private isAutoUpdateEnabled(): boolean {
--		return this.configurationService.getValue(AutoUpdateConfigurationKey);
-+		return this.configurationService.getValue(AutoUpdateConfigurationKey) && this.isReceiveUpdatesEnabled();
-+	}
-+
-+	private isReceiveUpdatesEnabled(): boolean {
-+		return this.configurationService.getValue(ReceivesUpdatesConfigurationKey);
- 	}
- 
- 	private isAutoCheckUpdatesEnabled(): boolean {
-@@ -609,8 +622,15 @@
- 	}
- 
- 	private eventuallySyncWithGallery(immediate = false): void {
-+<<<<<<< .our
- 		const shouldSync = this.isAutoUpdateEnabled() || this.isAutoCheckUpdatesEnabled();
- 		const loop = () => (shouldSync ? this.syncWithGallery() : TPromise.as(null)).then(() => this.eventuallySyncWithGallery());
-+=======
-+		if (!this.isReceiveUpdatesEnabled()) {
-+			return;
-+		}
-+		const loop = () => this.syncWithGallery().then(() => this.eventuallySyncWithGallery());
-+>>>>>>> .their
- 		const delay = immediate ? 0 : ExtensionsWorkbenchService.SyncPeriod;
- 
- 		this.syncDelayer.trigger(loop, delay)
-changed in both
-  base   100644 f3f0e333ec4571e139487fd1e48baa35ba0dd6ad src/vs/workbench/parts/extensions/test/electron-browser/extensionsWorkbenchService.test.ts
-  our    100644 7da387ac880b0ed21957601ffcf9fbb9f1133d6f src/vs/workbench/parts/extensions/test/electron-browser/extensionsWorkbenchService.test.ts
-  their  100644 2a39f3d4cfe4e29d44142524305fc5e60308f0e2 src/vs/workbench/parts/extensions/test/electron-browser/extensionsWorkbenchService.test.ts
-@@ -11,7 +11,11 @@
- import { assign } from 'vs/base/common/objects';
- import { TPromise } from 'vs/base/common/winjs.base';
- import { generateUuid } from 'vs/base/common/uuid';
-+<<<<<<< .our
- import { IExtensionsWorkbenchService, ExtensionState, AutoCheckUpdatesConfigurationKey, AutoUpdateConfigurationKey } from 'vs/workbench/parts/extensions/common/extensions';
-+=======
-+import { IExtensionsWorkbenchService, ExtensionState, ReceivesUpdatesConfigurationKey } from 'vs/workbench/parts/extensions/common/extensions';
-+>>>>>>> .their
- import { ExtensionsWorkbenchService } from 'vs/workbench/parts/extensions/node/extensionsWorkbenchService';
- import {
- 	IExtensionManagementService, IExtensionGalleryService, IExtensionEnablementService, IExtensionTipsService, ILocalExtension, LocalExtensionType, IGalleryExtension,
-@@ -70,8 +74,13 @@
- 			onDidUpdateConfiguration: () => { },
- 			onDidChangeConfiguration: () => { },
- 			getConfiguration: () => ({}),
-+<<<<<<< .our
- 			getValue: (key) => {
- 				return (key === AutoCheckUpdatesConfigurationKey || key === AutoUpdateConfigurationKey) ? true : undefined;
-+=======
-+			getValue: (a) => {
-+				return a === ReceivesUpdatesConfigurationKey ? true : undefined;
-+>>>>>>> .their
- 			}
- 		});
- 
diff --git a/app/test/fixtures/merge-parser/vscode/merge-release-1.15-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-release-1.15-into-master.txt
deleted file mode 100644
index 23f9a0c6b3a..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-release-1.15-into-master.txt
+++ /dev/null
@@ -1,7653 +0,0 @@
-removed in local
-  base   100644 b607cda2d6906284eb97afa8830a2ba206abda89 extensions/emmet/npm-shrinkwrap.json
-  their  100644 68b2886e6d460a13ed2e34108781935bb6e8bfd4 extensions/emmet/npm-shrinkwrap.json
-changed in both
-  base   100644 0554a343e08820f227c63d01e01edc674301d78b extensions/emmet/package.json
-  our    100644 d9be62f74d1063d961b7895eab86495b34482691 extensions/emmet/package.json
-  their  100644 f9266ef067a387613b6912855dd99e9dd26c62ff extensions/emmet/package.json
-@@ -39,7 +39,11 @@
-                         "inMarkupAndStylesheetFilesOnly"
-                     ],
-                     "default": "always",
-+<<<<<<< .our
-                     "markdownDescription": "%emmetShowExpandedAbbreviation%"
-+=======
-+                    "description": "%emmetShowExpandedAbbreviation%"
-+>>>>>>> .their
-                 },
-                 "emmet.showAbbreviationSuggestions": {
-                     "type": "boolean",
-@@ -87,6 +91,7 @@
-                     "type": "boolean",
-                     "default": false,
-                     "description": "%emmetTriggerExpansionOnTab%"
-+<<<<<<< .our
-                 },
-                 "emmet.preferences": {
-                     "type": "object",
-@@ -216,6 +221,8 @@
-                     "type": "boolean",
-                     "default": true,
-                     "markdownDescription": "%emmetOptimizeStylesheetParsing%"
-+=======
-+>>>>>>> .their
-                 }
-             }
-         },
-@@ -446,6 +453,11 @@
-         "@emmetio/css-parser": "ramya-rao-a/css-parser#vscode",
-         "@emmetio/html-matcher": "^0.3.3",
-         "@emmetio/math-expression": "^0.1.1",
-+<<<<<<< .our
-+=======
-+        "vscode-emmet-helper": "^1.0.16",
-+        "vscode-languageserver-types": "^3.0.3",
-+>>>>>>> .their
-         "image-size": "^0.5.2",
-         "vscode-emmet-helper": "^1.2.11"
-     }
-changed in both
-  base   100644 5a21d5bc4790ef86ab1e71cb5bf337a469ab3263 extensions/emmet/package.nls.json
-  our    100644 3f3bf912fd84e40ee4fbf65592c9123e2f4d160a extensions/emmet/package.nls.json
-  their  100644 cafd59328708f3a4d33f9f213864c80eb69aeec3 extensions/emmet/package.nls.json
-@@ -24,6 +24,7 @@
- 	"command.incrementNumberByTen": "Increment by 10",
- 	"command.decrementNumberByTen": "Decrement by 10",
- 	"emmetSyntaxProfiles": "Define profile for specified syntax or use your own profile with specific rules.",
-+<<<<<<< .our
- 	"emmetExclude": "An array of languages where Emmet abbreviations should not be expanded.",
- 	"emmetExtensionsPath": "Path to a folder containing Emmet profiles and snippets.",
- 	"emmetShowExpandedAbbreviation": "Shows expanded Emmet abbreviations as suggestions.\nThe option `\"inMarkupAndStylesheetFilesOnly\"` applies to html, haml, jade, slim, xml, xsl, css, scss, sass, less and stylus.\nThe option `\"always\"` applies to all parts of the file regardless of markup/css.",
-@@ -56,3 +57,13 @@
- 	"emmetPreferencesCssFuzzySearchMinScore": "The minimum score (from 0 to 1) that fuzzy-matched abbreviation should achieve. Lower values may produce many false-positive matches, higher values may reduce possible matches.",
- 	"emmetOptimizeStylesheetParsing": "When set to `false`, the whole file is parsed to determine if current position is valid for expanding Emmet abbreviations. When set to `true`, only the content around the current position in css/scss/less files is parsed."
- }
-+=======
-+	"emmetExclude": "An array of languages where emmet abbreviations should not be expanded.",
-+	"emmetExtensionsPath": "Path to a folder containing emmet profiles and snippets.'",
-+	"emmetShowExpandedAbbreviation": "Shows expanded emmet abbreviations as suggestions.\nThe option \"inMarkupAndStylesheetFilesOnly\" applies to html, haml, jade, slim, xml, xsl, css, scss, sass, less and stylus.\nThe option \"always\" applies to all parts of the file regardless of markup/css.",
-+	"emmetShowAbbreviationSuggestions": "Shows possible emmet abbreviations as suggestions. Not applicable in stylesheets or when emmet.showExpandedAbbreviation is set to \"never\".",
-+	"emmetIncludeLanguages": "Enable emmet abbreviations in languages that are not supported by default. Add a mapping here between the language and emmet supported language.\n Eg: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
-+	"emmetVariables": "Variables to be used in emmet snippets",
-+	"emmetTriggerExpansionOnTab": "When enabled, emmet abbreviations are expanded when pressing TAB."
-+}
-+>>>>>>> .their
-changed in both
-  base   100644 c4b77df6514b93b64bef5b16bdf0ac1416da8d01 extensions/emmet/src/abbreviationActions.ts
-  our    100644 26444af31e5994ebc9cddebb9de151cacae3311b extensions/emmet/src/abbreviationActions.ts
-  their  100644 149e144c0689132e50cde174ec19d87589804a21 extensions/emmet/src/abbreviationActions.ts
-@@ -81,6 +81,7 @@
- 			}
- 		}
- 
-+<<<<<<< .our
- 		const firstLineOfSelection = editor.document.lineAt(rangeToReplace.start).text.substr(rangeToReplace.start.character);
- 		const matches = firstLineOfSelection.match(/^(\s*)/);
- 		const extraWhiteSpaceSelected = matches ? matches[1].length : 0;
-@@ -97,6 +98,15 @@
- 			textToWrapInPreview = rangeToReplace.isSingleLine ? [textToReplace] : ['\n\t' + textToReplace.split('\n' + preceedingWhiteSpace).join('\n\t') + '\n'];
- 		}
- 		textToWrapInPreview = textToWrapInPreview.map(e => e.replace(/(\$\d)/g, '\\$1'));
-+=======
-+			const firstLineOfSelection = editor.document.lineAt(rangeToReplace.start).text.substr(rangeToReplace.start.character);
-+			const matches = firstLineOfSelection.match(/^(\s*)/);
-+			const preceedingWhiteSpace = matches ? matches[1].length : 0;
-+
-+			rangeToReplace = new vscode.Range(rangeToReplace.start.line, rangeToReplace.start.character + preceedingWhiteSpace, rangeToReplace.end.line, rangeToReplace.end.character);
-+			expandAbbrList.push({ syntax, abbreviation, rangeToReplace, textToWrap: ['\n\t$TM_SELECTED_TEXT\n'] });
-+		});
-+>>>>>>> .their
- 
- 		return {
- 			previewRange: rangeToReplace,
-@@ -176,12 +186,31 @@
- 			return inPreview ? revertPreview().then(() => { return false; }) : Promise.resolve(inPreview);
- 		}
- 
-+<<<<<<< .our
- 		let extractedResults = helper.extractAbbreviationFromText(inputAbbreviation);
- 		if (!extractedResults) {
- 			return Promise.resolve(inPreview);
- 		} else if (extractedResults.abbreviation !== inputAbbreviation) {
- 			// Not clear what should we do in this case. Warn the user? How?
- 		}
-+=======
-+	return abbreviationPromise.then(inputAbbreviation => {
-+		if (!inputAbbreviation || !inputAbbreviation.trim() || !isAbbreviationValid(syntax, inputAbbreviation)) { return; }
-+
-+		let extractedResults = extractAbbreviationFromText(inputAbbreviation);
-+		if (!extractedResults) {
-+			return;
-+		}
-+
-+		let { abbreviation, filters } = extractedResults;
-+		let input: ExpandAbbreviationInput = {
-+			syntax,
-+			abbreviation,
-+			rangeToReplace: editor.selection,
-+			textToWrap: lines,
-+			filters
-+		};
-+>>>>>>> .their
- 
- 		let { abbreviation, filter } = extractedResults;
- 		if (definitive) {
-@@ -225,6 +254,7 @@
- 	});
- }
- 
-+<<<<<<< .our
- export function expandEmmetAbbreviation(args: any): Thenable<boolean | undefined> {
- 	if (!validate() || !vscode.window.activeTextEditor) {
- 		return fallbackTab();
-@@ -241,6 +271,11 @@
- 	}
- 	const syntax = getSyntaxFromArgs(args);
- 	if (!syntax) {
-+=======
-+export function expandEmmetAbbreviation(args): Thenable<boolean> {
-+	const syntax = getSyntaxFromArgs(args);
-+	if (!syntax || !validate()) {
-+>>>>>>> .their
- 		return fallbackTab();
- 	}
- 
-@@ -253,6 +288,14 @@
- 		rootNode = parseDocument(editor.document, false);
- 	}
- 
-+<<<<<<< .our
-+=======
-+	let rootNode = parseDocument(editor.document);
-+	if (!rootNode) {
-+		return fallbackTab();
-+	}
-+
-+>>>>>>> .their
- 	// When tabbed on a non empty selection, do not treat it as an emmet abbreviation, and fallback to tab instead
- 	if (vscode.workspace.getConfiguration('emmet')['triggerExpansionOnTab'] === true && editor.selections.find(x => !x.isEmpty)) {
- 		return fallbackTab();
-@@ -267,11 +310,19 @@
- 		let rangeToReplace: vscode.Range = selection;
- 		let abbr = document.getText(rangeToReplace);
- 		if (!rangeToReplace.isEmpty) {
-+<<<<<<< .our
- 			let extractedResults = helper.extractAbbreviationFromText(abbr);
- 			if (extractedResults) {
- 				return [rangeToReplace, extractedResults.abbreviation, extractedResults.filter];
- 			}
- 			return [null, '', ''];
-+=======
-+			let extractedResults = extractAbbreviationFromText(abbr);
-+			if (extractedResults) {
-+				return [rangeToReplace, extractedResults.abbreviation, extractedResults.filters];
-+			}
-+			return [null, '', []];
-+>>>>>>> .their
- 		}
- 
- 		const currentLine = editor.document.lineAt(position.line).text;
-@@ -287,6 +338,7 @@
- 				return [rangeToReplace, abbr, ''];
- 			}
- 		}
-+<<<<<<< .our
- 		let extractedResults = helper.extractAbbreviation(editor.document, position, false);
- 		if (!extractedResults) {
- 			return [null, '', ''];
-@@ -294,6 +346,15 @@
- 
- 		let { abbreviationRange, abbreviation, filter } = extractedResults;
- 		return [new vscode.Range(abbreviationRange.start.line, abbreviationRange.start.character, abbreviationRange.end.line, abbreviationRange.end.character), abbreviation, filter];
-+=======
-+		let extractedResults = extractAbbreviation(editor.document, position, false);
-+		if (!extractedResults) {
-+			return [null, '', []];
-+		}
-+
-+		let { abbreviationRange, abbreviation, filters } = extractedResults;
-+		return [new vscode.Range(abbreviationRange.start.line, abbreviationRange.start.character, abbreviationRange.end.line, abbreviationRange.end.character), abbreviation, filters];
-+>>>>>>> .their
- 	};
- 
- 	let selectionsInReverseOrder = editor.selections.slice(0);
-@@ -305,8 +366,16 @@
- 
- 	selectionsInReverseOrder.forEach(selection => {
- 		let position = selection.isReversed ? selection.anchor : selection.active;
-+<<<<<<< .our
- 		let [rangeToReplace, abbreviation, filter] = getAbbreviation(editor.document, selection, position, syntax);
- 		if (!rangeToReplace) {
-+=======
-+		let [rangeToReplace, abbreviation, filters] = getAbbreviation(editor.document, selection, position, syntax === 'html');
-+		if (!rangeToReplace) {
-+			return;
-+		}
-+		if (!isAbbreviationValid(syntax, abbreviation)) {
-+>>>>>>> .their
- 			return;
- 		}
- 		if (!helper.isAbbreviationValid(syntax, abbreviation)) {
-@@ -349,11 +418,18 @@
- 	});
- }
- 
-+<<<<<<< .our
- function fallbackTab(): Thenable<boolean | undefined> {
- 	if (vscode.workspace.getConfiguration('emmet')['triggerExpansionOnTab'] === true) {
- 		return vscode.commands.executeCommand('tab');
- 	}
- 	return Promise.resolve(true);
-+=======
-+function fallbackTab(): Thenable<boolean> {
-+	if (vscode.workspace.getConfiguration('emmet')['triggerExpansionOnTab'] === true) {
-+		return vscode.commands.executeCommand('tab');
-+	}
-+>>>>>>> .their
- }
- /**
-  * Checks if given position is a valid location to expand emmet abbreviation.
-@@ -365,7 +441,16 @@
-  * @param position position to validate
-  * @param abbreviationRange The range of the abbreviation for which given position is being validated
-  */
-+<<<<<<< .our
- export function isValidLocationForEmmetAbbreviation(document: vscode.TextDocument, rootNode: Node | undefined, currentNode: Node | null, syntax: string, position: vscode.Position, abbreviationRange: vscode.Range): boolean {
-+=======
-+export function isValidLocationForEmmetAbbreviation(currentNode: Node, syntax: string, position: vscode.Position): boolean {
-+	// Continue validation only if the file was parse-able and the currentNode has been found
-+	if (!currentNode) {
-+		return true;
-+	}
-+
-+>>>>>>> .their
- 	if (isStyleSheet(syntax)) {
- 		const stylesheet = <Stylesheet>rootNode;
- 		if (stylesheet && (stylesheet.comments || []).some(x => position.isAfterOrEqual(x.start) && position.isBeforeOrEqual(x.end))) {
-@@ -595,6 +680,7 @@
- 
- 	try {
- 		// Expand the abbreviation
-+<<<<<<< .our
- 		let expandedText;
- 
- 		if (input.textToWrap) {
-@@ -618,6 +704,19 @@
- 			expandedText = expandedText.replace('\\$TM_SELECTED_TEXT', '$TM_SELECTED_TEXT');
- 		} else {
- 			expandedText = helper.expandAbbreviation(input.abbreviation, expandOptions);
-+=======
-+		let expandedText = expandAbbreviation(input.abbreviation, expandOptions);
-+
-+		if (input.textToWrap) {
-+			// All $anyword would have been escaped by the emmet helper.
-+			// Remove the escaping backslash from $TM_SELECTED_TEXT so that VS Code Snippet controller can treat it as a variable
-+			expandedText = expandedText.replace('\\$TM_SELECTED_TEXT', '$TM_SELECTED_TEXT');
-+
-+			// If the expanded text is single line then we dont need the \t and \n we added to $TM_SELECTED_TEXT earlier
-+			if (input.textToWrap.length === 1 && expandedText.indexOf('\n') === -1) {
-+				expandedText = expandedText.replace(/\s*\$TM_SELECTED_TEXT\s*/, '$TM_SELECTED_TEXT');
-+			}
-+>>>>>>> .their
- 		}
- 
- 		return expandedText;
-changed in both
-  base   100644 7fd535a341855a42d7a5ee3a8bc147cfcd37f989 extensions/emmet/src/defaultCompletionProvider.ts
-  our    100644 92888ea1c4be910d2e4ccaa101d3cfb8349a410d extensions/emmet/src/defaultCompletionProvider.ts
-  their  100644 28adbadfb7a8ce0088e26d35b089b01798941d2d extensions/emmet/src/defaultCompletionProvider.ts
-@@ -55,6 +55,7 @@
- 			return;
- 		}
- 
-+<<<<<<< .our
- 		const helper = getEmmetHelper();
- 		let validateLocation = syntax === 'html' || syntax === 'jsx' || syntax === 'xml';
- 		let rootNode: Node | undefined = undefined;
-@@ -73,6 +74,24 @@
- 					default:
- 						break;
- 				}
-+=======
-+		let result: vscode.CompletionList = doComplete(document, position, syntax, getEmmetConfiguration());
-+		let newItems: vscode.CompletionItem[] = [];
-+		if (result && result.items) {
-+			result.items.forEach(item => {
-+				let newItem = new vscode.CompletionItem(item.label);
-+				newItem.documentation = item.documentation;
-+				newItem.detail = item.detail;
-+				newItem.insertText = new vscode.SnippetString(item.textEdit.newText);
-+				let oldrange = item.textEdit.range;
-+				newItem.range = new vscode.Range(oldrange.start.line, oldrange.start.character, oldrange.end.line, oldrange.end.character);
-+
-+				newItem.filterText = item.filterText;
-+				newItem.sortText = item.sortText;
-+				newItems.push(newItem);
-+			});
-+		}
-+>>>>>>> .their
- 
- 			}
- 			if (validateLocation) {
-removed in local
-  base   100644 693a00ba7eba4b5988dce6a9274d3428a4c4367a extensions/markdown/src/security.ts
-  their  100644 5c269f7fb265567db8f70e23511e2e2d17400312 extensions/markdown/src/security.ts
-changed in both
-  base   100644 a6d0d75c963a08dc07b7f6a47e52060a07594f56 i18n/chs/extensions/emmet/package.i18n.json
-  our    100644 5cf0382870fbe5abfd1dea23749ad88b51794f9a i18n/chs/extensions/emmet/package.i18n.json
-  their  100644 53857769751cbd8f1495077242e9f636d23bfa8f i18n/chs/extensions/emmet/package.i18n.json
-@@ -32,6 +32,7 @@
- 	"command.decrementNumberByTen": "减少 10",
- 	"emmetSyntaxProfiles": "为指定的语法定义配置文件或使用带有特定规则的配置文件。",
- 	"emmetExclude": "不应展开 Emmet 缩写的语言数组。",
-+<<<<<<< .our
- 	"emmetExtensionsPath": "包含 Emmet 配置文件与代码片段的文件夹路径。",
- 	"emmetShowExpandedAbbreviation": "在建议中显示展开的 Emmet 缩写。\n选择 \"inMarkupAndStylesheetFilesOnly\" 选项将仅应用于 html、haml、jade、slim、xml、xsl、css、scss、sass、less 和 stylus 文件。\n选择 \"always\" 选项将应用于所有适用文件不限于标记或 CSS 的所有部分。",
- 	"emmetShowAbbreviationSuggestions": "显示可能的 Emmet 缩写作为建议。在样式表中或当 emmet.showExpandedAbbreviation 设置为 \"never\" 时不适用。",
-@@ -62,4 +63,11 @@
- 	"emmetPreferencesCssMsProperties": "Emmet 缩写中使用的由 \"-\" 打头有 \"ms\" 前缀的 CSS 属性，使用半角逗号 (\",\") 进行分隔。若要始终避免 \"ms\" 前缀，请设为空字符串。",
- 	"emmetPreferencesCssFuzzySearchMinScore": "显示的缩写模糊匹配应达到的最低分数 (0 到 1 之间)。较低的值可能使匹配错误变多，较高的值可能将不会显示应有的匹配项。",
- 	"emmetOptimizeStylesheetParsing": "当设置为 false 时，将分析整个文件并确定当前位置能否展开 Emmet 缩写。当设置为 true 时，则仅在 CSS/SCSS/LESS 文件中进行分析。"
-+=======
-+	"emmetExtensionsPath": "包含 Emmet 配置文件、片段和首选项的文件夹路径。当 emmet.useNewEmmet 设置为 true 时，只有配置文件才服从于扩展路径。",
-+	"emmetShowExpandedAbbreviation": "显示扩展的 Emmet 缩写作为建议。\n\"inMarkupAndStylesheetFilesOnly\" 选项适用于 html、haml、jade、slim、xml、xsl、css、scss、sass、less 和 stylus。\n\"always\" 选项适用于 markup/css 文件的所有部分。",
-+	"emmetShowAbbreviationSuggestions": "显示可能的 Emmet 缩写作为建议。在风格表中或将 emmet.showExpandedAbbreviation 设置为 \"never\" 时不适用。",
-+	"emmetIncludeLanguages": "启用使用默认不支持的语言的 Emmet 缩写。在此添加该语言与支持 Emmet 的语言之间的映射。示例: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
-+	"emmetVariables": "要用于 Emmet 代码片段的变量"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f7e87a0d5613a93f1778451f22a9c696ea636c42 i18n/chs/extensions/extension-editing/out/extensionLinter.i18n.json
-  our    100644 605e80db79201225087dde7ac9e675add872dd3b i18n/chs/extensions/extension-editing/out/extensionLinter.i18n.json
-  their  100644 6e684ea67b036fdc53762cb4d272038abb22240d i18n/chs/extensions/extension-editing/out/extensionLinter.i18n.json
-changed in both
-  base   100644 0ceae1d9a5946647bfe2526b3781b45d55016c3a i18n/chs/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 1be88d0e515057ba8dbf0bcd7cef8fa6af9d6bf5 i18n/chs/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 19796927f10244781c199383bb70e4a1f76adb89 i18n/chs/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -9,7 +9,20 @@
- 	"openFile": "打开文件...",
- 	"openFolder": "打开文件夹...",
- 	"openFileFolder": "打开...",
-+<<<<<<< .our
- 	"globalRemoveFolderFromWorkspace": "将文件夹从工作区删除…",
-+=======
-+	"reload": "重新加载(&&R)",
-+	"cancel": "取消",
-+	"newWorkspaceFormExisting": "从现有内容新建工作区...",
-+	"select": "选择(&&S)",
-+	"selectWorkspace": "选择文件夹作为工作区",
-+	"addSupported": "需要重载窗口以打开多个文件夹。",
-+	"addFolderToWorkspace": "将文件夹添加到工作区...",
-+	"add": "添加(&&A)",
-+	"addFolderToWorkspaceTitle": "将文件夹添加到工作区",
-+	"removeFolderFromWorkspace": "将文件夹从工作区删除",
-+>>>>>>> .their
- 	"saveWorkspaceAsAction": "将工作区另存为...",
- 	"save": "保存(&&S)",
- 	"saveWorkspace": "保存工作区",
-changed in both
-  base   100644 943141ce567d4721646ac0c798f2baea84327923 i18n/chs/src/vs/workbench/common/theme.i18n.json
-  our    100644 9dff140c48c8d58d62f0adab067f1886bd30d318 i18n/chs/src/vs/workbench/common/theme.i18n.json
-  their  100644 4de0f24ff61fc0510e2ce3259a870dac25b1a462 i18n/chs/src/vs/workbench/common/theme.i18n.json
-changed in both
-  base   100644 f5089c0197a26c4bbd1c666ddf37ce03370a74a2 i18n/chs/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  our    100644 cd6b52432c5724bdc5e159734ac7ba787ed23e4f i18n/chs/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  their  100644 9852244f28dacb2c84d171cecdb4d3d4bcebc685 i18n/chs/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-merged
-  result 100644 83e026a7dbde35f88978675b2be3664004a8becc i18n/chs/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-  our    100644 c14acb9c9cd8f882d969fa957f2f4f98e2fb2c74 i18n/chs/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-@@ -7,8 +7,5 @@
- 	"emmetConfigurationTitle": "Emmet",
- 	"triggerExpansionOnTab": "启用后，按 TAB 键时，将展开 Emmet 缩写。若 emmet.useNewemmet 设置为 true，则不适用。",
- 	"emmetPreferences": "用于修改 Emmet 的某些操作和解决程序的行为的首选项。若 emmet.useNewemmet 设置为 true，则不适用。",
--	"emmetSyntaxProfiles": "为指定的语法定义配置文件或使用带有特定规则的配置文件。",
--	"emmetExclude": "不应展开 Emmet 缩写的语言数组。",
--	"emmetExtensionsPath": "包含 Emmet 配置文件、片段和首选项的文件夹路径。当 emmet.useNewEmmet 设置为 true 时，只有配置文件才服从于扩展路径。",
- 	"useNewEmmet": "试用新版 Emmet 模块（最终会替换旧版单一 Emmet 库）体验所有 Emmet 功能。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 d2cf1b98e7bca78448a1d13455adcefc22cc2116 i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 9fc53ead3b405eb141c09e4bad1572eca1cf588a i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 c70f6d72be0b60635995433f666a9f066341c6e8 i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -14,4 +15,19 @@
- 	"editTtile": "编辑",
- 	"replaceDefaultValue": "在设置中替换",
- 	"copyDefaultValue": "复制到设置"
-+=======
-+	"emptyUserSettingsHeader": "将设置放入此处以覆盖\"默认设置\"。",
-+	"errorInvalidConfiguration": "无法写入设置。请更正文件中的错误/警告，然后重试。",
-+	"emptyWorkspaceSettingsHeader": "将设置放入此处以覆盖\"用户设置\"。",
-+	"emptyFolderSettingsHeader": "将文件夹设置放入此处以覆盖\"工作区设置\"。",
-+	"defaultFolderSettingsTitle": "默认文件夹设置",
-+	"defaultSettingsTitle": "默认设置",
-+	"noSettingsFound": "未找到设置。",
-+	"editTtile": "编辑",
-+	"replaceDefaultValue": "在设置中替换",
-+	"copyDefaultValue": "复制到设置",
-+	"unsupportedPHPExecutablePathSetting": "此设置必须是“用户设置”。若要为工作区配置 PHP，请打开 PHP 文件并单击状态栏中的“PHP 路径”。",
-+	"unsupportedWorkspaceSetting": "此设置必须是“用户设置”。",
-+	"unsupportedWorkbenchSetting": "当前无法应用此设置。将在直接打开此文件夹时应用。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 5645f876d2193e91958c02bff92bb4a6803f7a7c i18n/chs/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 db5d7a07f49a26b2f7df503221d63078c01a6dc6 i18n/chs/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 6af8f4d75746d980b519ffb0667be5367759b938 i18n/chs/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"nextSearchIncludePattern": "显示下一个搜索包含模式",
- 	"previousSearchIncludePattern": "显示上一个搜索包含模式",
- 	"nextSearchExcludePattern": "显示下一个搜索排除模式",
-changed in both
-  base   100644 8bdf54da1723935aabcb23ff3ce14ab06cd4681a i18n/chs/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  our    100644 e6d06592621a01e4beede22526fb784dff427ca8 i18n/chs/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  their  100644 c8d357bdaa13bba222e6542933370045337a5ada i18n/chs/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-changed in both
-  base   100644 b447c9db51b05b9f6cc60d69b91992254d55eefa i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 c2fbe4fef10dc5236ff5c8da48376f2ca681d709 i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 fc4722516d18e4e3d99911a7174ddd4a80b93688 i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-changed in both
-  base   100644 c8746db7afb2f9dede27bb908bf2db91ff4b46aa i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 1becbfa0f08ad931e9c32c280588da0196edc807 i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 8927bceddff2468bcd5867977ccb18abbf2e6161 i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -14,8 +14,11 @@
- 	"workbench.action.terminal.selectAll": "全选",
- 	"workbench.action.terminal.deleteWordLeft": "删除左侧的字符",
- 	"workbench.action.terminal.deleteWordRight": "删除右侧的字符",
-+<<<<<<< .our
- 	"workbench.action.terminal.moveToLineStart": "移动到行首",
- 	"workbench.action.terminal.moveToLineEnd": "移动到行尾",
-+=======
-+>>>>>>> .their
- 	"workbench.action.terminal.new": "新建集成终端",
- 	"workbench.action.terminal.new.short": "新的终端",
- 	"workbench.action.terminal.newWorkspacePlaceholder": "选择当前工作目录新建终端",
-@@ -51,6 +54,7 @@
- 	"workbench.action.terminal.rename.prompt": "输入终端名称",
- 	"workbench.action.terminal.focusFindWidget": "聚焦于查找小组件",
- 	"workbench.action.terminal.hideFindWidget": "隐藏查找小组件",
-+<<<<<<< .our
- 	"nextTerminalFindTerm": "显示下一个搜索结果",
- 	"previousTerminalFindTerm": "显示上一个搜索结果",
- 	"quickOpenTerm": "切换活动终端",
-@@ -60,4 +64,7 @@
- 	"workbench.action.terminal.selectToNextCommand": "选择下一条命令所有内容",
- 	"workbench.action.terminal.selectToPreviousLine": "选择上一行的所有内容",
- 	"workbench.action.terminal.selectToNextLine": "选择下一行的所有内容"
-+=======
-+	"quickOpenTerm": "切换活动终端"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8459b7e494edb1c30730b8ceded6b56cf3264c46 i18n/chs/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 34456c16f6384eecbdba1d3ed14696eac3704dab i18n/chs/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 c6b32fc84ff21cf64df959972c6c0fe7e14fc4ca i18n/chs/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -11,7 +11,12 @@
- 	"read the release notes": "欢迎使用 {0} v{1}! 是否要阅读发布说明?",
- 	"licenseChanged": "我们对许可条款进行了修改，请点击[此处]({0})进行查看。",
- 	"neveragain": "不再显示",
-+<<<<<<< .our
- 	"64bitisavailable": "Windows 64 位版的 {0} 已经发布! 单击[这里]({1})了解更多信息。",
-+=======
-+	"64bitisavailable": "{0} 的 Windows 64 位版本现已可用！",
-+	"learn more": "了解详细信息",
-+>>>>>>> .their
- 	"updateIsReady": "有新的 {0} 的更新可用。",
- 	"noUpdatesAvailable": "当前没有可用的更新。",
- 	"ok": "确定",
-changed in both
-  base   100644 5c2a2259104469dd55dc43a50fd2eeec436a1a22 i18n/chs/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-  our    100644 52ac27ba5d7a4b2f7d1d4e2c5075a744dd7c1778 i18n/chs/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-  their  100644 1f422ca6c00315353adf89a4f14f0e70264ac79c i18n/chs/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-changed in both
-  base   100644 4d604a72c835d54e1575a1ffa0407933349033f1 i18n/chs/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  our    100644 2eb80022de4425a068a5199e1996a315ca606b51 i18n/chs/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  their  100644 2608d40b7c8c8dbbacd6272f7b88fee4a057edb0 i18n/chs/src/vs/workbench/services/configuration/node/configuration.i18n.json
-@@ -9,6 +9,7 @@
- 	"scope.window.description": "特定于窗口的配置，可在“用户”或“工作区”设置中配置。",
- 	"scope.resource.description": "特定于资源的配置，可在“用户”、“工作区”或“文件夹”设置中配置。",
- 	"scope.description": "配置适用的范围。可用范围有“窗口”和“资源”。",
-+<<<<<<< .our
- 	"vscode.extension.contributes.configuration": "用于配置字符串。",
- 	"invalid.title": "configuration.title 必须是字符串",
- 	"vscode.extension.contributes.defaultConfiguration": "按语言提供默认编辑器配置设置。",
-@@ -21,4 +22,13 @@
- 	"workspaceConfig.settings.description": "工作区设置",
- 	"workspaceConfig.extensions.description": "工作区扩展",
- 	"unknownWorkspaceProperty": "未知的工作区配置属性"
-+=======
-+	"invalid.type": "如果进行设置，\"configuration.type\" 必须设置为对象",
-+	"invalid.title": "configuration.title 必须是字符串",
-+	"vscode.extension.contributes.defaultConfiguration": "按语言提供默认编辑器配置设置。",
-+	"invalid.properties": "configuration.properties 必须是对象",
-+	"workspaceConfig.id.description": "工作区标识符。用于存储工作区内部状态。修改标识符可能导致内部状态丢失。",
-+	"workspaceConfig.folders.description": "要在工作区中加载的文件夹列表。必须为文件夹完整路径。例如 \"file:///root/folderA\"",
-+	"workspaceConfig.settings.description": "工作区设置"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c709a1e567fc8500f1f0dec05a1a28a7ffdb194d i18n/chs/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 5acf3a0fa36fa93c78f58cdf2d0b020db420fb68 i18n/chs/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 d494104435ec40cf64fa87ef1b1e4e1ac0638cfd i18n/chs/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -9,6 +9,7 @@
- 	"openTasksConfiguration": "打开任务配置",
- 	"openLaunchConfiguration": "打开启动配置",
- 	"open": "打开设置",
-+<<<<<<< .our
- 	"saveAndRetry": "保存并重试",
- 	"errorUnknownKey": "没有注册配置 {1}，因此无法写入 {0}。",
- 	"errorInvalidWorkspaceConfigurationApplication": "无法将 {0} 写入“工作区设置”。此设置只能写于“用户设置”。",
-@@ -27,6 +28,19 @@
- 	"errorConfigurationFileDirty": "用户设置文件已变更，无法写入。请先保存此文件，然后重试。",
- 	"errorConfigurationFileDirtyWorkspace": "工作区设置文件已变更，无法写入。请先保存此文件，然后重试。",
- 	"errorConfigurationFileDirtyFolder": "文件夹设置文件已变更，无法写入。请先保存“{0}”文件夹设置文件，然后重试。",
-+=======
-+	"close": "关闭",
-+	"saveAndRetry": "保存设置并重试",
-+	"errorUnknownKey": "没有注册配置 {1}，因此无法写入 {0}。",
-+	"errorInvalidFolderConfiguration": "{0} 不支持文件夹资源域，因此无法写入\"文件夹设置\"。",
-+	"errorInvalidUserTarget": "{0} 不支持全局域，因此无法写入\"用户设置\"。",
-+	"errorInvalidFolderTarget": "未提供资源，因此无法写入\"文件夹设置\"。",
-+	"errorNoWorkspaceOpened": "没有打开任何工作区，因此无法写入 {0}。请先打开一个工作区，然后重试。",
-+	"errorInvalidConfiguration": "无法写入设置。请打开 **用户设置** 更正文件中的错误/警告，然后重试。",
-+	"errorInvalidConfigurationWorkspace": "无法写入设置。请打开 **工作区设置** 更正文件中的错误/警告，然后重试。",
-+	"errorConfigurationFileDirty": "文件已变更，因此无法写入设置。请先保存 **用户设置** 文件，然后重试。",
-+	"errorConfigurationFileDirtyWorkspace": "文件已变更，因此无法写入设置。请先保存 **工作区设置** 文件，然后重试。",
-+>>>>>>> .their
- 	"userTarget": "用户设置",
- 	"workspaceTarget": "工作区设置",
- 	"folderTarget": "文件夹设置"
-changed in both
-  base   100644 a35321b4655c4f000dafff5aa8edca576c732397 i18n/cht/extensions/emmet/package.i18n.json
-  our    100644 b3dc8be8bb9ec8fba170590d50c4692dadd9f40f i18n/cht/extensions/emmet/package.i18n.json
-  their  100644 fbee2df0322efb1dfe093f8d3df15896eee6023f i18n/cht/extensions/emmet/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -9,6 +10,8 @@
- 	"description": "VS Code 的 Emnet 支援",
- 	"command.wrapWithAbbreviation": "使用縮寫換行",
- 	"command.wrapIndividualLinesWithAbbreviation": "使用縮寫換每一行",
-+=======
-+>>>>>>> .their
- 	"command.removeTag": "移除標籤",
- 	"command.updateTag": "更新標記",
- 	"command.matchTag": "前往相符的配對",
-@@ -32,6 +35,7 @@
- 	"command.decrementNumberByTen": "依 10 遞減",
- 	"emmetSyntaxProfiles": "為指定的語法定義設定檔，或透過特定規則使用自己的設定檔。",
- 	"emmetExclude": "不應展開 Emmet 縮寫的語言陣列。",
-+<<<<<<< .our
- 	"emmetExtensionsPath": "包含 Emmet 設定檔及程式碼片段的資料夾路徑",
- 	"emmetShowExpandedAbbreviation": "顯示建議之展開的 Emmet 縮寫。\n\"inMarkupAndStylesheetFilesOnly\" 選項適用於 html、haml、jade、slim、xml、xsl、css、scss、sass、less 和 stylus。\n不論 markup/css 為何，該選項「一律」適用於檔案的所有部分。",
- 	"emmetShowAbbreviationSuggestions": "顯示建議可能的 Emmet 縮寫。但在樣式表內或 emmet.showExpandedAbbreviation 設為「永不」時，則不適用。",
-@@ -62,4 +66,11 @@
- 	"emmetPreferencesCssMsProperties": "在以 `-` 開頭的 Emmet 縮寫中使用時，會取得 'ms' 廠商前綴的逗點分隔 CSS 屬性。設定為空白字串可避免總是取得 'ms' 前綴。",
- 	"emmetPreferencesCssFuzzySearchMinScore": "模糊比對的縮寫應該達到最低分數(從 0 到 1)。較低數值可能產生錯誤的比對，較高的數值可能會降低可能的比對。",
- 	"emmetOptimizeStylesheetParsing": "當設定為 false 時，將解析整個檔案以確定目前的位置是否適用於展開 Emmet 縮寫。當設定為 true 時，僅會解析 css/scss/less 檔案中目前位置周圍的內容。"
-+=======
-+	"emmetExtensionsPath": "前往包含 Emmet 設定檔、程式碼片段和喜好設定的資料夾之路徑。emmet.useNewEmmet 設定為 True 時，從延伸模組路徑只會接受設定檔。",
-+	"emmetShowExpandedAbbreviation": "顯示建議之展開的 Emmet 縮寫\n\"inMarkupAndStylesheetFilesOnly\" 選項適用於 html、haml、jade、slim、xml、xsl、css、scss、sass、less 和 stylus。\n不論標記/css 為何，該選項「一律」適用於檔案的所有部分。",
-+	"emmetShowAbbreviationSuggestions": "顯示建議之可能的 Emmet 縮寫。但在樣式表內，或若 emmet.showExpandedAbbreviation 設為「永不」，則不適用。",
-+	"emmetIncludeLanguages": "以預設未支援的語言啟用 Emmet 縮寫。在此新增該語言和 Emmet 支援的語言間之對應。例如: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"} ",
-+	"emmetVariables": "要在 Emmet 程式碼片段中使用的變數"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 425005b7245b29437530f465ed04ae81f8e30d2b i18n/cht/extensions/extension-editing/out/extensionLinter.i18n.json
-  our    100644 67c98d58805f7a295d9a615f22f783bfecb27575 i18n/cht/extensions/extension-editing/out/extensionLinter.i18n.json
-  their  100644 7816e127fc1c804089c73876711e1c552a6b1a63 i18n/cht/extensions/extension-editing/out/extensionLinter.i18n.json
-changed in both
-  base   100644 85a64933fccf24a4f29fad60c350d6d6b6dc7223 i18n/cht/extensions/markdown/out/previewContentProvider.i18n.json
-  our    100644 66d0022701855bf94d8cff40c0e868eeb6fbb549 i18n/cht/extensions/markdown/out/previewContentProvider.i18n.json
-  their  100644 c1054297c7b4a27dc3511459f245e4943d7fe448 i18n/cht/extensions/markdown/out/previewContentProvider.i18n.json
-@@ -4,7 +4,11 @@
-  *--------------------------------------------------------------------------------------------*/
- // Do not edit this file. It is machine generated.
- {
-+<<<<<<< .our
- 	"preview.securityMessage.text": "此文件中的部分內容已停用",
-+=======
-+	"preview.securityMessage.text": "此文件已停用部分內容",
-+>>>>>>> .their
- 	"preview.securityMessage.title": "Markdown 預覽中已停用可能不安全或不安全的內容。請將 Markdown 預覽的安全性設定變更為允許不安全內容，或啟用指令碼",
- 	"preview.securityMessage.label": "內容已停用安全性警告"
- }
-\ No newline at end of file
-changed in both
-  base   100644 9cec2a47a614c3e7fb8cc674197151a62343a068 i18n/cht/extensions/markdown/out/security.i18n.json
-  our    100644 cc4260be39fbcfcea114d06109122da15a50bcfa i18n/cht/extensions/markdown/out/security.i18n.json
-  their  100644 fdfc62ce17ce6b1aa23f39d458b4d2e7b499d11d i18n/cht/extensions/markdown/out/security.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -16,5 +17,11 @@
- 	"enableSecurityWarning.title": "允許此工作區預覽安全性警告",
- 	"disableSecurityWarning.title": "不允許此工作區預覽安全性警告",
- 	"toggleSecurityWarning.description": "不影響內容安全性層級",
-+=======
-+	"preview.showPreviewSecuritySelector.strictTitle": "嚴謹。僅載入安全內容。",
-+	"preview.showPreviewSecuritySelector.currentSelection": "目前的設定",
-+	"preview.showPreviewSecuritySelector.insecureContentTitle": "允許通過 http 載入內容。",
-+	"preview.showPreviewSecuritySelector.scriptsAndAllContent": "允許執行所有內容與指令碼。不建議使用。",
-+>>>>>>> .their
- 	"preview.showPreviewSecuritySelector.title": "選擇此工作區 Markdown 預覽的安全性設定"
- }
-\ No newline at end of file
-changed in both
-  base   100644 74cbc6cffe4b82151105822fcca16e895e57e623 i18n/cht/extensions/npm/package.i18n.json
-  our    100644 e1e497559e0002c1cb7f8161b65cf930f3fd8de7 i18n/cht/extensions/npm/package.i18n.json
-  their  100644 439c8e3bb279cb260144c8e604499d17123648e4 i18n/cht/extensions/npm/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -23,4 +24,8 @@
- 	"command.debug": "偵錯",
- 	"command.openScript": "開啟",
- 	"command.runInstall": "執行安裝"
-+=======
-+	"config.npm.autoDetect": "控制是否自動檢測npm腳本.預設為開啟.",
-+	"config.npm.runSilent": "以 '--silent' 選項執行 npm 命令 "
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/cht/extensions/typescript/out/features/taskProvider.i18n.json
-  our    100644 61ba5737e640ec966e3c9ef97217c53e5e9c01d7 i18n/cht/extensions/typescript/out/features/taskProvider.i18n.json
-  their  100644 f6e962d5d7df1fe1f2dee61c7d44967c93474465 i18n/cht/extensions/typescript/out/features/taskProvider.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,14 @@
- 	],
- 	"buildTscLabel": "建置 - {0}",
- 	"buildAndWatchTscLabel": "監看 - {0}"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"buildAndWatchTscLabel": "監看 - {0}",
-+	"buildTscLabel": "建置 - {0}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/cht/src/vs/code/electron-main/auth.i18n.json
-  our    100644 e6c89f97dd816e01883006cafe664b6545677fcd i18n/cht/src/vs/code/electron-main/auth.i18n.json
-  their  100644 3eef49744675b6c6becc10eb0aac908b1a6156e1 i18n/cht/src/vs/code/electron-main/auth.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"authRequire": "必須進行 Proxy 驗證 ",
- 	"proxyauth": "Proxy {0} 必須進行驗證。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 6448fc6cba36fe8cbb7277b9fc0b12a416ab579d i18n/cht/src/vs/code/electron-main/menus.i18n.json
-  our    100644 5f037b2a895deac7820d5f0872d4b9af5505b797 i18n/cht/src/vs/code/electron-main/menus.i18n.json
-  their  100644 3adbeb6bf92d74ff6b76607d8da558be0f6ff064 i18n/cht/src/vs/code/electron-main/menus.i18n.json
-@@ -24,12 +24,21 @@
- 	"miQuit": "結束 {0}",
- 	"miNewFile": "新增檔案(&&N)",
- 	"miOpen": "開啟(&&O)...",
-+<<<<<<< .our
- 	"miOpenWorkspace": "開啟工作區 (&&k)...",
- 	"miOpenFolder": "開啟資料夾(&&F)...",
- 	"miOpenFile": "開啟檔案(&&O)...",
- 	"miOpenRecent": "開啟最近的檔案(&&R)",
- 	"miSaveWorkspaceAs": "另存工作區為...",
- 	"miAddFolderToWorkspace": "新增資料夾至工作區 (&&A)...",
-+=======
-+	"miOpenWorkspace": "開啟工作區(&&O)...",
-+	"miOpenFolder": "開啟資料夾(&&F)...",
-+	"miOpenFile": "開啟檔案(&&O)...",
-+	"miOpenRecent": "開啟最近的檔案(&&R)",
-+	"miSaveWorkspaceAs": "將工作區另存為(&&S)...",
-+	"miAddFolderToWorkspace": "將資料夾新增到工作區(&&A)",
-+>>>>>>> .their
- 	"miSave": "儲存(&&S)",
- 	"miSaveAs": "另存新檔(&&A)...",
- 	"miSaveAll": "全部儲存(&&L)",
-@@ -176,7 +185,11 @@
- 	"miPrivacyStatement": "隱私權聲明(&&P)",
- 	"miAbout": "關於(&&A)",
- 	"miRunTask": "執行工作(&&R)",
-+<<<<<<< .our
- 	"miBuildTask": "執行建置工作(&&B)...",
-+=======
-+	"miBuildTask": " 執行建置工作(&&B)...",
-+>>>>>>> .their
- 	"miRunningTask": "顯示執行中的工作(&&G)...",
- 	"miRestartTask": "重新開始執行工作(&&E)...",
- 	"miTerminateTask": "終止工作(&&T)...",
-@@ -189,5 +202,11 @@
- 	"miDownloadingUpdate": "正在下載更新...",
- 	"miInstallUpdate": "安裝更新...",
- 	"miInstallingUpdate": "正在安裝更新...",
-+<<<<<<< .our
- 	"miRestartToUpdate": "重新啟動以更新..."
-+=======
-+	"miCheckForUpdates": "查看是否有更新",
-+	"aboutDetail": "\n版本 {0}\n認可 {1}\n日期 {2}\nShell {3}\n轉譯器 {4}\n節點 {5}\n架構 {6}",
-+	"okButton": "確定"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/cht/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
-  our    100644 859ea73188c0049b2000e3a07bf2f988f03e5823 i18n/cht/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
-  their  100644 3a28fce1fa68025791beec112460484ce2011a28 i18n/cht/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"diff.tooLarge": "因其中一個檔案過大而無法比較。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 c05e2bee113bd5996380e859b484dbdf6eec0401 i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 15a1cfb1f061b73d70aaaf6b56b29fe87aab2b5a i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 6989de814a387d64ced8e7c23ff1f2af59a7694b i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json
-changed in both
-  base   100644 a64950d25e3b81d295ef533625681bc43b219652 i18n/cht/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 66736a4e736cf7b9a66b648bff264434bc450d4c i18n/cht/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 a29045e800625ac7796c02837a74e085c2b45b5c i18n/cht/src/vs/editor/common/view/editorColorRegistry.i18n.json
-changed in both
-  base   100644 0de30c3bd71e343bee7a2c8058fc81c929a8a9f4 i18n/cht/src/vs/editor/contrib/find/common/findController.i18n.json
-  our    100644 cbbf89b710f3c38eb241337fd8bfd81392694209 i18n/cht/src/vs/editor/contrib/find/common/findController.i18n.json
-  their  100644 c75e923d0b7ea4e99a3f006bcf19778b1aa5cbab i18n/cht/src/vs/editor/contrib/find/common/findController.i18n.json
-@@ -10,6 +10,15 @@
- 	"nextSelectionMatchFindAction": "尋找下一個選取項目",
- 	"previousSelectionMatchFindAction": "尋找上一個選取項目",
- 	"startReplace": "取代",
-+<<<<<<< .our
-+=======
-+	"addSelectionToNextFindMatch": "將選取項目加入下一個找到的相符項",
-+	"addSelectionToPreviousFindMatch": "將選取項目加入前一個找到的相符項中",
-+	"moveSelectionToNextFindMatch": "將最後一個選擇項目移至下一個找到的相符項",
-+	"moveSelectionToPreviousFindMatch": "將最後一個選擇項目移至前一個找到的相符項",
-+	"selectAllOccurrencesOfFindMatch": "選取所有找到的相符項目",
-+	"changeAll.label": "變更所有發生次數",
-+>>>>>>> .their
- 	"showNextFindTermAction": "顯示下一個尋找字詞",
- 	"showPreviousFindTermAction": "顯示上一個尋找字詞"
- }
-\ No newline at end of file
-changed in both
-  base   100644 79e27db5d9b837d858897dcaa8de4174da7f4750 i18n/cht/src/vs/platform/history/electron-main/historyMainService.i18n.json
-  our    100644 e92cc96c4b4d33d18c32d6ff208f27aa16bd1d25 i18n/cht/src/vs/platform/history/electron-main/historyMainService.i18n.json
-  their  100644 39b78314b9688ffd566da805954ad67a3c83f5fa i18n/cht/src/vs/platform/history/electron-main/historyMainService.i18n.json
-changed in both
-  base   100644 16223f6ab7b5e64add90af0036288a5740b0da6e i18n/cht/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 790929bd611f6dd14a59e2ff8a6640378fde30cb i18n/cht/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 06bbc994c13aee44072a0abc1575cd3c5debcdaf i18n/cht/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -60,7 +60,11 @@
- 	"scrollbarShadow": "指出在捲動該檢視的捲軸陰影。",
- 	"scrollbarSliderBackground": "捲軸滑桿的背景顏色。",
- 	"scrollbarSliderHoverBackground": "動態顯示時捲軸滑桿的背景顏色。",
-+<<<<<<< .our
- 	"scrollbarSliderActiveBackground": "當點擊時捲軸滑桿的背景顏色。",
-+=======
-+	"scrollbarSliderActiveBackground": "使用中狀態下捲軸滑桿的背景顏色。",
-+>>>>>>> .their
- 	"progressBarBackground": "長時間運行進度條的背景色彩.",
- 	"editorBackground": "編輯器的背景色彩。",
- 	"editorForeground": "編輯器的預設前景色彩。",
-changed in both
-  base   100644 db42e723debdbf371fb3138338d04bf0d47e2dc7 i18n/cht/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 fb350c87bdc732a5022e5d51b20bc738ad941987 i18n/cht/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 dd4cec40163af1af46496b254f15d804e87603ca i18n/cht/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -9,6 +9,7 @@
- 	"openFile": "開啟檔案...",
- 	"openFolder": "開啟資料夾...",
- 	"openFileFolder": "開啟...",
-+<<<<<<< .our
- 	"globalRemoveFolderFromWorkspace": "將資料夾從工作區移除...",
- 	"saveWorkspaceAsAction": "另存工作區為...",
- 	"save": "儲存(&&S)",
-@@ -16,4 +17,24 @@
- 	"openWorkspaceAction": "開啟工作區...",
- 	"openWorkspaceConfigFile": "開啟工作區組態檔",
- 	"duplicateWorkspaceInNewWindow": "新視窗中的重覆工作區"
-+=======
-+	"reload": "重新載入(&&R)",
-+	"cancel": "取消",
-+	"newWorkspaceFormExisting": "新的工作區從現有...",
-+	"select": "選取(&&S)",
-+	"selectWorkspace": "為工作區選取資料夾",
-+	"addSupported": "必須要重新載入視窗，才可開啟多個資料夾。",
-+	"addFolderToWorkspace": "將資料夾新增到工作區...",
-+	"add": "新增",
-+	"addFolderToWorkspaceTitle": "將資料夾新增到工作區",
-+	"removeFolderFromWorkspace": "將資料夾從工作區移除",
-+	"saveWorkspaceAsAction": "另存工作區為...",
-+	"saveEmptyWorkspaceNotSupported": "請先開啟工作區以進行儲存。",
-+	"saveNotSupported": "必須重新載入視窗才可儲存工作區。",
-+	"save": "儲存(&&S)",
-+	"saveWorkspace": "儲存工作區",
-+	"openWorkspaceAction": "開啟工作區...",
-+	"newWorkspace": "新增工作區...",
-+	"openWorkspaceConfigFile": "開啟工作區組態檔"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 4e7c8606cb8af492f968241faebfa838dd50f135 i18n/cht/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-  our    100644 c06a79c75c89653cc4fdd1d131f354e9584bf94e i18n/cht/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-  their  100644 bed067ba4a663202e859d5c825b6a24e31a32749 i18n/cht/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,9 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"compositePart.hideSideBarLabel": "隱藏提要欄位",
-+>>>>>>> .their
- 	"focusSideBar": "瀏覽至提要欄位",
- 	"viewCategory": "檢視"
- }
-\ No newline at end of file
-changed in both
-  base   100644 5fde1a301073a079ae4a80a52bbe8e20e346be70 i18n/cht/src/vs/workbench/common/theme.i18n.json
-  our    100644 41a6d8c801b131296a56223489edd198cc2bf33b i18n/cht/src/vs/workbench/common/theme.i18n.json
-  their  100644 e68c905d8515dad4f0105664d2579109403f445f i18n/cht/src/vs/workbench/common/theme.i18n.json
-changed in both
-  base   100644 a76c05ee2f6d366e5e1cba784691c58df209183d i18n/cht/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 8c04c44fd8aa84aafd673c4f7e7c350b8ac52c3b i18n/cht/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 fa6f13944092eaf2443c555ce17f949070849975 i18n/cht/src/vs/workbench/electron-browser/actions.i18n.json
-changed in both
-  base   100644 06d815243f257592379c8a4c1f21ca5fe85199f7 i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 bf339c91e8587ec53fe81a294c54ddc0f5aad010 i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 e2f6f7dff654bb41dd340b243bb6d88c4a3b3276 i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,8 +35,13 @@
- 	"panelDefaultLocation": "控制面板的預設位置。可顯示在 Workbench 的底部或是右方。",
- 	"statusBarVisibility": "控制 Workbench 底端狀態列的可視性。",
- 	"activityBarVisibility": "控制活動列在 workbench 中的可見度。",
-+<<<<<<< .our
- 	"viewVisibility": "控制檢視標頭動作的可見度。檢視標頭動作可為總是可見，或在檢視為焦點或暫留時才可見。",
- 	"fontAliasing": "控制工作台中的字型鋸齒化方法。\n- default: 子像素字型平滑化。在多數非 Retina 的顯示器上，這會使文字變得最鮮明\n- antialiased: 在像素層級上使字型平滑化，與子像素相對。能夠使字型整體顯示較亮\n- none: 停用字型平滑化。顯示的文字會帶有鋸齒狀銳利邊緣\n- auto: 根據顯示器的 DPI 自動套用 `default` 或 `antialiased`。",
-+=======
-+	"closeOnFileDelete": "控制顯示檔案的編輯器是否應在其他處理序刪除或重新命名該檔案時自動關閉。若停用此選項，當發生前述狀況時，編輯器會保持開啟，並呈現已變更的狀態。請注意，從應用程式內刪除一律會關閉編輯器，但已變更的檔案在資料未儲存前一律不會關閉。",
-+	"fontAliasing": "在 Workbench 中控制字型鋸齒化的方法。- 預設: 子像素字型平滑處理。在大部分非 Retina 顯示器上會顯示出最銳利的文字- 已消除鋸齒: 相對於子像素，根據像素層級平滑字型。可讓字型整體顯得較細- 無: 停用字型平滑處理。文字會以鋸齒狀的銳邊顯示 ",
-+>>>>>>> .their
- 	"workbench.fontAliasing.default": "子像素字型平滑處理。在大部分非 Retina 顯示器上會顯示出最銳利的文字。",
- 	"workbench.fontAliasing.antialiased": "相對於子像素，根據像素層級平滑字型。可以讓字型整體顯得較細。",
- 	"workbench.fontAliasing.none": "禁用字體平滑.文字將會顯示鋸齒狀與鋒利的邊緣.",
-changed in both
-  base   100644 21628fd8aa6b759354e19d5ad195f566f5948a4c i18n/cht/src/vs/workbench/electron-browser/window.i18n.json
-  our    100644 a99eb9754bc3a0014907555c92c0c41fb3ae62fe i18n/cht/src/vs/workbench/electron-browser/window.i18n.json
-  their  100644 dfbd17cb4f0f94eb6c11d0728fc547dd9f9e11e7 i18n/cht/src/vs/workbench/electron-browser/window.i18n.json
-@@ -12,5 +12,10 @@
- 	"copy": "複製",
- 	"paste": "貼上",
- 	"selectAll": "全選",
-+<<<<<<< .our
- 	"runningAsRoot": "不建議以 root 身分執行 {0}。"
-+=======
-+	"confirmOpen": "確定要開啟 {0} 工作區嗎?",
-+	"confirmOpenButton": "開啟(&&O)..."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 5e4862406578e468c6624c92ef6503ed847ddf68 i18n/cht/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  our    100644 56556d70235cd8dc10872d36bf84fa1b4f974a29 i18n/cht/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  their  100644 810ba4331057679e400f1f22816edda0081b06dd i18n/cht/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-changed in both
-  base   100644 81362151ea4a175110376f52ab771f5c622cdde6 i18n/cht/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  our    100644 f23815901afa5b319483b39e8acead1be6dfacc5 i18n/cht/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  their  100644 315d0d6089a3ce25ccd56b3d6d554a33af426615 i18n/cht/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-changed in both
-  base   100644 d368fda6a7e0eb522f358ff964a6ff20a3137c34 i18n/cht/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-  our    100644 af127333714633e2cd9ea855bc30064393aa20c4 i18n/cht/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-  their  100644 b7e7de6341d2818ad13f30cf2aa84c8d37a4d188 i18n/cht/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-@@ -6,9 +6,13 @@
- {
- 	"emmetConfigurationTitle": "Emmet",
- 	"triggerExpansionOnTab": "啟用時，按下 TAB 即可展開 Emmet 縮寫。當 emmet.useNewemmet 設定為 true 時不適用。",
-+<<<<<<< .our
- 	"emmetPreferences": "用以修改部分 Emmet 動作及解析程式之行為的喜好設定。emmet.useNewemmet 設定為 true 時不適用。",
- 	"emmetSyntaxProfiles": "為指定的語法定義設定檔，或透過特定規則使用自己的設定檔。",
- 	"emmetExclude": "不應展開 Emmet 縮寫的語言陣列。",
- 	"emmetExtensionsPath": "包含 Emmet 設定檔、片段及喜好設定的資料夾路徑。emmet.useNewEmmet 設定為 true 時僅會從延伸模組路徑接受設定檔。",
-+=======
-+	"emmetPreferences": "用以修改部分 Emmet 動作及解析程式之行為的喜好設定。emmet.useNewemmet 設定為 ture 時不適用。",
-+>>>>>>> .their
- 	"useNewEmmet": "試試所有 Emmet 功能的新 Emmet 模組 (最終會取代舊的單一 Emmet 程式庫)。"
- }
-changed in both
-  base   100644 dce745aeaf805e8ac5d98b1e660b3e8f6b607a17 i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 beddde6d10ce2b9a74005421467ca470c839a054 i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 9d9aab08287be2dfaab830451fccddc1fe19ac94 i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-changed in both
-  base   100644 0dbbb1af8ef020d81d3b4f3e423f75e710b1dae4 i18n/cht/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  our    100644 c32641ccebc8fbed926c69242f64a9fbc36d13e0 i18n/cht/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  their  100644 6e446c4f38c25f0adefd54bad7db04a304fe55a5 i18n/cht/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-@@ -69,7 +69,11 @@
- 	"invalidFileNameError": "名稱 **{0}** 不能作為檔案或資料夾名稱。請選擇不同的名稱。",
- 	"filePathTooLongError": "名稱 **{0}** 導致路徑太長。請選擇較短的名稱。",
- 	"compareWithSaved": "比較使用中的檔案和已儲存的檔案",
-+<<<<<<< .our
- 	"modifiedLabel": "{0} (在磁碟上) ↔ {1}",
- 	"compareWithClipboard": "比較使用中的檔案和剪貼簿的檔案",
- 	"clipboardComparisonLabel": "剪貼簿 ↔ {0}"
-+=======
-+	"modifiedLabel": "{0} (在磁碟上) ↔ {1}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f49cef6b9b302058ec00d2e712d1d0e11d261bdd i18n/cht/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 867d603ca5633a190dd294a861b5733b06da3c8c i18n/cht/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 7b885c7514130a1ea63173630c471a99df4a8a9f i18n/cht/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-@@ -40,6 +40,7 @@
- 	"dynamicHeight": "控制 [開放式編輯器] 區段的高度是否應依元素數目動態調整。",
- 	"autoReveal": "控制總管是否在開啟檔案時自動加以顯示及選取。",
- 	"enableDragAndDrop": "控制總管是否應該允許透過拖放功能移動檔案和資料夾。",
-+<<<<<<< .our
- 	"confirmDragAndDrop": "控制總管是否須要求確認，以透過拖放來移動檔案和資料夾。",
- 	"confirmDelete": "控制總管是否須在透過垃圾桶刪除檔案時要求確認。",
- 	"sortOrder.default": "檔案與資料夾會依照名稱以字母順序排序。資料夾會顯示在檔案前。",
-@@ -50,4 +51,12 @@
- 	"sortOrder": "控制檔案與資料夾在總管中的排列順序。除了預設排序外，您也可以將順序設定為 'mixed' (檔案與資料夾)、'type' (依檔案類型)、'modified' (依最後修改日期) 或 'filesFirst' (將檔案排序在資料夾前)。",
- 	"explorer.decorations.colors": "控制檔案裝飾是否須使用色彩。",
- 	"explorer.decorations.badges": "控制檔案裝飾是否須使用徽章。"
-+=======
-+	"sortOrder.default": "檔案與目錄依照名稱的字母順序排序。目錄顯示於檔案之前。",
-+	"sortOrder.mixed": "檔案與目錄依照名稱的字母順序排序。檔案與目錄交錯排列。",
-+	"sortOrder.filesFirst": "檔案與目錄依照名稱的字母順序排序。檔案顯示於目錄之前。",
-+	"sortOrder.type": "檔案與目錄依照延伸模組的字母順序排序。目錄顯示於檔案之前。",
-+	"sortOrder.modified": "檔案與目錄依照最後修改的日期遞減排序。目錄顯示於檔案之前。",
-+	"sortOrder": "控制總管中檔案和目錄排序的方式。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 91195575caef9fd3f0e15d4cb81b303417cbac24 i18n/cht/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-  our    100644 7a6f0b075f74848503c85069b40013f41dc423f4 i18n/cht/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-  their  100644 4e8368f2a610ada63f62b62fc804ff4cc731b06a i18n/cht/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-@@ -12,5 +12,6 @@
- 	"genericSaveError": "無法儲存 '{0}': {1}",
- 	"staleSaveError": "無法儲存 '{0}': 磁碟上的內容較新。請按一下 [比較]，比較您的版本與磁碟上的版本。",
- 	"compareChanges": "比較",
--	"saveConflictDiffLabel": "{0} (位於磁碟) ↔ {1} (在 {2} 中) - 解決儲存衝突"
-+	"saveConflictDiffLabel": "{0} (位於磁碟) ↔ {1} (在 {2} 中) - 解決儲存衝突",
-+	"userGuide": "在右方使用編輯器工具列中的動作來 **復原** 您的變更，或以您的變更 **覆寫** 磁碟上的內容"
- }
-\ No newline at end of file
-changed in both
-  base   100644 a92d2c49e8bbed71e46196ad2a287c00756dd1a5 i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  our    100644 7de2fa4801f7ec2e9b89f96219fca72b072066be i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  their  100644 f0f4cd2a6a4ea8d62e16b98cee8964196de9fda4 i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-@@ -14,6 +14,10 @@
- 	"openGlobalKeybindingsFile": "開啟鍵盤快速鍵檔案",
- 	"openWorkspaceSettings": "開啟工作區設定",
- 	"openFolderSettings": "開啟資料夾設定",
-+<<<<<<< .our
-+=======
-+	"pickFolder": "選取資料夾",
-+>>>>>>> .their
- 	"configureLanguageBasedSettings": "設定語言專屬設定...",
- 	"languageDescriptionConfigured": "({0})",
- 	"pickLanguage": "選取語言"
-changed in both
-  base   100644 ec85dfcb77816fe9817cb8dd309895c2e111bfd2 i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 912f924cec997084f6bbf36563d0171c3e38d0e5 i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 12df0eb04742fb8530ef3f65c385c383abb2d9cc i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -14,4 +15,19 @@
- 	"editTtile": "編輯",
- 	"replaceDefaultValue": "在設定中取代",
- 	"copyDefaultValue": "複製到設定"
-+=======
-+	"emptyUserSettingsHeader": "將您的設定放置在此以覆寫預設設定。",
-+	"errorInvalidConfiguration": "無法寫入設定.請開啟使用者設定並修正檔案中的錯誤/警告後再試一次.",
-+	"emptyWorkspaceSettingsHeader": "將您的設定放置在此以覆寫使用者設定。",
-+	"emptyFolderSettingsHeader": "將您的資料夾設定放置在此以覆寫工作區設定的資料夾設定。",
-+	"defaultFolderSettingsTitle": "預設資料夾設定",
-+	"defaultSettingsTitle": "預設設定",
-+	"noSettingsFound": "找不到任何設定。",
-+	"editTtile": "編輯",
-+	"replaceDefaultValue": "在設定中取代",
-+	"copyDefaultValue": "複製到設定",
-+	"unsupportedPHPExecutablePathSetting": "這項設定必須是使用者設定。若要設定工作區的 PHP，請開啟 PHP 檔案並按一下狀態列中的 [PHP 路徑]。",
-+	"unsupportedWorkspaceSetting": "這項設定必須是使用者設定。",
-+	"unsupportedWorkbenchSetting": "目前無法套用此設定。要在您直接開啟此資料夾時才會套用。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 68d504b78421876a31ce971c2ef3cdc8f5ccd0af i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-  our    100644 bf6c80d40dab496574eb97873c8671035e53aa62 i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-  their  100644 ea581bd5e89879425a29fbff595afbca3ba18854 i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 17bda120dbd77f09aaae9b33d7a0fd346cfe2603 i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 3a059706c6b5eb843151bff68a94a09cb22fd815 i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -12,4 +13,13 @@
- 	"userSettings": "使用者設定",
- 	"workspaceSettings": "工作區設定",
- 	"folderSettings": "資料夾設定"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"folderSettingsDetails": "資料夾設定"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a4c089ec5ce16abdc1f2850b7e3df35e53a88641 i18n/cht/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  our    100644 9b318b09ce08ab0ea0c2bb529eb879057b9096c4 i18n/cht/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  their  100644 2fbf166712a262be3af438ca3d35ebdce221a5e0 i18n/cht/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-@@ -8,5 +8,11 @@
- 	],
- 	"relaunchSettingMessage": "設定已經變更，必須重新啟動才會生效。",
- 	"relaunchSettingDetail": "請按 [重新啟動] 按鈕以重新啟動 {0} 並啟用設定。",
-+<<<<<<< .our
- 	"restart": "重新啟動(&&R)"
-+=======
-+	"restart": "重新啟動",
-+	"relaunchWorkspaceMessage": "必須重新載入延伸模組系統才可變更此工作區。",
-+	"reload": "重新載入"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 5d095421436354ce0f25de1390666c9e539cd4a0 i18n/cht/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 ba1fd77bc20f96eb0056aa05843bd1bb7818c0eb i18n/cht/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 52826c8f8d8a2de8ed8be1f73ae2e5160d23b74d i18n/cht/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"nextSearchIncludePattern": "顯示下一個搜尋包含模式",
- 	"previousSearchIncludePattern": "顯示上一個搜尋包含模式",
- 	"nextSearchExcludePattern": "顯示下一個搜尋排除模式",
-@@ -16,6 +19,8 @@
- 	"previousReplaceTerm": "顯示上一個搜尋取代字詞",
- 	"findInFiles": "在檔案中尋找",
- 	"replaceInFiles": "檔案中取代",
-+	"findInWorkspace": "在工作區中尋找...",
-+	"findInFolder": "在資料夾中尋找...",
- 	"RefreshAction.label": "重新整理",
- 	"CollapseDeepestExpandedLevelAction.label": "全部摺疊",
- 	"ClearSearchResultsAction.label": "清除",
-changed in both
-  base   100644 0780f0f62bdbe796cdc92508546c85c8df3f208f i18n/cht/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-  our    100644 f9a4b46d6b9113c7745b8a62029d44d607b9ee13 i18n/cht/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-  their  100644 5a3224c66f5b4482613753ff358a57d04f536880 i18n/cht/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"searchFolderMatch.other.label": "其他檔案",
- 	"searchFileMatches": "找到 {0} 個檔案",
- 	"searchFileMatch": "找到 {0} 個檔案",
-changed in both
-  base   100644 ffc0ef1d621fc0a291567eb5da80bb4f268b3ee7 i18n/cht/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  our    100644 4578dbafa9e6c13f1d3fbca1dcd19f0c9ec0aa56 i18n/cht/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  their  100644 7f165c5f71752ac86d09fc541bf64d313e610ffa i18n/cht/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-changed in both
-  base   100644 095028d433ac8d9f422ed56246395f1c3f4bc88b i18n/cht/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 9a7f1ae524570aa14ab8735a1962f8357f3564aa i18n/cht/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 b0bb104792a9819e38fc0aaac2f44ceb9b936922 i18n/cht/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-changed in both
-  base   100644 e34e2f41cb78e95c969037ede5260fab45c4e3e5 i18n/cht/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 a13d5229d23a832c6ada352df9587e856b73629f i18n/cht/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 eccd83ffb960f90625d0eddfff0f230f4a382455 i18n/cht/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -24,17 +24,25 @@
- 	"TaskService.noTestTask1": "未定義任何建置工作。請使用 'isTestCommand' 標記 tasks.json 檔案中的工作。",
- 	"TaskService.noTestTask2": "未定義任何測試工作，請在 tasks.json 檔案中將工作標記為 'test' 群組。",
- 	"TaskServer.noTask": "找不到所要求要執行的工作 {0}。",
-+<<<<<<< .our
- 	"TaskService.associate": "建立關聯",
-+=======
-+>>>>>>> .their
- 	"TaskService.attachProblemMatcher.continueWithout": "在不掃描工作輸出的情況下繼續",
- 	"TaskService.attachProblemMatcher.never": "永不掃描工作輸出",
- 	"TaskService.attachProblemMatcher.learnMoreAbout": "深入了解掃描工作輸出",
- 	"selectProblemMatcher": "選取錯誤和警告的種類以掃描工作輸出",
- 	"customizeParseErrors": "當前的工作組態存在錯誤.請更正錯誤再執行工作.",
- 	"moreThanOneBuildTask": "定義了很多建置工作於tasks.json.執行第一個.",
-+<<<<<<< .our
- 	"TaskSystem.activeSame.background": "工作 '{0}' 已在使用中並且處於背景模式。",
- 	"TaskSystem.activeSame.noBackground": "工作 '{0}' 已在使用中。",
- 	"terminateTask": "終止工作",
- 	"restartTask": "重新啟動工作",
-+=======
-+	"TaskSystem.activeSame.background": "工作 '{0}' 已在使用中，且處於背景模式中。請使用工作功能表的 [終止工作...] 將其終止。",
-+	"TaskSystem.activeSame.noBackground": "工作 '{0}' 已在使用中。請使用工作功能表的 [終止工作...] 將其終止。 ",
-+>>>>>>> .their
- 	"TaskSystem.active": "已有工作在執行。請先終止該工作，然後再執行其他工作。",
- 	"TaskSystem.restartFailed": "無法終止再重新啟動工作 {0}",
- 	"TaskService.noConfiguration": "錯誤: {0} 工作偵測未替下列組態提供工作:\n{1}\n將會忽略該工作。\n",
-@@ -75,8 +83,13 @@
- 	"TaskService.pickDefaultBuildTask": "請選取要用作預設組建工作的工作",
- 	"TaskService.defaultTestTaskExists": "已經將 {0} 標記為預設測試工作。",
- 	"TaskService.pickDefaultTestTask": "請選取要用作預設測試工作的工作",
-+<<<<<<< .our
- 	"TaskService.pickShowTask": "選取要顯示輸出的工作",
- 	"TaskService.noTaskIsRunning": "未執行任何工作",
-+=======
-+	"TaskService.noTaskIsRunning": "沒有執行中的工作。",
-+	"TaskService.pickShowTask": "選取要顯示輸出的工作",
-+>>>>>>> .their
- 	"ShowLogAction.label": "顯示工作記錄檔",
- 	"RunTaskAction.label": "執行工作",
- 	"RestartTaskAction.label": "重新開始執行工作",
-changed in both
-  base   100644 49ff9315f1a721384761f4c4a76a1c82e40fd629 i18n/cht/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  our    100644 b9d0cc54748098528d7d52af4aef0b78d90f5832 i18n/cht/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  their  100644 26d27a86749740c76a7af7158bf0e12f369506ec i18n/cht/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/cht/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  our    100644 7c11d510d10d8533ee23906029dda6ab883d5ac2 i18n/cht/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  their  100644 6416f9621a282e8b7c7e4bc03d9bb9a3897f1f63 i18n/cht/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,6 +10,15 @@
- 	"termEntryAriaLabel": "{0} , 終端機選擇器",
- 	"termCreateEntryAriaLabel": "{0}，建立新的終端機",
- 	"workbench.action.terminal.newplus": "$(plus) 建立新的整合式終端機",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"entryAriaLabel": "{0} , 終端機選擇器",
-+>>>>>>> .their
- 	"noTerminalsMatching": "無相符的終端機",
- 	"noTerminalsFound": "無開啟的終端機"
- }
-\ No newline at end of file
-changed in both
-  base   100644 e4baafd4cb1136efba6f34f3f049a92805be86d9 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 dc4a98ed7869a7cc55922d5bc3bb8ecb137f6a4d i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 1e1fd8854062dd35d0e06e9b2e68f6b6b852f51a i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,9 @@
- 	],
- 	"quickOpen.terminal": "顯示所有已開啟的終端機",
- 	"terminal": "終端機",
-+=======
-+	"quickOpen.terminal": "顯示所有已開啟的終端機",
-+>>>>>>> .their
- 	"terminalIntegratedConfigurationTitle": "整合式終端機",
- 	"terminal.integrated.shell.linux": "終端機在 Linux 上使用的殼層路徑。",
- 	"terminal.integrated.shellArgs.linux": "在 Linux 終端機要使用的命令列引數。",
-@@ -36,8 +40,12 @@
- 	"terminal.integrated.env.osx": "OS X 上的終端機要使用之具有將新增至 VS Code 流程之環境變數的物件",
- 	"terminal.integrated.env.linux": "Linux 上的終端機要使用之具有將新增至 VS Code 流程之環境變數的物件",
- 	"terminal.integrated.env.windows": "Windows 上的終端機要使用之具有將新增至 VS Code 流程之環境變數的物件",
-+<<<<<<< .our
- 	"terminal.integrated.showExitAlert": "當結束代碼非 0，顯示警告訊息 '終端處理序已終止並回傳結束代碼'",
- 	"terminal.integrated.experimentalRestore": "啟動 VS Code 是否會自動還原工作區的終端機工作階段。此設定處於實驗階段，可能會出現 Bug 或在之後有所變更。",
-+=======
-+	"terminal": "終端機",
-+>>>>>>> .their
- 	"terminalCategory": "終端機",
- 	"viewCategory": "檢視"
- }
-\ No newline at end of file
-changed in both
-  base   100644 e7485a609ef8f73b7f501d3d2ecd47baf53fe5e7 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 b65af1ec7222f34f85465a0e272b45818ced6ea4 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 cf821b0c74fc9baea119ad03a3fc0bddce19e192 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -14,8 +14,11 @@
- 	"workbench.action.terminal.selectAll": "全選",
- 	"workbench.action.terminal.deleteWordLeft": "刪除左方文字",
- 	"workbench.action.terminal.deleteWordRight": "刪除右方文字",
-+<<<<<<< .our
- 	"workbench.action.terminal.moveToLineStart": "移至行開端",
- 	"workbench.action.terminal.moveToLineEnd": "移至行尾端",
-+=======
-+>>>>>>> .their
- 	"workbench.action.terminal.new": "建立新的整合式終端機",
- 	"workbench.action.terminal.new.short": "新增終端機",
- 	"workbench.action.terminal.newWorkspacePlaceholder": "為新的終端機選擇目前的工作目錄",
-@@ -51,6 +54,7 @@
- 	"workbench.action.terminal.rename.prompt": "輸入終端機名稱",
- 	"workbench.action.terminal.focusFindWidget": "焦點尋找小工具",
- 	"workbench.action.terminal.hideFindWidget": "隱藏尋找小工具",
-+<<<<<<< .our
- 	"nextTerminalFindTerm": "顯示下一個尋找字詞",
- 	"previousTerminalFindTerm": "顯示上一個尋找字詞",
- 	"quickOpenTerm": "切換使用中的終端機 ",
-@@ -60,4 +64,7 @@
- 	"workbench.action.terminal.selectToNextCommand": "選取下一個命令",
- 	"workbench.action.terminal.selectToPreviousLine": "選擇上一行",
- 	"workbench.action.terminal.selectToNextLine": "選擇下一行"
-+=======
-+	"quickOpenTerm": "切換使用中的終端機"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6016a0077c1c8dbfb26f20abd3dccb8a03b464cc i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 2657899133e07b49fde3b011113a300d729b30b8 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 f80c288cbec285a050d1369d1fdc283ef870e226 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -10,7 +10,10 @@
- 	"terminal.foreground": "終端機的前景色彩。",
- 	"terminalCursor.foreground": "終端機游標的前景色彩。",
- 	"terminalCursor.background": "終端機游標的背景色彩。允許區塊游標重疊於自訂字元色彩。",
-+<<<<<<< .our
- 	"terminal.selectionBackground": "終端機的選取項目背景色彩。",
- 	"terminal.border": "在終端機內將窗格分割之邊界的色彩。預設為 panel.border。",
-+=======
-+>>>>>>> .their
- 	"terminal.ansiColor": "終端機中的 '{0}' ANSI 色彩。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 bcb5723b6fb1b66e0fa4e765c1eb7a3f3e9d27db i18n/cht/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 3fdd15bb8f2f2cfb1dd6d7b789581c43681e05de i18n/cht/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 8bf17270e248057f51fdbeb5aed894df6b8a59cc i18n/cht/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -11,10 +11,16 @@
- 	"read the release notes": "歡迎使用 {0} v{1}! 您要閱讀版本資訊嗎?",
- 	"licenseChanged": "我們的授權條款已變更，請按一下[這裡]({0})查看變更項目。",
- 	"neveragain": "不要再顯示",
-+<<<<<<< .our
- 	"64bitisavailable": "適用於 64 位元 Windows 的 {0} 已正式推出! 若要深入了解，請按一下[這裡]({1})。",
- 	"updateIsReady": "新的 {0} 更新已可用。",
- 	"noUpdatesAvailable": "目前沒有任何可用的更新。",
- 	"ok": "確定",
-+=======
-+	"64bitisavailable": "適用於 Windows 64 位元的 {0} 已可用!",
-+	"learn more": "深入了解",
-+	"updateIsReady": "新的 {0} 更新已可用。",
-+>>>>>>> .their
- 	"thereIsUpdateAvailable": "已有更新可用。",
- 	"download now": "立即下載",
- 	"later": "稍後",
-changed in both
-  base   100644 4acbaf6f0acdab10437ec9ccfab9cb99fcb65e07 i18n/cht/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-  our    100644 0f84b94182873a4113b624f04ff70972b67fa09b i18n/cht/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-  their  100644 d624449b463b2e80390d2c132635bc3ef90ae3af i18n/cht/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-changed in both
-  base   100644 8fd534084bbd4deacc580700ccea246f70097f9b i18n/cht/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  our    100644 2bc73e75628de887e06bdd3449b69211e28f0a91 i18n/cht/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  their  100644 398c82daa4febacef66af69428fab4f2120ec13e i18n/cht/src/vs/workbench/services/configuration/node/configuration.i18n.json
-@@ -9,6 +9,7 @@
- 	"scope.window.description": "視窗特定組態，可在使用者或工作區設定中予以設定。",
- 	"scope.resource.description": "資源特定設定，可在使用者、工作區或資料夾設定中予以設定。",
- 	"scope.description": "組態適用的範圍。可用的範圍為「視窗」和「資源」。",
-+<<<<<<< .our
- 	"vscode.extension.contributes.configuration": "提供組態設定。",
- 	"invalid.title": "'configuration.title' 必須是字串",
- 	"vscode.extension.contributes.defaultConfiguration": "依語言貢獻預設編輯器組態設定。",
-@@ -21,4 +22,13 @@
- 	"workspaceConfig.settings.description": "工作區設定",
- 	"workspaceConfig.extensions.description": "工作區延伸模組",
- 	"unknownWorkspaceProperty": "未知的工作區組態屬性"
-+=======
-+	"invalid.type": "如果已設定，'configuration.type' 必須設定為物件",
-+	"invalid.title": "'configuration.title' 必須是字串",
-+	"vscode.extension.contributes.defaultConfiguration": "依語言貢獻預設編輯器組態設定。",
-+	"invalid.properties": "'configuration.properties' 必須是物件",
-+	"workspaceConfig.id.description": "工作區識別項。用於儲存內部工作區狀態，狀態可能會在變更時遺失。",
-+	"workspaceConfig.folders.description": "要在工作區中載入的資料夾清單。必須為檔案路徑。例如 `file:///root/folderA`",
-+	"workspaceConfig.settings.description": "工作區設定"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 b20ee8ce75fdb33fa3f5b690ac7a3c50dfcab79e i18n/cht/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 d8a57b177d1c5bed0bf72818f809bba5c7dd5e99 i18n/cht/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 8235f18066a43a939162d8765aee24f9244e1d49 i18n/cht/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -9,6 +9,7 @@
- 	"openTasksConfiguration": "開啟工作組態",
- 	"openLaunchConfiguration": "開啟啟動組態",
- 	"open": "開啟設定",
-+<<<<<<< .our
- 	"saveAndRetry": "儲存並重試",
- 	"errorUnknownKey": "因為 {1} 非已註冊的組態，所以無法寫入至 {0}。",
- 	"errorInvalidWorkspaceConfigurationApplication": "無法寫入 {0} 至工作區設定。此設定只能寫入使用者設定中。",
-@@ -27,6 +28,19 @@
- 	"errorConfigurationFileDirty": "因為檔案已變更，所以無法寫入使用者設定。請儲存使用者設定檔案，然後再試一次。",
- 	"errorConfigurationFileDirtyWorkspace": "因為檔案已變更，所以無法寫入工作區設定。請儲存工作區設定檔案，然後再試一次。",
- 	"errorConfigurationFileDirtyFolder": "因為檔案已變更，所以無法寫入資料夾設定。請儲存 '{0}' 資料夾設定檔案，然後再試一次。",
-+=======
-+	"close": "關閉",
-+	"saveAndRetry": "儲存設定並重啟",
-+	"errorUnknownKey": "因為 {1} 非已註冊的組態，所以無法寫入至 {0}。",
-+	"errorInvalidFolderConfiguration": "因為 {0} 不支援資料夾資源範圍，所以無法寫入至資料夾設定。",
-+	"errorInvalidUserTarget": "因為 {0} 不支援全域範圍，所以無法寫入至使用者設定。",
-+	"errorInvalidFolderTarget": "因為未提供資源，所以無法寫入至資料夾設定。",
-+	"errorNoWorkspaceOpened": "因為未開啟工作區，所以無法寫入至 {0}。請先開啟工作區，再試一次。",
-+	"errorInvalidConfiguration": "無法寫入設定.請開啟**使用者設定**並修正錯誤/警告後再試一次.",
-+	"errorInvalidConfigurationWorkspace": "無法寫入設定.請開啟**工作區設定**並修正檔案中的錯誤/警告後再試一次.",
-+	"errorConfigurationFileDirty": "無法寫入設定,因為檔案已變更.請儲存**使用者設定**後再試一次",
-+	"errorConfigurationFileDirtyWorkspace": "無法寫入設定,因檔案已變更.請儲存**工作區設定**後再試一次.",
-+>>>>>>> .their
- 	"userTarget": "使用者設定",
- 	"workspaceTarget": "工作區設定",
- 	"folderTarget": "資料夾設定"
-changed in both
-  base   100644 b10dcde2a95c2fd6c3dd89b15581c97212a0edc7 i18n/cht/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 80a488e2a3e2c61dc5b117e10596d1fd5524e484 i18n/cht/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 bf99a19fd4720326e14bce70e1510979878237e1 i18n/cht/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-@@ -13,6 +13,7 @@
- 	"noIconThemeDesc": "No file icons",
- 	"iconThemeError": "File icon theme is unknown or not installed.",
- 	"workbenchColors": "依目前選擇的彩色佈景主題覆寫顏色",
-+<<<<<<< .our
- 	"editorColors.comments": "設定註解的色彩與樣式",
- 	"editorColors.strings": "設定字串常值的色彩與樣式。",
- 	"editorColors.keywords": "設定關鍵字的色彩與樣式。",
-@@ -21,5 +22,9 @@
- 	"editorColors.functions": "設定函式宣告與參考的色彩與樣式。",
- 	"editorColors.variables": "設定變數宣告與參考的色彩與樣式。",
- 	"editorColors.textMateRules": "使用 TextMate 佈景主題規則設定色彩與樣式 (進階)。",
-+=======
-+	"workbenchColors.deprecated": "此設定不再為實驗性，且已被重新命名為 'workbench.colorCustomizations'",
-+	"workbenchColors.deprecatedDescription": "改用'workbench.colorCustomizations'",
-+>>>>>>> .their
- 	"editorColors": "依目前選取的色彩佈景主題覆寫編輯器色彩與字型樣式。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/deu/extensions/emmet/package.i18n.json
-  our    100644 76a0f1cf2f4933fe2973e0cc716d5590fccebd37 i18n/deu/extensions/emmet/package.i18n.json
-  their  100644 c49db667dd371812806ecc5cf4151a7ae4e8041b i18n/deu/extensions/emmet/package.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,6 +10,14 @@
- 	"description": "Emmet-Unterstützung für VS Code",
- 	"command.wrapWithAbbreviation": "Mit Abkürzung umschließen",
- 	"command.wrapIndividualLinesWithAbbreviation": "Einzelne Zeilen mit Abkürzung umschließen",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"command.removeTag": "Tag entfernen",
- 	"command.updateTag": "Tag aktualisieren",
- 	"command.matchTag": "Gehe zu übereinstimmendem Paar",
-@@ -31,6 +40,7 @@
- 	"command.incrementNumberByTen": "Um 10 erhöhen",
- 	"command.decrementNumberByTen": "Um 10 verringern",
- 	"emmetSyntaxProfiles": "Definieren Sie das Profil für die angegebene Syntax, oder verwenden Sie Ihr eigenes Profil mit bestimmten Regeln.",
-+<<<<<<< .our
- 	"emmetExclude": "Ein Array von Sprachen, in dem Emmet-Abkürzungen nicht erweitert werden sollten.",
- 	"emmetExtensionsPath": "Pfad zu einem Ordner mit Emmet-Profilen und Ausschnitten.",
- 	"emmetShowExpandedAbbreviation": "Zeigt erweiterte Emmet-Abkürzungen als Vorschläge an.\nDie Option inMarkupAndStylesheetFilesOnly gilt für HTML, HAML, Jade, Slim, XML, XSL, CSS, SCSS, Sass, Less und Stylus.\nDie Option \"always\" gilt unabhängig vom Markup/CSS für alle Teile der Datei.",
-@@ -62,4 +72,12 @@
- 	"emmetPreferencesCssMsProperties": "Durch Trennzeichen getrennte CSS-Eigenschaften, die das \"ms\"-Herstellerpräfix erhalten, wenn sie in einer Emmet-Abkürzung verwendet werden, die mit \"-\" beginnt. Legen Sie eine leere Zeichenfolge fest, um das \"ms\"-Präfix immer zu vermeiden.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "Das Mindestergebnis (zwischen 0 und 1), das die Abkürzung mit Fuzzyübereinstimmung erreichen muss. Niedrigere Werte führen zu vielen falsch positiven Übereinstimmungen, höhere Werte verringern unter Umständen die möglichen Übereinstimmungen.",
- 	"emmetOptimizeStylesheetParsing": "Bei der Einstellung FALSE wird die gesamte Datei analysiert, um zu bestimmten, ob die aktuelle Position zum Erweitern von Emmet-Abkürzungen gültig ist. Bei der Einstellung TRUE wird nur der Inhalt um die die aktuelle Position in CSS-/SCSS-/LESS-Dateien analysiert."
-+=======
-+	"emmetExclude": "Ein Array von Sprachen, in dem Emmet-Abkürzungen nicht erweitert werden sollen.",
-+	"emmetExtensionsPath": "Pfad zu einem Ordner mit Emmet-Profilen, -Ausschnitten und -Einstellungen. Wenn emmet.useNewEmmet auf \"true\" festgelegt ist, werden nur Profile vom Erweiterungspfad berücksichtigt. ",
-+	"emmetShowExpandedAbbreviation": "Zeigt erweiterte Emmet-Abkürzungen als Vorschläge an.\nDie Option inMarkupAndStylesheetFilesOnly gilt für HTML, HAML, Jade, Slim, XML, XSL, CSS, SCSS, Sass, Less und Stylus.\nDie Option \"always\" gilt unabhängig vom Markup/CSS für alle Teile der Datei.",
-+	"emmetShowAbbreviationSuggestions": "Zeigt mögliche Emmet-Abkürzungen als Vorschläge an. Diese Option gilt nicht in Stylesheets oder wenn emmet.showExpandedAbbreviation auf \"never\" festgelegt ist.",
-+	"emmetIncludeLanguages": "Aktivieren Sie Emmet-Abkürzungen in Sprachen, die nicht standardmäßig unterstützt werden. Fügen Sie hier ein Mapping zwischen der Sprache und der von Emmet unterstützten Sprache hinzu.\nBeispiel: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
-+	"emmetVariables": "In Emmet-Ausschnitten zu verwendende Variablen"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 03fa4d766d9ae321b3f1b77ee1a09b1ff3bd92de i18n/deu/extensions/extension-editing/out/extensionLinter.i18n.json
-  our    100644 36866190f3efcb5834281b67770828a9ea8c674f i18n/deu/extensions/extension-editing/out/extensionLinter.i18n.json
-  their  100644 31af64199eb2b11604fceafb049f4879af9361ac i18n/deu/extensions/extension-editing/out/extensionLinter.i18n.json
-changed in both
-  base   100644 87d98409dd99a4b49e0999adc799fd273a5d6f12 i18n/deu/extensions/git/out/commands.i18n.json
-  our    100644 1abad5f86ec11c777f2319fc1588d47f5ea1c8f5 i18n/deu/extensions/git/out/commands.i18n.json
-  their  100644 454807d247b19b130b5a0ec64956d5c897ddb717 i18n/deu/extensions/git/out/commands.i18n.json
-changed in both
-  base   100644 62705e93d919c88e3ec1170a9abff8e7c6556b71 i18n/deu/extensions/markdown/out/security.i18n.json
-  our    100644 828b182b8ed53f89b863a57157b6b787f6c91dc0 i18n/deu/extensions/markdown/out/security.i18n.json
-  their  100644 4821397740fda23f6bc0050151f54c4ea413bfc4 i18n/deu/extensions/markdown/out/security.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -16,5 +17,11 @@
- 	"enableSecurityWarning.title": "Vorschau von Sicherheitswarnungen in diesem Arbeitsbereich aktivieren",
- 	"disableSecurityWarning.title": "Vorschau von Sicherheitswarnungen in diesem Arbeitsbereich deaktivieren ",
- 	"toggleSecurityWarning.description": "Hat keinen Einfluss auf die Inhaltssicherheitsebene",
-+=======
-+	"preview.showPreviewSecuritySelector.strictTitle": "Strict. Nur sicheren Inhalt laden.",
-+	"preview.showPreviewSecuritySelector.currentSelection": "Aktuelle Einstellung",
-+	"preview.showPreviewSecuritySelector.insecureContentTitle": "Laden von Inhalten über HTTP zulassen.",
-+	"preview.showPreviewSecuritySelector.scriptsAndAllContent": "Alle Inhalte und Skriptausführung zulassen. Nicht empfohlen.",
-+>>>>>>> .their
- 	"preview.showPreviewSecuritySelector.title": "Sicherheitseinstellungen für die Markdown-Vorschau in diesem Arbeitsbereich auswählen"
- }
-\ No newline at end of file
-changed in both
-  base   100644 df3491b4c052583c360e279bc895be6608fb2c57 i18n/deu/extensions/npm/package.i18n.json
-  our    100644 8df75704426af1d4997cfc228d8144b23fc7a25f i18n/deu/extensions/npm/package.i18n.json
-  their  100644 6d17843d6df9f96161ae53acd02b6b8739c05b6b i18n/deu/extensions/npm/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -23,4 +24,8 @@
- 	"command.debug": "Debuggen",
- 	"command.openScript": "Öffnen",
- 	"command.runInstall": "Installation ausführen"
-+=======
-+	"config.npm.autoDetect": "Steuert, ob die automatische Erkennung von NPM-Skripts aktiviert oder deaktiviert ist. Standardmäßig ist die Funktion aktiviert.",
-+	"config.npm.runSilent": "npm-Befehle mit der Option \"--silent\" ausführen"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/deu/extensions/typescript/out/features/taskProvider.i18n.json
-  our    100644 8d79b969dfa26d3e6da17af9cef214ffe4faad14 i18n/deu/extensions/typescript/out/features/taskProvider.i18n.json
-  their  100644 3c8640b94b25b1219d11b1f029ef421fbcb94931 i18n/deu/extensions/typescript/out/features/taskProvider.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,14 @@
- 	],
- 	"buildTscLabel": "Erstellen – {0}",
- 	"buildAndWatchTscLabel": "Überwachen – {0}"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"buildAndWatchTscLabel": "Überwachen – {0}",
-+	"buildTscLabel": "Erstellen – {0}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/deu/src/vs/code/electron-main/auth.i18n.json
-  our    100644 fa26814a783e517cd40e6eb8f4b73b928c283ce2 i18n/deu/src/vs/code/electron-main/auth.i18n.json
-  their  100644 84f927c08ed962134c11d5173a92bcd8f747379e i18n/deu/src/vs/code/electron-main/auth.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"authRequire": "Proxyauthentifizierung erforderlich",
- 	"proxyauth": "Der Proxy {0} erfordert eine Authentifizierung."
- }
-\ No newline at end of file
-changed in both
-  base   100644 587b2aaa0697d7cc3cc78dba0c566ada02ea7cf2 i18n/deu/src/vs/code/electron-main/menus.i18n.json
-  our    100644 2c62aec3f2252906a0cfb94c2bac025ecf6adbb0 i18n/deu/src/vs/code/electron-main/menus.i18n.json
-  their  100644 9bdce77a2e75c9b5e78e0025bc056c9aa20135ab i18n/deu/src/vs/code/electron-main/menus.i18n.json
-@@ -24,12 +24,21 @@
- 	"miQuit": "{0} beenden",
- 	"miNewFile": "&&Neue Datei",
- 	"miOpen": "&&Öffnen...",
-+<<<<<<< .our
- 	"miOpenWorkspace": "Ar&&beitsbereich öffnen...",
- 	"miOpenFolder": "&&Ordner öffnen...",
- 	"miOpenFile": "Datei &&öffnen...",
- 	"miOpenRecent": "&&Zuletzt verwendete öffnen",
- 	"miSaveWorkspaceAs": "Arbeitsbereich speichern unter...",
- 	"miAddFolderToWorkspace": "Or&&dner zu Arbeitsbereich hinzufügen...",
-+=======
-+	"miOpenWorkspace": "&&Arbeitsbereich öffnen...",
-+	"miOpenFolder": "&&Ordner öffnen...",
-+	"miOpenFile": "Datei &&öffnen...",
-+	"miOpenRecent": "&&Zuletzt verwendete öffnen",
-+	"miSaveWorkspaceAs": "Arbeitsbereich &&speichern unter...",
-+	"miAddFolderToWorkspace": "&&Ordner zum Arbeitsbereich hinzufügen...",
-+>>>>>>> .their
- 	"miSave": "&&Speichern",
- 	"miSaveAs": "Speichern &&unter...",
- 	"miSaveAll": "A&&lles speichern",
-@@ -189,5 +198,11 @@
- 	"miDownloadingUpdate": "Das Update wird heruntergeladen...",
- 	"miInstallUpdate": "Update installieren …",
- 	"miInstallingUpdate": "Update wird installiert...",
-+<<<<<<< .our
- 	"miRestartToUpdate": "Zum Aktualisieren neu starten..."
-+=======
-+	"miCheckForUpdates": "Nach Aktualisierungen suchen...",
-+	"aboutDetail": "\nVersion {0}\nCommit {1}\nDatum {2}\nShell {3}\nRenderer {4}\nKnoten {5}\nArchitektur {6}",
-+	"okButton": "OK"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/deu/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
-  our    100644 ac5ede63bdad3f517c243ff071879566adbbceae i18n/deu/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
-  their  100644 59257f107ffc766067dc0665995a1fe15aeb166b i18n/deu/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"diff.tooLarge": "Kann die Dateien nicht vergleichen, da eine Datei zu groß ist."
- }
-\ No newline at end of file
-changed in both
-  base   100644 c96d13745a4103d8bbf85f7bc914f575aae66dc6 i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 0cb95fccc47d309d94aacd1e25b0718fd455d527 i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 390c1dcac71f278618f820742e452897fafd1e28 i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json
-changed in both
-  base   100644 56e0924a36c8f29bc1b45ad635d4feda8d334958 i18n/deu/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 7bcd160f251f75f4318d89da439565bbd4c696e5 i18n/deu/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 d15ae588852787b74e3102ade3ea959a0839cf9e i18n/deu/src/vs/editor/common/view/editorColorRegistry.i18n.json
-changed in both
-  base   100644 1766611d9a43ced4e1ebee10a06185f7cb9b8533 i18n/deu/src/vs/editor/contrib/find/common/findController.i18n.json
-  our    100644 966c9eafe93d9687633b93001e9f81c1a52554ac i18n/deu/src/vs/editor/contrib/find/common/findController.i18n.json
-  their  100644 a704a48537415cf89b16a1f544157c105f361124 i18n/deu/src/vs/editor/contrib/find/common/findController.i18n.json
-@@ -10,6 +10,15 @@
- 	"nextSelectionMatchFindAction": "Nächste Auswahl suchen",
- 	"previousSelectionMatchFindAction": "Vorherige Auswahl suchen",
- 	"startReplace": "Ersetzen",
-+<<<<<<< .our
-+=======
-+	"addSelectionToNextFindMatch": "Auswahl zur nächsten Übereinstimmungssuche hinzufügen",
-+	"addSelectionToPreviousFindMatch": "Letzte Auswahl zu vorheriger Übereinstimmungssuche hinzufügen",
-+	"moveSelectionToNextFindMatch": "Letzte Auswahl in nächste Übereinstimmungssuche verschieben",
-+	"moveSelectionToPreviousFindMatch": "Letzte Auswahl in vorherige Übereinstimmungssuche verschieben",
-+	"selectAllOccurrencesOfFindMatch": "Alle Vorkommen auswählen und Übereinstimmung suchen",
-+	"changeAll.label": "Alle Vorkommen ändern",
-+>>>>>>> .their
- 	"showNextFindTermAction": "Nächsten Suchbegriff anzeigen",
- 	"showPreviousFindTermAction": "Vorherigen Suchbegriff anzeigen"
- }
-\ No newline at end of file
-changed in both
-  base   100644 88af0de928a075c57bf0edcda7af629cebae0f76 i18n/deu/src/vs/platform/history/electron-main/historyMainService.i18n.json
-  our    100644 45518a8f05289158f9a6a01043e48b1d666c428a i18n/deu/src/vs/platform/history/electron-main/historyMainService.i18n.json
-  their  100644 5d0462e717abf9f06c780a93cc6b7e9a8599fc32 i18n/deu/src/vs/platform/history/electron-main/historyMainService.i18n.json
-changed in both
-  base   100644 a66c145ad23e2875a00249a655ef7abe470978bd i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 b32f03c31fd5ffcb9742f2b1188daade81a7b028 i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 a0b7ad9a177df48dd18c79264275f8d43ae69b35 i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -60,7 +60,11 @@
- 	"scrollbarShadow": "Schatten der Scrollleiste, um anzuzeigen, dass die Ansicht gescrollt wird.",
- 	"scrollbarSliderBackground": "Hintergrundfarbe vom Scrollbar-Schieber",
- 	"scrollbarSliderHoverBackground": "Hintergrundfarbe des Schiebereglers, wenn darauf gezeigt wird.",
-+<<<<<<< .our
- 	"scrollbarSliderActiveBackground": "Hintergrundfarbe des Schiebereglers, wenn darauf geklickt wird.",
-+=======
-+	"scrollbarSliderActiveBackground": "Hintergrundfarbe des Schiebereglers, wenn dieser aktiv ist.",
-+>>>>>>> .their
- 	"progressBarBackground": "Hintergrundfarbe des Fortschrittbalkens, der für lang ausgeführte Vorgänge angezeigt werden kann.",
- 	"editorBackground": "Hintergrundfarbe des Editors.",
- 	"editorForeground": "Standardvordergrundfarbe des Editors.",
-changed in both
-  base   100644 2c55bed538b95582b0288d9d5439abd117bf4051 i18n/deu/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 108a8fac6be8b55e95f04920e7eb7dd21d592b50 i18n/deu/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 a0694aea6d4856cd9db3bb403d7fd1d178419dce i18n/deu/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -9,6 +9,7 @@
- 	"openFile": "Datei öffnen...",
- 	"openFolder": "Ordner öffnen...",
- 	"openFileFolder": "Öffnen...",
-+<<<<<<< .our
- 	"globalRemoveFolderFromWorkspace": "Ordner aus dem Arbeitsbereich entfernen...",
- 	"saveWorkspaceAsAction": "Arbeitsbereich speichern unter...",
- 	"save": "&&Speichern",
-@@ -16,4 +17,24 @@
- 	"openWorkspaceAction": "Arbeitsbereich öffnen...",
- 	"openWorkspaceConfigFile": "Konfigurationsdatei des Arbeitsbereichs öffnen",
- 	"duplicateWorkspaceInNewWindow": "Duplikat des Arbeitsbereichs in neuem Fenster erstellen"
-+=======
-+	"reload": "E&&rneut laden",
-+	"cancel": "Abbrechen",
-+	"newWorkspaceFormExisting": "Neuer Arbeitsbereich aus vorhandenem...",
-+	"select": "Au&&swählen",
-+	"selectWorkspace": "Ordner für den Arbeitsbereich auswählen",
-+	"addSupported": "Zum Öffnen mehrerer Ordner muss das Fenster erneut geladen werden.",
-+	"addFolderToWorkspace": "Ordner zum Arbeitsbereich hinzufügen...",
-+	"add": "&&Hinzufügen",
-+	"addFolderToWorkspaceTitle": "Ordner zum Arbeitsbereich hinzufügen",
-+	"removeFolderFromWorkspace": "Ordner aus dem Arbeitsbereich entfernen",
-+	"saveWorkspaceAsAction": "Arbeitsbereich speichern unter...",
-+	"saveEmptyWorkspaceNotSupported": "Öffnen Sie zum Speichern zunächst einen Arbeitsbereich.",
-+	"saveNotSupported": "Zum Speichern des Arbeitsbereichs muss das Fenster erneut geladen werden.",
-+	"save": "&&Speichern",
-+	"saveWorkspace": "Arbeitsbereich speichern",
-+	"openWorkspaceAction": "Arbeitsbereich öffnen...",
-+	"newWorkspace": "Neuer Arbeitsbereich...",
-+	"openWorkspaceConfigFile": "Konfigurationsdatei des Arbeitsbereichs öffnen"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 fe0b21dfd66febbed8bf102e75453a40160608a1 i18n/deu/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 bfd72770d07a936659f4d75458f1721e0e96ed8a i18n/deu/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 16d380370f6bc4cc58af60318a0b34dfbd39cef1 i18n/deu/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 870bcf2795a5d391ab44802e1eed9744de058680 i18n/deu/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-  our    100644 5aff102ff6f5b6ee71757498b4052435747a48e1 i18n/deu/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-  their  100644 e6a573610242b0b95a887f31475333c9b1137171 i18n/deu/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,9 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"compositePart.hideSideBarLabel": "Randleiste ausblenden",
-+>>>>>>> .their
- 	"focusSideBar": "Fokus in Randleiste",
- 	"viewCategory": "Anzeigen"
- }
-\ No newline at end of file
-changed in both
-  base   100644 20f046bd07c9af448cefee7b7fe475a9e04d8b7c i18n/deu/src/vs/workbench/common/theme.i18n.json
-  our    100644 7230e04365d13635c1ebe9cad1ed0f92866146cc i18n/deu/src/vs/workbench/common/theme.i18n.json
-  their  100644 6cde0d23751ebd6882303500a6983bab550c8c7f i18n/deu/src/vs/workbench/common/theme.i18n.json
-@@ -61,6 +61,7 @@
- 	"titleBarActiveBackground": "Hintergrund der Titelleiste, wenn das Fenster aktiv ist. Diese Farbe wird derzeit nur von MacOS unterstützt.",
- 	"titleBarInactiveBackground": "Hintergrund der Titelleiste, wenn das Fenster inaktiv ist. Diese Farbe wird derzeit nur von MacOS unterstützt.",
- 	"titleBarBorder": "Rahmenfarbe der Titelleiste. Diese Farbe wird derzeit nur unter MacOS unterstützt.",
-+<<<<<<< .our
- 	"notificationCenterBorder": "Rahmenfarbe der Benachrichtigungszentrale. Benachrichtigungen werden unten rechts eingeblendet.",
- 	"notificationToastBorder": "Rahmenfarbe der Popupbenachrichtigung. Benachrichtigungen werden unten rechts eingeblendet.",
- 	"notificationsForeground": "Vordergrundfarbe für Benachrichtigungen. Benachrichtigungen werden unten rechts eingeblendet.",
-@@ -69,4 +70,17 @@
- 	"notificationCenterHeaderForeground": "Vordergrundfarbe für Kopfzeile der Benachrichtigungszentrale. Benachrichtigungen werden unten rechts eingeblendet.",
- 	"notificationCenterHeaderBackground": "Hintergrundfarbe für Kopfzeile der Benachrichtigungszentrale. Benachrichtigungen werden unten rechts eingeblendet.",
- 	"notificationsBorder": "Rahmenfarbe für Benachrichtigungen zum Trennen von anderen Benachrichtigungen in der Benachrichtigungszentrale. Benachrichtigungen werden unten rechts eingeblendet."
-+=======
-+	"notificationsForeground": "Vordergrundfarbe für Benachrichtigungen. Benachrichtigungen werden oben im Fenster eingeblendet.",
-+	"notificationsBackground": "Hintergrundfarbe für Benachrichtigungen. Benachrichtigungen werden oben im Fenster eingeblendet.",
-+	"notificationsButtonBackground": "Hintergrundfarbe der Benachrichtigungsschaltfläche. Benachrichtigungen werden oben im Fenster eingeblendet.",
-+	"notificationsButtonHoverBackground": "Hintergrundfarbe der Benachrichtigungsschaltfläche, wenn darauf gezeigt wird. Benachrichtigungen werden oben im Fenster eingeblendet.",
-+	"notificationsButtonForeground": "Vordergrundfarbe der Benachrichtigungsschaltfläche. Benachrichtigungen werden oben im Fenster eingeblendet.",
-+	"notificationsInfoBackground": "Hintergrundfarbe von Benachrichtigungsinformationen. Benachrichtigungen werden oben im Fenster eingeblendet.",
-+	"notificationsInfoForeground": "Vordergrundfarbe von Benachrichtigungsinformationen. Benachrichtigungen werden oben im Fenster eingeblendet.",
-+	"notificationsWarningBackground": "Hintergrundfarbe von Benachrichtigungswarnungen. Benachrichtigungen werden oben im Fenster eingeblendet.",
-+	"notificationsWarningForeground": "Vordergrundfarbe von Benachrichtigungswarnungen. Benachrichtigungen werden oben im Fenster eingeblendet.",
-+	"notificationsErrorBackground": "Hintergrundfarbe von Benachrichtigungsfehlern. Benachrichtigungen werden oben im Fenster eingeblendet.",
-+	"notificationsErrorForeground": "Vordergrundfarbe von Benachrichtigungsfehlern. Benachrichtigungen werden oben im Fenster eingeblendet."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6af3818bfee8e5b3f41e793e98c9b72f1ec25025 i18n/deu/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 1609e7c92719c7aa89402c8bf0018971f9a1043e i18n/deu/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 fc58109765ade07d20b81f82323a32e9e4aae440 i18n/deu/src/vs/workbench/electron-browser/actions.i18n.json
-changed in both
-  base   100644 624c0ec5539441248b4a9ef99c15411932a20f51 i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 fc92fd392259fb9b2d1dec1cecdbc3c76bdc7440 i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 908ac5f9840805490661d6af4100fed1bd354029 i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,6 +35,7 @@
- 	"panelDefaultLocation": "Steuert die Standardposition des Panels. Dieses kann entweder unterhalb oder rechts von der Workbench angezeigt werden.",
- 	"statusBarVisibility": "Steuert die Sichtbarkeit der Statusleiste im unteren Bereich der Workbench.",
- 	"activityBarVisibility": "Steuert die Sichtbarkeit der Aktivitätsleiste in der Workbench.",
-+<<<<<<< .our
- 	"viewVisibility": "Steuert die Sichtbarkeit von Headeraktionen. Headeraktionen können immer sichtbar sein oder nur sichtbar sein, wenn diese Ansicht fokussiert ist oder mit der Maus darauf gezeigt wird.",
- 	"fontAliasing": "Steuert die Schriftartaliasingmethode in der Workbench.\n - default: Subpixel-Schriftartglättung. Auf den meisten Nicht-Retina-Displays wird Text bei dieser Einstellung am schärfsten dargestellt. \n- antialiased: Glättet die Schriftart auf der Pixelebene (im Gegensatz zur Subpixelebene). Bei dieser Einstellung kann die Schriftart insgesamt heller wirken.\n- none: Deaktiviert die Schriftartglättung. Text wird mit gezackten scharfen Kanten dargestellt.\n- auto: Wendet ausgehend vom DPI der Anzeige automatisch \"default\" oder \"antialiased\" an.",
- 	"workbench.fontAliasing.default": "Subpixel-Schriftartglättung. Auf den meisten Nicht-Retina-Displays wird Text bei dieser Einstellung am schärfsten dargestellt.",
-@@ -43,6 +44,15 @@
- 	"workbench.fontAliasing.auto": "Wendet ausgehend vom DPI der Anzeige automatisch \"default\" oder \"antialiased\" an.",
- 	"enableNaturalLanguageSettingsSearch": "Steuert, ob der Suchmodus mit natürlicher Sprache für die Einstellungen aktiviert werden soll.",
- 	"windowConfigurationTitle": "Fenster",
-+=======
-+	"closeOnFileDelete": "Steuert, ob Editoren, die eine Datei anzeigen, automatisch geschlossen werden sollen, wenn die Datei von einem anderen Prozess umbenannt oder gelöscht wird. Wenn Sie diese Option deaktivieren, bleibt der Editor bei einem solchen Ereignis als geändert offen. Bei Löschvorgängen innerhalb der Anwendung wird der Editor immer geschlossen, und geänderte Dateien werden nie geschlossen, damit Ihre Daten nicht verloren gehen.",
-+	"fontAliasing": "Steuert die Schriftartaliasingmethode in der Workbench.\n- default: Subpixel-Schriftartglättung. Auf den meisten Nicht-Retina-Displays wird Text bei dieser Einstellung am schärfsten dargestellt.\n- antialiased: Glättet die Schriftart auf der Pixelebene (im Gegensatz zur Subpixelebene). Bei dieser Einstellung kann die Schriftart insgesamt heller wirken.\n- none: Deaktiviert die Schriftartglättung. Text wird mit gezackten scharfen Kanten dargestellt.\n",
-+	"workbench.fontAliasing.default": "Subpixel-Schriftartglättung. Auf den meisten Nicht-Retina-Displays wird Text bei dieser Einstellung am schärfsten dargestellt.",
-+	"workbench.fontAliasing.antialiased": "Glättet die Schriftart auf der Pixelebene (im Gegensatz zur Subpixelebene). Bei dieser Einstellung kann die Schriftart insgesamt heller wirken.",
-+	"workbench.fontAliasing.none": "Deaktiviert die Schriftartglättung. Text wird mit gezackten scharfen Kanten dargestellt.",
-+	"swipeToNavigate": "Hiermit navigieren Sie per waagrechtem Wischen mit drei Fingen zwischen geöffneten Dateien.",
-+	"workbenchConfigurationTitle": "Workbench",
-+>>>>>>> .their
- 	"window.openFilesInNewWindow.on": "Dateien werden in einem neuen Fenster geöffnet.",
- 	"window.openFilesInNewWindow.off": "Dateien werden im Fenster mit dem geöffneten Dateiordner oder im letzten aktiven Fenster geöffnet.",
- 	"window.openFilesInNewWindow.defaultMac": "Dateien werden im Fenster mit dem geöffneten Dateiordner oder im letzten aktiven Fenster geöffnet, sofern sie nicht über das Dock oder den Finder geöffnet werden.",
-changed in both
-  base   100644 fcfa5e59e8fdf81b9992c20f1c90353fe5155167 i18n/deu/src/vs/workbench/electron-browser/window.i18n.json
-  our    100644 4c4d3d858c118a5c816610f7b78e3f49ca6d0d66 i18n/deu/src/vs/workbench/electron-browser/window.i18n.json
-  their  100644 00352ea7fda43462db3813ba46dd5f4b8154e0ae i18n/deu/src/vs/workbench/electron-browser/window.i18n.json
-@@ -12,5 +12,10 @@
- 	"copy": "Kopieren",
- 	"paste": "Einfügen",
- 	"selectAll": "Alles auswählen",
-+<<<<<<< .our
- 	"runningAsRoot": "Es wird nicht empfohlen, {0} als Root-Benutzer auszuführen."
-+=======
-+	"confirmOpen": "Sind Sie sicher, dass Sie {0} Arbeitsbereiche öffnen möchten?",
-+	"confirmOpenButton": "&&Öffnen"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 3886214271ecc8b5e3610f8a547dced7cdbe45b2 i18n/deu/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  our    100644 ddda783ca8462bb00a69ac063609b63009b0e769 i18n/deu/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  their  100644 f8f92c8accfaf85b6f77866ad235403d02144ce7 i18n/deu/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-changed in both
-  base   100644 4588894202af0a4c69cf51fe010ef3000cc7db93 i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 d6cc1170dbfaab61ca55376b64654ebe15edb98e i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 7101b4ffb876d56a12bbcce5b4e508d73f3f43ed i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -28,7 +28,13 @@
- 	"preLaunchTaskExitCode": "Der preLaunchTask \"{0}\" wurde mit dem Exitcode {1} beendet.",
- 	"showErrors": "Fehler anzeigen",
- 	"noFolderWorkspaceDebugError": "Debuggen der aktiven Datei ist nicht möglich. Stellen Sie sicher, dass sie auf einem Datenträger gespeichert ist und dass Sie die Debugerweiterung für diesen Dateityp installiert haben.",
-+<<<<<<< .our
- 	"cancel": "Abbrechen",
- 	"DebugTaskNotFound": "Der Task \"{0}\" konnte nicht gefunden werden.",
- 	"taskNotTracked": "Der Task \"{0}\" kann nicht nachverfolgt werden."
-+=======
-+	"NewLaunchConfig": "Richten Sie die Startkonfigurationsdatei für Ihre Anwendung ein. {0}",
-+	"DebugTaskNotFound": "Der preLaunchTask \"{0}\" wurde nicht gefunden.",
-+	"differentTaskRunning": "Die Aufgabe \"{0}\" wird bereits ausgeführt. Die Aufgabe \"{1}\" vor dem Start kann nicht ausgeführt werden."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 57d2b6200423f3560ec630b7fb173184d283237d i18n/deu/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  our    100644 d4395810a2fe1de4942de018b95fcee0dd85b088 i18n/deu/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  their  100644 3de79db297ebde37bcde55d475d1dae0fc159314 i18n/deu/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-merged
-  result 100644 5c81aa23b633da3476852d85a456fa282aa4ae05 i18n/deu/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-  our    100644 c344b63f2642e76618c3fb2a6df96403a5b5bc78 i18n/deu/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-@@ -7,8 +7,5 @@
- 	"emmetConfigurationTitle": "Emmet",
- 	"triggerExpansionOnTab": "Wenn diese Option aktiviert ist, werden Emmet-Abkürzungen beim Drücken der TAB-TASTE erweitert. Nicht zutreffend, wenn emmet.useNewemmet auf \"true\" festgelegt ist.",
- 	"emmetPreferences": "Einstellungen, die zum Ändern des Verhaltens einiger Aktionen und Resolver von Emmet verwendet werden. Nicht zutreffend, wenn emmet.useNewemmet auf \"true\" festgelegt ist.",
--	"emmetSyntaxProfiles": "Definieren Sie das Profil für die angegebene Syntax, oder verwenden Sie Ihr eigenes Profil mit bestimmten Regeln.",
--	"emmetExclude": "Ein Array von Sprachen, in dem Emmet-Abkürzungen nicht erweitert werden sollen.",
--	"emmetExtensionsPath": "Pfad zu einem Ordner mit Emmet-Profilen, -Ausschnitten und -Einstellungen. Wenn emmet.useNewEmmet auf \"true\" festgelegt ist, werden nur Profile vom Erweiterungspfad berücksichtigt.",
- 	"useNewEmmet": "Testen Sie die neuen Emmet-Module (die letztendlich die alte einzelne Emmet-Bibliothek ersetzen) für alle Emmet-Funktionen."
- }
-\ No newline at end of file
-changed in both
-  base   100644 f14a2f53165cd54ca89c3c268e1afcd90307a746 i18n/deu/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  our    100644 ffcb91c35c3b84aa761f9cf48403d04cda0e5ae4 i18n/deu/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  their  100644 0b10a0310640832c8a3915fac3d07fdb8efec6d2 i18n/deu/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-changed in both
-  base   100644 0e32d73283c0620025905bbab284e509d3d2515b i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 cf7a07fdcb5de4fa57ac5ab17021ee98e54c3fc8 i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 39ae9002f33adb326e270912b47af97a866a56d4 i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-changed in both
-  base   100644 72876f0d4f678b46d6769e17f4a17b069b6c2c6d i18n/deu/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
-  our    100644 46de1e8541a805d4182b71abb75b9857226854c4 i18n/deu/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
-  their  100644 bc53701d4ae437060ca49f98787d0548028622e4 i18n/deu/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
-@@ -4,7 +4,11 @@
-  *--------------------------------------------------------------------------------------------*/
- // Do not edit this file. It is machine generated.
- {
-+<<<<<<< .our
- 	"filesCategory": "Datei",
-+=======
-+	"filesCategory": "Dateien",
-+>>>>>>> .their
- 	"revealInSideBar": "In Seitenleiste anzeigen",
- 	"acceptLocalChanges": "Änderungen verwenden und Datenträgerinhalte überschreiben",
- 	"revertLocalChanges": "Änderungen verwerfen und Datenträgerinhalte wiederherstellen"
-changed in both
-  base   100644 074e91a4e393e893480513aabe524f59da0b145c i18n/deu/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  our    100644 146bfaf2e064336bab67d6d79de7ec4303d23e61 i18n/deu/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  their  100644 48a3c7f870d26e5fdfe78eae393ceaaf1abe791d i18n/deu/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-changed in both
-  base   100644 a959a89e774dc4329ff85c5c4d71a075f6b681c8 i18n/deu/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 00a2164ceaa6feb9c7573ae407355c84d09fbc3c i18n/deu/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 5ffcbbdc2703496912ce894b3c30ff0d87edd0a1 i18n/deu/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-@@ -40,6 +40,7 @@
- 	"dynamicHeight": "Steuert, ob sich die Höhe des Abschnitts \"Geöffnete Editoren\" dynamisch an die Anzahl der Elemente anpassen soll.",
- 	"autoReveal": "Steuert, ob der Explorer Dateien beim Öffnen automatisch anzeigen und auswählen soll.",
- 	"enableDragAndDrop": "Steuert, ob der Explorer das Verschieben von Dateien und Ordnern mithilfe von Drag  Drop zulassen soll.",
-+<<<<<<< .our
- 	"confirmDragAndDrop": "Steuert, ob der Explorer um Bestätigung bittet, um Dateien und Ordner per Drag & Drop zu verschieben.",
- 	"confirmDelete": "Steuert, ob der Explorer um Bestätigung bitten soll, wenn Sie eine Datei über den Papierkorb löschen.",
- 	"sortOrder.default": "Dateien und Ordner werden nach ihren Namen in alphabetischer Reihenfolge sortiert. Ordner werden vor Dateien angezeigt. ",
-@@ -50,4 +51,12 @@
- 	"sortOrder": "Steuert die Sortierreihenfolge von Dateien und Ordnern im Explorer. Zusätzlich zur Standardsortierreihenfolge können Sie die Reihenfolge auf \"mixed\" (kombinierte Sortierung von Dateien und Ordnern), \"type\" (nach Dateityp), \"modified\" (nach letztem Änderungsdatum) oder \"filesFirst\" (Dateien vor Ordnern anzeigen) festlegen.",
- 	"explorer.decorations.colors": "Steuert, ob Dateidekorationen Farben verwenden.",
- 	"explorer.decorations.badges": "Steuert, ob Dateidekorationen Badges verwenden."
-+=======
-+	"sortOrder.default": "Dateien und Verzeichnisse werden in alphabetischer Reihenfolge nach Namen sortiert. Verzeichnisse werden vor Dateien angezeigt.",
-+	"sortOrder.mixed": "Dateien und Verzeichnisse werden in alphabetischer Reihenfolge nach Namen sortiert. Dateien und Verzeichnisse werden vermischt angezeigt.",
-+	"sortOrder.filesFirst": "Dateien und Verzeichnisse werden in alphabetischer Reihenfolge nach Namen sortiert. Dateien werden vor Verzeichnissen angezeigt.",
-+	"sortOrder.type": "Dateien und Verzeichnisse werden in alphabetischer Reihenfolge nach Erweiterungen sortiert. Verzeichnisse werden vor Dateien angezeigt.",
-+	"sortOrder.modified": "Dateien und Verzeichnisse werden in absteigender Reihenfolge nach dem Datum der letzten Änderung sortiert. Verzeichnisse werden vor Dateien angezeigt.",
-+	"sortOrder": "Steuert die Sortierung von Dateien und Verzeichnissen im Explorer."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a9804d972b229d4ae3053c3b9f9774ad84f8306c i18n/deu/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-  our    100644 55ed6344bee5a16153879a922530a6ec8eac9933 i18n/deu/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-  their  100644 7bd4f281a16e90c09992384ba94903ce0b0d6fde i18n/deu/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-@@ -12,5 +12,6 @@
- 	"genericSaveError": "Fehler beim Speichern von \"{0}\": {1}.",
- 	"staleSaveError": "Fehler beim Speichern von \"{0}\": Der Inhalt auf dem Datenträger ist neuer. Klicken Sie auf **Vergleichen**, um Ihre Version mit der Version auf dem Datenträger zu vergleichen.",
- 	"compareChanges": "Vergleichen",
--	"saveConflictDiffLabel": "{0} (auf Datenträger) ↔ {1} (in {2}): Speicherkonflikt lösen"
-+	"saveConflictDiffLabel": "{0} (auf Datenträger) ↔ {1} (in {2}): Speicherkonflikt lösen",
-+	"userGuide": "Verwenden Sie die Aktionen auf der Editor-Symbolleiste auf der rechten Seite, um Ihre Änderungen **rückgängig zu machen** oder den Inhalt auf dem Datenträger mit Ihren Änderungen zu **überschreiben**."
- }
-\ No newline at end of file
-changed in both
-  base   100644 157325389a5f25722b7c2bc1bc9b6bbfc5ba3c50 i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  our    100644 69766a391fed29fd2a77d8603a89733b0bed7495 i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  their  100644 73113cf629416b51787bb1eb2cd34deeeb1fe266 i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-@@ -14,6 +14,10 @@
- 	"openGlobalKeybindingsFile": "Datei mit Tastaturkurzbefehlen öffnen",
- 	"openWorkspaceSettings": "Arbeitsbereichseinstellungen öffnen",
- 	"openFolderSettings": "Ordnereinstellungen öffnen",
-+<<<<<<< .our
-+=======
-+	"pickFolder": "Ordner auswählen",
-+>>>>>>> .their
- 	"configureLanguageBasedSettings": "Sprachspezifische Einstellungen konfigurieren...",
- 	"languageDescriptionConfigured": "({0})",
- 	"pickLanguage": "Sprache auswählen"
-changed in both
-  base   100644 e39c41141f00155e6b9dc3e17df012ab5a8e8e0a i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 93e401bd692b17b66ba4a0cb54c6f67464e449ac i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 c7f0245455c7f6d35f2d40d2db5ed9de0c0ad045 i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -14,4 +15,19 @@
- 	"editTtile": "Bearbeiten",
- 	"replaceDefaultValue": "In Einstellungen ersetzen",
- 	"copyDefaultValue": "In Einstellungen kopieren"
-+=======
-+	"emptyUserSettingsHeader": "Platzieren Sie Ihre Einstellungen hier, um die Standardeinstellungen zu überschreiben.",
-+	"errorInvalidConfiguration": "Einstellungen können nicht geschrieben werden. Öffnen Sie die Datei, um Fehler/Warnungen in der Datei zu korrigieren. Versuchen Sie es anschließend noch mal.",
-+	"emptyWorkspaceSettingsHeader": "Platzieren Sie Ihre Einstellungen hier, um die Benutzereinstellungen zu überschreiben.",
-+	"emptyFolderSettingsHeader": "Platzieren Sie Ihre Ordnereinstellungen hier, um die Einstellungen in den Arbeitsbereichseinstellungen zu überschreiben.",
-+	"defaultFolderSettingsTitle": "Standardordnereinstellungen",
-+	"defaultSettingsTitle": "Standardeinstellungen",
-+	"noSettingsFound": "Keine Einstellungen gefunden.",
-+	"editTtile": "Bearbeiten",
-+	"replaceDefaultValue": "In Einstellungen ersetzen",
-+	"copyDefaultValue": "In Einstellungen kopieren",
-+	"unsupportedPHPExecutablePathSetting": "Diese Einstellung muss eine Benutzereinstellung sein. Öffnen Sie zum Konfigurieren von PHP für den Arbeitsbereich eine PHP-Datei, und klicken Sie in der Statusleiste auf \"PHP-Pfad\".",
-+	"unsupportedWorkspaceSetting": "Diese Einstellung muss eine Benutzereinstellung sein.",
-+	"unsupportedWorkbenchSetting": "Diese Einstellung kann jetzt nicht angewendet werden. Sie wird angewendet, wenn Sie den Ordner direkt öffnen."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f28cfa282a3346026a136ee46195ab686b252e00 i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-  our    100644 13bbcc4e6f2e8917c91b8e538c5ae2056a00c878 i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-  their  100644 29ee08e9ffca0c6a66ff9b5869f96bb6c00be649 i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 cfd3784b25185836bda1d8d6784b3e81792155f0 i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 6c90dea80f47d72c434318e2c0963ba5bccd11a8 i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -12,4 +13,13 @@
- 	"userSettings": "Benutzereinstellungen",
- 	"workspaceSettings": "Arbeitsbereichseinstellungen",
- 	"folderSettings": "Ordnereinstellungen"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"folderSettingsDetails": "Ordnereinstellungen"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 30e347510d43c5806741967a6745068f2cd6f432 i18n/deu/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  our    100644 944c8644290b13cdcb690093cff1d8e9a037f81b i18n/deu/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  their  100644 4e537daf3e5002d319bf1dfeabf2273c7fba3744 i18n/deu/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-@@ -8,5 +8,11 @@
- 	],
- 	"relaunchSettingMessage": "Eine Einstellung wurde geändert, welche einen Neustart benötigt.",
- 	"relaunchSettingDetail": "Drücke den Neu starten-Button, um {0} neuzustarten und die Einstellung zu aktivieren.",
-+<<<<<<< .our
- 	"restart": "&&Neu starten"
-+=======
-+	"restart": "Neu starten",
-+	"relaunchWorkspaceMessage": "Dieser Arbeitsbereich erfordert das erneute Laden des Erweiterungssystems.",
-+	"reload": "Neu starten"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 2914ad5ba59e7889a1648a7d2d7ac79bb3aa74f7 i18n/deu/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 1dcdaff92772bd253ab87cb0ce46920ce5c5e6bc i18n/deu/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 b16c9eacc2aec0509c74506a12ffad9ce50eaeda i18n/deu/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"nextSearchIncludePattern": "Nächstes Sucheinschlussmuster anzeigen",
- 	"previousSearchIncludePattern": "Vorheriges Sucheinschlussmuster anzeigen",
- 	"nextSearchExcludePattern": "Nächstes Suchausschlussmuster anzeigen",
-@@ -16,6 +19,8 @@
- 	"previousReplaceTerm": "Vorherigen Such-/Ersetzungsbegriff anzeigen ",
- 	"findInFiles": "In Dateien suchen",
- 	"replaceInFiles": "In Dateien ersetzen",
-+	"findInWorkspace": "In Arbeitsbereich suchen...",
-+	"findInFolder": "In Ordner suchen...",
- 	"RefreshAction.label": "Aktualisieren",
- 	"CollapseDeepestExpandedLevelAction.label": "Alle zuklappen",
- 	"ClearSearchResultsAction.label": "Löschen",
-changed in both
-  base   100644 8ec0049b3b37ba259c8ad15829388e11fff001cb i18n/deu/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-  our    100644 7fc53a6c4eefd13fb550ab2f60913080f68637da i18n/deu/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-  their  100644 66ba97093a94a46a9be324b8085b85c39555ccd4 i18n/deu/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"searchFolderMatch.other.label": "Andere Dateien",
- 	"searchFileMatches": "{0} Dateien gefunden",
- 	"searchFileMatch": "{0} Datei gefunden",
-changed in both
-  base   100644 86e0e518608a25b5f3b0c74109b855024a7aa9d1 i18n/deu/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  our    100644 f2f216a0a047fbef56f5094bbd15e808251180f1 i18n/deu/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  their  100644 b7189463a56677556b81e950b165a0c09f49e0b9 i18n/deu/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-changed in both
-  base   100644 76d6135b7eb9bb3c9309f346b1f52786ee73615d i18n/deu/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 b3a9bfb6f09fdd913393d2a5b333f495988fabdc i18n/deu/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 227a46a1685e61a1c67b2aad2ce5133a1b0ee127 i18n/deu/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-changed in both
-  base   100644 b85cadb9245a83b3bb024d9868956eef54dbc116 i18n/deu/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 5e860baf0d874c2a564e21bd9c48c55877bc2bfd i18n/deu/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 7d2a7a768ee32b2c274aa3e79d9184de3672c26f i18n/deu/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -12,8 +12,12 @@
- 	"totalWarnings": "{0} Warnungen",
- 	"totalInfos": "{0}-Informationen",
- 	"problems": "Probleme",
-+<<<<<<< .our
- 	"building": "Wird gebaut...",
- 	"manyProblems": "Über 10.000",
-+=======
-+	"manyMarkers": "mehr als 99",
-+>>>>>>> .their
- 	"runningTasks": "Aktive Aufgaben anzeigen",
- 	"tasks": "Aufgaben",
- 	"TaskSystem.noHotSwap": "Zum Ändern des Aufgabenausführungsmoduls mit einem aktiven Task muss das Fenster erneut geladen werden.",
-@@ -24,17 +28,25 @@
- 	"TaskService.noTestTask1": "Keine Testaufgabe definiert. Markieren Sie eine Aufgabe mit 'isTestCommand' in der tasks.json-Datei.",
- 	"TaskService.noTestTask2": "Es ist keine Testaufgabe definiert. Markieren Sie eine Aufgabe in der Datei \"tasks.json\" als \"Testgruppe\". ",
- 	"TaskServer.noTask": "Die angeforderte auszuführende Aufgabe {0} wurde nicht gefunden.",
-+<<<<<<< .our
- 	"TaskService.associate": "assoziieren",
-+=======
-+>>>>>>> .their
- 	"TaskService.attachProblemMatcher.continueWithout": "Ohne Überprüfung der Aufgabenausgabe fortsetzen",
- 	"TaskService.attachProblemMatcher.never": "Aufgabenausgabe nie überprüfen",
- 	"TaskService.attachProblemMatcher.learnMoreAbout": "Weitere Informationen zur Überprüfung der Aufgabenausgabe",
- 	"selectProblemMatcher": "Fehler- und Warnungsarten auswählen, auf die die Aufgabenausgabe überprüft werden soll",
- 	"customizeParseErrors": "Die aktuelle Aufgabenkonfiguration weist Fehler auf. Beheben Sie die Fehler, bevor Sie eine Aufgabe anpassen.",
- 	"moreThanOneBuildTask": "In \"tasks.json\" sind mehrere Buildaufgaben definiert. Die erste wird ausgeführt.\n",
-+<<<<<<< .our
- 	"TaskSystem.activeSame.background": "Die Aufgabe \"{0}\" ist bereits aktiv und befindet sich im Hintergrundmodus.",
- 	"TaskSystem.activeSame.noBackground": "Die Aufgabe \"{0}\" ist bereits aktiv.",
- 	"terminateTask": "Aufgabe beenden",
- 	"restartTask": "Aufgabe neu starten",
-+=======
-+	"TaskSystem.activeSame.background": "Die Aufgabe \"{0}\" ist bereits im Hintergrundmodus aktiv. Klicken Sie zum Beenden der Aufgabe im Menü \"Aufgaben\" auf \"Aufgabe beenden\".",
-+	"TaskSystem.activeSame.noBackground": "Die Aufgabe \"{0}\" ist bereits aktiv. Klicken Sie zum Beenden der Aufgabe im Menü \"Aufgaben\" auf \"Aufgabe beenden\".",
-+>>>>>>> .their
- 	"TaskSystem.active": "Eine aktive Aufgabe wird bereits ausgeführt. Beenden Sie diese, bevor Sie eine andere Aufgabe ausführen.",
- 	"TaskSystem.restartFailed": "Fehler beim Beenden und Neustarten der Aufgabe \"{0}\".",
- 	"TaskService.noConfiguration": "Fehler: Die Aufgabenerkennung {0} hat für die folgende Konfiguration keine Aufgabe beigetragen:\n {1}\nDie Aufgabe wird ignoriert.\n",
-@@ -75,8 +87,13 @@
- 	"TaskService.pickDefaultBuildTask": "Als Standardbuildaufgabe zu verwendende Aufgabe auswählen",
- 	"TaskService.defaultTestTaskExists": "{0} ist bereits als Standardtestaufgabe markiert.",
- 	"TaskService.pickDefaultTestTask": "Als Standardtestaufgabe zu verwendende Aufgabe auswählen",
-+<<<<<<< .our
- 	"TaskService.pickShowTask": "Aufgabe zum Anzeigen der Ausgabe auswählen",
- 	"TaskService.noTaskIsRunning": "Es wird keine Aufgabe ausgeführt.",
-+=======
-+	"TaskService.noTaskIsRunning": "Es wird keine Aufgabe ausgeführt.",
-+	"TaskService.pickShowTask": "Aufgabe zum Anzeigen der Ausgabe auswählen",
-+>>>>>>> .their
- 	"ShowLogAction.label": "Taskprotokoll anzeigen",
- 	"RunTaskAction.label": "Task ausführen",
- 	"RestartTaskAction.label": "Ausgeführte Aufgabe neu starten",
-changed in both
-  base   100644 6064eccbd983947832bba2f4dfe2b117945710cc i18n/deu/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  our    100644 4f46618a81282525db957b1ebde7efb9886db7e0 i18n/deu/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  their  100644 06880671c112308c581aa9c5941c879222933ca9 i18n/deu/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/deu/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  our    100644 baf84ca2434746b629839192402548996da51973 i18n/deu/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  their  100644 fefb75a0cf0e759096e87e068ea2ed9340801543 i18n/deu/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,6 +10,15 @@
- 	"termEntryAriaLabel": "{0}, Terminalauswahl",
- 	"termCreateEntryAriaLabel": "{0}, neues Terminal erstellen",
- 	"workbench.action.terminal.newplus": "$(plus) Neues integriertes Terminal erstellen",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"entryAriaLabel": "{0}, Terminalauswahl",
-+>>>>>>> .their
- 	"noTerminalsMatching": "Keine übereinstimmenden Terminals",
- 	"noTerminalsFound": "Keine geöffneten Terminals"
- }
-\ No newline at end of file
-changed in both
-  base   100644 4d0a1893044c792abea39a3afc4621f1d6fecc2d i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 e7e17f13a867ab30a0455dba8cfbc4967b92e2a0 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 0c03c8172266b4ab4a1c4976a18ffe03b02d3f24 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,9 @@
- 	],
- 	"quickOpen.terminal": "Alle geöffneten Terminals anzeigen",
- 	"terminal": "Terminal",
-+=======
-+	"quickOpen.terminal": "Alle geöffneten Terminals anzeigen",
-+>>>>>>> .their
- 	"terminalIntegratedConfigurationTitle": "Integriertes Terminal",
- 	"terminal.integrated.shell.linux": "Der Pfad der Shell, den das Terminal unter Linux verwendet.",
- 	"terminal.integrated.shellArgs.linux": "Die Befehlszeilenargumente, die für das Linux-Terminal verwendet werden sollen.",
-@@ -36,8 +40,12 @@
- 	"terminal.integrated.env.osx": "Objekt mit Umgebungsvariablen, das dem unter OS X vom Terminal zu verwendenden VS Code-Prozess hinzugefügt wird",
- 	"terminal.integrated.env.linux": "Objekt mit Umgebungsvariablen, das dem unter Linux vom Terminal zu verwendenden VS Code-Prozess hinzugefügt wird",
- 	"terminal.integrated.env.windows": "Objekt mit Umgebungsvariablen, das dem unter Windows vom Terminal zu verwendenden VS Code-Prozess hinzugefügt wird",
-+<<<<<<< .our
- 	"terminal.integrated.showExitAlert": "Warnung \"Der Terminalprozess wurde mit folgendem Exitcode beendet\" anzeigen, wenn der Exitcode nicht Null ist.",
- 	"terminal.integrated.experimentalRestore": "Ob aktive Terminalsitzungen für den Arbeitsbereich beim Starten von VS Code automatisch wiederhergestellt werden sollen. Diese Einstellung ist in der Testphase, kann fehlerhaft sein und in Zukunft geändert werden.",
-+=======
-+	"terminal": "Terminal",
-+>>>>>>> .their
- 	"terminalCategory": "Terminal",
- 	"viewCategory": "Anzeigen"
- }
-\ No newline at end of file
-changed in both
-  base   100644 31e96cf587e451a0aea30f6532a173f8a77747c9 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 17f468b874b715481031f72251583765b50e478f i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 a4c9e32a386ec3b214d0b4b586116b39673a972d i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -14,8 +14,11 @@
- 	"workbench.action.terminal.selectAll": "Alles auswählen",
- 	"workbench.action.terminal.deleteWordLeft": "Wort links löschen",
- 	"workbench.action.terminal.deleteWordRight": "Wort rechts löschen",
-+<<<<<<< .our
- 	"workbench.action.terminal.moveToLineStart": "Zum Zeilenanfang",
- 	"workbench.action.terminal.moveToLineEnd": "Zum Zeilenende",
-+=======
-+>>>>>>> .their
- 	"workbench.action.terminal.new": "Neues integriertes Terminal erstellen",
- 	"workbench.action.terminal.new.short": "Neues Terminal",
- 	"workbench.action.terminal.newWorkspacePlaceholder": "Aktuelles Arbeitsverzeichnis für neues Terminal auswählen",
-@@ -51,6 +54,7 @@
- 	"workbench.action.terminal.rename.prompt": "Terminalnamen eingeben",
- 	"workbench.action.terminal.focusFindWidget": "Widget zum Anzeigen der Suche mit Fokus",
- 	"workbench.action.terminal.hideFindWidget": "Widget zum Ausblenden der Suche",
-+<<<<<<< .our
- 	"nextTerminalFindTerm": "Nächsten Suchbegriff anzeigen",
- 	"previousTerminalFindTerm": "Vorherigen Suchbegriff anzeigen",
- 	"quickOpenTerm": "Aktives Terminal wechseln",
-@@ -60,4 +64,7 @@
- 	"workbench.action.terminal.selectToNextCommand": "Auswählen bis zu nächstem Befehl",
- 	"workbench.action.terminal.selectToPreviousLine": " Auswählen bis zur vorherigen Zeile ",
- 	"workbench.action.terminal.selectToNextLine": "Auswählen bis zur nächsten Zeile"
-+=======
-+	"quickOpenTerm": "Aktives Terminal wechseln"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 9d4810761f24371631240b96e6b04a543431877e i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 84fc7fe0d67567c48c4b669c0d3d08c7386267cc i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 e1d9d37fe1e42e0b79089a0c6ec23beeac903b2e i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -10,7 +10,11 @@
- 	"terminal.foreground": "Die Vordergrundfarbe des Terminal.",
- 	"terminalCursor.foreground": "Die Vordergrundfarbe des Terminalcursors.",
- 	"terminalCursor.background": "Die Hintergrundfarbe des Terminalcursors. Ermöglicht das Anpassen der Farbe eines Zeichens, das von einem Blockcursor überdeckt wird.",
-+<<<<<<< .our
- 	"terminal.selectionBackground": "Die Auswahlvordergrundfarbe des Terminals.",
- 	"terminal.border": "Die Farbe des Rahmens, der Bereiche innerhalb des Terminals teilt. Der Standardwert ist panel.border.",
- 	"terminal.ansiColor": "\"{0}\" ANSI-Farbe im Terminal"
-+=======
-+	"terminal.ansiColor": "\"{0}\": ANSI-Farbe im Terminal"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f579c5cd19f0ef91306edb73995a5ed9810cda82 i18n/deu/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 dca9f59735754d2304f7bca4be1c8c6b2470923f i18n/deu/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 107869007af08bba924f92278a960d32a11d1be4 i18n/deu/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -9,10 +9,21 @@
- 	"releaseNotes": "Anmerkungen zu dieser Version",
- 	"showReleaseNotes": "Anmerkungen zu dieser Version anzeigen",
- 	"read the release notes": "Willkommen bei {0} v{1}! Möchten Sie die Hinweise zu dieser Version lesen?",
-+<<<<<<< .our
- 	"licenseChanged": "Unsere Lizenzbedingungen haben sich geändert. Bitte klicken Sie [hier]({0}), um die neuen Bedingungen zu lesen.",
- 	"neveragain": "Nicht mehr anzeigen",
- 	"64bitisavailable": "{0} für 64-Bit-Windows ist jetzt verfügbar! Klicken Sie [hier]({1}), um mehr zu erfahren.",
- 	"updateIsReady": "Neues {0}-Update verfügbar.",
-+=======
-+	"licenseChanged": "Unsere Lizenzbedingungen haben sich geändert. Bitte lesen Sie die neuen Bedingungen.",
-+	"license": "Lizenz lesen",
-+	"neveragain": "Nie wieder anzeigen",
-+	"64bitisavailable": "{0} für Windows 64 Bit ist jetzt verfügbar!",
-+	"learn more": "Weitere Informationen",
-+	"updateIsReady": "Neues {0}-Update verfügbar.",
-+	"thereIsUpdateAvailable": "Ein Update ist verfügbar.",
-+	"updateAvailable": "{0} wird nach dem Neustart aktualisiert.",
-+>>>>>>> .their
- 	"noUpdatesAvailable": "Zurzeit sind keine Updates verfügbar.",
- 	"ok": "OK",
- 	"thereIsUpdateAvailable": "Ein Update ist verfügbar.",
-changed in both
-  base   100644 b7eb39e941ebe8231e75695c6a51ff43817ba50b i18n/deu/src/vs/workbench/parts/views/browser/views.i18n.json
-  our    100644 17abacb1d8ce3ce6f8ea3e6f4017346dafd45d34 i18n/deu/src/vs/workbench/parts/views/browser/views.i18n.json
-  their  100644 ce39e3ce42163aef36a63c9fe3d7ff586a0d9342 i18n/deu/src/vs/workbench/parts/views/browser/views.i18n.json
-@@ -5,5 +5,9 @@
- // Do not edit this file. It is machine generated.
- {
- 	"viewToolbarAriaLabel": "{0}-Aktionen",
-+<<<<<<< .our
- 	"hideView": "Auf Randleiste ausblenden"
-+=======
-+	"removeView": "Aus Randleiste entfernen"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 465e716820754a5be3ecd5a1cd58e244453ae77c i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-  our    100644 bbdcf9ec8ce1acc993eb679b46f1fae9f13f6a92 i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-  their  100644 dfd27d2d8c3e3a9440d2033a6c0ba6b4a8243a25 i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-changed in both
-  base   100644 57926d3c88c40420a5098d01c515f4bf7590e405 i18n/deu/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  our    100644 d6a37d8334e4fabea5afba7ea495f6b39d9f466f i18n/deu/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  their  100644 e85c685c957a6e74f5ebd23f5a4289f8ca7379e7 i18n/deu/src/vs/workbench/services/configuration/node/configuration.i18n.json
-@@ -9,6 +9,7 @@
- 	"scope.window.description": "Fensterspezifische Konfiguration, die in den Benutzer- oder Arbeitsbereichseinstellungen konfiguriert werden kann.",
- 	"scope.resource.description": "Ressourcenspezifische Konfiguration, die in den Benutzer-, Arbeitsbereichs- oder Ordnereinstellungen konfiguriert werden kann.",
- 	"scope.description": "Bereich, in dem die Konfiguration gültig ist. Verfügbare Gültigkeitsbereiche sind \"window\" und \"resource\".",
-+<<<<<<< .our
- 	"vscode.extension.contributes.configuration": "Trägt Konfigurationseigenschaften bei.",
- 	"invalid.title": "configuration.title muss eine Zeichenfolge sein.",
- 	"vscode.extension.contributes.defaultConfiguration": "Trägt zu Konfigurationeinstellungen des Standard-Editors für die jeweilige Sprache bei.",
-@@ -21,4 +22,13 @@
- 	"workspaceConfig.settings.description": "Arbeitsbereichseinstellungen",
- 	"workspaceConfig.extensions.description": "Arbeitsbereichserweiterungen",
- 	"unknownWorkspaceProperty": "Unbekannte Arbeitsbereichs-Konfigurationseigenschaft"
-+=======
-+	"invalid.type": "Wenn eine Festlegung erfolgt, muss \"configuration.type\" auf \"object\" festgelegt werden.",
-+	"invalid.title": "configuration.title muss eine Zeichenfolge sein.",
-+	"vscode.extension.contributes.defaultConfiguration": "Trägt zu Konfigurationeinstellungen des Standard-Editors für die jeweilige Sprache bei.",
-+	"invalid.properties": "\"configuration.properties\" muss ein Objekt sein.",
-+	"workspaceConfig.id.description": "Arbeitsbereichsbezeichner. Dient zum Speichern des internen Arbeitsbereichszustands, der verloren gehen oder sich ändern kann.",
-+	"workspaceConfig.folders.description": "Liste von Ordnern, die in den Arbeitsbereich geladen werden. Hierbei muss es sich um einen Dateipfad handeln, z.B. \"file:///root/folderA\".",
-+	"workspaceConfig.settings.description": "Arbeitsbereichseinstellungen"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d1f34002c594f81e426dbe19e270d8f75776b61a i18n/deu/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 6e51d0a62d6cbb327e635cf17096e9a085de524c i18n/deu/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 c23b461e1c21857d9c32788cd6400f44145bd3c3 i18n/deu/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -9,6 +9,7 @@
- 	"openTasksConfiguration": "Aufgabenkonfiguration öffnen",
- 	"openLaunchConfiguration": "Startkonfiguration öffnen",
- 	"open": "Einstellungen öffnen",
-+<<<<<<< .our
- 	"saveAndRetry": "Speichern und wiederholen",
- 	"errorUnknownKey": "In {0} kann nicht geschrieben werden, weil {1} keine registrierte Konfiguration ist.",
- 	"errorInvalidWorkspaceConfigurationApplication": "{0} kann nicht in die Arbeitsbereichseinstellungen geschrieben werden. Diese Einstellung kann nur in den Benutzereinstellungen geschrieben werden.",
-@@ -27,6 +28,19 @@
- 	"errorConfigurationFileDirty": "In die Benutzereinstellungen kann nicht geschrieben werden, weil die Datei geändert wurde. Speichern Sie die Datei mit den Benutzereinstellungen, und versuchen Sie es noch mal.",
- 	"errorConfigurationFileDirtyWorkspace": "In die Arbeitsbereichseinstellungen kann nicht geschrieben werden, weil die Datei geändert wurde. Speichern Sie die Datei mit den Arbeitsbereichseinstellungen, und versuchen Sie es noch mal.",
- 	"errorConfigurationFileDirtyFolder": "In die Ordnereinstellungen kann nicht geschrieben werden, da die Datei geändert wurde. Speichern Sie die Datei mit den Ordnereinstellungen \"{0}\" und versuchen Sie es noch mal.",
-+=======
-+	"close": "Schließen",
-+	"saveAndRetry": "Änderungen Speichern und Wiederholen",
-+	"errorUnknownKey": "In {0} kann nicht geschrieben werden, weil {1} keine registrierte Konfiguration ist.",
-+	"errorInvalidFolderConfiguration": "In die Ordnereinstellungen kann nicht geschrieben werden, weil {0} den Gültigkeitsbereich für Ordnerressourcen nicht unterstützt.",
-+	"errorInvalidUserTarget": "In die Benutzereinstellungen kann nicht geschrieben werden, weil {0} den globalen Gültigkeitsbereich nicht unterstützt.",
-+	"errorInvalidFolderTarget": "In die Ordnereinstellungen kann nicht geschrieben werden, weil keine Ressource angegeben ist.",
-+	"errorNoWorkspaceOpened": "In {0} kann nicht geschrieben werden, weil kein Arbeitsbereich geöffnet ist. Öffnen Sie zuerst einen Arbeitsbereich, und versuchen Sie es noch mal.",
-+	"errorInvalidConfiguration": "In die Einstellungen kann nicht geschrieben werden. Öffnen Sie **Benutzereinstellungen**, um Fehler/Warnungen in der Datei zu korrigieren, und versuchen Sie es noch mal.",
-+	"errorInvalidConfigurationWorkspace": "In die Einstellungen kann nicht geschrieben werden. Öffnen Sie die **Arbeitsbereichseinstellungen**, um Fehler/Warnungen in der Datei zu korrigieren, und versuchen Sie es noch mal.",
-+	"errorConfigurationFileDirty": "In die Einstellungen kann nicht geschrieben werden, weil die Datei geändert wurde. Speichern Sie die Datei **Benutzereinstellungen**, und versuchen Sie es noch mal.",
-+	"errorConfigurationFileDirtyWorkspace": "In die Einstellungen kann nicht geschrieben werden, weil die Datei geändert wurde. Speichern Sie die Datei **Arbeitsbereichseinstellungen**, und versuchen Sie es noch mal.",
-+>>>>>>> .their
- 	"userTarget": "Benutzereinstellungen",
- 	"workspaceTarget": "Arbeitsbereichseinstellungen",
- 	"folderTarget": "Ordnereinstellungen"
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/deu/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-  our    100644 559afa0a3598ba26b6ff414d4264783532a2ef4b i18n/deu/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-  their  100644 789de4230c1123dde2c673ed3b9b5aef28fb1648 i18n/deu/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"errorInvalidFile": "In die Datei kann nicht geschrieben werden. Öffnen Sie die Datei, um Fehler/Warnungen in der Datei zu beheben, und versuchen Sie es noch mal.",
- 	"errorFileDirty": "In die Datei kann nicht geschrieben werden, weil sie geändert wurde. Speichern Sie die Datei, und versuchen Sie es noch mal."
- }
-\ No newline at end of file
-changed in both
-  base   100644 374e2c223edafd7ff2e5baa130b77721ed527ed3 i18n/deu/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 66c124a9d5a7fdc4a4f5dd03bfbddf459d3761cb i18n/deu/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 d1ccabcfb834a7c432f2df7a5d086ddedff01bfc i18n/deu/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-@@ -13,6 +13,7 @@
- 	"noIconThemeDesc": "No file icons",
- 	"iconThemeError": "File icon theme is unknown or not installed.",
- 	"workbenchColors": "Überschreibt Farben aus dem derzeit ausgewählte Farbdesign.",
-+<<<<<<< .our
- 	"editorColors.comments": "Legt die Farben und Stile für Kommentare fest.",
- 	"editorColors.strings": "Legt die Farben und Stile für Zeichenfolgenliterale fest.",
- 	"editorColors.keywords": "Legt die Farben und Stile für Schlüsselwörter fest.",
-@@ -21,5 +22,9 @@
- 	"editorColors.functions": "Legt die Farben und Stile für Funktionsdeklarationen und Verweise fest.",
- 	"editorColors.variables": "Legt die Farben und Stile für Variablendeklarationen und Verweise fest.",
- 	"editorColors.textMateRules": "Legt Farben und Stile mithilfe von Textmate-Designregeln fest (erweitert).",
-+=======
-+	"workbenchColors.deprecated": "Diese Einstellung ist nicht mehr experimentell und wurde in \"workbench.colorCustomizations\" umbenannt.",
-+	"workbenchColors.deprecatedDescription": "Verwenden Sie stattdessen \"workbench.colorCustomizations\".",
-+>>>>>>> .their
- 	"editorColors": "Überschreibt Editorfarben und den Schriftschnitt aus dem momentan ausgewählten Farbdesign."
- }
-\ No newline at end of file
-changed in both
-  base   100644 26c61c87280689d7b1fce369e9b02cabf4fcd5e8 i18n/esn/extensions/emmet/package.i18n.json
-  our    100644 d6c05800c1ebc6febea004f2095561aeefca8479 i18n/esn/extensions/emmet/package.i18n.json
-  their  100644 e6b079e4552936063b7c034d3d0124bd82b41bf6 i18n/esn/extensions/emmet/package.i18n.json
-@@ -31,6 +31,7 @@
- 	"command.incrementNumberByTen": "Aumentar por 10",
- 	"command.decrementNumberByTen": "Disminuir por 10",
- 	"emmetSyntaxProfiles": "Defina el perfil de la sintaxis especificada o use su propio perfil con reglas específicas.",
-+<<<<<<< .our
- 	"emmetExclude": "Una serie de idiomas donde no deben ampliar las abreviaturas de Emmet.",
- 	"emmetExtensionsPath": "Ruta de acceso a una carpeta que contiene los perfiles y fragmentos de Emmet.",
- 	"emmetShowExpandedAbbreviation": "Muestra abreviaciones Emmet expandidas como sugerencias. La opción \"inMarkupAndStylesheetFilesOnly\" se aplica a HTML, HAML, Jade, Slim, XML, XSL, CSS, SCSS, SASS, LESS y Stylus. La opción \"always\" se aplica a todas las partes del archivo, independientemente de que sea de marcado o CSS. ",
-@@ -62,4 +63,12 @@
- 	"emmetPreferencesCssMsProperties": "Propiedades CSS separadas por comas que obtienen el prefijo de proveedor 'ms' cuando se utilizan en la abreviatura Emmet que comienza con '-'. Establecer en la cadena vacía para evitar siempre el prefijo 'ms'.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "La mínima puntuación (de 0 a 1) que se debe alcanzar en la comparación difusa de abreviación. Los valores más bajos pueden producir muchos resultados falsos positivos, los valores más altos pueden reducir posibles coincidencias.",
- 	"emmetOptimizeStylesheetParsing": "Cuando se establece en falso, se analiza el archivo entero para determinar si la posición actual es válida para la expansión de abreviaturas de Emmet. Cuando se establece en verdadero, sólo el contenido alrededor de la posición actual en archivos css, scss/less es analizado."
-+=======
-+	"emmetExclude": "Matriz de lenguajes donde no deben expandirse la abreviación Emmet.",
-+	"emmetExtensionsPath": "Ruta de acceso a una carpeta que contiene perfiles de Emmet, fragmentos de código y preferencias. Solo se respetan los perfiles de la ruta de acceso de extensiones cuando emmet.useNewEmmet se establece en true.",
-+	"emmetShowExpandedAbbreviation": "\nMuestra abreviaciones Emmet expandidas como sugerencias. La opción \"inMarkupAndStylesheetFilesOnly\" se aplica a HTML, HAML, Jade, Slim, XML, XSL, CSS, SCSS, SASS, LESS y Stylus. La opción \"always\" se aplica a todas las partes del archivo, independientemente de que sea de marcado o CSS.",
-+	"emmetShowAbbreviationSuggestions": "Muestra posibles abreviaciones Emmet como sugerencias. No se aplica a hojas de estilos ni cuando emmet.showExpandedAbbreviation está establecido en \"never\".",
-+	"emmetIncludeLanguages": "Habilita abreviaciones Emmet en lenguajes que no se admiten de forma predeterminada. Agregue una asignación aquí entre el lenguaje y el lenguaje que admite Emmet.\n Ejemplo: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
-+	"emmetVariables": "Variables para usar en fragmentos de código Emmet"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 4a97190b0ee3e9125fc7569a86f6f3f1dc174919 i18n/esn/extensions/extension-editing/out/extensionLinter.i18n.json
-  our    100644 be1c632d33ad9a44120a81a730ef70678bc4a96c i18n/esn/extensions/extension-editing/out/extensionLinter.i18n.json
-  their  100644 085b35595029ec7e92ae3029bc0b32368a178a23 i18n/esn/extensions/extension-editing/out/extensionLinter.i18n.json
-changed in both
-  base   100644 3a099ab94418f505508479a910813e43624d2888 i18n/esn/src/vs/code/electron-main/menus.i18n.json
-  our    100644 2173ae65d3ed6bda349c8ed563942ab2c195e7ea i18n/esn/src/vs/code/electron-main/menus.i18n.json
-  their  100644 e01c4644bdeedecccebd4979d97ec38910a24fc9 i18n/esn/src/vs/code/electron-main/menus.i18n.json
-@@ -189,5 +189,11 @@
- 	"miDownloadingUpdate": "Descargando actualización...",
- 	"miInstallUpdate": "Instalar actualización...",
- 	"miInstallingUpdate": "Instalando actualización...",
-+<<<<<<< .our
- 	"miRestartToUpdate": "Reiniciar para actualizar..."
-+=======
-+	"miCheckForUpdates": "Buscar actualizaciones...",
-+	"aboutDetail": "\nVersión: {0}\nConfirmación: {1}\nFecha: {2}\nShell: {3}\nRepresentador: {4}\nNodo {5}\nArquitectura {6}",
-+	"okButton": "Aceptar"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d7f7577857c0178652297dfd4a277fdd2ee0907a i18n/esn/src/vs/editor/contrib/find/common/findController.i18n.json
-  our    100644 27d384a1b6819c1c9684fe1acbb034af8aebf02c i18n/esn/src/vs/editor/contrib/find/common/findController.i18n.json
-  their  100644 2928bececece405849e616b93729fb43121c68aa i18n/esn/src/vs/editor/contrib/find/common/findController.i18n.json
-@@ -10,6 +10,15 @@
- 	"nextSelectionMatchFindAction": "Buscar selección siguiente",
- 	"previousSelectionMatchFindAction": "Buscar selección anterior",
- 	"startReplace": "Reemplazar",
-+<<<<<<< .our
-+=======
-+	"addSelectionToNextFindMatch": "Agregar selección hasta la siguiente coincidencia de búsqueda",
-+	"addSelectionToPreviousFindMatch": "Agregar selección hasta la anterior coincidencia de búsqueda",
-+	"moveSelectionToNextFindMatch": "Mover última selección hasta la siguiente coincidencia de búsqueda",
-+	"moveSelectionToPreviousFindMatch": "Mover última selección hasta la anterior coincidencia de búsqueda",
-+	"selectAllOccurrencesOfFindMatch": "Seleccionar todas las repeticiones de coincidencia de búsqueda",
-+	"changeAll.label": "Cambiar todas las ocurrencias",
-+>>>>>>> .their
- 	"showNextFindTermAction": "Mostrar el siguiente término de búsqueda",
- 	"showPreviousFindTermAction": "Mostrar término de búsqueda anterior"
- }
-\ No newline at end of file
-changed in both
-  base   100644 0c23382bea4e472ec4eef6fd26f69c0e64205165 i18n/esn/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 c48bc5883853a0c6c279c545c6c1c9d024a6241b i18n/esn/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 82353f07117243d5ff5018cf74ba67efb87cfa50 i18n/esn/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -9,6 +9,7 @@
- 	"openFile": "Abrir archivo...",
- 	"openFolder": "Abrir carpeta...",
- 	"openFileFolder": "Abrir...",
-+<<<<<<< .our
- 	"globalRemoveFolderFromWorkspace": "Quitar carpeta del Área de trabajo...",
- 	"saveWorkspaceAsAction": "Guardar área de trabajo como...",
- 	"save": "&&Guardar",
-@@ -16,4 +17,24 @@
- 	"openWorkspaceAction": "Abrir área de trabajo...",
- 	"openWorkspaceConfigFile": "Abrir archivo de configuración del área de trabajo",
- 	"duplicateWorkspaceInNewWindow": "Duplicar el área de trabajo en una ventana nueva"
-+=======
-+	"reload": "&&Recargar",
-+	"cancel": "Cancelar",
-+	"newWorkspaceFormExisting": "Nueva área de trabajo a partir de una existente...",
-+	"select": "&&Seleccionar",
-+	"selectWorkspace": "Seleccionar carpetas para el área de trabajo",
-+	"addSupported": "Para abrir varias carpetas, es necesario recargar la ventana.",
-+	"addFolderToWorkspace": "Agregar carpeta al área de trabajo...",
-+	"add": "&& Agregar",
-+	"addFolderToWorkspaceTitle": "Agregar carpeta al área de trabajo",
-+	"removeFolderFromWorkspace": "Quitar carpeta del área de trabajo",
-+	"saveWorkspaceAsAction": "Guardar área de trabajo como...",
-+	"saveEmptyWorkspaceNotSupported": "Abra un área de trabajo antes de guardar.",
-+	"saveNotSupported": "Para guardar el área de trabajo, es necesario recargar la ventana.",
-+	"save": "&&Guardar",
-+	"saveWorkspace": "Guardar área de trabajo",
-+	"openWorkspaceAction": "Abrir área de trabajo...",
-+	"newWorkspace": "Nueva área de trabajo...",
-+	"openWorkspaceConfigFile": "Abrir archivo de configuración del área de trabajo"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f155f261fa1391fc6f10c6cdbe008fdb675c82b9 i18n/esn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 e35e95658e0757a0dd58a01697234694ea4f0954 i18n/esn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 e50bfab447c66d6063a1c89dcb964f82c7be01b3 i18n/esn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 8791cdb4ffb50cec595a210f8de07468bf4c70de i18n/esn/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-  our    100644 9813cd2ca327085170a56ccd1ad7fd899ea9a685 i18n/esn/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-  their  100644 19146d91eec52d3afe8e2f36d367b74d58efb78d i18n/esn/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,9 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"compositePart.hideSideBarLabel": "Ocultar barra lateral",
-+>>>>>>> .their
- 	"focusSideBar": "Enfocar la barra lateral",
- 	"viewCategory": "Ver"
- }
-\ No newline at end of file
-changed in both
-  base   100644 42525c6192bd52a670d1aeadc597582517a5feab i18n/esn/src/vs/workbench/common/theme.i18n.json
-  our    100644 a12ae1a7d50911472b1c450409ccd4fd8e4aba33 i18n/esn/src/vs/workbench/common/theme.i18n.json
-  their  100644 91c8514a3170a03730f25880c6fe49c2d00b35d5 i18n/esn/src/vs/workbench/common/theme.i18n.json
-@@ -61,6 +61,7 @@
- 	"titleBarActiveBackground": "Fondo de la barra de título cuando la ventana está activa. Tenga en cuenta que, actualmente, este color solo se admite en macOS.",
- 	"titleBarInactiveBackground": "Color de fondo de la barra de título cuando la ventana está inactiva. Tenga en cuenta que, actualmente, este color solo se admite en macOS.",
- 	"titleBarBorder": "Color de borde de la barra de título. Tenga en cuenta que, actualmente, este color se admite solo en macOS.",
-+<<<<<<< .our
- 	"notificationCenterBorder": "Color del borde del centro de notificaciones. Las notificaciones se deslizan desde la parte inferior derecha de la ventana.",
- 	"notificationToastBorder": "Color del borde de las notificaciones del sistema. Las notificaciones se deslizan desde la parte inferior derecha de la ventana.",
- 	"notificationsForeground": "Color de primer plano de las notificaciones. Las notificaciones se deslizan desde la parte inferior derecha de la ventana.",
-@@ -69,4 +70,17 @@
- 	"notificationCenterHeaderForeground": "Color de primer plano del encabezado del centro de notificaciones. Las notificaciones se deslizan desde la parte inferior derecha de la ventana.",
- 	"notificationCenterHeaderBackground": "Color de fondo del encabezado del centro de notificaciones. Las notificaciones se deslizan desde la parte inferior derecha de la ventana.",
- 	"notificationsBorder": "Color de borde que separa las notificaciones en el centro de notificaciones. Las notificaciones se deslizan desde la parte inferior derecha de la ventana."
-+=======
-+	"notificationsForeground": "Color de primer plano de las notificaciones. Estas se deslizan en la parte superior de la ventana. ",
-+	"notificationsBackground": "Color de fondo de las notificaciones. Estas se deslizan en la parte superior de la ventana. ",
-+	"notificationsButtonBackground": "Color de fondo del botón de notificaciones. Estas se deslizan en la parte superior de la ventana.",
-+	"notificationsButtonHoverBackground": "Color de fondo del botón de notificaciones al desplazar el ratón sobre él. Estas se deslizan en la parte superior de la ventana.",
-+	"notificationsButtonForeground": "Color de primer plano del botón de notificaciones. Estas se deslizan en la parte superior de la ventana.",
-+	"notificationsInfoBackground": "Color de fondo de la información de notificaciones. Estas se deslizan en la parte superior de la ventana.",
-+	"notificationsInfoForeground": "Color de primer plano de la información de notificaciones. Estas se deslizan en la parte superior de la ventana.",
-+	"notificationsWarningBackground": "Color de fondo del aviso de notificaciones. Estas se deslizan en la parte superior de la ventana.",
-+	"notificationsWarningForeground": "Color de primer plano del aviso de notificaciones. Estas se deslizan en la parte superior de la ventana.",
-+	"notificationsErrorBackground": "Color de fondo del error de notificaciones. Estas se deslizan en la parte superior de la ventana.",
-+	"notificationsErrorForeground": "Color de primer plano del error de notificaciones. Estas se deslizan en la parte superior de la ventana."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d8ddeb3fcda4008a6898b1b170368d03aab35f5b i18n/esn/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 89fe344b57b1d619a163cac9c32cff2261374fbd i18n/esn/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 dfb23a5b69a6f8f1e565b1321020eec7aac2b79d i18n/esn/src/vs/workbench/electron-browser/actions.i18n.json
-changed in both
-  base   100644 dc8d19d2e3a3558f89911ae9264afd9ed19dd979 i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 57d447a0a0b664b859bc321a1781f6980e63b0fd i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 485778c1c8caff53f27f07f38f5ad84cd95783ab i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,6 +35,7 @@
- 	"panelDefaultLocation": "Controla la ubicación predeterminada del panel. Puede mostrarse en la parte inferior o a la derecha de la mesa de banco.",
- 	"statusBarVisibility": "Controla la visibilidad de la barra de estado en la parte inferior del área de trabajo.",
- 	"activityBarVisibility": "Controla la visibilidad de la barra de actividades en el área de trabajo.",
-+<<<<<<< .our
- 	"viewVisibility": "Controla la visibilidad de las acciones en el encabezado de la vista. Las acciones en el encabezado de la vista pueden ser siempre visibles, o solo cuando la vista es enfocada o apuntada.",
- 	"fontAliasing": "Controla el método de suavizado de fuentes en la mesa de trabajo.\n-por defecto: subpíxel suavizado de fuentes. En la mayoría las pantallas retina no dará el texto más agudo - alisado: suavizar la fuente a nivel del píxel, a diferencia de los subpíxeles. Puede hacer que la fuente aparezca más general - ninguno: desactiva el suavizado de fuentes. Texto se mostrará con dentados filos - auto: se aplica el 'default' o 'antialiasing' automáticamente en función de la DPI de la muestra.",
- 	"workbench.fontAliasing.default": "Suavizado de fuentes en subpíxeles. En la mayoría de las pantallas que no son Retina, esta opción muestra el texto más nítido.",
-@@ -43,6 +44,15 @@
- 	"workbench.fontAliasing.auto": "Aplica ' default ' o ' antialiased ' automáticamente basándose en la DPI de las pantallas.",
- 	"enableNaturalLanguageSettingsSearch": "Controla si habilita el modo de búsqueda de lenguaje natural para la configuración.",
- 	"windowConfigurationTitle": "Ventana",
-+=======
-+	"closeOnFileDelete": "Controla si los editores que muestran un archivo deben cerrarse automáticamente cuando otro proceso elimina el archivo o le cambia el nombre. Si se deshabilita esta opción y se da alguna de estas circunstancias, se mantiene el editor abierto con modificaciones. Tenga en cuenta que, cuando se eliminan archivos desde la aplicación, siempre se cierra el editor y que los archivos con modificaciones no se cierran nunca para preservar los datos.",
-+	"fontAliasing": "Controla el método de suavizado de fuentes en el área de trabajo.\n- default: suavizado de fuentes en subpíxeles. En la mayoría de las pantallas que no son Retina, esta opción muestra el texto más nítido.\n- antialiased: suaviza las fuentes en píxeles, en lugar de subpíxeles. Puede hacer que las fuentes se vean más claras en general\n- none: deshabilita el suavizado de fuentes. El texto se muestra con bordes nítidos irregulares.",
-+	"workbench.fontAliasing.default": "Suavizado de fuentes en subpíxeles. En la mayoría de las pantallas que no son Retina, esta opción muestra el texto más nítido.",
-+	"workbench.fontAliasing.antialiased": "Suaviza las fuentes en píxeles, en lugar de subpíxeles. Puede hacer que las fuentes se vean más claras en general.",
-+	"workbench.fontAliasing.none": "Deshabilita el suavizado de fuentes. El texto se muestra con bordes nítidos irregulares.",
-+	"swipeToNavigate": "Navegar entre achivos abiertos utlizando la pulsación de tres dedos para deslizar horizontalmante.",
-+	"workbenchConfigurationTitle": "Área de trabajo",
-+>>>>>>> .their
- 	"window.openFilesInNewWindow.on": "Los archivos se abrirán en una nueva ventana",
- 	"window.openFilesInNewWindow.off": "Los archivos se abrirán en la ventana con la carpeta de archivos abierta o en la última ventana activa",
- 	"window.openFilesInNewWindow.defaultMac": "Los archivos se abrirán en la ventana con la carpeta de archivos abierta o en la última ventana activa, a menos que se abran con Dock o desde Finder.",
-changed in both
-  base   100644 ff93659c0b4766c04545fce5164d554d2b143b93 i18n/esn/src/vs/workbench/electron-browser/window.i18n.json
-  our    100644 e8aa1b0f0ade64091e67095c753c265dcab4edbb i18n/esn/src/vs/workbench/electron-browser/window.i18n.json
-  their  100644 47643628637498cac1e76328c70ca1a8b545f393 i18n/esn/src/vs/workbench/electron-browser/window.i18n.json
-@@ -12,5 +12,10 @@
- 	"copy": "Copiar",
- 	"paste": "Pegar",
- 	"selectAll": "Seleccionar todo",
-+<<<<<<< .our
- 	"runningAsRoot": "No se recomienda ejecutar {0} como usuario root."
-+=======
-+	"confirmOpen": "¿Está seguro que desea abrir {0} áreas de trabajo?",
-+	"confirmOpenButton": "&&Abrir..."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 83815d8f8b2f3e84d7b20a90ff058f6b2e810256 i18n/esn/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  our    100644 f7ca04589cbd9f14b8ad81f3eeeb2d31b025f0be i18n/esn/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  their  100644 a4c0a9b282fb25e21203f52f11914ee0318ed94d i18n/esn/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-changed in both
-  base   100644 ff677b59a60d7db60f598e857c6a74b0719443ab i18n/esn/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  our    100644 decfe5f17ec5766164dc8ed0fd546cc20aa4c84f i18n/esn/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  their  100644 ca947a2308c7eedaea302f64c067730e233ded47 i18n/esn/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-merged
-  result 100644 6ade7c35b51e8b6dfa206838bc9b3fe8fa237170 i18n/esn/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-  our    100644 fd22c3cec4d1ebf0114832174b7c0e40c876e5d1 i18n/esn/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-@@ -7,8 +7,5 @@
- 	"emmetConfigurationTitle": "Emmet",
- 	"triggerExpansionOnTab": "Cuando se habilita, se expanden las abreviaciones Emmet al presionar la tecla TAB. No disponible cuando emmet.useNewemmet se establece en true.",
- 	"emmetPreferences": "Preferencias usadas para modificar el comportamiento de algunas acciones y resoluciones de Emmet. No aplicable cuando emmet.useNewemmet se establece en true.",
--	"emmetSyntaxProfiles": "Defina el perfil de la sintaxis especificada o use su propio perfil con reglas específicas.",
--	"emmetExclude": "Matriz de lenguajes donde no deben expandirse la abreviación Emmet.",
--	"emmetExtensionsPath": "Ruta de acceso a una carpeta que contiene perfiles de Emmet, fragmentos de código y preferencias. Solo se respetan los perfiles de la ruta de acceso de extensiones cuando emmet.useNewEmmet se establece en true.",
- 	"useNewEmmet": "Pruebe los nuevos módulos de Emmet (que finalmente sustituirán a la biblioteca anterior de Emmet) para conocer todas las características de Emmet."
- }
-\ No newline at end of file
-changed in both
-  base   100644 5e236865193d6269c830c1a492ada0d2c55fd245 i18n/esn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 695af76fadee1019c3d4b030faef94140cf218ba i18n/esn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 bd0211073b2c71445f471109e99a21cc28caeb45 i18n/esn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-changed in both
-  base   100644 a58136aa89fa9fe4bdc337f806e71cf429d06cdf i18n/esn/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
-  our    100644 5b4f1d9a867259ee397b0ce30c196d0e0e92f66c i18n/esn/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
-  their  100644 9b4c0a6fb4586073b2c3708789a8064149beaef7 i18n/esn/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
-@@ -4,7 +4,11 @@
-  *--------------------------------------------------------------------------------------------*/
- // Do not edit this file. It is machine generated.
- {
-+<<<<<<< .our
- 	"filesCategory": "Archivo",
-+=======
-+	"filesCategory": "Archivos",
-+>>>>>>> .their
- 	"revealInSideBar": "Mostrar en barra lateral",
- 	"acceptLocalChanges": "Usar los cambios y sobrescribir el contenido del disco",
- 	"revertLocalChanges": "Descartar los cambios y volver al contenido del disco"
-changed in both
-  base   100644 c3a2ac37c7e7f92dcb2868d9b1e108d1eb0e8e68 i18n/esn/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  our    100644 6ceeb1cae46a37cb52e1e026c2b248e26e834bff i18n/esn/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  their  100644 76c6e86ac47f16ccf50bdbfe198034cf268d15a4 i18n/esn/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-@@ -69,7 +69,11 @@
- 	"invalidFileNameError": "El nombre **{0}** no es válido para el archivo o la carpeta. Elija un nombre diferente.",
- 	"filePathTooLongError": "El nombre **{0}** da como resultado una ruta de acceso demasiado larga. Elija un nombre más corto.",
- 	"compareWithSaved": "Comparar el archivo activo con el guardado",
-+<<<<<<< .our
- 	"modifiedLabel": "{0} (en disco) ↔ {1}",
- 	"compareWithClipboard": "Comparar archivo activo con portapapeles",
- 	"clipboardComparisonLabel": "Portapapeles ↔ {0}"
-+=======
-+	"modifiedLabel": "{0} (en disco) ↔ {1}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ad4eeb2b73109bd8f3b7286dde5456825e4d5e75 i18n/esn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 6b7926d2bf7039c9fedbd3b89b2c9e98ee891b0d i18n/esn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 15a2ead2aebb303944fab5393b1f3aaabd5cc681 i18n/esn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-@@ -40,6 +40,7 @@
- 	"dynamicHeight": "Controla si la altura de la sección de editores abiertos debería adaptarse o no de forma dinámica al número de elementos.",
- 	"autoReveal": "Controla si el explorador debe mostrar y seleccionar automáticamente los archivos al abrirlos.",
- 	"enableDragAndDrop": "Controla si el explorador debe permitir mover archivos y carpetas mediante la función arrastrar y colocar.",
-+<<<<<<< .our
- 	"confirmDragAndDrop": "Controla si el explorador debe pedir la confirmación al reubicar archivos o carpetas a través de arrastrar y soltar.",
- 	"confirmDelete": "Controla si el explorador debe pedir la confirmación al borrar un archivo utilizando la papelera.",
- 	"sortOrder.default": "Los archivos y las carpetas se ordenan por nombre alfabéticamente. Las carpetas se muestran antes que los archivos.",
-@@ -50,4 +51,12 @@
- 	"sortOrder": "Controla el criterio de ordenación de los archivos y las carpetas en el explorador. Además del orden \"default\", puede establecer el orden en \"mixed\" (los archivos y las carpetas se ordenan combinados), \"type\" (por tipo de archivo), \"modified\" (por fecha de última modificación) o \"filesFirst\" (los archivos se colocan antes que las carpetas).",
- 	"explorer.decorations.colors": "Controla si las decoraciones de archivo deben utilizar colores. ",
- 	"explorer.decorations.badges": "Controla si las decoraciones de archivo deben utilizar insignias"
-+=======
-+	"sortOrder.default": "Los archivos y directorios se ordenan por nombre, en orden alfabético. Los directorios se muestran antes que los archivos.",
-+	"sortOrder.mixed": "Los archivos y directorios se ordenan por nombre, en orden alfabético. Los archivos se muestran intercalados con los directorios.",
-+	"sortOrder.filesFirst": "Los archivos y directorios se ordenan por nombre, en orden alfabético. Los archivos se muestran antes que los directorios.",
-+	"sortOrder.type": "Los archivos y directorios se ordenan por extensión, en orden alfabético. Los directorios se muestran antes que los archivos.",
-+	"sortOrder.modified": "Los archivos y directorios se ordenan por fecha de última modificación, en orden descendente. Los directorios se muestran antes que los archivos.",
-+	"sortOrder": "Controla el modo en el que se ordenan los archivos y directorios en el explorador."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e5705ac4c784df8a3dd4454a29534038053107b9 i18n/esn/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-  our    100644 186f5cdaa427312a38cea816fd6aefcbf2dffeee i18n/esn/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-  their  100644 7e727b161ff1eb8f3ab2e2b905d4aff2118aa3e3 i18n/esn/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-@@ -12,5 +12,6 @@
- 	"genericSaveError": "No se pudo guardar '{0}': {1}",
- 	"staleSaveError": "No se pudo guardar '{0}': El contenido del disco es más reciente. Haga clic en **Comparar** para comparar su versión con la que hay en el disco.",
- 	"compareChanges": "Comparar",
--	"saveConflictDiffLabel": "0} (on disk) ↔ {1} (in {2}) - Resolver conflicto guardado"
-+	"saveConflictDiffLabel": "0} (on disk) ↔ {1} (in {2}) - Resolver conflicto guardado",
-+	"userGuide": "Use las acciones de la barra de herramientas del editor situada a la derecha para **deshacer** los cambios o **sobrescribir** el contenido del disco con sus cambios"
- }
-\ No newline at end of file
-changed in both
-  base   100644 3131805763058e54cd505f1dfa6f6373733eb214 i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  our    100644 43c2c3d02aa907b50655fd06c6120b273adc682c i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  their  100644 2bfe512b1d5f7114a6089c8c0d2e780c716e182e i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-@@ -14,6 +14,10 @@
- 	"openGlobalKeybindingsFile": "Abrir el archivo de métodos abreviados de teclado",
- 	"openWorkspaceSettings": "Abrir configuración del área de trabajo",
- 	"openFolderSettings": "Abrir Configuración de carpeta",
-+<<<<<<< .our
-+=======
-+	"pickFolder": "Seleccionar carpeta",
-+>>>>>>> .their
- 	"configureLanguageBasedSettings": "Configurar opciones específicas del lenguaje...",
- 	"languageDescriptionConfigured": "({0})",
- 	"pickLanguage": "Seleccionar lenguaje"
-changed in both
-  base   100644 e2e21899134365fe2ad5fb6d9d2b15403a841e26 i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 98610852f746563a7652418cfa26304844d182c0 i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 ed5419507d3d191c1c9ca806689cff34303bfbd9 i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -14,4 +15,19 @@
- 	"editTtile": "Editar",
- 	"replaceDefaultValue": "Reemplazar en Configuración",
- 	"copyDefaultValue": "Copiar en Configuración"
-+=======
-+	"emptyUserSettingsHeader": "Coloque aquí su configuración para sobrescribir la configuración predeterminada.",
-+	"errorInvalidConfiguration": "No se puede escribir la configuración. Corrija los errores o advertencias del archivo y vuelva a intentarlo.",
-+	"emptyWorkspaceSettingsHeader": "Coloque aquí su configuración para sobrescribir la configuración de usuario.",
-+	"emptyFolderSettingsHeader": "Coloque aquí su configuración de carpeta para sobrescribir la que se especifica en la configuración de área de trabajo.",
-+	"defaultFolderSettingsTitle": "Configuración de carpeta predeterminada",
-+	"defaultSettingsTitle": "Configuración predeterminada",
-+	"noSettingsFound": "No se encontró ninguna configuración.",
-+	"editTtile": "Editar",
-+	"replaceDefaultValue": "Reemplazar en Configuración",
-+	"copyDefaultValue": "Copiar en Configuración",
-+	"unsupportedPHPExecutablePathSetting": "Este valor debe estar en la configuración de usuario. Si quiere configurar PHP para el área de trabajo, abra un archivo PHP y haga clic en \"Ruta de acceso PHP\" en la barra de estado.",
-+	"unsupportedWorkspaceSetting": "Este valor debe estar en Configuración de usuario.",
-+	"unsupportedWorkbenchSetting": "Esta configuración no se puede aplicar ahora. Se aplicará al abrir esta carpeta directamente."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7edb56fa42098e55e6a6f364aec11428f54c03e4 i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-  our    100644 15749e4075a6560e7e5d76cae3f4a75f319357f2 i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-  their  100644 d53ba6ae07b45a6139c2289ab72764b70b262f5d i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 ab7d78224458e031f0d5873434caefe0111f3854 i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 2126bfe2fb90bed14f7effb7b34dc1e77b479150 i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -12,4 +13,13 @@
- 	"userSettings": "Configuración de usuario",
- 	"workspaceSettings": "Configuración de área de trabajo",
- 	"folderSettings": "Configuración de Carpeta"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"folderSettingsDetails": "Configuración de carpeta"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 498d20e2ecd409c37697c1f73ccb9a17375ca27f i18n/esn/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  our    100644 2b0101fb6caa5f4582f9e7ff75c9409382316a8d i18n/esn/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  their  100644 a447e55f2de302180642e53747ded56fcaefea36 i18n/esn/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-@@ -8,5 +8,11 @@
- 	],
- 	"relaunchSettingMessage": "Ha cambiado un ajuste que requiere un reinicio para ser efectivo.",
- 	"relaunchSettingDetail": "Pulse el botón de reinicio para reiniciar {0} y habilitar el ajuste.",
-+<<<<<<< .our
- 	"restart": "&& Reiniciar"
-+=======
-+	"restart": "Reiniciar",
-+	"relaunchWorkspaceMessage": "Este cambio de área de trabajo requiere recargar nuestro sistema de extensiones.",
-+	"reload": "Recargar"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 676bea02e78d083517bc3e3be014a2ae3914622f i18n/esn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 08f95963fe8efaa9640a8368bea5bd91b3e1ccb0 i18n/esn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 314acd5b6dd01653d85d184675bd60ee1c6e5f58 i18n/esn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"nextSearchIncludePattern": "Mostrar siguiente búsqueda de patrón include",
- 	"previousSearchIncludePattern": "Mostrar búsqueda anterior de patrón include ",
- 	"nextSearchExcludePattern": "Mostrar siguiente búsqueda de patrón exclude ",
-@@ -16,6 +19,8 @@
- 	"previousReplaceTerm": "Mostrar la búsqueda anterior de Reemplazar término",
- 	"findInFiles": "Buscar en archivos",
- 	"replaceInFiles": "Reemplazar en archivos",
-+	"findInWorkspace": "Buscar en área de trabajo...",
-+	"findInFolder": "Buscar en carpeta...",
- 	"RefreshAction.label": "Actualizar",
- 	"CollapseDeepestExpandedLevelAction.label": "Contraer todo",
- 	"ClearSearchResultsAction.label": "Borrar",
-changed in both
-  base   100644 06b841c9cab76dfb15bb1868d131a72575db207d i18n/esn/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-  our    100644 819a6285c14c28c67f847aba7f0a36adfece768a i18n/esn/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-  their  100644 97148bc69de0f7099b7713b972f9e9d6e3c2e7bf i18n/esn/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"searchFolderMatch.other.label": "Otros archivos",
- 	"searchFileMatches": "{0} archivos encontrados",
- 	"searchFileMatch": "{0} archivo encontrado",
-changed in both
-  base   100644 9dce8d0622c4f8b3f231d0d4914664ccae36abd9 i18n/esn/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  our    100644 0c3d29ae593df25c19d137f3045954d907ba1dc7 i18n/esn/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  their  100644 82a227721a70cccce9ab5c3bc0da44f4bebdd27f i18n/esn/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-changed in both
-  base   100644 021fb81ebaa63f8be286150fa3b2de457da9ed54 i18n/esn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 7367d0a39f1701be221d6ff3d3d8cae3add9845a i18n/esn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 1925eae4febe76bb87b66f4ac0ab55c604c188b5 i18n/esn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-changed in both
-  base   100644 048794026a3772346ae3bf1fd0509b98db8cb5c4 i18n/esn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 cf1ca0ef5c2b17265b6eb266a58dc6112305ccf4 i18n/esn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 feed01daffa5ff60cd67fde09dd5d6737207968e i18n/esn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -12,8 +12,12 @@
- 	"totalWarnings": "{0} advertencias",
- 	"totalInfos": "{0} informaciones",
- 	"problems": "Problemas",
-+<<<<<<< .our
- 	"building": "Compilando...",
- 	"manyProblems": "+10Mil",
-+=======
-+	"manyMarkers": "Más de 99",
-+>>>>>>> .their
- 	"runningTasks": "Mostrar tareas en ejecución",
- 	"tasks": "Tareas",
- 	"TaskSystem.noHotSwap": "Cambiar el motor de ejecución de tareas con una tarea activa ejecutandose, requiere recargar la ventana",
-@@ -24,17 +28,25 @@
- 	"TaskService.noTestTask1": "No se ha definido ninguna tarea de prueba. Marque una tarea con \"isTestCommand\" en el archivo tasks.json.",
- 	"TaskService.noTestTask2": "No se ha definido ninguna tarea de prueba. Marque una tarea con \"test\" en el archivo tasks.json.",
- 	"TaskServer.noTask": "No se encuentra la tarea {0} que se ha solicitado para ejecutarla.",
-+<<<<<<< .our
- 	"TaskService.associate": "asociar",
-+=======
-+>>>>>>> .their
- 	"TaskService.attachProblemMatcher.continueWithout": "Continuar sin examinar la salida de la tarea",
- 	"TaskService.attachProblemMatcher.never": "No examinar nunca la salida de la tarea",
- 	"TaskService.attachProblemMatcher.learnMoreAbout": "Más información acerca del examen de la salida de la tarea",
- 	"selectProblemMatcher": "Seleccione qué tipo de errores y advertencias deben buscarse durante el examen de la salida de la tarea",
- 	"customizeParseErrors": "La configuración actual de tareas contiene errores. Antes de personalizar una tarea, corrija los errores.",
- 	"moreThanOneBuildTask": "Hay muchas tareas de compilación definidas en el archivo tasks.json. Se ejecutará la primera.\n",
-+<<<<<<< .our
- 	"TaskSystem.activeSame.background": "La tarea \"{0}\" ya está activa en segundo plano.",
- 	"TaskSystem.activeSame.noBackground": "La tarea \"{0}\" ya está activa.",
- 	"terminateTask": "Finalizar tarea",
- 	"restartTask": "Reiniciar tarea",
-+=======
-+	"TaskSystem.activeSame.background": "La tarea \"{0}\" ya está activa en segundo plano. Para terminarla, use la opción \"Terminar tarea\" del menú Tareas.",
-+	"TaskSystem.activeSame.noBackground": "La tarea \"{0}\" ya está activa. Para terminarla, use la opción \"Terminar tarea\" del menú Tareas.",
-+>>>>>>> .their
- 	"TaskSystem.active": "Ya hay una tarea en ejecución. Finalícela antes de ejecutar otra tarea.",
- 	"TaskSystem.restartFailed": "No se pudo terminar y reiniciar la tarea {0}",
- 	"TaskService.noConfiguration": "Error: La detección de tarea {0} no encontró una tarea para la siguiente configuración:\n{1}\nLa tarea será omitida.\n",
-@@ -75,8 +87,13 @@
- 	"TaskService.pickDefaultBuildTask": "Seleccione la tarea que se va a utilizar como tarea de compilación predeterminada",
- 	"TaskService.defaultTestTaskExists": "{0} ya se ha marcado como la tarea de prueba predeterminada.",
- 	"TaskService.pickDefaultTestTask": "Seleccione la tarea que se va a usar como la tarea de prueba predeterminada ",
-+<<<<<<< .our
- 	"TaskService.pickShowTask": "Seleccione la tarea de la que desea ver la salida",
- 	"TaskService.noTaskIsRunning": "Ninguna tarea se está ejecutando",
-+=======
-+	"TaskService.noTaskIsRunning": "No hay ninguna tarea en ejecución.",
-+	"TaskService.pickShowTask": "Seleccione la tarea de la que desea ver la salida",
-+>>>>>>> .their
- 	"ShowLogAction.label": "Mostrar registro de tareas",
- 	"RunTaskAction.label": "Ejecutar tarea",
- 	"RestartTaskAction.label": "Reiniciar la tarea en ejecución",
-changed in both
-  base   100644 bb2599901cac4e42180e7997e766b6638e50839d i18n/esn/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  our    100644 c53edb70544eaeed1ed345fd659e584b8c452a64 i18n/esn/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  their  100644 40bf1ce95646af6d20160a59a1bcbfb317a41674 i18n/esn/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/esn/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  our    100644 2dd035c28fdef3fa3b55cd25845e4c542bfe6d90 i18n/esn/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  their  100644 1766210bb77087405636a26d61f7abe0bbe32374 i18n/esn/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,6 +10,15 @@
- 	"termEntryAriaLabel": "{0}, selector de terminal",
- 	"termCreateEntryAriaLabel": "{0}, crear nueva terminal",
- 	"workbench.action.terminal.newplus": "$(plus) Crear nueva terminal integrada",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"entryAriaLabel": "{0}, selector de terminal",
-+>>>>>>> .their
- 	"noTerminalsMatching": "No hay terminales coincidentes",
- 	"noTerminalsFound": "No hay terminales abiertos"
- }
-\ No newline at end of file
-changed in both
-  base   100644 120d6ffbb3d47f4a6ed247915573e0be5f1f0f5f i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 638d95e07783cab2681275875d22dd4b5bb236b5 i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 80e11f38691b0c24e4ddfef0a1c6009ff7d95154 i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,9 @@
- 	],
- 	"quickOpen.terminal": "Mostrar todos los terminales abiertos",
- 	"terminal": "Terminal",
-+=======
-+	"quickOpen.terminal": "Mostrar todos los terminales abiertos",
-+>>>>>>> .their
- 	"terminalIntegratedConfigurationTitle": "Terminal integrado",
- 	"terminal.integrated.shell.linux": "La ruta de acceso del shell que el terminal usa en Linux.",
- 	"terminal.integrated.shellArgs.linux": "Los argumentos de la línea de comandos que se usarán en el terminal de Linux.",
-@@ -36,8 +40,12 @@
- 	"terminal.integrated.env.osx": "Objeto con variables de entorno que se agregarán al proceso de VS Code para que las use el terminal en OS X",
- 	"terminal.integrated.env.linux": "Objeto con variables de entorno que se agregarán al proceso de VS Code para que las use el terminal en Linux",
- 	"terminal.integrated.env.windows": "Objeto con variables de entorno que se agregarán al proceso de VS Code para que las use el terminal en Windows",
-+<<<<<<< .our
- 	"terminal.integrated.showExitAlert": "Mostrar alerta 'El proceso de terminal terminó con el código de salida ' cuando el código de salida no es cero.",
- 	"terminal.integrated.experimentalRestore": "Indica si se restauran automáticamente las sesiones del terminal para el área de trabajo cuando se inicia VS Code. Esta es una opción experimental; puede tener errores y podría cambiar en el futuro.",
-+=======
-+	"terminal": "Terminal",
-+>>>>>>> .their
- 	"terminalCategory": "Terminal",
- 	"viewCategory": "Ver"
- }
-\ No newline at end of file
-changed in both
-  base   100644 a2abb93e39c68f700660af87e1667369bbe5da46 i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 21fcf5a4e9d2653bdf22cd882d1fa612baf507de i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 d4285e26c3012004b7d9a7988765a55b26e2900d i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -14,8 +14,11 @@
- 	"workbench.action.terminal.selectAll": "Seleccionar todo",
- 	"workbench.action.terminal.deleteWordLeft": "Eliminar una palabra a la izquierda",
- 	"workbench.action.terminal.deleteWordRight": "Eliminar una palabra a la derecha",
-+<<<<<<< .our
- 	"workbench.action.terminal.moveToLineStart": "Mover al principio de la línea",
- 	"workbench.action.terminal.moveToLineEnd": "Mover al final de la línea",
-+=======
-+>>>>>>> .their
- 	"workbench.action.terminal.new": "Crear nuevo terminal integrado",
- 	"workbench.action.terminal.new.short": "Nuevo terminal",
- 	"workbench.action.terminal.newWorkspacePlaceholder": "Seleccione el directorio de trabajo actual para el nuevo terminal",
-@@ -51,6 +54,7 @@
- 	"workbench.action.terminal.rename.prompt": "Introducir nombre del terminal",
- 	"workbench.action.terminal.focusFindWidget": "Foco Encontrar Widget",
- 	"workbench.action.terminal.hideFindWidget": "Ocultar Encontrar Widget",
-+<<<<<<< .our
- 	"nextTerminalFindTerm": "Mostrar siguiente término de búsqueda",
- 	"previousTerminalFindTerm": "Mostrar término de búsqueda anterior",
- 	"quickOpenTerm": "Cambiar terminal activo",
-@@ -60,4 +64,7 @@
- 	"workbench.action.terminal.selectToNextCommand": "Seleccionar hasta el comando siguiente",
- 	"workbench.action.terminal.selectToPreviousLine": "Seleccione la línea anterior",
- 	"workbench.action.terminal.selectToNextLine": "Seleccione la línea siguiente"
-+=======
-+	"quickOpenTerm": "Cambiar terminal activo"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d371b1e3d8c96d8eb60031f4700465a659baa5b8 i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 452c57e69431420c6bcfb59a898fee8e18810b50 i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 091847a7181701ffc388f16eccb9ff2543d27599 i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -10,7 +10,11 @@
- 	"terminal.foreground": "El color de primer plano del terminal.",
- 	"terminalCursor.foreground": "Color de primer plano del cursor del terminal.",
- 	"terminalCursor.background": "Color de fondo del cursor del terminal. Permite personalizar el color de un carácter solapado por un cursor de bloque.",
-+<<<<<<< .our
- 	"terminal.selectionBackground": "Color de fondo de selección del terminal.",
- 	"terminal.border": "Color del borde que separa paneles divididos en el terminal. El valor predeterminado es panel.border.",
- 	"terminal.ansiColor": "color ANSI ' {0} ' en el terminal."
-+=======
-+	"terminal.ansiColor": "Color ANSI \"{0}\" en el terminal."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e99da0524bcac96e49becfa9544ec4105a096a07 i18n/esn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 2d994e363264374d23ba6185653395b42a1471ce i18n/esn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 788665ef84b9513d4270d37b09250c937643db65 i18n/esn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -11,10 +11,16 @@
- 	"read the release notes": "{0} v{1}. ¿Quiere leer las notas de la versión?",
- 	"licenseChanged": "Los términos de licencia han cambiado. Haga clic [aquí]({0}) para revisarlos.",
- 	"neveragain": "No volver a mostrar",
-+<<<<<<< .our
- 	"64bitisavailable": "Ya está disponible {0} para Windows de 64 bits. Haga clic [aquí]({1}) para obtener más información.",
- 	"updateIsReady": "Nueva actualización de {0} disponible.",
- 	"noUpdatesAvailable": "Actualmente, no hay actualizaciones disponibles.",
- 	"ok": "Aceptar",
-+=======
-+	"64bitisavailable": "Ya está disponible {0} para Windows de 64 bits.",
-+	"learn more": "Más información",
-+	"updateIsReady": "Nueva actualización de {0} disponible.",
-+>>>>>>> .their
- 	"thereIsUpdateAvailable": "Hay una actualización disponible.",
- 	"download now": "Descargar ahora",
- 	"later": "Más tarde",
-changed in both
-  base   100644 62933f6b509ea5c06df3601765df92605ec2f36d i18n/esn/src/vs/workbench/parts/views/browser/views.i18n.json
-  our    100644 f2487840d9765d6e1cd172f1e43b1dad5a12f21c i18n/esn/src/vs/workbench/parts/views/browser/views.i18n.json
-  their  100644 de9004ff778b5b22c7873eb60af275d113128263 i18n/esn/src/vs/workbench/parts/views/browser/views.i18n.json
-@@ -5,5 +5,9 @@
- // Do not edit this file. It is machine generated.
- {
- 	"viewToolbarAriaLabel": "{0} acciones",
-+<<<<<<< .our
- 	"hideView": "Ocultar en la barra lateral"
-+=======
-+	"removeView": "Quitar de la barra lateral"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c8a34873f9d8da569cbcebdc314a82cd97e734f3 i18n/esn/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-  our    100644 dbd723b12f68e8ad7cc1594d964090b81e98beba i18n/esn/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-  their  100644 f768bb7f55890e9810f24c7b56f12b5d11e07773 i18n/esn/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-changed in both
-  base   100644 05e79aa04fc5e36d1b26d265ed22a8f6d5fdaeee i18n/esn/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  our    100644 7393d6074556b0bd61735f99be1150899407f3cb i18n/esn/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  their  100644 2e9666a093be88316a6da00bc089d8255a36ec78 i18n/esn/src/vs/workbench/services/configuration/node/configuration.i18n.json
-@@ -9,6 +9,7 @@
- 	"scope.window.description": "Configuración específica para ventanas, que se puede definir en la configuración de usuario o de área de trabajo.",
- 	"scope.resource.description": "Configuración específica para recursos, que se puede definir en la configuración de usuario, de área de trabajo o de carpeta.",
- 	"scope.description": "Ámbito donde es aplicable la configuración. Los ámbitos disponibles son \"window\" y \"resource\".",
-+<<<<<<< .our
- 	"vscode.extension.contributes.configuration": "Aporta opciones de configuración.",
- 	"invalid.title": "configuration.title debe ser una cadena",
- 	"vscode.extension.contributes.defaultConfiguration": "Contribuye a la configuración de los parámetros del editor predeterminados por lenguaje.",
-@@ -21,4 +22,13 @@
- 	"workspaceConfig.settings.description": "Configuración de área de trabajo",
- 	"workspaceConfig.extensions.description": "Extensiones del área de trabajo",
- 	"unknownWorkspaceProperty": "Propiedad de configuración de espacio de trabajo desconocida"
-+=======
-+	"invalid.type": "si se establece, \"configuration.type\" debe establecerse en \"object\"",
-+	"invalid.title": "configuration.title debe ser una cadena",
-+	"vscode.extension.contributes.defaultConfiguration": "Contribuye a la configuración de los parámetros del editor predeterminados por lenguaje.",
-+	"invalid.properties": "configuration.properties debe ser un objeto",
-+	"workspaceConfig.id.description": "Identificador del área de trabajo. Se usa para almacenar el estado interno del área de trabajo, que se puede perder al cambiar.",
-+	"workspaceConfig.folders.description": "Lista de carpetas para cargar en el área de trabajo. Debe ser una ruta de acceso de archivo; por ejemplo, \"file:///raíz/carpetaA\"",
-+	"workspaceConfig.settings.description": "Configuración de área de trabajo"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c750b75802ed6877f0ae3e9b853ea3c16fd07935 i18n/esn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 532a6558111964e59cddb3ee4e8da3da36a9d18f i18n/esn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 98bdd1d3bf582e302727c676ed9484b82266e59b i18n/esn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -9,6 +9,7 @@
- 	"openTasksConfiguration": "Abrir configuración de tareas",
- 	"openLaunchConfiguration": "Abrir configuración de inicio",
- 	"open": "Abrir configuración",
-+<<<<<<< .our
- 	"saveAndRetry": "Guardar y reintentar",
- 	"errorUnknownKey": "No se puede escribir en {0} porque {1} no es una configuración registrada.",
- 	"errorInvalidWorkspaceConfigurationApplication": "No se puede escribir {0} en Configuración de área de trabajo; solo se puede escribir en Configuración de usuario.",
-@@ -27,6 +28,19 @@
- 	"errorConfigurationFileDirty": "No se puede escribir en el archivo de configuración de usuario porque se ha modificado. Guarde primero el archivo y vuelva a intentarlo.",
- 	"errorConfigurationFileDirtyWorkspace": "No se puede escribir en el archivo de configuración del área de trabajo porque se ha modificado. Guarde primero el archivo y vuelva a intentarlo.",
- 	"errorConfigurationFileDirtyFolder": "No se puede escribir en el archivo de configuración de carpeta porque se ha modificado. Guarde primero el archivo de configuración de la carpeta \"{0}\" y vuelva a intentarlo.",
-+=======
-+	"close": "Cerrar",
-+	"saveAndRetry": "Guardar la configuración y reintentar. ",
-+	"errorUnknownKey": "No se puede escribir en {0} porque {1} no es una configuración registrada.",
-+	"errorInvalidFolderConfiguration": "No se puede escribir en Configuración de carpeta porque {0} no admite el ámbito del recurso de carpeta.",
-+	"errorInvalidUserTarget": "No se puede escribir en Configuración de usuario porque {0} no admite el ámbito global.",
-+	"errorInvalidFolderTarget": "No se puede escribir en Configuración de carpeta porque no se ha proporcionado ningún recurso.",
-+	"errorNoWorkspaceOpened": "No se puede escribir en {0} porque no hay ninguna área de trabajo abierta. Abra un área de trabajo y vuelva a intentarlo.",
-+	"errorInvalidConfiguration": "No se pudo guardar la configuración. Abra el archivo **Configuración de usuario** para corregir los errores o advertencias del archivo y vuelva a intentarlo.",
-+	"errorInvalidConfigurationWorkspace": "No se pudo guardar la configuración. Abra **Configuración de área de trabajo** para corregir los errores o advertencias del archivo y vuelva a intentarlo.",
-+	"errorConfigurationFileDirty": "No se pudo guardar la configuración porque el archivo se ha modificado. Guarde el archivo **Configuración de usuario** y vuelva a intentarlo.",
-+	"errorConfigurationFileDirtyWorkspace": "No se pudo guardar la configuración porque el archivo se ha modificado. Guarde el archivo **Configuración de área de trabajo** y vuelva a intentarlo.",
-+>>>>>>> .their
- 	"userTarget": "Configuración de usuario",
- 	"workspaceTarget": "Configuración de área de trabajo",
- 	"folderTarget": "Configuración de carpeta"
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/esn/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-  our    100644 55e16aec92fb2aa84070bbb90a6e48fce9bdc3da i18n/esn/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-  their  100644 081d076416688f1e88a1bf5f809dc0e7e11e7f30 i18n/esn/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"errorInvalidFile": "No se puede escribir en el archivo. Abra el archivo para corregir los errores o advertencias y vuelva a intentarlo.",
- 	"errorFileDirty": "No se puede escribir en el archivo porque se ha modificado. Guarde el archivo y vuelva a intentarlo."
- }
-\ No newline at end of file
-changed in both
-  base   100644 e9c42972e4eb3e96d3f1e8d3509f5f0f918a71bb i18n/esn/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 5a34a01efe3be981f2f79fe82b2b70f00f7de801 i18n/esn/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 52d9fd4ec4e1657150c36caba2b71707a73f74f1 i18n/esn/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-@@ -13,6 +13,7 @@
- 	"noIconThemeDesc": "No file icons",
- 	"iconThemeError": "File icon theme is unknown or not installed.",
- 	"workbenchColors": "Reemplaza los colores del tema de color actual",
-+<<<<<<< .our
- 	"editorColors.comments": "Establece los colores y estilos para los comentarios",
- 	"editorColors.strings": "Establece los colores y estilos para los literales de cadena.",
- 	"editorColors.keywords": "Establece los colores y estilos para las palabras clave.",
-@@ -21,5 +22,9 @@
- 	"editorColors.functions": "Establece los colores y estilos para las declaraciones y referencias de funciones.",
- 	"editorColors.variables": "Establece los colores y estilos para las declaraciones y referencias de variables.",
- 	"editorColors.textMateRules": "Establece colores y estilos utilizando las reglas de la tematización de textmate (avanzadas).",
-+=======
-+	"workbenchColors.deprecated": "Esta configuracion no es experimental y se ha cambiado de nombre a 'workbench.colorCustomizations'",
-+	"workbenchColors.deprecatedDescription": "Utilice 'workbench.colorCustomizations' en su lugar",
-+>>>>>>> .their
- 	"editorColors": "Reemplaza los colores y el estilo de fuente del editor del tema de color seleccionado."
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/fra/extensions/emmet/package.i18n.json
-  our    100644 2b38d968d648e0792cab88ddd57aa657ed8e85b3 i18n/fra/extensions/emmet/package.i18n.json
-  their  100644 ad7e209c1bab1c60df741b7f9fa5798e3bb97768 i18n/fra/extensions/emmet/package.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,6 +10,14 @@
- 	"description": "Prise en charge d'Emmet pour VS Code",
- 	"command.wrapWithAbbreviation": "Envelopper avec une abréviation",
- 	"command.wrapIndividualLinesWithAbbreviation": "Envelopper les lignes individuelles avec une abréviation",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"command.removeTag": "Supprimer le Tag",
- 	"command.updateTag": "Mettre à jour le Tag",
- 	"command.matchTag": "Aller à la paire correspondante",
-@@ -31,6 +40,7 @@
- 	"command.incrementNumberByTen": "Incrémenter de 10",
- 	"command.decrementNumberByTen": "Décrémenter de 10",
- 	"emmetSyntaxProfiles": "Définissez le profil pour la syntaxe spécifiée ou utilisez votre propre profil avec des règles spécifiques.",
-+<<<<<<< .our
- 	"emmetExclude": "Un tableau des langages pour lesquels les abréviations Emmet ne devraient pas être développées.",
- 	"emmetExtensionsPath": "Chemin d’accès au dossier contenant les profils Emmet et les extraits.",
- 	"emmetShowExpandedAbbreviation": "Affiche les abréviations Emmet développées sous forme de suggestions.\nL’option \"inMarkupAndStylesheetFilesOnly\" s’applique à haml, jade, slim, xml, xsl, css, html, scss, sass, less et stylus.\nL’option\"always\" s’applique à toutes les parties du fichier indépendamment du balisage/css.",
-@@ -62,4 +72,12 @@
- 	"emmetPreferencesCssMsProperties": "Les propriétés css séparées par des virgules qui ont un préfixe 'ms' vendor lorsqu’elles sont utilisées dans une abréviation emmet qui commence par '-'. Mettre une chaîne vide pour éviter le préfixe 'ms'.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "La note minimale (de 0 à 1) que la correspondance de l'abréviation (fuzzy-matched) devrait atteindre. Des valeurs plus faibles peuvent produire de nombreuses correspondances de faux-positifs, des valeurs plus élevées peuvent réduire les correspondances possibles.",
- 	"emmetOptimizeStylesheetParsing": "Si défini à false, la fichier entier est analysé pour déterminer si la position courante est valide pour l’expansion des abréviations Emmet. Si défini à true, seul le contenu autour de la position actuelle dans les fichiers css/scss/less est analysé."
-+=======
-+	"emmetExclude": "Ensemble de langages où les abréviations emmet ne doivent pas être développées.",
-+	"emmetExtensionsPath": "Chemin d'un dossier contenant les profils, extraits de code et préférences Emmet. Seuls les profils sont honorés à partir du chemin des extensions quand emmet.useNewEmmet est défini sur true.",
-+	"emmetShowExpandedAbbreviation": "Affiche les abréviations Emmet développées sous forme de suggestions.\nL’option \"inMarkupAndStylesheetFilesOnly\" s’applique à html, haml, jade, slim, xml, xsl, css, scss, sass, less et un stylet.\nL’option \"toujours\" s’applique à toutes les parties du fichier indépendamment du balisage/css.",
-+	"emmetShowAbbreviationSuggestions": "Affiche les abréviations Emmet possibles sous forme de suggestions. Non applicable dans les feuilles de style ou quand emmet.showExpandedAbbreviation est défini sur \"jamais\".",
-+	"emmetIncludeLanguages": "Active les abréviations Emmet dans les langages qui ne sont pas pris en charge par défaut. Ajoute un mappage ici entre le langage et le langage Emmet pris en charge .\n Par exemple : {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
-+	"emmetVariables": "Variables à utiliser dans les extraits Emmet"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7f69cac4fb4ced48bdb36d562ed995dafb269475 i18n/fra/extensions/extension-editing/out/extensionLinter.i18n.json
-  our    100644 d3911a1e602c0342caf62e07ddf3705c7fd299e1 i18n/fra/extensions/extension-editing/out/extensionLinter.i18n.json
-  their  100644 c64c3a6f8629dc833ef958acecb94fd1ebf4d238 i18n/fra/extensions/extension-editing/out/extensionLinter.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/fra/extensions/markdown/out/previewContentProvider.i18n.json
-  our    100644 2eb7c81389dcce502544cffb79afa896eb0947f7 i18n/fra/extensions/markdown/out/previewContentProvider.i18n.json
-  their  100644 15ff651f2cb065d333538c0d99c9cef719ccc884 i18n/fra/extensions/markdown/out/previewContentProvider.i18n.json
-@@ -4,7 +4,11 @@
-  *--------------------------------------------------------------------------------------------*/
- // Do not edit this file. It is machine generated.
- {
-+<<<<<<< .our
- 	"preview.securityMessage.text": "Du contenu a été désactivé dans ce document",
-+=======
-+	"preview.securityMessage.text": "Certains contenus a été désactivé dans ce document",
-+>>>>>>> .their
- 	"preview.securityMessage.title": "Le contenu potentiellement dangereux ou précaire a été désactivé dans l’aperçu du format markdown. Modifier le paramètre de sécurité Aperçu Markdown afin d’autoriser les contenus non sécurisés ou activer les scripts",
- 	"preview.securityMessage.label": "Avertissement de sécurité de contenu désactivé"
- }
-\ No newline at end of file
-changed in both
-  base   100644 b6ec4bbef7d05ec17922cc59b7ea95efb8fc589b i18n/fra/extensions/markdown/out/security.i18n.json
-  our    100644 b3c4ab567f3cdf0e0bc77b8eccc8d1f547a63393 i18n/fra/extensions/markdown/out/security.i18n.json
-  their  100644 a91a93c54829c4a724165f671a414a5bd48b37a9 i18n/fra/extensions/markdown/out/security.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -16,5 +17,11 @@
- 	"enableSecurityWarning.title": "Activer l'aperçu d'avertissements de sécurité pour cet espace de travail",
- 	"disableSecurityWarning.title": "Désactiver l'aperçu d'avertissements de sécurité pour cet espace de travail",
- 	"toggleSecurityWarning.description": "N’affecte pas le niveau de sécurité du contenu",
-+=======
-+	"preview.showPreviewSecuritySelector.strictTitle": "Stricte. Charger uniquement le contenu sécurisé.",
-+	"preview.showPreviewSecuritySelector.currentSelection": "Paramètre actuel",
-+	"preview.showPreviewSecuritySelector.insecureContentTitle": "Autoriser le chargement de contenu via http.",
-+	"preview.showPreviewSecuritySelector.scriptsAndAllContent": "Autoriser l’exécution de tous les contenus et scripts. Non recommandé.",
-+>>>>>>> .their
- 	"preview.showPreviewSecuritySelector.title": "Sélectionner les paramètres de sécurité pour les aperçus Markdown dans cet espace de travail"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/fra/extensions/typescript/out/features/taskProvider.i18n.json
-  our    100644 451f7029bacabab17fb9cb543b1797329aaacbf3 i18n/fra/extensions/typescript/out/features/taskProvider.i18n.json
-  their  100644 f90da051c30eb4ff19252d3ecb2ab3501d766f4b i18n/fra/extensions/typescript/out/features/taskProvider.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,14 @@
- 	],
- 	"buildTscLabel": "build - {0}",
- 	"buildAndWatchTscLabel": "watch - {0}"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"buildAndWatchTscLabel": "watch - {0}",
-+	"buildTscLabel": "build - {0}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c4301b43c6762827c9cfceab5fe3c9ffe12eb579 i18n/fra/src/vs/code/electron-main/menus.i18n.json
-  our    100644 16a57011e6fe8292ae1edcf0b9eb59b9f28b2c10 i18n/fra/src/vs/code/electron-main/menus.i18n.json
-  their  100644 8381adf72c936915f9eaa1e9a16251761a678d0c i18n/fra/src/vs/code/electron-main/menus.i18n.json
-@@ -24,12 +24,21 @@
- 	"miQuit": "Quitter {0}",
- 	"miNewFile": "&&Nouveau fichier",
- 	"miOpen": "&&Ouvrir...",
-+<<<<<<< .our
- 	"miOpenWorkspace": "Ouvrir l'espace de travail...",
- 	"miOpenFolder": "Ouvrir le &&dossier",
- 	"miOpenFile": "&&Ouvrir un fichier...",
- 	"miOpenRecent": "Ouvrir les éléments &&récents",
- 	"miSaveWorkspaceAs": "Enregistrer l’espace de travail sous...",
- 	"miAddFolderToWorkspace": "Ajouter un dossier à l'espace de travail...",
-+=======
-+	"miOpenWorkspace": "&&Ouvrir un espace de travail...",
-+	"miOpenFolder": "Ouvrir le &&dossier",
-+	"miOpenFile": "&&Ouvrir un fichier...",
-+	"miOpenRecent": "Ouvrir les éléments &&récents",
-+	"miSaveWorkspaceAs": "&&Enregistrer l’espace de travail sous...",
-+	"miAddFolderToWorkspace": "&&Ajouter un dossier à l'espace de travail...",
-+>>>>>>> .their
- 	"miSave": "&&Enregistrer",
- 	"miSaveAs": "Enregistrer &&sous...",
- 	"miSaveAll": "Enregistrer to&&ut",
-@@ -189,5 +198,11 @@
- 	"miDownloadingUpdate": "Téléchargement de la mise à jour...",
- 	"miInstallUpdate": "Installer la mise à jour...",
- 	"miInstallingUpdate": "Installation de la mise à jour...",
-+<<<<<<< .our
- 	"miRestartToUpdate": "Redémarrer pour mettre à jour..."
-+=======
-+	"miCheckForUpdates": "Rechercher les mises à jour...",
-+	"aboutDetail": "\nVersion {0}\nCommit {1}\nDate {2}\nShell {3}\nRenderer {4}\nNode {5}\nArchitecture {6}",
-+	"okButton": "OK"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7517a404783a2da12ff25e4053e022614e0ec4f6 i18n/fra/src/vs/editor/contrib/find/common/findController.i18n.json
-  our    100644 21889b4123e3ab0c51a61420c30b2adddb59929d i18n/fra/src/vs/editor/contrib/find/common/findController.i18n.json
-  their  100644 2176cea208c5eaa0ca5310602d4add0d86ac5282 i18n/fra/src/vs/editor/contrib/find/common/findController.i18n.json
-@@ -10,6 +10,15 @@
- 	"nextSelectionMatchFindAction": "Sélection suivante",
- 	"previousSelectionMatchFindAction": "Sélection précédente",
- 	"startReplace": "Remplacer",
-+<<<<<<< .our
-+=======
-+	"addSelectionToNextFindMatch": "Ajouter la sélection à la correspondance de recherche suivante",
-+	"addSelectionToPreviousFindMatch": "Ajouter la sélection à la correspondance de recherche précédente",
-+	"moveSelectionToNextFindMatch": "Déplacer la dernière sélection vers la correspondance de recherche suivante",
-+	"moveSelectionToPreviousFindMatch": "Déplacer la dernière sélection à la correspondance de recherche précédente",
-+	"selectAllOccurrencesOfFindMatch": "Sélectionner toutes les occurrences des correspondances de la recherche",
-+	"changeAll.label": "Modifier toutes les occurrences",
-+>>>>>>> .their
- 	"showNextFindTermAction": "Afficher le terme de recherche suivant",
- 	"showPreviousFindTermAction": "Afficher le terme de recherche précédent"
- }
-\ No newline at end of file
-changed in both
-  base   100644 bdfc2772c3939d2335ad3b7fb518d67d2669e6f9 i18n/fra/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 4522e0fd127e1bcf08d6748e14cb70d5513ca327 i18n/fra/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 6f0597c75fb9bb64ec7e9659dce19de8109411c6 i18n/fra/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -9,6 +9,7 @@
- 	"openFile": "Ouvrir un fichier...",
- 	"openFolder": "Ouvrir un dossier...",
- 	"openFileFolder": "Ouvrir...",
-+<<<<<<< .our
- 	"globalRemoveFolderFromWorkspace": "Supprimer le dossier d’espace de travail...",
- 	"saveWorkspaceAsAction": "Enregistrer l’espace de travail sous...",
- 	"save": "&&Enregistrer",
-@@ -16,4 +17,24 @@
- 	"openWorkspaceAction": "Ouvrir un espace de travail...",
- 	"openWorkspaceConfigFile": "Ouvrir le Fichier de Configuration d’espace de travail",
- 	"duplicateWorkspaceInNewWindow": "Dupliquer l'espace de travail dans une Nouvelle fenêtre"
-+=======
-+	"reload": "&&Recharger",
-+	"cancel": "Annuler",
-+	"newWorkspaceFormExisting": "Nouvel espace de travail à partir d'un existant...",
-+	"select": "&&Sélectionner",
-+	"selectWorkspace": "Sélectionner les dossiers pour l’espace de travail",
-+	"addSupported": "Pour ouvrir plusieurs dossiers, un rechargement de la fenêtre est nécessaire.",
-+	"addFolderToWorkspace": "Ajouter un dossier à l'espace de travail...",
-+	"add": "&&Ajouter",
-+	"addFolderToWorkspaceTitle": "Ajouter un dossier à l'espace de travail",
-+	"removeFolderFromWorkspace": "Supprimer le dossier de l'espace de travail",
-+	"saveWorkspaceAsAction": "Enregistrer l’espace de travail sous...",
-+	"saveEmptyWorkspaceNotSupported": "Veuillez d’abord ouvrir un espace de travail pour enregistrer.",
-+	"saveNotSupported": "Pour enregistrer l’espace de travail, un rechargement de la fenêtre est nécessaire.",
-+	"save": "&&Enregistrer",
-+	"saveWorkspace": "Enregistrer l’espace de travail",
-+	"openWorkspaceAction": "Ouvrir un espace de travail...",
-+	"newWorkspace": "Nouvel espace de travail...",
-+	"openWorkspaceConfigFile": "Ouvrir le Fichier de Configuration d’espace de travail"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 9927a31f58e6bd42637c5158d6261570092eb358 i18n/fra/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 1cdd98b12a70baa1c905f59b19493e7b2e495bea i18n/fra/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 2ebd48c5bc85a3fa5c053b7e12394611bbcf4c12 i18n/fra/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 ab3e54a798da942efd8b75ea2526c3a6c72c0159 i18n/fra/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-  our    100644 905c22110d52d6416342fd8550af80f658130a52 i18n/fra/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-  their  100644 7a0ea73a96adc00dfc80ce66c642f04432843c39 i18n/fra/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,9 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"compositePart.hideSideBarLabel": "Masquer la barre latérale",
-+>>>>>>> .their
- 	"focusSideBar": "Focus sur la barre latérale",
- 	"viewCategory": "Affichage"
- }
-\ No newline at end of file
-changed in both
-  base   100644 2c777584371c8b2c3d3ce847ee8503c47b3ad7a1 i18n/fra/src/vs/workbench/common/theme.i18n.json
-  our    100644 67b5e93740c6b4696aa15e5da68929b00e585c36 i18n/fra/src/vs/workbench/common/theme.i18n.json
-  their  100644 4496db1c37401a017f739e62f246fd6e07e1354c i18n/fra/src/vs/workbench/common/theme.i18n.json
-@@ -61,6 +61,7 @@
- 	"titleBarActiveBackground": "Arrière-plan de la barre de titre quand la fenêtre est active. Notez que cette couleur est uniquement prise en charge sur macOS.",
- 	"titleBarInactiveBackground": "Arrière-plan de la barre de titre quand la fenêtre est inactive. Notez que cette couleur est uniquement prise en charge sur macOS.",
- 	"titleBarBorder": "Couleur de bordure de la barre titre. Notez que cette couleur est actuellement uniquement pris en charge sur macOS.",
-+<<<<<<< .our
- 	"notificationCenterBorder": "Couleur de bordure du centre de notifications. Les notifications défilent à partir du bas à droite de la fenêtre.",
- 	"notificationToastBorder": "Couleur de bordure du toast des notifications. Les notifications défilent à partir du bas à droite de la fenêtre.",
- 	"notificationsForeground": "Couleur de premier plan des notifications. Les notifications défilent à partir du bas à droite de la fenêtre.",
-@@ -69,4 +70,17 @@
- 	"notificationCenterHeaderForeground": "Couleur de premier plan de l'en-tête du centre de notifications. Les notifications défilent à partir du bas à droite de la fenêtre.",
- 	"notificationCenterHeaderBackground": "Couleur d'arrière plan de l'en-tête du centre de notifications. Les notifications défilent à partir du bas à droite de la fenêtre.",
- 	"notificationsBorder": "Couleur de bordure séparant des autres notifications dans le centre de notifications. Les notifications défilent à partir du bas à droite de la fenêtre."
-+=======
-+	"notificationsForeground": "Couleur de premier plan des notifications. Les notifications défilent à partir du haut de la fenêtre.",
-+	"notificationsBackground": "Couleur d'arrière-plan des notifications. Les notifications défilent à paritr du haut de la fenêtre.",
-+	"notificationsButtonBackground": "Couleur d'arrière-plan du bouton des notifications. Les notifications défilent à partir du haut de la fenêtre.",
-+	"notificationsButtonHoverBackground": "Couleur d'arrière-plan du bouton des notifications pendant le pointage. Les notifications défilent à partir du haut de la fenêtre.",
-+	"notificationsButtonForeground": "Couleur de premier plan du bouton des notifications. Les notifications défilent à partir du haut de la fenêtre.",
-+	"notificationsInfoBackground": "Couleur d'arrière-plan des informations des notifications. Les notifications défilent à partir du haut de la fenêtre.",
-+	"notificationsInfoForeground": "Couleur de premier plan des informations des notifications. Les notifications défilent à partir du haut de la fenêtre.",
-+	"notificationsWarningBackground": "Couleur d'arrière-plan de l'avertissement des notifications. Les notifications défilent à partir du haut de la fenêtre.",
-+	"notificationsWarningForeground": "Couleur de premier plan de l'avertissement des notifications. Les notifications défilent à partir du haut de la fenêtre.",
-+	"notificationsErrorBackground": "Couleur d'arrière-plan de l'erreur des notifications. Les notifications défilent à partir du haut de la fenêtre.",
-+	"notificationsErrorForeground": "Couleur de premier plan de l'erreur des notifications. Les notifications défilent à partir du haut de la fenêtre."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a082ef906e173c46f00cb5467720263156c97c0e i18n/fra/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 8f9f7eb339d47d55df577bac8ccf306bd77eb0fa i18n/fra/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 55e38a54c343c42b03bdac296610b69ec356c776 i18n/fra/src/vs/workbench/electron-browser/actions.i18n.json
-changed in both
-  base   100644 4753f90d9c4fdaaa445659703e9f8d05b376a6d4 i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 1a663cb4405d0c8f86ec154a57cdd2b613d93195 i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 cd1097afbbd70b14c52ba2263d512bf159291954 i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,6 +35,7 @@
- 	"panelDefaultLocation": "Contrôle l’emplacement par défaut du panneau. Il peut être affiché soit en bas ou à droite du banc d'essai.",
- 	"statusBarVisibility": "Contrôle la visibilité de la barre d'état au bas du banc d'essai.",
- 	"activityBarVisibility": "Contrôle la visibilité de la barre d'activités dans le banc d'essai.",
-+<<<<<<< .our
- 	"viewVisibility": "Contrôle la visibilité des actions d'en-tête de vue. Les actions d'en-tête de vue peuvent être soit toujours visibles, ou uniquement visibles quand cette vue a le focus ou est survolée.",
- 	"fontAliasing": "Contrôle la méthode de font aliasing dans le workbench.\n- default : Lissage des polices de sous-pixel. Sur la plupart des affichages non-ratina, cela vous donnera le texte le plus vif\n- antialiased : Lisse les polices au niveau du pixel, plutôt que les sous-pixels. Peut faire en sorte que la police apparaisse plus fine dans l’ensemble \n- none : Désactive le lissage des polices. Le texte s'affichera avec des bordures dentelées\n- auto: Applique `default` ou `antialiased` automatiquement en se basant sur la résolution de l'affichage.",
- 	"workbench.fontAliasing.default": "Lissage de sous-pixel des polices. Sur la plupart des affichages non-retina, cela vous donnera le texte le plus vif.",
-@@ -43,6 +44,15 @@
- 	"workbench.fontAliasing.auto": "Applique `default` ou `antialiased`automatiquement en se basant sur la résolution de l'affichage.",
- 	"enableNaturalLanguageSettingsSearch": "Contrôle s’il faut activer le mode de recherche en langage naturel pour les paramètres.",
- 	"windowConfigurationTitle": "Fenêtre",
-+=======
-+	"closeOnFileDelete": "Contrôle si les éditeurs qui affichent un fichier doivent se fermer automatiquement quand ce fichier est supprimé ou renommé par un autre processus. Si vous désactivez cette option, l'éditeur reste ouvert dans un état indiquant une intégrité compromise. Notez que la suppression de fichiers à partir de l'application entraîne toujours la fermeture de l'éditeur, et que les fichiers à l'intégrité compromise ne sont jamais fermés pour permettre la conservation de vos données.",
-+	"fontAliasing": "Contrôle la méthode de font aliasing dans le workbench.\n- par défaut : Lissage des polices de sous-pixel. Sur la plupart des affichages non-ratina, cela vous donnera le texte le plus vif\n- crénelées : Lisse les polices au niveau du pixel, plutôt que les sous-pixels. Peut faire en sorte que la police apparaisse plus légère dans l’ensemble \n- none : désactive le lissage des polices. Le texte s'affichera avec des bordures dentelées",
-+	"workbench.fontAliasing.default": "Lissage de sous-pixel des polices. Sur la plupart des affichages non-retina, cela vous donnera le texte le plus vif.",
-+	"workbench.fontAliasing.antialiased": "Lisser les polices au niveau du pixel, plutôt que les sous-pixels. Peut faire en sorte que la police apparaisse plus légère dans l’ensemble.",
-+	"workbench.fontAliasing.none": "Désactive le lissage des polices. Le texte s'affichera avec des bordures dentelées.",
-+	"swipeToNavigate": "Parcourez les fichiers ouverts en faisant glisser trois doigts horizontalement. ",
-+	"workbenchConfigurationTitle": "Banc d'essai",
-+>>>>>>> .their
- 	"window.openFilesInNewWindow.on": "Les fichiers s'ouvrent dans une nouvelle fenêtre",
- 	"window.openFilesInNewWindow.off": "Les fichiers s'ouvrent dans la fenêtre du dossier conteneur ouvert ou dans la dernière fenêtre active",
- 	"window.openFilesInNewWindow.defaultMac": "Les fichiers s'ouvriront dans la fenêtre avec le dossier des fichiers ouvert ou la dernière fenêtre active, à moins qu'ils ne soient ouverts via le Dock ou depuis Finder.",
-changed in both
-  base   100644 52e6b8d12ff6a7d2751282ee43e38ff1cbc624e2 i18n/fra/src/vs/workbench/electron-browser/window.i18n.json
-  our    100644 6e669b2258da3109a79d0d8175b8cfd0b9744d85 i18n/fra/src/vs/workbench/electron-browser/window.i18n.json
-  their  100644 d486ee50b5a96a263d36b476ec708a9a4151dae9 i18n/fra/src/vs/workbench/electron-browser/window.i18n.json
-@@ -12,5 +12,10 @@
- 	"copy": "Copier",
- 	"paste": "Coller",
- 	"selectAll": "Tout Sélectionner",
-+<<<<<<< .our
- 	"runningAsRoot": "Il est déconseillé d’exécuter {0} en tant qu’utilisateur root."
-+=======
-+	"confirmOpen": "Êtes-vous certain de vouloir ouvrir {0} espaces de travail ?",
-+	"confirmOpenButton": "&&Ouvrir..."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 fdf0d48085c83bffe2a4bdcd650c9db5ad80e96c i18n/fra/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  our    100644 979233d172f8263db25eb12ad373b2838a718689 i18n/fra/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  their  100644 207f6a482dd33342e14a2bd69dca953b27d9b93f i18n/fra/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-changed in both
-  base   100644 d60a025a1a0cda0185e27c30f5c1de9401645b4b i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 dc9d0f20d0f5632bb197839a3ff1ba56a6ca08d4 i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 9ddcff0cc12caed5c7dafde26eec94c66e62b30c i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -28,7 +28,13 @@
- 	"preLaunchTaskExitCode": "Le preLaunchTask '{0}' s'est terminé avec le code de sortie {1}.",
- 	"showErrors": "Afficher les erreurs",
- 	"noFolderWorkspaceDebugError": "Impossible de déboguer le fichier actif. Vérifiez qu'il est enregistré sur le disque et qu'une extension de débogage est installée pour ce type de fichier.",
-+<<<<<<< .our
- 	"cancel": "Annuler",
- 	"DebugTaskNotFound": "Tâche '{0}' introuvable.",
- 	"taskNotTracked": "La tâche '{0}' ne peut pas être tracée."
-+=======
-+	"NewLaunchConfig": "Configurez le fichier config de lancement de votre application. {0}",
-+	"DebugTaskNotFound": "preLaunchTask '{0}' introuvable.",
-+	"differentTaskRunning": "La tâche '{0}' est déjà en cours d’exécution. Impossible d’exécuter tâche de pré-lancement '{1}'."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 b4fa3eab63698bf2d7d1b2c6f094448308ec86ad i18n/fra/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  our    100644 a15f1f9ca32a27db95a99dffa5e908bd56d7dd64 i18n/fra/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  their  100644 76fb8ce3e72902541c34908770721316afef299b i18n/fra/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-merged
-  result 100644 48e561613a56f3f957e89112e71b08d357391e18 i18n/fra/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-  our    100644 2d849d42acddcd35c05dcc416ee987f711a3634d i18n/fra/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-@@ -7,8 +7,5 @@
- 	"emmetConfigurationTitle": "Emmet",
- 	"triggerExpansionOnTab": "Une fois les abréviations Emmet activées, elles se développent quand vous appuyez sur la touche Tab. Non applicable quand emmet.useNewemmet est défini sur true.",
- 	"emmetPreferences": "Préférences utilisées pour modifier le comportement de certaines actions et résolutions d'Emmet. Non applicable quand emmet.useNewemmet est défini sur true.",
--	"emmetSyntaxProfiles": "Définissez le profil pour la syntaxe spécifiée ou utilisez votre propre profil avec des règles spécifiques.",
--	"emmetExclude": "Ensemble de langages où les abréviations emmet ne doivent pas être développées.",
--	"emmetExtensionsPath": "Chemin d'un dossier contenant les profils, extraits de code et préférences Emmet. Seuls les profils sont honorés à partir du chemin des extensions quand emmet.useNewEmmet est défini sur true.",
- 	"useNewEmmet": "Essayez les nouveaux modules Emmet (qui remplaceront à terme l'ancienne bibliothèque Emmet) pour toutes les fonctionnalités Emmet."
- }
-\ No newline at end of file
-changed in both
-  base   100644 552e6f9f400c95d6f23081099bac318da780c5ef i18n/fra/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  our    100644 3551b5e036401750ea0c8346808de61f5309a6a0 i18n/fra/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  their  100644 8fadf8b958bad5b0f9ead536beda02b61da7f096 i18n/fra/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-changed in both
-  base   100644 0112a21db366de319a7a5193ffda7b5f497aba67 i18n/fra/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 0057e22b4a8443d5b30bfe0090c058bd31602f8d i18n/fra/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 304d491606739fc3c0039285eb118829cf7b56f7 i18n/fra/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-changed in both
-  base   100644 fdf890d05eef06d8609adc4a736123f0301d8f12 i18n/fra/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
-  our    100644 c0057e5215c73761b92d65b5e39fe74aa4c15151 i18n/fra/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
-  their  100644 2a8a3d2e72cabcc4be68b4c4dfff5f79ac2721d1 i18n/fra/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
-@@ -4,7 +4,11 @@
-  *--------------------------------------------------------------------------------------------*/
- // Do not edit this file. It is machine generated.
- {
-+<<<<<<< .our
- 	"filesCategory": "Fichier",
-+=======
-+	"filesCategory": "Fichiers",
-+>>>>>>> .their
- 	"revealInSideBar": "Afficher dans la barre latérale",
- 	"acceptLocalChanges": "Utiliser vos modifications et écraser les contenus du disque",
- 	"revertLocalChanges": "Ignorer les modifications et revenir au contenu sur le disque"
-changed in both
-  base   100644 9439ba9fff7726de3b8dbe7216e8b5a4fb089945 i18n/fra/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 9693ca31c50911feab4d02a16763cfd2142313b0 i18n/fra/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 91bcea898e715f28bed7c7a06aa3b51dc60c9725 i18n/fra/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-@@ -40,6 +40,7 @@
- 	"dynamicHeight": "Contrôle si la hauteur de la section des éditeurs ouverts doit s'adapter dynamiquement ou non au nombre d'éléments.",
- 	"autoReveal": "Contrôle si l'Explorateur doit automatiquement afficher et sélectionner les fichiers à l'ouverture.",
- 	"enableDragAndDrop": "Contrôle si l'explorateur doit autoriser le déplacement de fichiers et de dossiers par glisser-déplacer.",
-+<<<<<<< .our
- 	"confirmDragAndDrop": "Contrôle si l’Explorateur doit demander confirmation lors du déplacement de fichiers ou de dossiers via glisser-déposer.",
- 	"confirmDelete": "Contrôle si l’explorateur doit demander confirmation lorsque vous supprimez un fichier via la corbeille.",
- 	"sortOrder.default": "Les fichiers et dossiers sont triés par nom, dans l’ordre alphabétique. Les dossiers sont affichés avant les fichiers.",
-@@ -50,4 +51,12 @@
- 	"sortOrder": "Contrôle l'ordre de tri des fichiers et dossiers dans l'explorateur. En plus du tri par défaut, vous pouvez définir l'ordre sur 'mixed' (fichiers et dossiers triés combinés), 'type' (par type de fichier), 'modified' (par date de dernière modification) ou 'fileFirst' (trier les fichiers avant les dossiers).",
- 	"explorer.decorations.colors": "Contrôle si les décorations de fichier doivent utiliser des couleurs.",
- 	"explorer.decorations.badges": "Contrôle si les décorations de fichier doivent utiliser des badges."
-+=======
-+	"sortOrder.default": "Fichiers et répertoires sont triés par leur nom, dans l’ordre alphabétique. Les répertoires sont affichés avant les fichiers.",
-+	"sortOrder.mixed": "Fichiers et répertoires sont triés par leur nom, dans l’ordre alphabétique. Les fichiers sont imbriquées dans des répertoires.",
-+	"sortOrder.filesFirst": "Fichiers et répertoires sont triés par leur nom, dans l’ordre alphabétique. Les fichiers sont affichés avant les répertoires.",
-+	"sortOrder.type": "Fichiers et répertoires sont triés par leurs extensions, dans l’ordre alphabétique. Les répertoires sont affichés avant les fichiers.",
-+	"sortOrder.modified": "Fichiers et répertoires sont triés par date de dernière modification, dans l’ordre décroissant. Les répertoires sont affichés avant les fichiers.",
-+	"sortOrder": "Contrôle le mode de tri des fichiers et des répertoires dans l’explorateur."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 2ecf7ac060da544f45120baaa23904f3a0639d5e i18n/fra/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-  our    100644 f944e7fc14ff13265af3f6fef112a7a5de5ca326 i18n/fra/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-  their  100644 b3844c69018427342f12432ff2be65b0e438b17c i18n/fra/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-@@ -12,5 +12,6 @@
- 	"genericSaveError": "Échec d'enregistrement de '{0}' ({1}).",
- 	"staleSaveError": "Échec de l'enregistrement de '{0}' : le contenu sur disque est plus récent. Cliquez sur **Comparer** pour comparer votre version à celle située sur le disque.",
- 	"compareChanges": "Comparer",
--	"saveConflictDiffLabel": "{0} (sur le disque) ↔ {1} (dans {2}) - Résoudre le conflit d'enregistrement"
-+	"saveConflictDiffLabel": "{0} (sur le disque) ↔ {1} (dans {2}) - Résoudre le conflit d'enregistrement",
-+	"userGuide": "Utiliser les actions dans la barre d’outils de l’éditeur vers la droite pour soit **annuler** vos modifications ou **écraser** le contenu sur le disque avec vos modifications"
- }
-\ No newline at end of file
-changed in both
-  base   100644 61742507b3662fb3aebe4b11318e6f585b157592 i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  our    100644 e838745aa51608675b5f1abeac806b7a4c29cad3 i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  their  100644 829d423c32eed88ed06208ea49a74df195782426 i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-@@ -14,6 +14,10 @@
- 	"openGlobalKeybindingsFile": "Ouvrir le fichier des raccourcis clavier",
- 	"openWorkspaceSettings": "Ouvrir les paramètres d'espace de travail",
- 	"openFolderSettings": "Ouvrir le dossier Paramètres",
-+<<<<<<< .our
-+=======
-+	"pickFolder": "Sélectionner le dossier",
-+>>>>>>> .their
- 	"configureLanguageBasedSettings": "Configurer les paramètres spécifiques au langage...",
- 	"languageDescriptionConfigured": "({0})",
- 	"pickLanguage": "Sélectionner un langage"
-changed in both
-  base   100644 990d1f6a9a97d982872ccdbfd7aa7822ec050601 i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 def18c92de62940f464c192ffdc0811ec055095e i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 3684b913ba7f4787f4aba3652d304d299cd8c070 i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -14,4 +15,19 @@
- 	"editTtile": "Modifier",
- 	"replaceDefaultValue": "Remplacer dans les paramètres",
- 	"copyDefaultValue": "Copier dans Paramètres"
-+=======
-+	"emptyUserSettingsHeader": "Placer vos paramètres ici pour remplacer les paramètres par défaut.",
-+	"errorInvalidConfiguration": "Impossible d'écrire les paramètres. Corrigez les erreurs/avertissements présents dans le fichier, puis réessayez.",
-+	"emptyWorkspaceSettingsHeader": "Placer vos paramètres ici pour remplacer les paramètres utilisateur.",
-+	"emptyFolderSettingsHeader": "Placer les paramètres de votre dossier ici pour remplacer ceux des paramètres de l’espace de travail.",
-+	"defaultFolderSettingsTitle": "Paramètres de dossier par défaut",
-+	"defaultSettingsTitle": "Paramètres par défaut",
-+	"noSettingsFound": "Aucun paramètre.",
-+	"editTtile": "Modifier",
-+	"replaceDefaultValue": "Remplacer dans les paramètres",
-+	"copyDefaultValue": "Copier dans Paramètres",
-+	"unsupportedPHPExecutablePathSetting": "Ce paramètre doit être un paramètre utilisateur. Pour configurer PHP pour l'espace de travail, ouvrez un fichier PHP, puis cliquez sur 'Chemin PHP' dans la barre d'état.",
-+	"unsupportedWorkspaceSetting": "Ce paramètre doit être un paramètre utilisateur.",
-+	"unsupportedWorkbenchSetting": "Ce paramètre ne peut pas être appliqué maintenant. Il est appliqué quand vous ouvrez ce dossier directement."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a71763915a8d5ad9d61baa9aa114a790fb1f0d99 i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-  our    100644 58fa7022cd814e057afdce2cbbafc9d8b5f28b30 i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-  their  100644 3f323a432755fe11c3d2452035d109a9fc62a8f4 i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 40cb14d81b25931ed98c99ed64c659dbe62e387d i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 c4a6584827b8d5c2d94892a3e758a5cde6b369eb i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -12,4 +13,13 @@
- 	"userSettings": "Paramètres utilisateur",
- 	"workspaceSettings": "Paramètres de l'espace de travail",
- 	"folderSettings": "Paramètres de dossier"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"folderSettingsDetails": "Paramètres de dossier"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7507a7f217ace49deaddaa2f034b8ac3c7b37728 i18n/fra/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  our    100644 31cb132ffd591f1fb232c21680adcc5624e5f7bc i18n/fra/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  their  100644 df36de368d34a03dde52e9c0b6f9b627ed246e3d i18n/fra/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-@@ -8,5 +8,11 @@
- 	],
- 	"relaunchSettingMessage": "Un paramètre a changé et nécessite un redémarrage pour être appliqué.",
- 	"relaunchSettingDetail": "Appuyez sur le bouton de redémarrage pour redémarrer {0} et activer le paramètre.",
-+<<<<<<< .our
- 	"restart": "&&Redémarrer"
-+=======
-+	"restart": "Redémarrer",
-+	"relaunchWorkspaceMessage": "Ce changement d’espace de travail nécessite un rechargement de notre système d’extension.",
-+	"reload": "Recharger"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 dd5b8b24dd7f1f47e7dbd0c84c8da968c17215fb i18n/fra/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 7927ac428c9397051edb023d925d6ab74f6c0189 i18n/fra/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 2478230b806fc22ca670def76a32897a33d71eb5 i18n/fra/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"nextSearchIncludePattern": "Afficher le prochain Include Pattern de recherche",
- 	"previousSearchIncludePattern": "Afficher le précédent Include Pattern de recherche",
- 	"nextSearchExcludePattern": "Afficher le prochain Exclude Pattern de recherche",
-@@ -16,6 +19,8 @@
- 	"previousReplaceTerm": "Voir le terme de recherche précédent à remplacer",
- 	"findInFiles": "Chercher dans les fichiers",
- 	"replaceInFiles": "Remplacer dans les fichiers",
-+	"findInWorkspace": "Trouver dans l’espace de travail...",
-+	"findInFolder": "Trouver dans le dossier...",
- 	"RefreshAction.label": "Actualiser",
- 	"CollapseDeepestExpandedLevelAction.label": "Réduire tout",
- 	"ClearSearchResultsAction.label": "Effacer",
-changed in both
-  base   100644 052e41c13ac834a4a073d338cc434d21861bf194 i18n/fra/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-  our    100644 a979901875e3ecf563312ec08ecc18edde6ad1ee i18n/fra/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-  their  100644 9038b91202e9bd43bb0dec03e5b877a44de31e78 i18n/fra/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"searchFolderMatch.other.label": "Autres fichiers",
- 	"searchFileMatches": "{0} fichiers trouvés",
- 	"searchFileMatch": "{0} fichier trouvé",
-changed in both
-  base   100644 ee2441931b50bb93815060a08c9980cf0fd775e8 i18n/fra/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  our    100644 4cd20eea1e68cf73a56249541b739d94f4272553 i18n/fra/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  their  100644 a17af9ee4c5db13e39d7ea2d3daae96c2f76b6ae i18n/fra/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-changed in both
-  base   100644 880bf493d013305e12d0de0cf4e4710c123a1dc4 i18n/fra/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 673cb698c2a5b3bfb8460611a63585f8ca3fd4e1 i18n/fra/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 3c2e0ad14bd7744fe5e0a3932175f2cddd0ea474 i18n/fra/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-changed in both
-  base   100644 3681aebcf343094a424a4703d21eb5d2bb6723c1 i18n/fra/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 87d639c304bc4b35cf6eb86239d5ea30fd616b54 i18n/fra/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 d1909b04f8a2c784737225db44aa8cc3ab9cceb4 i18n/fra/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -12,8 +12,12 @@
- 	"totalWarnings": "{0} avertissements",
- 	"totalInfos": "{0} infos",
- 	"problems": "Problèmes",
-+<<<<<<< .our
- 	"building": "Génération...",
- 	"manyProblems": "10K+",
-+=======
-+	"manyMarkers": "99",
-+>>>>>>> .their
- 	"runningTasks": "Afficher les tâches en cours d'exécution",
- 	"tasks": "Tâches",
- 	"TaskSystem.noHotSwap": "Changer le moteur d’exécution de tâches avec une tâche active en cours d’exécution nécessite de recharger la fenêtre",
-@@ -24,17 +28,25 @@
- 	"TaskService.noTestTask1": "Aucune tâche de test définie. Marquez une tâche avec 'isTestCommand' dans le fichier tasks.json.",
- 	"TaskService.noTestTask2": "Aucune tâche de test définie. Marquez une tâche comme groupe 'test' dans le fichier tasks.json.",
- 	"TaskServer.noTask": "La tâche {0} à exécuter est introuvable.",
-+<<<<<<< .our
- 	"TaskService.associate": "associer",
-+=======
-+>>>>>>> .their
- 	"TaskService.attachProblemMatcher.continueWithout": "Continuer sans analyser la sortie de la tâche",
- 	"TaskService.attachProblemMatcher.never": "Ne jamais vérifier la sortie de la tâche",
- 	"TaskService.attachProblemMatcher.learnMoreAbout": "En savoir plus sur la sortie de la tâche de numérisation",
- 	"selectProblemMatcher": "Sélectionner pour quel type d’erreurs et d’avertissements analyser la sortie de la tâche",
- 	"customizeParseErrors": "La configuration de tâche actuelle contient des erreurs. Corrigez-les avant de personnaliser une tâche. ",
- 	"moreThanOneBuildTask": "De nombreuses tâches de génération sont définies dans le fichier tasks.json. Exécution de la première.\n",
-+<<<<<<< .our
- 	"TaskSystem.activeSame.background": "La tâche '{0}\" est déjà active et en mode arrière-plan.",
- 	"TaskSystem.activeSame.noBackground": "La tâche '{0}' est déjà active.",
- 	"terminateTask": "Terminer la tâche",
- 	"restartTask": "Redémarrer la tâche",
-+=======
-+	"TaskSystem.activeSame.background": "La tâche '{0}' est déjà active et en mode arrière-plan. Pour la terminer, utiliser `Terminer la Tâche...` » dans le menu Tâches.",
-+	"TaskSystem.activeSame.noBackground": "La tâche '{0}' est déjà active. Pour la terminer, il utilise `Terminer la Tâche...` dans le menu Tâches.",
-+>>>>>>> .their
- 	"TaskSystem.active": "Une tâche est déjà en cours d'exécution. Terminez-la avant d'exécuter une autre tâche.",
- 	"TaskSystem.restartFailed": "Échec de la fin de l'exécution de la tâche {0}",
- 	"TaskService.noConfiguration": "Erreur : La détection de la tâche {0} n’a pas contribué à une tâche pour la configuration suivante : {1}, la tâche sera ignorée.\n",
-@@ -75,8 +87,13 @@
- 	"TaskService.pickDefaultBuildTask": "Sélectionner la tâche à utiliser comme tâche de génération par défaut",
- 	"TaskService.defaultTestTaskExists": "{0} est déjà marquée comme tâche de test par défaut.",
- 	"TaskService.pickDefaultTestTask": "Sélectionner la tâche à utiliser comme tâche de test par défaut",
-+<<<<<<< .our
- 	"TaskService.pickShowTask": "Sélectionner la tâche pour montrer sa sortie",
- 	"TaskService.noTaskIsRunning": "Aucune tâche n’est en cours d’exécution",
-+=======
-+	"TaskService.noTaskIsRunning": "Aucune tâche n’est en cours d’exécution.",
-+	"TaskService.pickShowTask": "Sélectionner la tâche pour montrer sa sortie",
-+>>>>>>> .their
- 	"ShowLogAction.label": "Afficher le journal des tâches",
- 	"RunTaskAction.label": "Exécuter la tâche",
- 	"RestartTaskAction.label": "Redémarrer la tâche en cours d'exécution",
-changed in both
-  base   100644 9b94ea398740a8d4bcf95677442564df33b7fc1a i18n/fra/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  our    100644 6d14510f43bd22b198ad6fdceb4967eca1723e41 i18n/fra/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  their  100644 f1bd9170bfd2f0f304c51f46b6cdc48af0695fda i18n/fra/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/fra/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  our    100644 e6b1283332bd10894500ddf69ae8a92a0b1f6a08 i18n/fra/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  their  100644 4c1012b62bf1eb2aeb5e50af757b0540d5371e8b i18n/fra/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,6 +10,15 @@
- 	"termEntryAriaLabel": "{0}, sélecteur de terminaux",
- 	"termCreateEntryAriaLabel": "{0}, créer un terminal",
- 	"workbench.action.terminal.newplus": "$(plus) Créer un terminal intégré",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"entryAriaLabel": "{0}, sélecteur de terminal",
-+>>>>>>> .their
- 	"noTerminalsMatching": "Aucun terminal correspondant",
- 	"noTerminalsFound": "Aucun terminal ouvert"
- }
-\ No newline at end of file
-changed in both
-  base   100644 4eb70b27e6505a3d913d692b5650d17d664c18b6 i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 c9b4f495f668b34a06e07f9e3acab9da423cc6a8 i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 f19cecf97cabcf334d6d6e9e4a7a7b3ba3a11a4c i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,9 @@
- 	],
- 	"quickOpen.terminal": "Afficher tous les terminaux ouverts",
- 	"terminal": "Terminal",
-+=======
-+	"quickOpen.terminal": "Afficher tous les terminaux ouverts",
-+>>>>>>> .their
- 	"terminalIntegratedConfigurationTitle": "Terminal intégré",
- 	"terminal.integrated.shell.linux": "Chemin de l'interpréteur de commandes utilisé par le terminal sur Linux.",
- 	"terminal.integrated.shellArgs.linux": "Arguments de ligne de commande à utiliser sur le terminal Linux.",
-@@ -36,8 +40,12 @@
- 	"terminal.integrated.env.osx": "Objet avec les variables d’environnement qui seront ajoutées au processus VS Code pour être utilisées par le terminal sous OS X",
- 	"terminal.integrated.env.linux": "Objet avec les variables d’environnement qui seront ajoutées au processus VS Code pour être utilisées par le terminal sous Linux",
- 	"terminal.integrated.env.windows": "Objet avec les variables d’environnement qui seront ajoutées au processus VS Code pour être utilisées par le terminal sous Windows",
-+<<<<<<< .our
- 	"terminal.integrated.showExitAlert": "Afficher une alerte `Le processus terminal s’est arrêté avec le code de sortie` lorsque le code de sortie est différent de zéro.",
- 	"terminal.integrated.experimentalRestore": "Si le fait de restaurer automatiquement les sessions du terminal pour l'espace de travail au lancement de VS Code. Il s'agit d'une fonctionnalité expérimentale; elle peut être boguée et peut changer dans le futur.",
-+=======
-+	"terminal": "Terminal",
-+>>>>>>> .their
- 	"terminalCategory": "Terminal",
- 	"viewCategory": "Affichage"
- }
-\ No newline at end of file
-changed in both
-  base   100644 e0a29182e956aeadbe127b8fc1c4dc3e0c3e87d0 i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 8f10773d1a2d0f2302f3cb3b7d0dac64b3d63462 i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 8c92d52774f98668012d409eb02d42a2fd56f9c3 i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -14,8 +14,11 @@
- 	"workbench.action.terminal.selectAll": "Tout Sélectionner",
- 	"workbench.action.terminal.deleteWordLeft": "Supprimer le mot à gauche",
- 	"workbench.action.terminal.deleteWordRight": "Supprimer le mot à droite",
-+<<<<<<< .our
- 	"workbench.action.terminal.moveToLineStart": "Aller au début de la ligne",
- 	"workbench.action.terminal.moveToLineEnd": "Aller à la fin de la ligne",
-+=======
-+>>>>>>> .their
- 	"workbench.action.terminal.new": "Créer un terminal intégré",
- 	"workbench.action.terminal.new.short": "Nouveau terminal",
- 	"workbench.action.terminal.newWorkspacePlaceholder": "Sélectionner le répertoire de travail actuel pour le nouveau terminal",
-@@ -51,6 +54,7 @@
- 	"workbench.action.terminal.rename.prompt": "Entrer le nom du terminal",
- 	"workbench.action.terminal.focusFindWidget": "Focus sur le widget de recherche",
- 	"workbench.action.terminal.hideFindWidget": "Masquer le widget de recherche",
-+<<<<<<< .our
- 	"nextTerminalFindTerm": "Afficher le terme de recherche suivant",
- 	"previousTerminalFindTerm": "Afficher le terme de recherche précédent",
- 	"quickOpenTerm": "Changer de terminal actif",
-@@ -60,4 +64,7 @@
- 	"workbench.action.terminal.selectToNextCommand": "Sélectionnez pour la commande suivante",
- 	"workbench.action.terminal.selectToPreviousLine": "Sélectionner pour la ligne précédente",
- 	"workbench.action.terminal.selectToNextLine": "Sélectionner pour la ligne suivante"
-+=======
-+	"quickOpenTerm": "Changer de terminal actif"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 2a639927b494a60c0250bc95e3eb2e7d42fc2ce6 i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 e89604d819428678dc7ff9b330667ccb471d786a i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 55c06f2a2f3f86a49c180d232a0b5e8832b15df5 i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -10,7 +10,10 @@
- 	"terminal.foreground": "Couleur de premier plan du terminal.",
- 	"terminalCursor.foreground": "La couleur de premier plan du curseur du terminal.",
- 	"terminalCursor.background": "La couleur d’arrière-plan du curseur terminal. Permet de personnaliser la couleur d’un caractère recouvert par un curseur de bloc.",
-+<<<<<<< .our
- 	"terminal.selectionBackground": "La couleur d’arrière-plan de sélection du terminal.",
- 	"terminal.border": "Couleur de bordure qui sépare les volets de fractionnement dans le terminal. La valeur par défaut est panel.border.",
-+=======
-+>>>>>>> .their
- 	"terminal.ansiColor": "Couleur ansi '{0}' dans le terminal."
- }
-\ No newline at end of file
-changed in both
-  base   100644 3b225062d915ef8fe2a6b9aa02fe9dbfe04517ce i18n/fra/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 7338692978cc41a3c9963a6eada047d9ffbf7ca9 i18n/fra/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 12b4156b835781ca1de4186f3756ef0f9112212f i18n/fra/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -11,8 +11,16 @@
- 	"read the release notes": "Bienvenue dans {0} v{1} ! Voulez-vous lire les notes de publication ?",
- 	"licenseChanged": "Nos termes du contrat de licence ont changé. Veuillez cliquer [ici]({0}) pour les consulter.",
- 	"neveragain": "Ne plus afficher",
-+<<<<<<< .our
- 	"64bitisavailable": "{0} pour Windows 64 bits est maintenant disponible ! Cliquez [ici]({0}) pour en savoir plus.",
- 	"updateIsReady": "Nouvelle mise à jour de {0} disponible.",
-+=======
-+	"64bitisavailable": "{0} pour Windows 64 bits est maintenant disponible !",
-+	"learn more": "En savoir plus",
-+	"updateIsReady": "Nouvelle mise à jour de {0} disponible.",
-+	"thereIsUpdateAvailable": "Une mise à jour est disponible.",
-+	"updateAvailable": "{0} sera mis à jour après avoir redémarré.",
-+>>>>>>> .their
- 	"noUpdatesAvailable": "Aucune mise à jour n'est disponible actuellement.",
- 	"ok": "OK",
- 	"thereIsUpdateAvailable": "Une mise à jour est disponible.",
-changed in both
-  base   100644 4868e0b0e11942a2f0db0667e1fc1cf8b851fb0b i18n/fra/src/vs/workbench/parts/views/browser/views.i18n.json
-  our    100644 fcd571da9266a7b7aa4a1a85d89a0851f378cac1 i18n/fra/src/vs/workbench/parts/views/browser/views.i18n.json
-  their  100644 b7b061cf58773d9a570d6c7357b303960fb59fb0 i18n/fra/src/vs/workbench/parts/views/browser/views.i18n.json
-@@ -5,5 +5,9 @@
- // Do not edit this file. It is machine generated.
- {
- 	"viewToolbarAriaLabel": "{0} actions",
-+<<<<<<< .our
- 	"hideView": "Masquer dans la barre latérale"
-+=======
-+	"removeView": "Supprimer de la barre latérale"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 77c399f7d666926a3b1f833b9759bb0fde8f4542 i18n/fra/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  our    100644 10bbc7a9e9670b9a8be87b309aaf0dd19bea459a i18n/fra/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  their  100644 c7bcf7a7820b143333035abb14cb1cf863659a34 i18n/fra/src/vs/workbench/services/configuration/node/configuration.i18n.json
-@@ -9,6 +9,7 @@
- 	"scope.window.description": "Configuration spécifique de la fenêtre, qui peut être configurée dans les paramètres utilisateur ou de l'espace de travail.",
- 	"scope.resource.description": "Configuration spécifique de la ressource, qui peut être configurée dans les paramètres utilisateur, de l'espace de travail ou du dossier.",
- 	"scope.description": "Portée dans laquelle la configuration s’applique. Les portées disponibles sont `window` et `resource`.",
-+<<<<<<< .our
- 	"vscode.extension.contributes.configuration": "Ajoute des paramètres de configuration.",
- 	"invalid.title": "'configuration.title' doit être une chaîne",
- 	"vscode.extension.contributes.defaultConfiguration": "Contribue aux paramètres de configuration d'éditeur par défaut en fonction du langage.",
-@@ -21,4 +22,13 @@
- 	"workspaceConfig.settings.description": "Paramètres de l’espace de travail",
- 	"workspaceConfig.extensions.description": "Extensions de l’espace de travail",
- 	"unknownWorkspaceProperty": "Propriété de configuration d’espace de travail inconnue"
-+=======
-+	"invalid.type": "s'il est défini, 'configuration.type' doit avoir la valeur 'object",
-+	"invalid.title": "'configuration.title' doit être une chaîne",
-+	"vscode.extension.contributes.defaultConfiguration": "Contribue aux paramètres de configuration d'éditeur par défaut en fonction du langage.",
-+	"invalid.properties": "'configuration.properties' doit être un objet",
-+	"workspaceConfig.id.description": "Identificateur d’espace de travail. Utilisé pour stocker l’état d’espace de travail interne, qui peut être perdu lors d'un changement.",
-+	"workspaceConfig.folders.description": "Liste des dossiers à charger dans l’espace de travail. Doit être un chemin d’accès. Par exemple `file:///root/folderA`",
-+	"workspaceConfig.settings.description": "Paramètres de l’espace de travail"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 059a4d8916792b8cbc0a80053689aa75959e6389 i18n/fra/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 2993ced5122221b6a919d7041aa1829b3f2477cf i18n/fra/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 5eacd95546fbf494efedffc16ff70745ea191ddc i18n/fra/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -9,6 +9,7 @@
- 	"openTasksConfiguration": "Ouvrir la configuration des tâches",
- 	"openLaunchConfiguration": "Ouvrir la configuration du lancement",
- 	"open": "Ouvrir les paramètres",
-+<<<<<<< .our
- 	"saveAndRetry": "Enregistrer et Réessayer",
- 	"errorUnknownKey": "Impossible d’écrire dans {0} car {1} n’est pas une configuration recommandée.",
- 	"errorInvalidWorkspaceConfigurationApplication": "Impossible d’écrire {0} dans les paramètres de l’espace de travail. Ce paramètre peut être écrit uniquement dans les paramètres de l’utilisateur.",
-@@ -27,6 +28,19 @@
- 	"errorConfigurationFileDirty": "Impossible d’écrire dans les paramètres de l'utilisateur car le fichier a été modifié. Veuillez s’il vous plaît enregistrer le fichier des paramètres de l'utilisateur et réessayez.",
- 	"errorConfigurationFileDirtyWorkspace": "Impossible d’écrire dans les paramètres de l’espace de travail, car le fichier est en attente de sauvegarde. Veuillez s’il vous plaît enregistrer le fichier des paramètres de l’espace de travail et essayez à nouveau.",
- 	"errorConfigurationFileDirtyFolder": "Impossible d’écrire dans les paramètres de dossier, car le fichier est en attente de sauvegarde. Veuillez s’il vous plaît enregistrer le fichier des paramètres du dossier '{0}' et essayez à nouveau.",
-+=======
-+	"close": "Fermer",
-+	"saveAndRetry": "Enregistrer les paramètres et recommencer",
-+	"errorUnknownKey": "Impossible d’écrire dans {0} car {1} n’est pas une configuration recommandée.",
-+	"errorInvalidFolderConfiguration": "Impossible d’écrire dans les paramètres de dossier parce que {0} ne supporte pas la portée de ressource de dossier.",
-+	"errorInvalidUserTarget": "Impossible d’écrire dans les paramètres utilisateur parce que {0} ne supporte pas de portée globale.",
-+	"errorInvalidFolderTarget": "Impossible d’écrire dans les paramètres de dossier car aucune ressource n’est fournie.",
-+	"errorNoWorkspaceOpened": "Impossible d’écrire dans {0} car aucun espace de travail n’est ouvert. Veuillez ouvrir un espace de travail et essayer à nouveau.",
-+	"errorInvalidConfiguration": "Impossible d'écrire les paramètres. Ouvrez les **Paramètres utilisateur** pour corriger les erreurs/avertissements présents dans le fichier, puis réessayez.",
-+	"errorInvalidConfigurationWorkspace": "Impossible d'écrire les paramètres. Ouvrez les **Paramètres d'espace de travail** pour corriger les erreurs/avertissements présents dans le fichier, puis réessayez.",
-+	"errorConfigurationFileDirty": "Impossible d'écrire les paramètres, car l'intégrité du fichier est compromise. Enregistrez le fichier des **Paramètres utilisateur**, puis réessayez.",
-+	"errorConfigurationFileDirtyWorkspace": "Impossible d'écrire les paramètres, car l'intégrité du fichier est compromise. Enregistrez le fichier des **Paramètres d'espace de travail**, puis réessayez.",
-+>>>>>>> .their
- 	"userTarget": "Paramètres utilisateur",
- 	"workspaceTarget": "Paramètres de l'espace de travail",
- 	"folderTarget": "Paramètres de dossier"
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/fra/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-  our    100644 67780b76187a9447d925cb0ef823da395cd5db48 i18n/fra/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-  their  100644 c071f5c7c670e9d73bce6f1308c991a06431ec05 i18n/fra/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"errorInvalidFile": "Impossible d’écrire dans le fichier. Veuillez ouvrir le fichier pour corriger les erreurs/avertissements dans le fichier et réessayer.",
- 	"errorFileDirty": "Impossible d’écrire dans le fichier parce que le fichier a été modifié. Veuillez enregistrer le fichier et réessayer."
- }
-\ No newline at end of file
-changed in both
-  base   100644 d541e53470bcf759186321b4beb9983f23440d0c i18n/fra/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 7050924f08d64059ea7847ed31aea3e00de2d358 i18n/fra/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 7f988ebf98b27eac5c77216f5ecd399b4e7d4960 i18n/fra/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-@@ -13,6 +13,7 @@
- 	"noIconThemeDesc": "No file icons",
- 	"iconThemeError": "File icon theme is unknown or not installed.",
- 	"workbenchColors": "Remplace les couleurs du thème de couleur sélectionné.",
-+<<<<<<< .our
- 	"editorColors.comments": "Définit les couleurs et les styles des commentaires",
- 	"editorColors.strings": "Définit les couleurs et les styles des littéraux de chaînes.",
- 	"editorColors.keywords": "Définit les couleurs et les styles des mots clés.",
-@@ -21,5 +22,9 @@
- 	"editorColors.functions": "Définit les couleurs et les styles des déclarations et références de fonctions.",
- 	"editorColors.variables": "Définit les couleurs et les styles des déclarations et références de variables.",
- 	"editorColors.textMateRules": "Définit les couleurs et les styles à l’aide de règles de thème textmate (avancé).",
-+=======
-+	"workbenchColors.deprecated": "Le paramètre n'est plus expérimental et a été renommé 'workbench.colorCustomizations'",
-+	"workbenchColors.deprecatedDescription": "Utiliser 'workbench.colorCustomizations' à la place",
-+>>>>>>> .their
- 	"editorColors": "Remplace les couleurs et le style de la police de l’éditeur du thème par la couleur actuellement sélectionnée."
- }
-\ No newline at end of file
-changed in both
-  base   100644 e5c10b00cae357d3329370d0a11e5f51f7177a68 i18n/hun/extensions/emmet/package.i18n.json
-  our    100644 4e87769482abf2ce774993c5210487918395fb71 i18n/hun/extensions/emmet/package.i18n.json
-  their  100644 2f28878d0d926324aacfbc5c36165ba8448a6fdd i18n/hun/extensions/emmet/package.i18n.json
-@@ -32,6 +32,7 @@
- 	"command.decrementNumberByTen": "Csökkentés 10-zel",
- 	"emmetSyntaxProfiles": "Konkrét szintaktika profiljának meghatározása vagy saját profil használata adott szabályokkal.",
- 	"emmetExclude": "Azon nyelvek listája, ahol az Emmet-rövidítések ne legyenek kibontva.",
-+<<<<<<< .our
- 	"emmetExtensionsPath": "Emmet-profilokat és -kódtöredékeket tartalmazó mappa elérési útja.",
- 	"emmetShowExpandedAbbreviation": "Kibontott Emmet-rövidítések megjelenítése javaslatként. Az \"inMarkupAndStylesheetFilesOnly\" beállítás csak a html, haml, jade, slim, xml, xsl, css, scss, sass, less és stylus típusú tartalmat jelenti. Az \"always\" beállítás a fájl összes részére vonatkozik a jelölőnyelvtől/css-től függetlenül.",
- 	"emmetShowAbbreviationSuggestions": "Lehetséges Emmet-rövidítések megjelenítése javaslatként. Nem használható a stíluslapokon vagy ha az emmet.showExpandedAbbreviation értéke \"never\".",
-@@ -62,4 +63,11 @@
- 	"emmetPreferencesCssMsProperties": "CSS-tulajdonságok vesszővel ellátott listája, melyek 'ms' gyártói előtagot kapnak azoknál az Emmet-rövidtéseknél, melyek `-` karakterrel kezdődnek. Állítsa üres szövegre, ha soha nem szeretne 'ms' előtagot használni.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "A minimális pontszám (0-tól 1-ig), amit egy fuzzy keresési találatnak el kell érnie. Az alacsonyabb értékek álpozitív találatokat eredményezhetnek, míg a magasabb értékek szűkítik a lehetséges találatok számát.",
- 	"emmetOptimizeStylesheetParsing": "Ha az értéke false, az egész fájl fel lesz dolgozva annak meghatározásához, hogy az aktuális pozíció ércényes-e Emmet-rövidítések kibontásához. Ha az értéke true, csak az aktuális pozíció körüli tartalom lesz feldolgozva a CSS/SCSS/LESS-fájlokban."
-+=======
-+	"emmetExtensionsPath": "Az Emmet-profilokat, -kódtöredékeket és -beállításokat tartalmazó mappa. Csak a profilok vannak használva a kiegészítőben, ha az emmet.useNewEmmet beállítás értéke true.",
-+	"emmetShowExpandedAbbreviation": "Kibontott emmet-rövidítések megjelenítése javaslatként. Az \"inMarkupAndStylesheetFilesOnly\" beállítás csak a html, haml, jade, slim, xml, xsl, css, scss, sass, less és stylus típusú tartalmat jelenti. Az \"always\" beállítás a fájl összes részére vonatkozik a jelölőnyelvtől/css-től függetlenül.",
-+	"emmetShowAbbreviationSuggestions": "A lehetséges emmet-rövidítések megjelenítése javaslatként. Nem használható a stíluslapokon vagy ha az emmet.showExpandedAbbreviation értéke \"never\".",
-+	"emmetIncludeLanguages": "Emmet-rövidítések engedélyezése olyan nyelvek esetében, amelyek alapértelmezés szerint nem támogatottak. Egy megfeleltetést kell felvenni a nyelv és egy emmet által támogatott nyelv között.\nPl.: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
-+	"emmetVariables": "Az emmet-kódrészletekben használt változók"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 3e085fae59ae803904737cef0ebcd127a7e0253d i18n/hun/extensions/extension-editing/out/extensionLinter.i18n.json
-  our    100644 5528d4e358b801448ec5dba3aaf0582297480dad i18n/hun/extensions/extension-editing/out/extensionLinter.i18n.json
-  their  100644 e3c13b9c6a9995add772c0920214f974605c4cbb i18n/hun/extensions/extension-editing/out/extensionLinter.i18n.json
-merged
-  result 100644 3da57c3d6665519f79f622d8f7c4b0b04309951c i18n/hun/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-  our    100644 66342aeada8f9437147533f9600ef6c47abefb15 i18n/hun/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-@@ -7,8 +7,5 @@
- 	"emmetConfigurationTitle": "Emmet",
- 	"triggerExpansionOnTab": "Ha engedélyezve van, akkor az Emmet-rövidítések a Tab billentyű lenyomásával oldhatók fel. Nem használható, ha az emmet.useNewemmet beállítás értéke true.",
- 	"emmetPreferences": "Beállítások, melyek módosítják az Emmet műveleteinek és feloldó algoritmusainak viselkedését. Nem használható, ha az emmet.useNewemmet beállítás értéke true.",
--	"emmetSyntaxProfiles": "Konkrét szintaktika profiljának meghatározása vagy saját profil használata adott szabályokkal.",
--	"emmetExclude": "Azon nyelvek listája, ahol az Emmet-rövidítések ne legyenek kibontva.",
--	"emmetExtensionsPath": "Az Emmet-profilokat, -kódtöredékeket és -beállításokat tartalmazó mappa. Csak a profilok vannak használva a kiegészítőben, ha az emmet.useNewEmmet beállítás értéke true.",
- 	"useNewEmmet": "Új Emmet-modulok használata az összes Emmet-funkcióhoz (ami előbb-utóbb helyettesíteni fogja az egyedülálló Emmet-könyvtárat)."
- }
-\ No newline at end of file
-changed in both
-  base   100644 7fbc7fb1516a69fbdc0a5ec691159a33a1f123f8 i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 7fcd4f374ab4f60995cadb201b3438b5f1c1d544 i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 ee0b9750f5650ec8052a84dd3dea81872e18858f i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -13,5 +13,12 @@
- 	"newExtensionLabel": "\"{0}\" kiegészítő megjelenítése",
- 	"editTtile": "Szerkesztés",
- 	"replaceDefaultValue": "Csere a beállításokban",
-+<<<<<<< .our
- 	"copyDefaultValue": "Másolás a beállításokba"
-+=======
-+	"copyDefaultValue": "Másolás a beállításokba",
-+	"unsupportedPHPExecutablePathSetting": "Ez a beállítás csak a felhasználói beállításokban szerepelhet. A PHP munkaterülethez történő konfigurálásához nyisson meg egy PHP-fájlt, majd kattintson a PHP-elérési útra az állapotsoron!",
-+	"unsupportedWorkspaceSetting": "Ez a beállítás csak a felhasználói beállításokban szerepelhet.",
-+	"unsupportedWorkbenchSetting": "Ez a beállítás jelenleg nem alkalmazható. Akkor van használatban, ha közvetlenül nyitja meg ezt a mappát."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 557a3b1f1b3bdc60ae0a3804d7505a407326123b i18n/hun/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  our    100644 7156b4ce412c8251e8f04a4b792b1c2d0136b79a i18n/hun/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  their  100644 5864461ae76309347ec98bd0ccd9139bdb37c9dc i18n/hun/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-changed in both
-  base   100644 30ac3bd312722396d493d3790da22866a84dd463 i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 8ec8f827057c19dd6709715ecc51f43540d7d5cc i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 2b495e02924e1ef9343862deb24d0f31d080f850 i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-changed in both
-  base   100644 3abe72be506dc91ec0eef8e438f3d03b7d012a54 i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 b5d8a4cb5cb8f374a5aeb4f4cc4a537c343663e4 i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 1365065ac1fc0cd8af630400851ff72f17cf98d8 i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -51,6 +51,7 @@
- 	"workbench.action.terminal.rename.prompt": "Adja meg a terminál nevét!",
- 	"workbench.action.terminal.focusFindWidget": "Váltás a keresőmodulra",
- 	"workbench.action.terminal.hideFindWidget": "Keresőmodul elrejtése",
-+<<<<<<< .our
- 	"nextTerminalFindTerm": "Következő keresési kifejezés megjelenítése",
- 	"previousTerminalFindTerm": "Előző keresési kifejezés megjelenítése",
- 	"quickOpenTerm": "Aktív terminál váltása",
-@@ -60,4 +61,7 @@
- 	"workbench.action.terminal.selectToNextCommand": "Következő parancs kiválasztása",
- 	"workbench.action.terminal.selectToPreviousLine": "Kijelölés az előző sorig",
- 	"workbench.action.terminal.selectToNextLine": "Kijelölés a következő sorig"
-+=======
-+	"quickOpenTerm": "Aktív terminál váltása"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 300fc7b40dc299d567e4beedb01b6d1bce16698e i18n/hun/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  our    100644 209303272b75dde2c6c8486d048f4d36b4fd9190 i18n/hun/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  their  100644 3388c59ff7981bac7f1311cf7960a294f80c1119 i18n/hun/src/vs/workbench/services/configuration/node/configuration.i18n.json
-@@ -9,7 +9,11 @@
- 	"scope.window.description": "Ablakspecifikus beállítás, ami konfigurálható a felhasználói vagy munkaterületi beállításokban.",
- 	"scope.resource.description": "Erőforrásspecifikus beállítás, ami beállítható a felhasználói, munkaterületi és mappaszintű beállításokban.",
- 	"scope.description": "A hatókör, amire a beállítás vonatkozik. Az elérhető hatókörök: `window` és `resource`.",
-+<<<<<<< .our
- 	"vscode.extension.contributes.configuration": "Konfigurációs beállításokat szolgáltat.",
-+=======
-+	"invalid.type": "ha meg van adva, a 'configuration.type' értékét egy objektumként kell megadnii",
-+>>>>>>> .their
- 	"invalid.title": "a 'configuration.title' értékét karakterláncként kell megadni",
- 	"vscode.extension.contributes.defaultConfiguration": "Adott nyelvre vonatkozóan szerkesztőbeállításokat szolgáltat.",
- 	"invalid.properties": "A 'configuration.properties' értékét egy objektumként kell megadni",
-changed in both
-  base   100644 459dfe9d8c1c6d76a2a67d59c21dc02a2defa3c5 i18n/hun/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 8838896ef923e5351413eebec6f141118ecced3a i18n/hun/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 b5420a3aa08b02a1b7d7efed67faadb7aae5feec i18n/hun/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -9,6 +9,7 @@
- 	"openTasksConfiguration": "Feladatkonfiguráció megnyitása",
- 	"openLaunchConfiguration": "Indítási konfiguráció megnyitása",
- 	"open": "Beállítások megnyitása",
-+<<<<<<< .our
- 	"saveAndRetry": "Mentés és újrapróbálkozás",
- 	"errorUnknownKey": "Nem sikerült írni a következőbe: {0}. A(z) {1} nem regisztrált beállítás.",
- 	"errorInvalidWorkspaceConfigurationApplication": "Nem sikerült írni a munkaterület beállításaiba, mert ez a beállítás csak a felhasználói beállításokban használható. ",
-@@ -27,6 +28,19 @@
- 	"errorConfigurationFileDirty": "Nem sikerült írni a felhasználói beállításokba, mert a fájl módosítva lett. Mentse a felhasználói beállításokat tartalmazó fájlt, majd próbálja újra!",
- 	"errorConfigurationFileDirtyWorkspace": "Nem sikerült írni a munkaterületi beállításokba, mert a fájl módosítva lett. Mentse a munkaterület beállításait tartalmazó fájlt, majd próbálja újra!",
- 	"errorConfigurationFileDirtyFolder": "Nem sikerült írni a mappa beállításait tartalmazó fájlba, mert a fájl módosítva lett. Mentse a(z) '{0}' mappa beállításait tartalmazó fájlt, majd próbálja újra!",
-+=======
-+	"close": "Bezárás",
-+	"saveAndRetry": "Beállítások mentése és újrapróbálkozás",
-+	"errorUnknownKey": "Nem sikerült írni a következőbe: {0}. A(z) {1} nem regisztrált beállítás.",
-+	"errorInvalidFolderConfiguration": "Nem sikerült írni a mappa beállításaiba, mert a(z) {0} nem támogatott mappa típusú erőforrások hatókörében.",
-+	"errorInvalidUserTarget": "Nem sikerült írni a felhasználói beállításokba, mert a(z) {0} nem támogatott globális hatókörben.",
-+	"errorInvalidFolderTarget": "Nem sikerült írni a mappa beállításaiba, mert nincs erőforrás megadva.",
-+	"errorNoWorkspaceOpened": "Nem sikerült írni a következőbe: {0}. Nincs munkaterület megnyitva. Nyisson meg egy munkaterületet, majd próbálja újra!",
-+	"errorInvalidConfiguration": "Nem sikerült írni a beállításokba. Nyissa meg a **Felhasználói beállításokat**, javítsa a hibákat és figyelmeztetéseket a fájlban, majd próbálja újra!",
-+	"errorInvalidConfigurationWorkspace": "Nem sikerült írni a beállításokba. Nyissa meg a **Munkaterült beállításait**, javítsa a hibákat és figyelmeztetéseket a fájlban, majd próbálja újra!",
-+	"errorConfigurationFileDirty": "Nem sikerült írni a beállításokba, mert a fájl módosítva lett. Mentse a **Felhasználói beállítások** fájlt, majd próbálja újra!",
-+	"errorConfigurationFileDirtyWorkspace": "Nem sikerült írni a beállításokba, mert a fájl módosítva lett. Mentse a **Munkaterület beállításai** fájlt, majd próbálja újra!",
-+>>>>>>> .their
- 	"userTarget": "Felhasználói beállítások",
- 	"workspaceTarget": "Munkaterület-beállítások",
- 	"folderTarget": "Mappabeálíltások"
-changed in both
-  base   100644 702045560ca96479bda9b9411bf1d371f3c874c9 i18n/ita/extensions/emmet/package.i18n.json
-  our    100644 325af035e69c09e1e32c51cdc976ffb0a4047641 i18n/ita/extensions/emmet/package.i18n.json
-  their  100644 54c9cc403a2a41e28eee83aa568ddecf22d199e1 i18n/ita/extensions/emmet/package.i18n.json
-@@ -31,6 +31,7 @@
- 	"command.incrementNumberByTen": "Aumenta di 10",
- 	"command.decrementNumberByTen": "Riduci di 10",
- 	"emmetSyntaxProfiles": "Consente di definire il profilo per la sintassi specificata oppure di usare un profilo personalizzato con regole specifiche.",
-+<<<<<<< .our
- 	"emmetExclude": "Una matrice di linguaggi dove le abbreviazioni Emmet non dovrebbero essere espanse.",
- 	"emmetExtensionsPath": "Percorso di una cartella contenente profili e snippet Emmet.'",
- 	"emmetShowExpandedAbbreviation": "Mostra le abbreviazioni Emmet espanse come suggerimenti.\nL'opzione \"inMarkupAndStylesheetFilesOnly\" si applica a html, haml, jade, slim, xml, xsl, css, scss, sass, less e stylus.\nL'opzione \"sempre\" (always) si applica a tutte le parti del file indipendentemente dal markup/css.",
-@@ -62,4 +63,12 @@
- 	"emmetPreferencesCssMsProperties": "Proprietà CSS delimitate da virgola che assumono il prefisso 'ms' del vendor quando utilizzate nelle abbreviazioni di Emmet che iniziano per '-'. Per evitare sempre il prefisso 'ms' impostare stringa vuota.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "Il valore minimo (da 0 a 1) che dovrebbe raggiungere un'abbreviazione di fuzzy-match. I valori più bassi possono produrre molti falsi positivi, i valori più alti possono ridurre le possibili corrispondenze.",
- 	"emmetOptimizeStylesheetParsing": "Se è impostato su false, l'intero file viene analizzato per determinare se la posizione corrente è valida per l'espansione delle abbreviazioni di Emmet. Se è impostato su true, viene analizzato solo il contenuto circostante alla posizione corrente nei file css/scss/less."
-+=======
-+	"emmetExclude": "Matrice di linguaggi in cui le abbreviazioni Emmet non devono essere espanse.",
-+	"emmetExtensionsPath": "Percorso di una cartella contenente profili emmet, frammenti e preferenze . Quando emmet.useNewEmmet è impostato a true, solo i profili vengono gestiti dal percorso delle estensioni.",
-+	"emmetShowExpandedAbbreviation": "Mostra le abbreviazioni emmet espanse come suggerimenti.\nL'opzione \"inMarkupAndStylesheetFilesOnly\" si applica a html, haml, jade, slim, xml, xsl, css, scss, sass, less e stylus.\nL'opzione \"sempre\" (always) si applica a tutte le parti del file indipendentemente dal markup/css.",
-+	"emmetShowAbbreviationSuggestions": "Mostra possibili abbreviazioni emmet come suggerimenti. Non si applica a fogli di stile o quando emmet.showExpandedAbbreviation è impostata a \"mai\" (never).",
-+	"emmetIncludeLanguages": "Abilita le abbreviazioni emmet in linguaggi che non sono normalmente supportati. Aggiungere un mapping tra il linguaggio ed il linguaggio supportato da emmet.\n Ad esempio: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
-+	"emmetVariables": "Variabili da utilizzare nei frammenti di emmet"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 4fb28078ec9d4499a88f6978fc37bd9a593d8322 i18n/ita/extensions/extension-editing/out/extensionLinter.i18n.json
-  our    100644 ffb77fa1af8844a4780620b5955b34dc93a0f44f i18n/ita/extensions/extension-editing/out/extensionLinter.i18n.json
-  their  100644 a8b4072cafe1942f3f070a324988ab13d4d8e777 i18n/ita/extensions/extension-editing/out/extensionLinter.i18n.json
-changed in both
-  base   100644 26d0cd57ac25cccf17f52fff5b14fe94775a32c2 i18n/ita/extensions/git/out/commands.i18n.json
-  our    100644 b8b9f0490197b0e5904f4f035caca3a7f04c7df9 i18n/ita/extensions/git/out/commands.i18n.json
-  their  100644 955f18ac9507c0b5b2d24a44903a4286ff8a22f7 i18n/ita/extensions/git/out/commands.i18n.json
-changed in both
-  base   100644 81907bad2d4d1b77dd6ad7b8b7ad0c8d79be6f3d i18n/ita/extensions/markdown/out/previewContentProvider.i18n.json
-  our    100644 9207358bc4d40c21d04b6b28dd176c9a48857762 i18n/ita/extensions/markdown/out/previewContentProvider.i18n.json
-  their  100644 9a12e1b113c36fe5304e1ef09cade00a2ae4afd4 i18n/ita/extensions/markdown/out/previewContentProvider.i18n.json
-@@ -4,7 +4,11 @@
-  *--------------------------------------------------------------------------------------------*/
- // Do not edit this file. It is machine generated.
- {
-+<<<<<<< .our
- 	"preview.securityMessage.text": "Alcuni contenuti sono stati disabilitati in questo documento",
-+=======
-+	"preview.securityMessage.text": "Alcuni contenuti sono stati disattivati in questo documento",
-+>>>>>>> .their
- 	"preview.securityMessage.title": "Contenuti potenzialmente non sicuri sono stati disattivati nell'anteprima del Markdown. Modificare l'impostazione di protezione dell'anteprima del Markdown per consentire la visualizzazione di contenuto insicuro o abilitare gli script",
- 	"preview.securityMessage.label": "Avviso di sicurezza contenuto disabilitato"
- }
-\ No newline at end of file
-changed in both
-  base   100644 4b1b334651f547ec735bfefa72dbb76ace7100f2 i18n/ita/extensions/markdown/out/security.i18n.json
-  our    100644 17900416bd63016cb376b5bd866dbacf0ec6bdd5 i18n/ita/extensions/markdown/out/security.i18n.json
-  their  100644 5b7d36b109ea6ca6ebd2b571be1d6f4fb6b05627 i18n/ita/extensions/markdown/out/security.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -16,5 +17,11 @@
- 	"enableSecurityWarning.title": "Abilita anteprima degli avvisi di protezione in questa area di lavoro",
- 	"disableSecurityWarning.title": "Disabilita anteprima degli avvisi di protezione in questa area di lavoro",
- 	"toggleSecurityWarning.description": "Non influisce sul livello di sicurezza del contenuto",
-+=======
-+	"preview.showPreviewSecuritySelector.strictTitle": "Strict. Carica solo contenuto protetto.",
-+	"preview.showPreviewSecuritySelector.currentSelection": "Impostazione corrente",
-+	"preview.showPreviewSecuritySelector.insecureContentTitle": "Consente il caricamento di contenuti via http.",
-+	"preview.showPreviewSecuritySelector.scriptsAndAllContent": "Consente l'esecuzione di tutti i contenuti e script. Sconsigliato.",
-+>>>>>>> .their
- 	"preview.showPreviewSecuritySelector.title": "Seleziona impostazioni di protezione per le anteprime Markdown in questa area di lavoro"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/ita/src/vs/code/electron-main/auth.i18n.json
-  our    100644 674db87b9f5bd5ed58dc33b63fa2954ba609d608 i18n/ita/src/vs/code/electron-main/auth.i18n.json
-  their  100644 354aecd5ccb0c070c75c8aff899a5065c07bbb54 i18n/ita/src/vs/code/electron-main/auth.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"authRequire": "Autenticazione proxy necessaria",
- 	"proxyauth": "Il proxy {0} richiede l'autenticazione."
- }
-\ No newline at end of file
-changed in both
-  base   100644 ad8399e27f9af629ea7a40b87affc69453bfff38 i18n/ita/src/vs/code/electron-main/menus.i18n.json
-  our    100644 a5f6c5e0343adf224d6df3a61663d9695836512e i18n/ita/src/vs/code/electron-main/menus.i18n.json
-  their  100644 17dc1a5be640cc2b4d33f9f71a9a6ce61d379935 i18n/ita/src/vs/code/electron-main/menus.i18n.json
-@@ -24,12 +24,21 @@
- 	"miQuit": "Chiudi {0}",
- 	"miNewFile": "&&Nuovo file",
- 	"miOpen": "&&Apri...",
-+<<<<<<< .our
- 	"miOpenWorkspace": "Aprire Wor&&kspace...",
- 	"miOpenFolder": "Apri &&cartella...",
- 	"miOpenFile": "&&Apri file...",
- 	"miOpenRecent": "Apri &&recenti",
- 	"miSaveWorkspaceAs": "Salva area di lavoro con nome...",
- 	"miAddFolderToWorkspace": "A&&ggiungere cartella all'area di lavoro...",
-+=======
-+	"miOpenWorkspace": "&&Apri area di lavoro...",
-+	"miOpenFolder": "Apri &&cartella...",
-+	"miOpenFile": "&&Apri file...",
-+	"miOpenRecent": "Apri &&recenti",
-+	"miSaveWorkspaceAs": "&&Salva area di lavoro con nome...",
-+	"miAddFolderToWorkspace": "&&Aggiungi cartella all'area di lavoro...",
-+>>>>>>> .their
- 	"miSave": "&&Salva",
- 	"miSaveAs": "Salva con nome...",
- 	"miSaveAll": "Salva &&tutto",
-@@ -189,5 +198,11 @@
- 	"miDownloadingUpdate": "Download dell'aggiornamento...",
- 	"miInstallUpdate": "Installa aggiornamento...",
- 	"miInstallingUpdate": "Installazione dell'aggiornamento...",
-+<<<<<<< .our
- 	"miRestartToUpdate": "Riavvia per aggiornare..."
-+=======
-+	"miCheckForUpdates": "Verifica disponibilità aggiornamenti...",
-+	"aboutDetail": "\nVersione {0}\nCommit {1}\nData {2}\nShell {3}\nRenderer {4}\nNodo {5}\nArchitettura {6}",
-+	"okButton": "OK"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ec56b9229e6a5bc84b8bd609fa288c4f6d8da462 i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 f91d8d15e9f7c53e3b2a0166aab270c9bf1f772e i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 3bf52e527e6ede6f17a79cbeaf1286be631d6814 i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json
-changed in both
-  base   100644 acd2bdb447c6f8eb7c4ddfba5d02209fc3f5b6d1 i18n/ita/src/vs/editor/contrib/find/common/findController.i18n.json
-  our    100644 753c08a072abf07ee50bf0b788eff38c641f8761 i18n/ita/src/vs/editor/contrib/find/common/findController.i18n.json
-  their  100644 0b6e1248aab60b64c0c8f7ae39434e21c71869f8 i18n/ita/src/vs/editor/contrib/find/common/findController.i18n.json
-@@ -10,6 +10,15 @@
- 	"nextSelectionMatchFindAction": "Trova selezione successiva",
- 	"previousSelectionMatchFindAction": "Trova selezione precedente",
- 	"startReplace": "Sostituisci",
-+<<<<<<< .our
-+=======
-+	"addSelectionToNextFindMatch": "Aggiungi selezione a risultato ricerca successivo",
-+	"addSelectionToPreviousFindMatch": "Aggiungi selezione a risultato ricerca precedente",
-+	"moveSelectionToNextFindMatch": "Sposta ultima selezione a risultato ricerca successivo",
-+	"moveSelectionToPreviousFindMatch": "Sposta ultima selezione a risultato ricerca precedente",
-+	"selectAllOccurrencesOfFindMatch": "Seleziona tutte le occorrenze del risultato ricerca",
-+	"changeAll.label": "Cambia tutte le occorrenze",
-+>>>>>>> .their
- 	"showNextFindTermAction": "Mostra il termine di ricerca successivo",
- 	"showPreviousFindTermAction": "Mostra il termine di ricerca precedente"
- }
-\ No newline at end of file
-changed in both
-  base   100644 0375c531a5b488902d70ee2ee25d469f302d74f2 i18n/ita/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 967a9460fbe454ea199d54b4639f97929c5854cd i18n/ita/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 c678682d4f3f868965b382aa8796194222327e44 i18n/ita/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -9,6 +9,7 @@
- 	"openFile": "Apri file...",
- 	"openFolder": "Apri cartella...",
- 	"openFileFolder": "Apri...",
-+<<<<<<< .our
- 	"globalRemoveFolderFromWorkspace": "Rimuovi cartella dall'area di lavoro...",
- 	"saveWorkspaceAsAction": "Salva area di lavoro come...",
- 	"save": "&&Salva",
-@@ -16,4 +17,24 @@
- 	"openWorkspaceAction": "Apri area di lavoro...",
- 	"openWorkspaceConfigFile": "Apri file di configurazione dell'area di lavoro",
- 	"duplicateWorkspaceInNewWindow": "Duplica area di lavoro nella nuova finestra"
-+=======
-+	"reload": "&&Ricarica",
-+	"cancel": "Annulla",
-+	"newWorkspaceFormExisting": "Nuova area di lavoro da una esistente...",
-+	"select": "&&Seleziona",
-+	"selectWorkspace": "Seleziona cartelle per l'area di lavoro",
-+	"addSupported": "Per aprire più cartelle, è necessario ricaricare la finestra.",
-+	"addFolderToWorkspace": "Aggiungi cartella all'area di lavoro...",
-+	"add": "&&Aggiungi",
-+	"addFolderToWorkspaceTitle": "Aggiungi cartella all'area di lavoro",
-+	"removeFolderFromWorkspace": "Rimuovi cartella dall'area di lavoro",
-+	"saveWorkspaceAsAction": "Salva area di lavoro come...",
-+	"saveEmptyWorkspaceNotSupported": "Aprire prima un'area di lavoro da salvare.",
-+	"saveNotSupported": "Per salvare l'area di lavoro, è necessario ricaricare la finestra.",
-+	"save": "&&Salva",
-+	"saveWorkspace": "Salva area di lavoro",
-+	"openWorkspaceAction": "Apri area di lavoro...",
-+	"newWorkspace": "Nuova area di lavoro...",
-+	"openWorkspaceConfigFile": "Apri file di configurazione dell'area di lavoro"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ad121771c6a44313ea205a217713874a62d1e732 i18n/ita/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 52332d26b607badcbfc6c1f6cb20390d01164f46 i18n/ita/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 34ec4817bae4966455cf5b020e3e55e33505f43e i18n/ita/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 3ba6e23918d44e7a5b3339d1fab97d86ab3415f5 i18n/ita/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-  our    100644 f27bb31505eb3962ff3d4e355a3108ad6a5fb52c i18n/ita/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-  their  100644 69d8f45b5e69ab79fd1d9c2cf98400e671c3b2c6 i18n/ita/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,9 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"compositePart.hideSideBarLabel": "Nascondi barra laterale",
-+>>>>>>> .their
- 	"focusSideBar": "Sposta lo stato attivo nella barra laterale",
- 	"viewCategory": "Visualizza"
- }
-\ No newline at end of file
-changed in both
-  base   100644 94f6d56ff31d1a24e80dce299dfc00189c548124 i18n/ita/src/vs/workbench/common/theme.i18n.json
-  our    100644 35f6e5209eb686bd26e13c1a8f96b6d2fe49fc8a i18n/ita/src/vs/workbench/common/theme.i18n.json
-  their  100644 22060bc365d75711d5e0982af4a0e521aff64a7f i18n/ita/src/vs/workbench/common/theme.i18n.json
-@@ -61,6 +61,7 @@
- 	"titleBarActiveBackground": "Colore di sfondo della barra di titolo quando la finestra è attiva. Si noti che questo colore è attualmente solo supportati su macOS.",
- 	"titleBarInactiveBackground": "Colore di sfondo della barra del titolo quando la finestra è inattiva. Si noti che questo colore è attualmente supportato solo su macOS.",
- 	"titleBarBorder": "Colore del bordo della barra di stato. Si noti che questo colore è attualmente supportato solo su macOS.",
-+<<<<<<< .our
- 	"notificationCenterBorder": "Colore del bordo del centro notifiche. Le notifiche scorrono dalla parte inferiore destra della finestra.",
- 	"notificationToastBorder": "Colore del bordo dell'avviso popup di notifica. Le notifiche scorrono dalla parte inferiore destra della finestra.",
- 	"notificationsForeground": "Colore primo piano delle notifiche. Le notifiche scorrono dalla parte inferiore destra della finestra.",
-@@ -69,4 +70,17 @@
- 	"notificationCenterHeaderForeground": "Colore primo piano dell'intestazione del centro notifiche. Le notifiche scorrono dalla parte inferiore destra della finestra.",
- 	"notificationCenterHeaderBackground": "Colore di sfondo dell'intestazione del centro notifiche. Le notifiche scorrono dalla parte inferiore destra della finestra.",
- 	"notificationsBorder": "Colore del bordo che separa le notifiche da altre notifiche nel centro notifiche. Le notifiche scorrono dalla parte inferiore destra della finestra."
-+=======
-+	"notificationsForeground": "Colore primo piano delle notifiche. Le notifiche scorrono dalla parte superiore della finestra.",
-+	"notificationsBackground": "Colore di sfondo delle notifiche. Le notifiche scorrono dalla parte superiore della finestra.",
-+	"notificationsButtonBackground": "Colore di sfondo del pulsante delle notifiche. Le notifiche scorrono dalla parte superiore della finestra.",
-+	"notificationsButtonHoverBackground": "Colore di sfondo del pulsante delle notifiche al passaggio del mouse. Le notifiche scorrono dalla parte superiore della finestra.",
-+	"notificationsButtonForeground": "Colore primo piano del pulsante delle notifiche. Le notifiche scorrono dalla parte superiore della finestra.",
-+	"notificationsInfoBackground": "Colore di sfondo delle notifiche informative. Le notifiche scorrono dalla parte superiore della finestra.",
-+	"notificationsInfoForeground": "Colore primo piano delle notifiche informative. Le notifiche scorrono dalla parte superiore della finestra.",
-+	"notificationsWarningBackground": "Colore di sfondo delle notifiche di avviso. Le notifiche scorrono dalla parte superiore della finestra.",
-+	"notificationsWarningForeground": "Colore primo piano delle notifiche di avviso. Le notifiche scorrono dalla parte superiore della finestra.",
-+	"notificationsErrorBackground": "Colore di sfondo delle notifiche di errore. Le notifiche scorrono dalla parte superiore della finestra.",
-+	"notificationsErrorForeground": "Colore primo piano delle notifiche di errore. Le notifiche scorrono dalla parte superiore della finestra."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ce7aaf644a53c9cc9154e313aa2eb37bea55d460 i18n/ita/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 9737d645d67a50d571dc86669b68ed740de20eba i18n/ita/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 a79d647bc84eaad5ce6eb3d2e29a016c01b00c08 i18n/ita/src/vs/workbench/electron-browser/actions.i18n.json
-changed in both
-  base   100644 310e156f9037debf76cdfb22f7fdaff2963cd69f i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 16fec1a5d98f225249a95297ad06c45ba75efafc i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 59acb53f222b5dbb3bd1b9a82ed342bf7933bc00 i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,6 +35,7 @@
- 	"panelDefaultLocation": "Controlla la posizione predefinita del pannello. Può essere mostrato nella parte inferiore o a destra del banco di lavoro.",
- 	"statusBarVisibility": "Controlla la visibilità della barra di stato nella parte inferiore del workbench.",
- 	"activityBarVisibility": "Controlla la visibilità della barra attività nel workbench.",
-+<<<<<<< .our
- 	"viewVisibility": "Controlla la visibilità delle azioni dell'intestazione della visualizzazione. Le azioni dell'intestazione della visualizzazione possono essere sempre visibili oppure visibili solo quando lo stato attivo è spostato sulla visualizzazione o si passa con il puntatore sulla visualizzazione.",
- 	"fontAliasing": "Controlla il metodo di aliasing dei caratteri nell'area di lavoro.\n- default: anti-aliasing dei caratteri a livello di sub-pixel. Nella maggior parte delle visualizzazioni non retina consentirà di ottenere un testo con il massimo contrasto.\n- antialiased: anti-aliasing dei caratteri a livello di pixel, invece che a livello di sub-pixel. Consente di visualizzare i caratteri più chiari.\n- none: disabilita l'anti-aliasing dei caratteri. Il testo verrà visualizzato con contorni irregolari.\n- auto: applica automaticamente `default` o `antialiased` in base al valore DPI degli schermi.",
- 	"workbench.fontAliasing.default": "Anti-aliasing dei caratteri a livello di sub-pixel. Nella maggior parte delle visualizzazioni non retina consentirà di ottenere un testo con il massimo contrasto.",
-@@ -43,6 +44,15 @@
- 	"workbench.fontAliasing.auto": "Applica automaticamente `default` o `antialiased` in base al valore DPI degli schermi.",
- 	"enableNaturalLanguageSettingsSearch": "Controlla se abilitare la modalità di ricerca in linguaggio naturale per le impostazioni.",
- 	"windowConfigurationTitle": "Finestra",
-+=======
-+	"closeOnFileDelete": "Controlla se gli editor che visualizzano un file devono chiudersi automaticamente quando il file viene eliminato o rinominato da un altro processo. Se si disabilita questa opzione, in una simile circostanza l'editor verrà aperto e i file risulteranno modificati ma non salvati. Nota: se si elimina il file dall'interno dell'applicazione, l'editor verrà sempre chiuso e i file modificati ma non salvati non verranno mai chiusi allo scopo di salvaguardare i dati.",
-+	"fontAliasing": "Controlla il metodo di aliasing dei caratteri nell'area di lavoro.\n- impostazione predefinita: anti-aliasing dei caratteri a livello di sub-pixel. Nella maggior parte delle visualizzazioni non retina consentirà di ottenere un testo con il massimo contrasto.\n- anti-aliasing: anti-aliasing dei caratteri a livello di pixel, invece che a livello di sub-pixel. Consente di visualizzare i caratteri più chiari.\n- nessuno: disabilita l'anti-aliasing dei caratteri. Il testo verrà visualizzato con contorni irregolari.",
-+	"workbench.fontAliasing.default": "Anti-aliasing dei caratteri a livello di sub-pixel. Nella maggior parte delle visualizzazioni non retina consentirà di ottenere un testo con il massimo contrasto.",
-+	"workbench.fontAliasing.antialiased": "Anti-aliasing dei caratteri a livello di pixel, invece che a livello di sub-pixel. Consente di visualizzare i caratteri più chiari.",
-+	"workbench.fontAliasing.none": "Disabilita l'anti-aliasing dei caratteri. Il testo verrà visualizzato con contorni irregolari. ",
-+	"swipeToNavigate": "Scorrere orizzontalmente con tre dita per spostarsi tra i file aperti.",
-+	"workbenchConfigurationTitle": "Area di lavoro",
-+>>>>>>> .their
- 	"window.openFilesInNewWindow.on": "I file verranno aperti in una nuova finestra",
- 	"window.openFilesInNewWindow.off": "I file verranno aperti nella finestra con la cartella dei file aperta o nell'ultima finestra attiva",
- 	"window.openFilesInNewWindow.defaultMac": "I file verranno aperti nella finestra con la cartella dei file aperta o nell'ultima finestra attiva a meno che non vengano aperti tramite il pannello Dock o da Finder",
-changed in both
-  base   100644 424eb5bfbe5e2bbdb12572d48ee7a9652feebbda i18n/ita/src/vs/workbench/electron-browser/window.i18n.json
-  our    100644 44890b35904935df91f62f43dcb119e76f1ea136 i18n/ita/src/vs/workbench/electron-browser/window.i18n.json
-  their  100644 9cc484cd55fa4a4a3a9e5684bbd54e105687f90b i18n/ita/src/vs/workbench/electron-browser/window.i18n.json
-@@ -12,5 +12,10 @@
- 	"copy": "Copia",
- 	"paste": "Incolla",
- 	"selectAll": "Seleziona tutto",
-+<<<<<<< .our
- 	"runningAsRoot": "Non è consigliabile eseguire {0} come utente root."
-+=======
-+	"confirmOpen": "Aprire le aree di lavoro {0}?",
-+	"confirmOpenButton": "&&Apri"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e9aa41595293a9979a315b1c0221357f8693c4e7 i18n/ita/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  our    100644 f41f96b7c06ef68c16637b9d036583a234592b6c i18n/ita/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  their  100644 01c6c92eb4a8eb3f8e525b4d988818c32f65cb0c i18n/ita/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-changed in both
-  base   100644 9df96f524f91cc77216cccfb811c2d5665334335 i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 c085858a8c6aed272feca37cbd61f5b25e9ca236 i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 22fadcc87095b65a95f0a5f0cb7d8a3bfdcab63c i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -28,7 +28,13 @@
- 	"preLaunchTaskExitCode": "L'attività di preavvio '{0}' è stata terminata ed è stato restituito il codice di uscita {1}.",
- 	"showErrors": "Mostra errori",
- 	"noFolderWorkspaceDebugError": "Non è possibile eseguire il debug del file attivo. Assicurarsi che sia salvato su disco e che sia installata un'estensione di debug per tale tipo di file.",
-+<<<<<<< .our
- 	"cancel": "Annulla",
- 	"DebugTaskNotFound": "Impossibile trovare l'attività '{0}'.",
- 	"taskNotTracked": "L'attività '{0}' non può essere rintracciata."
-+=======
-+	"NewLaunchConfig": "Impostare il file di configurazione di avvio per l'applicazione. {0}",
-+	"DebugTaskNotFound": "L'attività di preavvio '{0}' non è stata trovata.",
-+	"differentTaskRunning": "L'attività '{0}' è già in esecuzione. Non è possibile eseguire l'attività di preavvio '{1}'."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c13997bfc292d9bff65fb64110c83127e3e7e65b i18n/ita/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  our    100644 8560eb8087005f6b67c1d2ea250d63444711322a i18n/ita/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  their  100644 cfdee9e4ec21b8992ede41cfc09a5ba4d4ea546e i18n/ita/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-merged
-  result 100644 040e6f9598b143eea0272a5c2817cd654ac7aac3 i18n/ita/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-  our    100644 ef13f9c1246f5e81d39e7a5f038bcca803b048de i18n/ita/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-@@ -7,8 +7,5 @@
- 	"emmetConfigurationTitle": "Emmet",
- 	"triggerExpansionOnTab": "Se abilitate, le abbreviazioni Emmet vengono espanse quando si preme TAB. Non applicabile quando emmet.useNewemmet è impostato su true.",
- 	"emmetPreferences": "Preferenze usate per modificare il comportamento di alcune azioni e i resolver di Emmet. Non applicabile quando emmet.useNewemmet è impostato su true.",
--	"emmetSyntaxProfiles": "Consente di definire il profilo per la sintassi specificata oppure di usare un profilo personalizzato con regole specifiche.",
--	"emmetExclude": "Matrice di linguaggi in cui le abbreviazioni Emmet non devono essere espanse.",
--	"emmetExtensionsPath": "Percorso di una cartella contenente snippet, preferenze e profili Emmet. Quando emmet.useNewEmmet è impostato su true, vengono gestiti solo i profili di questo percorso di estensione.",
- 	"useNewEmmet": "Prova i nuovi moduli emmet (che andrà a sostituire la vecchia libreria singola emmet) per tutte le funzionalità emmet."
- }
-\ No newline at end of file
-changed in both
-  base   100644 adf7b3f404290e74c46bfea58335644aa063f088 i18n/ita/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  our    100644 2e6bc1e73d84675841055020e554bed2fb64eb7d i18n/ita/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  their  100644 1b150a45b5f94b4afe926f7593fd6e0077139c2c i18n/ita/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-changed in both
-  base   100644 2430ac5cd9b3b29fa37118750b6fe63a191687ba i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 8a9cb12815ff71703170d90088b67ed38f90d1c9 i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 13e8e8dfc1551d226735430f58193f3c1c7ef5f4 i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-changed in both
-  base   100644 ffdd66502955969b90340078de979da82d7b77ba i18n/ita/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  our    100644 7d23a38e70345906d2303122bbd907e2d0b21fb4 i18n/ita/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  their  100644 53e6b0a907e6d2f59e5eb7f1e7712a3ddb628b85 i18n/ita/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-@@ -69,7 +69,11 @@
- 	"invalidFileNameError": "Il nome **{0}** non è valido per un nome file o un nome di cartella. Scegliere un nome diverso.",
- 	"filePathTooLongError": "Con il nome **{0}** il percorso diventa troppo lungo. Scegliere un nome più breve.",
- 	"compareWithSaved": "Confronta file attivo con file salvato",
-+<<<<<<< .our
- 	"modifiedLabel": "{0} (su disco) ↔ {1}",
- 	"compareWithClipboard": "Confronta il file attivo con gli appunti",
- 	"clipboardComparisonLabel": "Appunti ↔ {0}"
-+=======
-+	"modifiedLabel": "{0} (su disco) ↔ {1}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8139ec4bf13634ecc5a8e71a5731b8961f21c6bf i18n/ita/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 1f2167be7be1086956a1ada80d0c4b23b8cc1195 i18n/ita/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 c2fa70491efbf929c519986147f9b7d1b23b6778 i18n/ita/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-@@ -40,6 +40,7 @@
- 	"dynamicHeight": "Controlla se l'altezza della sezione degli editor aperti deve essere adattata o meno dinamicamente al numero di elementi.",
- 	"autoReveal": "Controlla se Esplora risorse deve rivelare automaticamente e selezionare i file durante l'apertura.",
- 	"enableDragAndDrop": "Controlla se Esplora risorse deve consentire lo spostamento di file e cartelle tramite trascinamento della selezione.",
-+<<<<<<< .our
- 	"confirmDragAndDrop": "Controlla se Esplora risorse deve chiedere conferma prima di spostare file e cartelle tramite trascinamento della selezione.",
- 	"confirmDelete": "Controlla se Esplora risorse deve chiedere una conferma quando si elimina file tramite il cestino.",
- 	"sortOrder.default": "I file e le cartelle vengono ordinati in ordine alfabetico in base al nome. Le cartelle vengono visualizzate prima dei file.",
-@@ -50,4 +51,12 @@
- 	"sortOrder": "Controlla l'ordinamento di file e cartelle in Esplora risorse. Oltre all'ordinamento predefinito, è possibile impostare l'ordine su 'mixed' (file e cartelle vengono ordinati insieme), 'type' (in base al tipo di file), 'modified' (in base alla data dell'ultima modifica) o 'filesFirst' (i file vengono ordinati prima delle cartelle).",
- 	"explorer.decorations.colors": "Controlli se decorazioni file dovrebbero usare colori.",
- 	"explorer.decorations.badges": "Controlli se decorazioni file devono utilizzare badge."
-+=======
-+	"sortOrder.default": "I file e le directory vengono ordinati in ordine alfabetico in base al nome. Le directory vengono visualizzate prima dei file.",
-+	"sortOrder.mixed": "File e directory vengono ordinate per nome, in ordine alfabetico, in un unico elenco ordinato.",
-+	"sortOrder.filesFirst": "File e directory vengono ordinate per nome, in ordine alfabetico. I file vengono visualizzati prima delle directory.",
-+	"sortOrder.type": "File e directory vengono ordinate secondo le loro estensioni, in ordine alfabetico. Le directory vengono visualizzate prima dei file.",
-+	"sortOrder.modified": "File e directory sono ordinate per data Ultima modifica, in ordine decrescente. Le directory vengono visualizzate prima dei file.",
-+	"sortOrder": "Controlla la modalità di ordinamento di file e directory in Esplora risorse."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 676f0815dcac6bb63ac0a387c2d196ef579e24e1 i18n/ita/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-  our    100644 49ebceb9611a7d647962c205cef0ff00c56d0e9d i18n/ita/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-  their  100644 7e522e82f6b51650e00ae618865457402413aaf9 i18n/ita/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-@@ -12,5 +12,6 @@
- 	"genericSaveError": "Non è stato possibile salvare '{0}': {1}",
- 	"staleSaveError": "Non è stato possibile salvare '{0}': il contenuto sul disco è più recente. Fare clic su **Confronta** per confrontare la versione corrente con quella sul disco.",
- 	"compareChanges": "Confronta",
--	"saveConflictDiffLabel": "{0} (su disco) ↔ {1} (in {2}) - Risolvere conflitto in fase di salvataggio"
-+	"saveConflictDiffLabel": "{0} (su disco) ↔ {1} (in {2}) - Risolvere conflitto in fase di salvataggio",
-+	"userGuide": "Usare le azioni della barra degli strumenti dell'editor a destra per **annullare** le modifiche o per **sovrascrivere** il contenuto su disco con le modifiche"
- }
-\ No newline at end of file
-changed in both
-  base   100644 12a31fb4c16d1bd5bf004f0683dc07c771544340 i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  our    100644 89b7fb9711b0bbc9cde43748de484037bba899db i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  their  100644 b5f2514add45ca6900c2f6fad9d302721a681e15 i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-@@ -14,6 +14,10 @@
- 	"openGlobalKeybindingsFile": "Apri file dei tasti di scelta rapida",
- 	"openWorkspaceSettings": "Apri impostazioni area di lavoro",
- 	"openFolderSettings": "Apri impostazioni cartella",
-+<<<<<<< .our
-+=======
-+	"pickFolder": "Seleziona cartella",
-+>>>>>>> .their
- 	"configureLanguageBasedSettings": "Configura impostazioni specifiche del linguaggio...",
- 	"languageDescriptionConfigured": "({0})",
- 	"pickLanguage": "Seleziona linguaggio"
-changed in both
-  base   100644 cb813bd7a4fde3650fd4db6a7f515ebc6840120e i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 acbb94499ddd6c7a425c0f53ca65dd8e6248c34e i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 237ebccfb3952a37235180c968a27630d349f3b2 i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -14,4 +15,19 @@
- 	"editTtile": "Modifica",
- 	"replaceDefaultValue": "Sostituisci nelle impostazioni",
- 	"copyDefaultValue": "Copia nelle impostazioni"
-+=======
-+	"emptyUserSettingsHeader": "Inserire le impostazioni qui per sovrascrivere quelle predefinite.",
-+	"errorInvalidConfiguration": "Impossibile scrivere nelle impostazioni. Correggere eventuali errori o avvisi nel file e riprovare.",
-+	"emptyWorkspaceSettingsHeader": "Inserire le impostazioni qui per sovrascrivere le impostazioni utente.",
-+	"emptyFolderSettingsHeader": "Inserire le impostazioni cartella qui per sovrascrivere quelle dell'area di lavoro.",
-+	"defaultFolderSettingsTitle": "Impostazioni cartella predefinite",
-+	"defaultSettingsTitle": "Impostazioni predefinite",
-+	"noSettingsFound": "Non sono state trovate impostazioni.",
-+	"editTtile": "Modifica",
-+	"replaceDefaultValue": "Sostituisci nelle impostazioni",
-+	"copyDefaultValue": "Copia nelle impostazioni",
-+	"unsupportedPHPExecutablePathSetting": "Questa deve essere un'impostazione utente. Per configurare PHP per l'area di lavoro, aprire un file PHP e fare clic su 'Percorso PHP' nella barra di stato.",
-+	"unsupportedWorkspaceSetting": "Questa deve essere un'impostazione utente.",
-+	"unsupportedWorkbenchSetting": "Non è possibile applicare ora questa impostazione. Verrà applicata direttamente all'apertura della cartella."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 dcc0829c0a62a843f06ba3c32379c61a13caa476 i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-  our    100644 5ef406c69728828b1062193472b0ce3832fa87d9 i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-  their  100644 6bdc47b5796d5f81b2089340871f57704f1be47e i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 fe346036c36b558ff4bb96cc47cf0bc0e91a4106 i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 0f87df191445fabeead61c7824e41af78aae9b70 i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -12,4 +13,13 @@
- 	"userSettings": "Impostazioni utente",
- 	"workspaceSettings": "Impostazioni area di lavoro",
- 	"folderSettings": "Impostazioni cartella"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"folderSettingsDetails": "Impostazioni cartella"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 b04fcadda7a309f8ee3f94e3c0c314580c417287 i18n/ita/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  our    100644 1b4ea6a446b0325fa66e3be86914f36ccca4943e i18n/ita/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  their  100644 0a301a74cb4c8c94d24ee7810a68f54a7fa90bdf i18n/ita/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-@@ -8,5 +8,11 @@
- 	],
- 	"relaunchSettingMessage": "È necessario riavviare per rendere effettiva un'impostazione modificata.",
- 	"relaunchSettingDetail": "Fare clic sul pulsante di riavvio per riavviare {0} e abilitare l'impostazione.",
-+<<<<<<< .our
- 	"restart": "&&Riavvia"
-+=======
-+	"restart": "Riavvia",
-+	"relaunchWorkspaceMessage": "Questo cambiamento di area di lavoro richiede un ricaricamento del nostro sistema di estensione.",
-+	"reload": "Ricarica"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 21137b24d8a54c4bc897918ce9bd6f37ae8be047 i18n/ita/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 92c227f579048a55e12147b807cef8b2e56a92a0 i18n/ita/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 942721004dfca3e92f7ae25dc131072f09d76ef2 i18n/ita/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"nextSearchIncludePattern": "Mostra i criteri di inclusione per la ricerca successivi",
- 	"previousSearchIncludePattern": "Mostra i criteri di inclusione per la ricerca precedenti",
- 	"nextSearchExcludePattern": "Mostra i criteri di esclusione per la ricerca successivi",
-@@ -16,6 +19,8 @@
- 	"previousReplaceTerm": "Mostra il termine di ricerca/sostituzione precedente",
- 	"findInFiles": "Cerca nei file",
- 	"replaceInFiles": "Sostituisci nei file",
-+	"findInWorkspace": "Trova nell'area di lavoro...",
-+	"findInFolder": "Trova nella cartella...",
- 	"RefreshAction.label": "Aggiorna",
- 	"CollapseDeepestExpandedLevelAction.label": "Comprimi tutto",
- 	"ClearSearchResultsAction.label": "Cancella",
-changed in both
-  base   100644 13608466e81d1a2ce1b9b826b3a38ff7220a5c98 i18n/ita/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-  our    100644 b79d204589effc5ed05889c9cd02d87b42f12993 i18n/ita/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-  their  100644 53c1288f408313a67d69e60e8b53e7a94a122881 i18n/ita/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"searchFolderMatch.other.label": "Altri file",
- 	"searchFileMatches": "{0} file trovati",
- 	"searchFileMatch": "{0} file trovato",
-changed in both
-  base   100644 fbd469a7550daca18dc85ab74e78c09b4083b346 i18n/ita/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  our    100644 e2aee106234415d5f98623d49849469952f58852 i18n/ita/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  their  100644 7ee59ee05da1047d77e9b323683d4564d52cce35 i18n/ita/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-changed in both
-  base   100644 5894505714eacc34e33a674fd27f44497d02620a i18n/ita/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 96a5512e9db341ff02996bad4ad811078b347739 i18n/ita/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 1dd6d34902893a862645eef38e2170f0cc813e06 i18n/ita/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-changed in both
-  base   100644 5e2515ceeda1fb4d1f5091f575ddef8ff18e119a i18n/ita/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 83baac91404ff175b394c533850a93d01538ab38 i18n/ita/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 ca2d8ed9126d9aebcdb34e40a3f097f6205471e0 i18n/ita/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -12,8 +12,12 @@
- 	"totalWarnings": "{0} avvisi",
- 	"totalInfos": "{0} messaggi informativi",
- 	"problems": "Problemi",
-+<<<<<<< .our
- 	"building": "Compilazione in corso...",
- 	"manyProblems": "Più di 10.000",
-+=======
-+	"manyMarkers": "Più di 99",
-+>>>>>>> .their
- 	"runningTasks": "Visualizza attività in esecuzione",
- 	"tasks": "Attività",
- 	"TaskSystem.noHotSwap": "Se si cambia il motore di esecuzione delle attività con un'attività attiva in esecuzione, è necessario ricaricare la finestra",
-@@ -24,17 +28,25 @@
- 	"TaskService.noTestTask1": "Non è stata definita alcuna attività di test. Contrassegnare un'attività con 'isTestCommand' nel file tasks.json.",
- 	"TaskService.noTestTask2": "Non è stata definita alcuna attività di test. Contrassegnare un'attività come gruppo 'test' nel file tasks.json.",
- 	"TaskServer.noTask": "Attività {0} richiesta per l'esecuzione non trovata",
-+<<<<<<< .our
- 	"TaskService.associate": "associare",
-+=======
-+>>>>>>> .their
- 	"TaskService.attachProblemMatcher.continueWithout": "Continua senza analizzare l'output dell'attività",
- 	"TaskService.attachProblemMatcher.never": "Mai analizzare l'output dell'attività",
- 	"TaskService.attachProblemMatcher.learnMoreAbout": "Ulteriori informazioni sull'analisi dell'output della attività",
- 	"selectProblemMatcher": "Selezionare il tipo di errori e di avvisi per cui analizzare l'output dell'attività",
- 	"customizeParseErrors": "La configurazione dell'attività corrente presenta errori. Per favore correggere gli errori prima di personalizzazione un'attività.",
- 	"moreThanOneBuildTask": "tasks.json contiene molte attività di compilazione. È in corso l'esecuzione della prima.\n",
-+<<<<<<< .our
- 	"TaskSystem.activeSame.background": "L'attività '{0}' è già attiva e in modalità background.",
- 	"TaskSystem.activeSame.noBackground": "L'attività '{0}' è già attiva.",
- 	"terminateTask": "Termina attività",
- 	"restartTask": "Riavvia attività",
-+=======
-+	"TaskSystem.activeSame.background": "L'attività '{0}' è già attiva ed in modalità background. Per terminarla, usare `Termina attività` dal menu Attività",
-+	"TaskSystem.activeSame.noBackground": "L'attività '{0}' è già attiva. Per terminarla utilizzare 'Termina attività...' dal menu Attività.",
-+>>>>>>> .their
- 	"TaskSystem.active": "Al momento c'è già un'attività in esecuzione. Terminarla prima di eseguirne un'altra.",
- 	"TaskSystem.restartFailed": "Non è stato possibile terminare e riavviare l'attività {0}",
- 	"TaskService.noConfiguration": "Errore: Il rilevamento di attività {0} non ha contribuito un'attività nella seguente configurazione: \n{1} \nL'attività verrà ignorata.\n",
-@@ -75,8 +87,13 @@
- 	"TaskService.pickDefaultBuildTask": "Selezionare l'attività da usare come attività di compilazione predefinita",
- 	"TaskService.defaultTestTaskExists": "{0} è già contrassegnato come attività di test predefinita.",
- 	"TaskService.pickDefaultTestTask": "Selezionare l'attività da usare come attività di test predefinita",
-+<<<<<<< .our
- 	"TaskService.pickShowTask": "Selezionare l'attività di cui mostrare l'output",
- 	"TaskService.noTaskIsRunning": "Non ci sono attività in esecuzione",
-+=======
-+	"TaskService.noTaskIsRunning": "Nessuna attività è in esecuzione.",
-+	"TaskService.pickShowTask": "Selezionare l'attività di cui mostrare l'output",
-+>>>>>>> .their
- 	"ShowLogAction.label": "Mostra log attività",
- 	"RunTaskAction.label": "Esegui attività",
- 	"RestartTaskAction.label": "Riavvia attività in esecuzione",
-changed in both
-  base   100644 a966fb16e92421f6486f832d88f979aaa443e2c4 i18n/ita/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  our    100644 b89a9a5d2c851fe192929fd8b043499ee5d305db i18n/ita/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  their  100644 e6292d5689eeba6042524dd0906ae515d92b262a i18n/ita/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/ita/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  our    100644 c79317e1e19d3b7bbd1fb15955a5248e2d4c5229 i18n/ita/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  their  100644 93e2514f3de53d328d9e7d7a72676907700f32d2 i18n/ita/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,6 +10,15 @@
- 	"termEntryAriaLabel": "{0}, selettore terminale",
- 	"termCreateEntryAriaLabel": "{0}, crea un nuovo terminale",
- 	"workbench.action.terminal.newplus": "$(plus) Crea nuovo terminale integrato",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"entryAriaLabel": "{0}, selettore terminale",
-+>>>>>>> .their
- 	"noTerminalsMatching": "Nessun terminale corrispondente",
- 	"noTerminalsFound": "Nessun terminale aperto"
- }
-\ No newline at end of file
-changed in both
-  base   100644 9b3321eecb561ee5c4250f3dbc340afce7e2c67d i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 b43f261b33e96573db19620791c6498f01662657 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 c901f072c339e85c13d643f07d8b675520f60b19 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,9 @@
- 	],
- 	"quickOpen.terminal": "Mostra tutti i terminali aperti",
- 	"terminal": "Terminale",
-+=======
-+	"quickOpen.terminal": "Mostra tutti i terminali aperti",
-+>>>>>>> .their
- 	"terminalIntegratedConfigurationTitle": "Terminale integrato",
- 	"terminal.integrated.shell.linux": "Percorso della shell usata dal terminale in Linux.",
- 	"terminal.integrated.shellArgs.linux": "Argomenti della riga di comando da usare nel terminale Linux.",
-@@ -36,8 +40,12 @@
- 	"terminal.integrated.env.osx": "Oggetto con variabili di ambiente che verrà aggiunto al processo VS Code per essere utilizzato dal terminale su OS X",
- 	"terminal.integrated.env.linux": "Oggetto con variabili di ambiente che verrà aggiunto al processo VS Code per essere utilizzato dal terminale su Linux",
- 	"terminal.integrated.env.windows": "Oggetto con variabili di ambiente che verrà aggiunto al processo VS Code per essere utilizzato dal terminale su Windows",
-+<<<<<<< .our
- 	"terminal.integrated.showExitAlert": "Visualizza avviso \"Il processo terminale ha restituito codice di uscita\" quando il codice di uscita è diverso da zero.",
- 	"terminal.integrated.experimentalRestore": "Indica se ripristinare automaticamente le sessioni di terminale per l'area di lavoro all'avvio di VS Code. Si tratta di un'impostazione sperimentale che potrebbe contenere bug e cambiare in futuro.",
-+=======
-+	"terminal": "Terminale",
-+>>>>>>> .their
- 	"terminalCategory": "Terminale",
- 	"viewCategory": "Visualizza"
- }
-\ No newline at end of file
-changed in both
-  base   100644 a676775b5fcd08117cdab1d48029bc02279376c2 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 9af26b9889eaa5fa492c1556e3e5203a1ebacbf4 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 4ebfe88285e5cbc74276049577954d89e0ddad69 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -14,8 +14,11 @@
- 	"workbench.action.terminal.selectAll": "Seleziona tutto",
- 	"workbench.action.terminal.deleteWordLeft": "Elimina parola a sinistra",
- 	"workbench.action.terminal.deleteWordRight": "Elimina la parola a destra",
-+<<<<<<< .our
- 	"workbench.action.terminal.moveToLineStart": "Passa all'inizio della riga",
- 	"workbench.action.terminal.moveToLineEnd": "Passa alla fine della riga",
-+=======
-+>>>>>>> .their
- 	"workbench.action.terminal.new": "Crea nuovo terminale integrato",
- 	"workbench.action.terminal.new.short": "Nuovo terminale",
- 	"workbench.action.terminal.newWorkspacePlaceholder": "Selezionare la cartella di lavoro corrente per un nuovo terminale.",
-@@ -51,6 +54,7 @@
- 	"workbench.action.terminal.rename.prompt": "Immettere il nome del terminale",
- 	"workbench.action.terminal.focusFindWidget": "Stato attivo su widget Trova",
- 	"workbench.action.terminal.hideFindWidget": "Nascondi widget Trova",
-+<<<<<<< .our
- 	"nextTerminalFindTerm": "Mostra il termine di ricerca successivo",
- 	"previousTerminalFindTerm": "Mostra il termine di ricerca precedente",
- 	"quickOpenTerm": "Cambia terminale attivo",
-@@ -60,4 +64,7 @@
- 	"workbench.action.terminal.selectToNextCommand": "Aggiungi selezione a comando successivo",
- 	"workbench.action.terminal.selectToPreviousLine": "Aggiungi selezione a riga precedente",
- 	"workbench.action.terminal.selectToNextLine": "Aggiungi selezione a riga successiva"
-+=======
-+	"quickOpenTerm": "Cambia terminale attivo"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 43f3afaeb3087727e1206563ed8271f819d7fe47 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 7ae3aac58f69dc8b25dec80d0624497a5e9abe14 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 d707ad877b4b90ba4430068830bd11d5a23de704 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -10,7 +10,11 @@
- 	"terminal.foreground": "Il colore di primo piano del terminale.",
- 	"terminalCursor.foreground": "Colore di primo piano del cursore del terminale.",
- 	"terminalCursor.background": "Colore di sfondo del cursore del terminale. Permette di personalizzare il colore di un carattere quando sovrapposto da un blocco cursore.",
-+<<<<<<< .our
- 	"terminal.selectionBackground": "Colore di sfondo di selezione del terminale.",
- 	"terminal.border": "Colore del bordo che separa i riquadri divisi all'interno del terminale. L'impostazione predefinita è panel.border.",
- 	"terminal.ansiColor": "'{0}' colori ANSI nel terminale. "
-+=======
-+	"terminal.ansiColor": "Colore ANSI '{0}' nel terminale."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 9dd33f62814e18b186fefa4391ecce198cf04730 i18n/ita/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 aed35ee0f736e71e25693c29ccc2843fb9df2498 i18n/ita/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 6186bf9ef5bd6fef03226011d387446a022f0717 i18n/ita/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -11,8 +11,16 @@
- 	"read the release notes": "Benvenuti in {0} versione {1}. Leggere le note sulla versione?",
- 	"licenseChanged": "I termini della licenza sono cambiati. Fare clic [qui]({0}) e leggerli con attenzione.",
- 	"neveragain": "Non visualizzare più questo messaggio",
-+<<<<<<< .our
- 	"64bitisavailable": "{0} per Windows a 64 bit è ora disponibile. Per maggiori informazioni, fare clic [qui]({1}).",
- 	"updateIsReady": "Nuovo aggiornamento di {0} disponibile.",
-+=======
-+	"64bitisavailable": "{0} per Windows a 64 bit è ora disponibile!",
-+	"learn more": "Altre informazioni",
-+	"updateIsReady": "Nuovo aggiornamento di {0} disponibile.",
-+	"thereIsUpdateAvailable": "È disponibile un aggiornamento.",
-+	"updateAvailable": "{0} verrà aggiornato dopo il riavvio.",
-+>>>>>>> .their
- 	"noUpdatesAvailable": "Al momento non sono disponibili aggiornamenti.",
- 	"ok": "OK",
- 	"thereIsUpdateAvailable": "È disponibile un aggiornamento.",
-changed in both
-  base   100644 a7b1c66172688f9136bf07fe85537eee22f69853 i18n/ita/src/vs/workbench/parts/views/browser/views.i18n.json
-  our    100644 860e3f239f29bae4b543c63ea0d30b89d5467fc8 i18n/ita/src/vs/workbench/parts/views/browser/views.i18n.json
-  their  100644 13722d5ca475d3cb677211fd8d98707ff8104b37 i18n/ita/src/vs/workbench/parts/views/browser/views.i18n.json
-@@ -5,5 +5,9 @@
- // Do not edit this file. It is machine generated.
- {
- 	"viewToolbarAriaLabel": "Azioni di {0}",
-+<<<<<<< .our
- 	"hideView": "Nascondi da barra laterale"
-+=======
-+	"removeView": "Rimuovere dalla barra laterale"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 300eb2118f1201f283eb3a1e66da168a06ef071b i18n/ita/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-  our    100644 82f6aedb638491aef3f6eb8ed73da8bd42051ffb i18n/ita/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-  their  100644 1f9832cab991258fe647e04ebd44c34fa5ce698b i18n/ita/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-changed in both
-  base   100644 a7e15b8a41426bed20881fa75e94534c6261f1c3 i18n/ita/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  our    100644 b5a489af390ae95c0040c4f75bba1c10766a089e i18n/ita/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  their  100644 2e22df971faf8d86e2b4019cc83273aeab627e9a i18n/ita/src/vs/workbench/services/configuration/node/configuration.i18n.json
-@@ -9,6 +9,7 @@
- 	"scope.window.description": "Configurazione specifica della finestra, che può essere configurata nelle impostazioni dell'utente o dell'area di lavoro.",
- 	"scope.resource.description": "Configurazione specifica di risorse, che possono essere configurate nelle impostazioni utente, in quelle dell'area di lavoro o di una cartella.",
- 	"scope.description": "Ambito in cui la configurazione è applicabile. Gli ambiti disponibili sono 'finestra' e 'risorsa'.",
-+<<<<<<< .our
- 	"vscode.extension.contributes.configuration": "Impostazioni di configurazione di contributes.",
- 	"invalid.title": "'configuration.title' deve essere una stringa",
- 	"vscode.extension.contributes.defaultConfiguration": "Aggiunge come contributo le impostazioni di configurazione predefinite dell'editor in base al linguaggio.",
-@@ -21,4 +22,13 @@
- 	"workspaceConfig.settings.description": "Impostazioni di area di lavoro",
- 	"workspaceConfig.extensions.description": "Estensioni dell'area di lavoro",
- 	"unknownWorkspaceProperty": "La proprietà di configurazione dell'area di lavoro è sconosciuta"
-+=======
-+	"invalid.type": "se impostato, 'configuration.type' deve essere impostato su 'object",
-+	"invalid.title": "'configuration.title' deve essere una stringa",
-+	"vscode.extension.contributes.defaultConfiguration": "Aggiunge come contributo le impostazioni di configurazione predefinite dell'editor in base al linguaggio.",
-+	"invalid.properties": "'configuration.properties' deve essere un oggetto",
-+	"workspaceConfig.id.description": "Identificatore di area di lavoro. Utilizzato per memorizzare lo stato interno dell'area di lavoro, che può essere perso durante un cambiamento.",
-+	"workspaceConfig.folders.description": "Elenco delle cartelle da caricare nell'area di lavoro. Deve essere un percorso di file. ad esempio 'file:///root/folderA'",
-+	"workspaceConfig.settings.description": "Impostazioni di area di lavoro"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 72151489b4a3399a5a1a4265c33ab4a5cf6ef965 i18n/ita/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 73635731361e3644a722328dacbcb86a39a295d3 i18n/ita/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 8cb580b70f0dc2753ce2b283b6274aecf8b053e6 i18n/ita/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -9,6 +9,7 @@
- 	"openTasksConfiguration": "Apri configurazione attività",
- 	"openLaunchConfiguration": "Apri configurazione di avvio",
- 	"open": "Apri impostazioni",
-+<<<<<<< .our
- 	"saveAndRetry": "Salva e riprova",
- 	"errorUnknownKey": "Impossibile scrivere {0} perché {1} non è una configurazione registrata.",
- 	"errorInvalidWorkspaceConfigurationApplication": "Non è possibile scrivere {0} in Impostazioni area di lavoro. Questa impostazione può essere scritta solo in Impostazioni utente.",
-@@ -27,6 +28,19 @@
- 	"errorConfigurationFileDirty": "Non è possibile scrivere nelle impostazioni utente perché il file è stato modificato. Salvare prima il file delle impostazioni utente, quindi riprovare.",
- 	"errorConfigurationFileDirtyWorkspace": "Non è possibile scrivere nelle impostazioni dell'area di lavoro perché il file è stato modificato. Salvare prima il file delle impostazioni dell'area di lavoro, quindi riprovare.",
- 	"errorConfigurationFileDirtyFolder": "Non è possibile scrivere nelle impostazioni della cartella perché il file è stato modificato. Salvare prima il file di impostazioni della cartella '{0}', quindi riprovare.",
-+=======
-+	"close": "Chiudi",
-+	"saveAndRetry": "Salva le impostazioni e riprova",
-+	"errorUnknownKey": "Impossibile scrivere {0} perché {1} non è una configurazione registrata.",
-+	"errorInvalidFolderConfiguration": "Impossibile scrivere nella cartella impostazioni perché {0} non supporta l'ambito di risorsa della cartella.",
-+	"errorInvalidUserTarget": "Impossibile scrivere le impostazioni utente perché {0} non supporta l'ambito globale.",
-+	"errorInvalidFolderTarget": "Impossibile scrivere nella cartella impostazioni perché non viene fornita alcuna risorsa.",
-+	"errorNoWorkspaceOpened": "Impossibile scrivere su {0} poiché nessuna area di lavoro è aperta. Si prega di aprire un'area di lavoro e riprovare.",
-+	"errorInvalidConfiguration": "Impossibile scrivere nelle impostazioni. Si prega di aprire  **Impostazioni utente** per correggere eventuali errori o avvisi nel file e riprovare.",
-+	"errorInvalidConfigurationWorkspace": "Impossibile scrivere in impostazioni. Si prega di aprire **Impostazioni area di lavoro** per correggere eventuali errori o avvisi nel file e riprovare.",
-+	"errorConfigurationFileDirty": "Impossibile scrivere nelle impostazioni perché il file è stato modificato ma non salvato. Si prega di salvare il file **impostazioni utente** e riprovare.",
-+	"errorConfigurationFileDirtyWorkspace": "Non è possibile scrivere in impostazioni perché il file è stato modificato ma non salvato. Salvare il file delle **Impostazioni area di lavoro** e riprovare.",
-+>>>>>>> .their
- 	"userTarget": "Impostazioni utente",
- 	"workspaceTarget": "Impostazioni area di lavoro",
- 	"folderTarget": "Impostazioni della cartella"
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/ita/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-  our    100644 bf0a4aae1080397e29d56822254443ce537de3ab i18n/ita/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-  their  100644 337b884305c827955fae8d3657b7c3e07fc90fa0 i18n/ita/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"errorInvalidFile": "Impossibile scrivere nel file. Si prega di aprire il file per correggere eventuali errori o avvisi nel file e riprovare.",
- 	"errorFileDirty": "Impossibile scrivere nel file perché il file è stato modificato. Si prega di salvare il file e riprovare."
- }
-\ No newline at end of file
-changed in both
-  base   100644 031d6c9544abbc9dcdd5097095d503830734d22b i18n/ita/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 59d0978a765c9fd6ca13b8566191473ce46ff2e1 i18n/ita/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 9a000d601a10fc7425c6583cf86a25cf0987ed76 i18n/ita/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-@@ -13,6 +13,7 @@
- 	"noIconThemeDesc": "No file icons",
- 	"iconThemeError": "File icon theme is unknown or not installed.",
- 	"workbenchColors": "Sostituisce i colori del tema colori attualmente selezionato.",
-+<<<<<<< .our
- 	"editorColors.comments": "Imposta i colori e gli stili per i commenti",
- 	"editorColors.strings": "Imposta i colori e gli stili per i valori letterali stringa.",
- 	"editorColors.keywords": "Imposta i colori e gli stili per le parole chiave.",
-@@ -21,5 +22,9 @@
- 	"editorColors.functions": "Imposta i colori e gli stili per i riferimenti e le dichiarazioni di funzioni.",
- 	"editorColors.variables": "Imposta i colori e gli stili per i riferimenti e le dichiarazioni di variabili.",
- 	"editorColors.textMateRules": "Imposta i colori e gli stili usando le regole di creazione temi di TextMate (impostazione avanzata).",
-+=======
-+	"workbenchColors.deprecated": "L'impostazione non è più sperimentale ed è stata rinominata in 'workbench.colorCustomizations'",
-+	"workbenchColors.deprecatedDescription": "In alternativa, usare 'workbench.colorCustomizations'",
-+>>>>>>> .their
- 	"editorColors": "Sostituisce i colori dell'editor e lo stile dei font nel tema colori attualmente selezionato."
- }
-\ No newline at end of file
-changed in both
-  base   100644 ce72c51b95bd9fd79a6e0e105e69519cd5f00f4f i18n/jpn/extensions/emmet/package.i18n.json
-  our    100644 2ea428b8ba7cebbdb24c299af08c070b4291f172 i18n/jpn/extensions/emmet/package.i18n.json
-  their  100644 a0e470e23f9ae49b1afcb8864c75ec714fc5e840 i18n/jpn/extensions/emmet/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -9,6 +10,8 @@
- 	"description": "VSCode の Emmet サポート",
- 	"command.wrapWithAbbreviation": "ラップ変換",
- 	"command.wrapIndividualLinesWithAbbreviation": "個々の行でラップ変換",
-+=======
-+>>>>>>> .their
- 	"command.removeTag": "タグの削除",
- 	"command.updateTag": "タグの更新",
- 	"command.matchTag": "一致するペアに移動",
-@@ -31,6 +34,7 @@
- 	"command.incrementNumberByTen": "10 ずつ増加",
- 	"command.decrementNumberByTen": "10 ずつ減少",
- 	"emmetSyntaxProfiles": "指定した構文に対してプロファイルを定義するか、特定の規則がある独自のプロファイルをご使用ください。",
-+<<<<<<< .our
- 	"emmetExclude": "Emmet 省略記法を展開すべきでない言語の配列。",
- 	"emmetExtensionsPath": "Emmet のプロファイルとスニペットを含むフォルダーへのパス。",
- 	"emmetShowExpandedAbbreviation": "展開された Emmet 省略記法を候補として表示します。\n\"inMarkupAndStylesheetFilesOnly\" オプションは、html、haml、jade、slim、xml、xsl、css、scss、sass、less、stylus に適用されます。\n\"always\" オプションは markup/css に関係なくファイルのすべての部分に適用されます。",
-@@ -62,4 +66,12 @@
- 	"emmetPreferencesCssMsProperties": "Emmet 省略記法で使用される場合に `-` で始まる 'ms' ベンダー プレフィックスを取得するカンマ区切りの CSS プロパティ。常に 'ms' プレフィックスを避ける場合は空の文字列に設定します。",
- 	"emmetPreferencesCssFuzzySearchMinScore": "あいまい検索の省略形が達成すべき (0 から 1 の) 最小スコア。値が低ければ多くの誤検出が発生する可能性があります。値が高ければ一致する見込みが減る可能性があります。",
- 	"emmetOptimizeStylesheetParsing": "false に設定すると、現在位置が Emmet 略語の展開位置として有効かどうかを判定するためにファイル全体を解析します。true に設定すると、css/scss/less ファイルの現在位置周辺のコンテンツのみを解析します。"
-+=======
-+	"emmetExclude": "emmet 省略記法を展開すべきでない言語の配列。",
-+	"emmetExtensionsPath": "Emmet のプロファイル、スニペット、基本設定を含むフォルダーへのパス。emmet.useNewEmmet が true に設定されている場合、プロファイルのみが拡張パスから受け入れられます。",
-+	"emmetShowExpandedAbbreviation": "候補として、展開された Emmet 省略記法を表示します。\n\"inMarkupAndStylesheetFilesOnly\" オプションは、html、haml、jade、slim、xml、xsl、css、scss、sass、less、および stylus に適用されます。\n\"always\" オプションは、マークアップ / css に関係なく、ファイルのすべての部分に適用されます。",
-+	"emmetShowAbbreviationSuggestions": "候補として考えられる Emmet 省略記法を表示します。 スタイルシートや emmet.showExpandedAbbreviation が \"never\" に設定されている場合は適用されません。",
-+	"emmetIncludeLanguages": "既定でサポートされていない言語で Emmet 省略記法を有効にします。 言語と Emmet がサポートする言語の間にマッピングを追加します。\n例: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
-+	"emmetVariables": "Emmet のスニペットで使用される変数 "
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 41d43b02c1f66f342064622c00a0890115d0dad9 i18n/jpn/extensions/extension-editing/out/extensionLinter.i18n.json
-  our    100644 29e11015a804a1186a5840b869b18fe6a3a72163 i18n/jpn/extensions/extension-editing/out/extensionLinter.i18n.json
-  their  100644 09e430952b7349d60633794eb3f06bb1f0cbba94 i18n/jpn/extensions/extension-editing/out/extensionLinter.i18n.json
-changed in both
-  base   100644 779f48926f3ef595774a18b9694c3d3e1e220a9f i18n/jpn/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 504738102db98241f299da4b50371a12d6a5d3cc i18n/jpn/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 e17dbdefa65d601e291e6e216e61485434e79906 i18n/jpn/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -9,7 +9,20 @@
- 	"openFile": "ファイルを開く...",
- 	"openFolder": "フォルダーを開く...",
- 	"openFileFolder": "開く...",
-+<<<<<<< .our
- 	"globalRemoveFolderFromWorkspace": "ワークスペースからフォルダーを削除...",
-+=======
-+	"reload": "再読み込み(&&R)",
-+	"cancel": "キャンセル",
-+	"newWorkspaceFormExisting": "既存を元に新しいワークスペース...",
-+	"select": "選択(&&S)",
-+	"selectWorkspace": "ワークスペースのフォルダーを選択",
-+	"addSupported": "複数のフォルダーを開くには、ウィンドウの再読み込みが必要です。",
-+	"addFolderToWorkspace": "ワークスペースにフォルダーを追加...",
-+	"add": "追加(&&A)",
-+	"addFolderToWorkspaceTitle": "ワークスペースにフォルダーを追加",
-+	"removeFolderFromWorkspace": "ワークスペースからフォルダーを削除",
-+>>>>>>> .their
- 	"saveWorkspaceAsAction": "名前を付けてワークスペースを保存...",
- 	"save": "保存(&&S)",
- 	"saveWorkspace": "ワークスペースを保存",
-changed in both
-  base   100644 8eef43766e8052a367343ee2707878adbbcd157a i18n/jpn/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  our    100644 2aabd470587713910c03051d128af69e0ce6da7a i18n/jpn/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  their  100644 52c478e6b9508361dd18da29ebc355fe7a6fe88d i18n/jpn/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-merged
-  result 100644 eae7eb92528ad2b4ad11d091bc99bb46f77a17ba i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-  our    100644 e62cceeca51279d4a513fe1b368ca6dbb70061eb i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-@@ -7,8 +7,5 @@
- 	"emmetConfigurationTitle": "Emmet",
- 	"triggerExpansionOnTab": "有効にすると、TAB キーを押したときに emmet 省略記法が展開されます。emmet.useNewemmet が true に設定されているときは適用されません。",
- 	"emmetPreferences": "Emmet の一部のアクションやリゾルバーの動作の変更に使用される基本設定。emmet.useNewemmet が true に設定されているときは適用されません。",
--	"emmetSyntaxProfiles": "指定した構文に対してプロファイルを定義するか、特定の規則がある独自のプロファイルをご使用ください。",
--	"emmetExclude": "emmet 省略記法を展開すべきでない言語の配列。",
--	"emmetExtensionsPath": "Emmet のプロファイル、スニペット、基本設定を含むフォルダーへのパス。emmet.useNewEmmet が true に設定されている場合、プロファイルのみが拡張パスから受け入れられます。",
- 	"useNewEmmet": "すべての emmet 機能に対して、新しい emmet モジュールをお試しください (最終的に、以前の単一 emmet ライブラリは置き換えられます)。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 4de3a3dae6f0243652321d24feb82b33dbb78aa1 i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 c8dc571e62a5169caab40469ba18a9dcea479c70 i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 72cb0a9b0aee0283c8b7bb6a5a98cb6551c3d732 i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -14,4 +15,19 @@
- 	"editTtile": "編集",
- 	"replaceDefaultValue": "設定を置換",
- 	"copyDefaultValue": "設定にコピー"
-+=======
-+	"emptyUserSettingsHeader": "既定の設定を上書きするには、このファイル内に設定を挿入します。",
-+	"errorInvalidConfiguration": "設定を書き込めません。ファイル内のエラー/警告を修正してからもう一度お試しください。",
-+	"emptyWorkspaceSettingsHeader": "ユーザー設定を上書きするには、このファイル内に設定を挿入します。",
-+	"emptyFolderSettingsHeader": "ワークスペースの設定を上書きするには、このファイル内にフォルダーの設定を挿入します。",
-+	"defaultFolderSettingsTitle": "既定のフォルダー設定",
-+	"defaultSettingsTitle": "既定の設定",
-+	"noSettingsFound": "設定が見つかりません。",
-+	"editTtile": "編集",
-+	"replaceDefaultValue": "設定を置換",
-+	"copyDefaultValue": "設定にコピー",
-+	"unsupportedPHPExecutablePathSetting": "この設定はユーザー設定でなければなりません。ワークスペースのために PHP を構成するには、PHP ファイルを開き、ステータス バーの [PHP パス] をクリックします。",
-+	"unsupportedWorkspaceSetting": "この設定はユーザー設定でなければなりません。",
-+	"unsupportedWorkbenchSetting": "この設定は現在適用できません。このフォルダーを直接開いたときに適用されます。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 47d6b9c337e4799ba23c7e2e42aa5524b4dbbde1 i18n/jpn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 0c0e1ef6922bb2ebfdd24dd39aa82c38ab488084 i18n/jpn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 ab57a31ce38f83ca1384d26d9bac9de8883f7e64 i18n/jpn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"nextSearchIncludePattern": "次の検索包含パターンを表示",
- 	"previousSearchIncludePattern": "前の検索包含パターンを表示",
- 	"nextSearchExcludePattern": "次の検索除外パターンを表示",
-changed in both
-  base   100644 78356e3e0f46be548f853447d45d40a0ab08b5cc i18n/jpn/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  our    100644 e3bc313f7629d61de69d1a7c87f4621737652171 i18n/jpn/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  their  100644 4dee2d5d093e01a8001cf6a02e5126c243155706 i18n/jpn/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-changed in both
-  base   100644 bec8ad0511234592cc1baaae890cb3821ad863ee i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 8021ef7847fd50a81058f6bd7af4fbd030bdc905 i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 f9f3eb982678a652e5adbfac9aeeff29bd9b441c i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-changed in both
-  base   100644 16366e22ca28f9aca9f14253e677c611418e13e0 i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 62e38b3747f8554dd00fc9cb1775537cf7a36bb1 i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 6f1481812dd67ba95cda718a289dd200f73deb54 i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-changed in both
-  base   100644 a046b227b9343b60dd225c2000e5b65dbc587fdc i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 bd0ce9939936ef31eabab48bc5a42980b19e29b3 i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 9be30e57a0445247bbdd211dab4d01091f1e4701 i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -51,6 +51,7 @@
- 	"workbench.action.terminal.rename.prompt": "ターミナルの名前を入力してください",
- 	"workbench.action.terminal.focusFindWidget": "検索ウィジェットにフォーカスする",
- 	"workbench.action.terminal.hideFindWidget": "検索ウィジェットを非表示にする",
-+<<<<<<< .our
- 	"nextTerminalFindTerm": "次の検索語句を表示",
- 	"previousTerminalFindTerm": "前の検索語句を表示",
- 	"quickOpenTerm": "アクティブなターミナルの切り替え",
-@@ -60,4 +61,7 @@
- 	"workbench.action.terminal.selectToNextCommand": "次のコマンドを選択",
- 	"workbench.action.terminal.selectToPreviousLine": "前の行を選択",
- 	"workbench.action.terminal.selectToNextLine": "次の行を選択"
-+=======
-+	"quickOpenTerm": "アクティブなターミナルの切り替え"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 01396d39cfbe1fb66aeed3ab4523479a89004157 i18n/jpn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 be4c3ee187a4c958a13a55a867d75c42dce31777 i18n/jpn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 a9d26fa1a49e9720e28ba5859d7b937bbc1d490f i18n/jpn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -11,7 +11,12 @@
- 	"read the release notes": "{0} v{1} へようこそ! リリース ノートを確認しますか?",
- 	"licenseChanged": "ライセンス条項が変更されました。[こちら]({0}) をクリックして内容をご確認ください。",
- 	"neveragain": "今後は表示しない",
-+<<<<<<< .our
- 	"64bitisavailable": "64 ビット Windows 用の {0} が利用可能になりました！詳細情報は[こちら]({1})をクリックしてください。",
-+=======
-+	"64bitisavailable": "Windows 64 ビット用の {0} が利用可能になりました！",
-+	"learn more": "詳細情報",
-+>>>>>>> .their
- 	"updateIsReady": "新しい更新 {0} が利用可能です。",
- 	"noUpdatesAvailable": "現在入手可能な更新はありません。",
- 	"ok": "OK",
-changed in both
-  base   100644 a0d2093c119b87d7501753be72fe16c7c05c433c i18n/jpn/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  our    100644 60bf4e08cf5bbad037fb33148e8162e4e6ad633a i18n/jpn/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  their  100644 4f492f5ba98c57babe89ff4cb44e5a701595103e i18n/jpn/src/vs/workbench/services/configuration/node/configuration.i18n.json
-@@ -9,6 +9,7 @@
- 	"scope.window.description": "ウィンドウ固有の構成。ユーザーまたはワークスペースの設定で構成できます。",
- 	"scope.resource.description": "リソース固有の構成。ユーザー、ワークスペース、またはフォルダーの設定で構成できます。",
- 	"scope.description": "構成が適用される範囲。 使用可能なスコープは `window` と ` resource` です。",
-+<<<<<<< .our
- 	"vscode.extension.contributes.configuration": "構成の設定を提供します。",
- 	"invalid.title": "'configuration.title' は、文字列である必要があります",
- 	"vscode.extension.contributes.defaultConfiguration": "言語ごとに既定のエディター構成の設定を提供します。",
-@@ -21,4 +22,13 @@
- 	"workspaceConfig.settings.description": "ワークスペースの設定",
- 	"workspaceConfig.extensions.description": "ワークスペースの拡張機能",
- 	"unknownWorkspaceProperty": "不明なワークスペース構成プロパティ"
-+=======
-+	"invalid.type": "設定すると、'configuration.type' は 'オブジェクトに設定されなければなりません",
-+	"invalid.title": "'configuration.title' は、文字列である必要があります",
-+	"vscode.extension.contributes.defaultConfiguration": "言語ごとに既定のエディター構成の設定を提供します。",
-+	"invalid.properties": "'configuration.properties' は、オブジェクトである必要があります",
-+	"workspaceConfig.id.description": "ワークスペース識別子。 ワークスペース内部の状態を保存するために使用されますが、変更時に失われる可能性があります。",
-+	"workspaceConfig.folders.description": "ワークスペースで読み込まれるフォルダーのリスト。ファイル パスである必要があります。例: `file:///root/folderA`",
-+	"workspaceConfig.settings.description": "ワークスペースの設定"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c3d8ee097dcab747accedea1ec6a2ad6defb457c i18n/jpn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 627b2d01b48806d1f5f06d10756e2464690ef51d i18n/jpn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 6a4f8a9515237eb58139490a0df20983be59a2f9 i18n/jpn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -9,6 +9,7 @@
- 	"openTasksConfiguration": "タスク構成を開く",
- 	"openLaunchConfiguration": "起動構成を開く",
- 	"open": "設定を開く",
-+<<<<<<< .our
- 	"saveAndRetry": "保存して再試行",
- 	"errorUnknownKey": "{1} は登録済みの構成ではないため、{0} に書き込むことができません。",
- 	"errorInvalidWorkspaceConfigurationApplication": "{0} をワークスペース設定に書き込めません。この設定はユーザー設定にのみ書き込めます。",
-@@ -27,6 +28,19 @@
- 	"errorConfigurationFileDirty": "ファイルが変更されているため、ユーザー設定を書き込めません。ユーザー設定ファイルを保存してから、もう一度お試しください。",
- 	"errorConfigurationFileDirtyWorkspace": "ファイルが変更されているため、ワークスペース設定を書き込めません。ワークスペース設定ファイルを保存してから、もう一度お試しください。",
- 	"errorConfigurationFileDirtyFolder": "ファイルが変更されているため、フォルダー設定を書き込めません。'{0}' フォルダー設定ファイルを保存してから、もう一度お試しください。",
-+=======
-+	"close": "閉じる",
-+	"saveAndRetry": "設定を保存して再試行",
-+	"errorUnknownKey": "{1} は登録済みの構成ではないため、{0} に書き込むことができません。",
-+	"errorInvalidFolderConfiguration": "{0} はフォルダーのリソース スコープをサポートしていないため、フォルダー設定に書き込むことができません。",
-+	"errorInvalidUserTarget": "{0} はグローバル スコープをサポートしていないため、ユーザー設定に書き込むことができません。",
-+	"errorInvalidFolderTarget": "リソースが指定されていないため、フォルダー設定に書き込むことができません。",
-+	"errorNoWorkspaceOpened": "開いているワークスペースがないため、{0} に書き込むことができません。最初にワークスペースを開いてから、もう一度お試しください。",
-+	"errorInvalidConfiguration": "設定を書き込めません。**User Settings** を開いて、ファイル内のエラー/警告を修正してからもう一度お試しください。",
-+	"errorInvalidConfigurationWorkspace": "設定を書き込めません。**Workspace Settings** を開いて、ファイル内のエラー/警告を修正してからもう一度お試しください。",
-+	"errorConfigurationFileDirty": "ファイルが変更されているため、設定を書き込めません。**User Settings** ファイルを保存してから、もう一度お試しください。",
-+	"errorConfigurationFileDirtyWorkspace": "ファイルが変更されているため、設定を書き込めません。**Workspace Settings** ファイルを保存してから、もう一度お試しください。",
-+>>>>>>> .their
- 	"userTarget": "ユーザー設定",
- 	"workspaceTarget": "ワークスペースの設定",
- 	"folderTarget": "フォルダーの設定"
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/extensions/emmet/package.i18n.json
-  our    100644 517fee7baf0c3ecd5ff03235a1df00c583e6985b i18n/kor/extensions/emmet/package.i18n.json
-  their  100644 79056f5a827f1e8a387f899380955917502e71b0 i18n/kor/extensions/emmet/package.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,6 +10,14 @@
- 	"description": "VS Code에 대한 Emmet 지원",
- 	"command.wrapWithAbbreviation": "약어로 래핑",
- 	"command.wrapIndividualLinesWithAbbreviation": "약어로 개별 줄 래핑",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"command.removeTag": "태그 제거",
- 	"command.updateTag": "태그 업데이트",
- 	"command.matchTag": "일치하는 쌍으로 이동",
-@@ -31,6 +40,7 @@
- 	"command.incrementNumberByTen": "10씩 증가",
- 	"command.decrementNumberByTen": "10씩 감소",
- 	"emmetSyntaxProfiles": "지정된 구문에 대한 프로필을 정의하거나 특정 규칙이 포함된 고유한 프로필을 사용하세요.",
-+<<<<<<< .our
- 	"emmetExclude": "Emmet 약어는 확장하면 안 되는 언어의 배열입니다.",
- 	"emmetExtensionsPath": "Emmet 프로필 및 코드 조각이 포함된 폴더의 경로입니다.'",
- 	"emmetShowExpandedAbbreviation": "확장된 emmet 약어를 제안으로 표시합니다.\n\"inMarkupAndStylesheetFilesOnly\" 옵션이 html, haml, jade, slim, xml, xsl, css, scss, sass, less 및 stylus에 적용됩니다.\n\"always\" 옵션이 마크업/css에 관계없이 파일의 모든 부분에 적용됩니다.",
-@@ -62,4 +72,12 @@
- 	"emmetPreferencesCssMsProperties": "`-`로 시작하는 emmet 약어에서 사용할 때 'ms' 공급업체 접두사를 가져오는 쉼표로 구분된 CSS 속성입니다. 항상 'ms' 접두사를 사용하지 않으려면 빈 문자열로 설정합니다.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "유사 일치 약어가 획득해야 하는 최소 점수(0에서 1 사이)입니다. 값이 낮을수록 가양성 일치 항목이 늘 수 있고, 값이 높을수록 가능한 일치 항목이 줄 수 있습니다.",
- 	"emmetOptimizeStylesheetParsing": "False로 설정할 경우 전체 파일이 구문 분석되어 현재 위치가 Emmet 약어 확장에 유효한지 확인합니다. True로 설정할 경우 css/scss/less 파일에서 현재 위치 주변의 콘텐츠만 구문 분석합니다."
-+=======
-+	"emmetExclude": "Emmet 약어를 확장하면 안 되는 언어의 배열입니다.",
-+	"emmetExtensionsPath": "Emmet 프로필, 코드 조각 및 기본 설정이 포함된 폴더의 경로입니다. emmet.useNewEmmet이 true일 때만 확장 경로의 프로필이 인정됩니다.",
-+	"emmetShowExpandedAbbreviation": "확장된 emmet 약어를 제안으로 표시합니다.\n\"inMarkupAndStylesheetFilesOnly\" 옵션이 html, haml, jade, slim, xml, xsl, css, scss, sass, less 및 stylus에 적용됩니다.\n\"always\" 옵션이 마크업/css에 관계없이 파일의 모든 부분에 적용됩니다.",
-+	"emmetShowAbbreviationSuggestions": "가능한 emmet 약어를 제안으로 표시합니다. 스타일시트에는 적용되지 않고 emmet.showExpandedAbbreviation이 \"never\"로 설정되어 있을 때도 적용되지 않습니다.",
-+	"emmetIncludeLanguages": "기본 지원되지 않는 언어에서 emmet 약어를 사용합니다. 언어와 emmet 지원 언어 사이에 매핑을 추가합니다.\n예: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
-+	"emmetVariables": "emmet 조각에 사용되는 변수"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8a96502e3a796749d61630cce0542fb94fc85e18 i18n/kor/extensions/extension-editing/out/extensionLinter.i18n.json
-  our    100644 1a6b6fec1699050fbebe38ad42640b3e0f0f07d3 i18n/kor/extensions/extension-editing/out/extensionLinter.i18n.json
-  their  100644 f8432086d5138d22c2abb41b372a3d0643d4e544 i18n/kor/extensions/extension-editing/out/extensionLinter.i18n.json
-changed in both
-  base   100644 600483c9e098bc70047c4edcea9a74d36acee23b i18n/kor/extensions/git/out/commands.i18n.json
-  our    100644 5c881abd459fc945dcc1b911f43b518f709ac538 i18n/kor/extensions/git/out/commands.i18n.json
-  their  100644 00b745895764c5ec0bc1cb093fb24872ceec908c i18n/kor/extensions/git/out/commands.i18n.json
-changed in both
-  base   100644 fea668373d19f57e029a7792039d3e31f5301591 i18n/kor/extensions/markdown/out/security.i18n.json
-  our    100644 b7fd641e49324f12cb3e70d0e0b3a99277526769 i18n/kor/extensions/markdown/out/security.i18n.json
-  their  100644 aa64d695e8ccd47e1d63df5ceab31b5e98b2753d i18n/kor/extensions/markdown/out/security.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -16,5 +17,11 @@
- 	"enableSecurityWarning.title": "이 작업 영역에서 미리 보기 보안 경고 사용",
- 	"disableSecurityWarning.title": "이 작업 영역에서 미리보기 보안 경고 사용 안 함",
- 	"toggleSecurityWarning.description": "콘텐츠 보안 수준에 영향을 주지 않습니다.",
-+=======
-+	"preview.showPreviewSecuritySelector.strictTitle": "엄격함. 보안 콘텐츠만 로드.",
-+	"preview.showPreviewSecuritySelector.currentSelection": "현재 설정",
-+	"preview.showPreviewSecuritySelector.insecureContentTitle": "http를 통한 콘텐츠 로드를 허용합니다.",
-+	"preview.showPreviewSecuritySelector.scriptsAndAllContent": "모든 콘텐츠 및 스크립트 실행을 허용합니다. 권장하지 않습니다.",
-+>>>>>>> .their
- 	"preview.showPreviewSecuritySelector.title": "이 작업 영역에 대해 Markdown 미리 보기의 보안 설정 선택"
- }
-\ No newline at end of file
-changed in both
-  base   100644 bae4e5954d08bb38ccbe0ffdc966eaaeeb0d5013 i18n/kor/extensions/npm/package.i18n.json
-  our    100644 b762a88ac6b09e3d0033e37c5db538576d49fc4b i18n/kor/extensions/npm/package.i18n.json
-  their  100644 04e51b003cad423ee7971f81d1a8a2963ea34482 i18n/kor/extensions/npm/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -23,4 +24,8 @@
- 	"command.debug": "디버그",
- 	"command.openScript": "열기",
- 	"command.runInstall": "설치 실행"
-+=======
-+	"config.npm.autoDetect": "npm 스크립트에 대한 자동 검색 여부를 설정합니다. 기본값은 [켜기]입니다.",
-+	"config.npm.runSilent": " `--silent` 옵션으로 npm 명령 실행"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/extensions/typescript/out/features/taskProvider.i18n.json
-  our    100644 6982eedcfd951f2be2d44e134096c815d17a7ef4 i18n/kor/extensions/typescript/out/features/taskProvider.i18n.json
-  their  100644 347d63b00dc1be110cd737d817413bb489cb2acd i18n/kor/extensions/typescript/out/features/taskProvider.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,14 @@
- 	],
- 	"buildTscLabel": "빌드 - {0}",
- 	"buildAndWatchTscLabel": "보기 - {0}"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"buildAndWatchTscLabel": "보기 - {0}",
-+	"buildTscLabel": "빌드 - {0}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/src/vs/code/electron-main/auth.i18n.json
-  our    100644 47f853841b33cd27117be4d7b9d6fa9b9af0ff56 i18n/kor/src/vs/code/electron-main/auth.i18n.json
-  their  100644 4b003737236c7e2a22405547da228b5644f4b586 i18n/kor/src/vs/code/electron-main/auth.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"authRequire": "프록시 인증 필요",
- 	"proxyauth": "프록시 {0}에 인증이 필요합니다."
- }
-\ No newline at end of file
-changed in both
-  base   100644 9f3f01d8dbf4f2aba0210028b7c982d8b0a518e3 i18n/kor/src/vs/code/electron-main/menus.i18n.json
-  our    100644 a3a33ffe4d84057c71074e546cdf9a1e5529a6c8 i18n/kor/src/vs/code/electron-main/menus.i18n.json
-  their  100644 2e4a6564eae28662a064870571bbdfd27b5ae584 i18n/kor/src/vs/code/electron-main/menus.i18n.json
-@@ -24,12 +24,21 @@
- 	"miQuit": "{0} 종료",
- 	"miNewFile": "새 파일(&&N)",
- 	"miOpen": "열기(&&O)...",
-+<<<<<<< .our
- 	"miOpenWorkspace": "작업 영역 열기(&&K)...",
- 	"miOpenFolder": "폴더 열기(&&F)...",
- 	"miOpenFile": "파일 열기(&&O)...",
- 	"miOpenRecent": "최근 항목 열기(&&R)",
- 	"miSaveWorkspaceAs": "작업 영역을 다른 이름으로 저장",
- 	"miAddFolderToWorkspace": "작업 영역에 폴더 추가(&&D)...",
-+=======
-+	"miOpenWorkspace": "작업 영역 열기(&O)...",
-+	"miOpenFolder": "폴더 열기(&&F)...",
-+	"miOpenFile": "파일 열기(&&O)...",
-+	"miOpenRecent": "최근 항목 열기(&&R)",
-+	"miSaveWorkspaceAs": "다른 이름으로 작업 영역 저장(&S)...",
-+	"miAddFolderToWorkspace": "작업 영역에 폴더 추가(&&A)",
-+>>>>>>> .their
- 	"miSave": "저장(&&S)",
- 	"miSaveAs": "다른 이름으로 저장(&&A)...",
- 	"miSaveAll": "모두 저장(&&L)",
-@@ -189,5 +198,11 @@
- 	"miDownloadingUpdate": "업데이트를 다운로드하는 중...",
- 	"miInstallUpdate": "업데이트 설치...",
- 	"miInstallingUpdate": "업데이트를 설치하는 중...",
-+<<<<<<< .our
- 	"miRestartToUpdate": "다시 시작하여 업데이트..."
-+=======
-+	"miCheckForUpdates": "업데이트 확인...",
-+	"aboutDetail": "\n버전 {0}\n커밋 {1}\n날짜 {2}\n셸 {3}\n렌더러 {4}\n노드 {5}\n아키텍처 {6}",
-+	"okButton": "확인"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
-  our    100644 bda85bce0b206ff79c5dce76befaf70badf82add i18n/kor/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
-  their  100644 748a7f2cb394a252b7d6673f26a9c1efcc24f119 i18n/kor/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"diff.tooLarge": "파일 1개가 너무 커서 파일을 비교할 수 없습니다."
- }
-\ No newline at end of file
-changed in both
-  base   100644 2c53ffbfb61c1bd3703b26d024e43b6fc44cbf68 i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 c96c0fe1469ce78842b73db686d63d6305f28dfb i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 63a10718dfeec8242710c6c7d6dc08106da68f98 i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json
-changed in both
-  base   100644 dcef1416eba3b36e89704049946067dd61560e9f i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 c148a56d8d67892505611b68cdd18b2ba3428134 i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 f42d9806fbe45b9c215beb1b52271da9bd8e1178 i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json
-changed in both
-  base   100644 8c6b4441dfce30ad18d7018cd01e0486ae75d861 i18n/kor/src/vs/editor/contrib/find/common/findController.i18n.json
-  our    100644 7201d1ab08fc71d8c9ec33ae39fdb857dbf3a0c9 i18n/kor/src/vs/editor/contrib/find/common/findController.i18n.json
-  their  100644 d0e58fa206e360002c7208853a0665c90b28ebfe i18n/kor/src/vs/editor/contrib/find/common/findController.i18n.json
-@@ -10,6 +10,15 @@
- 	"nextSelectionMatchFindAction": "다음 선택 찾기",
- 	"previousSelectionMatchFindAction": "이전 선택 찾기",
- 	"startReplace": "바꾸기",
-+<<<<<<< .our
-+=======
-+	"addSelectionToNextFindMatch": "다음 일치 항목 찾기에 선택 항목 추가",
-+	"addSelectionToPreviousFindMatch": "이전 일치 항목 찾기에 선택 항목 추가",
-+	"moveSelectionToNextFindMatch": "다음 일치 항목 찾기로 마지막 선택 항목 이동",
-+	"moveSelectionToPreviousFindMatch": "마지막 선택 항목을 이전 일치 항목 찾기로 이동",
-+	"selectAllOccurrencesOfFindMatch": "일치 항목 찾기의 모든 항목 선택",
-+	"changeAll.label": "모든 항목 변경",
-+>>>>>>> .their
- 	"showNextFindTermAction": "다음 검색어 표시",
- 	"showPreviousFindTermAction": "이전 검색어 표시"
- }
-\ No newline at end of file
-changed in both
-  base   100644 ee033a6e86d186c6e6815d7bf7efa992f6699b5e i18n/kor/src/vs/platform/history/electron-main/historyMainService.i18n.json
-  our    100644 9400d59c513057d5900bfcbd5bcb8b5890743265 i18n/kor/src/vs/platform/history/electron-main/historyMainService.i18n.json
-  their  100644 74f2992518abeaa3aa267103e02461410bf75ab7 i18n/kor/src/vs/platform/history/electron-main/historyMainService.i18n.json
-changed in both
-  base   100644 ab5da7316c6103edf30c44261039b1a9d3ac518f i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 44b01274f5b039d38e4cfbd58f3d0758fa5d1e89 i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 45f6d8d560c2002727261c71c26991b243b84c8d i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -60,7 +60,11 @@
- 	"scrollbarShadow": "스크롤되는 보기를 나타내는 스크롤 막대 그림자입니다.",
- 	"scrollbarSliderBackground": "스크롤 막대 슬라이버 배경색입니다.",
- 	"scrollbarSliderHoverBackground": "마우스로 가리킬 때 스크롤 막대 슬라이더 배경색입니다.",
-+<<<<<<< .our
- 	"scrollbarSliderActiveBackground": "클릭된 상태일 때 스크롤 막대 슬라이더 배경색입니다.",
-+=======
-+	"scrollbarSliderActiveBackground": "활성 상태일 때 스크롤 막대 슬라이더 배경색입니다.",
-+>>>>>>> .their
- 	"progressBarBackground": "오래 실행 중인 작업에 대해 표시되는 진행률 표시 막대의 배경색입니다.",
- 	"editorBackground": "편집기 배경색입니다.",
- 	"editorForeground": "편집기 기본 전경색입니다.",
-changed in both
-  base   100644 56b8182afa2371ec565fe3b383e32ed8d1076af5 i18n/kor/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 9f392ee6782a9cd3b3d60690870bfb3e051b1e8b i18n/kor/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 0e57f95cfae79754ad9dc747aefe09141723ac88 i18n/kor/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -9,6 +9,7 @@
- 	"openFile": "파일 열기...",
- 	"openFolder": "폴더 열기...",
- 	"openFileFolder": "열기...",
-+<<<<<<< .our
- 	"globalRemoveFolderFromWorkspace": "작업 영역에서 폴더 제거...",
- 	"saveWorkspaceAsAction": "작업 영역을 다른 이름으로 저장",
- 	"save": "저장(&&S)",
-@@ -16,4 +17,24 @@
- 	"openWorkspaceAction": "작업 영역 열기...",
- 	"openWorkspaceConfigFile": "작업 영역 구성 파일 열기",
- 	"duplicateWorkspaceInNewWindow": "새 창에 작업 영역 복제"
-+=======
-+	"reload": "다시 로드(&&R)",
-+	"cancel": "취소",
-+	"newWorkspaceFormExisting": "기존 작업 영역을 바탕으로 새 작업 영역 만들기...",
-+	"select": "선택(&&S)",
-+	"selectWorkspace": "작업 영역 폴더 선택",
-+	"addSupported": "여러 폴더를 열려면 창을 다시 로드해야 합니다.",
-+	"addFolderToWorkspace": "작업 영역에 폴더 추가...",
-+	"add": "추가(&&A)",
-+	"addFolderToWorkspaceTitle": "작업 영역에 폴더 추가",
-+	"removeFolderFromWorkspace": "작업 영역에서 폴더 삭제",
-+	"saveWorkspaceAsAction": "작업 영역을 다른 이름으로 저장",
-+	"saveEmptyWorkspaceNotSupported": "저장하려면 먼저 작업 영역을 여세요.",
-+	"saveNotSupported": "작업 영역을 저장하려면 창을 다시 로드해야 합니다.",
-+	"save": "저장(&&S)",
-+	"saveWorkspace": "작업 영역 저장",
-+	"openWorkspaceAction": "작업 영역 열기...",
-+	"newWorkspace": "새 작업 영역...",
-+	"openWorkspaceConfigFile": "작업 영역 구성 파일 열기"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 0977d6d1b49023bfdcc955aea2c88da8c7a76c67 i18n/kor/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 c3a38e203dc33f498428fe02d849236cb876a123 i18n/kor/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 241bb67c5eee8ce0a274d3f675a332f810f92572 i18n/kor/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 5e2f77ce29d584046b775def4dba3837e6629d07 i18n/kor/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-  our    100644 93f9a5f3a8b11703c482d474163e0bd4ada760f7 i18n/kor/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-  their  100644 d6de51734164ad589ae3565b29422580bde33a62 i18n/kor/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,9 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"compositePart.hideSideBarLabel": "사이드 막대 숨기기",
-+>>>>>>> .their
- 	"focusSideBar": "사이드바에 포커스",
- 	"viewCategory": "보기"
- }
-\ No newline at end of file
-changed in both
-  base   100644 71d7cfe6952de22b112495938f77f82acd153f82 i18n/kor/src/vs/workbench/common/theme.i18n.json
-  our    100644 634f6ea85a754d26140eeb8ed57e39a6ab596db9 i18n/kor/src/vs/workbench/common/theme.i18n.json
-  their  100644 64172c524ed6bce53ff9e333142bae79e1c4bdc3 i18n/kor/src/vs/workbench/common/theme.i18n.json
-@@ -61,6 +61,7 @@
- 	"titleBarActiveBackground": "창을 활성화할 때의 제목 표시줄 전경입니다. 이 색은 현재 macOS에서만 지원됩니다.",
- 	"titleBarInactiveBackground": "창이 비활성화된 경우의 제목 표시줄 배경입니다. 이 색은 현재 macOS에서만 지원됩니다.",
- 	"titleBarBorder": "제목 막대 테두리 색입니다. 현재 이 색상은 macOS에서만 지원됩니다.",
-+<<<<<<< .our
- 	"notificationCenterBorder": "알림 센터 테두리 색입니다. 알림은 창 오른쪽 맨 아래에 표시됩니다.",
- 	"notificationToastBorder": "알림 테두리 색입니다. 알림은 창 오른쪽 맨 아래에 표시됩니다.",
- 	"notificationsForeground": "알림 전경색입니다. 알림은 창 오른쪽 맨 아래에 표시됩니다.",
-@@ -69,4 +70,17 @@
- 	"notificationCenterHeaderForeground": "알림 센터 머리글 전경색입니다. 알림은 창 오른쪽 맨 아래에 표시됩니다.",
- 	"notificationCenterHeaderBackground": "알림 센터 머리글 배경색입니다. 알림은 창 오른쪽 맨 아래에 표시됩니다.",
- 	"notificationsBorder": "알림 센터에서 다른 알림과 구분하는 알림 테두리 색입니다. 알림은 창 오른쪽 맨 아래에 표시됩니다."
-+=======
-+	"notificationsForeground": "알림 전경색입니다. 알림은 창의 위쪽에 표시됩니다.",
-+	"notificationsBackground": "알림 배경색입니다. 알림은 창의 위쪽에 표시됩니다.",
-+	"notificationsButtonBackground": "알림 단추 배경색입니다. 알림은 창의 위쪽에 표시됩니다.",
-+	"notificationsButtonHoverBackground": "떠 있는 알림 단추 배경색입니다. 알림은 창의 위쪽에 표시됩니다.",
-+	"notificationsButtonForeground": "알림 단추 전경색입니다. 알림은 창의 위쪽에 표시됩니다.",
-+	"notificationsInfoBackground": "알림 정보 배경색입니다. 알림은 창의 위쪽에 표시됩니다.",
-+	"notificationsInfoForeground": "알림 정보 전경색입니다. 알림은 창의 위쪽에 표시됩니다.",
-+	"notificationsWarningBackground": "알림 경고 배경색입니다. 알림은 창의 위쪽에 표시됩니다.",
-+	"notificationsWarningForeground": "알림 경고 전경색입니다. 알림은 창의 위쪽에 표시됩니다.",
-+	"notificationsErrorBackground": "알림 오류 배경색입니다. 알림은 창의 위쪽에 표시됩니다.",
-+	"notificationsErrorForeground": "알림 오류 전경색입니다. 알림은 창의 위쪽에 표시됩니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d6e342c7b2244965f9f49a03f8b7b950a26c77fd i18n/kor/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 e913e127345422fb81d57f13fd8b5c25a0d63e10 i18n/kor/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 e9b90f8dbe3eab05fb2305d42588a4bfd5fe8e1b i18n/kor/src/vs/workbench/electron-browser/actions.i18n.json
-changed in both
-  base   100644 96418c6f448fe0fa68e2a7eba4d25c96bce1c874 i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 faff44b17686fcb835995d2bfd92efcfdcc183b1 i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 57a3833e96f18df728132e4eda300aa9bbbfa084 i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,6 +35,7 @@
- 	"panelDefaultLocation": "패널의 기본 위치를 제어합니다. 워크벤치의 아래 또는 오른쪽에 표시될 수 있습니다.",
- 	"statusBarVisibility": "워크벤치 아래쪽에서 상태 표시줄의 표시 유형을 제어합니다.",
- 	"activityBarVisibility": "워크벤치에서 작업 막대의 표시 유형을 제어합니다.",
-+<<<<<<< .our
- 	"viewVisibility": "보기 머리글 작업의 표시 여부를 제어합니다. 보기 머리글 작업은 항상 표시할 수도 있고 보기에 포커스가 있거나 보기를 마우스로 가리킬 때만 표시할 수도 있습니다.",
- 	"fontAliasing": "워크벤치에서 글꼴 앨리어싱 방식을 제어합니다.\n- 기본: 서브 픽셀 글꼴 다듬기. 대부분의 일반 디스플레이에서 가장 선명한 글꼴 제공\n- 안티앨리어싱: 서브 픽셀이 아닌 픽셀 단위에서 글꼴 다듬기. 전반적으로 더 밝은 느낌을 줄 수 있음\n- 없음: 글꼴 다듬기 사용 안 함. 텍스트 모서리가 각지게 표시됨\n- 자동: 디스플레이의 DPI에 따라 `기본` 또는 `안티앨리어싱`을 자동으로 적용합니다.",
- 	"workbench.fontAliasing.default": "서브 픽셀 글꼴 다듬기. 대부분의 일반 디스플레이에서 가장 선명한 텍스트를 제공합니다. ",
-@@ -43,6 +44,15 @@
- 	"workbench.fontAliasing.auto": "디스플레이의 DPI에 따라 `기본` 또는 `안티앨리어싱`을 자동으로 적용합니다.",
- 	"enableNaturalLanguageSettingsSearch": "설정에 대한 자연어 검색 모드를 사용할지 여부를 제어합니다.",
- 	"windowConfigurationTitle": "창",
-+=======
-+	"closeOnFileDelete": "일부 다른 프로세스에서 파일을 삭제하거나 이름을 바꿀 때 파일을 표시하는 편집기를 자동으로 닫을지 여부를 제어합니다. 사용하지 않도록 설정하는 경우 이러한 이벤트가 발생하면 편집기가 더티 상태로 계속 열려 있습니다. 응용 프로그램 내에서 삭제하면 항상 편집기가 닫히고 데이터를 유지하기 위해 더티 파일은 닫히지 않습니다.",
-+	"fontAliasing": "워크벤치에서 글꼴 앨리어싱 방식을 제어합니다.\n- 기본: 서브 픽셀 글꼴 다듬기. 대부분의 일반 디스플레이에서 가장 선명한 글꼴 제공\n- 안티앨리어싱: 서브 픽셀이 아닌 픽셀 단위에서 글꼴 다듬기. 전반적으로 더 밝은 느낌을 줄 수 있음\n- 없음: 글꼴 다듬기 사용 안 함. 텍스트 모서리가 각지게 표시됨",
-+	"workbench.fontAliasing.default": "서브 픽셀 글꼴 다듬기. 대부분의 일반 디스플레이에서 가장 선명한 텍스트를 제공합니다. ",
-+	"workbench.fontAliasing.antialiased": "서브 픽셀이 아닌 픽셀 수준에서 글꼴을 다듬습니다. 전반적으로 글꼴이 더 밝게 표시됩니다.",
-+	"workbench.fontAliasing.none": "글꼴 다듬기를 사용하지 않습니다. 텍스트 가장자리가 각지게 표시됩니다.",
-+	"swipeToNavigate": "세 손가락으로 가로로 살짝 밀어 열려 있는 파일 간을 이동합니다.",
-+	"workbenchConfigurationTitle": "워크벤치",
-+>>>>>>> .their
- 	"window.openFilesInNewWindow.on": "파일이 새 창에서 열립니다.",
- 	"window.openFilesInNewWindow.off": "파일이 파일의 폴더가 열려 있는 창 또는 마지막 활성 창에서 열립니다.",
- 	"window.openFilesInNewWindow.defaultMac": "Dock 또는 Finder를 통해 파일을 연 경우를 제외하고 파일이 파일의 폴더가 열린 창 또는 마지막 활성 창에서 열립니다.",
-changed in both
-  base   100644 25e82009859b6337471de1227baae9692d5ef89e i18n/kor/src/vs/workbench/electron-browser/window.i18n.json
-  our    100644 703e3d8d4269028adc7403f098f2a57162a9f658 i18n/kor/src/vs/workbench/electron-browser/window.i18n.json
-  their  100644 a1dd528439c484d9c337c4c7530afa4862973131 i18n/kor/src/vs/workbench/electron-browser/window.i18n.json
-@@ -12,5 +12,10 @@
- 	"copy": "복사",
- 	"paste": "붙여넣기",
- 	"selectAll": "모두 선택",
-+<<<<<<< .our
- 	"runningAsRoot": "{0}을(를) 루트 사용자로 실행하지 않는 것이 좋습니다."
-+=======
-+	"confirmOpen": "{0} 작업 영역을 여시겠습니까?",
-+	"confirmOpenButton": "열기(&&O)"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 33a1fa482a7a10c469872359aabac624242ce70e i18n/kor/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  our    100644 dd3c2e1891671a9ad308f3ef03becfcb764d3cd7 i18n/kor/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  their  100644 17a439db7451aed3cd75fffe4988416294bbe633 i18n/kor/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-changed in both
-  base   100644 3a1c8cbdce79807cc1c13d7c37c9f0160c3f7bb9 i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 f0485e490c5dc7158ba60cc766e0b791027e8972 i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 08b7596ca511d4d679d67603576b27dd76f531ed i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -28,7 +28,13 @@
- 	"preLaunchTaskExitCode": "preLaunchTask '{0}'이(가) {1} 종료 코드와 함께 종료되었습니다.",
- 	"showErrors": "오류 표시",
- 	"noFolderWorkspaceDebugError": "활성 파일은 디버그할 수 없습니다. 이 파일이 디스크에 저장되어 있고 해당 파일 형식에 대한 디버그 확장이 설치되어 있는지 확인하세요.",
-+<<<<<<< .our
- 	"cancel": "취소",
- 	"DebugTaskNotFound": "작업 '{0}' 을(를) 찾을 수 없습니다.",
- 	"taskNotTracked": "작업 '{0}' 을(를) 추적할 수 없습니다."
-+=======
-+	"NewLaunchConfig": "응용 프로그램에 사용할 구성 시작 파일을 설정하세요. {0}",
-+	"DebugTaskNotFound": "preLaunchTask '{0}'을(를) 찾을 수 없습니다.",
-+	"differentTaskRunning": "'{0}' 작업이 이미 실행 중입니다. 실행 전 작업 '{1}'을(를) 실행할 수 없습니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6de8809b45e61af1d63e0b627e3919cb0487d957 i18n/kor/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  our    100644 a364973604ec4284961f14cfdd0ccf08d6d710b7 i18n/kor/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  their  100644 86af02695e33c4349f543d4fa547a9be7a8de097 i18n/kor/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-merged
-  result 100644 aa4c7b650ce726c1909e8e14b0e673bc244b099b i18n/kor/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-  our    100644 cc42700efc8ccde4573f62bccb584ab0b951aa54 i18n/kor/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-@@ -7,8 +7,5 @@
- 	"emmetConfigurationTitle": "Emmet",
- 	"triggerExpansionOnTab": "사용하도록 설정하면 emmet 약어는 <Tab> 키를 눌렀을 때 확장됩니다. emmet.useNewemmet을 true로 설정하면 적용되지 않습니다.",
- 	"emmetPreferences": "Emmet의 일부 작업 및 해결 프로그램의 동작을 수정하는 데 사용되는 기본 설정입니다. emmet.useNewemmet을 true로 설정하면 적용되지 않습니다.",
--	"emmetSyntaxProfiles": "지정된 구문에 대한 프로필을 정의하거나 특정 규칙이 포함된 고유한 프로필을 사용하세요.",
--	"emmetExclude": "Emmet 약어를 확장하면 안 되는 언어의 배열입니다.",
--	"emmetExtensionsPath": "Emmet 프로필, 코드 조각 및 기본 설정이 포함된 폴더의 경로입니다. emmet.useNewEmmet이 true일 때만 확장 경로의 프로필이 인정됩니다.",
- 	"useNewEmmet": "모든 emmet 기능에 대해 새 emmet 모듈을 사용해 보세요(이전 단일 emmet 라이브러리를 대체함)."
- }
-\ No newline at end of file
-changed in both
-  base   100644 3eb884953bf2e253a100dadbfbecbc88d57b23c3 i18n/kor/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  our    100644 d7e3fbf5baba4bf721149551ff3617009db1827d i18n/kor/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  their  100644 50730f440768cb821b1884c299c5df52891014fd i18n/kor/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-changed in both
-  base   100644 748fbd6e5f8c01227daf8ce913e8569c6cd7e51d i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 3b79008f444d2989f35d429d32801582bb6d419c i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 55a66108426ab39b99d910d449c56e35e8d22f53 i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-changed in both
-  base   100644 272b83e055a11e417843f8e38c3a88706df397a8 i18n/kor/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  our    100644 b962da52ed963be01f95715acc2834881bf51629 i18n/kor/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  their  100644 32bbc3c8291b298f3185fb405ae8d61e128add6e i18n/kor/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-changed in both
-  base   100644 2044ec34d69a4c44a1635f8fc298967fe65af72d i18n/kor/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 64e3a748c1d30ddcf3658546af6b8c004e841f1b i18n/kor/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 a6fa5c340277c18536040bc1bd4fc1e734bc5649 i18n/kor/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-@@ -40,6 +40,7 @@
- 	"dynamicHeight": "열려 있는 편집기 섹션의 높이가 요소 수에 따라 동적으로 조정되는지 여부를 제어합니다.",
- 	"autoReveal": "탐색기에서 파일을 열 때 자동으로 표시하고 선택할지를 제어합니다.",
- 	"enableDragAndDrop": "탐색기에서 끌어서 놓기를 통한 파일 및 폴더 이동을 허용하는지를 제어합니다.",
-+<<<<<<< .our
- 	"confirmDragAndDrop": "끌어서 놓기를 사용하여 파일 및 폴더를 이동하기 위해 탐색기에서 확인을 요청해야 하는지 제어합니다.",
- 	"confirmDelete": "파일을 휴지통에서 삭제할 때 탐색기에서 확인을 요청해야 하는지 제어합니다.",
- 	"sortOrder.default": "파일 및 폴더가 이름을 기준으로 사전순으로 정렬됩니다. 폴더가 파일 앞에 표시됩니다.",
-@@ -50,4 +51,12 @@
- 	"sortOrder": "탐색기에서 파일 및 폴더의 정렬 순서를 제어합니다. 기본 정렬 외에 순서를 'mixed'(파일 및 폴더가 결합되어 정렬), 'type'(파일 형식 기준), 'modified'(마지막으로 수정한 날짜 기준) 또는 'filesFirst'(파일을 폴더 앞에 정렬)로 설정할 수 있습니다.",
- 	"explorer.decorations.colors": "파일 장식에 색을 사용해야 하는지 제어합니다.",
- 	"explorer.decorations.badges": "파일 장식에 배지를 사용해야 하는지 제어합니다."
-+=======
-+	"sortOrder.default": "파일 및 경로는 이름을 기준으로 알파벳순으로 정렬됩니다. 디렉터리가 파일 앞에 표시됩니다.",
-+	"sortOrder.mixed": "파일 및 디렉터리가 이름을 기준으로 알파벳순으로 정렬됩니다. 파일이 디렉터리와 결합됩니다.",
-+	"sortOrder.filesFirst": "파일 및 디렉터리가 이름을 기준으로 알파벳순으로 정렬됩니다. 파일이 디렉터리 앞에 표시됩니다.",
-+	"sortOrder.type": "파일 및 디렉터리가 확장자를 기준으로 알파벳순으로 정렬됩니다. 디렉터리가 파일 앞에 표시됩니다.",
-+	"sortOrder.modified": "파일 및 디렉터리가 마지막으로 수정한 날짜를 기준으로 내림차순 정렬됩니다. 디렉터리가 파일 앞에 표시됩니다.",
-+	"sortOrder": "undefined"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 cbfa5b0cef99ec8345da977d528810fa5d244a3b i18n/kor/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-  our    100644 6cf353ae7129b46c74d8a2ece73bc29603959134 i18n/kor/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-  their  100644 a59e72f5c391f9c5d555515eb949a58666d7d0f7 i18n/kor/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-@@ -12,5 +12,6 @@
- 	"genericSaveError": "'{0}'을(를) 저장하지 못했습니다. {1}",
- 	"staleSaveError": "'{0}'을(를) 저장하지 못했습니다. 디스크의 내용이 최신 버전입니다. 버전을 디스크에 있는 버전과 비교하려면 **비교**를 클릭하세요.",
- 	"compareChanges": "비교",
--	"saveConflictDiffLabel": "{0}(디스크에 있음) ↔ {1}({2}에 있음) - 저장 충돌 해결"
-+	"saveConflictDiffLabel": "{0}(디스크에 있음) ↔ {1}({2}에 있음) - 저장 충돌 해결",
-+	"userGuide": "오른쪽 편집기 도구 모음의 작업을 사용하여 변경 내용을 **실행 취소**하거나 디스크의 콘텐츠를 변경 내용으로 **덮어쓰기**"
- }
-\ No newline at end of file
-changed in both
-  base   100644 474bdeb6edf46a1c2b8f9fbf73073c06b239f528 i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  our    100644 ad061c299ee4ef976122d2a8f6e9baa370867e9b i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  their  100644 392c06bedeb45e9356901bf138ff3b8cc44184a7 i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-@@ -14,6 +14,10 @@
- 	"openGlobalKeybindingsFile": "바로 가기 키 파일 열기",
- 	"openWorkspaceSettings": "작업 영역 설정 열기",
- 	"openFolderSettings": "폴더 설정 열기",
-+<<<<<<< .our
-+=======
-+	"pickFolder": "폴더 선택",
-+>>>>>>> .their
- 	"configureLanguageBasedSettings": "언어별 설정 구성...",
- 	"languageDescriptionConfigured": "({0})",
- 	"pickLanguage": "언어 선택"
-changed in both
-  base   100644 714541e3b4c81c2a75e962e1feaad6013af5b976 i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 952972db109181a066081ea0ee054ff4a0c809ad i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 393b61b671f8a42e7064445336f07f06f5f762e7 i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -14,4 +15,19 @@
- 	"editTtile": "편집",
- 	"replaceDefaultValue": "설정에서 바꾸기",
- 	"copyDefaultValue": "설정에 복사"
-+=======
-+	"emptyUserSettingsHeader": "설정을 여기에 넣어서 기본 설정을 덮어씁니다.",
-+	"errorInvalidConfiguration": "설정에 쓸 수 없습니다. 파일에서 오류/경고를 해결하고 다시 시도하세요.",
-+	"emptyWorkspaceSettingsHeader": "설정을 여기에 넣어서 사용자 설정을 덮어씁니다.",
-+	"emptyFolderSettingsHeader": "폴더 설정을 여기에 넣어서 작업 영역 설정을 덮어씁니다.",
-+	"defaultFolderSettingsTitle": "기본 폴더 설정",
-+	"defaultSettingsTitle": "기본 설정",
-+	"noSettingsFound": "설정을 찾을 수 없습니다.",
-+	"editTtile": "편집",
-+	"replaceDefaultValue": "설정에서 바꾸기",
-+	"copyDefaultValue": "설정에 복사",
-+	"unsupportedPHPExecutablePathSetting": "이 설정은 사용자 설정이어야 합니다. 작업 영역에 대해 PHP를 구성하려면 PHP 파일을 열고 상태 표시줄에서 'PHP 경로'를 클릭합니다.",
-+	"unsupportedWorkspaceSetting": "이 설정은 사용자 설정이어야 합니다.",
-+	"unsupportedWorkbenchSetting": "이 설정은 지금 적용할 수 없으며 이 폴더를 직접 열 경우에 적용됩니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f43ae31fedacdb1cdde2741f9342b50c5ab23e63 i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-  our    100644 503603410ea6bf6bdfe2187f4cb333a3f5a17aea i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-  their  100644 7c672264d394c998056ddc88e441cc7f6a8e7eae i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 a8bd67a28f391e840f7a35323a824c51031c0c11 i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 16b932871b29f61a36b73fbdf7e039c49a475ec1 i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -12,4 +13,13 @@
- 	"userSettings": "사용자 설정",
- 	"workspaceSettings": "작업 영역 설정",
- 	"folderSettings": "폴더 설정"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"folderSettingsDetails": "폴더 설정"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 4fe2fc0bfe27efd9c8cf6f65e729bd0f7acd8b85 i18n/kor/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  our    100644 112bca1e01f4036334cbaa730dc5d8a1af52991c i18n/kor/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  their  100644 f2e2d333694d65f7245ef777747cfbfae44c53be i18n/kor/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-@@ -8,5 +8,11 @@
- 	],
- 	"relaunchSettingMessage": "설정이 변경되어 다시 시작해야만 적용됩니다.",
- 	"relaunchSettingDetail": "[다시 시작] 단추를 눌러 {0}을(를) 다시 시작하고 설정을 사용하도록 설정하세요.",
-+<<<<<<< .our
- 	"restart": "다시 시작(&&R)"
-+=======
-+	"restart": "다시 시작",
-+	"relaunchWorkspaceMessage": "이 작업 영역을 변경하려면 확장 시스템을 다시 로드해야 합니다.",
-+	"reload": "다시 로드"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7d8570952628fe3c9bd773e5def704d7952be918 i18n/kor/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 071d294ccc8fe4437d151c87e9b3a4d19cd1a8d5 i18n/kor/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 d8c432f8bb004a012f1c3808074610d7cd6dc03b i18n/kor/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"nextSearchIncludePattern": "다음 검색 포함 패턴 표시",
- 	"previousSearchIncludePattern": "이전 검색 포함 패턴 표시",
- 	"nextSearchExcludePattern": "다음 검색 제외 패턴 표시",
-@@ -16,6 +19,8 @@
- 	"previousReplaceTerm": "이전 검색 대체어 표시",
- 	"findInFiles": "파일에서 찾기",
- 	"replaceInFiles": "파일에서 바꾸기",
-+	"findInWorkspace": "작업 영역에서 찾기...",
-+	"findInFolder": "폴더에서 찾기...",
- 	"RefreshAction.label": "새로 고침",
- 	"CollapseDeepestExpandedLevelAction.label": "모두 축소",
- 	"ClearSearchResultsAction.label": "지우기",
-changed in both
-  base   100644 4d21f25e146300f8b406b2915191ba0751c1a47f i18n/kor/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-  our    100644 51d183c82ffdf6c0811c8874f35fecd592ff5557 i18n/kor/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-  their  100644 2c8228cd8e4738400c20b314f1b789c06badb95b i18n/kor/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"searchFolderMatch.other.label": "다른 파일",
- 	"searchFileMatches": "{0}개 파일 찾음",
- 	"searchFileMatch": "{0}개 파일 찾음",
-changed in both
-  base   100644 c58a113000197959668c60b982d2413c3a00c534 i18n/kor/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  our    100644 c98e307c23bf5e868367c1bc97cd270b8e1c1303 i18n/kor/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  their  100644 483e9ae5d54191f6ccfac472a9a76ffe6e224f62 i18n/kor/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-changed in both
-  base   100644 e3482cdc4e3fb031e43e6acafe64f70326b658a9 i18n/kor/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 5dfbb2074f09c64c5ec03adc7d012b25c2bb9e72 i18n/kor/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 d17c30251b6c28821c5bd58bf2f3a0259e13c0cc i18n/kor/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-changed in both
-  base   100644 66187c94e82e2daf9911df95c32fedd949983ef7 i18n/kor/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 7b483f685d0f32a5b2eb20f1327a18475e2d29ae i18n/kor/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 7d8dc6c2c6abb52f1d0cb816c103c5d4238c5879 i18n/kor/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -12,8 +12,12 @@
- 	"totalWarnings": "경고 {0}개",
- 	"totalInfos": "정보 {0}개",
- 	"problems": "문제",
-+<<<<<<< .our
- 	"building": "빌드하고 있습니다...",
- 	"manyProblems": "10K+",
-+=======
-+	"manyMarkers": "99+",
-+>>>>>>> .their
- 	"runningTasks": "실행 중인 작업 표시",
- 	"tasks": "작업",
- 	"TaskSystem.noHotSwap": "실행 중인 활성 작업이 있는 작업 실행 엔진을 변경하면 Window를 다시 로드해야 합니다.",
-@@ -24,17 +28,25 @@
- 	"TaskService.noTestTask1": "정의된 테스트 작업이 없습니다. tasks.json 파일에서 작업을 'isTestCommand'로 표시하세요.",
- 	"TaskService.noTestTask2": "정의된 테스트 작업이 없습니다. tasks.json 파일에서 작업을 'test'로 표시하세요.",
- 	"TaskServer.noTask": "실행하도록 요청한 작업 {0}을(를) 찾을 수 없습니다.",
-+<<<<<<< .our
- 	"TaskService.associate": "연결",
-+=======
-+>>>>>>> .their
- 	"TaskService.attachProblemMatcher.continueWithout": "작업 출력을 스캔하지 않고 계속",
- 	"TaskService.attachProblemMatcher.never": "작업 출력 스캔 안 함",
- 	"TaskService.attachProblemMatcher.learnMoreAbout": "작업 출력 스캔에 대해 자세히 알아보기",
- 	"selectProblemMatcher": "작업 출력에서 스캔할 오류 및 경고 유형을 선택",
- 	"customizeParseErrors": "현재 작성 구성에 오류가 있습니다. 작업을 사용자 지정하기 전에 오류를 수정하세요.\n",
- 	"moreThanOneBuildTask": "tasks.json에 여러 빌드 작업이 정의되어 있습니다. 첫 번째 작업을 실행합니다.\n",
-+<<<<<<< .our
- 	"TaskSystem.activeSame.background": "'{0}' 작업이 이미 활성 상태이며 백그라운드 모드입니다.",
- 	"TaskSystem.activeSame.noBackground": "'{0}' 작업은 이미 활성 상태입니다.",
- 	"terminateTask": "작업 종료",
- 	"restartTask": "작업 다시 시작",
-+=======
-+	"TaskSystem.activeSame.background": "'{0}' 작업이 이미 활성 상태로 백그라운드 모드에 있습니다. 종료하려면 작업 메뉴에서 '작업 종료'를 사용하세요.",
-+	"TaskSystem.activeSame.noBackground": "'{0}' 작업이 이미 활성 상태입니다. 작업을 종료하려면 작업 메뉴에서 '작업 종료'를 사용하세요.",
-+>>>>>>> .their
- 	"TaskSystem.active": "이미 실행 중인 작업이 있습니다. 다른 작업을 실행하려면 먼저 이 작업을 종료하세요.",
- 	"TaskSystem.restartFailed": "{0} 작업을 종료하고 다시 시작하지 못했습니다.",
- 	"TaskService.noConfiguration": "오류: {0} 작업 검색에서는 다음 구성에 대한 작업을 제공하지 않습니다:\n{1}\n이 작업이 무시됩니다.\n",
-@@ -75,8 +87,13 @@
- 	"TaskService.pickDefaultBuildTask": "기본 빌드 작업으로 사용할 작업을 선택",
- 	"TaskService.defaultTestTaskExists": "{0}은(는) 이미 기본 테스트 작업으로 표시되어 있습니다.",
- 	"TaskService.pickDefaultTestTask": "기본 테스트 작업으로 사용할 작업 선택",
-+<<<<<<< .our
- 	"TaskService.pickShowTask": "출력을 표시할 작업 선택",
- 	"TaskService.noTaskIsRunning": "실행 중인 작업이 없습니다.",
-+=======
-+	"TaskService.noTaskIsRunning": "실행 중인 작업이 없습니다.",
-+	"TaskService.pickShowTask": "출력을 표시할 작업 선택",
-+>>>>>>> .their
- 	"ShowLogAction.label": "작업 로그 표시",
- 	"RunTaskAction.label": "작업 실행",
- 	"RestartTaskAction.label": "실행 중인 작업 다시 시작",
-changed in both
-  base   100644 840298c5adbc79c51df4aa33f24f8ba0e34af680 i18n/kor/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  our    100644 13963265fec1836212d41ecacb07eed5e173dace i18n/kor/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  their  100644 9b3adf8165e42882eec3540d79bab51d0950c445 i18n/kor/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  our    100644 ba7f34ebda0d6a112370fe91393ef138e8200a78 i18n/kor/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  their  100644 ae662c4eb21bdc5e35d869e2dedc61321bea3ca9 i18n/kor/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,6 +10,15 @@
- 	"termEntryAriaLabel": "{0}, 터미널 선택기",
- 	"termCreateEntryAriaLabel": "{0}, 새 터미널 만들기",
- 	"workbench.action.terminal.newplus": "$(plus) 새 통합 터미널 만들기",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"entryAriaLabel": "{0}, 터미널 선택기",
-+>>>>>>> .their
- 	"noTerminalsMatching": "일치하는 터미널 없음",
- 	"noTerminalsFound": "열린 터미널 없음"
- }
-\ No newline at end of file
-changed in both
-  base   100644 cd78dbfc40f81a698651c0c6471adbe21b2ce9f9 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 bc58bba26a36ca2c7cacec97bfa2f02daab82775 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 65227b7a9de823bfbbf960d5d116f74cbd5e1536 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,9 @@
- 	],
- 	"quickOpen.terminal": "모든 열려 있는 터미널 표시",
- 	"terminal": "터미널",
-+=======
-+	"quickOpen.terminal": "모든 열려 있는 터미널 표시",
-+>>>>>>> .their
- 	"terminalIntegratedConfigurationTitle": "통합 터미널",
- 	"terminal.integrated.shell.linux": "터미널이 Linux에서 사용하는 셸의 경로입니다.",
- 	"terminal.integrated.shellArgs.linux": "Linux 터미널에 있을 때 사용할 명령줄 인수입니다.",
-@@ -36,8 +40,12 @@
- 	"terminal.integrated.env.osx": "OS X의 터미널이 사용하는 VS Code 프로세스에 추가될 환경 변수를 포함한 개체",
- 	"terminal.integrated.env.linux": "Linux의 터미널에서 사용할 VS Code 프로세스에 추가되는 환경 변수를 포함한 개체",
- 	"terminal.integrated.env.windows": "Windows의 터미널에서 사용할 VS Code 프로세스에 추가되는 환경 변수를 포함한 개체",
-+<<<<<<< .our
- 	"terminal.integrated.showExitAlert": "종료 코드가 0이 아닌 경우 `터미널 프로세스가 종료 코드로 종료되었습니다` 경고를 표시합니다.",
- 	"terminal.integrated.experimentalRestore": "VS Code를 시작할 때 작업 영역에 대한 터미널 세션을 자동으로 복원할지 여부를 지정합니다. 이 설정은 실험적 설정이므로 버그가 있을 수 있고 향후 변경될 수 있습니다.",
-+=======
-+	"terminal": "터미널",
-+>>>>>>> .their
- 	"terminalCategory": "터미널",
- 	"viewCategory": "보기"
- }
-\ No newline at end of file
-changed in both
-  base   100644 601a8942d55fde212e2183a803d84a901360295c i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 0c53998d6e084853fcbcba0b56050a6d820a2b6f i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 493a37e9ad524ad5c29b7fc8001d8646438f71a6 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -14,8 +14,11 @@
- 	"workbench.action.terminal.selectAll": "모두 선택",
- 	"workbench.action.terminal.deleteWordLeft": "왼쪽 단어 삭제",
- 	"workbench.action.terminal.deleteWordRight": "오른쪽 단어 삭제",
-+<<<<<<< .our
- 	"workbench.action.terminal.moveToLineStart": "줄 시작으로 이동",
- 	"workbench.action.terminal.moveToLineEnd": "줄 끝으로 이동",
-+=======
-+>>>>>>> .their
- 	"workbench.action.terminal.new": "새 통합 터미널 만들기",
- 	"workbench.action.terminal.new.short": "새 터미널",
- 	"workbench.action.terminal.newWorkspacePlaceholder": "새 터미널의 현재 작업 디렉토리를 선택합니다.",
-@@ -51,6 +54,7 @@
- 	"workbench.action.terminal.rename.prompt": "터미널 이름 입력",
- 	"workbench.action.terminal.focusFindWidget": "파인드 위젯 포커스",
- 	"workbench.action.terminal.hideFindWidget": "파인드 위젯 숨기기",
-+<<<<<<< .our
- 	"nextTerminalFindTerm": "다음 검색어 표시",
- 	"previousTerminalFindTerm": "이전 검색어 표시",
- 	"quickOpenTerm": "활성 터미널 전환",
-@@ -60,4 +64,7 @@
- 	"workbench.action.terminal.selectToNextCommand": "다음 명령까지 선택",
- 	"workbench.action.terminal.selectToPreviousLine": "이전 줄까지 선택",
- 	"workbench.action.terminal.selectToNextLine": "다음 줄까지 선택"
-+=======
-+	"quickOpenTerm": "활성 터미널 스위치"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 5923a5bf7d5ca280848e6757c78142d7c96e7133 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 d9e00ba07827f3430d124e149c098a234044e854 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 23c1d36b14271b708b4fbe9288aa7ed1ea3d88e8 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -10,7 +10,11 @@
- 	"terminal.foreground": "터미널의 전경색입니다.",
- 	"terminalCursor.foreground": "터미널 커서의 전경색입니다.",
- 	"terminalCursor.background": "터미널 커서의 배경색입니다. 블록 커서와 겹친 문자의 색상을 사용자 정의할 수 있습니다.",
-+<<<<<<< .our
- 	"terminal.selectionBackground": "터미널의 선택 영역 배경색입니다.",
- 	"terminal.border": "터미널 내의 분할 창을 구분하는 테두리의 색입니다. 기본값은 panel.border입니다.",
- 	"terminal.ansiColor": "터미널의 '{0}' ANSI 색상"
-+=======
-+	"terminal.ansiColor": "터미널의 '{0}' ANSI 색입니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 13239987ba2032559fd83262eb133815dd0371db i18n/kor/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 46a0013cd0e5a09c5cae294dfef72bf6b6e0aeef i18n/kor/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 01154954d3d064564cba6969f85cf2862f9b0da9 i18n/kor/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -11,10 +11,16 @@
- 	"read the release notes": "{0} v{1}을(를) 시작합니다. 릴리스 정보를 확인하시겠습니까?",
- 	"licenseChanged": "사용 조건이 변경되었습니다. [여기]({0})를 클릭하여 자세히 읽어보세요.",
- 	"neveragain": "다시 표시 안 함",
-+<<<<<<< .our
- 	"64bitisavailable": "64비트 Windows용 {0}을(를) 사용할 수 있습니다. 자세히 알아보려면 [여기]({1})를 클릭하세요.",
- 	"updateIsReady": "새 {0} 업데이트를 사용할 수 있습니다.",
- 	"noUpdatesAvailable": "현재 사용할 수 있는 업데이트가 없습니다.",
- 	"ok": "확인",
-+=======
-+	"64bitisavailable": "Windows 64비트용 {0} 사용 가능!",
-+	"learn more": "자세한 정보",
-+	"updateIsReady": "새 {0} 업데이트를 사용할 수 있습니다.",
-+>>>>>>> .their
- 	"thereIsUpdateAvailable": "사용 가능한 업데이트가 있습니다.",
- 	"download now": "지금 다운로드",
- 	"later": "나중에",
-changed in both
-  base   100644 8d20ba83c9aa5bc71e82065b368d8f865db112c0 i18n/kor/src/vs/workbench/parts/views/browser/views.i18n.json
-  our    100644 126ed4fd56c3c81bf97ff2799ec1bff37c3acc79 i18n/kor/src/vs/workbench/parts/views/browser/views.i18n.json
-  their  100644 e69a54f9b4fd61c2741b41d08316dd308d8c8a12 i18n/kor/src/vs/workbench/parts/views/browser/views.i18n.json
-@@ -5,5 +5,9 @@
- // Do not edit this file. It is machine generated.
- {
- 	"viewToolbarAriaLabel": "{0} 동작",
-+<<<<<<< .our
- 	"hideView": "사이드바에서 숨기기"
-+=======
-+	"removeView": "undefined"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 20c6758ebabb324f0d24194f3ad95b5bcc8f9d89 i18n/kor/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-  our    100644 aa4def687d8bf40f210c2e8d34023643fb5542c6 i18n/kor/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-  their  100644 375f27f648352b99a3c3209e827586ffbba10dec i18n/kor/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-changed in both
-  base   100644 bea643cae15bf0ccb46fad7d323b1d02a70707b7 i18n/kor/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  our    100644 96b95e7ea94ff23a6df5c6c5dd518571602dc1c9 i18n/kor/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  their  100644 313ae9485ab2e641cb46cb010c23c173578f5692 i18n/kor/src/vs/workbench/services/configuration/node/configuration.i18n.json
-@@ -9,6 +9,7 @@
- 	"scope.window.description": "[사용자] 설정 또는 [작업 영역] 설정에서 구성할 수 있는 창 특정 구성입니다.",
- 	"scope.resource.description": "사용자, 작업 영역 또는 폴더 설정에서 구성할 수 있는 리소스 특정 구성",
- 	"scope.description": "구성이 적용되는 범위입니다. 사용 가능 범위는 '창'과 '리소스'입니다.",
-+<<<<<<< .our
- 	"vscode.extension.contributes.configuration": "구성 설정을 적용합니다.",
- 	"invalid.title": "'configuration.title'은 문자열이어야 합니다.",
- 	"vscode.extension.contributes.defaultConfiguration": "언어별로 기본 편집기 구성 설정을 적용합니다.",
-@@ -21,4 +22,13 @@
- 	"workspaceConfig.settings.description": "작업 영역 설정",
- 	"workspaceConfig.extensions.description": "작업 영역 확장",
- 	"unknownWorkspaceProperty": "알 수 없는 작업 영역 구성 속성"
-+=======
-+	"invalid.type": "설정된 경우 'configuration.type'을 '개체'로 설정해야 합니다.",
-+	"invalid.title": "'configuration.title'은 문자열이어야 합니다.",
-+	"vscode.extension.contributes.defaultConfiguration": "언어별로 기본 편집기 구성 설정을 적용합니다.",
-+	"invalid.properties": "'configuration.properties'는 개체여야 합니다.",
-+	"workspaceConfig.id.description": "작업 영역 식별자입니다. 변경 시 소실될 수 있는 내부 작업 영역 상태를 저장하는 데 사용됩니다.",
-+	"workspaceConfig.folders.description": "작업 영역에 로드할 폴더 목록입니다. 파일 경로를 사용해야 합니다. 예: `file:///root/folderA`",
-+	"workspaceConfig.settings.description": "작업 영역 설정"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 77aa3c54a2973cf078758f4a60476a7dbce13855 i18n/kor/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 e81a8a242fb847453d5e2339de27eb2791e53868 i18n/kor/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 0b398bf4e1f24311af817ff4c298b50aed23341c i18n/kor/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -9,6 +9,7 @@
- 	"openTasksConfiguration": "작업 구성 열기",
- 	"openLaunchConfiguration": "시작 구성 열기",
- 	"open": "설정 열기",
-+<<<<<<< .our
- 	"saveAndRetry": "저장 및 다시 시도",
- 	"errorUnknownKey": "{1}은(는) 등록된 구성이 아니므로 {0}에 쓸 수 없습니다.",
- 	"errorInvalidWorkspaceConfigurationApplication": "{0}을(를) [작업 영역] 설정에 쓸 수 없습니다. 이 설정은 [사용자] 설정에만 쓸 수 있습니다.",
-@@ -27,6 +28,19 @@
- 	"errorConfigurationFileDirty": "사용자 설정 파일이 변경되어 사용자 설정에 쓸 수 없습니다. 먼저 사용자 설정 파일을 저장하고 다시 시도하세요.",
- 	"errorConfigurationFileDirtyWorkspace": "작업 영역 설정 파일이 변경되어 작업 영역 설정에 쓸 수 없습니다. 먼저 작업 영역 설정 파일을 저장하고 다시 시도하세요.",
- 	"errorConfigurationFileDirtyFolder": "폴더 설정 파일이 변경되어 폴더 설정에 쓸 수 없습니다. 먼저 '{0}' 폴더 설정 파일을 저장하고 다시 시도하세요.",
-+=======
-+	"close": "닫기",
-+	"saveAndRetry": "설정 저장 및 다시 시도",
-+	"errorUnknownKey": "{1}은(는) 등록된 구성이 아니므로 {0}에 쓸 수 없습니다.",
-+	"errorInvalidFolderConfiguration": "{0}이(가) 폴더 리소스 범위를 지원하지 않으므로 폴더 설정에 쓸 수 없습니다.",
-+	"errorInvalidUserTarget": "{0}이(가) 글로벌 범위를 지원하지 않으므로 사용자 설정에 쓸 수 없습니다.",
-+	"errorInvalidFolderTarget": "리소스가 제공되지 않으므로 폴더 설정에 쓸 수 없습니다.",
-+	"errorNoWorkspaceOpened": "작업 영역이 열려 있지 않으므로 {0}에 쓸 수 없습니다. 먼저 작업 영역을 열고 다시 시도하세요.",
-+	"errorInvalidConfiguration": "설정에 쓸 수 없습니다. **사용자 설정**을 열어 파일에서 오류/경고를 해결하고 다시 시도하세요.",
-+	"errorInvalidConfigurationWorkspace": "설정에 쓸 수 없습니다. **작업 영역 설정**을 열어 파일에서 오류/경고를 해결하고 다시 시도하세요.",
-+	"errorConfigurationFileDirty": "파일이 변경되어 설정에 쓸 수 없습니다. **사용자 설정** 파일을 저장하고 다시 시도하세요.",
-+	"errorConfigurationFileDirtyWorkspace": "파일이 변경되어 설정에 쓸 수 없습니다. **작업 영역 설정** 파일을 저장하고 다시 시도하세요.",
-+>>>>>>> .their
- 	"userTarget": "사용자 설정",
- 	"workspaceTarget": "작업 영역 설정",
- 	"folderTarget": "폴더 설정"
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-  our    100644 58f3403ef49b8254c1c26be159dc56a98ee11db1 i18n/kor/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-  their  100644 72bc3a9126b24a8c7aeceef0fd6541f7604a65d0 i18n/kor/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"errorInvalidFile": "파일에 쓸 수 없습니다. 파일을 열어 오류/경고를 수정한 후 다시 시도하세요.",
- 	"errorFileDirty": "파일이 오염되어 파일에 쓸 수 없습니다. 파일을 저장하고 다시 시도하세요."
- }
-\ No newline at end of file
-changed in both
-  base   100644 a617486e76e99ecf97ccaaf3b946728ccfda5a46 i18n/kor/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 d97177c41e4a5031dad60cb0cfff30a1e2f28fd5 i18n/kor/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 22287eb2a6df047e1bc7b9a4f076d6b8d2165563 i18n/kor/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-@@ -13,6 +13,7 @@
- 	"noIconThemeDesc": "No file icons",
- 	"iconThemeError": "File icon theme is unknown or not installed.",
- 	"workbenchColors": "현재 선택한 색 테마에서 색을 재정의합니다.",
-+<<<<<<< .our
- 	"editorColors.comments": "주석의 색 및 스타일을 설정합니다.",
- 	"editorColors.strings": "문자열 리터럴의 색 및 스타일을 설정합니다.",
- 	"editorColors.keywords": "키워드의 색과 스타일을 설정합니다.",
-@@ -21,5 +22,9 @@
- 	"editorColors.functions": "함수 선언 및 참조의 색 및 스타일을 설정합니다.",
- 	"editorColors.variables": "변수 선언 및 참조의 색 및 스타일을 설정합니다.",
- 	"editorColors.textMateRules": "textmate 테마 설정 규칙을 사용하여 색 및 스타일을 설정합니다(고급).",
-+=======
-+	"workbenchColors.deprecated": "이 설정은 더 이상 실험적 설정이 아니며 이름이\n 'workbench.colorCustomizations'로 변경되었습니다.",
-+	"workbenchColors.deprecatedDescription": "대신 'workbench.colorCustomizations'를 사용합니다.",
-+>>>>>>> .their
- 	"editorColors": "현재 선택된 색 테마에서 편집기 색상과 글꼴 스타일을 재정의합니다."
- }
-\ No newline at end of file
-changed in both
-  base   100644 d1d286c6e2efd6e81cd2355940b882450a8f9005 i18n/ptb/extensions/emmet/package.i18n.json
-  our    100644 bd44dd5d5523e2a5800a445af385bb5a762f2233 i18n/ptb/extensions/emmet/package.i18n.json
-  their  100644 c2b4e23150909c43c73ba8dbfd97721c1bc76fe0 i18n/ptb/extensions/emmet/package.i18n.json
-@@ -31,6 +31,7 @@
- 	"command.incrementNumberByTen": "Incremento de 10",
- 	"command.decrementNumberByTen": "Decrementar por 10",
- 	"emmetSyntaxProfiles": "Definir o perfil para a sintaxe especificada ou usar seu próprio perfil com regras específicas.",
-+<<<<<<< .our
- 	"emmetExclude": "Uma matriz de línguas onde abreviaturas Emmet não devem ser expandidas.",
- 	"emmetExtensionsPath": "Caminho para uma pasta que contém os perfis Emmet e trechos de códigos.'",
- 	"emmetShowExpandedAbbreviation": "Mostrar abreviaturas Emmet expandidas como sugestões.\nA opção \"inMarkupAndStylesheetFilesOnly\" aplica-se a html, haml, jade, slim, xml, xsl, css, scss, sass, less e stylus.\nA opção \"always\" se aplica a todas as partes do arquivo independentemente de marcação/css.",
-@@ -62,4 +63,12 @@
- 	"emmetPreferencesCssMsProperties": "Propriedades CSS separadas por vírgula que recebem o prefixo vendor 'ms' quando utilizado em abreviações do Emmet que iniciam com `-`. Defina como string vazia para sempre evitar o prefixo 'ms'.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "A pontuação mínima (de 0 a 1) que a abreviação difusa deve alcançar. Os valores mais baixos podem produzir muitas correspondências falso-positivas, valores mais elevados podem reduzir possíveis correspondências.\n",
- 	"emmetOptimizeStylesheetParsing": "Quando definido como false, o arquivo inteiro é analisado para determinar se a posição atual é válida para expandir as abreviações Emmet. Quando definido como true, somente o conteúdo em torno da posição atual em arquivos css / scss / less é analisado."
-+=======
-+	"emmetExclude": "Uma matriz de línguagens onde abreviaturas emmet não devem ser expandidas.",
-+	"emmetExtensionsPath": "Caminho para uma pasta que contém perfis de emmet, trechos de código e preferências. Somente perfis são honrados do caminho de extensões quando emmet.useNewEmmet estiver definida como true.'",
-+	"emmetShowExpandedAbbreviation": "Mostra abreviaturas emmet expandidas como sugestões.\nA opção \"inMarkupAndStylesheetFilesOnly\" aplica-se a html, haml, jade, slim, xml, xsl, css, scss, sass, less e stylus.\nA opção \"always\" se aplica a todas as partes do arquivo independentemente de marcação/css.",
-+	"emmetShowAbbreviationSuggestions": "Mostra possíveis abreviaturas emmet como sugestões. Não aplicável em folhas de estilo ou quando emmet.showExpandedAbbreviation é definido como \"nunca\".",
-+	"emmetIncludeLanguages": "Habilita as abreviaturas do emmet em idiomas que não são suportados por padrão. Adicione um mapeamento aqui entre a linguagem e a linguagem emmet suportada.\n Por exemplo: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
-+	"emmetVariables": "Variáveis a serem usadas em trechos de código emmet"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 0fee06973c8b08e341e6dba8f3cc4dd139762867 i18n/ptb/extensions/extension-editing/out/extensionLinter.i18n.json
-  our    100644 514199b2eb4c7a7235895cc4faec19c4b4eaf681 i18n/ptb/extensions/extension-editing/out/extensionLinter.i18n.json
-  their  100644 4a35721116819d493772e604e862f37ce0f23432 i18n/ptb/extensions/extension-editing/out/extensionLinter.i18n.json
-changed in both
-  base   100644 d6108586df8b1ff6fab7bb0bd9ee68e2c4d537ac i18n/ptb/src/vs/base/common/jsonErrorMessages.i18n.json
-  our    100644 c0df2b99ce98bcdadd04ed9815b0b3354d2593a0 i18n/ptb/src/vs/base/common/jsonErrorMessages.i18n.json
-  their  100644 97f0770c0dc0bf45300d512dde96b3c4542b9313 i18n/ptb/src/vs/base/common/jsonErrorMessages.i18n.json
-changed in both
-  base   100644 bf2baf839060849cf84c714ebc9b91e51da423d5 i18n/ptb/src/vs/base/common/keybindingLabels.i18n.json
-  our    100644 88f9db8bef58f10b607d709254accc21c89d65f4 i18n/ptb/src/vs/base/common/keybindingLabels.i18n.json
-  their  100644 5977a200f222330634394fc1a23c8c900a9f02a5 i18n/ptb/src/vs/base/common/keybindingLabels.i18n.json
-changed in both
-  base   100644 40b318ab1590a72883d114b8fbf4ce164a3732b7 i18n/ptb/src/vs/editor/browser/widget/diffReview.i18n.json
-  our    100644 073825f3f56385bac2c761870572d0a8ac4ead8a i18n/ptb/src/vs/editor/browser/widget/diffReview.i18n.json
-  their  100644 d7c36424974ded8bf7df532b5fff62b52494f4d8 i18n/ptb/src/vs/editor/browser/widget/diffReview.i18n.json
-@@ -7,7 +7,11 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"label.close": "Fechar",
-+<<<<<<< .our
- 	"more_lines": "{0} linhas",
-+=======
-+	"header": "Diferença {0} de {1}: original {2}, {3} linhas, modificado {4}, {5} linhas",
-+>>>>>>> .their
- 	"blankLine": "branco",
- 	"equalLine": "original {0}, modificados {1}: {2}",
- 	"insertLine": "+ modificado {0}: {1}",
-merged
-  result 100644 ddbbf126107e57f761e09aaf2d8f86d0b4b5ec08 i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-  our    100644 5188de485d31a72dc0c31c63995e7efed14f0e1c i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-@@ -7,8 +7,5 @@
- 	"emmetConfigurationTitle": "Emmet",
- 	"triggerExpansionOnTab": "Quando habilitado, abreviações emmet são expandidas ao pressionar TAB. Não aplicável quando emmet.useNewemmet é definido como true.",
- 	"emmetPreferences": "Preferências usadas para modificar o comportamento de algumas ações e resolvedores do Emmet. Não aplicável quando emmet.useNewemmet é definido como true.",
--	"emmetSyntaxProfiles": "Definir o perfil para a sintaxe especificada ou usar seu próprio perfil com regras específicas.",
--	"emmetExclude": "Uma matriz de línguagens onde abreviaturas emmet não devem ser expandidas.",
--	"emmetExtensionsPath": "Caminho para uma pasta que contém perfis emmet, trechos e preferências. Somente perfis são honrados do caminho das extensões quando emmet.useNewEmmet estiver definida como true.",
- 	"useNewEmmet": "Experimente os novos módulos emmet (que irão substituir a antiga biblioteca unica emmet) para todos os recursos emmet."
- }
-\ No newline at end of file
-changed in both
-  base   100644 ccc14607143248b7d8b729eb6cc57076a87003b1 i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 d9d0d18805d748d7acf0de5557a30b4d38564784 i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 1b5d84180e9fcd1f62cac06acc0bed3c07410ca8 i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -13,5 +13,12 @@
- 	"newExtensionLabel": "Mostrar Extensão \"{0}\"",
- 	"editTtile": "Editar",
- 	"replaceDefaultValue": "Substituir nas Configurações",
-+<<<<<<< .our
- 	"copyDefaultValue": "Copiar para Configurações"
-+=======
-+	"copyDefaultValue": "Copiar para Configurações",
-+	"unsupportedPHPExecutablePathSetting": "Essa configuração deve ser uma Configuração de Usuário. Para configurar o PHP para o espaço de trabalho, abra um arquivo PHP e clique em 'Caminho do PHP' na barra de status.",
-+	"unsupportedWorkspaceSetting": "Essa configuração deve ser uma Configuração de Usuário.",
-+	"unsupportedWorkbenchSetting": "Essa configuração não pode ser aplicada agora. Será aplicada quando você abrir esta pasta diretamente."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 1d50c0f64642a61065bdca90b0fe65d05149a534 i18n/ptb/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  our    100644 b3ae68185057b9a794fe9aa335e3a999986822bc i18n/ptb/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  their  100644 104a0a6044a868d25cafefd1b2a63b8b00c2c952 i18n/ptb/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-changed in both
-  base   100644 f46966dd22540bf3c8ae911a39bab3e7afceee0e i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 a7fcbfe8b12598411b8516f57bb30b642834b0bc i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 e247ed12a3dfcb681cd73cf9e672caccbf3c2536 i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-changed in both
-  base   100644 26e13bbf486aaaf40fef4db6513dd7f5bdbb0e2d i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 5844af8cc38149dcfa5ec9e4de0ec76188e00645 i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 8639fd536408851bb9643216d553868d5a975c90 i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -49,7 +49,11 @@
- 	"workbench.action.terminal.rename.prompt": "Digite o nome do terminal",
- 	"workbench.action.terminal.focusFindWidget": "Focalizar Ferramenta de Pesquisa",
- 	"workbench.action.terminal.hideFindWidget": "Ocultar Ferramenta de Pesquisa",
-+<<<<<<< .our
- 	"nextTerminalFindTerm": "Mostrar Próximo Termo de Busca",
- 	"previousTerminalFindTerm": "Mostrar Termo de Busca Anterior",
- 	"quickOpenTerm": "Alternar o Terminal Ativo"
-+=======
-+	"quickOpenTerm": "Trocar o terminal ativo"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7655014ffc05ddbcbcd88effd5fd3f271d1d36ed i18n/ptb/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  our    100644 2cd5ff9947ee5fd942a87c7aaf5c1c28e906b412 i18n/ptb/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  their  100644 532ff1837b5eb51b90e4e0035d202b46103b77df i18n/ptb/src/vs/workbench/services/configuration/node/configuration.i18n.json
-@@ -9,7 +9,11 @@
- 	"scope.window.description": "Janela de configuração específica que pode ser configurada nas configurações do usuário ou área de trabalho.",
- 	"scope.resource.description": "Configuração específica do recurso que pode ser configurada nas configurações do usuário, espaço de trabalho ou pasta.",
- 	"scope.description": "Escopo em que a configuração é aplicável. Escopos disponíveis são 'janela' e 'recurso'.",
-+<<<<<<< .our
- 	"vscode.extension.contributes.configuration": "Contribui às definições de configuração.",
-+=======
-+	"invalid.type": "Se definido, 'configuration.type' deve ser do tipo 'object'",
-+>>>>>>> .their
- 	"invalid.title": "'configuration.title' deve ser um string",
- 	"vscode.extension.contributes.defaultConfiguration": "Contribui às definições de configuração padrão do editor por linguagem.",
- 	"invalid.properties": "'configuration.properties' deve ser um objeto",
-changed in both
-  base   100644 21d2a812bb910811a7286d88c2b4dd0e7f27be2b i18n/ptb/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 68215b632ce90bcb7b46b0cefec04b9e2085133e i18n/ptb/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 22f5d117a1ad95ffde93d1a9b6688c08010f8ae8 i18n/ptb/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -9,6 +9,7 @@
- 	"openTasksConfiguration": "Abrir Configuração de Tarefas",
- 	"openLaunchConfiguration": "Abrir Configuração de Execução",
- 	"open": "Abrir configurações",
-+<<<<<<< .our
- 	"saveAndRetry": "Salvar e tentar novamente",
- 	"errorUnknownKey": "Não é possível gravar {0} porque {1} não é uma configuração registrada.",
- 	"errorInvalidFolderConfiguration": "Não é possível gravar as configurações da pasta porque {0} não suporta o escopo de recurso de pasta.",
-@@ -21,6 +22,19 @@
- 	"errorInvalidConfiguration": "Não é possível escrever nas configurações do usuário. Por favor, abra as configurações do usuário para corrigir erros/avisos e tente novamente.",
- 	"errorInvalidConfigurationWorkspace": "Não é possível escrever nas configurações do espaço de trabalho. Por favor, abra as configurações do espaço de trabalho para corrigir erros/avisos no arquivo e tente novamente.",
- 	"errorInvalidConfigurationFolder": "Não é possível escrever nas configurações de pasta. Por favor, abra as configurações da pasta '{0}' para corrigir erros/avisos e tente novamente.",
-+=======
-+	"close": "Fechar",
-+	"saveAndRetry": "Salvar as configurações e tentar novamente",
-+	"errorUnknownKey": "Não é possível gravar {0} porque {1} não é uma configuração registrada.",
-+	"errorInvalidFolderConfiguration": "Não é possível gravar as configurações da pasta porque {0} não suporta o escopo de recurso de pasta.",
-+	"errorInvalidUserTarget": "Não é possível gravar as configurações do usuário porque {0} não oferece suporte para o escopo global.",
-+	"errorInvalidFolderTarget": "Não é possível gravar as configurações da pasta porque nenhum recurso é fornecido.",
-+	"errorNoWorkspaceOpened": "Não é possível gravar {0} porque nenhum espaço de trabalho está aberto. Por favor, abra um espaço de trabalho primeiro e tente novamente.",
-+	"errorInvalidConfiguration": "Não é possível gravar em configurações. Por favor abra **User Settings** para corrigir erros/avisos no arquivo e tente novamente.",
-+	"errorInvalidConfigurationWorkspace": "Não é possível gravar em configurações. Por favor abra **Workspace Settings** para corrigir erros/avisos no arquivo e tente novamente.",
-+	"errorConfigurationFileDirty": "Não é possível gravar em configurações, porque o arquivo foi alterado. Por favor, salve o arquivo **User Settings** e tente novamente.",
-+	"errorConfigurationFileDirtyWorkspace": "Não é possível gravar em configurações, porque o arquivo foi alterado. Por favor, salve o arquivo **Workspace Settings** e tente novamente.",
-+>>>>>>> .their
- 	"userTarget": "Configurações de Usuário",
- 	"workspaceTarget": "Configurações de Espaço de Trabalho",
- 	"folderTarget": "Configurações de pasta"
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/extensions/emmet/package.i18n.json
-  our    100644 e8a08df3b0fb514f0bab0b0d555c900a23a3deca i18n/rus/extensions/emmet/package.i18n.json
-  their  100644 1f986e96f3c7dc10eb4c3bb4db861f73d73f461a i18n/rus/extensions/emmet/package.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,6 +10,14 @@
- 	"description": "Поддержка Emmet для VS Code",
- 	"command.wrapWithAbbreviation": "Перенести с сокращением",
- 	"command.wrapIndividualLinesWithAbbreviation": "Перенести отдельные строки с сокращением",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"command.removeTag": "Удалить тег",
- 	"command.updateTag": "Обновить тег",
- 	"command.matchTag": "Перейти к соответствующей паре",
-@@ -32,6 +41,7 @@
- 	"command.decrementNumberByTen": "Уменьшить значение на 10",
- 	"emmetSyntaxProfiles": "Задайте профиль для указанного синтаксиса или используйте свой собственный профиль с определенными правилами.",
- 	"emmetExclude": "Массив языков, в которых не должны развертываться сокращения Emmet.",
-+<<<<<<< .our
- 	"emmetExtensionsPath": "Путь к папке, содержащей профили Emmet и фрагменты кода.",
- 	"emmetShowExpandedAbbreviation": "Отображает развернутые сокращения Emmet в виде предложений.\nПараметр \"inMarkupAndStylesheetFilesOnly\" применяется к html, haml, jade, slim, xml, xsl, css, scss, sass, less и stylus .\nПараметр \"always\" применяется ко всем частям файла независимо от разметки и стилей.",
- 	"emmetShowAbbreviationSuggestions": "Отображает возможные сокращения Emmet в виде предложений. Не применяется в таблицах стилей или если параметр emmet.showExpandedAbbreviation имеет значение \"never\".",
-@@ -62,4 +72,11 @@
- 	"emmetPreferencesCssMsProperties": "Разделенный запятыми список свойств CSS, которые получают префикс разработчика \"ms\" при использовании в сокращениях Emmet, которые начинаются с \"-\". Чтобы префикс \"ms\" никогда не подставлялся, установите в качестве этого параметра пустое значение. ",
- 	"emmetPreferencesCssFuzzySearchMinScore": "Минимальное количество очков для нечеткого соответствия сокращения (от 0 до 1). При указании более низких значений возможно увеличение числа ложных срабатываний, при указании более высоких значений - уменьшение числа возможных соответствий.",
- 	"emmetOptimizeStylesheetParsing": "Если значение равно false, весь файл анализируется для определения, является ли текущая позиция допустимой для расширения сокращений Emmet. Когда присвоено значение true, только содержимое вокруг текущей позиции в файлах css/scss/less подвергается синтаксическому анализу."
-+=======
-+	"emmetExtensionsPath": "Путь к папке, содержащей профили Emmet, фрагменты кода и настройки. Если параметр emmet.useNewemmet имеет значение 'true', используются только профили для путей расширения.",
-+	"emmetShowExpandedAbbreviation": "Отображает развернутые сокращения Emmet в виде предложений.\nПараметр \"inMarkupAndStylesheetFilesOnly\" применяется к html, haml, jade, slim, xml, xsl, css, scss, sass, less и stylus .\nПараметр \"always\" применяется ко всем частям файла независимо от разметки и стилей.",
-+	"emmetShowAbbreviationSuggestions": "Отображает возможные сокращения Emmet в виде предложений. Не применяется в таблицах стилей или если параметр emmet.showExpandedAbbreviation имеет значение \"never\".",
-+	"emmetIncludeLanguages": "Включает сокращения Emmet в языках, которые не поддерживаются по умолчанию. Здесь можно указать связь между не поддерживаемым и поддерживаемым языками.\nПример: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
-+	"emmetVariables": "Переменные, которые будут использоваться во фрагментах Emmet"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 cde1c4fa500de7444ac2dc9c80cf9300b2d22797 i18n/rus/extensions/extension-editing/out/extensionLinter.i18n.json
-  our    100644 da9798c314288e14352137e37ea372181d1b3348 i18n/rus/extensions/extension-editing/out/extensionLinter.i18n.json
-  their  100644 44fb90bb411cbf48ac7d42915161328d6533cc5f i18n/rus/extensions/extension-editing/out/extensionLinter.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/extensions/markdown/out/previewContentProvider.i18n.json
-  our    100644 62ff186c85837f620059565d6a81b3be9d408585 i18n/rus/extensions/markdown/out/previewContentProvider.i18n.json
-  their  100644 2b920d1ba956934baf37b83952dd26f593a19595 i18n/rus/extensions/markdown/out/previewContentProvider.i18n.json
-@@ -4,7 +4,11 @@
-  *--------------------------------------------------------------------------------------------*/
- // Do not edit this file. It is machine generated.
- {
-+<<<<<<< .our
- 	"preview.securityMessage.text": "Некоторое содержимое в этом документе было отключено",
-+=======
-+	"preview.securityMessage.text": "Некоторое содержимое этого документа было отключено",
-+>>>>>>> .their
- 	"preview.securityMessage.title": "В предварительном просмотре Markdown было отключено потенциально опасное или ненадежное содержимое. Чтобы разрешить ненадежное содержимое или включить сценарии, измените параметры безопасности предварительного просмотра Markdown.",
- 	"preview.securityMessage.label": "Предупреждение безопасности об отключении содержимого"
- }
-\ No newline at end of file
-changed in both
-  base   100644 9dff589ebb976aaa3b243624b1ecd57c7c4f8860 i18n/rus/extensions/markdown/out/security.i18n.json
-  our    100644 e57fedc24d6225bfff89936b87ebe3ea901f606d i18n/rus/extensions/markdown/out/security.i18n.json
-  their  100644 05e72a6effff012512105afd2b335922725da3a9 i18n/rus/extensions/markdown/out/security.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -16,5 +17,11 @@
- 	"enableSecurityWarning.title": "Включить предварительный просмотр предупреждений системы безопасности в этой рабочей области",
- 	"disableSecurityWarning.title": "Отключить предварительный просмотр предупреждений системы безопасности в этой рабочей области",
- 	"toggleSecurityWarning.description": "Не влияет на уровень безопасности содержимого",
-+=======
-+	"preview.showPreviewSecuritySelector.strictTitle": "Строгий режим. Загружается только безопасное содержимое.",
-+	"preview.showPreviewSecuritySelector.currentSelection": "Текущий параметр",
-+	"preview.showPreviewSecuritySelector.insecureContentTitle": "Разрешить загрузку содержимого по протоколу http.",
-+	"preview.showPreviewSecuritySelector.scriptsAndAllContent": "Разрешить все содержимое и выполнение скриптов. Не рекомендуется.",
-+>>>>>>> .their
- 	"preview.showPreviewSecuritySelector.title": "Установите параметры безопасности для предварительного просмотра Markdown в этой рабочей области"
- }
-\ No newline at end of file
-changed in both
-  base   100644 48afb646815e1ccf0052b9e63568107aef4dd3b9 i18n/rus/extensions/npm/package.i18n.json
-  our    100644 8d7baa6e0dc033bbe07eab95362f11ea8ace26f2 i18n/rus/extensions/npm/package.i18n.json
-  their  100644 f10d56b2585874f5dacc2666bc98465a6405aff1 i18n/rus/extensions/npm/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -23,4 +24,8 @@
- 	"command.debug": "Отладка",
- 	"command.openScript": "Открыть",
- 	"command.runInstall": "Запустить установку"
-+=======
-+	"config.npm.autoDetect": "Включает или отключает автоматическое определение сценариев npm. Значение по умолчанию — \"включено\".",
-+	"config.npm.runSilent": "Запускать команды npm с параметром `--silent`"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/extensions/typescript/out/features/taskProvider.i18n.json
-  our    100644 a641634e0773b483755ba4ae179e64a5b993d228 i18n/rus/extensions/typescript/out/features/taskProvider.i18n.json
-  their  100644 0bc8e72f9ce11014857cd5fce2bcecb8d48528de i18n/rus/extensions/typescript/out/features/taskProvider.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,14 @@
- 	],
- 	"buildTscLabel": "сборка – {0}",
- 	"buildAndWatchTscLabel": "отслеживание – {0}"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"buildAndWatchTscLabel": "отслеживание – {0}",
-+	"buildTscLabel": "сборка – {0}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/src/vs/code/electron-main/auth.i18n.json
-  our    100644 ba63a0fa3197bd99d8b447ee3e1c9f01d486efe3 i18n/rus/src/vs/code/electron-main/auth.i18n.json
-  their  100644 a419dfadc51880e12e441e87eedcd2b34636913a i18n/rus/src/vs/code/electron-main/auth.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"authRequire": "Требуется проверка подлинности прокси-сервера",
- 	"proxyauth": "Прокси-сервер {0} требует проверки подлинности."
- }
-\ No newline at end of file
-changed in both
-  base   100644 82539b857e7062cd899366b02610d2fcfdbad862 i18n/rus/src/vs/code/electron-main/menus.i18n.json
-  our    100644 6c6420ff3fff2721736f81d703d8eb2e0907f38c i18n/rus/src/vs/code/electron-main/menus.i18n.json
-  their  100644 0893851333b47ccc649331a5106734a4036ba474 i18n/rus/src/vs/code/electron-main/menus.i18n.json
-@@ -24,12 +24,21 @@
- 	"miQuit": "Выйти из {0}",
- 	"miNewFile": "&&Новый файл",
- 	"miOpen": "Открыть...",
-+<<<<<<< .our
- 	"miOpenWorkspace": "Открыть рабочую &&область...",
- 	"miOpenFolder": "Открыть &&папку...",
- 	"miOpenFile": "&&Открыть файл...",
- 	"miOpenRecent": "Открыть &&последние",
- 	"miSaveWorkspaceAs": "Сохранить рабочую область как...",
- 	"miAddFolderToWorkspace": "Доб&&авить папку в рабочую область...",
-+=======
-+	"miOpenWorkspace": "&&Открыть рабочую область...",
-+	"miOpenFolder": "Открыть &&папку...",
-+	"miOpenFile": "&&Открыть файл...",
-+	"miOpenRecent": "Открыть &&последние",
-+	"miSaveWorkspaceAs": "&&Сохранить рабочую область как...",
-+	"miAddFolderToWorkspace": "&& Добавить папку в рабочую область...",
-+>>>>>>> .their
- 	"miSave": "Сохранить",
- 	"miSaveAs": "Сохранить &&как...",
- 	"miSaveAll": "Сохранить &&все",
-@@ -189,5 +198,11 @@
- 	"miDownloadingUpdate": "Скачивается обновление...",
- 	"miInstallUpdate": "Установить обновление...",
- 	"miInstallingUpdate": "Идет установка обновления...",
-+<<<<<<< .our
- 	"miRestartToUpdate": "Перезапустить программу для обновления..."
-+=======
-+	"miCheckForUpdates": "Проверить наличие обновлений...",
-+	"aboutDetail": "\nВерсия {0}\nФиксация {1}\nДата {2}\nОблочка {3}\nОтрисовщик {4}\nУзел {5}\nАрхитектура {6}",
-+	"okButton": "ОК"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 56a590f35d91ee319c1d44673a7f103e2117f039 i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 66cf48db0f575d6b4f93e4e908a24029fed35a72 i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 898de20dd06175ce0b572b0920c73706736fd9d0 i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json
-changed in both
-  base   100644 fbe127a6eb426f71c59661ec15b8664928a5673b i18n/rus/src/vs/editor/contrib/find/common/findController.i18n.json
-  our    100644 5c6f87afd29e3d4a26efcc3d50060548fd13d051 i18n/rus/src/vs/editor/contrib/find/common/findController.i18n.json
-  their  100644 5cbc15bce8a5b49ebd16d0dcc2664925a6a7e1ed i18n/rus/src/vs/editor/contrib/find/common/findController.i18n.json
-@@ -10,6 +10,15 @@
- 	"nextSelectionMatchFindAction": "Найти следующее выделение",
- 	"previousSelectionMatchFindAction": "Найти предыдущее выделение",
- 	"startReplace": "Заменить",
-+<<<<<<< .our
-+=======
-+	"addSelectionToNextFindMatch": "Добавить выделение в следующее найденное совпадение",
-+	"addSelectionToPreviousFindMatch": "Добавить выделенный фрагмент в предыдущее найденное совпадение",
-+	"moveSelectionToNextFindMatch": "Переместить последнее выделение в следующее найденное совпадение",
-+	"moveSelectionToPreviousFindMatch": "Переместить последний выделенный фрагмент в предыдущее найденное совпадение",
-+	"selectAllOccurrencesOfFindMatch": "Выбрать все вхождения найденных совпадений",
-+	"changeAll.label": "Изменить все вхождения",
-+>>>>>>> .their
- 	"showNextFindTermAction": "Показать следующий найденный термин",
- 	"showPreviousFindTermAction": "Показать предыдущий найденный термин"
- }
-\ No newline at end of file
-changed in both
-  base   100644 1281d5e53dc338f3eb64c0e6846ec51026e8873e i18n/rus/src/vs/platform/history/electron-main/historyMainService.i18n.json
-  our    100644 4930aa8449c8b9acfaa97602ebba3b187b1531b6 i18n/rus/src/vs/platform/history/electron-main/historyMainService.i18n.json
-  their  100644 891764b5aeeaed458c29eae9e33ce67394537f05 i18n/rus/src/vs/platform/history/electron-main/historyMainService.i18n.json
-changed in both
-  base   100644 bf1ce6c7711be9d5f247d285debcab01f8d5500a i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 a203da5726ce360e6e4c7bd4be5cee05446e8ca5 i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 5793df0ed50928aa1251844347a2d65d57a782fb i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -60,7 +60,11 @@
- 	"scrollbarShadow": "Цвет тени полосы прокрутки, которая свидетельствует о том, что содержимое прокручивается.",
- 	"scrollbarSliderBackground": "Цвет фона ползунка полосы прокрутки.",
- 	"scrollbarSliderHoverBackground": "Цвет фона ползунка полосы прокрутки при наведении курсора.",
-+<<<<<<< .our
- 	"scrollbarSliderActiveBackground": "Цвет фона ползунка полосы прокрутки при щелчке по нему.",
-+=======
-+	"scrollbarSliderActiveBackground": "Цвет фона активного ползунка полосы прокрутки.",
-+>>>>>>> .their
- 	"progressBarBackground": "Цвет фона индикатора выполнения, который может отображаться для длительных операций.",
- 	"editorBackground": "Цвет фона редактора.",
- 	"editorForeground": "Цвет переднего плана редактора по умолчанию.",
-changed in both
-  base   100644 77f0bdb5c2bde44276ea9217bd35729ef66c5a5a i18n/rus/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 c446918f7398d91df096414504ebb365f7b433fb i18n/rus/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 04cf9479a3b68b7389b03a8e6f536a4d87c13cc6 i18n/rus/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -9,6 +9,7 @@
- 	"openFile": "Открыть файл...",
- 	"openFolder": "Открыть папку...",
- 	"openFileFolder": "Открыть...",
-+<<<<<<< .our
- 	"globalRemoveFolderFromWorkspace": "Удалить папку из рабочей области...",
- 	"saveWorkspaceAsAction": "Сохранить рабочую область как...",
- 	"save": "Сохранить",
-@@ -16,4 +17,24 @@
- 	"openWorkspaceAction": "Открыть рабочую область...",
- 	"openWorkspaceConfigFile": "Открыть файл конфигурации рабочей области",
- 	"duplicateWorkspaceInNewWindow": "Создать копию рабочей области в новом окне"
-+=======
-+	"reload": "&&Перезагрузить",
-+	"cancel": "Отмена",
-+	"newWorkspaceFormExisting": "Новая рабочая область из существующей...",
-+	"select": "&&Выбрать",
-+	"selectWorkspace": "Выбрать папки для рабочей области",
-+	"addSupported": "Чтобы открыть несколько папок, необходимо перезагрузить окно.",
-+	"addFolderToWorkspace": "Добавить папку в рабочую область...",
-+	"add": "&&Добавить",
-+	"addFolderToWorkspaceTitle": "Добавить папку в рабочую область",
-+	"removeFolderFromWorkspace": "Удалить папку из рабочей области",
-+	"saveWorkspaceAsAction": "Сохранить рабочую область как...",
-+	"saveEmptyWorkspaceNotSupported": "Перед сохранением рабочей области откройте ее. ",
-+	"saveNotSupported": "Чтобы сохранить рабочую область, необходимо перезагрузить окно.",
-+	"save": "Сохранить",
-+	"saveWorkspace": "Сохранить рабочую область",
-+	"openWorkspaceAction": "Открыть рабочую область...",
-+	"newWorkspace": "Создать рабочую область...",
-+	"openWorkspaceConfigFile": "Открыть файл конфигурации рабочей области"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 38dfb4e1703c002ce8fb88bb74d065a5fa28b7cb i18n/rus/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 99aca234c7b93506a14c237c3960c0558fba20a4 i18n/rus/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 393b1e55fe555b5c3bccece2611e702147267e1a i18n/rus/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 1db923803c4019b36091d3b30508c7e3e28d1b49 i18n/rus/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-  our    100644 1ef0f05df26e85532ec4820bdf2161b011019703 i18n/rus/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-  their  100644 3a5b37bf67a56e9cc81dd211415ef10779a43773 i18n/rus/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,9 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"compositePart.hideSideBarLabel": "Скрыть боковую панель",
-+>>>>>>> .their
- 	"focusSideBar": "Перевести фокус на боковую панель",
- 	"viewCategory": "Просмотреть"
- }
-\ No newline at end of file
-changed in both
-  base   100644 190db792a178b273e0982f348c9903874ff3ee15 i18n/rus/src/vs/workbench/common/theme.i18n.json
-  our    100644 1ea38452a6e8832b511f19d37e5007a3b201c44b i18n/rus/src/vs/workbench/common/theme.i18n.json
-  their  100644 1e1638c8206cd0b1710579a6673f51666c809159 i18n/rus/src/vs/workbench/common/theme.i18n.json
-@@ -61,6 +61,7 @@
- 	"titleBarActiveBackground": "Фон панели заголовка, если окно активно. Обратите внимание, что этот цвет сейчас поддерживается только в macOS.",
- 	"titleBarInactiveBackground": "Фон панели заголовка, если окно неактивно. Обратите внимание, что этот цвет сейчас поддерживается только в macOS.",
- 	"titleBarBorder": "Цвет границы панели заголовка. Обратите внимание, что этот цвет сейчас поддерживается только в macOS.",
-+<<<<<<< .our
- 	"notificationCenterBorder": "Цвет границы центра уведомлений. Уведомления появляются в нижней правой части окна. ",
- 	"notificationToastBorder": "Цвет границы всплывающего уведомления. Уведомления появляются в нижней правой части окна.",
- 	"notificationsForeground": "Цвет переднего плана уведомления. Уведомления появляются в нижней правой части окна.",
-@@ -69,4 +70,17 @@
- 	"notificationCenterHeaderForeground": "Цвет переднего плана заголовка в центре уведомлений. Уведомления появляются в нижней правой части окна. ",
- 	"notificationCenterHeaderBackground": "Цвет фона заголовка в центре уведомлений. Уведомления появляются в нижней правой части окна. ",
- 	"notificationsBorder": "Цвет границы уведомления, которая отделяет это уведомление от других в центре уведомлений. Уведомления появляются в нижней правой части окна. "
-+=======
-+	"notificationsForeground": "Цвет переднего плана для уведомлений. Уведомления отображаются в верхней части окна.",
-+	"notificationsBackground": "Цвет фона для уведомлений. Уведомления отображаются в верхней части окна.",
-+	"notificationsButtonBackground": "Цвет фона кнопки для уведомлений. Уведомления отображаются в верхней части окна.",
-+	"notificationsButtonHoverBackground": "Цвет фона кнопки для уведомлений при наведении курсора мыши. Уведомления отображаются в верхней части окна.",
-+	"notificationsButtonForeground": "Цвет переднего плана кнопки для уведомлений. Уведомления отображаются в верхней части окна.",
-+	"notificationsInfoBackground": "Цвет фона для информационных сообщений. Уведомления отображаются в верхней части окна. ",
-+	"notificationsInfoForeground": "Цвет переднего плана для информационных сообщений. Уведомления отображаются в верхней части окна. ",
-+	"notificationsWarningBackground": "Цвет фона для предупреждений. Уведомления отображаются в верхней части окна. ",
-+	"notificationsWarningForeground": "Цвет переднего плана для предупреждений. Уведомления отображаются в верхней части окна. ",
-+	"notificationsErrorBackground": "Цвет фона для ошибок. Уведомления отображаются в верхней части окна. ",
-+	"notificationsErrorForeground": "Цвет переднего плана для ошибок. Уведомления отображаются в верхней части окна. "
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 5140913c988c3e3d06041c5911ce99f91633104d i18n/rus/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 266dadc0ddcb2cfb8391eafba4890dbacea4172b i18n/rus/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 cb0068c301afb51cc6e4e61f00631f826a357508 i18n/rus/src/vs/workbench/electron-browser/actions.i18n.json
-changed in both
-  base   100644 73686d728483239ab4a6e5b0b5e4d3456d4319f0 i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 bdb5e10a72aa6a97a13c01acd6d5626456147e68 i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 130cb3a7c8f96cabb6494d8fbdb2767a6014e38f i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,6 +35,7 @@
- 	"panelDefaultLocation": "Определяет расположение панели по умолчанию. Она может находиться снизу или справа от рабочего места.",
- 	"statusBarVisibility": "Управляет видимостью строки состояния в нижней части рабочего места.",
- 	"activityBarVisibility": "Управляет видимостью панели действий на рабочем месте.",
-+<<<<<<< .our
- 	"viewVisibility": "Управляет видимостью действий в заголовке представления. Действия в заголовке представления могут быть видимы всегда или видимы только тогда, когда представление получает фокус или на него наводится курсор мыши.",
- 	"fontAliasing": "Управляет методом сглаживания шрифтов в рабочей области.\n- default: субпиксельное сглаживание шрифтов; позволит добиться максимальной четкости текста на большинстве дисплеев за исключением Retina\n- antialiased: сглаживание шрифтов на уровне пикселей, в отличие от субпиксельного сглаживания; позволит сделать шрифт более светлым в целом\n- none: сглаживание шрифтов отключено; текст будет отображаться с неровными острыми краями\n- auto: автоматически применяется режим \"default\" или \"antialiased\" в зависимости от разрешения дисплея (количество точек на дюйм).",
- 	"workbench.fontAliasing.default": "Субпиксельное сглаживание шрифтов; позволит добиться максимальной четкости текста на большинстве дисплеев за исключением Retina.",
-@@ -43,6 +44,15 @@
- 	"workbench.fontAliasing.auto": "Автоматически применяется режим \"default\" или \"antialiased\" в зависимости от разрешения дисплея (количество точек на дюйм).",
- 	"enableNaturalLanguageSettingsSearch": "Определяет, следует ли включить режим поиска естественного языка для параметров.",
- 	"windowConfigurationTitle": "Окно",
-+=======
-+	"closeOnFileDelete": "Определяет, следует ли автоматически закрывать редакторы, когда отображаемый в них файл удален или переименован другим процессом. При отключении этой функции редактор остается открытым в качестве черновика. Обратите внимание, что при удалении из приложения редактор закрывается всегда и что файлы черновиков никогда не закрываются для сохранения данных.",
-+	"fontAliasing": "Управляет методом сглаживания шрифтов в рабочей области.-по умолчанию: субпиксельное сглаживание шрифтов; позволит добиться максимальной четкости текста на большинстве дисплеев за исключением Retina - сглаживание: сглаживание шрифтов на уровне пикселей, в отличие от субпиксельного сглаживания; позволит сделать шрифт более светлым в целом - нет: сглаживание шрифтов отключено; текст будет отображаться с неровными острыми краями ",
-+	"workbench.fontAliasing.default": "Субпиксельное сглаживание шрифтов; позволит добиться максимальной четкости текста на большинстве дисплеев за исключением Retina.",
-+	"workbench.fontAliasing.antialiased": "Сглаживание шрифтов на уровне пикселей, в отличие от субпиксельного сглаживания. Может сделать шрифт светлее в целом.",
-+	"workbench.fontAliasing.none": "Отключает сглаживание шрифтов; текст будет отображаться с неровными острыми краями.",
-+	"swipeToNavigate": "Переключайтесь между открытыми файлами, проводя по экрану по горизонтали тремя пальцами.",
-+	"workbenchConfigurationTitle": "Workbench",
-+>>>>>>> .their
- 	"window.openFilesInNewWindow.on": "Файлы будут открываться в новом окне.",
- 	"window.openFilesInNewWindow.off": "Файлы будут открываться в окне с открытой папкой файлов или последнем активном окне.",
- 	"window.openFilesInNewWindow.defaultMac": "Файлы будут открыты в новом окне с открытой папкой файлов или в последнем активном окне, если они не были открыты с помощью панели Dock или поиска",
-changed in both
-  base   100644 8b4be6fe00b637b36f63436ed5fc49c4885af9ca i18n/rus/src/vs/workbench/electron-browser/window.i18n.json
-  our    100644 1b50f4f1a795fd43ccff439303c3058ab0677b98 i18n/rus/src/vs/workbench/electron-browser/window.i18n.json
-  their  100644 becf8c9a3ade3f5f6076386279e035e9bfef1535 i18n/rus/src/vs/workbench/electron-browser/window.i18n.json
-@@ -12,5 +12,10 @@
- 	"copy": "Копировать",
- 	"paste": "Вставить",
- 	"selectAll": "Выбрать все",
-+<<<<<<< .our
- 	"runningAsRoot": "Не рекомендуется запускать {0} в качестве корневого пользователя."
-+=======
-+	"confirmOpen": "Вы действительно хотите открыть рабочие области {0}?",
-+	"confirmOpenButton": "&&Открыть..."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 575548ac1c853eabb16aa0b05089b18cc1edfbc7 i18n/rus/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  our    100644 4f96620576f3a410b1ea446182daa43ce07b0b3e i18n/rus/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  their  100644 e0979b269531b647d6b48800a73958aaa8fd43a2 i18n/rus/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-changed in both
-  base   100644 ee52447b162947169085de03f59487ca1a016fee i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 23eb63e486d254cf5d707329f4a13e4ae0e33119 i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 6030f06024ee4fc411f72e2952fb21ee0800d9b4 i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -28,7 +28,13 @@
- 	"preLaunchTaskExitCode": "Выполнение предварительной задачи \"{0}\" завершено с кодом выхода {1}.",
- 	"showErrors": "Показывать ошибки",
- 	"noFolderWorkspaceDebugError": "Нельзя выполнить отладку активного файла. Убедитесь, что файл сохранен на диске и установлено расширение отладки для этого типа файла.",
-+<<<<<<< .our
- 	"cancel": "Отмена",
- 	"DebugTaskNotFound": "Не удалось найти задачу \"{0}\".",
- 	"taskNotTracked": "Не удается отследить задачу \"{0}\"."
-+=======
-+	"NewLaunchConfig": "Настройте файл конфигурации запуска для вашего приложения. {0}",
-+	"DebugTaskNotFound": "Не удалось найти задачу preLaunchTask \"{0}\".",
-+	"differentTaskRunning": "Задача '{0}' уже выполняется. Невозможно запустить предварительную задачу '{1}'."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 bf63a86ed4abb041df809fc50fa111b16d1e62ee i18n/rus/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  our    100644 6c1558c003488082dde47699207223b28eebf91d i18n/rus/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  their  100644 775b1ec66d27642859880d78b67087a80e045c09 i18n/rus/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-merged
-  result 100644 f14f85558fea64ee69d49eb862bb08976819a4ed i18n/rus/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-  our    100644 41da05e341f85731c03f542735bf4208bd4a23aa i18n/rus/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-@@ -7,8 +7,5 @@
- 	"emmetConfigurationTitle": "Emmet",
- 	"triggerExpansionOnTab": "Если этот параметр установлен, сокращения Emmet разворачиваются при нажатии клавиши TAB. Не применяется, если параметр emmet.useNewemmet имеет значение 'true'.",
- 	"emmetPreferences": "Настройки, которые используются для изменения поведения некоторых действий и сопоставителей Emmet. Не применяется, если параметр emmet.useNewemmet имеет значение 'true'.",
--	"emmetSyntaxProfiles": "Задайте профиль для указанного синтаксиса или используйте свой собственный профиль с определенными правилами.",
--	"emmetExclude": "Массив языков, в которых не должны развертываться сокращения Emmet.",
--	"emmetExtensionsPath": "Путь к папке, содержащей профили Emmet, фрагменты кода и настройки. Если параметр emmet.useNewemmet имеет значение 'true', используются только профили для пути расширения.",
- 	"useNewEmmet": "Попробуйте новые модули emmet (которые в конечном итоге заменят устаревшую библиотеку emmet), чтобы ознакомиться со всеми функциями emmet."
- }
-\ No newline at end of file
-changed in both
-  base   100644 5d0c8aac61038db995dad0114f7129732b73f64f i18n/rus/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  our    100644 aed4ddc96e0fa43f50c41bf2aa86012d93744f14 i18n/rus/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  their  100644 4671a2c1d2386d77c57263adca2af6874f936563 i18n/rus/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-changed in both
-  base   100644 b01a24938599c2f028d182bf6682c5bd1b46060c i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 bd475832dcfff4640327a5b72df263d4356ba205 i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 ecce4c8d043abae246ac7370b04bf2373d30c75a i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-changed in both
-  base   100644 61dde35c09366008ad91ce2a0622f0c780fff1cc i18n/rus/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
-  our    100644 821930bfc8797aa66e392542a9a207e98e5802c7 i18n/rus/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
-  their  100644 9a2b3bf6390d9a58b7aa2db743c38027ac2c9eba i18n/rus/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
-@@ -4,7 +4,11 @@
-  *--------------------------------------------------------------------------------------------*/
- // Do not edit this file. It is machine generated.
- {
-+<<<<<<< .our
- 	"filesCategory": "Файл",
-+=======
-+	"filesCategory": "Файлы",
-+>>>>>>> .their
- 	"revealInSideBar": "Показать в боковой панели",
- 	"acceptLocalChanges": "Использовать изменения и перезаписать содержимое диска",
- 	"revertLocalChanges": "Отменить изменения и вернуться к содержимому на диске"
-changed in both
-  base   100644 eab30252ca80391e5d68c74f71fab27ffde31bab i18n/rus/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  our    100644 12bee9cd2a35e610f5f68160ed62a575d0331ad1 i18n/rus/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  their  100644 c78c894bf5227e2d4c8cba3e701e1d80c177dc80 i18n/rus/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-changed in both
-  base   100644 e3d342df049f3895908496eaa86ae4d4a8681a88 i18n/rus/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 a4725d2faef4b5a6c23ee7c2ecc46a16530b3341 i18n/rus/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 8332d1fabcf879c7c01606ccee623644190ca2ce i18n/rus/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-@@ -40,6 +40,7 @@
- 	"dynamicHeight": "Определяет, будет ли высота раздела открытых редакторов динамически адаптироваться к количеству элементов.",
- 	"autoReveal": "Определяет, будет ли проводник автоматически отображать и выбирать файлы при их открытии.",
- 	"enableDragAndDrop": "Определяет, разрешено ли перемещение файлов и папок перетаскиванием в проводнике.",
-+<<<<<<< .our
- 	"confirmDragAndDrop": "Определяет, должно ли запрашиваться подтверждение при перемещении файлов и папок в проводнике.",
- 	"confirmDelete": "Определяет, должно ли запрашиваться подтверждение при удалении файла в корзину.",
- 	"sortOrder.default": "Файлы и папки сортируются по именам в алфавитном порядке. Папки отображаются перед файлами.",
-@@ -50,4 +51,12 @@
- 	"sortOrder": "Управляет порядком сортировки файлов и папок в проводнике. Наряду с сортировкой по умолчанию можно установить следующие варианты сортировки: 'mixed' (файлы и папки сортируются вместе), 'type' (по типу файла), 'modified' (по дате последнего изменения) и 'filesFirst' (сортировать файлы перед папками).",
- 	"explorer.decorations.colors": "Определяет, следует ли использовать цвета в декораторах файла.",
- 	"explorer.decorations.badges": "Определяет, следует ли использовать эмблемы в декораторах файла. "
-+=======
-+	"sortOrder.default": "Файлы и каталоги сортируются по именам в алфавитном порядке. Каталоги отображаются перед файлами.",
-+	"sortOrder.mixed": "Файлы и каталоги сортируются по именам в алфавитном порядке. Файлы чередуются с каталогами.",
-+	"sortOrder.filesFirst": "Файлы и каталоги сортируются по именам в алфавитном порядке. Файлы отображаются перед каталогами. ",
-+	"sortOrder.type": "Файлы и каталоги сортируются по именам в алфавитном порядке. Каталоги отображаются перед файлами. ",
-+	"sortOrder.modified": "Файлы и каталоги сортируются по дате последнего изменения в порядке убывания. Каталоги отображаются перед файлами.",
-+	"sortOrder": "Определяет способ сортировки файлов и каталогов в проводнике."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 990a276ce3588c94b2ee2f182b840bff2b59a7a4 i18n/rus/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-  our    100644 d5622eec39a12463acb3bf3b84df8406aca38203 i18n/rus/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-  their  100644 fa76089bc65010b8fe88410befe2fda5bdf8fe73 i18n/rus/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-@@ -12,5 +12,6 @@
- 	"genericSaveError": "Не удалось сохранить \"{0}\": {1}",
- 	"staleSaveError": "Не удалось сохранить \"{0}\": содержимое на диске более новое. Чтобы сравнить свою версию с версией на диске, нажмите **Сравнить**.",
- 	"compareChanges": "Сравнить",
--	"saveConflictDiffLabel": "{0} (на диске) ↔ {1} (в {2}) - Разрешить конфликт сохранения"
-+	"saveConflictDiffLabel": "{0} (на диске) ↔ {1} (в {2}) - Разрешить конфликт сохранения",
-+	"userGuide": "Используйте команды на панели инструментов редактора справа для **отмены** изменений или **перезаписи** содержимого на диске с учетом этих изменений"
- }
-\ No newline at end of file
-changed in both
-  base   100644 b82ad2f758e37c0128a69b3cf2c5361e8c02d5d2 i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  our    100644 73f5287abade720146d5385f06b5e028d614a772 i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  their  100644 e7a2b6b75eca5c1a0cc7a4c77dae281844647694 i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-@@ -14,6 +14,10 @@
- 	"openGlobalKeybindingsFile": "Открыть файл сочетаний клавиш",
- 	"openWorkspaceSettings": "Открыть параметры рабочей области",
- 	"openFolderSettings": "Открыть параметры папок",
-+<<<<<<< .our
-+=======
-+	"pickFolder": "Выбрать папку",
-+>>>>>>> .their
- 	"configureLanguageBasedSettings": "Настроить параметры языка...",
- 	"languageDescriptionConfigured": "({0})",
- 	"pickLanguage": "Выбрать язык"
-changed in both
-  base   100644 dd141cde1c50dc2e173ef8968196f6047f99926b i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 b457921fc6fc12c765888c49560d62815333e020 i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 71bf804e80088112b8ebf6e5159414eafb073b11 i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -14,4 +15,19 @@
- 	"editTtile": "Изменить",
- 	"replaceDefaultValue": "Заменить в параметрах",
- 	"copyDefaultValue": "Копировать в параметры"
-+=======
-+	"emptyUserSettingsHeader": "Укажите параметры здесь, чтобы перезаписать параметры по умолчанию.",
-+	"errorInvalidConfiguration": "Не удается записать параметры. Устраните ошибки и предупреждения в файле и повторите попытку.",
-+	"emptyWorkspaceSettingsHeader": "Укажите параметры здесь, чтобы перезаписать параметры пользователей.",
-+	"emptyFolderSettingsHeader": "Укажите параметры папок здесь, чтобы перезаписать параметры рабочих областей.",
-+	"defaultFolderSettingsTitle": "Параметры папок по умолчанию",
-+	"defaultSettingsTitle": "Параметры по умолчанию",
-+	"noSettingsFound": "Параметры не найдены.",
-+	"editTtile": "Изменить",
-+	"replaceDefaultValue": "Заменить в параметрах",
-+	"copyDefaultValue": "Копировать в параметры",
-+	"unsupportedPHPExecutablePathSetting": "Этот параметр должен быть параметром пользователя. Чтобы настроить в рабочей области PHP, откройте PHP-файл и щелкните \"Путь PHP\" в строке состояния.",
-+	"unsupportedWorkspaceSetting": "Этот параметр должен быть параметром пользователя.",
-+	"unsupportedWorkbenchSetting": "Сейчас применить этот параметр нельзя. Он будет применен, когда вы откроете эту папку напрямую."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d90a4e6c80b1c3c1b58bbb1b52526e80f0efe89f i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-  our    100644 7e702c2b5e93de8692ffe0243a9f0889bfcceb3c i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-  their  100644 870d134266523d084d65420727101c747d174919 i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 2639f8a70dc171eed499a24e68b57de977a1debe i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 fbe7b0fc59d0a09ac4f13a85af3e18479e146aa3 i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -12,4 +13,13 @@
- 	"userSettings": "Параметры пользователя",
- 	"workspaceSettings": "Параметры рабочей области",
- 	"folderSettings": "Параметры папок"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"folderSettingsDetails": "Параметры папок"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 155d4022b8eaad02d00cf55a647933cd0a9ed3ad i18n/rus/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  our    100644 a0702c99bc6adf515a02bc50655ac66d8b369690 i18n/rus/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  their  100644 cb591fb1f5f21ff745e3f7c6b8efd952ab2d7317 i18n/rus/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-@@ -8,5 +8,11 @@
- 	],
- 	"relaunchSettingMessage": "После изменения параметра необходима выполнить перезагрузку, чтобы изменения вступили в силу.",
- 	"relaunchSettingDetail": "Нажмите кнопку \"Перезагрузить\", чтобы перезагрузить {0} и включить параметр.",
-+<<<<<<< .our
- 	"restart": "&&Перезапустить"
-+=======
-+	"restart": "Перезапустить",
-+	"relaunchWorkspaceMessage": "Для изменения этой рабочей области требуется перезагрузить нашу систему расширений.",
-+	"reload": "Перезагрузка"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e5f21d40d06215c5a29c27531436657b5b20a2b1 i18n/rus/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 012af24286aec719761b0687ebd50b2292e4db5e i18n/rus/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 a60edb8ea779767ce0b1b8e40126c096e8082eaa i18n/rus/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"nextSearchIncludePattern": "Показать следующий шаблон включения в поиск",
- 	"previousSearchIncludePattern": "Показать предыдущий шаблон включения в поиск ",
- 	"nextSearchExcludePattern": "Показать следующий шаблон исключения из поиска",
-@@ -16,6 +19,8 @@
- 	"previousReplaceTerm": "Показать предыдущее условие поиска и замены",
- 	"findInFiles": "Найти в файлах",
- 	"replaceInFiles": "Заменить в файлах",
-+	"findInWorkspace": "Найти в рабочей области...",
-+	"findInFolder": "Найти в папке...",
- 	"RefreshAction.label": "Обновить",
- 	"CollapseDeepestExpandedLevelAction.label": "Свернуть все",
- 	"ClearSearchResultsAction.label": "Очистить",
-changed in both
-  base   100644 cd394a2c256ae3595abf54197c01dcb233ef7384 i18n/rus/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-  our    100644 d3adc19c362c0be32a82dcdb9b4f38f6d17c183e i18n/rus/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-  their  100644 9d483c5df778ea5767a5155fd8f736f62653edc8 i18n/rus/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"searchFolderMatch.other.label": "Другие файлы",
- 	"searchFileMatches": "Найдено файлов: {0}",
- 	"searchFileMatch": "Найден {0} файл",
-changed in both
-  base   100644 39d234e38ac3f691ae3a0d2b108355e437fa9102 i18n/rus/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  our    100644 b197ab3521e49957a9edec72b674203f6268c391 i18n/rus/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  their  100644 1359328df0c5cb8ef24d158ed6715012b58bafb9 i18n/rus/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-changed in both
-  base   100644 8892c40326eab5015b51d487d5e37e0b294512b2 i18n/rus/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 5406c69914aaafdfca9d082f48774213cbbbd661 i18n/rus/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 478d79d5732a3b6729494a6797168cddf58a459d i18n/rus/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-changed in both
-  base   100644 b8738833fa754fe6c88f27c641e6554589e325da i18n/rus/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 3ad2e6ca5f31ca94a9cdd8a18a046b2a9773636b i18n/rus/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 c9567d9d0e74067d8b5ab85829404eb6f957e1ad i18n/rus/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -12,8 +12,12 @@
- 	"totalWarnings": "Предупреждения: {0}",
- 	"totalInfos": "Сообщения: {0}",
- 	"problems": "Проблемы",
-+<<<<<<< .our
- 	"building": "Сборка...",
- 	"manyProblems": "Более 10 тысяч",
-+=======
-+	"manyMarkers": "99+",
-+>>>>>>> .their
- 	"runningTasks": "Показать выполняемые задачи",
- 	"tasks": "Задачи",
- 	"TaskSystem.noHotSwap": "Чтобы изменить подсистему выполнения задач, в которой запущена активная задача, необходимо перезагрузить окно",
-@@ -24,17 +28,25 @@
- 	"TaskService.noTestTask1": "Задача теста не определена. Отметьте задачу с помощью \"isTestCommand\" в файле tasks.json.",
- 	"TaskService.noTestTask2": "Задача теста не определена. Отметьте задачу с помощью группы 'test' в файле tasks.json.",
- 	"TaskServer.noTask": "Запрошенная задача {0} для выполнения не найдена.",
-+<<<<<<< .our
- 	"TaskService.associate": "связать",
-+=======
-+>>>>>>> .their
- 	"TaskService.attachProblemMatcher.continueWithout": "Продолжить без проверки выходных данных задачи",
- 	"TaskService.attachProblemMatcher.never": "Никогда не проверять выходные данные задачи",
- 	"TaskService.attachProblemMatcher.learnMoreAbout": "Дополнительные сведения о проверке выходных данных задачи",
- 	"selectProblemMatcher": "Выберите, на какие ошибки и предупреждения следует проверять выходные данные задачи",
- 	"customizeParseErrors": "В конфигурации текущей задачи есть ошибки. Исправьте ошибки перед изменением задачи.",
- 	"moreThanOneBuildTask": "В файле tasks.json определено несколько задач сборки. Выполняется первая задача.\n",
-+<<<<<<< .our
- 	"TaskSystem.activeSame.background": "Задача '{0}' уже активна и находится в фоновом режиме.",
- 	"TaskSystem.activeSame.noBackground": "Задача '{0}' уже выполняется.",
- 	"terminateTask": "Завершить задачу",
- 	"restartTask": "Перезапустить задачу",
-+=======
-+	"TaskSystem.activeSame.background": "Задача '{0}' уже активна и находится в фоновом режиме. Чтобы завершить задачу, выберите \"Завершить задачу\" в меню \"Задачи\".",
-+	"TaskSystem.activeSame.noBackground": "Задача '{0}' уже активна. Чтобы завершить задачу, выберите \"Завершить задачу\" из меню \"Задачи\".",
-+>>>>>>> .their
- 	"TaskSystem.active": "Уже выполняется задача. Завершите ее, прежде чем выполнять другую задачу.",
- 	"TaskSystem.restartFailed": "Не удалось завершить и перезапустить задачу {0}",
- 	"TaskService.noConfiguration": "Ошибка: в определении задачи {0} не выявлена задача для следующей конфигурации:\n{1}\nЗадача будет проигнорирована.\n",
-@@ -75,8 +87,13 @@
- 	"TaskService.pickDefaultBuildTask": "Выберите задачу, которая будет использоваться в качестве задачи сборки по умолчанию.",
- 	"TaskService.defaultTestTaskExists": "{0} уже помечена как задача сборки по умолчанию. ",
- 	"TaskService.pickDefaultTestTask": "Выберите задачу, которая будет использоваться в качестве задачи тестирования по умолчанию. ",
-+<<<<<<< .our
- 	"TaskService.pickShowTask": "Выберите задачу, выходные данные для которой нужно отобразить",
- 	"TaskService.noTaskIsRunning": "Ни одной задачи не запущено",
-+=======
-+	"TaskService.noTaskIsRunning": "Ни одной задачи не запущено.",
-+	"TaskService.pickShowTask": "Выберите задачу, выходные данные для которой нужно отобразить",
-+>>>>>>> .their
- 	"ShowLogAction.label": "Показать журнал задач",
- 	"RunTaskAction.label": "Выполнить задачу",
- 	"RestartTaskAction.label": "Перезапустить запущенную задачу",
-changed in both
-  base   100644 5f9a68cdb97f93b50890241bb8fa0b0102a28ab4 i18n/rus/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  our    100644 b7b348484d2ec81180585cec523e688a69bfd6fc i18n/rus/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  their  100644 b89e73645df41663fbfaac4323c26a0a9a031ef2 i18n/rus/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  our    100644 f97f741a841441f81547b7f5c26cdd6055680df5 i18n/rus/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  their  100644 2353eb8ddd1ae57c4cae589c3f5412550da6f9da i18n/rus/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,6 +10,15 @@
- 	"termEntryAriaLabel": "{0}, средство выбора терминалов",
- 	"termCreateEntryAriaLabel": "{0}, создать новый терминал",
- 	"workbench.action.terminal.newplus": "$(plus) Создать новый интегрированный терминал",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"entryAriaLabel": "{0}, средство выбора терминалов",
-+>>>>>>> .their
- 	"noTerminalsMatching": "Терминалы, соответствующие условию, отсутствуют",
- 	"noTerminalsFound": "Открытые терминалы отсутствуют"
- }
-\ No newline at end of file
-changed in both
-  base   100644 ffbac2eb99e0ea5a143c1bb70ece8333b0d34010 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 e05b07ca1e0540b56ed4788f50fea5db9d3c3f96 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 09ebc373f5482f173ef9216d5cf2dff94d20b598 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,9 @@
- 	],
- 	"quickOpen.terminal": "Показать все открытые терминалы",
- 	"terminal": "Терминал",
-+=======
-+	"quickOpen.terminal": "Показать все открытые терминалы",
-+>>>>>>> .their
- 	"terminalIntegratedConfigurationTitle": "Интегрированный терминал",
- 	"terminal.integrated.shell.linux": "Путь оболочки, который используется терминалом в Linux.",
- 	"terminal.integrated.shellArgs.linux": "Аргументы командной строки, которые следует использовать в терминале Linux.",
-@@ -36,8 +40,12 @@
- 	"terminal.integrated.env.osx": "Объект с переменными среды, которые будут добавлены к процессу VS Code для использования в терминале OS X",
- 	"terminal.integrated.env.linux": "Объект с переменными среды, которые будут добавлены к процессу VS Code для использования в терминале Linux ",
- 	"terminal.integrated.env.windows": "Объект с переменными среды, которые будут добавлены к процессу VS Code для использования в терминале Windows",
-+<<<<<<< .our
- 	"terminal.integrated.showExitAlert": "Отображать предупреждение \"Процесс терминала завершен с кодом выхода\", если код выхода не равен нулю.",
- 	"terminal.integrated.experimentalRestore": "Восстанавливать ли сеансы терминала для рабочей области автоматически при запуске VS Code. Это экспериментальный параметр; он может приводить к ошибкам и может быть изменен в будущем.",
-+=======
-+	"terminal": "Терминал",
-+>>>>>>> .their
- 	"terminalCategory": "Терминал",
- 	"viewCategory": "Просмотреть"
- }
-\ No newline at end of file
-changed in both
-  base   100644 32aa44547c4327e0be154304cb9a8146845ada73 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 ea0d455fc7f4fc786ef2ef083f3b437a535a441a i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 e2064127c8ab238a9a9057bd8111d8371ade1908 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -14,8 +14,11 @@
- 	"workbench.action.terminal.selectAll": "Выбрать все",
- 	"workbench.action.terminal.deleteWordLeft": "Удалить слово слева",
- 	"workbench.action.terminal.deleteWordRight": "Удалить слово справа",
-+<<<<<<< .our
- 	"workbench.action.terminal.moveToLineStart": "Перейти к началу строки",
- 	"workbench.action.terminal.moveToLineEnd": "Перейти к концу строки",
-+=======
-+>>>>>>> .their
- 	"workbench.action.terminal.new": "Создание нового интегрированного терминала",
- 	"workbench.action.terminal.new.short": "Новый терминал",
- 	"workbench.action.terminal.newWorkspacePlaceholder": "Выбрать текущий рабочий каталог для нового терминала",
-@@ -51,6 +54,7 @@
- 	"workbench.action.terminal.rename.prompt": "Введите название терминала",
- 	"workbench.action.terminal.focusFindWidget": "Выделить мини-приложение поиска",
- 	"workbench.action.terminal.hideFindWidget": "Скрыть мини-приложение поиска",
-+<<<<<<< .our
- 	"nextTerminalFindTerm": "Показать следующий найденный термин",
- 	"previousTerminalFindTerm": "Показать предыдущий найденный термин",
- 	"quickOpenTerm": "Переключить активный терминал",
-@@ -60,4 +64,7 @@
- 	"workbench.action.terminal.selectToNextCommand": "Выбрать следующую команду",
- 	"workbench.action.terminal.selectToPreviousLine": "Выделить текст до предыдущей строки",
- 	"workbench.action.terminal.selectToNextLine": "Выделить текст до следующей строки"
-+=======
-+	"quickOpenTerm": "Переключить активный терминал"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a43d3077cff1b9cf703d317964bd31c51e83d890 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 aca12bf1061a643000b1615902ead62bb39d5223 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 3a2688c515c648212b96cc4c490842b7c49a7043 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -10,7 +10,10 @@
- 	"terminal.foreground": "Цвет переднего плана терминала.",
- 	"terminalCursor.foreground": "Цвет переднего плана курсора терминала.",
- 	"terminalCursor.background": "Цвет фона курсора терминала. Позволяет выбрать цвет символа, который перекрывается блочным курсором.",
-+<<<<<<< .our
- 	"terminal.selectionBackground": "Цвет фона выделения терминала.",
- 	"terminal.border": "Цвет границы, которая отделяет области в терминале. По умолчанию используется panel.border.",
-+=======
-+>>>>>>> .their
- 	"terminal.ansiColor": "Цвет ANSI \"{0}\" в терминале."
- }
-\ No newline at end of file
-changed in both
-  base   100644 e74084f36861306b1d8352a452623fc9b4cb5779 i18n/rus/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 0aa456751192f6ae65f23c8eacec75c6ffe01fe8 i18n/rus/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 d10d994409d4786c1b2672b0288a0a2e3b73392e i18n/rus/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -11,10 +11,16 @@
- 	"read the release notes": "Вас приветствует {0} v{1}! Вы хотите прочитать заметки о выпуске?",
- 	"licenseChanged": "Наши условия лицензии изменились. Чтобы ознакомиться с ними, щелкните [здесь]({0}).",
- 	"neveragain": "Больше не показывать",
-+<<<<<<< .our
- 	"64bitisavailable": "{0} для 64-разрядной версии Windows теперь доступен! Дополнительные сведения см. [здесь]({1}).",
- 	"updateIsReady": "Доступно новое обновление {0}.",
- 	"noUpdatesAvailable": "Доступные обновления отсутствуют.",
- 	"ok": "ОК",
-+=======
-+	"64bitisavailable": "{0} для 64-разрядных версий Windows теперь доступен!",
-+	"learn more": "Дополнительные сведения",
-+	"updateIsReady": "Доступно новое обновление {0}.",
-+>>>>>>> .their
- 	"thereIsUpdateAvailable": "Доступно обновление.",
- 	"download now": "Скачать сейчас",
- 	"later": "Позже",
-changed in both
-  base   100644 761072edd67cf6fb14a79a53de792bb8cd9fca3e i18n/rus/src/vs/workbench/parts/views/browser/views.i18n.json
-  our    100644 b0fa6d5e7e3abc8f109624f6c8e2c13655a54270 i18n/rus/src/vs/workbench/parts/views/browser/views.i18n.json
-  their  100644 ad533f8cbf10fb7506003bfed6810788da5b5b00 i18n/rus/src/vs/workbench/parts/views/browser/views.i18n.json
-@@ -5,5 +5,9 @@
- // Do not edit this file. It is machine generated.
- {
- 	"viewToolbarAriaLabel": "Действий: {0}",
-+<<<<<<< .our
- 	"hideView": "Скрыть из боковой панели"
-+=======
-+	"removeView": "Удалить из боковой панели"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 23cea88a1ceee6a440989c6533e259f662a46166 i18n/rus/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-  our    100644 472304cddee7043b300afe794ae73584b5e0577d i18n/rus/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-  their  100644 d11a8867da1bb8f1ce92a910616955affc4bcf54 i18n/rus/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-changed in both
-  base   100644 a74bc2f57d972fde3753efbe6bc776755e527c63 i18n/rus/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  our    100644 8915524eb9bff2cf02cf7f994fd2d422deaed65c i18n/rus/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  their  100644 1a6d5175801408cc02cd06043f5502b74a91c4cd i18n/rus/src/vs/workbench/services/configuration/node/configuration.i18n.json
-@@ -9,6 +9,7 @@
- 	"scope.window.description": "Конфигурация окна, которая может быть задана в параметрах пользователя или рабочей области.",
- 	"scope.resource.description": "Конфигурации ресурсов, которые могут быть заданы в параметрах пользователей, рабочих областей или папок.",
- 	"scope.description": "Область, в которой применяется конфигурация. Доступные области — 'window' и 'resource'.",
-+<<<<<<< .our
- 	"vscode.extension.contributes.configuration": "Добавляет параметры конфигурации.",
- 	"invalid.title": "configuration.title должно быть строкой",
- 	"vscode.extension.contributes.defaultConfiguration": "Предоставляет параметры конфигурации редактора по умолчанию в соответствии с языком.",
-@@ -21,4 +22,13 @@
- 	"workspaceConfig.settings.description": "Параметры рабочей области",
- 	"workspaceConfig.extensions.description": "Расширения рабочей области",
- 	"unknownWorkspaceProperty": "Неизвестное свойство рабочей области"
-+=======
-+	"invalid.type": "Если тип configuration.type задан, то он должен иметь значение object",
-+	"invalid.title": "configuration.title должно быть строкой",
-+	"vscode.extension.contributes.defaultConfiguration": "Предоставляет параметры конфигурации редактора по умолчанию в соответствии с языком.",
-+	"invalid.properties": "configuration.properties должно быть объектом",
-+	"workspaceConfig.id.description": "Идентификатор рабочей области. Используется для хранения внутреннего состояния рабочей области, которое может быть утеряно во время изменения.",
-+	"workspaceConfig.folders.description": "Список папок, которые будут загружены в рабочую область. Необходимо указывать пути к файлам, например, \"file:///root/folderA\"",
-+	"workspaceConfig.settings.description": "Параметры рабочей области"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 0d0c909172dbc855f1b653c8dbc0618f9156cd06 i18n/rus/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 466dfbc590c46288cb65b00cb7bf87e50489e811 i18n/rus/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 66d2499a4375c12dfd28ce75b7ee7cf3405539c5 i18n/rus/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -9,6 +9,7 @@
- 	"openTasksConfiguration": "Открыть конфигурацию задач",
- 	"openLaunchConfiguration": "Открыть конфигурацию запуска",
- 	"open": "Открыть параметры",
-+<<<<<<< .our
- 	"saveAndRetry": "Сохранить и повторить",
- 	"errorUnknownKey": "Не удалось записать в {0}, так как {1} не является зарегистрированной конфигурацией.",
- 	"errorInvalidWorkspaceConfigurationApplication": "Не удается записать {0} в параметры рабочей области. Этот параметр можно записать только в параметры пользователя.",
-@@ -27,6 +28,19 @@
- 	"errorConfigurationFileDirty": "Не удается записать параметры пользователя, так как файл был изменен. Сохраните файл параметров пользователя и повторите попытку.",
- 	"errorConfigurationFileDirtyWorkspace": "Не удается записать параметры рабочей области, так как файл был изменен. Сохраните файл параметров рабочей области и повторите попытку. ",
- 	"errorConfigurationFileDirtyFolder": "Не удается записать параметры папки, так как файл был изменен. Сохраните файл параметров папки '{0}' и повторите попытку.",
-+=======
-+	"close": "Закрыть",
-+	"saveAndRetry": "Сохранить параметры и повторить попытку",
-+	"errorUnknownKey": "Не удалось записать в {0}, так как {1} не является зарегистрированной конфигурацией.",
-+	"errorInvalidFolderConfiguration": "Не удается изменить параметры папок, так как {0} не поддерживает область ресурсов папок. ",
-+	"errorInvalidUserTarget": "Не удается изменить параметры пользователей, так как {0} не поддерживает глобальную область.",
-+	"errorInvalidFolderTarget": "Не удается изменить параметры папок, так как ресурс не указан.",
-+	"errorNoWorkspaceOpened": "Не удается записать в {0}, так как не открыта ни одна рабочая область. Откройте рабочую область и повторите попытку.",
-+	"errorInvalidConfiguration": "Не удается записать параметры. Откройте файл **User Settings**, устраните ошибки и предупреждения в файле и повторите попытку.",
-+	"errorInvalidConfigurationWorkspace": "Не удается записать параметры. Откройте файл **Workspace Settings**, устраните ошибки и предупреждения в файле и повторите попытку.",
-+	"errorConfigurationFileDirty": "Не удается записать параметры, так как файл был изменен. Сохраните файл **User Settings** и повторите попытку.",
-+	"errorConfigurationFileDirtyWorkspace": "Не удается записать параметры, так как файл был изменен. Сохраните файл **Workspace Settings** и повторите попытку.",
-+>>>>>>> .their
- 	"userTarget": "Параметры пользователя",
- 	"workspaceTarget": "Параметры рабочей области",
- 	"folderTarget": "Параметры папок"
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-  our    100644 b7d0271fbd9ef29c3bcbab141b27997ab44f9969 i18n/rus/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-  their  100644 8463d1762c16a7702d8c668f58bb03ac1aaa6530 i18n/rus/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"errorInvalidFile": "Не удается выполнить запись в файл. Откройте файл, исправьте ошибки и предупреждения в файле и повторите попытку.",
- 	"errorFileDirty": "Не удается записать сведения в файл, так как файл был изменен. Сохраните файл и повторите попытку."
- }
-\ No newline at end of file
-changed in both
-  base   100644 9a03e746560855f41b46f0dee2465f2396d6cda9 i18n/rus/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 73e5413908fbafda8e65fdd1e7768bf4e42a1926 i18n/rus/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 1fc0039118800fe2e7f256c3a7e02425aef4b39b i18n/rus/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-@@ -13,6 +13,7 @@
- 	"noIconThemeDesc": "No file icons",
- 	"iconThemeError": "File icon theme is unknown or not installed.",
- 	"workbenchColors": "Переопределяет цвета из выбранной цветовой темы.",
-+<<<<<<< .our
- 	"editorColors.comments": "Задает цвета и стили для комментариев",
- 	"editorColors.strings": "Задает цвета и стили для строковых литералов.",
- 	"editorColors.keywords": "Задает цвета и стили для ключевых слов.",
-@@ -21,5 +22,9 @@
- 	"editorColors.functions": "Задает цвета и стили для объявлений функций и ссылок. ",
- 	"editorColors.variables": "Задает цвета и стили для объявлений переменных и для ссылок. ",
- 	"editorColors.textMateRules": "Задает цвета и стили с использованием правил оформления textmate (расширенный параметр).",
-+=======
-+	"workbenchColors.deprecated": "Параметр больше не является экспериментальным и был переименован в 'workbench.colorCustomizations'",
-+	"workbenchColors.deprecatedDescription": "Используйте параметр 'workbench.colorCustomizations'",
-+>>>>>>> .their
- 	"editorColors": "Переопределяет цвета редактора и стиль шрифта из текущей выбранной цветовой темы."
- }
-\ No newline at end of file
-changed in both
-  base   100644 bd568a64488e267349f9912913dd7d886c029b8e i18n/trk/extensions/emmet/package.i18n.json
-  our    100644 da0ca75d8cf264d2aa273bacfc4c88c0e06fd83f i18n/trk/extensions/emmet/package.i18n.json
-  their  100644 945f529be303e7ce3323f2bc11757519e7917f8a i18n/trk/extensions/emmet/package.i18n.json
-@@ -32,6 +32,7 @@
- 	"command.decrementNumberByTen": "10 Azalt",
- 	"emmetSyntaxProfiles": "Belirtilen sentaks için profil tanımlayın veya kendi profilinizi belirli kurallarla kullanın.",
- 	"emmetExclude": "Emmet kısaltmalarının genişletilmeyeceği bir diller dizisi.",
-+<<<<<<< .our
- 	"emmetExtensionsPath": "Emmet profileri ve parçacıklarını içeren bir klasör yolu.'",
- 	"emmetShowExpandedAbbreviation": "Genişletilmiş Emmet kısaltmalarını öneriler olarak gösterir.\n\"inMarkupAndStylesheetFilesOnly\" seçeneği\" html, haml, jade, xml, xsl, css, scss, sass, less ve stylus'a uygulanır.\n\"always\" seçeneği işaretleme/css'den bağımsız olarak dosyanın tüm bölümlerine uygulanır.",
- 	"emmetShowAbbreviationSuggestions": "Olası Emmet kısaltmalarını öneriler olarak gösterir. Stil dosyalarında veya emmet.showExpandedAbbreviation'a \"never\" değeri atandığında uygulanamaz.",
-@@ -62,4 +63,11 @@
- 	"emmetPreferencesCssMsProperties": "`-` ile başlayan Emmet kısaltmasında kullanıldığında 'ms' önekini alacak virgülle ayrılmış CSS özellikleri. 'ms' önekinden her zaman kaçınmak için boş bir dize olarak ayarlayın.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "Bulanık eşleştirilmiş kısaltmaların elde etmesi gereken minimum puan (0'dan 1'e kadar). Düşük değerler birçok yanlış pozitif eşleşme oluşturabilir, daha yüksek değerler olası eşleşmeleri azaltabilir.",
- 	"emmetOptimizeStylesheetParsing": "\"false\" değeri atandığında, Emmet kısaltmalarının genişletilmesinde o anki konumun geçerli olup olmadığını belirlemek için tüm dosya ayrıştırılır. \"true\" değeri atandığında, css/scss/less dosyalarında sadece o anki konumun çevresi ayrıştırılır."
-+=======
-+	"emmetExtensionsPath": "Emmet profileri, parçacıkları ve tercihlerini içeren bir klasör yolu. emmet.useNewEmmet, 'true' olarak ayarlandığında, yalnızca profiller eklentiler yolundan kabul edilir.",
-+	"emmetShowExpandedAbbreviation": "Genişletilmiş emmet kısaltmalarını öneriler olarak gösterir.\n\"inMarkupAndStylesheetFilesOnly\" seçeneği\" html, haml, jade, xml, xsl, css, scss, sass, less ve stylus'a uygulanır.\n\"always\" seçeneği işaretleme/css'den bağımsız olarak dosyanın tüm bölümlerine uygulanır.",
-+	"emmetShowAbbreviationSuggestions": "Olası emmet kısaltmalarını öneriler olarak gösterir. Stil dosyalarında veya emmet.showExpandedAbbreviation, \"never\" olarak ayarlandığında uygulanamaz.",
-+	"emmetIncludeLanguages": "Varsayılan olarak desteklenmeyen dillerde emmet kısaltmalarını etkinleştirin. Burada dil ile desteklenen emmet destekli dil arasında eşleme ekleyin.",
-+	"emmetVariables": "Emmet parçacıklarında kullanılacak değişkenler"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 3f17e74fb401bba03573ea5e82027792ca176b87 i18n/trk/extensions/extension-editing/out/extensionLinter.i18n.json
-  our    100644 548a560533a7647174cfb35884c3fb051dd6a218 i18n/trk/extensions/extension-editing/out/extensionLinter.i18n.json
-  their  100644 12dd37bc72ba22ba6a2e37346ff90810bf199295 i18n/trk/extensions/extension-editing/out/extensionLinter.i18n.json
-merged
-  result 100644 d7c20ac4f9a27db43c8550e8ea0fafd7e23fff17 i18n/trk/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-  our    100644 55701eb8ca7edcba08365569ef5cef15063535d4 i18n/trk/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-@@ -7,8 +7,5 @@
- 	"emmetConfigurationTitle": "Emmet",
- 	"triggerExpansionOnTab": "Etkinleştirildiğinde, emmet kısaltmaları TAB tuşuna basıldığında genişletilir. emmet.useNewemmet, 'true' olarak ayarlandığında geçerli değildir.",
- 	"emmetPreferences": "Emmet'in bazı eylemleri ve çözümleyicilerinin davranışını değiştirmek için kullanılacak tercihler. emmet.useNewemmet, 'true' olarak ayarlandığında geçerli değildir.",
--	"emmetSyntaxProfiles": "Belirtilen sentaks için profil tanımlayın veya kendi profilinizi belirli kurallarla kullanın.",
--	"emmetExclude": "Emmet kısaltmalarının genişletilmeyeceği bir diller dizisi.",
--	"emmetExtensionsPath": "Emmet profileri, parçacıkları ve tercihlerini içeren bir klasör yolu. emmet.useNewEmmet, 'true' olarak ayarlandığında, yalnızca profiller eklentiler yolundan kabul edilir.",
- 	"useNewEmmet": "Tüm emmet özellikleri için yeni emmet modüllerini deneyin(sonunda eski tekil emmet kütüphanesinin yerini alacaktır)."
- }
-\ No newline at end of file
-changed in both
-  base   100644 29aaafa9f7d6843f546cdfef52b1cbc1195a4ece i18n/trk/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  our    100644 fc38590cc3008cde13df29309821e754e11630d7 i18n/trk/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  their  100644 2ad5b6fc3719f24cbc819cf93e60e0b5cfd4dcae i18n/trk/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-changed in both
-  base   100644 7ba23fb595cf13e4d218315bf573bad8a9de5368 i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 0dfa05cd7919b2b8edd950bcde47408dafdd57f0 i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 7ded7e9bf4639bddec7d3fdb520cab11c3cfbb8a i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -51,6 +51,7 @@
- 	"workbench.action.terminal.rename.prompt": "Terminal adını girin",
- 	"workbench.action.terminal.focusFindWidget": "Bulma Aracına Odakla",
- 	"workbench.action.terminal.hideFindWidget": "Bulma Aracını Gizle",
-+<<<<<<< .our
- 	"nextTerminalFindTerm": "Sonraki Arama Terimini Göster",
- 	"previousTerminalFindTerm": "Önceki Arama Terimini Göster",
- 	"quickOpenTerm": "Aktif Terminali Değiştir",
-@@ -60,4 +61,7 @@
- 	"workbench.action.terminal.selectToNextCommand": "Sonraki Komuta Kadar Seç",
- 	"workbench.action.terminal.selectToPreviousLine": "Önceki Satıra Kadar Seç",
- 	"workbench.action.terminal.selectToNextLine": "Sonraki Satıra Kadar Seç"
-+=======
-+	"quickOpenTerm": "Aktif terminali değiştir"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 545170b838923410bdfa899bbc63b90cd395f0f8 package.json
-  our    100644 d0e982ce0b76c5b1b5eb02b673e459e47f3353a4 package.json
-  their  100644 2ac85a5a59781e4ffc89ef2981ecfe5a92633fc4 package.json
-@@ -1,7 +1,13 @@
- {
-   "name": "code-oss-dev",
-+<<<<<<< .our
-   "version": "1.27.0",
-   "distro": "a4155d9780fbbc94ead6cb3017dd0fc3806c57b8",
-+=======
-+  "version": "1.15.1",
-+  "electronVersion": "1.6.6",
-+  "distro": "ff145171d1200edd43f053ec353f513435914b5f",
-+>>>>>>> .their
-   "author": {
-     "name": "Microsoft Corporation"
-   },
-changed in both
-  base   100644 b40d18fabcf7a11767324ef5cd5d0006c27fb2cf src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.ts
-  our    100644 42968c4b84603ff59a9acfd4957937949e3cc7cd src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.ts
-  their  100644 fc9136fce72fa856746b6d08c7abb2ba8a7b1351 src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.ts
-@@ -10,8 +10,11 @@
- import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
- import { KeyCode } from 'vs/base/common/keyCodes';
- import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-+<<<<<<< .our
- import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
- import { MenuId } from 'vs/platform/actions/common/actions';
-+=======
-+>>>>>>> .their
- 
- class ExpandAbbreviationAction extends EmmetEditorAction {
- 
-@@ -25,6 +28,7 @@
- 			kbOpts: {
- 				primary: KeyCode.Tab,
- 				kbExpr: ContextKeyExpr.and(
-+<<<<<<< .our
- 					EditorContextKeys.editorTextFocus,
- 					EditorContextKeys.tabDoesNotMoveFocus,
- 					ContextKeyExpr.has('config.emmet.triggerExpansionOnTab')
-@@ -36,6 +40,12 @@
- 				group: '5_insert',
- 				title: nls.localize({ key: 'miEmmetExpandAbbreviation', comment: ['&& denotes a mnemonic'] }, "Emmet: E&&xpand Abbreviation"),
- 				order: 3
-+=======
-+					EditorContextKeys.textFocus,
-+					EditorContextKeys.tabDoesNotMoveFocus,
-+					ContextKeyExpr.has('config.emmet.triggerExpansionOnTab')
-+				)
-+>>>>>>> .their
- 			}
- 		});
- 
-changed in both
-  base   100644 440d91b1f73b61070c8d8042233684c5ef4d1608 src/vs/workbench/parts/search/common/queryBuilder.ts
-  our    100644 08bea8ac1cd1ac176f945e3b17a9312781a25be1 src/vs/workbench/parts/search/common/queryBuilder.ts
-  their  100644 f1293649fd9cc6b724a508f6f8b2bdb10e8d48af src/vs/workbench/parts/search/common/queryBuilder.ts
-@@ -144,7 +144,11 @@
- 					p = '*' + p; // convert ".js" to "*.js"
- 				}
- 
-+<<<<<<< .our
- 				return expandGlobalGlob(p);
-+=======
-+				return toGlobalGlob(p);
-+>>>>>>> .their
- 			});
- 		const exprSegments = arrays.flatten(expandedExprSegments);
- 
-@@ -361,6 +365,7 @@
- }
- 
- /**
-+<<<<<<< .our
-  * Note - we used {} here previously but ripgrep can't handle nested {} patterns. See https://github.com/Microsoft/vscode/issues/32761
-  */
- function expandGlobalGlob(pattern: string): string[] {
-@@ -370,4 +375,11 @@
- 	];
- 
- 	return patterns.map(p => p.replace(/\*\*\/\*\*/g, '**'));
-+=======
-+ * Avoid double ** pattern, see https://github.com/Microsoft/vscode/issues/32325
-+ */
-+function toGlobalGlob(pattern: string): string {
-+	const globalGlob = strings.format('{**/{0}/**,**/{0}}', pattern); // convert foo to {**/foo/**,**/foo} to cover files and folders
-+	return globalGlob.replace(/\*\*([/\\]\*\*)+/g, '**');
-+>>>>>>> .their
- }
-changed in both
-  base   100644 ec15b35db65b8bb8611fbaec46070d30490e8c9f src/vs/workbench/parts/search/test/common/queryBuilder.test.ts
-  our    100644 4ac216e7e239085454537c43c8b1fc4227e4b3e1 src/vs/workbench/parts/search/test/common/queryBuilder.test.ts
-  their  100644 2fff34d2b40cf76ef982f4eea15778398d8cb4c7 src/vs/workbench/parts/search/test/common/queryBuilder.test.ts
-@@ -327,8 +327,14 @@
- 				folderQueries: [{
- 					folder: ROOT_1_URI
- 				}],
-+<<<<<<< .our
- 				excludePattern: patternsToIExpression(...globalGlob('*.js')),
- 				type: QueryType.Text
-+=======
-+				excludePattern: patternsToIExpression(globalGlob('*.js')),
-+				type: QueryType.Text,
-+				useRipgrep: true
-+>>>>>>> .their
- 			});
- 
- 		assertEqualQueries(
-@@ -345,8 +351,14 @@
- 				folderQueries: [{
- 					folder: ROOT_1_URI
- 				}],
-+<<<<<<< .our
- 				includePattern: patternsToIExpression(...globalGlob('*.txt')),
- 				type: QueryType.Text
-+=======
-+				includePattern: patternsToIExpression(globalGlob('*.txt')),
-+				type: QueryType.Text,
-+				useRipgrep: true
-+>>>>>>> .their
- 			});
- 	});
- 
-@@ -371,6 +383,24 @@
- 			].forEach(([includePattern, expectedPatterns]) => testSimpleIncludes(<string>includePattern, <string[]>expectedPatterns));
- 		});
- 
-+		test('double-star patterns are normalized', () => {
-+			function testLiteralIncludes(includePattern: string, expectedPattern: string): void {
-+				assert.deepEqual(
-+					queryBuilder.parseSearchPaths(includePattern),
-+					<ISearchPathsResult>{
-+						pattern: patternsToIExpression(expectedPattern)
-+					},
-+					includePattern);
-+			}
-+
-+			[
-+				['**/*.*', '{**/*.*/**,**/*.*}'],
-+				['foo/**', '{**/foo/**,**/foo/**}'],
-+				['**/**/foo', '{**/foo/**,**/foo}'],
-+				['**/**', '{**,**}']
-+			].forEach(([includePattern, expectedPattern]) => testLiteralIncludes(includePattern, expectedPattern));
-+		});
-+
- 		function testIncludes(includePattern: string, expectedResult: ISearchPathsResult): void {
- 			assertEqualSearchPathResults(
- 				queryBuilder.parseSearchPaths(includePattern),
-@@ -879,11 +909,17 @@
- 	return q;
- }
- 
-+<<<<<<< .our
- function globalGlob(pattern: string): string[] {
- 	return [
- 		`**/${pattern}/**`,
- 		`**/${pattern}`
- 	];
-+=======
-+function globalGlob(str: string): string {
-+	const globalGlob = `{**/${str}/**,**/${str}}`;
-+	return globalGlob.replace(/\*\*([/\\]\*\*)+/g, '**');
-+>>>>>>> .their
- }
- 
- function patternsToIExpression(...patterns: string[]): IExpression {
-changed in both
-  base   100644 ce7b9dafe0c04397a2756f5e7573750617586e82 src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
-  our    100644 04d9dcba251cf79c28429027cda3ca3b0c10a29c src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
-  their  100644 19bee0cac6c2cedda599481e7e2d382f3a514141 src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
-removed in local
-  base   100644 f9a49ee9a4edd8db0f00e9414313ecbc7be72ca3 src/vs/workbench/parts/terminal/electron-browser/windowsShellHelper.ts
-  their  100644 4effb4b94664237abb90670a2a1b73dc2248345a src/vs/workbench/parts/terminal/electron-browser/windowsShellHelper.ts
-changed in both
-  base   100644 bda3dbff7de334823ba13972eb03a33d4bfad62e src/vs/workbench/services/search/node/fileSearch.ts
-  our    100644 b1683441fd7f00f5af261a34980bf07cbba6d344 src/vs/workbench/services/search/node/fileSearch.ts
-  their  100644 f0b617d4fbfe1bc001c15a3359c8af50f7c8d341 src/vs/workbench/services/search/node/fileSearch.ts
diff --git a/app/test/fixtures/merge-parser/vscode/merge-release-1.16-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-release-1.16-into-master.txt
deleted file mode 100644
index 9f865aa76c9..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-release-1.16-into-master.txt
+++ /dev/null
@@ -1,21107 +0,0 @@
-changed in both
-  base   100644 1759f356fd6949b30ec08947aa84b341b5d0dfeb build/gulpfile.vscode.js
-  our    100644 d79071e56bcfc53b3448052cc08bd7247bd7e789 build/gulpfile.vscode.js
-  their  100644 1bac79a2a4cb91fccae564a6d5f75db681877a32 build/gulpfile.vscode.js
-@@ -44,7 +44,15 @@
- 	.concat(baseModules);
- 
- // Build
-+<<<<<<< .our
- const builtInExtensions = require('./builtInExtensions.json');
-+=======
-+
-+const builtInExtensions = [
-+	{ name: 'ms-vscode.node-debug', version: '1.16.10' },
-+	{ name: 'ms-vscode.node-debug2', version: '1.16.9' }
-+];
-+>>>>>>> .their
- 
- const excludedExtensions = [
- 	'vscode-api-tests',
-changed in both
-  base   100644 016140b256cf952b0058e798da34e8ee761531f0 extensions/emmet/src/abbreviationActions.ts
-  our    100644 26444af31e5994ebc9cddebb9de151cacae3311b extensions/emmet/src/abbreviationActions.ts
-  their  100644 5d341c2c636250d3b61afb3be47fa87b450b0368 extensions/emmet/src/abbreviationActions.ts
-@@ -4,8 +4,14 @@
-  *--------------------------------------------------------------------------------------------*/
- 
- import * as vscode from 'vscode';
-+<<<<<<< .our
- import { Node, HtmlNode, Rule, Property, Stylesheet } from 'EmmetNode';
- import { getEmmetHelper, getNode, getInnerRange, getMappingForIncludedLanguages, parseDocument, validate, getEmmetConfiguration, isStyleSheet, getEmmetMode, parsePartialStylesheet, isStyleAttribute, getEmbeddedCssNodeIfAny, isTemplateScript } from './util';
-+=======
-+import { Node, HtmlNode, Rule } from 'EmmetNode';
-+import { getNode, getInnerRange, getMappingForIncludedLanguages, parseDocument, validate, getEmmetConfiguration } from './util';
-+import { getExpandOptions, extractAbbreviation, extractAbbreviationFromText, isStyleSheet, isAbbreviationValid, getEmmetMode, expandAbbreviation } from 'vscode-emmet-helper';
-+>>>>>>> .their
- 
- const trimRegex = /[\u00a0]*[\d|#|\-|\*|\u2022]+\.?/;
- const hexColorRegex = /^#[\d,a-f,A-F]{0,6}$/;
-@@ -573,9 +579,14 @@
- /**
-  * Expands abbreviation as detailed in given input.
-  */
-+<<<<<<< .our
- function expandAbbr(input: ExpandAbbreviationInput): string | undefined {
- 	const helper = getEmmetHelper();
- 	const expandOptions = helper.getExpandOptions(input.syntax, getEmmetConfiguration(input.syntax), input.filter);
-+=======
-+function expandAbbr(input: ExpandAbbreviationInput): string {
-+	const expandOptions = getExpandOptions(input.syntax, getEmmetConfiguration(input.syntax), input.filter);
-+>>>>>>> .their
- 
- 	if (input.textToWrap) {
- 		if (input.filter && input.filter.indexOf('t') > -1) {
-changed in both
-  base   100644 178c5193a450c69cd45f4ce0b94c433f5f235718 extensions/emmet/src/defaultCompletionProvider.ts
-  our    100644 92888ea1c4be910d2e4ccaa101d3cfb8349a410d extensions/emmet/src/defaultCompletionProvider.ts
-  their  100644 5c78aea06a0e2204264e9dedf1edb36f9ad2f8c0 extensions/emmet/src/defaultCompletionProvider.ts
-@@ -134,7 +134,11 @@
- 				return;
- 			}
- 
-+<<<<<<< .our
- 			let result = helper.doComplete(document, position, syntax, getEmmetConfiguration(syntax!));
-+=======
-+			let result: vscode.CompletionList = doComplete(document, position, syntax, getEmmetConfiguration(syntax));
-+>>>>>>> .their
- 			let newItems: vscode.CompletionItem[] = [];
- 			if (result && result.items) {
- 				result.items.forEach((item: any) => {
-changed in both
-  base   100644 64060a5970e64a6fa0fc0f99084680811b590c2c extensions/emmet/src/test/abbreviationAction.test.ts
-  our    100644 b5fb87d8b0791993b65959e4e4c9219aa4e8388c extensions/emmet/src/test/abbreviationAction.test.ts
-  their  100644 4dd97f7a7e19f2eeb9764bb7f3c4430fd4cd2209 extensions/emmet/src/test/abbreviationAction.test.ts
-@@ -476,6 +476,7 @@
- 		});
- 	});
- 
-+<<<<<<< .our
- 	test('No expanding text inside open tag in completion list (jsx)', () => {
- 		return testNoCompletion('jsx', htmlContents, new Selection(2, 4, 2, 4));
- 	});
-@@ -483,6 +484,52 @@
- 	test('No expanding tag that is opened, but not closed in completion list (jsx)', () => {
- 		return testNoCompletion('jsx', htmlContents, new Selection(9, 6, 9, 6));
- 	});
-+=======
-+suite('Tests for jsx, xml and xsl', () => {
-+	teardown(closeAllEditors);
-+	
-+		test('Expand abbreviation with className instead of class in jsx', () => {
-+			return withRandomFileEditor('ul.nav', 'javascriptreact', (editor, doc) => {
-+				editor.selection = new Selection(0, 6, 0, 6);
-+				return expandEmmetAbbreviation({language: 'javascriptreact'}).then(() => {
-+					assert.equal(editor.document.getText(), '<ul className="nav"></ul>');
-+					return Promise.resolve();
-+				});
-+			});
-+		});
-+
-+		test('Expand abbreviation with self closing tags for jsx', () => {
-+			return withRandomFileEditor('img', 'javascriptreact', (editor, doc) => {
-+				editor.selection = new Selection(0, 6, 0, 6);
-+				return expandEmmetAbbreviation({language: 'javascriptreact'}).then(() => {
-+					assert.equal(editor.document.getText(), '<img src="" alt=""/>');
-+					return Promise.resolve();
-+				});
-+			});
-+		});
-+
-+		test('Expand abbreviation with self closing tags for xml', () => {
-+			return withRandomFileEditor('img', 'xml', (editor, doc) => {
-+				editor.selection = new Selection(0, 6, 0, 6);
-+				return expandEmmetAbbreviation({language: 'xml'}).then(() => {
-+					assert.equal(editor.document.getText(), '<img src="" alt=""/>');
-+					return Promise.resolve();
-+				});
-+			});
-+		});
-+
-+		test('Expand abbreviation with no self closing tags for html', () => {
-+			return withRandomFileEditor('img', 'html', (editor, doc) => {
-+				editor.selection = new Selection(0, 6, 0, 6);
-+				return expandEmmetAbbreviation({language: 'html'}).then(() => {
-+					assert.equal(editor.document.getText(), '<img src="" alt="">');
-+					return Promise.resolve();
-+				});
-+			});
-+		});
-+
-+});
-+>>>>>>> .their
- 
- 	test('No expanding text inside open tag when there is no closing tag in completion list (jsx)', () => {
- 		return testNoCompletion('jsx', htmlContents, new Selection(9, 8, 9, 8));
-changed in both
-  base   100644 0cf6f3518ad9ef29f07e888527fb37eb6d8ebb49 extensions/emmet/src/util.ts
-  our    100644 b51d04d6cec49e4cad958e1de44c033b7862b549 extensions/emmet/src/util.ts
-  their  100644 66f8ba03fc8990ff1f943f517674fd45d5683cfc extensions/emmet/src/util.ts
-@@ -8,6 +8,7 @@
- import parseStylesheet from '@emmetio/css-parser';
- import { Node, HtmlNode, CssToken, Property, Rule, Stylesheet } from 'EmmetNode';
- import { DocumentStreamReader } from './bufferStream';
-+<<<<<<< .our
- 
- let _emmetHelper: any;
- let _currentExtensionsPath: string | undefined = undefined;
-@@ -32,12 +33,18 @@
- }
- 
- export const LANGUAGE_MODES: any = {
-+=======
-+import { isStyleSheet } from 'vscode-emmet-helper';
-+
-+export const LANGUAGE_MODES: Object = {
-+>>>>>>> .their
- 	'html': ['!', '.', '}', ':', '*', '$', ']', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'],
- 	'jade': ['!', '.', '}', ':', '*', '$', ']', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'],
- 	'slim': ['!', '.', '}', ':', '*', '$', ']', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'],
- 	'haml': ['!', '.', '}', ':', '*', '$', ']', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'],
- 	'xml': ['.', '}', '*', '$', ']', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'],
- 	'xsl': ['!', '.', '}', '*', '$', ']', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'],
-+<<<<<<< .our
- 	'css': [':', '-', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'],
- 	'scss': [':', '-', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'],
- 	'sass': [':', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'],
-@@ -45,6 +52,15 @@
- 	'stylus': [':', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'],
- 	'javascriptreact': ['!', '.', '}', '*', '$', ']', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'],
- 	'typescriptreact': ['!', '.', '}', '*', '$', ']', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9']
-+=======
-+	'css': [':', ';'],
-+	'scss': [':', ';'],
-+	'sass': [':'],
-+	'less': [':', ';'],
-+	'stylus': [':'],
-+	'javascriptreact': ['.', '}', '*', '$', ']', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'],
-+	'typescriptreact': ['.', '}', '*', '$', ']', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9']
-+>>>>>>> .their
- };
- 
- const allowedMimeTypesInScriptTag = ['text/html', 'text/plain', 'text/x-template', 'text/template', 'text/ng-template'];
-@@ -481,7 +497,11 @@
- export function getEmmetConfiguration(syntax: string) {
- 	const emmetConfig = vscode.workspace.getConfiguration('emmet');
- 	const syntaxProfiles = Object.assign({}, emmetConfig['syntaxProfiles'] || {});
-+<<<<<<< .our
- 	const preferences = Object.assign({}, emmetConfig['preferences'] || {});
-+=======
-+
-+>>>>>>> .their
- 	// jsx, xml and xsl syntaxes need to have self closing tags unless otherwise configured by user
- 	if (syntax === 'jsx' || syntax === 'xml' || syntax === 'xsl') {
- 		syntaxProfiles[syntax] = syntaxProfiles[syntax] || {};
-@@ -489,10 +509,14 @@
- 			&& !syntaxProfiles[syntax].hasOwnProperty('self_closing_tag') // Old Emmet format
- 			&& !syntaxProfiles[syntax].hasOwnProperty('selfClosingStyle') // Emmet 2.0 format
- 		) {
-+<<<<<<< .our
- 			syntaxProfiles[syntax] = {
- 				...syntaxProfiles[syntax],
- 				selfClosingStyle: 'xml'
- 			};
-+=======
-+			syntaxProfiles[syntax]['selfClosingStyle'] = 'xml';
-+>>>>>>> .their
- 		}
- 	}
- 
-@@ -501,9 +525,13 @@
- 		showExpandedAbbreviation: emmetConfig['showExpandedAbbreviation'],
- 		showAbbreviationSuggestions: emmetConfig['showAbbreviationSuggestions'],
- 		syntaxProfiles,
-+<<<<<<< .our
- 		variables: emmetConfig['variables'],
- 		excludeLanguages: emmetConfig['excludeLanguages'],
- 		showSuggestionsAsSnippets: emmetConfig['showSuggestionsAsSnippets']
-+=======
-+		variables: emmetConfig['variables']
-+>>>>>>> .their
- 	};
- }
- 
-changed in both
-  base   100644 92a71b1697a25af07ed33285005325b6ed008fa1 extensions/git/src/git.ts
-  our    100644 a360264a394dd40505d22501f165404fbe228c50 extensions/git/src/git.ts
-  their  100644 ec95f7ffe8de84ffaa566aae3a6ab0e059f2aa26 extensions/git/src/git.ts
-changed in both
-  base   100644 8d571c01747e1eba2cb92d4361351ea0a123445a extensions/php/syntaxes/php.tmLanguage.json
-  our    100644 62153a2b04bbac4a7c7a8c7a98da3448aebc1e5b extensions/php/syntaxes/php.tmLanguage.json
-  their  100644 3f4d3f537f67534464dfc7bbdade9094f07c11db extensions/php/syntaxes/php.tmLanguage.json
-@@ -1,9 +1,10 @@
- {
- 	"information_for_contributors": [
--		"This file has been converted from https://github.com/atom/language-php/blob/master/grammars/php.cson",
-+		"This file has been converted from https://github.com/roblourens/language-php/blob/revertBraceMatching/grammars/php.cson",
- 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
- 		"Once accepted there, we are happy to receive an update request."
- 	],
-+<<<<<<< .our
- 	"version": "https://github.com/atom/language-php/commit/13842b6dfb4568f76e8fa0c08dbff74347ee13c6",
- 	"scopeName": "source.php",
- 	"patterns": [
-@@ -42,6 +43,31 @@
- 				}
- 			},
- 			"name": "meta.interface.php",
-+=======
-+	"version": "https://github.com/roblourens/language-php/commit/91d50ab5f871ea2d11b4c511dc0b9a972e4ac5ce",
-+	"scopeName": "text.html.php",
-+	"name": "PHP",
-+	"fileTypes": [
-+		"aw",
-+		"ctp",
-+		"inc",
-+		"install",
-+		"module",
-+		"php",
-+		"php_cs",
-+		"php3",
-+		"php4",
-+		"php5",
-+		"phpt",
-+		"phtml",
-+		"profile"
-+	],
-+	"firstLineMatch": "(?x)\n# Hashbang\n^\\#!.*(?:\\s|\\/)\n  php\\d?\n(?:$|\\s)\n|\n# Modeline\n(?i:\n  # Emacs\n  -\\*-(?:\\s*(?=[^:;\\s]+\\s*-\\*-)|(?:.*?[;\\s]|(?<=-\\*-))mode\\s*:\\s*)\n    php\n  (?=[\\s;]|(?<![-*])-\\*-).*?-\\*-\n  |\n  # Vim\n  (?:(?:\\s|^)vi(?:m[<=>]?\\d+|m)?|\\sex)(?=:(?=\\s*set?\\s[^\\n:]+:)|:(?!\\s*set?\\s))(?:(?:\\s|\\s*:\\s*)\\w*(?:\\s*=(?:[^\\n\\\\\\s]|\\\\.)*)?)*[\\s:](?:filetype|ft|syntax)\\s*=\n    (?:php|phtml)\n  (?=\\s|:|$)\n)",
-+	"foldingStartMarker": "(/\\*|\\{\\s*$|<<<HTML)",
-+	"foldingStopMarker": "(\\*/|^\\s*\\}|^HTML;)",
-+	"injections": {
-+		"text.html.php - (meta.embedded | meta.tag), L:text.html.php meta.tag, L:text.html.php source.js": {
-+>>>>>>> .their
- 			"patterns": [
- 				{
- 					"include": "#namespace"
-@@ -1497,7 +1523,114 @@
- 							"name": "punctuation.definition.string.php"
- 						},
- 						"3": {
-+<<<<<<< .our
- 							"name": "keyword.operator.heredoc.php"
-+=======
-+							"name": "invalid.illegal.trailing-whitespace.php"
-+						}
-+					},
-+					"end": "^(\\2)\\b",
-+					"endCaptures": {
-+						"1": {
-+							"name": "keyword.operator.nowdoc.php"
-+						}
-+					}
-+				}
-+			]
-+		},
-+		"instantiation": {
-+			"begin": "(?i)(new)\\s+",
-+			"beginCaptures": {
-+				"1": {
-+					"name": "keyword.other.new.php"
-+				}
-+			},
-+			"end": "(?i)(?=[^a-z0-9_\\x{7f}-\\x{ff}\\\\])",
-+			"patterns": [
-+				{
-+					"match": "(?i)(parent|static|self)(?![a-z0-9_\\x{7f}-\\x{ff}])",
-+					"name": "storage.type.php"
-+				},
-+				{
-+					"include": "#class-name"
-+				},
-+				{
-+					"include": "#variable-name"
-+				}
-+			]
-+		},
-+		"interpolation": {
-+			"patterns": [
-+				{
-+					"match": "\\\\[0-7]{1,3}",
-+					"name": "constant.numeric.octal.php"
-+				},
-+				{
-+					"match": "\\\\x[0-9A-Fa-f]{1,2}",
-+					"name": "constant.numeric.hex.php"
-+				},
-+				{
-+					"match": "\\\\[enrt\\\\\\$\\\"]",
-+					"name": "constant.character.escape.php"
-+				},
-+				{
-+					"begin": "{(?=\\$.*?})",
-+					"beginCaptures": {
-+						"0": {
-+							"name": "punctuation.definition.variable.php"
-+						}
-+					},
-+					"end": "}",
-+					"endCaptures": {
-+						"0": {
-+							"name": "punctuation.definition.variable.php"
-+						}
-+					},
-+					"patterns": [
-+						{
-+							"include": "#language"
-+						}
-+					]
-+				},
-+				{
-+					"include": "#variable-name"
-+				}
-+			]
-+		},
-+		"invoke-call": {
-+			"captures": {
-+				"1": {
-+					"name": "punctuation.definition.variable.php"
-+				},
-+				"2": {
-+					"name": "variable.other.php"
-+				}
-+			},
-+			"match": "(?i)(\\$+)([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)(?=\\s*\\()",
-+			"name": "meta.function-call.invoke.php"
-+		},
-+		"language": {
-+			"patterns": [
-+				{
-+					"include": "#comments"
-+				},
-+				{
-+					"match": "{",
-+					"name": "punctuation.section.scope.begin.php"
-+				},
-+				{
-+					"match": "}",
-+					"name": "punctuation.section.scope.end.php"
-+				},
-+				{
-+					"begin": "(?i)^\\s*(interface)\\s+([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)\\s*(extends)?\\s*",
-+					"beginCaptures": {
-+						"1": {
-+							"name": "storage.type.interface.php"
-+						},
-+						"2": {
-+							"name": "entity.name.type.interface.php"
-+>>>>>>> .their
- 						},
- 						"5": {
- 							"name": "invalid.illegal.trailing-whitespace.php"
-@@ -1967,12 +2100,32 @@
- 					"name": "constant.character.escape.hex.php"
- 				},
- 				{
-+<<<<<<< .our
- 					"match": "\\\\u{[0-9A-Fa-f]+}",
- 					"name": "constant.character.escape.unicode.php"
- 				},
- 				{
- 					"match": "\\\\[nrtvef$\\\\]",
- 					"name": "constant.character.escape.php"
-+=======
-+					"begin": "\\[",
-+					"beginCaptures": {
-+						"0": {
-+							"name": "punctuation.section.array.begin.php"
-+						}
-+					},
-+					"end": "\\]",
-+					"endCaptures": {
-+						"0": {
-+							"name": "punctuation.section.array.end.php"
-+						}
-+					},
-+					"patterns": [
-+						{
-+							"include": "#language"
-+						}
-+					]
-+>>>>>>> .their
- 				},
- 				{
- 					"begin": "{(?=\\$.*?})",
-removed in local
-  base   100644 140c9fc9ea4a5b872a929cf4f1f1e73a384338c1 extensions/typescript/package.json
-  their  100644 7f24be0df8b79b28644608a239967c175b9bd044 extensions/typescript/package.json
-changed in both
-  base   100644 f5b62deb3890d3df35cfd78e85e5b7c73c893c2a i18n/chs/extensions/css/package.i18n.json
-  our    100644 52369e22e58426a42b55c9ff7f02f2eb23faa940 i18n/chs/extensions/css/package.i18n.json
-  their  100644 8f8d582630b21d725bbfa3abac2bb0e848b83a51 i18n/chs/extensions/css/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,73 @@
- 	],
- 	"displayName": "CSS 语言基础功能",
- 	"description": "为 CSS、LESS 和 SCSS 文件中提供语法高亮和括号匹配功能。"
-+=======
-+	"css.lint.argumentsInColorFunction.desc": "参数数量无效",
-+	"css.lint.boxModel.desc": "使用边距或边框时，不要使用宽度或高度",
-+	"css.lint.compatibleVendorPrefixes.desc": "使用供应商特定前缀时，确保同时包括所有其他供应商特定属性",
-+	"css.lint.duplicateProperties.desc": "不要使用重复的样式定义",
-+	"css.lint.emptyRules.desc": "不要使用空规则集",
-+	"css.lint.float.desc": "避免使用“float”。浮动会带来脆弱的 CSS，如果布局的某一方面更改，将很容易破坏 CSS。",
-+	"css.lint.fontFaceProperties.desc": "@font-face 规则必须定义 \"src\" 和 \"font-family\" 属性",
-+	"css.lint.hexColorLength.desc": "十六进制颜色必须由三个或六个十六进制数字组成",
-+	"css.lint.idSelector.desc": "选择器不应包含 ID，因为这些规则与 HTML 的耦合过于紧密。",
-+	"css.lint.ieHack.desc": "仅当支持 IE7 及更低版本时，才需要 IE hack",
-+	"css.lint.important.desc": "避免使用 !important。它表明整个 CSS 的特异性已经失去控制且需要重构。",
-+	"css.lint.importStatement.desc": "Import 语句不会并行加载",
-+	"css.lint.propertyIgnoredDueToDisplay.desc": "因显示而忽略属性。例如，使用 \"display: inline\"时，宽度、高度、上边距、下边距和 float 属性将不起作用",
-+	"css.lint.universalSelector.desc": "已知通配选择符 (*) 慢",
-+	"css.lint.unknownProperties.desc": "未知的属性。",
-+	"css.lint.unknownVendorSpecificProperties.desc": "未知的供应商特定属性。",
-+	"css.lint.vendorPrefix.desc": "使用供应商特定前缀时，还应包括标准属性",
-+	"css.lint.zeroUnits.desc": "零不需要单位",
-+	"css.trace.server.desc": "跟踪 VS Code 与 CSS 语言服务器之间的通信。",
-+	"css.validate.title": "控制 CSS 验证和问题严重性。",
-+	"css.validate.desc": "启用或禁用所有验证",
-+	"less.lint.argumentsInColorFunction.desc": "参数数量无效",
-+	"less.lint.boxModel.desc": "使用边距或边框时，不要使用宽度或高度",
-+	"less.lint.compatibleVendorPrefixes.desc": "使用供应商特定前缀时，确保同时包括所有其他供应商特定属性",
-+	"less.lint.duplicateProperties.desc": "不要使用重复的样式定义",
-+	"less.lint.emptyRules.desc": "不要使用空规则集",
-+	"less.lint.float.desc": "避免使用“float”。浮动会带来脆弱的 CSS，如果布局的某一方面更改，将很容易破坏 CSS。",
-+	"less.lint.fontFaceProperties.desc": "@font-face 规则必须定义 \"src\" 和 \"font-family\" 属性",
-+	"less.lint.hexColorLength.desc": "十六进制颜色必须由三个或六个十六进制数字组成",
-+	"less.lint.idSelector.desc": "选择器不应包含 ID，因为这些规则与 HTML 的耦合过于紧密。",
-+	"less.lint.ieHack.desc": "仅当支持 IE7 及更低版本时，才需要 IE hack",
-+	"less.lint.important.desc": "避免使用 !important。它表明整个 CSS 的特异性已经失去控制且需要重构。",
-+	"less.lint.importStatement.desc": "Import 语句不会并行加载",
-+	"less.lint.propertyIgnoredDueToDisplay.desc": "因显示而忽略属性。例如，使用 \"display: inline\"时，宽度、高度、上边距、下边距和 float 属性将不起作用",
-+	"less.lint.universalSelector.desc": "已知通配选择符 (*) 慢",
-+	"less.lint.unknownProperties.desc": "未知的属性。",
-+	"less.lint.unknownVendorSpecificProperties.desc": "未知的供应商特定属性。",
-+	"less.lint.vendorPrefix.desc": "使用供应商特定前缀时，还应包括标准属性",
-+	"less.lint.zeroUnits.desc": "零不需要单位",
-+	"less.validate.title": "控制 LESS 验证和问题严重性。",
-+	"less.validate.desc": "启用或禁用所有验证",
-+	"scss.lint.argumentsInColorFunction.desc": "参数数量无效",
-+	"scss.lint.boxModel.desc": "使用边距或边框时，不要使用宽度或高度",
-+	"scss.lint.compatibleVendorPrefixes.desc": "使用供应商特定前缀时，确保同时包括所有其他供应商特定属性",
-+	"scss.lint.duplicateProperties.desc": "不要使用重复的样式定义",
-+	"scss.lint.emptyRules.desc": "不要使用空规则集",
-+	"scss.lint.float.desc": "避免使用“float”。浮动会带来脆弱的 CSS，如果布局的某一方面更改，将很容易破坏 CSS。",
-+	"scss.lint.fontFaceProperties.desc": "@font-face 规则必须定义 \"src\" 和 \"font-family\" 属性",
-+	"scss.lint.hexColorLength.desc": "十六进制颜色必须由三个或六个十六进制数字组成",
-+	"scss.lint.idSelector.desc": "选择器不应包含 ID，因为这些规则与 HTML 的耦合过于紧密。",
-+	"scss.lint.ieHack.desc": "仅当支持 IE7 及更低版本时，才需要 IE hack",
-+	"scss.lint.important.desc": "避免使用 !important。它表明整个 CSS 的特异性已经失去控制且需要重构。",
-+	"scss.lint.importStatement.desc": "Import 语句不会并行加载",
-+	"scss.lint.propertyIgnoredDueToDisplay.desc": "因显示而忽略属性。例如，使用 \"display: inline\"时，宽度、高度、上边距、下边距和 float 属性将不起作用",
-+	"scss.lint.universalSelector.desc": "已知通配选择符 (*) 慢",
-+	"scss.lint.unknownProperties.desc": "未知的属性。",
-+	"scss.lint.unknownVendorSpecificProperties.desc": "未知的供应商特定属性。",
-+	"scss.lint.vendorPrefix.desc": "使用供应商特定前缀时，还应包括标准属性",
-+	"scss.lint.zeroUnits.desc": "零不需要单位",
-+	"scss.validate.title": "控制 SCSS 验证和问题严重性。",
-+	"scss.validate.desc": "启用或禁用所有验证",
-+	"less.colorDecorators.enable.desc": "启用或禁用颜色修饰器",
-+	"scss.colorDecorators.enable.desc": "启用或禁用颜色修饰器",
-+	"css.colorDecorators.enable.desc": "启用或禁用颜色修饰器",
-+	"css.colorDecorators.enable.deprecationMessage": "已弃用设置 \"css.colorDecorators.enabl\"，请改用 \"editor.colorDecorators\"。",
-+	"scss.colorDecorators.enable.deprecationMessage": "已弃用设置 \"scss.colorDecorators.enable\"，请改用 \"editor.colorDecorators\"。",
-+	"less.colorDecorators.enable.deprecationMessage": "已弃用设置 \"less.colorDecorators.enable\"，请改用 \"editor.colorDecorators\"。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a6d0d75c963a08dc07b7f6a47e52060a07594f56 i18n/chs/extensions/emmet/package.i18n.json
-  our    100644 5cf0382870fbe5abfd1dea23749ad88b51794f9a i18n/chs/extensions/emmet/package.i18n.json
-  their  100644 fe933ada874345555371d31fdd5830e881508383 i18n/chs/extensions/emmet/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -7,6 +8,8 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"description": "适用于 VS Code 的 Emmet 支持",
-+=======
-+>>>>>>> .their
- 	"command.wrapWithAbbreviation": "使用缩写包围",
- 	"command.wrapIndividualLinesWithAbbreviation": "输入缩写包围个别行",
- 	"command.removeTag": "移除标签",
-@@ -32,12 +35,21 @@
- 	"command.decrementNumberByTen": "减少 10",
- 	"emmetSyntaxProfiles": "为指定的语法定义配置文件或使用带有特定规则的配置文件。",
- 	"emmetExclude": "不应展开 Emmet 缩写的语言数组。",
-+<<<<<<< .our
- 	"emmetExtensionsPath": "包含 Emmet 配置文件与代码片段的文件夹路径。",
- 	"emmetShowExpandedAbbreviation": "在建议中显示展开的 Emmet 缩写。\n选择 \"inMarkupAndStylesheetFilesOnly\" 选项将仅应用于 html、haml、jade、slim、xml、xsl、css、scss、sass、less 和 stylus 文件。\n选择 \"always\" 选项将应用于所有适用文件不限于标记或 CSS 的所有部分。",
- 	"emmetShowAbbreviationSuggestions": "显示可能的 Emmet 缩写作为建议。在样式表中或当 emmet.showExpandedAbbreviation 设置为 \"never\" 时不适用。",
- 	"emmetIncludeLanguages": "在默认不支持 Emmet 的语言中启用 Emmet 缩写功能。在此添加该语言与受支持的语言间的映射。\n示例: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
- 	"emmetVariables": "用于 Emmet 代码片段的变量",
- 	"emmetTriggerExpansionOnTab": "启用后，按下 TAB 键，将展开 Emmet 缩写。",
-+=======
-+	"emmetExtensionsPath": "含有 Emmet 配置文件和片段的文件夹路径。",
-+	"emmetShowExpandedAbbreviation": "显示扩展的 Emmet 缩写作为建议。\n\"inMarkupAndStylesheetFilesOnly\" 选项适用于 html、haml、jade、slim、xml、xsl、css、scss、sass、less 和 stylus。\n\"always\" 选项适用于 markup/css 文件的所有部分。",
-+	"emmetShowAbbreviationSuggestions": "显示可能的 Emmet 缩写作为建议。在风格表中或将 emmet.showExpandedAbbreviation 设置为 \"never\" 时不适用。",
-+	"emmetIncludeLanguages": "启用使用默认不支持的语言的 Emmet 缩写。在此添加该语言与支持 Emmet 的语言之间的映射。示例: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
-+	"emmetVariables": "要用于 Emmet 代码片段的变量",
-+	"emmetTriggerExpansionOnTab": "启用后，按 TAB 键时，将展开 Emmet 缩写。",
-+>>>>>>> .their
- 	"emmetPreferences": "用于修改 Emmet 某些操作和解析程序的行为的首选项。",
- 	"emmetPreferencesIntUnit": "整数值的默认单位",
- 	"emmetPreferencesFloatUnit": "浮点数值的默认单位",
-@@ -47,6 +59,7 @@
- 	"emmetPreferencesCssBetween": "展开 CSS 缩写时在 CSS 属性之间放置的符号",
- 	"emmetPreferencesSassBetween": "在 Sass 文件中展开 CSS 缩写时在 CSS 属性之间放置的符号",
- 	"emmetPreferencesStylusBetween": "在 Stylus 文件中展开 CSS 缩写时在 CSS 属性之间放置的符号",
-+<<<<<<< .our
- 	"emmetShowSuggestionsAsSnippets": "若为 \"true\"，Emmet 建议将显示为代码片段。你可以在 editor.snippetSuggestions 设置中排列顺序。",
- 	"emmetPreferencesBemElementSeparator": "在使用 BEM 过滤器时，类名使用的元素分隔符",
- 	"emmetPreferencesBemModifierSeparator": "在使用 BEM 过滤器时，类名使用的修饰符分隔符",
-@@ -62,4 +75,7 @@
- 	"emmetPreferencesCssMsProperties": "Emmet 缩写中使用的由 \"-\" 打头有 \"ms\" 前缀的 CSS 属性，使用半角逗号 (\",\") 进行分隔。若要始终避免 \"ms\" 前缀，请设为空字符串。",
- 	"emmetPreferencesCssFuzzySearchMinScore": "显示的缩写模糊匹配应达到的最低分数 (0 到 1 之间)。较低的值可能使匹配错误变多，较高的值可能将不会显示应有的匹配项。",
- 	"emmetOptimizeStylesheetParsing": "当设置为 false 时，将分析整个文件并确定当前位置能否展开 Emmet 缩写。当设置为 true 时，则仅在 CSS/SCSS/LESS 文件中进行分析。"
-+=======
-+	"emmetShowSuggestionsAsSnippets": "若为 \"true\"，Emmet 建议将会显示为代码片段，根据editor.snippetSuggestions 设置进行排列。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f7e87a0d5613a93f1778451f22a9c696ea636c42 i18n/chs/extensions/extension-editing/out/extensionLinter.i18n.json
-  our    100644 605e80db79201225087dde7ac9e675add872dd3b i18n/chs/extensions/extension-editing/out/extensionLinter.i18n.json
-  their  100644 6e684ea67b036fdc53762cb4d272038abb22240d i18n/chs/extensions/extension-editing/out/extensionLinter.i18n.json
-changed in both
-  base   100644 5aebef2e00eb1f6ab88181c7c9285c365efff080 i18n/chs/extensions/git/out/commands.i18n.json
-  our    100644 04fae89946b4fff2a3f253e57b9b96d137dedd28 i18n/chs/extensions/git/out/commands.i18n.json
-  their  100644 5b826945eabead6feaf8b0b15c83703d16cbe2e4 i18n/chs/extensions/git/out/commands.i18n.json
-@@ -13,6 +13,7 @@
- 	"selectFolder": "选择存储库位置",
- 	"cloning": "正在克隆 Git 存储库“{0}”...",
- 	"proposeopen": "是否要打开已克隆存储库?",
-+<<<<<<< .our
- 	"openrepo": "打开存储库",
- 	"add": "添加到工作区",
- 	"proposeopen2": "您是希望打开克隆的存储库，还是将其添加到当前工作区?",
-@@ -20,6 +21,10 @@
- 	"init repo": "初始化存储库",
- 	"create repo": "初始化存储库",
- 	"are you sure": "将在“{0}”中创建 Git 存储库。确定要继续吗？",
-+=======
-+	"path to init": "文件夹路径",
-+	"provide path": "请提供用于初始化 Git 存储库的文件夹路径",
-+>>>>>>> .their
- 	"HEAD not available": "“{0}”的 HEAD 版本不可用。",
- 	"confirm stage files with merge conflicts": "确定要暂存含有合并冲突的 {0} 个文件吗?",
- 	"confirm stage file with merge conflicts": "确定要暂存含有合并冲突的 {0}  吗?",
-@@ -43,10 +48,13 @@
- 	"confirm discard all 2": "{0}\n\n此操作不可撤销，你当前的工作集将会永远丢失。",
- 	"yes discard tracked": "放弃 1  个已跟踪的文件",
- 	"yes discard tracked multiple": "放弃 {0} 个已跟踪的文件",
-+<<<<<<< .our
- 	"unsaved files single": "以下文件尚未保存：{0}。\n\n您要在提交之前保存吗?",
- 	"unsaved files": "当前有 {0} 个文件尚未保存。\n\n您要在提交之前保存吗?",
- 	"save and commit": "全部保存并提交",
- 	"commit": "仍要提交",
-+=======
-+>>>>>>> .their
- 	"no staged changes": "现在没有暂存的更改以供提交\n\n是否要直接自动暂存所有更改并提交？",
- 	"always": "始终",
- 	"no changes": "没有要提交的更改。",
-@@ -66,10 +74,15 @@
- 	"provide tag name": "请提供标签名称",
- 	"tag message": "消息",
- 	"provide tag message": "请提供消息以对标签进行注释",
-+<<<<<<< .our
- 	"no remotes to fetch": "此存储库未配置可以从中抓取的远程存储库。",
- 	"no remotes to pull": "存储库未配置任何可进行拉取的远程存储库。",
-+=======
-+	"no remotes to pull": "存储库未配置任何从其中进行拉取的远程存储库。",
-+>>>>>>> .their
- 	"pick remote pull repo": "选择要从其拉取分支的远程位置",
- 	"no remotes to push": "存储库未配置任何要推送到的远程存储库。",
-+	"push with tags success": "已成功带标签进行推送。",
- 	"nobranch": "请签出一个分支以推送到远程。",
- 	"confirm publish branch": "分支“{0}”没有上游分支。您要发布此分支吗?",
- 	"ok": "确定",
-@@ -78,11 +91,19 @@
- 	"sync is unpredictable": "此操作将推送提交至“{0}/{1}”，并从中拉取提交。",
- 	"never again": "确定，且不再显示",
- 	"no remotes to publish": "存储库未配置任何要发布到的远程存储库。",
-+<<<<<<< .our
- 	"no changes stash": "没有要储藏的更改。",
- 	"provide stash message": "提供储藏消息(可选)",
- 	"stash message": "储藏消息",
- 	"no stashes": "没有可以恢复的储藏。",
- 	"pick stash to pop": "选择要弹出的储藏",
-+=======
-+	"no changes stash": "没有要存储的更改。",
-+	"provide stash message": "提供存储消息(可选)",
-+	"stash message": "存储消息",
-+	"no stashes": "没有可以恢复的存储。",
-+	"pick stash to pop": "选择要弹出的存储",
-+>>>>>>> .their
- 	"clean repo": "在签出前，请清理存储库工作树。",
- 	"cant push": "无法推送 refs 到远端。您可以试着运行“拉取”功能，整合您的更改。",
- 	"git error details": "Git: {0}",
-changed in both
-  base   100644 4ef0b1e6a7430ce1528991c2f7b2b370987d57ea i18n/chs/extensions/git/out/model.i18n.json
-  our    100644 e965f8d5735a5fe6ba7795e491185d750ceec34f i18n/chs/extensions/git/out/model.i18n.json
-  their  100644 e0223bbb637be5c8882aaaba5b41f7067b7f71f2 i18n/chs/extensions/git/out/model.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -7,6 +8,8 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"too many submodules": "“{0}”存储库中的 {1} 个子模块将不会自动打开。您仍可以通过打开其中的文件来单独打开每个子模块。",
-+=======
-+>>>>>>> .their
- 	"no repositories": "没有可用存储库",
- 	"pick repo": "选择存储库"
- }
-\ No newline at end of file
-added in both
-  our    100644 9cf0fee43690494f0f1e6d419789081f305343f9 i18n/chs/extensions/git/out/repository.i18n.json
-  their  100644 8b700b3abe3c76e412f26628fe044060b80e84eb i18n/chs/extensions/git/out/repository.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"open": "打开",
- 	"index modified": "已修改索引",
- 	"modified": "已修改",
-@@ -23,13 +32,20 @@
- 	"deleted by us": "已被我们删除",
- 	"both added": "两者均已添加",
- 	"both modified": "二者均已修改",
-+<<<<<<< .our
- 	"commitMessage": "消息 (按 {0} 提交)",
-+=======
-+>>>>>>> .their
- 	"commit": "提交",
- 	"merge changes": "合并更改",
- 	"staged changes": "暂存的更改",
- 	"changes": "更改",
-+<<<<<<< .our
- 	"commitMessageCountdown": "当前行剩余 {0} 个字符",
- 	"commitMessageWarning": "当前行比 {1} 超出 {0} 个字符",
-+=======
-+	"ok": "确定",
-+>>>>>>> .their
- 	"neveragain": "不再显示",
- 	"huge": "Git 存储库“{0}”中存在大量活动更改，将仅启用部分 Git 功能。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 a4e031e5adb2b1a9e3d26807ff70f9c116ab67c1 i18n/chs/extensions/git/package.i18n.json
-  our    100644 7c2a3b49c9f848f60d2957657294486b061a17aa i18n/chs/extensions/git/package.i18n.json
-  their  100644 35849ac02890c8c4a06c98b31c3d78c75a23ce2c i18n/chs/extensions/git/package.i18n.json
-@@ -40,7 +40,10 @@
- 	"command.renameBranch": "重命名分支...",
- 	"command.merge": "合并分支...",
- 	"command.createTag": "创建标签",
-+<<<<<<< .our
- 	"command.fetch": "抓取",
-+=======
-+>>>>>>> .their
- 	"command.pull": "拉取",
- 	"command.pullRebase": "拉取(变基)",
- 	"command.pullFrom": "拉取自...",
-@@ -52,11 +55,18 @@
- 	"command.publish": "发布分支",
- 	"command.showOutput": "显示 Git 输出",
- 	"command.ignore": "将文件添加到 .gitignore",
-+<<<<<<< .our
- 	"command.stashIncludeUntracked": "储藏(包含未跟踪)",
- 	"command.stash": "储藏",
- 	"command.stashPop": "弹出储藏...",
- 	"command.stashPopLatest": "弹出最新储藏",
- 	"config.enabled": "是否启用 Git",
-+=======
-+	"command.stash": "存储",
-+	"command.stashPop": "弹出存储...",
-+	"command.stashPopLatest": "弹出最新存储",
-+	"config.enabled": "是否已启用 GIT",
-+>>>>>>> .their
- 	"config.path": "Git 可执行文件路径",
- 	"config.autoRepositoryDetection": "是否自动检测存储库",
- 	"config.autorefresh": "是否启用自动刷新",
-@@ -71,6 +81,7 @@
- 	"config.defaultCloneDirectory": "克隆 Git 存储库的默认位置",
- 	"config.enableSmartCommit": "在没有暂存的更改时提交所有更改。",
- 	"config.enableCommitSigning": "启用使用 GPG 签名的提交",
-+<<<<<<< .our
- 	"config.discardAllScope": "控制运行“放弃所有更改”命令时放弃的更改类型。\"all\" 放弃所有更改。\"tracked\" 只放弃跟踪的文件。\"prompt\" 表示在每次运行此操作时显示提示对话框。",
- 	"config.decorations.enabled": "控制 Git 是否向资源管理器和“打开的编辑器”视图添加颜色和小标。",
- 	"config.promptToSaveFilesBeforeCommit": "控制 Git 是否在提交之前检查未保存的文件。",
-@@ -84,4 +95,7 @@
- 	"colors.ignored": "已忽略资源的颜色。",
- 	"colors.conflict": "存在冲突的资源的颜色。",
- 	"colors.submodule": "子模块资源的颜色。"
-+=======
-+	"config.discardAllScope": "控制运行\"放弃所有更改\"命令时放弃的更改。\"all\" 放弃所有更改。 \"tracked\" 只放弃跟踪的文件。 \"prompt\" 每次运行此操作时显示提示对话框。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 054fbfdac598c13384003d0f40c0386470a7392e i18n/chs/extensions/html/package.i18n.json
-  our    100644 ba42e46c478056bcc6f942ea154fe1375f6b5355 i18n/chs/extensions/html/package.i18n.json
-  their  100644 61c50847e232c9e4062dad9a8a6aa7f41741fbc2 i18n/chs/extensions/html/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,28 @@
- 	],
- 	"displayName": "HTML 语言基础功能",
- 	"description": "在 HTML 文件中提供语法高亮、括号匹配和代码片段功能。"
-+=======
-+	"html.format.enable.desc": "启用/禁用默认 HTML 格式化程序",
-+	"html.format.wrapLineLength.desc": "每行最大字符数(0 = 禁用)。",
-+	"html.format.unformatted.desc": "以逗号分隔的标记列表不应重设格式。\"null\" 默认为所有列于 https://www.w3.org/TR/html5/dom.html#phrasing-content 的标记。",
-+	"html.format.contentUnformatted.desc": "以逗号分隔的标记列表，不应在其中重新设置内容的格式。\"null\" 默认为 \"pre\" 标记。",
-+	"html.format.indentInnerHtml.desc": "缩进 <head> 和 <body> 部分。",
-+	"html.format.preserveNewLines.desc": "是否要保留元素前面的现有换行符。仅适用于元素前，不适用于标记内或文本。",
-+	"html.format.maxPreserveNewLines.desc": "要保留在一个区块中的换行符的最大数量。对于无限制使用 \"null\"。",
-+	"html.format.indentHandlebars.desc": "格式和缩进 {{#foo}} 和 {{/foo}}。",
-+	"html.format.endWithNewline.desc": "以新行结束。",
-+	"html.format.extraLiners.desc": "标记列表，以逗号分隔，其前应有额外新行。\"null\" 默认为“标头、正文、/html”。",
-+	"html.format.wrapAttributes.desc": "对属性进行换行。",
-+	"html.format.wrapAttributes.auto": "仅在超出行长度时才对属性进行换行。",
-+	"html.format.wrapAttributes.force": "对除第一个属性外的其他每个属性进行换行。",
-+	"html.format.wrapAttributes.forcealign": "对除第一个属性外的其他每个属性进行换行，并保持对齐。",
-+	"html.format.wrapAttributes.forcemultiline": "对每个属性进行换行。",
-+	"html.suggest.angular1.desc": "配置内置 HTML 语言支持是否建议 Angular V1 标记和属性。",
-+	"html.suggest.ionic.desc": "配置内置 HTML 语言支持是否建议 Ionic 标记、属性和值。",
-+	"html.suggest.html5.desc": "配置内置 HTML 语言支持是否建议 HTML5 标记、属性和值。",
-+	"html.trace.server.desc": "跟踪 VS Code 与 HTML 语言服务器之间的通信。",
-+	"html.validate.scripts": "配置内置的 HTML 语言支持是否对嵌入的脚本进行验证。",
-+	"html.validate.styles": "配置内置的 HTML 语言支持是否对嵌入的样式进行验证。",
-+	"html.autoClosingTags": "启用/禁用 HTML 标记的自动关闭。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f147c64ed829b3aa0f432b9ce81e84662c238f48 i18n/chs/extensions/json/package.i18n.json
-  our    100644 6138d8e11f1b4cdb33a5d6b848092084585ef9f8 i18n/chs/extensions/json/package.i18n.json
-  their  100644 46d90c7f016c1fd1198f3dbfa5f5437e2200889d i18n/chs/extensions/json/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,15 @@
- 	],
- 	"displayName": "JSON 语言基础功能",
- 	"description": "在 JSON 文件中提供语法高亮和括号匹配功能。"
-+=======
-+	"json.schemas.desc": "将当前项目中的 JSON 文件与架构关联起来",
-+	"json.schemas.url.desc": "当前目录中指向架构的 URL 或相对路径",
-+	"json.schemas.fileMatch.desc": "将 JSON 文件解析到架构时，用于匹配的一组文件模式。",
-+	"json.schemas.fileMatch.item.desc": "将 JSON 文件解析到架构时，用于匹配的可以包含 \"*\" 的文件模式。",
-+	"json.schemas.schema.desc": "给定 URL 的架构定义。只需提供该架构以避免对架构 URL 的访问。",
-+	"json.format.enable.desc": "启用/禁用默认 JSON 格式化程序(需要重启)",
-+	"json.tracing.desc": "跟踪 VS Code 与 JSON 语言服务器之间的通信。",
-+	"json.colorDecorators.enable.desc": "启用或禁用颜色修饰器",
-+	"json.colorDecorators.enable.deprecationMessage": "已弃用设置 \"json.colorDecorators.enable\"，请改用 \"editor.colorDecorators\"。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 602d9a27b465719af4106bf4946cc68128ba2248 i18n/chs/extensions/markdown/out/security.i18n.json
-  our    100644 152913f911620b52eb7b912fc3d2f3d69c4de28e i18n/chs/extensions/markdown/out/security.i18n.json
-  their  100644 dbe6ce5383fb7f4da198e9409b5037900846c2ad i18n/chs/extensions/markdown/out/security.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"strict.title": "严格",
- 	"strict.description": "仅载入安全内容",
- 	"insecureContent.title": "允许不安全内容",
-@@ -13,8 +16,11 @@
- 	"disable.title": "禁用",
- 	"disable.description": "允许所有内容，执行所有脚本。不推荐",
- 	"moreInfo.title": "详细信息",
-+<<<<<<< .our
- 	"enableSecurityWarning.title": "在此工作区中启用预览安全警告",
- 	"disableSecurityWarning.title": "在此工作区中取消预览安全警告",
- 	"toggleSecurityWarning.description": "不影响内容安全级别",
-+=======
-+>>>>>>> .their
- 	"preview.showPreviewSecuritySelector.title": "选择此工作区中 Markdown 预览的安全设置"
- }
-\ No newline at end of file
-changed in both
-  base   100644 d97d7e985077c40ab305f5b51b6c9817631d1427 i18n/chs/extensions/markdown/package.i18n.json
-  our    100644 11595bfc615ef4e4ea3494eaec63460d68e54498 i18n/chs/extensions/markdown/package.i18n.json
-  their  100644 6576e84f901449175d6f523ba4def5fc46226139 i18n/chs/extensions/markdown/package.i18n.json
-@@ -27,6 +27,10 @@
- 	"markdown.styles.dec": "要在 Markdown 预览中使用的 CSS 样式表的 URL 或本地路径列表。相对路径被解释为相对于资源管理器中打开的文件夹。如果没有任何打开的文件夹，则会被解释为相对于 Markdown 文件的位置。所有的 \"\\\" 需写为 \"\\\\\"。",
- 	"markdown.showPreviewSecuritySelector.title": "更改预览安全设置",
- 	"markdown.trace.desc": "对 Markdown 扩展启用调试日志记录。",
-+<<<<<<< .our
- 	"markdown.preview.refresh.title": "刷新预览",
- 	"markdown.preview.toggleLock.title": "切换预览锁定"
-+=======
-+	"markdown.refreshPreview.title": "刷新预览"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 006fe31225820947714d672293c660093eef0ee5 i18n/chs/extensions/typescript/out/utils/api.i18n.json
-  their  100644 39fa80741e9965bcd3fbcb00b627059df59151d8 i18n/chs/extensions/typescript/out/utils/api.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"invalidVersion": "无效版本"
- }
-\ No newline at end of file
-changed in both
-  base   100644 2f9d184dfef18151d20087a1475d0718e2fb4ff2 i18n/chs/extensions/typescript/out/utils/versionPicker.i18n.json
-  our    100644 c9f87e17e81cc23c6264aa7d9154aac97946c27a i18n/chs/extensions/typescript/out/utils/versionPicker.i18n.json
-  their  100644 71a73427ea1cdc71622cb65e95efd0e9703c7677 i18n/chs/extensions/typescript/out/utils/versionPicker.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"useVSCodeVersionOption": "使用 VS Code 的版本",
- 	"useWorkspaceVersionOption": "使用工作区版本",
- 	"learnMore": "了解详细信息",
-changed in both
-  base   100644 3a3d6c19c92b5b0fa5a990b4a6b65afee36cb572 i18n/chs/extensions/typescript/out/utils/versionProvider.i18n.json
-  our    100644 4bb999f00f59f2007f0be4eac243b997d331a6dd i18n/chs/extensions/typescript/out/utils/versionProvider.i18n.json
-  their  100644 c51e8bf23031ebd404b7b0bacd8094d2e29e09a1 i18n/chs/extensions/typescript/out/utils/versionProvider.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"couldNotLoadTsVersion": "无法获取此目录 TypeScript 的版本",
- 	"noBundledServerFound": "VS Code 的 tsserver 已被其他应用程序(例如运行异常的病毒检测工具)删除。请重新安装 VS Code。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 f8529d515241093438e7e4920d6a9db24053ef46 i18n/chs/extensions/typescript/package.i18n.json
-  our    100644 bfdc4b0322d7765cabc911e22f70cfd5aed89e04 i18n/chs/extensions/typescript/package.i18n.json
-  their  100644 03246f64123f71917e6b0bda80bcedb51c0fd7b0 i18n/chs/extensions/typescript/package.i18n.json
-changed in both
-  base   100644 d020e9b19904efe874e9b38c87f2b93041277e5f i18n/chs/src/vs/code/electron-main/menus.i18n.json
-  our    100644 8ef99d97e56fa2367ea176a647acfd2598f9da39 i18n/chs/src/vs/code/electron-main/menus.i18n.json
-  their  100644 40b03cafea81b3c452e9706f836fbdab9586e809 i18n/chs/src/vs/code/electron-main/menus.i18n.json
-changed in both
-  base   100644 2c892bf97d07836c68ffc163745d5af76cd92836 i18n/chs/src/vs/code/electron-main/windows.i18n.json
-  our    100644 b2eae61077b3d164ebdeef46e2e6172f91479389 i18n/chs/src/vs/code/electron-main/windows.i18n.json
-  their  100644 2abc90bd7ce4ad5a6049bf1d0ebccc52ddef9e21 i18n/chs/src/vs/code/electron-main/windows.i18n.json
-@@ -9,15 +9,30 @@
- 	"ok": "确定",
- 	"pathNotExistTitle": "路径不存在",
- 	"pathNotExistDetail": "磁盘上似乎不再存在路径“{0}”。",
-+<<<<<<< .our
- 	"reopen": "重新打开(&&R)",
- 	"wait": "继续等待(&&K)",
- 	"close": "关闭(&&C)",
-+=======
-+	"openWorkspace": "打开(&&O)...",
-+	"openWorkspaceTitle": "打开工作区",
-+	"save": "保存(&&S)",
-+	"doNotSave": "不保存(&&N)",
-+	"cancel": "取消",
-+	"saveWorkspaceMessage": "你是否要将你的工作区配置保存为文件？",
-+	"saveWorkspaceDetail": "若要再次打开此工作区，请先保存。",
-+	"saveWorkspace": "保存工作区",
-+	"reopen": "重新打开",
-+	"wait": "保持等待",
-+	"close": "关闭",
-+>>>>>>> .their
- 	"appStalled": "窗口不再响应",
- 	"appStalledDetail": "你可以重新打开或关闭窗口，或者保持等待。",
- 	"appCrashed": "窗口出现故障",
- 	"appCrashedDetail": "我们对此引起的不便表示抱歉! 请重启该窗口从上次停止的位置继续。",
- 	"open": "打开",
- 	"openFolder": "打开文件夹",
-+<<<<<<< .our
- 	"openFile": "打开文件",
- 	"workspaceOpenedMessage": "无法保存工作区“{0}”",
- 	"workspaceOpenedDetail": "已在另一个窗口打开工作区。请先关闭该窗口，然后重试。",
-@@ -29,4 +44,7 @@
- 	"saveWorkspaceMessage": "你是否要将你的工作区配置保存为文件？",
- 	"saveWorkspaceDetail": "若要再次打开此工作区，请先保存。",
- 	"saveWorkspace": "保存工作区"
-+=======
-+	"openFile": "打开文件"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 9cdbb1a75e0182fd0e75926cd06c46fbba2303e6 i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 e4c993e2df857650110681bbfaaa48507f4e2ec6 i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 f7681a600e9abe3f0155f347c1481afda0817e30 i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -26,11 +26,17 @@
- 	"detectIndentation": "当打开文件时，将基于文件内容检测 \"editor.tabSize\" 和 \"editor.insertSpaces\"。",
- 	"roundedSelection": "控制选取范围是否有圆角",
- 	"scrollBeyondLastLine": "控制编辑器是否可以滚动到最后一行之后",
-+<<<<<<< .our
- 	"scrollBeyondLastColumn": "控制编辑器水平滚动时可以超出滚动的字符数",
- 	"smoothScrolling": "控制编辑器是否在滚动时使用动画",
- 	"minimap.enabled": "控制是否显示 minimap",
- 	"minimap.side": "控制在哪一侧显示小地图。",
- 	"minimap.showSlider": "控制是否自动隐藏小地图滑块。",
-+=======
-+	"smoothScrolling": "控制编辑器是否在滚动时使用动画",
-+	"minimap.enabled": "控制是否显示 minimap",
-+	"minimap.showSlider": "控制是否自动隐藏小地图滑块。可选值为 \"always\" 和 \"mouseover\"",
-+>>>>>>> .their
- 	"minimap.renderCharacters": "呈现某行上的实际字符(与颜色块相反)",
- 	"minimap.maxColumn": "限制最小映射的宽度，尽量多地呈现特定数量的列",
- 	"find.seedSearchStringFromSelection": "控制是否将编辑器的选中内容作为搜索词填入到查找组件",
-@@ -106,11 +112,14 @@
- 	"accessibilitySupport": "控制编辑器是否应运行在对屏幕阅读器进行优化的模式。",
- 	"links": "控制编辑器是否应检测链接并使它们可被点击",
- 	"colorDecorators": "控制编辑器是否显示内联颜色修饰器和颜色选取器。",
-+<<<<<<< .our
- 	"codeActions": "启用代码操作小灯泡提示",
- 	"codeActionsOnSave.organizeImports": "是否在保存时整理 import 语句?",
- 	"codeActionsOnSave": "在保存时运行的代码操作类型。",
- 	"codeActionsOnSaveTimeout": "在保存时运行的代码操作的超时时间。",
- 	"selectionClipboard": "控制是否支持 Linux 主剪贴板。",
-+=======
-+>>>>>>> .their
- 	"sideBySide": "控制 Diff 编辑器以并排或内联形式显示差异",
- 	"ignoreTrimWhitespace": "控制差异编辑器是否将对前导空格或尾随空格的更改显示为差异",
- 	"largeFileOptimizations": "对大型文件进行特殊处理，禁用某些内存密集型功能。",
-changed in both
-  base   100644 9cfdf24e308f8399df2fd8eb0576ceb21a80a857 i18n/chs/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 264f0668a4da9659a58613193f24657a9dfbbc79 i18n/chs/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 6ac6ec500efb27c5abf5a496b7e71f1edb7b5c42 i18n/chs/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -28,12 +28,16 @@
- 	"errorBorder": "编辑器中错误波浪线的边框颜色。",
- 	"warningForeground": "编辑器中警告波浪线的前景色。",
- 	"warningBorder": "编辑器中警告波浪线的边框颜色。",
-+<<<<<<< .our
- 	"infoForeground": "编辑器中信息波浪线的前景色。",
- 	"infoBorder": "编辑器中信息波浪线的边框颜色。",
- 	"hintForeground": "编辑器中提示波浪线的前景色。",
- 	"hintBorder": "编辑器中提示波浪线的边框颜色。",
- 	"unnecessaryForeground": "编辑器中不必要代码的前景色。",
- 	"overviewRulerRangeHighlight": "概览标尺中高亮范围的标记颜色。颜色必须透明，使其不会挡住下方的其他元素。",
-+=======
-+	"overviewRulerRangeHighlight": "概述范围突出显示的标尺标记颜色。",
-+>>>>>>> .their
- 	"overviewRuleError": "概述错误的标尺标记颜色。",
- 	"overviewRuleWarning": "概述警告的标尺标记颜色。",
- 	"overviewRuleInfo": "概述信息的标尺标记颜色。"
-changed in both
-  base   100644 35b299bfd8ae5236633a7eb717c2950436785f8e i18n/chs/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
-  our    100644 7926047995cd2085bb787739e9fc392f79b6f9fb i18n/chs/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
-  their  100644 76f13f5e3defd0d96b862d0fc25489d0c3570810 i18n/chs/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
-@@ -7,7 +7,11 @@
- 	"wordHighlight": "读取访问时符号的背景颜色，例如读取变量时。",
- 	"wordHighlightStrong": "写入访问时符号的背景颜色，例如写入变量时。",
- 	"overviewRulerWordHighlightForeground": "概述符号突出显示的标尺标记颜色。",
-+<<<<<<< .our
- 	"overviewRulerWordHighlightStrongForeground": "概述写访问符号突出显示的标尺标记颜色。",
- 	"wordHighlight.next.label": "转到下一个突出显示的符号",
- 	"wordHighlight.previous.label": "转到上一个突出显示的符号"
-+=======
-+	"overviewRulerWordHighlightStrongForeground": "概述写访问符号突出显示的标尺标记颜色。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f5c7660b6175b10aba78efb6b8b1dec19455bd3f i18n/chs/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 9b8e352f2e01c71634dfc189a8ddc9dc7485da94 i18n/chs/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 e0dd5c720f2e4948da9e987499721bbf23e6ec4d i18n/chs/src/vs/platform/environment/node/argv.i18n.json
-@@ -8,11 +8,16 @@
- 	],
- 	"gotoValidation": "\"--goto\" 模式中的参数格式应为 \"FILE(:LINE(:CHARACTER))\"。",
- 	"diff": "将两个文件相互比较。",
-+<<<<<<< .our
- 	"add": "将文件夹添加到上一个活动窗口。",
- 	"goto": "打开路径下的文件并定位到特定行和特定列。",
- 	"newWindow": "强制打开新窗口。",
- 	"reuseWindow": "强制打开上一个活动窗口中的文件或文件夹。",
- 	"wait": "等文件关闭后再返回。",
-+=======
-+	"add": "将文件夹添加到最后一个活动窗口。",
-+	"goto": "打开路径下的文件并定位到特定行和特定字符。",
-+>>>>>>> .their
- 	"locale": "要使用的区域设置(例如 en-US 或 zh-TW)。",
- 	"userDataDir": "指定保存用户数据的目录。可用于打开多个不同的 Code 实例。",
- 	"version": "打印版本。",
-added in both
-  our    100644 5e33981fbb8e00284069609386c32f50cda9797f i18n/chs/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
-  their  100644 72e224481c53cad92262585c5fba3cd45ea9d1de i18n/chs/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"contributes.color": "提供由扩展定义的主题颜色",
- 	"contributes.color.id": "主题颜色标识符",
- 	"contributes.color.id.format": "标识符应满足 aa[.bb]*",
-changed in both
-  base   100644 8152a84933fb06b8267f30b76d6b4aba4a1ae15d i18n/chs/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 c983e4e827a53b4bffaaa1c1c11e806845efcb6b i18n/chs/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 0784d4fbc110da3d846e0566bc07cad7e9186afd i18n/chs/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -96,6 +96,11 @@
- 	"overviewRulerCurrentContentForeground": "内联合并冲突中当前版本区域的概览标尺前景色。",
- 	"overviewRulerIncomingContentForeground": "内联合并冲突中传入的版本区域的概览标尺前景色。",
- 	"overviewRulerCommonContentForeground": "内联合并冲突中共同祖先区域的概览标尺前景色。",
-+<<<<<<< .our
- 	"overviewRulerFindMatchForeground": "概览标尺中查找匹配项的标记颜色。颜色必须透明，使其不会挡住下方的其他元素。",
- 	"overviewRulerSelectionHighlightForeground": "概览标尺中选择高亮的标记颜色。颜色必须透明，使其不会挡住下方的其他元素。"
-+=======
-+	"overviewRulerFindMatchForeground": "概述查找匹配项的标尺标记颜色。",
-+	"overviewRulerSelectionHighlightForeground": "概述选择突出显示的标尺标记颜色。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 2d543ebd224145f07bc0e8f8ed748b1e727c8690 i18n/chs/src/vs/platform/workspaces/common/workspaces.i18n.json
-  their  100644 3e8a456134d40af3777236a31e27477366b0b159 i18n/chs/src/vs/platform/workspaces/common/workspaces.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,6 +8,15 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"codeWorkspace": "Code 工作区",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"codeWorkspace": "代码工作区",
-+>>>>>>> .their
- 	"untitledWorkspace": "无标题 (工作区)",
- 	"workspaceNameVerbose": "{0} (工作区)",
- 	"workspaceName": "{0} (工作区)"
-added in both
-  our    100644 a986da91051a5b617459eaea042c07c51a020df2 i18n/chs/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
-  their  100644 9e906e992b8a853644ea814e305ad8a5330da3e5 i18n/chs/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,5 +10,16 @@
- 	"unknownDep": "无法激活扩展“{1}”。原因: 未知的依赖项“{0}”。",
- 	"failedDep1": "无法激活扩展“{1}”。原因: 无法激活依赖项“{0}”。",
- 	"failedDep2": "无法激活扩展”{0}“。原因: 依赖关系超过 10 级(很可能存在循环依赖)。",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"unknownDep": "无法激活扩展”{1}“。原因: 未知依赖关系“{0}”。",
-+	"failedDep1": "无法激活扩展”{1}“。原因: 无法激活依赖关系”{0}“。",
-+	"failedDep2": "无法激活扩展”{0}“。原因: 依赖关系多于 10 级(最可能是依赖关系循环)。",
-+>>>>>>> .their
- 	"activationError": "激活扩展“{0}”失败: {1}。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 0ceae1d9a5946647bfe2526b3781b45d55016c3a i18n/chs/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 1be88d0e515057ba8dbf0bcd7cef8fa6af9d6bf5 i18n/chs/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 8a712411c27e2cd01d01b24ae2d763fb7e420c03 i18n/chs/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -9,6 +9,7 @@
- 	"openFile": "打开文件...",
- 	"openFolder": "打开文件夹...",
- 	"openFileFolder": "打开...",
-+<<<<<<< .our
- 	"globalRemoveFolderFromWorkspace": "将文件夹从工作区删除…",
- 	"saveWorkspaceAsAction": "将工作区另存为...",
- 	"save": "保存(&&S)",
-@@ -16,4 +17,19 @@
- 	"openWorkspaceAction": "打开工作区...",
- 	"openWorkspaceConfigFile": "打开工作区配置文件",
- 	"duplicateWorkspaceInNewWindow": "复制此工作区并在新窗口打开"
-+=======
-+	"addFolderToWorkspace": "将文件夹添加到工作区...",
-+	"add": "添加(&&A)",
-+	"addFolderToWorkspaceTitle": "将文件夹添加到工作区",
-+	"newWorkspace": "新建工作区...",
-+	"select": "选择(&&S)",
-+	"selectWorkspace": "选择文件夹作为工作区",
-+	"removeFolderFromWorkspace": "将文件夹从工作区删除",
-+	"saveWorkspaceAsAction": "将工作区另存为...",
-+	"saveEmptyWorkspaceNotSupported": "请先打开一个工作区再保存。",
-+	"save": "保存(&&S)",
-+	"saveWorkspace": "保存工作区",
-+	"openWorkspaceAction": "打开工作区...",
-+	"openWorkspaceConfigFile": "打开工作区配置文件"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 63726f327651d89a4b60228bb98abd6539c681ac i18n/chs/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  our    100644 928aff21e4992e87ab9bef7c409760daf942c7a2 i18n/chs/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-  their  100644 90dedb611faac865cd269b429974f7fd3c21df3d i18n/chs/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"close": "关闭",
-+	"closeOthers": "关闭其他",
-+	"closeRight": "关闭到右侧",
-+	"closeAll": "全部关闭",
-+	"closeAllUnmodified": "关闭未更改",
-+	"keepOpen": "保持打开状态",
-+	"showOpenedEditors": "显示打开的编辑器",
-+>>>>>>> .their
- 	"araLabelEditorActions": "编辑器操作"
- }
-\ No newline at end of file
-changed in both
-  base   100644 943141ce567d4721646ac0c798f2baea84327923 i18n/chs/src/vs/workbench/common/theme.i18n.json
-  our    100644 9dff140c48c8d58d62f0adab067f1886bd30d318 i18n/chs/src/vs/workbench/common/theme.i18n.json
-  their  100644 128218322029dbbc262950328a076b3c81b0f304 i18n/chs/src/vs/workbench/common/theme.i18n.json
-@@ -11,12 +11,17 @@
- 	"tabHoverBackground": "选项卡被悬停时的背景色。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以有多个编辑器组。",
- 	"tabUnfocusedHoverBackground": "非焦点组选项卡被悬停时的背景色。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以有多个编辑器组。",
- 	"tabBorder": "用于将选项卡彼此分隔开的边框。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以存在多个编辑器组。",
-+<<<<<<< .our
- 	"tabActiveBorder": "活动选项卡底部的边框。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以存在多个编辑器组。",
- 	"tabActiveBorderTop": "活动选项卡顶部的边框。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以存在多个编辑器组。",
- 	"tabActiveUnfocusedBorder": "在失去焦点的编辑器组中的活动选项卡底部的边框。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以存在多个编辑器组。",
- 	"tabActiveUnfocusedBorderTop": "在失去焦点的编辑器组中的活动选项卡顶部的边框。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以存在多个编辑器组。",
- 	"tabHoverBorder": "选项卡被悬停时用于突出显示的边框。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以有多个编辑器组。",
- 	"tabUnfocusedHoverBorder": "非焦点组选项卡被悬停时用于突出显示的边框。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以有多个编辑器组。",
-+=======
-+	"tabActiveBorder": "用于高亮活动的选项卡的边框。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以存在多个编辑器组。",
-+	"tabActiveUnfocusedBorder": "用于高亮一个失去焦点的编辑器组中的活动选项卡的边框。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以存在多个编辑器组。",
-+>>>>>>> .their
- 	"tabActiveForeground": "活动组中活动选项卡的前景色。在编辑器区域，选项卡是编辑器的容器。可在一个编辑器组中打开多个选项卡。可以有多个编辑器组。",
- 	"tabInactiveForeground": "活动组中非活动选项卡的前景色。在编辑器区域，选项卡是编辑器的容器。可在一个编辑器组中打开多个选项卡。可以有多个编辑器组。",
- 	"tabUnfocusedActiveForeground": "一个失去焦点的编辑器组中的活动选项卡的前景色。在编辑器区域，选项卡是编辑器的容器。可在一个编辑器组中打开多个选项卡。可以有多个编辑器组。",
-@@ -32,7 +37,10 @@
- 	"panelActiveTitleForeground": "活动面板的标题颜色。面板显示在编辑器区域下方，并包含输出和集成终端等视图。",
- 	"panelInactiveTitleForeground": "非活动面板的标题颜色。面板显示在编辑器区域下方，并包含输出和集成终端等视图。",
- 	"panelActiveTitleBorder": "活动面板的边框颜色。面板显示在编辑器区域下方，包含输出和集成终端等视图。",
-+<<<<<<< .our
- 	"panelDragAndDropBackground": "面板标题项在拖放时的反馈颜色。此颜色应有透明度，以便面板项仍能透过。面板显示在编辑器区域下方，包含输出和集成终端等视图。",
-+=======
-+>>>>>>> .their
- 	"statusBarForeground": "工作区打开时状态栏的前景色。状态栏显示在窗口底部。",
- 	"statusBarNoFolderForeground": "没有打开文件夹时状态栏的前景色。状态栏显示在窗口底部。",
- 	"statusBarBackground": "工作区打开时状态栏的背景色。状态栏显示在窗口底部。",
-changed in both
-  base   100644 8c0ddc480b269cfe64ea3a2453125d76d0a9490d i18n/chs/src/vs/workbench/electron-browser/window.i18n.json
-  our    100644 b437f51e7f989125bf762fd5e4c708b7a064f39e i18n/chs/src/vs/workbench/electron-browser/window.i18n.json
-  their  100644 b2c1d0e6763a13d5f4c50d21fd3a2cc1d555c72c i18n/chs/src/vs/workbench/electron-browser/window.i18n.json
-@@ -11,6 +11,10 @@
- 	"cut": "剪切",
- 	"copy": "复制",
- 	"paste": "粘贴",
-+<<<<<<< .our
- 	"selectAll": "全选",
- 	"runningAsRoot": "不建议以 root 用户身份运行 {0}。"
-+=======
-+	"selectAll": "全选"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 85fa76a879134e13d2d93e3ad9b4735791804370 i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
-  their  100644 a381c9562f9451518b1e730b928f0264e9bec9aa i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"toggleMinimap": "查看: 切换小地图"
- }
-\ No newline at end of file
-changed in both
-  base   100644 f19f82c9b16d85274d79043e052e15a42cd08d29 i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
-  our    100644 9ad649d33c730747805616ff6020697af1bc4c64 i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
-  their  100644 8f88c5108420669f1e5e4ef490c9a43a3fc2cea8 i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"toggleRenderControlCharacters": "查看: 切换控制字符"
- }
-\ No newline at end of file
-changed in both
-  base   100644 455b405c3136ab3ff8636a460525ddaa9e6897d3 i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
-  our    100644 b03ad9960c7f33077f73809def2e436c5ee70a5d i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
-  their  100644 4666a1892d73f21ea911567c2dd19949fc072465 i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"toggleRenderWhitespace": "查看: 切换呈现空格"
- }
-\ No newline at end of file
-changed in both
-  base   100644 5156b83be6d62eee43584f3179cce543ee0d7b09 i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 d713b18f9f797773516060ccdb111cd56b80034e i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 15235fff2c5a5daef6f447b594ac88c4ed46b5ca i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -28,7 +28,12 @@
- 	"preLaunchTaskExitCode": "preLaunchTask“{0}”已终止，退出代码为 {1}。",
- 	"showErrors": "显示错误",
- 	"noFolderWorkspaceDebugError": "无法调试活动文件。请确保它保存在磁盘上，并确保已为该文件类型安装了调试扩展。",
-+<<<<<<< .our
- 	"cancel": "取消",
- 	"DebugTaskNotFound": "找不到任务“{0}”。",
- 	"taskNotTracked": "无法跟踪任务“{0}”。"
-+=======
-+	"NewLaunchConfig": "请设置应用程序的启动配置文件。{0}",
-+	"DebugTaskNotFound": "找不到 preLaunchTask“{0}”。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f5089c0197a26c4bbd1c666ddf37ce03370a74a2 i18n/chs/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  our    100644 cd6b52432c5724bdc5e159734ac7ba787ed23e4f i18n/chs/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  their  100644 9852244f28dacb2c84d171cecdb4d3d4bcebc685 i18n/chs/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-changed in both
-  base   100644 54243f83ce3239615e33ed0d75bbaf3a87f86baa i18n/chs/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  our    100644 cd5c87160d63c424e94fd5828b9bb9bbcdf71805 i18n/chs/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  their  100644 b29401c19459458910725ec3b290f60a3a043735 i18n/chs/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-@@ -8,6 +8,23 @@
- 	],
- 	"debugAdapterBinNotFound": "调试适配器可执行的“{0}”不存在。",
- 	"debugAdapterCannotDetermineExecutable": "无法确定调试适配器“{0}”的可执行文件。",
-+<<<<<<< .our
- 	"unableToLaunchDebugAdapter": "无法从“{0}”启动调试适配器。",
- 	"unableToLaunchDebugAdapterNoArgs": "无法启动调试适配器。"
-+=======
-+	"launch.config.comment1": "使用 IntelliSense 了解相关属性。 ",
-+	"launch.config.comment2": "悬停以查看现有属性的描述。",
-+	"launch.config.comment3": "欲了解更多信息，请访问: {0}",
-+	"debugType": "配置类型。",
-+	"debugTypeNotRecognised": "无法识别此调试类型。确保已经安装并启用相应的调试扩展。",
-+	"node2NotSupported": "不再支持 \"node2\"，改用 \"node\"，并将 \"protocol\" 属性设为 \"inspector\"。",
-+	"debugName": "配置名称；在启动配置下拉菜单中显示。",
-+	"debugRequest": "请求配置类型。可以是“启动”或“附加”。",
-+	"debugServer": "仅用于调试扩展开发: 如果已指定端口，VS 代码会尝试连接到在服务器模式中运行的调试适配器",
-+	"debugPrelaunchTask": "调试会话开始前要运行的任务。",
-+	"debugWindowsConfiguration": "特定于 Windows 的启动配置属性。",
-+	"debugOSXConfiguration": "特定于 OS X 的启动配置属性。",
-+	"debugLinuxConfiguration": "特定于 Linux 的启动配置属性。",
-+	"deprecatedVariables": "已弃用 \"env.\"、\"config.\" 和 \"command.\"，改用 \"env:\"、\"config:\" 和 \"command:\"。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 0d0d492ff6bbf96316ef0c6fd837866a0b496ca1 i18n/chs/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 d7e48510561de6a730248773c638ea6ba6002331 i18n/chs/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 4b54f4bccd1b89286e7411843be843e6b6121f15 i18n/chs/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-@@ -52,7 +52,14 @@
- 	"extensionInstalled": "您已经安装过此推荐扩展",
- 	"showRecommendedKeymapExtensionsShort": "按键映射",
- 	"showLanguageExtensionsShort": "语言扩展",
-+<<<<<<< .our
- 	"showAzureExtensionsShort": "Azure 扩展",
-+=======
-+	"showAzureExtensions": "显示 Azure 扩展",
-+	"showAzureExtensionsShort": "Azure 扩展",
-+	"configureWorkspaceRecommendedExtensions": "配置建议的扩展(工作区)",
-+	"ConfigureWorkspaceRecommendations.noWorkspace": "建议仅在工作区文件夹上可用。",
-+>>>>>>> .their
- 	"OpenExtensionsFile.failed": "无法在 \".vscode\" 文件夹({0})内创建 \"extensions.json\" 文件。",
- 	"configureWorkspaceRecommendedExtensions": "配置建议的扩展(工作区)",
- 	"configureWorkspaceFolderRecommendedExtensions": "配置建议的扩展(工作区文件夹)",
-changed in both
-  base   100644 81284f01099f41230a838b64b77414a1750b22b2 i18n/chs/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  our    100644 f9208415003c3fca3ac10a6b4dad634318b1cef7 i18n/chs/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  their  100644 95ca006c03e49fdff4d460dfb574e438553ca6cb i18n/chs/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-changed in both
-  base   100644 6e4288916488f5faec98179503bae9e4ff9ec62e i18n/chs/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 63427668f5f3315bd1b2d497574a17d7eb4d0258 i18n/chs/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 be1c93a6518b86d28f202b367b97f2539391c909 i18n/chs/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-@@ -40,14 +40,21 @@
- 	"dynamicHeight": "控制打开的编辑器部分的高度是否应动态适应元素数量。",
- 	"autoReveal": "控制资源管理器是否应在打开文件时自动显示并选择它们。",
- 	"enableDragAndDrop": "控制资源管理器是否应该允许通过拖放移动文件和文件夹。",
-+<<<<<<< .our
- 	"confirmDragAndDrop": "控制在资源管理器内拖放移动文件或文件夹时是否进行确认。",
- 	"confirmDelete": "控制资源管理器是否应在删除文件到回收站时进行确认。",
-+=======
-+>>>>>>> .their
- 	"sortOrder.default": "按名称的字母顺序排列文件和文件夹。文件夹显示在文件前。",
- 	"sortOrder.mixed": "按名称的字母顺序排列文件和文件夹。两者穿插显示。",
- 	"sortOrder.filesFirst": "按名称的字母顺序排列文件和文件夹。文件显示在文件夹前。",
- 	"sortOrder.type": "按扩展名的字母顺序排列文件和文件夹。文件夹显示在文件前。",
- 	"sortOrder.modified": "按最后修改日期降序排列文件和文件夹。文件夹显示在文件前。",
-+<<<<<<< .our
- 	"sortOrder": "控制资源管理器文件和文件夹的排列顺序。除了默认排列顺序，你也可以设置为 \"mixed\" (文件和文件夹一起排序)、\"type\" (按文件类型排)、\"modified\" (按最后修改日期排)或是 \"filesFirst\" (将文件排在文件夹前)。",
- 	"explorer.decorations.colors": "控制文件修饰是否用颜色。",
- 	"explorer.decorations.badges": "控制文件修饰是否用徽章。"
-+=======
-+	"sortOrder": "控制资源管理器文件和文件夹的排列顺序。除了默认排列顺序，你也可以设置为 \"mixed\" (文件和文件夹一起排序)、\"type\" (按文件类型排)、\"modified\" (按最后修改日期排)或是 \"filesFirst\" (将文件排在文件夹前)。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 bc13e54543e10a126249048a9f980a5032eda8e3 i18n/chs/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
-  our    100644 d97098d02f75c7878aa7990a2af3993ce04c3448 i18n/chs/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
-  their  100644 cd38244eb2374df5679f36eaac43709e89684b31 i18n/chs/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
-@@ -10,9 +10,12 @@
- 	"dropFolder": "你是否要将文件夹添加到工作区?",
- 	"addFolders": "添加文件夹(&&A)",
- 	"addFolder": "添加文件夹(&&A)",
-+<<<<<<< .our
- 	"confirmMove": "是否确实要移动“{0}”?",
- 	"doNotAskAgain": "不再询问",
- 	"moveButtonLabel": "移动(&&M)",
-+=======
-+>>>>>>> .their
- 	"confirmOverwriteMessage": "目标文件夹中已存在“{0}”。是否要将其替换?",
- 	"irreversible": "此操作不可逆!",
- 	"replaceButtonLabel": "替换(&&R)"
-changed in both
-  base   100644 d2cf1b98e7bca78448a1d13455adcefc22cc2116 i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 9fc53ead3b405eb141c09e4bad1572eca1cf588a i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 c70f6d72be0b60635995433f666a9f066341c6e8 i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -14,4 +15,19 @@
- 	"editTtile": "编辑",
- 	"replaceDefaultValue": "在设置中替换",
- 	"copyDefaultValue": "复制到设置"
-+=======
-+	"emptyUserSettingsHeader": "将设置放入此处以覆盖\"默认设置\"。",
-+	"errorInvalidConfiguration": "无法写入设置。请更正文件中的错误/警告，然后重试。",
-+	"emptyWorkspaceSettingsHeader": "将设置放入此处以覆盖\"用户设置\"。",
-+	"emptyFolderSettingsHeader": "将文件夹设置放入此处以覆盖\"工作区设置\"。",
-+	"defaultFolderSettingsTitle": "默认文件夹设置",
-+	"defaultSettingsTitle": "默认设置",
-+	"noSettingsFound": "未找到设置。",
-+	"editTtile": "编辑",
-+	"replaceDefaultValue": "在设置中替换",
-+	"copyDefaultValue": "复制到设置",
-+	"unsupportedPHPExecutablePathSetting": "此设置必须是“用户设置”。若要为工作区配置 PHP，请打开 PHP 文件并单击状态栏中的“PHP 路径”。",
-+	"unsupportedWorkspaceSetting": "此设置必须是“用户设置”。",
-+	"unsupportedWorkbenchSetting": "当前无法应用此设置。将在直接打开此文件夹时应用。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 bc3bae9c0e521199aaf6d5d1503bf4c737ba17b1 i18n/chs/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-  our    100644 a45d6d27c484d7c0f612468c962e673eb19d9ebf i18n/chs/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-  their  100644 c4aae56e0d913f1e5d6cb6e2815c6f637d24fd7e i18n/chs/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-@@ -15,7 +15,13 @@
- 	"editorGutterModifiedBackground": "编辑器导航线中被修改行的背景颜色。",
- 	"editorGutterAddedBackground": "编辑器导航线中已插入行的背景颜色。",
- 	"editorGutterDeletedBackground": "编辑器导航线中被删除行的背景颜色。",
-+<<<<<<< .our
- 	"overviewRulerModifiedForeground": "概览标尺中已修改内容的颜色。",
- 	"overviewRulerAddedForeground": "概览标尺中已增加内容的颜色。",
- 	"overviewRulerDeletedForeground": "概览标尺中已删除内容的颜色。"
-+=======
-+	"overviewRulerModifiedForeground": "概述已修改内容的标尺标记颜色。",
-+	"overviewRulerAddedForeground": "概述已添加内容的标尺标记颜色。",
-+	"overviewRulerDeletedForeground": "概述已删除内容的标尺标记颜色。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8ea8ff4f96e85ebc583e3131193ba7487f37d89d i18n/chs/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  our    100644 8c0bab20637f95dcd55c856707e386b397840a9c i18n/chs/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  their  100644 2a9c9ff240ebbc7e8225dba5542d2ca3603ddd25 i18n/chs/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-changed in both
-  base   100644 c4fb0f2b279c0b146e5097d70cccce004fe2c515 i18n/chs/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  our    100644 72a33d59853b6a03462fb33cc281f9024f7e12dd i18n/chs/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  their  100644 2625b0dda4a2f23d40a7112e5c8f14866bdaaccb i18n/chs/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -10,6 +11,11 @@
- 	"hideRepository": "隐藏",
- 	"installAdditionalSCMProviders": "安装其他源代码管理提供程序...",
- 	"no open repo": "没有活动的源代码管理提供程序。",
-+=======
-+	"commitMessage": "消息(按 {0} 提交)",
-+	"installAdditionalSCMProviders": "安装其他 SCM 提供程序...",
-+	"no open repo": "没有可用的源控件。",
-+>>>>>>> .their
- 	"source control": "源代码管理",
- 	"viewletTitle": "{0}: {1}",
- 	"hideView": "隐藏"
-changed in both
-  base   100644 5645f876d2193e91958c02bff92bb4a6803f7a7c i18n/chs/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 db5d7a07f49a26b2f7df503221d63078c01a6dc6 i18n/chs/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 6af8f4d75746d980b519ffb0667be5367759b938 i18n/chs/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"nextSearchIncludePattern": "显示下一个搜索包含模式",
- 	"previousSearchIncludePattern": "显示上一个搜索包含模式",
- 	"nextSearchExcludePattern": "显示下一个搜索排除模式",
-changed in both
-  base   100644 8bdf54da1723935aabcb23ff3ce14ab06cd4681a i18n/chs/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  our    100644 e6d06592621a01e4beede22526fb784dff427ca8 i18n/chs/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  their  100644 c8d357bdaa13bba222e6542933370045337a5ada i18n/chs/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-added in both
-  our    100644 b1e7023bb9fb2ce96b97c9e1cfe1d8cd9c6ed007 i18n/chs/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
-  their  100644 2d30016b0fbb1fb98d1c7772a64570e5fb9b8dd4 i18n/chs/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"search.noWorkspaceWithName": "工作区中没有名为“{0}”的文件夹 "
- }
-\ No newline at end of file
-changed in both
-  base   100644 df453e33c6fcb0c3270385d8d57e16c7d092b405 i18n/chs/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 97fec3bb83dafb2a3f7801b86601c223a35c3b81 i18n/chs/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 4859b93c2b189cce30e26f187a9ce67939c9a3e2 i18n/chs/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-changed in both
-  base   100644 c5130a55ee3a40c717e4c0f5590374045957b0a0 i18n/chs/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 41326098874e0bd69d9f2619a881deaa0a61b179 i18n/chs/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 261eabf5fd0ab69b534c75cbaf81bc8ff2072477 i18n/chs/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -16,9 +16,13 @@
- 	"manyProblems": "1万+",
- 	"runningTasks": "显示运行中的任务",
- 	"tasks": "任务",
-+<<<<<<< .our
- 	"TaskSystem.noHotSwap": "在有活动任务运行时更换任务执行引擎需要重新加载窗口",
- 	"reloadWindow": "重新加载窗口",
- 	"TaskServer.folderIgnored": "由于使用任务版本 0.1.0，文件夹 {0} 将被忽略",
-+=======
-+	"TaskSystem.noHotSwap": "更改需要重新加载窗口的任务执行引擎。",
-+>>>>>>> .their
- 	"TaskService.noBuildTask1": "未定义任何生成任务。使用 \"isBuildCommand\" 在 tasks.json 文件中标记任务。",
- 	"TaskService.noBuildTask2": "未定义任何生成任务。在 tasks.json 文件中将任务标记为 \"build\" 组。",
- 	"TaskService.noTestTask1": "未定义任何测试任务。使用 \"isTestCommand\" 在 tasks.json 文件中标记任务。",
-changed in both
-  base   100644 f94666c4e49696816fe751809ebfcc7013108463 i18n/chs/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  our    100644 6d505c88ed56f651f5f3ce0799c77bffcb2b717b i18n/chs/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  their  100644 aa6e75732d229caee11c3e82062a8f8aca7076ae i18n/chs/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-@@ -15,7 +15,10 @@
- 	"ConfigurationParser.invalidVaraibleReference": "错误: 无效的 problemMatcher 引用: {0}\n",
- 	"ConfigurationParser.noTaskType": "错误: 任务必须提供 type 属性。将忽略该任务。\n{0}\n",
- 	"ConfigurationParser.noTypeDefinition": "错误: 没有注册任务类型“{0}”。你是不是忘记安装含有相应任务提供器的扩展?",
-+<<<<<<< .our
- 	"ConfigurationParser.missingRequiredProperty": "错误: 任务配置“{0}”缺失必要属性“{1}”。将忽略该任务。",
-+=======
-+>>>>>>> .their
- 	"ConfigurationParser.notCustom": "错误: 任务未声明为自定义任务。将忽略配置。\n{0}\n",
- 	"ConfigurationParser.noTaskName": "错误: 任务必须提供 label 属性。将忽略该任务。\n{0}\n",
- 	"taskConfiguration.noCommandOrDependsOn": "错误：任务“{0}”既不指定命令，也不指定 dependsOn 属性。将忽略该任务。其定义为:\n{1}",
-changed in both
-  base   100644 58e173605b179326d9241ba99219b8213c70aa13 i18n/chs/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  our    100644 0f7562b50c43d8c711e559109c08397ed2a1803f i18n/chs/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  their  100644 b7523fc74cdd505310856074acb68dc3fdafe5c2 i18n/chs/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -9,6 +10,11 @@
- 	"termEntryAriaLabel": "{0}，终端选取器",
- 	"termCreateEntryAriaLabel": "{0}，新建终端",
- 	"workbench.action.terminal.newplus": "$(plus) 新建集成终端",
-+=======
-+	"termEntryAriaLabel": "{0}，终端选取器",
-+	"termCreateEntryAriaLabel": "{0}，新建终端",
-+	"'workbench.action.terminal.newplus": "$(plus) 新建集成终端",
-+>>>>>>> .their
- 	"noTerminalsMatching": "没有匹配的终端",
- 	"noTerminalsFound": "没有打开终端"
- }
-\ No newline at end of file
-changed in both
-  base   100644 b447c9db51b05b9f6cc60d69b91992254d55eefa i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 c2fbe4fef10dc5236ff5c8da48376f2ca681d709 i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 fc4722516d18e4e3d99911a7174ddd4a80b93688 i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-changed in both
-  base   100644 c8746db7afb2f9dede27bb908bf2db91ff4b46aa i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 1becbfa0f08ad931e9c32c280588da0196edc807 i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 e5b5d7633d5417ce746f3fc4761648026b548605 i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -14,8 +14,11 @@
- 	"workbench.action.terminal.selectAll": "全选",
- 	"workbench.action.terminal.deleteWordLeft": "删除左侧的字符",
- 	"workbench.action.terminal.deleteWordRight": "删除右侧的字符",
-+<<<<<<< .our
- 	"workbench.action.terminal.moveToLineStart": "移动到行首",
- 	"workbench.action.terminal.moveToLineEnd": "移动到行尾",
-+=======
-+>>>>>>> .their
- 	"workbench.action.terminal.new": "新建集成终端",
- 	"workbench.action.terminal.new.short": "新的终端",
- 	"workbench.action.terminal.newWorkspacePlaceholder": "选择当前工作目录新建终端",
-@@ -53,6 +56,7 @@
- 	"workbench.action.terminal.hideFindWidget": "隐藏查找小组件",
- 	"nextTerminalFindTerm": "显示下一个搜索结果",
- 	"previousTerminalFindTerm": "显示上一个搜索结果",
-+<<<<<<< .our
- 	"quickOpenTerm": "切换活动终端",
- 	"workbench.action.terminal.scrollToPreviousCommand": "滚动到上一条命令",
- 	"workbench.action.terminal.scrollToNextCommand": "滚动到下一条命令",
-@@ -60,4 +64,7 @@
- 	"workbench.action.terminal.selectToNextCommand": "选择下一条命令所有内容",
- 	"workbench.action.terminal.selectToPreviousLine": "选择上一行的所有内容",
- 	"workbench.action.terminal.selectToNextLine": "选择下一行的所有内容"
-+=======
-+	"quickOpenTerm": "终端: 切换活动终端"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8459b7e494edb1c30730b8ceded6b56cf3264c46 i18n/chs/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 34456c16f6384eecbdba1d3ed14696eac3704dab i18n/chs/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 d43fc9ca29b2221e63e144fe4130ed4103353809 i18n/chs/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -11,7 +11,12 @@
- 	"read the release notes": "欢迎使用 {0} v{1}! 是否要阅读发布说明?",
- 	"licenseChanged": "我们对许可条款进行了修改，请点击[此处]({0})进行查看。",
- 	"neveragain": "不再显示",
-+<<<<<<< .our
- 	"64bitisavailable": "Windows 64 位版的 {0} 已经发布! 单击[这里]({1})了解更多信息。",
-+=======
-+	"64bitisavailable": "{0} 的 Windows 64 位版现已可用!",
-+	"learn more": "了解详细信息",
-+>>>>>>> .their
- 	"updateIsReady": "有新的 {0} 的更新可用。",
- 	"noUpdatesAvailable": "当前没有可用的更新。",
- 	"ok": "确定",
-changed in both
-  base   100644 5aa494cfd6f1ff5ea494b2ab88ae9eb57cbc0e65 i18n/chs/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  our    100644 e799257937ad32ea075b25e0a6d3255fc5c1a826 i18n/chs/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  their  100644 0298d3e03d6e071d994bca7b1db1a7b119d99de6 i18n/chs/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-@@ -37,6 +37,8 @@
- 	"welcomePage.showCommandsDescription": "使用命令面板快速访问和搜索命令 ({0})",
- 	"welcomePage.interfaceOverview": "界面概览",
- 	"welcomePage.interfaceOverviewDescription": "查看突出显示主要 UI 组件的叠加图",
-+	"welcomePage.deployToAzure": "将应用部署到云端",
-+	"welcomePage.deployToAzureDescription": "了解如何将你的 Node 应用部署到 Azure 应用服务",
- 	"welcomePage.interactivePlayground": "交互式演练场",
- 	"welcomePage.interactivePlaygroundDescription": "在简短演练中试用编辑器的基本功能"
- }
-\ No newline at end of file
-changed in both
-  base   100644 5c2a2259104469dd55dc43a50fd2eeec436a1a22 i18n/chs/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-  our    100644 52ac27ba5d7a4b2f7d1d4e2c5075a744dd7c1778 i18n/chs/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-  their  100644 1f422ca6c00315353adf89a4f14f0e70264ac79c i18n/chs/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-changed in both
-  base   100644 2ce7d16dc1f52cbc02f1407c02acae29fe5a6325 i18n/chs/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-  our    100644 a4d5faf62868939331e99041f87d0f1f3c39a627 i18n/chs/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-  their  100644 96dfd2ea466ae2fee40fe0c83cd0b39563c6ef6e i18n/chs/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-changed in both
-  base   100644 3fdab2ec275177c192319d1d7e4806c224b33aba i18n/chs/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
-  our    100644 e8f117370d9d047608a389300289e565b0f5bc79 i18n/chs/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
-  their  100644 a3461e4f30155f84a2dc29761c91025a9729c230 i18n/chs/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"editorWalkThrough.title": "交互式演练场",
- 	"editorWalkThrough": "交互式演练场"
- }
-\ No newline at end of file
-changed in both
-  base   100644 4d604a72c835d54e1575a1ffa0407933349033f1 i18n/chs/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  our    100644 2eb80022de4425a068a5199e1996a315ca606b51 i18n/chs/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  their  100644 a97bc87af6205af82699b8d47fd01d14a0fe0d51 i18n/chs/src/vs/workbench/services/configuration/node/configuration.i18n.json
-@@ -9,6 +9,7 @@
- 	"scope.window.description": "特定于窗口的配置，可在“用户”或“工作区”设置中配置。",
- 	"scope.resource.description": "特定于资源的配置，可在“用户”、“工作区”或“文件夹”设置中配置。",
- 	"scope.description": "配置适用的范围。可用范围有“窗口”和“资源”。",
-+<<<<<<< .our
- 	"vscode.extension.contributes.configuration": "用于配置字符串。",
- 	"invalid.title": "configuration.title 必须是字符串",
- 	"vscode.extension.contributes.defaultConfiguration": "按语言提供默认编辑器配置设置。",
-@@ -21,4 +22,13 @@
- 	"workspaceConfig.settings.description": "工作区设置",
- 	"workspaceConfig.extensions.description": "工作区扩展",
- 	"unknownWorkspaceProperty": "未知的工作区配置属性"
-+=======
-+	"invalid.type": "如果进行设置，\"configuration.type\" 必须设置为对象",
-+	"invalid.title": "configuration.title 必须是字符串",
-+	"vscode.extension.contributes.defaultConfiguration": "按语言提供默认编辑器配置设置。",
-+	"invalid.properties": "configuration.properties 必须是对象",
-+	"workspaceConfig.folders.description": "要在工作区中加载的文件夹列表。必须为文件夹完整路径。例如 \"/root/folderA\" 或 \"./folderA\"。后者表示根据工作区文件位置进行解析的相对路径。",
-+	"workspaceConfig.folder.description": "文件路径。例如 \"/root/folderA\" 或 \"./folderA\"。后者表示根据工作区文件位置进行解析的相对路径。",
-+	"workspaceConfig.settings.description": "工作区设置"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c709a1e567fc8500f1f0dec05a1a28a7ffdb194d i18n/chs/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 5acf3a0fa36fa93c78f58cdf2d0b020db420fb68 i18n/chs/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 d494104435ec40cf64fa87ef1b1e4e1ac0638cfd i18n/chs/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -9,6 +9,7 @@
- 	"openTasksConfiguration": "打开任务配置",
- 	"openLaunchConfiguration": "打开启动配置",
- 	"open": "打开设置",
-+<<<<<<< .our
- 	"saveAndRetry": "保存并重试",
- 	"errorUnknownKey": "没有注册配置 {1}，因此无法写入 {0}。",
- 	"errorInvalidWorkspaceConfigurationApplication": "无法将 {0} 写入“工作区设置”。此设置只能写于“用户设置”。",
-@@ -27,6 +28,19 @@
- 	"errorConfigurationFileDirty": "用户设置文件已变更，无法写入。请先保存此文件，然后重试。",
- 	"errorConfigurationFileDirtyWorkspace": "工作区设置文件已变更，无法写入。请先保存此文件，然后重试。",
- 	"errorConfigurationFileDirtyFolder": "文件夹设置文件已变更，无法写入。请先保存“{0}”文件夹设置文件，然后重试。",
-+=======
-+	"close": "关闭",
-+	"saveAndRetry": "保存设置并重试",
-+	"errorUnknownKey": "没有注册配置 {1}，因此无法写入 {0}。",
-+	"errorInvalidFolderConfiguration": "{0} 不支持文件夹资源域，因此无法写入\"文件夹设置\"。",
-+	"errorInvalidUserTarget": "{0} 不支持全局域，因此无法写入\"用户设置\"。",
-+	"errorInvalidFolderTarget": "未提供资源，因此无法写入\"文件夹设置\"。",
-+	"errorNoWorkspaceOpened": "没有打开任何工作区，因此无法写入 {0}。请先打开一个工作区，然后重试。",
-+	"errorInvalidConfiguration": "无法写入设置。请打开 **用户设置** 更正文件中的错误/警告，然后重试。",
-+	"errorInvalidConfigurationWorkspace": "无法写入设置。请打开 **工作区设置** 更正文件中的错误/警告，然后重试。",
-+	"errorConfigurationFileDirty": "文件已变更，因此无法写入设置。请先保存 **用户设置** 文件，然后重试。",
-+	"errorConfigurationFileDirtyWorkspace": "文件已变更，因此无法写入设置。请先保存 **工作区设置** 文件，然后重试。",
-+>>>>>>> .their
- 	"userTarget": "用户设置",
- 	"workspaceTarget": "工作区设置",
- 	"folderTarget": "文件夹设置"
-added in both
-  our    100644 13113edbb5a4c2101d8b035745fe42a156553809 i18n/chs/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
-  their  100644 81f5e1cfda22805c977f86e021c0c6a92e84ed1a i18n/chs/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,5 +10,15 @@
- 	"extensionHostProcess.startupFailDebug": "扩展未在 10 秒内启动，可能在第一行已停止，需要调试器才能继续。",
- 	"extensionHostProcess.startupFail": "扩展主机未在 10 秒内启动，可能发生了一个问题。",
- 	"reloadWindow": "重新加载窗口",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"extensionHostProcess.startupFailDebug": "扩展未在 10 秒内启动，可能在第一行已停止，需要调试器才能继续。",
-+	"extensionHostProcess.startupFail": "扩展主机未在 10 秒内启动，可能发生了一个问题。",
-+>>>>>>> .their
- 	"extensionHostProcess.error": "扩展主机中的错误: {0}"
- }
-\ No newline at end of file
-added in both
-  our    100644 6672922534709a1202d0c55eb1ddcce5d69d29b0 i18n/chs/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
-  their  100644 eb7858e1e0c226f6880d024db4a3c3db50364ab3 i18n/chs/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,5 +10,16 @@
- 	"jsonParseFail": "未能分析 {0}: {1}。",
- 	"fileReadFail": "无法读取文件 {0}: {1}。",
- 	"jsonsParseReportErrors": "未能分析 {0}: {1}。",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"jsonParseFail": "未能分析 {0}: {1}。",
-+	"fileReadFail": "无法读取文件 {0}: {1}。",
-+	"jsonsParseFail": "未能分析 {0} 或 {1}: {2}。",
-+>>>>>>> .their
- 	"missingNLSKey": "无法找到键 {0} 的消息。"
- }
-\ No newline at end of file
-added in both
-  our    100644 53d5f14ef4a12f66e07a18cbc63d85a6e636bbf0 i18n/chs/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-  their  100644 c6b9abd9ce6ff8409aacf619225ef678bf0dc845 i18n/chs/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -15,4 +16,18 @@
- 	"extensionUnderDevelopment": "正在 {0} 处加载开发扩展程序",
- 	"extensionCache.invalid": "扩展在磁盘上已被修改。请重新加载窗口。",
- 	"reloadWindow": "重新加载窗口"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"devTools": "开发人员工具",
-+	"restart": "重启扩展宿主",
-+	"extensionHostProcess.crash": "扩展宿主意外终止。",
-+	"extensionHostProcess.unresponsiveCrash": "扩展宿主因没有响应而被终止。",
-+	"overwritingExtension": "使用扩展程序 {1} 覆盖扩展程序 {0}。",
-+	"extensionUnderDevelopment": "正在 {0} 处加载开发扩展程序"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6db7d6aae514a031afce5ac346abfd84bb8ee1cc i18n/chs/src/vs/workbench/services/progress/browser/progressService2.i18n.json
-  our    100644 2ac632948418df90b1e85729f7a5b865a6e278fe i18n/chs/src/vs/workbench/services/progress/browser/progressService2.i18n.json
-  their  100644 dbcd7381ae2fcf0e7a8fc81ec166ed7112edca11 i18n/chs/src/vs/workbench/services/progress/browser/progressService2.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -9,4 +10,8 @@
- 	"progress.subtitle": "{0} - {1}",
- 	"progress.title": "{0}: {1}",
- 	"cancel": "取消"
-+=======
-+	"progress.subtitle": "{0} - {1}",
-+	"progress.title": "{0}: {1}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 24302866e1f87bb0f9c7179006177d3df1864479 i18n/chs/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-  our    100644 4d22aba950ef78de5081f20a9746c6303f72dccd i18n/chs/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-  their  100644 3006c199103d29b52dc105c6bf4688f2912e19a1 i18n/chs/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,12 @@
- 	"schema.token.fontStyle": "这条规则的字体样式: \"italic\" (斜体)、\"bold\" (粗体)、\"underline\" (下划线) 或是上述的组合。空字符串将清除继承的设置。",
- 	"schema.fontStyle.error": "字体样式必须为 \"italic\" (斜体)、\"bold\" (粗体)、\"underline\" (下划线) 、上述的组合或是为空字符串。",
- 	"schema.token.fontStyle.none": "无 (清除继承的设置)",
-+=======
-+	"schema.token.settings": "标记的颜色和样式。",
-+	"schema.token.foreground": "标记的前景色。",
-+	"schema.token.fontStyle": "规则字体样式:“斜体”、“粗体”和“下划线”中的一种或者组合",
-+	"schema.fontStyle.error": "字体样式必须为 \"italic\"(斜体)、 \"bold\"(粗体)和 \"underline\"(下划线)的组合。",
-+>>>>>>> .their
- 	"schema.properties.name": "规则的描述。",
- 	"schema.properties.scope": "此规则适用的范围选择器。",
- 	"schema.tokenColors.path": "tmTheme 文件路径(相对于当前文件)。",
-changed in both
-  base   100644 88cd69f245175f2ab695da06f49fa19bf61351ca i18n/chs/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
-  our    100644 fdbbd851c6ebb5780e1fd021808d61a4952b4bd2 i18n/chs/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
-  their  100644 224f57f3f64b24fedc9a96ae48346c75cd566be5 i18n/chs/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
-changed in both
-  base   100644 ef537ea8255a9257daa9dca69ce93fbb5f4c2323 i18n/chs/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 b8184384917ecac19f65cc6ad82a6fa2b4f59292 i18n/chs/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 fae9207b8f3ec1883e46195d271c5d41b803d472 i18n/chs/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-@@ -13,6 +13,12 @@
- 	"noIconThemeDesc": "无文件图标",
- 	"iconThemeError": "文件图标主题未知或未安装。",
- 	"workbenchColors": "覆盖当前所选颜色主题的颜色。",
-+<<<<<<< .our
-+=======
-+	"workbenchColors.deprecated": "该设置不再是实验性设置，并已重命名为“workbench.colorCustomizations”",
-+	"workbenchColors.deprecatedDescription": "改用“workbench.colorCustomizations”",
-+	"editorColors": "覆盖当前所选颜色主题中的编辑器颜色和字体样式。",
-+>>>>>>> .their
- 	"editorColors.comments": "设置注释的颜色和样式",
- 	"editorColors.strings": "设置字符串文本的颜色和样式",
- 	"editorColors.keywords": "设置关键字的颜色和样式。",
-@@ -20,6 +26,10 @@
- 	"editorColors.types": "设置类型定义与引用的颜色和样式。",
- 	"editorColors.functions": "设置函数定义与引用的颜色和样式。",
- 	"editorColors.variables": "设置变量定义和引用的颜色和样式。",
-+<<<<<<< .our
- 	"editorColors.textMateRules": "使用 TextMate 主题规则设置颜色和样式(高级)。",
- 	"editorColors": "覆盖当前所选颜色主题中的编辑器颜色和字体样式。"
-+=======
-+	"editorColors.textMateRules": "使用 TextMate 主题规则设置颜色和样式(高级)。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 4021c09714308ac2b6dd9e7bf4259172333b6521 i18n/cht/extensions/css/package.i18n.json
-  our    100644 3b83a3b860e5429d1bd45acf5cd49a91b96746b6 i18n/cht/extensions/css/package.i18n.json
-  their  100644 86489b3522cc054c05434b448db59559563fdfb6 i18n/cht/extensions/css/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,73 @@
- 	],
- 	"displayName": "CSS 語言基礎知識",
- 	"description": "為 CSS、LESS 與 SCSS 檔案提供語法醒目提示與括弧對應功能。"
-+=======
-+	"css.lint.argumentsInColorFunction.desc": "參數數目無效",
-+	"css.lint.boxModel.desc": "使用填補或框線時不要使用寬度或高度。",
-+	"css.lint.compatibleVendorPrefixes.desc": "在使用廠商專屬的前置詞時，請確定也包括其他所有的廠商特定屬性。",
-+	"css.lint.duplicateProperties.desc": "請勿使用重複的樣式定義",
-+	"css.lint.emptyRules.desc": "請勿使用空白規則集",
-+	"css.lint.float.desc": "避免使用 'float'。浮動會使 CSS 脆弱，在版面配置的任一層面改變時容易中斷。",
-+	"css.lint.fontFaceProperties.desc": "@font-face 規則必須定義 'src' 和 'font-family' 屬性",
-+	"css.lint.hexColorLength.desc": "十六進位色彩必須由三個或六個十六進位數字組成",
-+	"css.lint.idSelector.desc": "選取器不應包含 ID，因為這些規則與 HTML 結合過於緊密。",
-+	"css.lint.ieHack.desc": "只有在支援 IE7 及更舊的版本時才需要 IE Hack",
-+	"css.lint.important.desc": "避免使用 !important。這表示整個 CSS 的明確性皆失控，需要重構。",
-+	"css.lint.importStatement.desc": "匯入陳述式不會平行載入",
-+	"css.lint.propertyIgnoredDueToDisplay.desc": "屬性因顯示而忽略。例如，若為 'display: inline'，則 width、height、margin-top、margin-bottom 以及 float 屬性就不會有任何作用。",
-+	"css.lint.universalSelector.desc": "已知通用選取器 (*) 速度緩慢",
-+	"css.lint.unknownProperties.desc": "未知的屬性。",
-+	"css.lint.unknownVendorSpecificProperties.desc": "未知的廠商特定屬性。",
-+	"css.lint.vendorPrefix.desc": "在使用廠商專屬的前置詞時，也包括標準屬性。",
-+	"css.lint.zeroUnits.desc": "零不需要任何單位",
-+	"css.trace.server.desc": "追蹤 VS Code 與 CSS 語言伺服器之間的通訊。",
-+	"css.validate.title": "控制 CSS 驗證與問題嚴重性。",
-+	"css.validate.desc": "啟用或停用所有驗證",
-+	"less.lint.argumentsInColorFunction.desc": "參數數目無效",
-+	"less.lint.boxModel.desc": "使用填補或框線時不要使用寬度或高度。",
-+	"less.lint.compatibleVendorPrefixes.desc": "在使用廠商專屬的前置詞時，請確定也包括其他所有的廠商特定屬性。",
-+	"less.lint.duplicateProperties.desc": "請勿使用重複的樣式定義",
-+	"less.lint.emptyRules.desc": "請勿使用空白規則集",
-+	"less.lint.float.desc": "避免使用 'float'。浮動會使 CSS 脆弱，在版面配置的任一層面改變時容易中斷。",
-+	"less.lint.fontFaceProperties.desc": "@font-face 規則必須定義 'src' 和 'font-family' 屬性",
-+	"less.lint.hexColorLength.desc": "十六進位色彩必須由三個或六個十六進位數字組成",
-+	"less.lint.idSelector.desc": "選取器不應包含 ID，因為這些規則與 HTML 結合過於緊密。",
-+	"less.lint.ieHack.desc": "只有在支援 IE7 及更舊的版本時才需要 IE Hack",
-+	"less.lint.important.desc": "避免使用 !important。這表示整個 CSS 的明確性皆失控，需要重構。",
-+	"less.lint.importStatement.desc": "匯入陳述式不會平行載入",
-+	"less.lint.propertyIgnoredDueToDisplay.desc": "屬性因顯示而忽略。例如，若為 'display: inline'，則 width、height、margin-top、margin-bottom 以及 float 屬性就不會有任何作用。",
-+	"less.lint.universalSelector.desc": "已知通用選取器 (*) 速度緩慢",
-+	"less.lint.unknownProperties.desc": "未知的屬性。",
-+	"less.lint.unknownVendorSpecificProperties.desc": "未知的廠商特定屬性。",
-+	"less.lint.vendorPrefix.desc": "在使用廠商專屬的前置詞時，也包括標準屬性。",
-+	"less.lint.zeroUnits.desc": "零不需要任何單位",
-+	"less.validate.title": "控制 LESS 驗證與問題嚴重性。",
-+	"less.validate.desc": "啟用或停用所有驗證",
-+	"scss.lint.argumentsInColorFunction.desc": "參數數目無效",
-+	"scss.lint.boxModel.desc": "使用填補或框線時不要使用寬度或高度。",
-+	"scss.lint.compatibleVendorPrefixes.desc": "在使用廠商專屬的前置詞時，請確定也包括其他所有的廠商特定屬性。",
-+	"scss.lint.duplicateProperties.desc": "請勿使用重複的樣式定義",
-+	"scss.lint.emptyRules.desc": "請勿使用空白規則集",
-+	"scss.lint.float.desc": "避免使用 'float'。浮動會使 CSS 脆弱，在版面配置的任一層面改變時容易中斷。",
-+	"scss.lint.fontFaceProperties.desc": "@font-face 規則必須定義 'src' 和 'font-family' 屬性",
-+	"scss.lint.hexColorLength.desc": "十六進位色彩必須由三個或六個十六進位數字組成",
-+	"scss.lint.idSelector.desc": "選取器不應包含 ID，因為這些規則與 HTML 結合過於緊密。",
-+	"scss.lint.ieHack.desc": "只有在支援 IE7 及更舊的版本時才需要 IE Hack",
-+	"scss.lint.important.desc": "避免使用 !important。這表示整個 CSS 的明確性皆失控，需要重構。",
-+	"scss.lint.importStatement.desc": "匯入陳述式不會平行載入",
-+	"scss.lint.propertyIgnoredDueToDisplay.desc": "屬性因顯示而忽略。例如，若為 'display: inline'，則 width、height、margin-top、margin-bottom 以及 float 屬性就不會有任何作用。",
-+	"scss.lint.universalSelector.desc": "已知通用選取器 (*) 速度緩慢",
-+	"scss.lint.unknownProperties.desc": "未知的屬性。",
-+	"scss.lint.unknownVendorSpecificProperties.desc": "未知的廠商特定屬性。",
-+	"scss.lint.vendorPrefix.desc": "在使用廠商專屬的前置詞時，也包括標準屬性。",
-+	"scss.lint.zeroUnits.desc": "零不需要任何單位",
-+	"scss.validate.title": "控制 SCSS 驗證與問題嚴重性。",
-+	"scss.validate.desc": "啟用或停用所有驗證",
-+	"less.colorDecorators.enable.desc": "啟用或停用彩色裝飾項目",
-+	"scss.colorDecorators.enable.desc": "啟用或停用彩色裝飾項目",
-+	"css.colorDecorators.enable.desc": "啟用或停用彩色裝飾項目",
-+	"css.colorDecorators.enable.deprecationMessage": "設定 `css.colorDecorators.enable` 已淘汰，改為 `editor.colorDecorators`。",
-+	"scss.colorDecorators.enable.deprecationMessage": "設定 `scss.colorDecorators.enable` 已淘汰，改為 `editor.colorDecorators`。",
-+	"less.colorDecorators.enable.deprecationMessage": "設定 `less.colorDecorators.enable` 已淘汰，改為 `editor.colorDecorators`。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a35321b4655c4f000dafff5aa8edca576c732397 i18n/cht/extensions/emmet/package.i18n.json
-  our    100644 b3dc8be8bb9ec8fba170590d50c4692dadd9f40f i18n/cht/extensions/emmet/package.i18n.json
-  their  100644 392c4b2278aa73fd88e1e465dd07d39a75ccc36b i18n/cht/extensions/emmet/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -7,6 +8,8 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"description": "VS Code 的 Emnet 支援",
-+=======
-+>>>>>>> .their
- 	"command.wrapWithAbbreviation": "使用縮寫換行",
- 	"command.wrapIndividualLinesWithAbbreviation": "使用縮寫換每一行",
- 	"command.removeTag": "移除標籤",
-@@ -32,12 +35,21 @@
- 	"command.decrementNumberByTen": "依 10 遞減",
- 	"emmetSyntaxProfiles": "為指定的語法定義設定檔，或透過特定規則使用自己的設定檔。",
- 	"emmetExclude": "不應展開 Emmet 縮寫的語言陣列。",
-+<<<<<<< .our
- 	"emmetExtensionsPath": "包含 Emmet 設定檔及程式碼片段的資料夾路徑",
- 	"emmetShowExpandedAbbreviation": "顯示建議之展開的 Emmet 縮寫。\n\"inMarkupAndStylesheetFilesOnly\" 選項適用於 html、haml、jade、slim、xml、xsl、css、scss、sass、less 和 stylus。\n不論 markup/css 為何，該選項「一律」適用於檔案的所有部分。",
- 	"emmetShowAbbreviationSuggestions": "顯示建議可能的 Emmet 縮寫。但在樣式表內或 emmet.showExpandedAbbreviation 設為「永不」時，則不適用。",
- 	"emmetIncludeLanguages": "以預設未支援的語言啟用 Emmet 縮寫。在此新增該語言和 Emmet 支援的語言間之對應。\n例如: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"} ",
- 	"emmetVariables": "在 Emmet 程式碼片段中使用的變數",
- 	"emmetTriggerExpansionOnTab": "啟用時，按下 Tab 鍵即可展開 Emmet 縮寫。",
-+=======
-+	"emmetExtensionsPath": "包含 Emmet 設定檔與程式碼片段的資料夾路徑。」",
-+	"emmetShowExpandedAbbreviation": "顯示建議之展開的 Emmet 縮寫\n\"inMarkupAndStylesheetFilesOnly\" 選項適用於 html、haml、jade、slim、xml、xsl、css、scss、sass、less 和 stylus。\n不論標記/css 為何，該選項「一律」適用於檔案的所有部分。",
-+	"emmetShowAbbreviationSuggestions": "顯示建議之可能的 Emmet 縮寫。但在樣式表內，或若 emmet.showExpandedAbbreviation 設為「永不」，則不適用。",
-+	"emmetIncludeLanguages": "以預設未支援的語言啟用 Emmet 縮寫。在此新增該語言和 Emmet 支援的語言間之對應。例如: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"} ",
-+	"emmetVariables": "要在 Emmet 程式碼片段中使用的變數",
-+	"emmetTriggerExpansionOnTab": "如有啟用，只要按 Tab 鍵就能展開 Emmet 縮寫。",
-+>>>>>>> .their
- 	"emmetPreferences": "喜好設定，用以修改某些動作的行為及 Emmet 的解析程式。",
- 	"emmetPreferencesIntUnit": "整數值的預設單位",
- 	"emmetPreferencesFloatUnit": "浮點值的預設單位",
-@@ -47,6 +59,7 @@
- 	"emmetPreferencesCssBetween": "展開 CSS 縮寫時，要放在 CSS 屬性與值之間的符號",
- 	"emmetPreferencesSassBetween": "在 SASS 檔案中展開 CSS 縮寫時，要放在 CSS 屬性與值之間的符號",
- 	"emmetPreferencesStylusBetween": "在手寫筆檔案中展開 CSS 縮寫時，要放在 CSS 屬性與值之間的符號",
-+<<<<<<< .our
- 	"emmetShowSuggestionsAsSnippets": "若為 true，則 Emmet 建議會顯示為程式碼片段，可讓您在每個 editor.snippetSuggestions 設定為其排序。",
- 	"emmetPreferencesBemElementSeparator": "使用 BEM 篩選時用於類別的元素分隔符號",
- 	"emmetPreferencesBemModifierSeparator": "使用 BEM 篩選時用於類別的修飾詞分隔符號",
-@@ -62,4 +75,7 @@
- 	"emmetPreferencesCssMsProperties": "在以 `-` 開頭的 Emmet 縮寫中使用時，會取得 'ms' 廠商前綴的逗點分隔 CSS 屬性。設定為空白字串可避免總是取得 'ms' 前綴。",
- 	"emmetPreferencesCssFuzzySearchMinScore": "模糊比對的縮寫應該達到最低分數(從 0 到 1)。較低數值可能產生錯誤的比對，較高的數值可能會降低可能的比對。",
- 	"emmetOptimizeStylesheetParsing": "當設定為 false 時，將解析整個檔案以確定目前的位置是否適用於展開 Emmet 縮寫。當設定為 true 時，僅會解析 css/scss/less 檔案中目前位置周圍的內容。"
-+=======
-+	"emmetShowSuggestionsAsSnippets": "若為 true，則 Emmet 建議會顯示為程式碼片段，可讓您在每個 editor.snippetSuggestions 設定為其排序。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 425005b7245b29437530f465ed04ae81f8e30d2b i18n/cht/extensions/extension-editing/out/extensionLinter.i18n.json
-  our    100644 67c98d58805f7a295d9a615f22f783bfecb27575 i18n/cht/extensions/extension-editing/out/extensionLinter.i18n.json
-  their  100644 7816e127fc1c804089c73876711e1c552a6b1a63 i18n/cht/extensions/extension-editing/out/extensionLinter.i18n.json
-changed in both
-  base   100644 d15c4822a77c0083cbfb67b31721c418bd388333 i18n/cht/extensions/git/out/commands.i18n.json
-  our    100644 f99c465da1ed922e8de7f8c6dfd9a26e886bdd66 i18n/cht/extensions/git/out/commands.i18n.json
-  their  100644 d7ef0b15a46bdbc9722cf6ed6244a9c257c07091 i18n/cht/extensions/git/out/commands.i18n.json
-@@ -13,6 +13,7 @@
- 	"selectFolder": "選擇儲存庫位置",
- 	"cloning": "正在複製 git 存放庫 '{0}'...",
- 	"proposeopen": "要開啟複製的儲存庫嗎?",
-+<<<<<<< .our
- 	"openrepo": "開啟儲存庫",
- 	"add": "新增到工作區",
- 	"proposeopen2": "要開啟以複製的儲存庫, 或將其新增到目前工作區？",
-@@ -20,6 +21,10 @@
- 	"init repo": "初始化儲存庫",
- 	"create repo": "初始化儲存庫",
- 	"are you sure": "這會建立一個 Git 儲存庫在 '{0}'。確定要繼續嗎？",
-+=======
-+	"path to init": "資料夾路徑",
-+	"provide path": "請提供資料夾路徑以初始化 Git 存放庫",
-+>>>>>>> .their
- 	"HEAD not available": "'{0}' 的 HEAD 版本無法使用。",
- 	"confirm stage files with merge conflicts": "確定要暫存 {0} 個有合併衝突的檔案嗎?",
- 	"confirm stage file with merge conflicts": "確定要暫存有合併衝突的 {0} 嗎?",
-@@ -43,10 +48,13 @@
- 	"confirm discard all 2": "{0}\n\n這項動作無法復原，您會永久失去目前的工作集。",
- 	"yes discard tracked": "捨棄 1 個追蹤的檔案",
- 	"yes discard tracked multiple": "捨棄 {0} 個追蹤的檔案",
-+<<<<<<< .our
- 	"unsaved files single": "下列檔案尚未儲存： {0}。\n\n您要在認可之前進行儲存嗎？",
- 	"unsaved files": "有 {0} 個未儲存檔案。\n\n您要在認可之前進行儲存嗎？",
- 	"save and commit": "儲存全部且認可",
- 	"commit": "無論如何仍認可",
-+=======
-+>>>>>>> .their
- 	"no staged changes": "沒有暫存變更進行提交\n\n您希望自動暫存您所有變更並直接提交?",
- 	"always": "永遠",
- 	"no changes": "沒有任何變更要認可。",
-@@ -66,10 +74,14 @@
- 	"provide tag name": "請提供標籤名稱",
- 	"tag message": "訊息",
- 	"provide tag message": "請提供訊息以標註標籤",
-+<<<<<<< .our
- 	"no remotes to fetch": "您的儲存庫未設定要擷取的遠端來源。",
-+=======
-+>>>>>>> .their
- 	"no remotes to pull": "您的儲存庫未設定要提取的遠端來源。",
- 	"pick remote pull repo": "挑選要將分支提取出的遠端",
- 	"no remotes to push": "您的儲存庫未設定要推送的遠端目標。",
-+	"push with tags success": "已成功使用標籤推送。",
- 	"nobranch": "請簽出分支以推送到遠端。",
- 	"confirm publish branch": "分支 '{0}' 沒有任何上游分支。 您仍想發布這個分支嗎？",
- 	"ok": "確定",
-changed in both
-  base   100644 9949e5c21643da1ee3242e99404c903c04547f5a i18n/cht/extensions/git/out/model.i18n.json
-  our    100644 9d0c687346549589afc411a7ee06e44db29429b8 i18n/cht/extensions/git/out/model.i18n.json
-  their  100644 300ab110fc66ac6fee3374ba6bd03c1c6cf8288a i18n/cht/extensions/git/out/model.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -7,6 +8,8 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"too many submodules": "'{0}' 存放庫有 {1} 個無法自動開啟的子模組。您仍可在其中開啟檔案來個別開啟子模組。",
-+=======
-+>>>>>>> .their
- 	"no repositories": "沒有存放庫可供使用",
- 	"pick repo": "請選擇存放庫"
- }
-\ No newline at end of file
-added in both
-  our    100644 a54587b5b75339d5398947d766aa1b0ea3230041 i18n/cht/extensions/git/out/repository.i18n.json
-  their  100644 c07485bdb6340576d5d44a7cda440d54db6e406b i18n/cht/extensions/git/out/repository.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"open": "開啟",
- 	"index modified": "已修改索引",
- 	"modified": "已修改",
-@@ -23,6 +32,7 @@
- 	"deleted by us": "已受到我們刪除",
- 	"both added": "皆已新增",
- 	"both modified": "皆已修改",
-+<<<<<<< .our
- 	"commitMessage": "訊息 (按 {0} 以認可)",
- 	"commit": "認可",
- 	"merge changes": "合併變更",
-@@ -30,6 +40,13 @@
- 	"changes": "變更",
- 	"commitMessageCountdown": "在目前行數剩餘 {0} 個字元",
- 	"commitMessageWarning": "在目前行數有 {0} 個字元已超過 {1} 個",
-+=======
-+	"commit": "認可",
-+	"merge changes": "合併變更",
-+	"staged changes": "已分段的變更",
-+	"changes": "變更",
-+	"ok": "確定",
-+>>>>>>> .their
- 	"neveragain": "不要再顯示",
- 	"huge": "位於 '{0}' 的 Git 儲存庫有過多使用中的變更，只有部份 Git 功能會被啟用。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 a1542c760c08352ce18decd3a0753357509fe09a i18n/cht/extensions/git/package.i18n.json
-  our    100644 bc042cb15d8c15d6c5568f5c08f9df112417a23c i18n/cht/extensions/git/package.i18n.json
-  their  100644 a06a7ada246d3ab478e85e2725fbc4dc3f08c91f i18n/cht/extensions/git/package.i18n.json
-@@ -40,7 +40,10 @@
- 	"command.renameBranch": "重新命名分支...",
- 	"command.merge": "合併分支...",
- 	"command.createTag": "建立標籤",
-+<<<<<<< .our
- 	"command.fetch": "擷取",
-+=======
-+>>>>>>> .their
- 	"command.pull": "提取",
- 	"command.pullRebase": "提取 (重訂基底)",
- 	"command.pullFrom": "從...提取",
-@@ -52,7 +55,10 @@
- 	"command.publish": "發行分支",
- 	"command.showOutput": "顯示 Git 輸出",
- 	"command.ignore": "將檔案新增到 .gitignore",
-+<<<<<<< .our
- 	"command.stashIncludeUntracked": "隱藏 (包含未被追蹤的檔案)",
-+=======
-+>>>>>>> .their
- 	"command.stash": "隱藏",
- 	"command.stashPop": "快顯隱藏...",
- 	"command.stashPopLatest": "快顯上一次的隱藏",
-@@ -71,6 +77,7 @@
- 	"config.defaultCloneDirectory": "複製 Git 儲存庫的預設位置",
- 	"config.enableSmartCommit": "無暫存變更時提交所有變更。",
- 	"config.enableCommitSigning": "啟用 GPG 認可簽署。",
-+<<<<<<< .our
- 	"config.discardAllScope": "控制 `Discard all changes` 命令會捨棄的變更。`all` 會捨棄所有變更。`tracked` 只會捨棄追蹤的檔案。`prompt` 會在每次動作執行時顯示提示對話方塊。",
- 	"config.decorations.enabled": "控制 Git 是否提供色彩及徽章給總管及開啟編輯器視窗。",
- 	"config.promptToSaveFilesBeforeCommit": "控制Git是否應該在提交之前檢查未儲存的檔案。",
-@@ -84,4 +91,7 @@
- 	"colors.ignored": "忽略資源的顏色。",
- 	"colors.conflict": "帶有衝突資源的顏色。",
- 	"colors.submodule": "子模組資源的顏色"
-+=======
-+	"config.discardAllScope": "控制 `Discard all changes` 命令會捨棄的變更。`all` 會捨棄所有變更。`tracked` 只會捨棄追蹤的檔案。`prompt` 會在每次動作執行時顯示提示對話方塊。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ecac49c75590e876e9b4b929e18696a333cba73a i18n/cht/extensions/html/package.i18n.json
-  our    100644 eb9141c8094021b0f2a1095db39a0fd715be7b2e i18n/cht/extensions/html/package.i18n.json
-  their  100644 5594c3d11ac395c3772ab3e82ba4fa27d5e236b3 i18n/cht/extensions/html/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,28 @@
- 	],
- 	"displayName": "HTML 語言基礎知識",
- 	"description": "為 HTML 檔案提供語法醒目提示、括弧對應與程式碼片段功能。"
-+=======
-+	"html.format.enable.desc": "啟用/停用預設 HTML 格式器",
-+	"html.format.wrapLineLength.desc": "每行的字元數上限 (0 = 停用)。",
-+	"html.format.unformatted.desc": "不應重新格式化的逗號分隔標記清單。'null' 預設為 https://www.w3.org/TR/html5/dom.html#phrasing-content 中列出的所有標記。",
-+	"html.format.contentUnformatted.desc": "逗點分隔的標記清單，其中內容的格式不應重新設定。'null' 預設為 'pre' 標記。",
-+	"html.format.indentInnerHtml.desc": "縮排 <head> 及 <body> 區段。",
-+	"html.format.preserveNewLines.desc": "是否應保留項目前方現有的分行符號。僅適用於項目前方，而不適用於標記內或文字。",
-+	"html.format.maxPreserveNewLines.desc": "一個區塊要保留的最大分行符號數。使用 'null' 表示無限制。",
-+	"html.format.indentHandlebars.desc": "格式化並縮排 {{#foo}} 及 {{/foo}}。",
-+	"html.format.endWithNewline.desc": "以新行字元結尾。",
-+	"html.format.extraLiners.desc": "前方應有額外新行字元的標記清單，須以逗號分隔。'null' 的預設值為 \"head, body, /html\"。",
-+	"html.format.wrapAttributes.desc": "將屬性換行。",
-+	"html.format.wrapAttributes.auto": "只在超過行的長度時將屬性換行。",
-+	"html.format.wrapAttributes.force": "將第一個以外的每個屬性換行。",
-+	"html.format.wrapAttributes.forcealign": "將第一個以外的每個屬性換行，並保持對齊。",
-+	"html.format.wrapAttributes.forcemultiline": "將每個屬性換行。",
-+	"html.suggest.angular1.desc": "設定內建 HTML 語言支援是否建議 Angular V1 標記和屬性。",
-+	"html.suggest.ionic.desc": "設定內建 HTML 語言支援是否建議 Ionic 標記、屬性和值。",
-+	"html.suggest.html5.desc": "設定內建 HTML 語言支援是否建議 HTML5 標記、屬性和值。",
-+	"html.trace.server.desc": "追蹤 VS Code 與 HTML  語言伺服器之間的通訊。",
-+	"html.validate.scripts": "設定內建 HTML 語言支援是否會驗證內嵌指定碼。",
-+	"html.validate.styles": "設定內建 HTML 語言支援是否會驗證內嵌樣式。",
-+	"html.autoClosingTags": "啟用/停用 HTML 標籤的自動關閉功能。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 3e40bd3dd2e948e76ea9cfd5c3ef3295adfe5ccb i18n/cht/extensions/json/package.i18n.json
-  our    100644 909f55cf27028d69b0c46d37319282cd3f8a8dc1 i18n/cht/extensions/json/package.i18n.json
-  their  100644 999ac85b405644519625ebcccea4dea8e412e9e2 i18n/cht/extensions/json/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,15 @@
- 	],
- 	"displayName": "JSON 語言基礎知識",
- 	"description": "為 JSON  檔案提供語法醒目提示與括弧對應功能。"
-+=======
-+	"json.schemas.desc": "在結構描述與目前專案的 JSON 檔案之間建立關聯",
-+	"json.schemas.url.desc": "目前目錄中的結構描述 URL 或結構描述相對路徑",
-+	"json.schemas.fileMatch.desc": "檔案模式陣列，在將 JSON 檔案解析成結構描述時的比對對象。",
-+	"json.schemas.fileMatch.item.desc": "可包含 '*' 的檔案模式，在將 JSON 檔案解析成結構描述時的比對對象。",
-+	"json.schemas.schema.desc": "指定 URL 的結構描述定義。只須提供結構描述以避免存取結構描述 URL。",
-+	"json.format.enable.desc": "啟用/停用預設 JSON 格式器 (需要重新啟動)",
-+	"json.tracing.desc": "追蹤 VS Code 與 JSON 語言伺服器之間的通訊。",
-+	"json.colorDecorators.enable.desc": "啟用或停用彩色裝飾項目",
-+	"json.colorDecorators.enable.deprecationMessage": "設定 `json.colorDecorators.enable` 已淘汰，將改為 `editor.colorDecorators`。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 9cec2a47a614c3e7fb8cc674197151a62343a068 i18n/cht/extensions/markdown/out/security.i18n.json
-  our    100644 cc4260be39fbcfcea114d06109122da15a50bcfa i18n/cht/extensions/markdown/out/security.i18n.json
-  their  100644 870789578bf673fc83685bb90104e72c282589b8 i18n/cht/extensions/markdown/out/security.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"strict.title": "嚴謹",
- 	"strict.description": "僅載入安全內容",
- 	"insecureContent.title": "允許不安全的內容",
-@@ -13,8 +16,11 @@
- 	"disable.title": "停用",
- 	"disable.description": "允許所有內容與指令碼執行。不建議",
- 	"moreInfo.title": "詳細資訊",
-+<<<<<<< .our
- 	"enableSecurityWarning.title": "允許此工作區預覽安全性警告",
- 	"disableSecurityWarning.title": "不允許此工作區預覽安全性警告",
- 	"toggleSecurityWarning.description": "不影響內容安全性層級",
-+=======
-+>>>>>>> .their
- 	"preview.showPreviewSecuritySelector.title": "選擇此工作區 Markdown 預覽的安全性設定"
- }
-\ No newline at end of file
-changed in both
-  base   100644 2834fa93cb56d974c1f0a87e8582adea8229cee1 i18n/cht/extensions/markdown/package.i18n.json
-  our    100644 d27fa896c2a968ebc3d62b14eeb7878112abde12 i18n/cht/extensions/markdown/package.i18n.json
-  their  100644 0a35a23533d5b34a0a74066454b503e0d833b0af i18n/cht/extensions/markdown/package.i18n.json
-@@ -27,6 +27,10 @@
- 	"markdown.styles.dec": "可從 Markdown 預覽使用之 CSS 樣式表的 URL 或本機路徑清單。相對路徑是相對於在總管中開啟的資料夾來進行解釋。若沒有開啟資料夾，路徑則是相對於 Markdown 檔案的位置來進行解釋。所有 '\\' 都必須寫成 '\\\\'。",
- 	"markdown.showPreviewSecuritySelector.title": "變更預覽的安全性設定",
- 	"markdown.trace.desc": "允許 Markdown 延伸模組進行偵錯記錄。",
-+<<<<<<< .our
- 	"markdown.preview.refresh.title": "重新整理預覽",
- 	"markdown.preview.toggleLock.title": "切換預覽鎖定"
-+=======
-+	"markdown.refreshPreview.title": "重新整理預覽"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 74cbc6cffe4b82151105822fcca16e895e57e623 i18n/cht/extensions/npm/package.i18n.json
-  our    100644 e1e497559e0002c1cb7f8161b65cf930f3fd8de7 i18n/cht/extensions/npm/package.i18n.json
-  their  100644 439c8e3bb279cb260144c8e604499d17123648e4 i18n/cht/extensions/npm/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -23,4 +24,8 @@
- 	"command.debug": "偵錯",
- 	"command.openScript": "開啟",
- 	"command.runInstall": "執行安裝"
-+=======
-+	"config.npm.autoDetect": "控制是否自動檢測npm腳本.預設為開啟.",
-+	"config.npm.runSilent": "以 '--silent' 選項執行 npm 命令 "
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/cht/extensions/typescript/out/features/taskProvider.i18n.json
-  our    100644 61ba5737e640ec966e3c9ef97217c53e5e9c01d7 i18n/cht/extensions/typescript/out/features/taskProvider.i18n.json
-  their  100644 f6e962d5d7df1fe1f2dee61c7d44967c93474465 i18n/cht/extensions/typescript/out/features/taskProvider.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,14 @@
- 	],
- 	"buildTscLabel": "建置 - {0}",
- 	"buildAndWatchTscLabel": "監看 - {0}"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"buildAndWatchTscLabel": "監看 - {0}",
-+	"buildTscLabel": "建置 - {0}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 bb0bb1a4af96c60f0b0fb43bb0b12e73a7633617 i18n/cht/extensions/typescript/out/utils/api.i18n.json
-  their  100644 1fed6af09c80bada8a10f4cee702bd6f62a4168e i18n/cht/extensions/typescript/out/utils/api.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"invalidVersion": "無效的版本"
- }
-\ No newline at end of file
-changed in both
-  base   100644 2849b6d3fb191d9ea2c8baac7b40b7339e3b5908 i18n/cht/extensions/typescript/out/utils/versionPicker.i18n.json
-  our    100644 fdf7133b8249cbb3604f8bd52f1e63fe2cf18f9b i18n/cht/extensions/typescript/out/utils/versionPicker.i18n.json
-  their  100644 d88c2947fea435445a16ac2e0a9c14d5035d700c i18n/cht/extensions/typescript/out/utils/versionPicker.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"useVSCodeVersionOption": "使用 VS Code 的版本",
- 	"useWorkspaceVersionOption": "使用工作區版本",
- 	"learnMore": "深入了解",
-changed in both
-  base   100644 f883c34b14441bcebba078adfc64c16694605bc6 i18n/cht/extensions/typescript/out/utils/versionProvider.i18n.json
-  our    100644 8d374cb18867b5e8f897e9283556849290230ab2 i18n/cht/extensions/typescript/out/utils/versionProvider.i18n.json
-  their  100644 d24a4e2a05e64664604fbe516821801feee8fc8f i18n/cht/extensions/typescript/out/utils/versionProvider.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"couldNotLoadTsVersion": "無法在此路徑載入 TypeScript 版本",
- 	"noBundledServerFound": "其他應用程式已刪除了 VS Code 的 tsserver，例如行為不當的病毒偵測工具。請重新安裝 VS Code。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 36c016dd769eeb5ced0a166569421eb8f6e885be i18n/cht/extensions/typescript/package.i18n.json
-  our    100644 003b932658c92a3dfaef72f32a2eeb83563c3b7f i18n/cht/extensions/typescript/package.i18n.json
-  their  100644 e56e400373b8e60c3b83375031a05548d58a650e i18n/cht/extensions/typescript/package.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/cht/src/vs/code/electron-main/auth.i18n.json
-  our    100644 e6c89f97dd816e01883006cafe664b6545677fcd i18n/cht/src/vs/code/electron-main/auth.i18n.json
-  their  100644 3eef49744675b6c6becc10eb0aac908b1a6156e1 i18n/cht/src/vs/code/electron-main/auth.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"authRequire": "必須進行 Proxy 驗證 ",
- 	"proxyauth": "Proxy {0} 必須進行驗證。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 6448fc6cba36fe8cbb7277b9fc0b12a416ab579d i18n/cht/src/vs/code/electron-main/menus.i18n.json
-  our    100644 5f037b2a895deac7820d5f0872d4b9af5505b797 i18n/cht/src/vs/code/electron-main/menus.i18n.json
-  their  100644 fe521f0b99097d058d705e5369e4ed4f017dbd08 i18n/cht/src/vs/code/electron-main/menus.i18n.json
-@@ -24,12 +24,21 @@
- 	"miQuit": "結束 {0}",
- 	"miNewFile": "新增檔案(&&N)",
- 	"miOpen": "開啟(&&O)...",
-+<<<<<<< .our
- 	"miOpenWorkspace": "開啟工作區 (&&k)...",
- 	"miOpenFolder": "開啟資料夾(&&F)...",
- 	"miOpenFile": "開啟檔案(&&O)...",
- 	"miOpenRecent": "開啟最近的檔案(&&R)",
- 	"miSaveWorkspaceAs": "另存工作區為...",
- 	"miAddFolderToWorkspace": "新增資料夾至工作區 (&&A)...",
-+=======
-+	"miOpenWorkspace": "開啟工作區(&&O)...",
-+	"miOpenFolder": "開啟資料夾(&&F)...",
-+	"miOpenFile": "開啟檔案(&&O)...",
-+	"miOpenRecent": "開啟最近的檔案(&&R)",
-+	"miSaveWorkspaceAs": "將工作區另存為(&&S)...",
-+	"miAddFolderToWorkspace": "將資料夾新增到工作區(&&A)",
-+>>>>>>> .their
- 	"miSave": "儲存(&&S)",
- 	"miSaveAs": "另存新檔(&&A)...",
- 	"miSaveAll": "全部儲存(&&L)",
-@@ -176,7 +185,11 @@
- 	"miPrivacyStatement": "隱私權聲明(&&P)",
- 	"miAbout": "關於(&&A)",
- 	"miRunTask": "執行工作(&&R)",
-+<<<<<<< .our
- 	"miBuildTask": "執行建置工作(&&B)...",
-+=======
-+	"miBuildTask": " 執行建置工作(&&B)...",
-+>>>>>>> .their
- 	"miRunningTask": "顯示執行中的工作(&&G)...",
- 	"miRestartTask": "重新開始執行工作(&&E)...",
- 	"miTerminateTask": "終止工作(&&T)...",
-@@ -189,5 +202,11 @@
- 	"miDownloadingUpdate": "正在下載更新...",
- 	"miInstallUpdate": "安裝更新...",
- 	"miInstallingUpdate": "正在安裝更新...",
-+<<<<<<< .our
- 	"miRestartToUpdate": "重新啟動以更新..."
-+=======
-+	"miCheckForUpdates": "查看是否有更新",
-+	"aboutDetail": "\n版本 {0}\n認可 {1}\n日期 {2}\nShell {3}\n轉譯器 {4}\n節點 {5}\n架構 {6}",
-+	"okButton": "確定"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6137785c58706549340ebae6eb4f883c8bf7da35 i18n/cht/src/vs/code/electron-main/windows.i18n.json
-  our    100644 0f0e6e8b8de1865a58f09b392ec2bcf42c9ef403 i18n/cht/src/vs/code/electron-main/windows.i18n.json
-  their  100644 a3d723b56aafb61afdf72bfa32cf814e4bb16db0 i18n/cht/src/vs/code/electron-main/windows.i18n.json
-@@ -9,15 +9,30 @@
- 	"ok": "確定",
- 	"pathNotExistTitle": "路徑不存在",
- 	"pathNotExistDetail": "磁碟上似乎已沒有路徑 '{0}'。",
-+<<<<<<< .our
- 	"reopen": "重新開啟(&&R)",
- 	"wait": "繼續等候(&&K)",
- 	"close": "關閉(&&C)",
-+=======
-+	"openWorkspace": "開啟(&&O)...",
-+	"openWorkspaceTitle": "開啟工作區",
-+	"save": "儲存(&&S)",
-+	"doNotSave": "不要儲存(&&N)",
-+	"cancel": "取消",
-+	"saveWorkspaceMessage": "要將工作區組態儲存為檔案嗎?",
-+	"saveWorkspaceDetail": "如果您預計再次開啟工作區，請儲存工作區。",
-+	"saveWorkspace": "儲存工作區",
-+	"reopen": "重新開啟",
-+	"wait": "繼續等候",
-+	"close": "關閉",
-+>>>>>>> .their
- 	"appStalled": "視窗已沒有回應",
- 	"appStalledDetail": "您可以重新開啟或關閉視窗，或是繼續等候。",
- 	"appCrashed": "視窗已損毀",
- 	"appCrashedDetail": "很抱歉造成您的不便! 您可以重新開啟視窗，從您離開的地方繼續進行。",
- 	"open": "開啟",
- 	"openFolder": "開啟資料夾",
-+<<<<<<< .our
- 	"openFile": "開啟檔案",
- 	"workspaceOpenedMessage": "無法儲存工作區 '{0}'",
- 	"workspaceOpenedDetail": "此工作區已在其他視窗中開啟。請先關閉該視窗再重試一次。",
-@@ -29,4 +44,7 @@
- 	"saveWorkspaceMessage": "要將工作區組態儲存為檔案嗎?",
- 	"saveWorkspaceDetail": "如果您預計再次開啟工作區，請儲存工作區。",
- 	"saveWorkspace": "儲存工作區"
-+=======
-+	"openFile": "開啟檔案"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/cht/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
-  our    100644 859ea73188c0049b2000e3a07bf2f988f03e5823 i18n/cht/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
-  their  100644 3a28fce1fa68025791beec112460484ce2011a28 i18n/cht/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"diff.tooLarge": "因其中一個檔案過大而無法比較。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 c05e2bee113bd5996380e859b484dbdf6eec0401 i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 15a1cfb1f061b73d70aaaf6b56b29fe87aab2b5a i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 b44b05e5981e4a0227ffd465e8fcf5504e054c10 i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -26,11 +26,17 @@
- 	"detectIndentation": "開啟檔案時，會依據檔案內容來偵測 `editor.tabSize` 及 `editor.insertSpaces`。",
- 	"roundedSelection": "控制選取範圍是否有圓角",
- 	"scrollBeyondLastLine": "控制編輯器是否會捲動到最後一行之後",
-+<<<<<<< .our
- 	"scrollBeyondLastColumn": "控制編輯器水平捲動所超出的額外字元數",
- 	"smoothScrolling": "控制編輯器是否會使用動畫捲動",
- 	"minimap.enabled": "控制是否會顯示迷你地圖",
- 	"minimap.side": "控制要在哪端呈現迷你地圖。",
- 	"minimap.showSlider": "自動隱藏迷你地圖滑桿",
-+=======
-+	"smoothScrolling": "控制編輯器是否會使用動畫捲動",
-+	"minimap.enabled": "控制是否會顯示迷你地圖",
-+	"minimap.showSlider": "控制是否會自動隱藏迷你地圖滑桿。可能的值為 'always' 與 'mouseover'",
-+>>>>>>> .their
- 	"minimap.renderCharacters": "呈現行內的實際字元 (而不是彩色區塊)",
- 	"minimap.maxColumn": "限制迷你地圖的寬度，以呈現最多的資料行",
- 	"find.seedSearchStringFromSelection": "控制編譯器選取範圍是否預設為尋找工具的搜尋字串",
-@@ -106,11 +112,14 @@
- 	"accessibilitySupport": "控制編輯器是否應於已為螢幕助讀程式最佳化的模式中執行。",
- 	"links": "控制編輯器是否應偵測連結且讓它可點擊",
- 	"colorDecorators": "控制編輯器是否應轉譯內嵌色彩裝飾項目與色彩選擇器。",
-+<<<<<<< .our
- 	"codeActions": "啟用程式動作燈泡提示",
- 	"codeActionsOnSave.organizeImports": "要在儲存時執行組織匯入嗎?",
- 	"codeActionsOnSave": "要在儲存時執行的程式碼動作種類。",
- 	"codeActionsOnSaveTimeout": "儲存時執行的程式碼動作逾時。",
- 	"selectionClipboard": "控制是否應支援 Linux 主要剪貼簿。",
-+=======
-+>>>>>>> .their
- 	"sideBySide": "控制 Diff 編輯器要並排或內嵌顯示差異",
- 	"ignoreTrimWhitespace": "控制 Diff 編輯器是否將開頭或尾端空白字元的變更顯示為差異",
- 	"largeFileOptimizations": "針對大型檔案停用部分高記憶體需求功能的特殊處理方式。",
-changed in both
-  base   100644 a64950d25e3b81d295ef533625681bc43b219652 i18n/cht/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 66736a4e736cf7b9a66b648bff264434bc450d4c i18n/cht/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 6423cb9fd23c1ac1411a229a0f658798095e2cd0 i18n/cht/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -28,12 +28,16 @@
- 	"errorBorder": "編輯器內錯誤提示線的邊框色彩.",
- 	"warningForeground": "編輯器內警告提示線的前景色彩.",
- 	"warningBorder": "編輯器內警告提示線的邊框色彩.",
-+<<<<<<< .our
- 	"infoForeground": "編輯器內資訊提示線的前景色彩",
- 	"infoBorder": "編輯器內資訊提示線的邊框色彩",
- 	"hintForeground": "編輯器內提示訊息的提示線前景色彩",
- 	"hintBorder": "編輯器內提示訊息的提示線邊框色彩",
- 	"unnecessaryForeground": "編輯器中不必要程式碼的前景色彩。",
- 	"overviewRulerRangeHighlight": "概述反白範圍的尺規標記顏色。不能使用非透明的顏色來隱藏底層的樣式。",
-+=======
-+	"overviewRulerRangeHighlight": "範圍醒目提示的概觀尺規標記色彩。",
-+>>>>>>> .their
- 	"overviewRuleError": "錯誤的概觀尺規標記色彩。",
- 	"overviewRuleWarning": "警示的概觀尺規標記色彩。",
- 	"overviewRuleInfo": "資訊的概觀尺規標記色彩。"
-changed in both
-  base   100644 0de30c3bd71e343bee7a2c8058fc81c929a8a9f4 i18n/cht/src/vs/editor/contrib/find/common/findController.i18n.json
-  our    100644 cbbf89b710f3c38eb241337fd8bfd81392694209 i18n/cht/src/vs/editor/contrib/find/common/findController.i18n.json
-  their  100644 c75e923d0b7ea4e99a3f006bcf19778b1aa5cbab i18n/cht/src/vs/editor/contrib/find/common/findController.i18n.json
-@@ -10,6 +10,15 @@
- 	"nextSelectionMatchFindAction": "尋找下一個選取項目",
- 	"previousSelectionMatchFindAction": "尋找上一個選取項目",
- 	"startReplace": "取代",
-+<<<<<<< .our
-+=======
-+	"addSelectionToNextFindMatch": "將選取項目加入下一個找到的相符項",
-+	"addSelectionToPreviousFindMatch": "將選取項目加入前一個找到的相符項中",
-+	"moveSelectionToNextFindMatch": "將最後一個選擇項目移至下一個找到的相符項",
-+	"moveSelectionToPreviousFindMatch": "將最後一個選擇項目移至前一個找到的相符項",
-+	"selectAllOccurrencesOfFindMatch": "選取所有找到的相符項目",
-+	"changeAll.label": "變更所有發生次數",
-+>>>>>>> .their
- 	"showNextFindTermAction": "顯示下一個尋找字詞",
- 	"showPreviousFindTermAction": "顯示上一個尋找字詞"
- }
-\ No newline at end of file
-changed in both
-  base   100644 f72027e45a8cb72d6901142d0556275172e479f9 i18n/cht/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
-  our    100644 97c113d82f04c657f7c081d1b902007e0beca10b i18n/cht/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
-  their  100644 4c8864f1a20428a8798b2b0b658d5701af4208cd i18n/cht/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
-@@ -7,7 +7,11 @@
- 	"wordHighlight": "讀取存取期間 (例如讀取變數時) 符號的背景色彩。",
- 	"wordHighlightStrong": "寫入存取期間 (例如寫入變數時) 符號的背景色彩。",
- 	"overviewRulerWordHighlightForeground": "符號醒目提示的概觀尺規標記色彩。",
-+<<<<<<< .our
- 	"overviewRulerWordHighlightStrongForeground": "寫入權限符號醒目提示的概觀尺規標記色彩。",
- 	"wordHighlight.next.label": "移至下一個反白符號",
- 	"wordHighlight.previous.label": "移至上一個反白符號"
-+=======
-+	"overviewRulerWordHighlightStrongForeground": "寫入權限符號醒目提示的概觀尺規標記色彩。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e5703d3b9516991dc70a66f9f475aaa28ea5d6f1 i18n/cht/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 d84006726480d7b55e5c9363c0ac7b4dbb203a6d i18n/cht/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 3f0c455e716a0aa7597f59f6ffb8605258247ea9 i18n/cht/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,9 +10,12 @@
- 	"diff": "互相比較兩個檔案。",
- 	"add": "將資料夾新增至上一個使用中的視窗。",
- 	"goto": "在路徑上的指定行與字元位置開啟檔案。",
-+<<<<<<< .our
- 	"newWindow": "強制開啟新視窗。",
- 	"reuseWindow": "強制在上一個使用中的視窗開啟檔案或資料夾。",
- 	"wait": "等候檔案在傳回前關閉。",
-+=======
-+>>>>>>> .their
- 	"locale": "要使用的地區設定 (例如 en-US 或 zh-TW)。",
- 	"userDataDir": "指定用於保存使用者資料的目錄。可用於開啟多個相異的 Code 執行個體。",
- 	"version": "列印版本。",
-changed in both
-  base   100644 79e27db5d9b837d858897dcaa8de4174da7f4750 i18n/cht/src/vs/platform/history/electron-main/historyMainService.i18n.json
-  our    100644 e92cc96c4b4d33d18c32d6ff208f27aa16bd1d25 i18n/cht/src/vs/platform/history/electron-main/historyMainService.i18n.json
-  their  100644 39b78314b9688ffd566da805954ad67a3c83f5fa i18n/cht/src/vs/platform/history/electron-main/historyMainService.i18n.json
-added in both
-  our    100644 5687ca535c6900a9ca8be5b81636a1974cd4f83b i18n/cht/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
-  their  100644 4c27d1b8aa420b620f024d21905b3293284a5492 i18n/cht/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"contributes.color": "提供延伸模組定義的可設定佈景主題色彩",
- 	"contributes.color.id": "可設定佈景主題色彩的識別碼 ",
- 	"contributes.color.id.format": "識別碼的格式應為 aa[.bb]*",
-changed in both
-  base   100644 16223f6ab7b5e64add90af0036288a5740b0da6e i18n/cht/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 790929bd611f6dd14a59e2ff8a6640378fde30cb i18n/cht/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 5f7d8743b2b9bb14d2bfdeb88bbefd3361930734 i18n/cht/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -60,7 +60,11 @@
- 	"scrollbarShadow": "指出在捲動該檢視的捲軸陰影。",
- 	"scrollbarSliderBackground": "捲軸滑桿的背景顏色。",
- 	"scrollbarSliderHoverBackground": "動態顯示時捲軸滑桿的背景顏色。",
-+<<<<<<< .our
- 	"scrollbarSliderActiveBackground": "當點擊時捲軸滑桿的背景顏色。",
-+=======
-+	"scrollbarSliderActiveBackground": "使用中狀態下捲軸滑桿的背景顏色。",
-+>>>>>>> .their
- 	"progressBarBackground": "長時間運行進度條的背景色彩.",
- 	"editorBackground": "編輯器的背景色彩。",
- 	"editorForeground": "編輯器的預設前景色彩。",
-@@ -96,6 +100,11 @@
- 	"overviewRulerCurrentContentForeground": "目前內嵌合併衝突的概觀尺規前景。",
- 	"overviewRulerIncomingContentForeground": "傳入內嵌合併衝突的概觀尺規前景。",
- 	"overviewRulerCommonContentForeground": "內嵌合併衝突中的共同上階概觀尺規前景。",
-+<<<<<<< .our
- 	"overviewRulerFindMatchForeground": "概述符合尋找條件的尺規標記顏色。不能使用非透明的顏色來隱藏底層的樣式。",
- 	"overviewRulerSelectionHighlightForeground": "概述反白選擇的尺規標記顏色。不能使用非透明的顏色來隱藏底層的樣式。"
-+=======
-+	"overviewRulerFindMatchForeground": "尋找比對的概觀尺規標記色彩。",
-+	"overviewRulerSelectionHighlightForeground": "選取項目醒目提示的概觀尺規標記色彩。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 ecd817ca0cb5827a0034eb8eb21e2ce66d261147 i18n/cht/src/vs/platform/workspaces/common/workspaces.i18n.json
-  their  100644 95909b5153f5fb6614d9422b3169069ef996cde0 i18n/cht/src/vs/platform/workspaces/common/workspaces.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"codeWorkspace": "Code 工作區",
- 	"untitledWorkspace": "未命名 (工作區)",
- 	"workspaceNameVerbose": "{0} (工作區)",
-added in both
-  our    100644 bd63c2e941781f2bf4a15bcbcd1599bcf773df8e i18n/cht/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
-  their  100644 99e2a181c4d548d36c6317c66aa275c092d6008c i18n/cht/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,4 +11,16 @@
- 	"failedDep1": "擴充功能 '{1}' 無法啟動。原因: 相依性 '{0}' 無法啟動。",
- 	"failedDep2": "擴充功能 '{0}' 無法啟動。原因: 相依性超過 10 個層級 (很可能是相依性迴圈)。",
- 	"activationError": "啟動擴充功能 '{0}' 失敗: {1}。"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"unknownDep": "擴充功能 `{1}` 無法啟動。原因: 未知的相依性 `{0}`。",
-+	"failedDep1": "擴充功能 `{1}` 無法啟動。原因: 相依性 `{0}` 無法啟動。",
-+	"failedDep2": "擴充功能 `{0}` 無法啟動。原因: 相依性超過 10 個層級 (很可能是相依性迴圈)。",
-+	"activationError": "啟動擴充功能 `{0}` 失敗: {1}。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 db42e723debdbf371fb3138338d04bf0d47e2dc7 i18n/cht/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 fb350c87bdc732a5022e5d51b20bc738ad941987 i18n/cht/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 c90e6e584f76935ddfa6481fe90612e77a4f5971 i18n/cht/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -9,6 +9,7 @@
- 	"openFile": "開啟檔案...",
- 	"openFolder": "開啟資料夾...",
- 	"openFileFolder": "開啟...",
-+<<<<<<< .our
- 	"globalRemoveFolderFromWorkspace": "將資料夾從工作區移除...",
- 	"saveWorkspaceAsAction": "另存工作區為...",
- 	"save": "儲存(&&S)",
-@@ -16,4 +17,19 @@
- 	"openWorkspaceAction": "開啟工作區...",
- 	"openWorkspaceConfigFile": "開啟工作區組態檔",
- 	"duplicateWorkspaceInNewWindow": "新視窗中的重覆工作區"
-+=======
-+	"addFolderToWorkspace": "將資料夾新增到工作區...",
-+	"add": "新增",
-+	"addFolderToWorkspaceTitle": "將資料夾新增到工作區",
-+	"newWorkspace": "新增工作區...",
-+	"select": "選取(&&S)",
-+	"selectWorkspace": "為工作區選取資料夾",
-+	"removeFolderFromWorkspace": "將資料夾從工作區移除",
-+	"saveWorkspaceAsAction": "另存工作區為...",
-+	"saveEmptyWorkspaceNotSupported": "請先開啟工作區以進行儲存。",
-+	"save": "儲存(&&S)",
-+	"saveWorkspace": "儲存工作區",
-+	"openWorkspaceAction": "開啟工作區...",
-+	"openWorkspaceConfigFile": "開啟工作區組態檔"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 4e7c8606cb8af492f968241faebfa838dd50f135 i18n/cht/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-  our    100644 c06a79c75c89653cc4fdd1d131f354e9584bf94e i18n/cht/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-  their  100644 bed067ba4a663202e859d5c825b6a24e31a32749 i18n/cht/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,9 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"compositePart.hideSideBarLabel": "隱藏提要欄位",
-+>>>>>>> .their
- 	"focusSideBar": "瀏覽至提要欄位",
- 	"viewCategory": "檢視"
- }
-\ No newline at end of file
-changed in both
-  base   100644 5fde1a301073a079ae4a80a52bbe8e20e346be70 i18n/cht/src/vs/workbench/common/theme.i18n.json
-  our    100644 41a6d8c801b131296a56223489edd198cc2bf33b i18n/cht/src/vs/workbench/common/theme.i18n.json
-  their  100644 bee45bd4f8371ed46fcd90883fdb06d7c2a823b6 i18n/cht/src/vs/workbench/common/theme.i18n.json
-@@ -11,12 +11,17 @@
- 	"tabHoverBackground": "當暫留索引標籤的背景色彩。索引標籤是編輯器在編輯器區域中的容器。同一個編輯器群組中的多個索引標籤可以同時開啟。可能會有多個編輯器群組。",
- 	"tabUnfocusedHoverBackground": "當暫留非焦點群組中索引標籤的背景色彩。索引標籤是編輯器在編輯器區域中的容器。同一個編輯器群組中的多個索引標籤可以同時開啟。可能會有多個編輯器群組。 ",
- 	"tabBorder": "用以分隔索引標籤彼此的框線。索引標籤是編輯器在編輯器區域中的容器。同一個編輯器群組中的多個索引標籤可以同時開啟。可能會有多個編輯器群組。",
-+<<<<<<< .our
- 	"tabActiveBorder": "使用中索引標籤的底部邊框。索引標籤是編輯器在編輯器區域中的容器。同一個編輯器群組中的多個索引標籤可以同時開啟。可能會有多個編輯器群組。",
- 	"tabActiveBorderTop": "使用中索引標籤的頂部邊框。索引標籤是編輯器在編輯器區域中的容器。同一個編輯器群組中的多個索引標籤可以同時開啟。可能會有多個編輯器群組。",
- 	"tabActiveUnfocusedBorder": "非焦點群組內使用中索引標籤的底部邊框。索引標籤是編輯器在編輯器區域中的容器。同一個編輯器群組中的多個索引標籤可以同時開啟。可能會有多個編輯器群組。",
- 	"tabActiveUnfocusedBorderTop": "非焦點群組內使用中索引標籤的頂部邊框。索引標籤是編輯器在編輯器區域中的容器。同一個編輯器群組中的多個索引標籤可以同時開啟。可能會有多個編輯器群組。",
- 	"tabHoverBorder": "用以反白顯示暫留時索引標籤的框線。索引標籤是編輯器在編輯器區域中的容器。同一個編輯器群組中的多個索引標籤可以同時開啟。可能會有多個編輯器群組。",
- 	"tabUnfocusedHoverBorder": "在非焦點群組中反白顯示暫留時索引標籤的框線。索引標籤是編輯器在編輯器區域中的容器。同一個編輯器群組中的多個索引標籤可以同時開啟。可能會有多個編輯器群組。 ",
-+=======
-+	"tabActiveBorder": "用以醒目提示使用中索引標籤的框線。索引標籤是編輯器在編輯器區域中的容器。同一個編輯器群組中的多個索引標籤可以同時開啟。可能會有多個編輯器群組。",
-+	"tabActiveUnfocusedBorder": "用以在非焦點群組中醒目提示使用中索引標籤的框線。索引標籤是編輯器在編輯器區域中的容器。同一個編輯器群組中的多個索引標籤可以同時開啟。可能會有多個編輯器群組。 ",
-+>>>>>>> .their
- 	"tabActiveForeground": "使用中的群組內，使用中之索引標籤的前景色彩。索引標籤是編輯器在編輯器區域中的容器。同一個編輯器群組中的多個索引標籤可以同時開啟。可能會有多個編輯器群組。",
- 	"tabInactiveForeground": "使用中的群組內，非使用中之索引標籤的前景色彩。索引標籤是編輯器在編輯器區域中的容器。同一個編輯器群組中的多個索引標籤可以同時開啟。可能會有多個編輯器群組。",
- 	"tabUnfocusedActiveForeground": "非焦點群組中的使用中索引標籤前景色彩。索引標籤是編輯器在編輯器區域中的容器。同一個編輯器群組中的多個索引標籤可以同時開啟。可能會有多個編輯器群組。",
-@@ -32,7 +37,10 @@
- 	"panelActiveTitleForeground": "使用中之面板標題的標題色彩。面板會顯示在編輯器區域的下方，其中包含諸如輸出與整合式終端機等檢視。",
- 	"panelInactiveTitleForeground": "非使用中之面板標題的標題色彩。面板會顯示在編輯器區域的下方，其中包含諸如輸出與整合式終端機等檢視。",
- 	"panelActiveTitleBorder": "使用中之面板標題的框線色彩。面板會顯示在編輯器區域的下方，其中包含諸如輸出與整合式終端機等檢視。",
-+<<<<<<< .our
- 	"panelDragAndDropBackground": "拖放面板標題項目的意見反應色彩。色彩必須具有透明度，面板項目才能顯示。面板會顯示於編輯區域的底部，並會包含檢視，如輸出和整合終端機。",
-+=======
-+>>>>>>> .their
- 	"statusBarForeground": "當一個工作區被開啟時，狀態列的前景色彩。狀態列會顯示在視窗的底部。",
- 	"statusBarNoFolderForeground": "當未開啟任何資料夾時，狀態列的前景色彩。狀態列會顯示在視窗的底部。",
- 	"statusBarBackground": "當一個工作區被開啟時，狀態列的背景色彩。狀態列會顯示在視窗的底部。",
-changed in both
-  base   100644 a76c05ee2f6d366e5e1cba784691c58df209183d i18n/cht/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 8c04c44fd8aa84aafd673c4f7e7c350b8ac52c3b i18n/cht/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 fa6f13944092eaf2443c555ce17f949070849975 i18n/cht/src/vs/workbench/electron-browser/actions.i18n.json
-changed in both
-  base   100644 06d815243f257592379c8a4c1f21ca5fe85199f7 i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 bf339c91e8587ec53fe81a294c54ddc0f5aad010 i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 e2f6f7dff654bb41dd340b243bb6d88c4a3b3276 i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,8 +35,13 @@
- 	"panelDefaultLocation": "控制面板的預設位置。可顯示在 Workbench 的底部或是右方。",
- 	"statusBarVisibility": "控制 Workbench 底端狀態列的可視性。",
- 	"activityBarVisibility": "控制活動列在 workbench 中的可見度。",
-+<<<<<<< .our
- 	"viewVisibility": "控制檢視標頭動作的可見度。檢視標頭動作可為總是可見，或在檢視為焦點或暫留時才可見。",
- 	"fontAliasing": "控制工作台中的字型鋸齒化方法。\n- default: 子像素字型平滑化。在多數非 Retina 的顯示器上，這會使文字變得最鮮明\n- antialiased: 在像素層級上使字型平滑化，與子像素相對。能夠使字型整體顯示較亮\n- none: 停用字型平滑化。顯示的文字會帶有鋸齒狀銳利邊緣\n- auto: 根據顯示器的 DPI 自動套用 `default` 或 `antialiased`。",
-+=======
-+	"closeOnFileDelete": "控制顯示檔案的編輯器是否應在其他處理序刪除或重新命名該檔案時自動關閉。若停用此選項，當發生前述狀況時，編輯器會保持開啟，並呈現已變更的狀態。請注意，從應用程式內刪除一律會關閉編輯器，但已變更的檔案在資料未儲存前一律不會關閉。",
-+	"fontAliasing": "在 Workbench 中控制字型鋸齒化的方法。- 預設: 子像素字型平滑處理。在大部分非 Retina 顯示器上會顯示出最銳利的文字- 已消除鋸齒: 相對於子像素，根據像素層級平滑字型。可讓字型整體顯得較細- 無: 停用字型平滑處理。文字會以鋸齒狀的銳邊顯示 ",
-+>>>>>>> .their
- 	"workbench.fontAliasing.default": "子像素字型平滑處理。在大部分非 Retina 顯示器上會顯示出最銳利的文字。",
- 	"workbench.fontAliasing.antialiased": "相對於子像素，根據像素層級平滑字型。可以讓字型整體顯得較細。",
- 	"workbench.fontAliasing.none": "禁用字體平滑.文字將會顯示鋸齒狀與鋒利的邊緣.",
-changed in both
-  base   100644 21628fd8aa6b759354e19d5ad195f566f5948a4c i18n/cht/src/vs/workbench/electron-browser/window.i18n.json
-  our    100644 a99eb9754bc3a0014907555c92c0c41fb3ae62fe i18n/cht/src/vs/workbench/electron-browser/window.i18n.json
-  their  100644 84c2c0756641cbecb3b8cb3860bb12a7c4709a14 i18n/cht/src/vs/workbench/electron-browser/window.i18n.json
-@@ -11,6 +11,10 @@
- 	"cut": "剪下",
- 	"copy": "複製",
- 	"paste": "貼上",
-+<<<<<<< .our
- 	"selectAll": "全選",
- 	"runningAsRoot": "不建議以 root 身分執行 {0}。"
-+=======
-+	"selectAll": "全選"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 14bbf4dc1d185755495b15864a61379f13fcadf2 i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
-  their  100644 71382a34611cf16b6a9fef68b4d18ec22b6cff9d i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"toggleMinimap": "檢視: 切換迷你地圖"
- }
-\ No newline at end of file
-changed in both
-  base   100644 c0e9f1c54f25545c666b43ababf3bba29e0f48c2 i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
-  our    100644 e6b78fd8a3e906f6ed4c17d180d1ba95bb317d81 i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
-  their  100644 52fe8ed02e5203f3d64db9a47bbad03bdc606764 i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"toggleRenderControlCharacters": "檢視: 切換控制字元"
- }
-\ No newline at end of file
-changed in both
-  base   100644 507d54a8855070fe84f180e1c35fe9bac2471a95 i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
-  our    100644 c846756f9dd53e74557d49b4c1554624725c0230 i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
-  their  100644 f69ad28329cadb98b0ecff7ba665321634dc695d i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"toggleRenderWhitespace": "檢視: 切換轉譯空白字元"
- }
-\ No newline at end of file
-changed in both
-  base   100644 5e4862406578e468c6624c92ef6503ed847ddf68 i18n/cht/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  our    100644 56556d70235cd8dc10872d36bf84fa1b4f974a29 i18n/cht/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  their  100644 810ba4331057679e400f1f22816edda0081b06dd i18n/cht/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-changed in both
-  base   100644 74156fbcb3af4eb087e7128e8eef7ef8ba2f824f i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 a922616389e0d8d38ea207e5428979e5adf305ab i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 00b0f0731b8a789f4d9613c7cbb2bfdf951ce9ba i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -28,7 +28,12 @@
- 	"preLaunchTaskExitCode": "preLaunchTask '{0}' 已終止，結束代碼為 {1}。",
- 	"showErrors": "顯示錯誤",
- 	"noFolderWorkspaceDebugError": "無法對使用中的檔案偵錯。請確認檔案已儲存在磁碟上，而且您已經為該檔案類型安裝偵錯延伸模組。",
-+<<<<<<< .our
- 	"cancel": "取消",
- 	"DebugTaskNotFound": "找不到工作 \"{0}\"。",
- 	"taskNotTracked": "無法追蹤工作 '{0}'。"
-+=======
-+	"NewLaunchConfig": "請為您的應用程式設定啟動組態檔。{0}",
-+	"DebugTaskNotFound": "找不到 preLaunchTask '{0}'。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 81362151ea4a175110376f52ab771f5c622cdde6 i18n/cht/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  our    100644 f23815901afa5b319483b39e8acead1be6dfacc5 i18n/cht/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  their  100644 315d0d6089a3ce25ccd56b3d6d554a33af426615 i18n/cht/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-changed in both
-  base   100644 246786aab6cf29703ad19b0dda2cc7be852af878 i18n/cht/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  our    100644 b15f9a6ac6a8909de8d8f39d7c994b78fdd0957c i18n/cht/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  their  100644 4036d2c2e6e9367c852da123da76ab7ee45cfb90 i18n/cht/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-@@ -8,6 +8,23 @@
- 	],
- 	"debugAdapterBinNotFound": "偵錯配接器可執行檔 '{0}' 不存在。",
- 	"debugAdapterCannotDetermineExecutable": "無法判斷偵錯配接器 '{0}' 的可執行檔。",
-+<<<<<<< .our
- 	"unableToLaunchDebugAdapter": "無法從 '{0}' 啟動偵錯配接器。",
- 	"unableToLaunchDebugAdapterNoArgs": "無法啟動偵錯配接器。"
-+=======
-+	"launch.config.comment1": "使用 IntelliSense 以得知可用的屬性。",
-+	"launch.config.comment2": "暫留以檢視現有屬性的描述。",
-+	"launch.config.comment3": "如需詳細資訊，請瀏覽: {0}",
-+	"debugType": "組態的類型。",
-+	"debugTypeNotRecognised": "無法辨識此偵錯類型.請確認已有安裝並啟用相對應的偵錯擴充功能.",
-+	"node2NotSupported": "\"node2\" 已不再支援，請改用 \"node\"，並將 \"protocol\" 屬性設為 \"inspector\"。",
-+	"debugName": "組態的名稱; 出現在啟動組態下拉式功能表中。",
-+	"debugRequest": "要求組態的類型。可以是 [啟動] 或 [附加]。",
-+	"debugServer": "僅限偵錯延伸模組開發: 如果指定了連接埠，VS Code 會嘗試連線至以伺服器模式執行的偵錯配接器",
-+	"debugPrelaunchTask": "偵錯工作階段啟動前要執行的工作。",
-+	"debugWindowsConfiguration": "Windows 特定的啟動設定屬性。",
-+	"debugOSXConfiguration": "OS X 特定的啟動設定屬性。",
-+	"debugLinuxConfiguration": "Linux 特定的啟動設定屬性。",
-+	"deprecatedVariables": "'env.'、'config.' 及 'command.' 已標示為即將淘汰，請改用 'env:'、'config:' 及 'command:'。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 dce745aeaf805e8ac5d98b1e660b3e8f6b607a17 i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 beddde6d10ce2b9a74005421467ca470c839a054 i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 072260a2e3b2aa62227745bdd80eb39ede823480 i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-@@ -52,7 +52,14 @@
- 	"extensionInstalled": "建議的延伸模組已安裝",
- 	"showRecommendedKeymapExtensionsShort": "按鍵對應",
- 	"showLanguageExtensionsShort": "語言擴充功能",
-+<<<<<<< .our
- 	"showAzureExtensionsShort": "Azure 延伸模組",
-+=======
-+	"showAzureExtensions": "顯示 Azure 延伸模組",
-+	"showAzureExtensionsShort": "Azure 延伸模組",
-+	"configureWorkspaceRecommendedExtensions": "設定建議的延伸模組 (工作區)",
-+	"ConfigureWorkspaceRecommendations.noWorkspace": "只有在工作區資料夾中才能使用建議。",
-+>>>>>>> .their
- 	"OpenExtensionsFile.failed": "無法在 '.vscode' 資料夾 ({0}) 中建立 'extensions.json' 檔案。",
- 	"configureWorkspaceRecommendedExtensions": "設定建議的延伸模組 (工作區)",
- 	"configureWorkspaceFolderRecommendedExtensions": "設定建議的延伸模組 (工作區資料夾) ",
-changed in both
-  base   100644 0dbbb1af8ef020d81d3b4f3e423f75e710b1dae4 i18n/cht/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  our    100644 c32641ccebc8fbed926c69242f64a9fbc36d13e0 i18n/cht/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  their  100644 0ce10edb2815042f4840cea81212ec5824213129 i18n/cht/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-@@ -69,7 +69,11 @@
- 	"invalidFileNameError": "名稱 **{0}** 不能作為檔案或資料夾名稱。請選擇不同的名稱。",
- 	"filePathTooLongError": "名稱 **{0}** 導致路徑太長。請選擇較短的名稱。",
- 	"compareWithSaved": "比較使用中的檔案和已儲存的檔案",
-+<<<<<<< .our
- 	"modifiedLabel": "{0} (在磁碟上) ↔ {1}",
- 	"compareWithClipboard": "比較使用中的檔案和剪貼簿的檔案",
- 	"clipboardComparisonLabel": "剪貼簿 ↔ {0}"
-+=======
-+	"modifiedLabel": "{0} (在磁碟上) ↔ {1}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f49cef6b9b302058ec00d2e712d1d0e11d261bdd i18n/cht/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 867d603ca5633a190dd294a861b5733b06da3c8c i18n/cht/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 063c4fe8bc0ed874f4ea52255af9091c8ba88c9f i18n/cht/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-@@ -40,14 +40,21 @@
- 	"dynamicHeight": "控制 [開放式編輯器] 區段的高度是否應依元素數目動態調整。",
- 	"autoReveal": "控制總管是否在開啟檔案時自動加以顯示及選取。",
- 	"enableDragAndDrop": "控制總管是否應該允許透過拖放功能移動檔案和資料夾。",
-+<<<<<<< .our
- 	"confirmDragAndDrop": "控制總管是否須要求確認，以透過拖放來移動檔案和資料夾。",
- 	"confirmDelete": "控制總管是否須在透過垃圾桶刪除檔案時要求確認。",
-+=======
-+>>>>>>> .their
- 	"sortOrder.default": "檔案與資料夾會依照名稱以字母順序排序。資料夾會顯示在檔案前。",
- 	"sortOrder.mixed": "檔案與資料夾會依照名稱以字母順序排序。檔案與資料夾會交錯排列。",
- 	"sortOrder.filesFirst": "檔案與資料夾會依照名稱以字母順序排序。檔案會顯示在資料夾前。",
- 	"sortOrder.type": "檔案與資料夾會依照延伸模組以字母順序排序。資料夾會顯示在檔案前。",
- 	"sortOrder.modified": "檔案與資料夾會依照最後修改日期以字母順序排序。資料夾會顯示在檔案前。",
-+<<<<<<< .our
- 	"sortOrder": "控制檔案與資料夾在總管中的排列順序。除了預設排序外，您也可以將順序設定為 'mixed' (檔案與資料夾)、'type' (依檔案類型)、'modified' (依最後修改日期) 或 'filesFirst' (將檔案排序在資料夾前)。",
- 	"explorer.decorations.colors": "控制檔案裝飾是否須使用色彩。",
- 	"explorer.decorations.badges": "控制檔案裝飾是否須使用徽章。"
-+=======
-+	"sortOrder": "控制檔案與資料夾在總管中的排列順序。除了預設排序外，您也可以將順序設定為 'mixed' (檔案與資料夾)、'type' (依檔案類型)、'modified' (依最後修改日期) 或 'filesFirst' (將檔案排序在資料夾前)。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 91195575caef9fd3f0e15d4cb81b303417cbac24 i18n/cht/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-  our    100644 7a6f0b075f74848503c85069b40013f41dc423f4 i18n/cht/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-  their  100644 4e8368f2a610ada63f62b62fc804ff4cc731b06a i18n/cht/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-@@ -12,5 +12,6 @@
- 	"genericSaveError": "無法儲存 '{0}': {1}",
- 	"staleSaveError": "無法儲存 '{0}': 磁碟上的內容較新。請按一下 [比較]，比較您的版本與磁碟上的版本。",
- 	"compareChanges": "比較",
--	"saveConflictDiffLabel": "{0} (位於磁碟) ↔ {1} (在 {2} 中) - 解決儲存衝突"
-+	"saveConflictDiffLabel": "{0} (位於磁碟) ↔ {1} (在 {2} 中) - 解決儲存衝突",
-+	"userGuide": "在右方使用編輯器工具列中的動作來 **復原** 您的變更，或以您的變更 **覆寫** 磁碟上的內容"
- }
-\ No newline at end of file
-changed in both
-  base   100644 9d81839c00d49341e13462c6a3f480d84d921f05 i18n/cht/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
-  our    100644 bc42ca6193fc35d40ad79569e25cdad74f6ad095 i18n/cht/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
-  their  100644 48600edd9b5dcae7ff26fd50963104963e944f24 i18n/cht/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
-@@ -10,9 +10,12 @@
- 	"dropFolder": "要在工作區新增資料夾嗎?",
- 	"addFolders": "新增資料夾(&A)",
- 	"addFolder": "新增資料夾(&A)",
-+<<<<<<< .our
- 	"confirmMove": "確定要移動 '{0}' 嗎?",
- 	"doNotAskAgain": "不要再詢問我",
- 	"moveButtonLabel": "移動(&&M)",
-+=======
-+>>>>>>> .their
- 	"confirmOverwriteMessage": "目的資料夾中已存在 '{0}'。要取代它嗎?",
- 	"irreversible": "此動作無法回復!",
- 	"replaceButtonLabel": "取代(&&R)"
-changed in both
-  base   100644 a92d2c49e8bbed71e46196ad2a287c00756dd1a5 i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  our    100644 7de2fa4801f7ec2e9b89f96219fca72b072066be i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  their  100644 f0f4cd2a6a4ea8d62e16b98cee8964196de9fda4 i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-@@ -14,6 +14,10 @@
- 	"openGlobalKeybindingsFile": "開啟鍵盤快速鍵檔案",
- 	"openWorkspaceSettings": "開啟工作區設定",
- 	"openFolderSettings": "開啟資料夾設定",
-+<<<<<<< .our
-+=======
-+	"pickFolder": "選取資料夾",
-+>>>>>>> .their
- 	"configureLanguageBasedSettings": "設定語言專屬設定...",
- 	"languageDescriptionConfigured": "({0})",
- 	"pickLanguage": "選取語言"
-changed in both
-  base   100644 ec85dfcb77816fe9817cb8dd309895c2e111bfd2 i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 912f924cec997084f6bbf36563d0171c3e38d0e5 i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 12df0eb04742fb8530ef3f65c385c383abb2d9cc i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -14,4 +15,19 @@
- 	"editTtile": "編輯",
- 	"replaceDefaultValue": "在設定中取代",
- 	"copyDefaultValue": "複製到設定"
-+=======
-+	"emptyUserSettingsHeader": "將您的設定放置在此以覆寫預設設定。",
-+	"errorInvalidConfiguration": "無法寫入設定.請開啟使用者設定並修正檔案中的錯誤/警告後再試一次.",
-+	"emptyWorkspaceSettingsHeader": "將您的設定放置在此以覆寫使用者設定。",
-+	"emptyFolderSettingsHeader": "將您的資料夾設定放置在此以覆寫工作區設定的資料夾設定。",
-+	"defaultFolderSettingsTitle": "預設資料夾設定",
-+	"defaultSettingsTitle": "預設設定",
-+	"noSettingsFound": "找不到任何設定。",
-+	"editTtile": "編輯",
-+	"replaceDefaultValue": "在設定中取代",
-+	"copyDefaultValue": "複製到設定",
-+	"unsupportedPHPExecutablePathSetting": "這項設定必須是使用者設定。若要設定工作區的 PHP，請開啟 PHP 檔案並按一下狀態列中的 [PHP 路徑]。",
-+	"unsupportedWorkspaceSetting": "這項設定必須是使用者設定。",
-+	"unsupportedWorkbenchSetting": "目前無法套用此設定。要在您直接開啟此資料夾時才會套用。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 68d504b78421876a31ce971c2ef3cdc8f5ccd0af i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-  our    100644 bf6c80d40dab496574eb97873c8671035e53aa62 i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-  their  100644 ea581bd5e89879425a29fbff595afbca3ba18854 i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 17bda120dbd77f09aaae9b33d7a0fd346cfe2603 i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 3a059706c6b5eb843151bff68a94a09cb22fd815 i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -12,4 +13,13 @@
- 	"userSettings": "使用者設定",
- 	"workspaceSettings": "工作區設定",
- 	"folderSettings": "資料夾設定"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"folderSettingsDetails": "資料夾設定"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a4c089ec5ce16abdc1f2850b7e3df35e53a88641 i18n/cht/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  our    100644 9b318b09ce08ab0ea0c2bb529eb879057b9096c4 i18n/cht/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  their  100644 2fbf166712a262be3af438ca3d35ebdce221a5e0 i18n/cht/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-@@ -8,5 +8,11 @@
- 	],
- 	"relaunchSettingMessage": "設定已經變更，必須重新啟動才會生效。",
- 	"relaunchSettingDetail": "請按 [重新啟動] 按鈕以重新啟動 {0} 並啟用設定。",
-+<<<<<<< .our
- 	"restart": "重新啟動(&&R)"
-+=======
-+	"restart": "重新啟動",
-+	"relaunchWorkspaceMessage": "必須重新載入延伸模組系統才可變更此工作區。",
-+	"reload": "重新載入"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 eea295d40666232065682419a101ed665e4ee83a i18n/cht/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-  our    100644 a561a356071b8dd1908e1e30765d3879d46612fc i18n/cht/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-  their  100644 8c7471e99523a866f27c0e545d5fb747bcef360c i18n/cht/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-changed in both
-  base   100644 cafed393010587027957cfdaecd51c162e07dfc7 i18n/cht/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  our    100644 a47e720b85b124ad8277e1dd5180192fef41e422 i18n/cht/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  their  100644 c0bccd6864ce28dcfdecff56da124d7a48f07b0b i18n/cht/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-changed in both
-  base   100644 29eba85f240545abc19d05374029888eca7a405b i18n/cht/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  our    100644 4bf0fb57a82a100d4c5b072e1a13f960c4e14c31 i18n/cht/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  their  100644 b734d88f6ea1b0478592b4ea1ef984cf27bc17e7 i18n/cht/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -10,6 +11,11 @@
- 	"hideRepository": "隱藏",
- 	"installAdditionalSCMProviders": "安裝額外SCM提供者...",
- 	"no open repo": "沒有使用中的原始檔控制提供者。",
-+=======
-+	"commitMessage": "Message (press {0} to commit)",
-+	"installAdditionalSCMProviders": "安裝額外SCM提供者...",
-+	"no open repo": "沒有使用中的原始檔控制。",
-+>>>>>>> .their
- 	"source control": "原始檔控制",
- 	"viewletTitle": "{0}: {1}",
- 	"hideView": "隱藏"
-changed in both
-  base   100644 5d095421436354ce0f25de1390666c9e539cd4a0 i18n/cht/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 ba1fd77bc20f96eb0056aa05843bd1bb7818c0eb i18n/cht/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 52826c8f8d8a2de8ed8be1f73ae2e5160d23b74d i18n/cht/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"nextSearchIncludePattern": "顯示下一個搜尋包含模式",
- 	"previousSearchIncludePattern": "顯示上一個搜尋包含模式",
- 	"nextSearchExcludePattern": "顯示下一個搜尋排除模式",
-@@ -16,6 +19,8 @@
- 	"previousReplaceTerm": "顯示上一個搜尋取代字詞",
- 	"findInFiles": "在檔案中尋找",
- 	"replaceInFiles": "檔案中取代",
-+	"findInWorkspace": "在工作區中尋找...",
-+	"findInFolder": "在資料夾中尋找...",
- 	"RefreshAction.label": "重新整理",
- 	"CollapseDeepestExpandedLevelAction.label": "全部摺疊",
- 	"ClearSearchResultsAction.label": "清除",
-changed in both
-  base   100644 0780f0f62bdbe796cdc92508546c85c8df3f208f i18n/cht/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-  our    100644 f9a4b46d6b9113c7745b8a62029d44d607b9ee13 i18n/cht/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-  their  100644 5a3224c66f5b4482613753ff358a57d04f536880 i18n/cht/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"searchFolderMatch.other.label": "其他檔案",
- 	"searchFileMatches": "找到 {0} 個檔案",
- 	"searchFileMatch": "找到 {0} 個檔案",
-changed in both
-  base   100644 ffc0ef1d621fc0a291567eb5da80bb4f268b3ee7 i18n/cht/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  our    100644 4578dbafa9e6c13f1d3fbca1dcd19f0c9ec0aa56 i18n/cht/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  their  100644 7f165c5f71752ac86d09fc541bf64d313e610ffa i18n/cht/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-added in both
-  our    100644 20778d3fe330f7f9c672776e9c938d4c828ef0be i18n/cht/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
-  their  100644 1b13478684c61052d3a392be06a6194e0101181f i18n/cht/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"search.noWorkspaceWithName": "工作區內無此名稱資料夾: {0}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 095028d433ac8d9f422ed56246395f1c3f4bc88b i18n/cht/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 9a7f1ae524570aa14ab8735a1962f8357f3564aa i18n/cht/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 301f2bd9c024fd1d6b6a34a7aabb287830212749 i18n/cht/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-changed in both
-  base   100644 e34e2f41cb78e95c969037ede5260fab45c4e3e5 i18n/cht/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 a13d5229d23a832c6ada352df9587e856b73629f i18n/cht/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 f56946faed2a4308d2aea52605e0de3f7c404f72 i18n/cht/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -16,25 +16,37 @@
- 	"manyProblems": "10K+",
- 	"runningTasks": "顯示執行中的工作",
- 	"tasks": "工作",
-+<<<<<<< .our
- 	"TaskSystem.noHotSwap": "必須重新載入視窗才可變更執行使用中工作的工作執行引擎",
- 	"reloadWindow": "重新載入視窗",
- 	"TaskServer.folderIgnored": "因為資料夾 {0} 使用工作版本 0.1.0，所以已將其忽略",
-+=======
-+	"TaskSystem.noHotSwap": "必須重新載入視窗才能變更工作執行引擎",
-+>>>>>>> .their
- 	"TaskService.noBuildTask1": "未定義任何建置工作。請使用 'isBuildCommand' 標記 tasks.json 檔案中的工作。",
- 	"TaskService.noBuildTask2": "未定義任何組建工作，請在 tasks.json 檔案中將工作標記為 'build' 群組。",
- 	"TaskService.noTestTask1": "未定義任何建置工作。請使用 'isTestCommand' 標記 tasks.json 檔案中的工作。",
- 	"TaskService.noTestTask2": "未定義任何測試工作，請在 tasks.json 檔案中將工作標記為 'test' 群組。",
- 	"TaskServer.noTask": "找不到所要求要執行的工作 {0}。",
-+<<<<<<< .our
- 	"TaskService.associate": "建立關聯",
-+=======
-+>>>>>>> .their
- 	"TaskService.attachProblemMatcher.continueWithout": "在不掃描工作輸出的情況下繼續",
- 	"TaskService.attachProblemMatcher.never": "永不掃描工作輸出",
- 	"TaskService.attachProblemMatcher.learnMoreAbout": "深入了解掃描工作輸出",
- 	"selectProblemMatcher": "選取錯誤和警告的種類以掃描工作輸出",
- 	"customizeParseErrors": "當前的工作組態存在錯誤.請更正錯誤再執行工作.",
- 	"moreThanOneBuildTask": "定義了很多建置工作於tasks.json.執行第一個.",
-+<<<<<<< .our
- 	"TaskSystem.activeSame.background": "工作 '{0}' 已在使用中並且處於背景模式。",
- 	"TaskSystem.activeSame.noBackground": "工作 '{0}' 已在使用中。",
- 	"terminateTask": "終止工作",
- 	"restartTask": "重新啟動工作",
-+=======
-+	"TaskSystem.activeSame.background": "工作 '{0}' 已在使用中，且處於背景模式中。請使用工作功能表的 [終止工作...] 將其終止。",
-+	"TaskSystem.activeSame.noBackground": "工作 '{0}' 已在使用中。請使用工作功能表的 [終止工作...] 將其終止。 ",
-+>>>>>>> .their
- 	"TaskSystem.active": "已有工作在執行。請先終止該工作，然後再執行其他工作。",
- 	"TaskSystem.restartFailed": "無法終止再重新啟動工作 {0}",
- 	"TaskService.noConfiguration": "錯誤: {0} 工作偵測未替下列組態提供工作:\n{1}\n將會忽略該工作。\n",
-@@ -75,8 +87,13 @@
- 	"TaskService.pickDefaultBuildTask": "請選取要用作預設組建工作的工作",
- 	"TaskService.defaultTestTaskExists": "已經將 {0} 標記為預設測試工作。",
- 	"TaskService.pickDefaultTestTask": "請選取要用作預設測試工作的工作",
-+<<<<<<< .our
- 	"TaskService.pickShowTask": "選取要顯示輸出的工作",
- 	"TaskService.noTaskIsRunning": "未執行任何工作",
-+=======
-+	"TaskService.noTaskIsRunning": "沒有執行中的工作。",
-+	"TaskService.pickShowTask": "選取要顯示輸出的工作",
-+>>>>>>> .their
- 	"ShowLogAction.label": "顯示工作記錄檔",
- 	"RunTaskAction.label": "執行工作",
- 	"RestartTaskAction.label": "重新開始執行工作",
-changed in both
-  base   100644 49ff9315f1a721384761f4c4a76a1c82e40fd629 i18n/cht/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  our    100644 b9d0cc54748098528d7d52af4aef0b78d90f5832 i18n/cht/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  their  100644 4ce804042be10a860180876e08726b8d42b7a860 i18n/cht/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-@@ -15,7 +15,10 @@
- 	"ConfigurationParser.invalidVaraibleReference": "錯誤: problemMatcher 參考無效: {0}\n",
- 	"ConfigurationParser.noTaskType": "錯誤: 工作組態必須具有型別屬性。將會忽略該組態。\n{0}\n",
- 	"ConfigurationParser.noTypeDefinition": "錯誤: 沒有已註冊工作類型 '{0}'。您是否忘記安裝提供相應工作提供者的延伸模組?",
-+<<<<<<< .our
- 	"ConfigurationParser.missingRequiredProperty": "錯誤: 工作組態 '{0}' 缺少要求的屬性 '{1}'。會略過工作組態。",
-+=======
-+>>>>>>> .their
- 	"ConfigurationParser.notCustom": "錯誤: 未將工作宣告為自訂工作。將會忽略該組態。\n{0}\n",
- 	"ConfigurationParser.noTaskName": "錯誤: 一項工作必須提供標籤屬性。即將忽略此工作。\n{0}\n",
- 	"taskConfiguration.noCommandOrDependsOn": "錯誤: 工作 '{0}' 未指定命令與 dependsOn 屬性。將會略過該工作。其定義為: \n{1}",
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/cht/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  our    100644 7c11d510d10d8533ee23906029dda6ab883d5ac2 i18n/cht/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  their  100644 a83e0f1442583b31b999acb92eeaf92b1e0d181d i18n/cht/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,6 +10,17 @@
- 	"termEntryAriaLabel": "{0} , 終端機選擇器",
- 	"termCreateEntryAriaLabel": "{0}，建立新的終端機",
- 	"workbench.action.terminal.newplus": "$(plus) 建立新的整合式終端機",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"termEntryAriaLabel": "{0} , 終端機選擇器",
-+	"termCreateEntryAriaLabel": "{0}，建立新的終端機",
-+	"'workbench.action.terminal.newplus": "$(plus) 建立新的整合式終端機",
-+>>>>>>> .their
- 	"noTerminalsMatching": "無相符的終端機",
- 	"noTerminalsFound": "無開啟的終端機"
- }
-\ No newline at end of file
-changed in both
-  base   100644 e4baafd4cb1136efba6f34f3f049a92805be86d9 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 dc4a98ed7869a7cc55922d5bc3bb8ecb137f6a4d i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 1e1fd8854062dd35d0e06e9b2e68f6b6b852f51a i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,9 @@
- 	],
- 	"quickOpen.terminal": "顯示所有已開啟的終端機",
- 	"terminal": "終端機",
-+=======
-+	"quickOpen.terminal": "顯示所有已開啟的終端機",
-+>>>>>>> .their
- 	"terminalIntegratedConfigurationTitle": "整合式終端機",
- 	"terminal.integrated.shell.linux": "終端機在 Linux 上使用的殼層路徑。",
- 	"terminal.integrated.shellArgs.linux": "在 Linux 終端機要使用的命令列引數。",
-@@ -36,8 +40,12 @@
- 	"terminal.integrated.env.osx": "OS X 上的終端機要使用之具有將新增至 VS Code 流程之環境變數的物件",
- 	"terminal.integrated.env.linux": "Linux 上的終端機要使用之具有將新增至 VS Code 流程之環境變數的物件",
- 	"terminal.integrated.env.windows": "Windows 上的終端機要使用之具有將新增至 VS Code 流程之環境變數的物件",
-+<<<<<<< .our
- 	"terminal.integrated.showExitAlert": "當結束代碼非 0，顯示警告訊息 '終端處理序已終止並回傳結束代碼'",
- 	"terminal.integrated.experimentalRestore": "啟動 VS Code 是否會自動還原工作區的終端機工作階段。此設定處於實驗階段，可能會出現 Bug 或在之後有所變更。",
-+=======
-+	"terminal": "終端機",
-+>>>>>>> .their
- 	"terminalCategory": "終端機",
- 	"viewCategory": "檢視"
- }
-\ No newline at end of file
-changed in both
-  base   100644 e7485a609ef8f73b7f501d3d2ecd47baf53fe5e7 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 b65af1ec7222f34f85465a0e272b45818ced6ea4 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 245ef9de86d0c43d6ee51d73e5b0c46071159888 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -14,8 +14,11 @@
- 	"workbench.action.terminal.selectAll": "全選",
- 	"workbench.action.terminal.deleteWordLeft": "刪除左方文字",
- 	"workbench.action.terminal.deleteWordRight": "刪除右方文字",
-+<<<<<<< .our
- 	"workbench.action.terminal.moveToLineStart": "移至行開端",
- 	"workbench.action.terminal.moveToLineEnd": "移至行尾端",
-+=======
-+>>>>>>> .their
- 	"workbench.action.terminal.new": "建立新的整合式終端機",
- 	"workbench.action.terminal.new.short": "新增終端機",
- 	"workbench.action.terminal.newWorkspacePlaceholder": "為新的終端機選擇目前的工作目錄",
-@@ -53,6 +56,7 @@
- 	"workbench.action.terminal.hideFindWidget": "隱藏尋找小工具",
- 	"nextTerminalFindTerm": "顯示下一個尋找字詞",
- 	"previousTerminalFindTerm": "顯示上一個尋找字詞",
-+<<<<<<< .our
- 	"quickOpenTerm": "切換使用中的終端機 ",
- 	"workbench.action.terminal.scrollToPreviousCommand": "捲動至上一個命令",
- 	"workbench.action.terminal.scrollToNextCommand": "捲動至下一個命令",
-@@ -60,4 +64,7 @@
- 	"workbench.action.terminal.selectToNextCommand": "選取下一個命令",
- 	"workbench.action.terminal.selectToPreviousLine": "選擇上一行",
- 	"workbench.action.terminal.selectToNextLine": "選擇下一行"
-+=======
-+	"quickOpenTerm": "終端機: 切換使用中的終端機"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6016a0077c1c8dbfb26f20abd3dccb8a03b464cc i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 2657899133e07b49fde3b011113a300d729b30b8 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 f80c288cbec285a050d1369d1fdc283ef870e226 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -10,7 +10,10 @@
- 	"terminal.foreground": "終端機的前景色彩。",
- 	"terminalCursor.foreground": "終端機游標的前景色彩。",
- 	"terminalCursor.background": "終端機游標的背景色彩。允許區塊游標重疊於自訂字元色彩。",
-+<<<<<<< .our
- 	"terminal.selectionBackground": "終端機的選取項目背景色彩。",
- 	"terminal.border": "在終端機內將窗格分割之邊界的色彩。預設為 panel.border。",
-+=======
-+>>>>>>> .their
- 	"terminal.ansiColor": "終端機中的 '{0}' ANSI 色彩。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 bcb5723b6fb1b66e0fa4e765c1eb7a3f3e9d27db i18n/cht/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 3fdd15bb8f2f2cfb1dd6d7b789581c43681e05de i18n/cht/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 e043af15328ee3940be29307d54ad6c128a488d4 i18n/cht/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -11,10 +11,16 @@
- 	"read the release notes": "歡迎使用 {0} v{1}! 您要閱讀版本資訊嗎?",
- 	"licenseChanged": "我們的授權條款已變更，請按一下[這裡]({0})查看變更項目。",
- 	"neveragain": "不要再顯示",
-+<<<<<<< .our
- 	"64bitisavailable": "適用於 64 位元 Windows 的 {0} 已正式推出! 若要深入了解，請按一下[這裡]({1})。",
- 	"updateIsReady": "新的 {0} 更新已可用。",
- 	"noUpdatesAvailable": "目前沒有任何可用的更新。",
- 	"ok": "確定",
-+=======
-+	"64bitisavailable": "適用於 64 位元 Windows 的 {0} 現已推出! ",
-+	"learn more": "深入了解",
-+	"updateIsReady": "新的 {0} 更新已可用。",
-+>>>>>>> .their
- 	"thereIsUpdateAvailable": "已有更新可用。",
- 	"download now": "立即下載",
- 	"later": "稍後",
-changed in both
-  base   100644 69805b63ee1aa5a061d6bf864ce49c4cc199720e i18n/cht/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  our    100644 bdcaab4106d8bcccb7ceace49106967eaf858fab i18n/cht/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  their  100644 69dbf592cda5b4891772b23180906e8e8e8f3b21 i18n/cht/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-@@ -37,6 +37,8 @@
- 	"welcomePage.showCommandsDescription": "從命令選擇區快速存取及搜尋命令 ({0})",
- 	"welcomePage.interfaceOverview": "介面概觀",
- 	"welcomePage.interfaceOverviewDescription": "使用視覺覆疊效果強調顯示 UI 的主要元件",
-+	"welcomePage.deployToAzure": "佈署應用程式到雲端",
-+	"welcomePage.deployToAzureDescription": "了解如何將結點應用程式部署至 Azure App Service",
- 	"welcomePage.interactivePlayground": "Interactive Playground",
- 	"welcomePage.interactivePlaygroundDescription": "嘗試使用逐步解說短片中的一些基本編輯器功能"
- }
-\ No newline at end of file
-changed in both
-  base   100644 4acbaf6f0acdab10437ec9ccfab9cb99fcb65e07 i18n/cht/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-  our    100644 0f84b94182873a4113b624f04ff70972b67fa09b i18n/cht/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-  their  100644 d624449b463b2e80390d2c132635bc3ef90ae3af i18n/cht/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-changed in both
-  base   100644 266ab6448f8ccbf0cedbe339ce3ac5cba113f42a i18n/cht/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-  our    100644 b19266dd080091d564b1457f642570d2d3bdec41 i18n/cht/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-  their  100644 7583abe2cc4819f5663a6aa96ce16f4dbb3805fe i18n/cht/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-changed in both
-  base   100644 a9e03459023378ba5f3780d801470a50342049a7 i18n/cht/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
-  our    100644 a8999c1feed62658e8d67f4bca806c1965675e30 i18n/cht/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
-  their  100644 576f7739cedcc35f948367c80fe958db90ebb0a2 i18n/cht/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"editorWalkThrough.title": "Interactive Playground",
- 	"editorWalkThrough": "Interactive Playground"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8fd534084bbd4deacc580700ccea246f70097f9b i18n/cht/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  our    100644 2bc73e75628de887e06bdd3449b69211e28f0a91 i18n/cht/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  their  100644 6a75f4da160263bbb75a84ad2966fbcb4ef10ef1 i18n/cht/src/vs/workbench/services/configuration/node/configuration.i18n.json
-@@ -9,6 +9,7 @@
- 	"scope.window.description": "視窗特定組態，可在使用者或工作區設定中予以設定。",
- 	"scope.resource.description": "資源特定設定，可在使用者、工作區或資料夾設定中予以設定。",
- 	"scope.description": "組態適用的範圍。可用的範圍為「視窗」和「資源」。",
-+<<<<<<< .our
- 	"vscode.extension.contributes.configuration": "提供組態設定。",
- 	"invalid.title": "'configuration.title' 必須是字串",
- 	"vscode.extension.contributes.defaultConfiguration": "依語言貢獻預設編輯器組態設定。",
-@@ -21,4 +22,13 @@
- 	"workspaceConfig.settings.description": "工作區設定",
- 	"workspaceConfig.extensions.description": "工作區延伸模組",
- 	"unknownWorkspaceProperty": "未知的工作區組態屬性"
-+=======
-+	"invalid.type": "如果已設定，'configuration.type' 必須設定為物件",
-+	"invalid.title": "'configuration.title' 必須是字串",
-+	"vscode.extension.contributes.defaultConfiguration": "依語言貢獻預設編輯器組態設定。",
-+	"invalid.properties": "'configuration.properties' 必須是物件",
-+	"workspaceConfig.folders.description": "要在工作區中載入之資料夾的清單。必須是檔案路徑，例如 `/root/folderA` 或 `./folderA` 即為會對工作區檔案位置解析的相關路徑。",
-+	"workspaceConfig.folder.description": "檔案路徑，例如 `/root/folderA` 或 `./folderA` 即為會對工作區檔案位置解析的相關路徑。",
-+	"workspaceConfig.settings.description": "工作區設定"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 b20ee8ce75fdb33fa3f5b690ac7a3c50dfcab79e i18n/cht/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 d8a57b177d1c5bed0bf72818f809bba5c7dd5e99 i18n/cht/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 8235f18066a43a939162d8765aee24f9244e1d49 i18n/cht/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -9,6 +9,7 @@
- 	"openTasksConfiguration": "開啟工作組態",
- 	"openLaunchConfiguration": "開啟啟動組態",
- 	"open": "開啟設定",
-+<<<<<<< .our
- 	"saveAndRetry": "儲存並重試",
- 	"errorUnknownKey": "因為 {1} 非已註冊的組態，所以無法寫入至 {0}。",
- 	"errorInvalidWorkspaceConfigurationApplication": "無法寫入 {0} 至工作區設定。此設定只能寫入使用者設定中。",
-@@ -27,6 +28,19 @@
- 	"errorConfigurationFileDirty": "因為檔案已變更，所以無法寫入使用者設定。請儲存使用者設定檔案，然後再試一次。",
- 	"errorConfigurationFileDirtyWorkspace": "因為檔案已變更，所以無法寫入工作區設定。請儲存工作區設定檔案，然後再試一次。",
- 	"errorConfigurationFileDirtyFolder": "因為檔案已變更，所以無法寫入資料夾設定。請儲存 '{0}' 資料夾設定檔案，然後再試一次。",
-+=======
-+	"close": "關閉",
-+	"saveAndRetry": "儲存設定並重啟",
-+	"errorUnknownKey": "因為 {1} 非已註冊的組態，所以無法寫入至 {0}。",
-+	"errorInvalidFolderConfiguration": "因為 {0} 不支援資料夾資源範圍，所以無法寫入至資料夾設定。",
-+	"errorInvalidUserTarget": "因為 {0} 不支援全域範圍，所以無法寫入至使用者設定。",
-+	"errorInvalidFolderTarget": "因為未提供資源，所以無法寫入至資料夾設定。",
-+	"errorNoWorkspaceOpened": "因為未開啟工作區，所以無法寫入至 {0}。請先開啟工作區，再試一次。",
-+	"errorInvalidConfiguration": "無法寫入設定.請開啟**使用者設定**並修正錯誤/警告後再試一次.",
-+	"errorInvalidConfigurationWorkspace": "無法寫入設定.請開啟**工作區設定**並修正檔案中的錯誤/警告後再試一次.",
-+	"errorConfigurationFileDirty": "無法寫入設定,因為檔案已變更.請儲存**使用者設定**後再試一次",
-+	"errorConfigurationFileDirtyWorkspace": "無法寫入設定,因檔案已變更.請儲存**工作區設定**後再試一次.",
-+>>>>>>> .their
- 	"userTarget": "使用者設定",
- 	"workspaceTarget": "工作區設定",
- 	"folderTarget": "資料夾設定"
-added in both
-  our    100644 b6236ca3b0f8430065a4c3402d2b5407326b8d75 i18n/cht/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
-  their  100644 38415d518f43f9521011b09ba99238df0d3c0c02 i18n/cht/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,5 +10,15 @@
- 	"extensionHostProcess.startupFailDebug": "延伸主機未於 10 秒內開始，可能在第一行就已停止，並需要偵錯工具才能繼續。",
- 	"extensionHostProcess.startupFail": "延伸主機未在 10 秒內啟動，可能發生了問題。",
- 	"reloadWindow": "重新載入視窗",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"extensionHostProcess.startupFailDebug": "延伸主機未於 10 秒內開始，可能在第一行就已停止，並需要偵錯工具才能繼續。",
-+	"extensionHostProcess.startupFail": "延伸主機未在 10 秒內啟動，可能發生了問題。",
-+>>>>>>> .their
- 	"extensionHostProcess.error": "延伸主機發生錯誤: {0}"
- }
-\ No newline at end of file
-added in both
-  our    100644 d78d215f84db2b61a20179e626d66f9fe50316b8 i18n/cht/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
-  their  100644 f08aebf3331db2b21ff58ed43761de1eaa72534d i18n/cht/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,5 +10,16 @@
- 	"jsonParseFail": "無法剖析 {0}: {1}。",
- 	"fileReadFail": "無法讀取檔案 {0}: {1}。",
- 	"jsonsParseReportErrors": "無法剖析 {0}: {1}。",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"jsonParseFail": "無法剖析 {0}: {1}。",
-+	"fileReadFail": "無法讀取檔案 {0}: {1}。",
-+	"jsonsParseFail": "無法剖析 {0} 或 {1}: {2}。",
-+>>>>>>> .their
- 	"missingNLSKey": "找不到金鑰 {0} 的訊息。"
- }
-\ No newline at end of file
-added in both
-  our    100644 1b176d67b9e7cc88eb18392ea83109e7d50b4db9 i18n/cht/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-  their  100644 e9e580ceb96c4aedcc5d3c1bb928809c0afd97f0 i18n/cht/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -15,4 +16,18 @@
- 	"extensionUnderDevelopment": "正在載入位於 {0} 的開發延伸模組",
- 	"extensionCache.invalid": "擴充功能在磁碟上已修改。請重新載入視窗。",
- 	"reloadWindow": "重新載入視窗"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"devTools": "開發人員工具",
-+	"restart": "重新啟動延伸主機",
-+	"extensionHostProcess.crash": "延伸主機意外終止。",
-+	"extensionHostProcess.unresponsiveCrash": "因為延伸主機沒有回應，所以意外終止。",
-+	"overwritingExtension": "正在以 {1} 覆寫延伸模組 {0}。",
-+	"extensionUnderDevelopment": "正在載入位於 {0} 的開發延伸模組"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6db7d6aae514a031afce5ac346abfd84bb8ee1cc i18n/cht/src/vs/workbench/services/progress/browser/progressService2.i18n.json
-  our    100644 2ac632948418df90b1e85729f7a5b865a6e278fe i18n/cht/src/vs/workbench/services/progress/browser/progressService2.i18n.json
-  their  100644 dbcd7381ae2fcf0e7a8fc81ec166ed7112edca11 i18n/cht/src/vs/workbench/services/progress/browser/progressService2.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -9,4 +10,8 @@
- 	"progress.subtitle": "{0} - {1}",
- 	"progress.title": "{0}: {1}",
- 	"cancel": "取消"
-+=======
-+	"progress.subtitle": "{0} - {1}",
-+	"progress.title": "{0}: {1}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c11894b26666346fd066e45a6285d9c9d973402b i18n/cht/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-  our    100644 56b196ad36bcae9e4b0e6df8622c4a2997889401 i18n/cht/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-  their  100644 6603fae31c10d22bf8cb8d90a8b04fa599014b55 i18n/cht/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,12 @@
- 	"schema.token.fontStyle": "字體格式規則: 'italic', 'bold' 或 'underline' 或是組合。空白字串取消繼承設定。",
- 	"schema.fontStyle.error": "字體格式必需是 'italic', 'bold' 或 'underline' 或是組合，或是空白字串。",
- 	"schema.token.fontStyle.none": "None (清除繼承格式)",
-+=======
-+	"schema.token.settings": "權杖的色彩與樣式。",
-+	"schema.token.foreground": "權杖的前景色彩。",
-+	"schema.token.fontStyle": "規則的字型樣式:「斜體」、「粗體」或「底線」之一或其組合",
-+	"schema.fontStyle.error": "字形樣式必須是「斜體」、「粗體」及「底線」的組合",
-+>>>>>>> .their
- 	"schema.properties.name": "規則的描述。",
- 	"schema.properties.scope": "針對此規則符合的範圍選取器。",
- 	"schema.tokenColors.path": "tmTheme 檔案的路徑 (相對於目前檔案)。",
-changed in both
-  base   100644 7c45152f8a53bad8bae0730683f3e299114a2152 i18n/cht/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
-  our    100644 67d1d983a279df5fd301289ad0b7bdfb3b816e88 i18n/cht/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
-  their  100644 fed5cb1c363afb37e5ef23a4ca3e729ac6dce0b3 i18n/cht/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
-changed in both
-  base   100644 b10dcde2a95c2fd6c3dd89b15581c97212a0edc7 i18n/cht/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 80a488e2a3e2c61dc5b117e10596d1fd5524e484 i18n/cht/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 34021b15c0aa0d5620ae575d85c52709207b959c i18n/cht/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-@@ -13,6 +13,12 @@
- 	"noIconThemeDesc": "No file icons",
- 	"iconThemeError": "File icon theme is unknown or not installed.",
- 	"workbenchColors": "依目前選擇的彩色佈景主題覆寫顏色",
-+<<<<<<< .our
-+=======
-+	"workbenchColors.deprecated": "此設定不再為實驗性，且已被重新命名為 'workbench.colorCustomizations'",
-+	"workbenchColors.deprecatedDescription": "改用'workbench.colorCustomizations'",
-+	"editorColors": "依目前選取的色彩佈景主題覆寫編輯器色彩與字型樣式。",
-+>>>>>>> .their
- 	"editorColors.comments": "設定註解的色彩與樣式",
- 	"editorColors.strings": "設定字串常值的色彩與樣式。",
- 	"editorColors.keywords": "設定關鍵字的色彩與樣式。",
-@@ -20,6 +26,10 @@
- 	"editorColors.types": "設定型別宣告與參考的色彩與樣式。",
- 	"editorColors.functions": "設定函式宣告與參考的色彩與樣式。",
- 	"editorColors.variables": "設定變數宣告與參考的色彩與樣式。",
-+<<<<<<< .our
- 	"editorColors.textMateRules": "使用 TextMate 佈景主題規則設定色彩與樣式 (進階)。",
- 	"editorColors": "依目前選取的色彩佈景主題覆寫編輯器色彩與字型樣式。"
-+=======
-+	"editorColors.textMateRules": "使用 TextMate 佈景主題規則設定色彩與樣式 (進階)。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 3f52af8f41e6fbad0b26f8cce2be299d2b8e47fe i18n/deu/extensions/css/package.i18n.json
-  our    100644 aed34432417b4bd351906eac6b6682221f298dc0 i18n/deu/extensions/css/package.i18n.json
-  their  100644 991fb95bca2dcb3875dce8d6bdd4c7a20db5c566 i18n/deu/extensions/css/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,73 @@
- 	],
- 	"displayName": "CSS-Sprachgrundlagen",
- 	"description": "Bietet Syntax-Highlighting und Bracket-Matching für CSS, LESS und SCSS Dateien."
-+=======
-+	"css.lint.argumentsInColorFunction.desc": "Ungültige Parameteranzahl.",
-+	"css.lint.boxModel.desc": "Verwenden Sie width oder height nicht beim Festlegen von padding oder border",
-+	"css.lint.compatibleVendorPrefixes.desc": "Stellen Sie beim Verwenden vom anbieterspezifischen Präfix sicher, dass alle anderen anbieterspezifischen Eigenschaften miteinbezogen werden",
-+	"css.lint.duplicateProperties.desc": "Keine doppelten Formatvorlagendefinitionen verwenden",
-+	"css.lint.emptyRules.desc": "Keine leeren Regelsätze verwenden",
-+	"css.lint.float.desc": "Die Verwendung von \"float\" vermeiden. float-Eigenschaften führen zu anfälligem CSS, das schnell nicht mehr funktioniert, wenn sich ein Aspekt des Layouts ändert.",
-+	"css.lint.fontFaceProperties.desc": "@font-face-Regel muss die Eigenschaften \"src\" und \"font-family\" definieren.",
-+	"css.lint.hexColorLength.desc": "Hexfarben müssen aus drei oder sechs Hexzahlen bestehen",
-+	"css.lint.idSelector.desc": "Selektoren sollten keine IDs enthalten, da diese Regeln zu eng mit HTML verknüpft sind.",
-+	"css.lint.ieHack.desc": "IE-Hacks sind nur für die Unterstützung von IE7 und älter erforderlich",
-+	"css.lint.important.desc": "Verwendung von „!important“ vermeiden. Damit wird angegeben, dass die Spezifität vom gesamten CSS außer Kontrolle geraten ist und umgestaltet werden muss.",
-+	"css.lint.importStatement.desc": "Importanweisungen können nicht parallel geladen werden.",
-+	"css.lint.propertyIgnoredDueToDisplay.desc": "Die Eigenschaft wird aufgrund der Anzeige ignoriert. Mit \"display: inline\" besitzen die width-, height-, margin-top-, margin-bottom- und float-Eigenschaften z. B. keine Auswirkung.",
-+	"css.lint.universalSelector.desc": "Es ist bekannt, dass der Universalselektor (*) langsam ist.",
-+	"css.lint.unknownProperties.desc": "Unbekannte Eigenschaft.",
-+	"css.lint.unknownVendorSpecificProperties.desc": "Unbekannte anbieterspezifische Eigenschaft.",
-+	"css.lint.vendorPrefix.desc": "Beim Verwenden von anbieterspezifischen Präfix auch die Standardeigenschaft miteinbeziehen",
-+	"css.lint.zeroUnits.desc": "Keine Einheit für Null erforderlich",
-+	"css.trace.server.desc": "Verfolgt die Kommunikation zwischen VS Code und dem CSS-Sprachserver.",
-+	"css.validate.title": "Steuert die CSS-Validierung und Problemschweregrade.",
-+	"css.validate.desc": "Aktiviert oder deaktiviert alle Überprüfungen.",
-+	"less.lint.argumentsInColorFunction.desc": "Ungültige Parameteranzahl.",
-+	"less.lint.boxModel.desc": "Verwenden Sie width oder height nicht beim Festlegen von padding oder border",
-+	"less.lint.compatibleVendorPrefixes.desc": "Stellen Sie beim Verwenden vom anbieterspezifischen Präfix sicher, dass alle anderen anbieterspezifischen Eigenschaften miteinbezogen werden",
-+	"less.lint.duplicateProperties.desc": "Keine doppelten Formatvorlagendefinitionen verwenden",
-+	"less.lint.emptyRules.desc": "Keine leeren Regelsätze verwenden",
-+	"less.lint.float.desc": "Die Verwendung von \"float\" vermeiden. float-Eigenschaften führen zu anfälligem CSS, das schnell nicht mehr funktioniert, wenn sich ein Aspekt des Layouts ändert.",
-+	"less.lint.fontFaceProperties.desc": "@font-face-Regel muss die Eigenschaften \"src\" und \"font-family\" definieren.",
-+	"less.lint.hexColorLength.desc": "Hexfarben müssen aus drei oder sechs Hexzahlen bestehen",
-+	"less.lint.idSelector.desc": "Selektoren sollten keine IDs enthalten, da diese Regeln zu eng mit HTML verknüpft sind.",
-+	"less.lint.ieHack.desc": "IE-Hacks sind nur für die Unterstützung von IE7 und älter erforderlich",
-+	"less.lint.important.desc": "Verwendung von „!important“ vermeiden. Damit wird angegeben, dass die Spezifität vom gesamten CSS außer Kontrolle geraten ist und umgestaltet werden muss.",
-+	"less.lint.importStatement.desc": "Importanweisungen können nicht parallel geladen werden.",
-+	"less.lint.propertyIgnoredDueToDisplay.desc": "Die Eigenschaft wird aufgrund der Anzeige ignoriert. Mit \"display: inline\" besitzen die width-, height-, margin-top-, margin-bottom- und float-Eigenschaften z. B. keine Auswirkung.",
-+	"less.lint.universalSelector.desc": "Es ist bekannt, dass der Universalselektor (*) langsam ist.",
-+	"less.lint.unknownProperties.desc": "Unbekannte Eigenschaft.",
-+	"less.lint.unknownVendorSpecificProperties.desc": "Unbekannte anbieterspezifische Eigenschaft.",
-+	"less.lint.vendorPrefix.desc": "Beim Verwenden von anbieterspezifischen Präfix auch die Standardeigenschaft miteinbeziehen",
-+	"less.lint.zeroUnits.desc": "Keine Einheit für Null erforderlich",
-+	"less.validate.title": "Steuert die LESS-Validierung und Problemschweregrade.",
-+	"less.validate.desc": "Aktiviert oder deaktiviert alle Überprüfungen.",
-+	"scss.lint.argumentsInColorFunction.desc": "Ungültige Parameteranzahl.",
-+	"scss.lint.boxModel.desc": "Verwenden Sie width oder height nicht beim Festlegen von padding oder border",
-+	"scss.lint.compatibleVendorPrefixes.desc": "Stellen Sie beim Verwenden vom anbieterspezifischen Präfix sicher, dass alle anderen anbieterspezifischen Eigenschaften miteinbezogen werden",
-+	"scss.lint.duplicateProperties.desc": "Keine doppelten Formatvorlagendefinitionen verwenden",
-+	"scss.lint.emptyRules.desc": "Keine leeren Regelsätze verwenden",
-+	"scss.lint.float.desc": "Die Verwendung von \"float\" vermeiden. float-Eigenschaften führen zu anfälligem CSS, das schnell nicht mehr funktioniert, wenn sich ein Aspekt des Layouts ändert.",
-+	"scss.lint.fontFaceProperties.desc": "@font-face-Regel muss die Eigenschaften \"src\" und \"font-family\" definieren.",
-+	"scss.lint.hexColorLength.desc": "Hexfarben müssen aus drei oder sechs Hexzahlen bestehen",
-+	"scss.lint.idSelector.desc": "Selektoren sollten keine IDs enthalten, da diese Regeln zu eng mit HTML verknüpft sind.",
-+	"scss.lint.ieHack.desc": "IE-Hacks sind nur für die Unterstützung von IE7 und älter erforderlich",
-+	"scss.lint.important.desc": "Verwendung von „!important“ vermeiden. Damit wird angegeben, dass die Spezifität vom gesamten CSS außer Kontrolle geraten ist und umgestaltet werden muss.",
-+	"scss.lint.importStatement.desc": "Importanweisungen können nicht parallel geladen werden.",
-+	"scss.lint.propertyIgnoredDueToDisplay.desc": "Die Eigenschaft wird aufgrund der Anzeige ignoriert. Mit \"display: inline\" besitzen die width-, height-, margin-top-, margin-bottom- und float-Eigenschaften z. B. keine Auswirkung.",
-+	"scss.lint.universalSelector.desc": "Es ist bekannt, dass der Universalselektor (*) langsam ist.",
-+	"scss.lint.unknownProperties.desc": "Unbekannte Eigenschaft.",
-+	"scss.lint.unknownVendorSpecificProperties.desc": "Unbekannte anbieterspezifische Eigenschaft.",
-+	"scss.lint.vendorPrefix.desc": "Beim Verwenden von anbieterspezifischen Präfix auch die Standardeigenschaft miteinbeziehen",
-+	"scss.lint.zeroUnits.desc": "Keine Einheit für Null erforderlich",
-+	"scss.validate.title": "Steuert die SCSS-Überprüfung und Problemschweregrade.",
-+	"scss.validate.desc": "Aktiviert oder deaktiviert alle Überprüfungen.",
-+	"less.colorDecorators.enable.desc": "Aktiviert oder deaktiviert Farb-Decorators",
-+	"scss.colorDecorators.enable.desc": "Aktiviert oder deaktiviert Farb-Decorators",
-+	"css.colorDecorators.enable.desc": "Aktiviert oder deaktiviert Farb-Decorators",
-+	"css.colorDecorators.enable.deprecationMessage": "Die Einstellung \"css.colorDecorators.enable\" ist veraltet und wurde durch \"editor.colorDecorators\" ersetzt.",
-+	"scss.colorDecorators.enable.deprecationMessage": "Die Einstellung \"scss.colorDecorators.enable\" ist veraltet und wurde durch \"editor.colorDecorators\" ersetzt.",
-+	"less.colorDecorators.enable.deprecationMessage": "Die Einstellung \"less.colorDecorators.enable\" ist veraltet und wurde durch \"editor.colorDecorators\" ersetzt."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/deu/extensions/emmet/package.i18n.json
-  our    100644 76a0f1cf2f4933fe2973e0cc716d5590fccebd37 i18n/deu/extensions/emmet/package.i18n.json
-  their  100644 aef483c7df261713bdd6021df328b21f273643b1 i18n/deu/extensions/emmet/package.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,6 +8,14 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"description": "Emmet-Unterstützung für VS Code",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"command.wrapWithAbbreviation": "Mit Abkürzung umschließen",
- 	"command.wrapIndividualLinesWithAbbreviation": "Einzelne Zeilen mit Abkürzung umschließen",
- 	"command.removeTag": "Tag entfernen",
-@@ -31,6 +40,7 @@
- 	"command.incrementNumberByTen": "Um 10 erhöhen",
- 	"command.decrementNumberByTen": "Um 10 verringern",
- 	"emmetSyntaxProfiles": "Definieren Sie das Profil für die angegebene Syntax, oder verwenden Sie Ihr eigenes Profil mit bestimmten Regeln.",
-+<<<<<<< .our
- 	"emmetExclude": "Ein Array von Sprachen, in dem Emmet-Abkürzungen nicht erweitert werden sollten.",
- 	"emmetExtensionsPath": "Pfad zu einem Ordner mit Emmet-Profilen und Ausschnitten.",
- 	"emmetShowExpandedAbbreviation": "Zeigt erweiterte Emmet-Abkürzungen als Vorschläge an.\nDie Option inMarkupAndStylesheetFilesOnly gilt für HTML, HAML, Jade, Slim, XML, XSL, CSS, SCSS, Sass, Less und Stylus.\nDie Option \"always\" gilt unabhängig vom Markup/CSS für alle Teile der Datei.",
-@@ -38,6 +48,15 @@
- 	"emmetIncludeLanguages": "Aktivieren Sie Emmet-Abkürzungen in Sprachen, die nicht standardmäßig unterstützt werden. Fügen Sie hier eine Zuordnung zwischen der Sprache und der von Emmet unterstützten Sprache hinzu.\nBeispiel: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
- 	"emmetVariables": "In Emmet-Ausschnitten zu verwendende Codeausschnitte",
- 	"emmetTriggerExpansionOnTab": "Wenn aktiviert, werden Emmet-Abkürzungen beim Drücken der TAB-Taste erweitert.",
-+=======
-+	"emmetExclude": "Ein Array von Sprachen, in dem Emmet-Abkürzungen nicht erweitert werden sollen.",
-+	"emmetExtensionsPath": "Pfad zu einem Ordner mit Emmet-Profilen und Ausschnitten.",
-+	"emmetShowExpandedAbbreviation": "Zeigt erweiterte Emmet-Abkürzungen als Vorschläge an.\nDie Option inMarkupAndStylesheetFilesOnly gilt für HTML, HAML, Jade, Slim, XML, XSL, CSS, SCSS, Sass, Less und Stylus.\nDie Option \"always\" gilt unabhängig vom Markup/CSS für alle Teile der Datei.",
-+	"emmetShowAbbreviationSuggestions": "Zeigt mögliche Emmet-Abkürzungen als Vorschläge an. Diese Option gilt nicht in Stylesheets oder wenn emmet.showExpandedAbbreviation auf \"never\" festgelegt ist.",
-+	"emmetIncludeLanguages": "Aktivieren Sie Emmet-Abkürzungen in Sprachen, die nicht standardmäßig unterstützt werden. Fügen Sie hier ein Mapping zwischen der Sprache und der von Emmet unterstützten Sprache hinzu.\nBeispiel: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
-+	"emmetVariables": "In Emmet-Ausschnitten zu verwendende Variablen",
-+	"emmetTriggerExpansionOnTab": "Wenn aktiviert, werden Emmet-Abkürzungen beim Drücken der TAB-TASTE erweitert.",
-+>>>>>>> .their
- 	"emmetPreferences": "Einstellungen, die zum Ändern des Verhaltens einiger Aktionen und Konfliktlöser von Emmet verwendet werden.",
- 	"emmetPreferencesIntUnit": "Standardeinheit für Integerwerte",
- 	"emmetPreferencesFloatUnit": "Standardeinheit für Floatwerte",
-@@ -47,6 +66,7 @@
- 	"emmetPreferencesCssBetween": "Symbol, das beim Erweitern von CSS-Abkürzungen zwischen der CSS-Eigenschaft und dem Wert eingefügt werden soll",
- 	"emmetPreferencesSassBetween": "Symbol, das beim Erweitern von CSS-Abkürzungen in Sass-Dateien zwischen der CSS-Eigenschaft und dem Wert eingefügt werden soll",
- 	"emmetPreferencesStylusBetween": "Symbol, das beim Erweitern von CSS-Abkürzungen in Stylus-Dateien zwischen der CSS-Eigenschaft und dem Wert eingefügt werden soll",
-+<<<<<<< .our
- 	"emmetShowSuggestionsAsSnippets": "Bei TRUE werden die Emmet-Vorschläge als Ausschnitte angezeigt, mit denen Sie sie der editor.snippetSuggestions-Einstellung entsprechend anordnen können.",
- 	"emmetPreferencesBemElementSeparator": "Elementtrennzeichen für Klassen unter Verwendung des BEM-Filters",
- 	"emmetPreferencesBemModifierSeparator": "Modifizierertrennzeichen für Klassen unter Verwendung des BEM-Filters",
-@@ -62,4 +82,7 @@
- 	"emmetPreferencesCssMsProperties": "Durch Trennzeichen getrennte CSS-Eigenschaften, die das \"ms\"-Herstellerpräfix erhalten, wenn sie in einer Emmet-Abkürzung verwendet werden, die mit \"-\" beginnt. Legen Sie eine leere Zeichenfolge fest, um das \"ms\"-Präfix immer zu vermeiden.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "Das Mindestergebnis (zwischen 0 und 1), das die Abkürzung mit Fuzzyübereinstimmung erreichen muss. Niedrigere Werte führen zu vielen falsch positiven Übereinstimmungen, höhere Werte verringern unter Umständen die möglichen Übereinstimmungen.",
- 	"emmetOptimizeStylesheetParsing": "Bei der Einstellung FALSE wird die gesamte Datei analysiert, um zu bestimmten, ob die aktuelle Position zum Erweitern von Emmet-Abkürzungen gültig ist. Bei der Einstellung TRUE wird nur der Inhalt um die die aktuelle Position in CSS-/SCSS-/LESS-Dateien analysiert."
-+=======
-+	"emmetShowSuggestionsAsSnippets": "Bei TRUE werden die Emmet-Vorschläge als Ausschnitte angezeigt, mit denen Sie sie der editor.snippetSuggestions-Einstellung entsprechend anordnen können."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 03fa4d766d9ae321b3f1b77ee1a09b1ff3bd92de i18n/deu/extensions/extension-editing/out/extensionLinter.i18n.json
-  our    100644 36866190f3efcb5834281b67770828a9ea8c674f i18n/deu/extensions/extension-editing/out/extensionLinter.i18n.json
-  their  100644 31af64199eb2b11604fceafb049f4879af9361ac i18n/deu/extensions/extension-editing/out/extensionLinter.i18n.json
-changed in both
-  base   100644 87d98409dd99a4b49e0999adc799fd273a5d6f12 i18n/deu/extensions/git/out/commands.i18n.json
-  our    100644 1abad5f86ec11c777f2319fc1588d47f5ea1c8f5 i18n/deu/extensions/git/out/commands.i18n.json
-  their  100644 c3d3a5519b74b1ca21ab9149b8f280ca5d95053e i18n/deu/extensions/git/out/commands.i18n.json
-@@ -13,6 +13,7 @@
- 	"selectFolder": "Repositoryspeicherort auswählen",
- 	"cloning": "Das Git-Repository \"{0}\" wird geklont …",
- 	"proposeopen": "Möchten Sie das geklonte Repository öffnen?",
-+<<<<<<< .our
- 	"openrepo": "Repository öffnen",
- 	"add": "Zum Arbeitsbereich hinzufügen",
- 	"proposeopen2": "Möchten Sie das geklonte Repository öffnen oder es zum aktuellen Arbeitsbereich hinzufügen?",
-@@ -20,6 +21,10 @@
- 	"init repo": "Repository initialisieren",
- 	"create repo": "Repository initialisieren",
- 	"are you sure": "Erstellt ein Git-Repository unter '{0}'. Sind Sie sicher das Sie weiterfahren möchten?",
-+=======
-+	"path to init": "Ordnerpfad",
-+	"provide path": "Geben Sie einen Ordnerpfad zum Initialisieren eines Git-Repositorys an.",
-+>>>>>>> .their
- 	"HEAD not available": "Es ist keine HEAD-Version von \"{0}\" verfügbar.",
- 	"confirm stage files with merge conflicts": "Möchten Sie {0} Dateien mit Mergingkonflikten bereitstellen?",
- 	"confirm stage file with merge conflicts": "Möchten Sie {0} mit Mergingkonflikten bereitstellen?",
-@@ -43,10 +48,13 @@
- 	"confirm discard all 2": "{0}\n\nDies kann NICHT rückgängig gemacht werden, und Ihr aktueller Arbeitssatz geht DAUERHAFT verloren.",
- 	"yes discard tracked": "1 verfolgte Datei verwerfen",
- 	"yes discard tracked multiple": "{0} verfolgte Dateien verwerfen",
-+<<<<<<< .our
- 	"unsaved files single": "Die folgende Datei ist nicht gespeichert: {0}.\n\nMöchten Sie diese vor dem Committen speichern?",
- 	"unsaved files": "{0} Dateien sind nicht gespeichert.\n\nMöchten Sie diese vor dem Committen speichern?",
- 	"save and commit": "Alles speichern und committen",
- 	"commit": "Trotzdem committen",
-+=======
-+>>>>>>> .their
- 	"no staged changes": "Es sind keine Änderungen bereitgestellt.\n\nMöchten Sie alle Ihre Änderungen automatisch bereitstellen und direkt committen?",
- 	"always": "Immer",
- 	"no changes": "Keine Änderungen zum Speichern vorhanden.",
-@@ -66,10 +74,14 @@
- 	"provide tag name": "Geben Sie einen Tagnamen an.",
- 	"tag message": "Nachricht",
- 	"provide tag message": "Geben Sie eine Meldung ein, um das Tag mit einer Anmerkung zu versehen.",
-+<<<<<<< .our
- 	"no remotes to fetch": "In diesem Repository wurden keine Remoteelemente konfiguriert, aus denen ein Abrufen erfolgt.",
-+=======
-+>>>>>>> .their
- 	"no remotes to pull": "In Ihrem Repository wurden keine Remoteelemente für den Pull konfiguriert.",
- 	"pick remote pull repo": "Remoteelement zum Pullen des Branch auswählen",
- 	"no remotes to push": "In Ihrem Repository wurden keine Remoteelemente für den Push konfiguriert.",
-+	"push with tags success": "Push mit Tags erfolgreich ausgeführt.",
- 	"nobranch": "Wählen Sie ein Branch für den Push zu einem Remoteelement aus.",
- 	"confirm publish branch": "Der Branch \"{0}\" verfügt über keinen Upstreambranch. Möchten Sie diesen Branch veröffentlichen?",
- 	"ok": "OK",
-changed in both
-  base   100644 681e5ffa795232500e6a422f551d93a6871c9626 i18n/deu/extensions/git/out/model.i18n.json
-  our    100644 9a6612eb540c94e36ad53e443993b0482724fe6c i18n/deu/extensions/git/out/model.i18n.json
-  their  100644 5e1088116a0b5e383cfce6afa5e4a2f8bff45f19 i18n/deu/extensions/git/out/model.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -7,6 +8,8 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"too many submodules": "Das Repository \"{0}\" enthält {1} Submodule, die nicht automatisch geöffnet werden. Sie könne Sie einzeln öffnen, indem Sie darin erhaltene Datei öffnen.",
-+=======
-+>>>>>>> .their
- 	"no repositories": "Es sind keine verfügbaren Repositorys vorhanden.",
- 	"pick repo": "Repository auswählen"
- }
-\ No newline at end of file
-added in both
-  our    100644 19de752d1259c61a02eef63529268457137c8f97 i18n/deu/extensions/git/out/repository.i18n.json
-  their  100644 eeff60b713c425cfb713e3199fc81dbab609407c i18n/deu/extensions/git/out/repository.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"open": "Öffnen",
- 	"index modified": "Index geändert",
- 	"modified": "Geändert am",
-@@ -23,13 +32,21 @@
- 	"deleted by us": "Gelöscht von uns",
- 	"both added": "Beide hinzugefügt",
- 	"both modified": "Beide geändert",
-+<<<<<<< .our
- 	"commitMessage": "Message (press {0} to commit)",
-+=======
-+>>>>>>> .their
- 	"commit": "Commit",
- 	"merge changes": "Änderungen zusammenführen",
- 	"staged changes": "Bereitgestellte Änderungen",
- 	"changes": "Änderungen",
-+<<<<<<< .our
- 	"commitMessageCountdown": "{0} Zeichen in der aktuellen Zeile verbleibend",
- 	"commitMessageWarning": "{0} Zeichen über {1} in der aktuellen Zeile",
- 	"neveragain": "Nicht mehr anzeigen",
-+=======
-+	"ok": "OK",
-+	"neveragain": "Nie wieder anzeigen",
-+>>>>>>> .their
- 	"huge": "Das Git-Repository unter {0} umfasst zu viele aktive Änderungen. Nur ein Teil der Git-Features wird aktiviert."
- }
-\ No newline at end of file
-changed in both
-  base   100644 baffc6c40180fb7bcef9cd85c3cd736de29c151b i18n/deu/extensions/git/package.i18n.json
-  our    100644 70e0819e8ad95e53d1958520356a5b59f85a5e7c i18n/deu/extensions/git/package.i18n.json
-  their  100644 4b4b197df1afe26ee39b5d01c0bc31b85874f645 i18n/deu/extensions/git/package.i18n.json
-@@ -40,7 +40,10 @@
- 	"command.renameBranch": "Branch umbenennen...",
- 	"command.merge": "Branch zusammenführen...",
- 	"command.createTag": "Tag erstellen",
-+<<<<<<< .our
- 	"command.fetch": "Abrufen",
-+=======
-+>>>>>>> .their
- 	"command.pull": "Pull",
- 	"command.pullRebase": "Pull (Rebase)",
- 	"command.pullFrom": "Pullen von...",
-@@ -52,8 +55,12 @@
- 	"command.publish": "Branch veröffentlichen",
- 	"command.showOutput": "Git-Ausgabe anzeigen",
- 	"command.ignore": "Datei zu .gitignore hinzufügen",
-+<<<<<<< .our
- 	"command.stashIncludeUntracked": "Stash (einschließlich nicht verfolgt)",
- 	"command.stash": "Stash ausführen",
-+=======
-+	"command.stash": " Stash ausführen",
-+>>>>>>> .their
- 	"command.stashPop": "Pop für Stash ausführen...",
- 	"command.stashPopLatest": "Pop für letzten Stash ausführen",
- 	"config.enabled": "Gibt an, ob Git aktiviert ist.",
-@@ -71,6 +78,7 @@
- 	"config.defaultCloneDirectory": "Das Standard-Verzeichnis für einen Klon eines Git-Repositorys",
- 	"config.enableSmartCommit": "Alle Änderungen committen, wenn keine bereitgestellten Änderungen vorhanden sind.",
- 	"config.enableCommitSigning": "Aktiviert das Signieren von Commits per GPG.",
-+<<<<<<< .our
- 	"config.discardAllScope": "Legt fest, welche Änderungen vom Befehl \"Alle Änderungen verwerfen\" verworfen werden. \"all\" verwirft alle Änderungen. \"tracked\" verwirft nur verfolgte Dateien. \"prompt\" zeigt immer eine Eingabeaufforderung an, wenn die Aktion ausgeführt wird.",
- 	"config.decorations.enabled": "Steuert, ob Git Farben und Badges für die Explorer-Ansicht und die Ansicht \"Geöffnete Editoren\" beiträgt.",
- 	"config.promptToSaveFilesBeforeCommit": "Legt fest, ob Git vor dem einchecken nach nicht gespeicherten Dateien suchen soll.",
-@@ -84,4 +92,7 @@
- 	"colors.ignored": "Farbe für ignorierte Ressourcen.",
- 	"colors.conflict": "Farbe für Ressourcen mit Konflikten.",
- 	"colors.submodule": "Farbe für Submodul-Ressourcen."
-+=======
-+	"config.discardAllScope": "Legt fest, welche Änderungen vom Befehl \"Alle Änderungen verwerfen\" verworfen werden. \"all\" verwirft alle Änderungen. \"tracked\" verwirft nur verfolgte Dateien. \"prompt\" zeigt immer eine Eingabeaufforderung an, wenn die Aktion ausgeführt wird."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 fa64ca7a131c22a5d117405352b855bfcdea4c72 i18n/deu/extensions/html/package.i18n.json
-  our    100644 9ce5789f79319444e43d360a505b99775b440971 i18n/deu/extensions/html/package.i18n.json
-  their  100644 276d5c08aae18eec04bf9f2e54d83679bc3eb7f4 i18n/deu/extensions/html/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,28 @@
- 	],
- 	"displayName": "HTML-Sprachgrundlagen",
- 	"description": "Bietet Syntaxhervorhebung, Klammernpaare und Ausschnitte in HTML-Dateien."
-+=======
-+	"html.format.enable.desc": "Standard-HTML-Formatierer aktivieren/deaktivieren",
-+	"html.format.wrapLineLength.desc": "Die maximale Anzahl von Zeichen pro Zeile (0 = deaktiviert).",
-+	"html.format.unformatted.desc": "Die Liste der Tags (durch Kommas getrennt), die nicht erneut formatiert werden sollen. \"null\" bezieht sich standardmäßig auf alle Tags, die unter https://www.w3.org/TR/html5/dom.html#phrasing-content aufgeführt werden.",
-+	"html.format.contentUnformatted.desc": "Liste der Tags (durch Trennzeichen getrennt), in der der Inhalt nicht neu formatiert werden muss. \"null\" entspricht standardmäßig dem Tag \"pre\".",
-+	"html.format.indentInnerHtml.desc": "Nimmt einen Einzug für <head>- und <body>-Abschnitte vor.",
-+	"html.format.preserveNewLines.desc": "Gibt an, ob vorhandene Zeilenumbrüche vor Elemente beibehalten werden sollen. Funktioniert nur vor Elementen, nicht in Tags oder für Text.",
-+	"html.format.maxPreserveNewLines.desc": "Die maximale Anzahl von Zeilenumbrüchen, die in einem Block beibehalten werden soll. Verwenden Sie \"null\" für eine unbegrenzte Anzahl.",
-+	"html.format.indentHandlebars.desc": "Formatiert {{#foo}} und {{/foo}} und nimmt einen Einzug vor.",
-+	"html.format.endWithNewline.desc": "Endet mit einer neuen Zeile.",
-+	"html.format.extraLiners.desc": "Die Liste der Tags (durch Kommas getrennt), vor denen eine zusätzliche neue Zeile eingefügt werden soll. \"null\" verwendet standardmäßig \"head, body, /HTML\".",
-+	"html.format.wrapAttributes.desc": "Attribute umschließen.",
-+	"html.format.wrapAttributes.auto": "Attribute nur dann umschließen, wenn die Zeilenlänge überschritten wird.",
-+	"html.format.wrapAttributes.force": "Jedes Attribut mit Ausnahme des ersten umschließen.",
-+	"html.format.wrapAttributes.forcealign": "Jedes Attribut mit Ausnahme des ersten umschließen und Ausrichtung beibehalten.",
-+	"html.format.wrapAttributes.forcemultiline": "Jedes Attribut umschließen.",
-+	"html.suggest.angular1.desc": "Konfiguriert, ob die integrierte HTML-Sprachuntersützung Angular V1-Tags und -Eigenschaften vorschlägt.",
-+	"html.suggest.ionic.desc": "Konfiguriert, ob die integrierte HTML-Sprachuntersützung Ionic-Tags, -Eigenschaften und -Werte vorschlägt.",
-+	"html.suggest.html5.desc": "Konfiguriert, ob die integrierte HTML-Sprachuntersützung HTML5-Tags, -Eigenschaften und -Werte vorschlägt.",
-+	"html.trace.server.desc": "Verfolgt die Kommunikation zwischen VS Code und dem HTML-Sprachserver.",
-+	"html.validate.scripts": "Konfiguriert, ob die integrierte HTML-Sprachunterstützung eingebettete Skripts unterstützt.",
-+	"html.validate.styles": "Konfiguriert, ob die integrierte HTML-Sprachunterstützung eingebettete Skripts validiert.",
-+	"html.autoClosingTags": "Automatisches Schließen von HTML-Tags aktivieren/deaktivieren."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 63c14903906c0f6600df9055b12660ab3586f54f i18n/deu/extensions/json/package.i18n.json
-  our    100644 b9be795e738e73486bf4e8725cdd00e6c55de4a0 i18n/deu/extensions/json/package.i18n.json
-  their  100644 7536827f7aa994d3d8175b8ae9c672e0fea6f514 i18n/deu/extensions/json/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,15 @@
- 	],
- 	"displayName": "JSON-Sprachgrundlagen",
- 	"description": "Bietet Syntaxhervorhebung und Klammernpaare in JSON-Dateien."
-+=======
-+	"json.schemas.desc": "Schemas zu JSON-Dateien im aktuellen Projekt zuordnen",
-+	"json.schemas.url.desc": "Eine URL zu einem Schema oder ein relativer Pfad zu einem Schema im aktuellen Verzeichnis",
-+	"json.schemas.fileMatch.desc": "Ein Array von Dateimustern, mit dem beim Auflösen von JSON-Dateien zu Schemas ein Abgleich erfolgt.",
-+	"json.schemas.fileMatch.item.desc": "Ein Dateimuster, das \"*\" enthalten kann, mit dem beim Auflösen von JSON-Dateien zu Schemas ein Abgleich erfolgt.",
-+	"json.schemas.schema.desc": "Die Schemadefinition für die angegebene URL. Das Schema muss nur angegeben werden, um Zugriffe auf die Schema-URL zu vermeiden.",
-+	"json.format.enable.desc": "Standard-JSON-Formatierer aktivieren/deaktivieren (Neustart erforderlich)",
-+	"json.tracing.desc": "Verfolgt die Kommunikation zwischen VS Code und JSON-Sprachserver nach.",
-+	"json.colorDecorators.enable.desc": "Aktiviert oder deaktiviert Farb-Decorators",
-+	"json.colorDecorators.enable.deprecationMessage": "Die Einstellung \"json.colorDecorators.enable\" ist veraltet und wurde durch \"editor.colorDecorators\" ersetzt."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 62705e93d919c88e3ec1170a9abff8e7c6556b71 i18n/deu/extensions/markdown/out/security.i18n.json
-  our    100644 828b182b8ed53f89b863a57157b6b787f6c91dc0 i18n/deu/extensions/markdown/out/security.i18n.json
-  their  100644 70533ed2e5ddae6d34c351189a2860cbf09e1cff i18n/deu/extensions/markdown/out/security.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"strict.title": "Strict",
- 	"strict.description": "Nur sicheren Inhalt laden",
- 	"insecureContent.title": "Unsicheren Inhalt zulassen",
-@@ -13,8 +16,11 @@
- 	"disable.title": "Deaktivieren",
- 	"disable.description": "Alle Inhalte und Skriptausführung zulassen. Nicht empfohlen.",
- 	"moreInfo.title": "Weitere Informationen",
-+<<<<<<< .our
- 	"enableSecurityWarning.title": "Vorschau von Sicherheitswarnungen in diesem Arbeitsbereich aktivieren",
- 	"disableSecurityWarning.title": "Vorschau von Sicherheitswarnungen in diesem Arbeitsbereich deaktivieren ",
- 	"toggleSecurityWarning.description": "Hat keinen Einfluss auf die Inhaltssicherheitsebene",
-+=======
-+>>>>>>> .their
- 	"preview.showPreviewSecuritySelector.title": "Sicherheitseinstellungen für die Markdown-Vorschau in diesem Arbeitsbereich auswählen"
- }
-\ No newline at end of file
-changed in both
-  base   100644 1e0e2709f9cfc9279ebcbfe5992aed2a4d011ae3 i18n/deu/extensions/markdown/package.i18n.json
-  our    100644 b88fe3c002a80f2d60d00bff4731023876258ccc i18n/deu/extensions/markdown/package.i18n.json
-  their  100644 14ba4116cc264fecd3cd476bfcffa1edfd9a2217 i18n/deu/extensions/markdown/package.i18n.json
-@@ -27,6 +27,10 @@
- 	"markdown.styles.dec": "Eine Liste von URLs oder lokalen Pfaden zu CSS-Stylesheets aus der Markdownvorschau, die verwendet werden sollen. Relative Pfade werden relativ zu dem Ordner interpretiert, der im Explorer geöffnet ist. Wenn kein Ordner geöffnet ist, werden sie relativ zum Speicherort der Markdowndatei interpretiert. Alle '\\' müssen als '\\\\' geschrieben werden.",
- 	"markdown.showPreviewSecuritySelector.title": "Sicherheitseinstellungen für Vorschau ändern",
- 	"markdown.trace.desc": "Aktiviert die Debugprotokollierung für die Markdown-Erweiterung.",
-+<<<<<<< .our
- 	"markdown.preview.refresh.title": "Vorschau aktualisieren",
- 	"markdown.preview.toggleLock.title": "Vorschausperre umschalten"
-+=======
-+	"markdown.refreshPreview.title": "Vorschau aktualisieren"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 df3491b4c052583c360e279bc895be6608fb2c57 i18n/deu/extensions/npm/package.i18n.json
-  our    100644 8df75704426af1d4997cfc228d8144b23fc7a25f i18n/deu/extensions/npm/package.i18n.json
-  their  100644 6d17843d6df9f96161ae53acd02b6b8739c05b6b i18n/deu/extensions/npm/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -23,4 +24,8 @@
- 	"command.debug": "Debuggen",
- 	"command.openScript": "Öffnen",
- 	"command.runInstall": "Installation ausführen"
-+=======
-+	"config.npm.autoDetect": "Steuert, ob die automatische Erkennung von NPM-Skripts aktiviert oder deaktiviert ist. Standardmäßig ist die Funktion aktiviert.",
-+	"config.npm.runSilent": "npm-Befehle mit der Option \"--silent\" ausführen"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/deu/extensions/typescript/out/features/taskProvider.i18n.json
-  our    100644 8d79b969dfa26d3e6da17af9cef214ffe4faad14 i18n/deu/extensions/typescript/out/features/taskProvider.i18n.json
-  their  100644 3c8640b94b25b1219d11b1f029ef421fbcb94931 i18n/deu/extensions/typescript/out/features/taskProvider.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,14 @@
- 	],
- 	"buildTscLabel": "Erstellen – {0}",
- 	"buildAndWatchTscLabel": "Überwachen – {0}"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"buildAndWatchTscLabel": "Überwachen – {0}",
-+	"buildTscLabel": "Erstellen – {0}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 e381d6d3b73b0d6533482f247a28ad5ab12caf4c i18n/deu/extensions/typescript/out/utils/api.i18n.json
-  their  100644 ac7390c715ad62915b175e0295e238875b03b55b i18n/deu/extensions/typescript/out/utils/api.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"invalidVersion": "Ungültige Version"
- }
-\ No newline at end of file
-changed in both
-  base   100644 26d4c60ec0cb101990019cd0a9881673ba10458f i18n/deu/extensions/typescript/out/utils/versionPicker.i18n.json
-  our    100644 9414ff7601e3e39a005c20274a23b05839f4d423 i18n/deu/extensions/typescript/out/utils/versionPicker.i18n.json
-  their  100644 ffcda0225951b1dabfa091c45d73a2fcc8dc2526 i18n/deu/extensions/typescript/out/utils/versionPicker.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"useVSCodeVersionOption": "Version von VS Code verwenden",
- 	"useWorkspaceVersionOption": "Arbeitsbereichsversion verwenden",
- 	"learnMore": "Weitere Informationen",
-changed in both
-  base   100644 06879a8a5e42074daf73c4f4577c38b6942a3758 i18n/deu/extensions/typescript/out/utils/versionProvider.i18n.json
-  our    100644 4d94a01dc626e9925a0a1aa3512a960992a4678a i18n/deu/extensions/typescript/out/utils/versionProvider.i18n.json
-  their  100644 620d39487299ad9da2b33c736a75c13ce00d2026 i18n/deu/extensions/typescript/out/utils/versionProvider.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"couldNotLoadTsVersion": "Die TypeScript-Version konnte unter diesem Pfad nicht geladen werden.",
- 	"noBundledServerFound": "Der tsserver von VS Code wurde von einer anderen Anwendung wie etwa einem fehlerhaften Tool zur Viruserkennung gelöscht. Führen Sie eine Neuinstallation von VS Code durch."
- }
-\ No newline at end of file
-changed in both
-  base   100644 a0a44b0a6f35f7a6e455f64e387297945b5c60b9 i18n/deu/extensions/typescript/package.i18n.json
-  our    100644 6f8bb4fea941525ab897f97cd6506e129d2eb1f4 i18n/deu/extensions/typescript/package.i18n.json
-  their  100644 227e220881d3bc26e3528221cf6cdd327ecb0486 i18n/deu/extensions/typescript/package.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/deu/src/vs/code/electron-main/auth.i18n.json
-  our    100644 fa26814a783e517cd40e6eb8f4b73b928c283ce2 i18n/deu/src/vs/code/electron-main/auth.i18n.json
-  their  100644 84f927c08ed962134c11d5173a92bcd8f747379e i18n/deu/src/vs/code/electron-main/auth.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"authRequire": "Proxyauthentifizierung erforderlich",
- 	"proxyauth": "Der Proxy {0} erfordert eine Authentifizierung."
- }
-\ No newline at end of file
-changed in both
-  base   100644 587b2aaa0697d7cc3cc78dba0c566ada02ea7cf2 i18n/deu/src/vs/code/electron-main/menus.i18n.json
-  our    100644 2c62aec3f2252906a0cfb94c2bac025ecf6adbb0 i18n/deu/src/vs/code/electron-main/menus.i18n.json
-  their  100644 c83d63795951d1592094e7beb0bcab310fe131e5 i18n/deu/src/vs/code/electron-main/menus.i18n.json
-@@ -24,12 +24,21 @@
- 	"miQuit": "{0} beenden",
- 	"miNewFile": "&&Neue Datei",
- 	"miOpen": "&&Öffnen...",
-+<<<<<<< .our
- 	"miOpenWorkspace": "Ar&&beitsbereich öffnen...",
- 	"miOpenFolder": "&&Ordner öffnen...",
- 	"miOpenFile": "Datei &&öffnen...",
- 	"miOpenRecent": "&&Zuletzt verwendete öffnen",
- 	"miSaveWorkspaceAs": "Arbeitsbereich speichern unter...",
- 	"miAddFolderToWorkspace": "Or&&dner zu Arbeitsbereich hinzufügen...",
-+=======
-+	"miOpenWorkspace": "&&Arbeitsbereich öffnen...",
-+	"miOpenFolder": "&&Ordner öffnen...",
-+	"miOpenFile": "Datei &&öffnen...",
-+	"miOpenRecent": "&&Zuletzt verwendete öffnen",
-+	"miSaveWorkspaceAs": "Arbeitsbereich &&speichern unter...",
-+	"miAddFolderToWorkspace": "&&Ordner zum Arbeitsbereich hinzufügen...",
-+>>>>>>> .their
- 	"miSave": "&&Speichern",
- 	"miSaveAs": "Speichern &&unter...",
- 	"miSaveAll": "A&&lles speichern",
-@@ -189,5 +198,11 @@
- 	"miDownloadingUpdate": "Das Update wird heruntergeladen...",
- 	"miInstallUpdate": "Update installieren …",
- 	"miInstallingUpdate": "Update wird installiert...",
-+<<<<<<< .our
- 	"miRestartToUpdate": "Zum Aktualisieren neu starten..."
-+=======
-+	"miCheckForUpdates": "Nach Aktualisierungen suchen...",
-+	"aboutDetail": "\nVersion {0}\nCommit {1}\nDatum {2}\nShell {3}\nRenderer {4}\nKnoten {5}\nArchitektur {6}",
-+	"okButton": "OK"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 72c02e88f7478215b5c092510d7d30463cfc6816 i18n/deu/src/vs/code/electron-main/windows.i18n.json
-  our    100644 9d74eacc42f56c4c4177eb5bc02c7e375a8b243a i18n/deu/src/vs/code/electron-main/windows.i18n.json
-  their  100644 04a3d636bd97d1557612d5df355b5020e4bb531b i18n/deu/src/vs/code/electron-main/windows.i18n.json
-@@ -9,15 +9,30 @@
- 	"ok": "OK",
- 	"pathNotExistTitle": "Der Pfad ist nicht vorhanden.",
- 	"pathNotExistDetail": "Der Pfad \"{0}\" scheint auf dem Datenträger nicht mehr vorhanden zu sein.",
-+<<<<<<< .our
- 	"reopen": "&&Erneut öffnen",
- 	"wait": "&&Bitte warten",
- 	"close": "&&Schließen",
-+=======
-+	"openWorkspace": "&&Öffnen",
-+	"openWorkspaceTitle": "Arbeitsbereich öffnen",
-+	"save": "&&Speichern",
-+	"doNotSave": "&&Nicht speichern",
-+	"cancel": "Abbrechen",
-+	"saveWorkspaceMessage": "Möchten Sie Ihre Arbeitsbereichskonfiguration als Datei speichern?",
-+	"saveWorkspaceDetail": "Speichern Sie Ihren Arbeitsbereich, wenn Sie ihn erneut öffnen möchten.",
-+	"saveWorkspace": "Arbeitsbereich speichern",
-+	"reopen": "Erneut öffnen",
-+	"wait": "Bitte warten.",
-+	"close": "Schließen",
-+>>>>>>> .their
- 	"appStalled": "Das Fenster reagiert nicht mehr.",
- 	"appStalledDetail": "Sie können das Fenster erneut öffnen oder schließen oder weiterhin warten.",
- 	"appCrashed": "Das Fenster ist abgestürzt.",
- 	"appCrashedDetail": "Bitte entschuldigen Sie die Unannehmlichkeiten. Sie können das Fenster erneut öffnen und dort weitermachen, wo Sie aufgehört haben.",
- 	"open": "Öffnen",
- 	"openFolder": "Ordner öffnen",
-+<<<<<<< .our
- 	"openFile": "Datei öffnen",
- 	"workspaceOpenedMessage": "Der Arbeitsbereich \"{0}\" kann nicht gespeichert werden.",
- 	"workspaceOpenedDetail": "Der Arbeitsbereich ist bereits in einem anderen Fenster geöffnet. Schließen Sie zuerst das andere Fenster, und versuchen Sie anschließend noch mal.",
-@@ -29,4 +44,7 @@
- 	"saveWorkspaceMessage": "Möchten Sie Ihre Arbeitsbereichskonfiguration als Datei speichern?",
- 	"saveWorkspaceDetail": "Speichern Sie Ihren Arbeitsbereich, wenn Sie ihn erneut öffnen möchten.",
- 	"saveWorkspace": "Arbeitsbereich speichern"
-+=======
-+	"openFile": "Datei öffnen"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/deu/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
-  our    100644 ac5ede63bdad3f517c243ff071879566adbbceae i18n/deu/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
-  their  100644 59257f107ffc766067dc0665995a1fe15aeb166b i18n/deu/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"diff.tooLarge": "Kann die Dateien nicht vergleichen, da eine Datei zu groß ist."
- }
-\ No newline at end of file
-changed in both
-  base   100644 c96d13745a4103d8bbf85f7bc914f575aae66dc6 i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 0cb95fccc47d309d94aacd1e25b0718fd455d527 i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 17755d6a385daf26998f275e045d23d5637293f7 i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -26,11 +26,17 @@
- 	"detectIndentation": "Beim Öffnen einer Datei werden \"editor.tabSize\" und \"editor.insertSpaces\" basierend auf den Dateiinhalten erkannt.",
- 	"roundedSelection": "Steuert, ob die Auswahl runde Ecken aufweist.",
- 	"scrollBeyondLastLine": "Legt fest, ob der Editor Bildläufe über die letzte Zeile hinaus ausführt.",
-+<<<<<<< .our
- 	"scrollBeyondLastColumn": "Steuert die Anzahl der zusätzlichen Zeichen, nach denen der Editor horizontal scrollt.",
- 	"smoothScrolling": "Legt fest, ob der Editor Bildläufe animiert ausführt.",
- 	"minimap.enabled": "Steuert, ob die Minikarte angezeigt wird",
- 	"minimap.side": "Steuert die Seite, wo die Minikarte gerendert wird.",
- 	"minimap.showSlider": "Steuert, ob der Minimap-Schieberegler automatisch ausgeblendet wird.",
-+=======
-+	"smoothScrolling": "Legt fest, ob der Editor Bildläufe animiert ausführt.",
-+	"minimap.enabled": "Steuert, ob die Minikarte angezeigt wird",
-+	"minimap.showSlider": "Steuert, ob der Minimap-Schieberegler automatisch ausgeblendet wird. Mögliche Werte sind \"always\" und \"mouseover\".",
-+>>>>>>> .their
- 	"minimap.renderCharacters": "Die tatsächlichen Zeichen in einer Zeile rendern (im Gegensatz zu Farbblöcken)",
- 	"minimap.maxColumn": "Breite der Minikarte beschränken, um höchstens eine bestimmte Anzahl von Spalten zu rendern",
- 	"find.seedSearchStringFromSelection": "Steuert, ob wir für die Suchzeichenfolge im Suchwidget aus der Editorauswahl ein Seeding ausführen.",
-@@ -106,11 +112,14 @@
- 	"accessibilitySupport": "Steuert, ob der Editor in einem Modus ausgeführt werden soll, in dem er für die Sprachausgabe optimiert wird.",
- 	"links": "Steuert, ob der Editor Links erkennen und anklickbar machen soll",
- 	"colorDecorators": "Steuert, ob der Editor die Inline-Farbdecorators und die Farbauswahl rendern soll.",
-+<<<<<<< .our
- 	"codeActions": "Ermöglicht die Code-Aktion \"lightbulb\"",
- 	"codeActionsOnSave.organizeImports": "Ein Organisieren der Importe beim Speichern ausführen?",
- 	"codeActionsOnSave": "Arten von Codeaktionen, die beim Speichern ausgeführt werden sollen.",
- 	"codeActionsOnSaveTimeout": "Timeout für Codeaktionen, die beim Speichern ausgeführt werden.",
- 	"selectionClipboard": "Steuert, ob die primäre Linux-Zwischenablage unterstützt werden soll.",
-+=======
-+>>>>>>> .their
- 	"sideBySide": "Steuert, ob der Diff-Editor das Diff nebeneinander oder inline anzeigt.",
- 	"ignoreTrimWhitespace": "Steuert, ob der Diff-Editor Änderungen in führenden oder nachgestellten Leerzeichen als Diffs anzeigt.",
- 	"largeFileOptimizations": "Spezielle Behandlung für große Dateien zum Deaktivieren bestimmter speicherintensiver Funktionen.",
-changed in both
-  base   100644 56e0924a36c8f29bc1b45ad635d4feda8d334958 i18n/deu/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 7bcd160f251f75f4318d89da439565bbd4c696e5 i18n/deu/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 59473c90e69f83ed665d210662f92fe84008ec4b i18n/deu/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -28,12 +28,16 @@
- 	"errorBorder": "Rahmenfarbe von Fehlerunterstreichungen im Editor.",
- 	"warningForeground": "Vordergrundfarbe von Warnungsunterstreichungen im Editor.",
- 	"warningBorder": "Rahmenfarbe von Warnungsunterstreichungen im Editor.",
-+<<<<<<< .our
- 	"infoForeground": "Vordergrundfarbe von Informationsunterstreichungen im Editor.",
- 	"infoBorder": "Rahmenfarbe von Informationsunterstreichungen im Editor.",
- 	"hintForeground": "Vordergrundfarbe der Hinweisunterstreichungen im Editor.",
- 	"hintBorder": "Rahmenfarbe der Hinweisunterstreichungen im Editor.",
- 	"unnecessaryForeground": "Vordergrundfarbe für nicht benötigten Code im Editor.",
- 	"overviewRulerRangeHighlight": "Übersichtslineal-Markierungsfarbe für Bereichshervorhebungen. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen.",
-+=======
-+	"overviewRulerRangeHighlight": "Übersichtslineal-Markierungsfarbe für Bereichshervorhebungen.",
-+>>>>>>> .their
- 	"overviewRuleError": "Übersichtslineal-Markierungsfarbe für Fehler.",
- 	"overviewRuleWarning": "Übersichtslineal-Markierungsfarbe für Warnungen.",
- 	"overviewRuleInfo": "Übersichtslineal-Markierungsfarbe für Informationen."
-changed in both
-  base   100644 1766611d9a43ced4e1ebee10a06185f7cb9b8533 i18n/deu/src/vs/editor/contrib/find/common/findController.i18n.json
-  our    100644 966c9eafe93d9687633b93001e9f81c1a52554ac i18n/deu/src/vs/editor/contrib/find/common/findController.i18n.json
-  their  100644 a704a48537415cf89b16a1f544157c105f361124 i18n/deu/src/vs/editor/contrib/find/common/findController.i18n.json
-@@ -10,6 +10,15 @@
- 	"nextSelectionMatchFindAction": "Nächste Auswahl suchen",
- 	"previousSelectionMatchFindAction": "Vorherige Auswahl suchen",
- 	"startReplace": "Ersetzen",
-+<<<<<<< .our
-+=======
-+	"addSelectionToNextFindMatch": "Auswahl zur nächsten Übereinstimmungssuche hinzufügen",
-+	"addSelectionToPreviousFindMatch": "Letzte Auswahl zu vorheriger Übereinstimmungssuche hinzufügen",
-+	"moveSelectionToNextFindMatch": "Letzte Auswahl in nächste Übereinstimmungssuche verschieben",
-+	"moveSelectionToPreviousFindMatch": "Letzte Auswahl in vorherige Übereinstimmungssuche verschieben",
-+	"selectAllOccurrencesOfFindMatch": "Alle Vorkommen auswählen und Übereinstimmung suchen",
-+	"changeAll.label": "Alle Vorkommen ändern",
-+>>>>>>> .their
- 	"showNextFindTermAction": "Nächsten Suchbegriff anzeigen",
- 	"showPreviousFindTermAction": "Vorherigen Suchbegriff anzeigen"
- }
-\ No newline at end of file
-changed in both
-  base   100644 02d8b1577c90a2d2ef7621d1a28845d406c74c72 i18n/deu/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
-  our    100644 d706ff2e9b2d0d291ab89967a844b41798e381a1 i18n/deu/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
-  their  100644 94efbce2ea8a1d11e71aaf26867a375b27fb7d80 i18n/deu/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
-@@ -7,7 +7,11 @@
- 	"wordHighlight": "Hintergrundfarbe eines Symbols beim Lesezugriff (beispielsweise beim Lesen einer Variablen).",
- 	"wordHighlightStrong": "Hintergrundfarbe eines Symbols beim Schreibzugriff (beispielsweise beim Schreiben in eine Variable).",
- 	"overviewRulerWordHighlightForeground": "Übersichtslineal-Markierungsfarbe für Symbolhervorhebungen.",
-+<<<<<<< .our
- 	"overviewRulerWordHighlightStrongForeground": "Übersichtslineal-Markierungsfarbe für Schreibzugriffs-Symbolhervorhebungen.",
- 	"wordHighlight.next.label": "Gehe zur nächsten Symbolhervorhebungen",
- 	"wordHighlight.previous.label": "Gehe zur vorherigen Symbolhervorhebungen"
-+=======
-+	"overviewRulerWordHighlightStrongForeground": "Übersichtslineal-Markierungsfarbe für Schreibzugriffs-Symbolhervorhebungen."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 058d98933af624c394c9044f64ed4faeb435668b i18n/deu/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 f6bdb0310262230d9fd3311d63fcfc0ae9c687d8 i18n/deu/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 d8e52e65222f6ede56f758fe8fd49e17e648e62d i18n/deu/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,9 +10,12 @@
- 	"diff": "Vergleicht zwei Dateien.",
- 	"add": "Fügt einen oder mehrere Ordner zum letzten aktiven Fenster hinzu.",
- 	"goto": "Öffnet eine Datei im Pfad in der angegebenen Zeile und an der Zeichenposition.",
-+<<<<<<< .our
- 	"newWindow": "Öffnen eines neuen Fensters erzwingen.",
- 	"reuseWindow": "Öffnen einer Datei oder eines Ordners im letzten aktiven Fenster erzwingen.",
- 	"wait": "Warten Sie, bis die Dateien geschlossen sind, bevor Sie zurück gehen können.",
-+=======
-+>>>>>>> .their
- 	"locale": "Das zu verwendende Gebietsschema (z. B. en-US oder zh-TW).",
- 	"userDataDir": "Gibt das Verzeichnis an, in dem Benutzerdaten gespeichert werden. Kann zum Öffnen mehrerer verschiedener Codeinstanzen verwendet werden.",
- 	"version": "Gibt die Version aus.",
-changed in both
-  base   100644 88af0de928a075c57bf0edcda7af629cebae0f76 i18n/deu/src/vs/platform/history/electron-main/historyMainService.i18n.json
-  our    100644 45518a8f05289158f9a6a01043e48b1d666c428a i18n/deu/src/vs/platform/history/electron-main/historyMainService.i18n.json
-  their  100644 5d0462e717abf9f06c780a93cc6b7e9a8599fc32 i18n/deu/src/vs/platform/history/electron-main/historyMainService.i18n.json
-added in both
-  our    100644 ee2ed63656ed9d42c8e5a6cd7e273abffefac671 i18n/deu/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
-  their  100644 b2fc3c591a61ca5d4c6eb5d0ad35bae28eb43764 i18n/deu/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"contributes.color": "Fügt in Erweiterung definierte verwendbare Farben hinzu",
- 	"contributes.color.id": "Der Bezeichner der verwendbaren Farbe",
- 	"contributes.color.id.format": "Bezeichner sollten in folgendem Format vorliegen: aa [.bb] *",
-@@ -17,6 +26,10 @@
- 	"invalid.default.colorType": "{0} muss entweder eine Farbe als Hex-Code (#RRGGBB[AA] oder #RGB[A]) sein oder der Bezeichner einer verwendbaren Farbe, der eine Standardeinstellung bereitstellt.",
- 	"invalid.id": "\"configuration.colors.id\" muss definiert und nicht leer sein",
- 	"invalid.id.format": "\"configuration.colors.id\" muss auf das Wort[.word]* folgen",
-+<<<<<<< .our
- 	"invalid.description": "\"configuration.colors.description\" muss definiert und darf nicht leer sein",
-+=======
-+	"invalid.description": "\"configuration.colors.description\" muss definiert und nicht leer sein",
-+>>>>>>> .their
- 	"invalid.defaults": "\"configuration.colors.defaults\" muss definiert sein, und \"light\", \"dark\" und \"highContrast\" enthalten"
- }
-\ No newline at end of file
-changed in both
-  base   100644 a66c145ad23e2875a00249a655ef7abe470978bd i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 b32f03c31fd5ffcb9742f2b1188daade81a7b028 i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 a26d1d4b9352683bc2288e317b6184a23ba5318c i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -60,7 +60,11 @@
- 	"scrollbarShadow": "Schatten der Scrollleiste, um anzuzeigen, dass die Ansicht gescrollt wird.",
- 	"scrollbarSliderBackground": "Hintergrundfarbe vom Scrollbar-Schieber",
- 	"scrollbarSliderHoverBackground": "Hintergrundfarbe des Schiebereglers, wenn darauf gezeigt wird.",
-+<<<<<<< .our
- 	"scrollbarSliderActiveBackground": "Hintergrundfarbe des Schiebereglers, wenn darauf geklickt wird.",
-+=======
-+	"scrollbarSliderActiveBackground": "Hintergrundfarbe des Schiebereglers, wenn dieser aktiv ist.",
-+>>>>>>> .their
- 	"progressBarBackground": "Hintergrundfarbe des Fortschrittbalkens, der für lang ausgeführte Vorgänge angezeigt werden kann.",
- 	"editorBackground": "Hintergrundfarbe des Editors.",
- 	"editorForeground": "Standardvordergrundfarbe des Editors.",
-@@ -96,6 +100,11 @@
- 	"overviewRulerCurrentContentForeground": "Aktueller Übersichtslineal-Vordergrund für Inline-Mergingkonflikte.",
- 	"overviewRulerIncomingContentForeground": "Eingehender Übersichtslineal-Vordergrund für Inline-Mergingkonflikte. ",
- 	"overviewRulerCommonContentForeground": "Hintergrund des Übersichtslineals des gemeinsamen übergeordneten Elements bei Inlinezusammenführungskonflikten.",
-+<<<<<<< .our
- 	"overviewRulerFindMatchForeground": "Übersichtslineal-Markierungsfarbe für Suchübereinstimmungen. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen.",
- 	"overviewRulerSelectionHighlightForeground": "Übersichtslineal-Markierungsfarbe für Auswahlhervorhebungen. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen."
-+=======
-+	"overviewRulerFindMatchForeground": "Übersichtslineal-Markierungsfarbe für Suchübereinstimmungen.",
-+	"overviewRulerSelectionHighlightForeground": "Übersichtslineal-Markierungsfarbe für Auswahlhervorhebungen."
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 9267e4f176226a70a1cde0204ac8582737a43282 i18n/deu/src/vs/platform/workspaces/common/workspaces.i18n.json
-  their  100644 7da0a031def21be51f2dc3d7f6bda1346277ae01 i18n/deu/src/vs/platform/workspaces/common/workspaces.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"codeWorkspace": "Codearbeitsbereich",
- 	"untitledWorkspace": "Ohne Titel (Arbeitsbereich)",
- 	"workspaceNameVerbose": "{0} (Arbeitsbereich)",
-added in both
-  our    100644 409eb14cc60ca89dd42662a902efe4f79b43e713 i18n/deu/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
-  their  100644 76ebdf6051e953bc07912dde49e3b846948b4867 i18n/deu/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,4 +11,16 @@
- 	"failedDep1": "Fehler beim Aktivieren der Erweiterung \"{1}\". Ursache: Fehler beim Aktivieren der Erweiterung \"{0}\".",
- 	"failedDep2": "Fehler beim Aktivieren der Erweiterung \"{0}\". Ursache: mehr als 10 Ebenen von Abhängigkeiten (wahrscheinlich eine Abhängigkeitsschleife).",
- 	"activationError": "Fehler beim Aktivieren der Erweiterung \"{0}\": {1}."
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"unknownDep": "Fehler beim Aktivieren der Extension \"{1}\". Ursache: unbekannte Abhängigkeit \"{0}\".",
-+	"failedDep1": "Fehler beim Aktivieren der Extension \"{1}\". Ursache: Fehler beim Aktivieren der Extension \"{0}\".",
-+	"failedDep2": "Fehler beim Aktivieren der Extension \"{0}\". Ursache: mehr als 10 Ebenen von Abhängigkeiten (wahrscheinlich eine Abhängigkeitsschleife).",
-+	"activationError": "Fehler beim Aktivieren der Extension \"{0}\": {1}."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 2c55bed538b95582b0288d9d5439abd117bf4051 i18n/deu/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 108a8fac6be8b55e95f04920e7eb7dd21d592b50 i18n/deu/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 4529b938efc32949ff64fa91050b9ccf430fed30 i18n/deu/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -9,6 +9,7 @@
- 	"openFile": "Datei öffnen...",
- 	"openFolder": "Ordner öffnen...",
- 	"openFileFolder": "Öffnen...",
-+<<<<<<< .our
- 	"globalRemoveFolderFromWorkspace": "Ordner aus dem Arbeitsbereich entfernen...",
- 	"saveWorkspaceAsAction": "Arbeitsbereich speichern unter...",
- 	"save": "&&Speichern",
-@@ -16,4 +17,19 @@
- 	"openWorkspaceAction": "Arbeitsbereich öffnen...",
- 	"openWorkspaceConfigFile": "Konfigurationsdatei des Arbeitsbereichs öffnen",
- 	"duplicateWorkspaceInNewWindow": "Duplikat des Arbeitsbereichs in neuem Fenster erstellen"
-+=======
-+	"addFolderToWorkspace": "Ordner zum Arbeitsbereich hinzufügen...",
-+	"add": "&&Hinzufügen",
-+	"addFolderToWorkspaceTitle": "Ordner zum Arbeitsbereich hinzufügen",
-+	"newWorkspace": "Neuer Arbeitsbereich...",
-+	"select": "Au&&swählen",
-+	"selectWorkspace": "Ordner für den Arbeitsbereich auswählen",
-+	"removeFolderFromWorkspace": "Ordner aus dem Arbeitsbereich entfernen",
-+	"saveWorkspaceAsAction": "Arbeitsbereich speichern unter...",
-+	"saveEmptyWorkspaceNotSupported": "Öffnen Sie zum Speichern zunächst einen Arbeitsbereich.",
-+	"save": "&&Speichern",
-+	"saveWorkspace": "Arbeitsbereich speichern",
-+	"openWorkspaceAction": "Arbeitsbereich öffnen...",
-+	"openWorkspaceConfigFile": "Konfigurationsdatei des Arbeitsbereichs öffnen"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 fe0b21dfd66febbed8bf102e75453a40160608a1 i18n/deu/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 bfd72770d07a936659f4d75458f1721e0e96ed8a i18n/deu/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 16d380370f6bc4cc58af60318a0b34dfbd39cef1 i18n/deu/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 870bcf2795a5d391ab44802e1eed9744de058680 i18n/deu/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-  our    100644 5aff102ff6f5b6ee71757498b4052435747a48e1 i18n/deu/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-  their  100644 e6a573610242b0b95a887f31475333c9b1137171 i18n/deu/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,9 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"compositePart.hideSideBarLabel": "Randleiste ausblenden",
-+>>>>>>> .their
- 	"focusSideBar": "Fokus in Randleiste",
- 	"viewCategory": "Anzeigen"
- }
-\ No newline at end of file
-changed in both
-  base   100644 20f046bd07c9af448cefee7b7fe475a9e04d8b7c i18n/deu/src/vs/workbench/common/theme.i18n.json
-  our    100644 7230e04365d13635c1ebe9cad1ed0f92866146cc i18n/deu/src/vs/workbench/common/theme.i18n.json
-  their  100644 dffcebfcfe5ffb97ec6da8143d5c6eba8616ecb1 i18n/deu/src/vs/workbench/common/theme.i18n.json
-@@ -11,12 +11,17 @@
- 	"tabHoverBackground": "Hintergrundfarbe der Registerkarte beim Daraufzeigen. Registerkarten sind die Container für Editoren im Editorbereich. In einer Editorgruppe können mehrere Registerkarten geöffnet werden. Mehrere Editorgruppen können vorhanden sein.",
- 	"tabUnfocusedHoverBackground": "Hintergrundfarbe für Registerkarten in einer unfokussierten Gruppe beim Daraufzeigen. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.",
- 	"tabBorder": "Rahmen zum Trennen von Registerkarten. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.",
-+<<<<<<< .our
- 	"tabActiveBorder": "Rahmen am unteren Rand einer aktiven Registerkarte. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.",
- 	"tabActiveBorderTop": "Rahmen am oberen Rand einer aktiven Registerkarte. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.",
- 	"tabActiveUnfocusedBorder": "Rahmen am unteren Rand einer aktiven Registerkarte in einer unfokussierten Gruppe. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.",
- 	"tabActiveUnfocusedBorderTop": "Rahmen am oberen Rand einer aktiven Registerkarte in einer unfokussierten Gruppe. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.",
- 	"tabHoverBorder": "Rahmen zum Hervorheben von Registerkarten beim Daraufzeigen. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.",
- 	"tabUnfocusedHoverBorder": "Rahmen zum Hervorheben von Registerkarten in einer unfokussierten Gruppe beim Daraufzeigen. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.",
-+=======
-+	"tabActiveBorder": "Rahmen zum Hervorheben aktiver Registerkarten. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.",
-+	"tabActiveUnfocusedBorder": "Rahmen zum Hervorheben aktiver Registerkarten in einer unfokussierten Gruppe. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.",
-+>>>>>>> .their
- 	"tabActiveForeground": "Vordergrundfarbe der aktiven Registerkarte in einer aktiven Gruppe. Registerkarten sind die Container für Editors im Editorbereich. In einer Editorgruppe können mehrere Registerkarten geöffnet werden. Mehrere Editorgruppen können vorhanden sein.",
- 	"tabInactiveForeground": "Vordergrundfarbe der inaktiven Registerkarte in einer aktiven Gruppe. Registerkarten sind die Container für Editors im Editorbereich. In einer Editorgruppe können mehrere Registerkarten geöffnet werden. Mehrere Editorgruppen können vorhanden sein.",
- 	"tabUnfocusedActiveForeground": "Vordergrundfarbe für aktive Registerkarten in einer unfokussierten Gruppe. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.",
-@@ -32,7 +37,10 @@
- 	"panelActiveTitleForeground": "Titelfarbe für den aktiven Bereich. Bereiche werden unter dem Editorbereich angezeigt und enthalten Ansichten wie Ausgabe und integriertes Terminal.",
- 	"panelInactiveTitleForeground": "Titelfarbe für den inaktiven Bereich. Bereiche werden unter dem Editorbereich angezeigt und enthalten Ansichten wie Ausgabe und integriertes Terminal.",
- 	"panelActiveTitleBorder": "Rahmenfarbe für den Titel des aktiven Bereichs. Bereiche werden unter dem Editorbereich angezeigt und enthalten Ansichten wie Ausgabe und integriertes Terminal.",
-+<<<<<<< .our
- 	"panelDragAndDropBackground": "Drag & Drop-Feedbackfarbe für die Paneltitelelemente. Die Farbe muss transparent sein, damit die Paneleinträge noch sichtbar sind. Panels werden unter dem Editorbereich angezeigt und enthalten Ansichten wie die Ausgabe und das integrierte Terminal.",
-+=======
-+>>>>>>> .their
- 	"statusBarForeground": "Vordergrundfarbe der Statusleiste beim Öffnen eines Arbeitsbereichs. Die Statusleiste wird unten im Fenster angezeigt.",
- 	"statusBarNoFolderForeground": "Vordergrundfarbe der Statusleiste, wenn kein Ordner geöffnet ist. Die Statusleiste wird unten im Fenster angezeigt.",
- 	"statusBarBackground": "Hintergrundfarbe der Statusleiste beim Öffnen eines Arbeitsbereichs. Die Statusleiste wird unten im Fenster angezeigt.",
-@@ -61,6 +69,7 @@
- 	"titleBarActiveBackground": "Hintergrund der Titelleiste, wenn das Fenster aktiv ist. Diese Farbe wird derzeit nur von MacOS unterstützt.",
- 	"titleBarInactiveBackground": "Hintergrund der Titelleiste, wenn das Fenster inaktiv ist. Diese Farbe wird derzeit nur von MacOS unterstützt.",
- 	"titleBarBorder": "Rahmenfarbe der Titelleiste. Diese Farbe wird derzeit nur unter MacOS unterstützt.",
-+<<<<<<< .our
- 	"notificationCenterBorder": "Rahmenfarbe der Benachrichtigungszentrale. Benachrichtigungen werden unten rechts eingeblendet.",
- 	"notificationToastBorder": "Rahmenfarbe der Popupbenachrichtigung. Benachrichtigungen werden unten rechts eingeblendet.",
- 	"notificationsForeground": "Vordergrundfarbe für Benachrichtigungen. Benachrichtigungen werden unten rechts eingeblendet.",
-@@ -69,4 +78,17 @@
- 	"notificationCenterHeaderForeground": "Vordergrundfarbe für Kopfzeile der Benachrichtigungszentrale. Benachrichtigungen werden unten rechts eingeblendet.",
- 	"notificationCenterHeaderBackground": "Hintergrundfarbe für Kopfzeile der Benachrichtigungszentrale. Benachrichtigungen werden unten rechts eingeblendet.",
- 	"notificationsBorder": "Rahmenfarbe für Benachrichtigungen zum Trennen von anderen Benachrichtigungen in der Benachrichtigungszentrale. Benachrichtigungen werden unten rechts eingeblendet."
-+=======
-+	"notificationsForeground": "Vordergrundfarbe für Benachrichtigungen. Benachrichtigungen werden oben im Fenster eingeblendet.",
-+	"notificationsBackground": "Hintergrundfarbe für Benachrichtigungen. Benachrichtigungen werden oben im Fenster eingeblendet.",
-+	"notificationsButtonBackground": "Hintergrundfarbe der Benachrichtigungsschaltfläche. Benachrichtigungen werden oben im Fenster eingeblendet.",
-+	"notificationsButtonHoverBackground": "Hintergrundfarbe der Benachrichtigungsschaltfläche, wenn darauf gezeigt wird. Benachrichtigungen werden oben im Fenster eingeblendet.",
-+	"notificationsButtonForeground": "Vordergrundfarbe der Benachrichtigungsschaltfläche. Benachrichtigungen werden oben im Fenster eingeblendet.",
-+	"notificationsInfoBackground": "Hintergrundfarbe von Benachrichtigungsinformationen. Benachrichtigungen werden oben im Fenster eingeblendet.",
-+	"notificationsInfoForeground": "Vordergrundfarbe von Benachrichtigungsinformationen. Benachrichtigungen werden oben im Fenster eingeblendet.",
-+	"notificationsWarningBackground": "Hintergrundfarbe von Benachrichtigungswarnungen. Benachrichtigungen werden oben im Fenster eingeblendet.",
-+	"notificationsWarningForeground": "Vordergrundfarbe von Benachrichtigungswarnungen. Benachrichtigungen werden oben im Fenster eingeblendet.",
-+	"notificationsErrorBackground": "Hintergrundfarbe von Benachrichtigungsfehlern. Benachrichtigungen werden oben im Fenster eingeblendet.",
-+	"notificationsErrorForeground": "Vordergrundfarbe von Benachrichtigungsfehlern. Benachrichtigungen werden oben im Fenster eingeblendet."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6af3818bfee8e5b3f41e793e98c9b72f1ec25025 i18n/deu/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 1609e7c92719c7aa89402c8bf0018971f9a1043e i18n/deu/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 fc58109765ade07d20b81f82323a32e9e4aae440 i18n/deu/src/vs/workbench/electron-browser/actions.i18n.json
-changed in both
-  base   100644 624c0ec5539441248b4a9ef99c15411932a20f51 i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 fc92fd392259fb9b2d1dec1cecdbc3c76bdc7440 i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 908ac5f9840805490661d6af4100fed1bd354029 i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,6 +35,7 @@
- 	"panelDefaultLocation": "Steuert die Standardposition des Panels. Dieses kann entweder unterhalb oder rechts von der Workbench angezeigt werden.",
- 	"statusBarVisibility": "Steuert die Sichtbarkeit der Statusleiste im unteren Bereich der Workbench.",
- 	"activityBarVisibility": "Steuert die Sichtbarkeit der Aktivitätsleiste in der Workbench.",
-+<<<<<<< .our
- 	"viewVisibility": "Steuert die Sichtbarkeit von Headeraktionen. Headeraktionen können immer sichtbar sein oder nur sichtbar sein, wenn diese Ansicht fokussiert ist oder mit der Maus darauf gezeigt wird.",
- 	"fontAliasing": "Steuert die Schriftartaliasingmethode in der Workbench.\n - default: Subpixel-Schriftartglättung. Auf den meisten Nicht-Retina-Displays wird Text bei dieser Einstellung am schärfsten dargestellt. \n- antialiased: Glättet die Schriftart auf der Pixelebene (im Gegensatz zur Subpixelebene). Bei dieser Einstellung kann die Schriftart insgesamt heller wirken.\n- none: Deaktiviert die Schriftartglättung. Text wird mit gezackten scharfen Kanten dargestellt.\n- auto: Wendet ausgehend vom DPI der Anzeige automatisch \"default\" oder \"antialiased\" an.",
- 	"workbench.fontAliasing.default": "Subpixel-Schriftartglättung. Auf den meisten Nicht-Retina-Displays wird Text bei dieser Einstellung am schärfsten dargestellt.",
-@@ -43,6 +44,15 @@
- 	"workbench.fontAliasing.auto": "Wendet ausgehend vom DPI der Anzeige automatisch \"default\" oder \"antialiased\" an.",
- 	"enableNaturalLanguageSettingsSearch": "Steuert, ob der Suchmodus mit natürlicher Sprache für die Einstellungen aktiviert werden soll.",
- 	"windowConfigurationTitle": "Fenster",
-+=======
-+	"closeOnFileDelete": "Steuert, ob Editoren, die eine Datei anzeigen, automatisch geschlossen werden sollen, wenn die Datei von einem anderen Prozess umbenannt oder gelöscht wird. Wenn Sie diese Option deaktivieren, bleibt der Editor bei einem solchen Ereignis als geändert offen. Bei Löschvorgängen innerhalb der Anwendung wird der Editor immer geschlossen, und geänderte Dateien werden nie geschlossen, damit Ihre Daten nicht verloren gehen.",
-+	"fontAliasing": "Steuert die Schriftartaliasingmethode in der Workbench.\n- default: Subpixel-Schriftartglättung. Auf den meisten Nicht-Retina-Displays wird Text bei dieser Einstellung am schärfsten dargestellt.\n- antialiased: Glättet die Schriftart auf der Pixelebene (im Gegensatz zur Subpixelebene). Bei dieser Einstellung kann die Schriftart insgesamt heller wirken.\n- none: Deaktiviert die Schriftartglättung. Text wird mit gezackten scharfen Kanten dargestellt.\n",
-+	"workbench.fontAliasing.default": "Subpixel-Schriftartglättung. Auf den meisten Nicht-Retina-Displays wird Text bei dieser Einstellung am schärfsten dargestellt.",
-+	"workbench.fontAliasing.antialiased": "Glättet die Schriftart auf der Pixelebene (im Gegensatz zur Subpixelebene). Bei dieser Einstellung kann die Schriftart insgesamt heller wirken.",
-+	"workbench.fontAliasing.none": "Deaktiviert die Schriftartglättung. Text wird mit gezackten scharfen Kanten dargestellt.",
-+	"swipeToNavigate": "Hiermit navigieren Sie per waagrechtem Wischen mit drei Fingen zwischen geöffneten Dateien.",
-+	"workbenchConfigurationTitle": "Workbench",
-+>>>>>>> .their
- 	"window.openFilesInNewWindow.on": "Dateien werden in einem neuen Fenster geöffnet.",
- 	"window.openFilesInNewWindow.off": "Dateien werden im Fenster mit dem geöffneten Dateiordner oder im letzten aktiven Fenster geöffnet.",
- 	"window.openFilesInNewWindow.defaultMac": "Dateien werden im Fenster mit dem geöffneten Dateiordner oder im letzten aktiven Fenster geöffnet, sofern sie nicht über das Dock oder den Finder geöffnet werden.",
-changed in both
-  base   100644 fcfa5e59e8fdf81b9992c20f1c90353fe5155167 i18n/deu/src/vs/workbench/electron-browser/window.i18n.json
-  our    100644 4c4d3d858c118a5c816610f7b78e3f49ca6d0d66 i18n/deu/src/vs/workbench/electron-browser/window.i18n.json
-  their  100644 dac54eb81af521a636bd69231e013783a6901dbf i18n/deu/src/vs/workbench/electron-browser/window.i18n.json
-@@ -11,6 +11,10 @@
- 	"cut": "Ausschneiden",
- 	"copy": "Kopieren",
- 	"paste": "Einfügen",
-+<<<<<<< .our
- 	"selectAll": "Alles auswählen",
- 	"runningAsRoot": "Es wird nicht empfohlen, {0} als Root-Benutzer auszuführen."
-+=======
-+	"selectAll": "Alles auswählen"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 f4b4719cc7da6232ceb6fe54170509b187a9caa5 i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
-  their  100644 6e8241b309f26909993fb94386884bd3fd925d8f i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"toggleMinimap": "Ansicht: Minikarte umschalten"
- }
-\ No newline at end of file
-changed in both
-  base   100644 a6a0523716f95dc39cd3cb5a7372611f4d8390fb i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
-  our    100644 cf06278fb8efa8243d0e892f569d35e6d6d8a528 i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
-  their  100644 09199c6fa3200534f4192f76a751b470b646e126 i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"toggleRenderControlCharacters": "Ansicht: Steuerzeichen umschalten"
- }
-\ No newline at end of file
-changed in both
-  base   100644 1c96dfb4c00a19189699cc8c1e0f43ed00f0be10 i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
-  our    100644 07f7b4a3cf3ad4b1df419415ba283f757853db63 i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
-  their  100644 4fad63eb3219f6abe5adb8d9d4df5dee84e79e2f i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"toggleRenderWhitespace": "Ansicht: Rendern von Leerzeichen umschalten"
- }
-\ No newline at end of file
-changed in both
-  base   100644 3886214271ecc8b5e3610f8a547dced7cdbe45b2 i18n/deu/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  our    100644 ddda783ca8462bb00a69ac063609b63009b0e769 i18n/deu/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  their  100644 f8f92c8accfaf85b6f77866ad235403d02144ce7 i18n/deu/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-changed in both
-  base   100644 57d2b6200423f3560ec630b7fb173184d283237d i18n/deu/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  our    100644 d4395810a2fe1de4942de018b95fcee0dd85b088 i18n/deu/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  their  100644 3de79db297ebde37bcde55d475d1dae0fc159314 i18n/deu/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-changed in both
-  base   100644 1bcee0dbf6e04302caa1169b7b59e62c1f2e5f40 i18n/deu/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  our    100644 9b039afb7e7129891b940975939709ed5db6f52c i18n/deu/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  their  100644 db6aa85dc0e1bc58391b22da3f3e548b5dcbb996 i18n/deu/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-@@ -8,6 +8,23 @@
- 	],
- 	"debugAdapterBinNotFound": "Die ausführbare Datei \"{0}\" des Debugadapters ist nicht vorhanden.",
- 	"debugAdapterCannotDetermineExecutable": "Die ausführbare Datei \"{0}\" des Debugadapters kann nicht bestimmt werden.",
-+<<<<<<< .our
- 	"unableToLaunchDebugAdapter": "Der Debugadapter kann nicht aus {0} gestartet werden.",
- 	"unableToLaunchDebugAdapterNoArgs": "Debugadapter kann nicht gestartet werden."
-+=======
-+	"launch.config.comment1": "Verwendet IntelliSense zum Ermitteln möglicher Attribute.",
-+	"launch.config.comment2": "Zeigen Sie auf vorhandene Attribute, um die zugehörigen Beschreibungen anzuzeigen.",
-+	"launch.config.comment3": "Weitere Informationen finden Sie unter {0}",
-+	"debugType": "Der Typ der Konfiguration.",
-+	"debugTypeNotRecognised": "Dieser Debugging-Typ wurde nicht erkannt. Bitte installieren und aktivieren Sie die dazugehörige Debugging-Erweiterung.",
-+	"node2NotSupported": "\"node2\" wird nicht mehr unterstützt, verwenden Sie stattdessen \"node\", und legen Sie das Attribut \"protocol\" auf \"inspector\" fest.",
-+	"debugName": "Der Name der Konfiguration. Er wird im Dropdownmenü der Startkonfiguration angezeigt.",
-+	"debugRequest": "Der Anforderungstyp der Konfiguration. Der Wert kann \"launch\" oder \"attach\" sein.",
-+	"debugServer": "Nur für die Entwicklung von Debugerweiterungen: Wenn ein Port angegeben ist, versucht der VS-Code, eine Verbindung mit einem Debugadapter herzustellen, der im Servermodus ausgeführt wird.",
-+	"debugPrelaunchTask": "Ein Task, der ausgeführt werden soll, bevor die Debugsitzung beginnt.",
-+	"debugWindowsConfiguration": "Windows-spezifische Startkonfigurationsattribute.",
-+	"debugOSXConfiguration": "OS X-spezifische Startkonfigurationsattribute.",
-+	"debugLinuxConfiguration": "Linux-spezifische Startkonfigurationsattribute.",
-+	"deprecatedVariables": "\"env.\", \"config.\" und \"command.\" sind veraltet, verwenden Sie stattdessen \"env:\", \"config:\" und \"command:\"."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f14a2f53165cd54ca89c3c268e1afcd90307a746 i18n/deu/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  our    100644 ffcb91c35c3b84aa761f9cf48403d04cda0e5ae4 i18n/deu/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  their  100644 0b10a0310640832c8a3915fac3d07fdb8efec6d2 i18n/deu/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-changed in both
-  base   100644 0e32d73283c0620025905bbab284e509d3d2515b i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 cf7a07fdcb5de4fa57ac5ab17021ee98e54c3fc8 i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 e6677c7d0b8264ea4f7b84764ef5bc678bd8ef62 i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-@@ -52,7 +52,14 @@
- 	"extensionInstalled": "Die empfohlene Erweiterung wurde bereits installiert.",
- 	"showRecommendedKeymapExtensionsShort": "Tastenzuordnungen",
- 	"showLanguageExtensionsShort": "Spracherweiterungen",
-+<<<<<<< .our
- 	"showAzureExtensionsShort": "Azure-Erweiterungen",
-+=======
-+	"showAzureExtensions": "Azure-Erweiterungen anzeigen",
-+	"showAzureExtensionsShort": "Azure-Erweiterungen",
-+	"configureWorkspaceRecommendedExtensions": "Empfohlene Erweiterungen konfigurieren (Arbeitsbereich)",
-+	"ConfigureWorkspaceRecommendations.noWorkspace": "Empfehlungen sind nur für einen Arbeitsbereichsordner verfügbar.",
-+>>>>>>> .their
- 	"OpenExtensionsFile.failed": "Die Datei \"extensions.json\" kann nicht im Ordner \".vscode\" erstellt werden ({0}).",
- 	"configureWorkspaceRecommendedExtensions": "Empfohlene Erweiterungen konfigurieren (Arbeitsbereich)",
- 	"configureWorkspaceFolderRecommendedExtensions": "Empfohlene Erweiterungen konfigurieren (Arbeitsbereichsordner)",
-changed in both
-  base   100644 72876f0d4f678b46d6769e17f4a17b069b6c2c6d i18n/deu/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
-  our    100644 46de1e8541a805d4182b71abb75b9857226854c4 i18n/deu/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
-  their  100644 bc53701d4ae437060ca49f98787d0548028622e4 i18n/deu/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
-@@ -4,7 +4,11 @@
-  *--------------------------------------------------------------------------------------------*/
- // Do not edit this file. It is machine generated.
- {
-+<<<<<<< .our
- 	"filesCategory": "Datei",
-+=======
-+	"filesCategory": "Dateien",
-+>>>>>>> .their
- 	"revealInSideBar": "In Seitenleiste anzeigen",
- 	"acceptLocalChanges": "Änderungen verwenden und Datenträgerinhalte überschreiben",
- 	"revertLocalChanges": "Änderungen verwerfen und Datenträgerinhalte wiederherstellen"
-changed in both
-  base   100644 074e91a4e393e893480513aabe524f59da0b145c i18n/deu/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  our    100644 146bfaf2e064336bab67d6d79de7ec4303d23e61 i18n/deu/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  their  100644 9bbadf5a16fed9d78eed6b49edc7423834c2608b i18n/deu/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-changed in both
-  base   100644 a959a89e774dc4329ff85c5c4d71a075f6b681c8 i18n/deu/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 00a2164ceaa6feb9c7573ae407355c84d09fbc3c i18n/deu/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 9e3f5cd16a75e14de6a79f61bb61caa129df7d5d i18n/deu/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-@@ -40,14 +40,21 @@
- 	"dynamicHeight": "Steuert, ob sich die Höhe des Abschnitts \"Geöffnete Editoren\" dynamisch an die Anzahl der Elemente anpassen soll.",
- 	"autoReveal": "Steuert, ob der Explorer Dateien beim Öffnen automatisch anzeigen und auswählen soll.",
- 	"enableDragAndDrop": "Steuert, ob der Explorer das Verschieben von Dateien und Ordnern mithilfe von Drag  Drop zulassen soll.",
-+<<<<<<< .our
- 	"confirmDragAndDrop": "Steuert, ob der Explorer um Bestätigung bittet, um Dateien und Ordner per Drag & Drop zu verschieben.",
- 	"confirmDelete": "Steuert, ob der Explorer um Bestätigung bitten soll, wenn Sie eine Datei über den Papierkorb löschen.",
-+=======
-+>>>>>>> .their
- 	"sortOrder.default": "Dateien und Ordner werden nach ihren Namen in alphabetischer Reihenfolge sortiert. Ordner werden vor Dateien angezeigt. ",
- 	"sortOrder.mixed": "Dateien und Ordner werden nach ihren Namen in alphabetischer Reihenfolge sortiert. Dateien und Ordner werden vermischt angezeigt.",
- 	"sortOrder.filesFirst": "Dateien und Ordner werden nach ihren Namen in alphabetischer Reihenfolge sortiert. Dateien werden vor Ordnern angezeigt.",
- 	"sortOrder.type": "Dateien und Ordner werden nach ihren Erweiterungen in alphabetischer Reihenfolge sortiert. Ordner werden vor Dateien angezeigt.",
- 	"sortOrder.modified": "Dateien und Ordner werden nach dem letzten Änderungsdatum in absteigender Reihenfolge sortiert. Ordner werden vor Dateien angezeigt.",
-+<<<<<<< .our
- 	"sortOrder": "Steuert die Sortierreihenfolge von Dateien und Ordnern im Explorer. Zusätzlich zur Standardsortierreihenfolge können Sie die Reihenfolge auf \"mixed\" (kombinierte Sortierung von Dateien und Ordnern), \"type\" (nach Dateityp), \"modified\" (nach letztem Änderungsdatum) oder \"filesFirst\" (Dateien vor Ordnern anzeigen) festlegen.",
- 	"explorer.decorations.colors": "Steuert, ob Dateidekorationen Farben verwenden.",
- 	"explorer.decorations.badges": "Steuert, ob Dateidekorationen Badges verwenden."
-+=======
-+	"sortOrder": "Steuert die Sortierreihenfolge von Dateien und Ordnern im Explorer. Zusätzlich zur Standardsortierreihenfolge können Sie die Reihenfolge auf \"mixed\" (kombinierte Sortierung von Dateien und Ordnern), \"type\" (nach Dateityp), \"modified\" (nach letztem Änderungsdatum) oder \"filesFirst\" (Dateien vor Ordnern anzeigen) festlegen."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a9804d972b229d4ae3053c3b9f9774ad84f8306c i18n/deu/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-  our    100644 55ed6344bee5a16153879a922530a6ec8eac9933 i18n/deu/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-  their  100644 7bd4f281a16e90c09992384ba94903ce0b0d6fde i18n/deu/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-@@ -12,5 +12,6 @@
- 	"genericSaveError": "Fehler beim Speichern von \"{0}\": {1}.",
- 	"staleSaveError": "Fehler beim Speichern von \"{0}\": Der Inhalt auf dem Datenträger ist neuer. Klicken Sie auf **Vergleichen**, um Ihre Version mit der Version auf dem Datenträger zu vergleichen.",
- 	"compareChanges": "Vergleichen",
--	"saveConflictDiffLabel": "{0} (auf Datenträger) ↔ {1} (in {2}): Speicherkonflikt lösen"
-+	"saveConflictDiffLabel": "{0} (auf Datenträger) ↔ {1} (in {2}): Speicherkonflikt lösen",
-+	"userGuide": "Verwenden Sie die Aktionen auf der Editor-Symbolleiste auf der rechten Seite, um Ihre Änderungen **rückgängig zu machen** oder den Inhalt auf dem Datenträger mit Ihren Änderungen zu **überschreiben**."
- }
-\ No newline at end of file
-changed in both
-  base   100644 fb2ebc77680583511ee2a7be97b1f07d5b3beccc i18n/deu/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
-  our    100644 4b59346e4d2298bf5837a4ced79f851350cd0b20 i18n/deu/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
-  their  100644 31a534a16fa9abbf62b1d388a615c87a3e1697e4 i18n/deu/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
-@@ -10,9 +10,12 @@
- 	"dropFolder": "Möchten Sie den Ordner zum Arbeitsbereich hinzufügen?",
- 	"addFolders": "&&Ordner hinzufügen",
- 	"addFolder": "&&Ordner hinzufügen",
-+<<<<<<< .our
- 	"confirmMove": "Sind Sie sicher, dass Sie \"{0}\" verschieben möchten?",
- 	"doNotAskAgain": "Nicht erneut fragen",
- 	"moveButtonLabel": "&&Verschieben",
-+=======
-+>>>>>>> .their
- 	"confirmOverwriteMessage": "{0} ist im Zielordner bereits vorhanden. Möchten Sie das Element ersetzen?",
- 	"irreversible": "Diese Aktion kann nicht rückgängig gemacht werden.",
- 	"replaceButtonLabel": "&&Ersetzen"
-changed in both
-  base   100644 157325389a5f25722b7c2bc1bc9b6bbfc5ba3c50 i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  our    100644 69766a391fed29fd2a77d8603a89733b0bed7495 i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  their  100644 73113cf629416b51787bb1eb2cd34deeeb1fe266 i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-@@ -14,6 +14,10 @@
- 	"openGlobalKeybindingsFile": "Datei mit Tastaturkurzbefehlen öffnen",
- 	"openWorkspaceSettings": "Arbeitsbereichseinstellungen öffnen",
- 	"openFolderSettings": "Ordnereinstellungen öffnen",
-+<<<<<<< .our
-+=======
-+	"pickFolder": "Ordner auswählen",
-+>>>>>>> .their
- 	"configureLanguageBasedSettings": "Sprachspezifische Einstellungen konfigurieren...",
- 	"languageDescriptionConfigured": "({0})",
- 	"pickLanguage": "Sprache auswählen"
-changed in both
-  base   100644 e39c41141f00155e6b9dc3e17df012ab5a8e8e0a i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 93e401bd692b17b66ba4a0cb54c6f67464e449ac i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 c7f0245455c7f6d35f2d40d2db5ed9de0c0ad045 i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -14,4 +15,19 @@
- 	"editTtile": "Bearbeiten",
- 	"replaceDefaultValue": "In Einstellungen ersetzen",
- 	"copyDefaultValue": "In Einstellungen kopieren"
-+=======
-+	"emptyUserSettingsHeader": "Platzieren Sie Ihre Einstellungen hier, um die Standardeinstellungen zu überschreiben.",
-+	"errorInvalidConfiguration": "Einstellungen können nicht geschrieben werden. Öffnen Sie die Datei, um Fehler/Warnungen in der Datei zu korrigieren. Versuchen Sie es anschließend noch mal.",
-+	"emptyWorkspaceSettingsHeader": "Platzieren Sie Ihre Einstellungen hier, um die Benutzereinstellungen zu überschreiben.",
-+	"emptyFolderSettingsHeader": "Platzieren Sie Ihre Ordnereinstellungen hier, um die Einstellungen in den Arbeitsbereichseinstellungen zu überschreiben.",
-+	"defaultFolderSettingsTitle": "Standardordnereinstellungen",
-+	"defaultSettingsTitle": "Standardeinstellungen",
-+	"noSettingsFound": "Keine Einstellungen gefunden.",
-+	"editTtile": "Bearbeiten",
-+	"replaceDefaultValue": "In Einstellungen ersetzen",
-+	"copyDefaultValue": "In Einstellungen kopieren",
-+	"unsupportedPHPExecutablePathSetting": "Diese Einstellung muss eine Benutzereinstellung sein. Öffnen Sie zum Konfigurieren von PHP für den Arbeitsbereich eine PHP-Datei, und klicken Sie in der Statusleiste auf \"PHP-Pfad\".",
-+	"unsupportedWorkspaceSetting": "Diese Einstellung muss eine Benutzereinstellung sein.",
-+	"unsupportedWorkbenchSetting": "Diese Einstellung kann jetzt nicht angewendet werden. Sie wird angewendet, wenn Sie den Ordner direkt öffnen."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f28cfa282a3346026a136ee46195ab686b252e00 i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-  our    100644 13bbcc4e6f2e8917c91b8e538c5ae2056a00c878 i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-  their  100644 29ee08e9ffca0c6a66ff9b5869f96bb6c00be649 i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 cfd3784b25185836bda1d8d6784b3e81792155f0 i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 6c90dea80f47d72c434318e2c0963ba5bccd11a8 i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -12,4 +13,13 @@
- 	"userSettings": "Benutzereinstellungen",
- 	"workspaceSettings": "Arbeitsbereichseinstellungen",
- 	"folderSettings": "Ordnereinstellungen"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"folderSettingsDetails": "Ordnereinstellungen"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 30e347510d43c5806741967a6745068f2cd6f432 i18n/deu/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  our    100644 944c8644290b13cdcb690093cff1d8e9a037f81b i18n/deu/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  their  100644 4e537daf3e5002d319bf1dfeabf2273c7fba3744 i18n/deu/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-@@ -8,5 +8,11 @@
- 	],
- 	"relaunchSettingMessage": "Eine Einstellung wurde geändert, welche einen Neustart benötigt.",
- 	"relaunchSettingDetail": "Drücke den Neu starten-Button, um {0} neuzustarten und die Einstellung zu aktivieren.",
-+<<<<<<< .our
- 	"restart": "&&Neu starten"
-+=======
-+	"restart": "Neu starten",
-+	"relaunchWorkspaceMessage": "Dieser Arbeitsbereich erfordert das erneute Laden des Erweiterungssystems.",
-+	"reload": "Neu starten"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 3a19632777036d35cc87c500cb65b5e29f550b09 i18n/deu/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-  our    100644 e0b0a9a0758b0ee73b2bca7ff94b610de46d61c9 i18n/deu/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-  their  100644 96756d61e401fa6b86e8573561e9dffb8db465b2 i18n/deu/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-changed in both
-  base   100644 11d322e71292a85251c812f32586547ebe7d0b56 i18n/deu/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  our    100644 eb263d7ae8b832d5edd4a36de00889ae94057caa i18n/deu/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  their  100644 cfb59dde79057dfcf687c79f87274defaa585187 i18n/deu/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-changed in both
-  base   100644 e79bc2ec95481897e8afdd55d6f0a327e7413c9f i18n/deu/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  our    100644 c287ce1399d3a4cbf5ee2cf49ae6344e62eac3a2 i18n/deu/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  their  100644 786f8d2dbc0f68d6117df381818f91a0f60c190b i18n/deu/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -10,6 +11,11 @@
- 	"hideRepository": "Ausblenden",
- 	"installAdditionalSCMProviders": "Installiere weiter SCM Provider...",
- 	"no open repo": "Es gibt keine aktiven Quellcodeanbieter.",
-+=======
-+	"commitMessage": "Message (press {0} to commit)",
-+	"installAdditionalSCMProviders": "Installiere weiter SCM Provider...",
-+	"no open repo": "Keine Quellsteuerelemente sind aktiv.",
-+>>>>>>> .their
- 	"source control": "Quellcodeverwaltung",
- 	"viewletTitle": "{0}: {1}",
- 	"hideView": "Ausblenden"
-changed in both
-  base   100644 2914ad5ba59e7889a1648a7d2d7ac79bb3aa74f7 i18n/deu/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 1dcdaff92772bd253ab87cb0ce46920ce5c5e6bc i18n/deu/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 b16c9eacc2aec0509c74506a12ffad9ce50eaeda i18n/deu/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"nextSearchIncludePattern": "Nächstes Sucheinschlussmuster anzeigen",
- 	"previousSearchIncludePattern": "Vorheriges Sucheinschlussmuster anzeigen",
- 	"nextSearchExcludePattern": "Nächstes Suchausschlussmuster anzeigen",
-@@ -16,6 +19,8 @@
- 	"previousReplaceTerm": "Vorherigen Such-/Ersetzungsbegriff anzeigen ",
- 	"findInFiles": "In Dateien suchen",
- 	"replaceInFiles": "In Dateien ersetzen",
-+	"findInWorkspace": "In Arbeitsbereich suchen...",
-+	"findInFolder": "In Ordner suchen...",
- 	"RefreshAction.label": "Aktualisieren",
- 	"CollapseDeepestExpandedLevelAction.label": "Alle zuklappen",
- 	"ClearSearchResultsAction.label": "Löschen",
-changed in both
-  base   100644 8ec0049b3b37ba259c8ad15829388e11fff001cb i18n/deu/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-  our    100644 7fc53a6c4eefd13fb550ab2f60913080f68637da i18n/deu/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-  their  100644 66ba97093a94a46a9be324b8085b85c39555ccd4 i18n/deu/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"searchFolderMatch.other.label": "Andere Dateien",
- 	"searchFileMatches": "{0} Dateien gefunden",
- 	"searchFileMatch": "{0} Datei gefunden",
-changed in both
-  base   100644 86e0e518608a25b5f3b0c74109b855024a7aa9d1 i18n/deu/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  our    100644 f2f216a0a047fbef56f5094bbd15e808251180f1 i18n/deu/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  their  100644 b7189463a56677556b81e950b165a0c09f49e0b9 i18n/deu/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-added in both
-  our    100644 b7b4d0a3f1c87c29efe7d9c1d96bf70be25ca9e5 i18n/deu/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
-  their  100644 4e9dc03fa81e1ab017bb948fb7d683cb41d0469e i18n/deu/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"search.noWorkspaceWithName": "Kein Ordner im Arbeitsbereich mit Namen: {0}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 76d6135b7eb9bb3c9309f346b1f52786ee73615d i18n/deu/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 b3a9bfb6f09fdd913393d2a5b333f495988fabdc i18n/deu/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 0b6401dc0d563a2ccddc41c113db9d400d47c350 i18n/deu/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-changed in both
-  base   100644 b85cadb9245a83b3bb024d9868956eef54dbc116 i18n/deu/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 5e860baf0d874c2a564e21bd9c48c55877bc2bfd i18n/deu/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 6c15ead2389408d7f9198a9332d7b1e96553c29e i18n/deu/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -12,6 +12,7 @@
- 	"totalWarnings": "{0} Warnungen",
- 	"totalInfos": "{0}-Informationen",
- 	"problems": "Probleme",
-+<<<<<<< .our
- 	"building": "Wird gebaut...",
- 	"manyProblems": "Über 10.000",
- 	"runningTasks": "Aktive Aufgaben anzeigen",
-@@ -19,22 +20,36 @@
- 	"TaskSystem.noHotSwap": "Zum Ändern des Aufgabenausführungsmoduls mit einem aktiven Task muss das Fenster erneut geladen werden.",
- 	"reloadWindow": "Fenster erneut laden",
- 	"TaskServer.folderIgnored": "Der Ordner {0} wird ignoriert, da er Aufgabenversion 0.1.0 verwendet",
-+=======
-+	"manyMarkers": "mehr als 99",
-+	"runningTasks": "Aktive Aufgaben anzeigen",
-+	"tasks": "Aufgaben",
-+	"TaskSystem.noHotSwap": "Zum Ändern des Aufgabenausführungsmoduls muss das Fenster erneut geladen werden.",
-+>>>>>>> .their
- 	"TaskService.noBuildTask1": "Keine Buildaufgabe definiert. Markieren Sie eine Aufgabe mit 'isBuildCommand' in der tasks.json-Datei.",
- 	"TaskService.noBuildTask2": "Es ist keine Buildaufgabe definiert. Markieren Sie eine Aufgabe in der Datei \"tasks.json\" als \"Buildgruppe\". ",
- 	"TaskService.noTestTask1": "Keine Testaufgabe definiert. Markieren Sie eine Aufgabe mit 'isTestCommand' in der tasks.json-Datei.",
- 	"TaskService.noTestTask2": "Es ist keine Testaufgabe definiert. Markieren Sie eine Aufgabe in der Datei \"tasks.json\" als \"Testgruppe\". ",
- 	"TaskServer.noTask": "Die angeforderte auszuführende Aufgabe {0} wurde nicht gefunden.",
-+<<<<<<< .our
- 	"TaskService.associate": "assoziieren",
-+=======
-+>>>>>>> .their
- 	"TaskService.attachProblemMatcher.continueWithout": "Ohne Überprüfung der Aufgabenausgabe fortsetzen",
- 	"TaskService.attachProblemMatcher.never": "Aufgabenausgabe nie überprüfen",
- 	"TaskService.attachProblemMatcher.learnMoreAbout": "Weitere Informationen zur Überprüfung der Aufgabenausgabe",
- 	"selectProblemMatcher": "Fehler- und Warnungsarten auswählen, auf die die Aufgabenausgabe überprüft werden soll",
- 	"customizeParseErrors": "Die aktuelle Aufgabenkonfiguration weist Fehler auf. Beheben Sie die Fehler, bevor Sie eine Aufgabe anpassen.",
- 	"moreThanOneBuildTask": "In \"tasks.json\" sind mehrere Buildaufgaben definiert. Die erste wird ausgeführt.\n",
-+<<<<<<< .our
- 	"TaskSystem.activeSame.background": "Die Aufgabe \"{0}\" ist bereits aktiv und befindet sich im Hintergrundmodus.",
- 	"TaskSystem.activeSame.noBackground": "Die Aufgabe \"{0}\" ist bereits aktiv.",
- 	"terminateTask": "Aufgabe beenden",
- 	"restartTask": "Aufgabe neu starten",
-+=======
-+	"TaskSystem.activeSame.background": "Die Aufgabe \"{0}\" ist bereits im Hintergrundmodus aktiv. Klicken Sie zum Beenden der Aufgabe im Menü \"Aufgaben\" auf \"Aufgabe beenden\".",
-+	"TaskSystem.activeSame.noBackground": "Die Aufgabe \"{0}\" ist bereits aktiv. Klicken Sie zum Beenden der Aufgabe im Menü \"Aufgaben\" auf \"Aufgabe beenden\".",
-+>>>>>>> .their
- 	"TaskSystem.active": "Eine aktive Aufgabe wird bereits ausgeführt. Beenden Sie diese, bevor Sie eine andere Aufgabe ausführen.",
- 	"TaskSystem.restartFailed": "Fehler beim Beenden und Neustarten der Aufgabe \"{0}\".",
- 	"TaskService.noConfiguration": "Fehler: Die Aufgabenerkennung {0} hat für die folgende Konfiguration keine Aufgabe beigetragen:\n {1}\nDie Aufgabe wird ignoriert.\n",
-@@ -75,8 +90,13 @@
- 	"TaskService.pickDefaultBuildTask": "Als Standardbuildaufgabe zu verwendende Aufgabe auswählen",
- 	"TaskService.defaultTestTaskExists": "{0} ist bereits als Standardtestaufgabe markiert.",
- 	"TaskService.pickDefaultTestTask": "Als Standardtestaufgabe zu verwendende Aufgabe auswählen",
-+<<<<<<< .our
- 	"TaskService.pickShowTask": "Aufgabe zum Anzeigen der Ausgabe auswählen",
- 	"TaskService.noTaskIsRunning": "Es wird keine Aufgabe ausgeführt.",
-+=======
-+	"TaskService.noTaskIsRunning": "Es wird keine Aufgabe ausgeführt.",
-+	"TaskService.pickShowTask": "Aufgabe zum Anzeigen der Ausgabe auswählen",
-+>>>>>>> .their
- 	"ShowLogAction.label": "Taskprotokoll anzeigen",
- 	"RunTaskAction.label": "Task ausführen",
- 	"RestartTaskAction.label": "Ausgeführte Aufgabe neu starten",
-changed in both
-  base   100644 6064eccbd983947832bba2f4dfe2b117945710cc i18n/deu/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  our    100644 4f46618a81282525db957b1ebde7efb9886db7e0 i18n/deu/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  their  100644 f4454e4c78d5efb711d131cffc2a002df1f35149 i18n/deu/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-@@ -15,7 +15,10 @@
- 	"ConfigurationParser.invalidVaraibleReference": "Fehler: Ungültiger ProblemMatcher-Verweis: {0}\n",
- 	"ConfigurationParser.noTaskType": "Fehler: Die Aufgabenkonfiguration muss eine type-Eigenschaft enthalten. Die Konfiguration wird ignoriert.\n{0}\n",
- 	"ConfigurationParser.noTypeDefinition": "Fehler: Der registrierte Aufgabentyp \"{0}\" ist nicht vorhanden. Wurde möglicherweise eine Erweiterung nicht installiert, die den entsprechenden Aufgabenanbieter bereitstellt?",
-+<<<<<<< .our
- 	"ConfigurationParser.missingRequiredProperty": "Fehler: Die Aufgabenkonfiguration \"{0}\" enthält die erforderlich Eigenschaft \"{1}\" nicht. Die Aufgabenkonfiguration wird ignoriert.",
-+=======
-+>>>>>>> .their
- 	"ConfigurationParser.notCustom": "Fehler: Die Aufgabe ist nicht als benutzerdefinierte Aufgabe deklariert. Die Konfiguration wird ignoriert.\n{0}\n",
- 	"ConfigurationParser.noTaskName": "Fehler: Eine Aufgabe muss eine label-Eigenschaft angeben. Die Aufgabe wird ignoriert.\n{0}\n",
- 	"taskConfiguration.noCommandOrDependsOn": "Fehler: Aufgabe \"{0}\" definiert keinen Befehl bzw. keine depondsOn-Eigenschaft. Die Aufgabe wird ignoriert. Die Definition lautet:\n{1}",
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/deu/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  our    100644 baf84ca2434746b629839192402548996da51973 i18n/deu/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  their  100644 331fd59e24c48f34c44d9440e953a381021c9fd6 i18n/deu/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,6 +10,17 @@
- 	"termEntryAriaLabel": "{0}, Terminalauswahl",
- 	"termCreateEntryAriaLabel": "{0}, neues Terminal erstellen",
- 	"workbench.action.terminal.newplus": "$(plus) Neues integriertes Terminal erstellen",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"termEntryAriaLabel": "{0}, Terminalauswahl",
-+	"termCreateEntryAriaLabel": "{0}, neues Terminal erstellen",
-+	"'workbench.action.terminal.newplus": "$(plus) Neues integriertes Terminal erstellen",
-+>>>>>>> .their
- 	"noTerminalsMatching": "Keine übereinstimmenden Terminals",
- 	"noTerminalsFound": "Keine geöffneten Terminals"
- }
-\ No newline at end of file
-changed in both
-  base   100644 4d0a1893044c792abea39a3afc4621f1d6fecc2d i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 e7e17f13a867ab30a0455dba8cfbc4967b92e2a0 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 0c03c8172266b4ab4a1c4976a18ffe03b02d3f24 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,9 @@
- 	],
- 	"quickOpen.terminal": "Alle geöffneten Terminals anzeigen",
- 	"terminal": "Terminal",
-+=======
-+	"quickOpen.terminal": "Alle geöffneten Terminals anzeigen",
-+>>>>>>> .their
- 	"terminalIntegratedConfigurationTitle": "Integriertes Terminal",
- 	"terminal.integrated.shell.linux": "Der Pfad der Shell, den das Terminal unter Linux verwendet.",
- 	"terminal.integrated.shellArgs.linux": "Die Befehlszeilenargumente, die für das Linux-Terminal verwendet werden sollen.",
-@@ -36,8 +40,12 @@
- 	"terminal.integrated.env.osx": "Objekt mit Umgebungsvariablen, das dem unter OS X vom Terminal zu verwendenden VS Code-Prozess hinzugefügt wird",
- 	"terminal.integrated.env.linux": "Objekt mit Umgebungsvariablen, das dem unter Linux vom Terminal zu verwendenden VS Code-Prozess hinzugefügt wird",
- 	"terminal.integrated.env.windows": "Objekt mit Umgebungsvariablen, das dem unter Windows vom Terminal zu verwendenden VS Code-Prozess hinzugefügt wird",
-+<<<<<<< .our
- 	"terminal.integrated.showExitAlert": "Warnung \"Der Terminalprozess wurde mit folgendem Exitcode beendet\" anzeigen, wenn der Exitcode nicht Null ist.",
- 	"terminal.integrated.experimentalRestore": "Ob aktive Terminalsitzungen für den Arbeitsbereich beim Starten von VS Code automatisch wiederhergestellt werden sollen. Diese Einstellung ist in der Testphase, kann fehlerhaft sein und in Zukunft geändert werden.",
-+=======
-+	"terminal": "Terminal",
-+>>>>>>> .their
- 	"terminalCategory": "Terminal",
- 	"viewCategory": "Anzeigen"
- }
-\ No newline at end of file
-changed in both
-  base   100644 31e96cf587e451a0aea30f6532a173f8a77747c9 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 17f468b874b715481031f72251583765b50e478f i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 3ec37100eacf87801b9dc2912f283bbe0d24dad6 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -14,8 +14,11 @@
- 	"workbench.action.terminal.selectAll": "Alles auswählen",
- 	"workbench.action.terminal.deleteWordLeft": "Wort links löschen",
- 	"workbench.action.terminal.deleteWordRight": "Wort rechts löschen",
-+<<<<<<< .our
- 	"workbench.action.terminal.moveToLineStart": "Zum Zeilenanfang",
- 	"workbench.action.terminal.moveToLineEnd": "Zum Zeilenende",
-+=======
-+>>>>>>> .their
- 	"workbench.action.terminal.new": "Neues integriertes Terminal erstellen",
- 	"workbench.action.terminal.new.short": "Neues Terminal",
- 	"workbench.action.terminal.newWorkspacePlaceholder": "Aktuelles Arbeitsverzeichnis für neues Terminal auswählen",
-@@ -53,6 +56,7 @@
- 	"workbench.action.terminal.hideFindWidget": "Widget zum Ausblenden der Suche",
- 	"nextTerminalFindTerm": "Nächsten Suchbegriff anzeigen",
- 	"previousTerminalFindTerm": "Vorherigen Suchbegriff anzeigen",
-+<<<<<<< .our
- 	"quickOpenTerm": "Aktives Terminal wechseln",
- 	"workbench.action.terminal.scrollToPreviousCommand": "Zu vorherigem Befehl scrollen",
- 	"workbench.action.terminal.scrollToNextCommand": "Zu nächstem Befehl scrollen",
-@@ -60,4 +64,7 @@
- 	"workbench.action.terminal.selectToNextCommand": "Auswählen bis zu nächstem Befehl",
- 	"workbench.action.terminal.selectToPreviousLine": " Auswählen bis zur vorherigen Zeile ",
- 	"workbench.action.terminal.selectToNextLine": "Auswählen bis zur nächsten Zeile"
-+=======
-+	"quickOpenTerm": "Terminal: Aktives Terminal wechseln"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 9d4810761f24371631240b96e6b04a543431877e i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 84fc7fe0d67567c48c4b669c0d3d08c7386267cc i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 e1d9d37fe1e42e0b79089a0c6ec23beeac903b2e i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -10,7 +10,11 @@
- 	"terminal.foreground": "Die Vordergrundfarbe des Terminal.",
- 	"terminalCursor.foreground": "Die Vordergrundfarbe des Terminalcursors.",
- 	"terminalCursor.background": "Die Hintergrundfarbe des Terminalcursors. Ermöglicht das Anpassen der Farbe eines Zeichens, das von einem Blockcursor überdeckt wird.",
-+<<<<<<< .our
- 	"terminal.selectionBackground": "Die Auswahlvordergrundfarbe des Terminals.",
- 	"terminal.border": "Die Farbe des Rahmens, der Bereiche innerhalb des Terminals teilt. Der Standardwert ist panel.border.",
- 	"terminal.ansiColor": "\"{0}\" ANSI-Farbe im Terminal"
-+=======
-+	"terminal.ansiColor": "\"{0}\": ANSI-Farbe im Terminal"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f579c5cd19f0ef91306edb73995a5ed9810cda82 i18n/deu/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 dca9f59735754d2304f7bca4be1c8c6b2470923f i18n/deu/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 7c24ef226ba5ac868abd398b492b1ed58f0fc93a i18n/deu/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -9,10 +9,21 @@
- 	"releaseNotes": "Anmerkungen zu dieser Version",
- 	"showReleaseNotes": "Anmerkungen zu dieser Version anzeigen",
- 	"read the release notes": "Willkommen bei {0} v{1}! Möchten Sie die Hinweise zu dieser Version lesen?",
-+<<<<<<< .our
- 	"licenseChanged": "Unsere Lizenzbedingungen haben sich geändert. Bitte klicken Sie [hier]({0}), um die neuen Bedingungen zu lesen.",
- 	"neveragain": "Nicht mehr anzeigen",
- 	"64bitisavailable": "{0} für 64-Bit-Windows ist jetzt verfügbar! Klicken Sie [hier]({1}), um mehr zu erfahren.",
- 	"updateIsReady": "Neues {0}-Update verfügbar.",
-+=======
-+	"licenseChanged": "Unsere Lizenzbedingungen haben sich geändert. Bitte lesen Sie die neuen Bedingungen.",
-+	"license": "Lizenz lesen",
-+	"neveragain": "Nie wieder anzeigen",
-+	"64bitisavailable": "{0} für 64-Bit-Windows ist jetzt verfügbar!",
-+	"learn more": "Weitere Informationen",
-+	"updateIsReady": "Neues {0}-Update verfügbar.",
-+	"thereIsUpdateAvailable": "Ein Update ist verfügbar.",
-+	"updateAvailable": "{0} wird nach dem Neustart aktualisiert.",
-+>>>>>>> .their
- 	"noUpdatesAvailable": "Zurzeit sind keine Updates verfügbar.",
- 	"ok": "OK",
- 	"thereIsUpdateAvailable": "Ein Update ist verfügbar.",
-changed in both
-  base   100644 75f68335e054d3737897120c2db960c4ed673245 i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  our    100644 32b9b62035bd1682e803803a438bf61ea5ca8408 i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  their  100644 40722803a7263b913f5855152fde68b552c507b2 i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-@@ -37,6 +37,8 @@
- 	"welcomePage.showCommandsDescription": "Über die Befehlspalette ({0}) schnell auf Befehle zugreifen und nach Befehlen suchen",
- 	"welcomePage.interfaceOverview": "Überblick über die Schnittstelle",
- 	"welcomePage.interfaceOverviewDescription": "Erhalten Sie eine visuelle Überlagerung, die die wichtigsten Komponenten der Benutzeroberfläche hervorhebt.",
-+	"welcomePage.deployToAzure": "Anwendungen in der Cloud bereitstellen",
-+	"welcomePage.deployToAzureDescription": "Hier erfahren Sie, wie Sie Ihre Node-Apps in Azure App Service bereitstellen.",
- 	"welcomePage.interactivePlayground": "Interaktiver Playground",
- 	"welcomePage.interactivePlaygroundDescription": "Testen Sie die wichtigsten Editorfunktionen in einer kurzen exemplarischen Vorgehensweise."
- }
-\ No newline at end of file
-changed in both
-  base   100644 465e716820754a5be3ecd5a1cd58e244453ae77c i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-  our    100644 bbdcf9ec8ce1acc993eb679b46f1fae9f13f6a92 i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-  their  100644 dfd27d2d8c3e3a9440d2033a6c0ba6b4a8243a25 i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-changed in both
-  base   100644 99cd19e8bb57353db122d4aeb51400e3ba172777 i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-  our    100644 35d2fc1d012f9e475869a6fc62ef95b886e25984 i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-  their  100644 ee2a9825fedf807c538ae86e88b08941f000c660 i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-changed in both
-  base   100644 080faf979f6ecb3751a23902c167169d37ed11c5 i18n/deu/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
-  our    100644 60e8cb1b465f3924a5d365e6bc4bfea0c56c4f59 i18n/deu/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
-  their  100644 5f5cf83edf8eb356caa24ef16d576056ed2f1688 i18n/deu/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"editorWalkThrough.title": "Interaktiver Playground",
- 	"editorWalkThrough": "Interaktiver Playground"
- }
-\ No newline at end of file
-changed in both
-  base   100644 57926d3c88c40420a5098d01c515f4bf7590e405 i18n/deu/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  our    100644 d6a37d8334e4fabea5afba7ea495f6b39d9f466f i18n/deu/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  their  100644 9bf4abe27f176249cda335582f84541412e8afe9 i18n/deu/src/vs/workbench/services/configuration/node/configuration.i18n.json
-@@ -9,6 +9,7 @@
- 	"scope.window.description": "Fensterspezifische Konfiguration, die in den Benutzer- oder Arbeitsbereichseinstellungen konfiguriert werden kann.",
- 	"scope.resource.description": "Ressourcenspezifische Konfiguration, die in den Benutzer-, Arbeitsbereichs- oder Ordnereinstellungen konfiguriert werden kann.",
- 	"scope.description": "Bereich, in dem die Konfiguration gültig ist. Verfügbare Gültigkeitsbereiche sind \"window\" und \"resource\".",
-+<<<<<<< .our
- 	"vscode.extension.contributes.configuration": "Trägt Konfigurationseigenschaften bei.",
- 	"invalid.title": "configuration.title muss eine Zeichenfolge sein.",
- 	"vscode.extension.contributes.defaultConfiguration": "Trägt zu Konfigurationeinstellungen des Standard-Editors für die jeweilige Sprache bei.",
-@@ -21,4 +22,13 @@
- 	"workspaceConfig.settings.description": "Arbeitsbereichseinstellungen",
- 	"workspaceConfig.extensions.description": "Arbeitsbereichserweiterungen",
- 	"unknownWorkspaceProperty": "Unbekannte Arbeitsbereichs-Konfigurationseigenschaft"
-+=======
-+	"invalid.type": "Wenn eine Festlegung erfolgt, muss \"configuration.type\" auf \"object\" festgelegt werden.",
-+	"invalid.title": "configuration.title muss eine Zeichenfolge sein.",
-+	"vscode.extension.contributes.defaultConfiguration": "Trägt zu Konfigurationeinstellungen des Standard-Editors für die jeweilige Sprache bei.",
-+	"invalid.properties": "\"configuration.properties\" muss ein Objekt sein.",
-+	"workspaceConfig.folders.description": "Liste von Ordnern, die in den Arbeitsbereich geladen werden. Hierbei muss es sich um einen Dateipfad handeln, z. B. \" /root/folderA\" oder \"./folderA\" bei einem relativen Pfad, der in Bezug auf den Speicherort der Arbeitsbereichsdatei aufgelöst wird.",
-+	"workspaceConfig.folder.description": "Ein Dateipfad, z. B. \" /root/folderA\" oder \"./folderA\" bei einem relativen Pfad, der in Bezug auf den Speicherort der Arbeitsbereichsdatei  aufgelöst wird.",
-+	"workspaceConfig.settings.description": "Arbeitsbereichseinstellungen"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d1f34002c594f81e426dbe19e270d8f75776b61a i18n/deu/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 6e51d0a62d6cbb327e635cf17096e9a085de524c i18n/deu/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 c23b461e1c21857d9c32788cd6400f44145bd3c3 i18n/deu/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -9,6 +9,7 @@
- 	"openTasksConfiguration": "Aufgabenkonfiguration öffnen",
- 	"openLaunchConfiguration": "Startkonfiguration öffnen",
- 	"open": "Einstellungen öffnen",
-+<<<<<<< .our
- 	"saveAndRetry": "Speichern und wiederholen",
- 	"errorUnknownKey": "In {0} kann nicht geschrieben werden, weil {1} keine registrierte Konfiguration ist.",
- 	"errorInvalidWorkspaceConfigurationApplication": "{0} kann nicht in die Arbeitsbereichseinstellungen geschrieben werden. Diese Einstellung kann nur in den Benutzereinstellungen geschrieben werden.",
-@@ -27,6 +28,19 @@
- 	"errorConfigurationFileDirty": "In die Benutzereinstellungen kann nicht geschrieben werden, weil die Datei geändert wurde. Speichern Sie die Datei mit den Benutzereinstellungen, und versuchen Sie es noch mal.",
- 	"errorConfigurationFileDirtyWorkspace": "In die Arbeitsbereichseinstellungen kann nicht geschrieben werden, weil die Datei geändert wurde. Speichern Sie die Datei mit den Arbeitsbereichseinstellungen, und versuchen Sie es noch mal.",
- 	"errorConfigurationFileDirtyFolder": "In die Ordnereinstellungen kann nicht geschrieben werden, da die Datei geändert wurde. Speichern Sie die Datei mit den Ordnereinstellungen \"{0}\" und versuchen Sie es noch mal.",
-+=======
-+	"close": "Schließen",
-+	"saveAndRetry": "Änderungen Speichern und Wiederholen",
-+	"errorUnknownKey": "In {0} kann nicht geschrieben werden, weil {1} keine registrierte Konfiguration ist.",
-+	"errorInvalidFolderConfiguration": "In die Ordnereinstellungen kann nicht geschrieben werden, weil {0} den Gültigkeitsbereich für Ordnerressourcen nicht unterstützt.",
-+	"errorInvalidUserTarget": "In die Benutzereinstellungen kann nicht geschrieben werden, weil {0} den globalen Gültigkeitsbereich nicht unterstützt.",
-+	"errorInvalidFolderTarget": "In die Ordnereinstellungen kann nicht geschrieben werden, weil keine Ressource angegeben ist.",
-+	"errorNoWorkspaceOpened": "In {0} kann nicht geschrieben werden, weil kein Arbeitsbereich geöffnet ist. Öffnen Sie zuerst einen Arbeitsbereich, und versuchen Sie es noch mal.",
-+	"errorInvalidConfiguration": "In die Einstellungen kann nicht geschrieben werden. Öffnen Sie **Benutzereinstellungen**, um Fehler/Warnungen in der Datei zu korrigieren, und versuchen Sie es noch mal.",
-+	"errorInvalidConfigurationWorkspace": "In die Einstellungen kann nicht geschrieben werden. Öffnen Sie die **Arbeitsbereichseinstellungen**, um Fehler/Warnungen in der Datei zu korrigieren, und versuchen Sie es noch mal.",
-+	"errorConfigurationFileDirty": "In die Einstellungen kann nicht geschrieben werden, weil die Datei geändert wurde. Speichern Sie die Datei **Benutzereinstellungen**, und versuchen Sie es noch mal.",
-+	"errorConfigurationFileDirtyWorkspace": "In die Einstellungen kann nicht geschrieben werden, weil die Datei geändert wurde. Speichern Sie die Datei **Arbeitsbereichseinstellungen**, und versuchen Sie es noch mal.",
-+>>>>>>> .their
- 	"userTarget": "Benutzereinstellungen",
- 	"workspaceTarget": "Arbeitsbereichseinstellungen",
- 	"folderTarget": "Ordnereinstellungen"
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/deu/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-  our    100644 559afa0a3598ba26b6ff414d4264783532a2ef4b i18n/deu/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-  their  100644 789de4230c1123dde2c673ed3b9b5aef28fb1648 i18n/deu/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"errorInvalidFile": "In die Datei kann nicht geschrieben werden. Öffnen Sie die Datei, um Fehler/Warnungen in der Datei zu beheben, und versuchen Sie es noch mal.",
- 	"errorFileDirty": "In die Datei kann nicht geschrieben werden, weil sie geändert wurde. Speichern Sie die Datei, und versuchen Sie es noch mal."
- }
-\ No newline at end of file
-added in both
-  our    100644 6e6b0e1735776b864124863e6f15f25fc8731c33 i18n/deu/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
-  their  100644 19669518abf4bec102ee64900f1a10fca21bf499 i18n/deu/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,5 +10,15 @@
- 	"extensionHostProcess.startupFailDebug": "Der Erweiterungshost wurde nicht innerhalb von 10 Sekunden gestartet. Möglicherweise wurde er in der ersten Zeile beendet und benötigt einen Debugger, um die Ausführung fortzusetzen.",
- 	"extensionHostProcess.startupFail": "Der Erweiterungshost wurde nicht innerhalb von 10 Sekunden gestartet. Dies stellt ggf. ein Problem dar.",
- 	"reloadWindow": "Fenster erneut laden",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"extensionHostProcess.startupFailDebug": "Der Erweiterungshost wurde nicht innerhalb von 10 Sekunden gestartet. Möglicherweise wurde er in der ersten Zeile beendet und benötigt einen Debugger, um die Ausführung fortzusetzen.",
-+	"extensionHostProcess.startupFail": "Der Erweiterungshost wurde nicht innerhalb von 10 Sekunden gestartet. Dies stellt ggf. ein Problem dar.",
-+>>>>>>> .their
- 	"extensionHostProcess.error": "Fehler vom Erweiterungshost: {0}"
- }
-\ No newline at end of file
-added in both
-  our    100644 061b5acc5861a368741884455b14cce06846d720 i18n/deu/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
-  their  100644 fc6d616a745662cf4737768a275bca33cbb5ba73 i18n/deu/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,5 +10,16 @@
- 	"jsonParseFail": "Fehler beim Analysieren von {0}: {1}.",
- 	"fileReadFail": "Die Datei \"{0}\" kann nicht gelesen werden: {1}",
- 	"jsonsParseReportErrors": "Fehler beim Analysieren von {0}: {1}.",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"jsonParseFail": "Fehler beim Analysieren von {0}: {1}.",
-+	"fileReadFail": "Die Datei \"{0}\" kann nicht gelesen werden: {1}",
-+	"jsonsParseFail": "Fehler beim Analysieren von {0} oder {1}: {2}.",
-+>>>>>>> .their
- 	"missingNLSKey": "Die Nachricht für den Schlüssel {0} wurde nicht gefunden."
- }
-\ No newline at end of file
-added in both
-  our    100644 9e2433b45a972658eaacfc782aa0bde370adaf55 i18n/deu/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-  their  100644 9dfb4d17ccaffcb0628e762467d57d1cd3258d79 i18n/deu/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -15,4 +16,18 @@
- 	"extensionUnderDevelopment": "Die Entwicklungserweiterung unter \"{0}\" wird geladen.",
- 	"extensionCache.invalid": "Erweiterungen wurden auf der Festplatte geändert. Bitte laden Sie das Fenster erneut.",
- 	"reloadWindow": "Fenster erneut laden"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"devTools": "Entwicklertools",
-+	"restart": "Erweiterungshost neu starten",
-+	"extensionHostProcess.crash": "Der Erweiterungshost wurde unerwartet beendet.",
-+	"extensionHostProcess.unresponsiveCrash": "Der Erweiterungshost wurde beendet, weil er nicht reagiert hat.",
-+	"overwritingExtension": "Die Erweiterung \"{0}\" wird mit \"{1}\" überschrieben.",
-+	"extensionUnderDevelopment": "Die Entwicklungserweiterung unter \"{0}\" wird geladen."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6db7d6aae514a031afce5ac346abfd84bb8ee1cc i18n/deu/src/vs/workbench/services/progress/browser/progressService2.i18n.json
-  our    100644 56b19fa3a5a311595dfe09f87354031351b8f70e i18n/deu/src/vs/workbench/services/progress/browser/progressService2.i18n.json
-  their  100644 dbcd7381ae2fcf0e7a8fc81ec166ed7112edca11 i18n/deu/src/vs/workbench/services/progress/browser/progressService2.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -9,4 +10,8 @@
- 	"progress.subtitle": "{0} - {1}",
- 	"progress.title": "{0}: {1}",
- 	"cancel": "Abbrechen"
-+=======
-+	"progress.subtitle": "{0} - {1}",
-+	"progress.title": "{0}: {1}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e8f5434b0d7f203cbb4160a368f42039a7c1c959 i18n/deu/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-  our    100644 8d8aab58b0c68aa877eef8f3f2016264c5b6b373 i18n/deu/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-  their  100644 3628bed2f06ee684d6ab2404092bea36f52b981f i18n/deu/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,12 @@
- 	"schema.token.fontStyle": "Schriftschnitt der Regel: kursiv, fett und unterstrichen (einzeln oder in Kombination). Die leere Zeichenfolge setzt geerbte Einstellungen zurück.",
- 	"schema.fontStyle.error": "Die Schriftart muss \"kursiv\", \"fett\" oder \"unterstrichen\", eine Kombination daraus oder eine leere Zeichenfolge sein.",
- 	"schema.token.fontStyle.none": "Keine (geerbten Stil löschen)",
-+=======
-+	"schema.token.settings": "Farben und Stile für das Token.",
-+	"schema.token.foreground": "Vordergrundfarbe für das Token.",
-+	"schema.token.fontStyle": "Schriftschnitt der Regel: kursiv, fett und unterstrichen (einzeln oder in Kombination)",
-+	"schema.fontStyle.error": "Der Schriftschnitt muss eine Kombination aus \"kursiv\", \"fett\" und \"unterstrichen\" sein.",
-+>>>>>>> .their
- 	"schema.properties.name": "Beschreibung der Regel.",
- 	"schema.properties.scope": "Bereichsauswahl, mit der diese Regel einen Abgleich ausführt.",
- 	"schema.tokenColors.path": "Pfad zu einer tmTheme-Designdatei (relativ zur aktuellen Datei).",
-changed in both
-  base   100644 2d04a1d985b58b0b5536b23a2a8a8e24115b1bd1 i18n/deu/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
-  our    100644 540c217df1b57fb32029e9b5ad4a5a90b3c8fc07 i18n/deu/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
-  their  100644 5c396ea44d19bd8aa35a1bd9b7b1457a7da9f332 i18n/deu/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
-changed in both
-  base   100644 374e2c223edafd7ff2e5baa130b77721ed527ed3 i18n/deu/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 66c124a9d5a7fdc4a4f5dd03bfbddf459d3761cb i18n/deu/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 a3137e30eb6ab727e9914b3d14321bd3f61eb050 i18n/deu/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-@@ -13,6 +13,12 @@
- 	"noIconThemeDesc": "No file icons",
- 	"iconThemeError": "File icon theme is unknown or not installed.",
- 	"workbenchColors": "Überschreibt Farben aus dem derzeit ausgewählte Farbdesign.",
-+<<<<<<< .our
-+=======
-+	"workbenchColors.deprecated": "Diese Einstellung ist nicht mehr experimentell und wurde in \"workbench.colorCustomizations\" umbenannt.",
-+	"workbenchColors.deprecatedDescription": "Verwenden Sie stattdessen \"workbench.colorCustomizations\".",
-+	"editorColors": "Überschreibt Editorfarben und den Schriftschnitt aus dem momentan ausgewählten Farbdesign.",
-+>>>>>>> .their
- 	"editorColors.comments": "Legt die Farben und Stile für Kommentare fest.",
- 	"editorColors.strings": "Legt die Farben und Stile für Zeichenfolgenliterale fest.",
- 	"editorColors.keywords": "Legt die Farben und Stile für Schlüsselwörter fest.",
-@@ -20,6 +26,10 @@
- 	"editorColors.types": "Legt die Farben und Stile für Typdeklarationen und Verweise fest.",
- 	"editorColors.functions": "Legt die Farben und Stile für Funktionsdeklarationen und Verweise fest.",
- 	"editorColors.variables": "Legt die Farben und Stile für Variablendeklarationen und Verweise fest.",
-+<<<<<<< .our
- 	"editorColors.textMateRules": "Legt Farben und Stile mithilfe von Textmate-Designregeln fest (erweitert).",
- 	"editorColors": "Überschreibt Editorfarben und den Schriftschnitt aus dem momentan ausgewählten Farbdesign."
-+=======
-+	"editorColors.textMateRules": "Legt Farben und Stile mithilfe von Textmate-Designregeln fest (erweitert)."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7a5a71fe55c000c3617210183c7b1ee218984b7d i18n/esn/extensions/css/package.i18n.json
-  our    100644 8b817c2ddd4baf1446176685b552b49f6711e9ba i18n/esn/extensions/css/package.i18n.json
-  their  100644 00bd711e0f718ea51c94ab8ef0230da04f6d6470 i18n/esn/extensions/css/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,73 @@
- 	],
- 	"displayName": "Básicos de CSS",
- 	"description": "Proporciona resaltado de sintaxis y correspondencia de corchetes en archivos CSS, LESS y SCSS."
-+=======
-+	"css.lint.argumentsInColorFunction.desc": "Número de parámetros no válido",
-+	"css.lint.boxModel.desc": "No use ancho o alto con el relleno o los bordes.",
-+	"css.lint.compatibleVendorPrefixes.desc": "Cuando use un prefijo específico del proveedor, compruebe que también haya incluido el resto de propiedades específicas del proveedor.",
-+	"css.lint.duplicateProperties.desc": "No use definiciones de estilo duplicadas",
-+	"css.lint.emptyRules.desc": "No use conjuntos de reglas vacíos",
-+	"css.lint.float.desc": "Le recomendamos no usar 'float'. Los floats producen CSS frágiles, fáciles de corromper si cambia cualquier aspecto del diseño.",
-+	"css.lint.fontFaceProperties.desc": "La regla @font-face debe definir las propiedades \"src\" y \"font-family\"",
-+	"css.lint.hexColorLength.desc": "Los colores hexadecimales deben estar formados por tres o seis números hexadecimales.",
-+	"css.lint.idSelector.desc": "Los selectores no deben contener identificadores porque estas reglas están estrechamente ligadas a HTML.",
-+	"css.lint.ieHack.desc": "Las modificaciones de IE solo son necesarias cuando admiten IE7 y anteriores",
-+	"css.lint.important.desc": "Le recomendamos no usar !important. Esto indica que la especificidad de todo el CSS está fuera de control y que debe refactorizarse.",
-+	"css.lint.importStatement.desc": "Las instrucciones Import no se cargan en paralelo",
-+	"css.lint.propertyIgnoredDueToDisplay.desc": "La propiedad se ignora a causa de la pantalla. Por ejemplo, con 'display: inline', el ancho, el alto, el margen superior e inferior y las propiedades de float no tienen efecto.",
-+	"css.lint.universalSelector.desc": "Se sabe que el selector universal (*) es lento",
-+	"css.lint.unknownProperties.desc": "Propiedad desconocida.",
-+	"css.lint.unknownVendorSpecificProperties.desc": "Propiedad específica del proveedor desconocida.",
-+	"css.lint.vendorPrefix.desc": "Cuando use un prefijo específico del proveedor, incluya también la propiedad estándar.",
-+	"css.lint.zeroUnits.desc": "No se necesita una unidad para cero",
-+	"css.trace.server.desc": "Hace un seguimiento de la comunicación entre VSCode y el servidor de lenguaje CSS.",
-+	"css.validate.title": "Controla la validación de CSS y la gravedad de los problemas.",
-+	"css.validate.desc": "Habilita o deshabilita todas las validaciones",
-+	"less.lint.argumentsInColorFunction.desc": "Número de parámetros no válido",
-+	"less.lint.boxModel.desc": "No use ancho o alto con el relleno o los bordes.",
-+	"less.lint.compatibleVendorPrefixes.desc": "Cuando use un prefijo específico del proveedor, compruebe que también haya incluido el resto de propiedades específicas del proveedor.",
-+	"less.lint.duplicateProperties.desc": "No use definiciones de estilo duplicadas",
-+	"less.lint.emptyRules.desc": "No use conjuntos de reglas vacíos",
-+	"less.lint.float.desc": "Le recomendamos no usar 'float'. Los floats producen CSS frágiles, fáciles de corromper si cambia cualquier aspecto del diseño.",
-+	"less.lint.fontFaceProperties.desc": "La regla @font-face debe definir las propiedades \"src\" y \"font-family\"",
-+	"less.lint.hexColorLength.desc": "Los colores hexadecimales deben estar formados por tres o seis números hexadecimales.",
-+	"less.lint.idSelector.desc": "Los selectores no deben contener identificadores porque estas reglas están estrechamente ligadas a HTML.",
-+	"less.lint.ieHack.desc": "Las modificaciones de IE solo son necesarias cuando admiten IE7 y anteriores",
-+	"less.lint.important.desc": "Le recomendamos no usar !important. Esto indica que la especificidad de todo el CSS está fuera de control y que debe refactorizarse.",
-+	"less.lint.importStatement.desc": "Las instrucciones Import no se cargan en paralelo",
-+	"less.lint.propertyIgnoredDueToDisplay.desc": "La propiedad se ignora a causa de la pantalla. Por ejemplo, con 'display: inline', el ancho, el alto, el margen superior e inferior y las propiedades de float no tienen efecto.",
-+	"less.lint.universalSelector.desc": "Se sabe que el selector universal (*) es lento",
-+	"less.lint.unknownProperties.desc": "Propiedad desconocida.",
-+	"less.lint.unknownVendorSpecificProperties.desc": "Propiedad específica del proveedor desconocida.",
-+	"less.lint.vendorPrefix.desc": "Cuando use un prefijo específico del proveedor, incluya también la propiedad estándar.",
-+	"less.lint.zeroUnits.desc": "No se necesita una unidad para cero",
-+	"less.validate.title": "Controla la validación de LESS y la gravedad de los problemas.",
-+	"less.validate.desc": "Habilita o deshabilita todas las validaciones",
-+	"scss.lint.argumentsInColorFunction.desc": "Número de parámetros no válido",
-+	"scss.lint.boxModel.desc": "No use ancho o alto con el relleno o los bordes.",
-+	"scss.lint.compatibleVendorPrefixes.desc": "Cuando use un prefijo específico del proveedor, compruebe que también haya incluido el resto de propiedades específicas del proveedor.",
-+	"scss.lint.duplicateProperties.desc": "No use definiciones de estilo duplicadas",
-+	"scss.lint.emptyRules.desc": "No use conjuntos de reglas vacíos",
-+	"scss.lint.float.desc": "Le recomendamos no usar 'float'. Los floats producen CSS frágiles, fáciles de corromper si cambia cualquier aspecto del diseño.",
-+	"scss.lint.fontFaceProperties.desc": "La regla @font-face debe definir las propiedades \"src\" y \"font-family\"",
-+	"scss.lint.hexColorLength.desc": "Los colores hexadecimales deben estar formados por tres o seis números hexadecimales.",
-+	"scss.lint.idSelector.desc": "Los selectores no deben contener identificadores porque estas reglas están estrechamente ligadas a HTML.",
-+	"scss.lint.ieHack.desc": "Las modificaciones de IE solo son necesarias cuando admiten IE7 y anteriores",
-+	"scss.lint.important.desc": "Le recomendamos no usar !important. Esto indica que la especificidad de todo el CSS está fuera de control y que debe refactorizarse.",
-+	"scss.lint.importStatement.desc": "Las instrucciones Import no se cargan en paralelo",
-+	"scss.lint.propertyIgnoredDueToDisplay.desc": "La propiedad se ignora a causa de la pantalla. Por ejemplo, con 'display: inline', el ancho, el alto, el margen superior e inferior y las propiedades de float no tienen efecto.",
-+	"scss.lint.universalSelector.desc": "Se sabe que el selector universal (*) es lento",
-+	"scss.lint.unknownProperties.desc": "Propiedad desconocida.",
-+	"scss.lint.unknownVendorSpecificProperties.desc": "Propiedad específica del proveedor desconocida.",
-+	"scss.lint.vendorPrefix.desc": "Cuando use un prefijo específico del proveedor, incluya también la propiedad estándar.",
-+	"scss.lint.zeroUnits.desc": "No se necesita una unidad para cero",
-+	"scss.validate.title": "Controla la validación de SCSS y la gravedad de los problemas.",
-+	"scss.validate.desc": "Habilita o deshabilita todas las validaciones",
-+	"less.colorDecorators.enable.desc": "Habilita o deshabilita decoradores de color",
-+	"scss.colorDecorators.enable.desc": "Habilita o deshabilita decoradores de color",
-+	"css.colorDecorators.enable.desc": "Habilita o deshabilita decoradores de color",
-+	"css.colorDecorators.enable.deprecationMessage": "El valor \"css.colorDecorators.enable\" está en desuso en favor de \"editor.colorDecorators\".",
-+	"scss.colorDecorators.enable.deprecationMessage": "El valor \"scss.colorDecorators.enable\" está en desuso en favor de \"editor.colorDecorators\".",
-+	"less.colorDecorators.enable.deprecationMessage": "El valor \"less.colorDecorators.enable\" está en desuso en favor de \"editor.colorDecorators\"."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 26c61c87280689d7b1fce369e9b02cabf4fcd5e8 i18n/esn/extensions/emmet/package.i18n.json
-  our    100644 d6c05800c1ebc6febea004f2095561aeefca8479 i18n/esn/extensions/emmet/package.i18n.json
-  their  100644 07653dd95674c6f0df3cf7ba1bdb5e0ad72cf999 i18n/esn/extensions/emmet/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -7,6 +8,8 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"description": "Soporte de Emmet para VS Code",
-+=======
-+>>>>>>> .their
- 	"command.wrapWithAbbreviation": "Encapsular con abreviatura",
- 	"command.wrapIndividualLinesWithAbbreviation": "Encapsular las líneas individuales con abreviatura",
- 	"command.removeTag": "Quitar etiqueta",
-@@ -31,6 +34,7 @@
- 	"command.incrementNumberByTen": "Aumentar por 10",
- 	"command.decrementNumberByTen": "Disminuir por 10",
- 	"emmetSyntaxProfiles": "Defina el perfil de la sintaxis especificada o use su propio perfil con reglas específicas.",
-+<<<<<<< .our
- 	"emmetExclude": "Una serie de idiomas donde no deben ampliar las abreviaturas de Emmet.",
- 	"emmetExtensionsPath": "Ruta de acceso a una carpeta que contiene los perfiles y fragmentos de Emmet.",
- 	"emmetShowExpandedAbbreviation": "Muestra abreviaciones Emmet expandidas como sugerencias. La opción \"inMarkupAndStylesheetFilesOnly\" se aplica a HTML, HAML, Jade, Slim, XML, XSL, CSS, SCSS, SASS, LESS y Stylus. La opción \"always\" se aplica a todas las partes del archivo, independientemente de que sea de marcado o CSS. ",
-@@ -38,6 +42,15 @@
- 	"emmetIncludeLanguages": "Habilite las abreviaturas de Emmet en idiomas que no sean compatibles de forma predeterminada. Añada una asignación aquí entre el idioma y el idioma admitido por Emmet.\n Ej.: { \"Vue-HTML \": \"HTML \", \"JavaScript \": \"javascriptreact \"}",
- 	"emmetVariables": "Variables para ser utilizadas en fragmentos de código de Emmet",
- 	"emmetTriggerExpansionOnTab": "Cuando se habilita, se expande la abreviación Emmet al presionar la tecla TAB. ",
-+=======
-+	"emmetExclude": "Matriz de lenguajes donde no deben expandirse la abreviación Emmet.",
-+	"emmetExtensionsPath": "Ruta de acceso a una carpeta que contiene los perfiles de emmet y fragmentos.»",
-+	"emmetShowExpandedAbbreviation": "\nMuestra abreviaciones Emmet expandidas como sugerencias. La opción \"inMarkupAndStylesheetFilesOnly\" se aplica a HTML, HAML, Jade, Slim, XML, XSL, CSS, SCSS, SASS, LESS y Stylus. La opción \"always\" se aplica a todas las partes del archivo, independientemente de que sea de marcado o CSS.",
-+	"emmetShowAbbreviationSuggestions": "Muestra posibles abreviaciones Emmet como sugerencias. No se aplica a hojas de estilos ni cuando emmet.showExpandedAbbreviation está establecido en \"never\".",
-+	"emmetIncludeLanguages": "Habilita abreviaciones Emmet en lenguajes que no se admiten de forma predeterminada. Agregue una asignación aquí entre el lenguaje y el lenguaje que admite Emmet.\n Ejemplo: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
-+	"emmetVariables": "Variables para usar en fragmentos de código Emmet",
-+	"emmetTriggerExpansionOnTab": "Cuando se habilita, se expande la abreviación Emmet al presionar la tecla TAB.",
-+>>>>>>> .their
- 	"emmetPreferences": "Preferencias usadas para modificar el comportamiento de algunas acciones y resoluciones de Emmet.",
- 	"emmetPreferencesIntUnit": "Unidad predeterminada para valores enteros",
- 	"emmetPreferencesFloatUnit": "Unidad predeterminada para valores float",
-@@ -47,6 +60,7 @@
- 	"emmetPreferencesCssBetween": "Símbolo que debe colocarse entre una propiedad CSS y un valor cuando se expanden abreviaturas CSS",
- 	"emmetPreferencesSassBetween": "Símbolo que debe colocarse entre una propiedad CSS y un valor cuando se expanden abreviaturas CSS en archivos SASS",
- 	"emmetPreferencesStylusBetween": "Símbolo que debe colocarse entre una propiedad CSS y un valor cuando se expanden abreviaturas CSS en archivos Stylus",
-+<<<<<<< .our
- 	"emmetShowSuggestionsAsSnippets": "Si es \"true\", las sugerencias Emmet se muestran como fragmentos de código, de modo que puede ordenarlas por el valor editor.snippetSuggestions. ",
- 	"emmetPreferencesBemElementSeparator": "Separador de elemento utilizado para las clases cuando se utiliza el filtro BEM",
- 	"emmetPreferencesBemModifierSeparator": "Separador de modificador utilizado para las clases cuando se utiliza el filtro BEM",
-@@ -62,4 +76,7 @@
- 	"emmetPreferencesCssMsProperties": "Propiedades CSS separadas por comas que obtienen el prefijo de proveedor 'ms' cuando se utilizan en la abreviatura Emmet que comienza con '-'. Establecer en la cadena vacía para evitar siempre el prefijo 'ms'.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "La mínima puntuación (de 0 a 1) que se debe alcanzar en la comparación difusa de abreviación. Los valores más bajos pueden producir muchos resultados falsos positivos, los valores más altos pueden reducir posibles coincidencias.",
- 	"emmetOptimizeStylesheetParsing": "Cuando se establece en falso, se analiza el archivo entero para determinar si la posición actual es válida para la expansión de abreviaturas de Emmet. Cuando se establece en verdadero, sólo el contenido alrededor de la posición actual en archivos css, scss/less es analizado."
-+=======
-+	"emmetShowSuggestionsAsSnippets": "Si es true, las sugerencias Emmet se muestran como fragmentos de código, de modo que puede ordenarlas por el valor editor.snippetSuggestions."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 4a97190b0ee3e9125fc7569a86f6f3f1dc174919 i18n/esn/extensions/extension-editing/out/extensionLinter.i18n.json
-  our    100644 be1c632d33ad9a44120a81a730ef70678bc4a96c i18n/esn/extensions/extension-editing/out/extensionLinter.i18n.json
-  their  100644 085b35595029ec7e92ae3029bc0b32368a178a23 i18n/esn/extensions/extension-editing/out/extensionLinter.i18n.json
-changed in both
-  base   100644 bd1bce4b2db94e21f382c7c424a2690a03970993 i18n/esn/extensions/git/out/commands.i18n.json
-  our    100644 022bf20d57e92a28a5ced5a2d0998bc8b0dfe335 i18n/esn/extensions/git/out/commands.i18n.json
-  their  100644 0376ca94cc1f73f29ece9da21dd3b2a968338811 i18n/esn/extensions/git/out/commands.i18n.json
-@@ -13,6 +13,7 @@
- 	"selectFolder": "Seleccione la ubicación del repositorio",
- 	"cloning": "Clonación del repositorio git ' {0} '...",
- 	"proposeopen": "¿Desea abrir el repositorio clonado?",
-+<<<<<<< .our
- 	"openrepo": "Abrir repositorio",
- 	"add": "Añadir a espacio de trabajo",
- 	"proposeopen2": "¿Desea abrir el repositorio clonado, o añadir al espacio de trabajo actual?",
-@@ -20,6 +21,10 @@
- 	"init repo": "Inicializar el repositorio",
- 	"create repo": "Inicializar el repositorio",
- 	"are you sure": "Esto creará un repositorio Git en '{0}'. ¿Está seguro de que desea continuar?",
-+=======
-+	"path to init": "Ruta de acceso de la carpeta",
-+	"provide path": "Proporcione una ruta de acceso de carpeta para inicializar un repositorio GIT",
-+>>>>>>> .their
- 	"HEAD not available": "La versión HEAD de '{0}' no está disponible.",
- 	"confirm stage files with merge conflicts": "¿Está seguro de que quiere hacer una copia intermedia de {0} archivos con conflictos de fusión mediante combinación?",
- 	"confirm stage file with merge conflicts": "¿Está seguro de que quiere hacer una copia intermedia de {0} con conflictos de fusión mediante combinación? ",
-@@ -27,7 +32,11 @@
- 	"confirm revert": "¿Está seguro de que desea revertir los cambios seleccionados en {0}?",
- 	"revert": "Revertir cambios",
- 	"discard": "Descartar cambios",
-+<<<<<<< .our
- 	"confirm delete": "¿Está seguro de que desea eliminar '{0}'? ",
-+=======
-+	"confirm delete": "¿Está seguro que desea eliminar {0}?",
-+>>>>>>> .their
- 	"delete file": "Eliminar archivo",
- 	"confirm discard": "¿Está seguro de que quiere descartar los cambios de {0}?",
- 	"confirm discard multiple": "¿Está seguro de que quiere descartar los cambios de {0} archivos?",
-@@ -43,10 +52,13 @@
- 	"confirm discard all 2": "{0}\n\nEsta acción es IRREVERSIBLE. Su espacio de trabajo actual SE PERDERÁ PARA SIEMPRE.",
- 	"yes discard tracked": "Descartar un archivo con seguimiento",
- 	"yes discard tracked multiple": "Descartar {0} archivos con seguimiento",
-+<<<<<<< .our
- 	"unsaved files single": "El siguiente archivo no está guardado: {0}.\n¿Desea guardarlo antes de confirmarlo? ",
- 	"unsaved files": "Hay {0} archivos sin guardar.\n¿Desea guardarlos antes de confirmar?",
- 	"save and commit": "Guardar todo y confirmar",
- 	"commit": "Confirmar de todas formas",
-+=======
-+>>>>>>> .their
- 	"no staged changes": "No hay elementos almacenados provisionalmente.\n\n¿Desea almacenar de forma provisional todos sus cambios y confirmarlos directamente?",
- 	"always": "Siempre",
- 	"no changes": "No hay cambios para confirmar.",
-@@ -62,14 +74,22 @@
- 	"branch already exists": "Ya existe una rama como '{0}'",
- 	"select a branch to merge from": "Seleccione una rama desde la que fusionar",
- 	"merge conflicts": "Hay conflictos de fusión. Resuelvalos antes de confirmar.",
-+<<<<<<< .our
- 	"tag name": "Nombre de etiqueta",
- 	"provide tag name": "Por favor proporcione un nombre para la etiqueta ",
- 	"tag message": "Mensaje ",
- 	"provide tag message": "Por favor, especifique un mensaje para anotar la etiqueta",
- 	"no remotes to fetch": "El repositorio no tiene remotos configurados de los que extraer.",
-+=======
-+	"tag name": "Nombre de la etiqueta",
-+	"provide tag name": "Por favor proporcione un nombre de etiqueta",
-+	"tag message": "Mensaje",
-+	"provide tag message": "Por favor, especifique un mensaje para anotar la etiqueta",
-+>>>>>>> .their
- 	"no remotes to pull": "El repositorio no tiene remotos configurados de los que extraer.",
- 	"pick remote pull repo": "Seleccione un origen remoto desde el que extraer la rama",
- 	"no remotes to push": "El repositorio no tiene remotos configurados en los que insertar.",
-+	"push with tags success": "Insertado con etiquetas correctamente.",
- 	"nobranch": "Extraiga del repositorio una rama para insertar un remoto.",
- 	"confirm publish branch": "La rama ' {0} ' no tiene ninguna rama ascendente. ¿desea publicar esta rama?",
- 	"ok": "Aceptar",
-changed in both
-  base   100644 f05f241d9280a04a61fc5ce0f2ac489cd4965167 i18n/esn/extensions/git/out/model.i18n.json
-  our    100644 b82caa9b99f18f952d3cb06630c6aee0fe0f8278 i18n/esn/extensions/git/out/model.i18n.json
-  their  100644 4fc1dc343c5afcbf2163bb3669a59e00b7aee795 i18n/esn/extensions/git/out/model.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -7,6 +8,8 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"too many submodules": "El repositorio ' {0} ' tiene {1} submódulos que no se abrirán automáticamente. Usted todavía puede abrir cada archivo individualmente.",
-+=======
-+>>>>>>> .their
- 	"no repositories": "No hay repositorios disponibles",
- 	"pick repo": "Elija un repositorio"
- }
-\ No newline at end of file
-added in both
-  our    100644 17b0873d4bcd7cb34dd2ec900e871c45abefab7f i18n/esn/extensions/git/out/repository.i18n.json
-  their  100644 fc557b451ea1f64e5ae274c7e75c709e10b00eeb i18n/esn/extensions/git/out/repository.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,6 +11,18 @@
- 	"index modified": "Índice modificado",
- 	"modified": "Modificado",
- 	"index added": "Índice añadido",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"open": "Abrir",
-+	"index modified": "Índice modificado",
-+	"modified": "Modificado",
-+	"index added": "Índice agregado",
-+>>>>>>> .their
- 	"index deleted": "Índice Eliminado",
- 	"deleted": "Eliminado",
- 	"index renamed": "Nombre de Índice Cambiado",
-@@ -23,13 +36,20 @@
- 	"deleted by us": "Borrado por nosotros",
- 	"both added": "Ambos añadidos",
- 	"both modified": "Ambos modificados",
-+<<<<<<< .our
- 	"commitMessage": "Message (press {0} to commit)",
-+=======
-+>>>>>>> .their
- 	"commit": "Confirmar",
- 	"merge changes": "Fusionar cambios mediante combinación",
- 	"staged changes": "Cambios almacenados provisionalmente",
- 	"changes": "Cambios",
-+<<<<<<< .our
- 	"commitMessageCountdown": "quedan {0} caracteres en la línea actual",
- 	"commitMessageWarning": "{0} caracteres sobre {1} en la línea actual",
-+=======
-+	"ok": "Aceptar",
-+>>>>>>> .their
- 	"neveragain": "No volver a mostrar",
- 	"huge": "El repositorio Git '{0}' contiene muchos cambios activos, solamente un subconjunto de las características de Git serán habilitadas."
- }
-\ No newline at end of file
-changed in both
-  base   100644 859497d97537ab98b14e3fa0042045457e7a4cca i18n/esn/extensions/git/package.i18n.json
-  our    100644 87a73cba8a7c7a490f6aba897a9a18d1a57dfc4c i18n/esn/extensions/git/package.i18n.json
-  their  100644 5b79f9f5752324ff6be1e50590415c4342d5e859 i18n/esn/extensions/git/package.i18n.json
-@@ -40,7 +40,10 @@
- 	"command.renameBranch": "Renombrar Rama...",
- 	"command.merge": "Fusionar rama...",
- 	"command.createTag": "Crear etiqueta",
-+<<<<<<< .our
- 	"command.fetch": "Buscar",
-+=======
-+>>>>>>> .their
- 	"command.pull": "Incorporación de cambios",
- 	"command.pullRebase": "Incorporación de cambios (fusionar mediante cambio de base)",
- 	"command.pullFrom": "Extraer de...",
-@@ -52,7 +55,10 @@
- 	"command.publish": "Publicar rama",
- 	"command.showOutput": "Mostrar salida de GIT",
- 	"command.ignore": "Agregar archivo a .gitignore",
-+<<<<<<< .our
- 	"command.stashIncludeUntracked": "Guardar provisionalmente (Incluir sin seguimiento)",
-+=======
-+>>>>>>> .their
- 	"command.stash": "Guardar provisionalmente",
- 	"command.stashPop": "Aplicar y quitar cambios guardados provisionalmente...",
- 	"command.stashPopLatest": "Aplicar y quitar últimos cambios guardados provisionalmente...",
-@@ -71,6 +77,7 @@
- 	"config.defaultCloneDirectory": "La ubicación predeterminada en la que se clona un repositorio git",
- 	"config.enableSmartCommit": "Confirmar todos los cambios cuando no hay elementos almacenados provisionalmente.",
- 	"config.enableCommitSigning": "Habilitar confirmar firma con GPG.",
-+<<<<<<< .our
- 	"config.discardAllScope": "Controla qué cambios son descartados por el comando 'Descartar todos los cambios'. 'all' descarta todos los cambios. 'tracked' descarta sólo los ficheros en seguimiento. 'prompt' muestra un cuadro de diálogo para confirmar cada vez la acción ejecutada.",
- 	"config.decorations.enabled": "Controla si Git contribuye los colores y distintivos al explorador y a los editores abiertos.",
- 	"config.promptToSaveFilesBeforeCommit": "Controla si Git debe comprobar los archivos no guardados antes de confirmar las actualizaciones. ",
-@@ -84,4 +91,7 @@
- 	"colors.ignored": "Color para los recursos ignorados.",
- 	"colors.conflict": "Color para los recursos con conflictos.",
- 	"colors.submodule": "Color para los recursos de submódulos."
-+=======
-+	"config.discardAllScope": "Controla qué cambios son descartados por el comando 'Descartar todos los cambios'. 'todos' descarta todos los cambios. 'seguidos' descarta sólo los ficheros en seguimiento. 'confirmar' muestra un cuadro de diálogo para confirmar cada vez la acción ejecutada."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ef2f1f348b3189ac4fa9926efed9b2fba507bde4 i18n/esn/extensions/html/package.i18n.json
-  our    100644 3a6ffcc4e4ebeb98400717bf3f45cbcbcf9ceae9 i18n/esn/extensions/html/package.i18n.json
-  their  100644 cdb66142db9adf5af16f1f1253fb70a427e73342 i18n/esn/extensions/html/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,28 @@
- 	],
- 	"displayName": "Conceptos básicos de lenguaje HTML",
- 	"description": "Proporciona resaltado de sintaxis, correspondencia de corchetes y fragmentos de código en archivos HTML."
-+=======
-+	"html.format.enable.desc": "Habilitar o deshabilitar el formateador HTML predeterminado",
-+	"html.format.wrapLineLength.desc": "Cantidad máxima de caracteres por línea (0 = deshabilitar).",
-+	"html.format.unformatted.desc": "Lista de etiquetas, separadas por comas, a las que no se debe volver a aplicar formato. El valor predeterminado de \"null\" son todas las etiquetas mostradas en https://www.w3.org/TR/html5/dom.html#phrasing-content.",
-+	"html.format.contentUnformatted.desc": "Lista de etiquetas, separadas por comas, en las que el contenido no debe volver a formatearse. \"null\" se establece de manera predeterminada en la etiqueta \"pre\".",
-+	"html.format.indentInnerHtml.desc": "Aplicar sangría a las secciones <head> y <body>.",
-+	"html.format.preserveNewLines.desc": "Indica si los saltos de línea existentes delante de los elementos deben conservarse. Solo funciona delante de los elementos, no dentro de las etiquetas o con texto.",
-+	"html.format.maxPreserveNewLines.desc": "Número máximo de saltos de línea que deben conservarse en un fragmento. Use \"null\" para que el número sea ilimitado.",
-+	"html.format.indentHandlebars.desc": "Formato y sangría {{#foo}} y {{/foo}}.",
-+	"html.format.endWithNewline.desc": "Finalizar con una nueva línea.",
-+	"html.format.extraLiners.desc": "Lista de etiquetas, separadas por comas, que deben tener una nueva línea adicional delante. \"null\" tiene como valores predeterminados \"head, body, /html\".",
-+	"html.format.wrapAttributes.desc": "Ajustar atributos.",
-+	"html.format.wrapAttributes.auto": "Ajustar atributos solo cuando se supera la longitud de la línea.",
-+	"html.format.wrapAttributes.force": "Ajustar todos los atributos excepto el primero.",
-+	"html.format.wrapAttributes.forcealign": "Ajustar todos los atributos excepto el primero y mantener la alineación.",
-+	"html.format.wrapAttributes.forcemultiline": "Ajustar todos los atributos.",
-+	"html.suggest.angular1.desc": "Configura si la compatibilidad con el lenguaje HTML integrada sugiere etiquetas y propiedades de Angular V1.",
-+	"html.suggest.ionic.desc": "Configura si la compatibilidad con el lenguaje HTML integrada sugiere etiquetas, propiedades y valores de Ionic.",
-+	"html.suggest.html5.desc": "Configura si la compatibilidad con el lenguaje HTML integrada sugiere etiquetas, propiedades y valores de HTML5.",
-+	"html.trace.server.desc": "Hace un seguimiento de la comunicación entre VSCode y el servidor de lenguaje HTML.",
-+	"html.validate.scripts": "Configura si la compatibilidad con el lenguaje HTML incorporado valida los scripts insertados.",
-+	"html.validate.styles": "Configura si la compatibilidad con el lenguaje HTML incorporado valida los estilos insertados.",
-+	"html.autoClosingTags": "Habilita o deshabilita el cierre automático de las etiquetas HTML."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e0edef4c42c9015fb7dfda8c29b92d48df5e14e4 i18n/esn/extensions/json/package.i18n.json
-  our    100644 4586ba0848a0700bed84ad6b0bcbc8ad9fbdd679 i18n/esn/extensions/json/package.i18n.json
-  their  100644 f73d2ce55781e092a7e3a1bda6fc05b1456c037a i18n/esn/extensions/json/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,15 @@
- 	],
- 	"displayName": "Conceptos básicos de lenguaje JSON",
- 	"description": "Proporciona resaltado de sintaxis y correspondencia de corchetes en archivos JSON."
-+=======
-+	"json.schemas.desc": "Asociar esquemas a archivos JSON en el proyecto actual",
-+	"json.schemas.url.desc": "Una dirección URL a un esquema o una ruta de acceso relativa a un esquema en el directorio actual",
-+	"json.schemas.fileMatch.desc": "Una matriz de patrones de archivo con los cuales coincidir cuando los archivos JSON se resuelvan en esquemas.",
-+	"json.schemas.fileMatch.item.desc": "Un patrón de archivo que puede contener \"*\" con el cual coincidir cuando los archivos JSON se resuelvan en esquemas.",
-+	"json.schemas.schema.desc": "La definición de esquema de la dirección URL determinada. Solo se necesita proporcionar el esquema para evitar los accesos a la dirección URL del esquema.",
-+	"json.format.enable.desc": "Habilitar/deshabilitar formateador JSON predeterminado (requiere reiniciar)",
-+	"json.tracing.desc": "Seguimiento de comunicación entre VS Code y el servidor de lenguaje JSON",
-+	"json.colorDecorators.enable.desc": "Habilita o deshabilita decoradores de color",
-+	"json.colorDecorators.enable.deprecationMessage": "El valor \"json.colorDecorators.enable\" está en desuso en favor de \"editor.colorDecorators\"."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ad9405c75c5c1291b397539b3b11b1d9342e06b7 i18n/esn/extensions/markdown/out/security.i18n.json
-  our    100644 cd6b70bb3a25a73b220c4a52e88dd14c9e6cb7dc i18n/esn/extensions/markdown/out/security.i18n.json
-  their  100644 ec5482bbbf2ca18a3055150a39feb79be14cc6c3 i18n/esn/extensions/markdown/out/security.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -16,5 +17,14 @@
- 	"enableSecurityWarning.title": "Habilitar advertencias de seguridad de vista previa en este espacio de trabajo",
- 	"disableSecurityWarning.title": "Deshabilitar advertencias de seguridad de vista previa en este espacio de trabajo",
- 	"toggleSecurityWarning.description": "No afecta el nivel de seguridad de contenido",
-+=======
-+	"strict.title": "Estricto",
-+	"strict.description": "Cargar solo el contenido seguro",
-+	"insecureContent.title": "Permitir contenido inseguro",
-+	"insecureContent.description": "Habilitar la carga del contenido sobre http",
-+	"disable.title": "Deshabilitar",
-+	"disable.description": "Permitir todo el contenido y la ejecución de scripts. No se recomienda.",
-+	"moreInfo.title": "Más información",
-+>>>>>>> .their
- 	"preview.showPreviewSecuritySelector.title": "Seleccione configuración de seguridad para las previsualizaciones de Markdown en esta área de trabajo"
- }
-\ No newline at end of file
-changed in both
-  base   100644 79557625b6c7b844b5fe443dfc957e63f8a3c0f1 i18n/esn/extensions/markdown/package.i18n.json
-  our    100644 0e6d8a1f74f90c67e6557536e174a40194ab5c37 i18n/esn/extensions/markdown/package.i18n.json
-  their  100644 5038437a133654da44afb45562d948287d45ea8b i18n/esn/extensions/markdown/package.i18n.json
-@@ -27,6 +27,10 @@
- 	"markdown.styles.dec": "Una lista de direcciones URL o rutas de acceso locales a hojas de estilo CSS que utilizar desde la vista previa del descuento. Las tutas de acceso relativas se interpretan en relación con la carpeta abierta en el explorador. Si no hay ninguna carpeta abierta, se interpretan en relación con la ubicación del archivo del descuento. Todos los '\\' deben escribirse como '\\\\'.",
- 	"markdown.showPreviewSecuritySelector.title": "Cambiar configuración de seguridad de vista previa",
- 	"markdown.trace.desc": "Habilitar registro de depuración para las extensiones de Markdown. ",
-+<<<<<<< .our
- 	"markdown.preview.refresh.title": "Actualizar vista previa",
- 	"markdown.preview.toggleLock.title": "Cambiar fijación de la vista previa "
-+=======
-+	"markdown.refreshPreview.title": "Actualizar vista previa"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 ea0f0a445e58bd1dc9d09c0dc259f0abe3237252 i18n/esn/extensions/typescript/out/utils/api.i18n.json
-  their  100644 dbd035ca7a7ff70638cf88393f2e0524d63c1e08 i18n/esn/extensions/typescript/out/utils/api.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"invalidVersion": "versión inválida"
- }
-\ No newline at end of file
-changed in both
-  base   100644 d8a5be9b3bff34b49fe1b40ed4ede3966b49554f i18n/esn/extensions/typescript/out/utils/versionPicker.i18n.json
-  our    100644 2cac579a2183435c1c92841ccbea0c796e6800e0 i18n/esn/extensions/typescript/out/utils/versionPicker.i18n.json
-  their  100644 ad50dfc9605fa47bc4bdf5e4bc27ce1de63c4c74 i18n/esn/extensions/typescript/out/utils/versionPicker.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"useVSCodeVersionOption": "Utilizar la versión de VS Code",
- 	"useWorkspaceVersionOption": "Usar versión del área de trabajo",
- 	"learnMore": "Más información",
-changed in both
-  base   100644 55bac23eb3c006122b7faa52b32c99020bc1a6a4 i18n/esn/extensions/typescript/out/utils/versionProvider.i18n.json
-  our    100644 2fa648a3e7e252a3f32a4590e4cb2163293837c8 i18n/esn/extensions/typescript/out/utils/versionProvider.i18n.json
-  their  100644 1b370b81201d3e1d8d94245787c4d976e406d388 i18n/esn/extensions/typescript/out/utils/versionProvider.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"couldNotLoadTsVersion": "No se pudo cargar la versión de TypeScript en esta ruta",
- 	"noBundledServerFound": "Otra aplicación (por ejemplo, una herramienta de detección de virus con un comportamiento erróneo) eliminó el tsserver de VSCode. Debe reinstalar el VS Code."
- }
-\ No newline at end of file
-changed in both
-  base   100644 1201416614d961784cbd44e4fe648ded3407735f i18n/esn/extensions/typescript/package.i18n.json
-  our    100644 622b6fc58819e8c01bc967cde654d845bccf06f1 i18n/esn/extensions/typescript/package.i18n.json
-  their  100644 2aeb36b7218a447dbd7ff9e8b43af238ce259b93 i18n/esn/extensions/typescript/package.i18n.json
-changed in both
-  base   100644 3a099ab94418f505508479a910813e43624d2888 i18n/esn/src/vs/code/electron-main/menus.i18n.json
-  our    100644 2173ae65d3ed6bda349c8ed563942ab2c195e7ea i18n/esn/src/vs/code/electron-main/menus.i18n.json
-  their  100644 df5c5da56dc32f8ec338aa795db0bdc7d54101ee i18n/esn/src/vs/code/electron-main/menus.i18n.json
-@@ -189,5 +189,11 @@
- 	"miDownloadingUpdate": "Descargando actualización...",
- 	"miInstallUpdate": "Instalar actualización...",
- 	"miInstallingUpdate": "Instalando actualización...",
-+<<<<<<< .our
- 	"miRestartToUpdate": "Reiniciar para actualizar..."
-+=======
-+	"miCheckForUpdates": "Buscar actualizaciones...",
-+	"aboutDetail": "\nVersión: {0}\nConfirmación: {1}\nFecha: {2}\nShell: {3}\nRepresentador: {4}\nNodo {5}\nArquitectura {6}",
-+	"okButton": "Aceptar"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f6ded97afe145bec636b3de2cf151b3d5aa9cb91 i18n/esn/src/vs/code/electron-main/windows.i18n.json
-  our    100644 d39f314a25745d7bc4fbb19303cbdd7777c5672d i18n/esn/src/vs/code/electron-main/windows.i18n.json
-  their  100644 1e72e361ddffc06443696c32119fab4cbafcc037 i18n/esn/src/vs/code/electron-main/windows.i18n.json
-@@ -9,15 +9,30 @@
- 	"ok": "Aceptar",
- 	"pathNotExistTitle": "La ruta no existe",
- 	"pathNotExistDetail": "Parece que la ruta '{0}' ya no existe en el disco.",
-+<<<<<<< .our
- 	"reopen": "&& Abrir",
- 	"wait": "&& Mantener la espera",
- 	"close": "&& Cerrar",
-+=======
-+	"openWorkspace": "&&Abrir...",
-+	"openWorkspaceTitle": "Abrir área de trabajo",
-+	"save": "&&Guardar",
-+	"doNotSave": "&&No guardar",
-+	"cancel": "Cancelar",
-+	"saveWorkspaceMessage": "¿Quiere guardar la configuración del área de trabajo como un archivo?",
-+	"saveWorkspaceDetail": "Guarde el área de trabajo si tiene pensado volverla a abrir.",
-+	"saveWorkspace": "Guardar área de trabajo",
-+	"reopen": "Volver a abrir",
-+	"wait": "Siga esperando",
-+	"close": "Cerrar",
-+>>>>>>> .their
- 	"appStalled": "La ventana ha dejado de responder.",
- 	"appStalledDetail": "Puede volver a abrir la ventana, cerrarla o seguir esperando.",
- 	"appCrashed": "La ventana se bloqueó",
- 	"appCrashedDetail": "Sentimos las molestias. Puede volver a abrir la ventana para continuar donde se detuvo.",
- 	"open": "Abrir",
- 	"openFolder": "Abrir carpeta",
-+<<<<<<< .our
- 	"openFile": "Abrir archivo",
- 	"workspaceOpenedMessage": "No se puede guardar el espacio de trabajo '{0}'",
- 	"workspaceOpenedDetail": "El espacio de trabajo ya está abierto en otra ventana. Por favor, cierre primero la ventana y vuelta a intentarlo de nuevo.",
-@@ -29,4 +44,7 @@
- 	"saveWorkspaceMessage": "¿Quiere guardar la configuración del área de trabajo como un archivo?",
- 	"saveWorkspaceDetail": "Guarde el área de trabajo si tiene pensado volverla a abrir.",
- 	"saveWorkspace": "Guardar área de trabajo"
-+=======
-+	"openFile": "Abrir archivo"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 4fbc97c7e588ec59000b921a8e355e94d34ad5aa i18n/esn/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 6ad3e3ebd5e87cf26a1b950237c8c58f3d92b674 i18n/esn/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 eced5bb390d4a0c8a315d497d0e61cb7a9c49ed1 i18n/esn/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -26,11 +26,17 @@
- 	"detectIndentation": "Al abrir un archivo, se detectarán `editor.tabSize` y `editor.insertSpaces` en función del contenido del archivo.",
- 	"roundedSelection": "Controla si las selecciones tienen esquinas redondeadas",
- 	"scrollBeyondLastLine": "Controla si el editor se seguirá desplazando después de la última línea",
-+<<<<<<< .our
- 	"scrollBeyondLastColumn": "Controla el número de caracteres adicionales a partir del cual el editor se desplazará horizontalmente",
- 	"smoothScrolling": "Controla si el editor se desplaza con una animación",
- 	"minimap.enabled": "Controla si se muestra el minimapa",
- 	"minimap.side": "Controla en qué lado se muestra el minimapa.",
- 	"minimap.showSlider": "Controla si el control deslizante del minimapa es ocultado automáticamente.",
-+=======
-+	"smoothScrolling": "Controla si el editor se desplaza con una animación",
-+	"minimap.enabled": "Controla si se muestra el minimapa",
-+	"minimap.showSlider": "Controla si se oculta automáticamente el control deslizante del minimapa. Los valores posibles son \"always\" y \"mouseover\".",
-+>>>>>>> .their
- 	"minimap.renderCharacters": "Presentar los caracteres reales en una línea (por oposición a bloques de color)",
- 	"minimap.maxColumn": "Limitar el ancho del minimapa para presentar como mucho un número de columnas determinado",
- 	"find.seedSearchStringFromSelection": "Controla si se inicializa la cadena de búsqueda en Buscar widget en la selección del editor",
-@@ -106,11 +112,14 @@
- 	"accessibilitySupport": "Controla si el editor se debe ejecutar en un modo optimizado para lectores de pantalla.",
- 	"links": "Controla si el editor debe detectar enlaces y hacerlos cliqueables",
- 	"colorDecorators": "Controla si el editor debe representar el Selector de colores y los elementos Decorator de color en línea.",
-+<<<<<<< .our
- 	"codeActions": "Permite que el foco de acción del código",
- 	"codeActionsOnSave.organizeImports": "¿organizar importaciones en guardar?",
- 	"codeActionsOnSave": "Tipos de acción de código que se ejecutarán en guardar.",
- 	"codeActionsOnSaveTimeout": "Tiempo de espera para ejecutar acciones de código en guardar.",
- 	"selectionClipboard": "Controla si el portapapeles principal de Linux debe admitirse.",
-+=======
-+>>>>>>> .their
- 	"sideBySide": "Controla si el editor de diferencias muestra las diferencias en paralelo o alineadas.",
- 	"ignoreTrimWhitespace": "Controla si el editor de diferencias muestra los cambios de espacio inicial o espacio final como diferencias.",
- 	"largeFileOptimizations": "Manejo especial para archivos grandes para desactivar ciertas funciones de memoria intensiva.",
-changed in both
-  base   100644 153aeca3e8bedeaad60e820cbcebee665add7be8 i18n/esn/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 e90f2798b359468ab2a777af9b7d68417b46fdb4 i18n/esn/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 2e0fab4b002f0ae3f34b5a55c89d876644bf6519 i18n/esn/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -28,12 +28,16 @@
- 	"errorBorder": "Color de borde de squigglies de error en el editor.",
- 	"warningForeground": "Color de primer plano de squigglies de advertencia en el editor.",
- 	"warningBorder": "Color de borde de squigglies de advertencia en el editor.",
-+<<<<<<< .our
- 	"infoForeground": "Color de primer plano de los subrayados ondulados informativos en el editor.",
- 	"infoBorder": "Color del borde de los subrayados ondulados informativos en el editor.",
- 	"hintForeground": "Color de primer plano de pista squigglies en el editor.",
- 	"hintBorder": "Color de borde de pista squigglies en el editor.",
- 	"unnecessaryForeground": "Color de primer plano de código innecesario en el editor.",
- 	"overviewRulerRangeHighlight": "Resumen de color de marcador para destacar rangos. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
-+=======
-+	"overviewRulerRangeHighlight": "Color de marcador de regla de información general para intervalos resaltados.",
-+>>>>>>> .their
- 	"overviewRuleError": "Color de marcador de regla de información general para errores. ",
- 	"overviewRuleWarning": "Color de marcador de regla de información general para advertencias.",
- 	"overviewRuleInfo": "Color de marcador de regla de información general para mensajes informativos. "
-changed in both
-  base   100644 d7f7577857c0178652297dfd4a277fdd2ee0907a i18n/esn/src/vs/editor/contrib/find/common/findController.i18n.json
-  our    100644 27d384a1b6819c1c9684fe1acbb034af8aebf02c i18n/esn/src/vs/editor/contrib/find/common/findController.i18n.json
-  their  100644 2928bececece405849e616b93729fb43121c68aa i18n/esn/src/vs/editor/contrib/find/common/findController.i18n.json
-@@ -10,6 +10,15 @@
- 	"nextSelectionMatchFindAction": "Buscar selección siguiente",
- 	"previousSelectionMatchFindAction": "Buscar selección anterior",
- 	"startReplace": "Reemplazar",
-+<<<<<<< .our
-+=======
-+	"addSelectionToNextFindMatch": "Agregar selección hasta la siguiente coincidencia de búsqueda",
-+	"addSelectionToPreviousFindMatch": "Agregar selección hasta la anterior coincidencia de búsqueda",
-+	"moveSelectionToNextFindMatch": "Mover última selección hasta la siguiente coincidencia de búsqueda",
-+	"moveSelectionToPreviousFindMatch": "Mover última selección hasta la anterior coincidencia de búsqueda",
-+	"selectAllOccurrencesOfFindMatch": "Seleccionar todas las repeticiones de coincidencia de búsqueda",
-+	"changeAll.label": "Cambiar todas las ocurrencias",
-+>>>>>>> .their
- 	"showNextFindTermAction": "Mostrar el siguiente término de búsqueda",
- 	"showPreviousFindTermAction": "Mostrar término de búsqueda anterior"
- }
-\ No newline at end of file
-changed in both
-  base   100644 b91a9fcb702cf4ebe1ca1f0a7876bc7e6c63efe2 i18n/esn/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
-  our    100644 ce1db0c57f28706e8cb649ba2cef27d66109e621 i18n/esn/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
-  their  100644 b26c24f60e653adbeb3a25c8f356c9a631011f8f i18n/esn/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
-@@ -7,7 +7,11 @@
- 	"wordHighlight": "Color de fondo de un símbolo durante el acceso de lectura; por ejemplo, cuando se lee una variable.",
- 	"wordHighlightStrong": "Color de fondo de un símbolo durante el acceso de escritura; por ejemplo, cuando se escribe una variable.",
- 	"overviewRulerWordHighlightForeground": "Color de marcador de regla de información general para símbolos resaltados.",
-+<<<<<<< .our
- 	"overviewRulerWordHighlightStrongForeground": "Color de marcador de regla de información general para símbolos de acceso de escritura resaltados. ",
- 	"wordHighlight.next.label": "Ir al siguiente símbolo destacado",
- 	"wordHighlight.previous.label": "Ir al símbolo destacado anterior"
-+=======
-+	"overviewRulerWordHighlightStrongForeground": "Color de marcador de regla de información general para símbolos de acceso de escritura resaltados. "
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 1a1f18154df7d227e5ad918a8f35586067699264 i18n/esn/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 b4899e15c5b89e537d227799bd60ed681404b6ca i18n/esn/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 b1f3b77299fd974610803d7dce2d35c9a7577d60 i18n/esn/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,9 +10,12 @@
- 	"diff": "Comparar dos archivos entre sí.",
- 	"add": "Agregar carpetas a la última ventana activa.",
- 	"goto": "Abrir un archivo en la ruta de acceso de la línea y posición de carácter especificadas.",
-+<<<<<<< .our
- 	"newWindow": "Fuerza para abrir una nueva ventana.",
- 	"reuseWindow": "Forzar para abrir un archivo o carpeta en la última ventana activa.",
- 	"wait": "Espere a que los archivos sean cerrados antes de volver.",
-+=======
-+>>>>>>> .their
- 	"locale": "La configuración regional que se usará (por ejemplo, en-US o zh-TW).",
- 	"userDataDir": "Especifica el directorio donde se guardan los datos del usuario. Se puede utilizar para abrir varias instancias de código distintas.",
- 	"version": "Versión de impresión.",
-added in both
-  our    100644 9ff13a2b8bfe56256dc36fc8a07898e7d7a38bc7 i18n/esn/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
-  their  100644 497e5ec39ecaf743e20dc9ea96c00f14ce319791 i18n/esn/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"contributes.color": "Contribuye a la extensión definida para los colores de los temas",
- 	"contributes.color.id": "El identificador de los colores de los temas",
- 	"contributes.color.id.format": "Los identificadores deben estar en la forma aa [.bb] *",
-@@ -15,8 +24,14 @@
- 	"contributes.defaults.highContrast": "El color predeterminado para los temas con constraste. Un valor de color en hexadecimal (#RRGGBB [AA]) o el identificador de un color para los temas que proporciona el valor predeterminado.",
- 	"invalid.colorConfiguration": "'configuration.colors' debe ser una matriz",
- 	"invalid.default.colorType": "{0} debe ser un valor de color en hexadecimal (#RRGGBB [AA] o #RGB [A]) o el identificador de un color para los temas que puede ser el valor predeterminado.",
-+<<<<<<< .our
- 	"invalid.id": "'configuration.colors.id' debe definirse y no puede estar vacío",
- 	"invalid.id.format": "'configuration.colors.id' debe seguir la palabra [.word]*",
- 	"invalid.description": "'configuration.colors.description' debe definirse y no puede estar vacío",
-+=======
-+	"invalid.id": "'configuration.colors.id' debe ser definida y no puede estar vacía",
-+	"invalid.id.format": "'configuration.colors.id' debe seguir la palabra [.word]*",
-+	"invalid.description": "'configuration.colors.description' debe ser definida y no puede estar vacía",
-+>>>>>>> .their
- 	"invalid.defaults": "'configuration.colors.defaults' debe ser definida y contener 'light', 'dark' y 'highContrast'"
- }
-\ No newline at end of file
-changed in both
-  base   100644 ea1252e6e2faeb928a3dffab842ed180aee582c8 i18n/esn/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 df47f2d2522b992756f57ce29b59bc070792254f i18n/esn/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 91ed718d0adc2d4297364cbb23bb6ecd4ddc9cf0 i18n/esn/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -96,6 +96,11 @@
- 	"overviewRulerCurrentContentForeground": "Primer plano de la regla de visión general actual para conflictos de combinación alineados.",
- 	"overviewRulerIncomingContentForeground": "Primer plano de regla de visión general de entrada para conflictos de combinación alineados.",
- 	"overviewRulerCommonContentForeground": "Primer plano de la regla de visión general de ancestros comunes para conflictos de combinación alineados.",
-+<<<<<<< .our
- 	"overviewRulerFindMatchForeground": "Destaca el color del marcador de regla para las coincidencias de búsqueda. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
- 	"overviewRulerSelectionHighlightForeground": "Destaca el color del marcador de regla para los puntos de selección . El color no debe ser opaco para no ocultar las decoraciones subyacentes."
-+=======
-+	"overviewRulerFindMatchForeground": "Color de marcador de regla de información general para coincidencias encontradas.",
-+	"overviewRulerSelectionHighlightForeground": "Color de marcador de regla de información general para elementos seleccionados resaltados."
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 9fccfc5be29a080558a2bdef30b4cc20fe650121 i18n/esn/src/vs/platform/workspaces/common/workspaces.i18n.json
-  their  100644 bdb0c0100ddf93614f7ea1c2ddbf21ebbe253c79 i18n/esn/src/vs/platform/workspaces/common/workspaces.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"codeWorkspace": "Espacio de trabajo de código",
- 	"untitledWorkspace": "Sin título (Espacio de trabajo)",
- 	"workspaceNameVerbose": "{0} (espacio de trabajo)",
-added in both
-  our    100644 0566852f130fcef5bb293a2d00aac7a5f202deaf i18n/esn/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
-  their  100644 2f9d0b3805c5ae670a3ccc2efc27231cd9bf3a9b i18n/esn/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,4 +11,16 @@
- 	"failedDep1": "No se pudo activar la extensión \"{1}\" porque no se pudo activar la dependencia \"{0}\".",
- 	"failedDep2": "No se pudo activar la extensión \"{0}\" porque hay más de 10 niveles de dependencias (lo más probable es que sea un bucle de dependencia).",
- 	"activationError": "No se pudo activar la extensión \"{0}\": {1}."
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"unknownDep": "La extensión `{1}` no se pudo activar. Motivo: dependencia `{0}` desconocida.",
-+	"failedDep1": "La extensión `{1}` no se pudo activar. Motivo: La dependencia `{0}` no se pudo activar.",
-+	"failedDep2": "La extensión `{0}` no se pudo activar. Motivo: más de 10 niveles de dependencias (probablemente sea un bucle de dependencias).",
-+	"activationError": "Error al activar la extensión `{0}`: {1}."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 0c23382bea4e472ec4eef6fd26f69c0e64205165 i18n/esn/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 c48bc5883853a0c6c279c545c6c1c9d024a6241b i18n/esn/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 9e8733c7faf77e7bb62d84eb16b14fb62dfa38ee i18n/esn/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -9,6 +9,7 @@
- 	"openFile": "Abrir archivo...",
- 	"openFolder": "Abrir carpeta...",
- 	"openFileFolder": "Abrir...",
-+<<<<<<< .our
- 	"globalRemoveFolderFromWorkspace": "Quitar carpeta del Área de trabajo...",
- 	"saveWorkspaceAsAction": "Guardar área de trabajo como...",
- 	"save": "&&Guardar",
-@@ -16,4 +17,19 @@
- 	"openWorkspaceAction": "Abrir área de trabajo...",
- 	"openWorkspaceConfigFile": "Abrir archivo de configuración del área de trabajo",
- 	"duplicateWorkspaceInNewWindow": "Duplicar el área de trabajo en una ventana nueva"
-+=======
-+	"addFolderToWorkspace": "Agregar carpeta al área de trabajo...",
-+	"add": "&& Agregar",
-+	"addFolderToWorkspaceTitle": "Agregar carpeta al área de trabajo",
-+	"newWorkspace": "Nueva área de trabajo...",
-+	"select": "&&Seleccionar",
-+	"selectWorkspace": "Seleccionar carpetas para el área de trabajo",
-+	"removeFolderFromWorkspace": "Quitar carpeta del área de trabajo",
-+	"saveWorkspaceAsAction": "Guardar área de trabajo como...",
-+	"saveEmptyWorkspaceNotSupported": "Abra un área de trabajo antes de guardar.",
-+	"save": "&&Guardar",
-+	"saveWorkspace": "Guardar área de trabajo",
-+	"openWorkspaceAction": "Abrir área de trabajo...",
-+	"openWorkspaceConfigFile": "Abrir archivo de configuración del área de trabajo"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f155f261fa1391fc6f10c6cdbe008fdb675c82b9 i18n/esn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 e35e95658e0757a0dd58a01697234694ea4f0954 i18n/esn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 e50bfab447c66d6063a1c89dcb964f82c7be01b3 i18n/esn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 8791cdb4ffb50cec595a210f8de07468bf4c70de i18n/esn/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-  our    100644 9813cd2ca327085170a56ccd1ad7fd899ea9a685 i18n/esn/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-  their  100644 19146d91eec52d3afe8e2f36d367b74d58efb78d i18n/esn/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,9 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"compositePart.hideSideBarLabel": "Ocultar barra lateral",
-+>>>>>>> .their
- 	"focusSideBar": "Enfocar la barra lateral",
- 	"viewCategory": "Ver"
- }
-\ No newline at end of file
-changed in both
-  base   100644 42525c6192bd52a670d1aeadc597582517a5feab i18n/esn/src/vs/workbench/common/theme.i18n.json
-  our    100644 a12ae1a7d50911472b1c450409ccd4fd8e4aba33 i18n/esn/src/vs/workbench/common/theme.i18n.json
-  their  100644 89603df1cd82652d76fec444080e271bf4751af1 i18n/esn/src/vs/workbench/common/theme.i18n.json
-@@ -11,12 +11,17 @@
- 	"tabHoverBackground": "Color de fondo de la pestaña activa. Las pestañas son los contenedores de los editores en el área de editores. Se pueden abrir varias pestañas en un grupo de editores. Puede haber varios grupos de editores. ",
- 	"tabUnfocusedHoverBackground": "Color de fondo de tabulación en un grupo no enfocado cuando se pasa. Las fichas son los contenedores para los editores en el área del editor. Se pueden abrir varias fichas en un grupo de editores. Puede haber varios grupos de editores.",
- 	"tabBorder": "Borde para separar las pestañas entre sí. Las pestañas son contenedores de editores en el área de editores. Se pueden abrir varias pestañas en un grupo de editores. Puede haber varios grupos de editores.",
-+<<<<<<< .our
- 	"tabActiveBorder": "Borde en la parte inferior de una ficha activa. Las fichas son los contenedores para los editores en el área de edición. Múltiple pestañas pueden abrirse en un grupo de editor. Puede haber múltiples grupos de editor. ",
- 	"tabActiveBorderTop": "Borde a la parte superior de una pestaña activa. Las pestañas son los contenedores para los editores en el área del editor. Se pueden abrir múltiples pestañas en un grupo de editores. Puede haber múltiples grupos de editores.",
- 	"tabActiveUnfocusedBorder": "Borde en la parte inferior de una pestaña activa para un grupo no seleccionado. Las pestañas son los contenedores para los editores en el área del editor. Se pueden abrir múltiples pestañas en un grupo de editores. Puede haber múltiples grupos de editores.",
- 	"tabActiveUnfocusedBorderTop": "Borde en la parte superior de una pestaña activa para un grupo no seleccionado. Las pestañas son los contenedores para los editores en el área del editor. Se pueden abrir múltiples pestañas en un grupo de editores. Puede haber múltiples grupos de editores.",
- 	"tabHoverBorder": "Borde para resaltar tabulaciones cuando se activan. Las fichas son los contenedores para los editores en el área del editor. Se pueden abrir varias fichas en un grupo de editores. Puede haber varios grupos de editores. ",
- 	"tabUnfocusedHoverBorder": "Borde para resaltar tabulaciones cuando se activan. Las fichas son los contenedores para los editores en el área del editor. Se pueden abrir varias fichas en un grupo de editores. Puede haber varios grupos de editores. ",
-+=======
-+	"tabActiveBorder": "Borde para resaltar las fichas activas. Las fichas son los contenedores de los editores en el área de editores. Se pueden abrir varias fichas en un grupo de editores. Puede haber varios grupos de editores.",
-+	"tabActiveUnfocusedBorder": "Borde para resaltar las fichas activas en un grupo que no tiene el foco. Las fichas son los contenedores de los editores en el área de editores. Se pueden abrir varias fichas en un grupo de editores. Puede haber varios grupos de editores. ",
-+>>>>>>> .their
- 	"tabActiveForeground": "Color de primer plano de la pestaña activa en un grupo activo. Las pestañas son los contenedores de los editores en el área de editores. Se pueden abrir varias pestañas en un grupo de editores. Puede haber varios grupos de editores.",
- 	"tabInactiveForeground": "Color de primer plano de la pestaña inactiva en un grupo activo. Las pestañas son los contenedores de los editores en el área de editores. Se pueden abrir varias pestañas en un grupo de editores. Puede haber varios grupos de editores.",
- 	"tabUnfocusedActiveForeground": "Color de primer plano de la ficha activa en un grupo que no tiene el foco. Las fichas son los contenedores de los editores en el área de editores. Se pueden abrir varias fichas en un grupo de editores. Puede haber varios grupos de editores. ",
-@@ -32,7 +37,10 @@
- 	"panelActiveTitleForeground": "Color del título del panel activo. Los paneles se muestran debajo del área del editor y contienen vistas como Salida y Terminal integrado.",
- 	"panelInactiveTitleForeground": "Color del título del panel inactivo. Los paneles se muestran debajo del área del editor y contienen vistas como Salida y Terminal integrado.",
- 	"panelActiveTitleBorder": "Color de borde del título del panel activo. Los paneles se muestran debajo del área del editor y contienen vistas como Salida y Terminal integrado.",
-+<<<<<<< .our
- 	"panelDragAndDropBackground": "Arrastre y suelte color comentarios para los artículos de título del panel. El color debe tener transparencia para que las entradas del panel todavía pueden brillar a través. Los paneles se muestran debajo de la zona de editor y contienen vistas como salida y el terminal integrado.",
-+=======
-+>>>>>>> .their
- 	"statusBarForeground": "Color de primer plano de la barra de estado cuando se abre un espacio de trabajo. La barra de estado se muestra en la parte inferior de la ventana.",
- 	"statusBarNoFolderForeground": "Color de primer plano de la barra de estado cuando no hay ninguna carpeta abierta. La barra de estado se muestra en la parte inferior de la ventana.",
- 	"statusBarBackground": "Color de fondo de la barra de estado cuando se abre un espacio de trabajo. La barra de estado se muestra en la parte inferior de la ventana.",
-@@ -61,6 +69,7 @@
- 	"titleBarActiveBackground": "Fondo de la barra de título cuando la ventana está activa. Tenga en cuenta que, actualmente, este color solo se admite en macOS.",
- 	"titleBarInactiveBackground": "Color de fondo de la barra de título cuando la ventana está inactiva. Tenga en cuenta que, actualmente, este color solo se admite en macOS.",
- 	"titleBarBorder": "Color de borde de la barra de título. Tenga en cuenta que, actualmente, este color se admite solo en macOS.",
-+<<<<<<< .our
- 	"notificationCenterBorder": "Color del borde del centro de notificaciones. Las notificaciones se deslizan desde la parte inferior derecha de la ventana.",
- 	"notificationToastBorder": "Color del borde de las notificaciones del sistema. Las notificaciones se deslizan desde la parte inferior derecha de la ventana.",
- 	"notificationsForeground": "Color de primer plano de las notificaciones. Las notificaciones se deslizan desde la parte inferior derecha de la ventana.",
-@@ -69,4 +78,17 @@
- 	"notificationCenterHeaderForeground": "Color de primer plano del encabezado del centro de notificaciones. Las notificaciones se deslizan desde la parte inferior derecha de la ventana.",
- 	"notificationCenterHeaderBackground": "Color de fondo del encabezado del centro de notificaciones. Las notificaciones se deslizan desde la parte inferior derecha de la ventana.",
- 	"notificationsBorder": "Color de borde que separa las notificaciones en el centro de notificaciones. Las notificaciones se deslizan desde la parte inferior derecha de la ventana."
-+=======
-+	"notificationsForeground": "Color de primer plano de las notificaciones. Estas se deslizan en la parte superior de la ventana. ",
-+	"notificationsBackground": "Color de fondo de las notificaciones. Estas se deslizan en la parte superior de la ventana. ",
-+	"notificationsButtonBackground": "Color de fondo del botón de notificaciones. Estas se deslizan en la parte superior de la ventana.",
-+	"notificationsButtonHoverBackground": "Color de fondo del botón de notificaciones al desplazar el ratón sobre él. Estas se deslizan en la parte superior de la ventana.",
-+	"notificationsButtonForeground": "Color de primer plano del botón de notificaciones. Estas se deslizan en la parte superior de la ventana.",
-+	"notificationsInfoBackground": "Color de fondo de la información de notificaciones. Estas se deslizan en la parte superior de la ventana.",
-+	"notificationsInfoForeground": "Color de primer plano de la información de notificaciones. Estas se deslizan en la parte superior de la ventana.",
-+	"notificationsWarningBackground": "Color de fondo del aviso de notificaciones. Estas se deslizan en la parte superior de la ventana.",
-+	"notificationsWarningForeground": "Color de primer plano del aviso de notificaciones. Estas se deslizan en la parte superior de la ventana.",
-+	"notificationsErrorBackground": "Color de fondo del error de notificaciones. Estas se deslizan en la parte superior de la ventana.",
-+	"notificationsErrorForeground": "Color de primer plano del error de notificaciones. Estas se deslizan en la parte superior de la ventana."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d8ddeb3fcda4008a6898b1b170368d03aab35f5b i18n/esn/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 89fe344b57b1d619a163cac9c32cff2261374fbd i18n/esn/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 dfb23a5b69a6f8f1e565b1321020eec7aac2b79d i18n/esn/src/vs/workbench/electron-browser/actions.i18n.json
-changed in both
-  base   100644 dc8d19d2e3a3558f89911ae9264afd9ed19dd979 i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 57d447a0a0b664b859bc321a1781f6980e63b0fd i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 485778c1c8caff53f27f07f38f5ad84cd95783ab i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,6 +35,7 @@
- 	"panelDefaultLocation": "Controla la ubicación predeterminada del panel. Puede mostrarse en la parte inferior o a la derecha de la mesa de banco.",
- 	"statusBarVisibility": "Controla la visibilidad de la barra de estado en la parte inferior del área de trabajo.",
- 	"activityBarVisibility": "Controla la visibilidad de la barra de actividades en el área de trabajo.",
-+<<<<<<< .our
- 	"viewVisibility": "Controla la visibilidad de las acciones en el encabezado de la vista. Las acciones en el encabezado de la vista pueden ser siempre visibles, o solo cuando la vista es enfocada o apuntada.",
- 	"fontAliasing": "Controla el método de suavizado de fuentes en la mesa de trabajo.\n-por defecto: subpíxel suavizado de fuentes. En la mayoría las pantallas retina no dará el texto más agudo - alisado: suavizar la fuente a nivel del píxel, a diferencia de los subpíxeles. Puede hacer que la fuente aparezca más general - ninguno: desactiva el suavizado de fuentes. Texto se mostrará con dentados filos - auto: se aplica el 'default' o 'antialiasing' automáticamente en función de la DPI de la muestra.",
- 	"workbench.fontAliasing.default": "Suavizado de fuentes en subpíxeles. En la mayoría de las pantallas que no son Retina, esta opción muestra el texto más nítido.",
-@@ -43,6 +44,15 @@
- 	"workbench.fontAliasing.auto": "Aplica ' default ' o ' antialiased ' automáticamente basándose en la DPI de las pantallas.",
- 	"enableNaturalLanguageSettingsSearch": "Controla si habilita el modo de búsqueda de lenguaje natural para la configuración.",
- 	"windowConfigurationTitle": "Ventana",
-+=======
-+	"closeOnFileDelete": "Controla si los editores que muestran un archivo deben cerrarse automáticamente cuando otro proceso elimina el archivo o le cambia el nombre. Si se deshabilita esta opción y se da alguna de estas circunstancias, se mantiene el editor abierto con modificaciones. Tenga en cuenta que, cuando se eliminan archivos desde la aplicación, siempre se cierra el editor y que los archivos con modificaciones no se cierran nunca para preservar los datos.",
-+	"fontAliasing": "Controla el método de suavizado de fuentes en el área de trabajo.\n- default: suavizado de fuentes en subpíxeles. En la mayoría de las pantallas que no son Retina, esta opción muestra el texto más nítido.\n- antialiased: suaviza las fuentes en píxeles, en lugar de subpíxeles. Puede hacer que las fuentes se vean más claras en general\n- none: deshabilita el suavizado de fuentes. El texto se muestra con bordes nítidos irregulares.",
-+	"workbench.fontAliasing.default": "Suavizado de fuentes en subpíxeles. En la mayoría de las pantallas que no son Retina, esta opción muestra el texto más nítido.",
-+	"workbench.fontAliasing.antialiased": "Suaviza las fuentes en píxeles, en lugar de subpíxeles. Puede hacer que las fuentes se vean más claras en general.",
-+	"workbench.fontAliasing.none": "Deshabilita el suavizado de fuentes. El texto se muestra con bordes nítidos irregulares.",
-+	"swipeToNavigate": "Navegar entre achivos abiertos utlizando la pulsación de tres dedos para deslizar horizontalmante.",
-+	"workbenchConfigurationTitle": "Área de trabajo",
-+>>>>>>> .their
- 	"window.openFilesInNewWindow.on": "Los archivos se abrirán en una nueva ventana",
- 	"window.openFilesInNewWindow.off": "Los archivos se abrirán en la ventana con la carpeta de archivos abierta o en la última ventana activa",
- 	"window.openFilesInNewWindow.defaultMac": "Los archivos se abrirán en la ventana con la carpeta de archivos abierta o en la última ventana activa, a menos que se abran con Dock o desde Finder.",
-changed in both
-  base   100644 ff93659c0b4766c04545fce5164d554d2b143b93 i18n/esn/src/vs/workbench/electron-browser/window.i18n.json
-  our    100644 e8aa1b0f0ade64091e67095c753c265dcab4edbb i18n/esn/src/vs/workbench/electron-browser/window.i18n.json
-  their  100644 5ceee829d2632f3ff65633bc0ba139e2e739546e i18n/esn/src/vs/workbench/electron-browser/window.i18n.json
-@@ -11,6 +11,10 @@
- 	"cut": "Cortar",
- 	"copy": "Copiar",
- 	"paste": "Pegar",
-+<<<<<<< .our
- 	"selectAll": "Seleccionar todo",
- 	"runningAsRoot": "No se recomienda ejecutar {0} como usuario root."
-+=======
-+	"selectAll": "Seleccionar todo"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 5748eeef8658d25ff9dddfb572bf21a1a7efe5b4 i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
-  their  100644 72b8a580d23e40d18c6ad1c30c29873816fb9ea4 i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"toggleMinimap": "Ver: Alternar minimapa"
- }
-\ No newline at end of file
-changed in both
-  base   100644 2bb51d7bf48af7ec4ce45162ba1f5b06b36f88d4 i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
-  our    100644 c2a66591e49279aadc2aae5c61a3a8020fc33cc9 i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
-  their  100644 ae024682e37c30767e61acb919cb264766c0c989 i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"toggleRenderControlCharacters": "Ver: Alternar caracteres de control"
- }
-\ No newline at end of file
-changed in both
-  base   100644 621ee31ec258162ead203361656c9ce689872cdf i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
-  our    100644 42cfbca9ac2164d71b267f36a2f926d540004585 i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
-  their  100644 b46420bf78488f41730bbf15a6622d69d7576365 i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"toggleRenderWhitespace": "Ver: Alternar representación de espacio en blanco"
- }
-\ No newline at end of file
-changed in both
-  base   100644 83815d8f8b2f3e84d7b20a90ff058f6b2e810256 i18n/esn/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  our    100644 f7ca04589cbd9f14b8ad81f3eeeb2d31b025f0be i18n/esn/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  their  100644 a4c0a9b282fb25e21203f52f11914ee0318ed94d i18n/esn/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-changed in both
-  base   100644 254f116235119f71d640904de46ce6f762fab859 i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 d28e2c7b8c0f100d21de57741d72f030bc22f977 i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 52c1264aae654e49c6394fa2a452052a864031b9 i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -28,7 +28,12 @@
- 	"preLaunchTaskExitCode": "La tarea preLaunchTask '{0}' finalizó con el código de salida {1}.",
- 	"showErrors": "Mostrar errores",
- 	"noFolderWorkspaceDebugError": "El archivo activo no se puede depurar. Compruebe que se ha guardado en el disco y que tiene una extensión de depuración instalada para ese tipo de archivo.",
-+<<<<<<< .our
- 	"cancel": "Cancelar",
- 	"DebugTaskNotFound": "No se pudo encontrar la tarea '{0}'.",
- 	"taskNotTracked": "La tarea '{0}' no puede rastrearse."
-+=======
-+	"NewLaunchConfig": "Defina los valores del archivo de configuración de inicio para la aplicación. {0}",
-+	"DebugTaskNotFound": "No se encontró el elemento preLaunchTask '{0}'."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ff677b59a60d7db60f598e857c6a74b0719443ab i18n/esn/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  our    100644 decfe5f17ec5766164dc8ed0fd546cc20aa4c84f i18n/esn/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  their  100644 ca947a2308c7eedaea302f64c067730e233ded47 i18n/esn/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-changed in both
-  base   100644 00a55728fff7c05706588ddeea5e28cea24a151a i18n/esn/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  our    100644 3055932755fc85e2cfe5115465d1c1970923bac0 i18n/esn/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  their  100644 2ad5121b38e2455fc46af3ba2fee36bb3789fc60 i18n/esn/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-@@ -8,6 +8,23 @@
- 	],
- 	"debugAdapterBinNotFound": "El ejecutable del adaptador de depuración \"{0}\" no existe.",
- 	"debugAdapterCannotDetermineExecutable": "No se puede determinar el ejecutable para el adaptador de depuración \"{0}\".",
-+<<<<<<< .our
- 	"unableToLaunchDebugAdapter": "No se puede iniciar el adaptador de depuración desde '{0}'.",
- 	"unableToLaunchDebugAdapterNoArgs": "No se puede iniciar el adaptador de depuración."
-+=======
-+	"launch.config.comment1": "Utilizar IntelliSense para aprender acerca de los posibles atributos.",
-+	"launch.config.comment2": "Mantenga el puntero para ver las descripciones de los existentes atributos ",
-+	"launch.config.comment3": "Para más información, visite: {0}",
-+	"debugType": "Tipo de configuración.",
-+	"debugTypeNotRecognised": "Este tipo de depuración no se reconoce. Compruebe que tiene instalada la correspondiente extensión de depuración y que está habilitada.",
-+	"node2NotSupported": "\"node2\" ya no se admite; use \"node\" en su lugar y establezca el atributo \"protocol\" en \"inspector\".",
-+	"debugName": "Nombre de la configuración. Aparece en el menú desplegable de la configuración de inicio.",
-+	"debugRequest": "Tipo de solicitud de la configuración. Puede ser \"launch\" o \"attach\".",
-+	"debugServer": "Solo para el desarrollo de extensiones de depuración: si se especifica un puerto, VS Code intenta conectarse a un adaptador de depuración que se ejecuta en modo servidor",
-+	"debugPrelaunchTask": "Tarea que se va a ejecutar antes de iniciarse la sesión de depuración.",
-+	"debugWindowsConfiguration": "Atributos de configuración de inicio específicos de Windows.",
-+	"debugOSXConfiguration": "Atributos de configuración de inicio específicos de OS X.",
-+	"debugLinuxConfiguration": "Atributos de configuración de inicio específicos de Linux.",
-+	"deprecatedVariables": "\"env.\", \"config.\" y \"command.\" están en desuso, utilice en su lugar \"env:\", \"config:\" y \"command:\"."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 5e236865193d6269c830c1a492ada0d2c55fd245 i18n/esn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 695af76fadee1019c3d4b030faef94140cf218ba i18n/esn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 25236ca476935c3fc6897369d6e7cfc8e51f40e7 i18n/esn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-@@ -52,7 +52,14 @@
- 	"extensionInstalled": "La extensión recomendada ya ha sido instalada",
- 	"showRecommendedKeymapExtensionsShort": "Asignaciones de teclado",
- 	"showLanguageExtensionsShort": "Extensiones del lenguaje",
-+<<<<<<< .our
- 	"showAzureExtensionsShort": "Extensiones de Azure",
-+=======
-+	"showAzureExtensions": "Mostrar extensiones de Azure",
-+	"showAzureExtensionsShort": "Extensiones de Azure",
-+	"configureWorkspaceRecommendedExtensions": "Configurar extensiones recomendadas (área de trabajo)",
-+	"ConfigureWorkspaceRecommendations.noWorkspace": "Las recomendaciones solo están disponibles en una carpeta de área de trabajo.",
-+>>>>>>> .their
- 	"OpenExtensionsFile.failed": "No se puede crear el archivo \"extensions.json\" dentro de la carpeta \".vscode\" ({0}).",
- 	"configureWorkspaceRecommendedExtensions": "Configurar extensiones recomendadas (área de trabajo)",
- 	"configureWorkspaceFolderRecommendedExtensions": "Configurar extensiones recomendadas (Carpeta del área de trabajo)",
-changed in both
-  base   100644 a58136aa89fa9fe4bdc337f806e71cf429d06cdf i18n/esn/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
-  our    100644 5b4f1d9a867259ee397b0ce30c196d0e0e92f66c i18n/esn/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
-  their  100644 9b4c0a6fb4586073b2c3708789a8064149beaef7 i18n/esn/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
-@@ -4,7 +4,11 @@
-  *--------------------------------------------------------------------------------------------*/
- // Do not edit this file. It is machine generated.
- {
-+<<<<<<< .our
- 	"filesCategory": "Archivo",
-+=======
-+	"filesCategory": "Archivos",
-+>>>>>>> .their
- 	"revealInSideBar": "Mostrar en barra lateral",
- 	"acceptLocalChanges": "Usar los cambios y sobrescribir el contenido del disco",
- 	"revertLocalChanges": "Descartar los cambios y volver al contenido del disco"
-changed in both
-  base   100644 c3a2ac37c7e7f92dcb2868d9b1e108d1eb0e8e68 i18n/esn/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  our    100644 6ceeb1cae46a37cb52e1e026c2b248e26e834bff i18n/esn/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  their  100644 836362af71e2b16ee1831e5f9f0b7efc14cab6c9 i18n/esn/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-@@ -69,7 +69,11 @@
- 	"invalidFileNameError": "El nombre **{0}** no es válido para el archivo o la carpeta. Elija un nombre diferente.",
- 	"filePathTooLongError": "El nombre **{0}** da como resultado una ruta de acceso demasiado larga. Elija un nombre más corto.",
- 	"compareWithSaved": "Comparar el archivo activo con el guardado",
-+<<<<<<< .our
- 	"modifiedLabel": "{0} (en disco) ↔ {1}",
- 	"compareWithClipboard": "Comparar archivo activo con portapapeles",
- 	"clipboardComparisonLabel": "Portapapeles ↔ {0}"
-+=======
-+	"modifiedLabel": "{0} (en disco) ↔ {1}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ad4eeb2b73109bd8f3b7286dde5456825e4d5e75 i18n/esn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 6b7926d2bf7039c9fedbd3b89b2c9e98ee891b0d i18n/esn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 37183f7f6f2c5e4c88b739573a7ccd2b89b6e941 i18n/esn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-@@ -40,14 +40,21 @@
- 	"dynamicHeight": "Controla si la altura de la sección de editores abiertos debería adaptarse o no de forma dinámica al número de elementos.",
- 	"autoReveal": "Controla si el explorador debe mostrar y seleccionar automáticamente los archivos al abrirlos.",
- 	"enableDragAndDrop": "Controla si el explorador debe permitir mover archivos y carpetas mediante la función arrastrar y colocar.",
-+<<<<<<< .our
- 	"confirmDragAndDrop": "Controla si el explorador debe pedir la confirmación al reubicar archivos o carpetas a través de arrastrar y soltar.",
- 	"confirmDelete": "Controla si el explorador debe pedir la confirmación al borrar un archivo utilizando la papelera.",
-+=======
-+>>>>>>> .their
- 	"sortOrder.default": "Los archivos y las carpetas se ordenan por nombre alfabéticamente. Las carpetas se muestran antes que los archivos.",
- 	"sortOrder.mixed": "Los archivos y las carpetas se ordenan por nombre alfabéticamente. Los archivos se entrelazan con las carpetas.",
- 	"sortOrder.filesFirst": "Los archivos y las carpetas se ordenan por nombre alfabéticamente. Los archivos se muestran antes que las carpetas.",
- 	"sortOrder.type": "Los archivos y las carpetas se ordenan por extensión. Las carpetas se muestran antes que los archivos.",
- 	"sortOrder.modified": "Los archivos y las carpetas se ordenan por fecha de última modificación. Las carpetas se muestran antes que los archivos.",
-+<<<<<<< .our
- 	"sortOrder": "Controla el criterio de ordenación de los archivos y las carpetas en el explorador. Además del orden \"default\", puede establecer el orden en \"mixed\" (los archivos y las carpetas se ordenan combinados), \"type\" (por tipo de archivo), \"modified\" (por fecha de última modificación) o \"filesFirst\" (los archivos se colocan antes que las carpetas).",
- 	"explorer.decorations.colors": "Controla si las decoraciones de archivo deben utilizar colores. ",
- 	"explorer.decorations.badges": "Controla si las decoraciones de archivo deben utilizar insignias"
-+=======
-+	"sortOrder": "Controla el criterio de ordenación de los archivos y las carpetas en el explorador. Además del orden \"default\", puede establecer el orden en \"mixed\" (los archivos y las carpetas se ordenan combinados), \"type\" (por tipo de archivo), \"modified\" (por fecha de última modificación) o \"filesFirst\" (los archivos se colocan antes que las carpetas)."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e5705ac4c784df8a3dd4454a29534038053107b9 i18n/esn/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-  our    100644 186f5cdaa427312a38cea816fd6aefcbf2dffeee i18n/esn/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-  their  100644 7e727b161ff1eb8f3ab2e2b905d4aff2118aa3e3 i18n/esn/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-@@ -12,5 +12,6 @@
- 	"genericSaveError": "No se pudo guardar '{0}': {1}",
- 	"staleSaveError": "No se pudo guardar '{0}': El contenido del disco es más reciente. Haga clic en **Comparar** para comparar su versión con la que hay en el disco.",
- 	"compareChanges": "Comparar",
--	"saveConflictDiffLabel": "0} (on disk) ↔ {1} (in {2}) - Resolver conflicto guardado"
-+	"saveConflictDiffLabel": "0} (on disk) ↔ {1} (in {2}) - Resolver conflicto guardado",
-+	"userGuide": "Use las acciones de la barra de herramientas del editor situada a la derecha para **deshacer** los cambios o **sobrescribir** el contenido del disco con sus cambios"
- }
-\ No newline at end of file
-changed in both
-  base   100644 6dd654390f15fdca06052764172d7357847e534a i18n/esn/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
-  our    100644 f1bacff5d9e85baf059e558cc9dbda4b91b1b620 i18n/esn/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
-  their  100644 7903df9c11bfb5dfebce9f55398e724396e36ec9 i18n/esn/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
-@@ -10,9 +10,12 @@
- 	"dropFolder": "¿Quiere agregar la carpeta al área de trabajo?",
- 	"addFolders": "&&Agregar carpetas",
- 	"addFolder": "&&Agregar carpeta",
-+<<<<<<< .our
- 	"confirmMove": "¿Está seguro de que desea mover '{0}'?",
- 	"doNotAskAgain": "No volver a preguntarme",
- 	"moveButtonLabel": "&&Mover",
-+=======
-+>>>>>>> .their
- 	"confirmOverwriteMessage": "'{0}' ya existe en la carpeta de destino. ¿Desea reemplazarlo?",
- 	"irreversible": "Esta acción es irreversible.",
- 	"replaceButtonLabel": "Reemplazar"
-changed in both
-  base   100644 3131805763058e54cd505f1dfa6f6373733eb214 i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  our    100644 43c2c3d02aa907b50655fd06c6120b273adc682c i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  their  100644 2bfe512b1d5f7114a6089c8c0d2e780c716e182e i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-@@ -14,6 +14,10 @@
- 	"openGlobalKeybindingsFile": "Abrir el archivo de métodos abreviados de teclado",
- 	"openWorkspaceSettings": "Abrir configuración del área de trabajo",
- 	"openFolderSettings": "Abrir Configuración de carpeta",
-+<<<<<<< .our
-+=======
-+	"pickFolder": "Seleccionar carpeta",
-+>>>>>>> .their
- 	"configureLanguageBasedSettings": "Configurar opciones específicas del lenguaje...",
- 	"languageDescriptionConfigured": "({0})",
- 	"pickLanguage": "Seleccionar lenguaje"
-changed in both
-  base   100644 e2e21899134365fe2ad5fb6d9d2b15403a841e26 i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 98610852f746563a7652418cfa26304844d182c0 i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 ed5419507d3d191c1c9ca806689cff34303bfbd9 i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -14,4 +15,19 @@
- 	"editTtile": "Editar",
- 	"replaceDefaultValue": "Reemplazar en Configuración",
- 	"copyDefaultValue": "Copiar en Configuración"
-+=======
-+	"emptyUserSettingsHeader": "Coloque aquí su configuración para sobrescribir la configuración predeterminada.",
-+	"errorInvalidConfiguration": "No se puede escribir la configuración. Corrija los errores o advertencias del archivo y vuelva a intentarlo.",
-+	"emptyWorkspaceSettingsHeader": "Coloque aquí su configuración para sobrescribir la configuración de usuario.",
-+	"emptyFolderSettingsHeader": "Coloque aquí su configuración de carpeta para sobrescribir la que se especifica en la configuración de área de trabajo.",
-+	"defaultFolderSettingsTitle": "Configuración de carpeta predeterminada",
-+	"defaultSettingsTitle": "Configuración predeterminada",
-+	"noSettingsFound": "No se encontró ninguna configuración.",
-+	"editTtile": "Editar",
-+	"replaceDefaultValue": "Reemplazar en Configuración",
-+	"copyDefaultValue": "Copiar en Configuración",
-+	"unsupportedPHPExecutablePathSetting": "Este valor debe estar en la configuración de usuario. Si quiere configurar PHP para el área de trabajo, abra un archivo PHP y haga clic en \"Ruta de acceso PHP\" en la barra de estado.",
-+	"unsupportedWorkspaceSetting": "Este valor debe estar en Configuración de usuario.",
-+	"unsupportedWorkbenchSetting": "Esta configuración no se puede aplicar ahora. Se aplicará al abrir esta carpeta directamente."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7edb56fa42098e55e6a6f364aec11428f54c03e4 i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-  our    100644 15749e4075a6560e7e5d76cae3f4a75f319357f2 i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-  their  100644 d53ba6ae07b45a6139c2289ab72764b70b262f5d i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 ab7d78224458e031f0d5873434caefe0111f3854 i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 2126bfe2fb90bed14f7effb7b34dc1e77b479150 i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -12,4 +13,13 @@
- 	"userSettings": "Configuración de usuario",
- 	"workspaceSettings": "Configuración de área de trabajo",
- 	"folderSettings": "Configuración de Carpeta"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"folderSettingsDetails": "Configuración de carpeta"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 498d20e2ecd409c37697c1f73ccb9a17375ca27f i18n/esn/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  our    100644 2b0101fb6caa5f4582f9e7ff75c9409382316a8d i18n/esn/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  their  100644 a447e55f2de302180642e53747ded56fcaefea36 i18n/esn/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-@@ -8,5 +8,11 @@
- 	],
- 	"relaunchSettingMessage": "Ha cambiado un ajuste que requiere un reinicio para ser efectivo.",
- 	"relaunchSettingDetail": "Pulse el botón de reinicio para reiniciar {0} y habilitar el ajuste.",
-+<<<<<<< .our
- 	"restart": "&& Reiniciar"
-+=======
-+	"restart": "Reiniciar",
-+	"relaunchWorkspaceMessage": "Este cambio de área de trabajo requiere recargar nuestro sistema de extensiones.",
-+	"reload": "Recargar"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 5fe13ab86c4315a4f15f2147ff96e1dacf1a47e3 i18n/esn/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-  our    100644 a665e6376a535d3e1862813673eba9727e801ca6 i18n/esn/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-  their  100644 c0de845ea641198db6ca859d846c1f07915616b8 i18n/esn/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-changed in both
-  base   100644 a77a22117808a0b699d54ff4b5e035bd5f1bea79 i18n/esn/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  our    100644 dcde42ae5b9e9263b1e8523db6c8f5fea75da510 i18n/esn/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  their  100644 2d44f58d5145a7f19318557e6b24393b0a4bea4c i18n/esn/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-changed in both
-  base   100644 745b72f23193c055c8f503a3a8e3bf75dafdbea9 i18n/esn/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  our    100644 67ddbe8f8cd175de377b1d65230024b0fc94bf07 i18n/esn/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  their  100644 7d2149a6bbda69b36e85aa3f0e1c2192947a8a1d i18n/esn/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -10,6 +11,11 @@
- 	"hideRepository": "Ocultar",
- 	"installAdditionalSCMProviders": "Instalar proveedores  adicionales de SCM...",
- 	"no open repo": "No hay proveedores de control de código fuente activos.",
-+=======
-+	"commitMessage": "Message (press {0} to commit)",
-+	"installAdditionalSCMProviders": "Instalar proveedores  adicionales de SCM...",
-+	"no open repo": "No hay controles de código fuente activos.",
-+>>>>>>> .their
- 	"source control": "Control de código fuente",
- 	"viewletTitle": "{0}: {1}",
- 	"hideView": "Ocultar"
-changed in both
-  base   100644 676bea02e78d083517bc3e3be014a2ae3914622f i18n/esn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 08f95963fe8efaa9640a8368bea5bd91b3e1ccb0 i18n/esn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 314acd5b6dd01653d85d184675bd60ee1c6e5f58 i18n/esn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"nextSearchIncludePattern": "Mostrar siguiente búsqueda de patrón include",
- 	"previousSearchIncludePattern": "Mostrar búsqueda anterior de patrón include ",
- 	"nextSearchExcludePattern": "Mostrar siguiente búsqueda de patrón exclude ",
-@@ -16,6 +19,8 @@
- 	"previousReplaceTerm": "Mostrar la búsqueda anterior de Reemplazar término",
- 	"findInFiles": "Buscar en archivos",
- 	"replaceInFiles": "Reemplazar en archivos",
-+	"findInWorkspace": "Buscar en área de trabajo...",
-+	"findInFolder": "Buscar en carpeta...",
- 	"RefreshAction.label": "Actualizar",
- 	"CollapseDeepestExpandedLevelAction.label": "Contraer todo",
- 	"ClearSearchResultsAction.label": "Borrar",
-changed in both
-  base   100644 06b841c9cab76dfb15bb1868d131a72575db207d i18n/esn/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-  our    100644 819a6285c14c28c67f847aba7f0a36adfece768a i18n/esn/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-  their  100644 97148bc69de0f7099b7713b972f9e9d6e3c2e7bf i18n/esn/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"searchFolderMatch.other.label": "Otros archivos",
- 	"searchFileMatches": "{0} archivos encontrados",
- 	"searchFileMatch": "{0} archivo encontrado",
-changed in both
-  base   100644 9dce8d0622c4f8b3f231d0d4914664ccae36abd9 i18n/esn/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  our    100644 0c3d29ae593df25c19d137f3045954d907ba1dc7 i18n/esn/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  their  100644 82a227721a70cccce9ab5c3bc0da44f4bebdd27f i18n/esn/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-added in both
-  our    100644 86d5fc851c68c136c49f752517f823375b9b9723 i18n/esn/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
-  their  100644 de65c6ed7969457c4d6421bf7785a2511f6dfa45 i18n/esn/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"search.noWorkspaceWithName": "Ninguna carpeta en el espacio de trabajo tiene el nombre: {0}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 021fb81ebaa63f8be286150fa3b2de457da9ed54 i18n/esn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 7367d0a39f1701be221d6ff3d3d8cae3add9845a i18n/esn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 485fb9108db5995d7e80452bdcfa82fb7a7499fb i18n/esn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-changed in both
-  base   100644 048794026a3772346ae3bf1fd0509b98db8cb5c4 i18n/esn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 cf1ca0ef5c2b17265b6eb266a58dc6112305ccf4 i18n/esn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 53a1ba108d98579b9032d8d29c384571861c45f5 i18n/esn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -12,6 +12,7 @@
- 	"totalWarnings": "{0} advertencias",
- 	"totalInfos": "{0} informaciones",
- 	"problems": "Problemas",
-+<<<<<<< .our
- 	"building": "Compilando...",
- 	"manyProblems": "+10Mil",
- 	"runningTasks": "Mostrar tareas en ejecución",
-@@ -19,22 +20,36 @@
- 	"TaskSystem.noHotSwap": "Cambiar el motor de ejecución de tareas con una tarea activa ejecutandose, requiere recargar la ventana",
- 	"reloadWindow": "Recargar ventana",
- 	"TaskServer.folderIgnored": "La carpeta {0} se pasa por alto puesto que utiliza la versión 0.1.0 de las tareas",
-+=======
-+	"manyMarkers": "Más de 99",
-+	"runningTasks": "Mostrar tareas en ejecución",
-+	"tasks": "Tareas",
-+	"TaskSystem.noHotSwap": "Para cambiar el motor de ejecución de tareas, es necesario recargar la ventana",
-+>>>>>>> .their
- 	"TaskService.noBuildTask1": "No se ha definido ninguna tarea de compilación. Marque una tarea con \"isBuildCommand\" en el archivo tasks.json.",
- 	"TaskService.noBuildTask2": "No se ha definido ninguna tarea de compilación. Marque una tarea con un grupo \"build\" en el archivo tasks.json. ",
- 	"TaskService.noTestTask1": "No se ha definido ninguna tarea de prueba. Marque una tarea con \"isTestCommand\" en el archivo tasks.json.",
- 	"TaskService.noTestTask2": "No se ha definido ninguna tarea de prueba. Marque una tarea con \"test\" en el archivo tasks.json.",
- 	"TaskServer.noTask": "No se encuentra la tarea {0} que se ha solicitado para ejecutarla.",
-+<<<<<<< .our
- 	"TaskService.associate": "asociar",
-+=======
-+>>>>>>> .their
- 	"TaskService.attachProblemMatcher.continueWithout": "Continuar sin examinar la salida de la tarea",
- 	"TaskService.attachProblemMatcher.never": "No examinar nunca la salida de la tarea",
- 	"TaskService.attachProblemMatcher.learnMoreAbout": "Más información acerca del examen de la salida de la tarea",
- 	"selectProblemMatcher": "Seleccione qué tipo de errores y advertencias deben buscarse durante el examen de la salida de la tarea",
- 	"customizeParseErrors": "La configuración actual de tareas contiene errores. Antes de personalizar una tarea, corrija los errores.",
- 	"moreThanOneBuildTask": "Hay muchas tareas de compilación definidas en el archivo tasks.json. Se ejecutará la primera.\n",
-+<<<<<<< .our
- 	"TaskSystem.activeSame.background": "La tarea \"{0}\" ya está activa en segundo plano.",
- 	"TaskSystem.activeSame.noBackground": "La tarea \"{0}\" ya está activa.",
- 	"terminateTask": "Finalizar tarea",
- 	"restartTask": "Reiniciar tarea",
-+=======
-+	"TaskSystem.activeSame.background": "La tarea \"{0}\" ya está activa en segundo plano. Para terminarla, use la opción \"Terminar tarea\" del menú Tareas.",
-+	"TaskSystem.activeSame.noBackground": "La tarea \"{0}\" ya está activa. Para terminarla, use la opción \"Terminar tarea\" del menú Tareas.",
-+>>>>>>> .their
- 	"TaskSystem.active": "Ya hay una tarea en ejecución. Finalícela antes de ejecutar otra tarea.",
- 	"TaskSystem.restartFailed": "No se pudo terminar y reiniciar la tarea {0}",
- 	"TaskService.noConfiguration": "Error: La detección de tarea {0} no encontró una tarea para la siguiente configuración:\n{1}\nLa tarea será omitida.\n",
-@@ -75,8 +90,13 @@
- 	"TaskService.pickDefaultBuildTask": "Seleccione la tarea que se va a utilizar como tarea de compilación predeterminada",
- 	"TaskService.defaultTestTaskExists": "{0} ya se ha marcado como la tarea de prueba predeterminada.",
- 	"TaskService.pickDefaultTestTask": "Seleccione la tarea que se va a usar como la tarea de prueba predeterminada ",
-+<<<<<<< .our
- 	"TaskService.pickShowTask": "Seleccione la tarea de la que desea ver la salida",
- 	"TaskService.noTaskIsRunning": "Ninguna tarea se está ejecutando",
-+=======
-+	"TaskService.noTaskIsRunning": "No hay ninguna tarea en ejecución.",
-+	"TaskService.pickShowTask": "Seleccione la tarea de la que desea ver la salida",
-+>>>>>>> .their
- 	"ShowLogAction.label": "Mostrar registro de tareas",
- 	"RunTaskAction.label": "Ejecutar tarea",
- 	"RestartTaskAction.label": "Reiniciar la tarea en ejecución",
-changed in both
-  base   100644 bb2599901cac4e42180e7997e766b6638e50839d i18n/esn/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  our    100644 c53edb70544eaeed1ed345fd659e584b8c452a64 i18n/esn/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  their  100644 f7268700b7d2c4031d7dc9b1d4909ba1dd7e2808 i18n/esn/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-@@ -15,7 +15,10 @@
- 	"ConfigurationParser.invalidVaraibleReference": "Error: Referencia a problemMatcher no válida: {0}",
- 	"ConfigurationParser.noTaskType": "Error: Las tareas deben tener una propiedad type. La configuración se omitirá.\n{0}\n",
- 	"ConfigurationParser.noTypeDefinition": "Error: No hay ningún tipo de tarea \"{0}\" registrado. ¿Omitió la instalación de una extensión que proporciona un proveedor de tareas correspondiente?",
-+<<<<<<< .our
- 	"ConfigurationParser.missingRequiredProperty": "Error: la configuración de la tarea '{0}' no contiene la propiedad requerida '{1}'. Se omitirá la configuración de la tarea.",
-+=======
-+>>>>>>> .their
- 	"ConfigurationParser.notCustom": "Error: Las tareas no se declaran como una tarea personalizada. La configuración se omitirá.\n{0}\n",
- 	"ConfigurationParser.noTaskName": "Error: Las tareas deben proporcionar una propiedad label. La tarea se ignorará.\n{0}\n",
- 	"taskConfiguration.noCommandOrDependsOn": "Error: La tarea \"{0}\" no especifica un comando ni una propiedad dependsOn. La tarea se ignorará. Su definición es: \n{1}",
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/esn/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  our    100644 2dd035c28fdef3fa3b55cd25845e4c542bfe6d90 i18n/esn/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  their  100644 34f865d0af23b1328cb061843890a4f6c5e7418f i18n/esn/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,6 +10,17 @@
- 	"termEntryAriaLabel": "{0}, selector de terminal",
- 	"termCreateEntryAriaLabel": "{0}, crear nueva terminal",
- 	"workbench.action.terminal.newplus": "$(plus) Crear nueva terminal integrada",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"termEntryAriaLabel": "{0}, selector de terminal",
-+	"termCreateEntryAriaLabel": "{0}, crear nueva terminal",
-+	"'workbench.action.terminal.newplus": "$(plus) crear nueva Terminal integrada",
-+>>>>>>> .their
- 	"noTerminalsMatching": "No hay terminales coincidentes",
- 	"noTerminalsFound": "No hay terminales abiertos"
- }
-\ No newline at end of file
-changed in both
-  base   100644 120d6ffbb3d47f4a6ed247915573e0be5f1f0f5f i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 638d95e07783cab2681275875d22dd4b5bb236b5 i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 80e11f38691b0c24e4ddfef0a1c6009ff7d95154 i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,9 @@
- 	],
- 	"quickOpen.terminal": "Mostrar todos los terminales abiertos",
- 	"terminal": "Terminal",
-+=======
-+	"quickOpen.terminal": "Mostrar todos los terminales abiertos",
-+>>>>>>> .their
- 	"terminalIntegratedConfigurationTitle": "Terminal integrado",
- 	"terminal.integrated.shell.linux": "La ruta de acceso del shell que el terminal usa en Linux.",
- 	"terminal.integrated.shellArgs.linux": "Los argumentos de la línea de comandos que se usarán en el terminal de Linux.",
-@@ -36,8 +40,12 @@
- 	"terminal.integrated.env.osx": "Objeto con variables de entorno que se agregarán al proceso de VS Code para que las use el terminal en OS X",
- 	"terminal.integrated.env.linux": "Objeto con variables de entorno que se agregarán al proceso de VS Code para que las use el terminal en Linux",
- 	"terminal.integrated.env.windows": "Objeto con variables de entorno que se agregarán al proceso de VS Code para que las use el terminal en Windows",
-+<<<<<<< .our
- 	"terminal.integrated.showExitAlert": "Mostrar alerta 'El proceso de terminal terminó con el código de salida ' cuando el código de salida no es cero.",
- 	"terminal.integrated.experimentalRestore": "Indica si se restauran automáticamente las sesiones del terminal para el área de trabajo cuando se inicia VS Code. Esta es una opción experimental; puede tener errores y podría cambiar en el futuro.",
-+=======
-+	"terminal": "Terminal",
-+>>>>>>> .their
- 	"terminalCategory": "Terminal",
- 	"viewCategory": "Ver"
- }
-\ No newline at end of file
-changed in both
-  base   100644 a2abb93e39c68f700660af87e1667369bbe5da46 i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 21fcf5a4e9d2653bdf22cd882d1fa612baf507de i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 b1a91fa14c464e0045d96615009474cdca1c8e19 i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -14,8 +14,11 @@
- 	"workbench.action.terminal.selectAll": "Seleccionar todo",
- 	"workbench.action.terminal.deleteWordLeft": "Eliminar una palabra a la izquierda",
- 	"workbench.action.terminal.deleteWordRight": "Eliminar una palabra a la derecha",
-+<<<<<<< .our
- 	"workbench.action.terminal.moveToLineStart": "Mover al principio de la línea",
- 	"workbench.action.terminal.moveToLineEnd": "Mover al final de la línea",
-+=======
-+>>>>>>> .their
- 	"workbench.action.terminal.new": "Crear nuevo terminal integrado",
- 	"workbench.action.terminal.new.short": "Nuevo terminal",
- 	"workbench.action.terminal.newWorkspacePlaceholder": "Seleccione el directorio de trabajo actual para el nuevo terminal",
-@@ -53,6 +56,7 @@
- 	"workbench.action.terminal.hideFindWidget": "Ocultar Encontrar Widget",
- 	"nextTerminalFindTerm": "Mostrar siguiente término de búsqueda",
- 	"previousTerminalFindTerm": "Mostrar término de búsqueda anterior",
-+<<<<<<< .our
- 	"quickOpenTerm": "Cambiar terminal activo",
- 	"workbench.action.terminal.scrollToPreviousCommand": "Desplácese al comando anterior",
- 	"workbench.action.terminal.scrollToNextCommand": "Desplácese al siguiente comando",
-@@ -60,4 +64,7 @@
- 	"workbench.action.terminal.selectToNextCommand": "Seleccionar hasta el comando siguiente",
- 	"workbench.action.terminal.selectToPreviousLine": "Seleccione la línea anterior",
- 	"workbench.action.terminal.selectToNextLine": "Seleccione la línea siguiente"
-+=======
-+	"quickOpenTerm": "Terminal: Cambiar Terminal Activo"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d371b1e3d8c96d8eb60031f4700465a659baa5b8 i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 452c57e69431420c6bcfb59a898fee8e18810b50 i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 091847a7181701ffc388f16eccb9ff2543d27599 i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -10,7 +10,11 @@
- 	"terminal.foreground": "El color de primer plano del terminal.",
- 	"terminalCursor.foreground": "Color de primer plano del cursor del terminal.",
- 	"terminalCursor.background": "Color de fondo del cursor del terminal. Permite personalizar el color de un carácter solapado por un cursor de bloque.",
-+<<<<<<< .our
- 	"terminal.selectionBackground": "Color de fondo de selección del terminal.",
- 	"terminal.border": "Color del borde que separa paneles divididos en el terminal. El valor predeterminado es panel.border.",
- 	"terminal.ansiColor": "color ANSI ' {0} ' en el terminal."
-+=======
-+	"terminal.ansiColor": "Color ANSI \"{0}\" en el terminal."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e99da0524bcac96e49becfa9544ec4105a096a07 i18n/esn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 2d994e363264374d23ba6185653395b42a1471ce i18n/esn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 788665ef84b9513d4270d37b09250c937643db65 i18n/esn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -11,10 +11,16 @@
- 	"read the release notes": "{0} v{1}. ¿Quiere leer las notas de la versión?",
- 	"licenseChanged": "Los términos de licencia han cambiado. Haga clic [aquí]({0}) para revisarlos.",
- 	"neveragain": "No volver a mostrar",
-+<<<<<<< .our
- 	"64bitisavailable": "Ya está disponible {0} para Windows de 64 bits. Haga clic [aquí]({1}) para obtener más información.",
- 	"updateIsReady": "Nueva actualización de {0} disponible.",
- 	"noUpdatesAvailable": "Actualmente, no hay actualizaciones disponibles.",
- 	"ok": "Aceptar",
-+=======
-+	"64bitisavailable": "Ya está disponible {0} para Windows de 64 bits.",
-+	"learn more": "Más información",
-+	"updateIsReady": "Nueva actualización de {0} disponible.",
-+>>>>>>> .their
- 	"thereIsUpdateAvailable": "Hay una actualización disponible.",
- 	"download now": "Descargar ahora",
- 	"later": "Más tarde",
-changed in both
-  base   100644 2085fc57b44e604390bfd098b095970c449ec747 i18n/esn/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  our    100644 6b8a32ca0b9fbfb7b96cd4e7f9890b9f8d3db2d1 i18n/esn/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  their  100644 57c279311f148d8e241a3e3085931dc4bf4a1758 i18n/esn/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-@@ -37,6 +37,8 @@
- 	"welcomePage.showCommandsDescription": "Acceda rápidamente y busque comandos desde la Paleta de Comandos ({0})",
- 	"welcomePage.interfaceOverview": "Introducción a la interfaz",
- 	"welcomePage.interfaceOverviewDescription": "Obtenga una superposición que resalta los componentes principales de la interfaz de usuario",
-+	"welcomePage.deployToAzure": "Implementar aplicaciones en la nube",
-+	"welcomePage.deployToAzureDescription": "Vea cómo implementar sus aplicaciones de Node en Azure App Service",
- 	"welcomePage.interactivePlayground": "Área de juegos interactiva",
- 	"welcomePage.interactivePlaygroundDescription": "Pruebe las características esenciales del editor en un tutorial corto"
- }
-\ No newline at end of file
-changed in both
-  base   100644 c8a34873f9d8da569cbcebdc314a82cd97e734f3 i18n/esn/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-  our    100644 dbd723b12f68e8ad7cc1594d964090b81e98beba i18n/esn/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-  their  100644 f768bb7f55890e9810f24c7b56f12b5d11e07773 i18n/esn/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-changed in both
-  base   100644 b1be3bd2206465d2c1894607612cce42c3407b8c i18n/esn/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-  our    100644 cafbdb24ad7d28494af288481fb40eeac9df1106 i18n/esn/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-  their  100644 14443a64a66252bdf89455a73647d5fcb420a9cb i18n/esn/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-changed in both
-  base   100644 70bde8b3e76a046c528c5d5ef1defe9ab9dde8e5 i18n/esn/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
-  our    100644 25444021c9d9f6ec2b538d12c09fd06bd2d3a69e i18n/esn/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
-  their  100644 dba5932269b223698a378f5c7f46082de12f5ee5 i18n/esn/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"editorWalkThrough.title": "Área de juegos interactiva",
- 	"editorWalkThrough": "Área de juegos interactiva"
- }
-\ No newline at end of file
-changed in both
-  base   100644 05e79aa04fc5e36d1b26d265ed22a8f6d5fdaeee i18n/esn/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  our    100644 7393d6074556b0bd61735f99be1150899407f3cb i18n/esn/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  their  100644 f3c4bc3ce55c8d3c40f5b30fd086da91589a80a7 i18n/esn/src/vs/workbench/services/configuration/node/configuration.i18n.json
-@@ -9,6 +9,7 @@
- 	"scope.window.description": "Configuración específica para ventanas, que se puede definir en la configuración de usuario o de área de trabajo.",
- 	"scope.resource.description": "Configuración específica para recursos, que se puede definir en la configuración de usuario, de área de trabajo o de carpeta.",
- 	"scope.description": "Ámbito donde es aplicable la configuración. Los ámbitos disponibles son \"window\" y \"resource\".",
-+<<<<<<< .our
- 	"vscode.extension.contributes.configuration": "Aporta opciones de configuración.",
- 	"invalid.title": "configuration.title debe ser una cadena",
- 	"vscode.extension.contributes.defaultConfiguration": "Contribuye a la configuración de los parámetros del editor predeterminados por lenguaje.",
-@@ -21,4 +22,13 @@
- 	"workspaceConfig.settings.description": "Configuración de área de trabajo",
- 	"workspaceConfig.extensions.description": "Extensiones del área de trabajo",
- 	"unknownWorkspaceProperty": "Propiedad de configuración de espacio de trabajo desconocida"
-+=======
-+	"invalid.type": "si se establece, \"configuration.type\" debe establecerse en \"object\"",
-+	"invalid.title": "configuration.title debe ser una cadena",
-+	"vscode.extension.contributes.defaultConfiguration": "Contribuye a la configuración de los parámetros del editor predeterminados por lenguaje.",
-+	"invalid.properties": "configuration.properties debe ser un objeto",
-+	"workspaceConfig.folders.description": "Lista de carpetas que debe cargarse en el área de trabajo. Debe ser una ruta de acceso de archivo; por ejemplo, \"/raíz/carpetaA\" o \"./carpetaA\" para una ruta de acceso relativa que se resolverá respecto a la ubicación del archivo del área de trabajo.",
-+	"workspaceConfig.folder.description": "Ruta de acceso de archivo; por ejemplo, \"/raíz/carpetaA\" o \"./carpetaA\" para una ruta de acceso de archivo que se resolverá respecto a la ubicación del archivo del área de trabajo.",
-+	"workspaceConfig.settings.description": "Configuración de área de trabajo"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c750b75802ed6877f0ae3e9b853ea3c16fd07935 i18n/esn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 532a6558111964e59cddb3ee4e8da3da36a9d18f i18n/esn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 98bdd1d3bf582e302727c676ed9484b82266e59b i18n/esn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -9,6 +9,7 @@
- 	"openTasksConfiguration": "Abrir configuración de tareas",
- 	"openLaunchConfiguration": "Abrir configuración de inicio",
- 	"open": "Abrir configuración",
-+<<<<<<< .our
- 	"saveAndRetry": "Guardar y reintentar",
- 	"errorUnknownKey": "No se puede escribir en {0} porque {1} no es una configuración registrada.",
- 	"errorInvalidWorkspaceConfigurationApplication": "No se puede escribir {0} en Configuración de área de trabajo; solo se puede escribir en Configuración de usuario.",
-@@ -27,6 +28,19 @@
- 	"errorConfigurationFileDirty": "No se puede escribir en el archivo de configuración de usuario porque se ha modificado. Guarde primero el archivo y vuelva a intentarlo.",
- 	"errorConfigurationFileDirtyWorkspace": "No se puede escribir en el archivo de configuración del área de trabajo porque se ha modificado. Guarde primero el archivo y vuelva a intentarlo.",
- 	"errorConfigurationFileDirtyFolder": "No se puede escribir en el archivo de configuración de carpeta porque se ha modificado. Guarde primero el archivo de configuración de la carpeta \"{0}\" y vuelva a intentarlo.",
-+=======
-+	"close": "Cerrar",
-+	"saveAndRetry": "Guardar la configuración y reintentar. ",
-+	"errorUnknownKey": "No se puede escribir en {0} porque {1} no es una configuración registrada.",
-+	"errorInvalidFolderConfiguration": "No se puede escribir en Configuración de carpeta porque {0} no admite el ámbito del recurso de carpeta.",
-+	"errorInvalidUserTarget": "No se puede escribir en Configuración de usuario porque {0} no admite el ámbito global.",
-+	"errorInvalidFolderTarget": "No se puede escribir en Configuración de carpeta porque no se ha proporcionado ningún recurso.",
-+	"errorNoWorkspaceOpened": "No se puede escribir en {0} porque no hay ninguna área de trabajo abierta. Abra un área de trabajo y vuelva a intentarlo.",
-+	"errorInvalidConfiguration": "No se pudo guardar la configuración. Abra el archivo **Configuración de usuario** para corregir los errores o advertencias del archivo y vuelva a intentarlo.",
-+	"errorInvalidConfigurationWorkspace": "No se pudo guardar la configuración. Abra **Configuración de área de trabajo** para corregir los errores o advertencias del archivo y vuelva a intentarlo.",
-+	"errorConfigurationFileDirty": "No se pudo guardar la configuración porque el archivo se ha modificado. Guarde el archivo **Configuración de usuario** y vuelva a intentarlo.",
-+	"errorConfigurationFileDirtyWorkspace": "No se pudo guardar la configuración porque el archivo se ha modificado. Guarde el archivo **Configuración de área de trabajo** y vuelva a intentarlo.",
-+>>>>>>> .their
- 	"userTarget": "Configuración de usuario",
- 	"workspaceTarget": "Configuración de área de trabajo",
- 	"folderTarget": "Configuración de carpeta"
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/esn/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-  our    100644 55e16aec92fb2aa84070bbb90a6e48fce9bdc3da i18n/esn/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-  their  100644 081d076416688f1e88a1bf5f809dc0e7e11e7f30 i18n/esn/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"errorInvalidFile": "No se puede escribir en el archivo. Abra el archivo para corregir los errores o advertencias y vuelva a intentarlo.",
- 	"errorFileDirty": "No se puede escribir en el archivo porque se ha modificado. Guarde el archivo y vuelva a intentarlo."
- }
-\ No newline at end of file
-added in both
-  our    100644 1678dd227145f4c5f04ac7f8691731e23ae99ca0 i18n/esn/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
-  their  100644 0d456319334caf6cc63f5e605a4a62d42e718e3f i18n/esn/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,5 +10,15 @@
- 	"extensionHostProcess.startupFailDebug": "El host de extensiones no se inició en 10 segundos, puede que se detenga en la primera línea y necesita un depurador para continuar.",
- 	"extensionHostProcess.startupFail": "El host de extensiones no se inició en 10 segundos, lo cual puede ser un problema.",
- 	"reloadWindow": "Recargar ventana",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"extensionHostProcess.startupFailDebug": "El host de extensiones no se inició en 10 segundos, puede que se detenga en la primera línea y necesita un depurador para continuar.",
-+	"extensionHostProcess.startupFail": "El host de extensiones no se inició en 10 segundos, lo cual puede ser un problema.",
-+>>>>>>> .their
- 	"extensionHostProcess.error": "Error del host de extensiones: {0}"
- }
-\ No newline at end of file
-added in both
-  our    100644 007b1debf5ba3ef4e5a7424f8d7403918090e7db i18n/esn/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
-  their  100644 7204a4d9d39ac10d1681e29b3331776d638f1b12 i18n/esn/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,5 +10,16 @@
- 	"jsonParseFail": "No se pudo analizar {0}: {1}.",
- 	"fileReadFail": "No se puede leer el archivo {0}: {1}.",
- 	"jsonsParseReportErrors": "No se pudo analizar {0}: {1}.",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"jsonParseFail": "No se pudo analizar {0}: {1}.",
-+	"fileReadFail": "No se puede leer el archivo {0}: {1}.",
-+	"jsonsParseFail": "No se pudo analizar {0} o {1}: {2}.",
-+>>>>>>> .their
- 	"missingNLSKey": "No se encontró un mensaje para la clave {0}."
- }
-\ No newline at end of file
-added in both
-  our    100644 e86398fcbf2a8a0e5d82052d39aa511881c5e900 i18n/esn/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-  their  100644 0e9ec06b1bfa1b92b9bb65f5c8feb5a78b15497e i18n/esn/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -15,4 +16,18 @@
- 	"extensionUnderDevelopment": "Cargando la extensión de desarrollo en {0}",
- 	"extensionCache.invalid": "Las extensiones han sido modificadas en disco. Por favor, vuelva a cargar la ventana.",
- 	"reloadWindow": "Recargar ventana"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"devTools": "Herramientas de desarrollo",
-+	"restart": "Reiniciar el host de extensiones",
-+	"extensionHostProcess.crash": "El host de extensiones finalizó inesperadamente.",
-+	"extensionHostProcess.unresponsiveCrash": "Se terminó el host de extensiones porque no respondía.",
-+	"overwritingExtension": "Sobrescribiendo la extensión {0} con {1}.",
-+	"extensionUnderDevelopment": "Cargando la extensión de desarrollo en {0}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ee9bbb9d071d33866fb8a7febdf96f5224e7828e i18n/esn/src/vs/workbench/services/progress/browser/progressService2.i18n.json
-  our    100644 07bc99d803dc508b31ee25324b51d7b694aa6336 i18n/esn/src/vs/workbench/services/progress/browser/progressService2.i18n.json
-  their  100644 d810290ae9dcce8cecc6be5b74940ca2f611fab7 i18n/esn/src/vs/workbench/services/progress/browser/progressService2.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -9,4 +10,8 @@
- 	"progress.subtitle": "{0} - {1} ",
- 	"progress.title": "{0}: {1}",
- 	"cancel": "Cancelar"
-+=======
-+	"progress.subtitle": "{0} - {1} ",
-+	"progress.title": "{0}: {1}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 b64b20cb44dc2aad141fcc773d6276eb8c722279 i18n/esn/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-  our    100644 c5f8d60d0be5baafe521d4327c1e565cd4404af2 i18n/esn/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-  their  100644 2c82b2e96727f9c3f8e77416b5ee3965bf4c0e2b i18n/esn/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,12 @@
- 	"schema.token.fontStyle": "Estilo de fuente de la regla: 'cursiva', 'negrita' o 'subrayado' o una combinación. La cadena vacía desestablece la configuración heredada.",
- 	"schema.fontStyle.error": "El estilo de fuente debe ser ' cursiva', ' negrita' o ' subrayado ' o una combinación o la cadena vacía.",
- 	"schema.token.fontStyle.none": "Ninguno (borrar el estilo heredado)",
-+=======
-+	"schema.token.settings": "Colores y estilos para el token.",
-+	"schema.token.foreground": "Color de primer plano para el token.",
-+	"schema.token.fontStyle": "Estilo de fuente de la regla: una opción de \"italic\", \"bold\" y \"underline\", o una combinación de ellas.",
-+	"schema.fontStyle.error": "Estilo de fuente debe ser una combinación de 'cursiva', 'negrita' y 'subrayado'",
-+>>>>>>> .their
- 	"schema.properties.name": "Descripción de la regla.",
- 	"schema.properties.scope": "Selector de ámbito con el que se compara esta regla.",
- 	"schema.tokenColors.path": "Ruta a un archivo tmTheme (relativa al archivo actual).",
-changed in both
-  base   100644 464fd1a886e839a6539f0c975ee656b3f90f3dc6 i18n/esn/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
-  our    100644 87d444acd52cb4ee66b5262b0fb420475d0b47ea i18n/esn/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
-  their  100644 1ef0ff3dbea833387dec24542010251f32b30be4 i18n/esn/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
-changed in both
-  base   100644 e9c42972e4eb3e96d3f1e8d3509f5f0f918a71bb i18n/esn/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 5a34a01efe3be981f2f79fe82b2b70f00f7de801 i18n/esn/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 7c308f9717e0688284b624f401967edb37e52961 i18n/esn/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-@@ -13,6 +13,12 @@
- 	"noIconThemeDesc": "No file icons",
- 	"iconThemeError": "File icon theme is unknown or not installed.",
- 	"workbenchColors": "Reemplaza los colores del tema de color actual",
-+<<<<<<< .our
-+=======
-+	"workbenchColors.deprecated": "Esta configuracion no es experimental y se ha cambiado de nombre a 'workbench.colorCustomizations'",
-+	"workbenchColors.deprecatedDescription": "Utilice 'workbench.colorCustomizations' en su lugar",
-+	"editorColors": "Reemplaza los colores y el estilo de fuente del editor del tema de color seleccionado.",
-+>>>>>>> .their
- 	"editorColors.comments": "Establece los colores y estilos para los comentarios",
- 	"editorColors.strings": "Establece los colores y estilos para los literales de cadena.",
- 	"editorColors.keywords": "Establece los colores y estilos para las palabras clave.",
-@@ -20,6 +26,10 @@
- 	"editorColors.types": "Establece los colores y estilos para las declaraciones y referencias de tipos.",
- 	"editorColors.functions": "Establece los colores y estilos para las declaraciones y referencias de funciones.",
- 	"editorColors.variables": "Establece los colores y estilos para las declaraciones y referencias de variables.",
-+<<<<<<< .our
- 	"editorColors.textMateRules": "Establece colores y estilos utilizando las reglas de la tematización de textmate (avanzadas).",
- 	"editorColors": "Reemplaza los colores y el estilo de fuente del editor del tema de color seleccionado."
-+=======
-+	"editorColors.textMateRules": "Establece colores y estilos utilizando las reglas de la tematización de textmate (avanzadas)."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 96dff648d691a6faca5ad62f90576b6d28b9e40c i18n/fra/extensions/css/package.i18n.json
-  our    100644 f80d3cb8bfc3b84dafb557eea5e52f174b639db6 i18n/fra/extensions/css/package.i18n.json
-  their  100644 161a45a8a7890a5bab24fd2c3f9c6fcdf9f629a8 i18n/fra/extensions/css/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,73 @@
- 	],
- 	"displayName": "Bases du langage CSS",
- 	"description": "Fournit la coloration syntaxique et la correspondance des parenthèses dans les fichiers CSS, LESS et SCSS."
-+=======
-+	"css.lint.argumentsInColorFunction.desc": "Nombre de paramètres non valide",
-+	"css.lint.boxModel.desc": "Ne pas utiliser la largeur ou la hauteur avec une marge intérieure ou une bordure",
-+	"css.lint.compatibleVendorPrefixes.desc": "Lors de l'utilisation d'un préfixe spécifique à un fabricant, toujours inclure également toutes les propriétés spécifiques au fabricant",
-+	"css.lint.duplicateProperties.desc": "Ne pas utiliser de définitions de style en double",
-+	"css.lint.emptyRules.desc": "Ne pas utiliser d'ensembles de règles vides",
-+	"css.lint.float.desc": "N'utilisez pas 'float'. Les éléments Float peuvent fragiliser le code CSS qui est ainsi plus vulnérable si un aspect de la disposition change.",
-+	"css.lint.fontFaceProperties.desc": "la règle @font-face doit définir les propriétés 'src' et 'font-family'",
-+	"css.lint.hexColorLength.desc": "Les couleurs Hex doivent contenir trois ou six chiffres hex",
-+	"css.lint.idSelector.desc": "Les sélecteurs ne doivent pas contenir d'ID, car ces règles sont trop fortement couplées au code HTML.",
-+	"css.lint.ieHack.desc": "Les hacks IE ne sont nécessaires que si IE7 et versions antérieures sont pris en charge",
-+	"css.lint.important.desc": "N'utilisez pas !important. Cela indique que la spécificité de l'intégralité du code CSS est incorrecte et qu'il doit être refactorisé.",
-+	"css.lint.importStatement.desc": "Les instructions d'importation ne sont pas chargées en parallèle",
-+	"css.lint.propertyIgnoredDueToDisplay.desc": "Propriété ignorée en raison de l'affichage. Par exemple, avec 'display: inline', les propriétés width, height, margin-top, margin-bottom et float sont sans effet",
-+	"css.lint.universalSelector.desc": "Le sélecteur universel (*) est connu pour sa lenteur",
-+	"css.lint.unknownProperties.desc": "Propriété inconnue.",
-+	"css.lint.unknownVendorSpecificProperties.desc": "Propriété spécifique à un fournisseur inconnue.",
-+	"css.lint.vendorPrefix.desc": "Lors de l'utilisation d'un préfixe spécifique à un fournisseur, ajouter également la propriété standard",
-+	"css.lint.zeroUnits.desc": "Aucune unité nécessaire pour zéro",
-+	"css.trace.server.desc": "Trace la communication entre VS Code et le serveur de langage CSS.",
-+	"css.validate.title": "Contrôle la validation CSS et la gravité des problèmes.",
-+	"css.validate.desc": "Active ou désactive toutes les validations",
-+	"less.lint.argumentsInColorFunction.desc": "Nombre de paramètres non valide",
-+	"less.lint.boxModel.desc": "Ne pas utiliser la largeur ou la hauteur avec une marge intérieure ou une bordure",
-+	"less.lint.compatibleVendorPrefixes.desc": "Lors de l'utilisation d'un préfixe spécifique à un fabricant, toujours inclure également toutes les propriétés spécifiques au fabricant",
-+	"less.lint.duplicateProperties.desc": "Ne pas utiliser de définitions de style en double",
-+	"less.lint.emptyRules.desc": "Ne pas utiliser d'ensembles de règles vides",
-+	"less.lint.float.desc": "N'utilisez pas 'float'. Les éléments Float peuvent fragiliser le code CSS qui est ainsi plus vulnérable si un aspect de la disposition change.",
-+	"less.lint.fontFaceProperties.desc": "la règle @font-face doit définir les propriétés 'src' et 'font-family'",
-+	"less.lint.hexColorLength.desc": "Les couleurs Hex doivent contenir trois ou six chiffres hex",
-+	"less.lint.idSelector.desc": "Les sélecteurs ne doivent pas contenir d'ID, car ces règles sont trop fortement couplées au code HTML.",
-+	"less.lint.ieHack.desc": "Les hacks IE ne sont nécessaires que si IE7 et versions antérieures sont pris en charge",
-+	"less.lint.important.desc": "N'utilisez pas !important. Cela indique que la spécificité de l'intégralité du code CSS est incorrecte et qu'il doit être refactorisé.",
-+	"less.lint.importStatement.desc": "Les instructions d'importation ne sont pas chargées en parallèle",
-+	"less.lint.propertyIgnoredDueToDisplay.desc": "Propriété ignorée en raison de l'affichage. Par exemple, avec 'display: inline', les propriétés width, height, margin-top, margin-bottom et float sont sans effet",
-+	"less.lint.universalSelector.desc": "Le sélecteur universel (*) est connu pour sa lenteur",
-+	"less.lint.unknownProperties.desc": "Propriété inconnue.",
-+	"less.lint.unknownVendorSpecificProperties.desc": "Propriété spécifique à un fournisseur inconnue.",
-+	"less.lint.vendorPrefix.desc": "Lors de l'utilisation d'un préfixe spécifique à un fournisseur, ajouter également la propriété standard",
-+	"less.lint.zeroUnits.desc": "Aucune unité nécessaire pour zéro",
-+	"less.validate.title": "Contrôle la validation LESS et la gravité des problèmes.",
-+	"less.validate.desc": "Active ou désactive toutes les validations",
-+	"scss.lint.argumentsInColorFunction.desc": "Nombre de paramètres non valide",
-+	"scss.lint.boxModel.desc": "Ne pas utiliser la largeur ou la hauteur avec une marge intérieure ou une bordure",
-+	"scss.lint.compatibleVendorPrefixes.desc": "Lors de l'utilisation d'un préfixe spécifique à un fabricant, toujours inclure également toutes les propriétés spécifiques au fabricant",
-+	"scss.lint.duplicateProperties.desc": "Ne pas utiliser de définitions de style en double",
-+	"scss.lint.emptyRules.desc": "Ne pas utiliser d'ensembles de règles vides",
-+	"scss.lint.float.desc": "N'utilisez pas 'float'. Les éléments Float peuvent fragiliser le code CSS qui est ainsi plus vulnérable si un aspect de la disposition change.",
-+	"scss.lint.fontFaceProperties.desc": "la règle @font-face doit définir les propriétés 'src' et 'font-family'",
-+	"scss.lint.hexColorLength.desc": "Les couleurs Hex doivent contenir trois ou six chiffres hex",
-+	"scss.lint.idSelector.desc": "Les sélecteurs ne doivent pas contenir d'ID, car ces règles sont trop fortement couplées au code HTML.",
-+	"scss.lint.ieHack.desc": "Les hacks IE ne sont nécessaires que si IE7 et versions antérieures sont pris en charge",
-+	"scss.lint.important.desc": "N'utilisez pas !important. Cela indique que la spécificité de l'intégralité du code CSS est incorrecte et qu'il doit être refactorisé.",
-+	"scss.lint.importStatement.desc": "Les instructions d'importation ne sont pas chargées en parallèle",
-+	"scss.lint.propertyIgnoredDueToDisplay.desc": "Propriété ignorée en raison de l'affichage. Par exemple, avec 'display: inline', les propriétés width, height, margin-top, margin-bottom et float sont sans effet",
-+	"scss.lint.universalSelector.desc": "Le sélecteur universel (*) est connu pour sa lenteur",
-+	"scss.lint.unknownProperties.desc": "Propriété inconnue.",
-+	"scss.lint.unknownVendorSpecificProperties.desc": "Propriété spécifique à un fournisseur inconnue.",
-+	"scss.lint.vendorPrefix.desc": "Lors de l'utilisation d'un préfixe spécifique à un fournisseur, ajouter également la propriété standard",
-+	"scss.lint.zeroUnits.desc": "Aucune unité nécessaire pour zéro",
-+	"scss.validate.title": "Contrôle la validation SCSS et la gravité des problèmes.",
-+	"scss.validate.desc": "Active ou désactive toutes les validations",
-+	"less.colorDecorators.enable.desc": "Active ou désactive les éléments décoratifs de couleurs",
-+	"scss.colorDecorators.enable.desc": "Active ou désactive les éléments décoratifs de couleurs",
-+	"css.colorDecorators.enable.desc": "Active ou désactive les éléments décoratifs de couleurs",
-+	"css.colorDecorators.enable.deprecationMessage": "Le paramètre 'css.colorDecorators.enable' a été déprécié en faveur de 'editor.colorDecorators'.",
-+	"scss.colorDecorators.enable.deprecationMessage": "Le paramètre 'scss.colorDecorators.enable' a été déprécié en faveur de 'editor.colorDecorators'.",
-+	"less.colorDecorators.enable.deprecationMessage": "Le paramètre 'less.colorDecorators.enable' a été déprécié en faveur de 'editor.colorDecorators'."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/fra/extensions/emmet/package.i18n.json
-  our    100644 2b38d968d648e0792cab88ddd57aa657ed8e85b3 i18n/fra/extensions/emmet/package.i18n.json
-  their  100644 d9a0b979e406ea39d19a1bf3795d6330086f6c68 i18n/fra/extensions/emmet/package.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,6 +8,14 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"description": "Prise en charge d'Emmet pour VS Code",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"command.wrapWithAbbreviation": "Envelopper avec une abréviation",
- 	"command.wrapIndividualLinesWithAbbreviation": "Envelopper les lignes individuelles avec une abréviation",
- 	"command.removeTag": "Supprimer le Tag",
-@@ -31,6 +40,7 @@
- 	"command.incrementNumberByTen": "Incrémenter de 10",
- 	"command.decrementNumberByTen": "Décrémenter de 10",
- 	"emmetSyntaxProfiles": "Définissez le profil pour la syntaxe spécifiée ou utilisez votre propre profil avec des règles spécifiques.",
-+<<<<<<< .our
- 	"emmetExclude": "Un tableau des langages pour lesquels les abréviations Emmet ne devraient pas être développées.",
- 	"emmetExtensionsPath": "Chemin d’accès au dossier contenant les profils Emmet et les extraits.",
- 	"emmetShowExpandedAbbreviation": "Affiche les abréviations Emmet développées sous forme de suggestions.\nL’option \"inMarkupAndStylesheetFilesOnly\" s’applique à haml, jade, slim, xml, xsl, css, html, scss, sass, less et stylus.\nL’option\"always\" s’applique à toutes les parties du fichier indépendamment du balisage/css.",
-@@ -38,6 +48,15 @@
- 	"emmetIncludeLanguages": "Activer les abréviations Emmet dans les langages qui ne sont pas pris en charge par défaut. Ajoutez un mappage ici entre la langue et le langage supporté par emmet.\n Par exemple : {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
- 	"emmetVariables": "Variables à utiliser dans les extraits de Emmet",
- 	"emmetTriggerExpansionOnTab": "Lorsqu’activé, les abréviations Emmet sont développées lorsque vous appuyez sur TAB.",
-+=======
-+	"emmetExclude": "Ensemble de langages où les abréviations emmet ne doivent pas être développées.",
-+	"emmetExtensionsPath": "Chemin d'un dossier contenant les profils et les extraits Emmet.",
-+	"emmetShowExpandedAbbreviation": "Affiche les abréviations Emmet développées sous forme de suggestions.\nL’option \"inMarkupAndStylesheetFilesOnly\" s’applique à html, haml, jade, slim, xml, xsl, css, scss, sass, less et un stylet.\nL’option \"toujours\" s’applique à toutes les parties du fichier indépendamment du balisage/css.",
-+	"emmetShowAbbreviationSuggestions": "Affiche les abréviations Emmet possibles sous forme de suggestions. Non applicable dans les feuilles de style ou quand emmet.showExpandedAbbreviation est défini sur \"jamais\".",
-+	"emmetIncludeLanguages": "Active les abréviations Emmet dans les langages qui ne sont pas pris en charge par défaut. Ajoute un mappage ici entre le langage et le langage Emmet pris en charge .\n Par exemple : {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
-+	"emmetVariables": "Variables à utiliser dans les extraits Emmet",
-+	"emmetTriggerExpansionOnTab": "Une fois les abréviations Emmet activées, elles se développent quand vous appuyez sur la touche Tab.",
-+>>>>>>> .their
- 	"emmetPreferences": "Préférences utilisées pour modifier le comportement de certaines actions et résolveurs d'Emmet.",
- 	"emmetPreferencesIntUnit": "Unité par défaut pour les valeurs entières",
- 	"emmetPreferencesFloatUnit": "Unité par défaut pour les valeurs float",
-@@ -47,6 +66,7 @@
- 	"emmetPreferencesCssBetween": "Symbole à placer entre la propriété CSS et la valeur pendant le développement des abréviations CSS",
- 	"emmetPreferencesSassBetween": "Symbole à placer entre la propriété CSS et la valeur pendant le développement des abréviations CSS dans les fichiers Sass",
- 	"emmetPreferencesStylusBetween": "Symbole à placer entre la propriété CSS et la valeur pendant le développement des abréviations CSS dans les fichiers Stylus",
-+<<<<<<< .our
- 	"emmetShowSuggestionsAsSnippets": "Si true, alors les suggestions Emmet apparaîtront en tant qu’extraits vous permettant de les commander selon le paramètre editor.snippetSuggestions.",
- 	"emmetPreferencesBemElementSeparator": "Séparateur d’éléments utilisé pour les classes lorsque le filtre BEM est utilisé",
- 	"emmetPreferencesBemModifierSeparator": "Séparateur de modificateur utilisé pour les classes lorsque le filtre BEM est utilisé",
-@@ -62,4 +82,7 @@
- 	"emmetPreferencesCssMsProperties": "Les propriétés css séparées par des virgules qui ont un préfixe 'ms' vendor lorsqu’elles sont utilisées dans une abréviation emmet qui commence par '-'. Mettre une chaîne vide pour éviter le préfixe 'ms'.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "La note minimale (de 0 à 1) que la correspondance de l'abréviation (fuzzy-matched) devrait atteindre. Des valeurs plus faibles peuvent produire de nombreuses correspondances de faux-positifs, des valeurs plus élevées peuvent réduire les correspondances possibles.",
- 	"emmetOptimizeStylesheetParsing": "Si défini à false, la fichier entier est analysé pour déterminer si la position courante est valide pour l’expansion des abréviations Emmet. Si défini à true, seul le contenu autour de la position actuelle dans les fichiers css/scss/less est analysé."
-+=======
-+	"emmetShowSuggestionsAsSnippets": "Si la valeur est True, les suggestions Emmet s'affichent sous forme d'extraits, ce qui vous permet de les ordonner conformément au paramètre editor.snippetSuggestions."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7f69cac4fb4ced48bdb36d562ed995dafb269475 i18n/fra/extensions/extension-editing/out/extensionLinter.i18n.json
-  our    100644 d3911a1e602c0342caf62e07ddf3705c7fd299e1 i18n/fra/extensions/extension-editing/out/extensionLinter.i18n.json
-  their  100644 c64c3a6f8629dc833ef958acecb94fd1ebf4d238 i18n/fra/extensions/extension-editing/out/extensionLinter.i18n.json
-changed in both
-  base   100644 ee6ed2d988cbe488bf7be2868e2fed7fb2048ec8 i18n/fra/extensions/git/out/commands.i18n.json
-  our    100644 95b33e9cb37384a542e0f0621ed506addc05f3b9 i18n/fra/extensions/git/out/commands.i18n.json
-  their  100644 72e09a4dac2fd84f63f9df1531858ee4aefb9ec8 i18n/fra/extensions/git/out/commands.i18n.json
-@@ -13,6 +13,7 @@
- 	"selectFolder": "Sélectionner l'emplacement du dépôt",
- 	"cloning": "Clonage du dépôt Git '{0}'...",
- 	"proposeopen": "Voulez-vous ouvrir le dépôt cloné ?",
-+<<<<<<< .our
- 	"openrepo": "Ouvrir le dépôt",
- 	"add": "Ajouter à l’espace de travail",
- 	"proposeopen2": "Voulez-vous ouvrir le dépôt cloné ou l'ajouter à l'espace de travail actuel ?",
-@@ -20,6 +21,10 @@
- 	"init repo": "Initialiser le dépôt",
- 	"create repo": "Initialiser le dépôt",
- 	"are you sure": "Ceci va créer un dépôt Git dans '{0}'. Êtes-vous sûr de vouloir continuer ?",
-+=======
-+	"path to init": "Chemin du dossier",
-+	"provide path": "Veuillez fournir un chemin de dossier pour initialiser un dépôt Git",
-+>>>>>>> .their
- 	"HEAD not available": "La version HEAD de '{0}' n'est pas disponible.",
- 	"confirm stage files with merge conflicts": "Voulez-vous vraiment créer {0} fichiers avec des conflits de fusion ?",
- 	"confirm stage file with merge conflicts": "Voulez-vous vraiment créer {0} avec des conflits de fusion ?",
-@@ -37,16 +42,23 @@
- 	"discardAll multiple": "Ignorer 1 fichier",
- 	"discardAll": "Ignorer les {0} fichiers",
- 	"confirm delete multiple": "Voulez-vous vraiment SUPPRIMER {0} fichiers ?",
-+<<<<<<< .our
- 	"delete files": "Supprimer les fichiers",
-+=======
-+	"delete files": "Supprimer des fichiers",
-+>>>>>>> .their
- 	"there are untracked files single": "Le fichier non suivi suivant sera SUPPRIMÉ DU DISQUE s'il est ignoré : {0}.",
- 	"there are untracked files": "{0} fichiers non suivis seront SUPPRIMÉS DU DISQUE s'ils sont ignorés.",
- 	"confirm discard all 2": "{0}\n\nCette opération est IRRÉVERSIBLE, votre plage de travail actuelle sera DÉFINITIVEMENT PERDUE.",
- 	"yes discard tracked": "Ignorer 1 fichier suivi",
- 	"yes discard tracked multiple": "Ignorer {0} fichiers suivis",
-+<<<<<<< .our
- 	"unsaved files single": "Le fichier suivant n'est pas enregistré : {0}.\n\nVoulez-vous l'enregistrer avant d'effectuer le commit ?",
- 	"unsaved files": "Il y a {0} fichiers non enregistrés.\n\nVoulez-vous l'enregistrer avant d'effectuer le commit ?",
- 	"save and commit": "Tout enregistrer et Effectuer le commit",
- 	"commit": "Effectuer le commit quand même",
-+=======
-+>>>>>>> .their
- 	"no staged changes": "Aucune modification en attente à valider.\n\nVoulez-vous automatiquement mettre en attente toutes vos modifications et les valider directement ?",
- 	"always": "Toujours",
- 	"no changes": "Il n'existe aucun changement à valider.",
-@@ -62,14 +74,22 @@
- 	"branch already exists": "Une branche nommée '0}' existe déjà",
- 	"select a branch to merge from": "Sélectionner une branche à fusionner",
- 	"merge conflicts": "Il existe des conflits de fusion. Corrigez-les avant la validation.",
-+<<<<<<< .our
- 	"tag name": "Nom du Tag",
- 	"provide tag name": "Spécifiez un nom de balise",
- 	"tag message": "Message",
- 	"provide tag message": "Spécifiez un message pour annoter la balise",
- 	"no remotes to fetch": "Ce dépôt n'a aucun dépôt distant configuré pour rappatrier.",
-+=======
-+	"tag name": "Nom de la balise",
-+	"provide tag name": "Spécifiez un nom de balise",
-+	"tag message": "Message",
-+	"provide tag message": "Spécifiez un message pour annoter la balise",
-+>>>>>>> .their
- 	"no remotes to pull": "Votre dépôt n'a aucun dépôt distant configuré pour un Pull.",
- 	"pick remote pull repo": "Choisir un dépôt distant duquel extraire la branche",
- 	"no remotes to push": "Votre dépôt n'a aucun dépôt distant configuré pour un Push.",
-+	"push with tags success": "Envoyé (push) avec des balises.",
- 	"nobranch": "Vous devez extraire une branche dont vous souhaitez effectuer le Push vers un emplacement distant.",
- 	"confirm publish branch": "La branche '{0}' n'a pas de branche en amont. Voulez-vous publier cette branche ?",
- 	"ok": "OK",
-changed in both
-  base   100644 70565ab624865588dd7c2562b4977ea7942ca45d i18n/fra/extensions/git/out/model.i18n.json
-  our    100644 045652b855363e4de6465d300355a9094d59ca3f i18n/fra/extensions/git/out/model.i18n.json
-  their  100644 6b72576dc57fa5227a12972d8d6319b20acd5bad i18n/fra/extensions/git/out/model.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -7,6 +8,8 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"too many submodules": "Le dépôt '{0}' a {1}  sous-modules qui ne vont pas être ouverts automatiquement. Vous pouvez ouvrir chacun individuellement en ouvrant un fichier à l'intérieur.",
-+=======
-+>>>>>>> .their
- 	"no repositories": "Aucun dépôt disponible",
- 	"pick repo": "Choisir un dépôt"
- }
-\ No newline at end of file
-added in both
-  our    100644 e8ff0723dffa05c7daa1c9cf5406a679b2ca708b i18n/fra/extensions/git/out/repository.i18n.json
-  their  100644 75b81935d06317a3f482fc1220debb7773ac62e4 i18n/fra/extensions/git/out/repository.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"open": "Ouvrir",
- 	"index modified": "Index modifié",
- 	"modified": "Modifié",
-@@ -17,6 +26,7 @@
- 	"untracked": "Non suivi",
- 	"ignored": "Ignoré",
- 	"both deleted": "Tous deux supprimés",
-+<<<<<<< .our
- 	"added by us": "Ajouté par nous",
- 	"deleted by them": "Supprimé par eux",
- 	"added by them": "Ajouté par eux",
-@@ -24,12 +34,24 @@
- 	"both added": "Tous deux ajoutés",
- 	"both modified": "Tous deux modifiés",
- 	"commitMessage": "Message (press {0} to commit)",
-+=======
-+	"added by us": "Ajouté par nos soins",
-+	"deleted by them": "Supprimé par eux",
-+	"added by them": "Ajouté par eux",
-+	"deleted by us": "Supprimé par nos soins",
-+	"both added": "Tous deux ajoutés",
-+	"both modified": "Tous deux modifiés",
-+>>>>>>> .their
- 	"commit": "Commit",
- 	"merge changes": "Fusionner les modifications",
- 	"staged changes": "Modifications en zone de transit",
- 	"changes": "Modifications",
-+<<<<<<< .our
- 	"commitMessageCountdown": "{0} caractères restants sur la ligne actuelle",
- 	"commitMessageWarning": "{0} caractères sur {1} sur la ligne actuelle",
-+=======
-+	"ok": "OK",
-+>>>>>>> .their
- 	"neveragain": "Ne plus afficher",
- 	"huge": "Le dépôt Git dans '{0}' a trop de modifications actives, seul un sous-ensemble de fonctionnalités Git sera activé."
- }
-\ No newline at end of file
-changed in both
-  base   100644 b3affbab95229c1a037f843bee776260aa22fc6c i18n/fra/extensions/git/package.i18n.json
-  our    100644 6b9b77f8287566561f58c3376d7d8aaba2171809 i18n/fra/extensions/git/package.i18n.json
-  their  100644 6253e6cf5fe899af61e1b5aeb7d00e08f2e554d0 i18n/fra/extensions/git/package.i18n.json
-@@ -40,19 +40,29 @@
- 	"command.renameBranch": "Renommer la branche...",
- 	"command.merge": "Fusionner la branche...",
- 	"command.createTag": "Créer une étiquette",
-+<<<<<<< .our
- 	"command.fetch": "Rappatrier",
-+=======
-+>>>>>>> .their
- 	"command.pull": "Pull",
- 	"command.pullRebase": "Pull (rebaser)",
- 	"command.pullFrom": "Extraire de...",
- 	"command.push": "Push",
- 	"command.pushTo": "Transfert (Push) vers...",
-+<<<<<<< .our
- 	"command.pushWithTags": "Envoyer avec les Tags",
-+=======
-+	"command.pushWithTags": "Transférer (Push) avec les étiquettes",
-+>>>>>>> .their
- 	"command.sync": "Synchroniser",
- 	"command.syncRebase": "Synchroniser (Rebase)",
- 	"command.publish": "Publier la branche",
- 	"command.showOutput": "Afficher la sortie Git",
- 	"command.ignore": "Ajouter un fichier à .gitignore",
-+<<<<<<< .our
- 	"command.stashIncludeUntracked": "Remiser (Inclure les non-tracés)",
-+=======
-+>>>>>>> .their
- 	"command.stash": "Remiser (stash)",
- 	"command.stashPop": "Appliquer et supprimer la remise...",
- 	"command.stashPopLatest": "Appliquer et supprimer la dernière remise",
-@@ -71,6 +81,7 @@
- 	"config.defaultCloneDirectory": "Emplacement par défaut où cloner un dépôt git",
- 	"config.enableSmartCommit": "Validez toutes les modifications en l'absence de modifications en attente.",
- 	"config.enableCommitSigning": "Permet de valider en signant avec GPG.",
-+<<<<<<< .our
- 	"config.discardAllScope": "Contrôle les modifications ignorées par la commande 'Ignorer toutes les modifications'. 'all' ignore toutes les modifications. 'tracked' ignore uniquement les fichiers suivis. 'prompt' affiche un message d'invite chaque fois que l’action est exécutée.",
- 	"config.decorations.enabled": "Contrôle si Git contribue aux couleurs et aux badges de l’Explorateur et à l'affichage des éditeurs ouverts.",
- 	"config.promptToSaveFilesBeforeCommit": "Contrôle si Git doit vérifier les fichiers non sauvegardés avant d'effectuer le commit.",
-@@ -84,4 +95,7 @@
- 	"colors.ignored": "Couleur des ressources ignorées.",
- 	"colors.conflict": "Couleur pour les ressources avec des conflits.",
- 	"colors.submodule": "Couleur pour les ressources de sous-module."
-+=======
-+	"config.discardAllScope": "Contrôle les modifications ignorées par la commande 'Ignorer toutes les modifications'. 'all' ignore toutes les modifications. 'tracked' ignore uniquement les fichiers suivis. 'prompt' affiche un message d'invite chaque fois que l’action est exécutée."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 bbd11b9a02fd6634367882406bb46eff3e9fc5db i18n/fra/extensions/html/package.i18n.json
-  our    100644 23dcd2b8cfbfabb741b11dd2fe1418d2a0f08b02 i18n/fra/extensions/html/package.i18n.json
-  their  100644 40f7639359f638c467a624a9b0a73f9daf82e32e i18n/fra/extensions/html/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,28 @@
- 	],
- 	"displayName": "Notions de base du langage HTML",
- 	"description": "Fournit la coloration syntaxique, la correspondance des balises d'ouverture et de fermeture et des extraits de code dans les fichiers HTML."
-+=======
-+	"html.format.enable.desc": "Activer/désactiver le formateur HTML par défaut.",
-+	"html.format.wrapLineLength.desc": "Nombre maximal de caractères par ligne (0 = désactiver).",
-+	"html.format.unformatted.desc": "Liste des balises, séparées par des virgules, qui ne doivent pas être remises en forme. 'null' correspond par défaut à toutes les balises répertoriées à l'adresse https://www.w3.org/TR/html5/dom.html#phrasing-content.",
-+	"html.format.contentUnformatted.desc": "Liste des balises, séparées par des virgules, dont le contenu ne doit pas être remis en forme. 'null' correspond par défaut à toutes les balises 'pre'.",
-+	"html.format.indentInnerHtml.desc": "Mettez en retrait les sections <head> et <body>.",
-+	"html.format.preserveNewLines.desc": "Spécifie si les sauts de ligne existants qui précèdent les éléments doivent être conservés. Fonctionne uniquement devant les éléments, pas dans les balises, ni pour du texte.",
-+	"html.format.maxPreserveNewLines.desc": "Nombre maximal de sauts de ligne à conserver dans un bloc. Utilisez 'null' pour indiquer une valeur illimitée.",
-+	"html.format.indentHandlebars.desc": "Mettez en forme et en retrait {{#foo}}, ainsi que {{/foo}}.",
-+	"html.format.endWithNewline.desc": "Finissez par un caractère de nouvelle ligne.",
-+	"html.format.extraLiners.desc": "Liste de balises, séparées par une virgule, qui doivent être précédées d'une nouvelle ligne. 'null' prend par défaut la valeur \"head, body, /html\".",
-+	"html.format.wrapAttributes.desc": "Retour à la ligne des attributs.",
-+	"html.format.wrapAttributes.auto": "Retour automatique à la ligne des attributs uniquement en cas de dépassement de la longueur de la ligne.",
-+	"html.format.wrapAttributes.force": "Retour automatique à la ligne de chaque attribut, sauf le premier.",
-+	"html.format.wrapAttributes.forcealign": "Retour automatique à la ligne de chaque attribut, sauf le premier, avec maintien de l'alignement.",
-+	"html.format.wrapAttributes.forcemultiline": "Retour automatique à la ligne de chaque attribut.",
-+	"html.suggest.angular1.desc": "Permet de configurer la prise en charge intégrée du langage HTML pour suggérer des balises et propriétés Angular V1.",
-+	"html.suggest.ionic.desc": "Permet de configurer la prise en charge intégrée du langage HTML pour suggérer des balises, des propriétés et des valeurs Ionic.",
-+	"html.suggest.html5.desc": "Permet de configurer la prise en charge intégrée du langage HTML pour suggérer des balises, des propriétés et des valeurs HTML5.",
-+	"html.trace.server.desc": "Trace la communication entre VS Code et le serveur de langage HTML.",
-+	"html.validate.scripts": "Configure la validation des scripts incorporés par la prise en charge du langage HTML intégré.",
-+	"html.validate.styles": "Configure la validation des styles incorporés par la prise en charge du langage HTML intégré.",
-+	"html.autoClosingTags": "Activez/désactivez la fermeture automatique des balises HTML."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6285b48329c4a06c1f95602339c10e4f97a3d8b1 i18n/fra/extensions/json/package.i18n.json
-  our    100644 91f8d80320a0fb102739f49345616300240c024d i18n/fra/extensions/json/package.i18n.json
-  their  100644 b236be267b2e8ac359723951dc4719fed39555a5 i18n/fra/extensions/json/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,15 @@
- 	],
- 	"displayName": "Bases du langage JSON",
- 	"description": "Fournit la coloration syntaxique et la correspondance des parenthèses dans les fichiers JSON."
-+=======
-+	"json.schemas.desc": "Associer les schémas aux fichiers JSON dans le projet actif",
-+	"json.schemas.url.desc": "URL de schéma ou chemin relatif d'un schéma dans le répertoire actif",
-+	"json.schemas.fileMatch.desc": "Tableau de modèles de fichiers pour la recherche de correspondances durant la résolution de fichiers JSON en schémas.",
-+	"json.schemas.fileMatch.item.desc": "Modèle de fichier pouvant contenir '*' pour la recherche de correspondances durant la résolution de fichiers JSON en schémas.",
-+	"json.schemas.schema.desc": "Définition de schéma pour l'URL indiquée. Le schéma doit être fourni uniquement pour éviter les accès à l'URL du schéma.",
-+	"json.format.enable.desc": "Activer/désactiver le formateur JSON par défaut (nécessite un redémarrage)",
-+	"json.tracing.desc": "Trace la communication entre VS Code et le serveur de langage JSON.",
-+	"json.colorDecorators.enable.desc": "Active ou désactive les éléments décoratifs de couleurs",
-+	"json.colorDecorators.enable.deprecationMessage": "Le paramètre 'json.colorDecorators.enable' a été déprécié en faveur de 'editor.colorDecorators'."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 b6ec4bbef7d05ec17922cc59b7ea95efb8fc589b i18n/fra/extensions/markdown/out/security.i18n.json
-  our    100644 b3c4ab567f3cdf0e0bc77b8eccc8d1f547a63393 i18n/fra/extensions/markdown/out/security.i18n.json
-  their  100644 3dbb7ee43fd8724d3f7fafa2feac9ebd8eea182a i18n/fra/extensions/markdown/out/security.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,13 +9,20 @@
- 	],
- 	"strict.title": "Strict",
- 	"strict.description": "Charger uniquement le contenu sécurisé.",
-+=======
-+	"strict.title": "Strict",
-+	"strict.description": "Charger uniquement le contenu sécurisé",
-+>>>>>>> .their
- 	"insecureContent.title": "Autoriser le contenu non sécurisé",
- 	"insecureContent.description": "Activer le chargement de contenu sur http",
- 	"disable.title": "Désactiver",
- 	"disable.description": "Autorisez tout le contenu et l’exécution des scripts. Non recommandé",
- 	"moreInfo.title": "Informations",
-+<<<<<<< .our
- 	"enableSecurityWarning.title": "Activer l'aperçu d'avertissements de sécurité pour cet espace de travail",
- 	"disableSecurityWarning.title": "Désactiver l'aperçu d'avertissements de sécurité pour cet espace de travail",
- 	"toggleSecurityWarning.description": "N’affecte pas le niveau de sécurité du contenu",
-+=======
-+>>>>>>> .their
- 	"preview.showPreviewSecuritySelector.title": "Sélectionner les paramètres de sécurité pour les aperçus Markdown dans cet espace de travail"
- }
-\ No newline at end of file
-changed in both
-  base   100644 4be642756458070546d4c417f6eb2372960dfde7 i18n/fra/extensions/markdown/package.i18n.json
-  our    100644 f5aede8507b86049b5f255e52efd92a8607b4f78 i18n/fra/extensions/markdown/package.i18n.json
-  their  100644 d6a8fb4e51e60a12b86c36fb8fc602d1c9b9b61e i18n/fra/extensions/markdown/package.i18n.json
-@@ -27,6 +27,10 @@
- 	"markdown.styles.dec": "Liste d'URL ou de chemins locaux de feuilles de style CSS à utiliser dans l'aperçu Markdown. Les chemins relatifs sont interprétés par rapport au dossier ouvert dans l'explorateur. S'il n'y a aucun dossier ouvert, ils sont interprétés par rapport à l'emplacement du fichier Markdown. Tous les signes '\\' doivent être écrits sous la forme '\\\\'.",
- 	"markdown.showPreviewSecuritySelector.title": "Changer les paramètres de sécurité de l'aperçu",
- 	"markdown.trace.desc": "Active la journalisation du débogage pour l'extension Markdown.",
-+<<<<<<< .our
- 	"markdown.preview.refresh.title": "Actualiser l'aperçu",
- 	"markdown.preview.toggleLock.title": "Activer/désactiver le verrouillage de l'aperçu"
-+=======
-+	"markdown.refreshPreview.title": "Actualiser l’aperçu"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/fra/extensions/typescript/out/features/taskProvider.i18n.json
-  our    100644 451f7029bacabab17fb9cb543b1797329aaacbf3 i18n/fra/extensions/typescript/out/features/taskProvider.i18n.json
-  their  100644 f90da051c30eb4ff19252d3ecb2ab3501d766f4b i18n/fra/extensions/typescript/out/features/taskProvider.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,14 @@
- 	],
- 	"buildTscLabel": "build - {0}",
- 	"buildAndWatchTscLabel": "watch - {0}"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"buildAndWatchTscLabel": "watch - {0}",
-+	"buildTscLabel": "build - {0}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 61ed0b60124a8c22b0b1dc4141f35f1ca4d7f021 i18n/fra/extensions/typescript/out/utils/api.i18n.json
-  their  100644 96e054255c0e694e5582a5fbe783e12b866d39ac i18n/fra/extensions/typescript/out/utils/api.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"invalidVersion": "version non valide"
- }
-\ No newline at end of file
-changed in both
-  base   100644 ea5f08fdab21aed559fb796fef4606e4bfc5c6e2 i18n/fra/extensions/typescript/out/utils/versionPicker.i18n.json
-  our    100644 c6da9b3843fca8a4bf908190cab62361d6e36f7f i18n/fra/extensions/typescript/out/utils/versionPicker.i18n.json
-  their  100644 718528e4059132724952004bbe0952ce5486c19b i18n/fra/extensions/typescript/out/utils/versionPicker.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"useVSCodeVersionOption": "Utiliser la version de VS Code",
- 	"useWorkspaceVersionOption": "Utiliser la version de l'espace de travail",
- 	"learnMore": "En savoir plus",
-changed in both
-  base   100644 9663a805143c34d79e6b05c9fc93cb728de1a41d i18n/fra/extensions/typescript/out/utils/versionProvider.i18n.json
-  our    100644 5c32ecfe106d4a76a404fce834c70dc47c115676 i18n/fra/extensions/typescript/out/utils/versionProvider.i18n.json
-  their  100644 eb6b0ab41a70b01faaf13e2ed0f5f8e1c78dbbcf i18n/fra/extensions/typescript/out/utils/versionProvider.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"couldNotLoadTsVersion": "Impossible de charger la version TypeScript dans ce chemin",
- 	"noBundledServerFound": "Le tsserver de VSCode a été supprimé par une autre application, par exemple, un outil de détection de virus mal configuré. Réinstallez VS Code."
- }
-\ No newline at end of file
-changed in both
-  base   100644 38e7c99e409b6f424690ce86ec7327f56066dfcf i18n/fra/extensions/typescript/package.i18n.json
-  our    100644 a8c7633468ea541c9079f05ac4cc3ec471aa57f6 i18n/fra/extensions/typescript/package.i18n.json
-  their  100644 8762fa61f0401295c2dec3daeaff97903a3aae1f i18n/fra/extensions/typescript/package.i18n.json
-changed in both
-  base   100644 c4301b43c6762827c9cfceab5fe3c9ffe12eb579 i18n/fra/src/vs/code/electron-main/menus.i18n.json
-  our    100644 16a57011e6fe8292ae1edcf0b9eb59b9f28b2c10 i18n/fra/src/vs/code/electron-main/menus.i18n.json
-  their  100644 4b6ddec2020872bf61cdd2728310b5efc24df488 i18n/fra/src/vs/code/electron-main/menus.i18n.json
-@@ -24,12 +24,21 @@
- 	"miQuit": "Quitter {0}",
- 	"miNewFile": "&&Nouveau fichier",
- 	"miOpen": "&&Ouvrir...",
-+<<<<<<< .our
- 	"miOpenWorkspace": "Ouvrir l'espace de travail...",
- 	"miOpenFolder": "Ouvrir le &&dossier",
- 	"miOpenFile": "&&Ouvrir un fichier...",
- 	"miOpenRecent": "Ouvrir les éléments &&récents",
- 	"miSaveWorkspaceAs": "Enregistrer l’espace de travail sous...",
- 	"miAddFolderToWorkspace": "Ajouter un dossier à l'espace de travail...",
-+=======
-+	"miOpenWorkspace": "&&Ouvrir un espace de travail...",
-+	"miOpenFolder": "Ouvrir le &&dossier",
-+	"miOpenFile": "&&Ouvrir un fichier...",
-+	"miOpenRecent": "Ouvrir les éléments &&récents",
-+	"miSaveWorkspaceAs": "&&Enregistrer l’espace de travail sous...",
-+	"miAddFolderToWorkspace": "&&Ajouter un dossier à l'espace de travail...",
-+>>>>>>> .their
- 	"miSave": "&&Enregistrer",
- 	"miSaveAs": "Enregistrer &&sous...",
- 	"miSaveAll": "Enregistrer to&&ut",
-@@ -189,5 +198,11 @@
- 	"miDownloadingUpdate": "Téléchargement de la mise à jour...",
- 	"miInstallUpdate": "Installer la mise à jour...",
- 	"miInstallingUpdate": "Installation de la mise à jour...",
-+<<<<<<< .our
- 	"miRestartToUpdate": "Redémarrer pour mettre à jour..."
-+=======
-+	"miCheckForUpdates": "Rechercher les mises à jour...",
-+	"aboutDetail": "\nVersion {0}\nCommit {1}\nDate {2}\nShell {3}\nRenderer {4}\nNode {5}\nArchitecture {6}",
-+	"okButton": "OK"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d1f659dfa2004cb0faac11ca95f7dd83acbfac19 i18n/fra/src/vs/code/electron-main/windows.i18n.json
-  our    100644 1af9787d7a761e343ff93a085772a779af125adf i18n/fra/src/vs/code/electron-main/windows.i18n.json
-  their  100644 541158a91ef36114401e54cda1ff63efbc118d96 i18n/fra/src/vs/code/electron-main/windows.i18n.json
-@@ -9,15 +9,30 @@
- 	"ok": "OK",
- 	"pathNotExistTitle": "Le chemin d'accès n'existe pas",
- 	"pathNotExistDetail": "Le chemin d'accès '{0}' ne semble plus exister sur le disque.",
-+<<<<<<< .our
- 	"reopen": "&&Rouvrir",
- 	"wait": "&&Continuer à attendre",
- 	"close": "&&Fermer",
-+=======
-+	"openWorkspace": "&&Ouvrir...",
-+	"openWorkspaceTitle": "Ouvrir un espace de travail",
-+	"save": "&&Enregistrer",
-+	"doNotSave": "&&Ne pas enregistrer",
-+	"cancel": "Annuler",
-+	"saveWorkspaceMessage": "Voulez-vous enregistrer la configuration de votre espace de travail dans un fichier ?",
-+	"saveWorkspaceDetail": "Enregistrez votre espace de travail si vous avez l’intention de le rouvrir.",
-+	"saveWorkspace": "Enregistrer l’espace de travail",
-+	"reopen": "Rouvrir",
-+	"wait": "Continuer à attendre",
-+	"close": "Fermer",
-+>>>>>>> .their
- 	"appStalled": "La fenêtre ne répond plus",
- 	"appStalledDetail": "Vous pouvez rouvrir ou fermer la fenêtre, ou continuer à patienter.",
- 	"appCrashed": "La fenêtre s'est bloquée",
- 	"appCrashedDetail": "Nous vous prions de nous excuser pour ce désagrément. Vous pouvez rouvrir la fenêtre pour reprendre l'action au moment où elle a été interrompue.",
- 	"open": "Ouvrir",
- 	"openFolder": "Ouvrir le dossier",
-+<<<<<<< .our
- 	"openFile": "Ouvrir le fichier",
- 	"workspaceOpenedMessage": "Impossible d’enregistrer l’espace de travail '{0}'",
- 	"workspaceOpenedDetail": "L’espace de travail est déjà ouvert dans une autre fenêtre. Veuillez s’il vous plaît d’abord fermer cette fenêtre et puis essayez à nouveau.",
-@@ -29,4 +44,7 @@
- 	"saveWorkspaceMessage": "Voulez-vous enregistrer la configuration de votre espace de travail dans un fichier ?",
- 	"saveWorkspaceDetail": "Enregistrez votre espace de travail si vous avez l’intention de le rouvrir.",
- 	"saveWorkspace": "Enregistrer l’espace de travail"
-+=======
-+	"openFile": "Ouvrir le fichier"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7df441726087e8c16cfe2ad415bd59ec64d36efa i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 1ad1b4ad7ba3d841a13ddfeab561381b182d7f45 i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 659427456292ac2e4066e11b99c7703f084a577c i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -26,11 +26,17 @@
- 	"detectIndentation": "Quand vous ouvrez un fichier, 'editor.tabSize' et 'editor.insertSpaces' sont détectés en fonction du contenu du fichier.",
- 	"roundedSelection": "Contrôle si les sélections ont des angles arrondis",
- 	"scrollBeyondLastLine": "Contrôle si l'éditeur défile au-delà de la dernière ligne",
-+<<<<<<< .our
- 	"scrollBeyondLastColumn": "Contrôle le nombre de caractères supplémentaires, au-delà duquel l’éditeur défilera horizontalement",
- 	"smoothScrolling": "Contrôle si l'éditeur défilera en utilisant une animation",
- 	"minimap.enabled": "Contrôle si la minicarte est affichée",
- 	"minimap.side": "Contrôle le côté où afficher la minicarte.",
- 	"minimap.showSlider": "Contrôle si le curseur de la minicarte est automatiquement masqué",
-+=======
-+	"smoothScrolling": "Contrôle si l'éditeur défilera en utilisant une animation",
-+	"minimap.enabled": "Contrôle si la minicarte est affichée",
-+	"minimap.showSlider": "Contrôle si le curseur de la minicarte est automatiquement masqué. Les valeurs possibles sont 'always' et 'mouseover'",
-+>>>>>>> .their
- 	"minimap.renderCharacters": "Afficher les caractères réels sur une ligne (par opposition aux blocs de couleurs)",
- 	"minimap.maxColumn": "Limiter la largeur de la minicarte pour afficher au maximum un certain nombre de colonnes",
- 	"find.seedSearchStringFromSelection": "Contrôle si nous remplissons la chaîne à rechercher dans le Widget Recherche à partir de la sélection de l'éditeur",
-@@ -106,11 +112,14 @@
- 	"accessibilitySupport": "Contrôle si l'éditeur doit s'exécuter dans un mode optimisé pour les lecteurs d'écran.",
- 	"links": "Contrôle si l'éditeur doit détecter les liens et les rendre cliquables",
- 	"colorDecorators": "Contrôle si l'éditeur doit afficher les éléments décoratifs de couleurs inline et le sélecteur de couleurs.",
-+<<<<<<< .our
- 	"codeActions": "Active l'ampoule d'action de code",
- 	"codeActionsOnSave.organizeImports": "Exécuter organiser les importations lors de l'enregistrement ?",
- 	"codeActionsOnSave": "Types d'action de code à exécuter à l'enregistrement.",
- 	"codeActionsOnSaveTimeout": "Délai d'attente pour les actions de code exécutées lors de l'enregistrement.",
- 	"selectionClipboard": "Contrôle si le presse-papiers primaire Linux doit être pris en charge.",
-+=======
-+>>>>>>> .their
- 	"sideBySide": "Contrôle si l'éditeur de différences affiche les différences en mode côte à côte ou inline",
- 	"ignoreTrimWhitespace": "Contrôle si l'éditeur de différences affiche les changements liés aux espaces blancs de début ou de fin comme des différences",
- 	"largeFileOptimizations": "Traitement spécial des fichiers volumineux pour désactiver certaines fonctionnalités utilisant beaucoup de mémoire.",
-changed in both
-  base   100644 73727b48419ffe6ce35bca8a7a280e241a4cf50a i18n/fra/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 e3b7be89c4680bacecf118915da9495bb164163d i18n/fra/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 40479e382e858f1236ea9f1f540899655271fe05 i18n/fra/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -28,12 +28,16 @@
- 	"errorBorder": "Couleur de bordure de la ligne ondulée marquant les erreurs dans l'éditeur.",
- 	"warningForeground": "Couleur de premier plan de la ligne ondulée marquant les avertissements dans l'éditeur.",
- 	"warningBorder": "Couleur de bordure de la ligne ondulée marquant les avertissements dans l'éditeur.",
-+<<<<<<< .our
- 	"infoForeground": "Couleur de premier plan de la ligne ondulée marquant les informations dans l'éditeur.",
- 	"infoBorder": "Couleur de bordure de la ligne ondulée marquant les informations dans l'éditeur.",
- 	"hintForeground": "Couleur de premier plan de la ligne ondulée d'indication dans l'éditeur.",
- 	"hintBorder": "Couleur de bordure de la ligne ondulée d'indication dans l'éditeur.",
- 	"unnecessaryForeground": "Couleur de premier plan du code inutile dans l'éditeur.",
- 	"overviewRulerRangeHighlight": "Couleur du marqueur de la règle d'aperçu pour des plages mises en surbrillance. La couleur doit ne pas être opaque pour ne pas masquer les décorations du dessous.",
-+=======
-+	"overviewRulerRangeHighlight": "Couleur du marqueur de la règle d'aperçu pour la mise en évidence de plage.",
-+>>>>>>> .their
- 	"overviewRuleError": "Couleur du marqueur de la règle d'aperçu pour les erreurs.",
- 	"overviewRuleWarning": "Couleur du marqueur de la règle d'aperçu pour les avertissements.",
- 	"overviewRuleInfo": "Couleur du marqueur de la règle d'aperçu pour les informations."
-changed in both
-  base   100644 7517a404783a2da12ff25e4053e022614e0ec4f6 i18n/fra/src/vs/editor/contrib/find/common/findController.i18n.json
-  our    100644 21889b4123e3ab0c51a61420c30b2adddb59929d i18n/fra/src/vs/editor/contrib/find/common/findController.i18n.json
-  their  100644 2176cea208c5eaa0ca5310602d4add0d86ac5282 i18n/fra/src/vs/editor/contrib/find/common/findController.i18n.json
-@@ -10,6 +10,15 @@
- 	"nextSelectionMatchFindAction": "Sélection suivante",
- 	"previousSelectionMatchFindAction": "Sélection précédente",
- 	"startReplace": "Remplacer",
-+<<<<<<< .our
-+=======
-+	"addSelectionToNextFindMatch": "Ajouter la sélection à la correspondance de recherche suivante",
-+	"addSelectionToPreviousFindMatch": "Ajouter la sélection à la correspondance de recherche précédente",
-+	"moveSelectionToNextFindMatch": "Déplacer la dernière sélection vers la correspondance de recherche suivante",
-+	"moveSelectionToPreviousFindMatch": "Déplacer la dernière sélection à la correspondance de recherche précédente",
-+	"selectAllOccurrencesOfFindMatch": "Sélectionner toutes les occurrences des correspondances de la recherche",
-+	"changeAll.label": "Modifier toutes les occurrences",
-+>>>>>>> .their
- 	"showNextFindTermAction": "Afficher le terme de recherche suivant",
- 	"showPreviousFindTermAction": "Afficher le terme de recherche précédent"
- }
-\ No newline at end of file
-changed in both
-  base   100644 1b5900cc0db53f811ec03e4391739b2e60540b0e i18n/fra/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
-  our    100644 45974daea0a3b23575493224f878de50cb38f733 i18n/fra/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
-  their  100644 22cee6c617c993b359657ce6ad7b47b60b43ea5e i18n/fra/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
-@@ -7,7 +7,11 @@
- 	"wordHighlight": "Couleur d'arrière-plan d'un symbole durant l'accès en lecture, par exemple la lecture d'une variable.",
- 	"wordHighlightStrong": "Couleur d'arrière-plan d'un symbole durant l'accès en écriture, par exemple l'écriture dans une variable.",
- 	"overviewRulerWordHighlightForeground": "Couleur du marqueur de la règle d'aperçu pour la mise en évidence de symbole.",
-+<<<<<<< .our
- 	"overviewRulerWordHighlightStrongForeground": "Couleur du marqueur de la règle d'aperçu la mise en évidence de symbole d’accès en écriture.",
- 	"wordHighlight.next.label": "Aller à la prochaine mise en évidence de symbole",
- 	"wordHighlight.previous.label": "Aller à la mise en évidence de symbole précédente"
-+=======
-+	"overviewRulerWordHighlightStrongForeground": "Couleur du marqueur de la règle d'aperçu la mise en évidence de symbole d’accès en écriture."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 b4a7b53c42bead6d6f08b02c8f2badf159dd80b0 i18n/fra/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 3a6ec15a4d0b2f141967d5aa037637bcdca560c3 i18n/fra/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 7668f1d1a8357ad1ad2616bdba5da67ab99569f6 i18n/fra/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,9 +10,12 @@
- 	"diff": "Comparez deux fichiers entre eux.",
- 	"add": "Ajoutez un ou plusieurs dossiers à la dernière fenêtre active.",
- 	"goto": "Ouvrez un fichier dans le chemin, à la ligne et la position de caractère spécifiées.",
-+<<<<<<< .our
- 	"newWindow": "Force à ouvrir une nouvelle fenêtre.",
- 	"reuseWindow": "Force à ouvrir un fichier ou un dossier dans la dernière fenêtre active.",
- 	"wait": "Attendre que les fichiers soient fermés avant de retourner.",
-+=======
-+>>>>>>> .their
- 	"locale": "Paramètres régionaux à utiliser (exemple : fr-FR ou en-US).",
- 	"userDataDir": "Spécifie le répertoire de l’utilisateur dans lequel les données sont conservées. Peut être utilisé pour ouvrir plusieurs instances distinctes du Code.",
- 	"version": "Affichez la version.",
-added in both
-  our    100644 12b054b670c9d0a2d799e43783cd30d426fa00a2 i18n/fra/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
-  their  100644 9bf03d3931269c813bb3adebdc3ec225f609a989 i18n/fra/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"contributes.color": "Contribue à des couleurs définies pour des extensions dont le thème peut être changé",
- 	"contributes.color.id": "L’identifiant de la couleur dont le thème peut être changé",
- 	"contributes.color.id.format": "Les identifiants doivent être sous la forme aa[.bb]*",
-changed in both
-  base   100644 e92560f342a141e3de951b7e90435fefd2a28d9d i18n/fra/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 30e1e919ce20ea7d38be72764392ce906b3ac7c0 i18n/fra/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 1c47e156e38b6490063e9aa66ea2dd37f074a578 i18n/fra/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -96,6 +96,11 @@
- 	"overviewRulerCurrentContentForeground": "Premier plan de la règle d'aperçu actuelle pour les conflits de fusion inline.",
- 	"overviewRulerIncomingContentForeground": "Premier plan de la règle d'aperçu entrante pour les conflits de fusion inline.",
- 	"overviewRulerCommonContentForeground": "Arrière-plan de la règle d'aperçu de l'ancêtre commun dans les conflits de fusion inline.",
-+<<<<<<< .our
- 	"overviewRulerFindMatchForeground": "Couleur du marqueur de la règle d'aperçu pour les correspondances trouvées. La couleur doit ne pas être opaque pour ne pas masquer les décorations du dessous.",
- 	"overviewRulerSelectionHighlightForeground": "Couleur du marqueur de la règle d'aperçu pour les mises en surbrillance de sélection. La couleur doit ne pas être opaque pour ne pas masquer les décorations du dessous."
-+=======
-+	"overviewRulerFindMatchForeground": "Couleur du marqueur de la règle d'aperçu pour rechercher des correspondances.",
-+	"overviewRulerSelectionHighlightForeground": "Couleur du marqueur de la règle d'aperçu pour la mise en évidence de la sélection."
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 c084a91938247c0ccff29a0aa7d4e1c73a382199 i18n/fra/src/vs/platform/workspaces/common/workspaces.i18n.json
-  their  100644 decedacdeb28ffd80e01ba3da776cdb2cec385c0 i18n/fra/src/vs/platform/workspaces/common/workspaces.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"codeWorkspace": "Espace de travail de code",
- 	"untitledWorkspace": "Sans titre(Espace de travail)",
- 	"workspaceNameVerbose": "{0} (Espace de travail)",
-added in both
-  our    100644 dec88bd1e82f4d80f6f2e881f5e682aa05c2b886 i18n/fra/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
-  their  100644 7c0c741150f9fba6d698fac92fc3becbc8adf5f7 i18n/fra/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,4 +11,16 @@
- 	"failedDep1": "Échec de l'activation de l'extension '{1}'. Raison : échec de l'activation de la dépendance '{0}'.",
- 	"failedDep2": "Échec de l'activation de l'extension '{0}'. Raison : plus de 10 niveaux de dépendances (probablement une boucle de dépendance).",
- 	"activationError": "L'activation de l'extension '{0}' a échoué: {1}. "
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"unknownDep": "Échec de l'activation de l'extension '{1}'. Raison : dépendance '{0}' inconnue.",
-+	"failedDep1": "Échec de l'activation de l'extension '{1}'. Raison : échec de l'activation de la dépendance '{0}'.",
-+	"failedDep2": "Échec de l'activation de l'extension '{0}'. Raison : plus de 10 niveaux de dépendances (probablement une boucle de dépendance).",
-+	"activationError": "Échec de l'activation de l'extension '{0}' : {1}."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 bdfc2772c3939d2335ad3b7fb518d67d2669e6f9 i18n/fra/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 4522e0fd127e1bcf08d6748e14cb70d5513ca327 i18n/fra/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 c65ee0c9b33bbbb1a157d2b634e886be32148faf i18n/fra/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -9,6 +9,7 @@
- 	"openFile": "Ouvrir un fichier...",
- 	"openFolder": "Ouvrir un dossier...",
- 	"openFileFolder": "Ouvrir...",
-+<<<<<<< .our
- 	"globalRemoveFolderFromWorkspace": "Supprimer le dossier d’espace de travail...",
- 	"saveWorkspaceAsAction": "Enregistrer l’espace de travail sous...",
- 	"save": "&&Enregistrer",
-@@ -16,4 +17,19 @@
- 	"openWorkspaceAction": "Ouvrir un espace de travail...",
- 	"openWorkspaceConfigFile": "Ouvrir le Fichier de Configuration d’espace de travail",
- 	"duplicateWorkspaceInNewWindow": "Dupliquer l'espace de travail dans une Nouvelle fenêtre"
-+=======
-+	"addFolderToWorkspace": "Ajouter un dossier à l'espace de travail...",
-+	"add": "&&Ajouter",
-+	"addFolderToWorkspaceTitle": "Ajouter un dossier à l'espace de travail",
-+	"newWorkspace": "Nouvel espace de travail...",
-+	"select": "&&Sélectionner",
-+	"selectWorkspace": "Sélectionner les dossiers pour l’espace de travail",
-+	"removeFolderFromWorkspace": "Supprimer le dossier de l'espace de travail",
-+	"saveWorkspaceAsAction": "Enregistrer l’espace de travail sous...",
-+	"saveEmptyWorkspaceNotSupported": "Veuillez d’abord ouvrir un espace de travail pour enregistrer.",
-+	"save": "&&Enregistrer",
-+	"saveWorkspace": "Enregistrer l’espace de travail",
-+	"openWorkspaceAction": "Ouvrir un espace de travail...",
-+	"openWorkspaceConfigFile": "Ouvrir le Fichier de Configuration d’espace de travail"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 9927a31f58e6bd42637c5158d6261570092eb358 i18n/fra/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 1cdd98b12a70baa1c905f59b19493e7b2e495bea i18n/fra/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 2ebd48c5bc85a3fa5c053b7e12394611bbcf4c12 i18n/fra/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 ab3e54a798da942efd8b75ea2526c3a6c72c0159 i18n/fra/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-  our    100644 905c22110d52d6416342fd8550af80f658130a52 i18n/fra/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-  their  100644 7a0ea73a96adc00dfc80ce66c642f04432843c39 i18n/fra/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,9 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"compositePart.hideSideBarLabel": "Masquer la barre latérale",
-+>>>>>>> .their
- 	"focusSideBar": "Focus sur la barre latérale",
- 	"viewCategory": "Affichage"
- }
-\ No newline at end of file
-changed in both
-  base   100644 2c777584371c8b2c3d3ce847ee8503c47b3ad7a1 i18n/fra/src/vs/workbench/common/theme.i18n.json
-  our    100644 67b5e93740c6b4696aa15e5da68929b00e585c36 i18n/fra/src/vs/workbench/common/theme.i18n.json
-  their  100644 0aeeb6d3ba7a1122d2868af7ecf241d4cae1b2e2 i18n/fra/src/vs/workbench/common/theme.i18n.json
-@@ -11,12 +11,17 @@
- 	"tabHoverBackground": "Couleur de l'onglet d’arrière-plan lors du survol. Les onglets sont les conteneurs pour les éditeurs dans la zone de l’éditeur. Plusieurs onglets peuvent être ouverts dans un groupe d'éditeur. Il peut y avoir plusieurs groupes d’éditeur.",
- 	"tabUnfocusedHoverBackground": "Couleur de l'onglet d’arrière-plan dans un groupe n'ayant pas le focus lors du survol. Les onglets sont les conteneurs pour les éditeurs dans la zone de l’éditeur. Plusieurs onglets peuvent être ouverts dans un groupe d'éditeur. Il peut y avoir plusieurs groupes d’éditeur.",
- 	"tabBorder": "Bordure séparant les onglets les uns des autres. Les onglets sont les conteneurs des éditeurs dans la zone d'éditeurs. Vous pouvez ouvrir plusieurs onglets dans un groupe d'éditeurs. Il peut exister plusieurs groupes d'éditeurs.",
-+<<<<<<< .our
- 	"tabActiveBorder": "Bordure en bas d'un onglet actif. Les onglets sont les conteneurs des éditeurs dans la zone d'édition. Vous pouvez ouvrir plusieurs onglets dans un groupe d'éditeurs. Il peut exister plusieurs groupes d'éditeurs.",
- 	"tabActiveBorderTop": "Bordure en haut d'un onglet actif. Les onglets sont les conteneurs des éditeurs dans la zone d'édition. Vous pouvez ouvrir plusieurs onglets dans un groupe d'éditeurs. Il peut exister plusieurs groupes d'éditeurs.",
- 	"tabActiveUnfocusedBorder": "Bordure en bas d'un onglet actif dans un groupe n'ayant pas le focus. Les onglets sont les conteneurs des éditeurs dans la zone d'édition. Vous pouvez ouvrir plusieurs onglets dans un groupe d'éditeurs. Il peut exister plusieurs groupes d'éditeurs.",
- 	"tabActiveUnfocusedBorderTop": "Bordure en haut d'un onglet actif dans un groupe n'ayant pas le focus. Les onglets sont les conteneurs des éditeurs dans la zone d'édition. Vous pouvez ouvrir plusieurs onglets dans un groupe d'éditeurs. Il peut exister plusieurs groupes d'éditeurs.",
- 	"tabHoverBorder": "Bordure avec laquelle surligner les onglets lors du survol. Couleur de l'onglet d’arrière-plan dans un groupe n'ayant pas le focus lors du survol. Les onglets sont les conteneurs pour les éditeurs dans la zone de l’éditeur. Plusieurs onglets peuvent être ouverts dans un groupe d'éditeur. Il peut y avoir plusieurs groupes d’éditeur.",
- 	"tabUnfocusedHoverBorder": "Bordure avec laquelle surligner les onglets lors du survol dans un groupe n'ayant pas le focus. Couleur de l'onglet d’arrière-plan dans un groupe n'ayant pas le focus lors du survol. Les onglets sont les conteneurs pour les éditeurs dans la zone de l’éditeur. Plusieurs onglets peuvent être ouverts dans un groupe d'éditeur. Il peut y avoir plusieurs groupes d’éditeur.",
-+=======
-+	"tabActiveBorder": "Bordure pour mettre en évidence les onglets actifs. Les onglets sont les conteneurs des éditeurs dans la zone d'édition. Vous pouvez ouvrir plusieurs onglets dans un groupe d'éditeurs. Il peut exister plusieurs groupes d'éditeurs.",
-+	"tabActiveUnfocusedBorder": "Bordure pour mettre en évidence les onglets actifs dans un groupe inactif. Les onglets sont les conteneurs des éditeurs dans la zone d'édition. Vous pouvez ouvrir plusieurs onglets dans un groupe d'éditeurs. Il peut exister plusieurs groupes d'éditeurs.",
-+>>>>>>> .their
- 	"tabActiveForeground": "Couleur de premier plan de l'onglet actif dans un groupe actif. Les onglets sont les conteneurs des éditeurs dans la zone d'éditeurs. Vous pouvez ouvrir plusieurs onglets dans un groupe d'éditeurs. Il peut exister plusieurs groupes d'éditeurs.",
- 	"tabInactiveForeground": "Couleur de premier plan de l'onglet inactif dans un groupe actif. Les onglets sont les conteneurs des éditeurs dans la zone d'éditeurs. Vous pouvez ouvrir plusieurs onglets dans un groupe d'éditeurs. Il peut exister plusieurs groupes d'éditeurs.",
- 	"tabUnfocusedActiveForeground": "Couleur de premier plan de l'onglet actif dans un groupe inactif. Les onglets sont les conteneurs des éditeurs dans la zone d'éditeurs. Vous pouvez ouvrir plusieurs onglets dans un groupe d'éditeurs. Il peut exister plusieurs groupes d'éditeurs.",
-@@ -32,7 +37,10 @@
- 	"panelActiveTitleForeground": "Couleur du titre du panneau actif. Les panneaux se situent sous la zone de l'éditeur et contiennent des affichages comme la sortie et le terminal intégré.",
- 	"panelInactiveTitleForeground": "Couleur du titre du panneau inactif. Les panneaux se situent sous la zone de l'éditeur et contiennent des affichages comme la sortie et le terminal intégré.",
- 	"panelActiveTitleBorder": "Couleur de la bordure du titre du panneau actif. Les panneaux se situent sous la zone de l'éditeur et contiennent des affichages comme la sortie et le terminal intégré.",
-+<<<<<<< .our
- 	"panelDragAndDropBackground": "Glissez et déposez la couleur de vos commentaires pour les éléments de titre du panneau. La couleur devrait avoir de la transparence afin que les entrées du panneau puissent encore briller à travers. Les panneaux apparaissent sous la zone de l’éditeur et contiennent des vues comme la sortie et le terminal intégré.",
-+=======
-+>>>>>>> .their
- 	"statusBarForeground": "Couleur de premier plan de la barre d'état quand l'espace de travail est ouvert. La barre d'état est affichée en bas de la fenêtre.",
- 	"statusBarNoFolderForeground": "Couleur de premier plan de la barre d'état quand aucun dossier n'est ouvert. La barre d'état est affichée en bas de la fenêtre.",
- 	"statusBarBackground": "Couleur d'arrière-plan de la barre d'état quand l'espace de travail est ouvert. La barre d'état est affichée en bas de la fenêtre.",
-@@ -61,6 +69,7 @@
- 	"titleBarActiveBackground": "Arrière-plan de la barre de titre quand la fenêtre est active. Notez que cette couleur est uniquement prise en charge sur macOS.",
- 	"titleBarInactiveBackground": "Arrière-plan de la barre de titre quand la fenêtre est inactive. Notez que cette couleur est uniquement prise en charge sur macOS.",
- 	"titleBarBorder": "Couleur de bordure de la barre titre. Notez que cette couleur est actuellement uniquement pris en charge sur macOS.",
-+<<<<<<< .our
- 	"notificationCenterBorder": "Couleur de bordure du centre de notifications. Les notifications défilent à partir du bas à droite de la fenêtre.",
- 	"notificationToastBorder": "Couleur de bordure du toast des notifications. Les notifications défilent à partir du bas à droite de la fenêtre.",
- 	"notificationsForeground": "Couleur de premier plan des notifications. Les notifications défilent à partir du bas à droite de la fenêtre.",
-@@ -69,4 +78,17 @@
- 	"notificationCenterHeaderForeground": "Couleur de premier plan de l'en-tête du centre de notifications. Les notifications défilent à partir du bas à droite de la fenêtre.",
- 	"notificationCenterHeaderBackground": "Couleur d'arrière plan de l'en-tête du centre de notifications. Les notifications défilent à partir du bas à droite de la fenêtre.",
- 	"notificationsBorder": "Couleur de bordure séparant des autres notifications dans le centre de notifications. Les notifications défilent à partir du bas à droite de la fenêtre."
-+=======
-+	"notificationsForeground": "Couleur de premier plan des notifications. Les notifications défilent à partir du haut de la fenêtre.",
-+	"notificationsBackground": "Couleur d'arrière-plan des notifications. Les notifications défilent à paritr du haut de la fenêtre.",
-+	"notificationsButtonBackground": "Couleur d'arrière-plan du bouton des notifications. Les notifications défilent à partir du haut de la fenêtre.",
-+	"notificationsButtonHoverBackground": "Couleur d'arrière-plan du bouton des notifications pendant le pointage. Les notifications défilent à partir du haut de la fenêtre.",
-+	"notificationsButtonForeground": "Couleur de premier plan du bouton des notifications. Les notifications défilent à partir du haut de la fenêtre.",
-+	"notificationsInfoBackground": "Couleur d'arrière-plan des informations des notifications. Les notifications défilent à partir du haut de la fenêtre.",
-+	"notificationsInfoForeground": "Couleur de premier plan des informations des notifications. Les notifications défilent à partir du haut de la fenêtre.",
-+	"notificationsWarningBackground": "Couleur d'arrière-plan de l'avertissement des notifications. Les notifications défilent à partir du haut de la fenêtre.",
-+	"notificationsWarningForeground": "Couleur de premier plan de l'avertissement des notifications. Les notifications défilent à partir du haut de la fenêtre.",
-+	"notificationsErrorBackground": "Couleur d'arrière-plan de l'erreur des notifications. Les notifications défilent à partir du haut de la fenêtre.",
-+	"notificationsErrorForeground": "Couleur de premier plan de l'erreur des notifications. Les notifications défilent à partir du haut de la fenêtre."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a082ef906e173c46f00cb5467720263156c97c0e i18n/fra/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 8f9f7eb339d47d55df577bac8ccf306bd77eb0fa i18n/fra/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 55e38a54c343c42b03bdac296610b69ec356c776 i18n/fra/src/vs/workbench/electron-browser/actions.i18n.json
-changed in both
-  base   100644 4753f90d9c4fdaaa445659703e9f8d05b376a6d4 i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 1a663cb4405d0c8f86ec154a57cdd2b613d93195 i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 cd1097afbbd70b14c52ba2263d512bf159291954 i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,6 +35,7 @@
- 	"panelDefaultLocation": "Contrôle l’emplacement par défaut du panneau. Il peut être affiché soit en bas ou à droite du banc d'essai.",
- 	"statusBarVisibility": "Contrôle la visibilité de la barre d'état au bas du banc d'essai.",
- 	"activityBarVisibility": "Contrôle la visibilité de la barre d'activités dans le banc d'essai.",
-+<<<<<<< .our
- 	"viewVisibility": "Contrôle la visibilité des actions d'en-tête de vue. Les actions d'en-tête de vue peuvent être soit toujours visibles, ou uniquement visibles quand cette vue a le focus ou est survolée.",
- 	"fontAliasing": "Contrôle la méthode de font aliasing dans le workbench.\n- default : Lissage des polices de sous-pixel. Sur la plupart des affichages non-ratina, cela vous donnera le texte le plus vif\n- antialiased : Lisse les polices au niveau du pixel, plutôt que les sous-pixels. Peut faire en sorte que la police apparaisse plus fine dans l’ensemble \n- none : Désactive le lissage des polices. Le texte s'affichera avec des bordures dentelées\n- auto: Applique `default` ou `antialiased` automatiquement en se basant sur la résolution de l'affichage.",
- 	"workbench.fontAliasing.default": "Lissage de sous-pixel des polices. Sur la plupart des affichages non-retina, cela vous donnera le texte le plus vif.",
-@@ -43,6 +44,15 @@
- 	"workbench.fontAliasing.auto": "Applique `default` ou `antialiased`automatiquement en se basant sur la résolution de l'affichage.",
- 	"enableNaturalLanguageSettingsSearch": "Contrôle s’il faut activer le mode de recherche en langage naturel pour les paramètres.",
- 	"windowConfigurationTitle": "Fenêtre",
-+=======
-+	"closeOnFileDelete": "Contrôle si les éditeurs qui affichent un fichier doivent se fermer automatiquement quand ce fichier est supprimé ou renommé par un autre processus. Si vous désactivez cette option, l'éditeur reste ouvert dans un état indiquant une intégrité compromise. Notez que la suppression de fichiers à partir de l'application entraîne toujours la fermeture de l'éditeur, et que les fichiers à l'intégrité compromise ne sont jamais fermés pour permettre la conservation de vos données.",
-+	"fontAliasing": "Contrôle la méthode de font aliasing dans le workbench.\n- par défaut : Lissage des polices de sous-pixel. Sur la plupart des affichages non-ratina, cela vous donnera le texte le plus vif\n- crénelées : Lisse les polices au niveau du pixel, plutôt que les sous-pixels. Peut faire en sorte que la police apparaisse plus légère dans l’ensemble \n- none : désactive le lissage des polices. Le texte s'affichera avec des bordures dentelées",
-+	"workbench.fontAliasing.default": "Lissage de sous-pixel des polices. Sur la plupart des affichages non-retina, cela vous donnera le texte le plus vif.",
-+	"workbench.fontAliasing.antialiased": "Lisser les polices au niveau du pixel, plutôt que les sous-pixels. Peut faire en sorte que la police apparaisse plus légère dans l’ensemble.",
-+	"workbench.fontAliasing.none": "Désactive le lissage des polices. Le texte s'affichera avec des bordures dentelées.",
-+	"swipeToNavigate": "Parcourez les fichiers ouverts en faisant glisser trois doigts horizontalement. ",
-+	"workbenchConfigurationTitle": "Banc d'essai",
-+>>>>>>> .their
- 	"window.openFilesInNewWindow.on": "Les fichiers s'ouvrent dans une nouvelle fenêtre",
- 	"window.openFilesInNewWindow.off": "Les fichiers s'ouvrent dans la fenêtre du dossier conteneur ouvert ou dans la dernière fenêtre active",
- 	"window.openFilesInNewWindow.defaultMac": "Les fichiers s'ouvriront dans la fenêtre avec le dossier des fichiers ouvert ou la dernière fenêtre active, à moins qu'ils ne soient ouverts via le Dock ou depuis Finder.",
-changed in both
-  base   100644 52e6b8d12ff6a7d2751282ee43e38ff1cbc624e2 i18n/fra/src/vs/workbench/electron-browser/window.i18n.json
-  our    100644 6e669b2258da3109a79d0d8175b8cfd0b9744d85 i18n/fra/src/vs/workbench/electron-browser/window.i18n.json
-  their  100644 96dc00191af1753b0d10c464125d2f736043f0a9 i18n/fra/src/vs/workbench/electron-browser/window.i18n.json
-@@ -11,6 +11,10 @@
- 	"cut": "Couper",
- 	"copy": "Copier",
- 	"paste": "Coller",
-+<<<<<<< .our
- 	"selectAll": "Tout Sélectionner",
- 	"runningAsRoot": "Il est déconseillé d’exécuter {0} en tant qu’utilisateur root."
-+=======
-+	"selectAll": "Tout Sélectionner"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 de5d59cb084fc5e8524335865e416888a66b8d88 i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
-  their  100644 56dc21af0013ec0ee9326ad37c247b09eb35750d i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"toggleMinimap": "Affichage : Activer/désactiver la minicarte"
- }
-\ No newline at end of file
-changed in both
-  base   100644 6555dbee12549937e511d62336111bd7b5e0b3c5 i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
-  our    100644 b1763757fe052adb8472e29d6f1f8e6f8940da98 i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
-  their  100644 064c359bfc763266c926bb82d7c667c94adee748 i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"toggleRenderControlCharacters": "Affichage : Activer/désactiver les caractères de contrôle"
- }
-\ No newline at end of file
-changed in both
-  base   100644 0bdd59aa9bd1735fd8df19d1fe78b115dd3f6376 i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
-  our    100644 96d37fe1585a16fae99ef5dfe38cca6b072d89c1 i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
-  their  100644 878f453bdeb97262052593f581f57074b74b6475 i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"toggleRenderWhitespace": "Affichage : Activer/désactiver l'affichage des espaces"
- }
-\ No newline at end of file
-changed in both
-  base   100644 fdf0d48085c83bffe2a4bdcd650c9db5ad80e96c i18n/fra/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  our    100644 979233d172f8263db25eb12ad373b2838a718689 i18n/fra/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  their  100644 207f6a482dd33342e14a2bd69dca953b27d9b93f i18n/fra/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-changed in both
-  base   100644 b4fa3eab63698bf2d7d1b2c6f094448308ec86ad i18n/fra/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  our    100644 a15f1f9ca32a27db95a99dffa5e908bd56d7dd64 i18n/fra/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  their  100644 76fb8ce3e72902541c34908770721316afef299b i18n/fra/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-changed in both
-  base   100644 8b0cfe2f540cb8128b2cbaddc148934f09a96b43 i18n/fra/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  our    100644 11c71d149dcd965919372e9b079e7b0ec31fc966 i18n/fra/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  their  100644 f3922c0c45a5812918dfdb68354e485cf3fb28a9 i18n/fra/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-@@ -8,6 +8,23 @@
- 	],
- 	"debugAdapterBinNotFound": "L'exécutable d'adaptateur de débogage '{0}' n'existe pas.",
- 	"debugAdapterCannotDetermineExecutable": "Impossible de déterminer l'exécutable pour l'adaptateur de débogage '{0}'.",
-+<<<<<<< .our
- 	"unableToLaunchDebugAdapter": "Impossible de lancer l'adaptateur de débogage à partir de '{0}'.",
- 	"unableToLaunchDebugAdapterNoArgs": "Impossible de lancer l'adaptateur de débogage."
-+=======
-+	"launch.config.comment1": "Utilisez IntelliSense pour en savoir plus sur les attributs possibles.",
-+	"launch.config.comment2": "Pointez pour afficher la description des attributs existants.",
-+	"launch.config.comment3": "Pour plus d'informations, visitez : {0}",
-+	"debugType": "Type de configuration.",
-+	"debugTypeNotRecognised": "Le type de débogage n'est pas reconnu. Vérifiez que vous avez installé l'extension de débogage correspondante et qu'elle est activée.",
-+	"node2NotSupported": "\"node2\" n'est plus pris en charge. Utilisez \"node\" à la place, et affectez la valeur \"inspector\" à l'attribut \"protocol\".",
-+	"debugName": "Le nom de la configuration s'affiche dans le menu déroulant de la configuration de lancement.",
-+	"debugRequest": "Type de requête de configuration. Il peut s'agir de \"launch\" ou \"attach\".",
-+	"debugServer": "Pour le développement d'une extension de débogage uniquement : si un port est spécifié, VS Code tente de se connecter à un adaptateur de débogage s'exécutant en mode serveur",
-+	"debugPrelaunchTask": "Tâche à exécuter avant le démarrage de la session de débogage.",
-+	"debugWindowsConfiguration": "Attributs de configuration de lancement spécifiques à Windows.",
-+	"debugOSXConfiguration": "Attributs de configuration de lancement spécifiques à OS X.",
-+	"debugLinuxConfiguration": "Attributs de configuration de lancement spécifiques à Linux.",
-+	"deprecatedVariables": "env.', 'config.' et 'command.' sont déconseillés. Utilisez 'env:', 'config:' et 'command:' à la place."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 552e6f9f400c95d6f23081099bac318da780c5ef i18n/fra/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  our    100644 3551b5e036401750ea0c8346808de61f5309a6a0 i18n/fra/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  their  100644 8fadf8b958bad5b0f9ead536beda02b61da7f096 i18n/fra/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-changed in both
-  base   100644 0112a21db366de319a7a5193ffda7b5f497aba67 i18n/fra/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 0057e22b4a8443d5b30bfe0090c058bd31602f8d i18n/fra/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 bb40909dd1ccb4594b22d4d2433eeed101d1bd40 i18n/fra/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-@@ -52,7 +52,14 @@
- 	"extensionInstalled": "L’extension recommandée est déjà installée",
- 	"showRecommendedKeymapExtensionsShort": "Mappages de touches",
- 	"showLanguageExtensionsShort": "Extensions de langage",
-+<<<<<<< .our
- 	"showAzureExtensionsShort": "Extensions Azure",
-+=======
-+	"showAzureExtensions": "Afficher les Extensions Azure",
-+	"showAzureExtensionsShort": "Extensions Azure",
-+	"configureWorkspaceRecommendedExtensions": "Configurer les extensions recommandées (espace de travail)",
-+	"ConfigureWorkspaceRecommendations.noWorkspace": "Les recommandations ne sont disponibles que pour un dossier d'espace de travail.",
-+>>>>>>> .their
- 	"OpenExtensionsFile.failed": "Impossible de créer le fichier 'extensions.json' dans le dossier '.vscode' ({0}).",
- 	"configureWorkspaceRecommendedExtensions": "Configurer les extensions recommandées (espace de travail)",
- 	"configureWorkspaceFolderRecommendedExtensions": "Configurer les extensions recommandées (Dossier d'espace de travail)",
-changed in both
-  base   100644 fdf890d05eef06d8609adc4a736123f0301d8f12 i18n/fra/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
-  our    100644 c0057e5215c73761b92d65b5e39fe74aa4c15151 i18n/fra/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
-  their  100644 2a8a3d2e72cabcc4be68b4c4dfff5f79ac2721d1 i18n/fra/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
-@@ -4,7 +4,11 @@
-  *--------------------------------------------------------------------------------------------*/
- // Do not edit this file. It is machine generated.
- {
-+<<<<<<< .our
- 	"filesCategory": "Fichier",
-+=======
-+	"filesCategory": "Fichiers",
-+>>>>>>> .their
- 	"revealInSideBar": "Afficher dans la barre latérale",
- 	"acceptLocalChanges": "Utiliser vos modifications et écraser les contenus du disque",
- 	"revertLocalChanges": "Ignorer les modifications et revenir au contenu sur le disque"
-changed in both
-  base   100644 c3b09b18594fbcb52adeafa91f8a6b5c3cd19f87 i18n/fra/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  our    100644 ca93414c3797b11dad1e4b58c6037891940ba5c7 i18n/fra/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  their  100644 78b61033acca5022808872aacdb06ec292d2a629 i18n/fra/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-changed in both
-  base   100644 9439ba9fff7726de3b8dbe7216e8b5a4fb089945 i18n/fra/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 9693ca31c50911feab4d02a16763cfd2142313b0 i18n/fra/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 df8712b707b72ec5a424e3f693c1ae35c2daffdb i18n/fra/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-@@ -40,14 +40,21 @@
- 	"dynamicHeight": "Contrôle si la hauteur de la section des éditeurs ouverts doit s'adapter dynamiquement ou non au nombre d'éléments.",
- 	"autoReveal": "Contrôle si l'Explorateur doit automatiquement afficher et sélectionner les fichiers à l'ouverture.",
- 	"enableDragAndDrop": "Contrôle si l'explorateur doit autoriser le déplacement de fichiers et de dossiers par glisser-déplacer.",
-+<<<<<<< .our
- 	"confirmDragAndDrop": "Contrôle si l’Explorateur doit demander confirmation lors du déplacement de fichiers ou de dossiers via glisser-déposer.",
- 	"confirmDelete": "Contrôle si l’explorateur doit demander confirmation lorsque vous supprimez un fichier via la corbeille.",
-+=======
-+>>>>>>> .their
- 	"sortOrder.default": "Les fichiers et dossiers sont triés par nom, dans l’ordre alphabétique. Les dossiers sont affichés avant les fichiers.",
- 	"sortOrder.mixed": "Les fichiers et dossiers sont triés par nom, dans l’ordre alphabétique. Les fichiers sont imbriqués dans les dossiers.",
- 	"sortOrder.filesFirst": "Les fichiers et dossiers sont triés par nom, dans l’ordre alphabétique. Les fichiers sont affichés avant les dossiers.",
- 	"sortOrder.type": "Les fichiers et dossiers sont triés par extension, dans l’ordre alphabétique. Les dossiers sont affichés avant les fichiers.",
- 	"sortOrder.modified": "Les fichiers et dossiers sont triés par date de dernière modification, dans l’ordre décroissant. Les dossiers sont affichés avant les fichiers.",
-+<<<<<<< .our
- 	"sortOrder": "Contrôle l'ordre de tri des fichiers et dossiers dans l'explorateur. En plus du tri par défaut, vous pouvez définir l'ordre sur 'mixed' (fichiers et dossiers triés combinés), 'type' (par type de fichier), 'modified' (par date de dernière modification) ou 'fileFirst' (trier les fichiers avant les dossiers).",
- 	"explorer.decorations.colors": "Contrôle si les décorations de fichier doivent utiliser des couleurs.",
- 	"explorer.decorations.badges": "Contrôle si les décorations de fichier doivent utiliser des badges."
-+=======
-+	"sortOrder": "Contrôle l'ordre de tri des fichiers et dossiers dans l'explorateur. En plus du tri par défaut, vous pouvez définir l'ordre sur 'mixed' (fichiers et dossiers triés combinés), 'type' (par type de fichier), 'modified' (par date de dernière modification) ou 'fileFirst' (trier les fichiers avant les dossiers)."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 2ecf7ac060da544f45120baaa23904f3a0639d5e i18n/fra/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-  our    100644 f944e7fc14ff13265af3f6fef112a7a5de5ca326 i18n/fra/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-  their  100644 b3844c69018427342f12432ff2be65b0e438b17c i18n/fra/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-@@ -12,5 +12,6 @@
- 	"genericSaveError": "Échec d'enregistrement de '{0}' ({1}).",
- 	"staleSaveError": "Échec de l'enregistrement de '{0}' : le contenu sur disque est plus récent. Cliquez sur **Comparer** pour comparer votre version à celle située sur le disque.",
- 	"compareChanges": "Comparer",
--	"saveConflictDiffLabel": "{0} (sur le disque) ↔ {1} (dans {2}) - Résoudre le conflit d'enregistrement"
-+	"saveConflictDiffLabel": "{0} (sur le disque) ↔ {1} (dans {2}) - Résoudre le conflit d'enregistrement",
-+	"userGuide": "Utiliser les actions dans la barre d’outils de l’éditeur vers la droite pour soit **annuler** vos modifications ou **écraser** le contenu sur le disque avec vos modifications"
- }
-\ No newline at end of file
-changed in both
-  base   100644 503c32add4056fa896c7a975bc8cab81a0e2492b i18n/fra/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
-  our    100644 631a14a1cef8d77621e2da2b5ff3821c4087f945 i18n/fra/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
-  their  100644 b4031885489f91352e4afdaf4d5ad178009c27b2 i18n/fra/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
-@@ -10,9 +10,12 @@
- 	"dropFolder": "Voulez-vous ajouter le dossier à l’espace de travail ?",
- 	"addFolders": "&&Ajouter les dossiers",
- 	"addFolder": "&&Ajouter le dossier",
-+<<<<<<< .our
- 	"confirmMove": "Êtes-vous certain de vouloir déplacer '{0}' ?",
- 	"doNotAskAgain": "Ne plus me demander",
- 	"moveButtonLabel": "&&Déplacer",
-+=======
-+>>>>>>> .their
- 	"confirmOverwriteMessage": "{0}' existe déjà dans le dossier de destination. Voulez-vous le remplacer ?",
- 	"irreversible": "Cette action est irréversible !",
- 	"replaceButtonLabel": "&&Remplacer"
-changed in both
-  base   100644 61742507b3662fb3aebe4b11318e6f585b157592 i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  our    100644 e838745aa51608675b5f1abeac806b7a4c29cad3 i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  their  100644 829d423c32eed88ed06208ea49a74df195782426 i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-@@ -14,6 +14,10 @@
- 	"openGlobalKeybindingsFile": "Ouvrir le fichier des raccourcis clavier",
- 	"openWorkspaceSettings": "Ouvrir les paramètres d'espace de travail",
- 	"openFolderSettings": "Ouvrir le dossier Paramètres",
-+<<<<<<< .our
-+=======
-+	"pickFolder": "Sélectionner le dossier",
-+>>>>>>> .their
- 	"configureLanguageBasedSettings": "Configurer les paramètres spécifiques au langage...",
- 	"languageDescriptionConfigured": "({0})",
- 	"pickLanguage": "Sélectionner un langage"
-changed in both
-  base   100644 990d1f6a9a97d982872ccdbfd7aa7822ec050601 i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 def18c92de62940f464c192ffdc0811ec055095e i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 3684b913ba7f4787f4aba3652d304d299cd8c070 i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -14,4 +15,19 @@
- 	"editTtile": "Modifier",
- 	"replaceDefaultValue": "Remplacer dans les paramètres",
- 	"copyDefaultValue": "Copier dans Paramètres"
-+=======
-+	"emptyUserSettingsHeader": "Placer vos paramètres ici pour remplacer les paramètres par défaut.",
-+	"errorInvalidConfiguration": "Impossible d'écrire les paramètres. Corrigez les erreurs/avertissements présents dans le fichier, puis réessayez.",
-+	"emptyWorkspaceSettingsHeader": "Placer vos paramètres ici pour remplacer les paramètres utilisateur.",
-+	"emptyFolderSettingsHeader": "Placer les paramètres de votre dossier ici pour remplacer ceux des paramètres de l’espace de travail.",
-+	"defaultFolderSettingsTitle": "Paramètres de dossier par défaut",
-+	"defaultSettingsTitle": "Paramètres par défaut",
-+	"noSettingsFound": "Aucun paramètre.",
-+	"editTtile": "Modifier",
-+	"replaceDefaultValue": "Remplacer dans les paramètres",
-+	"copyDefaultValue": "Copier dans Paramètres",
-+	"unsupportedPHPExecutablePathSetting": "Ce paramètre doit être un paramètre utilisateur. Pour configurer PHP pour l'espace de travail, ouvrez un fichier PHP, puis cliquez sur 'Chemin PHP' dans la barre d'état.",
-+	"unsupportedWorkspaceSetting": "Ce paramètre doit être un paramètre utilisateur.",
-+	"unsupportedWorkbenchSetting": "Ce paramètre ne peut pas être appliqué maintenant. Il est appliqué quand vous ouvrez ce dossier directement."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a71763915a8d5ad9d61baa9aa114a790fb1f0d99 i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-  our    100644 58fa7022cd814e057afdce2cbbafc9d8b5f28b30 i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-  their  100644 3f323a432755fe11c3d2452035d109a9fc62a8f4 i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 40cb14d81b25931ed98c99ed64c659dbe62e387d i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 c4a6584827b8d5c2d94892a3e758a5cde6b369eb i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -12,4 +13,13 @@
- 	"userSettings": "Paramètres utilisateur",
- 	"workspaceSettings": "Paramètres de l'espace de travail",
- 	"folderSettings": "Paramètres de dossier"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"folderSettingsDetails": "Paramètres de dossier"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7507a7f217ace49deaddaa2f034b8ac3c7b37728 i18n/fra/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  our    100644 31cb132ffd591f1fb232c21680adcc5624e5f7bc i18n/fra/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  their  100644 df36de368d34a03dde52e9c0b6f9b627ed246e3d i18n/fra/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-@@ -8,5 +8,11 @@
- 	],
- 	"relaunchSettingMessage": "Un paramètre a changé et nécessite un redémarrage pour être appliqué.",
- 	"relaunchSettingDetail": "Appuyez sur le bouton de redémarrage pour redémarrer {0} et activer le paramètre.",
-+<<<<<<< .our
- 	"restart": "&&Redémarrer"
-+=======
-+	"restart": "Redémarrer",
-+	"relaunchWorkspaceMessage": "Ce changement d’espace de travail nécessite un rechargement de notre système d’extension.",
-+	"reload": "Recharger"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 3fe2c3e213dbebc4fe35cba045e9ea57af1e8d9b i18n/fra/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-  our    100644 fa6244d3c201b07b11c500c5ae7d35a50921cd8c i18n/fra/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-  their  100644 e9c5ba38792ced0f76480c9fb55f3fdef9fccea8 i18n/fra/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-changed in both
-  base   100644 50606f11e00f0d8620a7ff2995710e416fd82d55 i18n/fra/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  our    100644 cff66834ecd9a182ea692c3558e8fa31ebfdf5cb i18n/fra/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  their  100644 015c5898f64a1906ae042e551610af6e1eb3b070 i18n/fra/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-changed in both
-  base   100644 af8d3a6de1256d20ec1523fc0c47fc83a24c65c7 i18n/fra/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  our    100644 4bae27c08c3d1da218f3a8a35acda60c8fbc4816 i18n/fra/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  their  100644 58e4c5b939e28982f73eca0b55d2104d40295272 i18n/fra/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -10,6 +11,11 @@
- 	"hideRepository": "Masquer",
- 	"installAdditionalSCMProviders": "Installer des fournisseurs SCM supplémentaires...",
- 	"no open repo": "Il n’y a aucun fournisseur de contrôle de code source actif.",
-+=======
-+	"commitMessage": "Message (press {0} to commit)",
-+	"installAdditionalSCMProviders": "Installer des fournisseurs SCM supplémentaires...",
-+	"no open repo": "Aucun contrôle de code source actif.",
-+>>>>>>> .their
- 	"source control": "Contrôle de code source",
- 	"viewletTitle": "{0} : {1}",
- 	"hideView": "Masquer"
-changed in both
-  base   100644 dd5b8b24dd7f1f47e7dbd0c84c8da968c17215fb i18n/fra/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 7927ac428c9397051edb023d925d6ab74f6c0189 i18n/fra/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 2478230b806fc22ca670def76a32897a33d71eb5 i18n/fra/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"nextSearchIncludePattern": "Afficher le prochain Include Pattern de recherche",
- 	"previousSearchIncludePattern": "Afficher le précédent Include Pattern de recherche",
- 	"nextSearchExcludePattern": "Afficher le prochain Exclude Pattern de recherche",
-@@ -16,6 +19,8 @@
- 	"previousReplaceTerm": "Voir le terme de recherche précédent à remplacer",
- 	"findInFiles": "Chercher dans les fichiers",
- 	"replaceInFiles": "Remplacer dans les fichiers",
-+	"findInWorkspace": "Trouver dans l’espace de travail...",
-+	"findInFolder": "Trouver dans le dossier...",
- 	"RefreshAction.label": "Actualiser",
- 	"CollapseDeepestExpandedLevelAction.label": "Réduire tout",
- 	"ClearSearchResultsAction.label": "Effacer",
-changed in both
-  base   100644 052e41c13ac834a4a073d338cc434d21861bf194 i18n/fra/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-  our    100644 a979901875e3ecf563312ec08ecc18edde6ad1ee i18n/fra/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-  their  100644 9038b91202e9bd43bb0dec03e5b877a44de31e78 i18n/fra/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"searchFolderMatch.other.label": "Autres fichiers",
- 	"searchFileMatches": "{0} fichiers trouvés",
- 	"searchFileMatch": "{0} fichier trouvé",
-changed in both
-  base   100644 ee2441931b50bb93815060a08c9980cf0fd775e8 i18n/fra/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  our    100644 4cd20eea1e68cf73a56249541b739d94f4272553 i18n/fra/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  their  100644 a17af9ee4c5db13e39d7ea2d3daae96c2f76b6ae i18n/fra/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-added in both
-  our    100644 a236bfe1de14ece9b9e726c5a39024e29c0b7d14 i18n/fra/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
-  their  100644 f01c8d3071d9ce7186e6ba674f04922da4540d53 i18n/fra/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"search.noWorkspaceWithName": "Aucun dossier dans l’espace de travail avec le nom {0}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 880bf493d013305e12d0de0cf4e4710c123a1dc4 i18n/fra/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 673cb698c2a5b3bfb8460611a63585f8ca3fd4e1 i18n/fra/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 dab43172adf014f0a15626d44ec9c3b6455327fb i18n/fra/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-changed in both
-  base   100644 3681aebcf343094a424a4703d21eb5d2bb6723c1 i18n/fra/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 87d639c304bc4b35cf6eb86239d5ea30fd616b54 i18n/fra/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 ec626616bb1f11e509fc7a71bb1d8c580f6b761e i18n/fra/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -12,6 +12,7 @@
- 	"totalWarnings": "{0} avertissements",
- 	"totalInfos": "{0} infos",
- 	"problems": "Problèmes",
-+<<<<<<< .our
- 	"building": "Génération...",
- 	"manyProblems": "10K+",
- 	"runningTasks": "Afficher les tâches en cours d'exécution",
-@@ -19,22 +20,36 @@
- 	"TaskSystem.noHotSwap": "Changer le moteur d’exécution de tâches avec une tâche active en cours d’exécution nécessite de recharger la fenêtre",
- 	"reloadWindow": "Recharger la fenêtre",
- 	"TaskServer.folderIgnored": "Le dossier {0} est ignoré car il utilise la version 0.1.0 de task",
-+=======
-+	"manyMarkers": "99",
-+	"runningTasks": "Afficher les tâches en cours d'exécution",
-+	"tasks": "Tâches",
-+	"TaskSystem.noHotSwap": "Le changement du moteur d’exécution de tâches nécessite de recharger la fenêtre",
-+>>>>>>> .their
- 	"TaskService.noBuildTask1": "Aucune tâche de build définie. Marquez une tâche avec 'isBuildCommand' dans le fichier tasks.json.",
- 	"TaskService.noBuildTask2": "Aucune tâche de génération définie. Marquez une tâche comme groupe 'build' dans le fichier tasks.json.",
- 	"TaskService.noTestTask1": "Aucune tâche de test définie. Marquez une tâche avec 'isTestCommand' dans le fichier tasks.json.",
- 	"TaskService.noTestTask2": "Aucune tâche de test définie. Marquez une tâche comme groupe 'test' dans le fichier tasks.json.",
- 	"TaskServer.noTask": "La tâche {0} à exécuter est introuvable.",
-+<<<<<<< .our
- 	"TaskService.associate": "associer",
-+=======
-+>>>>>>> .their
- 	"TaskService.attachProblemMatcher.continueWithout": "Continuer sans analyser la sortie de la tâche",
- 	"TaskService.attachProblemMatcher.never": "Ne jamais vérifier la sortie de la tâche",
- 	"TaskService.attachProblemMatcher.learnMoreAbout": "En savoir plus sur la sortie de la tâche de numérisation",
- 	"selectProblemMatcher": "Sélectionner pour quel type d’erreurs et d’avertissements analyser la sortie de la tâche",
- 	"customizeParseErrors": "La configuration de tâche actuelle contient des erreurs. Corrigez-les avant de personnaliser une tâche. ",
- 	"moreThanOneBuildTask": "De nombreuses tâches de génération sont définies dans le fichier tasks.json. Exécution de la première.\n",
-+<<<<<<< .our
- 	"TaskSystem.activeSame.background": "La tâche '{0}\" est déjà active et en mode arrière-plan.",
- 	"TaskSystem.activeSame.noBackground": "La tâche '{0}' est déjà active.",
- 	"terminateTask": "Terminer la tâche",
- 	"restartTask": "Redémarrer la tâche",
-+=======
-+	"TaskSystem.activeSame.background": "La tâche '{0}' est déjà active et en mode arrière-plan. Pour la terminer, utiliser `Terminer la Tâche...` » dans le menu Tâches.",
-+	"TaskSystem.activeSame.noBackground": "La tâche '{0}' est déjà active. Pour la terminer, il utilise `Terminer la Tâche...` dans le menu Tâches.",
-+>>>>>>> .their
- 	"TaskSystem.active": "Une tâche est déjà en cours d'exécution. Terminez-la avant d'exécuter une autre tâche.",
- 	"TaskSystem.restartFailed": "Échec de la fin de l'exécution de la tâche {0}",
- 	"TaskService.noConfiguration": "Erreur : La détection de la tâche {0} n’a pas contribué à une tâche pour la configuration suivante : {1}, la tâche sera ignorée.\n",
-@@ -75,8 +90,13 @@
- 	"TaskService.pickDefaultBuildTask": "Sélectionner la tâche à utiliser comme tâche de génération par défaut",
- 	"TaskService.defaultTestTaskExists": "{0} est déjà marquée comme tâche de test par défaut.",
- 	"TaskService.pickDefaultTestTask": "Sélectionner la tâche à utiliser comme tâche de test par défaut",
-+<<<<<<< .our
- 	"TaskService.pickShowTask": "Sélectionner la tâche pour montrer sa sortie",
- 	"TaskService.noTaskIsRunning": "Aucune tâche n’est en cours d’exécution",
-+=======
-+	"TaskService.noTaskIsRunning": "Aucune tâche n’est en cours d’exécution.",
-+	"TaskService.pickShowTask": "Sélectionner la tâche pour montrer sa sortie",
-+>>>>>>> .their
- 	"ShowLogAction.label": "Afficher le journal des tâches",
- 	"RunTaskAction.label": "Exécuter la tâche",
- 	"RestartTaskAction.label": "Redémarrer la tâche en cours d'exécution",
-changed in both
-  base   100644 9b94ea398740a8d4bcf95677442564df33b7fc1a i18n/fra/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  our    100644 6d14510f43bd22b198ad6fdceb4967eca1723e41 i18n/fra/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  their  100644 a9951351c686bde116f09b3a0507e0c9318bf2d5 i18n/fra/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-@@ -15,7 +15,10 @@
- 	"ConfigurationParser.invalidVaraibleReference": "Erreur : référence à problemMatcher non valide : {0}\n",
- 	"ConfigurationParser.noTaskType": "Erreur : la configuration des tâches doit avoir une propriété de type. La configuration est ignorée.\n{0}\n",
- 	"ConfigurationParser.noTypeDefinition": "Erreur : aucun type de tâche '{0}' enregistré. Avez-vous oublié d'installer une extension incluant le fournisseur de tâches correspondant ?",
-+<<<<<<< .our
- 	"ConfigurationParser.missingRequiredProperty": "Erreur : la configuration de la tâche '{0}' a besoin de la propriété '{1}'. La configuration de la tâche sera ignorée.",
-+=======
-+>>>>>>> .their
- 	"ConfigurationParser.notCustom": "Erreur : la tâche n'est pas déclarée comme une tâche personnalisée. La configuration est ignorée.\n{0}\n",
- 	"ConfigurationParser.noTaskName": "Erreur : un tâche doit fournir une propriété label. La tâche va être ignorée.\n{0}\n",
- 	"taskConfiguration.noCommandOrDependsOn": "Erreur : La tâche '{0}' ne spécifie ni une commande, ni une propriété dependsOn. La tâche est ignorée. Sa définition est :\n{1}",
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/fra/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  our    100644 e6b1283332bd10894500ddf69ae8a92a0b1f6a08 i18n/fra/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  their  100644 f680d69a958d98239eb17b2b6f255a75772e1988 i18n/fra/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,6 +10,17 @@
- 	"termEntryAriaLabel": "{0}, sélecteur de terminaux",
- 	"termCreateEntryAriaLabel": "{0}, créer un terminal",
- 	"workbench.action.terminal.newplus": "$(plus) Créer un terminal intégré",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"termEntryAriaLabel": "{0}, sélecteur de terminaux",
-+	"termCreateEntryAriaLabel": "{0}, créer un terminal",
-+	"'workbench.action.terminal.newplus": "$(plus) Créer un terminal intégré",
-+>>>>>>> .their
- 	"noTerminalsMatching": "Aucun terminal correspondant",
- 	"noTerminalsFound": "Aucun terminal ouvert"
- }
-\ No newline at end of file
-changed in both
-  base   100644 4eb70b27e6505a3d913d692b5650d17d664c18b6 i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 c9b4f495f668b34a06e07f9e3acab9da423cc6a8 i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 f19cecf97cabcf334d6d6e9e4a7a7b3ba3a11a4c i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,9 @@
- 	],
- 	"quickOpen.terminal": "Afficher tous les terminaux ouverts",
- 	"terminal": "Terminal",
-+=======
-+	"quickOpen.terminal": "Afficher tous les terminaux ouverts",
-+>>>>>>> .their
- 	"terminalIntegratedConfigurationTitle": "Terminal intégré",
- 	"terminal.integrated.shell.linux": "Chemin de l'interpréteur de commandes utilisé par le terminal sur Linux.",
- 	"terminal.integrated.shellArgs.linux": "Arguments de ligne de commande à utiliser sur le terminal Linux.",
-@@ -36,8 +40,12 @@
- 	"terminal.integrated.env.osx": "Objet avec les variables d’environnement qui seront ajoutées au processus VS Code pour être utilisées par le terminal sous OS X",
- 	"terminal.integrated.env.linux": "Objet avec les variables d’environnement qui seront ajoutées au processus VS Code pour être utilisées par le terminal sous Linux",
- 	"terminal.integrated.env.windows": "Objet avec les variables d’environnement qui seront ajoutées au processus VS Code pour être utilisées par le terminal sous Windows",
-+<<<<<<< .our
- 	"terminal.integrated.showExitAlert": "Afficher une alerte `Le processus terminal s’est arrêté avec le code de sortie` lorsque le code de sortie est différent de zéro.",
- 	"terminal.integrated.experimentalRestore": "Si le fait de restaurer automatiquement les sessions du terminal pour l'espace de travail au lancement de VS Code. Il s'agit d'une fonctionnalité expérimentale; elle peut être boguée et peut changer dans le futur.",
-+=======
-+	"terminal": "Terminal",
-+>>>>>>> .their
- 	"terminalCategory": "Terminal",
- 	"viewCategory": "Affichage"
- }
-\ No newline at end of file
-changed in both
-  base   100644 e0a29182e956aeadbe127b8fc1c4dc3e0c3e87d0 i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 8f10773d1a2d0f2302f3cb3b7d0dac64b3d63462 i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 931ab6165f2600f1eed730965baff65d31abc805 i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -14,8 +14,11 @@
- 	"workbench.action.terminal.selectAll": "Tout Sélectionner",
- 	"workbench.action.terminal.deleteWordLeft": "Supprimer le mot à gauche",
- 	"workbench.action.terminal.deleteWordRight": "Supprimer le mot à droite",
-+<<<<<<< .our
- 	"workbench.action.terminal.moveToLineStart": "Aller au début de la ligne",
- 	"workbench.action.terminal.moveToLineEnd": "Aller à la fin de la ligne",
-+=======
-+>>>>>>> .their
- 	"workbench.action.terminal.new": "Créer un terminal intégré",
- 	"workbench.action.terminal.new.short": "Nouveau terminal",
- 	"workbench.action.terminal.newWorkspacePlaceholder": "Sélectionner le répertoire de travail actuel pour le nouveau terminal",
-@@ -53,6 +56,7 @@
- 	"workbench.action.terminal.hideFindWidget": "Masquer le widget de recherche",
- 	"nextTerminalFindTerm": "Afficher le terme de recherche suivant",
- 	"previousTerminalFindTerm": "Afficher le terme de recherche précédent",
-+<<<<<<< .our
- 	"quickOpenTerm": "Changer de terminal actif",
- 	"workbench.action.terminal.scrollToPreviousCommand": "Faire défiler jusqu'à la commande précédente",
- 	"workbench.action.terminal.scrollToNextCommand": "Faire défiler jusqu'à la prochaine commande",
-@@ -60,4 +64,7 @@
- 	"workbench.action.terminal.selectToNextCommand": "Sélectionnez pour la commande suivante",
- 	"workbench.action.terminal.selectToPreviousLine": "Sélectionner pour la ligne précédente",
- 	"workbench.action.terminal.selectToNextLine": "Sélectionner pour la ligne suivante"
-+=======
-+	"quickOpenTerm": "Terminal : Changer de terminal actif"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 2a639927b494a60c0250bc95e3eb2e7d42fc2ce6 i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 e89604d819428678dc7ff9b330667ccb471d786a i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 55c06f2a2f3f86a49c180d232a0b5e8832b15df5 i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -10,7 +10,10 @@
- 	"terminal.foreground": "Couleur de premier plan du terminal.",
- 	"terminalCursor.foreground": "La couleur de premier plan du curseur du terminal.",
- 	"terminalCursor.background": "La couleur d’arrière-plan du curseur terminal. Permet de personnaliser la couleur d’un caractère recouvert par un curseur de bloc.",
-+<<<<<<< .our
- 	"terminal.selectionBackground": "La couleur d’arrière-plan de sélection du terminal.",
- 	"terminal.border": "Couleur de bordure qui sépare les volets de fractionnement dans le terminal. La valeur par défaut est panel.border.",
-+=======
-+>>>>>>> .their
- 	"terminal.ansiColor": "Couleur ansi '{0}' dans le terminal."
- }
-\ No newline at end of file
-changed in both
-  base   100644 3b225062d915ef8fe2a6b9aa02fe9dbfe04517ce i18n/fra/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 7338692978cc41a3c9963a6eada047d9ffbf7ca9 i18n/fra/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 12b4156b835781ca1de4186f3756ef0f9112212f i18n/fra/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -11,8 +11,16 @@
- 	"read the release notes": "Bienvenue dans {0} v{1} ! Voulez-vous lire les notes de publication ?",
- 	"licenseChanged": "Nos termes du contrat de licence ont changé. Veuillez cliquer [ici]({0}) pour les consulter.",
- 	"neveragain": "Ne plus afficher",
-+<<<<<<< .our
- 	"64bitisavailable": "{0} pour Windows 64 bits est maintenant disponible ! Cliquez [ici]({0}) pour en savoir plus.",
- 	"updateIsReady": "Nouvelle mise à jour de {0} disponible.",
-+=======
-+	"64bitisavailable": "{0} pour Windows 64 bits est maintenant disponible !",
-+	"learn more": "En savoir plus",
-+	"updateIsReady": "Nouvelle mise à jour de {0} disponible.",
-+	"thereIsUpdateAvailable": "Une mise à jour est disponible.",
-+	"updateAvailable": "{0} sera mis à jour après avoir redémarré.",
-+>>>>>>> .their
- 	"noUpdatesAvailable": "Aucune mise à jour n'est disponible actuellement.",
- 	"ok": "OK",
- 	"thereIsUpdateAvailable": "Une mise à jour est disponible.",
-changed in both
-  base   100644 8f490ebe7011956c83910f9e6ad5c373c6fa0a7d i18n/fra/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  our    100644 25e95767831db176f3ab81c120b1f484fac43ea4 i18n/fra/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  their  100644 a3d8226e6722b1e336f2497634a58554c61c705b i18n/fra/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-@@ -37,6 +37,8 @@
- 	"welcomePage.showCommandsDescription": "La palette de commandes ({0}) permet d'accéder rapidement aux commandes pour en rechercher une",
- 	"welcomePage.interfaceOverview": "Vue d'ensemble de l'interface",
- 	"welcomePage.interfaceOverviewDescription": "Obtenez une superposition visuelle mettant en évidence les principaux composants de l'IU",
-+	"welcomePage.deployToAzure": "Déployer des applications sur le cloud",
-+	"welcomePage.deployToAzureDescription": "Découvrir comment déployer vos applications Node sur Azure App Service",
- 	"welcomePage.interactivePlayground": "Terrain de jeu interactif",
- 	"welcomePage.interactivePlaygroundDescription": "Essayez les fonctionnalités essentielles de l'éditeur en suivant une brève procédure pas à pas"
- }
-\ No newline at end of file
-changed in both
-  base   100644 7e1598eb3472166990640d1e84d70b513fd39a5d i18n/fra/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-  our    100644 ea5c592e201b82ea53c73f6acedfd92e4353f522 i18n/fra/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-  their  100644 8b2700e0374872de9d97bb230145400c1606196a i18n/fra/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-changed in both
-  base   100644 3fb36dad027be7a274e5bc876f8c1f4916d592ed i18n/fra/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
-  our    100644 80f2b91000bd665fc00211f02406843ac2262bbf i18n/fra/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
-  their  100644 5e7bc3ffbc25b53d3d7cb855d49ff8c49a9e78bf i18n/fra/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"editorWalkThrough.title": "Terrain de jeu interactif",
- 	"editorWalkThrough": "Terrain de jeu interactif"
- }
-\ No newline at end of file
-changed in both
-  base   100644 77c399f7d666926a3b1f833b9759bb0fde8f4542 i18n/fra/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  our    100644 10bbc7a9e9670b9a8be87b309aaf0dd19bea459a i18n/fra/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  their  100644 4737f22d4713edee686507c75f4d3c395d528599 i18n/fra/src/vs/workbench/services/configuration/node/configuration.i18n.json
-@@ -9,6 +9,7 @@
- 	"scope.window.description": "Configuration spécifique de la fenêtre, qui peut être configurée dans les paramètres utilisateur ou de l'espace de travail.",
- 	"scope.resource.description": "Configuration spécifique de la ressource, qui peut être configurée dans les paramètres utilisateur, de l'espace de travail ou du dossier.",
- 	"scope.description": "Portée dans laquelle la configuration s’applique. Les portées disponibles sont `window` et `resource`.",
-+<<<<<<< .our
- 	"vscode.extension.contributes.configuration": "Ajoute des paramètres de configuration.",
- 	"invalid.title": "'configuration.title' doit être une chaîne",
- 	"vscode.extension.contributes.defaultConfiguration": "Contribue aux paramètres de configuration d'éditeur par défaut en fonction du langage.",
-@@ -21,4 +22,13 @@
- 	"workspaceConfig.settings.description": "Paramètres de l’espace de travail",
- 	"workspaceConfig.extensions.description": "Extensions de l’espace de travail",
- 	"unknownWorkspaceProperty": "Propriété de configuration d’espace de travail inconnue"
-+=======
-+	"invalid.type": "s'il est défini, 'configuration.type' doit avoir la valeur 'object",
-+	"invalid.title": "'configuration.title' doit être une chaîne",
-+	"vscode.extension.contributes.defaultConfiguration": "Contribue aux paramètres de configuration d'éditeur par défaut en fonction du langage.",
-+	"invalid.properties": "'configuration.properties' doit être un objet",
-+	"workspaceConfig.folders.description": "Liste des dossiers à charger dans l’espace de travail. Doit être un chemin de fichier, par exemple, '/root/folderA' ou './folderA' pour un chemin relatif résolu selon l’emplacement du fichier d’espace de travail.",
-+	"workspaceConfig.folder.description": "Un chemin de fichier, par exemple, '/root/folderA' ou './folderA' pour un chemin relatif résolu selon l’emplacement du fichier d’espace de travail.",
-+	"workspaceConfig.settings.description": "Paramètres de l’espace de travail"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 059a4d8916792b8cbc0a80053689aa75959e6389 i18n/fra/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 2993ced5122221b6a919d7041aa1829b3f2477cf i18n/fra/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 5eacd95546fbf494efedffc16ff70745ea191ddc i18n/fra/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -9,6 +9,7 @@
- 	"openTasksConfiguration": "Ouvrir la configuration des tâches",
- 	"openLaunchConfiguration": "Ouvrir la configuration du lancement",
- 	"open": "Ouvrir les paramètres",
-+<<<<<<< .our
- 	"saveAndRetry": "Enregistrer et Réessayer",
- 	"errorUnknownKey": "Impossible d’écrire dans {0} car {1} n’est pas une configuration recommandée.",
- 	"errorInvalidWorkspaceConfigurationApplication": "Impossible d’écrire {0} dans les paramètres de l’espace de travail. Ce paramètre peut être écrit uniquement dans les paramètres de l’utilisateur.",
-@@ -27,6 +28,19 @@
- 	"errorConfigurationFileDirty": "Impossible d’écrire dans les paramètres de l'utilisateur car le fichier a été modifié. Veuillez s’il vous plaît enregistrer le fichier des paramètres de l'utilisateur et réessayez.",
- 	"errorConfigurationFileDirtyWorkspace": "Impossible d’écrire dans les paramètres de l’espace de travail, car le fichier est en attente de sauvegarde. Veuillez s’il vous plaît enregistrer le fichier des paramètres de l’espace de travail et essayez à nouveau.",
- 	"errorConfigurationFileDirtyFolder": "Impossible d’écrire dans les paramètres de dossier, car le fichier est en attente de sauvegarde. Veuillez s’il vous plaît enregistrer le fichier des paramètres du dossier '{0}' et essayez à nouveau.",
-+=======
-+	"close": "Fermer",
-+	"saveAndRetry": "Enregistrer les paramètres et recommencer",
-+	"errorUnknownKey": "Impossible d’écrire dans {0} car {1} n’est pas une configuration recommandée.",
-+	"errorInvalidFolderConfiguration": "Impossible d’écrire dans les paramètres de dossier parce que {0} ne supporte pas la portée de ressource de dossier.",
-+	"errorInvalidUserTarget": "Impossible d’écrire dans les paramètres utilisateur parce que {0} ne supporte pas de portée globale.",
-+	"errorInvalidFolderTarget": "Impossible d’écrire dans les paramètres de dossier car aucune ressource n’est fournie.",
-+	"errorNoWorkspaceOpened": "Impossible d’écrire dans {0} car aucun espace de travail n’est ouvert. Veuillez ouvrir un espace de travail et essayer à nouveau.",
-+	"errorInvalidConfiguration": "Impossible d'écrire les paramètres. Ouvrez les **Paramètres utilisateur** pour corriger les erreurs/avertissements présents dans le fichier, puis réessayez.",
-+	"errorInvalidConfigurationWorkspace": "Impossible d'écrire les paramètres. Ouvrez les **Paramètres d'espace de travail** pour corriger les erreurs/avertissements présents dans le fichier, puis réessayez.",
-+	"errorConfigurationFileDirty": "Impossible d'écrire les paramètres, car l'intégrité du fichier est compromise. Enregistrez le fichier des **Paramètres utilisateur**, puis réessayez.",
-+	"errorConfigurationFileDirtyWorkspace": "Impossible d'écrire les paramètres, car l'intégrité du fichier est compromise. Enregistrez le fichier des **Paramètres d'espace de travail**, puis réessayez.",
-+>>>>>>> .their
- 	"userTarget": "Paramètres utilisateur",
- 	"workspaceTarget": "Paramètres de l'espace de travail",
- 	"folderTarget": "Paramètres de dossier"
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/fra/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-  our    100644 67780b76187a9447d925cb0ef823da395cd5db48 i18n/fra/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-  their  100644 c071f5c7c670e9d73bce6f1308c991a06431ec05 i18n/fra/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"errorInvalidFile": "Impossible d’écrire dans le fichier. Veuillez ouvrir le fichier pour corriger les erreurs/avertissements dans le fichier et réessayer.",
- 	"errorFileDirty": "Impossible d’écrire dans le fichier parce que le fichier a été modifié. Veuillez enregistrer le fichier et réessayer."
- }
-\ No newline at end of file
-added in both
-  our    100644 ff11cb2ba249590a3b4e7f86b274a4919d4c7e44 i18n/fra/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
-  their  100644 a8972ed186e5b43ab77111fa5a937c3f83a5f45b i18n/fra/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,5 +10,15 @@
- 	"extensionHostProcess.startupFailDebug": "L'hôte d'extension n'a pas démarré en moins de 10 secondes. Il est peut-être arrêté à la première ligne et a besoin d'un débogueur pour continuer.",
- 	"extensionHostProcess.startupFail": "L'hôte d'extension n'a pas démarré en moins de 10 secondes. Il existe peut-être un problème.",
- 	"reloadWindow": "Recharger la fenêtre",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"extensionHostProcess.startupFailDebug": "L'hôte d'extension n'a pas démarré en moins de 10 secondes. Il est peut-être arrêté à la première ligne et a besoin d'un débogueur pour continuer.",
-+	"extensionHostProcess.startupFail": "L'hôte d'extension n'a pas démarré en moins de 10 secondes. Il existe peut-être un problème.",
-+>>>>>>> .their
- 	"extensionHostProcess.error": "Erreur de l'hôte d'extension : {0}"
- }
-\ No newline at end of file
-added in both
-  our    100644 66f94810fab39efdf01fb6bbc356beb844836002 i18n/fra/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
-  their  100644 20c3f21a455baa224123f3027c86141d8eb55ebc i18n/fra/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,5 +10,16 @@
- 	"jsonParseFail": "Échec de l'analyse de {0} : {1}.",
- 	"fileReadFail": "Impossible de lire le fichier {0} : {1}.",
- 	"jsonsParseReportErrors": "Échec de l'analyse de {0} : {1}.",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"jsonParseFail": "Échec de l'analyse de {0} : {1}.",
-+	"fileReadFail": "Impossible de lire le fichier {0} : {1}.",
-+	"jsonsParseFail": "Échec de l'analyse de {0} ou de {1} : {2}.",
-+>>>>>>> .their
- 	"missingNLSKey": "Le message est introuvable pour la clé {0}."
- }
-\ No newline at end of file
-added in both
-  our    100644 7604f9ffac7adc1500f36ed60a59f4853399daa3 i18n/fra/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-  their  100644 2056c501ce052705646a7dcd3c9b981fe58ec8e9 i18n/fra/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -15,4 +16,18 @@
- 	"extensionUnderDevelopment": "Chargement de l'extension de développement sur {0}",
- 	"extensionCache.invalid": "Des extensions ont été modifiées sur le disque. Veuillez recharger la fenêtre.",
- 	"reloadWindow": "Recharger la fenêtre"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"devTools": "Outils de développement",
-+	"restart": "Redémarrer l’hôte d'extension",
-+	"extensionHostProcess.crash": "L'hôte d’extension s'est arrêté de manière inattendue.",
-+	"extensionHostProcess.unresponsiveCrash": "L'hôte d'extension s'est arrêté, car il ne répondait pas.",
-+	"overwritingExtension": "Remplacement de l'extension {0} par {1}.",
-+	"extensionUnderDevelopment": "Chargement de l'extension de développement sur {0}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 541b82ff55a2e20b30bd3aa5d2d04420df3f9ea7 i18n/fra/src/vs/workbench/services/progress/browser/progressService2.i18n.json
-  our    100644 8520681211169aae5904c2b8c3ee97e9d2ed6045 i18n/fra/src/vs/workbench/services/progress/browser/progressService2.i18n.json
-  their  100644 8488594cac5fe1cba4d62f55b0e1ac017c95001a i18n/fra/src/vs/workbench/services/progress/browser/progressService2.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -9,4 +10,8 @@
- 	"progress.subtitle": "{0} - {1}",
- 	"progress.title": "{0} : {1}",
- 	"cancel": "Annuler"
-+=======
-+	"progress.subtitle": "{0} - {1}",
-+	"progress.title": "{0} : {1}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8d3e92e30051aa393494f1ef456ac38898f4965c i18n/fra/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-  our    100644 8f707cb3e3d76463fdcfb154f775d39d6892fd33 i18n/fra/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-  their  100644 d9200a0b8791eea58b070f2345ca799bb780e590 i18n/fra/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,12 @@
- 	"schema.token.fontStyle": "Style de police de la règle: 'italic', 'bold' ou 'underline' ou une combinaison. La chaîne vide défait les paramètres hérités.",
- 	"schema.fontStyle.error": "Le style de polie doit être 'italic', 'bold' or 'underline' ou une combinaison ou la chaîne vide.",
- 	"schema.token.fontStyle.none": "Aucun (vide le style hérité)",
-+=======
-+	"schema.token.settings": "Couleurs et styles du jeton.",
-+	"schema.token.foreground": "Couleur de premier plan du jeton.",
-+	"schema.token.fontStyle": "Style de police de la règle : 'italique', 'gras' ou 'souligné', ou une combinaison de ces styles",
-+	"schema.fontStyle.error": "Le style de police doit être une combinaison de 'italic', 'bold' et 'underline'",
-+>>>>>>> .their
- 	"schema.properties.name": "Description de la règle.",
- 	"schema.properties.scope": "Sélecteur de portée qui correspond à cette règle.",
- 	"schema.tokenColors.path": "Chemin d'un ficher tmTheme (relatif au fichier actuel).",
-changed in both
-  base   100644 d541e53470bcf759186321b4beb9983f23440d0c i18n/fra/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 7050924f08d64059ea7847ed31aea3e00de2d358 i18n/fra/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 8ca3299b2ba7a610eda77cbd0f4829980d484794 i18n/fra/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-@@ -13,6 +13,12 @@
- 	"noIconThemeDesc": "No file icons",
- 	"iconThemeError": "File icon theme is unknown or not installed.",
- 	"workbenchColors": "Remplace les couleurs du thème de couleur sélectionné.",
-+<<<<<<< .our
-+=======
-+	"workbenchColors.deprecated": "Le paramètre n'est plus expérimental et a été renommé 'workbench.colorCustomizations'",
-+	"workbenchColors.deprecatedDescription": "Utiliser 'workbench.colorCustomizations' à la place",
-+	"editorColors": "Remplace les couleurs et le style de la police de l’éditeur du thème par la couleur actuellement sélectionnée.",
-+>>>>>>> .their
- 	"editorColors.comments": "Définit les couleurs et les styles des commentaires",
- 	"editorColors.strings": "Définit les couleurs et les styles des littéraux de chaînes.",
- 	"editorColors.keywords": "Définit les couleurs et les styles des mots clés.",
-@@ -20,6 +26,10 @@
- 	"editorColors.types": "Définit les couleurs et les styles des déclarations et références de type.",
- 	"editorColors.functions": "Définit les couleurs et les styles des déclarations et références de fonctions.",
- 	"editorColors.variables": "Définit les couleurs et les styles des déclarations et références de variables.",
-+<<<<<<< .our
- 	"editorColors.textMateRules": "Définit les couleurs et les styles à l’aide de règles de thème textmate (avancé).",
- 	"editorColors": "Remplace les couleurs et le style de la police de l’éditeur du thème par la couleur actuellement sélectionnée."
-+=======
-+	"editorColors.textMateRules": "Définit les couleurs et les styles à l’aide de règles de thème textmate (avancé)."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 5f6b8a4014be091e22df6a069ac2400aafd568ff i18n/hun/extensions/css/package.i18n.json
-  our    100644 804a00791e04d156a9d1dd28748691ba3a7de533 i18n/hun/extensions/css/package.i18n.json
-  their  100644 fca40c15eed52f1af92e5bac44ba473b5543106f i18n/hun/extensions/css/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,73 @@
- 	],
- 	"displayName": "CSS nyelvi alapok",
- 	"description": "Szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket a CSS-, LESS- és SCSS-fájlokban."
-+=======
-+	"css.lint.argumentsInColorFunction.desc": "Nem megfelelő számú paraméter",
-+	"css.lint.boxModel.desc": "A width és a height tulajdonság kerülése a padding és a border tulajdonság használata esetén",
-+	"css.lint.compatibleVendorPrefixes.desc": "Gyártóspecifikus előtag használata esetén minden más gyártóspecifikus tulajdonságot is meg kell adni",
-+	"css.lint.duplicateProperties.desc": "Duplikált stílusdefiníciók kerülése",
-+	"css.lint.emptyRules.desc": "Üres szabályhalmazok kerülése",
-+	"css.lint.float.desc": "A float tulajdonságérték kerülése, mivel könnyen váratlan eredményt idézhet elő az elrendezés változásakor.",
-+	"css.lint.fontFaceProperties.desc": "A @font-face szabályokban az src és a font-family tulajdonságot is definiálni kell",
-+	"css.lint.hexColorLength.desc": "A hexadecimális formában megadott színeknek három vagy hat hexadecimális számjegyből kell állniuk",
-+	"css.lint.idSelector.desc": "A szelektorok nem tartalmazhatnak azonosítókat, mivel az ilyen szabályok túl szorosan kötődnek a HTML-hez.",
-+	"css.lint.ieHack.desc": "Az IE hangolása csak az IE7 vagy régebbi verziók támogatása esetén szükséges",
-+	"css.lint.important.desc": "Az !important attribútum mellőzése. Az attribútum jelenléte arra utal, hogy a CSS-struktúra átláthatatlanná vált, és refaktorálásra szorul.",
-+	"css.lint.importStatement.desc": "Ne töltődjenek párhuzamosan az importálási utasítások",
-+	"css.lint.propertyIgnoredDueToDisplay.desc": "A megjelenítési mód miatt a megjelenítőkomponensek nem fogják figyelembe venni a tulajdonságot. Ha például a display tulajdonság értéke inline, akkor a megjelenítők figyelmen kívül hagyják a width, a height, a margin-top, a margin-bottom és a float tulajdonságot.",
-+	"css.lint.universalSelector.desc": "Az univerzális szelektor (*) lassú működést eredményez",
-+	"css.lint.unknownProperties.desc": "Ismeretlen tulajdonság.",
-+	"css.lint.unknownVendorSpecificProperties.desc": "Ismeretlen gyártóspecifikus tulajdonság.",
-+	"css.lint.vendorPrefix.desc": "Gyártóspecifikus előtagok használata esetén az adott tulajdonság szabványos változatát is meg kell adni",
-+	"css.lint.zeroUnits.desc": "A 0 értékhez nem szükséges mértékegység",
-+	"css.trace.server.desc": "A VS Code és a CSS nyelvi szerver közötti kommunikáció naplózása.",
-+	"css.validate.title": "Meghatározza a CSS-validáció működését és a problémák súlyosságát.",
-+	"css.validate.desc": "Összes validálás engedélyezése vagy letiltása",
-+	"less.lint.argumentsInColorFunction.desc": "Nem megfelelő számú paraméter",
-+	"less.lint.boxModel.desc": "A width és a height tulajdonság kerülése a padding és a border tulajdonság használata esetén",
-+	"less.lint.compatibleVendorPrefixes.desc": "Gyártóspecifikus előtag használata esetén minden más gyártóspecifikus tulajdonságot is meg kell adni",
-+	"less.lint.duplicateProperties.desc": "Duplikált stílusdefiníciók kerülése",
-+	"less.lint.emptyRules.desc": "Üres szabályhalmazok kerülése",
-+	"less.lint.float.desc": "A float tulajdonságérték kerülése, mivel könnyen váratlan eredményt idézhet elő az elrendezés változásakor.",
-+	"less.lint.fontFaceProperties.desc": "A @font-face szabályokban az src és a font-family tulajdonságot is definiálni kell",
-+	"less.lint.hexColorLength.desc": "A hexadecimális formában megadott színeknek három vagy hat hexadecimális számjegyből kell állniuk",
-+	"less.lint.idSelector.desc": "A szelektorok nem tartalmazhatnak azonosítókat, mivel az ilyen szabályok túl szorosan kötődnek a HTML-hez.",
-+	"less.lint.ieHack.desc": "Az IE hangolása csak az IE7 vagy régebbi verziók támogatása esetén szükséges",
-+	"less.lint.important.desc": "Az !important attribútum mellőzése. Az attribútum jelenléte arra utal, hogy a CSS-struktúra átláthatatlanná vált, és refaktorálásra szorul.",
-+	"less.lint.importStatement.desc": "Ne töltődjenek párhuzamosan az importálási utasítások",
-+	"less.lint.propertyIgnoredDueToDisplay.desc": "A megjelenítési mód miatt a megjelenítőkomponensek nem fogják figyelembe venni a tulajdonságot. Ha például a display tulajdonság értéke inline, akkor a megjelenítők figyelmen kívül hagyják a width, a height, a margin-top, a margin-bottom és a float tulajdonságot.",
-+	"less.lint.universalSelector.desc": "Az univerzális szelektor (*) lassú működést eredményez",
-+	"less.lint.unknownProperties.desc": "Ismeretlen tulajdonság.",
-+	"less.lint.unknownVendorSpecificProperties.desc": "Ismeretlen gyártóspecifikus tulajdonság.",
-+	"less.lint.vendorPrefix.desc": "Gyártóspecifikus előtagok használata esetén az adott tulajdonság szabványos változatát is meg kell adni",
-+	"less.lint.zeroUnits.desc": "A 0 értékhez nem szükséges mértékegység",
-+	"less.validate.title": "Meghatározza a LESS-validáció működését és a problémák súlyosságát.",
-+	"less.validate.desc": "Összes validálás engedélyezése vagy letiltása",
-+	"scss.lint.argumentsInColorFunction.desc": "Nem megfelelő számú paraméter",
-+	"scss.lint.boxModel.desc": "A width és a height tulajdonság kerülése a padding és a border tulajdonság használata esetén",
-+	"scss.lint.compatibleVendorPrefixes.desc": "Gyártóspecifikus előtag használata esetén minden más gyártóspecifikus tulajdonságot is meg kell adni",
-+	"scss.lint.duplicateProperties.desc": "Duplikált stílusdefiníciók kerülése",
-+	"scss.lint.emptyRules.desc": "Üres szabályhalmazok kerülése",
-+	"scss.lint.float.desc": "A float tulajdonságérték kerülése, mivel könnyen váratlan eredményt idézhet elő az elrendezés változásakor.",
-+	"scss.lint.fontFaceProperties.desc": "A @font-face szabályokban az src és a font-family tulajdonságot is definiálni kell",
-+	"scss.lint.hexColorLength.desc": "A hexadecimális formában megadott színeknek három vagy hat hexadecimális számjegyből kell állniuk",
-+	"scss.lint.idSelector.desc": "A szelektorok nem tartalmazhatnak azonosítókat, mivel az ilyen szabályok túl szorosan kötődnek a HTML-hez.",
-+	"scss.lint.ieHack.desc": "Az IE hangolása csak az IE7 vagy régebbi verziók támogatása esetén szükséges",
-+	"scss.lint.important.desc": "Az !important attribútum mellőzése. Az attribútum jelenléte arra utal, hogy a CSS-struktúra átláthatatlanná vált, és refaktorálásra szorul.",
-+	"scss.lint.importStatement.desc": "Ne töltődjenek párhuzamosan az importálási utasítások",
-+	"scss.lint.propertyIgnoredDueToDisplay.desc": "A megjelenítési mód miatt a megjelenítőkomponensek nem fogják figyelembe venni a tulajdonságot. Ha például a display tulajdonság értéke inline, akkor a megjelenítők figyelmen kívül hagyják a width, a height, a margin-top, a margin-bottom és a float tulajdonságot.",
-+	"scss.lint.universalSelector.desc": "Az univerzális szelektor (*) lassú működést eredményez",
-+	"scss.lint.unknownProperties.desc": "Ismeretlen tulajdonság.",
-+	"scss.lint.unknownVendorSpecificProperties.desc": "Ismeretlen gyártóspecifikus tulajdonság.",
-+	"scss.lint.vendorPrefix.desc": "Gyártóspecifikus előtagok használata esetén az adott tulajdonság szabványos változatát is meg kell adni",
-+	"scss.lint.zeroUnits.desc": "A 0 értékhez nem szükséges mértékegység",
-+	"scss.validate.title": "Meghatározza az SCSS-validáció működését és a problémák súlyosságát.",
-+	"scss.validate.desc": "Összes validálás engedélyezése vagy letiltása",
-+	"less.colorDecorators.enable.desc": "Színdekorátorok engedélyezése vagy letiltása",
-+	"scss.colorDecorators.enable.desc": "Színdekorátorok engedélyezése vagy letiltása",
-+	"css.colorDecorators.enable.desc": "Színdekorátorok engedélyezése vagy letiltása",
-+	"css.colorDecorators.enable.deprecationMessage": "Az `css.colorDecorators.enable` beállítás elavult az `editor.colorDecorators` bevezetése miatt.",
-+	"scss.colorDecorators.enable.deprecationMessage": "Az `scss.colorDecorators.enable` beállítás elavult az `editor.colorDecorators` bevezetése miatt.",
-+	"less.colorDecorators.enable.deprecationMessage": "A `less.colorDecorators.enable` beállítás elavult az `editor.colorDecorators` bevezetése miatt."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e5c10b00cae357d3329370d0a11e5f51f7177a68 i18n/hun/extensions/emmet/package.i18n.json
-  our    100644 4e87769482abf2ce774993c5210487918395fb71 i18n/hun/extensions/emmet/package.i18n.json
-  their  100644 576657ed6467ba9e1fa04dc57b27b4df0eb33493 i18n/hun/extensions/emmet/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -7,6 +8,8 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"description": "Emmet-támogatás a VS Code-hoz",
-+=======
-+>>>>>>> .their
- 	"command.wrapWithAbbreviation": "Becsomagolás rövidítéssel",
- 	"command.wrapIndividualLinesWithAbbreviation": "Egyedi sorok becsomagolása rövidítéssel",
- 	"command.removeTag": "Elem eltávolítása",
-@@ -32,11 +35,19 @@
- 	"command.decrementNumberByTen": "Csökkentés 10-zel",
- 	"emmetSyntaxProfiles": "Konkrét szintaktika profiljának meghatározása vagy saját profil használata adott szabályokkal.",
- 	"emmetExclude": "Azon nyelvek listája, ahol az Emmet-rövidítések ne legyenek kibontva.",
-+<<<<<<< .our
- 	"emmetExtensionsPath": "Emmet-profilokat és -kódtöredékeket tartalmazó mappa elérési útja.",
- 	"emmetShowExpandedAbbreviation": "Kibontott Emmet-rövidítések megjelenítése javaslatként. Az \"inMarkupAndStylesheetFilesOnly\" beállítás csak a html, haml, jade, slim, xml, xsl, css, scss, sass, less és stylus típusú tartalmat jelenti. Az \"always\" beállítás a fájl összes részére vonatkozik a jelölőnyelvtől/css-től függetlenül.",
- 	"emmetShowAbbreviationSuggestions": "Lehetséges Emmet-rövidítések megjelenítése javaslatként. Nem használható a stíluslapokon vagy ha az emmet.showExpandedAbbreviation értéke \"never\".",
- 	"emmetIncludeLanguages": "Emmet-rövidítések engedélyezése olyan nyelvek esetében, amelyek alapértelmezés szerint nem támogatottak. Egy megfeleltetést kell felvenni a nyelv és egy emmet által támogatott nyelv között.\nPl.: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
- 	"emmetVariables": "Az Emmet-kódrészletekben használt változók",
-+=======
-+	"emmetExtensionsPath": "Egy Emmet-profilokat és -kódtöredékeket tartalmazó mappa elérési útja.",
-+	"emmetShowExpandedAbbreviation": "Kibontott emmet-rövidítések megjelenítése javaslatként. Az \"inMarkupAndStylesheetFilesOnly\" beállítás csak a html, haml, jade, slim, xml, xsl, css, scss, sass, less és stylus típusú tartalmat jelenti. Az \"always\" beállítás a fájl összes részére vonatkozik a jelölőnyelvtől/css-től függetlenül.",
-+	"emmetShowAbbreviationSuggestions": "A lehetséges emmet-rövidítések megjelenítése javaslatként. Nem használható a stíluslapokon vagy ha az emmet.showExpandedAbbreviation értéke \"never\".",
-+	"emmetIncludeLanguages": "Emmet-rövidítések engedélyezése olyan nyelvek esetében, amelyek alapértelmezés szerint nem támogatottak. Egy megfeleltetést kell felvenni a nyelv és egy emmet által támogatott nyelv között.\nPl.: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
-+	"emmetVariables": "Az emmet-kódrészletekben használt változók",
-+>>>>>>> .their
- 	"emmetTriggerExpansionOnTab": "Ha engedélyezve van, akkor az Emmet-rövidítések a Tab billentyű lenyomásával bonthatók ki.",
- 	"emmetPreferences": "Beállítások, melyek módosítják az Emmet műveleteinek és feloldó algoritmusainak viselkedését.",
- 	"emmetPreferencesIntUnit": "Az egész számok alapértelmezett mértékegysége",
-@@ -47,6 +58,7 @@
- 	"emmetPreferencesCssBetween": "A CSS-tulajdonság és az érték közé helyezett szimbólum CSS-rövidítések kibontásánál",
- 	"emmetPreferencesSassBetween": "A CSS-tulajdonság és az érték közé helyezett szimbólum CSS-rövidítések kibontásánál Sass-fájlokban",
- 	"emmetPreferencesStylusBetween": "A CSS-tulajdonság és az érték közé helyezett szimbólum CSS-rövidítések kibontásánál Stylus-fájlokban",
-+<<<<<<< .our
- 	"emmetShowSuggestionsAsSnippets": "Ha ez igaz, majd Emmet-javaslatok jelenik meg mint töredék, amely lehetővé teszi, annak érdekében, őket egy editor.snippetSuggestions beállítást.",
- 	"emmetPreferencesBemElementSeparator": "Elemelválasztó osztályok megadásánál BEM-szűrő használata esetén",
- 	"emmetPreferencesBemModifierSeparator": "Módosító elválasztó osztályok megadásánál BEM-szűrő használata esetén",
-@@ -62,4 +74,7 @@
- 	"emmetPreferencesCssMsProperties": "CSS-tulajdonságok vesszővel ellátott listája, melyek 'ms' gyártói előtagot kapnak azoknál az Emmet-rövidtéseknél, melyek `-` karakterrel kezdődnek. Állítsa üres szövegre, ha soha nem szeretne 'ms' előtagot használni.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "A minimális pontszám (0-tól 1-ig), amit egy fuzzy keresési találatnak el kell érnie. Az alacsonyabb értékek álpozitív találatokat eredményezhetnek, míg a magasabb értékek szűkítik a lehetséges találatok számát.",
- 	"emmetOptimizeStylesheetParsing": "Ha az értéke false, az egész fájl fel lesz dolgozva annak meghatározásához, hogy az aktuális pozíció ércényes-e Emmet-rövidítések kibontásához. Ha az értéke true, csak az aktuális pozíció körüli tartalom lesz feldolgozva a CSS/SCSS/LESS-fájlokban."
-+=======
-+	"emmetShowSuggestionsAsSnippets": "Ha az értéke igaz, akkor az emmetes javaslatok kódrészletekként jelennek meg, ami lehetővé teszi az editor.snippetSuggestions beállítás alapján történő rendezésüket."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 3e085fae59ae803904737cef0ebcd127a7e0253d i18n/hun/extensions/extension-editing/out/extensionLinter.i18n.json
-  our    100644 5528d4e358b801448ec5dba3aaf0582297480dad i18n/hun/extensions/extension-editing/out/extensionLinter.i18n.json
-  their  100644 e3c13b9c6a9995add772c0920214f974605c4cbb i18n/hun/extensions/extension-editing/out/extensionLinter.i18n.json
-changed in both
-  base   100644 cefdc21b643e6ad939aeb80cd69ef2fc8b3bafd4 i18n/hun/extensions/git/out/commands.i18n.json
-  our    100644 affdd78fc14682c19c792c8ead9202e7167f2315 i18n/hun/extensions/git/out/commands.i18n.json
-  their  100644 e3a356092583cb510d3f67d5b92d38aba07b1792 i18n/hun/extensions/git/out/commands.i18n.json
-@@ -13,6 +13,7 @@
- 	"selectFolder": "Válassza ki a forráskódtár helyét!",
- 	"cloning": "'{0}' git forráskódtár klónozása...",
- 	"proposeopen": "Szeretné megnyitni a klónozott forráskódtárat?",
-+<<<<<<< .our
- 	"openrepo": "Forráskódtár megnyitása",
- 	"add": "Hozzáadás a munkaterülethez",
- 	"proposeopen2": "Szeretné megnyitni a klónozott forráskódtára, vagy hozzáadni az aktuális munkaterülethez?",
-@@ -20,6 +21,10 @@
- 	"init repo": "Forráskódtár előkészítése",
- 	"create repo": "Forráskódtár előkészítése",
- 	"are you sure": "A művelet egy Git forráskódtárat hoz létre a következő helyen: '{0}. Biztosan szeretné folytatni?",
-+=======
-+	"path to init": "Mappa elérési útja",
-+	"provide path": "Git-forráskódtár inicializálásához adjon meg egy elérési utat!",
-+>>>>>>> .their
- 	"HEAD not available": "A(z) '{0}' HEAD-verziója nem elérhető.",
- 	"confirm stage files with merge conflicts": "Biztosan elő szeretne jegyezni {0} ütközési konfliktussal rendelkező fájlt?",
- 	"confirm stage file with merge conflicts": "Biztosan elő szeretne jegyezni a következő, ütközési konfliktussal rendelkező fájlt: {0}?",
-@@ -43,10 +48,13 @@
- 	"confirm discard all 2": "{0}\n\nA művelet NEM VONHATÓ VISSZA, az aktuális munka ÖRÖKRE EL FOG VESZNI.",
- 	"yes discard tracked": "Egy követett fájl elvetése",
- 	"yes discard tracked multiple": "{0} követett fájl elvetése",
-+<<<<<<< .our
- 	"unsaved files single": "A következő fájl nincs elmentve: {0}.\n\nSzeretné menteni a beadás előtt?",
- 	"unsaved files": "{0} nem mentett fájl található.\n\nSzeretné menteni őket a beadás előtt?",
- 	"save and commit": "Összes mentése és beadás",
- 	"commit": "Beadás mindenképp",
-+=======
-+>>>>>>> .their
- 	"no staged changes": "Nincs beadáshoz (commithoz) előjegyzett módosítás. Szeretné automatikusan előjegyeztetni a módosításokat és közvetlenül beadni őket?",
- 	"always": "Mindig",
- 	"no changes": "Nincs beadandó módosítás.",
-@@ -66,10 +74,14 @@
- 	"provide tag name": "Adja meg a címke nevét",
- 	"tag message": "Üzenet",
- 	"provide tag message": "Adja meg a címke leírását tartalmazó üzenetet",
-+<<<<<<< .our
- 	"no remotes to fetch": "A forráskódtárhoz nincsenek távoli szerverek konfigurálva, ahonnan le lehetne kérni.",
-+=======
-+>>>>>>> .their
- 	"no remotes to pull": "A forráskódtárhoz nincsenek távoli szerverek konfigurálva, ahonnan pullozni lehetne.",
- 	"pick remote pull repo": "Válassza ki a távoli szervert, ahonnan pullozni szeretné az ágat",
- 	"no remotes to push": "A forráskódtárhoz nincsenek távoli szerverek konfigurálva, ahová pusholni lehetne.",
-+	"push with tags success": "A címkékkel együtt történő pusholás sikeresen befejeződött.",
- 	"nobranch": "Válasszon egy ágat a távoli szerverre való pusholáshot!",
- 	"confirm publish branch": "A(z) '{0}' ág nem létezik a távoli szerveren. Szeretné publikálni ezt az ágat?",
- 	"ok": "OK",
-changed in both
-  base   100644 3744b7c2b597707ebcae1629dac09611c0627dce i18n/hun/extensions/git/out/model.i18n.json
-  our    100644 db074aaa5c810e011525a3262927beb00961bf7c i18n/hun/extensions/git/out/model.i18n.json
-  their  100644 b48df0faf59f74cfc0d205d5c0a706f70dcdf043 i18n/hun/extensions/git/out/model.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -7,6 +8,8 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"too many submodules": "A(z) '{0}' forráskódtárhoz {1} almodul tartozik, ami nem lesz megnyitva automatikusan. Bármelyik megnyitható külön-külön egy bennük lévő fájl megnyitásával.",
-+=======
-+>>>>>>> .their
- 	"no repositories": "Nem található forráskódtár.",
- 	"pick repo": "Válasszon forráskódtárat!"
- }
-\ No newline at end of file
-added in both
-  our    100644 cbcda0cc8b4d1780f1b5648ec0e6c19e36877abc i18n/hun/extensions/git/out/repository.i18n.json
-  their  100644 360a4435ac67fb89431a6a2dbf11573ee3f1d442 i18n/hun/extensions/git/out/repository.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"open": "Megnyitás",
- 	"index modified": "Index, módosítva",
- 	"modified": "Módosítva",
-@@ -23,13 +32,21 @@
- 	"deleted by us": "Általunk törölt",
- 	"both added": "Mindkettő hozzáadta",
- 	"both modified": "Mindkettő módosította",
-+<<<<<<< .our
- 	"commitMessage": "Üzenet (nyomja meg a következőt a commithoz: {0})",
-+=======
-+>>>>>>> .their
- 	"commit": "Commit",
- 	"merge changes": "Módosítások összeolvasztása",
- 	"staged changes": "Beadásra előjegyzett módosítások",
- 	"changes": "Módosítások",
-+<<<<<<< .our
- 	"commitMessageCountdown": "{0} karakter maradt az aktuális sorban",
- 	"commitMessageWarning": " {0} karakterrel több, mint {1} az aktuális sorban",
- 	"neveragain": "Ne jelenítse meg újra",
-+=======
-+	"ok": "OK",
-+	"neveragain": "Soha ne jelenítse meg újra",
-+>>>>>>> .their
- 	"huge": "A(z) '{0}' forráskódtárban túl sok aktív módosítás van. A Git-funkciók csak egy része lesz engedélyezve."
- }
-\ No newline at end of file
-changed in both
-  base   100644 9495998160638f87c775b3f17107825028645b3b i18n/hun/extensions/git/package.i18n.json
-  our    100644 d2831b61da52e95d0526dd36ac91c937df6fc33e i18n/hun/extensions/git/package.i18n.json
-  their  100644 3aff31e4cd794a37f68f4687e929b96513553e6d i18n/hun/extensions/git/package.i18n.json
-@@ -40,7 +40,10 @@
- 	"command.renameBranch": "Ág átnevezése...",
- 	"command.merge": "Ág beolvasztása...",
- 	"command.createTag": "Címke létrehozása",
-+<<<<<<< .our
- 	"command.fetch": "Lekérés (fetch)",
-+=======
-+>>>>>>> .their
- 	"command.pull": "Pull",
- 	"command.pullRebase": "Pull (Rebase)",
- 	"command.pullFrom": "Pullozás...",
-@@ -52,7 +55,10 @@
- 	"command.publish": "Ág publikálása",
- 	"command.showOutput": "Git-kimenet megjelenítése",
- 	"command.ignore": "Fájl hozzáadása a .gitignore-hoz",
-+<<<<<<< .our
- 	"command.stashIncludeUntracked": "Stash (a nem követett fájlokkal együtt)",
-+=======
-+>>>>>>> .their
- 	"command.stash": "Stash",
- 	"command.stashPop": "Stash visszaállítása...",
- 	"command.stashPopLatest": "Legutóbbi stash visszaállítása",
-@@ -71,6 +77,7 @@
- 	"config.defaultCloneDirectory": "Git-forráskódtárak klónozásának alapértelmezett helye.",
- 	"config.enableSmartCommit": "Összes módosítás beadása (commit), ha nincsenek előjegyzett módosítások.",
- 	"config.enableCommitSigning": "Commit GPG-vel történő aláírásának engedélyezése.",
-+<<<<<<< .our
- 	"config.discardAllScope": "Meghatározza, hogy milyen módosítások kerülnek elvetésre az \"Összes módosítás elvetése\" parancs kiadása esetén. `all` esetén minden módosítás elvetődik. `tracked` esetén csak a követett fájlok módosításai vetődnek el. `prompt` esetén a parancs minden futtatásánál felugrik egy párbeszédablak.",
- 	"config.decorations.enabled": "Meghatározza, hogy a Git megjelölje-e színnel és jelvénnyekkel a fájlokat a fájlkezelőben és a nyitott szerkesztőablakok nézetben.",
- 	"config.promptToSaveFilesBeforeCommit": "Meghatározza, hogy a Git ellenőrizze-e, hogy van-e mentetlen fájl beadás (commit) előtt.",
-@@ -84,4 +91,7 @@
- 	"colors.ignored": "A figyelmen kívül hagyott erőforrások színe.",
- 	"colors.conflict": "A konfliktusos erőforrások színe.",
- 	"colors.submodule": "Az almodulokhoz tartozó erőforrások színe"
-+=======
-+	"config.discardAllScope": "Meghatározza, hogy milyen módosítások kerülnek elvetésre az \"Összes módosítás elvetése\" parancs kiadása esetén. `all` esetén minden módosítás elvetődik. `tracked` esetén csak a követett fájlok módosításai vetődnek el. `prompt` esetén a parancs minden futtatásánál felugrik egy párbeszédablak."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 1eea9c9eee6614d9c1304f284bdfa8568cdaa399 i18n/hun/extensions/html/package.i18n.json
-  our    100644 bb0ee17f709d53eca1fad21951ed4bd43b4d3dd8 i18n/hun/extensions/html/package.i18n.json
-  their  100644 292aa40864bc8aed988e2f0251599270833cb6ff i18n/hun/extensions/html/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,28 @@
- 	],
- 	"displayName": "HTML nyelvi alapok",
- 	"description": "Szintaktikai kiemelést, összetartozó zárójelek kezelését és kódtöredékeket szolgáltat a HTML-fájlokhoz."
-+=======
-+	"html.format.enable.desc": "Alapértelmezett HTML-formázó engedélyezése vagy letiltása.",
-+	"html.format.wrapLineLength.desc": "Maximális karakterszám soronként (0 = letiltás)",
-+	"html.format.unformatted.desc": "Azon elemek vesszővel elválasztott listája, melyek ne legyenek újraformázva. 'null' érték esetén a https://www.w3.org/TR/html5/dom.html#phrasing-content oldalon listázott elemek lesznek használva.",
-+	"html.format.contentUnformatted.desc": "Azon elemek vesszővel elválasztott listája, melyek ne legyenek újraformázva. 'null' érték esetén a 'pre' tag lesz használva.",
-+	"html.format.indentInnerHtml.desc": "<head>- és <body>-szakaszok indentálása.",
-+	"html.format.preserveNewLines.desc": "Az elemek előtt lévő sortörések meg legyenek-e hagyva. Csak elemek előtt működik, elemek belsejében vagy szövegben nem.",
-+	"html.format.maxPreserveNewLines.desc": "Az egymás után megőrzött sortörések maximális száma. Ha nem szeretné korlátozni, használja a 'null' értéket!",
-+	"html.format.indentHandlebars.desc": "{{#foo}} és {{/foo}} formázása és indentálása.",
-+	"html.format.endWithNewline.desc": "Lezárás új sorral.",
-+	"html.format.extraLiners.desc": "Azon elemek veszővel elválasztott listája, amelyek előtt lennie kell egy extra új sornak. 'null' érték esetén a \"head,body,/html\" érték van használva.",
-+	"html.format.wrapAttributes.desc": "Attribútumok tördelése.",
-+	"html.format.wrapAttributes.auto": "Az attribútumok csak akkor vannak tördelve, ha a sorhossz túl lett lépve.",
-+	"html.format.wrapAttributes.force": "Minden egyes attribútum tördelve van, kivéve az elsőt.",
-+	"html.format.wrapAttributes.forcealign": "Minden egyes attribútum tördelve van, kivéve az elsőt, és igazítva vannak.",
-+	"html.format.wrapAttributes.forcemultiline": "Minden egyes attribútum tördelve van.",
-+	"html.suggest.angular1.desc": "Meghatározza, hogy a beépített HTML nyelvi támogatás ajánl-e Angular V1 elemeket és tulajdonságokat.",
-+	"html.suggest.ionic.desc": "Meghatározza, hogy a beépített HTML nyelvi támogatás ajánl-e Ionic elemeket, tulajdonságokat és értékeket.",
-+	"html.suggest.html5.desc": "Meghatározza, hogy a beépített HTML nyelvi támogatás ajánl-e HTML5-ös elemeket, tulajdonságokat és értékeket.",
-+	"html.trace.server.desc": "A VS Code és a HTML nyelvi szerver közötti kommunikáció naplózása.",
-+	"html.validate.scripts": "Meghatározza, hogy a beépített HTML nyelvi támogatás validálja-e a beágyazott parancsafájlokat.",
-+	"html.validate.styles": "Meghatározza, hogy a beépített HTML nyelvi támogatás validálja-e a beágyazott stílusfájlokat.",
-+	"html.autoClosingTags": "HTML-elemek automatikus lezárásának engedélyezése vagy tetiltása."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 9357a63ffaf869283d8ea308a0afcb1cd28cf4a4 i18n/hun/extensions/json/package.i18n.json
-  our    100644 55ffac6d3ddffd4a5aec160935b4bab3af657ee7 i18n/hun/extensions/json/package.i18n.json
-  their  100644 9738d213584addb39d71bf4c6008822f46734b34 i18n/hun/extensions/json/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,15 @@
- 	],
- 	"displayName": "JSON nyelvi alapok",
- 	"description": "Szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket a JSON-fájlokban."
-+=======
-+	"json.schemas.desc": "Sémák hozzárendelése JSON-fájlokhoz a jelenlegi projektben",
-+	"json.schemas.url.desc": "Egy séma URL-címe vagy egy séma relatív elérési útja az aktuális könyvtárban",
-+	"json.schemas.fileMatch.desc": "Fájlminták tömbje, amely a JSON-fájlok sémákhoz való rendelésénél van használva.",
-+	"json.schemas.fileMatch.item.desc": "Fájlminták tömbje, amely a JSON-fájlok sémákhoz való rendelésénél van használva. Tartalmazhat '*'-ot.",
-+	"json.schemas.schema.desc": "Az adott URL-cím sémadefiníciója. A sémát csak a séma URL-címéhez való fölösleges lekérdezések megakadályozása érdekében kell megadni.",
-+	"json.format.enable.desc": "Alapértelmezett JSON-formázó engedélyezése vagy letiltása (újraindítást igényel)",
-+	"json.tracing.desc": "A VS Code és a JSON nyelvi szerver közötti kommunikáció naplózása.",
-+	"json.colorDecorators.enable.desc": "Színdekorátorok engedélyezése vagy letiltása",
-+	"json.colorDecorators.enable.deprecationMessage": "A `json.colorDecorators.enable` beállítás elavult az `editor.colorDecorators` bevezetése miatt."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 cafe0123ba20fb08dd54cd5e40256fc86a623476 i18n/hun/extensions/markdown/out/security.i18n.json
-  our    100644 def0928c3a2d04d4810fab85fdcb21de9c9a696e i18n/hun/extensions/markdown/out/security.i18n.json
-  their  100644 17e3cdb8d75545883458eda2441aadfd19684672 i18n/hun/extensions/markdown/out/security.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"strict.title": "Szigorú",
- 	"strict.description": "Csak biztonságos tartalmak betöltése",
- 	"insecureContent.title": "Nem biztonságos tartalom engedélyezése",
-@@ -13,8 +16,11 @@
- 	"disable.title": "Letiltás",
- 	"disable.description": "Minden tartalom és parancsfájl futtatásának engedélyezése. Nem ajánlott.",
- 	"moreInfo.title": "További információ",
-+<<<<<<< .our
- 	"enableSecurityWarning.title": "Előnézettel kapcsolatos biztonsági figyelmeztetések engedélyezése ezen a munkaterületen",
- 	"disableSecurityWarning.title": "Előnézettel kapcsolatos biztonsági figyelmeztetések letiltása ezen a munkaterületen",
- 	"toggleSecurityWarning.description": "Nem befolyásolja a tartalom biztonsági szintjét",
-+=======
-+>>>>>>> .their
- 	"preview.showPreviewSecuritySelector.title": "Válassza ki a munkaterület Markdown-előnézeteinek biztonsági beállítását!"
- }
-\ No newline at end of file
-changed in both
-  base   100644 75c0b114f2e84ba56a0d059e18f6748e3c4e8f24 i18n/hun/extensions/markdown/package.i18n.json
-  our    100644 5e8a854122783db03c5813dac68d9f900c039710 i18n/hun/extensions/markdown/package.i18n.json
-  their  100644 beadc8533dcdaad77263e9aa178956b3f51afa1e i18n/hun/extensions/markdown/package.i18n.json
-@@ -27,6 +27,10 @@
- 	"markdown.styles.dec": "CSS-stíluslapok URL-címeinek vagy helyi elérési útjainak listája, amelyek a markdown-előnézeten használva vannak. A relatív elérési utak az intézőben megnyitott mappához képest vannak relatívan értelmezve. Ha nincs mappa megnyitva, akkor a markdown-fájl elréséi útjához képest. Minden '\\' karaktert '\\\\' formában kell megadni.",
- 	"markdown.showPreviewSecuritySelector.title": "Az előnézet biztonsági beállításainak módosítása",
- 	"markdown.trace.desc": "Hibakeresési napló engedélyezése a markdown kiterjesztésben.",
-+<<<<<<< .our
- 	"markdown.preview.refresh.title": "Előnézet frissítése",
- 	"markdown.preview.toggleLock.title": "Előnézet rögzítésének be- és kikapcsolása"
-+=======
-+	"markdown.refreshPreview.title": "Előnézet frissítése"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 93f5c9220fa94963877f135ecf1ab0d796a35193 i18n/hun/extensions/typescript/out/utils/api.i18n.json
-  their  100644 1fdc40628744f62a1ef4dc47db98bd2a52cf5a7e i18n/hun/extensions/typescript/out/utils/api.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"invalidVersion": "érvénytelen verzió"
- }
-\ No newline at end of file
-changed in both
-  base   100644 e7e49293c5e078a0bcfda05b3b78864411654e25 i18n/hun/extensions/typescript/out/utils/versionProvider.i18n.json
-  our    100644 4e8b25cde58ffa5b90d634fa963676d16f3d1d94 i18n/hun/extensions/typescript/out/utils/versionProvider.i18n.json
-  their  100644 62faa5fc547ed5d67bc772292c541b17dc6ae5c6 i18n/hun/extensions/typescript/out/utils/versionProvider.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"couldNotLoadTsVersion": "Nem sikerült meghatározni a TypeScript-verziót ezen az elérési úton",
- 	"noBundledServerFound": "A VSCode beépített tsserverét törölte egy másik alkalmazás, például egy hibásan viselkedő víruskereső eszköz. Telepítse újra a VSCode-ot!"
- }
-\ No newline at end of file
-changed in both
-  base   100644 c840556f299fdb077039af2a60100e137e515c0c i18n/hun/extensions/typescript/package.i18n.json
-  our    100644 e19877c4360e3513fd3a5b1a2ecccc96234d5215 i18n/hun/extensions/typescript/package.i18n.json
-  their  100644 031efbd3fe4459d372d5fe2a73a40ea5690eaf28 i18n/hun/extensions/typescript/package.i18n.json
-changed in both
-  base   100644 1c2baf9517c4b116a47c13ebd415842dd270150d i18n/hun/src/vs/code/electron-main/menus.i18n.json
-  our    100644 9ee4bd446c9ab5267b57c59dea436b05e72146ac i18n/hun/src/vs/code/electron-main/menus.i18n.json
-  their  100644 f2b24a522462fde526434a4c057f02d34fdd1964 i18n/hun/src/vs/code/electron-main/menus.i18n.json
-changed in both
-  base   100644 035c87c63bf947101474fc1feecfdca13992ce0e i18n/hun/src/vs/code/electron-main/windows.i18n.json
-  our    100644 6b542dd4e995cbd0bf2f1aa1576f1abe188fedf8 i18n/hun/src/vs/code/electron-main/windows.i18n.json
-  their  100644 b1266fdcb51fc9109932d149cacd7aab0d853a07 i18n/hun/src/vs/code/electron-main/windows.i18n.json
-@@ -9,15 +9,30 @@
- 	"ok": "OK",
- 	"pathNotExistTitle": "Az elérési út nem létezik",
- 	"pathNotExistDetail": "Úgy tűnik, hogy a(z) „{0}” elérési út már nem létezik a lemezen.",
-+<<<<<<< .our
- 	"reopen": "Megnyitás új&&ra",
- 	"wait": "Várakozás &&tovább",
- 	"close": "&&Bezárás",
-+=======
-+	"openWorkspace": "&&Megnyitás",
-+	"openWorkspaceTitle": "Munkaterület megnyitása",
-+	"save": "Menté&&s",
-+	"doNotSave": "&&Ne mentse",
-+	"cancel": "Mégse",
-+	"saveWorkspaceMessage": "Szeretné menteni a munkaterület konfigurációját egy fájlba?",
-+	"saveWorkspaceDetail": "Mentse el a munkaterületet, ha meg szeretné nyitni újra!",
-+	"saveWorkspace": "Munkaterület mentése",
-+	"reopen": "Újranyitás",
-+	"wait": "Várakozás tovább",
-+	"close": "Bezárás",
-+>>>>>>> .their
- 	"appStalled": "Az ablak nem válaszol",
- 	"appStalledDetail": "Bezárhatja vagy újranyithatja az ablakot vagy várakozhat tovább.",
- 	"appCrashed": "Az ablak összeomlott",
- 	"appCrashedDetail": "Elnézést kérünk az okozott kellemetlenségért. Nyissa újra az ablakot, ha onnan szeretné folytatni a munkát, ahol abbahagyta.",
- 	"open": "Megnyitás",
- 	"openFolder": "Mappa megnyitása",
-+<<<<<<< .our
- 	"openFile": "Fájl megnyitása",
- 	"workspaceOpenedMessage": "Nem sikerült menteni a(z) '{0}' munkaterületet",
- 	"workspaceOpenedDetail": "A munkaterület már meg van nyitva egy másik ablakban. Zárja be azt az ablakot, majd próbálja újra!",
-@@ -29,4 +44,7 @@
- 	"saveWorkspaceMessage": "Szeretné menteni a munkaterület konfigurációját egy fájlba?",
- 	"saveWorkspaceDetail": "Mentse el a munkaterületet, ha meg szeretné nyitni újra!",
- 	"saveWorkspace": "Munkaterület mentése"
-+=======
-+	"openFile": "Fájl megnyitása"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 9a872bf8d12beb83ba1aec465e88a60f1edca2b6 i18n/hun/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 2379691d68b1bb47b875192927c6b81fe486ec04 i18n/hun/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 b183a47b5af155178253d4bc846e9ab3923b1dbf i18n/hun/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -26,11 +26,17 @@
- 	"detectIndentation": "Fájl megnyitásakor az `editor.tabSize` és az `editor.insertSpaces` értéke a fájl tartalma alapján lesz meghatározva.",
- 	"roundedSelection": "Meghatározza, hogy a kijelölések sarkai le legyenek-e kerekítve.",
- 	"scrollBeyondLastLine": "Meghatározza, hogy a szerkesztőablak görgethető-e az utolsó sor után.",
-+<<<<<<< .our
- 	"scrollBeyondLastColumn": "Meghatározza, hogy hány extra karakterig görgethető a szerkesztőablak vízszintesen.",
- 	"smoothScrolling": "Meghatározza, hogy a szerkesztőablak animálva van-e görgetve.",
- 	"minimap.enabled": "Meghatározza, hogy megjelenjen-e a kódtérkép.",
- 	"minimap.side": "Meghatározza, hogy melyik oldalon jelenjen meg a kódtérkép.",
- 	"minimap.showSlider": "Meghatározza, hogy automatikusan el legyen-e rejtve a kódtérképes görgetősáv.",
-+=======
-+	"smoothScrolling": "Meghatározza, hogy a szerkesztőablak animálva van-e görgetve.",
-+	"minimap.enabled": "Meghatározza, hogy megjelenjen-e a kódtérkép.",
-+	"minimap.showSlider": "Meghatározza, hogy automatikusan el legyen-e rejtve a kódtérképes görgetősáv. Lehetséges értékek: 'always' és 'mouseover'.",
-+>>>>>>> .their
- 	"minimap.renderCharacters": "Meghatározza, hogy a tényleges karakterek legyenek-e megjelenítve (színes téglalapok helyett)",
- 	"minimap.maxColumn": "Meghatározza, hogy a kódtérképen legfeljebb hány oszlop legyen kirajzolva.",
- 	"find.seedSearchStringFromSelection": "Meghatározza, hogy a keresés modulba automatikusan bekerüljön-e a szerkesztőablakban kiválasztott szöveg.",
-@@ -106,11 +112,14 @@
- 	"accessibilitySupport": "Meghatározza, hogy a szerkesztő olyan módban fusson-e, ami optimalizálva van képernyőolvasóval való használathoz.",
- 	"links": "Meghatározza, hogy a szerkesztőablak érzékelje-e a hivatkozásokat, és kattinthatóvá tegye-e őket.",
- 	"colorDecorators": "Meghatározza, hogy a szerkesztőablakban ki legyenek-e rajzolva a színdekorátorok és színválasztók.",
-+<<<<<<< .our
- 	"codeActions": "Engedélyezi a kódműveletek végrehajtásához használható villanykörtét",
- 	"codeActionsOnSave.organizeImports": "Importálások rendezése mentés során",
- 	"codeActionsOnSave": "A mentés során futtatott kódműveletek.",
- 	"codeActionsOnSaveTimeout": "A mentés során futtatott kódműveletek futási időkorlátja.",
- 	"selectionClipboard": "Meghatározza-e, hogy támogatva van-e az elsődleges vágólap Linux alatt",
-+=======
-+>>>>>>> .their
- 	"sideBySide": "Meghatározza, hogy a differenciaszerkesztő ablakban egymás mellett vagy a sorban jelenjenek meg az eltérések",
- 	"ignoreTrimWhitespace": "Meghatározza, hogy a differenciaszerkesztő ablakban megjelenjenek-e a sor elején vagy végén a szóközökben talált különbségek",
- 	"largeFileOptimizations": "Nagy fájlok megnyitása esetén néhány, sok memóriát használó funkció letiltása.",
-changed in both
-  base   100644 313187f032a39971c7d9275b0815008f1e84b1ce i18n/hun/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 4128ea8ed8c31eaff6f326d9803f8603753a32a5 i18n/hun/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 e02ecc12d7f9b096ad0ad9d634bdbdf2ce6214dd i18n/hun/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -28,12 +28,16 @@
- 	"errorBorder": "A hibákat jelző hullámvonal keretszíne a szerkesztőablakban.",
- 	"warningForeground": "A figyelmeztetéseket jelző hullámvonal előtérszíne a szerkesztőablakban.",
- 	"warningBorder": "A figyelmeztetéseket jelző hullámvonal keretszíne a szerkesztőablakban.",
-+<<<<<<< .our
- 	"infoForeground": "Az információkat jelző hullámvonal előtérszíne a szerkesztőablakban.",
- 	"infoBorder": "Az információkat jelző hullámvonal keretszíne a szerkesztőablakban. ",
- 	"hintForeground": "Az utalásokat jelző hullámvonal előtérszíne a szerkesztőablakban.",
- 	"hintBorder": "Az utalásokat jelző hullámvonal keretszíne a szerkesztőablakban.",
- 	"unnecessaryForeground": "A szükségtelen kódrészletek előtérszíne a szerkesztőablakban.",
- 	"overviewRulerRangeHighlight": "A kiemelt területeket jelölő jelzések színe az áttekintősávon. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
-+=======
-+	"overviewRulerRangeHighlight": "A kiemelt tartományokat jelölő jelzések színe az áttekintősávon.",
-+>>>>>>> .their
- 	"overviewRuleError": "A hibákat jelölő jelzések színe az áttekintősávon.",
- 	"overviewRuleWarning": "A figyelmeztetéseket jelölő jelzések színe az áttekintősávon.",
- 	"overviewRuleInfo": "Az információkat jelölő jelzések színe az áttekintősávon."
-changed in both
-  base   100644 6192eaea44a972c2ba7e20e6523a599db126c80e i18n/hun/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
-  our    100644 fa7c3359075157c0a146e8ae8c803e06a1fb1a60 i18n/hun/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
-  their  100644 0880180553b683cf078c20377e08d5439d3114c6 i18n/hun/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
-@@ -7,7 +7,11 @@
- 	"wordHighlight": "Szimbólumok háttérszíne olvasási hozzáférés, páldául változó olvasása esetén.",
- 	"wordHighlightStrong": "Szimbólumok háttérszíne írási hozzáférés, páldául változó írása esetén.",
- 	"overviewRulerWordHighlightForeground": "A kiemelt szimbólumokat jelölő jelzések színe az áttekintősávon.",
-+<<<<<<< .our
- 	"overviewRulerWordHighlightStrongForeground": "A kiemelt, írási hozzáférésű szimbólumokat jelölő jelzések színe az áttekintősávon.",
- 	"wordHighlight.next.label": "Ugrás a következő kiemelt szimbólumhoz",
- 	"wordHighlight.previous.label": "Ugrás az előző kiemelt szimbólumhoz"
-+=======
-+	"overviewRulerWordHighlightStrongForeground": "A kiemelt, írási hozzáférésű szimbólumokat jelölő jelzések színe az áttekintősávon."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e6ca14e40be7dd49a26d934e5a125d9ed433345d i18n/hun/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 77c071af2b9d55c9f89889f4eaba840c5ab42297 i18n/hun/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 00566165aced043e2a95f92e6dbcb7067a5293fe i18n/hun/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,9 +10,12 @@
- 	"diff": "Két fájl összehasonlítása egymással.",
- 	"add": "Mappá(k) hozzáadása a legutolsó aktív ablakhoz.",
- 	"goto": "Megnyitja a megadott elérési úton található fájlt a megadott sornál és oszlopnál.",
-+<<<<<<< .our
- 	"newWindow": "Mindenképp új ablakban nyíljon meg",
- 	"reuseWindow": "Fájl vagy mappa a legutolsó aktív ablakban nyíljon meg.",
- 	"wait": "Várjon a fájlok bezárására a visszatérés előtt.",
-+=======
-+>>>>>>> .their
- 	"locale": "A használt lokalizáció (pl. en-US vagy zh-TW)",
- 	"userDataDir": "Meghatározza azt a mappát, ahol a felhasználói adatok vannak tárolva. Egyszerre több megnyitott Code-példány is használhatja.",
- 	"version": "Verzió kiírása.",
-added in both
-  our    100644 de7dfdd74633da46082c9bdd153d0dd68b42f472 i18n/hun/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
-  their  100644 7be8f29fde86fd7d69d2ace0e0002d6fb450127b i18n/hun/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"contributes.color": "Kiegészítők által definiált, témázható színeket szolgáltat.",
- 	"contributes.color.id": "A témázható szín azonosítója.",
- 	"contributes.color.id.format": "Az azonosítókat az aa[.bb]* formában kell megadni.",
-changed in both
-  base   100644 b106cb3adab923a5a9d8a69fc6f325df199168de i18n/hun/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 b9f948caca15d9f0853c29c47b30338822af7bb9 i18n/hun/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 8cfb21c1837d3fa34d7fe32f5153bb6c98bcd98c i18n/hun/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -96,6 +96,11 @@
- 	"overviewRulerCurrentContentForeground": "A helyi tartalom előtérszíne az áttekintő sávon összeolvasztási konfliktusok esetén.",
- 	"overviewRulerIncomingContentForeground": "A beérkező tartalom előtérszíne az áttekintő sávon összeolvasztási konfliktusok esetén.",
- 	"overviewRulerCommonContentForeground": "A közös ős tartalom előtérszíne az áttekintő sávon összeolvasztási konfliktusok esetén. ",
-+<<<<<<< .our
- 	"overviewRulerFindMatchForeground": "A keresési találatokat jelölő jelzések színe az áttekintősávon. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
- 	"overviewRulerSelectionHighlightForeground": "A kijelölt területeket jelölő jelzések színe az áttekintősávon. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat."
-+=======
-+	"overviewRulerFindMatchForeground": "A keresési találatokat jelölő jelzések színe az áttekintősávon.",
-+	"overviewRulerSelectionHighlightForeground": "A kiemelt kijelöléseket jelölő jelzések színe az áttekintősávon."
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 bcfb490cbc6e7453b6857d3da8f26732a626aa89 i18n/hun/src/vs/platform/workspaces/common/workspaces.i18n.json
-  their  100644 cfef075a08306efbe0ec434384f6c2ad5b815459 i18n/hun/src/vs/platform/workspaces/common/workspaces.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"codeWorkspace": "Code-munkaterület",
- 	"untitledWorkspace": "Névtelen (munkaterület)",
- 	"workspaceNameVerbose": "{0} (munkaterület)",
-added in both
-  our    100644 d9673b1c04f54051342a784da4f831573fedd903 i18n/hun/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
-  their  100644 a4e5d9f9437b0b41bd4343a2183b9a4cfc4cc641 i18n/hun/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,4 +11,16 @@
- 	"failedDep1": "A(z) '{1}' kiegészítőt nem sikerült aktiválni. Oka: a(z) '{0}' függőséget nem sikerült aktiválni.",
- 	"failedDep2": "A(z) '{0}' kiegészítőt nem sikerült aktiválni. Oka: több, mint 10  szintnyi függőség van (nagy valószínűséggel egy függőségi hurok miatt).",
- 	"activationError": "Nem sikerült aktiválni a(z) `{0}` kiegészítőt: {1}."
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"unknownDep": "A(z) `{1}` kiegészítőt nem sikerült aktiválni. Oka: ismeretlen függőség: `{0}`.",
-+	"failedDep1": "A(z) `{1}` kiegészítőt nem sikerült aktiválni. Oka: a(z) `{0}` függőséget nem sikerült aktiválni.",
-+	"failedDep2": "A(z) `{0}` kiegészítőt nem sikerült aktiválni. Oka: több, mint 10  szintnyi függőség van (nagy valószínűséggel egy függőségi hurok miatt).",
-+	"activationError": "A(z) `{0}` kiegészítő aktiválása nem sikerült: {1}."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 4a577b24d46df0fd37718e56c62bf4f30e191fd5 i18n/hun/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 123987f7d72edfd6ce2f5a4dafa7e92b866ab98d i18n/hun/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 c7a76624e3dc94dcfff0b64b4d5a158ecab284cf i18n/hun/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -9,6 +9,7 @@
- 	"openFile": "Fájl megnyitása...",
- 	"openFolder": "Mappa megnyitása...",
- 	"openFileFolder": "Megnyitás...",
-+<<<<<<< .our
- 	"globalRemoveFolderFromWorkspace": "Mappa eltávolítása a munkaterületről...",
- 	"saveWorkspaceAsAction": "Munkaterület mentése másként...",
- 	"save": "Menté&&s",
-@@ -16,4 +17,19 @@
- 	"openWorkspaceAction": "Munkaterület megnyitása...",
- 	"openWorkspaceConfigFile": "Munkaterület konfigurációs fájljának megnyitása",
- 	"duplicateWorkspaceInNewWindow": "Munkaterület megnyitása egy új ablakban"
-+=======
-+	"addFolderToWorkspace": "Mappa hozzáadása a munkaterülethez...",
-+	"add": "&&Hozzáadás",
-+	"addFolderToWorkspaceTitle": "Mappa hozzáadása a munkaterülethez",
-+	"newWorkspace": "Új munkaterület...",
-+	"select": "&&Kiválasztás",
-+	"selectWorkspace": "Válassza ki a munkaterület mappáit!",
-+	"removeFolderFromWorkspace": "Mappa eltávolítása a munkaterületről",
-+	"saveWorkspaceAsAction": "Munkaterület mentése másként...",
-+	"saveEmptyWorkspaceNotSupported": "A mentéshez először nyisson meg egy munkaterületet.",
-+	"save": "Menté&&s",
-+	"saveWorkspace": "Munkaterület mentése",
-+	"openWorkspaceAction": "Munkaterület megnyitása...",
-+	"openWorkspaceConfigFile": "Munkaterület konfigurációs fájljának megnyitása"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e127840392f56f5ad8bae3013003086b7c4f51a2 i18n/hun/src/vs/workbench/common/theme.i18n.json
-  our    100644 3406c795c4b8de9d50192c0ba339b8532a562f5d i18n/hun/src/vs/workbench/common/theme.i18n.json
-  their  100644 4beab6520d486b7486ac9dc8d02e65aaaa635119 i18n/hun/src/vs/workbench/common/theme.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -21,6 +22,17 @@
- 	"tabInactiveForeground": "Az inaktív fülek előtérszíne az aktív csoportban. A fülek tartalmazzák a szerkesztőterületen lévő szerkesztőablakokat. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
- 	"tabUnfocusedActiveForeground": "Az aktív fül előtérszíne egy fókusz nélküli csoportban. A fülek tartalmazzák a szerkesztőterületen lévő szerkesztőablakokat. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
- 	"tabUnfocusedInactiveForeground": "Az inaktív fülek előtérszíne egy fókusz nélküli csoportban. A fülek tartalmazzák a szerkesztőterületen lévő szerkesztőablakokat. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
-+=======
-+	"tabActiveBackground": "Az aktív fül háttérszíne. A fülek tartalmazzák a szerkesztőablakokat a szerkesztőterületen. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
-+	"tabInactiveBackground": "Az inaktív fülek háttérszíne. A fülek tartalmazzák a szerkesztőablakokat a szerkesztőterületen. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
-+	"tabBorder": "A füleket egymástól elválasztó keret színe. A fülek tartalmazzák a szerkesztőablakokat a szerkesztőterületen. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
-+	"tabActiveBorder": "Az aktív fülek kiemelésére használt keretszín. A fülek tartalmazzák a szerkesztőablakokat a szerkesztőterületen. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
-+	"tabActiveUnfocusedBorder": "Az aktív fülek kiemelésére használt keretszín egy fókusz nélküli csoportban. A fülek tartalmazzák a szerkesztőablakokat a szerkesztőterületen. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni. ",
-+	"tabActiveForeground": "Az aktív fül előtérszíne az aktív csoportban. A fülek tartalmazzák a szerkesztőablakokat a szerkesztőterületen. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
-+	"tabInactiveForeground": "Az inaktív fülek előtérszíne az aktív csoportban. A fülek tartalmazzák a szerkesztőablakokat a szerkesztőterületen. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
-+	"tabUnfocusedActiveForeground": "Az aktív fül előtérszíne egy fókusz nélküli csoportban. A fülek tartalmazzák a szerkesztőablakokat a szerkesztőterületen. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
-+	"tabUnfocusedInactiveForeground": "Az inaktív fülek előtérszíne egy fókusz nélküli csoportban. A fülek tartalmazzák a szerkesztőablakokat a szerkesztőterületen. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.",
-+>>>>>>> .their
- 	"editorGroupBackground": "A szerkesztőcsoportok háttérszíne. A szerkesztőcsoportok szerkesztőablakokat tartalmaznak. A háttérszín akkor jelenik meg, ha a szerkesztőcsoportok mozgatva vannak.",
- 	"tabsContainerBackground": "A szerkesztőcsoport címsorának háttérszíne, ha a fülek engedélyezve vannak. A szerkesztőcsoportok szerkesztőablakokat tartalmaznak.",
- 	"tabsContainerBorder": "A szerkesztőcsoport címsorának keretszíne, ha a fülek engedélyezve vannak. A szerkesztőcsoportok szerkesztőablakokat tartalmaznak.",
-@@ -29,10 +41,16 @@
- 	"editorDragAndDropBackground": "A szerkesztőablakok mozgatásánál használt háttérszín. Érdemes átlátszó színt választani, hogy a szerkesztőablak tartalma továbbra is látszódjon.",
- 	"panelBackground": "A panelek háttérszíne. A panelek a szerkesztőterület alatt jelennek meg, és pl. itt található a kimenet és az integrált terminál.",
- 	"panelBorder": "A panelek keretszíne, ami elválasztja őket a szerkesztőablakoktól. A panelek a szerkesztőterület alatt jelennek meg, és pl. itt található a kimenetet és az integrált terminál.",
-+<<<<<<< .our
- 	"panelActiveTitleForeground": "Az aktív panel címsorának színe. A panelek a szerkesztőterület alatt jelennek meg, és pl. itt található a kimenet és az integrált terminál.",
- 	"panelInactiveTitleForeground": "Az inaktív panelek címsorának színe. A panelek a szerkesztőterület alatt jelennek meg, és pl. itt található a kimenet és az integrált terminál.",
- 	"panelActiveTitleBorder": "Az aktív panel címsorának keretszíne. A panelek a szerkesztőterület alatt jelennek meg, és pl. itt található a kimenet és az integrált terminál.",
- 	"panelDragAndDropBackground": "A panel címsorában található elemek mozgatásánál használt visszajelzési szín. Érdemes átlátszó színt választani, hogy a panel elemei láthatóak maradjanak. A panelek a szerkesztőterület alatt jelennek meg, és pl. itt található a kimenet és az integrált terminál.",
-+=======
-+	"panelActiveTitleForeground": "Az aktív panel címsorának színe. A panelek a szerkesztőterület alatt jelennek meg, és pl. itt található a kimenetet és az integrált terminál.",
-+	"panelInactiveTitleForeground": "Az inaktív panelek címsorának színe. A panelek a szerkesztőterület alatt jelennek meg, és pl. itt található a kimenetet és az integrált terminál.",
-+	"panelActiveTitleBorder": "Az aktív panel címsorának keretszíne. A panelek a szerkesztőterület alatt jelennek meg, és pl. itt található a kimenetet és az integrált terminál.",
-+>>>>>>> .their
- 	"statusBarForeground": "Az állapotsor előtérszíne, ha egy munkaterület van megnyitva. Az állapotsor az ablak alján jelenik meg.",
- 	"statusBarNoFolderForeground": "Az állapotsor előtérszíne, ha nincs mappa megnyitva. Az állapotsor az ablak alján jelenik meg.",
- 	"statusBarBackground": "Az állapotsor háttérszíne, ha egy munkaterület van megnyitva. Az állapotsor az ablak alján jelenik meg.",
-changed in both
-  base   100644 345a003f2e5984704931778c36dfec293e9d5170 i18n/hun/src/vs/workbench/electron-browser/window.i18n.json
-  our    100644 0da8bd6c434595c584e7d6a578513ca7f171e8fe i18n/hun/src/vs/workbench/electron-browser/window.i18n.json
-  their  100644 3f8ae5cf9ddff63b8beb040265845f413c95dc4b i18n/hun/src/vs/workbench/electron-browser/window.i18n.json
-@@ -11,6 +11,10 @@
- 	"cut": "Kivágás",
- 	"copy": "Másolás",
- 	"paste": "Beillesztés",
-+<<<<<<< .our
- 	"selectAll": "Összes kijelölése",
- 	"runningAsRoot": "Nem ajánlott a {0} 'root'-két futtatása."
-+=======
-+	"selectAll": "Összes kijelölése"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 92aa0078bb82429c42e205a88cccd9a295623e7b i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
-  their  100644 bae20c58d0d08035036814fe4d7db1a5dca03177 i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"toggleMinimap": "Nézet: Kódtérkép be- és kikapcsolása"
- }
-\ No newline at end of file
-changed in both
-  base   100644 79c5e7716eee6a74be07454f0ede463934a9d1da i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
-  our    100644 6cf74e0b4a8396c3e30ea89b916bd20ef436f35a i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
-  their  100644 ebffddce9a708e829ed814823cacfd621af007eb i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"toggleRenderControlCharacters": "Nézet: Vezérlőkarakterek be- és kikapcsolása"
- }
-\ No newline at end of file
-changed in both
-  base   100644 e496d62b10240839adf4ab79ee3fd2010648044f i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
-  our    100644 3ba14042af6efdede17109427c2f43f904a4634c i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
-  their  100644 eea8c1ed6d1d68a36f4c9dbe78e01d36ba81e407 i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"toggleRenderWhitespace": "Nézet: Szóközök kirajzolásának be- és kikapcsolása"
- }
-\ No newline at end of file
-changed in both
-  base   100644 80975da2ce41ee1e041d2601643bb09bf2081267 i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 d46bba56fc807a6d58f940f4f326c6859150d33d i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 4b2b5f704cd88f04a2656ecc631b0b6d92633937 i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -28,7 +28,12 @@
- 	"preLaunchTaskExitCode": "A(z) '{0}' preLaunchTask a következő hibakóddal fejeződött be: {1}.",
- 	"showErrors": "Hibák megjelenítése",
- 	"noFolderWorkspaceDebugError": "Az aktív fájlon nem lehet hibakeresést végezni. Bizonyosodjon meg róla, hogy el van mentve a lemezre, és hogy az adott fájltípushoz telepítve van a megfelelő hibakeresési kiegészítő.",
-+<<<<<<< .our
- 	"cancel": "Mégse",
- 	"DebugTaskNotFound": "A(z) '{0}' feladat nem található.",
- 	"taskNotTracked": "A(z) '{0}' feladatot nem lehet követni."
-+=======
-+	"NewLaunchConfig": "Állítson be egy indítási konfigurációt az alkalmazása számára. {0}",
-+	"DebugTaskNotFound": "A(z) '{0}' preLaunchTask nem található."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6b2154af74d903c84c03e98c3056b513d4e27075 i18n/hun/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  our    100644 27c4e8cd4a1a4098144ded401ee99b5c6568fc10 i18n/hun/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  their  100644 0efffacb2ab563f5c2d9489d1e129d2b5e8379d1 i18n/hun/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-@@ -8,6 +8,23 @@
- 	],
- 	"debugAdapterBinNotFound": "A hibakeresési illesztő futtatható állománya ('{0}') nem létezik.",
- 	"debugAdapterCannotDetermineExecutable": "Nem határozható meg a(z) '{0}' hibakeresési illesztő futtatható állománya.",
-+<<<<<<< .our
- 	"unableToLaunchDebugAdapter": "Nem sikerült elindítani a hibakeresési illesztőt a következő helyről: '{0}'.",
- 	"unableToLaunchDebugAdapterNoArgs": "Nem sikerült elindítani a hibakeresési illesztőt."
-+=======
-+	"launch.config.comment1": "IntelliSense használata a lehetséges attribútumok listázásához",
-+	"launch.config.comment2": "Húzza fölé az egeret a létező attribútumok leírásának megtekintéséhez!",
-+	"launch.config.comment3": "További információért látogassa meg a következőt: {0}",
-+	"debugType": "A konfiguráció típusa.",
-+	"debugTypeNotRecognised": "Ez a hibakeresési típus nem ismert. Bizonyosodjon meg róla, hogy telepítve és engedélyezve van a megfelelő hibakeresési kiegészítő.",
-+	"node2NotSupported": "A \"node2\" már nem támogatott. Használja helyette a \"node\"-ot, és állítsa a \"protocol\" attribútum értékét \"inspector\"-ra.",
-+	"debugName": "A konfiguráció neve. Az indítási konfiguráció lenyíló menüjében jelenik meg.",
-+	"debugRequest": "A konfiguráció kérési típusa. Lehet \"launch\" vagy \"attach\".",
-+	"debugServer": "Csak hibakeresési kiegészítők fejlesztéséhez: ha a port meg van adva, akkor a VS Code egy szerver módban futó hibakeresési illesztőhöz próbál meg csatlakozni.",
-+	"debugPrelaunchTask": "A hibakeresési folyamat előtt futtatandó feladat.",
-+	"debugWindowsConfiguration": "Windows-specifikus indítási konfigurációs attribútumok.",
-+	"debugOSXConfiguration": "OS X-specifikus indítási konfigurációs attribútumok.",
-+	"debugLinuxConfiguration": "Linux-specifikus indítási konfigurációs attribútumok.",
-+	"deprecatedVariables": "Az 'env.', 'config.' és 'command.' tujdonságok elavultak, használja helyette az 'env:', 'config:' és 'command:' tulajdonságokat."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 650d879840db340a7161c57cb98be765662025d4 i18n/hun/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 7a913054b256429d23dc7fd5eaa396c14eb26134 i18n/hun/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 01fc6a8fbf998bf24da363242fed08e9da72c4ed i18n/hun/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-@@ -52,7 +52,14 @@
- 	"extensionInstalled": "Ez az ajánlott kiegészítő már telepítve van.",
- 	"showRecommendedKeymapExtensionsShort": "Billentyűkonfigurációk",
- 	"showLanguageExtensionsShort": "Nyelvi kiegészítők",
-+<<<<<<< .our
- 	"showAzureExtensionsShort": "Azure-kiegészítők",
-+=======
-+	"showAzureExtensions": "Azure-kiegészítők megjelenítése",
-+	"showAzureExtensionsShort": "Azure-kiegészítők",
-+	"configureWorkspaceRecommendedExtensions": "Ajánlott kiegészítők konfigurálása (munkaterületre vonatkozóan)",
-+	"ConfigureWorkspaceRecommendations.noWorkspace": "Az ajánlatok csak egy munkaterület mappájára vonatkozóan érhetők el.",
-+>>>>>>> .their
- 	"OpenExtensionsFile.failed": "Nem sikerült létrehozni az 'extensions.json' fájlt a '.vscode' mappánan ({0}).",
- 	"configureWorkspaceRecommendedExtensions": "Ajánlott kiegészítők konfigurálása (munkaterületre vonatkozóan)",
- 	"configureWorkspaceFolderRecommendedExtensions": "Ajánlott kiegészítők konfigurálása (munkaterület-mappára vonatkozóan)",
-changed in both
-  base   100644 4e50a349a2fafcf5d82cdbff11058aabf2b01bf0 i18n/hun/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  our    100644 893935427055ad47ead3dc96b6c4c09439e67753 i18n/hun/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  their  100644 b495b205cd596f17d90560c2db90193f3fc1eee1 i18n/hun/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-changed in both
-  base   100644 0bb1717ba9585415dbaab0e30a49581f1a1e56d3 i18n/hun/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 a6c7fe4eaefdd33cdf754b41fc784a5aa1d323ba i18n/hun/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 2d048ca64f906e512362df8c199522a7c7952a25 i18n/hun/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-@@ -40,14 +40,21 @@
- 	"dynamicHeight": "Meghatározza, hogy a megnyitott szerkesztőablakok szakasz magassága automatikusan illeszkedjen a megnyitott elemek számához vagy sem.",
- 	"autoReveal": "Meghatározza, hogy a fájlkezelőben automatikusan fel legyenek fedve és ki legyenek jelölve a fájlok, amikor megnyitják őket.",
- 	"enableDragAndDrop": "Meghatározza, hogy a fájlkezelőben áthelyezhetők-e a fájlok és mappák húzással.",
-+<<<<<<< .our
- 	"confirmDragAndDrop": "Meghatározza, hogy a fájlkezelő kérjen-e megerősítést fájlok és mappák húzással történő áthelyezése esetén.",
- 	"confirmDelete": "Meghatározza, hogy a fájlkezelő kérjen-e megerősítést a fájlok lomtárba történő helyezése esetén.",
-+=======
-+>>>>>>> .their
- 	"sortOrder.default": "A fájlok és mappák név szerint vannak rendezve, ABC-sorrendben. A mappák a fájlok előtt vannak listázva.",
- 	"sortOrder.mixed": "A fájlok és mappák név szerint vannak rendezve, ABC-sorrendben. A fájlok és a mappák közösen vannak rendezve.",
- 	"sortOrder.filesFirst": "A fájlok és mappák név szerint vannak rendezve, ABC-sorrendben. A fájlok a mappák előtt vannak listázva.",
- 	"sortOrder.type": "A fájlok és mappák a kiterjesztésük szerint vannak rendezve, ABC-sorrendben. A mappák a fájlok előtt vannak listázva.",
- 	"sortOrder.modified": "A fájlok és mappák a legutolsó módosítás dátuma szerint vannak rendezve, csökkenő sorrendben. A mappák a fájlok előtt vannak listázva.",
-+<<<<<<< .our
- 	"sortOrder": "Meghatározza a fájlok és mappák rendezési módját a fájlkezelőben. Az alapértelmezett rendezésen túl beállítható 'mixed' (a fájlok és mappák közösen vannak rendezve), 'type' (rendezés fájltípus szerint), 'modified' (rendezés utolsó módosítási dátum szerint) vagy 'filesFirst' (fájlok a mappák elé vannak rendezve) is.",
- 	"explorer.decorations.colors": "Meghatározza, hogy a fájldekorációk használjanak-e színeket.",
- 	"explorer.decorations.badges": "Meghatározza, hogy a fájldekorációk használjanak-e jelvényeket."
-+=======
-+	"sortOrder": "Meghatározza a fájlok és mappák rendezési módját a fájlkezelőben. Az alapértelmezett rendezésen túl beállítható 'mixed' (a fájlok és mappák közösen vannak rendezve), 'type' (rendezés fájltípus szerint), 'modified' (rendezés utolsó módosítási dátum szerint) vagy 'filesFirst' (fájlok a mappák elé vannak rendezve) is."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d2f6b36195dbdd606b1955f3de43fb39913ad1a4 i18n/hun/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
-  our    100644 e00a7141ecf961ae821e4ecc00d47ceb886f6670 i18n/hun/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
-  their  100644 21ef2846403cc80ba62d8c87cc31c8820effe9e4 i18n/hun/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
-@@ -10,9 +10,12 @@
- 	"dropFolder": "Szeretné hozzáadni a mappát a munkaterülethez?",
- 	"addFolders": "Mappák hozzá&&adása",
- 	"addFolder": "Mappa hozzá&&adása",
-+<<<<<<< .our
- 	"confirmMove": "Biztosan át szeretné helyezni a következőt: '{0}'?",
- 	"doNotAskAgain": "Ne kérdezze meg újra",
- 	"moveButtonLabel": "&&Áthelyezés",
-+=======
-+>>>>>>> .their
- 	"confirmOverwriteMessage": "A célmappában már létezik '{0}' nevű elem. Le szeretné cserélni?",
- 	"irreversible": "A művelet nem vonható vissza!",
- 	"replaceButtonLabel": "&&Csere"
-changed in both
-  base   100644 7fbc7fb1516a69fbdc0a5ec691159a33a1f123f8 i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 7fcd4f374ab4f60995cadb201b3438b5f1c1d544 i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 ee0b9750f5650ec8052a84dd3dea81872e18858f i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -13,5 +13,12 @@
- 	"newExtensionLabel": "\"{0}\" kiegészítő megjelenítése",
- 	"editTtile": "Szerkesztés",
- 	"replaceDefaultValue": "Csere a beállításokban",
-+<<<<<<< .our
- 	"copyDefaultValue": "Másolás a beállításokba"
-+=======
-+	"copyDefaultValue": "Másolás a beállításokba",
-+	"unsupportedPHPExecutablePathSetting": "Ez a beállítás csak a felhasználói beállításokban szerepelhet. A PHP munkaterülethez történő konfigurálásához nyisson meg egy PHP-fájlt, majd kattintson a PHP-elérési útra az állapotsoron!",
-+	"unsupportedWorkspaceSetting": "Ez a beállítás csak a felhasználói beállításokban szerepelhet.",
-+	"unsupportedWorkbenchSetting": "Ez a beállítás jelenleg nem alkalmazható. Akkor van használatban, ha közvetlenül nyitja meg ezt a mappát."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 088f4ecdf17398fe6e5960475b16e286273adbc1 i18n/hun/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-  our    100644 8349d99a4a6324ac86a46ca1c20f7160f93e0aa3 i18n/hun/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-  their  100644 8e8c7a2962e14bcfc3bbf32928cfe836b39f63f1 i18n/hun/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-changed in both
-  base   100644 fd2863510afd56f94e9d869faf5007ef8a37c2a3 i18n/hun/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  our    100644 b8dbc7740d8d5f70035f6da70f3e92605c2e7f25 i18n/hun/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  their  100644 4f8b481dc00d734f2215c121c783ca9022c3ba6e i18n/hun/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-changed in both
-  base   100644 529d2491ca21ff8f7a5db6e232273461c28bcab1 i18n/hun/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  our    100644 eed65b480a816d02a454fae412b29472fd8ae097 i18n/hun/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  their  100644 5fe5fb61f239178e733ebea5d246ca8c7518eadb i18n/hun/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,9 @@
- 	],
- 	"scm providers": "Verziókezelő rendszerek",
- 	"hideRepository": "Elrejtés",
-+=======
-+	"commitMessage": "Üzenet (nyomja meg a következőt a commithoz: {0})",
-+>>>>>>> .their
- 	"installAdditionalSCMProviders": "További verziókezelő rendszerek telepítése...",
- 	"no open repo": "Nincs aktív verziókezelő rendszer.",
- 	"source control": "Verziókezelő rendszer",
-changed in both
-  base   100644 557a3b1f1b3bdc60ae0a3804d7505a407326123b i18n/hun/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  our    100644 7156b4ce412c8251e8f04a4b792b1c2d0136b79a i18n/hun/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  their  100644 5864461ae76309347ec98bd0ccd9139bdb37c9dc i18n/hun/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-added in both
-  our    100644 794e9a078192b1557504653e40de51027399b492 i18n/hun/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
-  their  100644 dcb26c8240f6f06516d46b77da30dff1ee9674d2 i18n/hun/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"search.noWorkspaceWithName": "Nincs {0} nevű mappa a munkaterületen"
- }
-\ No newline at end of file
-changed in both
-  base   100644 0af66d78b7a0eba73916e362b5dc228e3315f569 i18n/hun/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 25b373020cb1651acc71d33aa66600dbd973089e i18n/hun/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 553e34a9c2af218f5a017e4b6847fc501d92f52c i18n/hun/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-changed in both
-  base   100644 08f91f727706a8150bbf6e4038c88e390f006fda i18n/hun/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 f91b0b4ec321ce05585bc7176e22754169aa0e2b i18n/hun/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 14edf183a4a272dcc86dee94c4509ddda009968a i18n/hun/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -16,9 +16,13 @@
- 	"manyProblems": "10k+",
- 	"runningTasks": "Futó feladatok megjelenítése",
- 	"tasks": "Feladatok",
-+<<<<<<< .our
- 	"TaskSystem.noHotSwap": "A feladatvégrehajtó motor megváltoztatása egy futó, aktív feladat esetén az ablak újraindítását igényli.",
- 	"reloadWindow": "Ablak újratöltése",
- 	"TaskServer.folderIgnored": "A(z) {0} mappa figyelmen kívül van hagyva, mert 0.1.0-s verziójú feladatkonfigurációt használ.",
-+=======
-+	"TaskSystem.noHotSwap": "A feladatvégrehajtó motor megváltoztatása az ablak újraindítását igényli.",
-+>>>>>>> .their
- 	"TaskService.noBuildTask1": "Nincs buildelési feladat definiálva. Jelöljön meg egy feladatot az 'isBuildCommand' tulajdonsággal a tasks.json fájlban!",
- 	"TaskService.noBuildTask2": "Nincs buildelési feladat definiálva. Jelöljön meg egy feladatot a 'build' csoporttal a tasks.json fájlban!",
- 	"TaskService.noTestTask1": "Nincs tesztelési feladat definiálva. Jelöljön meg egy feladatot az 'isTestCommand' tulajdonsággal a tasks.json fájlban!",
-changed in both
-  base   100644 cec5de6d41002df6fbf14999e8c3e531099cace7 i18n/hun/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  our    100644 fc54f4c27dcbc48772b8e0d9939f7da173a64963 i18n/hun/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  their  100644 b324e8e05fb9ddc050d2db02509baa1f4db88a5e i18n/hun/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-@@ -15,7 +15,10 @@
- 	"ConfigurationParser.invalidVaraibleReference": "Hiba: érvénytelen problemMatcher-referencia: {0}\n",
- 	"ConfigurationParser.noTaskType": "Hiba: a feladatkonfigurációnak rendelkeznie kell type tulajdonsággal. A konfiguráció figyelmen kívül lesz hagyva.\n{0}\n",
- 	"ConfigurationParser.noTypeDefinition": "Hiba: nincs '{0}' azonosítójú feladattípus regisztrálva. Elfelejtett telepíteni egy kiegészítőt, ami a feladat szolgáltatásáért felelős?",
-+<<<<<<< .our
- 	"ConfigurationParser.missingRequiredProperty": "Hiba: a(z) '{0}' feladatkonfigurációból hiányzik a kötelező '{1}' tulajdonság. A feladatkonfiguráció figyelmen kívül lesz hagyva.",
-+=======
-+>>>>>>> .their
- 	"ConfigurationParser.notCustom": "Hiba: a feladat nem egyedi feladatként van definiálva. A konfiguráció figyelmen kívül lesz hagyva.\n{0}\n",
- 	"ConfigurationParser.noTaskName": "Hiba: a feladatnak rendelkeznie kell adni taskName tulajdonsággal. A feladat figyelmen kívül lesz hagyva.\n{0}\n",
- 	"taskConfiguration.noCommandOrDependsOn": "Hiba: a(z) '{0}' feladat nem ad meg parancsot, és nem definiálja a dependsOn tulajdonságot sem. A feladat figyelmen kívül lesz hagyva. A definíciója:\n{1}",
-changed in both
-  base   100644 ce7074ecb9083df1c728572c8db85aa59158a69a i18n/hun/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  our    100644 2b1d782eb213534a4a021b3f53ef54718ece0ea1 i18n/hun/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  their  100644 d2b84accaac6a3a1a6d3f450b3d7351b68836ce4 i18n/hun/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -9,6 +10,11 @@
- 	"termEntryAriaLabel": "{0}, terminálválasztó",
- 	"termCreateEntryAriaLabel": "{0}, új terminál létrehozása",
- 	"workbench.action.terminal.newplus": "$(plus) Új integrált terminál létrehozása",
-+=======
-+	"termEntryAriaLabel": "{0}, terminálválasztó",
-+	"termCreateEntryAriaLabel": "{0}, új terminál létrehozása",
-+	"'workbench.action.terminal.newplus": "$(plus) Új integrált terminál létrehozása",
-+>>>>>>> .their
- 	"noTerminalsMatching": "Nincs ilyen terminál",
- 	"noTerminalsFound": "Nincs megnyitott terminál"
- }
-\ No newline at end of file
-changed in both
-  base   100644 30ac3bd312722396d493d3790da22866a84dd463 i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 8ec8f827057c19dd6709715ecc51f43540d7d5cc i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 2b495e02924e1ef9343862deb24d0f31d080f850 i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-changed in both
-  base   100644 3abe72be506dc91ec0eef8e438f3d03b7d012a54 i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 b5d8a4cb5cb8f374a5aeb4f4cc4a537c343663e4 i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 ed14d5780e708f6c360b2a5faf22754231501b4a i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -53,6 +53,7 @@
- 	"workbench.action.terminal.hideFindWidget": "Keresőmodul elrejtése",
- 	"nextTerminalFindTerm": "Következő keresési kifejezés megjelenítése",
- 	"previousTerminalFindTerm": "Előző keresési kifejezés megjelenítése",
-+<<<<<<< .our
- 	"quickOpenTerm": "Aktív terminál váltása",
- 	"workbench.action.terminal.scrollToPreviousCommand": "Görgetés az előző parancshoz",
- 	"workbench.action.terminal.scrollToNextCommand": "Görgetés a következő parancshoz",
-@@ -60,4 +61,7 @@
- 	"workbench.action.terminal.selectToNextCommand": "Következő parancs kiválasztása",
- 	"workbench.action.terminal.selectToPreviousLine": "Kijelölés az előző sorig",
- 	"workbench.action.terminal.selectToNextLine": "Kijelölés a következő sorig"
-+=======
-+	"quickOpenTerm": "Terminál: Aktív terminál váltása"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8c2f2f7b249d0db34cf54f5a54645b3d5c791a08 i18n/hun/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  our    100644 e777fa951c0ed63db22a18a7f794b7d1b4223ff6 i18n/hun/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  their  100644 cd933cb6f9f260bff15197ffe02a8401541c7ed0 i18n/hun/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-@@ -37,6 +37,8 @@
- 	"welcomePage.showCommandsDescription": "Parancsok gyors listázása és keresése a parancskatalógusban ({0})",
- 	"welcomePage.interfaceOverview": "Felhasználói felület áttekintése",
- 	"welcomePage.interfaceOverviewDescription": "Fedvény, ami vizuálisan bemutatja a felhasználói felület legfőbb részeit.",
-+	"welcomePage.deployToAzure": "Alkalmazások telepítése a felhőbe",
-+	"welcomePage.deployToAzureDescription": "Tudja meg, hogyan telepítheti Node-alkalmazásait az Azure App Service-re",
- 	"welcomePage.interactivePlayground": "Interaktív játszótér",
- 	"welcomePage.interactivePlaygroundDescription": "Próbálja ki a szerkesztő funkcióit egy rövid bemutató keretében!"
- }
-\ No newline at end of file
-changed in both
-  base   100644 7b98229452c4dc7c92207534dc7d9c4c91670990 i18n/hun/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-  our    100644 8ffe66f77ad9cf93ee1e6d79631e012c1973a694 i18n/hun/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-  their  100644 0ea6480ec657df6514b2682946b1575dd0f8428d i18n/hun/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-changed in both
-  base   100644 0120c6821a0a70d163478535d8f3656c042957d0 i18n/hun/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
-  our    100644 ae00c356289098d90d66e00a74ebadfd6d36c61b i18n/hun/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
-  their  100644 d6da0ebd90161676fd690dff1bcae62631da7d03 i18n/hun/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"editorWalkThrough.title": "Interaktív játszótér",
- 	"editorWalkThrough": "Interaktív játszótér"
- }
-\ No newline at end of file
-changed in both
-  base   100644 300fc7b40dc299d567e4beedb01b6d1bce16698e i18n/hun/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  our    100644 209303272b75dde2c6c8486d048f4d36b4fd9190 i18n/hun/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  their  100644 617531fdba677df05c3dbf12f7a109ed255b5797 i18n/hun/src/vs/workbench/services/configuration/node/configuration.i18n.json
-@@ -9,6 +9,7 @@
- 	"scope.window.description": "Ablakspecifikus beállítás, ami konfigurálható a felhasználói vagy munkaterületi beállításokban.",
- 	"scope.resource.description": "Erőforrásspecifikus beállítás, ami beállítható a felhasználói, munkaterületi és mappaszintű beállításokban.",
- 	"scope.description": "A hatókör, amire a beállítás vonatkozik. Az elérhető hatókörök: `window` és `resource`.",
-+<<<<<<< .our
- 	"vscode.extension.contributes.configuration": "Konfigurációs beállításokat szolgáltat.",
- 	"invalid.title": "a 'configuration.title' értékét karakterláncként kell megadni",
- 	"vscode.extension.contributes.defaultConfiguration": "Adott nyelvre vonatkozóan szerkesztőbeállításokat szolgáltat.",
-@@ -21,4 +22,13 @@
- 	"workspaceConfig.settings.description": "Munkaterület-beállítások",
- 	"workspaceConfig.extensions.description": "Munkaterület-kiegészítők",
- 	"unknownWorkspaceProperty": "Ismeretlen munkaterület-konfigurációs tulajdonság"
-+=======
-+	"invalid.type": "ha meg van adva, a 'configuration.type' értékét egy objektumként kell megadnii",
-+	"invalid.title": "a 'configuration.title' értékét karakterláncként kell megadni",
-+	"vscode.extension.contributes.defaultConfiguration": "Adott nyelvre vonatkozóan szerkesztőbeállításokat szolgáltat.",
-+	"invalid.properties": "A 'configuration.properties' értékét egy objektumként kell megadni",
-+	"workspaceConfig.folders.description": "A munkaterületre betöltött mappák listája. Elérési útnak kell lennie, pl. `/root/folderA` vagy `./folderA` relatív elérési út esetén, ami a munkaterületfájl helye alapján lesz feloldva.",
-+	"workspaceConfig.folder.description": "Egy fájl elérési útja, pl. `/root/folderA` vagy `./folderA` relatív elérési út esetén, ami a munkaterületfájl helye alapján lesz feloldva.",
-+	"workspaceConfig.settings.description": "Munkaterület-beállítások"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 459dfe9d8c1c6d76a2a67d59c21dc02a2defa3c5 i18n/hun/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 8838896ef923e5351413eebec6f141118ecced3a i18n/hun/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 b5420a3aa08b02a1b7d7efed67faadb7aae5feec i18n/hun/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -9,6 +9,7 @@
- 	"openTasksConfiguration": "Feladatkonfiguráció megnyitása",
- 	"openLaunchConfiguration": "Indítási konfiguráció megnyitása",
- 	"open": "Beállítások megnyitása",
-+<<<<<<< .our
- 	"saveAndRetry": "Mentés és újrapróbálkozás",
- 	"errorUnknownKey": "Nem sikerült írni a következőbe: {0}. A(z) {1} nem regisztrált beállítás.",
- 	"errorInvalidWorkspaceConfigurationApplication": "Nem sikerült írni a munkaterület beállításaiba, mert ez a beállítás csak a felhasználói beállításokban használható. ",
-@@ -27,6 +28,19 @@
- 	"errorConfigurationFileDirty": "Nem sikerült írni a felhasználói beállításokba, mert a fájl módosítva lett. Mentse a felhasználói beállításokat tartalmazó fájlt, majd próbálja újra!",
- 	"errorConfigurationFileDirtyWorkspace": "Nem sikerült írni a munkaterületi beállításokba, mert a fájl módosítva lett. Mentse a munkaterület beállításait tartalmazó fájlt, majd próbálja újra!",
- 	"errorConfigurationFileDirtyFolder": "Nem sikerült írni a mappa beállításait tartalmazó fájlba, mert a fájl módosítva lett. Mentse a(z) '{0}' mappa beállításait tartalmazó fájlt, majd próbálja újra!",
-+=======
-+	"close": "Bezárás",
-+	"saveAndRetry": "Beállítások mentése és újrapróbálkozás",
-+	"errorUnknownKey": "Nem sikerült írni a következőbe: {0}. A(z) {1} nem regisztrált beállítás.",
-+	"errorInvalidFolderConfiguration": "Nem sikerült írni a mappa beállításaiba, mert a(z) {0} nem támogatott mappa típusú erőforrások hatókörében.",
-+	"errorInvalidUserTarget": "Nem sikerült írni a felhasználói beállításokba, mert a(z) {0} nem támogatott globális hatókörben.",
-+	"errorInvalidFolderTarget": "Nem sikerült írni a mappa beállításaiba, mert nincs erőforrás megadva.",
-+	"errorNoWorkspaceOpened": "Nem sikerült írni a következőbe: {0}. Nincs munkaterület megnyitva. Nyisson meg egy munkaterületet, majd próbálja újra!",
-+	"errorInvalidConfiguration": "Nem sikerült írni a beállításokba. Nyissa meg a **Felhasználói beállításokat**, javítsa a hibákat és figyelmeztetéseket a fájlban, majd próbálja újra!",
-+	"errorInvalidConfigurationWorkspace": "Nem sikerült írni a beállításokba. Nyissa meg a **Munkaterült beállításait**, javítsa a hibákat és figyelmeztetéseket a fájlban, majd próbálja újra!",
-+	"errorConfigurationFileDirty": "Nem sikerült írni a beállításokba, mert a fájl módosítva lett. Mentse a **Felhasználói beállítások** fájlt, majd próbálja újra!",
-+	"errorConfigurationFileDirtyWorkspace": "Nem sikerült írni a beállításokba, mert a fájl módosítva lett. Mentse a **Munkaterület beállításai** fájlt, majd próbálja újra!",
-+>>>>>>> .their
- 	"userTarget": "Felhasználói beállítások",
- 	"workspaceTarget": "Munkaterület-beállítások",
- 	"folderTarget": "Mappabeálíltások"
-added in both
-  our    100644 10dc61c2737a8662a373b9e45ebe46cfd04968a3 i18n/hun/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
-  their  100644 4ffc18c313c0eb339aada94ac79bf295228ca878 i18n/hun/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,5 +10,15 @@
- 	"extensionHostProcess.startupFailDebug": "A kiegészítő gazdafolyamata nem idult el 10 másodperben belül. Elképzelhető, hogy megállt az első soron, és szüksége van a hibakeresőre a folytatáshoz.",
- 	"extensionHostProcess.startupFail": "A kiegészítő gazdafolyamata nem idult el 10 másodperben belül. Ez probléma lehet.",
- 	"reloadWindow": "Ablak újratöltése",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"extensionHostProcess.startupFailDebug": "A kiegészítő gazdafolyamata nem idult el 10 másodperben belül. Elképzelhető, hogy megállt az első soron, és szüksége van a hibakeresőre a folytatáshoz.",
-+	"extensionHostProcess.startupFail": "A kiegészítő gazdafolyamata nem idult el 10 másodperben belül. Ez probléma lehet.",
-+>>>>>>> .their
- 	"extensionHostProcess.error": "A kiegészítő gazdafolyamatától hiba érkezett: {0}"
- }
-\ No newline at end of file
-added in both
-  our    100644 816060ad96661300efc63158d5c697de25287bca i18n/hun/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
-  their  100644 e9cae50ed459f81e007d9d6eb4171974196972a2 i18n/hun/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,5 +10,16 @@
- 	"jsonParseFail": "Hiba a(z) {0} feldolgozása közben: {1}.",
- 	"fileReadFail": "A(z) ({0}) fájl nem olvasható: {1}.",
- 	"jsonsParseReportErrors": "Hiba a(z) {0} feldolgozása közben: {1}.",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"jsonParseFail": "Hiba a(z) {0} feldolgozása közben: {1}.",
-+	"fileReadFail": "A(z) ({0}) fájl nem olvasható: {1}.",
-+	"jsonsParseFail": "Hiba a(z) {0} vagy {1} feldolgozása közben: {2}.",
-+>>>>>>> .their
- 	"missingNLSKey": "A(z) {0} kulcshoz tartozó üzenet nem található."
- }
-\ No newline at end of file
-added in both
-  our    100644 a6ca11e97bf931156bbcea0e55d23d51e07fc42c i18n/hun/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-  their  100644 dd506bf2042e26a527d28352a9f02a7ebdf84cf2 i18n/hun/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -15,4 +16,18 @@
- 	"extensionUnderDevelopment": "A(z) {0} elérési úton található fejlesztői kiegészítő betöltése",
- 	"extensionCache.invalid": "A kiegészítők módosultak a lemezen. Töltse újra az ablakot!",
- 	"reloadWindow": "Ablak újratöltése"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"devTools": "Fejlesztői eszközök",
-+	"restart": "Kiegészítő gazdafolyamatának újraindítása",
-+	"extensionHostProcess.crash": "A kiegészítő gazdafolyamata váratlanul leállt.",
-+	"extensionHostProcess.unresponsiveCrash": "A kiegészítő gazdafolyamata le lett állítva, mert nem válaszolt.",
-+	"overwritingExtension": "A(z) {0} kiegészítő felülírása a következővel: {1}.",
-+	"extensionUnderDevelopment": "A(z) {0} elérési úton található fejlesztői kiegészítő betöltése"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 1618012de896e611e6e7e89f0cac6810ddcdeae5 i18n/hun/src/vs/workbench/services/progress/browser/progressService2.i18n.json
-  our    100644 d15b9a685b2dbb9a98892b2c815fa7b5f3600375 i18n/hun/src/vs/workbench/services/progress/browser/progressService2.i18n.json
-  their  100644 483d1f717cc5ad6c7195ad63a5d14e5d2911ef03 i18n/hun/src/vs/workbench/services/progress/browser/progressService2.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -9,4 +10,8 @@
- 	"progress.subtitle": "{0} – {1}",
- 	"progress.title": "{0}: {1}",
- 	"cancel": "Mégse"
-+=======
-+	"progress.subtitle": "{0} – {1}",
-+	"progress.title": "{0}: {1}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 eba34a8381df7ab7483061ec217a686943103a7c i18n/hun/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-  our    100644 595de7359bdc93a68ba5d4f08c126960b1920a71 i18n/hun/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-  their  100644 c20612f1980a83eb2af0ae9e6fbcd028f71744c9 i18n/hun/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,12 @@
- 	"schema.token.fontStyle": "A szabály betűstílusa 'italic', 'bold', 'underline', ezek kombinációja lehet. Az üres szöveg eltávolítja az örökölt beállításokat.",
- 	"schema.fontStyle.error": "A betűstílus 'italic', 'bold', 'underline', ezek kombinációja vagy üres szöveg lehet.",
- 	"schema.token.fontStyle.none": "Nincs (örökölt stílusok eltávolítása)",
-+=======
-+	"schema.token.settings": "A token színe és stílusa.",
-+	"schema.token.foreground": "A token előtérszíne.",
-+	"schema.token.fontStyle": "A szabály betűtípusának stílusa: 'italic', 'bold', 'underline', vagy ezek kombinációja",
-+	"schema.fontStyle.error": "A betűtípus stílusa 'italic', 'bold', 'underline', vagy ezek kombinációja lehet.",
-+>>>>>>> .their
- 	"schema.properties.name": "A szabály leírása.",
- 	"schema.properties.scope": "Hatókörszelektor, amire ez a szabály illeszkedik.",
- 	"schema.tokenColors.path": "Egy tmTheme-fájl elérési útja (az aktuális fájlhoz képest relatívan).",
-changed in both
-  base   100644 88c2c7411555ac6f0f1903b688ffac04c62f1659 i18n/hun/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
-  our    100644 b8af5ee724594e545495a011adc60bdfa714d121 i18n/hun/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
-  their  100644 d3d8dca1d71231ab10b9a6c088b99f50110059b1 i18n/hun/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
-changed in both
-  base   100644 46c356d2f238459ae90eaec7e82fc2809d6d2677 i18n/hun/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 cf978af5d8a1515d6c83d24f871d30875b427657 i18n/hun/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 c1c244778114e3ff66b2aa86337af7e6f4820107 i18n/hun/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-@@ -13,6 +13,12 @@
- 	"noIconThemeDesc": "Nincsenek fájlikonok",
- 	"iconThemeError": "A fájlikontéma ismeretlen vagy nincs telepítve.",
- 	"workbenchColors": "Felülírja az aktuális színtémában definiált színeket.",
-+<<<<<<< .our
-+=======
-+	"workbenchColors.deprecated": "A beállítás már nem kísérleti, és át lett nevezve 'workbench.colorCustomizations'-re.",
-+	"workbenchColors.deprecatedDescription": "Használja a 'workbench.colorCustomizations' tulajdonságot helyette.",
-+	"editorColors": "Felülírja az aktuális színtémában definiált, szerkesztőablakhoz kapcsolódó színeket és betűstílusokat.",
-+>>>>>>> .their
- 	"editorColors.comments": "Meghatározza a megjegyzések színét és stílusát.",
- 	"editorColors.strings": "Meghatározza a sztringliterálok színét és stílusát.",
- 	"editorColors.keywords": "Meghatározza a kulcsszavak színét és stílusát.",
-@@ -20,6 +26,10 @@
- 	"editorColors.types": "Meghatározza a típusdeklarációk és -referenciák színét és stílusát.",
- 	"editorColors.functions": "Meghatározza a függvénydeklarációk és -referenciák színét és stílusát.",
- 	"editorColors.variables": "Meghatározza a változódeklarációk és -referenciák színét és stílusát.",
-+<<<<<<< .our
- 	"editorColors.textMateRules": "Színek és stílusok beállítása textmate témázási szabályok alapján (haladó).",
- 	"editorColors": "Felülírja az aktuális színtémában definiált, szerkesztőablakhoz kapcsolódó színeket és betűstílusokat."
-+=======
-+	"editorColors.textMateRules": "Színek és stílusok beállítása textmate témázási szabályok alapján (haladó)."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 5c004d473e59c6e1e1378999048e285d0d4d9362 i18n/ita/extensions/css/package.i18n.json
-  our    100644 5f1a325b6dad6c5a147db0e935fbba1c1aca9afa i18n/ita/extensions/css/package.i18n.json
-  their  100644 0361873deb3a461ee804991b85e2771975014629 i18n/ita/extensions/css/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,73 @@
- 	],
- 	"displayName": "Nozioni di base del linguaggio CSS",
- 	"description": "Offre l'evidenziazione della sintassi e la corrispondenza delle parentesi nei file CSS, LESS e SCSS."
-+=======
-+	"css.lint.argumentsInColorFunction.desc": "Numero di parametri non valido",
-+	"css.lint.boxModel.desc": "Non usare width o height con padding o border",
-+	"css.lint.compatibleVendorPrefixes.desc": "Quando si usa un prefisso specifico del fornitore, assicurarsi di includere anche tutte le altre proprietà specifiche del fornitore",
-+	"css.lint.duplicateProperties.desc": "Non usare definizioni di stile duplicate",
-+	"css.lint.emptyRules.desc": "Non usare set di regole vuoti",
-+	"css.lint.float.desc": "Evitare di usare 'float'. Con gli elementi float si ottiene codice CSS che causa facilmente interruzioni in caso di modifica di un aspetto del layout.",
-+	"css.lint.fontFaceProperties.desc": "La regola @font-face deve definire le proprietà 'src' e 'font-family'",
-+	"css.lint.hexColorLength.desc": "I colori esadecimali devono essere composti da tre o sei numeri esadecimali",
-+	"css.lint.idSelector.desc": "I selettori non devono contenere ID perché queste regole sono strettamente accoppiate al codice HTML.",
-+	"css.lint.ieHack.desc": "Gli hack IE sono necessari solo per il supporto di IE7 e versioni precedenti",
-+	"css.lint.important.desc": "Evitare di usare !important perché indica che la specificità dell'intero codice CSS non è più controllabile ed è necessario effettuarne il refactoring.",
-+	"css.lint.importStatement.desc": "Le istruzioni Import non vengono caricate in parallelo",
-+	"css.lint.propertyIgnoredDueToDisplay.desc": "La proprietà viene ignorata a causa della visualizzazione. Ad esempio, con 'display: inline', le proprietà width, height, margin-top, margin-bottom e float non hanno effetto",
-+	"css.lint.universalSelector.desc": "Il selettore universale (*) è notoriamente lento",
-+	"css.lint.unknownProperties.desc": "Proprietà sconosciuta.",
-+	"css.lint.unknownVendorSpecificProperties.desc": "Proprietà specifica del fornitore sconosciuta.",
-+	"css.lint.vendorPrefix.desc": "Quando si usa un prefisso specifico del fornitore, includere anche la proprietà standard",
-+	"css.lint.zeroUnits.desc": "Non è necessaria alcuna unità per lo zero",
-+	"css.trace.server.desc": "Traccia la comunicazione tra VS Code e il server del linguaggio CSS.",
-+	"css.validate.title": "Controlla la convalida CSS e le gravità dei problemi.",
-+	"css.validate.desc": "Abilita o disabilita tutte le convalide",
-+	"less.lint.argumentsInColorFunction.desc": "Numero di parametri non valido",
-+	"less.lint.boxModel.desc": "Non usare width o height con padding o border",
-+	"less.lint.compatibleVendorPrefixes.desc": "Quando si usa un prefisso specifico del fornitore, assicurarsi di includere anche tutte le altre proprietà specifiche del fornitore",
-+	"less.lint.duplicateProperties.desc": "Non usare definizioni di stile duplicate",
-+	"less.lint.emptyRules.desc": "Non usare set di regole vuoti",
-+	"less.lint.float.desc": "Evitare di usare 'float'. Con gli elementi float si ottiene codice CSS che causa facilmente interruzioni in caso di modifica di un aspetto del layout.",
-+	"less.lint.fontFaceProperties.desc": "La regola @font-face deve definire le proprietà 'src' e 'font-family'",
-+	"less.lint.hexColorLength.desc": "I colori esadecimali devono essere composti da tre o sei numeri esadecimali",
-+	"less.lint.idSelector.desc": "I selettori non devono contenere ID perché queste regole sono strettamente accoppiate al codice HTML.",
-+	"less.lint.ieHack.desc": "Gli hack IE sono necessari solo per il supporto di IE7 e versioni precedenti",
-+	"less.lint.important.desc": "Evitare di usare !important perché indica che la specificità dell'intero codice CSS non è più controllabile ed è necessario effettuarne il refactoring.",
-+	"less.lint.importStatement.desc": "Le istruzioni Import non vengono caricate in parallelo",
-+	"less.lint.propertyIgnoredDueToDisplay.desc": "La proprietà viene ignorata a causa della visualizzazione. Ad esempio, con 'display: inline', le proprietà width, height, margin-top, margin-bottom e float non hanno effetto",
-+	"less.lint.universalSelector.desc": "Il selettore universale (*) è notoriamente lento",
-+	"less.lint.unknownProperties.desc": "Proprietà sconosciuta.",
-+	"less.lint.unknownVendorSpecificProperties.desc": "Proprietà specifica del fornitore sconosciuta.",
-+	"less.lint.vendorPrefix.desc": "Quando si usa un prefisso specifico del fornitore, includere anche la proprietà standard",
-+	"less.lint.zeroUnits.desc": "Non è necessaria alcuna unità per lo zero",
-+	"less.validate.title": "Controlla la convalida LESS e le gravità dei problemi.",
-+	"less.validate.desc": "Abilita o disabilita tutte le convalide",
-+	"scss.lint.argumentsInColorFunction.desc": "Numero di parametri non valido",
-+	"scss.lint.boxModel.desc": "Non usare width o height con padding o border",
-+	"scss.lint.compatibleVendorPrefixes.desc": "Quando si usa un prefisso specifico del fornitore, assicurarsi di includere anche tutte le altre proprietà specifiche del fornitore",
-+	"scss.lint.duplicateProperties.desc": "Non usare definizioni di stile duplicate",
-+	"scss.lint.emptyRules.desc": "Non usare set di regole vuoti",
-+	"scss.lint.float.desc": "Evitare di usare 'float'. Con gli elementi float si ottiene codice CSS che causa facilmente interruzioni in caso di modifica di un aspetto del layout.",
-+	"scss.lint.fontFaceProperties.desc": "La regola @font-face deve definire le proprietà 'src' e 'font-family'",
-+	"scss.lint.hexColorLength.desc": "I colori esadecimali devono essere composti da tre o sei numeri esadecimali",
-+	"scss.lint.idSelector.desc": "I selettori non devono contenere ID perché queste regole sono strettamente accoppiate al codice HTML.",
-+	"scss.lint.ieHack.desc": "Gli hack IE sono necessari solo per il supporto di IE7 e versioni precedenti",
-+	"scss.lint.important.desc": "Evitare di usare !important perché indica che la specificità dell'intero codice CSS non è più controllabile ed è necessario effettuarne il refactoring.",
-+	"scss.lint.importStatement.desc": "Le istruzioni Import non vengono caricate in parallelo",
-+	"scss.lint.propertyIgnoredDueToDisplay.desc": "La proprietà viene ignorata a causa della visualizzazione. Ad esempio, con 'display: inline', le proprietà width, height, margin-top, margin-bottom e float non hanno effetto",
-+	"scss.lint.universalSelector.desc": "Il selettore universale (*) è notoriamente lento",
-+	"scss.lint.unknownProperties.desc": "Proprietà sconosciuta.",
-+	"scss.lint.unknownVendorSpecificProperties.desc": "Proprietà specifica del fornitore sconosciuta.",
-+	"scss.lint.vendorPrefix.desc": "Quando si usa un prefisso specifico del fornitore, includere anche la proprietà standard",
-+	"scss.lint.zeroUnits.desc": "Non è necessaria alcuna unità per lo zero",
-+	"scss.validate.title": "Controlla la convalida SCSS e le gravità dei problemi.",
-+	"scss.validate.desc": "Abilita o disabilita tutte le convalide",
-+	"less.colorDecorators.enable.desc": "Abilita o disabilita gli elementi Decorator di tipo colore",
-+	"scss.colorDecorators.enable.desc": "Abilita o disabilita gli elementi Decorator di tipo colore",
-+	"css.colorDecorators.enable.desc": "Abilita o disabilita gli elementi Decorator di tipo colore",
-+	"css.colorDecorators.enable.deprecationMessage": "L'impostazione `css.colorDecorators.enable` è stata deprecata e sostituita da `editor.colorDecorators`.",
-+	"scss.colorDecorators.enable.deprecationMessage": "L'impostazione `scss.colorDecorators.enable` è stata deprecata e sostituita da `editor.colorDecorators`.",
-+	"less.colorDecorators.enable.deprecationMessage": "L'impostazione `less.colorDecorators.enable` è stata deprecata e sostituita da `editor.colorDecorators`."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 702045560ca96479bda9b9411bf1d371f3c874c9 i18n/ita/extensions/emmet/package.i18n.json
-  our    100644 325af035e69c09e1e32c51cdc976ffb0a4047641 i18n/ita/extensions/emmet/package.i18n.json
-  their  100644 6d5829bd5ff361a98b3874a5713590b195000b26 i18n/ita/extensions/emmet/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -7,6 +8,8 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"description": "Supporto di Emmet per VS codice",
-+=======
-+>>>>>>> .their
- 	"command.wrapWithAbbreviation": "Esegui il wrapping con l'abbreviazione",
- 	"command.wrapIndividualLinesWithAbbreviation": "Esegui il wrapping di singole righe con l'abbreviazione",
- 	"command.removeTag": "Rimuovi Tag",
-@@ -31,12 +34,21 @@
- 	"command.incrementNumberByTen": "Aumenta di 10",
- 	"command.decrementNumberByTen": "Riduci di 10",
- 	"emmetSyntaxProfiles": "Consente di definire il profilo per la sintassi specificata oppure di usare un profilo personalizzato con regole specifiche.",
-+<<<<<<< .our
- 	"emmetExclude": "Una matrice di linguaggi dove le abbreviazioni Emmet non dovrebbero essere espanse.",
- 	"emmetExtensionsPath": "Percorso di una cartella contenente profili e snippet Emmet.'",
- 	"emmetShowExpandedAbbreviation": "Mostra le abbreviazioni Emmet espanse come suggerimenti.\nL'opzione \"inMarkupAndStylesheetFilesOnly\" si applica a html, haml, jade, slim, xml, xsl, css, scss, sass, less e stylus.\nL'opzione \"sempre\" (always) si applica a tutte le parti del file indipendentemente dal markup/css.",
- 	"emmetShowAbbreviationSuggestions": "Mostra possibili abbreviazioni Emmet come suggerimenti. Non si applica a fogli di stile o quando emmet.showExpandedAbbreviation è impostata a \"mai\" (never).",
- 	"emmetIncludeLanguages": "Abilita le abbreviazioni Emmet in linguaggi che non sono normalmente supportati. Qui si può aggiungere un mapping tra il linguaggio ed il linguaggio supportato da Emmet.\n Ad esempio: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
- 	"emmetVariables": "Variabili da utilizzare negli snippet Emmet",
-+=======
-+	"emmetExclude": "Matrice di linguaggi in cui le abbreviazioni Emmet non devono essere espanse.",
-+	"emmetExtensionsPath": "Percorso di una cartella contenente snippet e profili Emmet.'",
-+	"emmetShowExpandedAbbreviation": "Mostra le abbreviazioni emmet espanse come suggerimenti.\nL'opzione \"inMarkupAndStylesheetFilesOnly\" si applica a html, haml, jade, slim, xml, xsl, css, scss, sass, less e stylus.\nL'opzione \"sempre\" (always) si applica a tutte le parti del file indipendentemente dal markup/css.",
-+	"emmetShowAbbreviationSuggestions": "Mostra possibili abbreviazioni emmet come suggerimenti. Non si applica a fogli di stile o quando emmet.showExpandedAbbreviation è impostata a \"mai\" (never).",
-+	"emmetIncludeLanguages": "Abilita le abbreviazioni emmet in linguaggi che non sono normalmente supportati. Aggiungere un mapping tra il linguaggio ed il linguaggio supportato da emmet.\n Ad esempio: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
-+	"emmetVariables": "Variabili da utilizzare nei frammenti di emmet",
-+>>>>>>> .their
- 	"emmetTriggerExpansionOnTab": "Se abilitate, le abbreviazioni Emmet vengono espanse quando si preme TAB.",
- 	"emmetPreferences": "Preferenze usate per modificare il comportamento di alcune azioni e i resolver di Emmet.",
- 	"emmetPreferencesIntUnit": "Unità di misura predefinita per i valori integer",
-@@ -47,6 +59,7 @@
- 	"emmetPreferencesCssBetween": "Simbolo da inserire tra la proprietà CSS e il valore quando si espandono le abbreviazioni CSS",
- 	"emmetPreferencesSassBetween": "Simbolo da inserire tra la proprietà CSS e il valore quando si espandono le abbreviazioni CSS nei file Sass",
- 	"emmetPreferencesStylusBetween": "Simbolo da inserire tra la proprietà CSS e il valore quando si espandono le abbreviazioni CSS nei file Stylus",
-+<<<<<<< .our
- 	"emmetShowSuggestionsAsSnippets": "Se è true, i suggerimenti Emmet verranno visualizzati come frammenti consentendo di ordinarli in base all'impostazione editor.snippetSuggestions.",
- 	"emmetPreferencesBemElementSeparator": "Separatore di elementi utilizzati per le classi quando si utilizza il filtro BEM",
- 	"emmetPreferencesBemModifierSeparator": "Separatore di modificatore utilizzato per le classi quando si utilizza il filtro BEM",
-@@ -62,4 +75,7 @@
- 	"emmetPreferencesCssMsProperties": "Proprietà CSS delimitate da virgola che assumono il prefisso 'ms' del vendor quando utilizzate nelle abbreviazioni di Emmet che iniziano per '-'. Per evitare sempre il prefisso 'ms' impostare stringa vuota.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "Il valore minimo (da 0 a 1) che dovrebbe raggiungere un'abbreviazione di fuzzy-match. I valori più bassi possono produrre molti falsi positivi, i valori più alti possono ridurre le possibili corrispondenze.",
- 	"emmetOptimizeStylesheetParsing": "Se è impostato su false, l'intero file viene analizzato per determinare se la posizione corrente è valida per l'espansione delle abbreviazioni di Emmet. Se è impostato su true, viene analizzato solo il contenuto circostante alla posizione corrente nei file css/scss/less."
-+=======
-+	"emmetShowSuggestionsAsSnippets": "Se è true, i suggerimenti Emmet verranno visualizzati come frammenti consentendo di ordinarli in base all'impostazione editor.snippetSuggestions."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 4fb28078ec9d4499a88f6978fc37bd9a593d8322 i18n/ita/extensions/extension-editing/out/extensionLinter.i18n.json
-  our    100644 ffb77fa1af8844a4780620b5955b34dc93a0f44f i18n/ita/extensions/extension-editing/out/extensionLinter.i18n.json
-  their  100644 a8b4072cafe1942f3f070a324988ab13d4d8e777 i18n/ita/extensions/extension-editing/out/extensionLinter.i18n.json
-changed in both
-  base   100644 26d0cd57ac25cccf17f52fff5b14fe94775a32c2 i18n/ita/extensions/git/out/commands.i18n.json
-  our    100644 b8b9f0490197b0e5904f4f035caca3a7f04c7df9 i18n/ita/extensions/git/out/commands.i18n.json
-  their  100644 16a12505d760669e549c8a32e7f85c58d25d9f66 i18n/ita/extensions/git/out/commands.i18n.json
-@@ -13,6 +13,7 @@
- 	"selectFolder": "Seleziona il Percorso del Repository",
- 	"cloning": "Clonazione del repository GIT '{0}'...",
- 	"proposeopen": "Aprire il repository clonato?",
-+<<<<<<< .our
- 	"openrepo": "Apri repository",
- 	"add": "Aggiungi all'Area di Lavoro",
- 	"proposeopen2": "Vuoi aprire il repository clonato o aggiungerlo all'area di lavoro corrente?",
-@@ -20,6 +21,10 @@
- 	"init repo": "Inizializza repository",
- 	"create repo": "Inizializza repository",
- 	"are you sure": "Questo creerà un repository Git in '{0}'. Sei sicuro di voler continuare?",
-+=======
-+	"path to init": "Percorso della cartella",
-+	"provide path": "Specificare un percorso di cartella per inizializzare un repository GIT",
-+>>>>>>> .their
- 	"HEAD not available": "La versione HEAD di '{0}' non è disponibile.",
- 	"confirm stage files with merge conflicts": "Preparare per il commit {0} file con conflitti di merge?",
- 	"confirm stage file with merge conflicts": "Preparare per il commit {0} con conflitti di merge?",
-@@ -43,10 +48,13 @@
- 	"confirm discard all 2": "{0}\n\nQuesta operazione è IRREVERSIBILE. Il working set corrente andrà PERSO PER SEMPRE.",
- 	"yes discard tracked": "Rimuovi 1 file di cui viene tenuta traccia",
- 	"yes discard tracked multiple": "Rimuovi {0} file di cui viene tenuta traccia",
-+<<<<<<< .our
- 	"unsaved files single": "Il seguente file non è stato salvato: {0}\n\nVuoi salvarlo prima di eseguirne il commit? ",
- 	"unsaved files": "Ci sono {0} file non ancora salvati.\n\nVuoi salvarli prima di eseguirne il commit? ",
- 	"save and commit": "Salva tutto & esegui Commit",
- 	"commit": "Esegui il Commit comunque",
-+=======
-+>>>>>>> .their
- 	"no staged changes": "Non ci sono modifiche in stage di cui eseguire il commit.\n\nSI desidera mettere in stage automaticamente tutte le modifiche ed eseguirne il commit direttamente?",
- 	"always": "Sempre",
- 	"no changes": "Non ci sono modifiche di cui eseguire il commit.",
-@@ -62,14 +70,22 @@
- 	"branch already exists": "La branch denominata '{0}' esiste già",
- 	"select a branch to merge from": "Selezionare un ramo da cui eseguire il merge",
- 	"merge conflicts": "Ci sono conflitti di merge. Risolverli prima di eseguire commit.",
-+<<<<<<< .our
- 	"tag name": "Nome tag",
- 	"provide tag name": "Specificare un nome di tag",
- 	"tag message": "Messaggio",
- 	"provide tag message": "Specificare un messaggio per aggiungere un'annotazione per il tag",
- 	"no remotes to fetch": "Questo repository non ha remote configurati da cui eseguire un fetch.",
-+=======
-+	"tag name": "Nome del tag",
-+	"provide tag name": "Specificare un nome di tag",
-+	"tag message": "Messaggio",
-+	"provide tag message": "Specificare un messaggio per aggiungere un'annotazione per il tag",
-+>>>>>>> .their
- 	"no remotes to pull": "Il repository non contiene elementi remoti configurati come origini del pull.",
- 	"pick remote pull repo": "Selezionare un repository remoto da cui effettuare il pull del ramo",
- 	"no remotes to push": "Il repository non contiene elementi remoti configurati come destinazione del push.",
-+	"push with tags success": "Il push con tag è riuscito.",
- 	"nobranch": "Estrarre un ramo per eseguire il push in un elemento remoto.",
- 	"confirm publish branch": "La branch '{0}' non ha una branch corrispondente a monte. Desideri pubblicarla?",
- 	"ok": "OK",
-changed in both
-  base   100644 5cfce3e084435c25cc0e1f4c91f916903cd1929f i18n/ita/extensions/git/out/model.i18n.json
-  our    100644 25fcf223ffe5b50db23d63f473ea1175669b6710 i18n/ita/extensions/git/out/model.i18n.json
-  their  100644 22eb58052df0382a8b23cf51510c757cc02fa0a6 i18n/ita/extensions/git/out/model.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -7,6 +8,8 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"too many submodules": "Il repository '{0}' ha {1} sottomoduli che non verranno aperti automaticamente. È possibile comunque aprirli individualmente aprendo il file all'interno.",
-+=======
-+>>>>>>> .their
- 	"no repositories": "Non ci sono repository disponibili",
- 	"pick repo": "Scegli un repository"
- }
-\ No newline at end of file
-added in both
-  our    100644 935d229ef3d726205b9cd81f4eb5a8ad6c057254 i18n/ita/extensions/git/out/repository.i18n.json
-  their  100644 0b2210016a0530315cadec169ab0f68016863294 i18n/ita/extensions/git/out/repository.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"open": "Apri",
- 	"index modified": "Indice modificato",
- 	"modified": "Modificato",
-@@ -17,6 +26,7 @@
- 	"untracked": "Non registrato",
- 	"ignored": "Ignorato",
- 	"both deleted": "Entrambi eliminati",
-+<<<<<<< .our
- 	"added by us": "Aggiunto da Microsoft",
- 	"deleted by them": "Eliminato dall'utente",
- 	"added by them": "Aggiunto dall'utente",
-@@ -24,12 +34,24 @@
- 	"both added": "Entrambi aggiunti",
- 	"both modified": "Entrambi modificati",
- 	"commitMessage": "Message (press {0} to commit)",
-+=======
-+	"added by us": "Aggiunto da noi",
-+	"deleted by them": "Eliminato da loro",
-+	"added by them": "Aggiunto da loro",
-+	"deleted by us": "Eliminato da noi",
-+	"both added": "Entrambi aggiunti",
-+	"both modified": "Entrambi modificati",
-+>>>>>>> .their
- 	"commit": "Esegui commit",
- 	"merge changes": "Esegui merge delle modifiche",
- 	"staged changes": "Modifiche preparate per il commit",
- 	"changes": "Modifiche",
-+<<<<<<< .our
- 	"commitMessageCountdown": "ancora {0} caratteri disponibili nella riga corrente",
- 	"commitMessageWarning": "{0} caratteri rispetto ai {1} disponibili nella riga corrente",
-+=======
-+	"ok": "OK",
-+>>>>>>> .their
- 	"neveragain": "Non visualizzare più questo messaggio",
- 	"huge": "Il repository git '{0}' ha troppe modifiche attive - verrà attivato solo un sottoinsieme delle funzionalità di Git."
- }
-\ No newline at end of file
-changed in both
-  base   100644 6333c529dcd1949dea7222b493cce9e170b051f9 i18n/ita/extensions/git/package.i18n.json
-  our    100644 3e99eceff18f0bd1805288644f15d41ccf24de7a i18n/ita/extensions/git/package.i18n.json
-  their  100644 fd78ff2a50babcf1e1a4f5050a85f804d64099cf i18n/ita/extensions/git/package.i18n.json
-@@ -40,7 +40,10 @@
- 	"command.renameBranch": "Rinomina Branch...",
- 	"command.merge": "Merge ramo...",
- 	"command.createTag": "Crea tag",
-+<<<<<<< .our
- 	"command.fetch": "Fetch",
-+=======
-+>>>>>>> .their
- 	"command.pull": "Esegui pull",
- 	"command.pullRebase": "Esegui pull (Riassegna)",
- 	"command.pullFrom": "Pull da...",
-@@ -52,7 +55,10 @@
- 	"command.publish": "Pubblica ramo",
- 	"command.showOutput": "Mostra output GIT",
- 	"command.ignore": "Aggiungi file a .gitignore",
-+<<<<<<< .our
- 	"command.stashIncludeUntracked": "Stash (includi non tracciate)",
-+=======
-+>>>>>>> .their
- 	"command.stash": "Accantona",
- 	"command.stashPop": "Preleva accantonamento...",
- 	"command.stashPopLatest": "Preleva accantonamento più recente",
-@@ -71,6 +77,7 @@
- 	"config.defaultCloneDirectory": "Il percorso predefinito dove clonare un repository GIT",
- 	"config.enableSmartCommit": "Eseguire il commit di tutte le modifiche quando non ci sono modifiche preparate.",
- 	"config.enableCommitSigning": "Abilita la firma del commit con GPG.",
-+<<<<<<< .our
- 	"config.discardAllScope": "Controlla quali modifiche vengono rimosse tramite il comando `Rimuovi tutte le modifiche`. Con `all` vengono rimosse tutte le modifiche. Con `tracked` vengono rimossi solo i file di cui viene tenuta traccia. Con `prompt` viene visualizzata una finestra di dialogo ogni volta che si esegue l'azione.",
- 	"config.decorations.enabled": "Controlla se Git fornisce colori e distintivi alle visualizzazioni Esplora risorse e Editor aperti.",
- 	"config.promptToSaveFilesBeforeCommit": "Controlla se GIT deve verificare la presenza di file non salvati prima di eseguire il commit.",
-@@ -84,4 +91,7 @@
- 	"colors.ignored": "Colore delle risorse ignorate.",
- 	"colors.conflict": "Colore delle risorse con conflitti.",
- 	"colors.submodule": "Colore delle risorse sottomodulo"
-+=======
-+	"config.discardAllScope": "Controlla quali modifiche vengono rimosse tramite il comando `Rimuovi tutte le modifiche`. Con `all` vengono rimosse tutte le modifiche. Con `tracked` vengono rimossi solo i file di cui viene tenuta traccia. Con `prompt` viene visualizzata una finestra di dialogo ogni volta che si esegue l'azione."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6e77b2e1cb18cbed8863546e071ec040fe214641 i18n/ita/extensions/html/package.i18n.json
-  our    100644 9015f75af4c550711e07a1e7f3d1832824bafe41 i18n/ita/extensions/html/package.i18n.json
-  their  100644 6aa0272c4c31158ea4855b4dfa9878fc5ff54ea1 i18n/ita/extensions/html/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,28 @@
- 	],
- 	"displayName": "Nozioni di base del linguaggio HTML",
- 	"description": "Fornisce l'evidenziazione della sintassi, la corrispondenza delle parentesi & frammenti nei file HTML."
-+=======
-+	"html.format.enable.desc": "Abilita/Disabilita il formattatore HTML predefinito",
-+	"html.format.wrapLineLength.desc": "Numero massimo di caratteri per riga (0 = disabilita).",
-+	"html.format.unformatted.desc": "Elenco di tag, separati da virgole, che non devono essere riformattati. Con 'null' viene usata l'impostazione predefinita che prevede l'uso di tutti i tag elencati in https://www.w3.org/TR/html5/dom.html#phrasing-content.",
-+	"html.format.contentUnformatted.desc": "Elenco di tag, separati da virgole, in cui il contenuto non deve essere riformattato. Per impostazione predefinita, con 'null' viene usato il tag 'pre'.",
-+	"html.format.indentInnerHtml.desc": "Imposta un rientro per le sezioni <head> e <body>.",
-+	"html.format.preserveNewLines.desc": "Indica se è necessario mantenere interruzioni di riga esistenti prima degli elementi. Funziona solo prima degli elementi e non all'interno di tag o per il testo.",
-+	"html.format.maxPreserveNewLines.desc": "Numero massimo di interruzioni di riga da mantenere in un unico blocco. Per non impostare un numero massimo, usare 'null'.",
-+	"html.format.indentHandlebars.desc": "Applica la formattazione e imposta un rientro per {{#foo}} e {{/foo}}.",
-+	"html.format.endWithNewline.desc": "Termina con un carattere di nuova riga.",
-+	"html.format.extraLiners.desc": "Elenco di tag, separati da virgole, che devono essere preceduti da un carattere di nuova riga. Con 'null' viene usata l'impostazione predefinita \"head, body, /html\".",
-+	"html.format.wrapAttributes.desc": "Esegue il wrapping degli attributi.",
-+	"html.format.wrapAttributes.auto": "Esegue il wrapping degli attributi solo quando viene superata la lunghezza di riga.",
-+	"html.format.wrapAttributes.force": "Esegue il wrapping di ogni attributo ad eccezione del primo.",
-+	"html.format.wrapAttributes.forcealign": "Esegue il wrapping di ogni attributo ad eccezione del primo e mantiene l'allineamento.",
-+	"html.format.wrapAttributes.forcemultiline": "Esegue il wrapping di ogni attributo.",
-+	"html.suggest.angular1.desc": "Consente di configurare se il supporto del linguaggio HTML predefinito suggerisce tag e proprietà di Angular V1.",
-+	"html.suggest.ionic.desc": "Consente di configurare se il supporto del linguaggio HTML predefinito suggerisce tag, proprietà e valori di Ionic.",
-+	"html.suggest.html5.desc": "Consente di configurare se il supporto del linguaggio HTML predefinito suggerisce tag, proprietà e valori di HTML5.",
-+	"html.trace.server.desc": "Traccia la comunicazione tra VS Code e il server del linguaggio HTML.",
-+	"html.validate.scripts": "Consente di configurare se il supporto del linguaggio HTML predefinito convalida gli script incorporati.",
-+	"html.validate.styles": "Consente di configurare se il supporto del linguaggio HTML predefinito convalida gli stili incorporati.",
-+	"html.autoClosingTags": "Abilita/Disabilita la chiusura automatica dei tag HTML."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f863ad2cb051609afa6f859148bc8fb2d24ccd4d i18n/ita/extensions/json/package.i18n.json
-  our    100644 d1cf4899cfa86afcb0389d3535383acafc91e09d i18n/ita/extensions/json/package.i18n.json
-  their  100644 99b5edcf95b28e7809a5526dcb46c7fc924020fc i18n/ita/extensions/json/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,15 @@
- 	],
- 	"displayName": "Nozioni di base del linguaggio JSON",
- 	"description": "Offre l'evidenziazione della sintassi e la corrispondenza delle parentesi nei file JSON."
-+=======
-+	"json.schemas.desc": "Associa schemi a file JSON nel progetto corrente",
-+	"json.schemas.url.desc": "URL di uno schema o percorso relativo di uno schema nella directory corrente",
-+	"json.schemas.fileMatch.desc": "Matrice di criteri dei file da usare per la ricerca durante la risoluzione di file JSON in schemi.",
-+	"json.schemas.fileMatch.item.desc": "Criteri dei file che possono contenere '*' da usare per la ricerca durante la risoluzione di file JSON in schemi.",
-+	"json.schemas.schema.desc": "Definizione dello schema per l'URL specificato. È necessario specificare lo schema per evitare accessi all'URL dello schema.",
-+	"json.format.enable.desc": "Abilita/Disabilita il formattatore JSON predefinito (richiede il riavvio)",
-+	"json.tracing.desc": "Traccia la comunicazione tra VS Code e il server del linguaggio JSON.",
-+	"json.colorDecorators.enable.desc": "Abilita o disabilita gli elementi Decorator di tipo colore",
-+	"json.colorDecorators.enable.deprecationMessage": "L'impostazione `json.colorDecorators.enable` è stata deprecata e sostituita da `editor.colorDecorators`."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 4b1b334651f547ec735bfefa72dbb76ace7100f2 i18n/ita/extensions/markdown/out/security.i18n.json
-  our    100644 17900416bd63016cb376b5bd866dbacf0ec6bdd5 i18n/ita/extensions/markdown/out/security.i18n.json
-  their  100644 0b73b98c61cff8571fae1e87fa72257c21d48ec0 i18n/ita/extensions/markdown/out/security.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"strict.title": "Strict",
- 	"strict.description": "Carica solo contenuto protetto",
- 	"insecureContent.title": "Consenti contenuto non protetto",
-@@ -13,8 +16,11 @@
- 	"disable.title": "Disabilita",
- 	"disable.description": "Consente l'esecuzione di tutti i contenuti e script. Scelta non consigliata",
- 	"moreInfo.title": "Altre informazioni",
-+<<<<<<< .our
- 	"enableSecurityWarning.title": "Abilita anteprima degli avvisi di protezione in questa area di lavoro",
- 	"disableSecurityWarning.title": "Disabilita anteprima degli avvisi di protezione in questa area di lavoro",
- 	"toggleSecurityWarning.description": "Non influisce sul livello di sicurezza del contenuto",
-+=======
-+>>>>>>> .their
- 	"preview.showPreviewSecuritySelector.title": "Seleziona impostazioni di protezione per le anteprime Markdown in questa area di lavoro"
- }
-\ No newline at end of file
-changed in both
-  base   100644 86ada41639d7a7aa98b86dece4c06c06e247c47e i18n/ita/extensions/markdown/package.i18n.json
-  our    100644 a46f2021ca01b1827f60d8762b195c535d2a3e6c i18n/ita/extensions/markdown/package.i18n.json
-  their  100644 6aca710a338c1fa26cbbfe50b358ee54acd7798e i18n/ita/extensions/markdown/package.i18n.json
-@@ -27,6 +27,10 @@
- 	"markdown.styles.dec": "Elenco di URL o percorsi locali dei fogli di stile CSS da usare dall'anteprima markdown. I percorsi relativi vengono interpretati come relativi alla cartella aperta nella finestra di esplorazione. Se non è presente alcuna cartella aperta, vengono interpretati come relativi al percorso del file markdown. Tutti i caratteri '\\' devono essere scritti come '\\\\'.",
- 	"markdown.showPreviewSecuritySelector.title": "Modifica impostazioni di sicurezza anteprima",
- 	"markdown.trace.desc": "Abilitare la registrazione debug per l'estensione markdown.",
-+<<<<<<< .our
- 	"markdown.preview.refresh.title": "Aggiorna anteprima",
- 	"markdown.preview.toggleLock.title": "Attiva/Disattiva blocco anteprima"
-+=======
-+	"markdown.refreshPreview.title": "Aggiorna anteprima"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 75f0f394012773512a4ea8a5ac66acc53b4b7254 i18n/ita/extensions/typescript/out/utils/api.i18n.json
-  their  100644 23e26f897b69e6439abdaf44456614db2cd4ef1b i18n/ita/extensions/typescript/out/utils/api.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"invalidVersion": "versione non valida"
- }
-\ No newline at end of file
-changed in both
-  base   100644 09c108e0ed35b4e903247f2c291e3a170c1c8351 i18n/ita/extensions/typescript/out/utils/versionPicker.i18n.json
-  our    100644 c0e18983544e6fa739b523daaf17a0388ce9f56c i18n/ita/extensions/typescript/out/utils/versionPicker.i18n.json
-  their  100644 d2d039e225674468bdc1a8720780791142c92751 i18n/ita/extensions/typescript/out/utils/versionPicker.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"useVSCodeVersionOption": "Usa versione di VS Code",
- 	"useWorkspaceVersionOption": "Usa versione dell'area di lavoro",
- 	"learnMore": "Altre informazioni",
-changed in both
-  base   100644 68ad43be044e5c378bff93a05a1610f2227f9116 i18n/ita/extensions/typescript/out/utils/versionProvider.i18n.json
-  our    100644 385cbc613775d52ff5c2891f917f015f744de2a2 i18n/ita/extensions/typescript/out/utils/versionProvider.i18n.json
-  their  100644 ce11b335ecaac83d0442043a8a9ce16cdb33c5b4 i18n/ita/extensions/typescript/out/utils/versionProvider.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"couldNotLoadTsVersion": "Non è stato possibile caricare la versione di TypeScript in questo percorso",
- 	"noBundledServerFound": "Il file tsserver di VS Code è stato eliminato da un'altra applicazione, ad esempio uno strumento di rilevamento virus che non funziona correttamente. Reinstallare VS Code."
- }
-\ No newline at end of file
-changed in both
-  base   100644 ed2f1d326cfddff989ae3f548538202ab4bda252 i18n/ita/extensions/typescript/package.i18n.json
-  our    100644 054fef232fe5cc6638b36dc9af5b8a091e76ce7d i18n/ita/extensions/typescript/package.i18n.json
-  their  100644 21866260c71e1790aaecdd16266011bdbf23f8cf i18n/ita/extensions/typescript/package.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/ita/src/vs/code/electron-main/auth.i18n.json
-  our    100644 674db87b9f5bd5ed58dc33b63fa2954ba609d608 i18n/ita/src/vs/code/electron-main/auth.i18n.json
-  their  100644 354aecd5ccb0c070c75c8aff899a5065c07bbb54 i18n/ita/src/vs/code/electron-main/auth.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"authRequire": "Autenticazione proxy necessaria",
- 	"proxyauth": "Il proxy {0} richiede l'autenticazione."
- }
-\ No newline at end of file
-changed in both
-  base   100644 ad8399e27f9af629ea7a40b87affc69453bfff38 i18n/ita/src/vs/code/electron-main/menus.i18n.json
-  our    100644 a5f6c5e0343adf224d6df3a61663d9695836512e i18n/ita/src/vs/code/electron-main/menus.i18n.json
-  their  100644 fbec1e5bf9c4adbe73dc2975203e45996cdbe652 i18n/ita/src/vs/code/electron-main/menus.i18n.json
-@@ -24,12 +24,21 @@
- 	"miQuit": "Chiudi {0}",
- 	"miNewFile": "&&Nuovo file",
- 	"miOpen": "&&Apri...",
-+<<<<<<< .our
- 	"miOpenWorkspace": "Aprire Wor&&kspace...",
- 	"miOpenFolder": "Apri &&cartella...",
- 	"miOpenFile": "&&Apri file...",
- 	"miOpenRecent": "Apri &&recenti",
- 	"miSaveWorkspaceAs": "Salva area di lavoro con nome...",
- 	"miAddFolderToWorkspace": "A&&ggiungere cartella all'area di lavoro...",
-+=======
-+	"miOpenWorkspace": "&&Apri area di lavoro...",
-+	"miOpenFolder": "Apri &&cartella...",
-+	"miOpenFile": "&&Apri file...",
-+	"miOpenRecent": "Apri &&recenti",
-+	"miSaveWorkspaceAs": "&&Salva area di lavoro con nome...",
-+	"miAddFolderToWorkspace": "&&Aggiungi cartella all'area di lavoro...",
-+>>>>>>> .their
- 	"miSave": "&&Salva",
- 	"miSaveAs": "Salva con nome...",
- 	"miSaveAll": "Salva &&tutto",
-@@ -189,5 +198,11 @@
- 	"miDownloadingUpdate": "Download dell'aggiornamento...",
- 	"miInstallUpdate": "Installa aggiornamento...",
- 	"miInstallingUpdate": "Installazione dell'aggiornamento...",
-+<<<<<<< .our
- 	"miRestartToUpdate": "Riavvia per aggiornare..."
-+=======
-+	"miCheckForUpdates": "Verifica disponibilità aggiornamenti...",
-+	"aboutDetail": "\nVersione {0}\nCommit {1}\nData {2}\nShell {3}\nRenderer {4}\nNodo {5}\nArchitettura {6}",
-+	"okButton": "OK"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c16eee44314db519bc5870d2fafc304af7600a43 i18n/ita/src/vs/code/electron-main/windows.i18n.json
-  our    100644 250ae14629598106ced719e4c761822b45303be0 i18n/ita/src/vs/code/electron-main/windows.i18n.json
-  their  100644 68df6f8687824d79f8aa0a5ea9b548b5c8b83ff2 i18n/ita/src/vs/code/electron-main/windows.i18n.json
-@@ -9,15 +9,30 @@
- 	"ok": "OK",
- 	"pathNotExistTitle": "Il percorso non esiste",
- 	"pathNotExistDetail": "Il percorso '{0}' sembra non esistere più sul disco.",
-+<<<<<<< .our
- 	"reopen": "&& Riaprire",
- 	"wait": "&&Continua ad attendere",
- 	"close": "&&Chiudi",
-+=======
-+	"openWorkspace": "&&Apri",
-+	"openWorkspaceTitle": "Apri area di lavoro",
-+	"save": "&&Salva",
-+	"doNotSave": "&&Non salvare",
-+	"cancel": "Annulla",
-+	"saveWorkspaceMessage": "Salvare la configurazione dell'area di lavoro in un file?",
-+	"saveWorkspaceDetail": "Salvare l'area di lavoro se si prevede di aprirla di nuovo.",
-+	"saveWorkspace": "Salva area di lavoro",
-+	"reopen": "Riapri",
-+	"wait": "Continua ad attendere",
-+	"close": "Chiudi",
-+>>>>>>> .their
- 	"appStalled": "La finestra non risponde",
- 	"appStalledDetail": "È possibile riaprire la finestra, chiuderla oppure attendere.",
- 	"appCrashed": "Si è verificato un arresto anomalo della finestra",
- 	"appCrashedDetail": "Ci scusiamo per l'inconveniente. Per riprendere dal punto in cui si è verificata l'interruzione, riaprire la finestra.",
- 	"open": "Apri",
- 	"openFolder": "Apri cartella",
-+<<<<<<< .our
- 	"openFile": "Apri file",
- 	"workspaceOpenedMessage": "Non è possibile salvare l'area di lavoro '{0}'",
- 	"workspaceOpenedDetail": "L'area di lavoro è già aperta in un'altra finestra. Chiudere tale finestra prima di riprovare.",
-@@ -29,4 +44,7 @@
- 	"saveWorkspaceMessage": "Salvare la configurazione dell'area di lavoro in un file?",
- 	"saveWorkspaceDetail": "Salvare l'area di lavoro se si prevede di aprirla di nuovo.",
- 	"saveWorkspace": "Salva area di lavoro"
-+=======
-+	"openFile": "Apri file"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ec56b9229e6a5bc84b8bd609fa288c4f6d8da462 i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 f91d8d15e9f7c53e3b2a0166aab270c9bf1f772e i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 304d2a8f93f9e5d24ed3b739ef5caa974a79e320 i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -26,11 +26,17 @@
- 	"detectIndentation": "All'apertura di un file, `editor.tabSize` e `editor.insertSpaces` verranno rilevati in base al contenuto del file.",
- 	"roundedSelection": "Controlla se gli angoli delle selezioni sono arrotondati",
- 	"scrollBeyondLastLine": "Controlla se l'editor scorrerà oltre l'ultima riga",
-+<<<<<<< .our
- 	"scrollBeyondLastColumn": "Controlla il numero di caratteri aggiuntivi oltre il quale l'editor scorrerà orizzontalmente",
- 	"smoothScrolling": "Controlla se per lo scorrimento dell'editor verrà usata un'animazione.",
- 	"minimap.enabled": "Controlla se la mini mappa è visualizzata",
- 	"minimap.side": "Definisce il lato in cui eseguire il rendering della mini mappa.",
- 	"minimap.showSlider": "Controlla se lo slider della mini mappa viene nascosto automaticamente.",
-+=======
-+	"smoothScrolling": "Controlla se per lo scorrimento dell'editor verrà usata un'animazione.",
-+	"minimap.enabled": "Controlla se la mini mappa è visualizzata",
-+	"minimap.showSlider": "Controlla se il dispositivo di scorrimento della mini mappa viene nascosto automaticamente. I valori possibili sono 'always' e 'mouseover'",
-+>>>>>>> .their
- 	"minimap.renderCharacters": "Esegue il rendering dei caratteri effettivi di una riga (in contrapposizione ai blocchi colore)",
- 	"minimap.maxColumn": "Limita la larghezza della mini mappa in modo da eseguire il rendering al massimo di un certo numero di colonne",
- 	"find.seedSearchStringFromSelection": "Controlla se inizializzare la stringa di ricerca nel Widget Trova con il testo selezionato nell'editor",
-@@ -106,11 +112,14 @@
- 	"accessibilitySupport": "Controlla se l'editor deve essere eseguito in una modalità ottimizzata per le utilità per la lettura dello schermo.",
- 	"links": "Controlla se l'editor deve individuare i collegamenti e renderli cliccabili",
- 	"colorDecorators": "Controlla se l'editor deve eseguire il rendering del selettore di colore e degli elementi Decorator di tipo colore inline.",
-+<<<<<<< .our
- 	"codeActions": "Abilita il codice azione lightbulb",
- 	"codeActionsOnSave.organizeImports": "Eseguire l'organizzazione degli Imports durante il salvataggio?",
- 	"codeActionsOnSave": "Tipi di azione codice da eseguire durante il salvataggio.",
- 	"codeActionsOnSaveTimeout": "Timeout per le azioni codice eseguite durante il salvataggio.",
- 	"selectionClipboard": "Controlla se gli appunti primari di Linux devono essere supportati.",
-+=======
-+>>>>>>> .their
- 	"sideBySide": "Controlla se l'editor diff mostra le differenze affiancate o incorporate",
- 	"ignoreTrimWhitespace": "Controlla se l'editor diff mostra come differenze le modifiche relative a spazi vuoti iniziali e finali",
- 	"largeFileOptimizations": "Gestione speciale dei file di grandi dimensioni per disabilitare alcune funzionalità che fanno un uso intensivo della memoria.",
-changed in both
-  base   100644 9b92b52f5c52e00dcf069e2652674467682d5677 i18n/ita/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 047668b002c0125f22b3c77979675bee2ddbe88f i18n/ita/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 492a995ee0201ed228a62d38e9fdc522be96d63b i18n/ita/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -28,12 +28,16 @@
- 	"errorBorder": "Colore del bordo degli squiggle di errore nell'editor.",
- 	"warningForeground": "Colore primo piano degli squiggle di avviso nell'editor",
- 	"warningBorder": "Colore del bordo degli squggle di avviso nell'editor.",
-+<<<<<<< .our
- 	"infoForeground": "Colore primo piano degli squiggle di informazione nell'editor",
- 	"infoBorder": "Colore del bordo degli squiggle di informazione nell'editor",
- 	"hintForeground": "Colore primo piano degli squiggle di suggerimento nell'editor.",
- 	"hintBorder": "Colore del bordo degli squiggle di suggerimento nell'editor.",
- 	"unnecessaryForeground": "Colore primo piano del codice non necessario nell'editor.",
- 	"overviewRulerRangeHighlight": "Colore del marcatore righello panoramica per evidenziazione intervalli. Il colore non deve essere opaco per non nascondere decorazioni sottostanti.",
-+=======
-+	"overviewRulerRangeHighlight": "Colore del marcatore del righello delle annotazioni per le evidenziazioni degli intervalli.",
-+>>>>>>> .their
- 	"overviewRuleError": "Colore del marcatore del righello delle annotazioni per gli errori.",
- 	"overviewRuleWarning": "Colore del marcatore del righello delle annotazioni per gli avvisi.",
- 	"overviewRuleInfo": "Colore del marcatore del righello delle annotazioni per i messaggi di tipo informativo."
-changed in both
-  base   100644 acd2bdb447c6f8eb7c4ddfba5d02209fc3f5b6d1 i18n/ita/src/vs/editor/contrib/find/common/findController.i18n.json
-  our    100644 753c08a072abf07ee50bf0b788eff38c641f8761 i18n/ita/src/vs/editor/contrib/find/common/findController.i18n.json
-  their  100644 0b6e1248aab60b64c0c8f7ae39434e21c71869f8 i18n/ita/src/vs/editor/contrib/find/common/findController.i18n.json
-@@ -10,6 +10,15 @@
- 	"nextSelectionMatchFindAction": "Trova selezione successiva",
- 	"previousSelectionMatchFindAction": "Trova selezione precedente",
- 	"startReplace": "Sostituisci",
-+<<<<<<< .our
-+=======
-+	"addSelectionToNextFindMatch": "Aggiungi selezione a risultato ricerca successivo",
-+	"addSelectionToPreviousFindMatch": "Aggiungi selezione a risultato ricerca precedente",
-+	"moveSelectionToNextFindMatch": "Sposta ultima selezione a risultato ricerca successivo",
-+	"moveSelectionToPreviousFindMatch": "Sposta ultima selezione a risultato ricerca precedente",
-+	"selectAllOccurrencesOfFindMatch": "Seleziona tutte le occorrenze del risultato ricerca",
-+	"changeAll.label": "Cambia tutte le occorrenze",
-+>>>>>>> .their
- 	"showNextFindTermAction": "Mostra il termine di ricerca successivo",
- 	"showPreviousFindTermAction": "Mostra il termine di ricerca precedente"
- }
-\ No newline at end of file
-changed in both
-  base   100644 7aa67ed2c811fb490f658c94eb8c7ec7ccfbe947 i18n/ita/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
-  our    100644 d57627a559aaf9ec3945b4e01975197a974efca5 i18n/ita/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
-  their  100644 be205f42033048284d7135e483f29f6156dcbddf i18n/ita/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
-@@ -7,7 +7,11 @@
- 	"wordHighlight": "Colore di sfondo di un simbolo durante l'accesso in lettura, ad esempio durante la lettura di una variabile.",
- 	"wordHighlightStrong": "Colore di sfondo di un simbolo durante l'accesso in scrittura, ad esempio durante la scrittura in una variabile.",
- 	"overviewRulerWordHighlightForeground": "Colore del marcatore del righello delle annotazioni per le evidenziazioni dei simboli.",
-+<<<<<<< .our
- 	"overviewRulerWordHighlightStrongForeground": "Colore del marcatore del righello delle annotazioni per le evidenziazioni dei simboli di accesso in scrittura.",
- 	"wordHighlight.next.label": "Vai al prossimo simbolo evidenziato",
- 	"wordHighlight.previous.label": "Vai al precedente simbolo evidenziato"
-+=======
-+	"overviewRulerWordHighlightStrongForeground": "Colore del marcatore del righello delle annotazioni per le evidenziazioni dei simboli di accesso in scrittura."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e9a4ecff7e02ea4ca1179e0b14d898e4df53f7b5 i18n/ita/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 9db983246eacb0b2b4bfd0f1c8d91ee5c10e2e9a i18n/ita/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 d0294d7c7cdac8fa61d167b275b9c352c235c54f i18n/ita/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,7 +10,14 @@
- 	"diff": "Confronta due file tra loro.",
- 	"add": "Aggiunge la cartella o le cartelle all'ultima finestra attiva.",
- 	"goto": "Apre un file nel percorso alla posizione specificata di riga e carattere.",
-+<<<<<<< .our
- 	"newWindow": "Forza l'apertura di una nuova finestra.",
-+=======
-+	"locale": "Impostazioni locali da usare, ad esempio en-US o it-IT.",
-+	"newWindow": "Forza una nuova istanza di Code.",
-+	"performance": "Eseguire l'avvio con il comando 'Developer: Startup Performance' abilitato.",
-+	"prof-startup": "Esegui il profiler della CPU durante l'avvio",
-+>>>>>>> .their
- 	"reuseWindow": "Forza l'apertura di un file o di una cartella nell'ultima finestra attiva.",
- 	"wait": "Attendere la chiusura dei file prima della restituzione.",
- 	"locale": "Impostazioni locali da usare, ad esempio en-US o it-IT.",
-added in both
-  our    100644 3c84f247f78f92235b3169c107b66ba33125cdff i18n/ita/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
-  their  100644 88108cb9b116cc807ec8aedf3705d3370da3fb25 i18n/ita/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"contributes.color": "Aggiunge colori tematizzabili alle estensioni definite",
- 	"contributes.color.id": "Identificatore del colore che supporta i temi",
- 	"contributes.color.id.format": "Gli identificativi devono rispettare il formato aa[.bb]*",
-changed in both
-  base   100644 2abb6be7b978e717477dfff4a0253d63d6aed19a i18n/ita/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 db040b20535e5fbe6df69ea748baeb36651c5732 i18n/ita/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 8e09cda877c43fa55f589942c4c432d392244b1c i18n/ita/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -96,6 +96,11 @@
- 	"overviewRulerCurrentContentForeground": "Colore primo piano righello panoramica attuale per i conflitti di merge in linea.",
- 	"overviewRulerIncomingContentForeground": "Colore primo piano del righello panoramica modifiche in arrivo per i conflitti di merge in linea.",
- 	"overviewRulerCommonContentForeground": "Colore primo piano righello panoramica dell'antenato comune per i conflitti di merge in linea.",
-+<<<<<<< .our
- 	"overviewRulerFindMatchForeground": "Colore del marcatore righello panoramica per trovare corrispondenze. Il colore non deve essere opaco per non nascondere decorazioni sottostanti.",
- 	"overviewRulerSelectionHighlightForeground": "Colore del marcatore righello panoramica per evidenziazione selezioni. Il colore non deve essere opaco per non nascondere decorazioni sottostanti."
-+=======
-+	"overviewRulerFindMatchForeground": "Colore del marcatore del righello delle annotazioni per le corrispondenze della ricerca.",
-+	"overviewRulerSelectionHighlightForeground": "Colore del marcatore del righello delle annotazioni per le evidenziazioni delle selezioni."
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 df96dd6ffbe702fd7fe5fbf7fb9687ce1eb2d662 i18n/ita/src/vs/platform/workspaces/common/workspaces.i18n.json
-  their  100644 4bf035be676f2704ea5a4fc38b7e9407e253b88a i18n/ita/src/vs/platform/workspaces/common/workspaces.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"codeWorkspace": "Area di lavoro del codice",
- 	"untitledWorkspace": "Senza titolo (Area di lavoro)",
- 	"workspaceNameVerbose": "{0} (Area di lavoro)",
-added in both
-  our    100644 da45d7e41c83b4de073af9d6c70cf1ce2581a578 i18n/ita/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
-  their  100644 be99767feaa707b8961b81016d585a04e91f3c3f i18n/ita/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,4 +11,16 @@
- 	"failedDep1": "L'attivazione dell'estensione '{1}' non è riuscita. Motivo: non è stato possibile attivare la dipendenza '{0}'.",
- 	"failedDep2": "L'attivazione dell'estensione '{0}' non è riuscita. Motivo: sono presenti più di 10 livelli di dipendenze (molto probabilmente un ciclo di dipendenze).",
- 	"activationError": "L'attivazione dell'estensione '{0}' non è riuscita: {1}."
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"unknownDep": "L'attivazione dell'estensione `{1}` non è riuscita. Motivo: la dipendenza `{0}` è sconosciuta.",
-+	"failedDep1": "L'attivazione dell'estensione `{1}` non è riuscita. Motivo: non è stato possibile attivare la dipendenza `{0}`.",
-+	"failedDep2": "L'attivazione dell'estensione `{0}` non è riuscita. Motivo: sono presenti più di 10 livelli di dipendenze (molto probabilmente un ciclo di dipendenze).",
-+	"activationError": "L'attivazione dell'estensione `{0}` non è riuscita: {1}."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 0375c531a5b488902d70ee2ee25d469f302d74f2 i18n/ita/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 967a9460fbe454ea199d54b4639f97929c5854cd i18n/ita/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 86e9486ae88f6898f0b4e67ee0908459e60d1441 i18n/ita/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -9,6 +9,7 @@
- 	"openFile": "Apri file...",
- 	"openFolder": "Apri cartella...",
- 	"openFileFolder": "Apri...",
-+<<<<<<< .our
- 	"globalRemoveFolderFromWorkspace": "Rimuovi cartella dall'area di lavoro...",
- 	"saveWorkspaceAsAction": "Salva area di lavoro come...",
- 	"save": "&&Salva",
-@@ -16,4 +17,19 @@
- 	"openWorkspaceAction": "Apri area di lavoro...",
- 	"openWorkspaceConfigFile": "Apri file di configurazione dell'area di lavoro",
- 	"duplicateWorkspaceInNewWindow": "Duplica area di lavoro nella nuova finestra"
-+=======
-+	"addFolderToWorkspace": "Aggiungi cartella all'area di lavoro...",
-+	"add": "&&Aggiungi",
-+	"addFolderToWorkspaceTitle": "Aggiungi cartella all'area di lavoro",
-+	"newWorkspace": "Nuova area di lavoro...",
-+	"select": "&&Seleziona",
-+	"selectWorkspace": "Seleziona cartelle per l'area di lavoro",
-+	"removeFolderFromWorkspace": "Rimuovi cartella dall'area di lavoro",
-+	"saveWorkspaceAsAction": "Salva area di lavoro come...",
-+	"saveEmptyWorkspaceNotSupported": "Aprire prima un'area di lavoro da salvare.",
-+	"save": "&&Salva",
-+	"saveWorkspace": "Salva area di lavoro",
-+	"openWorkspaceAction": "Apri area di lavoro...",
-+	"openWorkspaceConfigFile": "Apri file di configurazione dell'area di lavoro"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ad121771c6a44313ea205a217713874a62d1e732 i18n/ita/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 52332d26b607badcbfc6c1f6cb20390d01164f46 i18n/ita/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 34ec4817bae4966455cf5b020e3e55e33505f43e i18n/ita/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 3ba6e23918d44e7a5b3339d1fab97d86ab3415f5 i18n/ita/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-  our    100644 f27bb31505eb3962ff3d4e355a3108ad6a5fb52c i18n/ita/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-  their  100644 69d8f45b5e69ab79fd1d9c2cf98400e671c3b2c6 i18n/ita/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,9 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"compositePart.hideSideBarLabel": "Nascondi barra laterale",
-+>>>>>>> .their
- 	"focusSideBar": "Sposta lo stato attivo nella barra laterale",
- 	"viewCategory": "Visualizza"
- }
-\ No newline at end of file
-changed in both
-  base   100644 94f6d56ff31d1a24e80dce299dfc00189c548124 i18n/ita/src/vs/workbench/common/theme.i18n.json
-  our    100644 35f6e5209eb686bd26e13c1a8f96b6d2fe49fc8a i18n/ita/src/vs/workbench/common/theme.i18n.json
-  their  100644 11a31568dcadd27c581ca49a72aa5a26d1f87e0c i18n/ita/src/vs/workbench/common/theme.i18n.json
-@@ -11,12 +11,17 @@
- 	"tabHoverBackground": "Colore di sfondo al passaggio del mouse sulle schede. Le schede sono i contenitori degli editor nell'area degli editor. È possibile aprire più schede in un gruppo di editor e possono esistere più gruppi di editor.",
- 	"tabUnfocusedHoverBackground": "Colore di sfondo al passaggio del mouse sulle schede in un gruppo non attivo. Le schede sono i contenitori degli editor nell'area degli editor. È possibile aprire più schede in un gruppo di editor e possono esistere più gruppi di editor.",
- 	"tabBorder": "Bordo per separare le schede l'una dall'altra. Le schede sono i contenitori degli editor nell'area degli editor. È possibile aprire più schede in un gruppo di editor e possono esistere più gruppi di editor.",
-+<<<<<<< .our
- 	"tabActiveBorder": "Bordo nella parte inferiore di una scheda attiva. Le schede sono i contenitori degli editor nell'area degli editor. È possibile aprire più schede in un gruppo di editor e possono esistere più gruppi di editor.",
- 	"tabActiveBorderTop": "Bordo nella parte superiore di una scheda attiva. Le schede sono i contenitori degli editor nell'area degli editor. È possibile aprire più schede in un gruppo di editor e possono esistere più gruppi di editor.",
- 	"tabActiveUnfocusedBorder": "Bordo nella parte inferiore di una scheda attiva in un gruppo con stato non attivo. Le schede sono i contenitori degli editor nell'area degli editor. È possibile aprire più schede in un gruppo di editor e possono esistere più gruppi di editor.",
- 	"tabActiveUnfocusedBorderTop": "Bordo nella parte superiore di una scheda attiva in un gruppo con stato non attivo. Le schede sono i contenitori degli editor nell'area degli editor. È possibile aprire più schede in un gruppo di editor e possono esistere più gruppi di editor.",
- 	"tabHoverBorder": "Bordo da utilizzare per evidenziare la scheda al passaggio del mouse. Le schede sono i contenitori degli editor nell'area degli editor. È possibile aprire più schede in un gruppo di editor e possono esistere più gruppi di editor.",
- 	"tabUnfocusedHoverBorder": "Bordo da utilizzare per evidenziare la scheda non attiva al passaggio del mouse. Le schede sono i contenitori degli editor nell'area degli editor. È possibile aprire più schede in un gruppo di editor e possono esistere più gruppi di editor.",
-+=======
-+	"tabActiveBorder": "Bordo per evidenziare le schede attive. Le schede sono i contenitori degli editor nell'area degli editor. È possibile aprire più schede in un gruppo di editor e possono esistere più gruppi di editor.",
-+	"tabActiveUnfocusedBorder": "Bordo per evidenziare le schede attive in un gruppo con stato non attivo. Le schede sono i contenitori degli editor nell'area degli editor. È possibile aprire più schede in un gruppo di editor e possono esistere più gruppi di editor.",
-+>>>>>>> .their
- 	"tabActiveForeground": "Colore di primo piano delle schede attive in un gruppo attivo. Le schede sono i contenitori degli editor nell'area degli editor. È possibile aprire più schede in un gruppo di editor e possono esistere più gruppi di editor.",
- 	"tabInactiveForeground": "Colore di primo piano delle schede inattive in un gruppo attivo. Le schede sono i contenitori degli editor nell'area degli editor. È possibile aprire più schede in un gruppo di editor e possono esistere più gruppi di editor.",
- 	"tabUnfocusedActiveForeground": "Colore primo piano delle schede attive in un gruppo con stato non attivo. Le schede sono i contenitori degli editor nell'area degli editor. È possibile aprire più schede in un gruppo di editor e possono esistere più gruppi di editor.",
-@@ -32,7 +37,10 @@
- 	"panelActiveTitleForeground": "Colore del titolo del pannello attivo. I pannelli sono visualizzati sotto l'area degli editor e contengono visualizzazioni quali quella di output e quella del terminale integrato.",
- 	"panelInactiveTitleForeground": "Colore del titolo del pannello inattivo. I pannelli sono visualizzati sotto l'area degli editor e contengono visualizzazioni quali quella di output e quella del terminale integrato.",
- 	"panelActiveTitleBorder": "Colore del bordo del titolo del pannello attivo. I pannelli sono visualizzati sotto l'area degli editor e contengono visualizzazioni quali quella di output e del terminale integrato.",
-+<<<<<<< .our
- 	"panelDragAndDropBackground": "Colore di feedback trascinamento per il titolo del pannello. Il colore dovrebbe avere trasparenza in modo che le voci del pannello possono ancora trasparire. I pannelli vengono visualizzati sotto l'area dell'editor e contengono viste come quella di output e del terminale integrato.",
-+=======
-+>>>>>>> .their
- 	"statusBarForeground": "Colore primo piano quando viene aperta un'area di lavoro. La barra di stato è visualizzata nella parte inferiore della finestra.",
- 	"statusBarNoFolderForeground": "Colore primo piano quando non ci sono cartelle aperte. La barra di stato è visualizzata nella parte inferiore della finestra.",
- 	"statusBarBackground": "Colore di sfondo della barra di stato quando viene aperta un'area di lavoro. La barra di stato è visualizzata nella parte inferiore della finestra.",
-@@ -61,6 +69,7 @@
- 	"titleBarActiveBackground": "Colore di sfondo della barra di titolo quando la finestra è attiva. Si noti che questo colore è attualmente solo supportati su macOS.",
- 	"titleBarInactiveBackground": "Colore di sfondo della barra del titolo quando la finestra è inattiva. Si noti che questo colore è attualmente supportato solo su macOS.",
- 	"titleBarBorder": "Colore del bordo della barra di stato. Si noti che questo colore è attualmente supportato solo su macOS.",
-+<<<<<<< .our
- 	"notificationCenterBorder": "Colore del bordo del centro notifiche. Le notifiche scorrono dalla parte inferiore destra della finestra.",
- 	"notificationToastBorder": "Colore del bordo dell'avviso popup di notifica. Le notifiche scorrono dalla parte inferiore destra della finestra.",
- 	"notificationsForeground": "Colore primo piano delle notifiche. Le notifiche scorrono dalla parte inferiore destra della finestra.",
-@@ -69,4 +78,17 @@
- 	"notificationCenterHeaderForeground": "Colore primo piano dell'intestazione del centro notifiche. Le notifiche scorrono dalla parte inferiore destra della finestra.",
- 	"notificationCenterHeaderBackground": "Colore di sfondo dell'intestazione del centro notifiche. Le notifiche scorrono dalla parte inferiore destra della finestra.",
- 	"notificationsBorder": "Colore del bordo che separa le notifiche da altre notifiche nel centro notifiche. Le notifiche scorrono dalla parte inferiore destra della finestra."
-+=======
-+	"notificationsForeground": "Colore primo piano delle notifiche. Le notifiche scorrono dalla parte superiore della finestra.",
-+	"notificationsBackground": "Colore di sfondo delle notifiche. Le notifiche scorrono dalla parte superiore della finestra.",
-+	"notificationsButtonBackground": "Colore di sfondo del pulsante delle notifiche. Le notifiche scorrono dalla parte superiore della finestra.",
-+	"notificationsButtonHoverBackground": "Colore di sfondo del pulsante delle notifiche al passaggio del mouse. Le notifiche scorrono dalla parte superiore della finestra.",
-+	"notificationsButtonForeground": "Colore primo piano del pulsante delle notifiche. Le notifiche scorrono dalla parte superiore della finestra.",
-+	"notificationsInfoBackground": "Colore di sfondo delle notifiche informative. Le notifiche scorrono dalla parte superiore della finestra.",
-+	"notificationsInfoForeground": "Colore primo piano delle notifiche informative. Le notifiche scorrono dalla parte superiore della finestra.",
-+	"notificationsWarningBackground": "Colore di sfondo delle notifiche di avviso. Le notifiche scorrono dalla parte superiore della finestra.",
-+	"notificationsWarningForeground": "Colore primo piano delle notifiche di avviso. Le notifiche scorrono dalla parte superiore della finestra.",
-+	"notificationsErrorBackground": "Colore di sfondo delle notifiche di errore. Le notifiche scorrono dalla parte superiore della finestra.",
-+	"notificationsErrorForeground": "Colore primo piano delle notifiche di errore. Le notifiche scorrono dalla parte superiore della finestra."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ce7aaf644a53c9cc9154e313aa2eb37bea55d460 i18n/ita/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 9737d645d67a50d571dc86669b68ed740de20eba i18n/ita/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 a79d647bc84eaad5ce6eb3d2e29a016c01b00c08 i18n/ita/src/vs/workbench/electron-browser/actions.i18n.json
-changed in both
-  base   100644 310e156f9037debf76cdfb22f7fdaff2963cd69f i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 16fec1a5d98f225249a95297ad06c45ba75efafc i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 59acb53f222b5dbb3bd1b9a82ed342bf7933bc00 i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,6 +35,7 @@
- 	"panelDefaultLocation": "Controlla la posizione predefinita del pannello. Può essere mostrato nella parte inferiore o a destra del banco di lavoro.",
- 	"statusBarVisibility": "Controlla la visibilità della barra di stato nella parte inferiore del workbench.",
- 	"activityBarVisibility": "Controlla la visibilità della barra attività nel workbench.",
-+<<<<<<< .our
- 	"viewVisibility": "Controlla la visibilità delle azioni dell'intestazione della visualizzazione. Le azioni dell'intestazione della visualizzazione possono essere sempre visibili oppure visibili solo quando lo stato attivo è spostato sulla visualizzazione o si passa con il puntatore sulla visualizzazione.",
- 	"fontAliasing": "Controlla il metodo di aliasing dei caratteri nell'area di lavoro.\n- default: anti-aliasing dei caratteri a livello di sub-pixel. Nella maggior parte delle visualizzazioni non retina consentirà di ottenere un testo con il massimo contrasto.\n- antialiased: anti-aliasing dei caratteri a livello di pixel, invece che a livello di sub-pixel. Consente di visualizzare i caratteri più chiari.\n- none: disabilita l'anti-aliasing dei caratteri. Il testo verrà visualizzato con contorni irregolari.\n- auto: applica automaticamente `default` o `antialiased` in base al valore DPI degli schermi.",
- 	"workbench.fontAliasing.default": "Anti-aliasing dei caratteri a livello di sub-pixel. Nella maggior parte delle visualizzazioni non retina consentirà di ottenere un testo con il massimo contrasto.",
-@@ -43,6 +44,15 @@
- 	"workbench.fontAliasing.auto": "Applica automaticamente `default` o `antialiased` in base al valore DPI degli schermi.",
- 	"enableNaturalLanguageSettingsSearch": "Controlla se abilitare la modalità di ricerca in linguaggio naturale per le impostazioni.",
- 	"windowConfigurationTitle": "Finestra",
-+=======
-+	"closeOnFileDelete": "Controlla se gli editor che visualizzano un file devono chiudersi automaticamente quando il file viene eliminato o rinominato da un altro processo. Se si disabilita questa opzione, in una simile circostanza l'editor verrà aperto e i file risulteranno modificati ma non salvati. Nota: se si elimina il file dall'interno dell'applicazione, l'editor verrà sempre chiuso e i file modificati ma non salvati non verranno mai chiusi allo scopo di salvaguardare i dati.",
-+	"fontAliasing": "Controlla il metodo di aliasing dei caratteri nell'area di lavoro.\n- impostazione predefinita: anti-aliasing dei caratteri a livello di sub-pixel. Nella maggior parte delle visualizzazioni non retina consentirà di ottenere un testo con il massimo contrasto.\n- anti-aliasing: anti-aliasing dei caratteri a livello di pixel, invece che a livello di sub-pixel. Consente di visualizzare i caratteri più chiari.\n- nessuno: disabilita l'anti-aliasing dei caratteri. Il testo verrà visualizzato con contorni irregolari.",
-+	"workbench.fontAliasing.default": "Anti-aliasing dei caratteri a livello di sub-pixel. Nella maggior parte delle visualizzazioni non retina consentirà di ottenere un testo con il massimo contrasto.",
-+	"workbench.fontAliasing.antialiased": "Anti-aliasing dei caratteri a livello di pixel, invece che a livello di sub-pixel. Consente di visualizzare i caratteri più chiari.",
-+	"workbench.fontAliasing.none": "Disabilita l'anti-aliasing dei caratteri. Il testo verrà visualizzato con contorni irregolari. ",
-+	"swipeToNavigate": "Scorrere orizzontalmente con tre dita per spostarsi tra i file aperti.",
-+	"workbenchConfigurationTitle": "Area di lavoro",
-+>>>>>>> .their
- 	"window.openFilesInNewWindow.on": "I file verranno aperti in una nuova finestra",
- 	"window.openFilesInNewWindow.off": "I file verranno aperti nella finestra con la cartella dei file aperta o nell'ultima finestra attiva",
- 	"window.openFilesInNewWindow.defaultMac": "I file verranno aperti nella finestra con la cartella dei file aperta o nell'ultima finestra attiva a meno che non vengano aperti tramite il pannello Dock o da Finder",
-changed in both
-  base   100644 424eb5bfbe5e2bbdb12572d48ee7a9652feebbda i18n/ita/src/vs/workbench/electron-browser/window.i18n.json
-  our    100644 44890b35904935df91f62f43dcb119e76f1ea136 i18n/ita/src/vs/workbench/electron-browser/window.i18n.json
-  their  100644 8c2277fae1157a1ae00b69f1dfac64cdb0271c16 i18n/ita/src/vs/workbench/electron-browser/window.i18n.json
-@@ -11,6 +11,10 @@
- 	"cut": "Taglia",
- 	"copy": "Copia",
- 	"paste": "Incolla",
-+<<<<<<< .our
- 	"selectAll": "Seleziona tutto",
- 	"runningAsRoot": "Non è consigliabile eseguire {0} come utente root."
-+=======
-+	"selectAll": "Seleziona tutto"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 38bfd704a5cb8a232faae127e62959916f0585ab i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
-  their  100644 bfbba165ded880acda72b9a1192156efeb60b50f i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"toggleMinimap": "Visualizza: Attiva/Disattiva mini mappa"
- }
-\ No newline at end of file
-changed in both
-  base   100644 7e765bb3a32674f9d9fb33fea3d0d09b34d2f001 i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
-  our    100644 4a9047f95e28150453f4dbbb7e81fea902228205 i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
-  their  100644 cb0ebbb30fd9e0ed2d962f326c83af58f8b989ae i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"toggleRenderControlCharacters": "Visualizza: Attiva/Disattiva caratteri di controllo"
- }
-\ No newline at end of file
-changed in both
-  base   100644 b5457f45cbd65498e2b25f4f0ce6ba88fe33dd48 i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
-  our    100644 11ec6af67eb87bff4bf4d937485a5be7d170ae21 i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
-  their  100644 b874a5cc0578e869b3e1d897b75cdf092361f4d5 i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"toggleRenderWhitespace": "Visualizza: Attiva/Disattiva rendering spazi vuoti"
- }
-\ No newline at end of file
-changed in both
-  base   100644 e9aa41595293a9979a315b1c0221357f8693c4e7 i18n/ita/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  our    100644 f41f96b7c06ef68c16637b9d036583a234592b6c i18n/ita/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  their  100644 01c6c92eb4a8eb3f8e525b4d988818c32f65cb0c i18n/ita/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-changed in both
-  base   100644 c13997bfc292d9bff65fb64110c83127e3e7e65b i18n/ita/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  our    100644 8560eb8087005f6b67c1d2ea250d63444711322a i18n/ita/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  their  100644 cfdee9e4ec21b8992ede41cfc09a5ba4d4ea546e i18n/ita/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-changed in both
-  base   100644 d116abf482013598248c17ace43c906bcc87f3bf i18n/ita/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  our    100644 3a9023e46622e84a42ee4a7ab34aa864b1ec0e8e i18n/ita/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  their  100644 b4cf1e3c59d44111184a218770063f36bd1d13a2 i18n/ita/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-@@ -8,6 +8,23 @@
- 	],
- 	"debugAdapterBinNotFound": "Il file eseguibile '{0}' dell'adattatore di debug non esiste.",
- 	"debugAdapterCannotDetermineExecutable": "Non è possibile determinare il file eseguibile per l'adattatore di debug '{0}'.",
-+<<<<<<< .our
- 	"unableToLaunchDebugAdapter": "Non è possibile avviare l'adattatore di debug da '{0}'.",
- 	"unableToLaunchDebugAdapterNoArgs": "Non è possibile avviare l'adattatore di debug."
-+=======
-+	"launch.config.comment1": "Usare IntelliSense per informazioni sui possibili attributi.",
-+	"launch.config.comment2": "Al passaggio del mouse vengono visualizzate le descrizioni degli attributi esistenti.",
-+	"launch.config.comment3": "Per ulteriori informazioni, visitare: {0}",
-+	"debugType": "Tipo di configurazione.",
-+	"debugTypeNotRecognised": "Il tipo di debug non è riconosciuto. Assicurarsi di avere un'estensione appropriata per il debug installata e che sia abilitata.",
-+	"node2NotSupported": "\"node2\" non è più supportato. In alternativa, usare \"node\" e impostare l'attributo \"protocol\" su \"inspector\".",
-+	"debugName": "Nome della configurazione. Viene visualizzato nel menu a discesa della configurazione di avvio.",
-+	"debugRequest": "Tipo della richiesta di configurazione. Può essere \"launch\" o \"attach\".",
-+	"debugServer": "Solo per lo sviluppo dell'estensione di debug: se si specifica una porta, Visual Studio Code prova a connettersi a un adattatore di debug in esecuzione in modalità server",
-+	"debugPrelaunchTask": "Attività da eseguire prima dell'avvio della sessione di debug.",
-+	"debugWindowsConfiguration": "Attributi della configurazione di avvio specifici di Windows.",
-+	"debugOSXConfiguration": "Attributi della configurazione di avvio specifici di OS X.",
-+	"debugLinuxConfiguration": "Attributi della configurazione di avvio specifici di Linux.",
-+	"deprecatedVariables": "'env.', 'config.' e 'command.' sono deprecati. In alternativa, usare 'env:', 'config:' e 'command:'."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 adf7b3f404290e74c46bfea58335644aa063f088 i18n/ita/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  our    100644 2e6bc1e73d84675841055020e554bed2fb64eb7d i18n/ita/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  their  100644 1b150a45b5f94b4afe926f7593fd6e0077139c2c i18n/ita/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-changed in both
-  base   100644 2430ac5cd9b3b29fa37118750b6fe63a191687ba i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 8a9cb12815ff71703170d90088b67ed38f90d1c9 i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 f3e714c067763e40139908f3d2577c7e4b0ad4c1 i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-@@ -52,7 +52,14 @@
- 	"extensionInstalled": "L'estensione consigliata è già stata installata",
- 	"showRecommendedKeymapExtensionsShort": "Mappature tastiera",
- 	"showLanguageExtensionsShort": "Estensioni del linguaggio",
-+<<<<<<< .our
- 	"showAzureExtensionsShort": "Estensioni di Azure",
-+=======
-+	"showAzureExtensions": "Mostra estensioni di Azure",
-+	"showAzureExtensionsShort": "Estensioni di Azure",
-+	"configureWorkspaceRecommendedExtensions": "Configura estensioni consigliate (area di lavoro)",
-+	"ConfigureWorkspaceRecommendations.noWorkspace": "Gli elementi consigliati sono disponibili solo per una cartella dell'area di lavoro.",
-+>>>>>>> .their
- 	"OpenExtensionsFile.failed": "Non è possibile creare il file 'extensions.json' all'interno della cartella '.vscode' ({0}).",
- 	"configureWorkspaceRecommendedExtensions": "Configura estensioni consigliate (area di lavoro)",
- 	"configureWorkspaceFolderRecommendedExtensions": "Configura estensioni consigliate (cartella dell'area di lavoro)",
-changed in both
-  base   100644 ffdd66502955969b90340078de979da82d7b77ba i18n/ita/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  our    100644 7d23a38e70345906d2303122bbd907e2d0b21fb4 i18n/ita/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  their  100644 f1f608e17312725d64a33d5b9b776a9bbe2d3071 i18n/ita/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-@@ -69,7 +69,11 @@
- 	"invalidFileNameError": "Il nome **{0}** non è valido per un nome file o un nome di cartella. Scegliere un nome diverso.",
- 	"filePathTooLongError": "Con il nome **{0}** il percorso diventa troppo lungo. Scegliere un nome più breve.",
- 	"compareWithSaved": "Confronta file attivo con file salvato",
-+<<<<<<< .our
- 	"modifiedLabel": "{0} (su disco) ↔ {1}",
- 	"compareWithClipboard": "Confronta il file attivo con gli appunti",
- 	"clipboardComparisonLabel": "Appunti ↔ {0}"
-+=======
-+	"modifiedLabel": "{0} (su disco) ↔ {1}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8139ec4bf13634ecc5a8e71a5731b8961f21c6bf i18n/ita/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 1f2167be7be1086956a1ada80d0c4b23b8cc1195 i18n/ita/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 6daccd9cf8dcfa62c474b9eb3f300804c823d187 i18n/ita/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-@@ -40,14 +40,21 @@
- 	"dynamicHeight": "Controlla se l'altezza della sezione degli editor aperti deve essere adattata o meno dinamicamente al numero di elementi.",
- 	"autoReveal": "Controlla se Esplora risorse deve rivelare automaticamente e selezionare i file durante l'apertura.",
- 	"enableDragAndDrop": "Controlla se Esplora risorse deve consentire lo spostamento di file e cartelle tramite trascinamento della selezione.",
-+<<<<<<< .our
- 	"confirmDragAndDrop": "Controlla se Esplora risorse deve chiedere conferma prima di spostare file e cartelle tramite trascinamento della selezione.",
- 	"confirmDelete": "Controlla se Esplora risorse deve chiedere una conferma quando si elimina file tramite il cestino.",
-+=======
-+>>>>>>> .their
- 	"sortOrder.default": "I file e le cartelle vengono ordinati in ordine alfabetico in base al nome. Le cartelle vengono visualizzate prima dei file.",
- 	"sortOrder.mixed": "I file e le cartelle vengono ordinati ordine alfabetico in base al nome, in un unico elenco ordinato.",
- 	"sortOrder.filesFirst": "I file e le cartelle vengono ordinati in ordine alfabetico in base al nome. I file vengono visualizzati prima delle cartelle.",
- 	"sortOrder.type": "I file e le cartelle vengono ordinati in ordine alfabetico in base all'estensione. Le cartelle vengono visualizzate prima dei file.",
- 	"sortOrder.modified": "I file e le cartelle vengono ordinati in ordine decrescente in base alla data dell'ultima modifica. Le cartelle vengono visualizzate prima dei file.",
-+<<<<<<< .our
- 	"sortOrder": "Controlla l'ordinamento di file e cartelle in Esplora risorse. Oltre all'ordinamento predefinito, è possibile impostare l'ordine su 'mixed' (file e cartelle vengono ordinati insieme), 'type' (in base al tipo di file), 'modified' (in base alla data dell'ultima modifica) o 'filesFirst' (i file vengono ordinati prima delle cartelle).",
- 	"explorer.decorations.colors": "Controlli se decorazioni file dovrebbero usare colori.",
- 	"explorer.decorations.badges": "Controlli se decorazioni file devono utilizzare badge."
-+=======
-+	"sortOrder": "Controlla l'ordinamento di file e cartelle in Esplora risorse. Oltre all'ordinamento predefinito, è possibile impostare l'ordine su 'mixed' (file e cartelle vengono ordinati insieme), 'type' (in base al tipo di file), 'modified' (in base alla data dell'ultima modifica) o 'filesFirst' (i file vengono ordinati prima delle cartelle)."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 676f0815dcac6bb63ac0a387c2d196ef579e24e1 i18n/ita/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-  our    100644 49ebceb9611a7d647962c205cef0ff00c56d0e9d i18n/ita/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-  their  100644 7e522e82f6b51650e00ae618865457402413aaf9 i18n/ita/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-@@ -12,5 +12,6 @@
- 	"genericSaveError": "Non è stato possibile salvare '{0}': {1}",
- 	"staleSaveError": "Non è stato possibile salvare '{0}': il contenuto sul disco è più recente. Fare clic su **Confronta** per confrontare la versione corrente con quella sul disco.",
- 	"compareChanges": "Confronta",
--	"saveConflictDiffLabel": "{0} (su disco) ↔ {1} (in {2}) - Risolvere conflitto in fase di salvataggio"
-+	"saveConflictDiffLabel": "{0} (su disco) ↔ {1} (in {2}) - Risolvere conflitto in fase di salvataggio",
-+	"userGuide": "Usare le azioni della barra degli strumenti dell'editor a destra per **annullare** le modifiche o per **sovrascrivere** il contenuto su disco con le modifiche"
- }
-\ No newline at end of file
-changed in both
-  base   100644 1ae9f2df3912c07c8156014485857fa09537a091 i18n/ita/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
-  our    100644 e1c70dabccae4b8cfbfbf863685ff1f4e84a4271 i18n/ita/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
-  their  100644 dc14341c65fc2c901e60b06ad542ac16fdea1b74 i18n/ita/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
-@@ -10,9 +10,12 @@
- 	"dropFolder": "Aggiungere la cartella all'area di lavoro?",
- 	"addFolders": "&& Aggiungi cartelle",
- 	"addFolder": "&&Aggiungi cartella",
-+<<<<<<< .our
- 	"confirmMove": "Sei sicuro di voler spostare '{0}'?",
- 	"doNotAskAgain": "Non chiedermelo di nuovo",
- 	"moveButtonLabel": "&&Sposta",
-+=======
-+>>>>>>> .their
- 	"confirmOverwriteMessage": "'{0}' esiste già nella cartella di destinazione. Sostituirlo?",
- 	"irreversible": "Questa azione è irreversibile.",
- 	"replaceButtonLabel": "&&Sostituisci"
-changed in both
-  base   100644 12a31fb4c16d1bd5bf004f0683dc07c771544340 i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  our    100644 89b7fb9711b0bbc9cde43748de484037bba899db i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  their  100644 b5f2514add45ca6900c2f6fad9d302721a681e15 i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-@@ -14,6 +14,10 @@
- 	"openGlobalKeybindingsFile": "Apri file dei tasti di scelta rapida",
- 	"openWorkspaceSettings": "Apri impostazioni area di lavoro",
- 	"openFolderSettings": "Apri impostazioni cartella",
-+<<<<<<< .our
-+=======
-+	"pickFolder": "Seleziona cartella",
-+>>>>>>> .their
- 	"configureLanguageBasedSettings": "Configura impostazioni specifiche del linguaggio...",
- 	"languageDescriptionConfigured": "({0})",
- 	"pickLanguage": "Seleziona linguaggio"
-changed in both
-  base   100644 cb813bd7a4fde3650fd4db6a7f515ebc6840120e i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 acbb94499ddd6c7a425c0f53ca65dd8e6248c34e i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 237ebccfb3952a37235180c968a27630d349f3b2 i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -14,4 +15,19 @@
- 	"editTtile": "Modifica",
- 	"replaceDefaultValue": "Sostituisci nelle impostazioni",
- 	"copyDefaultValue": "Copia nelle impostazioni"
-+=======
-+	"emptyUserSettingsHeader": "Inserire le impostazioni qui per sovrascrivere quelle predefinite.",
-+	"errorInvalidConfiguration": "Impossibile scrivere nelle impostazioni. Correggere eventuali errori o avvisi nel file e riprovare.",
-+	"emptyWorkspaceSettingsHeader": "Inserire le impostazioni qui per sovrascrivere le impostazioni utente.",
-+	"emptyFolderSettingsHeader": "Inserire le impostazioni cartella qui per sovrascrivere quelle dell'area di lavoro.",
-+	"defaultFolderSettingsTitle": "Impostazioni cartella predefinite",
-+	"defaultSettingsTitle": "Impostazioni predefinite",
-+	"noSettingsFound": "Non sono state trovate impostazioni.",
-+	"editTtile": "Modifica",
-+	"replaceDefaultValue": "Sostituisci nelle impostazioni",
-+	"copyDefaultValue": "Copia nelle impostazioni",
-+	"unsupportedPHPExecutablePathSetting": "Questa deve essere un'impostazione utente. Per configurare PHP per l'area di lavoro, aprire un file PHP e fare clic su 'Percorso PHP' nella barra di stato.",
-+	"unsupportedWorkspaceSetting": "Questa deve essere un'impostazione utente.",
-+	"unsupportedWorkbenchSetting": "Non è possibile applicare ora questa impostazione. Verrà applicata direttamente all'apertura della cartella."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 dcc0829c0a62a843f06ba3c32379c61a13caa476 i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-  our    100644 5ef406c69728828b1062193472b0ce3832fa87d9 i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-  their  100644 6bdc47b5796d5f81b2089340871f57704f1be47e i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 fe346036c36b558ff4bb96cc47cf0bc0e91a4106 i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 0f87df191445fabeead61c7824e41af78aae9b70 i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -12,4 +13,13 @@
- 	"userSettings": "Impostazioni utente",
- 	"workspaceSettings": "Impostazioni area di lavoro",
- 	"folderSettings": "Impostazioni cartella"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"folderSettingsDetails": "Impostazioni cartella"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 b04fcadda7a309f8ee3f94e3c0c314580c417287 i18n/ita/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  our    100644 1b4ea6a446b0325fa66e3be86914f36ccca4943e i18n/ita/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  their  100644 0a301a74cb4c8c94d24ee7810a68f54a7fa90bdf i18n/ita/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-@@ -8,5 +8,11 @@
- 	],
- 	"relaunchSettingMessage": "È necessario riavviare per rendere effettiva un'impostazione modificata.",
- 	"relaunchSettingDetail": "Fare clic sul pulsante di riavvio per riavviare {0} e abilitare l'impostazione.",
-+<<<<<<< .our
- 	"restart": "&&Riavvia"
-+=======
-+	"restart": "Riavvia",
-+	"relaunchWorkspaceMessage": "Questo cambiamento di area di lavoro richiede un ricaricamento del nostro sistema di estensione.",
-+	"reload": "Ricarica"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 504c42cd09001c7c376be465259b418e8b9f483e i18n/ita/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-  our    100644 d04bc9f96833fe1092b4249bae9a4027f864d8e2 i18n/ita/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-  their  100644 7461336d8d6049bf5929054d4a642ae4f3cdc380 i18n/ita/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-changed in both
-  base   100644 acbf024d405acf3a5f8c471458e030f24c59d6d2 i18n/ita/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  our    100644 1bf66fd38b69adac67e7b86fcb0f801683c89491 i18n/ita/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  their  100644 44389863a6597158d5c8c1ef5cea9a4f43086987 i18n/ita/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-changed in both
-  base   100644 6400c7be4edfc6727e822242bd1ce8b1ba39d1f3 i18n/ita/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  our    100644 781c9834bae8c70c8f1100724594cf5248538506 i18n/ita/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  their  100644 01d88af1ee703347e018175307915317e386ab9e i18n/ita/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -10,6 +11,11 @@
- 	"hideRepository": "Nascondi",
- 	"installAdditionalSCMProviders": "Installa ulteriori provider SCM ...",
- 	"no open repo": "Non esistono provider di controllo codice sorgente attivi.",
-+=======
-+	"commitMessage": "Message (press {0} to commit)",
-+	"installAdditionalSCMProviders": "Installa ulteriori provider SCM ...",
-+	"no open repo": "Non ci sono controlli del codice sorgente attivi.",
-+>>>>>>> .their
- 	"source control": "Controllo del codice sorgente",
- 	"viewletTitle": "{0}: {1}",
- 	"hideView": "Nascondi"
-changed in both
-  base   100644 21137b24d8a54c4bc897918ce9bd6f37ae8be047 i18n/ita/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 92c227f579048a55e12147b807cef8b2e56a92a0 i18n/ita/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 942721004dfca3e92f7ae25dc131072f09d76ef2 i18n/ita/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"nextSearchIncludePattern": "Mostra i criteri di inclusione per la ricerca successivi",
- 	"previousSearchIncludePattern": "Mostra i criteri di inclusione per la ricerca precedenti",
- 	"nextSearchExcludePattern": "Mostra i criteri di esclusione per la ricerca successivi",
-@@ -16,6 +19,8 @@
- 	"previousReplaceTerm": "Mostra il termine di ricerca/sostituzione precedente",
- 	"findInFiles": "Cerca nei file",
- 	"replaceInFiles": "Sostituisci nei file",
-+	"findInWorkspace": "Trova nell'area di lavoro...",
-+	"findInFolder": "Trova nella cartella...",
- 	"RefreshAction.label": "Aggiorna",
- 	"CollapseDeepestExpandedLevelAction.label": "Comprimi tutto",
- 	"ClearSearchResultsAction.label": "Cancella",
-changed in both
-  base   100644 13608466e81d1a2ce1b9b826b3a38ff7220a5c98 i18n/ita/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-  our    100644 b79d204589effc5ed05889c9cd02d87b42f12993 i18n/ita/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-  their  100644 53c1288f408313a67d69e60e8b53e7a94a122881 i18n/ita/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"searchFolderMatch.other.label": "Altri file",
- 	"searchFileMatches": "{0} file trovati",
- 	"searchFileMatch": "{0} file trovato",
-changed in both
-  base   100644 fbd469a7550daca18dc85ab74e78c09b4083b346 i18n/ita/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  our    100644 e2aee106234415d5f98623d49849469952f58852 i18n/ita/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  their  100644 7ee59ee05da1047d77e9b323683d4564d52cce35 i18n/ita/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-added in both
-  our    100644 7a0d50122c5371209df2120292501edc4c29f9d8 i18n/ita/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
-  their  100644 a63955595512a6b274746bbb4ab51ed9f9e328f7 i18n/ita/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"search.noWorkspaceWithName": "Nell'area di lavoro non ci sono cartelle denominate {0}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 5894505714eacc34e33a674fd27f44497d02620a i18n/ita/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 96a5512e9db341ff02996bad4ad811078b347739 i18n/ita/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 8a056b360b982185fbca1b5da9e6b57c62c8c833 i18n/ita/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-changed in both
-  base   100644 5e2515ceeda1fb4d1f5091f575ddef8ff18e119a i18n/ita/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 83baac91404ff175b394c533850a93d01538ab38 i18n/ita/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 4891e50a4029c074e66c6a8f75988d6ac7655312 i18n/ita/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -12,6 +12,7 @@
- 	"totalWarnings": "{0} avvisi",
- 	"totalInfos": "{0} messaggi informativi",
- 	"problems": "Problemi",
-+<<<<<<< .our
- 	"building": "Compilazione in corso...",
- 	"manyProblems": "Più di 10.000",
- 	"runningTasks": "Visualizza attività in esecuzione",
-@@ -19,22 +20,36 @@
- 	"TaskSystem.noHotSwap": "Se si cambia il motore di esecuzione delle attività con un'attività attiva in esecuzione, è necessario ricaricare la finestra",
- 	"reloadWindow": "Ricarica finestra",
- 	"TaskServer.folderIgnored": "La cartella {0} viene ignorata poiché utilizza attività (task) versione 0.1.0",
-+=======
-+	"manyMarkers": "Più di 99",
-+	"runningTasks": "Visualizza attività in esecuzione",
-+	"tasks": "Attività",
-+	"TaskSystem.noHotSwap": "Se si cambia il motore di esecuzione delle attività, è necessario ricaricare la finestra",
-+>>>>>>> .their
- 	"TaskService.noBuildTask1": "Non è stata definita alcuna attività di compilazione. Contrassegnare un'attività con 'isBuildCommand' nel file tasks.json.",
- 	"TaskService.noBuildTask2": "Non è stata definita alcuna attività di compilazione. Contrassegnare un'attività come gruppo 'build' nel file tasks.json.",
- 	"TaskService.noTestTask1": "Non è stata definita alcuna attività di test. Contrassegnare un'attività con 'isTestCommand' nel file tasks.json.",
- 	"TaskService.noTestTask2": "Non è stata definita alcuna attività di test. Contrassegnare un'attività come gruppo 'test' nel file tasks.json.",
- 	"TaskServer.noTask": "Attività {0} richiesta per l'esecuzione non trovata",
-+<<<<<<< .our
- 	"TaskService.associate": "associare",
-+=======
-+>>>>>>> .their
- 	"TaskService.attachProblemMatcher.continueWithout": "Continua senza analizzare l'output dell'attività",
- 	"TaskService.attachProblemMatcher.never": "Mai analizzare l'output dell'attività",
- 	"TaskService.attachProblemMatcher.learnMoreAbout": "Ulteriori informazioni sull'analisi dell'output della attività",
- 	"selectProblemMatcher": "Selezionare il tipo di errori e di avvisi per cui analizzare l'output dell'attività",
- 	"customizeParseErrors": "La configurazione dell'attività corrente presenta errori. Per favore correggere gli errori prima di personalizzazione un'attività.",
- 	"moreThanOneBuildTask": "tasks.json contiene molte attività di compilazione. È in corso l'esecuzione della prima.\n",
-+<<<<<<< .our
- 	"TaskSystem.activeSame.background": "L'attività '{0}' è già attiva e in modalità background.",
- 	"TaskSystem.activeSame.noBackground": "L'attività '{0}' è già attiva.",
- 	"terminateTask": "Termina attività",
- 	"restartTask": "Riavvia attività",
-+=======
-+	"TaskSystem.activeSame.background": "L'attività '{0}' è già attiva ed in modalità background. Per terminarla, usare `Termina attività` dal menu Attività",
-+	"TaskSystem.activeSame.noBackground": "L'attività '{0}' è già attiva. Per terminarla utilizzare 'Termina attività...' dal menu Attività.",
-+>>>>>>> .their
- 	"TaskSystem.active": "Al momento c'è già un'attività in esecuzione. Terminarla prima di eseguirne un'altra.",
- 	"TaskSystem.restartFailed": "Non è stato possibile terminare e riavviare l'attività {0}",
- 	"TaskService.noConfiguration": "Errore: Il rilevamento di attività {0} non ha contribuito un'attività nella seguente configurazione: \n{1} \nL'attività verrà ignorata.\n",
-@@ -75,8 +90,13 @@
- 	"TaskService.pickDefaultBuildTask": "Selezionare l'attività da usare come attività di compilazione predefinita",
- 	"TaskService.defaultTestTaskExists": "{0} è già contrassegnato come attività di test predefinita.",
- 	"TaskService.pickDefaultTestTask": "Selezionare l'attività da usare come attività di test predefinita",
-+<<<<<<< .our
- 	"TaskService.pickShowTask": "Selezionare l'attività di cui mostrare l'output",
- 	"TaskService.noTaskIsRunning": "Non ci sono attività in esecuzione",
-+=======
-+	"TaskService.noTaskIsRunning": "Nessuna attività è in esecuzione.",
-+	"TaskService.pickShowTask": "Selezionare l'attività di cui mostrare l'output",
-+>>>>>>> .their
- 	"ShowLogAction.label": "Mostra log attività",
- 	"RunTaskAction.label": "Esegui attività",
- 	"RestartTaskAction.label": "Riavvia attività in esecuzione",
-changed in both
-  base   100644 a966fb16e92421f6486f832d88f979aaa443e2c4 i18n/ita/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  our    100644 b89a9a5d2c851fe192929fd8b043499ee5d305db i18n/ita/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  their  100644 10234317e8f170c8ea57151cc145e390ec0fbba5 i18n/ita/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-@@ -15,7 +15,10 @@
- 	"ConfigurationParser.invalidVaraibleReference": "Errore: il riferimento a problemMatcher non è valido: {0}\n",
- 	"ConfigurationParser.noTaskType": "Errore: la configurazione di tasks deve contenere una proprietà di tipo. La configurazione verrà ignorata.\n{0}\n",
- 	"ConfigurationParser.noTypeDefinition": "Errore: non ci sono attività registrate di tipo '{0}'. Non è stata installata un'estensione che fornisce un provider di task corrispondente?",
-+<<<<<<< .our
- 	"ConfigurationParser.missingRequiredProperty": "Errore: nella configurazione di attività '{0}' manca la proprietà obbligatoria '{1}'. La configurazione dell'attività verrà ignorata.",
-+=======
-+>>>>>>> .their
- 	"ConfigurationParser.notCustom": "Errore: tasks non è dichiarato come un'attività personalizzata. La configurazione verrà ignorata.\n{0}\n",
- 	"ConfigurationParser.noTaskName": "Errore: un'attività deve specificare una proprietà label. L'attività verrà ignorata.\n{0}\n",
- 	"taskConfiguration.noCommandOrDependsOn": "Errore: l'attività '{0}' non specifica un comando né una proprietà dependsOn. L'attività verrà ignorata. La sua definizione è:\n{1}",
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/ita/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  our    100644 c79317e1e19d3b7bbd1fb15955a5248e2d4c5229 i18n/ita/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  their  100644 606a321e648df2b98a8bd08c9ad6fdf9302197c0 i18n/ita/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,6 +10,17 @@
- 	"termEntryAriaLabel": "{0}, selettore terminale",
- 	"termCreateEntryAriaLabel": "{0}, crea un nuovo terminale",
- 	"workbench.action.terminal.newplus": "$(plus) Crea nuovo terminale integrato",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"termEntryAriaLabel": "{0}, selettore terminale",
-+	"termCreateEntryAriaLabel": "{0}, crea un nuovo terminale",
-+	"'workbench.action.terminal.newplus": "$(plus) Crea nuovo terminale integrato",
-+>>>>>>> .their
- 	"noTerminalsMatching": "Nessun terminale corrispondente",
- 	"noTerminalsFound": "Nessun terminale aperto"
- }
-\ No newline at end of file
-changed in both
-  base   100644 9b3321eecb561ee5c4250f3dbc340afce7e2c67d i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 b43f261b33e96573db19620791c6498f01662657 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 c901f072c339e85c13d643f07d8b675520f60b19 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,9 @@
- 	],
- 	"quickOpen.terminal": "Mostra tutti i terminali aperti",
- 	"terminal": "Terminale",
-+=======
-+	"quickOpen.terminal": "Mostra tutti i terminali aperti",
-+>>>>>>> .their
- 	"terminalIntegratedConfigurationTitle": "Terminale integrato",
- 	"terminal.integrated.shell.linux": "Percorso della shell usata dal terminale in Linux.",
- 	"terminal.integrated.shellArgs.linux": "Argomenti della riga di comando da usare nel terminale Linux.",
-@@ -36,8 +40,12 @@
- 	"terminal.integrated.env.osx": "Oggetto con variabili di ambiente che verrà aggiunto al processo VS Code per essere utilizzato dal terminale su OS X",
- 	"terminal.integrated.env.linux": "Oggetto con variabili di ambiente che verrà aggiunto al processo VS Code per essere utilizzato dal terminale su Linux",
- 	"terminal.integrated.env.windows": "Oggetto con variabili di ambiente che verrà aggiunto al processo VS Code per essere utilizzato dal terminale su Windows",
-+<<<<<<< .our
- 	"terminal.integrated.showExitAlert": "Visualizza avviso \"Il processo terminale ha restituito codice di uscita\" quando il codice di uscita è diverso da zero.",
- 	"terminal.integrated.experimentalRestore": "Indica se ripristinare automaticamente le sessioni di terminale per l'area di lavoro all'avvio di VS Code. Si tratta di un'impostazione sperimentale che potrebbe contenere bug e cambiare in futuro.",
-+=======
-+	"terminal": "Terminale",
-+>>>>>>> .their
- 	"terminalCategory": "Terminale",
- 	"viewCategory": "Visualizza"
- }
-\ No newline at end of file
-changed in both
-  base   100644 a676775b5fcd08117cdab1d48029bc02279376c2 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 9af26b9889eaa5fa492c1556e3e5203a1ebacbf4 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 0caa97a52a0e23e8fcd74a7e93abd0d9cfcc20b1 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -14,8 +14,11 @@
- 	"workbench.action.terminal.selectAll": "Seleziona tutto",
- 	"workbench.action.terminal.deleteWordLeft": "Elimina parola a sinistra",
- 	"workbench.action.terminal.deleteWordRight": "Elimina la parola a destra",
-+<<<<<<< .our
- 	"workbench.action.terminal.moveToLineStart": "Passa all'inizio della riga",
- 	"workbench.action.terminal.moveToLineEnd": "Passa alla fine della riga",
-+=======
-+>>>>>>> .their
- 	"workbench.action.terminal.new": "Crea nuovo terminale integrato",
- 	"workbench.action.terminal.new.short": "Nuovo terminale",
- 	"workbench.action.terminal.newWorkspacePlaceholder": "Selezionare la cartella di lavoro corrente per un nuovo terminale.",
-@@ -53,6 +56,7 @@
- 	"workbench.action.terminal.hideFindWidget": "Nascondi widget Trova",
- 	"nextTerminalFindTerm": "Mostra il termine di ricerca successivo",
- 	"previousTerminalFindTerm": "Mostra il termine di ricerca precedente",
-+<<<<<<< .our
- 	"quickOpenTerm": "Cambia terminale attivo",
- 	"workbench.action.terminal.scrollToPreviousCommand": "Scorri al comando precedente",
- 	"workbench.action.terminal.scrollToNextCommand": "Scorri al comando successivo",
-@@ -60,4 +64,7 @@
- 	"workbench.action.terminal.selectToNextCommand": "Aggiungi selezione a comando successivo",
- 	"workbench.action.terminal.selectToPreviousLine": "Aggiungi selezione a riga precedente",
- 	"workbench.action.terminal.selectToNextLine": "Aggiungi selezione a riga successiva"
-+=======
-+	"quickOpenTerm": "Terminale: Cambia terminale attivo"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 43f3afaeb3087727e1206563ed8271f819d7fe47 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 7ae3aac58f69dc8b25dec80d0624497a5e9abe14 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 d707ad877b4b90ba4430068830bd11d5a23de704 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -10,7 +10,11 @@
- 	"terminal.foreground": "Il colore di primo piano del terminale.",
- 	"terminalCursor.foreground": "Colore di primo piano del cursore del terminale.",
- 	"terminalCursor.background": "Colore di sfondo del cursore del terminale. Permette di personalizzare il colore di un carattere quando sovrapposto da un blocco cursore.",
-+<<<<<<< .our
- 	"terminal.selectionBackground": "Colore di sfondo di selezione del terminale.",
- 	"terminal.border": "Colore del bordo che separa i riquadri divisi all'interno del terminale. L'impostazione predefinita è panel.border.",
- 	"terminal.ansiColor": "'{0}' colori ANSI nel terminale. "
-+=======
-+	"terminal.ansiColor": "Colore ANSI '{0}' nel terminale."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 9dd33f62814e18b186fefa4391ecce198cf04730 i18n/ita/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 aed35ee0f736e71e25693c29ccc2843fb9df2498 i18n/ita/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 46c966a637e00f99a76a08c2c86d66c2ae0d7e48 i18n/ita/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -11,8 +11,16 @@
- 	"read the release notes": "Benvenuti in {0} versione {1}. Leggere le note sulla versione?",
- 	"licenseChanged": "I termini della licenza sono cambiati. Fare clic [qui]({0}) e leggerli con attenzione.",
- 	"neveragain": "Non visualizzare più questo messaggio",
-+<<<<<<< .our
- 	"64bitisavailable": "{0} per Windows a 64 bit è ora disponibile. Per maggiori informazioni, fare clic [qui]({1}).",
- 	"updateIsReady": "Nuovo aggiornamento di {0} disponibile.",
-+=======
-+	"64bitisavailable": "{0} per Windows a 64 bit è ora disponibile.",
-+	"learn more": "Altre informazioni",
-+	"updateIsReady": "Nuovo aggiornamento di {0} disponibile.",
-+	"thereIsUpdateAvailable": "È disponibile un aggiornamento.",
-+	"updateAvailable": "{0} verrà aggiornato dopo il riavvio.",
-+>>>>>>> .their
- 	"noUpdatesAvailable": "Al momento non sono disponibili aggiornamenti.",
- 	"ok": "OK",
- 	"thereIsUpdateAvailable": "È disponibile un aggiornamento.",
-changed in both
-  base   100644 4d0a4f3dde58cfbd357b97fe085f279cded0a5e6 i18n/ita/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  our    100644 4042bb544ec621f03590cdd507b7e33f55392950 i18n/ita/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  their  100644 54f09dc2127c97d44a83a3dfe95730f344fbdd85 i18n/ita/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-@@ -37,6 +37,8 @@
- 	"welcomePage.showCommandsDescription": "Accesso e ricerca rapida di comandi dal riquadro comandi ({0})",
- 	"welcomePage.interfaceOverview": "Panoramica dell'interfaccia",
- 	"welcomePage.interfaceOverviewDescription": "Immagine in sovrimpressione che evidenzia i principali componenti dell'interfaccia utente",
-+	"welcomePage.deployToAzure": "Distribuisci le applicazioni nel cloud",
-+	"welcomePage.deployToAzureDescription": "Informazioni sulla distribuzione di app Node in Servizio app di Azure",
- 	"welcomePage.interactivePlayground": "Playground interattivo",
- 	"welcomePage.interactivePlaygroundDescription": "Breve panoramica delle funzionalità essenziali dell'editor"
- }
-\ No newline at end of file
-changed in both
-  base   100644 300eb2118f1201f283eb3a1e66da168a06ef071b i18n/ita/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-  our    100644 82f6aedb638491aef3f6eb8ed73da8bd42051ffb i18n/ita/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-  their  100644 1f9832cab991258fe647e04ebd44c34fa5ce698b i18n/ita/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-changed in both
-  base   100644 b6dde7dcf2cafc632d07cee1d845a8954e2e8393 i18n/ita/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-  our    100644 b638ceb72cd3fb4123e52da2c2b721506664c117 i18n/ita/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-  their  100644 81a32bb47793b8e466654f099561b556b318a295 i18n/ita/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-changed in both
-  base   100644 2b28fa7289bc092e107356bbc2696bc97ba158b4 i18n/ita/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
-  our    100644 0e26a64df7496635060aff67217e38da429f9d25 i18n/ita/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
-  their  100644 723449aaedfb8cd77e57981b1414950fc68a2a45 i18n/ita/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"editorWalkThrough.title": "Playground interattivo",
- 	"editorWalkThrough": "Playground interattivo"
- }
-\ No newline at end of file
-changed in both
-  base   100644 a7e15b8a41426bed20881fa75e94534c6261f1c3 i18n/ita/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  our    100644 b5a489af390ae95c0040c4f75bba1c10766a089e i18n/ita/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  their  100644 31fce73e2d650426cc884f08a4f5876e6a680003 i18n/ita/src/vs/workbench/services/configuration/node/configuration.i18n.json
-@@ -9,6 +9,7 @@
- 	"scope.window.description": "Configurazione specifica della finestra, che può essere configurata nelle impostazioni dell'utente o dell'area di lavoro.",
- 	"scope.resource.description": "Configurazione specifica di risorse, che possono essere configurate nelle impostazioni utente, in quelle dell'area di lavoro o di una cartella.",
- 	"scope.description": "Ambito in cui la configurazione è applicabile. Gli ambiti disponibili sono 'finestra' e 'risorsa'.",
-+<<<<<<< .our
- 	"vscode.extension.contributes.configuration": "Impostazioni di configurazione di contributes.",
- 	"invalid.title": "'configuration.title' deve essere una stringa",
- 	"vscode.extension.contributes.defaultConfiguration": "Aggiunge come contributo le impostazioni di configurazione predefinite dell'editor in base al linguaggio.",
-@@ -21,4 +22,13 @@
- 	"workspaceConfig.settings.description": "Impostazioni di area di lavoro",
- 	"workspaceConfig.extensions.description": "Estensioni dell'area di lavoro",
- 	"unknownWorkspaceProperty": "La proprietà di configurazione dell'area di lavoro è sconosciuta"
-+=======
-+	"invalid.type": "se impostato, 'configuration.type' deve essere impostato su 'object",
-+	"invalid.title": "'configuration.title' deve essere una stringa",
-+	"vscode.extension.contributes.defaultConfiguration": "Aggiunge come contributo le impostazioni di configurazione predefinite dell'editor in base al linguaggio.",
-+	"invalid.properties": "'configuration.properties' deve essere un oggetto",
-+	"workspaceConfig.folders.description": "Elenco delle cartelle da caricare nell'area di lavoro. Deve essere un percorso di file, ad esempio `/root/folderA` o `./folderA` per un percorso relativo che verrà risolto in base alla posizione del file dell'area di lavoro.",
-+	"workspaceConfig.folder.description": "Percorso di file, ad esempio `/root/folderA` o `./folderA` per un percorso relativo che verrà risolto in base alla posizione del file dell'area di lavoro.",
-+	"workspaceConfig.settings.description": "Impostazioni di area di lavoro"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 72151489b4a3399a5a1a4265c33ab4a5cf6ef965 i18n/ita/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 73635731361e3644a722328dacbcb86a39a295d3 i18n/ita/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 8cb580b70f0dc2753ce2b283b6274aecf8b053e6 i18n/ita/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -9,6 +9,7 @@
- 	"openTasksConfiguration": "Apri configurazione attività",
- 	"openLaunchConfiguration": "Apri configurazione di avvio",
- 	"open": "Apri impostazioni",
-+<<<<<<< .our
- 	"saveAndRetry": "Salva e riprova",
- 	"errorUnknownKey": "Impossibile scrivere {0} perché {1} non è una configurazione registrata.",
- 	"errorInvalidWorkspaceConfigurationApplication": "Non è possibile scrivere {0} in Impostazioni area di lavoro. Questa impostazione può essere scritta solo in Impostazioni utente.",
-@@ -27,6 +28,19 @@
- 	"errorConfigurationFileDirty": "Non è possibile scrivere nelle impostazioni utente perché il file è stato modificato. Salvare prima il file delle impostazioni utente, quindi riprovare.",
- 	"errorConfigurationFileDirtyWorkspace": "Non è possibile scrivere nelle impostazioni dell'area di lavoro perché il file è stato modificato. Salvare prima il file delle impostazioni dell'area di lavoro, quindi riprovare.",
- 	"errorConfigurationFileDirtyFolder": "Non è possibile scrivere nelle impostazioni della cartella perché il file è stato modificato. Salvare prima il file di impostazioni della cartella '{0}', quindi riprovare.",
-+=======
-+	"close": "Chiudi",
-+	"saveAndRetry": "Salva le impostazioni e riprova",
-+	"errorUnknownKey": "Impossibile scrivere {0} perché {1} non è una configurazione registrata.",
-+	"errorInvalidFolderConfiguration": "Impossibile scrivere nella cartella impostazioni perché {0} non supporta l'ambito di risorsa della cartella.",
-+	"errorInvalidUserTarget": "Impossibile scrivere le impostazioni utente perché {0} non supporta l'ambito globale.",
-+	"errorInvalidFolderTarget": "Impossibile scrivere nella cartella impostazioni perché non viene fornita alcuna risorsa.",
-+	"errorNoWorkspaceOpened": "Impossibile scrivere su {0} poiché nessuna area di lavoro è aperta. Si prega di aprire un'area di lavoro e riprovare.",
-+	"errorInvalidConfiguration": "Impossibile scrivere nelle impostazioni. Si prega di aprire  **Impostazioni utente** per correggere eventuali errori o avvisi nel file e riprovare.",
-+	"errorInvalidConfigurationWorkspace": "Impossibile scrivere in impostazioni. Si prega di aprire **Impostazioni area di lavoro** per correggere eventuali errori o avvisi nel file e riprovare.",
-+	"errorConfigurationFileDirty": "Impossibile scrivere nelle impostazioni perché il file è stato modificato ma non salvato. Si prega di salvare il file **impostazioni utente** e riprovare.",
-+	"errorConfigurationFileDirtyWorkspace": "Non è possibile scrivere in impostazioni perché il file è stato modificato ma non salvato. Salvare il file delle **Impostazioni area di lavoro** e riprovare.",
-+>>>>>>> .their
- 	"userTarget": "Impostazioni utente",
- 	"workspaceTarget": "Impostazioni area di lavoro",
- 	"folderTarget": "Impostazioni della cartella"
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/ita/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-  our    100644 bf0a4aae1080397e29d56822254443ce537de3ab i18n/ita/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-  their  100644 337b884305c827955fae8d3657b7c3e07fc90fa0 i18n/ita/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"errorInvalidFile": "Impossibile scrivere nel file. Si prega di aprire il file per correggere eventuali errori o avvisi nel file e riprovare.",
- 	"errorFileDirty": "Impossibile scrivere nel file perché il file è stato modificato. Si prega di salvare il file e riprovare."
- }
-\ No newline at end of file
-added in both
-  our    100644 9afa6ea006f8557de1fbad5ab446076bf99ec84d i18n/ita/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
-  their  100644 e77d27848abcd31138d4b6d12314ac1986a390b1 i18n/ita/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,5 +10,15 @@
- 	"extensionHostProcess.startupFailDebug": "L'host dell'estensione non è stato avviato entro 10 secondi. Potrebbe essersi arrestato alla prima riga e richiedere un debugger per continuare.",
- 	"extensionHostProcess.startupFail": "L'host dell'estensione non è stato avviato entro 10 secondi. Potrebbe essersi verificato un problema.",
- 	"reloadWindow": "Ricarica finestra",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"extensionHostProcess.startupFailDebug": "L'host dell'estensione non è stato avviato entro 10 secondi. Potrebbe essersi arrestato alla prima riga e richiedere un debugger per continuare.",
-+	"extensionHostProcess.startupFail": "L'host dell'estensione non è stato avviato entro 10 secondi. Potrebbe essersi verificato un problema.",
-+>>>>>>> .their
- 	"extensionHostProcess.error": "Errore restituito dall'host dell'estensione: {0}"
- }
-\ No newline at end of file
-added in both
-  our    100644 357580d8fe35859de61dc029b380b6f6df64b7d2 i18n/ita/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
-  their  100644 a8123821923960e48e7590755193edae2142a7db i18n/ita/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,5 +10,16 @@
- 	"jsonParseFail": "Non è stato possibile analizzare {0}: {1}.",
- 	"fileReadFail": "Non è possibile leggere il file {0}: {1}.",
- 	"jsonsParseReportErrors": "Non è stato possibile analizzare {0}: {1}.",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"jsonParseFail": "Non è stato possibile analizzare {0}: {1}.",
-+	"fileReadFail": "Non è possibile leggere il file {0}: {1}.",
-+	"jsonsParseFail": "Non è stato possibile analizzare {0} o {1}: {2}.",
-+>>>>>>> .their
- 	"missingNLSKey": "Il messaggio per la chiave {0} non è stato trovato."
- }
-\ No newline at end of file
-added in both
-  our    100644 c2d273b94b1c2d55b6b9a98fd07bdb882fbd6cfc i18n/ita/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-  their  100644 037da6258e4c2beb29452286d30492df603fe618 i18n/ita/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -15,4 +16,18 @@
- 	"extensionUnderDevelopment": "Caricamento dell'estensione di sviluppo in {0}",
- 	"extensionCache.invalid": "Le estensioni sono state modificate sul disco. Si prega di ricaricare la finestra.",
- 	"reloadWindow": "Ricarica finestra"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"devTools": "Strumenti di sviluppo",
-+	"restart": "Riavvia host dell'estensione",
-+	"extensionHostProcess.crash": "L'host dell'estensione è stato terminato in modo imprevisto.",
-+	"extensionHostProcess.unresponsiveCrash": "L'host dell'estensione è stato terminato perché non rispondeva.",
-+	"overwritingExtension": "Sovrascrittura dell'estensione {0} con {1}.",
-+	"extensionUnderDevelopment": "Caricamento dell'estensione di sviluppo in {0}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6db7d6aae514a031afce5ac346abfd84bb8ee1cc i18n/ita/src/vs/workbench/services/progress/browser/progressService2.i18n.json
-  our    100644 4fa1f89e7ff3e30753408aba6f64ead1ddd8e344 i18n/ita/src/vs/workbench/services/progress/browser/progressService2.i18n.json
-  their  100644 dbcd7381ae2fcf0e7a8fc81ec166ed7112edca11 i18n/ita/src/vs/workbench/services/progress/browser/progressService2.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -9,4 +10,8 @@
- 	"progress.subtitle": "{0} - {1}",
- 	"progress.title": "{0}: {1}",
- 	"cancel": "Annulla"
-+=======
-+	"progress.subtitle": "{0} - {1}",
-+	"progress.title": "{0}: {1}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 5c07d90544128bccccfb5881d8fee1610d01b2b9 i18n/ita/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-  our    100644 ca82bab7411bb1a811f84dd6fe0d9ec562d1b7fc i18n/ita/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-  their  100644 3b13087ceeab2d96d1d4a7ce2de906ff6dda0a47 i18n/ita/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,12 @@
- 	"schema.token.fontStyle": "Stile del carattere della regola: 'italic', 'bold' o 'underline' o una combinazione. Con una stringa vuota le impostazioni ereditate vengono annullate.",
- 	"schema.fontStyle.error": "Lo stile del carattere deve 'italic', 'bold' o 'underline' oppure una combinazione di tali impostazioni oppure la stringa vuota.",
- 	"schema.token.fontStyle.none": "Nessuno (cancella lo stile ereditato)",
-+=======
-+	"schema.token.settings": "Colori e stili per il token.",
-+	"schema.token.foreground": "Colore primo piano per il token.",
-+	"schema.token.fontStyle": "Stile del carattere della regola: uno o combinazione di 'italic', 'bold' e 'underline'",
-+	"schema.fontStyle.error": "Lo stile del carattere deve essere una combinazione di 'italic', 'bold' e 'underline'",
-+>>>>>>> .their
- 	"schema.properties.name": "Descrizione della regola.",
- 	"schema.properties.scope": "Selettore di ambito usato per la corrispondenza della regola.",
- 	"schema.tokenColors.path": "Percorso di un file tmTheme (relativo al file corrente).",
-changed in both
-  base   100644 0aee1a7594dd190139d5993f9b0b7f9cce4dfbde i18n/ita/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
-  our    100644 152b492e56b736451d0bba85ee736ea70f08a626 i18n/ita/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
-  their  100644 ad9328eb6822d560bd415071a44d136779e2e1b2 i18n/ita/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
-changed in both
-  base   100644 031d6c9544abbc9dcdd5097095d503830734d22b i18n/ita/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 59d0978a765c9fd6ca13b8566191473ce46ff2e1 i18n/ita/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 d6ed75ea2e19a69fff3558989487719e87bd8bba i18n/ita/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-@@ -13,6 +13,12 @@
- 	"noIconThemeDesc": "No file icons",
- 	"iconThemeError": "File icon theme is unknown or not installed.",
- 	"workbenchColors": "Sostituisce i colori del tema colori attualmente selezionato.",
-+<<<<<<< .our
-+=======
-+	"workbenchColors.deprecated": "L'impostazione non è più sperimentale ed è stata rinominata in 'workbench.colorCustomizations'",
-+	"workbenchColors.deprecatedDescription": "In alternativa, usare 'workbench.colorCustomizations'",
-+	"editorColors": "Sostituisce i colori dell'editor e lo stile dei font nel tema colori attualmente selezionato.",
-+>>>>>>> .their
- 	"editorColors.comments": "Imposta i colori e gli stili per i commenti",
- 	"editorColors.strings": "Imposta i colori e gli stili per i valori letterali stringa.",
- 	"editorColors.keywords": "Imposta i colori e gli stili per le parole chiave.",
-@@ -20,6 +26,10 @@
- 	"editorColors.types": "Imposta i colori e gli stili per i riferimenti e le dichiarazioni di tipo.",
- 	"editorColors.functions": "Imposta i colori e gli stili per i riferimenti e le dichiarazioni di funzioni.",
- 	"editorColors.variables": "Imposta i colori e gli stili per i riferimenti e le dichiarazioni di variabili.",
-+<<<<<<< .our
- 	"editorColors.textMateRules": "Imposta i colori e gli stili usando le regole di creazione temi di TextMate (impostazione avanzata).",
- 	"editorColors": "Sostituisce i colori dell'editor e lo stile dei font nel tema colori attualmente selezionato."
-+=======
-+	"editorColors.textMateRules": "Imposta i colori e gli stili usando le regole di creazione temi di TextMate (impostazione avanzata)."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 0d0d4cde3c92290c17e0d54a7747e575a4efe3b7 i18n/jpn/extensions/css/package.i18n.json
-  our    100644 afbe11a31b688e3d20e90f7c0034dcf3b0256eba i18n/jpn/extensions/css/package.i18n.json
-  their  100644 e24d5a99b9be31a83c998ff7e97fa63c00c81425 i18n/jpn/extensions/css/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,73 @@
- 	],
- 	"displayName": "CSS の基本言語サポート",
- 	"description": "CSS、LESS、SCSS ファイル内で構文ハイライト、かっこ一致を提供します。"
-+=======
-+	"css.lint.argumentsInColorFunction.desc": "正しくないパラメーターの数",
-+	"css.lint.boxModel.desc": "パディングまたは枠線を使用する場合は幅または高さを使用しないでください",
-+	"css.lint.compatibleVendorPrefixes.desc": "ベンダー固有のプレフィックスを使用する場合は、他のすべてのベンダー固有のプロパティも必ず含めてください",
-+	"css.lint.duplicateProperties.desc": "重複するスタイル定義を使用しないでください",
-+	"css.lint.emptyRules.desc": "空の規則セットを使用しないでください",
-+	"css.lint.float.desc": "'float' は使用しないでください。float を使用すると、レイアウトの一部が変更されたときに CSS が破損しやすくなります。",
-+	"css.lint.fontFaceProperties.desc": "@font-face 規則で 'src' プロパティと 'font-family' プロパティを定義する必要があります",
-+	"css.lint.hexColorLength.desc": "16 進数の色には、3 つまたは 6 つの 16 進数が含まれる必要があります",
-+	"css.lint.idSelector.desc": "セレクターには ID を含めないでください。これらの規則と HTML の結合が密接すぎます。",
-+	"css.lint.ieHack.desc": "IE ハックは、IE7 以前をサポートする場合にのみ必要です",
-+	"css.lint.important.desc": "!important は使用しないでください。これは CSS 全体の特定性が制御不能になり、リファクタリングが必要なことを示しています。",
-+	"css.lint.importStatement.desc": "複数の Import ステートメントを同時に読み込むことはできません",
-+	"css.lint.propertyIgnoredDueToDisplay.desc": "表示によりプロパティが無視されます。たとえば、'display: inline' の場合、width、height、margin-top、margin-bottom、および float のプロパティには効果がありません",
-+	"css.lint.universalSelector.desc": "ユニバーサル セレクター (*) を使用すると処理速度が低下することが分かっています",
-+	"css.lint.unknownProperties.desc": "不明なプロパティ。",
-+	"css.lint.unknownVendorSpecificProperties.desc": "不明なベンダー固有のプロパティ。",
-+	"css.lint.vendorPrefix.desc": "ベンダー固有のプレフィックスを使用する場合は、標準のプロパティも含めます",
-+	"css.lint.zeroUnits.desc": "0 の単位は必要ありません",
-+	"css.trace.server.desc": "VS Code と CSS 言語サーバー間の通信をトレースします。",
-+	"css.validate.title": "CSS の検証と問題の重大度を制御します。",
-+	"css.validate.desc": "すべての検証を有効または無効にします",
-+	"less.lint.argumentsInColorFunction.desc": "正しくないパラメーターの数",
-+	"less.lint.boxModel.desc": "パディングまたは枠線を使用する場合は幅または高さを使用しないでください",
-+	"less.lint.compatibleVendorPrefixes.desc": "ベンダー固有のプレフィックスを使用する場合は、他のすべてのベンダー固有のプロパティも必ず含めてください",
-+	"less.lint.duplicateProperties.desc": "重複するスタイル定義を使用しないでください",
-+	"less.lint.emptyRules.desc": "空の規則セットを使用しないでください",
-+	"less.lint.float.desc": "'float' は使用しないでください。float を使用すると、レイアウトの一部が変更されたときに CSS が破損しやすくなります。",
-+	"less.lint.fontFaceProperties.desc": "@font-face 規則で 'src' プロパティと 'font-family' プロパティを定義する必要があります",
-+	"less.lint.hexColorLength.desc": "16 進数の色には、3 つまたは 6 つの 16 進数が含まれる必要があります",
-+	"less.lint.idSelector.desc": "セレクターには ID を含めないでください。これらの規則と HTML の結合が密接すぎます。",
-+	"less.lint.ieHack.desc": "IE ハックは、IE7 以前をサポートする場合にのみ必要です",
-+	"less.lint.important.desc": "!important は使用しないでください。これは CSS 全体の特定性が制御不能になり、リファクタリングが必要なことを示しています。",
-+	"less.lint.importStatement.desc": "複数の Import ステートメントを同時に読み込むことはできません",
-+	"less.lint.propertyIgnoredDueToDisplay.desc": "表示によりプロパティが無視されます。たとえば、'display: inline' の場合、width、height、margin-top、margin-bottom、および float のプロパティには効果がありません",
-+	"less.lint.universalSelector.desc": "ユニバーサル セレクター (*) を使用すると処理速度が低下することが分かっています",
-+	"less.lint.unknownProperties.desc": "不明なプロパティ。",
-+	"less.lint.unknownVendorSpecificProperties.desc": "不明なベンダー固有のプロパティ。",
-+	"less.lint.vendorPrefix.desc": "ベンダー固有のプレフィックスを使用する場合は、標準のプロパティも含めます",
-+	"less.lint.zeroUnits.desc": "0 の単位は必要ありません",
-+	"less.validate.title": "LESS の検証と問題の重大度を制御します。",
-+	"less.validate.desc": "すべての検証を有効または無効にします",
-+	"scss.lint.argumentsInColorFunction.desc": "正しくないパラメーターの数",
-+	"scss.lint.boxModel.desc": "パディングまたは枠線を使用する場合は幅または高さを使用しないでください",
-+	"scss.lint.compatibleVendorPrefixes.desc": "ベンダー固有のプレフィックスを使用する場合は、他のすべてのベンダー固有のプロパティも必ず含めてください",
-+	"scss.lint.duplicateProperties.desc": "重複するスタイル定義を使用しないでください",
-+	"scss.lint.emptyRules.desc": "空の規則セットを使用しないでください",
-+	"scss.lint.float.desc": "'float' は使用しないでください。float を使用すると、レイアウトの一部が変更されたときに CSS が破損しやすくなります。",
-+	"scss.lint.fontFaceProperties.desc": "@font-face 規則で 'src' プロパティと 'font-family' プロパティを定義する必要があります",
-+	"scss.lint.hexColorLength.desc": "16 進数の色には、3 つまたは 6 つの 16 進数が含まれる必要があります",
-+	"scss.lint.idSelector.desc": "セレクターには ID を含めないでください。これらの規則と HTML の結合が密接すぎます。",
-+	"scss.lint.ieHack.desc": "IE ハックは、IE7 以前をサポートする場合にのみ必要です",
-+	"scss.lint.important.desc": "!important は使用しないでください。これは CSS 全体の特定性が制御不能になり、リファクタリングが必要なことを示しています。",
-+	"scss.lint.importStatement.desc": "複数の Import ステートメントを同時に読み込むことはできません",
-+	"scss.lint.propertyIgnoredDueToDisplay.desc": "表示によりプロパティが無視されます。たとえば、'display: inline' の場合、width、height、margin-top、margin-bottom、および float のプロパティには効果がありません",
-+	"scss.lint.universalSelector.desc": "ユニバーサル セレクター (*) を使用すると処理速度が低下することが分かっています",
-+	"scss.lint.unknownProperties.desc": "不明なプロパティ。",
-+	"scss.lint.unknownVendorSpecificProperties.desc": "不明なベンダー固有のプロパティ。",
-+	"scss.lint.vendorPrefix.desc": "ベンダー固有のプレフィックスを使用する場合は、標準のプロパティも含めます",
-+	"scss.lint.zeroUnits.desc": "0 の単位は必要ありません",
-+	"scss.validate.title": "SCSS の検証と問題の重大度を制御します。",
-+	"scss.validate.desc": "すべての検証を有効または無効にします",
-+	"less.colorDecorators.enable.desc": "カラー デコレーターを有効または無効にします",
-+	"scss.colorDecorators.enable.desc": "カラー デコレーターを有効または無効にします",
-+	"css.colorDecorators.enable.desc": "カラー デコレーターを有効または無効にします",
-+	"css.colorDecorators.enable.deprecationMessage": "設定 `css.colorDecorators.enable` は使用されなくなりました。`editor.colorDecorators` を使用してください。",
-+	"scss.colorDecorators.enable.deprecationMessage": "設定 `scss.colorDecorators.enable` は使用されなくなりました。`editor.colorDecorators` を使用してください。",
-+	"less.colorDecorators.enable.deprecationMessage": "設定 `less.colorDecorators.enable` は使用されなくなりました。`editor.colorDecorators` を使用してください。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ce72c51b95bd9fd79a6e0e105e69519cd5f00f4f i18n/jpn/extensions/emmet/package.i18n.json
-  our    100644 2ea428b8ba7cebbdb24c299af08c070b4291f172 i18n/jpn/extensions/emmet/package.i18n.json
-  their  100644 d8400d06d02de76563a89c63a203a485efa5ba95 i18n/jpn/extensions/emmet/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -7,6 +8,8 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"description": "VSCode の Emmet サポート",
-+=======
-+>>>>>>> .their
- 	"command.wrapWithAbbreviation": "ラップ変換",
- 	"command.wrapIndividualLinesWithAbbreviation": "個々の行でラップ変換",
- 	"command.removeTag": "タグの削除",
-@@ -33,11 +36,19 @@
- 	"emmetSyntaxProfiles": "指定した構文に対してプロファイルを定義するか、特定の規則がある独自のプロファイルをご使用ください。",
- 	"emmetExclude": "Emmet 省略記法を展開すべきでない言語の配列。",
- 	"emmetExtensionsPath": "Emmet のプロファイルとスニペットを含むフォルダーへのパス。",
-+<<<<<<< .our
- 	"emmetShowExpandedAbbreviation": "展開された Emmet 省略記法を候補として表示します。\n\"inMarkupAndStylesheetFilesOnly\" オプションは、html、haml、jade、slim、xml、xsl、css、scss、sass、less、stylus に適用されます。\n\"always\" オプションは markup/css に関係なくファイルのすべての部分に適用されます。",
- 	"emmetShowAbbreviationSuggestions": "利用できる Emmet 省略記法を候補として表示します。スタイルシートや emmet.showExpandedAbbreviation を \"never\" に設定していると適用されません。",
- 	"emmetIncludeLanguages": "既定でサポートされていない言語で Emmet 略語を有効にします。ここに、その言語と Emmet でサポートされる言語のマッピングを追加します。\n 例: {\"vue-html\":\"html\"、\"javascript\":\"javascriptreact\"}",
- 	"emmetVariables": "Emmet のスニペットで使用される変数",
- 	"emmetTriggerExpansionOnTab": "有効にすると、TAB キーを押したときに Eemmet 省略記法が展開されます。",
-+=======
-+	"emmetShowExpandedAbbreviation": "候補として、展開された Emmet 省略記法を表示します。\n\"inMarkupAndStylesheetFilesOnly\" オプションは、html、haml、jade、slim、xml、xsl、css、scss、sass、less、および stylus に適用されます。\n\"always\" オプションは、マークアップ / css に関係なく、ファイルのすべての部分に適用されます。",
-+	"emmetShowAbbreviationSuggestions": "候補として考えられる Emmet 省略記法を表示します。 スタイルシートや emmet.showExpandedAbbreviation が \"never\" に設定されている場合は適用されません。",
-+	"emmetIncludeLanguages": "既定でサポートされていない言語で Emmet 省略記法を有効にします。 言語と Emmet がサポートする言語の間にマッピングを追加します。\n例: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
-+	"emmetVariables": "Emmet のスニペットで使用される変数 ",
-+	"emmetTriggerExpansionOnTab": "これをオンにすると、TAB キーを押したときに emmet 省略記法が展開されます.",
-+>>>>>>> .their
- 	"emmetPreferences": "Emmet の一部のアクションやリゾルバーの動作の変更に使用される基本設定。",
- 	"emmetPreferencesIntUnit": "整数値に使用する既定の単位",
- 	"emmetPreferencesFloatUnit": "float 値に使用する既定の単位",
-@@ -47,6 +58,7 @@
- 	"emmetPreferencesCssBetween": "CSS の略語を展開するときに CSS プロパティと値の間に配置されるシンボル ",
- 	"emmetPreferencesSassBetween": "Sass ファイルで CSS の略語を展開するときに CSS プロパティと値の間に配置されるシンボル ",
- 	"emmetPreferencesStylusBetween": "Stylus ファイルで CSS の略語を展開するときに CSS プロパティと値の間に配置されるシンボル ",
-+<<<<<<< .our
- 	"emmetShowSuggestionsAsSnippets": "true の場合、Emmet 候補をスニペットとして表示して editor.snippetSuggestions 設定に従ってそれらを並び替えます。",
- 	"emmetPreferencesBemElementSeparator": "BEM フィルターを利用時にクラス使用する Element の区切り文字 ",
- 	"emmetPreferencesBemModifierSeparator": "BEM フィルターを利用時にクラス使用する Modifier の区切り文字",
-@@ -62,4 +74,7 @@
- 	"emmetPreferencesCssMsProperties": "Emmet 省略記法で使用される場合に `-` で始まる 'ms' ベンダー プレフィックスを取得するカンマ区切りの CSS プロパティ。常に 'ms' プレフィックスを避ける場合は空の文字列に設定します。",
- 	"emmetPreferencesCssFuzzySearchMinScore": "あいまい検索の省略形が達成すべき (0 から 1 の) 最小スコア。値が低ければ多くの誤検出が発生する可能性があります。値が高ければ一致する見込みが減る可能性があります。",
- 	"emmetOptimizeStylesheetParsing": "false に設定すると、現在位置が Emmet 略語の展開位置として有効かどうかを判定するためにファイル全体を解析します。true に設定すると、css/scss/less ファイルの現在位置周辺のコンテンツのみを解析します。"
-+=======
-+	"emmetShowSuggestionsAsSnippets": "true の場合、emmet 候補では、editor.snippetSuggestions 設定に従ってそれらを並べてスニペットとして表示されます。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 41d43b02c1f66f342064622c00a0890115d0dad9 i18n/jpn/extensions/extension-editing/out/extensionLinter.i18n.json
-  our    100644 29e11015a804a1186a5840b869b18fe6a3a72163 i18n/jpn/extensions/extension-editing/out/extensionLinter.i18n.json
-  their  100644 09e430952b7349d60633794eb3f06bb1f0cbba94 i18n/jpn/extensions/extension-editing/out/extensionLinter.i18n.json
-changed in both
-  base   100644 e0b20cd3072a573c188a1dda09d623234ecee2d4 i18n/jpn/extensions/git/out/commands.i18n.json
-  our    100644 9e38217888fdc2db31af2a431341d645d8b6b16d i18n/jpn/extensions/git/out/commands.i18n.json
-  their  100644 072e2fc708971253df7fad52c426583c6e507242 i18n/jpn/extensions/git/out/commands.i18n.json
-@@ -14,12 +14,18 @@
- 	"cloning": "Git リポジトリ '{0}' を複製しています...",
- 	"proposeopen": "クローンしたリポジトリを開きますか?",
- 	"openrepo": "リポジトリを開く",
-+<<<<<<< .our
- 	"add": "ワークスペースに追加",
- 	"proposeopen2": "複製したリポジトリを開きますか? または現在のワークスペースに追加しますか?",
- 	"init": "Git リポジトリを初期化するワークスペース フォルダーを選択してください",
- 	"init repo": "リポジトリの初期化",
- 	"create repo": "リポジトリの初期化",
- 	"are you sure": "'{0}' に Git リポジトリを作成します。続行してもよろしいですか?",
-+=======
-+	"proposeopen": "複製したリポジトリを開きますか?",
-+	"path to init": "フォルダーのパス",
-+	"provide path": "初期化する Git リポジトリへのフォルダー パスを入力してください",
-+>>>>>>> .their
- 	"HEAD not available": "'{0}' の HEAD バージョンは利用できません。",
- 	"confirm stage files with merge conflicts": "マージの競合がある {0} 個のファイルをステージしてもよろしいですか?",
- 	"confirm stage file with merge conflicts": "マージの競合がある {0} をステージしてもよろしいですか? ",
-@@ -40,6 +46,7 @@
- 	"delete files": "複数のファイルを削除",
- 	"there are untracked files single": "破棄すると次の未追跡ファイルがディスクから削除されます: {0}。",
- 	"there are untracked files": "破棄すると {0} 個の未追跡ファイルがディスクから削除されます。",
-+<<<<<<< .our
- 	"confirm discard all 2": "{0}\n\nこの変更は元に戻すことはできません。現在のワーキング セットは永久に失われます。",
- 	"yes discard tracked": "1 つの追跡ファイルを破棄",
- 	"yes discard tracked multiple": "{0} 個の追跡ファイルを破棄",
-@@ -47,6 +54,11 @@
- 	"unsaved files": "{0} 個の保存されていないファイルがあります。\n\nコミット前に保存しますか?",
- 	"save and commit": "すべて保存してコミットする",
- 	"commit": "とにかくコミットする",
-+=======
-+	"confirm discard all 2": "{0}\n\nこの変更は元に戻すことはできません、現在のワーキング セットは永久に失われます。",
-+	"yes discard tracked": "1 つの追跡ファイルを破棄",
-+	"yes discard tracked multiple": "{0} 個の追跡ファイルを破棄",
-+>>>>>>> .their
- 	"no staged changes": "コミットするステージされた変更がありません。\n\nすべての変更を自動的にステージして、直接コミットしますか?",
- 	"always": "常に行う",
- 	"no changes": "コミットする必要のある変更はありません。",
-@@ -63,13 +75,20 @@
- 	"select a branch to merge from": "マージ元のブランチを選択",
- 	"merge conflicts": "マージの競合があります。コミットする前にこれを解決してください。",
- 	"tag name": "タグ名",
-+<<<<<<< .our
- 	"provide tag name": "タグ名を入力してください",
- 	"tag message": "メッセージ",
- 	"provide tag message": "注釈付きタグにつけるメッセージを入力してください",
- 	"no remotes to fetch": "リポジトリには、フェッチ元として構成されているリモートがありません。",
-+=======
-+	"provide tag name": "タグ名を入力してください。",
-+	"tag message": "メッセージ",
-+	"provide tag message": "注釈付きタグにつけるメッセージを入力してください",
-+>>>>>>> .their
- 	"no remotes to pull": "リポジトリには、プル元として構成されているリモートがありません。",
- 	"pick remote pull repo": "リモートを選んで、ブランチを次からプルします:",
- 	"no remotes to push": "リポジトリには、プッシュ先として構成されているリモートがありません。",
-+	"push with tags success": "タグが正常にプッシュされました。",
- 	"nobranch": "リモートにプッシュするブランチをチェックアウトしてください。",
- 	"confirm publish branch": "'{0}' ブランチに上流ブランチはありません。このブランチを公開しますか?",
- 	"ok": "OK",
-changed in both
-  base   100644 87fddca56884666a249c69bf40e99c5fad6deaf1 i18n/jpn/extensions/git/out/model.i18n.json
-  our    100644 b58f38d95f29002c9d689762082df730e6c86ace i18n/jpn/extensions/git/out/model.i18n.json
-  their  100644 223a2121eec8f1d0f9b7c9713a9cfb5f86804763 i18n/jpn/extensions/git/out/model.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -7,6 +8,8 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"too many submodules": "'{0}' リポジトリに {1} 個のサブモジュールがあり、自動では開かれません。 ファイルを開くことで、それぞれを個別に開くことができます。",
-+=======
-+>>>>>>> .their
- 	"no repositories": "利用可能なリポジトリがありません",
- 	"pick repo": "リポジトリの選択"
- }
-\ No newline at end of file
-added in both
-  our    100644 0bcce0f6123b4b62aeac84ed8edc984ed60d5a0e i18n/jpn/extensions/git/out/repository.i18n.json
-  their  100644 553e8a8277f8a862c6981cbd12ddd9b0d0098e2b i18n/jpn/extensions/git/out/repository.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -11,6 +12,19 @@
- 	"modified": "変更済み",
- 	"index added": "インデックスの追加",
- 	"index deleted": "削除されたインデックス",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"open": "開く",
-+	"index modified": "インデックスの変更",
-+	"modified": "変更済み",
-+	"index added": "インデックスの追加",
-+	"index deleted": "インデックスの削除",
-+>>>>>>> .their
- 	"deleted": "削除済み",
- 	"index renamed": "インデックスの名前変更",
- 	"index copied": "インデックスをコピー",
-@@ -23,13 +37,20 @@
- 	"deleted by us": "こちら側による削除",
- 	"both added": "双方とも追加",
- 	"both modified": "双方とも変更",
-+<<<<<<< .our
- 	"commitMessage": "Message (press {0} to commit)",
-+=======
-+>>>>>>> .their
- 	"commit": "コミット",
- 	"merge changes": "変更のマージ",
- 	"staged changes": "ステージング済みの変更",
- 	"changes": "変更",
-+<<<<<<< .our
- 	"commitMessageCountdown": "現在の行で残り {0} 文字",
- 	"commitMessageWarning": "現在の行で {1} から {0} 文字オーバー",
-+=======
-+	"ok": "OK",
-+>>>>>>> .their
- 	"neveragain": "今後は表示しない",
- 	"huge": "'{0}' のGit リポジトリにアクティブな変更が多いため、 Git 機能の一部のみが有効になります。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 07f940f47577317547f3777e96371d1914927aae i18n/jpn/extensions/git/package.i18n.json
-  our    100644 5f3a79c480024cb95bcb777b25dc5a51987c0ee1 i18n/jpn/extensions/git/package.i18n.json
-  their  100644 ffdb7e9c5a1b7cd5d4e736fc5309b1dfba06a923 i18n/jpn/extensions/git/package.i18n.json
-@@ -40,7 +40,10 @@
- 	"command.renameBranch": "ブランチ名の変更...",
- 	"command.merge": "ブランチをマージ...",
- 	"command.createTag": "タグを作成",
-+<<<<<<< .our
- 	"command.fetch": "フェッチ",
-+=======
-+>>>>>>> .their
- 	"command.pull": "プル",
- 	"command.pullRebase": "プル (リベース)",
- 	"command.pullFrom": "指定元からプル...",
-@@ -52,11 +55,18 @@
- 	"command.publish": "ブランチの発行",
- 	"command.showOutput": "Git 出力の表示",
- 	"command.ignore": "ファイルを .gitignore に追加",
-+<<<<<<< .our
- 	"command.stashIncludeUntracked": "スタッシュ (未追跡ファイルを含む)",
- 	"command.stash": "スタッシュ",
- 	"command.stashPop": "スタッシュを適用して削除...",
- 	"command.stashPopLatest": "最新のスタッシュを適用して削除",
- 	"config.enabled": "Git を有効にするかどうか",
-+=======
-+	"command.stash": "スタッシュ",
-+	"command.stashPop": "スタッシュを適用して削除...",
-+	"command.stashPopLatest": "最新のスタッシュを適用して削除",
-+	"config.enabled": "Git が有効になっているかどうか",
-+>>>>>>> .their
- 	"config.path": "Git 実行可能ファイルのパス",
- 	"config.autoRepositoryDetection": "レポジトリを自動的に検出するかどうか",
- 	"config.autorefresh": "自動更新が有効かどうか",
-@@ -71,6 +81,7 @@
- 	"config.defaultCloneDirectory": "Git リポジトリをクローンする既定の場所",
- 	"config.enableSmartCommit": "ステージされた変更がない場合はすべての変更をコミットします。",
- 	"config.enableCommitSigning": "GPG によりデジタル署名されたコミットを有効にします。",
-+<<<<<<< .our
- 	"config.discardAllScope": "'すべての変更を破棄' コマンドによってどの変更が破棄されるかを制御します。'all' はすべての変更を破棄します。 'tracked' は追跡されているファイルだけを破棄します。 'prompt' は、アクションが実行されるたびにプロンプ​​ト ダイアログを表示します。",
- 	"config.decorations.enabled": "Git が配色とバッジをエクスプローラーと開いているエディターのビューに提供するかどうかを制御します。",
- 	"config.promptToSaveFilesBeforeCommit": "コミット前に Git が保存していないファイルを確認すべきかどうかを制御します。",
-@@ -84,4 +95,7 @@
- 	"colors.ignored": "リソースを無視する場合の配色",
- 	"colors.conflict": "リソースが競合する場合の配色",
- 	"colors.submodule": "サブモジュールの配色。"
-+=======
-+	"config.discardAllScope": "'すべての変更を破棄' コマンドによってどの変更が破棄されるかを制御します。'all' はすべての変更を破棄します。 'tracked' は追跡されているファイルだけを破棄します。 'prompt' は、アクションが実行されるたびにプロンプ​​ト ダイアログを表示します。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 b543141db661282d34d06a57ea49cbe63a27afdd i18n/jpn/extensions/html/package.i18n.json
-  our    100644 965c8b85db9835f5a36ffbbc3a7678d3a5dfcffa i18n/jpn/extensions/html/package.i18n.json
-  their  100644 52563f5a5438731553bc62bc61db46bd51686168 i18n/jpn/extensions/html/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,28 @@
- 	],
- 	"displayName": "HTML の基本言語サポート",
- 	"description": "HTML ファイル内で構文ハイライト、かっこ一致、スニペットを提供"
-+=======
-+	"html.format.enable.desc": "既定の HTML フォーマッタを有効/無効にします",
-+	"html.format.wrapLineLength.desc": "1 行あたりの最大文字数 (0 = 無効にする)。",
-+	"html.format.unformatted.desc": "再フォーマットしてはならないタグの、コンマ区切りの一覧。'null' の場合、既定で https://www.w3.org/TR/html5/dom.html#phrasing-content にリストされているすべてのタグになります。",
-+	"html.format.contentUnformatted.desc": "コンテンツを再フォーマットしてはならないタグをコンマで区切ってリストにします。'null' は、既定値の 'pre' タグを表します。",
-+	"html.format.indentInnerHtml.desc": "<head> セクションと <body> セクションをインデントします。",
-+	"html.format.preserveNewLines.desc": "要素の前にある既存の改行を保持するかどうか。要素の前でのみ機能し、タグの内側やテキストに対しては機能しません。",
-+	"html.format.maxPreserveNewLines.desc": "1 つのチャンク内に保持できる改行の最大数。無制限にするには、'null' を使います。",
-+	"html.format.indentHandlebars.desc": "書式設定とインデント {{#foo}} および {{/foo}}。",
-+	"html.format.endWithNewline.desc": "末尾に改行を入れます。",
-+	"html.format.extraLiners.desc": "直前に改行を 1 つ入れるタグの、コンマで区切られたリストです。'null' は、既定値の \"head, body, /html\" を表します。",
-+	"html.format.wrapAttributes.desc": "属性を折り返します。",
-+	"html.format.wrapAttributes.auto": "行の長さが超過した場合のみ属性を折り返します。",
-+	"html.format.wrapAttributes.force": "先頭以外の各属性を折り返します。",
-+	"html.format.wrapAttributes.forcealign": "先頭以外の各属性を折り返して位置を合わせます。",
-+	"html.format.wrapAttributes.forcemultiline": "各属性を折り返します。",
-+	"html.suggest.angular1.desc": "ビルトイン HTML 言語サポートが Angular V1 のタグおよびプロパティを候補表示するかどうかを構成します。",
-+	"html.suggest.ionic.desc": "ビルトイン HTML 言語サポートが Ionic のタグ、プロパティ、および値を候補表示するかどうかを構成します。",
-+	"html.suggest.html5.desc": "ビルトイン HTML 言語サポートが HTML5 のタグ、プロパティ、および値を候補表示するかどうかを構成します。",
-+	"html.trace.server.desc": "VS Code と HTML 言語サーバー間の通信をトレースします。",
-+	"html.validate.scripts": "ビルトイン HTML 言語サポートが埋め込みスクリプトを検証するかどうかを構成します。",
-+	"html.validate.styles": "ビルトイン HTML 言語サポートが埋め込みスタイルを検証するかどうかを構成します。",
-+	"html.autoClosingTags": "HTML タグの自動クローズを有効/無効にします。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7020b602951cfa88892b9615e12e8bf3e6ba1ed9 i18n/jpn/extensions/json/package.i18n.json
-  our    100644 2ec4d67b79918d3a7ddc49906f0618f13f9ef1a8 i18n/jpn/extensions/json/package.i18n.json
-  their  100644 365d8a0de8d3bb423ff764e23ea8625886d0b40d i18n/jpn/extensions/json/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,15 @@
- 	],
- 	"displayName": "JSON の基本言語サポート",
- 	"description": "JSON ファイル内で構文ハイライト、かっこ一致を提供"
-+=======
-+	"json.schemas.desc": "スキーマを現在のプロジェクトの JSON ファイルに関連付けます",
-+	"json.schemas.url.desc": "スキーマへの URL または現在のディレクトリのスキーマへの相対パス",
-+	"json.schemas.fileMatch.desc": "JSON ファイルをスキーマに解決する場合に一致するファイル パターンの配列です。",
-+	"json.schemas.fileMatch.item.desc": "JSON ファイルをスキーマに解決する場合に一致するよう '*' を含む可能性があるファイル パターンです。",
-+	"json.schemas.schema.desc": "指定された URL のスキーマ定義です。スキーマは、スキーマ URL へのアクセスを避けるためにのみ指定する必要があります。",
-+	"json.format.enable.desc": "既定の JSON フォーマッタを有効/無効にします (再起動が必要です)",
-+	"json.tracing.desc": "VS Code と JSON 言語サーバー間の通信をトレースします。",
-+	"json.colorDecorators.enable.desc": "カラー デコレーターを有効または無効にします",
-+	"json.colorDecorators.enable.deprecationMessage": "設定 `json.colorDecorators.enable` は使用されなくなりました。`editor.colorDecorators` を使用してください。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 dc234e49ac5f734e614edee7f9ae790e47c91901 i18n/jpn/extensions/markdown/out/security.i18n.json
-  our    100644 fd9bf5f6a30a99f51a5ca7e2d38e7107dcfb9f9b i18n/jpn/extensions/markdown/out/security.i18n.json
-  their  100644 4ef933fbf913245cf374276ad77246a0308a9c7c i18n/jpn/extensions/markdown/out/security.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"strict.title": "高レベル",
- 	"strict.description": "セキュリティで保護されたコンテンツのみを読み込む",
- 	"insecureContent.title": "セキュリティで保護されていないコンテンツを許可する",
-@@ -13,8 +16,11 @@
- 	"disable.title": "無効にする",
- 	"disable.description": "すべてのコンテンツとスクリプトの実行を許可します。推奨されません。",
- 	"moreInfo.title": "詳細情報",
-+<<<<<<< .our
- 	"enableSecurityWarning.title": "このワークスペースでプレビューのセキュリティ警告を有効にする",
- 	"disableSecurityWarning.title": "このワークスペースでプレビューのセキュリティ警告を有効にする",
- 	"toggleSecurityWarning.description": "コンテンツのセキュリティ レベルには影響しません",
-+=======
-+>>>>>>> .their
- 	"preview.showPreviewSecuritySelector.title": "ワークスペースのマークダウン プレビューに関するセキュリティ設定を選択 "
- }
-\ No newline at end of file
-changed in both
-  base   100644 5efdc62eafa17220254909cb47c2f87190c9aa46 i18n/jpn/extensions/markdown/package.i18n.json
-  our    100644 58b68df0b74f4d164ab945b5a5c202367b240d88 i18n/jpn/extensions/markdown/package.i18n.json
-  their  100644 9c09de2d69a13a871142e7f954f937a50d3fd097 i18n/jpn/extensions/markdown/package.i18n.json
-@@ -26,7 +26,12 @@
- 	"markdown.showSource.title": "ソースの表示",
- 	"markdown.styles.dec": "マークダウン プレビューから使用する CSS スタイル シートの URL またはローカル パスの一覧。相対パスは、エクスプローラーで開かれているフォルダーへの絶対パスと解釈されます。開かれているフォルダーがない場合、マークダウン ファイルの場所を基準としていると解釈されます。'\\' はすべて '\\\\' と入力する必要があります。",
- 	"markdown.showPreviewSecuritySelector.title": "プレビュー のセキュリティ設定を変更",
-+<<<<<<< .our
- 	"markdown.trace.desc": "マークダウン拡張機能のデバッグ ログを有効にします。",
- 	"markdown.preview.refresh.title": "プレビューを更新",
- 	"markdown.preview.toggleLock.title": "プレビュー ロックの切り替え"
-+=======
-+	"markdown.trace.desc": "マークダウン拡張機能のデバッグログを有効にします。",
-+	"markdown.refreshPreview.title": "プレビューを更新"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 4b09d67cea313ddd3810ae384f2ea5917e3dd8b7 i18n/jpn/extensions/typescript/out/utils/api.i18n.json
-  their  100644 b15aaab723fb747359168e38aa60a11e1b3343b0 i18n/jpn/extensions/typescript/out/utils/api.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"invalidVersion": "バージョンが無効です"
- }
-\ No newline at end of file
-changed in both
-  base   100644 e23b727c84679dc892fca8cafed6a30aad582cbf i18n/jpn/extensions/typescript/out/utils/versionPicker.i18n.json
-  our    100644 e9aaf9781518556af0335b45d96f8e5ae3def24d i18n/jpn/extensions/typescript/out/utils/versionPicker.i18n.json
-  their  100644 1668a6e2c0366b05d71187b6044623e32f9d706d i18n/jpn/extensions/typescript/out/utils/versionPicker.i18n.json
-changed in both
-  base   100644 b756a20a584a65b0058ac92379d6f95d2d9eeb4c i18n/jpn/extensions/typescript/out/utils/versionProvider.i18n.json
-  our    100644 bb98209ca70f6fbf5bd49e69ee1ab7dd774f320a i18n/jpn/extensions/typescript/out/utils/versionProvider.i18n.json
-  their  100644 7aeb9d9672f6f3c88e6fd07d3a98a8d180b35366 i18n/jpn/extensions/typescript/out/utils/versionProvider.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"couldNotLoadTsVersion": "このパスでは TypeScript のバージョンを読み込むことができません",
- 	"noBundledServerFound": "VS Code の tsserver が適切に動作しないウイルス検出ツールなどの他アプリケーションにより削除されました。VS Code を再インストールしてください。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 79c205c42ce4ef28b92e1871ad6e0824094c2021 i18n/jpn/extensions/typescript/package.i18n.json
-  our    100644 a1554306e84a86835cd4f134180dd845efc6c209 i18n/jpn/extensions/typescript/package.i18n.json
-  their  100644 7d6417ebf7df3bed933a91edec713397e227a1f7 i18n/jpn/extensions/typescript/package.i18n.json
-changed in both
-  base   100644 2f15aceaa80c87e80a101a6bc343fe141bdefb8c i18n/jpn/src/vs/code/electron-main/menus.i18n.json
-  our    100644 ff7eb3df479fa3b25aa486b1991a4263b1ee917b i18n/jpn/src/vs/code/electron-main/menus.i18n.json
-  their  100644 fc66e6ab2419a91b42d35628a11ee89664f0dddd i18n/jpn/src/vs/code/electron-main/menus.i18n.json
-changed in both
-  base   100644 d8c6d81fa40ece144b2a4edf82ae50c2294f44b2 i18n/jpn/src/vs/code/electron-main/windows.i18n.json
-  our    100644 f510ab911e2d4f9c5226e45799f0fea593c0177a i18n/jpn/src/vs/code/electron-main/windows.i18n.json
-  their  100644 8297ee97c1a0421bf08f26e13ecac71e31a40dd9 i18n/jpn/src/vs/code/electron-main/windows.i18n.json
-@@ -9,15 +9,30 @@
- 	"ok": "OK",
- 	"pathNotExistTitle": "パスが存在しません",
- 	"pathNotExistDetail": "パス '{0}' はディスクに存在しなくなったようです。",
-+<<<<<<< .our
- 	"reopen": "もう一度開く(&&R)",
- 	"wait": "待機を続ける(&&K)",
- 	"close": "閉じる(&&C)",
-+=======
-+	"openWorkspace": "開く(&&O)",
-+	"openWorkspaceTitle": "ワークスペースを開く",
-+	"save": "保存(&&S)",
-+	"doNotSave": "保存しない(&&N)",
-+	"cancel": "キャンセル",
-+	"saveWorkspaceMessage": "ワークスペースの構成をファイルとして保存しますか?",
-+	"saveWorkspaceDetail": "再度開く予定があるならワークスペースを保存します。",
-+	"saveWorkspace": "ワークスペースを保存",
-+	"reopen": "もう一度開く",
-+	"wait": "待機を続ける",
-+	"close": "閉じる",
-+>>>>>>> .their
- 	"appStalled": "ウィンドウから応答がありません",
- 	"appStalledDetail": "ウィンドウを再度開くか、閉じるか、このまま待機できます。",
- 	"appCrashed": "ウィンドウがクラッシュしました",
- 	"appCrashedDetail": "ご不便をおかけして申し訳ありません。ウィンドウを再度開いて、中断したところから続行できます。",
- 	"open": "開く",
- 	"openFolder": "フォルダーを開く",
-+<<<<<<< .our
- 	"openFile": "ファイルを開く",
- 	"workspaceOpenedMessage": "ワークスペース '{0}' を保存できません",
- 	"workspaceOpenedDetail": "ワークスペースは既に別のウィンドウで開いています。最初にそのウィンドウを閉じててから、もう一度やり直してください。",
-@@ -29,4 +44,7 @@
- 	"saveWorkspaceMessage": "ワークスペースの構成をファイルとして保存しますか?",
- 	"saveWorkspaceDetail": "再度開く予定があるならワークスペースを保存します。",
- 	"saveWorkspace": "ワークスペースを保存"
-+=======
-+	"openFile": "ファイルを開く"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d8054ab9fe465a47ed3380c5dc24a6f7760e7e59 i18n/jpn/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 8a524167aa36e1a9cb85f51526bd76d90fd343d7 i18n/jpn/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 28b5711561e05aa1a0c1173c7514ec4bed99b8f2 i18n/jpn/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -26,11 +26,17 @@
- 	"detectIndentation": "ファイルを開くと、そのファイルの内容に基づいて `editor.tabSize` と `editor.insertSpaces` が検出されます。",
- 	"roundedSelection": "選択範囲の角を丸くするかどうかを制御します",
- 	"scrollBeyondLastLine": "エディターで最後の行を越えてスクロールするかどうかを制御します",
-+<<<<<<< .our
- 	"scrollBeyondLastColumn": "エディターが水平方向に余分にスクロールする文字数を制御します",
- 	"smoothScrolling": "アニメーションでエディターをスクロールするかどうかを制御します",
- 	"minimap.enabled": "ミニマップを表示するかどうかを制御します",
- 	"minimap.side": "ミニマップを表示する場所を制御します。",
- 	"minimap.showSlider": "ミニマップのスライダーを自動的に非表示にするかどうかを制御します。",
-+=======
-+	"smoothScrolling": "アニメーションでエディターをスクロールするかどうかを制御します",
-+	"minimap.enabled": "ミニマップを表示するかどうかを制御します",
-+	"minimap.showSlider": "ミニマップのスライダーを自動的に非表示にするかどうかを制御します。指定できる値は 'always' と 'mouseover' です",
-+>>>>>>> .their
- 	"minimap.renderCharacters": "行に (カラー ブロックではなく) 実際の文字を表示します",
- 	"minimap.maxColumn": "表示するミニマップの最大幅を特定の桁数に制限します",
- 	"find.seedSearchStringFromSelection": "エディターの選択から検索ウィジェット内の検索文字列を与えるかどうかを制御します",
-@@ -106,11 +112,14 @@
- 	"accessibilitySupport": "エディターをスクリーン リーダーに最適化されたモードで実行するかどうかを制御します。",
- 	"links": "エディターがリンクを検出してクリック可能な状態にするかどうかを制御します",
- 	"colorDecorators": "エディターでインライン カラー デコレーターと色の選択を表示する必要があるかどうかを制御します。",
-+<<<<<<< .our
- 	"codeActions": "コード アクション (lightbulb) を有効にする",
- 	"codeActionsOnSave.organizeImports": "保存時にインポートの整理を実行しますか?",
- 	"codeActionsOnSave": "保存時に実行されるコードアクションの種類。",
- 	"codeActionsOnSaveTimeout": "保存時に実行されるコード アクションのタイムアウト値。",
- 	"selectionClipboard": "Linux の PRIMARY クリップボードをサポートするかどうかを制御します。",
-+=======
-+>>>>>>> .their
- 	"sideBySide": "差分エディターが差分を横に並べて表示するか、行内に表示するかを制御します",
- 	"ignoreTrimWhitespace": "差分エディターが、先頭または末尾の空白の変更を差分として表示するかどうかを制御します。",
- 	"largeFileOptimizations": "大きなファイルでメモリが集中する特定の機能を無効にするための特別な処理。",
-changed in both
-  base   100644 a41f64b8ff210eab3b1ea3a4f0d341395bcea628 i18n/jpn/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 94d561750e1a7b0be01cfe4af934ab8ee7840419 i18n/jpn/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 903a157c87a27a1305c3060b871b1a3b85f03060 i18n/jpn/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -28,12 +28,16 @@
- 	"errorBorder": "エディターでエラーを示す波線の境界線の色。",
- 	"warningForeground": "エディターで警告を示す波線の前景色。",
- 	"warningBorder": "エディターで警告を示す波線の境界線の色。",
-+<<<<<<< .our
- 	"infoForeground": "エディターで情報を示す波線の前景色。",
- 	"infoBorder": "エディターで情報を示す波線の境界線の色。",
- 	"hintForeground": "エディターでヒントを示す波線の前景色。",
- 	"hintBorder": "エディターでヒントを示す波線の境界線の色。",
- 	"unnecessaryForeground": "エディターの中で不要なコードを示す前景色。",
- 	"overviewRulerRangeHighlight": "範囲を強調表示するときの概要ルーラーのマーカー色。この色は下地の色に紛れないよう不明瞭であってはいけません。",
-+=======
-+	"overviewRulerRangeHighlight": "範囲を強調表示するときの概要ルーラーのマーカー色。",
-+>>>>>>> .their
- 	"overviewRuleError": "エラーを示す概要ルーラーのマーカー色。",
- 	"overviewRuleWarning": "警告を示す概要ルーラーのマーカー色。",
- 	"overviewRuleInfo": "情報を示す概要ルーラーのマーカー色。"
-changed in both
-  base   100644 e091fdcbaecba6aafa2326a177880abea2d98ace i18n/jpn/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
-  our    100644 8eac21c6979bdc2bbd84922338b3a14576eeeb14 i18n/jpn/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
-  their  100644 f416a1266bdbfa79cca2164af7cb7be4dc51b3b0 i18n/jpn/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
-@@ -7,7 +7,11 @@
- 	"wordHighlight": "変数の読み取りなど読み取りアクセス中のシンボルの背景色。",
- 	"wordHighlightStrong": "変数への書き込みなど書き込みアクセス中のシンボルの背景色。",
- 	"overviewRulerWordHighlightForeground": "シンボルを強調表示するときの概要ルーラーのマーカー色。",
-+<<<<<<< .our
- 	"overviewRulerWordHighlightStrongForeground": "書き込みアクセス シンボルを強調表示するときの概要ルーラーのマーカー色。",
- 	"wordHighlight.next.label": "次のシンボル ハイライトに移動",
- 	"wordHighlight.previous.label": "前のシンボル ハイライトに移動"
-+=======
-+	"overviewRulerWordHighlightStrongForeground": "書き込みアクセス シンボルを強調表示するときの概要ルーラーのマーカー色。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6cd2c2e4b34acd009c647186b74f2f81258cdef5 i18n/jpn/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 dd4553b6a25f3d18d9ae6f341855e230cceed4fe i18n/jpn/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 7fcdc0fb8ddc6f1c809f1c064ab1e2d7f641b140 i18n/jpn/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,9 +10,12 @@
- 	"diff": "2 つのファイルを比較します。",
- 	"add": "最後にアクティブだったウィンドウにフォルダーを追加します。",
- 	"goto": "指定した行と文字の位置にあるパスでファイルを開きます。",
-+<<<<<<< .our
- 	"newWindow": "強制的に新しいウィンドウを開きます。",
- 	"reuseWindow": "強制的に最後にアクティブだったウィンドウ内でファイルかフォルダーを開きます。",
- 	"wait": "現在のファイルが閉じられるまで待機します。",
-+=======
-+>>>>>>> .their
- 	"locale": "使用する国と地域 (例:en-US や zh-TW など)。",
- 	"userDataDir": "ユーザー データが保持されるディレクトリを指定します。複数の異なる Code のインスタンスを開くために使用できます。",
- 	"version": "バージョンを表示します。",
-added in both
-  our    100644 05d5a73192031bc4a1ae4b366828405dfc3d46f3 i18n/jpn/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
-  their  100644 ae9d901594c2aeac775aae396079e027d3219b93 i18n/jpn/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"contributes.color": "拡張機能でテーマ設定の可能な配色を提供します",
- 	"contributes.color.id": "テーマ設定可能な配色の識別子",
- 	"contributes.color.id.format": "識別子は aa[.bb]* の形式にする必要があります",
-@@ -15,8 +24,14 @@
- 	"contributes.defaults.highContrast": "high contrast テーマの既定の配色。配色の値は 16 進数(#RRGGBB[AA]) 、または 既定で提供されているテーマ設定可能な配色の識別子の既定値のいずれか。",
- 	"invalid.colorConfiguration": "'configuration.colors' は配列である必要があります",
- 	"invalid.default.colorType": "{0} は 16 進数(#RRGGBB[AA] または  #RGB[A]) 、または 既定で提供されているテーマ設定可能な配色の識別子の既定値のいずれかでなければなりません。",
-+<<<<<<< .our
- 	"invalid.id": "'configuration.colors.id' を定義してください。空にはできません。",
- 	"invalid.id.format": "'configuration.colors.id' は word[.word]* の形式である必要があります",
- 	"invalid.description": "'configuration.colors.description' を定義してください。空にはできません。",
-+=======
-+	"invalid.id": "'configuration.colors.id' は定義する必要があり、空にできません",
-+	"invalid.id.format": "'configuration.colors.id' は word[.word]* の形式である必要があります",
-+	"invalid.description": "'configuration.colors.description' は定義する必要があり、空にできません \n",
-+>>>>>>> .their
- 	"invalid.defaults": "'configuration.colors.defaults' は定義する必要があります。'light' か 'dark'、'highContrast' を含める必要があります。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 272213197af5146c2bcf08d8814720f69302ffa7 i18n/jpn/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 10667640968038e7107ce7d296e8264e00fd0ada i18n/jpn/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 69cc08c144eaaade5aa393b2c276758b3b5a33b0 i18n/jpn/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -96,6 +96,11 @@
- 	"overviewRulerCurrentContentForeground": "行内マージ競合の現在の概要ルーラー前景色。",
- 	"overviewRulerIncomingContentForeground": "行内マージ競合の入力側の概要ルーラー前景色。",
- 	"overviewRulerCommonContentForeground": "行内マージ競合の共通の祖先概要ルーラー前景色。",
-+<<<<<<< .our
- 	"overviewRulerFindMatchForeground": "検索一致項目を示す概要ルーラーのマーカー色。この色は下地の色に紛れないよう不明瞭であってはいけません。",
- 	"overviewRulerSelectionHighlightForeground": "選択範囲を強調表示するときの概要ルーラーのマーカー色。この色は下地の色に紛れないよう不明瞭であってはいけません。"
-+=======
-+	"overviewRulerFindMatchForeground": "一致項目を示す概要ルーラーのマーカー色。",
-+	"overviewRulerSelectionHighlightForeground": "選択対象を強調表示するときの概要ルーラーのマーカー色。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 9b3ca7f2d6cc1eb0b1569ba73c37898953e05060 i18n/jpn/src/vs/platform/workspaces/common/workspaces.i18n.json
-  their  100644 fad7eabca20ecc0f9c8ed0e3e24db6f65ffde556 i18n/jpn/src/vs/platform/workspaces/common/workspaces.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"codeWorkspace": "コード ワークスペース",
- 	"untitledWorkspace": "未設定 (ワークスペース)",
- 	"workspaceNameVerbose": "{0} (ワークスペース)",
-added in both
-  our    100644 d7be1321439c96d9fae4f07a1df5a556a542303d i18n/jpn/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
-  their  100644 5d369543a9a2995ec0acd1756d3ec3b7b6ab24de i18n/jpn/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,4 +11,16 @@
- 	"failedDep1": "拡張機能 '{1}' のアクティブ化に失敗しました。理由: 依存関係 '{0}' のアクティブ化に失敗しました。",
- 	"failedDep2": "拡張機能 '{0}' のアクティブ化に失敗しました。理由: 依存関係のレベルが 10 を超えています (依存関係のループの可能性があります)。",
- 	"activationError": "拡張機能 '{0}' のアクティブ化に失敗しました: {1}。"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"unknownDep": "拡張機能 `{1}` のアクティブ化に失敗しました。理由: 依存関係 `{0}` が不明です。",
-+	"failedDep1": "拡張機能 `{1}` のアクティブ化に失敗しました。理由: 依存関係 `{0}` のアクティブ化に失敗しました。",
-+	"failedDep2": "拡張機能 `{0}` のアクティブ化に失敗しました。理由: 依存関係のレベルが 10 を超えています (依存関係のループの可能性があります)。",
-+	"activationError": "拡張機能 `{0}` のアクティブ化に失敗しました: {1}。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 779f48926f3ef595774a18b9694c3d3e1e220a9f i18n/jpn/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 504738102db98241f299da4b50371a12d6a5d3cc i18n/jpn/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 a93dd60c18554ad2fb3c61821d15a6ae63841955 i18n/jpn/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -9,6 +9,7 @@
- 	"openFile": "ファイルを開く...",
- 	"openFolder": "フォルダーを開く...",
- 	"openFileFolder": "開く...",
-+<<<<<<< .our
- 	"globalRemoveFolderFromWorkspace": "ワークスペースからフォルダーを削除...",
- 	"saveWorkspaceAsAction": "名前を付けてワークスペースを保存...",
- 	"save": "保存(&&S)",
-@@ -16,4 +17,19 @@
- 	"openWorkspaceAction": "ワークスペースを開く...",
- 	"openWorkspaceConfigFile": "ワークスペースの構成ファイルを開く",
- 	"duplicateWorkspaceInNewWindow": "新しいウィンドウでワークスペースを複製"
-+=======
-+	"addFolderToWorkspace": "ワークスペースにフォルダーを追加...",
-+	"add": "追加(&&A)",
-+	"addFolderToWorkspaceTitle": "ワークスペースにフォルダーを追加",
-+	"newWorkspace": "新しいワークスペース...",
-+	"select": "選択(&&S)",
-+	"selectWorkspace": "ワークスペースのフォルダーを選択",
-+	"removeFolderFromWorkspace": "ワークスペースからフォルダーを削除",
-+	"saveWorkspaceAsAction": "名前を付けてワークスペースを保存...",
-+	"saveEmptyWorkspaceNotSupported": "最初に保存するためのワークスペースを開いてください。",
-+	"save": "保存(&&S)",
-+	"saveWorkspace": "ワークスペースを保存",
-+	"openWorkspaceAction": "ワークスペースを開く...",
-+	"openWorkspaceConfigFile": "ワークスペースの構成ファイルを開く"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 33e26a1ff3fd0fd88e9e3ed69ac5759e8419b2ca i18n/jpn/src/vs/workbench/common/theme.i18n.json
-  our    100644 b14021a35078518051aec469e7adb4b85583e1c9 i18n/jpn/src/vs/workbench/common/theme.i18n.json
-  their  100644 f422c0d20f5cb7f7f1c025f2638a05d106fd1f1e i18n/jpn/src/vs/workbench/common/theme.i18n.json
-@@ -11,12 +11,17 @@
- 	"tabHoverBackground": "ホバー時のタブの背景色。タブはエディター領域におけるエディターのコンテナです。1 つのエディター グループで複数のタブを開くことができます。エディター グループを複数にすることもできます。",
- 	"tabUnfocusedHoverBackground": "ホバー時のフォーカスされていないグループ内のタブの背景色。タブはエディター領域におけるエディターのコンテナです。1 つのエディター グループで複数のタブを開くことができます。エディター グループを複数にすることもできます。",
- 	"tabBorder": "タブ同士を分けるための境界線。タブはエディター領域内にあるエディターのコンテナーです。複数のタブを 1 つのエディター グループで開くことができます。複数のエディター グループがある可能性があります。",
-+<<<<<<< .our
- 	"tabActiveBorder": "アクティブなタブの下部の境界線。タブはエディター領域内にあるエディターのコンテナーです。複数のタブを 1 つのエディター グループで開くことができます。複数のエディター グループがある可能性があります。",
- 	"tabActiveBorderTop": "アクティブなタブの上部の境界線。タブはエディター領域内にあるエディターのコンテナーです。複数のタブを 1 つのエディター グループで開くことができます。複数のエディター グループがある可能性があります。",
- 	"tabActiveUnfocusedBorder": "フォーカスされていないグループ内で、アクティブなタブの下部の境界線。タブはエディター領域内にあるエディターのコンテナーです。複数のタブを 1 つのエディター グループで開くことができます。複数のエディター グループがある可能性があります。",
- 	"tabActiveUnfocusedBorderTop": "フォーカスされていないグループ内で、アクティブなタブの上部の境界線。タブはエディター領域内にあるエディターのコンテナーです。複数のタブを 1 つのエディター グループで開くことができます。複数のエディター グループがある可能性があります。",
- 	"tabHoverBorder": "ホバー時のタブを強調表示するための境界線。タブはエディター領域内にあるエディターのコンテナーです。複数のタブを 1 つのエディター グループで開くことができます。複数のエディター グループがある可能性があります。",
- 	"tabUnfocusedHoverBorder": "ホバー時のフォーカスされていないグループ内のタブを強調表示するための境界線。タブはエディター領域内にあるエディターのコンテナーです。複数のタブを 1 つのエディター グループで開くことができます。複数のエディター グループがある可能性があります。",
-+=======
-+	"tabActiveBorder": "アクティブなタブを強調表示するための境界線。タブはエディター領域内にあるエディターのコンテナーです。複数のタブを 1 つのエディター グループで開くことができます。複数のエディター グループがある可能性があります。",
-+	"tabActiveUnfocusedBorder": "フォーカスされていないグループ内のアクティブ タブを強調表示するための境界線。タブはエディター領域内にあるエディターのコンテナーです。複数のタブを 1 つのエディター グループで開くことができます。複数のエディター グループがある可能性があります。",
-+>>>>>>> .their
- 	"tabActiveForeground": "アクティブ グループ内のアクティブ タブの前景色。タブはエディター領域におけるエディターのコンテナーです。1 つのエディター グループで複数のタブを開くことができます。エディター グループを複数にすることもできます。",
- 	"tabInactiveForeground": "アクティブ グループ内の非アクティブ タブの前景色。タブはエディター領域におけるエディターのコンテナーです。1 つのエディター グループで複数のタブを開くことができます。エディター グループを複数にすることもできます。",
- 	"tabUnfocusedActiveForeground": "フォーカスされていないグループ内のアクティブ タブの前景色。タブはエディター領域におけるエディターのコンテナーです。1 つのエディター グループで複数のタブを開くことができます。エディター グループを複数にすることもできます。",
-@@ -32,7 +37,10 @@
- 	"panelActiveTitleForeground": "アクティブ パネルのタイトルの色。パネルはエディター領域の下に表示され、出力や統合ターミナルなどのビューを含みます。",
- 	"panelInactiveTitleForeground": "非アクティブ パネルのタイトルの色。パネルはエディター領域の下に表示され、出力や統合ターミナルなどのビューを含みます。",
- 	"panelActiveTitleBorder": "アクティブ パネル タイトルの境界線の色。パネルはエディター領域の下に表示され、出力や統合ターミナルなどのビューを含みます。",
-+<<<<<<< .our
- 	"panelDragAndDropBackground": "パネル タイトル項目のドラッグ アンド ドロップ フィードバックの色。パネル エントリーが最後まで輝くために、色は透過である必要があります。パネルはエディター エリアの下側に表示され、出力や統合ターミナルのようなビューを含みます。",
-+=======
-+>>>>>>> .their
- 	"statusBarForeground": "ワークスペースを開いていないときのステータス バーの前景色。ステータス バーはウィンドウの下部に表示されます。",
- 	"statusBarNoFolderForeground": "フォルダーが開いていないときのステータス バーの前景色。ステータス バーはウィンドウの下部に表示されます。",
- 	"statusBarBackground": "ワークスペースを開いていないときのステータス バーの背景色。ステータス バーはウィンドウの下部に表示されます。",
-changed in both
-  base   100644 090217063f9252bcd40cff1faa003e68d2af2c20 i18n/jpn/src/vs/workbench/electron-browser/window.i18n.json
-  our    100644 b544af3baf4b86010347cffabbb513883c29d0b1 i18n/jpn/src/vs/workbench/electron-browser/window.i18n.json
-  their  100644 0813ed28598088e292a260022b49a00ce865f8fa i18n/jpn/src/vs/workbench/electron-browser/window.i18n.json
-@@ -11,6 +11,10 @@
- 	"cut": "切り取り",
- 	"copy": "コピー",
- 	"paste": "貼り付け",
-+<<<<<<< .our
- 	"selectAll": "すべて選択",
- 	"runningAsRoot": "{0} をルート ユーザーとして実行しないことを推奨します。"
-+=======
-+	"selectAll": "すべて選択"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 465ad161ad9019e6037783d4db70e6c5eccb46bc i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
-  their  100644 7ad50e6716e07f05ce606f05b7df818ffababcd6 i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"toggleMinimap": "表示: ミニマップの切り替え"
- }
-\ No newline at end of file
-changed in both
-  base   100644 a507f7468448b1e56064910ed11d8fa1779a6ce9 i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
-  our    100644 cb1849eb7ae4af3537113c13b7e90498c6b8b8b9 i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
-  their  100644 debd28baf6431a07028d34d7f74ef33f82b4e88d i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"toggleRenderControlCharacters": "表示: 制御文字の切り替え"
- }
-\ No newline at end of file
-changed in both
-  base   100644 eae0b2cf15a878644be7ca690a5c181295b0cb2a i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
-  our    100644 888a38817b8577928cd969a46fa82bf8b602a237 i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
-  their  100644 9601fcc6e74b030a394b4dac0fb2a3cfd59f7ba2 i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"toggleRenderWhitespace": "表示: 空白文字の表示の切り替え"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8eef43766e8052a367343ee2707878adbbcd157a i18n/jpn/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  our    100644 2aabd470587713910c03051d128af69e0ce6da7a i18n/jpn/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  their  100644 52c478e6b9508361dd18da29ebc355fe7a6fe88d i18n/jpn/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-changed in both
-  base   100644 27747833c5159b7c2ea6e1004253041e40d2a70c i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 94c8c8c8a16f500b0da2b646b5e8bf435bacba10 i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 6754c23d67a4da1c0ec45bcacf783e3246146a37 i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -28,7 +28,12 @@
- 	"preLaunchTaskExitCode": "preLaunchTask '{0}' が終了コード {1} で終了しました。",
- 	"showErrors": "エラーの表示",
- 	"noFolderWorkspaceDebugError": "アクティブ ファイルをデバッグできません。ファイルがディスクに保存されており、そのファイル タイプのデバッグ拡張機能がインストールされていることを確認してください。",
-+<<<<<<< .our
- 	"cancel": "キャンセル",
- 	"DebugTaskNotFound": "タスク '{0}' を見つけられませんでした。",
- 	"taskNotTracked": "タスク '{0}' を追跡できません。"
-+=======
-+	"NewLaunchConfig": "アプリケーションの起動構成ファイルをセットアップしてください。{0}",
-+	"DebugTaskNotFound": "preLaunchTask '{0}' が見つかりませんでした。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d63fe387f50b01d86c60c5fb38c9b8a2ed7dbf47 i18n/jpn/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  our    100644 152d9f1c423ce54f49fe4ae6d0188ae9e99338d8 i18n/jpn/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  their  100644 e96a6ca745692ba4d3fd23db26287933d53f7593 i18n/jpn/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-@@ -8,6 +8,23 @@
- 	],
- 	"debugAdapterBinNotFound": "デバッグ アダプターの実行可能ファイル '{0}' がありません。",
- 	"debugAdapterCannotDetermineExecutable": "デバッグ アダプター '{0}' の実行可能ファイルを判別できません。",
-+<<<<<<< .our
- 	"unableToLaunchDebugAdapter": "デバッグ アダプターを {0} から起動できません。",
- 	"unableToLaunchDebugAdapterNoArgs": "デバッグ アダプターを起動できません。"
-+=======
-+	"launch.config.comment1": "IntelliSense を使用して利用可能な属性を学べます。",
-+	"launch.config.comment2": "既存の属性の説明をホバーして表示します。",
-+	"launch.config.comment3": "詳細情報は次を確認してください: {0}",
-+	"debugType": "構成の種類。",
-+	"debugTypeNotRecognised": "デバッグの種類は認識されませんでした。対応するデバッグの拡張機能がインストールされており、有効になっていることを確認してください。",
-+	"node2NotSupported": "\"node2\" はサポートされていません。代わりに \"node\" を使用し、\"protocol\" 属性を \"inspector\" に設定してください。",
-+	"debugName": "構成の名前。起動構成のドロップダウン メニューに表示されます。",
-+	"debugRequest": "構成の要求の種類。\"launch\" または \"attach\" です。",
-+	"debugServer": "デバッグ拡張機能の開発のみ。ポートが指定の VS Code の場合、サーバー モードで実行中のデバッグ アダプターへの接続が試行されます。",
-+	"debugPrelaunchTask": "デバッグ セッションの開始前に実行するタスク。",
-+	"debugWindowsConfiguration": "Windows 固有の起動構成の属性。",
-+	"debugOSXConfiguration": "OS X 固有の起動構成の属性。",
-+	"debugLinuxConfiguration": "Linux 固有の起動構成の属性。",
-+	"deprecatedVariables": "'env.'、'config.'、'command.' は使用されていません。代わりに、'env:'、'config:'、'command:' を使用してください。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c967445c40cbaaad580c2556a3d356e8bc435dc3 i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 69dc63c434a809f92bc13d405e990c05feb2db91 i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 473ed0e7c04f8f1dc6b2d1f5b4f8eea30cb47b54 i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-@@ -52,7 +52,14 @@
- 	"extensionInstalled": "推奨された拡張機能がすでにインストールされています",
- 	"showRecommendedKeymapExtensionsShort": "キーマップ",
- 	"showLanguageExtensionsShort": "言語の拡張機能",
-+<<<<<<< .our
- 	"showAzureExtensionsShort": "Azure 拡張機能",
-+=======
-+	"showAzureExtensions": "Azure 拡張機能の表示",
-+	"showAzureExtensionsShort": "Azure 拡張機能",
-+	"configureWorkspaceRecommendedExtensions": "お勧めの拡張機能の構成 (ワークスペース)",
-+	"ConfigureWorkspaceRecommendations.noWorkspace": "推奨事項はワークスペース フォルダーでのみ利用可能です。",
-+>>>>>>> .their
- 	"OpenExtensionsFile.failed": "'.vscode' ファルダー ({0}) 内に 'extensions.json' ファイルを作成できません。",
- 	"configureWorkspaceRecommendedExtensions": "推奨事項の拡張機能を構成 (ワークスペース)",
- 	"configureWorkspaceFolderRecommendedExtensions": "推奨事項の拡張機能を構成 (ワークスペース フォルダー)",
-changed in both
-  base   100644 b2abd33ddd473b6dabfe4deb10c9b9b0a412dd95 i18n/jpn/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  our    100644 2ef009f9c59c0827e7d3538b89266dc7db0d0891 i18n/jpn/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  their  100644 b11053bec023dbbfbbf23ee1a3f0edfef86a2302 i18n/jpn/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-changed in both
-  base   100644 137f07f4650c922f77bc5e82e87c706c5347e7a1 i18n/jpn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 5461c0b3fa9062516c7b3d179dc36d861ad4f80d i18n/jpn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 a6f39fd24c3280e737f6b2207768307652b34f43 i18n/jpn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-@@ -40,14 +40,21 @@
- 	"dynamicHeight": "開いているエディターのセクションの高さを要素の数に合わせて動的に調整するかどうかを制御します。",
- 	"autoReveal": "エクスプローラーでファイルを開くとき、自動的にファイルの内容を表示して選択するかどうかを制御します。",
- 	"enableDragAndDrop": "ドラッグ アンド ドロップを使用したファイルとフォルダーの移動をエクスプローラーが許可するかどうかを制御します。",
-+<<<<<<< .our
- 	"confirmDragAndDrop": "ドラッグ アンド ドロップを使用したファイルやフォルダーの移動時にエクスプローラーが確認を求めるかどうかを制御します。",
- 	"confirmDelete": "ごみ箱を経由したファイル削除時にエクスプローラーが確認を求めるかどうかを制御します。",
-+=======
-+>>>>>>> .their
- 	"sortOrder.default": "ファイルとフォルダーをアルファベット順に名前で並び替えます。フォルダーはファイルの前に表示されます。",
- 	"sortOrder.mixed": "ファイルとフォルダーをアルファベット順に名前で並び替えます。ファイルはフォルダーと混交して表示されます。",
- 	"sortOrder.filesFirst": "ファイルとフォルダーをアルファベット順に名前で並び替えます。ファイルはフォルダーの前に表示されます。",
- 	"sortOrder.type": "ファイルとフォルダーをアルファベット順に拡張子で並び替えます。フォルダーはファイルの前に表示されます。",
- 	"sortOrder.modified": "ファイルとフォルダーを降順に最終更新日で並び替えます。フォルダーはファイルの前に表示されます。",
-+<<<<<<< .our
- 	"sortOrder": "エクスプローラー内のファイルとフォルダーの並び順を制御します。既定の並び順に加えて、'mixed' (ファイルとフォルダーを混交した並び順)、' type' (ファイルの種類順)、' modified' (最終更新日時順)、または 'filesFirst' (フォルダーの前にファイルを並べる) のいずれかの並び順に設定できます。 ",
- 	"explorer.decorations.colors": "ファイルの装飾に配色を使用するかどうかを制御します。",
- 	"explorer.decorations.badges": "ファイルの装飾にバッジを使用するかどうかを制御します。"
-+=======
-+	"sortOrder": "エクスプローラー内のファイルとフォルダーの並び順を制御します。既定の並び順に加えて、'mixed' (ファイルとフォルダーを混交した並び順)、' type' (ファイルの種類順)、' modified' (最終更新日時順)、または 'filesFirst' (フォルダーの前にファイルを並べる) のいずれかの並び順に設定できます。 "
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7e7aa33fae700b5345a33c53c3b9cb95c931546f i18n/jpn/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
-  our    100644 f9c3565a125a3775c3cb9968e3484f6908b01830 i18n/jpn/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
-  their  100644 2199fe2e71e00cdc40e549a58c82dba42ff64a34 i18n/jpn/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
-@@ -10,9 +10,12 @@
- 	"dropFolder": "ワークスペースにフォルダーを追加しますか?",
- 	"addFolders": "フォルダーの追加(&&A)",
- 	"addFolder": "フォルダーの追加(&&A)",
-+<<<<<<< .our
- 	"confirmMove": "'{0}' を移動しますか?",
- 	"doNotAskAgain": "再度表示しない",
- 	"moveButtonLabel": "移動(&&M)",
-+=======
-+>>>>>>> .their
- 	"confirmOverwriteMessage": "'{0}' は保存先フォルダーに既に存在します。置き換えてもよろしいですか。",
- 	"irreversible": "このアクションは元に戻すことができません。",
- 	"replaceButtonLabel": "置換(&&R)"
-changed in both
-  base   100644 4de3a3dae6f0243652321d24feb82b33dbb78aa1 i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 c8dc571e62a5169caab40469ba18a9dcea479c70 i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 72cb0a9b0aee0283c8b7bb6a5a98cb6551c3d732 i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -14,4 +15,19 @@
- 	"editTtile": "編集",
- 	"replaceDefaultValue": "設定を置換",
- 	"copyDefaultValue": "設定にコピー"
-+=======
-+	"emptyUserSettingsHeader": "既定の設定を上書きするには、このファイル内に設定を挿入します。",
-+	"errorInvalidConfiguration": "設定を書き込めません。ファイル内のエラー/警告を修正してからもう一度お試しください。",
-+	"emptyWorkspaceSettingsHeader": "ユーザー設定を上書きするには、このファイル内に設定を挿入します。",
-+	"emptyFolderSettingsHeader": "ワークスペースの設定を上書きするには、このファイル内にフォルダーの設定を挿入します。",
-+	"defaultFolderSettingsTitle": "既定のフォルダー設定",
-+	"defaultSettingsTitle": "既定の設定",
-+	"noSettingsFound": "設定が見つかりません。",
-+	"editTtile": "編集",
-+	"replaceDefaultValue": "設定を置換",
-+	"copyDefaultValue": "設定にコピー",
-+	"unsupportedPHPExecutablePathSetting": "この設定はユーザー設定でなければなりません。ワークスペースのために PHP を構成するには、PHP ファイルを開き、ステータス バーの [PHP パス] をクリックします。",
-+	"unsupportedWorkspaceSetting": "この設定はユーザー設定でなければなりません。",
-+	"unsupportedWorkbenchSetting": "この設定は現在適用できません。このフォルダーを直接開いたときに適用されます。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 3902ae7752750f24eb59156a29c50674d5f10662 i18n/jpn/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-  our    100644 f523b6b58632e814cd9f666f3fa19e84738a6376 i18n/jpn/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-  their  100644 3eaaf1477f2a99df9c9c99ee9b616e7e0331ef60 i18n/jpn/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-changed in both
-  base   100644 d45b84374594d68d5db62ce518ad4b699d9eb2aa i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  our    100644 a508097adbd35ddee214a11ce8ccd760b70a063c i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  their  100644 b650b0b0eb32f851abac1ec77b6afec79ef866ff i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-changed in both
-  base   100644 6ff988da156c3bf5f995c6c9f54d74b258140d7a i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  our    100644 fadead296a93c202fdae35990b689034db6c7569 i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  their  100644 25592200f559e4cfb7f2eec36409b0b4d06a5ce4 i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -10,6 +11,11 @@
- 	"hideRepository": "非表示",
- 	"installAdditionalSCMProviders": "その他の SCM プロバイダーをインストール...",
- 	"no open repo": "有効なソース管理プロバイダーがありません。",
-+=======
-+	"commitMessage": "Message (press {0} to commit)",
-+	"installAdditionalSCMProviders": "その他の SCM プロバイダーをインストール...",
-+	"no open repo": "有効なソース管理がありません。",
-+>>>>>>> .their
- 	"source control": "ソース管理",
- 	"viewletTitle": "{0}: {1}",
- 	"hideView": "非表示"
-changed in both
-  base   100644 47d6b9c337e4799ba23c7e2e42aa5524b4dbbde1 i18n/jpn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 0c0e1ef6922bb2ebfdd24dd39aa82c38ab488084 i18n/jpn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 ab57a31ce38f83ca1384d26d9bac9de8883f7e64 i18n/jpn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"nextSearchIncludePattern": "次の検索包含パターンを表示",
- 	"previousSearchIncludePattern": "前の検索包含パターンを表示",
- 	"nextSearchExcludePattern": "次の検索除外パターンを表示",
-changed in both
-  base   100644 78356e3e0f46be548f853447d45d40a0ab08b5cc i18n/jpn/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  our    100644 e3bc313f7629d61de69d1a7c87f4621737652171 i18n/jpn/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  their  100644 4dee2d5d093e01a8001cf6a02e5126c243155706 i18n/jpn/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-added in both
-  our    100644 1c389487583531918075adbf2e9217668ca003bd i18n/jpn/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
-  their  100644 91bb212b330968331f12023a14443934c4756381 i18n/jpn/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"search.noWorkspaceWithName": "ワークスペースに次の名前のフォルダーはありません: {0}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 1048a9303ee7199afe7df7f497fb32c5970003e2 i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 12d9ee548c02f4e1c1a9f6f57b065e164ea8e9c2 i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 034dd3840cbe5248f61a68ed826d630776b302ea i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-changed in both
-  base   100644 bec8ad0511234592cc1baaae890cb3821ad863ee i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 8021ef7847fd50a81058f6bd7af4fbd030bdc905 i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 25833416f1180e360360f77b3afd571ac772d061 i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -16,9 +16,13 @@
- 	"manyProblems": "10K+",
- 	"runningTasks": "実行中のタスクを表示",
- 	"tasks": "タスク",
-+<<<<<<< .our
- 	"TaskSystem.noHotSwap": "アクティブなタスクを実行しているタスク実行エンジンを変更するには、ウィンドウの再読み込みが必要です",
- 	"reloadWindow": "ウィンドウの再読み込み",
- 	"TaskServer.folderIgnored": "{0} フォルダーはタスク バージョン 0.1.0  を使用しているために無視されます",
-+=======
-+	"TaskSystem.noHotSwap": "タスクの実行エンジンを変更するにはウィンドウの再読み込みが必要です",
-+>>>>>>> .their
- 	"TaskService.noBuildTask1": "ビルド タスクが定義されていません。tasks.json ファイルでタスクに 'isBuildCommand' というマークを付けてください。",
- 	"TaskService.noBuildTask2": "ビルド タスクが定義されていません。tasks.json ファイルでタスクに 'build' グループとしてマークを付けてください。",
- 	"TaskService.noTestTask1": "テスト タスクが定義されていません。tasks.json ファイルでタスクに 'isTestCommand' というマークを付けてください。",
-changed in both
-  base   100644 40f8e647676e6f355d6372f2961c3aba909fb7ad i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
-  our    100644 cdd450e9166615c8d85a3c912cb5b2076431955d i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
-  their  100644 b638ec4fd641b57e43889c27f229f4efcbe1da28 i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
-@@ -9,8 +9,13 @@
- 	"TerminalTaskSystem.unknownError": "タスクの実行中に不明なエラーが発生しました。詳細については、タスク出力ログを参照してください。",
- 	"dependencyFailed": "ワークスペース フォルダー '{1}' 内で依存タスクの '{0}' を解決できませんでした",
- 	"TerminalTaskSystem.terminalName": "タスク - {0}",
-+<<<<<<< .our
- 	"closeTerminal": "任意のキーを押してターミナルを終了します。",
- 	"reuseTerminal": "ターミナルはタスクで再利用されます、閉じるには任意のキーを押してください。",
- 	"TerminalTaskSystem": "cmd.exe を使用して UNC ドライブ上でシェル コマンドを実行できません。",
-+=======
-+	"reuseTerminal": "ターミナルはタスクで再利用されます、閉じるには任意のキーを押してください。",
-+	"TerminalTaskSystem": "UNC ドライブでシェル コマンドを実行できません。",
-+>>>>>>> .their
- 	"unkownProblemMatcher": "問題マッチャー {0} は解決できませんでした。マッチャーは無視されます"
- }
-\ No newline at end of file
-changed in both
-  base   100644 787ca1130299bb4cf21bf6284d82bd8929a34b34 i18n/jpn/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  our    100644 c7a264707a6381182e68c10ae0ac2fac2bba05d7 i18n/jpn/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  their  100644 b14e09b81ed2a33343e362a62a2f3d91421e772e i18n/jpn/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-@@ -15,7 +15,10 @@
- 	"ConfigurationParser.invalidVaraibleReference": "エラー: 正しくない problemMatcher 参照 {0}\n",
- 	"ConfigurationParser.noTaskType": "エラー: タスクの構成には type プロパティが必要です。この構成は無視されます。\n{0}\n",
- 	"ConfigurationParser.noTypeDefinition": "Error: タスク タイプ '{0}' は登録されていません。対応するタスク プロバイダーを提供する拡張機能をインストールしましたか?",
-+<<<<<<< .our
- 	"ConfigurationParser.missingRequiredProperty": "エラー: タスク構成 '{0}' に必要な '{1}' プロパティがありません。構成は無視されます。 ",
-+=======
-+>>>>>>> .their
- 	"ConfigurationParser.notCustom": "エラー: タスクがカスタム タスクとして定義されていません。この構成は無視されます。\n{0}\n",
- 	"ConfigurationParser.noTaskName": "エラー: タスクが label プロパティを提供しなければなりません。このタスクは無視されます。\n{0}\n",
- 	"taskConfiguration.noCommandOrDependsOn": "エラー: タスク '{0}' は、コマンドも dependsOn プロパティも指定していません。このタスクは無視されます。定義は次のとおりです:\n{1}",
-changed in both
-  base   100644 b99e360cd8b56632f5e52df477d3bd4aaf0f0221 i18n/jpn/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  our    100644 197c74abf0318edb085bfa6606f349196690f23b i18n/jpn/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  their  100644 f4845c96a75cc0f5e5c08b840d84b1f526a539f5 i18n/jpn/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -9,6 +10,11 @@
- 	"termEntryAriaLabel": "{0}、ターミナル ピッカー",
- 	"termCreateEntryAriaLabel": "{0} 、新しいターミナルの作成",
- 	"workbench.action.terminal.newplus": "$(plus) 新しい統合ターミナルの作成",
-+=======
-+	"termEntryAriaLabel": "{0}、ターミナル ピッカー",
-+	"termCreateEntryAriaLabel": "{0} 、新しいターミナルの作成",
-+	"'workbench.action.terminal.newplus": "$(plus) 新しい統合ターミナルの作成",
-+>>>>>>> .their
- 	"noTerminalsMatching": "一致するターミナルがありません",
- 	"noTerminalsFound": "開いているターミナルがありません"
- }
-\ No newline at end of file
-changed in both
-  base   100644 16366e22ca28f9aca9f14253e677c611418e13e0 i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 62e38b3747f8554dd00fc9cb1775537cf7a36bb1 i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 6f1481812dd67ba95cda718a289dd200f73deb54 i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-changed in both
-  base   100644 a046b227b9343b60dd225c2000e5b65dbc587fdc i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 bd0ce9939936ef31eabab48bc5a42980b19e29b3 i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 8877f9b0a8b8f7a5efcd758af20f71eb0a06ed08 i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -53,6 +53,7 @@
- 	"workbench.action.terminal.hideFindWidget": "検索ウィジェットを非表示にする",
- 	"nextTerminalFindTerm": "次の検索語句を表示",
- 	"previousTerminalFindTerm": "前の検索語句を表示",
-+<<<<<<< .our
- 	"quickOpenTerm": "アクティブなターミナルの切り替え",
- 	"workbench.action.terminal.scrollToPreviousCommand": "前のコマンドにスクロール",
- 	"workbench.action.terminal.scrollToNextCommand": "次のコマンドにスクロール",
-@@ -60,4 +61,7 @@
- 	"workbench.action.terminal.selectToNextCommand": "次のコマンドを選択",
- 	"workbench.action.terminal.selectToPreviousLine": "前の行を選択",
- 	"workbench.action.terminal.selectToNextLine": "次の行を選択"
-+=======
-+	"quickOpenTerm": "ターミナル: アクティブなターミナルの切り替え"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 01396d39cfbe1fb66aeed3ab4523479a89004157 i18n/jpn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 be4c3ee187a4c958a13a55a867d75c42dce31777 i18n/jpn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 5007e4d58ae2dd2ca0b047d697ac1b5dbbec988a i18n/jpn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -11,7 +11,12 @@
- 	"read the release notes": "{0} v{1} へようこそ! リリース ノートを確認しますか?",
- 	"licenseChanged": "ライセンス条項が変更されました。[こちら]({0}) をクリックして内容をご確認ください。",
- 	"neveragain": "今後は表示しない",
-+<<<<<<< .our
- 	"64bitisavailable": "64 ビット Windows 用の {0} が利用可能になりました！詳細情報は[こちら]({1})をクリックしてください。",
-+=======
-+	"64bitisavailable": "64 ビット Windows 用の {0} が利用可能になりました！",
-+	"learn more": "詳細情報",
-+>>>>>>> .their
- 	"updateIsReady": "新しい更新 {0} が利用可能です。",
- 	"noUpdatesAvailable": "現在入手可能な更新はありません。",
- 	"ok": "OK",
-changed in both
-  base   100644 6b8b81bf3c12a2e6742ae0be059c44e3b1f9cbf8 i18n/jpn/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  our    100644 946723a67128023eb3e9fb6c646c3cf967e21f00 i18n/jpn/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  their  100644 5dbb0f484f367c725fa708b04cbe729267ba0ee5 i18n/jpn/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-@@ -37,6 +37,8 @@
- 	"welcomePage.showCommandsDescription": "コマンド パレットからコマンドを検索してすばやくアクセスします ({0})",
- 	"welcomePage.interfaceOverview": "インターフェイスの概要",
- 	"welcomePage.interfaceOverviewDescription": "UI の主要コンポーネントを解説した視覚オーバーレイを表示します",
-+	"welcomePage.deployToAzure": "クラウドにアプリケーションをデプロイ",
-+	"welcomePage.deployToAzureDescription": "Node アプリケーションを Azure App Service にデプロイする方法を学ぶ",
- 	"welcomePage.interactivePlayground": "対話型プレイグラウンド",
- 	"welcomePage.interactivePlaygroundDescription": "エディターの基本機能を簡潔なチュートリアルで体験します"
- }
-\ No newline at end of file
-changed in both
-  base   100644 6bda9ff535782ea028574d45f677bd982ccd4474 i18n/jpn/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-  our    100644 07da445924359806714c48eda402680117e0b913 i18n/jpn/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-  their  100644 0ee74727bf375ac4c56b7cd95d3669b649aaf228 i18n/jpn/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-changed in both
-  base   100644 47830f896d2e2ec7f9a379db3fedfdaa41e10dd2 i18n/jpn/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
-  our    100644 579dff00fa8e7b5062ddd8a8e511d6a8c9e95949 i18n/jpn/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
-  their  100644 1fccee043f55a1c151ba6ce3d1d9c114f1d2783e i18n/jpn/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"editorWalkThrough.title": "対話型プレイグラウンド",
- 	"editorWalkThrough": "対話型プレイグラウンド"
- }
-\ No newline at end of file
-changed in both
-  base   100644 a0d2093c119b87d7501753be72fe16c7c05c433c i18n/jpn/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  our    100644 60bf4e08cf5bbad037fb33148e8162e4e6ad633a i18n/jpn/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  their  100644 47295547a7e701aa9595729a543e4143a8fb116d i18n/jpn/src/vs/workbench/services/configuration/node/configuration.i18n.json
-@@ -9,6 +9,7 @@
- 	"scope.window.description": "ウィンドウ固有の構成。ユーザーまたはワークスペースの設定で構成できます。",
- 	"scope.resource.description": "リソース固有の構成。ユーザー、ワークスペース、またはフォルダーの設定で構成できます。",
- 	"scope.description": "構成が適用される範囲。 使用可能なスコープは `window` と ` resource` です。",
-+<<<<<<< .our
- 	"vscode.extension.contributes.configuration": "構成の設定を提供します。",
- 	"invalid.title": "'configuration.title' は、文字列である必要があります",
- 	"vscode.extension.contributes.defaultConfiguration": "言語ごとに既定のエディター構成の設定を提供します。",
-@@ -21,4 +22,13 @@
- 	"workspaceConfig.settings.description": "ワークスペースの設定",
- 	"workspaceConfig.extensions.description": "ワークスペースの拡張機能",
- 	"unknownWorkspaceProperty": "不明なワークスペース構成プロパティ"
-+=======
-+	"invalid.type": "設定すると、'configuration.type' は 'オブジェクトに設定されなければなりません",
-+	"invalid.title": "'configuration.title' は、文字列である必要があります",
-+	"vscode.extension.contributes.defaultConfiguration": "言語ごとに既定のエディター構成の設定を提供します。",
-+	"invalid.properties": "'configuration.properties' は、オブジェクトである必要があります",
-+	"workspaceConfig.folders.description": "ワークスペースで読み込まれるフォルダーのリスト。ファイル パスである必要があります。例: `/root/folderA` または `./folderA` のようなワークスペース ファイルの場所に対して解決される相対パス。",
-+	"workspaceConfig.folder.description": "ファイルパス。例: `/root/folderA` または `./folderA` のようなワークスペース ファイルの場所に対して解決される相対パス。",
-+	"workspaceConfig.settings.description": "ワークスペースの設定"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c3d8ee097dcab747accedea1ec6a2ad6defb457c i18n/jpn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 627b2d01b48806d1f5f06d10756e2464690ef51d i18n/jpn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 6a4f8a9515237eb58139490a0df20983be59a2f9 i18n/jpn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -9,6 +9,7 @@
- 	"openTasksConfiguration": "タスク構成を開く",
- 	"openLaunchConfiguration": "起動構成を開く",
- 	"open": "設定を開く",
-+<<<<<<< .our
- 	"saveAndRetry": "保存して再試行",
- 	"errorUnknownKey": "{1} は登録済みの構成ではないため、{0} に書き込むことができません。",
- 	"errorInvalidWorkspaceConfigurationApplication": "{0} をワークスペース設定に書き込めません。この設定はユーザー設定にのみ書き込めます。",
-@@ -27,6 +28,19 @@
- 	"errorConfigurationFileDirty": "ファイルが変更されているため、ユーザー設定を書き込めません。ユーザー設定ファイルを保存してから、もう一度お試しください。",
- 	"errorConfigurationFileDirtyWorkspace": "ファイルが変更されているため、ワークスペース設定を書き込めません。ワークスペース設定ファイルを保存してから、もう一度お試しください。",
- 	"errorConfigurationFileDirtyFolder": "ファイルが変更されているため、フォルダー設定を書き込めません。'{0}' フォルダー設定ファイルを保存してから、もう一度お試しください。",
-+=======
-+	"close": "閉じる",
-+	"saveAndRetry": "設定を保存して再試行",
-+	"errorUnknownKey": "{1} は登録済みの構成ではないため、{0} に書き込むことができません。",
-+	"errorInvalidFolderConfiguration": "{0} はフォルダーのリソース スコープをサポートしていないため、フォルダー設定に書き込むことができません。",
-+	"errorInvalidUserTarget": "{0} はグローバル スコープをサポートしていないため、ユーザー設定に書き込むことができません。",
-+	"errorInvalidFolderTarget": "リソースが指定されていないため、フォルダー設定に書き込むことができません。",
-+	"errorNoWorkspaceOpened": "開いているワークスペースがないため、{0} に書き込むことができません。最初にワークスペースを開いてから、もう一度お試しください。",
-+	"errorInvalidConfiguration": "設定を書き込めません。**User Settings** を開いて、ファイル内のエラー/警告を修正してからもう一度お試しください。",
-+	"errorInvalidConfigurationWorkspace": "設定を書き込めません。**Workspace Settings** を開いて、ファイル内のエラー/警告を修正してからもう一度お試しください。",
-+	"errorConfigurationFileDirty": "ファイルが変更されているため、設定を書き込めません。**User Settings** ファイルを保存してから、もう一度お試しください。",
-+	"errorConfigurationFileDirtyWorkspace": "ファイルが変更されているため、設定を書き込めません。**Workspace Settings** ファイルを保存してから、もう一度お試しください。",
-+>>>>>>> .their
- 	"userTarget": "ユーザー設定",
- 	"workspaceTarget": "ワークスペースの設定",
- 	"folderTarget": "フォルダーの設定"
-added in both
-  our    100644 8a4a971117179aa623413797c5cb43212904996c i18n/jpn/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
-  their  100644 37c4d971a1c00842fdd7e7303064664e3c9d63ad i18n/jpn/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,5 +10,15 @@
- 	"extensionHostProcess.startupFailDebug": "拡張機能ホストが 10 秒以内に開始されませんでした。先頭行で停止している可能性があり、続行するにはデバッガーが必要です。",
- 	"extensionHostProcess.startupFail": "拡張機能ホストが 10 秒以内に開始されませんでした。問題が発生している可能性があります。",
- 	"reloadWindow": "ウィンドウの再読み込み",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"extensionHostProcess.startupFailDebug": "拡張機能ホストが 10 秒以内に開始されませんでした。先頭行で停止している可能性があり、続行するにはデバッガーが必要です。",
-+	"extensionHostProcess.startupFail": "拡張機能ホストが 10 秒以内に開始されませんでした。問題が発生している可能性があります。",
-+>>>>>>> .their
- 	"extensionHostProcess.error": "拡張機能ホストからのエラー: {0}"
- }
-\ No newline at end of file
-added in both
-  our    100644 764aaf678ad2d50f154e669f8d140081a3b98f36 i18n/jpn/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
-  their  100644 7d36d86d279f2a17961fb70ee80670b00ab2b0d1 i18n/jpn/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,5 +10,16 @@
- 	"jsonParseFail": "{0} を解析できません: {1}。",
- 	"fileReadFail": "ファイル {0} を読み取れません: {1}。",
- 	"jsonsParseReportErrors": "{0} を解析できません: {1}。",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"jsonParseFail": "{0} を解析できません: {1}。",
-+	"fileReadFail": "ファイル {0} を読み取れません: {1}。",
-+	"jsonsParseFail": "{0} または {1} を解析できませんでした: {2}。",
-+>>>>>>> .their
- 	"missingNLSKey": "キー {0} のメッセージが見つかりませんでした。"
- }
-\ No newline at end of file
-added in both
-  our    100644 ebdf2bc38d9d52c04ae3ff72f37a5f4d912d7af4 i18n/jpn/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-  their  100644 a4d588df685c9fd74f3e47eda814ec3187130e5c i18n/jpn/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -15,4 +16,18 @@
- 	"extensionUnderDevelopment": "開発の拡張機能を {0} に読み込んでいます",
- 	"extensionCache.invalid": "拡張機能がディスク上で変更されています。ウィンドウを再読み込みしてください。",
- 	"reloadWindow": "ウィンドウの再読み込み"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"devTools": "開発者ツール",
-+	"restart": "拡張機能のホストを再起動",
-+	"extensionHostProcess.crash": "拡張機能のホストが予期せずに終了しました。",
-+	"extensionHostProcess.unresponsiveCrash": "拡張機能のホストが応答しないため終了しました。",
-+	"overwritingExtension": "拡張機能 {0} を {1} で上書きしています。",
-+	"extensionUnderDevelopment": "開発の拡張機能を {0} に読み込んでいます"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6db7d6aae514a031afce5ac346abfd84bb8ee1cc i18n/jpn/src/vs/workbench/services/progress/browser/progressService2.i18n.json
-  our    100644 0814f6f9f9667814ad2f09d50028518d424008dd i18n/jpn/src/vs/workbench/services/progress/browser/progressService2.i18n.json
-  their  100644 dbcd7381ae2fcf0e7a8fc81ec166ed7112edca11 i18n/jpn/src/vs/workbench/services/progress/browser/progressService2.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -9,4 +10,8 @@
- 	"progress.subtitle": "{0} - {1}",
- 	"progress.title": "{0}: {1}",
- 	"cancel": "キャンセル"
-+=======
-+	"progress.subtitle": "{0} - {1}",
-+	"progress.title": "{0}: {1}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 4ac14b2ebbc787edebb32baabfe037f5a478681c i18n/jpn/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-  our    100644 c0b06c46190fccd2d8cc7bada6600d065007b77c i18n/jpn/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-  their  100644 2773e1cc1be152fc16a4997b2dc60c8e883c533a i18n/jpn/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,12 @@
- 	"schema.token.fontStyle": "ルールのフォント スタイル:  'italic'、'bold'、'underline' のいずれかまたはこれらの組み合わせです。空の文字列は継承された設定を解除します。",
- 	"schema.fontStyle.error": "フォント スタイルは 'italic'、'bold'、'underline' もしくはこれらの組み合わせ、または空の文字列である必要があります。",
- 	"schema.token.fontStyle.none": "なし (継承したスタイルを解除)",
-+=======
-+	"schema.token.settings": "トークンの色とスタイル。",
-+	"schema.token.foreground": "トークンの前景色。",
-+	"schema.token.fontStyle": "ルールのフォント スタイル: '斜体'、'太字'、'下線' のいずれかまたはこれらの組み合わせ",
-+	"schema.fontStyle.error": "フォント スタイルは '斜体'、'太字'、'下線'を組み合わせる必要があります。",
-+>>>>>>> .their
- 	"schema.properties.name": "ルールの説明。",
- 	"schema.properties.scope": "このルールに一致するスコープ セレクター。",
- 	"schema.tokenColors.path": "tmTheme ファイルへのパス (現在のファイルとの相対パス)。",
-changed in both
-  base   100644 782cc7b29de1941acfe825acfdfa1a89e47204e4 i18n/jpn/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
-  our    100644 34d5bf4b4f04a3048c2acaff7d956642dcd4a144 i18n/jpn/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
-  their  100644 546df93122c34f42b0a9c314572f2fc1c9cc766a i18n/jpn/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
-changed in both
-  base   100644 c13ce18320483aca0ece415902912a3a3783e27b i18n/jpn/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 1c24e18b8352f7c98a6c854017d4381edcc0bc7e i18n/jpn/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 7e4f5b6b23f51c5b22ff75e064fb5bd53c448f42 i18n/jpn/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-@@ -13,6 +13,12 @@
- 	"noIconThemeDesc": "ファイル アイコンがありません",
- 	"iconThemeError": "ファイル アイコンのテーマが不明、またはインストールされていません。",
- 	"workbenchColors": "現在選択している配色テーマで配色を上書きします。",
-+<<<<<<< .our
-+=======
-+	"workbenchColors.deprecated": "この設定はもう試験的なものではなく、名前が 'workbench.colorCustomizations' に変更されています",
-+	"workbenchColors.deprecatedDescription": "代わりに 'workbench.colorCustomizations' を使用してください",
-+	"editorColors": "現在選択している配色テーマで配色とフォント スタイルを上書きします。",
-+>>>>>>> .their
- 	"editorColors.comments": "コメントの色とスタイルを設定します",
- 	"editorColors.strings": "文字列リテラルの色とスタイルを設定します。",
- 	"editorColors.keywords": "キーワードの色とスタイルを設定します。",
-@@ -20,6 +26,10 @@
- 	"editorColors.types": "型定義と参照の色とスタイルを設定します。",
- 	"editorColors.functions": "関数定義と参照の色とスタイルを設定します。",
- 	"editorColors.variables": "変数定義と参照の色とスタイルを設定します。",
-+<<<<<<< .our
- 	"editorColors.textMateRules": "textmate テーマ規則 (高度) を使っての色とスタイルを設定します。",
- 	"editorColors": "現在選択している配色テーマで配色とフォント スタイルを上書きします。"
-+=======
-+	"editorColors.textMateRules": "textmate テーマ規則 (高度) を使っての色とスタイルを設定します。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a8f1ec46a18bc64ef3eaafaad01d78cfb05093a1 i18n/kor/extensions/css/package.i18n.json
-  our    100644 2d4d9da9391916e94d45c5f0a1fe31764372d347 i18n/kor/extensions/css/package.i18n.json
-  their  100644 35ae2cde936c4a6c5472cfa60fba34f0446f82ee i18n/kor/extensions/css/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,73 @@
- 	],
- 	"displayName": "CSS 언어 기본",
- 	"description": "CSS,LESS,SCSS 파일에서 구문 강조 표시와 괄호 일치를 제공합니다."
-+=======
-+	"css.lint.argumentsInColorFunction.desc": "잘못된 매개 변수 수",
-+	"css.lint.boxModel.desc": "패딩 또는 테두리를 사용하는 경우 너비 또는 높이를 사용하지 마세요.",
-+	"css.lint.compatibleVendorPrefixes.desc": "공급업체 관련 접두사를 사용할 경우 다른 모든 공급업체 관련 속성도 포함합니다.",
-+	"css.lint.duplicateProperties.desc": "중복된 스타일 정의를 사용하지 마세요.",
-+	"css.lint.emptyRules.desc": "빈 규칙 집합을 사용하지 마세요.",
-+	"css.lint.float.desc": "'float'를 사용하지 않도록 합니다. Float를 사용하면 레이아웃의 한쪽이 바뀔 경우 CSS가 쉽게 깨질 수 있습니다.",
-+	"css.lint.fontFaceProperties.desc": "@font-face 규칙에서 'src' 및 'font-family' 속성을 정의해야 합니다.",
-+	"css.lint.hexColorLength.desc": "16진수 색은 3개 또는 6개의 16진수로 구성되어야 합니다.",
-+	"css.lint.idSelector.desc": "이러한 규칙은 HTML과 긴밀하게 결합되므로 선택기에 ID를 포함하면 안 됩니다.",
-+	"css.lint.ieHack.desc": "IE 핵(Hack)은 IE7 이상을 지원할 때만 필요합니다.",
-+	"css.lint.important.desc": "!important는 사용하지 않도록 합니다. 이것은 전체 CSS의 특정성에 문제가 있어서 리팩터링해야 함을 나타냅니다.",
-+	"css.lint.importStatement.desc": "Import 문은 병렬로 로드되지 않습니다.",
-+	"css.lint.propertyIgnoredDueToDisplay.desc": "display 때문에 속성이 무시됩니다. 예를 들어 'display: inline'을 사용할 경우 width, height, margin-top, margin-bottom 및 float 속성은 적용되지 않습니다.",
-+	"css.lint.universalSelector.desc": "범용 선택기 (*)는 느린 것으로 알려져 있습니다.",
-+	"css.lint.unknownProperties.desc": "알 수 없는 속성입니다.",
-+	"css.lint.unknownVendorSpecificProperties.desc": "알 수 없는 공급업체 관련 속성입니다.",
-+	"css.lint.vendorPrefix.desc": "공급업체 관련 접두사를 사용할 때 표준 속성도 포함합니다.",
-+	"css.lint.zeroUnits.desc": "0에는 단위가 필요하지 않습니다.",
-+	"css.trace.server.desc": "VS Code와 CSS 언어 서버 간 통신을 추적합니다.",
-+	"css.validate.title": "CSS 유효성 검사 및 문제 심각도를 제어합니다.",
-+	"css.validate.desc": "모든 유효성 검사 사용 또는 사용 안 함",
-+	"less.lint.argumentsInColorFunction.desc": "잘못된 매개 변수 수",
-+	"less.lint.boxModel.desc": "패딩 또는 테두리를 사용하는 경우 너비 또는 높이를 사용하지 마세요.",
-+	"less.lint.compatibleVendorPrefixes.desc": "공급업체 관련 접두사를 사용할 경우 다른 모든 공급업체 관련 속성도 포함합니다.",
-+	"less.lint.duplicateProperties.desc": "중복된 스타일 정의를 사용하지 마세요.",
-+	"less.lint.emptyRules.desc": "빈 규칙 집합을 사용하지 마세요.",
-+	"less.lint.float.desc": "'float'를 사용하지 않도록 합니다. Float를 사용하면 레이아웃의 한쪽이 바뀔 경우 CSS가 쉽게 깨질 수 있습니다.",
-+	"less.lint.fontFaceProperties.desc": "@font-face 규칙에서 'src' 및 'font-family' 속성을 정의해야 합니다.",
-+	"less.lint.hexColorLength.desc": "16진수 색은 3개 또는 6개의 16진수로 구성되어야 합니다.",
-+	"less.lint.idSelector.desc": "이러한 규칙은 HTML과 긴밀하게 결합되므로 선택기에 ID를 포함하면 안 됩니다.",
-+	"less.lint.ieHack.desc": "IE 핵(Hack)은 IE7 이상을 지원할 때만 필요합니다.",
-+	"less.lint.important.desc": "!important는 사용하지 않도록 합니다. 이것은 전체 CSS의 특정성에 문제가 있어서 리팩터링해야 함을 나타냅니다.",
-+	"less.lint.importStatement.desc": "Import 문은 병렬로 로드되지 않습니다.",
-+	"less.lint.propertyIgnoredDueToDisplay.desc": "display 때문에 속성이 무시됩니다. 예를 들어 'display: inline'을 사용할 경우 width, height, margin-top, margin-bottom 및 float 속성은 적용되지 않습니다.",
-+	"less.lint.universalSelector.desc": "범용 선택기 (*)는 느린 것으로 알려져 있습니다.",
-+	"less.lint.unknownProperties.desc": "알 수 없는 속성입니다.",
-+	"less.lint.unknownVendorSpecificProperties.desc": "알 수 없는 공급업체 관련 속성입니다.",
-+	"less.lint.vendorPrefix.desc": "공급업체 관련 접두사를 사용할 때 표준 속성도 포함합니다.",
-+	"less.lint.zeroUnits.desc": "0에는 단위가 필요하지 않습니다.",
-+	"less.validate.title": "LESS 유효성 검사 및 문제 심각도를 제어합니다.",
-+	"less.validate.desc": "모든 유효성 검사 사용 또는 사용 안 함",
-+	"scss.lint.argumentsInColorFunction.desc": "잘못된 매개 변수 수",
-+	"scss.lint.boxModel.desc": "패딩 또는 테두리를 사용하는 경우 너비 또는 높이를 사용하지 마세요.",
-+	"scss.lint.compatibleVendorPrefixes.desc": "공급업체 관련 접두사를 사용할 경우 다른 모든 공급업체 관련 속성도 포함합니다.",
-+	"scss.lint.duplicateProperties.desc": "중복된 스타일 정의를 사용하지 마세요.",
-+	"scss.lint.emptyRules.desc": "빈 규칙 집합을 사용하지 마세요.",
-+	"scss.lint.float.desc": "'float'를 사용하지 않도록 합니다. Float를 사용하면 레이아웃의 한쪽이 바뀔 경우 CSS가 쉽게 깨질 수 있습니다.",
-+	"scss.lint.fontFaceProperties.desc": "@font-face 규칙에서 'src' 및 'font-family' 속성을 정의해야 합니다.",
-+	"scss.lint.hexColorLength.desc": "16진수 색은 3개 또는 6개의 16진수로 구성되어야 합니다.",
-+	"scss.lint.idSelector.desc": "이러한 규칙은 HTML과 긴밀하게 결합되므로 선택기에 ID를 포함하면 안 됩니다.",
-+	"scss.lint.ieHack.desc": "IE 핵(Hack)은 IE7 이상을 지원할 때만 필요합니다.",
-+	"scss.lint.important.desc": "!important는 사용하지 않도록 합니다. 이것은 전체 CSS의 특정성에 문제가 있어서 리팩터링해야 함을 나타냅니다.",
-+	"scss.lint.importStatement.desc": "Import 문은 병렬로 로드되지 않습니다.",
-+	"scss.lint.propertyIgnoredDueToDisplay.desc": "display 때문에 속성이 무시됩니다. 예를 들어 'display: inline'을 사용할 경우 width, height, margin-top, margin-bottom 및 float 속성은 적용되지 않습니다.",
-+	"scss.lint.universalSelector.desc": "범용 선택기 (*)는 느린 것으로 알려져 있습니다.",
-+	"scss.lint.unknownProperties.desc": "알 수 없는 속성입니다.",
-+	"scss.lint.unknownVendorSpecificProperties.desc": "알 수 없는 공급업체 관련 속성입니다.",
-+	"scss.lint.vendorPrefix.desc": "공급업체 관련 접두사를 사용할 때 표준 속성도 포함합니다.",
-+	"scss.lint.zeroUnits.desc": "0에는 단위가 필요하지 않습니다.",
-+	"scss.validate.title": "SCSS 유효성 검사 및 문제 심각도를 제어합니다.",
-+	"scss.validate.desc": "모든 유효성 검사 사용 또는 사용 안 함",
-+	"less.colorDecorators.enable.desc": "색 데코레이터 사용 또는 사용 안 함",
-+	"scss.colorDecorators.enable.desc": "색 데코레이터 사용 또는 사용 안 함",
-+	"css.colorDecorators.enable.desc": "색 데코레이터 사용 또는 사용 안 함",
-+	"css.colorDecorators.enable.deprecationMessage": "`css.colorDecorators.enable` 설정은 `editor.colorDecorators`를 위해 사용되지 않습니다.",
-+	"scss.colorDecorators.enable.deprecationMessage": "`scss.colorDecorators.enable` 설정은 `editor.colorDecorators`를 위해 사용되지 않습니다.",
-+	"less.colorDecorators.enable.deprecationMessage": "`less.colorDecorators.enable` 설정은 `editor.colorDecorators`를 위해 사용되지 않습니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/extensions/emmet/package.i18n.json
-  our    100644 517fee7baf0c3ecd5ff03235a1df00c583e6985b i18n/kor/extensions/emmet/package.i18n.json
-  their  100644 0576d669667fc73b560ae487b0a794941bad631c i18n/kor/extensions/emmet/package.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,6 +8,14 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"description": "VS Code에 대한 Emmet 지원",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"command.wrapWithAbbreviation": "약어로 래핑",
- 	"command.wrapIndividualLinesWithAbbreviation": "약어로 개별 줄 래핑",
- 	"command.removeTag": "태그 제거",
-@@ -31,6 +40,7 @@
- 	"command.incrementNumberByTen": "10씩 증가",
- 	"command.decrementNumberByTen": "10씩 감소",
- 	"emmetSyntaxProfiles": "지정된 구문에 대한 프로필을 정의하거나 특정 규칙이 포함된 고유한 프로필을 사용하세요.",
-+<<<<<<< .our
- 	"emmetExclude": "Emmet 약어는 확장하면 안 되는 언어의 배열입니다.",
- 	"emmetExtensionsPath": "Emmet 프로필 및 코드 조각이 포함된 폴더의 경로입니다.'",
- 	"emmetShowExpandedAbbreviation": "확장된 emmet 약어를 제안으로 표시합니다.\n\"inMarkupAndStylesheetFilesOnly\" 옵션이 html, haml, jade, slim, xml, xsl, css, scss, sass, less 및 stylus에 적용됩니다.\n\"always\" 옵션이 마크업/css에 관계없이 파일의 모든 부분에 적용됩니다.",
-@@ -38,6 +48,15 @@
- 	"emmetIncludeLanguages": "기본 지원되지 않는 언어에서 Emmet 약어를 사용하도록 설정합니다. 언어와 emmet 지원 언어 사이에 매핑을 추가합니다.\n예: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
- 	"emmetVariables": "emmet 조각에 사용되는 변수",
- 	"emmetTriggerExpansionOnTab": "사용하도록 설정하면 emmet 약어는 Tab 키를 눌렀을 때 확장됩니다.",
-+=======
-+	"emmetExclude": "Emmet 약어를 확장하면 안 되는 언어의 배열입니다.",
-+	"emmetExtensionsPath": "Emmet 프로필 및 코드 조각이 포함된 폴더의 경로입니다.'",
-+	"emmetShowExpandedAbbreviation": "확장된 emmet 약어를 제안으로 표시합니다.\n\"inMarkupAndStylesheetFilesOnly\" 옵션이 html, haml, jade, slim, xml, xsl, css, scss, sass, less 및 stylus에 적용됩니다.\n\"always\" 옵션이 마크업/css에 관계없이 파일의 모든 부분에 적용됩니다.",
-+	"emmetShowAbbreviationSuggestions": "가능한 emmet 약어를 제안으로 표시합니다. 스타일시트에는 적용되지 않고 emmet.showExpandedAbbreviation이 \"never\"로 설정되어 있을 때도 적용되지 않습니다.",
-+	"emmetIncludeLanguages": "기본 지원되지 않는 언어에서 emmet 약어를 사용합니다. 언어와 emmet 지원 언어 사이에 매핑을 추가합니다.\n예: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
-+	"emmetVariables": "emmet 조각에 사용되는 변수",
-+	"emmetTriggerExpansionOnTab": "사용하도록 설정하면 emmet 약어는 <Tab> 키를 눌렀을 때 확장됩니다.",
-+>>>>>>> .their
- 	"emmetPreferences": "Emmet의 일부 작업 및 해결 프로그램의 동작을 수정하는 데 사용되는 기본 설정입니다.",
- 	"emmetPreferencesIntUnit": "정수 값의 기본 단위",
- 	"emmetPreferencesFloatUnit": "부동 소수점 값의 기본 단위",
-@@ -47,6 +66,7 @@
- 	"emmetPreferencesCssBetween": "CSS 약어를 확장할 때 CSS 속성 및 값 사이에 배치할 기호",
- 	"emmetPreferencesSassBetween": "Sass 파일에서 CSS 약어를 확장할 때 CSS 속성 및 값 사이에 배치할 기호",
- 	"emmetPreferencesStylusBetween": "Stylus 파일에서 CSS 약어를 확장할 때 CSS 속성 및 값 사이에 배치할 기호",
-+<<<<<<< .our
- 	"emmetShowSuggestionsAsSnippets": "True이면 emmet 제안이 코드 조각으로 표시되며 editor.snippetSuggestions 설정에 따라 코드 조각을 정렬할 수 있습니다.",
- 	"emmetPreferencesBemElementSeparator": "BEM 필터 사용시 요소 구분자를 클래스로 사용합니다.",
- 	"emmetPreferencesBemModifierSeparator": "BEM 필터 사용시 변경된 구분자를 클래스로 사용합니다.",
-@@ -62,4 +82,7 @@
- 	"emmetPreferencesCssMsProperties": "`-`로 시작하는 emmet 약어에서 사용할 때 'ms' 공급업체 접두사를 가져오는 쉼표로 구분된 CSS 속성입니다. 항상 'ms' 접두사를 사용하지 않으려면 빈 문자열로 설정합니다.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "유사 일치 약어가 획득해야 하는 최소 점수(0에서 1 사이)입니다. 값이 낮을수록 가양성 일치 항목이 늘 수 있고, 값이 높을수록 가능한 일치 항목이 줄 수 있습니다.",
- 	"emmetOptimizeStylesheetParsing": "False로 설정할 경우 전체 파일이 구문 분석되어 현재 위치가 Emmet 약어 확장에 유효한지 확인합니다. True로 설정할 경우 css/scss/less 파일에서 현재 위치 주변의 콘텐츠만 구문 분석합니다."
-+=======
-+	"emmetShowSuggestionsAsSnippets": "True이면 emmet 제안이 코드 조각으로 표시되며 editor.snippetSuggestions 설정에 따라 코드 조각을 정렬할 수 있습니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8a96502e3a796749d61630cce0542fb94fc85e18 i18n/kor/extensions/extension-editing/out/extensionLinter.i18n.json
-  our    100644 1a6b6fec1699050fbebe38ad42640b3e0f0f07d3 i18n/kor/extensions/extension-editing/out/extensionLinter.i18n.json
-  their  100644 f8432086d5138d22c2abb41b372a3d0643d4e544 i18n/kor/extensions/extension-editing/out/extensionLinter.i18n.json
-changed in both
-  base   100644 600483c9e098bc70047c4edcea9a74d36acee23b i18n/kor/extensions/git/out/commands.i18n.json
-  our    100644 5c881abd459fc945dcc1b911f43b518f709ac538 i18n/kor/extensions/git/out/commands.i18n.json
-  their  100644 7428312894956a7dce238547fe725b4f0ea2d0cd i18n/kor/extensions/git/out/commands.i18n.json
-@@ -13,6 +13,7 @@
- 	"selectFolder": "리포지토리 위치 선택",
- 	"cloning": "Git 리포지토리 '{0}'을(를) 복제하는 중...",
- 	"proposeopen": "복제된 리포지토리를 여시겠습니까?",
-+<<<<<<< .our
- 	"openrepo": "리포지토리 열기",
- 	"add": "작업 영역에 추가",
- 	"proposeopen2": "복제된 리포지토리를 열거나 현재 작업 영역에 추가하시겠습니까?",
-@@ -20,6 +21,10 @@
- 	"init repo": "리포지토리 초기화",
- 	"create repo": "리포지토리 초기화",
- 	"are you sure": "'{0}'에서 Git 리포지토리가 만들어집니다. 계속하시겠습니까?",
-+=======
-+	"path to init": "폴더 경로",
-+	"provide path": "Git 리포지토리를 초기화할 폴더 경로를 입력하세요.",
-+>>>>>>> .their
- 	"HEAD not available": "'{0}'의 HEAD 버전이 없습니다.",
- 	"confirm stage files with merge conflicts": "병합 충돌이 있는 {0} 파일을 스테이징하시겠습니까?",
- 	"confirm stage file with merge conflicts": "병합 충돌이 있는 {0}을(를) 스테이징하시겠습니까?",
-@@ -43,10 +48,13 @@
- 	"confirm discard all 2": "{0}\n\n이 작업은 되돌릴 수 없으며, 현재 작업 설정이 영구적으로 손실됩니다.",
- 	"yes discard tracked": "1개의 추적된 파일 취소",
- 	"yes discard tracked multiple": "{0}개의 추적된 파일 취소",
-+<<<<<<< .our
- 	"unsaved files single": "다음 파일이 저장되지 않았습니다: {0}.\n\n제출하기 전에 저장할까요?",
- 	"unsaved files": "저장되지 않은 {0}개의 파일들이 있습니다.\n\n제출하기 전에 저장할까요?",
- 	"save and commit": "모두 저장하고 제출",
- 	"commit": "그냥 제출",
-+=======
-+>>>>>>> .their
- 	"no staged changes": "저장할 단계적 변경 사항이 없습니다.\n\n모든 변경 사항을 자동으로 스테이징하고 직접 저장하시겠습니까?",
- 	"always": "항상",
- 	"no changes": "커밋할 변경 내용이 없습니다.",
-@@ -66,10 +74,14 @@
- 	"provide tag name": "태그 이름을 입력하세요.",
- 	"tag message": "메시지",
- 	"provide tag message": "태그에 주석을 달 메시지를 입력하세요.",
-+<<<<<<< .our
- 	"no remotes to fetch": "이 리포지토리에 페치할 원격 항목이 구성되어 있지 않습니다.",
-+=======
-+>>>>>>> .their
- 	"no remotes to pull": "리포지토리에 풀하도록 구성된 원격 항목이 없습니다.",
- 	"pick remote pull repo": "분기를 가져올 원격 선택",
- 	"no remotes to push": "리포지토리에 푸시하도록 구성된 원격이 없습니다.",
-+	"push with tags success": "태그와 함께 푸시되었습니다.",
- 	"nobranch": "원격에 푸시할 분기를 체크 아웃하세요.",
- 	"confirm publish branch": "'{0}' 분기에는 상향 분기가 없습니다. 이 분기를 게시하시겠습니까?",
- 	"ok": "확인",
-changed in both
-  base   100644 79de8a8d0b39d48aeeca782104c5621434c9749b i18n/kor/extensions/git/out/model.i18n.json
-  our    100644 47bfb877f0f28f9cdc490e2f621887b99ce11351 i18n/kor/extensions/git/out/model.i18n.json
-  their  100644 0992c34ccab6cd337e3cc9d6a77ab08183b8092f i18n/kor/extensions/git/out/model.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -7,6 +8,8 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"too many submodules": "'{0}' 리포지토리에 자동으로 열리지 않는 {1}개의 하위 모듈이 있습니다. 모듈 내의 파일을 열러 각 모듈을 개별적으로 열 수는 있습니다.",
-+=======
-+>>>>>>> .their
- 	"no repositories": "사용 가능한 리포지토리가 없습니다.",
- 	"pick repo": "리포지토리 선택"
- }
-\ No newline at end of file
-added in both
-  our    100644 0d6d7f489d094938410881200676b74f6fd2e6f1 i18n/kor/extensions/git/out/repository.i18n.json
-  their  100644 c5c45af0062ce7f2f23a6c04c203fa4972283832 i18n/kor/extensions/git/out/repository.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"open": "열기",
- 	"index modified": "인덱스 수정됨",
- 	"modified": "수정됨",
-@@ -23,13 +32,20 @@
- 	"deleted by us": "본인이 삭제함",
- 	"both added": "둘 다 추가됨",
- 	"both modified": "둘 다 수정됨",
-+<<<<<<< .our
- 	"commitMessage": "메시지(커밋하려면 {0} 누르기)",
-+=======
-+>>>>>>> .their
- 	"commit": "커밋",
- 	"merge changes": "변경 내용 병합",
- 	"staged changes": "스테이징된 변경 내용",
- 	"changes": "변경 내용",
-+<<<<<<< .our
- 	"commitMessageCountdown": "현재 줄에서 {0} 글자 남음",
- 	"commitMessageWarning": "현재 줄에서 {0} 글자 초과 {1}",
-+=======
-+	"ok": "확인",
-+>>>>>>> .their
- 	"neveragain": "다시 표시 안 함",
- 	"huge": "'{0}'의 Git 리포지토리에 활성 변경 내용이 너무 많습니다. Git 기능의 하위 집합만 사용할 수 있도록 설정됩니다."
- }
-\ No newline at end of file
-changed in both
-  base   100644 38e31439c8c040c3e88812a82bc2a86dda3374a9 i18n/kor/extensions/git/package.i18n.json
-  our    100644 3703ac48f99d1ed061418ae09d45c9f7e6e3d128 i18n/kor/extensions/git/package.i18n.json
-  their  100644 a39479125fe2add7b45ff229de7da44f271454fb i18n/kor/extensions/git/package.i18n.json
-@@ -40,7 +40,10 @@
- 	"command.renameBranch": "분기 이름 바꾸기...",
- 	"command.merge": "분기 병합...",
- 	"command.createTag": "태그 생성",
-+<<<<<<< .our
- 	"command.fetch": "페치",
-+=======
-+>>>>>>> .their
- 	"command.pull": "풀",
- 	"command.pullRebase": "풀(다시 지정)",
- 	"command.pullFrom": "가져올 위치...",
-@@ -52,7 +55,10 @@
- 	"command.publish": "분기 게시",
- 	"command.showOutput": "Git 출력 표시",
- 	"command.ignore": ".gitignore에 파일 추가",
-+<<<<<<< .our
- 	"command.stashIncludeUntracked": "스태시(미추적 포함)",
-+=======
-+>>>>>>> .their
- 	"command.stash": "스태시",
- 	"command.stashPop": "스태시 표시...",
- 	"command.stashPopLatest": "최신 슬래시 표시",
-@@ -71,6 +77,7 @@
- 	"config.defaultCloneDirectory": "git 리포지토리를 복제할 기본 위치",
- 	"config.enableSmartCommit": "단계적 변경 사항이 없는 경우 모든 변경 사항을 저장합니다.",
- 	"config.enableCommitSigning": "GPG를 사용한 커밋 서명을 사용하도록 설정합니다.",
-+<<<<<<< .our
- 	"config.discardAllScope": "`모든 변경 내용 취소` 명령으로 취소되는 변경 내용을 제어합니다. `all`이면 모든 변경 내용을 취소합니다. `tracked`이면 추적된 파일만 취소합니다. `prompt`이면 작업을 실행할 때마다 프롬프트 대화 상자를 표시합니다.",
- 	"config.decorations.enabled": "Git에서 색과 배지를 탐색기와 열려 있는 편집기 뷰에 적용하는지 제어합니다.",
- 	"config.promptToSaveFilesBeforeCommit": "Git가 제출(commit)하기 전에 저장되지 않은 파일을 검사할지를 제어합니다. ",
-@@ -84,4 +91,7 @@
- 	"colors.ignored": "무시된 리소스의 색상입니다.",
- 	"colors.conflict": "충돌이 발생한 리소스의 색상입니다.",
- 	"colors.submodule": "서브모듈 자원의 색상"
-+=======
-+	"config.discardAllScope": "`모든 변경 내용 취소` 명령으로 취소되는 변경 내용을 제어합니다. `모두`이면 모든 변경 내용을 취소합니다. `추적됨`이면 추적된 파일만 취소합니다. `프롬프트`이면 작업을 실행할 때마다 프롬프트 대화 상자를 표시합니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 413a15e786c30319c5da272945c93ee76c20260d i18n/kor/extensions/html/package.i18n.json
-  our    100644 0801cef7b57b962a0bdfa42be6a016e76501c2ef i18n/kor/extensions/html/package.i18n.json
-  their  100644 17e48a1237b9aa331329ad2fe5c34ebc91086d4a i18n/kor/extensions/html/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,28 @@
- 	],
- 	"displayName": "HTML 언어 기본",
- 	"description": "HTML 파일에서 구문 강조 표시, 괄호 일치 및 코드 조각을 제공합니다."
-+=======
-+	"html.format.enable.desc": "기본 HTML 포맷터를 사용하거나 사용하지 않습니다.",
-+	"html.format.wrapLineLength.desc": "한 줄당 최대 문자 수입니다(0 = 사용 안 함).",
-+	"html.format.unformatted.desc": "쉼표로 분리된 태그 목록으로, 서식을 다시 지정해서는 안 됩니다. https://www.w3.org/TR/html5/dom.html#phrasing-content에 나열된 모든 태그의 기본값은 'null'로 설정됩니다.",
-+	"html.format.contentUnformatted.desc": "쉼표로 분리된 태그 목록으로, 콘텐츠의 서식을 다시 지정해서는 안 됩니다. 'pre' 태그의 기본값은 'null'로 설정됩니다.",
-+	"html.format.indentInnerHtml.desc": "<head> 및 <body> 섹션을 들여쓰기합니다.",
-+	"html.format.preserveNewLines.desc": "요소 앞에 있는 기존 줄 바꿈의 유지 여부입니다. 요소 앞에만 적용되며 태그 안이나 텍스트에는 적용되지 않습니다.",
-+	"html.format.maxPreserveNewLines.desc": "청크 한 개에 유지할 수 있는 최대 줄 바꿈 수입니다. 무제한일 때는 'null'을 사용합니다.",
-+	"html.format.indentHandlebars.desc": "{{#foo}} 및 {{/foo}}를 서식 지정하고 들여쓰기합니다.",
-+	"html.format.endWithNewline.desc": "줄 바꿈으로 끝납니다.",
-+	"html.format.extraLiners.desc": "쉼표로 분리된 태그 목록으로 앞에 줄 바꿈을 추가로 넣어야 합니다. \"head, body, /html\"의 기본값은 'null'로 설정됩니다.",
-+	"html.format.wrapAttributes.desc": "특성을 래핑합니다.",
-+	"html.format.wrapAttributes.auto": "줄 길이를 초과하는 경우에만 특성을 래핑합니다.",
-+	"html.format.wrapAttributes.force": "첫 번째 특성을 제외한 각 특성을 래핑합니다.",
-+	"html.format.wrapAttributes.forcealign": "첫 번째 특성을 제외한 각 특성을 래핑하고 정렬된 상태를 유지합니다.",
-+	"html.format.wrapAttributes.forcemultiline": "각 특성을 래핑합니다.",
-+	"html.suggest.angular1.desc": "기본 제공 HTML 언어 지원에서 Angular V1 태그 및 속성을 제안하는지 여부를 구성합니다.",
-+	"html.suggest.ionic.desc": "기본 제공 HTML 언어 지원에서 Ionic 태그, 속성 및 값을 제안하는지 여부를 구성합니다.",
-+	"html.suggest.html5.desc": "기본 제공 HTML 언어 지원에서 HTML5 태그, 속성 및 값을 제안하는지 여부를 구성합니다.",
-+	"html.trace.server.desc": "VS Code와 HTML 언어 서버 간 통신을 추적합니다.",
-+	"html.validate.scripts": "기본 제공 HTML 언어 지원에서 포함 스크립트의 유효성을 검사하는지 여부를 구성합니다.",
-+	"html.validate.styles": "기본 제공 HTML 언어 지원에서 포함 스타일의 유효성을 검사하는지 여부를 구성합니다.",
-+	"html.autoClosingTags": "HTML 태그의 자동 닫기를 사용하거나 사용하지 않습니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 0f62fca8d065f4e862af954257adee120423793d i18n/kor/extensions/json/package.i18n.json
-  our    100644 c63982946ed351ad61f5ab7f8e00843d4a6de447 i18n/kor/extensions/json/package.i18n.json
-  their  100644 c8cfa96cabfea37e4d36530dc7c87a3161fca38a i18n/kor/extensions/json/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,15 @@
- 	],
- 	"displayName": "JSON 언어 기본",
- 	"description": "JSON 파일에서 구문 강조 표시 및 괄호 일치를 제공합니다. "
-+=======
-+	"json.schemas.desc": "현재 프로젝트에서 스키마를 JSON 파일에 연결",
-+	"json.schemas.url.desc": "현재 디렉터리에 있는 스키마의 URL 또는 상대 경로",
-+	"json.schemas.fileMatch.desc": "스키마에 대한 JSON 파일을 확인할 때 일치할 파일 패턴의 배열입니다.",
-+	"json.schemas.fileMatch.item.desc": "스키마에 대한 JSON 파일을 확인할 때 일치할 '*'를 포함할 수 있는 파일 패턴입니다.",
-+	"json.schemas.schema.desc": "지정된 URL에 대한 스키마 정의입니다. 스키마 URL에 대한 액세스 방지를 위해서만 스키마를 제공해야 합니다.",
-+	"json.format.enable.desc": "기본 JSON 포맷터 사용/사용 안 함(다시 시작해야 함)",
-+	"json.tracing.desc": "VS Code와 JSON 언어 서버 간 통신을 추적합니다.",
-+	"json.colorDecorators.enable.desc": "색 데코레이터 사용 또는 사용 안 함",
-+	"json.colorDecorators.enable.deprecationMessage": "`json.colorDecorators.enable` 설정은 `editor.colorDecorators`를 위해 사용되지 않습니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 fea668373d19f57e029a7792039d3e31f5301591 i18n/kor/extensions/markdown/out/security.i18n.json
-  our    100644 b7fd641e49324f12cb3e70d0e0b3a99277526769 i18n/kor/extensions/markdown/out/security.i18n.json
-  their  100644 6dd50f40273a443aa7d72b3f11e7cebf0cfed056 i18n/kor/extensions/markdown/out/security.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -9,12 +10,20 @@
- 	"strict.title": "Strict",
- 	"strict.description": "보안 콘텐츠만 로드",
- 	"insecureContent.title": "안전하지 않은 콘텐츠 허용",
-+=======
-+	"strict.title": "Strict",
-+	"strict.description": "보안 콘텐츠만 로드",
-+	"insecureContent.title": "보아되지 않은 콘텐츠 허용",
-+>>>>>>> .their
- 	"insecureContent.description": "http를 통한 콘텐츠 로드 사용",
- 	"disable.title": "사용 안 함",
- 	"disable.description": "모든 콘텐츠 및 스크립트 실행을 허용합니다. 권장하지 않습니다.",
- 	"moreInfo.title": "추가 정보",
-+<<<<<<< .our
- 	"enableSecurityWarning.title": "이 작업 영역에서 미리 보기 보안 경고 사용",
- 	"disableSecurityWarning.title": "이 작업 영역에서 미리보기 보안 경고 사용 안 함",
- 	"toggleSecurityWarning.description": "콘텐츠 보안 수준에 영향을 주지 않습니다.",
-+=======
-+>>>>>>> .their
- 	"preview.showPreviewSecuritySelector.title": "이 작업 영역에 대해 Markdown 미리 보기의 보안 설정 선택"
- }
-\ No newline at end of file
-changed in both
-  base   100644 f4dc3e5e6f1d4ef786c6b3dc3d63ce93d41d7c26 i18n/kor/extensions/markdown/package.i18n.json
-  our    100644 83878314ebefa4a56e8ce43378ee7264847b7459 i18n/kor/extensions/markdown/package.i18n.json
-  their  100644 dc173d21269d978753a6fe904294e38d3feab81a i18n/kor/extensions/markdown/package.i18n.json
-@@ -27,6 +27,10 @@
- 	"markdown.styles.dec": "markdown 미리 보기에서 사용할 CSS 스타일시트의 URL 또는 로컬 경로 목록입니다. 상대 경로는 탐색기에서 열린 폴더를 기준으로 해석됩니다. 열린 폴더가 없으면 markdown 파일의 위치를 기준으로 해석됩니다. 모든 '\\'는 '\\\\'로 써야 합니다.",
- 	"markdown.showPreviewSecuritySelector.title": "미리 보기 보안 설정 변경",
- 	"markdown.trace.desc": "Markdown 확장에 대해 디버그 로깅을 사용하도록 설정합니다.",
-+<<<<<<< .our
- 	"markdown.preview.refresh.title": "미리 보기 새로 고침",
- 	"markdown.preview.toggleLock.title": "미리 보기 잠금 설정/해제"
-+=======
-+	"markdown.refreshPreview.title": "미리 보기 새로 고침"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 bae4e5954d08bb38ccbe0ffdc966eaaeeb0d5013 i18n/kor/extensions/npm/package.i18n.json
-  our    100644 b762a88ac6b09e3d0033e37c5db538576d49fc4b i18n/kor/extensions/npm/package.i18n.json
-  their  100644 04e51b003cad423ee7971f81d1a8a2963ea34482 i18n/kor/extensions/npm/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -23,4 +24,8 @@
- 	"command.debug": "디버그",
- 	"command.openScript": "열기",
- 	"command.runInstall": "설치 실행"
-+=======
-+	"config.npm.autoDetect": "npm 스크립트에 대한 자동 검색 여부를 설정합니다. 기본값은 [켜기]입니다.",
-+	"config.npm.runSilent": " `--silent` 옵션으로 npm 명령 실행"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/extensions/typescript/out/features/taskProvider.i18n.json
-  our    100644 6982eedcfd951f2be2d44e134096c815d17a7ef4 i18n/kor/extensions/typescript/out/features/taskProvider.i18n.json
-  their  100644 347d63b00dc1be110cd737d817413bb489cb2acd i18n/kor/extensions/typescript/out/features/taskProvider.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,14 @@
- 	],
- 	"buildTscLabel": "빌드 - {0}",
- 	"buildAndWatchTscLabel": "보기 - {0}"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"buildAndWatchTscLabel": "보기 - {0}",
-+	"buildTscLabel": "빌드 - {0}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 f57994230cb8219b9c547fcebbfae8dcd8943e26 i18n/kor/extensions/typescript/out/utils/api.i18n.json
-  their  100644 128cac23b14408f7d8f0688784a204730658b94f i18n/kor/extensions/typescript/out/utils/api.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"invalidVersion": "잘못된 버전"
- }
-\ No newline at end of file
-changed in both
-  base   100644 52fb57a72edd69c4822771acbd4ebf6459ff4370 i18n/kor/extensions/typescript/out/utils/versionPicker.i18n.json
-  our    100644 bdd4f232c518cc06bec0c21e9cee57193a198b23 i18n/kor/extensions/typescript/out/utils/versionPicker.i18n.json
-  their  100644 13043b07ab129deb0364d4f7158ed34056b1d65f i18n/kor/extensions/typescript/out/utils/versionPicker.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"useVSCodeVersionOption": "VS Code의 버전 사용",
- 	"useWorkspaceVersionOption": "작업 영역 버전 사용",
- 	"learnMore": "자세한 정보",
-changed in both
-  base   100644 6bdc1aa86ddd1361faeb4d65d5931b78cb6163aa i18n/kor/extensions/typescript/out/utils/versionProvider.i18n.json
-  our    100644 9a563329739677e8186993535cd19b9c7ecbe86f i18n/kor/extensions/typescript/out/utils/versionProvider.i18n.json
-  their  100644 ce4b4570352d591f6b6dd94f11fe03df487b5fd1 i18n/kor/extensions/typescript/out/utils/versionProvider.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"couldNotLoadTsVersion": "이 경로에서 TypeScript 버전을 로드할 수 없습니다.",
- 	"noBundledServerFound": "잘못 동작하는 바이러스 감지 도구와 같은 다른 응용 프로그램에서 VS Code의 tsserver가 삭제되었습니다. VS Code를 다시 설치하세요."
- }
-\ No newline at end of file
-changed in both
-  base   100644 ebf695748cca36e1b60d3bca4b68c583b75a97f1 i18n/kor/extensions/typescript/package.i18n.json
-  our    100644 dd42af00286b776dba8496a69b6e677f0653dc9b i18n/kor/extensions/typescript/package.i18n.json
-  their  100644 9024eb3187d51e31bb1be266291b4f626925ecf3 i18n/kor/extensions/typescript/package.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/src/vs/code/electron-main/auth.i18n.json
-  our    100644 47f853841b33cd27117be4d7b9d6fa9b9af0ff56 i18n/kor/src/vs/code/electron-main/auth.i18n.json
-  their  100644 4b003737236c7e2a22405547da228b5644f4b586 i18n/kor/src/vs/code/electron-main/auth.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"authRequire": "프록시 인증 필요",
- 	"proxyauth": "프록시 {0}에 인증이 필요합니다."
- }
-\ No newline at end of file
-changed in both
-  base   100644 9f3f01d8dbf4f2aba0210028b7c982d8b0a518e3 i18n/kor/src/vs/code/electron-main/menus.i18n.json
-  our    100644 a3a33ffe4d84057c71074e546cdf9a1e5529a6c8 i18n/kor/src/vs/code/electron-main/menus.i18n.json
-  their  100644 46251c505735b7ab0ebe7ef7874d99913baee7d5 i18n/kor/src/vs/code/electron-main/menus.i18n.json
-@@ -24,12 +24,21 @@
- 	"miQuit": "{0} 종료",
- 	"miNewFile": "새 파일(&&N)",
- 	"miOpen": "열기(&&O)...",
-+<<<<<<< .our
- 	"miOpenWorkspace": "작업 영역 열기(&&K)...",
- 	"miOpenFolder": "폴더 열기(&&F)...",
- 	"miOpenFile": "파일 열기(&&O)...",
- 	"miOpenRecent": "최근 항목 열기(&&R)",
- 	"miSaveWorkspaceAs": "작업 영역을 다른 이름으로 저장",
- 	"miAddFolderToWorkspace": "작업 영역에 폴더 추가(&&D)...",
-+=======
-+	"miOpenWorkspace": "작업 영역 열기(&O)...",
-+	"miOpenFolder": "폴더 열기(&&F)...",
-+	"miOpenFile": "파일 열기(&&O)...",
-+	"miOpenRecent": "최근 항목 열기(&&R)",
-+	"miSaveWorkspaceAs": "다른 이름으로 작업 영역 저장(&S)...",
-+	"miAddFolderToWorkspace": "작업 영역에 폴더 추가(&&A)",
-+>>>>>>> .their
- 	"miSave": "저장(&&S)",
- 	"miSaveAs": "다른 이름으로 저장(&&A)...",
- 	"miSaveAll": "모두 저장(&&L)",
-@@ -189,5 +198,11 @@
- 	"miDownloadingUpdate": "업데이트를 다운로드하는 중...",
- 	"miInstallUpdate": "업데이트 설치...",
- 	"miInstallingUpdate": "업데이트를 설치하는 중...",
-+<<<<<<< .our
- 	"miRestartToUpdate": "다시 시작하여 업데이트..."
-+=======
-+	"miCheckForUpdates": "업데이트 확인...",
-+	"aboutDetail": "\n버전 {0}\n커밋 {1}\n날짜 {2}\n셸 {3}\n렌더러 {4}\n노드 {5}\n아키텍처 {6}",
-+	"okButton": "확인"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 827fd75a50f23b97342d382d443d08f70ef464c5 i18n/kor/src/vs/code/electron-main/windows.i18n.json
-  our    100644 d5c6b9b1265e0ee69b9beb0907ae3e533810962d i18n/kor/src/vs/code/electron-main/windows.i18n.json
-  their  100644 da140f0ae8816879d3527b0df9df52be234140e7 i18n/kor/src/vs/code/electron-main/windows.i18n.json
-@@ -9,15 +9,30 @@
- 	"ok": "확인",
- 	"pathNotExistTitle": "경로가 없습니다.",
- 	"pathNotExistDetail": "'{0}' 경로가 디스크에 더 이상 없는 것 같습니다.",
-+<<<<<<< .our
- 	"reopen": "다시 열기(&&R)",
- 	"wait": "계속 대기(&&K)",
- 	"close": "닫기(&&C)",
-+=======
-+	"openWorkspace": "열기(&&O)",
-+	"openWorkspaceTitle": "작업 영역 열기",
-+	"save": "저장(&&S)",
-+	"doNotSave": "저장 안 함(&&N)",
-+	"cancel": "취소",
-+	"saveWorkspaceMessage": "작업 영역 구성을 파일로 저장하시겠습니까?",
-+	"saveWorkspaceDetail": "작업 영역을 다시 열려면 작업 영역을 저장하세요.",
-+	"saveWorkspace": "작업 영역 저장",
-+	"reopen": "다시 열기",
-+	"wait": "계속 대기",
-+	"close": "닫기",
-+>>>>>>> .their
- 	"appStalled": "창이 더 이상 응답하지 않습니다.",
- 	"appStalledDetail": "창을 다시 열거나, 닫거나, 계속 기다릴 수 있습니다.",
- 	"appCrashed": "창이 충돌했습니다.",
- 	"appCrashedDetail": "불편을 드려서 죄송합니다. 창을 다시 열면 중단된 위치에서 계속할 수 있습니다.",
- 	"open": "열기",
- 	"openFolder": "폴더 열기",
-+<<<<<<< .our
- 	"openFile": "파일 열기",
- 	"workspaceOpenedMessage": "'{0}' 작업 영역을 저장할 수 없음",
- 	"workspaceOpenedDetail": "작업 영역이 이미 다른 창에 열렸습니다. 먼저 해당 창을 닫은 후 다시 시도하세요.",
-@@ -29,4 +44,7 @@
- 	"saveWorkspaceMessage": "작업 영역 구성을 파일로 저장하시겠습니까?",
- 	"saveWorkspaceDetail": "작업 영역을 다시 열려면 작업 영역을 저장하세요.",
- 	"saveWorkspace": "작업 영역 저장"
-+=======
-+	"openFile": "파일 열기"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
-  our    100644 bda85bce0b206ff79c5dce76befaf70badf82add i18n/kor/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
-  their  100644 748a7f2cb394a252b7d6673f26a9c1efcc24f119 i18n/kor/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"diff.tooLarge": "파일 1개가 너무 커서 파일을 비교할 수 없습니다."
- }
-\ No newline at end of file
-changed in both
-  base   100644 2c53ffbfb61c1bd3703b26d024e43b6fc44cbf68 i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 c96c0fe1469ce78842b73db686d63d6305f28dfb i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 ccdc95ec7122d2fc2105655c0d99d2da27ca0e03 i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -26,11 +26,17 @@
- 	"detectIndentation": "파일을 열면 파일 콘텐츠를 기반으로 하여 'editor.tabSize'와 'editor.insertSpaces'가 검색됩니다.",
- 	"roundedSelection": "선택 항목의 모서리를 둥글게 할지 여부를 제어합니다.",
- 	"scrollBeyondLastLine": "편집기에서 마지막 줄 이후로 스크롤할지 여부를 제어합니다.",
-+<<<<<<< .our
- 	"scrollBeyondLastColumn": "편집기에서 가로로 스크롤되는 범위를 벗어나는 추가 문자의 수를 제어합니다.",
- 	"smoothScrolling": "편집기에서 애니메이션을 사용하여 스크롤할지 여부를 제어합니다.",
- 	"minimap.enabled": "미니맵 표시 여부를 제어합니다.",
- 	"minimap.side": "미니맵을 렌더링할 측면을 제어합니다.",
- 	"minimap.showSlider": "미니맵 슬라이더를 자동으로 숨길지 결정합니다.",
-+=======
-+	"smoothScrolling": "편집기에서 애니메이션을 사용하여 스크롤할지 여부를 제어합니다.",
-+	"minimap.enabled": "미니맵 표시 여부를 제어합니다.",
-+	"minimap.showSlider": "미니맵 슬라이더를 자동으로 숨길지 결정합니다. 가능한 값은 'always' 및 'mouseover'입니다.",
-+>>>>>>> .their
- 	"minimap.renderCharacters": "줄의 실제 문자(색 블록 아님) 렌더링",
- 	"minimap.maxColumn": "최대 특정 수의 열을 렌더링하도록 미니맵의 너비를 제한합니다.",
- 	"find.seedSearchStringFromSelection": "편집기 선택에서 Find Widget의 검색 문자열을 시딩할지 설정합니다.",
-@@ -106,11 +112,14 @@
- 	"accessibilitySupport": "편집기를 스크린 리더를 위해 최적화된 모드로 실행할지 결정합니다.",
- 	"links": "편집기에서 링크를 감지하고 클릭할 수 있게 만들지 결정합니다.",
- 	"colorDecorators": "편집기에서 인라인 색 데코레이터 및 색 선택을 렌더링할지를 제어합니다.",
-+<<<<<<< .our
- 	"codeActions": "코드 동작 전구를 사용합니다.",
- 	"codeActionsOnSave.organizeImports": "저장할 때 가져오기 구성을 실행하시겠습니까?",
- 	"codeActionsOnSave": "저장할 때 실행되는 코드 동작 종류입니다.",
- 	"codeActionsOnSaveTimeout": "저장할 때 실행되는 코드 동작에 대한 시간 제한입니다.",
- 	"selectionClipboard": "Linux 주 클립보드의 지원 여부를 제어합니다.",
-+=======
-+>>>>>>> .their
- 	"sideBySide": "diff 편집기에서 diff를 나란히 표시할지 인라인으로 표시할지 여부를 제어합니다.",
- 	"ignoreTrimWhitespace": "diff 편집기에서 선행 공백 또는 후행 공백 변경을 diffs로 표시할지 여부를 제어합니다.",
- 	"largeFileOptimizations": "큰 파일에 대한 특수 처리로, 메모리를 많이 사용하는 특정 기능을 사용하지 않도록 설정합니다.",
-changed in both
-  base   100644 dcef1416eba3b36e89704049946067dd61560e9f i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 c148a56d8d67892505611b68cdd18b2ba3428134 i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 b7f686e2628e1c09e2426b0a0480a1a29015af29 i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -28,12 +28,16 @@
- 	"errorBorder": "편집기 내 오류 표시선의 테두리 색입니다.",
- 	"warningForeground": "편집기 내 경고 표시선의 전경색입니다.",
- 	"warningBorder": "편집기 내 경고 표시선의 테두리 색입니다.",
-+<<<<<<< .our
- 	"infoForeground": "편집기 내 정보 표시선의 전경색입니다.",
- 	"infoBorder": "편집기 내 정보 표시선의 테두리 색입니다.",
- 	"hintForeground": "편집기에서 힌트 표시선의 전경색입니다.",
- 	"hintBorder": "편집기에서 힌트 표시선의 테두리 색입니다.",
- 	"unnecessaryForeground": "편집기 내 불필요한 코드의 전경색입니다.",
- 	"overviewRulerRangeHighlight": "범위 강조의 개요 눈금자 표식 색입니다. 이 색은 불투명해야만 내부 장식을 가리지 않습니다.",
-+=======
-+	"overviewRulerRangeHighlight": "범위 강조 표시의 개요 눈금자 마커 색입니다.",
-+>>>>>>> .their
- 	"overviewRuleError": "오류의 개요 눈금자 마커 색입니다.",
- 	"overviewRuleWarning": "경고의 개요 눈금자 마커 색입니다.",
- 	"overviewRuleInfo": "정보의 개요 눈금자 마커 색입니다."
-changed in both
-  base   100644 8c6b4441dfce30ad18d7018cd01e0486ae75d861 i18n/kor/src/vs/editor/contrib/find/common/findController.i18n.json
-  our    100644 7201d1ab08fc71d8c9ec33ae39fdb857dbf3a0c9 i18n/kor/src/vs/editor/contrib/find/common/findController.i18n.json
-  their  100644 d0e58fa206e360002c7208853a0665c90b28ebfe i18n/kor/src/vs/editor/contrib/find/common/findController.i18n.json
-@@ -10,6 +10,15 @@
- 	"nextSelectionMatchFindAction": "다음 선택 찾기",
- 	"previousSelectionMatchFindAction": "이전 선택 찾기",
- 	"startReplace": "바꾸기",
-+<<<<<<< .our
-+=======
-+	"addSelectionToNextFindMatch": "다음 일치 항목 찾기에 선택 항목 추가",
-+	"addSelectionToPreviousFindMatch": "이전 일치 항목 찾기에 선택 항목 추가",
-+	"moveSelectionToNextFindMatch": "다음 일치 항목 찾기로 마지막 선택 항목 이동",
-+	"moveSelectionToPreviousFindMatch": "마지막 선택 항목을 이전 일치 항목 찾기로 이동",
-+	"selectAllOccurrencesOfFindMatch": "일치 항목 찾기의 모든 항목 선택",
-+	"changeAll.label": "모든 항목 변경",
-+>>>>>>> .their
- 	"showNextFindTermAction": "다음 검색어 표시",
- 	"showPreviousFindTermAction": "이전 검색어 표시"
- }
-\ No newline at end of file
-changed in both
-  base   100644 4ea06482be09428e90d0c937f54159ccb5413a9a i18n/kor/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
-  our    100644 ab340d73f19ecf15cb9622216450ecbc5bb87e24 i18n/kor/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
-  their  100644 81b184674c2069abed65b08bfc92479803cacfbc i18n/kor/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
-@@ -7,7 +7,11 @@
- 	"wordHighlight": "변수 읽기와 같은 읽기 액세스 중 기호의 배경색입니다.",
- 	"wordHighlightStrong": "변수에 쓰기와 같은 쓰기 액세스 중 기호의 배경색입니다.",
- 	"overviewRulerWordHighlightForeground": "기호 강조 표시의 개요 눈금자 마커 색입니다.",
-+<<<<<<< .our
- 	"overviewRulerWordHighlightStrongForeground": "쓰기 권한 기호 강조 표시의 개요 눈금자 마커 색입니다.",
- 	"wordHighlight.next.label": "다음 강조 기호로 이동",
- 	"wordHighlight.previous.label": "이전 강조 기호로 이동"
-+=======
-+	"overviewRulerWordHighlightStrongForeground": "쓰기 권한 기호 강조 표시의 개요 눈금자 마커 색입니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 95f21567a73b198b90ae693427286377ad36bdc7 i18n/kor/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 5e47e69c5607206a94dadfaaaaa5928d57a2cd8e i18n/kor/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 a17aa5d4532de631ea297c516b0bd5335c32cb10 i18n/kor/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,9 +10,12 @@
- 	"diff": "두 파일을 서로 비교합니다.",
- 	"add": "마지막 활성 창에 폴더를 추가합니다.",
- 	"goto": "지정된 줄과 문자 위치에 있는 경로의 파일을 엽니다.",
-+<<<<<<< .our
- 	"newWindow": "새 창을 강제로 엽니다.",
- 	"reuseWindow": "마지막 활성 창에서 파일 또는 파일을 강제로 엽니다.",
- 	"wait": "파일이 닫힐 때 까지 기다린 후 돌아갑니다.",
-+=======
-+>>>>>>> .their
- 	"locale": "사용할 로캘(예: en-US 또는 zh-TW)입니다.",
- 	"userDataDir": "사용자 데이터가 저장되는 디렉터리를 지정합니다. Code의 여러 고유 인스턴스를 여는 데 사용할 수 있습니다.",
- 	"version": "버전을 출력합니다.",
-changed in both
-  base   100644 ee033a6e86d186c6e6815d7bf7efa992f6699b5e i18n/kor/src/vs/platform/history/electron-main/historyMainService.i18n.json
-  our    100644 9400d59c513057d5900bfcbd5bcb8b5890743265 i18n/kor/src/vs/platform/history/electron-main/historyMainService.i18n.json
-  their  100644 74f2992518abeaa3aa267103e02461410bf75ab7 i18n/kor/src/vs/platform/history/electron-main/historyMainService.i18n.json
-added in both
-  our    100644 eb6d49f45206b1a02989ce8cd09cfb3279900a45 i18n/kor/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
-  their  100644 50827151bc9c5f56a4d5c39b36e76fd29b4877df i18n/kor/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"contributes.color": "확장 정의 테마 지정 가능 색을 적용합니다.",
- 	"contributes.color.id": "테마 지정 가능 색의 식별자입니다.",
- 	"contributes.color.id.format": "식별자는 aa[.bb]* 형식이어야 합니다.",
-@@ -15,8 +24,14 @@
- 	"contributes.defaults.highContrast": "고대비 테마의 기본 색상입니다. 기본값을 제공하는 16진수(#RRGGBB[AA])의 색상 값 또는 테마 지정 가능 색의 식별자입니다.",
- 	"invalid.colorConfiguration": "'configuration.colors'는 배열이어야 합니다.",
- 	"invalid.default.colorType": "{0}은(는) 16진수의 색 값(#RRGGBB[AA] 또는 #RGB[A]) 또는 기본값을 제공하는 테마 지정 가능 색의 식별자입니다.",
-+<<<<<<< .our
- 	"invalid.id": "'configuration.colors.id'를 정의해야 하며 비워둘 수 없습니다.",
- 	"invalid.id.format": "'configuration.colors.id'는 단어[.word]* 다음에 와야 합니다.",
- 	"invalid.description": "'configuration.colors.description'을 정의해야 하며 비워둘 수 없습니다.",
-+=======
-+	"invalid.id": "'configuration.colors.id'를 정의해야 하여 비워 둘 수 없습니다.",
-+	"invalid.id.format": "'configuration.colors.id'는 단어[.word]* 다음에 와야 합니다.",
-+	"invalid.description": "'configuration.colors.description'를 정의해야 하며 비워 둘 수 없습니다.",
-+>>>>>>> .their
- 	"invalid.defaults": "'configuration.colors.defaults'를 정의해야 하며 'light', 'dark' 및 'highContrast'를 포함해야 합니다."
- }
-\ No newline at end of file
-changed in both
-  base   100644 ab5da7316c6103edf30c44261039b1a9d3ac518f i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 44b01274f5b039d38e4cfbd58f3d0758fa5d1e89 i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 98c0d356e835abd6c2114c2022c86d782414e2e8 i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -60,7 +60,11 @@
- 	"scrollbarShadow": "스크롤되는 보기를 나타내는 스크롤 막대 그림자입니다.",
- 	"scrollbarSliderBackground": "스크롤 막대 슬라이버 배경색입니다.",
- 	"scrollbarSliderHoverBackground": "마우스로 가리킬 때 스크롤 막대 슬라이더 배경색입니다.",
-+<<<<<<< .our
- 	"scrollbarSliderActiveBackground": "클릭된 상태일 때 스크롤 막대 슬라이더 배경색입니다.",
-+=======
-+	"scrollbarSliderActiveBackground": "활성 상태일 때 스크롤 막대 슬라이더 배경색입니다.",
-+>>>>>>> .their
- 	"progressBarBackground": "오래 실행 중인 작업에 대해 표시되는 진행률 표시 막대의 배경색입니다.",
- 	"editorBackground": "편집기 배경색입니다.",
- 	"editorForeground": "편집기 기본 전경색입니다.",
-@@ -96,6 +100,11 @@
- 	"overviewRulerCurrentContentForeground": "인라인 병합 충돌에서 현재 개요 눈금 전경색입니다.",
- 	"overviewRulerIncomingContentForeground": "인라인 병합 충돌에서 수신 개요 눈금 전경색입니다.",
- 	"overviewRulerCommonContentForeground": "인라인 병합 충돌에서 공통 과거 개요 눈금 전경색입니다.",
-+<<<<<<< .our
- 	"overviewRulerFindMatchForeground": "일치하는 항목 찾기의 개요 눈금자 표식 색입니다. 이 색은 불투명해야만 내부 장식을 가리지 않습니다.",
- 	"overviewRulerSelectionHighlightForeground": "선택 영역 강조의 개요 눈금자 표식 색입니다. 이 색은 불투명해야만 내부 장식을 가리지 않습니다."
-+=======
-+	"overviewRulerFindMatchForeground": "찾기 일치 항목의 개요 눈금자 마커 색입니다.",
-+	"overviewRulerSelectionHighlightForeground": "선택 영역 강조 표시의 개요 눈금자 마커 색입니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 3e94ef3d79a4d8f6c95c876b08356a989bc71de6 i18n/kor/src/vs/platform/workspaces/common/workspaces.i18n.json
-  their  100644 6a58bb386107c50cf42baa031268006f4c500763 i18n/kor/src/vs/platform/workspaces/common/workspaces.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"codeWorkspace": "코드 작업 영역",
- 	"untitledWorkspace": "제목 없음(작업 영역)",
- 	"workspaceNameVerbose": "{0}(작업 영역)",
-added in both
-  our    100644 0f680b0e8511e6ea1a2b62f413ee101ed55085a9 i18n/kor/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
-  their  100644 6aaab18c9bf89d4419a68daab6f569354912da3c i18n/kor/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,4 +11,16 @@
- 	"failedDep1": "`{1}` 확장을 활성화하지 못했습니다. 이유: `{0}` 종속성을 활성화하지 못했습니다.",
- 	"failedDep2": "`{1}` 확장을 활성화하지 못했습니다. 이유: 10개를 초과하는 종속성 수준(종속성 루프일 가능성 높음).",
- 	"activationError": "'{0}' 확장을 활성화하지 못했습니다. {1}."
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"unknownDep": "확장 `{1}`을(를) 활성화하지 못했습니다. 이유: 알 수 없는 종속성 `{0}`.",
-+	"failedDep1": "확장 `{1}`을(를) 활성화하지 못했습니다. 이유: 종속성 `{0}`이(가) 활성화되지 않았습니다.",
-+	"failedDep2": "확장 `{0}`을(를) 활성화하지 못했습니다. 이유: 종속성 수준이 10개가 넘음(종속성 루프일 가능성이 높음).",
-+	"activationError": "확장 `{0}` 활성화 실패: {1}."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 56b8182afa2371ec565fe3b383e32ed8d1076af5 i18n/kor/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 9f392ee6782a9cd3b3d60690870bfb3e051b1e8b i18n/kor/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 82079af3e4af31a8de83cccb3e03a0d2423cdb0c i18n/kor/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -9,6 +9,7 @@
- 	"openFile": "파일 열기...",
- 	"openFolder": "폴더 열기...",
- 	"openFileFolder": "열기...",
-+<<<<<<< .our
- 	"globalRemoveFolderFromWorkspace": "작업 영역에서 폴더 제거...",
- 	"saveWorkspaceAsAction": "작업 영역을 다른 이름으로 저장",
- 	"save": "저장(&&S)",
-@@ -16,4 +17,19 @@
- 	"openWorkspaceAction": "작업 영역 열기...",
- 	"openWorkspaceConfigFile": "작업 영역 구성 파일 열기",
- 	"duplicateWorkspaceInNewWindow": "새 창에 작업 영역 복제"
-+=======
-+	"addFolderToWorkspace": "작업 영역에 폴더 추가...",
-+	"add": "추가(&&A)",
-+	"addFolderToWorkspaceTitle": "작업 영역에 폴더 추가",
-+	"newWorkspace": "새 작업 영역...",
-+	"select": "선택(&&S)",
-+	"selectWorkspace": "작업 영역 폴더 선택",
-+	"removeFolderFromWorkspace": "작업 영역에서 폴더 삭제",
-+	"saveWorkspaceAsAction": "작업 영역을 다른 이름으로 저장",
-+	"saveEmptyWorkspaceNotSupported": "저장하려면 먼저 작업 영역을 여세요.",
-+	"save": "저장(&&S)",
-+	"saveWorkspace": "작업 영역 저장",
-+	"openWorkspaceAction": "작업 영역 열기...",
-+	"openWorkspaceConfigFile": "작업 영역 구성 파일 열기"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 0977d6d1b49023bfdcc955aea2c88da8c7a76c67 i18n/kor/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 c3a38e203dc33f498428fe02d849236cb876a123 i18n/kor/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 241bb67c5eee8ce0a274d3f675a332f810f92572 i18n/kor/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 5e2f77ce29d584046b775def4dba3837e6629d07 i18n/kor/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-  our    100644 93f9a5f3a8b11703c482d474163e0bd4ada760f7 i18n/kor/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-  their  100644 d6de51734164ad589ae3565b29422580bde33a62 i18n/kor/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,9 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"compositePart.hideSideBarLabel": "사이드 막대 숨기기",
-+>>>>>>> .their
- 	"focusSideBar": "사이드바에 포커스",
- 	"viewCategory": "보기"
- }
-\ No newline at end of file
-changed in both
-  base   100644 71d7cfe6952de22b112495938f77f82acd153f82 i18n/kor/src/vs/workbench/common/theme.i18n.json
-  our    100644 634f6ea85a754d26140eeb8ed57e39a6ab596db9 i18n/kor/src/vs/workbench/common/theme.i18n.json
-  their  100644 dd78f3b3df153673ba32f896e4911bd1b99c9044 i18n/kor/src/vs/workbench/common/theme.i18n.json
-@@ -11,12 +11,17 @@
- 	"tabHoverBackground": "마우스 커서를 올려놓았을 때의 탭 배경색. 탭은 편집 영역에서 편집기를 감싸고 있습니다. 한 편집기 그룹에서 여러 탭을 열 수 있습니다. 편집기 그룹이 여러 개일 수 있습니다.",
- 	"tabUnfocusedHoverBackground": "마우스 커서를 올려놓았을 때 포커스를 받지 못한 탭 배경색. 탭은 편집 영역에서 편집기를 감싸고 있습니다. 한 편집기 그룹에서 여러 탭을 열 수 있습니다. 편집기 그룹이 여러 개일 수 있습니다.",
- 	"tabBorder": "탭을 서로 구분하기 위한 테두리입니다. 탭은 편집기 영역에서 편집기의 컨테이너입니다. 한 편집기 그룹에 여러 탭을 열 수 있습니다. 여러 편집기 그룹이 있을 수 있습니다.",
-+<<<<<<< .our
- 	"tabActiveBorder": "활성 탭 맨 아래의 테두리입니다. 탭은 편집기 영역에서 편집기의 컨테이너입니다. 한 편집기 그룹에 여러 탭을 열 수 있습니다. 여러 편집기 그룹이 있을 수 있습니다.",
- 	"tabActiveBorderTop": "활성 탭 맨 위의 위한 테두리입니다. 탭은 편집기 영역에서 편집기의 컨테이너입니다. 한 편집기 그룹에 여러 탭을 열 수 있습니다. 여러 편집기 그룹이 있을 수 있습니다.",
- 	"tabActiveUnfocusedBorder": "포커스가 없는 그룹에서 활성 탭 맨 아래의 테두리입니다. 탭은 편집기 영역에서 편집기의 컨테이너입니다. 한 편집기 그룹에 여러 탭을 열 수 있습니다. 여러 편집기 그룹이 있을 수 있습니다.",
- 	"tabActiveUnfocusedBorderTop": "포커스가 없는 그룹에서 활성 탭 맨 위의 테두리입니다. 탭은 편집기 영역에서 편집기의 컨테이너입니다. 한 편집기 그룹에 여러 탭을 열 수 있습니다. 여러 편집기 그룹이 있을 수 있습니다.",
- 	"tabHoverBorder": "마우스 커서를 올려놓았을 때 활성 탭의 테두리. 탭은 편집 영역에서 편집기를 감싸고 있습니다. 한 편집기 그룹에서 여러 탭을 열 수 있습니다. 편집기 그룹이 여러 개일 수 있습니다.",
- 	"tabUnfocusedHoverBorder": "마우스 커서를 올려놓았을 때 포커스를 받지 못한 그룹에서 활성 탭 테두리. 탭은 편집 영역에서 편집기를 감싸고 있습니다. 한 편집기 그룹에서 여러 탭을 열 수 있습니다. 편집기 그룹이 여러 개일 수 있습니다.",
-+=======
-+	"tabActiveBorder": "활성 탭을 강조 표시하기 위한 테두리입니다. 탭은 편집기 영역에서 편집기의 컨테이너입니다. 한 편집기 그룹에 여러 탭을 열 수 있습니다. 여러 편집기 그룹이 있을 수 있습니다.",
-+	"tabActiveUnfocusedBorder": "포커스가 없는 그룹에서 활성 탭을 강조 표시하기 위한 테두리입니다. 탭은 편집기 영역에서 편집기의 컨테이너입니다. 한 편집기 그룹에 여러 탭을 열 수 있습니다. 여러 편집기 그룹이 있을 수 있습니다.",
-+>>>>>>> .their
- 	"tabActiveForeground": "활성 그룹의 활성 탭 전경색입니다. 탭은 편집기 영역에서 편집기의 컨테이너입니다. 한 편집기 그룹에서 여러 탭을 열 수 있습니다. 여러 편집기 그룹이 있을 수 있습니다.",
- 	"tabInactiveForeground": "활성 그룹의 비활성 탭 전경색입니다. 탭은 편집기 영역에서 편집기의 컨테이너입니다. 한 편집기 그룹에서 여러 탭을 열 수 있습니다. 여러 편집기 그룹이 있을 수 있습니다.",
- 	"tabUnfocusedActiveForeground": "포커스가 없는 그룹의 활성 탭 전경색입니다. 탭은 편집기 영역에서 편집기의 컨테이너입니다. 한 편집기 그룹에서 여러 탭을 열 수 있습니다. 여러 편집기 그룹이 있을 수 있습니다.",
-@@ -32,7 +37,10 @@
- 	"panelActiveTitleForeground": "활성 패널의 제목 색입니다. 패널은 편집기 영역 아래에 표시되며 출력 및 통합 터미널 같은 보기가 포함됩니다.",
- 	"panelInactiveTitleForeground": "비활성 패널의 제목 색입니다. 패널은 편집기 영역 아래에 표시되며 출력 및 통합 터미널 같은 보기가 포함됩니다.",
- 	"panelActiveTitleBorder": "활성 패널 제목의 테두리 색입니다. 패널은 편집기 영역 아래에 표시되며 출력 및 통합 터미널 같은 보기가 포함됩니다.",
-+<<<<<<< .our
- 	"panelDragAndDropBackground": "패널 제목 항목의 끌어서 놓기 피드백 색입니다. 이 색은 패널 항목이 게속 비추어 보이도록 투명해야 합니다. 패널은 편집기 영역 아래에 표시되며 출력 및 통합 터미널 같은 보기가 포함됩니다.",
-+=======
-+>>>>>>> .their
- 	"statusBarForeground": "작업 영역이 열려 있을 때의 상태 표시줄 전경색입니다. 상태 표시줄은 창의 맨 아래에 표시됩니다.",
- 	"statusBarNoFolderForeground": "폴더가 열리지 않았을 때의 상태 표시줄 전경색입니다. 상태 표시줄은 창의 맨 아래에 표시됩니다.",
- 	"statusBarBackground": "작업 영역이 열려 있을 때의 상태 표시줄 배경색입니다. 상태 표시줄은 창의 맨 아래에 표시됩니다.",
-@@ -61,6 +69,7 @@
- 	"titleBarActiveBackground": "창을 활성화할 때의 제목 표시줄 전경입니다. 이 색은 현재 macOS에서만 지원됩니다.",
- 	"titleBarInactiveBackground": "창이 비활성화된 경우의 제목 표시줄 배경입니다. 이 색은 현재 macOS에서만 지원됩니다.",
- 	"titleBarBorder": "제목 막대 테두리 색입니다. 현재 이 색상은 macOS에서만 지원됩니다.",
-+<<<<<<< .our
- 	"notificationCenterBorder": "알림 센터 테두리 색입니다. 알림은 창 오른쪽 맨 아래에 표시됩니다.",
- 	"notificationToastBorder": "알림 테두리 색입니다. 알림은 창 오른쪽 맨 아래에 표시됩니다.",
- 	"notificationsForeground": "알림 전경색입니다. 알림은 창 오른쪽 맨 아래에 표시됩니다.",
-@@ -69,4 +78,17 @@
- 	"notificationCenterHeaderForeground": "알림 센터 머리글 전경색입니다. 알림은 창 오른쪽 맨 아래에 표시됩니다.",
- 	"notificationCenterHeaderBackground": "알림 센터 머리글 배경색입니다. 알림은 창 오른쪽 맨 아래에 표시됩니다.",
- 	"notificationsBorder": "알림 센터에서 다른 알림과 구분하는 알림 테두리 색입니다. 알림은 창 오른쪽 맨 아래에 표시됩니다."
-+=======
-+	"notificationsForeground": "알림 전경색입니다. 알림은 창의 위쪽에 표시됩니다.",
-+	"notificationsBackground": "알림 배경색입니다. 알림은 창의 위쪽에 표시됩니다.",
-+	"notificationsButtonBackground": "알림 단추 배경색입니다. 알림은 창의 위쪽에 표시됩니다.",
-+	"notificationsButtonHoverBackground": "떠 있는 알림 단추 배경색입니다. 알림은 창의 위쪽에 표시됩니다.",
-+	"notificationsButtonForeground": "알림 단추 전경색입니다. 알림은 창의 위쪽에 표시됩니다.",
-+	"notificationsInfoBackground": "알림 정보 배경색입니다. 알림은 창의 위쪽에 표시됩니다.",
-+	"notificationsInfoForeground": "알림 정보 전경색입니다. 알림은 창의 위쪽에 표시됩니다.",
-+	"notificationsWarningBackground": "알림 경고 배경색입니다. 알림은 창의 위쪽에 표시됩니다.",
-+	"notificationsWarningForeground": "알림 경고 전경색입니다. 알림은 창의 위쪽에 표시됩니다.",
-+	"notificationsErrorBackground": "알림 오류 배경색입니다. 알림은 창의 위쪽에 표시됩니다.",
-+	"notificationsErrorForeground": "알림 오류 전경색입니다. 알림은 창의 위쪽에 표시됩니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d6e342c7b2244965f9f49a03f8b7b950a26c77fd i18n/kor/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 e913e127345422fb81d57f13fd8b5c25a0d63e10 i18n/kor/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 e9b90f8dbe3eab05fb2305d42588a4bfd5fe8e1b i18n/kor/src/vs/workbench/electron-browser/actions.i18n.json
-changed in both
-  base   100644 96418c6f448fe0fa68e2a7eba4d25c96bce1c874 i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 faff44b17686fcb835995d2bfd92efcfdcc183b1 i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 57a3833e96f18df728132e4eda300aa9bbbfa084 i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,6 +35,7 @@
- 	"panelDefaultLocation": "패널의 기본 위치를 제어합니다. 워크벤치의 아래 또는 오른쪽에 표시될 수 있습니다.",
- 	"statusBarVisibility": "워크벤치 아래쪽에서 상태 표시줄의 표시 유형을 제어합니다.",
- 	"activityBarVisibility": "워크벤치에서 작업 막대의 표시 유형을 제어합니다.",
-+<<<<<<< .our
- 	"viewVisibility": "보기 머리글 작업의 표시 여부를 제어합니다. 보기 머리글 작업은 항상 표시할 수도 있고 보기에 포커스가 있거나 보기를 마우스로 가리킬 때만 표시할 수도 있습니다.",
- 	"fontAliasing": "워크벤치에서 글꼴 앨리어싱 방식을 제어합니다.\n- 기본: 서브 픽셀 글꼴 다듬기. 대부분의 일반 디스플레이에서 가장 선명한 글꼴 제공\n- 안티앨리어싱: 서브 픽셀이 아닌 픽셀 단위에서 글꼴 다듬기. 전반적으로 더 밝은 느낌을 줄 수 있음\n- 없음: 글꼴 다듬기 사용 안 함. 텍스트 모서리가 각지게 표시됨\n- 자동: 디스플레이의 DPI에 따라 `기본` 또는 `안티앨리어싱`을 자동으로 적용합니다.",
- 	"workbench.fontAliasing.default": "서브 픽셀 글꼴 다듬기. 대부분의 일반 디스플레이에서 가장 선명한 텍스트를 제공합니다. ",
-@@ -43,6 +44,15 @@
- 	"workbench.fontAliasing.auto": "디스플레이의 DPI에 따라 `기본` 또는 `안티앨리어싱`을 자동으로 적용합니다.",
- 	"enableNaturalLanguageSettingsSearch": "설정에 대한 자연어 검색 모드를 사용할지 여부를 제어합니다.",
- 	"windowConfigurationTitle": "창",
-+=======
-+	"closeOnFileDelete": "일부 다른 프로세스에서 파일을 삭제하거나 이름을 바꿀 때 파일을 표시하는 편집기를 자동으로 닫을지 여부를 제어합니다. 사용하지 않도록 설정하는 경우 이러한 이벤트가 발생하면 편집기가 더티 상태로 계속 열려 있습니다. 응용 프로그램 내에서 삭제하면 항상 편집기가 닫히고 데이터를 유지하기 위해 더티 파일은 닫히지 않습니다.",
-+	"fontAliasing": "워크벤치에서 글꼴 앨리어싱 방식을 제어합니다.\n- 기본: 서브 픽셀 글꼴 다듬기. 대부분의 일반 디스플레이에서 가장 선명한 글꼴 제공\n- 안티앨리어싱: 서브 픽셀이 아닌 픽셀 단위에서 글꼴 다듬기. 전반적으로 더 밝은 느낌을 줄 수 있음\n- 없음: 글꼴 다듬기 사용 안 함. 텍스트 모서리가 각지게 표시됨",
-+	"workbench.fontAliasing.default": "서브 픽셀 글꼴 다듬기. 대부분의 일반 디스플레이에서 가장 선명한 텍스트를 제공합니다. ",
-+	"workbench.fontAliasing.antialiased": "서브 픽셀이 아닌 픽셀 수준에서 글꼴을 다듬습니다. 전반적으로 글꼴이 더 밝게 표시됩니다.",
-+	"workbench.fontAliasing.none": "글꼴 다듬기를 사용하지 않습니다. 텍스트 가장자리가 각지게 표시됩니다.",
-+	"swipeToNavigate": "세 손가락으로 가로로 살짝 밀어 열려 있는 파일 간을 이동합니다.",
-+	"workbenchConfigurationTitle": "워크벤치",
-+>>>>>>> .their
- 	"window.openFilesInNewWindow.on": "파일이 새 창에서 열립니다.",
- 	"window.openFilesInNewWindow.off": "파일이 파일의 폴더가 열려 있는 창 또는 마지막 활성 창에서 열립니다.",
- 	"window.openFilesInNewWindow.defaultMac": "Dock 또는 Finder를 통해 파일을 연 경우를 제외하고 파일이 파일의 폴더가 열린 창 또는 마지막 활성 창에서 열립니다.",
-changed in both
-  base   100644 25e82009859b6337471de1227baae9692d5ef89e i18n/kor/src/vs/workbench/electron-browser/window.i18n.json
-  our    100644 703e3d8d4269028adc7403f098f2a57162a9f658 i18n/kor/src/vs/workbench/electron-browser/window.i18n.json
-  their  100644 dc0deb8eb7f8161fdb73791860860809cca450c7 i18n/kor/src/vs/workbench/electron-browser/window.i18n.json
-@@ -11,6 +11,10 @@
- 	"cut": "잘라내기",
- 	"copy": "복사",
- 	"paste": "붙여넣기",
-+<<<<<<< .our
- 	"selectAll": "모두 선택",
- 	"runningAsRoot": "{0}을(를) 루트 사용자로 실행하지 않는 것이 좋습니다."
-+=======
-+	"selectAll": "모두 선택"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 d8536fcf0985e046d6bca7a04f507bfdac7c5803 i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
-  their  100644 1e8111e9fe99181af0003f2dbe079b6e08015b52 i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"toggleMinimap": "보기: 미니맵 토글"
- }
-\ No newline at end of file
-changed in both
-  base   100644 a111c0128f1fe894adc5addaa737669c0325f2fd i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
-  our    100644 9d609ff8327b4e8d81b3f069526c92b06e1defbe i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
-  their  100644 852c1e89096ab61ae8b46f1d35816b23e3317227 i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"toggleRenderControlCharacters": "보기: 제어 문자 토글"
- }
-\ No newline at end of file
-changed in both
-  base   100644 0cdc554c0defd0da5dbb4eb4a0e1718ece2c45d5 i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
-  our    100644 18184e2aa935d052052a868723fd5fc4e49ad457 i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
-  their  100644 2b875500e85a8c6c1cd2e9306fc317ab5fbaf5eb i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"toggleRenderWhitespace": "보기: 렌더링 공백 토글"
- }
-\ No newline at end of file
-changed in both
-  base   100644 33a1fa482a7a10c469872359aabac624242ce70e i18n/kor/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  our    100644 dd3c2e1891671a9ad308f3ef03becfcb764d3cd7 i18n/kor/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  their  100644 17a439db7451aed3cd75fffe4988416294bbe633 i18n/kor/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-changed in both
-  base   100644 6de8809b45e61af1d63e0b627e3919cb0487d957 i18n/kor/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  our    100644 a364973604ec4284961f14cfdd0ccf08d6d710b7 i18n/kor/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  their  100644 86af02695e33c4349f543d4fa547a9be7a8de097 i18n/kor/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-changed in both
-  base   100644 6be8b2345dfb03f9ec19f4f24e069d2cd92e1fe5 i18n/kor/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  our    100644 e49f8a732d537adaf418b41491fe7b363cf6da78 i18n/kor/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  their  100644 c5ed858c98bda37ed1533374ad38d72f7e984c2e i18n/kor/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-@@ -8,6 +8,23 @@
- 	],
- 	"debugAdapterBinNotFound": "디버그 어댑터 실행 파일 '{0}'이(가) 없습니다.",
- 	"debugAdapterCannotDetermineExecutable": "디버그 어댑터 '{0}'에 대한 실행 파일을 확인할 수 없습니다.",
-+<<<<<<< .our
- 	"unableToLaunchDebugAdapter": "'{0}'에서 디버그 어댑터를 시작할 수 없습니다.",
- 	"unableToLaunchDebugAdapterNoArgs": "디버그 어댑터를 시작할 수 없습니다."
-+=======
-+	"launch.config.comment1": "IntelliSense를 사용하여 가능한 특성에 대해 알아보세요.",
-+	"launch.config.comment2": "기존 특성에 대한 설명을 보려면 가리킵니다.",
-+	"launch.config.comment3": "자세한 내용을 보려면 {0}을(를) 방문하세요.",
-+	"debugType": "구성의 형식입니다.",
-+	"debugTypeNotRecognised": "디버그 형식이 인식되지 않습니다. 해당하는 디버그 확장을 설치하고 사용하도록 설정했는지 확인하세요.",
-+	"node2NotSupported": "\"node2\"는 더 이상 지원되지 않습니다. 대신 \"node\"를 사용하고 \"protocol\" 특성을 \"inspector\"로 설정하세요.",
-+	"debugName": "구성 이름이며, 구성 시작 드롭다운 메뉴에 표시됩니다.",
-+	"debugRequest": "구성 형식을 요청합니다. \"시작\" 또는 \"연결\"일 수 있습니다.",
-+	"debugServer": "디버그 확장 배포 전용입니다. 포트가 지정된 경우 VS Code에서는 서버 모드로 실행하는 디버그 어댑터에 연결을 시도합니다.",
-+	"debugPrelaunchTask": "디버그 세션이 시작되기 이전에 실행할 작업입니다.",
-+	"debugWindowsConfiguration": "Windows 특정 시작 구성 특성입니다.",
-+	"debugOSXConfiguration": "OS X 특정 시작 구성 특성입니다.",
-+	"debugLinuxConfiguration": "Linux 특정 시작 구성 특성입니다.",
-+	"deprecatedVariables": "'env.', 'config.' 및 'command.'는 사용되지 않습니다. 대신 'env:', 'config:' 및 'command:'를 사용하세요."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 3eb884953bf2e253a100dadbfbecbc88d57b23c3 i18n/kor/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  our    100644 d7e3fbf5baba4bf721149551ff3617009db1827d i18n/kor/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  their  100644 50730f440768cb821b1884c299c5df52891014fd i18n/kor/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-changed in both
-  base   100644 748fbd6e5f8c01227daf8ce913e8569c6cd7e51d i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 3b79008f444d2989f35d429d32801582bb6d419c i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 8c1877159e184ac94e3e2eb53ae1af68603da199 i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-@@ -52,7 +52,14 @@
- 	"extensionInstalled": "권장되는 확장이 이미 설치되어 있습니다.",
- 	"showRecommendedKeymapExtensionsShort": "키 맵",
- 	"showLanguageExtensionsShort": "언어 확장",
-+<<<<<<< .our
- 	"showAzureExtensionsShort": "Azure 확장",
-+=======
-+	"showAzureExtensions": "Azure 확장 표시",
-+	"showAzureExtensionsShort": "Azure 확장",
-+	"configureWorkspaceRecommendedExtensions": "권장 확장 구성(작업 영역)",
-+	"ConfigureWorkspaceRecommendations.noWorkspace": "권장 사항은 작업 영역 폴더에서만 사용할 수 있습니다.",
-+>>>>>>> .their
- 	"OpenExtensionsFile.failed": "'.vscode' 폴더({0}) 내에 'extensions.json' 파일을 만들 수 없습니다.",
- 	"configureWorkspaceRecommendedExtensions": "권장 확장 구성(작업 영역)",
- 	"configureWorkspaceFolderRecommendedExtensions": "권장 확장 구성(작업 영역 폴더)",
-changed in both
-  base   100644 272b83e055a11e417843f8e38c3a88706df397a8 i18n/kor/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  our    100644 b962da52ed963be01f95715acc2834881bf51629 i18n/kor/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  their  100644 8bcb4133777d23b94aa10a1ef9bc2f71817a1433 i18n/kor/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-changed in both
-  base   100644 2044ec34d69a4c44a1635f8fc298967fe65af72d i18n/kor/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 64e3a748c1d30ddcf3658546af6b8c004e841f1b i18n/kor/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 e75ec609b8916951437c79e18656ceef13ced6e9 i18n/kor/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-@@ -40,14 +40,21 @@
- 	"dynamicHeight": "열려 있는 편집기 섹션의 높이가 요소 수에 따라 동적으로 조정되는지 여부를 제어합니다.",
- 	"autoReveal": "탐색기에서 파일을 열 때 자동으로 표시하고 선택할지를 제어합니다.",
- 	"enableDragAndDrop": "탐색기에서 끌어서 놓기를 통한 파일 및 폴더 이동을 허용하는지를 제어합니다.",
-+<<<<<<< .our
- 	"confirmDragAndDrop": "끌어서 놓기를 사용하여 파일 및 폴더를 이동하기 위해 탐색기에서 확인을 요청해야 하는지 제어합니다.",
- 	"confirmDelete": "파일을 휴지통에서 삭제할 때 탐색기에서 확인을 요청해야 하는지 제어합니다.",
-+=======
-+>>>>>>> .their
- 	"sortOrder.default": "파일 및 폴더가 이름을 기준으로 사전순으로 정렬됩니다. 폴더가 파일 앞에 표시됩니다.",
- 	"sortOrder.mixed": "파일 및 폴더가 이름을 기준으로 사전순으로 정렬됩니다. 파일이 폴더와 결합됩니다.",
- 	"sortOrder.filesFirst": "파일 및 폴더가 이름을 기준으로 사전순으로 정렬됩니다. 파일이 폴더 앞에 표시됩니다.",
- 	"sortOrder.type": "파일 및 폴더가 확장명을 기준으로 사전순으로 정렬됩니다. 폴더가 파일 앞에 표시됩니다.",
- 	"sortOrder.modified": "파일 및 폴더가 마지막으로 수정한 날짜를 기준으로 내림차순 정렬됩니다. 폴더가 파일 앞에 표시됩니다.",
-+<<<<<<< .our
- 	"sortOrder": "탐색기에서 파일 및 폴더의 정렬 순서를 제어합니다. 기본 정렬 외에 순서를 'mixed'(파일 및 폴더가 결합되어 정렬), 'type'(파일 형식 기준), 'modified'(마지막으로 수정한 날짜 기준) 또는 'filesFirst'(파일을 폴더 앞에 정렬)로 설정할 수 있습니다.",
- 	"explorer.decorations.colors": "파일 장식에 색을 사용해야 하는지 제어합니다.",
- 	"explorer.decorations.badges": "파일 장식에 배지를 사용해야 하는지 제어합니다."
-+=======
-+	"sortOrder": "탐색기에서 파일 및 폴더의 정렬 순서를 제어합니다. 기본 정렬 외에 순서를 'mixed'(파일 및 폴더가 결합되어 정렬), 'type'(파일 형식 기준), 'modified'(마지막으로 수정한 날짜 기준) 또는 'filesFirst'(파일을 폴더 앞에 정렬)로 설정할 수 있습니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 cbfa5b0cef99ec8345da977d528810fa5d244a3b i18n/kor/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-  our    100644 6cf353ae7129b46c74d8a2ece73bc29603959134 i18n/kor/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-  their  100644 a59e72f5c391f9c5d555515eb949a58666d7d0f7 i18n/kor/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-@@ -12,5 +12,6 @@
- 	"genericSaveError": "'{0}'을(를) 저장하지 못했습니다. {1}",
- 	"staleSaveError": "'{0}'을(를) 저장하지 못했습니다. 디스크의 내용이 최신 버전입니다. 버전을 디스크에 있는 버전과 비교하려면 **비교**를 클릭하세요.",
- 	"compareChanges": "비교",
--	"saveConflictDiffLabel": "{0}(디스크에 있음) ↔ {1}({2}에 있음) - 저장 충돌 해결"
-+	"saveConflictDiffLabel": "{0}(디스크에 있음) ↔ {1}({2}에 있음) - 저장 충돌 해결",
-+	"userGuide": "오른쪽 편집기 도구 모음의 작업을 사용하여 변경 내용을 **실행 취소**하거나 디스크의 콘텐츠를 변경 내용으로 **덮어쓰기**"
- }
-\ No newline at end of file
-changed in both
-  base   100644 77df94558dfc024dcfe7f1c2114d1988606cbe15 i18n/kor/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
-  our    100644 249d7018e6a3bf3b4280f8bb9261beadaed4e870 i18n/kor/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
-  their  100644 8d29882bc60c69d68c3d1f104d18e799a8189898 i18n/kor/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
-@@ -10,9 +10,12 @@
- 	"dropFolder": "작업 영역에 폴더를 추가하시겠습니까?",
- 	"addFolders": "폴더 추가(&&A)",
- 	"addFolder": "폴더 추가(&&A)",
-+<<<<<<< .our
- 	"confirmMove": "'{0}'을(를) 이동하시겠습니까?",
- 	"doNotAskAgain": "이 메시지를 다시 표시 안 함",
- 	"moveButtonLabel": "이동(&&M)",
-+=======
-+>>>>>>> .their
- 	"confirmOverwriteMessage": "'{0}'이(가) 대상 폴더에 이미 있습니다. 바꿀까요?",
- 	"irreversible": "이 작업은 취소할 수 없습니다.",
- 	"replaceButtonLabel": "바꾸기(&&R)"
-changed in both
-  base   100644 474bdeb6edf46a1c2b8f9fbf73073c06b239f528 i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  our    100644 ad061c299ee4ef976122d2a8f6e9baa370867e9b i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  their  100644 392c06bedeb45e9356901bf138ff3b8cc44184a7 i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-@@ -14,6 +14,10 @@
- 	"openGlobalKeybindingsFile": "바로 가기 키 파일 열기",
- 	"openWorkspaceSettings": "작업 영역 설정 열기",
- 	"openFolderSettings": "폴더 설정 열기",
-+<<<<<<< .our
-+=======
-+	"pickFolder": "폴더 선택",
-+>>>>>>> .their
- 	"configureLanguageBasedSettings": "언어별 설정 구성...",
- 	"languageDescriptionConfigured": "({0})",
- 	"pickLanguage": "언어 선택"
-changed in both
-  base   100644 714541e3b4c81c2a75e962e1feaad6013af5b976 i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 952972db109181a066081ea0ee054ff4a0c809ad i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 393b61b671f8a42e7064445336f07f06f5f762e7 i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -14,4 +15,19 @@
- 	"editTtile": "편집",
- 	"replaceDefaultValue": "설정에서 바꾸기",
- 	"copyDefaultValue": "설정에 복사"
-+=======
-+	"emptyUserSettingsHeader": "설정을 여기에 넣어서 기본 설정을 덮어씁니다.",
-+	"errorInvalidConfiguration": "설정에 쓸 수 없습니다. 파일에서 오류/경고를 해결하고 다시 시도하세요.",
-+	"emptyWorkspaceSettingsHeader": "설정을 여기에 넣어서 사용자 설정을 덮어씁니다.",
-+	"emptyFolderSettingsHeader": "폴더 설정을 여기에 넣어서 작업 영역 설정을 덮어씁니다.",
-+	"defaultFolderSettingsTitle": "기본 폴더 설정",
-+	"defaultSettingsTitle": "기본 설정",
-+	"noSettingsFound": "설정을 찾을 수 없습니다.",
-+	"editTtile": "편집",
-+	"replaceDefaultValue": "설정에서 바꾸기",
-+	"copyDefaultValue": "설정에 복사",
-+	"unsupportedPHPExecutablePathSetting": "이 설정은 사용자 설정이어야 합니다. 작업 영역에 대해 PHP를 구성하려면 PHP 파일을 열고 상태 표시줄에서 'PHP 경로'를 클릭합니다.",
-+	"unsupportedWorkspaceSetting": "이 설정은 사용자 설정이어야 합니다.",
-+	"unsupportedWorkbenchSetting": "이 설정은 지금 적용할 수 없으며 이 폴더를 직접 열 경우에 적용됩니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f43ae31fedacdb1cdde2741f9342b50c5ab23e63 i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-  our    100644 503603410ea6bf6bdfe2187f4cb333a3f5a17aea i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-  their  100644 7c672264d394c998056ddc88e441cc7f6a8e7eae i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 a8bd67a28f391e840f7a35323a824c51031c0c11 i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 16b932871b29f61a36b73fbdf7e039c49a475ec1 i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -12,4 +13,13 @@
- 	"userSettings": "사용자 설정",
- 	"workspaceSettings": "작업 영역 설정",
- 	"folderSettings": "폴더 설정"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"folderSettingsDetails": "폴더 설정"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 4fe2fc0bfe27efd9c8cf6f65e729bd0f7acd8b85 i18n/kor/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  our    100644 112bca1e01f4036334cbaa730dc5d8a1af52991c i18n/kor/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  their  100644 f2e2d333694d65f7245ef777747cfbfae44c53be i18n/kor/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-@@ -8,5 +8,11 @@
- 	],
- 	"relaunchSettingMessage": "설정이 변경되어 다시 시작해야만 적용됩니다.",
- 	"relaunchSettingDetail": "[다시 시작] 단추를 눌러 {0}을(를) 다시 시작하고 설정을 사용하도록 설정하세요.",
-+<<<<<<< .our
- 	"restart": "다시 시작(&&R)"
-+=======
-+	"restart": "다시 시작",
-+	"relaunchWorkspaceMessage": "이 작업 영역을 변경하려면 확장 시스템을 다시 로드해야 합니다.",
-+	"reload": "다시 로드"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 984555805217c571faeb954229b51502871acf99 i18n/kor/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-  our    100644 52b3cb24c35ab91ce4ff10ea66e61a3c2acf2767 i18n/kor/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-  their  100644 06048cc7a3cdeac94390d7c24009f6f1d067742c i18n/kor/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-changed in both
-  base   100644 791c967182aa4669eb4ea2d2e90d8015e9be4fb2 i18n/kor/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  our    100644 073f844e7848ee2b0e2748bc20d2dbf992c527a9 i18n/kor/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  their  100644 4b848835e917596b00ac1d10a906244611a01da8 i18n/kor/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-changed in both
-  base   100644 8e1ae7347935382fcf191601c94f06edc2876592 i18n/kor/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  our    100644 a3f29b119baf78974d1c8a562e98893325a62a67 i18n/kor/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  their  100644 ddc3c58328da7ceab2892908d873f07ff2bf0ff5 i18n/kor/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -10,6 +11,11 @@
- 	"hideRepository": "숨기기",
- 	"installAdditionalSCMProviders": "추가 SCM 공급자 설치...",
- 	"no open repo": "활성 소스 제어 공급자가 없습니다.",
-+=======
-+	"commitMessage": "Message (press {0} to commit)",
-+	"installAdditionalSCMProviders": "추가 SCM 공급자 설치...",
-+	"no open repo": "활성 상태인 소스 제어가 없습니다.",
-+>>>>>>> .their
- 	"source control": "소스 제어",
- 	"viewletTitle": "{0}: {1}",
- 	"hideView": "숨기기"
-changed in both
-  base   100644 7d8570952628fe3c9bd773e5def704d7952be918 i18n/kor/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 071d294ccc8fe4437d151c87e9b3a4d19cd1a8d5 i18n/kor/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 d8c432f8bb004a012f1c3808074610d7cd6dc03b i18n/kor/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"nextSearchIncludePattern": "다음 검색 포함 패턴 표시",
- 	"previousSearchIncludePattern": "이전 검색 포함 패턴 표시",
- 	"nextSearchExcludePattern": "다음 검색 제외 패턴 표시",
-@@ -16,6 +19,8 @@
- 	"previousReplaceTerm": "이전 검색 대체어 표시",
- 	"findInFiles": "파일에서 찾기",
- 	"replaceInFiles": "파일에서 바꾸기",
-+	"findInWorkspace": "작업 영역에서 찾기...",
-+	"findInFolder": "폴더에서 찾기...",
- 	"RefreshAction.label": "새로 고침",
- 	"CollapseDeepestExpandedLevelAction.label": "모두 축소",
- 	"ClearSearchResultsAction.label": "지우기",
-changed in both
-  base   100644 4d21f25e146300f8b406b2915191ba0751c1a47f i18n/kor/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-  our    100644 51d183c82ffdf6c0811c8874f35fecd592ff5557 i18n/kor/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-  their  100644 2c8228cd8e4738400c20b314f1b789c06badb95b i18n/kor/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"searchFolderMatch.other.label": "다른 파일",
- 	"searchFileMatches": "{0}개 파일 찾음",
- 	"searchFileMatch": "{0}개 파일 찾음",
-changed in both
-  base   100644 c58a113000197959668c60b982d2413c3a00c534 i18n/kor/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  our    100644 c98e307c23bf5e868367c1bc97cd270b8e1c1303 i18n/kor/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  their  100644 483e9ae5d54191f6ccfac472a9a76ffe6e224f62 i18n/kor/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-added in both
-  our    100644 7429c4c4e1dff1837ee953fdc4f8bf708a346c50 i18n/kor/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
-  their  100644 b8d438493caae3a89f4cb3556bdd9fd4cd0a2709 i18n/kor/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"search.noWorkspaceWithName": "작업 영역에 이름이 {0}인 폴더가 없습니다."
- }
-\ No newline at end of file
-changed in both
-  base   100644 e3482cdc4e3fb031e43e6acafe64f70326b658a9 i18n/kor/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 5dfbb2074f09c64c5ec03adc7d012b25c2bb9e72 i18n/kor/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 f84f5f7deb060d5a81cbf93bceecc2693a757fe6 i18n/kor/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-changed in both
-  base   100644 66187c94e82e2daf9911df95c32fedd949983ef7 i18n/kor/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 7b483f685d0f32a5b2eb20f1327a18475e2d29ae i18n/kor/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 9b7e29a9d9595ddabd5e588ad96566e6e67127a8 i18n/kor/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -12,6 +12,7 @@
- 	"totalWarnings": "경고 {0}개",
- 	"totalInfos": "정보 {0}개",
- 	"problems": "문제",
-+<<<<<<< .our
- 	"building": "빌드하고 있습니다...",
- 	"manyProblems": "10K+",
- 	"runningTasks": "실행 중인 작업 표시",
-@@ -19,22 +20,36 @@
- 	"TaskSystem.noHotSwap": "실행 중인 활성 작업이 있는 작업 실행 엔진을 변경하면 Window를 다시 로드해야 합니다.",
- 	"reloadWindow": "창 다시 로드",
- 	"TaskServer.folderIgnored": "작업 버전 0.1.0을 사용하므로 {0} 폴더가 무시됩니다.",
-+=======
-+	"manyMarkers": "99+",
-+	"runningTasks": "실행 중인 작업 표시",
-+	"tasks": "작업",
-+	"TaskSystem.noHotSwap": "작업 실행 엔진을 변경하면 창을 다시 로드해야 합니다.",
-+>>>>>>> .their
- 	"TaskService.noBuildTask1": "정의된 빌드 작업이 없습니다. tasks.json 파일에서 작업을 'isBuildCommand'로 표시하세요.",
- 	"TaskService.noBuildTask2": "정의된 빌드 작업이 없습니다. tasks.json 파일에서 작업을 'build'로 표시하세요.",
- 	"TaskService.noTestTask1": "정의된 테스트 작업이 없습니다. tasks.json 파일에서 작업을 'isTestCommand'로 표시하세요.",
- 	"TaskService.noTestTask2": "정의된 테스트 작업이 없습니다. tasks.json 파일에서 작업을 'test'로 표시하세요.",
- 	"TaskServer.noTask": "실행하도록 요청한 작업 {0}을(를) 찾을 수 없습니다.",
-+<<<<<<< .our
- 	"TaskService.associate": "연결",
-+=======
-+>>>>>>> .their
- 	"TaskService.attachProblemMatcher.continueWithout": "작업 출력을 스캔하지 않고 계속",
- 	"TaskService.attachProblemMatcher.never": "작업 출력 스캔 안 함",
- 	"TaskService.attachProblemMatcher.learnMoreAbout": "작업 출력 스캔에 대해 자세히 알아보기",
- 	"selectProblemMatcher": "작업 출력에서 스캔할 오류 및 경고 유형을 선택",
- 	"customizeParseErrors": "현재 작성 구성에 오류가 있습니다. 작업을 사용자 지정하기 전에 오류를 수정하세요.\n",
- 	"moreThanOneBuildTask": "tasks.json에 여러 빌드 작업이 정의되어 있습니다. 첫 번째 작업을 실행합니다.\n",
-+<<<<<<< .our
- 	"TaskSystem.activeSame.background": "'{0}' 작업이 이미 활성 상태이며 백그라운드 모드입니다.",
- 	"TaskSystem.activeSame.noBackground": "'{0}' 작업은 이미 활성 상태입니다.",
- 	"terminateTask": "작업 종료",
- 	"restartTask": "작업 다시 시작",
-+=======
-+	"TaskSystem.activeSame.background": "'{0}' 작업이 이미 활성 상태로 백그라운드 모드에 있습니다. 종료하려면 작업 메뉴에서 '작업 종료'를 사용하세요.",
-+	"TaskSystem.activeSame.noBackground": "'{0}' 작업이 이미 활성 상태입니다. 작업을 종료하려면 작업 메뉴에서 '작업 종료'를 사용하세요.",
-+>>>>>>> .their
- 	"TaskSystem.active": "이미 실행 중인 작업이 있습니다. 다른 작업을 실행하려면 먼저 이 작업을 종료하세요.",
- 	"TaskSystem.restartFailed": "{0} 작업을 종료하고 다시 시작하지 못했습니다.",
- 	"TaskService.noConfiguration": "오류: {0} 작업 검색에서는 다음 구성에 대한 작업을 제공하지 않습니다:\n{1}\n이 작업이 무시됩니다.\n",
-@@ -75,8 +90,13 @@
- 	"TaskService.pickDefaultBuildTask": "기본 빌드 작업으로 사용할 작업을 선택",
- 	"TaskService.defaultTestTaskExists": "{0}은(는) 이미 기본 테스트 작업으로 표시되어 있습니다.",
- 	"TaskService.pickDefaultTestTask": "기본 테스트 작업으로 사용할 작업 선택",
-+<<<<<<< .our
- 	"TaskService.pickShowTask": "출력을 표시할 작업 선택",
- 	"TaskService.noTaskIsRunning": "실행 중인 작업이 없습니다.",
-+=======
-+	"TaskService.noTaskIsRunning": "실행 중인 작업이 없습니다.",
-+	"TaskService.pickShowTask": "출력을 표시할 작업 선택",
-+>>>>>>> .their
- 	"ShowLogAction.label": "작업 로그 표시",
- 	"RunTaskAction.label": "작업 실행",
- 	"RestartTaskAction.label": "실행 중인 작업 다시 시작",
-changed in both
-  base   100644 840298c5adbc79c51df4aa33f24f8ba0e34af680 i18n/kor/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  our    100644 13963265fec1836212d41ecacb07eed5e173dace i18n/kor/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  their  100644 e33377e30643badc571692ee5e88d20c6a0f3661 i18n/kor/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-@@ -15,7 +15,10 @@
- 	"ConfigurationParser.invalidVaraibleReference": "오류: 잘못된 problemMatcher 참조:  {0}\n",
- 	"ConfigurationParser.noTaskType": "오류: 작업 구성은 유형 속성이 필요합니다. 이 구성은 무시됩니다.\n{0}\n",
- 	"ConfigurationParser.noTypeDefinition": "오류: 등록된 작업 형식 '{0}'이(가) 없습니다. 해당하는 작업 공급자를 제공하는 확장을 설치하지 않으셨습니까?",
-+<<<<<<< .our
- 	"ConfigurationParser.missingRequiredProperty": "오류: 작업 구성 '{0}'에 필요한 속성 '{1}'이(가) 없습니다. 작업 구성이 무시됩니다.",
-+=======
-+>>>>>>> .their
- 	"ConfigurationParser.notCustom": "오류: 작업이 사용자 지정 작업으로 선언되지 않았습니다. 이 구성은 무시됩니다.\n{0}\n",
- 	"ConfigurationParser.noTaskName": "오류: 작업에서 레이블 속성을 제공해야 합니다. 이 작업은 무시됩니다.\n{0}\n",
- 	"taskConfiguration.noCommandOrDependsOn": "오류: 작업 '{0}'에서 명령이나 dependsOn 속성을 지정하지 않습니다. 이 작업은 무시됩니다. 해당 작업의 정의는 {1}입니다.",
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  our    100644 ba7f34ebda0d6a112370fe91393ef138e8200a78 i18n/kor/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  their  100644 0c1970cb3cfe1f1bbced608f35216e12193543c8 i18n/kor/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,6 +10,17 @@
- 	"termEntryAriaLabel": "{0}, 터미널 선택기",
- 	"termCreateEntryAriaLabel": "{0}, 새 터미널 만들기",
- 	"workbench.action.terminal.newplus": "$(plus) 새 통합 터미널 만들기",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"termEntryAriaLabel": "{0}, 터미널 선택기",
-+	"termCreateEntryAriaLabel": "{0}, 새 터미널 만들기",
-+	"'workbench.action.terminal.newplus": "$(plus) 새 통합 터미널 만들기",
-+>>>>>>> .their
- 	"noTerminalsMatching": "일치하는 터미널 없음",
- 	"noTerminalsFound": "열린 터미널 없음"
- }
-\ No newline at end of file
-changed in both
-  base   100644 cd78dbfc40f81a698651c0c6471adbe21b2ce9f9 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 bc58bba26a36ca2c7cacec97bfa2f02daab82775 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 65227b7a9de823bfbbf960d5d116f74cbd5e1536 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,9 @@
- 	],
- 	"quickOpen.terminal": "모든 열려 있는 터미널 표시",
- 	"terminal": "터미널",
-+=======
-+	"quickOpen.terminal": "모든 열려 있는 터미널 표시",
-+>>>>>>> .their
- 	"terminalIntegratedConfigurationTitle": "통합 터미널",
- 	"terminal.integrated.shell.linux": "터미널이 Linux에서 사용하는 셸의 경로입니다.",
- 	"terminal.integrated.shellArgs.linux": "Linux 터미널에 있을 때 사용할 명령줄 인수입니다.",
-@@ -36,8 +40,12 @@
- 	"terminal.integrated.env.osx": "OS X의 터미널이 사용하는 VS Code 프로세스에 추가될 환경 변수를 포함한 개체",
- 	"terminal.integrated.env.linux": "Linux의 터미널에서 사용할 VS Code 프로세스에 추가되는 환경 변수를 포함한 개체",
- 	"terminal.integrated.env.windows": "Windows의 터미널에서 사용할 VS Code 프로세스에 추가되는 환경 변수를 포함한 개체",
-+<<<<<<< .our
- 	"terminal.integrated.showExitAlert": "종료 코드가 0이 아닌 경우 `터미널 프로세스가 종료 코드로 종료되었습니다` 경고를 표시합니다.",
- 	"terminal.integrated.experimentalRestore": "VS Code를 시작할 때 작업 영역에 대한 터미널 세션을 자동으로 복원할지 여부를 지정합니다. 이 설정은 실험적 설정이므로 버그가 있을 수 있고 향후 변경될 수 있습니다.",
-+=======
-+	"terminal": "터미널",
-+>>>>>>> .their
- 	"terminalCategory": "터미널",
- 	"viewCategory": "보기"
- }
-\ No newline at end of file
-changed in both
-  base   100644 601a8942d55fde212e2183a803d84a901360295c i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 0c53998d6e084853fcbcba0b56050a6d820a2b6f i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 56cc67cff46c6b2625c4f89a9b2e7c9bb9ccb502 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -14,8 +14,11 @@
- 	"workbench.action.terminal.selectAll": "모두 선택",
- 	"workbench.action.terminal.deleteWordLeft": "왼쪽 단어 삭제",
- 	"workbench.action.terminal.deleteWordRight": "오른쪽 단어 삭제",
-+<<<<<<< .our
- 	"workbench.action.terminal.moveToLineStart": "줄 시작으로 이동",
- 	"workbench.action.terminal.moveToLineEnd": "줄 끝으로 이동",
-+=======
-+>>>>>>> .their
- 	"workbench.action.terminal.new": "새 통합 터미널 만들기",
- 	"workbench.action.terminal.new.short": "새 터미널",
- 	"workbench.action.terminal.newWorkspacePlaceholder": "새 터미널의 현재 작업 디렉토리를 선택합니다.",
-@@ -53,6 +56,7 @@
- 	"workbench.action.terminal.hideFindWidget": "파인드 위젯 숨기기",
- 	"nextTerminalFindTerm": "다음 검색어 표시",
- 	"previousTerminalFindTerm": "이전 검색어 표시",
-+<<<<<<< .our
- 	"quickOpenTerm": "활성 터미널 전환",
- 	"workbench.action.terminal.scrollToPreviousCommand": "이전 명령으로 스크롤",
- 	"workbench.action.terminal.scrollToNextCommand": "다음 명령으로 스크롤",
-@@ -60,4 +64,7 @@
- 	"workbench.action.terminal.selectToNextCommand": "다음 명령까지 선택",
- 	"workbench.action.terminal.selectToPreviousLine": "이전 줄까지 선택",
- 	"workbench.action.terminal.selectToNextLine": "다음 줄까지 선택"
-+=======
-+	"quickOpenTerm": "터미널: 활성 터미널에 전환"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 5923a5bf7d5ca280848e6757c78142d7c96e7133 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 d9e00ba07827f3430d124e149c098a234044e854 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 23c1d36b14271b708b4fbe9288aa7ed1ea3d88e8 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -10,7 +10,11 @@
- 	"terminal.foreground": "터미널의 전경색입니다.",
- 	"terminalCursor.foreground": "터미널 커서의 전경색입니다.",
- 	"terminalCursor.background": "터미널 커서의 배경색입니다. 블록 커서와 겹친 문자의 색상을 사용자 정의할 수 있습니다.",
-+<<<<<<< .our
- 	"terminal.selectionBackground": "터미널의 선택 영역 배경색입니다.",
- 	"terminal.border": "터미널 내의 분할 창을 구분하는 테두리의 색입니다. 기본값은 panel.border입니다.",
- 	"terminal.ansiColor": "터미널의 '{0}' ANSI 색상"
-+=======
-+	"terminal.ansiColor": "터미널의 '{0}' ANSI 색입니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 13239987ba2032559fd83262eb133815dd0371db i18n/kor/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 46a0013cd0e5a09c5cae294dfef72bf6b6e0aeef i18n/kor/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 bb502a90cb606760056865a84c2a991300ed2f22 i18n/kor/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -11,10 +11,16 @@
- 	"read the release notes": "{0} v{1}을(를) 시작합니다. 릴리스 정보를 확인하시겠습니까?",
- 	"licenseChanged": "사용 조건이 변경되었습니다. [여기]({0})를 클릭하여 자세히 읽어보세요.",
- 	"neveragain": "다시 표시 안 함",
-+<<<<<<< .our
- 	"64bitisavailable": "64비트 Windows용 {0}을(를) 사용할 수 있습니다. 자세히 알아보려면 [여기]({1})를 클릭하세요.",
- 	"updateIsReady": "새 {0} 업데이트를 사용할 수 있습니다.",
- 	"noUpdatesAvailable": "현재 사용할 수 있는 업데이트가 없습니다.",
- 	"ok": "확인",
-+=======
-+	"64bitisavailable": "64비트 Windows용 {0}을(를) 지금 사용할 수 있습니다.",
-+	"learn more": "자세한 정보",
-+	"updateIsReady": "새 {0} 업데이트를 사용할 수 있습니다.",
-+>>>>>>> .their
- 	"thereIsUpdateAvailable": "사용 가능한 업데이트가 있습니다.",
- 	"download now": "지금 다운로드",
- 	"later": "나중에",
-changed in both
-  base   100644 a7a11fff0315780963827979b6a5e8203d76746b i18n/kor/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  our    100644 41ca426ace31e84127ef6bca48017cabc9916033 i18n/kor/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  their  100644 e18166f17b46bfc90c0639d16d355c885c153176 i18n/kor/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-@@ -37,6 +37,8 @@
- 	"welcomePage.showCommandsDescription": "명령 팔레트({0})에서 빠른 액세스 및 명령 검색",
- 	"welcomePage.interfaceOverview": "인터페이스 개요",
- 	"welcomePage.interfaceOverviewDescription": "UI의 주요 구성 요소를 강조 표시하는 시각적 오버레이 가져오기",
-+	"welcomePage.deployToAzure": "클라우드에 응용 프로그램 배포",
-+	"welcomePage.deployToAzureDescription": "Azure App Service에 Node 앱을 배포하는 방법 알아보기",
- 	"welcomePage.interactivePlayground": "대화형 실습",
- 	"welcomePage.interactivePlaygroundDescription": "짧은 연습에서 기본 편집기 기능 사용해 보기"
- }
-\ No newline at end of file
-changed in both
-  base   100644 20c6758ebabb324f0d24194f3ad95b5bcc8f9d89 i18n/kor/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-  our    100644 aa4def687d8bf40f210c2e8d34023643fb5542c6 i18n/kor/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-  their  100644 375f27f648352b99a3c3209e827586ffbba10dec i18n/kor/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-changed in both
-  base   100644 00f168682409950989c8177832fd5cccb2197b08 i18n/kor/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-  our    100644 1591b991e17d0824d0970a0892f8ff07452a2cd5 i18n/kor/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-  their  100644 65a67f13f6ca1fb983c5e8ed946d5e80e1e23f6b i18n/kor/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-changed in both
-  base   100644 a60d1663e0016a7d4f5dfcfd56cc0dc6ad6f98bb i18n/kor/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
-  our    100644 a01a437bc1038b746d8103e7820083d8c87e0993 i18n/kor/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
-  their  100644 5965ac616427ace39dc5327ddb41e305a14f9a67 i18n/kor/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"editorWalkThrough.title": "대화형 실습",
- 	"editorWalkThrough": "대화형 실습"
- }
-\ No newline at end of file
-changed in both
-  base   100644 bea643cae15bf0ccb46fad7d323b1d02a70707b7 i18n/kor/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  our    100644 96b95e7ea94ff23a6df5c6c5dd518571602dc1c9 i18n/kor/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  their  100644 ecd7ef483a37489247748004e1a2131a3a6f7792 i18n/kor/src/vs/workbench/services/configuration/node/configuration.i18n.json
-@@ -9,6 +9,7 @@
- 	"scope.window.description": "[사용자] 설정 또는 [작업 영역] 설정에서 구성할 수 있는 창 특정 구성입니다.",
- 	"scope.resource.description": "사용자, 작업 영역 또는 폴더 설정에서 구성할 수 있는 리소스 특정 구성",
- 	"scope.description": "구성이 적용되는 범위입니다. 사용 가능 범위는 '창'과 '리소스'입니다.",
-+<<<<<<< .our
- 	"vscode.extension.contributes.configuration": "구성 설정을 적용합니다.",
- 	"invalid.title": "'configuration.title'은 문자열이어야 합니다.",
- 	"vscode.extension.contributes.defaultConfiguration": "언어별로 기본 편집기 구성 설정을 적용합니다.",
-@@ -21,4 +22,13 @@
- 	"workspaceConfig.settings.description": "작업 영역 설정",
- 	"workspaceConfig.extensions.description": "작업 영역 확장",
- 	"unknownWorkspaceProperty": "알 수 없는 작업 영역 구성 속성"
-+=======
-+	"invalid.type": "설정된 경우 'configuration.type'을 '개체'로 설정해야 합니다.",
-+	"invalid.title": "'configuration.title'은 문자열이어야 합니다.",
-+	"vscode.extension.contributes.defaultConfiguration": "언어별로 기본 편집기 구성 설정을 적용합니다.",
-+	"invalid.properties": "'configuration.properties'는 개체여야 합니다.",
-+	"workspaceConfig.folders.description": "작업 영역에 로드할 폴더 목록입니다. 파일 경로를 사용해야 합니다. 예: `/root/folderA` 또는 `./folderA`(작업 영역 파일의 위치를 기준으로 확인할 상대 경로인 경우)",
-+	"workspaceConfig.folder.description": "파일 경로입니다. 예: `/root/folderA` 또는 `./folderA`(작업 영역 파일의 위치를 기준으로 확인할 상대 경로인 경우)",
-+	"workspaceConfig.settings.description": "작업 영역 설정"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 77aa3c54a2973cf078758f4a60476a7dbce13855 i18n/kor/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 e81a8a242fb847453d5e2339de27eb2791e53868 i18n/kor/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 0b398bf4e1f24311af817ff4c298b50aed23341c i18n/kor/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -9,6 +9,7 @@
- 	"openTasksConfiguration": "작업 구성 열기",
- 	"openLaunchConfiguration": "시작 구성 열기",
- 	"open": "설정 열기",
-+<<<<<<< .our
- 	"saveAndRetry": "저장 및 다시 시도",
- 	"errorUnknownKey": "{1}은(는) 등록된 구성이 아니므로 {0}에 쓸 수 없습니다.",
- 	"errorInvalidWorkspaceConfigurationApplication": "{0}을(를) [작업 영역] 설정에 쓸 수 없습니다. 이 설정은 [사용자] 설정에만 쓸 수 있습니다.",
-@@ -27,6 +28,19 @@
- 	"errorConfigurationFileDirty": "사용자 설정 파일이 변경되어 사용자 설정에 쓸 수 없습니다. 먼저 사용자 설정 파일을 저장하고 다시 시도하세요.",
- 	"errorConfigurationFileDirtyWorkspace": "작업 영역 설정 파일이 변경되어 작업 영역 설정에 쓸 수 없습니다. 먼저 작업 영역 설정 파일을 저장하고 다시 시도하세요.",
- 	"errorConfigurationFileDirtyFolder": "폴더 설정 파일이 변경되어 폴더 설정에 쓸 수 없습니다. 먼저 '{0}' 폴더 설정 파일을 저장하고 다시 시도하세요.",
-+=======
-+	"close": "닫기",
-+	"saveAndRetry": "설정 저장 및 다시 시도",
-+	"errorUnknownKey": "{1}은(는) 등록된 구성이 아니므로 {0}에 쓸 수 없습니다.",
-+	"errorInvalidFolderConfiguration": "{0}이(가) 폴더 리소스 범위를 지원하지 않으므로 폴더 설정에 쓸 수 없습니다.",
-+	"errorInvalidUserTarget": "{0}이(가) 글로벌 범위를 지원하지 않으므로 사용자 설정에 쓸 수 없습니다.",
-+	"errorInvalidFolderTarget": "리소스가 제공되지 않으므로 폴더 설정에 쓸 수 없습니다.",
-+	"errorNoWorkspaceOpened": "작업 영역이 열려 있지 않으므로 {0}에 쓸 수 없습니다. 먼저 작업 영역을 열고 다시 시도하세요.",
-+	"errorInvalidConfiguration": "설정에 쓸 수 없습니다. **사용자 설정**을 열어 파일에서 오류/경고를 해결하고 다시 시도하세요.",
-+	"errorInvalidConfigurationWorkspace": "설정에 쓸 수 없습니다. **작업 영역 설정**을 열어 파일에서 오류/경고를 해결하고 다시 시도하세요.",
-+	"errorConfigurationFileDirty": "파일이 변경되어 설정에 쓸 수 없습니다. **사용자 설정** 파일을 저장하고 다시 시도하세요.",
-+	"errorConfigurationFileDirtyWorkspace": "파일이 변경되어 설정에 쓸 수 없습니다. **작업 영역 설정** 파일을 저장하고 다시 시도하세요.",
-+>>>>>>> .their
- 	"userTarget": "사용자 설정",
- 	"workspaceTarget": "작업 영역 설정",
- 	"folderTarget": "폴더 설정"
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-  our    100644 58f3403ef49b8254c1c26be159dc56a98ee11db1 i18n/kor/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-  their  100644 72bc3a9126b24a8c7aeceef0fd6541f7604a65d0 i18n/kor/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"errorInvalidFile": "파일에 쓸 수 없습니다. 파일을 열어 오류/경고를 수정한 후 다시 시도하세요.",
- 	"errorFileDirty": "파일이 오염되어 파일에 쓸 수 없습니다. 파일을 저장하고 다시 시도하세요."
- }
-\ No newline at end of file
-added in both
-  our    100644 59dd41575e5ba4346218da299254d3c19afeb5ed i18n/kor/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
-  their  100644 49510b9736a98fc9fe0632954ebfc25d0afa4785 i18n/kor/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,5 +10,15 @@
- 	"extensionHostProcess.startupFailDebug": "확장 호스트가 10초 내에 시작되지 않았습니다. 첫 번째 줄에서 중지되었을 수 있습니다. 계속하려면 디버거가 필요합니다.",
- 	"extensionHostProcess.startupFail": "확장 호스트가 10초 이내에 시작되지 않았습니다. 문제가 발생했을 수 있습니다.",
- 	"reloadWindow": "창 다시 로드",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"extensionHostProcess.startupFailDebug": "확장 호스트가 10초 내에 시작되지 않았습니다. 첫 번째 줄에서 중지되었을 수 있습니다. 계속하려면 디버거가 필요합니다.",
-+	"extensionHostProcess.startupFail": "확장 호스트가 10초 이내에 시작되지 않았습니다. 문제가 발생했을 수 있습니다.",
-+>>>>>>> .their
- 	"extensionHostProcess.error": "확장 호스트에서 오류 발생: {0}"
- }
-\ No newline at end of file
-added in both
-  our    100644 d8ba92cfb2a41966c5585d8fbdefb22fe0aab691 i18n/kor/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
-  their  100644 2105771ead960bbfe69c20cf6c2657d1276a125d i18n/kor/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,5 +10,16 @@
- 	"jsonParseFail": "{0}을(를) 구문 분석하지 못함: {1}.",
- 	"fileReadFail": "파일 {0}을(를) 읽을 수 없음: {1}.",
- 	"jsonsParseReportErrors": "{0}을(를) 구문 분석하지 못함: {1}.",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"jsonParseFail": "{0}을(를) 구문 분석하지 못함: {1}.",
-+	"fileReadFail": "파일 {0}을(를) 읽을 수 없음: {1}.",
-+	"jsonsParseFail": "{0} 또는 {1}을(를) 구문 분석하지 못했습니다. {2}",
-+>>>>>>> .their
- 	"missingNLSKey": "키 {0}에 대한 메시지를 찾을 수 없습니다."
- }
-\ No newline at end of file
-added in both
-  our    100644 69402728066363caec2fc8a19b417aff1116be30 i18n/kor/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-  their  100644 6f9c095c667c8818808de57bf842f1918a292e00 i18n/kor/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -15,4 +16,18 @@
- 	"extensionUnderDevelopment": "{0}에서 개발 확장 로드 중",
- 	"extensionCache.invalid": "확장이 디스크에서 수정되었습니다. 창을 다시 로드하세요.",
- 	"reloadWindow": "창 다시 로드"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"devTools": "개발자 도구",
-+	"restart": "확장 호스트 다시 시작",
-+	"extensionHostProcess.crash": "확장 호스트가 예기치 않게 종료되었습니다.",
-+	"extensionHostProcess.unresponsiveCrash": "확장 호스트가 응답하지 않아서 종료되었습니다.",
-+	"overwritingExtension": "확장 {0}을(를) {1}(으)로 덮어쓰는 중입니다.",
-+	"extensionUnderDevelopment": "{0}에서 개발 확장 로드 중"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6db7d6aae514a031afce5ac346abfd84bb8ee1cc i18n/kor/src/vs/workbench/services/progress/browser/progressService2.i18n.json
-  our    100644 d4f0c4c0f4d8b58a5dcecdf16704fa3d256ee0f2 i18n/kor/src/vs/workbench/services/progress/browser/progressService2.i18n.json
-  their  100644 dbcd7381ae2fcf0e7a8fc81ec166ed7112edca11 i18n/kor/src/vs/workbench/services/progress/browser/progressService2.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -9,4 +10,8 @@
- 	"progress.subtitle": "{0} - {1}",
- 	"progress.title": "{0}: {1}",
- 	"cancel": "취소"
-+=======
-+	"progress.subtitle": "{0} - {1}",
-+	"progress.title": "{0}: {1}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 9f7e84ad9b4e716d59f74e8b7c5e9787bce4aee0 i18n/kor/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-  our    100644 46df36fa33f9b35bce4f0b92ef13e545c22da310 i18n/kor/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-  their  100644 5195b5ea1f4e10c3d3831ed2739947850193ea08 i18n/kor/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,12 @@
- 	"schema.token.fontStyle": "규칙의 글꼴 스타일로 '기울임꼴, '굵게' 및 '밑줄' 중 하나이거나 이들의 조합입니다. 빈 문자열을 지정하면 상속된 설정이 해제됩니다.",
- 	"schema.fontStyle.error": "글꼴 스타일은 '기울임꼴, '굵게' , '밑줄' 또는 이들의 조합이나 빈 문자열이어야 합니다.",
- 	"schema.token.fontStyle.none": "없음(상속된 스타일 지우기)",
-+=======
-+	"schema.token.settings": "토큰의 색 및 스타일입니다.",
-+	"schema.token.foreground": "토큰의 전경색입니다.",
-+	"schema.token.fontStyle": "규칙의 글꼴 스타일: '기울임꼴, '굵게' 및 '밑줄' 중 하나 또는 이들의 조합",
-+	"schema.fontStyle.error": "글꼴 스타일은 '기울임꼴, '굵게' 및 '밑줄'의 조합이어야 합니다.",
-+>>>>>>> .their
- 	"schema.properties.name": "규칙에 대한 설명입니다.",
- 	"schema.properties.scope": "이 규칙과 일치하는 범위 선택기입니다.",
- 	"schema.tokenColors.path": "tmTheme 파일의 경로(현재 파일의 상대 경로)입니다.",
-changed in both
-  base   100644 1acfa7a4ff49240b7a827c5121139c742d377f02 i18n/kor/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
-  our    100644 f892e55439ea6b599f59d9bae269185194bcfa6c i18n/kor/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
-  their  100644 4f7d8d2ef890b53946115db5d8835e0774f04acf i18n/kor/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
-changed in both
-  base   100644 a617486e76e99ecf97ccaaf3b946728ccfda5a46 i18n/kor/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 d97177c41e4a5031dad60cb0cfff30a1e2f28fd5 i18n/kor/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 3f05d41e6bb142452398a1743b02c17a48890893 i18n/kor/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-@@ -13,6 +13,12 @@
- 	"noIconThemeDesc": "No file icons",
- 	"iconThemeError": "File icon theme is unknown or not installed.",
- 	"workbenchColors": "현재 선택한 색 테마에서 색을 재정의합니다.",
-+<<<<<<< .our
-+=======
-+	"workbenchColors.deprecated": "이 설정은 더 이상 실험적 설정이 아니며 이름이\n 'workbench.colorCustomizations'로 변경되었습니다.",
-+	"workbenchColors.deprecatedDescription": "대신 'workbench.colorCustomizations'를 사용합니다.",
-+	"editorColors": "현재 선택된 색 테마에서 편집기 색상과 글꼴 스타일을 재정의합니다.",
-+>>>>>>> .their
- 	"editorColors.comments": "주석의 색 및 스타일을 설정합니다.",
- 	"editorColors.strings": "문자열 리터럴의 색 및 스타일을 설정합니다.",
- 	"editorColors.keywords": "키워드의 색과 스타일을 설정합니다.",
-@@ -20,6 +26,10 @@
- 	"editorColors.types": "형식 선언 및 참조의 색 및 스타일을 설정합니다.",
- 	"editorColors.functions": "함수 선언 및 참조의 색 및 스타일을 설정합니다.",
- 	"editorColors.variables": "변수 선언 및 참조의 색 및 스타일을 설정합니다.",
-+<<<<<<< .our
- 	"editorColors.textMateRules": "textmate 테마 설정 규칙을 사용하여 색 및 스타일을 설정합니다(고급).",
- 	"editorColors": "현재 선택된 색 테마에서 편집기 색상과 글꼴 스타일을 재정의합니다."
-+=======
-+	"editorColors.textMateRules": "textmate 테마 설정 규칙을 사용하여 색 및 스타일을 설정합니다(고급)."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 de011d44dcee1e5b84348cbbbac47b39514e14b0 i18n/ptb/extensions/css/package.i18n.json
-  our    100644 b5a1c26e58ba4e5c3b5335a8a52681f23c94556b i18n/ptb/extensions/css/package.i18n.json
-  their  100644 57b5e3227e142dfc7090e964edc45d058b0dde4a i18n/ptb/extensions/css/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,73 @@
- 	],
- 	"displayName": "Noções Básicas da Linguagem CSS",
- 	"description": "Fornece realce de sintaxe e correspondência de colchetes para arquivos CSS, LESS e SCSS."
-+=======
-+	"css.lint.argumentsInColorFunction.desc": "Número inválido de parâmetros",
-+	"css.lint.boxModel.desc": "Não use largura ou altura ao usar preenchimento ou borda",
-+	"css.lint.compatibleVendorPrefixes.desc": "Ao usar um prefixo específico de fornecedor, certifique-se de também incluir todas as outras propriedades específicas do fornecedor",
-+	"css.lint.duplicateProperties.desc": "Não use as definições de estilo duplicadas",
-+	"css.lint.emptyRules.desc": "Não use conjuntos de regra em branco",
-+	"css.lint.float.desc": "Evite usar 'float'. Floats levam a CSS frágil, que é fácil de quebrar se um aspecto do layout for alterado.",
-+	"css.lint.fontFaceProperties.desc": "A regra @font-face deve definir propriedades 'src' e 'font-family'",
-+	"css.lint.hexColorLength.desc": "Cores hexadecimais devem consistir em três ou seis números hexadecimais",
-+	"css.lint.idSelector.desc": "Seletores não devem conter IDs, pois essas regras estão firmemente acopladas ao HTML.",
-+	"css.lint.ieHack.desc": "IE hacks somente são necessários ao dar suporte ao IE7 e mais antigos",
-+	"css.lint.important.desc": "Evite usar !important. Esta é uma indicação de que a especificidade do CSS inteiro saiu de controle e precisa ser fatorada novamente.",
-+	"css.lint.importStatement.desc": "Instruções de importação não carregam em paralelo",
-+	"css.lint.propertyIgnoredDueToDisplay.desc": "Propriedade ignorada devido à exibição. Por exemplo, com 'display: inline', as propriedades width, height, margin-top, margin-bottom e float não têm efeito",
-+	"css.lint.universalSelector.desc": "O seletor universal (*) é conhecido por ser lento",
-+	"css.lint.unknownProperties.desc": "Propriedade desconhecida.",
-+	"css.lint.unknownVendorSpecificProperties.desc": "Propriedade específica do fornecedor desconhecida.",
-+	"css.lint.vendorPrefix.desc": "Ao usar um prefixo específico do fornecedor, inclua também a propriedade padrão",
-+	"css.lint.zeroUnits.desc": "Nenhuma unidade para zero é necessária",
-+	"css.trace.server.desc": "Rastrear a comunicação entre o VS Code e o servidor de linguagem CSS.",
-+	"css.validate.title": "Controla a validação CSS and a gravidade dos problemas.",
-+	"css.validate.desc": "Habilita ou desabilita todas as validações",
-+	"less.lint.argumentsInColorFunction.desc": "Número inválido de parâmetros",
-+	"less.lint.boxModel.desc": "Não use largura ou altura ao usar preenchimento ou borda",
-+	"less.lint.compatibleVendorPrefixes.desc": "Ao usar um prefixo específico de fornecedor, certifique-se de também incluir todas as outras propriedades específicas do fornecedor",
-+	"less.lint.duplicateProperties.desc": "Não use as definições de estilo duplicadas",
-+	"less.lint.emptyRules.desc": "Não use conjuntos de regra em branco",
-+	"less.lint.float.desc": "Evite usar 'float'. Floats levam a CSS frágil, que é fácil de quebrar se um aspecto do layout for alterado.",
-+	"less.lint.fontFaceProperties.desc": "A regra @font-face deve definir propriedades 'src' e 'font-family'",
-+	"less.lint.hexColorLength.desc": "Cores hexadecimais devem consistir em três ou seis números hexadecimais",
-+	"less.lint.idSelector.desc": "Seletores não devem conter IDs, pois essas regras estão firmemente acopladas ao HTML.",
-+	"less.lint.ieHack.desc": "IE hacks somente são necessários ao dar suporte ao IE7 e mais antigos",
-+	"less.lint.important.desc": "Evite usar !important. Esta é uma indicação de que a especificidade do CSS inteiro saiu de controle e precisa ser fatorada novamente.",
-+	"less.lint.importStatement.desc": "Instruções de importação não carregam em paralelo",
-+	"less.lint.propertyIgnoredDueToDisplay.desc": "Propriedade ignorada devido à exibição. Por exemplo, com 'display: inline', as propriedades width, height, margin-top, margin-bottom e float não têm efeito",
-+	"less.lint.universalSelector.desc": "O seletor universal (*) é conhecido por ser lento",
-+	"less.lint.unknownProperties.desc": "Propriedade desconhecida.",
-+	"less.lint.unknownVendorSpecificProperties.desc": "Propriedade específica do fornecedor desconhecida.",
-+	"less.lint.vendorPrefix.desc": "Ao usar um prefixo específico do fornecedor, inclua também a propriedade padrão",
-+	"less.lint.zeroUnits.desc": "Nenhuma unidade para zero é necessária",
-+	"less.validate.title": "Controla MENOS as severidades de validação e problemas.",
-+	"less.validate.desc": "Habilita ou desabilita todas as validações",
-+	"scss.lint.argumentsInColorFunction.desc": "Número inválido de parâmetros",
-+	"scss.lint.boxModel.desc": "Não use largura ou altura ao usar preenchimento ou borda",
-+	"scss.lint.compatibleVendorPrefixes.desc": "Ao usar um prefixo específico de fornecedor, certifique-se de também incluir todas as outras propriedades específicas do fornecedor",
-+	"scss.lint.duplicateProperties.desc": "Não use as definições de estilo duplicadas",
-+	"scss.lint.emptyRules.desc": "Não use conjuntos de regra em branco",
-+	"scss.lint.float.desc": "Evite usar 'float'. Floats levam a CSS frágil, que é fácil de quebrar se um aspecto do layout for alterado.",
-+	"scss.lint.fontFaceProperties.desc": "A regra @font-face deve definir propriedades 'src' e 'font-family'",
-+	"scss.lint.hexColorLength.desc": "Cores hexadecimais devem consistir em três ou seis números hexadecimais",
-+	"scss.lint.idSelector.desc": "Seletores não devem conter IDs, pois essas regras estão firmemente acopladas ao HTML.",
-+	"scss.lint.ieHack.desc": "IE hacks somente são necessários ao dar suporte ao IE7 e mais antigos",
-+	"scss.lint.important.desc": "Evite usar !important. Esta é uma indicação de que a especificidade do CSS inteiro saiu de controle e precisa ser fatorada novamente.",
-+	"scss.lint.importStatement.desc": "Instruções de importação não carregam em paralelo",
-+	"scss.lint.propertyIgnoredDueToDisplay.desc": "Propriedade ignorada devido à exibição. Por exemplo, com 'display: inline', as propriedades width, height, margin-top, margin-bottom e float não têm efeito",
-+	"scss.lint.universalSelector.desc": "O seletor universal (*) é conhecido por ser lento",
-+	"scss.lint.unknownProperties.desc": "Propriedade desconhecida.",
-+	"scss.lint.unknownVendorSpecificProperties.desc": "Propriedade específica do fornecedor desconhecida.",
-+	"scss.lint.vendorPrefix.desc": "Ao usar um prefixo específico do fornecedor, inclua também a propriedade padrão",
-+	"scss.lint.zeroUnits.desc": "Nenhuma unidade para zero é necessária",
-+	"scss.validate.title": "Controla severidades de validação e problemas SCSS.",
-+	"scss.validate.desc": "Habilita ou desabilita todas as validações",
-+	"less.colorDecorators.enable.desc": "Habilita ou desabilita decoradores de cores",
-+	"scss.colorDecorators.enable.desc": "Habilita ou desabilita decoradores de cores",
-+	"css.colorDecorators.enable.desc": "Habilita ou desabilita decoradores de cores",
-+	"css.colorDecorators.enable.deprecationMessage": "A configuração 'css.colorDecorators.enable' foi descontinuada em favor de 'editor.colorDecorators'.",
-+	"scss.colorDecorators.enable.deprecationMessage": "A configuração 'scss.colorDecorators.enable' foi descontinuada em favor de 'editor.colorDecorators'.",
-+	"less.colorDecorators.enable.deprecationMessage": "A configuração 'less.colorDecorators.enable' foi descontinuada em favor de 'editor.colorDecorators'."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d1d286c6e2efd6e81cd2355940b882450a8f9005 i18n/ptb/extensions/emmet/package.i18n.json
-  our    100644 bd44dd5d5523e2a5800a445af385bb5a762f2233 i18n/ptb/extensions/emmet/package.i18n.json
-  their  100644 07589c8fc9d225be6f0086463c3c1f9db99aa6ec i18n/ptb/extensions/emmet/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -7,6 +8,8 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"description": "Suporte ao Emmet para VS Code",
-+=======
-+>>>>>>> .their
- 	"command.wrapWithAbbreviation": "Envelope com a abreviatura",
- 	"command.wrapIndividualLinesWithAbbreviation": "Envelopar Linhas Individuais com Abreviatura",
- 	"command.removeTag": "Remover Tag",
-@@ -31,6 +34,7 @@
- 	"command.incrementNumberByTen": "Incremento de 10",
- 	"command.decrementNumberByTen": "Decrementar por 10",
- 	"emmetSyntaxProfiles": "Definir o perfil para a sintaxe especificada ou usar seu próprio perfil com regras específicas.",
-+<<<<<<< .our
- 	"emmetExclude": "Uma matriz de línguas onde abreviaturas Emmet não devem ser expandidas.",
- 	"emmetExtensionsPath": "Caminho para uma pasta que contém os perfis Emmet e trechos de códigos.'",
- 	"emmetShowExpandedAbbreviation": "Mostrar abreviaturas Emmet expandidas como sugestões.\nA opção \"inMarkupAndStylesheetFilesOnly\" aplica-se a html, haml, jade, slim, xml, xsl, css, scss, sass, less e stylus.\nA opção \"always\" se aplica a todas as partes do arquivo independentemente de marcação/css.",
-@@ -38,6 +42,15 @@
- 	"emmetIncludeLanguages": "Ative abreviações do Emmet em idiomas que não são suportados por padrão. Adicione um mapeamento aqui entre o idioma e a linguagem suportada emmet.\nPor exemplo: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
- 	"emmetVariables": "Variáveis a serem usadas em trechos de código Emmet",
- 	"emmetTriggerExpansionOnTab": "Quando habilitado, abreviações Emmet são expandidas ao pressionar TAB.",
-+=======
-+	"emmetExclude": "Uma matriz de línguagens onde abreviaturas emmet não devem ser expandidas.",
-+	"emmetExtensionsPath": "Caminho para uma pasta que contém os perfis de emmet e trechos de código.'",
-+	"emmetShowExpandedAbbreviation": "Mostra abreviaturas emmet expandidas como sugestões.\nA opção \"inMarkupAndStylesheetFilesOnly\" aplica-se a html, haml, jade, slim, xml, xsl, css, scss, sass, less e stylus.\nA opção \"always\" se aplica a todas as partes do arquivo independentemente de marcação/css.",
-+	"emmetShowAbbreviationSuggestions": "Mostra possíveis abreviaturas emmet como sugestões. Não aplicável em folhas de estilo ou quando emmet.showExpandedAbbreviation é definido como \"nunca\".",
-+	"emmetIncludeLanguages": "Habilita as abreviaturas do emmet em idiomas que não são suportados por padrão. Adicione um mapeamento aqui entre a linguagem e a linguagem emmet suportada.\n Por exemplo: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
-+	"emmetVariables": "Variáveis a serem usadas em trechos de código emmet",
-+	"emmetTriggerExpansionOnTab": "Quando habilitado, abreviações emmet são expandidas ao pressionar TAB.",
-+>>>>>>> .their
- 	"emmetPreferences": "Preferências usadas para modificar o comportamento de algumas ações e resolvedores de Emmet.",
- 	"emmetPreferencesIntUnit": "Unidade padrão para valores inteiros",
- 	"emmetPreferencesFloatUnit": "Unidade padrão para valores float",
-@@ -47,6 +60,7 @@
- 	"emmetPreferencesCssBetween": "Símbolo a ser colocado entre a propriedade CSS e o valor quando expandir abreviaturas CSS",
- 	"emmetPreferencesSassBetween": "Símbolo a ser colocado entre a propriedade CSS e o valor quando expandir abreviaturas CSS em arquivos Sass",
- 	"emmetPreferencesStylusBetween": "Símbolo a ser colocado entre a propriedade CSS e o valor quando expandir abreviaturas CSS em arquivos Stylus",
-+<<<<<<< .our
- 	"emmetShowSuggestionsAsSnippets": "Se verdadeiro, então as sugestões emmet aparecerão como trechos, permitindo você requisitá-los conforme a configuração de editor.snippetSuggestions.",
- 	"emmetPreferencesBemElementSeparator": "Separador de elemento usado para classes quando utilizar o filtro BEM",
- 	"emmetPreferencesBemModifierSeparator": "Separador de modificador usado para classes quando utilizar o filtro BEM",
-@@ -62,4 +76,7 @@
- 	"emmetPreferencesCssMsProperties": "Propriedades CSS separadas por vírgula que recebem o prefixo vendor 'ms' quando utilizado em abreviações do Emmet que iniciam com `-`. Defina como string vazia para sempre evitar o prefixo 'ms'.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "A pontuação mínima (de 0 a 1) que a abreviação difusa deve alcançar. Os valores mais baixos podem produzir muitas correspondências falso-positivas, valores mais elevados podem reduzir possíveis correspondências.\n",
- 	"emmetOptimizeStylesheetParsing": "Quando definido como false, o arquivo inteiro é analisado para determinar se a posição atual é válida para expandir as abreviações Emmet. Quando definido como true, somente o conteúdo em torno da posição atual em arquivos css / scss / less é analisado."
-+=======
-+	"emmetShowSuggestionsAsSnippets": "Se verdadeiro, então as sugestões emmet aparecerão como trechos, permitindo você requisitá-los conforme a configuração de editor.snippetSuggestions."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 0fee06973c8b08e341e6dba8f3cc4dd139762867 i18n/ptb/extensions/extension-editing/out/extensionLinter.i18n.json
-  our    100644 514199b2eb4c7a7235895cc4faec19c4b4eaf681 i18n/ptb/extensions/extension-editing/out/extensionLinter.i18n.json
-  their  100644 4a35721116819d493772e604e862f37ce0f23432 i18n/ptb/extensions/extension-editing/out/extensionLinter.i18n.json
-changed in both
-  base   100644 b33bd9ee59bc9cee1fd66fde79a86fde98ea4111 i18n/ptb/extensions/git/out/commands.i18n.json
-  our    100644 614b7d0fe2aa5964fe65add6e8d1ab893a154db4 i18n/ptb/extensions/git/out/commands.i18n.json
-  their  100644 4c72afe876f701697e1d15345c647a6e6c922515 i18n/ptb/extensions/git/out/commands.i18n.json
-@@ -12,11 +12,16 @@
- 	"repourl": "URL do repositório",
- 	"cloning": "Clonando repositório git '{0}'...",
- 	"proposeopen": "Gostaria de abrir o repositório clonado?",
-+<<<<<<< .our
- 	"openrepo": "Abrir Repositório",
- 	"init": "Escolher a pasta de trabalho para inicializar o git repo",
- 	"init repo": "Inicializar Repositório",
- 	"create repo": "Inicializar Repositório",
- 	"are you sure": "Isto irá criar um repositório Git em '{0}'. Tem certeza que deseja continuar?",
-+=======
-+	"path to init": "Caminho da pasta",
-+	"provide path": "Por favor, forneça um caminho de pasta para inicializar um repositório Git",
-+>>>>>>> .their
- 	"HEAD not available": "Versão HEAD de '{0}' não está disponível.",
- 	"confirm stage files with merge conflicts": "Tem certeza que deseja processar {0} arquivos com conflitos de mesclagem?",
- 	"confirm stage file with merge conflicts": "Tem certeza que deseja processar {0} com conflitos de mesclagem?",
-@@ -33,17 +38,24 @@
- 	"confirm discard all": "Tem certeza que deseja descartar todas as alterações em {0} arquivos?\nIsso é IRREVERSíVEL!\nO conjunto de trabalhando atual será PERDIDO PARA SEMPRE.",
- 	"discardAll multiple": "Descartar 1 Arquivo",
- 	"discardAll": "Descartar Todos os {0} Arquivos",
-+<<<<<<< .our
- 	"confirm delete multiple": "Tem certeza que deseja EXCLUIR {0} arquivos?",
-+=======
-+	"confirm delete multiple": "Tem certeza que deseja excluir {0} arquivos?",
-+>>>>>>> .their
- 	"delete files": "Excluir arquivos",
- 	"there are untracked files single": "O seguinte arquivo não controlado será excluído do disco se descartado: {0}.",
- 	"there are untracked files": "Existem {0} arquivos não controlados que serão excluídos do disco se descartados.",
- 	"confirm discard all 2": "{0}\n\n é IRREVERSÍVEL, o conjunto de trabalho atual será PERDIDO PARA SEMPRE.",
- 	"yes discard tracked": "Descartar 1 arquivo controlado",
- 	"yes discard tracked multiple": "Descartar arquivos {0} controlados",
-+<<<<<<< .our
- 	"unsaved files single": "O seguinte arquivo não foi salvo: [0}.\n\nGostaria de salvá-lo antes de executar o commit?",
- 	"unsaved files": "Existem {0} arquivos não salvos.\n\nGostaria de salvá-los antes de executar o commit?",
- 	"save and commit": "Salvar Tudo & Confirmar",
- 	"commit": "Confirmar de qualquer maneira",
-+=======
-+>>>>>>> .their
- 	"no staged changes": "Não há nenhuma modificação escalonada para confirmar.\n\nGostaria de escalonar automaticamente todas as suas alterações e confirmá-las diretamente?",
- 	"always": "Sempre",
- 	"no changes": "Não há mudanças para confirmar.",
-@@ -63,10 +75,14 @@
- 	"provide tag name": "Por favor, forneça um nome de Tag",
- 	"tag message": "Mensagem",
- 	"provide tag message": "Por favor, forneça uma mensagem para comentar o rótulo",
-+<<<<<<< .our
- 	"no remotes to fetch": "Este repositório não possui remotos configurados para buscar algo",
-+=======
-+>>>>>>> .their
- 	"no remotes to pull": "O seu repositório não possui remotos configurados para efetuar pull.",
- 	"pick remote pull repo": "Selecione um remoto para efeutar o pull da ramificação",
- 	"no remotes to push": "O seu repositório não possui remotos configurados para efetuar push.",
-+	"push with tags success": "Envio de rótulos finalizado com sucesso.",
- 	"nobranch": "Por favor, faça checkout em um ramo para fazer push em um remoto.",
- 	"confirm publish branch": "O branch '{0}' não possui um branch superior. Você quer publicar este branch?",
- 	"ok": "OK",
-changed in both
-  base   100644 717d2b4364a76160a0ba309d9b60023bedb750bf i18n/ptb/extensions/git/out/model.i18n.json
-  our    100644 39e57632fd80437ac1efdf00f90158fc55ceb67d i18n/ptb/extensions/git/out/model.i18n.json
-  their  100644 05c63b7788a03d4fc108b3214ec611c2e6cebf8e i18n/ptb/extensions/git/out/model.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -9,4 +10,8 @@
- 	"too many submodules": "O repositório '{0}' possui submódulos {1} que não serão abertos automaticamente. Você ainda pode abrir cada um individualmente abrindo um arquivo dentro dele.",
- 	"no repositories": "Não existem repositórios disponíveis",
- 	"pick repo": "Escolha um repositório"
-+=======
-+	"no repositories": "Não existem repositórios disponíveis",
-+	"pick repo": "Escolher um repositório"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 ee4b84c24042f8a1bb30756b849d017dd6de9b1e i18n/ptb/extensions/git/out/repository.i18n.json
-  their  100644 d9855ba9df28b2a9874fc2d6b718b98490d1671a i18n/ptb/extensions/git/out/repository.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -24,12 +25,42 @@
- 	"both added": "Ambos adicionados",
- 	"both modified": "Ambos Modificados",
- 	"commitMessage": "Mensagem (tecle {0} para confirmar)",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"open": "Abrir",
-+	"index modified": "Índice modificado",
-+	"modified": "Modificado",
-+	"index added": "Índice adicionado",
-+	"index deleted": "Índice excluído",
-+	"deleted": "Excluído",
-+	"index renamed": "Índice renomeado",
-+	"index copied": "Índice copiado",
-+	"untracked": "Não acompanhado",
-+	"ignored": "Ignorado",
-+	"both deleted": "Ambos Excluídos",
-+	"added by us": "Adicionado por nós",
-+	"deleted by them": "Excluído por eles",
-+	"added by them": "Adicionado por eles",
-+	"deleted by us": "Excluído por nós",
-+	"both added": "Ambos adicionados",
-+	"both modified": "Ambos modificados",
-+>>>>>>> .their
- 	"commit": "Confirmar",
- 	"merge changes": "Mesclar Alterações",
- 	"staged changes": "Alterações em Etapas",
- 	"changes": "Alterações",
-+<<<<<<< .our
- 	"commitMessageCountdown": "{0} caracteres restantes na linha atual",
- 	"commitMessageWarning": "{0} caracteres sobre {1} na linha atual",
- 	"neveragain": "Não mostrar novamente",
-+=======
-+	"ok": "OK",
-+	"neveragain": "Nunca Mostrar Novamente",
-+>>>>>>> .their
- 	"huge": "O repositório git em '{0}' tem muitas atualizações ativas, somente um subconjunto de funcionalidades do Git será habilitado."
- }
-\ No newline at end of file
-changed in both
-  base   100644 6a5c2f313f281ed4f931c4d0186d46731c3fef2a i18n/ptb/extensions/git/package.i18n.json
-  our    100644 6ab84324adbad521926986bc352591224f0e601f i18n/ptb/extensions/git/package.i18n.json
-  their  100644 f45cd09fb8b6fa782b4940e6e3911400288040dc i18n/ptb/extensions/git/package.i18n.json
-@@ -40,7 +40,10 @@
- 	"command.renameBranch": "Renomear o Branch",
- 	"command.merge": "Mesclar ramificação...",
- 	"command.createTag": "Criar Tag",
-+<<<<<<< .our
- 	"command.fetch": "Buscar",
-+=======
-+>>>>>>> .their
- 	"command.pull": "Efetuar pull",
- 	"command.pullRebase": "Efetuar pull (Rebase)",
- 	"command.pullFrom": "Fazer pull de...",
-@@ -52,7 +55,10 @@
- 	"command.publish": "Publicar Ramo",
- 	"command.showOutput": "Mostrar Saída do Git",
- 	"command.ignore": "Adicionar arquivo ao .gitignore",
-+<<<<<<< .our
- 	"command.stashIncludeUntracked": "Estoque (incluir não controlados)",
-+=======
-+>>>>>>> .their
- 	"command.stash": "Esconder",
- 	"command.stashPop": "Pop Stash...",
- 	"command.stashPopLatest": "Pop mais recente Stash",
-@@ -71,6 +77,7 @@
- 	"config.defaultCloneDirectory": "O local padrão onde clonar um repositório git",
- 	"config.enableSmartCommit": "Confirme todas as alterações quando não há modificações planejadas.",
- 	"config.enableCommitSigning": "Habilitar Commit assinando com GPG.",
-+<<<<<<< .our
- 	"config.discardAllScope": "Controla as alterações que são descartadas pelo comando 'Descartar todas as alterações'. 'todos' descarta todas as alterações. 'rastreados' descarta somente arquivos rastreados. 'prompt' mostra uma caixa de diálogo de alerta cada vez que a ação é executada.",
- 	"config.decorations.enabled": "Controla se o Git contribui cores e emblemas para o explorer e visualizador de editores abertos.",
- 	"config.promptToSaveFilesBeforeCommit": "Controla se o Git deve verificar arquivos não salvos antes do Commit.",
-@@ -84,4 +91,7 @@
- 	"colors.ignored": "Cor para recursos ignorados.",
- 	"colors.conflict": "Cor para recursos com conflitos.",
- 	"colors.submodule": "Cor para recursos de sub-módulos."
-+=======
-+	"config.discardAllScope": "Controla as alterações que são descartadas pelo comando 'Descartar todas as alterações'. 'todos' descarta todas as alterações. 'rastreados' descarta somente arquivos rastreados. 'prompt' mostra uma caixa de diálogo de alerta cada vez que a ação é executada."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 2f255a02e7f1c4b914878b7355dd19b5ff4e679a i18n/ptb/extensions/html/package.i18n.json
-  our    100644 53d3b893ddacd3ad9bb88dfb93f9d1611510eaa4 i18n/ptb/extensions/html/package.i18n.json
-  their  100644 2772cf08cde94b84a0c633f5cf47de7f47bcfc4e i18n/ptb/extensions/html/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,28 @@
- 	],
- 	"displayName": "Noções Básicas da Linguagem HTML",
- 	"description": "Fornece realce de sintaxe, correspondência de colchetes e trechos em arquivos HTML."
-+=======
-+	"html.format.enable.desc": "Ativar/desativar o formatador HTML padrão",
-+	"html.format.wrapLineLength.desc": "Quantidade máxima de caracteres por linha (0 = desativar).",
-+	"html.format.unformatted.desc": "Lista de tags, separados por vírgula, que não deveria ser reformatada. o padrão é 'nulo' para todas as tags listadas em https://www.w3.org/TR/html5/dom.html#phrasing-content.",
-+	"html.format.contentUnformatted.desc": "Lista de tags, separada por vírgula, onde o conteúdo não deve ser reformatado. o padrão é 'nulo' para a tag 'pré'.",
-+	"html.format.indentInnerHtml.desc": "Indentar secões <head>e <body>.",
-+	"html.format.preserveNewLines.desc": "Se quebras de linha existentes antes de elementos deveriam ser preservadas. Só funciona antes de elementos, não dentro de rótulos ou para texto.",
-+	"html.format.maxPreserveNewLines.desc": "Número máximo de quebras de linha a serem preservadas em um bloco. Use 'null' para ilimitado.",
-+	"html.format.indentHandlebars.desc": "Formatar e indentar {{#foo}} e {{/ foo}}.",
-+	"html.format.endWithNewline.desc": "Finalizar com uma nova linha.",
-+	"html.format.extraLiners.desc": "Lista de rótulos, separados por vírgulas, que deveriam ter uma quebra de linha extra antes deles. 'null' admite o padrão \"head, body, /html\".",
-+	"html.format.wrapAttributes.desc": "Agrupar atributos.",
-+	"html.format.wrapAttributes.auto": "Agrupar atributos somente quando o tamanho da linha é excedido.",
-+	"html.format.wrapAttributes.force": "Agrupar cada atributo exceto o primeiro.",
-+	"html.format.wrapAttributes.forcealign": "Agrupar cada atributo, exceto o primeiro e manter alinhado.",
-+	"html.format.wrapAttributes.forcemultiline": "Agrupar cada atributo.",
-+	"html.suggest.angular1.desc": "Configura se o suporte da linguagem HTML interna sugere rótulos e propriedades do Angular V1.",
-+	"html.suggest.ionic.desc": "Configura se o suporte da linguagem HTML interna sugere rótulos, propriedades e valores Ionic.",
-+	"html.suggest.html5.desc": "Configura se o suporte da linguagem HTML interna sugere rótulos, propriedades e valores HTML5.",
-+	"html.trace.server.desc": "Rastrear a comunicação entre o VS Code e o servidor de linguagem HTML.",
-+	"html.validate.scripts": "Configura se o suporte da linguagem HTML interna valida scripts embutidos.",
-+	"html.validate.styles": "Configura se o suporte da linguagem HTML interna valida estilos embutidos.",
-+	"html.autoClosingTags": "Ativar/desativar o fechamento automático de tags HTML."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 9d812f5b25317170c07a603dc12d284c8df60b4b i18n/ptb/extensions/json/package.i18n.json
-  our    100644 4f2081eef5fead342df69be4023a245ba06e99f6 i18n/ptb/extensions/json/package.i18n.json
-  their  100644 c588df96a2f257e797e6b0af06293e5f79372a5a i18n/ptb/extensions/json/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,15 @@
- 	],
- 	"displayName": "Noções Básicas da Linguagem JSON",
- 	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos JSON."
-+=======
-+	"json.schemas.desc": "Esquemas associadas a arquivos de JSON no projeto atual",
-+	"json.schemas.url.desc": "Um URL para um esquema ou um caminho relativo a um esquema no diretório atual",
-+	"json.schemas.fileMatch.desc": "Uma matriz de padrões de arquivos para correspondência ao resolver arquivos JSON para esquemas.",
-+	"json.schemas.fileMatch.item.desc": "Um padrão de arquivos que pode conter '*' para fazer a correspondência ao resolver arquivos JSON para esquemas.",
-+	"json.schemas.schema.desc": "A definição de esquema para o URL dado. O esquema precisa ser fornecido apenas para evitar acessos ao URL do esquema.",
-+	"json.format.enable.desc": "Habilitar/desabilitar o formatador JSON padrão (requer reinicialização)",
-+	"json.tracing.desc": "Loga a comunicação entre o VS Code e o servidor de linguagem JSON.",
-+	"json.colorDecorators.enable.desc": "Habilita ou desabilita os decoradores de cor",
-+	"json.colorDecorators.enable.deprecationMessage": "A configuração 'json.colorDecorators.enable' foi descontinuada em favor de 'editor.colorDecorators'."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 cc2b913b977e4a01e6287b7bf856361b4d565382 i18n/ptb/extensions/markdown/out/security.i18n.json
-  our    100644 ed697341a9e3e0ee2d631edb406f7b5bc89a42d1 i18n/ptb/extensions/markdown/out/security.i18n.json
-  their  100644 c0b18587a31f48d9426a5baa03c238cd4d35fc12 i18n/ptb/extensions/markdown/out/security.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"strict.title": "Estrita",
- 	"strict.description": "Somente carregar conteúdo seguro",
- 	"insecureContent.title": "Permitir conteúdo inseguro",
-@@ -13,8 +16,11 @@
- 	"disable.title": "Desabilitar",
- 	"disable.description": "Permitir a execução de conteúdo e scripts. Não recomendado",
- 	"moreInfo.title": "Mais informações",
-+<<<<<<< .our
- 	"enableSecurityWarning.title": "Habilitar a visualização de avisos de segurança neste espaço de trabalho",
- 	"disableSecurityWarning.title": "Desabilitar a visualização de avisos de segurança neste espaço de trabalho",
- 	"toggleSecurityWarning.description": "Não afeta o nível de segurança de conteúdo",
-+=======
-+>>>>>>> .their
- 	"preview.showPreviewSecuritySelector.title": "Selecione as configurações de segurança para visualizações de Markdown neste espaço de trabalho"
- }
-\ No newline at end of file
-changed in both
-  base   100644 c1f744bf765d9d69e09c48a3af89cc3c3045660c i18n/ptb/extensions/markdown/package.i18n.json
-  our    100644 2d381cc3188ef9f046b05f6898c92915b232ccd1 i18n/ptb/extensions/markdown/package.i18n.json
-  their  100644 789f117448a5cf147d83a04819c63864b3258c10 i18n/ptb/extensions/markdown/package.i18n.json
-@@ -23,5 +23,10 @@
- 	"markdown.showSource.title": "Exibir Código-Fonte",
- 	"markdown.styles.dec": "Uma lista de URLs ou caminhos locais para folhas de estilo CSS para usar na pré-visualização do markdown. Caminhos relativos são interpretados em relação à pasta aberta no explorer. Se não houver nenhuma pasta aberta, eles são interpretados em relação ao local do arquivo markdown. Todos os ' \\' precisam ser escritos como ' \\ \\ '.",
- 	"markdown.showPreviewSecuritySelector.title": "Alterar as configurações de segurança de visualização",
-+<<<<<<< .our
- 	"markdown.trace.desc": "Habilitar log de depuração para a extensão do markdown."
-+=======
-+	"markdown.trace.desc": "Habilitar log de depuração para a extensão do markdown.",
-+	"markdown.refreshPreview.title": "Atualizar a visualização"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 c723b32adb6bfc83ad009205ae236843ace13e64 i18n/ptb/extensions/typescript/out/utils/api.i18n.json
-  their  100644 ea073b5472503db6af26a5d75e90c37ca0dd0737 i18n/ptb/extensions/typescript/out/utils/api.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"invalidVersion": "versão inválida"
- }
-\ No newline at end of file
-changed in both
-  base   100644 d7e1e13f4a3f796229b7498bfc25392a8b4a595a i18n/ptb/extensions/typescript/out/utils/versionPicker.i18n.json
-  our    100644 8f3cd072f305b121b77c508d88eea8b2c05f193f i18n/ptb/extensions/typescript/out/utils/versionPicker.i18n.json
-  their  100644 87043e03fd65541178a3941ee655d46402b7f47d i18n/ptb/extensions/typescript/out/utils/versionPicker.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"useVSCodeVersionOption": "Use a versão do VS Code",
- 	"useWorkspaceVersionOption": "Use a versão de área de trabalho",
- 	"learnMore": "Saiba Mais",
-changed in both
-  base   100644 62c461cbe8e20d7c6ab98363f01e871091bd4ac3 i18n/ptb/extensions/typescript/out/utils/versionProvider.i18n.json
-  our    100644 ba136d68e8b6908aeebd89c1f20622fbc08d9376 i18n/ptb/extensions/typescript/out/utils/versionProvider.i18n.json
-  their  100644 e2cf1ea2df5fe104fdd520a9b1446171ab507208 i18n/ptb/extensions/typescript/out/utils/versionProvider.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"couldNotLoadTsVersion": "Não foi possível carregar a versão do TypeScript neste caminho",
- 	"noBundledServerFound": "Tsserver do VS Code foi eliminado por outro aplicativo como uma ferramenta de detecção de vírus com um comportamento inadequado. Por favor reinstale o VS Code."
- }
-\ No newline at end of file
-changed in both
-  base   100644 7f19341f39e11b9c6c7dfb67e2c8202b016deebd i18n/ptb/extensions/typescript/package.i18n.json
-  our    100644 e2a4a79890442f42b8f34d40819d4ee59c4bac77 i18n/ptb/extensions/typescript/package.i18n.json
-  their  100644 8b7415813f2cc8b0f4f10aaf9e359bebddc4ec90 i18n/ptb/extensions/typescript/package.i18n.json
-changed in both
-  base   100644 d6108586df8b1ff6fab7bb0bd9ee68e2c4d537ac i18n/ptb/src/vs/base/common/jsonErrorMessages.i18n.json
-  our    100644 c0df2b99ce98bcdadd04ed9815b0b3354d2593a0 i18n/ptb/src/vs/base/common/jsonErrorMessages.i18n.json
-  their  100644 97f0770c0dc0bf45300d512dde96b3c4542b9313 i18n/ptb/src/vs/base/common/jsonErrorMessages.i18n.json
-changed in both
-  base   100644 bf2baf839060849cf84c714ebc9b91e51da423d5 i18n/ptb/src/vs/base/common/keybindingLabels.i18n.json
-  our    100644 88f9db8bef58f10b607d709254accc21c89d65f4 i18n/ptb/src/vs/base/common/keybindingLabels.i18n.json
-  their  100644 5977a200f222330634394fc1a23c8c900a9f02a5 i18n/ptb/src/vs/base/common/keybindingLabels.i18n.json
-changed in both
-  base   100644 04dffa8a8bda202443242dfe7f2647cc5ba93e71 i18n/ptb/src/vs/code/electron-main/menus.i18n.json
-  our    100644 a0ea065a8bc82783d33d375e03e02641423e3c6a i18n/ptb/src/vs/code/electron-main/menus.i18n.json
-  their  100644 669229119736af15a64809d311944bf0cab9efe8 i18n/ptb/src/vs/code/electron-main/menus.i18n.json
-changed in both
-  base   100644 c7c535d2dd2c800b452b39cf4520e176ce4710bf i18n/ptb/src/vs/code/electron-main/windows.i18n.json
-  our    100644 25a098f0535c8ad69d84e0bf787c6e701db72d31 i18n/ptb/src/vs/code/electron-main/windows.i18n.json
-  their  100644 05960bd53502c51f3ddada037cbde87bd1045c9e i18n/ptb/src/vs/code/electron-main/windows.i18n.json
-@@ -8,16 +8,32 @@
- 	],
- 	"ok": "OK",
- 	"pathNotExistTitle": "O caminho não existe",
-+<<<<<<< .our
- 	"pathNotExistDetail": "Aparentemente o caminho {0} não existe mais no disco.",
- 	"reopen": "&&Reabrir",
- 	"wait": "&&Continuar Aguardando",
- 	"close": "&&Fechar",
-+=======
-+	"pathNotExistDetail": "O caminho '{0}' não parece mais existir no disco.",
-+	"openWorkspace": "&&Abrir",
-+	"openWorkspaceTitle": "Abrir o Espaço de Trabalho",
-+	"save": "&&Salvar",
-+	"doNotSave": "&&Não Salvar",
-+	"cancel": "Cancelar",
-+	"saveWorkspaceMessage": "Você quer salvar a sua configuração de área de trabalho como um arquivo?",
-+	"saveWorkspaceDetail": "Salve seu espaço de trabalho se pretende abri-lo novamente.",
-+	"saveWorkspace": "Salvar o espaço de trabalho",
-+	"reopen": "Reabrir",
-+	"wait": "Continuar Esperando",
-+	"close": "Fechar",
-+>>>>>>> .their
- 	"appStalled": "A janela não está mais respondendo",
- 	"appStalledDetail": "Você pode reabrir, fechar a janela ou continuar esperando.",
- 	"appCrashed": "A janela foi fechada inesperadamente",
- 	"appCrashedDetail": "Pedimos desculpas pelo inconveniente! Você pode reabrir a janela para continuar de onde parou.",
- 	"open": "Abrir",
- 	"openFolder": "Abrir Pasta",
-+<<<<<<< .our
- 	"openFile": "Abrir Arquivo",
- 	"workspaceOpenedMessage": "Não é possível salvar espaço de trabalho '{0}'",
- 	"workspaceOpenedDetail": "O espaço de trabalho já está aberto em outra janela. Por favor, feche a janela primeiro e tente novamente.",
-@@ -29,4 +45,7 @@
- 	"saveWorkspaceMessage": "Você quer salvar a sua configuração de área de trabalho como um arquivo?",
- 	"saveWorkspaceDetail": "Salve seu espaço de trabalho se pretende abri-lo novamente.",
- 	"saveWorkspace": "Salvar o espaço de trabalho"
-+=======
-+	"openFile": "Abrir Arquivo"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 40b318ab1590a72883d114b8fbf4ce164a3732b7 i18n/ptb/src/vs/editor/browser/widget/diffReview.i18n.json
-  our    100644 073825f3f56385bac2c761870572d0a8ac4ead8a i18n/ptb/src/vs/editor/browser/widget/diffReview.i18n.json
-  their  100644 d7c36424974ded8bf7df532b5fff62b52494f4d8 i18n/ptb/src/vs/editor/browser/widget/diffReview.i18n.json
-@@ -7,7 +7,11 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"label.close": "Fechar",
-+<<<<<<< .our
- 	"more_lines": "{0} linhas",
-+=======
-+	"header": "Diferença {0} de {1}: original {2}, {3} linhas, modificado {4}, {5} linhas",
-+>>>>>>> .their
- 	"blankLine": "branco",
- 	"equalLine": "original {0}, modificados {1}: {2}",
- 	"insertLine": "+ modificado {0}: {1}",
-changed in both
-  base   100644 dd1475466b3f72596decb8231aa4fab240a69814 i18n/ptb/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 6c41dd22a5af7308ee2eafe191d717bc6243ff1f i18n/ptb/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 44d5ecaf2b385cf73a78e439201525eedc5d4926 i18n/ptb/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -27,8 +27,12 @@
- 	"scrollBeyondLastLine": "Controla se o editor rolará além da última linha",
- 	"smoothScrolling": "Controla se o editor irá rolar usando uma animação",
- 	"minimap.enabled": "Controla se o mini mapa é exibido",
-+<<<<<<< .our
- 	"minimap.side": "Controla o lado onde renderizar o minimapa.",
- 	"minimap.showSlider": "Controla se o controle deslizante minimap é oculto automaticamente.",
-+=======
-+	"minimap.showSlider": "Controla se o controle deslizante minimap é automaticamente escondido. Os valores possíveis são 'sempre' e 'mouseover'",
-+>>>>>>> .their
- 	"minimap.renderCharacters": "Renderizar os caracteres em uma linha (em oposição a blocos de caracteres)",
- 	"minimap.maxColumn": "Limitar o tamanho de um mini-mapa para renderizar no máximo um número determinado de colunas",
- 	"find.seedSearchStringFromSelection": "Controla se nós inicializamos a string de pesquisa na Ferramenta de Pesquisa a partir da seleção do editor",
-@@ -103,11 +107,14 @@
- 	"accessibilitySupport": "Controla quando o editor deve executar em modo otimizado para leitores de tela.",
- 	"links": "Controla se o editor deve detectar links e torná-los clicáveis",
- 	"colorDecorators": "Controla se o editor deve processar os decoradores de cor inline e o seletor de cores.",
-+<<<<<<< .our
- 	"codeActions": "Habilita a ação de código lightbulb",
- 	"codeActionsOnSave.organizeImports": "Executar organização de imports ao salvar?",
- 	"codeActionsOnSave": "Tipos de ação de código a serem executadas ao salvar.",
- 	"codeActionsOnSaveTimeout": "Tempo limite para ações de código executadas ao salvar.",
- 	"selectionClipboard": "Controla se a área primária de transferência Linux deve ser suportada.",
-+=======
-+>>>>>>> .their
- 	"sideBySide": "Controla se o editor de diff mostra as diff lado a lado ou inline.",
- 	"ignoreTrimWhitespace": "Controla se o editor de diff mostra alterações nos espaços iniciais ou finais como diferenças",
- 	"largeFileOptimizations": "Tratamento especial para arquivos grandes para desabilitar determinados recursos que fazem uso intensivo de memória.",
-changed in both
-  base   100644 c848a223488777a0cb34ac8aa3ca68ac1e9355a3 i18n/ptb/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 94d4e2ad2eeafdadb40b9a7361c52cda20aa5187 i18n/ptb/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 bbf45a1f6a89afa1f9c8bc3ac38c400f14d1ac03 i18n/ptb/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -28,12 +28,16 @@
- 	"errorBorder": "Cor da borda das linhas onduladas de erro no editor.",
- 	"warningForeground": "Cor do primeiro plano de linhas onduladas de aviso no editor.",
- 	"warningBorder": "Cor da borda das linhas onduladas de aviso no editor.",
-+<<<<<<< .our
- 	"infoForeground": "Cor do primeiro plano das linhas de informação no editor.",
- 	"infoBorder": "Cor da borda das linhas de informação no editor.",
- 	"hintForeground": "Cor de primeiro plano de linhas onduladas de dica no editor.",
- 	"hintBorder": "Cor da borda de linhas onduladas de dica no editor.",
- 	"unnecessaryForeground": "Cor de primeiro plano de código desnecessário no editor.",
- 	"overviewRulerRangeHighlight": "Visão geral da cor do marcador da régua para destaques do intervalo. A cor não deve ser opaca para não esconder decorações subjacentes.",
-+=======
-+	"overviewRulerRangeHighlight": "Visão geral da cor do marcador da régua para intervalos de destaques.",
-+>>>>>>> .their
- 	"overviewRuleError": "Visão geral da cor do marcador da régua para erros.",
- 	"overviewRuleWarning": "Visão geral da cor do marcador da régua para avisos.",
- 	"overviewRuleInfo": "Visão geral da cor do marcador da régua para informações."
-changed in both
-  base   100644 e8556cb38a817be3e7945f29a146ad1f6c32d208 i18n/ptb/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
-  our    100644 36476d7e95d8edb5c560727723e28a2d34bbaa84 i18n/ptb/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
-  their  100644 e0bb80689af14156b68f1ee7bcd51b1014db6321 i18n/ptb/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
-@@ -7,7 +7,11 @@
- 	"wordHighlight": "Cor de fundo de um símbolo durante acesso de leitura, como ao ler uma variável.",
- 	"wordHighlightStrong": "Cor de fundo de um símbolo durante acesso de escrita, como ao escrever uma variável.",
- 	"overviewRulerWordHighlightForeground": "Visão geral da cor do marcador da régua para destaques de símbolos.",
-+<<<<<<< .our
- 	"overviewRulerWordHighlightStrongForeground": "Visão geral da cor do marcador da régua para gravação de destaques de símbolos.",
- 	"wordHighlight.next.label": "Ir para o próximo símbolo de destaque",
- 	"wordHighlight.previous.label": "Ir para o símbolo de destaque anterior"
-+=======
-+	"overviewRulerWordHighlightStrongForeground": "Visão geral da cor do marcador da régua para gravação de destaques de símbolos."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 4cec19113d2174c75f5074f4aa78af1eacd5f45b i18n/ptb/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 a3aea9d9c8c0805d0052884c40ebb83b3447e311 i18n/ptb/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 c7feb1525e8245f67e2eff01a14b572d11710490 i18n/ptb/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,9 +10,12 @@
- 	"diff": "Comparar dois arquivos entre si.",
- 	"add": "Adicione pasta(s) para a última janela ativa.",
- 	"goto": "Abra um arquivo no caminho sobre a linha especificada e a posição do caractere.",
-+<<<<<<< .our
- 	"newWindow": "Obriga a abrir uma nova janela.",
- 	"reuseWindow": "Obriga a abrir um arquivo ou pasta na última janela ativa.",
- 	"wait": "Espere pelos arquivos a serem fechados antes de retornar.",
-+=======
-+>>>>>>> .their
- 	"locale": "Para localização utilize (ex. en-US ou zh-TW).",
- 	"userDataDir": "Especifica o diretório em que os dados do usuário são mantidos. Pode ser usado para abrir várias instâncias distintas do Code.",
- 	"version": "Versão de impressão",
-added in both
-  our    100644 16386f1dd268bd0bb266aee8f218c5206c2a96b6 i18n/ptb/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
-  their  100644 6e7de5809be0f6c19164dc21367ff7cb035b77ae i18n/ptb/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"contributes.color": "Contribui com a extensão de cores temáticas definidas",
- 	"contributes.color.id": "O identificador da cor temática",
- 	"contributes.color.id.format": "Identificadores devem estar no formato aa [.bb] *",
-changed in both
-  base   100644 e692515c18674711ac97ac6d68fecd6e49b0e580 i18n/ptb/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 260c1b4a3e4eca5d178e7a38ec6a34692e2a3d10 i18n/ptb/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 2c5e3a22276c4729387d38f962762ff7f4207a98 i18n/ptb/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -88,6 +88,11 @@
- 	"overviewRulerCurrentContentForeground": "Cor de fundo de régua de visuaização atual em conflito de mesclagem em linha.",
- 	"overviewRulerIncomingContentForeground": "Cor de fundo de régua de visuaização de entrada em conflito de mesclagem em linha.",
- 	"overviewRulerCommonContentForeground": "Ancestral comum da cor da régua de visão geral para conflitos de mesclagem inline.",
-+<<<<<<< .our
- 	"overviewRulerFindMatchForeground": "Visão geral da cor do marcador da régua para correspondências de localização. A cor não deve ser opaca para não esconder decorações subjacentes.",
- 	"overviewRulerSelectionHighlightForeground": "Visão geral da cor do marcador da régua para destaques de seleção. A cor não deve ser opaca para não esconder decorações subjacentes."
-+=======
-+	"overviewRulerFindMatchForeground": "Visão geral da cor do marcador da régua para buscas correspondentes.",
-+	"overviewRulerSelectionHighlightForeground": "Visão geral da cor do marcador da régua para a seleção de destaques"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 3b72fc565ec39ced44fe79c59e381f2276a2933e i18n/ptb/src/vs/platform/workspaces/common/workspaces.i18n.json
-  their  100644 33e05e1228b72ddeeeaa9575a2414dd6371da37b i18n/ptb/src/vs/platform/workspaces/common/workspaces.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"codeWorkspace": "Área de Trabalho de Código",
- 	"untitledWorkspace": "Sem título (espaço de trabalho)",
- 	"workspaceNameVerbose": "{0} (Espaço de trabalho)",
-added in both
-  our    100644 890eb2c02400d59dcf311d99242d928a8e9c1681 i18n/ptb/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
-  their  100644 d521fce97ffbace1597ee213be97e4a2f5270150 i18n/ptb/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,4 +11,16 @@
- 	"failedDep1": "Extensão '{1}' falhou ao ativar. Motivo: a dependência '{0}' falhou ao ativar.",
- 	"failedDep2": "Extensão '{0}' falhou ao ativar. Motivo: mais de 10 níveis de dependências (provavelmente um círculo de dependência).",
- 	"activationError": "Ativação da extensão '{0}' falhou: {1}."
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"unknownDep": "Extensão '{1}' falhou ao ativar. Motivo: dependência desconhecida '{0}'.",
-+	"failedDep1": "Extensão '{1}' falhou ao ativar. Motivo: a dependência '{0}' falhou ao ativar.",
-+	"failedDep2": "Extensão '{0}' falhou ao ativar. Motivo: mais de 10 níveis de dependências (provavelmente um laço de dependência).",
-+	"activationError": "Ativação da extensão `{0}` falhou: {1}."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 cbebd215cb4c93e4b1a0312d3006895ddf5cceeb i18n/ptb/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 c0131be8c0f47591731287a576edb83735664081 i18n/ptb/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 64f25e297250cdd010c115f244039232f35442bc i18n/ptb/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -9,8 +9,20 @@
- 	"openFile": "Abrir arquivo...",
- 	"openFolder": "Abrir Pasta...",
- 	"openFileFolder": "Abrir...",
-+<<<<<<< .our
- 	"globalRemoveFolderFromWorkspace": "Remover pasta da área de trabalho",
- 	"saveWorkspaceAsAction": "Salvar o espaço de trabalho como...",
-+=======
-+	"addFolderToWorkspace": "Adicionar pasta ao espaço de trabalho...",
-+	"add": "&& Adicionar",
-+	"addFolderToWorkspaceTitle": "Adicionar pasta ao espaço de trabalho",
-+	"newWorkspace": "Novo espaço de trabalho...",
-+	"select": "&&Selecionar",
-+	"selectWorkspace": "Selecionar pastas para espaço de trabalho",
-+	"removeFolderFromWorkspace": "Remover pasta da área de trabalho",
-+	"saveWorkspaceAsAction": "Salvar o espaço de trabalho como...",
-+	"saveEmptyWorkspaceNotSupported": "Por favor, abra um espaço de trabalho antes de salvar.",
-+>>>>>>> .their
- 	"save": "&&Salvar",
- 	"saveWorkspace": "Salvar o espaço de trabalho",
- 	"openWorkspaceAction": "Abrir o Espaço de Trabalho...",
-changed in both
-  base   100644 dbfae18a9bfb0890fb2fcaca5452a3413885af20 i18n/ptb/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  our    100644 3991d555141b86ae4264c724195d522ff4374831 i18n/ptb/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  their  100644 e318ceb94340107000d8085957c3f6a049b60526 i18n/ptb/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"textEditor": "Editor de Texto",
- 	"textDiffEditor": "Editor de Diferentes Textos",
- 	"binaryDiffEditor": "Editor de Diferença Binária",
-changed in both
-  base   100644 fc5507b3a8c69a6ad7b93f066d2c1aa1327584a3 i18n/ptb/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 8f7c2c323736446313384ee58a6648f36e7ab418 i18n/ptb/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 1d6013b09e547710190bfcc10cc3c94d12fecf47 i18n/ptb/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-@@ -51,8 +51,12 @@
- 	"moveEditorLeft": "Mover o Editor para a Esquerda",
- 	"moveEditorRight": "Mover o Editor para a Direita",
- 	"moveEditorToPreviousGroup": "Mover o Editor para o Grupo Anterior",
-+<<<<<<< .our
- 	"moveEditorToNextGroup": "Mover o Editor para o Próximo Grupo",
- 	"moveEditorToFirstGroup": "Mover o Editor para o Primeiro Grupo",
- 	"moveEditorToSecondGroup": "Mover o Editor para o Segundo Grupo",
- 	"moveEditorToThirdGroup": "Mover o Editor para o Terceiro Grupo"
-+=======
-+	"moveEditorToNextGroup": "Mover o Editor para o Próximo Grupo"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c6a90d88542a6d9cf2ffee76cd9f9d1f75e2bda4 i18n/ptb/src/vs/workbench/browser/parts/editor/editorPart.i18n.json
-  our    100644 6717c3f4cdbc25783daf3ba5fa5c0d40c0306ba9 i18n/ptb/src/vs/workbench/browser/parts/editor/editorPart.i18n.json
-  their  100644 c4530706af986f0e75a4944c221bb0487fc5ea35 i18n/ptb/src/vs/workbench/browser/parts/editor/editorPart.i18n.json
-changed in both
-  base   100644 f07de1200735116cbfbd7d4b641e6f6e7cfc69a5 i18n/ptb/src/vs/workbench/common/theme.i18n.json
-  our    100644 431c9c090b931f212ddb987a19512fdc507d3bd6 i18n/ptb/src/vs/workbench/common/theme.i18n.json
-  their  100644 9ad896440c1880257476cecf5ddd4e923c8247e0 i18n/ptb/src/vs/workbench/common/theme.i18n.json
-@@ -11,8 +11,13 @@
- 	"tabHoverBackground": "Cor de fundo da guia ao passar o mouse. As guias são os contêineres para editores na área do editor. Várias guias podem ser abertas em um grupo de editor. Podem existir vários grupos de editor.",
- 	"tabUnfocusedHoverBackground": "Cor de fundo da guia em um grupo fora de foco ao passar o mouse. As guias são os contêineres para editores na área do editor. Várias guias podem ser abertas em um grupo de editor. Podem existir vários grupos de editor.",
- 	"tabBorder": "Borda para separar uma guia das outras. As guias são os recipientes para editores na área do editor. Várias guias podem ser abertas em um grupo de editores. Podem haver vários grupos de editor.",
-+<<<<<<< .our
- 	"tabHoverBorder": "Borda para destacar guias ao passar o mouse. As guias são os contêineres para editores na área do editor. Várias guias podem ser abertas em um grupo de editor. Podem existir vários grupos de editor.",
- 	"tabUnfocusedHoverBorder": "Borda para destacar guias em um grupo fora de foco ao passar o mouse. As guias são os contêineres para editores na área do editor. Várias guias podem ser abertas em um grupo de editor. Podem existir vários grupos de editor.",
-+=======
-+	"tabActiveBorder": "Borda para destacar guias ativas. As guias são os recipientes para editores na área do editor. Várias guias podem ser abertas em um grupo de editores. Podem haver vários grupos de editores.",
-+	"tabActiveUnfocusedBorder": "Borda para destacar guias ativas em um grupo fora de foco. As guias são os recipientes para editores na área do editor. Várias guias podem ser abertas em um grupo de editores. Podem haver vários grupos de editores.",
-+>>>>>>> .their
- 	"tabActiveForeground": "Cor de primeiro plano da guia ativa em um grupo ativo. As guias são os recipientes para editores na área do editor. Várias guias podem ser abertas em um grupo de editores. Podem haver vários grupos de editor.",
- 	"tabInactiveForeground": "Cor de primeiro plano da guia inativa em um grupo ativo. As guias são os recipientes para editores na área do editor. Várias guias podem ser abertas em um grupo de editores. Podem haver vários grupos de editor.",
- 	"tabUnfocusedActiveForeground": "Cor de primeiro plano da aba ativa em um grupo fora de foco. As guias são os recipientes para editores na área do editor. Várias guias podem ser abertas em um grupo de editores. Podem haver vários grupos de editores.",
-@@ -28,7 +33,10 @@
- 	"panelActiveTitleForeground": "Cor do título para o painel ativo. Os painéis são mostrados abaixo da área do editor e contém visualizações como saída e terminal integrado.",
- 	"panelInactiveTitleForeground": "Cor do título para o painel inativo. Os painéis são mostrados abaixo da área do editor e contém visualizações como saída e terminal integrado.",
- 	"panelActiveTitleBorder": "Cor da borda para o título do painel ativo. Os painéis são mostrados abaixo da área do editor e contém visualizações como saída e terminal integrado.",
-+<<<<<<< .our
- 	"panelDragAndDropBackground": "Cor de resposta ao arrastar e soltar itens de título de painel. A cor deve possuir transparência para que os registros no painel ainda possam brilhar através dela. Os painéis são exibidos abaixo da área do editor e contém visualizações como a saída e o terminal integrado.",
-+=======
-+>>>>>>> .their
- 	"statusBarForeground": "Cor de primeiro plano da barra de status quando um espaço de trabalho é aberto. A barra de status é mostrada na parte inferior da janela.",
- 	"statusBarNoFolderForeground": "Cor do primeiro plano da barra de status quando nenhuma pasta está aberta. A barra de status é mostrada na parte inferior da janela.",
- 	"statusBarBackground": "Cor de fundo da barra de status quando um espaço de trabalho é aberto. A barra de status é mostrada na parte inferior da janela.",
-changed in both
-  base   100644 3774fceeb1aff965cb6dbb13afd1bde83d5062df i18n/ptb/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 15dd21d37a31b843a88f5eb322486062a4b034bf i18n/ptb/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 187a9d8fc3eae22ff3b69b66f11cb96aa08e5455 i18n/ptb/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -45,8 +45,13 @@
- 	"windowConfigurationTitle": "Janela",
- 	"window.openFilesInNewWindow.on": "Arquivos serão abertos em uma nova janela",
- 	"window.openFilesInNewWindow.off": "Arquivos serão abertos em uma nova janela com a pasta de arquivos aberta ou com a última janela ativa.",
-+<<<<<<< .our
- 	"window.openFilesInNewWindow.defaultMac": "Arquivos serão abertos na janela com a pasta dos arquivos aberta ou a última janela ativa, a menos que tenha sido aberta pelo Dock ou pelo Finder",
- 	"window.openFilesInNewWindow.default": "Arquivos serão abertos em uma nova janela, a menos que escolhidos  dentro do aplicativo (por exemplo, através do menu de arquivo)",
-+=======
-+	"window.openFilesInNewWindow.default": "Os arquivos serão abertos na janela com a pasta de arquivos aberta ou a última janela ativa, a menos que seja aberto através do dock ou do finder (somente macOS)",
-+	"openFilesInNewWindow": "Controla se os arquivos devem ser abertos em uma nova janela\n- padrão: os arquivos serão abertos em uma nova janela com a pasta de arquivos aberta ou na última janela ativa, a menos que seja aberta através do dock ou do finder (apenas macOS)\n- ligado: os arquivos serão abertos em uma nova janela\n- desligado: os arquivos serão abertos em uma janela com a pasta de arquivos aberta ou a última janela ativa\nNote que ainda podem haver casos em que esta configuração será ignorada (por exemplo, quando estiver usando as opções de linha de comando -new-window ou -reuse-window).",
-+>>>>>>> .their
- 	"window.openFoldersInNewWindow.on": "As pastas serão abertas em uma nova janela",
- 	"window.openFoldersInNewWindow.off": "As pastas substituirão a última janela ativa",
- 	"window.openFoldersInNewWindow.default": "As pastas serão abertas em uma nova janela, a menos que uma pasta seja selecionada dentro do aplicativo (por exemplo, através do menu Arquivo)",
-changed in both
-  base   100644 0c1343293395cde68de4fa9640da919301a70508 i18n/ptb/src/vs/workbench/electron-browser/window.i18n.json
-  our    100644 676a0758385e0e41de8ed3de00c9c63bab54ddb0 i18n/ptb/src/vs/workbench/electron-browser/window.i18n.json
-  their  100644 8a03ff87882eac824ec8cf3828aed006658a3411 i18n/ptb/src/vs/workbench/electron-browser/window.i18n.json
-@@ -11,6 +11,10 @@
- 	"cut": "Recortar",
- 	"copy": "Copiar",
- 	"paste": "Colar",
-+<<<<<<< .our
- 	"selectAll": "Selecionar Tudo",
- 	"runningAsRoot": "Não é recomendado executar {0} como usuário root."
-+=======
-+	"selectAll": "Selecionar Tudo"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 c5b6891ce22a495b89538ce62f9b4b9e51bc7ba1 i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
-  their  100644 90537b96001f23d2c496266e6ddf2dd70e61a355 i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"toggleMinimap": "Visualização: Ativar/Desativar Minimapa"
- }
-\ No newline at end of file
-changed in both
-  base   100644 217bdf1c04ed596e34d8b147ac31780d067a4014 i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
-  our    100644 0919c0b47b392a6eca98a3718d8e99d34665e336 i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
-  their  100644 2b5be03ac198bdf25f4fcdfb6411e0e229bdfcc9 i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"toggleRenderControlCharacters": "Visualização: Ativar/Desativar Caracteres de Controle"
- }
-\ No newline at end of file
-changed in both
-  base   100644 453104fcc6d6055a9dc3a1cc3c09728931160aea i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
-  our    100644 c3d132e73dc73ed81b38939919897a328aef134f i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
-  their  100644 6ea4f0fca7273ed81b1c5a93f73be001e366f3cf i18n/ptb/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"toggleRenderWhitespace": "Visualização: Ativar/Desativar Renderização de Espaços em Branco"
- }
-\ No newline at end of file
-changed in both
-  base   100644 bedcd587a9b2fc116b78fc89d67ede2912e732a3 i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 7ae7f7f9b7576297c381fe538464cf315327a1cf i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 86218bade610653e73328dcbc1d30b32e880e176 i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -28,7 +28,12 @@
- 	"preLaunchTaskExitCode": "A preLaunchTask '{0}' encerrada com código de saída {1}.",
- 	"showErrors": "Mostrar erros",
- 	"noFolderWorkspaceDebugError": "O arquivo ativo não pode ser depurado. Certifique-se de que ele está salvo no disco e que tem uma extensão de depuração instalada para esse tipo de arquivo.",
-+<<<<<<< .our
- 	"cancel": "Cancelar",
- 	"DebugTaskNotFound": "Não foi possível encontrar a tarefa '{0}'.",
- 	"taskNotTracked": "A tarefa '{0}' não pode ser rastreada."
-+=======
-+	"NewLaunchConfig": "Por favor, configure o arquivo de configuração de lançamento para seu aplicativo. {0}",
-+	"DebugTaskNotFound": "Não foi possível encontrar o preLaunchTask '{0}'."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f0551dfe57b82daa311b6d59611c53805e552ce2 i18n/ptb/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  our    100644 18e436b0f51c078a33ff8a7ef00fa4c01b630818 i18n/ptb/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  their  100644 9ed5fc448b4fb1348564e34483ce65d5357c64ab i18n/ptb/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-@@ -8,6 +8,23 @@
- 	],
- 	"debugAdapterBinNotFound": "Executável do adaptador de depuração '{0}' não existe.",
- 	"debugAdapterCannotDetermineExecutable": "Não é possível determinar o executável para o adaptador de depuração '{0}'.",
-+<<<<<<< .our
- 	"unableToLaunchDebugAdapter": "Não é possível executar o adaptador de depuração de '{0}'.",
- 	"unableToLaunchDebugAdapterNoArgs": "Não é possível executar o adaptador de depuração."
-+=======
-+	"launch.config.comment1": "Use o IntelliSense para aprender sobre possíveis atributos.",
-+	"launch.config.comment2": "Passe o mouse para ver as descrições dos atributos existentes.",
-+	"launch.config.comment3": "Para obter mais informações, visite: {0}",
-+	"debugType": "Tipo de configuração.",
-+	"debugTypeNotRecognised": "O tipo de depuração não é reconhecido. Certifique-se de que você tem uma extensão de depuração correspondente instalada e que ela está habilitada.",
-+	"node2NotSupported": "\"node2\" não é mais suportado, use \"node\" ao invés e defina o atributo \"protocol\" para \"inspector\".",
-+	"debugName": "Nome da configuração; aparece no menu drop-down da configuração de lançamento. ",
-+	"debugRequest": "Requer o tipo de configuração. Pode ser \"launch\" ou \"attach\".",
-+	"debugServer": "Somente para o desenvolvimento de extensão de depuração: se uma porta é especificada, o VS Code tenta se conectar a um adaptador de depuração executando em modo de servidor",
-+	"debugPrelaunchTask": "Tarefa para ser executada antes de começar a sessão de depuração.",
-+	"debugWindowsConfiguration": "Atributos de configuração de lançamento específicos do Windows.",
-+	"debugOSXConfiguration": "Atributos de configuração de lançamento específicos do OS X.",
-+	"debugLinuxConfiguration": "Atributos de configuração de lançamento específicos do Linux.",
-+	"deprecatedVariables": "'env.', 'config.' e 'command.' foram descontinuados, use ' env:', ' config:' e ' command:' em vez disso."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 52a79e4fb67c1b083db7ed61159eb2ebf3f714b8 i18n/ptb/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 86302d2d21747526427ebd222c88651b42924842 i18n/ptb/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 fc84602f2f7f96783ebaeea6c96feb39003945f4 i18n/ptb/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-@@ -51,7 +51,14 @@
- 	"extensionInstalled": "A extensão recomendada já foi instalada",
- 	"showRecommendedKeymapExtensionsShort": "Mapeamentos de Teclado",
- 	"showLanguageExtensionsShort": "Extensões de Linguagem",
-+<<<<<<< .our
- 	"showAzureExtensionsShort": "Extensões do Azure",
-+=======
-+	"showAzureExtensions": "Mostrar extensões para o Azure",
-+	"showAzureExtensionsShort": "Extensões do Azure",
-+	"configureWorkspaceRecommendedExtensions": "Configurar Extensões Recomendadas (Espaço de Trabalho)",
-+	"ConfigureWorkspaceRecommendations.noWorkspace": "As recomendações somente estão disponíveis em uma pasta do espaço de trabalho.",
-+>>>>>>> .their
- 	"OpenExtensionsFile.failed": "Não foi possível criar o arquivo 'extensions.json' na pasta '.vscode' ({0}).",
- 	"configureWorkspaceRecommendedExtensions": "Configurar Extensões Recomendadas (Espaço de Trabalho)",
- 	"configureWorkspaceFolderRecommendedExtensions": "Configurar as Extensões Recomendadas (Pasta do Espaço de Trabalho)",
-changed in both
-  base   100644 1408051c27874850084c530cfe4d1b9d2d3f2318 i18n/ptb/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  our    100644 7c8e3e05c0a9eb5592fe968dcda8d51e0fbdf9f2 i18n/ptb/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  their  100644 99af18bd13ec9c6d8f6bf254b8710646e2a5a39f i18n/ptb/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-changed in both
-  base   100644 21cedf9a0bdac016d604986cacff2db197116c89 i18n/ptb/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 0e95d226253753e96cd8acccc486951d1a479af6 i18n/ptb/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 ee171bb57590bb8f746376b1424daefc314a89e0 i18n/ptb/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-@@ -40,14 +40,21 @@
- 	"dynamicHeight": "Controla se a altura da seção de editores abertos deve adaptar-se dinamicamente para o número de elementos ou não.",
- 	"autoReveal": "Controla se o explorador deve automaticamente revelar e selecionar arquivos ao abri-los.",
- 	"enableDragAndDrop": "Controla se o explorador deve permitir mover arquivos e pastas através de arrastar e soltar.",
-+<<<<<<< .our
- 	"confirmDragAndDrop": "Controla se o explorer deve pedir a confirmação ao mover arquivos ou pastas através de arrastar e soltar.",
- 	"confirmDelete": "Controla se o explorador deve pedir a confirmação ao excluir um arquivo por meio do lixo.",
-+=======
-+>>>>>>> .their
- 	"sortOrder.default": "Arquivos e pastas são classificadas por seus nomes, em ordem alfabética. Pastas são exibidas acima dos arquivos.",
- 	"sortOrder.mixed": "Arquivos e pastas são classificadas por seus nomes, em ordem alfabética. Arquivos são misturados com pastas.",
- 	"sortOrder.filesFirst": "Arquivos e pastas são classificadas por seus nomes, em ordem alfabética. Os arquivos são exibidos acima das pastas.",
- 	"sortOrder.type": "Arquivos e pastas são classificadas de acordo com suas extensões, em ordem alfabética. Pastas são exibidas acima dos arquivos.",
- 	"sortOrder.modified": "Arquivos e pastas são classificados de acordo com a data da última modificação, em ordem decrescente. Pastas são exibidas acima dos arquivos.",
-+<<<<<<< .our
- 	"sortOrder": "Controla a ordem de classificação dos arquivos e pastas no explorador. Além da classificação padrão, você pode definir a ordem para 'mixed' (arquivos e pastas misturados), 'type' (por tipo de arquivo), 'modified' (pela data da última modificação) ou 'filesFirst' (exibe os arquivos acima das pastas).",
- 	"explorer.decorations.colors": "Controles se as decorações de arquivo devem usar cores.",
- 	"explorer.decorations.badges": "Controles se as decorações de arquivo devem usar identificações."
-+=======
-+	"sortOrder": "Controla a ordem de classificação dos arquivos e pastas no explorador. Além da classificação padrão, você pode definir a ordem para 'mixed' (arquivos e pastas misturados), 'type' (por tipo de arquivo), 'modified' (pela data da última modificação) ou 'filesFirst' (exibe os arquivos acima das pastas)."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c670883e6ace859593adbbdcc59ba9a92ee84b33 i18n/ptb/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
-  our    100644 14fa61ade5ffc385d7f478a444faee19f67b3015 i18n/ptb/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
-  their  100644 d321f8c15cee3ee6042fb2c4e7ed978f1ed81dcd i18n/ptb/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
-@@ -10,9 +10,12 @@
- 	"dropFolder": "Você quer adicionar a pasta no espaço de trabalho?",
- 	"addFolders": "&& Adicionar pastas",
- 	"addFolder": "&& Adicionar pasta",
-+<<<<<<< .our
- 	"confirmMove": "Tem certeza que deseja mover '{0}'?",
- 	"doNotAskAgain": "Não me pergunte novamente",
- 	"moveButtonLabel": "&&Mover",
-+=======
-+>>>>>>> .their
- 	"confirmOverwriteMessage": "'{0}' já existe na pasta de destino. Deseja substituí-lo?",
- 	"irreversible": "Esta ação é irreversível!",
- 	"replaceButtonLabel": "&&Substituir"
-changed in both
-  base   100644 ccc14607143248b7d8b729eb6cc57076a87003b1 i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 d9d0d18805d748d7acf0de5557a30b4d38564784 i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 1b5d84180e9fcd1f62cac06acc0bed3c07410ca8 i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -13,5 +13,12 @@
- 	"newExtensionLabel": "Mostrar Extensão \"{0}\"",
- 	"editTtile": "Editar",
- 	"replaceDefaultValue": "Substituir nas Configurações",
-+<<<<<<< .our
- 	"copyDefaultValue": "Copiar para Configurações"
-+=======
-+	"copyDefaultValue": "Copiar para Configurações",
-+	"unsupportedPHPExecutablePathSetting": "Essa configuração deve ser uma Configuração de Usuário. Para configurar o PHP para o espaço de trabalho, abra um arquivo PHP e clique em 'Caminho do PHP' na barra de status.",
-+	"unsupportedWorkspaceSetting": "Essa configuração deve ser uma Configuração de Usuário.",
-+	"unsupportedWorkbenchSetting": "Essa configuração não pode ser aplicada agora. Será aplicada quando você abrir esta pasta diretamente."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 1cb8d16e56630516183e70df2c1e4f5186628f6e i18n/ptb/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-  our    100644 5474cd46ba9326cf0059b54331a096671f3b7ebc i18n/ptb/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-  their  100644 f9640a94d5a748dbe94b2860a093e0f3e827d3f1 i18n/ptb/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-changed in both
-  base   100644 1b5369ebeea17dc7f726d852b47c6e9a348ee9f5 i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  our    100644 5186f0aaae9ff54a935df56019817030e2dd75cc i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  their  100644 117ddc11b046f6840855512deb617c3c416d0435 i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-changed in both
-  base   100644 c14da8019782da84ab3799eb67145541a4fd6074 i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  our    100644 dfb6a734a7bd828d4b5aba3c014e4458b5423834 i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  their  100644 aec6c7e3ba5c906d67ffec031eb05b57e38ab85c i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -10,6 +11,11 @@
- 	"hideRepository": "Ocultar",
- 	"installAdditionalSCMProviders": "Instalar provedores de SCM adicionais...",
- 	"no open repo": "Não existem provedores de controle de código fonte ativos.",
-+=======
-+	"commitMessage": "Mensagem (tecle {0} para confirmar)",
-+	"installAdditionalSCMProviders": "Instalar provedores de SCM adicionais...",
-+	"no open repo": "Não há um controle de código fonte ativo",
-+>>>>>>> .their
- 	"source control": "Controle de código-fonte",
- 	"viewletTitle": "{0}: {1}",
- 	"hideView": "Ocultar"
-changed in both
-  base   100644 1d50c0f64642a61065bdca90b0fe65d05149a534 i18n/ptb/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  our    100644 b3ae68185057b9a794fe9aa335e3a999986822bc i18n/ptb/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  their  100644 104a0a6044a868d25cafefd1b2a63b8b00c2c952 i18n/ptb/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-added in both
-  our    100644 5c6e545f88c0d0b1cde8a03ea60cd1670c3d321c i18n/ptb/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
-  their  100644 c16ba8d7ba628542aa8706f9dd214818452d415f i18n/ptb/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"search.noWorkspaceWithName": "Nenhuma pasta no espaço de trabalho com o nome: {0}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 b0419122adc761f3882299853af36b720022bb65 i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 7cef3aef4bdefc5b4dd7af02da577643f2895b13 i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 05fdc6b53d9539ef0458a09b27b43dc5788943ec i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-changed in both
-  base   100644 cf733db0eb3ef8dee59377c2e53f92292f21fe83 i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 c3c8aff54991b1522f7c64ea3428a81e96b3045d i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 450948fc045dbcbb89ab88cf0b5aebf3ee831eb0 i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -16,9 +16,13 @@
- 	"manyProblems": "10K+",
- 	"runningTasks": "Mostrar tarefas em execução",
- 	"tasks": "Tarefas",
-+<<<<<<< .our
- 	"TaskSystem.noHotSwap": "Alterar o mecanismo de execução da tarefa com uma tarefa ativa executando exige que a janela seja recarregada",
- 	"reloadWindow": "Recarregar Janela",
- 	"TaskServer.folderIgnored": "A pasta {0} é ignorada desde que use a versão de tarefas 0.1.0",
-+=======
-+	"TaskSystem.noHotSwap": "Alterar o mecanismo de execução de tarefa exige que a Janela seja recarregada.",
-+>>>>>>> .their
- 	"TaskService.noBuildTask1": "Nenhuma tarefa de compilação definida. Marque uma tarefa com 'isBuildCommand' no arquivo tasks.json.",
- 	"TaskService.noBuildTask2": "Nenhuma tarefa de compilação definida. Marque uma tarefa como um grupo 'build' no arquivo tasks.json.",
- 	"TaskService.noTestTask1": "Nenhuma tarefa de teste definida. Marque uma tarefa com 'isTestCommand' no arquivo tasks.json.",
-changed in both
-  base   100644 ab03cd23ba1ebb6e8edbf35feca59b8c9fcbf9b1 i18n/ptb/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  our    100644 2b141ba44a31478d06d77d3a6f3e9f61f0211814 i18n/ptb/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  their  100644 88ceb3bb58560a0d4ed9a7299972ee85e335f1ca i18n/ptb/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-@@ -14,7 +14,10 @@
- 	"ConfigurationParser.invalidVaraibleReference": "Erro: ProblemMatcher inválido referência: {0}\n",
- 	"ConfigurationParser.noTaskType": "Erro: configuração de tarefas deve ter uma propriedade de tipo. A configuração será ignorada.\n{0}\n",
- 	"ConfigurationParser.noTypeDefinition": "Erro: não há nenhum tipo de tarefa registrado '{0}'. Você esqueceu de instalar uma extensão que fornece um provedor de tarefa correspondente?",
-+<<<<<<< .our
- 	"ConfigurationParser.missingRequiredProperty": "Erro: a configuração de tarefa '{0}' não possui a propriedade obrigatória '{1}'. A configuração de tarefa será ignorada.",
-+=======
-+>>>>>>> .their
- 	"ConfigurationParser.notCustom": "Erro: tarefas não está declarada como uma tarefa personalizada. A configuração será ignorada.\n{0}\n",
- 	"ConfigurationParser.noTaskName": "Erro: uma tarefa deve fornecer uma propriedade de rótulo. A tarefa será ignorada.\n{0}\n",
- 	"taskConfiguration.noCommandOrDependsOn": "Erro: a tarefa '{0}' não especifica nem um comando nem uma propriedade dependsOn. A tarefa será ignorada. Sua definição é: \n{1}",
-changed in both
-  base   100644 717cc9a63a034ef1575479cd235698faeffc60c3 i18n/ptb/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  our    100644 9784eaf453f8efba6eda265a5916dac07c098656 i18n/ptb/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  their  100644 44762cc06d3bdc23ae935236b1bcc7897234cd57 i18n/ptb/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -9,6 +10,11 @@
- 	"termEntryAriaLabel": "{0}, seletor de terminal",
- 	"termCreateEntryAriaLabel": "{0}, criar novo terminal",
- 	"workbench.action.terminal.newplus": "$(plus) criar novo Terminal Integrado",
-+=======
-+	"termEntryAriaLabel": "{0}, seletor de terminal",
-+	"termCreateEntryAriaLabel": "{0}, criar novo terminal",
-+	"'workbench.action.terminal.newplus": "$(plus) criar novo Terminal Integrado",
-+>>>>>>> .their
- 	"noTerminalsMatching": "Não há terminais correspondentes",
- 	"noTerminalsFound": "Não há terminais abertos"
- }
-\ No newline at end of file
-changed in both
-  base   100644 f46966dd22540bf3c8ae911a39bab3e7afceee0e i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 a7fcbfe8b12598411b8516f57bb30b642834b0bc i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 e247ed12a3dfcb681cd73cf9e672caccbf3c2536 i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-changed in both
-  base   100644 26e13bbf486aaaf40fef4db6513dd7f5bdbb0e2d i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 5844af8cc38149dcfa5ec9e4de0ec76188e00645 i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 8d7c9ccb011c0609619aef86e4c35cdb63956414 i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -51,5 +51,9 @@
- 	"workbench.action.terminal.hideFindWidget": "Ocultar Ferramenta de Pesquisa",
- 	"nextTerminalFindTerm": "Mostrar Próximo Termo de Busca",
- 	"previousTerminalFindTerm": "Mostrar Termo de Busca Anterior",
-+<<<<<<< .our
- 	"quickOpenTerm": "Alternar o Terminal Ativo"
-+=======
-+	"quickOpenTerm": "Terminal: Trocar o Terminal Ativo"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 2e52947094106a47827e813c95502aaec58526d9 i18n/ptb/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 da6e72a8a9829b085b81f04ac2a19502d69acb6e i18n/ptb/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 6a2cfcb15ab8c5a993db42865a78ed0364ac27f2 i18n/ptb/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -9,9 +9,17 @@
- 	"releaseNotes": "Notas da Versão",
- 	"showReleaseNotes": "Mostrar Notas da Versão",
- 	"read the release notes": "Bem-vindo a {0} v{1}! Gostaria de ler as Notas da Versão?",
-+<<<<<<< .our
- 	"licenseChanged": "Nossos termos de licença mudaram, por favor, clique [aqui]({0}) para revisá-los.",
- 	"neveragain": "Não mostrar novamente",
- 	"64bitisavailable": "{0} para Windows de 64 bits está agora disponível! Clique [aqui]({0}) para maiores informações.",
-+=======
-+	"licenseChanged": "Nossos termos de licença mudaram, favor revisá-los.",
-+	"license": "Ler Licença",
-+	"neveragain": "Nunca Mostrar Novamente",
-+	"64bitisavailable": "{0} para Windows de 64 bits está agora disponível!",
-+	"learn more": "Saiba Mais",
-+>>>>>>> .their
- 	"updateIsReady": "Nova atualização de {0} disponível.",
- 	"noUpdatesAvailable": "Não há nenhuma atualização disponível no momento.",
- 	"ok": "OK",
-changed in both
-  base   100644 c746085618b98f1b7e33558948673b90d05d4224 i18n/ptb/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  our    100644 39c7626f423b8e0d7573cd7480e81805ff8abbac i18n/ptb/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  their  100644 984a4a38e3fb0887eee4c1795aa87c69b33d7a1a i18n/ptb/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-@@ -35,6 +35,8 @@
- 	"welcomePage.showCommandsDescription": "Comandos de acesso rápido e de pesquisa da paleta de comando ({0})",
- 	"welcomePage.interfaceOverview": "Visão geral da interface",
- 	"welcomePage.interfaceOverviewDescription": "Obter uma sobreposição visual, destacando os principais componentes da interface do usuário",
-+	"welcomePage.deployToAzure": "Implantar aplicativos na nuvem",
-+	"welcomePage.deployToAzureDescription": "Aprenda como implantar seus aplicativos Node no Serviço de aplicativo do Azure",
- 	"welcomePage.interactivePlayground": "Playground interativo",
- 	"welcomePage.interactivePlaygroundDescription": "Experimente as características essenciais do editor em um curto passo-a-passo"
- }
-\ No newline at end of file
-changed in both
-  base   100644 fcdb7c13f8dad70240ddaaa322592dbdb3b07cd7 i18n/ptb/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-  our    100644 b9b063e271714da1c46ee031e2907977a8472ef6 i18n/ptb/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-  their  100644 5fe2d66f53ad29d9011204efd265153de1346634 i18n/ptb/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-changed in both
-  base   100644 9c7c7f681fa23f181619443d5c3391411eb1311b i18n/ptb/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
-  our    100644 e3b2a1ead2d1631f0bc8fbf25e71d3e6221551cb i18n/ptb/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
-  their  100644 26fbe210679b35634dad9270657c6c7a8c60f523 i18n/ptb/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"editorWalkThrough.title": "Playground Interativo",
- 	"editorWalkThrough": "Playground Interativo"
- }
-\ No newline at end of file
-changed in both
-  base   100644 7655014ffc05ddbcbcd88effd5fd3f271d1d36ed i18n/ptb/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  our    100644 2cd5ff9947ee5fd942a87c7aaf5c1c28e906b412 i18n/ptb/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  their  100644 c2ace7f2fb1cffa3515a1dd8387f5fe8d58d21ca i18n/ptb/src/vs/workbench/services/configuration/node/configuration.i18n.json
-@@ -9,6 +9,7 @@
- 	"scope.window.description": "Janela de configuração específica que pode ser configurada nas configurações do usuário ou área de trabalho.",
- 	"scope.resource.description": "Configuração específica do recurso que pode ser configurada nas configurações do usuário, espaço de trabalho ou pasta.",
- 	"scope.description": "Escopo em que a configuração é aplicável. Escopos disponíveis são 'janela' e 'recurso'.",
-+<<<<<<< .our
- 	"vscode.extension.contributes.configuration": "Contribui às definições de configuração.",
- 	"invalid.title": "'configuration.title' deve ser um string",
- 	"vscode.extension.contributes.defaultConfiguration": "Contribui às definições de configuração padrão do editor por linguagem.",
-@@ -21,4 +22,13 @@
- 	"workspaceConfig.settings.description": "Configurações de espaço de trabalho",
- 	"workspaceConfig.extensions.description": "Extensões para o espaço de trabalho",
- 	"unknownWorkspaceProperty": "Propriedade de configuração do espaço de trabalho desconhecida"
-+=======
-+	"invalid.type": "Se definido, 'configuration.type' deve ser do tipo 'object'",
-+	"invalid.title": "'configuration.title' deve ser um string",
-+	"vscode.extension.contributes.defaultConfiguration": "Contribui às definições de configuração padrão do editor por linguagem.",
-+	"invalid.properties": "'configuration.properties' deve ser um objeto",
-+	"workspaceConfig.folders.description": "Lista de pastas para ser carregada no espaço de trabalho. Deve ser um caminho para um arquivo. Por exemplo '/root/pastaA' ou './pastaA' para um caminho relativo que será determinado de acordo com o local do arquivo no espaço de trabalho.",
-+	"workspaceConfig.folder.description": "Um caminho para um arquivo. Por exemplo, '/root /pastaA' ou './pastaA' para um caminho relativo que será determinado de acordo com o local do arquivo no espaço de trabalho.",
-+	"workspaceConfig.settings.description": "Configurações de espaço de trabalho"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 21d2a812bb910811a7286d88c2b4dd0e7f27be2b i18n/ptb/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 68215b632ce90bcb7b46b0cefec04b9e2085133e i18n/ptb/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 22f5d117a1ad95ffde93d1a9b6688c08010f8ae8 i18n/ptb/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -9,6 +9,7 @@
- 	"openTasksConfiguration": "Abrir Configuração de Tarefas",
- 	"openLaunchConfiguration": "Abrir Configuração de Execução",
- 	"open": "Abrir configurações",
-+<<<<<<< .our
- 	"saveAndRetry": "Salvar e tentar novamente",
- 	"errorUnknownKey": "Não é possível gravar {0} porque {1} não é uma configuração registrada.",
- 	"errorInvalidFolderConfiguration": "Não é possível gravar as configurações da pasta porque {0} não suporta o escopo de recurso de pasta.",
-@@ -21,6 +22,19 @@
- 	"errorInvalidConfiguration": "Não é possível escrever nas configurações do usuário. Por favor, abra as configurações do usuário para corrigir erros/avisos e tente novamente.",
- 	"errorInvalidConfigurationWorkspace": "Não é possível escrever nas configurações do espaço de trabalho. Por favor, abra as configurações do espaço de trabalho para corrigir erros/avisos no arquivo e tente novamente.",
- 	"errorInvalidConfigurationFolder": "Não é possível escrever nas configurações de pasta. Por favor, abra as configurações da pasta '{0}' para corrigir erros/avisos e tente novamente.",
-+=======
-+	"close": "Fechar",
-+	"saveAndRetry": "Salvar as configurações e tentar novamente",
-+	"errorUnknownKey": "Não é possível gravar {0} porque {1} não é uma configuração registrada.",
-+	"errorInvalidFolderConfiguration": "Não é possível gravar as configurações da pasta porque {0} não suporta o escopo de recurso de pasta.",
-+	"errorInvalidUserTarget": "Não é possível gravar as configurações do usuário porque {0} não oferece suporte para o escopo global.",
-+	"errorInvalidFolderTarget": "Não é possível gravar as configurações da pasta porque nenhum recurso é fornecido.",
-+	"errorNoWorkspaceOpened": "Não é possível gravar {0} porque nenhum espaço de trabalho está aberto. Por favor, abra um espaço de trabalho primeiro e tente novamente.",
-+	"errorInvalidConfiguration": "Não é possível gravar em configurações. Por favor abra **User Settings** para corrigir erros/avisos no arquivo e tente novamente.",
-+	"errorInvalidConfigurationWorkspace": "Não é possível gravar em configurações. Por favor abra **Workspace Settings** para corrigir erros/avisos no arquivo e tente novamente.",
-+	"errorConfigurationFileDirty": "Não é possível gravar em configurações, porque o arquivo foi alterado. Por favor, salve o arquivo **User Settings** e tente novamente.",
-+	"errorConfigurationFileDirtyWorkspace": "Não é possível gravar em configurações, porque o arquivo foi alterado. Por favor, salve o arquivo **Workspace Settings** e tente novamente.",
-+>>>>>>> .their
- 	"userTarget": "Configurações de Usuário",
- 	"workspaceTarget": "Configurações de Espaço de Trabalho",
- 	"folderTarget": "Configurações de pasta"
-added in both
-  our    100644 3867f612998a644b48a555a286c10d0a1e0c7c4e i18n/ptb/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
-  their  100644 2c7759581728bf19a837b7df16e3f7e87a83938a i18n/ptb/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,5 +10,15 @@
- 	"extensionHostProcess.startupFailDebug": "O host de extensão não iniciou em 10 segundos, ele pode ser interrompido na primeira linha e precisa de um depurador para continuar.",
- 	"extensionHostProcess.startupFail": "Host de extensão não começou em 10 segundos, isso pode ser um problema.",
- 	"reloadWindow": "Recarregar Janela",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"extensionHostProcess.startupFailDebug": "O host de extensão não iniciou em 10 segundos, ele pode ser interrompido na primeira linha e precisa de um depurador para continuar.",
-+	"extensionHostProcess.startupFail": "Host de extensão não começou em 10 segundos, isso pode ser um problema.",
-+>>>>>>> .their
- 	"extensionHostProcess.error": "Erro do host de extensão: {0}"
- }
-\ No newline at end of file
-added in both
-  our    100644 0f83744e99a67184c8f95703bb0a2eba95e0da5b i18n/ptb/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
-  their  100644 18d7b3f26c89224006e2aff67b13f89a11715b3a i18n/ptb/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,5 +10,16 @@
- 	"jsonParseFail": "Falha ao analisar {0}: {1}.",
- 	"fileReadFail": "Não foi possível ler o arquivo {0}: {1}.",
- 	"jsonsParseReportErrors": "Falha ao analisar {0}: {1}.",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"jsonParseFail": "Falha ao analisar {0}: {1}.",
-+	"fileReadFail": "Não foi possível ler o arquivo {0}: {1}.",
-+	"jsonsParseFail": "Falha ao analisar {0} ou {1}: {2}.",
-+>>>>>>> .their
- 	"missingNLSKey": "Não foi possível encontrar a mensagem para a chave {0}."
- }
-\ No newline at end of file
-added in both
-  our    100644 f274e33cf84922e0339aca525f39cc7c82a4dddb i18n/ptb/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-  their  100644 8b5f44c434ac8660543099b0da488b2c56e97c86 i18n/ptb/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -13,4 +14,18 @@
- 	"extensionUnderDevelopment": "Carregando extensão de desenvolvimento em {0}",
- 	"extensionCache.invalid": "Extensões foram modificadas no disco. Por favor atualize a janela.",
- 	"reloadWindow": "Recarregar Janela"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"devTools": "Ferramentas do Desenvolvedor",
-+	"restart": "Reinicie o Host de extensão",
-+	"extensionHostProcess.crash": "Host de extensão foi encerrado inesperadamente.",
-+	"extensionHostProcess.unresponsiveCrash": "Host de extensão encerrado porque não foi responsivo.",
-+	"overwritingExtension": "Sobrescrevendo extensão {0} por {1}.",
-+	"extensionUnderDevelopment": "Carregando extensão de desenvolvimento em {0}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6db7d6aae514a031afce5ac346abfd84bb8ee1cc i18n/ptb/src/vs/workbench/services/progress/browser/progressService2.i18n.json
-  our    100644 10f4afca07b2689783c64b5945faa991675015a5 i18n/ptb/src/vs/workbench/services/progress/browser/progressService2.i18n.json
-  their  100644 dbcd7381ae2fcf0e7a8fc81ec166ed7112edca11 i18n/ptb/src/vs/workbench/services/progress/browser/progressService2.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -9,4 +10,8 @@
- 	"progress.subtitle": "{0} - {1}",
- 	"progress.title": "{0}: {1}",
- 	"cancel": "Cancelar"
-+=======
-+	"progress.subtitle": "{0} - {1}",
-+	"progress.title": "{0}: {1}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 984bc289c85c7159c5a92888875aa2808f535e25 i18n/ptb/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-  our    100644 76671d7901fb51d0dbe971e0457c29df593e36ed i18n/ptb/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-  their  100644 0f7a663082cff9c2128584ce7fdcc5e3b8780c85 i18n/ptb/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,12 @@
- 	"schema.token.fontStyle": "Estilo da fonte da regra: 'itálico', 'negrito', 'sublinhado' ou uma combinação. Cadeia de caracteres vazia desfaz configurações herdadas.",
- 	"schema.fontStyle.error": "O estilo da fonte deve ser 'itálico', 'negrito' ou 'sublinhado', uma combinação ou cadeia de caracteres vazia.",
- 	"schema.token.fontStyle.none": "Nenhum (limpar estilo herdado)",
-+=======
-+	"schema.token.settings": "Cores e estilos para o token.",
-+	"schema.token.foreground": "Cor do primeiro plano para o token.",
-+	"schema.token.fontStyle": "Estilo da fonte da regra: um estilo ou uma combinação de 'itálico', 'negrito' e 'sublinhado'",
-+	"schema.fontStyle.error": "O estilo da fonte deve ser uma combinação de 'itálico', 'negrito' e 'sublinhado'",
-+>>>>>>> .their
- 	"schema.properties.name": "Descrição da regra.",
- 	"schema.properties.scope": "Seletor de escopo que bate com esta regra.",
- 	"schema.tokenColors.path": "Caminho para um arquivo tmTheme (relativo ao arquivo atual).",
-changed in both
-  base   100644 4ef6944ba7352fc67dd17a3df214afe3efb0a2e7 i18n/ptb/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
-  our    100644 a5e50c537df24a63857eff8f17e764654462d242 i18n/ptb/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
-  their  100644 e7eaddc34c9c9b70406103012da717d0d348f993 i18n/ptb/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
-changed in both
-  base   100644 93ae243bc25c65afc52b145d1c00d787f53ab58c i18n/ptb/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 effaee068b393bc8fea42a2d38b17e32baca11e5 i18n/ptb/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 db248225f67f7a8baad9acb746f05875f7d5254d i18n/ptb/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-@@ -13,6 +13,12 @@
- 	"noIconThemeDesc": "Nenhum arquivo de ícones",
- 	"iconThemeError": "Arquivo de tema de ícones é desconhecido ou não está instalado.",
- 	"workbenchColors": "Substitui as cores do tema do tema de cores atualmente selecionado.",
-+<<<<<<< .our
-+=======
-+	"workbenchColors.deprecated": "A configuração não é mais experimental e foi renomeada para 'workbench.colorCustomizations'",
-+	"workbenchColors.deprecatedDescription": "Use 'workbench.colorCustomizations'",
-+	"editorColors": "Substitui as cores e o estilo da fonte do editor do tema de cores atualmente selecionado.",
-+>>>>>>> .their
- 	"editorColors.comments": "Define as cores e estilos para os comentários",
- 	"editorColors.strings": "Define as cores e estilos para textos literais.",
- 	"editorColors.keywords": "Define as cores e estilos para palavras-chave.",
-@@ -20,6 +26,10 @@
- 	"editorColors.types": "Define as cores e estilos para declarações de tipo e referências.",
- 	"editorColors.functions": "Define as cores e estilos para declarações de funções e referências.",
- 	"editorColors.variables": "Define as cores e estilos para declarações de variáveis e referências.",
-+<<<<<<< .our
- 	"editorColors.textMateRules": "Define as cores e estilos usando regras de temas textmate (avançado).",
- 	"editorColors": "Substitui as cores e o estilo da fonte do editor do tema de cores atualmente selecionado."
-+=======
-+	"editorColors.textMateRules": "Define as cores e estilos usando regras de temas textmate (avançado)."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a89665ea18b343ba43539c39f808a3a691a660dc i18n/rus/extensions/css/package.i18n.json
-  our    100644 f94884afe4ab08854717ecf9bfcce904b5da5115 i18n/rus/extensions/css/package.i18n.json
-  their  100644 b6410d713d7c1dc7e150334ef0a57144bf342ae1 i18n/rus/extensions/css/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,73 @@
- 	],
- 	"displayName": "Основы языка CSS",
- 	"description": "Предоставляет подсветку синтаксиса и выделение парных скобок в файлах CSS, LESS и SCSS."
-+=======
-+	"css.lint.argumentsInColorFunction.desc": "Недопустимое число параметров",
-+	"css.lint.boxModel.desc": "Не использовать ширину или высоту при использовании поля или границы",
-+	"css.lint.compatibleVendorPrefixes.desc": "При использовании зависящего от поставщика префикса также указывайте все остальные свойства поставщика",
-+	"css.lint.duplicateProperties.desc": "Не использовать дублирующиеся определения стилей",
-+	"css.lint.emptyRules.desc": "Не использовать пустые наборы правил",
-+	"css.lint.float.desc": "Старайтесь не использовать \"float\". Из-за элементов \"float\" работа кода CSS может легко нарушиться, если изменить один из аспектов разметки.",
-+	"css.lint.fontFaceProperties.desc": "Правило @font-face должно определять свойства src и font-family",
-+	"css.lint.hexColorLength.desc": "Цвета в шестнадцатеричном формате должны содержать три или шесть шестнадцатеричных чисел",
-+	"css.lint.idSelector.desc": "Селекторы не должны содержать идентификаторов, потому что эти правила слишком тесно связаны с HTML.",
-+	"css.lint.ieHack.desc": "Полезные советы для Internet Explorer требуются только при поддержке Internet Explorer 7 и более ранних версий",
-+	"css.lint.important.desc": "Старайтесь не использовать !important, так как это признак того, что весь код CSS стал неуправляемым и его надо переработать.",
-+	"css.lint.importStatement.desc": "Операторы импорта не загружаются параллельно",
-+	"css.lint.propertyIgnoredDueToDisplay.desc": "Свойство проигнорировано из-за значения свойства display. Например, при \"display: inline\" свойства width, height, margin-top, margin-bottom и float не работают",
-+	"css.lint.universalSelector.desc": "Универсальный селектор (*) работает медленно",
-+	"css.lint.unknownProperties.desc": "Неизвестное свойство.",
-+	"css.lint.unknownVendorSpecificProperties.desc": "Неизвестное свойство поставщика.",
-+	"css.lint.vendorPrefix.desc": "При использовании зависящего от поставщика префикса также указывайте стандартное свойство",
-+	"css.lint.zeroUnits.desc": "Для нуля не требуется единица измерения",
-+	"css.trace.server.desc": "Отслеживает обмен данными между VS Code и языковым сервером CSS.",
-+	"css.validate.title": "Управляет проверкой CSS и серьезностью проблем.",
-+	"css.validate.desc": "Включает или отключает все проверки",
-+	"less.lint.argumentsInColorFunction.desc": "Недопустимое число параметров",
-+	"less.lint.boxModel.desc": "Не использовать ширину или высоту при использовании поля или границы",
-+	"less.lint.compatibleVendorPrefixes.desc": "При использовании зависящего от поставщика префикса также указывайте все остальные свойства поставщика",
-+	"less.lint.duplicateProperties.desc": "Не использовать дублирующиеся определения стилей",
-+	"less.lint.emptyRules.desc": "Не использовать пустые наборы правил",
-+	"less.lint.float.desc": "Старайтесь не использовать \"float\". Из-за элементов \"float\" работа кода CSS может легко нарушиться, если изменить один из аспектов разметки.",
-+	"less.lint.fontFaceProperties.desc": "Правило @font-face должно определять свойства src и font-family",
-+	"less.lint.hexColorLength.desc": "Цвета в шестнадцатеричном формате должны содержать три или шесть шестнадцатеричных чисел",
-+	"less.lint.idSelector.desc": "Селекторы не должны содержать идентификаторов, потому что эти правила слишком тесно связаны с HTML.",
-+	"less.lint.ieHack.desc": "Полезные советы для Internet Explorer требуются только при поддержке Internet Explorer 7 и более ранних версий",
-+	"less.lint.important.desc": "Старайтесь не использовать !important, так как это признак того, что весь код CSS стал неуправляемым и его надо переработать.",
-+	"less.lint.importStatement.desc": "Операторы импорта не загружаются параллельно",
-+	"less.lint.propertyIgnoredDueToDisplay.desc": "Свойство проигнорировано из-за значения свойства display. Например, при \"display: inline\" свойства width, height, margin-top, margin-bottom и float не работают",
-+	"less.lint.universalSelector.desc": "Универсальный селектор (*) работает медленно",
-+	"less.lint.unknownProperties.desc": "Неизвестное свойство.",
-+	"less.lint.unknownVendorSpecificProperties.desc": "Неизвестное свойство поставщика.",
-+	"less.lint.vendorPrefix.desc": "При использовании зависящего от поставщика префикса также указывайте стандартное свойство",
-+	"less.lint.zeroUnits.desc": "Для нуля не требуется единица измерения",
-+	"less.validate.title": "Управляет проверкой LESS и уровнями серьезности проблем. ",
-+	"less.validate.desc": "Включает или отключает все проверки",
-+	"scss.lint.argumentsInColorFunction.desc": "Недопустимое число параметров",
-+	"scss.lint.boxModel.desc": "Не использовать ширину или высоту при использовании поля или границы",
-+	"scss.lint.compatibleVendorPrefixes.desc": "При использовании зависящего от поставщика префикса также указывайте все остальные свойства поставщика",
-+	"scss.lint.duplicateProperties.desc": "Не использовать дублирующиеся определения стилей",
-+	"scss.lint.emptyRules.desc": "Не использовать пустые наборы правил",
-+	"scss.lint.float.desc": "Старайтесь не использовать \"float\". Из-за элементов \"float\" работа кода CSS может легко нарушиться, если изменить один из аспектов разметки.",
-+	"scss.lint.fontFaceProperties.desc": "Правило @font-face должно определять свойства src и font-family",
-+	"scss.lint.hexColorLength.desc": "Цвета в шестнадцатеричном формате должны содержать три или шесть шестнадцатеричных чисел",
-+	"scss.lint.idSelector.desc": "Селекторы не должны содержать идентификаторов, потому что эти правила слишком тесно связаны с HTML.",
-+	"scss.lint.ieHack.desc": "Полезные советы для Internet Explorer требуются только при поддержке Internet Explorer 7 и более ранних версий",
-+	"scss.lint.important.desc": "Старайтесь не использовать !important, так как это признак того, что весь код CSS стал неуправляемым и его надо переработать.",
-+	"scss.lint.importStatement.desc": "Операторы импорта не загружаются параллельно",
-+	"scss.lint.propertyIgnoredDueToDisplay.desc": "Свойство проигнорировано из-за значения свойства display. Например, при \"display: inline\" свойства width, height, margin-top, margin-bottom и float не работают",
-+	"scss.lint.universalSelector.desc": "Универсальный селектор (*) работает медленно",
-+	"scss.lint.unknownProperties.desc": "Неизвестное свойство.",
-+	"scss.lint.unknownVendorSpecificProperties.desc": "Неизвестное свойство поставщика.",
-+	"scss.lint.vendorPrefix.desc": "При использовании зависящего от поставщика префикса также указывайте стандартное свойство",
-+	"scss.lint.zeroUnits.desc": "Для нуля не требуется единица измерения",
-+	"scss.validate.title": "Управляет проверкой SCSS и уровнями серьезности проблем.",
-+	"scss.validate.desc": "Включает или отключает все проверки",
-+	"less.colorDecorators.enable.desc": "Включает или отключает декораторы цвета.",
-+	"scss.colorDecorators.enable.desc": "Включает или отключает декораторы цвета.",
-+	"css.colorDecorators.enable.desc": "Включает или отключает декораторы цвета.",
-+	"css.colorDecorators.enable.deprecationMessage": "Параметр \"css.colorDecorators.enable\" устарел. Теперь вместо него используется параметр \"editor.colorDecorators\". ",
-+	"scss.colorDecorators.enable.deprecationMessage": "Параметр \"scss.colorDecorators.enable\" устарел. Теперь вместо него используется параметр \"editor.colorDecorators\". ",
-+	"less.colorDecorators.enable.deprecationMessage": "Параметр \"less.colorDecorators.enable\" устарел. Теперь вместо него используется параметр \"editor.colorDecorators\". "
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/extensions/emmet/package.i18n.json
-  our    100644 e8a08df3b0fb514f0bab0b0d555c900a23a3deca i18n/rus/extensions/emmet/package.i18n.json
-  their  100644 5df2b4e5410410e868deccdf035341027646408f i18n/rus/extensions/emmet/package.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,6 +8,14 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"description": "Поддержка Emmet для VS Code",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"command.wrapWithAbbreviation": "Перенести с сокращением",
- 	"command.wrapIndividualLinesWithAbbreviation": "Перенести отдельные строки с сокращением",
- 	"command.removeTag": "Удалить тег",
-@@ -37,7 +46,11 @@
- 	"emmetShowAbbreviationSuggestions": "Отображает возможные сокращения Emmet в виде предложений. Не применяется в таблицах стилей или если параметр emmet.showExpandedAbbreviation имеет значение \"never\".",
- 	"emmetIncludeLanguages": "Включает сокращения Emmet в языках, которые не поддерживаются по умолчанию. Здесь можно указать связь между не поддерживаемым и поддерживаемым языками.\nПример: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
- 	"emmetVariables": "Переменные, которые будут использоваться во фрагментах Emmet",
-+<<<<<<< .our
- 	"emmetTriggerExpansionOnTab": "Если этот параметр установлен, сокращения Emmet разворачиваются при нажатии клавиши TAB.",
-+=======
-+	"emmetTriggerExpansionOnTab": "Если включено, сокращения Emmet разворачиваются при нажатии клавиши TAB.",
-+>>>>>>> .their
- 	"emmetPreferences": "Настройки, которые используются для изменения поведения некоторых действий и сопоставителей Emmet.",
- 	"emmetPreferencesIntUnit": "Единица по умолчанию для целочисленных значений",
- 	"emmetPreferencesFloatUnit": "Единица по умолчанию для значений с плавающей запятой",
-@@ -47,6 +60,7 @@
- 	"emmetPreferencesCssBetween": "Символ, который будет помещен между свойством CSS и значением при развертывании сокращений CSS",
- 	"emmetPreferencesSassBetween": "Символ, который будет помещен между свойством CSS и значением при развертывании сокращений CSS в файлах Sass",
- 	"emmetPreferencesStylusBetween": "Символ, который будет помещен между свойством CSS и значением при развертывании сокращений CSS в файлах Stylus",
-+<<<<<<< .our
- 	"emmetShowSuggestionsAsSnippets": "Если этот параметр имеет значение true, предложения Emmet будут отображаться в виде фрагментов, которые можно упорядочить с помощью параметра editor.snippetSuggestions.",
- 	"emmetPreferencesBemElementSeparator": "Разделитель элемента для классов, используемый с фильтром BEM",
- 	"emmetPreferencesBemModifierSeparator": "Разделитель модификатора для классов, используемый с фильтром BEM",
-@@ -62,4 +76,7 @@
- 	"emmetPreferencesCssMsProperties": "Разделенный запятыми список свойств CSS, которые получают префикс разработчика \"ms\" при использовании в сокращениях Emmet, которые начинаются с \"-\". Чтобы префикс \"ms\" никогда не подставлялся, установите в качестве этого параметра пустое значение. ",
- 	"emmetPreferencesCssFuzzySearchMinScore": "Минимальное количество очков для нечеткого соответствия сокращения (от 0 до 1). При указании более низких значений возможно увеличение числа ложных срабатываний, при указании более высоких значений - уменьшение числа возможных соответствий.",
- 	"emmetOptimizeStylesheetParsing": "Если значение равно false, весь файл анализируется для определения, является ли текущая позиция допустимой для расширения сокращений Emmet. Когда присвоено значение true, только содержимое вокруг текущей позиции в файлах css/scss/less подвергается синтаксическому анализу."
-+=======
-+	"emmetShowSuggestionsAsSnippets": "Если этот параметр имеет значение true, предложения Emmet будут отображаться в виде фрагментов, которые можно упорядочить с помощью параметра editor.snippetSuggestions."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 cde1c4fa500de7444ac2dc9c80cf9300b2d22797 i18n/rus/extensions/extension-editing/out/extensionLinter.i18n.json
-  our    100644 da9798c314288e14352137e37ea372181d1b3348 i18n/rus/extensions/extension-editing/out/extensionLinter.i18n.json
-  their  100644 44fb90bb411cbf48ac7d42915161328d6533cc5f i18n/rus/extensions/extension-editing/out/extensionLinter.i18n.json
-changed in both
-  base   100644 69f509ebf704530d11470d7e6c90e045cf282447 i18n/rus/extensions/git/out/commands.i18n.json
-  our    100644 bdd7adadfadc50db48d014178fb19ce838d13900 i18n/rus/extensions/git/out/commands.i18n.json
-  their  100644 633cd74962be02f59e7e8d05a67c876df37b5dee i18n/rus/extensions/git/out/commands.i18n.json
-@@ -13,6 +13,7 @@
- 	"selectFolder": "Выбрать расположение репозитория",
- 	"cloning": "Клонирование репозитория Git \"{0}\"...",
- 	"proposeopen": "Вы хотите открыть клонированный репозиторий?",
-+<<<<<<< .our
- 	"openrepo": "Открыть репозиторий",
- 	"add": "Добавить в рабочую область",
- 	"proposeopen2": "Вы хотите открыть клонированный репозиторий, или добавить его в текущую рабочую область?",
-@@ -20,6 +21,10 @@
- 	"init repo": "Инициализировать репозиторий",
- 	"create repo": "Инициализировать репозиторий",
- 	"are you sure": "В '{0}' будет создан репозиторий Git. Вы действительно хотите продолжить?",
-+=======
-+	"path to init": "Путь к папке",
-+	"provide path": "Укажите путь к папке для инициализации репозитория Git",
-+>>>>>>> .their
- 	"HEAD not available": "Версия HEAD '{0}' недоступна.",
- 	"confirm stage files with merge conflicts": "Вы действительно хотите перенести в промежуточный этап файлы с конфликтами слияния ({0})?",
- 	"confirm stage file with merge conflicts": "Вы действительно хотите перенести в промежуточный этап файлы с конфликтами слияния ({0})?",
-@@ -43,10 +48,13 @@
- 	"confirm discard all 2": "{0}\n\nОтменить это действие нельзя, текущие изменения будут утеряны.",
- 	"yes discard tracked": "Отменить изменения для отслеживаемого файла",
- 	"yes discard tracked multiple": "Отменить изменения для отслеживаемых файлов ({0})",
-+<<<<<<< .our
- 	"unsaved files single": "Следующий файл не сохранен: {0}.\n\nВы хотите сохранить его перед тем как продолжить?",
- 	"unsaved files": "Некоторые файлы ({0}) не сохранены.\n\nВы хотите сохранить их перед тем как продолжить?",
- 	"save and commit": "Сохранить все и зафиксировать",
- 	"commit": "Все равно зафиксировать",
-+=======
-+>>>>>>> .their
- 	"no staged changes": "Отсутствуют промежуточные изменения для фиксации.\n\nВы хотите сделать все изменения промежуточными и зафиксировать их напрямую?",
- 	"always": "Всегда",
- 	"no changes": "Нет изменений для фиксации.",
-@@ -66,10 +74,14 @@
- 	"provide tag name": "Укажите имя тега",
- 	"tag message": "Сообщение",
- 	"provide tag message": "Укажите сообщение для аннотирования тега",
-+<<<<<<< .our
- 	"no remotes to fetch": "Для этого репозитория не настроены удаленные репозитории для получения данных.",
-+=======
-+>>>>>>> .their
- 	"no remotes to pull": "Для вашего репозитория не настроены удаленные репозитории для получения данных.",
- 	"pick remote pull repo": "Выберите удаленный компьютер, с которого следует загрузить ветвь",
- 	"no remotes to push": "Для вашего репозитория не настроены удаленные репозитории для отправки данных.",
-+	"push with tags success": "Файлы с тегами успешно отправлены.",
- 	"nobranch": "Извлеките ветвь, чтобы передать данные в удаленный репозиторий.",
- 	"confirm publish branch": "В ветви '{0}' отсутствует восходящая ветвь. Вы хотите опубликовать эту ветвь?",
- 	"ok": "ОК",
-changed in both
-  base   100644 c349ed7bde0be64d23a9781974d9df86e58f303c i18n/rus/extensions/git/out/model.i18n.json
-  our    100644 bfef65f2afd5ca19cda9c60e633fdd8046dda723 i18n/rus/extensions/git/out/model.i18n.json
-  their  100644 00d28dbb017d1c4007aeafc782bcbae26a4d5150 i18n/rus/extensions/git/out/model.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -7,6 +8,8 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"too many submodules": "В репозитории '{0}' есть подмодули ({1}), которые не будут открыты автоматически. Вы можете открыть каждый подмодуль вручную, открыв соответствующий файл.",
-+=======
-+>>>>>>> .their
- 	"no repositories": "Доступные репозитории отсутствуют",
- 	"pick repo": "Выберите репозиторий"
- }
-\ No newline at end of file
-added in both
-  our    100644 27ed60f95b9836baa733a4ef0f7b0bab94fe0664 i18n/rus/extensions/git/out/repository.i18n.json
-  their  100644 053f8f8b45f976cba881d4b207419680434e3ecb i18n/rus/extensions/git/out/repository.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"open": "Открыть",
- 	"index modified": "Индекс изменен",
- 	"modified": "Изменено",
-@@ -23,13 +32,20 @@
- 	"deleted by us": "Удалено нами",
- 	"both added": "Добавлено обеими сторонами",
- 	"both modified": "Изменено обеими сторонами",
-+<<<<<<< .our
- 	"commitMessage": "Сообщение (чтобы зафиксировать, нажмите кнопку {0})",
-+=======
-+>>>>>>> .their
- 	"commit": "Commit",
- 	"merge changes": "Объединить изменения",
- 	"staged changes": "Промежуточно сохраненные изменения",
- 	"changes": "Изменения",
-+<<<<<<< .our
- 	"commitMessageCountdown": "Осталось {0} знаков в текущей строке",
- 	"commitMessageWarning": "символов {0} над {1} в текущей строке",
-+=======
-+	"ok": "ОК",
-+>>>>>>> .their
- 	"neveragain": "Больше не показывать",
- 	"huge": "Репозиторий git в '{0}' имеет очень много активных изменений, только часть функций Git будет доступна."
- }
-\ No newline at end of file
-changed in both
-  base   100644 cfd880ed746fcc0eecf7e9745b25249aab1e673f i18n/rus/extensions/git/package.i18n.json
-  our    100644 f033330e3d5aad5041c41da260339bd159e31636 i18n/rus/extensions/git/package.i18n.json
-  their  100644 27170f9c192f1a1abe4fac22645b9f66e2201481 i18n/rus/extensions/git/package.i18n.json
-@@ -40,7 +40,10 @@
- 	"command.renameBranch": "Переименовать ветвь...",
- 	"command.merge": "Объединить ветвь...",
- 	"command.createTag": "Создать тег",
-+<<<<<<< .our
- 	"command.fetch": "Получить",
-+=======
-+>>>>>>> .their
- 	"command.pull": "Получить",
- 	"command.pullRebase": "Получить (переместить изменения из одной ветви в другую)",
- 	"command.pullFrom": "Загрузить с...",
-@@ -52,7 +55,10 @@
- 	"command.publish": "Опубликовать ветвь",
- 	"command.showOutput": "Показать выходные данные GIT",
- 	"command.ignore": "Добавить файл в .gitignore",
-+<<<<<<< .our
- 	"command.stashIncludeUntracked": "Спрятать (включить неотслеживаемые)",
-+=======
-+>>>>>>> .their
- 	"command.stash": "Спрятать",
- 	"command.stashPop": "Извлечь спрятанное",
- 	"command.stashPopLatest": "Извлечь последнее спрятанное",
-@@ -71,6 +77,7 @@
- 	"config.defaultCloneDirectory": "Расположение по умолчанию, в которое будет клонирован репозиторий Git",
- 	"config.enableSmartCommit": "Зафиксировать все изменения при отсутствии промежуточных изменений.",
- 	"config.enableCommitSigning": "Включает подписывание фиксации с GPG.",
-+<<<<<<< .our
- 	"config.discardAllScope": "Определяет, какие изменения отменяются с помощью команды \"Отменить все изменения\". При указании значения \"all\" отменяются все изменения, при указании значения \"tracked\" отменяются изменения только в отслеживаемых файлах, при указании значения \"prompt\" отображается окно подтверждения каждый раз при выполнении действия.",
- 	"config.decorations.enabled": "Управляет тем, используются ли цвета и эмблемы Git в проводнике и открытых представлениях редактора.",
- 	"config.promptToSaveFilesBeforeCommit": "Определяет, должен ли Git проверять несохраненные файлы перед фиксацией.",
-@@ -84,4 +91,7 @@
- 	"colors.ignored": "Цвет игнорируемых ресурсов.",
- 	"colors.conflict": "Цвет ресурсов с конфликтами.",
- 	"colors.submodule": "Цвет ресурсов подмодуля."
-+=======
-+	"config.discardAllScope": "Определяет, какие изменения отменяются с помощью команды \"Отменить все изменения\". При указании значения \"all\" отменяются все изменения, при указании значения \"tracked\" отменяются изменения только в отслеживаемых файлах, при указании значения \"prompt\" отображается окно подтверждения каждый раз при выполнении действия."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 70b47820fce3e98eafdc24ce2eba52b7e32a2e55 i18n/rus/extensions/html/package.i18n.json
-  our    100644 42837cfec9de872ae181ce411be0f2cebea5ef66 i18n/rus/extensions/html/package.i18n.json
-  their  100644 9600097ae322753e6b88427ab29efed6e8b4c61b i18n/rus/extensions/html/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,28 @@
- 	],
- 	"displayName": "Основы языка HTML",
- 	"description": "Обеспечивает подсветку синтаксиса, выделение парных скобок и сниппеты в HTML-файлах."
-+=======
-+	"html.format.enable.desc": "Включить/отключить модуль форматирования HTML по умолчанию",
-+	"html.format.wrapLineLength.desc": "Максимальное число символов на строку (0 — отключить).",
-+	"html.format.unformatted.desc": "Список тегов, которые не следует повторно форматировать, с разделителями-запятыми. Значение \"NULL\" по умолчанию означает все теги, перечисленные на странице https://www.w3.org/TR/html5/dom.html#phrasing-content.",
-+	"html.format.contentUnformatted.desc": "Разделенный запятыми список тегов, в которых формат содержимого не должен изменяться. Значение null задается по умолчанию для тега pre.",
-+	"html.format.indentInnerHtml.desc": "Отступ в разделах <head> и <body>.",
-+	"html.format.preserveNewLines.desc": "Следует ли сохранять разрывы строк перед элементами. Работает только перед элементами, а не внутри тегов или для текста.",
-+	"html.format.maxPreserveNewLines.desc": "Максимальное число разрывов строк для сохранения в блоке. Чтобы указать неограниченное число строк, используйте \"null\".",
-+	"html.format.indentHandlebars.desc": "Формат и отступ {{#foo}} и {{/foo}}.",
-+	"html.format.endWithNewline.desc": "Завершение символом новой строки.",
-+	"html.format.extraLiners.desc": "Список тегов с разделителями-запятыми и дополнительными новыми строками между ними. Значение \"null\" по умолчанию ставится для \"head, body, /html\".",
-+	"html.format.wrapAttributes.desc": "Перенос атрибутов.",
-+	"html.format.wrapAttributes.auto": "Перенос атрибутов только при превышении длины строки.",
-+	"html.format.wrapAttributes.force": "Перенос всех атрибутов, кроме первого.",
-+	"html.format.wrapAttributes.forcealign": "Перенос всех атрибутов, кроме первого, и сохранение выравнивания.",
-+	"html.format.wrapAttributes.forcemultiline": "Перенос всех атрибутов.",
-+	"html.suggest.angular1.desc": "Определяет, будет ли встроенная поддержка языка HTML предлагать теги и свойства Angular 1.",
-+	"html.suggest.ionic.desc": "Определяет, будет ли встроенная поддержка языка HTML предлагать теги, свойства и значения Ionic.",
-+	"html.suggest.html5.desc": "Определяет, будет ли встроенная поддержка языка HTML предлагать теги, свойства и значения HTML5.",
-+	"html.trace.server.desc": "Отслеживает обмен данными между VS Code и языковым сервером HTML. ",
-+	"html.validate.scripts": "Определяет, будет ли встроенная поддержка языка HTML проверять внедренные сценарии.",
-+	"html.validate.styles": "Определяет, будет ли встроенная поддержка языка HTML проверять внедренные стили.",
-+	"html.autoClosingTags": "Включить или отключить автоматическое закрытие тегов HTML. "
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 468445675ae932a5a746f51ef151ea95ab2e546e i18n/rus/extensions/json/package.i18n.json
-  our    100644 85f61bdfc1a6eb903ba45e2ec3c3cbf21f3a407c i18n/rus/extensions/json/package.i18n.json
-  their  100644 14f78a0ce8a8557bf1f60b066e9ee395cb5e4423 i18n/rus/extensions/json/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,15 @@
- 	],
- 	"displayName": "Основы языка JSON",
- 	"description": "Обеспечивает подсветку синтаксиса и выделение парных скобок в файлах JSON."
-+=======
-+	"json.schemas.desc": "Связь схем с JSON-файлами в текущем проекте",
-+	"json.schemas.url.desc": "URL-адрес схемы или относительный путь к ней в текущем каталоге",
-+	"json.schemas.fileMatch.desc": "Массив шаблонов файлов, с которым выполняется сравнение, при разрешении JSON-файлов в схемах.",
-+	"json.schemas.fileMatch.item.desc": "Шаблон файла, который может содержать \"*\" и с которым выполняется сравнение, при разрешении JSON-файлов в схемах.",
-+	"json.schemas.schema.desc": "Определение схемы для указанного URL-адреса. Схему необходимо указать только для того, чтобы не обращаться по URL-адресу схемы.",
-+	"json.format.enable.desc": "Включение или отключение модуля форматирования JSON по умолчанию (требуется перезагрузка)",
-+	"json.tracing.desc": "Отслеживает связь между VS Code и языковым сервером JSON.",
-+	"json.colorDecorators.enable.desc": "Включает или отключает декораторы цвета.",
-+	"json.colorDecorators.enable.deprecationMessage": "Параметр \"json.colorDecorators.enable\" устарел. Теперь вместо него используется параметр \"editor.colorDecorators\"."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 9dff589ebb976aaa3b243624b1ecd57c7c4f8860 i18n/rus/extensions/markdown/out/security.i18n.json
-  our    100644 e57fedc24d6225bfff89936b87ebe3ea901f606d i18n/rus/extensions/markdown/out/security.i18n.json
-  their  100644 11a39b993e2b7c6ebf242ff28a9f8f9a1800111a i18n/rus/extensions/markdown/out/security.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"strict.title": "Строгий",
- 	"strict.description": "Загружать только безопасное содержимое",
- 	"insecureContent.title": "Разрешить небезопасное содержимое",
-@@ -13,8 +16,11 @@
- 	"disable.title": "Отключить",
- 	"disable.description": "Разрешить все содержимое и выполнение сценариев. Не рекомендуется",
- 	"moreInfo.title": "Дополнительные сведения",
-+<<<<<<< .our
- 	"enableSecurityWarning.title": "Включить предварительный просмотр предупреждений системы безопасности в этой рабочей области",
- 	"disableSecurityWarning.title": "Отключить предварительный просмотр предупреждений системы безопасности в этой рабочей области",
- 	"toggleSecurityWarning.description": "Не влияет на уровень безопасности содержимого",
-+=======
-+>>>>>>> .their
- 	"preview.showPreviewSecuritySelector.title": "Установите параметры безопасности для предварительного просмотра Markdown в этой рабочей области"
- }
-\ No newline at end of file
-changed in both
-  base   100644 6ded2043a7d4d22aef02fbdc93a2946aa58540cf i18n/rus/extensions/markdown/package.i18n.json
-  our    100644 0c2058582128b872c53b8ed573aed483d30eb3c8 i18n/rus/extensions/markdown/package.i18n.json
-  their  100644 bf621b96f2e974f5dea48fb7b4780b481a2edcef i18n/rus/extensions/markdown/package.i18n.json
-@@ -27,6 +27,10 @@
- 	"markdown.styles.dec": "Список URL-адресов или локальных путей к таблицам стилей CSS, используемых из области предварительного просмотра файла Markdown. Относительные пути интерпретируются относительно папки, открытой в проводнике. Если папка не открыта, они интерпретируются относительно расположения файла Markdown. Все символы '\\' должны записываться в виде '\\\\'.",
- 	"markdown.showPreviewSecuritySelector.title": "Изменить параметры безопасности для предварительного просмотра",
- 	"markdown.trace.desc": "Включить ведение журнала отладки для расширения Markdown.",
-+<<<<<<< .our
- 	"markdown.preview.refresh.title": "Обновить область предварительного просмотра",
- 	"markdown.preview.toggleLock.title": "Включить/отключить блокировку области предварительного просмотра"
-+=======
-+	"markdown.refreshPreview.title": "Обновить предварительный просмотр"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 48afb646815e1ccf0052b9e63568107aef4dd3b9 i18n/rus/extensions/npm/package.i18n.json
-  our    100644 8d7baa6e0dc033bbe07eab95362f11ea8ace26f2 i18n/rus/extensions/npm/package.i18n.json
-  their  100644 f10d56b2585874f5dacc2666bc98465a6405aff1 i18n/rus/extensions/npm/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -23,4 +24,8 @@
- 	"command.debug": "Отладка",
- 	"command.openScript": "Открыть",
- 	"command.runInstall": "Запустить установку"
-+=======
-+	"config.npm.autoDetect": "Включает или отключает автоматическое определение сценариев npm. Значение по умолчанию — \"включено\".",
-+	"config.npm.runSilent": "Запускать команды npm с параметром `--silent`"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/extensions/typescript/out/features/taskProvider.i18n.json
-  our    100644 a641634e0773b483755ba4ae179e64a5b993d228 i18n/rus/extensions/typescript/out/features/taskProvider.i18n.json
-  their  100644 0bc8e72f9ce11014857cd5fce2bcecb8d48528de i18n/rus/extensions/typescript/out/features/taskProvider.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,14 @@
- 	],
- 	"buildTscLabel": "сборка – {0}",
- 	"buildAndWatchTscLabel": "отслеживание – {0}"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"buildAndWatchTscLabel": "отслеживание – {0}",
-+	"buildTscLabel": "сборка – {0}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 9e87774a838a3f8b65310ce043e5e28442df0a61 i18n/rus/extensions/typescript/out/utils/api.i18n.json
-  their  100644 1af9a8a041538f16b006541fc640da0a21e879a1 i18n/rus/extensions/typescript/out/utils/api.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"invalidVersion": "Недопустимая версия"
- }
-\ No newline at end of file
-changed in both
-  base   100644 d7e26443046888ccbbdd5f988247f46e9d3afd58 i18n/rus/extensions/typescript/out/utils/versionPicker.i18n.json
-  our    100644 f475eb8cead76d6eb0a4de4c3bedf0cdf92bc632 i18n/rus/extensions/typescript/out/utils/versionPicker.i18n.json
-  their  100644 e545c9ff4363ff6047b76e7fba51f286a90bb79e i18n/rus/extensions/typescript/out/utils/versionPicker.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"useVSCodeVersionOption": "Использовать версию VS Code",
- 	"useWorkspaceVersionOption": "Использовать версию рабочей области",
- 	"learnMore": "Дополнительные сведения",
-changed in both
-  base   100644 f97639bb41bbe17590924278b3b3306abe8ead17 i18n/rus/extensions/typescript/out/utils/versionProvider.i18n.json
-  our    100644 5de17783d5632e2f121020f42d89b31628f69d29 i18n/rus/extensions/typescript/out/utils/versionProvider.i18n.json
-  their  100644 5cc970d97265ec9ca62d2bf7a3773877a3c4f2f4 i18n/rus/extensions/typescript/out/utils/versionProvider.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"couldNotLoadTsVersion": "Не удалось загрузить версию TypeScript по этому пути",
- 	"noBundledServerFound": "Файл tsserver VSCode был удален другим приложением, например, в результате ошибочного срабатывания средства обнаружения вирусов. Переустановите VSCode."
- }
-\ No newline at end of file
-changed in both
-  base   100644 990537ef568d45c96d3427933bbbce91e976c01a i18n/rus/extensions/typescript/package.i18n.json
-  our    100644 f85ab4719ef4b9af38326543e2a0d45bbd38ba2c i18n/rus/extensions/typescript/package.i18n.json
-  their  100644 aeaeec49a6ac9fe8fb9c0f85406ff63e9842f54b i18n/rus/extensions/typescript/package.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/src/vs/code/electron-main/auth.i18n.json
-  our    100644 ba63a0fa3197bd99d8b447ee3e1c9f01d486efe3 i18n/rus/src/vs/code/electron-main/auth.i18n.json
-  their  100644 a419dfadc51880e12e441e87eedcd2b34636913a i18n/rus/src/vs/code/electron-main/auth.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"authRequire": "Требуется проверка подлинности прокси-сервера",
- 	"proxyauth": "Прокси-сервер {0} требует проверки подлинности."
- }
-\ No newline at end of file
-changed in both
-  base   100644 82539b857e7062cd899366b02610d2fcfdbad862 i18n/rus/src/vs/code/electron-main/menus.i18n.json
-  our    100644 6c6420ff3fff2721736f81d703d8eb2e0907f38c i18n/rus/src/vs/code/electron-main/menus.i18n.json
-  their  100644 696280aa197893411a88c4953e64e8afd329856e i18n/rus/src/vs/code/electron-main/menus.i18n.json
-@@ -24,12 +24,21 @@
- 	"miQuit": "Выйти из {0}",
- 	"miNewFile": "&&Новый файл",
- 	"miOpen": "Открыть...",
-+<<<<<<< .our
- 	"miOpenWorkspace": "Открыть рабочую &&область...",
- 	"miOpenFolder": "Открыть &&папку...",
- 	"miOpenFile": "&&Открыть файл...",
- 	"miOpenRecent": "Открыть &&последние",
- 	"miSaveWorkspaceAs": "Сохранить рабочую область как...",
- 	"miAddFolderToWorkspace": "Доб&&авить папку в рабочую область...",
-+=======
-+	"miOpenWorkspace": "&&Открыть рабочую область...",
-+	"miOpenFolder": "Открыть &&папку...",
-+	"miOpenFile": "&&Открыть файл...",
-+	"miOpenRecent": "Открыть &&последние",
-+	"miSaveWorkspaceAs": "&&Сохранить рабочую область как...",
-+	"miAddFolderToWorkspace": "&& Добавить папку в рабочую область...",
-+>>>>>>> .their
- 	"miSave": "Сохранить",
- 	"miSaveAs": "Сохранить &&как...",
- 	"miSaveAll": "Сохранить &&все",
-@@ -189,5 +198,11 @@
- 	"miDownloadingUpdate": "Скачивается обновление...",
- 	"miInstallUpdate": "Установить обновление...",
- 	"miInstallingUpdate": "Идет установка обновления...",
-+<<<<<<< .our
- 	"miRestartToUpdate": "Перезапустить программу для обновления..."
-+=======
-+	"miCheckForUpdates": "Проверить наличие обновлений...",
-+	"aboutDetail": "\nВерсия {0}\nФиксация {1}\nДата {2}\nОблочка {3}\nОтрисовщик {4}\nУзел {5}\nАрхитектура {6}",
-+	"okButton": "ОК"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 eefa41d8a329bf87d1e81bb78b002dc7cccbbe3b i18n/rus/src/vs/code/electron-main/windows.i18n.json
-  our    100644 d379d233127c99cdfb618689fe034d97e0544e27 i18n/rus/src/vs/code/electron-main/windows.i18n.json
-  their  100644 4241dda94d8d939a21a05bbe60db9a56ea71d78e i18n/rus/src/vs/code/electron-main/windows.i18n.json
-@@ -9,15 +9,30 @@
- 	"ok": "ОК",
- 	"pathNotExistTitle": "Путь не существует.",
- 	"pathNotExistDetail": "Путь \"{0}\" больше не существует на диске.",
-+<<<<<<< .our
- 	"reopen": "&&Открыть повторно",
- 	"wait": "&&Подождать",
- 	"close": "&&Закрыть",
-+=======
-+	"openWorkspace": "&&Открыть...",
-+	"openWorkspaceTitle": "Открыть рабочую область",
-+	"save": "Сохранить",
-+	"doNotSave": "&&Не сохранять",
-+	"cancel": "Отмена",
-+	"saveWorkspaceMessage": "Вы хотите сохранить конфигурацию рабочей области в файле?",
-+	"saveWorkspaceDetail": "Сохраните рабочую область, если хотите открыть ее позже.",
-+	"saveWorkspace": "Сохранить рабочую область",
-+	"reopen": "Открыть повторно",
-+	"wait": "Подождать",
-+	"close": "Закрыть",
-+>>>>>>> .their
- 	"appStalled": "Окно не отвечает",
- 	"appStalledDetail": "Вы можете повторно открыть окно, закрыть его или продолжить ожидание.",
- 	"appCrashed": "Сбой окна",
- 	"appCrashedDetail": "Приносим извинения за неудобство! Вы можете повторно открыть окно, чтобы продолжить работу с того места, на котором остановились.",
- 	"open": "Открыть",
- 	"openFolder": "Открыть папку",
-+<<<<<<< .our
- 	"openFile": "Открыть файл",
- 	"workspaceOpenedMessage": "Не удается сохранить рабочую область '{0}'",
- 	"workspaceOpenedDetail": "Эта рабочая область уже открыта в другом окне. Закройте это окно и повторите попытку.",
-@@ -29,4 +44,7 @@
- 	"saveWorkspaceMessage": "Вы хотите сохранить конфигурацию рабочей области в файле?",
- 	"saveWorkspaceDetail": "Сохраните рабочую область, если хотите открыть ее позже.",
- 	"saveWorkspace": "Сохранить рабочую область"
-+=======
-+	"openFile": "Открыть файл"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 56a590f35d91ee319c1d44673a7f103e2117f039 i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 66cf48db0f575d6b4f93e4e908a24029fed35a72 i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 c59c7e2d6cae9f8d2d86fb18a133583fe6a93a6c i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -26,11 +26,17 @@
- 	"detectIndentation": "При открытии файла editor.tabSize и editor.insertSpaces будут определяться на основе содержимого файла.",
- 	"roundedSelection": "Определяет, будут ли выделения иметь скругленные углы.",
- 	"scrollBeyondLastLine": "Определяет, будет ли содержимое редактора прокручиваться за последнюю строку.",
-+<<<<<<< .our
- 	"scrollBeyondLastColumn": "Управляет количеством дополнительных символов, на которое содержимое редактора будет прокручиваться по горизонтали.",
- 	"smoothScrolling": "Определяет, будет ли использоваться анимация при прокрутке содержимого редактора",
- 	"minimap.enabled": "Определяет, отображается ли мини-карта",
- 	"minimap.side": "Определяет, с какой стороны будет отображаться мини-карта.",
- 	"minimap.showSlider": "Определяет, будет ли автоматически скрываться ползунок мини-карты",
-+=======
-+	"smoothScrolling": "Определяет, будет ли использоваться анимация при прокрутке содержимого редактора",
-+	"minimap.enabled": "Определяет, отображается ли мини-карта",
-+	"minimap.showSlider": "Определяет, будет ли автоматически скрываться ползунок мини-карты. Возможные значения: 'always' (всегда) и 'mouseover' (при наведении курсора мыши)",
-+>>>>>>> .their
- 	"minimap.renderCharacters": "Отображает фактические символы в строке вместо цветных блоков.",
- 	"minimap.maxColumn": "Ограничивает ширину мини-карты для отображения числа столбцов не больше определенного.",
- 	"find.seedSearchStringFromSelection": "Определяет, можно ли передать строку поиска в мини-приложение поиска из текста, выделенного в редакторе",
-@@ -106,11 +112,14 @@
- 	"accessibilitySupport": "Определяет, следует ли запустить редактор в режиме оптимизации для средства чтения с экрана.",
- 	"links": "Определяет, должен ли редактор определять ссылки и делать их доступными для щелчка",
- 	"colorDecorators": "Определяет, должны ли в редакторе отображаться внутренние декораторы цвета и средство выбора цвета.",
-+<<<<<<< .our
- 	"codeActions": "Включает индикатор действия кода",
- 	"codeActionsOnSave.organizeImports": "Упорядочить импорты при сохранении?",
- 	"codeActionsOnSave": "Типы действий кода, которые будут выполнены при сохранении.",
- 	"codeActionsOnSaveTimeout": "Время ожидания для действий кода, которые будут выполнены при сохранении.",
- 	"selectionClipboard": "Контролирует, следует ли поддерживать первичный буфер обмена Linux.",
-+=======
-+>>>>>>> .their
- 	"sideBySide": "Определяет, как редактор несовпадений отображает отличия: рядом или в тексте.",
- 	"ignoreTrimWhitespace": "Определяет, должен ли редактор несовпадений трактовать несовпадения символов-разделителей как различия.",
- 	"largeFileOptimizations": "Специальная обработка для больших файлов с отключением некоторых функций, которые интенсивно используют память.",
-changed in both
-  base   100644 fbad34f6ea8f410e935de8d688a1f05f4e280eed i18n/rus/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 9d3bc679fc1f2c06c947cdc33c9616b8b522920c i18n/rus/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 6fb3e1373cebec97d19a232010186e697f9e0241 i18n/rus/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -28,12 +28,16 @@
- 	"errorBorder": "Цвет границ волнистой линии для выделения ошибок в редакторе.",
- 	"warningForeground": "Цвет волнистой линии для выделения предупреждений в редакторе.",
- 	"warningBorder": "Цвет границ волнистой линии для выделения предупреждений в редакторе.",
-+<<<<<<< .our
- 	"infoForeground": "Цвет волнистой линии для выделения информационных сообщений в редакторе.",
- 	"infoBorder": "Цвет границ волнистой линии для выделения информационных сообщений в редакторе. ",
- 	"hintForeground": "Цвет волнистой линии для выделения подсказок в редакторе.",
- 	"hintBorder": "Цвет границ волнистой линии для выделения подсказок в редакторе. ",
- 	"unnecessaryForeground": "Цвет переднего плана ненужного кода в редакторе.",
- 	"overviewRulerRangeHighlight": "Цвет метки линейки в окне просмотра для выделений диапазонов. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
-+=======
-+	"overviewRulerRangeHighlight": "Цвет метки линейки в окне просмотра для выделений диапазонов.",
-+>>>>>>> .their
- 	"overviewRuleError": "Цвет метки линейки в окне просмотра для ошибок.",
- 	"overviewRuleWarning": "Цвет метки линейки в окне просмотра для предупреждений.",
- 	"overviewRuleInfo": "Цвет метки линейки в окне просмотра для информационных сообщений."
-changed in both
-  base   100644 fbe127a6eb426f71c59661ec15b8664928a5673b i18n/rus/src/vs/editor/contrib/find/common/findController.i18n.json
-  our    100644 5c6f87afd29e3d4a26efcc3d50060548fd13d051 i18n/rus/src/vs/editor/contrib/find/common/findController.i18n.json
-  their  100644 5cbc15bce8a5b49ebd16d0dcc2664925a6a7e1ed i18n/rus/src/vs/editor/contrib/find/common/findController.i18n.json
-@@ -10,6 +10,15 @@
- 	"nextSelectionMatchFindAction": "Найти следующее выделение",
- 	"previousSelectionMatchFindAction": "Найти предыдущее выделение",
- 	"startReplace": "Заменить",
-+<<<<<<< .our
-+=======
-+	"addSelectionToNextFindMatch": "Добавить выделение в следующее найденное совпадение",
-+	"addSelectionToPreviousFindMatch": "Добавить выделенный фрагмент в предыдущее найденное совпадение",
-+	"moveSelectionToNextFindMatch": "Переместить последнее выделение в следующее найденное совпадение",
-+	"moveSelectionToPreviousFindMatch": "Переместить последний выделенный фрагмент в предыдущее найденное совпадение",
-+	"selectAllOccurrencesOfFindMatch": "Выбрать все вхождения найденных совпадений",
-+	"changeAll.label": "Изменить все вхождения",
-+>>>>>>> .their
- 	"showNextFindTermAction": "Показать следующий найденный термин",
- 	"showPreviousFindTermAction": "Показать предыдущий найденный термин"
- }
-\ No newline at end of file
-changed in both
-  base   100644 b025e34a7bd9f304f1a68bef530d34d41c198fb0 i18n/rus/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
-  our    100644 ab058cc24db7358f649c11408aac34dcd487cb98 i18n/rus/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
-  their  100644 94eb8720432d1797dcbda28d9e05a7df4e78fa33 i18n/rus/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
-@@ -7,7 +7,11 @@
- 	"wordHighlight": "Цвет фона символа при доступе на чтение, например считывании переменной.",
- 	"wordHighlightStrong": "Цвет фона символа при доступе на запись, например записи переменной.",
- 	"overviewRulerWordHighlightForeground": "Цвет метки линейки в окне просмотра для выделений символов.",
-+<<<<<<< .our
- 	"overviewRulerWordHighlightStrongForeground": "Цвет метки линейки в окне просмотра для выделений символов, доступных для записи. ",
- 	"wordHighlight.next.label": "Перейти к следующему выделению символов",
- 	"wordHighlight.previous.label": "Перейти к предыдущему выделению символов"
-+=======
-+	"overviewRulerWordHighlightStrongForeground": "Цвет метки линейки в окне просмотра для выделений символов, доступных для записи. "
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 962ca99076ba643588634a1c5c30c7dbdd05f1bd i18n/rus/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 60e5e887ae41d0c2770bdb1306a52fd5bbf7375a i18n/rus/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 0821eccbd295d0b592fb013eeb30cc1bb19db42c i18n/rus/src/vs/platform/environment/node/argv.i18n.json
-@@ -7,10 +7,19 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"gotoValidation": "Аргументы в режиме \"--goto\" должны быть в формате \"ФАЙЛ(:СТРОКА(:СИМВОЛ))\".",
-+<<<<<<< .our
- 	"diff": "Сравнение двух файлов друг с другом",
- 	"add": "Добавление папок в последнее активное окно.",
- 	"goto": "Открытие файла по указанному пути с выделением указанного символа в указанной строке.",
- 	"newWindow": "Принудительно открыть новое окно.",
-+=======
-+	"add": "Добавление папок в последнее активное окно.",
-+	"goto": "Открытие файла по указанному пути с выделением указанного символа в указанной строке.",
-+	"locale": "Языковой стандарт, который следует использовать (например, en-US или zh-TW).",
-+	"newWindow": "Принудительно запустить новый экземпляр Code.",
-+	"performance": "Запустите с включенной командой \"Developer: Startup Performance\".",
-+	"prof-startup": "Запустить профилировщик ЦП при запуске",
-+>>>>>>> .their
- 	"reuseWindow": "Принудительно открыть файл или папку в последнем активном окне.",
- 	"wait": "Дождаться закрытия файлов перед возвратом.",
- 	"locale": "Языковой стандарт, который следует использовать (например, en-US или zh-TW).",
-changed in both
-  base   100644 1281d5e53dc338f3eb64c0e6846ec51026e8873e i18n/rus/src/vs/platform/history/electron-main/historyMainService.i18n.json
-  our    100644 4930aa8449c8b9acfaa97602ebba3b187b1531b6 i18n/rus/src/vs/platform/history/electron-main/historyMainService.i18n.json
-  their  100644 891764b5aeeaed458c29eae9e33ce67394537f05 i18n/rus/src/vs/platform/history/electron-main/historyMainService.i18n.json
-added in both
-  our    100644 ce0c503ab7ee9f128d46cefefff7f6fecd14741c i18n/rus/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
-  their  100644 b29f1cb46abd4b86ec78b74aae4a6ce3d7838603 i18n/rus/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"contributes.color": "Добавляет цвета тем, определяемые расширением ",
- 	"contributes.color.id": "Идентификатор цвета темы",
- 	"contributes.color.id.format": "Идентификаторы необходимо указывать в форме aa [.bb]*",
-@@ -17,6 +26,10 @@
- 	"invalid.default.colorType": "{0} должен представлять собой значение цвета в шестнадцатеричном формате (#RRGGBB[AA] или #RGB[A]) или идентификатор цвета темы.",
- 	"invalid.id": "Параметр 'configuration.colors.id' должен быть указан и не может быть пустым",
- 	"invalid.id.format": "Параметр 'configuration.colors.id' должен следовать за word[.word]*",
-+<<<<<<< .our
- 	"invalid.description": "Параметр 'configuration.colors.description' должен быть указан и не может быть пустым",
-+=======
-+	"invalid.description": "Параметр 'configuration.colors.description' должен быть указан и не может быть пустым ",
-+>>>>>>> .their
- 	"invalid.defaults": "'configuration.colors.defaults' может быть указан и может содержать значения 'light', 'dark' и 'highContrast'"
- }
-\ No newline at end of file
-changed in both
-  base   100644 bf1ce6c7711be9d5f247d285debcab01f8d5500a i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 a203da5726ce360e6e4c7bd4be5cee05446e8ca5 i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 dbab65f5dc7a47a6a32a78e6b7917039e959f9cd i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -60,7 +60,11 @@
- 	"scrollbarShadow": "Цвет тени полосы прокрутки, которая свидетельствует о том, что содержимое прокручивается.",
- 	"scrollbarSliderBackground": "Цвет фона ползунка полосы прокрутки.",
- 	"scrollbarSliderHoverBackground": "Цвет фона ползунка полосы прокрутки при наведении курсора.",
-+<<<<<<< .our
- 	"scrollbarSliderActiveBackground": "Цвет фона ползунка полосы прокрутки при щелчке по нему.",
-+=======
-+	"scrollbarSliderActiveBackground": "Цвет фона активного ползунка полосы прокрутки.",
-+>>>>>>> .their
- 	"progressBarBackground": "Цвет фона индикатора выполнения, который может отображаться для длительных операций.",
- 	"editorBackground": "Цвет фона редактора.",
- 	"editorForeground": "Цвет переднего плана редактора по умолчанию.",
-@@ -96,6 +100,11 @@
- 	"overviewRulerCurrentContentForeground": "Цвет переднего плана линейки текущего окна во внутренних конфликтах слияния.",
- 	"overviewRulerIncomingContentForeground": "Цвет переднего плана линейки входящего окна во внутренних конфликтах слияния.",
- 	"overviewRulerCommonContentForeground": "Цвет переднего плана для обзорной линейки для общего предка во внутренних конфликтах слияния. ",
-+<<<<<<< .our
- 	"overviewRulerFindMatchForeground": "Цвет метки линейки в окне просмотра для результатов поиска. Цвет не должен был прозрачным, чтобы не перекрывать основные знаки отличия.",
- 	"overviewRulerSelectionHighlightForeground": "Цвет метки линейки в окне просмотра для выделения. Цвет не должен был прозрачным, чтобы не перекрывать основные знаки отличия."
-+=======
-+	"overviewRulerFindMatchForeground": "Цвет метки линейки в окне просмотра для результатов поиска.",
-+	"overviewRulerSelectionHighlightForeground": "Цвет метки линейки в окне просмотра для выделения."
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 4eb95a0c5431a4936cc5c736810c7891044557e7 i18n/rus/src/vs/platform/workspaces/common/workspaces.i18n.json
-  their  100644 08cd26e159a91992753561c94ff204fe0e57825e i18n/rus/src/vs/platform/workspaces/common/workspaces.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"codeWorkspace": "Рабочая область кода",
- 	"untitledWorkspace": "(Рабочая область) без названия",
- 	"workspaceNameVerbose": "{0} (рабочая область)",
-added in both
-  our    100644 bb59edd906fdcca5a249184a88d2e2d2c265da8d i18n/rus/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
-  their  100644 6dd5f17dccfc93ed6e224cb5d177bda18305f428 i18n/rus/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,4 +11,16 @@
- 	"failedDep1": "Не удалось активировать расширение \"{1}\". Причина: не удалось активировать зависимость \"{0}\".",
- 	"failedDep2": "Не удалось активировать расширение \"{0}\". Причина: более 10 уровней зависимостей (вероятна циклическая зависимость).",
- 	"activationError": "Не удалось активировать расширение '{0}': {1}."
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"unknownDep": "Не удалось активировать расширение \"{1}\". Причина: неизвестный зависимый компонент \"{0}\".",
-+	"failedDep1": "Не удалось активировать расширение \"{1}\". Причина: ошибка активации зависимого компонента \"{0}\".",
-+	"failedDep2": "Не удалось активировать расширение \"{0}\". Причина: более 10 уровней зависимостей (скорее всего, цикл зависимостей).",
-+	"activationError": "Ошибка активации расширения \"{0}\": {1}."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 77f0bdb5c2bde44276ea9217bd35729ef66c5a5a i18n/rus/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 c446918f7398d91df096414504ebb365f7b433fb i18n/rus/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 9c00cba356f9c3203fd678032bb176becf4367e9 i18n/rus/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -9,6 +9,7 @@
- 	"openFile": "Открыть файл...",
- 	"openFolder": "Открыть папку...",
- 	"openFileFolder": "Открыть...",
-+<<<<<<< .our
- 	"globalRemoveFolderFromWorkspace": "Удалить папку из рабочей области...",
- 	"saveWorkspaceAsAction": "Сохранить рабочую область как...",
- 	"save": "Сохранить",
-@@ -16,4 +17,19 @@
- 	"openWorkspaceAction": "Открыть рабочую область...",
- 	"openWorkspaceConfigFile": "Открыть файл конфигурации рабочей области",
- 	"duplicateWorkspaceInNewWindow": "Создать копию рабочей области в новом окне"
-+=======
-+	"addFolderToWorkspace": "Добавить папку в рабочую область...",
-+	"add": "&&Добавить",
-+	"addFolderToWorkspaceTitle": "Добавить папку в рабочую область",
-+	"newWorkspace": "Создать рабочую область...",
-+	"select": "&&Выбрать",
-+	"selectWorkspace": "Выбрать папки для рабочей области",
-+	"removeFolderFromWorkspace": "Удалить папку из рабочей области",
-+	"saveWorkspaceAsAction": "Сохранить рабочую область как...",
-+	"saveEmptyWorkspaceNotSupported": "Перед сохранением рабочей области откройте ее. ",
-+	"save": "Сохранить",
-+	"saveWorkspace": "Сохранить рабочую область",
-+	"openWorkspaceAction": "Открыть рабочую область...",
-+	"openWorkspaceConfigFile": "Открыть файл конфигурации рабочей области"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 38dfb4e1703c002ce8fb88bb74d065a5fa28b7cb i18n/rus/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 99aca234c7b93506a14c237c3960c0558fba20a4 i18n/rus/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 393b1e55fe555b5c3bccece2611e702147267e1a i18n/rus/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 1db923803c4019b36091d3b30508c7e3e28d1b49 i18n/rus/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-  our    100644 1ef0f05df26e85532ec4820bdf2161b011019703 i18n/rus/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-  their  100644 3a5b37bf67a56e9cc81dd211415ef10779a43773 i18n/rus/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,9 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"compositePart.hideSideBarLabel": "Скрыть боковую панель",
-+>>>>>>> .their
- 	"focusSideBar": "Перевести фокус на боковую панель",
- 	"viewCategory": "Просмотреть"
- }
-\ No newline at end of file
-changed in both
-  base   100644 190db792a178b273e0982f348c9903874ff3ee15 i18n/rus/src/vs/workbench/common/theme.i18n.json
-  our    100644 1ea38452a6e8832b511f19d37e5007a3b201c44b i18n/rus/src/vs/workbench/common/theme.i18n.json
-  their  100644 3940c7d1e14855b285a0cb39a5be3e186ead3f33 i18n/rus/src/vs/workbench/common/theme.i18n.json
-@@ -11,12 +11,17 @@
- 	"tabHoverBackground": "Цвет фона вкладки при наведении. Вкладки — это контейнеры для редакторов в области редактора. В одной группе редакторов можно открыть несколько вкладок. Может присутствовать несколько групп редакторов.",
- 	"tabUnfocusedHoverBackground": "Цвет фона вкладки в группе, не имеющей фокуса, при наведении. Вкладки — это контейнеры для редакторов в области редактора. В одной группе редакторов можно открыть несколько вкладок. Также можно открыть несколько групп редакторов.",
- 	"tabBorder": "Граница для разделения вкладок. Вкладки — это контейнеры для редакторов в области редакторов. В одной группе редакторов можно открыть несколько вкладок. Может быть несколько групп редакторов.",
-+<<<<<<< .our
- 	"tabActiveBorder": "Граница в нижней части активной вкладки. Вкладки — это контейнеры для редакторов в области редакторов. В одной группе редакторов можно открыть несколько вкладок. Также можно открыть несколько групп редакторов. ",
- 	"tabActiveBorderTop": "Граница в верхней части активной вкладки. Вкладки — это контейнеры для редакторов в области редакторов. В одной группе редакторов можно открыть несколько вкладок. Также можно открыть несколько групп редакторов. ",
- 	"tabActiveUnfocusedBorder": "Граница нижней части активной вкладки в группе, не имеющей фокуса. Вкладки — это контейнеры для редакторов в области редакторов. В одной группе редакторов можно открыть несколько вкладок. Также можно открыть несколько групп редакторов.",
- 	"tabActiveUnfocusedBorderTop": "Граница верхней части активной вкладки в группе, не имеющей фокуса. Вкладки — это контейнеры для редакторов в области редакторов. В одной группе редакторов можно открыть несколько вкладок. Также можно открыть несколько групп редакторов.",
- 	"tabHoverBorder": "Граница для выделения вкладок при наведении курсора. Вкладки — это контейнеры для редакторов в области редакторов. В одной группе редакторов можно открыть несколько вкладок. Также можно открыть несколько групп редакторов. ",
- 	"tabUnfocusedHoverBorder": "Граница для выделения вкладок в группе, не имеющей фокуса, при наведении. Вкладки — это контейнеры для редакторов в области редакторов. В одной группе редакторов можно открыть несколько вкладок. Также можно открыть несколько групп редакторов.",
-+=======
-+	"tabActiveBorder": "Граница для выделения активных вкладок. Вкладки — это контейнеры для редакторов в области редакторов. В одной группе редакторов можно открыть несколько вкладок. Также можно открыть несколько групп редакторов. ",
-+	"tabActiveUnfocusedBorder": "Граница для выделения активных вкладок в группе, не имеющей фокуса. Вкладки — это контейнеры для редакторов в области редакторов. В одной группе редакторов можно открыть несколько вкладок. Также можно открыть несколько групп редакторов.",
-+>>>>>>> .their
- 	"tabActiveForeground": "Цвет переднего плана активной вкладки в активной группе. Вкладки — это контейнеры для редакторов в области редактора. В одной группе редакторов можно открыть несколько вкладок. Может присутствовать несколько групп редакторов.",
- 	"tabInactiveForeground": "Цвет переднего плана неактивной вкладки в активной группе. Вкладки — это контейнеры для редакторов в области редактора. В одной группе редакторов можно открыть несколько вкладок. Может присутствовать несколько групп редакторов.",
- 	"tabUnfocusedActiveForeground": "Цвет переднего плана активной вкладки в группе,  не имеющей фокуса. Вкладки — это контейнеры для редакторов в области редактора. В одной группе редакторов можно открыть несколько вкладок. Также можно открыть несколько групп редакторов.",
-@@ -32,7 +37,10 @@
- 	"panelActiveTitleForeground": "Цвет заголовка для активной панели. Панели отображаются под областью редактора и содержат такие представления, как окно вывода и встроенный терминал.",
- 	"panelInactiveTitleForeground": "Цвет заголовка для неактивной панели. Панели отображаются под областью редактора и содержат такие представления, как окно вывода и встроенный терминал.",
- 	"panelActiveTitleBorder": "Цвет границ для заголовка активной панели. Панели отображаются под областью редактора и содержат такие представления, как окно вывода и встроенный терминал.",
-+<<<<<<< .our
- 	"panelDragAndDropBackground": "Цвет элементов заголовка панели при перетаскивании. Этот цвет должен иметь прозрачность, чтобы содержимое панели оставалось видимым. Панели находятся под областью редактора и содержат такие представления, как выходные данные и встроенный терминал. ",
-+=======
-+>>>>>>> .their
- 	"statusBarForeground": "Цвет переднего плана строки состояния, когда открыта рабочая область. Строка состояния отображается в нижней части окна.",
- 	"statusBarNoFolderForeground": "Цвет переднего плана строки состояния, если папка не открыта. Строка состояния отображается в нижней части окна.",
- 	"statusBarBackground": "Цвет фона строки состояния, когда открыта рабочая область. Строка состояния отображается в нижней части окна.",
-@@ -61,6 +69,7 @@
- 	"titleBarActiveBackground": "Фон панели заголовка, если окно активно. Обратите внимание, что этот цвет сейчас поддерживается только в macOS.",
- 	"titleBarInactiveBackground": "Фон панели заголовка, если окно неактивно. Обратите внимание, что этот цвет сейчас поддерживается только в macOS.",
- 	"titleBarBorder": "Цвет границы панели заголовка. Обратите внимание, что этот цвет сейчас поддерживается только в macOS.",
-+<<<<<<< .our
- 	"notificationCenterBorder": "Цвет границы центра уведомлений. Уведомления появляются в нижней правой части окна. ",
- 	"notificationToastBorder": "Цвет границы всплывающего уведомления. Уведомления появляются в нижней правой части окна.",
- 	"notificationsForeground": "Цвет переднего плана уведомления. Уведомления появляются в нижней правой части окна.",
-@@ -69,4 +78,17 @@
- 	"notificationCenterHeaderForeground": "Цвет переднего плана заголовка в центре уведомлений. Уведомления появляются в нижней правой части окна. ",
- 	"notificationCenterHeaderBackground": "Цвет фона заголовка в центре уведомлений. Уведомления появляются в нижней правой части окна. ",
- 	"notificationsBorder": "Цвет границы уведомления, которая отделяет это уведомление от других в центре уведомлений. Уведомления появляются в нижней правой части окна. "
-+=======
-+	"notificationsForeground": "Цвет переднего плана для уведомлений. Уведомления отображаются в верхней части окна.",
-+	"notificationsBackground": "Цвет фона для уведомлений. Уведомления отображаются в верхней части окна.",
-+	"notificationsButtonBackground": "Цвет фона кнопки для уведомлений. Уведомления отображаются в верхней части окна.",
-+	"notificationsButtonHoverBackground": "Цвет фона кнопки для уведомлений при наведении курсора мыши. Уведомления отображаются в верхней части окна.",
-+	"notificationsButtonForeground": "Цвет переднего плана кнопки для уведомлений. Уведомления отображаются в верхней части окна.",
-+	"notificationsInfoBackground": "Цвет фона для информационных сообщений. Уведомления отображаются в верхней части окна. ",
-+	"notificationsInfoForeground": "Цвет переднего плана для информационных сообщений. Уведомления отображаются в верхней части окна. ",
-+	"notificationsWarningBackground": "Цвет фона для предупреждений. Уведомления отображаются в верхней части окна. ",
-+	"notificationsWarningForeground": "Цвет переднего плана для предупреждений. Уведомления отображаются в верхней части окна. ",
-+	"notificationsErrorBackground": "Цвет фона для ошибок. Уведомления отображаются в верхней части окна. ",
-+	"notificationsErrorForeground": "Цвет переднего плана для ошибок. Уведомления отображаются в верхней части окна. "
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 5140913c988c3e3d06041c5911ce99f91633104d i18n/rus/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 266dadc0ddcb2cfb8391eafba4890dbacea4172b i18n/rus/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 cb0068c301afb51cc6e4e61f00631f826a357508 i18n/rus/src/vs/workbench/electron-browser/actions.i18n.json
-changed in both
-  base   100644 73686d728483239ab4a6e5b0b5e4d3456d4319f0 i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 bdb5e10a72aa6a97a13c01acd6d5626456147e68 i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 130cb3a7c8f96cabb6494d8fbdb2767a6014e38f i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,6 +35,7 @@
- 	"panelDefaultLocation": "Определяет расположение панели по умолчанию. Она может находиться снизу или справа от рабочего места.",
- 	"statusBarVisibility": "Управляет видимостью строки состояния в нижней части рабочего места.",
- 	"activityBarVisibility": "Управляет видимостью панели действий на рабочем месте.",
-+<<<<<<< .our
- 	"viewVisibility": "Управляет видимостью действий в заголовке представления. Действия в заголовке представления могут быть видимы всегда или видимы только тогда, когда представление получает фокус или на него наводится курсор мыши.",
- 	"fontAliasing": "Управляет методом сглаживания шрифтов в рабочей области.\n- default: субпиксельное сглаживание шрифтов; позволит добиться максимальной четкости текста на большинстве дисплеев за исключением Retina\n- antialiased: сглаживание шрифтов на уровне пикселей, в отличие от субпиксельного сглаживания; позволит сделать шрифт более светлым в целом\n- none: сглаживание шрифтов отключено; текст будет отображаться с неровными острыми краями\n- auto: автоматически применяется режим \"default\" или \"antialiased\" в зависимости от разрешения дисплея (количество точек на дюйм).",
- 	"workbench.fontAliasing.default": "Субпиксельное сглаживание шрифтов; позволит добиться максимальной четкости текста на большинстве дисплеев за исключением Retina.",
-@@ -43,6 +44,15 @@
- 	"workbench.fontAliasing.auto": "Автоматически применяется режим \"default\" или \"antialiased\" в зависимости от разрешения дисплея (количество точек на дюйм).",
- 	"enableNaturalLanguageSettingsSearch": "Определяет, следует ли включить режим поиска естественного языка для параметров.",
- 	"windowConfigurationTitle": "Окно",
-+=======
-+	"closeOnFileDelete": "Определяет, следует ли автоматически закрывать редакторы, когда отображаемый в них файл удален или переименован другим процессом. При отключении этой функции редактор остается открытым в качестве черновика. Обратите внимание, что при удалении из приложения редактор закрывается всегда и что файлы черновиков никогда не закрываются для сохранения данных.",
-+	"fontAliasing": "Управляет методом сглаживания шрифтов в рабочей области.-по умолчанию: субпиксельное сглаживание шрифтов; позволит добиться максимальной четкости текста на большинстве дисплеев за исключением Retina - сглаживание: сглаживание шрифтов на уровне пикселей, в отличие от субпиксельного сглаживания; позволит сделать шрифт более светлым в целом - нет: сглаживание шрифтов отключено; текст будет отображаться с неровными острыми краями ",
-+	"workbench.fontAliasing.default": "Субпиксельное сглаживание шрифтов; позволит добиться максимальной четкости текста на большинстве дисплеев за исключением Retina.",
-+	"workbench.fontAliasing.antialiased": "Сглаживание шрифтов на уровне пикселей, в отличие от субпиксельного сглаживания. Может сделать шрифт светлее в целом.",
-+	"workbench.fontAliasing.none": "Отключает сглаживание шрифтов; текст будет отображаться с неровными острыми краями.",
-+	"swipeToNavigate": "Переключайтесь между открытыми файлами, проводя по экрану по горизонтали тремя пальцами.",
-+	"workbenchConfigurationTitle": "Workbench",
-+>>>>>>> .their
- 	"window.openFilesInNewWindow.on": "Файлы будут открываться в новом окне.",
- 	"window.openFilesInNewWindow.off": "Файлы будут открываться в окне с открытой папкой файлов или последнем активном окне.",
- 	"window.openFilesInNewWindow.defaultMac": "Файлы будут открыты в новом окне с открытой папкой файлов или в последнем активном окне, если они не были открыты с помощью панели Dock или поиска",
-changed in both
-  base   100644 8b4be6fe00b637b36f63436ed5fc49c4885af9ca i18n/rus/src/vs/workbench/electron-browser/window.i18n.json
-  our    100644 1b50f4f1a795fd43ccff439303c3058ab0677b98 i18n/rus/src/vs/workbench/electron-browser/window.i18n.json
-  their  100644 dde4ab1d2283812746d30a9bf91dd484c0da8d0a i18n/rus/src/vs/workbench/electron-browser/window.i18n.json
-@@ -11,6 +11,10 @@
- 	"cut": "Вырезать",
- 	"copy": "Копировать",
- 	"paste": "Вставить",
-+<<<<<<< .our
- 	"selectAll": "Выбрать все",
- 	"runningAsRoot": "Не рекомендуется запускать {0} в качестве корневого пользователя."
-+=======
-+	"selectAll": "Выбрать все"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 6be7fe83a1dac75d7eeaf55b81f7c6552472232d i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
-  their  100644 0c3fb07d4ddc85ddbdf67745de261998ced2e00a i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"toggleMinimap": "Вид: переключить мини-карту"
- }
-\ No newline at end of file
-changed in both
-  base   100644 e6eb87730f7467aeed2a7101118a63c97dcd20ee i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
-  our    100644 90a64f813d22e02b8844dbec30f4a93e2f19bdd1 i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
-  their  100644 926bc748b56278164be555981c21ac51989bef83 i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"toggleRenderControlCharacters": "Вид: переключить управляющие символы"
- }
-\ No newline at end of file
-changed in both
-  base   100644 d3464613b1a8069ba0a2de030fbee9fcb6016357 i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
-  our    100644 4d54311b671f7aef88f7f9168d61146fa63ad05a i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
-  their  100644 2c3e4867a49e85ce4ee43005bc8d49a64d81f549 i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"toggleRenderWhitespace": "Вид: включить или отключить вывод пробелов"
- }
-\ No newline at end of file
-changed in both
-  base   100644 575548ac1c853eabb16aa0b05089b18cc1edfbc7 i18n/rus/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  our    100644 4f96620576f3a410b1ea446182daa43ce07b0b3e i18n/rus/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  their  100644 e0979b269531b647d6b48800a73958aaa8fd43a2 i18n/rus/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-changed in both
-  base   100644 bf63a86ed4abb041df809fc50fa111b16d1e62ee i18n/rus/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  our    100644 6c1558c003488082dde47699207223b28eebf91d i18n/rus/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  their  100644 775b1ec66d27642859880d78b67087a80e045c09 i18n/rus/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-changed in both
-  base   100644 109e9178c2dd038e4b1777560f4c2a707d9c61b2 i18n/rus/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  our    100644 4d4a7ed83f0f21185a7b07658c2021e06bcfa0df i18n/rus/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  their  100644 fc11e0ac507bdb257e9bbf199a038ba669637838 i18n/rus/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-@@ -8,6 +8,23 @@
- 	],
- 	"debugAdapterBinNotFound": "Исполняемый файл адаптера отладки \"{0}\" не существует.",
- 	"debugAdapterCannotDetermineExecutable": "Невозможно определить исполняемый файл для адаптера отладки \"{0}\".",
-+<<<<<<< .our
- 	"unableToLaunchDebugAdapter": "Не удается запустить адаптер отладки из \"{0}\".",
- 	"unableToLaunchDebugAdapterNoArgs": "Не удается запустить адаптер отладки."
-+=======
-+	"launch.config.comment1": "Используйте IntelliSense, чтобы узнать о возможных атрибутах.",
-+	"launch.config.comment2": "Наведите указатель мыши, чтобы просмотреть описания существующих атрибутов.",
-+	"launch.config.comment3": "Для получения дополнительной информации посетите: {0}",
-+	"debugType": "Тип конфигурации.",
-+	"debugTypeNotRecognised": "Не удается распознать тип отладки. Убедитесь, что соответствующее расширение отладки установлено и включено.",
-+	"node2NotSupported": "Значение \"node2\" больше не поддерживается; используйте \"node\" и задайте для атрибута \"protocol\" значение \"inspector\".",
-+	"debugName": "Имя конфигурации; отображается в раскрывающемся меню конфигурации запуска.",
-+	"debugRequest": "Запросите тип конфигурации. Возможные типы: \"запуск\" и \"подключение\".",
-+	"debugServer": "Только для разработки расширений отладки: если указан порт, VS Code пытается подключиться к адаптеру отладки, запущенному в режиме сервера.",
-+	"debugPrelaunchTask": "Задача, выполняемая перед началом сеанса отладки.",
-+	"debugWindowsConfiguration": "Атрибуты конфигурации запуска для Windows.",
-+	"debugOSXConfiguration": "Атрибуты конфигурации запуска для OS X.",
-+	"debugLinuxConfiguration": "Атрибуты конфигурации запуска для Linux.",
-+	"deprecatedVariables": "\"env.\", \"config.\" и \"command.\" устарели, используйте \"env:\", \"config:\" и \"command:\"."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 5d0c8aac61038db995dad0114f7129732b73f64f i18n/rus/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  our    100644 aed4ddc96e0fa43f50c41bf2aa86012d93744f14 i18n/rus/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  their  100644 4671a2c1d2386d77c57263adca2af6874f936563 i18n/rus/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-changed in both
-  base   100644 b01a24938599c2f028d182bf6682c5bd1b46060c i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 bd475832dcfff4640327a5b72df263d4356ba205 i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 d49f2b5aee8c55e86f9ed152ae61342e3adcc6b8 i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-@@ -52,7 +52,14 @@
- 	"extensionInstalled": "Рекомендуемое расширение уже установлено",
- 	"showRecommendedKeymapExtensionsShort": "Раскладки клавиатуры",
- 	"showLanguageExtensionsShort": "Расширения языка",
-+<<<<<<< .our
- 	"showAzureExtensionsShort": "Расширения Azure",
-+=======
-+	"showAzureExtensions": "Показать расширения Azure",
-+	"showAzureExtensionsShort": "Расширения Azure",
-+	"configureWorkspaceRecommendedExtensions": "Настроить рекомендуемые расширения (рабочая область)",
-+	"ConfigureWorkspaceRecommendations.noWorkspace": "Рекомендации доступны только для папки рабочей области.",
-+>>>>>>> .their
- 	"OpenExtensionsFile.failed": "Не удается создать файл \"extensions.json\" в папке \".vscode\" ({0}).",
- 	"configureWorkspaceRecommendedExtensions": "Настроить рекомендуемые расширения (рабочая область)",
- 	"configureWorkspaceFolderRecommendedExtensions": "Настроить рекомендуемые расширения (папка рабочей области)",
-changed in both
-  base   100644 61dde35c09366008ad91ce2a0622f0c780fff1cc i18n/rus/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
-  our    100644 821930bfc8797aa66e392542a9a207e98e5802c7 i18n/rus/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
-  their  100644 9a2b3bf6390d9a58b7aa2db743c38027ac2c9eba i18n/rus/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
-@@ -4,7 +4,11 @@
-  *--------------------------------------------------------------------------------------------*/
- // Do not edit this file. It is machine generated.
- {
-+<<<<<<< .our
- 	"filesCategory": "Файл",
-+=======
-+	"filesCategory": "Файлы",
-+>>>>>>> .their
- 	"revealInSideBar": "Показать в боковой панели",
- 	"acceptLocalChanges": "Использовать изменения и перезаписать содержимое диска",
- 	"revertLocalChanges": "Отменить изменения и вернуться к содержимому на диске"
-changed in both
-  base   100644 eab30252ca80391e5d68c74f71fab27ffde31bab i18n/rus/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  our    100644 12bee9cd2a35e610f5f68160ed62a575d0331ad1 i18n/rus/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  their  100644 61840ca236b345954a4ee688d0af22859ec1fd62 i18n/rus/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-changed in both
-  base   100644 e3d342df049f3895908496eaa86ae4d4a8681a88 i18n/rus/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 a4725d2faef4b5a6c23ee7c2ecc46a16530b3341 i18n/rus/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 c22b02a06e4216bb48978c7dd2c764b631d3788d i18n/rus/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-@@ -40,14 +40,21 @@
- 	"dynamicHeight": "Определяет, будет ли высота раздела открытых редакторов динамически адаптироваться к количеству элементов.",
- 	"autoReveal": "Определяет, будет ли проводник автоматически отображать и выбирать файлы при их открытии.",
- 	"enableDragAndDrop": "Определяет, разрешено ли перемещение файлов и папок перетаскиванием в проводнике.",
-+<<<<<<< .our
- 	"confirmDragAndDrop": "Определяет, должно ли запрашиваться подтверждение при перемещении файлов и папок в проводнике.",
- 	"confirmDelete": "Определяет, должно ли запрашиваться подтверждение при удалении файла в корзину.",
-+=======
-+>>>>>>> .their
- 	"sortOrder.default": "Файлы и папки сортируются по именам в алфавитном порядке. Папки отображаются перед файлами.",
- 	"sortOrder.mixed": "Файлы и папки сортируются по именам в алфавитном порядке. Файлы чередуются с папками.",
- 	"sortOrder.filesFirst": "Файлы и папки сортируются по именам в алфавитном порядке. Файлы отображаются перед папками. ",
- 	"sortOrder.type": "Файлы и папки сортируются по расширениям в алфавитном порядке. Папки отображаются перед файлами.",
- 	"sortOrder.modified": "Файлы и папки сортируются по дате последнего изменения в порядке убывания. Папки отображаются перед файлами.",
-+<<<<<<< .our
- 	"sortOrder": "Управляет порядком сортировки файлов и папок в проводнике. Наряду с сортировкой по умолчанию можно установить следующие варианты сортировки: 'mixed' (файлы и папки сортируются вместе), 'type' (по типу файла), 'modified' (по дате последнего изменения) и 'filesFirst' (сортировать файлы перед папками).",
- 	"explorer.decorations.colors": "Определяет, следует ли использовать цвета в декораторах файла.",
- 	"explorer.decorations.badges": "Определяет, следует ли использовать эмблемы в декораторах файла. "
-+=======
-+	"sortOrder": "Управляет порядком сортировки файлов и папок в проводнике. Наряду с сортировкой по умолчанию можно установить следующие варианты сортировки: 'mixed' (файлы и папки сортируются вместе), 'type' (по типу файла), 'modified' (по дате последнего изменения) и 'filesFirst' (сортировать файлы перед папками)."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 990a276ce3588c94b2ee2f182b840bff2b59a7a4 i18n/rus/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-  our    100644 d5622eec39a12463acb3bf3b84df8406aca38203 i18n/rus/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-  their  100644 fa76089bc65010b8fe88410befe2fda5bdf8fe73 i18n/rus/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-@@ -12,5 +12,6 @@
- 	"genericSaveError": "Не удалось сохранить \"{0}\": {1}",
- 	"staleSaveError": "Не удалось сохранить \"{0}\": содержимое на диске более новое. Чтобы сравнить свою версию с версией на диске, нажмите **Сравнить**.",
- 	"compareChanges": "Сравнить",
--	"saveConflictDiffLabel": "{0} (на диске) ↔ {1} (в {2}) - Разрешить конфликт сохранения"
-+	"saveConflictDiffLabel": "{0} (на диске) ↔ {1} (в {2}) - Разрешить конфликт сохранения",
-+	"userGuide": "Используйте команды на панели инструментов редактора справа для **отмены** изменений или **перезаписи** содержимого на диске с учетом этих изменений"
- }
-\ No newline at end of file
-changed in both
-  base   100644 21887e5d78160fb06d07582535dc5a44c2cd4dfe i18n/rus/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
-  our    100644 564af43edc0da257fe695630dc1df6d6e72f1fba i18n/rus/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
-  their  100644 af609366aa583969d1ad0bf586a606628301a191 i18n/rus/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
-@@ -10,9 +10,12 @@
- 	"dropFolder": "Вы хотите добавить папку в рабочую область?",
- 	"addFolders": "&&Добавить папки",
- 	"addFolder": "&&Добавить папку",
-+<<<<<<< .our
- 	"confirmMove": "Вы действительно хотите переместить '{0}'?",
- 	"doNotAskAgain": "Больше не спрашивать",
- 	"moveButtonLabel": "&&Переместить",
-+=======
-+>>>>>>> .their
- 	"confirmOverwriteMessage": "{0} уже существует в целевой папке. Заменить его?",
- 	"irreversible": "Это действие необратимо!",
- 	"replaceButtonLabel": "&&Заменить"
-changed in both
-  base   100644 b82ad2f758e37c0128a69b3cf2c5361e8c02d5d2 i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  our    100644 73f5287abade720146d5385f06b5e028d614a772 i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  their  100644 e7a2b6b75eca5c1a0cc7a4c77dae281844647694 i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-@@ -14,6 +14,10 @@
- 	"openGlobalKeybindingsFile": "Открыть файл сочетаний клавиш",
- 	"openWorkspaceSettings": "Открыть параметры рабочей области",
- 	"openFolderSettings": "Открыть параметры папок",
-+<<<<<<< .our
-+=======
-+	"pickFolder": "Выбрать папку",
-+>>>>>>> .their
- 	"configureLanguageBasedSettings": "Настроить параметры языка...",
- 	"languageDescriptionConfigured": "({0})",
- 	"pickLanguage": "Выбрать язык"
-changed in both
-  base   100644 dd141cde1c50dc2e173ef8968196f6047f99926b i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 b457921fc6fc12c765888c49560d62815333e020 i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 71bf804e80088112b8ebf6e5159414eafb073b11 i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -14,4 +15,19 @@
- 	"editTtile": "Изменить",
- 	"replaceDefaultValue": "Заменить в параметрах",
- 	"copyDefaultValue": "Копировать в параметры"
-+=======
-+	"emptyUserSettingsHeader": "Укажите параметры здесь, чтобы перезаписать параметры по умолчанию.",
-+	"errorInvalidConfiguration": "Не удается записать параметры. Устраните ошибки и предупреждения в файле и повторите попытку.",
-+	"emptyWorkspaceSettingsHeader": "Укажите параметры здесь, чтобы перезаписать параметры пользователей.",
-+	"emptyFolderSettingsHeader": "Укажите параметры папок здесь, чтобы перезаписать параметры рабочих областей.",
-+	"defaultFolderSettingsTitle": "Параметры папок по умолчанию",
-+	"defaultSettingsTitle": "Параметры по умолчанию",
-+	"noSettingsFound": "Параметры не найдены.",
-+	"editTtile": "Изменить",
-+	"replaceDefaultValue": "Заменить в параметрах",
-+	"copyDefaultValue": "Копировать в параметры",
-+	"unsupportedPHPExecutablePathSetting": "Этот параметр должен быть параметром пользователя. Чтобы настроить в рабочей области PHP, откройте PHP-файл и щелкните \"Путь PHP\" в строке состояния.",
-+	"unsupportedWorkspaceSetting": "Этот параметр должен быть параметром пользователя.",
-+	"unsupportedWorkbenchSetting": "Сейчас применить этот параметр нельзя. Он будет применен, когда вы откроете эту папку напрямую."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d90a4e6c80b1c3c1b58bbb1b52526e80f0efe89f i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-  our    100644 7e702c2b5e93de8692ffe0243a9f0889bfcceb3c i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-  their  100644 870d134266523d084d65420727101c747d174919 i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 2639f8a70dc171eed499a24e68b57de977a1debe i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 fbe7b0fc59d0a09ac4f13a85af3e18479e146aa3 i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -12,4 +13,13 @@
- 	"userSettings": "Параметры пользователя",
- 	"workspaceSettings": "Параметры рабочей области",
- 	"folderSettings": "Параметры папок"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"folderSettingsDetails": "Параметры папок"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 155d4022b8eaad02d00cf55a647933cd0a9ed3ad i18n/rus/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  our    100644 a0702c99bc6adf515a02bc50655ac66d8b369690 i18n/rus/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  their  100644 cb591fb1f5f21ff745e3f7c6b8efd952ab2d7317 i18n/rus/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-@@ -8,5 +8,11 @@
- 	],
- 	"relaunchSettingMessage": "После изменения параметра необходима выполнить перезагрузку, чтобы изменения вступили в силу.",
- 	"relaunchSettingDetail": "Нажмите кнопку \"Перезагрузить\", чтобы перезагрузить {0} и включить параметр.",
-+<<<<<<< .our
- 	"restart": "&&Перезапустить"
-+=======
-+	"restart": "Перезапустить",
-+	"relaunchWorkspaceMessage": "Для изменения этой рабочей области требуется перезагрузить нашу систему расширений.",
-+	"reload": "Перезагрузка"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ce6c4c198e53640025e97af6f051f8e359900666 i18n/rus/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-  our    100644 ea48fd0d000e46e4ca2651924908528f7e33755a i18n/rus/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-  their  100644 5e4642ba704557f711a7f395d1c1f56b4ffd38f7 i18n/rus/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-changed in both
-  base   100644 ba48b09e26359666787720e9b999e646dd5696a1 i18n/rus/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  our    100644 39961b3a4e8ca19501aa8f2ce29968dd3e4cbb83 i18n/rus/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  their  100644 029a91dd1211a2d0d2a7b909a874cad6a54856c1 i18n/rus/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-changed in both
-  base   100644 9e37c37510eb5c5db61d0b5d6c452efdfe6d2d4e i18n/rus/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  our    100644 6b3cd3ed9a812c6397a2bcc6a3a3ba5e711fc058 i18n/rus/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  their  100644 9eeb4643e0d692981132a361c4a2f49e716d3e67 i18n/rus/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -10,6 +11,11 @@
- 	"hideRepository": "Скрыть",
- 	"installAdditionalSCMProviders": "Установить дополнительных поставщиков SCM...",
- 	"no open repo": "Отсутствуют активные поставщики систем управления версиями.",
-+=======
-+	"commitMessage": "Message (press {0} to commit)",
-+	"installAdditionalSCMProviders": "Установить дополнительных поставщиков SCM...",
-+	"no open repo": "Отсутствуют активные системы управления версиями.",
-+>>>>>>> .their
- 	"source control": "Система управления версиями",
- 	"viewletTitle": "{0}: {1}",
- 	"hideView": "Скрыть"
-changed in both
-  base   100644 e5f21d40d06215c5a29c27531436657b5b20a2b1 i18n/rus/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 012af24286aec719761b0687ebd50b2292e4db5e i18n/rus/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 a60edb8ea779767ce0b1b8e40126c096e8082eaa i18n/rus/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"nextSearchIncludePattern": "Показать следующий шаблон включения в поиск",
- 	"previousSearchIncludePattern": "Показать предыдущий шаблон включения в поиск ",
- 	"nextSearchExcludePattern": "Показать следующий шаблон исключения из поиска",
-@@ -16,6 +19,8 @@
- 	"previousReplaceTerm": "Показать предыдущее условие поиска и замены",
- 	"findInFiles": "Найти в файлах",
- 	"replaceInFiles": "Заменить в файлах",
-+	"findInWorkspace": "Найти в рабочей области...",
-+	"findInFolder": "Найти в папке...",
- 	"RefreshAction.label": "Обновить",
- 	"CollapseDeepestExpandedLevelAction.label": "Свернуть все",
- 	"ClearSearchResultsAction.label": "Очистить",
-changed in both
-  base   100644 cd394a2c256ae3595abf54197c01dcb233ef7384 i18n/rus/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-  our    100644 d3adc19c362c0be32a82dcdb9b4f38f6d17c183e i18n/rus/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-  their  100644 9d483c5df778ea5767a5155fd8f736f62653edc8 i18n/rus/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"searchFolderMatch.other.label": "Другие файлы",
- 	"searchFileMatches": "Найдено файлов: {0}",
- 	"searchFileMatch": "Найден {0} файл",
-changed in both
-  base   100644 39d234e38ac3f691ae3a0d2b108355e437fa9102 i18n/rus/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  our    100644 b197ab3521e49957a9edec72b674203f6268c391 i18n/rus/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  their  100644 1359328df0c5cb8ef24d158ed6715012b58bafb9 i18n/rus/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-added in both
-  our    100644 ca725ca0f8ecd45e9b60317a72e4760cf7fbd014 i18n/rus/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
-  their  100644 6ab5238739ecfc70d0aaa4992fed750079238d0b i18n/rus/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"search.noWorkspaceWithName": "В рабочей области отсутствуют папки с указанным именем: {0}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8892c40326eab5015b51d487d5e37e0b294512b2 i18n/rus/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 5406c69914aaafdfca9d082f48774213cbbbd661 i18n/rus/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 08bfb05feae9cb3c3d751f454bbff9a0a9577c21 i18n/rus/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-changed in both
-  base   100644 b8738833fa754fe6c88f27c641e6554589e325da i18n/rus/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 3ad2e6ca5f31ca94a9cdd8a18a046b2a9773636b i18n/rus/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 4a632d48414504797ee24daba799f5c70723df0f i18n/rus/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -12,6 +12,7 @@
- 	"totalWarnings": "Предупреждения: {0}",
- 	"totalInfos": "Сообщения: {0}",
- 	"problems": "Проблемы",
-+<<<<<<< .our
- 	"building": "Сборка...",
- 	"manyProblems": "Более 10 тысяч",
- 	"runningTasks": "Показать выполняемые задачи",
-@@ -19,22 +20,36 @@
- 	"TaskSystem.noHotSwap": "Чтобы изменить подсистему выполнения задач, в которой запущена активная задача, необходимо перезагрузить окно",
- 	"reloadWindow": "Перезагрузить окно",
- 	"TaskServer.folderIgnored": "Папка {0} будет проигнорирована, так как в ней используется версия задач 0.1.0",
-+=======
-+	"manyMarkers": "99+",
-+	"runningTasks": "Показать выполняемые задачи",
-+	"tasks": "Задачи",
-+	"TaskSystem.noHotSwap": "Чтобы изменить подсистему выполнения задач, необходимо перезагрузить окно",
-+>>>>>>> .their
- 	"TaskService.noBuildTask1": "Задача сборки не определена. Отметьте задачу с помощью \"isBuildCommand\" в файле tasks.json.",
- 	"TaskService.noBuildTask2": "Задача сборки не определена. Отметьте задачу с помощью группы 'build' в файле tasks.json.",
- 	"TaskService.noTestTask1": "Задача теста не определена. Отметьте задачу с помощью \"isTestCommand\" в файле tasks.json.",
- 	"TaskService.noTestTask2": "Задача теста не определена. Отметьте задачу с помощью группы 'test' в файле tasks.json.",
- 	"TaskServer.noTask": "Запрошенная задача {0} для выполнения не найдена.",
-+<<<<<<< .our
- 	"TaskService.associate": "связать",
-+=======
-+>>>>>>> .their
- 	"TaskService.attachProblemMatcher.continueWithout": "Продолжить без проверки выходных данных задачи",
- 	"TaskService.attachProblemMatcher.never": "Никогда не проверять выходные данные задачи",
- 	"TaskService.attachProblemMatcher.learnMoreAbout": "Дополнительные сведения о проверке выходных данных задачи",
- 	"selectProblemMatcher": "Выберите, на какие ошибки и предупреждения следует проверять выходные данные задачи",
- 	"customizeParseErrors": "В конфигурации текущей задачи есть ошибки. Исправьте ошибки перед изменением задачи.",
- 	"moreThanOneBuildTask": "В файле tasks.json определено несколько задач сборки. Выполняется первая задача.\n",
-+<<<<<<< .our
- 	"TaskSystem.activeSame.background": "Задача '{0}' уже активна и находится в фоновом режиме.",
- 	"TaskSystem.activeSame.noBackground": "Задача '{0}' уже выполняется.",
- 	"terminateTask": "Завершить задачу",
- 	"restartTask": "Перезапустить задачу",
-+=======
-+	"TaskSystem.activeSame.background": "Задача '{0}' уже активна и находится в фоновом режиме. Чтобы завершить задачу, выберите \"Завершить задачу\" в меню \"Задачи\".",
-+	"TaskSystem.activeSame.noBackground": "Задача '{0}' уже активна. Чтобы завершить задачу, выберите \"Завершить задачу\" из меню \"Задачи\".",
-+>>>>>>> .their
- 	"TaskSystem.active": "Уже выполняется задача. Завершите ее, прежде чем выполнять другую задачу.",
- 	"TaskSystem.restartFailed": "Не удалось завершить и перезапустить задачу {0}",
- 	"TaskService.noConfiguration": "Ошибка: в определении задачи {0} не выявлена задача для следующей конфигурации:\n{1}\nЗадача будет проигнорирована.\n",
-@@ -75,8 +90,13 @@
- 	"TaskService.pickDefaultBuildTask": "Выберите задачу, которая будет использоваться в качестве задачи сборки по умолчанию.",
- 	"TaskService.defaultTestTaskExists": "{0} уже помечена как задача сборки по умолчанию. ",
- 	"TaskService.pickDefaultTestTask": "Выберите задачу, которая будет использоваться в качестве задачи тестирования по умолчанию. ",
-+<<<<<<< .our
- 	"TaskService.pickShowTask": "Выберите задачу, выходные данные для которой нужно отобразить",
- 	"TaskService.noTaskIsRunning": "Ни одной задачи не запущено",
-+=======
-+	"TaskService.noTaskIsRunning": "Ни одной задачи не запущено.",
-+	"TaskService.pickShowTask": "Выберите задачу, выходные данные для которой нужно отобразить",
-+>>>>>>> .their
- 	"ShowLogAction.label": "Показать журнал задач",
- 	"RunTaskAction.label": "Выполнить задачу",
- 	"RestartTaskAction.label": "Перезапустить запущенную задачу",
-changed in both
-  base   100644 5f9a68cdb97f93b50890241bb8fa0b0102a28ab4 i18n/rus/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  our    100644 b7b348484d2ec81180585cec523e688a69bfd6fc i18n/rus/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  their  100644 3360204c259dd15808d051461474feff6f215bb6 i18n/rus/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-@@ -15,7 +15,10 @@
- 	"ConfigurationParser.invalidVaraibleReference": "Ошибка: недопустимая ссылка на problemMatcher: {0}\n",
- 	"ConfigurationParser.noTaskType": "Ошибка: в конфигурации задач должно присутствовать свойство типа. Конфигурация будет проигнорирована.\n{0}\n",
- 	"ConfigurationParser.noTypeDefinition": "Ошибка: тип задачи '{0}' не зарегистрирован. Возможно, вы не установили расширение, которое предоставляет соответствующий поставщик задач.",
-+<<<<<<< .our
- 	"ConfigurationParser.missingRequiredProperty": "Ошибка: в конфигурации задачи '{0}' отсутствует необходимое свойство '{1}'. Конфигурация задачи будет проигнорирована.",
-+=======
-+>>>>>>> .their
- 	"ConfigurationParser.notCustom": "Ошибка: задачи не объявлены в качестве пользовательской задачи. Конфигурация будет проигнорирована.\n{0}\n",
- 	"ConfigurationParser.noTaskName": "Ошибка: в задаче должно быть указано свойство метки. Задача будет проигнорирована.\n{0}\n",
- 	"taskConfiguration.noCommandOrDependsOn": "Ошибка: в задаче \"{0}\" не указаны ни команда, ни свойство dependsOn. Задача будет проигнорирована. Определение задачи:\n{1}",
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  our    100644 f97f741a841441f81547b7f5c26cdd6055680df5 i18n/rus/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  their  100644 bc758f0570498ca147cdcd506317b774e2e49fa3 i18n/rus/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,6 +10,17 @@
- 	"termEntryAriaLabel": "{0}, средство выбора терминалов",
- 	"termCreateEntryAriaLabel": "{0}, создать новый терминал",
- 	"workbench.action.terminal.newplus": "$(plus) Создать новый интегрированный терминал",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"termEntryAriaLabel": "{0}, средство выбора терминалов",
-+	"termCreateEntryAriaLabel": "{0}, создать новый терминал",
-+	"'workbench.action.terminal.newplus": "$(plus) Создать новый интегрированный терминал",
-+>>>>>>> .their
- 	"noTerminalsMatching": "Терминалы, соответствующие условию, отсутствуют",
- 	"noTerminalsFound": "Открытые терминалы отсутствуют"
- }
-\ No newline at end of file
-changed in both
-  base   100644 ffbac2eb99e0ea5a143c1bb70ece8333b0d34010 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 e05b07ca1e0540b56ed4788f50fea5db9d3c3f96 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 09ebc373f5482f173ef9216d5cf2dff94d20b598 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,9 @@
- 	],
- 	"quickOpen.terminal": "Показать все открытые терминалы",
- 	"terminal": "Терминал",
-+=======
-+	"quickOpen.terminal": "Показать все открытые терминалы",
-+>>>>>>> .their
- 	"terminalIntegratedConfigurationTitle": "Интегрированный терминал",
- 	"terminal.integrated.shell.linux": "Путь оболочки, который используется терминалом в Linux.",
- 	"terminal.integrated.shellArgs.linux": "Аргументы командной строки, которые следует использовать в терминале Linux.",
-@@ -36,8 +40,12 @@
- 	"terminal.integrated.env.osx": "Объект с переменными среды, которые будут добавлены к процессу VS Code для использования в терминале OS X",
- 	"terminal.integrated.env.linux": "Объект с переменными среды, которые будут добавлены к процессу VS Code для использования в терминале Linux ",
- 	"terminal.integrated.env.windows": "Объект с переменными среды, которые будут добавлены к процессу VS Code для использования в терминале Windows",
-+<<<<<<< .our
- 	"terminal.integrated.showExitAlert": "Отображать предупреждение \"Процесс терминала завершен с кодом выхода\", если код выхода не равен нулю.",
- 	"terminal.integrated.experimentalRestore": "Восстанавливать ли сеансы терминала для рабочей области автоматически при запуске VS Code. Это экспериментальный параметр; он может приводить к ошибкам и может быть изменен в будущем.",
-+=======
-+	"terminal": "Терминал",
-+>>>>>>> .their
- 	"terminalCategory": "Терминал",
- 	"viewCategory": "Просмотреть"
- }
-\ No newline at end of file
-changed in both
-  base   100644 32aa44547c4327e0be154304cb9a8146845ada73 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 ea0d455fc7f4fc786ef2ef083f3b437a535a441a i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 c26f2bb18ac65c56923486ad2ca8af360575b438 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -14,8 +14,11 @@
- 	"workbench.action.terminal.selectAll": "Выбрать все",
- 	"workbench.action.terminal.deleteWordLeft": "Удалить слово слева",
- 	"workbench.action.terminal.deleteWordRight": "Удалить слово справа",
-+<<<<<<< .our
- 	"workbench.action.terminal.moveToLineStart": "Перейти к началу строки",
- 	"workbench.action.terminal.moveToLineEnd": "Перейти к концу строки",
-+=======
-+>>>>>>> .their
- 	"workbench.action.terminal.new": "Создание нового интегрированного терминала",
- 	"workbench.action.terminal.new.short": "Новый терминал",
- 	"workbench.action.terminal.newWorkspacePlaceholder": "Выбрать текущий рабочий каталог для нового терминала",
-@@ -53,6 +56,7 @@
- 	"workbench.action.terminal.hideFindWidget": "Скрыть мини-приложение поиска",
- 	"nextTerminalFindTerm": "Показать следующий найденный термин",
- 	"previousTerminalFindTerm": "Показать предыдущий найденный термин",
-+<<<<<<< .our
- 	"quickOpenTerm": "Переключить активный терминал",
- 	"workbench.action.terminal.scrollToPreviousCommand": "Перейти к предыдущей команде",
- 	"workbench.action.terminal.scrollToNextCommand": "Перейти к следующей команде",
-@@ -60,4 +64,7 @@
- 	"workbench.action.terminal.selectToNextCommand": "Выбрать следующую команду",
- 	"workbench.action.terminal.selectToPreviousLine": "Выделить текст до предыдущей строки",
- 	"workbench.action.terminal.selectToNextLine": "Выделить текст до следующей строки"
-+=======
-+	"quickOpenTerm": "Терминал: переключить активный терминал"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a43d3077cff1b9cf703d317964bd31c51e83d890 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 aca12bf1061a643000b1615902ead62bb39d5223 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 3a2688c515c648212b96cc4c490842b7c49a7043 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -10,7 +10,10 @@
- 	"terminal.foreground": "Цвет переднего плана терминала.",
- 	"terminalCursor.foreground": "Цвет переднего плана курсора терминала.",
- 	"terminalCursor.background": "Цвет фона курсора терминала. Позволяет выбрать цвет символа, который перекрывается блочным курсором.",
-+<<<<<<< .our
- 	"terminal.selectionBackground": "Цвет фона выделения терминала.",
- 	"terminal.border": "Цвет границы, которая отделяет области в терминале. По умолчанию используется panel.border.",
-+=======
-+>>>>>>> .their
- 	"terminal.ansiColor": "Цвет ANSI \"{0}\" в терминале."
- }
-\ No newline at end of file
-changed in both
-  base   100644 e74084f36861306b1d8352a452623fc9b4cb5779 i18n/rus/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 0aa456751192f6ae65f23c8eacec75c6ffe01fe8 i18n/rus/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 baeaa62ec049d314ef26979a454363f99980513f i18n/rus/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -11,10 +11,16 @@
- 	"read the release notes": "Вас приветствует {0} v{1}! Вы хотите прочитать заметки о выпуске?",
- 	"licenseChanged": "Наши условия лицензии изменились. Чтобы ознакомиться с ними, щелкните [здесь]({0}).",
- 	"neveragain": "Больше не показывать",
-+<<<<<<< .our
- 	"64bitisavailable": "{0} для 64-разрядной версии Windows теперь доступен! Дополнительные сведения см. [здесь]({1}).",
- 	"updateIsReady": "Доступно новое обновление {0}.",
- 	"noUpdatesAvailable": "Доступные обновления отсутствуют.",
- 	"ok": "ОК",
-+=======
-+	"64bitisavailable": "{0} для 64-разрядной версии Windows теперь доступен!",
-+	"learn more": "Дополнительные сведения",
-+	"updateIsReady": "Доступно новое обновление {0}.",
-+>>>>>>> .their
- 	"thereIsUpdateAvailable": "Доступно обновление.",
- 	"download now": "Скачать сейчас",
- 	"later": "Позже",
-changed in both
-  base   100644 a9a867d8cd56bb727a36be41ea01334205a462fc i18n/rus/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  our    100644 7ec1bcab6e599251e71e94e275c4cb230b6f85ec i18n/rus/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  their  100644 076e01bbf7eea51e28eb25af2a51a4e2b66c6fbb i18n/rus/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-@@ -37,6 +37,8 @@
- 	"welcomePage.showCommandsDescription": "Быстро обращайтесь к командам и выполняйте поиск по командам с помощью палитры команд ({0})",
- 	"welcomePage.interfaceOverview": "Общие сведения об интерфейсе",
- 	"welcomePage.interfaceOverviewDescription": "Используйте визуальное наложение с выделением основных компонентов пользовательского интерфейса.",
-+	"welcomePage.deployToAzure": "Развертывание приложений в облако",
-+	"welcomePage.deployToAzureDescription": "Узнайте, как развернуть приложения Node в службу приложений Azure",
- 	"welcomePage.interactivePlayground": "Интерактивная площадка",
- 	"welcomePage.interactivePlaygroundDescription": "Опробуйте основные функции редактора в ходе краткого пошагового руководства."
- }
-\ No newline at end of file
-changed in both
-  base   100644 23cea88a1ceee6a440989c6533e259f662a46166 i18n/rus/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-  our    100644 472304cddee7043b300afe794ae73584b5e0577d i18n/rus/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-  their  100644 d11a8867da1bb8f1ce92a910616955affc4bcf54 i18n/rus/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-changed in both
-  base   100644 47a6fd1a229f5aa35d2d2fa86c3b59588d0e5bb2 i18n/rus/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-  our    100644 196b7c7b83cc8489602f5816dbabf281005e498a i18n/rus/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-  their  100644 83a72146fa4b20ed4aaaf85e6468dc45cad3bbbd i18n/rus/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-changed in both
-  base   100644 d5a3ca1e7d77fff726651dde975d70d6acae6b51 i18n/rus/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
-  our    100644 c5fd42fdce804f5a91125b12e1c5b41313caad9b i18n/rus/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
-  their  100644 3f6384ee226e4596bcd37e61b70df33776ad5d91 i18n/rus/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"editorWalkThrough.title": "Интерактивная площадка",
- 	"editorWalkThrough": "Интерактивная площадка"
- }
-\ No newline at end of file
-changed in both
-  base   100644 a74bc2f57d972fde3753efbe6bc776755e527c63 i18n/rus/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  our    100644 8915524eb9bff2cf02cf7f994fd2d422deaed65c i18n/rus/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  their  100644 485972bfcb33ba32d9ba5f4cf740e7ea6a5706b5 i18n/rus/src/vs/workbench/services/configuration/node/configuration.i18n.json
-@@ -9,6 +9,7 @@
- 	"scope.window.description": "Конфигурация окна, которая может быть задана в параметрах пользователя или рабочей области.",
- 	"scope.resource.description": "Конфигурации ресурсов, которые могут быть заданы в параметрах пользователей, рабочих областей или папок.",
- 	"scope.description": "Область, в которой применяется конфигурация. Доступные области — 'window' и 'resource'.",
-+<<<<<<< .our
- 	"vscode.extension.contributes.configuration": "Добавляет параметры конфигурации.",
- 	"invalid.title": "configuration.title должно быть строкой",
- 	"vscode.extension.contributes.defaultConfiguration": "Предоставляет параметры конфигурации редактора по умолчанию в соответствии с языком.",
-@@ -21,4 +22,13 @@
- 	"workspaceConfig.settings.description": "Параметры рабочей области",
- 	"workspaceConfig.extensions.description": "Расширения рабочей области",
- 	"unknownWorkspaceProperty": "Неизвестное свойство рабочей области"
-+=======
-+	"invalid.type": "Если тип configuration.type задан, то он должен иметь значение object",
-+	"invalid.title": "configuration.title должно быть строкой",
-+	"vscode.extension.contributes.defaultConfiguration": "Предоставляет параметры конфигурации редактора по умолчанию в соответствии с языком.",
-+	"invalid.properties": "configuration.properties должно быть объектом",
-+	"workspaceConfig.folders.description": "Список папок, которые будут загружены в рабочую область. Необходимо указывать пути к файлам, например, \"/root/folderA\" или \"./folderA\" для пути по отношению к файлу рабочей области.",
-+	"workspaceConfig.folder.description": "Путь к файлу, например, \"/root/folderA\" или \"./folderA\" для пути по отношению к файлу рабочей области.",
-+	"workspaceConfig.settings.description": "Параметры рабочей области"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 0d0c909172dbc855f1b653c8dbc0618f9156cd06 i18n/rus/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 466dfbc590c46288cb65b00cb7bf87e50489e811 i18n/rus/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 66d2499a4375c12dfd28ce75b7ee7cf3405539c5 i18n/rus/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -9,6 +9,7 @@
- 	"openTasksConfiguration": "Открыть конфигурацию задач",
- 	"openLaunchConfiguration": "Открыть конфигурацию запуска",
- 	"open": "Открыть параметры",
-+<<<<<<< .our
- 	"saveAndRetry": "Сохранить и повторить",
- 	"errorUnknownKey": "Не удалось записать в {0}, так как {1} не является зарегистрированной конфигурацией.",
- 	"errorInvalidWorkspaceConfigurationApplication": "Не удается записать {0} в параметры рабочей области. Этот параметр можно записать только в параметры пользователя.",
-@@ -27,6 +28,19 @@
- 	"errorConfigurationFileDirty": "Не удается записать параметры пользователя, так как файл был изменен. Сохраните файл параметров пользователя и повторите попытку.",
- 	"errorConfigurationFileDirtyWorkspace": "Не удается записать параметры рабочей области, так как файл был изменен. Сохраните файл параметров рабочей области и повторите попытку. ",
- 	"errorConfigurationFileDirtyFolder": "Не удается записать параметры папки, так как файл был изменен. Сохраните файл параметров папки '{0}' и повторите попытку.",
-+=======
-+	"close": "Закрыть",
-+	"saveAndRetry": "Сохранить параметры и повторить попытку",
-+	"errorUnknownKey": "Не удалось записать в {0}, так как {1} не является зарегистрированной конфигурацией.",
-+	"errorInvalidFolderConfiguration": "Не удается изменить параметры папок, так как {0} не поддерживает область ресурсов папок. ",
-+	"errorInvalidUserTarget": "Не удается изменить параметры пользователей, так как {0} не поддерживает глобальную область.",
-+	"errorInvalidFolderTarget": "Не удается изменить параметры папок, так как ресурс не указан.",
-+	"errorNoWorkspaceOpened": "Не удается записать в {0}, так как не открыта ни одна рабочая область. Откройте рабочую область и повторите попытку.",
-+	"errorInvalidConfiguration": "Не удается записать параметры. Откройте файл **User Settings**, устраните ошибки и предупреждения в файле и повторите попытку.",
-+	"errorInvalidConfigurationWorkspace": "Не удается записать параметры. Откройте файл **Workspace Settings**, устраните ошибки и предупреждения в файле и повторите попытку.",
-+	"errorConfigurationFileDirty": "Не удается записать параметры, так как файл был изменен. Сохраните файл **User Settings** и повторите попытку.",
-+	"errorConfigurationFileDirtyWorkspace": "Не удается записать параметры, так как файл был изменен. Сохраните файл **Workspace Settings** и повторите попытку.",
-+>>>>>>> .their
- 	"userTarget": "Параметры пользователя",
- 	"workspaceTarget": "Параметры рабочей области",
- 	"folderTarget": "Параметры папок"
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-  our    100644 b7d0271fbd9ef29c3bcbab141b27997ab44f9969 i18n/rus/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-  their  100644 8463d1762c16a7702d8c668f58bb03ac1aaa6530 i18n/rus/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"errorInvalidFile": "Не удается выполнить запись в файл. Откройте файл, исправьте ошибки и предупреждения в файле и повторите попытку.",
- 	"errorFileDirty": "Не удается записать сведения в файл, так как файл был изменен. Сохраните файл и повторите попытку."
- }
-\ No newline at end of file
-added in both
-  our    100644 90d7d9c828322534ba13ee9774f696d40eab7432 i18n/rus/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
-  their  100644 34e6efd6686547f3fa9512b2b0a43305e0f0945e i18n/rus/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,5 +10,15 @@
- 	"extensionHostProcess.startupFailDebug": "Хост-процесс для расширений не был запущен в течение 10 секунд. Возможно, он был остановлен в первой строке, а для продолжения требуется отладчик.",
- 	"extensionHostProcess.startupFail": "Хост-процесс для расширений не запустился спустя 10 секунд. Возможно, произошла ошибка.",
- 	"reloadWindow": "Перезагрузить окно",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"extensionHostProcess.startupFailDebug": "Хост-процесс для расширений не был запущен в течение 10 секунд. Возможно, он был остановлен в первой строке, а для продолжения требуется отладчик.",
-+	"extensionHostProcess.startupFail": "Хост-процесс для расширений не запустился спустя 10 секунд. Возможно, произошла ошибка.",
-+>>>>>>> .their
- 	"extensionHostProcess.error": "Ошибка в хост-процессе для расширений: {0}"
- }
-\ No newline at end of file
-added in both
-  our    100644 91df877283714c54bd33a40433fe6207981bca6a i18n/rus/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
-  their  100644 b3a07f325206573f1577db6ef63333e8e7610757 i18n/rus/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,5 +10,16 @@
- 	"jsonParseFail": "Не удалось проанализировать {0}: {1}.",
- 	"fileReadFail": "Не удается прочитать файл {0}: {1}.",
- 	"jsonsParseReportErrors": "Не удалось проанализировать {0}: {1}.",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"jsonParseFail": "Не удалось проанализировать {0}: {1}.",
-+	"fileReadFail": "Не удается прочитать файл {0}: {1}.",
-+	"jsonsParseFail": "Не удалось проанализировать {0} или {1}: {2}.",
-+>>>>>>> .their
- 	"missingNLSKey": "Не удалось найти сообщение для ключа {0}."
- }
-\ No newline at end of file
-added in both
-  our    100644 563d0e6d58b2163e3bb2e6d25a6030bab10243c4 i18n/rus/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-  their  100644 592a962b0992f6bbd1a0de53f505e9911682278f i18n/rus/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -15,4 +16,18 @@
- 	"extensionUnderDevelopment": "Идет загрузка расширения разработки в {0}.",
- 	"extensionCache.invalid": "Расширения были изменены на диске. Обновите окно.",
- 	"reloadWindow": "Перезагрузить окно"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"devTools": "Средства разработчика",
-+	"restart": "Перезапустить хост-процесс для расширений",
-+	"extensionHostProcess.crash": "Хост-процесс для расширений неожиданно завершил работу.",
-+	"extensionHostProcess.unresponsiveCrash": "Работа хост-процесса для расширений была завершена, так как он перестал отвечать на запросы.",
-+	"overwritingExtension": "Идет перезапись расширения {0} на {1}.",
-+	"extensionUnderDevelopment": "Идет загрузка расширения разработки в {0}."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6db7d6aae514a031afce5ac346abfd84bb8ee1cc i18n/rus/src/vs/workbench/services/progress/browser/progressService2.i18n.json
-  our    100644 ba82447f37bab197f2b886972623c486e9586dc6 i18n/rus/src/vs/workbench/services/progress/browser/progressService2.i18n.json
-  their  100644 dbcd7381ae2fcf0e7a8fc81ec166ed7112edca11 i18n/rus/src/vs/workbench/services/progress/browser/progressService2.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -9,4 +10,8 @@
- 	"progress.subtitle": "{0} - {1}",
- 	"progress.title": "{0}: {1}",
- 	"cancel": "Отмена"
-+=======
-+	"progress.subtitle": "{0} - {1}",
-+	"progress.title": "{0}: {1}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 63c693a5849904994d69ec80155fd4470b06927c i18n/rus/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-  our    100644 52a5a5e9b5cb00b1501fd3d47177f37e740e312d i18n/rus/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-  their  100644 16f8c52e622a5aee2dba8a57cc50638f7c9ae48e i18n/rus/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,12 @@
- 	"schema.token.fontStyle": "Стиль шрифта для правила: 'italic', 'bold', 'underline' или их сочетание. Если указана пустая строка, то унаследованные настройки отменяются.",
- 	"schema.fontStyle.error": "Стиль шрифта может иметь значения 'italic', 'bold' и 'underline', сочетание этих свойств или содержать пустую строку.",
- 	"schema.token.fontStyle.none": "Нет (очистить унаследованный стиль)",
-+=======
-+	"schema.token.settings": "Цвета и стили для маркера.",
-+	"schema.token.foreground": "Цвет переднего плана для маркера.",
-+	"schema.token.fontStyle": "Начертание шрифта для правила: один либо сочетание курсива, полужирного и подчеркивания.",
-+	"schema.fontStyle.error": "Стиль шрифта должен представлять собой сочетание свойств 'italic', 'bold' и 'underline'",
-+>>>>>>> .their
- 	"schema.properties.name": "Описание правила.",
- 	"schema.properties.scope": "Переключатель области, для которой проверяется это правило.",
- 	"schema.tokenColors.path": "Путь к файлу tmTheme (относительно текущего файла).",
-changed in both
-  base   100644 ac6d90763578ddf2b9536d1595a98c7fa5fed78d i18n/rus/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
-  our    100644 abc05e5e3b025371b12829d668c4bd9f9db0a3a0 i18n/rus/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
-  their  100644 b5a06fd68d0903b20c7e9b7e19839d746d2e3e2c i18n/rus/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
-changed in both
-  base   100644 9a03e746560855f41b46f0dee2465f2396d6cda9 i18n/rus/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 73e5413908fbafda8e65fdd1e7768bf4e42a1926 i18n/rus/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 8caee5d0eaeaebc0d7f30b48bee2ca18f078aed6 i18n/rus/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-@@ -13,6 +13,12 @@
- 	"noIconThemeDesc": "No file icons",
- 	"iconThemeError": "File icon theme is unknown or not installed.",
- 	"workbenchColors": "Переопределяет цвета из выбранной цветовой темы.",
-+<<<<<<< .our
-+=======
-+	"workbenchColors.deprecated": "Параметр больше не является экспериментальным и был переименован в 'workbench.colorCustomizations'",
-+	"workbenchColors.deprecatedDescription": "Используйте параметр 'workbench.colorCustomizations'",
-+	"editorColors": "Переопределяет цвета редактора и стиль шрифта из текущей выбранной цветовой темы.",
-+>>>>>>> .their
- 	"editorColors.comments": "Задает цвета и стили для комментариев",
- 	"editorColors.strings": "Задает цвета и стили для строковых литералов.",
- 	"editorColors.keywords": "Задает цвета и стили для ключевых слов.",
-@@ -20,6 +26,10 @@
- 	"editorColors.types": "Задает цвета и стили для объявлений типов и ссылок. ",
- 	"editorColors.functions": "Задает цвета и стили для объявлений функций и ссылок. ",
- 	"editorColors.variables": "Задает цвета и стили для объявлений переменных и для ссылок. ",
-+<<<<<<< .our
- 	"editorColors.textMateRules": "Задает цвета и стили с использованием правил оформления textmate (расширенный параметр).",
- 	"editorColors": "Переопределяет цвета редактора и стиль шрифта из текущей выбранной цветовой темы."
-+=======
-+	"editorColors.textMateRules": "Задает цвета и стили с использованием правил оформления textmate (расширенный параметр)."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 215750e00ed3d7df7ca51f9d1cca11d983f849a3 i18n/trk/extensions/css/package.i18n.json
-  our    100644 66b4b1f0603088d4b36204dc80aa234f4af34f75 i18n/trk/extensions/css/package.i18n.json
-  their  100644 c2596bffcb3061767e80aee93d81848d6eaff91f i18n/trk/extensions/css/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,73 @@
- 	],
- 	"displayName": "CSS Dil Temelleri",
- 	"description": "CSS, LESS ve SCSS dosyaları için söz dizimi vurgulama ve ayraç eşleştirme sağlar."
-+=======
-+	"css.lint.argumentsInColorFunction.desc": "Geçersiz sayıda parametre",
-+	"css.lint.boxModel.desc": "Doldurma veya kenarlık kullanırken genişlik veya yükseklik kullanmayın",
-+	"css.lint.compatibleVendorPrefixes.desc": "Satıcıya özgü bir ön ek kullanırken satıcıya özgü diğer tüm özellikleri de dahil ettiğinizden emin olun",
-+	"css.lint.duplicateProperties.desc": "Yinelenen stil tanımları kullanmayın",
-+	"css.lint.emptyRules.desc": "Boş kural kümeleri kullanmayın",
-+	"css.lint.float.desc": "'float' kullanmaktan kaçının. Float'lar, düzenin herhangi bir unsuru değiştiğinde kolayca bozulan kırılgan CSS ile sonuçlanır.",
-+	"css.lint.fontFaceProperties.desc": "@font-face kuralı 'src' ve 'font-family' özelliklerini tanımlamalıdır",
-+	"css.lint.hexColorLength.desc": "Onaltılık renkler üç veya altı onaltılık sayıdan oluşmalıdır",
-+	"css.lint.idSelector.desc": "Bu kurallar HTML'ye çok sıkı bağlı olduğundan seçiciler kimlikleri içermemelidir.",
-+	"css.lint.ieHack.desc": "IE izinsiz girişleri yalnızca IE7 ve daha eski sürümler desteklenirken gereklidir",
-+	"css.lint.important.desc": "!important kullanmaktan kaçının. Tüm CSS'nin belirginlik düzeyi üzerindeki denetimin kaybedildiğinin ve yeniden düzenlenmesi gerektiğinin bir belirtisidir.",
-+	"css.lint.importStatement.desc": "İçe aktarma deyimleri paralel olarak yüklenmez",
-+	"css.lint.propertyIgnoredDueToDisplay.desc": "Özellik gösterim nedeniyle yoksayıldı. Örn. 'display: inline' ile width, height, margin-top, margin-bottom ve float özelliklerinin hiçbir etkisi olmaz",
-+	"css.lint.universalSelector.desc": "Evrensel seçici (*) yavaş olarak bilinir",
-+	"css.lint.unknownProperties.desc": "Bilinmeyen özellik.",
-+	"css.lint.unknownVendorSpecificProperties.desc": "Bilinmeyen satıcıya özel özellik.",
-+	"css.lint.vendorPrefix.desc": "Satıcıya özgü bir ön ek kullanırken standart özelliği de dahil edin",
-+	"css.lint.zeroUnits.desc": "Sıfır için birim gerekmez",
-+	"css.trace.server.desc": "VS Code ve CSS dil sunucusu arasındaki iletişimi izler.",
-+	"css.validate.title": "CSS doğrulamasını ve sorunların önem derecelerini denetler.",
-+	"css.validate.desc": "Tüm doğrulamaları etkinleştirir veya devre dışı bırakır",
-+	"less.lint.argumentsInColorFunction.desc": "Geçersiz sayıda parametre",
-+	"less.lint.boxModel.desc": "Doldurma veya kenarlık kullanırken genişlik veya yükseklik kullanmayın",
-+	"less.lint.compatibleVendorPrefixes.desc": "Satıcıya özgü bir ön ek kullanırken satıcıya özgü diğer tüm özellikleri de dahil ettiğinizden emin olun",
-+	"less.lint.duplicateProperties.desc": "Yinelenen stil tanımları kullanmayın",
-+	"less.lint.emptyRules.desc": "Boş kural kümeleri kullanmayın",
-+	"less.lint.float.desc": "'float' kullanmaktan kaçının. Float'lar, düzenin herhangi bir unsuru değiştiğinde kolayca bozulan kırılgan CSS ile sonuçlanır.",
-+	"less.lint.fontFaceProperties.desc": "@font-face kuralı 'src' ve 'font-family' özelliklerini tanımlamalıdır",
-+	"less.lint.hexColorLength.desc": "Onaltılık renkler üç veya altı onaltılık sayıdan oluşmalıdır",
-+	"less.lint.idSelector.desc": "Bu kurallar HTML'ye çok sıkı bağlı olduğundan seçiciler kimlikleri içermemelidir.",
-+	"less.lint.ieHack.desc": "IE izinsiz girişleri yalnızca IE7 ve daha eski sürümler desteklenirken gereklidir",
-+	"less.lint.important.desc": "!important kullanmaktan kaçının. Tüm CSS'nin belirginlik düzeyi üzerindeki denetimin kaybedildiğinin ve yeniden düzenlenmesi gerektiğinin bir belirtisidir.",
-+	"less.lint.importStatement.desc": "İçe aktarma deyimleri paralel olarak yüklenmez",
-+	"less.lint.propertyIgnoredDueToDisplay.desc": "Özellik gösterim nedeniyle yoksayıldı. Örn. 'display: inline' ile width, height, margin-top, margin-bottom ve float özelliklerinin hiçbir etkisi olmaz",
-+	"less.lint.universalSelector.desc": "Evrensel seçici (*) yavaş olarak bilinir",
-+	"less.lint.unknownProperties.desc": "Bilinmeyen özellik.",
-+	"less.lint.unknownVendorSpecificProperties.desc": "Bilinmeyen satıcıya özel özellik.",
-+	"less.lint.vendorPrefix.desc": "Satıcıya özgü bir ön ek kullanırken standart özelliği de dahil edin",
-+	"less.lint.zeroUnits.desc": "Sıfır için birim gerekmez",
-+	"less.validate.title": "LESS doğrulamasını ve sorunların önem derecelerini denetler.",
-+	"less.validate.desc": "Tüm doğrulamaları etkinleştirir veya devre dışı bırakır",
-+	"scss.lint.argumentsInColorFunction.desc": "Geçersiz sayıda parametre",
-+	"scss.lint.boxModel.desc": "Doldurma veya kenarlık kullanırken genişlik veya yükseklik kullanmayın",
-+	"scss.lint.compatibleVendorPrefixes.desc": "Satıcıya özgü bir ön ek kullanırken satıcıya özgü diğer tüm özellikleri de dahil ettiğinizden emin olun",
-+	"scss.lint.duplicateProperties.desc": "Yinelenen stil tanımları kullanmayın",
-+	"scss.lint.emptyRules.desc": "Boş kural kümeleri kullanmayın",
-+	"scss.lint.float.desc": "'float' kullanmaktan kaçının. Float'lar, düzenin herhangi bir unsuru değiştiğinde kolayca bozulan kırılgan CSS ile sonuçlanır.",
-+	"scss.lint.fontFaceProperties.desc": "@font-face kuralı 'src' ve 'font-family' özelliklerini tanımlamalıdır",
-+	"scss.lint.hexColorLength.desc": "Onaltılık renkler üç veya altı onaltılık sayıdan oluşmalıdır",
-+	"scss.lint.idSelector.desc": "Bu kurallar HTML'ye çok sıkı bağlı olduğundan seçiciler kimlikleri içermemelidir.",
-+	"scss.lint.ieHack.desc": "IE izinsiz girişleri yalnızca IE7 ve daha eski sürümler desteklenirken gereklidir",
-+	"scss.lint.important.desc": "!important kullanmaktan kaçının. Tüm CSS'nin belirginlik düzeyi üzerindeki denetimin kaybedildiğinin ve yeniden düzenlenmesi gerektiğinin bir belirtisidir.",
-+	"scss.lint.importStatement.desc": "İçe aktarma deyimleri paralel olarak yüklenmez",
-+	"scss.lint.propertyIgnoredDueToDisplay.desc": "Özellik gösterim nedeniyle yoksayıldı. Örn. 'display: inline' ile width, height, margin-top, margin-bottom ve float özelliklerinin hiçbir etkisi olmaz",
-+	"scss.lint.universalSelector.desc": "Evrensel seçici (*) yavaş olarak bilinir",
-+	"scss.lint.unknownProperties.desc": "Bilinmeyen özellik.",
-+	"scss.lint.unknownVendorSpecificProperties.desc": "Bilinmeyen satıcıya özel özellik.",
-+	"scss.lint.vendorPrefix.desc": "Satıcıya özgü bir ön ek kullanırken standart özelliği de dahil edin",
-+	"scss.lint.zeroUnits.desc": "Sıfır için birim gerekmez",
-+	"scss.validate.title": "SCSS doğrulamasını ve sorunların önem derecelerini denetler.",
-+	"scss.validate.desc": "Tüm doğrulamaları etkinleştirir veya devre dışı bırakır",
-+	"less.colorDecorators.enable.desc": "Renk dekoratörlerini etkinleştirir veya devre dışı bırakır",
-+	"scss.colorDecorators.enable.desc": "Renk dekoratörlerini etkinleştirir veya devre dışı bırakır",
-+	"css.colorDecorators.enable.desc": "Renk dekoratörlerini etkinleştirir veya devre dışı bırakır",
-+	"css.colorDecorators.enable.deprecationMessage": "`css.colorDecorators.enable` ayarı, `editor.colorDecorators` yüzünden kullanım dışıdır.",
-+	"scss.colorDecorators.enable.deprecationMessage": "`scss.colorDecorators.enable` ayarı, `editor.colorDecorators` yüzünden kullanım dışıdır.",
-+	"less.colorDecorators.enable.deprecationMessage": "`less.colorDecorators.enable` ayarı, `editor.colorDecorators` yüzünden kullanım dışıdır."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 bd568a64488e267349f9912913dd7d886c029b8e i18n/trk/extensions/emmet/package.i18n.json
-  our    100644 da0ca75d8cf264d2aa273bacfc4c88c0e06fd83f i18n/trk/extensions/emmet/package.i18n.json
-  their  100644 e1f898b22d3e43c4af74e98acd3f558804ec4fa9 i18n/trk/extensions/emmet/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -7,6 +8,8 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"description": "VS Code için Emmet desteği",
-+=======
-+>>>>>>> .their
- 	"command.wrapWithAbbreviation": "Kısaltma ile Sarmala",
- 	"command.wrapIndividualLinesWithAbbreviation": "Her Bir Satırı Kısaltma ile Sarmala",
- 	"command.removeTag": "Etiketi Kaldır",
-@@ -33,11 +36,19 @@
- 	"emmetSyntaxProfiles": "Belirtilen sentaks için profil tanımlayın veya kendi profilinizi belirli kurallarla kullanın.",
- 	"emmetExclude": "Emmet kısaltmalarının genişletilmeyeceği bir diller dizisi.",
- 	"emmetExtensionsPath": "Emmet profileri ve parçacıklarını içeren bir klasör yolu.'",
-+<<<<<<< .our
- 	"emmetShowExpandedAbbreviation": "Genişletilmiş Emmet kısaltmalarını öneriler olarak gösterir.\n\"inMarkupAndStylesheetFilesOnly\" seçeneği\" html, haml, jade, xml, xsl, css, scss, sass, less ve stylus'a uygulanır.\n\"always\" seçeneği işaretleme/css'den bağımsız olarak dosyanın tüm bölümlerine uygulanır.",
- 	"emmetShowAbbreviationSuggestions": "Olası Emmet kısaltmalarını öneriler olarak gösterir. Stil dosyalarında veya emmet.showExpandedAbbreviation'a \"never\" değeri atandığında uygulanamaz.",
- 	"emmetIncludeLanguages": "Varsayılan olarak desteklenmeyen dillerde Emmet kısaltmalarını etkinleştirin. Burada dil ile desteklenen emmet destekli dil arasında bir eşleme ekleyin.\nÖr: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
- 	"emmetVariables": "Emmet parçacıklarında kullanılacak değişkenler",
- 	"emmetTriggerExpansionOnTab": "Etkinleştirildiğinde, Emmet kısaltmaları TAB tuşuna basıldığında genişletilir.",
-+=======
-+	"emmetShowExpandedAbbreviation": "Genişletilmiş emmet kısaltmalarını öneriler olarak gösterir.\n\"inMarkupAndStylesheetFilesOnly\" seçeneği\" html, haml, jade, xml, xsl, css, scss, sass, less ve stylus'a uygulanır.\n\"always\" seçeneği işaretleme/css'den bağımsız olarak dosyanın tüm bölümlerine uygulanır.",
-+	"emmetShowAbbreviationSuggestions": "Olası emmet kısaltmalarını öneriler olarak gösterir. Stil dosyalarında veya emmet.showExpandedAbbreviation, \"never\" olarak ayarlandığında uygulanamaz.",
-+	"emmetIncludeLanguages": "Varsayılan olarak desteklenmeyen dillerde emmet kısaltmalarını etkinleştirin. Burada dil ile desteklenen emmet destekli dil arasında eşleme ekleyin.",
-+	"emmetVariables": "Emmet parçacıklarında kullanılacak değişkenler",
-+	"emmetTriggerExpansionOnTab": "Etkinleştirildiğinde, emmet kısaltmaları TAB tuşuna basıldığında genişletilir.",
-+>>>>>>> .their
- 	"emmetPreferences": "Emmet'in bazı eylemleri ve çözümleyicilerinin davranışını değiştirmek için kullanılacak tercihler.",
- 	"emmetPreferencesIntUnit": "Tam sayı değerleri için varsayılan birim",
- 	"emmetPreferencesFloatUnit": "Ondalık sayı değerleri için varsayılan birim",
-@@ -47,6 +58,7 @@
- 	"emmetPreferencesCssBetween": "CSS kısaltmaları genişletilirken CSS özelliği ve değerinin arasına koyulacak sembol",
- 	"emmetPreferencesSassBetween": "Sass dosyalarında CSS kısaltmaları genişletilirken CSS özelliği ve değerinin arasına koyulacak sembol",
- 	"emmetPreferencesStylusBetween": "Stylus dosyalarında CSS kısaltmaları genişletilirken CSS özelliği ve değerinin arasına koyulacak sembol",
-+<<<<<<< .our
- 	"emmetShowSuggestionsAsSnippets": "Doğruysa, Emmet önerileri, editor.snippetSuggestions ayarı ile sıralayabilmenizi sağlayan parçacıklar olarak gösterilir.",
- 	"emmetPreferencesBemElementSeparator": "BEM filtresi kullanırken sınıflar için kullanılacak öge ayrıcı",
- 	"emmetPreferencesBemModifierSeparator": "BEM filtresi kullanırken sınıflar için kullanılacak niteleyici ayrıcı",
-@@ -62,4 +74,7 @@
- 	"emmetPreferencesCssMsProperties": "`-` ile başlayan Emmet kısaltmasında kullanıldığında 'ms' önekini alacak virgülle ayrılmış CSS özellikleri. 'ms' önekinden her zaman kaçınmak için boş bir dize olarak ayarlayın.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "Bulanık eşleştirilmiş kısaltmaların elde etmesi gereken minimum puan (0'dan 1'e kadar). Düşük değerler birçok yanlış pozitif eşleşme oluşturabilir, daha yüksek değerler olası eşleşmeleri azaltabilir.",
- 	"emmetOptimizeStylesheetParsing": "\"false\" değeri atandığında, Emmet kısaltmalarının genişletilmesinde o anki konumun geçerli olup olmadığını belirlemek için tüm dosya ayrıştırılır. \"true\" değeri atandığında, css/scss/less dosyalarında sadece o anki konumun çevresi ayrıştırılır."
-+=======
-+	"emmetShowSuggestionsAsSnippets": "Doğru ise, emmet önerileri, editor.snippetSuggestions ayarı ile sıralayabilmenizi sağlayan parçacıklar olarak gösterilir."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 3f17e74fb401bba03573ea5e82027792ca176b87 i18n/trk/extensions/extension-editing/out/extensionLinter.i18n.json
-  our    100644 548a560533a7647174cfb35884c3fb051dd6a218 i18n/trk/extensions/extension-editing/out/extensionLinter.i18n.json
-  their  100644 12dd37bc72ba22ba6a2e37346ff90810bf199295 i18n/trk/extensions/extension-editing/out/extensionLinter.i18n.json
-changed in both
-  base   100644 631b43cf4f27cac0a17b23217cb23f9403f215ba i18n/trk/extensions/git/out/commands.i18n.json
-  our    100644 6794dc4934caa0927c5d65dc1f742c2cefd9cd5b i18n/trk/extensions/git/out/commands.i18n.json
-  their  100644 062e690a02d8f42c7868d9270f89f2c8e4b46a8a i18n/trk/extensions/git/out/commands.i18n.json
-@@ -13,6 +13,7 @@
- 	"selectFolder": "Depo Konumunu Seç",
- 	"cloning": "'{0}' git deposu kopyalanıyor...",
- 	"proposeopen": "Kopyalanan depoyu açmak ister misiniz?",
-+<<<<<<< .our
- 	"openrepo": "Depoyu Aç",
- 	"add": "Çalışma Alanına Ekle",
- 	"proposeopen2": "Kopyalanan depoyu açmak veya geçerli çalışma alanına eklemek ister misiniz?",
-@@ -20,6 +21,10 @@
- 	"init repo": "Depo Oluştur",
- 	"create repo": "Depo Oluştur",
- 	"are you sure": "Bu, '{0}' dizininde bir Git deposu oluşturacak. Devam etmek istediğinizden emin misiniz?",
-+=======
-+	"path to init": "Klasör yolu",
-+	"provide path": "Git deposu oluşturmak için lütfen bir klasör yolu belirtin",
-+>>>>>>> .their
- 	"HEAD not available": "'{0}'e ait HEAD sürümü mevcut değil.",
- 	"confirm stage files with merge conflicts": "Birleştirme çakışmaları bulunan {0} dosyayı hazırlamak istediğinizden emin misiniz?",
- 	"confirm stage file with merge conflicts": "Birleştirme çakışmaları bulunan {0} klasörünü hazırlamak istediğinizden emin misiniz?",
-@@ -43,12 +48,17 @@
- 	"confirm discard all 2": "{0}\n\nBu GERİ DÖNDÜRÜLEMEZ, mevcut çalışma grubunuz TAMAMEN KAYBOLACAK.",
- 	"yes discard tracked": "İzlenen 1 Dosyayı Göz Ardı Et",
- 	"yes discard tracked multiple": "İzlenen {0} Dosyayı Göz Ardı Et",
-+<<<<<<< .our
- 	"unsaved files single": "Aşağıdaki dosya kaydedilmemiş: {0}.\n\nCommit'lemeden önce kaydetmek ister misiniz?",
- 	"unsaved files": "{0} kaydedilmemiş dosya var.\n\nCommit'lemeden önce kaydetmek ister misiniz?",
- 	"save and commit": "Tümünü Kaydet & Commit'le",
- 	"commit": "Yine de Commit'le",
- 	"no staged changes": "Commit'lenecek hazırlanmış değişiklik yok.\n\nTüm değişikliklerinizi otomatik olarak hazırlamak ve direkt olarak commit'lemek ister misiniz?",
- 	"always": "Daima",
-+=======
-+	"no staged changes": "Commit'lenecek hazırlanmış değişiklik yok.\n\nTüm değişikliklerinizi otomatik olarak hazırlamak ve direkt olarak commit'lemek ister misiniz?",
-+	"always": "Her Zaman",
-+>>>>>>> .their
- 	"no changes": "Commit'lenecek değişiklik yok.",
- 	"commit message": "Commit mesajı",
- 	"provide commit message": "Lütfen bir commit mesajı belirtin.",
-@@ -66,10 +76,14 @@
- 	"provide tag name": "Lütfen bir etiket adı belirtin",
- 	"tag message": "Mesaj",
- 	"provide tag message": "Lütfen etikete açıklama yapmak için bir mesaj belirtin",
-+<<<<<<< .our
- 	"no remotes to fetch": "Bu depoda alma işleminin yapılacağı hiçbir uzak uçbirim yapılandırılmamış.",
-+=======
-+>>>>>>> .their
- 	"no remotes to pull": "Deponuzda çekme işleminin yapılacağı hiçbir uzak uçbirim yapılandırılmamış.",
- 	"pick remote pull repo": "Dalın çekileceği bir uzak uçbirim seçin",
- 	"no remotes to push": "Deponuzda gönderimin yapılacağı hiçbir uzak uçbirim yapılandırılmamış.",
-+	"push with tags success": "Başarılı bir şekilde etiketlerle gönderildi.",
- 	"nobranch": "Lütfen uzak uçbirime gönderilecek dala geçiş yapın.",
- 	"confirm publish branch": "'{0}' dalında bir ana depo(upstream) dalı bulunmuyor. Bu dalı yayınlamak ister misiniz?",
- 	"ok": "Tamam",
-changed in both
-  base   100644 282a283d443825c66dc7140f4ae0909e56d59543 i18n/trk/extensions/git/out/model.i18n.json
-  our    100644 2751f7326c1f0ded23750b1a9a93029dc4dfb228 i18n/trk/extensions/git/out/model.i18n.json
-  their  100644 9bc54bdfe7a2a6e1618f588f8b19da78dbbf3cd5 i18n/trk/extensions/git/out/model.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -7,6 +8,8 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"too many submodules": "'{0}' deposu otomatik olarak açılmayacak {1} alt modül içeriyor. İçlerindeki bir dosyayı açarak her birini tek tek açabilirsiniz.",
-+=======
-+>>>>>>> .their
- 	"no repositories": "Mevcut depo yok",
- 	"pick repo": "Bir depo seçin"
- }
-\ No newline at end of file
-added in both
-  our    100644 88e17ba3d7d5e83256ff34b6baf559204df8aba3 i18n/trk/extensions/git/out/repository.i18n.json
-  their  100644 4f0f8a1a395f865bf6b18258d6d118b5e5ee7e1e i18n/trk/extensions/git/out/repository.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"open": "Aç",
- 	"index modified": "Dizin Değiştirildi",
- 	"modified": "Değiştirilmiş",
-@@ -23,13 +32,20 @@
- 	"deleted by us": "Bizim Tarafımızdan Silindi",
- 	"both added": "Her İkimiz de Ekledik",
- 	"both modified": "Her İkimiz de Değiştirdik",
-+<<<<<<< .our
- 	"commitMessage": "Mesaj (commit'lemek için {0} tuşlarına basın)",
-+=======
-+>>>>>>> .their
- 	"commit": "Commit'le",
- 	"merge changes": "Değişiklikleri Birleştir",
- 	"staged changes": "Hazırlanmış Değişiklikler",
- 	"changes": "Değişiklikler",
-+<<<<<<< .our
- 	"commitMessageCountdown": "geçerli satırda {0} karakter kaldı",
- 	"commitMessageWarning": "geçerli satırda {1} üzerinde {0} karakter",
-+=======
-+	"ok": "Tamam",
-+>>>>>>> .their
- 	"neveragain": "Tekrar Gösterme",
- 	"huge": "'{0}' yolundaki git deposunda çok fazla aktif değişikliklik var, Git özelliklerinin yalnızca bir alt kümesi etkinleştirilecektir."
- }
-\ No newline at end of file
-changed in both
-  base   100644 ce903ba937414479b32a7cc8b605a00306ad29c8 i18n/trk/extensions/git/package.i18n.json
-  our    100644 c440a7230c670854e02c25e2d19a46df2b4abcb8 i18n/trk/extensions/git/package.i18n.json
-  their  100644 de67f8473215bbf915ec6fc38ce10a5a93733270 i18n/trk/extensions/git/package.i18n.json
-@@ -40,7 +40,10 @@
- 	"command.renameBranch": "Dalı Yeniden Adlandır...",
- 	"command.merge": "Dalı Birleştir...",
- 	"command.createTag": "Etiket Oluştur",
-+<<<<<<< .our
- 	"command.fetch": "Al",
-+=======
-+>>>>>>> .their
- 	"command.pull": "Çek",
- 	"command.pullRebase": "Çek (Yeniden Adresle)",
- 	"command.pullFrom": "Şuradan Çek...",
-@@ -52,7 +55,10 @@
- 	"command.publish": "Dalı Yayınla",
- 	"command.showOutput": "Git Çıktısını Göster",
- 	"command.ignore": ".gitignore'a Dosya Ekle",
-+<<<<<<< .our
- 	"command.stashIncludeUntracked": "Geçici Olarak Sakla(İzlenmeyenleri Dahil Et)",
-+=======
-+>>>>>>> .their
- 	"command.stash": "Geçici Olarak Sakla",
- 	"command.stashPop": "Geçici Olarak Saklananı Geri Yükle...",
- 	"command.stashPopLatest": "En Son Geçici Olarak Saklananı Geri Yükle",
-@@ -71,6 +77,7 @@
- 	"config.defaultCloneDirectory": "Bir git deposunun kopyalanacağı varsayılan konum",
- 	"config.enableSmartCommit": "Hazırlanan değişiklik yoksa tüm değişiklikleri commit'le.",
- 	"config.enableCommitSigning": "GPG ile commit imzalamayı etkinleştirir.",
-+<<<<<<< .our
- 	"config.discardAllScope": "`Tüm Değişiklikleri Göz Ardı Et` komutuyla hangi değişikliklerin göz ardı edileceğini denetler. `all` tüm değişiklikleri göz ardı eder. `tracked` sadece izlenen dosyaları göz ardı eder. `prompt` eylem her çalıştığında bir onay penceresi gösterir.",
- 	"config.decorations.enabled": "Git'in gezgine ve açık düzenleyiciler görünümüne renkler ve göstergeler ile ekleme yapıp yapmadığını denetler.",
- 	"config.promptToSaveFilesBeforeCommit": "Commit'lemeden önce Git'in kaydedilmemiş dosyaları kontrol edip etmeyeceğini denetler.",
-@@ -84,4 +91,7 @@
- 	"colors.ignored": "Yok sayılan kaynakların rengi.",
- 	"colors.conflict": "Çakışma içeren kaynakların rengi.",
- 	"colors.submodule": "Alt modül kaynaklarının rengi."
-+=======
-+	"config.discardAllScope": "`Tüm Değişiklikleri Göz Ardı Et` komutuyla hangi değişikliklerin göz ardı edileceğini denetler. `all` tüm değişiklikleri göz ardı eder. `tracked` sadece izlenen dosyaları göz ardı eder. `prompt` eylem her çalıştığında bir onay penceresi gösterir."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ee68938c898ccd9a68cfaca7b19754195b958704 i18n/trk/extensions/html/package.i18n.json
-  our    100644 7b449502bb09e8eb93e2740266484b88cac8470c i18n/trk/extensions/html/package.i18n.json
-  their  100644 e2bf2407d3d4331499457e0b6b74fe356d910f19 i18n/trk/extensions/html/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,28 @@
- 	],
- 	"displayName": "HTML Dil Temelleri",
- 	"description": "HTML dosyaları için söz dizimi vurgulama, ayraç eşleştirme ve kod parçacıkları sağlar."
-+=======
-+	"html.format.enable.desc": "Varsayılan HTML biçimlendiricisini etkinleştirin/devre dışı bırakın",
-+	"html.format.wrapLineLength.desc": "Satır başına en fazla karakter miktarı (0 = devre dışı bırak)",
-+	"html.format.unformatted.desc": "Yeniden biçimlendirilmeyecek virgülle ayrılmış etiketler listesi. 'null' değeri, https://www.w3.org/TR/html5/dom.html#phrasing-content adresinde listelenen tüm etiketleri varsayılan olarak belirler.",
-+	"html.format.contentUnformatted.desc": "İçeriğin yeniden biçimlendirilmeyeceği virgülle ayrılmış etiketler listesi. 'null' değeri, 'pre' etiketini varsayılan olarak belirler.",
-+	"html.format.indentInnerHtml.desc": "<head> ve <body> bölümlerini girintile.",
-+	"html.format.preserveNewLines.desc": "Ögelerden önceki mevcut satır sonlarının korunup korunmayacağı. Yalnızca ögelerden önce çalışır, etiketler içinde veya metinde çalışmaz.",
-+	"html.format.maxPreserveNewLines.desc": "Bir öbekte korunacak maksimum satır sonu sayısı. Sınırsız için 'null' değerini kullanın.",
-+	"html.format.indentHandlebars.desc": "{{#foo}} ve {{/foo}}'yu biçimlendir ve girintile.",
-+	"html.format.endWithNewline.desc": "Boş bir satırla bitir.",
-+	"html.format.extraLiners.desc": "Kendilerinden önce ek bir boş satır bulunması gereken virgülle ayrılmış etiketler listesi. 'null' değeri, \"head, body, /html\" değerini varsayılan olarak belirler.",
-+	"html.format.wrapAttributes.desc": "Öznitelikleri sarmala.",
-+	"html.format.wrapAttributes.auto": "Öznitelikleri sadece satır uzunluğu aşıldığında sarmala.",
-+	"html.format.wrapAttributes.force": "İlki hariç tüm öznitelikleri sarmala.",
-+	"html.format.wrapAttributes.forcealign": "İlki hariç tüm öznitelikleri sarmala ve hizada tut.",
-+	"html.format.wrapAttributes.forcemultiline": "Tüm öznitelikleri sarmala.",
-+	"html.suggest.angular1.desc": "Yerleşik HTML dili desteğinin Angular V1 etiketlerini ve özelliklerini önerip önermeyeceğini yapılandırır.",
-+	"html.suggest.ionic.desc": "Yerleşik HTML dili desteğinin Ionic etiketlerini, özelliklerini ve değerlerini önerip önermeyeceğini yapılandırır.",
-+	"html.suggest.html5.desc": "Yerleşik HTML dili desteğinin HTML5 etiketlerini, özelliklerini ve değerlerini önerip önermeyeceğini yapılandırır.",
-+	"html.trace.server.desc": "VS Code ve HTML dil sunucusu arasındaki iletişimi izler.",
-+	"html.validate.scripts": "Yerleşik HTML dili desteğinin HTML5 gömülü betikleri doğrulayıp doğrulamayacağını yapılandırır.",
-+	"html.validate.styles": "Yerleşik HTML dili desteğinin HTML5 gömülü stilleri doğrulayıp doğrulamayacağını yapılandırır.",
-+	"html.autoClosingTags": "HTML etiketlerinin otomatik kapatılmasını etkinleştirin/devre dışı bırakın"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 bc1296fa6f9b9f659f818176307c107b98805161 i18n/trk/extensions/json/package.i18n.json
-  our    100644 edd357770105df4ae5b1aa1ecd498f54db2d069a i18n/trk/extensions/json/package.i18n.json
-  their  100644 746d1a4acc789e8f8a8aa97d680c4d054aab49bc i18n/trk/extensions/json/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,15 @@
- 	],
- 	"displayName": "JSON Dil Temelleri",
- 	"description": "JSON dosyaları için söz dizimi vurgulama ve ayraç eşleştirme sağlar."
-+=======
-+	"json.schemas.desc": "Şemaları geçerli projedeki JSON dosyalarıyla ilişkilendir",
-+	"json.schemas.url.desc": "Bir şemanın URL'si veya geçerli dizindeki bir şemanın göreli yolu",
-+	"json.schemas.fileMatch.desc": "JSON dosyaları şemalara çözümlenirken eşleşme için kullanılacak bir dosya düzenleri dizisi.",
-+	"json.schemas.fileMatch.item.desc": "JSON dosyaları şemalara çözümlenirken eşleşme için '*' içerebilen bir dosya düzeni.",
-+	"json.schemas.schema.desc": "Verilen URL için şema tanımı. Şema, yalnızca şema URL'sine erişimi önlemek için sağlanmalıdır.",
-+	"json.format.enable.desc": "Varsayılan JSON biçimlendiricisini etkinleştirin/devre dışı bırakın (yeniden başlatma gerektirir)",
-+	"json.tracing.desc": "VS Code ve JSON dil sunucusu arasındaki iletişimi izler.",
-+	"json.colorDecorators.enable.desc": "Renk dekoratörlerini etkinleştirir veya devre dışı bırakır",
-+	"json.colorDecorators.enable.deprecationMessage": "`json.colorDecorators.enable` ayarı, `editor.colorDecorators` yüzünden kullanım dışıdır."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 5b2f136351dbd4f6aa7b89253a7c15c1b66b3944 i18n/trk/extensions/markdown/out/security.i18n.json
-  our    100644 df9d9eb7615e7e140077147ad41d16bb6d6221c8 i18n/trk/extensions/markdown/out/security.i18n.json
-  their  100644 fa3ecf1c124bc9e9c72655325e15d39e6aff2672 i18n/trk/extensions/markdown/out/security.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"strict.title": "Katı",
- 	"strict.description": "Sadece güvenli içeriği yükle",
- 	"insecureContent.title": "Güvenli olmayan içeriğe izin ver",
-@@ -13,8 +16,11 @@
- 	"disable.title": "Devre Dışı Bırak",
- 	"disable.description": "Tüm içeriğe ve betik yürütmeye izin ver. Tavsiye edilmez",
- 	"moreInfo.title": "Daha Fazla Bilgi",
-+<<<<<<< .our
- 	"enableSecurityWarning.title": "Bu çalışma alanında önizleme güvenlik uyarılarını etkinleştir",
- 	"disableSecurityWarning.title": "Bu çalışma alanında önizleme güvenlik uyarılarını devre dışı bırak",
- 	"toggleSecurityWarning.description": "İçerik güvenlik seviyesini etkilemez",
-+=======
-+>>>>>>> .their
- 	"preview.showPreviewSecuritySelector.title": "Bu çalışma alanında Markdown önizlemeleri için güvenlik ayarlarını seçin"
- }
-\ No newline at end of file
-changed in both
-  base   100644 abaac8b698cb3ef67a5dba3fb17cfddace99542d i18n/trk/extensions/markdown/package.i18n.json
-  our    100644 c7a539dac45ee72aae83994082c0712c8e2ad3c9 i18n/trk/extensions/markdown/package.i18n.json
-  their  100644 7918c3811b0163513fdad86d98ec5cdd794599e3 i18n/trk/extensions/markdown/package.i18n.json
-@@ -27,6 +27,10 @@
- 	"markdown.styles.dec": "Markdown önizlemesinde kullanılmak üzere CSS stil dosyalarını işaret eden bir URL'ler veya yerel yollar listesi. Göreli yollar, gezginde açılan klasöre göreli olarak yorumlanır.",
- 	"markdown.showPreviewSecuritySelector.title": "Önizleme Güvenlik Ayarlarını Değiştir",
- 	"markdown.trace.desc": "Markdown eklentisi için hata ayıklama günlüğünü etkinleştir.",
-+<<<<<<< .our
- 	"markdown.preview.refresh.title": "Önizlemeyi Yenile",
- 	"markdown.preview.toggleLock.title": "Önizleme Kilitlemeyi Aç/Kapat"
-+=======
-+	"markdown.refreshPreview.title": "Önizlemeyi Yenile"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 4a8a4fba715e6fd5cd349913d9b51f9cc09f453b i18n/trk/extensions/typescript/out/utils/api.i18n.json
-  their  100644 c4d4b0caae846b7c458f99e59e749276c2267056 i18n/trk/extensions/typescript/out/utils/api.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"invalidVersion": "geçersiz sürüm"
- }
-\ No newline at end of file
-changed in both
-  base   100644 455ef6e2cd661993d5860e5d0ecd4dda2524eaec i18n/trk/extensions/typescript/out/utils/versionPicker.i18n.json
-  our    100644 bbccc6cfbc110151af8ac9dffb09062dca1fe838 i18n/trk/extensions/typescript/out/utils/versionPicker.i18n.json
-  their  100644 bd757dc390127da2064872f25ec4ff2b5035f34c i18n/trk/extensions/typescript/out/utils/versionPicker.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"useVSCodeVersionOption": "VS Code'un Sürümünü Kullan",
- 	"useWorkspaceVersionOption": "Çalışma Alanı Sürümünü Kullan",
- 	"learnMore": "Daha Fazla Bilgi Edin",
-changed in both
-  base   100644 56d26c0c0e9f75876b184616868a53617e713ad1 i18n/trk/extensions/typescript/out/utils/versionProvider.i18n.json
-  our    100644 86f606ebb3a1b93760a90b5264b62ca214d3b116 i18n/trk/extensions/typescript/out/utils/versionProvider.i18n.json
-  their  100644 639b0c30529caec38d38ac76367324b271dbb1bd i18n/trk/extensions/typescript/out/utils/versionProvider.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"couldNotLoadTsVersion": "Bu yolda TypeScript sürümü yüklenemedi",
- 	"noBundledServerFound": "VS Code'un tsserver'ı hatalı bir virüs tespit aracı gibi bir uygulama tarafından silindi. Lütfen VS Code'u yeniden yükleyin."
- }
-\ No newline at end of file
-changed in both
-  base   100644 e8c103349d0456f612fd7946ffb9ddff67799bad i18n/trk/extensions/typescript/package.i18n.json
-  our    100644 58f0a5a249c42bb0db613701c4f884fac455ba97 i18n/trk/extensions/typescript/package.i18n.json
-  their  100644 6a51d6c3ed71473c346bea46f5e0e0e0326fb2d4 i18n/trk/extensions/typescript/package.i18n.json
-changed in both
-  base   100644 c54714a1c61653d8b6e14c3340bc8f8ef702a3ee i18n/trk/src/vs/code/electron-main/menus.i18n.json
-  our    100644 ace3ab96e0fa1ead7fddaef7b7dca337a5d22633 i18n/trk/src/vs/code/electron-main/menus.i18n.json
-  their  100644 2a2c04a9be24ae2164b81312bb48f8583e2dc33d i18n/trk/src/vs/code/electron-main/menus.i18n.json
-changed in both
-  base   100644 1113da7233fb821e3fa850abe800a1a1aab22a32 i18n/trk/src/vs/code/electron-main/windows.i18n.json
-  our    100644 689291cc8807e32e3cfda7f943c2503552525c53 i18n/trk/src/vs/code/electron-main/windows.i18n.json
-  their  100644 03fcb4b6a05d614fd74949e52461effae4e0617a i18n/trk/src/vs/code/electron-main/windows.i18n.json
-@@ -9,15 +9,30 @@
- 	"ok": "Tamam",
- 	"pathNotExistTitle": "Yol yok",
- 	"pathNotExistDetail": "'{0}' yolu artık diskte değil.",
-+<<<<<<< .our
- 	"reopen": "&&Yeniden Aç",
- 	"wait": "&&Beklemeye Devam Et",
- 	"close": "&&Kapat",
-+=======
-+	"openWorkspace": "&&Aç",
-+	"openWorkspaceTitle": "Çalışma Alanı Aç",
-+	"save": "&&Kaydet",
-+	"doNotSave": "Kaydet&&me",
-+	"cancel": "İptal",
-+	"saveWorkspaceMessage": "Çalışma alanı yapılandırmanızı bir dosya olarak kaydetmek istiyor musunuz?",
-+	"saveWorkspaceDetail": "Yeniden açmayı planlıyorsanız, çalışma alanınızı kaydedin.",
-+	"saveWorkspace": "Çalışma Alanını Kaydet",
-+	"reopen": "Yeniden Aç",
-+	"wait": "Beklemeye Devam Et",
-+	"close": "Kapat",
-+>>>>>>> .their
- 	"appStalled": "Pencere artık yanıt vermiyor",
- 	"appStalledDetail": "Pencereyi yeniden açabilir, kapatabilir veya bekleyebilirsiniz.",
- 	"appCrashed": "Pencere kilitlendi",
- 	"appCrashedDetail": "Verdiğimiz rahatsızlıktan dolayı özür dileriz! Pencereyi yeniden açıp kaldığınız yerden devam edebilirsiniz.",
- 	"open": "Aç",
- 	"openFolder": "Klasör Aç",
-+<<<<<<< .our
- 	"openFile": "Dosya Aç",
- 	"workspaceOpenedMessage": "Çalışma alanı '{0}' kaydedilemiyor",
- 	"workspaceOpenedDetail": "Çalışma alanı zaten başka bir pencerede açılmış. Lütfen ilk olarak o pencereyi kapatın ve tekrar deneyin.",
-@@ -29,4 +44,7 @@
- 	"saveWorkspaceMessage": "Çalışma alanı yapılandırmanızı bir dosya olarak kaydetmek istiyor musunuz?",
- 	"saveWorkspaceDetail": "Yeniden açmayı planlıyorsanız, çalışma alanınızı kaydedin.",
- 	"saveWorkspace": "Çalışma Alanını Kaydet"
-+=======
-+	"openFile": "Dosya Aç"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 018257d1f222fed10d0c805797f6fd25c35cbb80 i18n/trk/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 80d2362504c2993d022a2eba3b68977e0e73b16b i18n/trk/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 f638cd37b77321cf2737da47b0d746207026ad14 i18n/trk/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -26,11 +26,17 @@
- 	"detectIndentation": "Bir dosyayı açarken, `editor.tabSize` ve `editor.insertSpaces` dosya içeriğine bağlı olarak algılanır.",
- 	"roundedSelection": "Seçimlerin köşelerinin yuvarlak olup olmayacağını denetler",
- 	"scrollBeyondLastLine": "Düzenleyicinin son satırın ötesine ilerleyip ilerlemeyeceğini denetler",
-+<<<<<<< .our
- 	"scrollBeyondLastColumn": "Düzenleyicinin yatay olarak kaydıracağına ek karakter sayısı",
- 	"smoothScrolling": "Düzenleyicinin bir animasyon kullanarak kaydırıp kaydırmayacağını denetler",
- 	"minimap.enabled": "Mini haritanın gösterilip gösterilmeyeceğini denetler",
- 	"minimap.side": "Mini haritanın görüntüleneceği tarafı denetler.",
- 	"minimap.showSlider": "Mini harita kaydıracının otomatik olarak gizlenip gizlenmeyeceğini denetler.",
-+=======
-+	"smoothScrolling": "Düzenleyicinin bir animasyon kullanarak kaydırıp kaydırmayacağını denetler",
-+	"minimap.enabled": "Mini haritanın gösterilip gösterilmeyeceğini denetler",
-+	"minimap.showSlider": "Mini harita kaydıracının otomatik olarak gizlenip gizlenmeyeceğini denetler. Alabileceği değerler 'always' ve 'mouseover'dır.",
-+>>>>>>> .their
- 	"minimap.renderCharacters": "(Renk blokları yerine) Bir satırdaki gerçek harfleri göster",
- 	"minimap.maxColumn": "Hazırlanacak mini haritanın azami genişliğini belirli sayıda sütunla sınırla",
- 	"find.seedSearchStringFromSelection": "Bulma Araç Çubuğu'ndaki arama metninin, düzenleyicideki seçili alandan beslenmesini denetler",
-@@ -106,11 +112,14 @@
- 	"accessibilitySupport": "Düzenleyicinin ekran okuyucular için optimize edilmiş bir modda çalışıp çalışmayacağını denetler.",
- 	"links": "Düzenleyicinin bağlantıları otomatik algılayıp, onları tıklanabilir yapıp yapmayacağını denetler",
- 	"colorDecorators": "Düzenleyicinin satır içi renk dekoratörlerini ve renk seçiciyi gösterip göstermemesini denetler.",
-+<<<<<<< .our
- 	"codeActions": "Kod eylemleri ampulunu etkinleştirir",
- 	"codeActionsOnSave.organizeImports": "Kaydederken \"içe aktarımları düzenle\" çalıştırılsın mı?",
- 	"codeActionsOnSave": "Kaydetme esnasında çalıştırılacak kod eylem türleri.",
- 	"codeActionsOnSaveTimeout": "Kaydetme esnasında çalıştırılacak kod eylem türleri için zaman aşımı.",
- 	"selectionClipboard": "Linux birincil panosunun desteklenip desteklenmeyeceğini denetler.",
-+=======
-+>>>>>>> .their
- 	"sideBySide": "Karşılaştırma düzenleyicisinin farklılıkları yan yana mı yoksa satır içinde mi göstereceğini denetler",
- 	"ignoreTrimWhitespace": "Karşılaştırma düzenleyicisinin baştaki veya sondaki boşluklardaki değişmeleri farklılık olarak gösterip göstermemesini denetler",
- 	"largeFileOptimizations": "Yoğun bellek kullanan belirli özellikleri devre dışı bırakacak şekilde büyük dosyalarla özel olarak ilgilenilmesi.",
-changed in both
-  base   100644 dba4219b1f74bd41f2538358e417634fe7d10282 i18n/trk/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 2cef84bd724584b1f220944adb841c7825808a67 i18n/trk/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 41fe598e229e5e3b3b2f1d9c7cc263bf64318ffe i18n/trk/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -28,12 +28,16 @@
- 	"errorBorder": "Düzenleyicideki hata karalamalarının kenarlık rengi.",
- 	"warningForeground": "Düzenleyicideki uyarı karalamalarının ön plan rengi.",
- 	"warningBorder": "Düzenleyicideki uyarı karalamalarının kenarlık rengi.",
-+<<<<<<< .our
- 	"infoForeground": "Düzenleyicideki bilgilendirme karalamalarının ön plan rengi.",
- 	"infoBorder": "Düzenleyicideki bilgilendirme karalamalarının kenarlık rengi.",
- 	"hintForeground": "Düzenleyicideki ipucu karalamalarının ön plan rengi.",
- 	"hintBorder": "Düzenleyicideki ipucu karalamalarının kenarlık rengi.",
- 	"unnecessaryForeground": "Düzenleyicide gereksiz kodun ön plan rengi.",
- 	"overviewRulerRangeHighlight": "Aralık vurguları için genel bakış cetvelinin işaretleyici rengi. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
-+=======
-+	"overviewRulerRangeHighlight": "Aralık vurguları için genel bakış cetvelinin işaretleyici rengi.",
-+>>>>>>> .their
- 	"overviewRuleError": "Hatalar için genel bakış cetvelinin işaretleyici rengi.",
- 	"overviewRuleWarning": "Uyarılar için genel bakış cetvelinin işaretleyici rengi.",
- 	"overviewRuleInfo": "Bilgilendirmeler için genel bakış cetvelinin işaretleyici rengi."
-changed in both
-  base   100644 25e86b185b8182cf0c032ef5f88768fabee95f7d i18n/trk/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
-  our    100644 6faf663326db20aad45550dfe4eb9100056606f9 i18n/trk/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
-  their  100644 d670cfb42ba4ca6da00fb2c4264f1b17916b1daf i18n/trk/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.i18n.json
-@@ -7,7 +7,11 @@
- 	"wordHighlight": "Bir değişkeni okumak gibi, okuma-erişimi sırasındaki bir sembolün arka plan rengi.",
- 	"wordHighlightStrong": "Bir değişkene yazmak gibi, yazma-erişimi sırasındaki bir sembolün arka plan rengi.",
- 	"overviewRulerWordHighlightForeground": "Sembol vurguları için genel bakış cetvelinin işaretleyici rengi.",
-+<<<<<<< .our
- 	"overviewRulerWordHighlightStrongForeground": "Yazma erişimli sembol vurguları için genel bakış cetvelinin işaretleyici rengi.",
- 	"wordHighlight.next.label": "Sonraki Sembol Vurgusuna Git",
- 	"wordHighlight.previous.label": "Önceki Sembol Vurgusuna Git"
-+=======
-+	"overviewRulerWordHighlightStrongForeground": "Yazma erişimli sembol vurguları için genel bakış cetvelinin işaretleyici rengi."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f3d197dfba2c1202b4146554b80f00ec2b0cace3 i18n/trk/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 de45d35b28e099e902eb3585dc451750064bb035 i18n/trk/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 b8fb205e6c36375a6337a311a0f720fe163052ea i18n/trk/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,9 +10,12 @@
- 	"diff": "İki dosyayı birbiriyle karşılaştır.",
- 	"add": "Son aktif pencereye klasör(ler) ekle.",
- 	"goto": "Konumdaki bir dosyayı belirtilen satır ve sütunda aç.",
-+<<<<<<< .our
- 	"newWindow": "Yeni pencere açmaya zorla.",
- 	"reuseWindow": "Bir dosya veya klasörü son aktif pencerede açmaya zorlayın.",
- 	"wait": "Geri dönmeden önce dosyaların kapanmasını bekle.",
-+=======
-+>>>>>>> .their
- 	"locale": "Kullanılacak yerel dil (örnek: en-US veya zh-TW).",
- 	"userDataDir": "Kullanıcı verilerinin tutulacağı klasörü belirtir. Code'un farklı örneklerini açmak için kullanılabilir.",
- 	"version": "Sürümü göster.",
-added in both
-  our    100644 99a30f5c96631abbdccb6a4c0455b218dcfaadc2 i18n/trk/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
-  their  100644 bf71ff9729b6d88a50b9bf74ac6b5497ff8b9955 i18n/trk/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"contributes.color": "Eklenti tarafından tanımlanan tema olarak kullanılabilir renklere ekleme yapar",
- 	"contributes.color.id": "Tema olarak kullanılabilir rengin tanımlayıcısı",
- 	"contributes.color.id.format": "Tanımlayıcılar aa[.bb]* biçiminde olmalıdır",
-changed in both
-  base   100644 ee6263e3e7ecd5560bc928d285f69f1a52fc13ca i18n/trk/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 fdc69c2c9e4d77a2bba5e0204a27fccdd7aa58e1 i18n/trk/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 690e08f5f05d4edd719e9155d797c49585338134 i18n/trk/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -96,6 +96,11 @@
- 	"overviewRulerCurrentContentForeground": "Satır içi birleştirme çakışmalarında \"mevcut olan\" için genel bakış cetveli ön planı.",
- 	"overviewRulerIncomingContentForeground": "Satır içi birleştirme çakışmalarında gelen genel bakış cetveli ön planı.",
- 	"overviewRulerCommonContentForeground": "Satır içi birleştirme çakışmalarında ortak ata genel bakış cetveli ön planı.",
-+<<<<<<< .our
- 	"overviewRulerFindMatchForeground": "Bulunan eşler için genel bakış cetvelinin işaretleyici rengi. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
- 	"overviewRulerSelectionHighlightForeground": "Seçim vurguları için genel bakış cetvelinin işaretleyici rengi. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır."
-+=======
-+	"overviewRulerFindMatchForeground": "Bulunan eşler için genel bakış cetvelinin işaretleyici rengi.",
-+	"overviewRulerSelectionHighlightForeground": "Seçim vurguları için genel bakış cetvelinin işaretleyici rengi."
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 bc99a3fde22aaeefc72f06b9eab3ef3002a7a34f i18n/trk/src/vs/platform/workspaces/common/workspaces.i18n.json
-  their  100644 2492d86a34458d8552d21ab4c566ae3faeba8173 i18n/trk/src/vs/platform/workspaces/common/workspaces.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"codeWorkspace": "Code Çalışma Alanı",
- 	"untitledWorkspace": "İsimsiz (Çalışma Alanı)",
- 	"workspaceNameVerbose": "{0} (Çalışma Alanı)",
-added in both
-  our    100644 be3c5de903c0cad34819d29f1c82c5198bef896c i18n/trk/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
-  their  100644 f48bbd6079549f33255c66d882d01960d90abea1 i18n/trk/src/vs/workbench/api/node/extHostExtensionActivator.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,4 +11,16 @@
- 	"failedDep1": "'{1}' eklentisi etkinleştirilemedi. Neden: bağımlılık '{0}' etkinleştirilemedi.",
- 	"failedDep2": "'{0}' eklentisi etkinleştirilemedi. Neden: 10'dan fazla bağımlılık düzeyi (büyük olasılıkla bağımlılık döngüsü).",
- 	"activationError": "'{0}' eklentisi etkinleştirilemedi: {1}."
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"unknownDep": "`{1}` eklentisi etkinleştirilemedi. Neden: bilinmeyen bağımlılık `{0}`.",
-+	"failedDep1": "`{1}` eklentisi etkinleştirilemedi. Neden: bağımlılık `{0}` etkinleştirilemedi.",
-+	"failedDep2": "`{0}` eklentisi etkinleştirilemedi. Neden: 10'dan fazla bağımlılık düzeyi (büyük olasılıkla bağımlılık döngüsü).",
-+	"activationError": "`{0}` eklentisi etkinleştirilemedi: {1}."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 bb4ce8a484d7afa8ca00c155f63e4b24e9f24e1b i18n/trk/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 ca5ef369836861985d260e6a09f5dc65617432d0 i18n/trk/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 543577ab634087b4896ae86a7d14c4d7eaa50c61 i18n/trk/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -9,8 +9,20 @@
- 	"openFile": "Dosya Aç...",
- 	"openFolder": "Klasör Aç...",
- 	"openFileFolder": "Aç...",
-+<<<<<<< .our
- 	"globalRemoveFolderFromWorkspace": "Çalışma Alanından Klasör Kaldır...",
- 	"saveWorkspaceAsAction": "Çalışma Alanını Farklı Kaydet...",
-+=======
-+	"addFolderToWorkspace": "Çalışma Alanına Klasör Ekle...",
-+	"add": "&&Ekle",
-+	"addFolderToWorkspaceTitle": "Çalışma Alanına Klasör Ekle",
-+	"newWorkspace": "Yeni Çalışma Alanı...",
-+	"select": "&&Seç",
-+	"selectWorkspace": "Çalışma Alanı İçin Klasörleri Seçin",
-+	"removeFolderFromWorkspace": "Çalışma Alanından Klasör Kaldır",
-+	"saveWorkspaceAsAction": "Çalışma Alanını Farklı Kaydet...",
-+	"saveEmptyWorkspaceNotSupported": "Lütfen kaydetmek için ilk olarak bir çalışma alanı açın.",
-+>>>>>>> .their
- 	"save": "&&Kaydet",
- 	"saveWorkspace": "Çalışma Alanını Kaydet",
- 	"openWorkspaceAction": "Çalışma Alanı Aç...",
-changed in both
-  base   100644 0cfde9b6a69f9bd451be6dcf5bb3290d4ab7305a i18n/trk/src/vs/workbench/common/theme.i18n.json
-  our    100644 c3e69879379552f9bae45b018ec024370c6f07fc i18n/trk/src/vs/workbench/common/theme.i18n.json
-  their  100644 77a9782a1f384ce416be291ebe5859aa851b01ea i18n/trk/src/vs/workbench/common/theme.i18n.json
-@@ -11,12 +11,17 @@
- 	"tabHoverBackground": "Fareyle üzerine gelindiğinde sekme arka plan rengi. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
- 	"tabUnfocusedHoverBackground": "Fareyle üzerine gelindiğinde odaklanılmamış bir gruptaki aktif sekmenin arka plan rengi. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
- 	"tabBorder": "Sekmeleri birbirinden ayıran kenarlığın rengi. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
-+<<<<<<< .our
- 	"tabActiveBorder": "Aktif bir sekmenin altındaki kenarlık. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
- 	"tabActiveBorderTop": "Aktif bir sekmenin üstündeki kenarlık. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
- 	"tabActiveUnfocusedBorder": "Odaklanılmamış bir gruptaki aktif bir sekmenin altındaki kenarlık. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
- 	"tabActiveUnfocusedBorderTop": "Odaklanılmamış bir gruptaki aktif bir sekmenin üstündeki kenarlık. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
- 	"tabHoverBorder": "Fareyle üzerine gelindiğinde sekmeleri vurgulayacak kenarlık. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
- 	"tabUnfocusedHoverBorder": "Fareyle üzerine gelindiğinde odaklanılmamış bir gruptaki sekmeleri vurgulayacak kenarlık. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
-+=======
-+	"tabActiveBorder": "Aktif sekmeleri vurgulayacak kenarlık. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
-+	"tabActiveUnfocusedBorder": "Odaklanılmamış bir gruptaki aktif sekmeleri vurgulayacak kenarlık. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
-+>>>>>>> .their
- 	"tabActiveForeground": "Aktif bir gruptaki aktif sekmenin ön plan rengi. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
- 	"tabInactiveForeground": "Aktif bir gruptaki pasif sekmenin ön plan rengi. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
- 	"tabUnfocusedActiveForeground": "Odaklanılmamış bir gruptaki aktif sekmenin ön plan rengi. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.",
-@@ -32,7 +37,10 @@
- 	"panelActiveTitleForeground": "Aktif panelin başlık rengi. Paneller düzenleyici alanının altında gösterilir ve çıktı ve entegre terminal gibi görünümler içerir.",
- 	"panelInactiveTitleForeground": "Pasif panelin başlık rengi. Paneller düzenleyici alanının altında gösterilir ve çıktı ve entegre terminal gibi görünümler içerir.",
- 	"panelActiveTitleBorder": "Aktif başlığının kenarlık rengi. Paneller düzenleyici alanının altında gösterilir ve çıktı ve entegre terminal gibi görünümler içerir.",
-+<<<<<<< .our
- 	"panelDragAndDropBackground": "Panel başlığı ögeleri için sürükle bırak geri bildirim rengi. Panel ögelerinin hâlâ iyi görünmeye devam edebilmesi için renk şeffaf olmalıdır. Paneller, düzenleyici alanının altında gösterilir, çıktı ve entegre terminal gibi görünümler içerir.",
-+=======
-+>>>>>>> .their
- 	"statusBarForeground": "Bir çalışma alanı açıkken durum çubuğu ön plan rengi. Durum çubuğu, pencerenin alt kısmında gösterilir.",
- 	"statusBarNoFolderForeground": "Hiçbir klasör açık değilken durum çubuğu ön plan rengi. Durum çubuğu, pencerenin alt kısmında gösterilir.",
- 	"statusBarBackground": "Bir çalışma alanı açıkken durum çubuğu arka plan rengi. Durum çubuğu, pencerenin alt kısmında gösterilir.",
-changed in both
-  base   100644 0be0914e872c5ca5d8a887bed9ca56b02a54a10e i18n/trk/src/vs/workbench/electron-browser/window.i18n.json
-  our    100644 861c7f35ac06435e7b62f3f5887738853101c48d i18n/trk/src/vs/workbench/electron-browser/window.i18n.json
-  their  100644 c583af8e7cc6927171694b5f244978ad43d7382a i18n/trk/src/vs/workbench/electron-browser/window.i18n.json
-@@ -11,6 +11,10 @@
- 	"cut": "Kes",
- 	"copy": "Kopyala",
- 	"paste": "Yapıştır",
-+<<<<<<< .our
- 	"selectAll": "Tümünü Seç",
- 	"runningAsRoot": "[0] uygulamasını root olarak çalıştırmanız önerilmez."
-+=======
-+	"selectAll": "Tümünü Seç"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 b60e378b48d27fc849bf2c4a7fe8c0c938472539 i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
-  their  100644 e7efe6a01b2c73bab0b5cd888356dbfc317a9dd8 i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"toggleMinimap": "Görünüm: Mini Haritayı Aç/Kapat"
- }
-\ No newline at end of file
-changed in both
-  base   100644 5c757ea1565b5000a9d40c80e491306eef1d0efc i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
-  our    100644 453a7859ffd3509f2ee559d3ee65f0fe834f105d i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
-  their  100644 001627659e13f767b388cc909339254c728a4540 i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"toggleRenderControlCharacters": "Görünüm: Kontrol Karakterlerini Aç/Kapat"
- }
-\ No newline at end of file
-changed in both
-  base   100644 87c50ce448866baa44a0daf5345554a86f7ea4c5 i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
-  our    100644 d6d94607f8350418de507bc968230a0f7f54faa9 i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
-  their  100644 7910538f5d271188cd6c3485bec2a5dd88db91a3 i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"toggleRenderWhitespace": "Görünüm: Boşlukları Görüntülemeyi Aç/Kapat"
- }
-\ No newline at end of file
-changed in both
-  base   100644 3769ac4ce31b5027f24c9e5cfbce1efb3bd015ca i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 3b4248d45e7ecb01c6045e1c3d824ba835249478 i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 c7e63743c9f79c5a97ea0b07bc4c185d69dfe03d i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -28,7 +28,12 @@
- 	"preLaunchTaskExitCode": "'{0}' ön başlatma görevi {1} çıkış koduyla sonlandı.",
- 	"showErrors": "Hataları Göster",
- 	"noFolderWorkspaceDebugError": "Aktif dosyada hata ayıklama yapılamıyor. Lütfen, dosyanın diskte kayıtlı olduğundan ve bu dosya türü için hata ayıklama eklentinizin olduğundan emin olun.",
-+<<<<<<< .our
- 	"cancel": "İptal",
- 	"DebugTaskNotFound": "'{0}' görevi bulunamadı.",
- 	"taskNotTracked": "'{0}' görevi izlenemez."
-+=======
-+	"NewLaunchConfig": "Lütfen uygulamanızın başlatma yapılandırması dosyasını ayarlayın. {0}",
-+	"DebugTaskNotFound": "'{0}' ön başlatma görevi bulunamadı."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6d21fb46e92fe00a8be9d373eb3179f87252aa03 i18n/trk/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  our    100644 a61ef28f2c1f3ddbea5a7a691dfc7b4cf2b07221 i18n/trk/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  their  100644 5e977fb511d52b2460d92f16efd6b7b325fa3911 i18n/trk/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-@@ -8,6 +8,23 @@
- 	],
- 	"debugAdapterBinNotFound": "Hata ayıklama bağdaştırıcısı yürütülebilir dosyası '{0}', mevcut değil.",
- 	"debugAdapterCannotDetermineExecutable": "Hata ayıklama bağdaştırıcısı yürütülebilir dosyası '{0}' belirlenemedi.",
-+<<<<<<< .our
- 	"unableToLaunchDebugAdapter": "'{0}' tarafından hata ayıklama bağdaştırıcısı başlatılamadı.",
- 	"unableToLaunchDebugAdapterNoArgs": "Hata ayıklama bağdaştırıcısı başlatılamıyor."
-+=======
-+	"launch.config.comment1": "Olası öznitelikler hakkında bilgi edinmek için IntelliSense kullanın.",
-+	"launch.config.comment2": "Mevcut özniteliklerin açıklamalarını görmek için fare ile üzerine gelin.",
-+	"launch.config.comment3": "Daha fazla bilgi için ziyaret edin: {0}",
-+	"debugType": "Yapılandırma türü.",
-+	"debugTypeNotRecognised": "Hata ayıklama türü tanınmıyor. Karşılık gelen hata ayıklama uzantısı yüklemiş olduğunuzdan ve etkinleştirildiğinden emin olun.",
-+	"node2NotSupported": "\"node2\" artık desteklenmiyor, bunun yerine \"node\" kullanın ve \"protocol\" özniteliğini \"inspector\" olarak ayarlayın.",
-+	"debugName": "Yapılandırmanın adı; başlatma yapılandırması açılır kutu menüsünde görünür.",
-+	"debugRequest": "Yapılandırmanın istek türü. \"launch\" veya \"attach\" olabilir.",
-+	"debugServer": "Sadece eklenti geliştirme hata ayıklaması için: eğer port belirtildiyse; Vs Code, bir hata ayıklama bağdaştırıcısına sunucu modunda bağlanmayı dener",
-+	"debugPrelaunchTask": "Hata ayıklama oturumu başlamadan önce çalıştırılacak görev.",
-+	"debugWindowsConfiguration": "Windows'a özel başlangıç yapılandırması öznitelikleri.",
-+	"debugOSXConfiguration": "OS X'e özel başlangıç yapılandırması öznitelikleri.",
-+	"debugLinuxConfiguration": "Linux'a özel başlangıç yapılandırması öznitelikleri.",
-+	"deprecatedVariables": "'env.', 'config.' ve 'command.' kullanım dışıdır, bunların yerine 'env:', 'config:' ve 'command:' kulanın."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8deac17c2e0ad1b816f0994dcb60515e529c4b09 i18n/trk/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 69722eca3eea4a8c67f00341a6ba461150a4d6f3 i18n/trk/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 71c438668c33bed6f2882d94a6910b31288fe3ba i18n/trk/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-@@ -52,7 +52,14 @@
- 	"extensionInstalled": "Tavsiye edilen eklenti zaten yüklü",
- 	"showRecommendedKeymapExtensionsShort": "Tuş Haritaları",
- 	"showLanguageExtensionsShort": "Dil Eklentileri",
-+<<<<<<< .our
- 	"showAzureExtensionsShort": "Azure Eklentileri",
-+=======
-+	"showAzureExtensions": "Azure Eklentilerini Göster",
-+	"showAzureExtensionsShort": "Azure Eklentileri",
-+	"configureWorkspaceRecommendedExtensions": "Tavsiye Edilen Eklentileri Yapılandır (Çalışma Alanı)",
-+	"ConfigureWorkspaceRecommendations.noWorkspace": "Tavsiyeler, sadece çalışma alanı klasöründe mevcuttur.",
-+>>>>>>> .their
- 	"OpenExtensionsFile.failed": " '.vscode' klasörü içinde 'extensions.json' dosyası oluşturulamıyor ({0}).",
- 	"configureWorkspaceRecommendedExtensions": "Tavsiye Edilen Eklentileri Yapılandır (Çalışma Alanı)",
- 	"configureWorkspaceFolderRecommendedExtensions": "Tavsiye Edilen Eklentileri Yapılandır (Çalışma Alanı Klasörü)",
-changed in both
-  base   100644 55a64a319b8b03a0cf35fced109c0d689a786ab6 i18n/trk/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  our    100644 c6dceab75161c027957827fd64ff7a2a82244860 i18n/trk/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  their  100644 84098dc8d04bf1f06896bbcf6bb9cb85837f8ef3 i18n/trk/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-changed in both
-  base   100644 80d061c3da22131945a7dcd53235b6b9649338a0 i18n/trk/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 4948cddf5c4363e22249b656347c511d008f08b3 i18n/trk/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 a44ee520b07739d4737def006d4f14e43ed03932 i18n/trk/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-@@ -47,7 +47,11 @@
- 	"sortOrder.filesFirst": "Dosya ve klasörler adlarına göre, alfabetik olarak sıralanırlar. Dosyalar klasörlerden önce görüntülenir.",
- 	"sortOrder.type": "Dosya ve klasörler uzantılarına göre, alfabetik olarak sıralanırlar. Klasörler dosyalardan önce görüntülenir.",
- 	"sortOrder.modified": "Dosya ve klasörler son değiştirilme tarihine göre, azalan düzende sıralanırlar. Klasörler dosyalardan önce görüntülenir.",
-+<<<<<<< .our
- 	"sortOrder": "Gezginde dosya ve klasörlerin sıralamasını denetler. Varsayılan sıralamaya ek olarak, sıralamayı; 'mixed' (dosya ve klasörler karışık olarak sıralanır), 'type' (dosya türüne göre), 'modified' (son düzenlenme tarihine göre) veya 'filesFirst' (dosyaları klasörlerden önce sırala) olarak ayarlayabilirsiniz.",
- 	"explorer.decorations.colors": "Dosya süslemelerinin renkleri kullanıp kullanmayacağını denetler.",
- 	"explorer.decorations.badges": "Dosya süslemelerinin göstergeleri kullanıp kullanmayacağını denetler."
-+=======
-+	"sortOrder": "Gezginde dosya ve klasörlerin sıralamasını denetler. Varsayılan sıralamaya ek olarak, sıralamayı; 'mixed' (dosya ve klasörler karışık olarak sıralanır), 'type' (dosya türüne göre), 'modified' (son düzenlenme tarihine göre) veya 'filesFirst' (dosyaları klasörlerden önce sırala) olarak ayarlayabilirsiniz."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 9dff53f0852e43bfeaedb576c89d8e56084dfad2 i18n/trk/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
-  our    100644 c2e160be13cf1d445172c02010b175bc6b49cb4a i18n/trk/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
-  their  100644 7bc1986b390fcbf4a301777a8ab059c1352a84fb i18n/trk/src/vs/workbench/parts/files/browser/views/explorerViewer.i18n.json
-@@ -10,9 +10,12 @@
- 	"dropFolder": "Klasörü çalışma alanına eklemek istiyor musunuz?",
- 	"addFolders": "Klasörleri &&Ekle",
- 	"addFolder": "Klasörü &&Ekle",
-+<<<<<<< .our
- 	"confirmMove": "'{0}' ögesini taşımak istediğinizden emin misiniz?",
- 	"doNotAskAgain": "Bir daha sorma",
- 	"moveButtonLabel": "&&Taşı",
-+=======
-+>>>>>>> .their
- 	"confirmOverwriteMessage": "'{0}' hedef klasörde zaten mevcut. Değiştirmek istiyor musunuz?",
- 	"irreversible": "Bu eylem geri döndürülemez!",
- 	"replaceButtonLabel": "&&Değiştir"
-changed in both
-  base   100644 bc11b3fbd68cd2dce3b0bd54ac8a5f4eac20d766 i18n/trk/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-  our    100644 0b56ea19d5bce8bbc82d144e7b2346054d2fe29f i18n/trk/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-  their  100644 9d16873e39fbcd2e952b20313ef8f3cca733693a i18n/trk/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-changed in both
-  base   100644 2fc322d2c8b845da4d8a75940754161227edd755 i18n/trk/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  our    100644 486ac598226f487b863d555ce5dd141c27268d0e i18n/trk/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  their  100644 06bd99d62b1d6f27257bb3bbe961bd75ef8c5220 i18n/trk/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-changed in both
-  base   100644 cd21a41cb42be464d59d37426c406273fc0f6404 i18n/trk/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  our    100644 d7ca189ea44c5d2606d8d9a850e0f1815ce27d51 i18n/trk/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  their  100644 00b004667ea2800c8d7791567993add1d4005b95 i18n/trk/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -10,6 +11,11 @@
- 	"hideRepository": "Gizle",
- 	"installAdditionalSCMProviders": "Ek SCM Sağlayıcıları Yükle...",
- 	"no open repo": "Aktif bir kaynak kontrolü sağlayıcısı yok.",
-+=======
-+	"commitMessage": "Mesaj (commit'lemek için {0} tuşlarına basın)",
-+	"installAdditionalSCMProviders": "Ek SCM Sağlayıcıları Yükle...",
-+	"no open repo": "Aktif kaynak kontrolü yok.",
-+>>>>>>> .their
- 	"source control": "Kaynak Kontrolü",
- 	"viewletTitle": "{0}: {1}",
- 	"hideView": "Gizle"
-changed in both
-  base   100644 29aaafa9f7d6843f546cdfef52b1cbc1195a4ece i18n/trk/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  our    100644 fc38590cc3008cde13df29309821e754e11630d7 i18n/trk/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  their  100644 2ad5b6fc3719f24cbc819cf93e60e0b5cfd4dcae i18n/trk/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-added in both
-  our    100644 17ebc206f046c9e11bcb96946d05c49f959fc7c8 i18n/trk/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
-  their  100644 096f6087c993ad88e1dbd2fa65c71b8b3683dd06 i18n/trk/src/vs/workbench/parts/search/common/queryBuilder.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"search.noWorkspaceWithName": "Çalışma alanında belirtilen isimde klasör yok: {0}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 ae1ee31d4593e4b719f47a4ca17eeb850f57d531 i18n/trk/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 05f7e742aff55adb4d6b203dba58bf230a657ea7 i18n/trk/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 f88d4acd4226ab156e945eaae66461cc35d9dc86 i18n/trk/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-@@ -12,7 +12,11 @@
- 	"JsonSchema.tasks.dependsOn.array": "Bu görevin bağlı olduğu diğer görevler.",
- 	"JsonSchema.tasks.presentation": "Görevin çıktısını gösterip, girdisini okumak için kullanılacak paneli yapılandırır.",
- 	"JsonSchema.tasks.presentation.echo": "Çalıştırılan komutun panele yazdırılıp yazdırılmayacağını denetler. Varsayılan olarak açıktır.",
-+<<<<<<< .our
- 	"JsonSchema.tasks.presentation.focus": "Panelin, kendisine odaklanmaya izin verip vermeyeceğini denetler. Varsayılan olarak kapalıdır. Eğer \"true\" değeri atanırsa panel de açığa çıkar.",
-+=======
-+	"JsonSchema.tasks.presentation.focus": "Panelin, kendisine odaklanmaya izin verip vermeyeceğini denetler. Varsayılan olarak kapalıdır. Eğer \"true\" olarak ayarlanırsa panel de açığa çıkar.",
-+>>>>>>> .their
- 	"JsonSchema.tasks.presentation.reveal.always": "Bu görev yürütülürken terminali her zaman ortaya çıkarır.",
- 	"JsonSchema.tasks.presentation.reveal.silent": "Sadece hiçbir sorun eşleştiricisi görevle ilişkilendirilmemiş ve görev çalıştırılırken hata oluşuyorsa terminali ortaya çıkar.",
- 	"JsonSchema.tasks.presentation.reveal.never": "Bu görev yürütülürken terminali hiçbir zaman ortaya çıkarmaz.",
-changed in both
-  base   100644 dc3290986babfb11a11d2d385096bf061c0cc99c i18n/trk/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 d266928557d5bfc332011e4d79ff493843cb99d1 i18n/trk/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 8545c2215f7d946b613287f6225f89b81fb50bc9 i18n/trk/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -16,9 +16,13 @@
- 	"manyProblems": "10b+",
- 	"runningTasks": "Çalışan Görevleri Göster",
- 	"tasks": "Görevler",
-+<<<<<<< .our
- 	"TaskSystem.noHotSwap": "Aktif bir görev çalıştıran görev yürütme motorunu değiştirmek pencereyi yeniden yüklemeyi gerektirir",
- 	"reloadWindow": "Pencereyi Yeniden Yükle",
- 	"TaskServer.folderIgnored": "{0} klasörü, 0.1.0 görev sürümünü kullandığı için yok sayıldı.",
-+=======
-+	"TaskSystem.noHotSwap": "Görev yürütme motorunu değiştirmek pencereyi yeniden yüklemeyi gerektirir",
-+>>>>>>> .their
- 	"TaskService.noBuildTask1": "Derleme görevi tanımlanmamış. tasks.json dosyasındaki bir görevi 'isBuildCommand' ile işaretleyin.",
- 	"TaskService.noBuildTask2": "Derleme görevi tanımlanmamış. tasks.json dosyasındaki bir görevi, bir 'build' grubu olarak işaretleyin.",
- 	"TaskService.noTestTask1": "Test görevi tanımlanmamış. tasks.json dosyasındaki bir testi 'isTestCommand' ile işaretleyin.",
-changed in both
-  base   100644 0c8941a88db58abfcb6e2d3b3414d3c23a36698b i18n/trk/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  our    100644 22ab290691fcd03121bae2c2c08062943aafe944 i18n/trk/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  their  100644 153d7d470946ddcaf71b37758274a51c0588b1db i18n/trk/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-@@ -15,7 +15,10 @@
- 	"ConfigurationParser.invalidVaraibleReference": "Hata: Geçersiz problemMatcher başvusu: {0}\n",
- 	"ConfigurationParser.noTaskType": "Hata: 'tasks' yapılandırması bir 'type' özelliğine sahip olmalıdır. Yapılandırma yok sayılacaktır.\n{0}\n",
- 	"ConfigurationParser.noTypeDefinition": "Hata: '{0}' olarak kayıtlı bir görev türü yok. İlgili görev sağlayıcısını içeren bir eklentiyi yüklemeyi mi unuttunuz?",
-+<<<<<<< .our
- 	"ConfigurationParser.missingRequiredProperty": "Hata: ihtiyaç duyulan '{1}' özelliği, '{0}' görev yapılandırmasında eksik. Görev yapılandırması yok sayılacaktır.",
-+=======
-+>>>>>>> .their
- 	"ConfigurationParser.notCustom": "Hata: 'tasks' bir özel görev olarak tanımlanmamış. Yapılandırma yok sayılacaktır.\n{0}\n",
- 	"ConfigurationParser.noTaskName": "Hata: bir görev, bir 'label' özelliği belirtmelidir. Görev yok sayılacaktır.\n{0}\n",
- 	"taskConfiguration.noCommandOrDependsOn": "Hata: '{0}' görevi bir komut veya dependsOn özelliği belirtmiyor. Görev yok sayılacaktır. Görevin tanımı:\n{1}",
-changed in both
-  base   100644 e7ce1ac11dbb155735b767eed4c21104a5a87070 i18n/trk/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  our    100644 854c812cb049e48d376f3cfcfd998eb62e16c306 i18n/trk/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  their  100644 82b1bdbdd460b5078de90ca272958e2ad4907ebf i18n/trk/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -9,6 +10,11 @@
- 	"termEntryAriaLabel": "{0}, terminal seçici",
- 	"termCreateEntryAriaLabel": "{0}, yeni terminal oluştur",
- 	"workbench.action.terminal.newplus": "$(plus) Yeni Entegre Terminal Oluştur",
-+=======
-+	"termEntryAriaLabel": "{0}, terminal seçici",
-+	"termCreateEntryAriaLabel": "{0}, yeni terminal oluştur",
-+	"'workbench.action.terminal.newplus": "$(plus) Yeni Entegre Terminal Oluştur",
-+>>>>>>> .their
- 	"noTerminalsMatching": "Eşleşen terminal yok",
- 	"noTerminalsFound": "Açık terminal yok"
- }
-\ No newline at end of file
-changed in both
-  base   100644 7ba23fb595cf13e4d218315bf573bad8a9de5368 i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 0dfa05cd7919b2b8edd950bcde47408dafdd57f0 i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 221d8d7f76efd6be3ac9a43b6ea8f323df840c5d i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -53,6 +53,7 @@
- 	"workbench.action.terminal.hideFindWidget": "Bulma Aracını Gizle",
- 	"nextTerminalFindTerm": "Sonraki Arama Terimini Göster",
- 	"previousTerminalFindTerm": "Önceki Arama Terimini Göster",
-+<<<<<<< .our
- 	"quickOpenTerm": "Aktif Terminali Değiştir",
- 	"workbench.action.terminal.scrollToPreviousCommand": "Önceki Komuta Kadar Kaydır",
- 	"workbench.action.terminal.scrollToNextCommand": "Sonraki Komuta Kadar Kaydır",
-@@ -60,4 +61,7 @@
- 	"workbench.action.terminal.selectToNextCommand": "Sonraki Komuta Kadar Seç",
- 	"workbench.action.terminal.selectToPreviousLine": "Önceki Satıra Kadar Seç",
- 	"workbench.action.terminal.selectToNextLine": "Sonraki Satıra Kadar Seç"
-+=======
-+	"quickOpenTerm": "Terminal: Aktif Terminali Değiştir"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a0c1e2f9685d1762de71c509792e45adc522425c i18n/trk/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 f7e01d490d6d3b9163203a648fd3930fc88e2b59 i18n/trk/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 61ebe35f50cc0198e08a3eafd72952210fa283f6 i18n/trk/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -11,7 +11,12 @@
- 	"read the release notes": "{0} v{1} uygulamasına hoş geldiniz! Sürüm Notları'nı okumak ister misiniz?",
- 	"licenseChanged": "Lisans koşullarımız değişti, lütfen [buraya]({0}) tıklayarak gözden geçirin.",
- 	"neveragain": "Tekrar Gösterme",
-+<<<<<<< .our
- 	"64bitisavailable": "64-bit Windows için {0} şu an mevcut! Daha fazla bilgi almak için [buraya]({0}) tıklayın.",
-+=======
-+	"64bitisavailable": "64-bit Windows için {0} şu an mevcut!",
-+	"learn more": "Daha Fazla Bilgi Edin",
-+>>>>>>> .their
- 	"updateIsReady": "Yeni {0} güncellemesi var.",
- 	"noUpdatesAvailable": "Şu anda mevcut herhangi bir güncelleme yok.",
- 	"ok": "Tamam",
-changed in both
-  base   100644 8098995a4862cda69516d572e609f4efe0fde2fa i18n/trk/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  our    100644 f17a8da753e58d36486dd2f3da30accab67d47b7 i18n/trk/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  their  100644 10ee69b97f9abe4da1e1d51ed02a7f6bdff62a9a i18n/trk/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-@@ -37,6 +37,8 @@
- 	"welcomePage.showCommandsDescription": "Komut Paleti'nden hızlıca komutlara erişin ve arayın ({0})",
- 	"welcomePage.interfaceOverview": "Arayüze genel bakış",
- 	"welcomePage.interfaceOverviewDescription": "Kullanıcı arayüzünün ana bileşenlerini vurgulayan bir kaplamayı görüntüleyin",
-+	"welcomePage.deployToAzure": "Uygulamaları buluta deploy edin",
-+	"welcomePage.deployToAzureDescription": "Node uygulamalarınızı Azure Uygulama Hizmeti'ne nasıl deploy edeceğinizi öğrenin",
- 	"welcomePage.interactivePlayground": "İnteraktif oyun alanı",
- 	"welcomePage.interactivePlaygroundDescription": "Başlıca düzenleyici özelliklerini kısa örneklerle deneyin"
- }
-\ No newline at end of file
-changed in both
-  base   100644 faac6bda704888a6997b06dc69f6f073bb56f8a8 i18n/trk/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-  our    100644 5ee2b5b9060610ae30de5ea1a5435d7b1d1f5347 i18n/trk/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-  their  100644 2b1dfd41f12142f79e346c75a0c2376b2ad49c62 i18n/trk/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
-changed in both
-  base   100644 80ad1bc8870bde0767e5ef44a3d3f7ee2a14f4c6 i18n/trk/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
-  our    100644 6f7dcd3fdbb3f59859e4776b8f1ed52c90453813 i18n/trk/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
-  their  100644 ca2222963ff697a9123a0c4b16e805732a524860 i18n/trk/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"editorWalkThrough.title": "İnteraktif Oyun Alanı",
- 	"editorWalkThrough": "İnteraktif Oyun Alanı"
- }
-\ No newline at end of file
-changed in both
-  base   100644 49c5097a73f0583b109dbb91ea4737d79fd4252b i18n/trk/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  our    100644 4c2ceda75b65e71f4874e7f6054b2ceb430c3389 i18n/trk/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  their  100644 56b11739e3f5f81614cdbb5f52994d7f36de3a8e i18n/trk/src/vs/workbench/services/configuration/node/configuration.i18n.json
-@@ -13,6 +13,7 @@
- 	"invalid.title": "'configuration.title' bir dize olmalıdır",
- 	"vscode.extension.contributes.defaultConfiguration": "Varsayılan düzenleyici yapılandırma ayarlarına dil bazında ekleme yapar.",
- 	"invalid.properties": "'configuration.properties' bir nesne olmalıdır",
-+<<<<<<< .our
- 	"invalid.allOf": "'configuration.allOf' kullanım dışıdır ve artık kullanılmamalıdır. Bunun yerine, birden çok yapılandırma bölümlerini bir dizi olarak 'configuration' ekleme noktasına geçirin.",
- 	"workspaceConfig.folders.description": "Çalışma alanına yüklenecek klasörler listesi.",
- 	"workspaceConfig.path.description": "Bir dosya yolu. ör. `/root/folderA` veya çalışma alanı dosyasının konumuna karşı çözümlenecek göreceli bir yol için `./folderA`.",
-@@ -21,4 +22,9 @@
- 	"workspaceConfig.settings.description": "Çalışma alanı ayarları",
- 	"workspaceConfig.extensions.description": "Çalışma alanı eklentileri",
- 	"unknownWorkspaceProperty": "Bilinmeyen çalışma alanı yapılandırması özelliği"
-+=======
-+	"workspaceConfig.folders.description": "Çalışma alanında yüklenecek klasörler listesi. Bir dosya yolu olmalıdır. ör. `/root/folderA` veya çalışma alanı dosyasının konumuna karşı çözümlenecek göreceli bir yol için `./folderA`.",
-+	"workspaceConfig.folder.description": "Bir dosya yolu. ör. `/root/folderA` veya çalışma alanı dosyasının konumuna karşı çözümlenecek göreceli bir yol için `./folderA`.",
-+	"workspaceConfig.settings.description": "Çalışma alanı ayarları"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 5fe056353b16ccf8c1758c665c413c6f6c685a4e i18n/trk/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
-  their  100644 bdf4e95d8a022e373a5a2391030fd26602474a24 i18n/trk/src/vs/workbench/services/extensions/electron-browser/extensionHost.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,5 +10,15 @@
- 	"extensionHostProcess.startupFailDebug": "Eklenti sunucusu 10 saniye içinde başlamadı, ilk satırda durdurulmuş olabilir ve devam etmesi için bir hata ayıklayıcıya ihtiyacı olabilir.",
- 	"extensionHostProcess.startupFail": "Eklenti sunucusu 10 saniye içinde başlamadı, bu bir sorun olabilir.",
- 	"reloadWindow": "Pencereyi Yeniden Yükle",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"extensionHostProcess.startupFailDebug": "Eklenti sunucusu 10 saniye içinde başlamadı, ilk satırda durdurulmuş olabilir ve devam etmesi için bir hata ayıklayıcıya ihtiyacı olabilir.",
-+	"extensionHostProcess.startupFail": "Eklenti sunucusu 10 saniye içinde başlamadı, bu bir sorun olabilir.",
-+>>>>>>> .their
- 	"extensionHostProcess.error": "Eklenti sunucusundan hata: {0}"
- }
-\ No newline at end of file
-added in both
-  our    100644 8a25b192f2010bb1aeefe2ad20faa7c7d1d243dd i18n/trk/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
-  their  100644 17cb5965e96efc1919bf2aec4d0314624a45d87e i18n/trk/src/vs/workbench/services/extensions/electron-browser/extensionPoints.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,5 +10,16 @@
- 	"jsonParseFail": "{0} ayrıştırılamadı: {1}.",
- 	"fileReadFail": "{0} dosyası okunamadı: {1}.",
- 	"jsonsParseReportErrors": "{0} ayrıştırılamadı: {1}.",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"jsonParseFail": "{0} ayrıştırılamadı: {1}.",
-+	"fileReadFail": "{0} dosyası okunamadı: {1}.",
-+	"jsonsParseFail": "{0} veya {1} ayrıştırılamadı: {2}.",
-+>>>>>>> .their
- 	"missingNLSKey": "{0} anahtarı için mesaj bulunamadı."
- }
-\ No newline at end of file
-added in both
-  our    100644 ab5fc985132e439630bd1f97bc76f36b0c051883 i18n/trk/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-  their  100644 f94d7e7d32f31ea5a91fdb34682d2672e7abff8f i18n/trk/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -15,4 +16,18 @@
- 	"extensionUnderDevelopment": "{0} konumundaki geliştirme eklentisi yükleniyor",
- 	"extensionCache.invalid": "Eklentiler disk üzerinde değişime uğradı. Lütfen pencereyi yeniden yükleyin.",
- 	"reloadWindow": "Pencereyi Yeniden Yükle"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"devTools": "Geliştirici Araçları",
-+	"restart": "Eklenti Sunucusunu Yeniden Başlat",
-+	"extensionHostProcess.crash": "Eklenti sunucusu beklenmeyen biçimde sonlandırıldı.",
-+	"extensionHostProcess.unresponsiveCrash": "Eklenti sunucusu yanıt vermediğinden sonlandırıldı.",
-+	"overwritingExtension": "{0} eklentisinin üzerine {1} yazılıyor.",
-+	"extensionUnderDevelopment": "{0} konumundaki geliştirme eklentisi yükleniyor"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6db7d6aae514a031afce5ac346abfd84bb8ee1cc i18n/trk/src/vs/workbench/services/progress/browser/progressService2.i18n.json
-  our    100644 4e6920ae96e02078b00340cd68b043e6fb243d96 i18n/trk/src/vs/workbench/services/progress/browser/progressService2.i18n.json
-  their  100644 dbcd7381ae2fcf0e7a8fc81ec166ed7112edca11 i18n/trk/src/vs/workbench/services/progress/browser/progressService2.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -9,4 +10,8 @@
- 	"progress.subtitle": "{0} - {1}",
- 	"progress.title": "{0}: {1}",
- 	"cancel": "İptal"
-+=======
-+	"progress.subtitle": "{0} - {1}",
-+	"progress.title": "{0}: {1}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f126fe535aa2aa8459cb7988ebad50f7c9fe7e64 i18n/trk/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-  our    100644 728572b97454c1722cf5ff70b066d23b39d43d3d i18n/trk/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-  their  100644 52f72c7cc9f2e360cf1a3ca99e9d7b91fa69658d i18n/trk/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,12 @@
- 	"schema.token.fontStyle": "Kuralın yazı tipi stili: 'italic', 'bold' veya 'underline' ya da bunların bir kombinasyonu. Boş dize devralınan ayarları kaldırır.",
- 	"schema.fontStyle.error": "Yazı tipi stili ya 'italic', 'bold' veya 'underline' ya da bunların bir kombinasyonu veya boş dize olmalıdır.",
- 	"schema.token.fontStyle.none": "Hiçbiri (devralınan stili temizle)",
-+=======
-+	"schema.token.settings": "Belirteç renkleri ve stilleri.",
-+	"schema.token.foreground": "Belirteç ön plan rengi.",
-+	"schema.token.fontStyle": "Kuralın yazı tipi stili: 'italic', 'bold' ve 'underline' kombinasyonu veya bunlardan bir tanesi",
-+	"schema.fontStyle.error": "Yazı tipi stili; 'italic', 'bold' ve 'underline' kombinasyonu olmalıdır",
-+>>>>>>> .their
- 	"schema.properties.name": "Kural açıklaması.",
- 	"schema.properties.scope": "Bu kural karşısında eşleşecek kapsam seçicisi.",
- 	"schema.tokenColors.path": "Bir tmTheme dosyasının yolu (geçerli dosyaya göreli).",
-changed in both
-  base   100644 d00686b6cdd37296789b24f93fb2201a420fc04c i18n/trk/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
-  our    100644 67548d89edd64f75acf2f56b63866766ca690eea i18n/trk/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
-  their  100644 60d2a29126dfce3b7e18b247a65fe6ade6ad0e2c i18n/trk/src/vs/workbench/services/themes/electron-browser/colorThemeData.i18n.json
-changed in both
-  base   100644 e6b44a705181cd04d8b797a38325ca9f7249cb50 i18n/trk/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 62ba4066699b1c2fed6080768294776dd46a2b53 i18n/trk/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 44429da31b5fd7280386d90a019e3fd58e7d5fc8 i18n/trk/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-@@ -13,6 +13,12 @@
- 	"noIconThemeDesc": "Dosya simgesi yok",
- 	"iconThemeError": "Dosya simgesi teması bilinmiyor veya yüklenmemiş.",
- 	"workbenchColors": "Şu an seçili renk temasındaki renkleri geçersiz kılar.",
-+<<<<<<< .our
-+=======
-+	"workbenchColors.deprecated": "Ayar, artık deneysel değildir ve 'workbench.colorCustomizations' olarak yeniden adlandırılmıştır",
-+	"workbenchColors.deprecatedDescription": "Bunun yerine 'workbench.colorCustomizations' kullanın",
-+	"editorColors": "Şu an seçili renk temasındaki düzenleyici renklerini ve yazı tipi stilini geçersiz kılar.",
-+>>>>>>> .their
- 	"editorColors.comments": "Yorumların rengini ve stillerini ayarlar",
- 	"editorColors.strings": "Dizelerin rengini ve stillerini ayarlar.",
- 	"editorColors.keywords": "Anahtar sözcüklerin rengini ve stillerini ayarlar.",
-@@ -20,6 +26,10 @@
- 	"editorColors.types": "Tür bildirimi ve başvurularının rengini ve stillerini ayarlar.",
- 	"editorColors.functions": "Fonksiyon bildirimi ve başvurularının rengini ve stillerini ayarlar.",
- 	"editorColors.variables": "Değişken bildirimi ve başvurularının rengini ve stillerini ayarlar.",
-+<<<<<<< .our
- 	"editorColors.textMateRules": "Textmate tema kurallarını kullanarak renkleri ve stilleri ayarlar (gelişmiş).",
- 	"editorColors": "Şu an seçili renk temasındaki düzenleyici renklerini ve yazı tipi stilini geçersiz kılar."
-+=======
-+	"editorColors.textMateRules": "Textmate tema kurallarını kullanarak renkleri ve stilleri ayarlar (gelişmiş)."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 dc144802fa5410640ad30b33a3a886c18bc81e23 package.json
-  our    100644 d0e982ce0b76c5b1b5eb02b673e459e47f3353a4 package.json
-  their  100644 a8125f3c5c59377f8341d41e472868f995885e3a package.json
-@@ -1,7 +1,13 @@
- {
-   "name": "code-oss-dev",
-+<<<<<<< .our
-   "version": "1.27.0",
-   "distro": "a4155d9780fbbc94ead6cb3017dd0fc3806c57b8",
-+=======
-+  "version": "1.16.1",
-+  "electronVersion": "1.7.3",
-+  "distro": "ee6ee3b7aa4725abd3b9de4cf2d67280db4ab246",
-+>>>>>>> .their
-   "author": {
-     "name": "Microsoft Corporation"
-   },
-removed in local
-  base   100644 f182fce6bdb5a197338d94d05c79da1379ab219c src/typings/xterm.d.ts
-  their  100644 ef40720682fba3e41112a85080955e29e367f0c1 src/typings/xterm.d.ts
-removed in local
-  base   100644 d72786b34c237b1a13a2efcc80c23508e61f3f48 src/vs/editor/contrib/snippet/browser/snippetParser.ts
-  their  100644 b65c628f01b681b5bd766e7f31f08603d99cf106 src/vs/editor/contrib/snippet/browser/snippetParser.ts
-removed in local
-  base   100644 6240c6547ecd8647fdc67a4aa52c40a7c0ffb150 src/vs/editor/contrib/snippet/test/browser/snippetParser.test.ts
-  their  100644 47f19d1de89f5a9bc971e3adf6213ea5ee72bc36 src/vs/editor/contrib/snippet/test/browser/snippetParser.test.ts
-removed in local
-  base   100644 d4846e4e48a06d98ae861c2912d0eb5442410173 src/vs/workbench/parts/files/browser/fileActions.ts
-  their  100644 d65b2e66aecb451c4d87738f24f5309762116d03 src/vs/workbench/parts/files/browser/fileActions.ts
-changed in both
-  base   100644 08d7dda6710a1dabb76c3d4a585eb234c3ff75e4 src/vs/workbench/parts/tasks/browser/quickOpen.ts
-  our    100644 18c84f752e2f2df5504d301626f558d3d37b3053 src/vs/workbench/parts/tasks/browser/quickOpen.ts
-  their  100644 2f64e8126551377ff3558063f147ee20d39596ea src/vs/workbench/parts/tasks/browser/quickOpen.ts
-changed in both
-  base   100644 ebc428835fcdae4ca2126f4b3d48d136879f9cbf src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
-  our    100644 6b4da35a3f141112a169ecfa12aadfaea48de26e src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
-  their  100644 2e299721025d5d45523811e4843c64931aa94d6d src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
-changed in both
-  base   100644 ebaad727abcf98945e6f17d8931773580190c352 src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
-  our    100644 04d9dcba251cf79c28429027cda3ca3b0c10a29c src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
-  their  100644 eeef27cdff512701a73b13120e54dfb8bdd51ed8 src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
-@@ -238,7 +238,11 @@
- 			// it gets removed and then added back to the DOM (resetting scrollTop to 0).
- 			// Upstream issue: https://github.com/sourcelair/xterm.js/issues/291
- 			if (this._xterm) {
-+<<<<<<< .our
- 				this._xterm.emit('scroll', this._xterm._core.buffer.ydisp);
-+=======
-+				this._xterm.emit('scroll', this._xterm.buffer.ydisp);
-+>>>>>>> .their
- 			}
- 		}
- 
-@@ -656,6 +660,7 @@
- 			// necessary if the number of rows in the terminal has decreased while it was in the
- 			// background since scrollTop changes take no effect but the terminal's position does
- 			// change since the number of visible rows decreases.
-+<<<<<<< .our
- 			this._xterm.emit('scroll', this._xterm._core.buffer.ydisp);
- 			if (this._container && this._container.parentElement) {
- 				// Force a layout when the instance becomes invisible. This is particularly important
-@@ -671,6 +676,9 @@
- 				// supported.
- 				setTimeout(() => this.layout(new dom.Dimension(width, height)), 0);
- 			}
-+=======
-+			this._xterm.emit('scroll', this._xterm.buffer.ydisp);
-+>>>>>>> .their
- 		}
- 	}
- 
-changed in both
-  base   100644 ca7a0317752d2acd993bf2056ee901cd8a3a4a18 src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts
-  our    100644 7179711f900e8ba53d2b99f073aecaacfebe3af9 src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts
-  their  100644 e34bcf8fc3ea96d66b826fa80ff26b301846ca5e src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts
-@@ -44,7 +44,11 @@
- 
- // Changing any regex may effect this value, hence changes this as well if required.
- const winLineAndColumnMatchIndex = 12;
-+<<<<<<< .our
- const unixLineAndColumnMatchIndex = 11;
-+=======
-+const unixLineAndColumnMatchIndex = 23;
-+>>>>>>> .their
- 
- // Each line and column clause have 6 groups (ie no. of expressions in round brackets)
- const lineAndColumnClauseGroupCount = 6;
-changed in both
-  base   100644 c71031b2552de53de4cca05c5de2822c2bd9d0f9 src/vs/workbench/parts/terminal/test/electron-browser/terminalLinkHandler.test.ts
-  our    100644 55e629b6feb7a9ead6d0a8655af3245a479f5485 src/vs/workbench/parts/terminal/test/electron-browser/terminalLinkHandler.test.ts
-  their  100644 a9f2b88d5ed7039763582f9ed934a8e0fb8fec0a src/vs/workbench/parts/terminal/test/electron-browser/terminalLinkHandler.test.ts
-@@ -132,10 +132,10 @@
- 
- 				const supportedLinkFormats: LinkFormatInfo[] = [
- 					{ urlFormat: '{0}' },
--					{ urlFormat: '{0} on line {1}', line: '5' },
--					{ urlFormat: '{0} on line {1}, column {2}', line: '5', column: '3' },
--					{ urlFormat: '{0}:line {1}', line: '5' },
--					{ urlFormat: '{0}:line {1}, column {2}', line: '5', column: '3' },
-+					// { urlFormat: '{0} on line {1}', line: '5' },
-+					// { urlFormat: '{0} on line {1}, column {2}', line: '5', column: '3' },
-+					// { urlFormat: '{0}:line {1}', line: '5' },
-+					// { urlFormat: '{0}:line {1}, column {2}', line: '5', column: '3' },
- 					{ urlFormat: '{0}({1})', line: '5' },
- 					{ urlFormat: '{0} ({1})', line: '5' },
- 					{ urlFormat: '{0}({1},{2})', line: '5', column: '3' },
diff --git a/app/test/fixtures/merge-parser/vscode/merge-release-1.17-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-release-1.17-into-master.txt
deleted file mode 100644
index 4d1bf35ed10..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-release-1.17-into-master.txt
+++ /dev/null
@@ -1,4899 +0,0 @@
-changed in both
-  base   100644 3600062cd1ee7588135d7ba8bf0b91a016c2fb89 build/gulpfile.vscode.js
-  our    100644 d79071e56bcfc53b3448052cc08bd7247bd7e789 build/gulpfile.vscode.js
-  their  100644 987d9152670941144b747203be60e88d53f57800 build/gulpfile.vscode.js
-@@ -44,7 +44,15 @@
- 	.concat(baseModules);
- 
- // Build
-+<<<<<<< .our
- const builtInExtensions = require('./builtInExtensions.json');
-+=======
-+
-+const builtInExtensions = [
-+	{ name: 'ms-vscode.node-debug', version: '1.17.18' },
-+	{ name: 'ms-vscode.node-debug2', version: '1.17.6' }
-+];
-+>>>>>>> .their
- 
- const excludedExtensions = [
- 	'vscode-api-tests',
-removed in local
-  base   100755 cdd656676a3a85922b87a6898e24fc24d00f5efd build/tfs/common/common.sh
-  their  100755 52f5353794345a8b7bfd054d6c4c4008e1235817 build/tfs/common/common.sh
-removed in local
-  base   100755 67f3f59552fcc1656c196db75ec63b51f80e77be build/tfs/common/node.sh
-  their  100755 87f95a5e1d7ea34cc07d8ef76883c2cc3663e22f build/tfs/common/node.sh
-removed in local
-  base   100755 0d9f98c692d6bf137663266c7092b89247a7ef9f build/tfs/linux/build-ia32.sh
-  their  100755 0b0f1c2a45800a48f8b1764de4becda0df97baf5 build/tfs/linux/build-ia32.sh
-removed in local
-  base   100755 e193a01a5b7ec3522076add91bfb3e0607a7dc6b build/tfs/linux/build-x64.sh
-  their  100755 fb5b38e02b3b60e93751fb31eb63ea65f13a6ade build/tfs/linux/build-x64.sh
-removed in local
-  base   100755 4af539470330ccda562f7c6558d1a3bde6fe5946 build/tfs/linux/build.sh
-  their  100755 b3d1825c2d98ff09530d67311d28f975f9dff690 build/tfs/linux/build.sh
-removed in local
-  base   100755 e4d2009a17215afc90dfeedfaa0ef9868b70c29f build/tfs/linux/release.sh
-  their  100755 41f6d35e675bab0fcc34c0ba38a92499e7bcf29d build/tfs/linux/release.sh
-removed in local
-  base   100644 9866874a208a0a9ae8b1a571d1af98795f2bf0e4 build/tfs/linux/smoketest.sh
-  their  100644 308fb0475900c894665ff7771234db8b02a18660 build/tfs/linux/smoketest.sh
-changed in both
-  base   100644 5ca21612e775f7ab85417b1bddfb7f5591948bfe extensions/git/src/commands.ts
-  our    100644 2e1c115c14f8d8c2b3a57340f9d77960ed3d9b59 extensions/git/src/commands.ts
-  their  100644 675eb2d0b8f815617d94bf7178ee0007ee58f21f extensions/git/src/commands.ts
-@@ -454,6 +454,7 @@
- 
- 	@command('git.init')
- 	async init(): Promise<void> {
-+<<<<<<< .our
- 		let path: string | undefined;
- 
- 		if (workspace.workspaceFolders && workspace.workspaceFolders.length > 1) {
-@@ -498,8 +499,37 @@
- 			}
- 
- 			path = uri.fsPath;
-+=======
-+		const homeUri = Uri.file(os.homedir());
-+		const defaultUri = workspace.workspaceFolders && workspace.workspaceFolders.length > 0
-+			? Uri.file(workspace.workspaceFolders[0].uri.fsPath)
-+			: homeUri;
-+
-+		const result = await window.showOpenDialog({
-+			canSelectFiles: false,
-+			canSelectFolders: true,
-+			canSelectMany: false,
-+			defaultUri,
-+			openLabel: localize('init repo', "Initialize Repository")
-+		});
-+
-+		if (!result || result.length === 0) {
-+			return;
-+>>>>>>> .their
-+		}
-+
-+		const uri = result[0];
-+
-+		if (homeUri.toString().startsWith(uri.toString())) {
-+			const yes = localize('create repo', "Initialize Repository");
-+			const answer = await window.showWarningMessage(localize('are you sure', "This will create a Git repository in '{0}'. Are you sure you want to continue?", uri.fsPath), yes);
-+
-+			if (answer !== yes) {
-+				return;
-+			}
- 		}
- 
-+		const path = uri.fsPath;
- 		await this.git.init(path);
- 		await this.model.openRepository(path);
- 	}
-changed in both
-  base   100644 78852ec6685e03de21cef44f13763af435fd2643 extensions/git/src/contentProvider.ts
-  our    100644 443dd774f2ab4119e831ec1cade5262e1d06ba3a extensions/git/src/contentProvider.ts
-  their  100644 4e591c1ae32a8b76751d1c9968b4ac5ee0d5c41c extensions/git/src/contentProvider.ts
-@@ -130,7 +130,11 @@
- 			const { path } = fromGitUri(row.uri);
- 			const isOpen = workspace.textDocuments
- 				.filter(d => d.uri.scheme === 'file')
-+<<<<<<< .our
- 				.some(d => pathEquals(d.uri.fsPath, path));
-+=======
-+				.some(d => d.uri.fsPath === path);
-+>>>>>>> .their
- 
- 			if (isOpen || now - row.timestamp < THREE_MINUTES) {
- 				cache[row.uri.toString()] = row;
-changed in both
-  base   100644 536a7ea70243b38d4abf20ef9b88e4264e4ee7da i18n/chs/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  our    100644 d23732f8ae4a1f9b08239592f29e3466b2c23adf i18n/chs/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  their  100644 aee9d4518e3a9ef15b21e6df689aa1fb1ddcd8e1 i18n/chs/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 7fff225f6c9561c720dad1830a1557442f70a6c7 i18n/chs/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-  our    100644 25d7a8f6bec5804cead51836da99778138632efe i18n/chs/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-  their  100644 49eaa8fd6f37fc7c46de74d904e8e8387290798d i18n/chs/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-@@ -13,12 +13,18 @@
- 	"vscode.extension.contributes.view.name": "人类可读的视图名称。将会被显示",
- 	"vscode.extension.contributes.view.when": "显示此视图必须为真的条件",
- 	"vscode.extension.contributes.views": "向编辑器提供视图",
-+<<<<<<< .our
- 	"views.explorer": "向活动栏中的“资源管理器”容器提供视图",
- 	"views.debug": "向活动栏中的“调试”容器提供视图",
- 	"views.scm": "向活动栏中的“源代码管理”容器提供视图",
- 	"views.test": "向活动栏中的“测试”容器提供视图",
- 	"views.contributed": "在扩展提供的视图容器中提供视图。",
- 	"ViewContainerDoesnotExist": "视图容器“{0}”不存在。所有注册到其中的视图将被添加到“资源管理器”中。",
-+=======
-+	"views.explorer": "资源管理器视图",
-+	"views.debug": "调试视图",
-+	"locationId.invalid": "“{0}”为无效视图位置",
-+>>>>>>> .their
- 	"duplicateView1": "无法在位置“{1}”注册多个 ID 同为“{0}”的视图。",
- 	"duplicateView2": "ID 为“{0}”的视图在位置“{1}”已被注册"
- }
-\ No newline at end of file
-changed in both
-  base   100644 272f5248a2ba9c48c79c3f1064236af434626236 i18n/chs/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-  our    100644 885d0713a18fef6a8a1d0c512f12ad40e9861d6d i18n/chs/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-  their  100644 67671aeb85cf3e51a5d064582d84116e37391c19 i18n/chs/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-@@ -55,5 +55,9 @@
- 	"screenReaderDetectedExplanation.answerYes": "是",
- 	"screenReaderDetectedExplanation.answerNo": "否",
- 	"screenReaderDetectedExplanation.body1": "VS Code 已为屏幕阅读器的使用进行优化。",
-+<<<<<<< .our
- 	"screenReaderDetectedExplanation.body2": "某些编辑器功能可能会有不同的行为，例如自动换行、折叠等。"
-+=======
-+	"screenReaderDetectedExplanation.body2": "一些编辑器功能将有不同的行为: 例如，文字换行，折叠，自动关闭括号等。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 3fb6c406424470441cdde2a19b4f68e92fea488d i18n/chs/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 eb24c55b636f82951f7ddca06c62ab11e05e6e73 i18n/chs/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 b2ac4ce4c5a8764a1260448135cb6c8f58c48f61 i18n/chs/src/vs/workbench/electron-browser/main.contribution.i18n.json
-changed in both
-  base   100644 2ef11d8a1a57a2921a517be025cacbab54302914 i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 d713b18f9f797773516060ccdb111cd56b80034e i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 0a2caf6c161101961cfbbfbf27e735a892e7ca53 i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -17,8 +17,12 @@
- 	"multipleConfigurationNamesInWorkspace": "工作区中存在多个启动配置“{0}”。请使用文件夹名称来限定配置。",
- 	"noFolderWithName": "无法在复合项“{2}”中为配置“{1}”找到名为“{0}”的文件夹。",
- 	"configMissing": "\"launch.json\" 中缺少配置“{0}”。",
-+<<<<<<< .our
- 	"launchJsonDoesNotExist": "\"launch.json\" 不存在。",
- 	"debugRequestNotSupported": "所选调试配置的属性“{0}”的值“{1}”不受支持。",
-+=======
-+	"debugRequestNotSupported": "所选的调试配置有一个不支持的属性值“{0}”: “{1}”。",
-+>>>>>>> .their
- 	"debugRequesMissing": "所选的调试配置缺少属性“{0}”。",
- 	"debugTypeNotSupported": "配置的类型“{0}”不受支持。",
- 	"debugTypeMissing": "所选的启动配置缺少属性 \"type\"。",
-changed in both
-  base   100644 1a78dfcd7283caca0f379cab32092238877b7ee4 i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 6d06818b00cbd9cc446af3ed0c5d32bc725f9a34 i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 f5bafe786b6d69aff5c50101cb032badaf656fa0 i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -14,11 +14,17 @@
- 	"workspaceRecommendation": "当前工作区的用户推荐此扩展。",
- 	"reallyRecommended2": "建议对这种类型的文件使用“{0}”扩展。",
- 	"reallyRecommendedExtensionPack": "建议对这种类型的文件使用“{0}”扩展包。",
-+<<<<<<< .our
- 	"install": "安装",
-+=======
-+>>>>>>> .their
- 	"showRecommendations": "显示建议",
- 	"showLanguageExtensions": "商店中有可以对 \".{0}\" 文件提供帮助的扩展。",
- 	"workspaceRecommended": "此工作区具有扩展建议。",
-+<<<<<<< .our
- 	"installAll": "全部安装",
-+=======
-+>>>>>>> .their
- 	"ignoreExtensionRecommendations": "你是否要忽略所有推荐的扩展?",
- 	"ignoreAll": "是，忽略全部",
- 	"no": "否"
-changed in both
-  base   100644 4cf97db7be0e3ef0566145129691e03e71fe5b66 i18n/chs/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 63427668f5f3315bd1b2d497574a17d7eb4d0258 i18n/chs/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 7f0b06008970065d6f0d52fe839b04bc6fa5891d i18n/chs/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-changed in both
-  base   100644 efe497c5bbb450eab8f0e4a8bcd3dfcf6bf272dc i18n/chs/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  our    100644 72a33d59853b6a03462fb33cc281f9024f7e12dd i18n/chs/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  their  100644 b3ba4d06a1bf542f5d2b9bbf076445edbd53f4a0 i18n/chs/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-@@ -8,7 +8,12 @@
- 	],
- 	"scm providers": "源代码管理提供程序",
- 	"hideRepository": "隐藏",
-+<<<<<<< .our
- 	"installAdditionalSCMProviders": "安装其他源代码管理提供程序...",
-+=======
-+	"commitMessage": "消息(按 {0} 提交)",
-+	"installAdditionalSCMProviders": "安装其他 SCM 提供程序...",
-+>>>>>>> .their
- 	"no open repo": "没有活动的源代码管理提供程序。",
- 	"source control": "源代码管理",
- 	"viewletTitle": "{0}: {1}",
-changed in both
-  base   100644 c197662840b127710f16e431185cd04221457c12 i18n/chs/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 41326098874e0bd69d9f2619a881deaa0a61b179 i18n/chs/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 925312c210add5404e417a95f1b522e96bf372f4 i18n/chs/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -51,7 +51,11 @@
- 	"recentlyUsed": "最近使用的任务",
- 	"configured": "已配置的任务",
- 	"detected": "检测到的任务",
-+<<<<<<< .our
- 	"TaskService.ignoredFolder": "由于使用任务版本 0.1.0，以下工作区文件夹将被忽略: {0}",
-+=======
-+	"TaskService.ignoredFolder": "由于使用任务版本 0.1.0，以下工作区文件夹将被忽略:",
-+>>>>>>> .their
- 	"TaskService.notAgain": "不再显示",
- 	"TaskService.pickRunTask": "选择要运行的任务",
- 	"TaslService.noEntryToRun": "没有找到要运行的任务。配置任务...",
-changed in both
-  base   100644 2bf3f1664d2b47d6be00a54be4bec13cd2598857 i18n/chs/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 5acf3a0fa36fa93c78f58cdf2d0b020db420fb68 i18n/chs/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 45d1a5bbb9ce69f7dd7485a11587a11e134b0bef i18n/chs/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,11 @@
- 	],
- 	"openTasksConfiguration": "打开任务配置",
- 	"openLaunchConfiguration": "打开启动配置",
-+=======
-+	"openTasksConfiguration": "打开任务配置",
-+	"openLaunchConfiguration": "打开启动配置",
-+	"close": "关闭",
-+>>>>>>> .their
- 	"open": "打开设置",
- 	"saveAndRetry": "保存并重试",
- 	"errorUnknownKey": "没有注册配置 {1}，因此无法写入 {0}。",
-@@ -17,6 +23,7 @@
- 	"errorInvalidWorkspaceTarget": "{0} 不在多文件夹工作区环境下支持工作区作用域，因此无法写入“工作区设置”。",
- 	"errorInvalidFolderTarget": "未提供资源，因此无法写入\"文件夹设置\"。",
- 	"errorNoWorkspaceOpened": "没有打开任何工作区，因此无法写入 {0}。请先打开一个工作区，然后重试。",
-+<<<<<<< .our
- 	"errorInvalidTaskConfiguration": "无法写入任务配置文件。请打开文件并更正错误或警告，然后重试。",
- 	"errorInvalidLaunchConfiguration": "无法写入启动配置文件。请打开文件并更正错误或警告，然后重试。",
- 	"errorInvalidConfiguration": "无法写入用户设置。请打开用户设置并清除错误或警告，然后重试。",
-@@ -27,6 +34,18 @@
- 	"errorConfigurationFileDirty": "用户设置文件已变更，无法写入。请先保存此文件，然后重试。",
- 	"errorConfigurationFileDirtyWorkspace": "工作区设置文件已变更，无法写入。请先保存此文件，然后重试。",
- 	"errorConfigurationFileDirtyFolder": "文件夹设置文件已变更，无法写入。请先保存“{0}”文件夹设置文件，然后重试。",
-+=======
-+	"errorInvalidTaskConfiguration": "无法写入任务文件。请打开**任务**文件并清除错误/警告，然后重试。",
-+	"errorInvalidLaunchConfiguration": "无法写入启动文件。请打开**启动**文件并清除错误/警告，然后重试。",
-+	"errorInvalidConfiguration": "无法写入用户设置。请打开**用户设置**文件并清除错误/警告，然后重试。",
-+	"errorInvalidConfigurationWorkspace": "无法写入工作区设置。请打开**工作区设置**文件并清除错误/警告，然后重试。",
-+	"errorInvalidConfigurationFolder": "无法写入文件夹设置。请打开在 **{0}** 文件夹下的**文件夹设置**文件并清除错误/警告，然后重试。",
-+	"errorTasksConfigurationFileDirty": "文件已变更，因此无法写入设置。请先保存**任务配置**文件，然后重试。",
-+	"errorLaunchConfigurationFileDirty": "文件已变更，因此无法写入设置。请先保存**启动配置**文件，然后重试。",
-+	"errorConfigurationFileDirty": "文件已变更，因此无法写入设置。请先保存**用户设置**文件，然后重试。",
-+	"errorConfigurationFileDirtyWorkspace": "文件已变更，因此无法写入设置。请先保存**工作区设置**文件，然后重试。",
-+	"errorConfigurationFileDirtyFolder": "文件已变更，因此无法写入设置。请先保存在 **{0}** 下的**文件夹设置**文件，然后重试。",
-+>>>>>>> .their
- 	"userTarget": "用户设置",
- 	"workspaceTarget": "工作区设置",
- 	"folderTarget": "文件夹设置"
-changed in both
-  base   100644 cd1eb975eb39331c632a34ca6da3c33dd36f9ea5 i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 15a1cfb1f061b73d70aaaf6b56b29fe87aab2b5a i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 779201a798617825b485856b415b0f772d4c7ff7 i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -12,11 +12,15 @@
- 	"fontSize": "控制字型大小 (以像素為單位)。",
- 	"lineHeight": "控制行高。使用 0 會從 fontSize 計算 lineHeight。",
- 	"letterSpacing": "控制字元間距 (以像素為單位)",
-+<<<<<<< .our
- 	"lineNumbers.off": "不顯示行號。",
- 	"lineNumbers.on": "行號以絕對值顯示。",
- 	"lineNumbers.relative": "行號以目前游標的相對值顯示。",
- 	"lineNumbers.interval": "每 10 行顯示行號。",
- 	"lineNumbers": "控制行號的顯示。",
-+=======
-+	"lineNumbers": "控制行號顯示。可能的值有 'on'、'off' 及 'relative'。'relative' 會從目前的資料指標位置顯示行數。",
-+>>>>>>> .their
- 	"rulers": "在特定的等寬字元數之後轉譯垂直尺規。有多個尺規就使用多個值。若陣列為空，則不繪製任何尺規。",
- 	"wordSeparators": "執行文字相關導覽或作業時將作為文字分隔符號的字元",
- 	"tabSize": "與 Tab 相等的空格數量。當 `editor.detectIndentation` 已開啟時，會根據檔案內容覆寫此設定。",
-changed in both
-  base   100644 ac0be09798b4a4b4a8a54fb8b12a88aeeac3943b i18n/cht/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  our    100644 16528bb0fea69d7b1f4ce878596d45af316d6a07 i18n/cht/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  their  100644 3484e0af5e72c3161ac13f116359799eb03b9296 i18n/cht/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 98b2d3ba1cef6512daa356f957a7211f78aba197 i18n/cht/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-  our    100644 982167897cd63061356e21ce1085bf02bbddf775 i18n/cht/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-  their  100644 1a48cc1d69416613af972343eef97efeb5f8f41b i18n/cht/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-@@ -13,12 +13,18 @@
- 	"vscode.extension.contributes.view.name": "使用人性化顯示名稱.",
- 	"vscode.extension.contributes.view.when": "必須為 true 以顯示此檢視的條件",
- 	"vscode.extension.contributes.views": "提供意見給編輯者",
-+<<<<<<< .our
- 	"views.explorer": "提供檢視給活動列中的總管容器",
- 	"views.debug": "提供檢視給活動列中的偵錯容器",
- 	"views.scm": "提供檢視給活動列中的 SCM 容器",
- 	"views.test": "提供檢視給活動列中的測試容器",
- 	"views.contributed": "提供檢視給參與檢視容器",
- 	"ViewContainerDoesnotExist": "檢視容器 '{0}' 不存在，且所有向其註冊的檢視都會新增至 'Explorer'。",
-+=======
-+	"views.explorer": "檔案總管檢視",
-+	"views.debug": "偵錯檢視",
-+	"locationId.invalid": "`{0}`不是有效的識別位置",
-+>>>>>>> .their
- 	"duplicateView1": "無法在位置 '{1}' 使用相同的識別碼 '{0}' 註冊多個檢視",
- 	"duplicateView2": "識別碼為 '{0}' 的檢視已在位置 '{1}' 註冊"
- }
-\ No newline at end of file
-changed in both
-  base   100644 de3c6d6122fe7029b2ba9d01d25690aa87d90a44 i18n/cht/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 fb350c87bdc732a5022e5d51b20bc738ad941987 i18n/cht/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 18a591310bd98caf1e3d2cfa265b214fc9ebf236 i18n/cht/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -15,5 +15,9 @@
- 	"saveWorkspace": "儲存工作區",
- 	"openWorkspaceAction": "開啟工作區...",
- 	"openWorkspaceConfigFile": "開啟工作區組態檔",
-+<<<<<<< .our
- 	"duplicateWorkspaceInNewWindow": "新視窗中的重覆工作區"
-+=======
-+	"workspaceFolderPickerPlaceholder": "選取工作區資料夾"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 96160a8359a96fe878a20d65be554ad622529a2e i18n/cht/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 9af81e350d69047f6d84eaf0bd191dc1d54db2a0 i18n/cht/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 ee6864d5c656fda3321f5242b91efbaab4f3ba1a i18n/cht/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 2d954d063e92abbf352f32ea958cf0ad39b2fd19 i18n/cht/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-  our    100644 e388b64bdedd5bd1e14f20cbb6611df4f0255f70 i18n/cht/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-  their  100644 e8b2ace0bcfec691c296eccc6f6971ec02acd36b i18n/cht/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-@@ -55,5 +55,9 @@
- 	"screenReaderDetectedExplanation.answerYes": "是",
- 	"screenReaderDetectedExplanation.answerNo": "否",
- 	"screenReaderDetectedExplanation.body1": "已將 VS Code 最佳化，現在可搭配螢幕助讀程式使用。",
-+<<<<<<< .our
- 	"screenReaderDetectedExplanation.body2": "某些編輯器功能會具有不同的行為: 例如文字換行、折疊等。"
-+=======
-+	"screenReaderDetectedExplanation.body2": "某些編輯器功能會具有不同的行為: 例如文字換行、折疊、自動括上括號等。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c45493d845e22043d4be7f7b9c8f6f3425b8249b i18n/cht/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 8c04c44fd8aa84aafd673c4f7e7c350b8ac52c3b i18n/cht/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 c44f42dbd5df7e55b14132058752ae2a7c3a6dd4 i18n/cht/src/vs/workbench/electron-browser/actions.i18n.json
-@@ -49,7 +49,11 @@
- 	"showNextWindowTab": "顯示下一個視窗索引標籤",
- 	"moveWindowTabToNewWindow": "將視窗索引標籤移至新的視窗",
- 	"mergeAllWindowTabs": "合併所有視窗",
-+<<<<<<< .our
- 	"toggleWindowTabsBar": "切換視窗索引標籤列",
- 	"about": "關於 {0}",
- 	"inspect context keys": "檢查功能表內容"
-+=======
-+	"toggleWindowTabsBar": "切換視窗索引標籤列"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 fc3ce74f059bbe571183d91046e35c51f49351bf i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 bf339c91e8587ec53fe81a294c54ddc0f5aad010 i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 8b6818a6c02a8ffb03d51daba6eb46d7e549be9b i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -13,9 +13,15 @@
- 	"developer": "開發人員",
- 	"workbenchConfigurationTitle": "工作台",
- 	"showEditorTabs": "控制已開啟的編輯器是否應顯示在索引標籤中。",
-+<<<<<<< .our
- 	"workbench.editor.labelFormat.default": "顯示檔案名稱。當啟用索引標籤，且同一個群組中有兩個檔案同名時，就會新增各個檔案路徑具有識別度的的區段。當停用索引標籤時，若編輯器在使用中，就會顯示與工作區資料夾相關的路徑。",
- 	"workbench.editor.labelFormat.short": "顯示檔案的名稱，並在名稱後接著該檔案的目錄名稱。",
- 	"workbench.editor.labelFormat.medium": "顯示檔案的名稱，並在名稱後接著該檔案與工作區資料夾的相對路徑。",
-+=======
-+	"workbench.editor.labelFormat.default": "顯示檔案的名稱。當啟用索引標籤時，若在一個群組中有兩個檔案使用相同的名稱，就會新增每個檔案路徑具有辨識度的區段。當索引標籤停用時，若編輯器在使用中，則會顯示工作區根目錄的相關路徑。",
-+	"workbench.editor.labelFormat.short": "顯示檔案的名稱，並在名稱後接著該檔案的目錄名稱。",
-+	"workbench.editor.labelFormat.medium": "顯示檔案的名稱，並在名稱後接著該檔案與工作區根目錄有關的路徑。",
-+>>>>>>> .their
- 	"workbench.editor.labelFormat.long": "顯示檔案的名稱，並在名稱後接著該檔案的絕對路徑。",
- 	"tabDescription": "控制編輯器的標籤格式。變更此設定具有多項優點，例如可讓檔案的位置更加清楚:\n-簡短: 'parent'\n-中等: 'workspace/src/parent'\n-完整: '/home/user/workspace/src/parent'\n-預設: '.../parent'，當另一個索引標籤共用相同的標題，或若路徑停用，卻共用相關的工作區路徑時",
- 	"editorTabCloseButton": "控制編輯器的索引標籤關閉按鈕位置，或在設為 'off' 時將其停用。",
-changed in both
-  base   100644 b629fbff31c483411b23f1d526a88616adc752ec i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
-  our    100644 ee6ac61edbe899401525da89522c78b5bd68808d i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
-  their  100644 06716533a4d375be612b4e5f66c4e8374fc0777d i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
-changed in both
-  base   100644 00b0f0731b8a789f4d9613c7cbb2bfdf951ce9ba i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 a922616389e0d8d38ea207e5428979e5adf305ab i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 4bdc5fb94f2a2782980c9769c92fa8784c73aef6 i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -17,8 +17,12 @@
- 	"multipleConfigurationNamesInWorkspace": "工作區中有多個啟動組態 '{0}'。請使用資料夾名稱以符合組態。",
- 	"noFolderWithName": "在複合 '{2}' 的組態 '{1}' 中找不到名稱為 '{0}' 的資料夾。",
- 	"configMissing": "'launch.json' 中遺漏組態 '{0}'。",
-+<<<<<<< .our
- 	"launchJsonDoesNotExist": "'launch.json' 不存在。",
- 	"debugRequestNotSupported": "在選取的偵錯組態中，屬性 '{0}' 具有不支援的值 '{1}'。",
-+=======
-+	"debugRequestNotSupported": "所選的偵錯組態具有不支援的屬性值 '{0}': '{1}'。",
-+>>>>>>> .their
- 	"debugRequesMissing": "所選的偵錯組態遺漏屬性 '{0}'。",
- 	"debugTypeNotSupported": "不支援設定的偵錯類型 '{0}'。",
- 	"debugTypeMissing": "遺漏所選啟動設定的屬性 'type'。",
-changed in both
-  base   100644 de1a015d977dddf7793e03a00ddab847ef16d640 i18n/cht/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-  our    100644 0f0a8bc19044c632734b896a3ae60011bf789513 i18n/cht/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-  their  100644 9d0f768770d39d30d65c1d07dbe52543cf3a3830 i18n/cht/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-@@ -34,10 +34,13 @@
- 	"view id": "識別碼",
- 	"view name": "名稱",
- 	"view location": "位置",
-+<<<<<<< .our
- 	"localizations": "當地語系化 ({0})",
- 	"localizations language id": "語言識別碼",
- 	"localizations language name": "語言名稱",
- 	"localizations localized language name": "語言名稱 (在地化)",
-+=======
-+>>>>>>> .their
- 	"colorThemes": "色彩佈景主題 ({0})",
- 	"iconThemes": "圖示佈景主題 ({0}) ",
- 	"colors": "色彩 ({0})",
-changed in both
-  base   100644 4a4fd03e15a9734ff8e81c138be8e7aa7c9863e4 i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 beddde6d10ce2b9a74005421467ca470c839a054 i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 ea9d6d8263167794e065998b1c6be35a786b3651 i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-@@ -56,11 +56,15 @@
- 	"OpenExtensionsFile.failed": "無法在 '.vscode' 資料夾 ({0}) 中建立 'extensions.json' 檔案。",
- 	"configureWorkspaceRecommendedExtensions": "設定建議的延伸模組 (工作區)",
- 	"configureWorkspaceFolderRecommendedExtensions": "設定建議的延伸模組 (工作區資料夾) ",
-+<<<<<<< .our
- 	"malicious tooltip": "這個延伸模組曾經被回報是有問題的。",
- 	"malicious": "惡意",
- 	"disabled": "停用",
- 	"disabled globally": "停用",
- 	"disabled workspace": "在此工作區停用",
-+=======
-+	"builtin": "內建",
-+>>>>>>> .their
- 	"disableAll": "停用所有已安裝的延伸模組",
- 	"disableAllWorkspace": "停用此工作區的所有已安裝延伸模組",
- 	"enableAll": "啟用所有擴充功能",
-changed in both
-  base   100644 eb4b8636d6604de92eefa0cd48af9ba2f402a02a i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 68a719930ef86e9c0443de55d9783ccfe2efafc4 i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 3e7df1758c7f01cf4c21e2b0a8afcc862fb01160 i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -14,11 +14,17 @@
- 	"workspaceRecommendation": "根據目前工作區的使用者，建議您使用此延伸模組。",
- 	"reallyRecommended2": "建議對此檔案類型使用 '{0}' 延伸模組。",
- 	"reallyRecommendedExtensionPack": "建議對此檔案類型使用 '{0}' 延伸模組套件。",
-+<<<<<<< .our
- 	"install": "安裝",
-+=======
-+>>>>>>> .their
- 	"showRecommendations": "顯示建議",
- 	"showLanguageExtensions": "市集有 '.{0}' 個文件的擴充功能可以提供協助",
- 	"workspaceRecommended": "此工作區具有擴充功能建議。",
-+<<<<<<< .our
- 	"installAll": "全部安裝",
-+=======
-+>>>>>>> .their
- 	"ignoreExtensionRecommendations": "是否略過所有的延伸模組建議?",
- 	"ignoreAll": "是，略過全部",
- 	"no": "否"
-changed in both
-  base   100644 fa56ff2830f0cc1435b7f1af7d8706e776c00009 i18n/cht/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 867d603ca5633a190dd294a861b5733b06da3c8c i18n/cht/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 fef80808ee47c75fbb3440d04dc4f001a378fc34 i18n/cht/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-changed in both
-  base   100644 953df2579ae30e24772f26379bbaa908871b4103 i18n/cht/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json
-  our    100644 89450055273dad237169ef3b8d1d4b394d669a97 i18n/cht/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json
-  their  100644 cd31ffc72aaa89622ca19d654756969e3d1525a0 i18n/cht/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"dirtyFile": "1 個未儲存的檔案",
- 	"dirtyFiles": "{0} 個未儲存的檔案"
- }
-\ No newline at end of file
-changed in both
-  base   100644 ac745b8e8e12994f8a64e60a57e1f3bc0b163c37 i18n/cht/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  our    100644 4bf0fb57a82a100d4c5b072e1a13f960c4e14c31 i18n/cht/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  their  100644 e0a612882aede62265d3a91760333bbfcbe85da1 i18n/cht/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,11 @@
- 	],
- 	"scm providers": "原始檔控制提供者",
- 	"hideRepository": "隱藏",
-+=======
-+	"scm providers": "原始檔控制提供者",
-+	"hideRepository": "隱藏",
-+	"commitMessage": "Message (press {0} to commit)",
-+>>>>>>> .their
- 	"installAdditionalSCMProviders": "安裝額外SCM提供者...",
- 	"no open repo": "沒有使用中的原始檔控制提供者。",
- 	"source control": "原始檔控制",
-changed in both
-  base   100644 de9b42f6aced8bc02f00559701e3e31b591c3b14 i18n/cht/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
-  our    100644 6a89d5934fffd7aa44365a5107d9f346b06c695b i18n/cht/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
-  their  100644 fb65a26db1370db5b46050535b33a7297dbae847 i18n/cht/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"snippet.suggestions.label": "插入程式碼片段",
- 	"sep.userSnippet": "使用者程式碼片段",
- 	"sep.extSnippet": "延伸模組程式碼片段"
-changed in both
-  base   100644 16e82cf135ff9e30ea83069920d5b5e2f9e2d7e5 i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  our    100644 763c92b7367ac35034e9498d362e409a1ce2c7f1 i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 8f1cdc4c641e991c59834b78a2081506f39060e3 i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-@@ -13,8 +13,14 @@
- 	"vscode.extension.contributes.snippets": "提供程式碼片段。",
- 	"vscode.extension.contributes.snippets-language": "要予以提供此程式碼片段的語言識別碼。",
- 	"vscode.extension.contributes.snippets-path": "程式碼片段檔案的路徑。此路徑是擴充功能資料夾的相對路徑，而且一般會以 './snippets/' 開頭。",
-+<<<<<<< .our
- 	"badVariableUse": "來自延伸模組 '{0}' 的一或多個程式碼片段很可能會混淆程式碼片段變數和程式碼片段預留位置 (如需更多詳細資料，請參閱 https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax)",
- 	"badFile": "無法讀取程式碼片段檔案 \"{0}\"。",
-+=======
-+	"badFile": "無法讀取程式碼片段檔案 \"{0}\"。",
-+	"badVariableUse": "程式碼片段 \"{0}\" 很可能會混淆 snippet-variables 及 snippet-placeholders。如需詳細資料，請參閱 https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax。",
-+	"source.snippet": "使用者程式碼片段",
-+>>>>>>> .their
- 	"detail.snippet": "{0} ({1})",
- 	"snippetSuggest.longLabel": "{0}，{1}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 58a261ac640b73818ccae2c1206eca645e2d4cca i18n/cht/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 a13d5229d23a832c6ada352df9587e856b73629f i18n/cht/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 c9cc1fc25d5c06394a4c3b57fc34e576e50f6620 i18n/cht/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -17,8 +17,11 @@
- 	"runningTasks": "顯示執行中的工作",
- 	"tasks": "工作",
- 	"TaskSystem.noHotSwap": "必須重新載入視窗才可變更執行使用中工作的工作執行引擎",
-+<<<<<<< .our
- 	"reloadWindow": "重新載入視窗",
- 	"TaskServer.folderIgnored": "因為資料夾 {0} 使用工作版本 0.1.0，所以已將其忽略",
-+=======
-+>>>>>>> .their
- 	"TaskService.noBuildTask1": "未定義任何建置工作。請使用 'isBuildCommand' 標記 tasks.json 檔案中的工作。",
- 	"TaskService.noBuildTask2": "未定義任何組建工作，請在 tasks.json 檔案中將工作標記為 'build' 群組。",
- 	"TaskService.noTestTask1": "未定義任何建置工作。請使用 'isTestCommand' 標記 tasks.json 檔案中的工作。",
-@@ -51,13 +54,23 @@
- 	"recentlyUsed": "最近使用的工作",
- 	"configured": "設定的工作",
- 	"detected": "偵測到的工作",
-+<<<<<<< .our
- 	"TaskService.ignoredFolder": "因為下列工作區資料夾使用工作版本 0.1.0，所以已略過: {0}",
- 	"TaskService.notAgain": "不要再顯示",
-+=======
-+	"TaskService.ignoredFolder": "下列工作區資料夾因為使用工作版本 0.1.0，所以已略過:",
-+	"TaskService.notAgain": "不要再顯示",
-+	"TaskService.ok": "確定",
-+>>>>>>> .their
- 	"TaskService.pickRunTask": "請選取要執行的工作",
- 	"TaslService.noEntryToRun": "找不到任何要執行的工作。請設定工作...",
- 	"TaskService.fetchingBuildTasks": "正在擷取組建工作...",
- 	"TaskService.pickBuildTask": "請選取要執行的組建工作",
-+<<<<<<< .our
- 	"TaskService.noBuildTask": "找不到任何要執行的組建工作。請設定建置工作...",
-+=======
-+	"TaskService.noBuildTask": "找不到任何要執行的組建工作。請設定工作...",
-+>>>>>>> .their
- 	"TaskService.fetchingTestTasks": "正在擷取測試工作...",
- 	"TaskService.pickTestTask": "請選取要執行的測試工作",
- 	"TaskService.noTestTaskTerminal": "找不到任何要執行的測試工作。請設定工作...",
-changed in both
-  base   100644 871f4fbea5ab1828cdbd17875aaf70ca5d8086d3 i18n/cht/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
-  our    100644 d74a43297d88e553e3d7e87ebf7e1bd866ef6eb6 i18n/cht/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
-  their  100644 a45b9045bdba0180e22ff17bbf23a6bcdcf234ad i18n/cht/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
-changed in both
-  base   100644 4ce804042be10a860180876e08726b8d42b7a860 i18n/cht/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  our    100644 b9d0cc54748098528d7d52af4aef0b78d90f5832 i18n/cht/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  their  100644 61b47eff6f84dd58c6b3aa2c55d4ee70f96754d4 i18n/cht/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-changed in both
-  base   100644 4cc323017ffa1d136f5bfde2750829b3dc497591 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 b65af1ec7222f34f85465a0e272b45818ced6ea4 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 db8c0bb28096663ef6188537033d54d66ee1fcf2 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -53,6 +53,7 @@
- 	"workbench.action.terminal.hideFindWidget": "隱藏尋找小工具",
- 	"nextTerminalFindTerm": "顯示下一個尋找字詞",
- 	"previousTerminalFindTerm": "顯示上一個尋找字詞",
-+<<<<<<< .our
- 	"quickOpenTerm": "切換使用中的終端機 ",
- 	"workbench.action.terminal.scrollToPreviousCommand": "捲動至上一個命令",
- 	"workbench.action.terminal.scrollToNextCommand": "捲動至下一個命令",
-@@ -60,4 +61,7 @@
- 	"workbench.action.terminal.selectToNextCommand": "選取下一個命令",
- 	"workbench.action.terminal.selectToPreviousLine": "選擇上一行",
- 	"workbench.action.terminal.selectToNextLine": "選擇下一行"
-+=======
-+	"quickOpenTerm": "切換使用中的終端機 "
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f80c288cbec285a050d1369d1fdc283ef870e226 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 2657899133e07b49fde3b011113a300d729b30b8 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 3c4cccada80ab6272079756f801b41915d757acb i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -11,6 +11,9 @@
- 	"terminalCursor.foreground": "終端機游標的前景色彩。",
- 	"terminalCursor.background": "終端機游標的背景色彩。允許區塊游標重疊於自訂字元色彩。",
- 	"terminal.selectionBackground": "終端機的選取項目背景色彩。",
-+<<<<<<< .our
- 	"terminal.border": "在終端機內將窗格分割之邊界的色彩。預設為 panel.border。",
-+=======
-+>>>>>>> .their
- 	"terminal.ansiColor": "終端機中的 '{0}' ANSI 色彩。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 69805b63ee1aa5a061d6bf864ce49c4cc199720e i18n/cht/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  our    100644 bdcaab4106d8bcccb7ceace49106967eaf858fab i18n/cht/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  their  100644 db1fb1ca656a41a2fb79034f32f08edac39cd931 i18n/cht/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-@@ -11,6 +11,10 @@
- 	"welcomePage.start": "開始",
- 	"welcomePage.newFile": "新增檔案",
- 	"welcomePage.openFolder": "開啟資料夾...",
-+<<<<<<< .our
-+=======
-+	"welcomePage.cloneGitRepository": "複製 Git 存放庫...",
-+>>>>>>> .their
- 	"welcomePage.addWorkspaceFolder": "新增工作區資料夾...",
- 	"welcomePage.recent": "最近使用",
- 	"welcomePage.moreRecent": "更多...",
-changed in both
-  base   100644 d447bb3b58562692de4ea1252a6f869c23a604cc i18n/cht/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 d8a57b177d1c5bed0bf72818f809bba5c7dd5e99 i18n/cht/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 2775ad9c28f2fdba709bae3f8436d64a3327d0fd i18n/cht/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,11 @@
- 	],
- 	"openTasksConfiguration": "開啟工作組態",
- 	"openLaunchConfiguration": "開啟啟動組態",
-+=======
-+	"openTasksConfiguration": "開啟工作組態",
-+	"openLaunchConfiguration": "開啟啟動組態",
-+	"close": "關閉",
-+>>>>>>> .their
- 	"open": "開啟設定",
- 	"saveAndRetry": "儲存並重試",
- 	"errorUnknownKey": "因為 {1} 非已註冊的組態，所以無法寫入至 {0}。",
-@@ -17,6 +23,7 @@
- 	"errorInvalidWorkspaceTarget": "因為 {0} 不支援多資料夾工作區中使用工作區範圍，所以無法寫入工作區設定。",
- 	"errorInvalidFolderTarget": "因為未提供資源，所以無法寫入至資料夾設定。",
- 	"errorNoWorkspaceOpened": "因為未開啟工作區，所以無法寫入至 {0}。請先開啟工作區，再試一次。",
-+<<<<<<< .our
- 	"errorInvalidTaskConfiguration": "無法寫入工作組態檔。請開啟它以更正其中的錯誤/警告，然後再試一次。 ",
- 	"errorInvalidLaunchConfiguration": "無法寫入啟動組態檔。請開啟它以更正其中的錯誤/警告，然後再試一次。 ",
- 	"errorInvalidConfiguration": "無法寫入使用者設定。請開啟它以更正其中的錯誤/警告，然後再試一次。 ",
-@@ -27,6 +34,18 @@
- 	"errorConfigurationFileDirty": "因為檔案已變更，所以無法寫入使用者設定。請儲存使用者設定檔案，然後再試一次。",
- 	"errorConfigurationFileDirtyWorkspace": "因為檔案已變更，所以無法寫入工作區設定。請儲存工作區設定檔案，然後再試一次。",
- 	"errorConfigurationFileDirtyFolder": "因為檔案已變更，所以無法寫入資料夾設定。請儲存 '{0}' 資料夾設定檔案，然後再試一次。",
-+=======
-+	"errorInvalidTaskConfiguration": "無法寫入工作檔案。請開啟 **工作** 檔案以修正其中的錯誤/警告，然後重試一次。",
-+	"errorInvalidLaunchConfiguration": "無法寫入啟動檔案。請開啟 **啟動** 檔案以修正其中的錯誤/警告，然後重試一次。",
-+	"errorInvalidConfiguration": "無法寫入使用者設定。請開啟 **使用者設定** 檔案以修正其中的錯誤/警告，然後重試一次。",
-+	"errorInvalidConfigurationWorkspace": "無法寫入工作區設定。請開啟 **工作區設定** 檔案以修正其中的錯誤/警告，然後重試一次。",
-+	"errorInvalidConfigurationFolder": "無法寫入資料夾設定。請開啟 **{0}** 資料夾下的 **資料夾設定** 檔案以修正其中的錯誤/警告，然後重試一次。",
-+	"errorTasksConfigurationFileDirty": "因為檔案已變更，所以無法寫入工作檔案。請儲存 **工作組態** 檔案，然後重試一次。",
-+	"errorLaunchConfigurationFileDirty": "因為檔案已變更，所以無法寫入啟動檔案。請儲存 **啟動組態** 檔案，然後重試一次。",
-+	"errorConfigurationFileDirty": "因為檔案已變更，所以無法寫入使用者設定。請儲存 **使用者設定** 檔案，然後重試一次。",
-+	"errorConfigurationFileDirtyWorkspace": "因為檔案已變更，所以無法寫入工作區設定。請儲存 **工作區設定** 檔案，然後重試一次。",
-+	"errorConfigurationFileDirtyFolder": "因為檔案已變更，所以無法寫入資料夾設定。請儲存 **{0}** 資料夾下的 **資料夾設定** 檔案，然後重試一次。",
-+>>>>>>> .their
- 	"userTarget": "使用者設定",
- 	"workspaceTarget": "工作區設定",
- 	"folderTarget": "資料夾設定"
-changed in both
-  base   100644 e538560091316b0ce02d357a98588c9dbbc77cad i18n/cht/src/vs/workbench/services/files/node/fileService.i18n.json
-  our    100644 ad99e777e96d2d1848aadc8ca56eb931f70d076e i18n/cht/src/vs/workbench/services/files/node/fileService.i18n.json
-  their  100644 745c027703e8594e44f3e41b305d2b21261f0bd1 i18n/cht/src/vs/workbench/services/files/node/fileService.i18n.json
-@@ -11,8 +11,11 @@
- 	"fileNotModifiedError": "未修改檔案的時間",
- 	"fileTooLargeError": "檔案太大無法開啟",
- 	"fileNotFoundError": "找不到檔案 ({0})",
-+<<<<<<< .our
- 	"fileBinaryError": "檔案似乎是二進位檔，因此無法當做文字開啟",
- 	"filePermission": "寫至檔案 ({0}) 的權限遭拒",
-+=======
-+>>>>>>> .their
- 	"fileExists": "要建立的檔案已存在 ({0})",
- 	"fileMoveConflict": "無法移動/複製。目的地已存在檔案。",
- 	"unableToMoveCopyError": "無法移動/複製。檔案會取代其所在的資料夾。",
-changed in both
-  base   100644 991fb95bca2dcb3875dce8d6bdd4c7a20db5c566 i18n/deu/extensions/css/package.i18n.json
-  our    100644 aed34432417b4bd351906eac6b6682221f298dc0 i18n/deu/extensions/css/package.i18n.json
-  their  100644 2fd30b43e1ffe52cfb9e5438d0bc433cb0d2d74e i18n/deu/extensions/css/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,76 @@
- 	],
- 	"displayName": "CSS-Sprachgrundlagen",
- 	"description": "Bietet Syntax-Highlighting und Bracket-Matching für CSS, LESS und SCSS Dateien."
-+=======
-+	"css.title": "CSS",
-+	"css.lint.argumentsInColorFunction.desc": "Ungültige Parameteranzahl.",
-+	"css.lint.boxModel.desc": "Verwenden Sie width oder height nicht beim Festlegen von padding oder border",
-+	"css.lint.compatibleVendorPrefixes.desc": "Stellen Sie beim Verwenden vom anbieterspezifischen Präfix sicher, dass alle anderen anbieterspezifischen Eigenschaften miteinbezogen werden",
-+	"css.lint.duplicateProperties.desc": "Keine doppelten Formatvorlagendefinitionen verwenden",
-+	"css.lint.emptyRules.desc": "Keine leeren Regelsätze verwenden",
-+	"css.lint.float.desc": "Die Verwendung von \"float\" vermeiden. float-Eigenschaften führen zu anfälligem CSS, das schnell nicht mehr funktioniert, wenn sich ein Aspekt des Layouts ändert.",
-+	"css.lint.fontFaceProperties.desc": "@font-face-Regel muss die Eigenschaften \"src\" und \"font-family\" definieren.",
-+	"css.lint.hexColorLength.desc": "Hexfarben müssen aus drei oder sechs Hexzahlen bestehen",
-+	"css.lint.idSelector.desc": "Selektoren sollten keine IDs enthalten, da diese Regeln zu eng mit HTML verknüpft sind.",
-+	"css.lint.ieHack.desc": "IE-Hacks sind nur für die Unterstützung von IE7 und älter erforderlich",
-+	"css.lint.important.desc": "Verwendung von „!important“ vermeiden. Damit wird angegeben, dass die Spezifität vom gesamten CSS außer Kontrolle geraten ist und umgestaltet werden muss.",
-+	"css.lint.importStatement.desc": "Importanweisungen können nicht parallel geladen werden.",
-+	"css.lint.propertyIgnoredDueToDisplay.desc": "Die Eigenschaft wird aufgrund der Anzeige ignoriert. Mit \"display: inline\" besitzen die width-, height-, margin-top-, margin-bottom- und float-Eigenschaften z. B. keine Auswirkung.",
-+	"css.lint.universalSelector.desc": "Es ist bekannt, dass der Universalselektor (*) langsam ist.",
-+	"css.lint.unknownProperties.desc": "Unbekannte Eigenschaft.",
-+	"css.lint.unknownVendorSpecificProperties.desc": "Unbekannte anbieterspezifische Eigenschaft.",
-+	"css.lint.vendorPrefix.desc": "Beim Verwenden von anbieterspezifischen Präfix auch die Standardeigenschaft miteinbeziehen",
-+	"css.lint.zeroUnits.desc": "Keine Einheit für Null erforderlich",
-+	"css.trace.server.desc": "Verfolgt die Kommunikation zwischen VS Code und dem CSS-Sprachserver.",
-+	"css.validate.title": "Steuert die CSS-Validierung und Problemschweregrade.",
-+	"css.validate.desc": "Aktiviert oder deaktiviert alle Überprüfungen.",
-+	"less.title": "LESS",
-+	"less.lint.argumentsInColorFunction.desc": "Ungültige Parameteranzahl.",
-+	"less.lint.boxModel.desc": "Verwenden Sie width oder height nicht beim Festlegen von padding oder border",
-+	"less.lint.compatibleVendorPrefixes.desc": "Stellen Sie beim Verwenden vom anbieterspezifischen Präfix sicher, dass alle anderen anbieterspezifischen Eigenschaften miteinbezogen werden",
-+	"less.lint.duplicateProperties.desc": "Keine doppelten Formatvorlagendefinitionen verwenden",
-+	"less.lint.emptyRules.desc": "Keine leeren Regelsätze verwenden",
-+	"less.lint.float.desc": "Die Verwendung von \"float\" vermeiden. float-Eigenschaften führen zu anfälligem CSS, das schnell nicht mehr funktioniert, wenn sich ein Aspekt des Layouts ändert.",
-+	"less.lint.fontFaceProperties.desc": "@font-face-Regel muss die Eigenschaften \"src\" und \"font-family\" definieren.",
-+	"less.lint.hexColorLength.desc": "Hexfarben müssen aus drei oder sechs Hexzahlen bestehen",
-+	"less.lint.idSelector.desc": "Selektoren sollten keine IDs enthalten, da diese Regeln zu eng mit HTML verknüpft sind.",
-+	"less.lint.ieHack.desc": "IE-Hacks sind nur für die Unterstützung von IE7 und älter erforderlich",
-+	"less.lint.important.desc": "Verwendung von „!important“ vermeiden. Damit wird angegeben, dass die Spezifität vom gesamten CSS außer Kontrolle geraten ist und umgestaltet werden muss.",
-+	"less.lint.importStatement.desc": "Importanweisungen können nicht parallel geladen werden.",
-+	"less.lint.propertyIgnoredDueToDisplay.desc": "Die Eigenschaft wird aufgrund der Anzeige ignoriert. Mit \"display: inline\" besitzen die width-, height-, margin-top-, margin-bottom- und float-Eigenschaften z. B. keine Auswirkung.",
-+	"less.lint.universalSelector.desc": "Es ist bekannt, dass der Universalselektor (*) langsam ist.",
-+	"less.lint.unknownProperties.desc": "Unbekannte Eigenschaft.",
-+	"less.lint.unknownVendorSpecificProperties.desc": "Unbekannte anbieterspezifische Eigenschaft.",
-+	"less.lint.vendorPrefix.desc": "Beim Verwenden von anbieterspezifischen Präfix auch die Standardeigenschaft miteinbeziehen",
-+	"less.lint.zeroUnits.desc": "Keine Einheit für Null erforderlich",
-+	"less.validate.title": "Steuert die LESS-Validierung und Problemschweregrade.",
-+	"less.validate.desc": "Aktiviert oder deaktiviert alle Überprüfungen.",
-+	"scss.title": "SCSS (SASS)",
-+	"scss.lint.argumentsInColorFunction.desc": "Ungültige Parameteranzahl.",
-+	"scss.lint.boxModel.desc": "Verwenden Sie width oder height nicht beim Festlegen von padding oder border",
-+	"scss.lint.compatibleVendorPrefixes.desc": "Stellen Sie beim Verwenden vom anbieterspezifischen Präfix sicher, dass alle anderen anbieterspezifischen Eigenschaften miteinbezogen werden",
-+	"scss.lint.duplicateProperties.desc": "Keine doppelten Formatvorlagendefinitionen verwenden",
-+	"scss.lint.emptyRules.desc": "Keine leeren Regelsätze verwenden",
-+	"scss.lint.float.desc": "Die Verwendung von \"float\" vermeiden. float-Eigenschaften führen zu anfälligem CSS, das schnell nicht mehr funktioniert, wenn sich ein Aspekt des Layouts ändert.",
-+	"scss.lint.fontFaceProperties.desc": "@font-face-Regel muss die Eigenschaften \"src\" und \"font-family\" definieren.",
-+	"scss.lint.hexColorLength.desc": "Hexfarben müssen aus drei oder sechs Hexzahlen bestehen",
-+	"scss.lint.idSelector.desc": "Selektoren sollten keine IDs enthalten, da diese Regeln zu eng mit HTML verknüpft sind.",
-+	"scss.lint.ieHack.desc": "IE-Hacks sind nur für die Unterstützung von IE7 und älter erforderlich",
-+	"scss.lint.important.desc": "Verwendung von „!important“ vermeiden. Damit wird angegeben, dass die Spezifität vom gesamten CSS außer Kontrolle geraten ist und umgestaltet werden muss.",
-+	"scss.lint.importStatement.desc": "Importanweisungen können nicht parallel geladen werden.",
-+	"scss.lint.propertyIgnoredDueToDisplay.desc": "Die Eigenschaft wird aufgrund der Anzeige ignoriert. Mit \"display: inline\" besitzen die width-, height-, margin-top-, margin-bottom- und float-Eigenschaften z. B. keine Auswirkung.",
-+	"scss.lint.universalSelector.desc": "Es ist bekannt, dass der Universalselektor (*) langsam ist.",
-+	"scss.lint.unknownProperties.desc": "Unbekannte Eigenschaft.",
-+	"scss.lint.unknownVendorSpecificProperties.desc": "Unbekannte anbieterspezifische Eigenschaft.",
-+	"scss.lint.vendorPrefix.desc": "Beim Verwenden von anbieterspezifischen Präfix auch die Standardeigenschaft miteinbeziehen",
-+	"scss.lint.zeroUnits.desc": "Keine Einheit für Null erforderlich",
-+	"scss.validate.title": "Steuert die SCSS-Überprüfung und Problemschweregrade.",
-+	"scss.validate.desc": "Aktiviert oder deaktiviert alle Überprüfungen.",
-+	"less.colorDecorators.enable.desc": "Aktiviert oder deaktiviert Farb-Decorators",
-+	"scss.colorDecorators.enable.desc": "Aktiviert oder deaktiviert Farb-Decorators",
-+	"css.colorDecorators.enable.desc": "Aktiviert oder deaktiviert Farb-Decorators",
-+	"css.colorDecorators.enable.deprecationMessage": "Die Einstellung \"css.colorDecorators.enable\" ist veraltet und wurde durch \"editor.colorDecorators\" ersetzt.",
-+	"scss.colorDecorators.enable.deprecationMessage": "Die Einstellung \"scss.colorDecorators.enable\" ist veraltet und wurde durch \"editor.colorDecorators\" ersetzt.",
-+	"less.colorDecorators.enable.deprecationMessage": "Die Einstellung \"less.colorDecorators.enable\" ist veraltet und wurde durch \"editor.colorDecorators\" ersetzt."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/deu/extensions/grunt/out/main.i18n.json
-  our    100644 aeff8901e653c3ad2298c0245dcbefd6a65cb64a i18n/deu/extensions/grunt/out/main.i18n.json
-  their  100644 47bed6eef41fcc422431a95309ee897ae3f4fa7b i18n/deu/extensions/grunt/out/main.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"execFailed": "Fehler bei der automatischen Grunt-Erkennung für den Ordner {0}.  Fehlermeldung: {1}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/deu/extensions/gulp/out/main.i18n.json
-  our    100644 df81773e8897027377718dc907285f2b6f60bb72 i18n/deu/extensions/gulp/out/main.i18n.json
-  their  100644 7d146a15f9457b93077976b5ea455c41332a519e i18n/deu/extensions/gulp/out/main.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"execFailed": "Fehler bei der automatischen Gulp-Erkennung für den Ordner {0}.  Fehlermeldung: {1}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/deu/extensions/jake/out/main.i18n.json
-  our    100644 9a2edd93c48a18c72f17515e8a90d7ab108026d1 i18n/deu/extensions/jake/out/main.i18n.json
-  their  100644 48ad4462aeb406a4737eeb559f8f136c6ff4c249 i18n/deu/extensions/jake/out/main.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"execFailed": "Fehler bei der automatischen Jake-Erkennung für den Ordner {0}. Fehlermeldung: {1}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 49cfdddcd5ded58d0f269f52941beeb7b30ec408 i18n/deu/src/vs/code/electron-main/menus.i18n.json
-  our    100644 2c62aec3f2252906a0cfb94c2bac025ecf6adbb0 i18n/deu/src/vs/code/electron-main/menus.i18n.json
-  their  100644 26bf3d1e0205c4745cd3b2b06280af8c8a86d83e i18n/deu/src/vs/code/electron-main/menus.i18n.json
-changed in both
-  base   100644 7939767138339e010cdb0d49ead0317e78a36abf i18n/deu/src/vs/code/electron-main/windows.i18n.json
-  our    100644 9d74eacc42f56c4c4177eb5bc02c7e375a8b243a i18n/deu/src/vs/code/electron-main/windows.i18n.json
-  their  100644 6b7b1900ae44767b5035378e50ef37dce78cd35b i18n/deu/src/vs/code/electron-main/windows.i18n.json
-changed in both
-  base   100644 52715dd20dbe0008e508841d53efff160c348d4e i18n/deu/src/vs/editor/contrib/format/browser/formatActions.i18n.json
-  our    100644 9ead4227c993925eae59466c5be895d5821e7f15 i18n/deu/src/vs/editor/contrib/format/browser/formatActions.i18n.json
-  their  100644 653f3d9628491f8400e502c6bd7694bf975e63db i18n/deu/src/vs/editor/contrib/format/browser/formatActions.i18n.json
-@@ -8,7 +8,10 @@
- 	"hintn1": "{0} Formatierungen in Zeile {1} vorgenommen",
- 	"hint1n": "1 Formatierung zwischen Zeilen {0} und {1} vorgenommen",
- 	"hintnn": "{0} Formatierungen zwischen Zeilen {1} und {2} vorgenommen",
-+<<<<<<< .our
- 	"no.provider": "Tut mir leid, aber es gibt keine Formatierer für \"{0}\"-Dateien installiert.",
-+=======
-+>>>>>>> .their
- 	"formatDocument.label": "Dokument formatieren",
- 	"formatSelection.label": "Auswahl formatieren"
- }
-\ No newline at end of file
-changed in both
-  base   100644 bd80f226684bf424f786062ad9e098b7c9e682b3 i18n/deu/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  our    100644 5dc1bba0ffa0332aada387afdb06b43754a7fefe i18n/deu/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  their  100644 5cd50df300ac1d988c35e6b77263b3e60c6bd44a i18n/deu/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 c43709d2e6c78cbe0571cb89c016eaed9c13a197 i18n/deu/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 efdaa6c50b1a7075eb309307a09334b8e64087d3 i18n/deu/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 521e20ed207b2fef252e95d13808eacda7bc32be i18n/deu/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -7,10 +7,18 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"invalidManifest": "Die Erweiterung ist ungültig: \"package.json\" ist keine JSON-Datei.",
-+<<<<<<< .our
- 	"incompatible": "Die Erweiterung \"{0}\" kann nicht installiert werden, die sie nicht mit dem Code \"{1}\" kompatibel ist.",
- 	"restartCode": "Bitte starten Sie Code vor der Neuinstallation von {0} neu.",
- 	"installingOutdatedExtension": "Eine neuere Version dieser Erweiterung ist bereits installiert. Möchten Sie diese mit der älteren Version überschreiben?",
- 	"override": "Überschreiben",
-+=======
-+	"restartCodeLocal": "Bitte starten Sie Code vor der Neuinstallation von {0} neu.",
-+	"restartCodeGallery": "Bitte vor der Neuinstallation VSCode neu starten.",
-+	"uninstallDependeciesConfirmation": "Möchten Sie nur \"{0}\" oder auch die zugehörigen Abhängigkeiten deinstallieren?",
-+	"uninstallOnly": "Nur",
-+	"uninstallAll": "Alle",
-+>>>>>>> .their
- 	"cancel": "Abbrechen",
- 	"errorInstallingDependencies": "Fehler während Installation der Abhängigkeiten. {0}",
- 	"MarketPlaceDisabled": "Marketplace ist nicht aktiviert.",
-changed in both
-  base   100644 c0e8f5d0d59a57adad87b3ff3e314eade67917af i18n/deu/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
-  our    100644 ee2ed63656ed9d42c8e5a6cd7e273abffefac671 i18n/deu/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
-  their  100644 27b155956bb335484ae7296a901660bf8940c8a5 i18n/deu/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
-changed in both
-  base   100644 79702d249615ba449c94e6098f954b4853ffea6a i18n/deu/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-  our    100644 03df43c789fa3c3ce234fdec6aea9f958973314e i18n/deu/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-  their  100644 fecc67b154da508ab0079186086e9dbc05cba388 i18n/deu/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-@@ -13,12 +13,18 @@
- 	"vscode.extension.contributes.view.name": "Der visuell lesbare Name der Ansicht. Wird angezeigt",
- 	"vscode.extension.contributes.view.when": "Bedingung, die zum Anzeigen dieser Ansicht erfüllt sein muss",
- 	"vscode.extension.contributes.views": "Trägt Ansichten zum Editor bei.",
-+<<<<<<< .our
- 	"views.explorer": "Trägt Ansichten zum Explorer-Container in der Aktivitätsleiste bei",
- 	"views.debug": "Trägt Ansichten zum Debugging-Container in der Aktivitätsleiste bei",
- 	"views.scm": "Trägt Ansichten zum SCM-Container in der Aktivitätsleiste bei",
- 	"views.test": "Trägt Ansichten zum Testcontainer in der Aktivitätsleiste bei",
- 	"views.contributed": "Trägt Ansichten zum Container mit beigetragenen Ansichten bei",
- 	"ViewContainerDoesnotExist": "Der Ansichtencontainer \"{0}\" ist nicht vorhanden, und alle für ihn registrierten Ansichten werden zu \"Explorer\" hinzugefügt.",
-+=======
-+	"views.explorer": "Explorer-Ansicht",
-+	"views.debug": "Debugansicht",
-+	"locationId.invalid": "{0}\" ist kein gültiger Ansichtenspeicherort",
-+>>>>>>> .their
- 	"duplicateView1": "Mehrere Ansichten können nicht mit derselben ID \"{0}\" am Speicherort \"{1}\" registriert werden.",
- 	"duplicateView2": "Eine Ansicht mit der ID \"{0}\" ist am Speicherort \"{1}\" bereits registriert."
- }
-\ No newline at end of file
-changed in both
-  base   100644 13a7e15f2065845c239333cb288ef21b31ecf454 i18n/deu/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 108a8fac6be8b55e95f04920e7eb7dd21d592b50 i18n/deu/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 d630b8be8f209ba5bb398615beb1d8b29d648d09 i18n/deu/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -15,5 +15,9 @@
- 	"saveWorkspace": "Arbeitsbereich speichern",
- 	"openWorkspaceAction": "Arbeitsbereich öffnen...",
- 	"openWorkspaceConfigFile": "Konfigurationsdatei des Arbeitsbereichs öffnen",
-+<<<<<<< .our
- 	"duplicateWorkspaceInNewWindow": "Duplikat des Arbeitsbereichs in neuem Fenster erstellen"
-+=======
-+	"workspaceFolderPickerPlaceholder": "Arbeitsbereichsordner auswählen"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 16d380370f6bc4cc58af60318a0b34dfbd39cef1 i18n/deu/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 bfd72770d07a936659f4d75458f1721e0e96ed8a i18n/deu/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 842738eb0926bf6666e5430db3e4986e231c01b9 i18n/deu/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 f18a0fe068786ba51bd8d438e729658a810139ee i18n/deu/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-  our    100644 66f3a1eebbd08aea70a332ab9697d5f5727d315b i18n/deu/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-  their  100644 fb5b37b002872158ee01990ebfe5c53800782b53 i18n/deu/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-@@ -55,5 +55,9 @@
- 	"screenReaderDetectedExplanation.answerYes": "Ja",
- 	"screenReaderDetectedExplanation.answerNo": "Nein",
- 	"screenReaderDetectedExplanation.body1": "VS Code ist jetzt für die Verwendung mit einer Sprachausgabe optimiert. ",
-+<<<<<<< .our
- 	"screenReaderDetectedExplanation.body2": "Einige Editorfunktionen weisen ein anderes Verhalten auf, z. B. in Bezug auf den Zeilenumbruch, die Faltung usw."
-+=======
-+	"screenReaderDetectedExplanation.body2": "Einige Editorfunktionen weisen ein anderes Verhalten auf, z. B. in Bezug auf den Zeilenumbruch, Faltung, automatisches Schließen von Klammern usw."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 fc58109765ade07d20b81f82323a32e9e4aae440 i18n/deu/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 1609e7c92719c7aa89402c8bf0018971f9a1043e i18n/deu/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 bff17f6154d2929ec610cffed9ff30a380500c5d i18n/deu/src/vs/workbench/electron-browser/actions.i18n.json
-@@ -49,7 +49,11 @@
- 	"showNextWindowTab": "Nächste Fensterregisterkarte anzeigen",
- 	"moveWindowTabToNewWindow": "Fensterregisterkarte in neues Fenster verschieben",
- 	"mergeAllWindowTabs": "Alle Fenster zusammenführen",
-+<<<<<<< .our
- 	"toggleWindowTabsBar": "Fensterregisterkarten-Leiste umschalten",
- 	"about": "Informationen zu {0}",
- 	"inspect context keys": "Kontextschlüssel prüfen"
-+=======
-+	"toggleWindowTabsBar": "Fensterregisterkarten-Leiste umschalten"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 748f3e96e32df543e0d0e5aab962f909b3c371e0 i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 fc92fd392259fb9b2d1dec1cecdbc3c76bdc7440 i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 ac447a681754ed4da4936227a37ddda75a231f52 i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -13,9 +13,15 @@
- 	"developer": "Entwickler",
- 	"workbenchConfigurationTitle": "Workbench",
- 	"showEditorTabs": "Steuert, ob geöffnete Editoren auf Registerkarten angezeigt werden sollen.",
-+<<<<<<< .our
- 	"workbench.editor.labelFormat.default": "Zeigt den Namen der Datei. Wenn Registerkarten aktiviert sind und zwei Dateien in einer Gruppe den gleichen Namen haben, werden die unterscheidenden Abschnitte der Pfade jeder Datei hinzugefügt. Wenn die Registerkarten deaktiviert sind, wird der Pfad relativ zum Arbeitsbereich-Ordner angezeigt, wenn der Editor aktiv ist. ",
- 	"workbench.editor.labelFormat.short": "Den Namen der Datei anzeigen, gefolgt von dessen Verzeichnisnamen.",
- 	"workbench.editor.labelFormat.medium": "Zeigt den Namen der Datei, gefolgt von dessen Pfad relativ zum Arbeitsbereich-Ordner.",
-+=======
-+	"workbench.editor.labelFormat.default": "Zeigt den Namen der Datei an. Wenn Registerkarten aktiviert sind und zwei Dateien den gleichen Namen in einer Gruppe haben, werden die besonderen Abschnitte des Pfads jeder Datei hinzugefügt. Wenn Registerkarten deaktiviert sind, wird der Pfad zum Arbeitsbereich-Stammverzeichnis angezeigt, wenn der Editor aktiv ist.",
-+	"workbench.editor.labelFormat.short": "Den Namen der Datei anzeigen, gefolgt von dessen Verzeichnisnamen.",
-+	"workbench.editor.labelFormat.medium": "Zeigt den Namen der Datei an, gefolgt vom Pfad zum Arbeitsbereich-Stammverzeichnis.",
-+>>>>>>> .their
- 	"workbench.editor.labelFormat.long": "Zeigt den Namen der Datei an, gefolgt von ihrem absoluten Pfad.",
- 	"tabDescription": "Steuert das Format der Beschriftung für einen Editor. Wenn Sie diese Einstellung ändern, ist beispielsweise der Speicherort einer Datei besser ersichtlich:\n- kurz: \"parent\"\n- mittel: \"workspace/src/parent\"\n- lang: \"/home/user/workspace/src/parent\"\n- Standard: \".../parent\", wenn eine andere Registerkarte denselben Titel hat, oder den relativen Arbeitsbereichspfad, wenn Registerkarten deaktiviert sind.",
- 	"editorTabCloseButton": "Steuert die Position der Schließen-Schaltflächen der Editor-Registerkarten oder deaktiviert sie bei der Einstellung \"off\".",
-changed in both
-  base   100644 51de9385764f61cd8ea484ed90ad57b0ec1aad81 i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
-  our    100644 6b55fb36e6c630a06589148373509024381197f9 i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
-  their  100644 3deaa385b55f7edde2fa480ab1fd5204fe1fcb88 i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
-changed in both
-  base   100644 4588894202af0a4c69cf51fe010ef3000cc7db93 i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 d6cc1170dbfaab61ca55376b64654ebe15edb98e i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 85809743b857d4dc2a1dffa6b57ac7579992977e i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -17,8 +17,12 @@
- 	"multipleConfigurationNamesInWorkspace": "Im Arbeitsbereich sind mehrere Startkonfigurationen \"{0}\" vorhanden. Verwenden Sie den Ordnernamen, um die Konfiguration zu qualifizieren.",
- 	"noFolderWithName": "Der Ordner mit dem Namen \"{0}\" für die Konfiguration \"{1}\" wurde im Verbund \"{2}\" nicht gefunden.",
- 	"configMissing": "Konfiguration \"{0}\" fehlt in \"launch.json\".",
-+<<<<<<< .our
- 	"launchJsonDoesNotExist": "\"launch.json\" ist nicht vorhanden.",
- 	"debugRequestNotSupported": "Das Attribut \"{0}\" weist in der ausgewählten Debugkonfiguration den nicht unterstützten Wert \"{1}\" auf.",
-+=======
-+	"debugRequestNotSupported": "Die ausgewählte Debugkonfiguration verfügt über einen nicht unterstützten Attributwert \"{0}\": \"{1}\".",
-+>>>>>>> .their
- 	"debugRequesMissing": "Das Attribut \"{0}\" fehlt in der ausgewählten Debugkonfiguration.",
- 	"debugTypeNotSupported": "Der konfigurierte Debugtyp \"{0}\" wird nicht unterstützt.",
- 	"debugTypeMissing": "Fehlende Eigenschaft \"type\" für die ausgewählte Startkonfiguration.",
-changed in both
-  base   100644 b850094920900b721dff67e3b4d9513f696ab539 i18n/deu/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-  our    100644 0e47ff84d42795084b73b4ffe93f3912ded6c392 i18n/deu/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-  their  100644 2d51a131a663a69b48c5d1503b96432ca4eec466 i18n/deu/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-@@ -34,10 +34,13 @@
- 	"view id": "ID",
- 	"view name": "Name",
- 	"view location": "Wo",
-+<<<<<<< .our
- 	"localizations": "Lokalisierungen ({0})",
- 	"localizations language id": "Sprach-ID",
- 	"localizations language name": "Sprachname",
- 	"localizations localized language name": "Sprachname (lokalisiert)",
-+=======
-+>>>>>>> .their
- 	"colorThemes": "Farbdesigns ({0})",
- 	"iconThemes": "Symboldesigns ({0})",
- 	"colors": "Farben ({0})",
-changed in both
-  base   100644 9285fd4e2a918199a53dde35b610ba5f2ecf24e5 i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 cf7a07fdcb5de4fa57ac5ab17021ee98e54c3fc8 i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 cf3c69c8cbec5572770948623ecf378c3b32fefa i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-@@ -56,12 +56,17 @@
- 	"OpenExtensionsFile.failed": "Die Datei \"extensions.json\" kann nicht im Ordner \".vscode\" erstellt werden ({0}).",
- 	"configureWorkspaceRecommendedExtensions": "Empfohlene Erweiterungen konfigurieren (Arbeitsbereich)",
- 	"configureWorkspaceFolderRecommendedExtensions": "Empfohlene Erweiterungen konfigurieren (Arbeitsbereichsordner)",
-+<<<<<<< .our
- 	"malicious tooltip": "Die Erweiterung wurde als problematisch gemeldet.",
- 	"malicious": "Böswillig",
- 	"disabled": "Deaktiviert",
- 	"disabled globally": "Deaktiviert",
- 	"disabled workspace": "Für diesen Arbeitsbereich deaktiviert",
- 	"disableAll": "Alle installierten Erweiterungen deaktivieren",
-+=======
-+	"builtin": "Integriert",
-+	"disableAll": "Alle installierten Erweiterungen löschen",
-+>>>>>>> .their
- 	"disableAllWorkspace": "Alle installierten Erweiterungen für diesen Arbeitsbereich deaktivieren",
- 	"enableAll": "Alle Erweiterungen aktivieren",
- 	"enableAllWorkspace": "Alle Erweiterungen für diesen Arbeitsbereich aktivieren",
-changed in both
-  base   100644 d81c461c922e4c009dfa205a1bb0bcb3a95ffd8d i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 5272d4afb1fdf32991cbacee03058c69d41ba9c7 i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 e62525ae0735b880c71ac80878a13fd7c5b356e3 i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -14,11 +14,17 @@
- 	"workspaceRecommendation": "Diese Erweiterung wird von Benutzern des aktuellen Arbeitsbereichs empfohlen.",
- 	"reallyRecommended2": "Für diesen Dateityp wird die Erweiterung \"{0}\" empfohlen.",
- 	"reallyRecommendedExtensionPack": "Für diesen Dateityp wird das Erweiterungspaket \"{0}\" empfohlen.",
-+<<<<<<< .our
- 	"install": "Installieren",
-+=======
-+>>>>>>> .their
- 	"showRecommendations": "Empfehlungen anzeigen",
- 	"showLanguageExtensions": "Der Marketplace enthält Erweiterungen, die bei \".{0}\"-Dateien behilflich sind.",
- 	"workspaceRecommended": "Für diesen Arbeitsbereich sind Erweiterungsempfehlungen verfügbar.",
-+<<<<<<< .our
- 	"installAll": "Alle installieren",
-+=======
-+>>>>>>> .their
- 	"ignoreExtensionRecommendations": "Möchten Sie alle Erweiterungsempfehlungen ignorieren?",
- 	"ignoreAll": "Ja, alles ignorieren",
- 	"no": "Nein"
-changed in both
-  base   100644 f5d75b5e0f7c35f58e1d5c715f7a38970c740929 i18n/deu/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 00a2164ceaa6feb9c7573ae407355c84d09fbc3c i18n/deu/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 93f045f545a2eeb634487d0dd9b7beea44a7c505 i18n/deu/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-changed in both
-  base   100644 26ccd3a867990a46f407fd4ae6d36e8dafc6b80c i18n/deu/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json
-  our    100644 29dbec49f4232526352ce7d3225c0719c9549530 i18n/deu/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json
-  their  100644 efb4c5dd0f470cf64a0ffdce4da12a78cf096c98 i18n/deu/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"dirtyFile": "1 nicht gespeicherte Datei",
- 	"dirtyFiles": "{0} nicht gespeicherte Dateien"
- }
-\ No newline at end of file
-changed in both
-  base   100644 e2b7029e51b9bb32a8d383d247aa1f5161164e7e i18n/deu/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  our    100644 c287ce1399d3a4cbf5ee2cf49ae6344e62eac3a2 i18n/deu/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  their  100644 c5c0985f4fc672adc13313634d8e730456ca32e0 i18n/deu/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,11 @@
- 	],
- 	"scm providers": "Quellcodeanbieter",
- 	"hideRepository": "Ausblenden",
-+=======
-+	"scm providers": "Quellcodeanbieter",
-+	"hideRepository": "Ausblenden",
-+	"commitMessage": "Message (press {0} to commit)",
-+>>>>>>> .their
- 	"installAdditionalSCMProviders": "Installiere weiter SCM Provider...",
- 	"no open repo": "Es gibt keine aktiven Quellcodeanbieter.",
- 	"source control": "Quellcodeverwaltung",
-changed in both
-  base   100644 1fb6b0285076f57ddf70ae22b7c7e6d825c5a599 i18n/deu/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
-  our    100644 0b1aa06f3842fd24888e1492a99cfa868ee5846e i18n/deu/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
-  their  100644 04501ed578acfa5323b7065ee2058d93640ab7b0 i18n/deu/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"snippet.suggestions.label": "Codeausschnitt einfügen",
- 	"sep.userSnippet": "Benutzercodeausschnitte",
- 	"sep.extSnippet": "Erweiterungscodeausschnitte"
-changed in both
-  base   100644 8dae191445015abca13dce2de14a4cbeef06da81 i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  our    100644 da21c5deaa2fffc31211d74e9a379224211f67e5 i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 016b1854df2259c284a28b9f841107f2214cb718 i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-@@ -13,8 +13,14 @@
- 	"vscode.extension.contributes.snippets": "Trägt Codeausschnitte bei.",
- 	"vscode.extension.contributes.snippets-language": "Der Sprachbezeichner, für den dieser Codeausschnitt beigetragen wird.",
- 	"vscode.extension.contributes.snippets-path": "Der Pfad der Codeausschnittdatei. Der Pfad ist relativ zum Erweiterungsordner und beginnt normalerweise mit \". /snippets/\".",
-+<<<<<<< .our
- 	"badVariableUse": "Bei mindestens einem Ausschnitt von der Erweiterung \"{0}\" sind Ausschnittsvariablen und Ausschnittsplatzhalter vertauscht (weitere Informationen finden Sie unter https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax).",
- 	"badFile": "Die Ausschnittsdatei \"{0}\" konnte nicht gelesen werden.",
-+=======
-+	"badFile": "Die Ausschnittsdatei \"{0}\" konnte nicht gelesen werden.",
-+	"badVariableUse": "Das \"{0}\"-Snippet verwirrt wahrscheinlich Snippet-Variablen und Snippet-Paltzhalter. Schaue https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax für weitere Informationen.",
-+	"source.snippet": "Benutzercodeausschnitt",
-+>>>>>>> .their
- 	"detail.snippet": "{0} ({1})",
- 	"snippetSuggest.longLabel": "{0}, {1}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 42ac5818d4637d16ff285e7d30c345cbcd290d21 i18n/deu/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 5e860baf0d874c2a564e21bd9c48c55877bc2bfd i18n/deu/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 5f9f1928ae63de0094468900192853c2bd85c56b i18n/deu/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -17,8 +17,11 @@
- 	"runningTasks": "Aktive Aufgaben anzeigen",
- 	"tasks": "Aufgaben",
- 	"TaskSystem.noHotSwap": "Zum Ändern des Aufgabenausführungsmoduls mit einem aktiven Task muss das Fenster erneut geladen werden.",
-+<<<<<<< .our
- 	"reloadWindow": "Fenster erneut laden",
- 	"TaskServer.folderIgnored": "Der Ordner {0} wird ignoriert, da er Aufgabenversion 0.1.0 verwendet",
-+=======
-+>>>>>>> .their
- 	"TaskService.noBuildTask1": "Keine Buildaufgabe definiert. Markieren Sie eine Aufgabe mit 'isBuildCommand' in der tasks.json-Datei.",
- 	"TaskService.noBuildTask2": "Es ist keine Buildaufgabe definiert. Markieren Sie eine Aufgabe in der Datei \"tasks.json\" als \"Buildgruppe\". ",
- 	"TaskService.noTestTask1": "Keine Testaufgabe definiert. Markieren Sie eine Aufgabe mit 'isTestCommand' in der tasks.json-Datei.",
-@@ -51,13 +54,23 @@
- 	"recentlyUsed": "zuletzt verwendete Aufgaben",
- 	"configured": "konfigurierte Aufgaben",
- 	"detected": "erkannte Aufgaben",
-+<<<<<<< .our
- 	"TaskService.ignoredFolder": "Die folgenden Arbeitsbereichsordner werden ignoriert, da sie Aufgabenversion 0.1.0 verwenden: {0}",
- 	"TaskService.notAgain": "Nicht mehr anzeigen",
-+=======
-+	"TaskService.ignoredFolder": "Die folgenden Arbeitsbereichsordner werden ignoriert, da sie Aufgabenversion 0.1.0 verwenden: ",
-+	"TaskService.notAgain": "Nicht mehr anzeigen",
-+	"TaskService.ok": "OK",
-+>>>>>>> .their
- 	"TaskService.pickRunTask": "Auszuführende Aufgabe auswählen",
- 	"TaslService.noEntryToRun": "Es wurde keine auszuführende Aufgabe gefunden. Aufgaben konfigurieren...",
- 	"TaskService.fetchingBuildTasks": "Buildaufgaben werden abgerufen...",
- 	"TaskService.pickBuildTask": "Auszuführende Buildaufgabe auswählen",
-+<<<<<<< .our
- 	"TaskService.noBuildTask": "Keine auszuführende Buildaufgabe gefunden. Buildaufgabe konfigurieren...",
-+=======
-+	"TaskService.noBuildTask": "Es wurde keine auszuführende Buildaufgabe gefunden. Aufgaben konfigurieren...",
-+>>>>>>> .their
- 	"TaskService.fetchingTestTasks": "Testaufgaben werden abgerufen...",
- 	"TaskService.pickTestTask": "Auszuführende Testaufgabe auswählen",
- 	"TaskService.noTestTaskTerminal": "Es wurde keine auszuführende Testaufgabe gefunden. Aufgaben konfigurieren...",
-changed in both
-  base   100644 0ad146b37850f7cc4307bc3a37c36444c9693b8d i18n/deu/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
-  our    100644 dd6cd0fe3650b3300ff531385df5136086c7e7b0 i18n/deu/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
-  their  100644 197256b0631069c4e5f18ed3af15f3869cde55f6 i18n/deu/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
-changed in both
-  base   100644 f4454e4c78d5efb711d131cffc2a002df1f35149 i18n/deu/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  our    100644 4f46618a81282525db957b1ebde7efb9886db7e0 i18n/deu/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  their  100644 89dde23b864bca9bf420641131943e97ea3821a7 i18n/deu/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-changed in both
-  base   100644 54fd0c65e9038f27c30f68ad63bdee34c3aea940 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 17f468b874b715481031f72251583765b50e478f i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 7d62688f024debf73cdd25871cbac9c25f094d03 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -53,6 +53,7 @@
- 	"workbench.action.terminal.hideFindWidget": "Widget zum Ausblenden der Suche",
- 	"nextTerminalFindTerm": "Nächsten Suchbegriff anzeigen",
- 	"previousTerminalFindTerm": "Vorherigen Suchbegriff anzeigen",
-+<<<<<<< .our
- 	"quickOpenTerm": "Aktives Terminal wechseln",
- 	"workbench.action.terminal.scrollToPreviousCommand": "Zu vorherigem Befehl scrollen",
- 	"workbench.action.terminal.scrollToNextCommand": "Zu nächstem Befehl scrollen",
-@@ -60,4 +61,7 @@
- 	"workbench.action.terminal.selectToNextCommand": "Auswählen bis zu nächstem Befehl",
- 	"workbench.action.terminal.selectToPreviousLine": " Auswählen bis zur vorherigen Zeile ",
- 	"workbench.action.terminal.selectToNextLine": "Auswählen bis zur nächsten Zeile"
-+=======
-+	"quickOpenTerm": "Aktives Terminal wechseln"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e1d9d37fe1e42e0b79089a0c6ec23beeac903b2e i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 84fc7fe0d67567c48c4b669c0d3d08c7386267cc i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 76d17079ae8593f6abcc2da12d7db4ec963105fb i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -11,6 +11,10 @@
- 	"terminalCursor.foreground": "Die Vordergrundfarbe des Terminalcursors.",
- 	"terminalCursor.background": "Die Hintergrundfarbe des Terminalcursors. Ermöglicht das Anpassen der Farbe eines Zeichens, das von einem Blockcursor überdeckt wird.",
- 	"terminal.selectionBackground": "Die Auswahlvordergrundfarbe des Terminals.",
-+<<<<<<< .our
- 	"terminal.border": "Die Farbe des Rahmens, der Bereiche innerhalb des Terminals teilt. Der Standardwert ist panel.border.",
- 	"terminal.ansiColor": "\"{0}\" ANSI-Farbe im Terminal"
-+=======
-+	"terminal.ansiColor": "\"{0}\": ANSI-Farbe im Terminal"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 75f68335e054d3737897120c2db960c4ed673245 i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  our    100644 32b9b62035bd1682e803803a438bf61ea5ca8408 i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  their  100644 ff1138d5fed089678c624cba497be6f83e39064f i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-@@ -11,6 +11,10 @@
- 	"welcomePage.start": "Starten",
- 	"welcomePage.newFile": "Neue Datei",
- 	"welcomePage.openFolder": "Ordner öffnen...",
-+<<<<<<< .our
-+=======
-+	"welcomePage.cloneGitRepository": "Git-Repository klonen...",
-+>>>>>>> .their
- 	"welcomePage.addWorkspaceFolder": "Arbeitsbereichsordner hinzufügen...",
- 	"welcomePage.recent": "Zuletzt verwendet",
- 	"welcomePage.moreRecent": "Weitere Informationen...",
-changed in both
-  base   100644 35397426d52ec53478f6171c09c41a7f64c666b0 i18n/deu/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 6e51d0a62d6cbb327e635cf17096e9a085de524c i18n/deu/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 2420a104c155abdaf901a86b12e0d852566b22f3 i18n/deu/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,11 @@
- 	],
- 	"openTasksConfiguration": "Aufgabenkonfiguration öffnen",
- 	"openLaunchConfiguration": "Startkonfiguration öffnen",
-+=======
-+	"openTasksConfiguration": "Aufgabenkonfiguration öffnen",
-+	"openLaunchConfiguration": "Startkonfiguration öffnen",
-+	"close": "Schließen",
-+>>>>>>> .their
- 	"open": "Einstellungen öffnen",
- 	"saveAndRetry": "Speichern und wiederholen",
- 	"errorUnknownKey": "In {0} kann nicht geschrieben werden, weil {1} keine registrierte Konfiguration ist.",
-@@ -17,6 +23,7 @@
- 	"errorInvalidWorkspaceTarget": "In die Arbeitsbereichseinstellungen kann nicht geschrieben werden, da {0} den Arbeitsbereichsumfang in einem Arbeitsbereich mit mehreren Ordnern nicht unterstützt.",
- 	"errorInvalidFolderTarget": "In die Ordnereinstellungen kann nicht geschrieben werden, weil keine Ressource angegeben ist.",
- 	"errorNoWorkspaceOpened": "In {0} kann nicht geschrieben werden, weil kein Arbeitsbereich geöffnet ist. Öffnen Sie zuerst einen Arbeitsbereich, und versuchen Sie es noch mal.",
-+<<<<<<< .our
- 	"errorInvalidTaskConfiguration": "In die Konfigurationsdatei der Aufgabe kann nicht geschrieben werden. Öffnen Sie die Datei, um Fehler/Warnungen darin zu beheben, und versuchen Sie es noch mal.",
- 	"errorInvalidLaunchConfiguration": "In die Startkonfigurationsdatei kann nicht geschrieben werden. Öffnen Sie die Datei, um Fehler/Warnungen darin zu beheben, und versuchen Sie es noch mal.",
- 	"errorInvalidConfiguration": "In die Benutzereinstellungen kann nicht geschrieben werden. Öffnen Sie die Benutzereinstellungen, um Fehler/Warnungen in der Datei zu korrigieren, und versuchen Sie es noch mal.",
-@@ -27,6 +34,18 @@
- 	"errorConfigurationFileDirty": "In die Benutzereinstellungen kann nicht geschrieben werden, weil die Datei geändert wurde. Speichern Sie die Datei mit den Benutzereinstellungen, und versuchen Sie es noch mal.",
- 	"errorConfigurationFileDirtyWorkspace": "In die Arbeitsbereichseinstellungen kann nicht geschrieben werden, weil die Datei geändert wurde. Speichern Sie die Datei mit den Arbeitsbereichseinstellungen, und versuchen Sie es noch mal.",
- 	"errorConfigurationFileDirtyFolder": "In die Ordnereinstellungen kann nicht geschrieben werden, da die Datei geändert wurde. Speichern Sie die Datei mit den Ordnereinstellungen \"{0}\" und versuchen Sie es noch mal.",
-+=======
-+	"errorInvalidTaskConfiguration": "In die Aufgabendatei kann nicht geschrieben werden. Öffnen Sie die Datei **Aufgaben**, um Fehler/Warnungen darin zu beheben, und versuchen Sie es noch mal.",
-+	"errorInvalidLaunchConfiguration": "In die Startdatei kann nicht geschrieben werden. Öffnen Sie die Datei **Starten**, um Fehler/Warnungen in der Datei zu beheben, und versuchen Sie es noch mal.",
-+	"errorInvalidConfiguration": "In die Benutzereinstellungen kann nicht geschrieben werden. Öffnen Sie die Datei **Benutzereinstellungen**, um Fehler/Warnungen darin zu korrigieren, und versuchen Sie es noch mal.",
-+	"errorInvalidConfigurationWorkspace": "In die Arbeitsbereichseinstellungen kann nicht geschrieben werden. Öffnen Sie die Datei **Arbeitsbereichseinstellungen**, um Fehler/Warnungen darin zu korrigieren, und versuchen Sie es noch mal.",
-+	"errorInvalidConfigurationFolder": "In die Ordnereinstellungen kann nicht geschrieben werden. Öffnen Sie die Datei **Ordnereinstellungen** unter **{0}**, um Fehler/Warnungen darin zu korrigieren, und versuchen Sie es noch mal.",
-+	"errorTasksConfigurationFileDirty": "In die Aufgabendatei kann nicht geschrieben werden, da sie geändert wurde. Speichern Sie die Datei **Aufgabenkonfiguration**, und versuchen Sie es noch mal.",
-+	"errorLaunchConfigurationFileDirty": "In die Startdatei kann nicht geschrieben werden, da sie geändert wurde. Speichern Sie die Datei **Startkonfiguration**, und versuchen Sie es noch mal.",
-+	"errorConfigurationFileDirty": "In die Einstellungen kann nicht geschrieben werden, da die Datei geändert wurde. Speichern Sie die Datei **Benutzereinstellungen**, und versuchen Sie es noch mal.",
-+	"errorConfigurationFileDirtyWorkspace": "In die Arbeitsbereichseinstellungen kann nicht geschrieben werden, da die Datei geändert wurde. Speichern Sie die Datei **Arbeitsbereichseinstellungen**, und versuchen Sie es noch mal.",
-+	"errorConfigurationFileDirtyFolder": "In die Ordnereinstellungen kann nicht geschrieben werden, da die Datei geändert wurde. Speichern Sie die Datei **Ordnereinstellungen** unter **{0}**, und versuchen Sie es noch mal.",
-+>>>>>>> .their
- 	"userTarget": "Benutzereinstellungen",
- 	"workspaceTarget": "Arbeitsbereichseinstellungen",
- 	"folderTarget": "Ordnereinstellungen"
-changed in both
-  base   100644 e44865e5a0fd1def2fc543d3e1668d20ff8cb82e i18n/deu/src/vs/workbench/services/files/node/fileService.i18n.json
-  our    100644 a2229be0ceef3b429bbc28d1dcb6e2f94145d317 i18n/deu/src/vs/workbench/services/files/node/fileService.i18n.json
-  their  100644 82912560d86c05f48735fdf7d9b75de2757b1994 i18n/deu/src/vs/workbench/services/files/node/fileService.i18n.json
-@@ -11,8 +11,11 @@
- 	"fileNotModifiedError": "Datei nicht geändert seit",
- 	"fileTooLargeError": "Die Datei ist zu groß, um sie zu öffnen.",
- 	"fileNotFoundError": "Die Datei wurde nicht gefunden ({0}).",
-+<<<<<<< .our
- 	"fileBinaryError": "Die Datei scheint eine Binärdatei zu sein und kann nicht als Text geöffnet werden.",
- 	"filePermission": "Schreibzugriff auf Datei ({0}) verweigert",
-+=======
-+>>>>>>> .their
- 	"fileExists": "Die zu erstellende Datei ist bereits vorhanden ({0}). ",
- 	"fileMoveConflict": "Verschieben/Kopieren kann nicht ausgeführt werden. Die Datei ist am Ziel bereits vorhanden.",
- 	"unableToMoveCopyError": "Der Verschiebe-/Kopiervorgang kann nicht ausgeführt werden. Die Datei würde den Ordner ersetzen, in dem sie enthalten ist.",
-changed in both
-  base   100644 c9693e97782df2dcf5ad35a3e7baaf76ec07360a i18n/esn/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  our    100644 ebca59c681c79c71e23dedb1815f394e6a16a4e3 i18n/esn/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  their  100644 fc4e80ef3e405b39e4f68f91aa909f57ab374ff5 i18n/esn/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 e0975190eb1ae42d9f913957bbfdb24877c67596 i18n/esn/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-  our    100644 6ab80fb8ae1160fa102af7a2cb332dde3bbd0835 i18n/esn/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-  their  100644 71dc1648d7cf8b9f42c850318e4df11e9c2d6d05 i18n/esn/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-@@ -13,12 +13,18 @@
- 	"vscode.extension.contributes.view.name": "Nombre de la vista en lenguaje natural. Será mostrado",
- 	"vscode.extension.contributes.view.when": "Condición que se debe cumplir para mostrar esta vista",
- 	"vscode.extension.contributes.views": "Aporta vistas al editor",
-+<<<<<<< .our
- 	"views.explorer": "Aporta vistas al contenedor del explorador en la barra de actividades",
- 	"views.debug": "Contribuye vistas al contenedor de depuración en la barra de actividades",
- 	"views.scm": "Contribuye vistas al contenedor SCM en la barra de actividades",
- 	"views.test": "Contribuye vistas al contenedor de pruebas en la barra de actividades",
- 	"views.contributed": "Contribuye vistas al contenedor de vistas aportadas",
- 	"ViewContainerDoesnotExist": "Contenedor de vistas ' {0} ' no existe y todas las vistas registradas se agregarán al 'Explorer'.",
-+=======
-+	"views.explorer": "Vista del explorador",
-+	"views.debug": "Vista de depuración",
-+	"locationId.invalid": "`{0}` no es una ubicación de vista válida",
-+>>>>>>> .their
- 	"duplicateView1": "No se pueden registrar múltiples vistas con el mismo identificador '{0}' en la ubicación '{1}'",
- 	"duplicateView2": "Una vista con el identificador '{0}' ya está registrada en la ubicación '{1}'"
- }
-\ No newline at end of file
-changed in both
-  base   100644 53cb8c300f6b0aff5630ba12ac21e65fcbe1159f i18n/esn/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-  our    100644 29cf10b5371d923fe060a45e5ebf099377fce213 i18n/esn/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-  their  100644 d3bb899fc0775b28516f57244c04069a5f14763d i18n/esn/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-@@ -55,5 +55,9 @@
- 	"screenReaderDetectedExplanation.answerYes": "Sí",
- 	"screenReaderDetectedExplanation.answerNo": "No",
- 	"screenReaderDetectedExplanation.body1": "VS Code se ha optimizado para ser utilizado con un lector de pantalla",
-+<<<<<<< .our
- 	"screenReaderDetectedExplanation.body2": "Algunas características del editor tendrán comportamientos diferentes: p. ej. ajuste de línea, plegado, etc."
-+=======
-+	"screenReaderDetectedExplanation.body2": "Algunas características del editor tendrán comportamientos diferentes: por ejemplo, los ajustes de línea, plegamiento, cierre automático de llaves, etc."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c05c6ca726cc88f27f51c183d190d498a60c3f45 i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 57d447a0a0b664b859bc321a1781f6980e63b0fd i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 4655a5812beac52751cf1681e359aebe1a388502 i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -13,7 +13,11 @@
- 	"developer": "Desarrollador",
- 	"workbenchConfigurationTitle": "Área de trabajo",
- 	"showEditorTabs": "Controla si los editores abiertos se deben mostrar o no en pestañas.",
-+<<<<<<< .our
- 	"workbench.editor.labelFormat.default": "Mostrar el nombre del archivo. Cuando están habilitadas las pestañas y dos archivos tienen el mismo nombre en un grupo se agregan las secciones de distinguinshing de ruta de cada archivo. Cuando se desactivan las pestañas, se muestra la ruta de acceso relativa a la carpeta de trabajo si el editor está activo.",
-+=======
-+	"workbench.editor.labelFormat.default": "Mostrar el nombre del archivo. Cuando las pestañas están habilitadas y dos archivos tienen el mismo nombre en un grupo, se agregan las secciones distintivas de la ruta de acceso de cada archivo. Cuando las pestañas están deshabilitadas, se muestra la ruta de acceso relativa a la raíz del área de trabajo si el editor está activo.",
-+>>>>>>> .their
- 	"workbench.editor.labelFormat.short": "Mostrar el nombre del archivo seguido de su nombre de directorio.",
- 	"workbench.editor.labelFormat.medium": "Mostrar el nombre del archivo seguido de la ruta de acceso relativa a la carpeta de espacio de trabajo.",
- 	"workbench.editor.labelFormat.long": "Mostrar el nombre del archivo seguido de la ruta de acceso absoluta.",
-changed in both
-  base   100644 87eaa41a91c13882bd17ee2dac9e5128ad181c04 i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
-  our    100644 6a27fe695c2703bcfe5a759b511d923cd18b45f8 i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
-  their  100644 ebf04db12c24f33118b253df905e1935e497737a i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
-changed in both
-  base   100644 376b321d29bac1786160143f1d58accdcdcea65c i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 d28e2c7b8c0f100d21de57741d72f030bc22f977 i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 39eca78322f66b91063665ac8d078386d67187e5 i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -17,9 +17,14 @@
- 	"multipleConfigurationNamesInWorkspace": "Hay varias configuraciones de inicio \"{0}\" en el área de trabajo. Use el nombre de la carpeta para calificar la configuración.",
- 	"noFolderWithName": "No se puede encontrar la carpeta con el nombre ' {0} ' para la configuración ' {1} ' en el compuesto ' {2} '.",
- 	"configMissing": "La configuración \"{0}\" falta en \"launch.json\".",
-+<<<<<<< .our
- 	"launchJsonDoesNotExist": "'launch.json' no existe.",
- 	"debugRequestNotSupported": "El atributo \"{0}\" tiene un valor no admitido ({1}) en la configuración de depuración elegida.",
- 	"debugRequesMissing": "El atributo '{0}' está ausente en la configuración de depuración elegida. ",
-+=======
-+	"debugRequestNotSupported": "La configuración de depuración seleccionada tiene un valor de atributo '{0}': '{1}' no compatible.",
-+	"debugRequesMissing": "El atributo '{0}' está ausente en la configuración de depuración elegida.",
-+>>>>>>> .their
- 	"debugTypeNotSupported": "El tipo de depuración '{0}' configurado no es compatible.",
- 	"debugTypeMissing": "Falta la propiedad \"type\" en la configuración de inicio seleccionada.",
- 	"debugAnyway": "Depurar de todos modos",
-changed in both
-  base   100644 c7638aea114a52d4c1c185253b9000e101536a7b i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 99cc3686e6501d7b489d9fd1df7919d3f52f53bb i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 854b93846eca52ba6b4b2a6164c1fe06d0da409e i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,11 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"reallyRecommended2": "Para este tipo de archivo, se recomineda la extensión '{0}'.",
-+	"reallyRecommendedExtensionPack": "Para este tipo de fichero, se recomienda el paquete de extensión '{0}'.",
-+	"showRecommendations": "Mostrar recomendaciones",
-+>>>>>>> .their
- 	"neverShowAgain": "No volver a mostrar",
- 	"searchMarketplace": "Buscar en Marketplace ",
- 	"dynamicWorkspaceRecommendation": "Esta extensión podría interesarle porque muchos otros usuarios del repositorio {0} la utilizan.",
-@@ -18,7 +24,10 @@
- 	"showRecommendations": "Mostrar recomendaciones",
- 	"showLanguageExtensions": "El Marketplace tiene extensiones que pueden ayudar con '. {0} ' archivos ",
- 	"workspaceRecommended": "Esta área de trabajo tiene recomendaciones de extensión.",
-+<<<<<<< .our
- 	"installAll": "Instalar todo",
-+=======
-+>>>>>>> .their
- 	"ignoreExtensionRecommendations": "¿Desea ignorar todas las recomendaciones de la extensión?",
- 	"ignoreAll": "Sí, despreciar todas.",
- 	"no": "No"
-changed in both
-  base   100644 5d7195fc652c7fac5e2e4c51636716e81a5b96b2 i18n/esn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 6b7926d2bf7039c9fedbd3b89b2c9e98ee891b0d i18n/esn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 d4d0e9494609332f3bdbf2e3a6ffaf2badaa9abe i18n/esn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-changed in both
-  base   100644 5c65b30517ec4f9b07f35bd9584563616d1b58e2 i18n/esn/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  our    100644 67ddbe8f8cd175de377b1d65230024b0fc94bf07 i18n/esn/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  their  100644 6b08e43a2919900d93f2dcf6cc4e066895a20d32 i18n/esn/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-@@ -8,6 +8,10 @@
- 	],
- 	"scm providers": "Proveedores de Control de Código fuente",
- 	"hideRepository": "Ocultar",
-+<<<<<<< .our
-+=======
-+	"commitMessage": "Message (press {0} to commit)",
-+>>>>>>> .their
- 	"installAdditionalSCMProviders": "Instalar proveedores  adicionales de SCM...",
- 	"no open repo": "No hay proveedores de control de código fuente activos.",
- 	"source control": "Control de código fuente",
-changed in both
-  base   100644 bc178db6915f477453f83685e5c3a77eaa6729fa i18n/esn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 cf1ca0ef5c2b17265b6eb266a58dc6112305ccf4 i18n/esn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 ad64a450cf5a5b5f16006781b531b8441294f625 i18n/esn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -51,7 +51,11 @@
- 	"recentlyUsed": "Tareas usadas recientemente",
- 	"configured": "tareas configuradas",
- 	"detected": "tareas detectadas",
-+<<<<<<< .our
- 	"TaskService.ignoredFolder": "Las siguientes carpetas del área de trabajo se omitirán porque utilizan la versión 0.1.0 de la tarea: {0}",
-+=======
-+	"TaskService.ignoredFolder": "Las siguientes carpetas del espacio de trabajo se omiten ya que utilizan la versión 0.1.0 de tarea: ",
-+>>>>>>> .their
- 	"TaskService.notAgain": "No volver a mostrar",
- 	"TaskService.pickRunTask": "Seleccione la tarea a ejecutar",
- 	"TaslService.noEntryToRun": "No se encontraron tareas para ejecutar. Configurar tareas...",
-changed in both
-  base   100644 7e1865b18d8c67d540e1e0e574cebf3ca4fc1691 i18n/esn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 532a6558111964e59cddb3ee4e8da3da36a9d18f i18n/esn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 c76e49703cc3b15cd555c0128a885d43865edcd7 i18n/esn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,11 @@
- 	],
- 	"openTasksConfiguration": "Abrir configuración de tareas",
- 	"openLaunchConfiguration": "Abrir configuración de inicio",
-+=======
-+	"openTasksConfiguration": "Abrir configuración de tareas",
-+	"openLaunchConfiguration": "Abrir configuración de inicio",
-+	"close": "Cerrar",
-+>>>>>>> .their
- 	"open": "Abrir configuración",
- 	"saveAndRetry": "Guardar y reintentar",
- 	"errorUnknownKey": "No se puede escribir en {0} porque {1} no es una configuración registrada.",
-@@ -17,6 +23,7 @@
- 	"errorInvalidWorkspaceTarget": "No se puede escribir a la configuración del espacio de trabajo porque {0} no soporta a un espacio de trabajo con multi carpetas.",
- 	"errorInvalidFolderTarget": "No se puede escribir en Configuración de carpeta porque no se ha proporcionado ningún recurso.",
- 	"errorNoWorkspaceOpened": "No se puede escribir en {0} porque no hay ninguna área de trabajo abierta. Abra un área de trabajo y vuelva a intentarlo.",
-+<<<<<<< .our
- 	"errorInvalidTaskConfiguration": "No se puede escribir en el archivo de configuración de tareas. Por favor, ábralo para corregir sus errores/advertencias e inténtelo de nuevo.",
- 	"errorInvalidLaunchConfiguration": "No se puede escribir en el archivo de configuración de inicio. Ábralo para corregir los posibles errores o advertencias que tenga y vuelva a intentarlo.",
- 	"errorInvalidConfiguration": "No se puede escribir en la configuración de usuario. Ábrala para corregir los posibles errores o advertencias que tenga y vuelva a intentarlo.",
-@@ -27,6 +34,18 @@
- 	"errorConfigurationFileDirty": "No se puede escribir en el archivo de configuración de usuario porque se ha modificado. Guarde primero el archivo y vuelva a intentarlo.",
- 	"errorConfigurationFileDirtyWorkspace": "No se puede escribir en el archivo de configuración del área de trabajo porque se ha modificado. Guarde primero el archivo y vuelva a intentarlo.",
- 	"errorConfigurationFileDirtyFolder": "No se puede escribir en el archivo de configuración de carpeta porque se ha modificado. Guarde primero el archivo de configuración de la carpeta \"{0}\" y vuelva a intentarlo.",
-+=======
-+	"errorInvalidTaskConfiguration": "No se puede escribir en el archivo de tareas. Por favor, abra el archivo de ** Tareas ** para corregir los errores/advertencias en él e inténtelo de nuevo.",
-+	"errorInvalidLaunchConfiguration": "No se puede escribir en el archivo de inicio. Por favor, abra el archivo de ** Inicio** para corregir los errores/advertencias en él e inténtelo de nuevo.",
-+	"errorInvalidConfiguration": "No se puede escribir en la configuración de usuario. Por favor, abra el archivo de **Configuración de usuario** para corregir los errores/advertencias en él e inténtelo de nuevo.",
-+	"errorInvalidConfigurationWorkspace": "No se puede escribir en la configuración del área de trabajo. Por favor, abra el archivo de **Configuración de área de trabajo** para corregir los errores/advertencias en él e inténtelo de nuevo.",
-+	"errorInvalidConfigurationFolder": "No se puede escribir en la configuración de carpeta. Por favor, abra el archivo de **Configuración de carpeta** para corregir los errores/advertencias en él e inténtelo de nuevo.",
-+	"errorTasksConfigurationFileDirty": "No se puede escribir en el archivo de tareas porque el archivo se ha modificado. Por favor, guarde el archivo de **Configuración de Tareas** e inténtelo de nuevo.",
-+	"errorLaunchConfigurationFileDirty": "No se puede escribir en el archivo de inicio porque el archivo se ha modificado. Por favor, guarde el archivo de **Configuración de inicio** e inténtelo de nuevo.",
-+	"errorConfigurationFileDirty": "No se puede escribir en la configuración de usuario porque el archivo se ha modificado. Por favor, guarde el archivo de **Configuración de usuario** e inténtelo de nuevo.",
-+	"errorConfigurationFileDirtyWorkspace": "No se puede escribir en la configuración del área de trabajo porque el archivo se ha modificado. Por favor, guarde el archivo de **Configuración del área de trabajo** e inténtelo de nuevo.",
-+	"errorConfigurationFileDirtyFolder": "No se puede escribir en la configuración de carpeta porque el archivo se ha modificado. Por favor, guarde el archivo de **Configuración de carpeta** en la carpeta ** {0} ** e inténtelo de nuevo.",
-+>>>>>>> .their
- 	"userTarget": "Configuración de usuario",
- 	"workspaceTarget": "Configuración de área de trabajo",
- 	"folderTarget": "Configuración de carpeta"
-changed in both
-  base   100644 2b660d7b4676ff8a04b62c4483578b8f302a347e i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 1ad1b4ad7ba3d841a13ddfeab561381b182d7f45 i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 482947dff9ae9dc6a2218df88ab2f37f8a9e220e i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -12,11 +12,15 @@
- 	"fontSize": "Contrôle la taille de police en pixels.",
- 	"lineHeight": "Contrôle la hauteur de ligne. Utilisez 0 pour calculer lineHeight à partir de fontSize.",
- 	"letterSpacing": "Définit l'espacement des caractères en pixels.",
-+<<<<<<< .our
- 	"lineNumbers.off": "Les numéros de ligne ne sont pas affichés.",
- 	"lineNumbers.on": "Les numéros de ligne sont affichés en nombre absolu.",
- 	"lineNumbers.relative": "Les numéros de ligne sont affichés sous la forme de distance en lignes à la position du curseur.",
- 	"lineNumbers.interval": "Les numéros de ligne sont affichés toutes les 10 lignes.",
- 	"lineNumbers": "Contrôle l’affichage des numéros de ligne.",
-+=======
-+	"lineNumbers": "Contrôle l'affichage des numéros de ligne. Les valeurs possibles sont 'activé', 'désactivé' et 'relatif'. La valeur 'relatif' indique le numéro de ligne à partir de la position actuelle du curseur.",
-+>>>>>>> .their
- 	"rulers": "Afficher les règles verticales après un certain nombre de caractères à espacement fixe. Utiliser plusieurs valeurs pour plusieurs règles. Aucune règle n'est dessinée si le tableau est vide",
- 	"wordSeparators": "Caractères utilisés comme séparateurs de mots durant la navigation ou les opérations basées sur les mots",
- 	"tabSize": "Le nombre d'espaces correspondant à une tabulation. Ce paramètre est remplacé en fonction du contenu du fichier quand 'editor.detectIndentation' est activé.",
-changed in both
-  base   100644 ca7209bfd1d16a777adf92731fe6f7455f8c6a79 i18n/fra/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  our    100644 8224c04d14f4b9a2a9f4bfece560cc047b4d9b4d i18n/fra/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  their  100644 ed0024d2710056b6d6aa2cc7085850607a7ec970 i18n/fra/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 f29fc92b3e64da69f1d2b6c20271f0698f0301e9 i18n/fra/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-  our    100644 fc507ea6db43f31dc909d180291c0064ac8f1ef9 i18n/fra/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-  their  100644 74930c2a09d05046922d16558752f3be4f03ef88 i18n/fra/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-@@ -13,12 +13,18 @@
- 	"vscode.extension.contributes.view.name": "Nom de la vue, contrôlable de visu. Affiché",
- 	"vscode.extension.contributes.view.when": "Condition qui doit être vraie pour afficher cette vue",
- 	"vscode.extension.contributes.views": "Ajoute des vues à l'éditeur",
-+<<<<<<< .our
- 	"views.explorer": "Les vues dans le conteneur \"Explorer\" contribuent à la barre d'activité",
- 	"views.debug": "Les vues dans le conteneur de débogage contribuent à la barre d'activité",
- 	"views.scm": "Les vues dans le conteneur \"SCM\" contribuent à la barre d'activité",
- 	"views.test": "Fournit des vues du conteneur de test dans la barre d'activités",
- 	"views.contributed": "Les vues contribuent au conteneur de vues contributives",
- 	"ViewContainerDoesnotExist": "Le conteneur de vues '{0}' n'existe pas et toutes les vues inscrites dans ce conteneur sont ajoutées à l''Explorateur'.",
-+=======
-+	"views.explorer": "Mode Explorateur",
-+	"views.debug": "Debug View",
-+	"locationId.invalid": "'{0}' n'est pas un emplacement de vue valide",
-+>>>>>>> .their
- 	"duplicateView1": "Impossible d’enregistrer des vues multiples avec le même id '{0}'» dans l’emplacement '{1}'",
- 	"duplicateView2": "Une vue avec l’id `{0}` est déjà enregistrée à l’emplacement `{1}`"
- }
-\ No newline at end of file
-changed in both
-  base   100644 4137209b78be81a3e77ed725c37b772dc8e02770 i18n/fra/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-  our    100644 d86bbe531c655c509c7c01934b693b45e4400b31 i18n/fra/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-  their  100644 dc585654a467ad347d5ac888c82271a7cfb1551d i18n/fra/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-@@ -55,5 +55,9 @@
- 	"screenReaderDetectedExplanation.answerYes": "Oui",
- 	"screenReaderDetectedExplanation.answerNo": "Non",
- 	"screenReaderDetectedExplanation.body1": "VS Code est maintenant optimisé pour une utilisation avec un lecteur d’écran.",
-+<<<<<<< .our
- 	"screenReaderDetectedExplanation.body2": "Certaines fonctionnalités de l’éditeur auront des comportements différents : par exemple encapsulation, repliage, etc.."
-+=======
-+	"screenReaderDetectedExplanation.body2": "Certaines fonctionnalités de l’éditeur auront des comportements différents : par exemple l'encapsulation, le repliage, l'auto-fermeture des parenthèses, etc..."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8d36e6182fd179aefbc080c24fc2979b5474aecd i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 1a663cb4405d0c8f86ec154a57cdd2b613d93195 i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 de18c2da7d08558b62e56d9ff8e2f7242b58906d i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -13,7 +13,11 @@
- 	"developer": "Développeur",
- 	"workbenchConfigurationTitle": "Banc d'essai",
- 	"showEditorTabs": "Contrôle si les éditeurs ouverts doivent s'afficher ou non sous des onglets.",
-+<<<<<<< .our
- 	"workbench.editor.labelFormat.default": "Afficher le nom du fichier. Lorsque les onglets sont activés et que deux fichiers portent le même nom dans un groupe, les sections distinctes du chemin de chaque fichier sont ajoutées. Lorsque les onglets sont désactivées, le chemin d’accès relatif au dossier de l'espace de travail est affiché si l’éditeur est actif.",
-+=======
-+	"workbench.editor.labelFormat.default": "Affiche le nom du fichier. Lorsque les onglets sont activés et deux fichiers portent le même nom dans un groupe les sections distinctes du chemin de chaque fichier sont ajoutées. Lorsque les onglets sont désactivées, le chemin relatif à la racine d’espace de travail est affiché si l’éditeur est actif.",
-+>>>>>>> .their
- 	"workbench.editor.labelFormat.short": "Indiquer le nom du fichier suivi de son nom de répertoire.",
- 	"workbench.editor.labelFormat.medium": "Afficher le nom du fichier suivi de son chemin d’accès relatif au dossier de l'espace de travail.",
- 	"workbench.editor.labelFormat.long": "Indiquer le nom du fichier suivi de son chemin d’accès absolu.",
-changed in both
-  base   100644 f97dc7aa91fcd9f0b3bd9e4f46098a8f0598762d i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
-  our    100644 dbcc91af218c16ec9a1a7cd1d30e7c70385fa794 i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
-  their  100644 07ecb08aee37382ef13100140705981a88fe9616 i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
-changed in both
-  base   100644 ff99f2314ffe9cb56ae7559d4c40efe1eddd25ba i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 dc9d0f20d0f5632bb197839a3ff1ba56a6ca08d4 i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 d8dbd301b65917dd0ff25263e6bd6bcdb18bb797 i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -17,9 +17,14 @@
- 	"multipleConfigurationNamesInWorkspace": "Il y a plusieurs configurations de lancement `{0}` dans l’espace de travail. Utilisez le nom du dossier pour qualifier la configuration.",
- 	"noFolderWithName": "Impossible de trouver le dossier avec le nom '{0}' pour la configuration '{1}' dans le composé '{2}'.",
- 	"configMissing": "Il manque la configuration '{0}' dans 'launch.json'.",
-+<<<<<<< .our
- 	"launchJsonDoesNotExist": "'launch.json' n’existe pas.",
- 	"debugRequestNotSupported": "L’attribut '{0}' a une valeur '{1}' non prise en charge dans la configuration de débogage sélectionnée.",
- 	"debugRequesMissing": "L’attribut '{0}' est introuvable dans la configuration de débogage choisie.",
-+=======
-+	"debugRequestNotSupported": "La configuration de débogage choisie a une valeur d’attribut non prise en charge `{0}` : `{1}`.",
-+	"debugRequesMissing": "L’attribut `{0}` est introuvable dans la configuration de débogage choisie.",
-+>>>>>>> .their
- 	"debugTypeNotSupported": "Le type de débogage '{0}' configuré n'est pas pris en charge.",
- 	"debugTypeMissing": "Propriété 'type' manquante pour la configuration de lancement choisie.",
- 	"debugAnyway": "Déboguer quand même",
-changed in both
-  base   100644 d292ed93d68d989cf8d336c19952be58fcce538c i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 3c10fdb84d0f8c069b4d8fe6dac7e8ac54606d34 i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 8383b67bbc5259c6acce593faca3c24d69eb9e92 i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -14,11 +14,17 @@
- 	"workspaceRecommendation": "Cette extension est recommandée par les utilisateurs de l’espace de travail actuel.",
- 	"reallyRecommended2": "L'extension '{0}' est recommandée pour ce type de fichier.",
- 	"reallyRecommendedExtensionPack": "Le pack d’extensions '{0}' est recommandé pour ce type de fichier.",
-+<<<<<<< .our
- 	"install": "Installer",
-+=======
-+>>>>>>> .their
- 	"showRecommendations": "Afficher les recommandations",
- 	"showLanguageExtensions": "Le Marketplace a des extensions qui peuvent aider avec les fichiers '.{0}'",
- 	"workspaceRecommended": "Cet espace de travail a des recommandations d'extension.",
-+<<<<<<< .our
- 	"installAll": "Tout installer",
-+=======
-+>>>>>>> .their
- 	"ignoreExtensionRecommendations": "Voulez-vous ignorer toutes les recommandations d’extensions ?",
- 	"ignoreAll": "Oui, ignorer tout",
- 	"no": "Non"
-changed in both
-  base   100644 ecb4466a57e49d1f3ea16981ed079fc27b577da9 i18n/fra/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 9693ca31c50911feab4d02a16763cfd2142313b0 i18n/fra/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 066934ce4c8c57d6cc6bea9ebb0859878012c935 i18n/fra/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-changed in both
-  base   100644 f2a4104bb7fb1f6a507414857e7f258900bb98dc i18n/fra/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  our    100644 4bae27c08c3d1da218f3a8a35acda60c8fbc4816 i18n/fra/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  their  100644 81a1f80802393bcbd2a37a0220bb4f852492f4f4 i18n/fra/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-@@ -8,6 +8,10 @@
- 	],
- 	"scm providers": "Fournisseurs de contrôle de code source",
- 	"hideRepository": "Masquer",
-+<<<<<<< .our
-+=======
-+	"commitMessage": "Message (press {0} to commit)",
-+>>>>>>> .their
- 	"installAdditionalSCMProviders": "Installer des fournisseurs SCM supplémentaires...",
- 	"no open repo": "Il n’y a aucun fournisseur de contrôle de code source actif.",
- 	"source control": "Contrôle de code source",
-changed in both
-  base   100644 f305685a88c712f57253c7165f0d6c53e81eadc4 i18n/fra/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 87d639c304bc4b35cf6eb86239d5ea30fd616b54 i18n/fra/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 0f3f74aef8d0b028c505db0b74fc2bf4d270dde3 i18n/fra/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-changed in both
-  base   100644 0800ae0f420e535cef0f87b6a61f3acf3c8f14d3 i18n/fra/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 2993ced5122221b6a919d7041aa1829b3f2477cf i18n/fra/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 8001c71bfc7eb4db1a7c750d3b0854e53d06e609 i18n/fra/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,11 @@
- 	],
- 	"openTasksConfiguration": "Ouvrir la configuration des tâches",
- 	"openLaunchConfiguration": "Ouvrir la configuration du lancement",
-+=======
-+	"openTasksConfiguration": "Ouvrir la configuration des tâches",
-+	"openLaunchConfiguration": "Ouvrir la configuration du lancement",
-+	"close": "Fermer",
-+>>>>>>> .their
- 	"open": "Ouvrir les paramètres",
- 	"saveAndRetry": "Enregistrer et Réessayer",
- 	"errorUnknownKey": "Impossible d’écrire dans {0} car {1} n’est pas une configuration recommandée.",
-@@ -17,6 +23,7 @@
- 	"errorInvalidWorkspaceTarget": "Impossible d’écrire dans les paramètres de l’espace de travail car {0} ne supporte pas de portée d’espace de travail dans un espace de travail multi dossiers.",
- 	"errorInvalidFolderTarget": "Impossible d’écrire dans les paramètres de dossier car aucune ressource n’est fournie.",
- 	"errorNoWorkspaceOpened": "Impossible d’écrire dans {0} car aucun espace de travail n’est ouvert. Veuillez ouvrir un espace de travail et essayer à nouveau.",
-+<<<<<<< .our
- 	"errorInvalidTaskConfiguration": "Impossible d’écrire dans le fichier de configuration des tâches. Veuillez ouvrir le fichier pour y corriger les erreurs/avertissements et essayez à nouveau.",
- 	"errorInvalidLaunchConfiguration": "Impossible d’écrire dans le fichier de configuration de lancement. Veuillez ouvrir le fichier pour y corriger les erreurs/avertissements et essayez à nouveau.",
- 	"errorInvalidConfiguration": "Impossible d’écrire dans les paramètres de l’utilisateur. Veuillez s’il vous plaît ouvrir le fichier des paramètres de l’utilisateur pour y corriger les erreurs/avertissements et essayez à nouveau.",
-@@ -27,6 +34,18 @@
- 	"errorConfigurationFileDirty": "Impossible d’écrire dans les paramètres de l'utilisateur car le fichier a été modifié. Veuillez s’il vous plaît enregistrer le fichier des paramètres de l'utilisateur et réessayez.",
- 	"errorConfigurationFileDirtyWorkspace": "Impossible d’écrire dans les paramètres de l’espace de travail, car le fichier est en attente de sauvegarde. Veuillez s’il vous plaît enregistrer le fichier des paramètres de l’espace de travail et essayez à nouveau.",
- 	"errorConfigurationFileDirtyFolder": "Impossible d’écrire dans les paramètres de dossier, car le fichier est en attente de sauvegarde. Veuillez s’il vous plaît enregistrer le fichier des paramètres du dossier '{0}' et essayez à nouveau.",
-+=======
-+	"errorInvalidTaskConfiguration": "Impossible d’écrire dans le fichier de tâches. Veuillez s’il vous plaît ouvrir le fichier **Tasks** pour corriger les erreurs/avertissements à l'intérieur et essayez à nouveau.",
-+	"errorInvalidLaunchConfiguration": "Impossible d’écrire dans le fichier de lancement. Veuillez s’il vous plaît ouvrir le fichier **Launch** pour corriger les erreurs/avertissements à l'intérieur et essayez à nouveau.",
-+	"errorInvalidConfiguration": "Impossible d’écrire dans les paramètres de l’utilisateur. Veuillez s’il vous plaît ouvrir le fichier **User Settings** pour corriger les erreurs/avertissements à l'intérieur et essayez à nouveau.",
-+	"errorInvalidConfigurationWorkspace": "Impossible d’écrire dans les paramètres de l’espace de travail. Veuillez s’il vous plaît ouvrir le fichier **Workspace Settings** pour corriger les erreurs/avertissements dans le fichier et réessayez.",
-+	"errorInvalidConfigurationFolder": "Impossible d’écrire dans les paramètres de dossier. Veuillez s’il vous plaît ouvrir le fichier **Folder Settings** sous le dossier **{0}** pour corriger les erreurs/avertissements à l'intérieur et essayez à nouveau.",
-+	"errorTasksConfigurationFileDirty": "Impossible d’écrire dans le fichier de tâches car le fichier est en attente de sauvegarde. Veuillez s’il vous plaît enregistrer le fichier **Tasks Configuration** et essayez à nouveau.",
-+	"errorLaunchConfigurationFileDirty": "Impossible d’écrire dans le fichier de lancement, car le fichier est en attente de sauvegarde. Veuillez s’il vous plaît enregistrer le fichier **Launch Configuration** et essayez à nouveau.",
-+	"errorConfigurationFileDirty": "Impossible d’écrire dans les paramètres de l’utilisateur, car le fichier est en attente de sauvegarde. Veuillez s’il vous plaît enregistrer le fichier **User Settings** et essayez à nouveau.",
-+	"errorConfigurationFileDirtyWorkspace": "Impossible d’écrire dans les paramètres de l’espace de travail, car le fichier est en attente de sauvegarde. Veuillez s’il vous plaît enregistrer le fichier **Workspace Settings** et essayez à nouveau.",
-+	"errorConfigurationFileDirtyFolder": "Impossible d’écrire dans les paramètres de dossier parce que le fichier est  attente de sauvegarde. Veuillez s’il vous plaît enregistrer le fichier **Folder Settings** sous le dossier **{0}** et essayez à nouveau.",
-+>>>>>>> .their
- 	"userTarget": "Paramètres utilisateur",
- 	"workspaceTarget": "Paramètres de l'espace de travail",
- 	"folderTarget": "Paramètres de dossier"
-changed in both
-  base   100644 bddcecac9cc724957774a6b5b38d065d3babff73 i18n/hun/extensions/grunt/out/main.i18n.json
-  our    100644 aa32b2ae15af7154e10010d4ef00157d01e8080d i18n/hun/extensions/grunt/out/main.i18n.json
-  their  100644 343486514dff032c0daf5af6b5f76e7689d2ae18 i18n/hun/extensions/grunt/out/main.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"execFailed": "A Grunt automatikus felderítése a(z) {0} mappához nem sikerült a következő hiba miatt: {1}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 2c833fdc8cb686c77338a597764322d45ecfabb3 i18n/hun/extensions/gulp/out/main.i18n.json
-  our    100644 b4716f93ef9af326cc3d2492c80a89e99a8fa916 i18n/hun/extensions/gulp/out/main.i18n.json
-  their  100644 9a22c2ad9b30bebb880b98a2a5814a6e460e4db2 i18n/hun/extensions/gulp/out/main.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"execFailed": "A gulp automatikus felderítése a(z) {0} mappához nem sikerült a következő hiba miatt: {1}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 0a05c39367e6191e778bd1000123c4db4ad58070 i18n/hun/extensions/jake/out/main.i18n.json
-  our    100644 930f667a2b3daea415c774f7635d948ca569be82 i18n/hun/extensions/jake/out/main.i18n.json
-  their  100644 3dd479da8bb1612bf49a8aa2c633fa7ee019c69c i18n/hun/extensions/jake/out/main.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,5 +7,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"execFailed": "A Jake automatikus felderítése a(z) {0} mappához nem sikerült a következő hiba miatt: {1}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 a2afa5b9e5ed176c45d16f2d41bad8dd74cfc622 i18n/hun/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  our    100644 e50c39417bf314b45d74cbd848fd7794fab13bae i18n/hun/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  their  100644 27181140f4be7f30cedc1692ab424fddcbb2df73 i18n/hun/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 b7933d496e4c0d53353532fbaa3bf52da9e242e1 i18n/hun/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-  our    100644 562dc2d0d3ac95f519f9e8d211f5d6feca01f2e5 i18n/hun/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-  their  100644 3b99b32d6197a6452278a6b7120d5e615066a555 i18n/hun/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-@@ -13,12 +13,18 @@
- 	"vscode.extension.contributes.view.name": "A nézet emberek számára szánt neve. Megjelenik a felületen.",
- 	"vscode.extension.contributes.view.when": "A nézet megjelenítésének feltétele",
- 	"vscode.extension.contributes.views": "Nézeteket szolgáltat a szerkesztőhöz",
-+<<<<<<< .our
- 	"views.explorer": "Nézeteket szolgáltat a tevékenységsávon található Fájlkezelő gyűjteményhez.",
- 	"views.debug": "Nézeteket szolgáltat a tevékenységsávon található Hibakeresés gyűjteményhez.",
- 	"views.scm": "Nézeteket szolgáltat a tevékenységsávon található Verziókezelő rendszer gyűjteményhez.",
- 	"views.test": "Nézeteket szolgáltat a tevékenységsávon található Teszt gyűjteményhez.",
- 	"views.contributed": "Nézeteket szolgáltat a szolgáltatott nézetek gyűjteményhez.",
- 	"ViewContainerDoesnotExist": "Nem létezik '{0}' azonosítójú nézetgyűjtemény, és az összes oda regisztrált nézet a Fájlkezelőhöz lesz hozzáadva.",
-+=======
-+	"views.explorer": "Fájlkezelő-nézet",
-+	"views.debug": "Hibakeresési nézet",
-+	"locationId.invalid": "A(z) `{0}` nem érvényes nézethelyszín",
-+>>>>>>> .their
- 	"duplicateView1": "Nem regisztrálható több nézet `{0}` azonosítóval a következő helyen: `{1}`",
- 	"duplicateView2": "Már van `{0}` azonosítójú nézet regisztrálva a következő helyen: `{1}`"
- }
-\ No newline at end of file
-changed in both
-  base   100644 b1e20b8dd6ddfaad7969b1bfd4f2318bd641a1bd i18n/hun/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-  our    100644 57ccef4bad82f52bdd2422f233c830e39e904f21 i18n/hun/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-  their  100644 7f3902b99cffdc3852400634ffd560afe262478c i18n/hun/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-@@ -55,5 +55,9 @@
- 	"screenReaderDetectedExplanation.answerYes": "Igen",
- 	"screenReaderDetectedExplanation.answerNo": "Nem",
- 	"screenReaderDetectedExplanation.body1": "A VS Code most már optimalizálva van képernyőolvasóval való használathoz.",
-+<<<<<<< .our
- 	"screenReaderDetectedExplanation.body2": "A szerkesztőablakban néhány funkció, például a sortörés, kódrészletek bezárása stb. másképp működik."
-+=======
-+	"screenReaderDetectedExplanation.body2": "Néhány funkció másképp működik. Például a sortörés, kódrészletek bezárása, automatikus záró zárójelek beszúrása stb."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 05979d2697e93457cb0e837c2d6389a9de63eec3 i18n/hun/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 cc21f47e7a5add72269e1dcc252497e79ab58b6b i18n/hun/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 730c270e5d599e9dce3a3bde36414974e9b890f8 i18n/hun/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -13,7 +13,11 @@
- 	"developer": "Fejlesztői",
- 	"workbenchConfigurationTitle": "Munkaterület",
- 	"showEditorTabs": "Meghatározza, hogy a megnyitott szerkesztőablakok telején megjelenjenek-e a fülek",
-+<<<<<<< .our
- 	"workbench.editor.labelFormat.default": "Fájl nevének megjelenítése. Ha a fülek engedélyezve vannak, és két egyező nevű fájl van egy csoportban, az elérési útjuk eltérő része lesz hozzáfűzve a névhez. Ha a fülek le vannak tiltva, a fájl munkaterület könyvtárához képest relatív elérési útja jelenik meg, ha a szerkesztőablak aktív.",
-+=======
-+	"workbench.editor.labelFormat.default": "Fájl nevének megjelenítése. Ha a fülek engedélyezve vannak, és két egyező nevű fájl van egy csoportban, az elérési útjuk eltérő része lesz hozzáfűzve a névhez. Ha a fülek le vannak tiltva, a fájl munkaterület gyökérkönyvtárához képest relatív elérési útja jelenik meg, ha a szerkesztőablak aktív.",
-+>>>>>>> .their
- 	"workbench.editor.labelFormat.short": "A fájl nevének megjelenítése a könyvtár nevével együtt.",
- 	"workbench.editor.labelFormat.medium": "Fájl nevének megjelenítése a fájl munkaterület könyvtárához képest relatív elérési útjával együtt.",
- 	"workbench.editor.labelFormat.long": "Fájl nevének megjelenítése a fájl abszolút elérési útjával együtt.",
-changed in both
-  base   100644 30c54c1d5f0acbc95e4cfda80e5d82974d8c2f20 i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 d46bba56fc807a6d58f940f4f326c6859150d33d i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 3945df51449f1066eba5db5c504b28cd3b0960d8 i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -17,8 +17,12 @@
- 	"multipleConfigurationNamesInWorkspace": "Több '{0}' névvel rendelkező indítási konfiguráció is van a munkaterületen. Használja a mappa nevét a konfiguráció pontos megadásához!",
- 	"noFolderWithName": "Nem található '{0}' nevű mappa a(z) '{1}' konfigurációhoz a(z) '{2}' összetett konfigurációban.",
- 	"configMissing": "A(z) '{0}' konfiguráció hiányzik a 'launch.json'-ból.",
-+<<<<<<< .our
- 	"launchJsonDoesNotExist": "A 'launch.json' nem létezik.",
- 	"debugRequestNotSupported": "A(z) '{0}' attribútumnak nem támogatott értéke van ('{1}') a kiválasztott hibakeresési konfigurációban.",
-+=======
-+	"debugRequestNotSupported": "A kiválasztott hibakeresési konfigurációban a(z) `{0}` attribútum értéke nem támogatott: '{1}'.",
-+>>>>>>> .their
- 	"debugRequesMissing": "A(z) '{0}' attribútum hiányzik a kiválasztott hibakeresési konfigurációból.",
- 	"debugTypeNotSupported": "A megadott hibakeresési típus ('{0}') nem támogatott.",
- 	"debugTypeMissing": "A kiválasztott indítási konfigurációnak hiányzik a 'type' tulajdonsága.",
-changed in both
-  base   100644 88c6b00012c31e0d224e83af43fef5d6ef71747e i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 236476e89a262d4e51ec02393f20d9a7b2715c82 i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 712a56778ee3948abe43aa49bcde1b79349912c9 i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,11 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"reallyRecommended2": "Ehhez a fájltípushoz ajánlott a(z) '{0}' kiegészítő.",
-+	"reallyRecommendedExtensionPack": "Ehhez a fájltípushoz ajánlott a(z) '{0}' kiegészítőcsomag.",
-+	"showRecommendations": "Ajánlatok megjelenítése",
-+>>>>>>> .their
- 	"neverShowAgain": "Ne jelenítse meg újra",
- 	"searchMarketplace": "Keresés a piactéren",
- 	"dynamicWorkspaceRecommendation": "Ez a kiegészítő lehet, hogy érdekelni fogja, mert népszerű a(z) {0} forráskódtár felhasználói körében.",
-@@ -18,7 +24,10 @@
- 	"showRecommendations": "Ajánlatok megjelenítése",
- 	"showLanguageExtensions": "A piactéren található olyan kiegészítő, ami segíthet a(z) '.{0}' fájloknál",
- 	"workspaceRecommended": "A munkaterülethez vannak javasolt kiegészítők",
-+<<<<<<< .our
- 	"installAll": "Összes telepítése",
-+=======
-+>>>>>>> .their
- 	"ignoreExtensionRecommendations": "Figyelmen kívül akarja hagyni az összes javasolt kiegészítőt?",
- 	"ignoreAll": "Igen, az összes figyelmen kívül hagyása",
- 	"no": "Nem"
-changed in both
-  base   100644 11cd26076bea4441f7e5ce7d2d6791c59d46fc49 i18n/hun/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 a6c7fe4eaefdd33cdf754b41fc784a5aa1d323ba i18n/hun/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 4cea0462d06569f76531d0c6cdda8abc5c162704 i18n/hun/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-changed in both
-  base   100644 ba0f414b2c2935a55a435a9a102e443fd7154723 i18n/hun/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  our    100644 eed65b480a816d02a454fae412b29472fd8ae097 i18n/hun/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  their  100644 023886324b755e5e666a756d221e3da18c367f1d i18n/hun/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-@@ -8,6 +8,10 @@
- 	],
- 	"scm providers": "Verziókezelő rendszerek",
- 	"hideRepository": "Elrejtés",
-+<<<<<<< .our
-+=======
-+	"commitMessage": "Üzenet (nyomja meg a következőt a commithoz: {0})",
-+>>>>>>> .their
- 	"installAdditionalSCMProviders": "További verziókezelő rendszerek telepítése...",
- 	"no open repo": "Nincs aktív verziókezelő rendszer.",
- 	"source control": "Verziókezelő rendszer",
-changed in both
-  base   100644 435a5a7596e0201f06b142392c8770d88fb9afd4 i18n/hun/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 f91b0b4ec321ce05585bc7176e22754169aa0e2b i18n/hun/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 26736788a2f341a2a82e09e1b96c5228a536151f i18n/hun/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -51,7 +51,11 @@
- 	"recentlyUsed": "legutóbb futtatott feladatok",
- 	"configured": "konfigurált feladatok",
- 	"detected": "talált feladatok",
-+<<<<<<< .our
- 	"TaskService.ignoredFolder": "A következő munkaterületi mappák figyelmen kívül vannak hagyva, mert 0.1.0-s verziójú feladatkonfigurációt használnak: {0}",
-+=======
-+	"TaskService.ignoredFolder": "A következő munkaterületi mappák figyelmen kívül vannak hagyva, mert 0.1.0-s verziójú feladatkonfigurációt használnak:",
-+>>>>>>> .their
- 	"TaskService.notAgain": "Ne jelenítse meg újra",
- 	"TaskService.pickRunTask": "Válassza ki a futtatandó feladatot!",
- 	"TaslService.noEntryToRun": "Nincs futtatandó feladat. Feladatok konfigurálása...",
-changed in both
-  base   100644 66f548427d8c639206f76a82c91f1740036b5e1e i18n/hun/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 8838896ef923e5351413eebec6f141118ecced3a i18n/hun/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 950d9971c46ba01ca6d3bc0161a8a5c7a21f85b4 i18n/hun/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,11 @@
- 	],
- 	"openTasksConfiguration": "Feladatkonfiguráció megnyitása",
- 	"openLaunchConfiguration": "Indítási konfiguráció megnyitása",
-+=======
-+	"openTasksConfiguration": "Feladatkonfiguráció megnyitása",
-+	"openLaunchConfiguration": "Indítási konfiguráció megnyitása",
-+	"close": "Bezárás",
-+>>>>>>> .their
- 	"open": "Beállítások megnyitása",
- 	"saveAndRetry": "Mentés és újrapróbálkozás",
- 	"errorUnknownKey": "Nem sikerült írni a következőbe: {0}. A(z) {1} nem regisztrált beállítás.",
-@@ -17,6 +23,7 @@
- 	"errorInvalidWorkspaceTarget": "Nem sikerült írni a munkaterület beállításaiba, mert a(z) {0} nem támogatott munkaterületi hatókörben egy több mappát tartalmazó munkaterületen.",
- 	"errorInvalidFolderTarget": "Nem sikerült írni a mappa beállításaiba, mert nincs erőforrás megadva.",
- 	"errorNoWorkspaceOpened": "Nem sikerült írni a következőbe: {0}. Nincs munkaterület megnyitva. Nyisson meg egy munkaterületet, majd próbálja újra!",
-+<<<<<<< .our
- 	"errorInvalidTaskConfiguration": "Nem sikerült írni a feladatokat tartalmazó konfigurációs fájljába. Nyissa meg a fájlt, javítsa a benne található hibákat és figyelmeztetéseket, majd próbálja újra!",
- 	"errorInvalidLaunchConfiguration": "Nem sikerült írni az indítási konfigurációs fájlba. Nyissa meg a fájlt, javítsa a benne található hibákat és figyelmeztetéseket, majd próbálja újra!",
- 	"errorInvalidConfiguration": "Nem sikerült írni a felhasználói beállításokba. Nyissa meg a felhasználói beállításokat, javítsa a hibákat és figyelmeztetéseket a fájlban, majd próbálja újra!",
-@@ -27,6 +34,18 @@
- 	"errorConfigurationFileDirty": "Nem sikerült írni a felhasználói beállításokba, mert a fájl módosítva lett. Mentse a felhasználói beállításokat tartalmazó fájlt, majd próbálja újra!",
- 	"errorConfigurationFileDirtyWorkspace": "Nem sikerült írni a munkaterületi beállításokba, mert a fájl módosítva lett. Mentse a munkaterület beállításait tartalmazó fájlt, majd próbálja újra!",
- 	"errorConfigurationFileDirtyFolder": "Nem sikerült írni a mappa beállításait tartalmazó fájlba, mert a fájl módosítva lett. Mentse a(z) '{0}' mappa beállításait tartalmazó fájlt, majd próbálja újra!",
-+=======
-+	"errorInvalidTaskConfiguration": "Nem sikerült írni a feladatkonfigurációs fájlba. Nyissa meg az **Feladatkonfigurációs** fájlt, javítsa a hibákat és figyelmeztetéseket a fájlban, majd próbálja újra!",
-+	"errorInvalidLaunchConfiguration": "Nem sikerült írni az indítási fájlba. Nyissa meg az **Indítási** fájlt, javítsa a hibákat és figyelmeztetéseket a fájlban, majd próbálja újra!",
-+	"errorInvalidConfiguration": "Nem sikerült írni a felhasználói beállításokba. Nyissa meg a **Felhasználói beállításokat**, javítsa a hibákat és figyelmeztetéseket a fájlban, majd próbálja újra!",
-+	"errorInvalidConfigurationWorkspace": "Nem sikerült írni a munkaterület beállításaiba. Nyissa meg a **Munkaterület beállításait**, javítsa a hibákat és figyelmeztetéseket a fájlban, majd próbálja újra!",
-+	"errorInvalidConfigurationFolder": "Nem sikerült írni a mappa beállításaiba. Nyissa meg a **Mappa beállításait**, javítsa a hibákat és figyelmeztetéseket a fájlban, majd próbálja újra!",
-+	"errorTasksConfigurationFileDirty": "Nem sikerült írni a feladatkonfigurációs fájlba, mert a fájl módosítva lett. Mentse a **Feladatkonfigurációs** fájlt, majd próbálja újra!",
-+	"errorLaunchConfigurationFileDirty": "Nem sikerült írni az indítási fájlba, mert a fájl módosítva lett. Mentse az **Indítási konfiguráció** fájlt, majd próbálja újra!",
-+	"errorConfigurationFileDirty": "Nem sikerült írni a felhasználói beállításokba, mert a fájl módosítva lett. Mentse a **Felhasználói beállítások** fájlt, majd próbálja újra!",
-+	"errorConfigurationFileDirtyWorkspace": "Nem sikerült írni a munkaterületi beállításokba, mert a fájl módosítva lett. Mentse a **Munkaterület beállításai** fájlt, majd próbálja újra!",
-+	"errorConfigurationFileDirtyFolder": "Nem sikerült írni a mappa beállításaiba, mert a fájl módosítva lett. Mentse a **Mappa beállításai** fájlt a(z) **{0}** mappában, majd próbálja újra!",
-+>>>>>>> .their
- 	"userTarget": "Felhasználói beállítások",
- 	"workspaceTarget": "Munkaterület-beállítások",
- 	"folderTarget": "Mappabeálíltások"
-changed in both
-  base   100644 d950c064592b137b6c877c5b805e22cd21e859a1 i18n/ita/src/vs/code/electron-main/menus.i18n.json
-  our    100644 a5f6c5e0343adf224d6df3a61663d9695836512e i18n/ita/src/vs/code/electron-main/menus.i18n.json
-  their  100644 17fd875af6f3e6d35455939a4ce3cd77216a57c0 i18n/ita/src/vs/code/electron-main/menus.i18n.json
-changed in both
-  base   100644 0976da778ff2f15991c56e98bf47badf43304013 i18n/ita/src/vs/code/electron-main/windows.i18n.json
-  our    100644 250ae14629598106ced719e4c761822b45303be0 i18n/ita/src/vs/code/electron-main/windows.i18n.json
-  their  100644 e284e7c2ab5a95b79fbbf02916d526fcd01457da i18n/ita/src/vs/code/electron-main/windows.i18n.json
-changed in both
-  base   100644 98ae85b38335c8c6834300004e10a121a173b767 i18n/ita/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  our    100644 1b2a046fdb00dc2b8d3837f833d8eac80b820712 i18n/ita/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  their  100644 32a58ae4a610928e553df9a55cccf0ff6b7f818f i18n/ita/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 79ac78f96ad59662cad8c3e5ac02d76934e70500 i18n/ita/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-  our    100644 1135b733ef30e2bcfdc82c789113502833156112 i18n/ita/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-  their  100644 ebd673947fb1d2cf9b2148c599cda5a169ae6370 i18n/ita/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-@@ -13,12 +13,18 @@
- 	"vscode.extension.contributes.view.name": "Il nome della visualizzazione. Verrà mostrato",
- 	"vscode.extension.contributes.view.when": "Condizione che deve essere vera per mostrare questa visualizzazione",
- 	"vscode.extension.contributes.views": "Contribuisce visualizzazioni all'editor",
-+<<<<<<< .our
- 	"views.explorer": "Aggiunge come contributo visualizzazioni al contenitore Esplora risorse nella barra attività",
- 	"views.debug": "Aggiunge come contributo visualizzazioni al contenitore Debug nella barra attività",
- 	"views.scm": "Aggiunge come contributo visualizzazioni al contenitore Gestione controllo servizi nella barra attività",
- 	"views.test": "Aggiunge come contributo visualizzazioni al contenitore Test nella barra attività",
- 	"views.contributed": "Aggiunge come contributo visualizzazioni al contenitore delle visualizzazioni aggiunto come contributo",
- 	"ViewContainerDoesnotExist": "Il contenitore di visualizzazioni '{0}' non esiste e tutte le visualizzazioni registrate verranno aggiunte a 'Esplora risorse'.",
-+=======
-+	"views.explorer": "Visualizzazione di esplorazione",
-+	"views.debug": "Visualizzazione Debug",
-+	"locationId.invalid": "'{0}' non è una posizione valida per la visualizzazione",
-+>>>>>>> .their
- 	"duplicateView1": "Non è possibile registrare più visualizzazioni con stesso ID `{0}` nel percorso `{1}`",
- 	"duplicateView2": "Nel percorso `{1}` è già registrata una visualizzazione con ID `{0}` "
- }
-\ No newline at end of file
-changed in both
-  base   100644 0c7b03c458ac89f8bda389115f8415f5ce62d3cf i18n/ita/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 967a9460fbe454ea199d54b4639f97929c5854cd i18n/ita/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 4d31bf1f0c43bff9bfacfddc42dcfe81cc857eaf i18n/ita/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -15,5 +15,9 @@
- 	"saveWorkspace": "Salva area di lavoro",
- 	"openWorkspaceAction": "Apri area di lavoro...",
- 	"openWorkspaceConfigFile": "Apri file di configurazione dell'area di lavoro",
-+<<<<<<< .our
- 	"duplicateWorkspaceInNewWindow": "Duplica area di lavoro nella nuova finestra"
-+=======
-+	"workspaceFolderPickerPlaceholder": "Selezionare la cartella dell'area di lavoro"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 34ec4817bae4966455cf5b020e3e55e33505f43e i18n/ita/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 52332d26b607badcbfc6c1f6cb20390d01164f46 i18n/ita/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 089f3a4202c4f61539d519731feb3e226df33559 i18n/ita/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 3c268f058c43ec4e05f780ea3d1a5684847e5e00 i18n/ita/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-  our    100644 f7d0ba95e12a26af474f97222fdcbbc332857ed7 i18n/ita/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-  their  100644 c8ef35020707c28af4409837d86ece55c3a33383 i18n/ita/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-@@ -55,5 +55,9 @@
- 	"screenReaderDetectedExplanation.answerYes": "Sì",
- 	"screenReaderDetectedExplanation.answerNo": "No",
- 	"screenReaderDetectedExplanation.body1": "VS Code è ora ottimizzato per l'utilizzo con un'utilità per la lettura dello schermo.",
-+<<<<<<< .our
- 	"screenReaderDetectedExplanation.body2": "Alcune funzionalità dell'editor avranno un comportamento differente: ad esempio a capo automatico, folding, ecc."
-+=======
-+	"screenReaderDetectedExplanation.body2": "Il comportamento di alcune funzionalità dell'editor sarà diverso, ad esempio a capo automatico, riduzione del codice, chiusura automatica delle parentesi e così via."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a79d647bc84eaad5ce6eb3d2e29a016c01b00c08 i18n/ita/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 9737d645d67a50d571dc86669b68ed740de20eba i18n/ita/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 4a97354ad492f3575819b8eb10596f104713bb13 i18n/ita/src/vs/workbench/electron-browser/actions.i18n.json
-@@ -49,7 +49,11 @@
- 	"showNextWindowTab": "Visualizza scheda della finestra successiva",
- 	"moveWindowTabToNewWindow": "Sposta scheda della finestra in una nuova finestra",
- 	"mergeAllWindowTabs": "Unisci tutte le finestre",
-+<<<<<<< .our
- 	"toggleWindowTabsBar": "Attiva/Disattiva barra delle schede delle finestre",
- 	"about": "Informazioni su {0}",
- 	"inspect context keys": "Esamina le chiavi di contesto"
-+=======
-+	"toggleWindowTabsBar": "Attiva/Disattiva barra delle schede delle finestre"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 9398f9fc3dcf33fbad63edf8109642ca4a956459 i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 16fec1a5d98f225249a95297ad06c45ba75efafc i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 52b4f223124b567fa63f8118514a008c6b9ef138 i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -13,9 +13,15 @@
- 	"developer": "Sviluppatore",
- 	"workbenchConfigurationTitle": "Area di lavoro",
- 	"showEditorTabs": "Controlla se visualizzare o meno gli editor aperti in schede.",
-+<<<<<<< .our
- 	"workbench.editor.labelFormat.default": "Visualizza il nome del file. Quando le schede sono abilitate e due file hanno lo stesso nome in un unico gruppo, vengono aggiunte le sezioni distintive del percorso di ciascun file. Quando le schede sono disabilitate, se l'editor è attivo, viene visualizzato il percorso relativo alla radice dell'area di lavoro.",
- 	"workbench.editor.labelFormat.short": "Visualizza il nome del file seguito dal relativo nome di directory.",
- 	"workbench.editor.labelFormat.medium": "Visualizza il nome del file seguito dal proprio percorso, relativo alla radice dell'area di lavoro.",
-+=======
-+	"workbench.editor.labelFormat.default": "Visualizza il nome del file. Quando le schede sono abilitate e due file presentano lo stesso nome in un unico gruppo, vengono aggiunte le sezioni distintive del percorso di ciascun file. Quando le schede sono disabilitate, viene visualizzato il percorso relativo alla radice dell'area di lavoro se l'editor è attivo.",
-+	"workbench.editor.labelFormat.short": "Visualizza il nome del file seguito dal relativo nome di directory.",
-+	"workbench.editor.labelFormat.medium": "Visualizza il nome del file seguito dal percorso corrispondente relativo alla radice dell'area di lavoro.",
-+>>>>>>> .their
- 	"workbench.editor.labelFormat.long": "Visualizza il nome del file seguito dal relativo percorso assoluto.",
- 	"tabDescription": "Controlla il formato dell'etichetta per un editor. Se si modifica questa impostazione, ad esempio, risulterà più agevole individuare il percorso di un file:\n- short:   'parent'\n- medium:  'workspace/src/parent'\n- long:    '/home/user/workspace/src/parent'\n- default: '.../parent', quando un'altra scheda condivide lo stesso titolo, oppure il percorso relativo dell'area di lavoro se le schede sono disabilitate",
- 	"editorTabCloseButton": "Controlla la posizione dei pulsanti di chiusura delle schede dell'editor oppure li disabilita quando è impostata su 'off'.",
-changed in both
-  base   100644 20b6f54dcb3c899884410a17385d5c7c088d7175 i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
-  our    100644 ee8766b9b8bd0e3e8297917629a642148f230b6c i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
-  their  100644 baba081c726b219918d076ce33cdf69135dcaf31 i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
-changed in both
-  base   100644 9df96f524f91cc77216cccfb811c2d5665334335 i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 c085858a8c6aed272feca37cbd61f5b25e9ca236 i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 70ec9c0d7119318b220869fa2ee6460d80d270a0 i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -17,8 +17,12 @@
- 	"multipleConfigurationNamesInWorkspace": "Nell'area di lavoro sono presenti più configurazioni di avvio '{0}'. Usare il nome di cartella per qualificare la configurazione.",
- 	"noFolderWithName": "La cartella denominata '{0}' per la configurazione '{1}' nell'elemento compounds '{2}' non è stata trovata.",
- 	"configMissing": "In 'launch.json' manca la configurazione '{0}'.",
-+<<<<<<< .our
- 	"launchJsonDoesNotExist": "'launch.json' non esiste.",
- 	"debugRequestNotSupported": "Nella configurazione di debug scelta l'attributo '{0}' ha un valore non supportato '{1}'.",
-+=======
-+	"debugRequestNotSupported": "La configurazione di debug scelta contiene un valore di attributo `{0}` che non è supportato: '{1}'.",
-+>>>>>>> .their
- 	"debugRequesMissing": "Nella configurazione di debug scelta manca l'attributo '{0}'.",
- 	"debugTypeNotSupported": "Il tipo di debug configurato '{0}' non è supportato.",
- 	"debugTypeMissing": "Manca la proprietà 'type' per la configurazione di avvio scelta.",
-changed in both
-  base   100644 eef179b48d3752315f0af2f47356d3ffdc5bc7cb i18n/ita/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-  our    100644 c10190882f00393c01c73ca439ba4da4fc843e7f i18n/ita/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-  their  100644 64cacf41da1818d0936e28b1cacc04ff1633df52 i18n/ita/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-@@ -34,10 +34,13 @@
- 	"view id": "ID",
- 	"view name": "Nome",
- 	"view location": "Dove",
-+<<<<<<< .our
- 	"localizations": "Localizzazioni ({0})",
- 	"localizations language id": "ID lingua",
- 	"localizations language name": "Nome lingua",
- 	"localizations localized language name": "Nome lingua (localizzato)",
-+=======
-+>>>>>>> .their
- 	"colorThemes": "Temi colore ({0})",
- 	"iconThemes": "Temi icona ({0})",
- 	"colors": "Colori ({0})",
-changed in both
-  base   100644 fe25758722c31a57eedfd65ff3452cb281e5c56e i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 8a9cb12815ff71703170d90088b67ed38f90d1c9 i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 999aa22e8f3b87fa8cd15054fa3cc13068e7790a i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-@@ -56,11 +56,15 @@
- 	"OpenExtensionsFile.failed": "Non è possibile creare il file 'extensions.json' all'interno della cartella '.vscode' ({0}).",
- 	"configureWorkspaceRecommendedExtensions": "Configura estensioni consigliate (area di lavoro)",
- 	"configureWorkspaceFolderRecommendedExtensions": "Configura estensioni consigliate (cartella dell'area di lavoro)",
-+<<<<<<< .our
- 	"malicious tooltip": "Questa estensione è stata segnalata come problematica.",
- 	"malicious": "Dannosa",
- 	"disabled": "Disabilitata",
- 	"disabled globally": "Disabilitata",
- 	"disabled workspace": "Disabilitata per questa area di lavoro",
-+=======
-+	"builtin": "Predefinita",
-+>>>>>>> .their
- 	"disableAll": "Disabilita tutte le estensioni installate",
- 	"disableAllWorkspace": "Disabilita tutte le estensioni installate per questa area di lavoro",
- 	"enableAll": "Abilita tutte le estensioni",
-changed in both
-  base   100644 69964d4f622e352d2cd2e979d669295a1ca7cec1 i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 87312cd2502c47006701381399f821b3154685ff i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 c97e1b40ccb218f1aec68f28df0d699a91d85329 i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -14,11 +14,17 @@
- 	"workspaceRecommendation": "Questa estensione è consigliata dagli utenti dell'area di lavoro corrente.",
- 	"reallyRecommended2": "Per questo tipo di file è consigliabile utilizzare l'estensione '{0}'.",
- 	"reallyRecommendedExtensionPack": "Per questo tipo di file è consigliabile usare il pacchetto di estensione '{0}'.",
-+<<<<<<< .our
- 	"install": "Installa",
-+=======
-+>>>>>>> .their
- 	"showRecommendations": "Mostra gli elementi consigliati",
- 	"showLanguageExtensions": "Il Marketplace ha estensioni per i file '.{0}'",
- 	"workspaceRecommended": "Per questa area di lavoro sono disponibili estensioni consigliate.",
-+<<<<<<< .our
- 	"installAll": "Installa tutto",
-+=======
-+>>>>>>> .their
- 	"ignoreExtensionRecommendations": "Ignorare tutti i suggerimenti per le estensioni?",
- 	"ignoreAll": "Sì, ignora tutti",
- 	"no": "No"
-changed in both
-  base   100644 b79f520e3d61454d657f0027c8017e09be183716 i18n/ita/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 1f2167be7be1086956a1ada80d0c4b23b8cc1195 i18n/ita/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 34e5d5d0c26d980adc2b4f152c4b87e3bdc43932 i18n/ita/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-changed in both
-  base   100644 53e90cc6554347fdbfea0b1fbbb1343eb74d29d5 i18n/ita/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json
-  our    100644 cde98f01a5eab861b2e55d1729472d7aef8c4544 i18n/ita/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json
-  their  100644 92d5051b4e0843ff7c550bdf3b2d0b9bedd7c313 i18n/ita/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"dirtyFile": "1 file non salvato",
- 	"dirtyFiles": "{0} file non salvati"
- }
-\ No newline at end of file
-changed in both
-  base   100644 411f31bd6506bf6038bff80acab97a4058846dc6 i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-  our    100644 10bf388adfb7246223e58b306fc20f4edcc1d949 i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-  their  100644 973412c0e7350a7a6806709f1ed9694ed0681521 i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-@@ -12,6 +12,7 @@
- 	"oneSettingFound": "1 impostazione trovata",
- 	"settingsFound": "{0} impostazioni trovate",
- 	"totalSettingsMessage": "{0} impostazioni in totale",
-+<<<<<<< .our
- 	"nlpResult": "Risultati linguaggio naturale",
- 	"filterResult": "Risultati filtrati",
- 	"defaultSettings": "Impostazioni predefinite",
-@@ -19,5 +20,12 @@
- 	"defaultWorkspaceSettings": "Impostazioni area di lavoro predefinite",
- 	"defaultFolderSettings": "Impostazioni cartella predefinite",
- 	"defaultEditorReadonly": "Modificare nell'editor a destra per ignorare le impostazioni predefinite.",
-+=======
-+	"noSettingsFound": "Nessun risultato",
-+	"oneSettingFound": "1 impostazione corrispondente",
-+	"settingsFound": "{0} impostazioni corrispondenti",
-+	"fileEditorWithInputAriaLabel": "{0}. Editor file di testo.",
-+	"fileEditorAriaLabel": "Editor file di testo.",
-+>>>>>>> .their
- 	"preferencesAriaLabel": "Preferenze predefinite. Editor di testo di sola lettura."
- }
-\ No newline at end of file
-changed in both
-  base   100644 3b24c2e210ba65f40d15a13aa1cea7f679123d6e i18n/ita/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  our    100644 781c9834bae8c70c8f1100724594cf5248538506 i18n/ita/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  their  100644 8bc8834c5e78351b3e1ef17a11aba877849a1244 i18n/ita/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-@@ -8,6 +8,10 @@
- 	],
- 	"scm providers": "Provider di controllo del codice sorgente",
- 	"hideRepository": "Nascondi",
-+<<<<<<< .our
-+=======
-+	"commitMessage": "Message (press {0} to commit)",
-+>>>>>>> .their
- 	"installAdditionalSCMProviders": "Installa ulteriori provider SCM ...",
- 	"no open repo": "Non esistono provider di controllo codice sorgente attivi.",
- 	"source control": "Controllo del codice sorgente",
-changed in both
-  base   100644 f501a03d135673e4e6f45658a82296e4650ce63e i18n/ita/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
-  our    100644 edd900079157f5d78c939b7b97126a7a1148d0e9 i18n/ita/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
-  their  100644 580b9d74850aa48216ebd77f2834508aefe3b917 i18n/ita/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"snippet.suggestions.label": "Inserisci frammento",
- 	"sep.userSnippet": "Frammenti utente",
- 	"sep.extSnippet": "Frammenti estensione"
-changed in both
-  base   100644 4df49b140ce0de23375aac1420a7146cd157d2e5 i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  our    100644 c878d5c9380cb8bf8f1d7f22ef4111b700bf8888 i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 09e4993b61b089163a45198ec18dd93575817bbd i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-@@ -13,8 +13,14 @@
- 	"vscode.extension.contributes.snippets": "Frammenti per contributes.",
- 	"vscode.extension.contributes.snippets-language": "Identificatore di linguaggio per cui si aggiunge come contributo questo frammento.",
- 	"vscode.extension.contributes.snippets-path": "Percorso del file snippets. È relativo alla cartella delle estensioni e in genere inizia con './snippets/'.",
-+<<<<<<< .our
- 	"badVariableUse": "Uno o più frammenti dall'estensione '{0}' confondono molto probabilmente variabili-frammento e segnaposto-frammento (Vedere https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax per maggiori dettagli)",
- 	"badFile": "Non è stato possibile leggere il file di frammento \"{0}\".",
-+=======
-+	"badFile": "Non è stato possibile leggere il file di frammento \"{0}\".",
-+	"badVariableUse": "Il frammento \"{0}\" molto probabilmente confonde variabili-frammento con segnaposti-frammento. Vedere https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax per ulteriori dettagli.",
-+	"source.snippet": "Frammento utente",
-+>>>>>>> .their
- 	"detail.snippet": "{0} ({1})",
- 	"snippetSuggest.longLabel": "{0}, {1}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 94dc081c02c1799f8b9a4c33e426e2cad21f274e i18n/ita/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 83baac91404ff175b394c533850a93d01538ab38 i18n/ita/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 17b0680c534d4fd5a82a8fa3bd686071e380a5d1 i18n/ita/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -17,8 +17,11 @@
- 	"runningTasks": "Visualizza attività in esecuzione",
- 	"tasks": "Attività",
- 	"TaskSystem.noHotSwap": "Se si cambia il motore di esecuzione delle attività con un'attività attiva in esecuzione, è necessario ricaricare la finestra",
-+<<<<<<< .our
- 	"reloadWindow": "Ricarica finestra",
- 	"TaskServer.folderIgnored": "La cartella {0} viene ignorata poiché utilizza attività (task) versione 0.1.0",
-+=======
-+>>>>>>> .their
- 	"TaskService.noBuildTask1": "Non è stata definita alcuna attività di compilazione. Contrassegnare un'attività con 'isBuildCommand' nel file tasks.json.",
- 	"TaskService.noBuildTask2": "Non è stata definita alcuna attività di compilazione. Contrassegnare un'attività come gruppo 'build' nel file tasks.json.",
- 	"TaskService.noTestTask1": "Non è stata definita alcuna attività di test. Contrassegnare un'attività con 'isTestCommand' nel file tasks.json.",
-@@ -51,13 +54,23 @@
- 	"recentlyUsed": "attività usate di recente",
- 	"configured": "attività configurate",
- 	"detected": "attività rilevate",
-+<<<<<<< .our
- 	"TaskService.ignoredFolder": "Le cartelle dell'area di lavoro seguenti verranno ignorate perché usano la versione 0.1.0 delle attività: {0}",
- 	"TaskService.notAgain": "Non visualizzare più questo messaggio",
-+=======
-+	"TaskService.ignoredFolder": "Le cartelle dell'area di lavoro seguenti verranno ignorate perché usano la versione 0.1.0 delle attività: ",
-+	"TaskService.notAgain": "Non visualizzare più questo messaggio",
-+	"TaskService.ok": "OK",
-+>>>>>>> .their
- 	"TaskService.pickRunTask": "Selezionare l'attività da eseguire",
- 	"TaslService.noEntryToRun": "Non è stata trovata alcuna attività da eseguire. Configurare le attività...",
- 	"TaskService.fetchingBuildTasks": "Recupero delle attività di compilazione...",
- 	"TaskService.pickBuildTask": "Selezionare l'attività di compilazione da eseguire",
-+<<<<<<< .our
- 	"TaskService.noBuildTask": "Nessuna attività di compilazione da eseguire trovato. Configurare l'attività di compilazione...",
-+=======
-+	"TaskService.noBuildTask": "Non è stata trovata alcuna attività di compilazione da eseguire. Configurare le attività...",
-+>>>>>>> .their
- 	"TaskService.fetchingTestTasks": "Recupero delle attività di test...",
- 	"TaskService.pickTestTask": "Selezionare l'attività di test da eseguire",
- 	"TaskService.noTestTaskTerminal": "Non è stata trovata alcuna attività di test da eseguire. Configurare le attività...",
-changed in both
-  base   100644 3d9e3d5f42be47cf78d99c94da4dea4048c923e6 i18n/ita/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
-  our    100644 aed34db2d6d41e90aa6657b13df20c4a1cb75137 i18n/ita/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
-  their  100644 acc06bc45a5398921502961183c845c15fc52fde i18n/ita/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
-changed in both
-  base   100644 10234317e8f170c8ea57151cc145e390ec0fbba5 i18n/ita/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  our    100644 b89a9a5d2c851fe192929fd8b043499ee5d305db i18n/ita/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  their  100644 5adc56a7ea07512323fc8ac8db78e2c5895e505d i18n/ita/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-changed in both
-  base   100644 f11b3608f657adde334f25d96aa772bd66992f86 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 9af26b9889eaa5fa492c1556e3e5203a1ebacbf4 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 ad495da28bf2f7a27ad053db3392c00c3c7daa6e i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -53,6 +53,7 @@
- 	"workbench.action.terminal.hideFindWidget": "Nascondi widget Trova",
- 	"nextTerminalFindTerm": "Mostra il termine di ricerca successivo",
- 	"previousTerminalFindTerm": "Mostra il termine di ricerca precedente",
-+<<<<<<< .our
- 	"quickOpenTerm": "Cambia terminale attivo",
- 	"workbench.action.terminal.scrollToPreviousCommand": "Scorri al comando precedente",
- 	"workbench.action.terminal.scrollToNextCommand": "Scorri al comando successivo",
-@@ -60,4 +61,7 @@
- 	"workbench.action.terminal.selectToNextCommand": "Aggiungi selezione a comando successivo",
- 	"workbench.action.terminal.selectToPreviousLine": "Aggiungi selezione a riga precedente",
- 	"workbench.action.terminal.selectToNextLine": "Aggiungi selezione a riga successiva"
-+=======
-+	"quickOpenTerm": "Cambia terminale attivo"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d707ad877b4b90ba4430068830bd11d5a23de704 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 7ae3aac58f69dc8b25dec80d0624497a5e9abe14 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 6d85a5950278a18e9fb88e927ad82d95caac736b i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -11,6 +11,10 @@
- 	"terminalCursor.foreground": "Colore di primo piano del cursore del terminale.",
- 	"terminalCursor.background": "Colore di sfondo del cursore del terminale. Permette di personalizzare il colore di un carattere quando sovrapposto da un blocco cursore.",
- 	"terminal.selectionBackground": "Colore di sfondo di selezione del terminale.",
-+<<<<<<< .our
- 	"terminal.border": "Colore del bordo che separa i riquadri divisi all'interno del terminale. L'impostazione predefinita è panel.border.",
- 	"terminal.ansiColor": "'{0}' colori ANSI nel terminale. "
-+=======
-+	"terminal.ansiColor": "Colore ANSI '{0}' nel terminale."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 4d0a4f3dde58cfbd357b97fe085f279cded0a5e6 i18n/ita/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  our    100644 4042bb544ec621f03590cdd507b7e33f55392950 i18n/ita/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  their  100644 be81923149cdedede5cb699be2f55e89d73f7753 i18n/ita/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-@@ -11,6 +11,10 @@
- 	"welcomePage.start": "Avvia",
- 	"welcomePage.newFile": "Nuovo file",
- 	"welcomePage.openFolder": "Apri cartella...",
-+<<<<<<< .our
-+=======
-+	"welcomePage.cloneGitRepository": "Clona repository GIT...",
-+>>>>>>> .their
- 	"welcomePage.addWorkspaceFolder": "Aggiungi cartella dell'area di lavoro...",
- 	"welcomePage.recent": "Recenti",
- 	"welcomePage.moreRecent": "Altro...",
-changed in both
-  base   100644 eb34a440eda3942e04ee3c45249d49d297f886e1 i18n/ita/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 73635731361e3644a722328dacbcb86a39a295d3 i18n/ita/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 965f92ae5a17b38744b9eea10fa95285d26ba3fe i18n/ita/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,11 @@
- 	],
- 	"openTasksConfiguration": "Apri configurazione attività",
- 	"openLaunchConfiguration": "Apri configurazione di avvio",
-+=======
-+	"openTasksConfiguration": "Apri configurazione attività",
-+	"openLaunchConfiguration": "Apri configurazione di avvio",
-+	"close": "Chiudi",
-+>>>>>>> .their
- 	"open": "Apri impostazioni",
- 	"saveAndRetry": "Salva e riprova",
- 	"errorUnknownKey": "Impossibile scrivere {0} perché {1} non è una configurazione registrata.",
-@@ -17,6 +23,7 @@
- 	"errorInvalidWorkspaceTarget": "Impossibile scrivere nell'area di lavoro perché {0} non supporta l'ambito globale in un'area di lavoro a cartelle multiple.",
- 	"errorInvalidFolderTarget": "Impossibile scrivere nella cartella impostazioni perché non viene fornita alcuna risorsa.",
- 	"errorNoWorkspaceOpened": "Impossibile scrivere su {0} poiché nessuna area di lavoro è aperta. Si prega di aprire un'area di lavoro e riprovare.",
-+<<<<<<< .our
- 	"errorInvalidTaskConfiguration": "Non è possibile scrivere nel file di configurazione delle attività. Aprirlo per correggere eventuali errori/avvisi e riprovare.",
- 	"errorInvalidLaunchConfiguration": "Non è possibile scrivere nel file di configurazione di avvio. Aprirlo per correggere eventuali errori/avvisi e riprovare.",
- 	"errorInvalidConfiguration": "Non è possibile scrivere nelle impostazioni utente. Aprirlo per correggere eventuali errori/avvisi e riprovare.",
-@@ -27,6 +34,18 @@
- 	"errorConfigurationFileDirty": "Non è possibile scrivere nelle impostazioni utente perché il file è stato modificato. Salvare prima il file delle impostazioni utente, quindi riprovare.",
- 	"errorConfigurationFileDirtyWorkspace": "Non è possibile scrivere nelle impostazioni dell'area di lavoro perché il file è stato modificato. Salvare prima il file delle impostazioni dell'area di lavoro, quindi riprovare.",
- 	"errorConfigurationFileDirtyFolder": "Non è possibile scrivere nelle impostazioni della cartella perché il file è stato modificato. Salvare prima il file di impostazioni della cartella '{0}', quindi riprovare.",
-+=======
-+	"errorInvalidTaskConfiguration": "Non è possibile scrivere nel file delle attività. Aprire il file **Attività** per correggere eventuali errori/avvisi, quindi riprovare.",
-+	"errorInvalidLaunchConfiguration": "Non è possibile scrivere nel file di avvio. Aprire il file **Avvio** per correggere eventuali errori/avvisi, quindi riprovare.",
-+	"errorInvalidConfiguration": "Non è possibile scrivere nelle impostazioni utente. Aprire il file **Impostazioni utente** per correggere eventuali errori/avvisi presenti, quindi riprovare.",
-+	"errorInvalidConfigurationWorkspace": "Non è possibile scrivere nelle impostazioni dell'area di lavoro. Aprire il file **Impostazioni area di lavoro** per correggere eventuali errori/avvisi presenti, quindi riprovare.",
-+	"errorInvalidConfigurationFolder": "Non è possibile scrivere nelle impostazioni della cartella. Aprire il file **Impostazioni cartella** nella cartella **{0}** per correggere eventuali errori/avvisi presenti, quindi riprovare.",
-+	"errorTasksConfigurationFileDirty": "Non è possibile scrivere nel file delle attività perché è stato modificato. Salvare il file **Configurazione attività** , quindi riprovare.",
-+	"errorLaunchConfigurationFileDirty": "Non è possibile scrivere nel file di avvio perché è stato modificato. Salvare il file **Configurazione di avvio** , quindi riprovare.",
-+	"errorConfigurationFileDirty": "Non è possibile scrivere nelle impostazioni utente perché il file è stato modificato. Salvare il file **Impostazioni utente** , quindi riprovare.",
-+	"errorConfigurationFileDirtyWorkspace": "Non è possibile scrivere nelle impostazioni dell'area di lavoro perché il file è stato modificato. Salvare il file **Impostazioni area di lavoro** , quindi riprovare.",
-+	"errorConfigurationFileDirtyFolder": "Non è possibile scrivere nelle impostazioni della cartella perché il file è stato modificato. Salvare il file **Impostazioni cartella** nella cartella **{0}**, quindi riprovare.",
-+>>>>>>> .their
- 	"userTarget": "Impostazioni utente",
- 	"workspaceTarget": "Impostazioni area di lavoro",
- 	"folderTarget": "Impostazioni della cartella"
-changed in both
-  base   100644 ba9fba1b1862fd837b51926ca2a29d75c24f38fb i18n/ita/src/vs/workbench/services/files/node/fileService.i18n.json
-  our    100644 e98cc6a8898c4a14c4cb33730d4c482765f69ffa i18n/ita/src/vs/workbench/services/files/node/fileService.i18n.json
-  their  100644 158f28c3a3e13733fc2fe3ca57b0b22624222381 i18n/ita/src/vs/workbench/services/files/node/fileService.i18n.json
-@@ -11,8 +11,11 @@
- 	"fileNotModifiedError": "File non modificato dal giorno",
- 	"fileTooLargeError": "File troppo grande per essere aperto",
- 	"fileNotFoundError": "Il file non è stato trovato ({0})",
-+<<<<<<< .our
- 	"fileBinaryError": "Il file sembra essere binario e non può essere aperto come file di testo",
- 	"filePermission": "Autorizzazione di scrittura sul file negata ({0}) ",
-+=======
-+>>>>>>> .their
- 	"fileExists": "Il file da creare esiste già ({0})",
- 	"fileMoveConflict": "Non è possibile eseguire operazioni di spostamento/copia. Il file esiste già nella destinazione.",
- 	"unableToMoveCopyError": "Non è possibile eseguire operazioni di spostamento/copia. Il file sostituirebbe la cartella in cui è contenuto.",
-changed in both
-  base   100644 32f21281c12b06287ec95d24ba1f3b6286c27367 i18n/jpn/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  our    100644 ef65f3f2706c8a53c3db11c1f57ddc0e49a1f2f7 i18n/jpn/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  their  100644 981e3bb87da93a8df7124822af50d363295f8844 i18n/jpn/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 7b7a2d57fdc642f6b34c25c5722b18910b6aaa16 i18n/jpn/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-  our    100644 140381eb48f46d0314befc0a6b39e2d850cf5eeb i18n/jpn/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-  their  100644 c17b073b1d354d8d66c66e2f05f062c5c6c10369 i18n/jpn/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-@@ -13,12 +13,18 @@
- 	"vscode.extension.contributes.view.name": "ビューの判読できる名前。表示されます",
- 	"vscode.extension.contributes.view.when": "このビューを表示するために満たす必要がある条件",
- 	"vscode.extension.contributes.views": "ビューをエディターに提供します",
-+<<<<<<< .our
- 	"views.explorer": "アクション バーのエクスプローラー コンテナにビューを提供します",
- 	"views.debug": "アクション バーのデバッグ コンテナにビューを提供します",
- 	"views.scm": "アクション バーのSCM コンテナにビューを提供します",
- 	"views.test": "アクション バーのテスト コンテナにビューを提供します",
- 	"views.contributed": "コントリビューション　ビュー コンテナにビューを提供します",
- 	"ViewContainerDoesnotExist": "ビュー コンテナ '{0}' が存在しません。このコンテナに登録されているすべてのビューは 'エクスプローラー' に追加されます。",
-+=======
-+	"views.explorer": "エクスプローラー ビュー",
-+	"views.debug": "デバッグ ビュー",
-+	"locationId.invalid": "`{0}` は有効なビューの場所ではありません",
-+>>>>>>> .their
- 	"duplicateView1": "location `{1}` で同じ id `{0}` を使用する複数のビューを登録できません",
- 	"duplicateView2": "location `{1}` で id `{0}` のビューが既に登録されています"
- }
-\ No newline at end of file
-changed in both
-  base   100644 00621c8e3a0a87129caf273b3658c3973be3dd08 i18n/jpn/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-  our    100644 e7c0107e6c1c24143b307f1affd938adb2a30a78 i18n/jpn/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-  their  100644 9a2136e7640bc71e1f4da6732349fab2ee8ab0a7 i18n/jpn/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-@@ -55,5 +55,9 @@
- 	"screenReaderDetectedExplanation.answerYes": "はい",
- 	"screenReaderDetectedExplanation.answerNo": "いいえ",
- 	"screenReaderDetectedExplanation.body1": "VS Codeは現在スクリーンリーダーの使用状況に最適化されています。",
-+<<<<<<< .our
- 	"screenReaderDetectedExplanation.body2": "いくつかのエディター機能が通常と異なる動作をします。例: 折り返し、折りたたみなど"
-+=======
-+	"screenReaderDetectedExplanation.body2": "いくつかのエディター機能が通常と異なる動作をします。例: 折り返し、折りたたみ、かっこの自動閉じなど"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 910483b7333e10a86dcf164ab08d8715fcdbfc0e i18n/jpn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 3b03f30557674ed7892d9127c78ab05070c860e0 i18n/jpn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 880049ace5880fbd8fd147e1e8c31c8889f9dff5 i18n/jpn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-changed in both
-  base   100644 e47e23b43264436a239873f1253d8313d3cfaa42 i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 94c8c8c8a16f500b0da2b646b5e8bf435bacba10 i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 86136d977a55ec4bea222939c091d4aebd7f9a8d i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -17,9 +17,14 @@
- 	"multipleConfigurationNamesInWorkspace": "ワークスペースに複数の起動構成 '{0}' があります。フォルダー名を使用して構成を修飾してください。",
- 	"noFolderWithName": "複合 '{2}' の構成 '{1}' で、名前 '{0}' を含むフォルダーが見つかりませんでした。",
- 	"configMissing": "構成 '{0}' が 'launch.json' 内にありません。",
-+<<<<<<< .our
- 	"launchJsonDoesNotExist": "'launch.json' は存在しません。",
- 	"debugRequestNotSupported": "選択しているデバッグ構成で '{0}' 属性はサポートされない値 '{1}' を指定しています。",
- 	"debugRequesMissing": "選択しているデバッグ構成に属性 '{0}' が含まれていません。",
-+=======
-+	"debugRequestNotSupported": "選択したデバッグ構成ではサポートされていない属性値 `{0}` : '{1}'。",
-+	"debugRequesMissing": "選択しているデバッグ構成に '{0}' 属性が含まれていません ",
-+>>>>>>> .their
- 	"debugTypeNotSupported": "構成されているデバッグの種類 '{0}' はサポートされていません。",
- 	"debugTypeMissing": "選択された起動構成のプロパティ 'type' がありません。",
- 	"debugAnyway": "このままデバッグを続ける",
-changed in both
-  base   100644 f8722645f50914f72360e8923713a5eb80c92b79 i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 c1d5e7d9f012953fc3bd6919da0d8a29b234fa8c i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 2bb3a05f0d62b3ea9ffcb05b4321651669ba8d7e i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -14,11 +14,17 @@
- 	"workspaceRecommendation": "現在のワークスペースのユーザーによってこの拡張機能が推奨されています。",
- 	"reallyRecommended2": "このファイルの種類には拡張機能 '{0}' が推奨されます。",
- 	"reallyRecommendedExtensionPack": "このファイルの種類には拡張機能パック '{0}' が推奨されます。",
-+<<<<<<< .our
- 	"install": "インストール",
-+=======
-+>>>>>>> .their
- 	"showRecommendations": "推奨事項を表示",
- 	"showLanguageExtensions": "'.{0}' ファイルに役立つ拡張機能が Marketplace にあります",
- 	"workspaceRecommended": "このワークスペースには拡張機能の推奨事項があります。",
-+<<<<<<< .our
- 	"installAll": "すべてインストール",
-+=======
-+>>>>>>> .their
- 	"ignoreExtensionRecommendations": "すべての拡張機能の推奨事項を無視しますか?",
- 	"ignoreAll": "はい、すべて無視します",
- 	"no": "いいえ"
-changed in both
-  base   100644 bb3a98960cc08f6b6eab6e0e11f2291baf593ca0 i18n/jpn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 5461c0b3fa9062516c7b3d179dc36d861ad4f80d i18n/jpn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 c1dd7969f73fb6315189efa58b6148c9b708afcd i18n/jpn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-changed in both
-  base   100644 7b71fd83e5783afdb81cdfe69703958b809a9a44 i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  our    100644 fadead296a93c202fdae35990b689034db6c7569 i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  their  100644 8f9dfe27002300164c26bdabf9bae757183297de i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-@@ -8,6 +8,10 @@
- 	],
- 	"scm providers": "ソース管理プロバイダー",
- 	"hideRepository": "非表示",
-+<<<<<<< .our
-+=======
-+	"commitMessage": "Message (press {0} to commit)",
-+>>>>>>> .their
- 	"installAdditionalSCMProviders": "その他の SCM プロバイダーをインストール...",
- 	"no open repo": "有効なソース管理プロバイダーがありません。",
- 	"source control": "ソース管理",
-changed in both
-  base   100644 d372cb182d40abfc49e3cf184971e24a7d586042 i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 8021ef7847fd50a81058f6bd7af4fbd030bdc905 i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 b93c884904a50348bf7ed9932e7104225cbdd11b i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -51,7 +51,11 @@
- 	"recentlyUsed": "最近使用したタスク",
- 	"configured": "構成済みのタスク",
- 	"detected": "検出されたタスク",
-+<<<<<<< .our
- 	"TaskService.ignoredFolder": "次のワークスペース フォルダーはタスク バージョン 0.1.0 を使用しているため無視されます: {0}",
-+=======
-+	"TaskService.ignoredFolder": "次のワークスペース フォルダーはタスク バージョン 0.1.0 を使用しているために無視されます:",
-+>>>>>>> .their
- 	"TaskService.notAgain": "今後は表示しない",
- 	"TaskService.pickRunTask": "実行するタスクを選択してください",
- 	"TaslService.noEntryToRun": "実行するタスクがありません。タスクを構成する...",
-changed in both
-  base   100644 1729047052e6d54674d286275345a5ca8c3ed30d i18n/jpn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 627b2d01b48806d1f5f06d10756e2464690ef51d i18n/jpn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 c898ae7bee3744d9d1f0bfb7c9ec671d46ada1cd i18n/jpn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,11 @@
- 	],
- 	"openTasksConfiguration": "タスク構成を開く",
- 	"openLaunchConfiguration": "起動構成を開く",
-+=======
-+	"openTasksConfiguration": "タスク構成を開く",
-+	"openLaunchConfiguration": "起動構成を開く",
-+	"close": "閉じる",
-+>>>>>>> .their
- 	"open": "設定を開く",
- 	"saveAndRetry": "保存して再試行",
- 	"errorUnknownKey": "{1} は登録済みの構成ではないため、{0} に書き込むことができません。",
-@@ -17,6 +23,7 @@
- 	"errorInvalidWorkspaceTarget": "{0} はマルチ フォルダー ワークスペースでワークスペース スコープをサポートしていないため、ワークスペース設定を書き込むことができません。",
- 	"errorInvalidFolderTarget": "リソースが指定されていないため、フォルダー設定に書き込むことができません。",
- 	"errorNoWorkspaceOpened": "開いているワークスペースがないため、{0} に書き込むことができません。最初にワークスペースを開いてから、もう一度お試しください。",
-+<<<<<<< .our
- 	"errorInvalidTaskConfiguration": "タスク構成ファイルに書き込めません。ファイルを開いて、ファイル内のエラー/警告を修正してからもう一度お試しください。",
- 	"errorInvalidLaunchConfiguration": "起動構成ファイルに書き込めません。ファイルを開いて、ファイル内のエラー/警告を修正してからもう一度お試しください。",
- 	"errorInvalidConfiguration": "ユーザー設定に書き込めません。ユーザー設定を開いて、ファイル内のエラー/警告を修正してからもう一度お試しください。",
-@@ -27,6 +34,18 @@
- 	"errorConfigurationFileDirty": "ファイルが変更されているため、ユーザー設定を書き込めません。ユーザー設定ファイルを保存してから、もう一度お試しください。",
- 	"errorConfigurationFileDirtyWorkspace": "ファイルが変更されているため、ワークスペース設定を書き込めません。ワークスペース設定ファイルを保存してから、もう一度お試しください。",
- 	"errorConfigurationFileDirtyFolder": "ファイルが変更されているため、フォルダー設定を書き込めません。'{0}' フォルダー設定ファイルを保存してから、もう一度お試しください。",
-+=======
-+	"errorInvalidTaskConfiguration": "タスク ファイルに書き込めません。**Tasks** ファイルを開いて、ファイル内のエラー/警告を修正してからもう一度お試しください。",
-+	"errorInvalidLaunchConfiguration": "起動ファイルに書き込めません。**Launch** ファイルを開いて、ファイル内のエラー/警告を修正してからもう一度お試しください。",
-+	"errorInvalidConfiguration": "ユーザー設定に書き込めません。**User Settings** ファイルを開いて、ファイル内のエラー/警告を修正してからもう一度お試しください。",
-+	"errorInvalidConfigurationWorkspace": "ワークスペース設定に書き込めません。**Workspace Settings** ファイルを開いて、ファイル内のエラー/警告を修正してからもう一度お試しください。",
-+	"errorInvalidConfigurationFolder": "フォルダー設定に書き込めません。**{0}** フォルダー配下の **Folder Settings** ファイルを開いて、ファイル内のエラー/警告を修正してからもう一度お試しください。",
-+	"errorTasksConfigurationFileDirty": "ファイルが変更されているため、タスク ファイルを書き込めません。**Tasks Configuration**ファイルを保存してから、もう一度お試しください。 ",
-+	"errorLaunchConfigurationFileDirty": "ファイルが変更されているため、起動設定を書き込めません。**Launch Configuration**ファイルを保存してから、もう一度お試しください。 ",
-+	"errorConfigurationFileDirty": "ファイルが変更されているため、ユーザー設定を書き込めません。**User Settings** ファイルを保存してから、もう一度お試しください。",
-+	"errorConfigurationFileDirtyWorkspace": "ファイルが変更されているため、ワークスペース設定を書き込めません。**Workspace Settings** ファイルを保存してから、もう一度お試しください。",
-+	"errorConfigurationFileDirtyFolder": "ファイルが変更されているため、フォルダー設定を書き込めません。**{0}** 配下の **Folder Settings** ファイルを保存してから、もう一度お試しください。",
-+>>>>>>> .their
- 	"userTarget": "ユーザー設定",
- 	"workspaceTarget": "ワークスペースの設定",
- 	"folderTarget": "フォルダーの設定"
-changed in both
-  base   100644 35ae2cde936c4a6c5472cfa60fba34f0446f82ee i18n/kor/extensions/css/package.i18n.json
-  our    100644 2d4d9da9391916e94d45c5f0a1fe31764372d347 i18n/kor/extensions/css/package.i18n.json
-  their  100644 307e44f09020eea046cd4c95ec1d5968c5328cf6 i18n/kor/extensions/css/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,76 @@
- 	],
- 	"displayName": "CSS 언어 기본",
- 	"description": "CSS,LESS,SCSS 파일에서 구문 강조 표시와 괄호 일치를 제공합니다."
-+=======
-+	"css.title": "CSS",
-+	"css.lint.argumentsInColorFunction.desc": "잘못된 매개 변수 수",
-+	"css.lint.boxModel.desc": "패딩 또는 테두리를 사용하는 경우 너비 또는 높이를 사용하지 마세요.",
-+	"css.lint.compatibleVendorPrefixes.desc": "공급업체 관련 접두사를 사용할 경우 다른 모든 공급업체 관련 속성도 포함합니다.",
-+	"css.lint.duplicateProperties.desc": "중복된 스타일 정의를 사용하지 마세요.",
-+	"css.lint.emptyRules.desc": "빈 규칙 집합을 사용하지 마세요.",
-+	"css.lint.float.desc": "'float'를 사용하지 않도록 합니다. Float를 사용하면 레이아웃의 한쪽이 바뀔 경우 CSS가 쉽게 깨질 수 있습니다.",
-+	"css.lint.fontFaceProperties.desc": "@font-face 규칙에서 'src' 및 'font-family' 속성을 정의해야 합니다.",
-+	"css.lint.hexColorLength.desc": "16진수 색은 3개 또는 6개의 16진수로 구성되어야 합니다.",
-+	"css.lint.idSelector.desc": "이러한 규칙은 HTML과 긴밀하게 결합되므로 선택기에 ID를 포함하면 안 됩니다.",
-+	"css.lint.ieHack.desc": "IE 핵(Hack)은 IE7 이상을 지원할 때만 필요합니다.",
-+	"css.lint.important.desc": "!important는 사용하지 않도록 합니다. 이것은 전체 CSS의 특정성에 문제가 있어서 리팩터링해야 함을 나타냅니다.",
-+	"css.lint.importStatement.desc": "Import 문은 병렬로 로드되지 않습니다.",
-+	"css.lint.propertyIgnoredDueToDisplay.desc": "display 때문에 속성이 무시됩니다. 예를 들어 'display: inline'을 사용할 경우 width, height, margin-top, margin-bottom 및 float 속성은 적용되지 않습니다.",
-+	"css.lint.universalSelector.desc": "범용 선택기 (*)는 느린 것으로 알려져 있습니다.",
-+	"css.lint.unknownProperties.desc": "알 수 없는 속성입니다.",
-+	"css.lint.unknownVendorSpecificProperties.desc": "알 수 없는 공급업체 관련 속성입니다.",
-+	"css.lint.vendorPrefix.desc": "공급업체 관련 접두사를 사용할 때 표준 속성도 포함합니다.",
-+	"css.lint.zeroUnits.desc": "0에는 단위가 필요하지 않습니다.",
-+	"css.trace.server.desc": "VS Code와 CSS 언어 서버 간 통신을 추적합니다.",
-+	"css.validate.title": "CSS 유효성 검사 및 문제 심각도를 제어합니다.",
-+	"css.validate.desc": "모든 유효성 검사 사용 또는 사용 안 함",
-+	"less.title": "LESS",
-+	"less.lint.argumentsInColorFunction.desc": "잘못된 매개 변수 수",
-+	"less.lint.boxModel.desc": "패딩 또는 테두리를 사용하는 경우 너비 또는 높이를 사용하지 마세요.",
-+	"less.lint.compatibleVendorPrefixes.desc": "공급업체 관련 접두사를 사용할 경우 다른 모든 공급업체 관련 속성도 포함합니다.",
-+	"less.lint.duplicateProperties.desc": "중복된 스타일 정의를 사용하지 마세요.",
-+	"less.lint.emptyRules.desc": "빈 규칙 집합을 사용하지 마세요.",
-+	"less.lint.float.desc": "'float'를 사용하지 않도록 합니다. Float를 사용하면 레이아웃의 한쪽이 바뀔 경우 CSS가 쉽게 깨질 수 있습니다.",
-+	"less.lint.fontFaceProperties.desc": "@font-face 규칙에서 'src' 및 'font-family' 속성을 정의해야 합니다.",
-+	"less.lint.hexColorLength.desc": "16진수 색은 3개 또는 6개의 16진수로 구성되어야 합니다.",
-+	"less.lint.idSelector.desc": "이러한 규칙은 HTML과 긴밀하게 결합되므로 선택기에 ID를 포함하면 안 됩니다.",
-+	"less.lint.ieHack.desc": "IE 핵(Hack)은 IE7 이상을 지원할 때만 필요합니다.",
-+	"less.lint.important.desc": "!important는 사용하지 않도록 합니다. 이것은 전체 CSS의 특정성에 문제가 있어서 리팩터링해야 함을 나타냅니다.",
-+	"less.lint.importStatement.desc": "Import 문은 병렬로 로드되지 않습니다.",
-+	"less.lint.propertyIgnoredDueToDisplay.desc": "display 때문에 속성이 무시됩니다. 예를 들어 'display: inline'을 사용할 경우 width, height, margin-top, margin-bottom 및 float 속성은 적용되지 않습니다.",
-+	"less.lint.universalSelector.desc": "범용 선택기 (*)는 느린 것으로 알려져 있습니다.",
-+	"less.lint.unknownProperties.desc": "알 수 없는 속성입니다.",
-+	"less.lint.unknownVendorSpecificProperties.desc": "알 수 없는 공급업체 관련 속성입니다.",
-+	"less.lint.vendorPrefix.desc": "공급업체 관련 접두사를 사용할 때 표준 속성도 포함합니다.",
-+	"less.lint.zeroUnits.desc": "0에는 단위가 필요하지 않습니다.",
-+	"less.validate.title": "LESS 유효성 검사 및 문제 심각도를 제어합니다.",
-+	"less.validate.desc": "모든 유효성 검사 사용 또는 사용 안 함",
-+	"scss.title": "SCSS(Sass)",
-+	"scss.lint.argumentsInColorFunction.desc": "잘못된 매개 변수 수",
-+	"scss.lint.boxModel.desc": "패딩 또는 테두리를 사용하는 경우 너비 또는 높이를 사용하지 마세요.",
-+	"scss.lint.compatibleVendorPrefixes.desc": "공급업체 관련 접두사를 사용할 경우 다른 모든 공급업체 관련 속성도 포함합니다.",
-+	"scss.lint.duplicateProperties.desc": "중복된 스타일 정의를 사용하지 마세요.",
-+	"scss.lint.emptyRules.desc": "빈 규칙 집합을 사용하지 마세요.",
-+	"scss.lint.float.desc": "'float'를 사용하지 않도록 합니다. Float를 사용하면 레이아웃의 한쪽이 바뀔 경우 CSS가 쉽게 깨질 수 있습니다.",
-+	"scss.lint.fontFaceProperties.desc": "@font-face 규칙에서 'src' 및 'font-family' 속성을 정의해야 합니다.",
-+	"scss.lint.hexColorLength.desc": "16진수 색은 3개 또는 6개의 16진수로 구성되어야 합니다.",
-+	"scss.lint.idSelector.desc": "이러한 규칙은 HTML과 긴밀하게 결합되므로 선택기에 ID를 포함하면 안 됩니다.",
-+	"scss.lint.ieHack.desc": "IE 핵(Hack)은 IE7 이상을 지원할 때만 필요합니다.",
-+	"scss.lint.important.desc": "!important는 사용하지 않도록 합니다. 이것은 전체 CSS의 특정성에 문제가 있어서 리팩터링해야 함을 나타냅니다.",
-+	"scss.lint.importStatement.desc": "Import 문은 병렬로 로드되지 않습니다.",
-+	"scss.lint.propertyIgnoredDueToDisplay.desc": "display 때문에 속성이 무시됩니다. 예를 들어 'display: inline'을 사용할 경우 width, height, margin-top, margin-bottom 및 float 속성은 적용되지 않습니다.",
-+	"scss.lint.universalSelector.desc": "범용 선택기 (*)는 느린 것으로 알려져 있습니다.",
-+	"scss.lint.unknownProperties.desc": "알 수 없는 속성입니다.",
-+	"scss.lint.unknownVendorSpecificProperties.desc": "알 수 없는 공급업체 관련 속성입니다.",
-+	"scss.lint.vendorPrefix.desc": "공급업체 관련 접두사를 사용할 때 표준 속성도 포함합니다.",
-+	"scss.lint.zeroUnits.desc": "0에는 단위가 필요하지 않습니다.",
-+	"scss.validate.title": "SCSS 유효성 검사 및 문제 심각도를 제어합니다.",
-+	"scss.validate.desc": "모든 유효성 검사 사용 또는 사용 안 함",
-+	"less.colorDecorators.enable.desc": "색 데코레이터 사용 또는 사용 안 함",
-+	"scss.colorDecorators.enable.desc": "색 데코레이터 사용 또는 사용 안 함",
-+	"css.colorDecorators.enable.desc": "색 데코레이터 사용 또는 사용 안 함",
-+	"css.colorDecorators.enable.deprecationMessage": "`css.colorDecorators.enable` 설정은 `editor.colorDecorators`를 위해 사용되지 않습니다.",
-+	"scss.colorDecorators.enable.deprecationMessage": "`scss.colorDecorators.enable` 설정은 `editor.colorDecorators`를 위해 사용되지 않습니다.",
-+	"less.colorDecorators.enable.deprecationMessage": "`less.colorDecorators.enable` 설정은 `editor.colorDecorators`를 위해 사용되지 않습니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/extensions/grunt/out/main.i18n.json
-  our    100644 12be3ef64611a84c71bec4c6da4384a32dc7d3c8 i18n/kor/extensions/grunt/out/main.i18n.json
-  their  100644 e7957d307fcf6d5217209c6bb49e2992d9fea0ff i18n/kor/extensions/grunt/out/main.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"execFailed": "폴더 {0}에 대해 Grunt 자동 검색에 실패하고 {1} 오류가 발생했습니다."
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/extensions/gulp/out/main.i18n.json
-  our    100644 d31cddf0bd469976fc05d03f8d1f1ce4be3c747a i18n/kor/extensions/gulp/out/main.i18n.json
-  their  100644 87895182ec6ce2e5609960530d03b96e5a061663 i18n/kor/extensions/gulp/out/main.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"execFailed": "폴더 {0}에 대해 Gulp 자동 검색에 실패하고 {1} 오류가 발생했습니다."
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/extensions/jake/out/main.i18n.json
-  our    100644 7f2b9a95456fe5196b15210696ea96e9c76ac241 i18n/kor/extensions/jake/out/main.i18n.json
-  their  100644 508a52858393a73d6345eea6b56c7ccbc0dcc44a i18n/kor/extensions/jake/out/main.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"execFailed": "폴더 {0}에 대해 Jake 자동 검색에 실패하고 {1} 오류가 발생했습니다."
- }
-\ No newline at end of file
-changed in both
-  base   100644 1e29745ea9b1735716edd38aa79e9092711b4492 i18n/kor/src/vs/code/electron-main/menus.i18n.json
-  our    100644 a3a33ffe4d84057c71074e546cdf9a1e5529a6c8 i18n/kor/src/vs/code/electron-main/menus.i18n.json
-  their  100644 2e942d1252d9a23c224376f6de820e2d5f2f81a4 i18n/kor/src/vs/code/electron-main/menus.i18n.json
-changed in both
-  base   100644 a4902f09f10634c2e50f135e73552bcb5d7b5142 i18n/kor/src/vs/code/electron-main/windows.i18n.json
-  our    100644 d5c6b9b1265e0ee69b9beb0907ae3e533810962d i18n/kor/src/vs/code/electron-main/windows.i18n.json
-  their  100644 16bd7728dcc4623895703165e70b45d58163b5e3 i18n/kor/src/vs/code/electron-main/windows.i18n.json
-changed in both
-  base   100644 7790e22f8fca8085b0a0d66d47bc787adcf2623e i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 c96c0fe1469ce78842b73db686d63d6305f28dfb i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 dc1d0da437c5f91398c46a7704452970e264c781 i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -12,11 +12,15 @@
- 	"fontSize": "글꼴 크기(픽셀)를 제어합니다.",
- 	"lineHeight": "줄 높이를 제어합니다. fontSize의 lineHeight를 계산하려면 0을 사용합니다.",
- 	"letterSpacing": "글자 간격을 픽셀 단위로 조정합니다.",
-+<<<<<<< .our
- 	"lineNumbers.off": "줄 번호는 렌더링 되지 않습니다.",
- 	"lineNumbers.on": "줄 번호는 절대값으로 렌더링 됩니다.",
- 	"lineNumbers.relative": "줄 번호는 커서 위치에서 줄 간격 거리로 렌더링 됩니다.",
- 	"lineNumbers.interval": "줄 번호는 매 10 줄마다 렌더링이 이루어집니다.",
- 	"lineNumbers": "줄 번호의 표시 여부를 제어합니다.",
-+=======
-+	"lineNumbers": "줄 번호의 표시 여부를 제어합니다. 가능한 값은 'on', 'off', 'relative'입니다. 'relative'는 현재 커서 위치에서 줄 수를 표시합니다.",
-+>>>>>>> .their
- 	"rulers": "특정 수의 고정 폭 문자 뒤에 세로 눈금자를 렌더링합니다. 여러 눈금자의 경우 여러 값을 사용합니다. 배열이 비어 있는 경우 눈금자가 그려져 있지 않습니다.",
- 	"wordSeparators": "단어 관련 탐색 또는 작업을 수행할 때 단어 구분 기호로 사용되는 문자입니다.",
- 	"tabSize": "탭 한 개에 해당하는 공백 수입니다. `editor.detectIndentation`이 켜져 있는 경우 이 설정은 파일 콘텐츠에 따라 재정의됩니다.",
-@@ -107,10 +111,13 @@
- 	"links": "편집기에서 링크를 감지하고 클릭할 수 있게 만들지 결정합니다.",
- 	"colorDecorators": "편집기에서 인라인 색 데코레이터 및 색 선택을 렌더링할지를 제어합니다.",
- 	"codeActions": "코드 동작 전구를 사용합니다.",
-+<<<<<<< .our
- 	"codeActionsOnSave.organizeImports": "저장할 때 가져오기 구성을 실행하시겠습니까?",
- 	"codeActionsOnSave": "저장할 때 실행되는 코드 동작 종류입니다.",
- 	"codeActionsOnSaveTimeout": "저장할 때 실행되는 코드 동작에 대한 시간 제한입니다.",
- 	"selectionClipboard": "Linux 주 클립보드의 지원 여부를 제어합니다.",
-+=======
-+>>>>>>> .their
- 	"sideBySide": "diff 편집기에서 diff를 나란히 표시할지 인라인으로 표시할지 여부를 제어합니다.",
- 	"ignoreTrimWhitespace": "diff 편집기에서 선행 공백 또는 후행 공백 변경을 diffs로 표시할지 여부를 제어합니다.",
- 	"largeFileOptimizations": "큰 파일에 대한 특수 처리로, 메모리를 많이 사용하는 특정 기능을 사용하지 않도록 설정합니다.",
-changed in both
-  base   100644 b7f686e2628e1c09e2426b0a0480a1a29015af29 i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 c148a56d8d67892505611b68cdd18b2ba3428134 i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 a8423dd155b69f4f3c407aa89df59d4826fc226b i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -30,10 +30,14 @@
- 	"warningBorder": "편집기 내 경고 표시선의 테두리 색입니다.",
- 	"infoForeground": "편집기 내 정보 표시선의 전경색입니다.",
- 	"infoBorder": "편집기 내 정보 표시선의 테두리 색입니다.",
-+<<<<<<< .our
- 	"hintForeground": "편집기에서 힌트 표시선의 전경색입니다.",
- 	"hintBorder": "편집기에서 힌트 표시선의 테두리 색입니다.",
- 	"unnecessaryForeground": "편집기 내 불필요한 코드의 전경색입니다.",
- 	"overviewRulerRangeHighlight": "범위 강조의 개요 눈금자 표식 색입니다. 이 색은 불투명해야만 내부 장식을 가리지 않습니다.",
-+=======
-+	"overviewRulerRangeHighlight": "범위 강조 표시의 개요 눈금자 마커 색입니다.",
-+>>>>>>> .their
- 	"overviewRuleError": "오류의 개요 눈금자 마커 색입니다.",
- 	"overviewRuleWarning": "경고의 개요 눈금자 마커 색입니다.",
- 	"overviewRuleInfo": "정보의 개요 눈금자 마커 색입니다."
-changed in both
-  base   100644 1c5f62b7b236b643cadede01f2015471de886ab6 i18n/kor/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  our    100644 c92b8c11e09e6ba98f1ebf4744826c9d584019e9 i18n/kor/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  their  100644 ee9870e16a1c7b6737e23bead633ce05b4850eb3 i18n/kor/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 614e1274b8754fc8b7f423a7354493330c8acb1b i18n/kor/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 5e47e69c5607206a94dadfaaaaa5928d57a2cd8e i18n/kor/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 b8dae1071a77db37f0bf234958c2e95b3173d2f8 i18n/kor/src/vs/platform/environment/node/argv.i18n.json
-@@ -14,9 +14,19 @@
- 	"reuseWindow": "마지막 활성 창에서 파일 또는 파일을 강제로 엽니다.",
- 	"wait": "파일이 닫힐 때 까지 기다린 후 돌아갑니다.",
- 	"locale": "사용할 로캘(예: en-US 또는 zh-TW)입니다.",
-+<<<<<<< .our
- 	"userDataDir": "사용자 데이터가 저장되는 디렉터리를 지정합니다. Code의 여러 고유 인스턴스를 여는 데 사용할 수 있습니다.",
- 	"version": "버전을 출력합니다.",
- 	"help": "사용법을 출력합니다.",
-+=======
-+	"newWindow": "Code의 새 인스턴스를 강제 적용합니다.",
-+	"performance": "'Developer: Startup Performance' 명령을 사용하여 시작합니다.",
-+	"prof-startup": "시작하는 동안 CPU 프로파일러 실행",
-+	"reuseWindow": "마지막 활성 창에서 파일 또는 폴더를 강제로 엽니다.",
-+	"userDataDir": "사용자 데이터가 저장되는 디렉터리를 지정합니다(루트로 실행할 경우 유용함).",
-+	"verbose": "자세한 정보 표시를 출력합니다(--wait를 의미).",
-+	"wait": "파일이 닫힐 때 까지 기다린 후 돌아갑니다.",
-+>>>>>>> .their
- 	"extensionHomePath": "확장의 루트 경로를 설정합니다.",
- 	"listExtensions": "설치된 확장을 나열합니다.",
- 	"showVersions": "#NAME?",
-changed in both
-  base   100644 d726014f30ad2fd605f428cab04c66818906cc1f i18n/kor/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 05518f96202309824a89dfbd3498bbcde7102ebd i18n/kor/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 a346e007e1c0f9d2c0fc9c57b07b54cdf7f7cd53 i18n/kor/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -7,10 +7,18 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"invalidManifest": "잘못된 확장: package.json이 JSON 파일이 아닙니다.",
-+<<<<<<< .our
- 	"incompatible": "'{0}' 확장은 Code '{1}'과(와) 호환되지 않으므로 설치할 수 없습니다.",
- 	"restartCode": "{0}을(를) 다시 설치하기 전에 Code를 다시 시작하세요.",
- 	"installingOutdatedExtension": "이 확장의 최신 버전이 이미 설치되어 있습니다. 이 버전을 이전 버전으로 재정의하시겠습니까?",
- 	"override": "재정의",
-+=======
-+	"restartCodeLocal": "{0}을(를) 다시 설치하기 전에 Code를 다시 시작하세요.",
-+	"restartCodeGallery": "다시 설치하기 전에 Code를 다시 시작하세요.",
-+	"uninstallDependeciesConfirmation": "'{0}'만 제거할까요, 아니면 종속성도 제거할까요?",
-+	"uninstallOnly": "만",
-+	"uninstallAll": "모두",
-+>>>>>>> .their
- 	"cancel": "취소",
- 	"errorInstallingDependencies": "의존성 설치 중 오류가 발생했습니다. {0}",
- 	"MarketPlaceDisabled": "Marketplace를 사용할 수 없습니다.",
-changed in both
-  base   100644 005dd7fd2b37b3c0eed2370af24f374ed69a3891 i18n/kor/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
-  our    100644 e0c7d88cbca23724ac5d38207a4b8cffa64623c6 i18n/kor/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
-  their  100644 cb72ee5dd24605ae5130290640fbe09aa05897ab i18n/kor/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
-@@ -19,8 +19,11 @@
- 	"vscode.extension.activationEvents.onLanguage": "지정된 언어로 확인되는 파일을 열 때마다 활성화 이벤트가 발송됩니다.",
- 	"vscode.extension.activationEvents.onCommand": "지정된 명령을 호출할 때마다 활성화 이벤트가 발송됩니다.",
- 	"vscode.extension.activationEvents.onDebug": "사용자가 디버깅을 시작하거나 디버그 구성을 설정하려고 할 때마다 활성화 이벤트를 내보냅니다.",
-+<<<<<<< .our
- 	"vscode.extension.activationEvents.onDebugInitialConfigurations": "\"launch.json\"을 만들어야 할 때마다(그리고 모든 provideDebugConfigurations 메서드를 호출해야 할 때마다) 발생하는 활성화 이벤트입니다.",
- 	"vscode.extension.activationEvents.onDebugResolve": "특정 유형의 디버그 세션이 시작하려고 할 때마다(그리고 해당하는 resolveDebugConfiguration 메서드를 호출해야 할 때마다) 발생하는 활성화 이벤트입니다.",
-+=======
-+>>>>>>> .their
- 	"vscode.extension.activationEvents.workspaceContains": "지정된 glob 패턴과 일치하는 파일이 하나 이상 있는 폴더를 열 때마다 활성화 알림이 발송됩니다.",
- 	"vscode.extension.activationEvents.onView": "지정된 뷰가 확장될 때마다 활성화 이벤트가 내보내 집니다.",
- 	"vscode.extension.activationEvents.star": "VS Code 시작 시 활성화 이벤트가 발송됩니다. 훌륭한 최종 사용자 경험을 보장하려면 사용 케이스에서 다른 활성화 이벤트 조합이 작동하지 않을 때에만 확장에서 이 활성화 이벤트를 사용하세요.",
-changed in both
-  base   100644 3f1ee411c6a793cf82b5e6a5c38287a90e4592c2 i18n/kor/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
-  our    100644 eb6d49f45206b1a02989ce8cd09cfb3279900a45 i18n/kor/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
-  their  100644 9553ac369b7bb39f06dcbc45838c71c2cd652a64 i18n/kor/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
-changed in both
-  base   100644 25892e50a69647d70a2014f685d8137b8c1521ec i18n/kor/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-  our    100644 ada81b2d8dcc6b90c893241fe65e532cf68e0ce0 i18n/kor/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-  their  100644 22493f55ddf844f7f2cfd0aa5d028fc815ea6e2c i18n/kor/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-@@ -13,12 +13,18 @@
- 	"vscode.extension.contributes.view.name": "사용자가 읽을 수 있는 뷰 이름입니다. 표시됩니다.",
- 	"vscode.extension.contributes.view.when": "이 보기를 표시하기 위해 true여야 하는 조건입니다.",
- 	"vscode.extension.contributes.views": "뷰를 에디터에 적용합니다.",
-+<<<<<<< .our
- 	"views.explorer": "뷰를 작업 막대의 탐색기 컨테이너에 기여합니다.",
- 	"views.debug": "뷰를 작업 막대의 디버그 컨테이너에 기여합니다.",
- 	"views.scm": "뷰를 작업 막대의 SCM 컨테이너에 적용합니다.",
- 	"views.test": "뷰를 작업 막대의 테스트 컨테이너에 적용합니다.",
- 	"views.contributed": "뷰를 기여된 뷰 컨테이너에 기여합니다.",
- 	"ViewContainerDoesnotExist": "뷰 컨테이너 '{0}'이(가) 없으므로 이 컨테이너에 등록된 모든 뷰가 '탐색기'에 추가됩니다.",
-+=======
-+	"views.explorer": "탐색기 뷰",
-+	"views.debug": "디버그 보기",
-+	"locationId.invalid": "`{0}`은(는) 유효한 뷰 위치가 아닙니다.",
-+>>>>>>> .their
- 	"duplicateView1": "위치 '{1}'에서 동일한 ID '{0}'(으)로된 여러 개의 보기를 등록할 수 없습니다.",
- 	"duplicateView2": "ID `{0}`이(가) 포함된 뷰가 위치 `{1}`에 이미 등록되어 있습니다."
- }
-\ No newline at end of file
-changed in both
-  base   100644 ae23e97e23b09dbcd33d0fa5f5cc663436995a11 i18n/kor/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 9f392ee6782a9cd3b3d60690870bfb3e051b1e8b i18n/kor/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 b414854fcaca322cf76a0e75ca362a1e422e1dd9 i18n/kor/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -15,5 +15,9 @@
- 	"saveWorkspace": "작업 영역 저장",
- 	"openWorkspaceAction": "작업 영역 열기...",
- 	"openWorkspaceConfigFile": "작업 영역 구성 파일 열기",
-+<<<<<<< .our
- 	"duplicateWorkspaceInNewWindow": "새 창에 작업 영역 복제"
-+=======
-+	"workspaceFolderPickerPlaceholder": "작업 영역 폴더 선택"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 241bb67c5eee8ce0a274d3f675a332f810f92572 i18n/kor/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 c3a38e203dc33f498428fe02d849236cb876a123 i18n/kor/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 d5bda0aa791158f8841713ad932929b9d7d95cb9 i18n/kor/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 75c077118a6467d6cbe6b33000d8eb86b07cb1d7 i18n/kor/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-  our    100644 94a028963a477ef2b767d0df3987e36b68137e65 i18n/kor/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-  their  100644 3c0b9b984d4c27c079b360a040f79e3cac7f844d i18n/kor/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-@@ -55,5 +55,9 @@
- 	"screenReaderDetectedExplanation.answerYes": "예",
- 	"screenReaderDetectedExplanation.answerNo": "아니요",
- 	"screenReaderDetectedExplanation.body1": "VS Code가 이제 화면 읽기 프로그램과 사용하는 데 최적화되었습니다.",
-+<<<<<<< .our
- 	"screenReaderDetectedExplanation.body2": "줄바꿈, 접기 등의 일부 편집기 기능은 동작이 다릅니다."
-+=======
-+	"screenReaderDetectedExplanation.body2": "일부 편집기 기능에는 자동 줄바꿈, 접기, 자동 닫는 대괄호 등 여러 가지 동작이 있습니다. "
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e9b90f8dbe3eab05fb2305d42588a4bfd5fe8e1b i18n/kor/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 e913e127345422fb81d57f13fd8b5c25a0d63e10 i18n/kor/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 f652392a3976d4b1c168fa26cafc222b5376a636 i18n/kor/src/vs/workbench/electron-browser/actions.i18n.json
-@@ -49,7 +49,11 @@
- 	"showNextWindowTab": "다음 창 탭 표시",
- 	"moveWindowTabToNewWindow": "창 탭을 새 창으로 이동",
- 	"mergeAllWindowTabs": "모든 창 병합",
-+<<<<<<< .our
- 	"toggleWindowTabsBar": "창 탭 모음 설정/해제",
- 	"about": "{0} 정보",
- 	"inspect context keys": "컨텍스트 키 검사"
-+=======
-+	"toggleWindowTabsBar": "창 탭 모음 설정/해제"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 cf4fcf372d66c0d5a93da18d41f397eb4c7eb120 i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 faff44b17686fcb835995d2bfd92efcfdcc183b1 i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 7c9f66647d925e4ca0e2e5aa9e25eb2dde7b3872 i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -13,9 +13,15 @@
- 	"developer": "개발자",
- 	"workbenchConfigurationTitle": "워크벤치",
- 	"showEditorTabs": "열려 있는 편집기를 탭에서 표시할지 여부를 제어합니다.",
-+<<<<<<< .our
- 	"workbench.editor.labelFormat.default": "파일 이름을 표시합니다. 탭이 사용하도록 설정되어 있고 하나의 그룹에서 파일 2개의 이름이 동일하면, 각 파일 경로의 특정 섹션이 추가됩니다. 탭이 사용하도록 설정되어 있지 않으면, 작업 영역 폴더에 대한 경로는 편집기가 활성 상태일 때 표시됩니다.",
- 	"workbench.editor.labelFormat.short": "디렉터리 이름 앞에 오는 파일의 이름을 표시합니다.",
- 	"workbench.editor.labelFormat.medium": "작업 영역 폴더에 상대적인 경로 앞에 오는 파일의 이름을 표시합니다.",
-+=======
-+	"workbench.editor.labelFormat.default": "파일 이름을 표시합니다. 탭이 사용하도록 설정되어 있고 하나의 그룹에서 파일 2개의 이름이 동일하면, 각 파일 경로의 특정 섹션이 추가됩니다. 탭이 사용하도록 설정되어 있지 않으면, 작업 영역 루트에 대한 경로는 편집기가 활성 상태일 때 표시됩니다.",
-+	"workbench.editor.labelFormat.short": "디렉터리 이름 앞에 오는 파일의 이름을 표시합니다.",
-+	"workbench.editor.labelFormat.medium": "작업 영역 루트를 기준으로 하는 상대 경로 앞에 오는 파일의 이름을 표시합니다.",
-+>>>>>>> .their
- 	"workbench.editor.labelFormat.long": "절대 경로 앞에 오는 파일의 이름을 표시합니다.",
- 	"tabDescription": "편집기의 레이블 형식을 제어합니다. 예를 들어 이 설정을 변경하면 파일의 위치를 더 쉽게 파악할 수 있습니다.:\n- 짧게:   'parent'\n- 중간:  'workspace/src/parent'\n- 길게:    '/home/user/workspace/src/parent'\n- 기본값: '.../parent', 다른 탭이 동일한 제목을 공유하거나, 탭을 사용하지 않도록 설정한 경우 작업 영역 상대 경로",
- 	"editorTabCloseButton": "편집기의 탭 닫기 단추의 위치를 제어하거나 'off'로 설정된 경우 이 단추를 사용하지 않도록 설정합니다.",
-changed in both
-  base   100644 f113def895bbf5487bd99e193c69257b569f616f i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
-  our    100644 afa2b96152f54f9966e9d4747fd450701cd59daf i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
-  their  100644 59ea1c2066d76df2f3473b466d3d77161934d547 i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
-changed in both
-  base   100644 3a1c8cbdce79807cc1c13d7c37c9f0160c3f7bb9 i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 f0485e490c5dc7158ba60cc766e0b791027e8972 i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 7b4fa4d91c96c0b2943f454159e129047aa50ae8 i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -17,8 +17,12 @@
- 	"multipleConfigurationNamesInWorkspace": "작업 영역에 시작 구성 '{0}'이(가) 여러 개 있습니다. 폴더 이름을 사용하여 구성을 한정하세요.",
- 	"noFolderWithName": "복합형 '{2}'의 구성 '{1}'에 대해 이름이 '{0}'인 폴더를 찾을 수 없습니다.",
- 	"configMissing": "'{0}' 구성이 'launch.json'에 없습니다.",
-+<<<<<<< .our
- 	"launchJsonDoesNotExist": "'launch.json'이 없습니다.",
- 	"debugRequestNotSupported": "'{0}' 특성에는 선택한 디버그 구성에서 지원되지 않는 값 '{1}'이(가) 있습니다.",
-+=======
-+	"debugRequestNotSupported": "선택한 디버그 구성에 지원되지 않는 특성 값 `{0}`: '{1}'이(가) 있습니다.",
-+>>>>>>> .their
- 	"debugRequesMissing": "선택한 디버그 구성에 특성 '{0}'이(가) 없습니다.",
- 	"debugTypeNotSupported": "구성된 디버그 형식 '{0}'은(는) 지원되지 않습니다.",
- 	"debugTypeMissing": "선택한 시작 구성에 대한 'type' 속성이 없습니다.",
-changed in both
-  base   100644 f0bb9eb253a06ae980e75fcbfcfbd961e6b1bb8c i18n/kor/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-  our    100644 ac0d4279306dd86dc6aef8e72448d92e45e7a5dd i18n/kor/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-  their  100644 7092740fd0cc1cea1d55fbfe71d6739b11d63a9c i18n/kor/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-@@ -34,10 +34,13 @@
- 	"view id": "ID",
- 	"view name": "이름",
- 	"view location": "위치",
-+<<<<<<< .our
- 	"localizations": "지역화({0})",
- 	"localizations language id": "언어 ID",
- 	"localizations language name": "언어 이름",
- 	"localizations localized language name": "언어 이름(지역화됨)",
-+=======
-+>>>>>>> .their
- 	"colorThemes": "색 테마({0})",
- 	"iconThemes": "아이콘 테마({0})",
- 	"colors": "색({0})",
-changed in both
-  base   100644 4740dad8c109e50f0136b78db9f14389dbd1841f i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 3b79008f444d2989f35d429d32801582bb6d419c i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 f725b6c7c5b7aef7e36e336a9cd0661f990bd05f i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-@@ -56,11 +56,15 @@
- 	"OpenExtensionsFile.failed": "'.vscode' 폴더({0}) 내에 'extensions.json' 파일을 만들 수 없습니다.",
- 	"configureWorkspaceRecommendedExtensions": "권장 확장 구성(작업 영역)",
- 	"configureWorkspaceFolderRecommendedExtensions": "권장 확장 구성(작업 영역 폴더)",
-+<<<<<<< .our
- 	"malicious tooltip": "이 확장은 문제가 있다고 보고되었습니다.",
- 	"malicious": "악성",
- 	"disabled": "사용 안 함",
- 	"disabled globally": "사용 안 함",
- 	"disabled workspace": "이 작업 영역에 대해  사용 안 함",
-+=======
-+	"builtin": "기본 제공",
-+>>>>>>> .their
- 	"disableAll": "설치된 모든 확장 사용 안 함",
- 	"disableAllWorkspace": "이 작업 영역에 대해 설치된 모든 확장 사용 안 함",
- 	"enableAll": "모든 확장 사용",
-changed in both
-  base   100644 1ad38867f92ac0f1959f2541e30295decd674acd i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 7d98f29daa7e57a06988b8e2e9d76dd40150f638 i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 5d5a8d4e6fbd7251f50ca129638dc44b64cf49a7 i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -14,11 +14,17 @@
- 	"workspaceRecommendation": "이 확장은 현재 작업 영역 사용자가 권장합니다.",
- 	"reallyRecommended2": "이 파일 형식에 대해 '{0}' 확장이 권장됩니다.",
- 	"reallyRecommendedExtensionPack": "이 파일 형식에 대해 '{0}' 확장 팩이 권장됩니다.",
-+<<<<<<< .our
- 	"install": "설치",
-+=======
-+>>>>>>> .their
- 	"showRecommendations": "권장 사항 표시",
- 	"showLanguageExtensions": "Marketplace에 '.{0}' 파일이 지원되는 확장이 있습니다.",
- 	"workspaceRecommended": "이 작업 영역에 확장 권장 사항이 있습니다.",
-+<<<<<<< .our
- 	"installAll": "모두 설치",
-+=======
-+>>>>>>> .their
- 	"ignoreExtensionRecommendations": "확장 권장 사항을 모두 무시하시겠습니까?",
- 	"ignoreAll": "예, 모두 무시",
- 	"no": "아니요"
-changed in both
-  base   100644 4ab44e5871c4fe93137d94c4f31ae37eefc44cf1 i18n/kor/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 64e3a748c1d30ddcf3658546af6b8c004e841f1b i18n/kor/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 c3fd559ec192d308b4818f01eb9cac49efe48838 i18n/kor/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-changed in both
-  base   100644 cbd0a3669214220a11da10ddb51f261f2ea41e0b i18n/kor/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json
-  our    100644 3bf1d80fbbb057903445e9ef23f1cc01cf399258 i18n/kor/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json
-  their  100644 92d4ab06aac50b058a9dc4e0a44d0248e1c91886 i18n/kor/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"dirtyFile": "저장되지 않은 파일 1개",
- 	"dirtyFiles": "{0}개의 저장되지 않은 파일"
- }
-\ No newline at end of file
-changed in both
-  base   100644 613ba80ad4ea971ed15ce3e0a85c0b35d6f17c41 i18n/kor/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  our    100644 a3f29b119baf78974d1c8a562e98893325a62a67 i18n/kor/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  their  100644 7706711508b23cd37e3f06ca725238bc180d2970 i18n/kor/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,11 @@
- 	],
- 	"scm providers": "소스 제어 공급자",
- 	"hideRepository": "숨기기",
-+=======
-+	"scm providers": "소스 제어 공급자",
-+	"hideRepository": "숨기기",
-+	"commitMessage": "Message (press {0} to commit)",
-+>>>>>>> .their
- 	"installAdditionalSCMProviders": "추가 SCM 공급자 설치...",
- 	"no open repo": "활성 소스 제어 공급자가 없습니다.",
- 	"source control": "소스 제어",
-changed in both
-  base   100644 7fd318c3ac3ad37607695361f136ae8bc67ad381 i18n/kor/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
-  our    100644 528ca95cbc966fb1629b4f122e4fa54aa88cd4cc i18n/kor/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
-  their  100644 89f97af107d36f49951d354d2482e7cfc2dc0058 i18n/kor/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"snippet.suggestions.label": "코드 조각 삽입",
- 	"sep.userSnippet": "사용자 코드 조각",
- 	"sep.extSnippet": "확장 코드 조각"
-changed in both
-  base   100644 ff965d875e1ba2516f85f2454079753daef56f08 i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  our    100644 4bb4deec5c3699ac48cd50b00a644c268e111a10 i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 b80c311ab32042cb1757104f78e9428d97a224f7 i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-@@ -13,8 +13,14 @@
- 	"vscode.extension.contributes.snippets": "코드 조각을 적용합니다.",
- 	"vscode.extension.contributes.snippets-language": "이 코드 조각이 적용되는 언어 식별자입니다.",
- 	"vscode.extension.contributes.snippets-path": "코드 조각 파일의 경로입니다. 이 경로는 확장 폴더의 상대 경로이며 일반적으로 './snippets/'로 시작합니다.",
-+<<<<<<< .our
- 	"badVariableUse": "'{0}' 확장의 1개 이상의 코드 조각은 snippet-variables 및 snippet-placeholders와 혼동하기 쉽습니다(자세한 내용은 https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax를 참조하세요).",
- 	"badFile": "코드 조각 파일 \"{0}\"을(를) 읽을 수 없습니다.",
-+=======
-+	"badFile": "코드 조각 파일 \"{0}\"을(를) 읽을 수 없습니다.",
-+	"badVariableUse": "\"{0}\"-snippet은 snippet-variables 및 snippet-placeholders와 혼동하기 쉽습니다. 자세한 내용은\n https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax를 참조하세요.",
-+	"source.snippet": "사용자 코드 조각",
-+>>>>>>> .their
- 	"detail.snippet": "{0}({1})",
- 	"snippetSuggest.longLabel": "{0}, {1}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 ebb319eca1e8e5ed1d7950134f0dbdf84b2b696d i18n/kor/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 7b483f685d0f32a5b2eb20f1327a18475e2d29ae i18n/kor/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 f423d7950f1fa1c6ab6696dad4f5e505c85ebd89 i18n/kor/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -17,8 +17,11 @@
- 	"runningTasks": "실행 중인 작업 표시",
- 	"tasks": "작업",
- 	"TaskSystem.noHotSwap": "실행 중인 활성 작업이 있는 작업 실행 엔진을 변경하면 Window를 다시 로드해야 합니다.",
-+<<<<<<< .our
- 	"reloadWindow": "창 다시 로드",
- 	"TaskServer.folderIgnored": "작업 버전 0.1.0을 사용하므로 {0} 폴더가 무시됩니다.",
-+=======
-+>>>>>>> .their
- 	"TaskService.noBuildTask1": "정의된 빌드 작업이 없습니다. tasks.json 파일에서 작업을 'isBuildCommand'로 표시하세요.",
- 	"TaskService.noBuildTask2": "정의된 빌드 작업이 없습니다. tasks.json 파일에서 작업을 'build'로 표시하세요.",
- 	"TaskService.noTestTask1": "정의된 테스트 작업이 없습니다. tasks.json 파일에서 작업을 'isTestCommand'로 표시하세요.",
-@@ -51,13 +54,23 @@
- 	"recentlyUsed": "최근에 사용한 작업",
- 	"configured": "구성된 작업",
- 	"detected": "감지된 작업",
-+<<<<<<< .our
- 	"TaskService.ignoredFolder": "작업 버전 0.1.0을 사용하기 때문에 다음 작업 영역 폴더는 무시됩니다. {0}",
- 	"TaskService.notAgain": "다시 표시 안 함",
-+=======
-+	"TaskService.ignoredFolder": "작업 버전 0.1.0을 사용하기 때문에 다음 작업 영역 폴더는 무시됩니다.",
-+	"TaskService.notAgain": "다시 표시 안 함",
-+	"TaskService.ok": "확인",
-+>>>>>>> .their
- 	"TaskService.pickRunTask": "실행할 작업 선택",
- 	"TaslService.noEntryToRun": "실행할 작업이 없습니다. 작업 구성...",
- 	"TaskService.fetchingBuildTasks": "빌드 작업을 페치하는 중...",
- 	"TaskService.pickBuildTask": "실행할 빌드 작업 선택",
-+<<<<<<< .our
- 	"TaskService.noBuildTask": "실행할 빌드 작업을 찾을 수 없습니다. 빌드 작업 구성...",
-+=======
-+	"TaskService.noBuildTask": "실행할 빌드 작업이 없습니다. 작업 구성...",
-+>>>>>>> .their
- 	"TaskService.fetchingTestTasks": "테스트 작업을 페치하는 중...",
- 	"TaskService.pickTestTask": "실행할 테스트 작업 선택",
- 	"TaskService.noTestTaskTerminal": "실행할 테스트 작업이 없습니다. 작업 구성...",
-changed in both
-  base   100644 4c053b9817c393ca195c98e0775da58257024c9f i18n/kor/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
-  our    100644 346918e15f0160843027dd42e9dddef5a13cb68d i18n/kor/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
-  their  100644 b052f09dc9eff6e8bf3144bd2926705cb687ec64 i18n/kor/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
-changed in both
-  base   100644 e33377e30643badc571692ee5e88d20c6a0f3661 i18n/kor/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  our    100644 13963265fec1836212d41ecacb07eed5e173dace i18n/kor/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  their  100644 d676ae23acbeb0e18cf80e2ab13f8f8f55cfefdb i18n/kor/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-changed in both
-  base   100644 d5e2c68ddac536e19d92c4590a12da0ff3388939 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 0c53998d6e084853fcbcba0b56050a6d820a2b6f i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 110ad44388287a2e33efe5e0095e0cfb9e0bdf95 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -53,6 +53,7 @@
- 	"workbench.action.terminal.hideFindWidget": "파인드 위젯 숨기기",
- 	"nextTerminalFindTerm": "다음 검색어 표시",
- 	"previousTerminalFindTerm": "이전 검색어 표시",
-+<<<<<<< .our
- 	"quickOpenTerm": "활성 터미널 전환",
- 	"workbench.action.terminal.scrollToPreviousCommand": "이전 명령으로 스크롤",
- 	"workbench.action.terminal.scrollToNextCommand": "다음 명령으로 스크롤",
-@@ -60,4 +61,7 @@
- 	"workbench.action.terminal.selectToNextCommand": "다음 명령까지 선택",
- 	"workbench.action.terminal.selectToPreviousLine": "이전 줄까지 선택",
- 	"workbench.action.terminal.selectToNextLine": "다음 줄까지 선택"
-+=======
-+	"quickOpenTerm": "활성 터미널 전환"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 23c1d36b14271b708b4fbe9288aa7ed1ea3d88e8 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 d9e00ba07827f3430d124e149c098a234044e854 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 32869d5021697b6a3ae2a49d5c06af5f67762158 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -11,6 +11,10 @@
- 	"terminalCursor.foreground": "터미널 커서의 전경색입니다.",
- 	"terminalCursor.background": "터미널 커서의 배경색입니다. 블록 커서와 겹친 문자의 색상을 사용자 정의할 수 있습니다.",
- 	"terminal.selectionBackground": "터미널의 선택 영역 배경색입니다.",
-+<<<<<<< .our
- 	"terminal.border": "터미널 내의 분할 창을 구분하는 테두리의 색입니다. 기본값은 panel.border입니다.",
- 	"terminal.ansiColor": "터미널의 '{0}' ANSI 색상"
-+=======
-+	"terminal.ansiColor": "터미널의 '{0}' ANSI 색입니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a7a11fff0315780963827979b6a5e8203d76746b i18n/kor/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  our    100644 41ca426ace31e84127ef6bca48017cabc9916033 i18n/kor/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  their  100644 5e2412f131bd8af82b03a6c830361b42054005f0 i18n/kor/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-@@ -11,6 +11,10 @@
- 	"welcomePage.start": "시작",
- 	"welcomePage.newFile": "새 파일",
- 	"welcomePage.openFolder": "폴더 열기...",
-+<<<<<<< .our
-+=======
-+	"welcomePage.cloneGitRepository": "Git 리포지토리 복제...",
-+>>>>>>> .their
- 	"welcomePage.addWorkspaceFolder": "작업 영역 폴더 추가...",
- 	"welcomePage.recent": "최근 항목",
- 	"welcomePage.moreRecent": "자세히...",
-changed in both
-  base   100644 f5327cac860e6a1151d5a1051ccd05aa8803f00e i18n/kor/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 e81a8a242fb847453d5e2339de27eb2791e53868 i18n/kor/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 8eb022003b18a31ed4e97efb72111cf8bfa96c14 i18n/kor/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,11 @@
- 	],
- 	"openTasksConfiguration": "작업 구성 열기",
- 	"openLaunchConfiguration": "시작 구성 열기",
-+=======
-+	"openTasksConfiguration": "작업 구성 열기",
-+	"openLaunchConfiguration": "시작 구성 열기",
-+	"close": "닫기",
-+>>>>>>> .their
- 	"open": "설정 열기",
- 	"saveAndRetry": "저장 및 다시 시도",
- 	"errorUnknownKey": "{1}은(는) 등록된 구성이 아니므로 {0}에 쓸 수 없습니다.",
-@@ -17,6 +23,7 @@
- 	"errorInvalidWorkspaceTarget": "{0}이(가) 여러 폴더 작업 영역에서 작업 영역 범위를 지원하지 않으므로 작업 영역 설정에 쓸 수 없습니다.",
- 	"errorInvalidFolderTarget": "리소스가 제공되지 않으므로 폴더 설정에 쓸 수 없습니다.",
- 	"errorNoWorkspaceOpened": "작업 영역이 열려 있지 않으므로 {0}에 쓸 수 없습니다. 먼저 작업 영역을 열고 다시 시도하세요.",
-+<<<<<<< .our
- 	"errorInvalidTaskConfiguration": "작업 구성 파일에 쓸 수 없습니다. 파일을 열고 오류/경고를 수정한 다음 다시 시도하세요.",
- 	"errorInvalidLaunchConfiguration": "시작 구성 파일에 쓸 수 없습니다. 파일을 열고 오류/경고를 수정한 다음 다시 시도하세요.",
- 	"errorInvalidConfiguration": "사용자 설정에 쓸 수 없습니다. 사용자 설정을 열어 오류/경고를 수정하고 다시 시도하세요.",
-@@ -27,6 +34,18 @@
- 	"errorConfigurationFileDirty": "사용자 설정 파일이 변경되어 사용자 설정에 쓸 수 없습니다. 먼저 사용자 설정 파일을 저장하고 다시 시도하세요.",
- 	"errorConfigurationFileDirtyWorkspace": "작업 영역 설정 파일이 변경되어 작업 영역 설정에 쓸 수 없습니다. 먼저 작업 영역 설정 파일을 저장하고 다시 시도하세요.",
- 	"errorConfigurationFileDirtyFolder": "폴더 설정 파일이 변경되어 폴더 설정에 쓸 수 없습니다. 먼저 '{0}' 폴더 설정 파일을 저장하고 다시 시도하세요.",
-+=======
-+	"errorInvalidTaskConfiguration": "작업 파일에 쓸 수 없습니다.  **작업** 파일을 열어 오류/경고를 수정하고 다시 시도하세요.",
-+	"errorInvalidLaunchConfiguration": "실행 파일에 쓸 수 없습니다. **실행** 파일을 열어 오류/경고를 수정하고 다시 시도하세요.",
-+	"errorInvalidConfiguration": "사용자 설정에 쓸 수 없습니다. **사용자 설정** 파일을 열어 오류/경고를 수정하고 다시 시도하세요.",
-+	"errorInvalidConfigurationWorkspace": "작업 영역 설정에 쓸 수 없습니다. **작업 영역 설정** 파일을 열어 오류/경고를 수정하고 다시 시도하세요.",
-+	"errorInvalidConfigurationFolder": "폴더 설정에 쓸 수 없습니다. **{0}** 폴더 아래의 **폴더 설정** 파일을 열어 오류/경고를 수정하고 다시 시도하세요.",
-+	"errorTasksConfigurationFileDirty": "파일이 변경되어 작업 파일에 쓸 수 없습니다. **작업 구성** 파일을 저장하고 다시 시도하세요.",
-+	"errorLaunchConfigurationFileDirty": "파일이 변경되어 시작 파일에 쓸 수 없습니다. **시작 구성** 파일을 저장하고 다시 시도하세요.",
-+	"errorConfigurationFileDirty": "파일이 변경되어 사용자 설정에 쓸 수 없습니다. **사용자 설정** 파일을 저장하고 다시 시도하세요.",
-+	"errorConfigurationFileDirtyWorkspace": "파일이 변경되어 작업 영역에 쓸 수 없습니다. **작업 영역 설정** 파일을 저장하고 다시 시도하세요.",
-+	"errorConfigurationFileDirtyFolder": "파일이 변경되어 폴더 설정에 쓸 수 없습니다. **{0}** 폴더 아래의 **폴더 설정** 파일을 저장하고 다시 시도하세요.",
-+>>>>>>> .their
- 	"userTarget": "사용자 설정",
- 	"workspaceTarget": "작업 영역 설정",
- 	"folderTarget": "폴더 설정"
-changed in both
-  base   100644 ff2c5e9f172a982c0725ff94232e32b4c35da8d8 i18n/kor/src/vs/workbench/services/files/node/fileService.i18n.json
-  our    100644 d411f384a723903358d48f22eaee747debee2d77 i18n/kor/src/vs/workbench/services/files/node/fileService.i18n.json
-  their  100644 28c96c9fb3d9e0c84ec1d71e5714bc113260a714 i18n/kor/src/vs/workbench/services/files/node/fileService.i18n.json
-@@ -11,8 +11,11 @@
- 	"fileNotModifiedError": "파일 수정 안 됨",
- 	"fileTooLargeError": "파일이 너무 커서 열 수 없음",
- 	"fileNotFoundError": "파일을 찾을 수 없습니다({0}).",
-+<<<<<<< .our
- 	"fileBinaryError": "파일이 이진인 것 같으므로 테스트로 열 수 없습니다.",
- 	"filePermission": "파일 쓰기 권한이 거부되었습니다. ({0})",
-+=======
-+>>>>>>> .their
- 	"fileExists": "만드려는 파일이 이미 있음({0})",
- 	"fileMoveConflict": "이동/복사할 수 없습니다. 대상에 파일이 이미 있습니다.",
- 	"unableToMoveCopyError": "이동/복사할 수 없습니다. 파일이 포함된 폴더를 파일로 대체합니다.",
-changed in both
-  base   100644 cea37b5ae9c5f16cd9d40e8999cef2eb4fc6bce8 i18n/ptb/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  our    100644 2aa222eaf70279b60b151ccffab51a1ed5b7a7ab i18n/ptb/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  their  100644 28adcb870653d4e3ae4406b036a344f8ed678e46 i18n/ptb/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 fe9bcf24664f255463385c7e66611cd667b28998 i18n/ptb/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-  our    100644 cd8962aa3a75fbfcc1b3b7ad4977f39db4e7c1f6 i18n/ptb/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-  their  100644 2d1418035ead4c2e2bc6bab3e703c1904a4196ee i18n/ptb/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-@@ -13,6 +13,12 @@
- 	"vscode.extension.contributes.view.name": "O nome legível da visualização. Será mostrado",
- 	"vscode.extension.contributes.view.when": "Condição que deve ser verdadeira para mostrar esta visualização",
- 	"vscode.extension.contributes.views": "Contribui visualizações ao editor",
-+<<<<<<< .our
-+=======
-+	"views.explorer": "Visualização do explorador",
-+	"views.debug": "Visualizar Depurador",
-+	"locationId.invalid": "'{0}' não é um local válido de visualização",
-+>>>>>>> .their
- 	"duplicateView1": "Não é possível registrar vários modos de exibição com a mesma id '{0}' no local '{1}'",
- 	"duplicateView2": "Uma exibição com id '{0}' já está registrada no local '{1}'"
- }
-\ No newline at end of file
-changed in both
-  base   100644 790bb0abf97ce504ea9896e83225e03f4bc14b37 i18n/ptb/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-  our    100644 086dcb9f4dabfe04a0cada61eb69473d28272381 i18n/ptb/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-  their  100644 fd2c0fd6d01f0d59268bca06bdc708d7387927f8 i18n/ptb/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-@@ -54,5 +54,9 @@
- 	"screenReaderDetectedExplanation.answerYes": "Sim",
- 	"screenReaderDetectedExplanation.answerNo": "Não",
- 	"screenReaderDetectedExplanation.body1": "O VS Code agora está otimizado para uso com um leitor de tela.",
-+<<<<<<< .our
- 	"screenReaderDetectedExplanation.body2": "Alguns recursos do editor terão comportamento diferente: por exemplo, quebra de linha, cruzamento, etc."
-+=======
-+	"screenReaderDetectedExplanation.body2": "Alguns recursos do editor terão comportamento diferente: por exemplo, a palavra envoltura, dobradura, auto fechamento de colchetes, etc."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 762047cd35b281ceb6d9d43180a1f95295f58744 i18n/ptb/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 15dd21d37a31b843a88f5eb322486062a4b034bf i18n/ptb/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 4f521d069108f4b0e8ed4363493ae77ccb7ecd27 i18n/ptb/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -13,7 +13,11 @@
- 	"developer": "Desenvolvedor",
- 	"workbenchConfigurationTitle": "Área de Trabalho",
- 	"showEditorTabs": "Controla se os editores abertos devem ou não serem exibidos em abas.",
-+<<<<<<< .our
- 	"workbench.editor.labelFormat.default": "Mostra o nome do arquivo. Quando guias estiverem ativadas e dois arquivos em um grupo tiverem o mesmo nome, a seção de distinção para cada caminho de arquivo é adicionada. Quando guias estiverem desativadas, o caminho relativo para a pasta do espaço de trabalho é exibida se o editor estiver ativo.",
-+=======
-+	"workbench.editor.labelFormat.default": "Mostrar o nome do arquivo. Quando as abas estão habilitadas e dois arquivos têm o mesmo nome em um grupo são adicionadas as seções de diferenciação do caminho de cada arquivo. Quando as abas estão desativadas, o caminho relativo para a raiz do espaço de trabalho é mostrado se o editor está ativo.",
-+>>>>>>> .their
- 	"workbench.editor.labelFormat.short": "Mostrar o nome do arquivo seguido pelo nome do diretório.",
- 	"workbench.editor.labelFormat.medium": "Mostra o nome do arquivo seguido de seu caminho relativo para a pasta de trabalho.",
- 	"workbench.editor.labelFormat.long": "Mostrar o nome do arquivo seguido pelo seu caminho absoluto.",
-changed in both
-  base   100644 8532e53b63f6207eee6b0b7fe92e020a1bc29426 i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 7ae7f7f9b7576297c381fe538464cf315327a1cf i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 aaf52e5dedb6bcb138ec29806d0ce10e0826a2a2 i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -17,8 +17,12 @@
- 	"multipleConfigurationNamesInWorkspace": "Existem múltiplas configurações de lançamento '{0}' na área de trabalho. Use o nome da pasta para qualificar a configuração.",
- 	"noFolderWithName": "Não é possível encontrar a pasta com nome '{0}' para configuração '{1}' no composto '{2}'.",
- 	"configMissing": "Configuração '{0}' não tem 'launch.json'.",
-+<<<<<<< .our
- 	"launchJsonDoesNotExist": "'launch.json' não existe.",
- 	"debugRequestNotSupported": "Atributo '{0}' tem um valor sem suporte '{1}' na configuração de debug escolhida.",
-+=======
-+	"debugRequestNotSupported": "Configuração de depuração escolhido possui um valor de atributo não suportado '{0}': '{1}'.",
-+>>>>>>> .their
- 	"debugRequesMissing": "Atributo '{0}' está faltando para a configuração de depuração escolhida.",
- 	"debugTypeNotSupported": "Tipo de depuração configurado '{0}' não é suportado.",
- 	"debugTypeMissing": "Falta a propriedade 'type' para a configuração de lançamento escolhida.",
-changed in both
-  base   100644 bbf9ec1405f6642a57f0482a986552047d0f606a i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 ddb9ffa28f8d3daf13de0c0b7197d8da53424c16 i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 6a2871fd38f514fd32cb61655acfcc7a341fcd66 i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -14,11 +14,17 @@
- 	"workspaceRecommendation": "Esta extensão é recomendada pelos usuários da área de trabalho atual.",
- 	"reallyRecommended2": "A extensão {0} é recomendada para este tipo de arquivo.",
- 	"reallyRecommendedExtensionPack": "O pacote de extensão '{0}' é recomendado para este tipo de arquivo.",
-+<<<<<<< .our
- 	"install": "Instalar",
-+=======
-+>>>>>>> .their
- 	"showRecommendations": "Mostrar Recomendações",
- 	"showLanguageExtensions": "A Loja tem extensões que podem ajudar com arquivos '.{0}'",
- 	"workspaceRecommended": "Este espaço de trabalho possui recomendações de extensão.",
-+<<<<<<< .our
- 	"installAll": "Instalar Tudo",
-+=======
-+>>>>>>> .their
- 	"ignoreExtensionRecommendations": "Você quer ignorar todas as recomendações de extensão?",
- 	"ignoreAll": "Sim, Ignorar Tudo",
- 	"no": "Não"
-changed in both
-  base   100644 e4d6ecbed2f8ad1f5ecc15c3c6d1c4624f053178 i18n/ptb/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 0e95d226253753e96cd8acccc486951d1a479af6 i18n/ptb/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 8100b458672ce8aadcfc3ebe66562e98de94c2a4 i18n/ptb/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-changed in both
-  base   100644 a743a823aadfff9b6f7e213574f8ea0a08e5fdbe i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  our    100644 dfb6a734a7bd828d4b5aba3c014e4458b5423834 i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  their  100644 4b9c688e07f85f2baac6e158ad2b528dcc87ace6 i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-@@ -8,6 +8,10 @@
- 	],
- 	"scm providers": "Provedores de Controle de Código Fonte",
- 	"hideRepository": "Ocultar",
-+<<<<<<< .our
-+=======
-+	"commitMessage": "Mensagem (tecle {0} para confirmar)",
-+>>>>>>> .their
- 	"installAdditionalSCMProviders": "Instalar provedores de SCM adicionais...",
- 	"no open repo": "Não existem provedores de controle de código fonte ativos.",
- 	"source control": "Controle de código-fonte",
-changed in both
-  base   100644 c7d151b5fb7b7ba2cfa5b290ea9102d3d6524dca i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 c3c8aff54991b1522f7c64ea3428a81e96b3045d i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 526a6233a3d371a977bf81d497f40f8c9117bbe5 i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -49,6 +49,7 @@
- 	"recentlyUsed": "tarefas recentemente utilizadas",
- 	"configured": "tarefas configuradas",
- 	"detected": "tarefas detectadas",
-+	"TaskService.ignoredFolder": "As seguintes pastas de espaço de trabalho serão ignoradas, uma vez que eles usam versão de tarefa 0.1.0: ",
- 	"TaskService.notAgain": "Não mostrar novamente",
- 	"TaskService.pickRunTask": "Selecione a tarefa a ser executada",
- 	"TaslService.noEntryToRun": "Nenhuma tarefa para executar foi encontrada. Configure Tarefas...",
-changed in both
-  base   100644 cf0d6f1808b467234c1b61bd8553212f2359ce53 i18n/ptb/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 68215b632ce90bcb7b46b0cefec04b9e2085133e i18n/ptb/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 fc58c32d09cd3cffa3ac7516d53d7668a5609daf i18n/ptb/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,11 @@
- 	],
- 	"openTasksConfiguration": "Abrir Configuração de Tarefas",
- 	"openLaunchConfiguration": "Abrir Configuração de Execução",
-+=======
-+	"openTasksConfiguration": "Abrir Configuração de Tarefas",
-+	"openLaunchConfiguration": "Abrir Configuração de Execução",
-+	"close": "Fechar",
-+>>>>>>> .their
- 	"open": "Abrir configurações",
- 	"saveAndRetry": "Salvar e tentar novamente",
- 	"errorUnknownKey": "Não é possível gravar {0} porque {1} não é uma configuração registrada.",
-@@ -16,11 +22,24 @@
- 	"errorInvalidWorkspaceTarget": "Não é possível gravar as configurações do espaço de trabalho porque {0} não oferece suporte para o escopo de espaço de trabalho em um espaço de trabalho de múltiplas pastas.",
- 	"errorInvalidFolderTarget": "Não é possível gravar as configurações da pasta porque nenhum recurso é fornecido.",
- 	"errorNoWorkspaceOpened": "Não é possível gravar {0} porque nenhum espaço de trabalho está aberto. Por favor, abra um espaço de trabalho primeiro e tente novamente.",
-+<<<<<<< .our
- 	"errorInvalidTaskConfiguration": "Não é possível escrever no arquivo de configuração de tarefas. Por favor, abra o arquivo para corrigir erros/avisos e tente novamente.",
- 	"errorInvalidLaunchConfiguration": "Não é possível escrever no arquivo de configuração de lançamento. Por favor, abra o arquivo para corrigir erros/avisos e tente novamente.",
- 	"errorInvalidConfiguration": "Não é possível escrever nas configurações do usuário. Por favor, abra as configurações do usuário para corrigir erros/avisos e tente novamente.",
- 	"errorInvalidConfigurationWorkspace": "Não é possível escrever nas configurações do espaço de trabalho. Por favor, abra as configurações do espaço de trabalho para corrigir erros/avisos no arquivo e tente novamente.",
- 	"errorInvalidConfigurationFolder": "Não é possível escrever nas configurações de pasta. Por favor, abra as configurações da pasta '{0}' para corrigir erros/avisos e tente novamente.",
-+=======
-+	"errorInvalidTaskConfiguration": "Não foi possível gravar no arquivo de tarefas. Por favor abra o arquivo **Tasks** para corrigir os erros/avisos e tente novamente.",
-+	"errorInvalidLaunchConfiguration": "Não foi possível gravar no arquivo de lançamento. Por favor abra o arquivo **Launch** para corrigir os erros/avisos e tente novamente.",
-+	"errorInvalidConfiguration": "Não é possível gravar em configurações do usuário. Por favor abra o arquivo **Configurações do Usuário** para corrigir erros/avisos nele e tente novamente.",
-+	"errorInvalidConfigurationWorkspace": "Não é possível gravar em configurações de espaço de trabalho. Por favor abra o arquivo **Configurações do Espaço de Trabalho** para corrigir erros/avisos no arquivo e tente novamente.",
-+	"errorInvalidConfigurationFolder": "Não é possível gravar nas configurações de pasta. Por favor abra o arquivo **Configurações de Pasta** sob a pasta **{0}** para corrigir erros/avisos no arquivo e tente novamente.",
-+	"errorTasksConfigurationFileDirty": "Não é possível gravar no arquivo de tarefas porque o arquivo está sujo. Por favor, salve o arquivo **Configurações de Tarefa** e tente novamente.",
-+	"errorLaunchConfigurationFileDirty": "Não é possível gravar no arquivo de início porque o arquivo está sujo. Por favor, salve o arquivo **Configuração de Lançamento** e tente novamente.",
-+	"errorConfigurationFileDirty": "Não é possível gravar em configurações do usuário porque o arquivo está sujo. Por favor, salve o arquivo **Configurações do Usuário** e tente novamente.",
-+	"errorConfigurationFileDirtyWorkspace": "Não é possível gravar em configurações de espaço de trabalho porque o arquivo está sujo. Por favor, salve o arquivo **Configurações do Espaço de Trabalho** e tente novamente.",
-+	"errorConfigurationFileDirtyFolder": "Não é possível gravar em configurações de pasta porque o arquivo está sujo. Por favor, salve o arquivo **Configurações de Pasta** sob na pasta **{0}** e tente novamente.",
-+>>>>>>> .their
- 	"userTarget": "Configurações de Usuário",
- 	"workspaceTarget": "Configurações de Espaço de Trabalho",
- 	"folderTarget": "Configurações de pasta"
-changed in both
-  base   100644 b6410d713d7c1dc7e150334ef0a57144bf342ae1 i18n/rus/extensions/css/package.i18n.json
-  our    100644 f94884afe4ab08854717ecf9bfcce904b5da5115 i18n/rus/extensions/css/package.i18n.json
-  their  100644 db66fb21a3cccdf336514ede86c9b0e4b923bac9 i18n/rus/extensions/css/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,4 +9,76 @@
- 	],
- 	"displayName": "Основы языка CSS",
- 	"description": "Предоставляет подсветку синтаксиса и выделение парных скобок в файлах CSS, LESS и SCSS."
-+=======
-+	"css.title": "CSS",
-+	"css.lint.argumentsInColorFunction.desc": "Недопустимое число параметров",
-+	"css.lint.boxModel.desc": "Не использовать ширину или высоту при использовании поля или границы",
-+	"css.lint.compatibleVendorPrefixes.desc": "При использовании зависящего от поставщика префикса также указывайте все остальные свойства поставщика",
-+	"css.lint.duplicateProperties.desc": "Не использовать дублирующиеся определения стилей",
-+	"css.lint.emptyRules.desc": "Не использовать пустые наборы правил",
-+	"css.lint.float.desc": "Старайтесь не использовать \"float\". Из-за элементов \"float\" работа кода CSS может легко нарушиться, если изменить один из аспектов разметки.",
-+	"css.lint.fontFaceProperties.desc": "Правило @font-face должно определять свойства src и font-family",
-+	"css.lint.hexColorLength.desc": "Цвета в шестнадцатеричном формате должны содержать три или шесть шестнадцатеричных чисел",
-+	"css.lint.idSelector.desc": "Селекторы не должны содержать идентификаторов, потому что эти правила слишком тесно связаны с HTML.",
-+	"css.lint.ieHack.desc": "Полезные советы для Internet Explorer требуются только при поддержке Internet Explorer 7 и более ранних версий",
-+	"css.lint.important.desc": "Старайтесь не использовать !important, так как это признак того, что весь код CSS стал неуправляемым и его надо переработать.",
-+	"css.lint.importStatement.desc": "Операторы импорта не загружаются параллельно",
-+	"css.lint.propertyIgnoredDueToDisplay.desc": "Свойство проигнорировано из-за значения свойства display. Например, при \"display: inline\" свойства width, height, margin-top, margin-bottom и float не работают",
-+	"css.lint.universalSelector.desc": "Универсальный селектор (*) работает медленно",
-+	"css.lint.unknownProperties.desc": "Неизвестное свойство.",
-+	"css.lint.unknownVendorSpecificProperties.desc": "Неизвестное свойство поставщика.",
-+	"css.lint.vendorPrefix.desc": "При использовании зависящего от поставщика префикса также указывайте стандартное свойство",
-+	"css.lint.zeroUnits.desc": "Для нуля не требуется единица измерения",
-+	"css.trace.server.desc": "Отслеживает обмен данными между VS Code и языковым сервером CSS.",
-+	"css.validate.title": "Управляет проверкой CSS и серьезностью проблем.",
-+	"css.validate.desc": "Включает или отключает все проверки",
-+	"less.title": "LESS",
-+	"less.lint.argumentsInColorFunction.desc": "Недопустимое число параметров",
-+	"less.lint.boxModel.desc": "Не использовать ширину или высоту при использовании поля или границы",
-+	"less.lint.compatibleVendorPrefixes.desc": "При использовании зависящего от поставщика префикса также указывайте все остальные свойства поставщика",
-+	"less.lint.duplicateProperties.desc": "Не использовать дублирующиеся определения стилей",
-+	"less.lint.emptyRules.desc": "Не использовать пустые наборы правил",
-+	"less.lint.float.desc": "Старайтесь не использовать \"float\". Из-за элементов \"float\" работа кода CSS может легко нарушиться, если изменить один из аспектов разметки.",
-+	"less.lint.fontFaceProperties.desc": "Правило @font-face должно определять свойства src и font-family",
-+	"less.lint.hexColorLength.desc": "Цвета в шестнадцатеричном формате должны содержать три или шесть шестнадцатеричных чисел",
-+	"less.lint.idSelector.desc": "Селекторы не должны содержать идентификаторов, потому что эти правила слишком тесно связаны с HTML.",
-+	"less.lint.ieHack.desc": "Полезные советы для Internet Explorer требуются только при поддержке Internet Explorer 7 и более ранних версий",
-+	"less.lint.important.desc": "Старайтесь не использовать !important, так как это признак того, что весь код CSS стал неуправляемым и его надо переработать.",
-+	"less.lint.importStatement.desc": "Операторы импорта не загружаются параллельно",
-+	"less.lint.propertyIgnoredDueToDisplay.desc": "Свойство проигнорировано из-за значения свойства display. Например, при \"display: inline\" свойства width, height, margin-top, margin-bottom и float не работают",
-+	"less.lint.universalSelector.desc": "Универсальный селектор (*) работает медленно",
-+	"less.lint.unknownProperties.desc": "Неизвестное свойство.",
-+	"less.lint.unknownVendorSpecificProperties.desc": "Неизвестное свойство поставщика.",
-+	"less.lint.vendorPrefix.desc": "При использовании зависящего от поставщика префикса также указывайте стандартное свойство",
-+	"less.lint.zeroUnits.desc": "Для нуля не требуется единица измерения",
-+	"less.validate.title": "Управляет проверкой LESS и уровнями серьезности проблем. ",
-+	"less.validate.desc": "Включает или отключает все проверки",
-+	"scss.title": "SCSS (SASS)",
-+	"scss.lint.argumentsInColorFunction.desc": "Недопустимое число параметров",
-+	"scss.lint.boxModel.desc": "Не использовать ширину или высоту при использовании поля или границы",
-+	"scss.lint.compatibleVendorPrefixes.desc": "При использовании зависящего от поставщика префикса также указывайте все остальные свойства поставщика",
-+	"scss.lint.duplicateProperties.desc": "Не использовать дублирующиеся определения стилей",
-+	"scss.lint.emptyRules.desc": "Не использовать пустые наборы правил",
-+	"scss.lint.float.desc": "Старайтесь не использовать \"float\". Из-за элементов \"float\" работа кода CSS может легко нарушиться, если изменить один из аспектов разметки.",
-+	"scss.lint.fontFaceProperties.desc": "Правило @font-face должно определять свойства src и font-family",
-+	"scss.lint.hexColorLength.desc": "Цвета в шестнадцатеричном формате должны содержать три или шесть шестнадцатеричных чисел",
-+	"scss.lint.idSelector.desc": "Селекторы не должны содержать идентификаторов, потому что эти правила слишком тесно связаны с HTML.",
-+	"scss.lint.ieHack.desc": "Полезные советы для Internet Explorer требуются только при поддержке Internet Explorer 7 и более ранних версий",
-+	"scss.lint.important.desc": "Старайтесь не использовать !important, так как это признак того, что весь код CSS стал неуправляемым и его надо переработать.",
-+	"scss.lint.importStatement.desc": "Операторы импорта не загружаются параллельно",
-+	"scss.lint.propertyIgnoredDueToDisplay.desc": "Свойство проигнорировано из-за значения свойства display. Например, при \"display: inline\" свойства width, height, margin-top, margin-bottom и float не работают",
-+	"scss.lint.universalSelector.desc": "Универсальный селектор (*) работает медленно",
-+	"scss.lint.unknownProperties.desc": "Неизвестное свойство.",
-+	"scss.lint.unknownVendorSpecificProperties.desc": "Неизвестное свойство поставщика.",
-+	"scss.lint.vendorPrefix.desc": "При использовании зависящего от поставщика префикса также указывайте стандартное свойство",
-+	"scss.lint.zeroUnits.desc": "Для нуля не требуется единица измерения",
-+	"scss.validate.title": "Управляет проверкой SCSS и уровнями серьезности проблем.",
-+	"scss.validate.desc": "Включает или отключает все проверки",
-+	"less.colorDecorators.enable.desc": "Включает или отключает декораторы цвета.",
-+	"scss.colorDecorators.enable.desc": "Включает или отключает декораторы цвета.",
-+	"css.colorDecorators.enable.desc": "Включает или отключает декораторы цвета.",
-+	"css.colorDecorators.enable.deprecationMessage": "Параметр \"css.colorDecorators.enable\" устарел. Теперь вместо него используется параметр \"editor.colorDecorators\". ",
-+	"scss.colorDecorators.enable.deprecationMessage": "Параметр \"scss.colorDecorators.enable\" устарел. Теперь вместо него используется параметр \"editor.colorDecorators\". ",
-+	"less.colorDecorators.enable.deprecationMessage": "Параметр \"less.colorDecorators.enable\" устарел. Теперь вместо него используется параметр \"editor.colorDecorators\". "
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/extensions/grunt/out/main.i18n.json
-  our    100644 41900393afd077155d9d4b0f35df014246a6a799 i18n/rus/extensions/grunt/out/main.i18n.json
-  their  100644 2de2f8e27194260749619a25e42590a559bcf90c i18n/rus/extensions/grunt/out/main.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"execFailed": "Не удалось автоматически определить задания Grunt для папки {0}. Ошибка: {1}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/extensions/gulp/out/main.i18n.json
-  our    100644 08a7f70824a17eb6b71465c76e5aac6971e95e21 i18n/rus/extensions/gulp/out/main.i18n.json
-  their  100644 21e246af6b3d7070ff9d7f696a61784efdc83030 i18n/rus/extensions/gulp/out/main.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"execFailed": "Не удалось автоматически определить задания gulp для папки {0}. Ошибка: {1}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/extensions/jake/out/main.i18n.json
-  our    100644 9870397c070903588a7070f76e05650d352b8243 i18n/rus/extensions/jake/out/main.i18n.json
-  their  100644 7a33b80be29644c31c9e8aef594c4e6031cc58e3 i18n/rus/extensions/jake/out/main.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"execFailed": "Не удалось автоматически определить задания Jake для папки {0}. Ошибка: {1}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 d5553161f35ab8dd1aa089b77ede0433171f4d86 i18n/rus/src/vs/code/electron-main/menus.i18n.json
-  our    100644 6c6420ff3fff2721736f81d703d8eb2e0907f38c i18n/rus/src/vs/code/electron-main/menus.i18n.json
-  their  100644 683007474d8d0ff1d88fb29ebc2cc26f584d4bd6 i18n/rus/src/vs/code/electron-main/menus.i18n.json
-changed in both
-  base   100644 6d52d829bc3db1cfba904a6b5e90797e8b226eba i18n/rus/src/vs/code/electron-main/windows.i18n.json
-  our    100644 d379d233127c99cdfb618689fe034d97e0544e27 i18n/rus/src/vs/code/electron-main/windows.i18n.json
-  their  100644 44f93a90db1acd18cf91b7da28909580520648e1 i18n/rus/src/vs/code/electron-main/windows.i18n.json
-changed in both
-  base   100644 9ba3271eec95b49e56c5ae479462a9ed384130b2 i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 66cf48db0f575d6b4f93e4e908a24029fed35a72 i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 33c7717b2f8381adde0a0caf39aa5bca48f5b5e5 i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -12,11 +12,15 @@
- 	"fontSize": "Управляет размером шрифта в пикселях.",
- 	"lineHeight": "Управляет высотой строк. Укажите 0 для вычисления высоты строки по размеру шрифта.",
- 	"letterSpacing": "Управляет интервалом между буквами в пикселях.",
-+<<<<<<< .our
- 	"lineNumbers.off": "Номера строк не отображаются.",
- 	"lineNumbers.on": "Отображаются абсолютные номера строк.",
- 	"lineNumbers.relative": "Отображаемые номера строк вычисляются как расстояние в строках до положения курсора.",
- 	"lineNumbers.interval": "Номера строк отображаются каждые 10 строк.",
- 	"lineNumbers": "Управляет отображением номеров строк.",
-+=======
-+	"lineNumbers": "Управляет видимостью номеров строк. Возможные значения: \"on\", \"off\" и \"relative\". Значение \"relative\" показывает количество строк, начиная с текущего положения курсора.",
-+>>>>>>> .their
- 	"rulers": "Отображать вертикальные линейки после определенного числа моноширинных символов. Для отображения нескольких линеек укажите несколько значений. Если не указано ни одного значения, вертикальные линейки отображаться не будут.",
- 	"wordSeparators": "Символы, которые будут использоваться как разделители слов при выполнении навигации или других операций, связанных со словами.",
- 	"tabSize": "Число пробелов в табуляции. Этот параметр переопределяется на основе содержимого файла, если установлен параметр \"editor.detectIndentation\".",
-@@ -107,10 +111,13 @@
- 	"links": "Определяет, должен ли редактор определять ссылки и делать их доступными для щелчка",
- 	"colorDecorators": "Определяет, должны ли в редакторе отображаться внутренние декораторы цвета и средство выбора цвета.",
- 	"codeActions": "Включает индикатор действия кода",
-+<<<<<<< .our
- 	"codeActionsOnSave.organizeImports": "Упорядочить импорты при сохранении?",
- 	"codeActionsOnSave": "Типы действий кода, которые будут выполнены при сохранении.",
- 	"codeActionsOnSaveTimeout": "Время ожидания для действий кода, которые будут выполнены при сохранении.",
- 	"selectionClipboard": "Контролирует, следует ли поддерживать первичный буфер обмена Linux.",
-+=======
-+>>>>>>> .their
- 	"sideBySide": "Определяет, как редактор несовпадений отображает отличия: рядом или в тексте.",
- 	"ignoreTrimWhitespace": "Определяет, должен ли редактор несовпадений трактовать несовпадения символов-разделителей как различия.",
- 	"largeFileOptimizations": "Специальная обработка для больших файлов с отключением некоторых функций, которые интенсивно используют память.",
-changed in both
-  base   100644 6fb3e1373cebec97d19a232010186e697f9e0241 i18n/rus/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 9d3bc679fc1f2c06c947cdc33c9616b8b522920c i18n/rus/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 4801d2ec386d6b4bfbe0889515045812867e8c2d i18n/rus/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -30,10 +30,14 @@
- 	"warningBorder": "Цвет границ волнистой линии для выделения предупреждений в редакторе.",
- 	"infoForeground": "Цвет волнистой линии для выделения информационных сообщений в редакторе.",
- 	"infoBorder": "Цвет границ волнистой линии для выделения информационных сообщений в редакторе. ",
-+<<<<<<< .our
- 	"hintForeground": "Цвет волнистой линии для выделения подсказок в редакторе.",
- 	"hintBorder": "Цвет границ волнистой линии для выделения подсказок в редакторе. ",
- 	"unnecessaryForeground": "Цвет переднего плана ненужного кода в редакторе.",
- 	"overviewRulerRangeHighlight": "Цвет метки линейки в окне просмотра для выделений диапазонов. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
-+=======
-+	"overviewRulerRangeHighlight": "Цвет метки линейки в окне просмотра для выделений диапазонов.",
-+>>>>>>> .their
- 	"overviewRuleError": "Цвет метки линейки в окне просмотра для ошибок.",
- 	"overviewRuleWarning": "Цвет метки линейки в окне просмотра для предупреждений.",
- 	"overviewRuleInfo": "Цвет метки линейки в окне просмотра для информационных сообщений."
-changed in both
-  base   100644 6b77834c3913bd2e2a3ea93a6a29ea9f6ddedbe2 i18n/rus/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  our    100644 c6bce4e5b081d94db7fb3a1598287f67537f7b4f i18n/rus/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  their  100644 b8216927851de334ae4cceeeb5443a2820d5e776 i18n/rus/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 b078834959acd9914a41a818ad28c3f0d1073ee3 i18n/rus/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 60e5e887ae41d0c2770bdb1306a52fd5bbf7375a i18n/rus/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 eb6770aa30bf8b69247d77c5e6d898cb0d84ade2 i18n/rus/src/vs/platform/environment/node/argv.i18n.json
-@@ -12,11 +12,17 @@
- 	"goto": "Открытие файла по указанному пути с выделением указанного символа в указанной строке.",
- 	"newWindow": "Принудительно открыть новое окно.",
- 	"reuseWindow": "Принудительно открыть файл или папку в последнем активном окне.",
-+<<<<<<< .our
- 	"wait": "Дождаться закрытия файлов перед возвратом.",
- 	"locale": "Языковой стандарт, который следует использовать (например, en-US или zh-TW).",
- 	"userDataDir": "Указывает каталог, в котором хранятся данные пользователей. Может использоваться для открытия нескольких отдельных экземпляров Code.",
- 	"version": "Печать версии.",
- 	"help": "Распечатать данные об использовании.",
-+=======
-+	"userDataDir": "Указывает каталог, в котором хранятся данные пользователей, используется в случае выполнения от имени привилегированного пользователя.",
-+	"verbose": "Печать подробного вывода (подразумевает использование параметра \"--wait\").",
-+	"wait": "Дождаться закрытия файлов перед возвратом.",
-+>>>>>>> .their
- 	"extensionHomePath": "Задайте корневой путь для расширений.",
- 	"listExtensions": "Перечислить существующие расширения.",
- 	"showVersions": "Показать версии установленных расширений при указании параметра --list-extension.",
-changed in both
-  base   100644 0e8a5193ce9da462324e1228dba3c212f6afb322 i18n/rus/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 b5b010a1ed08e7bd0639632258a4ace9da636f30 i18n/rus/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 16024062ff71ddd13bc28660f82eea7c1ce98534 i18n/rus/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -7,10 +7,18 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"invalidManifest": "Недопустимое расширение: package.json не является файлом JSON.",
-+<<<<<<< .our
- 	"incompatible": "Не удалось установить расширение '{0}', так как оно не совместимо с Code '{1}'.",
- 	"restartCode": "Перезапустите код перед переустановкой {0}.",
- 	"installingOutdatedExtension": "Уже установлена более новая версия этого расширения. Вы хотите переопределить ее более старой версией?",
- 	"override": "Переопределить",
-+=======
-+	"restartCodeLocal": "Перезапустите код перед переустановкой {0}.",
-+	"restartCodeGallery": "Перезапустите Code перед повторной установкой.",
-+	"uninstallDependeciesConfirmation": "Вы хотите удалить \"{0}\" отдельно или вместе с зависимостями?",
-+	"uninstallOnly": "Только",
-+	"uninstallAll": "Все",
-+>>>>>>> .their
- 	"cancel": "Отмена",
- 	"errorInstallingDependencies": "Ошибка при установке зависимостей. {0}",
- 	"MarketPlaceDisabled": "Marketplace не включен",
-changed in both
-  base   100644 fc0e79cc2604ad4d89bceb6b7a708da1c658bd54 i18n/rus/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
-  our    100644 8d9d6a48ce34a974c867208292d4d791a55b7fee i18n/rus/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
-  their  100644 c5f432f019cf1a497b200e1a9b835a3c1df6418c i18n/rus/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
-@@ -19,8 +19,11 @@
- 	"vscode.extension.activationEvents.onLanguage": "Событие активации выдается каждый раз, когда открывается файл, который разрешается к указанному языку.",
- 	"vscode.extension.activationEvents.onCommand": "Событие активации выдается каждый раз при вызове указанной команды.",
- 	"vscode.extension.activationEvents.onDebug": "Событие активации выдается каждый раз, когда пользователь запускает отладку или собирается установить конфигурацию отладки.",
-+<<<<<<< .our
- 	"vscode.extension.activationEvents.onDebugInitialConfigurations": "Событие активации выдается каждый раз, когда необходимо создать файл \"launch.json\" (и вызывать все методы provideDebugConfigurations).",
- 	"vscode.extension.activationEvents.onDebugResolve": "Событие активации выдается каждый раз при запуске сеанса отладки указанного типа (и при вызове соответствующего метода resolveDebugConfiguration).",
-+=======
-+>>>>>>> .their
- 	"vscode.extension.activationEvents.workspaceContains": "Событие активации выдается каждый раз при открытии папки, содержащей по крайней мере один файл, который соответствует указанной стандартной маске.",
- 	"vscode.extension.activationEvents.onView": "Событие активации выдается каждый раз при развертывании указанного окна.",
- 	"vscode.extension.activationEvents.star": "Событие активации выдается при запуске VS Code. Для удобства пользователя используйте это событие в своем расширении только в том случае, если другие сочетания событий не подходят.",
-changed in both
-  base   100644 88665d47b9328dec5a96ba4fce1e78fc5c77060d i18n/rus/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
-  our    100644 ce0c503ab7ee9f128d46cefefff7f6fecd14741c i18n/rus/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
-  their  100644 651ebfe5a8df373890365993f7a8e36077b2199e i18n/rus/src/vs/platform/theme/common/colorExtensionPoint.i18n.json
-changed in both
-  base   100644 1ad62d4bc9b7c09c55cf66817445d2eecc83549e i18n/rus/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-  our    100644 5beb5d197c986d03c69303b0d445df5dbc5cfad5 i18n/rus/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-  their  100644 56be368eede06b32cff03640751963b0f8a21562 i18n/rus/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-@@ -13,12 +13,18 @@
- 	"vscode.extension.contributes.view.name": "Понятное имя представления. Будет отображаться на экране",
- 	"vscode.extension.contributes.view.when": "Условие, которое должно иметь значение 'true', чтобы отображалось это представление",
- 	"vscode.extension.contributes.views": "Добавляет представления в редактор",
-+<<<<<<< .our
- 	"views.explorer": "Добавляет представления в контейнер обозревателя на панели действий",
- 	"views.debug": "Добавляет представления в контейнер отладки на панели действий",
- 	"views.scm": "Добавляет представления в контейнер диспетчера служб на панели действий ",
- 	"views.test": "Добавляет представления в контейнер проверки на панели действий ",
- 	"views.contributed": "Добавляет представления в контейнер добавленных представлений",
- 	"ViewContainerDoesnotExist": "Контейнер представлений '{0}' не существует, и все представления, зарегистрированные в этом контейнере, будут добавлены в обозреватель.",
-+=======
-+	"views.explorer": "Представление проводника",
-+	"views.debug": "Представление отладки",
-+	"locationId.invalid": "\"{0}\" не является допустимым расположением представления",
-+>>>>>>> .their
- 	"duplicateView1": "Не удается зарегистрировать несколько представлений с одинаковым идентификатором '{0}' в расположении '{1}'",
- 	"duplicateView2": "Представление с идентификатором '{0}' уже зарегистрировано в расположении '{1}'"
- }
-\ No newline at end of file
-changed in both
-  base   100644 b82df283bae91b0042144edceb85e0a6a58b520b i18n/rus/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 c446918f7398d91df096414504ebb365f7b433fb i18n/rus/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 3dc67610b9461600aab955b5039991632745beb4 i18n/rus/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -15,5 +15,9 @@
- 	"saveWorkspace": "Сохранить рабочую область",
- 	"openWorkspaceAction": "Открыть рабочую область...",
- 	"openWorkspaceConfigFile": "Открыть файл конфигурации рабочей области",
-+<<<<<<< .our
- 	"duplicateWorkspaceInNewWindow": "Создать копию рабочей области в новом окне"
-+=======
-+	"workspaceFolderPickerPlaceholder": "Выберите папку рабочей области"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 393b1e55fe555b5c3bccece2611e702147267e1a i18n/rus/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 99aca234c7b93506a14c237c3960c0558fba20a4 i18n/rus/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 86a745f5204df3676aec3a3f41392afa0bd0caef i18n/rus/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 3b9f50c195a21039e98fe36f0be7866edd96868d i18n/rus/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-  our    100644 27ce51b004b167f93d4d65682e4145526dd9ae1d i18n/rus/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-  their  100644 c38e7f9a12a3d81cf06218e43839aa0d262f9f32 i18n/rus/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-@@ -55,5 +55,9 @@
- 	"screenReaderDetectedExplanation.answerYes": "Да",
- 	"screenReaderDetectedExplanation.answerNo": "Нет",
- 	"screenReaderDetectedExplanation.body1": "Теперь среда VS Code оптимизирована для средства чтения с экрана.",
-+<<<<<<< .our
- 	"screenReaderDetectedExplanation.body2": "Некоторые функции редактора (например, перенос слов, сворачивание и т.д.) будут работать по-другому."
-+=======
-+	"screenReaderDetectedExplanation.body2": "Некоторые функции редактора (например, перенос слов, сворачивание, автоматическая вставка закрывающих скобок и т.д.) будут работать по-другому."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 cb0068c301afb51cc6e4e61f00631f826a357508 i18n/rus/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 266dadc0ddcb2cfb8391eafba4890dbacea4172b i18n/rus/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 be259940bc0df6abea817ff717dd34411ec8c19f i18n/rus/src/vs/workbench/electron-browser/actions.i18n.json
-@@ -49,7 +49,11 @@
- 	"showNextWindowTab": "Показать следующую вкладку в окне",
- 	"moveWindowTabToNewWindow": "Переместить вкладку окна в новое окно",
- 	"mergeAllWindowTabs": "Объединить все окна",
-+<<<<<<< .our
- 	"toggleWindowTabsBar": "Переключить панель вкладок окна",
- 	"about": "О программе {0}",
- 	"inspect context keys": "Проверить ключи контекста"
-+=======
-+	"toggleWindowTabsBar": "Переключить панель вкладок окна"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e0e8cd01de8f24928d7b0076e65c53d62f53c1c4 i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 bdb5e10a72aa6a97a13c01acd6d5626456147e68 i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 1de29e6dd0edd249196c06fbd52fd7368cb517ad i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -13,9 +13,15 @@
- 	"developer": "Разработчик",
- 	"workbenchConfigurationTitle": "Workbench",
- 	"showEditorTabs": "Определяет, должны ли открытые редакторы отображаться на вкладках или нет.",
-+<<<<<<< .our
- 	"workbench.editor.labelFormat.default": "Отображать имя файла. Если вкладки включены и в одной группе есть два файла с одинаковыми именами, то к имени каждого из этих файлов будут добавлены различающиеся части пути. Если вкладки отключены, то для активного редактора отображается путь по отношению к папке рабочей области.",
- 	"workbench.editor.labelFormat.short": "Отображать имя файла и имя каталога.",
- 	"workbench.editor.labelFormat.medium": "Отображать имя файла и путь к файлу относительно папки рабочей области.",
-+=======
-+	"workbench.editor.labelFormat.default": "Отображать имя файла. Если вкладки включены и в одной группе есть два файла с одинаковыми именами, будут добавлены различающиеся части пути к каждому из этих файлов. Если вкладки отключены, то для активного редактора отображается путь по отношению к корневому каталогу рабочей области.",
-+	"workbench.editor.labelFormat.short": "Отображать имя файла и имя каталога.",
-+	"workbench.editor.labelFormat.medium": "Отображать имя файла и путь к файлу относительно корневого каталога рабочей области.",
-+>>>>>>> .their
- 	"workbench.editor.labelFormat.long": "Отображать имя файла и абсолютный путь.",
- 	"tabDescription": "Определяет формат метки редактора. Изменив этот параметр, можно сделать более наглядным расположение файла:\n- короткий формат: 'parent'\n- средний формат: 'workspace/src/parent'\n- длинный формат: '/home/user/workspace/src/parent'\n- по умолчанию: '.../parent', если другая вкладка имеет такой же заголовок или относительный путь к рабочей области, если вкладки отключены",
- 	"editorTabCloseButton": "Определяет положение кнопок закрытия вкладок редактора или отключает их, если задано значение off.",
-changed in both
-  base   100644 177e66e9e737e3d6ff167f470dab81c1397b14ec i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
-  our    100644 c29cfd8de53bb4d16c8eddd598aa305db5676eb4 i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
-  their  100644 b42f22c888061c290d8d95f28d9d13ea2efb49fe i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.i18n.json
-changed in both
-  base   100644 ee52447b162947169085de03f59487ca1a016fee i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 23eb63e486d254cf5d707329f4a13e4ae0e33119 i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 3333c4ffeb25ee6facd70f2d32e5816697229ecb i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -17,8 +17,12 @@
- 	"multipleConfigurationNamesInWorkspace": "В рабочей области есть несколько конфигураций запуска \"{0}\". Используйте имя папки для определения конфигурации.",
- 	"noFolderWithName": "Не удается найти папку с именем '{0}' для конфигурации '{1}' в составном объекте '{2}'.",
- 	"configMissing": "Конфигурация \"{0}\" отсутствует в launch.json.",
-+<<<<<<< .our
- 	"launchJsonDoesNotExist": "Файл \"launch.json\" не существует.",
- 	"debugRequestNotSupported": "Атрибут '{0}' имеет неподдерживаемое значение '{1}' в выбранной конфигурации отладки.",
-+=======
-+	"debugRequestNotSupported": "В выбранной конфигурации отладки указано неподдерживаемое значение атрибута '{0}': '{1}'.",
-+>>>>>>> .their
- 	"debugRequesMissing": "В выбранной конфигурации отладки отсутствует атрибут '{0}'.",
- 	"debugTypeNotSupported": "Настроенный тип отладки \"{0}\" не поддерживается.",
- 	"debugTypeMissing": "Отсутствует свойство \"type\" для выбранной конфигурации запуска.",
-changed in both
-  base   100644 b56949c4101a13d77a45784ba8043515820b361b i18n/rus/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-  our    100644 80214fe333933c85dc938913564565da17a68e22 i18n/rus/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-  their  100644 00a5bd00b41d261fe19a731e00d1cce1f98dd741 i18n/rus/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-@@ -34,10 +34,13 @@
- 	"view id": "Идентификатор",
- 	"view name": "Имя",
- 	"view location": "Где",
-+<<<<<<< .our
- 	"localizations": "Локализации ({0})",
- 	"localizations language id": "Идентификатор языка",
- 	"localizations language name": "Название языка",
- 	"localizations localized language name": "Название языка (локализованное)",
-+=======
-+>>>>>>> .their
- 	"colorThemes": "Цветовые темы ({0})",
- 	"iconThemes": "Темы значков ({0})",
- 	"colors": "Цвета ({0})",
-changed in both
-  base   100644 6c4879d3c3f51b5800517f47b68e4a84e7e01867 i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 bd475832dcfff4640327a5b72df263d4356ba205 i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 9f7ebdfbc583eac2b6d98b2e3da47819f7143ed2 i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-@@ -56,11 +56,15 @@
- 	"OpenExtensionsFile.failed": "Не удается создать файл \"extensions.json\" в папке \".vscode\" ({0}).",
- 	"configureWorkspaceRecommendedExtensions": "Настроить рекомендуемые расширения (рабочая область)",
- 	"configureWorkspaceFolderRecommendedExtensions": "Настроить рекомендуемые расширения (папка рабочей области)",
-+<<<<<<< .our
- 	"malicious tooltip": "Это расширение помечено как проблемное.",
- 	"malicious": "Вредоносный",
- 	"disabled": "Отключено",
- 	"disabled globally": "Отключено",
- 	"disabled workspace": "Отключено для этой рабочей области",
-+=======
-+	"builtin": "Встроенное",
-+>>>>>>> .their
- 	"disableAll": "Отключить все установленные расширения",
- 	"disableAllWorkspace": "Отключить все установленные расширения для этой рабочей области",
- 	"enableAll": "Включить все расширения",
-changed in both
-  base   100644 1034adcf6b0c526833c3c9ca988f9cd1ba7730b2 i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 11278b85abb135a3195540e01213542dadbc0081 i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 150e4832ad9a6792924d217623882cf5ea837d38 i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -14,11 +14,17 @@
- 	"workspaceRecommendation": "Это расширение рекомендуется пользователями текущей рабочей области.",
- 	"reallyRecommended2": "Для этого типа файлов рекомендуется использовать расширение '{0}'.",
- 	"reallyRecommendedExtensionPack": "Для этого типа файлов рекомендуется использовать пакет расширений '{0}'.",
-+<<<<<<< .our
- 	"install": "Установить",
-+=======
-+>>>>>>> .their
- 	"showRecommendations": "Показать рекомендации",
- 	"showLanguageExtensions": "В Marketplace есть расширения для работы с файлами '.{0}'",
- 	"workspaceRecommended": "Эта рабочая область включает рекомендации по расширениям.",
-+<<<<<<< .our
- 	"installAll": "Установить все",
-+=======
-+>>>>>>> .their
- 	"ignoreExtensionRecommendations": "Вы действительно хотите проигнорировать все рекомендации по расширениям?",
- 	"ignoreAll": "Да, игнорировать все",
- 	"no": "Нет"
-changed in both
-  base   100644 a46c73f42cc900fd6667a54ec2d4600994c6526a i18n/rus/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 a4725d2faef4b5a6c23ee7c2ecc46a16530b3341 i18n/rus/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 7f5602d12668d4ef3388714d4e4f791993c659cc i18n/rus/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-changed in both
-  base   100644 83ec78cab1e5867d9a2c3d960d3f49b6aafcfb1c i18n/rus/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json
-  our    100644 d94fb37ebe784f6c2f6c62f3d92ed0ad354d97cf i18n/rus/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json
-  their  100644 b2007310ead3e4891b8c7f753d671ee3cf5d0150 i18n/rus/src/vs/workbench/parts/files/common/dirtyFilesTracker.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"dirtyFile": "1 несохраненный файл",
- 	"dirtyFiles": "Несохраненных файлов: {0}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8aaaf54a7a25070a4bf886f26169e4a645ac7875 i18n/rus/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  our    100644 6b3cd3ed9a812c6397a2bcc6a3a3ba5e711fc058 i18n/rus/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  their  100644 d61548e8be2d3a973d21af3961f6af0bc671283d i18n/rus/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,11 @@
- 	],
- 	"scm providers": "Поставщики систем управления версиями",
- 	"hideRepository": "Скрыть",
-+=======
-+	"scm providers": "Поставщики систем управления версиями",
-+	"hideRepository": "Скрыть",
-+	"commitMessage": "Message (press {0} to commit)",
-+>>>>>>> .their
- 	"installAdditionalSCMProviders": "Установить дополнительных поставщиков SCM...",
- 	"no open repo": "Отсутствуют активные поставщики систем управления версиями.",
- 	"source control": "Система управления версиями",
-changed in both
-  base   100644 8c220bbce30b2d13576aca5f10f23271cd10f882 i18n/rus/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
-  our    100644 e024fba5eea27faef8520f42bdcb15ef40bb3982 i18n/rus/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
-  their  100644 9c6c8d802ca01b69770289b9a54fe6095b9e768f i18n/rus/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"snippet.suggestions.label": "Вставить фрагмент кода",
- 	"sep.userSnippet": "Фрагменты кода пользователя",
- 	"sep.extSnippet": "Фрагменты кода расширения"
-changed in both
-  base   100644 7d6c740e5bcc307dce540d03718c161fb31e95c3 i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  our    100644 6a37d94b67d26daf129e538d4e91992157d2b014 i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 8f0ce17a110a4307a899d1825a21229e3de9237f i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-@@ -13,8 +13,14 @@
- 	"vscode.extension.contributes.snippets": "Добавляет фрагменты.",
- 	"vscode.extension.contributes.snippets-language": "Идентификатор языка, для которого добавляется этот фрагмент.",
- 	"vscode.extension.contributes.snippets-path": "Путь к файлу фрагментов. Путь указывается относительно папки расширения и обычно начинается с \"./snippets/\".",
-+<<<<<<< .our
- 	"badVariableUse": "Похоже, что в одном или нескольких фрагментах расширения \"{0}\" перепутаны переменные и заполнители. Дополнительные сведения см. на странице https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax.",
- 	"badFile": "Не удалось прочитать файл фрагмента \"{0}\".",
-+=======
-+	"badFile": "Не удалось прочитать файл фрагмента \"{0}\".",
-+	"badVariableUse": "Похоже, во фрагменте \"{0}\" перепутаны переменные и заполнители. Дополнительные сведения см. на странице https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax.",
-+	"source.snippet": "Фрагмент кода пользователя",
-+>>>>>>> .their
- 	"detail.snippet": "{0} ({1})",
- 	"snippetSuggest.longLabel": "{0}, {1}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 56cb2f5fe566dc104b5ee9a009494512a0c7e204 i18n/rus/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 3ad2e6ca5f31ca94a9cdd8a18a046b2a9773636b i18n/rus/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 6e4e63c216e0ad2f578efd4585fea1f85a5dccac i18n/rus/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -17,8 +17,11 @@
- 	"runningTasks": "Показать выполняемые задачи",
- 	"tasks": "Задачи",
- 	"TaskSystem.noHotSwap": "Чтобы изменить подсистему выполнения задач, в которой запущена активная задача, необходимо перезагрузить окно",
-+<<<<<<< .our
- 	"reloadWindow": "Перезагрузить окно",
- 	"TaskServer.folderIgnored": "Папка {0} будет проигнорирована, так как в ней используется версия задач 0.1.0",
-+=======
-+>>>>>>> .their
- 	"TaskService.noBuildTask1": "Задача сборки не определена. Отметьте задачу с помощью \"isBuildCommand\" в файле tasks.json.",
- 	"TaskService.noBuildTask2": "Задача сборки не определена. Отметьте задачу с помощью группы 'build' в файле tasks.json.",
- 	"TaskService.noTestTask1": "Задача теста не определена. Отметьте задачу с помощью \"isTestCommand\" в файле tasks.json.",
-@@ -51,13 +54,23 @@
- 	"recentlyUsed": "недавно использованные задачи",
- 	"configured": "настроенные задачи",
- 	"detected": "обнаруженные задачи",
-+<<<<<<< .our
- 	"TaskService.ignoredFolder": "Следующие папки рабочей области будут проигнорированы, так как в них используется версия задач 0.1.0: {0}",
- 	"TaskService.notAgain": "Больше не показывать",
-+=======
-+	"TaskService.ignoredFolder": "Следующие папки рабочей области будут проигнорированы, так как в них используется версия задач 0.1.0:",
-+	"TaskService.notAgain": "Больше не показывать",
-+	"TaskService.ok": "ОК",
-+>>>>>>> .their
- 	"TaskService.pickRunTask": "Выберите задачу для запуска",
- 	"TaslService.noEntryToRun": "Задача для запуска не найдена. Настройте задачи...",
- 	"TaskService.fetchingBuildTasks": "Получение задач сборки...",
- 	"TaskService.pickBuildTask": "Выберите задачу сборки для запуска",
-+<<<<<<< .our
- 	"TaskService.noBuildTask": "Задача сборки для запуска отсутствует. Настройте задачи сборки...",
-+=======
-+	"TaskService.noBuildTask": "Задача сборки не найдена. Настройте задачи... ",
-+>>>>>>> .their
- 	"TaskService.fetchingTestTasks": "Получение задач тестирования...",
- 	"TaskService.pickTestTask": "Выберите задачу тестирования для запуска",
- 	"TaskService.noTestTaskTerminal": "Тестовая задача для запуска не найдена. Настройте задачи...",
-changed in both
-  base   100644 922550c51cb1f2213cd6c91e2bb75f809e710b42 i18n/rus/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
-  our    100644 85438793d7fbbc55accd0dfd6b6dfc2da7a7b3f9 i18n/rus/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
-  their  100644 05102c96f17d8eeb0bf919372adb18e3fb2a99f3 i18n/rus/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
-changed in both
-  base   100644 3360204c259dd15808d051461474feff6f215bb6 i18n/rus/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  our    100644 b7b348484d2ec81180585cec523e688a69bfd6fc i18n/rus/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  their  100644 a317034d2a3d8fa0293c5229873e134e440ae436 i18n/rus/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-changed in both
-  base   100644 3b888b1a880fcdaf8e431da218ecd13902f476b4 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 ea0d455fc7f4fc786ef2ef083f3b437a535a441a i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 05cb39eed74a0574fed1536560d0a61cf48c8605 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -53,6 +53,7 @@
- 	"workbench.action.terminal.hideFindWidget": "Скрыть мини-приложение поиска",
- 	"nextTerminalFindTerm": "Показать следующий найденный термин",
- 	"previousTerminalFindTerm": "Показать предыдущий найденный термин",
-+<<<<<<< .our
- 	"quickOpenTerm": "Переключить активный терминал",
- 	"workbench.action.terminal.scrollToPreviousCommand": "Перейти к предыдущей команде",
- 	"workbench.action.terminal.scrollToNextCommand": "Перейти к следующей команде",
-@@ -60,4 +61,7 @@
- 	"workbench.action.terminal.selectToNextCommand": "Выбрать следующую команду",
- 	"workbench.action.terminal.selectToPreviousLine": "Выделить текст до предыдущей строки",
- 	"workbench.action.terminal.selectToNextLine": "Выделить текст до следующей строки"
-+=======
-+	"quickOpenTerm": "Переключить активный терминал"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 3a2688c515c648212b96cc4c490842b7c49a7043 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 aca12bf1061a643000b1615902ead62bb39d5223 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 fc208588fb0fbe740f70c087d14259a8f43f705b i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -11,6 +11,9 @@
- 	"terminalCursor.foreground": "Цвет переднего плана курсора терминала.",
- 	"terminalCursor.background": "Цвет фона курсора терминала. Позволяет выбрать цвет символа, который перекрывается блочным курсором.",
- 	"terminal.selectionBackground": "Цвет фона выделения терминала.",
-+<<<<<<< .our
- 	"terminal.border": "Цвет границы, которая отделяет области в терминале. По умолчанию используется panel.border.",
-+=======
-+>>>>>>> .their
- 	"terminal.ansiColor": "Цвет ANSI \"{0}\" в терминале."
- }
-\ No newline at end of file
-changed in both
-  base   100644 a9a867d8cd56bb727a36be41ea01334205a462fc i18n/rus/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  our    100644 7ec1bcab6e599251e71e94e275c4cb230b6f85ec i18n/rus/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  their  100644 0a038573db21d818dc19d9ed7fc2f68d7dd070ac i18n/rus/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-@@ -11,6 +11,10 @@
- 	"welcomePage.start": "Запустить",
- 	"welcomePage.newFile": "Создать файл",
- 	"welcomePage.openFolder": "Открыть папку...",
-+<<<<<<< .our
-+=======
-+	"welcomePage.cloneGitRepository": "Клонировать репозиторий Git...",
-+>>>>>>> .their
- 	"welcomePage.addWorkspaceFolder": "Добавить папку в рабочую область...",
- 	"welcomePage.recent": "Последние",
- 	"welcomePage.moreRecent": "Дополнительные сведения...",
-changed in both
-  base   100644 2408ba056f81e667e11b93328381109ea73a3e01 i18n/rus/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 466dfbc590c46288cb65b00cb7bf87e50489e811 i18n/rus/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 6d87ae00932619db9d65ebbad1cfe3e69274c92f i18n/rus/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,11 @@
- 	],
- 	"openTasksConfiguration": "Открыть конфигурацию задач",
- 	"openLaunchConfiguration": "Открыть конфигурацию запуска",
-+=======
-+	"openTasksConfiguration": "Открыть конфигурацию задач",
-+	"openLaunchConfiguration": "Открыть конфигурацию запуска",
-+	"close": "Закрыть",
-+>>>>>>> .their
- 	"open": "Открыть параметры",
- 	"saveAndRetry": "Сохранить и повторить",
- 	"errorUnknownKey": "Не удалось записать в {0}, так как {1} не является зарегистрированной конфигурацией.",
-@@ -17,6 +23,7 @@
- 	"errorInvalidWorkspaceTarget": "Не удается изменить параметры рабочей области, так как {0} не поддерживает рабочие области в в рабочей области из нескольких папок.",
- 	"errorInvalidFolderTarget": "Не удается изменить параметры папок, так как ресурс не указан.",
- 	"errorNoWorkspaceOpened": "Не удается записать в {0}, так как не открыта ни одна рабочая область. Откройте рабочую область и повторите попытку.",
-+<<<<<<< .our
- 	"errorInvalidTaskConfiguration": "Не удается записать файл конфигурации задач. Откройте файл, исправьте ошибки и предупреждения и повторите попытку.",
- 	"errorInvalidLaunchConfiguration": "Не удается записать файл конфигурации запуска. Откройте файл, исправьте ошибки и предупреждения и повторите попытку.",
- 	"errorInvalidConfiguration": "Не удается выполнить запись в файл параметров пользователя. Откройте параметры пользователя, исправьте ошибки и предупреждения и повторите попытку. ",
-@@ -27,6 +34,18 @@
- 	"errorConfigurationFileDirty": "Не удается записать параметры пользователя, так как файл был изменен. Сохраните файл параметров пользователя и повторите попытку.",
- 	"errorConfigurationFileDirtyWorkspace": "Не удается записать параметры рабочей области, так как файл был изменен. Сохраните файл параметров рабочей области и повторите попытку. ",
- 	"errorConfigurationFileDirtyFolder": "Не удается записать параметры папки, так как файл был изменен. Сохраните файл параметров папки '{0}' и повторите попытку.",
-+=======
-+	"errorInvalidTaskConfiguration": "Не удается выполнить запись в файл задач. Откройте файл **Tasks**, исправьте ошибки и предупреждения и повторите попытку.",
-+	"errorInvalidLaunchConfiguration": "Не удается выполнить запись в файл запуска. Откройте файл **Launch**, исправьте ошибки и предупреждения и повторите попытку. ",
-+	"errorInvalidConfiguration": "Не удается выполнить запись в файл параметров пользователя. Откройте файл **User Settings**, исправьте ошибки и предупреждения и повторите попытку. ",
-+	"errorInvalidConfigurationWorkspace": "Не удается выполнить запись в файл параметров рабочей области. Откройте файл **Workspace Settings**, исправьте ошибки и предупреждения и повторите попытку. ",
-+	"errorInvalidConfigurationFolder": "Не удается выполнить запись в файл параметров папок. Откройте файл **Folder Settings** в папке **{0}**, исправьте ошибки и предупреждения и повторите попытку. ",
-+	"errorTasksConfigurationFileDirty": "Не удается выполнить запись параметров в файл задач, так как файл был изменен. Сохраните файл **Tasks Configuration** и повторите попытку.",
-+	"errorLaunchConfigurationFileDirty": "Не удается выполнить запись в файл запуска, так как файл был изменен. Сохраните файл **Launch Configuration** и повторите попытку.",
-+	"errorConfigurationFileDirty": "Не удается записать параметры пользователя, так как файл был изменен. Сохраните файл **User Settings** и повторите попытку.",
-+	"errorConfigurationFileDirtyWorkspace": "Не удается записать параметры рабочей области, так как файл был изменен. Сохраните файл **Workspace Settings** и повторите попытку. ",
-+	"errorConfigurationFileDirtyFolder": "Не удается записать параметры папок, так как файл был изменен. Сохраните файл **Folder Settings** в папке **{0}** и повторите попытку. ",
-+>>>>>>> .their
- 	"userTarget": "Параметры пользователя",
- 	"workspaceTarget": "Параметры рабочей области",
- 	"folderTarget": "Параметры папок"
-changed in both
-  base   100644 975e12c9b235034adae7b5df783bf9ca4d4507c2 i18n/rus/src/vs/workbench/services/files/node/fileService.i18n.json
-  our    100644 10de0847f46ee9702ad03a0d05b0874fadaa8148 i18n/rus/src/vs/workbench/services/files/node/fileService.i18n.json
-  their  100644 6e032cd387492b38b15de16b7cc68617cd4e47cb i18n/rus/src/vs/workbench/services/files/node/fileService.i18n.json
-@@ -11,8 +11,11 @@
- 	"fileNotModifiedError": "undefined",
- 	"fileTooLargeError": "Не удается открыть файл, так как он имеет слишком большой размер",
- 	"fileNotFoundError": "Файл не найден ({0})",
-+<<<<<<< .our
- 	"fileBinaryError": "Похоже, файл является двоичным, и его нельзя открыть как текстовый.",
- 	"filePermission": "Отсутствует разрешение на запись в файл ({0})",
-+=======
-+>>>>>>> .their
- 	"fileExists": "Создаваемый файл уже существует ({0})",
- 	"fileMoveConflict": "Невозможно переместить или скопировать файл, так как он уже существует в папке назначения.",
- 	"unableToMoveCopyError": "Невозможно переместить или скопировать файл, так как он заменил бы папку, в которой содержится.",
-changed in both
-  base   100644 cd79d1e6d7c4ecff014b74988aaf6800df6fc748 i18n/trk/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  our    100644 cf0aa1dfaf2b39bdf7038b0ab5c826f2430d60ca i18n/trk/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  their  100644 5ddafd4b6b978d2fd799290a45716122eb6bdef0 i18n/trk/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 b6cde91a3db74ad1d7ef4fe8ff8a1b561bd0933f i18n/trk/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-  our    100644 3c92c8ee5f97958caa95c84da374aba6a8cf8c6c i18n/trk/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-  their  100644 e786294f13038e6583e1852dd9dee2b1d3818999 i18n/trk/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-@@ -13,6 +13,7 @@
- 	"vscode.extension.contributes.view.name": "Görünümün insanlar tarafından okunabilir adı. Gösterilecektir",
- 	"vscode.extension.contributes.view.when": "Bu görünümü göstermek için doğru olması gereken koşul",
- 	"vscode.extension.contributes.views": "Görünümleri düzenleyiciye ekler.",
-+<<<<<<< .our
- 	"views.explorer": "Etkinlik Çubuğu'ndaki Gezgin kapsayıcısına görünümler ekler",
- 	"views.debug": "Etkinlik Çubuğu'ndaki Hata Ayıklama kapsayıcısına görünümler ekler",
- 	"views.scm": "Etkinlik Çubuğu'ndaki SCM kapsayıcısına görünümler ekler",
-@@ -21,4 +22,11 @@
- 	"ViewContainerDoesnotExist": "'{0}' görünüm kapsayıcısı mevcut değil ve ona kayıtlı tüm görünümler 'Explorer'a eklenecektir.",
- 	"duplicateView1": "`{1}` konumunda aynı `{0}` id'sine sahip birden çok görünüm kaydedilemiyor",
- 	"duplicateView2": "`{0}` id'sine sahip bir görünüm `{1}` konumunda zaten kayıtlı"
-+=======
-+	"views.explorer": "Gezgin Görünümü",
-+	"views.debug": "Hata Ayıklama Görünümü",
-+	"locationId.invalid": "`{0}` geçerli bir görünüm konumu değil",
-+	"duplicateView1": "`{1}` konumunda aynı `{0}` kimliğine sahip birden çok görünüm kaydedilemiyor",
-+	"duplicateView2": "`{0}` kimliğine sahip bir görünüm `{1}` konumunda zaten kayıtlı"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 48c31c797e6abee4f4525019643a8557560a2a74 i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 3b4248d45e7ecb01c6045e1c3d824ba835249478 i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 25a3a60a2ae5bb233cbe033a5de97636014be64a i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -17,8 +17,12 @@
- 	"multipleConfigurationNamesInWorkspace": "Çalışma alanında birden fazla '{0}' başlatma yapılandırması var. Yapılandırmayı belirtmek için klasör adını kullanın.",
- 	"noFolderWithName": "'{2}' bileşiğindeki '{1}' yapılandırması için '{0}' adlı klasör bulunamadı.",
- 	"configMissing": "'launch.json' dosyasında '{0}' yapılandırması eksik.",
-+<<<<<<< .our
- 	"launchJsonDoesNotExist": "'launch.json' mevcut değil.",
- 	"debugRequestNotSupported": "Seçilen hata ayıklama yapılandırılmasındaki '{0}' özniteliği desteklenmeyen '{1}' değeri içeriyor.",
-+=======
-+	"debugRequestNotSupported": "Seçilen hata ayıklama yapılandırması desteklenmeyen öznitelik değeri `{0}` içeriyor: '{1}'.",
-+>>>>>>> .their
- 	"debugRequesMissing": "'{0}' özniteliği seçilen hata ayıklama yapılandırılmasında eksik.",
- 	"debugTypeNotSupported": "Yapılandırılan hata ayıklama türü '{0}', desteklenmiyor.",
- 	"debugTypeMissing": "Seçilen başlatma yapılandırması için 'type' özelliği eksik.",
-changed in both
-  base   100644 640d11588c60ded3fd041dd0cb1160f47c861d64 i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 c1fd4a38b55f33cc75802aa90a13a4a917da2acc i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 278618bcfd831e9892315bf8de841137c64c82b0 i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -14,7 +14,10 @@
- 	"workspaceRecommendation": "Bu eklenti geçerli çalışma alanı kullanıcıları tarafından tavsiye ediliyor.",
- 	"reallyRecommended2": "'{0}' eklentisi bu dosya türü için tavsiye edilir.",
- 	"reallyRecommendedExtensionPack": "'{0}' eklenti paketi bu dosya türü için tavsiye edilir.",
-+<<<<<<< .our
- 	"install": "Yükle",
-+=======
-+>>>>>>> .their
- 	"showRecommendations": "Tavsiyeleri Göster",
- 	"showLanguageExtensions": "Markette '.{0}' dosyaları için yardımcı olabilecek eklentiler bulunuyor",
- 	"workspaceRecommended": "Bu çalışma alanı bazı eklentileri tavsiye ediyor.",
-removed in local
-  base   100644 13a6a715ec469a4d3811c652dcf38b209410b3fd npm-shrinkwrap.json
-  their  100644 593d13a9006e4cb75c7e2b4796e6ffda8264d551 npm-shrinkwrap.json
-changed in both
-  base   100644 ff6dd7480d3d6238e1b1a8ab3926adfb5fa8ca16 package.json
-  our    100644 d0e982ce0b76c5b1b5eb02b673e459e47f3353a4 package.json
-  their  100644 18b0ad33fb40f8d4d7e83b0aedc4cd523b8c6f94 package.json
-@@ -1,7 +1,13 @@
- {
-   "name": "code-oss-dev",
-+<<<<<<< .our
-   "version": "1.27.0",
-   "distro": "a4155d9780fbbc94ead6cb3017dd0fc3806c57b8",
-+=======
-+  "version": "1.17.2",
-+  "electronVersion": "1.7.7",
-+  "distro": "c2baeca34f80f25032ae9aa14ce1373f83bd22ef",
-+>>>>>>> .their
-   "author": {
-     "name": "Microsoft Corporation"
-   },
-changed in both
-  base   100755 f530bf283691d6d13df484274c8485147a82191a scripts/env.sh
-  our    100755 8f641759b2729b3183b0ad042c6927d1cb909098 scripts/env.sh
-  their  100755 35d09f66bb2c46f1b6ac14f5de26997b5e739fe6 scripts/env.sh
-changed in both
-  base   100755 02268eafd6efc4e60ff9a7f9e966df5e2b0ba302 scripts/npm.sh
-  our    100755 93562dd24d6cafd393720b9c41c6806789f84fbd scripts/npm.sh
-  their  100755 69c6d0c48aec64b9246a0a9029624d7e103e3c8a scripts/npm.sh
-changed in both
-  base   100755 2bfd21a20c727f8fe275157e30b12a1e3918b717 scripts/test-integration.sh
-  our    100755 d2225c4475d754de72e745def72814606c90f9a3 scripts/test-integration.sh
-  their  100755 d0154a4101dc58d09a3f03c721ebdf2608cf2ce5 scripts/test-integration.sh
-removed in local
-  base   100755 5d1d71a2da2cfa19b676f5ea03c0569c4c1c642a scripts/test-mocha.sh
-  their  100755 9aa16fa32410bb99babb3225bc6e36b81f3e42db scripts/test-mocha.sh
-changed in both
-  base   100755 157c6da2cc7966f7409ca80e8f7f63ff9e45270e scripts/test.sh
-  our    100755 ac96627846f2f5a50436b191657e491e77174b4e scripts/test.sh
-  their  100755 ce1e5e11856a63c4822c3749fba592f7a7b77410 scripts/test.sh
-changed in both
-  base   100644 ba0b37167ad3c5fc4560733711624c4323c5db12 src/vs/base/browser/ui/splitview/splitview.ts
-  our    100644 3f593b721e0e5f25237d90e4a9b2a29fb3997f1a src/vs/base/browser/ui/splitview/splitview.ts
-  their  100644 b90401d437f0cd105df631fe413ae449cb3b7c0b src/vs/base/browser/ui/splitview/splitview.ts
-@@ -86,6 +86,11 @@
- 	export function Split(index: number): SplitSizing { return { type: 'split', index }; }
- }
- 
-+enum State {
-+	Idle,
-+	Busy
-+}
-+
- export class SplitView implements IDisposable {
- 
- 	readonly orientation: Orientation;
-@@ -100,12 +105,15 @@
- 	private sashItems: ISashItem[] = [];
- 	private sashDragState: ISashDragState;
- 	private state: State = State.Idle;
-+<<<<<<< .our
- 	private inverseAltBehavior: boolean;
- 
- 	private _onDidSashChange = new Emitter<number>();
- 	readonly onDidSashChange = this._onDidSashChange.event;
- 	private _onDidSashReset = new Emitter<number>();
- 	readonly onDidSashReset = this._onDidSashReset.event;
-+=======
-+>>>>>>> .their
- 
- 	get length(): number {
- 		return this.viewItems.length;
-@@ -168,7 +176,11 @@
- 		}
- 	}
- 
-+<<<<<<< .our
- 	addView(view: IView, size: number | Sizing, index = this.viewItems.length): void {
-+=======
-+	addView(view: IView, size: number, index = this.viewItems.length): void {
-+>>>>>>> .their
- 		if (this.state !== State.Idle) {
- 			throw new Error('Cant modify splitview');
- 		}
-@@ -238,6 +250,7 @@
- 			this.sashItems.splice(index - 1, 0, sashItem);
- 		}
- 
-+<<<<<<< .our
- 		container.appendChild(view.element);
- 
- 		let highPriorityIndex: number | undefined;
-@@ -255,6 +268,14 @@
- 	}
- 
- 	removeView(index: number, sizing?: Sizing): IView {
-+=======
-+		view.render(container, this.orientation);
-+		this.relayout();
-+		this.state = State.Idle;
-+	}
-+
-+	removeView(index: number): void {
-+>>>>>>> .their
- 		if (this.state !== State.Idle) {
- 			throw new Error('Cant modify splitview');
- 		}
-@@ -278,17 +299,29 @@
- 
- 		this.relayout();
- 		this.state = State.Idle;
-+<<<<<<< .our
- 
- 		if (sizing && sizing.type === 'distribute') {
- 			this.distributeViewSizes();
- 		}
- 
- 		return viewItem.view;
-+=======
-+>>>>>>> .their
- 	}
- 
- 	moveView(from: number, to: number): void {
- 		if (this.state !== State.Idle) {
- 			throw new Error('Cant modify splitview');
-+<<<<<<< .our
-+=======
-+		}
-+
-+		this.state = State.Busy;
-+
-+		if (from < 0 || from >= this.viewItems.length) {
-+			return;
-+>>>>>>> .their
- 		}
- 
- 		const size = this.getViewSize(from);
-@@ -305,6 +338,7 @@
- 			return this.swapViews(to, from);
- 		}
- 
-+<<<<<<< .our
- 		const fromSize = this.getViewSize(from);
- 		const toSize = this.getViewSize(to);
- 		const toView = this.removeView(to);
-@@ -312,6 +346,10 @@
- 
- 		this.addView(toView, fromSize, from);
- 		this.addView(fromView, toSize, to);
-+=======
-+		this.layoutViews();
-+		this.state = State.Idle;
-+>>>>>>> .their
- 	}
- 
- 	private relayout(lowPriorityIndex?: number, highPriorityIndex?: number): void {
-@@ -473,6 +511,7 @@
- 			this.resize(index - 1, deltaUp);
- 		}
- 
-+<<<<<<< .our
- 		this.distributeEmptySpace();
- 		this.layoutViews();
- 		this.saveProportions();
-@@ -485,6 +524,9 @@
- 		for (let i = 0; i < this.viewItems.length - 1; i++) {
- 			this.resizeView(i, size);
- 		}
-+=======
-+		this.state = State.Idle;
-+>>>>>>> .their
- 	}
- 
- 	getViewSize(index: number): number {
-changed in both
-  base   100644 67f5ce6ade65c70f4264fb267dc7f0fef8dd4f29 src/vs/base/common/glob.ts
-  our    100644 6ec8e429211b4bfe577a5acce697c639e25f14de src/vs/base/common/glob.ts
-  their  100644 3571fb9c33e6d0deae3b17e9847fdba118063ea3 src/vs/base/common/glob.ts
-@@ -482,6 +482,7 @@
- 	return parsedExpression(<IExpression>arg1, options);
- }
- 
-+<<<<<<< .our
- export function hasSiblingPromiseFn(siblingsFn?: () => TPromise<string[]>) {
- 	if (!siblingsFn) {
- 		return undefined;
-@@ -524,6 +525,12 @@
- 	const rp = obj as IRelativePattern;
- 
- 	return rp && typeof rp.base === 'string' && typeof rp.pattern === 'string' && typeof rp.pathToRelative === 'function';
-+=======
-+function isRelativePattern(obj: any): obj is IRelativePattern {
-+	const rp = obj as IRelativePattern;
-+
-+	return typeof rp.base === 'string' && typeof rp.pattern === 'string';
-+>>>>>>> .their
- }
- 
- /**
-changed in both
-  base   100644 85185e428b3cefcecec10a3bd12d30000d2e6c53 src/vs/base/test/browser/ui/splitview/splitview.test.ts
-  our    100644 619fa4dfa14b7e3131ffe60cc2a4997db8291a16 src/vs/base/test/browser/ui/splitview/splitview.test.ts
-  their  100644 044af37c4eb7ba73eba58edf00118df7adefe322 src/vs/base/test/browser/ui/splitview/splitview.test.ts
-@@ -431,4 +431,33 @@
- 		view2.dispose();
- 		view1.dispose();
- 	});
-+
-+	test('issue #35497', () => {
-+		const view1 = new TestView(160, Number.POSITIVE_INFINITY);
-+		const view2 = new TestView(66, 66);
-+
-+		const splitview = new SplitView(container);
-+		splitview.layout(986);
-+
-+		splitview.addView(view1, 142, 0);
-+		assert.equal(view1.size, 986, 'first view is stretched');
-+
-+		view2.onDidRender(() => {
-+			assert.throws(() => splitview.resizeView(1, 922));
-+			assert.throws(() => splitview.resizeView(1, 922));
-+		});
-+
-+		splitview.addView(view2, 66, 0);
-+		assert.equal(view2.size, 66, 'second view is fixed');
-+		assert.equal(view1.size, 986 - 66, 'first view is collapsed');
-+
-+		const viewContainers = container.querySelectorAll('.split-view-view');
-+		assert.equal(viewContainers.length, 2, 'there are two view containers');
-+		assert.equal((viewContainers.item(0) as HTMLElement).style.height, '66px', 'second view container is 66px');
-+		assert.equal((viewContainers.item(1) as HTMLElement).style.height, `${986 - 66}px`, 'first view container is 66px');
-+
-+		splitview.dispose();
-+		view2.dispose();
-+		view1.dispose();
-+	});
- });
-\ No newline at end of file
-changed in both
-  base   100644 0e61295fdb80259c3f0662b40c0aa2146683ec9c src/vs/base/test/node/glob.test.ts
-  our    100644 564399dc659a5d105983c880380449d6903b0eee src/vs/base/test/node/glob.test.ts
-  their  100644 301762e6130e4ebaf9264a18103bfe2087a3b1e7 src/vs/base/test/node/glob.test.ts
-removed in local
-  base   100644 1352bec2320251bc1ab54a69b7d1666685bd2e1f src/vs/editor/contrib/comment/common/lineCommentCommand.ts
-  their  100644 8f0abccfd3214c8561d4dd04caa2a64558f4fc97 src/vs/editor/contrib/comment/common/lineCommentCommand.ts
-removed in local
-  base   100644 443415d88201e3d723cdd2dff99f4a6b42f09247 src/vs/editor/contrib/comment/test/common/lineCommentCommand.test.ts
-  their  100644 57c946f76f9d92a9d111d868b6a48206144d9194 src/vs/editor/contrib/comment/test/common/lineCommentCommand.test.ts
-removed in local
-  base   100644 bb0601afb80c3c22b0e2c3e2bdcf3a0afc7da046 src/vs/editor/contrib/hover/browser/modesContentHover.ts
-  their  100644 c26f35eb3f4bbb38d896d8b9850c3459d34c692f src/vs/editor/contrib/hover/browser/modesContentHover.ts
-changed in both
-  base   100644 1ad860d4cdc65c9a53fdf5fa4d5808f12a5d9b29 src/vs/workbench/api/node/extHost.api.impl.ts
-  our    100644 ea64898c5b15cfae4b4ab32d722f4ae4a68f831a src/vs/workbench/api/node/extHost.api.impl.ts
-  their  100644 e11b0bd057f9916512e4e2bec645d63d7e44f656 src/vs/workbench/api/node/extHost.api.impl.ts
-changed in both
-  base   100644 873af61890d19dea9c44e36fb1d55f31c2445e62 src/vs/workbench/parts/debug/common/debugModel.ts
-  our    100644 3a58268ec72266a669641d6f7022f0816eff2d1e src/vs/workbench/parts/debug/common/debugModel.ts
-  their  100644 c5fa2b544fa8ad825c0a93f47329fb51b06f4feb src/vs/workbench/parts/debug/common/debugModel.ts
-@@ -556,10 +556,18 @@
- 
- 	private sources: Map<string, Source>;
- 	private threads: Map<number, Thread>;
-+<<<<<<< .our
-+=======
-+	public inactive = true;
-+>>>>>>> .their
- 
- 	constructor(private _configuration: { resolved: IConfig, unresolved: IConfig }, private session: IRawSession & ITreeElement) {
- 		this.threads = new Map<number, Thread>();
- 		this.sources = new Map<string, Source>();
-+<<<<<<< .our
-+=======
-+		this._session.onDidInitialize(() => this.inactive = false);
-+>>>>>>> .their
- 	}
- 
- 	public get configuration(): IConfig {
-changed in both
-  base   100644 56dd2f81b7829c96739e5fd02231f31f39cf8e21 src/vs/workbench/parts/debug/electron-browser/debugService.ts
-  our    100644 a5e2dcee7a0eb14bc388d84c6c7cac591067b1b2 src/vs/workbench/parts/debug/electron-browser/debugService.ts
-  their  100644 cf1fe6e7f2225dde2174a48b7a7a4309f87256ba src/vs/workbench/parts/debug/electron-browser/debugService.ts
-@@ -1204,6 +1204,7 @@
- 			watchExpressionsCount: this.model.getWatchExpressions().length
- 		});
- 
-+<<<<<<< .our
- 		this.model.removeSession(raw.getId());
- 		if (session) {
- 			this._onDidEndSession.fire(session);
-@@ -1212,6 +1213,12 @@
- 					this.notificationService.error(err)
- 				);
- 			}
-+=======
-+		this.model.removeProcess(session.getId());
-+		if (process && process.state !== debug.ProcessState.INACTIVE) {
-+			process.inactive = true;
-+			this._onDidEndProcess.fire(process);
-+>>>>>>> .their
- 		}
- 
- 		lifecycle.dispose(this.toDisposeOnSessionEnd.get(raw.getId()));
-changed in both
-  base   100644 69de6255a05341c221ce962c826a6076a90a8465 src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
-  our    100644 6f9d4a74f5feb07a450341f183980ee0a10455a9 src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
-  their  100644 a365c3fe77d8d56935cb32906db0a109e7852bdc src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
-@@ -563,6 +563,7 @@
- 					message = localize('reallyRecommendedExtensionPack', "The '{0}' extension pack is recommended for this file type.", name);
- 				}
- 
-+<<<<<<< .our
- 				this.notificationService.prompt(Severity.Info, message,
- 					[{
- 						label: localize('install', 'Install'),
-@@ -571,6 +572,54 @@
- 							"extensionRecommendations:popup" : {
- 								"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
- 								"extensionId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
-+=======
-+						let message = localize('reallyRecommended2', "The '{0}' extension is recommended for this file type.", name);
-+						// Temporary fix for the only extension pack we recommend. See https://github.com/Microsoft/vscode/issues/35364
-+						if (id === 'vscjava.vscode-java-pack') {
-+							message = localize('reallyRecommendedExtensionPack', "The '{0}' extension pack is recommended for this file type.", name);
-+						}
-+
-+						const recommendationsAction = this.instantiationService.createInstance(ShowRecommendedExtensionsAction, ShowRecommendedExtensionsAction.ID, localize('showRecommendations', "Show Recommendations"));
-+						const options = [
-+							recommendationsAction.label,
-+							localize('neverShowAgain', "Don't show again"),
-+							localize('close', "Close")
-+						];
-+
-+						this.choiceService.choose(Severity.Info, message, options, 2).done(choice => {
-+							switch (choice) {
-+								case 0:
-+									/* __GDPR__
-+										"extensionRecommendations:popup" : {
-+											"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-+											"extensionId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
-+										}
-+									*/
-+									this.telemetryService.publicLog('extensionRecommendations:popup', { userReaction: 'show', extensionId: name });
-+									return recommendationsAction.run();
-+								case 1: this.importantRecommendationsIgnoreList.push(id);
-+									this.storageService.store(
-+										'extensionsAssistant/importantRecommendationsIgnore',
-+										JSON.stringify(this.importantRecommendationsIgnoreList),
-+										StorageScope.GLOBAL
-+									);
-+									/* __GDPR__
-+										"extensionRecommendations:popup" : {
-+											"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-+											"extensionId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
-+										}
-+									*/
-+									this.telemetryService.publicLog('extensionRecommendations:popup', { userReaction: 'neverShowAgain', extensionId: name });
-+									return this.ignoreExtensionRecommendations();
-+								case 2:
-+									/* __GDPR__
-+										"extensionRecommendations:popup" : {
-+											"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-+											"extensionId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
-+										}
-+									*/
-+									this.telemetryService.publicLog('extensionRecommendations:popup', { userReaction: 'close', extensionId: name });
-+>>>>>>> .their
- 							}
- 							*/
- 							this.telemetryService.publicLog('extensionRecommendations:popup', { userReaction: 'install', extensionId: name });
-@@ -836,7 +885,11 @@
- 					.replace('%ProgramFiles(x86)%', process.env['ProgramFiles(x86)'])
- 					.replace('%ProgramFiles%', process.env['ProgramFiles'])
- 					.replace('%APPDATA%', process.env['APPDATA']);
-+<<<<<<< .our
- 				promises.push(findExecutable(exeName, windowsPath));
-+=======
-+				findExecutable(exeName, windowsPath);
-+>>>>>>> .their
- 			} else {
- 				promises.push(findExecutable(exeName, paths.join('/usr/local/bin', exeName)));
- 				promises.push(findExecutable(exeName, paths.join(homeDir, exeName)));
-removed in local
-  base   100644 fcb3b89e67fd1b8d6c7ed96a5311f00f613cf9da src/vs/workbench/parts/files/browser/fileActions.ts
-  their  100644 d593a7474cbde94b3938b89a0529b1f2ca798b49 src/vs/workbench/parts/files/browser/fileActions.ts
-removed in local
-  base   100644 13ac78f564013ddca24732c209e8f464185d1b29 src/vs/workbench/parts/files/browser/media/explorerviewlet.css
-  their  100644 749714d7782f880e27445e02256b4554fff6a503 src/vs/workbench/parts/files/browser/media/explorerviewlet.css
-changed in both
-  base   100644 501bdf5d32e945201808ce3686ac8955305298a8 src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts
-  our    100644 4a9da7a25f70fd599ab7b4e7adadf6adf1e52215 src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts
-  their  100644 990928f0af8b6e5d0598b573c8477194aaa47bb7 src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts
-@@ -242,6 +242,21 @@
- 
- 	getSelection(): ISCMRepository[] {
- 		return this.list.getSelectedElements();
-+<<<<<<< .our
-+=======
-+	}
-+
-+	private splice(index: number, deleteCount: number, repositories: ISCMRepository[] = []): void {
-+		const wasEmpty = this.list.length === 0;
-+
-+		this.list.splice(index, deleteCount, repositories);
-+		this.updateBodySize();
-+
-+		// Automatically select the first one
-+		if (wasEmpty && this.list.length > 0) {
-+			this.list.setSelection([0]);
-+		}
-+>>>>>>> .their
- 	}
- 
- 	protected renderBody(container: HTMLElement): void {
-@@ -1152,11 +1167,18 @@
- 
- 		if (shouldMainPanelBeVisible) {
- 			this.mainPanel = this.instantiationService.createInstance(MainPanel, this);
-+<<<<<<< .our
- 			this.mainPanel.render();
- 			this.addPanels([{ panel: this.mainPanel, size: this.mainPanel.minimumSize, index: 0 }]);
- 
- 			const selectionChangeDisposable = this.mainPanel.onSelectionChange(this.onSelectionChange, this);
- 			this.onSelectionChange(this.mainPanel.getSelection());
-+=======
-+			this.addPanel(this.mainPanel, this.mainPanel.minimumSize, 0);
-+>>>>>>> .their
-+
-+			const selectionChangeDisposable = this.mainPanel.onSelectionChange(this.onSelectionChange, this);
-+			this.onSelectionChange(this.mainPanel.getSelection());
- 
- 			this.mainPanelDisposable = toDisposable(() => {
- 				this.removePanels([this.mainPanel]);
-@@ -1453,6 +1475,7 @@
- 	}
- 
- 	protected isSingleView(): boolean {
-+<<<<<<< .our
- 		return super.isSingleView() && this.repositoryPanels.length + this.contributedViews.visibleViewDescriptors.length === 1;
- 	}
- 
-@@ -1468,6 +1491,9 @@
- 		panel.setExpanded(true);
- 		panel.focus();
- 		return TPromise.as(panel);
-+=======
-+		return super.isSingleView() && this.repositoryPanels.length === 1;
-+>>>>>>> .their
- 	}
- 
- 	hide(repository: ISCMRepository): void {
-@@ -1478,11 +1504,14 @@
- 		this.mainPanel.hide(repository);
- 	}
- 
-+<<<<<<< .our
- 	shutdown(): void {
- 		this.contributedViews.saveViewsStates();
- 		super.shutdown();
- 	}
- 
-+=======
-+>>>>>>> .their
- 	dispose(): void {
- 		this.disposables = dispose(this.disposables);
- 		this.contributedViewDisposables = dispose(this.contributedViewDisposables);
-removed in local
-  base   100644 4601182e9a7081958e32f2d0edcff502be83876c src/vs/workbench/parts/terminal/electron-browser/terminal.ts
-  their  100644 e91d9b86fda1f2b0b0451392c12bc0b9081ac835 src/vs/workbench/parts/terminal/electron-browser/terminal.ts
-changed in both
-  base   100644 6507587aa97883fb602326ae3bbbe528ed3e9557 src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts
-  our    100644 4d4f6645ad04db61e848109ba1d334d7475a5e7a src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts
-  their  100644 b1793339026f8f89e56b79bd229f8a6be0e4cfb2 src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts
-@@ -12,9 +12,13 @@
- import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
- import { ITerminalConfiguration, ITerminalConfigHelper, ITerminalFont, IShellLaunchConfig, IS_WORKSPACE_SHELL_ALLOWED_STORAGE_KEY, TERMINAL_CONFIG_SECTION, DEFAULT_LETTER_SPACING, DEFAULT_LINE_HEIGHT, MINIMUM_LETTER_SPACING } from 'vs/workbench/parts/terminal/common/terminal';
- import Severity from 'vs/base/common/severity';
-+<<<<<<< .our
- import { isFedora } from 'vs/workbench/parts/terminal/node/terminal';
- import { Terminal as XTermTerminal } from 'vscode-xterm';
- import { INotificationService } from 'vs/platform/notification/common/notification';
-+=======
-+import { isFedora } from 'vs/workbench/parts/terminal/electron-browser/terminal';
-+>>>>>>> .their
- 
- const MINIMUM_FONT_SIZE = 6;
- const MAXIMUM_FONT_SIZE = 25;
-@@ -110,6 +114,7 @@
- 	 * Gets the font information based on the terminal.integrated.fontFamily
- 	 * terminal.integrated.fontSize, terminal.integrated.lineHeight configuration properties
- 	 */
-+<<<<<<< .our
- 	public getFont(xterm?: XTermTerminal, excludeDimensions?: boolean): ITerminalFont {
- 		const editorConfig = this._configurationService.getValue<IEditorOptions>('editor');
- 
-@@ -120,6 +125,25 @@
- 			if (isFedora) {
- 				fontFamily = '\'DejaVu Sans Mono\'';
- 			}
-+=======
-+	public getFont(excludeDimensions?: boolean): ITerminalFont {
-+		const config = this._configurationService.getConfiguration();
-+		const editorConfig = (<IEditorConfiguration>config).editor;
-+		const terminalConfig = this.config;
-+
-+		let fontFamily = terminalConfig.fontFamily || editorConfig.fontFamily;
-+
-+		// Work around bad font on Fedora
-+		if (!terminalConfig.fontFamily) {
-+			if (isFedora) {
-+				fontFamily = '\'DejaVu Sans Mono\'';
-+			}
-+		}
-+
-+		let fontSize = this._toInteger(terminalConfig.fontSize, 0);
-+		if (fontSize <= 0) {
-+			fontSize = EDITOR_FONT_DEFAULTS.fontSize;
-+>>>>>>> .their
- 		}
- 
- 		const fontSize = this._toInteger(this.config.fontSize, MINIMUM_FONT_SIZE, MAXIMUM_FONT_SIZE, EDITOR_FONT_DEFAULTS.fontSize);
-changed in both
-  base   100644 9b6b9c6ca0183dbd9f9aa299ab3c5c38c94f1ceb src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
-  our    100644 04d9dcba251cf79c28429027cda3ca3b0c10a29c src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
-  their  100644 5d7177b30b219c6a7547c9cef96b22b21458168a src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
-@@ -656,12 +656,18 @@
- 			// necessary if the number of rows in the terminal has decreased while it was in the
- 			// background since scrollTop changes take no effect but the terminal's position does
- 			// change since the number of visible rows decreases.
-+<<<<<<< .our
- 			this._xterm.emit('scroll', this._xterm._core.buffer.ydisp);
- 			if (this._container && this._container.parentElement) {
-+=======
-+			this._xterm.emit('scroll', this._xterm.buffer.ydisp);
-+			if (this._container) {
-+>>>>>>> .their
- 				// Force a layout when the instance becomes invisible. This is particularly important
- 				// for ensuring that terminals that are created in the background by an extension will
- 				// correctly get correct character measurements in order to render to the screen (see
- 				// #34554).
-+<<<<<<< .our
- 				const computedStyle = window.getComputedStyle(this._container.parentElement);
- 				const width = parseInt(computedStyle.getPropertyValue('width').replace('px', ''), 10);
- 				const height = parseInt(computedStyle.getPropertyValue('height').replace('px', ''), 10);
-@@ -670,6 +676,12 @@
- 				// this hack can be removed when https://github.com/xtermjs/xterm.js/issues/702 is
- 				// supported.
- 				setTimeout(() => this.layout(new dom.Dimension(width, height)), 0);
-+=======
-+				const computedStyle = window.getComputedStyle(this._container);
-+				const width = parseInt(computedStyle.getPropertyValue('width').replace('px', ''), 10);
-+				const height = parseInt(computedStyle.getPropertyValue('height').replace('px', ''), 10);
-+				this.layout(new Dimension(width, height));
-+>>>>>>> .their
- 			}
- 		}
- 	}
-changed in both
-  base   100644 e95533d078f2975f33b6cb243c65dee85edcbe4d src/vs/workbench/parts/terminal/test/electron-browser/terminalConfigHelper.test.ts
-  our    100644 27cc89f26cc653bbb099e6fb1795f5e59b7912a3 src/vs/workbench/parts/terminal/test/electron-browser/terminalConfigHelper.test.ts
-  their  100644 3eecd534b8c32d92f7dcad3d7a56c524102d8fd4 src/vs/workbench/parts/terminal/test/electron-browser/terminalConfigHelper.test.ts
-@@ -6,8 +6,25 @@
- import * as assert from 'assert';
- import { TerminalConfigHelper } from 'vs/workbench/parts/terminal/electron-browser/terminalConfigHelper';
- import { EDITOR_FONT_DEFAULTS } from 'vs/editor/common/config/editorOptions';
-+<<<<<<< .our
- import { isFedora } from 'vs/workbench/parts/terminal/node/terminal';
- import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-+=======
-+import { isFedora } from 'vs/workbench/parts/terminal/electron-browser/terminal';
-+
-+class MockConfigurationService implements IConfigurationService {
-+	public _serviceBrand: any;
-+	public serviceId = IConfigurationService;
-+	public constructor(private configuration: any = {}) { }
-+	public reloadConfiguration<T>(section?: string): TPromise<T> { return TPromise.as(this.getConfiguration()); }
-+	public lookup<T>(key: string, overrides?: IConfigurationOverrides): IConfigurationValue<T> { return { value: getConfigurationValue<T>(this.getConfiguration(), key), default: getConfigurationValue<T>(this.getConfiguration(), key), user: getConfigurationValue<T>(this.getConfiguration(), key), workspace: void 0, folder: void 0 }; }
-+	public keys() { return { default: [], user: [], workspace: [], folder: [] }; }
-+	public values() { return {}; }
-+	public getConfiguration(): any { return this.configuration; }
-+	public getConfigurationData(): any { return null; }
-+	public onDidUpdateConfiguration() { return { dispose() { } }; }
-+}
-+>>>>>>> .their
- 
- suite('Workbench - TerminalConfigHelper', () => {
- 	let fixture: HTMLElement;
-removed in local
-  base   100644 ac15101c9d6e70ca2e1699e00a1c842f37d50c1d test/smoke/src/spectron/client.ts
-  their  100644 b2e827b605f1f32c95228c6d3e52c0f27a0a26aa test/smoke/src/spectron/client.ts
diff --git a/app/test/fixtures/merge-parser/vscode/merge-release-1.18-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-release-1.18-into-master.txt
deleted file mode 100644
index 4e095bc2d7b..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-release-1.18-into-master.txt
+++ /dev/null
@@ -1,4842 +0,0 @@
-changed in both
-  base   100644 31f3e0efe5dd38818df170a1cbe733a940a63fd0 build/gulpfile.vscode.js
-  our    100644 d79071e56bcfc53b3448052cc08bd7247bd7e789 build/gulpfile.vscode.js
-  their  100644 2f0396a5a8e25ae6d9b8b29c78b0a328f29325b5 build/gulpfile.vscode.js
-@@ -44,7 +44,15 @@
- 	.concat(baseModules);
- 
- // Build
-+<<<<<<< .our
- const builtInExtensions = require('./builtInExtensions.json');
-+=======
-+
-+const builtInExtensions = [
-+	{ name: 'ms-vscode.node-debug', version: '1.18.3' },
-+	{ name: 'ms-vscode.node-debug2', version: '1.18.5' }
-+];
-+>>>>>>> .their
- 
- const excludedExtensions = [
- 	'vscode-api-tests',
-changed in both
-  base   100644 de7382190de8b62390b3a477f0ca75df10100fc6 extensions/git/src/repository.ts
-  our    100644 c2c9a2f344d553fd490133027cf31e67b3c21aa2 extensions/git/src/repository.ts
-  their  100644 7174cebf680def3c994d50bc6882165fa7656ef1 extensions/git/src/repository.ts
-changed in both
-  base   100644 ac60b0720fbc44e48987939e68ecbefcae2f578e i18n/chs/extensions/git/out/commands.i18n.json
-  our    100644 04fae89946b4fff2a3f253e57b9b96d137dedd28 i18n/chs/extensions/git/out/commands.i18n.json
-  their  100644 020ac1e3589e5a8232bc9603f198f60148515eef i18n/chs/extensions/git/out/commands.i18n.json
-changed in both
-  base   100644 7e5710c9d9fd6d42194bc040803263c8b504915a i18n/chs/extensions/git/package.i18n.json
-  our    100644 7c2a3b49c9f848f60d2957657294486b061a17aa i18n/chs/extensions/git/package.i18n.json
-  their  100644 657920b4ae9834cc0abeea61ae04e2ec2e88ded1 i18n/chs/extensions/git/package.i18n.json
-@@ -73,15 +73,22 @@
- 	"config.enableCommitSigning": "启用使用 GPG 签名的提交",
- 	"config.discardAllScope": "控制运行“放弃所有更改”命令时放弃的更改类型。\"all\" 放弃所有更改。\"tracked\" 只放弃跟踪的文件。\"prompt\" 表示在每次运行此操作时显示提示对话框。",
- 	"config.decorations.enabled": "控制 Git 是否向资源管理器和“打开的编辑器”视图添加颜色和小标。",
-+<<<<<<< .our
- 	"config.promptToSaveFilesBeforeCommit": "控制 Git 是否在提交之前检查未保存的文件。",
- 	"config.showInlineOpenFileAction": "控制是否在 Git 更改视图中显示内联“打开文件”操作。",
- 	"config.inputValidation": "控制何时显示提交消息输入验证。",
- 	"config.detectSubmodules": "控制是否自动检测 Git 子模块。",
- 	"config.detectSubmodulesLimit": "控制可检测到的 Git 子模块的限制。",
-+=======
-+>>>>>>> .their
- 	"colors.modified": "已修改资源的颜色。",
- 	"colors.deleted": "已删除资源的颜色。",
- 	"colors.untracked": "未跟踪资源的颜色。",
- 	"colors.ignored": "已忽略资源的颜色。",
-+<<<<<<< .our
- 	"colors.conflict": "存在冲突的资源的颜色。",
- 	"colors.submodule": "子模块资源的颜色。"
-+=======
-+	"colors.conflict": "存在冲突的资源的颜色。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 13082990df0555d96758736f330a40b1ea90d67e i18n/chs/extensions/npm/package.i18n.json
-  our    100644 3f53500fe1fade31ff765e96760b3a5c8a6d618f i18n/chs/extensions/npm/package.i18n.json
-  their  100644 88413cd19ab717ee51cbe6b372cb71a4e6e0534c i18n/chs/extensions/npm/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -23,4 +24,10 @@
- 	"command.debug": "调试",
- 	"command.openScript": "开放",
- 	"command.runInstall": "运行 install"
-+=======
-+	"config.npm.autoDetect": "控制自动检测 npm 脚本是否打开。默认开启。",
-+	"config.npm.runSilent": "使用 \"--silent\" 选项运行 npm 命令。",
-+	"config.npm.packageManager": "用于运行脚本的程序包管理器。",
-+	"npm.parseError": "Npm 任务检测: 无法分析文件 {0}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 2b45360018b48099e41dded0af8208c86ca33d1a i18n/chs/extensions/typescript/out/features/completionItemProvider.i18n.json
-  our    100644 cec1f8a1e0a0ce48cb47082845125e9f145f84a5 i18n/chs/extensions/typescript/out/features/completionItemProvider.i18n.json
-  their  100644 b1b7365e6c0ebf6264bcb9f40defa7c347380e9b i18n/chs/extensions/typescript/out/features/completionItemProvider.i18n.json
-changed in both
-  base   100644 f927441d137279ba7c876b90c41a96f421ca48f7 i18n/chs/src/vs/workbench/common/theme.i18n.json
-  our    100644 9dff140c48c8d58d62f0adab067f1886bd30d318 i18n/chs/src/vs/workbench/common/theme.i18n.json
-  their  100644 8ebf8f723db31c43b8eb24f67501b3d72999f545 i18n/chs/src/vs/workbench/common/theme.i18n.json
-changed in both
-  base   100644 b5e0d10d18fd66d2d08fff8057c8c4941865db2d i18n/chs/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 eb24c55b636f82951f7ddca06c62ab11e05e6e73 i18n/chs/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 91dacb2a81d1fcdc391bf8457fc5b5ebd7d4a685 i18n/chs/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,8 +35,15 @@
- 	"panelDefaultLocation": "控制此面板的默认位置。可显示在工作台的底部或右侧。",
- 	"statusBarVisibility": "控制工作台底部状态栏的可见性。",
- 	"activityBarVisibility": "控制工作台中活动栏的可见性。",
-+<<<<<<< .our
- 	"viewVisibility": "控制是否显示视图头部的操作项。视图头部操作项可以一直，或是仅当聚焦到和悬停在视图上时显示。",
- 	"fontAliasing": "控制工作台中字体的渲染方式\n- default: 次像素平滑字体。将在大多数非 retina 显示器上显示最清晰的文字\n- antialiased: 进行像素而不是次像素级别的字体平滑。可能会导致字体整体显示得更细\n- none: 禁用字体平滑。将显示边缘粗糙、有锯齿的文字\n- auto: 根据显示器 DPI 自动应用 \"default\" 或 \"antialiased\" 选项。",
-+=======
-+	"closeOnFileDelete": "控制文件被其他某些进程删除或重命名时是否应该自动关闭显示文件的编辑器。禁用此项会保持编辑器作为此类事件的脏文件打开。请注意，从应用程序内部进行删除操作会始终关闭编辑器，并且脏文件始终不会关闭以保存数据。",
-+	"experimentalFuzzySearchEndpoint": "表示用于实验性设置搜索的端点。",
-+	"experimentalFuzzySearchKey": "表示用于实验性设置搜索的密钥。",
-+	"fontAliasing": "控制工作台中字体的渲染方式\n- default: 次像素平滑字体。将在大多数非 retina 显示器上显示最清晰的文字\n- antialiased: 进行像素而不是次像素级别的字体平滑。可能会导致字体整体显示得更细\n- none: 禁用字体平滑。将显示边缘粗糙、有锯齿的文字",
-+>>>>>>> .their
- 	"workbench.fontAliasing.default": "次像素平滑字体。将在大多数非 retina 显示器上显示最清晰的文字。",
- 	"workbench.fontAliasing.antialiased": "进行像素而不是次像素级别的字体平滑。可能会导致字体整体显示得更细。",
- 	"workbench.fontAliasing.none": "禁用字体平滑。将显示边缘粗糙、有锯齿的文字。",
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/chs/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
-  our    100644 f7f60a95751202fabe5a7332b55f257d275aada8 i18n/chs/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
-  their  100644 81b8c9e2804633a5061494a8ff98eb605419bed0 i18n/chs/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"selectAndStartDebug": "选择并启动调试配置"
- }
-\ No newline at end of file
-changed in both
-  base   100644 2447a5efc53b846354e481ec6dd85a211cc624ed i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 d713b18f9f797773516060ccdb111cd56b80034e i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 c3b4b35910514666375e858c13a77ec1a4ec4913 i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -28,7 +28,13 @@
- 	"preLaunchTaskExitCode": "preLaunchTask“{0}”已终止，退出代码为 {1}。",
- 	"showErrors": "显示错误",
- 	"noFolderWorkspaceDebugError": "无法调试活动文件。请确保它保存在磁盘上，并确保已为该文件类型安装了调试扩展。",
-+<<<<<<< .our
- 	"cancel": "取消",
- 	"DebugTaskNotFound": "找不到任务“{0}”。",
- 	"taskNotTracked": "无法跟踪任务“{0}”。"
-+=======
-+	"NewLaunchConfig": "请设置应用程序的启动配置文件。{0}",
-+	"DebugTaskNotFound": "找不到 preLaunchTask“{0}”。",
-+	"taskNotTracked": "无法跟踪预启动任务“{0}”。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 39cad7d69ee31d1891b3d4ba5d0d86f82c09d5a2 i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 6d06818b00cbd9cc446af3ed0c5d32bc725f9a34 i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 efe5507494d6e4d4f3a59014a1d7f14840521a24 i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -12,6 +12,7 @@
- 	"exeBasedRecommendation": "根据你安装的 {0}，向你推荐此扩展。",
- 	"fileBasedRecommendation": "根据您最近打开的文件推荐此扩展。",
- 	"workspaceRecommendation": "当前工作区的用户推荐此扩展。",
-+	"exeBasedRecommendation": "根据你安装的 {0}，向你推荐此扩展。",
- 	"reallyRecommended2": "建议对这种类型的文件使用“{0}”扩展。",
- 	"reallyRecommendedExtensionPack": "建议对这种类型的文件使用“{0}”扩展包。",
- 	"install": "安装",
-changed in both
-  base   100644 3638ae24a1417765413f3b0bf4d1796d46e946ad i18n/chs/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
-  our    100644 971f3dddcce66938820acc384a9bf40f7989b8fb i18n/chs/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
-  their  100644 342e7b239c15126a410f9ac8eaa23ec7209944c5 i18n/chs/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
-@@ -16,6 +16,10 @@
- 	"exclude.boolean": "匹配文件路径所依据的 glob 模式。设置为 true 或 false 可启用或禁用该模式。",
- 	"exclude.when": "对匹配文件的同级文件的其他检查。使用 $(basename) 作为匹配文件名的变量。",
- 	"useRipgrep": "控制是否在文本和文件搜索中使用 ripgrep",
-+<<<<<<< .our
-+=======
-+	"useIgnoreFilesByDefault": "控制在新工作区中搜索文本时是否默认使用 .gitignore 和 .ignore 文件。",
-+>>>>>>> .their
- 	"useIgnoreFiles": "控制搜索文件时是否使用 .gitignore 和 .ignore 文件。",
- 	"search.quickOpen.includeSymbols": "配置为在 Quick Open 文件结果中包括全局符号搜索的结果。",
- 	"search.followSymlinks": "控制是否在搜索中跟踪符号链接。"
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/chs/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
-  our    100644 42e502a0b2b9b8c11a5bf8887bf5269cf3b4aa3e i18n/chs/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
-  their  100644 177d09d66131ba0be328c20fb2f46c3df9ddf794 i18n/chs/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"bubbleTitle": "包含强调项"
- }
-\ No newline at end of file
-changed in both
-  base   100644 7bc2b17300e4053cfde8c4e7d3114d40f82e4529 i18n/cht/extensions/emmet/package.i18n.json
-  our    100644 b3dc8be8bb9ec8fba170590d50c4692dadd9f40f i18n/cht/extensions/emmet/package.i18n.json
-  their  100644 7d6aff82b16b43e38d9fc7de67633c50b5bcd13b i18n/cht/extensions/emmet/package.i18n.json
-@@ -52,6 +52,7 @@
- 	"emmetPreferencesBemModifierSeparator": "使用 BEM 篩選時用於類別的修飾詞分隔符號",
- 	"emmetPreferencesFilterCommentBefore": "套用註解篩選時必須置於相符元素前的註解定義。",
- 	"emmetPreferencesFilterCommentAfter": "套用註解篩選時必須置於相符元素後的註解定義。 ",
-+<<<<<<< .our
- 	"emmetPreferencesFilterCommentTrigger": "必須採用縮寫以套用註解篩選的屬性名稱逗點分隔清單",
- 	"emmetPreferencesFormatNoIndentTags": "陣列的標籤名稱不應向內縮排",
- 	"emmetPreferencesFormatForceIndentTags": "陣列的標籤名稱應總是向內縮排",
-@@ -62,4 +63,7 @@
- 	"emmetPreferencesCssMsProperties": "在以 `-` 開頭的 Emmet 縮寫中使用時，會取得 'ms' 廠商前綴的逗點分隔 CSS 屬性。設定為空白字串可避免總是取得 'ms' 前綴。",
- 	"emmetPreferencesCssFuzzySearchMinScore": "模糊比對的縮寫應該達到最低分數(從 0 到 1)。較低數值可能產生錯誤的比對，較高的數值可能會降低可能的比對。",
- 	"emmetOptimizeStylesheetParsing": "當設定為 false 時，將解析整個檔案以確定目前的位置是否適用於展開 Emmet 縮寫。當設定為 true 時，僅會解析 css/scss/less 檔案中目前位置周圍的內容。"
-+=======
-+	"emmetPreferencesFilterCommentTrigger": "必須採用縮寫以套用註解篩選的屬性名稱逗點分隔清單"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a07211f85759fe5bbe10e010f1362a2e101de1ef i18n/cht/extensions/git/package.i18n.json
-  our    100644 bc042cb15d8c15d6c5568f5c08f9df112417a23c i18n/cht/extensions/git/package.i18n.json
-  their  100644 1b15b9673ea125ed104e9e857a78746e45a83b3f i18n/cht/extensions/git/package.i18n.json
-@@ -73,15 +73,22 @@
- 	"config.enableCommitSigning": "啟用 GPG 認可簽署。",
- 	"config.discardAllScope": "控制 `Discard all changes` 命令會捨棄的變更。`all` 會捨棄所有變更。`tracked` 只會捨棄追蹤的檔案。`prompt` 會在每次動作執行時顯示提示對話方塊。",
- 	"config.decorations.enabled": "控制 Git 是否提供色彩及徽章給總管及開啟編輯器視窗。",
-+<<<<<<< .our
- 	"config.promptToSaveFilesBeforeCommit": "控制Git是否應該在提交之前檢查未儲存的檔案。",
- 	"config.showInlineOpenFileAction": "控制是否在Git變更列表中的檔名旁顯示“開啟檔案”的動作按鈕。",
- 	"config.inputValidation": "控制何時顯示認可訊息輸入驗證。",
- 	"config.detectSubmodules": "控制是否自動偵測 Git 子模組。",
- 	"config.detectSubmodulesLimit": "控制 Git 子模組的偵測限制",
-+=======
-+>>>>>>> .their
- 	"colors.modified": "修改資源的顏色。",
- 	"colors.deleted": "刪除資源的顏色",
- 	"colors.untracked": "未追蹤資源的顏色。",
- 	"colors.ignored": "忽略資源的顏色。",
-+<<<<<<< .our
- 	"colors.conflict": "帶有衝突資源的顏色。",
- 	"colors.submodule": "子模組資源的顏色"
-+=======
-+	"colors.conflict": "帶有衝突資源的顏色。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/cht/extensions/npm/out/main.i18n.json
-  our    100644 f0e654540ce075c68860cd8f870f82ef0c9d8413 i18n/cht/extensions/npm/out/main.i18n.json
-  their  100644 99b0c6bcfcd52a3bcb14299487d36493b15c3e03 i18n/cht/extensions/npm/out/main.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"npm.parseError": "Npm 工作刪除: 解析檔案 {0} 失敗"
- }
-\ No newline at end of file
-changed in both
-  base   100644 439c8e3bb279cb260144c8e604499d17123648e4 i18n/cht/extensions/npm/package.i18n.json
-  our    100644 e1e497559e0002c1cb7f8161b65cf930f3fd8de7 i18n/cht/extensions/npm/package.i18n.json
-  their  100644 a9103ac8844d091ff004f5dbad47ba3231843510 i18n/cht/extensions/npm/package.i18n.json
-@@ -11,6 +11,7 @@
- 	"config.npm.autoDetect": "控制是否自動檢測npm腳本.預設為開啟.",
- 	"config.npm.runSilent": "以 `--silent` 選項執行 npm 命令。 ",
- 	"config.npm.packageManager": "用來執行指令碼的套件管理員。",
-+<<<<<<< .our
- 	"config.npm.exclude": "為應從自動指令碼偵測排除的資料夾設定 Glob 模式。",
- 	"config.npm.enableScriptExplorer": "啟用 npm 指令碼的總管檢視。",
- 	"config.npm.scriptExplorerAction": "指令碼總管中預設按一下行為: 'open' 或 'run', 預設值為 'open'。",
-@@ -23,4 +24,7 @@
- 	"command.debug": "偵錯",
- 	"command.openScript": "開啟",
- 	"command.runInstall": "執行安裝"
-+=======
-+	"npm.parseError": "Npm 工作刪除: 解析檔案 {0} 失敗"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 2124588e4b9b5ee26c8b58a09263d4ad1f9f82af i18n/cht/extensions/typescript/out/features/completionItemProvider.i18n.json
-  our    100644 18117a677b62732505dc8fee924f23d691a3a3c1 i18n/cht/extensions/typescript/out/features/completionItemProvider.i18n.json
-  their  100644 f75533e302e29d4419c9927b66ea5425953a8861 i18n/cht/extensions/typescript/out/features/completionItemProvider.i18n.json
-changed in both
-  base   100644 cd9c40de3674be9f021b5027e6b71762ee84b003 i18n/cht/extensions/typescript/package.i18n.json
-  our    100644 003b932658c92a3dfaef72f32a2eeb83563c3b7f i18n/cht/extensions/typescript/package.i18n.json
-  their  100644 5d211fb02002d787f95cecb20b536dee58c4e4e9 i18n/cht/extensions/typescript/package.i18n.json
-@@ -55,7 +55,11 @@
- 	"typescript.quickSuggestionsForPaths": "啟用/停用在輸入匯入路徑顯示即時建議。",
- 	"typescript.locale": "設定報告 TypeScript 錯誤的語系。需要 TypeScript >= 2.6.0。預設值 'null' 則使用 VS Code 的語系來顯示 TypeScript 錯誤。",
- 	"javascript.implicitProjectConfig.experimentalDecorators": "啟用/停用 JavaScript 檔案中非專案部分的 'experimentalDecorators'。現有的 jsconfig.json 或 tsconfig.json 檔案會覆寫此設定。需要 TypeScript >=2.3.1。",
-+<<<<<<< .our
- 	"typescript.autoImportSuggestions.enabled": "啟用/停用 自動匯入建議。需要 TypeScript >=2.6.1",
- 	"typescript.experimental.syntaxFolding": "啟用/停用語法感知摺疊標記。",
- 	"taskDefinition.tsconfig.description": "定義 TS 組建的 tsconfig 檔案。"
-+=======
-+	"typescript.autoImportSuggestions.enabled": "啟用/停用 自動匯入建議。需要 TypeScript >=2.6.1"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 531bddc0287f0b71e333381bf0dd762d2359f211 i18n/cht/src/vs/code/electron-main/windows.i18n.json
-  our    100644 0f0e6e8b8de1865a58f09b392ec2bcf42c9ef403 i18n/cht/src/vs/code/electron-main/windows.i18n.json
-  their  100644 38f593652a54e361b1e39070e1b499b8c385e858 i18n/cht/src/vs/code/electron-main/windows.i18n.json
-changed in both
-  base   100644 1ec0770a363088d72c6be082c0f9ab58cc8d7e9e i18n/cht/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 790929bd611f6dd14a59e2ff8a6640378fde30cb i18n/cht/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 4868c4bbc6c4e5500d0edede4ad2f376ac897420 i18n/cht/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -48,8 +48,11 @@
- 	"listDropBackground": "使用滑鼠四處移動項目時的清單/樹狀拖放背景。",
- 	"highlight": "在清單/樹狀內搜尋時，相符醒目提示的清單/樹狀前景色彩。",
- 	"invalidItemForeground": "列表/樹狀 無效項目的前景色彩，例如在瀏覽視窗無法解析的根目錄",
-+<<<<<<< .our
- 	"listErrorForeground": "包含錯誤清單項目的前景色彩",
- 	"listWarningForeground": "包含警告清單項目的前景色彩",
-+=======
-+>>>>>>> .their
- 	"pickerGroupForeground": "分組標籤的快速選擇器色彩。",
- 	"pickerGroupBorder": "分組邊界的快速選擇器色彩。",
- 	"buttonForeground": "按鈕前景色彩。",
-changed in both
-  base   100644 0ab2723d455b03df6922643e417c6b598529a96c i18n/cht/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
-  our    100644 31e28bee8b2fa6ab24576143f66210f3f3343428 i18n/cht/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
-  their  100644 45d26626e6064c0863fbc82e8455ce07ab094b82 i18n/cht/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
-changed in both
-  base   100644 0f7f13446d00537101fe93eb9c9ce127e9a8612f i18n/cht/src/vs/workbench/browser/parts/panel/panelActions.i18n.json
-  our    100644 f31aedce3b1d6e2f250a4a2d07b452d64954f177 i18n/cht/src/vs/workbench/browser/parts/panel/panelActions.i18n.json
-  their  100644 53a530a4f42d361d23cbc0eadd612dee1d37d09e i18n/cht/src/vs/workbench/browser/parts/panel/panelActions.i18n.json
-changed in both
-  base   100644 d1c20d9850d5e82a259bdf7d4e58be316f6416a8 i18n/cht/src/vs/workbench/common/theme.i18n.json
-  our    100644 41a6d8c801b131296a56223489edd198cc2bf33b i18n/cht/src/vs/workbench/common/theme.i18n.json
-  their  100644 6be57ab281c6524fe9f41d9e4d4bfc88fbeb25c2 i18n/cht/src/vs/workbench/common/theme.i18n.json
-changed in both
-  base   100644 214d9764606639690dc51720f936d7427ef2d3f2 i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 bf339c91e8587ec53fe81a294c54ddc0f5aad010 i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 ecd8e3a4ce4cae8e336d8a2f3bcce2c88060f1bd i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -23,20 +23,35 @@
- 	"showIcons": "控制開啟的編輯器是否搭配圖示顯示。這需要同時啟用圖示佈景主題。",
- 	"enablePreview": "控制已開啟的編輯器是否顯示為預覽。預覽編輯器會重複使用到被保留 (例如按兩下或進行編輯) 並以斜體字型樣式顯示為止。",
- 	"enablePreviewFromQuickOpen": "控制透過 Quick Open 所開啟的編輯器是否顯示為預覽。預覽編輯器會重複使用到被保留 (例如按兩下或進行編輯) 為止。",
-+<<<<<<< .our
- 	"closeOnFileDelete": "控制顯示檔案的編輯器是否應在其他處理序刪除或重新命名該檔案時自動關閉。若停用此選項，當發生前述狀況時，編輯器會保持開啟，並呈現已變更的狀態。請注意，從應用程式內刪除一律會關閉編輯器，但已變更的檔案在資料未儲存前一律不會關閉。",
- 	"editorOpenPositioning": "控制編輯器的開啟位置。選取 [左] 或 [右] 可在目前使用中的編輯器左方或右方加以開啟。選取 [第一個] 或 [最後一個] 則可從目前使用中的編輯器另外加以開啟。",
- 	"revealIfOpen": "控制編輯器是否要在任何顯示的群組開啟時，在其中顯示。若啟用此選項，已經開啟的編輯器將會繼續顯示，而不會在目前使用中的編輯器群組中再開啟一次。請注意，有一些情況會忽略此設定，例如當強制編輯器在特定群組中開啟，或強制編輯器在目前使用中的群組旁開啟等情況。",
- 	"swipeToNavigate": "利用三指水平撥動在開啟的檔案間瀏覽。",
-+=======
-+	"editorOpenPositioning": "控制編輯器的開啟位置。選取 [左] 或 [右] 可在目前使用中的編輯器左方或右方加以開啟。選取 [第一個] 或 [最後一個] 則可從目前使用中的編輯器另外加以開啟。",
-+	"revealIfOpen": "控制編輯器是否要在任何顯示的群組開啟時，在其中顯示。若啟用此選項，已經開啟的編輯器將會繼續顯示，而不會在目前使用中的編輯器群組中再開啟一次。請注意，有一些情況會忽略此設定，例如當強制編輯器在特定群組中開啟，或強制編輯器在目前使用中的群組旁開啟等情況。",
-+>>>>>>> .their
- 	"commandHistory": "控制最近使用之命令的數量，以保留命令選擇區的記錄。設為 0 可停用命令列記錄。",
- 	"preserveInput": "控制下次開啟命令選擇區時，最後鍵入的輸入是否應該還原。",
- 	"closeOnFocusLost": "控制是否在 Quick Open 失去焦點時自動關閉。",
- 	"openDefaultSettings": "控制開啟設定時是否也會開啟顯示所有預設設定的編輯器。",
- 	"sideBarLocation": "控制項資訊看板的位置。可顯示於 Workbench 的左方或右方。",
-+<<<<<<< .our
- 	"panelDefaultLocation": "控制面板的預設位置。可顯示在 Workbench 的底部或是右方。",
- 	"statusBarVisibility": "控制 Workbench 底端狀態列的可視性。",
- 	"activityBarVisibility": "控制活動列在 workbench 中的可見度。",
- 	"viewVisibility": "控制檢視標頭動作的可見度。檢視標頭動作可為總是可見，或在檢視為焦點或暫留時才可見。",
- 	"fontAliasing": "控制工作台中的字型鋸齒化方法。\n- default: 子像素字型平滑化。在多數非 Retina 的顯示器上，這會使文字變得最鮮明\n- antialiased: 在像素層級上使字型平滑化，與子像素相對。能夠使字型整體顯示較亮\n- none: 停用字型平滑化。顯示的文字會帶有鋸齒狀銳利邊緣\n- auto: 根據顯示器的 DPI 自動套用 `default` 或 `antialiased`。",
-+=======
-+	"panelLocation": "控制面板的位置。其可顯示於工作台底部或工作台右方。",
-+	"statusBarVisibility": "控制 Workbench 底端狀態列的可視性。",
-+	"activityBarVisibility": "控制活動列在 workbench 中的可見度。",
-+	"closeOnFileDelete": "控制顯示檔案的編輯器是否應在其他處理序刪除或重新命名該檔案時自動關閉。若停用此選項，當發生前述狀況時，編輯器會保持開啟，並呈現已變更的狀態。請注意，從應用程式內刪除一律會關閉編輯器，但已變更的檔案在資料未儲存前一律不會關閉。",
-+	"experimentalFuzzySearchEndpoint": "表示要用於實驗性設定搜尋的端點。",
-+	"experimentalFuzzySearchKey": "表示要用於實驗性設定搜尋的索引碼。",
-+	"fontAliasing": "在 Workbench 中控制字型鋸齒化的方法。- 預設: 子像素字型平滑處理。在大部分非 Retina 顯示器上會顯示出最銳利的文字- 已消除鋸齒: 相對於子像素，根據像素層級平滑字型。可讓字型整體顯得較細- 無: 停用字型平滑處理。文字會以鋸齒狀的銳邊顯示 ",
-+>>>>>>> .their
- 	"workbench.fontAliasing.default": "子像素字型平滑處理。在大部分非 Retina 顯示器上會顯示出最銳利的文字。",
- 	"workbench.fontAliasing.antialiased": "相對於子像素，根據像素層級平滑字型。可以讓字型整體顯得較細。",
- 	"workbench.fontAliasing.none": "禁用字體平滑.文字將會顯示鋸齒狀與鋒利的邊緣.",
-@@ -63,7 +78,11 @@
- 	"restoreWindows": "控制重新啟動後視窗重新開啟的方式。選取 [無] 一律以空白工作區開始、選取 [一] 從上一個編輯的視窗重新開啟、選取 [資料夾] 重新開啟所有資料夾曾經開啟的視窗，或選取 [全部] 重新開啟上一個工作階段的所有視窗。",
- 	"restoreFullscreen": "控制當視窗在全螢幕模式下結束後，下次是否仍以全螢幕模式開啟。",
- 	"zoomLevel": "調整視窗的縮放比例。原始大小為 0，而且每個向上增量 (例如 1) 或向下增量 (例如 -1) 代表放大或縮小 20%。您也可以輸入小數，更細微地調整縮放比例。",
-+<<<<<<< .our
- 	"title": "依據使用中的編輯器控制視窗標題。變數會依據內容替換:\n${activeEditorShort}: 檔案名稱 (例如 myFile.txt)\n${activeEditorMedium}: 與工作區資料夾相關的檔案路徑 (例如 myFolder/myFile.txt)\n${activeEditorLong}: 完整的檔案路徑 (例如 /Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: 包含著資料夾之工作區資料夾的名稱 (例如 myFolder)\n${folderPath}: 包含著資料夾之工作區資料夾的檔案路徑 (例如 /Users/Development/myFolder)\n${rootName}: 工作區的名稱 (例如 myFolder 或 myWorkspace)\n${rootPath}: 工作區的檔案路徑 (例如 /Users/Development/myWorkspace)\n${appName}: 例如 VS Code\n${dirty}: 已變更指示 (若使用中編輯器已變更)\n${separator}: 僅在受具有值或靜態文字之變數括住時才顯示的條件式分隔符號 (\" - \")",
-+=======
-+	"title": "依據使用中的編輯器控制視窗標題。變數會依據內容替換:\n${activeEditorShort}: 檔案名稱 (例如 myFile.txt)\n${activeEditorMedium}: 與工作區資料夾相關的檔案路徑 (例如 myFolder/myFile.txt)\n${activeEditorLong}: 完整的檔案路徑 (例如 /Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: 包含著資料夾之工作區資料夾的名稱 (例如 myFolder)\n${folderPath}: 包含著資料夾之工作區資料夾的檔案路徑 (例如 /Users/Development/myFolder)\n${rootName}: 工作區的名稱 (例如 myFolder 或 myWorkspace)\n${rootPath}: 工作區的檔案路徑 (例如 /Users/Development/myWorkspace)\n${appName}: 例如 VS Code\n${dirty}: 已變更指示 (若使用中編輯器已變更)\n${separator}: 僅在受具有值之變數括住時才顯示的條件式分隔符號 (\" - \")",
-+>>>>>>> .their
- 	"window.newWindowDimensions.default": "在螢幕中央開啟新視窗。",
- 	"window.newWindowDimensions.inherit": "以相同於上一個使用中之視窗的維度開啟新視窗。",
- 	"window.newWindowDimensions.maximized": "開啟並最大化新視窗。",
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/cht/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
-  our    100644 878cdf5f6063a00dedeba0b807018878d8231a33 i18n/cht/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
-  their  100644 0cd89f075f4c67120b0c00a209bd1016d5919ab5 i18n/cht/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"selectAndStartDebug": "選取並啟動偵錯組態"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/cht/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json
-  our    100644 31b1b7d2564bc25056e27f5c6c0784db9ccbe9d8 i18n/cht/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json
-  their  100644 bde470acdcfc44f1ef99a63ae9ccc8f80b25fd67 i18n/cht/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,6 +8,14 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"startAdditionalSession": "啟動附加工作階段",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"debugFocusVariablesView": "焦點變數",
- 	"debugFocusWatchView": "焦點監看",
- 	"debugFocusCallStackView": "焦點呼叫堆疊",
-changed in both
-  base   100644 d0f395c762cc8231e0c86fd9a37f74240ddf9441 i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 a922616389e0d8d38ea207e5428979e5adf305ab i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 c0721bb661f75f428ba869d95795a30cbc0295a5 i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -17,8 +17,12 @@
- 	"multipleConfigurationNamesInWorkspace": "工作區中有多個啟動組態 '{0}'。請使用資料夾名稱以符合組態。",
- 	"noFolderWithName": "在複合 '{2}' 的組態 '{1}' 中找不到名稱為 '{0}' 的資料夾。",
- 	"configMissing": "'launch.json' 中遺漏組態 '{0}'。",
-+<<<<<<< .our
- 	"launchJsonDoesNotExist": "'launch.json' 不存在。",
- 	"debugRequestNotSupported": "在選取的偵錯組態中，屬性 '{0}' 具有不支援的值 '{1}'。",
-+=======
-+	"debugRequestNotSupported": "在選取的偵錯組態中，屬性 `{0}` 具有不支援的值 '{1}'。",
-+>>>>>>> .their
- 	"debugRequesMissing": "所選的偵錯組態遺漏屬性 '{0}'。",
- 	"debugTypeNotSupported": "不支援設定的偵錯類型 '{0}'。",
- 	"debugTypeMissing": "遺漏所選啟動設定的屬性 'type'。",
-@@ -28,7 +32,13 @@
- 	"preLaunchTaskExitCode": "preLaunchTask '{0}' 已終止，結束代碼為 {1}。",
- 	"showErrors": "顯示錯誤",
- 	"noFolderWorkspaceDebugError": "無法對使用中的檔案偵錯。請確認檔案已儲存在磁碟上，而且您已經為該檔案類型安裝偵錯延伸模組。",
-+<<<<<<< .our
- 	"cancel": "取消",
- 	"DebugTaskNotFound": "找不到工作 \"{0}\"。",
- 	"taskNotTracked": "無法追蹤工作 '{0}'。"
-+=======
-+	"NewLaunchConfig": "請為您的應用程式設定啟動組態檔。{0}",
-+	"DebugTaskNotFound": "找不到 preLaunchTask '{0}'。",
-+	"taskNotTracked": "無法追蹤 preLaunchTask '{0}'。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 39f259be4a4565ffa1889f2c9b1993855cb0fa6b i18n/cht/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json
-  our    100644 2078f05bf9e4abe80258f21462b306a01ed8951c i18n/cht/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json
-  their  100644 0ea305aec9849549ee72df537504810c79cbd6dc i18n/cht/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json
-changed in both
-  base   100644 0f96abef009452a5923da8c14c469acff06c99a0 i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 beddde6d10ce2b9a74005421467ca470c839a054 i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 237dad58880e375f08a6ee7525cb9e02ab068a78 i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-@@ -50,6 +50,10 @@
- 	"allExtensionsInstalled": "所有建議此工作區使用的延伸模組皆已安裝",
- 	"installRecommendedExtension": "安裝建議的擴充功能",
- 	"extensionInstalled": "建議的延伸模組已安裝",
-+<<<<<<< .our
-+=======
-+	"showRecommendedKeymapExtensions": "顯示建議的按鍵對應",
-+>>>>>>> .their
- 	"showRecommendedKeymapExtensionsShort": "按鍵對應",
- 	"showLanguageExtensionsShort": "語言擴充功能",
- 	"showAzureExtensionsShort": "Azure 延伸模組",
-changed in both
-  base   100644 12e2f0aa4b6e5cb9ead900314545e175ce4f9734 i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json
-  our    100644 70882d7de8177b123c7f54e2bee8c9af1a9d2a96 i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json
-  their  100644 341469ea139021497caf7a34161a4a5a39a7447d i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json
-changed in both
-  base   100644 654ea0ca06eb4f27cccfe6d1419774568c6d3fb4 i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 68a719930ef86e9c0443de55d9783ccfe2efafc4 i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 89b01309fa3551db55acdecd525dbbe3e36cb497 i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,11 @@
- 	"exeBasedRecommendation": "因為您已安裝 {0}，所以建議您使用此延伸模組。",
- 	"fileBasedRecommendation": "根據您最近開啟的檔案，建議您使用此延伸模組。",
- 	"workspaceRecommendation": "根據目前工作區的使用者，建議您使用此延伸模組。",
-+=======
-+	"fileBasedRecommendation": "根據您最近開啟的檔案，建議您使用此延伸模組。",
-+	"workspaceRecommendation": "根據目前工作區的使用者，建議您使用此延伸模組。",
-+	"exeBasedRecommendation": "因為您已安裝 {0}，所以建議您使用此延伸模組。",
-+>>>>>>> .their
- 	"reallyRecommended2": "建議對此檔案類型使用 '{0}' 延伸模組。",
- 	"reallyRecommendedExtensionPack": "建議對此檔案類型使用 '{0}' 延伸模組套件。",
- 	"install": "安裝",
-changed in both
-  base   100644 9bfb2638d94f361f43459f5175b8e552e94027cc i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
-  our    100644 62bbf9c79c788286aa72279f14be4742ad2f9c64 i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
-  their  100644 7f2d518eb06c1e8fbfacf31b45d2b33e9e5cdd77 i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
-@@ -10,6 +10,10 @@
- 	"installVSIX": "從 VSIX 安裝...",
- 	"installFromVSIX": "從 VSIX 安裝",
- 	"installButton": "安裝(&&I)",
-+<<<<<<< .our
- 	"InstallVSIXAction.success": "已成功安裝擴充功能。請重新載入以啟用。",
-+=======
-+	"InstallVSIXAction.success": "已成功安裝延伸模組。請重新啟動以啟用。",
-+>>>>>>> .their
- 	"InstallVSIXAction.reloadNow": "立即重新載入"
- }
-\ No newline at end of file
-changed in both
-  base   100644 0f1bae7913a757467542f2362fa38bf3f0429cff i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  our    100644 6233388a0658b8bb5644c8edb3109bcd919c8977 i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  their  100644 f605535d76c93e6aa2f1e99f9cd99e4e9845fee5 i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-@@ -12,9 +12,12 @@
- 	"recommendedExtensions": " 推薦項目",
- 	"otherRecommendedExtensions": "其他建議",
- 	"workspaceRecommendedExtensions": "工作區建議",
-+<<<<<<< .our
- 	"builtInExtensions": "功能",
- 	"builtInThemesExtensions": "主題",
- 	"builtInBasicsExtensions": "程式語言",
-+=======
-+>>>>>>> .their
- 	"searchExtensions": "在 Marketplace 中搜尋擴充功能",
- 	"sort by installs": "排序依據: 安裝計數",
- 	"sort by rating": "排序依據: 評等",
-changed in both
-  base   100644 d858ed8a7c4219916f3084bed17794497f73522c i18n/cht/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  our    100644 c32641ccebc8fbed926c69242f64a9fbc36d13e0 i18n/cht/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  their  100644 61b98653e608e6aed6d24d04bf5072cf0afa892d i18n/cht/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-changed in both
-  base   100644 79cb63cbd79a2447e6395a2077169c9bf337567e i18n/cht/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json
-  our    100644 6a593deff2fc0ce04244d46f2c4131028e76fe0a i18n/cht/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json
-  their  100644 5ef902a997964e2dafebafd4e54d2d1ae890ee8f i18n/cht/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"label": "問題",
- 	"tooltip.1": "此檔案發生 1 個問題",
- 	"tooltip.N": "此檔案發生 {0} 個問題",
-changed in both
-  base   100644 9c86c672deea1a50dec032d7077d132741ab4784 i18n/cht/src/vs/workbench/parts/markers/common/messages.i18n.json
-  our    100644 277304218a05614a88d10d3dfa976833dcf8b63a i18n/cht/src/vs/workbench/parts/markers/common/messages.i18n.json
-  their  100644 2871ecef6100600b25f1f4eefac80e6144c4cfc7 i18n/cht/src/vs/workbench/parts/markers/common/messages.i18n.json
-@@ -7,8 +7,14 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"viewCategory": "檢視",
-+<<<<<<< .our
- 	"problems.view.toggle.label": "切換至問題(錯誤, 警告, 資訊)",
- 	"problems.view.focus.label": "聚焦於問題(錯誤, 警告, 資訊)",
-+=======
-+	"problems.view.toggle.label": "切換問題",
-+	"problems.view.show.label": "顯示問題",
-+	"problems.view.hide.label": "隱藏問題",
-+>>>>>>> .their
- 	"problems.panel.configuration.title": "[問題] 檢視",
- 	"problems.panel.configuration.autoreveal": "控制 [問題] 檢視是否應自動在開啟檔案時加以顯示",
- 	"markers.panel.title.problems": "問題",
-changed in both
-  base   100644 48b44c3d44359323cdfa0c7f03fdb5eb59f0a03b i18n/cht/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json
-  our    100644 88fd157d4b8741d29d13c755692e6832dd45edae i18n/cht/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json
-  their  100644 ad0765b8108c555ae3590e6156f15ae6189f18a4 i18n/cht/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"copyMarker": "複製",
- 	"copyMarkerMessage": "複製訊息"
- }
-\ No newline at end of file
-changed in both
-  base   100644 b9978e763e1113f5c4d3ba3f02ab0966a58a61f8 i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-  our    100644 566a9672a3c11b4b95771bf96fbcc2d8a852e888 i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-  their  100644 175a2c3161c7aff2b5c4e51c48ac145f9bd8cf7c i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-@@ -9,6 +9,7 @@
- 	"SearchSettingsWidget.AriaLabel": "搜尋設定",
- 	"SearchSettingsWidget.Placeholder": "搜尋設定",
- 	"noSettingsFound": "沒有結果",
-+<<<<<<< .our
- 	"oneSettingFound": "找到 1 項設定",
- 	"settingsFound": "找到 {0} 項設置",
- 	"totalSettingsMessage": "共 {0} 項設定",
-@@ -18,6 +19,12 @@
- 	"defaultUserSettings": "預設使用者設定",
- 	"defaultWorkspaceSettings": "預設工作區設定",
- 	"defaultFolderSettings": "預設資料夾設定",
-+=======
-+	"oneSettingFound": "1 項相符設定",
-+	"settingsFound": "{0} 項相符設定",
-+	"fileEditorWithInputAriaLabel": "{0}。文字檔編輯器。",
-+	"fileEditorAriaLabel": "文字檔編輯器。",
-+>>>>>>> .their
- 	"defaultEditorReadonly": "在右方編輯器中編輯以覆寫預設。",
- 	"preferencesAriaLabel": "預設喜好設定。唯讀文字編輯器。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 e7ace859036d426fe0c8133415222dd8fea05912 i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 912f924cec997084f6bbf36563d0171c3e38d0e5 i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 194d1e8d5141c132bc5917ba78c3a8777d72c2c5 i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -13,5 +13,13 @@
- 	"newExtensionLabel": "顯示擴充功能 \"{0}\"",
- 	"editTtile": "編輯",
- 	"replaceDefaultValue": "在設定中取代",
-+<<<<<<< .our
- 	"copyDefaultValue": "複製到設定"
-+=======
-+	"copyDefaultValue": "複製到設定",
-+	"unsupportedPHPExecutablePathSetting": "這項設定必須是使用者設定。若要設定工作區的 PHP，請開啟 PHP 檔案並按一下狀態列中的 [PHP 路徑]。",
-+	"unsupportedWorkspaceSetting": "這項設定必須是使用者設定。",
-+	"unsupportedWorkbenchSetting": "目前無法套用此設定。要在您直接開啟此資料夾時才會套用。",
-+	"unsupportedWorkbenchSettingDevMode": "目前無法套用此設定。若您在註冊時將其範圍定義為「資源」，或您直接開啟此資料夾時，才會套用該設定。 "
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a459e99912abb9115dd3dd27bd29465c94f405b5 i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 17bda120dbd77f09aaae9b33d7a0fd346cfe2603 i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 6fc789518cb4fddf44fc175c403aa145cdae9f39 i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,4 +13,11 @@
- 	"userSettings": "使用者設定",
- 	"workspaceSettings": "工作區設定",
- 	"folderSettings": "資料夾設定"
-+=======
-+	"defaultSettingsFuzzyPrompt": "嘗試模糊搜尋!",
-+	"defaultSettings": "將您的設定放置於右方編輯器中以覆寫。",
-+	"noSettingsFound": "找不到任何設定。",
-+	"folderSettingsDetails": "資料夾設定",
-+	"enableFuzzySearch": "啟用實驗性模糊搜尋"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 4a5625894bd6dacc5f486e4c24636132474ae2ec i18n/cht/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  our    100644 8733c537f59df2fc8c00e76d49613ca2252a3d72 i18n/cht/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  their  100644 3aed58520858912cd1bb672948bfa8d19d71ffdf i18n/cht/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-@@ -7,5 +7,6 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"commonlyUsed": "經常使用的",
-+	"mostRelevant": "最相關的",
- 	"defaultKeybindingsHeader": "將按鍵組合放入您的按鍵組合檔案中加以覆寫。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 31900ffc0bceab06359726cffa18cb4394b291cd i18n/cht/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  our    100644 9b318b09ce08ab0ea0c2bb529eb879057b9096c4 i18n/cht/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  their  100644 89585021dddf614fe5f7fa7c4941bc4a9ca9178b i18n/cht/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-changed in both
-  base   100644 8c7471e99523a866f27c0e545d5fb747bcef360c i18n/cht/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-  our    100644 a561a356071b8dd1908e1e30765d3879d46612fc i18n/cht/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-  their  100644 fd139000f171df04a8411521a45b259d5888ebf6 i18n/cht/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,12 +7,17 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"changes": "{0}/{1} 已變更 ",
- 	"change": "{0}/{1} 已變更 ",
- 	"show previous change": "顯示上一個變更",
- 	"show next change": "顯示下一個變更",
-+<<<<<<< .our
- 	"move to previous change": "移至上一個變更",
- 	"move to next change": "移至下一個變更",
-+=======
-+>>>>>>> .their
- 	"editorGutterModifiedBackground": "修改中的行於編輯器邊框的背景色彩",
- 	"editorGutterAddedBackground": "新增後的行於編輯器邊框的背景色彩",
- 	"editorGutterDeletedBackground": "刪除後的行於編輯器邊框的背景色彩",
-changed in both
-  base   100644 7bbfb9ecd08bb5baf70ef0dcd58f7a7734150ed1 i18n/cht/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
-  our    100644 2737e83ab4e2d72307285d25741cd8198fec0007 i18n/cht/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
-  their  100644 2192cc5b3fe3219d9fb4d15886f003ba08688c57 i18n/cht/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
-@@ -16,6 +16,10 @@
- 	"exclude.boolean": "要符合檔案路徑的 Glob 模式。設為 True 或 False 可啟用或停用模式。",
- 	"exclude.when": "在相符檔案同層級上額外的檢查。請使用 $(basename) 作為相符檔案名稱的變數。",
- 	"useRipgrep": "控制是否要在文字和檔案搜尋中使用 ripgrep",
-+<<<<<<< .our
-+=======
-+	"useIgnoreFilesByDefault": "控制在新的工作區中搜尋文字時，是否要根據預設使用 .gitignore 及 .ignore 檔案。 ",
-+>>>>>>> .their
- 	"useIgnoreFiles": "控制在搜尋檔案時，是否要使用 .gitignore 及 .ignore 檔案。 ",
- 	"search.quickOpen.includeSymbols": "設定以將全域符號搜尋的結果納入 Quick Open 的檔案結果中。",
- 	"search.followSymlinks": "控制是否要在搜尋時遵循 symlink。"
-changed in both
-  base   100644 0c44c7464bbef28008247d06bb6f110ceb045313 i18n/cht/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 ba1fd77bc20f96eb0056aa05843bd1bb7818c0eb i18n/cht/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 010379cf8d2677fb6f6aa3a7595e50a91f1292d6 i18n/cht/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-@@ -15,7 +15,14 @@
- 	"nextReplaceTerm": "顯示下一個搜尋取代字詞",
- 	"previousReplaceTerm": "顯示上一個搜尋取代字詞",
- 	"findInFiles": "在檔案中尋找",
-+	"findInFilesWithSelectedText": "在檔案中尋找選取的文字 ",
- 	"replaceInFiles": "檔案中取代",
-+<<<<<<< .our
-+=======
-+	"replaceInFilesWithSelectedText": "在檔案中取代為選取的文字",
-+	"findInWorkspace": "在工作區中尋找...",
-+	"findInFolder": "在資料夾中尋找...",
-+>>>>>>> .their
- 	"RefreshAction.label": "重新整理",
- 	"CollapseDeepestExpandedLevelAction.label": "全部摺疊",
- 	"ClearSearchResultsAction.label": "清除",
-changed in both
-  base   100644 476bfa47553799e29f2fa5e7e980ce959e11568f i18n/cht/src/vs/workbench/parts/search/browser/searchWidget.i18n.json
-  our    100644 9f58470dad6c9ad5343bbd7bcf8622229350bd54 i18n/cht/src/vs/workbench/parts/search/browser/searchWidget.i18n.json
-  their  100644 67da11e079a47a637602847aaf59a75fad8eb961 i18n/cht/src/vs/workbench/parts/search/browser/searchWidget.i18n.json
-changed in both
-  base   100644 bfcd3e1c0bbdf1ab1598004759eee42ac03f17b2 i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  our    100644 763c92b7367ac35034e9498d362e409a1ce2c7f1 i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 e7261d392fd61f6d6e84e036a1d31a2661b64366 i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-changed in both
-  base   100644 aabd84b62703cc0dc93c1faa54832bcc0652892b i18n/cht/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 9a7f1ae524570aa14ab8735a1962f8357f3564aa i18n/cht/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 be4401acabb6dcfaaba6d60226470fd10a498954 i18n/cht/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-@@ -28,6 +28,7 @@
- 	"JsonSchema.tasks.group.none": "指派工作到沒有群組",
- 	"JsonSchema.tasks.group": "定義工作屬於哪個執行群組。支援將 「組建」新增到組建群組，以及將「測試」新增到測試群組。",
- 	"JsonSchema.tasks.type": "定義工作在殼層中會作為處理序或命令來執行。",
-+<<<<<<< .our
- 	"JsonSchema.commandArray": "要執行的 shell 命令。陣列項目會以空白字元連接",
- 	"JsonSchema.command.quotedString.value": "實際命令值",
- 	"JsonSchema.tasks.quoting.escape": "使用殼層逸出字元的逸出字元 (例如  ` under PowerShell 與 \\ under bash)。",
-@@ -38,6 +39,8 @@
- 	"JsonSchema.args.quotedString.value": "實際參數值",
- 	"JsonSchema.args.quotesString.quote": "如何引用參數值。",
- 	"JsonSchema.tasks.args": "叫用此工作時，傳遞至命令的引數。",
-+=======
-+>>>>>>> .their
- 	"JsonSchema.tasks.label": "工作的使用者介面標籤",
- 	"JsonSchema.version": "組態版本號碼",
- 	"JsonSchema.tasks.identifier": "用以參考在 launch.json 或 dependsOn 子句中工作的使用者定義識別碼。",
-changed in both
-  base   100644 c9cc1fc25d5c06394a4c3b57fc34e576e50f6620 i18n/cht/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 a13d5229d23a832c6ada352df9587e856b73629f i18n/cht/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 0e7261b9d399d717b2c03fc5f095815884d64991 i18n/cht/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -17,7 +17,10 @@
- 	"runningTasks": "顯示執行中的工作",
- 	"tasks": "工作",
- 	"TaskSystem.noHotSwap": "必須重新載入視窗才可變更執行使用中工作的工作執行引擎",
-+<<<<<<< .our
- 	"reloadWindow": "重新載入視窗",
-+=======
-+>>>>>>> .their
- 	"TaskServer.folderIgnored": "因為資料夾 {0} 使用工作版本 0.1.0，所以已將其忽略",
- 	"TaskService.noBuildTask1": "未定義任何建置工作。請使用 'isBuildCommand' 標記 tasks.json 檔案中的工作。",
- 	"TaskService.noBuildTask2": "未定義任何組建工作，請在 tasks.json 檔案中將工作標記為 'build' 群組。",
-changed in both
-  base   100644 5a928b9d9111d5d9e6cb87a0aebff35db98aebd7 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 dc4a98ed7869a7cc55922d5bc3bb8ecb137f6a4d i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 80abe8bb59c2d8ae4b753b7631b622d1b57645e7 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -21,8 +21,12 @@
- 	"terminal.integrated.fontSize": "控制終端機的字型大小 (以像素為單位)。",
- 	"terminal.integrated.letterSpacing": "控制終端機的字元間距，這是一個整數值，用於呈現增加在字元間額外的像素量。",
- 	"terminal.integrated.lineHeight": "控制終端機的行高，此數字會乘上終端機字型大小，以取得以像素為單位的實際行高。",
-+<<<<<<< .our
- 	"terminal.integrated.fontWeight": "在終端機內使用非粗體文字的字體寬度。",
- 	"terminal.integrated.fontWeightBold": "在終端機內使用粗體文字的字體寬度。",
-+=======
-+	"terminal.integrated.enableBold": "是否要在終端機中啟用粗體文字，請注意，此動作須有終端機殼層的支援。",
-+>>>>>>> .their
- 	"terminal.integrated.cursorBlinking": "控制終端機資料指標是否閃爍。",
- 	"terminal.integrated.cursorStyle": "控制終端機資料指標的樣式。",
- 	"terminal.integrated.scrollback": "控制終端機保留在其緩衝區中的行數上限。",
-changed in both
-  base   100644 2775ad9c28f2fdba709bae3f8436d64a3327d0fd i18n/cht/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 d8a57b177d1c5bed0bf72818f809bba5c7dd5e99 i18n/cht/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 c5b1ea92a759f2530f2f26416c59139d2c16a708 i18n/cht/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/cht/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
-  our    100644 98abedaa506e334b03c961eed48bc5befdd3e270 i18n/cht/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
-  their  100644 40b81b62803ba72fcb651ade9a7202a7974f4007 i18n/cht/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"bubbleTitle": "包含強調項目"
- }
-\ No newline at end of file
-changed in both
-  base   100644 6603fae31c10d22bf8cb8d90a8b04fa599014b55 i18n/cht/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-  our    100644 56b196ad36bcae9e4b0e6df8622c4a2997889401 i18n/cht/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-  their  100644 69ba4ba857370ae4f9329bdc3a898d79a16ff1df i18n/cht/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-@@ -9,9 +9,14 @@
- 	"schema.token.settings": "權杖的色彩與樣式。",
- 	"schema.token.foreground": "權杖的前景色彩。",
- 	"schema.token.background.warning": "目前不支援權杖背景色彩。",
-+<<<<<<< .our
- 	"schema.token.fontStyle": "字體格式規則: 'italic', 'bold' 或 'underline' 或是組合。空白字串取消繼承設定。",
- 	"schema.fontStyle.error": "字體格式必需是 'italic', 'bold' 或 'underline' 或是組合，或是空白字串。",
- 	"schema.token.fontStyle.none": "None (清除繼承格式)",
-+=======
-+	"schema.token.fontStyle": "規則的字型樣式:「斜體」、「粗體」或「底線」之一或其組合",
-+	"schema.fontStyle.error": "字形樣式必須是「斜體」、「粗體」及「底線」的組合",
-+>>>>>>> .their
- 	"schema.properties.name": "規則的描述。",
- 	"schema.properties.scope": "針對此規則符合的範圍選取器。",
- 	"schema.tokenColors.path": "tmTheme 檔案的路徑 (相對於目前檔案)。",
-changed in both
-  base   100644 0a88095914150e3915d503b65db56f9bce253367 i18n/cht/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
-  our    100644 93b15989326bd32d742e9f366768fea18c366633 i18n/cht/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
-  their  100644 181f05848923e46c7df0f1c8c2ff006bb345b652 i18n/cht/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
-changed in both
-  base   100644 96e1b32dbec624cefbd34c9c8f2f9665658883f5 i18n/cht/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  our    100644 4d4e5f4f69d10620c3c84b07885a16c64b735010 i18n/cht/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  their  100644 283d3809ddb10d028c96aed1895e6717e7489153 i18n/cht/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -9,4 +10,14 @@
- 	"errorInvalidTaskConfiguration": "無法寫入工作區組態檔。請開啟檔案更正其中的錯誤/警告，然後再試一次。 ",
- 	"errorWorkspaceConfigurationFileDirty": "因為檔案已變更，所以無法寫入工作區組態檔。請將其儲存，然後再試一次。",
- 	"openWorkspaceConfigurationFile": "開啟工作區組態設定"
-+=======
-+	"errorInvalidTaskConfiguration": "無法寫入工作區組態檔。請開啟檔案更正其中的錯誤/警告，然後再試一次。 ",
-+	"errorWorkspaceConfigurationFileDirty": "因為檔案已變更，所以無法寫入工作區組態檔。請將其儲存，然後再試一次。",
-+	"openWorkspaceConfigurationFile": "開啟工作區組態檔",
-+	"close": "關閉",
-+	"enterWorkspace.close": "關閉",
-+	"enterWorkspace.dontShowAgain": "不要再顯示",
-+	"enterWorkspace.moreInfo": "詳細資訊",
-+	"enterWorkspace.prompt": "深入了解在 VS Code 中使用多個資料夾。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7c71a6c1109a8ef7559d41d7d032f512a3f912fd i18n/deu/extensions/emmet/package.i18n.json
-  our    100644 76a0f1cf2f4933fe2973e0cc716d5590fccebd37 i18n/deu/extensions/emmet/package.i18n.json
-  their  100644 0ad73e29fcce56eed3ee7f1a2744e6a679536cb6 i18n/deu/extensions/emmet/package.i18n.json
-@@ -35,7 +35,11 @@
- 	"emmetExtensionsPath": "Pfad zu einem Ordner mit Emmet-Profilen und Ausschnitten.",
- 	"emmetShowExpandedAbbreviation": "Zeigt erweiterte Emmet-Abkürzungen als Vorschläge an.\nDie Option inMarkupAndStylesheetFilesOnly gilt für HTML, HAML, Jade, Slim, XML, XSL, CSS, SCSS, Sass, Less und Stylus.\nDie Option \"always\" gilt unabhängig vom Markup/CSS für alle Teile der Datei.",
- 	"emmetShowAbbreviationSuggestions": "Zeigt mögliche Emmet-Abkürzungen als Vorschläge an. Diese Option gilt nicht in Stylesheets oder wenn emmet.showExpandedAbbreviation auf \"never\" festgelegt ist.",
-+<<<<<<< .our
- 	"emmetIncludeLanguages": "Aktivieren Sie Emmet-Abkürzungen in Sprachen, die nicht standardmäßig unterstützt werden. Fügen Sie hier eine Zuordnung zwischen der Sprache und der von Emmet unterstützten Sprache hinzu.\nBeispiel: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
-+=======
-+	"emmetIncludeLanguages": "Aktivieren Sie Emmet-Abkürzungen in Sprachen, die nicht standardmäßig unterstützt werden. Fügen Sie hier ein Mapping zwischen der Sprache und der von Emmet unterstützten Sprache hinzu.\nBeispiel: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
-+>>>>>>> .their
- 	"emmetVariables": "In Emmet-Ausschnitten zu verwendende Codeausschnitte",
- 	"emmetTriggerExpansionOnTab": "Wenn aktiviert, werden Emmet-Abkürzungen beim Drücken der TAB-Taste erweitert.",
- 	"emmetPreferences": "Einstellungen, die zum Ändern des Verhaltens einiger Aktionen und Konfliktlöser von Emmet verwendet werden.",
-@@ -52,6 +56,7 @@
- 	"emmetPreferencesBemModifierSeparator": "Modifizierertrennzeichen für Klassen unter Verwendung des BEM-Filters",
- 	"emmetPreferencesFilterCommentBefore": "Eine Kommentardefinition, die vor dem abgeglichenen Element platziert werden muss, wenn ein Kommentarfilter angewendet wird.",
- 	"emmetPreferencesFilterCommentAfter": "Eine Kommentardefinition, die nach dem abgeglichenen Element platziert werden muss, wenn ein Kommentarfilter angewendet wird.",
-+<<<<<<< .our
- 	"emmetPreferencesFilterCommentTrigger": "Eine durch Trennzeichen getrennte Liste von Attributnamen, die in abgekürzter Form vorliegen müssen, damit der Kommentarfilter angewendet werden kann",
- 	"emmetPreferencesFormatNoIndentTags": "Ein Array von Tagnamen, die keinen inneren Einzug erhalten",
- 	"emmetPreferencesFormatForceIndentTags": "Ein Array von Tagnamen, die immer einen inneren Einzug erhalten",
-@@ -62,4 +67,7 @@
- 	"emmetPreferencesCssMsProperties": "Durch Trennzeichen getrennte CSS-Eigenschaften, die das \"ms\"-Herstellerpräfix erhalten, wenn sie in einer Emmet-Abkürzung verwendet werden, die mit \"-\" beginnt. Legen Sie eine leere Zeichenfolge fest, um das \"ms\"-Präfix immer zu vermeiden.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "Das Mindestergebnis (zwischen 0 und 1), das die Abkürzung mit Fuzzyübereinstimmung erreichen muss. Niedrigere Werte führen zu vielen falsch positiven Übereinstimmungen, höhere Werte verringern unter Umständen die möglichen Übereinstimmungen.",
- 	"emmetOptimizeStylesheetParsing": "Bei der Einstellung FALSE wird die gesamte Datei analysiert, um zu bestimmten, ob die aktuelle Position zum Erweitern von Emmet-Abkürzungen gültig ist. Bei der Einstellung TRUE wird nur der Inhalt um die die aktuelle Position in CSS-/SCSS-/LESS-Dateien analysiert."
-+=======
-+	"emmetPreferencesFilterCommentTrigger": "Eine durch Trennzeichen getrennte Liste von Attributnamen, die in abgekürzter Form vorliegen müssen, damit der Kommentarfilter angewendet werden kann"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 42eb8374ef1ed116043b781c028299eef8811af7 i18n/deu/extensions/git/package.i18n.json
-  our    100644 70e0819e8ad95e53d1958520356a5b59f85a5e7c i18n/deu/extensions/git/package.i18n.json
-  their  100644 c692dbace3203f98dcd1752699dd3f74108d8f74 i18n/deu/extensions/git/package.i18n.json
-@@ -73,15 +73,22 @@
- 	"config.enableCommitSigning": "Aktiviert das Signieren von Commits per GPG.",
- 	"config.discardAllScope": "Legt fest, welche Änderungen vom Befehl \"Alle Änderungen verwerfen\" verworfen werden. \"all\" verwirft alle Änderungen. \"tracked\" verwirft nur verfolgte Dateien. \"prompt\" zeigt immer eine Eingabeaufforderung an, wenn die Aktion ausgeführt wird.",
- 	"config.decorations.enabled": "Steuert, ob Git Farben und Badges für die Explorer-Ansicht und die Ansicht \"Geöffnete Editoren\" beiträgt.",
-+<<<<<<< .our
- 	"config.promptToSaveFilesBeforeCommit": "Legt fest, ob Git vor dem einchecken nach nicht gespeicherten Dateien suchen soll.",
- 	"config.showInlineOpenFileAction": "Steuert, ob eine Inlineaktion zum Öffnen der Datei in der Ansicht \"Git-Änderungen\" angezeigt wird.",
- 	"config.inputValidation": "Steuert, wann die Commit-Meldung der Eingabevalidierung angezeigt wird.",
- 	"config.detectSubmodules": "Steuert, ob Git-Submodule automatisch erkannt werden.",
- 	"config.detectSubmodulesLimit": "Steuert die Begrenzung der Git-Submodule.",
-+=======
-+>>>>>>> .their
- 	"colors.modified": "Farbe für geänderte Ressourcen.",
- 	"colors.deleted": "Farbe für gelöschten Ressourcen.",
- 	"colors.untracked": "Farbe für nicht verfolgte Ressourcen.",
- 	"colors.ignored": "Farbe für ignorierte Ressourcen.",
-+<<<<<<< .our
- 	"colors.conflict": "Farbe für Ressourcen mit Konflikten.",
- 	"colors.submodule": "Farbe für Submodul-Ressourcen."
-+=======
-+	"colors.conflict": "Farbe für Ressourcen mit Konflikten."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/deu/extensions/npm/out/main.i18n.json
-  our    100644 a918970a6307af5d2a1f40327409f2c207b5df27 i18n/deu/extensions/npm/out/main.i18n.json
-  their  100644 b04014ab749458d12dfc7b312b7c287f5d940ee6 i18n/deu/extensions/npm/out/main.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"npm.parseError": "NPM-Aufgabenerkennung: Fehler beim Analysieren der Datei {0}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 6d17843d6df9f96161ae53acd02b6b8739c05b6b i18n/deu/extensions/npm/package.i18n.json
-  our    100644 8df75704426af1d4997cfc228d8144b23fc7a25f i18n/deu/extensions/npm/package.i18n.json
-  their  100644 9ed4a7c230ccb9f580eefac992074db53455740e i18n/deu/extensions/npm/package.i18n.json
-@@ -11,6 +11,7 @@
- 	"config.npm.autoDetect": "Steuert, ob die automatische Erkennung von NPM-Skripts aktiviert oder deaktiviert ist. Standardmäßig ist die Funktion aktiviert.",
- 	"config.npm.runSilent": "npm-Befehle mit der Option \"--silent\" ausführen.",
- 	"config.npm.packageManager": "Der zu verwendende Paket-Manager, um Skripte auszuführen.",
-+<<<<<<< .our
- 	"config.npm.exclude": "Konfigurieren Sie Globmuster für Ordner, die von der automatischen Skripterkennung ausgeschlossen werden sollen.",
- 	"config.npm.enableScriptExplorer": "Aktiviert eine Exploreransicht für npm-Skripts.",
- 	"config.npm.scriptExplorerAction": "Die im Skript-Explorer verwendete Standardaktion für Klicks. Mögliche Werte sind \"open\" (Standard) und \"run\".",
-@@ -23,4 +24,7 @@
- 	"command.debug": "Debuggen",
- 	"command.openScript": "Öffnen",
- 	"command.runInstall": "Installation ausführen"
-+=======
-+	"npm.parseError": "NPM-Aufgabenerkennung: Fehler beim Analysieren der Datei {0}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 fa115368c8db3387bdc92d74f7958c9a95b511bf i18n/deu/extensions/typescript/out/features/completionItemProvider.i18n.json
-  our    100644 c1be716a2f83a6b7af9b27666136cecb21feb9c4 i18n/deu/extensions/typescript/out/features/completionItemProvider.i18n.json
-  their  100644 87035b7816ff0878666285b0955ef5519696be06 i18n/deu/extensions/typescript/out/features/completionItemProvider.i18n.json
-changed in both
-  base   100644 3725f9400c0712f992450dc16d13ea0379bb72b8 i18n/deu/extensions/typescript/package.i18n.json
-  our    100644 6f8bb4fea941525ab897f97cd6506e129d2eb1f4 i18n/deu/extensions/typescript/package.i18n.json
-  their  100644 11769f91e3fa73ffba0c465b7feacd5b4547447a i18n/deu/extensions/typescript/package.i18n.json
-@@ -55,7 +55,11 @@
- 	"typescript.quickSuggestionsForPaths": "Aktiviert oder deaktiviert Schnellvorschläge, wenn Sie einen Importpfad ausschreiben.",
- 	"typescript.locale": "Legt das zum Melden von TypeScript-Fehlern verwendete Gebietsschema fest. Erfordert TypeScript 2.6.0 oder höher. Der Standardwert \"null\" verwendet für TypeScript-Fehler das Gebietsschema von VS Code.",
- 	"javascript.implicitProjectConfig.experimentalDecorators": "Aktiviert oder deaktiviert \"experimentalDecorators\" für JavaScript-Dateien, die nicht Teil eines Projekts sind. Vorhandene jsconfig.json- oder tsconfig.json-Dateien setzen diese Einstellung außer Kraft. Erfordert TypeScript 2.3.1 oder höher.",
-+<<<<<<< .our
- 	"typescript.autoImportSuggestions.enabled": "Aktiviert oder deaktiviert Vorschläge für den automatischen Import. Erfordert TypeScript 2.6.1 oder höher.",
- 	"typescript.experimental.syntaxFolding": "Aktiviert bzw. deaktiviert die syntaxabhängigen Faltungsmarkierungen.",
- 	"taskDefinition.tsconfig.description": "Die \"tsconfig\"-Datei, die den TS-Build definiert."
-+=======
-+	"typescript.autoImportSuggestions.enabled": "Aktiviert oder deaktiviert Vorschläge für den automatischen Import. Erfordert TypeScript 2.6.1 oder höher."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c4b92351759cfe67ebea12cffe7c1216e2c71d61 i18n/deu/src/vs/code/electron-main/windows.i18n.json
-  our    100644 9d74eacc42f56c4c4177eb5bc02c7e375a8b243a i18n/deu/src/vs/code/electron-main/windows.i18n.json
-  their  100644 3f917752059c661f0a62a2d6f609047df65460aa i18n/deu/src/vs/code/electron-main/windows.i18n.json
-changed in both
-  base   100644 74231bf551a5eb892005b038248baf60ee08aeaa i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 0cb95fccc47d309d94aacd1e25b0718fd455d527 i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 692a3d343b4345db6b402fc3c15ca945c4005cec i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json
-changed in both
-  base   100644 b1b17e724eb6d4e14efc5df6f87dc2322b52e7c8 i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 b32f03c31fd5ffcb9742f2b1188daade81a7b028 i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 937855710852497edd351ef5072275dfd928a600 i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -48,8 +48,11 @@
- 	"listDropBackground": "Drag & Drop-Hintergrund der Liste/Struktur, wenn Elemente mithilfe der Maus verschoben werden.",
- 	"highlight": "Vordergrundfarbe der Liste/Struktur zur Trefferhervorhebung beim Suchen innerhalb der Liste/Struktur.",
- 	"invalidItemForeground": "Liste/Baum Vordergrundfarbe für ungültige Elemente, z. B. eine ungelöste Wurzel im Explorer.",
-+<<<<<<< .our
- 	"listErrorForeground": "Vordergrundfarbe für Listenelemente, die Fehler enthalten.",
- 	"listWarningForeground": "Vordergrundfarbe für Listenelemente, die Warnungen enthalten.",
-+=======
-+>>>>>>> .their
- 	"pickerGroupForeground": "Schnellauswahlfarbe für das Gruppieren von Bezeichnungen.",
- 	"pickerGroupBorder": "Schnellauswahlfarbe für das Gruppieren von Rahmen.",
- 	"buttonForeground": "Vordergrundfarbe der Schaltfläche.",
-changed in both
-  base   100644 db033ae76d29e214bcbc4bf3f41ef1b1c9ff5c89 i18n/deu/src/vs/workbench/browser/parts/panel/panelActions.i18n.json
-  our    100644 a862b85106d7636509b3155c17ab9e08a4e0c872 i18n/deu/src/vs/workbench/browser/parts/panel/panelActions.i18n.json
-  their  100644 dc59292f79b1b8fe4700b125542ed1cb7a91b374 i18n/deu/src/vs/workbench/browser/parts/panel/panelActions.i18n.json
-changed in both
-  base   100644 9e592858f8d17440751fb85ce8a3d0caa26998e4 i18n/deu/src/vs/workbench/common/theme.i18n.json
-  our    100644 7230e04365d13635c1ebe9cad1ed0f92866146cc i18n/deu/src/vs/workbench/common/theme.i18n.json
-  their  100644 4336f732bee2d7e45a60d66f703e0d7095b9626a i18n/deu/src/vs/workbench/common/theme.i18n.json
-changed in both
-  base   100644 9febb7b51bf7055929cf8e4064e58a1e2010d04c i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 fc92fd392259fb9b2d1dec1cecdbc3c76bdc7440 i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 2b8cdcfb0213350da2e4af82d9dba68963a69e3f i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -23,20 +23,35 @@
- 	"showIcons": "Steuert, ob geöffnete Editoren mit einem Symbol angezeigt werden sollen. Hierzu muss auch ein Symboldesign aktiviert werden.",
- 	"enablePreview": "Steuert, ob geöffnete Editoren als Vorschau angezeigt werden. Vorschau-Editoren werden wiederverwendet, bis sie gespeichert werden (z. B. über Doppelklicken oder Bearbeiten), und sie werden mit kursivem Schriftschnitt angezeigt.",
- 	"enablePreviewFromQuickOpen": "Steuert, ob geöffnete Editoren aus Quick Open als Vorschau angezeigt werden. Vorschau-Editoren werden wiederverwendet, bis sie gespeichert werden (z. B. über Doppelklicken oder Bearbeiten).",
-+<<<<<<< .our
- 	"closeOnFileDelete": "Steuert, ob Editoren, die eine Datei anzeigen, automatisch geschlossen werden sollen, wenn die Datei von einem anderen Prozess umbenannt oder gelöscht wird. Wenn Sie diese Option deaktivieren, bleibt der Editor bei einem solchen Ereignis als geändert offen. Bei Löschvorgängen innerhalb der Anwendung wird der Editor immer geschlossen, und geänderte Dateien werden nie geschlossen, damit Ihre Daten nicht verloren gehen.",
- 	"editorOpenPositioning": "Steuert, wo Editoren geöffnet werden. Wählen Sie \"links\" oder \"rechts\", um Editoren links oder rechts neben dem derzeit aktiven Editor zu öffnen. Wählen Sie \"erster\" oder \"letzter\", um Editoren unabhängig vom derzeit aktiven Editor zu öffnen.",
- 	"revealIfOpen": "Steuert, ob ein geöffneter Editor in einer der sichtbaren Gruppen angezeigt wird. Ist diese Option deaktiviert, wird ein Editor vorzugsweise in der aktuell aktiven Editorgruppe geöffnet. Ist diese Option aktiviert, wird ein bereits geöffneter Editor angezeigt und nicht in der aktuell aktiven Editorgruppe erneut geöffnet. In einigen Fällen wird diese Einstellung ignoriert, z. B. wenn das Öffnen eines Editors in einer bestimmten Gruppe oder neben der aktuell aktiven Gruppe erzwungen wird.",
- 	"swipeToNavigate": "Hiermit navigieren Sie per waagrechtem Wischen mit drei Fingen zwischen geöffneten Dateien.",
-+=======
-+	"editorOpenPositioning": "Steuert, wo Editoren geöffnet werden. Wählen Sie \"links\" oder \"rechts\", um Editoren links oder rechts neben dem derzeit aktiven Editor zu öffnen. Wählen Sie \"erster\" oder \"letzter\", um Editoren unabhängig vom derzeit aktiven Editor zu öffnen.",
-+	"revealIfOpen": "Steuert, ob ein geöffneter Editor in einer der sichtbaren Gruppen angezeigt wird. Ist diese Option deaktiviert, wird ein Editor vorzugsweise in der aktuell aktiven Editorgruppe geöffnet. Ist diese Option aktiviert, wird ein bereits geöffneter Editor angezeigt und nicht in der aktuell aktiven Editorgruppe erneut geöffnet. In einigen Fällen wird diese Einstellung ignoriert, z. B. wenn das Öffnen eines Editors in einer bestimmten Gruppe oder neben der aktuell aktiven Gruppe erzwungen wird.",
-+>>>>>>> .their
- 	"commandHistory": "Steuert, ob die Anzahl zuletzt verwendeter Befehle im Verlauf für die Befehlspalette gespeichert wird. Legen Sie diese Option auf 0 fest, um den Befehlsverlauf zu deaktivieren.",
- 	"preserveInput": "Steuert, ob die letzte typisierte Eingabe in die Befehlspalette beim nächsten Öffnen wiederhergestellt wird.",
- 	"closeOnFocusLost": "Steuert, ob Quick Open automatisch geschlossen werden soll, sobald das Feature den Fokus verliert.",
- 	"openDefaultSettings": "Steuert, ob beim Öffnen der Einstellungen auch ein Editor geöffnet wird, der alle Standardeinstellungen anzeigt.",
- 	"sideBarLocation": "Steuert die Position der Seitenleiste. Diese kann entweder links oder rechts von der Workbench angezeigt werden.",
-+<<<<<<< .our
- 	"panelDefaultLocation": "Steuert die Standardposition des Panels. Dieses kann entweder unterhalb oder rechts von der Workbench angezeigt werden.",
- 	"statusBarVisibility": "Steuert die Sichtbarkeit der Statusleiste im unteren Bereich der Workbench.",
- 	"activityBarVisibility": "Steuert die Sichtbarkeit der Aktivitätsleiste in der Workbench.",
- 	"viewVisibility": "Steuert die Sichtbarkeit von Headeraktionen. Headeraktionen können immer sichtbar sein oder nur sichtbar sein, wenn diese Ansicht fokussiert ist oder mit der Maus darauf gezeigt wird.",
- 	"fontAliasing": "Steuert die Schriftartaliasingmethode in der Workbench.\n - default: Subpixel-Schriftartglättung. Auf den meisten Nicht-Retina-Displays wird Text bei dieser Einstellung am schärfsten dargestellt. \n- antialiased: Glättet die Schriftart auf der Pixelebene (im Gegensatz zur Subpixelebene). Bei dieser Einstellung kann die Schriftart insgesamt heller wirken.\n- none: Deaktiviert die Schriftartglättung. Text wird mit gezackten scharfen Kanten dargestellt.\n- auto: Wendet ausgehend vom DPI der Anzeige automatisch \"default\" oder \"antialiased\" an.",
-+=======
-+	"panelLocation": "Steuert die Position des Panels. Dieses kann entweder unter oder rechts der Workbench angezeigt werden.",
-+	"statusBarVisibility": "Steuert die Sichtbarkeit der Statusleiste im unteren Bereich der Workbench.",
-+	"activityBarVisibility": "Steuert die Sichtbarkeit der Aktivitätsleiste in der Workbench.",
-+	"closeOnFileDelete": "Steuert, ob Editoren, die eine Datei anzeigen, automatisch geschlossen werden sollen, wenn die Datei von einem anderen Prozess umbenannt oder gelöscht wird. Wenn Sie diese Option deaktivieren, bleibt der Editor bei einem solchen Ereignis als geändert offen. Bei Löschvorgängen innerhalb der Anwendung wird der Editor immer geschlossen, und geänderte Dateien werden nie geschlossen, damit Ihre Daten nicht verloren gehen.",
-+	"experimentalFuzzySearchEndpoint": "Gibt den Endpunkt an, der für die experimentelle Einstellungssuche verwendet wird.",
-+	"experimentalFuzzySearchKey": "Gibt den Schlüssel an, der für die experimentelle Einstellungssuche verwendet wird.",
-+	"fontAliasing": "Steuert die Schriftartaliasingmethode in der Workbench.\n- default: Subpixel-Schriftartglättung. Auf den meisten Nicht-Retina-Displays wird Text bei dieser Einstellung am schärfsten dargestellt.\n- antialiased: Glättet die Schriftart auf der Pixelebene (im Gegensatz zur Subpixelebene). Bei dieser Einstellung kann die Schriftart insgesamt heller wirken.\n- none: Deaktiviert die Schriftartglättung. Text wird mit gezackten scharfen Kanten dargestellt.\n",
-+>>>>>>> .their
- 	"workbench.fontAliasing.default": "Subpixel-Schriftartglättung. Auf den meisten Nicht-Retina-Displays wird Text bei dieser Einstellung am schärfsten dargestellt.",
- 	"workbench.fontAliasing.antialiased": "Glättet die Schriftart auf der Pixelebene (im Gegensatz zur Subpixelebene). Bei dieser Einstellung kann die Schriftart insgesamt heller wirken.",
- 	"workbench.fontAliasing.none": "Deaktiviert die Schriftartglättung. Text wird mit gezackten scharfen Kanten dargestellt.",
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/deu/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
-  our    100644 b84eccf398be056209c9fab929e503fdabc02892 i18n/deu/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
-  their  100644 dcd6d661cd1bac6723fa71f0f79298ba4c6a69d3 i18n/deu/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"selectAndStartDebug": "Debug Konfiguration auswählen und starten"
- }
-\ No newline at end of file
-changed in both
-  base   100644 ceda8e419e5d6ec2218897d27682ca9fcd95dde5 i18n/deu/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json
-  our    100644 f0bef41ec09a62239ad44100d925a85f77067af2 i18n/deu/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json
-  their  100644 76a6649d67c3fc7af0da0e38118f8530b86b14d8 i18n/deu/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json
-changed in both
-  base   100644 a02407d3bd94904c76f059550144c7d59b1eb07d i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 d6cc1170dbfaab61ca55376b64654ebe15edb98e i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 823e29f8a0042d9b6c40f438fba125d1339c8285 i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -17,8 +17,12 @@
- 	"multipleConfigurationNamesInWorkspace": "Im Arbeitsbereich sind mehrere Startkonfigurationen \"{0}\" vorhanden. Verwenden Sie den Ordnernamen, um die Konfiguration zu qualifizieren.",
- 	"noFolderWithName": "Der Ordner mit dem Namen \"{0}\" für die Konfiguration \"{1}\" wurde im Verbund \"{2}\" nicht gefunden.",
- 	"configMissing": "Konfiguration \"{0}\" fehlt in \"launch.json\".",
-+<<<<<<< .our
- 	"launchJsonDoesNotExist": "\"launch.json\" ist nicht vorhanden.",
- 	"debugRequestNotSupported": "Das Attribut \"{0}\" weist in der ausgewählten Debugkonfiguration den nicht unterstützten Wert \"{1}\" auf.",
-+=======
-+	"debugRequestNotSupported": "Das Attribut \"{0}\" hat in der ausgewählten Debugkonfiguration den nicht unterstützten Wert \"{1}\".",
-+>>>>>>> .their
- 	"debugRequesMissing": "Das Attribut \"{0}\" fehlt in der ausgewählten Debugkonfiguration.",
- 	"debugTypeNotSupported": "Der konfigurierte Debugtyp \"{0}\" wird nicht unterstützt.",
- 	"debugTypeMissing": "Fehlende Eigenschaft \"type\" für die ausgewählte Startkonfiguration.",
-@@ -28,7 +32,13 @@
- 	"preLaunchTaskExitCode": "Der preLaunchTask \"{0}\" wurde mit dem Exitcode {1} beendet.",
- 	"showErrors": "Fehler anzeigen",
- 	"noFolderWorkspaceDebugError": "Debuggen der aktiven Datei ist nicht möglich. Stellen Sie sicher, dass sie auf einem Datenträger gespeichert ist und dass Sie die Debugerweiterung für diesen Dateityp installiert haben.",
-+<<<<<<< .our
- 	"cancel": "Abbrechen",
- 	"DebugTaskNotFound": "Der Task \"{0}\" konnte nicht gefunden werden.",
- 	"taskNotTracked": "Der Task \"{0}\" kann nicht nachverfolgt werden."
-+=======
-+	"NewLaunchConfig": "Richten Sie die Startkonfigurationsdatei für Ihre Anwendung ein. {0}",
-+	"DebugTaskNotFound": "Der preLaunchTask \"{0}\" wurde nicht gefunden.",
-+	"taskNotTracked": "Der preLaunchTask \"{0}\" kann nicht getrackt werden."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 fc3e3434fee5f091774eca338255520854cec4f8 i18n/deu/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json
-  our    100644 cdd266b61b4277292f7a6fd99dcfb206022d68e4 i18n/deu/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json
-  their  100644 9eb5b14d1e4c1cdcebc147f05cd7442e846dadbc i18n/deu/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json
-changed in both
-  base   100644 9974d8c470954eeb210897fe0306ecaae190cb84 i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 cf7a07fdcb5de4fa57ac5ab17021ee98e54c3fc8 i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 625d2c1f1ce171e08e7c903c6613b86d3e0f3b54 i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-@@ -50,6 +50,10 @@
- 	"allExtensionsInstalled": "Alle für diesen Arbeitsbereich empfohlenen Erweiterungen wurden bereits installiert.",
- 	"installRecommendedExtension": "Empfohlene Erweiterung installieren",
- 	"extensionInstalled": "Die empfohlene Erweiterung wurde bereits installiert.",
-+<<<<<<< .our
-+=======
-+	"showRecommendedKeymapExtensions": "Empfohlene Tastenzuordnungen anzeigen",
-+>>>>>>> .their
- 	"showRecommendedKeymapExtensionsShort": "Tastenzuordnungen",
- 	"showLanguageExtensionsShort": "Spracherweiterungen",
- 	"showAzureExtensionsShort": "Azure-Erweiterungen",
-changed in both
-  base   100644 6772e6da40560411b4286161caa9ac9ba6ec6dff i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json
-  our    100644 38670d8d0017c15f71a5c05e1db6c40cc739d93e i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json
-  their  100644 d15c03382bed46bb52d50b10f66132e29d6ddad9 i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json
-changed in both
-  base   100644 d8e69ffc518c65981e63a0f03fd63309e090e13b i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 5272d4afb1fdf32991cbacee03058c69d41ba9c7 i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 9cde3634e7645260427694be43e17b2a038481a7 i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,11 @@
- 	"exeBasedRecommendation": "Diese Erweiterung wird empfohlen, da Sie {0} installiert haben.",
- 	"fileBasedRecommendation": "Ausgehend von den kürzlich geöffneten Dateien wird diese Erweiterung empfohlen.",
- 	"workspaceRecommendation": "Diese Erweiterung wird von Benutzern des aktuellen Arbeitsbereichs empfohlen.",
-+=======
-+	"fileBasedRecommendation": "Ausgehend von den kürzlich geöffneten Dateien wird diese Erweiterung empfohlen.",
-+	"workspaceRecommendation": "Diese Erweiterung wird von Benutzern des aktuellen Arbeitsbereichs empfohlen.",
-+	"exeBasedRecommendation": "Diese Erweiterung wird empfohlen, da Sie {0} installiert haben.",
-+>>>>>>> .their
- 	"reallyRecommended2": "Für diesen Dateityp wird die Erweiterung \"{0}\" empfohlen.",
- 	"reallyRecommendedExtensionPack": "Für diesen Dateityp wird das Erweiterungspaket \"{0}\" empfohlen.",
- 	"install": "Installieren",
-changed in both
-  base   100644 56a4056096228f5d74d58b3c8aba54be35c49e2f i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
-  our    100644 e7da14c93afce4901fe9848f82183257e46fcc61 i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
-  their  100644 a1b621bf5a29627398c731c3af3228d74d6adf05 i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
-@@ -10,5 +10,9 @@
- 	"installVSIX": "Aus VSIX installieren...",
- 	"installFromVSIX": "Aus VSIX installieren",
- 	"installButton": "&&Installieren",
-+<<<<<<< .our
-+=======
-+	"InstallVSIXAction.success": "Die Erweiterung wurde erfolgreich installiert. Führen Sie einen Neustart aus, um sie zu aktivieren.",
-+>>>>>>> .their
- 	"InstallVSIXAction.reloadNow": "Jetzt erneut laden"
- }
-\ No newline at end of file
-changed in both
-  base   100644 33a02e17c4ebcb4d02496eaef3c720adc8019900 i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  our    100644 7344b01b4a3219fe21a92df254af8af45008be39 i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  their  100644 7d8f0229f0746f694db787ed60eea4492804765c i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-@@ -12,9 +12,12 @@
- 	"recommendedExtensions": "Empfohlen",
- 	"otherRecommendedExtensions": "Weitere Empfehlungen",
- 	"workspaceRecommendedExtensions": "Arbeitsbereich-Empfehlungen",
-+<<<<<<< .our
- 	"builtInExtensions": "Features",
- 	"builtInThemesExtensions": "Designs",
- 	"builtInBasicsExtensions": "Programmiersprachen",
-+=======
-+>>>>>>> .their
- 	"searchExtensions": "Nach Erweiterungen im Marketplace suchen",
- 	"sort by installs": "Sortieren nach: Installationsanzahl",
- 	"sort by rating": "Sortieren nach: Bewertung",
-changed in both
-  base   100644 018528770c19842c841dfe61753e5b71c05489ce i18n/deu/src/vs/workbench/parts/markers/common/messages.i18n.json
-  our    100644 08feefc0086392fcd6f986e3c1116e070a102b03 i18n/deu/src/vs/workbench/parts/markers/common/messages.i18n.json
-  their  100644 d2105c83afe34c434ee6ad06da0749746115b4ce i18n/deu/src/vs/workbench/parts/markers/common/messages.i18n.json
-@@ -7,8 +7,14 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"viewCategory": "Anzeigen",
-+<<<<<<< .our
- 	"problems.view.toggle.label": "Probleme umschalten (Fehler, Warnungen, Informationen)",
- 	"problems.view.focus.label": "Probleme fokussieren (Fehler, Warnungen, Informationen)",
-+=======
-+	"problems.view.toggle.label": "Probleme umschalten",
-+	"problems.view.show.label": "Probleme anzeigen",
-+	"problems.view.hide.label": "Probleme ausblenden",
-+>>>>>>> .their
- 	"problems.panel.configuration.title": "Ansicht \"Probleme\"",
- 	"problems.panel.configuration.autoreveal": "Steuert, ob die Ansicht \"Probleme\" automatisch Dateien anzeigen sollte, wenn diese geöffnet werden.",
- 	"markers.panel.title.problems": "Probleme",
-changed in both
-  base   100644 8c1ec2464f4d2dbaefa8ccf9ed6698a4619f138d i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-  our    100644 3d77216b1a1d5e227d0a712025ced6f776fffcf1 i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-  their  100644 4a6cbbeb787d56209b0969f9e7841b23f8a69e75 i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-@@ -9,6 +9,7 @@
- 	"SearchSettingsWidget.AriaLabel": "Einstellungen suchen",
- 	"SearchSettingsWidget.Placeholder": "Einstellungen suchen",
- 	"noSettingsFound": "Keine Ergebnisse",
-+<<<<<<< .our
- 	"oneSettingFound": "1 Einstellung gefunden",
- 	"settingsFound": "{0} Einstellungen gefunden",
- 	"totalSettingsMessage": "Insgesamt {0} Einstellungen",
-@@ -18,6 +19,12 @@
- 	"defaultUserSettings": "Standardbenutzereinstellungen",
- 	"defaultWorkspaceSettings": "Standard-Arbeitsbereichseinstellungen",
- 	"defaultFolderSettings": "Standardordnereinstellungen",
-+=======
-+	"oneSettingFound": "1 Einstellung zugeordnet",
-+	"settingsFound": "{0} Einstellungen zugeordnet",
-+	"fileEditorWithInputAriaLabel": "{0}. Textdatei-Editor.",
-+	"fileEditorAriaLabel": "Textdatei-Editor",
-+>>>>>>> .their
- 	"defaultEditorReadonly": "Nehmen Sie im Editor auf der rechten Seite Änderungen vor, um Standardwerte zu überschreiben.",
- 	"preferencesAriaLabel": "Standardeinstellungen. Schreibgeschützter Text-Editor."
- }
-\ No newline at end of file
-changed in both
-  base   100644 06345a8acb01605723aa45678e6a6de353c4b87f i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 93e401bd692b17b66ba4a0cb54c6f67464e449ac i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 e45478f5abff08284178fa9c6835201b7b07756e i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -13,5 +13,13 @@
- 	"newExtensionLabel": "Erweiterung \"{0}\" anzeigen",
- 	"editTtile": "Bearbeiten",
- 	"replaceDefaultValue": "In Einstellungen ersetzen",
-+<<<<<<< .our
- 	"copyDefaultValue": "In Einstellungen kopieren"
-+=======
-+	"copyDefaultValue": "In Einstellungen kopieren",
-+	"unsupportedPHPExecutablePathSetting": "Diese Einstellung muss eine Benutzereinstellung sein. Öffnen Sie zum Konfigurieren von PHP für den Arbeitsbereich eine PHP-Datei, und klicken Sie in der Statusleiste auf \"PHP-Pfad\".",
-+	"unsupportedWorkspaceSetting": "Diese Einstellung muss eine Benutzereinstellung sein.",
-+	"unsupportedWorkbenchSetting": "Diese Einstellung kann jetzt nicht angewendet werden. Sie wird angewendet, wenn Sie den Ordner direkt öffnen.",
-+	"unsupportedWorkbenchSettingDevMode": "Diese Einstellung kann jetzt nicht angewendet werden. Sie wird angewendet, wenn Sie ihren Bereich beim Registrieren als \"Ressource\" definieren oder den Ordner direkt öffnen."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8bf5f390edb1390ac5d36965642f6564a245fc64 i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 cfd3784b25185836bda1d8d6784b3e81792155f0 i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 9358ff2d21115cf9c22e550f15b2d2b688b834b4 i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,4 +13,11 @@
- 	"userSettings": "Benutzereinstellungen",
- 	"workspaceSettings": "Arbeitsbereichseinstellungen",
- 	"folderSettings": "Ordnereinstellungen"
-+=======
-+	"defaultSettingsFuzzyPrompt": "Testen Sie die Fuzzysuche!",
-+	"defaultSettings": "Platzieren Sie Ihre Einstellungen zum Überschreiben im Editor auf der rechten Seite.",
-+	"noSettingsFound": "Keine Einstellungen gefunden.",
-+	"folderSettingsDetails": "Ordnereinstellungen",
-+	"enableFuzzySearch": "Experimentelle Fuzzysuche aktivieren"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f93cea2858c08890f1fed79d7457f04649df8add i18n/deu/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  our    100644 db93b66f34fda877ff44d1ba11f1c28d8148660f i18n/deu/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  their  100644 74ffcdff9a140bf095b6da331c25c6511a62896c i18n/deu/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-@@ -7,5 +7,6 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"commonlyUsed": "Am häufigsten verwendet",
-+	"mostRelevant": "Relevantesten",
- 	"defaultKeybindingsHeader": "Überschreiben Sie Tastenzuordnungen, indem Sie sie in die Tastenzuordnungsdatei einfügen."
- }
-\ No newline at end of file
-changed in both
-  base   100644 8615a77c33bc41e25f5a671cce722c8c85a65c24 i18n/deu/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  our    100644 944c8644290b13cdcb690093cff1d8e9a037f81b i18n/deu/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  their  100644 319afe0c3a30c12b3d61d966c46ae6acdfb02f7f i18n/deu/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-changed in both
-  base   100644 451df58f63e9c21a59e8697672085c19b9d92057 i18n/deu/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
-  our    100644 a765a1ac06fcdb16377300be0c54f9d277dca20d i18n/deu/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
-  their  100644 577d7a656ebcbeadd8273536c53474d6884a23f3 i18n/deu/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
-@@ -16,6 +16,10 @@
- 	"exclude.boolean": "Das Globmuster, mit dem Dateipfade verglichen werden sollen. Legen Sie diesen Wert auf \"true\" oder \"false\" fest, um das Muster zu aktivieren bzw. zu deaktivieren.",
- 	"exclude.when": "Zusätzliche Überprüfung der gleichgeordneten Elemente einer entsprechenden Datei. Verwenden Sie \"$(basename)\" als Variable für den entsprechenden Dateinamen.",
- 	"useRipgrep": "Steuert, ob \"ripgrep\" in der Text- und Dateisuche verwendet wird.",
-+<<<<<<< .our
-+=======
-+	"useIgnoreFilesByDefault": "Steuert, ob bei der Suche nach Text in einem neuen Arbeitsbereich standardmäßig GITIGNORE- und IGNORE-Dateien verwendet werden.",
-+>>>>>>> .their
- 	"useIgnoreFiles": "Steuert, ob bei der Suche nach Dateien GITIGNORE- und IGNORE-Dateien verwendet werden.",
- 	"search.quickOpen.includeSymbols": "Konfigurieren Sie diese Option, um Ergebnisse aus einer globalen Symbolsuche in die Dateiergebnisse für Quick Open einzuschließen.",
- 	"search.followSymlinks": "Steuert, ob Symlinks während der Suche gefolgt werden."
-changed in both
-  base   100644 d0c6fa6941c0583b3d28876eec30a20eb0699bb5 i18n/deu/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 1dcdaff92772bd253ab87cb0ce46920ce5c5e6bc i18n/deu/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 5a178e2f2fa2c881fc2d195afd397040cfc50acc i18n/deu/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-@@ -15,7 +15,14 @@
- 	"nextReplaceTerm": "Nächsten Such-/Ersetzungsbegriff anzeigen",
- 	"previousReplaceTerm": "Vorherigen Such-/Ersetzungsbegriff anzeigen ",
- 	"findInFiles": "In Dateien suchen",
-+	"findInFilesWithSelectedText": "In Dateien mit ausgewähltem Text suchen",
- 	"replaceInFiles": "In Dateien ersetzen",
-+<<<<<<< .our
-+=======
-+	"replaceInFilesWithSelectedText": "In Dateien mit ausgewähltem Text ersetzen",
-+	"findInWorkspace": "In Arbeitsbereich suchen...",
-+	"findInFolder": "In Ordner suchen...",
-+>>>>>>> .their
- 	"RefreshAction.label": "Aktualisieren",
- 	"CollapseDeepestExpandedLevelAction.label": "Alle zuklappen",
- 	"ClearSearchResultsAction.label": "Löschen",
-changed in both
-  base   100644 53462b16f025ef04f9dda6be1dc05fb26265d444 i18n/deu/src/vs/workbench/parts/search/browser/searchWidget.i18n.json
-  our    100644 717069a96ed812eef7ba6ae9ffa520f93690a4fb i18n/deu/src/vs/workbench/parts/search/browser/searchWidget.i18n.json
-  their  100644 c75b9101979b760c5e7a2f133d8726c00ef0488e i18n/deu/src/vs/workbench/parts/search/browser/searchWidget.i18n.json
-changed in both
-  base   100644 f7ba361f2c6c9e3711878e2a468336afd7104689 i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  our    100644 da21c5deaa2fffc31211d74e9a379224211f67e5 i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 e67d5f89a93412d3a93540146db0afb274b86bc9 i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-changed in both
-  base   100644 232837396be9b2dadf1660e8eb6ca1d25fd05715 i18n/deu/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 b3a9bfb6f09fdd913393d2a5b333f495988fabdc i18n/deu/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 13d82c87c8d381eff13b9c38c8d857472a88c4f7 i18n/deu/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-@@ -28,6 +28,7 @@
- 	"JsonSchema.tasks.group.none": "Weist die Aufgabe keiner Gruppe zu.",
- 	"JsonSchema.tasks.group": "Definiert die Ausführungsgruppe, zu der diese Aufgabe gehört. Zum Hinzufügen der Aufgabe zur Buildgruppe wird \"build\" unterstützt und zum Hinzufügen zur Testgruppe \"test\".",
- 	"JsonSchema.tasks.type": "Definiert, ob die Aufgabe als Prozess oder als Befehl innerhalb einer Shell ausgeführt wird.",
-+<<<<<<< .our
- 	"JsonSchema.commandArray": "Der auszuführende Shell-Befehl. Arrayelemente werden mit einem Leerzeichen verknüpft.",
- 	"JsonSchema.command.quotedString.value": "Der tatsächliche Sollwert",
- 	"JsonSchema.tasks.quoting.escape": "Fügt mithilfe des Escapezeichens der Shell vor Zeichen Escapezeichen ein (z. B. `  bei PowerShell und \\ bei Bash).",
-@@ -38,6 +39,8 @@
- 	"JsonSchema.args.quotedString.value": "Der tatsächliche Argumentwert",
- 	"JsonSchema.args.quotesString.quote": "In welche Anführungszeichen der Argumentwert gesetzt wird.",
- 	"JsonSchema.tasks.args": "Argumente, die an den Befehl übergeben werden, wenn diese Aufgabe aufgerufen wird.",
-+=======
-+>>>>>>> .their
- 	"JsonSchema.tasks.label": "Die Bezeichnung der Aufgabe der Benutzerschnittstelle",
- 	"JsonSchema.version": "Die Versionsnummer der Konfiguration.",
- 	"JsonSchema.tasks.identifier": "Ein vom Benutzer definierter Bezeichner, mit dem in \"launch.json\" oder in einer dependsOn-Klausel auf die Aufgabe verwiesen wird.",
-changed in both
-  base   100644 09fd787097a82f4e5a789bc8a8f1a0ea1aefc7dd i18n/deu/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 5e860baf0d874c2a564e21bd9c48c55877bc2bfd i18n/deu/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 b4b3f22afbb89177b8b0bb556fb21a2d8cd81cc4 i18n/deu/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-changed in both
-  base   100644 caa7dd980fdff40edacaf41d1e870aac9af411a7 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 e7e17f13a867ab30a0455dba8cfbc4967b92e2a0 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 bc6dee18ad00b1f89b8fe4ba9ffad8ea4e5ec37c i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -21,8 +21,12 @@
- 	"terminal.integrated.fontSize": "Steuert den Schriftgrad des Terminals in Pixeln.",
- 	"terminal.integrated.letterSpacing": "Steuert den Buchstabenabstand im Terminal. Dies ist ein Integerwert, der die Anzahl der zusätzlichen Pixel zwischen den einzelnen Zeichen darstellt.",
- 	"terminal.integrated.lineHeight": "Steuert die Zeilenhöhe für das Terminal. Dieser Wert wird mit dem Schriftgrad des Terminals multipliziert, um die tatsächliche Zeilenhöhe in Pixeln zu erhalten.",
-+<<<<<<< .our
- 	"terminal.integrated.fontWeight": "Die innerhalb des Terminals zu verwendende Schriftbreite für nicht fetten Text.",
- 	"terminal.integrated.fontWeightBold": "Die innerhalb des Terminals zu verwendende Schriftbreite für fetten Text.",
-+=======
-+	"terminal.integrated.enableBold": "Gibt an, ob Fettdruck im Terminal aktiviert wird. Dies muss durch die Terminalshell unterstützt werden.",
-+>>>>>>> .their
- 	"terminal.integrated.cursorBlinking": "Steuert, ob der Terminalcursor blinkt.",
- 	"terminal.integrated.cursorStyle": "Steuert den Stil des Terminalcursors.",
- 	"terminal.integrated.scrollback": "Steuert die maximale Anzahl von Zeilen, die das Terminal im Puffer beibehält.",
-changed in both
-  base   100644 ce08826d007fc3bac53fae4210b4d8c601b6c6ea i18n/deu/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-  our    100644 6dfaa8e09e1ebf0b9c830edc04ba7a7171df0643 i18n/deu/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-  their  100644 d6a37d8334e4fabea5afba7ea495f6b39d9f466f i18n/deu/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-@@ -23,7 +23,10 @@
- 	"workspaceConfig.name.description": "Ein optionaler Name für den Ordner.",
- 	"workspaceConfig.uri.description": "URI des Ordners",
- 	"workspaceConfig.settings.description": "Arbeitsbereichseinstellungen",
-+<<<<<<< .our
- 	"workspaceConfig.launch.description": "Arbeitsbereichs-Startkonfigurationen",
-+=======
-+>>>>>>> .their
- 	"workspaceConfig.extensions.description": "Arbeitsbereichserweiterungen",
- 	"unknownWorkspaceProperty": "Unbekannte Arbeitsbereichs-Konfigurationseigenschaft"
- }
-\ No newline at end of file
-changed in both
-  base   100644 2420a104c155abdaf901a86b12e0d852566b22f3 i18n/deu/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 6e51d0a62d6cbb327e635cf17096e9a085de524c i18n/deu/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 a4ac509ab2898fe0dc4992fa94a10d12f1a9dc0c i18n/deu/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/deu/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
-  our    100644 97095dac5b7cbae70857703eef9319b427782779 i18n/deu/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
-  their  100644 336dc274f3934da6689903c3f8a7824209bc12f2 i18n/deu/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"bubbleTitle": "Enthält hervorgehobene Elemente"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"bubbleTitle": "enthält hervorgehobene Elemente"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 85f4c3818ed621810f4ea326388fa1c8724bc758 i18n/deu/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  our    100644 e86a18877a777946dc953d1135a4123abedf75f6 i18n/deu/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  their  100644 67d01f0f0d412e9d74ae8f7651ba59886dd37e70 i18n/deu/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -9,4 +10,14 @@
- 	"errorInvalidTaskConfiguration": "In die Konfigurationsdatei des Arbeitsbereichs kann nicht geschrieben werden. Öffnen Sie die Datei, um Fehler/Warnungen darin zu beheben, und versuchen Sie es noch mal.",
- 	"errorWorkspaceConfigurationFileDirty": "In die Konfigurationsdatei des Arbeitsbereichs kann nicht geschrieben werden, weil sie geändert wurde. Speichern Sie die Datei, und versuchen Sie es noch mal.",
- 	"openWorkspaceConfigurationFile": "Konfiguration des Arbeitsbereichs öffnen"
-+=======
-+	"errorInvalidTaskConfiguration": "In die Konfigurationsdatei des Arbeitsbereichs kann nicht geschrieben werden. Öffnen Sie die Datei, um Fehler/Warnungen darin zu beheben, und versuchen Sie es noch mal.",
-+	"errorWorkspaceConfigurationFileDirty": "In die Konfigurationsdatei des Arbeitsbereichs kann nicht geschrieben werden, weil sie geändert wurde. Speichern Sie die Datei, und versuchen Sie es noch mal.",
-+	"openWorkspaceConfigurationFile": "Konfigurationsdatei des Arbeitsbereichs öffnen",
-+	"close": "Schließen",
-+	"enterWorkspace.close": "Schließen",
-+	"enterWorkspace.dontShowAgain": "Nicht mehr anzeigen",
-+	"enterWorkspace.moreInfo": "Weitere Informationen",
-+	"enterWorkspace.prompt": "Weitere Informationen zum Arbeiten mit mehreren Ordnern in VS Code."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 928a2b6629e9342b082784b0f28a2354f3318afb i18n/esn/extensions/git/package.i18n.json
-  our    100644 87a73cba8a7c7a490f6aba897a9a18d1a57dfc4c i18n/esn/extensions/git/package.i18n.json
-  their  100644 a2502269e64fde2b7caf8025d5ba37b7f3a17ed0 i18n/esn/extensions/git/package.i18n.json
-changed in both
-  base   100644 6e3ba74bee27cce61131435050b2bc0e82b8ffcf i18n/esn/extensions/npm/package.i18n.json
-  our    100644 7e73e482c8e8bbff949c516cd193524915f7859f i18n/esn/extensions/npm/package.i18n.json
-  their  100644 dacfe78f339a4cb05c1ad92f7dcb3dd73e692200 i18n/esn/extensions/npm/package.i18n.json
-@@ -11,6 +11,7 @@
- 	"config.npm.autoDetect": "Controla si la detección automática de scripts npm está activada o desactivada. Por defecto está activada.",
- 	"config.npm.runSilent": "Ejecutar comandos de npm con la opción '--silent'",
- 	"config.npm.packageManager": "El administrador de paquetes utilizado para ejecutar secuencias de comandos. ",
-+<<<<<<< .our
- 	"config.npm.exclude": "Configura patrones globales para carpetas que deben excluirse de la detección automática de scripts. ",
- 	"config.npm.enableScriptExplorer": "Habilitar una vista de explorador para scripts de npm.",
- 	"config.npm.scriptExplorerAction": "La acción de clic predeterminada utilizada en el explorador de secuencias de comandos: 'abrir' o 'ejecutar', el valor predeterminado es 'abrir'.",
-@@ -23,4 +24,7 @@
- 	"command.debug": "Depurar",
- 	"command.openScript": "Abrir",
- 	"command.runInstall": "Ejecutar instalación"
-+=======
-+	"npm.parseError": "Detección de tareas de nueva gestión pública: no se pudo analizar el archivo {0}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 9f4b0f1a71730347c48aa2138e247c0280685a29 i18n/esn/extensions/typescript/out/features/completionItemProvider.i18n.json
-  our    100644 20f052367195387017e19eb2410e5678acef51e0 i18n/esn/extensions/typescript/out/features/completionItemProvider.i18n.json
-  their  100644 0f96519f3fafec6f78015e28950f18d50c240815 i18n/esn/extensions/typescript/out/features/completionItemProvider.i18n.json
-changed in both
-  base   100644 490b1f6de0dac4520ac8372e4252d08dc06512fa i18n/esn/extensions/typescript/package.i18n.json
-  our    100644 622b6fc58819e8c01bc967cde654d845bccf06f1 i18n/esn/extensions/typescript/package.i18n.json
-  their  100644 b5f0de6515d742013a5b62327216aa08d77a764f i18n/esn/extensions/typescript/package.i18n.json
-@@ -55,7 +55,11 @@
- 	"typescript.quickSuggestionsForPaths": "Activar o desactivar rápidas sugerencias al escribir una ruta de importación.",
- 	"typescript.locale": "Establece la configuración regional para reportar errores de TypeScript. Requiere TypeScript > = 2.6.0. Por defecto, utiliza el valor 'null'  de VS Code para errores de TypeScript.",
- 	"javascript.implicitProjectConfig.experimentalDecorators": "Activar/desactivar 'experimentalDecorators' para los archivos JavaScript que no son parte de un proyecto. Los archivos jsconfig.json o tsconfig.json reemplazan esta configuración. Requiere inicio > = 2.3.1. ",
-+<<<<<<< .our
- 	"typescript.autoImportSuggestions.enabled": "Habilita o deshabilita sugerencias de importación automática.  Requiere TypeScript >= 2.6.1.",
- 	"typescript.experimental.syntaxFolding": "Habilita/deshabilita los marcadores de plegado sensibles a la sintaxis.",
- 	"taskDefinition.tsconfig.description": "Archivo tsconfig que define la compilación de TS."
-+=======
-+	"typescript.autoImportSuggestions.enabled": "Habilita o deshabilita sugerencias de importación automática.  Requiere TypeScript >= 2.6.1."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f6ea30df3b76f4bb99c3e5f91a96d8a1d1398fe6 i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 57d447a0a0b664b859bc321a1781f6980e63b0fd i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 33913ddd2b52513ea858e8a43db995551c7b303d i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,8 +35,15 @@
- 	"panelDefaultLocation": "Controla la ubicación predeterminada del panel. Puede mostrarse en la parte inferior o a la derecha de la mesa de banco.",
- 	"statusBarVisibility": "Controla la visibilidad de la barra de estado en la parte inferior del área de trabajo.",
- 	"activityBarVisibility": "Controla la visibilidad de la barra de actividades en el área de trabajo.",
-+<<<<<<< .our
- 	"viewVisibility": "Controla la visibilidad de las acciones en el encabezado de la vista. Las acciones en el encabezado de la vista pueden ser siempre visibles, o solo cuando la vista es enfocada o apuntada.",
- 	"fontAliasing": "Controla el método de suavizado de fuentes en la mesa de trabajo.\n-por defecto: subpíxel suavizado de fuentes. En la mayoría las pantallas retina no dará el texto más agudo - alisado: suavizar la fuente a nivel del píxel, a diferencia de los subpíxeles. Puede hacer que la fuente aparezca más general - ninguno: desactiva el suavizado de fuentes. Texto se mostrará con dentados filos - auto: se aplica el 'default' o 'antialiasing' automáticamente en función de la DPI de la muestra.",
-+=======
-+	"closeOnFileDelete": "Controla si los editores que muestran un archivo deben cerrarse automáticamente cuando otro proceso elimina el archivo o le cambia el nombre. Si se deshabilita esta opción y se da alguna de estas circunstancias, se mantiene el editor abierto con modificaciones. Tenga en cuenta que, cuando se eliminan archivos desde la aplicación, siempre se cierra el editor y que los archivos con modificaciones no se cierran nunca para preservar los datos.",
-+	"experimentalFuzzySearchEndpoint": "Indica el punto final para la búsqueda de configuraciones experimentales.",
-+	"experimentalFuzzySearchKey": "Indica la clave a utilizar para la búsqueda de configuraciones experimentales.",
-+	"fontAliasing": "Controla el método de suavizado de fuentes en el área de trabajo.\n- default: suavizado de fuentes en subpíxeles. En la mayoría de las pantallas que no son Retina, esta opción muestra el texto más nítido.\n- antialiased: suaviza las fuentes en píxeles, en lugar de subpíxeles. Puede hacer que las fuentes se vean más claras en general\n- none: deshabilita el suavizado de fuentes. El texto se muestra con bordes nítidos irregulares.",
-+>>>>>>> .their
- 	"workbench.fontAliasing.default": "Suavizado de fuentes en subpíxeles. En la mayoría de las pantallas que no son Retina, esta opción muestra el texto más nítido.",
- 	"workbench.fontAliasing.antialiased": "Suaviza las fuentes en píxeles, en lugar de subpíxeles. Puede hacer que las fuentes se vean más claras en general.",
- 	"workbench.fontAliasing.none": "Deshabilita el suavizado de fuentes. El texto se muestra con bordes nítidos irregulares.",
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/esn/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
-  our    100644 065c0919852341a09adc95f70f297a79402b9e4f i18n/esn/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
-  their  100644 04b7ea25404007fc82b960bf3f8b984a1daf3573 i18n/esn/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"selectAndStartDebug": "Seleccionar e iniciar la configuración de depuración"
- }
-\ No newline at end of file
-changed in both
-  base   100644 97fb5eae642e78157f5ab4e9ab33c194e1361831 i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 d28e2c7b8c0f100d21de57741d72f030bc22f977 i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 b9b659ba536f8144452f4abd6de11160b160e6d9 i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -28,7 +28,13 @@
- 	"preLaunchTaskExitCode": "La tarea preLaunchTask '{0}' finalizó con el código de salida {1}.",
- 	"showErrors": "Mostrar errores",
- 	"noFolderWorkspaceDebugError": "El archivo activo no se puede depurar. Compruebe que se ha guardado en el disco y que tiene una extensión de depuración instalada para ese tipo de archivo.",
-+<<<<<<< .our
- 	"cancel": "Cancelar",
- 	"DebugTaskNotFound": "No se pudo encontrar la tarea '{0}'.",
- 	"taskNotTracked": "La tarea '{0}' no puede rastrearse."
-+=======
-+	"NewLaunchConfig": "Defina los valores del archivo de configuración de inicio para la aplicación. {0}",
-+	"DebugTaskNotFound": "No se encontró el elemento preLaunchTask '{0}'.",
-+	"taskNotTracked": "No se puede realizar un seguimiento de la tarea preLaunchTask '{0}'."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6e56df786fd3dbc29ca8dc75eaae40f080d178ef i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 99cc3686e6501d7b489d9fd1df7919d3f52f53bb i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 3c9b787331df171d78781a896fa6b7e928ca7f16 i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -12,7 +12,12 @@
- 	"exeBasedRecommendation": "Se recomienda esta extensión porque tiene instalado {0} . ",
- 	"fileBasedRecommendation": "Esta extensión se recomienda basado en los archivos que abrió recientemente.",
- 	"workspaceRecommendation": "Esta extensión es recomendada por los usuarios del espacio de trabajo actual.",
-+<<<<<<< .our
- 	"reallyRecommended2": "La extension recomendada para este tipo de archivo es {0}",
-+=======
-+	"exeBasedRecommendation": "Se recomienda esta extensión porque tiene instalado {0} . ",
-+	"reallyRecommended2": "Para este tipo de archivo, se recomineda la extensión '{0}'.",
-+>>>>>>> .their
- 	"reallyRecommendedExtensionPack": "Para este tipo de fichero, se recomienda el paquete de extensión '{0}'.",
- 	"install": "Instalar",
- 	"showRecommendations": "Mostrar recomendaciones",
-changed in both
-  base   100644 e5008fa48da821e8320a243d65f47a908590ef9e i18n/fra/extensions/git/package.i18n.json
-  our    100644 6b9b77f8287566561f58c3376d7d8aaba2171809 i18n/fra/extensions/git/package.i18n.json
-  their  100644 f21d3ba66f70b788e04d0bf40794cde3209adadb i18n/fra/extensions/git/package.i18n.json
-@@ -73,15 +73,22 @@
- 	"config.enableCommitSigning": "Permet de valider en signant avec GPG.",
- 	"config.discardAllScope": "Contrôle les modifications ignorées par la commande 'Ignorer toutes les modifications'. 'all' ignore toutes les modifications. 'tracked' ignore uniquement les fichiers suivis. 'prompt' affiche un message d'invite chaque fois que l’action est exécutée.",
- 	"config.decorations.enabled": "Contrôle si Git contribue aux couleurs et aux badges de l’Explorateur et à l'affichage des éditeurs ouverts.",
-+<<<<<<< .our
- 	"config.promptToSaveFilesBeforeCommit": "Contrôle si Git doit vérifier les fichiers non sauvegardés avant d'effectuer le commit.",
- 	"config.showInlineOpenFileAction": "Contrôle s’il faut afficher une action Ouvrir le fichier dans l’affichage des modifications de Git.",
- 	"config.inputValidation": "Contrôle quand afficher la validation de la saisie du message de commit.",
- 	"config.detectSubmodules": "Contrôle s’il faut détecter automatiquement les sous-modules git.",
- 	"config.detectSubmodulesLimit": "Contrôle la limite de sous-modules git détectés.",
-+=======
-+>>>>>>> .their
- 	"colors.modified": "Couleur pour les ressources modifiées.",
- 	"colors.deleted": "Couleur pour les ressources supprimées.",
- 	"colors.untracked": "Couleur pour les ressources non tracées.",
- 	"colors.ignored": "Couleur des ressources ignorées.",
-+<<<<<<< .our
- 	"colors.conflict": "Couleur pour les ressources avec des conflits.",
- 	"colors.submodule": "Couleur pour les ressources de sous-module."
-+=======
-+	"colors.conflict": "Couleur pour les ressources avec des conflits."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 05ec75a219e914fb4c5467116ee16b59dc6e0723 i18n/fra/extensions/npm/package.i18n.json
-  our    100644 dab74867a9ea8aa21e2f332eabe0dca553256787 i18n/fra/extensions/npm/package.i18n.json
-  their  100644 f13b19db4f35250a40317c25a99c54611bf52a58 i18n/fra/extensions/npm/package.i18n.json
-@@ -11,6 +11,7 @@
- 	"config.npm.autoDetect": "Contrôle si la détection automatique des scripts npm est activée ou désactivée. La valeur par défaut est activée.",
- 	"config.npm.runSilent": "Exécutez les commandes npm avec l'option `--silent`.",
- 	"config.npm.packageManager": "Le gestionnaire de paquets utilisé pour exécuter des scripts.",
-+<<<<<<< .our
- 	"config.npm.exclude": "Configurer les profils glob pour les dossiers qui doivent être exclus de la détection de script automatique.",
- 	"config.npm.enableScriptExplorer": "Activez une vue Explorateur pour les scripts npm.",
- 	"config.npm.scriptExplorerAction": "Action de clic par défaut utilisée dans l’explorateur de scripts :  'open' ou 'run', la valeur par défaut est 'open'.",
-@@ -23,4 +24,7 @@
- 	"command.debug": "Déboguer",
- 	"command.openScript": "Ouvrir",
- 	"command.runInstall": "Exécuter Install"
-+=======
-+	"npm.parseError": "Détection de tâche Npm : impossible d’analyser le fichier {0}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 abd2cc096c82a69b1e9b2c2df7a6e6d6d3bff803 i18n/fra/extensions/typescript/out/features/completionItemProvider.i18n.json
-  our    100644 e11c85c6abbec0a6014d4338f862896dfebf0cee i18n/fra/extensions/typescript/out/features/completionItemProvider.i18n.json
-  their  100644 91434ab1cb277a8e1022f52ecb6e9c492c30a813 i18n/fra/extensions/typescript/out/features/completionItemProvider.i18n.json
-changed in both
-  base   100644 af5be6b52659a12641db54ccf6bf6a388df3d7d6 i18n/fra/src/vs/workbench/common/theme.i18n.json
-  our    100644 67b5e93740c6b4696aa15e5da68929b00e585c36 i18n/fra/src/vs/workbench/common/theme.i18n.json
-  their  100644 0082e6d4ec103ec09a23bd56ca76408ee4620ddc i18n/fra/src/vs/workbench/common/theme.i18n.json
-changed in both
-  base   100644 4827be6525fb187eda1085fe27af1fb85b697dfb i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 1a663cb4405d0c8f86ec154a57cdd2b613d93195 i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 f1f2a6fc8a0f8332bb2b585a3c64152995d9ad51 i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,8 +35,15 @@
- 	"panelDefaultLocation": "Contrôle l’emplacement par défaut du panneau. Il peut être affiché soit en bas ou à droite du banc d'essai.",
- 	"statusBarVisibility": "Contrôle la visibilité de la barre d'état au bas du banc d'essai.",
- 	"activityBarVisibility": "Contrôle la visibilité de la barre d'activités dans le banc d'essai.",
-+<<<<<<< .our
- 	"viewVisibility": "Contrôle la visibilité des actions d'en-tête de vue. Les actions d'en-tête de vue peuvent être soit toujours visibles, ou uniquement visibles quand cette vue a le focus ou est survolée.",
- 	"fontAliasing": "Contrôle la méthode de font aliasing dans le workbench.\n- default : Lissage des polices de sous-pixel. Sur la plupart des affichages non-ratina, cela vous donnera le texte le plus vif\n- antialiased : Lisse les polices au niveau du pixel, plutôt que les sous-pixels. Peut faire en sorte que la police apparaisse plus fine dans l’ensemble \n- none : Désactive le lissage des polices. Le texte s'affichera avec des bordures dentelées\n- auto: Applique `default` ou `antialiased` automatiquement en se basant sur la résolution de l'affichage.",
-+=======
-+	"closeOnFileDelete": "Contrôle si les éditeurs qui affichent un fichier doivent se fermer automatiquement quand ce fichier est supprimé ou renommé par un autre processus. Si vous désactivez cette option, l'éditeur reste ouvert dans un état indiquant une intégrité compromise. Notez que la suppression de fichiers à partir de l'application entraîne toujours la fermeture de l'éditeur, et que les fichiers à l'intégrité compromise ne sont jamais fermés pour permettre la conservation de vos données.",
-+	"experimentalFuzzySearchEndpoint": "Indique le point de terminaison à utiliser pour la recherche des paramètres expérimentaux.",
-+	"experimentalFuzzySearchKey": "Indique la clé à utiliser pour la recherche des paramètres expérimentaux.",
-+	"fontAliasing": "Contrôle la méthode de font aliasing dans le workbench.\n- par défaut : Lissage des polices de sous-pixel. Sur la plupart des affichages non-ratina, cela vous donnera le texte le plus vif\n- crénelées : Lisse les polices au niveau du pixel, plutôt que les sous-pixels. Peut faire en sorte que la police apparaisse plus légère dans l’ensemble \n- none : désactive le lissage des polices. Le texte s'affichera avec des bordures dentelées",
-+>>>>>>> .their
- 	"workbench.fontAliasing.default": "Lissage de sous-pixel des polices. Sur la plupart des affichages non-retina, cela vous donnera le texte le plus vif.",
- 	"workbench.fontAliasing.antialiased": "Lisser les polices au niveau du pixel, plutôt que les sous-pixels. Peut faire en sorte que la police apparaisse plus légère dans l’ensemble.",
- 	"workbench.fontAliasing.none": "Désactive le lissage des polices. Le texte s'affichera avec des bordures dentelées.",
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/fra/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
-  our    100644 285e9d0601730be7a888b6472206502c406c1275 i18n/fra/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
-  their  100644 f14bf24026ea71ee0990603730e15e5f2dcedfda i18n/fra/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"selectAndStartDebug": "Sélectionner et démarrer la configuration de débogage"
- }
-\ No newline at end of file
-changed in both
-  base   100644 1dae12e425f5f78af53715cb4a76766fc37fef50 i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 dc9d0f20d0f5632bb197839a3ff1ba56a6ca08d4 i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 15ea2e4fc11b0c93a75c2b32a9c20438ae90840b i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -28,7 +28,13 @@
- 	"preLaunchTaskExitCode": "Le preLaunchTask '{0}' s'est terminé avec le code de sortie {1}.",
- 	"showErrors": "Afficher les erreurs",
- 	"noFolderWorkspaceDebugError": "Impossible de déboguer le fichier actif. Vérifiez qu'il est enregistré sur le disque et qu'une extension de débogage est installée pour ce type de fichier.",
-+<<<<<<< .our
- 	"cancel": "Annuler",
- 	"DebugTaskNotFound": "Tâche '{0}' introuvable.",
- 	"taskNotTracked": "La tâche '{0}' ne peut pas être tracée."
-+=======
-+	"NewLaunchConfig": "Configurez le fichier config de lancement de votre application. {0}",
-+	"DebugTaskNotFound": "preLaunchTask '{0}' introuvable.",
-+	"taskNotTracked": "La tâche de prélancement '{0}' n'a pas pu être tracée."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c0c7657681f22171eefc67e3d22cbc5bd2e53667 i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 3c10fdb84d0f8c069b4d8fe6dac7e8ac54606d34 i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 32c0006fd6719b621f6db26f320d872d5575dab1 i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -12,6 +12,7 @@
- 	"exeBasedRecommendation": "Cette extension est recommandée parce que {0} est installé.",
- 	"fileBasedRecommendation": "Cette extension est recommandée basé sur les fichiers que vous avez ouverts récemment.",
- 	"workspaceRecommendation": "Cette extension est recommandée par les utilisateurs de l’espace de travail actuel.",
-+	"exeBasedRecommendation": "Cette extension est recommandée parce que {0} est installé.",
- 	"reallyRecommended2": "L'extension '{0}' est recommandée pour ce type de fichier.",
- 	"reallyRecommendedExtensionPack": "Le pack d’extensions '{0}' est recommandé pour ce type de fichier.",
- 	"install": "Installer",
-changed in both
-  base   100644 2ab53a489426db956ae4b882910ba4c59048263a i18n/fra/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
-  our    100644 e89ff759730af280279a145488408bbe2921c8d5 i18n/fra/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
-  their  100644 891ac2e5d786f2e90bd45f56d43cf23e041408bd i18n/fra/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
-@@ -16,6 +16,10 @@
- 	"exclude.boolean": "Modèle Glob auquel les chemins de fichiers doivent correspondre. Affectez la valeur true ou false pour activer ou désactiver le modèle.",
- 	"exclude.when": "Vérification supplémentaire des frères d'un fichier correspondant. Utilisez $(basename) comme variable pour le nom de fichier correspondant.",
- 	"useRipgrep": "Contrôle si ripgrep doit être utilisé dans la recherche de texte et de fichier",
-+<<<<<<< .our
-+=======
-+	"useIgnoreFilesByDefault": "Contrôle s'il faut utiliser les fichiers .gitignore et .ignore par défaut en cas de recherche dans un nouvel espace de travail.",
-+>>>>>>> .their
- 	"useIgnoreFiles": "Contrôle s'il faut utiliser les fichiers .gitignore et .ignore par défaut pendant la recherche de fichiers.",
- 	"search.quickOpen.includeSymbols": "Configurez l'ajout des résultats d'une recherche de symboles globale dans le fichier de résultats pour Quick Open.",
- 	"search.followSymlinks": "Détermine s’il faut suivre les liens symboliques lors de la recherche."
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/fra/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
-  our    100644 414a32a9d53d5a777716624b75a232d5b767f87e i18n/fra/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
-  their  100644 2355522c31cbdeabd34cd92bf5de2bb71624a0f6 i18n/fra/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"bubbleTitle": "Contient des éléments soulignés"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"bubbleTitle": "contient des éléments soulignés"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7903815d420844e79703b2d77a1f5ce3b94959f0 i18n/hun/extensions/npm/package.i18n.json
-  our    100644 08255b5c4709454b75a16c8ef42f48e270a52f7d i18n/hun/extensions/npm/package.i18n.json
-  their  100644 f40a9889cf10c681d0ec0b91d83748de3bda230f i18n/hun/extensions/npm/package.i18n.json
-@@ -11,6 +11,7 @@
- 	"config.npm.autoDetect": "Meghatározza, hogy az npm-parancsfájlok automatikus felderításe be van-e kapcsolva. A beállítás alapértelmezetten aktív.",
- 	"config.npm.runSilent": "Az npm-parancsok a '--silent' kapcsolóval fussanak.",
- 	"config.npm.packageManager": "A parancsfájlok futtatásához használt csomagkezelő.",
-+<<<<<<< .our
- 	"config.npm.exclude": "Azokat a mappákat leíró globális minta, amelyek ne legyenek vizsgálva az automatikus parancsfájlkeresés közben.",
- 	"config.npm.enableScriptExplorer": "Npm-parancsokat listázó nézet engedélyezése a Fájlkezelőben.",
- 	"config.npm.scriptExplorerAction": "Az alapértelmezett művelet kattintás esetén a parancsnézeten: „open” a megnyitáshoz vagy „run” a futtatáshoz. Az alapértelmezett érték az „open”.",
-@@ -23,4 +24,7 @@
- 	"command.debug": "Hibakeresés",
- 	"command.openScript": "Megnyitás",
- 	"command.runInstall": "Telepítés futtatása"
-+=======
-+	"npm.parseError": "Npm-feladatok felderítése: nem sikerült beolvasni a következő fájlt: {0}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 69b50af008f826622d3dbc0de087c81df9a0e999 i18n/hun/extensions/typescript/out/features/completionItemProvider.i18n.json
-  our    100644 30437c7682caf989fb6254d77ce8268b6bb97735 i18n/hun/extensions/typescript/out/features/completionItemProvider.i18n.json
-  their  100644 74dcbbe0b6ce30a4a90640b067bbe98eadb5f9b5 i18n/hun/extensions/typescript/out/features/completionItemProvider.i18n.json
-changed in both
-  base   100644 471b064ae29d989455d86872866cc7536ca18f84 i18n/hun/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 cc21f47e7a5add72269e1dcc252497e79ab58b6b i18n/hun/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 9d611969580846c222a04fef1f02ecdbe811ed71 i18n/hun/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,8 +35,15 @@
- 	"panelDefaultLocation": "Meghatározza a panel alapértelmezett pozícióját. A panel a munkaterület alján vagy jobb oldalán jelenhet meg.",
- 	"statusBarVisibility": "Meghatározza, hogy megjelenjen-e az állapotsor a munkaterület alján.",
- 	"activityBarVisibility": "Meghatározza, hogy megjelenjen-e a tevékenységsáv a munkaterületen.",
-+<<<<<<< .our
- 	"viewVisibility": "Meghatározza a nézetek fejlécén található műveletek láthatóságát. A műveletek vagy mindig láthatók, vagy csak akkor jelennek meg, ha a nézeten van a fókusz vagy az egérkurzor fölötte van.",
- 	"fontAliasing": "Meghatározza a munkaterületen megjelenő betűtípusok élsimítási módszerét.\n- default: Szubpixeles betűsimítás. A legtöbb nem-retina típusú kijelzőn ez adja a legélesebb szöveget.\n- antialiased: A betűket pixelek, és nem szubpixelek szintjén simítja. A betűtípus vékonyabbnak tűnhet összességében.\n- none: Letiltja a betűtípusok élsimítését. A szövegek egyenetlen, éles szélekkel jelennek meg.\n- auto: A `default` vagy `antialiased` beállítások automatikus alkalmazása a kijelzők DPI-je alapján.",
-+=======
-+	"closeOnFileDelete": "Meghatározza, hogy bezáródjanak-e azok a szerkesztőablakok, melyekben olyan fájl van megnyitva, amelyet töröl vagy átnevez egy másik folyamat. A beállítás letiltása esetén a szerkesztőablak nyitva marad módosított állapotban ilyen esemény után. Megjegyzés: az alkalmazáson belüli törlések esetén mindig bezáródik a szerkesztőablakok, a módosított fájlok pedig soha nem záródnak be, hogy az adatok megmaradjanak.",
-+	"experimentalFuzzySearchEndpoint": "Meghatározza a kísérleti beállításkeresőben használt végpontot.",
-+	"experimentalFuzzySearchKey": "Meghatározza a kísérleti beállításkeresőben használt kulcsot.",
-+	"fontAliasing": "Meghatározza a munkaterületen megjelenő betűtípusok élsimítási módszerét.\n- default: Szubpixeles betűsimítás. A legtöbb nem-retina típusú kijelzőn ez adja a legélesebb szöveget.\n- antialiased: A betűket pixelek, és nem szubpixelek szintjén simítja. A betűtípus vékonyabbnak tűnhet összességében.\n- none: Letiltja a betűtípusok élsimítését. A szövegek egyenetlen, éles szélekkel jelennek meg.",
-+>>>>>>> .their
- 	"workbench.fontAliasing.default": "Szubpixeles betűsimítás. A legtöbb nem-retina típusú kijelzőn ez adja a legélesebb szöveget.",
- 	"workbench.fontAliasing.antialiased": "A betűket pixelek, és nem szubpixelek szintjén simítja. A betűtípus vékonyabbnak tűnhet összességében.",
- 	"workbench.fontAliasing.none": "Letiltja a betűtípusok élsimítését. A szövegek egyenetlen, éles szélekkel jelennek meg.",
-changed in both
-  base   100644 21f3a85d0140d5a809cdd611ce176a16b5bf0161 i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 236476e89a262d4e51ec02393f20d9a7b2715c82 i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 45b78dc0d375061a54888e6a315b10e6f4261237 i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -12,8 +12,15 @@
- 	"exeBasedRecommendation": "Ez a kiegészítő azért ajánlott, mert a következő telepítve van: {0}.",
- 	"fileBasedRecommendation": "Ez a kiegészítő a közelmúltban megnyitott fájlok alapján ajánlott.",
- 	"workspaceRecommendation": "Ez a kiegészítő az aktuális munkaterület felhasználói által ajánlott.",
-+<<<<<<< .our
- 	"reallyRecommended2": "Ehhez a fájltípushoz a(z) '{0}' kiegészítő ajánlott.",
- 	"reallyRecommendedExtensionPack": "Ehhez a fájltípushoz a(z) '{0}' kiegészítőcsomag ajánlott.",
-+=======
-+	"exeBasedRecommendation": "Ez a kiegészítő azért ajánlott, mert a következő telepítve van: {0}.",
-+	"reallyRecommended2": "Ehhez a fájltípushoz ajánlott a(z) '{0}' kiegészítő.",
-+	"reallyRecommendedExtensionPack": "Ehhez a fájltípushoz ajánlott a(z) '{0}' kiegészítőcsomag.",
-+	"showRecommendations": "Ajánlatok megjelenítése",
-+>>>>>>> .their
- 	"install": "Telepítés",
- 	"showRecommendations": "Ajánlatok megjelenítése",
- 	"showLanguageExtensions": "A piactéren található olyan kiegészítő, ami segíthet a(z) '.{0}' fájloknál",
-changed in both
-  base   100644 2b1bd514d59d7209f821ab97a64c35a2bd14bb59 i18n/ita/extensions/npm/package.i18n.json
-  our    100644 35faed0d788c5e82f45e8fdf22618f3516a421ca i18n/ita/extensions/npm/package.i18n.json
-  their  100644 87433f51bd9562b3a15d7216bda0227c8d79191c i18n/ita/extensions/npm/package.i18n.json
-@@ -11,6 +11,7 @@
- 	"config.npm.autoDetect": "Controlla se la rilevazione automatica degli script npm è on/off. L'impostazione predefinita è 'on'.",
- 	"config.npm.runSilent": "Eseguire comandi npm con l'opzione `--silent`.",
- 	"config.npm.packageManager": "Il gestore dei pacchetti utilizzato per eseguire script.",
-+<<<<<<< .our
- 	"config.npm.exclude": "Configura i modelli glob per le cartelle che dovrebbero essere escluse dalla rilevazione automatica di script.",
- 	"config.npm.enableScriptExplorer": "Vedi come Esplora risorse gli script npm.",
- 	"config.npm.scriptExplorerAction": "Azione predefinita per il clic in Esplora script: 'open' o 'run'. L'impostazione predefinita è 'open'.",
-@@ -23,4 +24,7 @@
- 	"command.debug": "Debug",
- 	"command.openScript": "Apri",
- 	"command.runInstall": "Esegui install"
-+=======
-+	"npm.parseError": "Rilevamento attività NPM: Impossibile analizzare il file {0}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 afc4b6fc6666066ba4f6e29d566fbf28878e45fe i18n/ita/src/vs/code/electron-main/windows.i18n.json
-  our    100644 250ae14629598106ced719e4c761822b45303be0 i18n/ita/src/vs/code/electron-main/windows.i18n.json
-  their  100644 a862ae375f20afc7a97150c0df6cd524bef11957 i18n/ita/src/vs/code/electron-main/windows.i18n.json
-changed in both
-  base   100644 3ce1b25b4982c3320a3d73571f2761deaf91bc46 i18n/ita/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 967a9460fbe454ea199d54b4639f97929c5854cd i18n/ita/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 0a58dca9eaaf74ffb9f135ba4039a3e5f5a663da i18n/ita/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -9,11 +9,25 @@
- 	"openFile": "Apri file...",
- 	"openFolder": "Apri cartella...",
- 	"openFileFolder": "Apri...",
-+<<<<<<< .our
- 	"globalRemoveFolderFromWorkspace": "Rimuovi cartella dall'area di lavoro...",
-+=======
-+	"addFolderToWorkspace": "Aggiungi cartella all'area di lavoro...",
-+	"add": "&&Aggiungi",
-+	"addFolderToWorkspaceTitle": "Aggiungi cartella all'area di lavoro",
-+	"globalRemoveFolderFromWorkspace": "Rimuovi cartella dall'area di lavoro...",
-+	"removeFolderFromWorkspace": "Rimuovi cartella dall'area di lavoro",
-+	"openFolderSettings": "Apri impostazioni cartella",
-+>>>>>>> .their
- 	"saveWorkspaceAsAction": "Salva area di lavoro come...",
- 	"save": "&&Salva",
- 	"saveWorkspace": "Salva area di lavoro",
- 	"openWorkspaceAction": "Apri area di lavoro...",
- 	"openWorkspaceConfigFile": "Apri file di configurazione dell'area di lavoro",
-+<<<<<<< .our
- 	"duplicateWorkspaceInNewWindow": "Duplica area di lavoro nella nuova finestra"
-+=======
-+	"openFolderAsWorkspaceInNewWindow": "Apre la cartella come area di lavoro in una nuova finestra",
-+	"workspaceFolderPickerPlaceholder": "Selezionare la cartella dell'area di lavoro"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 427b89146248b2ab39dfe5b84f1a05acdf4db8fe i18n/ita/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
-  our    100644 8b19a3a5d088317951bdfd3535f2d22a5ae9ba07 i18n/ita/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
-  their  100644 7564483e276300e61057a51e79d3804dcdb90ddc i18n/ita/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
-changed in both
-  base   100644 e288ac9106694533c542a9deff82b1836d07911a i18n/ita/src/vs/workbench/browser/parts/panel/panelActions.i18n.json
-  our    100644 c833030dc0a96d9762770d5d5964d090dcf47bb9 i18n/ita/src/vs/workbench/browser/parts/panel/panelActions.i18n.json
-  their  100644 c642df3b5ec09aed20b39a7d3f988387fa651ea9 i18n/ita/src/vs/workbench/browser/parts/panel/panelActions.i18n.json
-changed in both
-  base   100644 3d0d9d93c84bc16423a691320ea1040b6650a5d0 i18n/ita/src/vs/workbench/common/theme.i18n.json
-  our    100644 35f6e5209eb686bd26e13c1a8f96b6d2fe49fc8a i18n/ita/src/vs/workbench/common/theme.i18n.json
-  their  100644 c2344ccce6ac86de46b28825eb9665a6a82d07cc i18n/ita/src/vs/workbench/common/theme.i18n.json
-changed in both
-  base   100644 f17ae8d5fa8911b132a399b5c20aaf646fc0b96b i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 16fec1a5d98f225249a95297ad06c45ba75efafc i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 527e50d39f6982650d3ab7f7a2719b9f937bbd97 i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -23,20 +23,35 @@
- 	"showIcons": "Controlla se visualizzare o meno un'icona per gli editor aperti. Richiede l'abilitazione anche di un tema dell'icona.",
- 	"enablePreview": "Controlla se gli editor aperti vengono visualizzati come anteprima. Le anteprime editor vengono riutilizzate finché vengono mantenute (ad esempio tramite doppio clic o modifica) e vengono visualizzate in corsivo.",
- 	"enablePreviewFromQuickOpen": "Controlla se gli editor aperti da Quick Open vengono visualizzati come anteprima. Le anteprime editor vengono riutilizzate finché vengono mantenute, ad esempio tramite doppio clic o modifica.",
-+<<<<<<< .our
- 	"closeOnFileDelete": "Controlla se gli editor che visualizzano un file devono chiudersi automaticamente quando il file viene eliminato o rinominato da un altro processo. Se si disabilita questa opzione, in una simile circostanza l'editor verrà aperto e i file risulteranno modificati ma non salvati. Nota: se si elimina il file dall'interno dell'applicazione, l'editor verrà sempre chiuso e i file modificati ma non salvati non verranno mai chiusi allo scopo di salvaguardare i dati.",
- 	"editorOpenPositioning": "Controlla la posizione in cui vengono aperti gli editor. Selezionare 'sinistra' o 'destra' per aprire gli editor a sinistra o a destra di quello attualmente attivo. Selezionare 'primo' o 'ultimo' per aprire gli editor indipendentemente da quello attualmente attivo.",
- 	"revealIfOpen": "Controlla se un editor viene visualizzato in uno qualsiasi dei gruppi visibili se viene aperto. Se l'opzione è disabilitata, un editor verrà aperto preferibilmente nel gruppo di editor attualmente attivo. Se è abilitata, un editor già aperto verrà visualizzato e non aperto di nuovo nel gruppo di editor attualmente attivo. Nota: in alcuni casi questa impostazione viene ignorata, ad esempio quando si forza l'apertura di un editor in un gruppo specifico oppure a lato del gruppo attualmente attivo.",
- 	"swipeToNavigate": "Scorrere orizzontalmente con tre dita per spostarsi tra i file aperti.",
-+=======
-+	"editorOpenPositioning": "Controlla la posizione in cui vengono aperti gli editor. Selezionare 'sinistra' o 'destra' per aprire gli editor a sinistra o a destra di quello attualmente attivo. Selezionare 'primo' o 'ultimo' per aprire gli editor indipendentemente da quello attualmente attivo.",
-+	"revealIfOpen": "Controlla se un editor viene visualizzato in uno qualsiasi dei gruppi visibili se viene aperto. Se l'opzione è disabilitata, un editor verrà aperto preferibilmente nel gruppo di editor attualmente attivo. Se è abilitata, un editor già aperto verrà visualizzato e non aperto di nuovo nel gruppo di editor attualmente attivo. Nota: in alcuni casi questa impostazione viene ignorata, ad esempio quando si forza l'apertura di un editor in un gruppo specifico oppure a lato del gruppo attualmente attivo.",
-+>>>>>>> .their
- 	"commandHistory": "Controlla il numero di comandi utilizzati di recente da mantenere nella cronologia. Impostare a 0 per disabilitare la cronologia dei comandi.",
- 	"preserveInput": "Controlla se l'ultimo input digitato nel riquadro comandi deve essere ripristinato alla successiva riapertura del riquadro.",
- 	"closeOnFocusLost": "Controlla se Quick Open deve essere chiuso automaticamente quando perde lo stato attivo.",
- 	"openDefaultSettings": "Controlla se all'apertura delle impostazioni viene aperto anche un editor che mostra tutte le impostazioni predefinite.",
- 	"sideBarLocation": "Controlla la posizione della barra laterale. Può essere visualizzata a sinistra o a destra del workbench.",
-+<<<<<<< .our
- 	"panelDefaultLocation": "Controlla la posizione predefinita del pannello. Può essere mostrato nella parte inferiore o a destra del banco di lavoro.",
- 	"statusBarVisibility": "Controlla la visibilità della barra di stato nella parte inferiore del workbench.",
- 	"activityBarVisibility": "Controlla la visibilità della barra attività nel workbench.",
- 	"viewVisibility": "Controlla la visibilità delle azioni dell'intestazione della visualizzazione. Le azioni dell'intestazione della visualizzazione possono essere sempre visibili oppure visibili solo quando lo stato attivo è spostato sulla visualizzazione o si passa con il puntatore sulla visualizzazione.",
- 	"fontAliasing": "Controlla il metodo di aliasing dei caratteri nell'area di lavoro.\n- default: anti-aliasing dei caratteri a livello di sub-pixel. Nella maggior parte delle visualizzazioni non retina consentirà di ottenere un testo con il massimo contrasto.\n- antialiased: anti-aliasing dei caratteri a livello di pixel, invece che a livello di sub-pixel. Consente di visualizzare i caratteri più chiari.\n- none: disabilita l'anti-aliasing dei caratteri. Il testo verrà visualizzato con contorni irregolari.\n- auto: applica automaticamente `default` o `antialiased` in base al valore DPI degli schermi.",
-+=======
-+	"panelLocation": "Controlla la posizione del pannello. Può essere visualizzato in basso o a destra del Workbench.",
-+	"statusBarVisibility": "Controlla la visibilità della barra di stato nella parte inferiore del workbench.",
-+	"activityBarVisibility": "Controlla la visibilità della barra attività nel workbench.",
-+	"closeOnFileDelete": "Controlla se gli editor che visualizzano un file devono chiudersi automaticamente quando il file viene eliminato o rinominato da un altro processo. Se si disabilita questa opzione, in una simile circostanza l'editor verrà aperto e i file risulteranno modificati ma non salvati. Nota: se si elimina il file dall'interno dell'applicazione, l'editor verrà sempre chiuso e i file modificati ma non salvati non verranno mai chiusi allo scopo di salvaguardare i dati.",
-+	"experimentalFuzzySearchEndpoint": "Indica l'endpoint da utilizzare per la ricerca di impostazioni sperimentali.",
-+	"experimentalFuzzySearchKey": "Indica la chiave da utilizzare per la ricerca di impostazioni sperimentali.",
-+	"fontAliasing": "Controlla il metodo di aliasing dei caratteri nell'area di lavoro.\n- impostazione predefinita: anti-aliasing dei caratteri a livello di sub-pixel. Nella maggior parte delle visualizzazioni non retina consentirà di ottenere un testo con il massimo contrasto.\n- anti-aliasing: anti-aliasing dei caratteri a livello di pixel, invece che a livello di sub-pixel. Consente di visualizzare i caratteri più chiari.\n- nessuno: disabilita l'anti-aliasing dei caratteri. Il testo verrà visualizzato con contorni irregolari.",
-+>>>>>>> .their
- 	"workbench.fontAliasing.default": "Anti-aliasing dei caratteri a livello di sub-pixel. Nella maggior parte delle visualizzazioni non retina consentirà di ottenere un testo con il massimo contrasto.",
- 	"workbench.fontAliasing.antialiased": "Anti-aliasing dei caratteri a livello di pixel, invece che a livello di sub-pixel. Consente di visualizzare i caratteri più chiari.",
- 	"workbench.fontAliasing.none": "Disabilita l'anti-aliasing dei caratteri. Il testo verrà visualizzato con contorni irregolari. ",
-@@ -63,7 +78,11 @@
- 	"restoreWindows": "Controlla la modalità di riapertura delle finestre dopo un riavvio. Selezionare 'none' per iniziare sempre con un'area di lavoro vuota, 'one' per riaprire l'ultima finestra usata,  'folders' per riaprire tutte le finestre con cartelle aperte oppure 'all' per riaprire tutte le finestre dell'ultima sessione.",
- 	"restoreFullscreen": "Controlla se una finestra deve essere ripristinata a schermo intero se è stata chiusa in questa modalità.",
- 	"zoomLevel": "Consente di modificare il livello di zoom della finestra. Il valore originale è 0 e ogni incremento superiore (ad esempio 1) o inferiore (ad esempio -1) rappresenta un aumento o una diminuzione del 20% della percentuale di zoom. È anche possibile immettere valori decimali per modificare il livello di zoom con maggiore granularità.",
-+<<<<<<< .our
- 	"title": "Controlla il titolo della finestra in base all'editor attivo. Le variabili vengono sostituite in base al contesto:\n${activeEditorShort}: nome del file (ad es. MyFile.txt)\n${activeEditorMedium}: percorso del file relativo alla cartella dell'area di lavoro (ad es. myFolder/myFile.txt)\n${activeEditorLong}: percorso completo del file (ad es. / Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: nome della cartella dell'area di lavoro in cui è contenuto il file (ad es. myFolder)\n${folderPath}: percorso della cartella dell'area di lavoro in cui è contenuto il file (ad es. /Users/Development/myFolder)\n${rootName}: nome dell'area di lavoro (ad es. myFolder o myWorkspace)\n${rootPath}: percorso dell'area di lavoro (ad es. /Users/Development/myWorkspace)\n$(appName): ad esempio VS Code\n${dirty}: indica se l'editor attivo è in fase di modifica\n${separator}: separatore condizionale (\" - \") che viene visualizzato solo quando circondato da variabili con valori o testo statico",
-+=======
-+	"title": "Controlla il titolo della finestra in base all'editor attivo. Le variabili vengono sostituite in base al contesto:\n${activeEditorShort}: il nome del file (ad es. MyFile.txt)\n${activeEditorMedium}: il percorso del file relativo alla cartella dell'area di lavoro (ad es. myFolder/myFile.txt)\n${activeEditorLong}: il percorso completo del file (ad es. / Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: nome della cartella dell'area di lavoro in cui è contenuto il file (ad es. myFolder)\n${folderPath}: percorso della cartella dell'area di lavoro in cui è contenuto il file (ad es. /Users/Development/myFolder)\n${rootName}: nome dell'area di lavoro (ad es. myFolder o myWorkspace)\n${rootPath}: percorso dell'area di lavoro (ad es. /Users/Development/myWorkspace)\n$(appName): ad esempio VS Code\n${dirty}: indica se l'editor attivo è in fase di modifica\n${separator}: un separatore condizionale (\" - \") che viene visualizzato solo quando circondato da variabili con valori",
-+>>>>>>> .their
- 	"window.newWindowDimensions.default": "Apre nuove finestre al centro della schermata.",
- 	"window.newWindowDimensions.inherit": "Apre nuove finestre le cui dimensioni sono uguali a quelle dell'ultima finestra attiva.",
- 	"window.newWindowDimensions.maximized": "Apre nuove finestre ingrandite a schermo intero.",
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/ita/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
-  our    100644 c49ae5ea1c1fcc99d91678668970a3bc3c61fe79 i18n/ita/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
-  their  100644 15537193818cdf79da7d5c950727ef0c9eb06c2e i18n/ita/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"selectAndStartDebug": "Selezionare e avviare la configurazione di debug"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/ita/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json
-  our    100644 52ef13cae4399db150b7f9fd517318c7894f33f8 i18n/ita/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json
-  their  100644 6e58c8fb31fb0089f5364a15f426de7d4c76d6b0 i18n/ita/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,6 +8,14 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"startAdditionalSession": "Avvia sessione aggiuntiva",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"debugFocusVariablesView": "Variabili in focus",
- 	"debugFocusWatchView": "Espressione di controllo in focus",
- 	"debugFocusCallStackView": "Stack di chiamate in focus",
-changed in both
-  base   100644 2a7a5e5d5a5891f0fab7c76a172f96b713ba28a4 i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 c085858a8c6aed272feca37cbd61f5b25e9ca236 i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 9d3c04442353db96d0981ece6f9bf125ea4f4624 i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -17,18 +17,31 @@
- 	"multipleConfigurationNamesInWorkspace": "Nell'area di lavoro sono presenti più configurazioni di avvio '{0}'. Usare il nome di cartella per qualificare la configurazione.",
- 	"noFolderWithName": "La cartella denominata '{0}' per la configurazione '{1}' nell'elemento compounds '{2}' non è stata trovata.",
- 	"configMissing": "In 'launch.json' manca la configurazione '{0}'.",
-+<<<<<<< .our
- 	"launchJsonDoesNotExist": "'launch.json' non esiste.",
- 	"debugRequestNotSupported": "Nella configurazione di debug scelta l'attributo '{0}' ha un valore non supportato '{1}'.",
- 	"debugRequesMissing": "Nella configurazione di debug scelta manca l'attributo '{0}'.",
- 	"debugTypeNotSupported": "Il tipo di debug configurato '{0}' non è supportato.",
- 	"debugTypeMissing": "Manca la proprietà 'type' per la configurazione di avvio scelta.",
-+=======
-+	"debugRequestNotSupported": "Nella configurazione di debug scelta l'attributo '{0}' ha un valore non supportato '{1}'.",
-+	"debugRequesMissing": "Nella configurazione di debug scelta manca l'attributo '{0}'.",
-+	"debugTypeNotSupported": "Il tipo di debug configurato '{0}' non è supportato.",
-+	"debugTypeMissing": "Proprietà 'tipo' mancante per la configurazione di avvio scelta",
-+>>>>>>> .their
- 	"debugAnyway": "Eseguire comunque il debug",
- 	"preLaunchTaskErrors": "Sono stati rilevati errori di compilazione durante preLaunchTask '{0}'.",
- 	"preLaunchTaskError": "È stato rilevato un errore di compilazione durante preLaunchTask '{0}'.",
- 	"preLaunchTaskExitCode": "L'attività di preavvio '{0}' è stata terminata ed è stato restituito il codice di uscita {1}.",
- 	"showErrors": "Mostra errori",
- 	"noFolderWorkspaceDebugError": "Non è possibile eseguire il debug del file attivo. Assicurarsi che sia salvato su disco e che sia installata un'estensione di debug per tale tipo di file.",
-+<<<<<<< .our
- 	"cancel": "Annulla",
- 	"DebugTaskNotFound": "Impossibile trovare l'attività '{0}'.",
- 	"taskNotTracked": "L'attività '{0}' non può essere rintracciata."
-+=======
-+	"NewLaunchConfig": "Impostare il file di configurazione di avvio per l'applicazione. {0}",
-+	"DebugTaskNotFound": "L'attività di preavvio '{0}' non è stata trovata.",
-+	"taskNotTracked": "Non è possibile tenere traccia del preLaunchTask '{0}'."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 2740934029a51630d81e022601f610469269d6c0 i18n/ita/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json
-  our    100644 00b46b84dddc26bf0a37228a7f93d0f77c06ed7a i18n/ita/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json
-  their  100644 fe1fda9b84874b29d9c96d09b274efc054017877 i18n/ita/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json
-changed in both
-  base   100644 3d729450651433add44463ca3862307694b4efec i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 8a9cb12815ff71703170d90088b67ed38f90d1c9 i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 9dc95614a882d840a585dfebacd56a6215eb1fd8 i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-@@ -50,6 +50,10 @@
- 	"allExtensionsInstalled": "Tutte le estensioni consigliate per questa area di lavoro sono già state installate",
- 	"installRecommendedExtension": "Installa l'estensione consigliata",
- 	"extensionInstalled": "L'estensione consigliata è già stata installata",
-+<<<<<<< .our
-+=======
-+	"showRecommendedKeymapExtensions": "Mostra mappature tastiera consigliate",
-+>>>>>>> .their
- 	"showRecommendedKeymapExtensionsShort": "Mappature tastiera",
- 	"showLanguageExtensionsShort": "Estensioni del linguaggio",
- 	"showAzureExtensionsShort": "Estensioni di Azure",
-changed in both
-  base   100644 235d30122926075505ccff4d67396b890861f36e i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 87312cd2502c47006701381399f821b3154685ff i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 ec5fd33a3b1949fdef92ce08e1586cdcb9ac2168 i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,11 @@
- 	"exeBasedRecommendation": "Questa estensione è consigliata perché avete installato {0}.",
- 	"fileBasedRecommendation": "Questa estensione è raccomandata in base ai file aperti di recente.",
- 	"workspaceRecommendation": "Questa estensione è consigliata dagli utenti dell'area di lavoro corrente.",
-+=======
-+	"fileBasedRecommendation": "Questa estensione è raccomandata in base ai file aperti di recente.",
-+	"workspaceRecommendation": "Questa estensione è consigliata dagli utenti dell'area di lavoro corrente.",
-+	"exeBasedRecommendation": "Questa estensione è consigliata perché avete installato {0}.",
-+>>>>>>> .their
- 	"reallyRecommended2": "Per questo tipo di file è consigliabile utilizzare l'estensione '{0}'.",
- 	"reallyRecommendedExtensionPack": "Per questo tipo di file è consigliabile usare il pacchetto di estensione '{0}'.",
- 	"install": "Installa",
-changed in both
-  base   100644 277f7243cc029c6004684c1079b3938af0442c14 i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
-  our    100644 b4c1e79a326eb4f752cd0998e8d6b2cc29e2acbe i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
-  their  100644 0a0c003ad3a207328a86797b4896036195dea4a9 i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
-@@ -10,5 +10,9 @@
- 	"installVSIX": "Installa da VSIX...",
- 	"installFromVSIX": "Installare da VSIX",
- 	"installButton": "&&Installa",
-+<<<<<<< .our
-+=======
-+	"InstallVSIXAction.success": "L'estensione è stata installata. Riavviare per abilitarla.",
-+>>>>>>> .their
- 	"InstallVSIXAction.reloadNow": "Ricarica ora"
- }
-\ No newline at end of file
-changed in both
-  base   100644 7d5d0970d7755958d26953debb10cab882162a3e i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  our    100644 17b06f638b8c4e434b5c1e9690e18cec027dc497 i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  their  100644 772fd9031b4726d71a5cd3d0e1056b41a8c9fb99 i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-@@ -12,9 +12,12 @@
- 	"recommendedExtensions": "Consigliate",
- 	"otherRecommendedExtensions": "Altri consigli",
- 	"workspaceRecommendedExtensions": "Consigli per l'area di lavoro",
-+<<<<<<< .our
- 	"builtInExtensions": "Funzionalità",
- 	"builtInThemesExtensions": "Temi",
- 	"builtInBasicsExtensions": "Linguaggi di programmazione",
-+=======
-+>>>>>>> .their
- 	"searchExtensions": "Cerca le estensioni nel Marketplace",
- 	"sort by installs": "Ordina per: conteggio installazioni",
- 	"sort by rating": "Ordina per: classificazione",
-changed in both
-  base   100644 ce01ca87af50e00c82e187341aac623a8ce32540 i18n/ita/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  our    100644 7d23a38e70345906d2303122bbd907e2d0b21fb4 i18n/ita/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  their  100644 3b0fcf88e9886940755aeb9cfcd52093aee3f17b i18n/ita/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-changed in both
-  base   100644 973412c0e7350a7a6806709f1ed9694ed0681521 i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-  our    100644 10bf388adfb7246223e58b306fc20f4edcc1d949 i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-  their  100644 7d41a6f735128cffc915f523f03ca493d01c8533 i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-@@ -9,6 +9,7 @@
- 	"SearchSettingsWidget.AriaLabel": "Cerca impostazioni",
- 	"SearchSettingsWidget.Placeholder": "Cerca impostazioni",
- 	"noSettingsFound": "Nessun risultato",
-+<<<<<<< .our
- 	"oneSettingFound": "1 impostazione trovata",
- 	"settingsFound": "{0} impostazioni trovate",
- 	"totalSettingsMessage": "{0} impostazioni in totale",
-@@ -18,6 +19,12 @@
- 	"defaultUserSettings": "Impostazioni predefinite utente",
- 	"defaultWorkspaceSettings": "Impostazioni area di lavoro predefinite",
- 	"defaultFolderSettings": "Impostazioni cartella predefinite",
-+=======
-+	"oneSettingFound": "1 impostazione corrispondente",
-+	"settingsFound": "{0} impostazioni corrispondenti",
-+	"fileEditorWithInputAriaLabel": "{0}. Editor file di testo.",
-+	"fileEditorAriaLabel": "Editor file di testo.",
-+>>>>>>> .their
- 	"defaultEditorReadonly": "Modificare nell'editor a destra per ignorare le impostazioni predefinite.",
- 	"preferencesAriaLabel": "Preferenze predefinite. Editor di testo di sola lettura."
- }
-\ No newline at end of file
-changed in both
-  base   100644 bfe4ac78d727bccfb5d487f78cf6fa16e367a579 i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 acbb94499ddd6c7a425c0f53ca65dd8e6248c34e i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 55d6b99c4086bec0b8159a5189bba491871f4ef8 i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -13,5 +13,13 @@
- 	"newExtensionLabel": "Mostra l'estensione \"{0}\"",
- 	"editTtile": "Modifica",
- 	"replaceDefaultValue": "Sostituisci nelle impostazioni",
-+<<<<<<< .our
- 	"copyDefaultValue": "Copia nelle impostazioni"
-+=======
-+	"copyDefaultValue": "Copia nelle impostazioni",
-+	"unsupportedPHPExecutablePathSetting": "Questa deve essere un'impostazione utente. Per configurare PHP per l'area di lavoro, aprire un file PHP e fare clic su 'Percorso PHP' nella barra di stato.",
-+	"unsupportedWorkspaceSetting": "Questa deve essere un'impostazione utente.",
-+	"unsupportedWorkbenchSetting": "Non è possibile applicare ora questa impostazione. Verrà applicata direttamente all'apertura della cartella.",
-+	"unsupportedWorkbenchSettingDevMode": "L'impostazione non può essere applicata in questo momento. Essa verrà applicata se il suo ambito sarà definito come 'risorsa' durante la registrazione, o quando si aprirà questa cartella direttamente."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 58c15096c23580b0502314e9e8ad35d303b13b3d i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 fe346036c36b558ff4bb96cc47cf0bc0e91a4106 i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 a440b0eccc0709f35c714b5e6f8d098885c8c25f i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,4 +13,11 @@
- 	"userSettings": "Impostazioni utente",
- 	"workspaceSettings": "Impostazioni area di lavoro",
- 	"folderSettings": "Impostazioni cartella"
-+=======
-+	"defaultSettingsFuzzyPrompt": "Prova la ricerca fuzzy!",
-+	"defaultSettings": "Inserire le impostazioni nell'editor di lato destro per eseguire l'override.",
-+	"noSettingsFound": "Non sono state trovate impostazioni.",
-+	"folderSettingsDetails": "Impostazioni cartella",
-+	"enableFuzzySearch": "Attivare la ricerca fuzzy sperimentale"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7149b64d24f5dfcf7812bd41014e1ca0e3f2d263 i18n/ita/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  our    100644 0dbd18fbe236306a0033a2febcef40e1643db2ff i18n/ita/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  their  100644 c4cdd4ead337c007b5986cec2f24a27abcbf7db7 i18n/ita/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-@@ -7,5 +7,6 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"commonlyUsed": "Più usate",
-+	"mostRelevant": "Più rilevanti",
- 	"defaultKeybindingsHeader": "Per sovrascrivere i tasti di scelta rapida, inserirli nel file dei tasti di scelta rapida."
- }
-\ No newline at end of file
-changed in both
-  base   100644 9cda34a7b9a0a4c82cf483cdeb6b8e19200ca8b2 i18n/ita/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
-  our    100644 25315a7f99eac9c9766c4f6939865daa29f48e65 i18n/ita/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
-  their  100644 a5096d19095d894bbdd0a0f1fdeaeed7888e3310 i18n/ita/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
-@@ -16,6 +16,10 @@
- 	"exclude.boolean": "Criterio GLOB da usare per trovare percorsi file. Impostare su True o False per abilitare o disabilitare il criterio.",
- 	"exclude.when": "Controllo aggiuntivo sugli elementi di pari livello di un file corrispondente. Usare $(basename) come variabile del nome file corrispondente.",
- 	"useRipgrep": "Controlla l'utilizzo di ripgrep nelle ricerche su testo e file",
-+<<<<<<< .our
-+=======
-+	"useIgnoreFilesByDefault": "Controlla se utilizzare i file .gitignore e .ignore come impostazione predefinita durante la ricerca testuale in una nuova area di lavoro.",
-+>>>>>>> .their
- 	"useIgnoreFiles": "Controlla se utilizzare i file .gitignore e .ignore durante la ricerca di file",
- 	"search.quickOpen.includeSymbols": "Configurare questa opzione per includere i risultati di una ricerca di simboli globale nei risultati dei file per Quick Open.",
- 	"search.followSymlinks": "Controlla se seguire i collegamenti simbolici durante la ricerca."
-changed in both
-  base   100644 8d2f14cd8ac379706b5e3a66745127129a9398d9 i18n/ita/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 92c227f579048a55e12147b807cef8b2e56a92a0 i18n/ita/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 a7900586404c23961a99f1e5d53f9df92dde1723 i18n/ita/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-@@ -15,7 +15,14 @@
- 	"nextReplaceTerm": "Mostra il termine di ricerca/sostituzione successivo",
- 	"previousReplaceTerm": "Mostra il termine di ricerca/sostituzione precedente",
- 	"findInFiles": "Cerca nei file",
-+	"findInFilesWithSelectedText": "Cerca nei file con il testo selezionato",
- 	"replaceInFiles": "Sostituisci nei file",
-+<<<<<<< .our
-+=======
-+	"replaceInFilesWithSelectedText": "Sostituisci nei file con il testo selezionato",
-+	"findInWorkspace": "Trova nell'area di lavoro...",
-+	"findInFolder": "Trova nella cartella...",
-+>>>>>>> .their
- 	"RefreshAction.label": "Aggiorna",
- 	"CollapseDeepestExpandedLevelAction.label": "Comprimi tutto",
- 	"ClearSearchResultsAction.label": "Cancella",
-changed in both
-  base   100644 60f801b0064329f75f32ee1d663897677f1e10d6 i18n/ita/src/vs/workbench/parts/search/browser/searchWidget.i18n.json
-  our    100644 308c6304f2a92b0a87d329d3baa153795e070176 i18n/ita/src/vs/workbench/parts/search/browser/searchWidget.i18n.json
-  their  100644 419cc9c23ee04174cf3e3b523e7c383fc81840a4 i18n/ita/src/vs/workbench/parts/search/browser/searchWidget.i18n.json
-changed in both
-  base   100644 afa0a10cc14ff191277774e4b45b13a2e1107a2d i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  our    100644 c878d5c9380cb8bf8f1d7f22ef4111b700bf8888 i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 d130ea84c16b708173b07dd8897cf004329160b5 i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-changed in both
-  base   100644 bdf08a4e790e4da8225d4dc89e56bb5942900f02 i18n/ita/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 96a5512e9db341ff02996bad4ad811078b347739 i18n/ita/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 9d3c3a8afbf2e24bad3e7db28db2bd3b7f6f0476 i18n/ita/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-@@ -28,6 +28,7 @@
- 	"JsonSchema.tasks.group.none": "Non assegna l'attività ad alcun gruppo",
- 	"JsonSchema.tasks.group": "Definisce il gruppo di esecuzione a cui appartiene questa attività. Supporta \"build\" per aggiungerlo al gruppo di compilazione e \"test\" per aggiungerlo al gruppo di test.",
- 	"JsonSchema.tasks.type": "Definisce se l'attività viene eseguita come un processo o come un comando all'interno di una shell.",
-+<<<<<<< .our
- 	"JsonSchema.commandArray": "Comando della shell da eseguire. Per unire gli elementi della matrice verrà usato un carattere di spazio",
- 	"JsonSchema.command.quotedString.value": "Valore effettivo del comando",
- 	"JsonSchema.tasks.quoting.escape": "Evita i caratteri utilizzando il carattere di escape della shell (per esempio ` sotto PowerShell e \\ sotto bash).",
-@@ -38,6 +39,8 @@
- 	"JsonSchema.args.quotedString.value": "Valore effettivo del comando",
- 	"JsonSchema.args.quotesString.quote": "Come il valore dell'argomento dovrebbe essere virgolettato",
- 	"JsonSchema.tasks.args": "Argomenti passati al comando quando viene richiamata questa attività.",
-+=======
-+>>>>>>> .their
- 	"JsonSchema.tasks.label": "Etichetta dell'attività per l'interfaccia utente ",
- 	"JsonSchema.version": "Numero di versione della configurazione",
- 	"JsonSchema.tasks.identifier": "Identificatore definito dall'utente per fare riferimento all'attività in launch.json o in una clausola dependsOn.",
-changed in both
-  base   100644 86527fb1ac6b2da25565415b866cfab400fb83af i18n/ita/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 83baac91404ff175b394c533850a93d01538ab38 i18n/ita/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 4f1a6c0fc9a0340062594d0401b1d963c7cc3ed7 i18n/ita/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-changed in both
-  base   100644 965f92ae5a17b38744b9eea10fa95285d26ba3fe i18n/ita/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 73635731361e3644a722328dacbcb86a39a295d3 i18n/ita/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 de0209be9b691a561ea3862033e8e17b0d8dcb01 i18n/ita/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/ita/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
-  our    100644 b3d7a1fd560cd2e57b3bc7619ddab81013411902 i18n/ita/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
-  their  100644 4f75b36a63647beffc3d762b01249e888faa7d81 i18n/ita/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"bubbleTitle": "Contiene elementi enfatizzati"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"bubbleTitle": "contiene elementi sottolineati"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 3b13087ceeab2d96d1d4a7ce2de906ff6dda0a47 i18n/ita/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-  our    100644 ca82bab7411bb1a811f84dd6fe0d9ec562d1b7fc i18n/ita/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-  their  100644 bf601f29845f6d673465085fbffe86108c55018c i18n/ita/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-@@ -9,9 +9,14 @@
- 	"schema.token.settings": "Colori e stili per il token.",
- 	"schema.token.foreground": "Colore primo piano per il token.",
- 	"schema.token.background.warning": "I colori di sfondo del token non sono supportati.",
-+<<<<<<< .our
- 	"schema.token.fontStyle": "Stile del carattere della regola: 'italic', 'bold' o 'underline' o una combinazione. Con una stringa vuota le impostazioni ereditate vengono annullate.",
- 	"schema.fontStyle.error": "Lo stile del carattere deve 'italic', 'bold' o 'underline' oppure una combinazione di tali impostazioni oppure la stringa vuota.",
- 	"schema.token.fontStyle.none": "Nessuno (cancella lo stile ereditato)",
-+=======
-+	"schema.token.fontStyle": "Stile del carattere della regola: uno o combinazione di 'italic', 'bold' e 'underline'",
-+	"schema.fontStyle.error": "Lo stile del carattere deve essere una combinazione di 'italic', 'bold' e 'underline'",
-+>>>>>>> .their
- 	"schema.properties.name": "Descrizione della regola.",
- 	"schema.properties.scope": "Selettore di ambito usato per la corrispondenza della regola.",
- 	"schema.tokenColors.path": "Percorso di un file tmTheme (relativo al file corrente).",
-changed in both
-  base   100644 20cd47a6ab6e801a01c32b60be5dc0137b419ed3 i18n/ita/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
-  our    100644 84a536773a0be565e71fcdffb892410e5f236188 i18n/ita/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
-  their  100644 c945f02ca44108670ae5d3be5faaa248aca8aad7 i18n/ita/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
-changed in both
-  base   100644 e176e6c6ec0a8deb608b18dc18040c909f71c7b5 i18n/jpn/extensions/git/package.i18n.json
-  our    100644 5f3a79c480024cb95bcb777b25dc5a51987c0ee1 i18n/jpn/extensions/git/package.i18n.json
-  their  100644 84c7a81f400e41af829229ea7ed5e3b79c355a33 i18n/jpn/extensions/git/package.i18n.json
-@@ -73,15 +73,22 @@
- 	"config.enableCommitSigning": "GPG によりデジタル署名されたコミットを有効にします。",
- 	"config.discardAllScope": "'すべての変更を破棄' コマンドによってどの変更が破棄されるかを制御します。'all' はすべての変更を破棄します。 'tracked' は追跡されているファイルだけを破棄します。 'prompt' は、アクションが実行されるたびにプロンプ​​ト ダイアログを表示します。",
- 	"config.decorations.enabled": "Git が配色とバッジをエクスプローラーと開いているエディターのビューに提供するかどうかを制御します。",
-+<<<<<<< .our
- 	"config.promptToSaveFilesBeforeCommit": "コミット前に Git が保存していないファイルを確認すべきかどうかを制御します。",
- 	"config.showInlineOpenFileAction": "Git 変更の表示内にインラインのファイルを開くアクションを表示するかどうかを制御します。",
- 	"config.inputValidation": "コミット メッセージの入力検証をいつ表示するかを制御します。",
- 	"config.detectSubmodules": "Git のサブモジュールを自動的に検出するかどうかを制御します。",
- 	"config.detectSubmodulesLimit": "Git サブモジュールの検出の制限を制御します。",
-+=======
-+>>>>>>> .their
- 	"colors.modified": "リソースを改変した場合の配色",
- 	"colors.deleted": "リソースを検出した場合の配色",
- 	"colors.untracked": "リソースを追跡しない場合の配色",
- 	"colors.ignored": "リソースを無視する場合の配色",
-+<<<<<<< .our
- 	"colors.conflict": "リソースが競合する場合の配色",
- 	"colors.submodule": "サブモジュールの配色。"
-+=======
-+	"colors.conflict": "リソースが競合する場合の配色"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6ef74ccbb61c972c51a3f6b6e93ad34dd70ec186 i18n/jpn/extensions/npm/package.i18n.json
-  our    100644 0ff30c62c2a3c39c26a5bdcdaa3a46a93a434f3e i18n/jpn/extensions/npm/package.i18n.json
-  their  100644 85eafe7697b35c6c968290da76107c675ac495a4 i18n/jpn/extensions/npm/package.i18n.json
-@@ -11,6 +11,7 @@
- 	"config.npm.autoDetect": "npm スクリプトの自動検出をオンにするかオフにするかを制御します。既定はオンです。",
- 	"config.npm.runSilent": "`--silent` オプションを使用して npm コマンドを実行する。",
- 	"config.npm.packageManager": "スクリプトを実行するために使用するパッケージ マネージャー。",
-+<<<<<<< .our
- 	"config.npm.exclude": "自動スクリプト検出から除外するフォルダーの glob パターンを構成します。",
- 	"config.npm.enableScriptExplorer": "npm スクリプトのエクスプ ローラー ビューを有効にします。",
- 	"config.npm.scriptExplorerAction": "スクリプトエクスプローラーで使用される規定のクリックアクション： 'open' または 'run' 、規定値は 'open' です。",
-@@ -23,4 +24,7 @@
- 	"command.debug": "デバッグ",
- 	"command.openScript": "Open",
- 	"command.runInstall": "インストールを実行"
-+=======
-+	"npm.parseError": "npmタスク検出: ファイル {0} の解析に失敗しました"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8ed97f01771321fb5a6f85d7a44e903f5b3c25b2 i18n/jpn/extensions/typescript/out/features/completionItemProvider.i18n.json
-  our    100644 adb307b9768c77753a1d0f351af9e7c9be210944 i18n/jpn/extensions/typescript/out/features/completionItemProvider.i18n.json
-  their  100644 98c4b9af245025b4871251125e66a24f2b00120c i18n/jpn/extensions/typescript/out/features/completionItemProvider.i18n.json
-changed in both
-  base   100644 7df7f3ceec8f48547ff45b53e170e5041986b669 i18n/jpn/src/vs/code/electron-main/windows.i18n.json
-  our    100644 f510ab911e2d4f9c5226e45799f0fea593c0177a i18n/jpn/src/vs/code/electron-main/windows.i18n.json
-  their  100644 abfc87dda206a3b33831d23742fa140ce5534745 i18n/jpn/src/vs/code/electron-main/windows.i18n.json
-changed in both
-  base   100644 a72d62e8dec1ad0b1f8553b4d2daf0780cf0bd8e i18n/jpn/src/vs/workbench/common/theme.i18n.json
-  our    100644 b14021a35078518051aec469e7adb4b85583e1c9 i18n/jpn/src/vs/workbench/common/theme.i18n.json
-  their  100644 a296fd913c1ec72a5656e12417b469fa276d0b4b i18n/jpn/src/vs/workbench/common/theme.i18n.json
-changed in both
-  base   100644 35db8c1bace86f29fd8f570edc63772a01b3872e i18n/jpn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 3b03f30557674ed7892d9127c78ab05070c860e0 i18n/jpn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 2601b15106307b77e2c7cc47c90eaeeb5de93ded i18n/jpn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,8 +35,15 @@
- 	"panelDefaultLocation": "パネルの既定の位置を制御します。ワークベンチの下部または右のいずれかに表示できます。",
- 	"statusBarVisibility": "ワークベンチの下部にステータス バーを表示するかどうかを制御します。",
- 	"activityBarVisibility": "ワークベンチでのアクティビティ バーの表示をコントロールします。",
-+<<<<<<< .our
- 	"viewVisibility": "ビュー ヘッダー アクションを表示するかどうかを制御します。ビュー ヘッダー アクションは常に表示されるか、パネルをフォーカスやホバーしたときのみ表示のいずれかです。",
- 	"fontAliasing": "ワークベンチのフォント エイリアシング方法を制御します。\n- default: サブピクセル方式でフォントを滑らかにします。ほとんどの非 Retina ディスプレイでもっとも鮮明なテキストを提供します\n- antialiased: サブピクセルとは対照的に、ピクセルのレベルでフォントを滑らかにします。フォント全体がより細く見えます\n- none: フォントのスムージングを無効にします。テキストをぎざぎざな尖ったエッジで表示します\n- auto: ディスプレイの DPI に基づいて自動的に `default` か `antialiased` を適用します",
-+=======
-+	"closeOnFileDelete": "ファイルを表示しているエディターを、ファイルが削除されるかその他のプロセスによって名前を変更された場合に、自動的に閉じるかどうかを制御します。これを無効にすると、このような場合にエディターはダーティで開かれたままになります。アプリケーション内で削除すると、必ずエディターは閉じられ、ダーティ ファイルは閉じられることがなく、データは保存されませんのでご注意ください。",
-+	"experimentalFuzzySearchEndpoint": "試験的な設定検索で使用するエンドポイントを指定します。",
-+	"experimentalFuzzySearchKey": "試験的な設定検索で使用するキーを指定します。",
-+	"fontAliasing": "ワークベンチのフォント エイリアシング方法を制御します。\n- default: サブピクセル方式でフォントを滑らかにします。ほとんどの非 Retina ディスプレイでもっとも鮮明なテキストを提供します\n- antialiased: サブピクセルとは対照的に、ピクセルのレベルでフォントを滑らかにします。フォント全体がより細く見えます\n- none: フォントのスムージングを無効にします。テキストをぎざぎざな尖ったエッジで表示します",
-+>>>>>>> .their
- 	"workbench.fontAliasing.default": "サブピクセル方式でフォントを滑らかにします。ほとんどの非 Retina ディスプレイでもっとも鮮明なテキストを提供します。",
- 	"workbench.fontAliasing.antialiased": "サブピクセルとは対照的に、ピクセルのレベルでフォントを滑らかにします。フォント全体がより細く見えるようになります。",
- 	"workbench.fontAliasing.none": "フォントのスムージングを無効にします。テキストをぎざぎざな尖ったエッジで表示します。",
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/jpn/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
-  our    100644 fb3e69967d2e1d3fe7228037080f0cd65bae28f4 i18n/jpn/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
-  their  100644 312dac3d40720ef58cc444de505874640a1f0d4d i18n/jpn/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"selectAndStartDebug": "選択してデバッグ構成を開始"
- }
-\ No newline at end of file
-changed in both
-  base   100644 c52fc9a42ea6fc0049d47b218970c11135ef3288 i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 94c8c8c8a16f500b0da2b646b5e8bf435bacba10 i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 e158385ba5c33f473b261adf7a54a5d87a3472cd i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -17,8 +17,12 @@
- 	"multipleConfigurationNamesInWorkspace": "ワークスペースに複数の起動構成 '{0}' があります。フォルダー名を使用して構成を修飾してください。",
- 	"noFolderWithName": "複合 '{2}' の構成 '{1}' で、名前 '{0}' を含むフォルダーが見つかりませんでした。",
- 	"configMissing": "構成 '{0}' が 'launch.json' 内にありません。",
-+<<<<<<< .our
- 	"launchJsonDoesNotExist": "'launch.json' は存在しません。",
- 	"debugRequestNotSupported": "選択しているデバッグ構成で '{0}' 属性はサポートされない値 '{1}' を指定しています。",
-+=======
-+	"debugRequestNotSupported": "選択しているデバッグ構成で `{0}` 属性はサポートされない値 '{1}' を指定しています。",
-+>>>>>>> .their
- 	"debugRequesMissing": "選択しているデバッグ構成に属性 '{0}' が含まれていません。",
- 	"debugTypeNotSupported": "構成されているデバッグの種類 '{0}' はサポートされていません。",
- 	"debugTypeMissing": "選択された起動構成のプロパティ 'type' がありません。",
-@@ -28,7 +32,13 @@
- 	"preLaunchTaskExitCode": "preLaunchTask '{0}' が終了コード {1} で終了しました。",
- 	"showErrors": "エラーの表示",
- 	"noFolderWorkspaceDebugError": "アクティブ ファイルをデバッグできません。ファイルがディスクに保存されており、そのファイル タイプのデバッグ拡張機能がインストールされていることを確認してください。",
-+<<<<<<< .our
- 	"cancel": "キャンセル",
- 	"DebugTaskNotFound": "タスク '{0}' を見つけられませんでした。",
- 	"taskNotTracked": "タスク '{0}' を追跡できません。"
-+=======
-+	"NewLaunchConfig": "アプリケーションの起動構成ファイルをセットアップしてください。{0}",
-+	"DebugTaskNotFound": "preLaunchTask '{0}' が見つかりませんでした。",
-+	"taskNotTracked": "preLaunchTask '{0}' を追跡できません。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c2fdd0e989aeea3a644e11c76372d51f5d08e76e i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 69dc63c434a809f92bc13d405e990c05feb2db91 i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 f9111aed1949986b9595d123cb0199d342e8397a i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-@@ -50,6 +50,10 @@
- 	"allExtensionsInstalled": "このワークスペースに推奨されているすべての拡張機能はすでにインストールされています",
- 	"installRecommendedExtension": "おすすめの拡張機能のインストール",
- 	"extensionInstalled": "推奨された拡張機能がすでにインストールされています",
-+<<<<<<< .our
-+=======
-+	"showRecommendedKeymapExtensions": "推奨のキーマップを表示する",
-+>>>>>>> .their
- 	"showRecommendedKeymapExtensionsShort": "キーマップ",
- 	"showLanguageExtensionsShort": "言語の拡張機能",
- 	"showAzureExtensionsShort": "Azure 拡張機能",
-changed in both
-  base   100644 685b5ccd1480952d82a92c1a21082762eff31dce i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json
-  our    100644 7caf6591a406976544c8acec966903cecfc8b335 i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json
-  their  100644 a7d393b5d64607fe8416ad6eebfb47184e07636d i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json
-changed in both
-  base   100644 5b07cd1e3efbcc160b02485b7c95ae0ce02d0cfd i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 c1d5e7d9f012953fc3bd6919da0d8a29b234fa8c i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 c381b702335077f34383b8d458cd753617e02c14 i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -12,6 +12,7 @@
- 	"exeBasedRecommendation": "{0} がインストールされているため、この拡張機能を推奨します。",
- 	"fileBasedRecommendation": "最近開いたファイルに基づいてこの拡張機能が推奨されます。",
- 	"workspaceRecommendation": "現在のワークスペースのユーザーによってこの拡張機能が推奨されています。",
-+	"exeBasedRecommendation": "{0} がインストールされているため、この拡張機能を推奨します。",
- 	"reallyRecommended2": "このファイルの種類には拡張機能 '{0}' が推奨されます。",
- 	"reallyRecommendedExtensionPack": "このファイルの種類には拡張機能パック '{0}' が推奨されます。",
- 	"install": "インストール",
-changed in both
-  base   100644 91392256939c17582ab96f7d0fd472e07da258c6 i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
-  our    100644 c11c8b6bc40319f94f160b3ece964354a75dce15 i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
-  their  100644 8942892c36afc7fde49cc8e9d695c834b3d56266 i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
-@@ -10,6 +10,10 @@
- 	"installVSIX": "VSIX からのインストール...",
- 	"installFromVSIX": "VSIX からインストール",
- 	"installButton": "インストール(&&I)",
-+<<<<<<< .our
- 	"InstallVSIXAction.success": "拡張機能が正常にインストールされました。有効にするには再読み込みしてください。",
-+=======
-+	"InstallVSIXAction.success": "拡張機能が正常にインストールされました。有効にするには再起動します。",
-+>>>>>>> .their
- 	"InstallVSIXAction.reloadNow": "今すぐ再度読み込む"
- }
-\ No newline at end of file
-changed in both
-  base   100644 301e0c4165664d55aa853730d69f79adb974150a i18n/jpn/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  our    100644 5a14440acb6649f2e07033eb12234eba79869087 i18n/jpn/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  their  100644 8fe9702db227e200ed98386c9fdf25370d286dee i18n/jpn/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-changed in both
-  base   100644 b9e95372194a8c53a764edff8baeb64d50f5af16 i18n/jpn/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
-  our    100644 cea0aca33034e7fd60cdd597505e2c5e782f8127 i18n/jpn/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
-  their  100644 7d61d0b13e652408d9e377665ee9aeac1e2c2dee i18n/jpn/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
-@@ -16,6 +16,10 @@
- 	"exclude.boolean": "ファイル パスの照合基準となる glob パターン。これを true または false に設定すると、パターンがそれぞれ有効/無効になります。",
- 	"exclude.when": "一致するファイルの兄弟をさらにチェックします。一致するファイル名の変数として $(basename) を使用します。",
- 	"useRipgrep": "テキストとファイル検索で ripgrep を使用するかどうかを制御します",
-+<<<<<<< .our
-+=======
-+	"useIgnoreFilesByDefault": "新しいワークスペースでテキストを検索するときに、既定で .gitignore ファイルと .ignore ファイルを使用するかどうかを制御します。",
-+>>>>>>> .their
- 	"useIgnoreFiles": "ファイルを検索するときに、.gitignore ファイルを使用するか .ignore ファイルを使用するかを制御します。",
- 	"search.quickOpen.includeSymbols": "グローバル シンボル検索の結果を、Quick Open の結果ファイルに含めるように構成します。",
- 	"search.followSymlinks": "検索中にシンボリック リンクを追跡するかどうかを制御します。"
-changed in both
-  base   100644 e06a40eed9bcaeaa3df4e5be7fb4a5a4fb4f987f i18n/jpn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 0c0e1ef6922bb2ebfdd24dd39aa82c38ab488084 i18n/jpn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 7f6464f3a56a55badeed1ed091ee326312263b3f i18n/jpn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-@@ -15,7 +15,14 @@
- 	"nextReplaceTerm": "次の検索置換語句を表示",
- 	"previousReplaceTerm": "前の検索置換語句を表示",
- 	"findInFiles": "フォルダーを指定して検索",
-+	"findInFilesWithSelectedText": "選択したテキストを含むファイルを検索",
- 	"replaceInFiles": "複数のファイルで置換",
-+<<<<<<< .our
-+=======
-+	"replaceInFilesWithSelectedText": "選択したテキストを含むファイルの置換",
-+	"findInWorkspace": "ワークスペース内を検索...",
-+	"findInFolder": "フォルダー内を検索...",
-+>>>>>>> .their
- 	"RefreshAction.label": "最新の情報に更新",
- 	"CollapseDeepestExpandedLevelAction.label": "すべて折りたたむ",
- 	"ClearSearchResultsAction.label": "クリア",
-changed in both
-  base   100644 c4dd7a6586f4f81133df6b2c83dd7669ce80475a i18n/jpn/src/vs/workbench/parts/search/browser/searchWidget.i18n.json
-  our    100644 bb69b79da47f57b3fb34bf0f2c285b9f88d16d88 i18n/jpn/src/vs/workbench/parts/search/browser/searchWidget.i18n.json
-  their  100644 d875a9b00ab4aa5d633da321b7cd99bf64c699c1 i18n/jpn/src/vs/workbench/parts/search/browser/searchWidget.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/jpn/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
-  our    100644 806121941c5b84f283a2bbc680a72ee3d2780bb1 i18n/jpn/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
-  their  100644 6891f80a335d65b1ef0d2e3f6362596d0ac683a8 i18n/jpn/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"bubbleTitle": "強調された項目を含む"
- }
-\ No newline at end of file
-changed in both
-  base   100644 1e7920f8a21ccf18f5e5d6f4836e6bf4f02a999c i18n/kor/extensions/git/out/commands.i18n.json
-  our    100644 5c881abd459fc945dcc1b911f43b518f709ac538 i18n/kor/extensions/git/out/commands.i18n.json
-  their  100644 bb03f6a56472e770e1e1058afd4d70a8850a6cfc i18n/kor/extensions/git/out/commands.i18n.json
-changed in both
-  base   100644 836154a75aa08d3ed9d5174974b148c18ddf530a i18n/kor/extensions/git/package.i18n.json
-  our    100644 3703ac48f99d1ed061418ae09d45c9f7e6e3d128 i18n/kor/extensions/git/package.i18n.json
-  their  100644 8499c4129035c305a10238cffee70cb5e2b4d213 i18n/kor/extensions/git/package.i18n.json
-@@ -73,15 +73,22 @@
- 	"config.enableCommitSigning": "GPG를 사용한 커밋 서명을 사용하도록 설정합니다.",
- 	"config.discardAllScope": "`모든 변경 내용 취소` 명령으로 취소되는 변경 내용을 제어합니다. `all`이면 모든 변경 내용을 취소합니다. `tracked`이면 추적된 파일만 취소합니다. `prompt`이면 작업을 실행할 때마다 프롬프트 대화 상자를 표시합니다.",
- 	"config.decorations.enabled": "Git에서 색과 배지를 탐색기와 열려 있는 편집기 뷰에 적용하는지 제어합니다.",
-+<<<<<<< .our
- 	"config.promptToSaveFilesBeforeCommit": "Git가 제출(commit)하기 전에 저장되지 않은 파일을 검사할지를 제어합니다. ",
- 	"config.showInlineOpenFileAction": "Git 변경점 보기에서 파일 열기 동작 줄을 표시할지의 여부를 제어합니다.",
- 	"config.inputValidation": "커밋 메시지 입력 유효성 검사를 언제 표시할지 제어합니다.",
- 	"config.detectSubmodules": "Git 하위 모듈을 자동으로 검색할지 여부를 제어합니다.",
- 	"config.detectSubmodulesLimit": "Git submodules 검출 개수의 제한을 제어합니다.",
-+=======
-+>>>>>>> .their
- 	"colors.modified": "수정된 리소스의 색상입니다.",
- 	"colors.deleted": "삭제된 리소스의 색상입니다.",
- 	"colors.untracked": "추적되지 않은 리소스의 색상입니다.",
- 	"colors.ignored": "무시된 리소스의 색상입니다.",
-+<<<<<<< .our
- 	"colors.conflict": "충돌이 발생한 리소스의 색상입니다.",
- 	"colors.submodule": "서브모듈 자원의 색상"
-+=======
-+	"colors.conflict": "충돌이 발생한 리소스의 색상입니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/extensions/npm/out/main.i18n.json
-  our    100644 c60d6694a0349575772e174fda06edfab1ac6987 i18n/kor/extensions/npm/out/main.i18n.json
-  their  100644 552c723f47e4810c78c57510af27db74da34c108 i18n/kor/extensions/npm/out/main.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"npm.parseError": "Npm 작업 검색: {0} 파일을 구문 분석하지 못했습니다. "
- }
-\ No newline at end of file
-changed in both
-  base   100644 04e51b003cad423ee7971f81d1a8a2963ea34482 i18n/kor/extensions/npm/package.i18n.json
-  our    100644 b762a88ac6b09e3d0033e37c5db538576d49fc4b i18n/kor/extensions/npm/package.i18n.json
-  their  100644 4a42ac2e0ffdea2d2f04a3735c2b9a9c84b0fb88 i18n/kor/extensions/npm/package.i18n.json
-@@ -11,6 +11,7 @@
- 	"config.npm.autoDetect": "npm 스크립트에 대한 자동 검색 여부를 설정합니다. 기본값은 [켜기]입니다.",
- 	"config.npm.runSilent": " `--silent` 옵션으로 npm 명령 실행.",
- 	"config.npm.packageManager": "스크립트를 실행하는 데 사용하는 패키지 관리자.",
-+<<<<<<< .our
- 	"config.npm.exclude": "자동 스크립트 검색에서 제외할 폴더에 대한 Glob 패턴을 구성합니다.",
- 	"config.npm.enableScriptExplorer": "npm 스크립트에 대한 탐색기 뷰를 사용하도록 설정합니다.",
- 	"config.npm.scriptExplorerAction": "스크립트 탐색기에서 사용되는 기본 클릭 동작으로 '열기' 또는 '실행'이며, 기본값은 '열기'입니다.",
-@@ -23,4 +24,7 @@
- 	"command.debug": "디버그",
- 	"command.openScript": "열기",
- 	"command.runInstall": "설치 실행"
-+=======
-+	"npm.parseError": "Npm 작업 검색: {0} 파일을 구문 분석하지 못했습니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d45e0216f550b6ff7cd9abb5e8a445f31970d8c1 i18n/kor/extensions/typescript/out/features/completionItemProvider.i18n.json
-  our    100644 65d840cf0b5ded0819d66343381b49074971bdd1 i18n/kor/extensions/typescript/out/features/completionItemProvider.i18n.json
-  their  100644 bfc413e861a86d28fab640c2117833cd4e4aceba i18n/kor/extensions/typescript/out/features/completionItemProvider.i18n.json
-changed in both
-  base   100644 7077f24ff6107643b56843676722cb0fc2ef3cd9 i18n/kor/extensions/typescript/package.i18n.json
-  our    100644 dd42af00286b776dba8496a69b6e677f0653dc9b i18n/kor/extensions/typescript/package.i18n.json
-  their  100644 8a1fd73f72ff75dc4c69ab8e2e6d8e39caa3697e i18n/kor/extensions/typescript/package.i18n.json
-@@ -55,7 +55,11 @@
- 	"typescript.quickSuggestionsForPaths": "가져오기 경로를 입력할 때 빠른 제안을 사용하거나 사용하지 않습니다.",
- 	"typescript.locale": "TypeScript 오류를 보고하는 데 사용하는 로캘을 설정합니다. TypeScript >= 2.6.0이 필요합니다. 기본값 'null'은 TypeScript 오류에 대해 VS Code의 로캘을 사용합니다.",
- 	"javascript.implicitProjectConfig.experimentalDecorators": "프로젝트의 일부가 아닌 JavaScript 파일에 대해 'experimentalDecorators'를 사용하거나 사용하지 않도록 설정합니다. 기존 jsconfig.json 또는 tsconfig.json 파일은 이 설정을 재정의합니다. TypeScript >=2.3.1이 필요합니다.",
-+<<<<<<< .our
- 	"typescript.autoImportSuggestions.enabled": "자동 가져오기 제안을 사용하거나 사용하지 않도록 설정합니다. TypeScript >=2.6.1이 필요합니다.",
- 	"typescript.experimental.syntaxFolding": "구문 인식 접기 마커를 설정하거나 해제합니다.",
- 	"taskDefinition.tsconfig.description": "TS 빌드를 정의하는 tsconfig 파일입니다."
-+=======
-+	"typescript.autoImportSuggestions.enabled": "자동 가져오기 제안을 사용하거나 사용하지 않도록 설정합니다. TypeScript >=2.6.1이 필요합니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 dc8b9079e3cd763f13a38ca8c9486d2dab36a641 i18n/kor/src/vs/code/electron-main/windows.i18n.json
-  our    100644 d5c6b9b1265e0ee69b9beb0907ae3e533810962d i18n/kor/src/vs/code/electron-main/windows.i18n.json
-  their  100644 b70845bc6818b8af89becb1c5b83c47e5e70cd28 i18n/kor/src/vs/code/electron-main/windows.i18n.json
-changed in both
-  base   100644 7bfa5cfc187614a44fa6a83f9d433aca2c95488f i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 c96c0fe1469ce78842b73db686d63d6305f28dfb i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 ca3b604fcad21f626bbf94b5252d9e3792e01c4d i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json
-changed in both
-  base   100644 8e8997c7ddf10975547769f3930055917d3d49f2 i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 44b01274f5b039d38e4cfbd58f3d0758fa5d1e89 i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 8f111cba06f865ee961ebf16a79910e37debbb04 i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -48,8 +48,11 @@
- 	"listDropBackground": "마우스로 항목을 이동할 때 목록/트리 끌어서 놓기 배경입니다.",
- 	"highlight": "목록/트리 내에서 검색할 때 일치 항목 강조 표시의 목록/트리 전경색입니다.",
- 	"invalidItemForeground": "잘못된 항목에 대한 목록/트리 전경 색(예: 탐색기의 확인할 수 없는 루트).",
-+<<<<<<< .our
- 	"listErrorForeground": "오류를 포함하는 목록 항목의 전경색입니다.",
- 	"listWarningForeground": "경고를 포함하는 목록 항목의 전경색입니다.",
-+=======
-+>>>>>>> .their
- 	"pickerGroupForeground": "그룹화 레이블에 대한 빠른 선택기 색입니다.",
- 	"pickerGroupBorder": "그룹화 테두리에 대한 빠른 선택기 색입니다.",
- 	"buttonForeground": "단추 기본 전경색입니다.",
-changed in both
-  base   100644 08bfa81a98eea9f252c192bf63fb07daec868827 i18n/kor/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 9f392ee6782a9cd3b3d60690870bfb3e051b1e8b i18n/kor/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 d99bcba35efbb21b5038a87126393fb6a3d9901f i18n/kor/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -9,11 +9,25 @@
- 	"openFile": "파일 열기...",
- 	"openFolder": "폴더 열기...",
- 	"openFileFolder": "열기...",
-+<<<<<<< .our
- 	"globalRemoveFolderFromWorkspace": "작업 영역에서 폴더 제거...",
-+=======
-+	"addFolderToWorkspace": "작업 영역에 폴더 추가...",
-+	"add": "추가(&&A)",
-+	"addFolderToWorkspaceTitle": "작업 영역에 폴더 추가",
-+	"globalRemoveFolderFromWorkspace": "작업 영역에서 폴더 제거...",
-+	"removeFolderFromWorkspace": "작업 영역에서 폴더 삭제",
-+	"openFolderSettings": "폴더 설정 열기",
-+>>>>>>> .their
- 	"saveWorkspaceAsAction": "작업 영역을 다른 이름으로 저장",
- 	"save": "저장(&&S)",
- 	"saveWorkspace": "작업 영역 저장",
- 	"openWorkspaceAction": "작업 영역 열기...",
- 	"openWorkspaceConfigFile": "작업 영역 구성 파일 열기",
-+<<<<<<< .our
- 	"duplicateWorkspaceInNewWindow": "새 창에 작업 영역 복제"
-+=======
-+	"openFolderAsWorkspaceInNewWindow": "새 창에서 작업 영역으로 폴더 열기",
-+	"workspaceFolderPickerPlaceholder": "작업 영역 폴더 선택"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 882b528591a9bf6ab99264b797be150bf5ea7fff i18n/kor/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
-  our    100644 875980e9b305a8741ba4d0ca2e19e7fef6be9c07 i18n/kor/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
-  their  100644 4691263e4869a356b179f7043739edffaa25c4fc i18n/kor/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
-changed in both
-  base   100644 a028fc067e5f1437f9081650660e68957589d883 i18n/kor/src/vs/workbench/browser/parts/panel/panelActions.i18n.json
-  our    100644 9d55e76b22262089e13e6b74af63f43fdb707643 i18n/kor/src/vs/workbench/browser/parts/panel/panelActions.i18n.json
-  their  100644 530fa330f8b9c800c8c4ff994f1f0cb615c8d2af i18n/kor/src/vs/workbench/browser/parts/panel/panelActions.i18n.json
-changed in both
-  base   100644 11018663022015cce9ec6be153a9bec93e839524 i18n/kor/src/vs/workbench/common/theme.i18n.json
-  our    100644 634f6ea85a754d26140eeb8ed57e39a6ab596db9 i18n/kor/src/vs/workbench/common/theme.i18n.json
-  their  100644 c43957e4bd8a3ec74d08ce0d2f31f76919e68cf6 i18n/kor/src/vs/workbench/common/theme.i18n.json
-changed in both
-  base   100644 22baa2ccddf6dafbdd8aa7d264bb44665a9ef2de i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 faff44b17686fcb835995d2bfd92efcfdcc183b1 i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 767f6d6d93c3e49c7503e3bb9e7befa831b44731 i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -23,20 +23,35 @@
- 	"showIcons": "열린 편집기를 아이콘과 함께 표시할지 여부를 제어합니다. 이를 위해서는 아이콘 테마도 사용하도록 설정해야 합니다.",
- 	"enablePreview": "열려 있는 편집기를 미리 보기로 표시할지 여부를 제어합니다. 미리 보기 편집기는 유지된 상태까지(예: 두 번 클릭 또는 편집을 통해) 다시 사용되며 기울임꼴 글꼴 스타일로 표시됩니다.",
- 	"enablePreviewFromQuickOpen": "Quick Open에서 연 편집기를 미리 보기로 표시할지 여부를 제어합니다. 미리 보기 편집기는 유지된 상태까지(예: 두 번 클릭 또는 편집을 통해) 다시 사용됩니다.",
-+<<<<<<< .our
- 	"closeOnFileDelete": "일부 다른 프로세스에서 파일을 삭제하거나 이름을 바꿀 때 파일을 표시하는 편집기를 자동으로 닫을지 여부를 제어합니다. 사용하지 않도록 설정하는 경우 이러한 이벤트가 발생하면 편집기가 더티 상태로 계속 열려 있습니다. 응용 프로그램 내에서 삭제하면 항상 편집기가 닫히고 데이터를 유지하기 위해 더티 파일은 닫히지 않습니다.",
- 	"editorOpenPositioning": "편집기가 열리는 위치를 제어합니다. 현재 활성 편집기의 왼쪽 또는 오른쪽에서 편집기를 열려면 '왼쪽' 또는 '오른쪽'을 선택합니다. 현재 활성 편집기와 독립적으로 편집기를 열려면 '처음' 또는 '마지막'을 선택합니다.",
- 	"revealIfOpen": "편집기를 여는 경우 보이는 그룹 중 하나에 표시할지 여부를 제어합니다. 사용하지 않도록 설정할 경우 편집기가 기본적으로 현재 활성 편집기 그룹에 열립니다. 사용하도록 설정할 경우 현재 활성 편집기 그룹에서 편집기가 다시 열리지 않고 이미 열린 편집기가 표시됩니다. 강제로 편집기가 특정 그룹에서 열리거나 현재 활성 그룹 옆에 열리도록 하는 등의 일부 경우에는 이 설정이 무시됩니다.",
- 	"swipeToNavigate": "세 손가락으로 가로로 살짝 밀어 열려 있는 파일 간을 이동합니다.",
-+=======
-+	"editorOpenPositioning": "편집기가 열리는 위치를 제어합니다. 현재 활성 편집기의 왼쪽 또는 오른쪽에서 편집기를 열려면 '왼쪽' 또는 '오른쪽'을 선택합니다. 현재 활성 편집기와 독립적으로 편집기를 열려면 '처음' 또는 '마지막'을 선택합니다.",
-+	"revealIfOpen": "편집기를 여는 경우 보이는 그룹 중 하나에 표시할지 여부를 제어합니다. 사용하지 않도록 설정할 경우 편집기가 기본적으로 현재 활성 편집기 그룹에 열립니다. 사용하도록 설정할 경우 현재 활성 편집기 그룹에서 편집기가 다시 열리지 않고 이미 열린 편집기가 표시됩니다. 강제로 편집기가 특정 그룹에서 열리거나 현재 활성 그룹 옆에 열리도록 하는 등의 일부 경우에는 이 설정이 무시됩니다.",
-+>>>>>>> .their
- 	"commandHistory": "명령 팔레트 기록을 유지하기 위해 최근 사용한 명령 개수를 제어합니다. 0으로 설정하면 명령 기록을 사용하지 않습니다.",
- 	"preserveInput": "다음에 열 때 마지막으로 명령 팔레트에 입력한 내용을 복원할지 결정합니다.",
- 	"closeOnFocusLost": "Quick Open가 포커스를 잃으면 자동으로 닫을지 여부를 제어합니다.",
- 	"openDefaultSettings": "설정을 열면 모든 기본 설정을 표시하는 편집기도 열리는지 여부를 제어합니다.",
- 	"sideBarLocation": "사이드바의 위치를 제어합니다. 워크벤치의 왼쪽이나 오른쪽에 표시될 수 있습니다.",
-+<<<<<<< .our
- 	"panelDefaultLocation": "패널의 기본 위치를 제어합니다. 워크벤치의 아래 또는 오른쪽에 표시될 수 있습니다.",
- 	"statusBarVisibility": "워크벤치 아래쪽에서 상태 표시줄의 표시 유형을 제어합니다.",
- 	"activityBarVisibility": "워크벤치에서 작업 막대의 표시 유형을 제어합니다.",
- 	"viewVisibility": "보기 머리글 작업의 표시 여부를 제어합니다. 보기 머리글 작업은 항상 표시할 수도 있고 보기에 포커스가 있거나 보기를 마우스로 가리킬 때만 표시할 수도 있습니다.",
- 	"fontAliasing": "워크벤치에서 글꼴 앨리어싱 방식을 제어합니다.\n- 기본: 서브 픽셀 글꼴 다듬기. 대부분의 일반 디스플레이에서 가장 선명한 글꼴 제공\n- 안티앨리어싱: 서브 픽셀이 아닌 픽셀 단위에서 글꼴 다듬기. 전반적으로 더 밝은 느낌을 줄 수 있음\n- 없음: 글꼴 다듬기 사용 안 함. 텍스트 모서리가 각지게 표시됨\n- 자동: 디스플레이의 DPI에 따라 `기본` 또는 `안티앨리어싱`을 자동으로 적용합니다.",
-+=======
-+	"panelLocation": "패널의 위치를 제어합니다. 워크벤치의 아래 또는 오른쪽에 표시될 수 있습니다.",
-+	"statusBarVisibility": "워크벤치 아래쪽에서 상태 표시줄의 표시 유형을 제어합니다.",
-+	"activityBarVisibility": "워크벤치에서 작업 막대의 표시 유형을 제어합니다.",
-+	"closeOnFileDelete": "일부 다른 프로세스에서 파일을 삭제하거나 이름을 바꿀 때 파일을 표시하는 편집기를 자동으로 닫을지 여부를 제어합니다. 사용하지 않도록 설정하는 경우 이러한 이벤트가 발생하면 편집기가 더티 상태로 계속 열려 있습니다. 응용 프로그램 내에서 삭제하면 항상 편집기가 닫히고 데이터를 유지하기 위해 더티 파일은 닫히지 않습니다.",
-+	"experimentalFuzzySearchEndpoint": "실험 설정 검색에 사용할 끝점을 나타냅니다.",
-+	"experimentalFuzzySearchKey": "실험 설정 검색에 사용할 키를 나타냅니다.",
-+	"fontAliasing": "워크벤치에서 글꼴 앨리어싱 방식을 제어합니다.\n- 기본: 서브 픽셀 글꼴 다듬기. 대부분의 일반 디스플레이에서 가장 선명한 글꼴 제공\n- 안티앨리어싱: 서브 픽셀이 아닌 픽셀 단위에서 글꼴 다듬기. 전반적으로 더 밝은 느낌을 줄 수 있음\n- 없음: 글꼴 다듬기 사용 안 함. 텍스트 모서리가 각지게 표시됨",
-+>>>>>>> .their
- 	"workbench.fontAliasing.default": "서브 픽셀 글꼴 다듬기. 대부분의 일반 디스플레이에서 가장 선명한 텍스트를 제공합니다. ",
- 	"workbench.fontAliasing.antialiased": "서브 픽셀이 아닌 픽셀 수준에서 글꼴을 다듬습니다. 전반적으로 글꼴이 더 밝게 표시됩니다.",
- 	"workbench.fontAliasing.none": "글꼴 다듬기를 사용하지 않습니다. 텍스트 가장자리가 각지게 표시됩니다.",
-@@ -63,7 +78,11 @@
- 	"restoreWindows": "다시 시작한 이후에 창을 다시 여는 방법을 설정합니다. 'none'을 선택하면 항상 빈 작업 영역으로 시작하고 'one'을 선택하면 마지막으로 작업한 창이 다시 열리고 'folders'를 선택하면 열었던 폴더가 포함된 모든 창이 다시 열리며 'all'을 선택하면 지난 세션의 모든 창이 다시 열립니다.",
- 	"restoreFullscreen": "창이 전체 화면 모드에서 종료된 경우 창을 전체 화면 모드로 복원할지 여부를 제어합니다.",
- 	"zoomLevel": "창의 확대/축소 수준을 조정합니다. 원래 크기는 0이고 각 상한 증분(예: 1) 또는 하한 증분(예: -1)은 20% 더 크거나 더 작게 확대/축소하는 것을 나타냅니다. 10진수를 입력하여 확대/축소 수준을 세부적으로 조정할 수도 있습니다.",
-+<<<<<<< .our
- 	"title": "활성 편집기를 기반으로 창 제목을 제어합니다. 변수는 컨텍스트를 기준으로 대체됩니다.\n${activeEditorShort}: 파일 이름(예: myFile.txt)\n${activeEditorMedium}: 작업 영역 폴더를 기준으로 하는 파일에 대한 상대 경로(예: myFolder/myFile.txt)\n${activeEditorLong}: 파일의 전체 경로(예: /Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: 파일이 포함된 작업 영역 폴더의 이름(예: myFolder)\n${folderPath}: 파일이 포함된 작업 영역 폴더의 파일 경로(예: /Users/Development/myFolder)\n${rootName}: 작업 영역의 이름(예: myFolder or myWorkspace)\n${rootPath}: 작업 영역의 파일 경로(예: /Users/Development/myWorkspace)\n${appName}: 예: VS Code\n${dirty}: 활성 편집기가 더티인 경우 더티 표시기\n${separator}: 값 또는 정적 텍스트가 있는 변수로 둘러싸인 경우에만 표시되는 조건부 구분 기호(\" - \")",
-+=======
-+	"title": "활성 편집기를 기반으로 창 제목을 제어합니다. 변수는 컨텍스트를 기반으로 대체됩니다.\n${activeEditorShort}: 파일 이름(예: myFile.txt)\n${activeEditorMedium}: 작업 영역 폴더에 상대적인 파일 경로(예: myFolder/myFile.txt)\n${activeEditorLong}: 파일 전체 경로(예: /Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: 파일이 포함된 작업 영역 폴더 이름(예: myFolder)\n${folderPath}: 파일이 포함된 작업 영역 폴더의 파일 경로(예: /Users/Development/myFolder)\n${rootName}: 작업 영역 이름(예: myFolder 또는 myWorkspace)\n${rootPath}: 작업 영역 파일 경로(예: /Users/Development/myWorkspace)\n${appName}: 예: VS Code\n${dirty}: 활성 편집기가 더티인 경우 더티 표시기\n${separator}: 값이 있는 변수로 둘러싸인 경우에만 표시되는 조건부 구분 기호(\" - \")",
-+>>>>>>> .their
- 	"window.newWindowDimensions.default": "화면 가운데에서 새 창을 엽니다.",
- 	"window.newWindowDimensions.inherit": "마지막 활성 창과 동일한 크기로 새 창을 엽니다.",
- 	"window.newWindowDimensions.maximized": "최대화된 새 창을 엽니다.",
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
-  our    100644 a4d28ad02529ed3c5dffcc45760a2becebb7204d i18n/kor/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
-  their  100644 cc0d763e267b86ab4cd0fdcbbfa69ceb337cf286 i18n/kor/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"selectAndStartDebug": "디버그 구성 선택 및 시작"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json
-  our    100644 280e7417d1087038ca4a62440f977e4120bb4396 i18n/kor/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json
-  their  100644 0b59989a2925b3e507eb753f68a7a28fa2b94920 i18n/kor/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,6 +8,14 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"startAdditionalSession": "추가 세션 시작",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"debugFocusVariablesView": "포커스 변수",
- 	"debugFocusWatchView": "포커스 조사식",
- 	"debugFocusCallStackView": "포커스 호출 스택",
-changed in both
-  base   100644 4cb60411f72221018911d22154e635bc91016afb i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 f0485e490c5dc7158ba60cc766e0b791027e8972 i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 345e2691e987bcc3314163c54b6afb4ac1576e51 i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -17,8 +17,12 @@
- 	"multipleConfigurationNamesInWorkspace": "작업 영역에 시작 구성 '{0}'이(가) 여러 개 있습니다. 폴더 이름을 사용하여 구성을 한정하세요.",
- 	"noFolderWithName": "복합형 '{2}'의 구성 '{1}'에 대해 이름이 '{0}'인 폴더를 찾을 수 없습니다.",
- 	"configMissing": "'{0}' 구성이 'launch.json'에 없습니다.",
-+<<<<<<< .our
- 	"launchJsonDoesNotExist": "'launch.json'이 없습니다.",
- 	"debugRequestNotSupported": "'{0}' 특성에는 선택한 디버그 구성에서 지원되지 않는 값 '{1}'이(가) 있습니다.",
-+=======
-+	"debugRequestNotSupported": "선택한 디버그 구성에서 특성 '{0}'에 지원되지 않는 값 '{1}'이(가) 있습니다.",
-+>>>>>>> .their
- 	"debugRequesMissing": "선택한 디버그 구성에 특성 '{0}'이(가) 없습니다.",
- 	"debugTypeNotSupported": "구성된 디버그 형식 '{0}'은(는) 지원되지 않습니다.",
- 	"debugTypeMissing": "선택한 시작 구성에 대한 'type' 속성이 없습니다.",
-@@ -28,7 +32,13 @@
- 	"preLaunchTaskExitCode": "preLaunchTask '{0}'이(가) {1} 종료 코드와 함께 종료되었습니다.",
- 	"showErrors": "오류 표시",
- 	"noFolderWorkspaceDebugError": "활성 파일은 디버그할 수 없습니다. 이 파일이 디스크에 저장되어 있고 해당 파일 형식에 대한 디버그 확장이 설치되어 있는지 확인하세요.",
-+<<<<<<< .our
- 	"cancel": "취소",
- 	"DebugTaskNotFound": "작업 '{0}' 을(를) 찾을 수 없습니다.",
- 	"taskNotTracked": "작업 '{0}' 을(를) 추적할 수 없습니다."
-+=======
-+	"NewLaunchConfig": "응용 프로그램에 사용할 구성 시작 파일을 설정하세요. {0}",
-+	"DebugTaskNotFound": "preLaunchTask '{0}'을(를) 찾을 수 없습니다.",
-+	"taskNotTracked": "PreLaunchTask '{0}'을(를) 추적할 수 없습니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 1da0363bd932d2490cbb4f10eeb57f7007d09131 i18n/kor/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json
-  our    100644 458c1b8a6ff302a2f9690f1fb6aecabf4dc49262 i18n/kor/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json
-  their  100644 80b0d2b3101f352bb06665947f72ed97422de3b2 i18n/kor/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json
-changed in both
-  base   100644 69ea1b57782760c0e46997d5c00c60735c191eb5 i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 3b79008f444d2989f35d429d32801582bb6d419c i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 0a9211f6a1296bc2ea83bcb12d9d0afe353f4c82 i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-@@ -50,6 +50,10 @@
- 	"allExtensionsInstalled": "이 작업 영역에 권장되는 확장이 모두 이미 설치되었습니다.",
- 	"installRecommendedExtension": "권장되는 확장 설치",
- 	"extensionInstalled": "권장되는 확장이 이미 설치되어 있습니다.",
-+<<<<<<< .our
-+=======
-+	"showRecommendedKeymapExtensions": "권장되는 키 맵 표시",
-+>>>>>>> .their
- 	"showRecommendedKeymapExtensionsShort": "키 맵",
- 	"showLanguageExtensionsShort": "언어 확장",
- 	"showAzureExtensionsShort": "Azure 확장",
-changed in both
-  base   100644 6a7c05a5019aea0fe39ef08ce6b73d71f9d1df10 i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json
-  our    100644 46f4e3c4fab2f149d98f817bbd9120417358d155 i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json
-  their  100644 7003b25314eb95cae7fa56edc57e495ded0e3442 i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json
-changed in both
-  base   100644 758c995665c959dac14dd48a8297f03eef277874 i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 7d98f29daa7e57a06988b8e2e9d76dd40150f638 i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 3b5fdb0caacd5c75cac18cf6e05cd98d9a1a6f58 i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,11 @@
- 	"exeBasedRecommendation": "{0}이(가) 설치되어 있으므로 이 확장을 권장합니다.",
- 	"fileBasedRecommendation": "최근에 연 파일을 기반으로 확장이 권장됩니다.",
- 	"workspaceRecommendation": "이 확장은 현재 작업 영역 사용자가 권장합니다.",
-+=======
-+	"fileBasedRecommendation": "최근에 연 파일을 기반으로 확장이 권장됩니다.",
-+	"workspaceRecommendation": "이 확장은 현재 작업 영역 사용자가 권장합니다.",
-+	"exeBasedRecommendation": "{0}이(가) 설치되어 있으므로 이 확장을 권장합니다.",
-+>>>>>>> .their
- 	"reallyRecommended2": "이 파일 형식에 대해 '{0}' 확장이 권장됩니다.",
- 	"reallyRecommendedExtensionPack": "이 파일 형식에 대해 '{0}' 확장 팩이 권장됩니다.",
- 	"install": "설치",
-changed in both
-  base   100644 7037b501b40ee8c0bac0116215acc2c27daf92c2 i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
-  our    100644 856397662efff2638dd54d4baa970dfd73a5c63a i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
-  their  100644 eecb0d0e89b448b4ed2f1317c5f945070bd4f4a9 i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
-@@ -10,5 +10,9 @@
- 	"installVSIX": "VSIX에서 설치...",
- 	"installFromVSIX": "VSIX에서 설치",
- 	"installButton": "설치(&&I)",
-+<<<<<<< .our
-+=======
-+	"InstallVSIXAction.success": "확장이 설치되었습니다. 사용하도록 설정하려면 다시 시작하세요.",
-+>>>>>>> .their
- 	"InstallVSIXAction.reloadNow": "지금 다시 로드"
- }
-\ No newline at end of file
-changed in both
-  base   100644 0e0732d6018e5d9dc97b03facbd8bd2a858d3e62 i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  our    100644 018f63d5c0fb6f63e432765ed1c8c8d45eb5d87b i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  their  100644 119dd7c1b8881962626ac4f6e8429a2898ec6177 i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-@@ -12,9 +12,12 @@
- 	"recommendedExtensions": "권장",
- 	"otherRecommendedExtensions": "기타 권장 사항",
- 	"workspaceRecommendedExtensions": "작업 영역 권장 사항",
-+<<<<<<< .our
- 	"builtInExtensions": "기능",
- 	"builtInThemesExtensions": "테마",
- 	"builtInBasicsExtensions": "프로그래밍 언어",
-+=======
-+>>>>>>> .their
- 	"searchExtensions": "마켓플레이스에서 확장 검색",
- 	"sort by installs": "정렬 기준: 설치 수",
- 	"sort by rating": "정렬 기준: 등급",
-changed in both
-  base   100644 9a5ca02f3228120bec88da96fba68bb08816fa2b i18n/kor/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json
-  our    100644 2103b0440bb4b391c2dff3443d8778a180fb0423 i18n/kor/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json
-  their  100644 8c66b17877e66254e0c3e716a59605bb83fded16 i18n/kor/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"label": "문제",
- 	"tooltip.1": "이 파일의 문제 1개",
- 	"tooltip.N": "이 파일의 문제 {0}개",
-changed in both
-  base   100644 dbf17ab8df7ebe05a8c126c0f12d0020b18de2e1 i18n/kor/src/vs/workbench/parts/markers/common/messages.i18n.json
-  our    100644 96ac7a8193ddf876a2dd0c0ad04713fa5d3664fb i18n/kor/src/vs/workbench/parts/markers/common/messages.i18n.json
-  their  100644 08ea34ce594a6c65fb5a14bf014322e16fc8b12d i18n/kor/src/vs/workbench/parts/markers/common/messages.i18n.json
-@@ -7,8 +7,14 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"viewCategory": "보기",
-+<<<<<<< .our
- 	"problems.view.toggle.label": "문제 토글(오류, 경고, 정보)",
- 	"problems.view.focus.label": "포커스 문제(오류, 경고, 정보)",
-+=======
-+	"problems.view.toggle.label": "설정/해제 문제",
-+	"problems.view.show.label": "문제 표시",
-+	"problems.view.hide.label": "숨기기 문제",
-+>>>>>>> .their
- 	"problems.panel.configuration.title": "문제 보기",
- 	"problems.panel.configuration.autoreveal": "문제 보기를 열 때 문제 보기에 자동으로 파일이 표시되어야 하는지를 제어합니다.",
- 	"markers.panel.title.problems": "문제",
-changed in both
-  base   100644 0b93c67b9afd249da800e8c10629eb234e06917e i18n/kor/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json
-  our    100644 e999d986aef4abdc9a96bf3e18263d0b30c77bea i18n/kor/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json
-  their  100644 2ab565a78cd4b1b655d08a3395c6b5c2f2ecf507 i18n/kor/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"copyMarker": "복사",
- 	"copyMarkerMessage": "메시지 복사"
- }
-\ No newline at end of file
-changed in both
-  base   100644 3fc4a09490ff90d530870aee6040ec0a967e1ff0 i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-  our    100644 aecb53ab9b9ac6a3addd171d6c1d4943de0e0b02 i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-  their  100644 ff68e7246b743801752d642c1ff80ea87ff5cdfe i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-@@ -9,6 +9,7 @@
- 	"SearchSettingsWidget.AriaLabel": "설정 검색",
- 	"SearchSettingsWidget.Placeholder": "설정 검색",
- 	"noSettingsFound": "결과 없음",
-+<<<<<<< .our
- 	"oneSettingFound": "1개 설정 찾음",
- 	"settingsFound": "{0}개 설정 찾음",
- 	"totalSettingsMessage": "총 {0}개 설정",
-@@ -18,6 +19,12 @@
- 	"defaultUserSettings": "기본 사용자 설정",
- 	"defaultWorkspaceSettings": "기본 작업 영역 설정",
- 	"defaultFolderSettings": "기본 폴더 설정",
-+=======
-+	"oneSettingFound": "1개 설정 일치함",
-+	"settingsFound": "{0}개 설정 일치함",
-+	"fileEditorWithInputAriaLabel": "{0}. 텍스트 파일 편집기입니다.",
-+	"fileEditorAriaLabel": "텍스트 파일 편집기입니다.",
-+>>>>>>> .their
- 	"defaultEditorReadonly": "기본값을 재정의하려면 오른쪽 편집기를 편집하세요.",
- 	"preferencesAriaLabel": "기본 설정. 읽기 전용 텍스트 편집기입니다."
- }
-\ No newline at end of file
-changed in both
-  base   100644 81148e5b1a963cd79308efbe5c23cfe5783e7615 i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 952972db109181a066081ea0ee054ff4a0c809ad i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 7a02526e6faebff92381adfe311aa1c05e9d7e6c i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -13,5 +13,13 @@
- 	"newExtensionLabel": "\"{0}\" 확장 표시",
- 	"editTtile": "편집",
- 	"replaceDefaultValue": "설정에서 바꾸기",
-+<<<<<<< .our
- 	"copyDefaultValue": "설정에 복사"
-+=======
-+	"copyDefaultValue": "설정에 복사",
-+	"unsupportedPHPExecutablePathSetting": "이 설정은 사용자 설정이어야 합니다. 작업 영역에 대해 PHP를 구성하려면 PHP 파일을 열고 상태 표시줄에서 'PHP 경로'를 클릭합니다.",
-+	"unsupportedWorkspaceSetting": "이 설정은 사용자 설정이어야 합니다.",
-+	"unsupportedWorkbenchSetting": "이 설정은 지금 적용할 수 없으며 이 폴더를 직접 열 경우에 적용됩니다.",
-+	"unsupportedWorkbenchSettingDevMode": "현재 이 설정을 적용할 수 없습니다. 등록하는 동안 범위를 '리소스'로 정의하거나 이 폴더를 직접 여는 경우 적용됩니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 04033d7640034f28513226be2a669396f54fb9ef i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 a8bd67a28f391e840f7a35323a824c51031c0c11 i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 dad1ce0c9be29a7e24e9b9eff674af2144b0c6bd i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,4 +13,11 @@
- 	"userSettings": "사용자 설정",
- 	"workspaceSettings": "작업 영역 설정",
- 	"folderSettings": "폴더 설정"
-+=======
-+	"defaultSettingsFuzzyPrompt": "유사 항목 검색을 사용해보세요!",
-+	"defaultSettings": "설정을 오른쪽 편집기에 넣어서 덮어씁니다.",
-+	"noSettingsFound": "설정을 찾을 수 없습니다.",
-+	"folderSettingsDetails": "폴더 설정",
-+	"enableFuzzySearch": "실험 유사 항목 검색 사용"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 90960b4f14df0be59da277d2ef17c628c8281345 i18n/kor/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  our    100644 9d01c25ee379b65a93a0db2fa71c9ac23d6dc2ba i18n/kor/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  their  100644 de4c67a1e309bee8918b8b47fe850519106e3a5f i18n/kor/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-@@ -7,5 +7,6 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"commonlyUsed": "일반적으로 사용되는 설정",
-+	"mostRelevant": "가장 관련 있는 항목",
- 	"defaultKeybindingsHeader": "키 바인딩을 키 바인딩 파일에 배치하여 덮어씁니다."
- }
-\ No newline at end of file
-changed in both
-  base   100644 cb13e895bebfd0dfa15d6daab7a531ecbef00d69 i18n/kor/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  our    100644 112bca1e01f4036334cbaa730dc5d8a1af52991c i18n/kor/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  their  100644 1d56872cb1dfe4330d74f880aacfa52df11226bc i18n/kor/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-changed in both
-  base   100644 06048cc7a3cdeac94390d7c24009f6f1d067742c i18n/kor/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-  our    100644 52b3cb24c35ab91ce4ff10ea66e61a3c2acf2767 i18n/kor/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-  their  100644 0caa41f634a7ad7424084306e96f96f772790716 i18n/kor/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,12 +7,17 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"changes": "변경 내용 {0}/{1}개",
- 	"change": "변경 내용 {0}/{1}개",
- 	"show previous change": "이전 변경 내용 표시",
- 	"show next change": "다음 변경 내용 표시",
-+<<<<<<< .our
- 	"move to previous change": "이전 변경 내용으로 이동",
- 	"move to next change": "다음 변경 내용으로 이동",
-+=======
-+>>>>>>> .their
- 	"editorGutterModifiedBackground": "수정된 줄의 편집기 여백 배경색입니다.",
- 	"editorGutterAddedBackground": "추가된 줄의 편집기 여백 배경색입니다.",
- 	"editorGutterDeletedBackground": "삭제된 줄의 편집기 여백 배경색입니다.",
-changed in both
-  base   100644 dc970ca0af240de932c807a5e9613c886e5d7ce5 i18n/kor/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
-  our    100644 9b239f6fd5f9008bb0b725a14f7d3a6db63c34a2 i18n/kor/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
-  their  100644 2d787a2e21c96c25ac693875b7ef5eda7b07c2a1 i18n/kor/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
-@@ -16,6 +16,10 @@
- 	"exclude.boolean": "파일 경로를 일치시킬 GLOB 패턴입니다. 패턴을 사용하거나 사용하지 않도록 설정하려면 true 또는 false로 설정하세요.",
- 	"exclude.when": "일치하는 파일의 형제에 대한 추가 검사입니다. $(basename)을 일치하는 파일 이름에 대한 변수로 사용하세요.",
- 	"useRipgrep": "텍스트 및 파일 검색에서 ripgrep 사용 여부를 제어합니다.",
-+<<<<<<< .our
-+=======
-+	"useIgnoreFilesByDefault": "새 작업 영역에서 검색할 때 기본적으로 .gitignore 파일 및 .ignore 파일을 사용할지 여부를 제어합니다.",
-+>>>>>>> .their
- 	"useIgnoreFiles": "파일을 검색할 때 .gitignore 파일 및 .ignore 파일을 사용할지 여부를 제어합니다.",
- 	"search.quickOpen.includeSymbols": "Quick Open에 대한 파일 결과에 전역 기호 검색 결과를 포함하도록 구성합니다.",
- 	"search.followSymlinks": "검색하는 동안 symlink를 누를지 여부를 제어합니다."
-changed in both
-  base   100644 787ec35e8aa4b2494e27ae99a0fec76b6a83c32c i18n/kor/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 071d294ccc8fe4437d151c87e9b3a4d19cd1a8d5 i18n/kor/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 2feb55cb593c9409203614328f0f15d84cf320fc i18n/kor/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-@@ -15,7 +15,14 @@
- 	"nextReplaceTerm": "다음 검색 대체어 표시",
- 	"previousReplaceTerm": "이전 검색 대체어 표시",
- 	"findInFiles": "파일에서 찾기",
-+	"findInFilesWithSelectedText": "선택한 텍스트가 있는 파일에서 찾기",
- 	"replaceInFiles": "파일에서 바꾸기",
-+<<<<<<< .our
-+=======
-+	"replaceInFilesWithSelectedText": "선택한 텍스트가 있는 파일에서 바꾸기",
-+	"findInWorkspace": "작업 영역에서 찾기...",
-+	"findInFolder": "폴더에서 찾기...",
-+>>>>>>> .their
- 	"RefreshAction.label": "새로 고침",
- 	"CollapseDeepestExpandedLevelAction.label": "모두 축소",
- 	"ClearSearchResultsAction.label": "지우기",
-changed in both
-  base   100644 8e0cddeec52d5231b32bb467a008809cedd04f64 i18n/kor/src/vs/workbench/parts/search/browser/searchWidget.i18n.json
-  our    100644 5fb23573a4f3832442ae22a737a31e471fe40b45 i18n/kor/src/vs/workbench/parts/search/browser/searchWidget.i18n.json
-  their  100644 8debcb76353b27e833b972dc15ae72f39b8cb5c5 i18n/kor/src/vs/workbench/parts/search/browser/searchWidget.i18n.json
-changed in both
-  base   100644 0c5d65d2c8db7a6d5f736fc2deed2211e99ccce0 i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  our    100644 4bb4deec5c3699ac48cd50b00a644c268e111a10 i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 c423047529b1d2dae016299bae1ec0ca95c817e6 i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-changed in both
-  base   100644 514b9724ac82d6ef70771451c4c8bbf2f8a7d8c8 i18n/kor/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 5dfbb2074f09c64c5ec03adc7d012b25c2bb9e72 i18n/kor/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 462567c24880bba5bd3145ccdf184aede4b6dc9d i18n/kor/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-@@ -28,6 +28,7 @@
- 	"JsonSchema.tasks.group.none": "작업을 그룹에 할당 안 함",
- 	"JsonSchema.tasks.group": "이 작업을 할당할 실행 그룹을 정의합니다. 빌드 그룹에 추가를 위한 \"build'와 테스트 그룹에 추가를 위한 \"test\"를 지원합니다.",
- 	"JsonSchema.tasks.type": "작업이 프로세스로 실행되는지 또는 셸 내의 명령으로 실행되는지를 제어합니다.",
-+<<<<<<< .our
- 	"JsonSchema.commandArray": "실행할 셸 명령입니다. 배열 항목은 공백 문자를 사용하여 연결됩니다.",
- 	"JsonSchema.command.quotedString.value": "실제 명령 값",
- 	"JsonSchema.tasks.quoting.escape": "셸의 이스케이프 문자를 사용하여 문자를 이스케이프합니다(예: ` under PowerShell 및 \\ under bash).",
-@@ -38,6 +39,8 @@
- 	"JsonSchema.args.quotedString.value": "실제 인수 값",
- 	"JsonSchema.args.quotesString.quote": "인수 값을 따옴표로 묶을 방법입니다.",
- 	"JsonSchema.tasks.args": "이 작업이 호출될 때 명령에 전달되는 인수입니다.",
-+=======
-+>>>>>>> .their
- 	"JsonSchema.tasks.label": "작업 사용자 인터페이스 레이블",
- 	"JsonSchema.version": "구성의 버전 번호입니다.",
- 	"JsonSchema.tasks.identifier": "작업을 launch.json 또는 dependsOn 구문에서 참조할 사용자 정의 식별자입니다.",
-changed in both
-  base   100644 f423d7950f1fa1c6ab6696dad4f5e505c85ebd89 i18n/kor/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 7b483f685d0f32a5b2eb20f1327a18475e2d29ae i18n/kor/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 56b330a8ddb3fb1dce08969063510556034ce6cb i18n/kor/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -17,7 +17,10 @@
- 	"runningTasks": "실행 중인 작업 표시",
- 	"tasks": "작업",
- 	"TaskSystem.noHotSwap": "실행 중인 활성 작업이 있는 작업 실행 엔진을 변경하면 Window를 다시 로드해야 합니다.",
-+<<<<<<< .our
- 	"reloadWindow": "창 다시 로드",
-+=======
-+>>>>>>> .their
- 	"TaskServer.folderIgnored": "작업 버전 0.1.0을 사용하므로 {0} 폴더가 무시됩니다.",
- 	"TaskService.noBuildTask1": "정의된 빌드 작업이 없습니다. tasks.json 파일에서 작업을 'isBuildCommand'로 표시하세요.",
- 	"TaskService.noBuildTask2": "정의된 빌드 작업이 없습니다. tasks.json 파일에서 작업을 'build'로 표시하세요.",
-changed in both
-  base   100644 3a48f647ff27e57eaf4964c9757cb13ffbb3cae5 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 bc58bba26a36ca2c7cacec97bfa2f02daab82775 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 1b4f36cd6712864cdc96623018412f3d2bf3420f i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -19,10 +19,15 @@
- 	"terminal.integrated.copyOnSelection": "설정된 경우, 터미널에서 선택된 텍스트가 클립보드로 복사됩니다.",
- 	"terminal.integrated.fontFamily": "터미널의 글꼴 패밀리를 제어하며, 기본값은 editor.fontFamily의 값입니다.",
- 	"terminal.integrated.fontSize": "터미널의 글꼴 크기(픽셀)를 제어합니다.",
-+<<<<<<< .our
- 	"terminal.integrated.letterSpacing": "터미널의 문자 간격을 제어하며, 문자  사이에 추가할 픽셀의 양을 나타내는 정수 값입니다.",
- 	"terminal.integrated.lineHeight": "터미널의 줄 높이를 제어합니다. 이 숫자에 터미널 글꼴 크기를 곱해 실제 줄 높이(픽셀)를 얻습니다.",
- 	"terminal.integrated.fontWeight": "터미널 내에서 굵은 글꼴이 아닌 텍스트에 사용할 글꼴 두께입니다.",
- 	"terminal.integrated.fontWeightBold": "터미널 내에서 굵은 글꼴 텍스트에 사용할 글꼴 두께입니다.",
-+=======
-+	"terminal.integrated.lineHeight": "터미널의 줄 높이를 제어하며, 이 숫자는 터미널 글꼴 크기를 곱하여 실제 줄 높이(픽셀)를 얻습니다.",
-+	"terminal.integrated.enableBold": "터미널 내에서 굵은 텍스트를 사용하도록 설정할지 여부이며, 터미널 셸의 지원이 필요합니다.",
-+>>>>>>> .their
- 	"terminal.integrated.cursorBlinking": "터미널 커서 깜박임 여부를 제어합니다.",
- 	"terminal.integrated.cursorStyle": "터미널 커서의 스타일을 제어합니다.",
- 	"terminal.integrated.scrollback": "터미널에서 버퍼에 유지하는 최대 줄 수를 제어합니다.",
-changed in both
-  base   100644 4fdc20a33c2c5cf14a82b8558647f59fa75b5684 i18n/kor/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-  our    100644 6cd63821229d7991380db65c8167125b14ca4e86 i18n/kor/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-  their  100644 c3734d9997df9478364ca9de4012980cba8a7e8c i18n/kor/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-@@ -23,7 +23,10 @@
- 	"workspaceConfig.name.description": "폴더에 대한 선택적 이름입니다.",
- 	"workspaceConfig.uri.description": "폴더 URI",
- 	"workspaceConfig.settings.description": "작업 영역 설정",
-+<<<<<<< .our
- 	"workspaceConfig.launch.description": "작업 영역 시작 구성",
-+=======
-+>>>>>>> .their
- 	"workspaceConfig.extensions.description": "작업 영역 확장",
- 	"unknownWorkspaceProperty": "알 수 없는 작업 영역 구성 속성"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8eb022003b18a31ed4e97efb72111cf8bfa96c14 i18n/kor/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 e81a8a242fb847453d5e2339de27eb2791e53868 i18n/kor/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 7b4d9af47055d18dfe8cfd52eb7a1fbf6bd978b6 i18n/kor/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
-  our    100644 5b8f343022ad10660aea8f42ade2ca43e07a7e4f i18n/kor/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
-  their  100644 ba22c381c7dca5164e0206c86164a8f00effc602 i18n/kor/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"bubbleTitle": "강조 표시한 항목 포함"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"bubbleTitle": "강조된 항목 포함"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 5195b5ea1f4e10c3d3831ed2739947850193ea08 i18n/kor/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-  our    100644 46df36fa33f9b35bce4f0b92ef13e545c22da310 i18n/kor/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-  their  100644 6c0f261188af4a6eaa6c16403fa17c7819a2518b i18n/kor/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-@@ -9,9 +9,14 @@
- 	"schema.token.settings": "토큰의 색 및 스타일입니다.",
- 	"schema.token.foreground": "토큰의 전경색입니다.",
- 	"schema.token.background.warning": "현재 토큰 배경색이 지원되지 않습니다.",
-+<<<<<<< .our
- 	"schema.token.fontStyle": "규칙의 글꼴 스타일로 '기울임꼴, '굵게' 및 '밑줄' 중 하나이거나 이들의 조합입니다. 빈 문자열을 지정하면 상속된 설정이 해제됩니다.",
- 	"schema.fontStyle.error": "글꼴 스타일은 '기울임꼴, '굵게' , '밑줄' 또는 이들의 조합이나 빈 문자열이어야 합니다.",
- 	"schema.token.fontStyle.none": "없음(상속된 스타일 지우기)",
-+=======
-+	"schema.token.fontStyle": "규칙의 글꼴 스타일: '기울임꼴, '굵게' 및 '밑줄' 중 하나 또는 이들의 조합",
-+	"schema.fontStyle.error": "글꼴 스타일은 '기울임꼴, '굵게' 및 '밑줄'의 조합이어야 합니다.",
-+>>>>>>> .their
- 	"schema.properties.name": "규칙에 대한 설명입니다.",
- 	"schema.properties.scope": "이 규칙과 일치하는 범위 선택기입니다.",
- 	"schema.tokenColors.path": "tmTheme 파일의 경로(현재 파일의 상대 경로)입니다.",
-changed in both
-  base   100644 9acab9d515dd0134c34e199f30ca5e1fd50a280c i18n/kor/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
-  our    100644 991bbd5c3eeea88c06b3096cf5fb24f1c83f98e9 i18n/kor/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
-  their  100644 964ce0502e732ffdf7a01283d9ee78f97b3642c3 i18n/kor/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
-changed in both
-  base   100644 05a0809b724c1bf90a0cf73596135e0696ba05c2 i18n/kor/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  our    100644 61519fa8e49ab82b98366279c3dfb35de603779e i18n/kor/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  their  100644 e836eb6be3f6f1b36ea5bc50a8ee77b81f58c92e i18n/kor/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -9,4 +10,14 @@
- 	"errorInvalidTaskConfiguration": "작업 영역 구성 파일에 쓸 수 없습니다. 파일을 열고 오류/경고를 수정한 다음 다시 시도하세요.",
- 	"errorWorkspaceConfigurationFileDirty": "파일이 변경되어 작업 영역 구성 파일에 쓸 수 없습니다. 저장하고 다시 시도하세요.",
- 	"openWorkspaceConfigurationFile": "작업 영역 구성 열기"
-+=======
-+	"errorInvalidTaskConfiguration": "작업 영역 구성 파일에 쓸 수 없습니다. 파일을 열고 오류/경고를 수정한 다음 다시 시도하세요.",
-+	"errorWorkspaceConfigurationFileDirty": "파일이 변경되어 작업 영역 구성 파일에 쓸 수 없습니다. 저장하고 다시 시도하세요.",
-+	"openWorkspaceConfigurationFile": "작업 영역 구성 파일 열기",
-+	"close": "닫기",
-+	"enterWorkspace.close": "닫기",
-+	"enterWorkspace.dontShowAgain": "다시 표시 안 함",
-+	"enterWorkspace.moreInfo": "추가 정보",
-+	"enterWorkspace.prompt": "VS Code에서 여러 개의 파일을 작업하는 방법에 대해 자세히 알아보세요."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8ca31f76ec11e35366a2e456737cd9b3e9e0d412 i18n/ptb/extensions/git/package.i18n.json
-  our    100644 6ab84324adbad521926986bc352591224f0e601f i18n/ptb/extensions/git/package.i18n.json
-  their  100644 99f6aa755f8fe5f9cda74fb970e125db8496ec95 i18n/ptb/extensions/git/package.i18n.json
-@@ -73,15 +73,22 @@
- 	"config.enableCommitSigning": "Habilitar Commit assinando com GPG.",
- 	"config.discardAllScope": "Controla as alterações que são descartadas pelo comando 'Descartar todas as alterações'. 'todos' descarta todas as alterações. 'rastreados' descarta somente arquivos rastreados. 'prompt' mostra uma caixa de diálogo de alerta cada vez que a ação é executada.",
- 	"config.decorations.enabled": "Controla se o Git contribui cores e emblemas para o explorer e visualizador de editores abertos.",
-+<<<<<<< .our
- 	"config.promptToSaveFilesBeforeCommit": "Controla se o Git deve verificar arquivos não salvos antes do Commit.",
- 	"config.showInlineOpenFileAction": "Controla se deve mostrar uma ação Abrir Arquivo em linha na visualização de alterações do Git.",
- 	"config.inputValidation": "Controla quando exibir validação do campo de mensagem do commit.",
- 	"config.detectSubmodules": "Controla se deve detectar automaticamente os sub-módulos do git.",
- 	"config.detectSubmodulesLimit": "Controla o limite de sub-módulos git detectados.",
-+=======
-+>>>>>>> .their
- 	"colors.modified": "Cor para recursos modificados.",
- 	"colors.deleted": "Cor para recursos excluídos.",
- 	"colors.untracked": "Cor para recursos não controlados.",
- 	"colors.ignored": "Cor para recursos ignorados.",
-+<<<<<<< .our
- 	"colors.conflict": "Cor para recursos com conflitos.",
- 	"colors.submodule": "Cor para recursos de sub-módulos."
-+=======
-+	"colors.conflict": "Cor para recursos com conflitos."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/ptb/extensions/npm/out/main.i18n.json
-  our    100644 187a3c1e1904b3154e6e84043e67241814e9e7dc i18n/ptb/extensions/npm/out/main.i18n.json
-  their  100644 e0f0d395640979d59e27cd0e43532a3cce15aab2 i18n/ptb/extensions/npm/out/main.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"npm.parseError": "Deteção de tarefa NPM: falha ao analisar o arquivo {0}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 c82810b5150bfa88d6082a972938eb67408e6937 i18n/ptb/extensions/npm/package.i18n.json
-  our    100644 8efb19208f1a49d6a7d774e93195885d875ea884 i18n/ptb/extensions/npm/package.i18n.json
-  their  100644 be4eed3240bc406bb05570836e0c799d9d51aa78 i18n/ptb/extensions/npm/package.i18n.json
-@@ -11,6 +11,7 @@
- 	"config.npm.autoDetect": "Controla se a deteção automática de scripts npm está ligado ou desligado. O padrão é ligado.",
- 	"config.npm.runSilent": "Executar comandos npm com a opção '--silent'.",
- 	"config.npm.packageManager": "O Gerenciador de pacotes usado para executar scripts.",
-+<<<<<<< .our
- 	"config.npm.exclude": "Configure padrões glob para pastas que devem ser excluídos da detecção automática de script.",
- 	"config.npm.enableScriptExplorer": "Ativar uma visualização do explorador para scripts npm.",
- 	"npm.parseError": "Deteção de tarefa NPM: falha ao analisar o arquivo {0}",
-@@ -20,4 +21,7 @@
- 	"command.run": "Executar",
- 	"command.debug": "Depurar",
- 	"command.openScript": "Abrir"
-+=======
-+	"npm.parseError": "Deteção de tarefa NPM: falha ao analisar o arquivo {0}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 58097d90545cceb60a28e3749029b31d3fff71a1 i18n/ptb/extensions/typescript/out/features/completionItemProvider.i18n.json
-  our    100644 07ef27a5bcf190056b77141606bb4fbfef68a177 i18n/ptb/extensions/typescript/out/features/completionItemProvider.i18n.json
-  their  100644 861ace441d3884a31bcd0c9b393fee54c51a1925 i18n/ptb/extensions/typescript/out/features/completionItemProvider.i18n.json
-changed in both
-  base   100644 6f602a84f321d08e92255434a4f8cfc95121b2a6 i18n/ptb/src/vs/workbench/common/theme.i18n.json
-  our    100644 431c9c090b931f212ddb987a19512fdc507d3bd6 i18n/ptb/src/vs/workbench/common/theme.i18n.json
-  their  100644 0ed9a7f544708c7e144aa2f65dd3da58d988aa2b i18n/ptb/src/vs/workbench/common/theme.i18n.json
-changed in both
-  base   100644 296a574f1ade2688dea43ca2a79237212f1b00f7 i18n/ptb/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 15dd21d37a31b843a88f5eb322486062a4b034bf i18n/ptb/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 797652bab4221f4290d9ca408f5a0a0558f62174 i18n/ptb/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,8 +35,15 @@
- 	"panelDefaultLocation": "Controla o local padrão do painel. Pode ser visualizado na parte inferior ou no lado direito da área de trabalho.",
- 	"statusBarVisibility": "Controla a visibilidade da barra de status na parte inferior da área de trabalho.",
- 	"activityBarVisibility": "Controla a visibilidade da barra de atividades na área de trabalho.",
-+<<<<<<< .our
- 	"viewVisibility": "Controla a visibilidade das ações do cabeçalho de exibição. Ações de cabeçalho de exibição podem ser sempre visíveis ou somente visíveis quando a exibição tiver o foco ou quando passar o mouse.",
- 	"fontAliasing": "Controla o método de aliasing da fonte na área de trabalho.\n- default: Suavização de fonte por Sub-pixel. Na maioria das telas não-retina, este fornecerá o texto mais nítido\n- antialiased: Suavização da fontes no nível do pixel, oposto ao subpixel. Pode fazer a fonte parecer mais fina/clara no geral.\n- none: Desabilita a suavização de fonte. O texto será mostrado com bordas pixeladas.\n- auto: Aplica `default` ou `antialiased` automaticamente baseado no DPI das telas.",
-+=======
-+	"closeOnFileDelete": "Controla se os editores que mostram um arquivo devem fechar automaticamente quanto o arquivo é apagado ou renomeado por algum outro processo. Desativar isso manterá o editor aberto como sujo neste evento. Note que apagar do aplicativo sempre fechará o editor e os arquivos sujos nunca fecharão para preservar seus dados.",
-+	"experimentalFuzzySearchEndpoint": "Indica o ponto de extremidade usar para a busca de definições experimental.",
-+	"experimentalFuzzySearchKey": "Indica a chave a ser usada para a busca experimental de configurações.",
-+	"fontAliasing": "Controla o método de identificação de fonte no espaço de trabalho.\n- padrão: Suavização de fonte subpixel. Na maioria dos monitores não-retina isto mostrará o texto mais nítido\n- antialiased: Suaviza a fonte no nível do pixel, em oposição a subpixel. Pode fazer a fonte aparecer mais clara de um modo geral \n- nenhum: Desabilita a suavização de fonte. Texto será mostrado com bordas irregulares",
-+>>>>>>> .their
- 	"workbench.fontAliasing.default": "Suavização de fonte subpixel. Na maioria dos monitores não-retina isto mostrará o texto mais nítido.",
- 	"workbench.fontAliasing.antialiased": "Suavizar a fonte no nível do pixel, em oposição a subpixel. Pode fazer com que a fonte apareça mais clara de uma forma geral.",
- 	"workbench.fontAliasing.none": "Desabilita a suavização de fonte. Texto será mostrado com bordas irregulares.",
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/ptb/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
-  our    100644 770870bd07fd270b42f112f916be37201bd51da8 i18n/ptb/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
-  their  100644 c7455f7e968cd07db812b2825f4b574e26a86737 i18n/ptb/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"selectAndStartDebug": "Selecionar e Iniciar a Configuração do Depurador"
- }
-\ No newline at end of file
-changed in both
-  base   100644 4904ae81309324d0528e7a757a1c70df8e8857f2 i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 7ae7f7f9b7576297c381fe538464cf315327a1cf i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 8232f470b3679a3730692d4b30dc9f0b8bf132da i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -28,7 +28,13 @@
- 	"preLaunchTaskExitCode": "A preLaunchTask '{0}' encerrada com código de saída {1}.",
- 	"showErrors": "Mostrar erros",
- 	"noFolderWorkspaceDebugError": "O arquivo ativo não pode ser depurado. Certifique-se de que ele está salvo no disco e que tem uma extensão de depuração instalada para esse tipo de arquivo.",
-+<<<<<<< .our
- 	"cancel": "Cancelar",
- 	"DebugTaskNotFound": "Não foi possível encontrar a tarefa '{0}'.",
- 	"taskNotTracked": "A tarefa '{0}' não pode ser rastreada."
-+=======
-+	"NewLaunchConfig": "Por favor, configure o arquivo de configuração de lançamento para seu aplicativo. {0}",
-+	"DebugTaskNotFound": "Não foi possível encontrar o preLaunchTask '{0}'.",
-+	"taskNotTracked": "Tarefa de pré-lançamento ${0} não pode ser rastreada."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 13e01541b3af3cd46609739f01a361306092398d i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 ddb9ffa28f8d3daf13de0c0b7197d8da53424c16 i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 b4f99cdf7467985c20dc66e8264976ec3719723f i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -10,8 +11,11 @@
- 	"searchMarketplace": "Pesquisar na Loja",
- 	"dynamicWorkspaceRecommendation": "Esta extensão pode interessá-lo porque é popular entre os usuários do repositório {0}.",
- 	"exeBasedRecommendation": "Esta extensão é recomendada porque você tem {0} instalado.",
-+=======
-+>>>>>>> .their
- 	"fileBasedRecommendation": "Esta extensão é recomendada baseada nos arquivos que você abriu recentemente.",
- 	"workspaceRecommendation": "Esta extensão é recomendada pelos usuários da área de trabalho atual.",
-+	"exeBasedRecommendation": "Esta extensão é recomendada porque você tem {0} instalado.",
- 	"reallyRecommended2": "A extensão {0} é recomendada para este tipo de arquivo.",
- 	"reallyRecommendedExtensionPack": "O pacote de extensão '{0}' é recomendado para este tipo de arquivo.",
- 	"install": "Instalar",
-changed in both
-  base   100644 2742e6642e3a187ad44feaafbb9237ad7d9de8b7 i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
-  our    100644 7255cc8d78b7eb2f55b9552ae859f6c3271c8a31 i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
-  their  100644 8403c0823117bd8c0a780c9fe333911d24c60308 i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
-changed in both
-  base   100644 53611fae125dd8fda0726516fc87c8cf837c4686 i18n/ptb/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
-  our    100644 b7b7494e9e4b4bd3e9b4e9565e52c213b3692be9 i18n/ptb/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
-  their  100644 e3cabff1118f552c570c34d8e157922cf111e4aa i18n/ptb/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
-@@ -16,6 +16,10 @@
- 	"exclude.boolean": "O padrão glob com o qual combinar os caminhos de arquivo. Defina para verdadeiro ou falso para habilitar ou desabilitar o padrão.",
- 	"exclude.when": "Verificação adicional nos irmãos de um arquivo correspondente. Use $(basename) como variável para o nome do arquivo correspondente.",
- 	"useRipgrep": "Controla se utiliza ripgrep em buscas de texto e de arquivo",
-+<<<<<<< .our
-+=======
-+	"useIgnoreFilesByDefault": "Controla se utiliza arquivos .gitignore e .ignore por padrão ao fazer pesquisas de texto em um novo espaço de trabalho.",
-+>>>>>>> .their
- 	"useIgnoreFiles": "Controla se utiliza arquivos .gitignore e .ignore por padrão ao fazer pesquisas de arquivos.",
- 	"search.quickOpen.includeSymbols": "Configurar para incluir resultados de uma pesquisa símbolo global nos resultados do arquivo para Abertura Rápida.",
- 	"search.followSymlinks": "Controla quando seguir symlinks ao realizar uma busca."
-changed in both
-  base   100644 ac001b085b6cea72a58aaa71cd88604ffa6dc8f7 i18n/ptb/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 ba5b86d8773fd55c24bc979c0c74cb81491c0258 i18n/ptb/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 18c5fd1a3c43214f0a458a8220da3cb7beb96f29 i18n/ptb/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-@@ -13,7 +13,14 @@
- 	"nextSearchTerm": "Mostrar o Próximo Termo de Pesquisa",
- 	"previousSearchTerm": "Mostrar Termo de Pesquisa Anterior",
- 	"findInFiles": "Localizar nos Arquivos",
-+	"findInFilesWithSelectedText": "Localizar nos Arquivos Com o Texto Selecionado",
- 	"replaceInFiles": "Substituir nos Arquivos",
-+<<<<<<< .our
-+=======
-+	"replaceInFilesWithSelectedText": "Substituir nos Arquivos Com o Texto Selecionado",
-+	"findInWorkspace": "Procurar no Espaço de Trabalho...",
-+	"findInFolder": "Procurar na pasta...",
-+>>>>>>> .their
- 	"RefreshAction.label": "Atualizar",
- 	"CollapseDeepestExpandedLevelAction.label": "Recolher tudo",
- 	"ClearSearchResultsAction.label": "Limpar",
-changed in both
-  base   100644 a691501ffe0010bde82bf07b8cb72382246f87ef i18n/rus/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
-  our    100644 e34b2279c4b7fca0b48e03c80622e6f54c4360dc i18n/rus/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
-  their  100644 3c376e0b3587f68f6f28026f6e436d26945b6b40 i18n/rus/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"activeEditorShort": "имя файла (например, myFile.txt)",
- 	"activeEditorMedium": "путь к файлу относительно папки рабочей области (например, myFolder/myFile.txt)",
- 	"activeEditorLong": "полный путь к файлу (например, \"/Users/Development/myProject/myFolder/myFile.txt\")",
-changed in both
-  base   100644 3c7e7099a9d4906d22e60542387d8fd4c4bfdd92 i18n/rus/extensions/emmet/package.i18n.json
-  our    100644 e8a08df3b0fb514f0bab0b0d555c900a23a3deca i18n/rus/extensions/emmet/package.i18n.json
-  their  100644 49fa561f309b4601652ed9ccb08462b1e2cdad8c i18n/rus/extensions/emmet/package.i18n.json
-@@ -52,6 +52,7 @@
- 	"emmetPreferencesBemModifierSeparator": "Разделитель модификатора для классов, используемый с фильтром BEM",
- 	"emmetPreferencesFilterCommentBefore": "Определение комментария, который должен быть размещен перед соответствующим элементом при применении фильтра комментария.",
- 	"emmetPreferencesFilterCommentAfter": "Определение комментария, который должен быть размещен после соответствующего элемента при применении фильтра комментария. ",
-+<<<<<<< .our
- 	"emmetPreferencesFilterCommentTrigger": "Разделителями запятыми список имен атрибутов, которые должны присутствовать в сокращении для применения фильтра комментария",
- 	"emmetPreferencesFormatNoIndentTags": "Массив имен тегов, для которых не следует использовать внутренние отступы",
- 	"emmetPreferencesFormatForceIndentTags": "Массив имен тегов, для которых всегда следует использовать внутренние отступы",
-@@ -62,4 +63,7 @@
- 	"emmetPreferencesCssMsProperties": "Разделенный запятыми список свойств CSS, которые получают префикс разработчика \"ms\" при использовании в сокращениях Emmet, которые начинаются с \"-\". Чтобы префикс \"ms\" никогда не подставлялся, установите в качестве этого параметра пустое значение. ",
- 	"emmetPreferencesCssFuzzySearchMinScore": "Минимальное количество очков для нечеткого соответствия сокращения (от 0 до 1). При указании более низких значений возможно увеличение числа ложных срабатываний, при указании более высоких значений - уменьшение числа возможных соответствий.",
- 	"emmetOptimizeStylesheetParsing": "Если значение равно false, весь файл анализируется для определения, является ли текущая позиция допустимой для расширения сокращений Emmet. Когда присвоено значение true, только содержимое вокруг текущей позиции в файлах css/scss/less подвергается синтаксическому анализу."
-+=======
-+	"emmetPreferencesFilterCommentTrigger": "Разделителями запятыми список имен атрибутов, которые должны присутствовать в сокращении для применения фильтра комментария"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f8b4fce36b0b40693b1cb6ce57cbd9d5c45238d2 i18n/rus/extensions/git/out/commands.i18n.json
-  our    100644 bdd7adadfadc50db48d014178fb19ce838d13900 i18n/rus/extensions/git/out/commands.i18n.json
-  their  100644 58ec5f6da2088d82ee8d81021e0d69d6eea0090a i18n/rus/extensions/git/out/commands.i18n.json
-changed in both
-  base   100644 27170f9c192f1a1abe4fac22645b9f66e2201481 i18n/rus/extensions/git/package.i18n.json
-  our    100644 f033330e3d5aad5041c41da260339bd159e31636 i18n/rus/extensions/git/package.i18n.json
-  their  100644 bb861a75c0cefc8f07c6493af28d607c18470173 i18n/rus/extensions/git/package.i18n.json
-@@ -73,15 +73,22 @@
- 	"config.enableCommitSigning": "Включает подписывание фиксации с GPG.",
- 	"config.discardAllScope": "Определяет, какие изменения отменяются с помощью команды \"Отменить все изменения\". При указании значения \"all\" отменяются все изменения, при указании значения \"tracked\" отменяются изменения только в отслеживаемых файлах, при указании значения \"prompt\" отображается окно подтверждения каждый раз при выполнении действия.",
- 	"config.decorations.enabled": "Управляет тем, используются ли цвета и эмблемы Git в проводнике и открытых представлениях редактора.",
-+<<<<<<< .our
- 	"config.promptToSaveFilesBeforeCommit": "Определяет, должен ли Git проверять несохраненные файлы перед фиксацией.",
- 	"config.showInlineOpenFileAction": "Определяет, должно ли отображаться интерактивное действие \"Открыть файл\" в представлении \"Изменения Git\".",
- 	"config.inputValidation": "Определяет, следует ли проверять введенные данные в сообщении фиксации.",
- 	"config.detectSubmodules": "Определяет, следует ли автоматически определять подмодули Git.",
- 	"config.detectSubmodulesLimit": "Управляет ограничением на количество обнаруженных подмодулей Git.",
-+=======
-+>>>>>>> .their
- 	"colors.modified": "Цвет измененных ресурсов.",
- 	"colors.deleted": "Цвет удаленных ресурсов.",
- 	"colors.untracked": "Цвет неотслеживаемых ресурсов.",
- 	"colors.ignored": "Цвет игнорируемых ресурсов.",
-+<<<<<<< .our
- 	"colors.conflict": "Цвет ресурсов с конфликтами.",
- 	"colors.submodule": "Цвет ресурсов подмодуля."
-+=======
-+	"colors.conflict": "Цвет ресурсов с конфликтами."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/extensions/npm/out/main.i18n.json
-  our    100644 df41ba3c21894f02422c48a9a9a3bc7ce7a84113 i18n/rus/extensions/npm/out/main.i18n.json
-  their  100644 e567298cc8515fd16e2d8e01136be41c28c7b144 i18n/rus/extensions/npm/out/main.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"npm.parseError": "Определение задач npm: не удалось проанализировать файл {0} "
- }
-\ No newline at end of file
-changed in both
-  base   100644 f10d56b2585874f5dacc2666bc98465a6405aff1 i18n/rus/extensions/npm/package.i18n.json
-  our    100644 8d7baa6e0dc033bbe07eab95362f11ea8ace26f2 i18n/rus/extensions/npm/package.i18n.json
-  their  100644 f92c0f33a8a99049df34571b8855469189d408fe i18n/rus/extensions/npm/package.i18n.json
-@@ -11,6 +11,7 @@
- 	"config.npm.autoDetect": "Включает или отключает автоматическое определение сценариев npm. Значение по умолчанию — \"включено\".",
- 	"config.npm.runSilent": "Запускать команды npm с параметром '--silent'.",
- 	"config.npm.packageManager": "Диспетчер пакетов, используемый для запуска сценариев.",
-+<<<<<<< .our
- 	"config.npm.exclude": "Настройте стандартные маски для папок, которые должны быть обработаны с помощью автоматического определения сценария.",
- 	"config.npm.enableScriptExplorer": "Включить представление обозревателя для сценариев npm.",
- 	"config.npm.scriptExplorerAction": "Действие по умолчанию при щелчке в обозревателе сценариев. Допустимые значения: 'open' или 'run', значение по умолчанию – 'open'.",
-@@ -23,4 +24,7 @@
- 	"command.debug": "Отладка",
- 	"command.openScript": "Открыть",
- 	"command.runInstall": "Запустить установку"
-+=======
-+	"npm.parseError": "Определение задач npm: не удалось проанализировать файл {0}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 50e4a58ad8ba81adc23c60e0121411e08ca3b072 i18n/rus/extensions/typescript/out/features/completionItemProvider.i18n.json
-  our    100644 3df8eafb0516e9eeec72a01567c1afd1ebf6d616 i18n/rus/extensions/typescript/out/features/completionItemProvider.i18n.json
-  their  100644 758fad838564109edf762d74947a4451b4487003 i18n/rus/extensions/typescript/out/features/completionItemProvider.i18n.json
-changed in both
-  base   100644 15940c3fc590a207c8d4fb6f826da35ccbb73875 i18n/rus/extensions/typescript/package.i18n.json
-  our    100644 f85ab4719ef4b9af38326543e2a0d45bbd38ba2c i18n/rus/extensions/typescript/package.i18n.json
-  their  100644 537a583b5e35c97f9c15cf9e9778d1323de60683 i18n/rus/extensions/typescript/package.i18n.json
-@@ -55,7 +55,11 @@
- 	"typescript.quickSuggestionsForPaths": "Включить/отключить краткие предложения при вводе пути импорта.",
- 	"typescript.locale": "Устанавливает языковой стандарт, используемый для сообщений об ошибках TypeScript. Требуется TypeScript 2.6.0 или более поздней версии. Значение по умолчанию — 'null'. При указании значения null для сообщений об ошибках TypeScript используется языковой стандарт VS Code.",
- 	"javascript.implicitProjectConfig.experimentalDecorators": "Включает/отключает параметр 'experimentalDecorators' для файлов JavaScript, которые не являются частью проекта. Этот параметр может переопределяться в файле jsconfig.json или tsconfig.json. Требуется TypeScript 2.3.1 или более поздней версии.",
-+<<<<<<< .our
- 	"typescript.autoImportSuggestions.enabled": "Включить/отключить предложения автоматического импорта. Требуется TypeScript 2.6.1 или более поздней версии",
- 	"typescript.experimental.syntaxFolding": "Включает/отключает маркеры свертывания с учетом синтаксиса.",
- 	"taskDefinition.tsconfig.description": "Файл tsconfig, который определяет сборку TS."
-+=======
-+	"typescript.autoImportSuggestions.enabled": "Включить/отключить предложения автоматического импорта. Требуется TypeScript 2.6.1 или более поздней версии"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 50944a8399c497336e67b9c4cf2cb87fc54dbf20 i18n/rus/src/vs/code/electron-main/windows.i18n.json
-  our    100644 d379d233127c99cdfb618689fe034d97e0544e27 i18n/rus/src/vs/code/electron-main/windows.i18n.json
-  their  100644 515f69bd342a19c2c8c397920187ea0323256bb4 i18n/rus/src/vs/code/electron-main/windows.i18n.json
-changed in both
-  base   100644 8914d592cb8f0e09d772947be39eea8e0317988c i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 66cf48db0f575d6b4f93e4e908a24029fed35a72 i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 4d615e7f9cf35d35cf257fafea39a6311f3208f2 i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json
-changed in both
-  base   100644 4de61ec7ef4c9c1cdbbb484f93d744674ec75892 i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 a203da5726ce360e6e4c7bd4be5cee05446e8ca5 i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 98e2cebe278a569ebc93b9f5a2b0590fb6d02e1b i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -48,8 +48,11 @@
- 	"listDropBackground": "Фоновый цвет элементов List/Tree при перемещении с помощью мыши.",
- 	"highlight": "Цвет переднего плана для выделения соответствия при поиске по элементу List/Tree.",
- 	"invalidItemForeground": "Цвет переднего плана списка/дерева для недопустимых элементов, например, для неразрешенного корневого узла в проводнике.",
-+<<<<<<< .our
- 	"listErrorForeground": "Цвет переднего плана элементов списка, содержащих ошибки.",
- 	"listWarningForeground": "Цвет переднего плана элементов списка, содержащих предупреждения.",
-+=======
-+>>>>>>> .their
- 	"pickerGroupForeground": "Цвет средства быстрого выбора для группировки меток.",
- 	"pickerGroupBorder": "Цвет средства быстрого выбора для группировки границ.",
- 	"buttonForeground": "Цвет переднего плана кнопки.",
-changed in both
-  base   100644 13d8031327faf42c6c5bc25ba1cb9126f00e35f5 i18n/rus/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 c446918f7398d91df096414504ebb365f7b433fb i18n/rus/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 7f87d17117ef5dbdd32a150b1191e9944234e145 i18n/rus/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -9,11 +9,25 @@
- 	"openFile": "Открыть файл...",
- 	"openFolder": "Открыть папку...",
- 	"openFileFolder": "Открыть...",
-+<<<<<<< .our
- 	"globalRemoveFolderFromWorkspace": "Удалить папку из рабочей области...",
-+=======
-+	"addFolderToWorkspace": "Добавить папку в рабочую область...",
-+	"add": "&&Добавить",
-+	"addFolderToWorkspaceTitle": "Добавить папку в рабочую область",
-+	"globalRemoveFolderFromWorkspace": "Удалить папку из рабочей области...",
-+	"removeFolderFromWorkspace": "Удалить папку из рабочей области",
-+	"openFolderSettings": "Открыть параметры папок",
-+>>>>>>> .their
- 	"saveWorkspaceAsAction": "Сохранить рабочую область как...",
- 	"save": "Сохранить",
- 	"saveWorkspace": "Сохранить рабочую область",
- 	"openWorkspaceAction": "Открыть рабочую область...",
- 	"openWorkspaceConfigFile": "Открыть файл конфигурации рабочей области",
-+<<<<<<< .our
- 	"duplicateWorkspaceInNewWindow": "Создать копию рабочей области в новом окне"
-+=======
-+	"openFolderAsWorkspaceInNewWindow": "Открыть папку как рабочую область в новом окне",
-+	"workspaceFolderPickerPlaceholder": "Выберите папку рабочей области"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 0e338824c87a6add77c234f3dadb6ef06a957201 i18n/rus/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
-  our    100644 0eca2304bb58f67d9dbc6465921f1a346ea46524 i18n/rus/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
-  their  100644 60289bc43b878a8c922b384e3a542192297b4e4f i18n/rus/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
-changed in both
-  base   100644 f23247593545f180b8555985eab33244d11e2da1 i18n/rus/src/vs/workbench/browser/parts/panel/panelActions.i18n.json
-  our    100644 92f2c95b2dd2622f94de18d6b8f25ae155fc6b29 i18n/rus/src/vs/workbench/browser/parts/panel/panelActions.i18n.json
-  their  100644 6f1782ab3e9ffc2ea70ee4b218f38791ffb9ef61 i18n/rus/src/vs/workbench/browser/parts/panel/panelActions.i18n.json
-changed in both
-  base   100644 81b50af396e2ab19f4f5eff9f390cf2c44960578 i18n/rus/src/vs/workbench/common/theme.i18n.json
-  our    100644 1ea38452a6e8832b511f19d37e5007a3b201c44b i18n/rus/src/vs/workbench/common/theme.i18n.json
-  their  100644 bd0d0f8b98bdcbebcab5d3adf085fa08676778b7 i18n/rus/src/vs/workbench/common/theme.i18n.json
-changed in both
-  base   100644 6887c80a117a2cf84b430f34e0b0b59b5ce92ab2 i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 bdb5e10a72aa6a97a13c01acd6d5626456147e68 i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 62c0bd218133622b8935319cd76bc6a6554a5fd0 i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -23,20 +23,35 @@
- 	"showIcons": "Определяет, должны ли открытые редакторы отображаться со значком. Требует включить тему значков.",
- 	"enablePreview": "Определяет, отображаются ли открытые редакторы в режиме предварительного просмотра. Редакторы в режиме предварительного просмотра можно использовать, пока они открыты (например, с помощью двойного щелчка мыши или изменения). Текст в таких редакторах отображается курсивом.",
- 	"enablePreviewFromQuickOpen": "Определяет, отображаются ли редакторы из Quick Open в режиме предварительного просмотра. Редакторы в режиме предварительного просмотра повторно используются до сохранения (например, с помощью двойного щелчка или изменения).",
-+<<<<<<< .our
- 	"closeOnFileDelete": "Определяет, следует ли автоматически закрывать редакторы, когда отображаемый в них файл удален или переименован другим процессом. При отключении этой функции редактор остается открытым в качестве черновика. Обратите внимание, что при удалении из приложения редактор закрывается всегда и что файлы черновиков никогда не закрываются для сохранения данных.",
- 	"editorOpenPositioning": "Определяет место открытия редакторов. Выберите 'left' или 'right', чтобы открывать редакторы слева или справа от активного редактора. Выберите 'first' или 'last', чтобы открывать редакторы независимо от активного редактора.",
- 	"revealIfOpen": "Определяет, отображается ли редактор в какой-либо из видимых групп при открытии. Если функция отключена, редактор открывается в текущей активной группе редакторов. Если функция включена, вместо открытия уже открытый редактор будет отображен в текущей активной группе редакторов. Обратите внимание, что в некоторых случаях этот параметр игнорируется, например при принудительном открытии редактора в определенной группе или сбоку от текущей активной группы редакторов.",
- 	"swipeToNavigate": "Переключайтесь между открытыми файлами, проводя по экрану по горизонтали тремя пальцами.",
-+=======
-+	"editorOpenPositioning": "Определяет место открытия редакторов. Выберите 'left' или 'right', чтобы открывать редакторы слева или справа от активного редактора. Выберите 'first' или 'last', чтобы открывать редакторы независимо от активного редактора.",
-+	"revealIfOpen": "Определяет, отображается ли редактор в какой-либо из видимых групп при открытии. Если функция отключена, редактор открывается в текущей активной группе редакторов. Если функция включена, вместо открытия уже открытый редактор будет отображен в текущей активной группе редакторов. Обратите внимание, что в некоторых случаях этот параметр игнорируется, например при принудительном открытии редактора в определенной группе или сбоку от текущей активной группы редакторов.",
-+>>>>>>> .their
- 	"commandHistory": "Определяет количество недавно использованных команд, которые следует хранить в журнале палитры команд. Установите значение 0, чтобы отключить журнал команд.",
- 	"preserveInput": "Определяет, следует ли восстановить последнюю введенную команду в палитре команд при следующем открытии палитры.",
- 	"closeOnFocusLost": "Управляет автоматическим закрытием Quick Open при потере фокуса.",
- 	"openDefaultSettings": "Управляет открытием редактора с отображением всех настроек по умолчанию при открытии настроек.",
- 	"sideBarLocation": "Определяет расположение боковой панели: слева или справа от рабочего места.",
-+<<<<<<< .our
- 	"panelDefaultLocation": "Определяет расположение панели по умолчанию. Она может находиться снизу или справа от рабочего места.",
- 	"statusBarVisibility": "Управляет видимостью строки состояния в нижней части рабочего места.",
- 	"activityBarVisibility": "Управляет видимостью панели действий на рабочем месте.",
- 	"viewVisibility": "Управляет видимостью действий в заголовке представления. Действия в заголовке представления могут быть видимы всегда или видимы только тогда, когда представление получает фокус или на него наводится курсор мыши.",
- 	"fontAliasing": "Управляет методом сглаживания шрифтов в рабочей области.\n- default: субпиксельное сглаживание шрифтов; позволит добиться максимальной четкости текста на большинстве дисплеев за исключением Retina\n- antialiased: сглаживание шрифтов на уровне пикселей, в отличие от субпиксельного сглаживания; позволит сделать шрифт более светлым в целом\n- none: сглаживание шрифтов отключено; текст будет отображаться с неровными острыми краями\n- auto: автоматически применяется режим \"default\" или \"antialiased\" в зависимости от разрешения дисплея (количество точек на дюйм).",
-+=======
-+	"panelLocation": "Определяет расположение панели: снизу или справа от рабочего места.",
-+	"statusBarVisibility": "Управляет видимостью строки состояния в нижней части рабочего места.",
-+	"activityBarVisibility": "Управляет видимостью панели действий на рабочем месте.",
-+	"closeOnFileDelete": "Определяет, следует ли автоматически закрывать редакторы, когда отображаемый в них файл удален или переименован другим процессом. При отключении этой функции редактор остается открытым в качестве черновика. Обратите внимание, что при удалении из приложения редактор закрывается всегда и что файлы черновиков никогда не закрываются для сохранения данных.",
-+	"experimentalFuzzySearchEndpoint": "Указывает конечную точку, которая будет использоваться для поиска с экспериментальными параметрами.",
-+	"experimentalFuzzySearchKey": "Указывает ключ, используемый для поиска с экспериментальными параметрами.",
-+	"fontAliasing": "Управляет методом сглаживания шрифтов в рабочей области.-по умолчанию: субпиксельное сглаживание шрифтов; позволит добиться максимальной четкости текста на большинстве дисплеев за исключением Retina - сглаживание: сглаживание шрифтов на уровне пикселей, в отличие от субпиксельного сглаживания; позволит сделать шрифт более светлым в целом - нет: сглаживание шрифтов отключено; текст будет отображаться с неровными острыми краями ",
-+>>>>>>> .their
- 	"workbench.fontAliasing.default": "Субпиксельное сглаживание шрифтов; позволит добиться максимальной четкости текста на большинстве дисплеев за исключением Retina.",
- 	"workbench.fontAliasing.antialiased": "Сглаживание шрифтов на уровне пикселей, в отличие от субпиксельного сглаживания. Может сделать шрифт светлее в целом.",
- 	"workbench.fontAliasing.none": "Отключает сглаживание шрифтов; текст будет отображаться с неровными острыми краями.",
-@@ -63,7 +78,11 @@
- 	"restoreWindows": "Управляет повторным открытием окон после перезапуска. Выберите 'none', чтобы всегда начинать с пустой рабочей области; 'one', чтобы открыть последнее окно, с которым вы работали; 'folders', чтобы открыть все окна с открытыми папками, и 'all', чтобы открыть все окна последнего сеанса.",
- 	"restoreFullscreen": "Определяет, должно ли окно восстанавливаться в полноэкранном режиме, если оно было закрыто в полноэкранном режиме.",
- 	"zoomLevel": "Настройте масштаб окна. Исходный размер равен 0. Увеличение или уменьшение значения на 1 означает увеличение или уменьшение окна на 20 %. Чтобы более точно задать масштаб, можно также ввести десятичное число.",
-+<<<<<<< .our
- 	"title": "Определяет заголовок окна в зависимости от активного редактора. Подстановка переменных выполняется на основе контекста:\n${activeEditorShort}: имя файла (например, myFile.txt)\n${activeEditorMedium}: путь к файлу относительно папки рабочей области (например, myFolder/myFile.txt)\n${activeEditorLong}: полный путь к файлу (например, /Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: имя папки рабочей области, в которой находится файл (например, myFolder)\n${folderPath}: путь к папке рабочей области, в которой находится файл (например, /Users/Development/myFolder)\n${rootName}: имя рабочей области (например, myFolder или myWorkspace)\n${rootPath}: путь к папке рабочей области (например, /Users/Development/myWorkspace)\n${appName}: например, VS Code\n${dirty}: индикатор изменения файла в активном редакторе\n${separator}: условный разделитель (\" - \"), который отображается, только если окружен переменными со значениями или статическим текстом",
-+=======
-+	"title": "Определяет заголовок окна в зависимости от активного редактора. Подстановка переменных выполняется на основе контекста:\n${activeEditorShort}: имя файла (например, myFile.txt)\n${activeEditorMedium}: путь к файлу относительно папки рабочей области (например, myFolder/myFile.txt)\n${activeEditorLong}: полный путь к файлу (например, /Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: имя папки рабочей области, в которой находится файл (например, myFolder)\n${folderPath}: путь к папке рабочей области, в которой находится файл (например, /Users/Development/myFolder)\n${rootName}: имя рабочей области (например, myFolder или myWorkspace)\n${rootPath}: путь к папке рабочей области (например, /Users/Development/myWorkspace)\n${appName}: например, VS Code\n${dirty}: индикатор изменения файла в активном редакторе\n${separator}: условный разделитель (\" - \"), который отображается, только если окружен переменными со значениями ",
-+>>>>>>> .their
- 	"window.newWindowDimensions.default": "Открывать новые окна в центре экрана.",
- 	"window.newWindowDimensions.inherit": "Открывать новые окна того же размера, что и последнее активное окно.",
- 	"window.newWindowDimensions.maximized": "Открывать новые окна в развернутом состоянии.",
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
-  our    100644 6ff61694550c199356f8578e1b806abcffaa884d i18n/rus/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
-  their  100644 2308850de934c8718622a4fd1b8d33d3c6fbca98 i18n/rus/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"selectAndStartDebug": "Выбрать и запустить конфигурацию отладки"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json
-  our    100644 489e93468efff44d243f4c1bead4998ad8f90302 i18n/rus/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json
-  their  100644 06412c841502ed249750c1289a9a33d25c447484 i18n/rus/src/vs/workbench/parts/debug/browser/debugViewlet.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,6 +8,14 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"startAdditionalSession": "Запустить дополнительный сеанс",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"debugFocusVariablesView": "Перейти в область переменных",
- 	"debugFocusWatchView": "Перейти в область контрольных значений",
- 	"debugFocusCallStackView": "Перейти в область стека вызовов",
-changed in both
-  base   100644 24d857f08621f6e1e91facb06fbda7cfc8b3228a i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 23eb63e486d254cf5d707329f4a13e4ae0e33119 i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 cae64165643d4dd688fd3eb01c144009eee2d8c4 i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -17,18 +17,31 @@
- 	"multipleConfigurationNamesInWorkspace": "В рабочей области есть несколько конфигураций запуска \"{0}\". Используйте имя папки для определения конфигурации.",
- 	"noFolderWithName": "Не удается найти папку с именем '{0}' для конфигурации '{1}' в составном объекте '{2}'.",
- 	"configMissing": "Конфигурация \"{0}\" отсутствует в launch.json.",
-+<<<<<<< .our
- 	"launchJsonDoesNotExist": "Файл \"launch.json\" не существует.",
- 	"debugRequestNotSupported": "Атрибут '{0}' имеет неподдерживаемое значение '{1}' в выбранной конфигурации отладки.",
- 	"debugRequesMissing": "В выбранной конфигурации отладки отсутствует атрибут '{0}'.",
- 	"debugTypeNotSupported": "Настроенный тип отладки \"{0}\" не поддерживается.",
- 	"debugTypeMissing": "Отсутствует свойство \"type\" для выбранной конфигурации запуска.",
-+=======
-+	"debugRequestNotSupported": "Атрибут '{0}' имеет неподдерживаемое значение '{1}' в выбранной конфигурации отладки.",
-+	"debugRequesMissing": "В выбранной конфигурации отладки отсутствует атрибут '{0}'.",
-+	"debugTypeNotSupported": "Настроенный тип отладки \"{0}\" не поддерживается.",
-+	"debugTypeMissing": "Отсутствует свойство 'type' для выбранной конфигурации запуска.",
-+>>>>>>> .their
- 	"debugAnyway": "Принудительная отладка",
- 	"preLaunchTaskErrors": "При выполнении предварительной задачи \"{0}\" обнаружены ошибки.",
- 	"preLaunchTaskError": "При выполнении предварительной задачи \"{0}\" обнаружена ошибка.",
- 	"preLaunchTaskExitCode": "Выполнение предварительной задачи \"{0}\" завершено с кодом выхода {1}.",
- 	"showErrors": "Показывать ошибки",
- 	"noFolderWorkspaceDebugError": "Нельзя выполнить отладку активного файла. Убедитесь, что файл сохранен на диске и установлено расширение отладки для этого типа файла.",
-+<<<<<<< .our
- 	"cancel": "Отмена",
- 	"DebugTaskNotFound": "Не удалось найти задачу \"{0}\".",
- 	"taskNotTracked": "Не удается отследить задачу \"{0}\"."
-+=======
-+	"NewLaunchConfig": "Настройте файл конфигурации запуска для вашего приложения. {0}",
-+	"DebugTaskNotFound": "Не удалось найти задачу preLaunchTask \"{0}\".",
-+	"taskNotTracked": "Не удается отследить задачу предварительного запуска '{0}'."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c7556643f1af682c00583cde344401e9c1f31473 i18n/rus/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json
-  our    100644 b22dfeae910376f718b5ec35a059296b0ae8d541 i18n/rus/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json
-  their  100644 2c39615757d01f87305d79c9b0ae0df0e2c5fccb i18n/rus/src/vs/workbench/parts/debug/electron-browser/replViewer.i18n.json
-changed in both
-  base   100644 321eafa78fd1288dcfb12bcf420eb2abce4da17f i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 bd475832dcfff4640327a5b72df263d4356ba205 i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 18a5d06c06b41027ee11346a7a0de3895703701c i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-@@ -50,6 +50,10 @@
- 	"allExtensionsInstalled": "Все рекомендуемые расширения для этой рабочей области уже установлены",
- 	"installRecommendedExtension": "Установить рекомендуемое расширение",
- 	"extensionInstalled": "Рекомендуемое расширение уже установлено",
-+<<<<<<< .our
-+=======
-+	"showRecommendedKeymapExtensions": "Показать рекомендуемые раскладки клавиатуры",
-+>>>>>>> .their
- 	"showRecommendedKeymapExtensionsShort": "Раскладки клавиатуры",
- 	"showLanguageExtensionsShort": "Расширения языка",
- 	"showAzureExtensionsShort": "Расширения Azure",
-changed in both
-  base   100644 079ff607cc96eb0123e082219964c8d499ea818e i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json
-  our    100644 4981c77a46f473057ad88ed20fd6f4682930e432 i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json
-  their  100644 278ef6b8b0b7f66acc038647000e7828a54b8dbf i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.i18n.json
-changed in both
-  base   100644 49881279b56100905d104122a187ff70c4542b16 i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 11278b85abb135a3195540e01213542dadbc0081 i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 3e00ebd88967071f0fa78b86272ed5b4184ad866 i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,6 +13,11 @@
- 	"exeBasedRecommendation": "Рекомендуется использовать это расширение, так как установлено {0}.",
- 	"fileBasedRecommendation": "Рекомендуется использовать это расширение (на основе недавно открытых файлов).",
- 	"workspaceRecommendation": "Это расширение рекомендуется пользователями текущей рабочей области.",
-+=======
-+	"fileBasedRecommendation": "Рекомендуется использовать это расширение (на основе недавно открытых файлов).",
-+	"workspaceRecommendation": "Это расширение рекомендуется пользователями текущей рабочей области.",
-+	"exeBasedRecommendation": "Рекомендуется использовать это расширение, так как установлено {0}.",
-+>>>>>>> .their
- 	"reallyRecommended2": "Для этого типа файлов рекомендуется использовать расширение '{0}'.",
- 	"reallyRecommendedExtensionPack": "Для этого типа файлов рекомендуется использовать пакет расширений '{0}'.",
- 	"install": "Установить",
-changed in both
-  base   100644 b9ec16ad99d91d42801f2c19695ecf8ba0ca9b22 i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
-  our    100644 e4f4310c781a6a0e51d8dbc974852e941d6f4de1 i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
-  their  100644 bbce89c45a257b72300ea043dae7de98dcdf8058 i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.i18n.json
-@@ -10,5 +10,9 @@
- 	"installVSIX": "Установка из VSIX...",
- 	"installFromVSIX": "Установить из VSIX",
- 	"installButton": "&&Установить",
-+<<<<<<< .our
-+=======
-+	"InstallVSIXAction.success": "Расширение установлено. Чтобы включить его, выполните перезапуск.",
-+>>>>>>> .their
- 	"InstallVSIXAction.reloadNow": "Перезагрузить"
- }
-\ No newline at end of file
-changed in both
-  base   100644 45f163a44aa1bfee3320c64b63b12770d0cdd166 i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  our    100644 2237c231d50e522f4f8d9167763aa06917febb9b i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  their  100644 b466066a024ad2984773833cc4e74d1757e695d1 i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-@@ -12,9 +12,12 @@
- 	"recommendedExtensions": "Рекомендуемое",
- 	"otherRecommendedExtensions": "Другие рекомендации",
- 	"workspaceRecommendedExtensions": "Рекомендации рабочей области",
-+<<<<<<< .our
- 	"builtInExtensions": "Функции",
- 	"builtInThemesExtensions": "Темы",
- 	"builtInBasicsExtensions": "Языки программирования",
-+=======
-+>>>>>>> .their
- 	"searchExtensions": "Поиск расширений в Marketplace",
- 	"sort by installs": "Сортировать по: числу установок",
- 	"sort by rating": "Сортировать по: рейтинг",
-changed in both
-  base   100644 1ffd1cf8897b997c86f23d358b635d471f72f400 i18n/rus/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json
-  our    100644 e99ea3422729ce7049e340161320d3550fa513a7 i18n/rus/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json
-  their  100644 37a3262cae48006110646e9754c365a158b48b22 i18n/rus/src/vs/workbench/parts/markers/browser/markersFileDecorations.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"label": "Проблемы",
- 	"tooltip.1": "Проблем в этом файле: 1",
- 	"tooltip.N": "Проблем в этом файле: {0}",
-changed in both
-  base   100644 d194e1e8d917550a5e1c9ba5912d10e9393dd54a i18n/rus/src/vs/workbench/parts/markers/common/messages.i18n.json
-  our    100644 a1ef2cd59b1cfdd0fef3ef7c2f1f17680b2a643a i18n/rus/src/vs/workbench/parts/markers/common/messages.i18n.json
-  their  100644 df6b024772e0c0f9f3afead5302f2af0388e6cf3 i18n/rus/src/vs/workbench/parts/markers/common/messages.i18n.json
-@@ -7,8 +7,14 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"viewCategory": "Просмотреть",
-+<<<<<<< .our
- 	"problems.view.toggle.label": "Включить или отключить сообщения о проблемах (ошибки, предупреждения, информационные сообщения)",
- 	"problems.view.focus.label": "Перевести фокус на сообщения о проблемах (ошибки, предупреждения, информационные сообщения) ",
-+=======
-+	"problems.view.toggle.label": "Показать/скрыть проблемы",
-+	"problems.view.show.label": "Показать проблемы",
-+	"problems.view.hide.label": "Скрыть проблемы",
-+>>>>>>> .their
- 	"problems.panel.configuration.title": "Представление \"Проблемы\"",
- 	"problems.panel.configuration.autoreveal": "Определяет, следует ли представлению \"Проблемы\" отображать файлы при их открытии",
- 	"markers.panel.title.problems": "Проблемы",
-changed in both
-  base   100644 7db022be87ee5efd56d1af32fc3d653a5d0671c7 i18n/rus/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json
-  our    100644 5c59b0255d7753999c775da7771f42bd83d799a5 i18n/rus/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json
-  their  100644 1eb66ba06b66c53709c3fad979790330d70bc0a0 i18n/rus/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"copyMarker": "Копировать",
- 	"copyMarkerMessage": "Копировать сообщение"
- }
-\ No newline at end of file
-changed in both
-  base   100644 7d8c77aeb83a0f98bc62abd5d464bf74dc451033 i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-  our    100644 14f251a84e0f5c94cbc0531579298faf4a9fea48 i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-  their  100644 de15465f5cd74fc6189e11072a1041342594aba4 i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-@@ -9,6 +9,7 @@
- 	"SearchSettingsWidget.AriaLabel": "Параметры поиска",
- 	"SearchSettingsWidget.Placeholder": "Параметры поиска",
- 	"noSettingsFound": "Нет результатов",
-+<<<<<<< .our
- 	"oneSettingFound": "Найден один параметр",
- 	"settingsFound": "Найдено параметров: {0}",
- 	"totalSettingsMessage": "Всего параметров: {0}",
-@@ -18,6 +19,12 @@
- 	"defaultUserSettings": "Параметры пользователя по умолчанию",
- 	"defaultWorkspaceSettings": "Параметры рабочей области по умолчанию",
- 	"defaultFolderSettings": "Параметры папок по умолчанию",
-+=======
-+	"oneSettingFound": "Один соответствующий параметр",
-+	"settingsFound": "Соответствующих параметров: {0}",
-+	"fileEditorWithInputAriaLabel": "{0}. Редактор текстовых файлов.",
-+	"fileEditorAriaLabel": "Редактор текстовых файлов.",
-+>>>>>>> .their
- 	"defaultEditorReadonly": "Редактировать в правой области редактора, чтобы переопределить значения по умолчанию.",
- 	"preferencesAriaLabel": "Параметры по умолчанию. Текстовый редактор только для чтения."
- }
-\ No newline at end of file
-changed in both
-  base   100644 6a867369b144fdd695141d61838daf46526a9d26 i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 b457921fc6fc12c765888c49560d62815333e020 i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 140a93428bcf1f25cd1f2a1ec5e7ba78f1813753 i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -13,5 +13,13 @@
- 	"newExtensionLabel": "Показать расширение «{0}»",
- 	"editTtile": "Изменить",
- 	"replaceDefaultValue": "Заменить в параметрах",
-+<<<<<<< .our
- 	"copyDefaultValue": "Копировать в параметры"
-+=======
-+	"copyDefaultValue": "Копировать в параметры",
-+	"unsupportedPHPExecutablePathSetting": "Этот параметр должен быть параметром пользователя. Чтобы настроить в рабочей области PHP, откройте PHP-файл и щелкните \"Путь PHP\" в строке состояния.",
-+	"unsupportedWorkspaceSetting": "Этот параметр должен быть параметром пользователя.",
-+	"unsupportedWorkbenchSetting": "Сейчас применить этот параметр нельзя. Он будет применен, когда вы откроете эту папку напрямую.",
-+	"unsupportedWorkbenchSettingDevMode": "Сейчас применить этот параметр нельзя. Он будет применен, когда вы определите область параметра как 'resource' при регистрации или когда вы откроете эту папку напрямую."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d17cc5fa1fe7f99a7277a57c73797512e01d99b4 i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 2639f8a70dc171eed499a24e68b57de977a1debe i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 46adf092d08484aa0858ec9072c79eb02a85b61c i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -12,4 +13,11 @@
- 	"userSettings": "Параметры пользователя",
- 	"workspaceSettings": "Параметры рабочей области",
- 	"folderSettings": "Параметры папок"
-+=======
-+	"defaultSettingsFuzzyPrompt": "Попробуйте нечеткий поиск!",
-+	"defaultSettings": "Чтобы переопределить параметры по умолчанию, укажите свои параметры в области справа.",
-+	"noSettingsFound": "Параметры не найдены.",
-+	"folderSettingsDetails": "Параметры папок",
-+	"enableFuzzySearch": "Включить экспериментальный нечеткий поиск"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 3305d6aa84d144d7e837abbb85ab71651d52c337 i18n/rus/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  our    100644 483c3b52c9f8f9cbb40dc452ed503745972ba5e2 i18n/rus/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-  their  100644 345c107b419df1726ab8ea2085df7d0d7187d01f i18n/rus/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json
-@@ -7,5 +7,6 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"commonlyUsed": "Часто используемые",
-+	"mostRelevant": "Наиболее релевантные",
- 	"defaultKeybindingsHeader": "Перезапишите настраиваемое сочетание клавиш, поместив их в файл настраиваемых сочетаний клавиш."
- }
-\ No newline at end of file
-changed in both
-  base   100644 3e5d8e50bd26e2e34d4429357bf398d6aca7c1d0 i18n/rus/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  our    100644 a0702c99bc6adf515a02bc50655ac66d8b369690 i18n/rus/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  their  100644 cd13a6df6b0b930debc5d71c8d8a08e70025406c i18n/rus/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-changed in both
-  base   100644 5e4642ba704557f711a7f395d1c1f56b4ffd38f7 i18n/rus/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-  our    100644 ea48fd0d000e46e4ca2651924908528f7e33755a i18n/rus/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-  their  100644 a98c4f89e3d7eb76a97108975f6075882a6ce343 i18n/rus/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,12 +7,17 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"changes": "{0} из {1} изменений",
- 	"change": "{0} из {1} изменения",
- 	"show previous change": "Показать предыдущее изменение",
- 	"show next change": "Показать следующее изменение",
-+<<<<<<< .our
- 	"move to previous change": "Перейти к предыдущему изменению",
- 	"move to next change": "Перейти к следующему изменению",
-+=======
-+>>>>>>> .their
- 	"editorGutterModifiedBackground": "Цвет фона полей редактора для измененных строк.",
- 	"editorGutterAddedBackground": "Цвет фона полей редактора для добавленных строк.",
- 	"editorGutterDeletedBackground": "Цвет фона полей редактора для удаленных строк.",
-changed in both
-  base   100644 5ce1c60d270f03c3e7fec5f5e0d740f9535ff1ad i18n/rus/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
-  our    100644 fb91734ab3bc363372fdf1dea6f0720c64d52c02 i18n/rus/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
-  their  100644 3eafd57dd44f4be1696a350e92f50d6bc4787ad5 i18n/rus/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
-@@ -16,6 +16,10 @@
- 	"exclude.boolean": "Стандартная маска, соответствующая путям к файлам. Задайте значение true или false, чтобы включить или отключить маску.",
- 	"exclude.when": "Дополнительная проверка элементов того же уровня соответствующего файла. Используйте $(basename) в качестве переменной для соответствующего имени файла.",
- 	"useRipgrep": "Определяет, следует ли использовать ripgrep в текстовом поиске и в поиске по файлам",
-+<<<<<<< .our
-+=======
-+	"useIgnoreFilesByDefault": "Определяет, следует ли использовать GITIGNORE- и IGNORE-файлы по умолчанию при поиске текста в новой рабочей области.",
-+>>>>>>> .their
- 	"useIgnoreFiles": "Определяет, следует ли использовать GITIGNORE- и IGNORE-файлы по умолчанию при поиске файлов.",
- 	"search.quickOpen.includeSymbols": "Настройте для включения результатов поиска глобальных символов в файлы по запросу для Quick Open.",
- 	"search.followSymlinks": "Определяет, нужно ли следовать символическим ссылкам при поиске."
-changed in both
-  base   100644 544b826c68e5342863efce9f8d07f7b0337cc9e5 i18n/rus/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 012af24286aec719761b0687ebd50b2292e4db5e i18n/rus/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 3243bdde9a8a1c90eca2d9f7e744cee0673caedd i18n/rus/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-@@ -15,7 +15,14 @@
- 	"nextReplaceTerm": "Показать следующее условие поиска и замены",
- 	"previousReplaceTerm": "Показать предыдущее условие поиска и замены",
- 	"findInFiles": "Найти в файлах",
-+	"findInFilesWithSelectedText": "Найти в файлах с выделенным текстом",
- 	"replaceInFiles": "Заменить в файлах",
-+<<<<<<< .our
-+=======
-+	"replaceInFilesWithSelectedText": "Заменить в файлах с выделенным текстом",
-+	"findInWorkspace": "Найти в рабочей области...",
-+	"findInFolder": "Найти в папке...",
-+>>>>>>> .their
- 	"RefreshAction.label": "Обновить",
- 	"CollapseDeepestExpandedLevelAction.label": "Свернуть все",
- 	"ClearSearchResultsAction.label": "Очистить",
-changed in both
-  base   100644 1b183c8fff62999cf8678e53df84cd44cd318f8e i18n/rus/src/vs/workbench/parts/search/browser/searchWidget.i18n.json
-  our    100644 3a958eab763b9648dafdb0ace27606b95df7f403 i18n/rus/src/vs/workbench/parts/search/browser/searchWidget.i18n.json
-  their  100644 abf60781b2101d85ed00d5de05f85b5a35409456 i18n/rus/src/vs/workbench/parts/search/browser/searchWidget.i18n.json
-changed in both
-  base   100644 5ec0ad21eef337898f2b56915860a7a2a0540db5 i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  our    100644 6a37d94b67d26daf129e538d4e91992157d2b014 i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-  their  100644 6c5ec091a1a8bf47c22b120df8180dc103e3af1f i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
-changed in both
-  base   100644 1588977370ee2c079cd6b8a7782504a4070c9327 i18n/rus/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 5406c69914aaafdfca9d082f48774213cbbbd661 i18n/rus/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 0bc1bcc16e71eceeaf987bee884ba9e6a6d9dc32 i18n/rus/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-@@ -28,6 +28,7 @@
- 	"JsonSchema.tasks.group.none": "Отменяет связь задачи со всеми группами",
- 	"JsonSchema.tasks.group": "Определяет, к какой группе выполнения принадлежит эта задача. Поддерживаемые значения: \"build\" для добавления задачи к группе сборки и \"test\" для добавления задачи к группе тестирования.",
- 	"JsonSchema.tasks.type": "Определяет, выполняется ли задача в виде процесса или в виде команды оболочки.",
-+<<<<<<< .our
- 	"JsonSchema.commandArray": "Команда оболочки, которая будет выполнена. Элементы массива будут объединены с помощью пробела",
- 	"JsonSchema.command.quotedString.value": "Фактическое значение команды",
- 	"JsonSchema.tasks.quoting.escape": "Экранирует символы с помощью escape-символа оболочки (например, \"`\" в PowerShell и\"\\\" в bash).",
-@@ -38,6 +39,8 @@
- 	"JsonSchema.args.quotedString.value": "Фактическое значение аргумента.",
- 	"JsonSchema.args.quotesString.quote": "Указывает, как значение аргумента должно быть заключено в кавычки.",
- 	"JsonSchema.tasks.args": "Аргументы, передаваемые в команду при вызове этой задачи.",
-+=======
-+>>>>>>> .their
- 	"JsonSchema.tasks.label": "Метка пользовательского интерфейса задачи",
- 	"JsonSchema.version": "Номер версии конфигурации.",
- 	"JsonSchema.tasks.identifier": "Пользовательский идентификатор задачи в файле launch.json или в предложении dependsOn.",
-changed in both
-  base   100644 6e4e63c216e0ad2f578efd4585fea1f85a5dccac i18n/rus/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 3ad2e6ca5f31ca94a9cdd8a18a046b2a9773636b i18n/rus/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 89b6fae2e75982c962b4f2d0358a9c64fb760942 i18n/rus/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -17,7 +17,10 @@
- 	"runningTasks": "Показать выполняемые задачи",
- 	"tasks": "Задачи",
- 	"TaskSystem.noHotSwap": "Чтобы изменить подсистему выполнения задач, в которой запущена активная задача, необходимо перезагрузить окно",
-+<<<<<<< .our
- 	"reloadWindow": "Перезагрузить окно",
-+=======
-+>>>>>>> .their
- 	"TaskServer.folderIgnored": "Папка {0} будет проигнорирована, так как в ней используется версия задач 0.1.0",
- 	"TaskService.noBuildTask1": "Задача сборки не определена. Отметьте задачу с помощью \"isBuildCommand\" в файле tasks.json.",
- 	"TaskService.noBuildTask2": "Задача сборки не определена. Отметьте задачу с помощью группы 'build' в файле tasks.json.",
-changed in both
-  base   100644 33131ec5a925244cf6ed60d4fe04fc1d7384c343 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 e05b07ca1e0540b56ed4788f50fea5db9d3c3f96 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 045380be6068784921d91a4443af28419f9375c3 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -21,8 +21,12 @@
- 	"terminal.integrated.fontSize": "Определяет размер шрифта (в пикселях) для терминала.",
- 	"terminal.integrated.letterSpacing": "Управляет межсимвольным интервалом в терминале. Это целочисленное значение, которое представляет собой количество дополнительных пикселей между символами.",
- 	"terminal.integrated.lineHeight": "Определяет высоту строки терминала; это число умножается на размер шрифта терминала, что дает фактическую высоту строки в пикселях.",
-+<<<<<<< .our
- 	"terminal.integrated.fontWeight": "Размер шрифта в терминале для нежирного текста.",
- 	"terminal.integrated.fontWeightBold": "Размер шрифта в терминале для полужирного текста. ",
-+=======
-+	"terminal.integrated.enableBold": "Следует ли разрешить полужирный текст в терминале. Эта функция должна поддерживаться оболочкой терминала.",
-+>>>>>>> .their
- 	"terminal.integrated.cursorBlinking": "Управляет миганием курсора терминала.",
- 	"terminal.integrated.cursorStyle": "Определяет стиль курсора терминала.",
- 	"terminal.integrated.scrollback": "Определяет предельное число строк в буфере терминала.",
-changed in both
-  base   100644 42442e0f21aa4a73a971f35934ea0bccd7de44cb i18n/rus/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-  our    100644 da59adfec73826ca4e574c95a636c7e2613597d0 i18n/rus/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-  their  100644 8915524eb9bff2cf02cf7f994fd2d422deaed65c i18n/rus/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-@@ -23,7 +23,10 @@
- 	"workspaceConfig.name.description": "Необязательное имя папки.",
- 	"workspaceConfig.uri.description": "URI папки",
- 	"workspaceConfig.settings.description": "Параметры рабочей области",
-+<<<<<<< .our
- 	"workspaceConfig.launch.description": "Конфигурации запуска рабочей области",
-+=======
-+>>>>>>> .their
- 	"workspaceConfig.extensions.description": "Расширения рабочей области",
- 	"unknownWorkspaceProperty": "Неизвестное свойство рабочей области"
- }
-\ No newline at end of file
-changed in both
-  base   100644 6d87ae00932619db9d65ebbad1cfe3e69274c92f i18n/rus/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 466dfbc590c46288cb65b00cb7bf87e50489e811 i18n/rus/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 39062b846ceeb571c2c5898d9226851b19e638cc i18n/rus/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
-  our    100644 35596266216cba8e608d5233580b3d82e8caf9ce i18n/rus/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
-  their  100644 6e3ff1bf5c174479d36597212771f227f06b39b8 i18n/rus/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"bubbleTitle": "Содержит выделенные элементы"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"bubbleTitle": "содержит выделенные элементы"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 16f8c52e622a5aee2dba8a57cc50638f7c9ae48e i18n/rus/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-  our    100644 52a5a5e9b5cb00b1501fd3d47177f37e740e312d i18n/rus/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-  their  100644 db97e7ffd818cb67f2300ddd98fb465ad9ba2772 i18n/rus/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
-@@ -9,9 +9,14 @@
- 	"schema.token.settings": "Цвета и стили для маркера.",
- 	"schema.token.foreground": "Цвет переднего плана для маркера.",
- 	"schema.token.background.warning": "Цвет фона маркера сейчас не поддерживается.",
-+<<<<<<< .our
- 	"schema.token.fontStyle": "Стиль шрифта для правила: 'italic', 'bold', 'underline' или их сочетание. Если указана пустая строка, то унаследованные настройки отменяются.",
- 	"schema.fontStyle.error": "Стиль шрифта может иметь значения 'italic', 'bold' и 'underline', сочетание этих свойств или содержать пустую строку.",
- 	"schema.token.fontStyle.none": "Нет (очистить унаследованный стиль)",
-+=======
-+	"schema.token.fontStyle": "Начертание шрифта для правила: один либо сочетание курсива, полужирного и подчеркивания.",
-+	"schema.fontStyle.error": "Стиль шрифта должен представлять собой сочетание свойств 'italic', 'bold' и 'underline'",
-+>>>>>>> .their
- 	"schema.properties.name": "Описание правила.",
- 	"schema.properties.scope": "Переключатель области, для которой проверяется это правило.",
- 	"schema.tokenColors.path": "Путь к файлу tmTheme (относительно текущего файла).",
-changed in both
-  base   100644 501f7ad3df08945f54f41db4a1065eb4518b2d4a i18n/rus/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
-  our    100644 fe543360ae79a89484bb4b557d3b54d01f9d2006 i18n/rus/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
-  their  100644 36030bba88533d091f4ed35e9fa40d0dc52970f2 i18n/rus/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
-changed in both
-  base   100644 27cc6bcc674314c254288413cca618eb98a327f3 i18n/rus/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  our    100644 680471e1ac0c7a4674469f91fa5e0f8217d52603 i18n/rus/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-  their  100644 019229d3fbb49ee267496c8b4f77617bec14a7b4 i18n/rus/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -9,4 +10,14 @@
- 	"errorInvalidTaskConfiguration": "Не удается записать файл конфигурации рабочей области. Откройте файл, исправьте ошибки и предупреждения и повторите попытку.",
- 	"errorWorkspaceConfigurationFileDirty": "Не удается записать файл конфигурации рабочей области, так как файл был изменен. Сохраните файл и повторите попытку.",
- 	"openWorkspaceConfigurationFile": "Открыть конфигурацию рабочей области"
-+=======
-+	"errorInvalidTaskConfiguration": "Не удается записать файл конфигурации рабочей области. Откройте файл, исправьте ошибки и предупреждения и повторите попытку.",
-+	"errorWorkspaceConfigurationFileDirty": "Не удается записать файл конфигурации рабочей области, так как файл был изменен. Сохраните файл и повторите попытку.",
-+	"openWorkspaceConfigurationFile": "Открыть файл конфигурации рабочей области",
-+	"close": "Закрыть",
-+	"enterWorkspace.close": "Закрыть",
-+	"enterWorkspace.dontShowAgain": "Больше не показывать",
-+	"enterWorkspace.moreInfo": "Дополнительные сведения",
-+	"enterWorkspace.prompt": "Дополнительные сведения о работе с несколькими папками в VS Code."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 42373afee86e28b172d4b06798290cacf2819dfa i18n/trk/extensions/git/package.i18n.json
-  our    100644 c440a7230c670854e02c25e2d19a46df2b4abcb8 i18n/trk/extensions/git/package.i18n.json
-  their  100644 fdf41929b4d8ded43116c897e22ca9dc0062be14 i18n/trk/extensions/git/package.i18n.json
-@@ -73,15 +73,22 @@
- 	"config.enableCommitSigning": "GPG ile commit imzalamayı etkinleştirir.",
- 	"config.discardAllScope": "`Tüm Değişiklikleri Göz Ardı Et` komutuyla hangi değişikliklerin göz ardı edileceğini denetler. `all` tüm değişiklikleri göz ardı eder. `tracked` sadece izlenen dosyaları göz ardı eder. `prompt` eylem her çalıştığında bir onay penceresi gösterir.",
- 	"config.decorations.enabled": "Git'in gezgine ve açık düzenleyiciler görünümüne renkler ve göstergeler ile ekleme yapıp yapmadığını denetler.",
-+<<<<<<< .our
- 	"config.promptToSaveFilesBeforeCommit": "Commit'lemeden önce Git'in kaydedilmemiş dosyaları kontrol edip etmeyeceğini denetler.",
- 	"config.showInlineOpenFileAction": "Git değişiklikleri görünümünde satır içi Dosyayı Aç eyleminin gösterilip gösterilmeyeceğini denetler.",
- 	"config.inputValidation": "Commit mesajı doğrulamasının ne zaman gösterileceğini kontrol eder.",
- 	"config.detectSubmodules": "Git alt modüllerin otomatik olarak tespit edilip edilmeyeceğini denetler.",
- 	"config.detectSubmodulesLimit": "Algılanan git alt modüllerinin limitini denetler.",
-+=======
-+>>>>>>> .their
- 	"colors.modified": "Değiştirilen kaynakların rengi.",
- 	"colors.deleted": "Silinen kaynakların rengi.",
- 	"colors.untracked": "İzlenmeyen kaynakların rengi.",
- 	"colors.ignored": "Yok sayılan kaynakların rengi.",
-+<<<<<<< .our
- 	"colors.conflict": "Çakışma içeren kaynakların rengi.",
- 	"colors.submodule": "Alt modül kaynaklarının rengi."
-+=======
-+	"colors.conflict": "Çakışma içeren kaynakların rengi."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 b84a1d0fe9f05c798c6cfe83347aa6e04758e372 i18n/trk/extensions/npm/package.i18n.json
-  our    100644 2139346855fff5ec5963cac4c1aa77b373277a6f i18n/trk/extensions/npm/package.i18n.json
-  their  100644 f93c4b7a9c0a8d893a4bf8c04ece57c22450cd61 i18n/trk/extensions/npm/package.i18n.json
-@@ -11,6 +11,7 @@
- 	"config.npm.autoDetect": "Npm betiklerinin otomatik olarak algılanıp algılanmayacağını denetler. Varsayılan olarak açıktır.",
- 	"config.npm.runSilent": "npm komutlarını `--silent`(sessiz) seçeneğiyle çalıştır.",
- 	"config.npm.packageManager": "Betikleri çalıştırmada kullanılacak paket yöneticisi.",
-+<<<<<<< .our
- 	"config.npm.exclude": "Otomatik betik algılamadan hariç tutulacak klasörler için glob desenlerini yapılandırın.",
- 	"config.npm.enableScriptExplorer": "npm betikleri için gezgin görünümünü etkinleştir.",
- 	"config.npm.scriptExplorerAction": "Betik gezgininde kullanılan varsayılan tıklama eylemi: 'open' (aç) veya 'run' (çalıştır), varsayılan 'open'dır.",
-@@ -23,4 +24,7 @@
- 	"command.debug": "Hata Ayıkla",
- 	"command.openScript": "Aç",
- 	"command.runInstall": "Kurulumu Çalıştır"
-+=======
-+	"npm.parseError": "Npm görev algılama: {0} dosyası ayrıştırılamadı"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 de2a515d9aba7e9a82611ead66a5b5a6d5601986 i18n/trk/extensions/typescript/out/features/completionItemProvider.i18n.json
-  our    100644 73c28f59b2d330cf249bdb3d03ed86764fc3a851 i18n/trk/extensions/typescript/out/features/completionItemProvider.i18n.json
-  their  100644 99dbe99b705b0dcc35144079c61cee9a4b6c7f08 i18n/trk/extensions/typescript/out/features/completionItemProvider.i18n.json
-changed in both
-  base   100644 16c90f38eccbec61112a5552801a9d13f366c024 i18n/trk/src/vs/workbench/common/theme.i18n.json
-  our    100644 c3e69879379552f9bae45b018ec024370c6f07fc i18n/trk/src/vs/workbench/common/theme.i18n.json
-  their  100644 9eb9ad116a5238fbf876533e50d6b63e7763457c i18n/trk/src/vs/workbench/common/theme.i18n.json
-changed in both
-  base   100644 d7ac2198d904ae0e9300d488cf09652249de23d1 i18n/trk/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 6083c93c0aa8c7594afe0d6fb609d69d65163ece i18n/trk/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 03dfb498b1e4857eeac825de4b81229eeb9e17d5 i18n/trk/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,8 +35,15 @@
- 	"panelDefaultLocation": "Panelin varsayılan konumunu denetler. Çalışma ekranının ya altında ya da sağında gösterilebilir.",
- 	"statusBarVisibility": "Çalışma ekranının altındaki durum çubuğunun görünürlüğünü denetler.",
- 	"activityBarVisibility": "Çalışma ekranındaki etkinlik çubuğunun görünürlüğünü denetler.",
-+<<<<<<< .our
- 	"viewVisibility": "Görünüm üstbilgi eylemlerinin görünürlüğünü denetler. Görünüm üstbilgi eylemleri ya her zaman görünür ya da sadece o görünüme odaklanıldığında veya fareyle üzerine gelindiğinde görünebilir.",
- 	"fontAliasing": "Çalışma ekranındaki yazı tipi yumuşatma yöntemini denetler.\n- default: Alt-piksel yazı tipi yumuşatma. Bu, çoğu retina olmayan ekranda en keskin metni verir\n- antialiased: Alt-pikselin tersine, pikselin seviyesine göre yazı tipini yumuşat. Yazı tipinin genel olarak daha açık görünmesini sağlayabilir\n- none: Yazı tipi yumuşatmayı devre dışı bırakır. Metin pürüzlü keskin kenarlarla gösterilir.\n- auto: Ekranların DPI'ına göre otomatik olarak `default` veya`antialiased`ı uygular.",
-+=======
-+	"closeOnFileDelete": "Düzenleyicinin gösterdiği bir dosyanın, başka bir işlem tarafından silinmesi veya yeniden adlandırması durumunda dosyayı otomatik olarak kapatıp kapatmamasını denetler. Bunu devre dışı bırakmak, böyle bir durumda düzenleyicinin kaydedilmemiş değişiklikler içeriyor durumunda kalmasını sağlar. Uygulama içinde silmek, düzenleyiciyi her zaman kapatır ve kaydedilmemiş değişiklikler içeren dosyalar, verilerinizin korunması için otomatik olarak kapatılmaz.",
-+	"experimentalFuzzySearchEndpoint": "Deneysel ayar araması için kullanılacak uçbirimi belirtir.",
-+	"experimentalFuzzySearchKey": "Deneysel ayar araması için kullanılacak anahtarı belirtir.",
-+	"fontAliasing": "Çalışma ekranındaki yazı tipi yumuşatma yöntemini denetler.\n- default: Alt-piksel yazı tipi yumuşatma. Bu, çoğu retina olmayan ekranda en keskin metni verir\n- antialiased: Alt-pikselin tersine, pikselin seviyesine göre yazı tipini yumuşat. Yazı tipinin genel olarak daha açık görünmesini sağlayabilir\n- none: Yazı tipi yumuşatmayı devre dışı bırakır. Metin pürüzlü keskin kenarlarla gösterilir.",
-+>>>>>>> .their
- 	"workbench.fontAliasing.default": "Alt-piksel yazı tipi yumuşatma. Bu, çoğu retina olmayan ekranda en keskin metni verir.",
- 	"workbench.fontAliasing.antialiased": "Alt-pikselin tersine, pikselin seviyesine göre yazı tipini yumuşat. Yazı tipinin genel olarak daha açık görünmesini sağlayabilir.",
- 	"workbench.fontAliasing.none": "Yazı tipi yumuşatmayı devre dışı bırakır. Metin pürüzlü keskin kenarlarla gösterilir.",
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/trk/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
-  our    100644 542e8b8284a0d941488ebdc05cb8022899f37ddd i18n/trk/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
-  their  100644 410f5af32affd454f9f37bcea328c4bd530be22b i18n/trk/src/vs/workbench/parts/debug/browser/debugStatus.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"selectAndStartDebug": "Seçin ve hata ayıklama yapılandırmasını başlatın"
- }
-\ No newline at end of file
-changed in both
-  base   100644 52318e59059ea48eba7ae7f0e2f4ca59ae882999 i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 3b4248d45e7ecb01c6045e1c3d824ba835249478 i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 a72d826faba61fa9f2ed2c29ebca78960c3aefb2 i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -17,8 +17,12 @@
- 	"multipleConfigurationNamesInWorkspace": "Çalışma alanında birden fazla '{0}' başlatma yapılandırması var. Yapılandırmayı belirtmek için klasör adını kullanın.",
- 	"noFolderWithName": "'{2}' bileşiğindeki '{1}' yapılandırması için '{0}' adlı klasör bulunamadı.",
- 	"configMissing": "'launch.json' dosyasında '{0}' yapılandırması eksik.",
-+<<<<<<< .our
- 	"launchJsonDoesNotExist": "'launch.json' mevcut değil.",
- 	"debugRequestNotSupported": "Seçilen hata ayıklama yapılandırılmasındaki '{0}' özniteliği desteklenmeyen '{1}' değeri içeriyor.",
-+=======
-+	"debugRequestNotSupported": "Seçilen hata ayıklama yapılandırılmasındaki `{0}` özniteliği desteklenmeyen `{1}` değeri içeriyor.",
-+>>>>>>> .their
- 	"debugRequesMissing": "'{0}' özniteliği seçilen hata ayıklama yapılandırılmasında eksik.",
- 	"debugTypeNotSupported": "Yapılandırılan hata ayıklama türü '{0}', desteklenmiyor.",
- 	"debugTypeMissing": "Seçilen başlatma yapılandırması için 'type' özelliği eksik.",
-@@ -28,7 +32,13 @@
- 	"preLaunchTaskExitCode": "'{0}' ön başlatma görevi {1} çıkış koduyla sonlandı.",
- 	"showErrors": "Hataları Göster",
- 	"noFolderWorkspaceDebugError": "Aktif dosyada hata ayıklama yapılamıyor. Lütfen, dosyanın diskte kayıtlı olduğundan ve bu dosya türü için hata ayıklama eklentinizin olduğundan emin olun.",
-+<<<<<<< .our
- 	"cancel": "İptal",
- 	"DebugTaskNotFound": "'{0}' görevi bulunamadı.",
- 	"taskNotTracked": "'{0}' görevi izlenemez."
-+=======
-+	"NewLaunchConfig": "Lütfen uygulamanızın başlatma yapılandırması dosyasını ayarlayın. {0}",
-+	"DebugTaskNotFound": "'{0}' ön başlatma görevi bulunamadı.",
-+	"taskNotTracked": "'{0}' başlatma öncesi görevi izlenemez."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 5b9f87d703262720f8daebd10b67a90d3192662c i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 c1fd4a38b55f33cc75802aa90a13a4a917da2acc i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 63820e9cd1c199a25695fc98440764b156a75525 i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -12,6 +12,7 @@
- 	"exeBasedRecommendation": "Bu eklenti, sizde {0} kurulu olduğu için tavsiye ediliyor.",
- 	"fileBasedRecommendation": "Bu eklenti yakınlarda açtığınız dosyalara dayanarak tavsiye ediliyor.",
- 	"workspaceRecommendation": "Bu eklenti geçerli çalışma alanı kullanıcıları tarafından tavsiye ediliyor.",
-+	"exeBasedRecommendation": "Bu eklenti, sizde {0} kurulu olduğu için tavsiye ediliyor.",
- 	"reallyRecommended2": "'{0}' eklentisi bu dosya türü için tavsiye edilir.",
- 	"reallyRecommendedExtensionPack": "'{0}' eklenti paketi bu dosya türü için tavsiye edilir.",
- 	"install": "Yükle",
-changed in both
-  base   100644 ad47c6f0e143c8b67db9f9d0da159a6f622fc477 i18n/trk/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
-  our    100644 fd6f32d47d67fb3d038b3000c78f1e0b06b673ce i18n/trk/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
-  their  100644 e5f8ce96be939474cd667d07893ca41056aff680 i18n/trk/src/vs/workbench/parts/search/browser/search.contribution.i18n.json
-@@ -16,6 +16,10 @@
- 	"exclude.boolean": "Dosya yollarının eşleştirileceği glob deseni. Deseni etkinleştirmek veya devre dışı bırakmak için true veya false olarak ayarlayın.",
- 	"exclude.when": "Eşleşen bir dosyanın eşdüzey dosyalarında ek denetim. Eşleşen dosya adı için değişken olarak $(basename) kullanın.",
- 	"useRipgrep": "Metin ve dosya aramasında Ripgrep kullanılıp kullanılmayacağını denetler",
-+<<<<<<< .our
-+=======
-+	"useIgnoreFilesByDefault": "Yeni bir çalışma alanında arama yaparken .gitignore ve .ignore dosyalarının varsayılan olarak kullanılıp kullanılmayacağını denetler.",
-+>>>>>>> .their
- 	"useIgnoreFiles": "Dosyaları ararken .gitignore ve .ignore dosyalarının kullanılıp kullanılmayacağını denetler.",
- 	"search.quickOpen.includeSymbols": "Dosya sonuçlarındaki bir global sembol aramasının sonuçlarının Hızlı Aç'a dahil edilip edilmeyeceğini yapılandırın.",
- 	"search.followSymlinks": "Arama yaparken sembolik linklerin takip edilip edilmeyeceğini denetler."
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/trk/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
-  our    100644 40e6b9e3318c6cdf506d4e3789b9633f03c3289c i18n/trk/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
-  their  100644 778ed05c3e7823795a6a130869aa02131de89521 i18n/trk/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -7,4 +8,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"bubbleTitle": "Vurgulanan ögeler içeriyor"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"bubbleTitle": "vurgulanan öğeler içeriyor"
-+>>>>>>> .their
- }
-\ No newline at end of file
-removed in local
-  base   100644 c22067ae484cd56b421b6cc9bb66d7fb026727e2 npm-shrinkwrap.json
-  their  100644 6e166c1b7c3bd8cd55c439aba2b317d3f61ea13e npm-shrinkwrap.json
-changed in both
-  base   100644 d3912390cc507a379660cc2980d0a384829e8e86 package.json
-  our    100644 d0e982ce0b76c5b1b5eb02b673e459e47f3353a4 package.json
-  their  100644 b6aa03a1af3f610b20f7065ceac7be6aac4acdf9 package.json
-@@ -1,7 +1,13 @@
- {
-   "name": "code-oss-dev",
-+<<<<<<< .our
-   "version": "1.27.0",
-   "distro": "a4155d9780fbbc94ead6cb3017dd0fc3806c57b8",
-+=======
-+  "version": "1.18.1",
-+  "electronVersion": "1.7.9",
-+  "distro": "3ad4dcb7f51b672173c5009c1965bd448f65811f",
-+>>>>>>> .their
-   "author": {
-     "name": "Microsoft Corporation"
-   },
-@@ -39,6 +45,7 @@
-     "native-is-elevated": "^0.2.1",
-     "native-keymap": "1.2.5",
-     "native-watchdog": "0.3.0",
-+<<<<<<< .our
-     "node-pty": "0.7.6",
-     "semver": "^5.5.0",
-     "spdlog": "0.7.1",
-@@ -52,6 +59,17 @@
-     "vscode-xterm": "3.7.0-beta4",
-     "winreg": "^1.2.4",
-     "yauzl": "^2.9.1"
-+=======
-+    "node-pty": "0.7.3",
-+    "nsfw": "1.0.16",
-+    "semver": "4.3.6",
-+    "v8-profiler": "jrieken/v8-profiler#vscode",
-+    "vscode-debugprotocol": "1.24.0",
-+    "vscode-ripgrep": "0.6.0-patch.0.2",
-+    "vscode-textmate": "^3.2.0",
-+    "xterm": "Tyriar/xterm.js#vscode-release/1.18",
-+    "yauzl": "2.8.0"
-+>>>>>>> .their
-   },
-   "devDependencies": {
-     "7zip": "0.0.6",
-changed in both
-  base   100644 fb916b8f73dbdcd4075c326849997fbe9b30b43e src/vs/code/electron-main/menus.ts
-  our    100644 9d5657cff26b159c842f9790d6387967d829e168 src/vs/code/electron-main/menus.ts
-  their  100644 1064121f163742cf83d64671acab6a41bf436758 src/vs/code/electron-main/menus.ts
-@@ -380,8 +380,13 @@
- 		this.setOpenRecentMenu(openRecentMenu);
- 		const openRecent = new MenuItem({ label: this.mnemonicLabel(nls.localize({ key: 'miOpenRecent', comment: ['&& denotes a mnemonic'] }, "Open &&Recent")), submenu: openRecentMenu, enabled: openRecentMenu.items.length > 0 });
- 
-+<<<<<<< .our
- 		const saveWorkspaceAs = this.createMenuItem(nls.localize('miSaveWorkspaceAs', "Save Workspace As..."), 'workbench.action.saveWorkspaceAs');
- 		const addFolder = this.createMenuItem(nls.localize({ key: 'miAddFolderToWorkspace', comment: ['&& denotes a mnemonic'] }, "A&&dd Folder to Workspace..."), 'workbench.action.addRootFolder');
-+=======
-+		const saveWorkspaceAs = this.createMenuItem(nls.localize({ key: 'miSaveWorkspaceAs', comment: ['&& denotes a mnemonic'] }, "Sa&&ve Workspace As..."), 'workbench.action.saveWorkspaceAs');
-+		const addFolder = this.createMenuItem(nls.localize({ key: 'miAddFolderToWorkspace', comment: ['&& denotes a mnemonic'] }, "&&Add Folder to Workspace..."), 'workbench.action.addRootFolder');
-+>>>>>>> .their
- 
- 		const saveFile = this.createMenuItem(nls.localize({ key: 'miSave', comment: ['&& denotes a mnemonic'] }, "&&Save"), 'workbench.action.files.save');
- 		const saveFileAs = this.createMenuItem(nls.localize({ key: 'miSaveAs', comment: ['&& denotes a mnemonic'] }, "Save &&As..."), 'workbench.action.files.saveAs');
-changed in both
-  base   100644 ef59a9672d0310d6e4aa68442a02ee343520298a src/vs/vscode.d.ts
-  our    100644 6000b0300db361418bc31c0585263a9d663705f5 src/vs/vscode.d.ts
-  their  100644 a6ee19445e28b73dc07451adcd4e6dadbc014d70 src/vs/vscode.d.ts
-changed in both
-  base   100644 2ffc03718df35e146eb22937c1b7eff7e9791cb3 src/vs/workbench/browser/parts/editor/editorStatus.ts
-  our    100644 9a47132500af09bad1cd9f36609d49fdb50a5f9a src/vs/workbench/browser/parts/editor/editorStatus.ts
-  their  100644 6f3ef39d9fbe0c3383b01b317d8c8a3657fc6cec src/vs/workbench/browser/parts/editor/editorStatus.ts
-@@ -1385,7 +1385,11 @@
- 		this.container.appendChild(explanation1);
- 
- 		const explanation2 = $('p.body2', {}, nls.localize('screenReaderDetectedExplanation.body2', "Some editor features will have different behaviour: e.g. word wrapping, folding, etc."));
-+<<<<<<< .our
- 		this.container.appendChild(explanation2);
-+=======
-+		domNode.appendChild(explanation2);
-+>>>>>>> .their
- 
- 		parent.appendChild(this.container);
- 
-changed in both
-  base   100644 c23c6a6cf638ff90905fc9ea9137f295d5a8052c src/vs/workbench/browser/parts/views/viewsViewlet.ts
-  our    100644 7fbaeee118622ff2c865cdcaad61d8bf1813d1b2 src/vs/workbench/browser/parts/views/viewsViewlet.ts
-  their  100644 3319af932d4ec4df449720f1b28efef8ab54d13a src/vs/workbench/browser/parts/views/viewsViewlet.ts
-@@ -248,8 +248,14 @@
- 		super.shutdown();
- 	}
- 
-+<<<<<<< .our
- 	protected isSingleView(): boolean {
- 		if (!super.isSingleView()) {
-+=======
-+	private canBeVisible(viewDescriptor: IViewDescriptor): boolean {
-+		const viewstate = this.viewsStates.get(viewDescriptor.id);
-+		if (viewDescriptor.canToggleVisibility && viewstate && viewstate.isHidden) {
-+>>>>>>> .their
- 			return false;
- 		}
- 		if (!this.areExtensionsReady) {
-changed in both
-  base   100644 e57e129f6d4180d89993a25f88ccb0a608f4d4f0 src/vs/workbench/node/extensionHostMain.ts
-  our    100644 b848a88609d33b26f2e00b18abb42bc94dca8e9a src/vs/workbench/node/extensionHostMain.ts
-  their  100644 4cf61b3e915917d00478f24167fff3c40af24aa9 src/vs/workbench/node/extensionHostMain.ts
-@@ -268,7 +268,11 @@
- 			includes[globPattern] = true;
- 		});
- 
-+<<<<<<< .our
- 		const folderQueries = this._workspace.folders.map(folder => ({ folder: URI.revive(folder.uri) }));
-+=======
-+		const folderQueries = this._workspace.folders.map(folder => ({ folder: folder.uri }));
-+>>>>>>> .their
- 		const config = this._extHostConfiguration.getConfiguration('search');
- 		const useRipgrep = config.get('useRipgrep', true);
- 		const followSymlinks = config.get('followSymlinks', true);
-changed in both
-  base   100644 37899661d2baab6dd62708ca509a7bced2d31552 src/vs/workbench/parts/debug/browser/debugEditorModelManager.ts
-  our    100644 4b21fa882fbb0a8432e82ade4907ea9f68000971 src/vs/workbench/parts/debug/browser/debugEditorModelManager.ts
-  their  100644 a7012d296d56bc3a56d93791c7c2d8405ec81a43 src/vs/workbench/parts/debug/browser/debugEditorModelManager.ts
-@@ -23,7 +23,13 @@
- interface IDebugEditorModelData {
- 	model: ITextModel;
- 	toDispose: lifecycle.IDisposable[];
-+<<<<<<< .our
- 	breakpointDecorations: IBreakpointDecoration[];
-+=======
-+	breakpointDecorationIds: string[];
-+	breakpointModelIds: string[];
-+	breakpointDecorationsAsMap: Map<string, Range>;
-+>>>>>>> .their
- 	currentStackDecorations: string[];
- 	topStackFrameRange: Range;
- }
-@@ -84,7 +90,13 @@
- 		this.modelDataMap.set(modelUriStr, {
- 			model: model,
- 			toDispose: toDispose,
-+<<<<<<< .our
- 			breakpointDecorations: breakpointDecorationIds.map((decorationId, index) => ({ decorationId, modelId: breakpoints[index].getId(), range: desiredDecorations[index].range })),
-+=======
-+			breakpointDecorationIds: breakPointDecorations,
-+			breakpointModelIds: breakpoints.map(bp => bp.getId()),
-+			breakpointDecorationsAsMap,
-+>>>>>>> .their
- 			currentStackDecorations: currentStackDecorations,
- 			topStackFrameRange: undefined
- 		});
-@@ -178,7 +190,11 @@
- 	// breakpoints management. Represent data coming from the debug service and also send data back.
- 	private onModelDecorationsChanged(modelUrlStr: string): void {
- 		const modelData = this.modelDataMap.get(modelUrlStr);
-+<<<<<<< .our
- 		if (modelData.breakpointDecorations.length === 0 || this.ignoreDecorationsChangedEvent) {
-+=======
-+		if (modelData.breakpointDecorationsAsMap.size === 0 || this.ignoreDecorationsChangedEvent) {
-+>>>>>>> .their
- 			// I have no decorations
- 			return;
- 		}
-@@ -197,6 +213,7 @@
- 			return;
- 		}
- 
-+<<<<<<< .our
- 		const data: { [id: string]: IBreakpointUpdateData } = Object.create(null);
- 		const breakpoints = this.debugService.getModel().getBreakpoints();
- 		const modelUri = modelData.model.uri;
-@@ -206,6 +223,17 @@
- 			// check if the line got deleted.
- 			if (decorationRange) {
- 				const breakpoint = breakpoints.filter(bp => bp.getId() === breakpointDecoration.modelId).pop();
-+=======
-+		const data: IRawBreakpoint[] = [];
-+
-+		const breakpoints = this.debugService.getModel().getBreakpoints();
-+		const modelUri = modelData.model.uri;
-+		for (let i = 0, len = modelData.breakpointDecorationIds.length; i < len; i++) {
-+			const decorationRange = modelData.model.getDecorationRange(modelData.breakpointDecorationIds[i]);
-+			// check if the line got deleted.
-+			if (decorationRange && decorationRange.endColumn - decorationRange.startColumn > 0) {
-+				const breakpoint = breakpoints.filter(bp => bp.getId() === modelData.breakpointModelIds[i]).pop();
-+>>>>>>> .their
- 				// since we know it is collapsed, it cannot grow to multiple lines
- 				if (breakpoint) {
- 					data[breakpoint.getId()] = {
-@@ -244,6 +272,7 @@
- 
- 	private updateBreakpoints(modelData: IDebugEditorModelData, newBreakpoints: IBreakpoint[]): void {
- 		const desiredDecorations = this.createBreakpointDecorations(modelData.model, newBreakpoints);
-+<<<<<<< .our
- 		let breakpointDecorationIds: string[];
- 		try {
- 			this.ignoreDecorationsChangedEvent = true;
-@@ -254,6 +283,17 @@
- 
- 		modelData.breakpointDecorations = breakpointDecorationIds.map((decorationId, index) =>
- 			({ decorationId, modelId: newBreakpoints[index].getId(), range: desiredDecorations[index].range }));
-+=======
-+		try {
-+			this.ignoreDecorationsChangedEvent = true;
-+			modelData.breakpointDecorationIds = modelData.model.deltaDecorations(modelData.breakpointDecorationIds, desiredDecorations);
-+		} finally {
-+			this.ignoreDecorationsChangedEvent = false;
-+		}
-+		modelData.breakpointModelIds = newBreakpoints.map(nbp => nbp.getId());
-+		modelData.breakpointDecorationsAsMap.clear();
-+		modelData.breakpointDecorationIds.forEach((decorationId, index) => modelData.breakpointDecorationsAsMap.set(decorationId, desiredDecorations[index].range));
-+>>>>>>> .their
- 	}
- 
- 	private createBreakpointDecorations(model: ITextModel, breakpoints: ReadonlyArray<IBreakpoint>): { range: Range; options: IModelDecorationOptions; }[] {
-changed in both
-  base   100644 8c2ce64e7704505fe3638e03656e2ba633b31279 src/vs/workbench/parts/debug/electron-browser/debugService.ts
-  our    100644 a5e2dcee7a0eb14bc388d84c6c7cac591067b1b2 src/vs/workbench/parts/debug/electron-browser/debugService.ts
-  their  100644 7e2a70c1abcc8bd031ddf9bee8e5a6a7023faf0d src/vs/workbench/parts/debug/electron-browser/debugService.ts
-@@ -1059,6 +1059,7 @@
- 				return TPromise.wrapError(errors.create(errorMessage));
- 			}
- 
-+<<<<<<< .our
- 			function once(kind: TaskEventKind, event: Event<TaskEvent>): Event<TaskEvent> {
- 				return (listener, thisArgs = null, disposables?) => {
- 					const result = event(e => {
-@@ -1070,6 +1071,8 @@
- 					return result;
- 				};
- 			}
-+=======
-+>>>>>>> .their
- 			// If a task is missing the problem matcher the promise will never complete, so we need to have a workaround #35340
- 			let taskStarted = false;
- 			const promise = this.taskService.getActiveTasks().then(tasks => {
-@@ -1077,11 +1080,16 @@
- 					// task is already running - nothing to do.
- 					return TPromise.as(null);
- 				}
-+<<<<<<< .our
- 				this.toDisposeOnSessionEnd.get(sessionId).push(
- 					once(TaskEventKind.Active, this.taskService.onDidStateChange)(() => {
- 						taskStarted = true;
- 					})
- 				);
-+=======
-+
-+				this.toDispose.push(this.taskService.addOneTimeListener(TaskServiceEvents.Active, () => taskStarted = true));
-+>>>>>>> .their
- 				const taskPromise = this.taskService.run(task);
- 				if (task.isBackground) {
- 					return new TPromise((c, e) => this.toDisposeOnSessionEnd.get(sessionId).push(
-changed in both
-  base   100644 98c764dc8c761898fa3fce1d4325b4ec5a703bf9 src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
-  our    100644 3bfb6cffba943bf68a9fa9c24fb1903c66dd3fad src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
-  their  100644 51ebc297e05138efc7d37d7e7f9e7b1dd2956239 src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
-@@ -239,8 +239,12 @@
- 			names.push(name);
- 		}
- 
-+<<<<<<< .our
- 		if (names.length) {
- 			return this.extensionsWorkbenchService.queryGallery({ names, source: 'queryById' })
-+=======
-+			return this.extensionsWorkbenchService.queryGallery({ names: [name], source: 'queryById' })
-+>>>>>>> .their
- 				.then(pager => new PagedModel(pager));
- 		}
- 
-@@ -357,6 +361,7 @@
- 		return this.extensionsWorkbenchService.queryLocal()
- 			.then(result => result.filter(e => e.type === LocalExtensionType.User))
- 			.then(local => {
-+<<<<<<< .our
- 				const fileBasedRecommendations = this.tipsService.getFileBasedRecommendations();
- 				const othersPromise = this.tipsService.getOtherRecommendations();
- 				const workspacePromise = this.tipsService.getWorkspaceRecommendations();
-@@ -380,6 +385,22 @@
- 								};
- 							})
- 						});
-+=======
-+				const installedExtensions = local.map(x => `${x.publisher}.${x.name}`);
-+				let fileBasedRecommendations = this.tipsService.getFileBasedRecommendations();
-+				let others = this.tipsService.getOtherRecommendations();
-+
-+				return this.tipsService.getWorkspaceRecommendations()
-+					.then(workspaceRecommendations => {
-+						const names = this.getTrimmedRecommendations(installedExtensions, value, fileBasedRecommendations, others, workspaceRecommendations);
-+
-+						/* __GDPR__
-+							"extensionAllRecommendations:open" : {
-+								"count" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-+							}
-+						*/
-+						this.telemetryService.publicLog('extensionAllRecommendations:open', { count: names.length });
-+>>>>>>> .their
- 						if (!names.length) {
- 							return TPromise.as(new PagedModel([]));
- 						}
-@@ -414,7 +435,9 @@
- 		return this.extensionsWorkbenchService.queryLocal()
- 			.then(result => result.filter(e => e.type === LocalExtensionType.User))
- 			.then(local => {
-+				const installedExtensions = local.map(x => `${x.publisher}.${x.name}`);
- 				let fileBasedRecommendations = this.tipsService.getFileBasedRecommendations();
-+<<<<<<< .our
- 				const othersPromise = this.tipsService.getOtherRecommendations();
- 				const workspacePromise = this.tipsService.getWorkspaceRecommendations();
- 
-@@ -442,6 +465,25 @@
- 							})
- 						});
- 
-+=======
-+				let others = this.tipsService.getOtherRecommendations();
-+
-+				return this.tipsService.getWorkspaceRecommendations()
-+					.then(workspaceRecommendations => {
-+						workspaceRecommendations = workspaceRecommendations.map(x => x.toLowerCase());
-+						fileBasedRecommendations = fileBasedRecommendations.filter(x => workspaceRecommendations.indexOf(x.toLowerCase()) === -1);
-+						others = others.filter(x => workspaceRecommendations.indexOf(x.toLowerCase()) === -1);
-+
-+						const names = this.getTrimmedRecommendations(installedExtensions, value, fileBasedRecommendations, others, []);
-+
-+						/* __GDPR__
-+							"extensionRecommendations:open" : {
-+								"count" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-+							}
-+						*/
-+						this.telemetryService.publicLog('extensionRecommendations:open', { count: names.length });
-+
-+>>>>>>> .their
- 						if (!names.length) {
- 							return TPromise.as(new PagedModel([]));
- 						}
-removed in local
-  base   100644 d7b128a2b1bd742d321aee31cf07c5f508621e9d src/vs/workbench/parts/files/browser/views/explorerViewer.ts
-  their  100644 de60078343b542de0d665d8572612302384a3b6a src/vs/workbench/parts/files/browser/views/explorerViewer.ts
-removed in local
-  base   100644 1b755f1d0d336b338ec8bf7da70db2887011545b src/vs/workbench/parts/markers/browser/markersPanelActions.ts
-  their  100644 ddb0a8b77bee2fa156fbaeaa48736f946754ce48 src/vs/workbench/parts/markers/browser/markersPanelActions.ts
-removed in local
-  base   100644 1098da633a11ab4661ddeddbeb40d9bf25a6aec9 src/vs/workbench/parts/markers/common/messages.ts
-  their  100644 86438ee287551d637a3a8f7e80639b9cdb1adff9 src/vs/workbench/parts/markers/common/messages.ts
-removed in local
-  base   100644 0e51795e53b9604211c13ecf76be923ed062de5c src/vs/workbench/parts/search/browser/searchViewlet.ts
-  their  100644 c2d8a0d9612503848c79ae8d4f91d5c145f8415a src/vs/workbench/parts/search/browser/searchViewlet.ts
-changed in both
-  base   100644 7967cacab4e3a492af5542e94b7ba96cddc56231 src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts
-  our    100644 9ad196cfe57cdeb9bba5be3c7c4200ac932dd842 src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts
-  their  100644 019239497905181a99116cce6329f9fbc68c1056 src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts
diff --git a/app/test/fixtures/merge-parser/vscode/merge-release-1.19-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-release-1.19-into-master.txt
deleted file mode 100644
index 858013c06dd..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-release-1.19-into-master.txt
+++ /dev/null
@@ -1,7402 +0,0 @@
-changed in both
-  base   100644 26b896ce817e158980c2faf2d5348fa12442e445 build/gulpfile.vscode.js
-  our    100644 d79071e56bcfc53b3448052cc08bd7247bd7e789 build/gulpfile.vscode.js
-  their  100644 92cb2a1d91c8cbba8ed4fc0a289b88ef0c425463 build/gulpfile.vscode.js
-@@ -44,7 +44,15 @@
- 	.concat(baseModules);
- 
- // Build
-+<<<<<<< .our
- const builtInExtensions = require('./builtInExtensions.json');
-+=======
-+
-+const builtInExtensions = [
-+	{ name: 'ms-vscode.node-debug', version: '1.19.8' },
-+	{ name: 'ms-vscode.node-debug2', version: '1.19.4' }
-+];
-+>>>>>>> .their
- 
- const excludedExtensions = [
- 	'vscode-api-tests',
-changed in both
-  base   100644 ecb551df3e937d0ea833d996af65b63c24efcbdf extensions/git/package.json
-  our    100644 712f071eb3a07013f5d0d6a279de9bb561020d87 extensions/git/package.json
-  their  100644 2d5b4e3886c90cb6242d51d960e8a510d08e45ad extensions/git/package.json
-@@ -1196,16 +1196,25 @@
-     "byline": "^5.0.0",
-     "file-type": "^7.2.0",
-     "iconv-lite": "0.4.19",
-+<<<<<<< .our
-     "jschardet": "^1.6.0",
-     "vscode-extension-telemetry": "0.0.18",
-     "vscode-nls": "^3.2.4",
-+=======
-+    "vscode-extension-telemetry": "0.0.8",
-+    "vscode-nls": "2.0.2",
-+>>>>>>> .their
-     "which": "^1.3.0"
-   },
-   "devDependencies": {
-     "@types/byline": "4.2.31",
-     "@types/file-type": "^5.2.1",
-     "@types/mocha": "2.2.43",
-+<<<<<<< .our
-     "@types/node": "^8.10.25",
-+=======
-+    "@types/node": "7.0.43",
-+>>>>>>> .their
-     "@types/which": "^1.0.28",
-     "mocha": "^3.2.0"
-   }
-changed in both
-  base   100644 cb8e054e90a1a32073e97b23e48064f19a588157 extensions/git/src/autofetch.ts
-  our    100644 758dc82182cdb58a9186a39aa2659b44fa97567d extensions/git/src/autofetch.ts
-  their  100644 ef309483297d386f58bd4ef31501529c584a7fd2 extensions/git/src/autofetch.ts
-@@ -5,7 +5,7 @@
- 
- 'use strict';
- 
--import { workspace, Disposable, EventEmitter, Memento, window, MessageItem, ConfigurationTarget } from 'vscode';
-+import { workspace, Disposable, EventEmitter, Memento, window, MessageItem, ConfigurationTarget, commands, Uri } from 'vscode';
- import { GitErrorCodes } from './git';
- import { Repository, Operation } from './repository';
- import { eventToPromise, filterEvent, onceEvent } from './util';
-@@ -54,14 +54,24 @@
- 		}
- 
- 		const yes: MessageItem = { title: localize('yes', "Yes") };
-+		const readMore: MessageItem = { title: localize('read more', "Read More") };
- 		const no: MessageItem = { isCloseAffordance: true, title: localize('no', "No") };
- 		const askLater: MessageItem = { title: localize('not now', "Ask Me Later") };
-+<<<<<<< .our
- 		const result = await window.showInformationMessage(localize('suggest auto fetch', "Would you like Code to [periodically run 'git fetch']({0})?", 'https://go.microsoft.com/fwlink/?linkid=865294'), yes, no, askLater);
-+=======
-+		const result = await window.showInformationMessage(localize('suggest auto fetch', "Would you like Code to periodically run `git fetch`?"), yes, readMore, no, askLater);
-+>>>>>>> .their
- 
- 		if (result === askLater) {
- 			return;
- 		}
- 
-+		if (result === readMore) {
-+			commands.executeCommand('vscode.open', Uri.parse('https://go.microsoft.com/fwlink/?linkid=865294'));
-+			return this.onFirstGoodRemoteOperation();
-+		}
-+
- 		if (result === yes) {
- 			const gitConfig = workspace.getConfiguration('git');
- 			gitConfig.update('autofetch', true, ConfigurationTarget.Global);
-changed in both
-  base   100644 17e6cd299422a44ab11cc2e5adb1803b8b491a20 extensions/git/src/git.ts
-  our    100644 a360264a394dd40505d22501f165404fbe228c50 extensions/git/src/git.ts
-  their  100644 fd19979b5c1dd0b86a3dfdab92854741bbb2b571 extensions/git/src/git.ts
-changed in both
-  base   100644 a28d386c38b8bba128ed36e274bff83c11e2a67c extensions/git/src/model.ts
-  our    100644 f28f71324cae2e95795cedcf48d76d9440a0bec8 extensions/git/src/model.ts
-  their  100644 a7de90be236a838cea567a513bfd3012aa73bce7 extensions/git/src/model.ts
-@@ -349,6 +349,15 @@
- 
- 		if (hint instanceof Uri) {
- 			let resourcePath: string;
-+<<<<<<< .our
-+=======
-+
-+			if (hint.scheme === 'git') {
-+				resourcePath = fromGitUri(hint).path;
-+			} else {
-+				resourcePath = hint.fsPath;
-+			}
-+>>>>>>> .their
- 
- 			if (hint.scheme === 'git') {
- 				resourcePath = fromGitUri(hint).path;
-changed in both
-  base   100644 c400a818d9db65a837f3f6b72e7f0c06dfc747ad extensions/git/src/repository.ts
-  our    100644 c2c9a2f344d553fd490133027cf31e67b3c21aa2 extensions/git/src/repository.ts
-  their  100644 bd032c0ac93982b3488857749004cf8077f07ad7 extensions/git/src/repository.ts
-changed in both
-  base   100644 9f5376164a697f6ec0459f4153a62597d76fb901 extensions/git/yarn.lock
-  our    100644 cf3f64be85380b9d42abc452055ff323ba258bce extensions/git/yarn.lock
-  their  100644 a9d4c679d30709d1bd529d318ada27c6eb9944ed extensions/git/yarn.lock
-@@ -30,6 +30,7 @@
-   version "1.0.28"
-   resolved "https://registry.yarnpkg.com/@types/which/-/which-1.0.28.tgz#016e387629b8817bed653fe32eab5d11279c8df6"
- 
-+<<<<<<< .our
- applicationinsights@1.0.1:
-   version "1.0.1"
-   resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-1.0.1.tgz#53446b830fe8d5d619eee2a278b31d3d25030927"
-@@ -37,6 +38,11 @@
-     diagnostic-channel "0.2.0"
-     diagnostic-channel-publishers "0.2.1"
-     zone.js "0.7.6"
-+=======
-+applicationinsights@0.18.0:
-+  version "0.18.0"
-+  resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-0.18.0.tgz#162ebb48a383408bc4de44db32b417307f45bbc1"
-+>>>>>>> .their
- 
- balanced-match@^1.0.0:
-   version "1.0.0"
-@@ -145,10 +151,13 @@
-   version "2.0.0"
-   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
- 
-+<<<<<<< .our
- jschardet@^1.6.0:
-   version "1.6.0"
-   resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-1.6.0.tgz#c7d1a71edcff2839db2f9ec30fc5d5ebd3c1a678"
- 
-+=======
-+>>>>>>> .their
- json3@3.3.2:
-   version "3.3.2"
-   resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
-@@ -272,6 +281,13 @@
-   resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
-   dependencies:
-     isexe "^2.0.0"
-+<<<<<<< .our
-+=======
-+
-+winreg@1.2.3:
-+  version "1.2.3"
-+  resolved "https://registry.yarnpkg.com/winreg/-/winreg-1.2.3.tgz#93ad116b2696da87d58f7265a8fcea5254a965d5"
-+>>>>>>> .their
- 
- wrappy@1:
-   version "1.0.2"
-changed in both
-  base   100644 c956f42aa07fd50d0e838c567a70990f062ffcef i18n/chs/extensions/emmet/package.i18n.json
-  our    100644 5cf0382870fbe5abfd1dea23749ad88b51794f9a i18n/chs/extensions/emmet/package.i18n.json
-  their  100644 631e7728eee66bfa31ef20447c0311132bc58275 i18n/chs/extensions/emmet/package.i18n.json
-@@ -55,6 +55,7 @@
- 	"emmetPreferencesFilterCommentTrigger": "用半角逗号 (\",\") 隔开的属性名缩写的数组，将由注释筛选器应用",
- 	"emmetPreferencesFormatNoIndentTags": "表示不应向内缩进的标记名称数组",
- 	"emmetPreferencesFormatForceIndentTags": "表示应始终向内缩进的标记名称数组",
-+<<<<<<< .our
- 	"emmetPreferencesAllowCompactBoolean": "若为 \"true\"，将生成紧凑型布尔属性",
- 	"emmetPreferencesCssWebkitProperties": "Emmet 缩写中使用的由 \"-\" 打头有 \"webkit\" 前缀的 CSS 属性，使用半角逗号 (\",\") 进行分隔。若要始终避免 \"webkit\" 前缀，请设为空字符串。",
- 	"emmetPreferencesCssMozProperties": "Emmet 缩写中使用的由 \"-\" 打头有 \"moz\" 前缀的 CSS 属性，使用半角逗号 (\",\") 进行分隔。若要始终避免 \"moz\" 前缀，请设为空字符串。",
-@@ -62,4 +63,7 @@
- 	"emmetPreferencesCssMsProperties": "Emmet 缩写中使用的由 \"-\" 打头有 \"ms\" 前缀的 CSS 属性，使用半角逗号 (\",\") 进行分隔。若要始终避免 \"ms\" 前缀，请设为空字符串。",
- 	"emmetPreferencesCssFuzzySearchMinScore": "显示的缩写模糊匹配应达到的最低分数 (0 到 1 之间)。较低的值可能使匹配错误变多，较高的值可能将不会显示应有的匹配项。",
- 	"emmetOptimizeStylesheetParsing": "当设置为 false 时，将分析整个文件并确定当前位置能否展开 Emmet 缩写。当设置为 true 时，则仅在 CSS/SCSS/LESS 文件中进行分析。"
-+=======
-+	"emmetPreferencesAllowCompactBoolean": "若为 \"true\"，将生成紧凑型布尔属性"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 2b05a1b187dc9a88939ee0ad30ff3272dcaecb70 i18n/chs/extensions/git/out/commands.i18n.json
-  our    100644 04fae89946b4fff2a3f253e57b9b96d137dedd28 i18n/chs/extensions/git/out/commands.i18n.json
-  their  100644 8f5f2a83f793b721a04539cf46eadfc8f5fa1ec5 i18n/chs/extensions/git/out/commands.i18n.json
-@@ -10,8 +10,16 @@
- 	"remote branch at": "{0} 处的远程分支",
- 	"create branch": "$(plus) 创建新分支",
- 	"repourl": "存储库 URL",
-+<<<<<<< .our
- 	"selectFolder": "选择存储库位置",
- 	"cloning": "正在克隆 Git 存储库“{0}”...",
-+=======
-+	"parent": "父目录",
-+	"cancel": "$(sync~spin) 正在克隆存储库... 点击取消",
-+	"cancel tooltip": "取消克隆",
-+	"cloning": "正在克隆 Git 存储库...",
-+	"openrepo": "打开存储库",
-+>>>>>>> .their
- 	"proposeopen": "是否要打开已克隆存储库?",
- 	"openrepo": "打开存储库",
- 	"add": "添加到工作区",
-changed in both
-  base   100644 19364485e2eaec424f694dee24986c468805c54c i18n/chs/extensions/git/out/main.i18n.json
-  our    100644 3af01415f05ae75fb174e6a205b809fd4906163a i18n/chs/extensions/git/out/main.i18n.json
-  their  100644 99ef376ae53a527bd455fffe27e3f733f5a7d42f i18n/chs/extensions/git/out/main.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,10 @@
- 	],
- 	"looking": "正在查找 Git: {0}",
- 	"using git": "将使用位于 {1} 的 Git {0}",
-+=======
-+	"looking": "在 {0} 查找 Git 中",
-+	"using git": "使用 {1} 中的 Git {0}",
-+>>>>>>> .their
- 	"downloadgit": "下载 Git",
- 	"neverShowAgain": "不再显示",
- 	"notfound": "未找到 Git。请安装 Git，或在 \"git.path\" 设置中配置。",
-changed in both
-  base   100644 3f973cac6735b73b8c43c8c45097beff4ff53337 i18n/chs/extensions/git/package.i18n.json
-  our    100644 7c2a3b49c9f848f60d2957657294486b061a17aa i18n/chs/extensions/git/package.i18n.json
-  their  100644 cb8443b7aecb74a6659f99fc88dc857dc7b6853c i18n/chs/extensions/git/package.i18n.json
-@@ -62,7 +62,7 @@
- 	"config.autorefresh": "是否启用自动刷新",
- 	"config.autofetch": "是否启用自动拉取",
- 	"config.enableLongCommitWarning": "是否针对长段提交消息进行警告",
--	"config.confirmSync": "同步 Git 存储库前进行确认",
-+	"config.confirmSync": "同步 GIT 存储库前请先进行确认",
- 	"config.countBadge": "控制 Git 徽章计数器。“all”计算所有更改。“tracked”只计算跟踪的更改。“off”关闭此功能。",
- 	"config.checkoutType": "控制运行“签出到...”功能时列出的分支类型。\"all\" 显示所有 refs，\"local\" 只显示本地分支，\"tags\" 只显示标签，\"remote\" 只显示远程分支。",
- 	"config.ignoreLegacyWarning": "忽略“旧版 Git”警告",
-changed in both
-  base   100644 39c7186301155adb6f0e22a0001cfdb52cc9ee6a i18n/chs/src/vs/code/node/cliProcessMain.i18n.json
-  our    100644 315b275c12b042f3554db9f94a7484488ec858d9 i18n/chs/src/vs/code/node/cliProcessMain.i18n.json
-  their  100644 0b63356dd4030ecf86e9c02bfed5c46ff9a2c5f5 i18n/chs/src/vs/code/node/cliProcessMain.i18n.json
-changed in both
-  base   100644 3aa5c1a68d422d3da3225950b0e91b1e6e3bbc7f i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 e4c993e2df857650110681bbfaaa48507f4e2ec6 i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 9c145d8c4d96ed4d4ed34fe0011175c2a7f1e61c i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -35,7 +35,11 @@
- 	"minimap.maxColumn": "限制最小映射的宽度，尽量多地呈现特定数量的列",
- 	"find.seedSearchStringFromSelection": "控制是否将编辑器的选中内容作为搜索词填入到查找组件",
- 	"find.autoFindInSelection": "控制当编辑器中选中多个字符或多行文字时是否开启“在选定内容中查找”选项 ",
-+<<<<<<< .our
- 	"find.globalFindClipboard": "控制“查找”小组件是否读取或修改 macOS 的共享查找剪贴板",
-+=======
-+	"find.globalFindClipboard": "控制查找小组件是否应在 macOS 上读取或修改在应用间共享的查找剪贴板",
-+>>>>>>> .their
- 	"wordWrap.off": "永不换行。",
- 	"wordWrap.on": "将在视区宽度处换行。",
- 	"wordWrap.wordWrapColumn": "将在 \"editor.wordWrapColumn\" 处换行。",
-@@ -88,7 +92,11 @@
- 	"renderControlCharacters": "控制编辑器是否应呈现控制字符",
- 	"renderIndentGuides": "控制编辑器是否应呈现缩进参考线",
- 	"renderLineHighlight": "控制编辑器应如何呈现当前行突出显示，可能为“无”、“装订线”、“线”和“全部”。",
-+<<<<<<< .our
- 	"codeLens": "控制是否在编辑器中显示 CodeLens",
-+=======
-+	"codeLens": "控制编辑器是否显示 CodeLens",
-+>>>>>>> .their
- 	"folding": "控制编辑器是否启用代码折叠功能",
- 	"foldingStrategyAuto": "若语言特定的折叠策略可用，将直接使用；否则，将回退到基于缩进的折叠策略。",
- 	"foldingStrategyIndentation": "始终使用基于缩进的折叠策略",
-changed in both
-  base   100644 ad84081b84e0488ac73cb4ec78a25529bc0f9197 i18n/chs/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 264f0668a4da9659a58613193f24657a9dfbbc79 i18n/chs/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 168dd2fb958ae830c3931ca87f2d3b51f2177c19 i18n/chs/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -8,8 +8,12 @@
- 	],
- 	"lineHighlight": "光标所在行高亮内容的背景颜色。",
- 	"lineHighlightBorderBox": "光标所在行四周边框的背景颜色。",
-+<<<<<<< .our
- 	"rangeHighlight": "高亮范围的背景色，像是由 \"Quick Open\" 和“查找”功能高亮的范围。颜色必须透明，使其不会挡住下方的其他元素。",
- 	"rangeHighlightBorder": "高亮区域边框的背景颜色。",
-+=======
-+	"rangeHighlight": "高亮范围的背景色，例如由 \"Quick Open\" 和“查找”功能高亮的范围。",
-+>>>>>>> .their
- 	"caret": "编辑器光标颜色。",
- 	"editorCursorBackground": "编辑器光标的背景色。可以自定义块型光标覆盖字符的颜色。",
- 	"editorWhitespaces": "编辑器中空白字符的颜色。",
-changed in both
-  base   100644 90d90c3c8ff760896db0b9aff96a21495449bac1 i18n/chs/src/vs/editor/contrib/folding/folding.i18n.json
-  our    100644 70ee32779535c1b3f33e38f616afdb2bdcc404a4 i18n/chs/src/vs/editor/contrib/folding/folding.i18n.json
-  their  100644 6ad3874f3bb3300424ae4d08d15f62df9d5bbdc3 i18n/chs/src/vs/editor/contrib/folding/folding.i18n.json
-changed in both
-  base   100644 21c4685e274f86d876f1654c063f9abb54e2cf02 i18n/chs/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  our    100644 d23732f8ae4a1f9b08239592f29e3466b2c23adf i18n/chs/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-  their  100644 d14243882a7e041eb7326c95dffaca2dd93b0761 i18n/chs/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json
-changed in both
-  base   100644 77d5d77fd7b30666ed6d09223a7fe3ea71a795ee i18n/chs/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 9b8e352f2e01c71634dfc189a8ddc9dc7485da94 i18n/chs/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 9a1faa5d9834a9baf000967abbf2ad5cd872c29e i18n/chs/src/vs/platform/environment/node/argv.i18n.json
-@@ -8,10 +8,25 @@
- 	],
- 	"gotoValidation": "\"--goto\" 模式中的参数格式应为 \"FILE(:LINE(:CHARACTER))\"。",
- 	"diff": "将两个文件相互比较。",
-+<<<<<<< .our
- 	"add": "将文件夹添加到上一个活动窗口。",
- 	"goto": "打开路径下的文件并定位到特定行和特定列。",
- 	"newWindow": "强制打开新窗口。",
- 	"reuseWindow": "强制打开上一个活动窗口中的文件或文件夹。",
-+=======
-+	"add": "将文件夹添加到最后一个活动窗口。",
-+	"goto": "打开路径下的文件并定位到特定行和特定列。",
-+	"locale": "要使用的区域设置(例如 en-US 或 zh-TW)。",
-+	"newWindow": "强制创建一个新的 Code 实例。",
-+	"performance": "通过启用 \"Developer: Startup Performance\" 命令开始。",
-+	"prof-startup": "启动期间运行 CPU 探查器",
-+	"inspect-extensions": "允许进行扩展的调试与分析。检查开发人员工具可获取连接 URI。",
-+	"inspect-brk-extensions": "允许在扩展主机在启动后暂停时进行扩展的调试与分析。检查开发人员工具可获取连接 URI。",
-+	"reuseWindow": "在上一活动窗口中强制打开文件或文件夹。",
-+	"userDataDir": "指定存放用户数据的目录。此目录在以 root 身份运行时十分有用。",
-+	"log": "使用的日志级别。默认值为 \"info\"。允许的值为 \"critical\" (关键)、\"error\" (错误)、\"warn\" (警告)、\"info\" (信息)、\"debug\" (调试)、\"trace\" (跟踪) 和 \"off\" (关闭)。",
-+	"verbose": "打印详细输出(隐含 --wait 参数)。",
-+>>>>>>> .their
- 	"wait": "等文件关闭后再返回。",
- 	"locale": "要使用的区域设置(例如 en-US 或 zh-TW)。",
- 	"userDataDir": "指定保存用户数据的目录。可用于打开多个不同的 Code 实例。",
-changed in both
-  base   100644 66040db95cc91f5a1e71fd84bef2b5ec4e4ff9c8 i18n/chs/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
-  our    100644 05a0fa4acd3eb2b012e3da4f0cf2285dbbb6398d i18n/chs/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
-  their  100644 992b3f197f4350ed42e9d586e6413d42e66fc58a i18n/chs/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"vscode.extension.engines.vscode": "对于 VS Code 扩展，指定与其兼容的 VS Code 版本。不能为 *。 例如: ^0.10.5 表示最低兼容 VS Code 版本 0.10.5。",
- 	"vscode.extension.publisher": "VS Code 扩展的发布者。",
- 	"vscode.extension.displayName": "VS Code 库中使用的扩展的显示名称。",
-changed in both
-  base   100644 8b65741ef0b0bb9d6bcaaa2ed4d5eb95f7a284bc i18n/chs/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 c8466983eb9f265f121ef57d4bfbd3223d7f8d81 i18n/chs/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 24ec2fcb7bd484dfd433484d28404685cb08eba2 i18n/chs/src/vs/workbench/electron-browser/actions.i18n.json
-@@ -50,6 +50,30 @@
- 	"moveWindowTabToNewWindow": "将窗口选项卡移动到新窗口",
- 	"mergeAllWindowTabs": "合并所有窗口",
- 	"toggleWindowTabsBar": "切换窗口选项卡栏",
-+<<<<<<< .our
- 	"about": "关于 {0}",
- 	"inspect context keys": "检查上下文键值"
-+=======
-+	"configureLocale": "配置语言",
-+	"displayLanguage": "定义 VSCode 的显示语言。",
-+	"doc": "请参阅 {0}，了解支持的语言列表。",
-+	"restart": "更改此值需要重启 VSCode。",
-+	"fail.createSettings": "无法创建“{0}”({1})。",
-+	"openLogsFolder": "打开日志文件夹",
-+	"showLogs": "显示日志...",
-+	"mainProcess": "主进程",
-+	"sharedProcess": "共享进程",
-+	"rendererProcess": "渲染器进程",
-+	"extensionHost": "扩展主机",
-+	"selectProcess": "选择进程",
-+	"setLogLevel": "设置日志级别",
-+	"trace": "跟踪",
-+	"debug": "调试",
-+	"info": "信息",
-+	"warn": "警告",
-+	"err": "错误",
-+	"critical": "关键",
-+	"off": "关闭",
-+	"selectLogLevel": "选择日志级别"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 0623903445b634561c9d651bbcab36f63ac7d656 i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 d713b18f9f797773516060ccdb111cd56b80034e i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 361a7a420b188c5ab008d480f5aa4918e7c8a4d3 i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -13,9 +13,12 @@
- 	"breakpointAdded": "已添加断点，行 {0}, 文件 {1}",
- 	"breakpointRemoved": "已删除断点，行 {0}，文件 {1}",
- 	"compoundMustHaveConfigurations": "复合项必须拥有 \"configurations\" 属性集，才能启动多个配置。",
-+<<<<<<< .our
- 	"noConfigurationNameInWorkspace": "在工作区中找不到启动配置“{0}”。",
- 	"multipleConfigurationNamesInWorkspace": "工作区中存在多个启动配置“{0}”。请使用文件夹名称来限定配置。",
- 	"noFolderWithName": "无法在复合项“{2}”中为配置“{1}”找到名为“{0}”的文件夹。",
-+=======
-+>>>>>>> .their
- 	"configMissing": "\"launch.json\" 中缺少配置“{0}”。",
- 	"launchJsonDoesNotExist": "\"launch.json\" 不存在。",
- 	"debugRequestNotSupported": "所选调试配置的属性“{0}”的值“{1}”不受支持。",
-changed in both
-  base   100644 3f110c4b49dee83d4421dd2bc8a1a9b5a82391b5 i18n/chs/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-  our    100644 8c7037df74fb847bbd5df3b42dc2835bc7f97189 i18n/chs/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-  their  100644 a463252daaf11c4d10c57631724a2ef9ecad5926 i18n/chs/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-@@ -9,7 +9,10 @@
- 	"name": "扩展名",
- 	"extension id": "扩展标识符",
- 	"preview": "预览版",
-+<<<<<<< .our
- 	"builtin": "内置",
-+=======
-+>>>>>>> .their
- 	"publisher": "发布服务器名称",
- 	"install count": "安装计数",
- 	"rating": "评级",
-changed in both
-  base   100644 e4ad4894419375f7bc18331fc57a3f46e022f54c i18n/chs/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
-  our    100644 260b41bdf21a9f049f3ee732b5f77198f08729a8 i18n/chs/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
-  their  100644 a6c445fa00d0b42abbbf518897d4fb3440e9f89c i18n/chs/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"ratedByUsers": "评价来自 {0} 位用户",
- 	"ratedBySingleUser": "评价来自 1 位用户"
- }
-\ No newline at end of file
-changed in both
-  base   100644 114a1822e0afcfa6ff14184d5aff03cc33ca28a0 i18n/cht/extensions/css/client/out/cssMain.i18n.json
-  our    100644 8d5e76dfac0ce51b0e369ca22e7fe5c482550e3b i18n/cht/extensions/css/client/out/cssMain.i18n.json
-  their  100644 a7dadfd1a6a333d92efe1eaf586909c66447be68 i18n/cht/extensions/css/client/out/cssMain.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -9,4 +10,9 @@
- 	"cssserver.name": "CSS 語言伺服器",
- 	"folding.start": "摺疊區域開始",
- 	"folding.end": "摺疊區域結束"
-+=======
-+	"cssserver.name": "CSS 語言伺服器",
-+	"folding.start": "摺疊區域開始",
-+	"folding.end": "摺疊區域結尾"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7d6aff82b16b43e38d9fc7de67633c50b5bcd13b i18n/cht/extensions/emmet/package.i18n.json
-  our    100644 b3dc8be8bb9ec8fba170590d50c4692dadd9f40f i18n/cht/extensions/emmet/package.i18n.json
-  their  100644 efdcb2b41985f67e9e3d4102ae87b8ca14b7cbcd i18n/cht/extensions/emmet/package.i18n.json
-@@ -55,6 +55,7 @@
- 	"emmetPreferencesFilterCommentTrigger": "必須採用縮寫以套用註解篩選的屬性名稱逗點分隔清單",
- 	"emmetPreferencesFormatNoIndentTags": "陣列的標籤名稱不應向內縮排",
- 	"emmetPreferencesFormatForceIndentTags": "陣列的標籤名稱應總是向內縮排",
-+<<<<<<< .our
- 	"emmetPreferencesAllowCompactBoolean": "若為 true，則生成布林屬性的嚴謹表示法",
- 	"emmetPreferencesCssWebkitProperties": "在以 `-` 開頭的 Emmet 縮寫中使用時，會取得 'webkit' 廠商前綴的逗點分隔 CSS 屬性。設定為空白字串可避免總是取得 'webkit' 前綴。",
- 	"emmetPreferencesCssMozProperties": "在以 `-` 開頭的 Emmet 縮寫中使用時，會取得 'moz' 廠商前綴的逗點分隔 CSS 屬性。設定為空白字串可避免總是取得 'moz' 前綴。",
-@@ -62,4 +63,7 @@
- 	"emmetPreferencesCssMsProperties": "在以 `-` 開頭的 Emmet 縮寫中使用時，會取得 'ms' 廠商前綴的逗點分隔 CSS 屬性。設定為空白字串可避免總是取得 'ms' 前綴。",
- 	"emmetPreferencesCssFuzzySearchMinScore": "模糊比對的縮寫應該達到最低分數(從 0 到 1)。較低數值可能產生錯誤的比對，較高的數值可能會降低可能的比對。",
- 	"emmetOptimizeStylesheetParsing": "當設定為 false 時，將解析整個檔案以確定目前的位置是否適用於展開 Emmet 縮寫。當設定為 true 時，僅會解析 css/scss/less 檔案中目前位置周圍的內容。"
-+=======
-+	"emmetPreferencesAllowCompactBoolean": "若為 true，則生成布林屬性的嚴謹表示法"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 bd190303079b5fd6759c34b167980c9ea97c3188 i18n/cht/extensions/git/out/autofetch.i18n.json
-  our    100644 15e10683f3186e8a5874bd157f3e207ae6f6fd89 i18n/cht/extensions/git/out/autofetch.i18n.json
-  their  100644 78cd65caa1f2df6d3c1ef580c197e00b304c866b i18n/cht/extensions/git/out/autofetch.i18n.json
-@@ -8,6 +8,11 @@
- 	],
- 	"yes": "是",
- 	"no": "否",
-+<<<<<<< .our
- 	"not now": "稍後詢問我",
- 	"suggest auto fetch": "您希望 Code [定期執行 'git fetch']({0}) 嗎?"
-+=======
-+	"not now": "不是現在",
-+	"suggest auto fetch": "是否啟用 Git 儲存庫的自動擷取？"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 24b380b69e3ca1ded6a7505a68eccb87c9cb0231 i18n/cht/extensions/git/out/commands.i18n.json
-  our    100644 f99c465da1ed922e8de7f8c6dfd9a26e886bdd66 i18n/cht/extensions/git/out/commands.i18n.json
-  their  100644 1ace18f1610a2558d62519881c68284f5a1519a1 i18n/cht/extensions/git/out/commands.i18n.json
-@@ -10,12 +10,21 @@
- 	"remote branch at": "位於 {0} 的遠端分支",
- 	"create branch": "$(plus) 建立新的分支",
- 	"repourl": "儲存庫 URL",
-+<<<<<<< .our
- 	"selectFolder": "選擇儲存庫位置",
- 	"cloning": "正在複製 git 存放庫 '{0}'...",
- 	"proposeopen": "要開啟複製的儲存庫嗎?",
- 	"openrepo": "開啟儲存庫",
- 	"add": "新增到工作區",
- 	"proposeopen2": "要開啟以複製的儲存庫, 或將其新增到目前工作區？",
-+=======
-+	"parent": "父目錄",
-+	"cancel": "$ (同步 ~ 旋轉) 複製儲存庫.. 按一下以取消",
-+	"cancel tooltip": "取消複製",
-+	"cloning": "正在複製 Git 儲存庫...",
-+	"openrepo": "開啟儲存庫",
-+	"proposeopen": "要開啟複製的儲存庫嗎?",
-+>>>>>>> .their
- 	"init": "選擇工作區資料夾以初始化 git 儲存庫",
- 	"init repo": "初始化儲存庫",
- 	"create repo": "初始化儲存庫",
-changed in both
-  base   100644 1705b21123ca81ac1900782dffa07afdb5c45e51 i18n/cht/extensions/git/out/main.i18n.json
-  our    100644 ca5e23909a4b0ec334cae0052b8bde03b7e6fce3 i18n/cht/extensions/git/out/main.i18n.json
-  their  100644 b9e759fe01870f2046b09913bb78c58fc5f056d8 i18n/cht/extensions/git/out/main.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"looking": "尋找 git : {0}",
- 	"using git": "正在使用來自 {1} 的 git {0}",
- 	"downloadgit": "下載 Git",
-changed in both
-  base   100644 c21ef00568637ce45a31530ca4c91340887c1b10 i18n/cht/extensions/git/package.i18n.json
-  our    100644 bc042cb15d8c15d6c5568f5c08f9df112417a23c i18n/cht/extensions/git/package.i18n.json
-  their  100644 5bb3d198bb4ea9d48cd0a708de83d915c012f75f i18n/cht/extensions/git/package.i18n.json
-changed in both
-  base   100644 7a77e714d976cb75548f1f8a0a69f2b0f8bea244 i18n/cht/extensions/html/client/out/htmlMain.i18n.json
-  our    100644 0c001145a7ac59f1c3089f766a6b4090cd7547ae i18n/cht/extensions/html/client/out/htmlMain.i18n.json
-  their  100644 d6e7c1e3a63c63a260c1b86b71fdbd269507a04b i18n/cht/extensions/html/client/out/htmlMain.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"htmlserver.name": "HTML 語言伺服器",
- 	"folding.start": "摺疊區域開始",
- 	"folding.end": "摺疊區域結束"
-changed in both
-  base   100644 870789578bf673fc83685bb90104e72c282589b8 i18n/cht/extensions/markdown/out/security.i18n.json
-  our    100644 cc4260be39fbcfcea114d06109122da15a50bcfa i18n/cht/extensions/markdown/out/security.i18n.json
-  their  100644 4aaab7a1cbd20ef5e0671b1b91b55b0122525346 i18n/cht/extensions/markdown/out/security.i18n.json
-@@ -13,8 +13,14 @@
- 	"disable.title": "停用",
- 	"disable.description": "允許所有內容與指令碼執行。不建議",
- 	"moreInfo.title": "詳細資訊",
-+<<<<<<< .our
- 	"enableSecurityWarning.title": "允許此工作區預覽安全性警告",
- 	"disableSecurityWarning.title": "不允許此工作區預覽安全性警告",
- 	"toggleSecurityWarning.description": "不影響內容安全性層級",
-+=======
-+	"enableSecurityWarning.title": "在此工作區中啟用預覽安全警告",
-+	"disableSecurityWarning.title": "禁用此工作區中的預覽安全警告",
-+	"toggleSecurityWarning.description": "不影響內容安全級別",
-+>>>>>>> .their
- 	"preview.showPreviewSecuritySelector.title": "選擇此工作區 Markdown 預覽的安全性設定"
- }
-\ No newline at end of file
-changed in both
-  base   100644 21711a0ff32115fc4fb8daba791304411b135a15 i18n/cht/extensions/merge-conflict/package.i18n.json
-  our    100644 c12550f5f7a2f0bbcc86cc9b2dc8bdeb00874f24 i18n/cht/extensions/merge-conflict/package.i18n.json
-  their  100644 7189e30af1bb633edcecde02a794b3307b805b90 i18n/cht/extensions/merge-conflict/package.i18n.json
-changed in both
-  base   100644 f75533e302e29d4419c9927b66ea5425953a8861 i18n/cht/extensions/typescript/out/features/completionItemProvider.i18n.json
-  our    100644 18117a677b62732505dc8fee924f23d691a3a3c1 i18n/cht/extensions/typescript/out/features/completionItemProvider.i18n.json
-  their  100644 c42d9c7db98bf292529927ca6b7b669292a51c6c i18n/cht/extensions/typescript/out/features/completionItemProvider.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"selectCodeAction": "選擇要套用的程式碼動作",
- 	"acquiringTypingsLabel": "正在擷取 typings...",
- 	"acquiringTypingsDetail": "正在為 IntelliSense 擷取 typings 定義。",
-changed in both
-  base   100644 0311ac8ba64bcadfdac14e3d00f8589ff33bffc1 i18n/cht/src/vs/code/electron-main/main.i18n.json
-  our    100644 3ef3df123cabb9c95180c94f5f15172b93c89d86 i18n/cht/src/vs/code/electron-main/main.i18n.json
-  their  100644 e36aac7561037c3c0d28e491608f7d3624b109b7 i18n/cht/src/vs/code/electron-main/main.i18n.json
-changed in both
-  base   100644 4aad58bdfe62efb19b7443daa2c1ae0d4cc39e30 i18n/cht/src/vs/code/electron-main/menus.i18n.json
-  our    100644 5f037b2a895deac7820d5f0872d4b9af5505b797 i18n/cht/src/vs/code/electron-main/menus.i18n.json
-  their  100644 a9c5252b3c1fca5b04bddb952528b0b3f5219269 i18n/cht/src/vs/code/electron-main/menus.i18n.json
-@@ -161,7 +161,10 @@
- 	"mMergeAllWindows": "合併所有視窗",
- 	"miToggleDevTools": "切換開發人員工具(&&T)",
- 	"miAccessibilityOptions": "協助工具選項(&&O)",
-+<<<<<<< .our
- 	"miOpenProcessExplorerer": "開啟處理序總管 (&&P)",
-+=======
-+>>>>>>> .their
- 	"miReportIssue": "回報問題 (&&I)",
- 	"miWelcome": "歡迎使用(&&W)",
- 	"miInteractivePlayground": "Interactive Playground(&&I)",
-@@ -189,5 +192,12 @@
- 	"miDownloadingUpdate": "正在下載更新...",
- 	"miInstallUpdate": "安裝更新...",
- 	"miInstallingUpdate": "正在安裝更新...",
-+<<<<<<< .our
- 	"miRestartToUpdate": "重新啟動以更新..."
-+=======
-+	"miCheckForUpdates": "查看是否有更新",
-+	"aboutDetail": "版本 {0} \n認可 {1} \n日期 {2} \nShell {3} \n轉譯器 {4} \n節點 {5} \n架構 {6}",
-+	"okButton": "確定",
-+	"copy": "複製(&&C)"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 02ee16e48c2ecf352dc045cb0898033e939fc0c3 i18n/cht/src/vs/code/node/cliProcessMain.i18n.json
-  our    100644 8923a6c9eae030868938f88d9c2d85677f8c0a8c i18n/cht/src/vs/code/node/cliProcessMain.i18n.json
-  their  100644 df13867eaad98b3ccafaf1580201924e2e155c48 i18n/cht/src/vs/code/node/cliProcessMain.i18n.json
-changed in both
-  base   100644 dd7847676ef1276df5e0a197c4da9977487f2034 i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 15a1cfb1f061b73d70aaaf6b56b29fe87aab2b5a i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 71be40322db097c5d8f26877c3ff83baae54bc42 i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json
-changed in both
-  base   100644 0a6abe069657b03d5fd5b1278aec05e59dad8ee0 i18n/cht/src/vs/editor/contrib/folding/folding.i18n.json
-  our    100644 a6a6e14fc003b69bd8bf4429ec95e28c728b51a3 i18n/cht/src/vs/editor/contrib/folding/folding.i18n.json
-  their  100644 5ca5c126d3a29eba148fcbed984fec423c505581 i18n/cht/src/vs/editor/contrib/folding/folding.i18n.json
-changed in both
-  base   100644 09f8c0cfeafb6fa20ab921aa24d0ed1e93f1de52 i18n/cht/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 d84006726480d7b55e5c9363c0ac7b4dbb203a6d i18n/cht/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 0874564b4c90f40b96b0ab41970b164eed784770 i18n/cht/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,8 +10,21 @@
- 	"diff": "互相比較兩個檔案。",
- 	"add": "將資料夾新增至上一個使用中的視窗。",
- 	"goto": "在路徑上的指定行與字元位置開啟檔案。",
-+<<<<<<< .our
- 	"newWindow": "強制開啟新視窗。",
- 	"reuseWindow": "強制在上一個使用中的視窗開啟檔案或資料夾。",
-+=======
-+	"locale": "要使用的地區設定 (例如 en-US 或 zh-TW)。",
-+	"newWindow": "強制執行 Code 的新執行個體。",
-+	"performance": "在已啟用 'Developer: Startup Performance' 命令的情況下開始。",
-+	"prof-startup": "啟動時執行 CPU 分析工具",
-+	"inspect-extensions": "允許對擴充功能進行除錯和分析。檢查開發工具的連接 uri。",
-+	"inspect-brk-extensions": "允許對擴展主機在啟動後暫停擴充功能進行除錯和分析。檢查開發工具中的連接 uri。",
-+	"reuseWindow": "強制在最近使用的視窗中開啟檔案或資料夾。",
-+	"userDataDir": "指定保留使用者資料的目錄，這在以根目錄身分執行時有用。",
-+	"log": "使用的日誌級別。預設為\"訊息\"。允許的值是 \"關鍵\"、\"錯誤\"、\"警告\"、\"訊息\"、\"偵錯\"、\"追蹤\"、\"關閉\"。",
-+	"verbose": "列印詳細資訊輸出 (表示 --wait)。",
-+>>>>>>> .their
- 	"wait": "等候檔案在傳回前關閉。",
- 	"locale": "要使用的地區設定 (例如 en-US 或 zh-TW)。",
- 	"userDataDir": "指定用於保存使用者資料的目錄。可用於開啟多個相異的 Code 執行個體。",
-changed in both
-  base   100644 36f7fd1af506e58b300150762147e463e283f0e3 i18n/cht/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
-  our    100644 66c72f5e62ff3b5a723eff7d1186fc2bd2be572f i18n/cht/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
-  their  100644 3bffab1e21ec750be49f296d3523b67a25b17fed i18n/cht/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
-changed in both
-  base   100644 45d26626e6064c0863fbc82e8455ce07ab094b82 i18n/cht/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
-  our    100644 31e28bee8b2fa6ab24576143f66210f3f3343428 i18n/cht/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
-  their  100644 479d20a33a8937d39be3f8b0ebcc3764632ba01c i18n/cht/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"largeNumberBadge": "10 k +",
- 	"badgeTitle": "{0} - {1}",
- 	"additionalViews": "其他檢視",
-changed in both
-  base   100644 b7ccbfd633892b28a01364810231a3b9c3058110 i18n/cht/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 8c04c44fd8aa84aafd673c4f7e7c350b8ac52c3b i18n/cht/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 daf7e22d21e520f6d3f111d84ce8ecbf63d29995 i18n/cht/src/vs/workbench/electron-browser/actions.i18n.json
-@@ -50,6 +50,30 @@
- 	"moveWindowTabToNewWindow": "將視窗索引標籤移至新的視窗",
- 	"mergeAllWindowTabs": "合併所有視窗",
- 	"toggleWindowTabsBar": "切換視窗索引標籤列",
-+<<<<<<< .our
- 	"about": "關於 {0}",
- 	"inspect context keys": "檢查功能表內容"
-+=======
-+	"configureLocale": "設定語言",
-+	"displayLanguage": "定義 VSCode 的顯示語言。",
-+	"doc": "如需支援的語言清單，請參閱 {0}。",
-+	"restart": "改變設定值後需要重新啟動 VSCode.",
-+	"fail.createSettings": "無法建立 '{0}' ({1})。",
-+	"openLogsFolder": "開啟紀錄資料夾",
-+	"showLogs": "顯示紀錄...。",
-+	"mainProcess": "主要",
-+	"sharedProcess": "共用",
-+	"rendererProcess": "轉譯器",
-+	"extensionHost": "延伸主機",
-+	"selectProcess": "選取程序",
-+	"setLogLevel": "設定記錄層級",
-+	"trace": "追蹤",
-+	"debug": "偵錯",
-+	"info": "資訊",
-+	"warn": "警告",
-+	"err": "錯誤",
-+	"critical": "關鍵",
-+	"off": "關閉",
-+	"selectLogLevel": "選擇日誌級別"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 26b36bafb2e69ecc7fb6315e821dd16b46a5b45d i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 bf339c91e8587ec53fe81a294c54ddc0f5aad010 i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 33e2c22230a0dd4f4c910e9234080655668a9c6b i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,8 +35,14 @@
- 	"panelDefaultLocation": "控制面板的預設位置。可顯示在 Workbench 的底部或是右方。",
- 	"statusBarVisibility": "控制 Workbench 底端狀態列的可視性。",
- 	"activityBarVisibility": "控制活動列在 workbench 中的可見度。",
-+<<<<<<< .our
- 	"viewVisibility": "控制檢視標頭動作的可見度。檢視標頭動作可為總是可見，或在檢視為焦點或暫留時才可見。",
- 	"fontAliasing": "控制工作台中的字型鋸齒化方法。\n- default: 子像素字型平滑化。在多數非 Retina 的顯示器上，這會使文字變得最鮮明\n- antialiased: 在像素層級上使字型平滑化，與子像素相對。能夠使字型整體顯示較亮\n- none: 停用字型平滑化。顯示的文字會帶有鋸齒狀銳利邊緣\n- auto: 根據顯示器的 DPI 自動套用 `default` 或 `antialiased`。",
-+=======
-+	"closeOnFileDelete": "控制顯示檔案的編輯器是否應在其他處理序刪除或重新命名該檔案時自動關閉。若停用此選項，當發生前述狀況時，編輯器會保持開啟，並呈現已變更的狀態。請注意，從應用程式內刪除一律會關閉編輯器，但已變更的檔案在資料未儲存前一律不會關閉。",
-+	"enableNaturalLanguageSettingsSearch": "控制是否啟用自然語言搜尋模式。",
-+	"fontAliasing": "在 Workbench 中控制字型鋸齒化的方法。- 預設: 子像素字型平滑處理。在大部分非 Retina 顯示器上會顯示出最銳利的文字- 已消除鋸齒: 相對於子像素，根據像素層級平滑字型。可讓字型整體顯得較細- 無: 停用字型平滑處理。文字會以鋸齒狀的銳邊顯示 ",
-+>>>>>>> .their
- 	"workbench.fontAliasing.default": "子像素字型平滑處理。在大部分非 Retina 顯示器上會顯示出最銳利的文字。",
- 	"workbench.fontAliasing.antialiased": "相對於子像素，根據像素層級平滑字型。可以讓字型整體顯得較細。",
- 	"workbench.fontAliasing.none": "禁用字體平滑.文字將會顯示鋸齒狀與鋒利的邊緣.",
-changed in both
-  base   100644 ff4a8ed693ff8b66de951953ff5ea4c83c8bd205 i18n/cht/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  our    100644 f3039d0a00bdbfdd171e2596b342a43ed854983d i18n/cht/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  their  100644 e0175b5cdfc40e05833fb4a1ac2c7ed43b53e9b8 i18n/cht/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-@@ -21,12 +21,20 @@
- 	"allowBreakpointsEverywhere": "允許在任何檔案設定中斷點",
- 	"openExplorerOnEnd": "自動於偵錯工作階段結束時開啟總管檢視",
- 	"inlineValues": "在偵錯時於編輯器以內嵌方式顯示變數值",
-+<<<<<<< .our
- 	"toolBarLocation": "控制偵錯工具列的位置。在所有檢視中 \"floating\" (浮動)、在偵錯檢視中 \"docked\" (停駐)，或 \"hidden\" (隱藏)",
-+=======
-+	"hideActionBar": "控制是否應隱藏浮點偵錯動作列",
-+>>>>>>> .their
- 	"never": "一律不在狀態列顯示偵錯",
- 	"always": "遠用在狀態列中顯示偵錯",
- 	"onFirstSessionStart": "只有第一次啟動偵錯後才在狀態列中顯示偵錯",
- 	"showInStatusBar": "控制何時應該顯示偵錯狀態列",
-+<<<<<<< .our
- 	"openDebug": "控制是否應於偵錯工作階段開始時開啟偵錯檢視。",
- 	"enableAllHovers": "控制偵錯期間是否應啟用非偵錯暫留。若為 true，會呼叫暫留提供者提供暫留。即使此設定為 true，一般暫留也不會顯示。",
-+=======
-+	"openDebug": "控制偵錯 viewlet 是否在 debugging session 啟動時開啟。",
-+>>>>>>> .their
- 	"launch": "全域偵錯啟動組態。應當做在工作區之間共用的 'launch.json' 替代方案使用"
- }
-\ No newline at end of file
-changed in both
-  base   100644 4a1b22f7293f310d48770f57f6fcdbfb9cffe2a3 i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 a922616389e0d8d38ea207e5428979e5adf305ab i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 4deaf2ddc5d54885ced081ae3fcaf491c8b00af0 i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -13,12 +13,18 @@
- 	"breakpointAdded": "已新增中斷點，行 {0}，檔案 {1}",
- 	"breakpointRemoved": "已移除中斷點，行 {0}，檔案 {1}",
- 	"compoundMustHaveConfigurations": "複合必須設有 \"configurations\" 屬性，才能啟動多個組態。",
-+<<<<<<< .our
- 	"noConfigurationNameInWorkspace": "無法在工作區中找到啟動組態 '{0}'。",
- 	"multipleConfigurationNamesInWorkspace": "工作區中有多個啟動組態 '{0}'。請使用資料夾名稱以符合組態。",
- 	"noFolderWithName": "在複合 '{2}' 的組態 '{1}' 中找不到名稱為 '{0}' 的資料夾。",
- 	"configMissing": "'launch.json' 中遺漏組態 '{0}'。",
- 	"launchJsonDoesNotExist": "'launch.json' 不存在。",
- 	"debugRequestNotSupported": "在選取的偵錯組態中，屬性 '{0}' 具有不支援的值 '{1}'。",
-+=======
-+	"configMissing": "'launch.json' 中遺漏組態 '{0}'。",
-+	"launchJsonDoesNotExist": "'launch.json' 不存在。",
-+	"debugRequestNotSupported": "在選取的偵錯組態中，屬性 `{0}` 具有不支援的值 '{1}'。",
-+>>>>>>> .their
- 	"debugRequesMissing": "所選的偵錯組態遺漏屬性 '{0}'。",
- 	"debugTypeNotSupported": "不支援設定的偵錯類型 '{0}'。",
- 	"debugTypeMissing": "遺漏所選啟動設定的屬性 'type'。",
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
-  our    100644 fd57ad3913f713cf45d8caed2133bc65b6653aa8 i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
-  their  100644 64f3c6488bc9134e2462bfec2ea86007d0992fa3 i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"ratedByUsers": "由 {0} 使用者評等",
- 	"ratedBySingleUser": "由 1 位使用者評等"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-  our    100644 428850cc74c02589704ef9f86cc3c383eda2110e i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-  their  100644 eb4eee28be7f0074c72969e160d30dafd3c6ad16 i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,5 +11,13 @@
- 	"restart2": "若要記錄延伸模組，則必須重新啟動。您要立即重新啟動 '{0}' 嗎?",
- 	"restart3": "重新啟動",
- 	"cancel": "取消",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"selectAndStartDebug": "按一下以停止性能分析。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 67a25ef14524178b9244464dddf82d524dce620e i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
-  our    100644 70aaaac2426cbc41b75fd597cab4af805cea5356 i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
-  their  100644 aaea0f3774bc7730d97ff7fd5430bc41b76471bb i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
-@@ -15,6 +15,10 @@
- 	"developer": "開發人員",
- 	"extensionsConfigurationTitle": "擴充功能",
- 	"extensionsAutoUpdate": "自動更新擴充功能",
-+<<<<<<< .our
- 	"extensionsIgnoreRecommendations": "如果設定為 true，擴充功能建議通知將停止顯示。",
- 	"extensionsShowRecommendationsOnlyOnDemand": "若設置為 true，除非使用者特別要求，否則不會擷取或顯示建議。"
-+=======
-+	"extensionsIgnoreRecommendations": "如果設定為 true，擴充功能建議通知將停止顯示。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8ab5d602c3a0af24511b033ce39162ecad04da83 i18n/cht/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
-  our    100644 1995569a03e9ce8b50f8957af2fe5f5de271d2eb i18n/cht/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
-  their  100644 be9d2e3a83801edd8bea99284dd746d0a5870b36 i18n/cht/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"starActivation": "在開始時啟動",
- 	"workspaceContainsGlobActivation": "已啟動，因為與 {0} 相符的檔案存在您的工作區中",
- 	"workspaceContainsFileActivation": "已啟動，因為檔案 {0} 存在您的工作區中",
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/cht/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json
-  our    100644 8e9b2618050c0d55f146f911eb77b6c5fdb96e6b i18n/cht/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json
-  their  100644 898e5d9f61701b02284c4de318b8ff00887ae482 i18n/cht/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"totalProblems": "共 {0} 項問題",
- 	"filteredProblems": "顯示 {1} 的 {0} 問題"
- }
-\ No newline at end of file
-changed in both
-  base   100644 af077309e72c96b1653ebd69aae1d1c25c63a38f i18n/cht/src/vs/workbench/parts/markers/common/messages.i18n.json
-  our    100644 277304218a05614a88d10d3dfa976833dcf8b63a i18n/cht/src/vs/workbench/parts/markers/common/messages.i18n.json
-  their  100644 7fd5ffaf852bbf00495cf764f9c33e0de548897a i18n/cht/src/vs/workbench/parts/markers/common/messages.i18n.json
-@@ -7,8 +7,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"viewCategory": "檢視",
-+<<<<<<< .our
- 	"problems.view.toggle.label": "切換至問題(錯誤, 警告, 資訊)",
- 	"problems.view.focus.label": "聚焦於問題(錯誤, 警告, 資訊)",
-+=======
-+	"problems.view.toggle.label": "切換問題",
-+	"problems.view.focus.label": "聚焦問題",
-+>>>>>>> .their
- 	"problems.panel.configuration.title": "[問題] 檢視",
- 	"problems.panel.configuration.autoreveal": "控制 [問題] 檢視是否應自動在開啟檔案時加以顯示",
- 	"markers.panel.title.problems": "問題",
-changed in both
-  base   100644 1d840c42cf9e5e8f216ca49b9ffd55fcf40f34fa i18n/cht/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
-  our    100644 3b54f3003a95723a0a170782d3aa592835eb2e7c i18n/cht/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
-  their  100644 450c57bf7a05a46d1403425d340a247b92beb350 i18n/cht/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,8 @@
- 	],
- 	"defineKeybinding.oneExists": "1 個現有命令有此按鍵繫結",
- 	"defineKeybinding.existing": "{0} 個現有命令有此按鍵繫結",
-+=======
-+>>>>>>> .their
- 	"defineKeybinding.initial": "按下所需按鍵組合，然後按 ENTER。",
- 	"defineKeybinding.chordsTo": "同步到"
- }
-\ No newline at end of file
-changed in both
-  base   100644 218672106595dfd952fef6a645e8a361f935a8ba i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  our    100644 7de2fa4801f7ec2e9b89f96219fca72b072066be i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  their  100644 f81891ad4c29456731df182e5b92dc20f56a1217 i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -9,6 +10,9 @@
- 	"openRawDefaultSettings": "開啟原始預設設置",
- 	"openSettings2": "開啟設定 (預覽)",
- 	"openSettings": "開啟設定",
-+=======
-+	"openRawDefaultSettings": "開啟原始預設設置",
-+>>>>>>> .their
- 	"openGlobalSettings": "開啟使用者設定",
- 	"openGlobalKeybindings": "開啟鍵盤快速鍵",
- 	"openGlobalKeybindingsFile": "開啟鍵盤快速鍵檔案",
-changed in both
-  base   100644 5c3acf7c7d64621384457e83b84b68b723891289 i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 17bda120dbd77f09aaae9b33d7a0fd346cfe2603 i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 480c3d2dbc2429466eae73efdf10836ba24348cb i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,10 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"defaultSettingsFuzzyPrompt": "試試自然語言搜尋！",
-+>>>>>>> .their
- 	"defaultSettings": "將您的設定放置於右方編輯器中以覆寫。",
- 	"noSettingsFound": "找不到任何設定。",
- 	"settingsSwitcherBarAriaLabel": "設定切換器",
- 	"userSettings": "使用者設定",
- 	"workspaceSettings": "工作區設定",
--	"folderSettings": "資料夾設定"
-+	"folderSettings": "資料夾設定",
-+	"enableFuzzySearch": "啟用自然語言搜尋"
- }
-\ No newline at end of file
-changed in both
-  base   100644 9ec03d5593288bf0fd987158921c7605efbbd800 i18n/cht/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 a13d5229d23a832c6ada352df9587e856b73629f i18n/cht/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 c5e55c9814ad6b5ebf0ee81acabb3d3f6343d8da i18n/cht/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-changed in both
-  base   100644 381d6bbb407f01f7faa3a68c909ea50463a38650 i18n/cht/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  our    100644 b9d0cc54748098528d7d52af4aef0b78d90f5832 i18n/cht/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  their  100644 6f6536eb1342092f88ba2d0ecfa285e5bdfb81f8 i18n/cht/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-@@ -18,6 +18,10 @@
- 	"ConfigurationParser.missingRequiredProperty": "錯誤: 工作組態 '{0}' 缺少要求的屬性 '{1}'。會略過工作組態。",
- 	"ConfigurationParser.notCustom": "錯誤: 未將工作宣告為自訂工作。將會忽略該組態。\n{0}\n",
- 	"ConfigurationParser.noTaskName": "錯誤: 一項工作必須提供標籤屬性。即將忽略此工作。\n{0}\n",
-+<<<<<<< .our
-+=======
-+	"taskConfiguration.shellArgs": "警告: 工作 '{0}' 是 shell 命令 ，其中一個引數可能有未逸出的空格。若要確保命令列正確引述，請將引數合併到命令中。",
-+>>>>>>> .their
- 	"taskConfiguration.noCommandOrDependsOn": "錯誤: 工作 '{0}' 未指定命令與 dependsOn 屬性。將會略過該工作。其定義為: \n{1}",
- 	"taskConfiguration.noCommand": "錯誤: 工作 '{0}' 未定義命令。即將略過該工作。其定義為:\n{1}",
- 	"TaskParse.noOsSpecificGlobalTasks": "工作版本 2.0.0 不支援全域 OS 特定工作。請使用 OS 特定命令來轉換這些工作。受影響的工作為:\n{0}"
-changed in both
-  base   100644 a6aa09a9aa9b66548cf91cae504050fbbad18919 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 dc4a98ed7869a7cc55922d5bc3bb8ecb137f6a4d i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 80abe8bb59c2d8ae4b753b7631b622d1b57645e7 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -19,10 +19,15 @@
- 	"terminal.integrated.copyOnSelection": "當設定時，在終端機中選擇的文字將會被複製至剪貼簿",
- 	"terminal.integrated.fontFamily": "控制終端機的字型家族，預設為 editor.fontFamily 的值。",
- 	"terminal.integrated.fontSize": "控制終端機的字型大小 (以像素為單位)。",
-+<<<<<<< .our
- 	"terminal.integrated.letterSpacing": "控制終端機的字元間距，這是一個整數值，用於呈現增加在字元間額外的像素量。",
- 	"terminal.integrated.lineHeight": "控制終端機的行高，此數字會乘上終端機字型大小，以取得以像素為單位的實際行高。",
- 	"terminal.integrated.fontWeight": "在終端機內使用非粗體文字的字體寬度。",
- 	"terminal.integrated.fontWeightBold": "在終端機內使用粗體文字的字體寬度。",
-+=======
-+	"terminal.integrated.lineHeight": "控制終端機的行高，此數字會乘上終端機字型大小，以取得以像素為單位的實際行高。",
-+	"terminal.integrated.enableBold": "是否要在終端機中啟用粗體文字，請注意，此動作須有終端機殼層的支援。",
-+>>>>>>> .their
- 	"terminal.integrated.cursorBlinking": "控制終端機資料指標是否閃爍。",
- 	"terminal.integrated.cursorStyle": "控制終端機資料指標的樣式。",
- 	"terminal.integrated.scrollback": "控制終端機保留在其緩衝區中的行數上限。",
-changed in both
-  base   100644 c2b6d2e3885902f4afe203fb9dd8dc9f97928279 i18n/cht/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
-  our    100644 40c930f8fa9d2a9e33620fc9202eef4ee42274da i18n/cht/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
-  their  100644 86e37b541ca0d1843baa5efde30aba28883e607e i18n/cht/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/cht/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
-  our    100644 98abedaa506e334b03c961eed48bc5befdd3e270 i18n/cht/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
-  their  100644 40b81b62803ba72fcb651ade9a7202a7974f4007 i18n/cht/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"bubbleTitle": "包含強調項目"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/cht/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
-  our    100644 b05708497f7aa0ee1fc2da5480857050221def93 i18n/cht/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
-  their  100644 178e97d6b8380e8a40bbf93694ad9671a74755b7 i18n/cht/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"message": "$(zap) 分析延伸主機..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 e9e580ceb96c4aedcc5d3c1bb928809c0afd97f0 i18n/cht/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-  our    100644 1b176d67b9e7cc88eb18392ea83109e7d50b4db9 i18n/cht/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-  their  100644 86661838eb1ef79cfe2b15508eb1e9a328ebe1ed i18n/cht/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-@@ -13,6 +13,10 @@
- 	"restart": "重新啟動延伸主機",
- 	"overwritingExtension": "正在以 {1} 覆寫延伸模組 {0}。",
- 	"extensionUnderDevelopment": "正在載入位於 {0} 的開發延伸模組",
-+<<<<<<< .our
- 	"extensionCache.invalid": "擴充功能在磁碟上已修改。請重新載入視窗。",
- 	"reloadWindow": "重新載入視窗"
-+=======
-+	"extensionCache.invalid": "擴充功能在磁碟上已修改。請重新載入視窗。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6cf70a5571611f9f7a405db8bda639dd3900a3ca i18n/cht/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
-  our    100644 c0103b25c2222174c35183ccc9c10d21ee12317c i18n/cht/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
-  their  100644 3d15720ddec08f8237be096eef32966fd3a3b794 i18n/cht/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
-@@ -24,6 +24,10 @@
- 	"keybindings.json.when": "按鍵為使用中時的條件。",
- 	"keybindings.json.args": "要傳遞至命令加以執行的引數。",
- 	"keyboardConfigurationTitle": "鍵盤",
-+<<<<<<< .our
- 	"dispatch": "控制按下按鍵時的分派邏輯 (使用 'code' (建議使用) 或 'keyCode')。",
- 	"touchbar.enabled": "啟用鍵盤上的 macOS 觸摸板按鈕 (如果可用)。"
-+=======
-+	"dispatch": "控制按下按鍵時的分派邏輯 (使用 'code' (建議使用) 或 'keyCode')。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/cht/src/vs/workbench/services/textfile/common/textFileService.i18n.json
-  our    100644 849aba14eaaeb4a637745d475d1bec484acc9fa7 i18n/cht/src/vs/workbench/services/textfile/common/textFileService.i18n.json
-  their  100644 83d4c0bd31efae95c022bdff7a185838dc7dbc58 i18n/cht/src/vs/workbench/services/textfile/common/textFileService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"files.backup.failSave": "檔案變更無法寫入備份區域 (錯誤: {0})。請嘗試儲存您的檔案後結束。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 139e2e24da47d52d908f179df3561c087e98c360 i18n/deu/extensions/css/client/out/cssMain.i18n.json
-  our    100644 05ec8e7779838c56ccdaa784c38f92081a521c30 i18n/deu/extensions/css/client/out/cssMain.i18n.json
-  their  100644 254ee717d96f8c90b923e37ecb0f8d9b5c082d4c i18n/deu/extensions/css/client/out/cssMain.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"cssserver.name": "CSS-Sprachserver",
- 	"folding.start": "Regionsanfang wird gefaltet",
- 	"folding.end": "Regionsende wird gefaltet"
-changed in both
-  base   100644 0ad73e29fcce56eed3ee7f1a2744e6a679536cb6 i18n/deu/extensions/emmet/package.i18n.json
-  our    100644 76a0f1cf2f4933fe2973e0cc716d5590fccebd37 i18n/deu/extensions/emmet/package.i18n.json
-  their  100644 079d0046ed51e90f7f922329abdd5185c488bde2 i18n/deu/extensions/emmet/package.i18n.json
-@@ -55,6 +55,7 @@
- 	"emmetPreferencesFilterCommentTrigger": "Eine durch Trennzeichen getrennte Liste von Attributnamen, die in abgekürzter Form vorliegen müssen, damit der Kommentarfilter angewendet werden kann",
- 	"emmetPreferencesFormatNoIndentTags": "Ein Array von Tagnamen, die keinen inneren Einzug erhalten",
- 	"emmetPreferencesFormatForceIndentTags": "Ein Array von Tagnamen, die immer einen inneren Einzug erhalten",
-+<<<<<<< .our
- 	"emmetPreferencesAllowCompactBoolean": "Bei TRUE wird eine kompakte Notation boolescher Attribute erzeugt",
- 	"emmetPreferencesCssWebkitProperties": "Durch Trennzeichen getrennte CSS-Eigenschaften, die das \"webkit\"-Herstellerpräfix erhalten, wenn sie in einer Emmet-Abkürzung verwendet werden, die mit \"-\" beginnt. Legen Sie eine leere Zeichenfolge fest, um das \"webkit\"-Präfix immer zu vermeiden.",
- 	"emmetPreferencesCssMozProperties": "Durch Trennzeichen getrennte CSS-Eigenschaften, die das \"moz\"-Herstellerpräfix erhalten, wenn sie in einer Emmet-Abkürzung verwendet werden, die mit \"-\" beginnt. Legen Sie eine leere Zeichenfolge fest, um das \"moz\"-Präfix immer zu vermeiden.",
-@@ -62,4 +63,7 @@
- 	"emmetPreferencesCssMsProperties": "Durch Trennzeichen getrennte CSS-Eigenschaften, die das \"ms\"-Herstellerpräfix erhalten, wenn sie in einer Emmet-Abkürzung verwendet werden, die mit \"-\" beginnt. Legen Sie eine leere Zeichenfolge fest, um das \"ms\"-Präfix immer zu vermeiden.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "Das Mindestergebnis (zwischen 0 und 1), das die Abkürzung mit Fuzzyübereinstimmung erreichen muss. Niedrigere Werte führen zu vielen falsch positiven Übereinstimmungen, höhere Werte verringern unter Umständen die möglichen Übereinstimmungen.",
- 	"emmetOptimizeStylesheetParsing": "Bei der Einstellung FALSE wird die gesamte Datei analysiert, um zu bestimmten, ob die aktuelle Position zum Erweitern von Emmet-Abkürzungen gültig ist. Bei der Einstellung TRUE wird nur der Inhalt um die die aktuelle Position in CSS-/SCSS-/LESS-Dateien analysiert."
-+=======
-+	"emmetPreferencesAllowCompactBoolean": "Bei TRUE wird eine kompakte Notation boolescher Attribute erzeugt"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 304f70941e249cedb00ba959127f6fa5642d642e i18n/deu/extensions/git/out/autofetch.i18n.json
-  our    100644 57d1be570fcceb0c9d422fc4552c950a9b3239ce i18n/deu/extensions/git/out/autofetch.i18n.json
-  their  100644 e1242008fcfe02d7588828e7ab2667e41a98f385 i18n/deu/extensions/git/out/autofetch.i18n.json
-@@ -8,6 +8,11 @@
- 	],
- 	"yes": "Ja",
- 	"no": "Nein",
-+<<<<<<< .our
- 	"not now": "Erneut nachfragen",
- 	"suggest auto fetch": "Möchten Sie Code [regelmäßig \"git fetch\" ausführen lassen] ({0})?"
-+=======
-+	"not now": "Nicht jetzt",
-+	"suggest auto fetch": "Möchten Sie das automatische Abrufen von Git-Repositorys aktivieren?"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 9f89fe2f662822aa5fc5e47ef4c0eedddfacf94f i18n/deu/extensions/git/out/commands.i18n.json
-  our    100644 1abad5f86ec11c777f2319fc1588d47f5ea1c8f5 i18n/deu/extensions/git/out/commands.i18n.json
-  their  100644 27787e3b3d420f2a46e6300d31a08177fb527d00 i18n/deu/extensions/git/out/commands.i18n.json
-@@ -13,9 +13,12 @@
- 	"selectFolder": "Repositoryspeicherort auswählen",
- 	"cloning": "Das Git-Repository \"{0}\" wird geklont …",
- 	"proposeopen": "Möchten Sie das geklonte Repository öffnen?",
-+<<<<<<< .our
- 	"openrepo": "Repository öffnen",
- 	"add": "Zum Arbeitsbereich hinzufügen",
- 	"proposeopen2": "Möchten Sie das geklonte Repository öffnen oder es zum aktuellen Arbeitsbereich hinzufügen?",
-+=======
-+>>>>>>> .their
- 	"init": "Arbeitsbereichsordner auswählen, in dem das Git-Repository initialisiert wird",
- 	"init repo": "Repository initialisieren",
- 	"create repo": "Repository initialisieren",
-changed in both
-  base   100644 17a3a6ed1276b06dbc9130d9eab2484d6e603a3d i18n/deu/extensions/git/out/main.i18n.json
-  our    100644 f9fdc4a621206c9b83e9f0ee9ba40c30e70df076 i18n/deu/extensions/git/out/main.i18n.json
-  their  100644 49edb1c1faa9ccf58d69734419f26022ba088eba i18n/deu/extensions/git/out/main.i18n.json
-changed in both
-  base   100644 88964f866442188b8060387f3754500e79f824fb i18n/deu/extensions/git/package.i18n.json
-  our    100644 70e0819e8ad95e53d1958520356a5b59f85a5e7c i18n/deu/extensions/git/package.i18n.json
-  their  100644 de4d841dd213285f434ae56f6ed42a2d3e3eeed7 i18n/deu/extensions/git/package.i18n.json
-@@ -53,7 +53,11 @@
- 	"command.showOutput": "Git-Ausgabe anzeigen",
- 	"command.ignore": "Datei zu .gitignore hinzufügen",
- 	"command.stashIncludeUntracked": "Stash (einschließlich nicht verfolgt)",
-+<<<<<<< .our
- 	"command.stash": "Stash ausführen",
-+=======
-+	"command.stash": " Stash ausführen",
-+>>>>>>> .their
- 	"command.stashPop": "Pop für Stash ausführen...",
- 	"command.stashPopLatest": "Pop für letzten Stash ausführen",
- 	"config.enabled": "Gibt an, ob Git aktiviert ist.",
-changed in both
-  base   100644 b2bef37b9bd2e5ebad2be86bbf48d5c7d4cd9e11 i18n/deu/extensions/html/client/out/htmlMain.i18n.json
-  our    100644 6a6d90250746c54afd160824ed5cd89484273313 i18n/deu/extensions/html/client/out/htmlMain.i18n.json
-  their  100644 c3c7dcb8f4e2dd1e4f5e58d05d5eae2f9cfc7935 i18n/deu/extensions/html/client/out/htmlMain.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"htmlserver.name": "HTML-Sprachserver",
- 	"folding.start": "Regionsanfang wird gefaltet",
- 	"folding.end": "Regionsende wird gefaltet"
-changed in both
-  base   100644 70533ed2e5ddae6d34c351189a2860cbf09e1cff i18n/deu/extensions/markdown/out/security.i18n.json
-  our    100644 828b182b8ed53f89b863a57157b6b787f6c91dc0 i18n/deu/extensions/markdown/out/security.i18n.json
-  their  100644 cd3ce408e9b68020ab73019ae1575fb9fbfe7927 i18n/deu/extensions/markdown/out/security.i18n.json
-@@ -15,6 +15,10 @@
- 	"moreInfo.title": "Weitere Informationen",
- 	"enableSecurityWarning.title": "Vorschau von Sicherheitswarnungen in diesem Arbeitsbereich aktivieren",
- 	"disableSecurityWarning.title": "Vorschau von Sicherheitswarnungen in diesem Arbeitsbereich deaktivieren ",
-+<<<<<<< .our
- 	"toggleSecurityWarning.description": "Hat keinen Einfluss auf die Inhaltssicherheitsebene",
-+=======
-+	"toggleSecurityWarning.description": "Kein Einfluss auf Inhalt Sicherheitsebene",
-+>>>>>>> .their
- 	"preview.showPreviewSecuritySelector.title": "Sicherheitseinstellungen für die Markdown-Vorschau in diesem Arbeitsbereich auswählen"
- }
-\ No newline at end of file
-changed in both
-  base   100644 5bbe54989dcf36134bac3a5c43adb4dceae4000a i18n/deu/extensions/merge-conflict/package.i18n.json
-  our    100644 fd5e8e62af961cb35cf358d4a263035c1458b95f i18n/deu/extensions/merge-conflict/package.i18n.json
-  their  100644 bc7d0cf1cf7fc0d31e6184043a23a1409796eeb3 i18n/deu/extensions/merge-conflict/package.i18n.json
-changed in both
-  base   100644 87035b7816ff0878666285b0955ef5519696be06 i18n/deu/extensions/typescript/out/features/completionItemProvider.i18n.json
-  our    100644 c1be716a2f83a6b7af9b27666136cecb21feb9c4 i18n/deu/extensions/typescript/out/features/completionItemProvider.i18n.json
-  their  100644 fceb3f1c9e0d77dd7ff3439f1bbf14ce3fcb1383 i18n/deu/extensions/typescript/out/features/completionItemProvider.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"selectCodeAction": "Anzuwendende Codeaktion auswählen",
- 	"acquiringTypingsLabel": "Eingaben werden abgerufen...",
- 	"acquiringTypingsDetail": "Eingabedefinitionen für IntelliSense werden abgerufen.",
-changed in both
-  base   100644 11769f91e3fa73ffba0c465b7feacd5b4547447a i18n/deu/extensions/typescript/package.i18n.json
-  our    100644 6f8bb4fea941525ab897f97cd6506e129d2eb1f4 i18n/deu/extensions/typescript/package.i18n.json
-  their  100644 baf9f4497a7363a238c91230133b889c7aa6e1f6 i18n/deu/extensions/typescript/package.i18n.json
-changed in both
-  base   100644 b88bee0ef1d3dad3783b8e5af80a03737650288e i18n/deu/src/vs/code/electron-main/main.i18n.json
-  our    100644 ae74a8461bc23dda8b28fd53ffc1e2405ad86cfe i18n/deu/src/vs/code/electron-main/main.i18n.json
-  their  100644 2a8df2c0128e15910931b31d49f5e542453a6d7a i18n/deu/src/vs/code/electron-main/main.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"secondInstanceNoResponse": "Eine andere Instanz von {0} läuft, reagiert aber nicht",
- 	"secondInstanceNoResponseDetail": "Bitte schließen Sie alle anderen Instanzen, und versuchen Sie es erneut.",
- 	"secondInstanceAdmin": "Eine zweite Instanz von {0} wird bereits als Administrator ausgeführt.",
-changed in both
-  base   100644 8dcc363ec8ea44b162d7a5e8f98ba4a35e344d71 i18n/deu/src/vs/code/electron-main/menus.i18n.json
-  our    100644 2c62aec3f2252906a0cfb94c2bac025ecf6adbb0 i18n/deu/src/vs/code/electron-main/menus.i18n.json
-  their  100644 edb7ae515e19217a1ed853dd03d425b9ffd35371 i18n/deu/src/vs/code/electron-main/menus.i18n.json
-@@ -161,7 +161,10 @@
- 	"mMergeAllWindows": "Alle Fenster zusammenführen",
- 	"miToggleDevTools": "&&Entwicklertools umschalten",
- 	"miAccessibilityOptions": "&&Optionen für erleichterte Bedienung",
-+<<<<<<< .our
- 	"miOpenProcessExplorerer": "&&Prozess-Explorer öffnen",
-+=======
-+>>>>>>> .their
- 	"miReportIssue": "&&Problem melden",
- 	"miWelcome": "&&Willkommen",
- 	"miInteractivePlayground": "&&Interactive Spielwiese",
-@@ -189,5 +192,12 @@
- 	"miDownloadingUpdate": "Das Update wird heruntergeladen...",
- 	"miInstallUpdate": "Update installieren …",
- 	"miInstallingUpdate": "Update wird installiert...",
-+<<<<<<< .our
- 	"miRestartToUpdate": "Zum Aktualisieren neu starten..."
-+=======
-+	"miCheckForUpdates": "Nach Aktualisierungen suchen...",
-+	"aboutDetail": "\nVersion {0}\nCommit {1}\nDatum {2}\nShell {3}\nRenderer {4}\nNode {5}\nArchitektur {6}",
-+	"okButton": "OK",
-+	"copy": "&&Kopieren"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 75e98b759836bc4b345371700e485ba895602969 i18n/deu/src/vs/code/node/cliProcessMain.i18n.json
-  our    100644 760b5040577256d687fc1f77cb25f4eecb5204a3 i18n/deu/src/vs/code/node/cliProcessMain.i18n.json
-  their  100644 27bf37c7820cbed4eb78b2b18813fa72b0caf7b8 i18n/deu/src/vs/code/node/cliProcessMain.i18n.json
-changed in both
-  base   100644 791032db29ace8ca0e3a6c4f3e4a29c02f3afda8 i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 0cb95fccc47d309d94aacd1e25b0718fd455d527 i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 42d65e250ff2d0d7ecb26879d1548e9dd2a4fbd0 i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json
-changed in both
-  base   100644 113379281fdae662fd131fcbfbc765d8b7004014 i18n/deu/src/vs/editor/contrib/folding/folding.i18n.json
-  our    100644 6be29bca2c2fd41bd1bd6b6a05cfd92e1409822d i18n/deu/src/vs/editor/contrib/folding/folding.i18n.json
-  their  100644 4e3ffb44a699303b1d538907140198af36e9c24a i18n/deu/src/vs/editor/contrib/folding/folding.i18n.json
-changed in both
-  base   100644 25a0dca34beb3ae53eeda1263e8972dc2e619912 i18n/deu/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 f6bdb0310262230d9fd3311d63fcfc0ae9c687d8 i18n/deu/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 e990ea9bf1ec2df4a4d7c3a0db611fe7436aa236 i18n/deu/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,8 +10,21 @@
- 	"diff": "Vergleicht zwei Dateien.",
- 	"add": "Fügt einen oder mehrere Ordner zum letzten aktiven Fenster hinzu.",
- 	"goto": "Öffnet eine Datei im Pfad in der angegebenen Zeile und an der Zeichenposition.",
-+<<<<<<< .our
- 	"newWindow": "Öffnen eines neuen Fensters erzwingen.",
- 	"reuseWindow": "Öffnen einer Datei oder eines Ordners im letzten aktiven Fenster erzwingen.",
-+=======
-+	"locale": "Das zu verwendende Gebietsschema (z. B. en-US oder zh-TW).",
-+	"newWindow": "Erzwingt eine neue Instanz des Codes.",
-+	"performance": "Startet mit aktiviertem Befehl \"Developer: Startup Performance\".",
-+	"prof-startup": "CPU-Profiler beim Start ausführen",
-+	"inspect-extensions": "Erlaubt Debugging und Profiling für Erweiterungen. Überprüfen Sie die Entwicklertools für die Verbindungs-URI.",
-+	"inspect-brk-extensions": "Erlaubt Debugging und Profiling für Erweiterungen, wobei der Erweiterungs-Host nach dem Starten pausiert wird. Überprüfen Sie die Entwicklertools für die Verbindungs-URI.",
-+	"reuseWindow": "Erzwingt das Öffnen einer Datei oder eines Ordners im letzten aktiven Fenster.",
-+	"userDataDir": "Gibt das Verzeichnis an, in dem Benutzerdaten gespeichert werden. Nützlich, wenn die Ausführung als \"root\" erfolgt.",
-+	"log": "Log-Level zu verwenden. Standardwert ist \"Info\". Zulässige Werte sind \"kritisch\", \"Fehler\", \"warnen\", \"Info\", \"debug\", \"verfolgen\", \"aus\".",
-+	"verbose": "Ausführliche Ausgabe (impliziert \"-wait\").",
-+>>>>>>> .their
- 	"wait": "Warten Sie, bis die Dateien geschlossen sind, bevor Sie zurück gehen können.",
- 	"locale": "Das zu verwendende Gebietsschema (z. B. en-US oder zh-TW).",
- 	"userDataDir": "Gibt das Verzeichnis an, in dem Benutzerdaten gespeichert werden. Kann zum Öffnen mehrerer verschiedener Codeinstanzen verwendet werden.",
-@@ -32,8 +45,14 @@
- 	"inspect-extensions": "Erlaubt Debuggen und Profilerstellung für Erweiterungen. Überprüfen Sie die Entwicklertools für die Verbindungs-URI.",
- 	"inspect-brk-extensions": "Erlaubt Debuggen und Profilerstellung für Erweiterungen, wobei der Erweiterungs-Host nach dem Start angehalten wird. Überprüfen Sie die Entwicklertools für die Verbindungs-URI.",
- 	"disableGPU": "Deaktiviert die GPU-Hardwarebeschleunigung.",
-+<<<<<<< .our
- 	"uploadLogs": "Lädt die Logs der aktuellen Sitzung an einem sicheren Endpunkt hoch.",
- 	"maxMemory": "Maximale Speichergröße für ein Fenster (in Mbyte).",
-+=======
-+	"status": "Prozessnutzungs- und Diagnose-Informationen ausgeben.",
-+	"version": "Gibt die Version aus.",
-+	"help": "Gibt die Syntax aus.",
-+>>>>>>> .their
- 	"usage": "Verwendung",
- 	"options": "Optionen",
- 	"paths": "Pfade",
-changed in both
-  base   100644 185a438a129ac28a5dfc6370a3404a8e8feec4e5 i18n/deu/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 efdaa6c50b1a7075eb309307a09334b8e64087d3 i18n/deu/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 256756a3fdd26e6ea0b4cb814e8b8026cff0adc7 i18n/deu/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -7,6 +7,7 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"invalidManifest": "Die Erweiterung ist ungültig: \"package.json\" ist keine JSON-Datei.",
-+<<<<<<< .our
- 	"incompatible": "Die Erweiterung \"{0}\" kann nicht installiert werden, die sie nicht mit dem Code \"{1}\" kompatibel ist.",
- 	"restartCode": "Bitte starten Sie Code vor der Neuinstallation von {0} neu.",
- 	"installingOutdatedExtension": "Eine neuere Version dieser Erweiterung ist bereits installiert. Möchten Sie diese mit der älteren Version überschreiben?",
-@@ -18,6 +19,15 @@
- 	"Not a Marketplace extension": "Nur Marktplatz-Erweiterungen können neu installiert werden",
- 	"notFoundCompatible": "'{0}' kann nicht installiert werden: Es gibt keine mit VS Code '{1}' kompatible Version.",
- 	"malicious extension": "Die Erweiterung kann nicht installiert werden, da sie als problematisch gemeldet wurde.",
-+=======
-+	"restartCodeLocal": "Bitte starten Sie Code vor der Neuinstallation von {0} neu.",
-+	"installingOutdatedExtension": "Eine neuere Version dieser Erweiterung ist bereits installiert. Möchten Sie diese mit der älteren Version überschreiben?",
-+	"override": "Überschreiben",
-+	"cancel": "Abbrechen",
-+	"notFoundCompatible": "Kann nicht installiert werden, da die Erweiterung '{0}', die mit der aktuellen Version '{1}' von VS Code kompatibel ist, nicht gefunden werden kann.",
-+	"quitCode": "Kann nicht installiert werden, da noch eine veraltete Instanz der Erweiterung ausgeführt wird. Bitte beenden und VS Code neu starten vor der Neuinstallation.",
-+	"exitCode": "Kann nicht installiert werden, da noch eine veraltete Instanz der Erweiterung ausgeführt wird. Bitte beenden und VS Code neu starten vor der Neuinstallation.",
-+>>>>>>> .their
- 	"notFoundCompatibleDependency": "Kann nicht installiert werden, da die abhängige Erweiterung '{0}', die mit der aktuellen VS Code Version '{1}' kompatibel ist, nicht gefunden werden kann. ",
- 	"quitCode": "Fehler bei der Installation der Erweiterung. Beenden und starten Sie VS Code vor der erneuten Installation neu.",
- 	"exitCode": "Fehler bei der Installation der Erweiterung. Beenden und starten Sie VS Code vor der erneuten Installation neu.",
-changed in both
-  base   100644 e0774394ce838e226ec9c8ab51a8bd16c1ecfc22 i18n/deu/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
-  our    100644 e9e4a6887bc51da4152a7382dc77e46be5c1d756 i18n/deu/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
-  their  100644 0e38f23ff50baec5ead7932d5655c42e1c776e33 i18n/deu/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
-changed in both
-  base   100644 c0039e0b4452ee01472f03960f359d0af18d2ff5 i18n/deu/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json
-  our    100644 ba921c208d6b2c3f20db3dfa45b5acc824e4c997 i18n/deu/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json
-  their  100644 b1c16b877d28965606e8362a08d5d14adbcc286a i18n/deu/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"toggleTabs": "Registerkartensichtbarkeit umschalten",
- 	"view": "Anzeigen"
- }
-\ No newline at end of file
-changed in both
-  base   100644 ced21f95b899d4dd81b97287ce959c5f2e51b4e5 i18n/deu/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
-  our    100644 073096f1735fc446777d8ab69c2db97c2ebbc74d i18n/deu/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
-  their  100644 22d3bb268e9a2aee6d1d0a5ab658ca88cd7b6dc2 i18n/deu/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"largeNumberBadge": "10k+",
- 	"badgeTitle": "{0} - {1}",
- 	"additionalViews": "Zusätzliche Ansichten",
-changed in both
-  base   100644 963d490097f5c167b9ce9900f1a0c5845aaa4128 i18n/deu/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  our    100644 ad42a8f37c9ae280a7cad2c863b690a8d39222a1 i18n/deu/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  their  100644 2b4ef55801bd9bec491371c61147fb773e0b36d2 i18n/deu/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-@@ -8,5 +8,11 @@
- 	],
- 	"editorCommand.activeEditorMove.description": "Aktiven Editor nach Tabstopps oder Gruppen verschieben",
- 	"editorCommand.activeEditorMove.arg.name": "Argument zum Verschieben des aktiven Editors",
-+<<<<<<< .our
- 	"editorCommand.activeEditorMove.arg.description": "Argumenteigenschaften:\n\t* \"to\": Ein Zeichenfolgenwert, der das Ziel des Verschiebungsvorgangs angibt.\n\t* \"by\": Ein Zeichenfolgenwert, der die Einheit für die Verschiebung angibt (nach Registerkarte oder nach Gruppe).\n\t* \"value\": Ein Zahlenwert, der angibt, um wie viele Positionen verschoben wird. Es kann auch die absolute Position für die Verschiebung angegeben werden.\n"
-+=======
-+	"editorCommand.activeEditorMove.arg.description": "Argumenteigenschaften:\n\t* \"to\": Ein Zeichenfolgenwert, der das Ziel des Verschiebungsvorgangs angibt.\n\t* \"by\": Ein Zeichenfolgenwert, der die Einheit für die Verschiebung angibt (nach Registerkarte oder nach Gruppe).\n\t* \"value\": Ein Zahlenwert, der angibt, um wie viele Positionen verschoben wird. Es kann auch die absolute Position für die Verschiebung angegeben werden.\n",
-+	"commandDeprecated": "Der Befehl **{0}** wurde entfernt. Sie können stattdessen **{1}** verwenden.",
-+	"openKeybindings": "Tastenkombinationen konfigurieren"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 56317ca59e32158a961e64947c20e95490c4ce4e i18n/deu/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-  our    100644 66f3a1eebbd08aea70a332ab9697d5f5727d315b i18n/deu/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-  their  100644 afbb07198da49802a707a16371873c1183da44d3 i18n/deu/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-changed in both
-  base   100644 9c274f7fb04479995ba1abf40d962c2d2fd02e64 i18n/deu/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 1609e7c92719c7aa89402c8bf0018971f9a1043e i18n/deu/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 7331216a594d4acf61cbf610077b089d1f6fe5e2 i18n/deu/src/vs/workbench/electron-browser/actions.i18n.json
-@@ -50,6 +50,30 @@
- 	"moveWindowTabToNewWindow": "Fensterregisterkarte in neues Fenster verschieben",
- 	"mergeAllWindowTabs": "Alle Fenster zusammenführen",
- 	"toggleWindowTabsBar": "Fensterregisterkarten-Leiste umschalten",
-+<<<<<<< .our
- 	"about": "Informationen zu {0}",
- 	"inspect context keys": "Kontextschlüssel prüfen"
-+=======
-+	"configureLocale": "Sprache konfigurieren",
-+	"displayLanguage": "Definiert die Anzeigesprache von VSCode.",
-+	"doc": "Unter {0} finden Sie eine Liste der unterstützten Sprachen.",
-+	"restart": "Das Ändern dieses Wertes erfordert einen Neustart von VSCode.",
-+	"fail.createSettings": "{0} ({1}) kann nicht erstellt werden.",
-+	"openLogsFolder": "Protokollordner öffnen",
-+	"showLogs": "Protokolle anzeigen...",
-+	"mainProcess": "Main",
-+	"sharedProcess": "Geteilt",
-+	"rendererProcess": "Renderer",
-+	"extensionHost": "Erweiterungshost",
-+	"selectProcess": "Prozess auswählen",
-+	"setLogLevel": "Protokollstufe festlegen",
-+	"trace": "Spur",
-+	"debug": "Debuggen",
-+	"info": "Info",
-+	"warn": "Warnung",
-+	"err": "Fehler",
-+	"critical": "Kritisch",
-+	"off": "Aus",
-+	"selectLogLevel": "Protokollstufe auswählen"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f90e322ae5f8ab78cdbf98092c24206028ee0771 i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 fc92fd392259fb9b2d1dec1cecdbc3c76bdc7440 i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 2a2af0f320b0f5411da37030fef16436d5a0c6f6 i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,8 +35,14 @@
- 	"panelDefaultLocation": "Steuert die Standardposition des Panels. Dieses kann entweder unterhalb oder rechts von der Workbench angezeigt werden.",
- 	"statusBarVisibility": "Steuert die Sichtbarkeit der Statusleiste im unteren Bereich der Workbench.",
- 	"activityBarVisibility": "Steuert die Sichtbarkeit der Aktivitätsleiste in der Workbench.",
-+<<<<<<< .our
- 	"viewVisibility": "Steuert die Sichtbarkeit von Headeraktionen. Headeraktionen können immer sichtbar sein oder nur sichtbar sein, wenn diese Ansicht fokussiert ist oder mit der Maus darauf gezeigt wird.",
- 	"fontAliasing": "Steuert die Schriftartaliasingmethode in der Workbench.\n - default: Subpixel-Schriftartglättung. Auf den meisten Nicht-Retina-Displays wird Text bei dieser Einstellung am schärfsten dargestellt. \n- antialiased: Glättet die Schriftart auf der Pixelebene (im Gegensatz zur Subpixelebene). Bei dieser Einstellung kann die Schriftart insgesamt heller wirken.\n- none: Deaktiviert die Schriftartglättung. Text wird mit gezackten scharfen Kanten dargestellt.\n- auto: Wendet ausgehend vom DPI der Anzeige automatisch \"default\" oder \"antialiased\" an.",
-+=======
-+	"closeOnFileDelete": "Steuert, ob Editoren, die eine Datei anzeigen, automatisch geschlossen werden sollen, wenn die Datei von einem anderen Prozess umbenannt oder gelöscht wird. Wenn Sie diese Option deaktivieren, bleibt der Editor bei einem solchen Ereignis als geändert offen. Bei Löschvorgängen innerhalb der Anwendung wird der Editor immer geschlossen, und geänderte Dateien werden nie geschlossen, damit Ihre Daten nicht verloren gehen.",
-+	"enableNaturalLanguageSettingsSearch": "Steuert, ob der Suchmodus mit natürlicher Sprache für die Einstellungen aktiviert werden soll.",
-+	"fontAliasing": "Steuert die Schriftartaliasingmethode in der Workbench.\n- default: Subpixel-Schriftartglättung. Auf den meisten Nicht-Retina-Displays wird Text bei dieser Einstellung am schärfsten dargestellt.\n- antialiased: Glättet die Schriftart auf der Pixelebene (im Gegensatz zur Subpixelebene). Bei dieser Einstellung kann die Schriftart insgesamt heller wirken.\n- none: Deaktiviert die Schriftartglättung. Text wird mit gezackten scharfen Kanten dargestellt.\n",
-+>>>>>>> .their
- 	"workbench.fontAliasing.default": "Subpixel-Schriftartglättung. Auf den meisten Nicht-Retina-Displays wird Text bei dieser Einstellung am schärfsten dargestellt.",
- 	"workbench.fontAliasing.antialiased": "Glättet die Schriftart auf der Pixelebene (im Gegensatz zur Subpixelebene). Bei dieser Einstellung kann die Schriftart insgesamt heller wirken.",
- 	"workbench.fontAliasing.none": "Deaktiviert die Schriftartglättung. Text wird mit gezackten scharfen Kanten dargestellt.",
-changed in both
-  base   100644 e95c2dc9747dc57ed024c9fee72c7887bffd8d59 i18n/deu/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  our    100644 72a2c9e811a52bded399b60826b044c598a0ead6 i18n/deu/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  their  100644 3906b91b9737ddd7f31700b20431c242b8deb979 i18n/deu/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-@@ -21,12 +21,20 @@
- 	"allowBreakpointsEverywhere": "Ermöglicht das Festlegen von Haltepunkten für alle Dateien.",
- 	"openExplorerOnEnd": "Hiermit wird am Ende einer Debugsitzung automatisch eine Explorer-Ansicht geöffnet.",
- 	"inlineValues": "Variablenwerte beim Debuggen in Editor eingebunden anzeigen",
-+<<<<<<< .our
- 	"toolBarLocation": "Steuert die Position der Debugsymbolleiste. Mögliche Werte sind \"floating\" (schwebend in allen Ansichten), \"docked\" (verankert in der Debugansicht) oder \"hidden\" (ausgeblendet).",
-+=======
-+	"hideActionBar": "Steuert, ob die unverankerte Debugaktionsleiste ausgeblendet werden soll",
-+>>>>>>> .their
- 	"never": "Debuggen nie in Statusleiste anzeigen",
- 	"always": "Debuggen immer in Statusleiste anzeigen",
- 	"onFirstSessionStart": "Debuggen nur in Statusleiste anzeigen, nachdem das Debuggen erstmals gestartet wurde",
- 	"showInStatusBar": "Steuert, wann die Debug-Statusleiste angezeigt werden soll",
-+<<<<<<< .our
- 	"openDebug": "Steuert, ob das Debug-Menü beim Start der Debugsitzung offen ist.",
- 	"enableAllHovers": "Legt fest, ob Nicht-Debughover beim Debuggen aktiviert sind. Bei \"true\" werden die Hoveranbieter aufgerufen, um einen Hover bereitstellen. Reguläre Hover werden auch bei der Einstellung \"true\" nicht angezeigt.",
-+=======
-+	"openDebug": "Steuert, ob das Debug-Viewlet beim Start der Debugsitzung offen ist.",
-+>>>>>>> .their
- 	"launch": "Startkonfiguration für globales Debuggen. Sollte als Alternative zu \"launch.json\" verwendet werden, das übergreifend von mehreren Arbeitsbereichen genutzt wird"
- }
-\ No newline at end of file
-changed in both
-  base   100644 374a6cc55501f132acbdfcc694c3e8a4ccda131e i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 d6cc1170dbfaab61ca55376b64654ebe15edb98e i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 bbb736c2010de3e47dbcc3ffb8c9e7793672d0b0 i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -13,12 +13,18 @@
- 	"breakpointAdded": "Der Haltepunkt wurde hinzugefügt. Zeile {0}, Datei \"{1}\".",
- 	"breakpointRemoved": "Der Haltepunkt wurde entfernt. Zeile {0}, Datei \"{1}\".",
- 	"compoundMustHaveConfigurations": "Für den Verbund muss das Attribut \"configurations\" festgelegt werden, damit mehrere Konfigurationen gestartet werden können.",
-+<<<<<<< .our
- 	"noConfigurationNameInWorkspace": "Die Startkonfiguration \"{0}\" wurde im Arbeitsbereich nicht gefunden.",
- 	"multipleConfigurationNamesInWorkspace": "Im Arbeitsbereich sind mehrere Startkonfigurationen \"{0}\" vorhanden. Verwenden Sie den Ordnernamen, um die Konfiguration zu qualifizieren.",
- 	"noFolderWithName": "Der Ordner mit dem Namen \"{0}\" für die Konfiguration \"{1}\" wurde im Verbund \"{2}\" nicht gefunden.",
- 	"configMissing": "Konfiguration \"{0}\" fehlt in \"launch.json\".",
- 	"launchJsonDoesNotExist": "\"launch.json\" ist nicht vorhanden.",
- 	"debugRequestNotSupported": "Das Attribut \"{0}\" weist in der ausgewählten Debugkonfiguration den nicht unterstützten Wert \"{1}\" auf.",
-+=======
-+	"configMissing": "Konfiguration \"{0}\" fehlt in \"launch.json\".",
-+	"launchJsonDoesNotExist": "\"launch.json\" ist nicht vorhanden.",
-+	"debugRequestNotSupported": "Das Attribut \"{0}\" hat in der ausgewählten Debugkonfiguration den nicht unterstützten Wert \"{1}\".",
-+>>>>>>> .their
- 	"debugRequesMissing": "Das Attribut \"{0}\" fehlt in der ausgewählten Debugkonfiguration.",
- 	"debugTypeNotSupported": "Der konfigurierte Debugtyp \"{0}\" wird nicht unterstützt.",
- 	"debugTypeMissing": "Fehlende Eigenschaft \"type\" für die ausgewählte Startkonfiguration.",
-changed in both
-  base   100644 2d51a131a663a69b48c5d1503b96432ca4eec466 i18n/deu/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-  our    100644 0e47ff84d42795084b73b4ffe93f3912ded6c392 i18n/deu/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-  their  100644 358babc21034618e027765ac05f5af5592ebac5f i18n/deu/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-@@ -9,7 +9,10 @@
- 	"name": "Erweiterungsname",
- 	"extension id": "Erweiterungsbezeichner",
- 	"preview": "Vorschau",
-+<<<<<<< .our
- 	"builtin": "Integriert",
-+=======
-+>>>>>>> .their
- 	"publisher": "Name des Herausgebers",
- 	"install count": "Installationsanzahl",
- 	"rating": "Bewertung",
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
-  our    100644 38b5316ee3881e612c1d7fcbaa6486eeb2dddd1e i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
-  their  100644 d63121a5b96d0f50b3d809468f7c172d37bd90f2 i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"ratedByUsers": "Von {0} Benutzern bewertet",
- 	"ratedBySingleUser": "Von 1 Benutzer bewertet"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-  our    100644 aac1ac14a6da026536311b68e103f2d7c51317bf i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-  their  100644 25343125096302ff43673319666c628bc4803541 i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,5 +11,13 @@
- 	"restart2": "Zum Erstellen von Profilerweiterungen ist ein Neustart erforderlich. Möchten Sie \"{0}\" jetzt neu starten?",
- 	"restart3": "Neu starten",
- 	"cancel": "Abbrechen",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"selectAndStartDebug": "Klicken Sie, um die Profilerstellung zu beenden."
- }
-\ No newline at end of file
-changed in both
-  base   100644 576288a75d36f7f0ad8af2066071b099b6b68001 i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
-  our    100644 eec3ca6a8c6b0055d6e8e7c46acef5975d452fce i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
-  their  100644 6259913b4c2c3971f2a849a8d0d9f1fdd52c522b i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
-@@ -15,6 +15,10 @@
- 	"developer": "Entwickler",
- 	"extensionsConfigurationTitle": "Erweiterungen",
- 	"extensionsAutoUpdate": "Erweiterungen automatisch aktualisieren",
-+<<<<<<< .our
- 	"extensionsIgnoreRecommendations": "Bei TRUE werden Benachrichtigungen für Erweiterungsempfehlungen nicht mehr angezeigt.",
- 	"extensionsShowRecommendationsOnlyOnDemand": "Wenn Sie \"True\" festlegen, werden Empfehlungen nur auf Anforderung vom Benutzer abgerufen oder angezeigt."
-+=======
-+	"extensionsIgnoreRecommendations": "Bei TRUE werden Benachrichtigungen für Erweiterungsempfehlungen nicht mehr angezeigt."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 af3cf4505942dda0215dc884aea7d0239d41a48d i18n/deu/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
-  our    100644 ac0906610488169c3a2c7e0e3adefb1d068aab57 i18n/deu/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
-  their  100644 3da4122d1409291d4ae78f625f596ca5836fccab i18n/deu/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"starActivation": "Beim Start aktiviert",
- 	"workspaceContainsGlobActivation": "Aktiviert, da eine mit {0} übereinstimmende Datei in Ihrem Arbeitsbereich vorhanden ist",
- 	"workspaceContainsFileActivation": "Aktiviert, da die Datei {0} in Ihrem Arbeitsbereich vorhanden ist",
-changed in both
-  base   100644 146bfaf2e064336bab67d6d79de7ec4303d23e61 i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 e5540f790640626d6989cde6c94da0327b708bbf i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 4d300a15634e7f7f35e201fb8aa4decb601ebc72 i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -67,6 +67,11 @@
- 	"fileNameExistsError": "Eine Datei oder ein Ordner **{0}** ist an diesem Ort bereits vorhanden. Wählen Sie einen anderen Namen.",
- 	"invalidFileNameError": "Der Name **{0}** ist als Datei- oder Ordnername ungültig. Bitte wählen Sie einen anderen Namen aus.",
- 	"filePathTooLongError": "Der Name **{0}** führt zu einem Pfad, der zu lang ist. Wählen Sie einen kürzeren Namen.",
-+<<<<<<< .our
-+=======
-+	"compareWithSaved": "Aktive Datei mit gespeicherter Datei vergleichen",
-+	"modifiedLabel": "{0} (auf Datenträger) ↔ {1}",
-+>>>>>>> .their
- 	"compareWithClipboard": "Aktive Datei mit Zwischenablage vergleichen",
- 	"clipboardComparisonLabel": "Zwischenablage ↔ {0}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 47a84100588d0ab3239041e571b7473785e339ac i18n/deu/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json
-  our    100644 57a8728afc28d9929bdb86192c12324111c421d7 i18n/deu/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json
-  their  100644 e3de54fe532485857b9c80d8006706df44faf352 i18n/deu/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json
-changed in both
-  base   100644 9ec12051af920d1978985bd3a1582dd1eea553c5 i18n/deu/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  our    100644 89c8d9fa907d279de7e54d5e05888634d504dacc i18n/deu/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  their  100644 d10b1d29c06090d6de9abb0ca0eff0d1f65e6435 i18n/deu/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-@@ -15,9 +15,12 @@
- 	"dropFolder": "Möchten Sie den Ordner zum Arbeitsbereich hinzufügen?",
- 	"addFolders": "&&Ordner hinzufügen",
- 	"addFolder": "&&Ordner hinzufügen",
-+<<<<<<< .our
- 	"confirmRootsMove": "Möchten Sie die Reihenfolge mehrerer Stammordner in Ihrem Arbeitsbereich ändern?",
- 	"confirmMultiMove": "Möchten Sie die folgenden {0} Dateien verschieben?",
- 	"confirmRootMove": "Möchten Sie die Reihenfolge des Stammordners \"{0}\" in Ihrem Arbeitsbereich ändern?",
-+=======
-+>>>>>>> .their
- 	"confirmMove": "Möchten Sie \"{0}\" wirklich verschieben?",
- 	"doNotAskAgain": "Nicht erneut fragen",
- 	"moveButtonLabel": "&&Verschieben",
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/deu/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json
-  our    100644 3926e145e99aef25f6413ac43af15fb04fdcb3f1 i18n/deu/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json
-  their  100644 7b31df50f74da3426ba9f3d6e993cacaf0fdf727 i18n/deu/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"totalProblems": "Insgesamt {0} Probleme",
- 	"filteredProblems": "Zeigt {0} von {1} Problemen an"
- }
-\ No newline at end of file
-changed in both
-  base   100644 162edd8cdb47cbf6e2a312910853530e12492745 i18n/deu/src/vs/workbench/parts/markers/common/messages.i18n.json
-  our    100644 08feefc0086392fcd6f986e3c1116e070a102b03 i18n/deu/src/vs/workbench/parts/markers/common/messages.i18n.json
-  their  100644 f9df98f6f178305e236dc1b54073ea78a66afc75 i18n/deu/src/vs/workbench/parts/markers/common/messages.i18n.json
-@@ -7,8 +7,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"viewCategory": "Anzeigen",
-+<<<<<<< .our
- 	"problems.view.toggle.label": "Probleme umschalten (Fehler, Warnungen, Informationen)",
- 	"problems.view.focus.label": "Probleme fokussieren (Fehler, Warnungen, Informationen)",
-+=======
-+	"problems.view.toggle.label": "Probleme umschalten",
-+	"problems.view.focus.label": "Probleme fokussieren",
-+>>>>>>> .their
- 	"problems.panel.configuration.title": "Ansicht \"Probleme\"",
- 	"problems.panel.configuration.autoreveal": "Steuert, ob die Ansicht \"Probleme\" automatisch Dateien anzeigen sollte, wenn diese geöffnet werden.",
- 	"markers.panel.title.problems": "Probleme",
-changed in both
-  base   100644 80ed5ad65892e7c3e54b2538746302a28ab8f12b i18n/deu/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
-  our    100644 78e46017147a33f067ab2bfd8c380dceca1f42c5 i18n/deu/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
-  their  100644 ea9ccbd99b2edc9c67b93a5c3ad36cce0f1ebe8d i18n/deu/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,8 @@
- 	],
- 	"defineKeybinding.oneExists": "Diese Tastenzordnung ist 1 vorhandenen Befehl zugewiesen",
- 	"defineKeybinding.existing": "Diese Tastenzordnung ist {0} vorhandenen Befehlen zugewiesen ",
-+=======
-+>>>>>>> .their
- 	"defineKeybinding.initial": "Drücken Sie die gewünschte Tastenkombination, und betätigen Sie anschließend die EINGABETASTE.",
- 	"defineKeybinding.chordsTo": "Tastenkombination zu"
- }
-\ No newline at end of file
-changed in both
-  base   100644 503c8aa631ffca14fe8087f9402379ddac5fe8b6 i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  our    100644 69766a391fed29fd2a77d8603a89733b0bed7495 i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  their  100644 fccfd818d551033f1335d99c45732157167e8025 i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -9,6 +10,9 @@
- 	"openRawDefaultSettings": "Raw-Standardeinstellungen öffnen",
- 	"openSettings2": "Einstellungen öffnen (Vorschau)",
- 	"openSettings": "Einstellungen öffnen",
-+=======
-+	"openRawDefaultSettings": "Raw-Standardeinstellungen öffnen",
-+>>>>>>> .their
- 	"openGlobalSettings": "Benutzereinstellungen öffnen",
- 	"openGlobalKeybindings": "Tastaturkurzbefehle öffnen",
- 	"openGlobalKeybindingsFile": "Datei mit Tastaturkurzbefehlen öffnen",
-changed in both
-  base   100644 bd64052e34bd88c3958f0fe9aaa8c846ee8e3802 i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 cfd3784b25185836bda1d8d6784b3e81792155f0 i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 26e5d28d6589aaf879b25cc42b85d9ccbad216ea i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,10 +7,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"defaultSettingsFuzzyPrompt": "Testen Sie das Suchen mit natürlicher Sprache!",
-+>>>>>>> .their
- 	"defaultSettings": "Platzieren Sie Ihre Einstellungen zum Überschreiben im Editor auf der rechten Seite.",
- 	"noSettingsFound": "Keine Einstellungen gefunden.",
- 	"settingsSwitcherBarAriaLabel": "Einstellungsumschaltung",
- 	"userSettings": "Benutzereinstellungen",
- 	"workspaceSettings": "Arbeitsbereichseinstellungen",
-+<<<<<<< .our
- 	"folderSettings": "Ordnereinstellungen"
-+=======
-+	"folderSettings": "Ordnereinstellungen",
-+	"enableFuzzySearch": "Suchen mit natürlicher Sprache aktivieren"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 103e50639f41dd7ef60dc4172f741333112da18f i18n/deu/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json
-  our    100644 61ec1f313d77efe5b5860e3c6642802def0025cd i18n/deu/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json
-  their  100644 a3591ad9724fb03cb8c2521d6c9c2af7efcff7e6 i18n/deu/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"defaultLabel": "Eingabe",
- 	"useExcludesAndIgnoreFilesDescription": "Ausschlusseinstellungen und Ignorieren von Dateien verwenden"
- }
-\ No newline at end of file
-changed in both
-  base   100644 00be7fe56b6980ff5a5a0a7bbdadeedd1ea55973 i18n/deu/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 5e860baf0d874c2a564e21bd9c48c55877bc2bfd i18n/deu/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 46c50def351cff698382da2a0326b09f2f2c7a31 i18n/deu/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -13,7 +13,11 @@
- 	"totalInfos": "{0}-Informationen",
- 	"problems": "Probleme",
- 	"building": "Wird gebaut...",
-+<<<<<<< .our
- 	"manyProblems": "Über 10.000",
-+=======
-+	"manyMarkers": "mehr als 99",
-+>>>>>>> .their
- 	"runningTasks": "Aktive Aufgaben anzeigen",
- 	"tasks": "Aufgaben",
- 	"TaskSystem.noHotSwap": "Zum Ändern des Aufgabenausführungsmoduls mit einem aktiven Task muss das Fenster erneut geladen werden.",
-changed in both
-  base   100644 197256b0631069c4e5f18ed3af15f3869cde55f6 i18n/deu/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
-  our    100644 dd6cd0fe3650b3300ff531385df5136086c7e7b0 i18n/deu/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
-  their  100644 094d55db2fa008a935b8f6a1579527c9407b9618 i18n/deu/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
-changed in both
-  base   100644 5b756d8c2217a918e9e7298ea9d956f7a270d075 i18n/deu/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  our    100644 4f46618a81282525db957b1ebde7efb9886db7e0 i18n/deu/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  their  100644 0899849a39b4fcf225e8d7643718da15692aeba2 i18n/deu/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-@@ -18,6 +18,10 @@
- 	"ConfigurationParser.missingRequiredProperty": "Fehler: Die Aufgabenkonfiguration \"{0}\" enthält die erforderlich Eigenschaft \"{1}\" nicht. Die Aufgabenkonfiguration wird ignoriert.",
- 	"ConfigurationParser.notCustom": "Fehler: Die Aufgabe ist nicht als benutzerdefinierte Aufgabe deklariert. Die Konfiguration wird ignoriert.\n{0}\n",
- 	"ConfigurationParser.noTaskName": "Fehler: Eine Aufgabe muss eine label-Eigenschaft angeben. Die Aufgabe wird ignoriert.\n{0}\n",
-+<<<<<<< .our
-+=======
-+	"taskConfiguration.shellArgs": "Warnung: Die Aufgabe \"{0}\" ist ein Shellbefehl, und eines seiner Argumente enthält Leerzeichen ohne Escapezeichen. Führen Sie Argumente im Befehl zusammen, um eine korrekte Angabe der Befehlszeile sicherzustellen.",
-+>>>>>>> .their
- 	"taskConfiguration.noCommandOrDependsOn": "Fehler: Aufgabe \"{0}\" definiert keinen Befehl bzw. keine depondsOn-Eigenschaft. Die Aufgabe wird ignoriert. Die Definition lautet:\n{1}",
- 	"taskConfiguration.noCommand": "Fehler: Aufgabe \"{0}\" definiert keinen Befehl. Die Aufgabe wird ignoriert. Die Definition lautet:\n{1}",
- 	"TaskParse.noOsSpecificGlobalTasks": "Die Aufgabenversion 2.0.0 unterstützt globale betriebssystemspezifische Aufgaben nicht. Konvertieren Sie sie in eine Aufgabe mit einem betriebssystemspezifischen Befehl. Folgende Aufgaben sind hiervon betroffen:\n{0}"
-changed in both
-  base   100644 aa687c62c7d9e4cd296fee1102de2c075cfd2eea i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 e7e17f13a867ab30a0455dba8cfbc4967b92e2a0 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 bc6dee18ad00b1f89b8fe4ba9ffad8ea4e5ec37c i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -19,10 +19,15 @@
- 	"terminal.integrated.copyOnSelection": "Wenn gesetzt, wird der im Terminal ausgewählte Text in die Zwischenablage kopiert.",
- 	"terminal.integrated.fontFamily": "Steuert die Schriftartfamilie des Terminals. Der Standardwert ist \"editor.fontFamily\".",
- 	"terminal.integrated.fontSize": "Steuert den Schriftgrad des Terminals in Pixeln.",
-+<<<<<<< .our
- 	"terminal.integrated.letterSpacing": "Steuert den Buchstabenabstand im Terminal. Dies ist ein Integerwert, der die Anzahl der zusätzlichen Pixel zwischen den einzelnen Zeichen darstellt.",
- 	"terminal.integrated.lineHeight": "Steuert die Zeilenhöhe für das Terminal. Dieser Wert wird mit dem Schriftgrad des Terminals multipliziert, um die tatsächliche Zeilenhöhe in Pixeln zu erhalten.",
- 	"terminal.integrated.fontWeight": "Die innerhalb des Terminals zu verwendende Schriftbreite für nicht fetten Text.",
- 	"terminal.integrated.fontWeightBold": "Die innerhalb des Terminals zu verwendende Schriftbreite für fetten Text.",
-+=======
-+	"terminal.integrated.lineHeight": "Steuert die Zeilenhöhe für das Terminal. Dieser Wert wird mit dem Schriftgrad des Terminals multipliziert, um die tatsächliche Zeilenhöhe in Pixeln zu erhalten.",
-+	"terminal.integrated.enableBold": "Gibt an, ob Fettdruck im Terminal aktiviert wird. Dies muss durch die Terminalshell unterstützt werden.",
-+>>>>>>> .their
- 	"terminal.integrated.cursorBlinking": "Steuert, ob der Terminalcursor blinkt.",
- 	"terminal.integrated.cursorStyle": "Steuert den Stil des Terminalcursors.",
- 	"terminal.integrated.scrollback": "Steuert die maximale Anzahl von Zeilen, die das Terminal im Puffer beibehält.",
-changed in both
-  base   100644 ec4d01388dae9001cddc73db6914e6686540da22 i18n/deu/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
-  our    100644 24c1b53c3b98255f636c5587ea10e8b69a8ced87 i18n/deu/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
-  their  100644 b5dcbbd3ffc900bd233160eaefe454bcbe54a798 i18n/deu/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/deu/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
-  our    100644 97095dac5b7cbae70857703eef9319b427782779 i18n/deu/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
-  their  100644 727ecbfc2551da697e2b839634aea868da65eead i18n/deu/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"bubbleTitle": "Enthält hervorgehobene Elemente"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/deu/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
-  our    100644 90d0c7f49d808ee794bad3ac54f074205d5b101f i18n/deu/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
-  their  100644 b92206c2f58a9eeaeab73c96d466a045d177f061 i18n/deu/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"message": "$(zap) Profilieren des Erweiterungshost..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 9dfb4d17ccaffcb0628e762467d57d1cd3258d79 i18n/deu/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-  our    100644 9e2433b45a972658eaacfc782aa0bde370adaf55 i18n/deu/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-  their  100644 37b2e1298941c7f7d3c36d90e561596026496cba i18n/deu/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-@@ -13,6 +13,10 @@
- 	"restart": "Erweiterungshost neu starten",
- 	"overwritingExtension": "Die Erweiterung \"{0}\" wird mit \"{1}\" überschrieben.",
- 	"extensionUnderDevelopment": "Die Entwicklungserweiterung unter \"{0}\" wird geladen.",
-+<<<<<<< .our
- 	"extensionCache.invalid": "Erweiterungen wurden auf der Festplatte geändert. Bitte laden Sie das Fenster erneut.",
- 	"reloadWindow": "Fenster erneut laden"
-+=======
-+	"extensionCache.invalid": "Erweiterungen wurden auf der Festplatte geändert. Bitte laden Sie das Fenster erneut."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 9e3cbe8e7cb0bf908f87412292548419dbeb6850 i18n/deu/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
-  our    100644 a6064ca5ef859e51cac23754703b911bd531d048 i18n/deu/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
-  their  100644 32304e03cea139fe4f815f9abc553bd82baea500 i18n/deu/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
-@@ -24,6 +24,10 @@
- 	"keybindings.json.when": "Die Bedingung, wann der Schlüssel aktiv ist.",
- 	"keybindings.json.args": "Argumente, die an den auszuführenden Befehl übergeben werden sollen.",
- 	"keyboardConfigurationTitle": "Tastatur",
-+<<<<<<< .our
- 	"dispatch": "Steuert die Abgangslogik, sodass bei einem Tastendruck entweder \"code\" (empfohlen) oder \"keyCode\" verwendet wird.",
- 	"touchbar.enabled": "Aktiviert die macOS-Touchbar-Schaltflächen der Tastatur, sofern verfügbar."
-+=======
-+	"dispatch": "Steuert die Abgangslogik, sodass bei einem Tastendruck entweder \"code\" (empfohlen) oder \"keyCode\" verwendet wird."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/deu/src/vs/workbench/services/textfile/common/textFileService.i18n.json
-  our    100644 6cb15c9710e1bb53878914475146c42d14a2aed8 i18n/deu/src/vs/workbench/services/textfile/common/textFileService.i18n.json
-  their  100644 aa9c6a5028013092de636266533d638230064091 i18n/deu/src/vs/workbench/services/textfile/common/textFileService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"files.backup.failSave": "Dateien, die geändert wurden, konnten nicht in den Sicherungsspeicherort geschrieben werden (Fehler: {0}). Speichern Sie zuerst Ihre Dateien, und beenden Sie dann den Vorgang."
- }
-\ No newline at end of file
-changed in both
-  base   100644 5f790214764644f02724172ae3899543496e32ab i18n/esn/extensions/emmet/package.i18n.json
-  our    100644 d6c05800c1ebc6febea004f2095561aeefca8479 i18n/esn/extensions/emmet/package.i18n.json
-  their  100644 eb90ccea6deaf2132592160cee0fe80c7879a7b2 i18n/esn/extensions/emmet/package.i18n.json
-@@ -55,6 +55,7 @@
- 	"emmetPreferencesFilterCommentTrigger": "Una lista separada por comas de nombres de atributos que debe existir en la abreviatura para el filtro de comentarios ser aplicado",
- 	"emmetPreferencesFormatNoIndentTags": "Una matriz de nombres de etiqueta que no debería recibir una sangría interna",
- 	"emmetPreferencesFormatForceIndentTags": "Una matriz de nombres de etiqueta que siempre debería recibir una sangría interna",
-+<<<<<<< .our
- 	"emmetPreferencesAllowCompactBoolean": "Si es 'true', se produce una anotación compacta de atributos booleanos",
- 	"emmetPreferencesCssWebkitProperties": "Propiedades CSS separadas por comas que obtienen el prefijo de proveedor 'webkit' cuando se utilizan en la abreviatura Emmet que comienza con '-'. Establecer en la cadena vacía para evitar siempre el prefijo 'webkit'.",
- 	"emmetPreferencesCssMozProperties": "Propiedades CSS separadas por comas que obtienen el prefijo de proveedor 'moz' cuando se utilizan en la abreviatura Emmet que comienza con '-'. Establecer en la cadena vacía para evitar siempre el prefijo 'moz'.",
-@@ -62,4 +63,7 @@
- 	"emmetPreferencesCssMsProperties": "Propiedades CSS separadas por comas que obtienen el prefijo de proveedor 'ms' cuando se utilizan en la abreviatura Emmet que comienza con '-'. Establecer en la cadena vacía para evitar siempre el prefijo 'ms'.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "La mínima puntuación (de 0 a 1) que se debe alcanzar en la comparación difusa de abreviación. Los valores más bajos pueden producir muchos resultados falsos positivos, los valores más altos pueden reducir posibles coincidencias.",
- 	"emmetOptimizeStylesheetParsing": "Cuando se establece en falso, se analiza el archivo entero para determinar si la posición actual es válida para la expansión de abreviaturas de Emmet. Cuando se establece en verdadero, sólo el contenido alrededor de la posición actual en archivos css, scss/less es analizado."
-+=======
-+	"emmetPreferencesAllowCompactBoolean": "Si es 'true', se produce una anotación compacta de atributos booleanos"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d6be2f08ce4b06c6771c505c7fddf31193922832 i18n/esn/src/vs/code/node/cliProcessMain.i18n.json
-  our    100644 bc66e0c14ce3f1e94050789a5a4f92c6fe8570cd i18n/esn/src/vs/code/node/cliProcessMain.i18n.json
-  their  100644 9ce3d98ae5ded8d8f33b88a980a3ec3e9a5af7f3 i18n/esn/src/vs/code/node/cliProcessMain.i18n.json
-changed in both
-  base   100644 97f2cfda15af6cdcbc7c00e763675ee070f1bdb4 i18n/esn/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 6ad3e3ebd5e87cf26a1b950237c8c58f3d92b674 i18n/esn/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 582dfe7c78ff3f9e1e74ab5530c86c597d062bc6 i18n/esn/src/vs/editor/common/config/commonEditorConfig.i18n.json
-changed in both
-  base   100644 69ac193ad0d95ec12947230493f780d5c42539ce i18n/esn/src/vs/editor/contrib/folding/folding.i18n.json
-  our    100644 f4c68c1342592d94e34dde26b301eb0930ece87f i18n/esn/src/vs/editor/contrib/folding/folding.i18n.json
-  their  100644 0db9b485ab2e93de29e13034fd3397adc7a05337 i18n/esn/src/vs/editor/contrib/folding/folding.i18n.json
-changed in both
-  base   100644 e7d97465a8cf857d04a7d8d4f9b8af29a4d17dc2 i18n/esn/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 b4899e15c5b89e537d227799bd60ed681404b6ca i18n/esn/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 37027504432c32285d2a3cdf76345ec0ffcb0222 i18n/esn/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,8 +10,21 @@
- 	"diff": "Comparar dos archivos entre sí.",
- 	"add": "Agregar carpetas a la última ventana activa.",
- 	"goto": "Abrir un archivo en la ruta de acceso de la línea y posición de carácter especificadas.",
-+<<<<<<< .our
- 	"newWindow": "Fuerza para abrir una nueva ventana.",
- 	"reuseWindow": "Forzar para abrir un archivo o carpeta en la última ventana activa.",
-+=======
-+	"locale": "La configuración regional que se usará (por ejemplo, en-US o zh-TW).",
-+	"newWindow": "Fuerce una nueva instancia de Code.",
-+	"performance": "Comience con el comando 'Developer: Startup Performance' habilitado.",
-+	"prof-startup": "Ejecutar generador de perfiles de CPU durante el inicio",
-+	"inspect-extensions": "Permitir la depuración y el perfil de las extensiones. Revisar las herramientas de desarrollador para la conexión uri.",
-+	"inspect-brk-extensions": "Permitir la depuración y el perfil de las extensiones con el host de la extensión pausado después del inicio. Revisar las herramientas de desarrollador para la conexión uri.",
-+	"reuseWindow": "Fuerce la apertura de un archivo o carpeta en la última ventana activa.",
-+	"userDataDir": "Especifica el directorio en que se conservan los datos de usuario; es útil cuando se ejecuta como raíz.",
-+	"log": "Nivel de registro a utilizar. Por defecto es 'info'. Los valores permitidos son 'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off'.",
-+	"verbose": "Imprima salidas detalladas (implica --wait).",
-+>>>>>>> .their
- 	"wait": "Espere a que los archivos sean cerrados antes de volver.",
- 	"locale": "La configuración regional que se usará (por ejemplo, en-US o zh-TW).",
- 	"userDataDir": "Especifica el directorio donde se guardan los datos del usuario. Se puede utilizar para abrir varias instancias de código distintas.",
-changed in both
-  base   100644 69c31d25805439fc1da285651034a32f2f22e8ba i18n/esn/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 89fe344b57b1d619a163cac9c32cff2261374fbd i18n/esn/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 81432663720a6a4eb93f9b7fae88edbba3a3eaac i18n/esn/src/vs/workbench/electron-browser/actions.i18n.json
-@@ -50,6 +50,30 @@
- 	"moveWindowTabToNewWindow": "Mover pestaña de ventana a una nueva ventana",
- 	"mergeAllWindowTabs": "Fusionar todas las ventanas",
- 	"toggleWindowTabsBar": "Alternar barra de pestañas de ventana",
-+<<<<<<< .our
- 	"about": "Acerca de {0}",
- 	"inspect context keys": "Inspeccionar claves de contexto"
-+=======
-+	"configureLocale": "Configurar idioma",
-+	"displayLanguage": "Define el lenguaje para mostrar de VSCode.",
-+	"doc": "Consulte {0} para obtener una lista de idiomas compatibles.",
-+	"restart": "Al cambiar el valor se requiere reiniciar VSCode.",
-+	"fail.createSettings": "No se puede crear '{0}' ({1}).",
-+	"openLogsFolder": "Abrir carpeta de registros",
-+	"showLogs": "Mostrar registros...",
-+	"mainProcess": "Principal",
-+	"sharedProcess": "Compartido",
-+	"rendererProcess": "Renderizador",
-+	"extensionHost": "Host de extensión",
-+	"selectProcess": "Seleccionar proceso",
-+	"setLogLevel": "Establecer nivel de registro",
-+	"trace": "Seguimiento",
-+	"debug": "Depurar",
-+	"info": "Información",
-+	"warn": "Advertencia",
-+	"err": "Error",
-+	"critical": "Crítico",
-+	"off": "Apagado",
-+	"selectLogLevel": "Seleccione el nivel de registro"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 b7bc040a66a33913bf7bb335fb63a35e7f11b93d i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 d28e2c7b8c0f100d21de57741d72f030bc22f977 i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 4a2a19ab863f71ae26e0a204e2ae65177e8ede27 i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -13,12 +13,18 @@
- 	"breakpointAdded": "Punto de interrupción agregado, línea {0}, archivo {1}",
- 	"breakpointRemoved": "Punto de interrupción quitado, línea {0}, archivo {1}",
- 	"compoundMustHaveConfigurations": "El compuesto debe tener configurado el atributo \"configurations\" a fin de iniciar varias configuraciones.",
-+<<<<<<< .our
- 	"noConfigurationNameInWorkspace": "No se pudo encontrar la configuración de inicio ' {0} ' en el espacio de trabajo.",
- 	"multipleConfigurationNamesInWorkspace": "Hay varias configuraciones de inicio \"{0}\" en el área de trabajo. Use el nombre de la carpeta para calificar la configuración.",
- 	"noFolderWithName": "No se puede encontrar la carpeta con el nombre ' {0} ' para la configuración ' {1} ' en el compuesto ' {2} '.",
- 	"configMissing": "La configuración \"{0}\" falta en \"launch.json\".",
- 	"launchJsonDoesNotExist": "'launch.json' no existe.",
- 	"debugRequestNotSupported": "El atributo \"{0}\" tiene un valor no admitido ({1}) en la configuración de depuración elegida.",
-+=======
-+	"configMissing": "La configuración \"{0}\" falta en \"launch.json\".",
-+	"launchJsonDoesNotExist": "'launch.json' no existe.",
-+	"debugRequestNotSupported": "El atributo '{0}' tiene un valor no admitido '{1}' en la configuración de depuración seleccionada.",
-+>>>>>>> .their
- 	"debugRequesMissing": "El atributo '{0}' está ausente en la configuración de depuración elegida. ",
- 	"debugTypeNotSupported": "El tipo de depuración '{0}' configurado no es compatible.",
- 	"debugTypeMissing": "Falta la propiedad \"type\" en la configuración de inicio seleccionada.",
-changed in both
-  base   100644 9671e111767bd7e929b1d7ad6e2127826bc83cb4 i18n/esn/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
-  our    100644 905390396295768c2023afb367bb3f622452f4d5 i18n/esn/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
-  their  100644 4d8d31b0d545c4b3d7155770907efb1d221a9438 i18n/esn/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"ratedByUsers": "Calificado por {0} usuarios",
- 	"ratedBySingleUser": "Calificado por 1 usuario"
- }
-\ No newline at end of file
-changed in both
-  base   100644 e86ad1697c178ec384e27c99201aff0987b535ca i18n/esn/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  our    100644 2dd035c28fdef3fa3b55cd25845e4c542bfe6d90 i18n/esn/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  their  100644 09f3e4dd1671a253f8ef4470dbec84eba11107c5 i18n/esn/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-changed in both
-  base   100644 dad0465be35e4d82b751d059ebbe73e8a60c0d2d i18n/esn/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
-  our    100644 2040b61c7cb1d7017bd8afc8f63f61171dd9f8bc i18n/esn/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
-  their  100644 ce5331764d68ee0a8a62bfbc06b690b6845ff913 i18n/esn/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/esn/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
-  our    100644 00c836be4c5945a31eda41ab9bc4748b9f0f2509 i18n/esn/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
-  their  100644 41edb4e2c275a1738b491fac05342c7191aaa329 i18n/esn/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"message": "Perfiles del Host de Extensiones $(zap)... "
- }
-\ No newline at end of file
-changed in both
-  base   100644 175d70aeb655615d521235f542732c29f1df73fd i18n/fra/extensions/emmet/package.i18n.json
-  our    100644 2b38d968d648e0792cab88ddd57aa657ed8e85b3 i18n/fra/extensions/emmet/package.i18n.json
-  their  100644 d8ebfe9b25cda7526cb4d294a63589a63b640a16 i18n/fra/extensions/emmet/package.i18n.json
-@@ -55,6 +55,7 @@
- 	"emmetPreferencesFilterCommentTrigger": "Une liste séparée par des virgules de noms d’attributs qui devraient exister en abrégé pour que le filtre de commentaire soit appliqué",
- 	"emmetPreferencesFormatNoIndentTags": "Un tableau de noms de balises qui ne devraient pas être indentées",
- 	"emmetPreferencesFormatForceIndentTags": "Un tableau de noms de balises qui devraient toujours être indentées",
-+<<<<<<< .our
- 	"emmetPreferencesAllowCompactBoolean": "Si true, la notation compacte des attributs booléens est produite",
- 	"emmetPreferencesCssWebkitProperties": "Les propriétés css séparées par des virgules qui ont un préfixe 'webkit' vendor lorsqu’elles sont utilisées dans une abréviation emmet qui commence par '-'. Mettre une chaîne vide pour éviter le préfixe 'webkit'.",
- 	"emmetPreferencesCssMozProperties": "Les propriétés css séparées par des virgules qui ont un préfixe 'moz' vendor lorsqu’elles sont utilisées dans une abréviation emmet qui commence par '-'. Mettre une chaîne vide pour éviter le préfixe 'moz'.",
-@@ -62,4 +63,7 @@
- 	"emmetPreferencesCssMsProperties": "Les propriétés css séparées par des virgules qui ont un préfixe 'ms' vendor lorsqu’elles sont utilisées dans une abréviation emmet qui commence par '-'. Mettre une chaîne vide pour éviter le préfixe 'ms'.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "La note minimale (de 0 à 1) que la correspondance de l'abréviation (fuzzy-matched) devrait atteindre. Des valeurs plus faibles peuvent produire de nombreuses correspondances de faux-positifs, des valeurs plus élevées peuvent réduire les correspondances possibles.",
- 	"emmetOptimizeStylesheetParsing": "Si défini à false, la fichier entier est analysé pour déterminer si la position courante est valide pour l’expansion des abréviations Emmet. Si défini à true, seul le contenu autour de la position actuelle dans les fichiers css/scss/less est analysé."
-+=======
-+	"emmetPreferencesAllowCompactBoolean": "Si true, la notation compacte des attributs booléens est produite"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 0a97aaf8721361462f012bbb5b70497844c10f5a i18n/fra/src/vs/code/node/cliProcessMain.i18n.json
-  our    100644 906e5063debca653de9c881ea1e708d09084b7f0 i18n/fra/src/vs/code/node/cliProcessMain.i18n.json
-  their  100644 839a1ac0317fa494c64b894f84bb98d1ec5990ca i18n/fra/src/vs/code/node/cliProcessMain.i18n.json
-changed in both
-  base   100644 f74e6c1fbc06efc508716307ad174a78e2bd0903 i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 1ad1b4ad7ba3d841a13ddfeab561381b182d7f45 i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 dd19016cb459a92b6c18acdc20e0d80133be0e99 i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json
-changed in both
-  base   100644 a019089db96d5a6a6e1904a18221ce8412c58534 i18n/fra/src/vs/editor/contrib/folding/folding.i18n.json
-  our    100644 695d18c0962ecc1dc3d2d15f8959386a0a854126 i18n/fra/src/vs/editor/contrib/folding/folding.i18n.json
-  their  100644 475f08c4a6f2de9871a00b1ea94122e0602f19d2 i18n/fra/src/vs/editor/contrib/folding/folding.i18n.json
-changed in both
-  base   100644 f1c7f8375eb18f10c194fa0892586787847c12a2 i18n/fra/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 3a6ec15a4d0b2f141967d5aa037637bcdca560c3 i18n/fra/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 f676e6c787f3387989d02061946c3167f2b6852a i18n/fra/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,8 +10,21 @@
- 	"diff": "Comparez deux fichiers entre eux.",
- 	"add": "Ajoutez un ou plusieurs dossiers à la dernière fenêtre active.",
- 	"goto": "Ouvrez un fichier dans le chemin, à la ligne et la position de caractère spécifiées.",
-+<<<<<<< .our
- 	"newWindow": "Force à ouvrir une nouvelle fenêtre.",
- 	"reuseWindow": "Force à ouvrir un fichier ou un dossier dans la dernière fenêtre active.",
-+=======
-+	"locale": "Paramètres régionaux à utiliser (exemple : fr-FR ou en-US).",
-+	"newWindow": "Forcez l'utilisation d'une nouvelle instance de Code.",
-+	"performance": "Démarrez avec la commande 'Développeur : performance de démarrage' activée.",
-+	"prof-startup": "Exécuter le profileur d'UC au démarrage",
-+	"inspect-extensions": "Autorise le débogage et le profilage des extensions. Vérifier les outils de développements pour l'uri de connexion.",
-+	"inspect-brk-extensions": "Autorise le débogage et le profilage des extensions avec l'hôte d'extensions en pause après le démarrage. Vérifier les outils de développement pour l'uri de connexion.",
-+	"reuseWindow": "Forcez l'ouverture d'un fichier ou dossier dans la dernière fenêtre active.",
-+	"userDataDir": "Spécifie le répertoire où sont conservées les données des utilisateurs. S'avère utile pour une exécution en tant que root.",
-+	"log": "Niveau de journalisation à utiliser. La valeur par défaut est 'info'. Les valeurs autorisées sont 'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off.",
-+	"verbose": "Affichez la sortie détaillée (implique --wait).",
-+>>>>>>> .their
- 	"wait": "Attendre que les fichiers soient fermés avant de retourner.",
- 	"locale": "Paramètres régionaux à utiliser (exemple : fr-FR ou en-US).",
- 	"userDataDir": "Spécifie le répertoire de l’utilisateur dans lequel les données sont conservées. Peut être utilisé pour ouvrir plusieurs instances distinctes du Code.",
-changed in both
-  base   100644 0e453c54e870059ee4105a58985bdb969d8a38de i18n/fra/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 8f9f7eb339d47d55df577bac8ccf306bd77eb0fa i18n/fra/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 541429a54086804cccb221a94137634a9048efc9 i18n/fra/src/vs/workbench/electron-browser/actions.i18n.json
-@@ -50,6 +50,30 @@
- 	"moveWindowTabToNewWindow": "Déplacer l’onglet de la fenêtre vers la nouvelle fenêtre",
- 	"mergeAllWindowTabs": "Fusionner toutes les fenêtres",
- 	"toggleWindowTabsBar": "Activer/désactiver la barre de fenêtres d’onglets",
-+<<<<<<< .our
- 	"about": "À propos de {0}",
- 	"inspect context keys": "Inspecter les clés de contexte"
-+=======
-+	"configureLocale": "Configurer la langue",
-+	"displayLanguage": "Définit le langage affiché par VSCode.",
-+	"doc": "Consultez {0} pour connaître la liste des langues prises en charge.",
-+	"restart": "Le changement de la valeur nécessite le redémarrage de VS Code.",
-+	"fail.createSettings": "Impossible de créer '{0}' ({1}).",
-+	"openLogsFolder": "Ouvrir le dossier des journaux",
-+	"showLogs": "Afficher les journaux...",
-+	"mainProcess": "Principal",
-+	"sharedProcess": "Partagé",
-+	"rendererProcess": "Renderer",
-+	"extensionHost": "Hôte de l’extension",
-+	"selectProcess": "Sélectionner le processus",
-+	"setLogLevel": "Définir le niveau de journalisation (log)",
-+	"trace": "Trace",
-+	"debug": "Déboguer",
-+	"info": "Informations",
-+	"warn": "Avertissement",
-+	"err": "Erreur",
-+	"critical": "Critique",
-+	"off": "Désactivé",
-+	"selectLogLevel": "Sélectionner le niveau de journalisation (log)"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 3aa861894070e3d101bcba20aa731532785a5e38 i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 dc9d0f20d0f5632bb197839a3ff1ba56a6ca08d4 i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 2833b451b2874fad8f7b9029aa70cb849da3fa80 i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -13,9 +13,12 @@
- 	"breakpointAdded": "Point d'arrêt ajouté, ligne {0}, fichier {1}",
- 	"breakpointRemoved": "Point d'arrêt supprimé, ligne {0}, fichier {1}",
- 	"compoundMustHaveConfigurations": "L'attribut \"configurations\" du composé doit être défini pour permettre le démarrage de plusieurs configurations.",
-+<<<<<<< .our
- 	"noConfigurationNameInWorkspace": "La configuration de lancement '{0}' est introuvable dans l’espace de travail.",
- 	"multipleConfigurationNamesInWorkspace": "Il y a plusieurs configurations de lancement `{0}` dans l’espace de travail. Utilisez le nom du dossier pour qualifier la configuration.",
- 	"noFolderWithName": "Impossible de trouver le dossier avec le nom '{0}' pour la configuration '{1}' dans le composé '{2}'.",
-+=======
-+>>>>>>> .their
- 	"configMissing": "Il manque la configuration '{0}' dans 'launch.json'.",
- 	"launchJsonDoesNotExist": "'launch.json' n’existe pas.",
- 	"debugRequestNotSupported": "L’attribut '{0}' a une valeur '{1}' non prise en charge dans la configuration de débogage sélectionnée.",
-changed in both
-  base   100644 e686f1aac70136cdea4409e62e8c16574af55844 i18n/fra/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
-  our    100644 b7e49db40781e133d82ce62a0c655b3f1d47455e i18n/fra/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
-  their  100644 6a9b09723ba44779c435dc4bdf876ba128a0c5ae i18n/fra/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"ratedByUsers": "Évaluée par {0} utilisateurs",
- 	"ratedBySingleUser": "Évaluée par 1 utilisateur"
- }
-\ No newline at end of file
-changed in both
-  base   100644 ded2c0dd4761a045428e35639cb416892f120f29 i18n/hun/extensions/css/client/out/cssMain.i18n.json
-  our    100644 762d665d83d73a24718352604eedbddd3dbdb79e i18n/hun/extensions/css/client/out/cssMain.i18n.json
-  their  100644 e5331e1a5acee61ee591ba2e7c10fe23f04765fe i18n/hun/extensions/css/client/out/cssMain.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"cssserver.name": "CSS nyelvi szerver",
- 	"folding.start": "Összecsukható tartomány kezdete",
- 	"folding.end": "Összecsukható tartomány vége"
-changed in both
-  base   100644 99db67d814e60fa16a36637c92e279535cf0d2a9 i18n/hun/extensions/emmet/package.i18n.json
-  our    100644 4e87769482abf2ce774993c5210487918395fb71 i18n/hun/extensions/emmet/package.i18n.json
-  their  100644 65869470a93f230348bdbcecb003736df72d7b97 i18n/hun/extensions/emmet/package.i18n.json
-@@ -55,6 +55,7 @@
- 	"emmetPreferencesFilterCommentTrigger": "Attribútumnevek vesszővel elválasztott listája, amelyeknek léteznie kell a megjegyzésszűrő alkalmazásához.",
- 	"emmetPreferencesFormatNoIndentTags": "Azon elemek neveit tartalmazó tömb, melyek nem kapnak belső indentálást",
- 	"emmetPreferencesFormatForceIndentTags": "Azon elemek neveit tartalmazó tömb, melyek mindig kapnak belső indentálást",
-+<<<<<<< .our
- 	"emmetPreferencesAllowCompactBoolean": "Ha az értéke true, a logikai értékeket tartalmazó attribútumok esetén a rövidített jelölés lesz használva",
- 	"emmetPreferencesCssWebkitProperties": "CSS-tulajdonságok vesszővel ellátott listája, melyek 'webkit' gyártói előtagot kapnak azoknál az Emmet-rövidtéseknél, melyek `-` karakterrel kezdődnek. Állítsa üres szövegre, ha soha nem szeretne 'webkit' előtagot használni.",
- 	"emmetPreferencesCssMozProperties": "CSS-tulajdonságok vesszővel ellátott listája, melyek 'moz' gyártói előtagot kapnak azoknál az Emmet-rövidtéseknél, melyek `-` karakterrel kezdődnek. Állítsa üres szövegre, ha soha nem szeretne 'moz' előtagot használni.",
-@@ -62,4 +63,7 @@
- 	"emmetPreferencesCssMsProperties": "CSS-tulajdonságok vesszővel ellátott listája, melyek 'ms' gyártói előtagot kapnak azoknál az Emmet-rövidtéseknél, melyek `-` karakterrel kezdődnek. Állítsa üres szövegre, ha soha nem szeretne 'ms' előtagot használni.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "A minimális pontszám (0-tól 1-ig), amit egy fuzzy keresési találatnak el kell érnie. Az alacsonyabb értékek álpozitív találatokat eredményezhetnek, míg a magasabb értékek szűkítik a lehetséges találatok számát.",
- 	"emmetOptimizeStylesheetParsing": "Ha az értéke false, az egész fájl fel lesz dolgozva annak meghatározásához, hogy az aktuális pozíció ércényes-e Emmet-rövidítések kibontásához. Ha az értéke true, csak az aktuális pozíció körüli tartalom lesz feldolgozva a CSS/SCSS/LESS-fájlokban."
-+=======
-+	"emmetPreferencesAllowCompactBoolean": "Ha az értéke true, a logikai értékeket tartalmazó attribútumok esetén a rövidített jelölés lesz használva"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 75a82e6ba00de05700f099e08dd5d3110d4dfc86 i18n/hun/extensions/git/out/commands.i18n.json
-  our    100644 affdd78fc14682c19c792c8ead9202e7167f2315 i18n/hun/extensions/git/out/commands.i18n.json
-  their  100644 d2dfa251e5d25cb8285a926f608ff708bb006a41 i18n/hun/extensions/git/out/commands.i18n.json
-@@ -13,9 +13,12 @@
- 	"selectFolder": "Válassza ki a forráskódtár helyét!",
- 	"cloning": "'{0}' git forráskódtár klónozása...",
- 	"proposeopen": "Szeretné megnyitni a klónozott forráskódtárat?",
-+<<<<<<< .our
- 	"openrepo": "Forráskódtár megnyitása",
- 	"add": "Hozzáadás a munkaterülethez",
- 	"proposeopen2": "Szeretné megnyitni a klónozott forráskódtára, vagy hozzáadni az aktuális munkaterülethez?",
-+=======
-+>>>>>>> .their
- 	"init": "Válasszon munkaterületi mappát a Git-forráskódtár inicializálásához!",
- 	"init repo": "Forráskódtár előkészítése",
- 	"create repo": "Forráskódtár előkészítése",
-changed in both
-  base   100644 3aff5dce6a06a16504b2a89675efc7a0bd570bc0 i18n/hun/extensions/html/client/out/htmlMain.i18n.json
-  our    100644 8b705a97409c7a80f7300d609ccc8501a9584d1f i18n/hun/extensions/html/client/out/htmlMain.i18n.json
-  their  100644 c7c371e8738bc252722555f58f0bb5e100cc1eef i18n/hun/extensions/html/client/out/htmlMain.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"htmlserver.name": "HTML nyelvi szerver",
- 	"folding.start": "Összecsukható tartomány kezdete",
- 	"folding.end": "Összecsukható tartomány vége"
-changed in both
-  base   100644 ffe920fbb7938720c602e14a0da4221d4a147eb8 i18n/hun/src/vs/editor/contrib/folding/folding.i18n.json
-  our    100644 9db50f44e4c77a78c20f6509156fcad4f0bca67b i18n/hun/src/vs/editor/contrib/folding/folding.i18n.json
-  their  100644 510a0072235656e9f8d3bba5e42ea46046b4479f i18n/hun/src/vs/editor/contrib/folding/folding.i18n.json
-changed in both
-  base   100644 0346bdf35893cd5089a86ab86a546de9aa7e484c i18n/hun/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 77c071af2b9d55c9f89889f4eaba840c5ab42297 i18n/hun/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 acbe400a835f132893c2b46d80667e338e47014e i18n/hun/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,8 +10,21 @@
- 	"diff": "Két fájl összehasonlítása egymással.",
- 	"add": "Mappá(k) hozzáadása a legutolsó aktív ablakhoz.",
- 	"goto": "Megnyitja a megadott elérési úton található fájlt a megadott sornál és oszlopnál.",
-+<<<<<<< .our
- 	"newWindow": "Mindenképp új ablakban nyíljon meg",
- 	"reuseWindow": "Fájl vagy mappa a legutolsó aktív ablakban nyíljon meg.",
-+=======
-+	"locale": "A használt lokalizáció (pl. en-US vagy zh-TW)",
-+	"newWindow": "Mindenképp induljon új példány a Code-ból.",
-+	"performance": "Indítás a 'Developer: Startup Performance' parancs engedélyezésével.",
-+	"prof-startup": "Processzorhasználat profilozása induláskor",
-+	"inspect-extensions": "Hibakeresés és profilozás engedélyezése a kiegészítőkben. Ellenőrizze a fejlesztői eszközöket a csatlakozási URI-hoz.",
-+	"inspect-brk-extensions": "Hibakeresés és profilozás engedélyezése a kiegészítőkben, úgy, hogy a kiegészítő gazdafolyamata szüneteltetve lesz az indítás után. Ellenőrizze a fejlesztői eszközöket a csatlakozási URI-hoz. ",
-+	"reuseWindow": "Fájl vagy mappa megnyitása a legutoljára aktív ablakban.",
-+	"userDataDir": "Meghatározza a könyvtárat, ahol a felhasználói adatok vannak tárolva. Hasznás, ha rootként van futtatva.",
-+	"log": "A naplózott események szintje.Az 'info' az alapértelmezett értéke. Lehetséges értékek: 'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off'.",
-+	"verbose": "Részletes kimenet kiírása (magába foglalja a --wait kapcsolót)",
-+>>>>>>> .their
- 	"wait": "Várjon a fájlok bezárására a visszatérés előtt.",
- 	"locale": "A használt lokalizáció (pl. en-US vagy zh-TW)",
- 	"userDataDir": "Meghatározza azt a mappát, ahol a felhasználói adatok vannak tárolva. Egyszerre több megnyitott Code-példány is használhatja.",
-changed in both
-  base   100644 99cb4104dec6e991e0f9d9f8b0259630ff8ff936 i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 d46bba56fc807a6d58f940f4f326c6859150d33d i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 8ea74e99bd6838f742fea28519b979f023400abb i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -13,9 +13,12 @@
- 	"breakpointAdded": "Töréspont hozzáadva, {0}. sor, fájl: {1}",
- 	"breakpointRemoved": "Töréspont eltávoíltva, {0}. sor, fájl: {1}",
- 	"compoundMustHaveConfigurations": "A kombinációk \"configurations\" tulajdonságát be kell állítani több konfiguráció elindításához.",
-+<<<<<<< .our
- 	"noConfigurationNameInWorkspace": "A(z) '{0}' indítási konfiguráció nem található a munkaterületen.",
- 	"multipleConfigurationNamesInWorkspace": "Több '{0}' névvel rendelkező indítási konfiguráció is van a munkaterületen. Használja a mappa nevét a konfiguráció pontos megadásához!",
- 	"noFolderWithName": "Nem található '{0}' nevű mappa a(z) '{1}' konfigurációhoz a(z) '{2}' összetett konfigurációban.",
-+=======
-+>>>>>>> .their
- 	"configMissing": "A(z) '{0}' konfiguráció hiányzik a 'launch.json'-ból.",
- 	"launchJsonDoesNotExist": "A 'launch.json' nem létezik.",
- 	"debugRequestNotSupported": "A(z) '{0}' attribútumnak nem támogatott értéke van ('{1}') a kiválasztott hibakeresési konfigurációban.",
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/hun/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
-  our    100644 051204473d6a8ac77ea13c4b019eddf7c42e3339 i18n/hun/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
-  their  100644 9bf53a3a15ab4985ca13717c01e6827c90d48564 i18n/hun/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"ratedByUsers": "{0} felhasználó értékelte",
- 	"ratedBySingleUser": "1 felhasználó értékelte"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-  our    100644 be33ca1c92f7e17fa11e2cb1bc14bf43fab6b0e0 i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-  their  100644 e51e9974cf6135e0e2804513571fcb62aa61b32d i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,5 +11,13 @@
- 	"restart2": "Kiegészítők profilozásához újraindítás szükséges. Szeretné újraindítani az alkalmazást?",
- 	"restart3": "Újraindítás",
- 	"cancel": "Mégse",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"selectAndStartDebug": "Kattintson a profilozás leállításához!"
- }
-\ No newline at end of file
-changed in both
-  base   100644 661261d0b488df9a3a6b59be348d40a3a2c394fa i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
-  our    100644 7fd3eb0dca50399b27dc25471210fe389f559107 i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
-  their  100644 871b3dc27b8958a1f5f18978ab23a9ad1d1f8970 i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
-@@ -15,6 +15,10 @@
- 	"developer": "Fejlesztői",
- 	"extensionsConfigurationTitle": "Kiegészítők",
- 	"extensionsAutoUpdate": "Kiegészítők automatikus frissítése",
-+<<<<<<< .our
- 	"extensionsIgnoreRecommendations": "Ha az értéke true, nem jelenik meg több kiegészítőajánlást tartalmazó értesítés.",
- 	"extensionsShowRecommendationsOnlyOnDemand": "Ha az értéke true, az ajánlatok csak akkor lesznek lekérve és megjelenítve, ha a felhasználó konkrétan kéri őket."
-+=======
-+	"extensionsIgnoreRecommendations": "Ha az értéke true, nem jelenik meg több kiegészítőajánlást tartalmazó értesítés."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 89b9332aaf7cef83cbb8678fbfbc620fbc709754 i18n/hun/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
-  our    100644 751d687e6f8c3823fcbb1f7789bc243280817544 i18n/hun/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
-  their  100644 43614d6d37be37b0ca3172968d8b40d8e1ea9126 i18n/hun/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -9,6 +10,11 @@
- 	"starActivation": "Indulásnál aktiválódott",
- 	"workspaceContainsGlobActivation": "Azért aktiválódott, mert létezik a következőre illeszkedő fájl a munkaterületen: {0}",
- 	"workspaceContainsFileActivation": "Azért aktiválódott, mert van {0} nevű fájl a munkaterületen ",
-+=======
-+	"starActivation": "Indulásnál aktiválódott",
-+	"workspaceContainsGlobActivation": "Azért aktiválódott, mert a következőre illeszkedő fájl létezik a munkaterületen: {0}",
-+	"workspaceContainsFileActivation": "Azért aktiválódott, mert {0} nevű fájl létezik a munkaterületen",
-+>>>>>>> .their
- 	"languageActivation": "Azért aktiválódott, mert megnyitott egy {0} fájlt.",
- 	"workspaceGenericActivation": "A következő miatt aktiválódott: {0}",
- 	"errors": "{0} kezeletlen hiba",
-changed in both
-  base   100644 b4c839776a9959f9036b2a9f175a3ba29ad5bc0f i18n/hun/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
-  our    100644 24d59de9298a8d6c06cfafd5c772ad8a1f7adb2d i18n/hun/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
-  their  100644 7ff857a3c189ea64fca502f091507e83529be625 i18n/hun/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/hun/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
-  our    100644 47a54ef7b7dfd7c77d85251646ac0bdebe171085 i18n/hun/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
-  their  100644 18419b7630f21fc9b4f6095aa30c03f887b9257e i18n/hun/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"message": "$(zap) Kiegészítő gazdafolyamat profilozása..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 dd506bf2042e26a527d28352a9f02a7ebdf84cf2 i18n/hun/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-  our    100644 a6ca11e97bf931156bbcea0e55d23d51e07fc42c i18n/hun/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-  their  100644 50fa8eeeefc5212b150f58936a423abc73275393 i18n/hun/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-@@ -13,6 +13,10 @@
- 	"restart": "Kiegészítő gazdafolyamatának újraindítása",
- 	"overwritingExtension": "A(z) {0} kiegészítő felülírása a következővel: {1}.",
- 	"extensionUnderDevelopment": "A(z) {0} elérési úton található fejlesztői kiegészítő betöltése",
-+<<<<<<< .our
- 	"extensionCache.invalid": "A kiegészítők módosultak a lemezen. Töltse újra az ablakot!",
- 	"reloadWindow": "Ablak újratöltése"
-+=======
-+	"extensionCache.invalid": "A kiegészítők módosultak a lemezen. Töltse újra az ablakot!"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 0fb3f4a3ac87498f6d16a17fdca0e59b833b0226 i18n/ita/extensions/css/client/out/cssMain.i18n.json
-  our    100644 49766496907e094f203877f0173ad950ad32b149 i18n/ita/extensions/css/client/out/cssMain.i18n.json
-  their  100644 ba180eb149930be7bb404e689aefca1aee6e264e i18n/ita/extensions/css/client/out/cssMain.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"cssserver.name": "Server di linguaggio CSS",
- 	"folding.start": "Inizio di una regione riducibile",
- 	"folding.end": "Fine di una regione riducibile"
-changed in both
-  base   100644 d4e654204c056e466af017efb9e553db06ab716c i18n/ita/extensions/emmet/package.i18n.json
-  our    100644 325af035e69c09e1e32c51cdc976ffb0a4047641 i18n/ita/extensions/emmet/package.i18n.json
-  their  100644 01c2ca68c2965f2546e0d46292a8fbd5650e14de i18n/ita/extensions/emmet/package.i18n.json
-@@ -55,6 +55,7 @@
- 	"emmetPreferencesFilterCommentTrigger": "Un elenco delimitato da virgole di nomi di attributi che dovrebbero esistere come abbreviazione per il filtro commenti da applicare",
- 	"emmetPreferencesFormatNoIndentTags": "Una matrice di nomi di tag che non dovrebbe ottenere il rientro interno",
- 	"emmetPreferencesFormatForceIndentTags": "Una matrice di nomi di tag che dovrebbe sempre ottenere il rientro interno",
-+<<<<<<< .our
- 	"emmetPreferencesAllowCompactBoolean": "Se true, viene prodotta una notazione compatta degli attributi booleani",
- 	"emmetPreferencesCssWebkitProperties": "Proprietà CSS delimitate da virgola che assumono il prefisso 'webkit' del vendor quando utilizzate nelle abbreviazioni di Emmet che iniziano per '-'. Per evitare sempre il prefisso 'webkit' impostare stringa vuota.",
- 	"emmetPreferencesCssMozProperties": "Proprietà CSS delimitate da virgola che assumono il prefisso 'moz' del vendor quando utilizzate nelle abbreviazioni di Emmet che iniziano per '-'. Per evitare sempre il prefisso 'moz' impostare stringa vuota.",
-@@ -62,4 +63,7 @@
- 	"emmetPreferencesCssMsProperties": "Proprietà CSS delimitate da virgola che assumono il prefisso 'ms' del vendor quando utilizzate nelle abbreviazioni di Emmet che iniziano per '-'. Per evitare sempre il prefisso 'ms' impostare stringa vuota.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "Il valore minimo (da 0 a 1) che dovrebbe raggiungere un'abbreviazione di fuzzy-match. I valori più bassi possono produrre molti falsi positivi, i valori più alti possono ridurre le possibili corrispondenze.",
- 	"emmetOptimizeStylesheetParsing": "Se è impostato su false, l'intero file viene analizzato per determinare se la posizione corrente è valida per l'espansione delle abbreviazioni di Emmet. Se è impostato su true, viene analizzato solo il contenuto circostante alla posizione corrente nei file css/scss/less."
-+=======
-+	"emmetPreferencesAllowCompactBoolean": "Se true, viene prodotta una notazione compatta degli attributi booleani"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 93fbf7a8a39572c2a81d08af9f41c7a12ff1ed6f i18n/ita/extensions/git/out/autofetch.i18n.json
-  our    100644 204ce5999322752d9ff0594e13195091068c5a02 i18n/ita/extensions/git/out/autofetch.i18n.json
-  their  100644 b51df7e140de3cfa8d940b59564fd038dcddaade i18n/ita/extensions/git/out/autofetch.i18n.json
-@@ -8,6 +8,11 @@
- 	],
- 	"yes": "Sì",
- 	"no": "No",
-+<<<<<<< .our
- 	"not now": "Chiedimelo in seguito",
- 	"suggest auto fetch": "Desideri che Code [esegua `git fetch` periodicamente]({0})?"
-+=======
-+	"not now": "Non ora",
-+	"suggest auto fetch": "Vorresti attivare il fetching automatico di repository Git?"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 3d1d3e71eaee85226f33411f9227fad700bb6e67 i18n/ita/extensions/git/out/commands.i18n.json
-  our    100644 b8b9f0490197b0e5904f4f035caca3a7f04c7df9 i18n/ita/extensions/git/out/commands.i18n.json
-  their  100644 b544cb5ca24aa5dfa2984deb2835a530ad9c1af6 i18n/ita/extensions/git/out/commands.i18n.json
-@@ -13,9 +13,12 @@
- 	"selectFolder": "Seleziona il Percorso del Repository",
- 	"cloning": "Clonazione del repository GIT '{0}'...",
- 	"proposeopen": "Aprire il repository clonato?",
-+<<<<<<< .our
- 	"openrepo": "Apri repository",
- 	"add": "Aggiungi all'Area di Lavoro",
- 	"proposeopen2": "Vuoi aprire il repository clonato o aggiungerlo all'area di lavoro corrente?",
-+=======
-+>>>>>>> .their
- 	"init": "Selezionare la cartella dell'area di lavoro in cui inizializzare il Git repo",
- 	"init repo": "Inizializza repository",
- 	"create repo": "Inizializza repository",
-changed in both
-  base   100644 7fc7257ad8ee2c124a6964069e6ec92c39406521 i18n/ita/extensions/git/out/main.i18n.json
-  our    100644 528e87d5fde6f184e54d8250c4f6f9245b1f97db i18n/ita/extensions/git/out/main.i18n.json
-  their  100644 657b68a5882777c0c3580154b8a10e8a5a42f12f i18n/ita/extensions/git/out/main.i18n.json
-@@ -8,7 +8,11 @@
- 	],
- 	"looking": "Ricerca di git in: {0}",
- 	"using git": "Uso di GIT {0} da {1}",
-+<<<<<<< .our
- 	"downloadgit": "Scarica GIT",
-+=======
-+	"downloadgit": "Scarica Git",
-+>>>>>>> .their
- 	"neverShowAgain": "Non visualizzare più questo messaggio",
- 	"notfound": "Git non trovato. Installarlo o configurarlo utilizzando l'impostazione 'git.path'.",
- 	"updateGit": "Aggiorna GIT",
-changed in both
-  base   100644 4c23aba5a2e36104379d183f463de89b24c047e0 i18n/ita/extensions/git/package.i18n.json
-  our    100644 3e99eceff18f0bd1805288644f15d41ccf24de7a i18n/ita/extensions/git/package.i18n.json
-  their  100644 9e6cd77fdcb7c0b7d80d392d1869617f246229f7 i18n/ita/extensions/git/package.i18n.json
-changed in both
-  base   100644 dd2cc39c679bac430120caae1d1edd68c0e804c6 i18n/ita/extensions/html/client/out/htmlMain.i18n.json
-  our    100644 8313a5f7e1b9e829c796806899c34473e92611c8 i18n/ita/extensions/html/client/out/htmlMain.i18n.json
-  their  100644 81abd3e79975a81bd321f8b951bf0f0d4f213f8d i18n/ita/extensions/html/client/out/htmlMain.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -9,4 +10,9 @@
- 	"htmlserver.name": "Server di linguaggio HTML",
- 	"folding.start": "Inizio di una regione riducibile",
- 	"folding.end": "Fine di una regione riducibile"
-+=======
-+	"htmlserver.name": "Server di linguaggio HTML",
-+	"folding.start": "Inizio di una regione riducibile",
-+	"folding.end": "Fine regione riducibile"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 2448cc1f0e072ceac01543a2371f68795610053a i18n/ita/extensions/markdown/out/commands.i18n.json
-  our    100644 ac76c4524dc501f27f48eee1dca6fd28b6a5723d i18n/ita/extensions/markdown/out/commands.i18n.json
-  their  100644 385404beefc784bc7b093ba89cd98b0ec2382a1d i18n/ita/extensions/markdown/out/commands.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"previewTitle": "Anteprima {0}",
- 	"onPreviewStyleLoadError": "Impossibile caricare 'markdown.styles': {0}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 0b73b98c61cff8571fae1e87fa72257c21d48ec0 i18n/ita/extensions/markdown/out/security.i18n.json
-  our    100644 17900416bd63016cb376b5bd866dbacf0ec6bdd5 i18n/ita/extensions/markdown/out/security.i18n.json
-  their  100644 82c72e77e6a8120c0ccc0006baa138a78ead642a i18n/ita/extensions/markdown/out/security.i18n.json
-@@ -15,6 +15,10 @@
- 	"moreInfo.title": "Altre informazioni",
- 	"enableSecurityWarning.title": "Abilita anteprima degli avvisi di protezione in questa area di lavoro",
- 	"disableSecurityWarning.title": "Disabilita anteprima degli avvisi di protezione in questa area di lavoro",
-+<<<<<<< .our
- 	"toggleSecurityWarning.description": "Non influisce sul livello di sicurezza del contenuto",
-+=======
-+	"toggleSecurityWarning.description": "Non influenza il livello di sicurezza del contenuto",
-+>>>>>>> .their
- 	"preview.showPreviewSecuritySelector.title": "Seleziona impostazioni di protezione per le anteprime Markdown in questa area di lavoro"
- }
-\ No newline at end of file
-changed in both
-  base   100644 323397967e1728a04b889c7549602c99656726d9 i18n/ita/extensions/merge-conflict/package.i18n.json
-  our    100644 5c38762d3e8c4cd42b57674af9fd95cb84d87932 i18n/ita/extensions/merge-conflict/package.i18n.json
-  their  100644 fc64b94112dca4e129971aa424c3d3e37285875a i18n/ita/extensions/merge-conflict/package.i18n.json
-changed in both
-  base   100644 70df4761df522b5a4d08f3aa5c6e31754fd3b43a i18n/ita/extensions/typescript/out/features/completionItemProvider.i18n.json
-  our    100644 86de96163a75ba238c08f0271916ac0716533c9c i18n/ita/extensions/typescript/out/features/completionItemProvider.i18n.json
-  their  100644 c662f167afb736695beedc231ed9070dd114378d i18n/ita/extensions/typescript/out/features/completionItemProvider.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"selectCodeAction": "Selezionare l'azione codice da applicare",
- 	"acquiringTypingsLabel": "Acquisizione dei file typings...",
- 	"acquiringTypingsDetail": "Acquisizione delle definizioni dei file typings per IntelliSense.",
-changed in both
-  base   100644 90fdc6f7bc0f9a9b89b6aef76e928fa6df3b686d i18n/ita/src/vs/code/electron-main/main.i18n.json
-  our    100644 f2ca8e2c497f2273ba504238ce5a96472585261b i18n/ita/src/vs/code/electron-main/main.i18n.json
-  their  100644 9c1ef35e983633f45804bfe0ee2b4861039c503b i18n/ita/src/vs/code/electron-main/main.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"secondInstanceNoResponse": "Un'altra istanza di {0} è in esecuzione ma non risponde",
- 	"secondInstanceNoResponseDetail": "Chiudere tutte le altre istanze e riprovare.",
- 	"secondInstanceAdmin": "Una seconda istanza di {0} è già in esecuzione come amministratore.",
-changed in both
-  base   100644 d476d47bdc57dff865b286cc2d07ca3a4d6f75db i18n/ita/src/vs/code/electron-main/menus.i18n.json
-  our    100644 a5f6c5e0343adf224d6df3a61663d9695836512e i18n/ita/src/vs/code/electron-main/menus.i18n.json
-  their  100644 728d24a70611e79c8f5d5974c253f687d44e2f6f i18n/ita/src/vs/code/electron-main/menus.i18n.json
-@@ -161,7 +161,10 @@
- 	"mMergeAllWindows": "Unisci tutte le finestre",
- 	"miToggleDevTools": "&&Attiva/Disattiva strumenti di sviluppo",
- 	"miAccessibilityOptions": "&&Opzioni accessibilità",
-+<<<<<<< .our
- 	"miOpenProcessExplorerer": "Apri &&Process Explorer",
-+=======
-+>>>>>>> .their
- 	"miReportIssue": "&&Segnala problema",
- 	"miWelcome": "&&Benvenuti",
- 	"miInteractivePlayground": "Playground &&interattivo",
-@@ -189,5 +192,12 @@
- 	"miDownloadingUpdate": "Download dell'aggiornamento...",
- 	"miInstallUpdate": "Installa aggiornamento...",
- 	"miInstallingUpdate": "Installazione dell'aggiornamento...",
-+<<<<<<< .our
- 	"miRestartToUpdate": "Riavvia per aggiornare..."
-+=======
-+	"miCheckForUpdates": "Verifica disponibilità aggiornamenti...",
-+	"aboutDetail": "Versione {0}\nCommit {1}\nData {2}\nShell {3}\nRenderer {4}\nNodo {5}\nArchitettura {6}",
-+	"okButton": "OK",
-+	"copy": "&&Copia"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 814141efbe98d32139d495ca77fe1d788f3b6ee4 i18n/ita/src/vs/code/node/cliProcessMain.i18n.json
-  our    100644 d2d7924208d6985500a774c97653f49b26fb6085 i18n/ita/src/vs/code/node/cliProcessMain.i18n.json
-  their  100644 65d929e5fb32b3ba36be53a2c86380a8b4f85b97 i18n/ita/src/vs/code/node/cliProcessMain.i18n.json
-changed in both
-  base   100644 1c04d1c06aefd44a895ebde7eb4b42df280ba14a i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 f91d8d15e9f7c53e3b2a0166aab270c9bf1f772e i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 99d10858e0709d519335020016e89ff83886bd5a i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json
-changed in both
-  base   100644 cebd48ad3bd515f8f5b9b44843ff5a4ec57b747f i18n/ita/src/vs/editor/contrib/folding/folding.i18n.json
-  our    100644 1c2fdee7f80c430c9371d4a38be2073d645859ae i18n/ita/src/vs/editor/contrib/folding/folding.i18n.json
-  their  100644 2a546151b452946a8f231ceb47774ef454a80cd1 i18n/ita/src/vs/editor/contrib/folding/folding.i18n.json
-changed in both
-  base   100644 871d55bf6d3ced69c178dbc19ee918360d43889d i18n/ita/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 9db983246eacb0b2b4bfd0f1c8d91ee5c10e2e9a i18n/ita/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 194dc9d937c95859b7ae7875cbd542c08c06b7ba i18n/ita/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,8 +10,21 @@
- 	"diff": "Confronta due file tra loro.",
- 	"add": "Aggiunge la cartella o le cartelle all'ultima finestra attiva.",
- 	"goto": "Apre un file nel percorso alla posizione specificata di riga e carattere.",
-+<<<<<<< .our
- 	"newWindow": "Forza l'apertura di una nuova finestra.",
- 	"reuseWindow": "Forza l'apertura di un file o di una cartella nell'ultima finestra attiva.",
-+=======
-+	"locale": "Impostazioni locali da usare, ad esempio en-US o it-IT.",
-+	"newWindow": "Forza una nuova istanza di Code.",
-+	"performance": "Eseguire l'avvio con il comando 'Developer: Startup Performance' abilitato.",
-+	"prof-startup": "Esegui il profiler della CPU durante l'avvio",
-+	"inspect-extensions": "Consentire il debug e profiling delle estensioni. Controllare gli strumenti di sviluppo per l'uri di connessione.",
-+	"inspect-brk-extensions": "Consentire il debug e profiling delle estensioni con l'host di estensione in pausa dopo inizio. Controllare gli strumenti di sviluppo per l'uri di connessione.",
-+	"reuseWindow": "Forza l'apertura di un file o di una cartella nell'ultima finestra attiva.",
-+	"userDataDir": "Consente di specificare la directory in cui si trovano i dati utente. Utile quando viene eseguito come root.",
-+	"log": "Livello di logging da utilizzare. Il valore predefinito è 'info'. I valori consentiti sono 'critical, 'error', 'warn', 'info', 'debug', 'trace', 'off'.",
-+	"verbose": "Visualizza l'output dettagliato (implica --wait).",
-+>>>>>>> .their
- 	"wait": "Attendere la chiusura dei file prima della restituzione.",
- 	"locale": "Impostazioni locali da usare, ad esempio en-US o it-IT.",
- 	"userDataDir": "Consente di specificare la directory in cui si trovano i dati utente. Può essere usata per aprire più istanze diverse di Code.",
-@@ -32,8 +45,14 @@
- 	"inspect-extensions": "Consente il debug e profiling delle estensioni. Controllare gli strumenti di sviluppo per la URI di connessione.",
- 	"inspect-brk-extensions": "Consente di eseguire debug e profilatura delle estensioni con l'host dell'estensione messo in pausa dopo l'avvio. Controllare gli strumenti di sviluppo per l'URI di connessione.",
- 	"disableGPU": "Disabilita l'accelerazione hardware della GPU.",
-+<<<<<<< .our
- 	"uploadLogs": "Caricamento dei log della sessione corrente verso un punto di comunicazione sicuro.",
- 	"maxMemory": "Dimensione massima della memoria per una finestra (in Mbytes).",
-+=======
-+	"status": "Stampare le informazioni di utilizzo e diagnostica di processo.",
-+	"version": "Visualizza la versione.",
-+	"help": "Visualizza la sintassi.",
-+>>>>>>> .their
- 	"usage": "Utilizzo",
- 	"options": "opzioni",
- 	"paths": "percorsi",
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/ita/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json
-  our    100644 a4a126f602de14af6fc552395137369c45aaf5b3 i18n/ita/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json
-  their  100644 e535e7a4f8b83032cd50f2acbad08c94146a42d6 i18n/ita/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"notCompatibleDownload": "Impossibile scaricare perché non è stata trovata l'estensione compatibile con la versione corrente '{0}' di VS Code."
- }
-\ No newline at end of file
-changed in both
-  base   100644 39a1c28e54eccf36e710e896ef7e83aecaf8688b i18n/ita/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 35f8ed83f0da1c4a75798a67e5b16affcd21632f i18n/ita/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 f82303364610623245f511acc588590a5af5d0fa i18n/ita/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -7,6 +7,7 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"invalidManifest": "Estensione non valida: package.json non è un file JSON.",
-+<<<<<<< .our
- 	"incompatible": "Impossibile installare l'estensione '{0}' in quanto non è compatibile con VS Code '{1}'.",
- 	"restartCode": "Riavviare Code prima di reinstallare {0}.",
- 	"installingOutdatedExtension": "Una versione più recente di questa estensione è già installata. Vuoi eseguire l'override di questa con la versione precedente?",
-@@ -22,6 +23,16 @@
- 	"quitCode": "Impossibile installare l'estensione. Riavviare VS Code prima di procedere ad un nuovo setup.",
- 	"exitCode": "Impossibile installare l'estensione. Riavviare VS Code prima di procedere ad un nuovo setup.",
- 	"renameError": "Errore sconosciuto durante la ridenominazione di {0} in {1}",
-+=======
-+	"restartCodeLocal": "Riavviare Code prima di reinstallare {0}.",
-+	"installingOutdatedExtension": "Una versione più recente di questa estensione è già installata. Vuoi eseguire l'override di questa con la versione precedente?",
-+	"override": "Eseguire l'override",
-+	"cancel": "Annulla",
-+	"notFoundCompatible": "Impossibile installare perché non è stata trovata l'estensione '{0}' compatibile con la versione corrente '{1}' di VS Code.",
-+	"quitCode": "Impossibile installare perché un'istanza obsoleta dell'estensione è ancora in esecuzione. Si prega di uscire e riavviare VS Code prima di reinstallare.",
-+	"exitCode": "Impossibile installare perché un'istanza obsoleta dell'estensione è ancora in esecuzione. Si prega di uscire e riavviare VS Code prima di reinstallare.",
-+	"notFoundCompatibleDependency": "Impossibile installare perché non è stata trovata l'estensione dipendente '{0}' compatibile con la versione corrente '{1}' di VS Code.",
-+>>>>>>> .their
- 	"uninstallDependeciesConfirmation": "Disinstallare solo '{0}' o anche le relative dipendenze?",
- 	"uninstallOnly": "Solo Estensioni",
- 	"uninstallAll": "Disinstalla tutti",
-changed in both
-  base   100644 20c377c85083741b03e8cea1393a41820a29d51d i18n/ita/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
-  our    100644 f793c5994e0a634925bb40cdd2b97d23d61684bb i18n/ita/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
-  their  100644 1eabda0d35db8b35ffb005f466e37f26930a8140 i18n/ita/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
-changed in both
-  base   100644 7564483e276300e61057a51e79d3804dcdb90ddc i18n/ita/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
-  our    100644 8b19a3a5d088317951bdfd3535f2d22a5ae9ba07 i18n/ita/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
-  their  100644 f174c284bff456a63dfff78ed6c473e56142f176 i18n/ita/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"largeNumberBadge": "Più di 10.000",
- 	"badgeTitle": "{0} - {1}",
- 	"additionalViews": "Visualizzazioni aggiuntive",
-changed in both
-  base   100644 29413ba4c6c28cfbe9ecb4e4d4dbda37814d5afe i18n/ita/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  our    100644 5a34fab0153073ac4fb299fb69d62730cb37cc6a i18n/ita/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  their  100644 0e49511fa544f8bb8b1399692fefdd6a2f5c053d i18n/ita/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-@@ -8,5 +8,11 @@
- 	],
- 	"editorCommand.activeEditorMove.description": "Consente di spostare l'editor attivo per schede o gruppi",
- 	"editorCommand.activeEditorMove.arg.name": "Argomento per spostamento editor attivo",
-+<<<<<<< .our
- 	"editorCommand.activeEditorMove.arg.description": "Proprietà degli argomenti:\n\t* 'to': valore stringa che specifica dove eseguire lo spostamento.\n\t* 'by': valore stringa che specifica l'unità per lo spostamento, ovvero per scheda o per gruppo.\n\t* 'value': valore numerico che specifica il numero di posizioni o una posizione assoluta per lo spostamento."
-+=======
-+	"editorCommand.activeEditorMove.arg.description": "Proprietà degli argomenti:\n\t* 'to': valore stringa che specifica dove eseguire lo spostamento.\n\t* 'by': valore stringa che specifica l'unità per lo spostamento, ovvero per scheda o per gruppo.\n\t* 'value': valore numerico che specifica il numero di posizioni o una posizione assoluta per lo spostamento.",
-+	"commandDeprecated": "Il comando **{0}** è stato rimosso. In alternativa, usare **{1}**",
-+	"openKeybindings": "Configura tasti di scelta rapida"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 702864ad03aeebcd68e7aa0d827353573f1c7291 i18n/ita/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 9737d645d67a50d571dc86669b68ed740de20eba i18n/ita/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 ac85b55822ecb116e00b5b2b2635f000c1b16c96 i18n/ita/src/vs/workbench/electron-browser/actions.i18n.json
-@@ -50,6 +50,30 @@
- 	"moveWindowTabToNewWindow": "Sposta scheda della finestra in una nuova finestra",
- 	"mergeAllWindowTabs": "Unisci tutte le finestre",
- 	"toggleWindowTabsBar": "Attiva/Disattiva barra delle schede delle finestre",
-+<<<<<<< .our
- 	"about": "Informazioni su {0}",
- 	"inspect context keys": "Esamina le chiavi di contesto"
-+=======
-+	"configureLocale": "Configura lingua",
-+	"displayLanguage": "Definisce la lingua visualizzata di VSCode.",
-+	"doc": "Per un elenco delle lingue supportate, vedere {0}.",
-+	"restart": "Se si modifica il valore, è necessario riavviare VSCode.",
-+	"fail.createSettings": "Non è possibile creare '{0}' ({1}).",
-+	"openLogsFolder": "Apri cartella dei log",
-+	"showLogs": "Mostra log...",
-+	"mainProcess": "Principale",
-+	"sharedProcess": "Condiviso",
-+	"rendererProcess": "Renderer",
-+	"extensionHost": "Host dell'estensione",
-+	"selectProcess": "Seleziona il processo",
-+	"setLogLevel": "Imposta livello log",
-+	"trace": "Analisi",
-+	"debug": "Debug",
-+	"info": "Informazioni",
-+	"warn": "Avviso",
-+	"err": "Errore",
-+	"critical": "Errori critici",
-+	"off": "Disattivato",
-+	"selectLogLevel": "Seleziona il livello log"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 0f9e509d30ba9ca87736ac32afd2d6bdea1b7f83 i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 16fec1a5d98f225249a95297ad06c45ba75efafc i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 14e407b8a5d2dd18080b98db4aeceb6e82efc738 i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,8 +35,14 @@
- 	"panelDefaultLocation": "Controlla la posizione predefinita del pannello. Può essere mostrato nella parte inferiore o a destra del banco di lavoro.",
- 	"statusBarVisibility": "Controlla la visibilità della barra di stato nella parte inferiore del workbench.",
- 	"activityBarVisibility": "Controlla la visibilità della barra attività nel workbench.",
-+<<<<<<< .our
- 	"viewVisibility": "Controlla la visibilità delle azioni dell'intestazione della visualizzazione. Le azioni dell'intestazione della visualizzazione possono essere sempre visibili oppure visibili solo quando lo stato attivo è spostato sulla visualizzazione o si passa con il puntatore sulla visualizzazione.",
- 	"fontAliasing": "Controlla il metodo di aliasing dei caratteri nell'area di lavoro.\n- default: anti-aliasing dei caratteri a livello di sub-pixel. Nella maggior parte delle visualizzazioni non retina consentirà di ottenere un testo con il massimo contrasto.\n- antialiased: anti-aliasing dei caratteri a livello di pixel, invece che a livello di sub-pixel. Consente di visualizzare i caratteri più chiari.\n- none: disabilita l'anti-aliasing dei caratteri. Il testo verrà visualizzato con contorni irregolari.\n- auto: applica automaticamente `default` o `antialiased` in base al valore DPI degli schermi.",
-+=======
-+	"closeOnFileDelete": "Controlla se gli editor che visualizzano un file devono chiudersi automaticamente quando il file viene eliminato o rinominato da un altro processo. Se si disabilita questa opzione, in una simile circostanza l'editor verrà aperto e i file risulteranno modificati ma non salvati. Nota: se si elimina il file dall'interno dell'applicazione, l'editor verrà sempre chiuso e i file modificati ma non salvati non verranno mai chiusi allo scopo di salvaguardare i dati.",
-+	"enableNaturalLanguageSettingsSearch": "Controlla se abilitare la modalità di ricerca in linguaggio naturale per le impostazioni.",
-+	"fontAliasing": "Controlla il metodo di aliasing dei caratteri nell'area di lavoro.\n- impostazione predefinita: anti-aliasing dei caratteri a livello di sub-pixel. Nella maggior parte delle visualizzazioni non retina consentirà di ottenere un testo con il massimo contrasto.\n- anti-aliasing: anti-aliasing dei caratteri a livello di pixel, invece che a livello di sub-pixel. Consente di visualizzare i caratteri più chiari.\n- nessuno: disabilita l'anti-aliasing dei caratteri. Il testo verrà visualizzato con contorni irregolari.",
-+>>>>>>> .their
- 	"workbench.fontAliasing.default": "Anti-aliasing dei caratteri a livello di sub-pixel. Nella maggior parte delle visualizzazioni non retina consentirà di ottenere un testo con il massimo contrasto.",
- 	"workbench.fontAliasing.antialiased": "Anti-aliasing dei caratteri a livello di pixel, invece che a livello di sub-pixel. Consente di visualizzare i caratteri più chiari.",
- 	"workbench.fontAliasing.none": "Disabilita l'anti-aliasing dei caratteri. Il testo verrà visualizzato con contorni irregolari. ",
-changed in both
-  base   100644 7a0c9c59e957be9235e6ab768301dfc2699baf50 i18n/ita/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  our    100644 6b44ed029fe95ee65797c44b98a611e088a91461 i18n/ita/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  their  100644 54fcb973a535b6d7aa51077f7df11d236adf0212 i18n/ita/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-@@ -21,12 +21,20 @@
- 	"allowBreakpointsEverywhere": "Consente l'impostazione del punto di interruzione in qualsiasi file",
- 	"openExplorerOnEnd": "Apre automaticamente la visualizzazione di esplorazione al termine di una sessione di debug",
- 	"inlineValues": "Mostra i valori delle variabili inline nell'editor durante il debug",
-+<<<<<<< .our
- 	"toolBarLocation": "Controlla la posizione della barra degli strumenti di debug. Le opzioni sono: \"floating\", ovvero mobile in tutte le visualizzazioni, \"docked\", ovvero ancorata nella visualizzazione di debug oppure \"hidden\", ovvero nascosta",
-+=======
-+	"hideActionBar": "Controlla se nascondere la barra delle azioni mobile di debug",
-+>>>>>>> .their
- 	"never": "Non mostrare mai debug nella barra di stato",
- 	"always": "Visualizzare sempre debug nella barra di stato",
- 	"onFirstSessionStart": "Mostra debug nella barra solo stato dopo il primo avvio del debug",
- 	"showInStatusBar": "Controlla se rendere visibile la barra di stato del debug",
-+<<<<<<< .our
- 	"openDebug": "Controlla se la visualizzazione di debug debba essere aperta all'avvio della sessione di debug.",
- 	"enableAllHovers": "Controlla se è necessario abilitare i passaggi del mouse non di debug durante il debug. Se è true, i provider di passaggi del mouse verranno chiamati per fornire un passaggio del mouse. I passaggi del mouse normali non verranno visualizzati anche se il valore di questa impostazione è true.",
-+=======
-+	"openDebug": "Controlla se la viewlet di debug debba essere aperta all'avvio della sessione di debug.",
-+>>>>>>> .their
- 	"launch": "Configurazione globale per l'esecuzione del debug. Può essere usata come un'alternativa a \"launch.json\" "
- }
-\ No newline at end of file
-changed in both
-  base   100644 c4da42088b5462f2d2dacbae105fcc14f910a1b7 i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 c085858a8c6aed272feca37cbd61f5b25e9ca236 i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 f162ddc21b6856e29eb5556a6a6e4bb4c4cfb000 i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -13,9 +13,12 @@
- 	"breakpointAdded": "Aggiunto un punto di interruzione a riga {0} del file {1}",
- 	"breakpointRemoved": "Rimosso un punto di interruzione a riga {0} del file {1}",
- 	"compoundMustHaveConfigurations": "Per avviare più configurazioni, deve essere impostato l'attributo \"configurations\" dell'elemento compounds.",
-+<<<<<<< .our
- 	"noConfigurationNameInWorkspace": "Non è stato possibile trovare la configurazione di avvio '{0}' nell'area di lavoro.",
- 	"multipleConfigurationNamesInWorkspace": "Nell'area di lavoro sono presenti più configurazioni di avvio '{0}'. Usare il nome di cartella per qualificare la configurazione.",
- 	"noFolderWithName": "La cartella denominata '{0}' per la configurazione '{1}' nell'elemento compounds '{2}' non è stata trovata.",
-+=======
-+>>>>>>> .their
- 	"configMissing": "In 'launch.json' manca la configurazione '{0}'.",
- 	"launchJsonDoesNotExist": "'launch.json' non esiste.",
- 	"debugRequestNotSupported": "Nella configurazione di debug scelta l'attributo '{0}' ha un valore non supportato '{1}'.",
-changed in both
-  base   100644 64cacf41da1818d0936e28b1cacc04ff1633df52 i18n/ita/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-  our    100644 c10190882f00393c01c73ca439ba4da4fc843e7f i18n/ita/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-  their  100644 0f0d43dc77d52f00e45aec533dac900e3823b428 i18n/ita/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-@@ -9,7 +9,10 @@
- 	"name": "Nome dell'estensione",
- 	"extension id": "Identificatore dell'estensione",
- 	"preview": "Anteprima",
-+<<<<<<< .our
- 	"builtin": "Predefinita",
-+=======
-+>>>>>>> .their
- 	"publisher": "Nome dell'editore",
- 	"install count": "Conteggio delle installazioni",
- 	"rating": "Valutazione",
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
-  our    100644 c8974951f6c5b6e41ec2f5a841c4703257952656 i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
-  their  100644 e6237e881bdd744be4698a683a8cfe313a60508e i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"ratedByUsers": "Valutato da {0} utenti",
- 	"ratedBySingleUser": "Valutato da 1 utente"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-  our    100644 122ac0848d21abbe53ae3ebabaf3b1c9842cdf10 i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-  their  100644 d3895e27f4dfc4d1f75235cf92aeaf1e77a6e24e i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,5 +11,13 @@
- 	"restart2": "Per eseguire la profilatura delle estensioni, è richiesto un riavvio. Riavviare '{0}' ora?",
- 	"restart3": "Riavvia",
- 	"cancel": "Annulla",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"selectAndStartDebug": "Fare clic per arrestare la profilatura."
- }
-\ No newline at end of file
-changed in both
-  base   100644 ada39f95c93cec7f944915b0d1060524ff059e02 i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
-  our    100644 73ccd10b71ccebeb15eed555b68a1c8e6c10a2eb i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
-  their  100644 4664107eeb28d7e44905d690473b4bfbadc7b11d i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
-@@ -15,6 +15,10 @@
- 	"developer": "Sviluppatore",
- 	"extensionsConfigurationTitle": "Estensioni",
- 	"extensionsAutoUpdate": "Aggiorna automaticamente le estensioni",
-+<<<<<<< .our
- 	"extensionsIgnoreRecommendations": "Se impostato a true, le notifiche delle raccomandazioni dell'estensione non verranno più mostrate.",
- 	"extensionsShowRecommendationsOnlyOnDemand": "Se impostato su true, le raccomandazioni non verranno recuperate o modificate a meno che non sia specificamente richiesto dall'utente."
-+=======
-+	"extensionsIgnoreRecommendations": "Se impostato a true, le notifiche delle raccomandazioni dell'estensione non verranno più mostrate."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d7a84eb6e65adefc4a1d8417ef85e6f59ac3a468 i18n/ita/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
-  our    100644 d8fc4374e9aae0699b46a1a777fa5cd748ebbdae i18n/ita/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
-  their  100644 ef42850ea002697c5321f021f69613217291a3a4 i18n/ita/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"starActivation": "Attivata all'avvio",
- 	"workspaceContainsGlobActivation": "Attivata perché nell'area di lavoro è presente un file corrispondente a {0}",
- 	"workspaceContainsFileActivation": "Attivata perché nell'area di lavoro è presente il file {0}",
-changed in both
-  base   100644 08176692fa739b0524e4f2de4486962ad6381e3f i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  our    100644 f659f351cf6a9bd615c47ae466bed823f6c0842e i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  their  100644 979ee1896bb4a0ed40f3dc0f15d528c50ff49c3c i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-@@ -9,6 +9,7 @@
- 	"filesCategory": "File",
- 	"revealInSideBar": "Visualizza nella barra laterale",
- 	"acceptLocalChanges": "Utilizzare le modifiche e sovrascrivere il contenuto del disco",
-+<<<<<<< .our
- 	"revertLocalChanges": "Annullare le modifiche e tornare al contenuto sul disco",
- 	"copyPathOfActive": "Copia percorso del file attivo",
- 	"saveAllInGroup": "Salva tutto nel gruppo",
-@@ -32,4 +33,7 @@
- 	"closeSaved": "Chiudi salvati",
- 	"closeAll": "Chiudi tutto",
- 	"deleteFile": "Elimina definitivamente"
-+=======
-+	"revertLocalChanges": "Annullare le modifiche e tornare al contenuto sul disco"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 976c0a1a9f7ac27ba900293e934503dd022067d8 i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 be168507f7ffd1be04bdbdbb14365762be628f25 i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 7d23a38e70345906d2303122bbd907e2d0b21fb4 i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -51,6 +51,11 @@
- 	"duplicateFile": "Duplicato",
- 	"globalCompareFile": "Confronta file attivo con...",
- 	"openFileToCompare": "Aprire prima un file per confrontarlo con un altro file.",
-+<<<<<<< .our
-+=======
-+	"compareWith": "Confronta '{0}' con '{1}'",
-+	"compareFiles": "Confronta file",
-+>>>>>>> .their
- 	"refresh": "Aggiorna",
- 	"saveAllInGroup": "Salva tutto nel gruppo",
- 	"focusOpenEditors": "Stato attivo su visualizzazione editor aperti",
-@@ -67,6 +72,11 @@
- 	"fileNameExistsError": "In questo percorso esiste già un file o una cartella **{0}**. Scegliere un nome diverso.",
- 	"invalidFileNameError": "Il nome **{0}** non è valido per un nome file o un nome di cartella. Scegliere un nome diverso.",
- 	"filePathTooLongError": "Con il nome **{0}** il percorso diventa troppo lungo. Scegliere un nome più breve.",
-+<<<<<<< .our
-+=======
-+	"compareWithSaved": "Confronta file attivo con file salvato",
-+	"modifiedLabel": "{0} (su disco) ↔ {1}",
-+>>>>>>> .their
- 	"compareWithClipboard": "Confronta il file attivo con gli appunti",
- 	"clipboardComparisonLabel": "Appunti ↔ {0}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 d240e8fc0752b832b44bdb301c40424964e3e35b i18n/ita/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 a29bf6c8fddc26469df2a03b0634b7525ec1e6dc i18n/ita/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 6fb07e8966ee518868af4ed7683ea01b1010f41f i18n/ita/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-changed in both
-  base   100644 4427bde01efbcef2d42e4180a190d82227718bc8 i18n/ita/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json
-  our    100644 c5eee3d232d0898fb56d464bfef210f4d8aafe49 i18n/ita/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json
-  their  100644 0fc4ed5c41b35a4c01d513ba5da1996757fd4aa2 i18n/ita/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json
-changed in both
-  base   100644 e0b8c74653bb2c7e54a4cf0848524a40512779e1 i18n/ita/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.i18n.json
-  our    100644 a8895546c98c289ecb980aaa34d9f59733bcca6c i18n/ita/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.i18n.json
-  their  100644 cee0d8e205d7b567c54fa176282b57b1cccf7c27 i18n/ita/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -9,4 +10,8 @@
- 	"label": "Esplora risorse",
- 	"canNotResolve": "Non è possibile risolvere la cartella dell'area di lavoro",
- 	"symbolicLlink": "Collegamento simbolico"
-+=======
-+	"label": "Esplora risorse",
-+	"canNotResolve": "Non è possibile risolvere la cartella dell'area di lavoro"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/ita/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json
-  our    100644 8c26d708058e3a7ce54e0261792495143f773c3e i18n/ita/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json
-  their  100644 3c7de14078210017563c6ce7b166daee8fedc664 i18n/ita/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"totalProblems": "Totale {0} problemi",
- 	"filteredProblems": "Mostrando {0} di {1} problemi"
- }
-\ No newline at end of file
-changed in both
-  base   100644 e60e5ecc05213c74f42802b8316a6bf5275f0acb i18n/ita/src/vs/workbench/parts/markers/common/messages.i18n.json
-  our    100644 c69fa3b4ca1f52f43b5f29fa9b4d56c7496d7921 i18n/ita/src/vs/workbench/parts/markers/common/messages.i18n.json
-  their  100644 5e585c6ea401a6decbb3a6fa908c9d0a7d3d4d6c i18n/ita/src/vs/workbench/parts/markers/common/messages.i18n.json
-@@ -7,8 +7,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"viewCategory": "Visualizza",
-+<<<<<<< .our
- 	"problems.view.toggle.label": "Attiva/Disattiva Problemi (Errori, Avvisi, Informazioni)",
- 	"problems.view.focus.label": "Sposta lo stato attivo su problemi (Errori, Avvisi, Informazioni)",
-+=======
-+	"problems.view.toggle.label": "Attiva/disattiva problemi",
-+	"problems.view.focus.label": "Problemi di Focus",
-+>>>>>>> .their
- 	"problems.panel.configuration.title": "Visualizzazione Problemi",
- 	"problems.panel.configuration.autoreveal": "Controlla se la visualizzazione Problemi deve visualizzare automaticamente i file durante l'apertura",
- 	"markers.panel.title.problems": "Problemi",
-changed in both
-  base   100644 4d00ef4a86325c8e86c52d4c979f80713c984c24 i18n/ita/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
-  our    100644 a0be1c98b14bfb028f73af78f2cedb467677146f i18n/ita/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
-  their  100644 6e8f4c9cca2f4358959a66c67f3e246da62b4139 i18n/ita/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,8 @@
- 	],
- 	"defineKeybinding.oneExists": "Questo tasto di scelta rapida è assegnato a 1 comando esistente",
- 	"defineKeybinding.existing": "Questo tasto di scelta rapida è assegnato a {0} comandi esistenti",
-+=======
-+>>>>>>> .their
- 	"defineKeybinding.initial": "Premere la combinazione di tasti desiderata, quindi INVIO.",
- 	"defineKeybinding.chordsTo": "premi contemporaneamente per"
- }
-\ No newline at end of file
-changed in both
-  base   100644 a5a6e8a1bba618f8563057ec727f26f48bf8469a i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  our    100644 89b7fb9711b0bbc9cde43748de484037bba899db i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  their  100644 344b356cf42d4f97fcbf169841c9e0a00162e7ba i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -9,6 +10,9 @@
- 	"openRawDefaultSettings": "Apri impostazioni predefinite non elaborate",
- 	"openSettings2": "Apri impostazioni (anteprima)",
- 	"openSettings": "Apri impostazioni",
-+=======
-+	"openRawDefaultSettings": "Apri impostazioni predefinite non elaborate",
-+>>>>>>> .their
- 	"openGlobalSettings": "Apri impostazioni utente",
- 	"openGlobalKeybindings": "Apri tasti di scelta rapida",
- 	"openGlobalKeybindingsFile": "Apri file dei tasti di scelta rapida",
-changed in both
-  base   100644 4669fa3cd569668aa151bf2371615c0405cad3df i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 fe346036c36b558ff4bb96cc47cf0bc0e91a4106 i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 7c1a3a7d3098bd08a59acf5cb5b4879d594479f6 i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,10 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"defaultSettingsFuzzyPrompt": "Prova la ricerca in linguaggio naturale.",
-+>>>>>>> .their
- 	"defaultSettings": "Inserire le impostazioni nell'editor di lato destro per eseguire l'override.",
- 	"noSettingsFound": "Non sono state trovate impostazioni.",
- 	"settingsSwitcherBarAriaLabel": "Selezione impostazioni",
- 	"userSettings": "Impostazioni utente",
- 	"workspaceSettings": "Impostazioni area di lavoro",
--	"folderSettings": "Impostazioni cartella"
-+	"folderSettings": "Impostazioni cartella",
-+	"enableFuzzySearch": "Abilita la ricerca in linguaggio naturale"
- }
-\ No newline at end of file
-changed in both
-  base   100644 6022523a4a4e23e6eede842986fb782fbac874ed i18n/ita/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  our    100644 b89a9a5d2c851fe192929fd8b043499ee5d305db i18n/ita/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  their  100644 b3c0576f3401e1ae15166ca5ee3236a1525f9273 i18n/ita/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-@@ -18,6 +18,10 @@
- 	"ConfigurationParser.missingRequiredProperty": "Errore: nella configurazione di attività '{0}' manca la proprietà obbligatoria '{1}'. La configurazione dell'attività verrà ignorata.",
- 	"ConfigurationParser.notCustom": "Errore: tasks non è dichiarato come un'attività personalizzata. La configurazione verrà ignorata.\n{0}\n",
- 	"ConfigurationParser.noTaskName": "Errore: un'attività deve specificare una proprietà label. L'attività verrà ignorata.\n{0}\n",
-+<<<<<<< .our
-+=======
-+	"taskConfiguration.shellArgs": "Avviso: l'attività '{0}' è un comando di shell e uno dei suoi argomenti potrebbe avere spazi indesiderati. Per garantire la correttezza della riga di comando unire args nel comando stesso.",
-+>>>>>>> .their
- 	"taskConfiguration.noCommandOrDependsOn": "Errore: l'attività '{0}' non specifica un comando né una proprietà dependsOn. L'attività verrà ignorata. La sua definizione è:\n{1}",
- 	"taskConfiguration.noCommand": "Errore: l'attività '{0}' non definisce un comando. L'attività verrà ignorata. Definizione dell'attività:\n{1}",
- 	"TaskParse.noOsSpecificGlobalTasks": "L'attività versione 2.0.0 non supporta attività specifiche globali del sistema operativo. Convertirle in un'attività con un comando specifico del sistema operativo. Attività interessate:\n{0}"
-changed in both
-  base   100644 f823b4b682f41622fe494260c7db4842884d3eb2 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 b43f261b33e96573db19620791c6498f01662657 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 42ec40f0ebd988333da392fbae6f895b8340653e i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -19,10 +19,15 @@
- 	"terminal.integrated.copyOnSelection": "Quando impostato, il testo selezionato nel terminale sarà copiato negli appunti.",
- 	"terminal.integrated.fontFamily": "Controlla la famiglia di caratteri del terminale. L'impostazione predefinita è il valore di editor.fontFamily.",
- 	"terminal.integrated.fontSize": "Consente di controllare le dimensioni del carattere in pixel del terminale.",
-+<<<<<<< .our
- 	"terminal.integrated.letterSpacing": "Controlla la spaziatura delle lettere del terminale. Si tratta di un valore intero che rappresenta il numero di pixel da aggiungere tra i caratteri.",
- 	"terminal.integrated.lineHeight": "Controlla l'altezza della riga del terminale. Questo numero è moltiplicato per la dimensione del carattere del terminale per ottenere l'effettiva altezza della riga in pixel.",
- 	"terminal.integrated.fontWeight": "Spessore del carattere da usare nel terminale per il testo non in grassetto.",
- 	"terminal.integrated.fontWeightBold": "Spessore del carattere da usare nel terminale per il testo in grassetto.",
-+=======
-+	"terminal.integrated.lineHeight": "Controlla l'altezza della riga del terminale. Questo numero è moltiplicato per la dimensione del carattere del terminale per ottenere l'effettiva altezza della riga in pixel.",
-+	"terminal.integrated.enableBold": "Per abilitare il grassetto del testo all'interno del terminale, è necessario il supporto della shell del terminale.",
-+>>>>>>> .their
- 	"terminal.integrated.cursorBlinking": "Controlla se il cursore del terminale è intermittente o meno.",
- 	"terminal.integrated.cursorStyle": "Controlla lo stile del cursore del terminale.",
- 	"terminal.integrated.scrollback": "Consente di controllare il numero massimo di righe che il terminale mantiene nel buffer.",
-changed in both
-  base   100644 551ccc06ba289436e2ce0527035631912f502fbb i18n/ita/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
-  our    100644 28b4a746aa3a9dd9efe83647ea721039277729f8 i18n/ita/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
-  their  100644 7fdd1a182be4e39a4e3c6b036b3883d97ca38d75 i18n/ita/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/ita/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
-  our    100644 9064922dee2e078270fbe73ca2f5820d96f89e07 i18n/ita/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
-  their  100644 3d8be0b14b4bca0db28276399ee2f779d2c9ce92 i18n/ita/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"message": "$(zap) Host profilatura estensione..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 037da6258e4c2beb29452286d30492df603fe618 i18n/ita/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-  our    100644 c2d273b94b1c2d55b6b9a98fd07bdb882fbd6cfc i18n/ita/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-  their  100644 fed34b0e75d4b5e1e922d7001951c90da08767cd i18n/ita/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-@@ -13,6 +13,10 @@
- 	"restart": "Riavvia host dell'estensione",
- 	"overwritingExtension": "Sovrascrittura dell'estensione {0} con {1}.",
- 	"extensionUnderDevelopment": "Caricamento dell'estensione di sviluppo in {0}",
-+<<<<<<< .our
- 	"extensionCache.invalid": "Le estensioni sono state modificate sul disco. Si prega di ricaricare la finestra.",
- 	"reloadWindow": "Ricarica finestra"
-+=======
-+	"extensionCache.invalid": "Le estensioni sono state modificate sul disco. Si prega di ricaricare la finestra."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 3f4aae3a6f026926a89e882fea288b28002c2e07 i18n/ita/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
-  our    100644 d5c4ae6fc0c2abca836271c90b56445cdaca0da3 i18n/ita/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
-  their  100644 b92ebc6840a3607d664ab68bbd33e33151955f5f i18n/ita/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
-@@ -24,6 +24,10 @@
- 	"keybindings.json.when": "Condizione quando il tasto è attivo.",
- 	"keybindings.json.args": "Argomenti da passare al comando da eseguire.",
- 	"keyboardConfigurationTitle": "Tastiera",
-+<<<<<<< .our
- 	"dispatch": "Controlla la logica di invio delle pressioni di tasti da usare, tra `code` (scelta consigliata) e `keyCode`.",
- 	"touchbar.enabled": "Abilita i pulsanti della Touch Bar di OSX sulla tastiera se possibile"
-+=======
-+	"dispatch": "Controlla la logica di invio delle pressioni di tasti da usare, tra `code` (scelta consigliata) e `keyCode`."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/ita/src/vs/workbench/services/textfile/common/textFileService.i18n.json
-  our    100644 fb052d8b3fdb5c8b32ffccf2a7ecb3daf9c88d66 i18n/ita/src/vs/workbench/services/textfile/common/textFileService.i18n.json
-  their  100644 0c1130350d8a69383e6f874127d87ecbf0526483 i18n/ita/src/vs/workbench/services/textfile/common/textFileService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"files.backup.failSave": "Non è stato possibile scrivere i file che sono stati modificati nel percorso di backup (errore: {0}). provare a salvare i file prima e quindi uscire."
- }
-\ No newline at end of file
-changed in both
-  base   100644 e29ab462a72944afb7407115aab2c4b6afd938f3 i18n/jpn/extensions/emmet/package.i18n.json
-  our    100644 2ea428b8ba7cebbdb24c299af08c070b4291f172 i18n/jpn/extensions/emmet/package.i18n.json
-  their  100644 b5d418989826a67925005131b9d07d0ae786a6f5 i18n/jpn/extensions/emmet/package.i18n.json
-@@ -55,6 +55,7 @@
- 	"emmetPreferencesFilterCommentTrigger": "コメント フィルターに適用される略語に存在する属性名のカンマ区切りのリスト",
- 	"emmetPreferencesFormatNoIndentTags": "内部インデントを取得しないタグ名の配列",
- 	"emmetPreferencesFormatForceIndentTags": "内部インデントを常に取得するタグ名の配列",
-+<<<<<<< .our
- 	"emmetPreferencesAllowCompactBoolean": "true の場合、 Boolean 型属性の短縮表記が生成されます",
- 	"emmetPreferencesCssWebkitProperties": "Emmet 省略記法で使用される場合に `-` で始まる 'webkit' ベンダー プレフィックスを取得するカンマ区切りの CSS プロパティ。常に 'webkit' プレフィックスを避ける場合は空の文字列に設定します。",
- 	"emmetPreferencesCssMozProperties": "Emmet 省略記法で使用される場合に `-` で始まる 'moz' ベンダー プレフィックスを取得するカンマ区切りの CSS プロパティ。常に 'moz' プレフィックスを避ける場合は空の文字列に設定します。",
-@@ -62,4 +63,7 @@
- 	"emmetPreferencesCssMsProperties": "Emmet 省略記法で使用される場合に `-` で始まる 'ms' ベンダー プレフィックスを取得するカンマ区切りの CSS プロパティ。常に 'ms' プレフィックスを避ける場合は空の文字列に設定します。",
- 	"emmetPreferencesCssFuzzySearchMinScore": "あいまい検索の省略形が達成すべき (0 から 1 の) 最小スコア。値が低ければ多くの誤検出が発生する可能性があります。値が高ければ一致する見込みが減る可能性があります。",
- 	"emmetOptimizeStylesheetParsing": "false に設定すると、現在位置が Emmet 略語の展開位置として有効かどうかを判定するためにファイル全体を解析します。true に設定すると、css/scss/less ファイルの現在位置周辺のコンテンツのみを解析します。"
-+=======
-+	"emmetPreferencesAllowCompactBoolean": "true の場合、 Boolean 型属性の短縮表記が生成されます"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e5e7244d33a4a53986be5afae71f878b4d1a955f i18n/jpn/src/vs/code/node/cliProcessMain.i18n.json
-  our    100644 d4f994f4c39cc7b339d1a835d51cee5caefa992a i18n/jpn/src/vs/code/node/cliProcessMain.i18n.json
-  their  100644 17e8239c8b5ac31e2fb7af0453f3896e4fa58a70 i18n/jpn/src/vs/code/node/cliProcessMain.i18n.json
-changed in both
-  base   100644 f8dc120d025d921bc6cc8eca30a23e84c6fe6752 i18n/jpn/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 8a524167aa36e1a9cb85f51526bd76d90fd343d7 i18n/jpn/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 ccf74d0af32e892eba94450a5d7effd68b2c4dc6 i18n/jpn/src/vs/editor/common/config/commonEditorConfig.i18n.json
-changed in both
-  base   100644 9d34d92b9263234ba28d1498999c8414854f3499 i18n/jpn/src/vs/editor/contrib/folding/folding.i18n.json
-  our    100644 0bebad98f593ecc4ddf6f049b905c5020711ef4d i18n/jpn/src/vs/editor/contrib/folding/folding.i18n.json
-  their  100644 c6a310be421987dcb4399ef92c4cb897e5bb5ebf i18n/jpn/src/vs/editor/contrib/folding/folding.i18n.json
-changed in both
-  base   100644 f118af6afc07977ddbf12813b3d1f625fc9b8e31 i18n/jpn/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 dd4553b6a25f3d18d9ae6f341855e230cceed4fe i18n/jpn/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 e5dd71eb7e2dc3ddd0b217173934064d4cb20cbf i18n/jpn/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,8 +10,21 @@
- 	"diff": "2 つのファイルを比較します。",
- 	"add": "最後にアクティブだったウィンドウにフォルダーを追加します。",
- 	"goto": "指定した行と文字の位置にあるパスでファイルを開きます。",
-+<<<<<<< .our
- 	"newWindow": "強制的に新しいウィンドウを開きます。",
- 	"reuseWindow": "強制的に最後にアクティブだったウィンドウ内でファイルかフォルダーを開きます。",
-+=======
-+	"locale": "使用する国と地域 (例:en-US や zh-TW など)。",
-+	"newWindow": "新しい Code のインスタンスを強制します。",
-+	"performance": "'Developer: Startup Performance' コマンドを有効にして開始します。",
-+	"prof-startup": "起動中に CPU プロファイラーを実行する",
-+	"inspect-extensions": "拡張機能のデバッグとプロファイリングを許可します。接続 URI を開発者ツールでチェックします。",
-+	"inspect-brk-extensions": "起動後に一時停止されている拡張ホストとの拡張機能のデバッグとプロファイリングを許可します。接続 URI を開発者ツールでチェックします。",
-+	"reuseWindow": "最後のアクティブ ウィンドウにファイルまたはフォルダーを強制的に開きます。",
-+	"userDataDir": "ユーザー データを保持するディレクトリを指定します。ルートで実行している場合に役立ちます。",
-+	"log": "使用するログレベル。既定値は 'info' です。利用可能な値は  'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off' です。",
-+	"verbose": "詳細出力を表示します (--wait を含みます)。",
-+>>>>>>> .their
- 	"wait": "現在のファイルが閉じられるまで待機します。",
- 	"locale": "使用する国と地域 (例:en-US や zh-TW など)。",
- 	"userDataDir": "ユーザー データが保持されるディレクトリを指定します。複数の異なる Code のインスタンスを開くために使用できます。",
-changed in both
-  base   100644 2da6de5555b68ddba327d5e80efa8e4901d9dfee i18n/jpn/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 bb47142b4560b826311d6df88270f90b21754504 i18n/jpn/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 e4698109a33894229a72372693cee43af1018a24 i18n/jpn/src/vs/workbench/electron-browser/actions.i18n.json
-@@ -50,6 +50,30 @@
- 	"moveWindowTabToNewWindow": "ウィンドウ タブを新しいウィンドウに移動",
- 	"mergeAllWindowTabs": "すべてのウィンドウを統合",
- 	"toggleWindowTabsBar": "ウィンドウ タブ バーの切り替え",
-+<<<<<<< .our
- 	"about": "{0} のバージョン情報",
- 	"inspect context keys": "コンテキスト キーの検査"
-+=======
-+	"configureLocale": "言語を構成する",
-+	"displayLanguage": "VSCode の表示言語を定義します。",
-+	"doc": "サポートされている言語の一覧については、{0} をご覧ください。",
-+	"restart": "値を変更するには VS Code の再起動が必要です。",
-+	"fail.createSettings": "'{0}' ({1}) を作成できません。",
-+	"openLogsFolder": "ログ フォルダーを開く",
-+	"showLogs": "ログの表示...",
-+	"mainProcess": "メイン",
-+	"sharedProcess": "共有",
-+	"rendererProcess": "レンダラー",
-+	"extensionHost": "拡張機能ホスト",
-+	"selectProcess": "プロセスの選択",
-+	"setLogLevel": "ログ レベルの設定",
-+	"trace": "トレース",
-+	"debug": "デバッグ",
-+	"info": "情報",
-+	"warn": "警告",
-+	"err": "エラー",
-+	"critical": "重大",
-+	"off": "オフ",
-+	"selectLogLevel": "ログ レベルを選択"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 2c8374a399905de29d46b46497672913c6821f15 i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 94c8c8c8a16f500b0da2b646b5e8bf435bacba10 i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 c5bae21c735352e2437b664764b53418635f96e1 i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -13,12 +13,18 @@
- 	"breakpointAdded": "ブレークポイントを追加しました。行 {0}、ファイル {1}",
- 	"breakpointRemoved": "ブレークポイントを削除しました。行 {0}、ファイル {1}",
- 	"compoundMustHaveConfigurations": "複合構成を開始するには、複合に \"configurations\" 属性が設定されている必要があります。",
-+<<<<<<< .our
- 	"noConfigurationNameInWorkspace": "ワークスペースに起動構成 '{0}' が見つかりませんでした。",
- 	"multipleConfigurationNamesInWorkspace": "ワークスペースに複数の起動構成 '{0}' があります。フォルダー名を使用して構成を修飾してください。",
- 	"noFolderWithName": "複合 '{2}' の構成 '{1}' で、名前 '{0}' を含むフォルダーが見つかりませんでした。",
- 	"configMissing": "構成 '{0}' が 'launch.json' 内にありません。",
- 	"launchJsonDoesNotExist": "'launch.json' は存在しません。",
- 	"debugRequestNotSupported": "選択しているデバッグ構成で '{0}' 属性はサポートされない値 '{1}' を指定しています。",
-+=======
-+	"configMissing": "構成 '{0}' が 'launch.json' 内にありません。",
-+	"launchJsonDoesNotExist": "'launch.json' は存在しません。",
-+	"debugRequestNotSupported": "選択しているデバッグ構成で `{0}` 属性はサポートされない値 '{1}' を指定しています。",
-+>>>>>>> .their
- 	"debugRequesMissing": "選択しているデバッグ構成に属性 '{0}' が含まれていません。",
- 	"debugTypeNotSupported": "構成されているデバッグの種類 '{0}' はサポートされていません。",
- 	"debugTypeMissing": "選択された起動構成のプロパティ 'type' がありません。",
-changed in both
-  base   100644 2fd0e4b1fd47bbf693c0f2645574ed7069af04e2 i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
-  our    100644 4a286928b155a77596ef147b9771757f791501ac i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
-  their  100644 41dd62310a4668d1023788728a507c05b311a060 i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"ratedByUsers": "{0} 人が評価",
- 	"ratedBySingleUser": "1 人が評価"
- }
-\ No newline at end of file
-changed in both
-  base   100644 e2aef1055ae3dc58fb455cb89148f21e85eb7fa0 i18n/jpn/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-  our    100644 ebdf2bc38d9d52c04ae3ff72f37a5f4d912d7af4 i18n/jpn/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-  their  100644 d5997e6170c818a12a02aaa69d94c61cb8f14157 i18n/jpn/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-@@ -13,6 +13,10 @@
- 	"restart": "拡張機能のホストを再起動",
- 	"overwritingExtension": "拡張機能 {0} を {1} で上書きしています。",
- 	"extensionUnderDevelopment": "開発の拡張機能を {0} に読み込んでいます",
-+<<<<<<< .our
- 	"extensionCache.invalid": "拡張機能がディスク上で変更されています。ウィンドウを再読み込みしてください。",
- 	"reloadWindow": "ウィンドウの再読み込み"
-+=======
-+	"extensionCache.invalid": "拡張機能がディスク上で変更されています。ウィンドウを再読み込みしてください。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7ecfcb46fd78aa970248b4150ed32d22782989b5 i18n/kor/extensions/css/client/out/cssMain.i18n.json
-  our    100644 18013d8de4182c0f06799665ddeb208968fb93f1 i18n/kor/extensions/css/client/out/cssMain.i18n.json
-  their  100644 64beafb92453792680e889cc6e90705ecc87d7dd i18n/kor/extensions/css/client/out/cssMain.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"cssserver.name": "CSS 언어 서버",
- 	"folding.start": "영역 접기 시작",
- 	"folding.end": "접기 영역 끝"
-changed in both
-  base   100644 10291752ac2cf004ffcb8241deec2242aad25ba5 i18n/kor/extensions/emmet/package.i18n.json
-  our    100644 517fee7baf0c3ecd5ff03235a1df00c583e6985b i18n/kor/extensions/emmet/package.i18n.json
-  their  100644 92dd938196e5bf4cc72a2e6692f4f815ec8da2d2 i18n/kor/extensions/emmet/package.i18n.json
-@@ -55,6 +55,7 @@
- 	"emmetPreferencesFilterCommentTrigger": "콤마로 구분된 리스트의 속성은 코멘트 필터 약어로 존재해야 합니다.",
- 	"emmetPreferencesFormatNoIndentTags": "내부 들여쓰기하면 안 되는 태그 이름 배열",
- 	"emmetPreferencesFormatForceIndentTags": "항상 내부 들여쓰기를 해야 하는 태그 이름의 배열",
-+<<<<<<< .our
- 	"emmetPreferencesAllowCompactBoolean": "true인 경우 부울 속성의 축소된 표기법이 생성됩니다.",
- 	"emmetPreferencesCssWebkitProperties": "`-`로 시작하는 Emmet 약어에서 사용될 때 'webkit' 공급업체 접두사를 가져오는 쉼표로 구분된 CSS 속성입니다. 항상 'webkit' 접두사를 사용하지 않으려면 빈 문자열로 설정합니다.",
- 	"emmetPreferencesCssMozProperties": "`-`로 시작하는 Emmet 약어에서 사용될 때 'moz' 공급업체 접두사를 가져오는 쉼표로 구분된 CSS 속성입니다. 항상 'moz' 접두사를 사용하지 않으려면 빈 문자열로 설정합니다.",
-@@ -62,4 +63,7 @@
- 	"emmetPreferencesCssMsProperties": "`-`로 시작하는 emmet 약어에서 사용할 때 'ms' 공급업체 접두사를 가져오는 쉼표로 구분된 CSS 속성입니다. 항상 'ms' 접두사를 사용하지 않으려면 빈 문자열로 설정합니다.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "유사 일치 약어가 획득해야 하는 최소 점수(0에서 1 사이)입니다. 값이 낮을수록 가양성 일치 항목이 늘 수 있고, 값이 높을수록 가능한 일치 항목이 줄 수 있습니다.",
- 	"emmetOptimizeStylesheetParsing": "False로 설정할 경우 전체 파일이 구문 분석되어 현재 위치가 Emmet 약어 확장에 유효한지 확인합니다. True로 설정할 경우 css/scss/less 파일에서 현재 위치 주변의 콘텐츠만 구문 분석합니다."
-+=======
-+	"emmetPreferencesAllowCompactBoolean": "true인 경우 부울 속성의 축소된 표기법이 생성됩니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 9ecba0491931f7f944f4683564f0058dfd56e233 i18n/kor/extensions/git/out/autofetch.i18n.json
-  our    100644 7f6a3198eb6e65405a295e58494ed873b68808c1 i18n/kor/extensions/git/out/autofetch.i18n.json
-  their  100644 a02c668eb9ded1dcee8405b81b1b5a737beabaf6 i18n/kor/extensions/git/out/autofetch.i18n.json
-@@ -8,6 +8,11 @@
- 	],
- 	"yes": "예",
- 	"no": "아니요",
-+<<<<<<< .our
- 	"not now": "나중에 물어보기",
- 	"suggest auto fetch": "Code에서 ['git fetch']({0})를 정기적으로 실행하도록 하시겠습니까?"
-+=======
-+	"not now": "나중에",
-+	"suggest auto fetch": "Git 리포지토리 자동 페치하기를 사용하도록 설정하시겠습니까?"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 2dc481e046b11ee35ac75470c3810209152dbf67 i18n/kor/extensions/git/out/commands.i18n.json
-  our    100644 5c881abd459fc945dcc1b911f43b518f709ac538 i18n/kor/extensions/git/out/commands.i18n.json
-  their  100644 15fcc99ffbe05058c00b3c23391a5ff72ff598ef i18n/kor/extensions/git/out/commands.i18n.json
-@@ -10,12 +10,21 @@
- 	"remote branch at": "{0}에서 원격 분기",
- 	"create branch": "$(plus) 새 분기 생성",
- 	"repourl": "리포지토리 URL",
-+<<<<<<< .our
- 	"selectFolder": "리포지토리 위치 선택",
- 	"cloning": "Git 리포지토리 '{0}'을(를) 복제하는 중...",
- 	"proposeopen": "복제된 리포지토리를 여시겠습니까?",
- 	"openrepo": "리포지토리 열기",
- 	"add": "작업 영역에 추가",
- 	"proposeopen2": "복제된 리포지토리를 열거나 현재 작업 영역에 추가하시겠습니까?",
-+=======
-+	"parent": "부모 디렉터리",
-+	"cancel": "$(sync~spin) 리포지토리를 복제하는 중... 취소하려면 클릭하세요.",
-+	"cancel tooltip": "복제 취소",
-+	"cloning": "Git 리포지토리를 복제하는 중...",
-+	"openrepo": "리포지토리 열기",
-+	"proposeopen": "복제된 리포지토리를 여시겠습니까?",
-+>>>>>>> .their
- 	"init": "Git 리포지토리를 초기화할 작업 영역 폴더 선택",
- 	"init repo": "리포지토리 초기화",
- 	"create repo": "리포지토리 초기화",
-changed in both
-  base   100644 1d7b6e3355cd19f0dd37734bb2a7acfa76f4fa9b i18n/kor/extensions/git/out/main.i18n.json
-  our    100644 d456beffb80631ce9efe3133a035173b4aa4e2b1 i18n/kor/extensions/git/out/main.i18n.json
-  their  100644 e152fcdc537128db03f94d21d2793840c5e92719 i18n/kor/extensions/git/out/main.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"looking": "다음에서 git을 찾는 중: {0}",
- 	"using git": "{1}에서 git {0}을(를) 사용하는 중",
- 	"downloadgit": "Git 다운로드",
-changed in both
-  base   100644 8499c4129035c305a10238cffee70cb5e2b4d213 i18n/kor/extensions/git/package.i18n.json
-  our    100644 3703ac48f99d1ed061418ae09d45c9f7e6e3d128 i18n/kor/extensions/git/package.i18n.json
-  their  100644 33448449d9e622f9d28ba5970e741549d9f3ebea i18n/kor/extensions/git/package.i18n.json
-changed in both
-  base   100644 5be38446dc7257d31a68536c4d5bf27fe9fc0695 i18n/kor/extensions/html/client/out/htmlMain.i18n.json
-  our    100644 d112b7520aeb6d80ce57f9522afebf9a52339812 i18n/kor/extensions/html/client/out/htmlMain.i18n.json
-  their  100644 596b2f4e3b54cb584a6657adf9b3b7e99fd872fc i18n/kor/extensions/html/client/out/htmlMain.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"htmlserver.name": "HTML 언어 서버",
- 	"folding.start": "영역 접기 시작",
- 	"folding.end": "접기 영역 끝"
-changed in both
-  base   100644 f38833da5da5d01eae3688a6f47f536d55d39c9b i18n/kor/extensions/markdown/out/commands.i18n.json
-  our    100644 aea09e921f671c7e5bb264f6b18723324e067757 i18n/kor/extensions/markdown/out/commands.i18n.json
-  their  100644 055ede2dd1375411a3f5683ed564dbd98dc51461 i18n/kor/extensions/markdown/out/commands.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"previewTitle": "{0} 미리 보기",
- 	"onPreviewStyleLoadError": "'markdown.styles': {0}을 불러올 수 없음"
- }
-\ No newline at end of file
-changed in both
-  base   100644 6dd50f40273a443aa7d72b3f11e7cebf0cfed056 i18n/kor/extensions/markdown/out/security.i18n.json
-  our    100644 b7fd641e49324f12cb3e70d0e0b3a99277526769 i18n/kor/extensions/markdown/out/security.i18n.json
-  their  100644 dcffab2e9ec0431caf65f8b470056d811207210a i18n/kor/extensions/markdown/out/security.i18n.json
-changed in both
-  base   100644 ceb1a3d504d98f6ee0e17b7184726cc893393ea4 i18n/kor/extensions/merge-conflict/package.i18n.json
-  our    100644 985040d350ce1c685e7641a2c5868d98f24c09ed i18n/kor/extensions/merge-conflict/package.i18n.json
-  their  100644 9416111e4bb6adb640ceba36cf8a3a4333f5a6c7 i18n/kor/extensions/merge-conflict/package.i18n.json
-changed in both
-  base   100644 bfc413e861a86d28fab640c2117833cd4e4aceba i18n/kor/extensions/typescript/out/features/completionItemProvider.i18n.json
-  our    100644 65d840cf0b5ded0819d66343381b49074971bdd1 i18n/kor/extensions/typescript/out/features/completionItemProvider.i18n.json
-  their  100644 a9f19fc8665baa72a496b2b4d83469f0d993185d i18n/kor/extensions/typescript/out/features/completionItemProvider.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"selectCodeAction": "적용할 코드 동작 선택",
- 	"acquiringTypingsLabel": "typings를 가져오는 중...",
- 	"acquiringTypingsDetail": "IntelliSense에 대한 typings 정의를 가져오는 중입니다.",
-changed in both
-  base   100644 8a1fd73f72ff75dc4c69ab8e2e6d8e39caa3697e i18n/kor/extensions/typescript/package.i18n.json
-  our    100644 dd42af00286b776dba8496a69b6e677f0653dc9b i18n/kor/extensions/typescript/package.i18n.json
-  their  100644 7b99823e951799f73db8c9252e7286bd8e77014b i18n/kor/extensions/typescript/package.i18n.json
-changed in both
-  base   100644 d259f7872ca7598af61eb288fed51e2fccce8cac i18n/kor/src/vs/code/electron-main/main.i18n.json
-  our    100644 1a35370bca62bc555cb254076331f9bc68009822 i18n/kor/src/vs/code/electron-main/main.i18n.json
-  their  100644 e77916a201ac752415b688e655f5681a12f9a981 i18n/kor/src/vs/code/electron-main/main.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"secondInstanceNoResponse": "{0}의 다른 인스턴스가 실행 중이지만 응답하지 않음",
- 	"secondInstanceNoResponseDetail": "다른 인스턴스를 모두 닫고 다시 시도하세요.",
- 	"secondInstanceAdmin": "{0}의 두 번째 인스턴스가 이미 관리자 권한으로 실행되고 있습니다.",
-changed in both
-  base   100644 08a780b6810bb6700d818b23af5692854668f59b i18n/kor/src/vs/code/electron-main/menus.i18n.json
-  our    100644 a3a33ffe4d84057c71074e546cdf9a1e5529a6c8 i18n/kor/src/vs/code/electron-main/menus.i18n.json
-  their  100644 ea36f9e14c0d814a6565b31ae5e2852852be1201 i18n/kor/src/vs/code/electron-main/menus.i18n.json
-@@ -161,7 +161,10 @@
- 	"mMergeAllWindows": "모든 창 병합",
- 	"miToggleDevTools": "개발자 도구 설정/해제(&&T)",
- 	"miAccessibilityOptions": "접근성 옵션(&&O)",
-+<<<<<<< .our
- 	"miOpenProcessExplorerer": "프로세스 탐색기 열기(&&P)",
-+=======
-+>>>>>>> .their
- 	"miReportIssue": "문제 보고(&&I)",
- 	"miWelcome": "시작(&&W)",
- 	"miInteractivePlayground": "대화형 실습(&&I)",
-@@ -189,5 +192,12 @@
- 	"miDownloadingUpdate": "업데이트를 다운로드하는 중...",
- 	"miInstallUpdate": "업데이트 설치...",
- 	"miInstallingUpdate": "업데이트를 설치하는 중...",
-+<<<<<<< .our
- 	"miRestartToUpdate": "다시 시작하여 업데이트..."
-+=======
-+	"miCheckForUpdates": "업데이트 확인...",
-+	"aboutDetail": "버전 {0}\n커밋 {1}\n날짜 {2}\n셸 {3}\n렌더러 {4}\n노드 {5}\n아키텍처 {6}",
-+	"okButton": "확인",
-+	"copy": "복사(&&C)"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c8b96ea3f8fe9f79365b540bf69702bb19726885 i18n/kor/src/vs/code/node/cliProcessMain.i18n.json
-  our    100644 3852ee2e6dff126eb146bb13387185484ed1ce91 i18n/kor/src/vs/code/node/cliProcessMain.i18n.json
-  their  100644 1fa2ec087e3f420fd3764d1d2c940498afa3923f i18n/kor/src/vs/code/node/cliProcessMain.i18n.json
-changed in both
-  base   100644 a5e25a8bb9a50a2fcfb83e8753219c8a4ddee373 i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 c96c0fe1469ce78842b73db686d63d6305f28dfb i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 1fe9d415d3a479365c1bc6205d1ce5230d48875d i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json
-changed in both
-  base   100644 0d8ac009a871ec4e48191b92bb8a458388774ff4 i18n/kor/src/vs/editor/contrib/folding/folding.i18n.json
-  our    100644 702a8ee6eb6b2f711c5484af0288dde4d2ff5d4c i18n/kor/src/vs/editor/contrib/folding/folding.i18n.json
-  their  100644 64113ae45bcb9a279150ae79fb36060d85fbbb2f i18n/kor/src/vs/editor/contrib/folding/folding.i18n.json
-changed in both
-  base   100644 b8dae1071a77db37f0bf234958c2e95b3173d2f8 i18n/kor/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 5e47e69c5607206a94dadfaaaaa5928d57a2cd8e i18n/kor/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 43b38b984db11136b8e50299f58c4be89210311d i18n/kor/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,8 +10,21 @@
- 	"diff": "두 파일을 서로 비교합니다.",
- 	"add": "마지막 활성 창에 폴더를 추가합니다.",
- 	"goto": "지정된 줄과 문자 위치에 있는 경로의 파일을 엽니다.",
-+<<<<<<< .our
- 	"newWindow": "새 창을 강제로 엽니다.",
- 	"reuseWindow": "마지막 활성 창에서 파일 또는 파일을 강제로 엽니다.",
-+=======
-+	"locale": "사용할 로캘(예: en-US 또는 zh-TW)입니다.",
-+	"newWindow": "Code의 새 인스턴스를 강제 적용합니다.",
-+	"performance": "'Developer: Startup Performance' 명령을 사용하여 시작합니다.",
-+	"prof-startup": "시작하는 동안 CPU 프로파일러 실행",
-+	"inspect-extensions": "디버깅 및 확장 프로파일링을 허용합니다. 연결 uri에 대한 개발자 도구를 확인하십시오.",
-+	"inspect-brk-extensions": "시작 후 일시 중시된 확장 호스트에서 디버깅 및 확장 프로파일링을 허용합니다. 연결 URL은 개발자 도구를 확인하세요.",
-+	"reuseWindow": "마지막 활성 창에서 파일 또는 폴더를 강제로 엽니다.",
-+	"userDataDir": "사용자 데이터가 저장되는 디렉터리를 지정합니다(루트로 실행할 경우 유용함).",
-+	"log": "사용할 로그 수준이며 기본값은 'info'입니다. 허용되는 값은 'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off'입니다.",
-+	"verbose": "자세한 정보 표시를 출력합니다(--wait를 의미).",
-+>>>>>>> .their
- 	"wait": "파일이 닫힐 때 까지 기다린 후 돌아갑니다.",
- 	"locale": "사용할 로캘(예: en-US 또는 zh-TW)입니다.",
- 	"userDataDir": "사용자 데이터가 저장되는 디렉터리를 지정합니다. Code의 여러 고유 인스턴스를 여는 데 사용할 수 있습니다.",
-@@ -32,8 +45,14 @@
- 	"inspect-extensions": "디버깅 및 확장 프로파일링을 허용합니다. 연결 URI는 개발자 도구를 확인하세요.",
- 	"inspect-brk-extensions": "시작 후 일시 중시된 확장 호스트에서 디버깅 및 확장 프로파일링을 허용합니다. 연결 URI는 개발자 도구를 확인하세요.",
- 	"disableGPU": "GPU 하드웨어 가속을 사용하지 않도록 설정합니다.",
-+<<<<<<< .our
- 	"uploadLogs": "현재의 세션에서 안전한 종점으로 로그 업로드",
- 	"maxMemory": "윈도우에 대한 최대 메모리 크기 (단위 MB).",
-+=======
-+	"status": "프로세스 사용 및 진단 정보를 인쇄합니다.",
-+	"version": "버전을 출력합니다.",
-+	"help": "사용법을 출력합니다.",
-+>>>>>>> .their
- 	"usage": "사용법",
- 	"options": "옵션",
- 	"paths": "경로",
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json
-  our    100644 7bb6efc105cfc3a98148376b96e9713a288561b1 i18n/kor/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json
-  their  100644 3a3afcd8c69c0fd92eb154527699cbec0636c969 i18n/kor/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"notCompatibleDownload": "VS Code의 현재 버전 '{0}'과(와) 호환되는 확장을 찾을 수 없으므로 다운로드할 수 없습니다."
- }
-\ No newline at end of file
-changed in both
-  base   100644 1f9083afa001e737f7d037f9903fd6f1bceff094 i18n/kor/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 05518f96202309824a89dfbd3498bbcde7102ebd i18n/kor/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 64578b6f8a5697a6d3ecc2adc9fb1ae266aab116 i18n/kor/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -7,6 +7,7 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"invalidManifest": "잘못된 확장: package.json이 JSON 파일이 아닙니다.",
-+<<<<<<< .our
- 	"incompatible": "'{0}' 확장은 Code '{1}'과(와) 호환되지 않으므로 설치할 수 없습니다.",
- 	"restartCode": "{0}을(를) 다시 설치하기 전에 Code를 다시 시작하세요.",
- 	"installingOutdatedExtension": "이 확장의 최신 버전이 이미 설치되어 있습니다. 이 버전을 이전 버전으로 재정의하시겠습니까?",
-@@ -22,6 +23,16 @@
- 	"quitCode": "확장을 설치할 수 없습니다. 다시 설치하기 위해 VS Code를 종료하고 다시 시작하십시오.",
- 	"exitCode": "확장을 설치할 수 없습니다. 다시 설치하기 전에 VS 코드를 종료한 후 다시 시작하십시오. ",
- 	"renameError": "이름을 {0}에서 {1}(으)로 변경하는 중 알 수 없는 오류 발생",
-+=======
-+	"restartCodeLocal": "{0}을(를) 다시 설치하기 전에 Code를 다시 시작하세요.",
-+	"installingOutdatedExtension": "이 확장의 최신 버전이 이미 설치되어 있습니다. 이 버전을 이전 버전으로 재정의하시겠습니까?",
-+	"override": "재정의",
-+	"cancel": "취소",
-+	"notFoundCompatible": "VS Code의 현재 버전 '{1}'과(와) 호환되는 '{0}' 확장을 찾을 수 없으므로 설치할 수 없습니다.",
-+	"quitCode": "확장의 사용되지 않는 인스턴스가 계속 실행 중이므로 설치할 수 없습니다. 다시 설치하기 전에 VS Code를 종료했다가 다시 시작하세요.",
-+	"exitCode": "확장의 사용되지 않는 인스턴스가 계속 실행 중이므로 설치할 수 없습니다. 다시 설치하기 전에 VS Code를 종료했다가 다시 시작하세요.",
-+	"notFoundCompatibleDependency": "VS Code의 현재 버전 '{1}'과(와) 호환되는 종속된 확장 '{0}'을(를) 찾을 수 없으므로 설치할 수 없습니다.",
-+>>>>>>> .their
- 	"uninstallDependeciesConfirmation": "'{0}'만 제거할까요, 아니면 종속성도 제거할까요?",
- 	"uninstallOnly": "확장만",
- 	"uninstallAll": "모두 제거",
-changed in both
-  base   100644 cb72ee5dd24605ae5130290640fbe09aa05897ab i18n/kor/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
-  our    100644 e0c7d88cbca23724ac5d38207a4b8cffa64623c6 i18n/kor/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
-  their  100644 ff477458670ebd866be3155ab54f8474cdaef01f i18n/kor/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
-changed in both
-  base   100644 091e1d884137185ff30c76d4e2b20de6f7b743c7 i18n/kor/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json
-  our    100644 04536816ec2955d74f330c089707c9c4f5377469 i18n/kor/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json
-  their  100644 78f9f16be4693aec8bf682953479812a01bde270 i18n/kor/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"toggleTabs": "탭 표시 설정/해제",
- 	"view": "보기"
- }
-\ No newline at end of file
-changed in both
-  base   100644 4691263e4869a356b179f7043739edffaa25c4fc i18n/kor/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
-  our    100644 875980e9b305a8741ba4d0ca2e19e7fef6be9c07 i18n/kor/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
-  their  100644 8f69ba1a1bc53615059b2b7e62cfef551cca60d3 i18n/kor/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"largeNumberBadge": "10k+",
- 	"badgeTitle": "{0} - {1}",
- 	"additionalViews": "추가 뷰",
-changed in both
-  base   100644 9b3b3941512c7e81e5423c02df89d7d0ed7a75ae i18n/kor/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  our    100644 610a770a8a9b2f4b0cc9af12766b082e0eb56297 i18n/kor/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  their  100644 6c0c854e4bf50db4f061e0608d915252f016a4d7 i18n/kor/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-@@ -8,5 +8,11 @@
- 	],
- 	"editorCommand.activeEditorMove.description": "활성 편집기를 탭 또는 그룹 단위로 이동",
- 	"editorCommand.activeEditorMove.arg.name": "활성 편집기 이동 인수",
-+<<<<<<< .our
- 	"editorCommand.activeEditorMove.arg.description": "인수 속성: * '를': 문자열 값을 제공 하 고 위치를 이동.\n\t* ' 의해': 문자열 이동에 대 한 단위를 제공 하는 값. 탭 또는 그룹.\n\t* ' value': 얼마나 많은 위치 또는 이동 하는 절대 위치를 제공 하는 숫자 값."
-+=======
-+	"editorCommand.activeEditorMove.arg.description": "인수 속성: * '를': 문자열 값을 제공 하 고 위치를 이동.\n\t* ' 의해': 문자열 이동에 대 한 단위를 제공 하는 값. 탭 또는 그룹.\n\t* ' value': 얼마나 많은 위치 또는 이동 하는 절대 위치를 제공 하는 숫자 값.",
-+	"commandDeprecated": "**{0}** 명령이 제거되었습니다. 대신 **{1}** 명령을 사용할 수 있습니다.",
-+	"openKeybindings": "바로 가기 키 구성"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8c2c5a8883ccfba62c02098ce3740eb992e41214 i18n/kor/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-  our    100644 94a028963a477ef2b767d0df3987e36b68137e65 i18n/kor/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-  their  100644 68d8989959fa2a4c709f9da012d179fac240eb2f i18n/kor/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-changed in both
-  base   100644 248d9a802264524bce059266a95297b003753cd8 i18n/kor/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 e913e127345422fb81d57f13fd8b5c25a0d63e10 i18n/kor/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 96f43aced40ed7c653c61ae714a6abe54398e585 i18n/kor/src/vs/workbench/electron-browser/actions.i18n.json
-@@ -50,6 +50,30 @@
- 	"moveWindowTabToNewWindow": "창 탭을 새 창으로 이동",
- 	"mergeAllWindowTabs": "모든 창 병합",
- 	"toggleWindowTabsBar": "창 탭 모음 설정/해제",
-+<<<<<<< .our
- 	"about": "{0} 정보",
- 	"inspect context keys": "컨텍스트 키 검사"
-+=======
-+	"configureLocale": "언어 구성",
-+	"displayLanguage": "VSCode의 표시 언어를 정의합니다.",
-+	"doc": "지원되는 언어 목록은 {0} 을(를) 참조하세요.",
-+	"restart": "값을 변경하려면 VSCode를 다시 시작해야 합니다.",
-+	"fail.createSettings": "{0}'({1})을(를) 만들 수 없습니다.",
-+	"openLogsFolder": "로그 폴더 열기",
-+	"showLogs": "로그 표시...",
-+	"mainProcess": "기본",
-+	"sharedProcess": "공유",
-+	"rendererProcess": "렌더러",
-+	"extensionHost": "확장 호스트",
-+	"selectProcess": "프로세스 선택",
-+	"setLogLevel": "로그 수준 설정",
-+	"trace": "Trace",
-+	"debug": "디버그",
-+	"info": "정보",
-+	"warn": "경고",
-+	"err": "오류",
-+	"critical": "Critical",
-+	"off": "Off",
-+	"selectLogLevel": "로그 수준 선택"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a78356cadf93b5feeba2074b4bd7cfc53555ea18 i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 faff44b17686fcb835995d2bfd92efcfdcc183b1 i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 b3ca18516e9974812c405cbae34392dfe0bd02e0 i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,8 +35,14 @@
- 	"panelDefaultLocation": "패널의 기본 위치를 제어합니다. 워크벤치의 아래 또는 오른쪽에 표시될 수 있습니다.",
- 	"statusBarVisibility": "워크벤치 아래쪽에서 상태 표시줄의 표시 유형을 제어합니다.",
- 	"activityBarVisibility": "워크벤치에서 작업 막대의 표시 유형을 제어합니다.",
-+<<<<<<< .our
- 	"viewVisibility": "보기 머리글 작업의 표시 여부를 제어합니다. 보기 머리글 작업은 항상 표시할 수도 있고 보기에 포커스가 있거나 보기를 마우스로 가리킬 때만 표시할 수도 있습니다.",
- 	"fontAliasing": "워크벤치에서 글꼴 앨리어싱 방식을 제어합니다.\n- 기본: 서브 픽셀 글꼴 다듬기. 대부분의 일반 디스플레이에서 가장 선명한 글꼴 제공\n- 안티앨리어싱: 서브 픽셀이 아닌 픽셀 단위에서 글꼴 다듬기. 전반적으로 더 밝은 느낌을 줄 수 있음\n- 없음: 글꼴 다듬기 사용 안 함. 텍스트 모서리가 각지게 표시됨\n- 자동: 디스플레이의 DPI에 따라 `기본` 또는 `안티앨리어싱`을 자동으로 적용합니다.",
-+=======
-+	"closeOnFileDelete": "일부 다른 프로세스에서 파일을 삭제하거나 이름을 바꿀 때 파일을 표시하는 편집기를 자동으로 닫을지 여부를 제어합니다. 사용하지 않도록 설정하는 경우 이러한 이벤트가 발생하면 편집기가 더티 상태로 계속 열려 있습니다. 응용 프로그램 내에서 삭제하면 항상 편집기가 닫히고 데이터를 유지하기 위해 더티 파일은 닫히지 않습니다.",
-+	"enableNaturalLanguageSettingsSearch": "설정에 대한 자연어 검색 모드를 사용할지 여부를 제어합니다.",
-+	"fontAliasing": "워크벤치에서 글꼴 앨리어싱 방식을 제어합니다.\n- 기본: 서브 픽셀 글꼴 다듬기. 대부분의 일반 디스플레이에서 가장 선명한 글꼴 제공\n- 안티앨리어싱: 서브 픽셀이 아닌 픽셀 단위에서 글꼴 다듬기. 전반적으로 더 밝은 느낌을 줄 수 있음\n- 없음: 글꼴 다듬기 사용 안 함. 텍스트 모서리가 각지게 표시됨",
-+>>>>>>> .their
- 	"workbench.fontAliasing.default": "서브 픽셀 글꼴 다듬기. 대부분의 일반 디스플레이에서 가장 선명한 텍스트를 제공합니다. ",
- 	"workbench.fontAliasing.antialiased": "서브 픽셀이 아닌 픽셀 수준에서 글꼴을 다듬습니다. 전반적으로 글꼴이 더 밝게 표시됩니다.",
- 	"workbench.fontAliasing.none": "글꼴 다듬기를 사용하지 않습니다. 텍스트 가장자리가 각지게 표시됩니다.",
-changed in both
-  base   100644 00b72c7e93404237c523d4c507b947c17e284fc8 i18n/kor/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  our    100644 383c5e7a51dcf49e07c095068c906ca99489d2d6 i18n/kor/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  their  100644 ae09d1a8d81a355b0769d6f46d50cd70679100d5 i18n/kor/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-@@ -21,12 +21,20 @@
- 	"allowBreakpointsEverywhere": "모든 파일에 대한 중단점을 설정할 수 있습니다.",
- 	"openExplorerOnEnd": "디버그 세션 끝에 탐색기 뷰를 자동으로 엽니다.",
- 	"inlineValues": "디버그하는 동안 편집기에서 변수 값을 인라인으로 표시합니다.",
-+<<<<<<< .our
- 	"toolBarLocation": "디버그 도구 모음의 위치를 제어합니다. \"floating\"(모든 보기에서 부동 창으로 표시), \"docked\"(디버그 보기에 고정) 또는 \"hidden\"(숨김)입니다.",
-+=======
-+	"hideActionBar": "부동 디버그 작업 모음을 숨길지 여부를 제거합니다.",
-+>>>>>>> .their
- 	"never": "상태 표시줄에 디버그 표시 안 함",
- 	"always": "상태 표시줄에 디버그 항상 표시",
- 	"onFirstSessionStart": "디버그가 처음으로 시작된 후에만 상태 표시줄에 디버그 표시",
- 	"showInStatusBar": "디버그 상태 표시줄을 표시할 시기를 제어합니다.",
-+<<<<<<< .our
- 	"openDebug": "디버깅 세션 시작 시에 디버그 보기를 열지 여부를 제어합니다",
- 	"enableAllHovers": "디버그할 때 디버그가 아닌 가리키기를 사용하도록 설정할지 여부를 제어합니다. True이면 가리키기를 제공하기 위해 가리키기 공급자를 호출합니다. 이 설정이 true인 경우에도 일반 가리키기는 표시되지 않습니다.",
-+=======
-+	"openDebug": "디버깅 세션 시작 시 디버그 뷰렛을 열지 여부를 제어합니다.",
-+>>>>>>> .their
- 	"launch": "전역 디버그 시작 구성입니다. 작업 영역에서 공유되는 \n 'launch.json'에 대한 대체로 사용되어야 합니다."
- }
-\ No newline at end of file
-changed in both
-  base   100644 9b138b5c58543036d1d6e2502d0e94f9b6d0bcb2 i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 f0485e490c5dc7158ba60cc766e0b791027e8972 i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 dd7daafffa87aefac3799e58390b3250e58cc28b i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -13,12 +13,18 @@
- 	"breakpointAdded": "파일 {1}, 줄 {0}에 중단점이 추가되었습니다.",
- 	"breakpointRemoved": "파일 {1}, 줄 {0}에서 중단점이 제거되었습니다.",
- 	"compoundMustHaveConfigurations": "여러 구성을 시작하려면 복합에 \"configurations\" 특성 집합이 있어야 합니다.",
-+<<<<<<< .our
- 	"noConfigurationNameInWorkspace": "작업 영역에서 시작 구성 '{0}'을(를) 찾을 수 없습니다.",
- 	"multipleConfigurationNamesInWorkspace": "작업 영역에 시작 구성 '{0}'이(가) 여러 개 있습니다. 폴더 이름을 사용하여 구성을 한정하세요.",
- 	"noFolderWithName": "복합형 '{2}'의 구성 '{1}'에 대해 이름이 '{0}'인 폴더를 찾을 수 없습니다.",
- 	"configMissing": "'{0}' 구성이 'launch.json'에 없습니다.",
- 	"launchJsonDoesNotExist": "'launch.json'이 없습니다.",
- 	"debugRequestNotSupported": "'{0}' 특성에는 선택한 디버그 구성에서 지원되지 않는 값 '{1}'이(가) 있습니다.",
-+=======
-+	"configMissing": "'{0}' 구성이 'launch.json'에 없습니다.",
-+	"launchJsonDoesNotExist": "'launch.json'이 없습니다.",
-+	"debugRequestNotSupported": "선택한 디버그 구성에서 특성 '{0}'에 지원되지 않는 값 '{1}'이(가) 있습니다.",
-+>>>>>>> .their
- 	"debugRequesMissing": "선택한 디버그 구성에 특성 '{0}'이(가) 없습니다.",
- 	"debugTypeNotSupported": "구성된 디버그 형식 '{0}'은(는) 지원되지 않습니다.",
- 	"debugTypeMissing": "선택한 시작 구성에 대한 'type' 속성이 없습니다.",
-changed in both
-  base   100644 7092740fd0cc1cea1d55fbfe71d6739b11d63a9c i18n/kor/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-  our    100644 ac0d4279306dd86dc6aef8e72448d92e45e7a5dd i18n/kor/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-  their  100644 863a81f423e22a72edf28532c9edc84c8814d7db i18n/kor/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-@@ -9,7 +9,10 @@
- 	"name": "확장 이름",
- 	"extension id": "확장 ID",
- 	"preview": "미리 보기",
-+<<<<<<< .our
- 	"builtin": "기본 제공",
-+=======
-+>>>>>>> .their
- 	"publisher": "게시자 이름",
- 	"install count": "설치 수",
- 	"rating": "등급",
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
-  our    100644 b96bcf0427e9ea050f7cd5acb5173ead7a78a154 i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
-  their  100644 a428c8145dba30fc92b4c1aa4c2969f3954ff30e i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"ratedByUsers": "{0}명의 사용자가 등급을 매김",
- 	"ratedBySingleUser": "1명의 사용자가 등급을 매김"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-  our    100644 6ca85821a3c0d4bf847c8a1f5caaa545dfc0fec0 i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-  their  100644 e0b45ad88d7b39b104b75d7421dce90e735de6a3 i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,5 +11,13 @@
- 	"restart2": "확장을 프로파일링하려면 다시 시작해야 합니다. 지금 '{0}'을(를) 다시 시작하시겠습니까?",
- 	"restart3": "다시 시작",
- 	"cancel": "취소",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"selectAndStartDebug": "프로파일링을 중지하려면 클릭하세요."
- }
-\ No newline at end of file
-changed in both
-  base   100644 9742da4937270e516e482c7fda49834e9a63da1d i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
-  our    100644 6523ae0d7b14cd2313e371e0d1429fe47ec7aca3 i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
-  their  100644 8dcad97c6a8cba140afd9e7a97fc074d636f82f5 i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
-@@ -15,6 +15,10 @@
- 	"developer": "개발자",
- 	"extensionsConfigurationTitle": "확장",
- 	"extensionsAutoUpdate": "자동으로 확장 업데이트",
-+<<<<<<< .our
- 	"extensionsIgnoreRecommendations": "True로 설정하는 경우 확장 권장 사항에 대한 알림 표시가 중지됩니다.",
- 	"extensionsShowRecommendationsOnlyOnDemand": "True로 설정하는 경우 사용자가 특별히 요청하는 경우가 아니면 권장 사항을 가져오거나 표시하지 않습니다."
-+=======
-+	"extensionsIgnoreRecommendations": "True로 설정하는 경우 확장 권장 사항에 대한 알림 표시가 중지됩니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 4b0a8e8d04637f302736414971e52402b336c74f i18n/kor/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
-  our    100644 3271bfdf63bf31e2a9d8cf8274a1f98cef049bf7 i18n/kor/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
-  their  100644 0496d738c05c68fa02a850115ac94ca7079b07ff i18n/kor/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"starActivation": "시작 시 활성화됨",
- 	"workspaceContainsGlobActivation": "{0}과(와) 일치하는 파일이 작업 영역에 있으므로 활성화됨",
- 	"workspaceContainsFileActivation": "{0} 파일이 작업 영역에 있으므로 활성화됨",
-changed in both
-  base   100644 b962da52ed963be01f95715acc2834881bf51629 i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 3bf77a27ac7c066f4ce3c283301cd1346b8314d5 i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 87d00a4c77a6c99ce0050a71341b3aa317861ab4 i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -67,6 +67,11 @@
- 	"fileNameExistsError": "파일 또는 폴더 **{0}**이(가) 이 위치에 이미 있습니다. 다른 이름을 선택하세요.",
- 	"invalidFileNameError": "**{0}**(이)라는 이름은 파일 또는 폴더 이름으로 올바르지 않습니다. 다른 이름을 선택하세요.",
- 	"filePathTooLongError": "**{0}**(이)라는 이름을 사용하면 경로가 너무 길어집니다. 짧은 이름을 선택하세요.",
-+<<<<<<< .our
-+=======
-+	"compareWithSaved": "활성 파일을 저장된 파일과 비교",
-+	"modifiedLabel": "{0}(디스크) ↔ {1}",
-+>>>>>>> .their
- 	"compareWithClipboard": "클립보드와 활성 파일 비교",
- 	"clipboardComparisonLabel": "클립보드 ↔ {0}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 4ce15b3e32b3be95e010ff03d60784e15c5b4209 i18n/kor/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json
-  our    100644 a442c7ea306d00b663b4b26e9b9b07730b387469 i18n/kor/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json
-  their  100644 639701925b402ebca28ce7bdebdcf69dbad2eeb4 i18n/kor/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json
-  our    100644 5ea2aa6a1471652a9fcd41b6d7b1a80915622da0 i18n/kor/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json
-  their  100644 ce74fbfe7d0afdf8987fef9af1d3ab890dc54b33 i18n/kor/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"totalProblems": "총 {0}개 문제",
- 	"filteredProblems": "{1}개 중 {0}개 문제 표시"
- }
-\ No newline at end of file
-changed in both
-  base   100644 fb8699cf20f26a9e4061a32b9781eaae4b288236 i18n/kor/src/vs/workbench/parts/markers/common/messages.i18n.json
-  our    100644 96ac7a8193ddf876a2dd0c0ad04713fa5d3664fb i18n/kor/src/vs/workbench/parts/markers/common/messages.i18n.json
-  their  100644 f9e867de14d4dfeed9a8cddbe7b34f6cb7164ee5 i18n/kor/src/vs/workbench/parts/markers/common/messages.i18n.json
-@@ -7,8 +7,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"viewCategory": "보기",
-+<<<<<<< .our
- 	"problems.view.toggle.label": "문제 토글(오류, 경고, 정보)",
- 	"problems.view.focus.label": "포커스 문제(오류, 경고, 정보)",
-+=======
-+	"problems.view.toggle.label": "설정/해제 문제",
-+	"problems.view.focus.label": "포커스 문제",
-+>>>>>>> .their
- 	"problems.panel.configuration.title": "문제 보기",
- 	"problems.panel.configuration.autoreveal": "문제 보기를 열 때 문제 보기에 자동으로 파일이 표시되어야 하는지를 제어합니다.",
- 	"markers.panel.title.problems": "문제",
-changed in both
-  base   100644 edf361223f66234367c3fd9bba6a5bca90e4cf4d i18n/kor/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
-  our    100644 076c415045b01eedcc3728c421f37dbe4f586176 i18n/kor/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
-  their  100644 4a2bff216ea0e60404093702ece6bffc0fd5739a i18n/kor/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,8 @@
- 	],
- 	"defineKeybinding.oneExists": "1개의 기존 명령에 이 키 바인딩이 있습니다.",
- 	"defineKeybinding.existing": "{0}개의 기존 명령에 이 키 바인딩이 있습니다.",
-+=======
-+>>>>>>> .their
- 	"defineKeybinding.initial": "원하는 키 조합을 누르고 <Enter> 키를 누르세요.",
- 	"defineKeybinding.chordsTo": "현"
- }
-\ No newline at end of file
-changed in both
-  base   100644 3ded239f7d21cff4867891406c6340e93018a86a i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  our    100644 ad061c299ee4ef976122d2a8f6e9baa370867e9b i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  their  100644 4ccbbd8cacf8ed7ac3dc5a83ff1b7281c114bc76 i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -9,6 +10,9 @@
- 	"openRawDefaultSettings": "원시 기본 설정 열기",
- 	"openSettings2": "설정 열기(미리 보기)",
- 	"openSettings": "설정 열기",
-+=======
-+	"openRawDefaultSettings": "원시 기본 설정 열기",
-+>>>>>>> .their
- 	"openGlobalSettings": "사용자 설정 열기",
- 	"openGlobalKeybindings": "바로 가기 키 열기",
- 	"openGlobalKeybindingsFile": "바로 가기 키 파일 열기",
-changed in both
-  base   100644 0356863191a9287975437da7f238a432aac175bc i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-  our    100644 aecb53ab9b9ac6a3addd171d6c1d4943de0e0b02 i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-  their  100644 8e8e066cc1a3fe86611a240d0e89289c9a2c2fb9 i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-@@ -15,8 +15,11 @@
- 	"nlpResult": "자연어 결과",
- 	"filterResult": "필터링된 결과",
- 	"defaultSettings": "기본 설정",
-+<<<<<<< .our
- 	"defaultUserSettings": "기본 사용자 설정",
- 	"defaultWorkspaceSettings": "기본 작업 영역 설정",
-+=======
-+>>>>>>> .their
- 	"defaultFolderSettings": "기본 폴더 설정",
- 	"defaultEditorReadonly": "기본값을 재정의하려면 오른쪽 편집기를 편집하세요.",
- 	"preferencesAriaLabel": "기본 설정. 읽기 전용 텍스트 편집기입니다."
-changed in both
-  base   100644 7a4c308d03cc82472b26037afd08d811b6e6ce72 i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 a8bd67a28f391e840f7a35323a824c51031c0c11 i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 188fd9c37dab70a07e044f3acd7af0dbac94f1fb i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,10 +7,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"defaultSettingsFuzzyPrompt": "자연어 검색을 사용해 보세요!",
-+>>>>>>> .their
- 	"defaultSettings": "설정을 오른쪽 편집기에 넣어서 덮어씁니다.",
- 	"noSettingsFound": "설정을 찾을 수 없습니다.",
- 	"settingsSwitcherBarAriaLabel": "설정 전환기",
- 	"userSettings": "사용자 설정",
- 	"workspaceSettings": "작업 영역 설정",
-+<<<<<<< .our
- 	"folderSettings": "폴더 설정"
-+=======
-+	"folderSettings": "폴더 설정",
-+	"enableFuzzySearch": "자연어 검색 사용"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 25d60399f44f2c35fca96484476f28f1f7549062 i18n/kor/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json
-  our    100644 edc1ed7d61f12dabcab95c9f2f34f7d2a44ed0c1 i18n/kor/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json
-  their  100644 583bab228648f284cfbd5807a794bb134cfcd77a i18n/kor/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"defaultLabel": "입력",
- 	"useExcludesAndIgnoreFilesDescription": "제외 설정 및 파일 무시 사용"
- }
-\ No newline at end of file
-changed in both
-  base   100644 e0344b0285be0c467fd558673f0663b8d8712bbe i18n/kor/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 7b483f685d0f32a5b2eb20f1327a18475e2d29ae i18n/kor/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 ad0d8faf6501e946b8440cf4fcdb6b8e22239c1c i18n/kor/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -13,7 +13,11 @@
- 	"totalInfos": "정보 {0}개",
- 	"problems": "문제",
- 	"building": "빌드하고 있습니다...",
-+<<<<<<< .our
- 	"manyProblems": "10K+",
-+=======
-+	"manyMarkers": "99+",
-+>>>>>>> .their
- 	"runningTasks": "실행 중인 작업 표시",
- 	"tasks": "작업",
- 	"TaskSystem.noHotSwap": "실행 중인 활성 작업이 있는 작업 실행 엔진을 변경하면 Window를 다시 로드해야 합니다.",
-changed in both
-  base   100644 b052f09dc9eff6e8bf3144bd2926705cb687ec64 i18n/kor/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
-  our    100644 346918e15f0160843027dd42e9dddef5a13cb68d i18n/kor/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
-  their  100644 a17354af37d17423be1c3c983c865782c2e5d1bc i18n/kor/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
-changed in both
-  base   100644 7638704dea1ed4b4613cc0fec1f7593062ffbb3d i18n/kor/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  our    100644 13963265fec1836212d41ecacb07eed5e173dace i18n/kor/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  their  100644 c62cb2cd281f77de0b129c37c04eb6bcf470e45e i18n/kor/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-@@ -18,6 +18,10 @@
- 	"ConfigurationParser.missingRequiredProperty": "오류: 작업 구성 '{0}'에 필요한 속성 '{1}'이(가) 없습니다. 작업 구성이 무시됩니다.",
- 	"ConfigurationParser.notCustom": "오류: 작업이 사용자 지정 작업으로 선언되지 않았습니다. 이 구성은 무시됩니다.\n{0}\n",
- 	"ConfigurationParser.noTaskName": "오류: 작업에서 레이블 속성을 제공해야 합니다. 이 작업은 무시됩니다.\n{0}\n",
-+<<<<<<< .our
-+=======
-+	"taskConfiguration.shellArgs": "경고: '{0}' 작업은 셸 명령이며 인수 중 하나에 이스케이프되지 않은 공백이 있을 수 있습니다. 올바른 명령줄 인용인지 확인하려면 인수를 명령으로 병합하세요.",
-+>>>>>>> .their
- 	"taskConfiguration.noCommandOrDependsOn": "오류: 작업 '{0}'에서 명령이나 dependsOn 속성을 지정하지 않습니다. 이 작업은 무시됩니다. 해당 작업의 정의는 {1}입니다.",
- 	"taskConfiguration.noCommand": "오류: 작업 '{0}'에서 명령을 정의하지 않습니다. 이 작업은 무시됩니다. 해당 작업의 정의는\n{1}입니다.",
- 	"TaskParse.noOsSpecificGlobalTasks": "작업 버전 2.0.0은 글로벌 OS별 작업을 지원하지 않습니다. OS별 명령을 사용하여 작업으로 변환하세요. 영향을 받는 작업::\n{0}"
-changed in both
-  base   100644 1a66c6cd5375b3ddb4e9e8e478d34cf0a38b85c6 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 bc58bba26a36ca2c7cacec97bfa2f02daab82775 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 c8be10020cfb54c54255e0bd1c4901d4ada3d4ca i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -19,10 +19,15 @@
- 	"terminal.integrated.copyOnSelection": "설정된 경우, 터미널에서 선택된 텍스트가 클립보드로 복사됩니다.",
- 	"terminal.integrated.fontFamily": "터미널의 글꼴 패밀리를 제어하며, 기본값은 editor.fontFamily의 값입니다.",
- 	"terminal.integrated.fontSize": "터미널의 글꼴 크기(픽셀)를 제어합니다.",
-+<<<<<<< .our
- 	"terminal.integrated.letterSpacing": "터미널의 문자 간격을 제어하며, 문자  사이에 추가할 픽셀의 양을 나타내는 정수 값입니다.",
- 	"terminal.integrated.lineHeight": "터미널의 줄 높이를 제어합니다. 이 숫자에 터미널 글꼴 크기를 곱해 실제 줄 높이(픽셀)를 얻습니다.",
- 	"terminal.integrated.fontWeight": "터미널 내에서 굵은 글꼴이 아닌 텍스트에 사용할 글꼴 두께입니다.",
- 	"terminal.integrated.fontWeightBold": "터미널 내에서 굵은 글꼴 텍스트에 사용할 글꼴 두께입니다.",
-+=======
-+	"terminal.integrated.lineHeight": "터미널의 줄 높이를 제어합니다. 이 숫자에 터미널 글꼴 크기를 곱해 실제 줄 높이(픽셀)를 얻습니다.",
-+	"terminal.integrated.enableBold": "터미널 내에서 굵은 텍스트를 사용하도록 설정할지 여부이며, 터미널 셸의 지원이 필요합니다.",
-+>>>>>>> .their
- 	"terminal.integrated.cursorBlinking": "터미널 커서 깜박임 여부를 제어합니다.",
- 	"terminal.integrated.cursorStyle": "터미널 커서의 스타일을 제어합니다.",
- 	"terminal.integrated.scrollback": "터미널에서 버퍼에 유지하는 최대 줄 수를 제어합니다.",
-changed in both
-  base   100644 43a0bba1a526a134b51d174836d4ba5721ba9bcb i18n/kor/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
-  our    100644 eaf1592fa8cc8814448c0f195b8f2c6cb9553ac8 i18n/kor/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
-  their  100644 c71597794cabfb2a6055315951924c5a6c491b2f i18n/kor/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
-  our    100644 5b8f343022ad10660aea8f42ade2ca43e07a7e4f i18n/kor/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
-  their  100644 69a95ffd567ad413ebe8820c457621f25d86221e i18n/kor/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"bubbleTitle": "강조 표시한 항목 포함"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
-  our    100644 d2e87a56b9af37fb9efbf261083e70c00aeff517 i18n/kor/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
-  their  100644 0df1b9294ba36817f4984e7b32354e51ef740192 i18n/kor/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"message": "$(zap) 확장 호스트를 프로파일링하는 중..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 6f9c095c667c8818808de57bf842f1918a292e00 i18n/kor/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-  our    100644 69402728066363caec2fc8a19b417aff1116be30 i18n/kor/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-  their  100644 2f308f7c3f849203296adee1ca959bea8bd1d567 i18n/kor/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-@@ -13,6 +13,10 @@
- 	"restart": "확장 호스트 다시 시작",
- 	"overwritingExtension": "확장 {0}을(를) {1}(으)로 덮어쓰는 중입니다.",
- 	"extensionUnderDevelopment": "{0}에서 개발 확장 로드 중",
-+<<<<<<< .our
- 	"extensionCache.invalid": "확장이 디스크에서 수정되었습니다. 창을 다시 로드하세요.",
- 	"reloadWindow": "창 다시 로드"
-+=======
-+	"extensionCache.invalid": "확장이 디스크에서 수정되었습니다. 창을 다시 로드하세요."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 10bf5a9ef4f0e122c68a22d58da72a5c4f189d6c i18n/kor/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
-  our    100644 4f7f21f665e01817cc68b7e909079d58bf73db9f i18n/kor/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
-  their  100644 4af8c158d1fb819710e7fcd773e9407f3e16c5f8 i18n/kor/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
-@@ -24,6 +24,10 @@
- 	"keybindings.json.when": "키가 활성화되는 조건입니다.",
- 	"keybindings.json.args": "실행할 명령에 전달할 인수입니다.",
- 	"keyboardConfigurationTitle": "키보드",
-+<<<<<<< .our
- 	"dispatch": "`code`(권장) 또는 `keyCode`를 사용하는 키 누름에 대한 디스패치 논리를 제어합니다.",
- 	"touchbar.enabled": "사용 가능한 경우 키보드의 macOS Touch Bar 단추를 사용하도록 설정합니다."
-+=======
-+	"dispatch": "`code`(권장) 또는 `keyCode`를 사용하는 키 누름에 대한 디스패치 논리를 제어합니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/src/vs/workbench/services/textfile/common/textFileService.i18n.json
-  our    100644 c1461906d4e0f78963dda32cdf7715e48cfb37e5 i18n/kor/src/vs/workbench/services/textfile/common/textFileService.i18n.json
-  their  100644 bcfc393f96111299460aa5ab1e490a5265cbea75 i18n/kor/src/vs/workbench/services/textfile/common/textFileService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"files.backup.failSave": "변경된 내용이 있는 파일을 백업 위치에 쓸 수 없습니다(오류: {0}). 먼저 파일을 저장한 다음 종료해 보세요."
- }
-\ No newline at end of file
-changed in both
-  base   100644 93bb46e1ff4b2d55924791c23fb042c1acf6d394 i18n/ptb/extensions/emmet/package.i18n.json
-  our    100644 bd44dd5d5523e2a5800a445af385bb5a762f2233 i18n/ptb/extensions/emmet/package.i18n.json
-  their  100644 41745410f9bcadcc60f93c8711390cc90dbdd42b i18n/ptb/extensions/emmet/package.i18n.json
-@@ -55,6 +55,7 @@
- 	"emmetPreferencesFilterCommentTrigger": "Uma lista separada por vírgulas de nomes de atributo que deve existir em abreviações para o filtro de comentário a ser aplicado",
- 	"emmetPreferencesFormatNoIndentTags": "Uma matriz de nomes de abas que não devem ter recuo interno",
- 	"emmetPreferencesFormatForceIndentTags": "Uma matriz de nomes de abas que deve sempre devem ter recuo interno",
-+<<<<<<< .our
- 	"emmetPreferencesAllowCompactBoolean": "Se verdadeiro, a notação compacta de atributos booleanos são produzidos",
- 	"emmetPreferencesCssWebkitProperties": "Propriedades CSS separadas por vírgula que recebem o prefixo vendor 'webkit' quando utilizado em abreviações do Emmet que iniciam com `-`. Defina como string vazia para sempre evitar o prefixo 'webkit'.",
- 	"emmetPreferencesCssMozProperties": "Propriedades CSS separadas por vírgula que recebem o prefixo vendor 'moz' quando utilizado em abreviações do Emmet que iniciam com `-`. Defina como string vazia para sempre evitar o prefixo 'moz'.",
-@@ -62,4 +63,7 @@
- 	"emmetPreferencesCssMsProperties": "Propriedades CSS separadas por vírgula que recebem o prefixo vendor 'ms' quando utilizado em abreviações do Emmet que iniciam com `-`. Defina como string vazia para sempre evitar o prefixo 'ms'.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "A pontuação mínima (de 0 a 1) que a abreviação difusa deve alcançar. Os valores mais baixos podem produzir muitas correspondências falso-positivas, valores mais elevados podem reduzir possíveis correspondências.\n",
- 	"emmetOptimizeStylesheetParsing": "Quando definido como false, o arquivo inteiro é analisado para determinar se a posição atual é válida para expandir as abreviações Emmet. Quando definido como true, somente o conteúdo em torno da posição atual em arquivos css / scss / less é analisado."
-+=======
-+	"emmetPreferencesAllowCompactBoolean": "Se verdadeiro, a notação compacta de atributos booleanos são produzidos"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ee0b74f6e41e5468d93e5f7173b69f0603644ff5 i18n/ptb/src/vs/code/node/cliProcessMain.i18n.json
-  our    100644 d7b75a600b19bf5bb52120fd61dad371f7eb3f96 i18n/ptb/src/vs/code/node/cliProcessMain.i18n.json
-  their  100644 ec57d526c983460b09aaae6b9449662e40ea339c i18n/ptb/src/vs/code/node/cliProcessMain.i18n.json
-changed in both
-  base   100644 db6da099ec40e53fde40692a4ed7872234f0b944 i18n/ptb/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 6c41dd22a5af7308ee2eafe191d717bc6243ff1f i18n/ptb/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 52ffce48a73d152ac7b3fed7adaa27517ed61e3d i18n/ptb/src/vs/editor/common/config/commonEditorConfig.i18n.json
-changed in both
-  base   100644 eb3341e2a4dcfa6b30a4af39e5eabd743ab40a2a i18n/ptb/src/vs/editor/contrib/folding/folding.i18n.json
-  our    100644 9738b48efa94d0314e5d3c26ef3d254baec2627b i18n/ptb/src/vs/editor/contrib/folding/folding.i18n.json
-  their  100644 51b3d0dbab7da87137c23054010c56105610bdf0 i18n/ptb/src/vs/editor/contrib/folding/folding.i18n.json
-changed in both
-  base   100644 eb886a026f7954cea045f47e539aaa77e5a70c2b i18n/ptb/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 a3aea9d9c8c0805d0052884c40ebb83b3447e311 i18n/ptb/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 ed9e5aca99ca21666c8f46c0690781a42cad37c6 i18n/ptb/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,8 +10,21 @@
- 	"diff": "Comparar dois arquivos entre si.",
- 	"add": "Adicione pasta(s) para a última janela ativa.",
- 	"goto": "Abra um arquivo no caminho sobre a linha especificada e a posição do caractere.",
-+<<<<<<< .our
- 	"newWindow": "Obriga a abrir uma nova janela.",
- 	"reuseWindow": "Obriga a abrir um arquivo ou pasta na última janela ativa.",
-+=======
-+	"locale": "Para localização utilize (ex. en-US ou zh-TW).",
-+	"newWindow": "Força uma nova instância do Código.",
-+	"performance": "Comece com o 'Desenvolvedor: Desempenho de inicialização' comando habilitado.",
-+	"prof-startup": "Rodar o CPU profiler durante a inicialização",
-+	"inspect-extensions": "Permite depuração e criação de perfis de extensões. Verifique as ferramentas de desenvolvimento para a conexão uri.",
-+	"inspect-brk-extensions": "Permitir depuração e criação de perfil de extensões com o host de extensão em pausa após o início. Verifique as ferramentas do desenvolvedor para a conexão uri.",
-+	"reuseWindow": "Forçar a abertura de um arquivo ou pasta na última janela ativa",
-+	"userDataDir": "Especifica o diretório que os dados do usuário serão mantidos, útil quando estiver rodando como root.",
-+	"log": "Nível de log a ser utilizado. O padrão é 'info'. Os valores permitidos são 'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off'.",
-+	"verbose": "Imprimir a saída detalhada (Implica -- esperar).",
-+>>>>>>> .their
- 	"wait": "Espere pelos arquivos a serem fechados antes de retornar.",
- 	"locale": "Para localização utilize (ex. en-US ou zh-TW).",
- 	"userDataDir": "Especifica o diretório em que os dados do usuário são mantidos. Pode ser usado para abrir várias instâncias distintas do Code.",
-changed in both
-  base   100644 04de1ce8ceff7c77e007e551a971023884747a0d i18n/ptb/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 62b4a14f179ce17a8ef358da83ed726d39cdb13f i18n/ptb/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 67b112045f5d9d5106f2f5fb7edeb28a179c9d19 i18n/ptb/src/vs/workbench/electron-browser/actions.i18n.json
-@@ -50,6 +50,30 @@
- 	"moveWindowTabToNewWindow": "Mover a guia da janela para a nova janela",
- 	"mergeAllWindowTabs": "Mesclar todas as janelas",
- 	"toggleWindowTabsBar": "Alternar a Barra de Guias da Janela",
-+<<<<<<< .our
- 	"about": "Sobre {0}",
- 	"inspect context keys": "Inspecionar Chaves de Contexto"
-+=======
-+	"configureLocale": "Configurar Idioma",
-+	"displayLanguage": "Define o idioma de exibição do VSCode.",
-+	"doc": "Veja {0} para obter uma lista dos idiomas suportados.",
-+	"restart": "Modificar o valor requer reinicialização do VSCode.",
-+	"fail.createSettings": "Não foi possível criar '{0}' ({1}).",
-+	"openLogsFolder": "Abrir Pasta de Logs",
-+	"showLogs": "Exibir Logs...",
-+	"mainProcess": "Principal",
-+	"sharedProcess": "Compartilhado",
-+	"rendererProcess": "Renderizador",
-+	"extensionHost": "Host de Extensão",
-+	"selectProcess": "Selecionar processo",
-+	"setLogLevel": "Definir Nível de Log",
-+	"trace": "Rastreamento",
-+	"debug": "Depurar",
-+	"info": "Informações",
-+	"warn": "Aviso",
-+	"err": "Erro",
-+	"critical": "Crítico",
-+	"off": "Desligado",
-+	"selectLogLevel": "Selecione o nível de log"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 b576d0807c894ae171646d0f6aac92520892d3f6 i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  our    100644 5396071d2357499831a5c23400da1b7100abbf16 i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  their  100644 82aa2a51714f7dc65d649d3ac989b550ff05577d i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-changed in both
-  base   100644 9d0ec3a464bf4f719d69e14cca146d7d8605d869 i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 7ae7f7f9b7576297c381fe538464cf315327a1cf i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 de45eedf2210368b72754398d9babde3e1c9a7d6 i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -13,12 +13,18 @@
- 	"breakpointAdded": "Adicionado ponto de interrupção, linha {0}, arquivo {1}",
- 	"breakpointRemoved": "Ponto de interrupção removido, linha {0}, arquivo {1}",
- 	"compoundMustHaveConfigurations": "Composição deve ter o atributo \"configurations\" definido para iniciar várias configurações.",
-+<<<<<<< .our
- 	"noConfigurationNameInWorkspace": "Não foi possível encontrar a configuração de inicialização '{0}' na área de trabalho.",
- 	"multipleConfigurationNamesInWorkspace": "Existem múltiplas configurações de lançamento '{0}' na área de trabalho. Use o nome da pasta para qualificar a configuração.",
- 	"noFolderWithName": "Não é possível encontrar a pasta com nome '{0}' para configuração '{1}' no composto '{2}'.",
- 	"configMissing": "Configuração '{0}' não tem 'launch.json'.",
- 	"launchJsonDoesNotExist": "'launch.json' não existe.",
- 	"debugRequestNotSupported": "Atributo '{0}' tem um valor sem suporte '{1}' na configuração de debug escolhida.",
-+=======
-+	"configMissing": "Configuração '{0}' não tem 'launch.json'.",
-+	"launchJsonDoesNotExist": "'launch.json' não existe.",
-+	"debugRequestNotSupported": "Atributo '{0}' tem um valor sem suporte '{1}' na configuração de depuração escolhida.",
-+>>>>>>> .their
- 	"debugRequesMissing": "Atributo '{0}' está faltando para a configuração de depuração escolhida.",
- 	"debugTypeNotSupported": "Tipo de depuração configurado '{0}' não é suportado.",
- 	"debugTypeMissing": "Falta a propriedade 'type' para a configuração de lançamento escolhida.",
-changed in both
-  base   100644 d82c863fc27a6a0904b10f466bd1e883a7d757c5 i18n/ptb/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
-  our    100644 7e7aea384bbc769cfc790b941ec4868aa41c3d6e i18n/ptb/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
-  their  100644 75103d39319255ac146f3d4386bc0459ab2f23ba i18n/ptb/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"ratedByUsers": "Avaliado por {0} usuários",
- 	"ratedBySingleUser": "Avaliado por 1 usuário"
- }
-\ No newline at end of file
-changed in both
-  base   100644 77e6de1fbbcabab009dce4082f6c1f5a78b82cb1 i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
-  our    100644 1437e9762aee09496562c4d47a8016ccdd5573c3 i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
-  their  100644 9e3b4ca9b5b9d7e7f2c7b839ab1a5de138b49115 i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
-@@ -15,6 +15,10 @@
- 	"developer": "Desenvolvedor",
- 	"extensionsConfigurationTitle": "Extensões",
- 	"extensionsAutoUpdate": "Atualizar extensões automaticamente",
-+<<<<<<< .our
- 	"extensionsIgnoreRecommendations": "Se definido como verdadeiro, as notificações para recomendações de extensão irão parar de aparecer.",
- 	"extensionsShowRecommendationsOnlyOnDemand": "Se configurado como verdadeira, as recomendações não serão localizadas ou mostradas a menos que sejam especificamente solicitadas pelo usuário."
-+=======
-+	"extensionsIgnoreRecommendations": "Se definido como verdadeiro, as notificações para recomendações de extensão irão parar de aparecer."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 bec798884ffa5a218e2e48a014847be270c6dae2 i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
-  our    100644 6f0b7a68d7c04a41aa930eb6079efc72e3957ece i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
-  their  100644 a02e2630fde97b77b3a1aa1f12783aca898d8e65 i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/ptb/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
-  our    100644 319153a4a8c18ad2654bc98b0e38ed9b631047fe i18n/ptb/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
-  their  100644 ff3ad330c910ae4d5428d55d14269a75d65323b0 i18n/ptb/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"message": "$(zap) Perfil de Host de Extensão..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 73454bf8b97025dc3a6481f9d1f252d7180a899b i18n/rus/extensions/css/client/out/cssMain.i18n.json
-  our    100644 01ee817cdcdf30f252457a8b31df7d66964bf6fc i18n/rus/extensions/css/client/out/cssMain.i18n.json
-  their  100644 237c382d200ccffe8dbf9af7a46d1e36f1bb425d i18n/rus/extensions/css/client/out/cssMain.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"cssserver.name": "Языковой сервер CSS",
- 	"folding.start": "Начало сворачиваемого региона",
- 	"folding.end": "Окончание сворачиваемого региона"
-changed in both
-  base   100644 49fa561f309b4601652ed9ccb08462b1e2cdad8c i18n/rus/extensions/emmet/package.i18n.json
-  our    100644 e8a08df3b0fb514f0bab0b0d555c900a23a3deca i18n/rus/extensions/emmet/package.i18n.json
-  their  100644 2638e01cf805d961ed9f12ba49cc5f949a5b3796 i18n/rus/extensions/emmet/package.i18n.json
-@@ -55,6 +55,7 @@
- 	"emmetPreferencesFilterCommentTrigger": "Разделителями запятыми список имен атрибутов, которые должны присутствовать в сокращении для применения фильтра комментария",
- 	"emmetPreferencesFormatNoIndentTags": "Массив имен тегов, для которых не следует использовать внутренние отступы",
- 	"emmetPreferencesFormatForceIndentTags": "Массив имен тегов, для которых всегда следует использовать внутренние отступы",
-+<<<<<<< .our
- 	"emmetPreferencesAllowCompactBoolean": "Если этот параметр имеет значение true, формируется компактная запись логических атрибутов",
- 	"emmetPreferencesCssWebkitProperties": "Разделенный запятыми список свойств CSS, которые получают префикс разработчика \"webkit\" при использовании в сокращениях Emmet, которые начинаются с \"-\". Чтобы префикс  \"webkit\" никогда не подставлялся, установите в качестве этого параметра пустое значение.",
- 	"emmetPreferencesCssMozProperties": "Разделенный запятыми список свойств CSS, которые получают префикс разработчика \"moz\" при использовании в сокращениях Emmet, которые начинаются с \"-\". Чтобы префикс \"moz\" никогда не подставлялся, установите в качестве этого параметра пустое значение. ",
-@@ -62,4 +63,7 @@
- 	"emmetPreferencesCssMsProperties": "Разделенный запятыми список свойств CSS, которые получают префикс разработчика \"ms\" при использовании в сокращениях Emmet, которые начинаются с \"-\". Чтобы префикс \"ms\" никогда не подставлялся, установите в качестве этого параметра пустое значение. ",
- 	"emmetPreferencesCssFuzzySearchMinScore": "Минимальное количество очков для нечеткого соответствия сокращения (от 0 до 1). При указании более низких значений возможно увеличение числа ложных срабатываний, при указании более высоких значений - уменьшение числа возможных соответствий.",
- 	"emmetOptimizeStylesheetParsing": "Если значение равно false, весь файл анализируется для определения, является ли текущая позиция допустимой для расширения сокращений Emmet. Когда присвоено значение true, только содержимое вокруг текущей позиции в файлах css/scss/less подвергается синтаксическому анализу."
-+=======
-+	"emmetPreferencesAllowCompactBoolean": "Если этот параметр имеет значение true, формируется компактная запись логических атрибутов"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 0f8fdf4d3aabb6ea5f234dd6011cbc849be33dce i18n/rus/extensions/git/out/autofetch.i18n.json
-  our    100644 674a3834cc198d7819143c18bcdd12ed733e4813 i18n/rus/extensions/git/out/autofetch.i18n.json
-  their  100644 1e461cf4629319ae5dd2cc20137a3683d3d8ed9b i18n/rus/extensions/git/out/autofetch.i18n.json
-@@ -8,6 +8,11 @@
- 	],
- 	"yes": "Да",
- 	"no": "Нет",
-+<<<<<<< .our
- 	"not now": "Спросить меня позже",
- 	"suggest auto fetch": "Вы хотите, чтобы среда Code [периодически выполняла команду \"git fetch\"]({0})?"
-+=======
-+	"not now": "Не сейчас",
-+	"suggest auto fetch": "Вы хотите включить автоматическое получение для репозиториев Git?"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 149e1af6b0972bd79630622eb1efa52cdbbc221d i18n/rus/extensions/git/out/commands.i18n.json
-  our    100644 bdd7adadfadc50db48d014178fb19ce838d13900 i18n/rus/extensions/git/out/commands.i18n.json
-  their  100644 d8d6feaa35d000d85deb6dadc78f8004729efb8f i18n/rus/extensions/git/out/commands.i18n.json
-@@ -10,12 +10,21 @@
- 	"remote branch at": "Удаленная ветвь в {0}",
- 	"create branch": "$(plus) Создать новую ветвь",
- 	"repourl": "URL-адрес репозитория",
-+<<<<<<< .our
- 	"selectFolder": "Выбрать расположение репозитория",
- 	"cloning": "Клонирование репозитория Git \"{0}\"...",
- 	"proposeopen": "Вы хотите открыть клонированный репозиторий?",
- 	"openrepo": "Открыть репозиторий",
- 	"add": "Добавить в рабочую область",
- 	"proposeopen2": "Вы хотите открыть клонированный репозиторий, или добавить его в текущую рабочую область?",
-+=======
-+	"parent": "Родительский каталог",
-+	"cancel": "$(sync~spin) Клонирование репозитория... Чтобы отменить эту операцию, щелкните здесь",
-+	"cancel tooltip": "Отменить клонирование",
-+	"cloning": "Клонируется репозиторий Git...",
-+	"openrepo": "Открыть репозиторий",
-+	"proposeopen": "Вы хотите открыть клонированный репозиторий?",
-+>>>>>>> .their
- 	"init": "Выберите папку рабочей области для инициализации репозитория Git",
- 	"init repo": "Инициализировать репозиторий",
- 	"create repo": "Инициализировать репозиторий",
-changed in both
-  base   100644 85416c1538abcf642cec1a37450e6283cfcb5a16 i18n/rus/extensions/git/out/main.i18n.json
-  our    100644 3d91096bb1a71d2e03304d644d4e7ee2d4b09ac4 i18n/rus/extensions/git/out/main.i18n.json
-  their  100644 f4e90ccb9872ecf5ea5704b0aad6bad18369e418 i18n/rus/extensions/git/out/main.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"looking": "Поиск Git в: {0}",
- 	"using git": "Использование GIT {0} из {1}",
- 	"downloadgit": "Скачать Git",
-changed in both
-  base   100644 bb861a75c0cefc8f07c6493af28d607c18470173 i18n/rus/extensions/git/package.i18n.json
-  our    100644 f033330e3d5aad5041c41da260339bd159e31636 i18n/rus/extensions/git/package.i18n.json
-  their  100644 dcff3e1c9f0abb0ae90a973cee11c6c5f38cfe02 i18n/rus/extensions/git/package.i18n.json
-changed in both
-  base   100644 364064582bff27dfc5de28ba576236b0913ce528 i18n/rus/extensions/html/client/out/htmlMain.i18n.json
-  our    100644 113482bb267a4e68dd1e6cf0c835df49decbd407 i18n/rus/extensions/html/client/out/htmlMain.i18n.json
-  their  100644 27921a772ec8678e07eeb8ce8e53bef2a93d275b i18n/rus/extensions/html/client/out/htmlMain.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"htmlserver.name": "Языковой сервер HTML",
- 	"folding.start": "Начало сворачиваемого региона",
- 	"folding.end": "Окончание сворачиваемого региона"
-changed in both
-  base   100644 5c5b3690dc66cead27af50fbe2ab03d27f33f429 i18n/rus/extensions/markdown/out/commands.i18n.json
-  our    100644 e57835dcf964aee57542cedde1e29affb8d3231d i18n/rus/extensions/markdown/out/commands.i18n.json
-  their  100644 e2752845d0fc877bd7e927a2c8740e54a6a5e86a i18n/rus/extensions/markdown/out/commands.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"previewTitle": "Предварительный просмотр {0}",
- 	"onPreviewStyleLoadError": "Не удалось загрузить 'markdown.styles': {0}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 11a39b993e2b7c6ebf242ff28a9f8f9a1800111a i18n/rus/extensions/markdown/out/security.i18n.json
-  our    100644 e57fedc24d6225bfff89936b87ebe3ea901f606d i18n/rus/extensions/markdown/out/security.i18n.json
-  their  100644 17f7b23073af34186a3c2b196a321c1cd1f2a473 i18n/rus/extensions/markdown/out/security.i18n.json
-changed in both
-  base   100644 209c32b7d11b45948293ab64b3c3e51dfd4d9e27 i18n/rus/extensions/merge-conflict/package.i18n.json
-  our    100644 617fa5e579f7de909d32df864b0c60ea258c8f92 i18n/rus/extensions/merge-conflict/package.i18n.json
-  their  100644 b792fefd678ad5f9f888b911620fd9df26c409ae i18n/rus/extensions/merge-conflict/package.i18n.json
-changed in both
-  base   100644 758fad838564109edf762d74947a4451b4487003 i18n/rus/extensions/typescript/out/features/completionItemProvider.i18n.json
-  our    100644 3df8eafb0516e9eeec72a01567c1afd1ebf6d616 i18n/rus/extensions/typescript/out/features/completionItemProvider.i18n.json
-  their  100644 baf52ec9de34bd7355c1e1dfed12a4e6e58f2183 i18n/rus/extensions/typescript/out/features/completionItemProvider.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"selectCodeAction": "Выберите применяемое действие кода",
- 	"acquiringTypingsLabel": "Получение typings...",
- 	"acquiringTypingsDetail": "Получение определений typings для IntelliSense.",
-changed in both
-  base   100644 537a583b5e35c97f9c15cf9e9778d1323de60683 i18n/rus/extensions/typescript/package.i18n.json
-  our    100644 f85ab4719ef4b9af38326543e2a0d45bbd38ba2c i18n/rus/extensions/typescript/package.i18n.json
-  their  100644 2980026d6d15b2ce911f1e3223a0cb4ab92d2b3a i18n/rus/extensions/typescript/package.i18n.json
-changed in both
-  base   100644 3a698517ea1d9d79868b3b322b1237a947e6c360 i18n/rus/src/vs/code/electron-main/main.i18n.json
-  our    100644 f870935460b4876ec85757720650151ceea0c423 i18n/rus/src/vs/code/electron-main/main.i18n.json
-  their  100644 1cf3dee66aab0e21f194f7c721b6684d1b014e00 i18n/rus/src/vs/code/electron-main/main.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"secondInstanceNoResponse": "Еще один экземпляр {0} запущен, но не отвечает",
- 	"secondInstanceNoResponseDetail": "Закройте все остальные экземпляры и повторите попытку.",
- 	"secondInstanceAdmin": "Уже запущен второй экземпляр {0} от имени администратора.",
-changed in both
-  base   100644 194c4240f258ff1d1bd72a93a0709acb3f4a05ab i18n/rus/src/vs/code/electron-main/menus.i18n.json
-  our    100644 6c6420ff3fff2721736f81d703d8eb2e0907f38c i18n/rus/src/vs/code/electron-main/menus.i18n.json
-  their  100644 937574f1898741569373522cd34568a43c0cdd11 i18n/rus/src/vs/code/electron-main/menus.i18n.json
-@@ -161,7 +161,10 @@
- 	"mMergeAllWindows": "Объединить все окна",
- 	"miToggleDevTools": "&&Показать/скрыть средства разработчика",
- 	"miAccessibilityOptions": "Специальные &&возможности",
-+<<<<<<< .our
- 	"miOpenProcessExplorerer": "Открыть &&обозреватель процессов",
-+=======
-+>>>>>>> .their
- 	"miReportIssue": "Сообщить о &&проблеме",
- 	"miWelcome": "&&Приветствие",
- 	"miInteractivePlayground": "&&Интерактивная площадка",
-@@ -189,5 +192,12 @@
- 	"miDownloadingUpdate": "Скачивается обновление...",
- 	"miInstallUpdate": "Установить обновление...",
- 	"miInstallingUpdate": "Идет установка обновления...",
-+<<<<<<< .our
- 	"miRestartToUpdate": "Перезапустить программу для обновления..."
-+=======
-+	"miCheckForUpdates": "Проверить наличие обновлений...",
-+	"aboutDetail": "Версия {0}\nФиксация {1}\nДата {2}\nОболочка {3}\nОтрисовщик {4}\nУзел {5}\nАрхитектура {6}",
-+	"okButton": "ОК",
-+	"copy": "Копировать"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 89660ffbf413b5d4fed70376e978251c2d3e56da i18n/rus/src/vs/code/node/cliProcessMain.i18n.json
-  our    100644 4424d0ecbc0cd55f26c0d4aea0ed6b41c2c4a294 i18n/rus/src/vs/code/node/cliProcessMain.i18n.json
-  their  100644 15ebcfee358f79d4f36104bbde2c3c5a22fa7419 i18n/rus/src/vs/code/node/cliProcessMain.i18n.json
-changed in both
-  base   100644 83b7b87dd66512a60649ed1beda9dbb901148a98 i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 66cf48db0f575d6b4f93e4e908a24029fed35a72 i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 f265f8d9eaa5d4bc740910d00a86729ad5704674 i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -16,7 +16,11 @@
- 	"lineNumbers.on": "Отображаются абсолютные номера строк.",
- 	"lineNumbers.relative": "Отображаемые номера строк вычисляются как расстояние в строках до положения курсора.",
- 	"lineNumbers.interval": "Номера строк отображаются каждые 10 строк.",
-+<<<<<<< .our
- 	"lineNumbers": "Управляет отображением номеров строк.",
-+=======
-+	"lineNumbers": "Управляет отображением номеров строк. Возможные значения: \"on\", \"off\" и \"relative\".",
-+>>>>>>> .their
- 	"rulers": "Отображать вертикальные линейки после определенного числа моноширинных символов. Для отображения нескольких линеек укажите несколько значений. Если не указано ни одного значения, вертикальные линейки отображаться не будут.",
- 	"wordSeparators": "Символы, которые будут использоваться как разделители слов при выполнении навигации или других операций, связанных со словами.",
- 	"tabSize": "Число пробелов в табуляции. Этот параметр переопределяется на основе содержимого файла, если установлен параметр \"editor.detectIndentation\".",
-changed in both
-  base   100644 5fe065ae0dc4f614be70e6429f38014af80762da i18n/rus/src/vs/editor/contrib/folding/folding.i18n.json
-  our    100644 b3b82ea4669bbd9eee2e4733500249059665f28f i18n/rus/src/vs/editor/contrib/folding/folding.i18n.json
-  their  100644 affa88cd5b820999358999a54ef2aee1d6cafc10 i18n/rus/src/vs/editor/contrib/folding/folding.i18n.json
-changed in both
-  base   100644 eb6770aa30bf8b69247d77c5e6d898cb0d84ade2 i18n/rus/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 60e5e887ae41d0c2770bdb1306a52fd5bbf7375a i18n/rus/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 7314aa060875ee62bb108f63f9fce24622982510 i18n/rus/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,8 +10,21 @@
- 	"diff": "Сравнение двух файлов друг с другом",
- 	"add": "Добавление папок в последнее активное окно.",
- 	"goto": "Открытие файла по указанному пути с выделением указанного символа в указанной строке.",
-+<<<<<<< .our
- 	"newWindow": "Принудительно открыть новое окно.",
- 	"reuseWindow": "Принудительно открыть файл или папку в последнем активном окне.",
-+=======
-+	"locale": "Языковой стандарт, который следует использовать (например, en-US или zh-TW).",
-+	"newWindow": "Принудительно запустить новый экземпляр Code.",
-+	"performance": "Запустите с включенной командой \"Developer: Startup Performance\".",
-+	"prof-startup": "Запустить профилировщик ЦП при запуске",
-+	"inspect-extensions": "Разрешить отладку и профилирование расширений. Проверьте URI подключения для инструментов разработчика.",
-+	"inspect-brk-extensions": "Разрешить отладку и профилирование расширений, когда узел расширения приостановлен после запуска. Проверьте URI подключения для инструментов разработчика. ",
-+	"reuseWindow": "Принудительно открыть файл или папку в последнем активном окне.",
-+	"userDataDir": "Указывает каталог, в котором хранятся данные пользователей, используется в случае выполнения от имени привилегированного пользователя.",
-+	"log": "Используемый уровень ведения журнала. Значение по умолчанию — \"info\". Допустимые значения: \"critical\", \"error\", \"warn\", \"info\", \"debug\", \"trace\", \"off\".",
-+	"verbose": "Печать подробного вывода (подразумевает использование параметра \"--wait\").",
-+>>>>>>> .their
- 	"wait": "Дождаться закрытия файлов перед возвратом.",
- 	"locale": "Языковой стандарт, который следует использовать (например, en-US или zh-TW).",
- 	"userDataDir": "Указывает каталог, в котором хранятся данные пользователей. Может использоваться для открытия нескольких отдельных экземпляров Code.",
-@@ -32,8 +45,14 @@
- 	"inspect-extensions": "Разрешить отладку и профилирование расширений. Проверьте URI подключения для инструментов разработчика.",
- 	"inspect-brk-extensions": "Разрешить отладку и профилирование расширений, когда узел расширения приостановлен после запуска. Проверьте URI подключения для инструментов разработчика. ",
- 	"disableGPU": "Отключить аппаратное ускорение GPU.",
-+<<<<<<< .our
- 	"uploadLogs": "Отправляет журналы из текущего сеанса в защищенную конечную точку.",
- 	"maxMemory": "Максимальный размер памяти для окна (в МБ).",
-+=======
-+	"status": "Выводить сведения об использовании процесса и диагностическую информацию.",
-+	"version": "Печать версии.",
-+	"help": "Распечатать данные об использовании.",
-+>>>>>>> .their
- 	"usage": "Использование",
- 	"options": "параметры",
- 	"paths": "пути",
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json
-  our    100644 2f7bf232b6683a705780a0198eb56fe354a7188a i18n/rus/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json
-  their  100644 c704c03956df3ddf9234e3b74e9e660cf557ba69 i18n/rus/src/vs/platform/extensionManagement/node/extensionGalleryService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"notCompatibleDownload": "Не удается выполнить скачивание, так как не найдено расширение, совместимое с текущей версией VS Code '{0}'. "
- }
-\ No newline at end of file
-changed in both
-  base   100644 44292b6a1deda2448909583fc878b92dc7722d79 i18n/rus/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 b5b010a1ed08e7bd0639632258a4ace9da636f30 i18n/rus/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 c25a9a85ff7ba00ef21a13c790094ead598b3c21 i18n/rus/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -7,6 +7,7 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"invalidManifest": "Недопустимое расширение: package.json не является файлом JSON.",
-+<<<<<<< .our
- 	"incompatible": "Не удалось установить расширение '{0}', так как оно не совместимо с Code '{1}'.",
- 	"restartCode": "Перезапустите код перед переустановкой {0}.",
- 	"installingOutdatedExtension": "Уже установлена более новая версия этого расширения. Вы хотите переопределить ее более старой версией?",
-@@ -22,6 +23,16 @@
- 	"quitCode": "Невозможно установить расширение. Пожалуйста, выйдите и зайдите в VS Code перед переустановкой.",
- 	"exitCode": "Невозможно установить расширение. Пожалуйста, выйдите и зайдите в VS Code перед переустановкой.",
- 	"renameError": "Неизвестная ошибка при переименовании {0} в {1}",
-+=======
-+	"restartCodeLocal": "Перезапустите код перед переустановкой {0}.",
-+	"installingOutdatedExtension": "Уже установлена более новая версия этого расширения. Вы хотите переопределить ее более старой версией?",
-+	"override": "Переопределить",
-+	"cancel": "Отмена",
-+	"notFoundCompatible": "Не удается выполнить установку, так как не найдено расширение '{0}', совместимое с текущей версией VS Code '{1}'.",
-+	"quitCode": "Не удается выполнить установку, так как устаревший экземпляр расширения еще запущен. Закройте и снова откройте VS Code, затем запустите установку повторно.",
-+	"exitCode": "Не удается выполнить установку, так как устаревший экземпляр расширения еще запущен. Закройте и снова откройте VS Code, затем запустите установку повторно. ",
-+	"notFoundCompatibleDependency": "Не удается выполнить установку, так как не найдено зависимое расширение '{0}', совместимое с текущей версией VS Code '{1}'. ",
-+>>>>>>> .their
- 	"uninstallDependeciesConfirmation": "Вы хотите удалить \"{0}\" отдельно или вместе с зависимостями?",
- 	"uninstallOnly": "Только расширение",
- 	"uninstallAll": "Удалить все",
-changed in both
-  base   100644 c5f432f019cf1a497b200e1a9b835a3c1df6418c i18n/rus/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
-  our    100644 8d9d6a48ce34a974c867208292d4d791a55b7fee i18n/rus/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
-  their  100644 b6fede714dca9c29c8d728c33696105a852532f6 i18n/rus/src/vs/platform/extensions/common/extensionsRegistry.i18n.json
-changed in both
-  base   100644 305c47b7195c39b528ea97db50df73f5f75a99a9 i18n/rus/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json
-  our    100644 b0719d0207ec40087f923dae6ba2de66c0c9d0c9 i18n/rus/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json
-  their  100644 d46e47e45914365ae7b301e00751563f3d48603e i18n/rus/src/vs/workbench/browser/actions/toggleTabsVisibility.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"toggleTabs": "Изменить видимость вкладки",
- 	"view": "Просмотр"
- }
-\ No newline at end of file
-changed in both
-  base   100644 60289bc43b878a8c922b384e3a542192297b4e4f i18n/rus/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
-  our    100644 0eca2304bb58f67d9dbc6465921f1a346ea46524 i18n/rus/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
-  their  100644 1556822923d6b88fadea06c0fdc2befb2513f134 i18n/rus/src/vs/workbench/browser/parts/compositebar/compositeBarActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"largeNumberBadge": "10000 и выше",
- 	"badgeTitle": "{0} - {1}",
- 	"additionalViews": "Дополнительные представления",
-changed in both
-  base   100644 769c14c870b07e1a5e32360586b080a933e41100 i18n/rus/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  our    100644 dc07ab24638605893378a2dd26ba1cc911f57626 i18n/rus/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-  their  100644 32e566863c80db35e9dd9f27cdaad3f1be966e9e i18n/rus/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json
-@@ -8,5 +8,11 @@
- 	],
- 	"editorCommand.activeEditorMove.description": "Перемещение активного редактора по вкладкам или группам",
- 	"editorCommand.activeEditorMove.arg.name": "Аргумент перемещения активного редактора",
-+<<<<<<< .our
- 	"editorCommand.activeEditorMove.arg.description": "Свойства аргумента:\n\t* 'to': строковое значение, указывающее направление перемещения.\n\t* 'by': строковое значение, указывающее единицу перемещения (вкладка или группа).\n\t* 'value': числовое значение, указывающее количество позиций перемещения или абсолютную позицию для перемещения."
-+=======
-+	"editorCommand.activeEditorMove.arg.description": "Свойства аргумента:\n\t* 'to': строковое значение, указывающее направление перемещения.\n\t* 'by': строковое значение, указывающее единицу перемещения (вкладка или группа).\n\t* 'value': числовое значение, указывающее количество позиций перемещения или абсолютную позицию для перемещения.",
-+	"commandDeprecated": "Команда **{0}** удалена. Вместо нее можно использовать **{1}**",
-+	"openKeybindings": "Настройка сочетаний клавиш"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 b72594a677cd7e8eb1781703e48769ee2d077e1d i18n/rus/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-  our    100644 27ce51b004b167f93d4d65682e4145526dd9ae1d i18n/rus/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-  their  100644 eabbcf197e745c551614d0fce74b882926bce8b4 i18n/rus/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-changed in both
-  base   100644 0af36ba16b24366cf69c4556c1e36cdb885944c1 i18n/rus/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 266dadc0ddcb2cfb8391eafba4890dbacea4172b i18n/rus/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 2380d05741c3cbea0514da1f0c5d12343fef18b3 i18n/rus/src/vs/workbench/electron-browser/actions.i18n.json
-@@ -50,6 +50,30 @@
- 	"moveWindowTabToNewWindow": "Переместить вкладку окна в новое окно",
- 	"mergeAllWindowTabs": "Объединить все окна",
- 	"toggleWindowTabsBar": "Переключить панель вкладок окна",
-+<<<<<<< .our
- 	"about": "О программе {0}",
- 	"inspect context keys": "Проверить ключи контекста"
-+=======
-+	"configureLocale": "Настроить язык",
-+	"displayLanguage": "Определяет язык интерфейса VSCode.",
-+	"doc": "Список поддерживаемых языков см. в {0}.",
-+	"restart": "Для изменения значения требуется перезапуск VSCode.",
-+	"fail.createSettings": "Невозможно создать \"{0}\" ({1}).",
-+	"openLogsFolder": "Открыть папку журналов",
-+	"showLogs": "Показать журналы...",
-+	"mainProcess": "Главный",
-+	"sharedProcess": "Общий",
-+	"rendererProcess": "Отрисовщик",
-+	"extensionHost": "Узел расширения",
-+	"selectProcess": "Выберите процесс",
-+	"setLogLevel": "Установите уровень ведения журнала",
-+	"trace": "Трассировка",
-+	"debug": "Отладка",
-+	"info": "Сведения",
-+	"warn": "Предупреждение",
-+	"err": "Ошибка",
-+	"critical": "Критический",
-+	"off": "Отключено",
-+	"selectLogLevel": "Установите уровень ведения журнала"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 fc3f719ff2829799116709af50ea2f1902c9a96b i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 bdb5e10a72aa6a97a13c01acd6d5626456147e68 i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 f0c8c83bedf56fbc46c5e5c030f7b5d2806199a7 i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,8 +35,14 @@
- 	"panelDefaultLocation": "Определяет расположение панели по умолчанию. Она может находиться снизу или справа от рабочего места.",
- 	"statusBarVisibility": "Управляет видимостью строки состояния в нижней части рабочего места.",
- 	"activityBarVisibility": "Управляет видимостью панели действий на рабочем месте.",
-+<<<<<<< .our
- 	"viewVisibility": "Управляет видимостью действий в заголовке представления. Действия в заголовке представления могут быть видимы всегда или видимы только тогда, когда представление получает фокус или на него наводится курсор мыши.",
- 	"fontAliasing": "Управляет методом сглаживания шрифтов в рабочей области.\n- default: субпиксельное сглаживание шрифтов; позволит добиться максимальной четкости текста на большинстве дисплеев за исключением Retina\n- antialiased: сглаживание шрифтов на уровне пикселей, в отличие от субпиксельного сглаживания; позволит сделать шрифт более светлым в целом\n- none: сглаживание шрифтов отключено; текст будет отображаться с неровными острыми краями\n- auto: автоматически применяется режим \"default\" или \"antialiased\" в зависимости от разрешения дисплея (количество точек на дюйм).",
-+=======
-+	"closeOnFileDelete": "Определяет, следует ли автоматически закрывать редакторы, когда отображаемый в них файл удален или переименован другим процессом. При отключении этой функции редактор остается открытым в качестве черновика. Обратите внимание, что при удалении из приложения редактор закрывается всегда и что файлы черновиков никогда не закрываются для сохранения данных.",
-+	"enableNaturalLanguageSettingsSearch": "Определяет, следует ли включить режим поиска естественного языка для параметров.",
-+	"fontAliasing": "Управляет методом сглаживания шрифтов в рабочей области.-по умолчанию: субпиксельное сглаживание шрифтов; позволит добиться максимальной четкости текста на большинстве дисплеев за исключением Retina - сглаживание: сглаживание шрифтов на уровне пикселей, в отличие от субпиксельного сглаживания; позволит сделать шрифт более светлым в целом - нет: сглаживание шрифтов отключено; текст будет отображаться с неровными острыми краями ",
-+>>>>>>> .their
- 	"workbench.fontAliasing.default": "Субпиксельное сглаживание шрифтов; позволит добиться максимальной четкости текста на большинстве дисплеев за исключением Retina.",
- 	"workbench.fontAliasing.antialiased": "Сглаживание шрифтов на уровне пикселей, в отличие от субпиксельного сглаживания. Может сделать шрифт светлее в целом.",
- 	"workbench.fontAliasing.none": "Отключает сглаживание шрифтов; текст будет отображаться с неровными острыми краями.",
-changed in both
-  base   100644 dcf24056a01703ec8e85f7a6c0456f229c8162c1 i18n/rus/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  our    100644 c40c0450d63a0a1ac9b7545e7ca88c35a304bd16 i18n/rus/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  their  100644 67f670f43d4212a04d650b43f48db2259a7e893d i18n/rus/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-@@ -21,12 +21,20 @@
- 	"allowBreakpointsEverywhere": "Разрешает задание точки останова в любом файле",
- 	"openExplorerOnEnd": "Автоматически открывать представление обозревателя в конце сеанса отладки",
- 	"inlineValues": "Показывать значения переменных в редакторе во время отладки",
-+<<<<<<< .our
- 	"toolBarLocation": "Управляет расположением панели инструментов отладки. Допустимые значения: \"floating\" (может находиться во всех представлениях), \"docked\" (закреплена в представлении отладки) или \"hidden\" (скрыта).",
-+=======
-+	"hideActionBar": "Определяет, следует ли скрыть всплывающую панель действий отладки.",
-+>>>>>>> .their
- 	"never": "Никогда не отображать отладку в строке состояния",
- 	"always": "Всегда отображать отладку в строке состояния",
- 	"onFirstSessionStart": "Отображать отладку в строке состояния только после первого запуска отладки",
- 	"showInStatusBar": "Определяет видимость для строки состояния отладки",
-+<<<<<<< .our
- 	"openDebug": "Определяет, следует ли открыть представление отладки в начале сеанса отладки.",
- 	"enableAllHovers": "Управляет тем, должны ли отображаться всплывающие сообщения, не связанные с отладкой, во время отладки. Если этот параметр имеет значение true, будут вызваны поставщики всплывающих сообщений, и сообщения будут отображены. Обычные всплывающие сообщения не будут отображаться, даже если этот параметр имеет значение true.",
-+=======
-+	"openDebug": "Определяет, следует ли открыть окно просмотра отладки в начале сеанса отладки.",
-+>>>>>>> .their
- 	"launch": "Глобальная конфигурация запуска отладки. Должна использоваться в качестве альтернативы для конфигурации \"launch.json\", которая является общей для рабочих пространств"
- }
-\ No newline at end of file
-changed in both
-  base   100644 1f995f9f60b23fb0d9fe2c80a8a9a40082bf6292 i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 23eb63e486d254cf5d707329f4a13e4ae0e33119 i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 4fb2a6b668138f0b34635ae267f0b3aa4bbad397 i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -13,9 +13,12 @@
- 	"breakpointAdded": "Добавлена точка останова: строка {0}, файл {1}",
- 	"breakpointRemoved": "Удалена точка останова: строка {0}, файл {1}",
- 	"compoundMustHaveConfigurations": "Для составного элемента должен быть задан атрибут configurations для запуска нескольких конфигураций.",
-+<<<<<<< .our
- 	"noConfigurationNameInWorkspace": "Не удалось найти конфигурацию запуска \"{0}\" в рабочей области.",
- 	"multipleConfigurationNamesInWorkspace": "В рабочей области есть несколько конфигураций запуска \"{0}\". Используйте имя папки для определения конфигурации.",
- 	"noFolderWithName": "Не удается найти папку с именем '{0}' для конфигурации '{1}' в составном объекте '{2}'.",
-+=======
-+>>>>>>> .their
- 	"configMissing": "Конфигурация \"{0}\" отсутствует в launch.json.",
- 	"launchJsonDoesNotExist": "Файл \"launch.json\" не существует.",
- 	"debugRequestNotSupported": "Атрибут '{0}' имеет неподдерживаемое значение '{1}' в выбранной конфигурации отладки.",
-changed in both
-  base   100644 00a5bd00b41d261fe19a731e00d1cce1f98dd741 i18n/rus/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-  our    100644 80214fe333933c85dc938913564565da17a68e22 i18n/rus/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-  their  100644 3bc095205a3f30252d19d5f470f0d7512de8e156 i18n/rus/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-@@ -9,7 +9,10 @@
- 	"name": "Имя расширения",
- 	"extension id": "Идентификатор расширений",
- 	"preview": "Предварительный просмотр",
-+<<<<<<< .our
- 	"builtin": "Встроенное",
-+=======
-+>>>>>>> .their
- 	"publisher": "Имя издателя",
- 	"install count": "Число установок",
- 	"rating": "Оценка",
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
-  our    100644 5b792d74f3b7b6d5e67e96424f4884d557de597d i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
-  their  100644 f52c6f67cb9329e9b16e63b16222c90fdd09aa5a i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"ratedByUsers": "Оценено пользователями: {0} ",
- 	"ratedBySingleUser": "Оценено 1 пользователем"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-  our    100644 6ecb81772e05a05bff03b480ac42e42e039e3863 i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-  their  100644 4de94d4af23c8fe74efb465e5807e3c467addbcb i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,5 +11,13 @@
- 	"restart2": "Для профилирования расширений требуется перезапуск. Вы действительно хотите перезапустить \"{0}\" сейчас?",
- 	"restart3": "Перезапустить",
- 	"cancel": "Отмена",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"selectAndStartDebug": "Щелкните здесь, чтобы остановить профилирование."
- }
-\ No newline at end of file
-changed in both
-  base   100644 ecf997900518cd5e3d2290da6b9faa328ef91900 i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
-  our    100644 1afe3284b6e44607d32cf13ce7f6321b703358ad i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
-  their  100644 31eb35b5dce0deba9c6653e1fbe7deac3cfedda9 i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
-@@ -15,6 +15,10 @@
- 	"developer": "Разработчик",
- 	"extensionsConfigurationTitle": "Расширения",
- 	"extensionsAutoUpdate": "Автоматически обновлять расширения",
-+<<<<<<< .our
- 	"extensionsIgnoreRecommendations": "Если этот параметр установлен в значение true, оповещения о рекомендациях по расширениям перестанут отображаться.",
- 	"extensionsShowRecommendationsOnlyOnDemand": "Если этот параметр установлен в true, рекомендации не будут извлекаться или отображаться до тех пор, пока пользователь не откроет их явно."
-+=======
-+	"extensionsIgnoreRecommendations": "Если этот параметр установлен в значение true, оповещения о рекомендациях по расширениям перестанут отображаться."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d813ae7a27e24bd196ec3464c05b9795edc43552 i18n/rus/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
-  our    100644 acd05048f3a9f1eb195ced4ce6a772244be245e0 i18n/rus/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
-  their  100644 ef7b1463fd4ce712df0269836ccd6fc9ed0daf64 i18n/rus/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"starActivation": "Активируется при запуске",
- 	"workspaceContainsGlobActivation": "Активируется, так как соответствующий файл {0} отсутствует в вашей рабочей области",
- 	"workspaceContainsFileActivation": "Активируется, так как файл {0} отсутствует в вашей рабочей области",
-changed in both
-  base   100644 c601c781bde1078b55688c4d667451cfb163309a i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 2c38d1331217bb70a1fc665d1c79c9658eacde43 i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 8e87ab6930ac96fbe342955841c0a060b532186e i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -53,6 +53,11 @@
- 	"openFileToCompare": "Чтобы сравнить файл с другим файлом, сначала откройте его.",
- 	"refresh": "Обновить",
- 	"saveAllInGroup": "Сохранить все в группе",
-+<<<<<<< .our
-+=======
-+	"saveFiles": "Сохранить все файлы",
-+	"revert": "Отменить изменения в файле",
-+>>>>>>> .their
- 	"focusOpenEditors": "Фокус на представлении открытых редакторов",
- 	"focusFilesExplorer": "Фокус на проводнике",
- 	"showInExplorer": "Показать активный файл в боковой панели",
-@@ -67,6 +72,11 @@
- 	"fileNameExistsError": "Файл или папка **{0}** уже существует в данном расположении. Выберите другое имя.",
- 	"invalidFileNameError": "Имя **{0}** недопустимо для файла или папки. Выберите другое имя.",
- 	"filePathTooLongError": "Из-за использования имени **{0}** путь слишком длинный. Выберите более короткое имя.",
-+<<<<<<< .our
-+=======
-+	"compareWithSaved": "Сравнить активный файл с сохраненным",
-+	"modifiedLabel": "{0} (на диске) ↔ {1}",
-+>>>>>>> .their
- 	"compareWithClipboard": "Сравнить активный файл с буфером обмена",
- 	"clipboardComparisonLabel": "Буфер обмена ↔ {0}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 5c9b67b2669049542d1aa1c6783b53dc4b25940a i18n/rus/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json
-  our    100644 e7c88b4ecc32dfcc4ff7fa6384032a23f79af054 i18n/rus/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json
-  their  100644 82dd74c7e2dce638687deb8d45a81b99980de36d i18n/rus/src/vs/workbench/parts/files/electron-browser/views/emptyView.i18n.json
-changed in both
-  base   100644 620852a6f1800d71bf12f2d8871e25ee739624cd i18n/rus/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  our    100644 b30660862fb648d55c4895c7ccb26b222d765662 i18n/rus/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  their  100644 1aa57ff69b5a60df5d206eafa66fd805bf4935a6 i18n/rus/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json
-  our    100644 9f1e9238a730f2c64968666c1b02e8b4d9181c04 i18n/rus/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json
-  their  100644 55325cd6d49085f75a9de01ca9baadef4c75cd70 i18n/rus/src/vs/workbench/parts/markers/browser/markersPanel.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"totalProblems": "Всего проблем: {0}",
- 	"filteredProblems": "Показано проблем: {0} из {1}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 2729294f21e4b13d3fd9b702cdda6ecd95dd2f17 i18n/rus/src/vs/workbench/parts/markers/common/messages.i18n.json
-  our    100644 a1ef2cd59b1cfdd0fef3ef7c2f1f17680b2a643a i18n/rus/src/vs/workbench/parts/markers/common/messages.i18n.json
-  their  100644 4a0ebeccf873e1e0f47f5c6df66188e36b38f2ff i18n/rus/src/vs/workbench/parts/markers/common/messages.i18n.json
-@@ -7,8 +7,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"viewCategory": "Просмотреть",
-+<<<<<<< .our
- 	"problems.view.toggle.label": "Включить или отключить сообщения о проблемах (ошибки, предупреждения, информационные сообщения)",
- 	"problems.view.focus.label": "Перевести фокус на сообщения о проблемах (ошибки, предупреждения, информационные сообщения) ",
-+=======
-+	"problems.view.toggle.label": "Показать/скрыть проблемы",
-+	"problems.view.focus.label": "Проблемы с фокусом",
-+>>>>>>> .their
- 	"problems.panel.configuration.title": "Представление \"Проблемы\"",
- 	"problems.panel.configuration.autoreveal": "Определяет, следует ли представлению \"Проблемы\" отображать файлы при их открытии",
- 	"markers.panel.title.problems": "Проблемы",
-changed in both
-  base   100644 209030a10b23a008da5868041bafd35b987edda1 i18n/rus/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
-  our    100644 4fa277f04cca2179e4672537febfba324f6de7d8 i18n/rus/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
-  their  100644 56bc0ec3ec316f0bb2be472481e7202726d350aa i18n/rus/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,8 @@
- 	],
- 	"defineKeybinding.oneExists": "Это сочетание клавиш назначено одной имеющейся команде",
- 	"defineKeybinding.existing": "Это сочетание клавиш назначено нескольким имеющимся командам ({0}}",
-+=======
-+>>>>>>> .their
- 	"defineKeybinding.initial": "Нажмите нужное сочетание клавиш, а затем клавишу ВВОД.",
- 	"defineKeybinding.chordsTo": "Аккорд для"
- }
-\ No newline at end of file
-changed in both
-  base   100644 db8d5850260fd5a8636059d491ec5defc3003000 i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  our    100644 73f5287abade720146d5385f06b5e028d614a772 i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  their  100644 3853973af143493481f79e239859835578c13706 i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -9,6 +10,9 @@
- 	"openRawDefaultSettings": "Открыть исходные параметры по умолчанию",
- 	"openSettings2": "Открыть параметры (предварительная версия)",
- 	"openSettings": "Открыть параметры",
-+=======
-+	"openRawDefaultSettings": "Открыть исходные параметры по умолчанию",
-+>>>>>>> .their
- 	"openGlobalSettings": "Открыть пользовательские параметры",
- 	"openGlobalKeybindings": "Открыть сочетания клавиш",
- 	"openGlobalKeybindingsFile": "Открыть файл сочетаний клавиш",
-changed in both
-  base   100644 ef7dc4d878361373a3c46be3c9a3626e06ffb28f i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 2639f8a70dc171eed499a24e68b57de977a1debe i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 cdba5fc34b20d61e1b453013d04522dcb8083ed2 i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,10 +7,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"defaultSettingsFuzzyPrompt": "Попробуйте режим поиска естественного языка!",
-+>>>>>>> .their
- 	"defaultSettings": "Чтобы переопределить параметры по умолчанию, укажите свои параметры в области справа.",
- 	"noSettingsFound": "Параметры не найдены.",
- 	"settingsSwitcherBarAriaLabel": "Переключатель параметров",
- 	"userSettings": "Параметры пользователя",
- 	"workspaceSettings": "Параметры рабочей области",
-+<<<<<<< .our
- 	"folderSettings": "Параметры папок"
-+=======
-+	"folderSettings": "Параметры папок",
-+	"enableFuzzySearch": "Включить режим поиска естественного языка"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 cd29f7f88b8cf943dea4e9e76f6d1e390b5b227d i18n/rus/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json
-  our    100644 0e3c7ad7cb5b38aae6ecf79a58c0a3350395ddcd i18n/rus/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json
-  their  100644 a1365d40ac3ae4b2e2edec8c56f1222a21ff9413 i18n/rus/src/vs/workbench/parts/search/browser/patternInputWidget.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"defaultLabel": "ввод",
- 	"useExcludesAndIgnoreFilesDescription": "Использовать параметры исключения и игнорировать файлы"
- }
-\ No newline at end of file
-changed in both
-  base   100644 2cba25f0f5ec04484188f46bc6bdd410cf3055a5 i18n/rus/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 3ad2e6ca5f31ca94a9cdd8a18a046b2a9773636b i18n/rus/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 11d41b01847d0f59c6a8b7dcc9d5b4833d50236d i18n/rus/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -13,7 +13,11 @@
- 	"totalInfos": "Сообщения: {0}",
- 	"problems": "Проблемы",
- 	"building": "Сборка...",
-+<<<<<<< .our
- 	"manyProblems": "Более 10 тысяч",
-+=======
-+	"manyMarkers": "99+",
-+>>>>>>> .their
- 	"runningTasks": "Показать выполняемые задачи",
- 	"tasks": "Задачи",
- 	"TaskSystem.noHotSwap": "Чтобы изменить подсистему выполнения задач, в которой запущена активная задача, необходимо перезагрузить окно",
-changed in both
-  base   100644 05102c96f17d8eeb0bf919372adb18e3fb2a99f3 i18n/rus/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
-  our    100644 85438793d7fbbc55accd0dfd6b6dfc2da7a7b3f9 i18n/rus/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
-  their  100644 2249170ee872b06f4804ef21a97f69819e5a4bf6 i18n/rus/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
-changed in both
-  base   100644 1b0a682834e66a32caba914e069ed5c0b142daad i18n/rus/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  our    100644 b7b348484d2ec81180585cec523e688a69bfd6fc i18n/rus/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  their  100644 5f308b15ff2fbd4755b9e04b08661f1afa6c316e i18n/rus/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-@@ -18,6 +18,10 @@
- 	"ConfigurationParser.missingRequiredProperty": "Ошибка: в конфигурации задачи '{0}' отсутствует необходимое свойство '{1}'. Конфигурация задачи будет проигнорирована.",
- 	"ConfigurationParser.notCustom": "Ошибка: задачи не объявлены в качестве пользовательской задачи. Конфигурация будет проигнорирована.\n{0}\n",
- 	"ConfigurationParser.noTaskName": "Ошибка: в задаче должно быть указано свойство метки. Задача будет проигнорирована.\n{0}\n",
-+<<<<<<< .our
-+=======
-+	"taskConfiguration.shellArgs": "Предупреждение: задача \"{0}\" является командой оболочки, и один из ее аргументов содержит пробелы без escape-последовательности. Чтобы обеспечить правильную расстановку кавычек в командной строке, объедините аргументы в команде.",
-+>>>>>>> .their
- 	"taskConfiguration.noCommandOrDependsOn": "Ошибка: в задаче \"{0}\" не указаны ни команда, ни свойство dependsOn. Задача будет проигнорирована. Определение задачи:\n{1}",
- 	"taskConfiguration.noCommand": "Ошибка: задача \"{0}\" не определяет команду. Задача будет игнорироваться. Ее определение:\n{1}",
- 	"TaskParse.noOsSpecificGlobalTasks": "Версия задач 2.0.0 не поддерживает глобальные задачи для конкретных ОС. Преобразуйте их в задачи с помощью команд для конкретных ОС.\nЗатронутые задачи: {0}"
-changed in both
-  base   100644 b8da8b233eb48d631f7158e1b6412f3a87633b02 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 e05b07ca1e0540b56ed4788f50fea5db9d3c3f96 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 045380be6068784921d91a4443af28419f9375c3 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -19,10 +19,15 @@
- 	"terminal.integrated.copyOnSelection": "Если задано, текст выделенный в терминале будет скопирован в буфер обмена",
- 	"terminal.integrated.fontFamily": "Определяет семейство шрифтов терминала, значение по умолчанию — editor.fontFamily.",
- 	"terminal.integrated.fontSize": "Определяет размер шрифта (в пикселях) для терминала.",
-+<<<<<<< .our
- 	"terminal.integrated.letterSpacing": "Управляет межсимвольным интервалом в терминале. Это целочисленное значение, которое представляет собой количество дополнительных пикселей между символами.",
- 	"terminal.integrated.lineHeight": "Определяет высоту строки терминала; это число умножается на размер шрифта терминала, что дает фактическую высоту строки в пикселях.",
- 	"terminal.integrated.fontWeight": "Размер шрифта в терминале для нежирного текста.",
- 	"terminal.integrated.fontWeightBold": "Размер шрифта в терминале для полужирного текста. ",
-+=======
-+	"terminal.integrated.lineHeight": "Определяет высоту строки терминала; это число умножается на размер шрифта терминала, что дает фактическую высоту строки в пикселях.",
-+	"terminal.integrated.enableBold": "Следует ли разрешить полужирный текст в терминале. Эта функция должна поддерживаться оболочкой терминала.",
-+>>>>>>> .their
- 	"terminal.integrated.cursorBlinking": "Управляет миганием курсора терминала.",
- 	"terminal.integrated.cursorStyle": "Определяет стиль курсора терминала.",
- 	"terminal.integrated.scrollback": "Определяет предельное число строк в буфере терминала.",
-changed in both
-  base   100644 1296713c7243b74c47a0aa50a8455d8af188e54a i18n/rus/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
-  our    100644 d000914c9552303fbad6984b724bb4eeea317681 i18n/rus/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
-  their  100644 116db87d73e73984c4752c7140ba1c2b2a52b575 i18n/rus/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
-  our    100644 35596266216cba8e608d5233580b3d82e8caf9ce i18n/rus/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
-  their  100644 dc2cdb3183b62ec4fdca9b68b38994d00f7ccf3c i18n/rus/src/vs/workbench/services/decorations/browser/decorationsService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"bubbleTitle": "Содержит выделенные элементы"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
-  our    100644 c1172f5619342d81ac35ea042f0290ff2f56cae8 i18n/rus/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
-  their  100644 928a4957cabd700aa0dd111b815fb4359fb78290 i18n/rus/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"message": "$(zap) Профилирование узла расширений..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 592a962b0992f6bbd1a0de53f505e9911682278f i18n/rus/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-  our    100644 563d0e6d58b2163e3bb2e6d25a6030bab10243c4 i18n/rus/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-  their  100644 eda56c60fde9e514b5f68f0b0c7a8810b69f432f i18n/rus/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
-@@ -13,6 +13,10 @@
- 	"restart": "Перезапустить хост-процесс для расширений",
- 	"overwritingExtension": "Идет перезапись расширения {0} на {1}.",
- 	"extensionUnderDevelopment": "Идет загрузка расширения разработки в {0}.",
-+<<<<<<< .our
- 	"extensionCache.invalid": "Расширения были изменены на диске. Обновите окно.",
- 	"reloadWindow": "Перезагрузить окно"
-+=======
-+	"extensionCache.invalid": "Расширения были изменены на диске. Обновите окно."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 297bca0ac5f1480e7558e80da9e8ad66b60fc505 i18n/rus/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
-  our    100644 920221aaf1f69ae416655531aad73e2ca7766228 i18n/rus/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
-  their  100644 1ea5d9e9c9c80523e72d770cad2d24991a8e39ab i18n/rus/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
-@@ -24,6 +24,10 @@
- 	"keybindings.json.when": "Условие, когда клавиша нажата.",
- 	"keybindings.json.args": "Аргументы, передаваемые в выполняемую команду.",
- 	"keyboardConfigurationTitle": "Клавиатура",
-+<<<<<<< .our
- 	"dispatch": "Управляет логикой диспетчеризации для нажатий клавиш \"code\" (рекомендуется) или \"keyCode\".",
- 	"touchbar.enabled": "Включает кнопки сенсорной панели macOS на клавиатуре, если они доступны."
-+=======
-+	"dispatch": "Управляет логикой диспетчеризации для нажатий клавиш \"code\" (рекомендуется) или \"keyCode\"."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/src/vs/workbench/services/textfile/common/textFileService.i18n.json
-  our    100644 9a0f25eff088f67ed1bc2eaf8c308ea6bddd9cbd i18n/rus/src/vs/workbench/services/textfile/common/textFileService.i18n.json
-  their  100644 07d83c760a514973e530d45b076b2638a0bcf864 i18n/rus/src/vs/workbench/services/textfile/common/textFileService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"files.backup.failSave": "Не удалось записать измененные файлы в расположение резервной копии (ошибка: {0}). Попробуйте сохранить файлы и выйти."
- }
-\ No newline at end of file
-changed in both
-  base   100644 25a60c398285c266eb019dfd8917299185424e42 i18n/trk/extensions/css/client/out/cssMain.i18n.json
-  our    100644 5d438afc47cf5ccc5e79d68af4056c0f7a3126d6 i18n/trk/extensions/css/client/out/cssMain.i18n.json
-  their  100644 efa3cfefe207e51b315a3c2576451e2c7e04a1c9 i18n/trk/extensions/css/client/out/cssMain.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"cssserver.name": "CSS Dil Sunucusu",
- 	"folding.start": "Katlama Bölgesi Başlangıcı",
- 	"folding.end": "Katlama Bölgesi Sonu"
-changed in both
-  base   100644 6ce7f81e59f0240dc7b57535d58052fdcc9ea552 i18n/trk/extensions/emmet/package.i18n.json
-  our    100644 da0ca75d8cf264d2aa273bacfc4c88c0e06fd83f i18n/trk/extensions/emmet/package.i18n.json
-  their  100644 a3ef0340c58afd32804a4516d492181470c641d4 i18n/trk/extensions/emmet/package.i18n.json
-@@ -50,6 +50,7 @@
- 	"emmetShowSuggestionsAsSnippets": "Doğruysa, Emmet önerileri, editor.snippetSuggestions ayarı ile sıralayabilmenizi sağlayan parçacıklar olarak gösterilir.",
- 	"emmetPreferencesBemElementSeparator": "BEM filtresi kullanırken sınıflar için kullanılacak öge ayrıcı",
- 	"emmetPreferencesBemModifierSeparator": "BEM filtresi kullanırken sınıflar için kullanılacak niteleyici ayrıcı",
-+<<<<<<< .our
- 	"emmetPreferencesFilterCommentBefore": "Yorum filtresi uygulandığında eşleşen ögenin önüne konulması gereken yorumun tanımı.",
- 	"emmetPreferencesFilterCommentAfter": "Yorum filtresi uygulandığında eşleşen ögenin ardına konulması gereken yorumun tanımı.",
- 	"emmetPreferencesFilterCommentTrigger": "Yorum filterinin uygulanması için kısaltmada bulunması gereken virgülle ayrılmış öznitelik adları listesi",
-@@ -62,4 +63,12 @@
- 	"emmetPreferencesCssMsProperties": "`-` ile başlayan Emmet kısaltmasında kullanıldığında 'ms' önekini alacak virgülle ayrılmış CSS özellikleri. 'ms' önekinden her zaman kaçınmak için boş bir dize olarak ayarlayın.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "Bulanık eşleştirilmiş kısaltmaların elde etmesi gereken minimum puan (0'dan 1'e kadar). Düşük değerler birçok yanlış pozitif eşleşme oluşturabilir, daha yüksek değerler olası eşleşmeleri azaltabilir.",
- 	"emmetOptimizeStylesheetParsing": "\"false\" değeri atandığında, Emmet kısaltmalarının genişletilmesinde o anki konumun geçerli olup olmadığını belirlemek için tüm dosya ayrıştırılır. \"true\" değeri atandığında, css/scss/less dosyalarında sadece o anki konumun çevresi ayrıştırılır."
-+=======
-+	"emmetPreferencesFilterCommentBefore": "Yorum filtresi uygulandığında eşleşen öğenin önüne yerleştirilmesi gereken yorumun tanımı.",
-+	"emmetPreferencesFilterCommentAfter": "Yorum filtresi uygulandığında eşleşen öğenin ardına yerleştirilmesi gereken yorumun tanımı.",
-+	"emmetPreferencesFilterCommentTrigger": "Yorum filterinin uygulanması için kısaltmada bulunması gereken virgülle ayrılmış öznitelik adları listesi",
-+	"emmetPreferencesFormatNoIndentTags": "İçe girintilenmemesi gereken bir etiket adları dizisi",
-+	"emmetPreferencesFormatForceIndentTags": "Her zaman içe girintilenmesi gereken bir etiket adları dizisi",
-+	"emmetPreferencesAllowCompactBoolean": "Doğruysa, boole niteliklerinin öz gösterimi üretilir"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 768300d269bfba939984cdacbec9f7d510501d7e i18n/trk/extensions/html/client/out/htmlMain.i18n.json
-  our    100644 cd480d421239bcc4d48d883bf1a868a93847a5d8 i18n/trk/extensions/html/client/out/htmlMain.i18n.json
-  their  100644 885fe11772614d215dd93e3317140f8baa9dc921 i18n/trk/extensions/html/client/out/htmlMain.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"htmlserver.name": "HTML Dil Sunucusu",
- 	"folding.start": "Katlama Bölgesi Başlangıcı",
- 	"folding.end": "Katlama Bölgesi Sonu"
-changed in both
-  base   100644 33eec63f82e690fe4ec73c07ff7efde7de2e5c68 i18n/trk/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 80d2362504c2993d022a2eba3b68977e0e73b16b i18n/trk/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 3a5d4006fd7b681fc7de41047ccba5ea23784969 i18n/trk/src/vs/editor/common/config/commonEditorConfig.i18n.json
-changed in both
-  base   100644 7d132e007de0d8ee29c719115a2c70b019b66bad i18n/trk/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 de45d35b28e099e902eb3585dc451750064bb035 i18n/trk/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 a4c4cd296d5db4ce1136a2bc299ac1232dc02f9f i18n/trk/src/vs/platform/environment/node/argv.i18n.json
-@@ -10,8 +10,21 @@
- 	"diff": "İki dosyayı birbiriyle karşılaştır.",
- 	"add": "Son aktif pencereye klasör(ler) ekle.",
- 	"goto": "Konumdaki bir dosyayı belirtilen satır ve sütunda aç.",
-+<<<<<<< .our
- 	"newWindow": "Yeni pencere açmaya zorla.",
- 	"reuseWindow": "Bir dosya veya klasörü son aktif pencerede açmaya zorlayın.",
-+=======
-+	"locale": "Kullanılacak yerel dil (örnek: en-US veya zh-TW).",
-+	"newWindow": "Yeni bir Code örneğini zorla.",
-+	"performance": "'Geliştirici: Başlangıç Performansı' komutu etkinleştirilmiş olarak başlat.",
-+	"prof-startup": "Başlangıç sırasında CPU profil oluşturucusunu çalıştır",
-+	"inspect-extensions": "Eklentilerde hata ayıklama ve ayrımlamaya izin ver. Bağlantı URI'ı için geliştirici araçlarını kontrol edin.",
-+	"inspect-brk-extensions": "Eklentilerde hata ayıklama ve ayrımlamaya eklenti sunucusu başladıktan hemen sonra duraklatılacak şekilde izin ver. Bağlantı URI'ı için geliştirici araçlarını kontrol edin.",
-+	"reuseWindow": "Bir dosya veya klasörü son etkin pencerede açmaya zorlayın.",
-+	"userDataDir": "Kullanıcı verilerinin tutulacağı klasörü belirtir, root olarak çalışırken yararlıdır.",
-+	"log": "Kullanılacak günlüğe yazma düzeyi. Varsayılan değer 'info'dur. İzin verilen değerler 'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off' şeklindedir.",
-+	"verbose": "Ayrıntılı çıktı oluştur (--wait anlamına gelir).",
-+>>>>>>> .their
- 	"wait": "Geri dönmeden önce dosyaların kapanmasını bekle.",
- 	"locale": "Kullanılacak yerel dil (örnek: en-US veya zh-TW).",
- 	"userDataDir": "Kullanıcı verilerinin tutulacağı klasörü belirtir. Code'un farklı örneklerini açmak için kullanılabilir.",
-changed in both
-  base   100644 7c4352f507baf288fa46504a98690ae30edcf1cd i18n/trk/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 44732b7e6176ac8f50fe0253110d6ef6cb302c9c i18n/trk/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 e3e29379b77ea4d15e4b1f5feab2ecd14b223fb8 i18n/trk/src/vs/workbench/electron-browser/actions.i18n.json
-@@ -50,6 +50,30 @@
- 	"moveWindowTabToNewWindow": "Pencere Sekmesini Yeni Pencereye Taşı",
- 	"mergeAllWindowTabs": "Tüm Pencereleri Birleştir",
- 	"toggleWindowTabsBar": "Pencere Sekmeleri Çubuğunu Gizle/Göster",
-+<<<<<<< .our
- 	"about": "{0} Hakkında",
- 	"inspect context keys": "Bağlam Anahtarlarını Denetle"
-+=======
-+	"configureLocale": "Dili Yapılandır",
-+	"displayLanguage": "VSCode'un görüntüleme dilini tanımlar.",
-+	"doc": "Desteklenen dillerin listesi için göz atın: {0}",
-+	"restart": "Değeri değiştirirseniz VSCode'u yeniden başlatmanız gerekir.",
-+	"fail.createSettings": " '{0}' oluşturulamadı ({1}).",
-+	"openLogsFolder": "Günlük Klasörünü Aç",
-+	"showLogs": "Günlükleri Göster...",
-+	"mainProcess": "Ana",
-+	"sharedProcess": "Paylaşılan",
-+	"rendererProcess": "Render Alan",
-+	"extensionHost": "Eklenti Sunucusu",
-+	"selectProcess": "İşlem seçin",
-+	"setLogLevel": "Günlük Düzeyini Ayarla",
-+	"trace": "İzle",
-+	"debug": "Hata Ayıklama",
-+	"info": "Bilgi",
-+	"warn": "Uyarı",
-+	"err": "Hata",
-+	"critical": "Kritik",
-+	"off": "Kapalı",
-+	"selectLogLevel": "Günlük düzeyini seçin"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 957aae1111b38bfc1f4044caef78fc3b98d2647a i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 3b4248d45e7ecb01c6045e1c3d824ba835249478 i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 ecfc10e7ef8898dc22e165a987e599a4f8f3c1b0 i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -13,9 +13,12 @@
- 	"breakpointAdded": "Kesme noktası eklendi, {0}. satır, {1} dosyası",
- 	"breakpointRemoved": "Kesme noktası kaldırıldı, {0}. satır, {1} dosyası",
- 	"compoundMustHaveConfigurations": "Bileşik, birden çok yapılandırmayı başlatmak için \"configurations\" özniteliği bulundurmalıdır.",
-+<<<<<<< .our
- 	"noConfigurationNameInWorkspace": "Çalışma alanında '{0}' başlatma yapılandırması bulunamadı.",
- 	"multipleConfigurationNamesInWorkspace": "Çalışma alanında birden fazla '{0}' başlatma yapılandırması var. Yapılandırmayı belirtmek için klasör adını kullanın.",
- 	"noFolderWithName": "'{2}' bileşiğindeki '{1}' yapılandırması için '{0}' adlı klasör bulunamadı.",
-+=======
-+>>>>>>> .their
- 	"configMissing": "'launch.json' dosyasında '{0}' yapılandırması eksik.",
- 	"launchJsonDoesNotExist": "'launch.json' mevcut değil.",
- 	"debugRequestNotSupported": "Seçilen hata ayıklama yapılandırılmasındaki '{0}' özniteliği desteklenmeyen '{1}' değeri içeriyor.",
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/trk/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
-  our    100644 7922afa176b0df28188a89415977c29d2112fad1 i18n/trk/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
-  their  100644 4ae85e568bf0e0fec79dcebd1a14512502453cdc i18n/trk/src/vs/workbench/parts/extensions/browser/extensionsWidgets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"ratedByUsers": "{0} kullanıcı tarafından derecelendirildi",
- 	"ratedBySingleUser": "1 kullanıcı tarafından derecelendirildi"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-  our    100644 31455f2520d59d46d91c9a904ee230bd79e973bd i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-  their  100644 4de7cbfa69cdc8831daea56173f5ff08f650e6fe i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -10,5 +11,13 @@
- 	"restart2": "Eklentileri ayrımlamak için yeniden başlatma gereklidir. '{0}'u yeniden başlatmak istiyor musunuz?",
- 	"restart3": "Yeniden Başlat",
- 	"cancel": "İptal",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"selectAndStartDebug": "Ayrımlamayı durdurmak için tıklayın."
- }
-\ No newline at end of file
-changed in both
-  base   100644 31d65218f0e63c129344d0731e9ba7ba258d95d9 i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
-  our    100644 85e9f33569f15cf9329656412550f85ea322828b i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
-  their  100644 067c82856673229abdf6d289676341b423168b04 i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
-@@ -15,6 +15,10 @@
- 	"developer": "Geliştirici",
- 	"extensionsConfigurationTitle": "Eklentiler",
- 	"extensionsAutoUpdate": "Eklentileri otomatik olarak güncelle",
-+<<<<<<< .our
- 	"extensionsIgnoreRecommendations": "\"true\" değeri atanırsa, eklenti tavsiyeleri bildirimleri artık gösterilmez.",
- 	"extensionsShowRecommendationsOnlyOnDemand": "\"true\" değeri atanırsa, kullanıcı tarafından özel olarak istenmedikçe tavsiyeler alınmaz ve gösterilmez."
-+=======
-+	"extensionsIgnoreRecommendations": "\"Doğru\" olarak ayarlanırsa, eklenti tavsiyeleri bildirimleri artık gösterilmez."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 cbbd312d9f3431d0f7860fab84d2d7a3ba08c643 i18n/trk/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
-  our    100644 63bc2d3216fabcb29a769870c519b6e0995befff i18n/trk/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
-  their  100644 244821c97619eb8caa4f52b1c4d3904d2ffa50bc i18n/trk/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"starActivation": "Başlangıçta etkinleştirildi",
- 	"workspaceContainsGlobActivation": "Çalışma alanınızda bir {0} dosya eşleşmesi mevcut olduğu için etkinleştirildi",
- 	"workspaceContainsFileActivation": "Çalışma alanınızda {0} dosyası mevcut olduğu için etkinleştirildi",
-changed in both
-  base   100644 146d4e604f99d4b14c2d2021cf9f60eb6804e8d9 package.json
-  our    100644 d0e982ce0b76c5b1b5eb02b673e459e47f3353a4 package.json
-  their  100644 9daecc5a8e56a327ee159065760a2347aa51466f package.json
-@@ -1,7 +1,12 @@
- {
-   "name": "code-oss-dev",
-+<<<<<<< .our
-   "version": "1.27.0",
-   "distro": "a4155d9780fbbc94ead6cb3017dd0fc3806c57b8",
-+=======
-+  "version": "1.19.3",
-+  "distro": "2751aca3e43316e3418502935939817889deb719",
-+>>>>>>> .their
-   "author": {
-     "name": "Microsoft Corporation"
-   },
-@@ -39,11 +44,19 @@
-     "native-is-elevated": "^0.2.1",
-     "native-keymap": "1.2.5",
-     "native-watchdog": "0.3.0",
-+<<<<<<< .our
-     "node-pty": "0.7.6",
-     "semver": "^5.5.0",
-     "spdlog": "0.7.1",
-     "sudo-prompt": "8.2.0",
-     "v8-inspect-profiler": "^0.0.8",
-+=======
-+    "node-pty": "0.7.4",
-+    "nsfw": "1.0.16",
-+    "semver": "4.3.6",
-+    "spdlog": "0.3.7",
-+    "v8-inspect-profiler": "^0.0.7",
-+>>>>>>> .their
-     "vscode-chokidar": "1.6.2",
-     "vscode-debugprotocol": "1.31.0",
-     "vscode-nsfw": "1.0.17",
-changed in both
-  base   100644 5f161533b5bd16a3db8d7678b844742c05ef90ec src/vs/base/node/ps.ts
-  our    100644 fc8c25a115347ff7439f36cde991f728a809fc7b src/vs/base/node/ps.ts
-  their  100644 ba5b81d31902d5f2858652aeabc001bdd80ac931 src/vs/base/node/ps.ts
-@@ -134,6 +134,7 @@
- 				}
- 			};
- 
-+<<<<<<< .our
- 			(import('windows-process-tree')).then(windowsProcessTree => {
- 				windowsProcessTree.getProcessList(rootPid, (processList) => {
- 					windowsProcessTree.getProcessCpuUsage(processList, (completeProcessList) => {
-@@ -149,6 +150,18 @@
- 								mem: process.memory
- 							});
- 						});
-+=======
-+			const execMain = path.basename(process.execPath);
-+			const script = URI.parse(require.toUrl('vs/base/node/ps-win.ps1')).fsPath;
-+			const commandLine = `& {& '${script}' -ProcessName '${execMain}' -MaxSamples 3}`;
-+			const cmd = spawn('powershell.exe', ['-NoProfile', '-ExecutionPolicy', 'Bypass', '-Command', commandLine]);
-+
-+			let stdout = '';
-+			let stderr = '';
-+			cmd.stdout.on('data', data => {
-+				stdout += data.toString();
-+			});
-+>>>>>>> .their
- 
- 						rootItem = processItems.get(rootPid);
- 						if (rootItem) {
-changed in both
-  base   100644 c16afdc079630501dcfb423c06c0ce1f39adc2e2 src/vs/code/electron-main/app.ts
-  our    100644 c0185b039e95315e65379ca7cda7ff397219bdf9 src/vs/code/electron-main/app.ts
-  their  100644 ff1d722007f9b0c378203e070c2cccb782e1c4ad src/vs/code/electron-main/app.ts
-@@ -305,7 +305,12 @@
- 			this.logService.trace(`Resolved machine identifier: ${machineId}`);
- 
- 			// Spawn shared process
-+<<<<<<< .our
- 			this.sharedProcess = new SharedProcess(this.environmentService, this.lifecycleService, this.logService, machineId, this.userEnv);
-+=======
-+			this.sharedProcess = new SharedProcess(this.environmentService, machineId, this.userEnv);
-+			this.toDispose.push(this.sharedProcess);
-+>>>>>>> .their
- 			this.sharedProcessClient = this.sharedProcess.whenReady().then(() => connect(this.environmentService.sharedIPCHandle, 'main'));
- 
- 			// Services
-changed in both
-  base   100644 31125cac1054c5f587a2fffa4dc7b29bd997f570 src/vs/code/electron-main/launch.ts
-  our    100644 a3affdb0597fc84d217c3981070db0ed9a7afe07 src/vs/code/electron-main/launch.ts
-  their  100644 00d555647ea2f6d510ec35f74b1191640648e195 src/vs/code/electron-main/launch.ts
-@@ -146,6 +146,7 @@
- 		const urlsToOpen = parseOpenUrl(args);
- 
- 		// Check early for open-url which is handled in URL service
-+<<<<<<< .our
- 		if (urlsToOpen.length) {
- 			let whenWindowReady = TPromise.as<any>(null);
- 
-@@ -161,6 +162,11 @@
- 					this.urlService.open(url);
- 				}
- 			});
-+=======
-+		const openUrl = (args['open-url'] ? args._urls : []) || [];
-+		if (openUrl.length > 0) {
-+			openUrl.forEach(url => this.urlService.open(url));
-+>>>>>>> .their
- 
- 			return TPromise.as(null);
- 		}
-changed in both
-  base   100644 d9f1c0b0081e25380c86dac3e06fe963e047aea6 src/vs/code/electron-main/main.ts
-  our    100644 dbe95eb11e2541904621bd2a4f74434f9f66801b src/vs/code/electron-main/main.ts
-  their  100644 02e318dda3b8fc29ed9ca28552c35222a834de12 src/vs/code/electron-main/main.ts
-@@ -74,7 +74,11 @@
- 	services.set(IStateService, new SyncDescriptor(StateService));
- 	services.set(IConfigurationService, new SyncDescriptor(ConfigurationService));
- 	services.set(IRequestService, new SyncDescriptor(RequestService));
-+<<<<<<< .our
- 	services.set(IURLService, new SyncDescriptor(URLService));
-+=======
-+	services.set(IURLService, new SyncDescriptor(URLService, args['open-url'] ? args._urls : []));
-+>>>>>>> .their
- 	services.set(IBackupMainService, new SyncDescriptor(BackupMainService));
- 	services.set(IDialogService, new SyncDescriptor(CommandLineDialogService));
- 
-changed in both
-  base   100644 fe645ff4e0dbb53b70cd39cfe4ed8724eafbd291 src/vs/code/node/cli.ts
-  our    100644 3ca3fd9ec9479918271b1fd5d7cd262e40dae630 src/vs/code/node/cli.ts
-  their  100644 b005cc2035054906e9096b518e391359100283ac src/vs/code/node/cli.ts
-@@ -17,7 +17,10 @@
- import { findFreePort } from 'vs/base/node/ports';
- import { resolveTerminalEncoding } from 'vs/base/node/encoding';
- import * as iconv from 'iconv-lite';
-+<<<<<<< .our
- import { writeFileAndFlushSync } from 'vs/base/node/extfs';
-+=======
-+>>>>>>> .their
- import { isWindows } from 'vs/base/common/platform';
- 
- function shouldSpawnCliProcess(argv: ParsedArgs): boolean {
-@@ -123,7 +126,11 @@
- 
- 		const processCallbacks: ((child: ChildProcess) => Thenable<any>)[] = [];
- 
-+<<<<<<< .our
- 		const verbose = args.verbose || args.status || typeof args['upload-logs'] !== 'undefined';
-+=======
-+		const verbose = args.verbose || args.status;
-+>>>>>>> .their
- 		if (verbose) {
- 			env['ELECTRON_ENABLE_LOGGING'] = '1';
- 
-@@ -155,7 +162,15 @@
- 			// Read from stdin: we require a single "-" argument to be passed in order to start reading from
- 			// stdin. We do this because there is no reliable way to find out if data is piped to stdin. Just
- 			// checking for stdin being connected to a TTY is not enough (https://github.com/Microsoft/vscode/issues/40351)
-+<<<<<<< .our
- 			if (args._.length === 0 && readFromStdin) {
-+=======
-+			if (args._.length === 1 && args._[0] === '-') {
-+
-+				// remove the "-" argument when we read from stdin
-+				args._ = [];
-+				argv = argv.filter(a => a !== '-');
-+>>>>>>> .their
- 
- 				// prepare temp file to read stdin to
- 				stdinFilePath = paths.join(os.tmpdir(), `code-stdin-${Math.random().toString(36).replace(/[^a-z]+/g, '').substr(0, 3)}.txt`);
-changed in both
-  base   100644 8755293fa81bcd50d5efd297386b5081741fac40 src/vs/editor/contrib/suggest/suggestWidget.ts
-  our    100644 a221be2731d33b2c0a5d84d119cac0233b76a147 src/vs/editor/contrib/suggest/suggestWidget.ts
-  their  100644 1742ab977819feeaa8f2816e5b9e454905697341 src/vs/editor/contrib/suggest/suggestWidget.ts
-@@ -35,6 +35,10 @@
- import { TimeoutTimer, CancelablePromise, createCancelablePromise } from 'vs/base/common/async';
- import { CancellationToken } from 'vs/base/common/cancellation';
- 
-+<<<<<<< .our
-+=======
-+const sticky = false; // for development purposes
-+>>>>>>> .their
- const expandSuggestionDocsByDefault = false;
- const maxSuggestionsToShow = 12;
- 
-removed in local
-  base   100644 40ecb80f1ff87ab0fce2c6c4eed434d7f23f7a8e src/vs/platform/actions/test/common/menuService.test.ts
-  their  100644 f4fa74113ee17671be7abbc7231eef36f28e983f src/vs/platform/actions/test/common/menuService.test.ts
-removed in local
-  base   100644 78207993cb09bb08613a731da5d2f1967bba910a src/vs/platform/commands/test/commandService.test.ts
-  their  100644 375f1ee35485b4dd4be3497d52f8ebae24317e3c src/vs/platform/commands/test/commandService.test.ts
-changed in both
-  base   100644 b35a183f28ecd3daa9a8e41e3903feb7985febd5 src/vs/platform/environment/common/environment.ts
-  our    100644 52431b2e260012bfee9b7964e1e56089ce2601ab src/vs/platform/environment/common/environment.ts
-  their  100644 ae07f3e26a171d3bd02820381871c31ec642cdf5 src/vs/platform/environment/common/environment.ts
-@@ -8,8 +8,11 @@
- export interface ParsedArgs {
- 	[arg: string]: any;
- 	_: string[];
-+<<<<<<< .our
- 	'folder-uri'?: string | string[];
- 	'file-uri'?: string | string[];
-+=======
-+>>>>>>> .their
- 	_urls?: string[];
- 	help?: boolean;
- 	version?: boolean;
-changed in both
-  base   100644 3f64b11ba94ded15651a28f52308e0fa2987c951 src/vs/platform/environment/node/argv.ts
-  our    100644 7183c2471eb1043a8263fbc1a8a7863b41344622 src/vs/platform/environment/node/argv.ts
-  their  100644 27b706c75a741012b7cb7f1a7a52669405790288 src/vs/platform/environment/node/argv.ts
-@@ -11,7 +11,10 @@
- import { ParsedArgs } from '../common/environment';
- import { isWindows } from 'vs/base/common/platform';
- import product from 'vs/platform/node/product';
-+<<<<<<< .our
- import { MIN_MAX_MEMORY_SIZE_MB } from 'vs/platform/files/common/files';
-+=======
-+>>>>>>> .their
- 
- const options: minimist.Opts = {
- 	string: [
-changed in both
-  base   100644 ca36e02bff8b679b2000c6ca26273bbc890c0dad src/vs/platform/extensionManagement/common/extensionManagement.ts
-  our    100644 f7a4416631b5fdc70826b6b07752e5d15f519c26 src/vs/platform/extensionManagement/common/extensionManagement.ts
-  their  100644 363e307899c366fbee312fad19ce61f51b4003d1 src/vs/platform/extensionManagement/common/extensionManagement.ts
-@@ -254,6 +254,7 @@
- 	malicious: boolean;
- }
- 
-+<<<<<<< .our
- export enum InstallOperation {
- 	Install = 1,
- 	Update
-@@ -263,6 +264,8 @@
- 	contents: { [key: string]: {} };
- }
- 
-+=======
-+>>>>>>> .their
- export interface IExtensionGalleryService {
- 	_serviceBrand: any;
- 	isEnabled(): boolean;
-changed in both
-  base   100644 15bb2aa58dfd11d24e73eaa4966a6149ba3eaa70 src/vs/platform/extensionManagement/common/extensionManagementIpc.ts
-  our    100644 4180af7c8a32f8775cf853609b970a93be7c71ba src/vs/platform/extensionManagement/common/extensionManagementIpc.ts
-  their  100644 9cb9488880e71ef624229d4ce242f1fbaf88eec4 src/vs/platform/extensionManagement/common/extensionManagementIpc.ts
-@@ -6,11 +6,17 @@
- 'use strict';
- 
- import { TPromise } from 'vs/base/common/winjs.base';
-+<<<<<<< .our
- import { IChannel } from 'vs/base/parts/ipc/common/ipc';
- import { IExtensionManagementService, ILocalExtension, InstallExtensionEvent, DidInstallExtensionEvent, IGalleryExtension, LocalExtensionType, DidUninstallExtensionEvent, IExtensionIdentifier, IGalleryMetadata, IReportedExtension } from './extensionManagement';
- import { Event, buffer, mapEvent } from 'vs/base/common/event';
- import URI from 'vs/base/common/uri';
- import { IURITransformer } from 'vs/base/common/uriIpc';
-+=======
-+import { IChannel, eventToCall, eventFromCall } from 'vs/base/parts/ipc/common/ipc';
-+import { IExtensionManagementService, ILocalExtension, InstallExtensionEvent, DidInstallExtensionEvent, IGalleryExtension, LocalExtensionType, DidUninstallExtensionEvent, IExtensionIdentifier, IGalleryMetadata, IReportedExtension } from './extensionManagement';
-+import Event, { buffer } from 'vs/base/common/event';
-+>>>>>>> .their
- 
- export interface IExtensionManagementChannel extends IChannel {
- 	listen(event: 'onInstallExtension'): Event<InstallExtensionEvent>;
-@@ -20,10 +26,16 @@
- 	call(command: 'install', args: [string]): TPromise<void>;
- 	call(command: 'installFromGallery', args: [IGalleryExtension]): TPromise<void>;
- 	call(command: 'uninstall', args: [ILocalExtension, boolean]): TPromise<void>;
-+<<<<<<< .our
- 	call(command: 'reinstallFromGallery', args: [ILocalExtension]): TPromise<void>;
- 	call(command: 'getInstalled', args: [LocalExtensionType]): TPromise<ILocalExtension[]>;
- 	call(command: 'getExtensionsReport'): TPromise<IReportedExtension[]>;
- 	call(command: 'updateMetadata', args: [ILocalExtension, IGalleryMetadata]): TPromise<ILocalExtension>;
-+=======
-+	call(command: 'getInstalled'): TPromise<ILocalExtension[]>;
-+	call(command: 'getExtensionsReport'): TPromise<IReportedExtension[]>;
-+	call(command: string, arg?: any): TPromise<any>;
-+>>>>>>> .their
- }
- 
- export class ExtensionManagementChannel implements IExtensionManagementChannel {
-@@ -53,12 +65,24 @@
- 
- 	call(command: string, args?: any): TPromise<any> {
- 		switch (command) {
-+<<<<<<< .our
- 			case 'install': return this.service.install(args[0]);
- 			case 'installFromGallery': return this.service.installFromGallery(args[0]);
- 			case 'uninstall': return this.service.uninstall(this._transform(args[0]), args[1]);
- 			case 'reinstallFromGallery': return this.service.reinstallFromGallery(this._transform(args[0]));
- 			case 'getInstalled': return this.service.getInstalled(args[0]);
- 			case 'updateMetadata': return this.service.updateMetadata(this._transform(args[0]), args[1]);
-+=======
-+			case 'event:onInstallExtension': return eventToCall(this.onInstallExtension);
-+			case 'event:onDidInstallExtension': return eventToCall(this.onDidInstallExtension);
-+			case 'event:onUninstallExtension': return eventToCall(this.onUninstallExtension);
-+			case 'event:onDidUninstallExtension': return eventToCall(this.onDidUninstallExtension);
-+			case 'install': return this.service.install(arg);
-+			case 'installFromGallery': return this.service.installFromGallery(arg[0]);
-+			case 'uninstall': return this.service.uninstall(arg[0], arg[1]);
-+			case 'getInstalled': return this.service.getInstalled(arg);
-+			case 'updateMetadata': return this.service.updateMetadata(arg[0], arg[1]);
-+>>>>>>> .their
- 			case 'getExtensionsReport': return this.service.getExtensionsReport();
- 		}
- 
-@@ -110,6 +134,7 @@
- 	getExtensionsReport(): TPromise<IReportedExtension[]> {
- 		return this.channel.call('getExtensionsReport');
- 	}
-+<<<<<<< .our
- 
- 	private _transformIncoming(extension: ILocalExtension): ILocalExtension {
- 		return extension ? { ...extension, ...{ location: URI.revive(this.uriTransformer.transformIncoming(extension.location)) } } : extension;
-@@ -119,4 +144,6 @@
- 		return extension ? { ...extension, ...{ location: this.uriTransformer.transformOutgoing(extension.location) } } : extension;
- 	}
- 
-+=======
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8fd3621d647d783a4437d12335cc942b2f681627 src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
-  our    100644 505673fa7fc83daa2d2994991f11bf17c4e691b9 src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
-  their  100644 53e71e406665d37d271824d6d8ddd62fe6f4fecb src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
-changed in both
-  base   100644 e79adfe2cbce59d883b549b91e1285999d95a9cf src/vs/platform/extensionManagement/node/extensionGalleryService.ts
-  our    100644 18b43c9c0ef6d23a341496a774df3ca1a74b49e1 src/vs/platform/extensionManagement/node/extensionGalleryService.ts
-  their  100644 81b8e3cc744ec98eecaabb7dd801d764dd2728d7 src/vs/platform/extensionManagement/node/extensionGalleryService.ts
-@@ -8,8 +8,13 @@
- import * as path from 'path';
- import { TPromise } from 'vs/base/common/winjs.base';
- import { distinct } from 'vs/base/common/arrays';
-+<<<<<<< .our
- import { getErrorMessage, isPromiseCanceledError, canceled } from 'vs/base/common/errors';
- import { StatisticType, IGalleryExtension, IExtensionGalleryService, IGalleryExtensionAsset, IQueryOptions, SortBy, SortOrder, IExtensionManifest, IExtensionIdentifier, IReportedExtension, InstallOperation, ITranslation } from 'vs/platform/extensionManagement/common/extensionManagement';
-+=======
-+import { getErrorMessage, isPromiseCanceledError } from 'vs/base/common/errors';
-+import { StatisticType, IGalleryExtension, IExtensionGalleryService, IGalleryExtensionAsset, IQueryOptions, SortBy, SortOrder, IExtensionManifest, IExtensionIdentifier, IReportedExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
-+>>>>>>> .their
- import { getGalleryExtensionId, getGalleryExtensionTelemetryData, adoptToGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
- import { assign, getOrDefault } from 'vs/base/common/objects';
- import { IRequestService } from 'vs/platform/request/node/request';
-@@ -24,8 +29,11 @@
- import { writeFileAndFlushSync } from 'vs/base/node/extfs';
- import { generateUuid, isUUID } from 'vs/base/common/uuid';
- import { values } from 'vs/base/common/map';
-+<<<<<<< .our
- import { CancellationToken } from 'vs/base/common/cancellation';
- import { wireCancellationToken } from 'vs/base/common/async';
-+=======
-+>>>>>>> .their
- 
- interface IRawGalleryExtensionFile {
- 	assetType: string;
-changed in both
-  base   100644 c447fb77b99192a620390e42a887e0edb3c8cc22 src/vs/platform/extensionManagement/node/extensionManagementService.ts
-  our    100644 fca1b8fcc1eedca233bd95ef59ad6d0d3904e895 src/vs/platform/extensionManagement/node/extensionManagementService.ts
-  their  100644 2785850ceb57925065bc02123025c949b6fdbaf0 src/vs/platform/extensionManagement/node/extensionManagementService.ts
-@@ -20,10 +20,17 @@
- 	InstallExtensionEvent, DidInstallExtensionEvent, DidUninstallExtensionEvent, LocalExtensionType,
- 	StatisticType,
- 	IExtensionIdentifier,
-+<<<<<<< .our
- 	IReportedExtension,
- 	InstallOperation
- } from 'vs/platform/extensionManagement/common/extensionManagement';
- import { getGalleryExtensionIdFromLocal, adoptToGalleryExtensionId, areSameExtensions, getGalleryExtensionId, groupByExtension, getMaliciousExtensionsSet, getLocalExtensionId, getGalleryExtensionTelemetryData, getLocalExtensionTelemetryData, getIdFromLocalExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-+=======
-+	IReportedExtension
-+} from 'vs/platform/extensionManagement/common/extensionManagement';
-+import { getGalleryExtensionIdFromLocal, adoptToGalleryExtensionId, areSameExtensions, getGalleryExtensionId, getMaliciousExtensionsSet } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-+import { getIdAndVersionFromLocalExtensionId } from 'vs/platform/extensionManagement/node/extensionManagementUtil';
-+>>>>>>> .their
- import { localizeManifest } from '../common/extensionNls';
- import { IEnvironmentService } from 'vs/platform/environment/common/environment';
- import { Limiter, always } from 'vs/base/common/async';
-@@ -31,6 +38,7 @@
- import * as semver from 'semver';
- import URI from 'vs/base/common/uri';
- import pkg from 'vs/platform/node/package';
-+<<<<<<< .our
- import { isMacintosh, isWindows } from 'vs/base/common/platform';
- import { ILogService } from 'vs/platform/log/common/log';
- import { ExtensionsManifestCache } from 'vs/platform/extensionManagement/node/extensionsManifestCache';
-@@ -46,6 +54,14 @@
- const ERROR_SCANNING_SYS_EXTENSIONS = 'scanningSystem';
- const ERROR_SCANNING_USER_EXTENSIONS = 'scanningUser';
- const INSTALL_ERROR_UNSET_UNINSTALLED = 'unsetUninstalled';
-+=======
-+import { isMacintosh } from 'vs/base/common/platform';
-+import { MANIFEST_CACHE_FOLDER, USER_MANIFEST_CACHE_FILE } from 'vs/platform/extensions/common/extensions';
-+import { ILogService } from 'vs/platform/log/common/log';
-+
-+const SystemExtensionsRoot = path.normalize(path.join(URI.parse(require.toUrl('')).fsPath, '..', 'extensions'));
-+const INSTALL_ERROR_OBSOLETE = 'obsolete';
-+>>>>>>> .their
- const INSTALL_ERROR_INCOMPATIBLE = 'incompatible';
- const INSTALL_ERROR_DOWNLOADING = 'downloading';
- const INSTALL_ERROR_VALIDATING = 'validating';
-@@ -110,6 +126,7 @@
- 	_serviceBrand: any;
- 
- 	private extensionsPath: string;
-+<<<<<<< .our
- 	private uninstalledPath: string;
- 	private uninstalledFileLimiter: Limiter<void>;
- 	private reportedExtensions: TPromise<IReportedExtension[]> | undefined;
-@@ -118,6 +135,13 @@
- 	private readonly uninstallingExtensions: Map<string, TPromise<void>> = new Map<string, TPromise<void>>();
- 	private readonly manifestCache: ExtensionsManifestCache;
- 	private readonly extensionLifecycle: ExtensionsLifecycle;
-+=======
-+	private obsoletePath: string;
-+	private obsoleteFileLimiter: Limiter<void>;
-+	private reportedExtensions: TPromise<IReportedExtension[]> | undefined;
-+	private lastReportTimestamp = 0;
-+	private disposables: IDisposable[] = [];
-+>>>>>>> .their
- 
- 	private readonly _onInstallExtension = new Emitter<InstallExtensionEvent>();
- 	readonly onInstallExtension: Event<InstallExtensionEvent> = this._onInstallExtension.event;
-@@ -132,14 +156,22 @@
- 	onDidUninstallExtension: Event<DidUninstallExtensionEvent> = this._onDidUninstallExtension.event;
- 
- 	constructor(
-+<<<<<<< .our
- 		@IEnvironmentService environmentService: IEnvironmentService,
- 		@IDialogService private dialogService: IDialogService,
- 		@IExtensionGalleryService private galleryService: IExtensionGalleryService,
- 		@ILogService private logService: ILogService,
- 		@ITelemetryService private telemetryService: ITelemetryService,
-+=======
-+		@IEnvironmentService private environmentService: IEnvironmentService,
-+		@IChoiceService private choiceService: IChoiceService,
-+		@IExtensionGalleryService private galleryService: IExtensionGalleryService,
-+		@ILogService private logService: ILogService
-+>>>>>>> .their
- 	) {
- 		super();
- 		this.extensionsPath = environmentService.extensionsPath;
-+<<<<<<< .our
- 		this.uninstalledPath = path.join(this.extensionsPath, '.obsolete');
- 		this.uninstalledFileLimiter = new Limiter(1);
- 		this.manifestCache = this._register(new ExtensionsManifestCache(environmentService, this));
-@@ -151,6 +183,17 @@
- 			this.installingExtensions.clear();
- 			this.uninstallingExtensions.clear();
- 		}));
-+=======
-+		this.obsoletePath = path.join(this.extensionsPath, '.obsolete');
-+		this.obsoleteFileLimiter = new Limiter(1);
-+	}
-+
-+	private deleteExtensionsManifestCache(): void {
-+		const cacheFolder = path.join(this.environmentService.userDataPath, MANIFEST_CACHE_FOLDER);
-+		const cacheFile = path.join(cacheFolder, USER_MANIFEST_CACHE_FILE);
-+
-+		pfs.del(cacheFile).done(() => { }, () => { });
-+>>>>>>> .their
- 	}
- 
- 	install(zipPath: string): TPromise<void> {
-@@ -298,6 +341,7 @@
- 			});
- 	}
- 
-+<<<<<<< .our
- 	private getOperation(extensionToInstall: IExtensionIdentifier, installed: ILocalExtension[]): InstallOperation {
- 		return installed.some(i => areSameExtensions({ id: getGalleryExtensionIdFromLocal(i), uuid: i.identifier.uuid }, extensionToInstall)) ? InstallOperation.Update : InstallOperation.Install;
- 	}
-@@ -313,6 +357,36 @@
- 					throw new ExtensionManagementError(INSTALL_ERROR_MALICIOUS, nls.localize('malicious extension', "Can't install extension since it was reported to be problematic."));
- 				} else {
- 					return null;
-+=======
-+	private downloadAndInstallExtensions(extensions: IGalleryExtension[]): TPromise<ILocalExtension[]> {
-+		return this.getInstalled(LocalExtensionType.User)
-+			.then(
-+			installed => TPromise.join(extensions.map(extensionToInstall =>
-+				this.downloadAndInstallExtension(extensionToInstall, installed)
-+			)).then(null, errors => this.rollback(extensions).then(() => TPromise.wrapError(errors), () => TPromise.wrapError(errors))),
-+			error => TPromise.wrapError<ILocalExtension[]>(new InstallationError(this.joinErrors(error).message, INSTALL_ERROR_LOCAL)));
-+	}
-+
-+	private downloadAndInstallExtension(extensionToInstall: IGalleryExtension, installed: ILocalExtension[]): TPromise<ILocalExtension> {
-+		return this.getExtensionsReport().then(report => {
-+			if (getMaliciousExtensionsSet(report).has(extensionToInstall.identifier.id)) {
-+				throw new Error(nls.localize('malicious extension', "Can't install extension since it was reported to be malicious."));
-+			}
-+
-+			return this.downloadInstallableExtension(extensionToInstall, installed)
-+				.then(installableExtension => this.installExtension(installableExtension).then(null, e => TPromise.wrapError(new InstallationError(this.joinErrors(e).message, INSTALL_ERROR_EXTRACTING))));
-+		});
-+	}
-+
-+	private checkForObsolete(extensionsToInstall: IGalleryExtension[]): TPromise<IGalleryExtension[]> {
-+		return this.filterObsolete(...extensionsToInstall.map(i => getLocalExtensionIdFromGallery(i, i.version)))
-+			.then(obsolete => {
-+				if (obsolete.length) {
-+					if (isMacintosh) {
-+						return TPromise.wrapError<IGalleryExtension[]>(new Error(nls.localize('quitCode', "Unable to install because an obsolete instance of the extension is still running. Please Quit and Start VS Code before reinstalling.")));
-+					}
-+					return TPromise.wrapError<IGalleryExtension[]>(new Error(nls.localize('exitCode', "Unable to install because an obsolete instance of the extension is still running. Please Exit and Start VS Code before reinstalling.")));
-+>>>>>>> .their
- 				}
- 			});
- 	}
-@@ -884,6 +958,7 @@
- 			});
- 	}
- 
-+<<<<<<< .our
- 	private toNonCancellablePromise<T>(promise: TPromise<T>): TPromise<T> {
- 		return new TPromise((c, e) => promise.then(result => c(result), error => e(error)), () => this.logService.debug('Request Cancelled'));
- 	}
-@@ -922,6 +997,10 @@
- 			}
- 		*/
- 		this.telemetryService.publicLog(eventName, assign(extensionData, { success: !error, duration, errorcode }));
-+=======
-+	dispose() {
-+		this.disposables = dispose(this.disposables);
-+>>>>>>> .their
- 	}
- }
- 
-changed in both
-  base   100644 7c78e26544bf8d65116c00eab6af62499349802d src/vs/platform/extensions/common/extensions.ts
-  our    100644 c1a48a2c6d65db8804bf0dbf4b49647684752a89 src/vs/platform/extensions/common/extensions.ts
-  their  100644 b5bd7bcd7379d74ea3f45048cc27135612c6693d src/vs/platform/extensions/common/extensions.ts
-@@ -7,3 +7,173 @@
- export const MANIFEST_CACHE_FOLDER = 'CachedExtensions';
- export const USER_MANIFEST_CACHE_FILE = 'user';
- export const BUILTIN_MANIFEST_CACHE_FILE = 'builtin';
-+<<<<<<< .our
-+=======
-+
-+export const IExtensionService = createDecorator<IExtensionService>('extensionService');
-+
-+export interface IMessage {
-+	type: Severity;
-+	message: string;
-+	source: string;
-+	extensionId: string;
-+	extensionPointId: string;
-+}
-+
-+export interface IExtensionsStatus {
-+	messages: IMessage[];
-+	activationTimes: ActivationTimes;
-+	runtimeErrors: Error[];
-+}
-+
-+/**
-+ * e.g.
-+ * ```
-+ * {
-+ *    startTime: 1511954813493000,
-+ *    endTime: 1511954835590000,
-+ *    deltas: [ 100, 1500, 123456, 1500, 100000 ],
-+ *    ids: [ 'idle', 'self', 'extension1', 'self', 'idle' ]
-+ * }
-+ * ```
-+ */
-+export interface IExtensionHostProfile {
-+	/**
-+	 * Profiling start timestamp in microseconds.
-+	 */
-+	startTime: number;
-+	/**
-+	 * Profiling end timestamp in microseconds.
-+	 */
-+	endTime: number;
-+	/**
-+	 * Duration of segment in microseconds.
-+	 */
-+	deltas: number[];
-+	/**
-+	 * Segment identifier: extension id or one of the four known strings.
-+	 */
-+	ids: ProfileSegmentId[];
-+
-+	/**
-+	 * Get the information as a .cpuprofile.
-+	 */
-+	data: object;
-+
-+	/**
-+	 * Get the aggregated time per segmentId
-+	 */
-+	getAggregatedTimes(): Map<ProfileSegmentId, number>;
-+}
-+
-+/**
-+ * Extension id or one of the four known program states.
-+ */
-+export type ProfileSegmentId = string | 'idle' | 'program' | 'gc' | 'self';
-+
-+export class ActivationTimes {
-+	constructor(
-+		public readonly startup: boolean,
-+		public readonly codeLoadingTime: number,
-+		public readonly activateCallTime: number,
-+		public readonly activateResolvedTime: number,
-+		public readonly activationEvent: string
-+	) {
-+	}
-+}
-+
-+export class ExtensionPointContribution<T> {
-+	readonly description: IExtensionDescription;
-+	readonly value: T;
-+
-+	constructor(description: IExtensionDescription, value: T) {
-+		this.description = description;
-+		this.value = value;
-+	}
-+}
-+
-+export interface IExtensionHostInformation {
-+	inspectPort: number;
-+}
-+
-+export interface IExtensionService {
-+	_serviceBrand: any;
-+
-+	/**
-+	 * TODO@Ben: Delete this and use `whenInstalledExtensionsRegistered`
-+	 * An event emitted when extensions are registered after their extension points got handled.
-+	 *
-+	 * This event will also fire on startup to signal the installed extensions.
-+	 *
-+	 * @returns the extensions that got registered
-+	 */
-+	onDidRegisterExtensions: Event<IExtensionDescription[]>;
-+
-+	/**
-+	 * @event
-+	 * Fired when extensions status changes.
-+	 * The event contains the ids of the extensions that have changed.
-+	 */
-+	onDidChangeExtensionsStatus: Event<string[]>;
-+
-+	/**
-+	 * Send an activation event and activate interested extensions.
-+	 */
-+	activateByEvent(activationEvent: string): TPromise<void>;
-+
-+	/**
-+	 * An promise that resolves when the installed extensions are registered after
-+	 * their extension points got handled.
-+	 */
-+	whenInstalledExtensionsRegistered(): TPromise<boolean>;
-+
-+	/**
-+	 * Return all registered extensions
-+	 */
-+	getExtensions(): TPromise<IExtensionDescription[]>;
-+
-+	/**
-+	 * Read all contributions to an extension point.
-+	 */
-+	readExtensionPointContributions<T>(extPoint: IExtensionPoint<T>): TPromise<ExtensionPointContribution<T>[]>;
-+
-+	/**
-+	 * Get information about extensions status.
-+	 */
-+	getExtensionsStatus(): { [id: string]: IExtensionsStatus };
-+
-+	/**
-+	 * Check if the extension host can be profiled.
-+	 */
-+	canProfileExtensionHost(): boolean;
-+
-+	/**
-+	 * Begin an extension host process profile session.
-+	 */
-+	startExtensionHostProfile(): TPromise<ProfileSession>;
-+
-+	/**
-+	 * Restarts the extension host.
-+	 */
-+	restartExtensionHost(): void;
-+
-+	/**
-+	 * Starts the extension host.
-+	 */
-+	startExtensionHost(): void;
-+
-+	/**
-+	 * Stops the extension host.
-+	 */
-+	stopExtensionHost(): void;
-+
-+	/**
-+	 *
-+	 */
-+	getExtensionHostInformation(): IExtensionHostInformation;
-+}
-+
-+export interface ProfileSession {
-+	stop(): TPromise<IExtensionHostProfile>;
-+}
-+>>>>>>> .their
-changed in both
-  base   100644 68802e24d9b91aba528759a6e16de6a693a4901c src/vs/platform/node/product.ts
-  our    100644 dbb84fd473f8212ea96a20a8f12d66c5b703786a src/vs/platform/node/product.ts
-  their  100644 517c8b6d01a1266645b35ae78fd0f08549c519b5 src/vs/platform/node/product.ts
-@@ -32,7 +32,10 @@
- 		serviceUrl: string;
- 		itemUrl: string;
- 		controlUrl: string;
-+<<<<<<< .our
- 		recommendationsUrl: string;
-+=======
-+>>>>>>> .their
- 	};
- 	extensionTips: { [id: string]: string; };
- 	extensionImportantTips: { [id: string]: { name: string; pattern: string; }; };
-removed in local
-  base   100644 5469274fb205381a3320e58e83548277bacf894e src/vs/platform/url/electron-main/urlService.ts
-  their  100644 595d3b38c970cb9d7caec4972e5c22a35cf6d4b2 src/vs/platform/url/electron-main/urlService.ts
-changed in both
-  base   100644 3af68d9fddb21b3892475e8d2f0cce9f1ce9cd03 src/vs/workbench/api/node/extHost.api.impl.ts
-  our    100644 ea64898c5b15cfae4b4ab32d722f4ae4a68f831a src/vs/workbench/api/node/extHost.api.impl.ts
-  their  100644 a39cdf3556e93e560b02319cc918b72e52bddcbd src/vs/workbench/api/node/extHost.api.impl.ts
-@@ -144,6 +144,7 @@
- 
- 	return function (extension: IExtensionDescription): typeof vscode {
- 
-+<<<<<<< .our
- 		// Check document selectors for being overly generic. Technically this isn't a problem but
- 		// in practice many extensions say they support `fooLang` but need fs-access to do so. Those
- 		// extension should specify then the `file`-scheme, e.g `{ scheme: 'fooLang', language: 'fooLang' }`
-@@ -156,6 +157,27 @@
- 					console.info(`Extension '${extension.id}' uses a document selector without scheme. Learn more about this: https://go.microsoft.com/fwlink/?linkid=872305`);
- 					done = true;
- 				}
-+=======
-+		if (!isFalsyOrEmpty(product.extensionAllowedProposedApi)
-+			&& product.extensionAllowedProposedApi.indexOf(extension.id) >= 0
-+		) {
-+			// fast lane -> proposed api is available to all extensions
-+			// that are listed in product.json-files
-+			extension.enableProposedApi = true;
-+
-+		} else if (extension.enableProposedApi && !extension.isBuiltin) {
-+			if (
-+				!initData.environment.enableProposedApiForAll &&
-+				initData.environment.enableProposedApiFor.indexOf(extension.id) < 0
-+			) {
-+				extension.enableProposedApi = false;
-+				console.error(`Extension '${extension.id} cannot use PROPOSED API (must started out of dev or enabled via --enable-proposed-api)`);
-+
-+			} else {
-+				// proposed api is available when developing or when an extension was explicitly
-+				// spelled out via a command line argument
-+				console.warn(`Extension '${extension.id}' uses PROPOSED API which is subject to change and removal without notice.`);
-+>>>>>>> .their
- 			}
- 			return function perform(selector: vscode.DocumentSelector): vscode.DocumentSelector {
- 				if (Array.isArray(selector)) {
-removed in local
-  base   100644 24b4a899842698a61f472d7bcf1cb2585f3370d2 src/vs/workbench/browser/parts/compositebar/compositeBar.ts
-  their  100644 e358dab0b6773fc6480c2f54ac6b08c630302aeb src/vs/workbench/browser/parts/compositebar/compositeBar.ts
-changed in both
-  base   100644 ab1499b9491d9fc6cc67636a37ccdf138b187b66 src/vs/workbench/browser/parts/views/viewsViewlet.ts
-  our    100644 7fbaeee118622ff2c865cdcaad61d8bf1813d1b2 src/vs/workbench/browser/parts/views/viewsViewlet.ts
-  their  100644 cd2d2213b2d0b8afe73c3c7c393f4a2da2d41ab5 src/vs/workbench/browser/parts/views/viewsViewlet.ts
-@@ -214,6 +214,7 @@
- 		return TPromise.as(view);
- 	}
- 
-+<<<<<<< .our
- 	movePanel(from: ViewletPanel, to: ViewletPanel): void {
- 		const fromIndex = firstIndex(this.panels, panel => panel === from);
- 		const toIndex = firstIndex(this.panels, panel => panel === to);
-@@ -222,6 +223,86 @@
- 
- 		super.movePanel(from, to);
- 		this.viewsModel.move(fromViewDescriptor.id, toViewDescriptor.id);
-+=======
-+	protected updateViews(unregisteredViews: IViewDescriptor[] = []): TPromise<ViewsViewletPanel[]> {
-+		const registeredViews = this.getViewDescriptorsFromRegistry();
-+		const [visible, toAdd, toRemove] = registeredViews.reduce<[IViewDescriptor[], IViewDescriptor[], IViewDescriptor[]]>((result, viewDescriptor) => {
-+			const isCurrentlyVisible = this.isCurrentlyVisible(viewDescriptor);
-+			const canBeVisible = this.canBeVisible(viewDescriptor);
-+
-+			if (canBeVisible) {
-+				result[0].push(viewDescriptor);
-+			}
-+
-+			if (!isCurrentlyVisible && canBeVisible) {
-+				result[1].push(viewDescriptor);
-+			}
-+
-+			if (isCurrentlyVisible && !canBeVisible) {
-+				result[2].push(viewDescriptor);
-+			}
-+
-+			return result;
-+
-+		}, [[], [], []]);
-+
-+		toRemove.push(...unregisteredViews.filter(viewDescriptor => this.isCurrentlyVisible(viewDescriptor)));
-+
-+		const toCreate: ViewsViewletPanel[] = [];
-+
-+		if (toAdd.length || toRemove.length) {
-+			const panels = [...this.viewsViewletPanels];
-+
-+			for (const view of panels) {
-+				let viewState = this.viewsStates.get(view.id);
-+				if (!viewState || typeof viewState.size === 'undefined' || !view.isExpanded() !== viewState.collapsed) {
-+					this.updateViewStateSize(view);
-+				}
-+			}
-+
-+			if (toRemove.length) {
-+				for (const viewDescriptor of toRemove) {
-+					let view = this.getView(viewDescriptor.id);
-+					this.updateViewStateSize(view);
-+					this.removePanel(view);
-+					this.viewsViewletPanels.splice(this.viewsViewletPanels.indexOf(view), 1);
-+				}
-+			}
-+
-+			for (const viewDescriptor of toAdd) {
-+				let viewState = this.viewsStates.get(viewDescriptor.id);
-+				let index = visible.indexOf(viewDescriptor);
-+				const view = this.createView(viewDescriptor,
-+					{
-+						id: viewDescriptor.id,
-+						name: viewDescriptor.name,
-+						actionRunner: this.getActionRunner(),
-+						expanded: !(viewState ? viewState.collapsed : viewDescriptor.collapsed),
-+						viewletSettings: this.viewletSettings
-+					});
-+				toCreate.push(view);
-+
-+				const size = (viewState && viewState.size) || viewDescriptor.size || 200;
-+				this.addPanel(view, size, index);
-+				this.viewsViewletPanels.splice(index, 0, view);
-+
-+				this.updateViewStateSize(view);
-+			}
-+
-+			return TPromise.join(toCreate.map(view => view.create()))
-+				.then(() => this.onViewsUpdated())
-+				.then(() => this._resizePanels())
-+				.then(() => toCreate);
-+		}
-+
-+		return TPromise.as([]);
-+	}
-+
-+	private updateAllViewsSizes(): void {
-+		for (const view of this.viewsViewletPanels) {
-+			this.updateViewStateSize(view);
-+		}
-+>>>>>>> .their
- 	}
- 
- 	layout(dimension: DOM.Dimension): void {
-@@ -355,6 +436,7 @@
- 		}
- 	}
- 
-+<<<<<<< .our
- 	private restoreViewSizes(): void {
- 		// Restore sizes only when the layout has happened
- 		if (this.didLayout) {
-@@ -372,6 +454,18 @@
- 				}
- 			}
- 		}
-+=======
-+	private updateViewStateSize(view: ViewsViewletPanel): void {
-+		const currentState = this.viewsStates.get(view.id);
-+		if (currentState && !this.didLayout) {
-+			// Do not update to new state if the layout has not happened yet
-+			return;
-+		}
-+
-+		const newViewState = this.createViewState(view);
-+		const stateToUpdate = currentState ? { ...currentState, collapsed: newViewState.collapsed, size: newViewState.size } : newViewState;
-+		this.viewsStates.set(view.id, stateToUpdate);
-+>>>>>>> .their
- 	}
- 
- 	private computeInitialSizes(): { [id: string]: number } {
-changed in both
-  base   100644 cdd88383ed63cd8cd02b1e0de9fb3b09e87eac2a src/vs/workbench/parts/debug/browser/debugViewlet.ts
-  our    100644 30ffc30d939529db426736e2841d36a02253b82d src/vs/workbench/parts/debug/browser/debugViewlet.ts
-  their  100644 6107937695a0527ed55e6a2f976d7a4a07128989 src/vs/workbench/parts/debug/browser/debugViewlet.ts
-@@ -66,10 +66,18 @@
- 		}));
- 	}
- 
-+<<<<<<< .our
- 	create(parent: HTMLElement): TPromise<void> {
- 		return super.create(parent).then(() => {
- 			DOM.addClass(parent, 'debug-viewlet');
- 		});
-+=======
-+	async create(parent: Builder): TPromise<void> {
-+		await super.create(parent);
-+
-+		const el = parent.getHTMLElement();
-+		DOM.addClass(el, 'debug-viewlet');
-+>>>>>>> .their
- 	}
- 
- 	public focus(): void {
-@@ -156,6 +164,7 @@
- 		}
- 	}
- 
-+<<<<<<< .our
- 	addPanels(panels: { panel: ViewletPanel, size: number, index?: number }[]): void {
- 		super.addPanels(panels);
- 
-@@ -167,6 +176,14 @@
- 			} else {
- 				this.panelListeners.set(panel.id, panel.onDidChange(() => this.updateBreakpointsMaxSize()));
- 			}
-+=======
-+		// attach event listener to
-+		if (panel.id === BREAKPOINTS_VIEW_ID) {
-+			this.breakpointView = panel;
-+			this.updateBreakpointsMaxSize();
-+		} else {
-+			this.panelListeners.set(panel.id, panel.onDidChange(() => this.updateBreakpointsMaxSize()));
-+>>>>>>> .their
- 		}
- 	}
- 
-@@ -181,7 +198,11 @@
- 	private updateBreakpointsMaxSize(): void {
- 		if (this.breakpointView) {
- 			// We need to update the breakpoints view since all other views are collapsed #25384
-+<<<<<<< .our
- 			const allOtherCollapsed = this.panels.every(view => !view.isExpanded() || view === this.breakpointView);
-+=======
-+			const allOtherCollapsed = this.views.every(view => !view.isExpanded() || view === this.breakpointView);
-+>>>>>>> .their
- 			this.breakpointView.maximumBodySize = allOtherCollapsed ? Number.POSITIVE_INFINITY : this.breakpointView.minimumBodySize;
- 		}
- 	}
-removed in local
-  base   100644 af0184e53df90d6e1cb64e837cf950d2a1ad4bd5 src/vs/workbench/parts/extensions/browser/extensionEditor.ts
-  their  100644 4ed28d46c95bba11d43628d96f3df2982498b37e src/vs/workbench/parts/extensions/browser/extensionEditor.ts
-removed in local
-  base   100644 677b4981ba6c2c28386d4925f902e09cc9a5f5ef src/vs/workbench/parts/extensions/browser/extensionsActions.ts
-  their  100644 a1bb37611ffb74f403cecb7673a5ffc8f0e0aa31 src/vs/workbench/parts/extensions/browser/extensionsActions.ts
-removed in local
-  base   100644 c5c4b2fb467801e41af86e23ff2b6c619d5bf372 src/vs/workbench/parts/extensions/browser/extensionsList.ts
-  their  100644 4488fa35b60cec032d40d102e0b7d2e13e07ef3a src/vs/workbench/parts/extensions/browser/extensionsList.ts
-changed in both
-  base   100644 e2af2e4e734cdac822bbd95c77e0a9c7b282d616 src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.ts
-  our    100644 392a25bbd7243b9283c35618eda3d568cd63f4cf src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.ts
-  their  100644 cf4aebc302cc59f168c700d707be5fea7da613f8 src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.ts
-@@ -11,7 +11,11 @@
- import { IExtensionsViewlet, VIEWLET_ID } from 'vs/workbench/parts/extensions/common/extensions';
- import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
- import { IExtensionGalleryService, IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
-+<<<<<<< .our
- import { INotificationService } from 'vs/platform/notification/common/notification';
-+=======
-+import { IMessageService, Severity } from 'vs/platform/message/common/message';
-+>>>>>>> .their
- 
- class SimpleEntry extends QuickOpenEntry {
- 
-@@ -77,7 +81,11 @@
- 		@IViewletService private viewletService: IViewletService,
- 		@IExtensionGalleryService private galleryService: IExtensionGalleryService,
- 		@IExtensionManagementService private extensionsService: IExtensionManagementService,
-+<<<<<<< .our
- 		@INotificationService private notificationService: INotificationService
-+=======
-+		@IMessageService private messageService: IMessageService
-+>>>>>>> .their
- 	) {
- 		super();
- 	}
-@@ -100,7 +108,11 @@
- 								.then(viewlet => viewlet as IExtensionsViewlet)
- 								.then(viewlet => viewlet.search(`@id:${text}`))
- 								.then(() => this.extensionsService.installFromGallery(galleryExtension))
-+<<<<<<< .our
- 								.done(null, err => this.notificationService.error(err));
-+=======
-+								.done(null, err => this.messageService.show(Severity.Error, err));
-+>>>>>>> .their
- 						};
- 
- 						entries.push(new SimpleEntry(label, action));
-removed in local
-  base   100644 8314dddb331583b9f4d90efbbe66b65120b86b12 src/vs/workbench/parts/extensions/browser/media/extensionActions.css
-  their  100644 9ff9876d7e53ecbc82cf448b9c0356a20b3fdc59 src/vs/workbench/parts/extensions/browser/media/extensionActions.css
-changed in both
-  base   100644 b836148a1b70a37c6e49d25740249664c970ab49 src/vs/workbench/parts/extensions/common/extensions.ts
-  our    100644 f80eddc2997bb323b4ddc2fa04965332cdf133ab src/vs/workbench/parts/extensions/common/extensions.ts
-  their  100644 069039e8463ca67144d74857ad9df43d93896e84 src/vs/workbench/parts/extensions/common/extensions.ts
-@@ -56,10 +56,13 @@
- 	getReadme(): TPromise<string>;
- 	hasReadme(): boolean;
- 	getChangelog(): TPromise<string>;
-+<<<<<<< .our
- 	hasChangelog(): boolean;
- 	local?: ILocalExtension;
- 	locals?: ILocalExtension[];
- 	gallery?: IGalleryExtension;
-+=======
-+>>>>>>> .their
- 	isMalicious: boolean;
- }
- 
-changed in both
-  base   100644 307d628fdd358e97fd3fec61d7556116c50773d4 src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.ts
-  our    100644 7ecf2cae7552c8a2d2df880052fad56d9852d6d0 src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.ts
-  their  100644 7a8e65fd19e0027c9f2cc10e339f68dfe1633701 src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.ts
-@@ -15,11 +15,16 @@
- import { StatusbarAlignment, IStatusbarRegistry, StatusbarItemDescriptor, Extensions, IStatusbarItem } from 'vs/workbench/browser/parts/statusbar/statusbar';
- import { Registry } from 'vs/platform/registry/common/platform';
- import { IExtensionHostProfileService, ProfileSessionState, RuntimeExtensionsInput } from 'vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor';
-+<<<<<<< .our
- import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
- import { IWindowsService } from 'vs/platform/windows/common/windows';
- import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
- import { randomPort } from 'vs/base/node/ports';
- import product from 'vs/platform/node/product';
-+=======
-+import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
-+import { IMessageService, Severity } from 'vs/platform/message/common/message';
-+>>>>>>> .their
- 
- export class ExtensionHostProfileService extends Disposable implements IExtensionHostProfileService {
- 
-@@ -42,8 +47,12 @@
- 		@IExtensionService private readonly _extensionService: IExtensionService,
- 		@IEditorService private readonly _editorService: IEditorService,
- 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
-+<<<<<<< .our
- 		@IWindowsService private readonly _windowsService: IWindowsService,
- 		@IDialogService private readonly _dialogService: IDialogService
-+=======
-+		@IMessageService private readonly _messageService: IMessageService
-+>>>>>>> .their
- 	) {
- 		super();
- 		this._profile = null;
-@@ -88,6 +97,14 @@
- 			});
- 		}
- 
-+<<<<<<< .our
-+=======
-+		if (!this._extensionService.canProfileExtensionHost()) {
-+			this._messageService.show(Severity.Info, nls.localize('noPro', "To profile extensions, launch with `--inspect-extensions=<port>`."));
-+			return;
-+		}
-+
-+>>>>>>> .their
- 		this._setState(ProfileSessionState.Starting);
- 
- 		return this._extensionService.startExtensionHostProfile().then((value) => {
-changed in both
-  base   100644 18f4e4a6d565c04353991a15e07dffd1ca2ef877 src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts
-  our    100644 5ce89339923c3f8305329edee9c2f811f190aaa7 src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts
-  their  100644 eb0fca943f05753b3470157a9201600f17d5a210 src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts
-@@ -26,8 +26,13 @@
- } from 'vs/workbench/parts/extensions/electron-browser/extensionsActions';
- import { ExtensionsInput } from 'vs/workbench/parts/extensions/common/extensionsInput';
- import { ViewletRegistry, Extensions as ViewletExtensions, ViewletDescriptor } from 'vs/workbench/browser/viewlet';
-+<<<<<<< .our
- import { ExtensionEditor } from 'vs/workbench/parts/extensions/electron-browser/extensionEditor';
- import { StatusUpdater, ExtensionsViewlet, MaliciousExtensionChecker, ExtensionsViewletViewsContribution } from 'vs/workbench/parts/extensions/electron-browser/extensionsViewlet';
-+=======
-+import { ExtensionEditor } from 'vs/workbench/parts/extensions/browser/extensionEditor';
-+import { StatusUpdater, ExtensionsViewlet, MaliciousExtensionChecker } from 'vs/workbench/parts/extensions/electron-browser/extensionsViewlet';
-+>>>>>>> .their
- import { IQuickOpenRegistry, Extensions, QuickOpenHandlerDescriptor } from 'vs/workbench/browser/quickopen';
- import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
- import * as jsonContributionRegistry from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
-changed in both
-  base   100644 d3981741f79fcd7cb35a6807c10ff18212ba3377 src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
-  our    100644 0deb9a35143336ac44f10debedd6afdf4d47c48d src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
-  their  100644 1602a225bf9d7fb342f0796179a8af6193d64c20 src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
-@@ -45,6 +45,7 @@
- import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
- import { getGalleryExtensionIdFromLocal, getMaliciousExtensionsSet } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
- import { ILogService } from 'vs/platform/log/common/log';
-+<<<<<<< .our
- import { INotificationService } from 'vs/platform/notification/common/notification';
- import { IWindowService } from 'vs/platform/windows/common/windows';
- import { IPartService } from 'vs/workbench/services/part/common/partService';
-@@ -56,6 +57,9 @@
- import { SingleServerExtensionManagementServerService } from 'vs/workbench/services/extensions/node/extensionManagementServerService';
- import { Query } from 'vs/workbench/parts/extensions/common/extensionQuery';
- import { SuggestEnabledInput } from 'vs/workbench/parts/codeEditor/browser/suggestEnabledInput';
-+=======
-+import { ReloadWindowAction } from 'vs/workbench/electron-browser/actions';
-+>>>>>>> .their
- 
- interface SearchInputEvent extends Event {
- 	target: HTMLInputElement;
-@@ -560,9 +564,15 @@
- 
- 	constructor(
- 		@IExtensionManagementService private extensionsManagementService: IExtensionManagementService,
-+<<<<<<< .our
- 		@IWindowService private windowService: IWindowService,
- 		@ILogService private logService: ILogService,
- 		@INotificationService private notificationService: INotificationService
-+=======
-+		@IInstantiationService private instantiationService: IInstantiationService,
-+		@ILogService private logService: ILogService,
-+		@IMessageService private messageService: IMessageService
-+>>>>>>> .their
- 	) {
- 		this.loopCheckForMaliciousExtensions();
- 	}
-@@ -583,6 +593,7 @@
- 
- 				if (maliciousExtensions.length) {
- 					return TPromise.join(maliciousExtensions.map(e => this.extensionsManagementService.uninstall(e, true).then(() => {
-+<<<<<<< .our
- 						this.notificationService.prompt(
- 							Severity.Warning,
- 							localize('malicious warning', "We have uninstalled '{0}' which was reported to be problematic.", getGalleryExtensionIdFromLocal(e)),
-@@ -591,6 +602,12 @@
- 								run: () => this.windowService.reloadWindow()
- 							}]
- 						);
-+=======
-+						this.messageService.show(Severity.Warning, {
-+							message: localize('malicious warning', "We have uninstalled '{0}' which was reported to be malicious.", getGalleryExtensionIdFromLocal(e)),
-+							actions: [this.instantiationService.createInstance(ReloadWindowAction, ReloadWindowAction.ID, localize('reloadNow', "Reload Now"))]
-+						});
-+>>>>>>> .their
- 					})));
- 				} else {
- 					return TPromise.as(null);
-changed in both
-  base   100644 9208d1a21edeaaa17e3f76c87a33dac6aeb8c88c src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
-  our    100644 dde370485c80817a804989c810abe2f1db9c0966 src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
-  their  100644 9f7fa889f09171f24175d1763922f93afe006880 src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
-@@ -31,6 +31,7 @@
- import { IURLService, IURLHandler } from 'vs/platform/url/common/url';
- import { ExtensionsInput } from 'vs/workbench/parts/extensions/common/extensionsInput';
- import product from 'vs/platform/node/product';
-+<<<<<<< .our
- import { ILogService } from 'vs/platform/log/common/log';
- import { IProgressService2, ProgressLocation } from 'vs/workbench/services/progress/common/progress';
- import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-@@ -39,6 +40,8 @@
- import { groupBy } from 'vs/base/common/collections';
- import { Schemas } from 'vs/base/common/network';
- import * as resources from 'vs/base/common/resources';
-+=======
-+>>>>>>> .their
- 
- interface IExtensionStateProvider<T> {
- 	(extension: Extension): T;
-@@ -52,7 +55,11 @@
- 	constructor(
- 		private galleryService: IExtensionGalleryService,
- 		private stateProvider: IExtensionStateProvider<ExtensionState>,
-+<<<<<<< .our
- 		public locals: ILocalExtension[],
-+=======
-+		public local: ILocalExtension,
-+>>>>>>> .their
- 		public gallery: IGalleryExtension,
- 		private telemetryService: ITelemetryService
- 	) { }
-@@ -365,8 +372,13 @@
- 	private static readonly SyncPeriod = 1000 * 60 * 60 * 12; // 12 hours
- 	_serviceBrand: any;
- 	private stateProvider: IExtensionStateProvider<ExtensionState>;
-+<<<<<<< .our
- 	private installing: Extension[] = [];
- 	private uninstalling: Extension[] = [];
-+=======
-+	private installing: IActiveExtension[] = [];
-+	private uninstalling: IActiveExtension[] = [];
-+>>>>>>> .their
- 	private installed: Extension[] = [];
- 	private syncDelayer: ThrottledDelayer<void>;
- 	private autoUpdateDelayer: ThrottledDelayer<void>;
-@@ -453,6 +465,7 @@
- 	}
- 
- 	queryGallery(options: IQueryOptions = {}): TPromise<IPager<IExtension>> {
-+<<<<<<< .our
- 		return this.extensionService.getExtensionsReport()
- 			.then(report => {
- 				const maliciousSet = getMaliciousExtensionsSet(report);
-@@ -467,6 +480,21 @@
- 						return TPromise.wrapError<IPager<IExtension>>(err);
- 					});
- 			});
-+=======
-+		return this.extensionService.getExtensionsReport().then(report => {
-+			const maliciousSet = getMaliciousExtensionsSet(report);
-+
-+			return this.galleryService.query(options)
-+				.then(result => mapPager(result, gallery => this.fromGallery(gallery, maliciousSet)))
-+				.then(null, err => {
-+					if (/No extension gallery service configured/.test(err.message)) {
-+						return TPromise.as(singlePagePager([]));
-+					}
-+
-+					return TPromise.wrapError<IPager<IExtension>>(err);
-+				});
-+		});
-+>>>>>>> .their
- 	}
- 
- 	loadDependencies(extension: IExtension): TPromise<IExtensionDependencies> {
-@@ -474,6 +502,7 @@
- 			return TPromise.wrap<IExtensionDependencies>(null);
- 		}
- 
-+<<<<<<< .our
- 		return this.extensionService.getExtensionsReport()
- 			.then(report => {
- 				const maliciousSet = getMaliciousExtensionsSet(report);
-@@ -489,12 +518,29 @@
- 						return new ExtensionDependencies(extension, extension.id, map);
- 					});
- 			});
-+=======
-+		return this.extensionService.getExtensionsReport().then(report => {
-+			const maliciousSet = getMaliciousExtensionsSet(report);
-+
-+			return this.galleryService.loadAllDependencies((<Extension>extension).dependencies.map(id => <IExtensionIdentifier>{ id }))
-+				.then(galleryExtensions => galleryExtensions.map(galleryExtension => this.fromGallery(galleryExtension, maliciousSet)))
-+				.then(extensions => [...this.local, ...extensions])
-+				.then(extensions => {
-+					const map = new Map<string, IExtension>();
-+					for (const extension of extensions) {
-+						map.set(extension.id, extension);
-+					}
-+					return new ExtensionDependencies(extension, extension.id, map);
-+				});
-+		});
-+>>>>>>> .their
- 	}
- 
- 	open(extension: IExtension, sideByside: boolean = false): TPromise<any> {
- 		return this.editorService.openEditor(this.instantiationService.createInstance(ExtensionsInput, extension), null, sideByside ? SIDE_GROUP : ACTIVE_GROUP);
- 	}
- 
-+<<<<<<< .our
- 	private getDistinctInstalledExtensions(allInstalled: ILocalExtension[]): TPromise<ILocalExtension[]> {
- 		if (!this.hasDuplicates(allInstalled)) {
- 			return TPromise.as(allInstalled);
-@@ -550,6 +596,11 @@
- 	private fromGallery(gallery: IGalleryExtension, maliciousExtensionSet: Set<string>): Extension {
- 		let result = this.getInstalledExtensionMatchingGallery(gallery);
- 
-+=======
-+	private fromGallery(gallery: IGalleryExtension, maliciousExtensionSet: Set<string>): Extension {
-+		let result = this.getInstalledExtensionMatchingGallery(gallery);
-+
-+>>>>>>> .their
- 		if (result) {
- 			// Loading the compatible version only there is an engine property
- 			// Otherwise falling back to old way so that we will not make many roundtrips
-@@ -560,6 +611,7 @@
- 				this.syncLocalWithGalleryExtension(result, gallery);
- 			}
- 		} else {
-+<<<<<<< .our
- 			result = new Extension(this.galleryService, this.stateProvider, [], gallery, this.telemetryService);
- 		}
- 
-@@ -567,6 +619,15 @@
- 			result.isMalicious = true;
- 		}
- 
-+=======
-+			result = new Extension(this.galleryService, this.stateProvider, null, gallery, this.telemetryService);
-+		}
-+
-+		if (maliciousExtensionSet.has(result.id)) {
-+			result.isMalicious = true;
-+		}
-+
-+>>>>>>> .their
- 		return result;
- 	}
- 
-@@ -683,6 +744,10 @@
- 			return TPromise.wrapError<void>(new Error(nls.localize('malicious', "This extension is reported to be problematic.")));
- 		}
- 
-+		if (extension.isMalicious) {
-+			return TPromise.wrapError<void>(new Error(nls.localize('malicious', "This extension is reported to be malicious.")));
-+		}
-+
- 		const ext = extension as Extension;
- 		const gallery = ext.gallery;
- 
-changed in both
-  base   100644 f6f9b37077edcb473c75596790332fb64fc36eb9 src/vs/workbench/parts/extensions/test/electron-browser/extensionsActions.test.ts
-  our    100644 5b724133ed51078a1e1b0fb3ea5ca5ed83b75210 src/vs/workbench/parts/extensions/test/electron-browser/extensionsActions.test.ts
-  their  100644 f9d3bfe229b9a6dc8f20c27e02e44680886068b0 src/vs/workbench/parts/extensions/test/electron-browser/extensionsActions.test.ts
-changed in both
-  base   100644 38d0d179cfe71daac0f88e4ba52804339a307f2b src/vs/workbench/parts/extensions/test/electron-browser/extensionsWorkbenchService.test.ts
-  our    100644 7da387ac880b0ed21957601ffcf9fbb9f1133d6f src/vs/workbench/parts/extensions/test/electron-browser/extensionsWorkbenchService.test.ts
-  their  100644 0b50e4486f5460f5184fac6ae80f5c2fcf165378 src/vs/workbench/parts/extensions/test/electron-browser/extensionsWorkbenchService.test.ts
-changed in both
-  base   100644 ba9c28aa47874054bc556dff89047fa79e917ecd src/vs/workbench/parts/files/common/files.ts
-  our    100644 160584dd829e69af46189f7323935e5658b7b546 src/vs/workbench/parts/files/common/files.ts
-  their  100644 b817c70919265ccb4c615210a4076aa3ade18c6d src/vs/workbench/parts/files/common/files.ts
-@@ -21,8 +21,11 @@
- import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
- import { IViewlet } from 'vs/workbench/common/viewlet';
- import { InputFocusedContextKey } from 'vs/platform/workbench/common/contextkeys';
-+<<<<<<< .our
- import { Registry } from 'vs/platform/registry/common/platform';
- import { IViewContainersRegistry, Extensions as ViewContainerExtensions, ViewContainer } from 'vs/workbench/common/views';
-+=======
-+>>>>>>> .their
- 
- /**
-  * Explorer viewlet id.
-changed in both
-  base   100644 c0da65c8d9bd6d9c33706ee65b6079b09e167076 src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts
-  our    100644 e4e47dce829b4ccdb4020a94d54f200e7ae125da src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts
-  their  100644 a8fa36aa37e1c4aeff5d30aba916d2da60caafc6 src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts
-@@ -32,6 +32,7 @@
- 		@ICommandService private commandService: ICommandService,
- 		@IWorkspaceContextService workspaceContextService: IWorkspaceContextService
- 	) {
-+<<<<<<< .our
- 		super({
- 			getFolderUri: (folderName: string): uri => {
- 				const folder = workspaceContextService.getWorkspace().folders.filter(f => f.name === folderName).pop();
-@@ -75,6 +76,74 @@
- 					return String(lineNumber);
- 				}
- 				return undefined;
-+=======
-+		this._execPath = environmentService.execPath;
-+		Object.keys(envVariables).forEach(key => {
-+			this[`env:${key}`] = envVariables[key];
-+		});
-+	}
-+
-+	private get execPath(): string {
-+		return this._execPath;
-+	}
-+
-+	private get cwd(): string {
-+		if (this.workspaceRoot) {
-+			return this.workspaceRoot;
-+		} else {
-+			return process.cwd();
-+		}
-+	}
-+
-+	private get workspaceRoot(): string {
-+		return this._lastWorkspaceFolder ? this._lastWorkspaceFolder.uri.fsPath : undefined;
-+	}
-+
-+	private get workspaceFolder(): string {
-+		return this.workspaceRoot;
-+	}
-+
-+	private get workspaceRootFolderName(): string {
-+		return this.workspaceFolderBasename;
-+	}
-+
-+	private get workspaceFolderBasename(): string {
-+		return this.workspaceRoot ? paths.basename(this.workspaceRoot) : '';
-+	}
-+
-+	private get file(): string {
-+		return this.getFilePath();
-+	}
-+
-+	private get relativeFile(): string {
-+		return (this.workspaceRoot) ? paths.normalize(relative(this.workspaceRoot, this.file)) : this.file;
-+	}
-+
-+	private get fileBasename(): string {
-+		return paths.basename(this.getFilePath());
-+	}
-+
-+	private get fileBasenameNoExtension(): string {
-+		const basename = this.fileBasename;
-+		return basename.slice(0, basename.length - paths.extname(basename).length);
-+	}
-+
-+	private get fileDirname(): string {
-+		return paths.dirname(this.getFilePath());
-+	}
-+
-+	private get fileExtname(): string {
-+		return paths.extname(this.getFilePath());
-+	}
-+
-+	private get lineNumber(): string {
-+		const activeEditor = this.editorService.getActiveEditor();
-+		if (activeEditor) {
-+			const editorControl = (<ICodeEditor>activeEditor.getControl());
-+			if (editorControl) {
-+				const lineNumber = editorControl.getSelection().positionLineNumber;
-+				return String(lineNumber);
-+>>>>>>> .their
- 			}
- 		}, envVariables);
- 	}
-changed in both
-  base   100644 4e881ab0b2ffa612f2278abbf2e1c43cbbf0e529 src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
-  our    100644 e30e323957d4065215ca39593ac4ac26251c0480 src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
-  their  100644 ca3a08d8a3334ed2c9e27537a9190b64664a5802 src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
-changed in both
-  base   100644 2b77e490063a085b682f2506eafa052eabe1ecef src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.ts
-  our    100644 cff2054ab5aaec57cdb3c546542fc99f7150b4af src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.ts
-  their  100644 0877a0df48a00d1f1ca84244104ba880356fe4ce src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.ts
-changed in both
-  base   100644 01f086dea8d408daebf4dfe7d29c7db591e0e759 src/vs/workbench/services/extensions/electron-browser/extensionService.ts
-  our    100644 6e8576b4e4d7982831e1f1176291fbce937f1bd8 src/vs/workbench/services/extensions/electron-browser/extensionService.ts
-  their  100644 61e94c5ba2d8076415df1c69cbd0aeaa7fb30cf1 src/vs/workbench/services/extensions/electron-browser/extensionService.ts
-@@ -468,6 +468,7 @@
- 	}
- 
- 	public canProfileExtensionHost(): boolean {
-+<<<<<<< .our
- 		for (let i = 0, len = this._extensionHostProcessManagers.length; i < len; i++) {
- 			const extHostProcessManager = this._extensionHostProcessManagers[i];
- 			if (extHostProcessManager.canProfileExtensionHost()) {
-@@ -475,6 +476,9 @@
- 			}
- 		}
- 		return false;
-+=======
-+		return this._extensionHostProcessWorker && Boolean(this._extensionHostProcessWorker.getInspectPort());
-+>>>>>>> .their
- 	}
- 
- 	public startExtensionHostProfile(): TPromise<ProfileSession> {
-changed in both
-  base   100644 4518ccc5c3aa315c8b1f15a79cc02334cb5b9935 src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts
-  our    100644 91a9a231ffa002c93656e368704ae04c54f6e8d1 src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts
-  their  100644 b7575a825ceb767e89745c8af97c1e94326be48f src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts
-@@ -592,7 +592,26 @@
- 	order: 7.2,
- 	type: 'object',
- 	properties: {
-+<<<<<<< .our
- 		[CUSTOM_EDITOR_COLORS_SETTING]: customEditorColorSchema
-+=======
-+		[CUSTOM_EDITOR_COLORS_SETTING]: {
-+			type: 'object',
-+			description: nls.localize('editorColors', "Overrides editor colors and font style from the currently selected color theme."),
-+			default: {},
-+			additionalProperties: false,
-+			properties: {
-+				comments: tokenGroupSettings(nls.localize('editorColors.comments', "Sets the colors and styles for comments")),
-+				strings: tokenGroupSettings(nls.localize('editorColors.strings', "Sets the colors and styles for strings literals.")),
-+				keywords: tokenGroupSettings(nls.localize('editorColors.keywords', "Sets the colors and styles for keywords.")),
-+				numbers: tokenGroupSettings(nls.localize('editorColors.numbers', "Sets the colors and styles for number literals.")),
-+				types: tokenGroupSettings(nls.localize('editorColors.types', "Sets the colors and styles for type declarations and references.")),
-+				functions: tokenGroupSettings(nls.localize('editorColors.functions', "Sets the colors and styles for functions declarations and references.")),
-+				variables: tokenGroupSettings(nls.localize('editorColors.variables', "Sets the colors and styles for variables declarations and references.")),
-+				[CUSTOM_EDITOR_SCOPE_COLORS_SETTING]: colorThemeSchema.tokenColorsSchema(nls.localize('editorColors.textMateRules', 'Sets colors and styles using textmate theming rules (advanced).'))
-+			}
-+		}
-+>>>>>>> .their
- 	}
- };
- configurationRegistry.registerConfiguration(customEditorColorConfiguration);
-changed in both
-  base   100644 9869ebcebb7060f012bad4a286211f5f03611f8b yarn.lock
-  our    100644 b56aa332449f9eb6db4b03a16548d91df21604bb yarn.lock
-  their  100644 f95110eef0888baea8a43cb42c08211394ed8ebe yarn.lock
-@@ -5055,6 +5055,7 @@
-   version "0.6.1"
-   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
- 
-+<<<<<<< .our
- neo-async@^2.5.0:
-   version "2.5.1"
-   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.1.tgz#acb909e327b1e87ec9ef15f41b8a269512ad41ee"
-@@ -5100,6 +5101,11 @@
- node-pre-gyp@^0.10.0:
-   version "0.10.3"
-   resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc"
-+=======
-+node-pty@0.7.4:
-+  version "0.7.4"
-+  resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.7.4.tgz#07146b2b40b76e432e57ce6750bda40f0da5c99f"
-+>>>>>>> .their
-   dependencies:
-     detect-libc "^1.0.2"
-     mkdirp "^0.5.1"
diff --git a/app/test/fixtures/merge-parser/vscode/merge-release-1.20-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-release-1.20-into-master.txt
deleted file mode 100644
index 10a2fe7a2c0..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-release-1.20-into-master.txt
+++ /dev/null
@@ -1,7694 +0,0 @@
-changed in both
-  base   100644 f74918098565c226b0caefe395a4fe02dd4f808f build/builtInExtensions.json
-  our    100644 b3efcd2cc657706605008661521b555c93a32c16 build/builtInExtensions.json
-  their  100644 a3b35277a0d16d4dbbbb572bf484ba9c57d40015 build/builtInExtensions.json
-@@ -1,7 +1,11 @@
- [
- 	{
- 		"name": "ms-vscode.node-debug",
-+<<<<<<< .our
- 		"version": "1.27.2",
-+=======
-+		"version": "1.20.12",
-+>>>>>>> .their
- 		"repo": "https://github.com/Microsoft/vscode-node-debug"
- 	},
- 	{
-changed in both
-  base   100644 240153c168d574c53f2aee7555045d55bfd5ff92 build/gulpfile.vscode.js
-  our    100644 d79071e56bcfc53b3448052cc08bd7247bd7e789 build/gulpfile.vscode.js
-  their  100644 a4916c9360fded5807227a395b41fda382121b95 build/gulpfile.vscode.js
-@@ -538,8 +538,12 @@
- 
- 		const userDataDir = path.join(os.tmpdir(), 'tmpuserdata');
- 		const extensionsDir = path.join(os.tmpdir(), 'tmpextdir');
-+<<<<<<< .our
- 		const appName = process.env.VSCODE_QUALITY === 'insider' ? 'Visual\\ Studio\\ Code\\ -\\ Insiders.app' : 'Visual\\ Studio\\ Code.app';
- 		const appPath = path.join(buildDir, `VSCode-darwin/${appName}/Contents/Resources/app/bin/code`);
-+=======
-+		const appPath = path.join(buildDir, 'VSCode-darwin/Visual\\ Studio\\ Code.app/Contents/Resources/app/bin/code');
-+>>>>>>> .their
- 		const codeProc = cp.exec(`${appPath} --export-default-configuration='${allConfigDetailsPath}' --wait --user-data-dir='${userDataDir}' --extensions-dir='${extensionsDir}'`);
- 
- 		const timer = setTimeout(() => {
-changed in both
-  base   100644 d484484cbdc8135cb1ce39535578e49293b8d1a5 extensions/emmet/src/abbreviationActions.ts
-  our    100644 26444af31e5994ebc9cddebb9de151cacae3311b extensions/emmet/src/abbreviationActions.ts
-  their  100644 0fdfacd41160234a19d07e1e46c2fc0e59e173dc extensions/emmet/src/abbreviationActions.ts
-@@ -394,16 +394,24 @@
- 				&& position.isAfterOrEqual(propertyNode.separatorToken.end)
- 				&& position.isBeforeOrEqual(propertyNode.terminatorToken.start)
- 				&& abbreviation.indexOf(':') === -1) {
-+<<<<<<< .our
- 				return hexColorRegex.test(abbreviation) || abbreviation === '!';
-+=======
-+				return hexColorRegex.test(abbreviation);
-+>>>>>>> .their
- 			}
- 			if (!propertyNode.terminatorToken
- 				&& propertyNode.separator
- 				&& position.isAfterOrEqual(propertyNode.separatorToken.end)
- 				&& abbreviation.indexOf(':') === -1) {
-+<<<<<<< .our
- 				return hexColorRegex.test(abbreviation) || abbreviation === '!';
- 			}
- 			if (hexColorRegex.test(abbreviation) || abbreviation === '!') {
- 				return false;
-+=======
-+				return hexColorRegex.test(abbreviation);
-+>>>>>>> .their
- 			}
- 		}
- 
-changed in both
-  base   100644 39fc7df5755f99433e35390d02c7ac77f0fd087d extensions/emmet/src/test/cssAbbreviationAction.test.ts
-  our    100644 88e993cff9c5d4531d13f69aad65d2ccc984f48f extensions/emmet/src/test/cssAbbreviationAction.test.ts
-  their  100644 4f07358638b63cb73353d9758b3c3758906e706e extensions/emmet/src/test/cssAbbreviationAction.test.ts
-@@ -60,6 +60,7 @@
- 			editor.selections = [new Selection(3, 1, 3, 6), new Selection(5, 1, 5, 6)];
- 			return expandEmmetAbbreviation(null).then(() => {
- 				assert.equal(editor.document.getText(), cssContents.replace(/pos:f/g, 'position: fixed;'));
-+<<<<<<< .our
- 				return Promise.resolve();
- 			});
- 		});
-@@ -84,6 +85,8 @@
- 				if (completionPromise) {
- 					assert.equal(1, 2, `Invalid completion at property value`);
- 				}
-+=======
-+>>>>>>> .their
- 				return Promise.resolve();
- 			});
- 		});
-@@ -339,8 +342,13 @@
- 		return withRandomFileEditor(cssContents, 'css', (editor, doc) => {
- 			editor.selection = new Selection(3, 1, 3, 6);
- 			const cancelSrc = new CancellationTokenSource();
-+<<<<<<< .our
- 			const completionPromise1 = completionProvider.provideCompletionItems(editor.document, new Position(3, 6), cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
- 			const completionPromise2 = completionProvider.provideCompletionItems(editor.document, new Position(5, 6), cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
-+=======
-+			const completionPromise1 = completionProvider.provideCompletionItems(editor.document, new Position(3, 6), cancelSrc.token);
-+			const completionPromise2 = completionProvider.provideCompletionItems(editor.document, new Position(5, 6), cancelSrc.token);
-+>>>>>>> .their
- 			if (!completionPromise1 || !completionPromise2) {
- 				assert.equal(1, 2, `Problem with expanding pos:f`);
- 				return Promise.resolve();
-changed in both
-  base   100644 202d73c4c00e72d222b9eab805caef82f43b3b23 extensions/git/package.json
-  our    100644 712f071eb3a07013f5d0d6a279de9bb561020d87 extensions/git/package.json
-  their  100644 72d29e62dadbc2e69b9731158925c86d5b44f1e2 extensions/git/package.json
-@@ -1196,9 +1196,14 @@
-     "byline": "^5.0.0",
-     "file-type": "^7.2.0",
-     "iconv-lite": "0.4.19",
-+<<<<<<< .our
-     "jschardet": "^1.6.0",
-     "vscode-extension-telemetry": "0.0.18",
-     "vscode-nls": "^3.2.4",
-+=======
-+    "vscode-extension-telemetry": "0.0.8",
-+    "vscode-nls": "^3.2.1",
-+>>>>>>> .their
-     "which": "^1.3.0"
-   },
-   "devDependencies": {
-changed in both
-  base   100644 b7c0719c1320935df55831d836c3f25d30208910 extensions/git/package.nls.json
-  our    100644 bc4c812d75bab82c7f66b4ac04102d4914b8efbe extensions/git/package.nls.json
-  their  100644 67005ce9e704345544e20e0d2f83f188b04effa5 extensions/git/package.nls.json
-@@ -80,8 +80,12 @@
- 	"config.decorations.enabled": "Controls whether Git contributes colors and badges to the explorer and the open editors view.",
- 	"config.promptToSaveFilesBeforeCommit": "Controls whether Git should check for unsaved files before committing.",
- 	"config.showInlineOpenFileAction": "Controls whether to show an inline Open File action in the Git changes view.",
-+<<<<<<< .our
- 	"config.showPushSuccessNotification": "Controls whether to show a notification when a push is successful.",
- 	"config.inputValidation": "Controls when to show commit message input validation.",
-+=======
-+	"config.inputValidation": "Controls when to show input validation.",
-+>>>>>>> .their
- 	"config.detectSubmodules": "Controls whether to automatically detect git submodules.",
- 	"colors.added": "Color for added resources.",
- 	"config.detectSubmodulesLimit": "Controls the limit of git submodules detected.",
-changed in both
-  base   100644 f840f51b49fcf3eb31974563d5685c3b98e57c01 extensions/git/yarn.lock
-  our    100644 cf3f64be85380b9d42abc452055ff323ba258bce extensions/git/yarn.lock
-  their  100644 a5348c49a520fa5794b80bedbb776de443cd8cc3 extensions/git/yarn.lock
-@@ -30,13 +30,9 @@
-   version "1.0.28"
-   resolved "https://registry.yarnpkg.com/@types/which/-/which-1.0.28.tgz#016e387629b8817bed653fe32eab5d11279c8df6"
- 
--applicationinsights@1.0.1:
--  version "1.0.1"
--  resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-1.0.1.tgz#53446b830fe8d5d619eee2a278b31d3d25030927"
--  dependencies:
--    diagnostic-channel "0.2.0"
--    diagnostic-channel-publishers "0.2.1"
--    zone.js "0.7.6"
-+applicationinsights@0.18.0:
-+  version "0.18.0"
-+  resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-0.18.0.tgz#162ebb48a383408bc4de44db32b417307f45bbc1"
- 
- balanced-match@^1.0.0:
-   version "1.0.0"
-@@ -73,16 +69,6 @@
-   dependencies:
-     ms "2.0.0"
- 
--diagnostic-channel-publishers@0.2.1:
--  version "0.2.1"
--  resolved "https://registry.yarnpkg.com/diagnostic-channel-publishers/-/diagnostic-channel-publishers-0.2.1.tgz#8e2d607a8b6d79fe880b548bc58cc6beb288c4f3"
--
--diagnostic-channel@0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/diagnostic-channel/-/diagnostic-channel-0.2.0.tgz#cc99af9612c23fb1fff13612c72f2cbfaa8d5a17"
--  dependencies:
--    semver "^5.3.0"
--
- diff@3.2.0:
-   version "3.2.0"
-   resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9"
-@@ -247,21 +233,24 @@
-   version "1.0.1"
-   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
- 
--semver@^5.3.0:
--  version "5.5.0"
--  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
--
- supports-color@3.1.2:
-   version "3.1.2"
-   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"
-   dependencies:
-     has-flag "^1.0.0"
- 
-+<<<<<<< .our
- vscode-extension-telemetry@0.0.18:
-   version "0.0.18"
-   resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.18.tgz#602ba20d8c71453aa34533a291e7638f6e5c0327"
-+=======
-+vscode-extension-telemetry@0.0.8:
-+  version "0.0.8"
-+  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.8.tgz#2261bff986b6690a6f1f746a45ac5bd1f85d29e0"
-+>>>>>>> .their
-   dependencies:
--    applicationinsights "1.0.1"
-+    applicationinsights "0.18.0"
-+    winreg "1.2.3"
- 
- vscode-nls@^3.2.4:
-   version "3.2.4"
-@@ -273,10 +262,10 @@
-   dependencies:
-     isexe "^2.0.0"
- 
-+winreg@1.2.3:
-+  version "1.2.3"
-+  resolved "https://registry.yarnpkg.com/winreg/-/winreg-1.2.3.tgz#93ad116b2696da87d58f7265a8fcea5254a965d5"
-+
- wrappy@1:
-   version "1.0.2"
-   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
--
--zone.js@0.7.6:
--  version "0.7.6"
--  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.7.6.tgz#fbbc39d3e0261d0986f1ba06306eb3aeb0d22009"
-changed in both
-  base   100644 a8bbb91b7613c4e23f075182382e69177815890b extensions/html/package.json
-  our    100644 5bcc9be5877c773efa5d16e5dc79ee66b4fba518 extensions/html/package.json
-  their  100644 d28af119e6f74c48242371546ba9f74aa482714e extensions/html/package.json
-@@ -66,6 +66,18 @@
-         "language": "html",
-         "path": "./snippets/html.snippets.json"
-       }
-+<<<<<<< .our
-     ]
-+=======
-+    }
-+  },
-+  "dependencies": {
-+    "vscode-extension-telemetry": "0.0.8",
-+    "vscode-languageclient": "^3.5.0",
-+    "vscode-nls": "^3.2.1"
-+  },
-+  "devDependencies": {
-+    "@types/node": "7.0.43"
-+>>>>>>> .their
-   }
- }
-removed in local
-  base   100644 47c5c2e51b717cefb936d0f55ab3ae6de64bc62d extensions/html/yarn.lock
-  their  100644 e21fadd6db7c7454df5a669b3560d283a9089f42 extensions/html/yarn.lock
-changed in both
-  base   100644 5b9b79b5c1191566cb7a55573fbf0ad740fc4dd9 extensions/json/package.json
-  our    100644 af9024bfde9123390d1583e73a5ad460ae6c9ea8 extensions/json/package.json
-  their  100644 69a6dcbabaffad169db72a8e25eb0e789f16b13d extensions/json/package.json
-@@ -67,6 +67,92 @@
-         "fileMatch": "*.schema.json",
-         "url": "http://json-schema.org/draft-04/schema#"
-       }
-+<<<<<<< .our
-     ]
-+=======
-+    ],
-+    "configuration": {
-+      "id": "json",
-+      "order": 20,
-+      "type": "object",
-+      "title": "JSON",
-+      "properties": {
-+        "json.schemas": {
-+          "type": "array",
-+          "scope": "resource",
-+          "description": "%json.schemas.desc%",
-+          "items": {
-+            "type": "object",
-+            "default": {
-+              "fileMatch": [
-+                "/myfile"
-+              ],
-+              "url": "schemaURL"
-+            },
-+            "properties": {
-+              "url": {
-+                "type": "string",
-+                "default": "/user.schema.json",
-+                "description": "%json.schemas.url.desc%"
-+              },
-+              "fileMatch": {
-+                "type": "array",
-+                "items": {
-+                  "type": "string",
-+                  "default": "MyFile.json",
-+                  "description": "%json.schemas.fileMatch.item.desc%"
-+                },
-+                "minItems": 1,
-+                "description": "%json.schemas.fileMatch.desc%"
-+              },
-+              "schema": {
-+                "$ref": "http://json-schema.org/draft-04/schema#",
-+                "description": "%json.schemas.schema.desc%"
-+              }
-+            }
-+          }
-+        },
-+        "json.format.enable": {
-+          "type": "boolean",
-+          "scope": "window",
-+          "default": true,
-+          "description": "%json.format.enable.desc%"
-+        },
-+        "json.trace.server": {
-+          "type": "string",
-+          "scope": "window",
-+          "enum": [
-+            "off",
-+            "messages",
-+            "verbose"
-+          ],
-+          "default": "off",
-+          "description": "%json.tracing.desc%"
-+        },
-+        "json.colorDecorators.enable": {
-+          "type": "boolean",
-+          "scope": "window",
-+          "default": true,
-+          "description": "%json.colorDecorators.enable.desc%",
-+          "deprecationMessage": "%json.colorDecorators.enable.deprecationMessage%"
-+        }
-+      }
-+    },
-+    "configurationDefaults": {
-+      "[json]": {
-+        "editor.quickSuggestions": {
-+          "strings": true
-+        }
-+      }
-+    }
-+  },
-+  "dependencies": {
-+    "vscode-extension-telemetry": "0.0.8",
-+    "vscode-languageclient": "^3.5.0",
-+    "vscode-nls": "^3.2.1"
-+  },
-+  "devDependencies": {
-+    "@types/node": "7.0.43"
-+>>>>>>> .their
-   }
- }
-removed in local
-  base   100644 47c5c2e51b717cefb936d0f55ab3ae6de64bc62d extensions/json/yarn.lock
-  their  100644 e21fadd6db7c7454df5a669b3560d283a9089f42 extensions/json/yarn.lock
-removed in local
-  base   100644 ec99b44b91d51d43a7e7ce480c306765798adb13 extensions/markdown/package.json
-  their  100644 f6961eed26e7fe612bc24ab427a2c3d45020a34b extensions/markdown/package.json
-removed in local
-  base   100644 b1ed9e8c9a1b99a6ba7c6cc731578b6f759010f4 extensions/markdown/yarn.lock
-  their  100644 c88a44add56d5e4ce96e482d176b22c2afa43bc9 extensions/markdown/yarn.lock
-changed in both
-  base   100644 146b7fd061a9878ab2b1741dd96d98df6904b124 extensions/merge-conflict/package.json
-  our    100644 81b65c21ac62f3d1237abb6a363f0644349d8408 extensions/merge-conflict/package.json
-  their  100644 9445d17a812bf2334d997119e66109339acebdb3 extensions/merge-conflict/package.json
-@@ -100,7 +100,12 @@
-     }
-   },
-   "dependencies": {
-+<<<<<<< .our
-     "vscode-nls": "^3.2.4"
-+=======
-+    "vscode-extension-telemetry": "0.0.8",
-+    "vscode-nls": "^3.2.1"
-+>>>>>>> .their
-   },
-   "devDependencies": {
-     "@types/node": "8.0.33"
-changed in both
-  base   100644 74ebd7c4fcfcc1dc36d48a77d0aefa622f17c905 extensions/merge-conflict/yarn.lock
-  our    100644 5b1dccc447c34e2e61ebbf9b7966bc495f7fb97f extensions/merge-conflict/yarn.lock
-  their  100644 ecb3d8de216c9e7eab37a06453f22837e894a46e extensions/merge-conflict/yarn.lock
-@@ -6,6 +6,27 @@
-   version "8.0.33"
-   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.33.tgz#1126e94374014e54478092830704f6ea89df04cd"
- 
-+<<<<<<< .our
- vscode-nls@^3.2.4:
-   version "3.2.4"
-   resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398"
-+=======
-+applicationinsights@0.18.0:
-+  version "0.18.0"
-+  resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-0.18.0.tgz#162ebb48a383408bc4de44db32b417307f45bbc1"
-+
-+vscode-extension-telemetry@0.0.8:
-+  version "0.0.8"
-+  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.8.tgz#2261bff986b6690a6f1f746a45ac5bd1f85d29e0"
-+  dependencies:
-+    applicationinsights "0.18.0"
-+    winreg "1.2.3"
-+
-+vscode-nls@^3.2.1:
-+  version "3.2.1"
-+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.1.tgz#b1f3e04e8a94a715d5a7bcbc8339c51e6d74ca51"
-+
-+winreg@1.2.3:
-+  version "1.2.3"
-+  resolved "https://registry.yarnpkg.com/winreg/-/winreg-1.2.3.tgz#93ad116b2696da87d58f7265a8fcea5254a965d5"
-+>>>>>>> .their
-removed in local
-  base   100644 3a94a50c4c3c3c9116c117b5b65f1d827692a71a extensions/typescript/package.json
-  their  100644 e876f7e3be79aaf2a54ab9ffcd5cf6b737601cbc extensions/typescript/package.json
-removed in local
-  base   100644 0fcc8a28cac0b15db4afa7fd7a682bc5d5b516e2 extensions/typescript/yarn.lock
-  their  100644 9e1bb7b96b0f41ffb035e7126b71468805a46796 extensions/typescript/yarn.lock
-changed in both
-  base   100644 fdf800049a7f48222acef8ef8806168078c35788 extensions/yaml/package.json
-  our    100644 79e2eecc31646fe12c00f40cc1ed32d3dfc3b18e extensions/yaml/package.json
-  their  100644 7c51745068386b3a8c63114c34129f333c4e0371 extensions/yaml/package.json
-@@ -38,8 +38,13 @@
- 		"configurationDefaults": {
- 			"[yaml]": {
- 				"editor.insertSpaces": true,
-+<<<<<<< .our
- 				"editor.tabSize": 2,
- 				"editor.autoIndent": false
-+=======
-+                "editor.tabSize": 2,
-+                "editor.autoIndent": false
-+>>>>>>> .their
- 			}
- 		}
- 	}
-changed in both
-  base   100644 57a9f3b0e8a3db3f23dd67eabe65110bdf6f22c7 i18n/chs/extensions/emmet/package.i18n.json
-  our    100644 5cf0382870fbe5abfd1dea23749ad88b51794f9a i18n/chs/extensions/emmet/package.i18n.json
-  their  100644 c2361746c994692fd514ca5f6cd85a2e0584b758 i18n/chs/extensions/emmet/package.i18n.json
-@@ -56,10 +56,17 @@
- 	"emmetPreferencesFormatNoIndentTags": "表示不应向内缩进的标记名称数组",
- 	"emmetPreferencesFormatForceIndentTags": "表示应始终向内缩进的标记名称数组",
- 	"emmetPreferencesAllowCompactBoolean": "若为 \"true\"，将生成紧凑型布尔属性",
-+<<<<<<< .our
- 	"emmetPreferencesCssWebkitProperties": "Emmet 缩写中使用的由 \"-\" 打头有 \"webkit\" 前缀的 CSS 属性，使用半角逗号 (\",\") 进行分隔。若要始终避免 \"webkit\" 前缀，请设为空字符串。",
- 	"emmetPreferencesCssMozProperties": "Emmet 缩写中使用的由 \"-\" 打头有 \"moz\" 前缀的 CSS 属性，使用半角逗号 (\",\") 进行分隔。若要始终避免 \"moz\" 前缀，请设为空字符串。",
- 	"emmetPreferencesCssOProperties": "Emmet 缩写中使用的由 \"-\" 打头有 \"o\" 前缀的 CSS 属性，使用半角逗号 (\",\") 进行分隔。若要始终避免 \"o\" 前缀，请设为空字符串。",
- 	"emmetPreferencesCssMsProperties": "Emmet 缩写中使用的由 \"-\" 打头有 \"ms\" 前缀的 CSS 属性，使用半角逗号 (\",\") 进行分隔。若要始终避免 \"ms\" 前缀，请设为空字符串。",
- 	"emmetPreferencesCssFuzzySearchMinScore": "显示的缩写模糊匹配应达到的最低分数 (0 到 1 之间)。较低的值可能使匹配错误变多，较高的值可能将不会显示应有的匹配项。",
- 	"emmetOptimizeStylesheetParsing": "当设置为 false 时，将分析整个文件并确定当前位置能否展开 Emmet 缩写。当设置为 true 时，则仅在 CSS/SCSS/LESS 文件中进行分析。"
-+=======
-+	"emmetPreferencesCssWebkitProperties": "Emmet 缩写中使用的由 \"-\" 打头有 webkit 前缀的 CSS 属性，使用半角逗号 (\",\") 进行分隔。若要始终避免 webkit 前缀，请设为空字符串。",
-+	"emmetPreferencesCssMozProperties": "Emmet 缩写中使用的由 \"-\" 打头有 moz 前缀的 CSS 属性，使用半角逗号 (\",\") 进行分隔。若要始终避免 moz 前缀，请设为空字符串。",
-+	"emmetPreferencesCssOProperties": "Emmet 缩写中使用的由 \"-\" 打头有 o 前缀的 CSS 属性，使用半角逗号 (\",\") 进行分隔。若要始终避免 o 前缀，请设为空字符串。",
-+	"emmetPreferencesCssMsProperties": "Emmet 缩写中使用的由 \"-\" 打头有 ms 前缀的 CSS 属性，使用半角逗号 (\",\") 进行分隔。若要始终避免 ms 前缀，请设为空字符串。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 2288b8204dd504596d0ae9603e76cba5eaf0d0a5 i18n/chs/extensions/git/package.i18n.json
-  our    100644 7c2a3b49c9f848f60d2957657294486b061a17aa i18n/chs/extensions/git/package.i18n.json
-  their  100644 0cdad2f98361e819c443b290826ba8bf5ac264dc i18n/chs/extensions/git/package.i18n.json
-@@ -75,9 +75,14 @@
- 	"config.decorations.enabled": "控制 Git 是否向资源管理器和“打开的编辑器”视图添加颜色和小标。",
- 	"config.promptToSaveFilesBeforeCommit": "控制 Git 是否在提交之前检查未保存的文件。",
- 	"config.showInlineOpenFileAction": "控制是否在 Git 更改视图中显示内联“打开文件”操作。",
-+<<<<<<< .our
- 	"config.inputValidation": "控制何时显示提交消息输入验证。",
- 	"config.detectSubmodules": "控制是否自动检测 Git 子模块。",
- 	"config.detectSubmodulesLimit": "控制可检测到的 Git 子模块的限制。",
-+=======
-+	"config.inputValidation": "控制何时显示输入验证输入计数。",
-+	"config.detectSubmodules": "控制是否自动检测 Git 子模块。",
-+>>>>>>> .their
- 	"colors.modified": "已修改资源的颜色。",
- 	"colors.deleted": "已删除资源的颜色。",
- 	"colors.untracked": "未跟踪资源的颜色。",
-changed in both
-  base   100644 a28934c2fcd6b7fd2e5cab686c805d154cedf7a5 i18n/chs/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  our    100644 537865041fd9d9e7add3c0c70d9f4ea7e9031aa5 i18n/chs/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  their  100644 f8697fc1e562ee990bc50884551fa8c4c22e0a54 i18n/chs/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-@@ -12,6 +12,7 @@
- 	"loadingData": "正在加载数据...",
- 	"rateLimited": "超出 GitHub 查询限制。请稍候。",
- 	"similarIssues": "类似的问题",
-+<<<<<<< .our
- 	"open": "开放",
- 	"closed": "已关闭",
- 	"noSimilarIssues": "没有找到类似问题",
-@@ -19,6 +20,10 @@
- 	"bugReporter": "问题报告",
- 	"featureRequest": "功能请求",
- 	"performanceIssue": "性能问题",
-+=======
-+	"noResults": "未找到结果",
-+	"rateLimited": "已超出 API 速率限制",
-+>>>>>>> .their
- 	"stepsToReproduce": "重现步骤",
- 	"bugDescription": "请分享能稳定重现此问题的必要步骤，并包含实际和预期的结果。我们支持 GitHub 版的 Markdown。您将能在 GitHub 上预览时编辑这个问题并添加截图。",
- 	"performanceIssueDesciption": "这个性能问题是在什么时候发生的? 是在启动时，还是在一系列特定的操作之后? 我们支持 GitHub 版的 Markdown。您将能在 GitHub 上预览时编辑这个问题并添加截图。",
-changed in both
-  base   100644 c3c6010d74239476feab526789931d1875dd906f i18n/chs/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  our    100644 b6a3844bc2b71bffc0711363af03fd28279e2538 i18n/chs/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  their  100644 59fb7b9b4c4c7eb8c517c23c379ba85e4bc39a8c i18n/chs/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-@@ -16,6 +16,7 @@
- 	"chooseExtension": "扩展",
- 	"issueTitleLabel": "标题",
- 	"issueTitleRequired": "请输入标题。",
-+<<<<<<< .our
- 	"titleLengthValidation": "标题太长。",
- 	"details": "请输入详细信息。",
- 	"sendSystemInfo": "包含系统信息 ({0})",
-@@ -25,4 +26,19 @@
- 	"sendExtensions": "包含已启用的扩展 ({0})",
- 	"sendSearchedExtensions": "发送已搜索的扩展 ({0})",
- 	"sendSettingsSearchDetails": "发送设置搜索的详细信息 ({0})"
-+=======
-+	"vscodeVersion": "VS Code 版本",
-+	"osVersion": "操作系统版本",
-+	"systemInfo": "我的系统信息",
-+	"sendData": "发送我的数据",
-+	"processes": "当前运行的进程",
-+	"workspaceStats": "我的工作区数据",
-+	"extensions": "我的扩展",
-+	"tryDisablingExtensions": "此问题可在禁用扩展后重现",
-+	"disableExtensions": "禁用所有扩展并重新加载窗口",
-+	"showRunningExtensions": "查看所有运行中的扩展",
-+	"githubMarkdown": "我们支持 GitHub 版 Markdown。您将能在 GitHub 上预览时编辑问题并添加截图。",
-+	"issueDescriptionRequired": "请输入说明。",
-+	"loadingData": "正在加载数据..."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d22aea0f7d1bdec4a2fba57991e97486576de36d i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 e4c993e2df857650110681bbfaaa48507f4e2ec6 i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 8bdf62702ee633c98cd8f6d2c973b071b7e99359 i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json
-changed in both
-  base   100644 95889a422aa0136ee59fae90ebcf78f332268105 i18n/chs/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 9b8e352f2e01c71634dfc189a8ddc9dc7485da94 i18n/chs/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 88b6e5587e7b75d87bd93a6f34bea822bf98e3e1 i18n/chs/src/vs/platform/environment/node/argv.i18n.json
-changed in both
-  base   100644 09bafab2ad912e9c1d3865ed00974e0a79ceef5a i18n/chs/src/vs/platform/list/browser/listService.i18n.json
-  our    100644 58e15e4f2c017b91848e29078a0b069f6a68fae6 i18n/chs/src/vs/platform/list/browser/listService.i18n.json
-  their  100644 9131b6edaea9b142b99d6654beac1684b4ff4ba4 i18n/chs/src/vs/platform/list/browser/listService.i18n.json
-@@ -12,6 +12,10 @@
- 	"multiSelectModifier": "在通过鼠标多选树和列表条目时使用的修改键 (例如资源管理器、打开的编辑器和源代码管理视图)。\"ctrlCmd\" 在 Windows 和 Linux 上会映射为 \"Ctrl\" ，在 macOS 上会映射为 \"Command\" 。“在侧边打开”功能所需的鼠标动作 (若可用) 将会相应调整，不与多选修改键冲突。",
- 	"openMode.singleClick": "在鼠标单击时打开项目。",
- 	"openMode.doubleClick": "在鼠标双击时打开项目。",
-+<<<<<<< .our
- 	"openModeModifier": "控制如何在受支持的树和列表中使用鼠标来打开项目。设置为 \"singleClick\" 可单击打开项目，\"doubleClick\" 仅可双击打开项目。对于树中含子节点的节点，此设置将控制使用单击还是双击来展开他们。注意，某些不适用此项的树或列表可能会忽略此设置。",
- 	"horizontalScrolling setting": "控制工作台中的树控件是否支持水平滚动。"
-+=======
-+	"openModeModifier": "控制如何在受支持的树和列表中使用鼠标来打开项目。设置为 \"singleClick\" 可单击打开项目，\"doubleClick\" 仅可双击打开项目。对于树中含子节点的节点，此设置将控制使用单击还是双击来展开他们。注意，某些不适用此项的树或列表可能会忽略此设置。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 abdefe892e432c1b5af253cf5f626fe7fd2e0580 i18n/chs/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
-  our    100644 041d404a5fbbd09bbd33c6eddf81f47a969a7de3 i18n/chs/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
-  their  100644 4962fa0f678f13e039d11e1c7e3e4fecc199f93b i18n/chs/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
-@@ -11,7 +11,11 @@
- 	"sizeMB": "{0} MB",
- 	"sizeGB": "{0} GB",
- 	"sizeTB": "{0} TB",
-+<<<<<<< .our
- 	"largeImageError": "图片太大，无法在编辑器中显示 ({0})。 ",
-+=======
-+	"largeImageError": "图像文件太大 (>1 MB)，无法在编辑器中显示。",
-+>>>>>>> .their
- 	"resourceOpenExternalButton": "使用外部程序打开图片？",
- 	"nativeFileTooLargeError": "文件太大，无法在编辑器中显示 ({0})。",
- 	"nativeBinaryError": "此文件是二进制文件或使用了不支持的文本编码，无法在编辑器中显示。",
-changed in both
-  base   100644 c576f96ab88234bfe1f31b01e0ea14a5b8fff88f i18n/chs/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  our    100644 6d8451561beae9b6de9d16f8e428c5a1d25661fb i18n/chs/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  their  100644 0c12f9f2c62f50622a4477132a157313309e684a i18n/chs/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-changed in both
-  base   100644 5a7de66c0324b5ac438c3a5ec82e77c54e4415fd i18n/chs/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  our    100644 03b2d9ae25a9da0fcddda65a5fb57f5675194f51 i18n/chs/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  their  100644 766e2d44d8c3ce63c2b0155f080f33a4226dd0e6 i18n/chs/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-@@ -17,8 +17,13 @@
- 	"changeLabel": "更改按键绑定",
- 	"addLabel": "添加按键绑定",
- 	"removeLabel": "删除键绑定",
-+<<<<<<< .our
- 	"resetLabel": "重置按键绑定",
- 	"showSameKeybindings": "显示相同的按键绑定",
-+=======
-+	"resetLabel": "重置键绑定",
-+	"showSameKeybindings": "显示相同的键绑定",
-+>>>>>>> .their
- 	"copyLabel": "复制",
- 	"copyCommandLabel": "拷贝命令",
- 	"error": "编辑按键绑定时发生错误“{0}”。请打开 \"keybindings.json\" 文件并检查错误。",
-changed in both
-  base   100644 2bed199f9ddbecfd922979119ed5894da7a66369 i18n/chs/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 61397c437f22149a7bd941ec158bc6fa9182474a i18n/chs/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 c8d72205ef60ff310061a9916d3bd5a0675b1a0f i18n/chs/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -30,6 +30,10 @@
- 	"search.quickOpen.includeSymbols": "配置为在 Quick Open 文件结果中包括全局符号搜索的结果。",
- 	"search.followSymlinks": "控制是否在搜索中跟踪符号链接。",
- 	"search.smartCase": "若搜索词全为小写，则不区分大小写进行搜索，否则区分大小写进行搜索",
-+<<<<<<< .our
- 	"search.globalFindClipboard": "控制“搜索”视图是否读取或修改 macOS 的共享查找剪贴板",
- 	"search.location": "控制搜索功能显示在侧边栏还是水平空间更大的面板区域"
-+=======
-+	"search.globalFindClipboard": "控制“搜索”侧边栏面板是否读取或修改 macOS 的共享查找剪贴板"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 61efd333f2752a49292ca8d5dfdb5fc06f761bfe i18n/cht/extensions/emmet/package.i18n.json
-  our    100644 b3dc8be8bb9ec8fba170590d50c4692dadd9f40f i18n/cht/extensions/emmet/package.i18n.json
-  their  100644 ef83be7500ba621cb076ecebc103fb563ada0eb5 i18n/cht/extensions/emmet/package.i18n.json
-@@ -56,10 +56,17 @@
- 	"emmetPreferencesFormatNoIndentTags": "陣列的標籤名稱不應向內縮排",
- 	"emmetPreferencesFormatForceIndentTags": "陣列的標籤名稱應總是向內縮排",
- 	"emmetPreferencesAllowCompactBoolean": "若為 true，則生成布林屬性的嚴謹表示法",
-+<<<<<<< .our
- 	"emmetPreferencesCssWebkitProperties": "在以 `-` 開頭的 Emmet 縮寫中使用時，會取得 'webkit' 廠商前綴的逗點分隔 CSS 屬性。設定為空白字串可避免總是取得 'webkit' 前綴。",
- 	"emmetPreferencesCssMozProperties": "在以 `-` 開頭的 Emmet 縮寫中使用時，會取得 'moz' 廠商前綴的逗點分隔 CSS 屬性。設定為空白字串可避免總是取得 'moz' 前綴。",
- 	"emmetPreferencesCssOProperties": "在以 `-` 開頭的 Emmet 縮寫中使用時，會取得 'o' 廠商前綴的逗點分隔 CSS 屬性。設定為空白字串可避免總是取得 'o' 前綴。",
- 	"emmetPreferencesCssMsProperties": "在以 `-` 開頭的 Emmet 縮寫中使用時，會取得 'ms' 廠商前綴的逗點分隔 CSS 屬性。設定為空白字串可避免總是取得 'ms' 前綴。",
- 	"emmetPreferencesCssFuzzySearchMinScore": "模糊比對的縮寫應該達到最低分數(從 0 到 1)。較低數值可能產生錯誤的比對，較高的數值可能會降低可能的比對。",
- 	"emmetOptimizeStylesheetParsing": "當設定為 false 時，將解析整個檔案以確定目前的位置是否適用於展開 Emmet 縮寫。當設定為 true 時，僅會解析 css/scss/less 檔案中目前位置周圍的內容。"
-+=======
-+	"emmetPreferencesCssWebkitProperties": "在以 `-` 開頭的 Emmet 縮寫中使用時，會取得 Webkit 廠商首碼的逗點分隔 CSS 屬性。設定為空白字串可避免一律取得 Webkit 首碼。",
-+	"emmetPreferencesCssMozProperties": "在以 `-` 開頭的 Emmet 縮寫中使用時，會取得 moz 廠商首碼的逗點分隔 CSS 屬性。設定為空白字串可避免一律取得 moz 首碼。",
-+	"emmetPreferencesCssOProperties": "在以 `-` 開頭的 Emmet 縮寫中使用時，會取得 o 廠商首碼的逗點分隔 CSS 屬性。設定為空白字串可避免一律取得 o 首碼。",
-+	"emmetPreferencesCssMsProperties": "在以 `-` 開頭的 Emmet 縮寫中使用時，會取得 ms 廠商首碼的逗點分隔 CSS 屬性。設定為空白字串可避免一律取得 ms 首碼。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 07eacdf3e93a5d702b40493d91bee2cb7f329254 i18n/cht/extensions/git/package.i18n.json
-  our    100644 bc042cb15d8c15d6c5568f5c08f9df112417a23c i18n/cht/extensions/git/package.i18n.json
-  their  100644 c27eba7ac4114d112a9af4bdf437a2034be212a3 i18n/cht/extensions/git/package.i18n.json
-@@ -75,9 +75,14 @@
- 	"config.decorations.enabled": "控制 Git 是否提供色彩及徽章給總管及開啟編輯器視窗。",
- 	"config.promptToSaveFilesBeforeCommit": "控制Git是否應該在提交之前檢查未儲存的檔案。",
- 	"config.showInlineOpenFileAction": "控制是否在Git變更列表中的檔名旁顯示“開啟檔案”的動作按鈕。",
-+<<<<<<< .our
- 	"config.inputValidation": "控制何時顯示認可訊息輸入驗證。",
- 	"config.detectSubmodules": "控制是否自動偵測 Git 子模組。",
- 	"config.detectSubmodulesLimit": "控制 Git 子模組的偵測限制",
-+=======
-+	"config.inputValidation": "控制顯示輸入驗證輸入計數器的時機。",
-+	"config.detectSubmodules": "控制是否自動偵測 Git 子模組。",
-+>>>>>>> .their
- 	"colors.modified": "修改資源的顏色。",
- 	"colors.deleted": "刪除資源的顏色",
- 	"colors.untracked": "未追蹤資源的顏色。",
-changed in both
-  base   100644 6024fb1b9b1af4696c6e3562f62f3e47a84d3a36 i18n/cht/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  our    100644 09acbc3ec19efc71b5dc84e5cced32f46de70cc7 i18n/cht/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  their  100644 1fd8767fb1e242dd45ab14d3937a1925564d588f i18n/cht/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-@@ -12,6 +12,7 @@
- 	"loadingData": "正在載入資料...",
- 	"rateLimited": "超出了 GitHub 查詢限制。請稍候。",
- 	"similarIssues": "相似的問題",
-+<<<<<<< .our
- 	"open": "開啟",
- 	"closed": "已關閉",
- 	"noSimilarIssues": "未發現相似的問題",
-@@ -27,5 +28,13 @@
- 	"expectedResults": "預期的結果",
- 	"settingsSearchResultsDescription": "請列出您以此查詢進行搜尋時，預期看到的結果。我們支援 GitHub 慣用的 Markdown 語言。當我們在 GitHub 上進行預覽時，您仍可編輯問題和新增螢幕擷取畫面。",
- 	"pasteData": "因為必要資料太大，我們已為您將其寫入您的剪貼簿。請貼上。",
-+=======
-+	"noResults": "找不到結果",
-+	"rateLimited": "已超過 API 率限制",
-+	"stepsToReproduce": "重現的步驟",
-+	"bugDescription": "您是如何碰到此問題的? 您需要執行哪些步驟確實重現該問題? 您預期發生與實際發生的情形為何?",
-+	"performanceIssueDesciption": "此效能問題何時發生? 舉例來說，該問題是否於啟動時或在特定一系列動作後發生? 您所能提供的任何詳細資料皆可協助我們調查。",
-+	"description": "描述",
-+>>>>>>> .their
- 	"disabledExtensions": "延伸模組已停用"
- }
-\ No newline at end of file
-changed in both
-  base   100644 83e08f9540b15034bff92c84d6cb6cf46c88787a i18n/cht/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  our    100644 59aba8fe0868aff03d0f93f784ef209442ed8b55 i18n/cht/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  their  100644 6ddb81e8cc0e2ac3ec3eb389c4cd5d997527c60d i18n/cht/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-@@ -7,6 +7,7 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"completeInEnglish": "請用英語填寫這張表格。",
-+<<<<<<< .our
- 	"issueTypeLabel": "這是一個",
- 	"issueSourceLabel": "檔案，位於",
- 	"vscode": "Visual Studio Code",
-@@ -25,4 +26,25 @@
- 	"sendExtensions": "包含我已啟用擴充功能 ({0})",
- 	"sendSearchedExtensions": "傳送已搜尋的擴充功能 ({0})",
- 	"sendSettingsSearchDetails": "傳送設置搜尋詳細資料 ({0})"
-+=======
-+	"issueTypeLabel": "我想要提交",
-+	"bugReporter": "Bug 報告",
-+	"performanceIssue": "效能問題",
-+	"featureRequest": "功能要求",
-+	"issueTitleLabel": "標題",
-+	"issueTitleRequired": "請輸入標題。",
-+	"vscodeVersion": "VS Code 版本",
-+	"osVersion": "作業系統版本",
-+	"systemInfo": "我的系統資訊",
-+	"sendData": "傳送我的資料",
-+	"processes": "目前執行的程序",
-+	"workspaceStats": "我的工作區統計資料",
-+	"extensions": "我的擴充功能",
-+	"tryDisablingExtensions": "延伸模組停用時問題仍會發生",
-+	"disableExtensions": "停用所有延伸模組並重新載入視窗",
-+	"showRunningExtensions": "查看所有正在執行的擴充功能",
-+	"githubMarkdown": "我們支援 GitHub 樣式的 Markdown。您將能夠編輯您的問題，並在 GitHub預覽時增加銀幕截圖。",
-+	"issueDescriptionRequired": "請輸入描述。",
-+	"loadingData": "正在載入資料..."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 fcb3d1a5e80dfb016325ad434fa3bb6a06a14bc0 i18n/cht/src/vs/code/electron-main/logUploader.i18n.json
-  our    100644 353e452eb1a5daa18ffbd660adaeae0eb30b4343 i18n/cht/src/vs/code/electron-main/logUploader.i18n.json
-  their  100644 848925e77e281ed4125f44e593a8d61f6499c7f9 i18n/cht/src/vs/code/electron-main/logUploader.i18n.json
-@@ -9,10 +9,18 @@
- 	"invalidEndpoint": "記錄檔上傳者端點無效",
- 	"beginUploading": "上傳中...",
- 	"didUploadLogs": "上傳成功! 記錄檔識別碼: {0}",
-+<<<<<<< .our
- 	"logUploadPromptHeader": "您即將將工作階段記錄上傳到安全的 Microsoft 端點，只有 VS Code 小組的 Microsoft 成員能夠存取。",
- 	"logUploadPromptBody": "工作階段記錄可能包含完整路徑或檔案內容等個人資訊。請從此處檢閱並編輯您的工作階段記錄檔: '{0}'",
- 	"logUploadPromptBodyDetails": "繼續進行即表示您確認已對工作階段記錄檔進行檢閱與編輯，並接受 Microsoft 將其用於偵錯 VS Code。",
- 	"logUploadPromptAcceptInstructions": "請執行程式碼 '--upload-logs={0}' 以繼續上傳",
-+=======
-+	"userDeniedUpload": "已取消上載",
-+	"logUploadPromptHeader": "要將工作階段記錄上傳到安全的端點嗎?",
-+	"logUploadPromptBody": "請於此處檢閱您的記錄檔: '{0}'",
-+	"logUploadPromptBodyDetails": "記錄可能包含個人資訊，例如完整路徑和檔案內容。",
-+	"logUploadPromptKey": "我已經檢閱記錄 (輸入 'y' 以確認上傳)",
-+>>>>>>> .their
- 	"postError": "張貼記錄時發生錯誤: {0}",
- 	"responseError": "張貼記錄時發生錯誤。得到 {0} - {1}",
- 	"parseError": "剖析回應時發生錯誤",
-changed in both
-  base   100644 7a953927b1ba16c9850e121930536a0201584259 i18n/cht/src/vs/code/electron-main/menus.i18n.json
-  our    100644 5f037b2a895deac7820d5f0872d4b9af5505b797 i18n/cht/src/vs/code/electron-main/menus.i18n.json
-  their  100644 ec283da7015472f349c8b1d9ad65bed2bce23131 i18n/cht/src/vs/code/electron-main/menus.i18n.json
-changed in both
-  base   100644 908cad5ade865a7badf3304a01fad24d64f9481c i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 15a1cfb1f061b73d70aaaf6b56b29fe87aab2b5a i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 abe0e03af436175f40c00f275bea355bf03bf53a i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -29,8 +29,13 @@
- 	"scrollBeyondLastColumn": "控制編輯器水平捲動所超出的額外字元數",
- 	"smoothScrolling": "控制編輯器是否會使用動畫捲動",
- 	"minimap.enabled": "控制是否會顯示迷你地圖",
-+<<<<<<< .our
- 	"minimap.side": "控制要在哪端呈現迷你地圖。",
- 	"minimap.showSlider": "自動隱藏迷你地圖滑桿",
-+=======
-+	"minimap.side": "控制要轉譯迷你地圖的方向。可能的值為 'right' 與 'left'",
-+	"minimap.showSlider": "控制是否會自動隱藏迷你地圖滑桿。可能的值為 'always' 與 'mouseover'",
-+>>>>>>> .their
- 	"minimap.renderCharacters": "呈現行內的實際字元 (而不是彩色區塊)",
- 	"minimap.maxColumn": "限制迷你地圖的寬度，以呈現最多的資料行",
- 	"find.seedSearchStringFromSelection": "控制編譯器選取範圍是否預設為尋找工具的搜尋字串",
-changed in both
-  base   100644 2171f07a7d21bdd9fd57761c9277322b899ca046 i18n/cht/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 d84006726480d7b55e5c9363c0ac7b4dbb203a6d i18n/cht/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 372f38f2bd4741308ade864e7132b9ab239d9c02 i18n/cht/src/vs/platform/environment/node/argv.i18n.json
-changed in both
-  base   100644 e9f363067d6cde6451e91feae0fa744b17e21b76 i18n/cht/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 a2cc538e14e2cfd1305228b36fae8794fa7c56f9 i18n/cht/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 0013de0e6a7dd17b3cc44f04c5e7fd0d887d5810 i18n/cht/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/cht/src/vs/platform/issue/electron-main/issueService.i18n.json
-  our    100644 855fc34813bbc27cd484caeed203347b53697099 i18n/cht/src/vs/platform/issue/electron-main/issueService.i18n.json
-  their  100644 01a61fb8c5eae9fd8d40cbd3ab89eb26c33a7351 i18n/cht/src/vs/platform/issue/electron-main/issueService.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"issueReporter": "問題回報程式",
- 	"processExplorer": "處理序總管"
-+=======
-+	"issueReporter": "問題回報程式"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 37f59f438521c2c89e3b652ea598414faf23fcb0 i18n/cht/src/vs/platform/list/browser/listService.i18n.json
-  our    100644 16ce88704c4cd3468d63489a018710040a4701b5 i18n/cht/src/vs/platform/list/browser/listService.i18n.json
-  their  100644 e9ebd5685ed941f6b4192ab56c4b7fe67fa17ac0 i18n/cht/src/vs/platform/list/browser/listService.i18n.json
-@@ -12,6 +12,10 @@
- 	"multiSelectModifier": "透過滑鼠多選，用於在樹狀目錄與清單中新增項目的輔助按鍵 (例如在總管中開啟 [編輯器] 及 [SCM] 檢視)。在 Windows 及 Linux 上，`ctrlCmd` 對應 `Control`，在 macOS 上則對應 `Command`。[在側邊開啟] 滑鼠手勢 (若支援) 將會適應以避免和多選輔助按鍵衝突。",
- 	"openMode.singleClick": "以滑鼠按一下開啟項目。",
- 	"openMode.doubleClick": "以滑鼠按兩下開啟項目。",
-+<<<<<<< .our
- 	"openModeModifier": "控制如何使用滑鼠在樹狀目錄與清單中開啟項目 (若有支援)。設為 `singleClick` 可以滑鼠按一下開啟物件，設為 `doubleClick` 則只能透過按兩下滑鼠開啟物件。對於樹狀目錄中具子系的父系而言，此設定會控制應以滑鼠按一下或按兩下展開父系。注意，某些樹狀目錄或清單若不適用此設定則會予以忽略。",
- 	"horizontalScrolling setting": "控制是否支援工作台中的水平滾動。"
-+=======
-+	"openModeModifier": "控制如何使用滑鼠在樹狀目錄與清單中開啟項目 (若有支援)。設為 `singleClick` 可以滑鼠按一下開啟物件，設為 `doubleClick` 則只能透過按兩下滑鼠開啟物件。對於樹狀目錄中具子系的父系而言，此設定會控制應以滑鼠按一下或按兩下展開父系。注意，某些樹狀目錄或清單若不適用此設定則會予以忽略。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 73ff4acf72b74263e633c090dc03dde469a416c1 i18n/cht/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
-  our    100644 e9f8dbb8b3edb9d2f61739010889f7a7fa837d29 i18n/cht/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
-  their  100644 56500848556ed9ebc4e079552046e0a29e655234 i18n/cht/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
-@@ -11,11 +11,17 @@
- 	"sizeMB": "{0}MB",
- 	"sizeGB": "{0}GB",
- 	"sizeTB": "{0}TB",
-+<<<<<<< .our
- 	"largeImageError": "因為影像太大，所以未在編輯器中顯示 ({0})。",
- 	"resourceOpenExternalButton": "要使用外部程式打開影像嗎?",
- 	"nativeFileTooLargeError": "因為檔案太大，所以未在編輯器中顯示 ({0})。",
- 	"nativeBinaryError": "因為檔案為二進位檔或使用了不支援的文字編碼，所以未在編輯器中顯示。",
- 	"openAsText": "是否確定要開啟?",
-+=======
-+	"largeImageError": "影像的檔案大小太大 (>1MB)，無法在編輯器中顯示。",
-+	"resourceOpenExternalButton": "要使用外部程式打開影像嗎?",
-+	"nativeBinaryError": "檔案為二進位檔、非常大或使用不支援的文字編碼，因此將不會顯示於編輯器中。",
-+>>>>>>> .their
- 	"zoom.action.fit.label": "整個影像",
- 	"imgMeta": "{0}x{1} {2}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 326c0846e47a726c19b7fd34390c855c41952546 i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 bf339c91e8587ec53fe81a294c54ddc0f5aad010 i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 75269c64a372144a5c76b3461bce572141cf337b i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,7 +35,10 @@
- 	"panelDefaultLocation": "控制面板的預設位置。可顯示在 Workbench 的底部或是右方。",
- 	"statusBarVisibility": "控制 Workbench 底端狀態列的可視性。",
- 	"activityBarVisibility": "控制活動列在 workbench 中的可見度。",
-+<<<<<<< .our
- 	"viewVisibility": "控制檢視標頭動作的可見度。檢視標頭動作可為總是可見，或在檢視為焦點或暫留時才可見。",
-+=======
-+>>>>>>> .their
- 	"fontAliasing": "控制工作台中的字型鋸齒化方法。\n- default: 子像素字型平滑化。在多數非 Retina 的顯示器上，這會使文字變得最鮮明\n- antialiased: 在像素層級上使字型平滑化，與子像素相對。能夠使字型整體顯示較亮\n- none: 停用字型平滑化。顯示的文字會帶有鋸齒狀銳利邊緣\n- auto: 根據顯示器的 DPI 自動套用 `default` 或 `antialiased`。",
- 	"workbench.fontAliasing.default": "子像素字型平滑處理。在大部分非 Retina 顯示器上會顯示出最銳利的文字。",
- 	"workbench.fontAliasing.antialiased": "相對於子像素，根據像素層級平滑字型。可以讓字型整體顯得較細。",
-changed in both
-  base   100644 284439109c4d5a3da1bc0a8bb72726347ddcd27d i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-  our    100644 ba46f891701adfb7092a6dba679dac4fb50eb21b i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-  their  100644 a3ce7418d3bec4d4709def17e3459523e7c2be04 i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-@@ -6,7 +6,40 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"debugNoType": "偵錯器 'type' 無法省略，且必須為類型 'string'。",
-+=======
-+	"vscode.extension.contributes.debuggers": "提供偵錯配接器。",
-+	"vscode.extension.contributes.debuggers.type": "此偵錯配接器的唯一識別碼。",
-+	"vscode.extension.contributes.debuggers.label": "此偵錯配接器的顯示名稱。",
-+	"vscode.extension.contributes.debuggers.program": "偵錯配接器程式的路徑。可以是擴充功能資料夾的絕對或相對路徑。",
-+	"vscode.extension.contributes.debuggers.args": "要傳遞至配接器的選擇性引數。",
-+	"vscode.extension.contributes.debuggers.runtime": "程式屬性不是可執行檔但需要執行階段時的選擇性執行階段。",
-+	"vscode.extension.contributes.debuggers.runtimeArgs": "選擇性執行階段引數。",
-+	"vscode.extension.contributes.debuggers.variables": "從 `launch.json` 中的互動式變數 (例如 ${action.pickProcess}) 對應到命令。",
-+	"vscode.extension.contributes.debuggers.initialConfigurations": "組態，用於產生初始 'launch.json'。",
-+	"vscode.extension.contributes.debuggers.languages": "可將偵錯延伸模組視為「預設偵錯工具」的語言清單。",
-+	"vscode.extension.contributes.debuggers.adapterExecutableCommand": "如有指定，VS Code 會呼叫此命令以決定偵錯配接器的可執行檔路徑及要傳遞的引數。",
-+	"vscode.extension.contributes.debuggers.configurationSnippets": "用於在 'launch.json' 中新增組態的程式碼片段。",
-+	"vscode.extension.contributes.debuggers.configurationAttributes": "JSON 結構描述組態，用於驗證 'launch.json'。",
-+	"vscode.extension.contributes.debuggers.windows": "Windows 特定設定。",
-+	"vscode.extension.contributes.debuggers.windows.runtime": "用於 Windows 的執行階段。",
-+	"vscode.extension.contributes.debuggers.osx": "macOS 特定設定。",
-+	"vscode.extension.contributes.debuggers.osx.runtime": "用於 macOS 的執行階段。",
-+	"vscode.extension.contributes.debuggers.linux": "Linux 特定設定。",
-+	"vscode.extension.contributes.debuggers.linux.runtime": "用於 Linux 的執行階段。",
-+	"vscode.extension.contributes.breakpoints": "提供中斷點。",
-+	"vscode.extension.contributes.breakpoints.language": "允許此語言使用中斷點。",
-+	"app.launch.json.title": "啟動",
-+	"app.launch.json.version": "此檔案格式的版本。",
-+	"app.launch.json.configurations": "組態清單。請使用 IntelliSense 新增新的組態或編輯現有的組態。",
-+	"app.launch.json.compounds": "複合的清單。每個複合都參考將會同時啟動的多重組態。",
-+	"app.launch.json.compound.name": "複合的名稱。顯示於啟動組態下拉式功能表。",
-+	"useUniqueNames": "請使用唯一的組態名稱。",
-+	"app.launch.json.compound.folder": "複合所在的資料夾名稱。",
-+	"app.launch.json.compounds.configurations": "將會作為此複合一部份而啟動之組態的名稱。",
-+	"debugNoType": "偵錯配接器 'type' 不能省略且必須屬於 'string' 類型。",
-+>>>>>>> .their
- 	"selectDebug": "選取環境",
- 	"DebugConfig.failed": "無法在 '.vscode' 資料夾 ({0}) 中建立 'launch.json' 檔案。",
- 	"workspace": "工作區",
-changed in both
-  base   100644 b9ca8450b586540de6b71715b164a09c6453ca35 i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 a922616389e0d8d38ea207e5428979e5adf305ab i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 2ccf21c20ada75884b9a34cb49e1ec6fd54a728f i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -14,7 +14,11 @@
- 	"breakpointRemoved": "已移除中斷點，行 {0}，檔案 {1}",
- 	"compoundMustHaveConfigurations": "複合必須設有 \"configurations\" 屬性，才能啟動多個組態。",
- 	"noConfigurationNameInWorkspace": "無法在工作區中找到啟動組態 '{0}'。",
-+<<<<<<< .our
- 	"multipleConfigurationNamesInWorkspace": "工作區中有多個啟動組態 '{0}'。請使用資料夾名稱以符合組態。",
-+=======
-+	"multipleConfigurationNamesInWorkspace": "工作區中有多個啟動組態 `{0}`。請使用資料夾名稱來符合組態。",
-+>>>>>>> .their
- 	"noFolderWithName": "在複合 '{2}' 的組態 '{1}' 中找不到名稱為 '{0}' 的資料夾。",
- 	"configMissing": "'launch.json' 中遺漏組態 '{0}'。",
- 	"launchJsonDoesNotExist": "'launch.json' 不存在。",
-@@ -26,7 +30,13 @@
- 	"preLaunchTaskErrors": "執行 preLaunchTask '{0}' 期間偵測到建置錯誤。",
- 	"preLaunchTaskError": "執行 preLaunchTask '{0}' 期間偵測到建置錯誤。",
- 	"preLaunchTaskExitCode": "preLaunchTask '{0}' 已終止，結束代碼為 {1}。",
-+<<<<<<< .our
- 	"showErrors": "顯示錯誤",
-+=======
-+	"debugAnyway": "仍要偵錯",
-+	"showErrors": "顯示錯誤",
-+	"cancel": "取消",
-+>>>>>>> .their
- 	"noFolderWorkspaceDebugError": "無法對使用中的檔案偵錯。請確認檔案已儲存在磁碟上，而且您已經為該檔案類型安裝偵錯延伸模組。",
- 	"cancel": "取消",
- 	"DebugTaskNotFound": "找不到工作 \"{0}\"。",
-changed in both
-  base   100644 e4f55aba1815e0693d196093b1c58570a84b8334 i18n/cht/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-  our    100644 0f0a8bc19044c632734b896a3ae60011bf789513 i18n/cht/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-  their  100644 d9f35568cbf04d01b600a2be553b03ef22ab817b i18n/cht/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-changed in both
-  base   100644 a1690057d3c5d44b6c855d00dc0cb18d72bc0414 i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 beddde6d10ce2b9a74005421467ca470c839a054 i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 df75fbfc27c54ae62db44def91cd950e2a281f6c i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-@@ -58,9 +58,12 @@
- 	"configureWorkspaceFolderRecommendedExtensions": "設定建議的延伸模組 (工作區資料夾) ",
- 	"malicious tooltip": "這個延伸模組曾經被回報是有問題的。",
- 	"malicious": "惡意",
-+<<<<<<< .our
- 	"disabled": "停用",
- 	"disabled globally": "停用",
- 	"disabled workspace": "在此工作區停用",
-+=======
-+>>>>>>> .their
- 	"disableAll": "停用所有已安裝的延伸模組",
- 	"disableAllWorkspace": "停用此工作區的所有已安裝延伸模組",
- 	"enableAll": "啟用所有擴充功能",
-changed in both
-  base   100644 b3c3c19d445cce90a27d858a2083b94a03f2cad9 i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-  our    100644 428850cc74c02589704ef9f86cc3c383eda2110e i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-  their  100644 733f876ef063aac2458d98fecd75f555adc1f61b i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-@@ -6,9 +6,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"restart1": "記錄延伸模組",
- 	"restart2": "若要記錄延伸模組，則必須重新啟動。您要立即重新啟動 '{0}' 嗎?",
- 	"restart3": "重新啟動",
- 	"cancel": "取消",
-+=======
-+	"noPro": "若要分析延伸模組，請以 `--inspect-extensions=<port>` 啟動。",
-+>>>>>>> .their
- 	"selectAndStartDebug": "按一下以停止性能分析。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 9df35da343e5ed6af60c9cbc84aabe01b5b72f05 i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 68a719930ef86e9c0443de55d9783ccfe2efafc4 i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 7fa09df63c637c1e1a172d88822f0206e930bfcc i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -10,8 +10,12 @@
- 	"searchMarketplace": "搜尋市集",
- 	"dynamicWorkspaceRecommendation": "此擴充功能可能會讓您感興趣，因為它在 {0} 儲存庫的使用者中很熱門。",
- 	"exeBasedRecommendation": "因為您已安裝 {0}，所以建議您使用此延伸模組。",
-+<<<<<<< .our
- 	"fileBasedRecommendation": "根據您最近開啟的檔案，建議您使用此延伸模組。",
- 	"workspaceRecommendation": "根據目前工作區的使用者，建議您使用此延伸模組。",
-+=======
-+	"dynamicWorkspaceRecommendation": "因為目前的工作區有許多使用者使用此延伸模組，所以您可能會對其有興趣。",
-+>>>>>>> .their
- 	"reallyRecommended2": "建議對此檔案類型使用 '{0}' 延伸模組。",
- 	"reallyRecommendedExtensionPack": "建議對此檔案類型使用 '{0}' 延伸模組套件。",
- 	"install": "安裝",
-changed in both
-  base   100644 f186269c095f37c99a267890e78260d6b7954c20 i18n/cht/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  our    100644 5ba4662a59600e7cc718255220a16ebea20d28b1 i18n/cht/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  their  100644 dc6c3bd4d61645b0bf4e30b71b364d88d5028b68 i18n/cht/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-changed in both
-  base   100644 41eaf632ea054d20fa99f10c5acbf03681651eb0 i18n/cht/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  our    100644 fc90fe51e844c5fc59a5b6f7c5b4c159894a0201 i18n/cht/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  their  100644 803411c1ad04e8885e1960905f01c84765c2ed43 i18n/cht/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-changed in both
-  base   100644 bc257ad2d3d32d248b95de66afb9c0eb99bf77b9 i18n/cht/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 ebc27f353b31e6e9c7c072ddd7a5d4a8a93dc07d i18n/cht/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 23c1fef1bf88bfe5292e18870b972780cb0b2150 i18n/cht/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -30,6 +30,10 @@
- 	"search.quickOpen.includeSymbols": "設定以將全域符號搜尋的結果納入 Quick Open 的檔案結果中。",
- 	"search.followSymlinks": "控制是否要在搜尋時遵循 symlink。",
- 	"search.smartCase": "如果搜尋式為全部小寫，則用不分大小寫的搜尋，否則用分大小寫的搜尋",
-+<<<<<<< .our
- 	"search.globalFindClipboard": "控制搜尋檢視是否應讀取或修改 macOS 上的共用尋找剪貼簿 (shared find clipboard)",
- 	"search.location": "控制搜尋是否以檢視方式在側邊欄顯示，或以面板方式在面板區域顯示以取得更多水平空間。"
-+=======
-+	"search.globalFindClipboard": "控制 Search Viewlet 是否應讀取或修改 macOS 上的共用尋找剪貼簿"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 652d103cc9d2da74993db9eff19d0fa1c736dda1 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-  our    100644 2737137686c426beed39e10ea8d73accc9f9b5a1 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-  their  100644 c5415de0931579b439943cd1885afdc090b5ca09 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-@@ -8,12 +8,16 @@
- 	],
- 	"terminal.integrated.a11yBlankLine": "空白行",
- 	"terminal.integrated.a11yPromptLabel": "終端機輸入",
-+<<<<<<< .our
- 	"terminal.integrated.a11yTooMuchOutput": "要宣告的輸出過多，請手動讀取瀏覽至資料列",
- 	"yes": "是",
- 	"terminal.rendererInAllNewTerminals": "所有新建立的終端將使用非 GPU 的轉譯器。",
- 	"no": "否",
- 	"dontShowAgain": "不要再顯示",
- 	"terminal.slowRendering": "整合終端的標準轉譯器在您的電腦上似乎很慢。 您是否想要切換以 Dom-based 轉譯器以提高效能? [閱讀更多有關終端設定的資訊] (https://code.visualstudio.com/docs/editor/integrated-terminal#_changing-how-the-terminal-is-rendered).",
-+=======
-+	"terminal.integrated.a11yTooMuchOutput": "要宣告的輸出過多，請手動瀏覽至資料列以讀取",
-+>>>>>>> .their
- 	"terminal.integrated.copySelection.noSelection": "終端機沒有任何選取項目可以複製",
- 	"terminal.integrated.exitedWithCode": "終端機處理序已終止，結束代碼為: {0}",
- 	"terminal.integrated.waitOnExit": "按任意鍵關閉終端機",
-changed in both
-  base   100644 c138007e3656622813c4d2b721c20575dfee2130 i18n/deu/extensions/emmet/package.i18n.json
-  our    100644 76a0f1cf2f4933fe2973e0cc716d5590fccebd37 i18n/deu/extensions/emmet/package.i18n.json
-  their  100644 102fce1f66a5592092344a53adcd6726f460f95e i18n/deu/extensions/emmet/package.i18n.json
-@@ -56,10 +56,17 @@
- 	"emmetPreferencesFormatNoIndentTags": "Ein Array von Tagnamen, die keinen inneren Einzug erhalten",
- 	"emmetPreferencesFormatForceIndentTags": "Ein Array von Tagnamen, die immer einen inneren Einzug erhalten",
- 	"emmetPreferencesAllowCompactBoolean": "Bei TRUE wird eine kompakte Notation boolescher Attribute erzeugt",
-+<<<<<<< .our
- 	"emmetPreferencesCssWebkitProperties": "Durch Trennzeichen getrennte CSS-Eigenschaften, die das \"webkit\"-Herstellerpräfix erhalten, wenn sie in einer Emmet-Abkürzung verwendet werden, die mit \"-\" beginnt. Legen Sie eine leere Zeichenfolge fest, um das \"webkit\"-Präfix immer zu vermeiden.",
- 	"emmetPreferencesCssMozProperties": "Durch Trennzeichen getrennte CSS-Eigenschaften, die das \"moz\"-Herstellerpräfix erhalten, wenn sie in einer Emmet-Abkürzung verwendet werden, die mit \"-\" beginnt. Legen Sie eine leere Zeichenfolge fest, um das \"moz\"-Präfix immer zu vermeiden.",
- 	"emmetPreferencesCssOProperties": "Durch Trennzeichen getrennte CSS-Eigenschaften, die das \"o\"-Herstellerpräfix erhalten, wenn sie in einer Emmet-Abkürzung verwendet werden, die mit \"-\" beginnt. Legen Sie eine leere Zeichenfolge fest, um das \"o\"-Präfix immer zu vermeiden.",
- 	"emmetPreferencesCssMsProperties": "Durch Trennzeichen getrennte CSS-Eigenschaften, die das \"ms\"-Herstellerpräfix erhalten, wenn sie in einer Emmet-Abkürzung verwendet werden, die mit \"-\" beginnt. Legen Sie eine leere Zeichenfolge fest, um das \"ms\"-Präfix immer zu vermeiden.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "Das Mindestergebnis (zwischen 0 und 1), das die Abkürzung mit Fuzzyübereinstimmung erreichen muss. Niedrigere Werte führen zu vielen falsch positiven Übereinstimmungen, höhere Werte verringern unter Umständen die möglichen Übereinstimmungen.",
- 	"emmetOptimizeStylesheetParsing": "Bei der Einstellung FALSE wird die gesamte Datei analysiert, um zu bestimmten, ob die aktuelle Position zum Erweitern von Emmet-Abkürzungen gültig ist. Bei der Einstellung TRUE wird nur der Inhalt um die die aktuelle Position in CSS-/SCSS-/LESS-Dateien analysiert."
-+=======
-+	"emmetPreferencesCssWebkitProperties": "Durch Trennzeichen getrennte CSS-Eigenschaften, die das webkit-Herstellerpräfix erhalten, wenn sie in einer Emmet-Abkürzung verwendet werden, die mit \"-\" beginnt. Legen Sie eine leere Zeichenfolge fest, um das webkit-Präfix immer zu vermeiden.",
-+	"emmetPreferencesCssMozProperties": "Durch Trennzeichen getrennte CSS-Eigenschaften, die das moz-Herstellerpräfix erhalten, wenn sie in einer Emmet-Abkürzung verwendet werden, die mit \"-\" beginnt. Legen Sie eine leere Zeichenfolge fest, um das moz-Präfix immer zu vermeiden.",
-+	"emmetPreferencesCssOProperties": "Durch Trennzeichen getrennte CSS-Eigenschaften, die das o-Herstellerpräfix erhalten, wenn sie in einer Emmet-Abkürzung verwendet werden, die mit \"-\" beginnt. Legen Sie eine leere Zeichenfolge fest, um das o-Präfix immer zu vermeiden.",
-+	"emmetPreferencesCssMsProperties": "Durch Trennzeichen getrennte CSS-Eigenschaften, die das ms-Herstellerpräfix erhalten, wenn sie in einer Emmet-Abkürzung verwendet werden, die mit \"-\" beginnt. Legen Sie eine leere Zeichenfolge fest, um das ms-Präfix immer zu vermeiden."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 5d1eaaf925e9a056138ec2b48a489d2c9ec46ade i18n/deu/extensions/git/out/commands.i18n.json
-  our    100644 1abad5f86ec11c777f2319fc1588d47f5ea1c8f5 i18n/deu/extensions/git/out/commands.i18n.json
-  their  100644 11a98b9d1aea950ffddc80dfd986bfeba8fea0db i18n/deu/extensions/git/out/commands.i18n.json
-changed in both
-  base   100644 fb87a24140edf00f911c54da6540806beda0b322 i18n/deu/extensions/git/out/repository.i18n.json
-  our    100644 19de752d1259c61a02eef63529268457137c8f97 i18n/deu/extensions/git/out/repository.i18n.json
-  their  100644 82e40fe58367ffbb78ac846d0ca2789469cde01b i18n/deu/extensions/git/out/repository.i18n.json
-@@ -30,6 +30,10 @@
- 	"changes": "Änderungen",
- 	"commitMessageCountdown": "{0} Zeichen in der aktuellen Zeile verbleibend",
- 	"commitMessageWarning": "{0} Zeichen über {1} in der aktuellen Zeile",
-+<<<<<<< .our
-+=======
-+	"ok": "OK",
-+>>>>>>> .their
- 	"neveragain": "Nicht mehr anzeigen",
- 	"huge": "Das Git-Repository unter {0} umfasst zu viele aktive Änderungen. Nur ein Teil der Git-Features wird aktiviert."
- }
-\ No newline at end of file
-changed in both
-  base   100644 18e902bcdb69fbf7789d43cb325db0196a812d58 i18n/deu/extensions/git/package.i18n.json
-  our    100644 70e0819e8ad95e53d1958520356a5b59f85a5e7c i18n/deu/extensions/git/package.i18n.json
-  their  100644 a08db26fbc06765b40fce7113785d876de6e37df i18n/deu/extensions/git/package.i18n.json
-@@ -75,9 +75,14 @@
- 	"config.decorations.enabled": "Steuert, ob Git Farben und Badges für die Explorer-Ansicht und die Ansicht \"Geöffnete Editoren\" beiträgt.",
- 	"config.promptToSaveFilesBeforeCommit": "Legt fest, ob Git vor dem einchecken nach nicht gespeicherten Dateien suchen soll.",
- 	"config.showInlineOpenFileAction": "Steuert, ob eine Inlineaktion zum Öffnen der Datei in der Ansicht \"Git-Änderungen\" angezeigt wird.",
-+<<<<<<< .our
- 	"config.inputValidation": "Steuert, wann die Commit-Meldung der Eingabevalidierung angezeigt wird.",
- 	"config.detectSubmodules": "Steuert, ob Git-Submodule automatisch erkannt werden.",
- 	"config.detectSubmodulesLimit": "Steuert die Begrenzung der Git-Submodule.",
-+=======
-+	"config.inputValidation": "Steuert, wann die Eingabevalidierung im Eingabezähler angezeigt wird.",
-+	"config.detectSubmodules": "Steuert, ob Git-Submodule automatisch erkannt werden.",
-+>>>>>>> .their
- 	"colors.modified": "Farbe für geänderte Ressourcen.",
- 	"colors.deleted": "Farbe für gelöschten Ressourcen.",
- 	"colors.untracked": "Farbe für nicht verfolgte Ressourcen.",
-changed in both
-  base   100644 60507eec0fa6e5040e5922621a5aef238d0f96f6 i18n/deu/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  our    100644 5bc9127f7c619b851c0cf1328cd211996a08b032 i18n/deu/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  their  100644 ba074306f0dd772d3eb614c8b9039e3569a99c07 i18n/deu/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-@@ -6,6 +6,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"hide": "Ausblenden",
- 	"show": "Anzeigen",
- 	"previewOnGitHub": "Vorschau in GitHub",
-@@ -27,5 +28,15 @@
- 	"expectedResults": "Erwartete Ergebnisse",
- 	"settingsSearchResultsDescription": "Bitte führen Sie die Ergebnisse auf, die Sie bei der Suche mit dieser Abfrage erwartet haben. Wir unterstützen GitHub-Markdown. Sie können in der GitHub-Preview ihr Problem bearbeiten und Screenshots hinzufügen.",
- 	"pasteData": "Wir haben die erforderlichen Daten in die Zwischenablage geschrieben, da sie zu groß zum Senden waren. Bitte fügen Sie sie ein.",
-+=======
-+	"previewOnGitHub": "Vorschau in GitHub",
-+	"similarIssues": "Ähnliche Probleme",
-+	"noResults": "Es wurden keine Ergebnisse gefunden.",
-+	"rateLimited": "API-Ratenbegrenzung überschritten",
-+	"stepsToReproduce": "Zu reproduzierende Schritte",
-+	"bugDescription": "Wie ist dieses Problem aufgetreten? Welche Schritte müssen Sie ausführen, um das Problem zuverlässig zu reproduzieren? Was sollte geschehen, und was ist stattdessen geschehen?",
-+	"performanceIssueDesciption": "Wann ist dieses Leistungsproblem aufgetreten? Tritt es beispielsweise beim Start oder nach einer bestimmten Reihe von Aktionen auf? Wenn Sie weitere Angaben machen, hilft uns das dabei, dieses Problem zu untersuchen.",
-+	"description": "Beschreibung",
-+>>>>>>> .their
- 	"disabledExtensions": "Erweiterungen sind deaktiviert"
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/deu/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  our    100644 b2207b414add0edf1a35b65e634fce205abbcca5 i18n/deu/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  their  100644 a21a4613fadffaec143caf31630d8108bfc1e721 i18n/deu/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-@@ -7,6 +7,7 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"completeInEnglish": "Füllen Sie das Formular auf Englisch aus.",
-+<<<<<<< .our
- 	"issueTypeLabel": "Dies ist",
- 	"issueSourceLabel": "Datei auf",
- 	"vscode": "Visual Studio Code",
-@@ -25,4 +26,25 @@
- 	"sendExtensions": "Meine aktivierten Erweiterungen einschließen ({0})",
- 	"sendSearchedExtensions": "Gesuchte Erweiterungen senden ({0})",
- 	"sendSettingsSearchDetails": "Details der Einstellungssuche senden ({0})"
-+=======
-+	"issueTypeLabel": "Ich möchte Folgendes übermitteln:",
-+	"bugReporter": "Fehlerbericht",
-+	"performanceIssue": "Leistungsproblem",
-+	"featureRequest": "Featureanforderung",
-+	"issueTitleLabel": "Titel",
-+	"issueTitleRequired": "Geben Sie einen Titel ein.",
-+	"vscodeVersion": "VS Code-Version",
-+	"osVersion": "Betriebssystemversion",
-+	"systemInfo": "Eigene Systeminformationen",
-+	"sendData": "Eigene Daten senden",
-+	"processes": "Derzeit ausgeführte Prozesse",
-+	"workspaceStats": "Eigene Arbeitsbereichsstatistiken",
-+	"extensions": "Eigene Erweiterungen",
-+	"tryDisablingExtensions": "Das Problem ist reproduzierbar, wenn Erweiterungen deaktiviert sind",
-+	"disableExtensions": "Alle Erweiterungen werden deaktiviert, und das Fenster wird neu geladen",
-+	"showRunningExtensions": "Alle ausgeführten Erweiterungen anzeigen",
-+	"githubMarkdown": "Wir unterstützen GitHub Flavored Markdown. Sie können während der Vorschau in GitHub Ihr Problem bearbeiten und Screenshots hinzufügen.",
-+	"issueDescriptionRequired": "Geben Sie eine Beschreibung ein.",
-+	"loadingData": "Daten werden geladen …"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/deu/src/vs/code/electron-main/logUploader.i18n.json
-  our    100644 7a0072f18e2f69b3acb59bcc2282e361880ccaa4 i18n/deu/src/vs/code/electron-main/logUploader.i18n.json
-  their  100644 8896fd116b903ff3d5f3eb284c54b56227eb9d44 i18n/deu/src/vs/code/electron-main/logUploader.i18n.json
-@@ -9,10 +9,18 @@
- 	"invalidEndpoint": "Ungültiger Protokolluploader-Endpunkt",
- 	"beginUploading": "Wird hochgeladen …",
- 	"didUploadLogs": "Upload erfolgreich! Protokolldatei-ID: {0}",
-+<<<<<<< .our
- 	"logUploadPromptHeader": "Sie sind im Begriff, Ihre Sitzungsprotokolle auf einen sicheren Microsoft-Endpunkt hochzuladen, auf den nur Mitglieder des Microsoft VS Code-Teams zugreifen können.",
- 	"logUploadPromptBody": "Sitzungsprotokolle können persönliche Informationen wie vollständige Pfade oder Inhalt der Datei enthalten. Bitte lesen und schwärzen Sie Ihre Sitzungsprotokolle hier: \"{0}\"",
- 	"logUploadPromptBodyDetails": "Indem Sie fortfahren, bestätigen Sie, dass Sie Ihre Sitzungsprotokolle gelesen und geschwärzt haben und dass Microsoft diese benutzen kann, um VS Code zu debuggen.",
- 	"logUploadPromptAcceptInstructions": "Führen Sie Code mit \"--upload-logs={0}\" aus, um den Upload fortzusetzen.",
-+=======
-+	"userDeniedUpload": "Upload abgebrochen",
-+	"logUploadPromptHeader": "Sitzungsprotokolle auf sicheren Endpunkt hochladen?",
-+	"logUploadPromptBody": "Überprüfen Sie Ihre Protokolldateien hier: \"{0}\"",
-+	"logUploadPromptBodyDetails": "Protokolle enthalten möglicherweise personenbezogene Informationen wie etwa vollständige Pfade und Dateiinhalte.",
-+	"logUploadPromptKey": "Ich habe meine Protokolle überprüft (geben Sie \"y\" ein, um das Hochladen zu bestätigen)",
-+>>>>>>> .their
- 	"postError": "Fehler beim Veröffentlichen von Protokollen: {0}",
- 	"responseError": "Fehler beim Veröffentlichen von Protokollen. Abgerufen: {0} – {1}",
- 	"parseError": "Fehler beim Analysieren der Antwort",
-changed in both
-  base   100644 3d107a3974ddbc42201995ba8e567c4d0e5cf480 i18n/deu/src/vs/code/electron-main/menus.i18n.json
-  our    100644 2c62aec3f2252906a0cfb94c2bac025ecf6adbb0 i18n/deu/src/vs/code/electron-main/menus.i18n.json
-  their  100644 a1ff0b747aba3d1f92bd5d8015ef4f2bdfd311f7 i18n/deu/src/vs/code/electron-main/menus.i18n.json
-changed in both
-  base   100644 1e55149d610a95af4819b4fddea5ed84902edecd i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 0cb95fccc47d309d94aacd1e25b0718fd455d527 i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 880b210f63a22a0e091c4038d162583e8bb86290 i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -29,8 +29,13 @@
- 	"scrollBeyondLastColumn": "Steuert die Anzahl der zusätzlichen Zeichen, nach denen der Editor horizontal scrollt.",
- 	"smoothScrolling": "Legt fest, ob der Editor Bildläufe animiert ausführt.",
- 	"minimap.enabled": "Steuert, ob die Minikarte angezeigt wird",
-+<<<<<<< .our
- 	"minimap.side": "Steuert die Seite, wo die Minikarte gerendert wird.",
- 	"minimap.showSlider": "Steuert, ob der Minimap-Schieberegler automatisch ausgeblendet wird.",
-+=======
-+	"minimap.side": "Steuert die Seite, wo die Minikarte gerendert wird. Mögliche Werte sind \"rechts\" und \"links\".",
-+	"minimap.showSlider": "Steuert, ob der Minimap-Schieberegler automatisch ausgeblendet wird. Mögliche Werte sind \"always\" und \"mouseover\".",
-+>>>>>>> .their
- 	"minimap.renderCharacters": "Die tatsächlichen Zeichen in einer Zeile rendern (im Gegensatz zu Farbblöcken)",
- 	"minimap.maxColumn": "Breite der Minikarte beschränken, um höchstens eine bestimmte Anzahl von Spalten zu rendern",
- 	"find.seedSearchStringFromSelection": "Steuert, ob wir für die Suchzeichenfolge im Suchwidget aus der Editorauswahl ein Seeding ausführen.",
-changed in both
-  base   100644 ea9187e53e737bdbd7c7a1268c40d3ada6217682 i18n/deu/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 f6bdb0310262230d9fd3311d63fcfc0ae9c687d8 i18n/deu/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 282989aa957e9f835f5680d400817c6d9a916aa2 i18n/deu/src/vs/platform/environment/node/argv.i18n.json
-changed in both
-  base   100644 3c5a8be8f6065570707ecde8b099eac329fbc1f1 i18n/deu/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 efdaa6c50b1a7075eb309307a09334b8e64087d3 i18n/deu/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 aaf357438c69310ee15ceaea1130c867220ed9bb i18n/deu/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/deu/src/vs/platform/issue/electron-main/issueService.i18n.json
-  our    100644 e05db0db1923c0ae97c18dbbb6d03e09422891e5 i18n/deu/src/vs/platform/issue/electron-main/issueService.i18n.json
-  their  100644 91ee9e32e4afc84ba60267607dc7a9183ba24161 i18n/deu/src/vs/platform/issue/electron-main/issueService.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"issueReporter": "Problembericht",
- 	"processExplorer": "Prozess-Explorer"
-+=======
-+	"issueReporter": "Problembericht"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 99b767c2190b026b66b5a862bd85cd22cf9e2881 i18n/deu/src/vs/platform/list/browser/listService.i18n.json
-  our    100644 d3f2996964a34862cccfeed32b135ae7417dfe4d i18n/deu/src/vs/platform/list/browser/listService.i18n.json
-  their  100644 204a5c783e7481ca20aa07e7b19a843479112192 i18n/deu/src/vs/platform/list/browser/listService.i18n.json
-@@ -12,6 +12,10 @@
- 	"multiSelectModifier": "Der Modifizierer zum Hinzufügen eines Elements in Bäumen und Listen zu einer Mehrfachauswahl mit der Maus (zum Beispiel im Explorer, in geöffneten Editoren und in der SCM-Ansicht). \"ctrlCmd\" wird unter Windows und Linux der Taste \"STRG\" und unter macOSX der Befehlstaste zugeordnet. Die Mausbewegung \"Seitlich öffnen\" wird – sofern unterstützt – so angepasst, dass kein Konflikt mit dem Modifizierer zur Mehrfachauswahl entsteht.",
- 	"openMode.singleClick": "Öffnet Elemente mit einem einzelnen Mausklick.",
- 	"openMode.doubleClick": "Öffnet Elemente mit einem doppelten Mausklick.",
-+<<<<<<< .our
- 	"openModeModifier": "Steuert, wie Elemente in Bäumen und Listen mithilfe der Maus geöffnet werden (sofern unterstützt). Legen Sie \"singleClick\" fest, um Elemente mit einem einzelnen Mausklick zu öffnen, und \"doubleClick\", damit sie nur mit einem doppelten Mausklick geöffnet werden. Bei übergeordneten Elementen, deren untergeordnete Elemente sich in Bäumen befinden, steuert diese Einstellung, ob ein Einfachklick oder ein Doppelklick das übergeordnete Elemente erweitert. Beachten Sie, dass einige Bäume und Listen diese Einstellung ggf. ignorieren, wenn sie nicht zutrifft.",
- 	"horizontalScrolling setting": "Steuert, ob Bäume horizontales Scrollen in der Workbench unterstützen."
-+=======
-+	"openModeModifier": "Steuert, wie Elemente in Bäumen und Listen mithilfe der Maus geöffnet werden (sofern unterstützt). Legen Sie \"singleClick\" fest, um Elemente mit einem einzelnen Mausklick zu öffnen, und \"doubleClick\", damit sie nur mit einem doppelten Mausklick geöffnet werden. Bei übergeordneten Elementen, deren untergeordnete Elemente sich in Bäumen befinden, steuert diese Einstellung, ob ein Einfachklick oder ein Doppelklick das übergeordnete Elemente erweitert. Beachten Sie, dass einige Bäume und Listen diese Einstellung ggf. ignorieren, wenn sie nicht zutrifft."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/deu/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  our    100644 75b2994052291390999698977515572a80141a18 i18n/deu/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 4290f5cc6933ad4c58c724f46473852a3540b00d i18n/deu/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -6,8 +6,11 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"timeout.formatOnSave": "Formatieren beim Speichern nach {0} ms abgebrochen",
- 	"codeActionsOnSave.didTimeout": "codeActionsOnSave nach {0} ms abgebrochen",
- 	"timeout.onWillSave": "Bei onWillSaveTextDocument-Ereignis nach 1750 ms abgebrochen",
-+=======
-+>>>>>>> .their
- 	"saveParticipants": "Speichern von Teilnehmern wird ausgeführt …"
- }
-\ No newline at end of file
-changed in both
-  base   100644 55a6b88e37069df6d007c621b44169792aa8f047 i18n/deu/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  our    100644 12e4c96abba0bc9f3237a988e8c2b28fd6bc23a7 i18n/deu/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  their  100644 51ea4c67e482d77e8fd9f8ddfcc8fbe4ed8adaf7 i18n/deu/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-changed in both
-  base   100644 3d757fb4c00ee2b8e58ffa0646f905d0eb70e6a8 i18n/deu/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 bfd72770d07a936659f4d75458f1721e0e96ed8a i18n/deu/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 1fe62d2efcb0b35f6cff133a6d0356477bc0bd6a i18n/deu/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 900a51155e64b2b203be1147ac69e2917549cf51 i18n/deu/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
-  our    100644 85e1ded2f40b16f41ee577826d2d3624a1e07b17 i18n/deu/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
-  their  100644 21a390445da3d32eab1d5646bcacd438bd4c6abd i18n/deu/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
-@@ -11,11 +11,17 @@
- 	"sizeMB": "{0} MB",
- 	"sizeGB": "{0} GB",
- 	"sizeTB": "{0} TB",
-+<<<<<<< .our
- 	"largeImageError": "Das Bild wird im Editor nicht angezeigt, weil es zu groß ist ({0}).",
- 	"resourceOpenExternalButton": "Bild mit externem Programm öffnen?",
- 	"nativeFileTooLargeError": "Die Datei wird im Editor nicht angezeigt, weil sie zu groß ist ({0}).",
- 	"nativeBinaryError": "Die Datei wird im Editor nicht angezeigt, weil sie entweder binär ist oder eine nicht unterstützte Textcodierung verwendet.",
- 	"openAsText": "Dennoch öffnen?",
-+=======
-+	"largeImageError": "Die Dateigröße des Bilds ist zu groß (über 1 MB), um im Editor angezeigt zu werden.",
-+	"resourceOpenExternalButton": "Bild mit externem Programm öffnen?",
-+	"nativeBinaryError": "Die Datei wird nicht im Editor angezeigt, weil sie binär oder sehr groß ist oder eine nicht unterstützte Textcodierung verwendet.",
-+>>>>>>> .their
- 	"zoom.action.fit.label": "Ganzes Bild",
- 	"imgMeta": "{0}x{1} {2}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/deu/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
-  our    100644 700e6b13da46916f3902f3df5629798e5bf70919 i18n/deu/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
-  their  100644 5d61536336c9de3f9d0fdf4f41dc13b18a16cd07 i18n/deu/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
-@@ -6,7 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"cannot toggle": "Für diese Sicht {0} kann die Sichtbarkeit nicht umgeschaltet werden.",
- 	"cannot show": "Für diese Sicht \"{0}\" kann die Sichtbarkeit nicht umgeschaltet werden, weil sie aufgrund ihrer \"when\"-Bedingung ausgeblendet ist.",
-+=======
-+>>>>>>> .their
- 	"hideView": "Ausblenden"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8516171d68aca442ea29cd992dfb10a0830ae759 i18n/deu/src/vs/workbench/common/theme.i18n.json
-  our    100644 7230e04365d13635c1ebe9cad1ed0f92866146cc i18n/deu/src/vs/workbench/common/theme.i18n.json
-  their  100644 2902fc870065296a101b05e80efbd05dd1eea399 i18n/deu/src/vs/workbench/common/theme.i18n.json
-changed in both
-  base   100644 bb58ec8934081e758c00579a468fc30dd017533b i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 fc92fd392259fb9b2d1dec1cecdbc3c76bdc7440 i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 9ec35c27d2712702265b83a461268f90a8461add i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,7 +35,10 @@
- 	"panelDefaultLocation": "Steuert die Standardposition des Panels. Dieses kann entweder unterhalb oder rechts von der Workbench angezeigt werden.",
- 	"statusBarVisibility": "Steuert die Sichtbarkeit der Statusleiste im unteren Bereich der Workbench.",
- 	"activityBarVisibility": "Steuert die Sichtbarkeit der Aktivitätsleiste in der Workbench.",
-+<<<<<<< .our
- 	"viewVisibility": "Steuert die Sichtbarkeit von Headeraktionen. Headeraktionen können immer sichtbar sein oder nur sichtbar sein, wenn diese Ansicht fokussiert ist oder mit der Maus darauf gezeigt wird.",
-+=======
-+>>>>>>> .their
- 	"fontAliasing": "Steuert die Schriftartaliasingmethode in der Workbench.\n - default: Subpixel-Schriftartglättung. Auf den meisten Nicht-Retina-Displays wird Text bei dieser Einstellung am schärfsten dargestellt. \n- antialiased: Glättet die Schriftart auf der Pixelebene (im Gegensatz zur Subpixelebene). Bei dieser Einstellung kann die Schriftart insgesamt heller wirken.\n- none: Deaktiviert die Schriftartglättung. Text wird mit gezackten scharfen Kanten dargestellt.\n- auto: Wendet ausgehend vom DPI der Anzeige automatisch \"default\" oder \"antialiased\" an.",
- 	"workbench.fontAliasing.default": "Subpixel-Schriftartglättung. Auf den meisten Nicht-Retina-Displays wird Text bei dieser Einstellung am schärfsten dargestellt.",
- 	"workbench.fontAliasing.antialiased": "Glättet die Schriftart auf der Pixelebene (im Gegensatz zur Subpixelebene). Bei dieser Einstellung kann die Schriftart insgesamt heller wirken.",
-changed in both
-  base   100644 5e893c6c5ca2f60e87366a377cfacf0ce84d3408 i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-  our    100644 7c5d10d550d3b9b70c30888b450dd546ea84dff0 i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-  their  100644 d64bb26e64f1c085c51a780095633d579974e851 i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-@@ -6,7 +6,40 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"debugNoType": "Der Debugger \"type\" darf nicht ausgelassen werden und muss den Typ \"string\" aufweisen.",
-+=======
-+	"vscode.extension.contributes.debuggers": "Trägt Debugadapter bei.",
-+	"vscode.extension.contributes.debuggers.type": "Der eindeutige Bezeichner für diese Debugadapter.",
-+	"vscode.extension.contributes.debuggers.label": "Der Anzeigename für diese Debugadapter.",
-+	"vscode.extension.contributes.debuggers.program": "Der Pfad zum Debugadapterprogramm. Der Pfad ist absolut oder relativ zum Erweiterungsordner.",
-+	"vscode.extension.contributes.debuggers.args": "Optionale Argumente, die an den Adapter übergeben werden sollen.",
-+	"vscode.extension.contributes.debuggers.runtime": "Optionale Laufzeit für den Fall, dass das Programmattribut keine ausführbare Datei ist und eine Laufzeit erfordert.",
-+	"vscode.extension.contributes.debuggers.runtimeArgs": "Optionale Laufzeitargumente.",
-+	"vscode.extension.contributes.debuggers.variables": "Eine Zuordnung von interaktiven Variablen (z. B. \"${action.pickProcess}\") in \"launch.json\" zu einem Befehl.",
-+	"vscode.extension.contributes.debuggers.initialConfigurations": "Konfigurationen zum Generieren der anfänglichen Datei \"launch.json\".",
-+	"vscode.extension.contributes.debuggers.languages": "Liste der Sprachen, für die die Debugerweiterung als \"Standarddebugger\" angesehen werden kann",
-+	"vscode.extension.contributes.debuggers.adapterExecutableCommand": "Wenn dies festgelegt ist, ruft der VS Code diesen Befehl auf, um den ausführbaren Pfad des Debugadapters und die zu übergebenden Argumente zu bestimmen.",
-+	"vscode.extension.contributes.debuggers.configurationSnippets": "Snippets zum Hinzufügen neuer Konfigurationen in \"launch.json\".",
-+	"vscode.extension.contributes.debuggers.configurationAttributes": "JSON-Schemakonfigurationen zum Überprüfen von \"launch.json\".",
-+	"vscode.extension.contributes.debuggers.windows": "Windows-spezifische Einstellungen.",
-+	"vscode.extension.contributes.debuggers.windows.runtime": "Die für Windows verwendete Laufzeit.",
-+	"vscode.extension.contributes.debuggers.osx": "macOS-spezifische Einstellungen.",
-+	"vscode.extension.contributes.debuggers.osx.runtime": "Für macOS verwendete Laufzeit.",
-+	"vscode.extension.contributes.debuggers.linux": "Linux-spezifische Einstellungen.",
-+	"vscode.extension.contributes.debuggers.linux.runtime": "Die für Linux verwendete Laufzeit.",
-+	"vscode.extension.contributes.breakpoints": "Trägt Haltepunkte bei.",
-+	"vscode.extension.contributes.breakpoints.language": "Lässt Haltepunkte für diese Sprache zu.",
-+	"app.launch.json.title": "Starten",
-+	"app.launch.json.version": "Die Version dieses Dateiformats.",
-+	"app.launch.json.configurations": "Die Liste der Konfigurationen. Fügen Sie neue Konfigurationen hinzu, oder bearbeiten Sie vorhandene Konfigurationen mit IntelliSense.",
-+	"app.launch.json.compounds": "Liste der Verbundelemente. Jeder Verbund verweist auf mehrere Konfigurationen, die zusammen gestartet werden.",
-+	"app.launch.json.compound.name": "Name des Verbunds. Wird im Dropdownmenü der Startkonfiguration angezeigt.",
-+	"useUniqueNames": "Verwenden Sie eindeutige Konfigurationsnamen.",
-+	"app.launch.json.compound.folder": "Name des Ordners, in dem sich der Verbund befindet.",
-+	"app.launch.json.compounds.configurations": "Namen von Konfigurationen, die als Bestandteil dieses Verbunds gestartet werden.",
-+	"debugNoType": "Der \"type\" des Debugadapters kann nicht ausgelassen werden und muss vom Typ \"string\" sein.",
-+>>>>>>> .their
- 	"selectDebug": "Umgebung auswählen",
- 	"DebugConfig.failed": "Die Datei \"launch.json\" kann nicht im Ordner \".vscode\" erstellt werden ({0}).",
- 	"workspace": "Arbeitsbereich",
-changed in both
-  base   100644 25396cea2b50b13190244548673ad0e346b655ff i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 d6cc1170dbfaab61ca55376b64654ebe15edb98e i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 3174c5b27963343ff6b9c0ed6ba2d1c43da8e8b9 i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -14,7 +14,11 @@
- 	"breakpointRemoved": "Der Haltepunkt wurde entfernt. Zeile {0}, Datei \"{1}\".",
- 	"compoundMustHaveConfigurations": "Für den Verbund muss das Attribut \"configurations\" festgelegt werden, damit mehrere Konfigurationen gestartet werden können.",
- 	"noConfigurationNameInWorkspace": "Die Startkonfiguration \"{0}\" wurde im Arbeitsbereich nicht gefunden.",
-+<<<<<<< .our
- 	"multipleConfigurationNamesInWorkspace": "Im Arbeitsbereich sind mehrere Startkonfigurationen \"{0}\" vorhanden. Verwenden Sie den Ordnernamen, um die Konfiguration zu qualifizieren.",
-+=======
-+	"multipleConfigurationNamesInWorkspace": "Es gibt mehrere Startkonfigurationen \"{0}\" im Arbeitsbereich. Verwenden Sie den Ordnernamen, um die Konfiguration zu qualifizieren.",
-+>>>>>>> .their
- 	"noFolderWithName": "Der Ordner mit dem Namen \"{0}\" für die Konfiguration \"{1}\" wurde im Verbund \"{2}\" nicht gefunden.",
- 	"configMissing": "Konfiguration \"{0}\" fehlt in \"launch.json\".",
- 	"launchJsonDoesNotExist": "\"launch.json\" ist nicht vorhanden.",
-@@ -26,7 +30,13 @@
- 	"preLaunchTaskErrors": "Buildfehler während preLaunchTask \"{0}\".",
- 	"preLaunchTaskError": "Buildfehler während preLaunchTask \"{0}\".",
- 	"preLaunchTaskExitCode": "Der preLaunchTask \"{0}\" wurde mit dem Exitcode {1} beendet.",
-+<<<<<<< .our
- 	"showErrors": "Fehler anzeigen",
-+=======
-+	"debugAnyway": "Trotzdem debuggen",
-+	"showErrors": "Fehler anzeigen",
-+	"cancel": "Abbrechen",
-+>>>>>>> .their
- 	"noFolderWorkspaceDebugError": "Debuggen der aktiven Datei ist nicht möglich. Stellen Sie sicher, dass sie auf einem Datenträger gespeichert ist und dass Sie die Debugerweiterung für diesen Dateityp installiert haben.",
- 	"cancel": "Abbrechen",
- 	"DebugTaskNotFound": "Der Task \"{0}\" konnte nicht gefunden werden.",
-changed in both
-  base   100644 99c67ee657c8d3c3450e2f002ca2f207e14ee49f i18n/deu/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-  our    100644 0e47ff84d42795084b73b4ffe93f3912ded6c392 i18n/deu/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-  their  100644 b094f314c8160fe0dfa3805680abd7f8db1acd9a i18n/deu/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-changed in both
-  base   100644 5991e08616ab7ebc2daa75ec42b1ccb1e9bf7f13 i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 cf7a07fdcb5de4fa57ac5ab17021ee98e54c3fc8 i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 e651a4b4ffcc05f6bc4fa4c79883c58bc8f6bbfb i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-@@ -56,12 +56,19 @@
- 	"OpenExtensionsFile.failed": "Die Datei \"extensions.json\" kann nicht im Ordner \".vscode\" erstellt werden ({0}).",
- 	"configureWorkspaceRecommendedExtensions": "Empfohlene Erweiterungen konfigurieren (Arbeitsbereich)",
- 	"configureWorkspaceFolderRecommendedExtensions": "Empfohlene Erweiterungen konfigurieren (Arbeitsbereichsordner)",
-+<<<<<<< .our
- 	"malicious tooltip": "Die Erweiterung wurde als problematisch gemeldet.",
- 	"malicious": "Böswillig",
- 	"disabled": "Deaktiviert",
- 	"disabled globally": "Deaktiviert",
- 	"disabled workspace": "Für diesen Arbeitsbereich deaktiviert",
- 	"disableAll": "Alle installierten Erweiterungen deaktivieren",
-+=======
-+	"builtin": "Integriert",
-+	"malicious tooltip": "Die Erweiterung wurde als problematisch gemeldet.",
-+	"malicious": "Böswillig",
-+	"disableAll": "Alle installierten Erweiterungen löschen",
-+>>>>>>> .their
- 	"disableAllWorkspace": "Alle installierten Erweiterungen für diesen Arbeitsbereich deaktivieren",
- 	"enableAll": "Alle Erweiterungen aktivieren",
- 	"enableAllWorkspace": "Alle Erweiterungen für diesen Arbeitsbereich aktivieren",
-changed in both
-  base   100644 80327bb0f120baae46e40c040cfa8ad155d851de i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-  our    100644 aac1ac14a6da026536311b68e103f2d7c51317bf i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-  their  100644 225bd3cf3d6528b880494c9fed27eef6af95e995 i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-@@ -6,9 +6,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"restart1": "Profilerweiterungen",
- 	"restart2": "Zum Erstellen von Profilerweiterungen ist ein Neustart erforderlich. Möchten Sie \"{0}\" jetzt neu starten?",
- 	"restart3": "Neu starten",
- 	"cancel": "Abbrechen",
-+=======
-+	"noPro": "Führen Sie zum Profilieren von Erweiterungen den Start mit \"--inspect-extensions=<port>\" durch.",
-+>>>>>>> .their
- 	"selectAndStartDebug": "Klicken Sie, um die Profilerstellung zu beenden."
- }
-\ No newline at end of file
-changed in both
-  base   100644 e491d64753137a755717335042f35bb92f345ab8 i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 5272d4afb1fdf32991cbacee03058c69d41ba9c7 i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 32a7731c5fd9fc83ffe6e58203ec8740ec9c113c i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -10,13 +10,22 @@
- 	"searchMarketplace": "Marketplace durchsuchen",
- 	"dynamicWorkspaceRecommendation": "Diese Erweiterung ist für Sie möglicherweise interessant, da sie von vielen anderen Benutzern des Repositorys {0} verwendet wird.",
- 	"exeBasedRecommendation": "Diese Erweiterung wird empfohlen, da Sie {0} installiert haben.",
-+<<<<<<< .our
- 	"fileBasedRecommendation": "Ausgehend von den kürzlich geöffneten Dateien wird diese Erweiterung empfohlen.",
- 	"workspaceRecommendation": "Diese Erweiterung wird von Benutzern des aktuellen Arbeitsbereichs empfohlen.",
-+=======
-+	"dynamicWorkspaceRecommendation": "Diese Erweiterung ist für Sie möglicherweise interessant, da sie von vielen anderen Benutzern des aktuellen Arbeitsbereichs verwendet wird.",
-+>>>>>>> .their
- 	"reallyRecommended2": "Für diesen Dateityp wird die Erweiterung \"{0}\" empfohlen.",
- 	"reallyRecommendedExtensionPack": "Für diesen Dateityp wird das Erweiterungspaket \"{0}\" empfohlen.",
- 	"install": "Installieren",
-+<<<<<<< .our
- 	"showRecommendations": "Empfehlungen anzeigen",
- 	"showLanguageExtensions": "Der Marketplace enthält Erweiterungen, die bei \".{0}\"-Dateien behilflich sind.",
-+=======
-+	"showLanguageExtensions": "Der Marketplace enthält Erweiterungen, die bei \".{0}\"-Dateien behilflich sind.",
-+	"searchMarketplace": "Marketplace durchsuchen",
-+>>>>>>> .their
- 	"workspaceRecommended": "Für diesen Arbeitsbereich sind Erweiterungsempfehlungen verfügbar.",
- 	"installAll": "Alle installieren",
- 	"ignoreExtensionRecommendations": "Möchten Sie alle Erweiterungsempfehlungen ignorieren?",
-changed in both
-  base   100644 c38717835d679756263dc7c87f3d4ba0d1ecf74b i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  our    100644 7344b01b4a3219fe21a92df254af8af45008be39 i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  their  100644 a3725fa64c59f98c8e680bc9f2b8db40dc66ce9c i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-changed in both
-  base   100644 5fa89a5902e04fe044442ae754ad5c475f831216 i18n/deu/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
-  our    100644 9c84dc579d641a67ff0f0033693f2874a18aa35e i18n/deu/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
-  their  100644 eea50360cc91f43d30b50f133fd3120d8cf39f45 i18n/deu/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
-@@ -10,7 +10,11 @@
- 	"malicious": "Diese Erweiterung wird als problematisch gemeldet.",
- 	"installingMarketPlaceExtension": "Die Erweiterung wird aus dem Marketplace installiert …",
- 	"uninstallingExtension": "Die Erweiterung wird deinstalliert …",
-+<<<<<<< .our
- 	"enableDependeciesConfirmation": "Durch das Aktivieren einer Erweiterung werden auch deren Abhängigkeiten aktiviert. Möchten Sie den Vorgang fortsetzen?",
-+=======
-+	"enableDependeciesConfirmation": "Durch Aktivieren von \"{0}\" werden auch die dazugehörigen Abhängigkeiten aktiviert. Möchten Sie fortfahren?",
-+>>>>>>> .their
- 	"enable": "Ja",
- 	"doNotEnable": "Nein",
- 	"disableDependeciesConfirmation": "Möchten Sie die Abhängigkeiten der Erweiterungen ebenfalls deaktivieren?",
-changed in both
-  base   100644 968c208fb47cab653d139b273d8a3b0263021284 i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  our    100644 da62e80408d3ad02f6eb7c71f4a32236b4605b89 i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  their  100644 befad7301564ee9dd7554de899dc27fedd55b483 i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-changed in both
-  base   100644 5d69462d71711d97b541177a13bcffdbf51932bc i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 e5540f790640626d6989cde6c94da0327b708bbf i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 fb478bf901e8ac1170ed9dddff38afcd3c45ed94 i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -25,6 +25,7 @@
- 	"dirtyMessageFolderDelete": "Sie löschen einen Ordner mit nicht gespeicherten Änderungen in {0} Dateien. Möchten Sie den Vorgang fortsetzen?",
- 	"dirtyMessageFileDelete": "Sie löschen eine Datei mit nicht gespeicherten Änderungen. Möchten Sie den Vorgang fortsetzen?",
- 	"dirtyWarning": "Ihre Änderungen gehen verloren, wenn Sie diese nicht speichern.",
-+<<<<<<< .our
- 	"undoBin": "Die Wiederherstellung kann aus dem Papierkorb erfolgen.",
- 	"undoTrash": "Die Wiederherstellung kann aus dem Papierkorb erfolgen.",
- 	"doNotAskAgain": "Nicht erneut fragen",
-@@ -40,14 +41,27 @@
- 	"confirmMoveTrashMessageFile": "Möchten Sie \"{0}\" wirklich löschen?",
- 	"confirmDeleteMessageFilesAndDirectories": "Möchten Sie die folgenden {0} Dateien/Verzeichnisse und ihren Inhalt dauerhaft löschen?",
- 	"confirmDeleteMessageMultipleDirectories": "Möchten Sie die folgenden {0} Verzeichnisse und ihren Inhalt dauerhaft löschen?",
-+=======
-+	"confirmMoveTrashMessageMultiple": "Möchten Sie die folgenden {0} Dateien löschen?",
-+	"confirmMoveTrashMessageFolder": "Möchten Sie \"{0}\" samt Inhalt wirklich löschen?",
-+	"confirmMoveTrashMessageFile": "Möchten Sie \"{0}\" wirklich löschen?",
-+	"undoBin": "Die Wiederherstellung kann aus dem Papierkorb erfolgen.",
-+	"undoTrash": "Die Wiederherstellung kann aus dem Papierkorb erfolgen.",
-+	"doNotAskAgain": "Nicht erneut fragen",
-+>>>>>>> .their
- 	"confirmDeleteMessageMultiple": "Möchten Sie die folgenden {0} Dateien endgültig löschen?",
- 	"confirmDeleteMessageFolder": "Möchten Sie \"{0}\" samt Inhalt wirklich endgültig löschen?",
- 	"confirmDeleteMessageFile": "Möchten Sie \"{0}\" wirklich endgültig löschen?",
- 	"addFiles": "Dateien hinzufügen",
- 	"confirmOverwrite": "Im Zielordner ist bereits eine Datei oder ein Ordner mit dem gleichen Namen vorhanden. Möchten Sie sie bzw. ihn ersetzen?",
- 	"replaceButtonLabel": "&&Ersetzen",
-+<<<<<<< .our
- 	"fileIsAncestor": "Die einzufügende Datei ist ein Vorgänger des Zielordners",
- 	"fileDeleted": "Die einzufügende Datei wurde zwischenzeitlich gelöscht oder verschoben.",
-+=======
-+	"fileDeleted": "Die Datei wurde zwischenzeitlich gelöscht oder verschoben.",
-+	"fileIsAncestor": "Die zu kopierende Datei ist ein Vorgänger des Zielordners",
-+>>>>>>> .their
- 	"duplicateFile": "Duplikat",
- 	"globalCompareFile": "Aktive Datei vergleichen mit...",
- 	"openFileToCompare": "Zuerst eine Datei öffnen, um diese mit einer anderen Datei zu vergleichen",
-changed in both
-  base   100644 90eb9a59429aef41be2b7d30e40730baa4ab1304 i18n/deu/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 99f2be77fbb56221d4c3c1cc8f45e6884be7fd7a i18n/deu/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 3a121e07e4e137d92b9ef0ca51f60c44aa42edb2 i18n/deu/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-changed in both
-  base   100644 9d65fed4b7fc1cc7fe20ec15c6a4176232e229c0 i18n/deu/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  our    100644 89c8d9fa907d279de7e54d5e05888634d504dacc i18n/deu/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  their  100644 939255ddb78d03312db79c5a97cbae174154bd59 i18n/deu/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-@@ -15,9 +15,13 @@
- 	"dropFolder": "Möchten Sie den Ordner zum Arbeitsbereich hinzufügen?",
- 	"addFolders": "&&Ordner hinzufügen",
- 	"addFolder": "&&Ordner hinzufügen",
-+<<<<<<< .our
- 	"confirmRootsMove": "Möchten Sie die Reihenfolge mehrerer Stammordner in Ihrem Arbeitsbereich ändern?",
- 	"confirmMultiMove": "Möchten Sie die folgenden {0} Dateien verschieben?",
- 	"confirmRootMove": "Möchten Sie die Reihenfolge des Stammordners \"{0}\" in Ihrem Arbeitsbereich ändern?",
-+=======
-+	"confirmMultiMove": "Möchten Sie die folgenden {0} Dateien verschieben?",
-+>>>>>>> .their
- 	"confirmMove": "Möchten Sie \"{0}\" wirklich verschieben?",
- 	"doNotAskAgain": "Nicht erneut fragen",
- 	"moveButtonLabel": "&&Verschieben",
-changed in both
-  base   100644 81aadc9a45fa7cde37ab1a54a4edddf007bf810a i18n/deu/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  our    100644 0b0f4d7c9c60baa558aea30524b31e8a72e10f84 i18n/deu/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  their  100644 49305c0e3f8b0e2dc7059a820cb99fe26999cf28 i18n/deu/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-@@ -15,7 +15,11 @@
- 	"mainProcess": "Haupt",
- 	"selectProcess": "Protokoll für Prozess auswählen",
- 	"openLogFile": "Protokolldatei öffnen …",
-+<<<<<<< .our
- 	"setLogLevel": "Protokollstufe festlegen…",
-+=======
-+	"setLogLevel": "Protokollstufe festlegen",
-+>>>>>>> .their
- 	"trace": "Nachverfolgen",
- 	"debug": "Debuggen",
- 	"info": "Info",
-changed in both
-  base   100644 8954d15539bfa2cb89ba85f281f4aaf5449970b6 i18n/deu/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-  our    100644 900a7f7ac3b7b4eec58da0278aaf74958ffe4b28 i18n/deu/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-  their  100644 88ed08aa1d5d415dddba98ad0158ec83a2075853 i18n/deu/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-changed in both
-  base   100644 7adf632c3092f556355232f8c613c86cb16330cd i18n/deu/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  our    100644 737a3d57cf844a63ebd59c6462488a0472760d7a i18n/deu/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  their  100644 90fed2917e7b0ddb8a4b222b5355e03c37b89d81 i18n/deu/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-@@ -21,7 +21,11 @@
- 	"showSameKeybindings": "Die gleichen Tastenzuordnung anzeigen",
- 	"copyLabel": "Kopieren",
- 	"copyCommandLabel": "Befehl kopieren",
-+<<<<<<< .our
- 	"error": "Fehler \"{0}\" beim Bearbeiten der Tastenzuordnung. Überprüfen Sie die Datei \"keybindings.json\" auf Fehler.",
-+=======
-+	"error": "Fehler '{0}' beim Bearbeiten der Tastenzuordnung. Überprüfen Sie die Datei 'keybindings.json'.",
-+>>>>>>> .their
- 	"command": "Befehlstaste",
- 	"keybinding": "Tastenzuordnung",
- 	"source": "Quelle",
-changed in both
-  base   100644 11ed109afd50760966dd9ee0f193172217df94fb i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-  our    100644 3d77216b1a1d5e227d0a712025ced6f776fffcf1 i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-  their  100644 6baba95d0bf4c3e5509fcea8987dacf839618c5e i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-changed in both
-  base   100644 a08bfa9fee88a21a6dc014ed15b5c35031ba9620 i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 93e401bd692b17b66ba4a0cb54c6f67464e449ac i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 91d7c1dbf42bdb260f55459c461771ed77fc9f1c i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -9,7 +9,10 @@
- 	"emptyUserSettingsHeader": "Platzieren Sie Ihre Einstellungen hier, um die Standardeinstellungen zu überschreiben.",
- 	"emptyWorkspaceSettingsHeader": "Platzieren Sie Ihre Einstellungen hier, um die Benutzereinstellungen zu überschreiben.",
- 	"emptyFolderSettingsHeader": "Platzieren Sie Ihre Ordnereinstellungen hier, um die Einstellungen in den Arbeitsbereichseinstellungen zu überschreiben.",
-+<<<<<<< .our
- 	"reportSettingsSearchIssue": "Problem melden",
-+=======
-+>>>>>>> .their
- 	"newExtensionLabel": "Erweiterung \"{0}\" anzeigen",
- 	"editTtile": "Bearbeiten",
- 	"replaceDefaultValue": "In Einstellungen ersetzen",
-changed in both
-  base   100644 c8eac2ecc99d603168cef9cb957329df2519f29d i18n/deu/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  our    100644 eb263d7ae8b832d5edd4a36de00889ae94057caa i18n/deu/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  their  100644 a9fedc14f84c7d21da856ed9b32d50e5066cc183 i18n/deu/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-@@ -12,6 +12,10 @@
- 	"view": "Anzeigen",
- 	"scmConfigurationTitle": "SCM",
- 	"alwaysShowProviders": "Ob der Quellcodeverwaltungsanbieter-Abschnitt immer angezeigt wird.",
-+<<<<<<< .our
- 	"diffDecorations": "Steuert die Diff-Dekorationen im Editor.",
- 	"diffGutterWidth": "Steuert die Breite (px) der Diff-Dekorationen in der Liste (hinzugefügt und verändert)."
-+=======
-+	"diffDecorations": "Steuert die Diff-Dekorationen im Editor."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 5bb3da1c7b64f1b7700ad4d00d6ded02b541d518 i18n/deu/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 1dcdaff92772bd253ab87cb0ce46920ce5c5e6bc i18n/deu/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 f953fa7ad28bc8e08fe5b3a69d0e5dae8a394ae5 i18n/deu/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-changed in both
-  base   100644 c87e814819b354b98fb1434a7311d6e509e29e6f i18n/deu/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 24b953a60a63d0739209f04cdbf2997fcdde9b37 i18n/deu/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 d91ba5a50c718958e9c071c98da85ade9de37975 i18n/deu/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -30,6 +30,10 @@
- 	"search.quickOpen.includeSymbols": "Konfigurieren Sie diese Option, um Ergebnisse aus einer globalen Symbolsuche in die Dateiergebnisse für Quick Open einzuschließen.",
- 	"search.followSymlinks": "Steuert, ob Symlinks während der Suche gefolgt werden.",
- 	"search.smartCase": "Sucht ohne Berücksichtigung von Groß-/Kleinschreibung, wenn das Muster kleingeschrieben ist, andernfalls wird mit Berücksichtigung von Groß-/Kleinschreibung gesucht.",
-+<<<<<<< .our
- 	"search.globalFindClipboard": "Steuert, ob die Suchansicht die freigegebene Suchzwischenablage auf macOS lesen oder verändern soll",
- 	"search.location": "Steuert, ob die Suche als Ansicht in der Seitenleiste oder als Bereich angezeigt wird (die zweite Variante bietet mehr Platz in der Horizontalen)."
-+=======
-+	"search.globalFindClipboard": "Steuert, ob das Viewlet zum Suchen die freigegebene Suchzwischenablage auf macOS lesen oder verändern soll"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 4bd363ba285954baf8b1ff6da854829370cb7ddb i18n/deu/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 b3a9bfb6f09fdd913393d2a5b333f495988fabdc i18n/deu/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 31dfb0b2d5efecc1bde59365203125f9c900e774 i18n/deu/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-changed in both
-  base   100644 836f833e80fea920ad8ccd46da49e2cb88b4dae8 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 e7e17f13a867ab30a0455dba8cfbc4967b92e2a0 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 23701807e373b10cc1b737e4a9f908986b7a5e6e i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -16,6 +16,10 @@
- 	"terminal.integrated.shell.windows": "Der Pfad der Shell, den das Terminal unter Windows verwendet, wenn in Windows enthaltene Terminals verwendet werden  (cmd, PowerShell oder Bash unter Ubuntu).",
- 	"terminal.integrated.shellArgs.windows": "Die Befehlszeilenargumente, die im Windows-Terminal verwendet werden sollen.",
- 	"terminal.integrated.macOptionIsMeta": "Optionsschlüssel als Metaschlüssel im Terminal auf macOS behandeln.",
-+<<<<<<< .our
-+=======
-+	"terminal.integrated.rightClickCopyPaste": "Wenn dies festgelegt ist, erscheint das Kontextmenü bei einem Rechtsklick im Terminal nicht mehr. Stattdessen erfolgen die Vorgänge Kopieren, wenn eine Auswahl vorgenommen wurde, sowie Einfügen, wenn keine Auswahl vorgenommen wurde.",
-+>>>>>>> .their
- 	"terminal.integrated.copyOnSelection": "Wenn gesetzt, wird der im Terminal ausgewählte Text in die Zwischenablage kopiert.",
- 	"terminal.integrated.fontFamily": "Steuert die Schriftartfamilie des Terminals. Der Standardwert ist \"editor.fontFamily\".",
- 	"terminal.integrated.fontSize": "Steuert den Schriftgrad des Terminals in Pixeln.",
-@@ -37,7 +41,10 @@
- 	"terminal.integrated.env.linux": "Objekt mit Umgebungsvariablen, das dem unter Linux vom Terminal zu verwendenden VS Code-Prozess hinzugefügt wird",
- 	"terminal.integrated.env.windows": "Objekt mit Umgebungsvariablen, das dem unter Windows vom Terminal zu verwendenden VS Code-Prozess hinzugefügt wird",
- 	"terminal.integrated.showExitAlert": "Warnung \"Der Terminalprozess wurde mit folgendem Exitcode beendet\" anzeigen, wenn der Exitcode nicht Null ist.",
-+<<<<<<< .our
- 	"terminal.integrated.experimentalRestore": "Ob aktive Terminalsitzungen für den Arbeitsbereich beim Starten von VS Code automatisch wiederhergestellt werden sollen. Diese Einstellung ist in der Testphase, kann fehlerhaft sein und in Zukunft geändert werden.",
-+=======
-+>>>>>>> .their
- 	"terminalCategory": "Terminal",
- 	"viewCategory": "Anzeigen"
- }
-\ No newline at end of file
-changed in both
-  base   100644 f4cfedf333b5c4f8464342366c4400c663cc4497 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 84fc7fe0d67567c48c4b669c0d3d08c7386267cc i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 d2d35c523b060f8004a7ac1ff7ec3f78bd76fd58 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -11,6 +11,9 @@
- 	"terminalCursor.foreground": "Die Vordergrundfarbe des Terminalcursors.",
- 	"terminalCursor.background": "Die Hintergrundfarbe des Terminalcursors. Ermöglicht das Anpassen der Farbe eines Zeichens, das von einem Blockcursor überdeckt wird.",
- 	"terminal.selectionBackground": "Die Auswahlvordergrundfarbe des Terminals.",
-+<<<<<<< .our
- 	"terminal.border": "Die Farbe des Rahmens, der Bereiche innerhalb des Terminals teilt. Der Standardwert ist panel.border.",
-+=======
-+>>>>>>> .their
- 	"terminal.ansiColor": "\"{0}\" ANSI-Farbe im Terminal"
- }
-\ No newline at end of file
-changed in both
-  base   100644 0e7a25d469ad976548394770f1a31ad71d3dba2a i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-  our    100644 aa2b4267c119832c5968d8d9433c6d265bf82336 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-  their  100644 d16dc80c2da465c7449f61f1fe49fe234ff8a19e i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-@@ -9,11 +9,14 @@
- 	"terminal.integrated.a11yBlankLine": "Leere Zeile",
- 	"terminal.integrated.a11yPromptLabel": "Terminaleingabe",
- 	"terminal.integrated.a11yTooMuchOutput": "Zu viele Ausgaben zum Anzeigen, navigieren Sie manuell zu den Zeilen, um sie zu lesen",
-+<<<<<<< .our
- 	"yes": "Ja",
- 	"terminal.rendererInAllNewTerminals": "Alle neu erstellten Terminals verwenden den Nicht-GPU-Renderer.",
- 	"no": "Nein",
- 	"dontShowAgain": "Nicht mehr anzeigen",
- 	"terminal.slowRendering": "Der Standardrenderer für das integrierte Terminal ist auf Ihrem Computer offenbar langsam. Möchten Sie zum alternativen DOM-basierten Renderer wechseln? Hierdurch kann die Leistung verbessert werden. [Weitere Informationen zu Terminaleinstellungen](https://code.visualstudio.com/docs/editor/integrated-terminal#_changing-how-the-terminal-is-rendered)",
-+=======
-+>>>>>>> .their
- 	"terminal.integrated.copySelection.noSelection": "Das Terminal enthält keine Auswahl zum Kopieren.",
- 	"terminal.integrated.exitedWithCode": "Der Terminalprozess wurde mit folgendem Exitcode beendet: {0}",
- 	"terminal.integrated.waitOnExit": "Betätigen Sie eine beliebige Taste, um das Terminal zu schließen.",
-changed in both
-  base   100644 8382b744970eac2a9fbf1f356b8d7a9983095daf i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  our    100644 19d7340468676889919217f01b6462b1b0b9da96 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  their  100644 4f31639f0ae894a8fef9f74e44daca2cc2645022 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-@@ -8,7 +8,12 @@
- 	],
- 	"terminal.integrated.chooseWindowsShellInfo": "Sie können die Standardterminalshell über die Schaltfläche \"Anpassen\" ändern.",
- 	"customize": "Anpassen",
-+<<<<<<< .our
- 	"never again": "Nicht mehr anzeigen",
-+=======
-+	"cancel": "Abbrechen",
-+	"never again": "OK, nicht mehr anzeigen",
-+>>>>>>> .their
- 	"terminal.integrated.chooseWindowsShell": "Wählen Sie Ihre bevorzugte Terminalshell. Sie können diese später in Ihren Einstellungen ändern.",
- 	"terminalService.terminalCloseConfirmationSingular": "Eine aktive Terminalsitzung ist vorhanden. Möchten Sie sie beenden?",
- 	"terminalService.terminalCloseConfirmationPlural": "{0} aktive Terminalsitzungen sind vorhanden. Möchten Sie sie beenden?"
-changed in both
-  base   100644 9596e70c245863acf3703a3493493f2045180cb9 i18n/deu/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json
-  our    100644 d38fff48236f67942d672c5e202f54584fb4cf35 i18n/deu/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json
-  their  100644 e3ed2866854d79ae0dd6d51c6056e050fc0b5fa9 i18n/deu/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json
-@@ -6,5 +6,12 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"release notes": "Anmerkungen zu dieser Version"
-+=======
-+	"release notes": "Anmerkungen zu dieser Version",
-+	"updateConfigurationTitle": "Aktualisieren",
-+	"updateChannel": "Konfiguriert, ob automatische Updates aus einem Updatekanal empfangen werden sollen. Erfordert einen Neustart nach der Änderung.",
-+	"enableWindowsBackgroundUpdates": "Aktiviert Windows-Hintergrundaktualisierungen."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 84809623043e309a5eb4de1da3b61dd4fd6d9ae0 i18n/deu/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 dca9f59735754d2304f7bca4be1c8c6b2470923f i18n/deu/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 a2ff426010d896e75f970c112d1930501ea3523c i18n/deu/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -16,12 +16,18 @@
- 	"noUpdatesAvailable": "Zurzeit sind keine Updates verfügbar.",
- 	"ok": "OK",
- 	"thereIsUpdateAvailable": "Ein Update ist verfügbar.",
-+<<<<<<< .our
- 	"download now": "Jetzt herunterladen",
- 	"later": "Später",
- 	"updateAvailable": "Ein Update ist verfügbar: {0} {1}",
- 	"installUpdate": "Update installieren",
- 	"updateInstalling": "{0} {1} wird im Hintergrund installiert. Wir informieren Sie, wenn der Vorgng abgeschlossen ist.",
- 	"updateAvailableAfterRestart": "Starten Sie {0} neu, um das neueste Update zu installieren.",
-+=======
-+	"installUpdate": "Update installieren",
-+	"updateAvailable": "Ein Update ist verfügbar: {0} {1}",
-+	"updateInstalling": "{0} {1} wird im Hintergrund installiert. Wir informieren Sie, wenn dies abgeschlossen ist.",
-+>>>>>>> .their
- 	"updateNow": "Jetzt aktualisieren",
- 	"commandPalette": "Befehlspalette...",
- 	"settings": "Einstellungen",
-changed in both
-  base   100644 9ea62fa02aa936eda8fc1bc256708148aa37c4de i18n/deu/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-  our    100644 6dfaa8e09e1ebf0b9c830edc04ba7a7171df0643 i18n/deu/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-  their  100644 8b206a77c779d12b041986ab5390dc97c7ed1ab7 i18n/deu/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-changed in both
-  base   100644 85f3567181fabd14e7c56d0803f95a1f7c454cef i18n/esn/extensions/emmet/package.i18n.json
-  our    100644 d6c05800c1ebc6febea004f2095561aeefca8479 i18n/esn/extensions/emmet/package.i18n.json
-  their  100644 371fe6268dafaaa3b536326bc17890fc57dbd438 i18n/esn/extensions/emmet/package.i18n.json
-@@ -56,10 +56,17 @@
- 	"emmetPreferencesFormatNoIndentTags": "Una matriz de nombres de etiqueta que no debería recibir una sangría interna",
- 	"emmetPreferencesFormatForceIndentTags": "Una matriz de nombres de etiqueta que siempre debería recibir una sangría interna",
- 	"emmetPreferencesAllowCompactBoolean": "Si es 'true', se produce una anotación compacta de atributos booleanos",
-+<<<<<<< .our
- 	"emmetPreferencesCssWebkitProperties": "Propiedades CSS separadas por comas que obtienen el prefijo de proveedor 'webkit' cuando se utilizan en la abreviatura Emmet que comienza con '-'. Establecer en la cadena vacía para evitar siempre el prefijo 'webkit'.",
- 	"emmetPreferencesCssMozProperties": "Propiedades CSS separadas por comas que obtienen el prefijo de proveedor 'moz' cuando se utilizan en la abreviatura Emmet que comienza con '-'. Establecer en la cadena vacía para evitar siempre el prefijo 'moz'.",
- 	"emmetPreferencesCssOProperties": "Propiedades CSS separadas por comas que obtienen el prefijo de proveedor 'o' cuando se utilizan en la abreviatura Emmet que comienza con '-'. Establecer en la cadena vacía para evitar siempre el prefijo 'o'.",
- 	"emmetPreferencesCssMsProperties": "Propiedades CSS separadas por comas que obtienen el prefijo de proveedor 'ms' cuando se utilizan en la abreviatura Emmet que comienza con '-'. Establecer en la cadena vacía para evitar siempre el prefijo 'ms'.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "La mínima puntuación (de 0 a 1) que se debe alcanzar en la comparación difusa de abreviación. Los valores más bajos pueden producir muchos resultados falsos positivos, los valores más altos pueden reducir posibles coincidencias.",
- 	"emmetOptimizeStylesheetParsing": "Cuando se establece en falso, se analiza el archivo entero para determinar si la posición actual es válida para la expansión de abreviaturas de Emmet. Cuando se establece en verdadero, sólo el contenido alrededor de la posición actual en archivos css, scss/less es analizado."
-+=======
-+	"emmetPreferencesCssWebkitProperties": "Propiedades CSS separadas por comas que consiguen el prefijo de proveedor WebKit cuando se utiliza en la abreviatura Emmet que comienza con '-'. Establecer en la cadena vacía para evitar el prefijo WebKit siempre.",
-+	"emmetPreferencesCssMozProperties": "Propiedades CSS separadas por comas que consiguen el prefijo de proveedor moz cuando se utiliza en la abreviatura Emmet que empieza por '-'. Establecer en la cadena vacía para evitar el prefijo moz siempre.",
-+	"emmetPreferencesCssOProperties": "Propiedades CSS separadas por comas que consiguen o prefijo de proveedor cuando se utiliza en la abreviatura Emmet que comienza con '-'. Establecer en la cadena vacía para evitar o prefijo siempre.",
-+	"emmetPreferencesCssMsProperties": "Propiedades CSS separadas por comas que consiguen el prefijo proveedor de MS cuando se utilizan en la abreviatura Emmet que empieza por '-'. Establecer en la cadena vacía para evitar el prefijo de MS siempre."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 63b41aa2e8f9772de7af036b18921c870f6ce7f1 i18n/esn/extensions/git/package.i18n.json
-  our    100644 87a73cba8a7c7a490f6aba897a9a18d1a57dfc4c i18n/esn/extensions/git/package.i18n.json
-  their  100644 cc607b168e4a4cc2bce4f8ade9962e0eb92efd4c i18n/esn/extensions/git/package.i18n.json
-@@ -75,9 +75,14 @@
- 	"config.decorations.enabled": "Controla si Git contribuye los colores y distintivos al explorador y a los editores abiertos.",
- 	"config.promptToSaveFilesBeforeCommit": "Controla si Git debe comprobar los archivos no guardados antes de confirmar las actualizaciones. ",
- 	"config.showInlineOpenFileAction": "Controla si se debe mostrar una acción de archivo abierto en la vista de cambios en Git",
-+<<<<<<< .our
- 	"config.inputValidation": "Controla cuándo mostrar el mensaje de validación de entrada en el contador de entrada.",
- 	"config.detectSubmodules": "Controla si se detectan automáticamente los submódulos Git. ",
- 	"config.detectSubmodulesLimit": "Controla el límite de submódulos de git detectados.",
-+=======
-+	"config.inputValidation": "Controla cuándo mostrar la validación de entrada el contador de entrada.",
-+	"config.detectSubmodules": "Controla si se detectan automáticamente los submódulos Git. ",
-+>>>>>>> .their
- 	"colors.modified": "Color para recursos modificados.",
- 	"colors.deleted": "Color para los recursos eliminados.",
- 	"colors.untracked": "Color para los recursos a los que no se les hace seguimiento.",
-changed in both
-  base   100644 aa0a765d6928769c95bff8d6e1daca992ec3e73e i18n/esn/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  our    100644 c55f03b5326124fc19c3d9f61315a6359293e3eb i18n/esn/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  their  100644 ad704b8b1740925f21734c2c2aa339eabad4b721 i18n/esn/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-@@ -12,6 +12,7 @@
- 	"loadingData": "Cargando datos...",
- 	"rateLimited": "Límite de consulta de GitHub excedido. Espera.",
- 	"similarIssues": "Problemas similares",
-+<<<<<<< .our
- 	"open": "Abrir",
- 	"closed": "Cerrado",
- 	"noSimilarIssues": "No se han encontrado problemas similares",
-@@ -19,6 +20,10 @@
- 	"bugReporter": "Informe de errores",
- 	"featureRequest": "Solicitud de característica",
- 	"performanceIssue": "Problema de rendimiento",
-+=======
-+	"noResults": "No se encontraron resultados",
-+	"rateLimited": "Límite de la API superado",
-+>>>>>>> .their
- 	"stepsToReproduce": "Pasos para reproducir",
- 	"bugDescription": "Indique los pasos necesarios para reproducir el problema. Debe incluir el resultado real y el resultado esperado. Admitimos Markdown al estilo de GitHub. Podrá editar el problema y agregar capturas de pantalla cuando veamos una vista previa en GitHub.",
- 	"performanceIssueDesciption": "¿Cuándo ocurrió este problema de rendimiento? ¿Se produce al inicio o después de realizar una serie específica de acciones? Admitimos Markdown al estilo de GitHub. Podrá editar el problema y agregar capturas de pantalla cuando veamos una vista previa en GitHub.",
-changed in both
-  base   100644 4f166939ad6bde0610fefba0326c670e9d849851 i18n/esn/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  our    100644 9333872d13ac187999b64000740250452a50a86d i18n/esn/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  their  100644 52308fd1777072daac653babcf1b119171b78237 i18n/esn/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-@@ -16,6 +16,7 @@
- 	"chooseExtension": "Extensión",
- 	"issueTitleLabel": "Título",
- 	"issueTitleRequired": "Por favor, introduzca un título.",
-+<<<<<<< .our
- 	"titleLengthValidation": "El título es demasiado largo.",
- 	"details": "Especifique los detalles.",
- 	"sendSystemInfo": "Incluir la información de mi sistema ({0})",
-@@ -25,4 +26,19 @@
- 	"sendExtensions": "Incluir mis extensiones habilitadas ({0})",
- 	"sendSearchedExtensions": "Enviar extensiones examinadas ({0})",
- 	"sendSettingsSearchDetails": "Enviar configuración detalles de búsqueda ({0})"
-+=======
-+	"vscodeVersion": "Versión de VS Code",
-+	"osVersion": "Versión del sistema operativo",
-+	"systemInfo": "Mi información del sistema",
-+	"sendData": "Enviar mis datos",
-+	"processes": "Procesos actualmente en ejecución",
-+	"workspaceStats": "Estadísticas de mi área de trabajo",
-+	"extensions": "Mis extensiones",
-+	"tryDisablingExtensions": "El problema es reproducible cuando se deshabilitan las extensiones",
-+	"disableExtensions": "Deshabilitar todas las extensiones y volver a cargar la ventana",
-+	"showRunningExtensions": "Ver todas las extensiones en ejecución",
-+	"githubMarkdown": "Apoyamos Markdown tipo GitHub. Podrá editar su problema y añadir capturas de pantallas para cuando lo previsualicemos en GitHub.",
-+	"issueDescriptionRequired": "Por favor, introduzca una descripción.",
-+	"loadingData": "Cargando datos..."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 2ba6f8738b84a7571512d9f53920fa447568e7d6 i18n/esn/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 6ad3e3ebd5e87cf26a1b950237c8c58f3d92b674 i18n/esn/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 966708573a3427a8249c83cfbac7354292482c33 i18n/esn/src/vs/editor/common/config/commonEditorConfig.i18n.json
-changed in both
-  base   100644 b63b822852d4d2db204c68072b745ca64ece63b9 i18n/esn/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 b4899e15c5b89e537d227799bd60ed681404b6ca i18n/esn/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 88d96d8cc1683ca353f54b9e16af5cf221c673e7 i18n/esn/src/vs/platform/environment/node/argv.i18n.json
-changed in both
-  base   100644 83f5d1c197ffeecb9bd885eaae334bb7de1a4491 i18n/esn/src/vs/platform/list/browser/listService.i18n.json
-  our    100644 fd8a2daed6a43870631dc426114f600c70db9a69 i18n/esn/src/vs/platform/list/browser/listService.i18n.json
-  their  100644 3c5d4431859e8d3238567aa61603c9cb21453164 i18n/esn/src/vs/platform/list/browser/listService.i18n.json
-@@ -12,6 +12,10 @@
- 	"multiSelectModifier": "El modificador que se usará para agregar un elemento en árboles y listas a una selección múltiple con el mouse (por ejemplo en el explorador, los editores abiertos y la vista SCM). ' ctrlCmd ' se asigna a ' control ' en Windows y Linux y a ' Command ' en macOS. Los gestos de ratón \"abrir a lado\", si se admiten, se adaptarán de tal manera que no estén en conflicto con el modificador multiselección.",
- 	"openMode.singleClick": "Abre elementos en solo clic de ratón.",
- 	"openMode.doubleClick": "Abre elementos en doble clic del ratón. ",
-+<<<<<<< .our
- 	"openModeModifier": "Controla cómo abrir elementos en árboles y listas con el ratón (si está soportado). Establecer en ' singleClick ' para abrir elementos con un solo clic del ratón y ' DoubleClick ' para abrir sólo a través del doble clic del ratón. Para los elementos padres con hijos en los árboles, este ajuste controlará si un solo clic expande el padre o un doble clic. Tenga en cuenta que algunos árboles y listas pueden optar por ignorar esta configuración si no es aplicable",
- 	"horizontalScrolling setting": "Controla el esplazamiento horizontal de los árboles en la mesa de trabajo."
-+=======
-+	"openModeModifier": "Controla cómo abrir elementos en árboles y listas con el ratón (si está soportado). Establecer en ' singleClick ' para abrir elementos con un solo clic del ratón y ' DoubleClick ' para abrir sólo a través del doble clic del ratón. Para los elementos padres con hijos en los árboles, este ajuste controlará si un solo clic expande el padre o un doble clic. Tenga en cuenta que algunos árboles y listas pueden optar por ignorar esta configuración si no es aplicable"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 1f1a35ca71c4148035dfe009a0bd818e59c64647 i18n/esn/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
-  our    100644 0ca704a5b8dea3b4b19c4fc49ebd4f24aaa393e8 i18n/esn/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
-  their  100644 400b2707b25576ff43726422051dda703ea13afc i18n/esn/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
-@@ -11,7 +11,11 @@
- 	"sizeMB": "{0} MB",
- 	"sizeGB": "{0} GB",
- 	"sizeTB": "{0} TB",
-+<<<<<<< .our
- 	"largeImageError": "La imagen no se muestra en el editor porque es demasiado grande ({0}). ",
-+=======
-+	"largeImageError": "El tamaño del archivo de la imagen es demasiado grande (> 1MB) para mostrarlo en el editor.",
-+>>>>>>> .their
- 	"resourceOpenExternalButton": "¿Abrir la imagen mediante un programa externo?",
- 	"nativeFileTooLargeError": "El archivo no se muestra en el editor porque es demasiado grande ({0}). ",
- 	"nativeBinaryError": "El archivo no se muestra en el editor porque es binario o utiliza una codificación de texto no soportada. ",
-changed in both
-  base   100644 4bd190cdebb59709a790764895fdc907937308f0 i18n/esn/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  our    100644 6d6dfbb8c770fb0e507d7b4d7b666813db7a2504 i18n/esn/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  their  100644 a69b23ccc623afadd6e5085b0fde18c49c4f2ef8 i18n/esn/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-changed in both
-  base   100644 c05869af64d574c700a55264c939eb1a394ad70e i18n/esn/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  our    100644 634545e1c6f01f32015f6ce1bd5a355377917a51 i18n/esn/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  their  100644 71c57f441577d38fcdfc0ec4126c61cfc6892c46 i18n/esn/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-changed in both
-  base   100644 b0e42525c307425218d10ded093c44f10bf60547 i18n/esn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 d7550e4cd76b5e1079a00c63a6ae28b84fca74d3 i18n/esn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 88d1c104f8f5b207fc12acb9617417bc8806512d i18n/esn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -30,6 +30,10 @@
- 	"search.quickOpen.includeSymbols": "Configurar para incluir los resultados de una búsqueda global de símbolos en los resultados de archivos de Quick Open.",
- 	"search.followSymlinks": "Controla si debe seguir enlaces simbólicos durante la búsqueda.",
- 	"search.smartCase": "Proporciona busquedas de mayúsculas y minúsculas si el patrón es todo en minúsculas, de lo contrario, busca en mayúsculas y minúsculas",
-+<<<<<<< .our
- 	"search.globalFindClipboard": "Controla si la vista de búsqueda debe leer o modificar el portapapeles de búsqueda compartido en macOS",
- 	"search.location": "Controla si la búsqueda se muestra como una vista en la barra lateral o como un panel en el área de paneles para disponer de más espacio horizontal."
-+=======
-+	"search.globalFindClipboard": "Controla si la Viewlet de búsqueda debe leer o modificar el portapapeles de búsqueda compartido en macOS"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 099d68b5de18d25f188c0843a5bc5ba8c007706e i18n/fra/extensions/emmet/package.i18n.json
-  our    100644 2b38d968d648e0792cab88ddd57aa657ed8e85b3 i18n/fra/extensions/emmet/package.i18n.json
-  their  100644 a84bbf2b5738648f0c02a9bd317cbceed4da9622 i18n/fra/extensions/emmet/package.i18n.json
-@@ -56,10 +56,17 @@
- 	"emmetPreferencesFormatNoIndentTags": "Un tableau de noms de balises qui ne devraient pas être indentées",
- 	"emmetPreferencesFormatForceIndentTags": "Un tableau de noms de balises qui devraient toujours être indentées",
- 	"emmetPreferencesAllowCompactBoolean": "Si true, la notation compacte des attributs booléens est produite",
-+<<<<<<< .our
- 	"emmetPreferencesCssWebkitProperties": "Les propriétés css séparées par des virgules qui ont un préfixe 'webkit' vendor lorsqu’elles sont utilisées dans une abréviation emmet qui commence par '-'. Mettre une chaîne vide pour éviter le préfixe 'webkit'.",
- 	"emmetPreferencesCssMozProperties": "Les propriétés css séparées par des virgules qui ont un préfixe 'moz' vendor lorsqu’elles sont utilisées dans une abréviation emmet qui commence par '-'. Mettre une chaîne vide pour éviter le préfixe 'moz'.",
- 	"emmetPreferencesCssOProperties": "Les propriétés css séparées par des virgules qui ont un préfixe 'o' vendor lorsqu’elles sont utilisées dans une abréviation emmet qui commence par '-'. Mettre une chaîne vide pour éviter le préfixe 'o'.",
- 	"emmetPreferencesCssMsProperties": "Les propriétés css séparées par des virgules qui ont un préfixe 'ms' vendor lorsqu’elles sont utilisées dans une abréviation emmet qui commence par '-'. Mettre une chaîne vide pour éviter le préfixe 'ms'.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "La note minimale (de 0 à 1) que la correspondance de l'abréviation (fuzzy-matched) devrait atteindre. Des valeurs plus faibles peuvent produire de nombreuses correspondances de faux-positifs, des valeurs plus élevées peuvent réduire les correspondances possibles.",
- 	"emmetOptimizeStylesheetParsing": "Si défini à false, la fichier entier est analysé pour déterminer si la position courante est valide pour l’expansion des abréviations Emmet. Si défini à true, seul le contenu autour de la position actuelle dans les fichiers css/scss/less est analysé."
-+=======
-+	"emmetPreferencesCssWebkitProperties": "Les propriétés css séparées par des virgules qui ont un préfixe webkit vendor lorsqu’elles sont utilisées dans une abréviation emmet qui commence par '-'. Mettre une chaîne vide pour éviter le préfixe webkit.",
-+	"emmetPreferencesCssMozProperties": "Les propriétés css séparées par des virgules qui ont un préfixe moz vendor lorsqu’elles sont utilisées dans une abréviation emmet qui commence par '-'. Mettre une chaîne vide pour éviter le préfixe moz.",
-+	"emmetPreferencesCssOProperties": "Les propriétés css séparées par des virgules qui ont un préfixe o vendor lorsqu’elles sont utilisées dans une abréviation emmet qui commence par '-'. Mettre une chaîne vide pour éviter le préfixe o.",
-+	"emmetPreferencesCssMsProperties": "Les propriétés css séparées par des virgules qui ont un préfixe ms vendor lorsqu’elles sont utilisées dans une abréviation emmet qui commence par '-'. Mettre une chaîne vide pour éviter le préfixe o."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6faff6f0ebccd3b902025c82413364ef7597c02f i18n/fra/extensions/git/package.i18n.json
-  our    100644 6b9b77f8287566561f58c3376d7d8aaba2171809 i18n/fra/extensions/git/package.i18n.json
-  their  100644 8914c99a8baf1cf5f4265c17557a52e5196a71e2 i18n/fra/extensions/git/package.i18n.json
-@@ -75,9 +75,14 @@
- 	"config.decorations.enabled": "Contrôle si Git contribue aux couleurs et aux badges de l’Explorateur et à l'affichage des éditeurs ouverts.",
- 	"config.promptToSaveFilesBeforeCommit": "Contrôle si Git doit vérifier les fichiers non sauvegardés avant d'effectuer le commit.",
- 	"config.showInlineOpenFileAction": "Contrôle s’il faut afficher une action Ouvrir le fichier dans l’affichage des modifications de Git.",
-+<<<<<<< .our
- 	"config.inputValidation": "Contrôle quand afficher la validation de la saisie du message de commit.",
- 	"config.detectSubmodules": "Contrôle s’il faut détecter automatiquement les sous-modules git.",
- 	"config.detectSubmodulesLimit": "Contrôle la limite de sous-modules git détectés.",
-+=======
-+	"config.inputValidation": "Contrôle quand afficher la validation du compteur de saisie.",
-+	"config.detectSubmodules": "Contrôle s’il faut détecter automatiquement les sous-modules git.",
-+>>>>>>> .their
- 	"colors.modified": "Couleur pour les ressources modifiées.",
- 	"colors.deleted": "Couleur pour les ressources supprimées.",
- 	"colors.untracked": "Couleur pour les ressources non tracées.",
-changed in both
-  base   100644 e0b6c0e0890df9a18289c7097f45629ae4025277 i18n/fra/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  our    100644 59278815c7709903c6f75eb6563cddd43dfd9adc i18n/fra/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  their  100644 62f42ce6d30a8a5291dca3a81a472e7173da04d8 i18n/fra/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-@@ -6,6 +6,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"hide": "masquer",
- 	"show": "afficher",
- 	"previewOnGitHub": "Prévisualiser sur GitHub",
-@@ -27,5 +28,15 @@
- 	"expectedResults": "Résultats attendus",
- 	"settingsSearchResultsDescription": "Veuillez lister les résultats que vous vous attendiez à voir quand vous avez cherché cette requête. Nous supportons la syntaxe GitHub Markdown. Vous pourrez modifier votre question et ajouter des captures d’écran lorsque nous la prévisualiserons sur GitHub.",
- 	"pasteData": "Nous avons écrit les données nécessaires dans votre presse-papiers, car elles étaient trop volumineuses à envoyer. Veuillez les coller.",
-+=======
-+	"previewOnGitHub": "Prévisualiser sur GitHub",
-+	"similarIssues": "Problèmes similaires",
-+	"noResults": "Résultats introuvables",
-+	"rateLimited": "Limite de fréquence d’appel à l'API dépassée",
-+	"stepsToReproduce": "Étapes à reproduire",
-+	"bugDescription": "Comment avez-vous rencontré ce problème ? Quelles étapes devez-vous effectuer pour reproduire efficacement le problème ? Qu'attendiez-vous qu'il se produise et qu'est-il réellement arrivé ?",
-+	"performanceIssueDesciption": "Quand ce problème de performance est-il arrivé ? Par exemple, s'est-il produit au démarrage ou après une série d’actions spécifiques ? Tous les détails que vous pouvez fournir peuvent aider notre investigation.",
-+	"description": "Description",
-+>>>>>>> .their
- 	"disabledExtensions": "Les extensions sont désactivées"
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/fra/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  our    100644 ffcda9c228570c3e52d613586da7b45c348e91a4 i18n/fra/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  their  100644 8d6402b57cf45841756df74c75a281299dabe7c8 i18n/fra/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-@@ -7,6 +7,7 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"completeInEnglish": "Veuillez remplir le formulaire en anglais.",
-+<<<<<<< .our
- 	"issueTypeLabel": "Ceci est un ",
- 	"issueSourceLabel": "Fichier sur",
- 	"vscode": "Visual Studio Code",
-@@ -25,4 +26,25 @@
- 	"sendExtensions": "Inclure mes extensions activées ({0})",
- 	"sendSearchedExtensions": "Envoyer les extensions recherchées ({0})",
- 	"sendSettingsSearchDetails": " Envoyer les paramètres des critères de recherche ({0}) "
-+=======
-+	"issueTypeLabel": "Je veux soumettre un(e)",
-+	"bugReporter": "Rapport de bug",
-+	"performanceIssue": "Problème de performance",
-+	"featureRequest": "Demande de fonctionnalité",
-+	"issueTitleLabel": "Titre",
-+	"issueTitleRequired": "Veuillez s’il vous plaît entrer un titre.",
-+	"vscodeVersion": "Version de VS Code",
-+	"osVersion": "Version de l’OS",
-+	"systemInfo": "Mes infos système",
-+	"sendData": "Envoyer mes données",
-+	"processes": "Processus en cours d’exécution",
-+	"workspaceStats": "Mes Stats de l’espace de travail",
-+	"extensions": "Mes Extensions",
-+	"tryDisablingExtensions": "Le problème est reproductible lorsque les extensions sont désactivées",
-+	"disableExtensions": "en désactivant toutes les extensions et en rechargeant la fenêtre",
-+	"showRunningExtensions": "Voir toutes les extensions en cours d’exécution",
-+	"githubMarkdown": "Nous supportons la syntaxe GitHub Markdown. Vous pourrez modifier votre question et ajouter des captures d’écran lorsque nous la prévisualiserons sur GitHub.",
-+	"issueDescriptionRequired": "Veuillez entrer une description.",
-+	"loadingData": "Chargement des données..."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/fra/src/vs/code/electron-main/logUploader.i18n.json
-  our    100644 4ad0b5e052b0e1a9677f7cbd00bf025629415db4 i18n/fra/src/vs/code/electron-main/logUploader.i18n.json
-  their  100644 b85eee766a0b8beedeb2f06053acbc3e6e7cce4e i18n/fra/src/vs/code/electron-main/logUploader.i18n.json
-@@ -9,10 +9,18 @@
- 	"invalidEndpoint": "Point de terminaison d'upload de journal non valide",
- 	"beginUploading": "Téléchargement (Upload) ...",
- 	"didUploadLogs": "Téléchargement réussi ! ID du fichier de log : {0}",
-+<<<<<<< .our
- 	"logUploadPromptHeader": "Vous êtes sur le point de téléverser vos journaux de session vers un terminal Microsoft sécurisé auquel seuls les membres de l'équipe VS Code peuvent accéder.",
- 	"logUploadPromptBody": "Les journaux de session peuvent contenir des informations personnelles telles que les chemins d'accès complets ou le contenu des fichiers. Veuillez consulter et supprimer les fichiers journaux de session ici: '{0}'",
- 	"logUploadPromptBodyDetails": "En continuant, vous confirmez que vous avez revu et édité vos fichiers journaux de session et que vous acceptez que Microsoft les utilise pour déboguer VS Code.",
- 	"logUploadPromptAcceptInstructions": "Veuillez exécuter le code avec '--upload-logs={0}' pour réaliser l'upload",
-+=======
-+	"userDeniedUpload": "Téléchargement (Upload) annulé",
-+	"logUploadPromptHeader": "Télécharger les journaux de session pour sécuriser le point de terminaison ?",
-+	"logUploadPromptBody": "Veuillez vérifier vos fichiers journaux ici : '{0}'",
-+	"logUploadPromptBodyDetails": "Les journaux peuvent contenir des informations personnelles telles que des chemins d’accès complets et des contenus de fichiers.",
-+	"logUploadPromptKey": "J’ai passé en revue mes logs (entrez 'y' pour confirmer le téléchargement)",
-+>>>>>>> .their
- 	"postError": "Erreur en postant les journaux : {0}",
- 	"responseError": "Erreur en postant les journaux. Reçu {0} — {1}",
- 	"parseError": "Erreur en analysant la réponse",
-changed in both
-  base   100644 43fe327de404df1c85e171a9ca8564d6ec9a872d i18n/fra/src/vs/code/electron-main/menus.i18n.json
-  our    100644 16a57011e6fe8292ae1edcf0b9eb59b9f28b2c10 i18n/fra/src/vs/code/electron-main/menus.i18n.json
-  their  100644 20c287bd86379e090d7fd2bf90e381217aaa1545 i18n/fra/src/vs/code/electron-main/menus.i18n.json
-changed in both
-  base   100644 017c54226861bfff312aa33094f04843fa92122b i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 1ad1b4ad7ba3d841a13ddfeab561381b182d7f45 i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 c59fa7756c39d52c2aaa95dcaac23d3c9a8898b9 i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -29,8 +29,13 @@
- 	"scrollBeyondLastColumn": "Contrôle le nombre de caractères supplémentaires, au-delà duquel l’éditeur défilera horizontalement",
- 	"smoothScrolling": "Contrôle si l'éditeur défilera en utilisant une animation",
- 	"minimap.enabled": "Contrôle si la minicarte est affichée",
-+<<<<<<< .our
- 	"minimap.side": "Contrôle le côté où afficher la minicarte.",
- 	"minimap.showSlider": "Contrôle si le curseur de la minicarte est automatiquement masqué",
-+=======
-+	"minimap.side": "Contrôle le côté où afficher la minicarte. Les valeurs possibles sont 'right' et 'left'",
-+	"minimap.showSlider": "Contrôle si le curseur de la minicarte est automatiquement masqué. Les valeurs possibles sont 'always' et 'mouseover'",
-+>>>>>>> .their
- 	"minimap.renderCharacters": "Afficher les caractères réels sur une ligne (par opposition aux blocs de couleurs)",
- 	"minimap.maxColumn": "Limiter la largeur de la minicarte pour afficher au maximum un certain nombre de colonnes",
- 	"find.seedSearchStringFromSelection": "Contrôle si nous remplissons la chaîne à rechercher dans le Widget Recherche à partir de la sélection de l'éditeur",
-changed in both
-  base   100644 cb790c12d8f3c4cf8b607a163db57cbe3875c3ed i18n/fra/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 3a6ec15a4d0b2f141967d5aa037637bcdca560c3 i18n/fra/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 c0b0bc6e3515b91f7a27ef93a87c78bc5d2335fc i18n/fra/src/vs/platform/environment/node/argv.i18n.json
-changed in both
-  base   100644 fe7f9c69fac99a7ad59fe2e713930005e7903457 i18n/fra/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 6d87da3180e1228e72028373cd528db86fbc5793 i18n/fra/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 f962bfa91d8a3bbb9b60fd5e54339943a94d63cf i18n/fra/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/fra/src/vs/platform/issue/electron-main/issueService.i18n.json
-  our    100644 615db052738b1c19ee8d55635ec49773ad92e58e i18n/fra/src/vs/platform/issue/electron-main/issueService.i18n.json
-  their  100644 cfbd6f443b7d2a99362cce9d683a6f4cf1a95754 i18n/fra/src/vs/platform/issue/electron-main/issueService.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"issueReporter": "Rapporteur du problème",
- 	"processExplorer": "Explorateur de processus"
-+=======
-+	"issueReporter": "Rapporteur du problème"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 b6216ff7d5abb5dfd000570370abe1acf4afa21a i18n/fra/src/vs/platform/list/browser/listService.i18n.json
-  our    100644 79767f92ca92254884c1f3a91c930e58e4e23371 i18n/fra/src/vs/platform/list/browser/listService.i18n.json
-  their  100644 e512ed15ca976984eae974ceb4d0d1ddb11523a1 i18n/fra/src/vs/platform/list/browser/listService.i18n.json
-@@ -12,6 +12,10 @@
- 	"multiSelectModifier": "Le modificateur à utiliser pour ajouter un élément à une multi-sélection avec la souris (par exemple dans l’Explorateur, des éditeurs ouverts et scm view). 'ctrlCmd' mappe vers 'Contrôle' dans Windows et Linux, et vers 'Commande' dans macOS. Les mouvements de souris 'Ouvrir sur le côté', si supportés, s'adaptent pour ne pas entrer en conflit avec le modificateur multiselect.",
- 	"openMode.singleClick": "Ouvre les éléments sur un simple clic de souris.",
- 	"openMode.doubleClick": "Ouvre les éléments sur un double clic de souris.",
-+<<<<<<< .our
- 	"openModeModifier": "Contrôle l’ouverture des éléments dans les arbres et listes à l’aide de la souris (si pris en charge). Mettre la valeur `singleClick` pour ouvrir des éléments avec un simple clic de souris et `doubleClick` pour ouvrir uniquement via un double-clic de souris. Pour les parents ayant des enfants dans les arbres, ce paramètre contrôle si un simple clic développe le parent ou un double-clic. Notez que certains arbres et listes peuvent choisir d’ignorer ce paramètre, si ce n’est pas applicable. ",
- 	"horizontalScrolling setting": "Contrôle si les arborescences prennent en charge le défilement horizontal dans le plan de travail."
-+=======
-+	"openModeModifier": "Contrôle l’ouverture des éléments dans les arbres et listes à l’aide de la souris (si pris en charge). Mettre la valeur `singleClick` pour ouvrir des éléments avec un simple clic de souris et `doubleClick` pour ouvrir uniquement via un double-clic de souris. Pour les parents ayant des enfants dans les arbres, ce paramètre contrôle si un simple clic développe le parent ou un double-clic. Notez que certains arbres et listes peuvent choisir d’ignorer ce paramètre, si ce n’est pas applicable. "
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/fra/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  our    100644 8e1c626a771393d667c7b3c11b9837bda978f030 i18n/fra/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 6b8c2481d1f40d9ba0346a2b906c7e8077f20985 i18n/fra/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -6,8 +6,11 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"timeout.formatOnSave": "Format avorté lors de l'enregistrement après {0} ms",
- 	"codeActionsOnSave.didTimeout": "codeActionsOnSave abandonné au bout de {0} ms",
- 	"timeout.onWillSave": "OnWillSaveTextDocument-event avorté après 1750 ms",
-+=======
-+>>>>>>> .their
- 	"saveParticipants": "Exécution de la sauvegarde des participants..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 58d22a471b847a603a4476f6731cbadfaeb75b54 i18n/fra/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
-  our    100644 a9163f8c71efdc09a3c2ad92e39f3439cc4fac0a i18n/fra/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
-  their  100644 e91a76e9b43e8d390721b4c65a16143c63906081 i18n/fra/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
-@@ -11,11 +11,17 @@
- 	"sizeMB": "{0} Mo",
- 	"sizeGB": "{0} Go",
- 	"sizeTB": "{0} To",
-+<<<<<<< .our
- 	"largeImageError": "L’image n’est pas affichée dans l’éditeur parce qu’elle est trop grande ({0}).",
- 	"resourceOpenExternalButton": " Ouvrir l'image en utilisant un programme externe ?",
- 	"nativeFileTooLargeError": "Le fichier n’est pas affiché dans l’éditeur, parce qu’il est trop volumineux ({0}).",
- 	"nativeBinaryError": "Le fichier n’est pas affiché dans l’éditeur parce que c’est un fichier binaire ou qu'il utilise un encodage de texte non pris en charge.",
- 	"openAsText": "Vous voulez l'ouvrir quand même ?",
-+=======
-+	"largeImageError": "La taille du fichier de l’image est trop grande (> à 1Mo) pour afficher dans l’éditeur.",
-+	"resourceOpenExternalButton": " Ouvrir l'image en utilisant un programme externe ?",
-+	"nativeBinaryError": "Impossible d'afficher le fichier dans l'éditeur : soit il est binaire, soit il est très volumineux, soit il utilise un encodage de texte non pris en charge.",
-+>>>>>>> .their
- 	"zoom.action.fit.label": "Toute l’Image",
- 	"imgMeta": "{0}x{1} {2}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 286165f993fdecdd0067fd23367c4fd28d8c3b67 i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 1a663cb4405d0c8f86ec154a57cdd2b613d93195 i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 a586a35349012c542818e7566b41872f275d207a i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,7 +35,10 @@
- 	"panelDefaultLocation": "Contrôle l’emplacement par défaut du panneau. Il peut être affiché soit en bas ou à droite du banc d'essai.",
- 	"statusBarVisibility": "Contrôle la visibilité de la barre d'état au bas du banc d'essai.",
- 	"activityBarVisibility": "Contrôle la visibilité de la barre d'activités dans le banc d'essai.",
-+<<<<<<< .our
- 	"viewVisibility": "Contrôle la visibilité des actions d'en-tête de vue. Les actions d'en-tête de vue peuvent être soit toujours visibles, ou uniquement visibles quand cette vue a le focus ou est survolée.",
-+=======
-+>>>>>>> .their
- 	"fontAliasing": "Contrôle la méthode de font aliasing dans le workbench.\n- default : Lissage des polices de sous-pixel. Sur la plupart des affichages non-ratina, cela vous donnera le texte le plus vif\n- antialiased : Lisse les polices au niveau du pixel, plutôt que les sous-pixels. Peut faire en sorte que la police apparaisse plus fine dans l’ensemble \n- none : Désactive le lissage des polices. Le texte s'affichera avec des bordures dentelées\n- auto: Applique `default` ou `antialiased` automatiquement en se basant sur la résolution de l'affichage.",
- 	"workbench.fontAliasing.default": "Lissage de sous-pixel des polices. Sur la plupart des affichages non-retina, cela vous donnera le texte le plus vif.",
- 	"workbench.fontAliasing.antialiased": "Lisser les polices au niveau du pixel, plutôt que les sous-pixels. Peut faire en sorte que la police apparaisse plus légère dans l’ensemble.",
-changed in both
-  base   100644 d3b5c5753a7f6a7289ad9c4d44b63a588db29500 i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-  our    100644 f911756f64613743aee3845817a09faf359067ac i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-  their  100644 4839400b9f6166db87a8fbca8f5567a6187865d5 i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-@@ -6,7 +6,40 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"debugNoType": "Le 'type' de débogueur ne peut pas être omis et doit être de type 'string'.",
-+=======
-+	"vscode.extension.contributes.debuggers": "Ajoute des adaptateurs de débogage.",
-+	"vscode.extension.contributes.debuggers.type": "Identificateur unique de cet adaptateur de débogage.",
-+	"vscode.extension.contributes.debuggers.label": "Nom complet de cet adaptateur de débogage.",
-+	"vscode.extension.contributes.debuggers.program": "Chemin du programme de l'adaptateur de débogage. Le chemin est absolu ou relatif par rapport au dossier d'extensions.",
-+	"vscode.extension.contributes.debuggers.args": "Arguments facultatifs à passer à l'adaptateur.",
-+	"vscode.extension.contributes.debuggers.runtime": "Runtime facultatif, si l'attribut de programme n'est pas un exécutable, mais qu'il nécessite un exécutable.",
-+	"vscode.extension.contributes.debuggers.runtimeArgs": "Arguments du runtime facultatif.",
-+	"vscode.extension.contributes.debuggers.variables": "Mappage à partir de variables interactives (par exemple, ${action.pickProcess}) dans 'launch.json' vers une commande.",
-+	"vscode.extension.contributes.debuggers.initialConfigurations": "Configurations pour la génération du fichier 'launch.json' initial.",
-+	"vscode.extension.contributes.debuggers.languages": "Liste de langages pour lesquels l'extension de débogage peut être considérée comme \"débogueur par défaut\".",
-+	"vscode.extension.contributes.debuggers.adapterExecutableCommand": "Si l'extension VS Code spécifiée appelle cette commande pour déterminer le chemin de l'exécutable de l'adaptateur de débogage et les arguments à passer.",
-+	"vscode.extension.contributes.debuggers.configurationSnippets": "Extraits pour l'ajout de nouvelles configurations à 'launch.json'.",
-+	"vscode.extension.contributes.debuggers.configurationAttributes": "Configurations de schéma JSON pour la validation de 'launch.json'.",
-+	"vscode.extension.contributes.debuggers.windows": "Paramètres spécifiques à Windows.",
-+	"vscode.extension.contributes.debuggers.windows.runtime": "Runtime utilisé pour Windows.",
-+	"vscode.extension.contributes.debuggers.osx": "Paramètres spécifiques à macOS.",
-+	"vscode.extension.contributes.debuggers.osx.runtime": "Runtime utilisé pour macOS.",
-+	"vscode.extension.contributes.debuggers.linux": "Paramètres spécifiques à Linux.",
-+	"vscode.extension.contributes.debuggers.linux.runtime": "Runtime utilisé pour Linux.",
-+	"vscode.extension.contributes.breakpoints": "Ajoute des points d'arrêt.",
-+	"vscode.extension.contributes.breakpoints.language": "Autorisez les points d'arrêt pour ce langage.",
-+	"app.launch.json.title": "Lancer",
-+	"app.launch.json.version": "Version de ce format de fichier.",
-+	"app.launch.json.configurations": "Liste des configurations. Ajoutez de nouvelles configurations, ou modifiez celles qui existent déjà à l'aide d'IntelliSense.",
-+	"app.launch.json.compounds": "Liste des composés. Chaque composé référence plusieurs configurations qui sont lancées ensemble.",
-+	"app.launch.json.compound.name": "Nom du composé. Apparaît dans le menu déroulant de la configuration de lancement.",
-+	"useUniqueNames": "Veuillez utiliser des noms de configuration uniques.",
-+	"app.launch.json.compound.folder": "Nom du dossier dans lequel le composé se trouve.",
-+	"app.launch.json.compounds.configurations": "Noms des configurations qui sont lancées dans le cadre de ce composé.",
-+	"debugNoType": "Le 'type' de l'adaptateur de débogage ne peut pas être omis. Il doit s'agir du type 'string'.",
-+>>>>>>> .their
- 	"selectDebug": "Sélectionner l'environnement",
- 	"DebugConfig.failed": "Impossible de créer le fichier 'launch.json' dans le dossier '.vscode' ({0}).",
- 	"workspace": "espace de travail",
-changed in both
-  base   100644 4e7aec72ee279200023a8c200c0fb62892d47ba8 i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 dc9d0f20d0f5632bb197839a3ff1ba56a6ca08d4 i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 58b7007f0721104165123631b729bbc27428148d i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -26,7 +26,13 @@
- 	"preLaunchTaskErrors": "Des erreurs de build ont été détectées durant le preLaunchTask '{0}'.",
- 	"preLaunchTaskError": "Une erreur de build a été détectée durant le preLaunchTask '{0}'.",
- 	"preLaunchTaskExitCode": "Le preLaunchTask '{0}' s'est terminé avec le code de sortie {1}.",
-+<<<<<<< .our
- 	"showErrors": "Afficher les erreurs",
-+=======
-+	"debugAnyway": "Déboguer quand même",
-+	"showErrors": "Afficher les erreurs",
-+	"cancel": "Annuler",
-+>>>>>>> .their
- 	"noFolderWorkspaceDebugError": "Impossible de déboguer le fichier actif. Vérifiez qu'il est enregistré sur le disque et qu'une extension de débogage est installée pour ce type de fichier.",
- 	"cancel": "Annuler",
- 	"DebugTaskNotFound": "Tâche '{0}' introuvable.",
-changed in both
-  base   100644 8d073926340408454f0ebf1ea0fa54fffd3e8d45 i18n/fra/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-  our    100644 7c8133234c39808af627f4574d56047ac8e01258 i18n/fra/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-  their  100644 cd8c8f19229490aa72cd4f339b99d49554ef9af8 i18n/fra/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-changed in both
-  base   100644 302b1f3356f78175e99a0a817fc956cee35cde98 i18n/fra/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 0057e22b4a8443d5b30bfe0090c058bd31602f8d i18n/fra/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 b36eb21c3f638c31814e5716fde8d2577d0de85e i18n/fra/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-@@ -56,11 +56,17 @@
- 	"OpenExtensionsFile.failed": "Impossible de créer le fichier 'extensions.json' dans le dossier '.vscode' ({0}).",
- 	"configureWorkspaceRecommendedExtensions": "Configurer les extensions recommandées (espace de travail)",
- 	"configureWorkspaceFolderRecommendedExtensions": "Configurer les extensions recommandées (Dossier d'espace de travail)",
-+<<<<<<< .our
- 	"malicious tooltip": "Cette extension a été signalée comme problématique.",
- 	"malicious": "Malveillant",
- 	"disabled": "Désactivé",
- 	"disabled globally": "Désactivé",
- 	"disabled workspace": "Désactivé pour cet espace de travail",
-+=======
-+	"builtin": "Intégrée",
-+	"malicious tooltip": "Cette extension a été signalée comme problématique.",
-+	"malicious": "Malveillant",
-+>>>>>>> .their
- 	"disableAll": "Désactiver toutes les extensions installées",
- 	"disableAllWorkspace": "Désactiver toutes les extensions installées pour cet espace de travail",
- 	"enableAll": "Activer toutes les extension",
-changed in both
-  base   100644 c1f0a70b06b3e99b70552f084422101aa70a18a5 i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-  our    100644 8968ae34eb7d456d98c4b9d9d14982f00ef8ea03 i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-  their  100644 e3c5023469867a709451457a4caa6b3de84b6b4d i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-@@ -6,9 +6,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"restart1": "Profiler les extensions",
- 	"restart2": "Un redémarrage est nécessaire pour profiler les extensions. Voulez-vous redémarrer '{0}' maintenant ?",
- 	"restart3": "Redémarrer",
- 	"cancel": "Annuler",
-+=======
-+	"noPro": "Pour profiler les extensions, lancer avec `--inspect-extensions=<port>`.",
-+>>>>>>> .their
- 	"selectAndStartDebug": "Cliquer pour arrêter le profilage"
- }
-\ No newline at end of file
-changed in both
-  base   100644 6336a0238906e38f3e0eb48d50ae2922e14fdcc7 i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 3c10fdb84d0f8c069b4d8fe6dac7e8ac54606d34 i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 885898a8f468b277bc193ea10eb94cc12c1c925c i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -10,8 +10,12 @@
- 	"searchMarketplace": "Rechercher dans le Marketplace",
- 	"dynamicWorkspaceRecommendation": "Cette extension peut vous intéresser car elle est populaire parmi les utilisateurs du dépôt {0}.",
- 	"exeBasedRecommendation": "Cette extension est recommandée parce que {0} est installé.",
-+<<<<<<< .our
- 	"fileBasedRecommendation": "Cette extension est recommandée basé sur les fichiers que vous avez ouverts récemment.",
- 	"workspaceRecommendation": "Cette extension est recommandée par les utilisateurs de l’espace de travail actuel.",
-+=======
-+	"dynamicWorkspaceRecommendation": "Cette extension peut vous intéresser car beaucoup d'utilisateurs de l'espace de travail actuel l'utilise.",
-+>>>>>>> .their
- 	"reallyRecommended2": "L'extension '{0}' est recommandée pour ce type de fichier.",
- 	"reallyRecommendedExtensionPack": "Le pack d’extensions '{0}' est recommandé pour ce type de fichier.",
- 	"install": "Installer",
-changed in both
-  base   100644 73f4e9667bea904cb2166c65d8200429b05d228f i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  our    100644 f395ede0a046caeae18a2c7db319d8ae7b900356 i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  their  100644 557f45e5910fd9ab623cccc9dd8fa87735b78615 i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-changed in both
-  base   100644 6a8d5b6d58ec19ca1f78fefdd2f7bd6d024c252c i18n/fra/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
-  our    100644 2ff09c7e0089603077900dc3d1abcafd1e2f52bf i18n/fra/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
-  their  100644 19955e42403e3f0b83f5f588abbf54fc54b41b6f i18n/fra/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
-changed in both
-  base   100644 a5a27d438f29096426c54d7bd8127f7cf4972e3c i18n/fra/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  our    100644 a4b260b7b1424820b72d256857339774c04df50f i18n/fra/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  their  100644 22ec4bca1a414e84c1d14e30fdfa0fac824c4956 i18n/fra/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-changed in both
-  base   100644 30ecf112fb6ed3c7be2b5b2d87e02f8b192529fe i18n/fra/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  our    100644 675ad6e2d506f6eb23037370e188ea4353697fb3 i18n/fra/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  their  100644 6479583ddf2a4bf2e1175e5fdf4b7bc00c530b06 i18n/fra/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-changed in both
-  base   100644 46d2aa7ed761e73c0f14077699637f786dc553f1 i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-  our    100644 6dca29c55a8d512cdadbf944493c55317a44cb5d i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-  their  100644 9576e2a455246f0d15c55e4f48d5d5b5ce2a747d i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-changed in both
-  base   100644 d1f1c499307e357af15de9f6f5780c07027a86d0 i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 def18c92de62940f464c192ffdc0811ec055095e i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 2d6bafcf633308ea5b7210418cdb874458c210fb i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -9,7 +9,10 @@
- 	"emptyUserSettingsHeader": "Placer vos paramètres ici pour remplacer les paramètres par défaut.",
- 	"emptyWorkspaceSettingsHeader": "Placer vos paramètres ici pour remplacer les paramètres utilisateur.",
- 	"emptyFolderSettingsHeader": "Placer les paramètres de votre dossier ici pour remplacer ceux des paramètres de l’espace de travail.",
-+<<<<<<< .our
- 	"reportSettingsSearchIssue": "Signaler un problème",
-+=======
-+>>>>>>> .their
- 	"newExtensionLabel": "Afficher l’Extension \"{0}\"",
- 	"editTtile": "Modifier",
- 	"replaceDefaultValue": "Remplacer dans les paramètres",
-changed in both
-  base   100644 d3c41fcdfcc2a1febf7f1c55d3e74b67d1fb3371 i18n/fra/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 7927ac428c9397051edb023d925d6ab74f6c0189 i18n/fra/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 675880ca4b72d91c1b83616d11db7c37030b3893 i18n/fra/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-changed in both
-  base   100644 4162ef81ca41c8ae2aab33717525badc901e6d44 i18n/fra/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 043fb92d98d510a0c65a09cbbe5e12feb8f611fa i18n/fra/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 338fbbcaab14200ca1b474eb601a4faa82eca52c i18n/fra/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -30,6 +30,10 @@
- 	"search.quickOpen.includeSymbols": "Configurez l'ajout des résultats d'une recherche de symboles globale dans le fichier de résultats pour Quick Open.",
- 	"search.followSymlinks": "Contrôle s'il faut suivre les symlinks pendant la recherche.",
- 	"search.smartCase": "Recherches de manière non case-sensitive si le modèle est entièrement en minuscules, dans le cas contraire, recherche de manière case-sensitive",
-+<<<<<<< .our
- 	"search.globalFindClipboard": "Contrôle si la vue de recherche doit lire ou modifier le presse-papiers partagé sur macOS",
- 	"search.location": "Contrôle si la recherche s’affichera comme une vue dans la barre latérale ou comme un panneau dans la zone de panneau pour plus d'espace horizontal."
-+=======
-+	"search.globalFindClipboard": "Contrôle si le viewlet de recherche doit lire ou modifier le presse-papiers partagé sur macOS"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 fb9dc3578ab8c818994beb037870a8d4782b3173 i18n/fra/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 673cb698c2a5b3bfb8460611a63585f8ca3fd4e1 i18n/fra/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 25af594698d60f9345188a7d90b807ff98555e4b i18n/fra/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-changed in both
-  base   100644 b0481602ad80a32b842c8be9c3ec9fa23349f227 i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 c9b4f495f668b34a06e07f9e3acab9da423cc6a8 i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 dd371d2b4a0f2d69cb328e30786385860fd52151 i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-changed in both
-  base   100644 36366528bb48ecd0abb6300e55deb2e2f7bf3233 i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-  our    100644 c976fd3fb9fd8db715643eaee5898a0e4ce98c79 i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-  their  100644 96e9b0fe39711516267418ea876814cef3c119a1 i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-@@ -9,11 +9,14 @@
- 	"terminal.integrated.a11yBlankLine": "Ligne vide",
- 	"terminal.integrated.a11yPromptLabel": "Entrée du terminal",
- 	"terminal.integrated.a11yTooMuchOutput": "Trop de sorties à annoncer, naviguer dans les lignes manuellement pour lire",
-+<<<<<<< .our
- 	"yes": "Oui",
- 	"terminal.rendererInAllNewTerminals": "Tous les terminaux nouvellement créés utiliseront le moteur de rendu non-GPU.",
- 	"no": "Non",
- 	"dontShowAgain": "Ne plus afficher",
- 	"terminal.slowRendering": "Le moteur de rendu standard pour le terminal intégré semble lent sur votre ordinateur. Souhaitez-vous basculer vers le moteur de rendu basé sur DOM  ce qui peut améliorer les performances ? [En savoir plus sur les paramètres de terminal] (https://code.visualstudio.com/docs/editor/integrated-terminal#_changing-how-the-terminal-is-rendered).",
-+=======
-+>>>>>>> .their
- 	"terminal.integrated.copySelection.noSelection": "Le terminal n'a aucune sélection à copier",
- 	"terminal.integrated.exitedWithCode": "Le processus du terminal s'est achevé avec le code de sortie {0}",
- 	"terminal.integrated.waitOnExit": "Appuyez sur une touche pour fermer le terminal",
-changed in both
-  base   100644 37c7f279e2be409df7a0e257d3a88c7a78b82c5d i18n/fra/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json
-  our    100644 8829ec6d50816703b7ba047f70c3bf561c0e123e i18n/fra/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json
-  their  100644 29c8735c1ee942aa9e1999b6303f374cc9410e05 i18n/fra/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json
-@@ -6,5 +6,12 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"release notes": "Notes de publication"
-+=======
-+	"release notes": "Notes de publication",
-+	"updateConfigurationTitle": "Mettre à jour",
-+	"updateChannel": "Indiquez si vous recevez des mises à jour automatiques en provenance d'un canal de mises à jour. Un redémarrage est nécessaire en cas de modification.",
-+	"enableWindowsBackgroundUpdates": "Active les mises à jour Windows en arrière-plan."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d57577cf970e2ed677c1607cb32a4cad5ba28dc8 i18n/fra/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 7338692978cc41a3c9963a6eada047d9ffbf7ca9 i18n/fra/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 ca0a706dda810b031b96b942c2cfa772b870ee7c i18n/fra/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -16,12 +16,18 @@
- 	"noUpdatesAvailable": "Aucune mise à jour n'est disponible actuellement.",
- 	"ok": "OK",
- 	"thereIsUpdateAvailable": "Une mise à jour est disponible.",
-+<<<<<<< .our
- 	"download now": "Télécharger maintenant",
- 	"later": "Plus tard",
- 	"updateAvailable": "Il y a une mise à jour disponible : {0} {1}",
- 	"installUpdate": "Installer la mise à jour",
- 	"updateInstalling": "{0} {1} est installé en tâche de fond ; Nous vous ferons savoir quand c’est fini.",
- 	"updateAvailableAfterRestart": "Redémarrer {0} pour appliquer la dernière mise à jour.",
-+=======
-+	"installUpdate": "Installer la mise à jour",
-+	"updateAvailable": "Il y a une mise à jour disponible : {0} {1}",
-+	"updateInstalling": "{0} {1} est en train d'être installé en arrière-plan, nous vous ferons savoir quand c’est fini.",
-+>>>>>>> .their
- 	"updateNow": "Mettre à jour maintenant",
- 	"commandPalette": "Palette de commandes...",
- 	"settings": "Paramètres",
-changed in both
-  base   100644 e0d37d9bb656bb3230f14a3d9f24391520fd8747 i18n/fra/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-  our    100644 a9b8b25920314ba43f559efd02c49384ce93cbc6 i18n/fra/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-  their  100644 bce1f4235aa02d9eb934d5e8defa36f88aab4b93 i18n/fra/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-changed in both
-  base   100644 34caaff29febb2a6feabaf2f2a608bd58eaf5af5 i18n/hun/extensions/emmet/package.i18n.json
-  our    100644 4e87769482abf2ce774993c5210487918395fb71 i18n/hun/extensions/emmet/package.i18n.json
-  their  100644 3df37c61cd749c5e9ca8e728e73133abe6151467 i18n/hun/extensions/emmet/package.i18n.json
-@@ -59,7 +59,11 @@
- 	"emmetPreferencesCssWebkitProperties": "CSS-tulajdonságok vesszővel ellátott listája, melyek 'webkit' gyártói előtagot kapnak azoknál az Emmet-rövidtéseknél, melyek `-` karakterrel kezdődnek. Állítsa üres szövegre, ha soha nem szeretne 'webkit' előtagot használni.",
- 	"emmetPreferencesCssMozProperties": "CSS-tulajdonságok vesszővel ellátott listája, melyek 'moz' gyártói előtagot kapnak azoknál az Emmet-rövidtéseknél, melyek `-` karakterrel kezdődnek. Állítsa üres szövegre, ha soha nem szeretne 'moz' előtagot használni.",
- 	"emmetPreferencesCssOProperties": "CSS-tulajdonságok vesszővel ellátott listája, melyek 'o' gyártói előtagot kapnak azoknál az Emmet-rövidtéseknél, melyek `-` karakterrel kezdődnek. Állítsa üres szövegre, ha soha nem szeretne 'o' előtagot használni.",
-+<<<<<<< .our
- 	"emmetPreferencesCssMsProperties": "CSS-tulajdonságok vesszővel ellátott listája, melyek 'ms' gyártói előtagot kapnak azoknál az Emmet-rövidtéseknél, melyek `-` karakterrel kezdődnek. Állítsa üres szövegre, ha soha nem szeretne 'ms' előtagot használni.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "A minimális pontszám (0-tól 1-ig), amit egy fuzzy keresési találatnak el kell érnie. Az alacsonyabb értékek álpozitív találatokat eredményezhetnek, míg a magasabb értékek szűkítik a lehetséges találatok számát.",
- 	"emmetOptimizeStylesheetParsing": "Ha az értéke false, az egész fájl fel lesz dolgozva annak meghatározásához, hogy az aktuális pozíció ércényes-e Emmet-rövidítések kibontásához. Ha az értéke true, csak az aktuális pozíció körüli tartalom lesz feldolgozva a CSS/SCSS/LESS-fájlokban."
-+=======
-+	"emmetPreferencesCssMsProperties": "CSS-tulajdonságok vesszővel ellátott listája, melyek 'ms' gyártói előtagot kapnak azoknál az Emmet-rövidtéseknél, melyek `-` karakterrel kezdődnek. Állítsa üres szövegre, ha soha nem szeretne 'ms' előtagot használni."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8ef19727403680a14c9dc086bca898828d9563f5 i18n/hun/extensions/git/out/commands.i18n.json
-  our    100644 affdd78fc14682c19c792c8ead9202e7167f2315 i18n/hun/extensions/git/out/commands.i18n.json
-  their  100644 b06c2c094022bb77c2e34f4515372d1a5aa9f0e3 i18n/hun/extensions/git/out/commands.i18n.json
-changed in both
-  base   100644 2d1e53ad170e08548f7cf66a94af6ebd4aa1bd8b i18n/hun/extensions/git/package.i18n.json
-  our    100644 d2831b61da52e95d0526dd36ac91c937df6fc33e i18n/hun/extensions/git/package.i18n.json
-  their  100644 4901736229c79f3e238723c8cf2b28f53e2a942e i18n/hun/extensions/git/package.i18n.json
-@@ -75,9 +75,14 @@
- 	"config.decorations.enabled": "Meghatározza, hogy a Git megjelölje-e színnel és jelvénnyekkel a fájlokat a fájlkezelőben és a nyitott szerkesztőablakok nézetben.",
- 	"config.promptToSaveFilesBeforeCommit": "Meghatározza, hogy a Git ellenőrizze-e, hogy van-e mentetlen fájl beadás (commit) előtt.",
- 	"config.showInlineOpenFileAction": "Meghatározza, hogy megjelenjen-e a sorok között egy 'Fájl megnyitása' művelet a git változások nézetén.",
-+<<<<<<< .our
- 	"config.inputValidation": "Meghatározza, hogy mikor jelenjen meg a beadási üzenet validálása.",
- 	"config.detectSubmodules": "Meghatározza, hogy automatikusan fel legyenek-e derítve a git almodulok.",
- 	"config.detectSubmodulesLimit": "Korlátozza a felderített git almodulok számát.",
-+=======
-+	"config.inputValidation": "Meghatározza, hogy mikor jelenjen meg a bemeneti karakterszámláló.",
-+	"config.detectSubmodules": "Meghatározza, hogy automatikusan fel legyenek-e derítve a git almodulok.",
-+>>>>>>> .their
- 	"colors.modified": "A módosított erőforrások színe.",
- 	"colors.deleted": "A törölt erőforrások színe.",
- 	"colors.untracked": "A nem követett erőforrások színe.",
-changed in both
-  base   100644 016d26a725b9f5cdfddcb6e8b3a20cd2badde564 i18n/hun/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  our    100644 e9b4725dad7038e93a7d0b6b415654f2520ef063 i18n/hun/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  their  100644 45d84d1c04eea4ae45be53f018f8a8cda59d435c i18n/hun/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-@@ -6,6 +6,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"hide": "elrejtés",
- 	"show": "megjelenítés",
- 	"previewOnGitHub": "Előnézet GitHubon",
-@@ -27,5 +28,15 @@
- 	"expectedResults": "Elvárt működés",
- 	"settingsSearchResultsDescription": "Írja le, hogy milyen találatokat szeretett volna kapni, amikor ezzel a keresőkifejezéssel keresett! A mezőben GitHub-stílusú markdown használható. A hibajelentés szerkeszthető lesz és képernyőfotók is csatolhatók a githubos előnézetnél.",
- 	"pasteData": "A szükséges adat túl nagy az elküldéshez, ezért a vágólapra másoltuk. Illessze be!",
-+=======
-+	"previewOnGitHub": "Előnézet GitHubon",
-+	"similarIssues": "Hasonló problémák",
-+	"noResults": "Nincs találat",
-+	"rateLimited": "API-híváskorlát túllépve",
-+	"stepsToReproduce": "A probléma előidézésének lépései",
-+	"bugDescription": "Hogyan találkozott a problémával? Milyen lépéseket kell tenni a hiba megbízható reprodukálásához? Minek kellett volna történnie, és mi történt helyette?",
-+	"performanceIssueDesciption": "Mikor fordult elő ez a teljesítménybeli probléma? Például előfordul indulásnál vagy végre kell hajtani bizonyos műveleteket? Bármilyen részlet segítheti a vizsgálatot.",
-+	"description": "Leírás",
-+>>>>>>> .their
- 	"disabledExtensions": "A kiegészítők le vannak tiltva."
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/hun/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  our    100644 bd8c9904ccb06290baad6a515c917d005aa9c429 i18n/hun/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  their  100644 e0afa073ad06d7f7ca4cc3daa47d6815448aa357 i18n/hun/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-@@ -7,6 +7,7 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"completeInEnglish": "Kérjük, hogy angolul töltse ki az űrlapot!",
-+<<<<<<< .our
- 	"issueTypeLabel": "Ez egy",
- 	"issueSourceLabel": "Komponens",
- 	"vscode": "Visual Studio Code",
-@@ -25,4 +26,23 @@
- 	"sendExtensions": "Engedélyezett kiegészítők listájának csatolása ({0})",
- 	"sendSearchedExtensions": "Keresett kiegészítők elküldése ({0})",
- 	"sendSettingsSearchDetails": "Beállításokban való keresés részleteinek elküldése ({0})"
-+=======
-+	"issueTypeLabel": "Szeretnék bejelenteni egy",
-+	"bugReporter": "hibát",
-+	"performanceIssue": "teljesítményproblémát",
-+	"featureRequest": "funkcióigényt",
-+	"issueTitleLabel": "Cím",
-+	"issueTitleRequired": "Kérjük, adja meg a címet!",
-+	"vscodeVersion": "VS Code-verzió",
-+	"osVersion": "Operációs rendszer verziója",
-+	"systemInfo": "Rendszerinformációk",
-+	"sendData": "Adatok elküldése",
-+	"processes": "Jelenleg futó folyamatok",
-+	"workspaceStats": "Munkaterület-statisztikák",
-+	"extensions": "Kiegészítők",
-+	"tryDisablingExtensions": "A probléma letiltott kiegészítőkkel is előidézhető",
-+	"githubMarkdown": "A mezőben GitHub-stílusú markdown használható. A hibajelentés szerkeszthető lesz és képernyőfotók is csatolhatók a githubos előnézetnél.",
-+	"issueDescriptionRequired": "Kérjük, adja meg a leírást.",
-+	"loadingData": "Adatok betöltése..."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/hun/src/vs/code/electron-main/logUploader.i18n.json
-  our    100644 835fafb4ef0f0d475710dd72d704c9c5a6da9e59 i18n/hun/src/vs/code/electron-main/logUploader.i18n.json
-  their  100644 68750e0560762fc821ecb1cae5b76cc3649f361f i18n/hun/src/vs/code/electron-main/logUploader.i18n.json
-@@ -9,10 +9,18 @@
- 	"invalidEndpoint": "Érvénytelen naplófájl-feltöltési végpont",
- 	"beginUploading": "Feltöltés...",
- 	"didUploadLogs": "Feltöltés sikeres! Naplófájl-azonosító: {0}",
-+<<<<<<< .our
- 	"logUploadPromptHeader": "A munkamenetnaplóit egy olyan biztonságos végpontra készül feltölteni, amelyhez csak a VS Code csapat microsoftos tagjai férhetnek hozzá.",
- 	"logUploadPromptBody": "A munkamenetnaplók személyes információkat tartalmazhatnak, például teljes elérési utakat és fájlok tartalmát. Tekintse át és távolítsa el a személyes adatokat a naplófájlokból a következő helyen: '{0}'!",
- 	"logUploadPromptBodyDetails": "A folytatással megerősíti, hogy átnézte és eltávolította a személyes adatokat a munkamenetnaplót tartalmazó fájlokból, és beleegyezik, hogy a Microsoft felhasználja őket a VS Code-ban való hibakereséshez.",
- 	"logUploadPromptAcceptInstructions": "A feltöltés folytatásához futtassa a Code-ot az '--upload-logs={0}' kapcsolóval!",
-+=======
-+	"userDeniedUpload": "Feltöltés megszakítása",
-+	"logUploadPromptHeader": "Munkamenet naplójának feltöltése egy biztonságos végpontra?",
-+	"logUploadPromptBody": "A naplófájlok itt tekinthetők át: '{0}'",
-+	"logUploadPromptBodyDetails": "A naplók személyes információkat tartalmazhatnak, például teljes elérési utakat és fájlok tartalmát.",
-+	"logUploadPromptKey": "Áttekintettem a naplófájljaimat (írjon be egy 'y'-t a feltöltés megerősítéséhez)",
-+>>>>>>> .their
- 	"postError": "Hiba a naplók beküldése közben: {0}",
- 	"responseError": "Hiba a naplók beküldése közben: {0} – {1}",
- 	"parseError": "Hiba a válasz feldolgozása közben",
-changed in both
-  base   100644 94919096b3134e3aa9165e74ba2581ab96fa59ec i18n/hun/src/vs/code/electron-main/menus.i18n.json
-  our    100644 9ee4bd446c9ab5267b57c59dea436b05e72146ac i18n/hun/src/vs/code/electron-main/menus.i18n.json
-  their  100644 4cccb93b736010f00f206b38919ede249d1ade7f i18n/hun/src/vs/code/electron-main/menus.i18n.json
-changed in both
-  base   100644 966e4e365e6da291e74275a4fc7931b1ea12de75 i18n/hun/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 77c071af2b9d55c9f89889f4eaba840c5ab42297 i18n/hun/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 b9c872c074c7bcb5bcd8bcb36911e8ad4bcb2ce2 i18n/hun/src/vs/platform/environment/node/argv.i18n.json
-changed in both
-  base   100644 2f08f3c0a0815043ffb8006d10513e1147515d3e i18n/hun/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 4e39213a98716ec8731af717bd7eabd7943bfb73 i18n/hun/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 9f9b5cc3316576f13832128e3a7c71ad944ac8f5 i18n/hun/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/hun/src/vs/platform/issue/electron-main/issueService.i18n.json
-  our    100644 144cb0419cc20b1209ef3526973931e4652f2b66 i18n/hun/src/vs/platform/issue/electron-main/issueService.i18n.json
-  their  100644 570645f055d085382ac4eb15e10713c2a85055cd i18n/hun/src/vs/platform/issue/electron-main/issueService.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"issueReporter": "Hibajelentő",
- 	"processExplorer": "Feladatkezelő"
-+=======
-+	"issueReporter": "Hibajelentő"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f820502bc2b0e28920fd7bfb41e5fa3fa92a50b6 i18n/hun/src/vs/platform/list/browser/listService.i18n.json
-  our    100644 23a85678ca5affa695e40e600d86f77f4c97cc5d i18n/hun/src/vs/platform/list/browser/listService.i18n.json
-  their  100644 c91ae24bd283769a51180b070b875aca9be93370 i18n/hun/src/vs/platform/list/browser/listService.i18n.json
-@@ -12,6 +12,10 @@
- 	"multiSelectModifier": "Több elem kijelölése esetén újabb elem hozzáadásához használt módosítóbillentyű a fanézetekben és listákban (például a fájlkezelőben, a megnyitott szerkesztőablakok listájában és a verziókezelő rendszer nézeten). A `ctrlCmd` Windows és Linux alatt a `Control`, macOS alatt a `Command` billentyűt jelenti. A 'Megnyitás oldalt\" egérgesztusok – ha támogatva vannak – automatikusan úgy lesznek beállítva, hogy ne ütközzenek a több elem kijelöléséhez tartozó módosító billentyűvel.",
- 	"openMode.singleClick": "Elemek megnyitása egyetlen kattintásra.",
- 	"openMode.doubleClick": "Elemek megnyitása dupla kattintásra.",
-+<<<<<<< .our
- 	"openModeModifier": "Meghatározza, hogyan nyíljanak meg az elemek a fanézetekben és listákban egér használata esetén (ha támogatott). `singleClick` esetén egyetlen kattintásra megnyílnak az elemek, míg `doubleClick` esetén dupla kattintás szükséges. Fanézeteknél meghatározza, hogy a szülőelemek egyetlen vagy dupla kattintásra nyílnak ki. Megjegyzés: néhány fanézet és lista figyelmen kívül hagyja ezt a beállítást ott, ahol ez nem alkalmazható. ",
- 	"horizontalScrolling setting": "Meghatározza, hogy a fák támogatják-e a vízszintes görgetést a munkaterületen."
-+=======
-+	"openModeModifier": "Meghatározza, hogyan nyíljanak meg az elemek a fanézetekben és listákban egér használata esetén (ha támogatott). `singleClick` esetén egyetlen kattintásra megnyílnak az elemek, míg `doubleClick` esetén dupla kattintás szükséges. Fanézeteknél meghatározza, hogy a szülőelemek egyetlen vagy dupla kattintásra nyílnak ki. Megjegyzés: néhány fanézet és lista figyelmen kívül hagyja ezt a beállítást ott, ahol ez nem alkalmazható. "
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c5650196af2c0605cab011e405cc4196c6d1f2f8 i18n/hun/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
-  our    100644 4df3b505d3680d3a8600231325bd7f2a426e763c i18n/hun/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
-  their  100644 3e1e7156096bb185cf4b86e11977d03358dc3281 i18n/hun/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
-@@ -11,11 +11,17 @@
- 	"sizeMB": "{0} MB",
- 	"sizeGB": "{0} GB",
- 	"sizeTB": "{0} TB",
-+<<<<<<< .our
- 	"largeImageError": "A kép nincs megjelenítve, mert túl nagy ({0}).",
- 	"resourceOpenExternalButton": "Kép megnyitása külső program használatával?",
- 	"nativeFileTooLargeError": "A fájl nem jeleníthető meg a szerkesztőben, mert túl nagy ({0}).",
- 	"nativeBinaryError": "A fájl nem jeleníthető meg a szerkesztőben, mert bináris adatokat tartalmaz vagy nem támogatott szövegkódolást használ.",
- 	"openAsText": "Mégis meg szeretné nyitni?",
-+=======
-+	"largeImageError": "A képfájl mérete túl nagy (>1 MB) a szerkesztőben való megjelenítéshez.",
-+	"resourceOpenExternalButton": "Kép megnyitása külső program használatával?",
-+	"nativeBinaryError": "A fájl nem jeleníthető meg a szerkesztőben, mert bináris adatokat tartalmaz, túl nagy vagy nem támogatott szövegkódolást használ.",
-+>>>>>>> .their
- 	"zoom.action.fit.label": "Teljes kép",
- 	"imgMeta": "{0}x{1} {2}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 fb26cad0fa6821fe0070291e6fdcd65a62ed52ef i18n/hun/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 cc21f47e7a5add72269e1dcc252497e79ab58b6b i18n/hun/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 ad1c52f6a8d62ac967bdb82c3b2f90de79439deb i18n/hun/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,7 +35,10 @@
- 	"panelDefaultLocation": "Meghatározza a panel alapértelmezett pozícióját. A panel a munkaterület alján vagy jobb oldalán jelenhet meg.",
- 	"statusBarVisibility": "Meghatározza, hogy megjelenjen-e az állapotsor a munkaterület alján.",
- 	"activityBarVisibility": "Meghatározza, hogy megjelenjen-e a tevékenységsáv a munkaterületen.",
-+<<<<<<< .our
- 	"viewVisibility": "Meghatározza a nézetek fejlécén található műveletek láthatóságát. A műveletek vagy mindig láthatók, vagy csak akkor jelennek meg, ha a nézeten van a fókusz vagy az egérkurzor fölötte van.",
-+=======
-+>>>>>>> .their
- 	"fontAliasing": "Meghatározza a munkaterületen megjelenő betűtípusok élsimítási módszerét.\n- default: Szubpixeles betűsimítás. A legtöbb nem-retina típusú kijelzőn ez adja a legélesebb szöveget.\n- antialiased: A betűket pixelek, és nem szubpixelek szintjén simítja. A betűtípus vékonyabbnak tűnhet összességében.\n- none: Letiltja a betűtípusok élsimítését. A szövegek egyenetlen, éles szélekkel jelennek meg.\n- auto: A `default` vagy `antialiased` beállítások automatikus alkalmazása a kijelzők DPI-je alapján.",
- 	"workbench.fontAliasing.default": "Szubpixeles betűsimítás. A legtöbb nem-retina típusú kijelzőn ez adja a legélesebb szöveget.",
- 	"workbench.fontAliasing.antialiased": "A betűket pixelek, és nem szubpixelek szintjén simítja. A betűtípus vékonyabbnak tűnhet összességében.",
-changed in both
-  base   100644 94900abbcc11069ddab5f688f6f8465cb3e19723 i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-  our    100644 4668cc1389794aa9151e21db24858507aa286848 i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-  their  100644 b07cb0ef2cd2a0346f5ce6a30198f94a94fcd7ea i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-@@ -6,7 +6,40 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"debugNoType": "A hibakereső 'type' tulajdonsága kötelező, és 'string' típusúnak kell lennie.",
-+=======
-+	"vscode.extension.contributes.debuggers": "Hibakeresési illesztőket szolgáltat.",
-+	"vscode.extension.contributes.debuggers.type": "A hibakeresési illesztő egyedi azonosítója.",
-+	"vscode.extension.contributes.debuggers.label": "A hibakeresési illesztő megjelenített neve.",
-+	"vscode.extension.contributes.debuggers.program": "A hibakeresési illesztő program elérési útja. Az elérési út lehet abszolút vagy relatív a kiegészítő mappájához képest.",
-+	"vscode.extension.contributes.debuggers.args": "Az illesztő számára átadott argumentumok.",
-+	"vscode.extension.contributes.debuggers.runtime": "Kiegészítő futtatókörnyezet arra az esetre, ha a program attribútum nem egy futtatható fájl, és futtatókörnyezetre van szüksége.",
-+	"vscode.extension.contributes.debuggers.runtimeArgs": "Kiegészítő argumentumok a futtatókörnyezet számára.",
-+	"vscode.extension.contributes.debuggers.variables": "A `launch.json`-ban található interaktív változók (pl. ${action.pickProcess}) hozzárendelése parancsokhoz.",
-+	"vscode.extension.contributes.debuggers.initialConfigurations": "Konfigurációk a 'launch.json' első változatának elkészítéséhez.",
-+	"vscode.extension.contributes.debuggers.languages": "Azon nyelvek listája, amelyeknél ez a hibakeresési kiegészítő alapértelmezett hibakeresőnek tekinthető.",
-+	"vscode.extension.contributes.debuggers.adapterExecutableCommand": "Ha meg van adva, a VS Code ezt a parancsot fogja hívni a hibakeresési illesztő futtatható állománya elérési útjának és az átadandó argumentumok meghatározásához.",
-+	"vscode.extension.contributes.debuggers.configurationSnippets": "Kódtöredékek új 'launch.json'-konfigurációk hozzáadásához.",
-+	"vscode.extension.contributes.debuggers.configurationAttributes": "JSON-sémakonfigurációk a 'launch.json' validálásához.",
-+	"vscode.extension.contributes.debuggers.windows": "Windows-specifikus beállítások.",
-+	"vscode.extension.contributes.debuggers.windows.runtime": "A Windows által használt futtatókörnyezet.",
-+	"vscode.extension.contributes.debuggers.osx": "macOS-specifikus beállítások.",
-+	"vscode.extension.contributes.debuggers.osx.runtime": "A macOS által használt futtatókörnyezet.",
-+	"vscode.extension.contributes.debuggers.linux": "Linux-specifikus beállítások.",
-+	"vscode.extension.contributes.debuggers.linux.runtime": "A Linux által használt futtatókörnyezet.",
-+	"vscode.extension.contributes.breakpoints": "Töréspontokat szolgáltat.",
-+	"vscode.extension.contributes.breakpoints.language": "Töréspontok engedélyezése ennél a nyelvnél.",
-+	"app.launch.json.title": "Indítás",
-+	"app.launch.json.version": "A fájlformátum verziója.",
-+	"app.launch.json.configurations": "A konfigurációk listája. Új konfigurációk hozzáadhatók vagy a meglévők szerkeszthetők az IntelliSense használatával.",
-+	"app.launch.json.compounds": "A kombinációk listája. Minden kombináció több konfigurációt hivatkozik meg, melyek együtt indulnak el.",
-+	"app.launch.json.compound.name": "A kombináció neve. Az indítási konfiguráció lenyíló menüjében jelenik meg.",
-+	"useUniqueNames": "Használjon egyedi konfigurációs neveket!",
-+	"app.launch.json.compound.folder": "A mappa neve, ahol az összetett konfiguráció található.",
-+	"app.launch.json.compounds.configurations": "Azon konfigurációk neve, melyek elindulnak ezen kombináció részeként.",
-+	"debugNoType": "A hibakeresési illesztő 'type' tulajdonsága kötelező, és 'string' típusúnak kell lennie.",
-+>>>>>>> .their
- 	"selectDebug": "Környezet kiválasztása",
- 	"DebugConfig.failed": "Nem sikerült létrehozni a 'launch.json' fájlt a '.vscode' mappánan ({0}).",
- 	"workspace": "munkaterület",
-changed in both
-  base   100644 c0d50b4b05c1f2b049432db5b1e77a8a246f6040 i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 d46bba56fc807a6d58f940f4f326c6859150d33d i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 c4fc5ba9093ae64f55b0e5ae1ed2ad929c8180d2 i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -14,7 +14,11 @@
- 	"breakpointRemoved": "Töréspont eltávoíltva, {0}. sor, fájl: {1}",
- 	"compoundMustHaveConfigurations": "A kombinációk \"configurations\" tulajdonságát be kell állítani több konfiguráció elindításához.",
- 	"noConfigurationNameInWorkspace": "A(z) '{0}' indítási konfiguráció nem található a munkaterületen.",
-+<<<<<<< .our
- 	"multipleConfigurationNamesInWorkspace": "Több '{0}' névvel rendelkező indítási konfiguráció is van a munkaterületen. Használja a mappa nevét a konfiguráció pontos megadásához!",
-+=======
-+	"multipleConfigurationNamesInWorkspace": "Több `{0}` névvel rendelkező indítási konfiguráció is van a munkaterületen. Használja a mappa nevét a konfiguráció pontos megadásához!",
-+>>>>>>> .their
- 	"noFolderWithName": "Nem található '{0}' nevű mappa a(z) '{1}' konfigurációhoz a(z) '{2}' összetett konfigurációban.",
- 	"configMissing": "A(z) '{0}' konfiguráció hiányzik a 'launch.json'-ból.",
- 	"launchJsonDoesNotExist": "A 'launch.json' nem létezik.",
-@@ -26,7 +30,13 @@
- 	"preLaunchTaskErrors": "Buildelési hibák léptek fel a(z) '{0}' preLaunchTask futása közben.",
- 	"preLaunchTaskError": "Buildelési hiba lépett fel a(z) '{0}' preLaunchTask futása közben.",
- 	"preLaunchTaskExitCode": "A(z) '{0}' preLaunchTask a következő hibakóddal fejeződött be: {1}.",
-+<<<<<<< .our
- 	"showErrors": "Hibák megjelenítése",
-+=======
-+	"debugAnyway": "Hibakeresés indítása mindenképp",
-+	"showErrors": "Hibák megjelenítése",
-+	"cancel": "Mégse",
-+>>>>>>> .their
- 	"noFolderWorkspaceDebugError": "Az aktív fájlon nem lehet hibakeresést végezni. Bizonyosodjon meg róla, hogy el van mentve a lemezre, és hogy az adott fájltípushoz telepítve van a megfelelő hibakeresési kiegészítő.",
- 	"cancel": "Mégse",
- 	"DebugTaskNotFound": "A(z) '{0}' feladat nem található.",
-changed in both
-  base   100644 788695273d2c4800b2698e86cedcf74a96268228 i18n/hun/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-  our    100644 823bbb7356817eb6647109564da6cf2aa6e72c76 i18n/hun/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-  their  100644 bbce48ea15edb956bbef16a183b4d58689244bda i18n/hun/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-changed in both
-  base   100644 19ba7826b26b07d88b80805b67c3fc2f4397938a i18n/hun/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 7a913054b256429d23dc7fd5eaa396c14eb26134 i18n/hun/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 591fd152602850c327a357b7806e1507abdce70e i18n/hun/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-@@ -56,11 +56,17 @@
- 	"OpenExtensionsFile.failed": "Nem sikerült létrehozni az 'extensions.json' fájlt a '.vscode' mappánan ({0}).",
- 	"configureWorkspaceRecommendedExtensions": "Ajánlott kiegészítők konfigurálása (munkaterületre vonatkozóan)",
- 	"configureWorkspaceFolderRecommendedExtensions": "Ajánlott kiegészítők konfigurálása (munkaterület-mappára vonatkozóan)",
-+<<<<<<< .our
- 	"malicious tooltip": "A kiegészítőt korábban problémásnak jelezték.",
- 	"malicious": "Rosszindulatú",
- 	"disabled": "Letiltva",
- 	"disabled globally": "Letiltva",
- 	"disabled workspace": "Letiltva ezen a munkaterületen",
-+=======
-+	"builtin": "Beépített",
-+	"malicious tooltip": "A kiegészítőt korábban problémásnak jelezték.",
-+	"malicious": "Rosszindulatú",
-+>>>>>>> .their
- 	"disableAll": "Összes telepített kiegészítő letiltása",
- 	"disableAllWorkspace": "Összes telepített kiegészítő letiltása a munkaterületre vonatkozóan",
- 	"enableAll": "Összes kiegészítő engedélyezése",
-changed in both
-  base   100644 d86f17e2c4acf1c79d055b8ae84afebb8eb7a9ad i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-  our    100644 be33ca1c92f7e17fa11e2cb1bc14bf43fab6b0e0 i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-  their  100644 2185e1f63166d2deb63f0ad66fff5d92c3e96e0f i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-@@ -6,9 +6,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"restart1": "Kiegészítők profilozása",
- 	"restart2": "Kiegészítők profilozásához újraindítás szükséges. Szeretné újraindítani az alkalmazást?",
- 	"restart3": "Újraindítás",
- 	"cancel": "Mégse",
-+=======
-+	"noPro": "Kiegészítők profilozásához indítsa az alkalmazást az `--inspect-extensions=<port>` kapcsolóval!",
-+>>>>>>> .their
- 	"selectAndStartDebug": "Kattintson a profilozás leállításához!"
- }
-\ No newline at end of file
-changed in both
-  base   100644 e7feafa73c2e87934c5da487788a71f3260d222e i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 236476e89a262d4e51ec02393f20d9a7b2715c82 i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 a877a7c58ff5cb800ff9e269ac7f0eea9b0691b7 i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -10,8 +10,12 @@
- 	"searchMarketplace": "Keresés a piactéren",
- 	"dynamicWorkspaceRecommendation": "Ez a kiegészítő lehet, hogy érdekelni fogja, mert népszerű a(z) {0} forráskódtár felhasználói körében.",
- 	"exeBasedRecommendation": "Ez a kiegészítő azért ajánlott, mert a következő telepítve van: {0}.",
-+<<<<<<< .our
- 	"fileBasedRecommendation": "Ez a kiegészítő a közelmúltban megnyitott fájlok alapján ajánlott.",
- 	"workspaceRecommendation": "Ez a kiegészítő az aktuális munkaterület felhasználói által ajánlott.",
-+=======
-+	"dynamicWorkspaceRecommendation": "Ez a kiegészítő lehet, hogy érdekelni fogja, mert az aktuális munkaterület felhasználói közül sokan használják.",
-+>>>>>>> .their
- 	"reallyRecommended2": "Ehhez a fájltípushoz a(z) '{0}' kiegészítő ajánlott.",
- 	"reallyRecommendedExtensionPack": "Ehhez a fájltípushoz a(z) '{0}' kiegészítőcsomag ajánlott.",
- 	"install": "Telepítés",
-changed in both
-  base   100644 8c69d5e6f09b4561c975c69602ebbac715ee5d5d i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  our    100644 1c51e825f0a403a2147da3ea0bf16769db79e4b3 i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  their  100644 e46c9945604e996bbf02211aad2ac53e0e3f0be4 i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-changed in both
-  base   100644 eb7e9655776d233d1232164e322cd2689cea6c77 i18n/hun/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
-  our    100644 ca858c413b18f03a2a0c0d2cdb34a5be44f915ff i18n/hun/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
-  their  100644 3afdba07a67cecca8a906327df177f99228ee0e6 i18n/hun/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
-changed in both
-  base   100644 435a44357b5b7a072dcb220e3104c250b8d8fccf i18n/hun/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  our    100644 533388e750ee4e135ca7c686e5459ac247110cdf i18n/hun/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  their  100644 02537c879c2dc402269388550aa63a90d25a95e2 i18n/hun/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-changed in both
-  base   100644 3b95fa88154df0fea4fadfaff30fe037d078562a i18n/hun/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  our    100644 c6560556f50b2c6b7850e49b1fbb3da9c8f3211a i18n/hun/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  their  100644 a7216cca1d6f795c3953a26d0c1b23307cb848fd i18n/hun/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-changed in both
-  base   100644 2affc6ad1ad25429ea04d58def0984549455c395 i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-  our    100644 b1b8e31025134dcff7f92246b95e3403defbfdfd i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-  their  100644 3f82c002188d80e9f85c47d61174298de400cee0 i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-changed in both
-  base   100644 e1d5c2e0db61e8af9043d59e7fa5ae0dac99168a i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 7fcd4f374ab4f60995cadb201b3438b5f1c1d544 i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 febf379cc1ef6e0f18354bb04acf29a159f858aa i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -9,7 +9,10 @@
- 	"emptyUserSettingsHeader": "Az ebben a fájlban elhelyezett beállítások felülírják az alapértelmezett beállításokat.",
- 	"emptyWorkspaceSettingsHeader": "Az ebben a fájlban elhelyezett beállítások felülírják a felhasználói beállításokat.",
- 	"emptyFolderSettingsHeader": "Az ebben a fájlban elhelyezett beállítások felülírják a munkaterületre vonatkozó beállításokat.",
-+<<<<<<< .our
- 	"reportSettingsSearchIssue": "Probléma jelentése",
-+=======
-+>>>>>>> .their
- 	"newExtensionLabel": "\"{0}\" kiegészítő megjelenítése",
- 	"editTtile": "Szerkesztés",
- 	"replaceDefaultValue": "Csere a beállításokban",
-changed in both
-  base   100644 56a5f129a8a457f9fa6dc5cad5e20ce90c1124d7 i18n/hun/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 9a1dc2269a19b301bdc256c8a1594b2d89a94c18 i18n/hun/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 6c9f746df9e9118b67f5d0e720327610b08d2512 i18n/hun/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-changed in both
-  base   100644 4fe5ac2c71249e92c022919352e8292b0e693262 i18n/hun/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 1439e6263aeea9edcee41566036c04020ed9c86f i18n/hun/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 99bf550dddd32c3f6495bb73d5deb1ea7eec9230 i18n/hun/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -30,6 +30,10 @@
- 	"search.quickOpen.includeSymbols": "Meghatározza, hogy a fájlok gyors megnyitásánál megjelenjenek-e a globális szimbólumkereső találatai.",
- 	"search.followSymlinks": "Meghatározza, hogy keresés során követve legyenek-e a szimbolikus linkek.",
- 	"search.smartCase": "Figyelmen kívül hagyja a kis- és nagybetűket, ha a minta csak kisbetűkből áll, ellenkező esetben kis- és nagybetűérzékenyen keres",
-+<<<<<<< .our
- 	"search.globalFindClipboard": "Meghatározza, hogy a keresőmodul olvassa és módosítsa-e a megosztott keresési vágólapot macOS-en.",
- 	"search.location": "Meghatározza, hogy a keresés az oldalsávon jelenik meg vagy egy panelként a panelterületen, mely utóbbi esetén több vízszintes hely áll rendelkezésre."
-+=======
-+	"search.globalFindClipboard": "Meghatározza, hogy a keresőmodul olvassa és módosítsa-e a megosztott keresési vágólapot macOS-en."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 273ee125f36d968121662813efc994aae679bafc i18n/hun/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 25b373020cb1651acc71d33aa66600dbd973089e i18n/hun/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 65bf3fa4359f4f40d47528d6a958dc16eacb907f i18n/hun/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-changed in both
-  base   100644 75d507968bed42cc66f29e73ce1c9124f76c9b68 i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 8ec8f827057c19dd6709715ecc51f43540d7d5cc i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 cf62370d670a01f9f854ac44e83a460432cc88ae i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -30,7 +30,11 @@
- 	"terminal.integrated.rendererType": "Meghatározza, hogy melyik módszerrel van kirajzolva a terminál: a „canvas” esetén az alap (gyors) canvas-alapú megjelenítővel, míg „dom” esetén a tartalék DOM-alapú megjelenítővel. Az „auto” esetén a VS Code megpróbálja kitalálni, melyik módszer lesz hatékonyabb. Az érték módosítása után újra kell tölteni a VS Code-ot, hogy az új terminálokban érvénybe lépjen a beállítás.",
- 	"terminal.integrated.rightClickBehavior": "Meghatározza, hogy a terminál milyen műveletet hajt végre jobb kattintás esetén. Lehetséges értékek: „default”, „copyPaste” és „selectWord”. „default” esetén megjelenik a helyi menü, „copyPaste” esetén másolja a kijelölt szöveget vagy beilleszt, „selectWord” esetén pedig kijelöli a kurzor alatti szót és megjeleníti a helyi menüt.",
- 	"terminal.integrated.cwd": "Explicit elérési út, ahol a terminál indítva lesz. Ez a shellfolyamat munkakönyvtára (cwd) lesz. Ez a beállítás nagyon hasznos olyan munkaterületeken, ahol a gyökérkönyvtár nem felel meg munkakönyvtárnak.",
-+<<<<<<< .our
- 	"terminal.integrated.confirmOnExit": "Az alkalmazás kérjen-e megerősítést kilépéskor, ha van aktív terminál-munkafolyamat.",
-+=======
-+	"terminal.integrated.confirmOnExit": "Meghatározza, hogy megerősítést kér-e az alkalamzás, ha van aktív terminál-munkafolyamat.",
-+>>>>>>> .their
- 	"terminal.integrated.enableBell": "Meghatározza, hogy engedélyezve van-e a csengő a terminálba.",
- 	"terminal.integrated.commandsToSkipShell": "Olyan parancsazonosítók listája, melyek nem lesznek elküldve a shellnek, és ehelyett mindig a Code kezeli le őket. Ez lehetővé teszi, hogy az olyan billentyűparancsok, melyeket normál esetben a shell dolgozna fel, ugyanúgy működjenek, mint mikor a terminálon nincs fókusz. Például ilyen a gyorsmegnyitás indításához használt Ctrl+P.",
- 	"terminal.integrated.env.osx": "A VS Code folyamatához hozzáadott környezeti változókat tartalmazó objektum, amit az OS X-es terminál használ.",
-changed in both
-  base   100644 3c3464193dc121b1625683b352214917aaa2153c i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-  our    100644 4605d8c3cbab7ef847959eb7d47662c8104aa641 i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-  their  100644 50576796b1ff8bd07a6d903f94e4aeed48543305 i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-@@ -9,11 +9,14 @@
- 	"terminal.integrated.a11yBlankLine": "Üres sor",
- 	"terminal.integrated.a11yPromptLabel": "Terminál bemenet",
- 	"terminal.integrated.a11yTooMuchOutput": "Túl sok felolvasásra váró kimenet, navigáljon a sorokhoz manuálisan a felolvasáshoz!",
-+<<<<<<< .our
- 	"yes": "Igen",
- 	"terminal.rendererInAllNewTerminals": "Az összes új terminál nem GPU-alapú kirajzolást fog használni.",
- 	"no": "Nem",
- 	"dontShowAgain": "Ne jelenítse meg újra",
- 	"terminal.slowRendering": "Úgy tűnik, hogy az integrált terminál alapértelmezett kirajzolására szolgáló motorja lassú ezen a számítógépen. Szeretne váltani az alternatív, DOM-alapú kirajzolóra, amely javíthat a teljesítményen? [További információ a terminál beállításairól](https://code.visualstudio.com/docs/editor/integrated-terminal#_changing-how-the-terminal-is-rendered).",
-+=======
-+>>>>>>> .their
- 	"terminal.integrated.copySelection.noSelection": "A terminálban nincs semmi kijelölve a másoláshoz",
- 	"terminal.integrated.exitedWithCode": "A terminálfolyamat a következő kilépési kóddal állt le: {0}",
- 	"terminal.integrated.waitOnExit": "A folytatáshoz nyomjon meg egy billentyűt...",
-changed in both
-  base   100644 a3fffba1fdcadec756d3b65d80fdcfb949a44ec2 i18n/hun/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json
-  our    100644 ab9ac7a787d7166b96901090ae62371e7647fadf i18n/hun/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json
-  their  100644 2650b5d6516e845eeb45a8fd661e9a1943a960b1 i18n/hun/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json
-@@ -6,5 +6,12 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"release notes": "Kiadási jegyzék"
-+=======
-+	"release notes": "Kiadási jegyzék",
-+	"updateConfigurationTitle": "Frissítés",
-+	"updateChannel": "Meghatározza, hogy érkeznek-e automatikus frissítések a frissítési csatornáról. A beállítás módosítása után újraindítás szükséges.",
-+	"enableWindowsBackgroundUpdates": "Háttérben történő frissítés engedélyezése Windowson."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d001933dd31b7d0bf2cc86a54edcf87318382ace i18n/hun/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 ee1596339153cc7e8c412014c640971b5ecc963e i18n/hun/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 5bdd606604265d437c6ea4e7bbdd69560a5a7b57 i18n/hun/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -16,12 +16,18 @@
- 	"noUpdatesAvailable": "Jelenleg nincs elérhető frissítés.",
- 	"ok": "OK",
- 	"thereIsUpdateAvailable": "Van elérhető frissítés.",
-+<<<<<<< .our
- 	"download now": "Letöltés most",
- 	"later": "Később",
- 	"updateAvailable": "Frissítés érhető el: {0} {1}",
- 	"installUpdate": "Frissítés telepítése",
- 	"updateInstalling": "{0} {1} a háttérben települ. Jelzünk, ha elkészült.",
- 	"updateAvailableAfterRestart": "A {0} újraindításával telepíthető a legújabb frissítés.",
-+=======
-+	"installUpdate": "Frissítés telepítése",
-+	"updateAvailable": "Frissítés érhető el: {0} {1}",
-+	"updateInstalling": "{0} {1} a háttérben települ. Jelzünk, ha elkészült.",
-+>>>>>>> .their
- 	"updateNow": "Frissítés most",
- 	"commandPalette": "Parancskatalógus...",
- 	"settings": "Beállítások",
-changed in both
-  base   100644 a8fb58c22e365685a72804b8cccfddbf09f48324 i18n/hun/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-  our    100644 e68aaa57dfa5d94ba540376d33ec4dec7fcce19f i18n/hun/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-  their  100644 dc9b5a6e5f0601daf47ea3ca1ab997ee8e8e06eb i18n/hun/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-changed in both
-  base   100644 a62c898a9fbe05b766bf77567055999cd539f765 i18n/ita/extensions/emmet/package.i18n.json
-  our    100644 325af035e69c09e1e32c51cdc976ffb0a4047641 i18n/ita/extensions/emmet/package.i18n.json
-  their  100644 edb1fa714911e0f065469d81f423ffe2f9f068c5 i18n/ita/extensions/emmet/package.i18n.json
-@@ -56,10 +56,17 @@
- 	"emmetPreferencesFormatNoIndentTags": "Una matrice di nomi di tag che non dovrebbe ottenere il rientro interno",
- 	"emmetPreferencesFormatForceIndentTags": "Una matrice di nomi di tag che dovrebbe sempre ottenere il rientro interno",
- 	"emmetPreferencesAllowCompactBoolean": "Se true, viene prodotta una notazione compatta degli attributi booleani",
-+<<<<<<< .our
- 	"emmetPreferencesCssWebkitProperties": "Proprietà CSS delimitate da virgola che assumono il prefisso 'webkit' del vendor quando utilizzate nelle abbreviazioni di Emmet che iniziano per '-'. Per evitare sempre il prefisso 'webkit' impostare stringa vuota.",
- 	"emmetPreferencesCssMozProperties": "Proprietà CSS delimitate da virgola che assumono il prefisso 'moz' del vendor quando utilizzate nelle abbreviazioni di Emmet che iniziano per '-'. Per evitare sempre il prefisso 'moz' impostare stringa vuota.",
- 	"emmetPreferencesCssOProperties": "Proprietà CSS delimitate da virgola che assumono il prefisso 'o' del vendor quando utilizzate nelle abbreviazioni di Emmet che iniziano per '-'. Per evitare sempre il prefisso 'o' impostare stringa vuota.",
- 	"emmetPreferencesCssMsProperties": "Proprietà CSS delimitate da virgola che assumono il prefisso 'ms' del vendor quando utilizzate nelle abbreviazioni di Emmet che iniziano per '-'. Per evitare sempre il prefisso 'ms' impostare stringa vuota.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "Il valore minimo (da 0 a 1) che dovrebbe raggiungere un'abbreviazione di fuzzy-match. I valori più bassi possono produrre molti falsi positivi, i valori più alti possono ridurre le possibili corrispondenze.",
- 	"emmetOptimizeStylesheetParsing": "Se è impostato su false, l'intero file viene analizzato per determinare se la posizione corrente è valida per l'espansione delle abbreviazioni di Emmet. Se è impostato su true, viene analizzato solo il contenuto circostante alla posizione corrente nei file css/scss/less."
-+=======
-+	"emmetPreferencesCssWebkitProperties": "Proprietà CSS delimitate da virgole che ottengono il prefisso del fornitore webkit quando vengono usate in un'abbreviazione Emmet che inizia con `-`. Impostare su una stringa vuota per evitare sempre il prefisso webkit.",
-+	"emmetPreferencesCssMozProperties": "Proprietà CSS delimitate da virgole che ottengono il prefisso del fornitore moz quando vengono usate in un'abbreviazione Emmet che inizia con `-`. Impostare su una stringa vuota per evitare sempre il prefisso moz.",
-+	"emmetPreferencesCssOProperties": "Proprietà CSS delimitate da virgole che ottengono il prefisso del fornitore o quando vengono usate in un'abbreviazione Emmet che inizia con `-`. Impostare su una stringa vuota per evitare sempre il prefisso o.",
-+	"emmetPreferencesCssMsProperties": "Proprietà CSS delimitate da virgole che ottengono il prefisso del fornitore ms quando vengono usate in un'abbreviazione Emmet che inizia con `-`. Impostare su una stringa vuota per evitare sempre il prefisso ms."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 fc40253cbec67d8b68d0afe875a2ee56eedfb850 i18n/ita/extensions/git/out/commands.i18n.json
-  our    100644 b8b9f0490197b0e5904f4f035caca3a7f04c7df9 i18n/ita/extensions/git/out/commands.i18n.json
-  their  100644 3ce147e64bc1087be1c213f85e28ef40d1334f21 i18n/ita/extensions/git/out/commands.i18n.json
-changed in both
-  base   100644 d5f494637111d262f038c96b8837bbd0eb213bfd i18n/ita/extensions/git/out/repository.i18n.json
-  our    100644 935d229ef3d726205b9cd81f4eb5a8ad6c057254 i18n/ita/extensions/git/out/repository.i18n.json
-  their  100644 5e17db881b4b664d11a2d896390539173a5d8698 i18n/ita/extensions/git/out/repository.i18n.json
-changed in both
-  base   100644 487e573a372ad1a9d6cb8c9c2722c9f6bfd08f04 i18n/ita/extensions/git/package.i18n.json
-  our    100644 3e99eceff18f0bd1805288644f15d41ccf24de7a i18n/ita/extensions/git/package.i18n.json
-  their  100644 7a906a3987eeda17c214be24114e96a958c8ab81 i18n/ita/extensions/git/package.i18n.json
-@@ -75,9 +75,14 @@
- 	"config.decorations.enabled": "Controlla se Git fornisce colori e distintivi alle visualizzazioni Esplora risorse e Editor aperti.",
- 	"config.promptToSaveFilesBeforeCommit": "Controlla se GIT deve verificare la presenza di file non salvati prima di eseguire il commit.",
- 	"config.showInlineOpenFileAction": "Controlla se visualizzare un'azione Apri file inline nella visualizzazione modifiche GIT.",
-+<<<<<<< .our
- 	"config.inputValidation": "Controlla quando visualizzare la convalida sull'input del messaggio di commit.",
- 	"config.detectSubmodules": "Controlla se rilevare automaticamente i moduli secondari GIT.",
- 	"config.detectSubmodulesLimit": "Controlla il limite dei sottomoduli git rilevati.",
-+=======
-+	"config.inputValidation": "Controlla quando visualizzare la convalida dell'input nel contatore di input.",
-+	"config.detectSubmodules": "Controlla se rilevare automaticamente i moduli secondari GIT.",
-+>>>>>>> .their
- 	"colors.modified": "Colore delle risorse modificate.",
- 	"colors.deleted": "Colore delle risorse eliminate.",
- 	"colors.untracked": "Colore delle risorse non tracciate.",
-changed in both
-  base   100644 2e0da47978c93f410ea8bb9e56dea49d52f79e66 i18n/ita/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  our    100644 227d32796a6baa320c796945995dc4dda33fa366 i18n/ita/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  their  100644 300d0ef225bd9d418e912321ac266a773459dbee i18n/ita/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-@@ -6,6 +6,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"hide": "nascondi",
- 	"show": "mostra",
- 	"previewOnGitHub": "Anteprima in GitHub",
-@@ -27,5 +28,15 @@
- 	"expectedResults": "Risultati previsti",
- 	"settingsSearchResultsDescription": "Elencare i risultati che si prevedeva di visualizzare durante la ricerca con questa query. È supportato il linguaggio Markdown per GitHub. Sarà possibile modificare il problema e aggiungere screenshot quando verrà visualizzato in anteprima in GitHub.",
- 	"pasteData": "I dati necessari sono stati scritti negli appunti perché erano eccessivi per l'invio. Incollarli.",
-+=======
-+	"previewOnGitHub": "Anteprima in GitHub",
-+	"similarIssues": "Problemi simili",
-+	"noResults": "Non sono stati trovati risultati",
-+	"rateLimited": "Superato il limite di frequenza API",
-+	"stepsToReproduce": "Passi da riprodurre",
-+	"bugDescription": "Come è stato riscontrato il problema? Quali passaggi è necessario eseguire per riprodurre il problema in modo affidabile? Che cosa doveva accadere e cosa è invece effettivamente accaduto?",
-+	"performanceIssueDesciption": "Quando si è verificato questo problema di prestazioni? Si è ad esempio verificato all'avvio o dopo una serie specifica di azioni? Qualsiasi dettaglio fornito può essere utile ai fini dell'analisi del problema.",
-+	"description": "Descrizione",
-+>>>>>>> .their
- 	"disabledExtensions": "Le estensioni sono disabilitate"
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ita/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  our    100644 a59dbde663cf3b1122a7f857a3ec49c9a6812924 i18n/ita/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  their  100644 473368cf559cde6392c92f589728a2824b9f46eb i18n/ita/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-@@ -7,6 +7,7 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"completeInEnglish": "Completare il modulo in lingua inglese.",
-+<<<<<<< .our
- 	"issueTypeLabel": "Questo è un",
- 	"issueSourceLabel": "File in",
- 	"vscode": "Visual Studio Code",
-@@ -25,4 +26,25 @@
- 	"sendExtensions": "Includi le estensioni abilitate ({0})",
- 	"sendSearchedExtensions": "Invia le estensioni cercate ({0})",
- 	"sendSettingsSearchDetails": "Invia i dettagli di ricerca delle impostazioni ({0})"
-+=======
-+	"issueTypeLabel": "Tipo di segnalazione",
-+	"bugReporter": "Segnalazione di bug",
-+	"performanceIssue": "Problema di prestazioni",
-+	"featureRequest": "Richiesta di funzionalità",
-+	"issueTitleLabel": "Titolo",
-+	"issueTitleRequired": "Immettere un titolo.",
-+	"vscodeVersion": "Versione di VS Code",
-+	"osVersion": "Versione del sistema operativo",
-+	"systemInfo": "Informazioni sul sistema in uso",
-+	"sendData": "Invia i dati",
-+	"processes": "Processi attualmente in esecuzione",
-+	"workspaceStats": "Statistiche area di lavoro personale",
-+	"extensions": "Estensioni personali",
-+	"tryDisablingExtensions": "Il problema è riproducibile quando le estensioni sono disabilitate",
-+	"disableExtensions": "disabilitando tutte le estensioni e ricaricando la finestra",
-+	"showRunningExtensions": "visualizzare tutte le estensioni in esecuzione",
-+	"githubMarkdown": "È supportato il linguaggio Markdown per GitHub. Sarà possibile modificare il problema e aggiungere screenshot quando verrà visualizzato in anteprima in GitHub.",
-+	"issueDescriptionRequired": "Immettere una descrizione.",
-+	"loadingData": "Caricamento dei dati..."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ita/src/vs/code/electron-main/logUploader.i18n.json
-  our    100644 39ed2854c63b243e16d0cba96772b1a23fb03086 i18n/ita/src/vs/code/electron-main/logUploader.i18n.json
-  their  100644 0b72a4d2fb9d504bf6de10ad3e793d353c1daa02 i18n/ita/src/vs/code/electron-main/logUploader.i18n.json
-@@ -9,10 +9,18 @@
- 	"invalidEndpoint": "Endpoint dell'uploader di log non valido",
- 	"beginUploading": "Caricamento...",
- 	"didUploadLogs": "Caricamento riuscito. ID file di log: {0}",
-+<<<<<<< .our
- 	"logUploadPromptHeader": "I log della sessione verranno caricati in un endpoint Microsoft protetto accessibile solo ai membri Microsoft del team di VS Code.",
- 	"logUploadPromptBody": "I log della sessione possono contenere informazioni personali, quali percorsi completi o contenuti di file. Esaminare e correggere i file di log della sessione qui: '{0}'",
- 	"logUploadPromptBodyDetails": "Continuando si conferma di aver esaminato e corretto i file di log della sessione e di accettare che Microsoft li usi per eseguire il debug di VS Code.",
- 	"logUploadPromptAcceptInstructions": "Per proseguire con l'upload, eseguire il codice con '--upload-logs={0}'",
-+=======
-+	"userDeniedUpload": "Caricamento annullato",
-+	"logUploadPromptHeader": "Caricare i log di sessione per proteggere l'endpoint?",
-+	"logUploadPromptBody": "È possibile esaminare i file di log qui: '{0}'",
-+	"logUploadPromptBodyDetails": "I log possono contenere informazioni personali, come percorsi completi e contenuto di file.",
-+	"logUploadPromptKey": "I log sono stati esaminati (immettere 's' per confermare l'upload)",
-+>>>>>>> .their
- 	"postError": "Si è verificato un errore durante l'invio dei log: {0}",
- 	"responseError": "Si è verificato un errore durante l'invio dei log. È stato ottenuto {0} - {1}",
- 	"parseError": "Si è verificato un errore durante l'analisi della risposta",
-changed in both
-  base   100644 06696549d5d7c1bd149a1bbfb9b8385a9e09476a i18n/ita/src/vs/code/electron-main/menus.i18n.json
-  our    100644 a5f6c5e0343adf224d6df3a61663d9695836512e i18n/ita/src/vs/code/electron-main/menus.i18n.json
-  their  100644 b0d0998bd4d1d3725f6a8f7567aeea484e524820 i18n/ita/src/vs/code/electron-main/menus.i18n.json
-changed in both
-  base   100644 c10a03cda1ba29463576f1f2163bc8a58cc47815 i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 f91d8d15e9f7c53e3b2a0166aab270c9bf1f772e i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 e88f3f97e71002d98d00fdb2d5b2df5369063ec1 i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json
-changed in both
-  base   100644 ea39baecdc99e3fd8f0ca116b5e411d8f02c7b03 i18n/ita/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 9db983246eacb0b2b4bfd0f1c8d91ee5c10e2e9a i18n/ita/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 b8a56734d346c6da2aaa8ef96df1fbc10b9ef608 i18n/ita/src/vs/platform/environment/node/argv.i18n.json
-changed in both
-  base   100644 b1080ce0418685734062451899fb34dad4f9bbc0 i18n/ita/src/vs/platform/list/browser/listService.i18n.json
-  our    100644 8a43e89f81348de65b8a948848a12644ffeedef3 i18n/ita/src/vs/platform/list/browser/listService.i18n.json
-  their  100644 adf48cd06e841de38defdf32225c763d2c4b797f i18n/ita/src/vs/platform/list/browser/listService.i18n.json
-@@ -12,6 +12,10 @@
- 	"multiSelectModifier": "Modificatore da usare per aggiungere un elemento in alberi ed elenchi a una selezione multipla con il mouse (ad esempio editor aperti e visualizzazione Gestione controllo servizi in Esplora risorse). 'ctrlCmd' rappresenta il tasto 'CTRL' in Windows e Linux e  il tasto 'Cmd' in OSX. I gesti del mouse Apri lateralmente, se supportati, si adatteranno in modo da non entrare in conflitto con il modificatore di selezione multipla.",
- 	"openMode.singleClick": "Apre elementi facendo un singolo clic col mouse.",
- 	"openMode.doubleClick": "Apre elementi facendo doppio clic col mouse.",
-+<<<<<<< .our
- 	"openModeModifier": "Controlla la modalità di apertura degli elementi in alberi ed elenchi con il mouse, se supportata. Impostare su `singleClick` per aprire gli elementi con un unico clic del mouse e `doubleClick` per aprirli solo se viene fatto doppio clic. Per gli elementi padre con elementi figlio negli alberi, questa impostazione controllerà se per espandere l'elemento padre è necessario fare clic una sola volta o fare doppio clic. Tenere presente che alcuni alberi ed elenchi potrebbero scegliere di ignorare questa impostazione se non è applicabile. ",
- 	"horizontalScrolling setting": "Controlla se gli alberi supportano lo scorrimento orizzontale in workbench."
-+=======
-+	"openModeModifier": "Controlla la modalità di apertura degli elementi in alberi ed elenchi con il mouse, se supportata. Impostare su `singleClick` per aprire gli elementi con un unico clic del mouse e `doubleClick` per aprirli solo se viene fatto doppio clic. Per gli elementi padre con elementi figlio negli alberi, questa impostazione controllerà se per espandere l'elemento padre è necessario fare clic una sola volta o fare doppio clic. Tenere presente che alcuni alberi ed elenchi potrebbero scegliere di ignorare questa impostazione se non è applicabile. "
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8299e0197410d9ae9410043deb8bde063254dad7 i18n/ita/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
-  our    100644 7e1b27bff8cc101489253244104718a377885633 i18n/ita/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
-  their  100644 46399326736f18bf92e99db82cc7538c5e8e47b0 i18n/ita/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
-@@ -11,11 +11,17 @@
- 	"sizeMB": "{0} MB",
- 	"sizeGB": "{0} GB",
- 	"sizeTB": "{0} TB",
-+<<<<<<< .our
- 	"largeImageError": "L'immagine non viene visualizzata nell'editor perché è troppo grande ({0}).",
- 	"resourceOpenExternalButton": "Aprire l'immagine utilizzando un programma esterno?",
- 	"nativeFileTooLargeError": "Il file non viene visualizzato nell'editor perché è troppo grande ({0}).",
- 	"nativeBinaryError": "Il file non viene visualizzato nell'editor perché è binario o usa una codifica di testo non supportata.",
- 	"openAsText": "Aprirlo comunque?",
-+=======
-+	"largeImageError": "Le dimensioni del file dell'immagine sono eccessive (maggiori di 1 MB) per la visualizzazione nell'editor. ",
-+	"resourceOpenExternalButton": "Aprire l'immagine utilizzando un programma esterno?",
-+	"nativeBinaryError": "Il file non verrà visualizzato nell'editor perché è binario, è molto grande o usa una codifica testo non supportata.",
-+>>>>>>> .their
- 	"zoom.action.fit.label": "Immagine intera",
- 	"imgMeta": "{0}x{1} {2}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 b0bde6ad0f4b06b53b6e5e3514fb3f3f9f5ed5cd i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 16fec1a5d98f225249a95297ad06c45ba75efafc i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 9cdd21146a82fae0d2dcdc629ee303d3b7b07d2e i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,7 +35,10 @@
- 	"panelDefaultLocation": "Controlla la posizione predefinita del pannello. Può essere mostrato nella parte inferiore o a destra del banco di lavoro.",
- 	"statusBarVisibility": "Controlla la visibilità della barra di stato nella parte inferiore del workbench.",
- 	"activityBarVisibility": "Controlla la visibilità della barra attività nel workbench.",
-+<<<<<<< .our
- 	"viewVisibility": "Controlla la visibilità delle azioni dell'intestazione della visualizzazione. Le azioni dell'intestazione della visualizzazione possono essere sempre visibili oppure visibili solo quando lo stato attivo è spostato sulla visualizzazione o si passa con il puntatore sulla visualizzazione.",
-+=======
-+>>>>>>> .their
- 	"fontAliasing": "Controlla il metodo di aliasing dei caratteri nell'area di lavoro.\n- default: anti-aliasing dei caratteri a livello di sub-pixel. Nella maggior parte delle visualizzazioni non retina consentirà di ottenere un testo con il massimo contrasto.\n- antialiased: anti-aliasing dei caratteri a livello di pixel, invece che a livello di sub-pixel. Consente di visualizzare i caratteri più chiari.\n- none: disabilita l'anti-aliasing dei caratteri. Il testo verrà visualizzato con contorni irregolari.\n- auto: applica automaticamente `default` o `antialiased` in base al valore DPI degli schermi.",
- 	"workbench.fontAliasing.default": "Anti-aliasing dei caratteri a livello di sub-pixel. Nella maggior parte delle visualizzazioni non retina consentirà di ottenere un testo con il massimo contrasto.",
- 	"workbench.fontAliasing.antialiased": "Anti-aliasing dei caratteri a livello di pixel, invece che a livello di sub-pixel. Consente di visualizzare i caratteri più chiari.",
-changed in both
-  base   100644 3b76ad0d268630b4967b7095e3c983d85f7772fc i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-  our    100644 73bdd73c5df0195d83491760c4fa2a706a243147 i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-  their  100644 74e055397e34d8ced98d5a011e8eeea74e61315a i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-@@ -6,7 +6,40 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"debugNoType": "Il \"tipo\" del debugger non può essere omesso e deve essere di tipo \"string\"",
-+=======
-+	"vscode.extension.contributes.debuggers": "Adattatori di debug per contributes.",
-+	"vscode.extension.contributes.debuggers.type": "Identificatore univoco per questo adattatore di debug.",
-+	"vscode.extension.contributes.debuggers.label": "Nome visualizzato per questo adattatore di debug.",
-+	"vscode.extension.contributes.debuggers.program": "Percorso del programma dell'adattatore di debug. Il percorso è assoluto o relativo alla cartella delle estensioni.",
-+	"vscode.extension.contributes.debuggers.args": "Argomenti facoltativi da passare all'adattatore.",
-+	"vscode.extension.contributes.debuggers.runtime": "Runtime facoltativo nel caso in cui l'attributo del programma non sia un eseguibile ma richieda un runtime.",
-+	"vscode.extension.contributes.debuggers.runtimeArgs": "Argomenti del runtime facoltativo.",
-+	"vscode.extension.contributes.debuggers.variables": "Mapping tra le variabili interattive, ad esempio ${action.pickProcess}, in `launch.json` e un comando.",
-+	"vscode.extension.contributes.debuggers.initialConfigurations": "Configurazioni per generare la versione iniziale di 'launch.json'.",
-+	"vscode.extension.contributes.debuggers.languages": "Elenco dei linguaggi. per cui l'estensione di debug può essere considerata il \"debugger predefinito\".",
-+	"vscode.extension.contributes.debuggers.adapterExecutableCommand": "Se è specificato, Visual Studio Code chiamerà questo comando per determinare il percorso eseguibile della scheda di debug e gli argomenti da passare.",
-+	"vscode.extension.contributes.debuggers.configurationSnippets": "Frammenti per l'aggiunta di nuove configurazioni in 'launch.json'.",
-+	"vscode.extension.contributes.debuggers.configurationAttributes": "Configurazioni dello schema JSON per la convalida di 'launch.json'.",
-+	"vscode.extension.contributes.debuggers.windows": "Impostazioni specifiche di Windows.",
-+	"vscode.extension.contributes.debuggers.windows.runtime": "Runtime usato per Windows.",
-+	"vscode.extension.contributes.debuggers.osx": "Impostazioni specifiche di macOS.",
-+	"vscode.extension.contributes.debuggers.osx.runtime": "Runtime usato per macOS.",
-+	"vscode.extension.contributes.debuggers.linux": "Impostazioni specifiche di Linux.",
-+	"vscode.extension.contributes.debuggers.linux.runtime": "Runtime usato per Linux.",
-+	"vscode.extension.contributes.breakpoints": "Punti di interruzione per contributes.",
-+	"vscode.extension.contributes.breakpoints.language": "Consente i punti di interruzione per questo linguaggio.",
-+	"app.launch.json.title": "Launch",
-+	"app.launch.json.version": "Versione di questo formato di file.",
-+	"app.launch.json.configurations": "Elenco delle configurazioni. Aggiungere nuove configurazioni o modificare quelle esistenti con IntelliSense.",
-+	"app.launch.json.compounds": "Elenco degli elementi compounds. Ogni elemento compounds fa riferimento a più configurazioni che verranno avviate insieme.",
-+	"app.launch.json.compound.name": "Nome dell'elemento compounds. Viene visualizzato nel menu a discesa della configurazione di avvio.",
-+	"useUniqueNames": "Usare nomi di configurazione univoci.",
-+	"app.launch.json.compound.folder": "Nome della cartella in cui si trova l'elemento compounds.",
-+	"app.launch.json.compounds.configurations": "Nomi delle configurazioni che verranno avviate per questo elemento compounds.",
-+	"debugNoType": "L'adattatore di debug 'type' non può essere omesso e deve essere di tipo 'string'.",
-+>>>>>>> .their
- 	"selectDebug": "Seleziona ambiente",
- 	"DebugConfig.failed": "Non è possibile creare il file 'launch.json' all'interno della cartella '.vscode' ({0}).",
- 	"workspace": "area di lavoro",
-changed in both
-  base   100644 4ac06a68557298de0963dd6dbd17245c09b07c20 i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 c085858a8c6aed272feca37cbd61f5b25e9ca236 i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 10217b0f8d5fb8d7a013e839c9446750168a4d18 i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -14,7 +14,11 @@
- 	"breakpointRemoved": "Rimosso un punto di interruzione a riga {0} del file {1}",
- 	"compoundMustHaveConfigurations": "Per avviare più configurazioni, deve essere impostato l'attributo \"configurations\" dell'elemento compounds.",
- 	"noConfigurationNameInWorkspace": "Non è stato possibile trovare la configurazione di avvio '{0}' nell'area di lavoro.",
-+<<<<<<< .our
- 	"multipleConfigurationNamesInWorkspace": "Nell'area di lavoro sono presenti più configurazioni di avvio '{0}'. Usare il nome di cartella per qualificare la configurazione.",
-+=======
-+	"multipleConfigurationNamesInWorkspace": "Nell'area di lavoro sono presenti più configurazioni di avvio `{0}`. Usare il nome di cartella per qualificare la configurazione.",
-+>>>>>>> .their
- 	"noFolderWithName": "La cartella denominata '{0}' per la configurazione '{1}' nell'elemento compounds '{2}' non è stata trovata.",
- 	"configMissing": "In 'launch.json' manca la configurazione '{0}'.",
- 	"launchJsonDoesNotExist": "'launch.json' non esiste.",
-@@ -26,7 +30,13 @@
- 	"preLaunchTaskErrors": "Sono stati rilevati errori di compilazione durante preLaunchTask '{0}'.",
- 	"preLaunchTaskError": "È stato rilevato un errore di compilazione durante preLaunchTask '{0}'.",
- 	"preLaunchTaskExitCode": "L'attività di preavvio '{0}' è stata terminata ed è stato restituito il codice di uscita {1}.",
-+<<<<<<< .our
- 	"showErrors": "Mostra errori",
-+=======
-+	"debugAnyway": "Eseguire comunque il debug",
-+	"showErrors": "Mostra errori",
-+	"cancel": "Annulla",
-+>>>>>>> .their
- 	"noFolderWorkspaceDebugError": "Non è possibile eseguire il debug del file attivo. Assicurarsi che sia salvato su disco e che sia installata un'estensione di debug per tale tipo di file.",
- 	"cancel": "Annulla",
- 	"DebugTaskNotFound": "Impossibile trovare l'attività '{0}'.",
-changed in both
-  base   100644 e61c448033e99d2c37097b4fb90f5adb2f12734e i18n/ita/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-  our    100644 c10190882f00393c01c73ca439ba4da4fc843e7f i18n/ita/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-  their  100644 68f5fd42101dcd7b23188b83fc306321ad9d47e6 i18n/ita/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-changed in both
-  base   100644 7d8a73398d020b9723bd6db96237150fd1dd69ce i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 8a9cb12815ff71703170d90088b67ed38f90d1c9 i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 491595ed9b7bf98143ad6ddcffe8fa5007a47aec i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-@@ -56,11 +56,17 @@
- 	"OpenExtensionsFile.failed": "Non è possibile creare il file 'extensions.json' all'interno della cartella '.vscode' ({0}).",
- 	"configureWorkspaceRecommendedExtensions": "Configura estensioni consigliate (area di lavoro)",
- 	"configureWorkspaceFolderRecommendedExtensions": "Configura estensioni consigliate (cartella dell'area di lavoro)",
-+<<<<<<< .our
- 	"malicious tooltip": "Questa estensione è stata segnalata come problematica.",
- 	"malicious": "Dannosa",
- 	"disabled": "Disabilitata",
- 	"disabled globally": "Disabilitata",
- 	"disabled workspace": "Disabilitata per questa area di lavoro",
-+=======
-+	"builtin": "Predefinita",
-+	"malicious tooltip": "Questa estensione è stata segnalata come problematica.",
-+	"malicious": "Dannosa",
-+>>>>>>> .their
- 	"disableAll": "Disabilita tutte le estensioni installate",
- 	"disableAllWorkspace": "Disabilita tutte le estensioni installate per questa area di lavoro",
- 	"enableAll": "Abilita tutte le estensioni",
-changed in both
-  base   100644 7e508ea22ca63c238c8aa2f2077fd452b57bc6f4 i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-  our    100644 122ac0848d21abbe53ae3ebabaf3b1c9842cdf10 i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-  their  100644 4a4b638db58d7b2d2bdef0493d34f530d49b294e i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-@@ -6,9 +6,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"restart1": "Esegui profilatura estensioni",
- 	"restart2": "Per eseguire la profilatura delle estensioni, è richiesto un riavvio. Riavviare '{0}' ora?",
- 	"restart3": "Riavvia",
- 	"cancel": "Annulla",
-+=======
-+	"noPro": "Per profilare le estensioni, avviare con `--inspect-extensions=<port>`.",
-+>>>>>>> .their
- 	"selectAndStartDebug": "Fare clic per arrestare la profilatura."
- }
-\ No newline at end of file
-changed in both
-  base   100644 b4e8d6c6042be794890ac071be4e46bef6d1dbfb i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 87312cd2502c47006701381399f821b3154685ff i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 92bf689efe79ef72cb3ec5e60a63bffda990db9f i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -10,8 +10,12 @@
- 	"searchMarketplace": "Cerca nel Marketplace",
- 	"dynamicWorkspaceRecommendation": "Questa estensione potrebbe essere interessante perché viene usata da altri utenti del repository {0}.",
- 	"exeBasedRecommendation": "Questa estensione è consigliata perché avete installato {0}.",
-+<<<<<<< .our
- 	"fileBasedRecommendation": "Questa estensione è raccomandata in base ai file aperti di recente.",
- 	"workspaceRecommendation": "Questa estensione è consigliata dagli utenti dell'area di lavoro corrente.",
-+=======
-+	"dynamicWorkspaceRecommendation": "Questa estensione potrebbe essere interessante perché viene usata da molti altri utenti dell'area di lavoro corrente.",
-+>>>>>>> .their
- 	"reallyRecommended2": "Per questo tipo di file è consigliabile utilizzare l'estensione '{0}'.",
- 	"reallyRecommendedExtensionPack": "Per questo tipo di file è consigliabile usare il pacchetto di estensione '{0}'.",
- 	"install": "Installa",
-changed in both
-  base   100644 8653c7d9177ce428a1b99cc781d568b00af2b30f i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  our    100644 17b06f638b8c4e434b5c1e9690e18cec027dc497 i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  their  100644 d9192794c7105465eaa5f8c2d95b9759e21cd2d2 i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-changed in both
-  base   100644 44ef61d873d9964133b1085a71918480c5d6120e i18n/ita/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
-  our    100644 69b2daed0abcff93b69221abcd504f7c4924566c i18n/ita/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
-  their  100644 184ccf3b77be2f1156e40ba29bc5d00665267305 i18n/ita/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
-changed in both
-  base   100644 92d8091e39a7402c19e5149fceac4c11267e4f8d i18n/ita/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  our    100644 1f4e198062af620354f99b641819730c9dd1751a i18n/ita/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  their  100644 935324eac992f0aced7bce0365f45dcfe59dc98d i18n/ita/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-changed in both
-  base   100644 8a1184b8387340bda28de94be392f40c3a919874 i18n/ita/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  our    100644 ab7704c8c47164753ebfc517a6fb9394b1465aff i18n/ita/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  their  100644 70c85a6780665a6962c9c8d5ca15b22b2894061e i18n/ita/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-changed in both
-  base   100644 e2ecce4b00bc08e8058d4f7cc239fed344f4851c i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-  our    100644 10bf388adfb7246223e58b306fc20f4edcc1d949 i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-  their  100644 01dd3d9cc62fde5d346f26976679fd0634b95359 i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-changed in both
-  base   100644 e0e24a895d496f037257c693e17d2a5f31108ba0 i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 acbb94499ddd6c7a425c0f53ca65dd8e6248c34e i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 801e215b679933832dab03aff96ea77feb47a99c i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -9,7 +9,10 @@
- 	"emptyUserSettingsHeader": "Inserire le impostazioni qui per sovrascrivere quelle predefinite.",
- 	"emptyWorkspaceSettingsHeader": "Inserire le impostazioni qui per sovrascrivere le impostazioni utente.",
- 	"emptyFolderSettingsHeader": "Inserire le impostazioni cartella qui per sovrascrivere quelle dell'area di lavoro.",
-+<<<<<<< .our
- 	"reportSettingsSearchIssue": "Segnala problema",
-+=======
-+>>>>>>> .their
- 	"newExtensionLabel": "Mostra l'estensione \"{0}\"",
- 	"editTtile": "Modifica",
- 	"replaceDefaultValue": "Sostituisci nelle impostazioni",
-changed in both
-  base   100644 7fbd72c66d729be9bc27c99ea3761ca03ac434ca i18n/ita/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 92c227f579048a55e12147b807cef8b2e56a92a0 i18n/ita/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 d47550729664365d53bed3784c9d0fe138aadbc6 i18n/ita/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-changed in both
-  base   100644 dbdffad9fb90a2da6d8cddbc0b45372a68016c05 i18n/ita/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 13379f4fe2a00cfa238ca2e6341676a8a3328e76 i18n/ita/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 1b1409ec716133cc91f248e5b2d81adbbb13a5c7 i18n/ita/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -30,6 +30,10 @@
- 	"search.quickOpen.includeSymbols": "Configurare questa opzione per includere i risultati di una ricerca di simboli globale nei risultati dei file per Quick Open.",
- 	"search.followSymlinks": "Controlla se seguire i collegamenti simbolici durante la ricerca.",
- 	"search.smartCase": "Cerca in modo insensibile alle maiuscole/minuscole se il criterio è tutto minuscolo, altrimenti cerca in modalità sensibile a maiuscole/minuscole",
-+<<<<<<< .our
- 	"search.globalFindClipboard": "Controlla se il viewlet di ricerca deve leggere o modificare gli appunti di ricerca condivisi in macOS",
- 	"search.location": "Controlla se la ricerca verrà mostrata come visualizzazione nella barra laterale o come pannello nell'area pannelli per ottenere più spazio orizzontale."
-+=======
-+	"search.globalFindClipboard": "Controlla se il viewlet di ricerca deve leggere o modificare gli appunti di ricerca condivisi in macOS"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 825ff7f9a4e7604d9106bddb307f24af486e6255 i18n/ita/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 96a5512e9db341ff02996bad4ad811078b347739 i18n/ita/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 8d36733b39a6682e4f10851be1463dc897ad85ab i18n/ita/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-changed in both
-  base   100644 eaed493cc30d2ab8d176f16a9e85dc0c38eb2011 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 b43f261b33e96573db19620791c6498f01662657 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 756d5334a1ae11d19ca4a4f85f6e4025e2d6a55d i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-changed in both
-  base   100644 e5b98e781d8dee765e4134e3663fd6394d4d0628 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-  our    100644 343f27488ed5ee62dbeabb654e81d1f94b49e11b i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-  their  100644 90437802e6593a2ae095cb511d222a9bef839466 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-@@ -8,12 +8,16 @@
- 	],
- 	"terminal.integrated.a11yBlankLine": "Riga vuota",
- 	"terminal.integrated.a11yPromptLabel": "Input di terminale",
-+<<<<<<< .our
- 	"terminal.integrated.a11yTooMuchOutput": "Troppo output da annunciare. Per leggere, spostarsi manualmente nelle righe",
- 	"yes": "Sì",
- 	"terminal.rendererInAllNewTerminals": "Per tutti i nuovi terminali creati verrà usato il renderer non GPU.",
- 	"no": "No",
- 	"dontShowAgain": "Non visualizzare più questo messaggio",
- 	"terminal.slowRendering": "Il renderer standard per il terminale integrato sembra lento nel computer. Passare al renderer alternativo basato su DOM che potrebbe offrire migliori prestazioni? [Altre informazioni sulle impostazioni del terminale](https://code.visualstudio.com/docs/editor/integrated-terminal#_changing-how-the-terminal-is-rendered).",
-+=======
-+	"terminal.integrated.a11yTooMuchOutput": "L'output è eccessivo per l'annuncio. Passare manualmente alle righe per leggere",
-+>>>>>>> .their
- 	"terminal.integrated.copySelection.noSelection": "Il terminale non contiene alcuna selezione da copiare",
- 	"terminal.integrated.exitedWithCode": "Il processo del terminale è stato terminato. Codice di uscita: {0}",
- 	"terminal.integrated.waitOnExit": "Premere un tasto qualsiasi per chiudere il terminale",
-changed in both
-  base   100644 173fc2e3ff565dec80f95c6bb5ce354181295e04 i18n/ita/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json
-  our    100644 8b167c6ddf602cc09a3402bc887017971a951bb4 i18n/ita/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json
-  their  100644 aacca351fde16ec5bb92a86e30f833c556da8bbd i18n/ita/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json
-@@ -6,5 +6,12 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"release notes": "Note sulla versione"
-+=======
-+	"release notes": "Note sulla versione",
-+	"updateConfigurationTitle": "Aggiorna",
-+	"updateChannel": "Consente di configurare la ricezione degli aggiornamenti automatici da un canale di aggiornamento. Richiede un riavvio dopo la modifica.",
-+	"enableWindowsBackgroundUpdates": "Abilita gli aggiornamenti di Windows in background."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 2792473dc0ba804a68ccead585b50d357a86c59d i18n/ita/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 aed35ee0f736e71e25693c29ccc2843fb9df2498 i18n/ita/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 6a31425dab2676040a3b07e50021d5e25fd8a31f i18n/ita/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -16,12 +16,18 @@
- 	"noUpdatesAvailable": "Al momento non sono disponibili aggiornamenti.",
- 	"ok": "OK",
- 	"thereIsUpdateAvailable": "È disponibile un aggiornamento.",
-+<<<<<<< .our
- 	"download now": "Scarica ora",
- 	"later": "In seguito",
- 	"updateAvailable": "È disponibile un aggiornamento: {0} {1}",
- 	"installUpdate": "Installa aggiornamento",
- 	"updateInstalling": "{0} {1} verrà installato in background. Al termine, verrà visualizzato un messaggio.",
- 	"updateAvailableAfterRestart": "Riavviare {0} per applicare l'aggiornamento più recente.",
-+=======
-+	"installUpdate": "Installa aggiornamento",
-+	"updateAvailable": "È disponibile un aggiornamento: {0} {1}",
-+	"updateInstalling": "{0} {1} verrà installato in background. Al termine, verrà visualizzato un messaggio.",
-+>>>>>>> .their
- 	"updateNow": "Aggiorna adesso",
- 	"commandPalette": "Riquadro comandi...",
- 	"settings": "Impostazioni",
-changed in both
-  base   100644 c1e824ddedc1cabbb284b5b504a6391f712f881a i18n/ita/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-  our    100644 1ac29db26914afff2f72d41f016deb4cf11bb6f6 i18n/ita/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-  their  100644 34686a60cf99e0b117a7ac3ba679b44e942fa55f i18n/ita/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-changed in both
-  base   100644 2a3b7fbff608beb204439ad27d530c1f11357732 i18n/jpn/extensions/emmet/package.i18n.json
-  our    100644 2ea428b8ba7cebbdb24c299af08c070b4291f172 i18n/jpn/extensions/emmet/package.i18n.json
-  their  100644 717d87371fbb9d05dd64b39844dfddd00d904a5d i18n/jpn/extensions/emmet/package.i18n.json
-@@ -56,10 +56,17 @@
- 	"emmetPreferencesFormatNoIndentTags": "内部インデントを取得しないタグ名の配列",
- 	"emmetPreferencesFormatForceIndentTags": "内部インデントを常に取得するタグ名の配列",
- 	"emmetPreferencesAllowCompactBoolean": "true の場合、 Boolean 型属性の短縮表記が生成されます",
-+<<<<<<< .our
- 	"emmetPreferencesCssWebkitProperties": "Emmet 省略記法で使用される場合に `-` で始まる 'webkit' ベンダー プレフィックスを取得するカンマ区切りの CSS プロパティ。常に 'webkit' プレフィックスを避ける場合は空の文字列に設定します。",
- 	"emmetPreferencesCssMozProperties": "Emmet 省略記法で使用される場合に `-` で始まる 'moz' ベンダー プレフィックスを取得するカンマ区切りの CSS プロパティ。常に 'moz' プレフィックスを避ける場合は空の文字列に設定します。",
- 	"emmetPreferencesCssOProperties": "Emmet 省略記法で使用される場合に `-` で始まる 'o' ベンダー プレフィックスを取得するカンマ区切りの CSS プロパティ。常に 'o' プレフィックスを避ける場合は空の文字列に設定します。",
- 	"emmetPreferencesCssMsProperties": "Emmet 省略記法で使用される場合に `-` で始まる 'ms' ベンダー プレフィックスを取得するカンマ区切りの CSS プロパティ。常に 'ms' プレフィックスを避ける場合は空の文字列に設定します。",
- 	"emmetPreferencesCssFuzzySearchMinScore": "あいまい検索の省略形が達成すべき (0 から 1 の) 最小スコア。値が低ければ多くの誤検出が発生する可能性があります。値が高ければ一致する見込みが減る可能性があります。",
- 	"emmetOptimizeStylesheetParsing": "false に設定すると、現在位置が Emmet 略語の展開位置として有効かどうかを判定するためにファイル全体を解析します。true に設定すると、css/scss/less ファイルの現在位置周辺のコンテンツのみを解析します。"
-+=======
-+	"emmetPreferencesCssWebkitProperties": "emmet 省略記法で使用される場合に `-` で始まる webkit ベンダー プレフィックスを取得するカンマ区切りの CSS プロパティ。常に webkit プレフィックスを避ける場合は空の文字列に設定します。",
-+	"emmetPreferencesCssMozProperties": "emmet 省略記法で使用される場合に `-` で始まる moz ベンダー プレフィックスを取得するカンマ区切りの CSS プロパティ。常に moz プレフィックスを避ける場合は空の文字列に設定します。",
-+	"emmetPreferencesCssOProperties": "emmet 省略記法で使用される場合に `-` で始まる o ベンダー プレフィックスを取得するカンマ区切りの CSS プロパティ。常に o プレフィックスを避ける場合は空の文字列に設定します。",
-+	"emmetPreferencesCssMsProperties": "emmet 省略記法で使用される場合に `-` で始まる ms ベンダー プレフィックスを取得するカンマ区切りの CSS プロパティ。常に ms プレフィックスを避ける場合は空の文字列に設定します。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 b764f7a053aa8f25466277f4eda9df4b99563ab6 i18n/jpn/extensions/git/out/commands.i18n.json
-  our    100644 9e38217888fdc2db31af2a431341d645d8b6b16d i18n/jpn/extensions/git/out/commands.i18n.json
-  their  100644 8b6874c3974811c21865e45cd275c22d9b01f0ed i18n/jpn/extensions/git/out/commands.i18n.json
-changed in both
-  base   100644 fe638b7b050e76879d8a45aa02d4d2bf2e15fb6e i18n/jpn/extensions/git/out/repository.i18n.json
-  our    100644 0bcce0f6123b4b62aeac84ed8edc984ed60d5a0e i18n/jpn/extensions/git/out/repository.i18n.json
-  their  100644 9ed02afc01cb5ac0b9db491fa89c1157108aacbf i18n/jpn/extensions/git/out/repository.i18n.json
-changed in both
-  base   100644 32ac162d5ba535d12a3a85c5bbda8b037198017c i18n/jpn/extensions/git/package.i18n.json
-  our    100644 5f3a79c480024cb95bcb777b25dc5a51987c0ee1 i18n/jpn/extensions/git/package.i18n.json
-  their  100644 506073ca6e32f793deb769bd55c2cd1a4093a6d9 i18n/jpn/extensions/git/package.i18n.json
-@@ -75,9 +75,14 @@
- 	"config.decorations.enabled": "Git が配色とバッジをエクスプローラーと開いているエディターのビューに提供するかどうかを制御します。",
- 	"config.promptToSaveFilesBeforeCommit": "コミット前に Git が保存していないファイルを確認すべきかどうかを制御します。",
- 	"config.showInlineOpenFileAction": "Git 変更の表示内にインラインのファイルを開くアクションを表示するかどうかを制御します。",
-+<<<<<<< .our
- 	"config.inputValidation": "コミット メッセージの入力検証をいつ表示するかを制御します。",
- 	"config.detectSubmodules": "Git のサブモジュールを自動的に検出するかどうかを制御します。",
- 	"config.detectSubmodulesLimit": "Git サブモジュールの検出の制限を制御します。",
-+=======
-+	"config.inputValidation": "入力検証の入力カウンターを表示するタイミングを制御します。",
-+	"config.detectSubmodules": "Git のサブモジュールを自動的に検出するかどうかを制御します。",
-+>>>>>>> .their
- 	"colors.modified": "リソースを改変した場合の配色",
- 	"colors.deleted": "リソースを検出した場合の配色",
- 	"colors.untracked": "リソースを追跡しない場合の配色",
-changed in both
-  base   100644 f174b2a04e170d62c8b7740e4eb6ec55152f6a1c i18n/jpn/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  our    100644 315725569baa57f717837a92f6063936d11bab98 i18n/jpn/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  their  100644 add172ddedb1f23b12111ef7943b3e98b687382b i18n/jpn/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-@@ -12,6 +12,7 @@
- 	"loadingData": "データを読み込んでいます...",
- 	"rateLimited": "GitHub クエリの制限を超えました。お待ちください。",
- 	"similarIssues": "類似の問題",
-+<<<<<<< .our
- 	"open": "Open",
- 	"closed": "Closed",
- 	"noSimilarIssues": "類似の問題は見つかりませんでした",
-@@ -19,6 +20,10 @@
- 	"bugReporter": "バグ レポート",
- 	"featureRequest": "機能欲求",
- 	"performanceIssue": "パフォーマンスの問題",
-+=======
-+	"noResults": "一致する項目はありません",
-+	"rateLimited": "API のレート制限を超えました",
-+>>>>>>> .their
- 	"stepsToReproduce": "再現手順",
- 	"bugDescription": "問題を再現するための正確な手順を共有します。このとき、期待する結果と実際の結果を提供してください。GitHub-flavored Markdown に対応しています。GitHub 上で確認するときに問題を編集してスクリーンショットを追加できます。",
- 	"performanceIssueDesciption": "このパフォーマンスの問題はいつ発生しましたか? それは起動時ですか? それとも特定のアクションのあとですか? GitHub-flavored Markdown に対応しています。GitHub 上で確認するときに問題を編集してスクリーンショットを追加できます。",
-changed in both
-  base   100644 2354d28c59075388faae5498d53801fc95a0ae7c i18n/jpn/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  our    100644 0b1e88174f8c1130b80c4aca55d2f619b3175c2c i18n/jpn/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  their  100644 d7ff3a96e4e7379e813727066f18434d343306db i18n/jpn/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-@@ -7,6 +7,7 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"completeInEnglish": "英語で記入して下さい。",
-+<<<<<<< .our
- 	"issueTypeLabel": "種類",
- 	"issueSourceLabel": "記録",
- 	"vscode": "Visual Studio Code",
-@@ -25,4 +26,25 @@
- 	"sendExtensions": "自分の利用可能な拡張機能 ({0}) を含める",
- 	"sendSearchedExtensions": "検索された拡張機能 ({0}) を送信する",
- 	"sendSettingsSearchDetails": "設定検索の詳細 ({0}) を送信する"
-+=======
-+	"issueTypeLabel": "次の問題を提出します",
-+	"bugReporter": "バグ報告",
-+	"performanceIssue": "パフォーマンスの問題",
-+	"featureRequest": "機能欲求",
-+	"issueTitleLabel": "タイトル",
-+	"issueTitleRequired": "タイトルを入力してください",
-+	"vscodeVersion": "VS Code のバージョン",
-+	"osVersion": "OS のバージョン",
-+	"systemInfo": "私のシステム情報",
-+	"sendData": "データを送信する",
-+	"processes": "現在実行中のプロセス",
-+	"workspaceStats": "私のワークスペースのステータス",
-+	"extensions": "私の拡張機能",
-+	"tryDisablingExtensions": "拡張機能が無効になっている場合、問題を再現できません",
-+	"disableExtensions": "すべての拡張機能を無効にしてウィンドウを再読みする",
-+	"showRunningExtensions": "すべての実行中の拡張機能を確認する",
-+	"githubMarkdown": "GitHub-flavored Markdown に対応しています。GitHub 上で確認するときに問題を編集してスクリーンショットを追加できます。",
-+	"issueDescriptionRequired": "説明を入力してください。",
-+	"loadingData": "データを読み込んでいます..."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d8c3570a91257a1c2b4bca004fbea0818adead24 i18n/jpn/src/vs/code/electron-main/logUploader.i18n.json
-  our    100644 017becb5cd7800c29eed3fa47e4acfd4127e1122 i18n/jpn/src/vs/code/electron-main/logUploader.i18n.json
-  their  100644 5df387f94588d6e784c8de8abdd335ff74221ce6 i18n/jpn/src/vs/code/electron-main/logUploader.i18n.json
-@@ -9,10 +9,18 @@
- 	"invalidEndpoint": "無効なログ アップローダーのエンドポイント",
- 	"beginUploading": "アップロードしています...",
- 	"didUploadLogs": "アップロードに成功しました! Log file ID: {0}",
-+<<<<<<< .our
- 	"logUploadPromptHeader": "Microsoft メンバーの VS Code チームのみがアクセスできる安全な Microsoft エンドポイントにセッション ログをアップロードしようとしています。",
- 	"logUploadPromptBody": "セッション ログは完全なパスやファイルの内容などの個人情報を含んでいる可能性があります。セッション ログ ファイルを次の場所で確認して編集してください: '{0}'",
- 	"logUploadPromptBodyDetails": "続行するには、セッション ログ ファイルを確認および編集済みであり、Microsoft が VS Code のデバッグにそれらを利用することに同意しているかを確認してください。",
- 	"logUploadPromptAcceptInstructions": "アップロードを続けるために '--upload-logs={0}' をつけて code を実行してください",
-+=======
-+	"userDeniedUpload": "アップロードを取り消しました",
-+	"logUploadPromptHeader": "安全なエンドポイントにセッションのログをアップロードしますか?",
-+	"logUploadPromptBody": "次の場所でログ ファイルを確認してください: '{0}'",
-+	"logUploadPromptBodyDetails": "ログには完全なパスやファイルの内容などの個人情報を含んでいる可能性があります。",
-+	"logUploadPromptKey": "ログを確認しました ('y' を入力してアップロードを確認)",
-+>>>>>>> .their
- 	"postError": "ログを提出中のエラー: {0}",
- 	"responseError": "ログの投稿でエラーが発生しました。{0} を取得しました — {1}",
- 	"parseError": "レスポンスを解析中にエラー",
-changed in both
-  base   100644 84f90c69a7551821e408b53b2f8f7dae9d74a4cb i18n/jpn/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 8a524167aa36e1a9cb85f51526bd76d90fd343d7 i18n/jpn/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 1024574c47707bf495d71884ddc586253149bd69 i18n/jpn/src/vs/editor/common/config/commonEditorConfig.i18n.json
-changed in both
-  base   100644 14135cac24b6652ed6ffec189296b065fa4f5ece i18n/jpn/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 dd4553b6a25f3d18d9ae6f341855e230cceed4fe i18n/jpn/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 9424d81fa5a56c2facae095539124ec248a13976 i18n/jpn/src/vs/platform/environment/node/argv.i18n.json
-changed in both
-  base   100644 a4b5f4f0f6e2575c898cd463d70de0bfca80f454 i18n/jpn/src/vs/platform/list/browser/listService.i18n.json
-  our    100644 b221fed577046c8248b6a2d1735f70a5ed572a48 i18n/jpn/src/vs/platform/list/browser/listService.i18n.json
-  their  100644 92abbc3a7e9d532176c0d74c8a1c3cc27a078704 i18n/jpn/src/vs/platform/list/browser/listService.i18n.json
-@@ -12,6 +12,10 @@
- 	"multiSelectModifier": "マウスで複数の選択肢にツリーおよびリストの項目を追加するために使用される修飾子 (たとえば、エクスプローラーでエディターと scm ビューを開くなど)。`ctrlCmd` は、Windows と Linux では `Control` にマップされ、macOS では `Command` にマップされます。'横に並べて開く' マウス ジェスチャー (サポートされている場合) は、複数選択修飾子と競合しないように調整されます。",
- 	"openMode.singleClick": "マウスのシングル クリックで項目を開きます。",
- 	"openMode.doubleClick": "マウスのダブル クリックで項目を開きます。",
-+<<<<<<< .our
- 	"openModeModifier": "マウスを使用して、ツリーとリストで項目を開く方法を制御します (サポートされている場合)。'SingleClick' に設定すると、項目をマウスのシングル クリックで開き、'doubleClick' に設定すると、ダブル クリックでのみ開きます。ツリーで子を持つ親の場合、この設定で、親をシングル クリックで展開するか、ダブル クリックで展開するかを制御します。該当しない場合、一部のツリーとリストでは、この設定が無視される場合があることに注意してください。",
- 	"horizontalScrolling setting": "ワークベンチでツリーが水平スクロールをサポートするかどうかを制御します。"
-+=======
-+	"openModeModifier": "マウスを使用して、ツリーとリストで項目を開く方法を制御します (サポートされている場合)。'SingleClick' に設定すると、項目をマウスのシングル クリックで開き、'doubleClick' に設定すると、ダブル クリックでのみ開きます。ツリーで子を持つ親の場合、この設定で、親をシングル クリックで展開するか、ダブル クリックで展開するかを制御します。該当しない場合、一部のツリーとリストでは、この設定が無視される場合があることに注意してください。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ee62f8238dc796306486a9699288592a54cdd474 i18n/jpn/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
-  our    100644 9be51e2dac873158e5f2b3c06b6363776b8ed051 i18n/jpn/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
-  their  100644 93c2b61746d3bae63b859715c2acb7abf3e7d3f4 i18n/jpn/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
-@@ -11,11 +11,17 @@
- 	"sizeMB": "{0}MB",
- 	"sizeGB": "{0}GB",
- 	"sizeTB": "{0}TB",
-+<<<<<<< .our
- 	"largeImageError": "画像が大きすぎるため、エディターに表示されません ({0})。",
- 	"resourceOpenExternalButton": "外部のプログラムを使用して画像を開きますか?",
- 	"nativeFileTooLargeError": "ファイルが大きすぎるため、エディターに表示されません ({0})。",
- 	"nativeBinaryError": "このファイルはバイナリか、サポートされていないテキスト エンコードを使用しているため、エディターに表示されません。",
- 	"openAsText": "このまま開きますか?",
-+=======
-+	"largeImageError": "画像のファイル サイズが非常に大きい (>1MB) ため、エディターに表示されません。 ",
-+	"resourceOpenExternalButton": "外部のプログラムを使用して画像を開きますか?",
-+	"nativeBinaryError": "このファイルはバイナリか、非常に大きいか、またはサポートされていないテキスト エンコードを使用しているため、エディターに表示されません。",
-+>>>>>>> .their
- 	"zoom.action.fit.label": "画像全体",
- 	"imgMeta": "{0}x{1} {2}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 f81b60ffef4da3e3350145d2471be7c75d4e4443 i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-  our    100644 14f4e7bbbb9fbfcb08c48182df3abdc73d53aebd i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-  their  100644 4964b4c61de9d91d1e06de09fea78f54c4699389 i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-@@ -6,7 +6,40 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"debugNoType": "デバッガー 'type' は省略不可で、'string' 型でなければなりません。",
-+=======
-+	"vscode.extension.contributes.debuggers": "デバッグ アダプターを提供します。",
-+	"vscode.extension.contributes.debuggers.type": "このデバッグ アダプターの一意識別子。",
-+	"vscode.extension.contributes.debuggers.label": "このデバッグ アダプターの表示名。",
-+	"vscode.extension.contributes.debuggers.program": "デバッグ アダプター プログラムへのパス。絶対パスか拡張機能フォルダーへの相対パスです。",
-+	"vscode.extension.contributes.debuggers.args": "アダプターに渡すオプションの引数。",
-+	"vscode.extension.contributes.debuggers.runtime": "プログラム属性が実行可能でなく、ランタイムが必要な場合のオプション ランタイム。",
-+	"vscode.extension.contributes.debuggers.runtimeArgs": "オプションのランタイム引数。",
-+	"vscode.extension.contributes.debuggers.variables": "`launch.json` 内の対話型の変数 (例: ${action.pickProcess}) からコマンドへマッピングしています。",
-+	"vscode.extension.contributes.debuggers.initialConfigurations": "初期 'launch.json' を生成するための構成。",
-+	"vscode.extension.contributes.debuggers.languages": "デバッグ拡張機能が \"既定のデバッガー\" とされる言語の一覧。",
-+	"vscode.extension.contributes.debuggers.adapterExecutableCommand": "指定されている場合、VS Code はこのコマンドを呼び出し、デバッグ アダプターの実行可能パスと、渡す引数を決定します。",
-+	"vscode.extension.contributes.debuggers.configurationSnippets": "'launch.json' に新しい構成を追加するためのスニペット。",
-+	"vscode.extension.contributes.debuggers.configurationAttributes": "'launch.json' を検証するための JSON スキーマ構成。",
-+	"vscode.extension.contributes.debuggers.windows": "Windows 固有の設定。",
-+	"vscode.extension.contributes.debuggers.windows.runtime": "Windows で使用されるランタイム。",
-+	"vscode.extension.contributes.debuggers.osx": "macOS 固有の設定。",
-+	"vscode.extension.contributes.debuggers.osx.runtime": "macOS で使用されるランタイム。",
-+	"vscode.extension.contributes.debuggers.linux": "Linux 固有の設定。",
-+	"vscode.extension.contributes.debuggers.linux.runtime": "Linux で使用されるランタイム。",
-+	"vscode.extension.contributes.breakpoints": "ブレークポイントを提供します。",
-+	"vscode.extension.contributes.breakpoints.language": "この言語でブレークポイントを許可します。",
-+	"app.launch.json.title": "起動",
-+	"app.launch.json.version": "このファイル形式のバージョン。",
-+	"app.launch.json.configurations": "構成の一覧。IntelliSense を使用して、新しい構成を追加したり、既存の構成を編集したります。",
-+	"app.launch.json.compounds": "複合の一覧。各複合は、同時に起動される複数の構成を参照します。",
-+	"app.launch.json.compound.name": "複合の名前。起動構成のドロップダウン メニューに表示されます。",
-+	"useUniqueNames": "一意の構成名を使用してください。",
-+	"app.launch.json.compound.folder": "複合があるフォルダーの名前。",
-+	"app.launch.json.compounds.configurations": "この複合の一部として開始される構成の名前。",
-+	"debugNoType": "デバッグ アダプター 'type' は省略不可で、'string' 型でなければなりません。",
-+>>>>>>> .their
- 	"selectDebug": "環境の選択",
- 	"DebugConfig.failed": "'launch.json' ファイルを '.vscode' フォルダー ({0}) 内に作成できません。",
- 	"workspace": "ワークスペース",
-changed in both
-  base   100644 78931990c2aa90e9de9464f178e465fb35aa7cfe i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 94c8c8c8a16f500b0da2b646b5e8bf435bacba10 i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 9601fe4710b5f5e7f431878a7d303813104b7f72 i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -14,7 +14,11 @@
- 	"breakpointRemoved": "ブレークポイントを削除しました。行 {0}、ファイル {1}",
- 	"compoundMustHaveConfigurations": "複合構成を開始するには、複合に \"configurations\" 属性が設定されている必要があります。",
- 	"noConfigurationNameInWorkspace": "ワークスペースに起動構成 '{0}' が見つかりませんでした。",
-+<<<<<<< .our
- 	"multipleConfigurationNamesInWorkspace": "ワークスペースに複数の起動構成 '{0}' があります。フォルダー名を使用して構成を修飾してください。",
-+=======
-+	"multipleConfigurationNamesInWorkspace": "ワークスペースに複数の起動構成 `{0}` があります。フォルダー名を使用して構成を修飾してください。",
-+>>>>>>> .their
- 	"noFolderWithName": "複合 '{2}' の構成 '{1}' で、名前 '{0}' を含むフォルダーが見つかりませんでした。",
- 	"configMissing": "構成 '{0}' が 'launch.json' 内にありません。",
- 	"launchJsonDoesNotExist": "'launch.json' は存在しません。",
-@@ -26,7 +30,13 @@
- 	"preLaunchTaskErrors": "preLaunchTask '{0}' の実行中にビルド エラーが検出されました。",
- 	"preLaunchTaskError": "preLaunchTask '{0}' の実行中にビルド エラーが検出されました。",
- 	"preLaunchTaskExitCode": "preLaunchTask '{0}' が終了コード {1} で終了しました。",
-+<<<<<<< .our
- 	"showErrors": "エラーの表示",
-+=======
-+	"debugAnyway": "このままデバッグを続ける",
-+	"showErrors": "エラーの表示",
-+	"cancel": "キャンセル",
-+>>>>>>> .their
- 	"noFolderWorkspaceDebugError": "アクティブ ファイルをデバッグできません。ファイルがディスクに保存されており、そのファイル タイプのデバッグ拡張機能がインストールされていることを確認してください。",
- 	"cancel": "キャンセル",
- 	"DebugTaskNotFound": "タスク '{0}' を見つけられませんでした。",
-changed in both
-  base   100644 f7a966e74a77ba251b0d9c7fc6e8aad4ad0fe948 i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-  our    100644 039a3a0e4afcd83b17e80e956ced28f43471295b i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-  their  100644 67dfcce90ce96c1a36b02ecbb6b40861789f9db1 i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-changed in both
-  base   100644 4977ba914b8f00e103c6748fb77695b5b6c9e6ba i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 69dc63c434a809f92bc13d405e990c05feb2db91 i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 b1a87868196b0817ee2dc92486122e19843608b2 i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-@@ -56,11 +56,17 @@
- 	"OpenExtensionsFile.failed": "'.vscode' ファルダー ({0}) 内に 'extensions.json' ファイルを作成できません。",
- 	"configureWorkspaceRecommendedExtensions": "推奨事項の拡張機能を構成 (ワークスペース)",
- 	"configureWorkspaceFolderRecommendedExtensions": "推奨事項の拡張機能を構成 (ワークスペース フォルダー)",
-+<<<<<<< .our
- 	"malicious tooltip": "この拡張機能は問題ありと報告されました。",
- 	"malicious": "悪意がある",
- 	"disabled": "無効",
- 	"disabled globally": "無効",
- 	"disabled workspace": "このワークスペースでは無効",
-+=======
-+	"builtin": "ビルトイン",
-+	"malicious tooltip": "この拡張機能は問題ありと報告されました。",
-+	"malicious": "悪意がある",
-+>>>>>>> .their
- 	"disableAll": "インストール済みのすべての拡張機能を無効にする",
- 	"disableAllWorkspace": "このワークスペースのインストール済みの拡張機能をすべて無効にする",
- 	"enableAll": "すべての拡張機能を有効にする",
-changed in both
-  base   100644 4c5a5894ff1edcb5048fc4692f8c65f9afadf6c4 i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-  our    100644 d17ed990511f87eed401faeffb4a6b5e7c9ae066 i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-  their  100644 a130a501f8541268efa8a6bf8a73ed3a892b07e7 i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-@@ -6,9 +6,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"restart1": "拡張機能のプロファイル",
- 	"restart2": "拡張機能のプロファイルには再起動が必要です。今すぐ '{0}' を再起動しますか?",
- 	"restart3": "再起動",
- 	"cancel": "キャンセル",
-+=======
-+	"noPro": "拡張機能をプロファイルするには、`--inspect-extensions=<port>` を使って起動してください。",
-+>>>>>>> .their
- 	"selectAndStartDebug": "クリックしてプロファイリングを停止します。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8e65e413015d6db2fa51609b53eb69347e15fd4f i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 c1d5e7d9f012953fc3bd6919da0d8a29b234fa8c i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 2b0ac4c599fe73809284ca21752b7275aecb819a i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -10,8 +10,12 @@
- 	"searchMarketplace": "Marketplace を検索",
- 	"dynamicWorkspaceRecommendation": "{0} レポジトリのユーザーに人気があるので、あなたもこの拡張機能に関心を持たれるかもしれません。",
- 	"exeBasedRecommendation": "{0} がインストールされているため、この拡張機能を推奨します。",
-+<<<<<<< .our
- 	"fileBasedRecommendation": "最近開いたファイルに基づいてこの拡張機能が推奨されます。",
- 	"workspaceRecommendation": "現在のワークスペースのユーザーによってこの拡張機能が推奨されています。",
-+=======
-+	"dynamicWorkspaceRecommendation": "現在のワークスペースの他の多くのユーザーがこの拡張機能を使用しているので、お客様も関心を持たれるかもしれません。",
-+>>>>>>> .their
- 	"reallyRecommended2": "このファイルの種類には拡張機能 '{0}' が推奨されます。",
- 	"reallyRecommendedExtensionPack": "このファイルの種類には拡張機能パック '{0}' が推奨されます。",
- 	"install": "インストール",
-changed in both
-  base   100644 572fc4519ab37ffbbbce312c33c2a8df507040d6 i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  our    100644 5d9d43e41b5cd7ad1f73f00a2391a20b162ec544 i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  their  100644 fe41df1b333a0c71edf4ee27be15aeb527296c35 i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-changed in both
-  base   100644 83cbae31999bf52b23f091a3e5cb7ac3373ebd14 i18n/jpn/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
-  our    100644 4eb7ebc4f8963f4002fd7cbd40b2abbc832ad915 i18n/jpn/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
-  their  100644 c7652dd8f25dc55639e26e255f9fd00362969b7b i18n/jpn/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
-changed in both
-  base   100644 3992b5dad3fa065f4b32f0efa6d23f70a41f07e5 i18n/jpn/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  our    100644 109ecf99fed822d185e649c8205c099c654f43d6 i18n/jpn/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  their  100644 6f22ec1f686e5ec258c4242a09206479c097fff7 i18n/jpn/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-changed in both
-  base   100644 e72b4e70776bfb4271d7be4e7a320033beb901dd i18n/jpn/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  our    100644 efda21bd7670c25e5650677646e9f03bb3b4771d i18n/jpn/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  their  100644 1662eba1d8995dd0d7488caca055bdb48ebab369 i18n/jpn/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-changed in both
-  base   100644 ed97b33a104344cc1bf16b296ac42b19b342fb50 i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 c8dc571e62a5169caab40469ba18a9dcea479c70 i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 ee6f0473951cd6b2abac695ced511982045b00b4 i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -9,7 +9,10 @@
- 	"emptyUserSettingsHeader": "既定の設定を上書きするには、このファイル内に設定を挿入します。",
- 	"emptyWorkspaceSettingsHeader": "ユーザー設定を上書きするには、このファイル内に設定を挿入します。",
- 	"emptyFolderSettingsHeader": "ワークスペースの設定を上書きするには、このファイル内にフォルダーの設定を挿入します。",
-+<<<<<<< .our
- 	"reportSettingsSearchIssue": "問題の報告",
-+=======
-+>>>>>>> .their
- 	"newExtensionLabel": "拡張機能 \"{0}\" を表示",
- 	"editTtile": "編集",
- 	"replaceDefaultValue": "設定を置換",
-changed in both
-  base   100644 349befb101fb771a8409730d54563dd194e5bf12 i18n/jpn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 0c0e1ef6922bb2ebfdd24dd39aa82c38ab488084 i18n/jpn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 64ef0f72b82edfb3555d1204b5afe981703d17b8 i18n/jpn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-changed in both
-  base   100644 86ecd5c7750ef7c2753cc788e1eb1de11f4b9ddc i18n/jpn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 d63dc1c7de64299d00cc648c70a452e18abf1957 i18n/jpn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 c485fcfc6a97675b03a2871a02e7731bd40b1d44 i18n/jpn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -30,6 +30,10 @@
- 	"search.quickOpen.includeSymbols": "グローバル シンボル検索の結果を、Quick Open の結果ファイルに含めるように構成します。",
- 	"search.followSymlinks": "検索中にシンボリック リンクをたどるかどうかを制御します。",
- 	"search.smartCase": "すべて小文字のパターンの場合、大文字と小文字を区別しないで検索し、そうでない場合は大文字と小文字を区別して検索する",
-+<<<<<<< .our
- 	"search.globalFindClipboard": "macOS で検索ビューが共有の検索クリップボードを読み取りまたは変更するかどうかを制御します",
- 	"search.location": "検索をサイドバーのビューとして表示するか、より水平方向の空間をとるためにパネル領域のパネルとして表示するかを制御します。"
-+=======
-+	"search.globalFindClipboard": "macOS で検索ビューレットが共有の検索クリップボードを読み取りまたは変更するかどうかを制御します"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 9b171966a41a4ebaf74e5a2aa1b07ab5f6b065ca i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 12d9ee548c02f4e1c1a9f6f57b065e164ea8e9c2 i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 e7430be8b03d24a3f0e92eebbd822da269c37061 i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-changed in both
-  base   100644 a14de1f65045000a171e7c9e4d018977200b1087 i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-  our    100644 62fabc08564be38d6306b5ef3bcb81e2922ec533 i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-  their  100644 12fb295a5cb2d2a37593a81e5aefdaca16d751a4 i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-@@ -9,11 +9,14 @@
- 	"terminal.integrated.a11yBlankLine": "空白行",
- 	"terminal.integrated.a11yPromptLabel": "端末入力",
- 	"terminal.integrated.a11yTooMuchOutput": "通知する出力が多すぎます。行に移動して手動で読み取ってください",
-+<<<<<<< .our
- 	"yes": "はい",
- 	"terminal.rendererInAllNewTerminals": "すべての新しく作成されるターミナルは非 GPU レンダラーを使用します。",
- 	"no": "いいえ",
- 	"dontShowAgain": "今後は表示しない",
- 	"terminal.slowRendering": "統合ターミナルの標準レンダラーが遅くなっているようです。パフォーマンスの向上を見込める DOM ベースのレンダラーに切り替えますか? [ターミナルの設定についてこちらを参照してください](https://code.visualstudio.com/docs/editor/integrated-terminal#_changing-how-the-terminal-is-rendered)。",
-+=======
-+>>>>>>> .their
- 	"terminal.integrated.copySelection.noSelection": "ターミナルにコピー対象の選択範囲がありません",
- 	"terminal.integrated.exitedWithCode": "ターミナルの処理が終了しました (終了コード: {0})",
- 	"terminal.integrated.waitOnExit": "任意のキーを押して端末を終了します",
-changed in both
-  base   100644 7c2f62ae857a71460cfa286ac07494410c41c835 i18n/kor/extensions/emmet/package.i18n.json
-  our    100644 517fee7baf0c3ecd5ff03235a1df00c583e6985b i18n/kor/extensions/emmet/package.i18n.json
-  their  100644 09a47620624863056c7b5a978e5a8502eb973873 i18n/kor/extensions/emmet/package.i18n.json
-@@ -56,10 +56,17 @@
- 	"emmetPreferencesFormatNoIndentTags": "내부 들여쓰기하면 안 되는 태그 이름 배열",
- 	"emmetPreferencesFormatForceIndentTags": "항상 내부 들여쓰기를 해야 하는 태그 이름의 배열",
- 	"emmetPreferencesAllowCompactBoolean": "true인 경우 부울 속성의 축소된 표기법이 생성됩니다.",
-+<<<<<<< .our
- 	"emmetPreferencesCssWebkitProperties": "`-`로 시작하는 Emmet 약어에서 사용될 때 'webkit' 공급업체 접두사를 가져오는 쉼표로 구분된 CSS 속성입니다. 항상 'webkit' 접두사를 사용하지 않으려면 빈 문자열로 설정합니다.",
- 	"emmetPreferencesCssMozProperties": "`-`로 시작하는 Emmet 약어에서 사용될 때 'moz' 공급업체 접두사를 가져오는 쉼표로 구분된 CSS 속성입니다. 항상 'moz' 접두사를 사용하지 않으려면 빈 문자열로 설정합니다.",
- 	"emmetPreferencesCssOProperties": "`-`로 시작하는 emmet 약어에서 사용할 때 'o' 공급업체 접두사를 가져오는 쉼표로 구분된 CSS 속성입니다. 항상 'o' 접두사를 사용하지 않으려면 빈 문자열로 설정합니다.",
- 	"emmetPreferencesCssMsProperties": "`-`로 시작하는 emmet 약어에서 사용할 때 'ms' 공급업체 접두사를 가져오는 쉼표로 구분된 CSS 속성입니다. 항상 'ms' 접두사를 사용하지 않으려면 빈 문자열로 설정합니다.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "유사 일치 약어가 획득해야 하는 최소 점수(0에서 1 사이)입니다. 값이 낮을수록 가양성 일치 항목이 늘 수 있고, 값이 높을수록 가능한 일치 항목이 줄 수 있습니다.",
- 	"emmetOptimizeStylesheetParsing": "False로 설정할 경우 전체 파일이 구문 분석되어 현재 위치가 Emmet 약어 확장에 유효한지 확인합니다. True로 설정할 경우 css/scss/less 파일에서 현재 위치 주변의 콘텐츠만 구문 분석합니다."
-+=======
-+	"emmetPreferencesCssWebkitProperties": "`-`로 시작하는 emmet 약어에서 사용할 때 webkit 공급업체 접두사를 가져오는 쉼표로 구분된 CSS 속성입니다. 항상 webkit 접두사를 사용하지 않으려면 빈 문자열로 설정합니다.",
-+	"emmetPreferencesCssMozProperties": "`-`로 시작하는 emmet 약어에서 사용할 때 moz 공급업체 접두사를 가져오는 쉼표로 구분된 CSS 속성입니다. 항상 moz 접두사를 사용하지 않으려면 빈 문자열로 설정합니다.",
-+	"emmetPreferencesCssOProperties": "`-`로 시작하는 emmet 약어에서 사용할 때 o 공급업체 접두사를 가져오는 쉼표로 구분된 CSS 속성입니다. 항상 o 접두사를 사용하지 않으려면 빈 문자열로 설정합니다.",
-+	"emmetPreferencesCssMsProperties": "`-`로 시작하는 emmet 약어에서 사용할 때 ms 공급업체 접두사를 가져오는 쉼표로 구분된 CSS 속성입니다. 항상 ms 접두사를 사용하지 않으려면 빈 문자열로 설정합니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 bcc589eb682d5215f2a5dbd431596ab45858ba00 i18n/kor/extensions/git/package.i18n.json
-  our    100644 3703ac48f99d1ed061418ae09d45c9f7e6e3d128 i18n/kor/extensions/git/package.i18n.json
-  their  100644 025b99831b767e4bfa27d2eedf72c27de1f7a4a7 i18n/kor/extensions/git/package.i18n.json
-@@ -75,9 +75,14 @@
- 	"config.decorations.enabled": "Git에서 색과 배지를 탐색기와 열려 있는 편집기 뷰에 적용하는지 제어합니다.",
- 	"config.promptToSaveFilesBeforeCommit": "Git가 제출(commit)하기 전에 저장되지 않은 파일을 검사할지를 제어합니다. ",
- 	"config.showInlineOpenFileAction": "Git 변경점 보기에서 파일 열기 동작 줄을 표시할지의 여부를 제어합니다.",
-+<<<<<<< .our
- 	"config.inputValidation": "커밋 메시지 입력 유효성 검사를 언제 표시할지 제어합니다.",
- 	"config.detectSubmodules": "Git 하위 모듈을 자동으로 검색할지 여부를 제어합니다.",
- 	"config.detectSubmodulesLimit": "Git submodules 검출 개수의 제한을 제어합니다.",
-+=======
-+	"config.inputValidation": "입력 유효성 검사에 입력 카운터를 언제 표시할지 제어합니다.",
-+	"config.detectSubmodules": "Git 하위 모듈을 자동으로 검색할지 여부를 제어합니다.",
-+>>>>>>> .their
- 	"colors.modified": "수정된 리소스의 색상입니다.",
- 	"colors.deleted": "삭제된 리소스의 색상입니다.",
- 	"colors.untracked": "추적되지 않은 리소스의 색상입니다.",
-changed in both
-  base   100644 2f3763ae9fb24e6b433eeba99fe8268e25a3a4be i18n/kor/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  our    100644 76588bffb73908d0aeec139d2a389b29a4d2f55f i18n/kor/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  their  100644 324628fdb332c4fb590b17988ab0dc6ab36eea2d i18n/kor/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-@@ -6,6 +6,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"hide": "숨기기",
- 	"show": "표시",
- 	"previewOnGitHub": "GitHub에서 미리 보기",
-@@ -27,5 +28,15 @@
- 	"expectedResults": "예상 결과",
- 	"settingsSearchResultsDescription": "이 쿼리를 검색할 때 기대했던 결과의 목록을 알려주세요. GitHub 버전의 Markdown을 지원합니다. GitHub에서 미리 볼 때 문제를 편집하고 스크린샷을 추가할 수 있습니다.",
- 	"pasteData": "너무 커서 보낼 수 없었기 때문에 필요한 데이터를 클립보드에 썼습니다. 붙여 넣으세요.",
-+=======
-+	"previewOnGitHub": "GitHub에서 미리 보기",
-+	"similarIssues": "유사한 문제",
-+	"noResults": "결과 없음",
-+	"rateLimited": "API 속도 제한 초과됨",
-+	"stepsToReproduce": "재현 단계",
-+	"bugDescription": "이 문제는 어떻게 발생했나요? 문제를 안정적으로 재현하는 데 필요한 단계는 무엇인가요? 정상 동작은 무엇이고 실제로 발생한 동작은 무엇인가요?",
-+	"performanceIssueDesciption": "이 성능 문제는 언제 일어났나요? 예를 들어 시작 시 발생했나요? 아니면 일련의 특정 작업 후 발생했나요? 세부 사항을 제공해 주시면 조사에 도움이 됩니다.",
-+	"description": "설명",
-+>>>>>>> .their
- 	"disabledExtensions": "확장을 사용할 수 없습니다."
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/kor/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  our    100644 ff0a015d193c699649f7844d926e630dbc9f9f24 i18n/kor/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  their  100644 e49ef79ad24755a932b4d76160fb550c09448c0c i18n/kor/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-@@ -7,6 +7,7 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"completeInEnglish": "양식을 영어로 작성해 주세요.",
-+<<<<<<< .our
- 	"issueTypeLabel": "이것은",
- 	"issueSourceLabel": "제출 대상",
- 	"vscode": "Visual Studio Code",
-@@ -25,4 +26,25 @@
- 	"sendExtensions": "사용하도록 설정된 확장 포함({0})",
- 	"sendSearchedExtensions": "검색된 확장 보내기({0})",
- 	"sendSettingsSearchDetails": "설정 검색 세부 정보 보내기({0})"
-+=======
-+	"issueTypeLabel": "다음을 제출하고자 합니다.",
-+	"bugReporter": "버그 보고서",
-+	"performanceIssue": "성능 문제",
-+	"featureRequest": "기능 요청",
-+	"issueTitleLabel": "제목",
-+	"issueTitleRequired": "제목을 입력하세요.",
-+	"vscodeVersion": "VS Code 버전",
-+	"osVersion": "OS 버전",
-+	"systemInfo": "내 시스템 정보",
-+	"sendData": "내 데이터 보내기",
-+	"processes": "현재 실행 중인 프로세스",
-+	"workspaceStats": "내 작업 영역 통계",
-+	"extensions": "내 확장",
-+	"tryDisablingExtensions": "확장을 사용하지 않도록 설정하는 경우 문제를 재현할 수 있습니다.",
-+	"disableExtensions": "모든 확장을 사용하지 않도록 설정하고 창 다시 로드",
-+	"showRunningExtensions": "실행 중인 확장 모두 보기",
-+	"githubMarkdown": "GitHub의 특성을 가지는 Markdown을 지원합니다. GitHub에서 미리 볼 때 문제를 편집하고 스크린샷을 추가할 수 있습니다.",
-+	"issueDescriptionRequired": "설명을 입력하세요.",
-+	"loadingData": "데이터 로드 중..."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/kor/src/vs/code/electron-main/logUploader.i18n.json
-  our    100644 127ac6cacc7b368ece376e886e4d2acda3d68418 i18n/kor/src/vs/code/electron-main/logUploader.i18n.json
-  their  100644 acb1fec378092cb40911a74ad7c40391dafdfd56 i18n/kor/src/vs/code/electron-main/logUploader.i18n.json
-@@ -9,10 +9,18 @@
- 	"invalidEndpoint": "잘못된 로그 업로더 끝점",
- 	"beginUploading": "업로드 중...",
- 	"didUploadLogs": "업로드 성공. 로그 파일 ID: {0}",
-+<<<<<<< .our
- 	"logUploadPromptHeader": "Microsoft의 VS Code 팀만 액세스할 수 있는 안전한 Microsoft 끝점에 세션 로그를 업로드하려고 합니다.",
- 	"logUploadPromptBody": "세션 로그에 전체 경로, 파일 내용 등과 같은 개인 정보가 포함되어 있을 수 있습니다. 다음에서 세션 로그 파일을 검토하고 편집하세요. '{0}'",
- 	"logUploadPromptBodyDetails": "계속하면 세션 로그 파일을 검토하고 수정했으며 Microsoft에서 이 파일을 사용하여 VS Code를 디버그하는 데 동의한다고 확인하게 됩니다.",
- 	"logUploadPromptAcceptInstructions": "업로드를 계속하려면 '--upload-logs={0}'을(를) 사용하여 코드를 실행하세요.",
-+=======
-+	"userDeniedUpload": "취소된 업로드",
-+	"logUploadPromptHeader": "세션 로그를 보안 끝점으로 업로드하시겠습니까?",
-+	"logUploadPromptBody": "여기에서 로그 파일을 검토하세요. '{0}'",
-+	"logUploadPromptBodyDetails": "로그에는 전체 경로 및 파일 내용과 같은 개인 정보가 포함되어 있을 수 있습니다.",
-+	"logUploadPromptKey": "내 로그 검토함(업로드를 확인하려면 'y' 입력)",
-+>>>>>>> .their
- 	"postError": "로그를 게시하는 동안 오류가 발생했습니다. {0}",
- 	"responseError": "로그를 게시하는 동안 오류가 발생했습니다. {0} — {1} 받음",
- 	"parseError": "응답을 구문 분석하는 동안 오류가 발생했습니다.",
-changed in both
-  base   100644 e08964a36de9e7f9f91c5497796472748c3fa2fc i18n/kor/src/vs/code/electron-main/menus.i18n.json
-  our    100644 a3a33ffe4d84057c71074e546cdf9a1e5529a6c8 i18n/kor/src/vs/code/electron-main/menus.i18n.json
-  their  100644 6c1f097554a4350b4d33c43701beef3f84c3895d i18n/kor/src/vs/code/electron-main/menus.i18n.json
-changed in both
-  base   100644 625cbf270c2b0acfc3649df247aa48a2848c5f46 i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 c96c0fe1469ce78842b73db686d63d6305f28dfb i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 85ef5c5304e04b8f2fb3380cf595d7a9c90d7e72 i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json
-changed in both
-  base   100644 9ceec5abd214f72e9872d0d7447c3ac782ed85c5 i18n/kor/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 5e47e69c5607206a94dadfaaaaa5928d57a2cd8e i18n/kor/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 b44ee27fd679d04b9501619f52cba4fe10a3cffc i18n/kor/src/vs/platform/environment/node/argv.i18n.json
-changed in both
-  base   100644 5bde8568f97e72ddf4b043797f17bbf83c8b177d i18n/kor/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 05518f96202309824a89dfbd3498bbcde7102ebd i18n/kor/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 042b7c91d0d196cd3c78cc5a55d2871b0294d0de i18n/kor/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/kor/src/vs/platform/issue/electron-main/issueService.i18n.json
-  our    100644 27d2b1e7d9c37d303bcfe8646f17b0166397c96f i18n/kor/src/vs/platform/issue/electron-main/issueService.i18n.json
-  their  100644 d927ee6ed7b6e64fae71ea71b49aea9f689c616d i18n/kor/src/vs/platform/issue/electron-main/issueService.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"issueReporter": "문제 보고자",
- 	"processExplorer": "프로세스 탐색기"
-+=======
-+	"issueReporter": "문제 보고자"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7e6f7bfe8588b046e4c50ad4b42ee2b2fa96b819 i18n/kor/src/vs/platform/list/browser/listService.i18n.json
-  our    100644 8b32c5188c5faaef1e01ee4a0d269dd5667aaf0e i18n/kor/src/vs/platform/list/browser/listService.i18n.json
-  their  100644 26cbc3957bc791ee9149d052866d7b7b473eafc6 i18n/kor/src/vs/platform/list/browser/listService.i18n.json
-@@ -12,6 +12,10 @@
- 	"multiSelectModifier": "마우스로 트리와 목록의 항목을 다중 선택에 추가할 때 사용할 한정자입니다(예를 들어 탐색기에서 편집기와 SCM 보기를 여는 경우). `ctrlCmd`는 Windows와 Linux에서 `Control`로 매핑되고 macOS에서 `Command`로 매핑됩니다. '옆에서 열기' 마우스 제스처(지원되는 경우)는 다중 선택 한정자와 충돌하지 않도록 조정됩니다.",
- 	"openMode.singleClick": "마우스를 한 번 클릭하여 항목을 엽니다.",
- 	"openMode.doubleClick": "마우스를 두 번 클릭하여 항목을 엽니다.",
-+<<<<<<< .our
- 	"openModeModifier": "트리와 목록에서 마우스를 사용하여 항목을 여는 방법을 제어합니다(지원되는 경우). 마우스을 한 번 클릭하여 항목을 열려면 `singleClick` 으로 설정하고 마우스 두 번 클릭을 통해서만 열려면 `doubleClick`으로 설정합니다. 트리에서 하위 항목이 있는 상위 항목의 경우 이 설정은 상위 항목을 한 번 클릭으로 확장할지 두 번 클릭으로 확장할지를 제어합니다. 일부 트리와 목록에서는 이 설정을 적용할 수 없는 경우  무시하도록 선택할 수 있습니다. ",
- 	"horizontalScrolling setting": "워크벤치에서 수평 스크롤 지원 여부를 제어 합니다."
-+=======
-+	"openModeModifier": "트리와 목록에서 마우스를 사용하여 항목을 여는 방법을 제어합니다(지원되는 경우). 마우스을 한 번 클릭하여 항목을 열려면 `singleClick` 으로 설정하고 마우스 두 번 클릭을 통해서만 열려면 `doubleClick`으로 설정합니다. 트리에서 하위 항목이 있는 상위 항목의 경우 이 설정은 상위 항목을 한 번 클릭으로 확장할지 두 번 클릭으로 확장할지를 제어합니다. 일부 트리와 목록에서는 이 설정을 적용할 수 없는 경우  무시하도록 선택할 수 있습니다. "
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 1360a457b37b0b616aa39bad0c7bb7b8ef732f7b i18n/kor/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  our    100644 f0e2070a7f457cc0db76815fba6defcb9702d6e1 i18n/kor/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  their  100644 64b2a99d8f5e2b52c85e455b7828e9fb65b76700 i18n/kor/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-changed in both
-  base   100644 1fccc78c1586e839b3a3df5d40aaf3d96ef75e2b i18n/kor/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 c3a38e203dc33f498428fe02d849236cb876a123 i18n/kor/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 52020df2eb36986da1895da58c18079f22189ee0 i18n/kor/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 56e89b535ba7c0312175578f31ae22a5d1b46b58 i18n/kor/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
-  our    100644 d01bfad8cc7a8c8e66c614803f6d4b1f0c761558 i18n/kor/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
-  their  100644 2eb6210e93a01be396a99665695b4f99e32589c9 i18n/kor/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
-@@ -11,11 +11,17 @@
- 	"sizeMB": "{0}MB",
- 	"sizeGB": "{0}GB",
- 	"sizeTB": "{0}TB",
-+<<<<<<< .our
- 	"largeImageError": "이미지가 너무 커서 편집기에 표시할 수 없습니다({0}). ",
- 	"resourceOpenExternalButton": " 외부 프로그램으로 이미지를 열까요?",
- 	"nativeFileTooLargeError": "파일이 너무 커서 편집기에서 표시되지 않습니다({0}).",
- 	"nativeBinaryError": "파일이 이진이거나 지원되지 않는 텍스트 인코딩을 사용하기 때문에 편집기에서 표시되지 않습니다.",
- 	"openAsText": "그래도 여시겠습니까?",
-+=======
-+	"largeImageError": "이미지의 파일 크기가 너무 커서(>1MB) 편집기에서 표시할 수 없습니다. ",
-+	"resourceOpenExternalButton": " 외부 프로그램으로 이미지를 열까요?",
-+	"nativeBinaryError": "파일이 이진이거나 매우 크거나 지원되지 않는 텍스트 인코딩을 사용하기 때문에 편집기에서 표시되지 않습니다.",
-+>>>>>>> .their
- 	"zoom.action.fit.label": "전체 이미지",
- 	"imgMeta": "{0}x{1} {2}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/kor/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
-  our    100644 8934fc203c0f35823e915cf123e33fee84c8f9ff i18n/kor/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
-  their  100644 b95f795040b73ad0675af1e2fd16158f999f72cb i18n/kor/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
-@@ -6,7 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"cannot toggle": "이 {0} 뷰에서 표시 여부를 전환할 수 없습니다.",
- 	"cannot show": "이 {0} 뷰는 'when' 조건으로 숨겨져 있으므로 표시할 수 없습니다.",
-+=======
-+>>>>>>> .their
- 	"hideView": "숨기기"
- }
-\ No newline at end of file
-changed in both
-  base   100644 1e4438f0ffc7e1784aa3444a9301c122b5fe043d i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 faff44b17686fcb835995d2bfd92efcfdcc183b1 i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 1dce13bbcdb04355ca6a0779be42c833a84518da i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,7 +35,10 @@
- 	"panelDefaultLocation": "패널의 기본 위치를 제어합니다. 워크벤치의 아래 또는 오른쪽에 표시될 수 있습니다.",
- 	"statusBarVisibility": "워크벤치 아래쪽에서 상태 표시줄의 표시 유형을 제어합니다.",
- 	"activityBarVisibility": "워크벤치에서 작업 막대의 표시 유형을 제어합니다.",
-+<<<<<<< .our
- 	"viewVisibility": "보기 머리글 작업의 표시 여부를 제어합니다. 보기 머리글 작업은 항상 표시할 수도 있고 보기에 포커스가 있거나 보기를 마우스로 가리킬 때만 표시할 수도 있습니다.",
-+=======
-+>>>>>>> .their
- 	"fontAliasing": "워크벤치에서 글꼴 앨리어싱 방식을 제어합니다.\n- 기본: 서브 픽셀 글꼴 다듬기. 대부분의 일반 디스플레이에서 가장 선명한 글꼴 제공\n- 안티앨리어싱: 서브 픽셀이 아닌 픽셀 단위에서 글꼴 다듬기. 전반적으로 더 밝은 느낌을 줄 수 있음\n- 없음: 글꼴 다듬기 사용 안 함. 텍스트 모서리가 각지게 표시됨\n- 자동: 디스플레이의 DPI에 따라 `기본` 또는 `안티앨리어싱`을 자동으로 적용합니다.",
- 	"workbench.fontAliasing.default": "서브 픽셀 글꼴 다듬기. 대부분의 일반 디스플레이에서 가장 선명한 텍스트를 제공합니다. ",
- 	"workbench.fontAliasing.antialiased": "서브 픽셀이 아닌 픽셀 수준에서 글꼴을 다듬습니다. 전반적으로 글꼴이 더 밝게 표시됩니다.",
-changed in both
-  base   100644 8973c256e51a91d644b034a9842860f08119d77a i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-  our    100644 dc993a8c3d23ac0936ec4871652b8ef33d88e1dd i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-  their  100644 31d9ef028955658bb3a88fa0c9c37bc484c39607 i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-@@ -6,7 +6,40 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"debugNoType": "디버거 '형식'은 생략할 수 없으며 '문자열' 형식이어야 합니다.",
-+=======
-+	"vscode.extension.contributes.debuggers": "디버그 어댑터를 적용합니다.",
-+	"vscode.extension.contributes.debuggers.type": "이 디버그 어댑터에 대한 고유한 식별자입니다.",
-+	"vscode.extension.contributes.debuggers.label": "이 디버그 어댑터에 대한 이름을 표시합니다.",
-+	"vscode.extension.contributes.debuggers.program": "디버그 어댑터 프로그램의 경로입니다. 절대 경로이거나 확장 폴더의 상대 경로입니다.",
-+	"vscode.extension.contributes.debuggers.args": "어댑터에 전달할 선택적 인수입니다.",
-+	"vscode.extension.contributes.debuggers.runtime": "프로그램 특성이 실행 파일이 아니지만 런타임이 필요한 경우의 선택적 런타임입니다.",
-+	"vscode.extension.contributes.debuggers.runtimeArgs": "선택적 런타임 인수입니다.",
-+	"vscode.extension.contributes.debuggers.variables": "`launch.json`의 대화형 변수(예: ${action.pickProcess})에서 명령으로의 매핑입니다.",
-+	"vscode.extension.contributes.debuggers.initialConfigurations": "초기 'launch.json'을 생성하기 위한 구성입니다.",
-+	"vscode.extension.contributes.debuggers.languages": "디버그 확장이 \"기본 디버거\"로 간주될 수 있는 언어 목록입니다.",
-+	"vscode.extension.contributes.debuggers.adapterExecutableCommand": "지정하는 경우 VS Code에서 이 명령을 호출하여 디버그 어댑터의 실행 파일 경로 및 전달할 인수를 확인합니다.",
-+	"vscode.extension.contributes.debuggers.configurationSnippets": "'launch.json'에 새 구성을 추가하는 코드 조각입니다.",
-+	"vscode.extension.contributes.debuggers.configurationAttributes": "'launch.json'의 유효성 검사를 위한 JSON 스키마 구성입니다.",
-+	"vscode.extension.contributes.debuggers.windows": "Windows 특정 설정",
-+	"vscode.extension.contributes.debuggers.windows.runtime": "Windows에 사용되는 런타임입니다.",
-+	"vscode.extension.contributes.debuggers.osx": "macOS 관련 설정입니다.",
-+	"vscode.extension.contributes.debuggers.osx.runtime": "macOS에 사용되는 런타임입니다.",
-+	"vscode.extension.contributes.debuggers.linux": "Linux 특정 설정",
-+	"vscode.extension.contributes.debuggers.linux.runtime": "Linux에 사용되는 런타임입니다.",
-+	"vscode.extension.contributes.breakpoints": "중단점을 적용합니다.",
-+	"vscode.extension.contributes.breakpoints.language": "이 언어에 대해 중단점을 허용합니다.",
-+	"app.launch.json.title": "시작",
-+	"app.launch.json.version": "이 파일 형식의 버전입니다.",
-+	"app.launch.json.configurations": "구성 목록입니다. IntelliSense를 사용하여 새 구성을 추가하거나 기존 구성을 편집합니다.",
-+	"app.launch.json.compounds": "복합의 목록입니다. 각 복합은 함께 시작되는 여러 구성을 참조합니다.",
-+	"app.launch.json.compound.name": "복합의 이름입니다. 구성 시작 드롭 다운 메뉴에 표시됩니다.",
-+	"useUniqueNames": "고유한 구성 이름을 사용하세요.",
-+	"app.launch.json.compound.folder": "복합형 항목이 있는 폴더의 이름입니다.",
-+	"app.launch.json.compounds.configurations": "이 복합의 일부로 시작되는 구성의 이름입니다.",
-+	"debugNoType": "디버그 어댑터 '형식'은 생략할 수 없으며 '문자열' 형식이어야 합니다.",
-+>>>>>>> .their
- 	"selectDebug": "환경 선택",
- 	"DebugConfig.failed": "'.vscode' 폴더({0}) 내에 'launch.json' 파일을 만들 수 없습니다.",
- 	"workspace": "작업 영역",
-changed in both
-  base   100644 0eeadebbdc47ea52bb767cc841131fbf2324a6d0 i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 f0485e490c5dc7158ba60cc766e0b791027e8972 i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 6527d3702d80377e23e0b8ba16c2854e8ecbcef4 i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -14,7 +14,11 @@
- 	"breakpointRemoved": "파일 {1}, 줄 {0}에서 중단점이 제거되었습니다.",
- 	"compoundMustHaveConfigurations": "여러 구성을 시작하려면 복합에 \"configurations\" 특성 집합이 있어야 합니다.",
- 	"noConfigurationNameInWorkspace": "작업 영역에서 시작 구성 '{0}'을(를) 찾을 수 없습니다.",
-+<<<<<<< .our
- 	"multipleConfigurationNamesInWorkspace": "작업 영역에 시작 구성 '{0}'이(가) 여러 개 있습니다. 폴더 이름을 사용하여 구성을 한정하세요.",
-+=======
-+	"multipleConfigurationNamesInWorkspace": "작업 영역에 여러 시작 구성 `{0}`이(가) 있습니다. 폴더 이름을 사용하여 구성을 한정하세요.",
-+>>>>>>> .their
- 	"noFolderWithName": "복합형 '{2}'의 구성 '{1}'에 대해 이름이 '{0}'인 폴더를 찾을 수 없습니다.",
- 	"configMissing": "'{0}' 구성이 'launch.json'에 없습니다.",
- 	"launchJsonDoesNotExist": "'launch.json'이 없습니다.",
-@@ -26,7 +30,13 @@
- 	"preLaunchTaskErrors": "preLaunchTask '{0}' 진행 중에 빌드 오류가 감지되었습니다.",
- 	"preLaunchTaskError": "preLaunchTask '{0}' 진행 중에 빌드 오류가 감지되었습니다.",
- 	"preLaunchTaskExitCode": "preLaunchTask '{0}'이(가) {1} 종료 코드와 함께 종료되었습니다.",
-+<<<<<<< .our
- 	"showErrors": "오류 표시",
-+=======
-+	"debugAnyway": "디버그",
-+	"showErrors": "오류 표시",
-+	"cancel": "취소",
-+>>>>>>> .their
- 	"noFolderWorkspaceDebugError": "활성 파일은 디버그할 수 없습니다. 이 파일이 디스크에 저장되어 있고 해당 파일 형식에 대한 디버그 확장이 설치되어 있는지 확인하세요.",
- 	"cancel": "취소",
- 	"DebugTaskNotFound": "작업 '{0}' 을(를) 찾을 수 없습니다.",
-changed in both
-  base   100644 e965576ac3bdb7d1e0d50d25aa14db831ec21cce i18n/kor/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-  our    100644 ac0d4279306dd86dc6aef8e72448d92e45e7a5dd i18n/kor/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-  their  100644 54e1dfab1d5f362887131118b61c60d6eb5d3214 i18n/kor/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-changed in both
-  base   100644 65a5fc093beb2988472361cdd7397926631dd55f i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 3b79008f444d2989f35d429d32801582bb6d419c i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 294633755d978ff0624ee75fe07eb2c2914180db i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-@@ -56,11 +56,17 @@
- 	"OpenExtensionsFile.failed": "'.vscode' 폴더({0}) 내에 'extensions.json' 파일을 만들 수 없습니다.",
- 	"configureWorkspaceRecommendedExtensions": "권장 확장 구성(작업 영역)",
- 	"configureWorkspaceFolderRecommendedExtensions": "권장 확장 구성(작업 영역 폴더)",
-+<<<<<<< .our
- 	"malicious tooltip": "이 확장은 문제가 있다고 보고되었습니다.",
- 	"malicious": "악성",
- 	"disabled": "사용 안 함",
- 	"disabled globally": "사용 안 함",
- 	"disabled workspace": "이 작업 영역에 대해  사용 안 함",
-+=======
-+	"builtin": "기본 제공",
-+	"malicious tooltip": "이 확장은 문제가 있다고 보고되었습니다.",
-+	"malicious": "악성",
-+>>>>>>> .their
- 	"disableAll": "설치된 모든 확장 사용 안 함",
- 	"disableAllWorkspace": "이 작업 영역에 대해 설치된 모든 확장 사용 안 함",
- 	"enableAll": "모든 확장 사용",
-changed in both
-  base   100644 9f0a02f28b7907e85d5638c3c22022ab8c723b36 i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-  our    100644 6ca85821a3c0d4bf847c8a1f5caaa545dfc0fec0 i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-  their  100644 e96ed3f41e1a062a19e9f07e16ca75d6e0770474 i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-@@ -6,9 +6,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"restart1": "확장 프로파일링",
- 	"restart2": "확장을 프로파일링하려면 다시 시작해야 합니다. 지금 '{0}'을(를) 다시 시작하시겠습니까?",
- 	"restart3": "다시 시작",
- 	"cancel": "취소",
-+=======
-+	"noPro": "확장을 프로파일링하려면 `--inspect-extensions=<port>`(으)로 시작합니다.",
-+>>>>>>> .their
- 	"selectAndStartDebug": "프로파일링을 중지하려면 클릭하세요."
- }
-\ No newline at end of file
-changed in both
-  base   100644 4083a40bfe8f950cb772e6baec4217babc2c2c01 i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 7d98f29daa7e57a06988b8e2e9d76dd40150f638 i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 9b8a35ad0e4240766bf5bd501fca67f5eb09fa7d i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -10,13 +10,22 @@
- 	"searchMarketplace": "Marketplace 검색",
- 	"dynamicWorkspaceRecommendation": "이 확장은 {0} 리포지토리의 사용자들에게 인기가 있으므로 관심을 가질 만합니다.",
- 	"exeBasedRecommendation": "{0}이(가) 설치되어 있으므로 이 확장을 권장합니다.",
-+<<<<<<< .our
- 	"fileBasedRecommendation": "최근에 연 파일을 기반으로 확장이 권장됩니다.",
- 	"workspaceRecommendation": "이 확장은 현재 작업 영역 사용자가 권장합니다.",
-+=======
-+	"dynamicWorkspaceRecommendation": "이 확장은 현재 작업 영역의 다른 많은 사용자가 사용하고 있으므로 관심을 가질 만합니다.",
-+>>>>>>> .their
- 	"reallyRecommended2": "이 파일 형식에 대해 '{0}' 확장이 권장됩니다.",
- 	"reallyRecommendedExtensionPack": "이 파일 형식에 대해 '{0}' 확장 팩이 권장됩니다.",
- 	"install": "설치",
-+<<<<<<< .our
- 	"showRecommendations": "권장 사항 표시",
- 	"showLanguageExtensions": "Marketplace에 '.{0}' 파일이 지원되는 확장이 있습니다.",
-+=======
-+	"showLanguageExtensions": "Marketplace에 '.{0}' 파일이 지원되는 확장이 있습니다.",
-+	"searchMarketplace": "Marketplace 검색",
-+>>>>>>> .their
- 	"workspaceRecommended": "이 작업 영역에 확장 권장 사항이 있습니다.",
- 	"installAll": "모두 설치",
- 	"ignoreExtensionRecommendations": "확장 권장 사항을 모두 무시하시겠습니까?",
-changed in both
-  base   100644 716717bd06dfa0dde870eafde1ceeb56e0edb837 i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  our    100644 018f63d5c0fb6f63e432765ed1c8c8d45eb5d87b i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  their  100644 d88f38093beb02b840189f0932a8c3f15a519404 i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-changed in both
-  base   100644 11d64317ca42268b1fd84c00bba428a6631682fa i18n/kor/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
-  our    100644 2a348dbd44730e2532ada8bed69d537a8e085d69 i18n/kor/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
-  their  100644 893db96ed7105d3e6af59fcb1b349c251fda3ced i18n/kor/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
-@@ -10,7 +10,11 @@
- 	"malicious": "이 확장은 문제가 있다고 보고되었습니다.",
- 	"installingMarketPlaceExtension": "Marketplace에서 확장을 설치하는 중...",
- 	"uninstallingExtension": "확장을 제거하는 중....",
-+<<<<<<< .our
- 	"enableDependeciesConfirmation": "확장을 사용하도록 설정하면 종속성도 사용하도록 설정됩니다. 계속하시겠습니까?",
-+=======
-+	"enableDependeciesConfirmation": "'{0}'을(를) 사용하도록 설정하면 종속성도 사용하도록 설정됩니다. 계속하시겠습니까?",
-+>>>>>>> .their
- 	"enable": "예",
- 	"doNotEnable": "아니요",
- 	"disableDependeciesConfirmation": "확장의 종속성도 사용하지 않도록 설정하시겠습니까?",
-changed in both
-  base   100644 d247ab2ff18fdc1dc8c5223f472f92936f2b7926 i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  our    100644 42cc77c6edf6d2ceb65bde3d33c468e821956123 i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  their  100644 97f92cef78bffc5d50aa4917b7426c58929f82f6 i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-changed in both
-  base   100644 be5c57ed4ab36831edc8365ff35ff94308235be5 i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 3bf77a27ac7c066f4ce3c283301cd1346b8314d5 i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 1063c333fab3426b9f6cca65eb79e1b427395cab i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -25,6 +25,7 @@
- 	"dirtyMessageFolderDelete": "{0}개 파일에 저장되지 않은 변경 내용이 있는 폴더를 삭제하려고 합니다. 계속하시겠습니까?",
- 	"dirtyMessageFileDelete": "저장되지 않은 변경 내용이 있는 파일을 삭제하려고 합니다. 계속하시겠습니까?",
- 	"dirtyWarning": "변경 내용을 저장하지 않은 경우 변경 내용이 손실됩니다.",
-+<<<<<<< .our
- 	"undoBin": "휴지통에서 복원할 수 있습니다.",
- 	"undoTrash": "휴지통에서 복원할 수 있습니다.",
- 	"doNotAskAgain": "이 메시지를 다시 표시 안 함",
-@@ -40,14 +41,27 @@
- 	"confirmMoveTrashMessageFile": "'{0}'을(를) 삭제할까요?",
- 	"confirmDeleteMessageFilesAndDirectories": "다음 {0}개 파일/디렉터리 및 해당 내용을 영구히 삭제하시겠습니까?",
- 	"confirmDeleteMessageMultipleDirectories": "다음 {0}개 디렉터리 및 해당 내용을 영구히 삭제하시겠습니까?",
-+=======
-+	"confirmMoveTrashMessageMultiple": "다음 {0}개 파일을 삭제하시겠습니까?",
-+	"confirmMoveTrashMessageFolder": "'{0}'과(와) 해당 내용을 삭제할까요?",
-+	"confirmMoveTrashMessageFile": "'{0}'을(를) 삭제할까요?",
-+	"undoBin": "휴지통에서 복원할 수 있습니다.",
-+	"undoTrash": "휴지통에서 복원할 수 있습니다.",
-+	"doNotAskAgain": "이 메시지를 다시 표시 안 함",
-+>>>>>>> .their
- 	"confirmDeleteMessageMultiple": "다음 {0}개 파일을 영구히 삭제하시겠습니까?",
- 	"confirmDeleteMessageFolder": "'{0}'과(와) 해당 내용을 영구히 삭제할까요?",
- 	"confirmDeleteMessageFile": "'{0}'을(를) 영구히 삭제할까요?",
- 	"addFiles": "파일 추가",
- 	"confirmOverwrite": "이름이 같은 파일 또는 폴더가 대상 폴더에 이미 있습니다. 덮어쓸까요?",
- 	"replaceButtonLabel": "바꾸기(&&R)",
-+<<<<<<< .our
- 	"fileIsAncestor": "붙여 넣을 파일이 대상 폴더의 상위 항목입니다.",
- 	"fileDeleted": "그동안 붙여 넣을 파일이 삭제되거나 이동되었습니다.",
-+=======
-+	"fileDeleted": "그동안 파일이 삭제되거나 이동됨",
-+	"fileIsAncestor": "복사할 파일이 대상 폴더의 상위 항목입니다.",
-+>>>>>>> .their
- 	"duplicateFile": "중복",
- 	"globalCompareFile": "활성 파일을 다음과 비교...",
- 	"openFileToCompare": "첫 번째 파일을 열어서 다른 파일과 비교합니다.",
-changed in both
-  base   100644 c976f4c0edbeffe0155bd4a08bbab0f418a41528 i18n/kor/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 86c9a7c9d2ee8cfe00d51c1241e8d08a131418a5 i18n/kor/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 60fac1e96fac0ab19644c39c68be7f314d3266fd i18n/kor/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-changed in both
-  base   100644 2d8e3744f9d938fe2bc8f8b8ae7d3d63364d45ce i18n/kor/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  our    100644 b2bb3346a0aacef8ebfc8da00ebb91b7f0db3e37 i18n/kor/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  their  100644 b0eb1a382235401c9b8d898c9c635f22bd06ffd5 i18n/kor/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-@@ -6,8 +6,15 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"userGuide": "편집기 도구 모음의 작업을 사용하여 변경 내용을 실행 취소하거나 디스크의 콘텐츠를 변경 내용으로 덮어쓰세요.",
- 	"staleSaveError": "'{0}'을(를) 저장하지 못했습니다. 디스크의 내용이 최신 버전입니다. 버전을 디스크에 있는 버전과 비교하하세요.",
-+=======
-+	"userGuide": "오른쪽 편집기 도구 모음의 작업을 사용하여 변경 내용을 **실행 취소**하거나 디스크의 콘텐츠를 변경 내용으로 **덮어쓰기**",
-+	"overwriteElevated": "관리자로 덮어쓰기...",
-+	"saveElevated": "관리자로 다시 시도...",
-+	"overwrite": "덮어쓰기",
-+>>>>>>> .their
- 	"retry": "다시 시도",
- 	"discard": "삭제",
- 	"readonlySaveErrorAdmin": "'{0}' 저장 실패: 파일이 쓰기 보호되어 있습니다. 관리자로 다시 시도하려면 '관리자로 덮어쓰기'를 선택하세요.",
-changed in both
-  base   100644 15332ccc747ba5ad7d23c51212a45d40cb29732f i18n/kor/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  our    100644 0e96fcdac44c2d3253e3fe7e92f0f23065b25765 i18n/kor/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  their  100644 b68cddecdb855779d1f4a6f063ce715a0e964bf5 i18n/kor/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-@@ -15,9 +15,13 @@
- 	"dropFolder": "작업 영역에 폴더를 추가하시겠습니까?",
- 	"addFolders": "폴더 추가(&&A)",
- 	"addFolder": "폴더 추가(&&A)",
-+<<<<<<< .our
- 	"confirmRootsMove": "작업 영역에서 다중 루트 폴더의 순서를 변경하시겠습니까? ",
- 	"confirmMultiMove": "다음 {0}개 파일을 이동하시겠습니까?",
- 	"confirmRootMove": "작업 영역에서 루트 폴더 '{0}'의 순서를 변경하시겠습니까? ",
-+=======
-+	"confirmMultiMove": "다음 {0}개 파일을 이동하시겠습니까?",
-+>>>>>>> .their
- 	"confirmMove": "'{0}'을(를) 이동하시겠습니까?",
- 	"doNotAskAgain": "이 메시지를 다시 표시 안 함",
- 	"moveButtonLabel": "이동(&&M)",
-changed in both
-  base   100644 c3c5cdfd9f31aa0039ec77fbd9a72a512850ff2d i18n/kor/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  our    100644 3bd63de7ca6d73e0237b469acdb4b75d84710150 i18n/kor/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  their  100644 43aca10fffe612160faf026422d892ee758c2092 i18n/kor/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-changed in both
-  base   100644 797d5a4e7dad4c498f5e4fb873859241f70a8f14 i18n/kor/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  our    100644 6a6e7f152719318ecb9e9ea38a0a26d753597925 i18n/kor/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  their  100644 2d56a5c5e8a710d9c4367bc1ef9a32a5fadb7f65 i18n/kor/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-@@ -21,7 +21,11 @@
- 	"showSameKeybindings": "동일한 키 바인딩 표시",
- 	"copyLabel": "복사",
- 	"copyCommandLabel": "복사 명령",
-+<<<<<<< .our
- 	"error": "키 바인딩을 편집하는 동안 '{0}' 오류가 발생했습니다. 'keybindings.json' 파일을 열고 오류를 확인하세요.",
-+=======
-+	"error": "키 바인딩을 편집하는 동안 오류 '{0}'이(가) 발생했습니다. 'keybindings.json' 파일을 열고 확인하세요.",
-+>>>>>>> .their
- 	"command": "명령",
- 	"keybinding": "키 바인딩",
- 	"source": "소스",
-changed in both
-  base   100644 395d4bef25e51a0eecb8265ccd3c2324e123f7ad i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-  our    100644 aecb53ab9b9ac6a3addd171d6c1d4943de0e0b02 i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-  their  100644 845d9b2416b350a2b3fa2d23b1b78c86c0594611 i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-changed in both
-  base   100644 321288cf32dece52b813e5b1edfa646173c4704d i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 952972db109181a066081ea0ee054ff4a0c809ad i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 5ddd6010e613ceb386be7ae62d60c558ac5e57fe i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -9,7 +9,10 @@
- 	"emptyUserSettingsHeader": "설정을 여기에 넣어서 기본 설정을 덮어씁니다.",
- 	"emptyWorkspaceSettingsHeader": "설정을 여기에 넣어서 사용자 설정을 덮어씁니다.",
- 	"emptyFolderSettingsHeader": "폴더 설정을 여기에 넣어서 작업 영역 설정을 덮어씁니다.",
-+<<<<<<< .our
- 	"reportSettingsSearchIssue": "문제 보고",
-+=======
-+>>>>>>> .their
- 	"newExtensionLabel": "\"{0}\" 확장 표시",
- 	"editTtile": "편집",
- 	"replaceDefaultValue": "설정에서 바꾸기",
-changed in both
-  base   100644 f868c2471aa6febba0a9592ef6d8051d67f727fe i18n/kor/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 071d294ccc8fe4437d151c87e9b3a4d19cd1a8d5 i18n/kor/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 ada854f50d6db57c9c76ae2900985707c28ff454 i18n/kor/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-changed in both
-  base   100644 4400f85024acaf959f8548a5f917d87e1e8ae2c3 i18n/kor/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 b8f4fa84a25213fae0e380ab22868cdef4e860d3 i18n/kor/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 5e4449bea891f5c59cb782e7b5211756628729c1 i18n/kor/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -6,12 +6,15 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"search": "검색",
- 	"copyMatchLabel": "복사",
- 	"copyPathLabel": "경로 복사",
- 	"copyAllLabel": "모두 복사",
- 	"clearSearchHistoryLabel": "검색 기록 지우기",
- 	"toggleSearchViewPositionLabel": "검색 보기 위치 토글",
-+=======
-+>>>>>>> .their
- 	"findInFolder": "폴더에서 찾기...",
- 	"findInWorkspace": "작업 영역에서 찾기...",
- 	"showTriggerActions": "작업 영역에서 기호로 이동...",
-@@ -30,6 +33,10 @@
- 	"search.quickOpen.includeSymbols": "Quick Open에 대한 파일 결과에 전역 기호 검색 결과를 포함하도록 구성합니다.",
- 	"search.followSymlinks": "검색하는 동안 symlink를 누를지 여부를 제어합니다.",
- 	"search.smartCase": "패턴이 모두 소문자인 경우 대/소문자를 구분하지 않고 검색하고, 그렇지 않으면 대/소문자를 구분하여 검색합니다.",
-+<<<<<<< .our
- 	"search.globalFindClipboard": "macOS에서 검색 보기가 공유 클립보드 찾기를 읽거나 수정해야 할지를 제어합니다.",
- 	"search.location": "검색을 사이드바의 보기로 표시할지 또는 가로 간격을 늘리기 위해 패널 영역의 패널로 표시할지를 제어합니다."
-+=======
-+	"search.globalFindClipboard": "macOS에서 Search Viewlet이 공유 클립보드 찾기를 읽거나 수정해야 할지를 제어합니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 00ebf63a54ee91b6e6c5708f8bb0e17fb2a8fba2 i18n/kor/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 5dfbb2074f09c64c5ec03adc7d012b25c2bb9e72 i18n/kor/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 58e2a3a2594563df4d8bb085abd5d888ddb1f0b7 i18n/kor/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-changed in both
-  base   100644 3e8e0df6db9e04f6d5a14a8aa0fa99e14ebff310 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 bc58bba26a36ca2c7cacec97bfa2f02daab82775 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 6b09571e55802392f3f78520823537b139ccecc4 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -16,6 +16,10 @@
- 	"terminal.integrated.shell.windows": "터미널이 Windows에서 사용하는 셸의 경로입니다. Windows와 함께 제공되는 셸을 사용하는 경우(cmd, PowerShell 또는 Ubuntu의 Bash)",
- 	"terminal.integrated.shellArgs.windows": "Windows 터미널에 있을 때 사용할 명령줄 인수입니다.",
- 	"terminal.integrated.macOptionIsMeta": "macOS의 터미널에서 옵션 키를 메타 키로 처리합니다.",
-+<<<<<<< .our
-+=======
-+	"terminal.integrated.rightClickCopyPaste": "설정하는 경우 터미널 내에서 마우스 오른쪽 단추를 클릭할 때 상황에 맞는 메뉴가 표시되지 않고 대신 선택 항목이 있으면 복사하고 선택 항목이 없으면 붙여넣습니다.",
-+>>>>>>> .their
- 	"terminal.integrated.copyOnSelection": "설정된 경우, 터미널에서 선택된 텍스트가 클립보드로 복사됩니다.",
- 	"terminal.integrated.fontFamily": "터미널의 글꼴 패밀리를 제어하며, 기본값은 editor.fontFamily의 값입니다.",
- 	"terminal.integrated.fontSize": "터미널의 글꼴 크기(픽셀)를 제어합니다.",
-@@ -37,7 +41,10 @@
- 	"terminal.integrated.env.linux": "Linux의 터미널에서 사용할 VS Code 프로세스에 추가되는 환경 변수를 포함한 개체",
- 	"terminal.integrated.env.windows": "Windows의 터미널에서 사용할 VS Code 프로세스에 추가되는 환경 변수를 포함한 개체",
- 	"terminal.integrated.showExitAlert": "종료 코드가 0이 아닌 경우 `터미널 프로세스가 종료 코드로 종료되었습니다` 경고를 표시합니다.",
-+<<<<<<< .our
- 	"terminal.integrated.experimentalRestore": "VS Code를 시작할 때 작업 영역에 대한 터미널 세션을 자동으로 복원할지 여부를 지정합니다. 이 설정은 실험적 설정이므로 버그가 있을 수 있고 향후 변경될 수 있습니다.",
-+=======
-+>>>>>>> .their
- 	"terminalCategory": "터미널",
- 	"viewCategory": "보기"
- }
-\ No newline at end of file
-changed in both
-  base   100644 6963a938df502d290d8ea914f210bb153e40e44d i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-  our    100644 260b52f5f8b41136576748b7b0f1f6a9c2632a85 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-  their  100644 dff61c0df6cb64af2edd3133bcf7bf4dc914974f i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-@@ -9,11 +9,14 @@
- 	"terminal.integrated.a11yBlankLine": "빈 줄",
- 	"terminal.integrated.a11yPromptLabel": "터미널 입력",
- 	"terminal.integrated.a11yTooMuchOutput": "발표할 출력이 너무 많음, 읽을 행으로 수동 이동",
-+<<<<<<< .our
- 	"yes": "예",
- 	"terminal.rendererInAllNewTerminals": "새로 만든 터미널은 모두 비 GPU 렌더러를 사용합니다.",
- 	"no": "아니요",
- 	"dontShowAgain": "다시 표시 안 함",
- 	"terminal.slowRendering": "통합 터미널의 표준 렌더러가 컴퓨터에서 느린 것 같습니다. 성능을 향상할 수 있는 대체 DOM 기반 렌더러로 전환하시겠습니까? [터미널 설정에 대한 자세한 정보](https://code.visualstudio.com/docs/editor/integrated-terminal#_changing-how-the-terminal-is-rendered)",
-+=======
-+>>>>>>> .their
- 	"terminal.integrated.copySelection.noSelection": "터미널에 복사할 선택 항목이 없음",
- 	"terminal.integrated.exitedWithCode": "터미널 프로세스가 종료 코드 {0}(으)로 종료되었습니다.",
- 	"terminal.integrated.waitOnExit": "터미널을 닫으려면 아무 키나 누르세요.",
-changed in both
-  base   100644 64da8fd9e1dedd5fcf5de032176add72b952b53d i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  our    100644 444b81d0780111787d9f82a5eb6b8366a4b685f3 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  their  100644 ec2ab7c2769e83f612cf4e125e110612c3aaed99 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-@@ -8,6 +8,10 @@
- 	],
- 	"terminal.integrated.chooseWindowsShellInfo": "사용자 지정 단추를 선택하여 기본 터미널 셸을 변경할 수 있습니다.",
- 	"customize": "사용자 지정",
-+<<<<<<< .our
-+=======
-+	"cancel": "취소",
-+>>>>>>> .their
- 	"never again": "다시 표시 안 함",
- 	"terminal.integrated.chooseWindowsShell": "기본으로 설정할 터미널 셸을 선택하세요. 나중에 설정에서 이 셸을 변경할 수 있습니다.",
- 	"terminalService.terminalCloseConfirmationSingular": "활성 터미널 세션이 있습니다. 종료할까요?",
-changed in both
-  base   100644 e579df60c64fd4212b78fe5a94122a8012209284 i18n/kor/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 46a0013cd0e5a09c5cae294dfef72bf6b6e0aeef i18n/kor/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 ae3e960954a8bfa85b1cdca53168f77595fd7cfe i18n/kor/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -16,12 +16,18 @@
- 	"noUpdatesAvailable": "현재 사용할 수 있는 업데이트가 없습니다.",
- 	"ok": "확인",
- 	"thereIsUpdateAvailable": "사용 가능한 업데이트가 있습니다.",
-+<<<<<<< .our
- 	"download now": "지금 다운로드",
- 	"later": "나중에",
- 	"updateAvailable": "사용 가능한 업데이트가 있습니다. {0} {1}",
- 	"installUpdate": "업데이트 설치",
- 	"updateInstalling": "{0} {1}이(가) 백그라운드에서 설치되고 있습니다. 설치가 끝나면 알려드리겠습니다.",
- 	"updateAvailableAfterRestart": "최신 업데이트를 적용하려면 {0}을(를) 다시 시작하세요.",
-+=======
-+	"installUpdate": "업데이트 설치",
-+	"updateAvailable": "사용 가능한 업데이트가 있습니다. {0} {1}",
-+	"updateInstalling": "{0} {1}이(가) 백그라운드로 설치되고 있습니다. 완료되면 알려드리겠습니다.",
-+>>>>>>> .their
- 	"updateNow": "지금 업데이트",
- 	"commandPalette": "명령 팔레트...",
- 	"settings": "설정",
-changed in both
-  base   100644 9d89b4306759aa950269a7621daed6248c508911 i18n/kor/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-  our    100644 6cd63821229d7991380db65c8167125b14ca4e86 i18n/kor/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-  their  100644 7a7934c552fa3424ae61e9870ba574d7690db253 i18n/kor/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-changed in both
-  base   100644 5db7a38967af42214d474dbb94f4a0e17c9b578c i18n/ptb/extensions/emmet/package.i18n.json
-  our    100644 bd44dd5d5523e2a5800a445af385bb5a762f2233 i18n/ptb/extensions/emmet/package.i18n.json
-  their  100644 5e16d0b3e0acfdbb529d411f7290e6281d69b2cd i18n/ptb/extensions/emmet/package.i18n.json
-@@ -56,10 +56,17 @@
- 	"emmetPreferencesFormatNoIndentTags": "Uma matriz de nomes de abas que não devem ter recuo interno",
- 	"emmetPreferencesFormatForceIndentTags": "Uma matriz de nomes de abas que deve sempre devem ter recuo interno",
- 	"emmetPreferencesAllowCompactBoolean": "Se verdadeiro, a notação compacta de atributos booleanos são produzidos",
-+<<<<<<< .our
- 	"emmetPreferencesCssWebkitProperties": "Propriedades CSS separadas por vírgula que recebem o prefixo vendor 'webkit' quando utilizado em abreviações do Emmet que iniciam com `-`. Defina como string vazia para sempre evitar o prefixo 'webkit'.",
- 	"emmetPreferencesCssMozProperties": "Propriedades CSS separadas por vírgula que recebem o prefixo vendor 'moz' quando utilizado em abreviações do Emmet que iniciam com `-`. Defina como string vazia para sempre evitar o prefixo 'moz'.",
- 	"emmetPreferencesCssOProperties": "Propriedades CSS separadas por vírgula que recebem o prefixo vendor 'o' quando utilizado em abreviações do Emmet que iniciam com `-`. Defina como string vazia para sempre evitar o prefixo 'o'.",
- 	"emmetPreferencesCssMsProperties": "Propriedades CSS separadas por vírgula que recebem o prefixo vendor 'ms' quando utilizado em abreviações do Emmet que iniciam com `-`. Defina como string vazia para sempre evitar o prefixo 'ms'.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "A pontuação mínima (de 0 a 1) que a abreviação difusa deve alcançar. Os valores mais baixos podem produzir muitas correspondências falso-positivas, valores mais elevados podem reduzir possíveis correspondências.\n",
- 	"emmetOptimizeStylesheetParsing": "Quando definido como false, o arquivo inteiro é analisado para determinar se a posição atual é válida para expandir as abreviações Emmet. Quando definido como true, somente o conteúdo em torno da posição atual em arquivos css / scss / less é analisado."
-+=======
-+	"emmetPreferencesCssWebkitProperties": "Propriedades css separadas por vírgula que obtém o prefixo do fornecedor webkit quando usadas em abreviações emmet que começam com `-`. Deixe vazio para prevenir o prefixo webkit sempre.",
-+	"emmetPreferencesCssMozProperties": "Propriedades css separadas por vírgula que obtém o prefixo do fornecedor moz quando usadas em abreviações emmet que começam com `-`. Deixe vazio para prevenir o prefixo moz sempre.",
-+	"emmetPreferencesCssOProperties": "Propriedades css separadas por vírgula que obtém o prefixo do fornecedor 'o' quando usadas em abreviações emmet que começam com `-`. Deixe vazio para prevenir o prefixo 'o' sempre.",
-+	"emmetPreferencesCssMsProperties": "Propriedades css separadas por vírgula que obtém o prefixo do fornecedor ms quando usadas em abreviações emmet que começam com `-`. Deixe vazio para prevenir o prefixo ms sempre."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 0e3ae33fa0e51f44408229e281cf6c6c77269609 i18n/ptb/extensions/git/out/commands.i18n.json
-  our    100644 614b7d0fe2aa5964fe65add6e8d1ab893a154db4 i18n/ptb/extensions/git/out/commands.i18n.json
-  their  100644 c27be95a1833b4813304a55e7d2b6fe9142b664b i18n/ptb/extensions/git/out/commands.i18n.json
-@@ -10,7 +10,15 @@
- 	"remote branch at": "Ramo remoto em {0}",
- 	"create branch": "$(plus) criar nova ramificação",
- 	"repourl": "URL do repositório",
-+<<<<<<< .our
- 	"cloning": "Clonando repositório git '{0}'...",
-+=======
-+	"parent": "Diretório pai",
-+	"cancel": "$(sync~spin) Clonando o repositório... Clique para cancelar",
-+	"cancel tooltip": "Cancelar o clone",
-+	"cloning": "Clonando repositório do Git...",
-+	"openrepo": "Abrir Repositório",
-+>>>>>>> .their
- 	"proposeopen": "Gostaria de abrir o repositório clonado?",
- 	"openrepo": "Abrir Repositório",
- 	"init": "Escolher a pasta de trabalho para inicializar o git repo",
-changed in both
-  base   100644 f6eebe27271135df9a5d50d87607eb404ede7cd2 i18n/ptb/extensions/git/out/model.i18n.json
-  our    100644 39e57632fd80437ac1efdf00f90158fc55ceb67d i18n/ptb/extensions/git/out/model.i18n.json
-  their  100644 d15bf0fdcf0c6235fd793385690836f06155d646 i18n/ptb/extensions/git/out/model.i18n.json
-@@ -6,7 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"too many submodules": "O repositório '{0}' possui submódulos {1} que não serão abertos automaticamente. Você ainda pode abrir cada um individualmente abrindo um arquivo dentro dele.",
-+=======
-+>>>>>>> .their
- 	"no repositories": "Não existem repositórios disponíveis",
- 	"pick repo": "Escolha um repositório"
- }
-\ No newline at end of file
-changed in both
-  base   100644 983c5d1d8cc7820da68a8f4c95db27acbc109433 i18n/ptb/extensions/git/out/repository.i18n.json
-  our    100644 ee4b84c24042f8a1bb30756b849d017dd6de9b1e i18n/ptb/extensions/git/out/repository.i18n.json
-  their  100644 de9d848c8ae6bdda47e341c8437d50a2601d536f i18n/ptb/extensions/git/out/repository.i18n.json
-changed in both
-  base   100644 9a2e18d19d13aa2732257699112d866c935a51bd i18n/ptb/extensions/git/package.i18n.json
-  our    100644 6ab84324adbad521926986bc352591224f0e601f i18n/ptb/extensions/git/package.i18n.json
-  their  100644 c227444506dcf7c8186a1086da5d8c4841089faf i18n/ptb/extensions/git/package.i18n.json
-@@ -75,9 +75,14 @@
- 	"config.decorations.enabled": "Controla se o Git contribui cores e emblemas para o explorer e visualizador de editores abertos.",
- 	"config.promptToSaveFilesBeforeCommit": "Controla se o Git deve verificar arquivos não salvos antes do Commit.",
- 	"config.showInlineOpenFileAction": "Controla se deve mostrar uma ação Abrir Arquivo em linha na visualização de alterações do Git.",
-+<<<<<<< .our
- 	"config.inputValidation": "Controla quando exibir validação do campo de mensagem do commit.",
- 	"config.detectSubmodules": "Controla se deve detectar automaticamente os sub-módulos do git.",
- 	"config.detectSubmodulesLimit": "Controla o limite de sub-módulos git detectados.",
-+=======
-+	"config.inputValidation": "Controla quando mostrar a validação de entrada no contador de entrada.",
-+	"config.detectSubmodules": "Controla se deve detectar automaticamente os sub-módulos do git.",
-+>>>>>>> .their
- 	"colors.modified": "Cor para recursos modificados.",
- 	"colors.deleted": "Cor para recursos excluídos.",
- 	"colors.untracked": "Cor para recursos não controlados.",
-changed in both
-  base   100644 6c1e3e438e511ddfe7da5ec4e93af4331ec1c439 i18n/ptb/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  our    100644 ff2a8afaccd1bc003911e136e3320e37fddd4380 i18n/ptb/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  their  100644 ac8dfbea0443b223bd52c12e0cdd73fc0881eba8 i18n/ptb/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-@@ -7,6 +7,7 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"previewOnGitHub": "Pré-visualizar no GitHub",
-+<<<<<<< .our
- 	"loadingData": "Carregando dados...",
- 	"rateLimited": "Limite de consulta do GitHub excedido. Por favor, espere.",
- 	"similarIssues": "Problemas semelhantes",
-@@ -25,5 +26,14 @@
- 	"expectedResults": "Resultado Esperado",
- 	"settingsSearchResultsDescription": "Nós suportamos Markdown no padrão GitHub. Você poderá editar o seu problema e adicionar capturas de tela quando nós o pré-visualizarmos no GitHub. ",
- 	"pasteData": "Nós escrevemos os dados necessários em sua área de transferência porque era muito grande para ser enviado. Por favor, Cole.",
-+=======
-+	"similarIssues": "Problemas semelhantes",
-+	"noResults": "Nenhum resultado encontrado",
-+	"rateLimited": "Taxa de limite da API excedida",
-+	"stepsToReproduce": "Etapas para Reproduzir",
-+	"bugDescription": "Como você encontrou este problema? Quais são as etapas que você precisa realizar para reproduzir de forma confiável o problema? O que você espera que acontece e o que acontece no momento?",
-+	"performanceIssueDesciption": "Quando este problema de performance aconteceu? Por exemplo, isto ocorre na inicialização ou após uma certa série de ações? Qualquer detalhe que você puder nos dar ajuda na nossa investigação.",
-+	"description": "Descrição",
-+>>>>>>> .their
- 	"disabledExtensions": "Extensões estão desabilitadas"
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ptb/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  our    100644 3d6196327402f2f599bf6fbd52c22d20ce00ad67 i18n/ptb/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  their  100644 ba6304224cc2b2bdc9ae80c355a2262e38f3298b i18n/ptb/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-@@ -7,6 +7,7 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"completeInEnglish": "Por favor, preencha o formulário em inglês.",
-+<<<<<<< .our
- 	"issueTypeLabel": "Isso é um",
- 	"issueSourceLabel": "Arquivo na",
- 	"vscode": "Visual Studio Code",
-@@ -18,4 +19,25 @@
- 	"issueTitleRequired": "Por favor, digite um título.",
- 	"titleLengthValidation": "O título é muito longo.",
- 	"details": "Por favor informe detalhes."
-+=======
-+	"issueTypeLabel": "Eu quero enviar um",
-+	"bugReporter": "Relatório de Bug",
-+	"performanceIssue": "Problema de Performance",
-+	"featureRequest": "Solicitação de recurso",
-+	"issueTitleLabel": "Título",
-+	"issueTitleRequired": "Por favor, digite um título.",
-+	"vscodeVersion": "Versão do VS Code",
-+	"osVersion": "Versão do sistema operacional",
-+	"systemInfo": "Minhas Informações do Sistema",
-+	"sendData": "Enviar meus dados",
-+	"processes": "Processos Atualmente em Execução",
-+	"workspaceStats": "Minhas Estatísticas do Espaço de Trabalho",
-+	"extensions": "Minhas extensões",
-+	"tryDisablingExtensions": "O problema é reprodutível quando as extensões são desativados",
-+	"disableExtensions": "desabilitando todas as extensões e recarregando a janela",
-+	"showRunningExtensions": "ver todas as extensões em execução",
-+	"githubMarkdown": "Nós suportamos Markdown no padrão GitHub. Você poderá editar o seu problema e adicionar capturas de tela quando nós o pré-visualizarmos no GitHub.",
-+	"issueDescriptionRequired": "Por favor, digite uma descrição.",
-+	"loadingData": "Carregando dados..."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ptb/src/vs/code/electron-main/logUploader.i18n.json
-  our    100644 0d8ffc448c9e6b47e6a87117e87ec1d092f7383c i18n/ptb/src/vs/code/electron-main/logUploader.i18n.json
-  their  100644 7d2a0454290340c26b48c718e4dbeb571a02873a i18n/ptb/src/vs/code/electron-main/logUploader.i18n.json
-@@ -9,10 +9,18 @@
- 	"invalidEndpoint": "Destino para envio do log é inválido.",
- 	"beginUploading": "Enviando...",
- 	"didUploadLogs": "Envio bem-sucedido! ID do arquivo de Log: {0}",
-+<<<<<<< .our
- 	"logUploadPromptHeader": "Você está prestes a fazer o envio de seus logs de sessão para um ponto de extremidade seguro da Microsoft e que apenas membros da equipe Microsoft e do time VS Code podem acessar.",
- 	"logUploadPromptBody": "Logs de sessão podem conter informações pessoais como caminhos completos ou conteúdos de arquivos. Por favor revise e elimine seus arquivos de log de sessão aqui: '{0}'",
- 	"logUploadPromptBodyDetails": "Ao continuar você confirma que você revisou e eliminou seus arquivos de log de sessão e que você concorda que a Microsoft use eles para depurar o VS Code.",
- 	"logUploadPromptAcceptInstructions": "Por favor execute o code com '--upload-logs={0}' para proceder com o upload",
-+=======
-+	"userDeniedUpload": "Envio cancelado",
-+	"logUploadPromptHeader": "Enviar logs de sessão para um destino seguro?",
-+	"logUploadPromptBody": "Por favor revise seus arquivos de log aqui: '{0}'",
-+	"logUploadPromptBodyDetails": "Os logs podem conter informações pessoais, como caminhos completos e o conteúdo do arquivo.",
-+	"logUploadPromptKey": "Eu revi meus logs (digite 'y' para confirmar o envio)",
-+>>>>>>> .their
- 	"postError": "Erro ao postar logs: {0}",
- 	"responseError": "Erro ao postar logs. Recebido {0} — {1}",
- 	"parseError": "Erro ao analisar a resposta",
-changed in both
-  base   100644 154a6fdf47cf42db3d3e984f408caae45f4e34b3 i18n/ptb/src/vs/code/electron-main/menus.i18n.json
-  our    100644 a0ea065a8bc82783d33d375e03e02641423e3c6a i18n/ptb/src/vs/code/electron-main/menus.i18n.json
-  their  100644 48234ffe3c81aff626c180a1728910452860c77f i18n/ptb/src/vs/code/electron-main/menus.i18n.json
-changed in both
-  base   100644 99e86baf79ad8f33658a0599f960cd6fa799e457 i18n/ptb/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 6c41dd22a5af7308ee2eafe191d717bc6243ff1f i18n/ptb/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 d31266adb34966ec298ad0044b7e0364476bf492 i18n/ptb/src/vs/editor/common/config/commonEditorConfig.i18n.json
-changed in both
-  base   100644 5c542087a0cede76ad3373cb28d73da97254c238 i18n/ptb/src/vs/platform/list/browser/listService.i18n.json
-  our    100644 e21fa3376d249cf9bc8e4af3bb592365ae4e914a i18n/ptb/src/vs/platform/list/browser/listService.i18n.json
-  their  100644 0d4902c10e251c2bd4816662f507042dbc8dc1fc i18n/ptb/src/vs/platform/list/browser/listService.i18n.json
-@@ -12,6 +12,10 @@
- 	"multiSelectModifier": "O modificador deve ser usado para adicionar um item nas listas e árvores para uma multi-seleção com o mouse (por exemplo, no explorador, editores abertos e exibição scm). 'ctrlCmd' mapeia para 'Control' no Windows e Linux e 'Command' no macOS. Os gestos do mouse 'Aberto ao lado' - se suportado - irá adaptar-se de tal forma que eles não entrem em conflito com o modificador de várias seleções.",
- 	"openMode.singleClick": "Abre os itens em um único clique do mouse.",
- 	"openMode.doubleClick": "Abre os itens com duplo clique do mouse. ",
-+<<<<<<< .our
- 	"openModeModifier": "Controla como abrir itens em árvores e listas usando o mouse (se suportado). Definido como 'singleClick' para abrir itens com um único clique do mouse e 'doubleClick' para abrir somente através do duplo clique do mouse. Para os pais com filhos em árvores, essa configuração controla se um único clique expande o pai ou um clique duplo. Note que algumas árvores e listas podem optar por ignorar essa configuração, se não for aplicável. ",
- 	"horizontalScrolling setting": "Controla se as árvores suportam a rolagem horizontal na área de trabalho."
-+=======
-+	"openModeModifier": "Controla como abrir itens em árvores e listas usando o mouse (se suportado). Definido como 'singleClick' para abrir itens com um único clique do mouse e 'doubleClick' para abrir somente através do duplo clique do mouse. Para os pais com filhos em árvores, essa configuração controla se um único clique expande o pai ou um clique duplo. Note que algumas árvores e listas podem optar por ignorar essa configuração, se não for aplicável. "
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 0e2720fc721dd94f338c9a67dae51e222e574718 i18n/ptb/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
-  our    100644 d65e8370bed4d8fca66c65ae333b8cc81b90f0f2 i18n/ptb/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
-  their  100644 bfe39400384d772b4d4fc6cd9e80d862054cacb3 i18n/ptb/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
-@@ -11,7 +11,12 @@
- 	"sizeMB": "{0}MB",
- 	"sizeGB": "{0}GB",
- 	"sizeTB": "{0}TB",
-+	"largeImageError": "O tamanho do arquivo da imagem é muito grande (>1MB) para exibir no editor. ",
- 	"resourceOpenExternalButton": "Abrir imagem usando um programa externo?",
-+<<<<<<< .our
-+=======
-+	"nativeBinaryError": "O arquivo não pode ser exibido no editor porque é binário, muito grande ou usa uma codificação de texto sem suporte.",
-+>>>>>>> .their
- 	"zoom.action.fit.label": "Toda a imagem",
- 	"imgMeta": "{0}x{1} {2}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 11981b2a3b0048af4cad0404ca0e37447991a16d i18n/ptb/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 15dd21d37a31b843a88f5eb322486062a4b034bf i18n/ptb/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 8e0fd4bd71050d540baff1eb93afcd4edfecde8a i18n/ptb/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,7 +35,10 @@
- 	"panelDefaultLocation": "Controla o local padrão do painel. Pode ser visualizado na parte inferior ou no lado direito da área de trabalho.",
- 	"statusBarVisibility": "Controla a visibilidade da barra de status na parte inferior da área de trabalho.",
- 	"activityBarVisibility": "Controla a visibilidade da barra de atividades na área de trabalho.",
-+<<<<<<< .our
- 	"viewVisibility": "Controla a visibilidade das ações do cabeçalho de exibição. Ações de cabeçalho de exibição podem ser sempre visíveis ou somente visíveis quando a exibição tiver o foco ou quando passar o mouse.",
-+=======
-+>>>>>>> .their
- 	"fontAliasing": "Controla o método de aliasing da fonte na área de trabalho.\n- default: Suavização de fonte por Sub-pixel. Na maioria das telas não-retina, este fornecerá o texto mais nítido\n- antialiased: Suavização da fontes no nível do pixel, oposto ao subpixel. Pode fazer a fonte parecer mais fina/clara no geral.\n- none: Desabilita a suavização de fonte. O texto será mostrado com bordas pixeladas.\n- auto: Aplica `default` ou `antialiased` automaticamente baseado no DPI das telas.",
- 	"workbench.fontAliasing.default": "Suavização de fonte subpixel. Na maioria dos monitores não-retina isto mostrará o texto mais nítido.",
- 	"workbench.fontAliasing.antialiased": "Suavizar a fonte no nível do pixel, em oposição a subpixel. Pode fazer com que a fonte apareça mais clara de uma forma geral.",
-changed in both
-  base   100644 2295e891db0c48a4a9afe9b336bd51a85c534381 i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-  our    100644 09a259f9132826c373aa270e4619976026e0ed30 i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-  their  100644 6d03421bc473fa5326d2e783942091833229c2f9 i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-@@ -6,6 +6,39 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
-+=======
-+	"vscode.extension.contributes.debuggers": "Contribui adaptadores de depuração.",
-+	"vscode.extension.contributes.debuggers.type": "Identificador único para esse adaptador de depuração.",
-+	"vscode.extension.contributes.debuggers.label": "Nome de exibição para esse adaptador de depuração.",
-+	"vscode.extension.contributes.debuggers.program": "Caminho para o programa adaptador de depuração. O caminho pode ser absoluto ou relativo à pasta de extensão.",
-+	"vscode.extension.contributes.debuggers.args": "Argumentos opcionais a serem informados para o adaptador.",
-+	"vscode.extension.contributes.debuggers.runtime": "Runtime opcional no caso do atributo do programa não ser um executável, mas requerer um runtime.",
-+	"vscode.extension.contributes.debuggers.runtimeArgs": "Argumentos opcionais do runtime.",
-+	"vscode.extension.contributes.debuggers.variables": "Mapeamento de variáveis interativas (por exemplo ${action.pickProcess}) em 'launch.json' para um comando.",
-+	"vscode.extension.contributes.debuggers.initialConfigurations": "Configurações para gerar o 'launch.json' inicial.",
-+	"vscode.extension.contributes.debuggers.languages": "Lista de idiomas para os quais a extensão de depuração pode ser considerada o \"depurador padrão\".",
-+	"vscode.extension.contributes.debuggers.adapterExecutableCommand": "Se especificado VS Code chamará este comando para determinar o caminho do executável do adaptador de depuração e os argumentos para passar.",
-+	"vscode.extension.contributes.debuggers.configurationSnippets": "Trechos de código para adicionar novas configurações em 'launch.json'.",
-+	"vscode.extension.contributes.debuggers.configurationAttributes": "Configurações de esquema JSON para validar 'launch.json'.",
-+	"vscode.extension.contributes.debuggers.windows": "Configurações específicas do Windows.",
-+	"vscode.extension.contributes.debuggers.windows.runtime": "Runtime usado para Windows.",
-+	"vscode.extension.contributes.debuggers.osx": "Configurações específicas para macOS.",
-+	"vscode.extension.contributes.debuggers.osx.runtime": "Runtime usado para o macOS.",
-+	"vscode.extension.contributes.debuggers.linux": "Configurações específicas do Linux.",
-+	"vscode.extension.contributes.debuggers.linux.runtime": "Runtime usado para o Linux.",
-+	"vscode.extension.contributes.breakpoints": "Contribui aos pontos de interrupção.",
-+	"vscode.extension.contributes.breakpoints.language": "Permitir pontos de parada para este idioma.",
-+	"app.launch.json.title": "Executar",
-+	"app.launch.json.version": "Versão deste formato de arquivo.",
-+	"app.launch.json.configurations": "Lista de configurações. Adicionar novas configurações ou editar as existentes usando o IntelliSense.",
-+	"app.launch.json.compounds": "Lista de compostos. Cada composto faz referência a várias configurações que vão ser executadas juntas.",
-+	"app.launch.json.compound.name": "Nome do composto. Aparece no menu drop-down da configuração de execução.",
-+	"useUniqueNames": "Por favor, use nomes únicos de configuração.",
-+	"app.launch.json.compound.folder": "Nome da pasta em que o composto se encontra.",
-+	"app.launch.json.compounds.configurations": "Nomes das configurações que serão iniciadas como parte deste composto.",
-+	"debugNoType": "'type' do adaptador de depuração não pode ser omitido e deve ser do tipo 'string'.",
-+>>>>>>> .their
- 	"selectDebug": "Selecione o ambiente",
- 	"DebugConfig.failed": "Não é possível criar o arquivo 'launch.json' dentro da pasta '.vscode' ({0}).",
- 	"workspace": "espaço de trabalho",
-changed in both
-  base   100644 7ae697429f62ea1eaba74e1622800cefe119d7ee i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 7ae7f7f9b7576297c381fe538464cf315327a1cf i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 4b9589da38dc9676e2f644dfdc6d03e9cdce84c4 i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -14,7 +14,11 @@
- 	"breakpointRemoved": "Ponto de interrupção removido, linha {0}, arquivo {1}",
- 	"compoundMustHaveConfigurations": "Composição deve ter o atributo \"configurations\" definido para iniciar várias configurações.",
- 	"noConfigurationNameInWorkspace": "Não foi possível encontrar a configuração de inicialização '{0}' na área de trabalho.",
-+<<<<<<< .our
- 	"multipleConfigurationNamesInWorkspace": "Existem múltiplas configurações de lançamento '{0}' na área de trabalho. Use o nome da pasta para qualificar a configuração.",
-+=======
-+	"multipleConfigurationNamesInWorkspace": "Existem várias configurações de inicialização `{0}` na área de trabalho. Use o nome da pasta para qualificar a configuração.",
-+>>>>>>> .their
- 	"noFolderWithName": "Não é possível encontrar a pasta com nome '{0}' para configuração '{1}' no composto '{2}'.",
- 	"configMissing": "Configuração '{0}' não tem 'launch.json'.",
- 	"launchJsonDoesNotExist": "'launch.json' não existe.",
-@@ -26,7 +30,13 @@
- 	"preLaunchTaskErrors": "Erros de build foram detectados durante a preLaunchTask '{0}'.",
- 	"preLaunchTaskError": "Erro de build foi detectado durante a preLaunchTask '{0}'.",
- 	"preLaunchTaskExitCode": "A preLaunchTask '{0}' encerrada com código de saída {1}.",
-+<<<<<<< .our
- 	"showErrors": "Mostrar erros",
-+=======
-+	"debugAnyway": "Depurar mesmo assim",
-+	"showErrors": "Mostrar erros",
-+	"cancel": "Cancelar",
-+>>>>>>> .their
- 	"noFolderWorkspaceDebugError": "O arquivo ativo não pode ser depurado. Certifique-se de que ele está salvo no disco e que tem uma extensão de depuração instalada para esse tipo de arquivo.",
- 	"cancel": "Cancelar",
- 	"DebugTaskNotFound": "Não foi possível encontrar a tarefa '{0}'.",
-changed in both
-  base   100644 93bffeeb47882d65bdfe0efe9c2ed017f35b9139 i18n/ptb/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-  our    100644 e3b5d73f94162b555af8494e148c9f93611860f7 i18n/ptb/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-  their  100644 a52b1047cff0226507a28877f41e30ddac5d53f7 i18n/ptb/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-changed in both
-  base   100644 b1834cc7440e1f7db3ce955f4d15a45c8e10bdc9 i18n/ptb/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 86302d2d21747526427ebd222c88651b42924842 i18n/ptb/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 8b2c7c944f030d9be1e57a933bce17a8d0625307 i18n/ptb/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-@@ -55,10 +55,16 @@
- 	"OpenExtensionsFile.failed": "Não foi possível criar o arquivo 'extensions.json' na pasta '.vscode' ({0}).",
- 	"configureWorkspaceRecommendedExtensions": "Configurar Extensões Recomendadas (Espaço de Trabalho)",
- 	"configureWorkspaceFolderRecommendedExtensions": "Configurar as Extensões Recomendadas (Pasta do Espaço de Trabalho)",
-+<<<<<<< .our
- 	"malicious tooltip": "Esta extensão foi relatada como problemática.",
- 	"malicious": "Malicioso",
- 	"disabled": "Desativado",
- 	"disabled globally": "Desativado",
-+=======
-+	"builtin": "Intrínseco",
-+	"malicious tooltip": "Esta extensão foi relatada como problemática.",
-+	"malicious": "Malicioso",
-+>>>>>>> .their
- 	"disableAll": "Desabilitar Todas as Extensões Instaladas",
- 	"disableAllWorkspace": "Desabilitar Todas as Extensões Instaladas para este Espaço de Trabalho",
- 	"enableAll": "Ativar Todas as Extensões",
-changed in both
-  base   100644 2094165fc607cb8613ebafbf1cbf574b298f1ab1 i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-  our    100644 24347d5855b023b8e91ea62b53273fb16d8840fd i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-  their  100644 be23328ded4bb8ca05b887048e1f1201649b058d i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-@@ -6,7 +6,11 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"restart3": "Reiniciar",
- 	"cancel": "Cancelar",
-+=======
-+	"noPro": "Para extensões de perfil, inicie com `--inspect-extensions=<port>`.",
-+>>>>>>> .their
- 	"selectAndStartDebug": "Clique para parar a perfilação."
- }
-\ No newline at end of file
-changed in both
-  base   100644 f408e23113a403845dac2314e0c45878f64f08a4 i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 ddb9ffa28f8d3daf13de0c0b7197d8da53424c16 i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 5e7b74b3f194062018e910ba2835ebbd4c7fe469 i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -10,8 +10,12 @@
- 	"searchMarketplace": "Pesquisar na Loja",
- 	"dynamicWorkspaceRecommendation": "Esta extensão pode interessá-lo porque é popular entre os usuários do repositório {0}.",
- 	"exeBasedRecommendation": "Esta extensão é recomendada porque você tem {0} instalado.",
-+<<<<<<< .our
- 	"fileBasedRecommendation": "Esta extensão é recomendada baseada nos arquivos que você abriu recentemente.",
- 	"workspaceRecommendation": "Esta extensão é recomendada pelos usuários da área de trabalho atual.",
-+=======
-+	"dynamicWorkspaceRecommendation": "Esta extensão pode lhe interessar porque muitos outros usuários da área de trabalho atual o usam.",
-+>>>>>>> .their
- 	"reallyRecommended2": "A extensão {0} é recomendada para este tipo de arquivo.",
- 	"reallyRecommendedExtensionPack": "O pacote de extensão '{0}' é recomendado para este tipo de arquivo.",
- 	"install": "Instalar",
-changed in both
-  base   100644 8bca69e9d6f9c913b7c39dfdcaf075b01690401b i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  our    100644 5d4dd840e849e249d4865eeefa45bd80e7e4150d i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  their  100644 963936e2ac1ccf84da6c3e5e371c00b0923e987f i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-changed in both
-  base   100644 af4d27f2511472013780e21126a438b0bf004031 i18n/ptb/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
-  our    100644 891a02ad1100292b39ae4d2e425da66b04670479 i18n/ptb/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
-  their  100644 8a0b641b61a56242041621acf3db80dd428483c4 i18n/ptb/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
-changed in both
-  base   100644 55df51eb748860f3fb8b82342e88f3e9bf2319d0 i18n/ptb/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  our    100644 2eb83b4affdb1796e75bcf3cb50b217b75722be9 i18n/ptb/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  their  100644 0d7d41515edac55548c34f3142bd69e59680e876 i18n/ptb/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-changed in both
-  base   100644 0823852bb7253578bee3a42592c40fb5413d6cc5 i18n/ptb/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  our    100644 b2078df07b5c6284fbc5990b42bd61e34ecf26bf i18n/ptb/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  their  100644 4d49c59b0726265b9b7ea7919e70b68bab8d933a i18n/ptb/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-changed in both
-  base   100644 292914da17b205000633c1ce0941f4dfd13983b1 i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-  our    100644 6036183487d6a519b023a104517bef0e395b1b06 i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-  their  100644 1c1c058a5fdabcf91cc5b32e1e2401c3d0638b45 i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-changed in both
-  base   100644 e7fbef22668c49414cea8b0effb2d5fd43bb771b i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 d9d0d18805d748d7acf0de5557a30b4d38564784 i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 bc9c2cc221615f1010fb9dc430d368438b1c1d64 i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -9,7 +9,10 @@
- 	"emptyUserSettingsHeader": "Coloque as suas configurações aqui para substituir as configurações padrão.",
- 	"emptyWorkspaceSettingsHeader": "Coloque as suas configurações aqui para substituir as configurações de usuário.",
- 	"emptyFolderSettingsHeader": "Coloque as suas configurações de pasta aqui para substituir aqueles das configurações do espaço de trabalho.",
-+<<<<<<< .our
- 	"reportSettingsSearchIssue": "Reportar Problema",
-+=======
-+>>>>>>> .their
- 	"newExtensionLabel": "Mostrar Extensão \"{0}\"",
- 	"editTtile": "Editar",
- 	"replaceDefaultValue": "Substituir nas Configurações",
-changed in both
-  base   100644 a893064e612a4923fb54ecb4e8e05ad90a003b4d i18n/ptb/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 ba5b86d8773fd55c24bc979c0c74cb81491c0258 i18n/ptb/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 31c522acb513676f4346bd43c06f9807350edb69 i18n/ptb/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-changed in both
-  base   100644 c195bbf66f5167a6af698d0def54a97866b2bc2d i18n/ptb/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 08831e79b99c984b5f938c4d959c75ada794a1e4 i18n/ptb/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 1393b24718680bad84dab012821f1f2e6f337a2a i18n/ptb/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -29,5 +29,9 @@
- 	"search.quickOpen.includeSymbols": "Configurar para incluir resultados de uma pesquisa símbolo global nos resultados do arquivo para Abertura Rápida.",
- 	"search.followSymlinks": "Controla quando seguir symlinks ao realizar uma busca.",
- 	"search.smartCase": "Faz pesquisas do tipo case-insensitive se o termo for totalmente minúsculo, caso contrário, faz pesquisas do tipo case-sensitive.",
-+<<<<<<< .our
- 	"search.globalFindClipboard": "Controla se a visualização de busca deve ler ou modificar a área de transferência de busca compartilhada no macOS"
-+=======
-+	"search.globalFindClipboard": "Controla se a ferramenta Pesquisa deve ler ou modificar a área de transferência de localização compartilhada no macOS"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 46dfeebc8bce763d70e7d823cb256f7d7c665581 i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 7cef3aef4bdefc5b4dd7af02da577643f2895b13 i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 36d63910548e25adfb6cc167411a323a1b360a28 i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-changed in both
-  base   100644 488a2ef16e86c317e8447ef5cc65cf3d30532dad i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 a7fcbfe8b12598411b8516f57bb30b642834b0bc i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 5b52e9f9a123aefd7b46d13c9dccbaeac1b0b1fc i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-changed in both
-  base   100644 fac36990a6e86a0265d8c874897365778cf4484b i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-  our    100644 60f3bd6d88807107ae96271d64c563653f239a49 i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-  their  100644 c10ece55c3c2e25e4f1573764ba5efe839a21f5c i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-@@ -8,9 +8,13 @@
- 	],
- 	"terminal.integrated.a11yBlankLine": "Linha em branco",
- 	"terminal.integrated.a11yPromptLabel": "Entrada do terminal",
-+<<<<<<< .our
- 	"yes": "Sim",
- 	"no": "Não",
- 	"dontShowAgain": "Não mostrar novamente",
-+=======
-+	"terminal.integrated.a11yTooMuchOutput": "Muita saída para anunciar, navegue até as linhas manualmente para ler",
-+>>>>>>> .their
- 	"terminal.integrated.copySelection.noSelection": "O terminal não tem nenhuma seleção para copiar",
- 	"terminal.integrated.exitedWithCode": "O processo terminal encerrado com código de saída: {0}",
- 	"terminal.integrated.waitOnExit": "Pressione qualquer tecla para fechar o terminal"
-changed in both
-  base   100644 4be73852e283421b0c2782dc154b148c2b5fe883 i18n/ptb/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json
-  our    100644 1e3efb198af459c03549b90cee66634ddf0269b0 i18n/ptb/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json
-  their  100644 a07ea36500caa1fe06d5c9c48a8582b03aa5969e i18n/ptb/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json
-@@ -6,5 +6,12 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"release notes": "Notas da versão"
-+=======
-+	"release notes": "Notas da versão",
-+	"updateConfigurationTitle": "Atualizar",
-+	"updateChannel": "Configurar se você recebe atualizações automáticas de um canal de atualização. Requer uma reinicialização depois da mudança.",
-+	"enableWindowsBackgroundUpdates": "Ativa as atualizações no plano de fundo no Windows."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 0079d5ea17dc1e55d72a207603903713aa28360a i18n/ptb/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 da6e72a8a9829b085b81f04ac2a19502d69acb6e i18n/ptb/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 e9f37d81d129923583ade31f534b2c62e50bb0bd i18n/ptb/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -16,10 +16,16 @@
- 	"noUpdatesAvailable": "Não há nenhuma atualização disponível no momento.",
- 	"ok": "OK",
- 	"thereIsUpdateAvailable": "Há uma atualização disponível.",
-+<<<<<<< .our
- 	"download now": "Baixar agora",
- 	"later": "Mais tarde",
- 	"installUpdate": "Instalar Atualização",
- 	"updateAvailableAfterRestart": "Reinicie o {0} para aplicar a atualização mais recente.",
-+=======
-+	"installUpdate": "Instalar Atualização",
-+	"updateAvailable": "Há uma atualização disponível: {0} {1}",
-+	"updateInstalling": "{0} {1} está sendo instalado no plano de fundo, nós te avisaremos quando estiver pronto.",
-+>>>>>>> .their
- 	"updateNow": "Atualizar Agora",
- 	"commandPalette": "Paleta de comandos...",
- 	"settings": "Configurações",
-changed in both
-  base   100644 271852db3ea0a2e21dd490fd2486b4bf2fe56dca i18n/rus/extensions/emmet/package.i18n.json
-  our    100644 e8a08df3b0fb514f0bab0b0d555c900a23a3deca i18n/rus/extensions/emmet/package.i18n.json
-  their  100644 1371e1159a90bd257304202a53f83ba3f4c01816 i18n/rus/extensions/emmet/package.i18n.json
-@@ -56,10 +56,17 @@
- 	"emmetPreferencesFormatNoIndentTags": "Массив имен тегов, для которых не следует использовать внутренние отступы",
- 	"emmetPreferencesFormatForceIndentTags": "Массив имен тегов, для которых всегда следует использовать внутренние отступы",
- 	"emmetPreferencesAllowCompactBoolean": "Если этот параметр имеет значение true, формируется компактная запись логических атрибутов",
-+<<<<<<< .our
- 	"emmetPreferencesCssWebkitProperties": "Разделенный запятыми список свойств CSS, которые получают префикс разработчика \"webkit\" при использовании в сокращениях Emmet, которые начинаются с \"-\". Чтобы префикс  \"webkit\" никогда не подставлялся, установите в качестве этого параметра пустое значение.",
- 	"emmetPreferencesCssMozProperties": "Разделенный запятыми список свойств CSS, которые получают префикс разработчика \"moz\" при использовании в сокращениях Emmet, которые начинаются с \"-\". Чтобы префикс \"moz\" никогда не подставлялся, установите в качестве этого параметра пустое значение. ",
- 	"emmetPreferencesCssOProperties": "Разделенный запятыми список свойств CSS, которые получают префикс разработчика \"o\" при использовании в сокращениях Emmet, которые начинаются с \"-\". Чтобы префикс \"o\" никогда не подставлялся, установите в качестве этого параметра пустое значение. ",
- 	"emmetPreferencesCssMsProperties": "Разделенный запятыми список свойств CSS, которые получают префикс разработчика \"ms\" при использовании в сокращениях Emmet, которые начинаются с \"-\". Чтобы префикс \"ms\" никогда не подставлялся, установите в качестве этого параметра пустое значение. ",
- 	"emmetPreferencesCssFuzzySearchMinScore": "Минимальное количество очков для нечеткого соответствия сокращения (от 0 до 1). При указании более низких значений возможно увеличение числа ложных срабатываний, при указании более высоких значений - уменьшение числа возможных соответствий.",
- 	"emmetOptimizeStylesheetParsing": "Если значение равно false, весь файл анализируется для определения, является ли текущая позиция допустимой для расширения сокращений Emmet. Когда присвоено значение true, только содержимое вокруг текущей позиции в файлах css/scss/less подвергается синтаксическому анализу."
-+=======
-+	"emmetPreferencesCssWebkitProperties": "Разделенный запятыми список свойств CSS, которые получают префикс разработчика веб-пакета при использовании в сокращениях Emmet, которые начинаются с \"-\". Чтобы префикс веб-пакета никогда не подставлялся, установите в качестве этого параметра пустое значение.",
-+	"emmetPreferencesCssMozProperties": "Разделенный запятыми список свойств CSS, которые получают префикс разработчика moz при использовании в сокращениях Emmet, которые начинаются с \"-\". Чтобы префикс moz никогда не подставлялся, установите в качестве этого параметра пустое значение. ",
-+	"emmetPreferencesCssOProperties": "Разделенный запятыми список свойств CSS, которые получают префикс разработчика o при использовании в сокращениях Emmet, которые начинаются с \"-\". Чтобы префикс o никогда не подставлялся, установите в качестве этого параметра пустое значение. ",
-+	"emmetPreferencesCssMsProperties": "Разделенный запятыми список свойств CSS, которые получают префикс разработчика ms при использовании в сокращениях Emmet, которые начинаются с \"-\". Чтобы префикс ms никогда не подставлялся, установите в качестве этого параметра пустое значение. "
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d53301e4a67e4ed3d3b3a0ae0da4592fb0b190f1 i18n/rus/extensions/git/out/autofetch.i18n.json
-  our    100644 674a3834cc198d7819143c18bcdd12ed733e4813 i18n/rus/extensions/git/out/autofetch.i18n.json
-  their  100644 fcc8c01bac900bfcb871f0ed55445e249f54229e i18n/rus/extensions/git/out/autofetch.i18n.json
-@@ -7,7 +7,14 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"yes": "Да",
-+<<<<<<< .our
- 	"no": "Нет",
- 	"not now": "Спросить меня позже",
- 	"suggest auto fetch": "Вы хотите, чтобы среда Code [периодически выполняла команду \"git fetch\"]({0})?"
-+=======
-+	"read more": "Подробнее",
-+	"no": "Нет",
-+	"not now": "Спросить меня позже",
-+	"suggest auto fetch": "Вы хотите, чтобы среда Code периодически выполняла команду \"git fetch\"?"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e32644e5e4b0f22b9645604ed6dbc5a3b5035daa i18n/rus/extensions/git/out/commands.i18n.json
-  our    100644 bdd7adadfadc50db48d014178fb19ce838d13900 i18n/rus/extensions/git/out/commands.i18n.json
-  their  100644 ef93bfa4e37539524259b8173dc6369405a58445 i18n/rus/extensions/git/out/commands.i18n.json
-@@ -75,7 +75,11 @@
- 	"ok": "ОК",
- 	"push with tags success": "Файлы с тегами успешно отправлены.",
- 	"pick remote": "Выберите удаленный сервер, на котором нужно опубликовать ветвь \"{0}\":",
-+<<<<<<< .our
- 	"sync is unpredictable": "Это действие отправляет фиксации в \"{0}/{1}\" и извлекает их из этого расположения.",
-+=======
-+	"sync is unpredictable": "Это действие отправляет фиксации в \"{0}\" и извлекает их из этого расположения.",
-+>>>>>>> .their
- 	"never again": "ОК, больше не показывать",
- 	"no remotes to publish": "Для вашего репозитория не настроены удаленные репозитории для публикации.",
- 	"no changes stash": "Отсутствуют изменения, которые необходимо спрятать.",
-changed in both
-  base   100644 5fe9e2f3030fbd9492fc152157e174f529a3ee89 i18n/rus/extensions/git/out/repository.i18n.json
-  our    100644 27ed60f95b9836baa733a4ef0f7b0bab94fe0664 i18n/rus/extensions/git/out/repository.i18n.json
-  their  100644 581b0105606cd5d80d91aaea6cc2e726770c6aff i18n/rus/extensions/git/out/repository.i18n.json
-@@ -30,6 +30,10 @@
- 	"changes": "Изменения",
- 	"commitMessageCountdown": "Осталось {0} знаков в текущей строке",
- 	"commitMessageWarning": "символов {0} над {1} в текущей строке",
-+<<<<<<< .our
-+=======
-+	"ok": "ОК",
-+>>>>>>> .their
- 	"neveragain": "Больше не показывать",
- 	"huge": "Репозиторий git в '{0}' имеет очень много активных изменений, только часть функций Git будет доступна."
- }
-\ No newline at end of file
-changed in both
-  base   100644 9154d1481f651487f7e701dcf9c4060bb4017f26 i18n/rus/extensions/git/package.i18n.json
-  our    100644 f033330e3d5aad5041c41da260339bd159e31636 i18n/rus/extensions/git/package.i18n.json
-  their  100644 07de51d98f592741d3c5079f7f475e6913a7d2cd i18n/rus/extensions/git/package.i18n.json
-@@ -75,9 +75,14 @@
- 	"config.decorations.enabled": "Управляет тем, используются ли цвета и эмблемы Git в проводнике и открытых представлениях редактора.",
- 	"config.promptToSaveFilesBeforeCommit": "Определяет, должен ли Git проверять несохраненные файлы перед фиксацией.",
- 	"config.showInlineOpenFileAction": "Определяет, должно ли отображаться интерактивное действие \"Открыть файл\" в представлении \"Изменения Git\".",
-+<<<<<<< .our
- 	"config.inputValidation": "Определяет, следует ли проверять введенные данные в сообщении фиксации.",
- 	"config.detectSubmodules": "Определяет, следует ли автоматически определять подмодули Git.",
- 	"config.detectSubmodulesLimit": "Управляет ограничением на количество обнаруженных подмодулей Git.",
-+=======
-+	"config.inputValidation": "Определяет, следует ли проверять ввод в счетчике ввода.",
-+	"config.detectSubmodules": "Определяет, следует ли автоматически определять подмодули Git.",
-+>>>>>>> .their
- 	"colors.modified": "Цвет измененных ресурсов.",
- 	"colors.deleted": "Цвет удаленных ресурсов.",
- 	"colors.untracked": "Цвет неотслеживаемых ресурсов.",
-changed in both
-  base   100644 34eeeb68b9e1939b23af1c2089105ba693491832 i18n/rus/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  our    100644 6d3f99cb3bb862ce8d5c4f79bdcea21926967bd4 i18n/rus/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  their  100644 3d4dac7a419b34e97299395f07091928ff687e59 i18n/rus/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-@@ -6,6 +6,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"hide": "скрыть",
- 	"show": "показать",
- 	"previewOnGitHub": "Предварительный просмотр в GitHub",
-@@ -27,5 +28,15 @@
- 	"expectedResults": "Ожидаемые результаты",
- 	"settingsSearchResultsDescription": "Укажите результаты, которые должны быть получены для этого поискового запроса. Поддерживается разметка Markdown в стиле GitHub. Вы можете отредактировать текст проблемы и добавить снимки экрана при просмотре проблемы в GitHub.",
- 	"pasteData": "Мы скопировали необходимые данные в буфер обмена, так как у них был слишком большой размер для отправки. Вставьте эти данные.",
-+=======
-+	"previewOnGitHub": "Предварительный просмотр в GitHub",
-+	"similarIssues": "Похожие проблемы",
-+	"noResults": "Результаты не найдены",
-+	"rateLimited": "Превышено ограничение на частоту использования API",
-+	"stepsToReproduce": "Действия для воспроизведения проблемы",
-+	"bugDescription": "Как вы столкнулись с этой проблемой? Какие шаги необходимо предпринять, чтобы воспроизвести проблему? Что должно было произойти и что произошло на самом деле?",
-+	"performanceIssueDesciption": "Когда возникла эта проблема с производительностью? Например, происходит ли она только при запуске или после выполнения определенных действий? Укажите любые сведения, которые могут помочь в исследовании проблемы.",
-+	"description": "Описание",
-+>>>>>>> .their
- 	"disabledExtensions": "Расширения отключены"
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/rus/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  our    100644 cd7ea704ca059c561476e5115a01c5cebc3018e8 i18n/rus/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  their  100644 df4217a966ad3c3641ba8ffa9e4e8a8a386c031b i18n/rus/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-@@ -7,6 +7,7 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"completeInEnglish": "Заполните форму на английском языке.",
-+<<<<<<< .our
- 	"issueTypeLabel": "Это",
- 	"issueSourceLabel": "Файл в",
- 	"vscode": "Visual Studio Code",
-@@ -25,4 +26,25 @@
- 	"sendExtensions": "Включить сведения об активных расширениях ({0})",
- 	"sendSearchedExtensions": "Отправить сведения о расширениях, для которых выполнялся поиск ({0})",
- 	"sendSettingsSearchDetails": "Отправить сведения о параметрах поиска ({0})"
-+=======
-+	"issueTypeLabel": "Я хочу отправить",
-+	"bugReporter": "Отчет об ошибке",
-+	"performanceIssue": "Проблема с производительностью",
-+	"featureRequest": "Запрос функции",
-+	"issueTitleLabel": "Название",
-+	"issueTitleRequired": "Введите название.",
-+	"vscodeVersion": "Версия VS Code",
-+	"osVersion": "Версия ОС",
-+	"systemInfo": "Информация о системе",
-+	"sendData": "Отправить мои данные",
-+	"processes": "Запущенные процессы",
-+	"workspaceStats": "Статистика моей рабочей области",
-+	"extensions": "Мои расширения",
-+	"tryDisablingExtensions": "Проблему можно воспроизвести, когда расширения отключены",
-+	"disableExtensions": "отключение всех расширений и перезагрузка окна",
-+	"showRunningExtensions": "просмотр всех запущенных расширений",
-+	"githubMarkdown": "Поддерживается разметка Markdown в стиле GitHub. Вы можете отредактировать текст проблемы и добавить снимки экрана при просмотре проблемы в GitHub.",
-+	"issueDescriptionRequired": "Укажите описание.",
-+	"loadingData": "Загрузка данных..."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/rus/src/vs/code/electron-main/logUploader.i18n.json
-  our    100644 34e056e905aad79724bc801a14427307e605d82c i18n/rus/src/vs/code/electron-main/logUploader.i18n.json
-  their  100644 01d56baa3413d29834765a9b00d2050b3f920c29 i18n/rus/src/vs/code/electron-main/logUploader.i18n.json
-@@ -9,10 +9,18 @@
- 	"invalidEndpoint": "Недопустимая конечная точка средства отправки журнала",
- 	"beginUploading": "Отправка...",
- 	"didUploadLogs": "Отправка успешно завершена! Идентификатор файла журнала: {0}",
-+<<<<<<< .our
- 	"logUploadPromptHeader": "Вы собираетесь отправить журналы сеанса в защищенную конечную точку Майкрософт, доступ к которой есть только у участников команды VS Code из Майкрософт.",
- 	"logUploadPromptBody": "Журналы сеансов могут содержать личную информацию, например, полные пути и содержимое файлов. Просмотрите файлы журналов и удалите из них личную информацию здесь: '{0}'",
- 	"logUploadPromptBodyDetails": "Нажимая кнопку \"Продолжить\", вы подтверждаете, что просмотрели файлы журналов сеанса, удалили из них личную информацию и соглашаетесь с тем, что Майкрософт будет использовать эти файлы для отладки VS Code.",
- 	"logUploadPromptAcceptInstructions": "Чтобы продолжить отправку, запустите код с параметром \"--upload-logs={0}\"",
-+=======
-+	"userDeniedUpload": "Отправка отменена",
-+	"logUploadPromptHeader": "Отправить журналы сеанса в защищенную конечную точку?",
-+	"logUploadPromptBody": "Просмотрите файлы журнала здесь: \"{0}\"",
-+	"logUploadPromptBodyDetails": "Журналы могут содержать личную информацию, например, полные пути и содержимое файлов.",
-+	"logUploadPromptKey": "Я просмотрел журналы (нажмите \"y\" для подтверждения отправки)",
-+>>>>>>> .their
- 	"postError": "Ошибка размещения журналов: {0}",
- 	"responseError": "Ошибка размещения журналов. Получено {0} — {1}",
- 	"parseError": "Ошибка разбора ответа",
-changed in both
-  base   100644 d14ec46f24d3f96f8b2acc61c8b0476347988ee9 i18n/rus/src/vs/code/electron-main/menus.i18n.json
-  our    100644 6c6420ff3fff2721736f81d703d8eb2e0907f38c i18n/rus/src/vs/code/electron-main/menus.i18n.json
-  their  100644 2ba5bab4016edae51d9f75e870811a4b69cb9dd4 i18n/rus/src/vs/code/electron-main/menus.i18n.json
-changed in both
-  base   100644 4f8eb69569056561352037613ea5f108bde3ebe2 i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 66cf48db0f575d6b4f93e4e908a24029fed35a72 i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 9ae0f49c8559c49d5519573ec5918559cc38e323 i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -29,8 +29,13 @@
- 	"scrollBeyondLastColumn": "Управляет количеством дополнительных символов, на которое содержимое редактора будет прокручиваться по горизонтали.",
- 	"smoothScrolling": "Определяет, будет ли использоваться анимация при прокрутке содержимого редактора",
- 	"minimap.enabled": "Определяет, отображается ли мини-карта",
-+<<<<<<< .our
- 	"minimap.side": "Определяет, с какой стороны будет отображаться мини-карта.",
- 	"minimap.showSlider": "Определяет, будет ли автоматически скрываться ползунок мини-карты",
-+=======
-+	"minimap.side": "Определяет, с какой стороны будет отображаться мини-карта. Возможные значения: \"right\" и \"left\"",
-+	"minimap.showSlider": "Определяет, будет ли автоматически скрываться ползунок мини-карты. Возможные значения: 'always' (всегда) и 'mouseover' (при наведении курсора мыши)",
-+>>>>>>> .their
- 	"minimap.renderCharacters": "Отображает фактические символы в строке вместо цветных блоков.",
- 	"minimap.maxColumn": "Ограничивает ширину мини-карты для отображения числа столбцов не больше определенного.",
- 	"find.seedSearchStringFromSelection": "Определяет, можно ли передать строку поиска в мини-приложение поиска из текста, выделенного в редакторе",
-@@ -47,7 +52,10 @@
- 	"multiCursorModifier.ctrlCmd": "Соответствует клавише CTRL в Windows и Linux и клавише COMMAND в macOS.",
- 	"multiCursorModifier.alt": "Соответствует клавише ALT в Windows и Linux и клавише OPTION в macOS.",
- 	"multiCursorModifier": "Модификатор, который будет использоваться для добавления нескольких курсоров с помощью мыши. \"ctrlCmd\" соответствует клавише CTRL в Windows и Linux и клавише COMMAND в macOS. Жесты мыши \"Перейти к определению\" и \"Открыть ссылку\" будут изменены так, чтобы они не конфликтовали с несколькими курсорами.",
-+<<<<<<< .our
- 	"multiCursorMergeOverlapping": "Объединить несколько курсоров, когда они перекрываются.",
-+=======
-+>>>>>>> .their
- 	"quickSuggestions.strings": "Разрешение кратких предложений в строках.",
- 	"quickSuggestions.comments": "Разрешение кратких предложений в комментариях.",
- 	"quickSuggestions.other": "Разрешение кратких предложений вне строк и комментариев.",
-changed in both
-  base   100644 cc6cb3829b799a1d9309c0d06c63df99596642cd i18n/rus/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 9d3bc679fc1f2c06c947cdc33c9616b8b522920c i18n/rus/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 1c687dc16fd685ecc68c9f394ececd75bc388e82 i18n/rus/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -9,7 +9,10 @@
- 	"lineHighlight": "Цвет фона для выделения строки в позиции курсора.",
- 	"lineHighlightBorderBox": "Цвет фона границ вокруг строки в позиции курсора.",
- 	"rangeHighlight": "Фоновый цвет выбранных диапазонов, например, в функциях быстрого открытия и поиска. Цвет должен быть прозрачным чтобы не перекрывать основных знаков отличия.",
-+<<<<<<< .our
- 	"rangeHighlightBorder": "Цвет фона обводки выделения.",
-+=======
-+>>>>>>> .their
- 	"caret": "Цвет курсора редактора.",
- 	"editorCursorBackground": "Цвет фона курсора редактора. Позволяет настраивать цвет символа, перекрываемого прямоугольным курсором.",
- 	"editorWhitespaces": "Цвет пробелов в редакторе.",
-changed in both
-  base   100644 321f7624b03b1562564a9b92059b275fbb990f3e i18n/rus/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 60e5e887ae41d0c2770bdb1306a52fd5bbf7375a i18n/rus/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 75e85a8667e08ac2095122c00c674d32790b8e88 i18n/rus/src/vs/platform/environment/node/argv.i18n.json
-@@ -33,7 +33,10 @@
- 	"inspect-brk-extensions": "Разрешить отладку и профилирование расширений, когда узел расширения приостановлен после запуска. Проверьте URI подключения для инструментов разработчика. ",
- 	"disableGPU": "Отключить аппаратное ускорение GPU.",
- 	"uploadLogs": "Отправляет журналы из текущего сеанса в защищенную конечную точку.",
-+<<<<<<< .our
- 	"maxMemory": "Максимальный размер памяти для окна (в МБ).",
-+=======
-+>>>>>>> .their
- 	"usage": "Использование",
- 	"options": "параметры",
- 	"paths": "пути",
-changed in both
-  base   100644 d76fe02ad9edb8b91a03088d386458a65eeaeb99 i18n/rus/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 b5b010a1ed08e7bd0639632258a4ace9da636f30 i18n/rus/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 5d6e27da2365519204df83d1fc738660815029dc i18n/rus/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/rus/src/vs/platform/issue/electron-main/issueService.i18n.json
-  our    100644 dc9424fc0d688895fd2d7dd87684932ab82b9ff9 i18n/rus/src/vs/platform/issue/electron-main/issueService.i18n.json
-  their  100644 04993184c64ca510a6143a0edd564806ee2cd2a8 i18n/rus/src/vs/platform/issue/electron-main/issueService.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"issueReporter": "Средство создания отчетов о неполадках",
- 	"processExplorer": "Обозреватель процессов"
-+=======
-+	"issueReporter": "Средство создания отчетов о неполадках"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7894eceea4db8667a7afb4a811c1ba02d66790a1 i18n/rus/src/vs/platform/list/browser/listService.i18n.json
-  our    100644 b9fbce4eef329e26bb47aa9994d4f773ea7a63c6 i18n/rus/src/vs/platform/list/browser/listService.i18n.json
-  their  100644 a5965b1f1412185cd9409ffcfa9da47bad936098 i18n/rus/src/vs/platform/list/browser/listService.i18n.json
-@@ -12,6 +12,10 @@
- 	"multiSelectModifier": "Модификатор, который будет использоваться для добавления элементов в деревьях и списках в элемент множественного выбора с помощью мыши (например, в проводнике, в открытых редакторах и в представлении scm). \"ctrlCmd\" соответствует клавише CTRL в Windows и Linux и клавише COMMAND в macOS. Жесты мыши  \"Открыть сбоку\" (если они поддерживаются), будут изменены таким образом, чтобы они не конфликтовали с модификатором элемента множественного выбора.",
- 	"openMode.singleClick": "Открывает элемент одним щелчком мыши.",
- 	"openMode.doubleClick": "Открывает элемент двойным щелчком мыши.",
-+<<<<<<< .our
- 	"openModeModifier": "Управляет тем, как открывать элементы в деревьях и списках с помощью мыши (если поддерживается). Укажите значение \"singleClick\", чтобы открывать элементы одним щелчком мыши, и \"doubleClick\", чтобы открывать их только двойным щелчком мыши. Для родительских элементов с дочерними элементами в деревьях этот параметр управляет тем, будет ли родительский элемент разворачиваться по одинарному или по двойному щелчку мыши. Обратите внимание, что этот параметр может игнорироваться в некоторых деревьях и списках, если он не применяется к ним. ",
- 	"horizontalScrolling setting": "Определяет, поддерживают ли древа горизонтальную прокрутку в рабочей области."
-+=======
-+	"openModeModifier": "Управляет тем, как открывать элементы в деревьях и списках с помощью мыши (если поддерживается). Укажите значение \"singleClick\", чтобы открывать элементы одним щелчком мыши, и \"doubleClick\", чтобы открывать их только двойным щелчком мыши. Для родительских элементов с дочерними элементами в деревьях этот параметр управляет тем, будет ли родительский элемент разворачиваться по одинарному или по двойному щелчку мыши. Обратите внимание, что этот параметр может игнорироваться в некоторых деревьях и списках, если он не применяется к ним. "
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/rus/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  our    100644 b7b1c72487ebcdd28a2f6de4bbc845fb5f8459a4 i18n/rus/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 37bcdaf055d812e045605594b2d353f0ee340cb6 i18n/rus/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -6,8 +6,11 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"timeout.formatOnSave": "Форматирование при сохранении прервано через {0} мс",
- 	"codeActionsOnSave.didTimeout": "Метод codeActionsOnSave прерван через {0} мс",
- 	"timeout.onWillSave": "Событие onWillSaveTextDocument-event прервано по истечении 1750 мс",
-+=======
-+>>>>>>> .their
- 	"saveParticipants": "Сохранение участников..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 f1a5f11a1f2c11cf758bb20d498f19fe0b236a41 i18n/rus/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  our    100644 0dbd953e79a55730f12c5d543642ff3b7502f278 i18n/rus/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-  their  100644 f5e6250eb3aae3312055e29e7e2ca50a1454f220 i18n/rus/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
-changed in both
-  base   100644 320c1467b62e945891ded785cd1427c13f36e178 i18n/rus/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
-  our    100644 c1693a871d96857877b1e79a294e4635fb438dc8 i18n/rus/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
-  their  100644 096f82a9a5129044d66f16d0f589968bda79aa9c i18n/rus/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
-@@ -11,11 +11,17 @@
- 	"sizeMB": "{0} МБ",
- 	"sizeGB": "{0} ГБ",
- 	"sizeTB": "{0} ТБ",
-+<<<<<<< .our
- 	"largeImageError": "Изображение не отображается в редакторе, так как имеет слишком большой размер ({0}).",
- 	"resourceOpenExternalButton": "Открыть изображение с помощью внешней программы?",
- 	"nativeFileTooLargeError": "Файл не отображается в редакторе, так как имеет слишком большой размер ({0}).",
- 	"nativeBinaryError": "Файл не отображается в редакторе, так как является двоичным или использует неподдерживаемую кодировку текста.",
- 	"openAsText": "Открыть его в любом случае?",
-+=======
-+	"largeImageError": "Изображение имеет слишком большой размер для отображения в редакторе (более 1 МБ). ",
-+	"resourceOpenExternalButton": "Открыть изображение с помощью внешней программы?",
-+	"nativeBinaryError": "Файл не будет отображен в редакторе, так как он двоичный, очень большой или использует неподдерживаемую кодировку текста.",
-+>>>>>>> .their
- 	"zoom.action.fit.label": "Все изображение",
- 	"imgMeta": "{0}x{1} {2}"
- }
-\ No newline at end of file
-changed in both
-  base   100644 2a0c1db176eab8df9c48b018abe120726c33fce2 i18n/rus/src/vs/workbench/common/theme.i18n.json
-  our    100644 1ea38452a6e8832b511f19d37e5007a3b201c44b i18n/rus/src/vs/workbench/common/theme.i18n.json
-  their  100644 82a624ca75f3d78933dc900af3704ff6b581a594 i18n/rus/src/vs/workbench/common/theme.i18n.json
-@@ -11,10 +11,15 @@
- 	"tabHoverBackground": "Цвет фона вкладки при наведении. Вкладки — это контейнеры для редакторов в области редактора. В одной группе редакторов можно открыть несколько вкладок. Может присутствовать несколько групп редакторов.",
- 	"tabUnfocusedHoverBackground": "Цвет фона вкладки в группе, не имеющей фокуса, при наведении. Вкладки — это контейнеры для редакторов в области редактора. В одной группе редакторов можно открыть несколько вкладок. Также можно открыть несколько групп редакторов.",
- 	"tabBorder": "Граница для разделения вкладок. Вкладки — это контейнеры для редакторов в области редакторов. В одной группе редакторов можно открыть несколько вкладок. Может быть несколько групп редакторов.",
-+<<<<<<< .our
- 	"tabActiveBorder": "Граница в нижней части активной вкладки. Вкладки — это контейнеры для редакторов в области редакторов. В одной группе редакторов можно открыть несколько вкладок. Также можно открыть несколько групп редакторов. ",
- 	"tabActiveBorderTop": "Граница в верхней части активной вкладки. Вкладки — это контейнеры для редакторов в области редакторов. В одной группе редакторов можно открыть несколько вкладок. Также можно открыть несколько групп редакторов. ",
- 	"tabActiveUnfocusedBorder": "Граница нижней части активной вкладки в группе, не имеющей фокуса. Вкладки — это контейнеры для редакторов в области редакторов. В одной группе редакторов можно открыть несколько вкладок. Также можно открыть несколько групп редакторов.",
- 	"tabActiveUnfocusedBorderTop": "Граница верхней части активной вкладки в группе, не имеющей фокуса. Вкладки — это контейнеры для редакторов в области редакторов. В одной группе редакторов можно открыть несколько вкладок. Также можно открыть несколько групп редакторов.",
-+=======
-+	"tabActiveBorder": "Граница для выделения активных вкладок. Вкладки — это контейнеры для редакторов в области редакторов. В одной группе редакторов можно открыть несколько вкладок. Также можно открыть несколько групп редакторов. ",
-+	"tabActiveUnfocusedBorder": "Граница для выделения активных вкладок в группе, не имеющей фокуса. Вкладки — это контейнеры для редакторов в области редакторов. В одной группе редакторов можно открыть несколько вкладок. Также можно открыть несколько групп редакторов.",
-+>>>>>>> .their
- 	"tabHoverBorder": "Граница для выделения вкладок при наведении курсора. Вкладки — это контейнеры для редакторов в области редакторов. В одной группе редакторов можно открыть несколько вкладок. Также можно открыть несколько групп редакторов. ",
- 	"tabUnfocusedHoverBorder": "Граница для выделения вкладок в группе, не имеющей фокуса, при наведении. Вкладки — это контейнеры для редакторов в области редакторов. В одной группе редакторов можно открыть несколько вкладок. Также можно открыть несколько групп редакторов.",
- 	"tabActiveForeground": "Цвет переднего плана активной вкладки в активной группе. Вкладки — это контейнеры для редакторов в области редактора. В одной группе редакторов можно открыть несколько вкладок. Может присутствовать несколько групп редакторов.",
-changed in both
-  base   100644 dfd0b2e5bc6a346c5d64b3aacf39954c1fbf4c44 i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 bdb5e10a72aa6a97a13c01acd6d5626456147e68 i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 8436da97092e0f70932065348af5a887b2d97a74 i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,7 +35,10 @@
- 	"panelDefaultLocation": "Определяет расположение панели по умолчанию. Она может находиться снизу или справа от рабочего места.",
- 	"statusBarVisibility": "Управляет видимостью строки состояния в нижней части рабочего места.",
- 	"activityBarVisibility": "Управляет видимостью панели действий на рабочем месте.",
-+<<<<<<< .our
- 	"viewVisibility": "Управляет видимостью действий в заголовке представления. Действия в заголовке представления могут быть видимы всегда или видимы только тогда, когда представление получает фокус или на него наводится курсор мыши.",
-+=======
-+>>>>>>> .their
- 	"fontAliasing": "Управляет методом сглаживания шрифтов в рабочей области.\n- default: субпиксельное сглаживание шрифтов; позволит добиться максимальной четкости текста на большинстве дисплеев за исключением Retina\n- antialiased: сглаживание шрифтов на уровне пикселей, в отличие от субпиксельного сглаживания; позволит сделать шрифт более светлым в целом\n- none: сглаживание шрифтов отключено; текст будет отображаться с неровными острыми краями\n- auto: автоматически применяется режим \"default\" или \"antialiased\" в зависимости от разрешения дисплея (количество точек на дюйм).",
- 	"workbench.fontAliasing.default": "Субпиксельное сглаживание шрифтов; позволит добиться максимальной четкости текста на большинстве дисплеев за исключением Retina.",
- 	"workbench.fontAliasing.antialiased": "Сглаживание шрифтов на уровне пикселей, в отличие от субпиксельного сглаживания. Может сделать шрифт светлее в целом.",
-changed in both
-  base   100644 04e36f262a2406e08d6c65f4930aaaeecba5fa46 i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-  our    100644 0ae1d13f646fdfbc6ac7b14d9b5924bcd9d0500c i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-  their  100644 718232647ac5ec3519e514d241a4a415b8b6d124 i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-@@ -6,7 +6,40 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"debugNoType": "Параметр 'type' отладчика является обязательным и должен иметь тип 'string'.",
-+=======
-+	"vscode.extension.contributes.debuggers": "Добавляет адаптеры отладки.",
-+	"vscode.extension.contributes.debuggers.type": "Уникальный идентификатор этого адаптера отладки.",
-+	"vscode.extension.contributes.debuggers.label": "Отображаемое имя этого адаптера отладки.",
-+	"vscode.extension.contributes.debuggers.program": "Путь к программе адаптера отладки. Путь указывается либо как абсолютный, либо относительно папки расширения.",
-+	"vscode.extension.contributes.debuggers.args": "Необязательные аргументы для передачи адаптеру.",
-+	"vscode.extension.contributes.debuggers.runtime": "Дополнительная среда выполнения, используемая в том случае, если атрибут program не указывает на исполняемый файл, но среда выполнения требуется.",
-+	"vscode.extension.contributes.debuggers.runtimeArgs": "Аргументы дополнительной среды выполнения.",
-+	"vscode.extension.contributes.debuggers.variables": "Сопоставление интерактивных переменных (например, ${action.pickProcess}) в \"launch.json\" для команды.",
-+	"vscode.extension.contributes.debuggers.initialConfigurations": "Конфигурации для создания первоначального файла launch.json.",
-+	"vscode.extension.contributes.debuggers.languages": "Список языков, для которых расширение отладки может считаться \"отладчиком по умолчанию\".",
-+	"vscode.extension.contributes.debuggers.adapterExecutableCommand": "Если задано, VS Code будет вызывать эту команду, чтобы определить путь к исполняемому файлу адаптера отладки и передаваемые аргументы.",
-+	"vscode.extension.contributes.debuggers.configurationSnippets": "Фрагменты для добавления новых конфигураций в launch.json.",
-+	"vscode.extension.contributes.debuggers.configurationAttributes": "Конфигурации схемы JSON для проверки launch.json.",
-+	"vscode.extension.contributes.debuggers.windows": "Параметры, связанные с Windows.",
-+	"vscode.extension.contributes.debuggers.windows.runtime": "Среда выполнения, используемая для Windows.",
-+	"vscode.extension.contributes.debuggers.osx": "Параметры, связанные с macOS.",
-+	"vscode.extension.contributes.debuggers.osx.runtime": "Среда выполнения, используемая для macOS.",
-+	"vscode.extension.contributes.debuggers.linux": "Параметры, связанные с Linux.",
-+	"vscode.extension.contributes.debuggers.linux.runtime": "Среда выполнения, используемая для Linux.",
-+	"vscode.extension.contributes.breakpoints": "Добавляет точки останова.",
-+	"vscode.extension.contributes.breakpoints.language": "Разрешить точки останова для этого языка.",
-+	"app.launch.json.title": "Запустить",
-+	"app.launch.json.version": "Версия этого формата файла.",
-+	"app.launch.json.configurations": "Список конфигураций. Добавьте новые конфигурации или измените существующие с помощью IntelliSense.",
-+	"app.launch.json.compounds": "Список составных объектов. Каждый из них ссылается на несколько конфигураций, которые будут запущены вместе.",
-+	"app.launch.json.compound.name": "Имя составного объекта. Отображается в раскрывающемся меню запуска конфигурации.",
-+	"useUniqueNames": "Используйте уникальное имя конфигурации.",
-+	"app.launch.json.compound.folder": "Имя папки, в которой расположен составной объект.",
-+	"app.launch.json.compounds.configurations": "Имена конфигураций, которые будут запущены как часть этого составного объекта.",
-+	"debugNoType": "Параметр type адаптера отладки не может быть опущен и должен иметь тип string.",
-+>>>>>>> .their
- 	"selectDebug": "Выбор среды",
- 	"DebugConfig.failed": "Не удается создать файл launch.json в папке .vscode ({0}).",
- 	"workspace": "рабочая область",
-changed in both
-  base   100644 36b2312dd6503816f388d0888a42158a1f27154e i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 23eb63e486d254cf5d707329f4a13e4ae0e33119 i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 9277f42da3021d33388e04149834ef951abd442a i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -26,7 +26,13 @@
- 	"preLaunchTaskErrors": "При выполнении предварительной задачи \"{0}\" обнаружены ошибки.",
- 	"preLaunchTaskError": "При выполнении предварительной задачи \"{0}\" обнаружена ошибка.",
- 	"preLaunchTaskExitCode": "Выполнение предварительной задачи \"{0}\" завершено с кодом выхода {1}.",
-+<<<<<<< .our
- 	"showErrors": "Показывать ошибки",
-+=======
-+	"debugAnyway": "Принудительная отладка",
-+	"showErrors": "Показывать ошибки",
-+	"cancel": "Отмена",
-+>>>>>>> .their
- 	"noFolderWorkspaceDebugError": "Нельзя выполнить отладку активного файла. Убедитесь, что файл сохранен на диске и установлено расширение отладки для этого типа файла.",
- 	"cancel": "Отмена",
- 	"DebugTaskNotFound": "Не удалось найти задачу \"{0}\".",
-changed in both
-  base   100644 8cdee6de7cfb5dc374028d4a59e4f6bde643fc30 i18n/rus/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-  our    100644 80214fe333933c85dc938913564565da17a68e22 i18n/rus/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-  their  100644 e3a986b75ef9645e888b55d02101b87a87283676 i18n/rus/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-changed in both
-  base   100644 126d3a1028c12365fb90582891aef5925591df7e i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 bd475832dcfff4640327a5b72df263d4356ba205 i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 943a6d1793937ad6ce0bec6f684a9797c59b3d0f i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-@@ -56,11 +56,17 @@
- 	"OpenExtensionsFile.failed": "Не удается создать файл \"extensions.json\" в папке \".vscode\" ({0}).",
- 	"configureWorkspaceRecommendedExtensions": "Настроить рекомендуемые расширения (рабочая область)",
- 	"configureWorkspaceFolderRecommendedExtensions": "Настроить рекомендуемые расширения (папка рабочей области)",
-+<<<<<<< .our
- 	"malicious tooltip": "Это расширение помечено как проблемное.",
- 	"malicious": "Вредоносный",
- 	"disabled": "Отключено",
- 	"disabled globally": "Отключено",
- 	"disabled workspace": "Отключено для этой рабочей области",
-+=======
-+	"builtin": "Встроенное",
-+	"malicious tooltip": "Это расширение помечено как проблемное.",
-+	"malicious": "Вредоносный",
-+>>>>>>> .their
- 	"disableAll": "Отключить все установленные расширения",
- 	"disableAllWorkspace": "Отключить все установленные расширения для этой рабочей области",
- 	"enableAll": "Включить все расширения",
-changed in both
-  base   100644 63ca7f876a0a1f96d91beeca3ad18580947f2e5c i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-  our    100644 6ecb81772e05a05bff03b480ac42e42e039e3863 i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-  their  100644 90ccf0f849c80f0d20ae3ea32539e1f5b0211c92 i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-@@ -6,9 +6,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"restart1": "Расширения профиля",
- 	"restart2": "Для профилирования расширений требуется перезапуск. Вы действительно хотите перезапустить \"{0}\" сейчас?",
- 	"restart3": "Перезапустить",
- 	"cancel": "Отмена",
-+=======
-+	"noPro": "Для профилирования расширений выполните команду с параметром \"--inspect-extensions=<port>\".",
-+>>>>>>> .their
- 	"selectAndStartDebug": "Щелкните здесь, чтобы остановить профилирование."
- }
-\ No newline at end of file
-changed in both
-  base   100644 74d611f933b49c07858dfbd1c56e9e83fa1bd54b i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 11278b85abb135a3195540e01213542dadbc0081 i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 237e0b0edf9e7feb4471f98e21c0583c9fa5a484 i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -10,13 +10,22 @@
- 	"searchMarketplace": "Поиск в Marketplace",
- 	"dynamicWorkspaceRecommendation": "Это расширение может вас заинтересовать, потому что оно популярно среди пользователей репозитория {0}.",
- 	"exeBasedRecommendation": "Рекомендуется использовать это расширение, так как установлено {0}.",
-+<<<<<<< .our
- 	"fileBasedRecommendation": "Рекомендуется использовать это расширение (на основе недавно открытых файлов).",
- 	"workspaceRecommendation": "Это расширение рекомендуется пользователями текущей рабочей области.",
-+=======
-+	"dynamicWorkspaceRecommendation": "Это расширение может вас заинтересовать, потому что многие другие пользователи в этой рабочей области пользуются им.",
-+>>>>>>> .their
- 	"reallyRecommended2": "Для этого типа файлов рекомендуется использовать расширение '{0}'.",
- 	"reallyRecommendedExtensionPack": "Для этого типа файлов рекомендуется использовать пакет расширений '{0}'.",
- 	"install": "Установить",
-+<<<<<<< .our
- 	"showRecommendations": "Показать рекомендации",
- 	"showLanguageExtensions": "В Marketplace есть расширения для работы с файлами '.{0}'",
-+=======
-+	"showLanguageExtensions": "В Marketplace есть расширения для работы с файлами '.{0}'",
-+	"searchMarketplace": "Поиск в Marketplace",
-+>>>>>>> .their
- 	"workspaceRecommended": "Эта рабочая область включает рекомендации по расширениям.",
- 	"installAll": "Установить все",
- 	"ignoreExtensionRecommendations": "Вы действительно хотите проигнорировать все рекомендации по расширениям?",
-changed in both
-  base   100644 4367c72b1cb0a6ebc8c83b6880248b2bf4bdd507 i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  our    100644 2237c231d50e522f4f8d9167763aa06917febb9b i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  their  100644 fc2676c541bdf82c50f159619a26ce5bc21e162b i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-changed in both
-  base   100644 e19c26eebd7447863c92df4d69b517fc7d21355c i18n/rus/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
-  our    100644 0a02049f6bebe1cbd6f325c0c02fa2c18c226452 i18n/rus/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
-  their  100644 7639b5985ab6e8067be194a93f914f3f5927588a i18n/rus/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
-@@ -10,7 +10,11 @@
- 	"malicious": "Это расширение помечено как проблемное.",
- 	"installingMarketPlaceExtension": "Установка расширения из Marketplace...",
- 	"uninstallingExtension": "Удаление расширения...",
-+<<<<<<< .our
- 	"enableDependeciesConfirmation": "При включении расширения также будут включены его зависимости. Вы действительно хотите продолжить?",
-+=======
-+	"enableDependeciesConfirmation": "Включение \"{0}\" также включит соответствующие зависимости. Продолжить?",
-+>>>>>>> .their
- 	"enable": "Да",
- 	"doNotEnable": "Нет",
- 	"disableDependeciesConfirmation": "Вы хотели бы также отключить зависимости расширения?",
-changed in both
-  base   100644 7094260597f8ae489a5dcd66e53be106c65f62c4 i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  our    100644 54559890c5017a8fa991d36e1d32e0ea4a0f5415 i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-  their  100644 3eaaab932e95cf3e9786909d0a7e9cb6156928fa i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
-changed in both
-  base   100644 a6e1a42df1e0978c35f921cc4dc87235726dd3e7 i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 2c38d1331217bb70a1fc665d1c79c9658eacde43 i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 cd6f07eb718d8612d548e7fba00ddb5e171c728a i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -25,6 +25,7 @@
- 	"dirtyMessageFolderDelete": "Вы удаляете папку с несохраненными изменениями в нескольких файлах ({0}). Вы хотите продолжить?",
- 	"dirtyMessageFileDelete": "Вы удаляете файл с несохраненными изменениями. Вы хотите продолжить?",
- 	"dirtyWarning": "Если не сохранить изменения, они будут утеряны.",
-+<<<<<<< .our
- 	"undoBin": "Вы можете выполнить восстановление из корзины.",
- 	"undoTrash": "Вы можете выполнить восстановление из корзины.",
- 	"doNotAskAgain": "Больше не спрашивать",
-@@ -40,14 +41,27 @@
- 	"confirmMoveTrashMessageFile": "Вы действительно хотите удалить \"{0}\"?",
- 	"confirmDeleteMessageFilesAndDirectories": "Вы уверены, что вы хотите удалить следующие файлы и каталоги ({0}) и их содержимое без возможности восстановления?",
- 	"confirmDeleteMessageMultipleDirectories": "Вы уверены, что вы хотите удалить следующие каталоги ({0}) и их содержимое без возможности восстановления? ",
-+=======
-+	"confirmMoveTrashMessageMultiple": "Вы действительно хотите удалить следующие файлы ({0})?",
-+	"confirmMoveTrashMessageFolder": "Вы действительно хотите удалить папку \"{0}\" и ее содержимое?",
-+	"confirmMoveTrashMessageFile": "Вы действительно хотите удалить \"{0}\"?",
-+	"undoBin": "Вы можете выполнить восстановление из корзины.",
-+	"undoTrash": "Вы можете выполнить восстановление из корзины.",
-+	"doNotAskAgain": "Больше не спрашивать",
-+>>>>>>> .their
- 	"confirmDeleteMessageMultiple": "Вы действительно хотите удалить следующие файлы ({0}) без возможности восстановления?",
- 	"confirmDeleteMessageFolder": "Вы действительно хотите удалить папку \"{0}\" и ее содержимое без возможности восстановления?",
- 	"confirmDeleteMessageFile": "Вы действительно хотите удалить \"{0}\" без возможности восстановления?",
- 	"addFiles": "Добавить файлы",
- 	"confirmOverwrite": "Файл или папка с таким именем уже существует в конечной папке. Заменить их?",
- 	"replaceButtonLabel": "Заменить",
-+<<<<<<< .our
- 	"fileIsAncestor": "Файл для вставки является предком папки назначения",
- 	"fileDeleted": "Файл для вставки был удален или перемещен в другое место",
-+=======
-+	"fileDeleted": "Файл был удален или перемещен в другое место",
-+	"fileIsAncestor": "Копируемый файл является предком папки назначения",
-+>>>>>>> .their
- 	"duplicateFile": "Дублировать",
- 	"globalCompareFile": "Сравнить активный файл с...",
- 	"openFileToCompare": "Чтобы сравнить файл с другим файлом, сначала откройте его.",
-changed in both
-  base   100644 616044b2c9bff90a3752413851c5b339d2ddc5c3 i18n/rus/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 8abc8c89790838ab546398086d2a394a5956c230 i18n/rus/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 7864917b59e67851283f9fd7cd4150a5422d8609 i18n/rus/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-changed in both
-  base   100644 1fdae0619e5861382c1deeb9bd54468b8fa6ff72 i18n/rus/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  our    100644 2c555771b4a5a50496e84e47522fb4a9fc9a7db4 i18n/rus/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-  their  100644 ea4716097342b53c24b4d48aa1bd0d36612a6451 i18n/rus/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
-@@ -6,8 +6,15 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"userGuide": "Используйте команды на панели инструментов редактора, чтобы отменить изменения или перезаписать содержимое на диске.",
- 	"staleSaveError": "Не удалось сохранить \"{0}\": содержимое на диске было изменено. Сравните свою версию с версией на диске.",
-+=======
-+	"userGuide": "Используйте команды на панели инструментов редактора справа для **отмены** изменений или **перезаписи** содержимого на диске с учетом этих изменений",
-+	"overwriteElevated": "Перезаписать с правами администратора....",
-+	"saveElevated": "Повторить с правами администратора....",
-+	"overwrite": "Перезаписать",
-+>>>>>>> .their
- 	"retry": "Повторить попытку",
- 	"discard": "Отмена",
- 	"readonlySaveErrorAdmin": "Не удалось сохранить \"{0}\": файл защищен от записи. Чтобы повторить попытку с правами администратора, выберите \"Перезаписать с правами администратора\".",
-changed in both
-  base   100644 ed319f477dfc7693c4d39db03c436bfe48117684 i18n/rus/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  our    100644 b30660862fb648d55c4895c7ccb26b222d765662 i18n/rus/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  their  100644 42c4426c51c4186a178944573a5dd2cd9486aa42 i18n/rus/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-@@ -15,9 +15,13 @@
- 	"dropFolder": "Вы хотите действительно добавить папку в эту рабочую область?",
- 	"addFolders": "&&Добавить папки",
- 	"addFolder": "&&Добавить папку",
-+<<<<<<< .our
- 	"confirmRootsMove": "Вы действительно хотите изменить порядок нескольких корневых папок в рабочей области?",
- 	"confirmMultiMove": "Вы действительно хотите переместить следующие файлы ({0})?",
- 	"confirmRootMove": "Вы действительно хотите изменить порядок корневой папки \"{0}\" в рабочей области?",
-+=======
-+	"confirmMultiMove": "Вы действительно хотите переместить следующие файлы ({0})?",
-+>>>>>>> .their
- 	"confirmMove": "Вы действительно хотите переместить '{0}'?",
- 	"doNotAskAgain": "Больше не спрашивать",
- 	"moveButtonLabel": "&&Переместить",
-changed in both
-  base   100644 9665e49caa1bef127935cc2302095faf461fc495 i18n/rus/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  our    100644 0e35df992440dc39588c4c4bfc73c2bf58694991 i18n/rus/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-  their  100644 abb406c1b5aebe7d800bed81268ed68a4f7b6662 i18n/rus/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
-changed in both
-  base   100644 929c54c82e9cc35450385bab571347453f80847c i18n/rus/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-  our    100644 66e8e86a36d5d543bef59dd5916b76c60f477b16 i18n/rus/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-  their  100644 e357345cb244fa633e303a93c4438f4c3a8331e7 i18n/rus/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
-changed in both
-  base   100644 07d11b5eb6f6db327f460ebcbf6f702a6bb686e9 i18n/rus/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  our    100644 b1ff2f3c4a2f645fbb9eec41aa8aaf1e9cdae2c6 i18n/rus/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  their  100644 007de0de321e863511153de4ab7987e2be143ec6 i18n/rus/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-@@ -21,7 +21,11 @@
- 	"showSameKeybindings": "Показывать одинаковые настраиваемые сочетания клавиш",
- 	"copyLabel": "Копировать",
- 	"copyCommandLabel": "Команда копирования",
-+<<<<<<< .our
- 	"error": "При изменении сочетания клавиш произошла ошибка \"{0}\". Откройте файл \"keybindings.json\" и проверьте его на наличие ошибок.",
-+=======
-+	"error": "Произошла ошибка \"{0}\" при редактировании настраиваемого сочетания клавиш. Откройте и проверьте файл \"keybindings.json\".",
-+>>>>>>> .their
- 	"command": "Команда",
- 	"keybinding": "Настраиваемое сочетание клавиш",
- 	"source": "Источник",
-changed in both
-  base   100644 5d997666f2a886819aad37d4201f983bf92e1968 i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-  our    100644 14f251a84e0f5c94cbc0531579298faf4a9fea48 i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-  their  100644 d1d27d53dda9229f8f272d6c438f66dc96c7c269 i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
-changed in both
-  base   100644 25906ddf058634ae753314e3d30a791a23e12366 i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 b457921fc6fc12c765888c49560d62815333e020 i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 4febeb5b22c28d0376ec3def230559d01ba88940 i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -9,7 +9,10 @@
- 	"emptyUserSettingsHeader": "Укажите параметры здесь, чтобы перезаписать параметры по умолчанию.",
- 	"emptyWorkspaceSettingsHeader": "Укажите параметры здесь, чтобы перезаписать параметры пользователей.",
- 	"emptyFolderSettingsHeader": "Укажите параметры папок здесь, чтобы перезаписать параметры рабочих областей.",
-+<<<<<<< .our
- 	"reportSettingsSearchIssue": "Сообщить об ошибке",
-+=======
-+>>>>>>> .their
- 	"newExtensionLabel": "Показать расширение «{0}»",
- 	"editTtile": "Изменить",
- 	"replaceDefaultValue": "Заменить в параметрах",
-changed in both
-  base   100644 62ef4a12c9684aaf5663e35d24c94dcbf524dc0a i18n/rus/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  our    100644 39961b3a4e8ca19501aa8f2ce29968dd3e4cbb83 i18n/rus/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-  their  100644 9f5ad1adbbbcb8a9893bb3ea834a257b093b262a i18n/rus/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
-@@ -12,6 +12,10 @@
- 	"view": "Просмотреть",
- 	"scmConfigurationTitle": "SCM",
- 	"alwaysShowProviders": "Всегда отображать хранилище исходного кода",
-+<<<<<<< .our
- 	"diffDecorations": "Управляет декораторами diff в редакторе.",
- 	"diffGutterWidth": "Управляет шириной (в пикселах) декораторов diff в поле (добавление и изменение)."
-+=======
-+	"diffDecorations": "Управляет декораторами diff в редакторе."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 9e5b6280df453979f4c5d3b2b200b6465a648109 i18n/rus/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 012af24286aec719761b0687ebd50b2292e4db5e i18n/rus/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 a43c7553d81b704533da3f0c7a04524077e748a8 i18n/rus/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-changed in both
-  base   100644 a8ba80c5dfa3fe5bd1b044e18702558729b0296a i18n/rus/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 113d804b27033c0eb1fd8478b7abca09ae0f3e64 i18n/rus/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 65bc79a6ec82937f72ed25c53f76b8d60f894d7e i18n/rus/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -6,12 +6,15 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"search": "Поиск",
- 	"copyMatchLabel": "Копировать",
- 	"copyPathLabel": "Скопировать путь",
- 	"copyAllLabel": "Копировать все",
- 	"clearSearchHistoryLabel": "Очистить историю поиска",
- 	"toggleSearchViewPositionLabel": "Переключить положение представления поиска",
-+=======
-+>>>>>>> .their
- 	"findInFolder": "Найти в папке...",
- 	"findInWorkspace": "Найти в рабочей области...",
- 	"showTriggerActions": "Перейти к символу в рабочей области...",
-@@ -30,6 +33,10 @@
- 	"search.quickOpen.includeSymbols": "Настройте для включения результатов поиска глобальных символов в файлы по запросу для Quick Open.",
- 	"search.followSymlinks": "Определяет, нужно ли следовать символическим ссылкам при поиске.",
- 	"search.smartCase": "Выполняет поиск без учета регистра, если шаблон состоит только из букв нижнего регистра; в противном случае выполняет поиск с учетом регистра",
-+<<<<<<< .our
- 	"search.globalFindClipboard": "Определяет, должно ли представление поиска считывать или изменять общий буфер обмена поиска в macOS",
- 	"search.location": "Управляет тем, будет ли панель поиска отображаться в виде представления в боковой колонке или в виде панели в области панели, чтобы освободить пространство по горизонтали."
-+=======
-+	"search.globalFindClipboard": "Определяет, должно ли мини-приложение поиска считывать или изменять общий буфер обмена поиска в macOS"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 cb0885ffff1f7246cb674777bff411e0b3e56c82 i18n/rus/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 5406c69914aaafdfca9d082f48774213cbbbd661 i18n/rus/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 60e666cad4cec5e2d8aa3373ca99b764daf5e517 i18n/rus/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-changed in both
-  base   100644 a56f8c90a3e0c0e7d0cea4e9f042b345077232e0 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 e05b07ca1e0540b56ed4788f50fea5db9d3c3f96 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 36cf40efb260dd9ca0721903cdb967d6edbb2536 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -16,13 +16,22 @@
- 	"terminal.integrated.shell.windows": "Путь к оболочке, который используется терминалом в Windows. Для оболочек, входящих в состав ОС Windows (cmd, PowerShell или Bash в Ubuntu).",
- 	"terminal.integrated.shellArgs.windows": "Аргументы командной строки, используемые в терминале Windows.",
- 	"terminal.integrated.macOptionIsMeta": "Считать клавишу OPTION метаклавишей в терминале macOS.",
-+<<<<<<< .our
-+=======
-+	"terminal.integrated.rightClickCopyPaste": "Если задано, блокирует отображение контекстного меню при щелчке правой кнопкой мыши в терминале. Вместо этого будет выполняться копирование выбранного элемента и вставка в область, в которой нет выбранных элементов.",
-+>>>>>>> .their
- 	"terminal.integrated.copyOnSelection": "Если задано, текст выделенный в терминале будет скопирован в буфер обмена",
- 	"terminal.integrated.fontFamily": "Определяет семейство шрифтов терминала, значение по умолчанию — editor.fontFamily.",
- 	"terminal.integrated.fontSize": "Определяет размер шрифта (в пикселях) для терминала.",
- 	"terminal.integrated.letterSpacing": "Управляет межсимвольным интервалом в терминале. Это целочисленное значение, которое представляет собой количество дополнительных пикселей между символами.",
- 	"terminal.integrated.lineHeight": "Определяет высоту строки терминала; это число умножается на размер шрифта терминала, что дает фактическую высоту строки в пикселях.",
-+<<<<<<< .our
- 	"terminal.integrated.fontWeight": "Размер шрифта в терминале для нежирного текста.",
- 	"terminal.integrated.fontWeightBold": "Размер шрифта в терминале для полужирного текста. ",
-+=======
-+	"terminal.integrated.fontWeight": "Насыщенность шрифта в терминале для нежирного текста.",
-+	"terminal.integrated.fontWeightBold": "Насыщенность шрифта в терминале для полужирного текста. ",
-+>>>>>>> .their
- 	"terminal.integrated.cursorBlinking": "Управляет миганием курсора терминала.",
- 	"terminal.integrated.cursorStyle": "Определяет стиль курсора терминала.",
- 	"terminal.integrated.scrollback": "Определяет предельное число строк в буфере терминала.",
-@@ -37,7 +46,10 @@
- 	"terminal.integrated.env.linux": "Объект с переменными среды, которые будут добавлены к процессу VS Code для использования в терминале Linux ",
- 	"terminal.integrated.env.windows": "Объект с переменными среды, которые будут добавлены к процессу VS Code для использования в терминале Windows",
- 	"terminal.integrated.showExitAlert": "Отображать предупреждение \"Процесс терминала завершен с кодом выхода\", если код выхода не равен нулю.",
-+<<<<<<< .our
- 	"terminal.integrated.experimentalRestore": "Восстанавливать ли сеансы терминала для рабочей области автоматически при запуске VS Code. Это экспериментальный параметр; он может приводить к ошибкам и может быть изменен в будущем.",
-+=======
-+>>>>>>> .their
- 	"terminalCategory": "Терминал",
- 	"viewCategory": "Просмотреть"
- }
-\ No newline at end of file
-changed in both
-  base   100644 e4a7dd2443031e2dc49e8102dc73da7134a9c933 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 ea0d455fc7f4fc786ef2ef083f3b437a535a441a i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 d43f2b103ef08c284b2e628fe9e8261f14e457ff i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -20,6 +20,7 @@
- 	"workbench.action.terminal.new.short": "Новый терминал",
- 	"workbench.action.terminal.newWorkspacePlaceholder": "Выбрать текущий рабочий каталог для нового терминала",
- 	"workbench.action.terminal.newInActiveWorkspace": "Создать новый интегрированный терминал (в активной рабочей области)",
-+<<<<<<< .our
- 	"workbench.action.terminal.split": "Разделить терминал",
- 	"workbench.action.terminal.splitInActiveWorkspace": "Разбить окно терминала (в активной рабочей области)",
- 	"workbench.action.terminal.focusPreviousPane": "Перейти на предыдущую область",
-@@ -28,6 +29,8 @@
- 	"workbench.action.terminal.resizePaneRight": "Изменить размер области справа",
- 	"workbench.action.terminal.resizePaneUp": "Изменить размер области вверху",
- 	"workbench.action.terminal.resizePaneDown": "Изменить размер области внизу",
-+=======
-+>>>>>>> .their
- 	"workbench.action.terminal.focus": "Фокус на терминале",
- 	"workbench.action.terminal.focusNext": "Фокус на следующем терминале",
- 	"workbench.action.terminal.focusPrevious": "Фокус на предыдущем терминале",
-changed in both
-  base   100644 e48d7b1d2acb654c83eb1528c6f766cd318e7bcc i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 aca12bf1061a643000b1615902ead62bb39d5223 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 5d87c842d7270a3780c7130736168acc62020837 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -11,6 +11,9 @@
- 	"terminalCursor.foreground": "Цвет переднего плана курсора терминала.",
- 	"terminalCursor.background": "Цвет фона курсора терминала. Позволяет выбрать цвет символа, который перекрывается блочным курсором.",
- 	"terminal.selectionBackground": "Цвет фона выделения терминала.",
-+<<<<<<< .our
- 	"terminal.border": "Цвет границы, которая отделяет области в терминале. По умолчанию используется panel.border.",
-+=======
-+>>>>>>> .their
- 	"terminal.ansiColor": "Цвет ANSI \"{0}\" в терминале."
- }
-\ No newline at end of file
-changed in both
-  base   100644 3c71e76847dccfdd8f75d08d6f73ac0adf52d71e i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-  our    100644 ff481cfdd880da29631a3150be6e33de6483b2b1 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-  their  100644 86dafb69b0f1a05f940166f6812932eabc9e97bc i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-@@ -9,11 +9,14 @@
- 	"terminal.integrated.a11yBlankLine": "Пустая строка",
- 	"terminal.integrated.a11yPromptLabel": "Ввод терминала",
- 	"terminal.integrated.a11yTooMuchOutput": "Объем выходных данных слишком велик для создания оповещения; проверьте строки вручную",
-+<<<<<<< .our
- 	"yes": "Да",
- 	"terminal.rendererInAllNewTerminals": "Во всех созданных терминалах будет использоваться модуль отображения, не связанный с GPU.",
- 	"no": "Нет",
- 	"dontShowAgain": "Больше не показывать",
- 	"terminal.slowRendering": "Стандартный модуль отображения для встроенного терминала работает медленно. Вы хотите переключиться на альтернативный модуль отображения на основе DOM, который может повысить производительность? [Дополнительные сведения о параметрах терминала](https://code.visualstudio.com/docs/editor/integrated-terminal#_changing-how-the-terminal-is-rendered).",
-+=======
-+>>>>>>> .their
- 	"terminal.integrated.copySelection.noSelection": "В терминале отсутствует выделенный текст для копирования",
- 	"terminal.integrated.exitedWithCode": "Процесс терминала завершен с кодом выхода: {0}",
- 	"terminal.integrated.waitOnExit": "Нажмите любую клавишу, чтобы закрыть терминал.",
-changed in both
-  base   100644 5895a36654355fbcdc2276d3a20e9c9c33ec0623 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  our    100644 cc8f5ba62551fedf802d2c73116bb6cf543dedf0 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-  their  100644 c0d1bbc3e2072d0e76dece1a2442bce8341d3fd1 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
-@@ -8,7 +8,12 @@
- 	],
- 	"terminal.integrated.chooseWindowsShellInfo": "Вы можете изменить оболочку терминала по умолчанию, нажав кнопку \"Настроить\".",
- 	"customize": "Настроить",
-+<<<<<<< .our
- 	"never again": "Больше не показывать",
-+=======
-+	"cancel": "Отмена",
-+	"never again": "ОК, больше не показывать",
-+>>>>>>> .their
- 	"terminal.integrated.chooseWindowsShell": "Выберите предпочитаемую оболочку терминала. Ее можно позже изменить в параметрах",
- 	"terminalService.terminalCloseConfirmationSingular": "Есть активный сеанс терминала, завершить его?",
- 	"terminalService.terminalCloseConfirmationPlural": "Есть несколько активных сеансов терминала ({0}), завершить их?"
-changed in both
-  base   100644 522f111f58e9022d9894d6fdf0e2402b1b3a316b i18n/rus/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json
-  our    100644 d0026de322c28ae3eb8b9f45b16849a687c1d720 i18n/rus/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json
-  their  100644 18124ac01733aeaf6147ea1b419223d8d34e3b04 i18n/rus/src/vs/workbench/parts/update/electron-browser/update.contribution.i18n.json
-@@ -6,5 +6,12 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"release notes": "Заметки о выпуске"
-+=======
-+	"release notes": "Заметки о выпуске",
-+	"updateConfigurationTitle": "Обновить",
-+	"updateChannel": "Настройте канал обновления, по которому вы будете получать обновления. После изменения значения необходим перезапуск.",
-+	"enableWindowsBackgroundUpdates": "Включает обновления Windows в фоновом режиме."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 9f0954a0641bebe8504ea22f5420800fa062dff7 i18n/rus/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 0aa456751192f6ae65f23c8eacec75c6ffe01fe8 i18n/rus/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 b54b0cfefeb4417abb46bfe1a7b3d4136e3795bb i18n/rus/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -16,17 +16,26 @@
- 	"noUpdatesAvailable": "Доступные обновления отсутствуют.",
- 	"ok": "ОК",
- 	"thereIsUpdateAvailable": "Доступно обновление.",
-+<<<<<<< .our
- 	"download now": "Скачать сейчас",
- 	"later": "Позже",
- 	"updateAvailable": "Доступно обновление: {0} {1}",
- 	"installUpdate": "Установить обновление",
- 	"updateInstalling": "{0} {1} устанавливается в фоновом режиме, мы сообщим вам о завершении.",
- 	"updateAvailableAfterRestart": "Перезапустите {0}, чтобы применить последнее обновление.",
-+=======
-+	"installUpdate": "Установить обновление",
-+	"updateAvailable": "Доступно обновление: {0} {1}",
-+	"updateInstalling": "{0} {1} устанавливается в фоновом режиме, мы сообщим вам о завершении.",
-+>>>>>>> .their
- 	"updateNow": "Обновить сейчас",
- 	"commandPalette": "Палитра команд...",
- 	"settings": "Параметры",
- 	"keyboardShortcuts": "Сочетания клавиш",
-+<<<<<<< .our
- 	"showExtensions": "Управление расширениями",
-+=======
-+>>>>>>> .their
- 	"userSnippets": "Фрагменты кода пользователя",
- 	"selectTheme.label": "Цветовая тема",
- 	"themes.selectIconTheme.label": "Тема значков файлов",
-changed in both
-  base   100644 9661f9ed6db1d295a2359399c0c84833eb8f72c6 i18n/rus/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-  our    100644 da59adfec73826ca4e574c95a636c7e2613597d0 i18n/rus/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-  their  100644 6f52d0bf69f4e5d13deeac4bebe9dbcd98ffb17e i18n/rus/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-changed in both
-  base   100644 03822ddf2b9a38d253c0e52cea4eda1e1ebe0fa8 i18n/rus/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  our    100644 2c983a39d579894623f58659f4686ad21c8ac392 i18n/rus/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  their  100644 b754ce1af13697a58fa0daaec263f229df459b27 i18n/rus/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-@@ -6,8 +6,11 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"invalidPath": "Путь к ресурсу '{0}' должен быть абсолютным",
- 	"fileNotFoundError": "Файл не найден ({0})",
-+=======
-+>>>>>>> .their
- 	"fileIsDirectoryError": "Файл является каталогом",
- 	"fileNotModifiedError": "undefined",
- 	"fileBinaryError": "Похоже, файл является двоичным, и его нельзя открыть как текстовый.",
-changed in both
-  base   100644 f7b71e7ac2cc0dff64b798c0bcc188b53dc1f59f i18n/trk/extensions/git/package.i18n.json
-  our    100644 c440a7230c670854e02c25e2d19a46df2b4abcb8 i18n/trk/extensions/git/package.i18n.json
-  their  100644 4c5ed661f393d6c9a4e05080d21975e54c0557fc i18n/trk/extensions/git/package.i18n.json
-@@ -75,7 +75,11 @@
- 	"config.decorations.enabled": "Git'in gezgine ve açık düzenleyiciler görünümüne renkler ve göstergeler ile ekleme yapıp yapmadığını denetler.",
- 	"config.promptToSaveFilesBeforeCommit": "Commit'lemeden önce Git'in kaydedilmemiş dosyaları kontrol edip etmeyeceğini denetler.",
- 	"config.showInlineOpenFileAction": "Git değişiklikleri görünümünde satır içi Dosyayı Aç eyleminin gösterilip gösterilmeyeceğini denetler.",
-+<<<<<<< .our
- 	"config.inputValidation": "Commit mesajı doğrulamasının ne zaman gösterileceğini kontrol eder.",
-+=======
-+	"config.inputValidation": "Girdi sayacının ne zaman gösterileceğini denetler.",
-+>>>>>>> .their
- 	"config.detectSubmodules": "Git alt modüllerin otomatik olarak tespit edilip edilmeyeceğini denetler.",
- 	"config.detectSubmodulesLimit": "Algılanan git alt modüllerinin limitini denetler.",
- 	"colors.modified": "Değiştirilen kaynakların rengi.",
-changed in both
-  base   100644 e526a94f4fec66c0e6d7c650a09d2d0f93629e8e i18n/trk/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  our    100644 1998afc436b21e1d4b60a22c372c3fee113efbf2 i18n/trk/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  their  100644 922f61899caf1e8bc3a7e37cc68c4aeb98e37a55 i18n/trk/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-@@ -12,6 +12,7 @@
- 	"loadingData": "Veri yükleniyor...",
- 	"rateLimited": "GitHub sorgu sınırı aşıldı. Lütfen bekleyin.",
- 	"similarIssues": "Benzer sorunlar",
-+<<<<<<< .our
- 	"open": "Aç",
- 	"closed": "Kapalı",
- 	"noSimilarIssues": "Benzer bir sorun bulunmadı",
-@@ -19,6 +20,10 @@
- 	"bugReporter": "Hata Raporu",
- 	"featureRequest": "Özellik İsteği",
- 	"performanceIssue": "Performans Sorunu",
-+=======
-+	"noResults": "Sonuç bulunamadı",
-+	"rateLimited": "API limiti aşıldı",
-+>>>>>>> .their
- 	"stepsToReproduce": "Yeniden oluşturma adımları",
- 	"bugDescription": "Sorunu güvenilir şekilde yeniden oluşturmak için gerekli adımları paylaşın. Lütfen gerçekleşen ve beklenen sonuçları ekleyin. GitHub-tarzı Markdown'ı destekliyoruz. GitHub'da önizleme yaptığımızda sorununuzu düzenleyebilecek ve ekran görüntüleri ekleyebileceksiniz.",
- 	"performanceIssueDesciption": "Bu performans sorunu ne zaman oluştu? Başlangıçta mı yoksa belirli eylemlerden sonra mı oluşuyor? GitHub-tarzı Markdown'ı destekliyoruz. GitHub'da önizleme yaptığımızda sorununuzu düzenleyebilecek ve ekran görüntüleri ekleyebileceksiniz.",
-changed in both
-  base   100644 9335c658b90c1bb64fad6c86e1f3bf1e1bd14b2b i18n/trk/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  our    100644 cc635c3213aa540df09c2e4c4a87b6c4833861d6 i18n/trk/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  their  100644 c58bf060a5106dfa7c4daa5b3beb87103dd12d22 i18n/trk/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-@@ -16,6 +16,7 @@
- 	"chooseExtension": "Eklenti",
- 	"issueTitleLabel": "Başlık",
- 	"issueTitleRequired": "Lütfen bir başlık girin.",
-+<<<<<<< .our
- 	"titleLengthValidation": "Başlık çok uzun.",
- 	"details": "Lütfen detayları giriniz.",
- 	"sendSystemInfo": "Sistem bilgilerimi dahil et ({0})",
-@@ -25,4 +26,19 @@
- 	"sendExtensions": " Aktif eklentilerimi dahil et ({0})",
- 	"sendSearchedExtensions": "Aranan eklentileri gönder ({0})",
- 	"sendSettingsSearchDetails": "Ayar arama detaylarını gönder ({0})"
-+=======
-+	"vscodeVersion": "VS Code Sürümü",
-+	"osVersion": "İşletim Sistemi Sürümü",
-+	"systemInfo": "Sistem Bilgilerim",
-+	"sendData": "Verilerimi gönder",
-+	"processes": "Şu Anda Çalışan İşlemler",
-+	"workspaceStats": "Çalışma Alanı İstatistiklerim",
-+	"extensions": "Eklentilerim",
-+	"tryDisablingExtensions": "Eklentiler devre dışı bırakıldığında sorun yeniden oluşturulabiliyor",
-+	"disableExtensions": "tüm eklentileri devre dışı bırakıp pencereyi yeniden yükleyin",
-+	"showRunningExtensions": "tüm çalışan eklentileri görün",
-+	"githubMarkdown": "GitHub-tarzı Markdown'ı destekliyoruz. GitHub'da önizleme yaptığımızda sorununuzu düzenleyebilecek ve ekran görüntüleri ekleyebileceksiniz.",
-+	"issueDescriptionRequired": "Lütfen bir açıklama girin.",
-+	"loadingData": "Veri yükleniyor..."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 677e275ea7b1f9addeb42e4cbef7e50dac9047a3 i18n/trk/src/vs/code/electron-main/menus.i18n.json
-  our    100644 ace3ab96e0fa1ead7fddaef7b7dca337a5d22633 i18n/trk/src/vs/code/electron-main/menus.i18n.json
-  their  100644 788541c699b26d6f0d665d72207fd39c60b20d2f i18n/trk/src/vs/code/electron-main/menus.i18n.json
-changed in both
-  base   100644 fe3cdc25532a420cfc5a3d7de34569c07031f336 i18n/trk/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 80d2362504c2993d022a2eba3b68977e0e73b16b i18n/trk/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 a5bd635fbcf73e7d177ca5cfb8bc4fe643a5e6db i18n/trk/src/vs/editor/common/config/commonEditorConfig.i18n.json
-changed in both
-  base   100644 cd45b59aebc6591b7c7c452feb1fa60b84132d2f i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-  our    100644 60d165f6930d7e7b232664d0842137c891794b8b i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-  their  100644 a8cf3c979b7cc776dcaa3f1f3957f496964bdb19 i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-@@ -6,7 +6,40 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"debugNoType": "Hata ayıklayıcının 'type' ögesi atlanamaz ve 'dize' türünde olmalıdır.",
-+=======
-+	"vscode.extension.contributes.debuggers": "Hata ayıklama bağdaştırıcılarına ekleme yapar.",
-+	"vscode.extension.contributes.debuggers.type": "Bu hata ayıklama bağdaştırıcısnın benzersiz tanımlayıcısı.",
-+	"vscode.extension.contributes.debuggers.label": "Bu hata ayıklama bağdaştırıcısnın görünen adı.",
-+	"vscode.extension.contributes.debuggers.program": "Hata ayıklama bağdaştırıcı programının yolu. Yol, ya mutlak ya da eklenti klasörüne görelidir.",
-+	"vscode.extension.contributes.debuggers.args": "Bağdaştırıcıya iletilecek ek argümanlar.",
-+	"vscode.extension.contributes.debuggers.runtime": "Program özniteliğinin yürütülebilir olmadığı halde bir çalışma zamanını gerektirmesi durumu için isteğe bağlı çalışma zamanı.",
-+	"vscode.extension.contributes.debuggers.runtimeArgs": "İsteğe bağlı çalışma zamanı argümanları.",
-+	"vscode.extension.contributes.debuggers.variables": "`launch.json` dosyasındaki interaktif değişkenlerin (ör. ${action.pickProcess}) bir komuta eşlenmesi.",
-+	"vscode.extension.contributes.debuggers.initialConfigurations": "İlk 'launch.json' dosyasının üretimi için yapılandırmalar.",
-+	"vscode.extension.contributes.debuggers.languages": "Hata ayıklama eklentisinin, \"varsayılan hata ayıklayıcı\" olarak değerlendirilebileceği diller listesi.",
-+	"vscode.extension.contributes.debuggers.adapterExecutableCommand": "Belirtilirse; VS Code, hata ayıklama bağdaştırıcısı yürütülebilir dosyasının yolunu ve ona gönderilecek argümanları belirlemek için bu komutu çağırır.",
-+	"vscode.extension.contributes.debuggers.configurationSnippets": "'launch.json' dosyasına yeni yapılandırmalar ekleme parçacıkları.",
-+	"vscode.extension.contributes.debuggers.configurationAttributes": "'launch.json' dosyasını doğrulayacak JSON şema yapılandırmaları.",
-+	"vscode.extension.contributes.debuggers.windows": "Windows'a özel ayarlar.",
-+	"vscode.extension.contributes.debuggers.windows.runtime": "Windows'da kullanılacak çalışma zamanı.",
-+	"vscode.extension.contributes.debuggers.osx": "macOS'e özel ayarlar.",
-+	"vscode.extension.contributes.debuggers.osx.runtime": "macOS'de kullanılacak çalışma zamanı.",
-+	"vscode.extension.contributes.debuggers.linux": "Linux'a özel ayarlar.",
-+	"vscode.extension.contributes.debuggers.linux.runtime": "Linux'da kullanılacak çalışma zamanı.",
-+	"vscode.extension.contributes.breakpoints": "Kesme noktalarına ekleme yapar.",
-+	"vscode.extension.contributes.breakpoints.language": "Bu dil için kesme noktalarını etkinleştir.",
-+	"app.launch.json.title": "Başlat",
-+	"app.launch.json.version": "Bu dosya biçiminin sürümü.",
-+	"app.launch.json.configurations": "Yapılandırma listesi. IntelliSense kullanarak yeni yapılandırmalar ekleyin veya mevcut olanları düzenleyin.",
-+	"app.launch.json.compounds": "Bileşikler listesi. Her bileşik, birlikte çalıştırılacak birden çok yapılandırmaya başvurur.",
-+	"app.launch.json.compound.name": "Bileşiğin adı. Başlatma yapılandırması açılır kutu menüsünde görünür.",
-+	"useUniqueNames": "Lütfen benzersiz yapılandırma adları kullanın.",
-+	"app.launch.json.compound.folder": "Bileşiğin bulunduğu klasörün adı.",
-+	"app.launch.json.compounds.configurations": "Bu bileşiğin parçası olarak başlatılacak yapılandırmaların adları.",
-+	"debugNoType": "Hata ayıklama bağdaştırıcısının 'type' ögesi atlanabilir veya 'dize' türünde olmalıdır.",
-+>>>>>>> .their
- 	"selectDebug": "Ortam Seçin",
- 	"DebugConfig.failed": " '.vscode' klasörü içinde 'launch.json' dosyası oluşturulamıyor ({0}).",
- 	"workspace": "çalışma alanı",
-changed in both
-  base   100644 6460a155a16e3a66a37ede4e962b45593dd333bf i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 3b4248d45e7ecb01c6045e1c3d824ba835249478 i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 f5566ad1a03af72a2dae44bcc49885117f141880 i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -14,7 +14,11 @@
- 	"breakpointRemoved": "Kesme noktası kaldırıldı, {0}. satır, {1} dosyası",
- 	"compoundMustHaveConfigurations": "Bileşik, birden çok yapılandırmayı başlatmak için \"configurations\" özniteliği bulundurmalıdır.",
- 	"noConfigurationNameInWorkspace": "Çalışma alanında '{0}' başlatma yapılandırması bulunamadı.",
-+<<<<<<< .our
- 	"multipleConfigurationNamesInWorkspace": "Çalışma alanında birden fazla '{0}' başlatma yapılandırması var. Yapılandırmayı belirtmek için klasör adını kullanın.",
-+=======
-+	"multipleConfigurationNamesInWorkspace": "Çalışma alanında birden fazla `{0}` başlatma yapılandırması var. Yapılandırmayı belirtmek için klasör adını kullanın.",
-+>>>>>>> .their
- 	"noFolderWithName": "'{2}' bileşiğindeki '{1}' yapılandırması için '{0}' adlı klasör bulunamadı.",
- 	"configMissing": "'launch.json' dosyasında '{0}' yapılandırması eksik.",
- 	"launchJsonDoesNotExist": "'launch.json' mevcut değil.",
-changed in both
-  base   100644 0899baae71756f2ab6fd9c2357065d8c83701176 i18n/trk/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-  our    100644 e72bf6372568811c4301ae015d114cb2ba222f56 i18n/trk/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-  their  100644 d7ea7654fbbe8543d8a8e18582f5a742da36dee6 i18n/trk/src/vs/workbench/parts/extensions/browser/extensionEditor.i18n.json
-changed in both
-  base   100644 d50a2c42059ffc9031a251ba9aefa730fc19e764 i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-  our    100644 31455f2520d59d46d91c9a904ee230bd79e973bd i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-  their  100644 d2997058702f6e8936344a7ad5a9b892742e9550 i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.i18n.json
-@@ -6,9 +6,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"restart1": "Eklentileri Ayrımla",
- 	"restart2": "Eklentileri ayrımlamak için yeniden başlatma gereklidir. '{0}'u yeniden başlatmak istiyor musunuz?",
- 	"restart3": "Yeniden Başlat",
- 	"cancel": "İptal",
-+=======
-+	"noPro": "Eklentileri ayrımlamak için,  `--inspect-extensions=<port>` parametresi ile çalıştırın.",
-+>>>>>>> .their
- 	"selectAndStartDebug": "Ayrımlamayı durdurmak için tıklayın."
- }
-\ No newline at end of file
-changed in both
-  base   100644 cdc94b0f2132c60d3b9e55bb33f29092c1160e01 i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 c1fd4a38b55f33cc75802aa90a13a4a917da2acc i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 a26140e1ab9a53e5bfc0f988f77a7d2b2f8fd5b3 i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -10,8 +10,12 @@
- 	"searchMarketplace": "Marketi Ara",
- 	"dynamicWorkspaceRecommendation": "Bu eklenti {0} deposundaki kullanıcılar arasında popüler olduğu için ilginizi çekebilir.",
- 	"exeBasedRecommendation": "Bu eklenti, sizde {0} kurulu olduğu için tavsiye ediliyor.",
-+<<<<<<< .our
- 	"fileBasedRecommendation": "Bu eklenti yakınlarda açtığınız dosyalara dayanarak tavsiye ediliyor.",
- 	"workspaceRecommendation": "Bu eklenti geçerli çalışma alanı kullanıcıları tarafından tavsiye ediliyor.",
-+=======
-+	"dynamicWorkspaceRecommendation": "Bu eklenti şu anki çalışma alanındaki diğer birçok kullanıcı tarafından kullanıldığı için ilginizi çekebilir.",
-+>>>>>>> .their
- 	"reallyRecommended2": "'{0}' eklentisi bu dosya türü için tavsiye edilir.",
- 	"reallyRecommendedExtensionPack": "'{0}' eklenti paketi bu dosya türü için tavsiye edilir.",
- 	"install": "Yükle",
-changed in both
-  base   100644 d7f8e0bba99fa3eba3bdaafa9ce3237d60f0b96c i18n/trk/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 a0bd993aafdcb34f7a0ceda2607b5dc27302c672 i18n/trk/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 00780d6b0c2e5ef548875998f431592116b61561 i18n/trk/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -9,7 +9,10 @@
- 	"emptyUserSettingsHeader": "Varsayılan ayarların üzerine yazmak için ayarlarınızı buraya yerleştirin.",
- 	"emptyWorkspaceSettingsHeader": "Varsayılan kullanıcı ayarlarının üzerine yazmak için ayarlarınızı buraya yerleştirin.",
- 	"emptyFolderSettingsHeader": "Çalışma alanı ayarlarındakilerin üzerine yazmak için klasör ayarlarınızı buraya yerleştirin.",
-+<<<<<<< .our
- 	"reportSettingsSearchIssue": "Sorun Bildir",
-+=======
-+>>>>>>> .their
- 	"newExtensionLabel": "\"{0}\" Eklentisini Göster",
- 	"editTtile": "Düzenle",
- 	"replaceDefaultValue": "Ayarlarda Değiştir",
-changed in both
-  base   100644 36924d0a44b8cd126141ae2f9e6bc3ce7cafc5b7 i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-  our    100644 69d4953e71c1df96cd0358ccbf46ac3587d73122 i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-  their  100644 7c27215e26ad245721a10b9bbeb829e75a18d0fc i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-@@ -9,9 +9,12 @@
- 	"terminal.integrated.a11yBlankLine": "Boş satır",
- 	"terminal.integrated.a11yPromptLabel": "Terminal girdisi",
- 	"terminal.integrated.a11yTooMuchOutput": "Gösterilecek çok fazla çıktı var, okumak için satırları manuel olarak gezin.",
-+<<<<<<< .our
- 	"yes": "Evet",
- 	"no": "Hayır",
- 	"dontShowAgain": "Tekrar Gösterme",
-+=======
-+>>>>>>> .their
- 	"terminal.integrated.copySelection.noSelection": "Terminalde kopyalanacak bir seçim bulunmuyor",
- 	"terminal.integrated.exitedWithCode": "Terminal işlemi şu çıkış koduyla sonlandı: {0}",
- 	"terminal.integrated.waitOnExit": "Terminali kapatmak için lütfen bir tuşa basın",
-changed in both
-  base   100644 d2cd7701ffb1504dda1860dbe1224113422b13dd package.json
-  our    100644 d0e982ce0b76c5b1b5eb02b673e459e47f3353a4 package.json
-  their  100644 9190fea96a39cd3bf39f15172915b02525a8535d package.json
-@@ -1,7 +1,12 @@
- {
-   "name": "code-oss-dev",
-+<<<<<<< .our
-   "version": "1.27.0",
-   "distro": "a4155d9780fbbc94ead6cb3017dd0fc3806c57b8",
-+=======
-+  "version": "1.20.1",
-+  "distro": "4957472198ae7ca4a3ed49fd40d6d082c0bc592b",
-+>>>>>>> .their
-   "author": {
-     "name": "Microsoft Corporation"
-   },
-@@ -45,6 +50,7 @@
-     "sudo-prompt": "8.2.0",
-     "v8-inspect-profiler": "^0.0.8",
-     "vscode-chokidar": "1.6.2",
-+<<<<<<< .our
-     "vscode-debugprotocol": "1.31.0",
-     "vscode-nsfw": "1.0.17",
-     "vscode-ripgrep": "1.1.0",
-@@ -52,6 +58,13 @@
-     "vscode-xterm": "3.7.0-beta4",
-     "winreg": "^1.2.4",
-     "yauzl": "^2.9.1"
-+=======
-+    "vscode-debugprotocol": "1.25.0",
-+    "vscode-ripgrep": "0.7.1-patch.0.1",
-+    "vscode-textmate": "^3.2.0",
-+    "vscode-xterm": "3.1.0-beta15",
-+    "yauzl": "2.8.0"
-+>>>>>>> .their
-   },
-   "devDependencies": {
-     "7zip": "0.0.6",
-changed in both
-  base   100644 d458afd8dade10c4da243065015e812f462166d3 src/main.js
-  our    100644 711217d64e2bdc43f33652d0bed34caa052cc331 src/main.js
-  their  100644 b099013dbdc75c5add8b5de86dc7a2835bc227e8 src/main.js
-@@ -7,6 +7,7 @@
- const perf = require('./vs/base/common/performance');
- perf.mark('main:started');
- 
-+<<<<<<< .our
- Error.stackTraceLimit = 100; // increase number of stack frames (from 10, https://github.com/v8/v8/wiki/Stack-Trace-API)
- 
- const fs = require('fs');
-@@ -51,6 +52,14 @@
- if (isTempPortable) {
- 	process.env[process.platform === 'win32' ? 'TEMP' : 'TMPDIR'] = portableTempPath;
- }
-+=======
-+// Install an uncaught exception handler very early on to prevent
-+// the default Electron dialog popping up
-+process.on('uncaughtException', error => console.error(error));
-+
-+// Perf measurements
-+global.perfStartTime = Date.now();
-+>>>>>>> .their
- 
- //#region Add support for using node_modules.asar
- (function () {
-changed in both
-  base   100644 400b8610977e771f443c1c0a21129eea48db5042 src/vs/code/electron-browser/issue/issueReporterMain.ts
-  our    100644 2e25cb33248a3d343edf9a79d532a58614f0a2b1 src/vs/code/electron-browser/issue/issueReporterMain.ts
-  their  100644 c0676aa709203ee235d1de62f04026299fb243f8 src/vs/code/electron-browser/issue/issueReporterMain.ts
-@@ -51,6 +51,8 @@
- 	state?: string;
- }
- 
-+const MAX_URL_LENGTH = 5400;
-+
- export interface IssueReporterConfiguration extends IWindowConfiguration {
- 	data: IssueReporterData;
- 	features: IssueReporterFeatures;
-@@ -68,12 +70,18 @@
- 	private telemetryService: ITelemetryService;
- 	private logService: ILogService;
- 	private issueReporterModel: IssueReporterModel;
-+<<<<<<< .our
- 	private numberOfSearchResultsDisplayed = 0;
- 	private receivedSystemInfo = false;
- 	private receivedPerformanceInfo = false;
- 	private shouldQueueSearch = false;
- 
- 	private previewButton: Button;
-+=======
-+	private shouldQueueSearch = true;
-+	private receivedSystemInfo = false;
-+	private receivedPerformanceInfo = false;
-+>>>>>>> .their
- 
- 	constructor(configuration: IssueReporterConfiguration) {
- 		super();
-@@ -89,10 +97,14 @@
- 			extensionsDisabled: !!this.environmentService.disableExtensions,
- 		});
- 
-+<<<<<<< .our
- 		this.previewButton = new Button(document.getElementById('issue-reporter'));
- 
- 		ipcRenderer.on('issuePerformanceInfoResponse', (event, info) => {
- 			this.logService.trace('issueReporter: Received performance data');
-+=======
-+		ipcRenderer.on('issuePerformanceInfoResponse', (event, info) => {
-+>>>>>>> .their
- 			this.issueReporterModel.update(info);
- 			this.receivedPerformanceInfo = true;
- 
-@@ -101,21 +113,33 @@
- 			this.updateWorkspaceInfo(state);
- 			this.updatePreviewButtonState();
- 		});
-+<<<<<<< .our
- 
- 		ipcRenderer.on('issueSystemInfoResponse', (event, info) => {
- 			this.logService.trace('issueReporter: Received system data');
- 			this.issueReporterModel.update({ systemInfo: info });
- 			this.receivedSystemInfo = true;
- 
-+=======
-+
-+		ipcRenderer.on('issueSystemInfoResponse', (event, info) => {
-+			this.issueReporterModel.update({ systemInfo: info });
-+			this.receivedSystemInfo = true;
-+
-+>>>>>>> .their
- 			this.updateSystemInfo(this.issueReporterModel.getData());
- 			this.updatePreviewButtonState();
- 		});
- 
- 		ipcRenderer.send('issueSystemInfoRequest');
-+<<<<<<< .our
- 		if (configuration.data.issueType === IssueType.PerformanceIssue) {
- 			ipcRenderer.send('issuePerformanceInfoRequest');
- 		}
- 		this.logService.trace('issueReporter: Sent data requests');
-+=======
-+		ipcRenderer.send('issuePerformanceInfoRequest');
-+>>>>>>> .their
- 
- 		if (window.document.documentElement.lang !== 'en') {
- 			show(document.getElementById('english'));
-@@ -304,12 +328,17 @@
- 	}
- 
- 	private setEventHandlers(): void {
-+<<<<<<< .our
- 		this.addEventListener('issue-type', 'change', (event: Event) => {
- 			const issueType = parseInt((<HTMLInputElement>event.target).value);
- 			this.issueReporterModel.update({ issueType: issueType });
- 			if (issueType === IssueType.PerformanceIssue && !this.receivedPerformanceInfo) {
- 				ipcRenderer.send('issuePerformanceInfoRequest');
- 			}
-+=======
-+		document.getElementById('issue-type').addEventListener('change', (event: Event) => {
-+			this.issueReporterModel.update({ issueType: parseInt((<HTMLInputElement>event.target).value) });
-+>>>>>>> .their
- 			this.updatePreviewButtonState();
- 			this.render();
- 		});
-@@ -353,6 +382,7 @@
- 			}
- 		});
- 
-+<<<<<<< .our
- 		this.addEventListener('description', 'input', (event: Event) => {
- 			const issueDescription = (<HTMLInputElement>event.target).value;
- 			this.issueReporterModel.update({ issueDescription });
-@@ -362,6 +392,10 @@
- 				const title = (<HTMLInputElement>document.getElementById('issue-title')).value;
- 				this.searchVSCodeIssues(title, issueDescription);
- 			}
-+=======
-+		document.getElementById('description').addEventListener('input', (event: Event) => {
-+			this.issueReporterModel.update({ issueDescription: (<HTMLInputElement>event.target).value });
-+>>>>>>> .their
- 		});
- 
- 		this.addEventListener('issue-title', 'input', (e) => {
-@@ -383,16 +417,27 @@
- 
- 		this.previewButton.onDidClick(() => this.createIssue());
- 
-+<<<<<<< .our
- 		this.addEventListener('disableExtensions', 'click', () => {
- 			ipcRenderer.send('workbenchCommand', 'workbench.action.reloadWindowWithExtensionsDisabled');
- 		});
- 
- 		this.addEventListener('disableExtensions', 'keydown', (e: KeyboardEvent) => {
- 			e.stopPropagation();
-+=======
-+		const disableExtensions = document.getElementById('disableExtensions');
-+		disableExtensions.addEventListener('click', () => {
-+			ipcRenderer.send('workbenchCommand', 'workbench.extensions.action.disableAll');
-+			ipcRenderer.send('workbenchCommand', 'workbench.action.reloadWindow');
-+		});
-+
-+		disableExtensions.addEventListener('keydown', (e) => {
-+>>>>>>> .their
- 			if (e.keyCode === 13 || e.keyCode === 32) {
- 				ipcRenderer.send('workbenchCommand', 'workbench.extensions.action.disableAll');
- 				ipcRenderer.send('workbenchCommand', 'workbench.action.reloadWindow');
- 			}
-+<<<<<<< .our
- 		});
- 
- 		document.onkeydown = (e: KeyboardEvent) => {
-@@ -401,6 +446,29 @@
- 			if (cmdOrCtrlKey && e.keyCode === 13) {
- 				if (this.createIssue()) {
- 					remote.getCurrentWindow().close();
-+=======
-+		});
-+
-+		const showRunning = document.getElementById('showRunning');
-+		showRunning.addEventListener('click', () => {
-+			ipcRenderer.send('workbenchCommand', 'workbench.action.showRuntimeExtensions');
-+		});
-+
-+		showRunning.addEventListener('keydown', (e) => {
-+			if (e.keyCode === 13 || e.keyCode === 32) {
-+				ipcRenderer.send('workbenchCommand', 'workbench.action.showRuntimeExtensions');
-+			}
-+		});
-+
-+		// Cmd+Enter or Mac or Ctrl+Enter on other platforms previews issue and closes window
-+		if (platform.isMacintosh) {
-+			let prevKeyWasCommand = false;
-+			document.onkeydown = (e: KeyboardEvent) => {
-+				if (prevKeyWasCommand && e.keyCode === 13) {
-+					if (this.createIssue()) {
-+						remote.getCurrentWindow().close();
-+					}
-+>>>>>>> .their
- 				}
- 			}
- 
-@@ -475,6 +543,7 @@
- 		}
- 	}
- 
-+<<<<<<< .our
- 	private searchExtensionIssues(title: string): void {
- 		const url = this.getExtensionGitHubUrl();
- 		if (title) {
-@@ -499,6 +568,34 @@
- 		const similarIssues = document.getElementById('similar-issues');
- 		similarIssues.innerHTML = '';
- 		this.numberOfSearchResultsDisplayed = 0;
-+=======
-+	private updatePreviewButtonState() {
-+		const submitButton = <HTMLButtonElement>document.getElementById('github-submit-btn');
-+		if (this.isPreviewEnabled()) {
-+			submitButton.disabled = false;
-+			submitButton.textContent = localize('previewOnGitHub', "Preview on GitHub");
-+		} else {
-+			submitButton.disabled = true;
-+			submitButton.textContent = localize('loadingData', "Loading data...");
-+		}
-+	}
-+
-+	private isPreviewEnabled() {
-+		const issueType = this.issueReporterModel.getData().issueType;
-+		if (issueType === IssueType.Bug && this.receivedSystemInfo) {
-+			return true;
-+		}
-+
-+		if (issueType === IssueType.PerformanceIssue && this.receivedSystemInfo && this.receivedPerformanceInfo) {
-+			return true;
-+		}
-+
-+		if (issueType === IssueType.FeatureRequest) {
-+			return true;
-+		}
-+
-+		return false;
-+>>>>>>> .their
- 	}
- 
- 	@debounce(300)
-@@ -669,6 +766,7 @@
- 		hide(problemSourceHelpText);
- 		hide(extensionSelector);
- 
-+
- 		if (issueType === IssueType.Bug) {
- 			show(blockContainer);
- 			show(systemBlock);
-@@ -690,18 +788,30 @@
- 			show(workspaceBlock);
- 			show(problemSource);
- 
-+<<<<<<< .our
- 			if (fileOnExtension) {
- 				show(extensionSelector);
- 			} else {
- 				show(extensionsBlock);
- 				show(problemSourceHelpText);
- 			}
-+=======
-+			descriptionTitle.innerHTML = `${localize('stepsToReproduce', "Steps to Reproduce")} <span class="required-input">*</span>`;
-+			descriptionSubtitle.innerHTML = localize('performanceIssueDesciption', "When did this performance issue happen? Does it occur on startup or after a specific series of actions? We support GitHub-flavored Markdown. You will be able to edit your issue and add screenshots when we preview it on GitHub.");
-+		} else {
-+			hide(systemBlock);
-+			hide(processBlock);
-+			hide(workspaceBlock);
-+			hide(extensionsBlock);
-+			hide(disabledExtensions);
-+>>>>>>> .their
- 
- 			descriptionTitle.innerHTML = `${localize('stepsToReproduce', "Steps to Reproduce")} <span class="required-input">*</span>`;
- 			descriptionSubtitle.innerHTML = localize('performanceIssueDesciption', "When did this performance issue happen? Does it occur on startup or after a specific series of actions? We support GitHub-flavored Markdown. You will be able to edit your issue and add screenshots when we preview it on GitHub.");
- 		} else if (issueType === IssueType.FeatureRequest) {
- 			descriptionTitle.innerHTML = `${localize('description', "Description")} <span class="required-input">*</span>`;
- 			descriptionSubtitle.innerHTML = localize('featureRequestDescription', "Please describe the feature you would like to see. We support GitHub-flavored Markdown. You will be able to edit your issue and add screenshots when we preview it on GitHub.");
-+<<<<<<< .our
- 			show(problemSource);
- 
- 			if (fileOnExtension) {
-@@ -714,6 +824,8 @@
- 
- 			descriptionTitle.innerHTML = `${localize('expectedResults', "Expected Results")} <span class="required-input">*</span>`;
- 			descriptionSubtitle.innerHTML = localize('settingsSearchResultsDescription', "Please list the results that you were expecting to see when you searched with this query. We support GitHub-flavored Markdown. You will be able to edit your issue and add screenshots when we preview it on GitHub.");
-+=======
-+>>>>>>> .their
- 		}
- 	}
- 
-@@ -775,19 +887,36 @@
- 		*/
- 		this.telemetryService.publicLog('issueReporterSubmit', { issueType: this.issueReporterModel.getData().issueType, numSimilarIssuesDisplayed: this.numberOfSearchResultsDisplayed });
- 
-+<<<<<<< .our
- 		const baseUrl = this.getIssueUrlWithTitle((<HTMLInputElement>document.getElementById('issue-title')).value);
-+=======
-+		const issueTitle = encodeURIComponent((<HTMLInputElement>document.getElementById('issue-title')).value);
-+		const queryStringPrefix = product.reportIssueUrl.indexOf('?') === -1 ? '?' : '&';
-+		const baseUrl = `${product.reportIssueUrl}${queryStringPrefix}title=${issueTitle}&body=`;
-+>>>>>>> .their
- 		const issueBody = this.issueReporterModel.serialize();
- 		let url = baseUrl + `&body=${encodeURIComponent(issueBody)}`;
- 
-+<<<<<<< .our
- 		if (url.length > MAX_URL_LENGTH) {
- 			clipboard.writeText(issueBody);
- 			url = baseUrl + `&body=${encodeURIComponent(localize('pasteData', "We have written the needed data into your clipboard because it was too large to send. Please paste."))}`;
-+=======
-+		const lengthValidationElement = document.getElementById('url-length-validation-error');
-+		if (url.length > MAX_URL_LENGTH) {
-+			lengthValidationElement.textContent = localize('urlLengthError', "The data exceeds the length limit of {0} characters. The data is length {1}.", MAX_URL_LENGTH, url.length);
-+			show(lengthValidationElement);
-+			return false;
-+		} else {
-+			hide(lengthValidationElement);
-+>>>>>>> .their
- 		}
- 
- 		shell.openExternal(url);
- 		return true;
- 	}
- 
-+<<<<<<< .our
- 	private getExtensionGitHubUrl(): string {
- 		let repositoryUrl = '';
- 		const bugsUrl = this.getExtensionBugsUrl();
-@@ -815,6 +944,8 @@
- 		return `${repositoryUrl}${queryStringPrefix}title=${encodeURIComponent(issueTitle)}`;
- 	}
- 
-+=======
-+>>>>>>> .their
- 	private updateSystemInfo = (state) => {
- 		const target = document.querySelector('.block-system .block-info');
- 		let tableHtml = '';
-changed in both
-  base   100644 86d5a0afc344211db40807ec5ceb13e6aaeae8bd src/vs/code/electron-browser/issue/issueReporterPage.ts
-  our    100644 afa0c79c4b86524a7065a34520049d4f1bbdcf14 src/vs/code/electron-browser/issue/issueReporterPage.ts
-  their  100644 14742da3b7362f75ce9c58b70fa09ef428bf6705 src/vs/code/electron-browser/issue/issueReporterPage.ts
-@@ -13,12 +13,28 @@
- 
- 	<div class="section">
- 		<div class="input-group">
-+<<<<<<< .our
- 			<label class="inline-label" for="issue-type">${escape(localize('issueTypeLabel', "This is a"))}</label>
- 			<select id="issue-type" class="inline-form-control">
-+=======
-+			<label id="issue-type-label" class="inline-form-control" for="issue-type">${escape(localize('issueTypeLabel', "This is a"))}</label>
-+			<select id="issue-type" class="inline-form-control">
-+				<option value="0">${escape(localize('bugReporter', "Bug Report"))}</option>
-+				<option value="1">${escape(localize('performanceIssue', "Performance Issue"))}</option>
-+				<option value="2">${escape(localize('featureRequest', "Feature Request"))}</option>
-+			</select>
-+		</div>
-+
-+		<div class="input-group">
-+			<label id="issue-title-label" for="issue-title">${escape(localize('issueTitleLabel', "Title"))} <span class="required-input">*</span></label>
-+			<input id="issue-title" type="text" class="inline-form-control" placeholder="${escape(localize('issueTitleRequired', "Please enter a title."))}" required>
-+			<small id="similar-issues">
-+>>>>>>> .their
- 				<!-- To be dynamically filled -->
- 			</select>
- 		</div>
- 
-+<<<<<<< .our
- 		<div class="input-group" id="problem-source">
- 			<label class="inline-label" for="issue-source">${escape(localize('issueSourceLabel', "File on"))}</label>
- 			<select id="issue-source" class="inline-form-control">
-@@ -34,9 +50,71 @@
- 				<select id="extension-selector" class="inline-form-control">
- 					<!-- To be dynamically filled -->
- 				</select>
-+=======
-+	<div class="system-info">
-+		<div id="block-container">
-+			<div class="block block-system">
-+				<details>
-+					<summary>${escape(localize('systemInfo', "My System Info"))}
-+						<div class="include-data">
-+							<input class="sendData" type="checkbox" id="includeSystemInfo" checked>
-+								<label class="caption" for="includeSystemInfo">${escape(localize('sendData', "Send my data"))}</label>
-+							</input>
-+						</div>
-+					</summary>
-+					<div class="block-info">
-+						<!-- To be dynamically filled -->
-+					</div>
-+				</details>
-+			</div>
-+			<div class="block block-process">
-+				<details>
-+					<summary>${escape(localize('processes', "Currently Running Processes"))}
-+						<div class="include-data">
-+							<input class="sendData"  type="checkbox" id="includeProcessInfo" checked>
-+								<label class="caption" for="includeProcessInfo">${escape(localize('sendData', "Send my data"))}</label>
-+							</input>
-+						</div>
-+					</summary>
-+					<div class="block-info">
-+						<!-- To be dynamically filled -->
-+					</div>
-+				</details>
-+			</div>
-+			<div class="block block-workspace">
-+				<details>
-+					<summary>${escape(localize('workspaceStats', "My Workspace Stats"))}
-+						<div class="include-data">
-+							<input class="sendData"  type="checkbox" id="includeWorkspaceInfo" checked>
-+								<label class="caption" for="includeWorkspaceInfo">${escape(localize('sendData', "Send my data"))}</label>
-+							</input>
-+						</div>
-+					</summary>
-+					<pre class="block-info">
-+						<code>
-+							<!-- To be dynamically filled -->
-+						</code>
-+					</pre>
-+				</details>
-+			</div>
-+			<div class="block block-extensions">
-+				<details>
-+					<summary>${escape(localize('extensions', "My Extensions"))}
-+						<div class="include-data">
-+							<input class="sendData"  type="checkbox" id="includeExtensions" checked>
-+								<label class="caption" for="includeExtensions">${escape(localize('sendData', "Send my data"))}</label>
-+							</input>
-+						</div>
-+					</summary>
-+					<div class="block-info">
-+						<!-- To be dynamically filled -->
-+					</div>
-+				</details>
-+>>>>>>> .their
- 			</div>
- 		</div>
- 
-+<<<<<<< .our
- 		<div class="input-group">
- 			<label class="inline-label" for="issue-title">${escape(localize('issueTitleLabel', "Title"))} <span class="required-input">*</span></label>
- 			<input id="issue-title" type="text" class="inline-form-control" placeholder="${escape(localize('issueTitleRequired', "Please enter a title."))}" required>
-@@ -44,6 +122,25 @@
- 			<small id="similar-issues">
- 				<!-- To be dynamically filled -->
- 			</small>
-+=======
-+	<div class="section">
-+		<div id="disabledExtensions">
-+			<div class="extensions-form">
-+				<label>${escape(localize('tryDisablingExtensions', "Is the problem reproducible when extensions are disabled?"))}</label>
-+				<div class="form-buttons">
-+					<div class="choice">
-+						<input type="radio" id="reproducesWithoutExtensions" value=true name="reprosWithoutExtensions" />
-+						<label for="reproducesWithoutExtensions">${escape(localize('yes', "Yes"))}</label>
-+					</div>
-+					<div class="choice">
-+						<input type="radio" id="reproducesWithExtensions" value=false name="reprosWithoutExtensions" checked/>
-+						<label for="reproducesWithExtensions">${escape(localize('no', "No"))}</label>
-+					</div>
-+				</div>
-+			</div>
-+			<div class="instructions">${escape(localize('disableExtensionsLabel', "Try to reproduce the problem after "))}<span tabIndex=0 role="button" id="disableExtensions" class="workbenchCommand">${escape(localize('disableExtensions', "disabling all extensions and reloading the window"))}</span>.</div>
-+			<div class="instructions">${escape(localize('showRunningExtensionsLabel', "If you suspect it's an extension issue, "))}<span tabIndex=0 role="button"id="showRunning" class="workbenchCommand">${escape(localize('showRunningExtensions', "see all running extensions"))}</span>.</div>
-+>>>>>>> .their
- 		</div>
- 
- 	</div>
-@@ -56,7 +153,11 @@
- 			<!-- To be dynamically filled -->
- 		</div>
- 		<div class="block-info-text">
-+<<<<<<< .our
- 			<textarea name="description" id="description" placeholder="${escape(localize('details', "Please enter details."))}" required></textarea>
-+=======
-+			<textarea name="description" id="description" cols="100" rows="12" placeholder="${escape(localize('details', "Please enter details."))}" required></textarea>
-+>>>>>>> .their
- 		</div>
- 	</div>
- 
-changed in both
-  base   100644 b0da6839f0ee6dec0e298b5475601cfbef9e151f src/vs/code/electron-browser/issue/media/issueReporter.css
-  our    100644 aeb02c73f2bd814e5226d69fd77698600c612772 src/vs/code/electron-browser/issue/media/issueReporter.css
-  their  100644 e5e13bf685f73db3a6ae0665d174c72fcb920401 src/vs/code/electron-browser/issue/media/issueReporter.css
-@@ -33,7 +33,16 @@
- }
- 
- .section {
-+<<<<<<< .our
- 	margin-bottom: .5em;
-+=======
-+	margin-bottom: 1.5em;
-+}
-+
-+#similar-issues {
-+	margin-left: 10%;
-+	display: block;
-+>>>>>>> .their
- }
- 
- /**
-@@ -50,6 +59,13 @@
- 	border: 1px solid #ced4da;
- }
- 
-+<<<<<<< .our
-+=======
-+.inline-form-control {
-+	display: inline-block !important;
-+}
-+
-+>>>>>>> .their
- textarea {
- 	overflow: auto;
- 	resize: vertical;
-@@ -108,7 +124,11 @@
- 
- .block .block-info {
- 	width: 100%;
-+<<<<<<< .our
- 	font-family: Monaco, Menlo, Consolas, "Droid Sans Mono", "Inconsolata", "Courier New", monospace, "Droid Sans Fallback";
-+=======
-+	font-family: 'Menlo', 'Courier New', 'Courier', monospace;
-+>>>>>>> .their
- 	font-size: 12px;
- 	overflow: auto;
- 	overflow-wrap: break-word;
-@@ -168,8 +188,40 @@
- 	margin-bottom: 1em;
- }
- 
-+<<<<<<< .our
- #extension-selection {
- 	margin-top: 1em;
-+=======
-+.extensions-form {
-+	display: flex;
-+}
-+
-+.extensions-form > .form-buttons {
-+	display: flex;
-+	margin-left: 20px;
-+}
-+
-+.extensions-form > .form-buttons > .choice {
-+	margin-right: 35px;
-+	position: relative;
-+}
-+
-+.extensions-form > .form-buttons > .choice > label, .extensions-form  > .form-buttons > .choice > input {
-+	cursor: pointer;
-+	height: 100%;
-+	margin-top: 1px;
-+}
-+
-+.extensions-form > .form-buttons > .choice > label {
-+	position: absolute;
-+	top: 50%;
-+	margin-top: -50%;
-+	left: 20px;
-+}
-+
-+.system-info {
-+	margin-bottom: 1.25em;
-+>>>>>>> .their
- }
- 
- select, input, textarea {
-@@ -177,12 +229,40 @@
- 	margin-top: 10px;
- }
- 
-+<<<<<<< .our
-+=======
-+summary {
-+	border: 1px solid transparent;
-+	padding: 0 10px;
-+	margin-bottom: 5px;
-+}
-+>>>>>>> .their
- 
- .validation-error {
- 	font-size: 12px;
- 	margin-top: 1em;
- }
- 
-+<<<<<<< .our
-+=======
-+.include-data {
-+	display: inline-block;
-+	position: relative;
-+}
-+
-+.include-data > .caption {
-+	display: inline-block;
-+	font-size: 12px;
-+	position: absolute;
-+	width: 80px;
-+	top: 2px;
-+	left: 30px;
-+}
-+
-+.sendData {
-+	margin-left: 1em;
-+}
-+>>>>>>> .their
- 
- input[type="checkbox"] {
- 	width: auto;
-@@ -206,6 +286,7 @@
- 	margin-top: .5em;
- }
- 
-+<<<<<<< .our
- a, .workbenchCommand {
- 	cursor: pointer;
- 	border: 1px solid transparent;
-@@ -214,6 +295,11 @@
- .workbenchCommand:disabled {
- 	color: #868e96;
- 	cursor: default
-+=======
-+.workbenchCommand:disabled {
-+	color: #868e96;
-+	cursor: pointer;
-+>>>>>>> .their
- }
- 
- .block-extensions .block-info {
-@@ -240,6 +326,7 @@
- 	color: #be1100;
- }
- 
-+<<<<<<< .our
- .section .input-group .validation-error {
- 	margin-left: 15%;
- }
-@@ -280,10 +367,52 @@
- 
- 	.section .inline-form-control  {
- 		width: calc(85% - 5px);
-+=======
-+button {
-+	background-color: #007ACC;
-+	color: #fff;
-+}
-+
-+#issue-type-label {
-+	width: 95px;
-+}
-+
-+#issue-type {
-+	width: calc(100% - 100px);
-+}
-+
-+#issue-title-label {
-+	width: 80px;
-+	display: inline-block;
-+}
-+
-+#issue-title {
-+	width: calc(100% - 85px);
-+}
-+
-+
-+@media (max-width: 950px) {
-+	#issue-type-label {
-+		width: 12%;
-+	}
-+
-+	#issue-type {
-+		width: calc(88% - 5px);
-+	}
-+
-+	#issue-title-label {
-+		width: 10%;
-+		display: inline-block
-+	}
-+
-+	#issue-title {
-+		width: calc(90% - 5px);
-+>>>>>>> .their
- 	}
- }
- 
- @media (max-width: 620px) {
-+<<<<<<< .our
- 	.section .inline-label {
- 		display: none !important;
- 	}
-@@ -352,3 +481,17 @@
- 	text-overflow: ellipsis;
- 	overflow: hidden;
- }
-+=======
-+	#issue-title-label, #issue-type-label {
-+		display: none !important;
-+	}
-+
-+	#issue-type, #issue-title {
-+		width: 100%;
-+	}
-+
-+	#similar-issues {
-+		margin-left: 0;
-+	}
-+}
-+>>>>>>> .their
-changed in both
-  base   100644 926ce809c15e50b217e7611d57950e1abb2b320e src/vs/code/electron-main/diagnostics.ts
-  our    100644 3bb9e182899533e24fe8967328f2174571df8e45 src/vs/code/electron-main/diagnostics.ts
-  their  100644 20101529482e798fcb9a3661e923227ec6db57b7 src/vs/code/electron-main/diagnostics.ts
-@@ -41,7 +41,11 @@
- }
- 
- export interface PerformanceInfo {
-+<<<<<<< .our
- 	processInfo?: string;
-+=======
-+	processInfo?: ProcessInfo[];
-+>>>>>>> .their
- 	workspaceInfo?: string;
- }
- 
-@@ -84,6 +88,7 @@
- 			});
- 		}
- 
-+<<<<<<< .our
- 		return Promise.all(workspaceStatPromises).then(() => {
- 			return {
- 				processInfo: formatProcessList(info, rootProcess),
-@@ -95,6 +100,12 @@
- 				workspaceInfo: `Unable to calculate workspace stats: ${error}`
- 			};
- 		});
-+=======
-+		return {
-+			processInfo: getProcessList(info, rootProcess),
-+			workspaceInfo: workspaceInfoMessages.join('\n')
-+		};
-+>>>>>>> .their
- 	});
- }
- 
-@@ -106,8 +117,12 @@
- 		'Memory (System)': `${(os.totalmem() / GB).toFixed(2)}GB (${(os.freemem() / GB).toFixed(2)}GB free)`,
- 		VM: `${Math.round((virtualMachineHint.value() * 100))}%`,
- 		'Screen Reader': `${app.isAccessibilitySupportEnabled() ? 'yes' : 'no'}`,
-+<<<<<<< .our
- 		'Process Argv': `${info.mainArguments.join(' ')}`,
- 		'GPU Status': app.getGPUFeatureStatus()
-+=======
-+		'Process Argv': `${info.mainArguments.join(' ')}`
-+>>>>>>> .their
- 	};
- 
- 	const cpus = os.cpus();
-@@ -233,11 +248,55 @@
- 	return output.join('\n');
- }
- 
-+<<<<<<< .our
- function expandGPUFeatures(): string {
- 	const gpuFeatures = app.getGPUFeatureStatus();
- 	const longestFeatureName = Math.max(...Object.keys(gpuFeatures).map(feature => feature.length));
- 	// Make columns aligned by adding spaces after feature name
- 	return Object.keys(gpuFeatures).map(feature => `${feature}:  ${repeat(' ', longestFeatureName - feature.length)}  ${gpuFeatures[feature]}`).join('\n                  ');
-+=======
-+function getProcessList(info: IMainProcessInfo, rootProcess: ProcessItem): ProcessInfo[] {
-+	const mapPidToWindowTitle = new Map<number, string>();
-+	info.windows.forEach(window => mapPidToWindowTitle.set(window.pid, window.title));
-+
-+	const processes: ProcessInfo[] = [];
-+
-+	if (rootProcess) {
-+		getProcessItem(mapPidToWindowTitle, processes, rootProcess, 0);
-+	}
-+
-+	return processes;
-+}
-+
-+function getProcessItem(mapPidToWindowTitle: Map<number, string>, processes: ProcessInfo[], item: ProcessItem, indent: number): void {
-+	const isRoot = (indent === 0);
-+
-+	const MB = 1024 * 1024;
-+
-+	// Format name with indent
-+	let name: string;
-+	if (isRoot) {
-+		name = `${product.applicationName} main`;
-+	} else {
-+		name = `${repeat('--', indent)} ${item.name}`;
-+
-+		if (item.name === 'window') {
-+			name = `${name} (${mapPidToWindowTitle.get(item.pid)})`;
-+		}
-+	}
-+	const memory = process.platform === 'win32' ? item.mem : (os.totalmem() * (item.mem / 100));
-+	processes.push({
-+		cpu: Number(item.load.toFixed(0)),
-+		memory: Number((memory / MB).toFixed(0)),
-+		pid: Number((item.pid).toFixed(0)),
-+		name
-+	});
-+
-+	// Recurse into children if any
-+	if (Array.isArray(item.children)) {
-+		item.children.forEach(child => getProcessItem(mapPidToWindowTitle, processes, child, indent + 1));
-+	}
-+>>>>>>> .their
- }
- 
- export function formatEnvironment(info: IMainProcessInfo): string {
-changed in both
-  base   100644 87425685c5bf2d06a5f136e2c85c9eb94a531eec src/vs/code/electron-main/logUploader.ts
-  our    100644 7142aa19a4cc1eda1ba377d464497305ab507809 src/vs/code/electron-main/logUploader.ts
-  their  100644 543fab3fb4112192910de1b00ccfbfb1392035a8 src/vs/code/electron-main/logUploader.ts
-changed in both
-  base   100644 f92847452e17f8a74e8e3061d3cdcd8497cc2a98 src/vs/editor/common/config/editorOptions.ts
-  our    100644 3a51038033803eb3e426c81c8416ce7c260eb272 src/vs/editor/common/config/editorOptions.ts
-  their  100644 921165fc844a1ffffaabae0686019f416d9cf666 src/vs/editor/common/config/editorOptions.ts
-changed in both
-  base   100644 7eb0243f2c1d3b7f1423d6ddaf20adeb7c3ba27a src/vs/editor/contrib/find/test/findController.test.ts
-  our    100644 e5ce80bb6016a1e51d5e1e85539a8e82a7c12e34 src/vs/editor/contrib/find/test/findController.test.ts
-  their  100644 f48c33a69778ffbb8ff101d0333db8b792a0fcc7 src/vs/editor/contrib/find/test/findController.test.ts
-changed in both
-  base   100644 3fdcc99d6befa01c078606e59f0f27bcb685735f src/vs/editor/contrib/suggest/suggestMemory.ts
-  our    100644 e278a619c962e7c12a5cd1b555b0c59b33e32c0a src/vs/editor/contrib/suggest/suggestMemory.ts
-  their  100644 58df1fd71798f5aefc1600422c7325aee09a6afe src/vs/editor/contrib/suggest/suggestMemory.ts
-changed in both
-  base   100644 ee095d5b1fed42389037b0f1aafa2a9c6ff2ebdb src/vs/monaco.d.ts
-  our    100644 76dcf491ff9c1973ad61bf5d423713bb1a3b4e44 src/vs/monaco.d.ts
-  their  100644 0a1cc793efdd772ec44aca5ef7cc0b887353421c src/vs/monaco.d.ts
-changed in both
-  base   100644 02ed4c6986266d06910a3eb61efa5ede6c6b5c5c src/vs/platform/issue/electron-main/issueService.ts
-  our    100644 cebb4e612373900c38659291fafa9b78f51e1be1 src/vs/platform/issue/electron-main/issueService.ts
-  their  100644 06355038ac58012ea185270479c7e8f0d2d1f7fa src/vs/platform/issue/electron-main/issueService.ts
-@@ -9,21 +9,33 @@
- import { localize } from 'vs/nls';
- import * as objects from 'vs/base/common/objects';
- import { parseArgs } from 'vs/platform/environment/node/argv';
-+<<<<<<< .our
- import { IIssueService, IssueReporterData, IssueReporterFeatures, ProcessExplorerData } from 'vs/platform/issue/common/issue';
-+=======
-+import { IIssueService, IssueReporterData } from 'vs/platform/issue/common/issue';
-+>>>>>>> .their
- import { BrowserWindow, ipcMain, screen } from 'electron';
- import { ILaunchService } from 'vs/code/electron-main/launch';
- import { getPerformanceInfo, PerformanceInfo, getSystemInfo, SystemInfo } from 'vs/code/electron-main/diagnostics';
- import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-+<<<<<<< .our
- import { isMacintosh, IProcessEnvironment } from 'vs/base/common/platform';
- import { ILogService } from 'vs/platform/log/common/log';
-+=======
-+import { isMacintosh } from 'vs/base/common/platform';
-+>>>>>>> .their
- 
- const DEFAULT_BACKGROUND_COLOR = '#1E1E1E';
- 
- export class IssueService implements IIssueService {
- 	_serviceBrand: any;
- 	_issueWindow: BrowserWindow;
-+<<<<<<< .our
- 	_issueParentWindow: BrowserWindow;
- 	_processExplorerWindow: BrowserWindow;
-+=======
-+	_parentWindow: BrowserWindow;
-+>>>>>>> .their
- 
- 	constructor(
- 		private machineId: string,
-@@ -47,6 +59,7 @@
- 		});
- 
- 		ipcMain.on('workbenchCommand', (event, arg) => {
-+<<<<<<< .our
- 			this._issueParentWindow.webContents.send('vscode:runAction', { id: arg, from: 'issueReporter' });
- 		});
- 
-@@ -95,6 +108,22 @@
- 			this.launchService.getMainProcessInfo().then(info => {
- 				event.sender.send('windowsInfoResponse', info.windows);
- 			});
-+=======
-+			this._parentWindow.webContents.send('vscode:runAction', { id: arg });
-+		});
-+
-+		this._parentWindow = BrowserWindow.getFocusedWindow();
-+		const position = this.getWindowPosition();
-+		this._issueWindow = new BrowserWindow({
-+			width: position.width,
-+			height: position.height,
-+			minWidth: 300,
-+			minHeight: 200,
-+			x: position.x,
-+			y: position.y,
-+			title: localize('issueReporter', "Issue Reporter"),
-+			backgroundColor: data.styles.backgroundColor || DEFAULT_BACKGROUND_COLOR
-+>>>>>>> .their
- 		});
- 
- 		// Create as singleton
-@@ -154,7 +183,11 @@
- 		return TPromise.as(null);
- 	}
- 
-+<<<<<<< .our
- 	private getWindowPosition(parentWindow: BrowserWindow, defaultWidth: number, defaultHeight: number) {
-+=======
-+	private getWindowPosition() {
-+>>>>>>> .their
- 		// We want the new window to open on the same display that the parent is in
- 		let displayToUse: Electron.Display;
- 		const displays = screen.getAllDisplays();
-@@ -174,8 +207,13 @@
- 			}
- 
- 			// if we have a last active window, use that display for the new window
-+<<<<<<< .our
- 			if (!displayToUse && parentWindow) {
- 				displayToUse = screen.getDisplayMatching(parentWindow.getBounds());
-+=======
-+			if (!displayToUse && this._parentWindow) {
-+				displayToUse = screen.getDisplayMatching(this._parentWindow.getBounds());
-+>>>>>>> .their
- 			}
- 
- 			// fallback to primary display or first display
-@@ -185,6 +223,7 @@
- 		}
- 
- 		let state = {
-+<<<<<<< .our
- 			width: defaultWidth,
- 			height: defaultHeight,
- 			x: undefined,
-@@ -220,6 +259,15 @@
- 				state.height = displayBounds.height; // prevent window from exceeding display bounds height
- 			}
- 		}
-+=======
-+			width: 800,
-+			height: 900,
-+			x: undefined,
-+			y: undefined
-+		};
-+		state.x = displayToUse.bounds.x + (displayToUse.bounds.width / 2) - (state.width / 2);
-+		state.y = displayToUse.bounds.y + (displayToUse.bounds.height / 2) - (state.height / 2);
-+>>>>>>> .their
- 
- 		return state;
- 	}
-changed in both
-  base   100644 effb25dd985cc2256dbaf4d071e4c08c73679d3a src/vs/workbench/api/node/extHostTreeViews.ts
-  our    100644 811fc4b464b2bd349271799d4eb443aa81870399 src/vs/workbench/api/node/extHostTreeViews.ts
-  their  100644 ea4dfe8b17269a5aec3630fc36f70721445e88c9 src/vs/workbench/api/node/extHostTreeViews.ts
-@@ -404,8 +404,13 @@
- 			return `${ExtHostTreeView.ID_HANDLE_PREFIX}/${id}`;
- 		}
- 
-+<<<<<<< .our
- 		const prefix: string = parent ? parent.item.handle : ExtHostTreeView.LABEL_HANDLE_PREFIX;
- 		let elementId = label ? label : resourceUri ? basename(resourceUri.path) : '';
-+=======
-+		const prefix = parentHandle ? parentHandle : ExtHostTreeView.LABEL_HANDLE_PREFIX;
-+		let elementId = label ? label : (resourceUri ? basename(resourceUri.path) : '');
-+>>>>>>> .their
- 		elementId = elementId.indexOf('/') !== -1 ? elementId.replace('/', '//') : elementId;
- 		const existingHandle = this.nodes.has(element) ? this.nodes.get(element).item.handle : void 0;
- 		const childrenNodes = (this.getChildrenNodes(parent) || []);
-changed in both
-  base   100644 de93ac69de48a0346cdacb450d2e51025c485f95 src/vs/workbench/browser/parts/editor/editorCommands.ts
-  our    100644 f8a7357eecc3080de4e3febda7b346e2b0e5aeaa src/vs/workbench/browser/parts/editor/editorCommands.ts
-  their  100644 18f4458765383b885d4024bccf842e1a399b68a2 src/vs/workbench/browser/parts/editor/editorCommands.ts
-@@ -498,10 +498,15 @@
- 					.filter(context => context.groupId === groupId)
- 					.map(context => typeof context.editorIndex === 'number' ? group.getEditor(context.editorIndex) : group.activeEditor);
- 
-+<<<<<<< .our
- 				return group.closeEditors(editors);
- 			}));
- 		}
- 	});
-+=======
-+						return group.activeEditor;
-+					}).filter(input => !!input);
-+>>>>>>> .their
- 
- 	KeybindingsRegistry.registerCommandAndKeybindingRule({
- 		id: CLOSE_EDITOR_GROUP_COMMAND_ID,
-removed in local
-  base   100644 b3b5dfc497319f909209434d226ee3043a841739 src/vs/workbench/browser/parts/views/treeView.ts
-  their  100644 58644cf73c8aaaa64484d347bbda28238c76d03d src/vs/workbench/browser/parts/views/treeView.ts
-changed in both
-  base   100644 7c4a15e8e7b5a76263d9cf59c24a21607c8d7a3d src/vs/workbench/electron-browser/actions.ts
-  our    100644 bdd05d8bf604885479f782703b020131fa80ea9f src/vs/workbench/electron-browser/actions.ts
-  their  100644 00db7589aea4cc5c06afae34fee65f342a38e3f8 src/vs/workbench/electron-browser/actions.ts
-@@ -29,6 +29,7 @@
- import { getBaseLabel } from 'vs/base/common/labels';
- import { IViewlet } from 'vs/workbench/common/viewlet';
- import { IPanel } from 'vs/workbench/common/panel';
-+<<<<<<< .our
- import { IWorkspaceIdentifier, getWorkspaceLabel, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
- import { FileKind } from 'vs/platform/files/common/files';
- import { IssueType } from 'vs/platform/issue/common/issue';
-@@ -46,6 +47,19 @@
- import { IModeService } from 'vs/editor/common/services/modeService';
- import { IQuickInputService, IQuickPickItem, IQuickInputButton, IQuickPickSeparator, IKeyMods } from 'vs/platform/quickinput/common/quickInput';
- import { getIconClasses } from 'vs/workbench/browser/labels';
-+=======
-+import { IWorkspaceIdentifier, getWorkspaceLabel, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
-+import { FileKind, IFileService } from 'vs/platform/files/common/files';
-+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-+import { IExtensionService, ActivationTimes } from 'vs/platform/extensions/common/extensions';
-+import { getEntries } from 'vs/base/common/performance';
-+import { IEditor } from 'vs/platform/editor/common/editor';
-+import { IIssueService, IssueReporterData, IssueType, IssueReporterStyles } from 'vs/platform/issue/common/issue';
-+import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService';
-+import { textLinkForeground, inputBackground, inputBorder, inputForeground, buttonBackground, buttonHoverBackground, buttonForeground, inputValidationErrorBorder, foreground, inputActiveOptionBorder } from 'vs/platform/theme/common/colorRegistry';
-+import { SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme';
-+import { getGalleryExtensionIdFromLocal } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-+>>>>>>> .their
- 
- // --- actions
- 
-@@ -584,9 +598,26 @@
- 		super(id, label);
- 	}
- 
-+<<<<<<< .our
- 	run(): TPromise<boolean> {
- 		return this.issueService.openProcessExplorer()
- 			.then(() => true);
-+=======
-+	public run(): TPromise<boolean> {
-+		return this.extensionManagementService.getInstalled(LocalExtensionType.User).then(extensions => {
-+			const enabledExtensions = extensions.filter(extension => this.extensionEnablementService.isEnabled({ id: getGalleryExtensionIdFromLocal(extension) }));
-+			const theme = this.themeService.getTheme();
-+			const issueReporterData: IssueReporterData = {
-+				styles: getIssueReporterStyles(theme),
-+				zoomLevel: webFrame.getZoomLevel(),
-+				enabledExtensions
-+			};
-+
-+			return this.issueService.openReporter(issueReporterData).then(() => {
-+				return TPromise.as(true);
-+			});
-+		});
-+>>>>>>> .their
- 	}
- }
- 
-changed in both
-  base   100644 f06096a0ece64eac36dd1c06b4baf3c88129aa1a src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
-  our    100644 7a0cba2221a0621bc5e800d66f9cca0f752e188c src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
-  their  100644 bc42ac441fbecfa1ee068f440a5d024b57cfd049 src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
-@@ -27,12 +27,112 @@
- import { IEditorService, ACTIVE_GROUP, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
- import { isCodeEditor } from 'vs/editor/browser/editorBrowser';
- import { launchSchemaId } from 'vs/workbench/services/configuration/common/configuration';
-+<<<<<<< .our
- import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
- import { TerminalLauncher } from 'vs/workbench/parts/debug/electron-browser/terminalSupport';
- import { Registry } from 'vs/platform/registry/common/platform';
- import { IJSONContributionRegistry, Extensions as JSONExtensions } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
- import { launchSchema, debuggersExtPoint, breakpointsExtPoint } from 'vs/workbench/parts/debug/common/debugSchemas';
- import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-+=======
-+import { IPreferencesService } from 'vs/workbench/parts/preferences/common/preferences';
-+import { memoize } from 'vs/base/common/decorators';
-+
-+// debuggers extension point
-+export const debuggersExtPoint = extensionsRegistry.ExtensionsRegistry.registerExtensionPoint<IRawAdapter[]>('debuggers', [], {
-+	description: nls.localize('vscode.extension.contributes.debuggers', 'Contributes debug adapters.'),
-+	type: 'array',
-+	defaultSnippets: [{ body: [{ type: '', extensions: [] }] }],
-+	items: {
-+		type: 'object',
-+		defaultSnippets: [{ body: { type: '', program: '', runtime: '', enableBreakpointsFor: { languageIds: [''] } } }],
-+		properties: {
-+			type: {
-+				description: nls.localize('vscode.extension.contributes.debuggers.type', "Unique identifier for this debug adapter."),
-+				type: 'string'
-+			},
-+			label: {
-+				description: nls.localize('vscode.extension.contributes.debuggers.label', "Display name for this debug adapter."),
-+				type: 'string'
-+			},
-+			program: {
-+				description: nls.localize('vscode.extension.contributes.debuggers.program', "Path to the debug adapter program. Path is either absolute or relative to the extension folder."),
-+				type: 'string'
-+			},
-+			args: {
-+				description: nls.localize('vscode.extension.contributes.debuggers.args', "Optional arguments to pass to the adapter."),
-+				type: 'array'
-+			},
-+			runtime: {
-+				description: nls.localize('vscode.extension.contributes.debuggers.runtime', "Optional runtime in case the program attribute is not an executable but requires a runtime."),
-+				type: 'string'
-+			},
-+			runtimeArgs: {
-+				description: nls.localize('vscode.extension.contributes.debuggers.runtimeArgs', "Optional runtime arguments."),
-+				type: 'array'
-+			},
-+			variables: {
-+				description: nls.localize('vscode.extension.contributes.debuggers.variables', "Mapping from interactive variables (e.g ${action.pickProcess}) in `launch.json` to a command."),
-+				type: 'object'
-+			},
-+			initialConfigurations: {
-+				description: nls.localize('vscode.extension.contributes.debuggers.initialConfigurations', "Configurations for generating the initial \'launch.json\'."),
-+				type: ['array', 'string'],
-+			},
-+			languages: {
-+				description: nls.localize('vscode.extension.contributes.debuggers.languages', "List of languages for which the debug extension could be considered the \"default debugger\"."),
-+				type: 'array'
-+			},
-+			adapterExecutableCommand: {
-+				description: nls.localize('vscode.extension.contributes.debuggers.adapterExecutableCommand', "If specified VS Code will call this command to determine the executable path of the debug adapter and the arguments to pass."),
-+				type: 'string'
-+			},
-+			configurationSnippets: {
-+				description: nls.localize('vscode.extension.contributes.debuggers.configurationSnippets', "Snippets for adding new configurations in \'launch.json\'."),
-+				type: 'array'
-+			},
-+			configurationAttributes: {
-+				description: nls.localize('vscode.extension.contributes.debuggers.configurationAttributes', "JSON schema configurations for validating \'launch.json\'."),
-+				type: 'object'
-+			},
-+			windows: {
-+				description: nls.localize('vscode.extension.contributes.debuggers.windows', "Windows specific settings."),
-+				type: 'object',
-+				properties: {
-+					runtime: {
-+						description: nls.localize('vscode.extension.contributes.debuggers.windows.runtime', "Runtime used for Windows."),
-+						type: 'string'
-+					}
-+				}
-+			},
-+			osx: {
-+				description: nls.localize('vscode.extension.contributes.debuggers.osx', "macOS specific settings."),
-+				type: 'object',
-+				properties: {
-+					runtime: {
-+						description: nls.localize('vscode.extension.contributes.debuggers.osx.runtime', "Runtime used for macOS."),
-+						type: 'string'
-+					}
-+				}
-+			},
-+			linux: {
-+				description: nls.localize('vscode.extension.contributes.debuggers.linux', "Linux specific settings."),
-+				type: 'object',
-+				properties: {
-+					runtime: {
-+						description: nls.localize('vscode.extension.contributes.debuggers.linux.runtime', "Runtime used for Linux."),
-+						type: 'string'
-+					}
-+				}
-+			}
-+		}
-+	}
-+});
-+
-+interface IRawBreakpointContribution {
-+	language: string;
-+}
-+>>>>>>> .their
- 
- const jsonRegistry = Registry.as<IJSONContributionRegistry>(JSONExtensions.JSONContribution);
- jsonRegistry.registerSchema(launchSchemaId, launchSchema);
-@@ -231,6 +331,10 @@
- 
- 	private initLaunches(): void {
- 		this.launches = this.contextService.getWorkspace().folders.map(folder => this.instantiationService.createInstance(Launch, this, folder));
-+<<<<<<< .our
-+=======
-+		this.launches.push(this.getUserLaunch());
-+>>>>>>> .their
- 		if (this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE) {
- 			this.launches.push(this.instantiationService.createInstance(WorkspaceLaunch, this));
- 		}
-@@ -277,6 +381,11 @@
- 		return this._onDidSelectConfigurationName.event;
- 	}
- 
-+	@memoize
-+	public getUserLaunch(): ILaunch {
-+		return this.instantiationService.createInstance(UserLaunch, this);
-+	}
-+
- 	public getWorkspaceLaunch(): ILaunch {
- 		if (this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE) {
- 			return this.launches[this.launches.length - 1];
-@@ -442,7 +551,38 @@
- 		return config.configurations.filter(config => config && config.name === name).shift();
- 	}
- 
-+<<<<<<< .our
- 	public openConfigFile(sideBySide: boolean, type?: string): TPromise<{ editor: IEditor, created: boolean }> {
-+=======
-+	public resolveConfiguration(config: IConfig): TPromise<IConfig> {
-+		const result = objects.deepClone(config) as IConfig;
-+		// Set operating system specific properties #1873
-+		const setOSProperties = (flag: boolean, osConfig: IEnvConfig) => {
-+			if (flag && osConfig) {
-+				Object.keys(osConfig).forEach(key => {
-+					result[key] = osConfig[key];
-+				});
-+			}
-+		};
-+		setOSProperties(isWindows, result.windows);
-+		setOSProperties(isMacintosh, result.osx);
-+		setOSProperties(isLinux, result.linux);
-+
-+		// massage configuration attributes - append workspace path to relatvie paths, substitute variables in paths.
-+		Object.keys(result).forEach(key => {
-+			result[key] = this.configurationResolverService.resolveAny(this.getWorkspaceForResolving(), result[key]);
-+		});
-+
-+		const adapter = this.configurationManager.getAdapter(result.type);
-+		return this.configurationResolverService.resolveInteractiveVariables(result, adapter ? adapter.variables : null);
-+	}
-+
-+	protected getWorkspaceForResolving(): IWorkspaceFolder {
-+		return this.workspace;
-+	}
-+
-+	public openConfigFile(sideBySide: boolean, type?: string): TPromise<IEditor> {
-+>>>>>>> .their
- 		const resource = this.uri;
- 		let created = false;
- 
-@@ -533,8 +673,14 @@
- 		@IFileService fileService: IFileService,
- 		@IEditorService editorService: IEditorService,
- 		@IConfigurationService configurationService: IConfigurationService,
-+<<<<<<< .our
- 		@IPreferencesService private preferencesService: IPreferencesService,
- 		@IWorkspaceContextService contextService: IWorkspaceContextService
-+=======
-+		@IConfigurationResolverService configurationResolverService: IConfigurationResolverService,
-+		@IPreferencesService private preferencesService: IPreferencesService,
-+		@IWorkspaceContextService private contextService: IWorkspaceContextService
-+>>>>>>> .their
- 	) {
- 		super(configurationManager, undefined, fileService, editorService, configurationService, contextService);
- 	}
-@@ -547,6 +693,10 @@
- 		return nls.localize('user settings', "user settings");
- 	}
- 
-+	protected getWorkspaceForResolving(): IWorkspaceFolder {
-+		return this.contextService.getWorkbenchState() === WorkbenchState.FOLDER ? this.contextService.getWorkspace().folders[0] : undefined;
-+	}
-+
- 	public get hidden(): boolean {
- 		return true;
- 	}
-changed in both
-  base   100644 5220266e48852630e08d7057bc03383c7b88935e src/vs/workbench/parts/debug/electron-browser/debugService.ts
-  our    100644 a5e2dcee7a0eb14bc388d84c6c7cac591067b1b2 src/vs/workbench/parts/debug/electron-browser/debugService.ts
-  their  100644 6ae0d9c17ebacdbc2f8a5945e8b2b31966551db9 src/vs/workbench/parts/debug/electron-browser/debugService.ts
-@@ -728,7 +728,16 @@
- 					this.removeReplExpressions();
- 					this.allSessions.clear();
- 				}
--
-+<<<<<<< .our
-+=======
-+				this.launchJsonChanged = false;
-+				let launch = root ? this.configurationManager.getLaunches().filter(l => l.workspace && l.workspace.uri.toString() === root.uri.toString()).pop()
-+					: this.configurationManager.getWorkspaceLaunch();
-+>>>>>>> .their
-+
-+				if (!root && !launch) {
-+					launch = this.configurationManager.getUserLaunch();
-+				}
- 				let config: debug.IConfig, compound: debug.ICompound;
- 				if (!configOrName) {
- 					configOrName = this.configurationManager.selectedConfiguration.name;
-@@ -813,11 +822,22 @@
- 							return this.createSession(launch, config, unresolvedConfiguration, sessionId);
- 						}
- 
-+<<<<<<< .our
- 						if (launch && type) {
- 							return launch.openConfigFile(false, type).done(undefined, errors.onUnexpectedError);
- 						}
- 					})
- 				).then(() => undefined);
-+=======
-+							if (launch) {
-+								return launch.openConfigFile(false, type).done(undefined, errors.onUnexpectedError);
-+							}
-+						})
-+					).then(() => wrapUpState(), err => {
-+						wrapUpState();
-+						return <any>TPromise.wrapError(err);
-+					}));
-+>>>>>>> .their
- 			})
- 		))).then(() => wrapUpState(), err => {
- 			wrapUpState();
-changed in both
-  base   100644 c3806ceef8da4420d0f7eff870511a61269245f7 src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
-  our    100644 3bfb6cffba943bf68a9fa9c24fb1903c66dd3fad src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
-  their  100644 fe0f04cc9726044795636d4eb91e984e94b93f2e src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
-@@ -12,8 +12,15 @@
- import { assign } from 'vs/base/common/objects';
- import { chain } from 'vs/base/common/event';
- import { isPromiseCanceledError, create as createError } from 'vs/base/common/errors';
-+<<<<<<< .our
- import { PagedModel, IPagedModel, IPager, DelayedPagedModel } from 'vs/base/common/paging';
- import { SortBy, SortOrder, IQueryOptions, LocalExtensionType, IExtensionTipsService, EnablementState, IExtensionRecommendation } from 'vs/platform/extensionManagement/common/extensionManagement';
-+=======
-+import Severity from 'vs/base/common/severity';
-+import { PagedModel, IPagedModel, IPager } from 'vs/base/common/paging';
-+import { IMessageService, CloseAction } from 'vs/platform/message/common/message';
-+import { SortBy, SortOrder, IQueryOptions, LocalExtensionType, IExtensionTipsService, EnablementState } from 'vs/platform/extensionManagement/common/extensionManagement';
-+>>>>>>> .their
- import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
- import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
- import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-@@ -293,10 +300,13 @@
- 			return this.getRecommendationsModel(query, options);
- 		}
- 
-+<<<<<<< .our
- 		if (/\bcurated:([^\s]+)\b/.test(query.value)) {
- 			return this.getCuratedModel(query, options);
- 		}
- 
-+=======
-+>>>>>>> .their
- 		let text = query.value;
- 		const extensionRegex = /\bext:([^\s]+)\b/g;
- 
-@@ -323,7 +333,7 @@
- 		}
- 
- 		if (text) {
--			options = assign(options, { text: text.substr(0, 350), source: 'searchText' });
-+			options = assign(options, { text: text.substr(0, 350), source: text === query.value ? 'searchText' : 'file-extension-tags' });
- 		} else {
- 			options.source = 'viewlet';
- 		}
-changed in both
-  base   100644 743441bf0a1310cf058f83a587c5bd1944df1347 src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts
-  our    100644 1fd97d3e91218de85139c2b8311f5cf671735e27 src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts
-  their  100644 7377e11af73a83ce2728d7b48736d8b07dd6c3f1 src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts
-@@ -16,7 +16,11 @@
- import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
- import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
- import { isWindows, isMacintosh } from 'vs/base/common/platform';
-+<<<<<<< .our
- import { FilesExplorerFocusCondition, ExplorerRootContext, ExplorerFolderContext, ExplorerResourceNotReadonlyContext } from 'vs/workbench/parts/files/common/files';
-+=======
-+import { FilesExplorerFocusCondition, ExplorerRootContext, ExplorerFolderContext } from 'vs/workbench/parts/files/common/files';
-+>>>>>>> .their
- import { ADD_ROOT_FOLDER_COMMAND_ID, ADD_ROOT_FOLDER_LABEL } from 'vs/workbench/browser/actions/workspaceCommands';
- import { CLOSE_SAVED_EDITORS_COMMAND_ID, CLOSE_EDITORS_IN_GROUP_COMMAND_ID, CLOSE_EDITOR_COMMAND_ID, CLOSE_OTHER_EDITORS_IN_GROUP_COMMAND_ID } from 'vs/workbench/browser/parts/editor/editorCommands';
- import { OPEN_FOLDER_SETTINGS_COMMAND, OPEN_FOLDER_SETTINGS_LABEL } from 'vs/workbench/parts/preferences/browser/preferencesActions';
-@@ -175,6 +179,11 @@
- appendToCommandPalette(CLOSE_EDITOR_COMMAND_ID, nls.localize('closeEditor', "Close Editor"), nls.localize('view', "View"));
- appendToCommandPalette(NEW_FILE_COMMAND_ID, NEW_FILE_LABEL, category);
- appendToCommandPalette(NEW_FOLDER_COMMAND_ID, NEW_FOLDER_LABEL, category);
-+<<<<<<< .our
-+=======
-+
-+
-+>>>>>>> .their
- 
- // Menu registration - open editors
- 
-changed in both
-  base   100644 952968f7641f2d7c5412400ccc5443ccc446c463 src/vs/workbench/parts/files/electron-browser/fileActions.ts
-  our    100644 2b34716fc38cb7630fc57b1b63eaabafcd472436 src/vs/workbench/parts/files/electron-browser/fileActions.ts
-  their  100644 af32ca68eba52da6f3ec2b144eab0096d9bb9471 src/vs/workbench/parts/files/electron-browser/fileActions.ts
-@@ -1596,7 +1596,11 @@
- 
- // TODO@isidor these commands are calling into actions due to the complex inheritance action structure.
- // It should be the other way around, that actions call into commands.
-+<<<<<<< .our
- function openExplorerAndRunAction(accessor: ServicesAccessor, constructor: IConstructorSignature2<ITree, ExplorerItem, Action>): TPromise<any> {
-+=======
-+function openExplorerAndRunAction(accessor: ServicesAccessor, isFolderAction: boolean): TPromise<any> {
-+>>>>>>> .their
- 	const instantationService = accessor.get(IInstantiationService);
- 	const listService = accessor.get(IListService);
- 	const viewletService = accessor.get(IViewletService);
-@@ -1611,6 +1615,10 @@
- 		if (explorerView && explorerView.isVisible() && explorerView.isExpanded()) {
- 			explorerView.focus();
- 			const explorerContext = getContext(listService.lastFocusedList, viewletService);
-+<<<<<<< .our
-+=======
-+			const constructor = isFolderAction ? NewFolderAction : NewFileAction;
-+>>>>>>> .their
- 			const action = instantationService.createInstance(constructor, listService.lastFocusedList, explorerContext.stat);
- 
- 			return action.run(explorerContext);
-@@ -1623,14 +1631,22 @@
- CommandsRegistry.registerCommand({
- 	id: NEW_FILE_COMMAND_ID,
- 	handler: (accessor) => {
-+<<<<<<< .our
- 		return openExplorerAndRunAction(accessor, NewFileAction);
-+=======
-+		return openExplorerAndRunAction(accessor, false);
-+>>>>>>> .their
- 	}
- });
- 
- CommandsRegistry.registerCommand({
- 	id: NEW_FOLDER_COMMAND_ID,
- 	handler: (accessor) => {
-+<<<<<<< .our
- 		return openExplorerAndRunAction(accessor, NewFolderAction);
-+=======
-+		return openExplorerAndRunAction(accessor, true);
-+>>>>>>> .their
- 	}
- });
- 
-changed in both
-  base   100644 6e4bf7992f557c12f3341b9300dd35d3beed11e3 src/vs/workbench/parts/files/electron-browser/fileCommands.ts
-  our    100644 38cb4a1c6b995d502359ecceccc8480e423cd6e0 src/vs/workbench/parts/files/electron-browser/fileCommands.ts
-  their  100644 ee8f3d96a5ed02f85a336743d200bd6f62b67e26 src/vs/workbench/parts/files/electron-browser/fileCommands.ts
-@@ -352,12 +352,17 @@
- 	}
- });
- 
-+<<<<<<< .our
- function revealResourcesInOS(resources: URI[], windowsService: IWindowsService, notificationService: INotificationService, workspaceContextService: IWorkspaceContextService): void {
-+=======
-+function revealResourcesInOS(resources: URI[], windowsService: IWindowsService, messageService: IMessageService): void {
-+>>>>>>> .their
- 	if (resources.length) {
- 		sequence(resources.map(r => () => windowsService.showItemInFolder(paths.normalize(r.fsPath, true))));
- 	} else if (workspaceContextService.getWorkspace().folders.length) {
- 		windowsService.showItemInFolder(paths.normalize(workspaceContextService.getWorkspace().folders[0].uri.fsPath, true));
- 	} else {
-+<<<<<<< .our
- 		notificationService.info(nls.localize('openFileToReveal', "Open a file first to reveal"));
- 	}
- }
-@@ -366,10 +371,20 @@
- 	id: REVEAL_IN_OS_COMMAND_ID,
- 	weight: KeybindingWeight.WorkbenchContrib,
- 	when: EditorContextKeys.focus.toNegated(),
-+=======
-+		messageService.show(severity.Info, nls.localize('openFileToReveal', "Open a file first to reveal"));
-+	}
-+}
-+KeybindingsRegistry.registerCommandAndKeybindingRule({
-+	id: REVEAL_IN_OS_COMMAND_ID,
-+	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
-+	when: ExplorerFocusCondition,
-+>>>>>>> .their
- 	primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KEY_R,
- 	win: {
- 		primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KEY_R
- 	},
-+<<<<<<< .our
- 	handler: (accessor: ServicesAccessor, resource: URI | object) => {
- 		const resources = getMultiSelectedResources(resource, accessor.get(IListService), accessor.get(IEditorService));
- 		revealResourcesInOS(resources, accessor.get(IWindowsService), accessor.get(INotificationService), accessor.get(IWorkspaceContextService));
-@@ -390,6 +405,27 @@
- });
- 
- function resourcesToClipboard(resources: URI[], clipboardService: IClipboardService, notificationService: INotificationService, contextService?: IWorkspaceContextService): void {
-+=======
-+	handler: (accessor: ServicesAccessor, resource: URI) => {
-+		const resources = getMultiSelectedResources(resource, accessor.get(IListService), accessor.get(IWorkbenchEditorService));
-+		revealResourcesInOS(resources, accessor.get(IWindowsService), accessor.get(IMessageService));
-+	}
-+});
-+KeybindingsRegistry.registerCommandAndKeybindingRule({
-+	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
-+	when: undefined,
-+	primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.KEY_R),
-+	id: 'workbench.action.files.revealActiveFileInWindows',
-+	handler: (accessor: ServicesAccessor, resource: URI) => {
-+		const editorService = accessor.get(IWorkbenchEditorService);
-+		const activeInput = editorService.getActiveEditorInput();
-+		const resources = activeInput && activeInput.getResource() ? [activeInput.getResource()] : [];
-+		revealResourcesInOS(resources, accessor.get(IWindowsService), accessor.get(IMessageService));
-+	}
-+});
-+
-+function resourcesToClipboard(resources: URI[], clipboardService: IClipboardService, messageService: IMessageService): void {
-+>>>>>>> .their
- 	if (resources.length) {
- 		const lineDelimiter = isWindows ? '\r\n' : '\n';
- 
-@@ -413,10 +449,16 @@
- 		}).join(lineDelimiter);
- 		clipboardService.writeText(text);
- 	} else {
-+<<<<<<< .our
- 		notificationService.info(nls.localize('openFileToCopy', "Open a file first to copy its path"));
- 	}
- }
- 
-+=======
-+		messageService.show(severity.Info, nls.localize('openFileToCopy', "Open a file first to copy its path"));
-+	}
-+}
-+>>>>>>> .their
- KeybindingsRegistry.registerCommandAndKeybindingRule({
- 	weight: KeybindingWeight.WorkbenchContrib,
- 	when: EditorContextKeys.focus.toNegated(),
-@@ -425,13 +467,20 @@
- 		primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KEY_C
- 	},
- 	id: COPY_PATH_COMMAND_ID,
-+<<<<<<< .our
- 	handler: (accessor, resource: URI | object) => {
- 		const resources = getMultiSelectedResources(resource, accessor.get(IListService), accessor.get(IEditorService));
- 		resourcesToClipboard(resources, accessor.get(IClipboardService), accessor.get(INotificationService));
-+=======
-+	handler: (accessor, resource: URI) => {
-+		const resources = getMultiSelectedResources(resource, accessor.get(IListService), accessor.get(IWorkbenchEditorService));
-+		resourcesToClipboard(resources, accessor.get(IClipboardService), accessor.get(IMessageService));
-+>>>>>>> .their
- 	}
- });
- 
- KeybindingsRegistry.registerCommandAndKeybindingRule({
-+<<<<<<< .our
- 	weight: KeybindingWeight.WorkbenchContrib,
- 	when: EditorContextKeys.focus.toNegated(),
- 	primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyMod.Alt | KeyCode.KEY_C,
-@@ -455,6 +504,17 @@
- 		const activeInput = editorService.activeEditor;
- 		const resources = activeInput && activeInput.getResource() ? [activeInput.getResource()] : [];
- 		resourcesToClipboard(resources, accessor.get(IClipboardService), accessor.get(INotificationService));
-+=======
-+	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
-+	when: undefined,
-+	primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.KEY_P),
-+	id: 'workbench.action.files.copyPathOfActiveFile',
-+	handler: (accessor, resource: URI) => {
-+		const editorService = accessor.get(IWorkbenchEditorService);
-+		const activeInput = editorService.getActiveEditorInput();
-+		const resources = activeInput && activeInput.getResource() ? [activeInput.getResource()] : [];
-+		resourcesToClipboard(resources, accessor.get(IClipboardService), accessor.get(IMessageService));
-+>>>>>>> .their
- 	}
- });
- 
-changed in both
-  base   100644 01d3979bd429fa0afa9868c5fcfc33064ecf9b5a src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
-  our    100644 04d9dcba251cf79c28429027cda3ca3b0c10a29c src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
-  their  100644 89bb5a4bcd265789549b0fae398c480e82e93907 src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
-@@ -813,7 +813,11 @@
- 	}
- 
- 	private _attachPressAnyKeyToCloseListener() {
-+<<<<<<< .our
- 		this._processManager.addDisposable(dom.addDisposableListener(this._xterm.textarea, 'keypress', (event: KeyboardEvent) => {
-+=======
-+		this._processDisposables.push(dom.addDisposableListener(this._xterm.textarea, 'keypress', (event: KeyboardEvent) => {
-+>>>>>>> .their
- 			this.dispose();
- 			event.preventDefault();
- 		}));
-changed in both
-  base   100644 4a4003ddab8cfa13991a776ceb21e75d73d9cb70 src/vs/workbench/services/textMate/electron-browser/TMSyntax.ts
-  our    100644 cb08ce01cea086e5139fb6d5a6e42d319fc1705b src/vs/workbench/services/textMate/electron-browser/TMSyntax.ts
-  their  100644 94dbc8c619708ce5a04ae7afc91874863723fa1b src/vs/workbench/services/textMate/electron-browser/TMSyntax.ts
-changed in both
-  base   100644 fd7ad73cded0a13631dfccd452800b6d3db6d78f src/vs/workbench/services/themes/electron-browser/colorThemeData.ts
-  our    100644 f49ab6eea33cacddae01b555b693b3bf72e5bdaa src/vs/workbench/services/themes/electron-browser/colorThemeData.ts
-  their  100644 438714997ca4d970df13fdf38bfd0a398e8c3df2 src/vs/workbench/services/themes/electron-browser/colorThemeData.ts
-@@ -115,12 +115,19 @@
- 	private addCustomTokenColors(customTokenColors: ITokenColorCustomizations) {
- 		// Put the general customizations such as comments, strings, etc. first so that
- 		// they can be overridden by specific customizations like "string.interpolated"
-+<<<<<<< .our
- 		for (let tokenGroup in tokenGroupToScopesMap) {
- 			let value = customTokenColors[tokenGroup];
-+=======
-+
-+		Object.keys(tokenGroupToScopesMap).forEach(key => {
-+			let value = customTokenColors[key];
-+>>>>>>> .their
- 			if (value) {
- 				let settings = typeof value === 'string' ? { foreground: value } : value;
- 				let scopes = tokenGroupToScopesMap[tokenGroup];
- 				for (let scope of scopes) {
-+<<<<<<< .our
- 					this.customTokenColors.push({ scope, settings });
- 				}
- 			}
-@@ -130,6 +137,19 @@
- 		if (Array.isArray(customTokenColors.textMateRules)) {
- 			for (let rule of customTokenColors.textMateRules) {
- 				if (rule.scope && rule.settings) {
-+=======
-+					this.customTokenColors.push({
-+						scope,
-+						settings
-+					});
-+				}
-+			}
-+		});
-+
-+		if (Array.isArray(customTokenColors.textMateRules)) {
-+			for (let rule of customTokenColors.textMateRules) {
-+				if (rule.settings && rule.scope) {
-+>>>>>>> .their
- 					this.customTokenColors.push(rule);
- 				}
- 			}
-changed in both
-  base   100644 a6217d7a3b77529221b6bf40538881606b412998 yarn.lock
-  our    100644 b56aa332449f9eb6db4b03a16548d91df21604bb yarn.lock
-  their  100644 36497baa99ddb22579eb010cb04d6c8793222e42 yarn.lock
-@@ -7896,6 +7896,7 @@
-     xml2js "^0.4.19"
-     yargs "^10.1.1"
- 
-+<<<<<<< .our
- vscode-nsfw@1.0.17:
-   version "1.0.17"
-   resolved "https://registry.yarnpkg.com/vscode-nsfw/-/vscode-nsfw-1.0.17.tgz#da3820f26aea3a7e95cadc54bd9e5dae3d47e474"
-@@ -7909,6 +7910,11 @@
- vscode-ripgrep@1.1.0:
-   version "1.1.0"
-   resolved "https://registry.yarnpkg.com/vscode-ripgrep/-/vscode-ripgrep-1.1.0.tgz#93c1e39d88342ee1b15530a12898ce930d511948"
-+=======
-+vscode-ripgrep@0.7.1-patch.0.1:
-+  version "0.7.1-patch.0.1"
-+  resolved "https://registry.yarnpkg.com/vscode-ripgrep/-/vscode-ripgrep-0.7.1-patch.0.1.tgz#f05d2f093fd7f6a9d10fb935171e72620feaf999"
-+>>>>>>> .their
- 
- vscode-textmate@^4.0.1:
-   version "4.0.1"
diff --git a/app/test/fixtures/merge-parser/vscode/merge-release-1.21-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-release-1.21-into-master.txt
deleted file mode 100644
index 7cb81922da1..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-release-1.21-into-master.txt
+++ /dev/null
@@ -1,6015 +0,0 @@
-changed in both
-  base   100644 4549611ecbd548b862857baac89ec39d3f9e6931 build/gulpfile.hygiene.js
-  our    100644 6a4cd05d17fefc0e6fdc6e8d0fd2997f3c2894ff build/gulpfile.hygiene.js
-  their  100644 00c7be8d23956419f4533d3618d34ae11a9dbc01 build/gulpfile.hygiene.js
-@@ -46,10 +46,17 @@
- 	'!src/vs/nls.js',
- 	'!src/vs/css.js',
- 	'!src/vs/loader.js',
-+<<<<<<< .our
- 	'!src/vs/base/common/marked/marked.js',
- 	'!src/vs/base/common/winjs.base.js',
- 	'!src/vs/base/node/terminateProcess.sh',
- 	'!src/vs/base/node/cpuUsage.sh',
-+=======
-+	'!src/vs/base/common/marked/raw.marked.js',
-+	'!src/vs/base/common/winjs.base.raw.js',
-+	'!src/vs/base/node/terminateProcess.sh',
-+	'!src/vs/base/node/ps-win.ps1',
-+>>>>>>> .their
- 	'!test/assert.js',
- 
- 	// except specific folders
-@@ -62,7 +69,10 @@
- 	// except multiple specific files
- 	'!**/package.json',
- 	'!**/yarn.lock',
-+<<<<<<< .our
- 	'!**/yarn-error.log',
-+=======
-+>>>>>>> .their
- 
- 	// except multiple specific folders
- 	'!**/octicons/**',
-@@ -82,9 +92,14 @@
- 	'!build/{lib,tslintRules}/**/*.js',
- 	'!build/**/*.sh',
- 	'!build/tfs/**/*.js',
-+<<<<<<< .our
- 	'!build/tfs/**/*.config',
- 	'!**/Dockerfile',
- 	'!extensions/markdown-language-features/media/*.js'
-+=======
-+	'!**/Dockerfile',
-+	'!extensions/markdown/media/*.js'
-+>>>>>>> .their
- ];
- 
- const copyrightFilter = [
-removed in local
-  base   100644 5e7cbdbab08bf5e1b72851b6571cfb2e6b189171 extensions/markdown/src/features/preview.ts
-  their  100644 def8fbb28c45a563b273badff77e54ce103e0f8f extensions/markdown/src/features/preview.ts
-removed in local
-  base   100644 25c6b771052d8ef100cb8edd5181982163f8fb7d extensions/markdown/src/features/previewContentProvider.ts
-  their  100644 f0dd43ff28eff8733c5718f2713ef3dcf5e0459f extensions/markdown/src/features/previewContentProvider.ts
-removed in local
-  base   100644 6bba131e107631920fd0b91389e7e2c6ba27ae45 extensions/markdown/src/markdownExtensions.ts
-  their  100644 124fabd46ee387f8b779670bcc7b85085056dc9f extensions/markdown/src/markdownExtensions.ts
-changed in both
-  base   100644 ad57992cc8800b5cee3a3c4c2244972a6ce20567 extensions/npm/src/main.ts
-  our    100644 02e22490fd765e056a1cc1278aaa50055590dce6 extensions/npm/src/main.ts
-  their  100644 00de7090ed1c7b1a23a4491c9d8baba01a51db1e extensions/npm/src/main.ts
-@@ -56,10 +56,35 @@
- 		watcher.onDidCreate((_e) => invalidateScriptCaches());
- 		context.subscriptions.push(watcher);
- 
-+<<<<<<< .our
- 		let provider: vscode.TaskProvider = new NpmTaskProvider(context);
- 		let disposable = vscode.workspace.registerTaskProvider('npm', provider);
- 		context.subscriptions.push(disposable);
- 		return disposable;
-+=======
-+async function readFile(file: string): Promise<string> {
-+	return new Promise<string>((resolve, reject) => {
-+		fs.readFile(file, (err, data) => {
-+			if (err) {
-+				reject(err);
-+			}
-+			resolve(data.toString());
-+		});
-+	});
-+}
-+
-+interface NpmTaskDefinition extends vscode.TaskDefinition {
-+	script: string;
-+	path?: string;
-+}
-+
-+const buildNames: string[] = ['build', 'compile', 'watch'];
-+function isBuildTask(name: string): boolean {
-+	for (let buildName of buildNames) {
-+		if (name.indexOf(buildName) !== -1) {
-+			return true;
-+		}
-+>>>>>>> .their
- 	}
- 	return undefined;
- }
-@@ -93,5 +118,42 @@
- 	httpRequest.configure(httpSettings.get<string>('proxy', ''), httpSettings.get<boolean>('proxyStrictSSL', true));
- }
- 
-+<<<<<<< .our
- export function deactivate(): void {
-+=======
-+function createTask(script: string, cmd: string, folder: vscode.WorkspaceFolder, packageJsonUri: vscode.Uri, matcher?: any): vscode.Task {
-+
-+	function getTaskName(script: string, file: string) {
-+		if (file.length) {
-+			return `${script} - ${file.substring(0, file.length - 1)}`;
-+		}
-+		return script;
-+	}
-+
-+	function getCommandLine(folder: vscode.WorkspaceFolder, cmd: string): string {
-+		let packageManager = vscode.workspace.getConfiguration('npm', folder.uri).get<string>('packageManager', 'npm');
-+		if (vscode.workspace.getConfiguration('npm', folder.uri).get<boolean>('runSilent')) {
-+			return `${packageManager} --silent ${cmd}`;
-+		}
-+		return `${packageManager} ${cmd}`;
-+	}
-+
-+	function getRelativePath(folder: vscode.WorkspaceFolder, packageJsonUri: vscode.Uri): string {
-+		let rootUri = folder.uri;
-+		let absolutePath = packageJsonUri.path.substring(0, packageJsonUri.path.length - 'package.json'.length);
-+		return absolutePath.substring(rootUri.path.length + 1);
-+	}
-+
-+	let kind: NpmTaskDefinition = {
-+		type: 'npm',
-+		script: script
-+	};
-+	let relativePackageJson = getRelativePath(folder, packageJsonUri);
-+	if (relativePackageJson.length) {
-+		kind.path = getRelativePath(folder, packageJsonUri);
-+	}
-+	let taskName = getTaskName(script, relativePackageJson);
-+	let cwd = path.dirname(packageJsonUri.fsPath);
-+	return new vscode.Task(kind, folder, taskName, 'npm', new vscode.ShellExecution(getCommandLine(folder, cmd), { cwd: cwd }), matcher);
-+>>>>>>> .their
- }
-changed in both
-  base   100644 2cb3eef99e75ae3df31ca9b8d5d8046671aaaf38 i18n/chs/extensions/emmet/package.i18n.json
-  our    100644 5cf0382870fbe5abfd1dea23749ad88b51794f9a i18n/chs/extensions/emmet/package.i18n.json
-  their  100644 091b728c40a8ffeaf06b61092f836d4a4b4cb81e i18n/chs/extensions/emmet/package.i18n.json
-changed in both
-  base   100644 15aa9f39edd10e3085f00c968a2fde9f4ab2458d i18n/chs/extensions/git/out/commands.i18n.json
-  our    100644 04fae89946b4fff2a3f253e57b9b96d137dedd28 i18n/chs/extensions/git/out/commands.i18n.json
-  their  100644 6276a473d55e92424b964a62088a5f8e4fc99930 i18n/chs/extensions/git/out/commands.i18n.json
-changed in both
-  base   100644 fb34b501a910f60076cf7c83f0f78e8edc432ed0 i18n/chs/extensions/npm/package.i18n.json
-  our    100644 3f53500fe1fade31ff765e96760b3a5c8a6d618f i18n/chs/extensions/npm/package.i18n.json
-  their  100644 452c6ca9d2f61357419651501952606093329ab1 i18n/chs/extensions/npm/package.i18n.json
-@@ -12,6 +12,7 @@
- 	"config.npm.runSilent": "使用 \"--silent\" 选项运行 npm 命令。",
- 	"config.npm.packageManager": "用于运行脚本的程序包管理器。",
- 	"config.npm.exclude": "配置应从自动脚本检测中排除的文件夹的 glob 模式。",
-+<<<<<<< .our
- 	"config.npm.enableScriptExplorer": "在资源管理器中启用“npm 脚本”视图。",
- 	"config.npm.scriptExplorerAction": "在脚本资源管理器中点击时进行的默认操作: \"open\" (打开) 或 \"run\" (运行)。默认值为 \"open\"。",
- 	"npm.parseError": "Npm 任务检测: 无法分析文件 {0}",
-@@ -23,4 +24,9 @@
- 	"command.debug": "调试",
- 	"command.openScript": "开放",
- 	"command.runInstall": "运行 install"
-+=======
-+	"npm.parseError": "Npm 任务检测: 无法分析文件 {0}",
-+	"taskdef.script": "要自定义的 npm 脚本。",
-+	"taskdef.path": "包含 package.json 文件的文件夹路径，其中 package.json 文件提供脚本。可以省略。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 b4f8c6ebb451b9a3c1006e1f2fd590f0e480deac i18n/chs/extensions/php/package.i18n.json
-  our    100644 f946b5c8649769c5e88f47301d2bdc529bcbea92 i18n/chs/extensions/php/package.i18n.json
-  their  100644 8385016844be7b6b513ccffda62eec0d9e485808 i18n/chs/extensions/php/package.i18n.json
-@@ -6,6 +6,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "PHP 语言基础功能",
- 	"description": "为 PHP 文件提供语法高亮和括号匹配功能。"
-+=======
-+	"configuration.suggest.basic": "如果已启用内置 PHP 语言建议，则进行配置。此支持建议 PHP 全局变量和变量。",
-+	"configuration.validate.enable": "启用/禁用内置的 PHP 验证。",
-+	"configuration.validate.executablePath": "指向 PHP 可执行文件。",
-+	"configuration.validate.run": "决定 linter 是在保存时还是输入时运行。",
-+	"configuration.title": "PHP",
-+	"commands.categroy.php": "PHP",
-+	"command.untrustValidationExecutable": "禁止 PHP 验证程序(定义为工作区设置)",
-+	"displayName": "PHP 语言功能",
-+	"description": "为 PHP 文件提供 IntelliSense、lint 和语言基础功能。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 93694a4df4080452bdcdf0aecc630afee433626f i18n/chs/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  our    100644 537865041fd9d9e7add3c0c70d9f4ea7e9031aa5 i18n/chs/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  their  100644 7980ba2eb43f47ab3c66c3d3512092eb63c7e96f i18n/chs/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-changed in both
-  base   100644 2cbe5a6b294d0bac868f1bc6022bf8e9e21ab8c0 i18n/chs/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  our    100644 b6a3844bc2b71bffc0711363af03fd28279e2538 i18n/chs/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  their  100644 e66e99336b19da0804db483078bb7ccaaf72f05d i18n/chs/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-@@ -17,6 +17,23 @@
- 	"issueTitleLabel": "标题",
- 	"issueTitleRequired": "请输入标题。",
- 	"titleLengthValidation": "标题太长。",
-+<<<<<<< .our
-+=======
-+	"systemInfo": "我的系统信息",
-+	"sendData": "发送我的数据",
-+	"processes": "当前运行的进程",
-+	"workspaceStats": "我的工作区数据",
-+	"extensions": "我的扩展",
-+	"searchedExtensions": "已搜索的扩展",
-+	"settingsSearchDetails": "设置搜索的详细信息",
-+	"tryDisablingExtensions": "能否在禁用扩展后重现此问题?",
-+	"yes": "是",
-+	"no": "否",
-+	"disableExtensionsLabelText": "尝试在{0}之后重现问题。",
-+	"disableExtensions": "禁用所有扩展并重新加载窗口",
-+	"showRunningExtensionsLabelText": "如果您怀疑这是扩展的问题，请{0}并进行报告。",
-+	"showRunningExtensions": "查看所有运行中的扩展",
-+>>>>>>> .their
- 	"details": "请输入详细信息。",
- 	"sendSystemInfo": "包含系统信息 ({0})",
- 	"show": "显示",
-changed in both
-  base   100644 5584072ab373101d5d13849a2d45b9cbf50a9e08 i18n/chs/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 7fee73e8505eefc794b34e899f5cfb2204f92225 i18n/chs/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 f27f13cb3e45a31ee6119d46cc8af28787bc0202 i18n/chs/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -15,7 +15,11 @@
- 	"errorInstallingDependencies": "安装依赖项时出错。{0}",
- 	"MarketPlaceDisabled": "商店未启用",
- 	"removeError": "删除扩展时出错: {0}。请重启 VS Code，然后重试。",
-+<<<<<<< .our
- 	"Not a Marketplace extension": "只能重新安装商店中的扩展",
-+=======
-+	"Not Market place extension": "只能重新安装商店中的扩展",
-+>>>>>>> .their
- 	"notFoundCompatible": "无法安装“{0}”；没有可用的版本与 VS Code “{1}”兼容。",
- 	"malicious extension": "无法安装此扩展，它被报告存在问题。",
- 	"notFoundCompatibleDependency": "无法安装。找不到与 VS Code 当前版本 ({1}) 兼容的依赖扩展“{0}”。",
-changed in both
-  base   100644 0da3b52855deeaead488f4ad3e78f5dd3b5378c2 i18n/chs/src/vs/workbench/common/theme.i18n.json
-  our    100644 9dff140c48c8d58d62f0adab067f1886bd30d318 i18n/chs/src/vs/workbench/common/theme.i18n.json
-  their  100644 11d275a1ff8f546e994275c4e6e8cc36f6e8c9b2 i18n/chs/src/vs/workbench/common/theme.i18n.json
-changed in both
-  base   100644 c45229362fb997dd4a1847773fbc875704e3dec1 i18n/chs/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  our    100644 2544cb87789add6dc4a60372e1fc63d1ab090b36 i18n/chs/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  their  100644 f853c73cc835095b40ff02ffec136c448abcd4a2 i18n/chs/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-@@ -27,6 +27,9 @@
- 	"onFirstSessionStart": "仅于第一次启动调试后在状态栏中显示调试",
- 	"showInStatusBar": "控制何时显示调试状态栏",
- 	"openDebug": "控制是否在调试会话开始时打开调试视图。",
-+<<<<<<< .our
- 	"enableAllHovers": "控制调试过程中是否启用非调试悬停提示。若为 \"true\"，将调用悬停提供程序提供悬停提示。即使此项设置为 \"true\"，普通悬停提示也不会显示。",
-+=======
-+>>>>>>> .their
- 	"launch": "全局的调试启动配置。应用作跨工作区共享的 \"launch.json\" 的替代。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 954d0a3cdb2a1cd9f3dca04501e548c344fdbc21 i18n/chs/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 d7e48510561de6a730248773c638ea6ba6002331 i18n/chs/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 383bbbf1ba0948ddae949ba1c90ad4297ccd174a i18n/chs/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-changed in both
-  base   100644 e56b967823c5b79b008a67a408f197fabd717dc5 i18n/chs/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 61397c437f22149a7bd941ec158bc6fa9182474a i18n/chs/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 b45279594d3b3e10ce7d434192ed536413eb6cef i18n/chs/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -31,5 +31,9 @@
- 	"search.followSymlinks": "控制是否在搜索中跟踪符号链接。",
- 	"search.smartCase": "若搜索词全为小写，则不区分大小写进行搜索，否则区分大小写进行搜索",
- 	"search.globalFindClipboard": "控制“搜索”视图是否读取或修改 macOS 的共享查找剪贴板",
-+<<<<<<< .our
- 	"search.location": "控制搜索功能显示在侧边栏还是水平空间更大的面板区域"
-+=======
-+	"search.location": "预览: 控制搜索功能显示在侧边栏还是水平空间更大的面板区域。我们将在下个版本优化面板中搜索的水平布局，之后这将不再是一个预览功能。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 db84745c7ca6f0e6560dfa74b9828f532bbaf6a9 i18n/chs/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 34456c16f6384eecbdba1d3ed14696eac3704dab i18n/chs/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 9dda0b0a2360fd9927aac644dac4ecc1f013d7f4 i18n/chs/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -15,6 +15,10 @@
- 	"updateIsReady": "有新的 {0} 的更新可用。",
- 	"noUpdatesAvailable": "当前没有可用的更新。",
- 	"ok": "确定",
-+<<<<<<< .our
-+=======
-+	"download now": "立即下载",
-+>>>>>>> .their
- 	"thereIsUpdateAvailable": "存在可用更新。",
- 	"download now": "立即下载",
- 	"later": "稍后",
-changed in both
-  base   100644 94cd71a5f3345b99c16c168bb6364012dc0be387 i18n/chs/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
-  our    100644 cc00a7772b1946b5d979b8e1b3a0e8a9feeb6b63 i18n/chs/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
-  their  100644 57b5dd7d36a8dfba26483dc81dee72d81600ab72 i18n/chs/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
-changed in both
-  base   100644 3dcded8945eb957052de7cf2bfd3db3d4eaae98d i18n/cht/extensions/emmet/package.i18n.json
-  our    100644 b3dc8be8bb9ec8fba170590d50c4692dadd9f40f i18n/cht/extensions/emmet/package.i18n.json
-  their  100644 660a269c068530750467087acf00e27056768486 i18n/cht/extensions/emmet/package.i18n.json
-changed in both
-  base   100644 9c9c23c6083338421073a0bbb53a235772c66925 i18n/cht/extensions/html/package.i18n.json
-  our    100644 eb9141c8094021b0f2a1095db39a0fd715be7b2e i18n/cht/extensions/html/package.i18n.json
-  their  100644 d120f92d827fbecb654abe88d0b6c55491cbe4ff i18n/cht/extensions/html/package.i18n.json
-@@ -6,6 +6,34 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "HTML 語言基礎知識",
- 	"description": "為 HTML 檔案提供語法醒目提示、括弧對應與程式碼片段功能。"
-+=======
-+	"displayName": "HTML 語言功能",
-+	"description": "為 HTML、Razor 及 Handlebars 檔案提供豐富的語言支援。",
-+	"html.format.enable.desc": "啟用/停用預設 HTML 格式器",
-+	"html.format.wrapLineLength.desc": "每行的字元數上限 (0 = 停用)。",
-+	"html.format.unformatted.desc": "不應重新格式化的逗號分隔標記清單。'null' 預設為 https://www.w3.org/TR/html5/dom.html#phrasing-content 中列出的所有標記。",
-+	"html.format.contentUnformatted.desc": "逗點分隔的標記清單，其中內容的格式不應重新設定。'null' 預設為 'pre' 標記。",
-+	"html.format.indentInnerHtml.desc": "縮排 <head> 及 <body> 區段。",
-+	"html.format.preserveNewLines.desc": "是否應保留項目前方現有的分行符號。僅適用於項目前方，而不適用於標記內或文字。",
-+	"html.format.maxPreserveNewLines.desc": "一個區塊要保留的最大分行符號數。使用 'null' 表示無限制。",
-+	"html.format.indentHandlebars.desc": "格式化並縮排 {{#foo}} 及 {{/foo}}。",
-+	"html.format.endWithNewline.desc": "以新行字元結尾。",
-+	"html.format.extraLiners.desc": "前方應有額外新行字元的標記清單，須以逗號分隔。'null' 的預設值為 \"head, body, /html\"。",
-+	"html.format.wrapAttributes.desc": "將屬性換行。",
-+	"html.format.wrapAttributes.auto": "只在超過行的長度時將屬性換行。",
-+	"html.format.wrapAttributes.force": "將第一個以外的每個屬性換行。",
-+	"html.format.wrapAttributes.forcealign": "將第一個以外的每個屬性換行，並保持對齊。",
-+	"html.format.wrapAttributes.forcemultiline": "將每個屬性換行。",
-+	"html.suggest.angular1.desc": "設定內建 HTML 語言支援是否建議 Angular V1 標記和屬性。",
-+	"html.suggest.ionic.desc": "設定內建 HTML 語言支援是否建議 Ionic 標記、屬性和值。",
-+	"html.suggest.html5.desc": "設定內建 HTML 語言支援是否建議 HTML5 標記、屬性和值。",
-+	"html.trace.server.desc": "追蹤 VS Code 與 HTML  語言伺服器之間的通訊。",
-+	"html.validate.scripts": "設定內建 HTML 語言支援是否會驗證內嵌指定碼。",
-+	"html.validate.styles": "設定內建 HTML 語言支援是否會驗證內嵌樣式。",
-+	"html.experimental.syntaxFolding": "啟用/停用語法感知摺疊標記。",
-+	"html.autoClosingTags": "啟用/停用 HTML 標籤的自動關閉功能。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 15eaaf64aef4fd9e427dbe6d61b87aa5f0720583 i18n/cht/extensions/json/package.i18n.json
-  our    100644 909f55cf27028d69b0c46d37319282cd3f8a8dc1 i18n/cht/extensions/json/package.i18n.json
-  their  100644 b0012a5af6c9da404f34850589c37b7fd5de83b8 i18n/cht/extensions/json/package.i18n.json
-@@ -6,6 +6,21 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "JSON 語言基礎知識",
- 	"description": "為 JSON  檔案提供語法醒目提示與括弧對應功能。"
-+=======
-+	"displayName": "JSON 語言功能",
-+	"description": "為 JSON 檔案提供豐富的語言支援",
-+	"json.schemas.desc": "在結構描述與目前專案的 JSON 檔案之間建立關聯",
-+	"json.schemas.url.desc": "目前目錄中的結構描述 URL 或結構描述相對路徑",
-+	"json.schemas.fileMatch.desc": "檔案模式陣列，在將 JSON 檔案解析成結構描述時的比對對象。",
-+	"json.schemas.fileMatch.item.desc": "可包含 '*' 的檔案模式，在將 JSON 檔案解析成結構描述時的比對對象。",
-+	"json.schemas.schema.desc": "指定 URL 的結構描述定義。只須提供結構描述以避免存取結構描述 URL。",
-+	"json.format.enable.desc": "啟用/停用預設 JSON 格式器 (需要重新啟動)",
-+	"json.tracing.desc": "追蹤 VS Code 與 JSON 語言伺服器之間的通訊。",
-+	"json.colorDecorators.enable.desc": "啟用或停用彩色裝飾項目",
-+	"json.colorDecorators.enable.deprecationMessage": "設定 `json.colorDecorators.enable` 已淘汰，將改為 `editor.colorDecorators`。",
-+	"json.experimental.syntaxFolding": "啟用/停用語法感知折疊標記。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ce79ea852ecd25355c72079c3d56c3bf635e27ce i18n/cht/extensions/npm/package.i18n.json
-  our    100644 e1e497559e0002c1cb7f8161b65cf930f3fd8de7 i18n/cht/extensions/npm/package.i18n.json
-  their  100644 0f02eca2d435f39bf8697c1c1f0d7a53a1c26de5 i18n/cht/extensions/npm/package.i18n.json
-@@ -12,6 +12,7 @@
- 	"config.npm.runSilent": "以 `--silent` 選項執行 npm 命令。 ",
- 	"config.npm.packageManager": "用來執行指令碼的套件管理員。",
- 	"config.npm.exclude": "為應從自動指令碼偵測排除的資料夾設定 Glob 模式。",
-+<<<<<<< .our
- 	"config.npm.enableScriptExplorer": "啟用 npm 指令碼的總管檢視。",
- 	"config.npm.scriptExplorerAction": "指令碼總管中預設按一下行為: 'open' 或 'run', 預設值為 'open'。",
- 	"npm.parseError": "Npm 工作刪除: 解析檔案 {0} 失敗",
-@@ -23,4 +24,9 @@
- 	"command.debug": "偵錯",
- 	"command.openScript": "開啟",
- 	"command.runInstall": "執行安裝"
-+=======
-+	"npm.parseError": "Npm 工作刪除: 解析檔案 {0} 失敗",
-+	"taskdef.script": "要自訂的 npm 指令碼。",
-+	"taskdef.path": "提供指令碼之 package.json 檔案的資料夾路徑。可以省略。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 133063880cd055d99f03433a69e870a061f4af2b i18n/cht/extensions/php/package.i18n.json
-  our    100644 d6cdfe9a0f2cc1fcf95b845133af34269f4312dc i18n/cht/extensions/php/package.i18n.json
-  their  100644 397c38b737e6aa0f63659861852356a204ea525d i18n/cht/extensions/php/package.i18n.json
-@@ -6,6 +6,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "PHP 語言基礎知識",
- 	"description": "為 PHP 檔案提供語法醒目提示與括弧對應功能。"
-+=======
-+	"configuration.suggest.basic": "設定是否啟用內建 PHP 語言建議。此支援會建議 PHP 全域和變數。",
-+	"configuration.validate.enable": "啟用/停用內建 PHP 驗證。",
-+	"configuration.validate.executablePath": "指向 PHP 可執行檔。",
-+	"configuration.validate.run": "是否在儲存或輸入時執行 linter。",
-+	"configuration.title": "PHP",
-+	"commands.categroy.php": "PHP",
-+	"command.untrustValidationExecutable": "禁止 PHP 驗證可執行檔 (定義為工作區設定)",
-+	"displayName": "PHP 語言功能",
-+	"description": "為 PHP 檔案提供 IntelliSense、Lint 支援及語言基礎知識。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 52a50a304371d88e20539b0f05cc08da9020b922 i18n/cht/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  our    100644 09acbc3ec19efc71b5dc84e5cced32f46de70cc7 i18n/cht/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  their  100644 04261af3234b5c3749c46b81887ec6ddc873412a i18n/cht/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-changed in both
-  base   100644 6af2e63d1f17cc4893b142c1532dada7709a91f6 i18n/cht/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  our    100644 59aba8fe0868aff03d0f93f784ef209442ed8b55 i18n/cht/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  their  100644 4d744adee4473679cdf09ab7bab0f85c12e66448 i18n/cht/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-@@ -17,6 +17,23 @@
- 	"issueTitleLabel": "標題",
- 	"issueTitleRequired": "請輸入標題。",
- 	"titleLengthValidation": "標題太長。",
-+<<<<<<< .our
-+=======
-+	"systemInfo": "我的系統資訊",
-+	"sendData": "傳送我的資料",
-+	"processes": "目前執行的程序",
-+	"workspaceStats": "我的工作區統計資料",
-+	"extensions": "我的擴充功能",
-+	"searchedExtensions": "搜尋過的擴充功能",
-+	"settingsSearchDetails": "設定值搜尋詳細資料",
-+	"tryDisablingExtensions": "是否在停用擴充功能後問題仍會發生？",
-+	"yes": "是",
-+	"no": "否",
-+	"disableExtensionsLabelText": "請在 {0} 之後嘗試複製問題。",
-+	"disableExtensions": "停用所有延伸模組並重新載入視窗",
-+	"showRunningExtensionsLabelText": "如果您認為這是延伸模組問題，請 {0} 以回報延伸模組問題。",
-+	"showRunningExtensions": "檢視所有執行中的延伸模組",
-+>>>>>>> .their
- 	"details": "請輸入詳細資料。",
- 	"sendSystemInfo": "包含我的系統資訊 ({0})",
- 	"show": "顯示",
-changed in both
-  base   100644 e00f4099a5cf3b9212b06043bba28ac25b9f250f i18n/cht/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 66736a4e736cf7b9a66b648bff264434bc450d4c i18n/cht/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 67c4e506a0fb6971f81a3fe0a9c21766a97ce4df i18n/cht/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -17,7 +17,10 @@
- 	"editorActiveIndentGuide": "使用中編輯器縮排輔助線的色彩。",
- 	"editorLineNumbers": "編輯器行號的色彩。",
- 	"editorActiveLineNumber": "編輯器使用中行號的色彩 ",
-+<<<<<<< .our
- 	"deprecatedEditorActiveLineNumber": "Id 已取代。請改用 'editorLineNumber.activeForeground' 。",
-+=======
-+>>>>>>> .their
- 	"editorRuler": "編輯器尺規的色彩",
- 	"editorCodeLensForeground": "編輯器程式碼濾鏡的前景色彩",
- 	"editorBracketMatchBackground": "成對括號背景色彩",
-changed in both
-  base   100644 0013de0e6a7dd17b3cc44f04c5e7fd0d887d5810 i18n/cht/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 a2cc538e14e2cfd1305228b36fae8794fa7c56f9 i18n/cht/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 01f556d1f68fd7b81fbc1856ef523861f2958426 i18n/cht/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -15,7 +15,11 @@
- 	"errorInstallingDependencies": "安裝相依套件時發生錯誤。{0}",
- 	"MarketPlaceDisabled": "未啟用市集",
- 	"removeError": "移除擴充功能: {0} 時發生錯誤。重新嘗試前請離開並再次啟動 VS Code。",
-+<<<<<<< .our
- 	"Not a Marketplace extension": "只有市集擴充功能可以重新安裝",
-+=======
-+	"Not Market place extension": "只有市集擴充功能可以重新安裝",
-+>>>>>>> .their
- 	"notFoundCompatible": "無法安裝 '{0}'；沒有任何與 VS Code 相容的可用版本 '{1}'。",
- 	"malicious extension": "因為有使用者回報該延伸模組有問題，所以無法安裝延伸模組。",
- 	"notFoundCompatibleDependency": "無法安裝，因為找不到相容於 VS Code 目前版本 '{1}' 的相依擴充功能 '{0}'。",
-changed in both
-  base   100644 d3952c67594a56427bcffa45780210a72aedddaa i18n/cht/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
-  our    100644 57cd7f568213eab3aaa00432122b8dadca2436f1 i18n/cht/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
-  their  100644 87b4e30eb9d6b4c7056e674166fa15f23940d6fb i18n/cht/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
-changed in both
-  base   100644 c2ce787dd2de0a2cd794bb552e7d3ad2f2504e25 i18n/cht/src/vs/workbench/common/theme.i18n.json
-  our    100644 41a6d8c801b131296a56223489edd198cc2bf33b i18n/cht/src/vs/workbench/common/theme.i18n.json
-  their  100644 be8fa25b644b9804312b4685449c115f98e4f1b8 i18n/cht/src/vs/workbench/common/theme.i18n.json
-changed in both
-  base   100644 7b5e1ff7f9504bf8d069a20197c14f5576fe1d2e i18n/cht/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 8c04c44fd8aa84aafd673c4f7e7c350b8ac52c3b i18n/cht/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 f55037e4c3b7cab1761bf08ef45149c4a5a749ab i18n/cht/src/vs/workbench/electron-browser/actions.i18n.json
-changed in both
-  base   100644 c9aa5d596d9f9924102535d68e92181d388f9991 i18n/cht/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  our    100644 5b3899db4ffb2882109c34486febad4f0d0318e9 i18n/cht/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  their  100644 219551b11e82afde93eaac4b3394aa30908eaf22 i18n/cht/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-changed in both
-  base   100644 6274babdab193aeb62573ba259849325faf8403b i18n/cht/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  our    100644 f3039d0a00bdbfdd171e2596b342a43ed854983d i18n/cht/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  their  100644 d9d627e8b23ff4509d997b73748e93df8090e2b6 i18n/cht/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-@@ -27,6 +27,9 @@
- 	"onFirstSessionStart": "只有第一次啟動偵錯後才在狀態列中顯示偵錯",
- 	"showInStatusBar": "控制何時應該顯示偵錯狀態列",
- 	"openDebug": "控制是否應於偵錯工作階段開始時開啟偵錯檢視。",
-+<<<<<<< .our
- 	"enableAllHovers": "控制偵錯期間是否應啟用非偵錯暫留。若為 true，會呼叫暫留提供者提供暫留。即使此設定為 true，一般暫留也不會顯示。",
-+=======
-+>>>>>>> .their
- 	"launch": "全域偵錯啟動組態。應當做在工作區之間共用的 'launch.json' 替代方案使用"
- }
-\ No newline at end of file
-changed in both
-  base   100644 93653e56482fe9ca81d9bce5e5ba601ed30dda2e i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 beddde6d10ce2b9a74005421467ca470c839a054 i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 f678d3e4041e1921c8010fbf95fb87e494ac6389 i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-changed in both
-  base   100644 d24095f15356100317cea75f798f763d0b75c09c i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 68a719930ef86e9c0443de55d9783ccfe2efafc4 i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 a6842652e2e210c1070597e7e7ef94bed1f10f7c i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -8,6 +8,7 @@
- 	],
- 	"neverShowAgain": "不要再顯示",
- 	"searchMarketplace": "搜尋市集",
-+	"showLanguagePackExtensions": "Marketplace 的延伸模組能夠協助將 VS Code 當地語系化為 '{0}' 地區設定",
- 	"dynamicWorkspaceRecommendation": "此擴充功能可能會讓您感興趣，因為它在 {0} 儲存庫的使用者中很熱門。",
- 	"exeBasedRecommendation": "因為您已安裝 {0}，所以建議您使用此延伸模組。",
- 	"fileBasedRecommendation": "根據您最近開啟的檔案，建議您使用此延伸模組。",
-changed in both
-  base   100644 fb76c662147aeb4add92e6ff7f3b80ae9680acb2 i18n/cht/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 ebc27f353b31e6e9c7c072ddd7a5d4a8a93dc07d i18n/cht/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 39cad4cb3d4519e4f0252f002b6cb262dbf4e238 i18n/cht/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -31,5 +31,9 @@
- 	"search.followSymlinks": "控制是否要在搜尋時遵循 symlink。",
- 	"search.smartCase": "如果搜尋式為全部小寫，則用不分大小寫的搜尋，否則用分大小寫的搜尋",
- 	"search.globalFindClipboard": "控制搜尋檢視是否應讀取或修改 macOS 上的共用尋找剪貼簿 (shared find clipboard)",
-+<<<<<<< .our
- 	"search.location": "控制搜尋是否以檢視方式在側邊欄顯示，或以面板方式在面板區域顯示以取得更多水平空間。"
-+=======
-+	"search.location": "預覽: 控制搜尋會在資訊看板顯示為檢視，或在面板區域顯示為面板以取得更多水平空間。下個版本的面板搜尋將具有改善的水平版面配置，而此項目將不再處於預覽階段。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a9e211625b57bb5d44b691ee47fa1cb255c8ebf6 i18n/cht/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 a13d5229d23a832c6ada352df9587e856b73629f i18n/cht/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 f498908a44cf01aec79ac0014cc7cf54881180c8 i18n/cht/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -31,10 +31,15 @@
- 	"selectProblemMatcher": "選取錯誤和警告的種類以掃描工作輸出",
- 	"customizeParseErrors": "當前的工作組態存在錯誤.請更正錯誤再執行工作.",
- 	"moreThanOneBuildTask": "定義了很多建置工作於tasks.json.執行第一個.",
-+<<<<<<< .our
- 	"TaskSystem.activeSame.background": "工作 '{0}' 已在使用中並且處於背景模式。",
- 	"TaskSystem.activeSame.noBackground": "工作 '{0}' 已在使用中。",
- 	"terminateTask": "終止工作",
- 	"restartTask": "重新啟動工作",
-+=======
-+	"TaskSystem.activeSame.background": "工作 '{0}' 已在使用中並處於背景模式。若要予以終止，請使用 [Tasks] \\(工作\\) 功能表的 [Terminate Task...] \\(終止工作...\\)。",
-+	"TaskSystem.activeSame.noBackground": "工作 '{0}' 已在使用中。若要予以終止，請使用 [Tasks] \\(工作\\) 功能表的 [Terminate Task...] \\(終止工作...\\)。",
-+>>>>>>> .their
- 	"TaskSystem.active": "已有工作在執行。請先終止該工作，然後再執行其他工作。",
- 	"TaskSystem.restartFailed": "無法終止再重新啟動工作 {0}",
- 	"TaskService.noConfiguration": "錯誤: {0} 工作偵測未替下列組態提供工作:\n{1}\n將會忽略該工作。\n",
-changed in both
-  base   100644 4afb2ed712327d1e12c1960c27d1fe94859f192b i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 dc4a98ed7869a7cc55922d5bc3bb8ecb137f6a4d i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 4c9806f2e53d890e04aded748e3f65849208bcf8 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-changed in both
-  base   100644 1f295095cccf9b2f71933dc00f774ed70f915da7 i18n/cht/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 3fdd15bb8f2f2cfb1dd6d7b789581c43681e05de i18n/cht/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 cda5b7948e8c558f3efa297bea0c3793bcea4a6b i18n/cht/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -15,6 +15,10 @@
- 	"updateIsReady": "新的 {0} 更新已可用。",
- 	"noUpdatesAvailable": "目前沒有任何可用的更新。",
- 	"ok": "確定",
-+<<<<<<< .our
-+=======
-+	"download now": "立即下載",
-+>>>>>>> .their
- 	"thereIsUpdateAvailable": "已有更新可用。",
- 	"download now": "立即下載",
- 	"later": "稍後",
-changed in both
-  base   100644 66c72f5e62ff3b5a723eff7d1186fc2bd2be572f i18n/cht/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
-  our    100644 0046c67d6ffd23f053abd972fc011d752c90bda1 i18n/cht/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
-  their  100644 b25bfc89872cc0fc7aa76b6464b33f619e0ab745 i18n/cht/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
-changed in both
-  base   100644 9b8e2535d10fb1ee3741270e92a068ed7b5bbe85 i18n/cht/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-  our    100644 fc04da73b94c635e80fe55cd3ed43322d7868458 i18n/cht/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-  their  100644 822c6c89950af8b77d1921b1eeaab0a9b5cc3b4f i18n/cht/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-@@ -11,6 +11,7 @@
- 	"neverShowAgain": "不要再顯示",
- 	"enospcError": "{0} 無法監看此大型工作區中的檔案變更。請按照連結中的說明來解決此問題。",
- 	"learnMore": "說明",
-+<<<<<<< .our
- 	"fileInvalidPath": "檔案資源 ({0}) 無效",
- 	"fileIsDirectoryError": "檔案是目錄",
- 	"fileNotModifiedError": "未修改檔案的時間",
-@@ -24,6 +25,9 @@
- 	"fileReadOnlyError": "檔案為唯讀",
- 	"fileMoveConflict": "無法移動/複製。目的地已存在檔案。",
- 	"unableToMoveCopyError": "無法移動/複製。檔案會取代其所在的資料夾。",
-+=======
-+	"enospcError": "{0} 已超出檔案處理。請按照說明連結解決此問題。",
-+>>>>>>> .their
- 	"binFailed": "無法將 '{0}' 移至資源回收筒",
- 	"trashFailed": "無法將 '{0}' 移動至垃圾"
- }
-\ No newline at end of file
-changed in both
-  base   100644 188ffb115ce80db5fa6474225862abb82392f93a i18n/deu/extensions/css/package.i18n.json
-  our    100644 aed34432417b4bd351906eac6b6682221f298dc0 i18n/deu/extensions/css/package.i18n.json
-  their  100644 6c525265ecf9fab7e148ff4906bf9abefb11c120 i18n/deu/extensions/css/package.i18n.json
-@@ -6,6 +6,81 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "CSS-Sprachgrundlagen",
- 	"description": "Bietet Syntax-Highlighting und Bracket-Matching für CSS, LESS und SCSS Dateien."
-+=======
-+	"displayName": "CSS Sprachfeatures",
-+	"description": "Bietet umfangreiche Sprachunterstützung für CSS-, LESS- und SCSS-Dateien.",
-+	"css.title": "CSS",
-+	"css.lint.argumentsInColorFunction.desc": "Ungültige Parameteranzahl.",
-+	"css.lint.boxModel.desc": "Verwenden Sie width oder height nicht beim Festlegen von padding oder border",
-+	"css.lint.compatibleVendorPrefixes.desc": "Stellen Sie beim Verwenden vom anbieterspezifischen Präfix sicher, dass alle anderen anbieterspezifischen Eigenschaften miteinbezogen werden",
-+	"css.lint.duplicateProperties.desc": "Keine doppelten Formatvorlagendefinitionen verwenden",
-+	"css.lint.emptyRules.desc": "Keine leeren Regelsätze verwenden",
-+	"css.lint.float.desc": "Die Verwendung von \"float\" vermeiden. float-Eigenschaften führen zu anfälligem CSS, das schnell nicht mehr funktioniert, wenn sich ein Aspekt des Layouts ändert.",
-+	"css.lint.fontFaceProperties.desc": "@font-face-Regel muss die Eigenschaften \"src\" und \"font-family\" definieren.",
-+	"css.lint.hexColorLength.desc": "Hexfarben müssen aus drei oder sechs Hexzahlen bestehen",
-+	"css.lint.idSelector.desc": "Selektoren sollten keine IDs enthalten, da diese Regeln zu eng mit HTML verknüpft sind.",
-+	"css.lint.ieHack.desc": "IE-Hacks sind nur für die Unterstützung von IE7 und älter erforderlich",
-+	"css.lint.important.desc": "Verwendung von „!important“ vermeiden. Damit wird angegeben, dass die Spezifität vom gesamten CSS außer Kontrolle geraten ist und umgestaltet werden muss.",
-+	"css.lint.importStatement.desc": "Importanweisungen können nicht parallel geladen werden.",
-+	"css.lint.propertyIgnoredDueToDisplay.desc": "Die Eigenschaft wird aufgrund der Anzeige ignoriert. Mit \"display: inline\" besitzen die width-, height-, margin-top-, margin-bottom- und float-Eigenschaften z. B. keine Auswirkung.",
-+	"css.lint.universalSelector.desc": "Es ist bekannt, dass der Universalselektor (*) langsam ist.",
-+	"css.lint.unknownProperties.desc": "Unbekannte Eigenschaft.",
-+	"css.lint.unknownVendorSpecificProperties.desc": "Unbekannte anbieterspezifische Eigenschaft.",
-+	"css.lint.vendorPrefix.desc": "Beim Verwenden von anbieterspezifischen Präfix auch die Standardeigenschaft miteinbeziehen",
-+	"css.lint.zeroUnits.desc": "Keine Einheit für Null erforderlich",
-+	"css.trace.server.desc": "Verfolgt die Kommunikation zwischen VS Code und dem CSS-Sprachserver.",
-+	"css.validate.title": "Steuert die CSS-Validierung und Problemschweregrade.",
-+	"css.validate.desc": "Aktiviert oder deaktiviert alle Überprüfungen.",
-+	"less.title": "LESS",
-+	"less.lint.argumentsInColorFunction.desc": "Ungültige Parameteranzahl.",
-+	"less.lint.boxModel.desc": "Verwenden Sie width oder height nicht beim Festlegen von padding oder border",
-+	"less.lint.compatibleVendorPrefixes.desc": "Stellen Sie beim Verwenden vom anbieterspezifischen Präfix sicher, dass alle anderen anbieterspezifischen Eigenschaften miteinbezogen werden",
-+	"less.lint.duplicateProperties.desc": "Keine doppelten Formatvorlagendefinitionen verwenden",
-+	"less.lint.emptyRules.desc": "Keine leeren Regelsätze verwenden",
-+	"less.lint.float.desc": "Die Verwendung von \"float\" vermeiden. float-Eigenschaften führen zu anfälligem CSS, das schnell nicht mehr funktioniert, wenn sich ein Aspekt des Layouts ändert.",
-+	"less.lint.fontFaceProperties.desc": "@font-face-Regel muss die Eigenschaften \"src\" und \"font-family\" definieren.",
-+	"less.lint.hexColorLength.desc": "Hexfarben müssen aus drei oder sechs Hexzahlen bestehen",
-+	"less.lint.idSelector.desc": "Selektoren sollten keine IDs enthalten, da diese Regeln zu eng mit HTML verknüpft sind.",
-+	"less.lint.ieHack.desc": "IE-Hacks sind nur für die Unterstützung von IE7 und älter erforderlich",
-+	"less.lint.important.desc": "Verwendung von „!important“ vermeiden. Damit wird angegeben, dass die Spezifität vom gesamten CSS außer Kontrolle geraten ist und umgestaltet werden muss.",
-+	"less.lint.importStatement.desc": "Importanweisungen können nicht parallel geladen werden.",
-+	"less.lint.propertyIgnoredDueToDisplay.desc": "Die Eigenschaft wird aufgrund der Anzeige ignoriert. Mit \"display: inline\" besitzen die width-, height-, margin-top-, margin-bottom- und float-Eigenschaften z. B. keine Auswirkung.",
-+	"less.lint.universalSelector.desc": "Es ist bekannt, dass der Universalselektor (*) langsam ist.",
-+	"less.lint.unknownProperties.desc": "Unbekannte Eigenschaft.",
-+	"less.lint.unknownVendorSpecificProperties.desc": "Unbekannte anbieterspezifische Eigenschaft.",
-+	"less.lint.vendorPrefix.desc": "Beim Verwenden von anbieterspezifischen Präfix auch die Standardeigenschaft miteinbeziehen",
-+	"less.lint.zeroUnits.desc": "Keine Einheit für Null erforderlich",
-+	"less.validate.title": "Steuert die LESS-Validierung und Problemschweregrade.",
-+	"less.validate.desc": "Aktiviert oder deaktiviert alle Überprüfungen.",
-+	"scss.title": "SCSS (SASS)",
-+	"scss.lint.argumentsInColorFunction.desc": "Ungültige Parameteranzahl.",
-+	"scss.lint.boxModel.desc": "Verwenden Sie width oder height nicht beim Festlegen von padding oder border",
-+	"scss.lint.compatibleVendorPrefixes.desc": "Stellen Sie beim Verwenden vom anbieterspezifischen Präfix sicher, dass alle anderen anbieterspezifischen Eigenschaften miteinbezogen werden",
-+	"scss.lint.duplicateProperties.desc": "Keine doppelten Formatvorlagendefinitionen verwenden",
-+	"scss.lint.emptyRules.desc": "Keine leeren Regelsätze verwenden",
-+	"scss.lint.float.desc": "Die Verwendung von \"float\" vermeiden. float-Eigenschaften führen zu anfälligem CSS, das schnell nicht mehr funktioniert, wenn sich ein Aspekt des Layouts ändert.",
-+	"scss.lint.fontFaceProperties.desc": "@font-face-Regel muss die Eigenschaften \"src\" und \"font-family\" definieren.",
-+	"scss.lint.hexColorLength.desc": "Hexfarben müssen aus drei oder sechs Hexzahlen bestehen",
-+	"scss.lint.idSelector.desc": "Selektoren sollten keine IDs enthalten, da diese Regeln zu eng mit HTML verknüpft sind.",
-+	"scss.lint.ieHack.desc": "IE-Hacks sind nur für die Unterstützung von IE7 und älter erforderlich",
-+	"scss.lint.important.desc": "Verwendung von „!important“ vermeiden. Damit wird angegeben, dass die Spezifität vom gesamten CSS außer Kontrolle geraten ist und umgestaltet werden muss.",
-+	"scss.lint.importStatement.desc": "Importanweisungen können nicht parallel geladen werden.",
-+	"scss.lint.propertyIgnoredDueToDisplay.desc": "Die Eigenschaft wird aufgrund der Anzeige ignoriert. Mit \"display: inline\" besitzen die width-, height-, margin-top-, margin-bottom- und float-Eigenschaften z. B. keine Auswirkung.",
-+	"scss.lint.universalSelector.desc": "Es ist bekannt, dass der Universalselektor (*) langsam ist.",
-+	"scss.lint.unknownProperties.desc": "Unbekannte Eigenschaft.",
-+	"scss.lint.unknownVendorSpecificProperties.desc": "Unbekannte anbieterspezifische Eigenschaft.",
-+	"scss.lint.vendorPrefix.desc": "Beim Verwenden von anbieterspezifischen Präfix auch die Standardeigenschaft miteinbeziehen",
-+	"scss.lint.zeroUnits.desc": "Keine Einheit für Null erforderlich",
-+	"scss.validate.title": "Steuert die SCSS-Überprüfung und Problemschweregrade.",
-+	"scss.validate.desc": "Aktiviert oder deaktiviert alle Überprüfungen.",
-+	"less.colorDecorators.enable.desc": "Aktiviert oder deaktiviert Farb-Decorators",
-+	"scss.colorDecorators.enable.desc": "Aktiviert oder deaktiviert Farb-Decorators",
-+	"css.colorDecorators.enable.desc": "Aktiviert oder deaktiviert Farb-Decorators",
-+	"css.colorDecorators.enable.deprecationMessage": "Die Einstellung \"css.colorDecorators.enable\" ist veraltet und wurde durch \"editor.colorDecorators\" ersetzt.",
-+	"scss.colorDecorators.enable.deprecationMessage": "Die Einstellung \"scss.colorDecorators.enable\" ist veraltet und wurde durch \"editor.colorDecorators\" ersetzt.",
-+	"less.colorDecorators.enable.deprecationMessage": "Die Einstellung \"less.colorDecorators.enable\" ist veraltet und wurde durch \"editor.colorDecorators\" ersetzt."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c138007e3656622813c4d2b721c20575dfee2130 i18n/deu/extensions/emmet/package.i18n.json
-  our    100644 76a0f1cf2f4933fe2973e0cc716d5590fccebd37 i18n/deu/extensions/emmet/package.i18n.json
-  their  100644 0dac2469d9815dfc5cbecc261ed4f7a984808da5 i18n/deu/extensions/emmet/package.i18n.json
-@@ -59,7 +59,11 @@
- 	"emmetPreferencesCssWebkitProperties": "Durch Trennzeichen getrennte CSS-Eigenschaften, die das \"webkit\"-Herstellerpräfix erhalten, wenn sie in einer Emmet-Abkürzung verwendet werden, die mit \"-\" beginnt. Legen Sie eine leere Zeichenfolge fest, um das \"webkit\"-Präfix immer zu vermeiden.",
- 	"emmetPreferencesCssMozProperties": "Durch Trennzeichen getrennte CSS-Eigenschaften, die das \"moz\"-Herstellerpräfix erhalten, wenn sie in einer Emmet-Abkürzung verwendet werden, die mit \"-\" beginnt. Legen Sie eine leere Zeichenfolge fest, um das \"moz\"-Präfix immer zu vermeiden.",
- 	"emmetPreferencesCssOProperties": "Durch Trennzeichen getrennte CSS-Eigenschaften, die das \"o\"-Herstellerpräfix erhalten, wenn sie in einer Emmet-Abkürzung verwendet werden, die mit \"-\" beginnt. Legen Sie eine leere Zeichenfolge fest, um das \"o\"-Präfix immer zu vermeiden.",
-+<<<<<<< .our
- 	"emmetPreferencesCssMsProperties": "Durch Trennzeichen getrennte CSS-Eigenschaften, die das \"ms\"-Herstellerpräfix erhalten, wenn sie in einer Emmet-Abkürzung verwendet werden, die mit \"-\" beginnt. Legen Sie eine leere Zeichenfolge fest, um das \"ms\"-Präfix immer zu vermeiden.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "Das Mindestergebnis (zwischen 0 und 1), das die Abkürzung mit Fuzzyübereinstimmung erreichen muss. Niedrigere Werte führen zu vielen falsch positiven Übereinstimmungen, höhere Werte verringern unter Umständen die möglichen Übereinstimmungen.",
- 	"emmetOptimizeStylesheetParsing": "Bei der Einstellung FALSE wird die gesamte Datei analysiert, um zu bestimmten, ob die aktuelle Position zum Erweitern von Emmet-Abkürzungen gültig ist. Bei der Einstellung TRUE wird nur der Inhalt um die die aktuelle Position in CSS-/SCSS-/LESS-Dateien analysiert."
-+=======
-+	"emmetPreferencesCssMsProperties": "Durch Trennzeichen getrennte CSS-Eigenschaften, die das \"ms\"-Herstellerpräfix erhalten, wenn sie in einer Emmet-Abkürzung verwendet werden, die mit \"-\" beginnt. Legen Sie eine leere Zeichenfolge fest, um das \"ms\"-Präfix immer zu vermeiden."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 11a98b9d1aea950ffddc80dfd986bfeba8fea0db i18n/deu/extensions/git/out/commands.i18n.json
-  our    100644 1abad5f86ec11c777f2319fc1588d47f5ea1c8f5 i18n/deu/extensions/git/out/commands.i18n.json
-  their  100644 390ed62228dd0a618e6a1f37c61314b238141ecb i18n/deu/extensions/git/out/commands.i18n.json
-changed in both
-  base   100644 e774d08cd538b25a3fed7e5ecfd25dac583d9260 i18n/deu/extensions/git/package.i18n.json
-  our    100644 70e0819e8ad95e53d1958520356a5b59f85a5e7c i18n/deu/extensions/git/package.i18n.json
-  their  100644 4c745be0f351bbb936f178a5d96c9fe711c2a333 i18n/deu/extensions/git/package.i18n.json
-changed in both
-  base   100644 51cd079a7f8a1f99a3dc9c0b3cb06db4f63334af i18n/deu/extensions/html/package.i18n.json
-  our    100644 9ce5789f79319444e43d360a505b99775b440971 i18n/deu/extensions/html/package.i18n.json
-  their  100644 a85a95e5d5d1f2fa9d88845e3e413c94417fb9f1 i18n/deu/extensions/html/package.i18n.json
-@@ -6,6 +6,34 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "HTML-Sprachgrundlagen",
- 	"description": "Bietet Syntaxhervorhebung, Klammernpaare und Ausschnitte in HTML-Dateien."
-+=======
-+	"displayName": "HTML-Sprachfeatures",
-+	"description": "Bietet umfangreiche Sprachunterstützung für HTML-, Razor- und Handlebar-Dateien.",
-+	"html.format.enable.desc": "Standard-HTML-Formatierer aktivieren/deaktivieren",
-+	"html.format.wrapLineLength.desc": "Die maximale Anzahl von Zeichen pro Zeile (0 = deaktiviert).",
-+	"html.format.unformatted.desc": "Die Liste der Tags (durch Kommas getrennt), die nicht erneut formatiert werden sollen. \"null\" bezieht sich standardmäßig auf alle Tags, die unter https://www.w3.org/TR/html5/dom.html#phrasing-content aufgeführt werden.",
-+	"html.format.contentUnformatted.desc": "Liste der Tags (durch Trennzeichen getrennt), in der der Inhalt nicht neu formatiert werden muss. \"null\" entspricht standardmäßig dem Tag \"pre\".",
-+	"html.format.indentInnerHtml.desc": "Nimmt einen Einzug für <head>- und <body>-Abschnitte vor.",
-+	"html.format.preserveNewLines.desc": "Gibt an, ob vorhandene Zeilenumbrüche vor Elemente beibehalten werden sollen. Funktioniert nur vor Elementen, nicht in Tags oder für Text.",
-+	"html.format.maxPreserveNewLines.desc": "Die maximale Anzahl von Zeilenumbrüchen, die in einem Block beibehalten werden soll. Verwenden Sie \"null\" für eine unbegrenzte Anzahl.",
-+	"html.format.indentHandlebars.desc": "Formatiert {{#foo}} und {{/foo}} und nimmt einen Einzug vor.",
-+	"html.format.endWithNewline.desc": "Endet mit einer neuen Zeile.",
-+	"html.format.extraLiners.desc": "Die Liste der Tags (durch Kommas getrennt), vor denen eine zusätzliche neue Zeile eingefügt werden soll. \"null\" verwendet standardmäßig \"head, body, /HTML\".",
-+	"html.format.wrapAttributes.desc": "Attribute umschließen.",
-+	"html.format.wrapAttributes.auto": "Attribute nur dann umschließen, wenn die Zeilenlänge überschritten wird.",
-+	"html.format.wrapAttributes.force": "Jedes Attribut mit Ausnahme des ersten umschließen.",
-+	"html.format.wrapAttributes.forcealign": "Jedes Attribut mit Ausnahme des ersten umschließen und Ausrichtung beibehalten.",
-+	"html.format.wrapAttributes.forcemultiline": "Jedes Attribut umschließen.",
-+	"html.suggest.angular1.desc": "Konfiguriert, ob die integrierte HTML-Sprachuntersützung Angular V1-Tags und -Eigenschaften vorschlägt.",
-+	"html.suggest.ionic.desc": "Konfiguriert, ob die integrierte HTML-Sprachuntersützung Ionic-Tags, -Eigenschaften und -Werte vorschlägt.",
-+	"html.suggest.html5.desc": "Konfiguriert, ob die integrierte HTML-Sprachuntersützung HTML5-Tags, -Eigenschaften und -Werte vorschlägt.",
-+	"html.trace.server.desc": "Verfolgt die Kommunikation zwischen VS Code und dem HTML-Sprachserver.",
-+	"html.validate.scripts": "Konfiguriert, ob die integrierte HTML-Sprachunterstützung eingebettete Skripts unterstützt.",
-+	"html.validate.styles": "Konfiguriert, ob die integrierte HTML-Sprachunterstützung eingebettete Skripts validiert.",
-+	"html.experimental.syntaxFolding": "Aktiviert bzw. deaktiviert syntaxabhängige Faltungsmarkierungen.",
-+	"html.autoClosingTags": "Automatisches Schließen von HTML-Tags aktivieren/deaktivieren."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 2471bee85e68e2339a8b8bf6bdab54909ad2a195 i18n/deu/extensions/json/package.i18n.json
-  our    100644 b9be795e738e73486bf4e8725cdd00e6c55de4a0 i18n/deu/extensions/json/package.i18n.json
-  their  100644 1ee4f4553c8e1ddf3e910565db08c3e50be53168 i18n/deu/extensions/json/package.i18n.json
-@@ -6,6 +6,21 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "JSON-Sprachgrundlagen",
- 	"description": "Bietet Syntaxhervorhebung und Klammernpaare in JSON-Dateien."
-+=======
-+	"displayName": "JSON-Sprachfeatures",
-+	"description": "Bietet umfangreiche Sprachunterstützung für JSON-Dateien.",
-+	"json.schemas.desc": "Schemas zu JSON-Dateien im aktuellen Projekt zuordnen",
-+	"json.schemas.url.desc": "Eine URL zu einem Schema oder ein relativer Pfad zu einem Schema im aktuellen Verzeichnis",
-+	"json.schemas.fileMatch.desc": "Ein Array von Dateimustern, mit dem beim Auflösen von JSON-Dateien zu Schemas ein Abgleich erfolgt.",
-+	"json.schemas.fileMatch.item.desc": "Ein Dateimuster, das \"*\" enthalten kann, mit dem beim Auflösen von JSON-Dateien zu Schemas ein Abgleich erfolgt.",
-+	"json.schemas.schema.desc": "Die Schemadefinition für die angegebene URL. Das Schema muss nur angegeben werden, um Zugriffe auf die Schema-URL zu vermeiden.",
-+	"json.format.enable.desc": "Standard-JSON-Formatierer aktivieren/deaktivieren (Neustart erforderlich)",
-+	"json.tracing.desc": "Verfolgt die Kommunikation zwischen VS Code und JSON-Sprachserver nach.",
-+	"json.colorDecorators.enable.desc": "Aktiviert oder deaktiviert Farb-Decorators",
-+	"json.colorDecorators.enable.deprecationMessage": "Die Einstellung \"json.colorDecorators.enable\" ist veraltet und wurde durch \"editor.colorDecorators\" ersetzt.",
-+	"json.experimental.syntaxFolding": "Aktiviert bzw. deaktiviert die syntaxabhängigen Faltungsmarkierungen."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 4a666a0a468e2250f2203d3ad4d49ad639fdc943 i18n/deu/extensions/npm/package.i18n.json
-  our    100644 8df75704426af1d4997cfc228d8144b23fc7a25f i18n/deu/extensions/npm/package.i18n.json
-  their  100644 76fc1f862d43692b276b957edc7cbd92aa989d8b i18n/deu/extensions/npm/package.i18n.json
-@@ -12,6 +12,7 @@
- 	"config.npm.runSilent": "npm-Befehle mit der Option \"--silent\" ausführen.",
- 	"config.npm.packageManager": "Der zu verwendende Paket-Manager, um Skripte auszuführen.",
- 	"config.npm.exclude": "Konfigurieren Sie Globmuster für Ordner, die von der automatischen Skripterkennung ausgeschlossen werden sollen.",
-+<<<<<<< .our
- 	"config.npm.enableScriptExplorer": "Aktiviert eine Exploreransicht für npm-Skripts.",
- 	"config.npm.scriptExplorerAction": "Die im Skript-Explorer verwendete Standardaktion für Klicks. Mögliche Werte sind \"open\" (Standard) und \"run\".",
- 	"npm.parseError": "NPM-Aufgabenerkennung: Fehler beim Analysieren der Datei {0}",
-@@ -23,4 +24,9 @@
- 	"command.debug": "Debuggen",
- 	"command.openScript": "Öffnen",
- 	"command.runInstall": "Installation ausführen"
-+=======
-+	"npm.parseError": "NPM-Aufgabenerkennung: Fehler beim Analysieren der Datei {0}",
-+	"taskdef.script": "Das anzupassende NPM-Skript.",
-+	"taskdef.path": "Der Pfad zu dem Ordner der Datei vom Typ \"package.json\", die das Skript bereitstellt. Kann ausgelassen werden."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 87a83d20ab8ffb452643e983b16082b33f47ca02 i18n/deu/extensions/php/package.i18n.json
-  our    100644 5c068410d3db4868bf1390c91ee395d7944d41c8 i18n/deu/extensions/php/package.i18n.json
-  their  100644 b969aa85c93f4e5aa79d271e52c43c29e3817e60 i18n/deu/extensions/php/package.i18n.json
-@@ -6,6 +6,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "PHP-Sprachgrundlagen",
- 	"description": "Bietet Syntaxhervorhebung und Klammernpaare für PHP-Dateien."
-+=======
-+	"configuration.suggest.basic": "Konfiguriert, ob die integrierten PHP-Sprachvorschläge aktiviert sind. Die Unterstützung schlägt globale und variable PHP-Elemente vor.",
-+	"configuration.validate.enable": "Integrierte PHP-Überprüfung aktivieren/deaktivieren.",
-+	"configuration.validate.executablePath": "Zeigt auf die ausführbare PHP-Datei.",
-+	"configuration.validate.run": "Gibt an, ob der Linter beim Speichern oder bei der Eingabe ausgeführt wird.",
-+	"configuration.title": "PHP",
-+	"commands.categroy.php": "PHP",
-+	"command.untrustValidationExecutable": "Ausführbare Datei für PHP-Überprüfung nicht zulassen (als Arbeitsbereicheinstellung definiert)",
-+	"displayName": "PHP-Sprachfeatures",
-+	"description": "Bietet IntelliSense, Bereinigen und Sprachgrundlagen für PHP-Dateien."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7c77a0595ce37fce4ac78791cd4efabebb14f335 i18n/deu/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  our    100644 5bc9127f7c619b851c0cf1328cd211996a08b032 i18n/deu/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  their  100644 631d23eff3f0f544f92cceaaa39e11db66b1a182 i18n/deu/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-@@ -14,7 +14,11 @@
- 	"similarIssues": "Ähnliche Probleme",
- 	"open": "Öffnen",
- 	"closed": "Geschlossen",
-+<<<<<<< .our
- 	"noSimilarIssues": "Keine ähnlichen Probleme gefunden",
-+=======
-+	"noResults": "Es wurden keine Ergebnisse gefunden.",
-+>>>>>>> .their
- 	"settingsSearchIssue": "Fehler in Einstellungssuche ",
- 	"bugReporter": "Fehlerbericht",
- 	"featureRequest": "Featureanforderung",
-changed in both
-  base   100644 6aed1b5b23d44159fc6443c32175045c3575f30a i18n/deu/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  our    100644 b2207b414add0edf1a35b65e634fce205abbcca5 i18n/deu/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  their  100644 f74316af1b583050ec379e318e6410f693de2572 i18n/deu/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-@@ -8,6 +8,7 @@
- 	],
- 	"completeInEnglish": "Füllen Sie das Formular auf Englisch aus.",
- 	"issueTypeLabel": "Dies ist",
-+<<<<<<< .our
- 	"issueSourceLabel": "Datei auf",
- 	"vscode": "Visual Studio Code",
- 	"extension": "Eine Erweiterung",
-@@ -25,4 +26,25 @@
- 	"sendExtensions": "Meine aktivierten Erweiterungen einschließen ({0})",
- 	"sendSearchedExtensions": "Gesuchte Erweiterungen senden ({0})",
- 	"sendSettingsSearchDetails": "Details der Einstellungssuche senden ({0})"
-+=======
-+	"issueTitleLabel": "Titel",
-+	"issueTitleRequired": "Geben Sie einen Titel ein.",
-+	"titleLengthValidation": "Der Titel ist zu lang.",
-+	"systemInfo": "Eigene Systeminformationen",
-+	"sendData": "Eigene Daten senden",
-+	"processes": "Derzeit ausgeführte Prozesse",
-+	"workspaceStats": "Eigene Arbeitsbereichsstatistiken",
-+	"extensions": "Eigene Erweiterungen",
-+	"searchedExtensions": "Gesuchte Erweiterungen",
-+	"settingsSearchDetails": "Details der Einstellungssuche",
-+	"tryDisablingExtensions": "Kann das Problem reproduziert werden, wenn Erweiterungen deaktiviert sind?",
-+	"yes": "Ja",
-+	"no": "Nein",
-+	"disableExtensionsLabelText": "Versuchen Sie, das Problem nach {0} zu reproduzieren.",
-+	"disableExtensions": "Alle Erweiterungen werden deaktiviert, und das Fenster wird neu geladen",
-+	"showRunningExtensionsLabelText": "Wenn Sie ein Erweiterungsproblem vermuten, melden Sie dieses Problem durch {0}.",
-+	"showRunningExtensions": "Alle ausgeführten Erweiterungen anzeigen",
-+	"details": "Geben Sie Details ein.",
-+	"loadingData": "Daten werden geladen …"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 b4786b83249969f1b9c20d95fb9d89ac37876b6e i18n/deu/src/vs/code/electron-main/menus.i18n.json
-  our    100644 2c62aec3f2252906a0cfb94c2bac025ecf6adbb0 i18n/deu/src/vs/code/electron-main/menus.i18n.json
-  their  100644 cc2c26f1108354be4e9a0b16c8fe41ef9035ed9c i18n/deu/src/vs/code/electron-main/menus.i18n.json
-changed in both
-  base   100644 aaf357438c69310ee15ceaea1130c867220ed9bb i18n/deu/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 efdaa6c50b1a7075eb309307a09334b8e64087d3 i18n/deu/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 786adadf99dc9f242c49d310102d431b0fb84780 i18n/deu/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -15,7 +15,11 @@
- 	"errorInstallingDependencies": "Fehler während Installation der Abhängigkeiten. {0}",
- 	"MarketPlaceDisabled": "Marketplace ist nicht aktiviert.",
- 	"removeError": "Fehler beim Entfernen der Erweiterung: {0}. Bitte beenden Sie und starten Sie VS Code neu bevor Sie erneut versuchen die Erweiterung zu installieren.",
-+<<<<<<< .our
- 	"Not a Marketplace extension": "Nur Marktplatz-Erweiterungen können neu installiert werden",
-+=======
-+	"Not Market place extension": "Nur Marktplatz-Erweiterungen können neu installiert werden",
-+>>>>>>> .their
- 	"notFoundCompatible": "'{0}' kann nicht installiert werden: Es gibt keine mit VS Code '{1}' kompatible Version.",
- 	"malicious extension": "Die Erweiterung kann nicht installiert werden, da sie als problematisch gemeldet wurde.",
- 	"notFoundCompatibleDependency": "Kann nicht installiert werden, da die abhängige Erweiterung '{0}', die mit der aktuellen VS Code Version '{1}' kompatibel ist, nicht gefunden werden kann. ",
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/deu/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
-  our    100644 522ad6a6e3b240277bc49e83671010226887d7d4 i18n/deu/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
-  their  100644 0a2dcb8a2c9a3e0ef6f2ec0b1350547be9a57d31 i18n/deu/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
-@@ -6,5 +6,9 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"errorMessage": "Ein Fehler ist aufgetreten beim Wiederherstellen der Ansicht: {0}"
-+=======
-+	"webview.editor.label": "Webview-Editor"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/deu/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
-  our    100644 25fb0b63c30c96ff819ae0176e8905563229fb61 i18n/deu/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
-  their  100644 cabab414f2d101eefe9426517f211b523ad05ad1 i18n/deu/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
-@@ -6,7 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"notificationsEmpty": "Keine neuen Benachrichtigungen",
-+=======
-+>>>>>>> .their
- 	"notifications": "Benachrichtigungen",
- 	"notificationsToolbar": "Aktionen der Benachrichtigungszentrale",
- 	"notificationsList": "Benachrichtigungsliste"
-changed in both
-  base   100644 e26b4a8c28284a102d4d931ec7776491b88fc697 i18n/deu/src/vs/workbench/common/theme.i18n.json
-  our    100644 7230e04365d13635c1ebe9cad1ed0f92866146cc i18n/deu/src/vs/workbench/common/theme.i18n.json
-  their  100644 f43e9eec891ab5849fcb694908e941cc8bd0c814 i18n/deu/src/vs/workbench/common/theme.i18n.json
-changed in both
-  base   100644 f7b5d114612634431b10ebfe1180a72bb553a088 i18n/deu/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 1609e7c92719c7aa89402c8bf0018971f9a1043e i18n/deu/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 443028d2ccb62d2748e047fb93ab6dd614916906 i18n/deu/src/vs/workbench/electron-browser/actions.i18n.json
-changed in both
-  base   100644 c6b5b2cb3140a044430648764a3b7521a93a7e24 i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 fc92fd392259fb9b2d1dec1cecdbc3c76bdc7440 i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 d7684461feb0358fd465823254581f00e28f8022 i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
-changed in both
-  base   100644 5fb263b1c0b410d311f967a6b9a2a448e9c917c8 i18n/deu/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  our    100644 b4980d90513329055396eb8b728644dabebdc442 i18n/deu/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  their  100644 6a4e04d332e9281f9901afe11418d3ce23bd41f0 i18n/deu/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-@@ -17,7 +17,10 @@
- 	"breakpointUnverifieddHover": "Nicht überprüfter Haltepunkt",
- 	"functionBreakpointUnsupported": "Funktionshaltepunkte werden von diesem Debugtyp nicht unterstützt.",
- 	"breakpointDirtydHover": "Nicht überprüfter Haltepunkt. Die Datei wurde geändert. Bitte starten Sie die Debugsitzung neu.",
-+<<<<<<< .our
- 	"logBreakpointUnsupported": "Protokollpunkte werden für diesen Debugtyp nicht unterstützt",
-+=======
-+>>>>>>> .their
- 	"conditionalBreakpointUnsupported": "Bedingte Haltepunkte werden für diesen Debugtyp nicht unterstützt.",
- 	"hitBreakpointUnsupported": "Bedingte Trefferhaltepunkte werden für diesen Debugtyp nicht unterstützt."
- }
-\ No newline at end of file
-changed in both
-  base   100644 77be1d58c4b54791f260cb5cea8c849f7b44ac91 i18n/deu/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
-  our    100644 3e3e238e2d921c466ae48de8b9f5b2e9b86fb3db i18n/deu/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
-  their  100644 0e8f2ebb5659300ca5c125b7289fa6b99619e98b i18n/deu/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
-@@ -7,7 +7,11 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"noFolderDebugConfig": "Öffnen Sie bitte einen Ordner, um erweitertes Debuggen zu konfigurieren.",
-+<<<<<<< .our
- 	"inlineBreakpoint": "Inlinehaltepunkt",
-+=======
-+	"columnBreakpoint": "Spaltenhaltepunkt",
-+>>>>>>> .their
- 	"debug": "Debuggen",
- 	"addInlineBreakpoint": "Inlinehaltepunkt hinzufügen"
- }
-\ No newline at end of file
-changed in both
-  base   100644 b59c791cf01a7d459fd79030890fa7b519d01baf i18n/deu/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  our    100644 72a2c9e811a52bded399b60826b044c598a0ead6 i18n/deu/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  their  100644 3c811f992f448f26f02d6e4c73c54647eefa7406 i18n/deu/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-@@ -27,6 +27,9 @@
- 	"onFirstSessionStart": "Debuggen nur in Statusleiste anzeigen, nachdem das Debuggen erstmals gestartet wurde",
- 	"showInStatusBar": "Steuert, wann die Debug-Statusleiste angezeigt werden soll",
- 	"openDebug": "Steuert, ob das Debug-Menü beim Start der Debugsitzung offen ist.",
-+<<<<<<< .our
- 	"enableAllHovers": "Legt fest, ob Nicht-Debughover beim Debuggen aktiviert sind. Bei \"true\" werden die Hoveranbieter aufgerufen, um einen Hover bereitstellen. Reguläre Hover werden auch bei der Einstellung \"true\" nicht angezeigt.",
-+=======
-+>>>>>>> .their
- 	"launch": "Startkonfiguration für globales Debuggen. Sollte als Alternative zu \"launch.json\" verwendet werden, das übergreifend von mehreren Arbeitsbereichen genutzt wird"
- }
-\ No newline at end of file
-changed in both
-  base   100644 99751dbb7a844ee8e2fe25b9a639b39d96a955dc i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 d6cc1170dbfaab61ca55376b64654ebe15edb98e i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 451f6c89a46830780f6e78d1cc7e93d59ae71a43 i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-changed in both
-  base   100644 eeaeb33f57eec1236294d5fc1c9b0923afdda98e i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 cf7a07fdcb5de4fa57ac5ab17021ee98e54c3fc8 i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 5b2cebadb753a92a7ecec7a65d92f35111dc477b i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-changed in both
-  base   100644 43e27dc6463b0a12a0495bf310be9b68787e0ddd i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 5272d4afb1fdf32991cbacee03058c69d41ba9c7 i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 161dda932e8dc755d5288e5818ca1bf7bd48e603 i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -8,6 +8,10 @@
- 	],
- 	"neverShowAgain": "Nicht mehr anzeigen",
- 	"searchMarketplace": "Marketplace durchsuchen",
-+<<<<<<< .our
-+=======
-+	"showLanguagePackExtensions": "Der Marketplace enthält Erweiterungen, die beim Lokalisieren von VS Code in die Sprache \"{0}\" behilflich sein können.",
-+>>>>>>> .their
- 	"dynamicWorkspaceRecommendation": "Diese Erweiterung ist für Sie möglicherweise interessant, da sie von vielen anderen Benutzern des Repositorys {0} verwendet wird.",
- 	"exeBasedRecommendation": "Diese Erweiterung wird empfohlen, da Sie {0} installiert haben.",
- 	"fileBasedRecommendation": "Ausgehend von den kürzlich geöffneten Dateien wird diese Erweiterung empfohlen.",
-changed in both
-  base   100644 a3725fa64c59f98c8e680bc9f2b8db40dc66ce9c i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  our    100644 7344b01b4a3219fe21a92df254af8af45008be39 i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  their  100644 29577e29ba62e50429d9c8b0bce62095d34276b0 i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-@@ -12,9 +12,13 @@
- 	"recommendedExtensions": "Empfohlen",
- 	"otherRecommendedExtensions": "Weitere Empfehlungen",
- 	"workspaceRecommendedExtensions": "Arbeitsbereich-Empfehlungen",
-+<<<<<<< .our
- 	"builtInExtensions": "Features",
- 	"builtInThemesExtensions": "Designs",
- 	"builtInBasicsExtensions": "Programmiersprachen",
-+=======
-+	"builtInExtensions": "Integriert",
-+>>>>>>> .their
- 	"searchExtensions": "Nach Erweiterungen im Marketplace suchen",
- 	"sort by installs": "Sortieren nach: Installationsanzahl",
- 	"sort by rating": "Sortieren nach: Bewertung",
-changed in both
-  base   100644 73cbebd6c6659478b188c017b1a62e176ce3e764 i18n/deu/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
-  our    100644 9c84dc579d641a67ff0f0033693f2874a18aa35e i18n/deu/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
-  their  100644 eea50360cc91f43d30b50f133fd3120d8cf39f45 i18n/deu/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
-@@ -10,7 +10,11 @@
- 	"malicious": "Diese Erweiterung wird als problematisch gemeldet.",
- 	"installingMarketPlaceExtension": "Die Erweiterung wird aus dem Marketplace installiert …",
- 	"uninstallingExtension": "Die Erweiterung wird deinstalliert …",
-+<<<<<<< .our
- 	"enableDependeciesConfirmation": "Durch das Aktivieren einer Erweiterung werden auch deren Abhängigkeiten aktiviert. Möchten Sie den Vorgang fortsetzen?",
-+=======
-+	"enableDependeciesConfirmation": "Durch Aktivieren von \"{0}\" werden auch die dazugehörigen Abhängigkeiten aktiviert. Möchten Sie fortfahren?",
-+>>>>>>> .their
- 	"enable": "Ja",
- 	"doNotEnable": "Nein",
- 	"disableDependeciesConfirmation": "Möchten Sie die Abhängigkeiten der Erweiterungen ebenfalls deaktivieren?",
-changed in both
-  base   100644 9041660f194f28fbbf218d60f3d08805386adb2e i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 e5540f790640626d6989cde6c94da0327b708bbf i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 157f84b48e7b1ba629124702d1176286eb10ec71 i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-changed in both
-  base   100644 939255ddb78d03312db79c5a97cbae174154bd59 i18n/deu/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  our    100644 89c8d9fa907d279de7e54d5e05888634d504dacc i18n/deu/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  their  100644 10464e3a656eefafb40a825e43a00a7f372e1d15 i18n/deu/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-@@ -7,9 +7,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"fileInputAriaLabel": "Geben Sie den Dateinamen ein. Drücken Sie zur Bestätigung die EINGABETASTE oder ESC, um den Vorgang abzubrechen.",
-+<<<<<<< .our
- 	"createFileFromExplorerInfoMessage": "Datei **{0}** in **{1}** erstellen",
- 	"renameFileFromExplorerInfoMessage": "Verschieben und in **{0}** umbenennen",
- 	"createFolderFromExplorerInfoMessage": "Ordner **{0}** in **{1}** erstellen",
-+=======
-+	"constructedPath": "{0} in **{1}** erstellen",
-+>>>>>>> .their
- 	"filesExplorerViewerAriaLabel": "{0}, Datei-Explorer",
- 	"dropFolders": "Möchten Sie die Ordner zum Arbeitsbereich hinzufügen?",
- 	"dropFolder": "Möchten Sie den Ordner zum Arbeitsbereich hinzufügen?",
-changed in both
-  base   100644 ea3ceda24e198ef3c19b72723497e441095a0298 i18n/deu/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-  our    100644 6f978d7eda1e5d2039c724cd7fa46fbb2de4b11c i18n/deu/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-  their  100644 2e89465d3be39eb46e3a72824eebf08affd97f8e i18n/deu/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-changed in both
-  base   100644 b36d8277169dca57516ac1aecbccebcbf9c26ae5 i18n/deu/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  our    100644 737a3d57cf844a63ebd59c6462488a0472760d7a i18n/deu/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  their  100644 d9089d4fc044e7258bebd17f19cb4dfdc5546019 i18n/deu/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-changed in both
-  base   100644 cdeb92a64db4f4d5c066d49ea9c2827f19b76d61 i18n/deu/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 24b953a60a63d0739209f04cdbf2997fcdde9b37 i18n/deu/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 1dbbf27f3f16a3f68cd4a653241c469a51ef8703 i18n/deu/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -31,5 +31,9 @@
- 	"search.followSymlinks": "Steuert, ob Symlinks während der Suche gefolgt werden.",
- 	"search.smartCase": "Sucht ohne Berücksichtigung von Groß-/Kleinschreibung, wenn das Muster kleingeschrieben ist, andernfalls wird mit Berücksichtigung von Groß-/Kleinschreibung gesucht.",
- 	"search.globalFindClipboard": "Steuert, ob die Suchansicht die freigegebene Suchzwischenablage auf macOS lesen oder verändern soll",
-+<<<<<<< .our
- 	"search.location": "Steuert, ob die Suche als Ansicht in der Seitenleiste oder als Bereich angezeigt wird (die zweite Variante bietet mehr Platz in der Horizontalen)."
-+=======
-+	"search.location": "Vorschau: Steuert, ob die Suche als Ansicht in der Seitenleiste oder als Bedienfeld im Bereich des Bedienfelds für horizontales Layout angezeigt wird. In der nächsten Version wird das horizontale Layout im Bedienfeld verbessert und dies keine Vorschau mehr sein."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 00670c601d006ad5b93a40f1f79a825e57845a54 i18n/deu/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
-  our    100644 4bee31d66e27ffd247dce67fd471efd70a4b311b i18n/deu/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
-  their  100644 cf9da95afab9f6d0d5469791b14edf998a63c5b3 i18n/deu/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
-changed in both
-  base   100644 1676ce2387567681cb8d8dde43b28bb2fbd73d0c i18n/deu/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 5e860baf0d874c2a564e21bd9c48c55877bc2bfd i18n/deu/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 f3b5da6308444aa1b664157da36035597ef53f5c i18n/deu/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -31,10 +31,15 @@
- 	"selectProblemMatcher": "Fehler- und Warnungsarten auswählen, auf die die Aufgabenausgabe überprüft werden soll",
- 	"customizeParseErrors": "Die aktuelle Aufgabenkonfiguration weist Fehler auf. Beheben Sie die Fehler, bevor Sie eine Aufgabe anpassen.",
- 	"moreThanOneBuildTask": "In \"tasks.json\" sind mehrere Buildaufgaben definiert. Die erste wird ausgeführt.\n",
-+<<<<<<< .our
- 	"TaskSystem.activeSame.background": "Die Aufgabe \"{0}\" ist bereits aktiv und befindet sich im Hintergrundmodus.",
- 	"TaskSystem.activeSame.noBackground": "Die Aufgabe \"{0}\" ist bereits aktiv.",
- 	"terminateTask": "Aufgabe beenden",
- 	"restartTask": "Aufgabe neu starten",
-+=======
-+	"TaskSystem.activeSame.background": "Die Aufgabe \"{0}\" ist bereits im Hintergrundmodus aktiv. Klicken Sie zum Beenden der Aufgabe im Menü \"Aufgaben\" auf \"Aufgabe beenden…\".",
-+	"TaskSystem.activeSame.noBackground": "Die Aufgabe \"{0}\" ist bereits aktiv. Klicken Sie zum Beenden der Aufgabe im Menü \"Aufgaben\" auf \"Aufgabe beenden\".",
-+>>>>>>> .their
- 	"TaskSystem.active": "Eine aktive Aufgabe wird bereits ausgeführt. Beenden Sie diese, bevor Sie eine andere Aufgabe ausführen.",
- 	"TaskSystem.restartFailed": "Fehler beim Beenden und Neustarten der Aufgabe \"{0}\".",
- 	"TaskService.noConfiguration": "Fehler: Die Aufgabenerkennung {0} hat für die folgende Konfiguration keine Aufgabe beigetragen:\n {1}\nDie Aufgabe wird ignoriert.\n",
-changed in both
-  base   100644 c0f035df8a046f6787e8700ba5aa8dfdd2676925 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 e7e17f13a867ab30a0455dba8cfbc4967b92e2a0 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 40cfcdf87f2467c5f95c7d2aa8f8c455c36dd1ce i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -27,8 +27,12 @@
- 	"terminal.integrated.cursorStyle": "Steuert den Stil des Terminalcursors.",
- 	"terminal.integrated.scrollback": "Steuert die maximale Anzahl von Zeilen, die das Terminal im Puffer beibehält.",
- 	"terminal.integrated.setLocaleVariables": "Steuert, ob Gebietsschemavariablen beim Start des Terminals festgelegt werden. Der Standardwert ist unter OS X TRUE und FALSE auf anderen Plattformen.",
-+<<<<<<< .our
- 	"terminal.integrated.rendererType": "Hiermit wird gesteuert, wie das Terminal gerendert wird. Mögliche Werte sind \"canvas\" für den (schnellen) Standardbereichsrenderer, \"dom\" für den als Ersatz gedachten DOM-basierten Renderer oder \"auto\" (hierbei bestimmt VS Code den geeignetsten Renderer automatisch). VS Code muss neu geladen werden, damit Änderungen wirksam werden.",
- 	"terminal.integrated.rightClickBehavior": "Steuert, wie das Terminal auf Rechtsklicks reagiert. Mögliche Werte sind \"default\", \"copyPaste\" und \"selectWord\". Bei \"default\" wird das Kontextmenü angezeigt. Bei \"copyPaste\" wird, wenn eine Auswahl getroffen wurde, diese in die Zwischenablage kopiert oder, wenn keine Auswahl getroffen wurde, der Inhalt der Zwischenablage eingefügt. Bei \"selectWord\" schließlich wird das Wort unter dem Cursor ausgewählt und das Kontextmenü angezeigt.",
-+=======
-+	"terminal.integrated.rightClickBehavior": "Steuert, wie das Terminal auf einen Rechtsklick reagiert. Möglich sind \"default\", \"copyPaste\", und \"selectWord\". \"default\" zeigt das Kontextmenü an, \"copyPaste\" kopiert, wenn eine Auswahl vorhanden ist, \"selectWord\" wählt das Wort unter dem Cursor aus und zeigt das Kontextmenü an.",
-+>>>>>>> .their
- 	"terminal.integrated.cwd": "Ein expliziter Startpfad zum Starten des Terminals, dies dient als das aktuelle Arbeitsverzeichnis (CWD) für den Shellprozess. Dies ist insbesondere in Arbeitsbereichseinstellungen praktisch, wenn das Stammverzeichnis kein passendes CWD ist.",
- 	"terminal.integrated.confirmOnExit": "Ob aktive Terminalsitzungen beim Beenden bestätigt werden sollen.",
- 	"terminal.integrated.enableBell": "Gibt an, ob die Terminalglocke aktiviert ist.",
-changed in both
-  base   100644 44f7458c23a0f385eacc17774dbb30bb0f551258 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 17f468b874b715481031f72251583765b50e478f i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 b47e2f347c047d0710922646a12b4d44e0cc5cae i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -20,8 +20,12 @@
- 	"workbench.action.terminal.new.short": "Neues Terminal",
- 	"workbench.action.terminal.newWorkspacePlaceholder": "Aktuelles Arbeitsverzeichnis für neues Terminal auswählen",
- 	"workbench.action.terminal.newInActiveWorkspace": "Neues integriertes Terminal erstellen (in aktivem Arbeitsbereich)",
-+<<<<<<< .our
- 	"workbench.action.terminal.split": "Terminal verdoppeln",
- 	"workbench.action.terminal.splitInActiveWorkspace": "Terminal teilen (in aktivem Arbeitsbereich)",
-+=======
-+	"workbench.action.terminal.split": "Details zu Sucheinstellungen",
-+>>>>>>> .their
- 	"workbench.action.terminal.focusPreviousPane": "Fokus in vorherigem Bereich",
- 	"workbench.action.terminal.focusNextPane": "Fokus in nächstem Bereich",
- 	"workbench.action.terminal.resizePaneLeft": "Größe des linken Bereichs ändern",
-changed in both
-  base   100644 4c15459ad7c779e435606cd59d2843dbd8f8e996 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-  our    100644 aa2b4267c119832c5968d8d9433c6d265bf82336 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-  their  100644 d16dc80c2da465c7449f61f1fe49fe234ff8a19e i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-@@ -9,6 +9,7 @@
- 	"terminal.integrated.a11yBlankLine": "Leere Zeile",
- 	"terminal.integrated.a11yPromptLabel": "Terminaleingabe",
- 	"terminal.integrated.a11yTooMuchOutput": "Zu viele Ausgaben zum Anzeigen, navigieren Sie manuell zu den Zeilen, um sie zu lesen",
-+<<<<<<< .our
- 	"yes": "Ja",
- 	"terminal.rendererInAllNewTerminals": "Alle neu erstellten Terminals verwenden den Nicht-GPU-Renderer.",
- 	"no": "Nein",
-@@ -19,4 +20,10 @@
- 	"terminal.integrated.waitOnExit": "Betätigen Sie eine beliebige Taste, um das Terminal zu schließen.",
- 	"terminal.integrated.launchFailed": "Fehler beim Starten des Terminalprozessbefehls \"{0}{1}\" (Exitcode: {2}).",
- 	"terminal.integrated.launchFailedExtHost": "Der Terminalprozess konnte nicht gestartet werden (Exitcode: {0})"
-+=======
-+	"terminal.integrated.copySelection.noSelection": "Das Terminal enthält keine Auswahl zum Kopieren.",
-+	"terminal.integrated.exitedWithCode": "Der Terminalprozess wurde mit folgendem Exitcode beendet: {0}",
-+	"terminal.integrated.waitOnExit": "Betätigen Sie eine beliebige Taste, um das Terminal zu schließen.",
-+	"terminal.integrated.launchFailed": "Fehler beim Starten des Terminalprozessbefehls \"{0}{1}\" (Exitcode: {2})."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ebdb5f3e119b89a0be54942e38c3711172acbabb i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
-  our    100644 96d60628b015b50d915b5da2a1a66c47e43f4c37 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
-  their  100644 10ca73d96162488308382281009b917252ed44a6 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
-@@ -12,5 +12,6 @@
- 	"split": "Teilen",
- 	"paste": "Einfügen",
- 	"selectAll": "Alles auswählen",
--	"clear": "Löschen"
-+	"clear": "Löschen",
-+	"split": "Teilen"
- }
-\ No newline at end of file
-changed in both
-  base   100644 0a8f5bec312f8789dd43ab8c6a3c4aaec929d1d0 i18n/deu/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 dca9f59735754d2304f7bca4be1c8c6b2470923f i18n/deu/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 f2d901b3bb938cbefad0f1ae279c318e24a7fbe5 i18n/deu/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -15,6 +15,10 @@
- 	"updateIsReady": "Neues {0}-Update verfügbar.",
- 	"noUpdatesAvailable": "Zurzeit sind keine Updates verfügbar.",
- 	"ok": "OK",
-+<<<<<<< .our
-+=======
-+	"download now": "Jetzt herunterladen",
-+>>>>>>> .their
- 	"thereIsUpdateAvailable": "Ein Update ist verfügbar.",
- 	"download now": "Jetzt herunterladen",
- 	"later": "Später",
-changed in both
-  base   100644 e7aa98fddfbcfa102331269d1e8679d869000001 i18n/deu/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 6e51d0a62d6cbb327e635cf17096e9a085de524c i18n/deu/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 ee5f56d7e44fb0262b7018411272390ebdfc11ea i18n/deu/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-changed in both
-  base   100644 e9e4a6887bc51da4152a7382dc77e46be5c1d756 i18n/deu/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
-  our    100644 f9c60fd53e41824c507aec61779b8d293a8126cf i18n/deu/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
-  their  100644 c2750cd84ccad3e6e85ac44aaa3ab241718e2619 i18n/deu/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
-changed in both
-  base   100644 027f83502b55fb20978f5a25ac1e1b325d3f0dac i18n/deu/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-  our    100644 846beeace7a9c66267471e1a113dc80dd82654c5 i18n/deu/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-  their  100644 37247fac8320fb8535bd0cb38f562fec3feb020b i18n/deu/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-@@ -9,6 +9,7 @@
- 	"netVersionError": "Microsoft .NET Framework 4.5 ist erforderlich. Klicken Sie auf den Link, um die Anwendung zu installieren.",
- 	"installNet": ".NET Framework 4.5 herunterladen",
- 	"neverShowAgain": "Nicht mehr anzeigen",
-+<<<<<<< .our
- 	"enospcError": "{0} kann keine Dateiänderungen in diesem großen Workspace überwachen. Folgen Sie dem Anwendungslink, um das Problem zu beheben.",
- 	"learnMore": "Anweisungen",
- 	"fileInvalidPath": "Ungültige Dateiressource ({0})",
-@@ -24,6 +25,11 @@
- 	"fileReadOnlyError": "Die Datei ist schreibgeschützt.",
- 	"fileMoveConflict": "Verschieben/Kopieren kann nicht ausgeführt werden. Die Datei ist am Ziel bereits vorhanden.",
- 	"unableToMoveCopyError": "Der Verschiebe-/Kopiervorgang kann nicht ausgeführt werden. Die Datei würde den Ordner ersetzen, in dem sie enthalten ist.",
-+=======
-+	"netVersionError": "Microsoft .NET Framework 4.5 ist erforderlich. Klicken Sie auf den Link, um die Anwendung zu installieren.",
-+	"learnMore": "Anweisungen",
-+	"enospcError": "Keine Dateihandles mehr in {0} vorhanden. Folgen Sie dem Anwendungslink, um das Problem zu beheben.",
-+>>>>>>> .their
- 	"binFailed": "Fehler beim Verschieben von \"{0}\" in den Papierkorb.",
- 	"trashFailed": "Fehler beim Verschieben von \"{0}\" in den Papierkorb."
- }
-\ No newline at end of file
-merged
-  result 100644 548b1344de66291f5617f2a878ea718213250e94 i18n/deu/src/vs/workbench/services/files/node/fileService.i18n.json
-  our    100644 a2229be0ceef3b429bbc28d1dcb6e2f94145d317 i18n/deu/src/vs/workbench/services/files/node/fileService.i18n.json
-@@ -9,6 +9,7 @@
- 	"fileInvalidPath": "Ungültige Dateiressource ({0})",
- 	"fileIsDirectoryError": "Die Datei ist ein Verzeichnis",
- 	"fileNotModifiedError": "Datei nicht geändert seit",
-+	"fileTooLargeForHeapError": "Die Dateigröße überschreitet die maximale Speichergröße für Fenster. Führen Sie folgenden Code aus: --max-memory=NEWSIZE",
- 	"fileTooLargeError": "Die Datei ist zu groß, um sie zu öffnen.",
- 	"fileNotFoundError": "Die Datei wurde nicht gefunden ({0}).",
- 	"fileBinaryError": "Die Datei scheint eine Binärdatei zu sein und kann nicht als Text geöffnet werden.",
-changed in both
-  base   100644 6b3d1578ba57ef3acc04a5592333fdec17bc7fcc i18n/esn/extensions/emmet/package.i18n.json
-  our    100644 d6c05800c1ebc6febea004f2095561aeefca8479 i18n/esn/extensions/emmet/package.i18n.json
-  their  100644 852d92d405c88aab4e4a293c6ab242b3255b18f1 i18n/esn/extensions/emmet/package.i18n.json
-changed in both
-  base   100644 e95dcc57c4b33dca47a70b82219519fdeca1330b i18n/esn/extensions/git/package.i18n.json
-  our    100644 87a73cba8a7c7a490f6aba897a9a18d1a57dfc4c i18n/esn/extensions/git/package.i18n.json
-  their  100644 0fdd9b9bbbfe06b847e16c3098d985fa33fb58d8 i18n/esn/extensions/git/package.i18n.json
-changed in both
-  base   100644 49f455c6432eda3344ec40bcbfdeae9bde35d670 i18n/esn/extensions/npm/package.i18n.json
-  our    100644 7e73e482c8e8bbff949c516cd193524915f7859f i18n/esn/extensions/npm/package.i18n.json
-  their  100644 76e4d49bacf2689471fd69e26593060bceaa0d15 i18n/esn/extensions/npm/package.i18n.json
-@@ -12,6 +12,7 @@
- 	"config.npm.runSilent": "Ejecutar comandos de npm con la opción '--silent'",
- 	"config.npm.packageManager": "El administrador de paquetes utilizado para ejecutar secuencias de comandos. ",
- 	"config.npm.exclude": "Configura patrones globales para carpetas que deben excluirse de la detección automática de scripts. ",
-+<<<<<<< .our
- 	"config.npm.enableScriptExplorer": "Habilitar una vista de explorador para scripts de npm.",
- 	"config.npm.scriptExplorerAction": "La acción de clic predeterminada utilizada en el explorador de secuencias de comandos: 'abrir' o 'ejecutar', el valor predeterminado es 'abrir'.",
- 	"npm.parseError": "Detección de tareas de nueva gestión pública: no se pudo analizar el archivo {0}",
-@@ -23,4 +24,9 @@
- 	"command.debug": "Depurar",
- 	"command.openScript": "Abrir",
- 	"command.runInstall": "Ejecutar instalación"
-+=======
-+	"npm.parseError": "Detección de tareas de nueva gestión pública: no se pudo analizar el archivo {0}",
-+	"taskdef.script": "Script npm que debe personalizarse.",
-+	"taskdef.path": "Ruta de acceso a la carpeta del archivo package.json que proporciona el script. Se puede omitir."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 dd2f1e37fd878aef198a5e1ce25627d565aa6566 i18n/esn/extensions/php/package.i18n.json
-  our    100644 edf1d540da8d8e826f984f378d9f2cef8f946b7b i18n/esn/extensions/php/package.i18n.json
-  their  100644 1e2e57cee70aacafe94c155f95fc689164d54329 i18n/esn/extensions/php/package.i18n.json
-@@ -6,6 +6,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Conceptos básicos del lenguaje PHP",
- 	"description": "Proporciona resaltado de sintaxis y correspondencia de corchetes en archivos PHP."
-+=======
-+	"configuration.suggest.basic": "Configura si se habilitan las sugerencias del lenguaje PHP integradas. La asistencia sugiere variables y opciones globales de PHP.",
-+	"configuration.validate.enable": "Habilita o deshabilita la validación integrada de PHP.",
-+	"configuration.validate.executablePath": "Señala al ejecutable PHP.",
-+	"configuration.validate.run": "Indica si linter se ejecuta al guardar o al escribir.",
-+	"configuration.title": "PHP",
-+	"commands.categroy.php": "PHP",
-+	"command.untrustValidationExecutable": "No permitir el ejecutable de validación de PHP (como configuración de área de trabajo)",
-+	"displayName": "Características del lenguaje PHP",
-+	"description": "Proporciona IntelliSense, linting y conceptos básicos del lenguaje para archivos de PHP."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6a41a243cf178ba83a8868b5b9a21707fe81fe73 i18n/esn/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  our    100644 c55f03b5326124fc19c3d9f61315a6359293e3eb i18n/esn/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  their  100644 9719ad40a2d58ce6b025c9de29123304251916eb i18n/esn/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-@@ -10,15 +10,23 @@
- 	"show": "Mostrar",
- 	"previewOnGitHub": "Visualizar en GitHub",
- 	"loadingData": "Cargando datos...",
-+<<<<<<< .our
- 	"rateLimited": "Límite de consulta de GitHub excedido. Espera.",
- 	"similarIssues": "Problemas similares",
- 	"open": "Abrir",
- 	"closed": "Cerrado",
- 	"noSimilarIssues": "No se han encontrado problemas similares",
-+=======
-+	"similarIssues": "Problemas similares",
-+	"open": "Abrir",
-+	"closed": "Cerrado",
-+	"noResults": "No se encontraron resultados",
-+>>>>>>> .their
- 	"settingsSearchIssue": "Problema de búsqueda de configuración",
- 	"bugReporter": "Informe de errores",
- 	"featureRequest": "Solicitud de característica",
- 	"performanceIssue": "Problema de rendimiento",
-+	"featureRequest": "Solicitud de característica",
- 	"stepsToReproduce": "Pasos para reproducir",
- 	"bugDescription": "Indique los pasos necesarios para reproducir el problema. Debe incluir el resultado real y el resultado esperado. Admitimos Markdown al estilo de GitHub. Podrá editar el problema y agregar capturas de pantalla cuando veamos una vista previa en GitHub.",
- 	"performanceIssueDesciption": "¿Cuándo ocurrió este problema de rendimiento? ¿Se produce al inicio o después de realizar una serie específica de acciones? Admitimos Markdown al estilo de GitHub. Podrá editar el problema y agregar capturas de pantalla cuando veamos una vista previa en GitHub.",
-changed in both
-  base   100644 359f0fb08f43172740bee9cf5822d0607091664a i18n/esn/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  our    100644 9333872d13ac187999b64000740250452a50a86d i18n/esn/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  their  100644 5e6ecd766bd499e357d29cdaee5f998b178a3fca i18n/esn/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-@@ -8,6 +8,7 @@
- 	],
- 	"completeInEnglish": "Por favor complete el formulario en inglés.",
- 	"issueTypeLabel": "Esto es un",
-+<<<<<<< .our
- 	"issueSourceLabel": "Archivo en",
- 	"vscode": "Visual Studio Code",
- 	"extension": "Una extensión",
-@@ -25,4 +26,25 @@
- 	"sendExtensions": "Incluir mis extensiones habilitadas ({0})",
- 	"sendSearchedExtensions": "Enviar extensiones examinadas ({0})",
- 	"sendSettingsSearchDetails": "Enviar configuración detalles de búsqueda ({0})"
-+=======
-+	"issueTitleLabel": "Título",
-+	"issueTitleRequired": "Por favor, introduzca un título.",
-+	"titleLengthValidation": "El título es demasiado largo.",
-+	"systemInfo": "Mi información del sistema",
-+	"sendData": "Enviar mis datos",
-+	"processes": "Procesos actualmente en ejecución",
-+	"workspaceStats": "Estadísticas de mi área de trabajo",
-+	"extensions": "Mis extensiones",
-+	"searchedExtensions": "Extensiones que se han buscado",
-+	"settingsSearchDetails": "Detalles de la búsqueda de configuración",
-+	"tryDisablingExtensions": "¿Se reproduce el problema cuando están deshabilitadas las extensiones?",
-+	"yes": "Sí",
-+	"no": "No",
-+	"disableExtensionsLabelText": "Intente reproducir el problema después de {0}.",
-+	"disableExtensions": "Deshabilitar todas las extensiones y volver a cargar la ventana",
-+	"showRunningExtensionsLabelText": "Si sospecha que se trata de un problema con una extensión, {0} para notificarlo.",
-+	"showRunningExtensions": "Ver todas las extensiones que están en ejecución",
-+	"details": "Especifique los detalles.",
-+	"loadingData": "Cargando datos..."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 85fdf82ae3f2be89c80a87fa19038dc9f849bf6a i18n/esn/src/vs/code/electron-main/menus.i18n.json
-  our    100644 2173ae65d3ed6bda349c8ed563942ab2c195e7ea i18n/esn/src/vs/code/electron-main/menus.i18n.json
-  their  100644 5286de3ed56ab960c51bb5fc5306e796f836e7a0 i18n/esn/src/vs/code/electron-main/menus.i18n.json
-changed in both
-  base   100644 4f128e2031aef82732a2a80feeab0e0e8e13049c i18n/esn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 862953cea1ced6aa68869023b06a401296a0b72c i18n/esn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 0206bd0f46c17e742e5e19dff8bfc04c6149fc25 i18n/esn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -15,7 +15,11 @@
- 	"errorInstallingDependencies": "Error instalando dependencias. {0}",
- 	"MarketPlaceDisabled": "Marketplace no está habilitado",
- 	"removeError": "Error al quitar la extensión: {0}. Salga e inicie VS Code antes de intentarlo de nuevo.",
-+<<<<<<< .our
- 	"Not a Marketplace extension": "Sólo se pueden reinstalar Extensiones del Marketplace",
-+=======
-+	"Not Market place extension": "Solo se pueden reinstalar las extensiones de Marketplace",
-+>>>>>>> .their
- 	"notFoundCompatible": "No se pueden instalar '{0}'; no hay ninguna versión disponible compatible con VS Code '{1}'. ",
- 	"malicious extension": "No se puede instalar la extensión ya que se informó que era problemático.",
- 	"notFoundCompatibleDependency": "No se puede instalar porque no se encuentra la extensión dependiente '{0}' compatible con la versión actual '{1}' del VS Code.",
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/esn/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
-  our    100644 c697497936106846bf9e5b125351f1015391e0bd i18n/esn/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
-  their  100644 7957a5748f1302a7c8d5b97be11b175a2288e167 i18n/esn/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
-@@ -6,5 +6,9 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"errorMessage": "Ha ocurrido un error mientras se restauraba la vista: {0}"
-+=======
-+	"webview.editor.label": "Editor de vistas web"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 cb05c5aaf0ff3ece2e446a75e28d4e9fc6246aae i18n/esn/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
-  our    100644 94aeba068eef561e92e484440d1d8433f549fe09 i18n/esn/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
-  their  100644 369309aa7cbe3187c6dc95136f3fd47cfa18412a i18n/esn/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
-@@ -6,7 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"notificationsEmpty": "No hay notificaciones nuevas",
-+=======
-+>>>>>>> .their
- 	"notifications": "Notificaciones",
- 	"notificationsToolbar": "Acciones del centro de notificaciones",
- 	"notificationsList": "Lista de notificaciones"
-changed in both
-  base   100644 b0fa110ac1199a52b4b2938d6747d35173838152 i18n/esn/src/vs/workbench/common/theme.i18n.json
-  our    100644 a12ae1a7d50911472b1c450409ccd4fd8e4aba33 i18n/esn/src/vs/workbench/common/theme.i18n.json
-  their  100644 9a536b1034276a966aec4251fe6afed2cb3a78d8 i18n/esn/src/vs/workbench/common/theme.i18n.json
-changed in both
-  base   100644 9b26d17ec2bfc5e27f8630a0458d5ae24f57ca3e i18n/esn/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 89fe344b57b1d619a163cac9c32cff2261374fbd i18n/esn/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 8c8e17dfa939faa7c8e2c561cd2ecfaaadf17d05 i18n/esn/src/vs/workbench/electron-browser/actions.i18n.json
-changed in both
-  base   100644 5d8ae0207ef4b7200e34e25ab9c13b902f7ed5e8 i18n/esn/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  our    100644 b7d4e9cddd0bf1f7c4ee968b757c9316af83ba48 i18n/esn/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  their  100644 19e1e0cc44d29e9d86a46f2181922a97361770d5 i18n/esn/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-@@ -17,7 +17,10 @@
- 	"breakpointUnverifieddHover": "Punto de interrupción no comprobado",
- 	"functionBreakpointUnsupported": "Este tipo de depuración no admite puntos de interrupción en funciones",
- 	"breakpointDirtydHover": "Punto de interrupción no comprobado. El archivo se ha modificado, reinicie la sesión de depuración.",
-+<<<<<<< .our
- 	"logBreakpointUnsupported": "Logpoints no son compatible con este tipo de depuración",
-+=======
-+>>>>>>> .their
- 	"conditionalBreakpointUnsupported": "Este tipo de depuración no es compatible con los puntos de interrupción condicionales.",
- 	"hitBreakpointUnsupported": "Este tipo de depuración no admite el uso de puntos de interrupción condicionales"
- }
-\ No newline at end of file
-changed in both
-  base   100644 f413f8710fa23a14f46ec84ff6990f60b76873b0 i18n/esn/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
-  our    100644 bc73c2e069093d87803025f3848e907f2f4c616c i18n/esn/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
-  their  100644 29a3149fe8451cf10e206e8a5416b44bde8b59fa i18n/esn/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
-@@ -7,7 +7,11 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"noFolderDebugConfig": "Abra una carpeta para trabajar con la configuración avanzada de depuración.",
-+<<<<<<< .our
- 	"inlineBreakpoint": "Punto de interrupción insertado",
-+=======
-+	"columnBreakpoint": "Punto de interrupción de columna",
-+>>>>>>> .their
- 	"debug": "Depurar",
- 	"addInlineBreakpoint": "Agregar punto de interrupción insertado"
- }
-\ No newline at end of file
-changed in both
-  base   100644 c18a930c279a1c49aa2b9d51ca5fdc8d99a4da8e i18n/esn/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  our    100644 876a90b705cdc75dc8baec9a2e11041916a82d83 i18n/esn/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  their  100644 0f55ee82f0376c5d0197b4d63c921e6baf03bb88 i18n/esn/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-@@ -27,6 +27,9 @@
- 	"onFirstSessionStart": "Mostrar debug en la barra de estado solamente después del primero uso de debug",
- 	"showInStatusBar": "Controla cuando se debe mostrar la barra de estado de depuración",
- 	"openDebug": "Controla si debe abrirse la vista de depuración al iniciar una sesión de depuración.",
-+<<<<<<< .our
- 	"enableAllHovers": "Controla si el indicador de no depuración debe estar habilitado durante la depuración. Si es cierto, se llamará a los proveedores de flotadores para que proporcionen un flotador. No se mostrarán los flotadores regulares incluso si este ajuste es verdadero.",
-+=======
-+>>>>>>> .their
- 	"launch": "Configuración de lanzamiento para depuración global. Debe utilizarse como una alternativa a “launch.json” en espacios de trabajo compartidos."
- }
-\ No newline at end of file
-changed in both
-  base   100644 8683657122f24ae497b58e65590c0175cb45badd i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 d28e2c7b8c0f100d21de57741d72f030bc22f977 i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 818cc21eb9a04a695aff19f567dab5dd155f9948 i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-changed in both
-  base   100644 8df2ad7b2d4cad69b81d99d95790d7f623d8a542 i18n/esn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 695af76fadee1019c3d4b030faef94140cf218ba i18n/esn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 d1cf9483c410efdd672d576bd9c4d1f5d844dda4 i18n/esn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-changed in both
-  base   100644 f5664bf0a4eca59a6cfe154e6f5090d712d0ae24 i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 99cc3686e6501d7b489d9fd1df7919d3f52f53bb i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 7a8e29d176010371182c82c90b9a5cc8d0984f80 i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -8,6 +8,7 @@
- 	],
- 	"neverShowAgain": "No volver a mostrar",
- 	"searchMarketplace": "Buscar en Marketplace ",
-+	"showLanguagePackExtensions": "Marketplace tiene extensiones que pueden facilitar la adaptación de VS Code a la configuración regional \"{0}\"",
- 	"dynamicWorkspaceRecommendation": "Esta extensión podría interesarle porque muchos otros usuarios del repositorio {0} la utilizan.",
- 	"exeBasedRecommendation": "Se recomienda esta extensión porque tiene instalado {0} . ",
- 	"fileBasedRecommendation": "Esta extensión se recomienda basado en los archivos que abrió recientemente.",
-changed in both
-  base   100644 896424f6a2cdd7d378e516117d20dbcb1fbcdd2b i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  our    100644 a44cd55d9ca2de8be4e5fadbac434ab72717183e i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  their  100644 7e5657b2ee0729a43389e49f1302ac7aa05abe72 i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-@@ -12,9 +12,13 @@
- 	"recommendedExtensions": "Recomendado",
- 	"otherRecommendedExtensions": "Otras recomendaciones",
- 	"workspaceRecommendedExtensions": "Recomendaciones de espacio de trabajo",
-+<<<<<<< .our
- 	"builtInExtensions": "Características",
- 	"builtInThemesExtensions": "Temas",
- 	"builtInBasicsExtensions": "Lenguajes de programación",
-+=======
-+	"builtInExtensions": "Integrado",
-+>>>>>>> .their
- 	"searchExtensions": "Buscar extensiones en Marketplace",
- 	"sort by installs": "Criterio de ordenación: Número de instalaciones",
- 	"sort by rating": "Criterio de ordenación: Clasificación",
-changed in both
-  base   100644 0e53011e602ed5f5ba1ac9fcd917d17f43b6d561 i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 1e23db714d120943226391e3c5ce27170460d94d i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 88a1e52e3470a28f1dbf570efe53f8b1f70e7b1a i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-changed in both
-  base   100644 a5999740f1e85aee7aaf23876290096470a02651 i18n/esn/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  our    100644 c8dca1d775bcd059f6f0f93622281f64f6f8d22e i18n/esn/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  their  100644 1bcad541fa7d0c0a87b9e01f0dfaf5ca934b6be1 i18n/esn/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-@@ -7,9 +7,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"fileInputAriaLabel": "Escriba el nombre de archivo. Presione ENTRAR para confirmar o Esc para cancelar",
-+<<<<<<< .our
- 	"createFileFromExplorerInfoMessage": "Crear el archivo **{0}** en **{1}**",
- 	"renameFileFromExplorerInfoMessage": "Mover y cambiar nombre a **{0}**",
- 	"createFolderFromExplorerInfoMessage": "Crear la carpeta **{0}** en **{1}**",
-+=======
-+	"constructedPath": "Crear {0} en **{1}**",
-+>>>>>>> .their
- 	"filesExplorerViewerAriaLabel": "{0}, Explorador de archivos",
- 	"dropFolders": "¿Quiere agregar las carpetas al área de trabajo?",
- 	"dropFolder": "¿Quiere agregar la carpeta al área de trabajo?",
-changed in both
-  base   100644 9987392f1d2a6ebd308c749bdaa49f326fbdb908 i18n/esn/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  our    100644 634545e1c6f01f32015f6ce1bd5a355377917a51 i18n/esn/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  their  100644 b0f61204eeb14401475bb1b008893a05035ba6e8 i18n/esn/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-changed in both
-  base   100644 18a11b2ccb1b0177f5235a0562858c254bdf4ba7 i18n/esn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 d7550e4cd76b5e1079a00c63a6ae28b84fca74d3 i18n/esn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 1cb9f6c349e3725e0f5194e9b3a26c08feed42dc i18n/esn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -31,5 +31,9 @@
- 	"search.followSymlinks": "Controla si debe seguir enlaces simbólicos durante la búsqueda.",
- 	"search.smartCase": "Proporciona busquedas de mayúsculas y minúsculas si el patrón es todo en minúsculas, de lo contrario, busca en mayúsculas y minúsculas",
- 	"search.globalFindClipboard": "Controla si la vista de búsqueda debe leer o modificar el portapapeles de búsqueda compartido en macOS",
-+<<<<<<< .our
- 	"search.location": "Controla si la búsqueda se muestra como una vista en la barra lateral o como un panel en el área de paneles para disponer de más espacio horizontal."
-+=======
-+	"search.location": "Vista previa: controla si se muestra la búsqueda como una vista en la barra lateral o como un panel en el área de paneles para tener más espacio horizontal. En la próxima versión, la búsqueda en panel tendrá una distribución horizontal mejorada y dejará de ser una vista previa."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 67738e91857aeda9a953f50934775b35e897abf0 i18n/esn/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
-  our    100644 c4a0654df75464ecfe6cc50ac2a48ee2418d60fe i18n/esn/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
-  their  100644 485b6c325bfbe984c7e8a516cf68d146ad90042f i18n/esn/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
-changed in both
-  base   100644 d3bad486b127f5d48e67e363a1b79636d5688a20 i18n/esn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 cf1ca0ef5c2b17265b6eb266a58dc6112305ccf4 i18n/esn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 6613231543f0895f593a1fdedd57cda7ff8da74d i18n/esn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -31,10 +31,15 @@
- 	"selectProblemMatcher": "Seleccione qué tipo de errores y advertencias deben buscarse durante el examen de la salida de la tarea",
- 	"customizeParseErrors": "La configuración actual de tareas contiene errores. Antes de personalizar una tarea, corrija los errores.",
- 	"moreThanOneBuildTask": "Hay muchas tareas de compilación definidas en el archivo tasks.json. Se ejecutará la primera.\n",
-+<<<<<<< .our
- 	"TaskSystem.activeSame.background": "La tarea \"{0}\" ya está activa en segundo plano.",
- 	"TaskSystem.activeSame.noBackground": "La tarea \"{0}\" ya está activa.",
- 	"terminateTask": "Finalizar tarea",
- 	"restartTask": "Reiniciar tarea",
-+=======
-+	"TaskSystem.activeSame.background": "La tarea \"{0}\" ya está activa en segundo plano. Para terminarla, use la opción \"Terminar tarea\" del menú Tareas.",
-+	"TaskSystem.activeSame.noBackground": "La tarea \"{0}\" ya está activa. Para terminarla, use la opción \"Terminar tarea\" del menú Tareas.",
-+>>>>>>> .their
- 	"TaskSystem.active": "Ya hay una tarea en ejecución. Finalícela antes de ejecutar otra tarea.",
- 	"TaskSystem.restartFailed": "No se pudo terminar y reiniciar la tarea {0}",
- 	"TaskService.noConfiguration": "Error: La detección de tarea {0} no encontró una tarea para la siguiente configuración:\n{1}\nLa tarea será omitida.\n",
-changed in both
-  base   100644 f12d6ac1dcf839cc3d54fe18c7d62b20e2db36bf i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 638d95e07783cab2681275875d22dd4b5bb236b5 i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 b168b6691a4c1036de1551e37b11564a6eae0751 i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -27,8 +27,12 @@
- 	"terminal.integrated.cursorStyle": "Controla el estilo de cursor del terminal.",
- 	"terminal.integrated.scrollback": "Controla la cantidad máxima de líneas que mantiene el terminal en su búfer.",
- 	"terminal.integrated.setLocaleVariables": "Controla si las variables de configuración regional se definen al inicio del terminal. El valor predeterminado es true en OS X y false en las demás plataformas.",
-+<<<<<<< .our
- 	"terminal.integrated.rendererType": "Controla el modo en el que se representa el terminal. Las opciones son \"canvas\" para el representador de lienzo estándar (rápido), \"dom\" para el representador de reserva basado en DOM o \"auto\", que deja que VS Code determine cuál es mejor. Para que esta opción surta efecto, es necesario reiniciar VS Code.",
- 	"terminal.integrated.rightClickBehavior": "Controla cómo reacciona el terminal al clic derecho, las posibilidades son \"default\", \"copyPaste\" y \"selectWord\". \"default\" mostrará el menú contextual, \"copyPaste\" copiará cuando haya una selección; de lo contrario, se pegará, \"selectWord\" seleccionará la palabra debajo del cursor y mostrará el menú contextual.",
-+=======
-+	"terminal.integrated.rightClickBehavior": "Controla el modo en el que el terminal reacciona al clic con el botón derecho. Las posibilidades son \"default\", \"copyPaste\" y \"selectWord\". \"default\" muestra el menú contextual. \"copyPaste\" copia si hay algo seleccionado; de lo contrario, pega. \"selectWord\" selecciona la palabra que hay debajo del cursor y muestra el menú contextual.",
-+>>>>>>> .their
- 	"terminal.integrated.cwd": "Una ruta de acceso de inicio explícita en la que se iniciará el terminal; se utiliza como el directorio de trabajo actual (cwd) para el proceso de shell. Puede resultar especialmente útil en una configuración de área de trabajo si la raíz de directorio no es un cwd práctico.",
- 	"terminal.integrated.confirmOnExit": "Indica si debe confirmarse a la salida si hay sesiones de terminal activas.",
- 	"terminal.integrated.enableBell": "Si la campana terminal está activada o no.",
-changed in both
-  base   100644 dc3a3a2aa6dd0952f891fa503a77b99d12666c95 i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 21fcf5a4e9d2653bdf22cd882d1fa612baf507de i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 1c13a74b03389ddf12f7b1955b36c28408f9fbd0 i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -21,7 +21,10 @@
- 	"workbench.action.terminal.newWorkspacePlaceholder": "Seleccione el directorio de trabajo actual para el nuevo terminal",
- 	"workbench.action.terminal.newInActiveWorkspace": "Crear nuevo terminal integrado (en el espacio de trabajo activo)",
- 	"workbench.action.terminal.split": "Dividir terminal",
-+<<<<<<< .our
- 	"workbench.action.terminal.splitInActiveWorkspace": "Dividir Terminal (En el espacio de trabajo activo)",
-+=======
-+>>>>>>> .their
- 	"workbench.action.terminal.focusPreviousPane": "Aplicar el foco al panel anterior",
- 	"workbench.action.terminal.focusNextPane": "Aplicar el foco al panel siguiente",
- 	"workbench.action.terminal.resizePaneLeft": "Cambiar el tamaño del panel por la izquierda",
-changed in both
-  base   100644 b7fa6cf1667bcb0f5c90fade2892ef77cd2cbd64 i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-  our    100644 acac8a721f38cf7e39ef6c8bee41c2babb8a579c i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-  their  100644 9b9c6d0cbc315abd8def3c1cd01c67a7a2593972 i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-@@ -9,6 +9,7 @@
- 	"terminal.integrated.a11yBlankLine": "Línea en blanco",
- 	"terminal.integrated.a11yPromptLabel": "Entrada de terminal",
- 	"terminal.integrated.a11yTooMuchOutput": "Demasiada salida para anunciarla. Vaya a las filas manualmente para leerlas.",
-+<<<<<<< .our
- 	"yes": "Sí",
- 	"terminal.rendererInAllNewTerminals": "Todos los terminales recién creados usarán el renderizador que no es GPU.",
- 	"no": "No",
-@@ -19,4 +20,10 @@
- 	"terminal.integrated.waitOnExit": "Presione cualquier tecla para cerrar el terminar",
- 	"terminal.integrated.launchFailed": "No se pudo iniciar el comando de proceso del terminal \"{0}{1}\" (código de salida: {2})",
- 	"terminal.integrated.launchFailedExtHost": "El proceso terminal no pudo iniciarse (código de salida: {0})"
-+=======
-+	"terminal.integrated.copySelection.noSelection": "El terminal no tiene ninguna selección para copiar",
-+	"terminal.integrated.exitedWithCode": "El proceso del terminal finalizó con el código de salida: {0}",
-+	"terminal.integrated.waitOnExit": "Presione cualquier tecla para cerrar el terminar",
-+	"terminal.integrated.launchFailed": "No se pudo iniciar el comando de proceso del terminal \"{0}{1}\" (código de salida: {2})"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c28b2b771d42bcf4ac3ee3fe4239703bf16dd651 i18n/esn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 2d994e363264374d23ba6185653395b42a1471ce i18n/esn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 0c545a6b0059d6011a2b508be02de975e8065e58 i18n/esn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -15,6 +15,10 @@
- 	"updateIsReady": "Nueva actualización de {0} disponible.",
- 	"noUpdatesAvailable": "Actualmente, no hay actualizaciones disponibles.",
- 	"ok": "Aceptar",
-+<<<<<<< .our
-+=======
-+	"download now": "Descargar ahora",
-+>>>>>>> .their
- 	"thereIsUpdateAvailable": "Hay una actualización disponible.",
- 	"download now": "Descargar ahora",
- 	"later": "Más tarde",
-changed in both
-  base   100644 c49fa03c1efb08367895195201d5c9cd10346be8 i18n/esn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 532a6558111964e59cddb3ee4e8da3da36a9d18f i18n/esn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 890db5376d9069eef382d7644bd3793ac342b746 i18n/esn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-changed in both
-  base   100644 c6e20a5fff0344698d4a162660464cb3ccafda38 i18n/esn/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
-  our    100644 314e93bb5206213e2a4899dc82dbe652b91442b4 i18n/esn/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
-  their  100644 29f353047f0fda55cb4485bf3bc746f40e1ad30a i18n/esn/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
-changed in both
-  base   100644 5e1f167f64d0ba8ff2ae828cb6b87b5ad43211ea i18n/esn/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-  our    100644 36c012260a5a1216265ae3447e8c5177afc64b59 i18n/esn/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-  their  100644 3170eed61fbf5909bcc71a8804e401d87f7eb210 i18n/esn/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-@@ -11,6 +11,7 @@
- 	"neverShowAgain": "No volver a mostrar",
- 	"enospcError": "{0} es incapaz de observar los cambios de los archivos en este espacio de trabajo tan grande. Por favor siga las instrucciones en el link para resolver este problema.",
- 	"learnMore": "Instrucciones",
-+<<<<<<< .our
- 	"fileInvalidPath": "Recurso de archivo no válido ({0})",
- 	"fileIsDirectoryError": "El archivo es un directorio",
- 	"fileNotModifiedError": "Archivo no modificado desde",
-@@ -24,6 +25,9 @@
- 	"fileReadOnlyError": "El archivo es de solo lectura",
- 	"fileMoveConflict": "No se puede mover o copiar. El archivo ya existe en la ubicación de destino. ",
- 	"unableToMoveCopyError": "No se puede mover o copiar. El archivo reemplazaría a la carpeta que lo contiene.",
-+=======
-+	"enospcError": "{0} está a punto de agotar los identificadores de archivo. Por favor siga el enlace de instrucciones para resolver este problema.",
-+>>>>>>> .their
- 	"binFailed": "No se pudo mover \"{0}\" a la papelera de reciclaje",
- 	"trashFailed": "No se pudo mover '{0}' a la papelera"
- }
-\ No newline at end of file
-merged
-  result 100644 7f057c3649076854744135eba3ea5d3532b722e3 i18n/esn/src/vs/workbench/services/files/node/fileService.i18n.json
-  our    100644 69847e82751064f3cffd7bd9062a7dbd2fdc0e69 i18n/esn/src/vs/workbench/services/files/node/fileService.i18n.json
-@@ -9,6 +9,7 @@
- 	"fileInvalidPath": "Recurso de archivo no válido ({0})",
- 	"fileIsDirectoryError": "Archivo es el directorio",
- 	"fileNotModifiedError": "Archivo no modificado desde",
-+	"fileTooLargeForHeapError": "El tamaño del archivo excede el límite de memoria de la ventana, intente ejecutarlo con --max-memory=NUEVOTAMAÑO",
- 	"fileTooLargeError": "Archivo demasiado grande para abrirlo",
- 	"fileNotFoundError": "Archivo no encontrado ({0})",
- 	"fileBinaryError": "El archivo parece ser binario y no se puede abrir como texto",
-changed in both
-  base   100644 b0d8c038b77f096489fda7180a2bd485c4895b9f i18n/fra/extensions/emmet/package.i18n.json
-  our    100644 2b38d968d648e0792cab88ddd57aa657ed8e85b3 i18n/fra/extensions/emmet/package.i18n.json
-  their  100644 498ecb9bffd25e2dd00084dbe7bd7786ad82887b i18n/fra/extensions/emmet/package.i18n.json
-changed in both
-  base   100644 0fc7ca5aa05a1450ec86cfc88d4c226d2d2463a8 i18n/fra/extensions/npm/package.i18n.json
-  our    100644 dab74867a9ea8aa21e2f332eabe0dca553256787 i18n/fra/extensions/npm/package.i18n.json
-  their  100644 e469e50043830b03e2f2cffe845772224056f759 i18n/fra/extensions/npm/package.i18n.json
-@@ -12,6 +12,7 @@
- 	"config.npm.runSilent": "Exécutez les commandes npm avec l'option `--silent`.",
- 	"config.npm.packageManager": "Le gestionnaire de paquets utilisé pour exécuter des scripts.",
- 	"config.npm.exclude": "Configurer les profils glob pour les dossiers qui doivent être exclus de la détection de script automatique.",
-+<<<<<<< .our
- 	"config.npm.enableScriptExplorer": "Activez une vue Explorateur pour les scripts npm.",
- 	"config.npm.scriptExplorerAction": "Action de clic par défaut utilisée dans l’explorateur de scripts :  'open' ou 'run', la valeur par défaut est 'open'.",
- 	"npm.parseError": "Détection de tâche Npm : impossible d’analyser le fichier {0}",
-@@ -23,4 +24,9 @@
- 	"command.debug": "Déboguer",
- 	"command.openScript": "Ouvrir",
- 	"command.runInstall": "Exécuter Install"
-+=======
-+	"npm.parseError": "Détection de tâche Npm : impossible d’analyser le fichier {0}",
-+	"taskdef.script": "Le script npm à personnaliser.",
-+	"taskdef.path": "Le chemin d’accès au dossier du fichier package.json qui fournit le script. Peut être oublié."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 4c45ca08938592d1ee6f104da55af0739d607f7f i18n/fra/extensions/php/package.i18n.json
-  our    100644 7432910059505786aeb77409e75866339d62c1a2 i18n/fra/extensions/php/package.i18n.json
-  their  100644 38ff61530b7c48083276a887137a481951210fb7 i18n/fra/extensions/php/package.i18n.json
-@@ -6,6 +6,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Concepts de base du langage PHP",
- 	"description": "Fournit la coloration syntaxique et la correspondance des parenthèses dans les fichiers PHP."
-+=======
-+	"configuration.suggest.basic": "Configure l'activation ou la désactivation des suggestions de langage PHP intégrées. La fonctionnalité de prise en charge suggère les variables globales et les variables de session PHP.",
-+	"configuration.validate.enable": "Activez/désactivez la validation PHP intégrée.",
-+	"configuration.validate.executablePath": "Pointe vers l'exécutable PHP.",
-+	"configuration.validate.run": "Spécifie si linter est exécuté au moment de l'enregistrement ou de la saisie.",
-+	"configuration.title": "PHP",
-+	"commands.categroy.php": "PHP",
-+	"command.untrustValidationExecutable": "Interdire l'exécutable de validation PHP (défini comme paramètre d'espace de travail)",
-+	"displayName": "Fonctionnalités du langage PHP",
-+	"description": "Fournit IntelliSense, le linting et les concepts de base de langage pour les fichiers PHP."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 2cf7b95f59c2a125f88f792eeae90c93d2ebec17 i18n/fra/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  our    100644 59278815c7709903c6f75eb6563cddd43dfd9adc i18n/fra/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  their  100644 4372aeafc54a71a0e35d459cd8e100edbd8d66f9 i18n/fra/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-changed in both
-  base   100644 d2a009b4aba4ebb3bf8b6f892839b950db9a29de i18n/fra/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  our    100644 ffcda9c228570c3e52d613586da7b45c348e91a4 i18n/fra/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  their  100644 b903d97313a43a4e44e6119462b9a1c78e5cd548 i18n/fra/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-@@ -17,6 +17,23 @@
- 	"issueTitleLabel": "Titre",
- 	"issueTitleRequired": "Veuillez s’il vous plaît entrer un titre.",
- 	"titleLengthValidation": "Le titre est trop long.",
-+<<<<<<< .our
-+=======
-+	"systemInfo": "Mes infos système",
-+	"sendData": "Envoyer mes données",
-+	"processes": "Processus en cours d’exécution",
-+	"workspaceStats": "Mes Stats de l’espace de travail",
-+	"extensions": "Mes Extensions",
-+	"searchedExtensions": "Extensions recherchées",
-+	"settingsSearchDetails": "Détails de paramètres de recherche",
-+	"tryDisablingExtensions": "Le problème est-il reproductible lorsque les extensions sont désactivées?",
-+	"yes": "Oui",
-+	"no": "Non",
-+	"disableExtensionsLabelText": "Essayez de reproduire le problème après {0}.",
-+	"disableExtensions": "en désactivant toutes les extensions et en rechargeant la fenêtre",
-+	"showRunningExtensionsLabelText": "Si vous pensez que c'est un problème d'extension, {0} pour reporter le problème de l'extension.",
-+	"showRunningExtensions": "Afficher toutes les extensions en cours d'exécution",
-+>>>>>>> .their
- 	"details": "Veuillez saisir les détails ",
- 	"sendSystemInfo": "Inclure des informations sur mon système ({0})",
- 	"show": "afficher",
-changed in both
-  base   100644 f962bfa91d8a3bbb9b60fd5e54339943a94d63cf i18n/fra/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 6d87da3180e1228e72028373cd528db86fbc5793 i18n/fra/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 705af653f74073d7d34ce9afb4b1f22e05e881d5 i18n/fra/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -15,7 +15,11 @@
- 	"errorInstallingDependencies": "Erreur lors de l'installation des dépendances. {0}",
- 	"MarketPlaceDisabled": "Le marketplace n’est pas activé",
- 	"removeError": "Erreur lors de la suppression de l’extension : {0}. Veuillez quitter et relancer VS Code avant de réessayer.",
-+<<<<<<< .our
- 	"Not a Marketplace extension": "Seules les Extensions de Marketplace peuvent être réinstallées",
-+=======
-+	"Not Market place extension": "Seules les Extensions de Marketplace peuvent être réinstallées",
-+>>>>>>> .their
- 	"notFoundCompatible": "Impossible d’installer '{0}'; Il n’y a pas de version disponible compatible avec VS Code '{1}'.",
- 	"malicious extension": "Impossible d’installer l'extension car elle a été signalée comme problématique.",
- 	"notFoundCompatibleDependency": "Installation impossible car l'extension dépendante '{0}' compatible avec la version actuelle '{1}' de VS Code est introuvable.",
-changed in both
-  base   100644 a5bb14bb6d2b45d615bb3ae7ffd07edaf7514931 i18n/fra/src/vs/workbench/common/theme.i18n.json
-  our    100644 67b5e93740c6b4696aa15e5da68929b00e585c36 i18n/fra/src/vs/workbench/common/theme.i18n.json
-  their  100644 c488ecd82155b670c980728828279f9c187aef00 i18n/fra/src/vs/workbench/common/theme.i18n.json
-changed in both
-  base   100644 bf5029bdf25b7abb885d4f15539437e0e654f2a2 i18n/fra/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  our    100644 ea17513fd0b7438358bedc5e679b748d269562de i18n/fra/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  their  100644 f3007ffa4193b68f457ed858caaa12ed5992ff30 i18n/fra/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-changed in both
-  base   100644 ea2ee6334e12d63be1316f22f68f57f0dec580bb i18n/fra/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  our    100644 7ccd41c32f9d398f60c5c910829d189e80ab1865 i18n/fra/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  their  100644 899866a157cfde522bfc71d082f149fc114b0e58 i18n/fra/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-@@ -27,6 +27,9 @@
- 	"onFirstSessionStart": "Afficher debug dans seule la barre d’état après que le débogage a été lancé pour la première fois",
- 	"showInStatusBar": "Contrôle quand la barre d’état de débogage doit être visible",
- 	"openDebug": "Contrôle si la vue de débogage doit être ouverte au démarrage de la session de débogage.",
-+<<<<<<< .our
- 	"enableAllHovers": "Contrôle si les non debug hovers doivent être activés pendant le débogage. Si true les fournisseurs hover seront appellés pour assurer un hover. Les hovers ordinaires ne seront pas affichés même si ce paramètre est true.",
-+=======
-+>>>>>>> .their
- 	"launch": "Configuration du lancement du débogage global. Doit être utilisée comme alternative à 'launch.json' qui est partagé entre les espaces de travail"
- }
-\ No newline at end of file
-changed in both
-  base   100644 7b19258118c106a64a949a175a2b3d053149a7c3 i18n/fra/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 0057e22b4a8443d5b30bfe0090c058bd31602f8d i18n/fra/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 8414cc420adc9b66790e1bf0a8882db9bec43ab5 i18n/fra/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-changed in both
-  base   100644 557f45e5910fd9ab623cccc9dd8fa87735b78615 i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  our    100644 f395ede0a046caeae18a2c7db319d8ae7b900356 i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  their  100644 518cd664a2e377f097ef2c52e68ee6afc0af6f58 i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-@@ -12,9 +12,13 @@
- 	"recommendedExtensions": "Recommandées",
- 	"otherRecommendedExtensions": "Autres recommandations",
- 	"workspaceRecommendedExtensions": "Recommandations de l’espace de travail",
-+<<<<<<< .our
- 	"builtInExtensions": "Fonctionnalités",
- 	"builtInThemesExtensions": "Thèmes",
- 	"builtInBasicsExtensions": "Langages de programmation",
-+=======
-+	"builtInExtensions": "Intégrée",
-+>>>>>>> .their
- 	"searchExtensions": "Rechercher des extensions dans Marketplace",
- 	"sort by installs": "Trier par : nombre d'installations",
- 	"sort by rating": "Trier par : évaluation",
-changed in both
-  base   100644 b2a614b8bb88315f589e1ab9c20584c9dfc30bce i18n/fra/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 043fb92d98d510a0c65a09cbbe5e12feb8f611fa i18n/fra/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 dbb8b385ac491ab71c20d15e04eec5ffe34527c9 i18n/fra/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -31,5 +31,9 @@
- 	"search.followSymlinks": "Contrôle s'il faut suivre les symlinks pendant la recherche.",
- 	"search.smartCase": "Recherches de manière non case-sensitive si le modèle est entièrement en minuscules, dans le cas contraire, recherche de manière case-sensitive",
- 	"search.globalFindClipboard": "Contrôle si la vue de recherche doit lire ou modifier le presse-papiers partagé sur macOS",
-+<<<<<<< .our
- 	"search.location": "Contrôle si la recherche s’affichera comme une vue dans la barre latérale ou comme un panneau dans la zone de panneau pour plus d'espace horizontal."
-+=======
-+	"search.location": "Aperçu : contrôle si la recherche est affichée comme une vue dans la barre latérale ou comme un panneau dans la zone correspondante pour libérer de l'espace horizontal. La prochaine version de la recherche dans le panneau prévoit une amélioration de la disposition horizontale qui ne sera plus un aperçu."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6b13e14cdb67336e4b127e93626ee2fb248e3056 i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 c9b4f495f668b34a06e07f9e3acab9da423cc6a8 i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 174156252aea85497c4f52cc00268f37c2e4e372 i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-changed in both
-  base   100644 0d61d2e3d7efe3c4fa6724a96c3fb1715b0ce808 i18n/fra/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 7338692978cc41a3c9963a6eada047d9ffbf7ca9 i18n/fra/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 0a4355e2acf78229c56859fdb0bc440c38a234c5 i18n/fra/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -15,6 +15,10 @@
- 	"updateIsReady": "Nouvelle mise à jour de {0} disponible.",
- 	"noUpdatesAvailable": "Aucune mise à jour n'est disponible actuellement.",
- 	"ok": "OK",
-+<<<<<<< .our
-+=======
-+	"download now": "Télécharger maintenant",
-+>>>>>>> .their
- 	"thereIsUpdateAvailable": "Une mise à jour est disponible.",
- 	"download now": "Télécharger maintenant",
- 	"later": "Plus tard",
-changed in both
-  base   100644 dadc42773a1cc5f94ba5318ad645204386fe481a i18n/fra/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
-  our    100644 b219305fb3c0934bf0d1c3ad49c4db168d9b4aab i18n/fra/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
-  their  100644 0e26b3fa0ffe3d8dbe2ba208a84ac377df744ab1 i18n/fra/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
-changed in both
-  base   100644 ff425d5d1cdceab37541489589245f61093dbedb i18n/fra/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-  our    100644 bd1e8163634b26d29532367b224c1c31d1dad37f i18n/fra/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-  their  100644 d1cd27ab59c51bac09b7f7d9b549f8fce8d4dd99 i18n/fra/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-@@ -11,6 +11,7 @@
- 	"neverShowAgain": "Ne plus afficher",
- 	"enospcError": "{0} n’est pas en mesure de surveiller les modifications de fichiers dans ce grand espace de travail. Veuillez suivre le lien d'instructions pour résoudre ce problème.",
- 	"learnMore": "Instructions",
-+<<<<<<< .our
- 	"fileInvalidPath": "Ressource de fichier non valide ({0})",
- 	"fileIsDirectoryError": "Le fichier est un répertoire",
- 	"fileNotModifiedError": "Fichier non modifié depuis",
-@@ -24,6 +25,9 @@
- 	"fileReadOnlyError": "Fichier en lecture seule",
- 	"fileMoveConflict": "Déplacement/copie impossible. Le fichier existe déjà dans la destination.",
- 	"unableToMoveCopyError": "Impossible de déplacer/copier. Le fichier remplace le dossier qui le contient.",
-+=======
-+	"enospcError": "{0} est à court de mémoire pour les fichiers. Veuillez suivre le lien avec les instructions pour résoudre ce problème.",
-+>>>>>>> .their
- 	"binFailed": "Échec du déplacement de '{0}' vers la corbeille",
- 	"trashFailed": "Échec du déplacement de '{0}' vers la corbeille"
- }
-\ No newline at end of file
-changed in both
-  base   100644 3df37c61cd749c5e9ca8e728e73133abe6151467 i18n/hun/extensions/emmet/package.i18n.json
-  our    100644 4e87769482abf2ce774993c5210487918395fb71 i18n/hun/extensions/emmet/package.i18n.json
-  their  100644 8809e7dca73e48c0d7b6a4d02a9625a967ef49de i18n/hun/extensions/emmet/package.i18n.json
-changed in both
-  base   100644 c1c327f70668b02ce3f9b75557bb89e0315ae118 i18n/hun/extensions/json/package.i18n.json
-  our    100644 55ffac6d3ddffd4a5aec160935b4bab3af657ee7 i18n/hun/extensions/json/package.i18n.json
-  their  100644 a4504577c67312f79f0c3aaecf753d4a8c390f7c i18n/hun/extensions/json/package.i18n.json
-@@ -6,6 +6,21 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "JSON nyelvi alapok",
- 	"description": "Szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket a JSON-fájlokban."
-+=======
-+	"displayName": "JSON nyelvi funkciók",
-+	"description": "Széleskörű nyelvi támogatás JSON-fájlokhoz.",
-+	"json.schemas.desc": "Sémák hozzárendelése JSON-fájlokhoz a jelenlegi projektben",
-+	"json.schemas.url.desc": "Egy séma URL-címe vagy egy séma relatív elérési útja az aktuális könyvtárban",
-+	"json.schemas.fileMatch.desc": "Fájlminták tömbje, amely a JSON-fájlok sémákhoz való rendelésénél van használva.",
-+	"json.schemas.fileMatch.item.desc": "Fájlminták tömbje, amely a JSON-fájlok sémákhoz való rendelésénél van használva. Tartalmazhat '*'-ot.",
-+	"json.schemas.schema.desc": "Az adott URL-cím sémadefiníciója. A sémát csak a séma URL-címéhez való fölösleges lekérdezések megakadályozása érdekében kell megadni.",
-+	"json.format.enable.desc": "Alapértelmezett JSON-formázó engedélyezése vagy letiltása (újraindítást igényel)",
-+	"json.tracing.desc": "A VS Code és a JSON nyelvi szerver közötti kommunikáció naplózása.",
-+	"json.colorDecorators.enable.desc": "Színdekorátorok engedélyezése vagy letiltása",
-+	"json.colorDecorators.enable.deprecationMessage": "A `json.colorDecorators.enable` beállítás elavult az `editor.colorDecorators` bevezetése miatt.",
-+	"json.experimental.syntaxFolding": "Szintaxisalapú becsukható kódrészletek engedélyezése vagy letiltása."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 9358ab6aa38acbbeb82e1324bcc93bf990f713f1 i18n/hun/extensions/npm/package.i18n.json
-  our    100644 08255b5c4709454b75a16c8ef42f48e270a52f7d i18n/hun/extensions/npm/package.i18n.json
-  their  100644 bdac8dc69e3b2d9e66c5f5447f9fbd634b1fab97 i18n/hun/extensions/npm/package.i18n.json
-@@ -12,6 +12,7 @@
- 	"config.npm.runSilent": "Az npm-parancsok a '--silent' kapcsolóval fussanak.",
- 	"config.npm.packageManager": "A parancsfájlok futtatásához használt csomagkezelő.",
- 	"config.npm.exclude": "Azokat a mappákat leíró globális minta, amelyek ne legyenek vizsgálva az automatikus parancsfájlkeresés közben.",
-+<<<<<<< .our
- 	"config.npm.enableScriptExplorer": "Npm-parancsokat listázó nézet engedélyezése a Fájlkezelőben.",
- 	"config.npm.scriptExplorerAction": "Az alapértelmezett művelet kattintás esetén a parancsnézeten: „open” a megnyitáshoz vagy „run” a futtatáshoz. Az alapértelmezett érték az „open”.",
- 	"npm.parseError": "Npm-feladatok felderítése: nem sikerült beolvasni a következő fájlt: {0}",
-@@ -23,4 +24,9 @@
- 	"command.debug": "Hibakeresés",
- 	"command.openScript": "Megnyitás",
- 	"command.runInstall": "Telepítés futtatása"
-+=======
-+	"npm.parseError": "Npm-feladatok felderítése: nem sikerült beolvasni a következő fájlt: {0}",
-+	"taskdef.script": "A testreszabott npm parancsfájl.",
-+	"taskdef.path": "Azon mappa elérési útja, amely a parancsfájlt szolgáltató package.json fájlt tartalmazza. Elhagyható."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a45cb7f5c61304ccf31c398e2d2596b2dac4e9bf i18n/hun/extensions/php/package.i18n.json
-  our    100644 7a75a0d1d20895ebaa28594ca8306d4f5de5c395 i18n/hun/extensions/php/package.i18n.json
-  their  100644 2fd2af0d0e88237bb2376eb6c6e8aeb27da66d24 i18n/hun/extensions/php/package.i18n.json
-@@ -6,6 +6,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "PHP nyelvi alapok",
- 	"description": "Szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket a PHP-fájlokban."
-+=======
-+	"configuration.suggest.basic": "Meghatározza, hogy a beépített PHP nyelvi támogatás ajánl-e PHP globálisokat és változókat.",
-+	"configuration.validate.enable": "Beépített PHP-validáció engedélyezése vagy letiltása",
-+	"configuration.validate.executablePath": "A PHP végrehajtható fájljának elérési útja.",
-+	"configuration.validate.run": "A linter mentéskor vagy gépeléskor fut-e.",
-+	"configuration.title": "PHP",
-+	"commands.categroy.php": "PHP",
-+	"command.untrustValidationExecutable": "PHP-validációs végrehajtható fájl letiltása (munkaterületi beállításként megadva)",
-+	"displayName": "PHP nyelvi funkciók",
-+	"description": "IntelliSense-t, lintelést és alapvető nyelvi funkciókat szolgáltat a PHP-fájlokban."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 1847b9dcdbff09336c848b30f31d1ae89fdd1965 i18n/hun/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  our    100644 e9b4725dad7038e93a7d0b6b415654f2520ef063 i18n/hun/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  their  100644 ed46a94304da46b50087dd51ce0d68f2607e3d5d i18n/hun/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-changed in both
-  base   100644 2ae4255abe00ce293f054c05d55b497c76e49ae7 i18n/hun/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  our    100644 bd8c9904ccb06290baad6a515c917d005aa9c429 i18n/hun/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  their  100644 a53b4129ee26137d971b7f192937503a4ae8076a i18n/hun/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-@@ -17,6 +17,23 @@
- 	"issueTitleLabel": "Cím",
- 	"issueTitleRequired": "Kérjük, adja meg a címet!",
- 	"titleLengthValidation": "A cím túl hosszú.",
-+<<<<<<< .our
-+=======
-+	"systemInfo": "Rendszerinformációk",
-+	"sendData": "Adatok elküldése",
-+	"processes": "Jelenleg futó folyamatok",
-+	"workspaceStats": "Munkaterület-statisztikák",
-+	"extensions": "Kiegészítők",
-+	"searchedExtensions": "Keresett kiegészítők",
-+	"settingsSearchDetails": "Beállításokban való keresés részletei",
-+	"tryDisablingExtensions": "A probléma letiltott kiegészítőkkel is előidézhető?",
-+	"yes": "Igen",
-+	"no": "Nem",
-+	"disableExtensionsLabelText": "Próbálja meg előidézni a hibát {0}!",
-+	"disableExtensions": "az összes kiegészítő letiltása és az ablak újratöltése után",
-+	"showRunningExtensionsLabelText": "Ha azt gyanítja, hogy a hiba egy kiegészítőben van, {0} a kiegészítővel kapcsolatos hiba jelentéséhez!",
-+	"showRunningExtensions": "tekintse meg a futó kiegészítők listáját",
-+>>>>>>> .their
- 	"details": "Írja le a részleteket!",
- 	"sendSystemInfo": "Rendszerinformációk csatolása ({0})",
- 	"show": "megjelenítés",
-changed in both
-  base   100644 9f9b5cc3316576f13832128e3a7c71ad944ac8f5 i18n/hun/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 4e39213a98716ec8731af717bd7eabd7943bfb73 i18n/hun/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 0cfe9dca9e2b25b064e974048f91959395bc7d14 i18n/hun/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -15,7 +15,11 @@
- 	"errorInstallingDependencies": "Hiba a függőségek telepítése közben. {0}",
- 	"MarketPlaceDisabled": "A piactér nincs engedélyezve",
- 	"removeError": "Hiba történt a kiegészítő eltávolítása közben: {0}. Lépjen ki és indítsa el a VS Code-ot mielőtt újrapróbálná!",
-+<<<<<<< .our
- 	"Not a Marketplace extension": "Csak a piactérről származó kiegészítőket lehet újratelepíteni",
-+=======
-+	"Not Market place extension": "Csak a piactérről származó kiegészítőket lehet újratelepíteni",
-+>>>>>>> .their
- 	"notFoundCompatible": "A(z) '{0}' nem telepíthető: nincs a VS Code '{1}' verziójával kompatibilis változat.",
- 	"malicious extension": "A kiegészítő nem telepíthető, mert jelentették, hogy problémás.",
- 	"notFoundCompatibleDependency": "A telepítés nem sikerült, mert a(z) '{0}' kiegészítő függőség VS Code '{1}' verziójával kompatibilis változata nem található. ",
-changed in both
-  base   100644 49d3ed267af8cd9a461b44e0914a97088f0d6e38 i18n/hun/src/vs/workbench/common/theme.i18n.json
-  our    100644 3406c795c4b8de9d50192c0ba339b8532a562f5d i18n/hun/src/vs/workbench/common/theme.i18n.json
-  their  100644 964a483d9581dfa59517f2ea35d06c6b09d44c30 i18n/hun/src/vs/workbench/common/theme.i18n.json
-changed in both
-  base   100644 b89ad6eeda744bac1e515301a668a5210dafafdb i18n/hun/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  our    100644 7a8fcade9f112dae2ecbed3eaa271bea631674d2 i18n/hun/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  their  100644 8f5ebe5ec40cfda7b83c5d1d7e62fddbf37fcf72 i18n/hun/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-@@ -27,6 +27,9 @@
- 	"onFirstSessionStart": "A hibakeresés csak akkor jelenjen meg az állapotsoron, miután először el lett indítva a hibakeresés",
- 	"showInStatusBar": "Meghatározza, hogy megjelenjen-e a hibakeresési állapotsáv",
- 	"openDebug": "Meghatározza, hogy megnyíljon-e a hibakeresési modul a hibakeresési munkamenet indulásakor.",
-+<<<<<<< .our
- 	"enableAllHovers": "Meghatározza, hogy megjelenjenek-e a nem hibakereséshez tartozó súgószövegek hibakeresés közben. Ha az értéke igaz, a súgószöveg-szolgáltatóktól el lesznek kérve a súgószövegek. A sima súgószövegek még ebben az esetben sem jelennek meg.",
-+=======
-+>>>>>>> .their
- 	"launch": "Globális hibakeresés indítási konfiguráció. Használható a 'launch.json' alternatívájaként, ami meg van osztva több munkaterület között"
- }
-\ No newline at end of file
-changed in both
-  base   100644 e8b75590c3828483fa9a9f4599ece3ae1e80503d i18n/hun/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 7a913054b256429d23dc7fd5eaa396c14eb26134 i18n/hun/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 cea278e8b7cd410cb4fb9a099a6cf92263273c08 i18n/hun/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-changed in both
-  base   100644 a00a37e81e8e84cd39badb218ad850494f4b3bb3 i18n/hun/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 1439e6263aeea9edcee41566036c04020ed9c86f i18n/hun/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 ffaed50c03f7d41aadb48dbf1dd75d063974a5a1 i18n/hun/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -31,5 +31,9 @@
- 	"search.followSymlinks": "Meghatározza, hogy keresés során követve legyenek-e a szimbolikus linkek.",
- 	"search.smartCase": "Figyelmen kívül hagyja a kis- és nagybetűket, ha a minta csak kisbetűkből áll, ellenkező esetben kis- és nagybetűérzékenyen keres",
- 	"search.globalFindClipboard": "Meghatározza, hogy a keresőmodul olvassa és módosítsa-e a megosztott keresési vágólapot macOS-en.",
-+<<<<<<< .our
- 	"search.location": "Meghatározza, hogy a keresés az oldalsávon jelenik meg vagy egy panelként a panelterületen, mely utóbbi esetén több vízszintes hely áll rendelkezésre."
-+=======
-+	"search.location": "Előzetes funkció: meghatározza, hogy a keresés az oldalsávon jelenik meg vagy egy panelként a panelterületen, mely utóbbi esetén több hely van vízszintesen. A következő kiadásban a panel megjelenése optimalizálva lesz a vízszintes megjelenítéshez, és a funkció nem lesz előzetes."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e2b8eaba4c109cbb94a9cf80d948e58ce8fde7dd i18n/hun/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 ee1596339153cc7e8c412014c640971b5ecc963e i18n/hun/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 41b05f04072f5d305efd3ea546d4c42a60590086 i18n/hun/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -15,6 +15,10 @@
- 	"updateIsReady": "Új {0}-frissítés érhető el.",
- 	"noUpdatesAvailable": "Jelenleg nincs elérhető frissítés.",
- 	"ok": "OK",
-+<<<<<<< .our
-+=======
-+	"download now": "Letöltés most",
-+>>>>>>> .their
- 	"thereIsUpdateAvailable": "Van elérhető frissítés.",
- 	"download now": "Letöltés most",
- 	"later": "Később",
-changed in both
-  base   100644 d26555edd69f9e19801c7bd8099cd932e8803623 i18n/hun/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
-  our    100644 89f126918e81d6a558f330dc9f23ac4f8fbf7d61 i18n/hun/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
-  their  100644 c71dafc3472059852cc4723a8ecd2307aec8ee97 i18n/hun/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
-changed in both
-  base   100644 6ef7ed5aaf9e5defa8cc38448bc186ad1f39129b i18n/ita/extensions/css/package.i18n.json
-  our    100644 5f1a325b6dad6c5a147db0e935fbba1c1aca9afa i18n/ita/extensions/css/package.i18n.json
-  their  100644 35517becb5bac846937fd90abeb9b21627723229 i18n/ita/extensions/css/package.i18n.json
-@@ -6,6 +6,81 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Nozioni di base del linguaggio CSS",
- 	"description": "Offre l'evidenziazione della sintassi e la corrispondenza delle parentesi nei file CSS, LESS e SCSS."
-+=======
-+	"displayName": "Funzionalità del linguaggio CSS",
-+	"description": "Offre un supporto avanzato per i file CSS, LESS e SCSS",
-+	"css.title": "CSS",
-+	"css.lint.argumentsInColorFunction.desc": "Numero di parametri non valido",
-+	"css.lint.boxModel.desc": "Non usare width o height con padding o border",
-+	"css.lint.compatibleVendorPrefixes.desc": "Quando si usa un prefisso specifico del fornitore, assicurarsi di includere anche tutte le altre proprietà specifiche del fornitore",
-+	"css.lint.duplicateProperties.desc": "Non usare definizioni di stile duplicate",
-+	"css.lint.emptyRules.desc": "Non usare set di regole vuoti",
-+	"css.lint.float.desc": "Evitare di usare 'float'. Con gli elementi float si ottiene codice CSS che causa facilmente interruzioni in caso di modifica di un aspetto del layout.",
-+	"css.lint.fontFaceProperties.desc": "La regola @font-face deve definire le proprietà 'src' e 'font-family'",
-+	"css.lint.hexColorLength.desc": "I colori esadecimali devono essere composti da tre o sei numeri esadecimali",
-+	"css.lint.idSelector.desc": "I selettori non devono contenere ID perché queste regole sono strettamente accoppiate al codice HTML.",
-+	"css.lint.ieHack.desc": "Gli hack IE sono necessari solo per il supporto di IE7 e versioni precedenti",
-+	"css.lint.important.desc": "Evitare di usare !important perché indica che la specificità dell'intero codice CSS non è più controllabile ed è necessario effettuarne il refactoring.",
-+	"css.lint.importStatement.desc": "Le istruzioni Import non vengono caricate in parallelo",
-+	"css.lint.propertyIgnoredDueToDisplay.desc": "La proprietà viene ignorata a causa della visualizzazione. Ad esempio, con 'display: inline', le proprietà width, height, margin-top, margin-bottom e float non hanno effetto",
-+	"css.lint.universalSelector.desc": "Il selettore universale (*) è notoriamente lento",
-+	"css.lint.unknownProperties.desc": "Proprietà sconosciuta.",
-+	"css.lint.unknownVendorSpecificProperties.desc": "Proprietà specifica del fornitore sconosciuta.",
-+	"css.lint.vendorPrefix.desc": "Quando si usa un prefisso specifico del fornitore, includere anche la proprietà standard",
-+	"css.lint.zeroUnits.desc": "Non è necessaria alcuna unità per lo zero",
-+	"css.trace.server.desc": "Traccia la comunicazione tra VS Code e il server del linguaggio CSS.",
-+	"css.validate.title": "Controlla la convalida CSS e le gravità dei problemi.",
-+	"css.validate.desc": "Abilita o disabilita tutte le convalide",
-+	"less.title": "LESS",
-+	"less.lint.argumentsInColorFunction.desc": "Numero di parametri non valido",
-+	"less.lint.boxModel.desc": "Non usare width o height con padding o border",
-+	"less.lint.compatibleVendorPrefixes.desc": "Quando si usa un prefisso specifico del fornitore, assicurarsi di includere anche tutte le altre proprietà specifiche del fornitore",
-+	"less.lint.duplicateProperties.desc": "Non usare definizioni di stile duplicate",
-+	"less.lint.emptyRules.desc": "Non usare set di regole vuoti",
-+	"less.lint.float.desc": "Evitare di usare 'float'. Con gli elementi float si ottiene codice CSS che causa facilmente interruzioni in caso di modifica di un aspetto del layout.",
-+	"less.lint.fontFaceProperties.desc": "La regola @font-face deve definire le proprietà 'src' e 'font-family'",
-+	"less.lint.hexColorLength.desc": "I colori esadecimali devono essere composti da tre o sei numeri esadecimali",
-+	"less.lint.idSelector.desc": "I selettori non devono contenere ID perché queste regole sono strettamente accoppiate al codice HTML.",
-+	"less.lint.ieHack.desc": "Gli hack IE sono necessari solo per il supporto di IE7 e versioni precedenti",
-+	"less.lint.important.desc": "Evitare di usare !important perché indica che la specificità dell'intero codice CSS non è più controllabile ed è necessario effettuarne il refactoring.",
-+	"less.lint.importStatement.desc": "Le istruzioni Import non vengono caricate in parallelo",
-+	"less.lint.propertyIgnoredDueToDisplay.desc": "La proprietà viene ignorata a causa della visualizzazione. Ad esempio, con 'display: inline', le proprietà width, height, margin-top, margin-bottom e float non hanno effetto",
-+	"less.lint.universalSelector.desc": "Il selettore universale (*) è notoriamente lento",
-+	"less.lint.unknownProperties.desc": "Proprietà sconosciuta.",
-+	"less.lint.unknownVendorSpecificProperties.desc": "Proprietà specifica del fornitore sconosciuta.",
-+	"less.lint.vendorPrefix.desc": "Quando si usa un prefisso specifico del fornitore, includere anche la proprietà standard",
-+	"less.lint.zeroUnits.desc": "Non è necessaria alcuna unità per lo zero",
-+	"less.validate.title": "Controlla la convalida LESS e le gravità dei problemi.",
-+	"less.validate.desc": "Abilita o disabilita tutte le convalide",
-+	"scss.title": "SCSS (Sass)",
-+	"scss.lint.argumentsInColorFunction.desc": "Numero di parametri non valido",
-+	"scss.lint.boxModel.desc": "Non usare width o height con padding o border",
-+	"scss.lint.compatibleVendorPrefixes.desc": "Quando si usa un prefisso specifico del fornitore, assicurarsi di includere anche tutte le altre proprietà specifiche del fornitore",
-+	"scss.lint.duplicateProperties.desc": "Non usare definizioni di stile duplicate",
-+	"scss.lint.emptyRules.desc": "Non usare set di regole vuoti",
-+	"scss.lint.float.desc": "Evitare di usare 'float'. Con gli elementi float si ottiene codice CSS che causa facilmente interruzioni in caso di modifica di un aspetto del layout.",
-+	"scss.lint.fontFaceProperties.desc": "La regola @font-face deve definire le proprietà 'src' e 'font-family'",
-+	"scss.lint.hexColorLength.desc": "I colori esadecimali devono essere composti da tre o sei numeri esadecimali",
-+	"scss.lint.idSelector.desc": "I selettori non devono contenere ID perché queste regole sono strettamente accoppiate al codice HTML.",
-+	"scss.lint.ieHack.desc": "Gli hack IE sono necessari solo per il supporto di IE7 e versioni precedenti",
-+	"scss.lint.important.desc": "Evitare di usare !important perché indica che la specificità dell'intero codice CSS non è più controllabile ed è necessario effettuarne il refactoring.",
-+	"scss.lint.importStatement.desc": "Le istruzioni Import non vengono caricate in parallelo",
-+	"scss.lint.propertyIgnoredDueToDisplay.desc": "La proprietà viene ignorata a causa della visualizzazione. Ad esempio, con 'display: inline', le proprietà width, height, margin-top, margin-bottom e float non hanno effetto",
-+	"scss.lint.universalSelector.desc": "Il selettore universale (*) è notoriamente lento",
-+	"scss.lint.unknownProperties.desc": "Proprietà sconosciuta.",
-+	"scss.lint.unknownVendorSpecificProperties.desc": "Proprietà specifica del fornitore sconosciuta.",
-+	"scss.lint.vendorPrefix.desc": "Quando si usa un prefisso specifico del fornitore, includere anche la proprietà standard",
-+	"scss.lint.zeroUnits.desc": "Non è necessaria alcuna unità per lo zero",
-+	"scss.validate.title": "Controlla la convalida SCSS e le gravità dei problemi.",
-+	"scss.validate.desc": "Abilita o disabilita tutte le convalide",
-+	"less.colorDecorators.enable.desc": "Abilita o disabilita gli elementi Decorator di tipo colore",
-+	"scss.colorDecorators.enable.desc": "Abilita o disabilita gli elementi Decorator di tipo colore",
-+	"css.colorDecorators.enable.desc": "Abilita o disabilita gli elementi Decorator di tipo colore",
-+	"css.colorDecorators.enable.deprecationMessage": "L'impostazione `css.colorDecorators.enable` è stata deprecata e sostituita da `editor.colorDecorators`.",
-+	"scss.colorDecorators.enable.deprecationMessage": "L'impostazione `scss.colorDecorators.enable` è stata deprecata e sostituita da `editor.colorDecorators`.",
-+	"less.colorDecorators.enable.deprecationMessage": "L'impostazione `less.colorDecorators.enable` è stata deprecata e sostituita da `editor.colorDecorators`."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a62c898a9fbe05b766bf77567055999cd539f765 i18n/ita/extensions/emmet/package.i18n.json
-  our    100644 325af035e69c09e1e32c51cdc976ffb0a4047641 i18n/ita/extensions/emmet/package.i18n.json
-  their  100644 4b669f7fc4943aa0d34753b217a9bf7cae554125 i18n/ita/extensions/emmet/package.i18n.json
-@@ -59,7 +59,11 @@
- 	"emmetPreferencesCssWebkitProperties": "Proprietà CSS delimitate da virgola che assumono il prefisso 'webkit' del vendor quando utilizzate nelle abbreviazioni di Emmet che iniziano per '-'. Per evitare sempre il prefisso 'webkit' impostare stringa vuota.",
- 	"emmetPreferencesCssMozProperties": "Proprietà CSS delimitate da virgola che assumono il prefisso 'moz' del vendor quando utilizzate nelle abbreviazioni di Emmet che iniziano per '-'. Per evitare sempre il prefisso 'moz' impostare stringa vuota.",
- 	"emmetPreferencesCssOProperties": "Proprietà CSS delimitate da virgola che assumono il prefisso 'o' del vendor quando utilizzate nelle abbreviazioni di Emmet che iniziano per '-'. Per evitare sempre il prefisso 'o' impostare stringa vuota.",
-+<<<<<<< .our
- 	"emmetPreferencesCssMsProperties": "Proprietà CSS delimitate da virgola che assumono il prefisso 'ms' del vendor quando utilizzate nelle abbreviazioni di Emmet che iniziano per '-'. Per evitare sempre il prefisso 'ms' impostare stringa vuota.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "Il valore minimo (da 0 a 1) che dovrebbe raggiungere un'abbreviazione di fuzzy-match. I valori più bassi possono produrre molti falsi positivi, i valori più alti possono ridurre le possibili corrispondenze.",
- 	"emmetOptimizeStylesheetParsing": "Se è impostato su false, l'intero file viene analizzato per determinare se la posizione corrente è valida per l'espansione delle abbreviazioni di Emmet. Se è impostato su true, viene analizzato solo il contenuto circostante alla posizione corrente nei file css/scss/less."
-+=======
-+	"emmetPreferencesCssMsProperties": "Proprietà CSS delimitate da virgola che assumono il prefisso 'ms' del vendor quando utilizzate nelle abbreviazioni di Emmet che iniziano per '-'. Per evitare sempre il prefisso 'ms' impostare stringa vuota."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 cda8e937b55988170ed1c8e3cd01899a8478aac0 i18n/ita/extensions/git/package.i18n.json
-  our    100644 3e99eceff18f0bd1805288644f15d41ccf24de7a i18n/ita/extensions/git/package.i18n.json
-  their  100644 24f0b387a00b4ae74797e666e056d2dea7310755 i18n/ita/extensions/git/package.i18n.json
-changed in both
-  base   100644 55d9fa1dde7a2dde6755825223b84aa02a49a8bf i18n/ita/extensions/html/package.i18n.json
-  our    100644 9015f75af4c550711e07a1e7f3d1832824bafe41 i18n/ita/extensions/html/package.i18n.json
-  their  100644 08d31d44db6427854c652fd93cb17c08579de464 i18n/ita/extensions/html/package.i18n.json
-@@ -6,6 +6,34 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Nozioni di base del linguaggio HTML",
- 	"description": "Fornisce l'evidenziazione della sintassi, la corrispondenza delle parentesi & frammenti nei file HTML."
-+=======
-+	"displayName": "Funzionalità del linguaggio HTML",
-+	"description": "Offre un supporto avanzato sul linguaggio per i file HTML, Razor e Handlebars",
-+	"html.format.enable.desc": "Abilita/Disabilita il formattatore HTML predefinito",
-+	"html.format.wrapLineLength.desc": "Numero massimo di caratteri per riga (0 = disabilita).",
-+	"html.format.unformatted.desc": "Elenco di tag, separati da virgole, che non devono essere riformattati. Con 'null' viene usata l'impostazione predefinita che prevede l'uso di tutti i tag elencati in https://www.w3.org/TR/html5/dom.html#phrasing-content.",
-+	"html.format.contentUnformatted.desc": "Elenco di tag, separati da virgole, in cui il contenuto non deve essere riformattato. Per impostazione predefinita, con 'null' viene usato il tag 'pre'.",
-+	"html.format.indentInnerHtml.desc": "Imposta un rientro per le sezioni <head> e <body>.",
-+	"html.format.preserveNewLines.desc": "Indica se è necessario mantenere interruzioni di riga esistenti prima degli elementi. Funziona solo prima degli elementi e non all'interno di tag o per il testo.",
-+	"html.format.maxPreserveNewLines.desc": "Numero massimo di interruzioni di riga da mantenere in un unico blocco. Per non impostare un numero massimo, usare 'null'.",
-+	"html.format.indentHandlebars.desc": "Applica la formattazione e imposta un rientro per {{#foo}} e {{/foo}}.",
-+	"html.format.endWithNewline.desc": "Termina con un carattere di nuova riga.",
-+	"html.format.extraLiners.desc": "Elenco di tag, separati da virgole, che devono essere preceduti da un carattere di nuova riga. Con 'null' viene usata l'impostazione predefinita \"head, body, /html\".",
-+	"html.format.wrapAttributes.desc": "Esegue il wrapping degli attributi.",
-+	"html.format.wrapAttributes.auto": "Esegue il wrapping degli attributi solo quando viene superata la lunghezza di riga.",
-+	"html.format.wrapAttributes.force": "Esegue il wrapping di ogni attributo ad eccezione del primo.",
-+	"html.format.wrapAttributes.forcealign": "Esegue il wrapping di ogni attributo ad eccezione del primo e mantiene l'allineamento.",
-+	"html.format.wrapAttributes.forcemultiline": "Esegue il wrapping di ogni attributo.",
-+	"html.suggest.angular1.desc": "Consente di configurare se il supporto del linguaggio HTML predefinito suggerisce tag e proprietà di Angular V1.",
-+	"html.suggest.ionic.desc": "Consente di configurare se il supporto del linguaggio HTML predefinito suggerisce tag, proprietà e valori di Ionic.",
-+	"html.suggest.html5.desc": "Consente di configurare se il supporto del linguaggio HTML predefinito suggerisce tag, proprietà e valori di HTML5.",
-+	"html.trace.server.desc": "Traccia la comunicazione tra VS Code e il server del linguaggio HTML.",
-+	"html.validate.scripts": "Consente di configurare se il supporto del linguaggio HTML predefinito convalida gli script incorporati.",
-+	"html.validate.styles": "Consente di configurare se il supporto del linguaggio HTML predefinito convalida gli stili incorporati.",
-+	"html.experimental.syntaxFolding": "Abilita/disabilita i marcatori di folding con riconoscimento della sintassi.",
-+	"html.autoClosingTags": "Abilita/Disabilita la chiusura automatica dei tag HTML."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 22c075040adc41bf04d467af5c9948f8ef5e5100 i18n/ita/extensions/json/package.i18n.json
-  our    100644 d1cf4899cfa86afcb0389d3535383acafc91e09d i18n/ita/extensions/json/package.i18n.json
-  their  100644 b6f387db3164b871d5a485dda8a279e77bc9196c i18n/ita/extensions/json/package.i18n.json
-@@ -6,6 +6,21 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Nozioni di base del linguaggio JSON",
- 	"description": "Offre l'evidenziazione della sintassi e la corrispondenza delle parentesi nei file JSON."
-+=======
-+	"displayName": "Funzionalità del linguaggio JSON",
-+	"description": "Fornisce supporto avanzato del linguaggio per i file JSON.",
-+	"json.schemas.desc": "Associa schemi a file JSON nel progetto corrente",
-+	"json.schemas.url.desc": "URL di uno schema o percorso relativo di uno schema nella directory corrente",
-+	"json.schemas.fileMatch.desc": "Matrice di criteri dei file da usare per la ricerca durante la risoluzione di file JSON in schemi.",
-+	"json.schemas.fileMatch.item.desc": "Criteri dei file che possono contenere '*' da usare per la ricerca durante la risoluzione di file JSON in schemi.",
-+	"json.schemas.schema.desc": "Definizione dello schema per l'URL specificato. È necessario specificare lo schema per evitare accessi all'URL dello schema.",
-+	"json.format.enable.desc": "Abilita/Disabilita il formattatore JSON predefinito (richiede il riavvio)",
-+	"json.tracing.desc": "Traccia la comunicazione tra VS Code e il server del linguaggio JSON.",
-+	"json.colorDecorators.enable.desc": "Abilita o disabilita gli elementi Decorator di tipo colore",
-+	"json.colorDecorators.enable.deprecationMessage": "L'impostazione `json.colorDecorators.enable` è stata deprecata e sostituita da `editor.colorDecorators`.",
-+	"json.experimental.syntaxFolding": "Abilita/disabilita i marcatori di folding con riconoscimento della sintassi."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e2947af8da1d157a6732f0db833ef378e07fdcd7 i18n/ita/extensions/npm/package.i18n.json
-  our    100644 35faed0d788c5e82f45e8fdf22618f3516a421ca i18n/ita/extensions/npm/package.i18n.json
-  their  100644 b541b36c36572f9ba643d484f1cac3d097a523ec i18n/ita/extensions/npm/package.i18n.json
-@@ -12,6 +12,7 @@
- 	"config.npm.runSilent": "Eseguire comandi npm con l'opzione `--silent`.",
- 	"config.npm.packageManager": "Il gestore dei pacchetti utilizzato per eseguire script.",
- 	"config.npm.exclude": "Configura i modelli glob per le cartelle che dovrebbero essere escluse dalla rilevazione automatica di script.",
-+<<<<<<< .our
- 	"config.npm.enableScriptExplorer": "Vedi come Esplora risorse gli script npm.",
- 	"config.npm.scriptExplorerAction": "Azione predefinita per il clic in Esplora script: 'open' o 'run'. L'impostazione predefinita è 'open'.",
- 	"npm.parseError": "Rilevamento attività NPM: Impossibile analizzare il file {0}",
-@@ -23,4 +24,9 @@
- 	"command.debug": "Debug",
- 	"command.openScript": "Apri",
- 	"command.runInstall": "Esegui install"
-+=======
-+	"npm.parseError": "Rilevamento attività NPM: Impossibile analizzare il file {0}",
-+	"taskdef.script": "Lo script di npm da personalizzare.",
-+	"taskdef.path": "Il percorso della cartella del file package.json che fornisce lo script. Può essere omesso."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ea44ea91d9f49cef69908768deaa8e2c73b85a15 i18n/ita/extensions/php/package.i18n.json
-  our    100644 d8344412ea06e1d3ebcd7a1c9d180341bd3b2e6d i18n/ita/extensions/php/package.i18n.json
-  their  100644 f2707697f234634a634b09a1769b644d495caa03 i18n/ita/extensions/php/package.i18n.json
-@@ -6,6 +6,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Nozioni di base del linguaggio PHP",
- 	"description": "Offre l'evidenziazione della sintassi e la corrispondenza delle parentesi nei file PHP."
-+=======
-+	"configuration.suggest.basic": "Consente di configurare l'abilitazione dei suggerimenti predefiniti per il linguaggio PHP. Il supporto suggerisce variabili e variabili globali PHP.",
-+	"configuration.validate.enable": "Abilita/Disabilita la convalida PHP predefinita.",
-+	"configuration.validate.executablePath": "Punta all'eseguibile di PHP.",
-+	"configuration.validate.run": "Indica se il linter viene eseguito durante il salvataggio o la digitazione.",
-+	"configuration.title": "PHP",
-+	"commands.categroy.php": "PHP",
-+	"command.untrustValidationExecutable": "Non consentire la convalida di PHP eseguibile (definito come impostazione dell'area di lavoro)",
-+	"displayName": "Funzionalità del linguaggio PHP",
-+	"description": "Offre IntelliSense, linting e nozioni di base sul linguaggio per i file PHP."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c9c81e13178cbd679993f8ac8b706e2c37eae276 i18n/ita/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  our    100644 227d32796a6baa320c796945995dc4dda33fa366 i18n/ita/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  their  100644 24c38320db5942b5f4d28b7182f130b1e0b49294 i18n/ita/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-@@ -14,11 +14,19 @@
- 	"similarIssues": "Problemi simili",
- 	"open": "Apri",
- 	"closed": "Chiuso",
-+<<<<<<< .our
- 	"noSimilarIssues": "Nessun problema simile trovato",
- 	"settingsSearchIssue": "Problema di ricerca impostazioni",
- 	"bugReporter": "Segnalazione bug",
- 	"featureRequest": "Richiesta di funzionalità",
- 	"performanceIssue": "Problema di prestazioni",
-+=======
-+	"noResults": "Non sono stati trovati risultati",
-+	"settingsSearchIssue": "Problema di ricerca impostazioni",
-+	"bugReporter": "Segnalazione bug",
-+	"performanceIssue": "Problema di prestazioni",
-+	"featureRequest": "Richiesta di funzionalità",
-+>>>>>>> .their
- 	"stepsToReproduce": "Passi da riprodurre",
- 	"bugDescription": "Indicare i passaggi necessari per riprodurre il problema in modo affidabile. Includere i risultati effettivi e quelli previsti. È supportato il linguaggio Markdown per GitHub. Sarà possibile modificare il problema e aggiungere screenshot quando verrà visualizzato in anteprima in GitHub.",
- 	"performanceIssueDesciption": "Quando si è verificato questo problema di prestazioni? All'avvio o dopo una serie specifiche di azioni? È supportato il linguaggio Markdown per GitHub. Sarà possibile modificare il problema e aggiungere screenshot quando verrà visualizzato in anteprima in GitHub.",
-changed in both
-  base   100644 9abb25d7aca8b107a725015a9c563311fdf04cbf i18n/ita/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  our    100644 a59dbde663cf3b1122a7f857a3ec49c9a6812924 i18n/ita/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  their  100644 bd90ead3d7ef655ae350477da4ece615987bc822 i18n/ita/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-@@ -8,6 +8,7 @@
- 	],
- 	"completeInEnglish": "Completare il modulo in lingua inglese.",
- 	"issueTypeLabel": "Questo è un",
-+<<<<<<< .our
- 	"issueSourceLabel": "File in",
- 	"vscode": "Visual Studio Code",
- 	"extension": "Un'estensione",
-@@ -25,4 +26,25 @@
- 	"sendExtensions": "Includi le estensioni abilitate ({0})",
- 	"sendSearchedExtensions": "Invia le estensioni cercate ({0})",
- 	"sendSettingsSearchDetails": "Invia i dettagli di ricerca delle impostazioni ({0})"
-+=======
-+	"issueTitleLabel": "Titolo",
-+	"issueTitleRequired": "Immettere un titolo.",
-+	"titleLengthValidation": "Il titolo è troppo lungo.",
-+	"systemInfo": "Informazioni sul sistema in uso",
-+	"sendData": "Invia i dati",
-+	"processes": "Processi attualmente in esecuzione",
-+	"workspaceStats": "Statistiche area di lavoro personale",
-+	"extensions": "Estensioni personali",
-+	"searchedExtensions": "Estensioni cercate",
-+	"settingsSearchDetails": "Dettagli ricerca impostazioni",
-+	"tryDisablingExtensions": "Il problema è riproducibile quando le estensioni sono disabilitate?",
-+	"yes": "Sì",
-+	"no": "No",
-+	"disableExtensionsLabelText": "Provare a riprodurre il problema dopo {0}.",
-+	"disableExtensions": "disabilitando tutte le estensioni e ricaricando la finestra",
-+	"showRunningExtensionsLabelText": "Se si sospetta che il problema sia relativo all'estensione, {0} per segnalare il problema.",
-+	"showRunningExtensions": "visualizzare tutte le estensioni in esecuzione",
-+	"details": "Immettere i dettagli.",
-+	"loadingData": "Caricamento dei dati..."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f30391d5843a5abd1be5d174805e787db449c192 i18n/ita/src/vs/code/electron-main/menus.i18n.json
-  our    100644 a5f6c5e0343adf224d6df3a61663d9695836512e i18n/ita/src/vs/code/electron-main/menus.i18n.json
-  their  100644 4b19663530a31dba0778c8328fdaf4e945dda7fc i18n/ita/src/vs/code/electron-main/menus.i18n.json
-changed in both
-  base   100644 bd30748cae58c6308238d9b4909b078805fce1b9 i18n/ita/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 047668b002c0125f22b3c77979675bee2ddbe88f i18n/ita/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 d51e843ddbf4e50724cb3ef13d21352c4dacca43 i18n/ita/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -17,7 +17,10 @@
- 	"editorActiveIndentGuide": "Colore delle guide di indentazione dell'editor attivo",
- 	"editorLineNumbers": "Colore dei numeri di riga dell'editor.",
- 	"editorActiveLineNumber": "Colore dei numeri per la riga attiva dell'editor",
-+<<<<<<< .our
- 	"deprecatedEditorActiveLineNumber": "Id è deprecato. In alternativa utilizzare 'editorLineNumber.activeForeground'.",
-+=======
-+>>>>>>> .their
- 	"editorRuler": "Colore dei righelli dell'editor.",
- 	"editorCodeLensForeground": "Colore primo piano delle finestre di CodeLens dell'editor",
- 	"editorBracketMatchBackground": "Colore di sfondo delle parentesi corrispondenti",
-changed in both
-  base   100644 16fb8383a5664ea19bb28bc35cfedf2c936ab22e i18n/ita/src/vs/editor/contrib/format/formatActions.i18n.json
-  our    100644 85c09bb79a42796171506be66819e2e3d7a96437 i18n/ita/src/vs/editor/contrib/format/formatActions.i18n.json
-  their  100644 6a24fce8757be97ed494ab2c4941b4344052d87e i18n/ita/src/vs/editor/contrib/format/formatActions.i18n.json
-changed in both
-  base   100644 e086db7fd7d6fc756680838f05b61098f2611a8b i18n/ita/src/vs/editor/contrib/links/links.i18n.json
-  our    100644 b8d39472123d09920dcb44929ff32662f5065ffe i18n/ita/src/vs/editor/contrib/links/links.i18n.json
-  their  100644 3c877aef4f6935608086e36f3376d5e68e2dd4a1 i18n/ita/src/vs/editor/contrib/links/links.i18n.json
-changed in both
-  base   100644 78ccdd76386db57f8e2f00a06eb138dc84847226 i18n/ita/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  our    100644 e0d29249698047f3608784eabef81557838d41db i18n/ita/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  their  100644 0129c5330e37c3aacb372eff448e4fafd1f6cd15 i18n/ita/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-@@ -10,8 +10,13 @@
- 	"wordHighlightStrong": "Colore di sfondo di un simbolo durante l'accesso in scrittura, per esempio durante la scrittura di una variabile. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.",
- 	"wordHighlightBorder": "Colore del bordo di un simbolo durante l'accesso in lettura, ad esempio durante la lettura di una variabile.",
- 	"wordHighlightStrongBorder": "Colore del bordo di un simbolo durante l'accesso in scrittura, ad esempio durante la scrittura in una variabile.",
-+<<<<<<< .our
- 	"overviewRulerWordHighlightForeground": "Colore del marcatore righello panoramica per evidenziazione simboli. Il colore non deve essere opaco per non nascondere decorazioni sottostanti.",
- 	"overviewRulerWordHighlightStrongForeground": "Colore del marcatore righello panoramica per evidenziazione simboli con accesso in scrittura. Il colore non deve essere opaco per non nascondere decorazioni sottostanti.",
-+=======
-+	"overviewRulerWordHighlightForeground": "Colore del marcatore del righello delle annotazioni per le evidenziazioni dei simboli.",
-+	"overviewRulerWordHighlightStrongForeground": "Colore del marcatore del righello delle annotazioni per le evidenziazioni dei simboli di accesso in scrittura.",
-+>>>>>>> .their
- 	"wordHighlight.next.label": "Vai al prossimo simbolo evidenziato",
- 	"wordHighlight.previous.label": "Vai al precedente simbolo evidenziato"
- }
-\ No newline at end of file
-changed in both
-  base   100644 ca0ebf07c84eaee0211af268c400f854469fcc2d i18n/ita/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 35f8ed83f0da1c4a75798a67e5b16affcd21632f i18n/ita/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 2dbb832ebf51844026cdd109c1e86bc6df6cc779 i18n/ita/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -15,7 +15,11 @@
- 	"errorInstallingDependencies": "Errore durante l'installazione delle dipendenze. {0}",
- 	"MarketPlaceDisabled": "Il Marketplace non è abilitato",
- 	"removeError": "Errore durante la rimozione dell'estensione: {0}. Chiudere e riavviare VS Code prima di riprovare.",
-+<<<<<<< .our
- 	"Not a Marketplace extension": "Solo le Estensioni del Marketplace possono essere reinstallate",
-+=======
-+	"Not Market place extension": "Solo le Estensioni del Marketplace possono essere reinstallate",
-+>>>>>>> .their
- 	"notFoundCompatible": "Impossibile installare '{0}'; non è presente alcuna versione compatibile con VS Code '{1}'.",
- 	"malicious extension": "Non è possibile installare l'estensione poiché è stata segnalata come problematica.",
- 	"notFoundCompatibleDependency": "Impossibile installare perché non è stata trovata l'estensione dipendente '{0}' compatibile con la versione corrente '{1}' di VS Code.",
-changed in both
-  base   100644 564925338c7b6ce2291db34ecbd9ac4b49b8930d i18n/ita/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 db040b20535e5fbe6df69ea748baeb36651c5732 i18n/ita/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 52b0e204cb50a0ab8a06ae253342e06e9fd76d6d i18n/ita/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -73,11 +73,18 @@
- 	"editorSelectionHighlightBorder": "Colore del bordo delle regioni con lo stesso contenuto della selezione.",
- 	"editorFindMatch": "Colore della corrispondenza di ricerca corrente.",
- 	"findMatchHighlight": "Colore degli altri risultati della ricerca. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.",
-+<<<<<<< .our
- 	"findRangeHighlight": "Colore dell'intervallo di limite della ricerca. Il colore non deve essere opaco per non nascondere decorazioni sottostanti.",
- 	"editorFindMatchBorder": "Colore del bordo della corrispondenza della ricerca corrente.",
- 	"findMatchHighlightBorder": "Colore del bordo delle altre corrispondenze della ricerca.",
- 	"findRangeHighlightBorder": "Colore del bordo dell'intervallo di limite della ricerca. Il colore non deve essere opaco per non nascondere decorazioni sottostanti.",
- 	"findWidgetResizeBorder": "Colore del bordo della barra di ridimensionamento del comando trova.",
-+=======
-+	"findRangeHighlight": "Colore dell'intervallo limite della ricerca. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.",
-+	"editorFindMatchBorder": "Colore del bordo della corrispondenza della ricerca corrente.",
-+	"findMatchHighlightBorder": "Colore del bordo delle altre corrispondenze della ricerca.",
-+	"findRangeHighlightBorder": "Colore del bordo dell'intervallo che delimita la ricerca. Il colore non deve essere opaco per non nascondere decorazioni sottostanti.",
-+>>>>>>> .their
- 	"hoverHighlight": "Evidenziazione sotto la parola per cui è visualizzata un'area sensibile al passaggio del mouse. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.",
- 	"hoverBackground": "Colore di sfondo dell'area sensibile al passaggio del mouse dell'editor.",
- 	"hoverBorder": "Colore del bordo dell'area sensibile al passaggio del mouse dell'editor.",
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ita/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
-  our    100644 8b6ff1d85679bb6f8a4055559f679c943afc74f5 i18n/ita/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
-  their  100644 6162c44dea8889c8535fdbf85abdc440758c6cd7 i18n/ita/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
-@@ -6,5 +6,9 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"errorMessage": "Si è verificato un errore durante il tentativo di ripristinare la visualizzazione: {0}"
-+=======
-+	"webview.editor.label": "editor Webview"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ita/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
-  our    100644 a203ffaf2a0d21600693c1cdf2e812297f4652ad i18n/ita/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
-  their  100644 40f3e83a7db6a1f8a7c45088bcefe5dfa03efefe i18n/ita/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
-@@ -6,7 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"notificationsEmpty": "Nessuna nuova notifica",
-+=======
-+>>>>>>> .their
- 	"notifications": "Notifiche",
- 	"notificationsToolbar": "Azioni del centro notifiche",
- 	"notificationsList": "Elenco notifiche"
-changed in both
-  base   100644 a1c1ce4de38d6d3b82ebdb87ab712b13af7a39b1 i18n/ita/src/vs/workbench/common/theme.i18n.json
-  our    100644 35f6e5209eb686bd26e13c1a8f96b6d2fe49fc8a i18n/ita/src/vs/workbench/common/theme.i18n.json
-  their  100644 e7034721bfde0f8881384c132391bdc18ee640f5 i18n/ita/src/vs/workbench/common/theme.i18n.json
-changed in both
-  base   100644 02447eacaeb34213e843dfff2933a8a2ef978b90 i18n/ita/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 9737d645d67a50d571dc86669b68ed740de20eba i18n/ita/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 4cb81a85d37b33f40408144196e92e3e28474b16 i18n/ita/src/vs/workbench/electron-browser/actions.i18n.json
-changed in both
-  base   100644 093fcc4441b82a4518d862ad00a86b0c310f322d i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 16fec1a5d98f225249a95297ad06c45ba75efafc i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 c4f1db5d2899d4c9f7b58bab7e668beda7f93b3c i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
-changed in both
-  base   100644 8ade9e0bdacd5e82e15320182985c2f6628b5e04 i18n/ita/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  our    100644 656b814006f7667926a1768077ad144830bd3d8a i18n/ita/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  their  100644 5e7acab8dbecc642c4e8e14b07024aae30472cef i18n/ita/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-@@ -17,7 +17,10 @@
- 	"breakpointUnverifieddHover": "Punto di interruzione non verificato",
- 	"functionBreakpointUnsupported": "Punti di interruzione di funzione non supportati da questo tipo di debug",
- 	"breakpointDirtydHover": "Punto di interruzione non verificato. Il file è stato modificato. Riavviare la sessione di debug.",
-+<<<<<<< .our
- 	"logBreakpointUnsupported": "Punti di registrazione non supportati da questo tipo di debug",
-+=======
-+>>>>>>> .their
- 	"conditionalBreakpointUnsupported": "Punti di interruzione condizionali non supportati da questo tipo di debug",
- 	"hitBreakpointUnsupported": "Sono stati raggiunti punti di interruzione condizionali non supportati da questo tipo di debug"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8a98da3cfbed043477643e067f46bcea5fb5697b i18n/ita/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
-  our    100644 0a3246caad77c1393ae3c68d6a75d4caa6da7894 i18n/ita/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
-  their  100644 9a306a433da9f11959457fbcafcfca9cf1f66768 i18n/ita/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
-@@ -7,7 +7,11 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"noFolderDebugConfig": "Si prega di aprire prima una cartella per consentire una configurazione di debug avanzato.",
-+<<<<<<< .our
- 	"inlineBreakpoint": "Punto di interruzione in linea",
-+=======
-+	"columnBreakpoint": "Punto di interruzione colonna",
-+>>>>>>> .their
- 	"debug": "Debug",
- 	"addInlineBreakpoint": "Aggiungi punto di interruzione in linea"
- }
-\ No newline at end of file
-changed in both
-  base   100644 19b06bc08816931425be485dc716aaff3cdd2d04 i18n/ita/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  our    100644 6b44ed029fe95ee65797c44b98a611e088a91461 i18n/ita/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  their  100644 61aec381ab64b232f887eee0ecb89a70da05721f i18n/ita/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-@@ -27,6 +27,9 @@
- 	"onFirstSessionStart": "Mostra debug nella barra solo stato dopo il primo avvio del debug",
- 	"showInStatusBar": "Controlla se rendere visibile la barra di stato del debug",
- 	"openDebug": "Controlla se la visualizzazione di debug debba essere aperta all'avvio della sessione di debug.",
-+<<<<<<< .our
- 	"enableAllHovers": "Controlla se è necessario abilitare i passaggi del mouse non di debug durante il debug. Se è true, i provider di passaggi del mouse verranno chiamati per fornire un passaggio del mouse. I passaggi del mouse normali non verranno visualizzati anche se il valore di questa impostazione è true.",
-+=======
-+>>>>>>> .their
- 	"launch": "Configurazione globale per l'esecuzione del debug. Può essere usata come un'alternativa a \"launch.json\" "
- }
-\ No newline at end of file
-changed in both
-  base   100644 0efada11b7d905a9811c87b63b32d540ca722d74 i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 c085858a8c6aed272feca37cbd61f5b25e9ca236 i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 1418cb86caf9f84867562ceb3b245c77d16a5161 i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-changed in both
-  base   100644 7b55ca77a71b1ccf38bf5cdc13ce6515bff29772 i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 8a9cb12815ff71703170d90088b67ed38f90d1c9 i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 79c3b874203dbaec01ebac6489f8feece9bc9c20 i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-changed in both
-  base   100644 c9155a70c0ff04244fe891aec4eb4afd574037e8 i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 87312cd2502c47006701381399f821b3154685ff i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 aeb7cee0d719b27c9d51a7572bf83cc24476b9a9 i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -8,6 +8,10 @@
- 	],
- 	"neverShowAgain": "Non visualizzare più questo messaggio",
- 	"searchMarketplace": "Cerca nel Marketplace",
-+<<<<<<< .our
-+=======
-+	"showLanguagePackExtensions": "Nel Marketplace sono disponibili estensioni che consentono di localizzare VS Code nelle impostazioni locali '{0}'",
-+>>>>>>> .their
- 	"dynamicWorkspaceRecommendation": "Questa estensione potrebbe essere interessante perché viene usata da altri utenti del repository {0}.",
- 	"exeBasedRecommendation": "Questa estensione è consigliata perché avete installato {0}.",
- 	"fileBasedRecommendation": "Questa estensione è raccomandata in base ai file aperti di recente.",
-changed in both
-  base   100644 d9192794c7105465eaa5f8c2d95b9759e21cd2d2 i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  our    100644 17b06f638b8c4e434b5c1e9690e18cec027dc497 i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  their  100644 96e949cb24af2db2ea98266122607ccfbda659a4 i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-@@ -12,9 +12,13 @@
- 	"recommendedExtensions": "Consigliate",
- 	"otherRecommendedExtensions": "Altri consigli",
- 	"workspaceRecommendedExtensions": "Consigli per l'area di lavoro",
-+<<<<<<< .our
- 	"builtInExtensions": "Funzionalità",
- 	"builtInThemesExtensions": "Temi",
- 	"builtInBasicsExtensions": "Linguaggi di programmazione",
-+=======
-+	"builtInExtensions": "Predefinite",
-+>>>>>>> .their
- 	"searchExtensions": "Cerca le estensioni nel Marketplace",
- 	"sort by installs": "Ordina per: conteggio installazioni",
- 	"sort by rating": "Ordina per: classificazione",
-changed in both
-  base   100644 1452ff54dedca394a369951bf1c197c411a08714 i18n/ita/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
-  our    100644 69b2daed0abcff93b69221abcd504f7c4924566c i18n/ita/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
-  their  100644 184ccf3b77be2f1156e40ba29bc5d00665267305 i18n/ita/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
-@@ -10,7 +10,11 @@
- 	"malicious": "Questa estensione è segnalata come problematica.",
- 	"installingMarketPlaceExtension": "Installazione dell'estensione dal Marketplace...",
- 	"uninstallingExtension": "Disinstallazione estensione in corso...",
-+<<<<<<< .our
- 	"enableDependeciesConfirmation": "Se si abilita un'estensione, verranno abilitate anche le relative dipendenze. Continuare?",
-+=======
-+	"enableDependeciesConfirmation": "Se si abilita '{0}', verranno abilitate anche le relative dipendenze. Continuare?",
-+>>>>>>> .their
- 	"enable": "Sì",
- 	"doNotEnable": "No",
- 	"disableDependeciesConfirmation": "Disabilitare anche le dipendenze dell'estensione?",
-changed in both
-  base   100644 72109697fbb5ec1ea1bfa370525148030d8d84a7 i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 be168507f7ffd1be04bdbdbb14365762be628f25 i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 1dfea4391db8b52e6a2e1cf41b1b87a6d2c36a2d i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-changed in both
-  base   100644 89525198530a0ace97a0781b3a6ac3d7c0de1946 i18n/ita/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  our    100644 a54b8fa48adfae1a9f192c1d397674dd2de20580 i18n/ita/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  their  100644 fffcdf8e5628b3e2097f600b3a113f2d6eeb9df8 i18n/ita/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-@@ -7,9 +7,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"fileInputAriaLabel": "Digitare il nome file. Premere INVIO per confermare oppure ESC per annullare.",
-+<<<<<<< .our
- 	"createFileFromExplorerInfoMessage": "Crea il file **{0}** in **{1}**",
- 	"renameFileFromExplorerInfoMessage": "Sposta e rinomina in **{0}**",
- 	"createFolderFromExplorerInfoMessage": "Crea la cartella **{0}** in **{1}**",
-+=======
-+	"constructedPath": "Crea {0} in **{1}**",
-+>>>>>>> .their
- 	"filesExplorerViewerAriaLabel": "{0}, Esplora file",
- 	"dropFolders": "Aggiungere le cartelle all'area di lavoro?",
- 	"dropFolder": "Aggiungere la cartella all'area di lavoro?",
-changed in both
-  base   100644 69740a58bbceadfc6a990029299c667424c1b0cf i18n/ita/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-  our    100644 d821a4ec5e01db07aa4ebd6ca0bffbc505bf90a3 i18n/ita/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-  their  100644 3e7cf3f5df4112f7da756c5e9702e457d1933476 i18n/ita/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-changed in both
-  base   100644 e875be271f927290086ba226825ad794d1ec59ba i18n/ita/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  our    100644 ab7704c8c47164753ebfc517a6fb9394b1465aff i18n/ita/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  their  100644 915767115f776a74d9ca8320ac0932858681db78 i18n/ita/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-changed in both
-  base   100644 6f893f45c4e6e966d0a7c5178a6725744d80c222 i18n/ita/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 13379f4fe2a00cfa238ca2e6341676a8a3328e76 i18n/ita/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 2990ba49e0055ed41093117e41be203ef6041660 i18n/ita/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -31,5 +31,9 @@
- 	"search.followSymlinks": "Controlla se seguire i collegamenti simbolici durante la ricerca.",
- 	"search.smartCase": "Cerca in modo insensibile alle maiuscole/minuscole se il criterio è tutto minuscolo, altrimenti cerca in modalità sensibile a maiuscole/minuscole",
- 	"search.globalFindClipboard": "Controlla se il viewlet di ricerca deve leggere o modificare gli appunti di ricerca condivisi in macOS",
-+<<<<<<< .our
- 	"search.location": "Controlla se la ricerca verrà mostrata come visualizzazione nella barra laterale o come pannello nell'area pannelli per ottenere più spazio orizzontale."
-+=======
-+	"search.location": "Anteprima: controlla se la ricerca verrà mostrata in una visualizzazione della barra laterale o in un pannello nell'area pannelli in modo da disporre di maggiore spazio in orizzontale. Nella versione successiva la ricerca nel pannello sarà caratterizzata da un layout orizzontale ottimizzato e questa funzione non sarà più un'anteprima."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 abb3ffc0e714a00ae657eafb3e7c689534a9cca5 i18n/ita/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
-  our    100644 f203692785346eae268379f4f8b9f15c33550e1c i18n/ita/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
-  their  100644 65ecc6909d4103cfc6754c5df02336b6533310c3 i18n/ita/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
-changed in both
-  base   100644 01582fa952143fd9b83db1492131fad0884e7d74 i18n/ita/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 83baac91404ff175b394c533850a93d01538ab38 i18n/ita/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 b2e3a492ebb05695c2658d3e39531967cf92061e i18n/ita/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -31,10 +31,15 @@
- 	"selectProblemMatcher": "Selezionare il tipo di errori e di avvisi per cui analizzare l'output dell'attività",
- 	"customizeParseErrors": "La configurazione dell'attività corrente presenta errori. Per favore correggere gli errori prima di personalizzazione un'attività.",
- 	"moreThanOneBuildTask": "tasks.json contiene molte attività di compilazione. È in corso l'esecuzione della prima.\n",
-+<<<<<<< .our
- 	"TaskSystem.activeSame.background": "L'attività '{0}' è già attiva e in modalità background.",
- 	"TaskSystem.activeSame.noBackground": "L'attività '{0}' è già attiva.",
- 	"terminateTask": "Termina attività",
- 	"restartTask": "Riavvia attività",
-+=======
-+	"TaskSystem.activeSame.background": "L'attività '{0}' è già attiva ed in modalità background. Per terminarla, usare 'Termina attività' dal menu Attività.",
-+	"TaskSystem.activeSame.noBackground": "L'attività '{0}' è già attiva. Per terminarla, usare 'Termina attività' dal menu Attività.",
-+>>>>>>> .their
- 	"TaskSystem.active": "Al momento c'è già un'attività in esecuzione. Terminarla prima di eseguirne un'altra.",
- 	"TaskSystem.restartFailed": "Non è stato possibile terminare e riavviare l'attività {0}",
- 	"TaskService.noConfiguration": "Errore: Il rilevamento di attività {0} non ha contribuito un'attività nella seguente configurazione: \n{1} \nL'attività verrà ignorata.\n",
-changed in both
-  base   100644 d263eec6450c60d189b50708d6f43510345c9fdf i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 b43f261b33e96573db19620791c6498f01662657 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 9dd32e0ddc3009821cd468bab3173ca305515d38 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -27,8 +27,12 @@
- 	"terminal.integrated.cursorStyle": "Controlla lo stile del cursore del terminale.",
- 	"terminal.integrated.scrollback": "Consente di controllare il numero massimo di righe che il terminale mantiene nel buffer.",
- 	"terminal.integrated.setLocaleVariables": "Controlla se le variabili delle impostazioni locali sono impostate all'avvio del terminale. Il valore predefinito è true per OS X e false per altre piattaforme.",
-+<<<<<<< .our
- 	"terminal.integrated.rendererType": "Controlla la modalità di rendering del terminale. Le opzioni sono \"canvas\" per il renderer di canvas standard (rapido), \"dom\" per il renderer di fallback basato su DOM oppure \"auto\" che consente a VS Code di individuare quello migliore. Per rendere effettiva questa impostazione, è necessario ricariare VS Code.",
- 	"terminal.integrated.rightClickBehavior": "Controlla la reazione del terminale quando viene fatto clic con il pulsante destro del mouse. Le opzioni disponibili solo \"default\", \"copyPaste\" e \"selectWord\". Con \"default\" verrà visualizzato il menu di scelta rapida. Con \"copyPaste\" verrà eseguita un'operazione di copia in presenza di una selezione o in caso contrario un'operazione di incollamento. Con \"selectWord\" verrà selezionata la parola sotto il cursore e verrà visualizzato il menu di scelta rapida.",
-+=======
-+	"terminal.integrated.rightClickBehavior": "Controlla la reazione del terminale quando viene fatto clic con il pulsante destro del mouse. Le opzioni disponibili solo 'default', 'copyPaste' e 'selectWord'. Con 'default' verrà visualizzato il menu di scelta rapida. Con 'copyPaste' verrà eseguita un'operazione di copia in presenza di una selezione o in caso contrario un'operazione di incollamento. Con 'selectWord' verrà selezionata la parola sotto il cursore e verrà visualizzato il menu di scelta rapida.",
-+>>>>>>> .their
- 	"terminal.integrated.cwd": "Percorso di avvio esplicito in cui verrà avviato il terminale. Viene usato come directory di lavoro corrente per il processo della shell. Può risultare particolarmente utile nelle impostazioni dell'area di lavoro se la directory radice non costituisce una directory di lavoro corrente comoda.",
- 	"terminal.integrated.confirmOnExit": "Indica se confermare all'uscita la presenza di sessioni di terminale attive.",
- 	"terminal.integrated.enableBell": "Indica se il cicalino del terminale è abilitato o meno.",
-changed in both
-  base   100644 5d418a1a3e9f04f6b3211987fbc67c50368949f3 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 9af26b9889eaa5fa492c1556e3e5203a1ebacbf4 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 183e933c6e1d170a5aa5f75d23f58d90b441511b i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -21,7 +21,10 @@
- 	"workbench.action.terminal.newWorkspacePlaceholder": "Selezionare la cartella di lavoro corrente per un nuovo terminale.",
- 	"workbench.action.terminal.newInActiveWorkspace": "Crea un nuovo terminale integrato (nel workspace attivo)",
- 	"workbench.action.terminal.split": "Terminale diviso",
-+<<<<<<< .our
- 	"workbench.action.terminal.splitInActiveWorkspace": "Terminale diviso (nell'area di lavoro attiva)",
-+=======
-+>>>>>>> .their
- 	"workbench.action.terminal.focusPreviousPane": "Sposta stato attivo sul riquadro precedente",
- 	"workbench.action.terminal.focusNextPane": "Sposta stato attivo sul riquadro successivo",
- 	"workbench.action.terminal.resizePaneLeft": "Ridimensiona il riquadro a sinistra",
-changed in both
-  base   100644 53ce8c394274a472f4a0a37b5503cb133e1042d0 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-  our    100644 343f27488ed5ee62dbeabb654e81d1f94b49e11b i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-  their  100644 26ff40d49d34d2a2cd5af60ac023fe56f86d6cd0 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-@@ -9,6 +9,7 @@
- 	"terminal.integrated.a11yBlankLine": "Riga vuota",
- 	"terminal.integrated.a11yPromptLabel": "Input di terminale",
- 	"terminal.integrated.a11yTooMuchOutput": "Troppo output da annunciare. Per leggere, spostarsi manualmente nelle righe",
-+<<<<<<< .our
- 	"yes": "Sì",
- 	"terminal.rendererInAllNewTerminals": "Per tutti i nuovi terminali creati verrà usato il renderer non GPU.",
- 	"no": "No",
-@@ -19,4 +20,10 @@
- 	"terminal.integrated.waitOnExit": "Premere un tasto qualsiasi per chiudere il terminale",
- 	"terminal.integrated.launchFailed": "Non è stato possibile avviare il comando '{0}{1}' del processo del terminale (codice di uscita: {2})",
- 	"terminal.integrated.launchFailedExtHost": "Non è stato possibile avviare il processo del terminale (codice di uscita: {0})"
-+=======
-+	"terminal.integrated.copySelection.noSelection": "Il terminale non contiene alcuna selezione da copiare",
-+	"terminal.integrated.exitedWithCode": "Il processo del terminale è stato terminato. Codice di uscita: {0}",
-+	"terminal.integrated.waitOnExit": "Premere un tasto qualsiasi per chiudere il terminale",
-+	"terminal.integrated.launchFailed": "Non è stato possibile avviare il comando '{0}{1}' del processo del terminale (codice di uscita: {2})"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ab29b44f780763516eccb11dd444c63bad6344c3 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
-  our    100644 17f51bf21b6b23aa066acf67423e2b24162cde72 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
-  their  100644 e0033bb7d618332e460e12ac950df62c5c4f7843 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
-@@ -12,5 +12,6 @@
- 	"split": "Dividi",
- 	"paste": "Incolla",
- 	"selectAll": "Seleziona tutto",
--	"clear": "Cancella"
-+	"clear": "Cancella",
-+	"split": "Dividi"
- }
-\ No newline at end of file
-changed in both
-  base   100644 01f2f4392afad5d7f23d9ec23925adb07f8814b7 i18n/ita/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 aed35ee0f736e71e25693c29ccc2843fb9df2498 i18n/ita/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 e675aaedcf602596b1ee8acb9a91229bbe6b6512 i18n/ita/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -15,6 +15,10 @@
- 	"updateIsReady": "Nuovo aggiornamento di {0} disponibile.",
- 	"noUpdatesAvailable": "Al momento non sono disponibili aggiornamenti.",
- 	"ok": "OK",
-+<<<<<<< .our
-+=======
-+	"download now": "Scarica ora",
-+>>>>>>> .their
- 	"thereIsUpdateAvailable": "È disponibile un aggiornamento.",
- 	"download now": "Scarica ora",
- 	"later": "In seguito",
-changed in both
-  base   100644 899b84a1d9e1f0a99aed02cf0f6d151ffba5c938 i18n/ita/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 73635731361e3644a722328dacbcb86a39a295d3 i18n/ita/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 25de7b826b68614119cdb356e2c328fa5d7a7931 i18n/ita/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-changed in both
-  base   100644 f793c5994e0a634925bb40cdd2b97d23d61684bb i18n/ita/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
-  our    100644 c8cae817c45b724d61a295468d5c46f90f3b3e19 i18n/ita/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
-  their  100644 c432e186411319c2b59d29c3aa633121fe1c5320 i18n/ita/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
-changed in both
-  base   100644 f8626350b5070193f9dcd127c4d7349ceddbb9ec i18n/ita/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-  our    100644 9d7b1a95836e1168352f251f13c08626caf9c555 i18n/ita/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-  their  100644 1b3859ecb50a020a1b57dd8ccf2c96ae49e786c3 i18n/ita/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-@@ -9,6 +9,7 @@
- 	"netVersionError": "Microsoft .NET Framework 4.5 è obbligatorio. Selezionare il collegamento per installarlo.",
- 	"installNet": "Scarica .NET Framework 4.5",
- 	"neverShowAgain": "Non visualizzare più questo messaggio",
-+<<<<<<< .our
- 	"enospcError": "{0} non è in grado di controllare le modifiche di una grande area di lavoro. Per risolvere questo problema, seguire il collegamento alle istruzioni. ",
- 	"learnMore": "Istruzioni",
- 	"fileInvalidPath": "Risorsa del file non valida ({0})",
-@@ -24,6 +25,11 @@
- 	"fileReadOnlyError": "Il file è di sola lettura",
- 	"fileMoveConflict": "Non è possibile eseguire operazioni di spostamento/copia. Il file esiste già nella destinazione.",
- 	"unableToMoveCopyError": "Non è possibile eseguire operazioni di spostamento/copia. Il file sostituirebbe la cartella in cui è contenuto.",
-+=======
-+	"netVersionError": "Microsoft .NET Framework 4.5 è obbligatorio. Selezionare il collegamento per installarlo.",
-+	"learnMore": "Istruzioni",
-+	"enospcError": "{0} sta esaurendo gli handle di file. Per risolvere questo problema, seguire il collegamento alle istruzioni.",
-+>>>>>>> .their
- 	"binFailed": "Non è stato possibile spostare '{0}' nel Cestino",
- 	"trashFailed": "Non è stato possibile spostare '{0}' nel Cestino"
- }
-\ No newline at end of file
-merged
-  result 100644 6e9f57076de045c9480004435a76d53cb61518d9 i18n/ita/src/vs/workbench/services/files/node/fileService.i18n.json
-  our    100644 e98cc6a8898c4a14c4cb33730d4c482765f69ffa i18n/ita/src/vs/workbench/services/files/node/fileService.i18n.json
-@@ -9,6 +9,7 @@
- 	"fileInvalidPath": "Risorsa del file non valida ({0})",
- 	"fileIsDirectoryError": "Il File è una Directory",
- 	"fileNotModifiedError": "File non modificato dal giorno",
-+	"fileTooLargeForHeapError": "Le dimensioni del file superano il limite di memoria della finestra. Provare a eseguire il codice --max-memory=NEWSIZE",
- 	"fileTooLargeError": "File troppo grande per essere aperto",
- 	"fileNotFoundError": "Il file non è stato trovato ({0})",
- 	"fileBinaryError": "Il file sembra essere binario e non può essere aperto come file di testo",
-changed in both
-  base   100644 0717d0a3b57b3fc128ce2cff4fb9b56853a67890 i18n/jpn/extensions/emmet/package.i18n.json
-  our    100644 2ea428b8ba7cebbdb24c299af08c070b4291f172 i18n/jpn/extensions/emmet/package.i18n.json
-  their  100644 b9dfede706362480be74ec41e91be771dec9f2d8 i18n/jpn/extensions/emmet/package.i18n.json
-changed in both
-  base   100644 3ee785b5b1f91eb4575e9ba4e1aa574d7ecdb867 i18n/jpn/extensions/npm/package.i18n.json
-  our    100644 0ff30c62c2a3c39c26a5bdcdaa3a46a93a434f3e i18n/jpn/extensions/npm/package.i18n.json
-  their  100644 30c354046746c768b72163ea4bd4115bc66394cb i18n/jpn/extensions/npm/package.i18n.json
-@@ -12,6 +12,7 @@
- 	"config.npm.runSilent": "`--silent` オプションを使用して npm コマンドを実行する。",
- 	"config.npm.packageManager": "スクリプトを実行するために使用するパッケージ マネージャー。",
- 	"config.npm.exclude": "自動スクリプト検出から除外するフォルダーの glob パターンを構成します。",
-+<<<<<<< .our
- 	"config.npm.enableScriptExplorer": "npm スクリプトのエクスプ ローラー ビューを有効にします。",
- 	"config.npm.scriptExplorerAction": "スクリプトエクスプローラーで使用される規定のクリックアクション： 'open' または 'run' 、規定値は 'open' です。",
- 	"npm.parseError": "npmタスク検出: ファイル {0} の解析に失敗しました",
-@@ -23,4 +24,9 @@
- 	"command.debug": "デバッグ",
- 	"command.openScript": "Open",
- 	"command.runInstall": "インストールを実行"
-+=======
-+	"npm.parseError": "npmタスク検出: ファイル {0} の解析に失敗しました",
-+	"taskdef.script": "カスタマイズする npm スクリプト。",
-+	"taskdef.path": "スクリプトを提供する package.json ファイルのフォルダーへのパス。省略をすることができます。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 49f3920699e4c4564e99e734e805b02e6556265c i18n/jpn/extensions/php/package.i18n.json
-  our    100644 16bb0ef7ca18648009f9c673553f431c802597ac i18n/jpn/extensions/php/package.i18n.json
-  their  100644 c5c7d5d62ef6debf83c266f2e9832efa4f9e007c i18n/jpn/extensions/php/package.i18n.json
-@@ -6,6 +6,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "PHP の基本言語サポート",
- 	"description": "PHP ファイル内に構文ハイライト、かっこ一致を提供します。"
-+=======
-+	"configuration.suggest.basic": "組み込みの PHP 言語候補機能を有効にするかどうかを設定します。このサポートによって、PHP グローバルと変数の候補が示されます。",
-+	"configuration.validate.enable": "組み込みの PHP 検証を有効/無効にします。",
-+	"configuration.validate.executablePath": "PHP 実行可能ファイルを指定します。",
-+	"configuration.validate.run": "リンターを保存時に実行するか、入力時に実行するか。",
-+	"configuration.title": "PHP",
-+	"commands.categroy.php": "PHP",
-+	"command.untrustValidationExecutable": "PHP の検証を無効にします (ワークスペース設定として定義)。",
-+	"displayName": "PHP 言語機能",
-+	"description": "PHP ファイルの IntelliSense、リンティング、および基本言語サポートを提供します。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 78e5ce26eb0dd5cc573eda49089156067557fabd i18n/jpn/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  our    100644 315725569baa57f717837a92f6063936d11bab98 i18n/jpn/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  their  100644 2abf82cf890618264918f6497de6c974139d74e4 i18n/jpn/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-changed in both
-  base   100644 eecdb8d682c99ca9b876c12c16c86d3e4d611f71 i18n/jpn/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  our    100644 0b1e88174f8c1130b80c4aca55d2f619b3175c2c i18n/jpn/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  their  100644 4222ad5ea5d08e9aa9f4dc3a6bc1ad1a711566a4 i18n/jpn/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-@@ -17,6 +17,23 @@
- 	"issueTitleLabel": "題名",
- 	"issueTitleRequired": "題名を入力してください",
- 	"titleLengthValidation": "タイトルが長すぎます。",
-+<<<<<<< .our
-+=======
-+	"systemInfo": "私のシステム情報",
-+	"sendData": "データを送信する",
-+	"processes": "現在実行中のプロセス",
-+	"workspaceStats": "私のワークスペースのステータス",
-+	"extensions": "私の拡張機能",
-+	"searchedExtensions": "見つかった拡張機能",
-+	"settingsSearchDetails": "設定検索の詳細",
-+	"tryDisablingExtensions": "拡張機能が無効な場合に問題は再現可能ですか?",
-+	"yes": "はい",
-+	"no": "いいえ",
-+	"disableExtensionsLabelText": "{0} を実行後に問題を再現してみてください。",
-+	"disableExtensions": "すべての拡張機能を無効にしてウィンドウを再読みする",
-+	"showRunningExtensionsLabelText": "拡張機能の問題と疑われる場合、拡張機能の問題を報告するために {0} を実行してください。",
-+	"showRunningExtensions": "すべての実行中の拡張機能を表示する",
-+>>>>>>> .their
- 	"details": "詳細を入力してください。",
- 	"sendSystemInfo": "自分のシステム情報 ({0}) を含める",
- 	"show": "表示",
-changed in both
-  base   100644 4cd87e974bd11e5db967fa68a346afda5a4d16ea i18n/jpn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 64efa1b1dbf8d2e7a5e45feb436be37921131cc7 i18n/jpn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 d9c8c1e7d10af73bf5c920096277244e8bcf0ea8 i18n/jpn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -15,7 +15,11 @@
- 	"errorInstallingDependencies": "依存関係のインストール中にエラーが発生しました。{0}",
- 	"MarketPlaceDisabled": "Marketplace が有効になっていません",
- 	"removeError": "拡張機能の削除中にエラーが発生しました: {0}。もう一度やり直す前に、VS Code の終了と起動を実施してください。",
-+<<<<<<< .our
- 	"Not a Marketplace extension": "Marketplace の拡張機能のみ再インストールできます",
-+=======
-+	"Not Market place extension": "Marketplace の拡張機能のみ再インストールできます",
-+>>>>>>> .their
- 	"notFoundCompatible": "'{0}' をインストールできません。VS Code '{1}' と互換性がある利用可能なバージョンがありません。",
- 	"malicious extension": "問題が報告されたので、拡張機能をインストールできません。",
- 	"notFoundCompatibleDependency": "VS Code の現在のバージョン '{1}'  と互換性を持つ、依存関係がある拡張機能 '{0}' が見つからないため、インストールできません。",
-changed in both
-  base   100644 f65da6ed297aea0b27e05d727d76e95cf006b81e i18n/jpn/src/vs/workbench/common/theme.i18n.json
-  our    100644 b14021a35078518051aec469e7adb4b85583e1c9 i18n/jpn/src/vs/workbench/common/theme.i18n.json
-  their  100644 ec711f49239bd27493e900636dc68796ba348b08 i18n/jpn/src/vs/workbench/common/theme.i18n.json
-changed in both
-  base   100644 5a8a58b378fdff8efd173c6e89e3c9e4120ce459 i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  our    100644 d168fc00cabeef774dd62a25d5a22dff669da924 i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  their  100644 540682766422610ba25b8b618129672b02615d02 i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-@@ -27,6 +27,9 @@
- 	"onFirstSessionStart": "初めてデバッグが開始されたときのみステータス バーにデバッグを表示する",
- 	"showInStatusBar": "デバッグのステータス バーが表示されるタイミングを制御",
- 	"openDebug": "デバッグ ビューを開くか、デバッグ セッションを開始するかを制御します。",
-+<<<<<<< .our
- 	"enableAllHovers": "デバッグ中に非デバッグ ホバーを有効にするかどうかを制御します。true の場合、ホバーを提供するためにホバー プロバイダーが呼び出されます。この設定が true でも通常のホバーは表示されません。",
-+=======
-+>>>>>>> .their
- 	"launch": "グローバル デバッグ起動構成。ワークスペース間で共有される 'launch.json' の代わりとして使用する必要があります"
- }
-\ No newline at end of file
-changed in both
-  base   100644 e1471c50bd72d584a3ccab7d15f1322e0730506b i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 69dc63c434a809f92bc13d405e990c05feb2db91 i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 66b620800278383d68e6c3d828827e1d50ef733e i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-@@ -14,7 +14,11 @@
- 	"uninstallAction": "アンインストール",
- 	"Uninstalling": "アンインストールしています",
- 	"updateAction": "更新",
-+<<<<<<< .our
- 	"updateTo": "{0} に更新",
-+=======
-+	"updateTo": "{0} に更新します",
-+>>>>>>> .their
- 	"failedToUpdate": "'{0}' を更新できませんでした。",
- 	"ManageExtensionAction.uninstallingTooltip": "アンインストールしています",
- 	"enableForWorkspaceAction": "有効にする (ワークスペース)",
-changed in both
-  base   100644 1472c6ff61d7c8bb595d102f03b963cc8ffb892d i18n/jpn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 d63dc1c7de64299d00cc648c70a452e18abf1957 i18n/jpn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 2fde4d268c7dcaa9b0c1547f77f5cbfb0b878c9c i18n/jpn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -31,5 +31,9 @@
- 	"search.followSymlinks": "検索中にシンボリック リンクをたどるかどうかを制御します。",
- 	"search.smartCase": "すべて小文字のパターンの場合、大文字と小文字を区別しないで検索し、そうでない場合は大文字と小文字を区別して検索する",
- 	"search.globalFindClipboard": "macOS で検索ビューが共有の検索クリップボードを読み取りまたは変更するかどうかを制御します",
-+<<<<<<< .our
- 	"search.location": "検索をサイドバーのビューとして表示するか、より水平方向の空間をとるためにパネル領域のパネルとして表示するかを制御します。"
-+=======
-+	"search.location": "プレビュー: 検索をサイドバーのビューとして表示するか、より水平方向の空間をとるためにパネル領域のパネルとして表示するかを制御します。次のリリースのパネル内の検索で水平レイアウトが改善され、プレビューではなくなります。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a29524846a2bff6fe97f7f45dbe2003cad2c1f94 i18n/jpn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 be4c3ee187a4c958a13a55a867d75c42dce31777 i18n/jpn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 07e679a1ed845b4cc7fab54412e060fe4dcc8bf6 i18n/jpn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -15,6 +15,10 @@
- 	"updateIsReady": "新しい更新 {0} が利用可能です。",
- 	"noUpdatesAvailable": "現在入手可能な更新はありません。",
- 	"ok": "OK",
-+<<<<<<< .our
-+=======
-+	"download now": "今すぐダウンロード",
-+>>>>>>> .their
- 	"thereIsUpdateAvailable": "利用可能な更新プログラムがあります。",
- 	"download now": "今すぐダウンロード",
- 	"later": "後で",
-changed in both
-  base   100644 edd7f28fedabcf3e80a7382ef3e74f340e931462 i18n/jpn/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
-  our    100644 f04ca84fa1ed82e94a0a99150d8762f7d1578638 i18n/jpn/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
-  their  100644 96725800f8021388efa82ed1f449009b06429f70 i18n/jpn/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
-changed in both
-  base   100644 6833fda84fd9fe993ecc5d69a7c6cffeec2fc4bc i18n/kor/extensions/css/package.i18n.json
-  our    100644 2d4d9da9391916e94d45c5f0a1fe31764372d347 i18n/kor/extensions/css/package.i18n.json
-  their  100644 43cc6cb4724d6aa11dfd7519fc8d158eab7f52bf i18n/kor/extensions/css/package.i18n.json
-@@ -6,6 +6,81 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "CSS 언어 기본",
- 	"description": "CSS,LESS,SCSS 파일에서 구문 강조 표시와 괄호 일치를 제공합니다."
-+=======
-+	"displayName": "CSS 언어 기능",
-+	"description": "CSS, LESS 및 SCSS 파일에 대한 다양한 언어 지원을 제공합니다.",
-+	"css.title": "CSS",
-+	"css.lint.argumentsInColorFunction.desc": "잘못된 매개 변수 수",
-+	"css.lint.boxModel.desc": "패딩 또는 테두리를 사용하는 경우 너비 또는 높이를 사용하지 마세요.",
-+	"css.lint.compatibleVendorPrefixes.desc": "공급업체 관련 접두사를 사용할 경우 다른 모든 공급업체 관련 속성도 포함합니다.",
-+	"css.lint.duplicateProperties.desc": "중복된 스타일 정의를 사용하지 마세요.",
-+	"css.lint.emptyRules.desc": "빈 규칙 집합을 사용하지 마세요.",
-+	"css.lint.float.desc": "'float'를 사용하지 않도록 합니다. Float를 사용하면 레이아웃의 한쪽이 바뀔 경우 CSS가 쉽게 깨질 수 있습니다.",
-+	"css.lint.fontFaceProperties.desc": "@font-face 규칙에서 'src' 및 'font-family' 속성을 정의해야 합니다.",
-+	"css.lint.hexColorLength.desc": "16진수 색은 3개 또는 6개의 16진수로 구성되어야 합니다.",
-+	"css.lint.idSelector.desc": "이러한 규칙은 HTML과 긴밀하게 결합되므로 선택기에 ID를 포함하면 안 됩니다.",
-+	"css.lint.ieHack.desc": "IE 핵(Hack)은 IE7 이상을 지원할 때만 필요합니다.",
-+	"css.lint.important.desc": "!important는 사용하지 않도록 합니다. 이것은 전체 CSS의 특정성에 문제가 있어서 리팩터링해야 함을 나타냅니다.",
-+	"css.lint.importStatement.desc": "Import 문은 병렬로 로드되지 않습니다.",
-+	"css.lint.propertyIgnoredDueToDisplay.desc": "display 때문에 속성이 무시됩니다. 예를 들어 'display: inline'을 사용할 경우 width, height, margin-top, margin-bottom 및 float 속성은 적용되지 않습니다.",
-+	"css.lint.universalSelector.desc": "범용 선택기 (*)는 느린 것으로 알려져 있습니다.",
-+	"css.lint.unknownProperties.desc": "알 수 없는 속성입니다.",
-+	"css.lint.unknownVendorSpecificProperties.desc": "알 수 없는 공급업체 관련 속성입니다.",
-+	"css.lint.vendorPrefix.desc": "공급업체 관련 접두사를 사용할 때 표준 속성도 포함합니다.",
-+	"css.lint.zeroUnits.desc": "0에는 단위가 필요하지 않습니다.",
-+	"css.trace.server.desc": "VS Code와 CSS 언어 서버 간 통신을 추적합니다.",
-+	"css.validate.title": "CSS 유효성 검사 및 문제 심각도를 제어합니다.",
-+	"css.validate.desc": "모든 유효성 검사 사용 또는 사용 안 함",
-+	"less.title": "LESS",
-+	"less.lint.argumentsInColorFunction.desc": "잘못된 매개 변수 수",
-+	"less.lint.boxModel.desc": "패딩 또는 테두리를 사용하는 경우 너비 또는 높이를 사용하지 마세요.",
-+	"less.lint.compatibleVendorPrefixes.desc": "공급업체 관련 접두사를 사용할 경우 다른 모든 공급업체 관련 속성도 포함합니다.",
-+	"less.lint.duplicateProperties.desc": "중복된 스타일 정의를 사용하지 마세요.",
-+	"less.lint.emptyRules.desc": "빈 규칙 집합을 사용하지 마세요.",
-+	"less.lint.float.desc": "'float'를 사용하지 않도록 합니다. Float를 사용하면 레이아웃의 한쪽이 바뀔 경우 CSS가 쉽게 깨질 수 있습니다.",
-+	"less.lint.fontFaceProperties.desc": "@font-face 규칙에서 'src' 및 'font-family' 속성을 정의해야 합니다.",
-+	"less.lint.hexColorLength.desc": "16진수 색은 3개 또는 6개의 16진수로 구성되어야 합니다.",
-+	"less.lint.idSelector.desc": "이러한 규칙은 HTML과 긴밀하게 결합되므로 선택기에 ID를 포함하면 안 됩니다.",
-+	"less.lint.ieHack.desc": "IE 핵(Hack)은 IE7 이상을 지원할 때만 필요합니다.",
-+	"less.lint.important.desc": "!important는 사용하지 않도록 합니다. 이것은 전체 CSS의 특정성에 문제가 있어서 리팩터링해야 함을 나타냅니다.",
-+	"less.lint.importStatement.desc": "Import 문은 병렬로 로드되지 않습니다.",
-+	"less.lint.propertyIgnoredDueToDisplay.desc": "display 때문에 속성이 무시됩니다. 예를 들어 'display: inline'을 사용할 경우 width, height, margin-top, margin-bottom 및 float 속성은 적용되지 않습니다.",
-+	"less.lint.universalSelector.desc": "범용 선택기 (*)는 느린 것으로 알려져 있습니다.",
-+	"less.lint.unknownProperties.desc": "알 수 없는 속성입니다.",
-+	"less.lint.unknownVendorSpecificProperties.desc": "알 수 없는 공급업체 관련 속성입니다.",
-+	"less.lint.vendorPrefix.desc": "공급업체 관련 접두사를 사용할 때 표준 속성도 포함합니다.",
-+	"less.lint.zeroUnits.desc": "0에는 단위가 필요하지 않습니다.",
-+	"less.validate.title": "LESS 유효성 검사 및 문제 심각도를 제어합니다.",
-+	"less.validate.desc": "모든 유효성 검사 사용 또는 사용 안 함",
-+	"scss.title": "SCSS(Sass)",
-+	"scss.lint.argumentsInColorFunction.desc": "잘못된 매개 변수 수",
-+	"scss.lint.boxModel.desc": "패딩 또는 테두리를 사용하는 경우 너비 또는 높이를 사용하지 마세요.",
-+	"scss.lint.compatibleVendorPrefixes.desc": "공급업체 관련 접두사를 사용할 경우 다른 모든 공급업체 관련 속성도 포함합니다.",
-+	"scss.lint.duplicateProperties.desc": "중복된 스타일 정의를 사용하지 마세요.",
-+	"scss.lint.emptyRules.desc": "빈 규칙 집합을 사용하지 마세요.",
-+	"scss.lint.float.desc": "'float'를 사용하지 않도록 합니다. Float를 사용하면 레이아웃의 한쪽이 바뀔 경우 CSS가 쉽게 깨질 수 있습니다.",
-+	"scss.lint.fontFaceProperties.desc": "@font-face 규칙에서 'src' 및 'font-family' 속성을 정의해야 합니다.",
-+	"scss.lint.hexColorLength.desc": "16진수 색은 3개 또는 6개의 16진수로 구성되어야 합니다.",
-+	"scss.lint.idSelector.desc": "이러한 규칙은 HTML과 긴밀하게 결합되므로 선택기에 ID를 포함하면 안 됩니다.",
-+	"scss.lint.ieHack.desc": "IE 핵(Hack)은 IE7 이상을 지원할 때만 필요합니다.",
-+	"scss.lint.important.desc": "!important는 사용하지 않도록 합니다. 이것은 전체 CSS의 특정성에 문제가 있어서 리팩터링해야 함을 나타냅니다.",
-+	"scss.lint.importStatement.desc": "Import 문은 병렬로 로드되지 않습니다.",
-+	"scss.lint.propertyIgnoredDueToDisplay.desc": "display 때문에 속성이 무시됩니다. 예를 들어 'display: inline'을 사용할 경우 width, height, margin-top, margin-bottom 및 float 속성은 적용되지 않습니다.",
-+	"scss.lint.universalSelector.desc": "범용 선택기 (*)는 느린 것으로 알려져 있습니다.",
-+	"scss.lint.unknownProperties.desc": "알 수 없는 속성입니다.",
-+	"scss.lint.unknownVendorSpecificProperties.desc": "알 수 없는 공급업체 관련 속성입니다.",
-+	"scss.lint.vendorPrefix.desc": "공급업체 관련 접두사를 사용할 때 표준 속성도 포함합니다.",
-+	"scss.lint.zeroUnits.desc": "0에는 단위가 필요하지 않습니다.",
-+	"scss.validate.title": "SCSS 유효성 검사 및 문제 심각도를 제어합니다.",
-+	"scss.validate.desc": "모든 유효성 검사 사용 또는 사용 안 함",
-+	"less.colorDecorators.enable.desc": "색 데코레이터 사용 또는 사용 안 함",
-+	"scss.colorDecorators.enable.desc": "색 데코레이터 사용 또는 사용 안 함",
-+	"css.colorDecorators.enable.desc": "색 데코레이터 사용 또는 사용 안 함",
-+	"css.colorDecorators.enable.deprecationMessage": "`css.colorDecorators.enable` 설정은 `editor.colorDecorators`를 위해 사용되지 않습니다.",
-+	"scss.colorDecorators.enable.deprecationMessage": "`scss.colorDecorators.enable` 설정은 `editor.colorDecorators`를 위해 사용되지 않습니다.",
-+	"less.colorDecorators.enable.deprecationMessage": "`less.colorDecorators.enable` 설정은 `editor.colorDecorators`를 위해 사용되지 않습니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7c2f62ae857a71460cfa286ac07494410c41c835 i18n/kor/extensions/emmet/package.i18n.json
-  our    100644 517fee7baf0c3ecd5ff03235a1df00c583e6985b i18n/kor/extensions/emmet/package.i18n.json
-  their  100644 d4ae14fedae69f26e2d66f03d9af438fd5f188ee i18n/kor/extensions/emmet/package.i18n.json
-@@ -59,7 +59,11 @@
- 	"emmetPreferencesCssWebkitProperties": "`-`로 시작하는 Emmet 약어에서 사용될 때 'webkit' 공급업체 접두사를 가져오는 쉼표로 구분된 CSS 속성입니다. 항상 'webkit' 접두사를 사용하지 않으려면 빈 문자열로 설정합니다.",
- 	"emmetPreferencesCssMozProperties": "`-`로 시작하는 Emmet 약어에서 사용될 때 'moz' 공급업체 접두사를 가져오는 쉼표로 구분된 CSS 속성입니다. 항상 'moz' 접두사를 사용하지 않으려면 빈 문자열로 설정합니다.",
- 	"emmetPreferencesCssOProperties": "`-`로 시작하는 emmet 약어에서 사용할 때 'o' 공급업체 접두사를 가져오는 쉼표로 구분된 CSS 속성입니다. 항상 'o' 접두사를 사용하지 않으려면 빈 문자열로 설정합니다.",
-+<<<<<<< .our
- 	"emmetPreferencesCssMsProperties": "`-`로 시작하는 emmet 약어에서 사용할 때 'ms' 공급업체 접두사를 가져오는 쉼표로 구분된 CSS 속성입니다. 항상 'ms' 접두사를 사용하지 않으려면 빈 문자열로 설정합니다.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "유사 일치 약어가 획득해야 하는 최소 점수(0에서 1 사이)입니다. 값이 낮을수록 가양성 일치 항목이 늘 수 있고, 값이 높을수록 가능한 일치 항목이 줄 수 있습니다.",
- 	"emmetOptimizeStylesheetParsing": "False로 설정할 경우 전체 파일이 구문 분석되어 현재 위치가 Emmet 약어 확장에 유효한지 확인합니다. True로 설정할 경우 css/scss/less 파일에서 현재 위치 주변의 콘텐츠만 구문 분석합니다."
-+=======
-+	"emmetPreferencesCssMsProperties": "`-`로 시작하는 emmet 약어에서 사용할 때 'ms' 공급업체 접두사를 가져오는 쉼표로 구분된 CSS 속성입니다. 항상 'ms' 접두사를 사용하지 않으려면 빈 문자열로 설정합니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 bff6239e1e3dfd310d3052011a01a5cba13f8355 i18n/kor/extensions/git/package.i18n.json
-  our    100644 3703ac48f99d1ed061418ae09d45c9f7e6e3d128 i18n/kor/extensions/git/package.i18n.json
-  their  100644 07838b84a85b8a763a8bef5601699ce4b5778064 i18n/kor/extensions/git/package.i18n.json
-changed in both
-  base   100644 260733d5e598ccc5311101a9b5c9c70c899bccb6 i18n/kor/extensions/html/package.i18n.json
-  our    100644 0801cef7b57b962a0bdfa42be6a016e76501c2ef i18n/kor/extensions/html/package.i18n.json
-  their  100644 a71b4df8880e17c8215b8c639b2aa3682a2aaa6e i18n/kor/extensions/html/package.i18n.json
-@@ -6,6 +6,34 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "HTML 언어 기본",
- 	"description": "HTML 파일에서 구문 강조 표시, 괄호 일치 및 코드 조각을 제공합니다."
-+=======
-+	"displayName": "HTML 언어 기능",
-+	"description": "HTML, Razor 및 Handlebar 파일에 대한 다양한 언어 지원을 제공합니다.",
-+	"html.format.enable.desc": "기본 HTML 포맷터를 사용하거나 사용하지 않습니다.",
-+	"html.format.wrapLineLength.desc": "한 줄당 최대 문자 수입니다(0 = 사용 안 함).",
-+	"html.format.unformatted.desc": "쉼표로 분리된 태그 목록으로, 서식을 다시 지정해서는 안 됩니다. https://www.w3.org/TR/html5/dom.html#phrasing-content에 나열된 모든 태그의 기본값은 'null'로 설정됩니다.",
-+	"html.format.contentUnformatted.desc": "쉼표로 분리된 태그 목록으로, 콘텐츠의 서식을 다시 지정해서는 안 됩니다. 'pre' 태그의 기본값은 'null'로 설정됩니다.",
-+	"html.format.indentInnerHtml.desc": "<head> 및 <body> 섹션을 들여쓰기합니다.",
-+	"html.format.preserveNewLines.desc": "요소 앞에 있는 기존 줄 바꿈의 유지 여부입니다. 요소 앞에만 적용되며 태그 안이나 텍스트에는 적용되지 않습니다.",
-+	"html.format.maxPreserveNewLines.desc": "청크 한 개에 유지할 수 있는 최대 줄 바꿈 수입니다. 무제한일 때는 'null'을 사용합니다.",
-+	"html.format.indentHandlebars.desc": "{{#foo}} 및 {{/foo}}를 서식 지정하고 들여쓰기합니다.",
-+	"html.format.endWithNewline.desc": "줄 바꿈으로 끝납니다.",
-+	"html.format.extraLiners.desc": "쉼표로 분리된 태그 목록으로 앞에 줄 바꿈을 추가로 넣어야 합니다. \"head, body, /html\"의 기본값은 'null'로 설정됩니다.",
-+	"html.format.wrapAttributes.desc": "특성을 래핑합니다.",
-+	"html.format.wrapAttributes.auto": "줄 길이를 초과하는 경우에만 특성을 래핑합니다.",
-+	"html.format.wrapAttributes.force": "첫 번째 특성을 제외한 각 특성을 래핑합니다.",
-+	"html.format.wrapAttributes.forcealign": "첫 번째 특성을 제외한 각 특성을 래핑하고 정렬된 상태를 유지합니다.",
-+	"html.format.wrapAttributes.forcemultiline": "각 특성을 래핑합니다.",
-+	"html.suggest.angular1.desc": "기본 제공 HTML 언어 지원에서 Angular V1 태그 및 속성을 제안하는지 여부를 구성합니다.",
-+	"html.suggest.ionic.desc": "기본 제공 HTML 언어 지원에서 Ionic 태그, 속성 및 값을 제안하는지 여부를 구성합니다.",
-+	"html.suggest.html5.desc": "기본 제공 HTML 언어 지원에서 HTML5 태그, 속성 및 값을 제안하는지 여부를 구성합니다.",
-+	"html.trace.server.desc": "VS Code와 HTML 언어 서버 간 통신을 추적합니다.",
-+	"html.validate.scripts": "기본 제공 HTML 언어 지원에서 포함 스크립트의 유효성을 검사하는지 여부를 구성합니다.",
-+	"html.validate.styles": "기본 제공 HTML 언어 지원에서 포함 스타일의 유효성을 검사하는지 여부를 구성합니다.",
-+	"html.experimental.syntaxFolding": "구문 인식 접기 마커를 설정하거나 해제합니다.",
-+	"html.autoClosingTags": "HTML 태그의 자동 닫기를 사용하거나 사용하지 않습니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 9625aae32014f203c97042aa6f72b44f56740f4b i18n/kor/extensions/jake/package.i18n.json
-  our    100644 f83be6fbb645020bd2fd7a1c0c9298f9d47dc2f8 i18n/kor/extensions/jake/package.i18n.json
-  their  100644 2dcfc03464b050977bd26a3c0528b8feeff35dc1 i18n/kor/extensions/jake/package.i18n.json
-@@ -6,7 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"description": "VSCode에 Jake 기능을 추가할 확장입니다.",
-+=======
-+>>>>>>> .their
- 	"displayName": "VSCode에 대한 Jake 지원",
- 	"jake.taskDefinition.type.description": "사용자 지정할 Jake 작업입니다.",
- 	"jake.taskDefinition.file.description": "작업을 제공하는 Jake 파일이며 생략할 수 있습니다.",
-changed in both
-  base   100644 bcc11ebefb58056d702eafb3b72dd4e8878a392f i18n/kor/extensions/json/package.i18n.json
-  our    100644 c63982946ed351ad61f5ab7f8e00843d4a6de447 i18n/kor/extensions/json/package.i18n.json
-  their  100644 3adf4f967d1ae9f63e5c520a0f541f335bdd74b1 i18n/kor/extensions/json/package.i18n.json
-@@ -6,6 +6,21 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "JSON 언어 기본",
- 	"description": "JSON 파일에서 구문 강조 표시 및 괄호 일치를 제공합니다. "
-+=======
-+	"displayName": "JSON 언어 기능",
-+	"description": "JSON 파일에 대한 다양한 언어 지원을 제공합니다.",
-+	"json.schemas.desc": "현재 프로젝트에서 스키마를 JSON 파일에 연결",
-+	"json.schemas.url.desc": "현재 디렉터리에 있는 스키마의 URL 또는 상대 경로",
-+	"json.schemas.fileMatch.desc": "스키마에 대한 JSON 파일을 확인할 때 일치할 파일 패턴의 배열입니다.",
-+	"json.schemas.fileMatch.item.desc": "스키마에 대한 JSON 파일을 확인할 때 일치할 '*'를 포함할 수 있는 파일 패턴입니다.",
-+	"json.schemas.schema.desc": "지정된 URL에 대한 스키마 정의입니다. 스키마 URL에 대한 액세스 방지를 위해서만 스키마를 제공해야 합니다.",
-+	"json.format.enable.desc": "기본 JSON 포맷터 사용/사용 안 함(다시 시작해야 함)",
-+	"json.tracing.desc": "VS Code와 JSON 언어 서버 간 통신을 추적합니다.",
-+	"json.colorDecorators.enable.desc": "색 데코레이터 사용 또는 사용 안 함",
-+	"json.colorDecorators.enable.deprecationMessage": "`json.colorDecorators.enable` 설정은 `editor.colorDecorators`를 위해 사용되지 않습니다.",
-+	"json.experimental.syntaxFolding": "구문 인식 접기 마커를 설정하거나 해제합니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e15fa853892e4cd302f60d6f39b1a1d7f3c20041 i18n/kor/extensions/npm/package.i18n.json
-  our    100644 b762a88ac6b09e3d0033e37c5db538576d49fc4b i18n/kor/extensions/npm/package.i18n.json
-  their  100644 316421231adc9474f7725a968c37bcafd80c61be i18n/kor/extensions/npm/package.i18n.json
-@@ -12,6 +12,7 @@
- 	"config.npm.runSilent": " `--silent` 옵션으로 npm 명령 실행.",
- 	"config.npm.packageManager": "스크립트를 실행하는 데 사용하는 패키지 관리자.",
- 	"config.npm.exclude": "자동 스크립트 검색에서 제외할 폴더에 대한 Glob 패턴을 구성합니다.",
-+<<<<<<< .our
- 	"config.npm.enableScriptExplorer": "npm 스크립트에 대한 탐색기 뷰를 사용하도록 설정합니다.",
- 	"config.npm.scriptExplorerAction": "스크립트 탐색기에서 사용되는 기본 클릭 동작으로 '열기' 또는 '실행'이며, 기본값은 '열기'입니다.",
- 	"npm.parseError": "Npm 작업 검색: {0} 파일을 구문 분석하지 못했습니다.",
-@@ -23,4 +24,9 @@
- 	"command.debug": "디버그",
- 	"command.openScript": "열기",
- 	"command.runInstall": "설치 실행"
-+=======
-+	"npm.parseError": "Npm 작업 검색: {0} 파일을 구문 분석하지 못했습니다.",
-+	"taskdef.script": "사용자 지정할 npm 스크립트입니다.",
-+	"taskdef.path": "스크립트를 제공하는 package.json 파일의 폴더에 대한 경로이며 생략할 수 있습니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ce478e07c683af95b205479d5e2325b138ea41a7 i18n/kor/extensions/php/package.i18n.json
-  our    100644 ad3f734a9df9cce84d996510442fc460749c7d2b i18n/kor/extensions/php/package.i18n.json
-  their  100644 c12a9f13cf2ed202bb601280e075b728718babc1 i18n/kor/extensions/php/package.i18n.json
-@@ -6,6 +6,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "PHP 언어 기본",
- 	"description": "PHP 파일에서 구문 강조 표시 및 괄호 일치를 제공합니다. "
-+=======
-+	"configuration.suggest.basic": "기본 제공 PHP 언어 제안을 사용하는지 여부를 구성합니다. 지원에서는 PHP 전역 및 변수를 제안합니다.",
-+	"configuration.validate.enable": "기본 제공 PHP 유효성 검사를 사용하거나 사용하지 않습니다.",
-+	"configuration.validate.executablePath": "PHP 실행 파일을 가리킵니다.",
-+	"configuration.validate.run": "저장 시 또는 입력 시 Linter의 실행 여부입니다.",
-+	"configuration.title": "PHP",
-+	"commands.categroy.php": "PHP",
-+	"command.untrustValidationExecutable": "PHP 유효성 검사 실행 파일을 허용하지 않음(작업\n 영역 설정으로 정의됨)",
-+	"displayName": "PHP 언어 기능",
-+	"description": "PHP 파일에 대해 IntelliSense, lint 및 언어 기본을 제공합니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 2d8e4964a4702bad8c56075e8687ba20bf261b82 i18n/kor/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  our    100644 76588bffb73908d0aeec139d2a389b29a4d2f55f i18n/kor/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  their  100644 f09203d420b80982c8e2c65c2c3a6536c3853f5a i18n/kor/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-@@ -14,9 +14,14 @@
- 	"similarIssues": "유사한 문제",
- 	"open": "열기",
- 	"closed": "닫힘",
-+<<<<<<< .our
- 	"noSimilarIssues": "검색된 유사한 문제 없음",
-+=======
-+	"noResults": "결과 없음",
-+>>>>>>> .their
- 	"settingsSearchIssue": "설정 검색 문제",
- 	"bugReporter": "버그 보고서",
-+	"performanceIssue": "성능 문제",
- 	"featureRequest": "기능 요청",
- 	"performanceIssue": "성능 문제",
- 	"stepsToReproduce": "재현 단계",
-changed in both
-  base   100644 0b7e91f8916cb6838b3a0a0e7ec095a5540d5538 i18n/kor/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  our    100644 ff0a015d193c699649f7844d926e630dbc9f9f24 i18n/kor/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  their  100644 838b50751aa27442c3583a57021b0cb8ecbf5ea5 i18n/kor/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-@@ -8,6 +8,7 @@
- 	],
- 	"completeInEnglish": "양식을 영어로 작성해 주세요.",
- 	"issueTypeLabel": "이것은",
-+<<<<<<< .our
- 	"issueSourceLabel": "제출 대상",
- 	"vscode": "Visual Studio Code",
- 	"extension": "확장",
-@@ -25,4 +26,25 @@
- 	"sendExtensions": "사용하도록 설정된 확장 포함({0})",
- 	"sendSearchedExtensions": "검색된 확장 보내기({0})",
- 	"sendSettingsSearchDetails": "설정 검색 세부 정보 보내기({0})"
-+=======
-+	"issueTitleLabel": "제목",
-+	"issueTitleRequired": "제목을 입력하세요.",
-+	"titleLengthValidation": "제목이 너무 깁니다.",
-+	"systemInfo": "내 시스템 정보",
-+	"sendData": "내 데이터 보내기",
-+	"processes": "현재 실행 중인 프로세스",
-+	"workspaceStats": "내 작업 영역 통계",
-+	"extensions": "내 확장",
-+	"searchedExtensions": "검색된 확장",
-+	"settingsSearchDetails": "설정 검색 세부 정보",
-+	"tryDisablingExtensions": "확장을 사용하지 않도록 설정해도 문제 재현이 가능한가요?",
-+	"yes": "예",
-+	"no": "아니요",
-+	"disableExtensionsLabelText": "{0} 후 문제를 재현해 보세요.",
-+	"disableExtensions": "모든 확장을 사용하지 않도록 설정하고 창 다시 로드",
-+	"showRunningExtensionsLabelText": "확장 문제로 의심되면 {0}에서 확장에 대한 문제를 보고하세요.",
-+	"showRunningExtensions": "모든 실행 중인 확장 보기",
-+	"details": "상세 내용을 입력하세요.",
-+	"loadingData": "데이터 로드 중..."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 9f4ca8b8ff9b74f13510f80917f214ea41d9a5d3 i18n/kor/src/vs/code/electron-main/menus.i18n.json
-  our    100644 a3a33ffe4d84057c71074e546cdf9a1e5529a6c8 i18n/kor/src/vs/code/electron-main/menus.i18n.json
-  their  100644 128f36b11087dd8086252293dbea93f455e9e72f i18n/kor/src/vs/code/electron-main/menus.i18n.json
-changed in both
-  base   100644 61a1a9f0adf21f8fb92144c28af97d1d729ee4b7 i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 c148a56d8d67892505611b68cdd18b2ba3428134 i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 37b495515753be0ea7c435355ceefd00cd3d969a i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -17,7 +17,10 @@
- 	"editorActiveIndentGuide": "활성 편집기 들여쓰기 안내선 색입니다.",
- 	"editorLineNumbers": "편집기 줄 번호 색입니다.",
- 	"editorActiveLineNumber": "편집기 활성 영역 줄번호 색상",
-+<<<<<<< .our
- 	"deprecatedEditorActiveLineNumber": "ID는 사용되지 않습니다. 대신 'editorLineNumber.activeForeground'를 사용하세요.",
-+=======
-+>>>>>>> .their
- 	"editorRuler": "편집기 눈금의 색상입니다.",
- 	"editorCodeLensForeground": "편집기 코드 렌즈의 전경색입니다.",
- 	"editorBracketMatchBackground": "일치하는 괄호 뒤의 배경색",
-changed in both
-  base   100644 042b7c91d0d196cd3c78cc5a55d2871b0294d0de i18n/kor/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 05518f96202309824a89dfbd3498bbcde7102ebd i18n/kor/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 76ee8e87f468b13970bc9d89cb2c1ac8317eb2ae i18n/kor/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -15,7 +15,11 @@
- 	"errorInstallingDependencies": "의존성 설치 중 오류가 발생했습니다. {0}",
- 	"MarketPlaceDisabled": "Marketplace를 사용할 수 없습니다.",
- 	"removeError": "확장을 제거하는 동안 오류가 발생했습니다. {0}. 다시 시도하기 전에 VS Code를 종료하고 다시 시작하세요.",
-+<<<<<<< .our
- 	"Not a Marketplace extension": "마켓플레이스 확장만 다시 설치할 수 있습니다.",
-+=======
-+	"Not Market place extension": "마켓플레이스 확장만 다시 설치할 수 있습니다.",
-+>>>>>>> .their
- 	"notFoundCompatible": "'{0}'을(를) 설치할 수 없습니다; VS Code '{1}'과 호환되는 버전이 없습니다.",
- 	"malicious extension": "문제가 있다고 보고되었으므로 확장을 설치할 수 없습니다.",
- 	"notFoundCompatibleDependency": "VS Code의 현재 버전 '{1}'과(와) 호환되는 종속된 확장 '{0}'을(를) 찾을 수 없으므로 설치할 수 없습니다.",
-changed in both
-  base   100644 9167adb7494a6ecf514cc5afc6b339b858deecb7 i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 44b01274f5b039d38e4cfbd58f3d0758fa5d1e89 i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 fb0ab90f546838a84dd8996c065075d9d0ff54eb i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/kor/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
-  our    100644 b55013c7dfbbab3e0619140a2e5a36e2995626c6 i18n/kor/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
-  their  100644 4a956b0bd25c8e569e89018ad36902316da23629 i18n/kor/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
-@@ -6,5 +6,9 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"errorMessage": "뷰를 복원하는 중 오류 발생:{0}"
-+=======
-+	"webview.editor.label": "webview 편집기"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/kor/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
-  our    100644 68b015e8455b76ef0cb60f9d1fc920915e9d247e i18n/kor/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
-  their  100644 26c8431a513e25627906babc0e00552cb1959e07 i18n/kor/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
-@@ -6,7 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"notificationsEmpty": "새 알림 없음",
-+=======
-+>>>>>>> .their
- 	"notifications": "알림",
- 	"notificationsToolbar": "알림 센터 작업",
- 	"notificationsList": "알림 목록"
-changed in both
-  base   100644 23195cc34018a19c249c974c35b8383a046fcf5c i18n/kor/src/vs/workbench/common/theme.i18n.json
-  our    100644 634f6ea85a754d26140eeb8ed57e39a6ab596db9 i18n/kor/src/vs/workbench/common/theme.i18n.json
-  their  100644 b7ee5105a1af7ed722d9738ecd41eba003aa2ee2 i18n/kor/src/vs/workbench/common/theme.i18n.json
-changed in both
-  base   100644 89c2585d58b157ce8417a4482c8b5d4890f1a425 i18n/kor/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 e913e127345422fb81d57f13fd8b5c25a0d63e10 i18n/kor/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 2d9a4b3ee0bb0e9393976b4f10885205ab1145f7 i18n/kor/src/vs/workbench/electron-browser/actions.i18n.json
-changed in both
-  base   100644 36b4d629cfec5c76eee16b069b07b702a0a421ae i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 faff44b17686fcb835995d2bfd92efcfdcc183b1 i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 451b959a9ea98040f30fbff0b810098e63918438 i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
-changed in both
-  base   100644 bda2da1af753d24216f425f6a8ad7ffdeb508ebc i18n/kor/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  our    100644 0495fb536e2135803ed54cf092a02a6c8b292fd8 i18n/kor/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  their  100644 8a6f29b83bfa1eb654a6d4e7ad38962ed0a9b685 i18n/kor/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-@@ -17,7 +17,10 @@
- 	"breakpointUnverifieddHover": "확인되지 않은 중단점",
- 	"functionBreakpointUnsupported": "이 디버그 형식은 함수 중단점을 지원하지 않습니다.",
- 	"breakpointDirtydHover": "확인되지 않은 중단점입니다. 파일이 수정되었습니다. 디버그 세션을 다시 시작하세요.",
-+<<<<<<< .our
- 	"logBreakpointUnsupported": "이 디버그 형식에서 지원되지 않는 logpoint",
-+=======
-+>>>>>>> .their
- 	"conditionalBreakpointUnsupported": "이 디버그 형식에서 지원되지 않는 조건부 중단점",
- 	"hitBreakpointUnsupported": "이 디버그 형식은 조건부 중단점 적중을 지원하지 않습니다."
- }
-\ No newline at end of file
-changed in both
-  base   100644 5d63b420a5a624c3b893f8a6eba47cdb598aa33e i18n/kor/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
-  our    100644 7928624aeb466e2c4725ae00559a1e4c299ebd08 i18n/kor/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
-  their  100644 dbd802f3d714ba815db4063b29c74b9a1e7a3087 i18n/kor/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
-@@ -7,7 +7,11 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"noFolderDebugConfig": "고급 디버그 구성을 수행하려면 먼저 폴더를 여세요.",
-+<<<<<<< .our
- 	"inlineBreakpoint": "인라인 중단점",
-+=======
-+	"columnBreakpoint": "열 중단점",
-+>>>>>>> .their
- 	"debug": "디버그",
- 	"addInlineBreakpoint": "인라인 중단점 추가"
- }
-\ No newline at end of file
-changed in both
-  base   100644 9063bc79c2f2f67b22a329ee697ac6fc34d5951a i18n/kor/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  our    100644 383c5e7a51dcf49e07c095068c906ca99489d2d6 i18n/kor/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  their  100644 874247a347565990f7750a3d6d926b66a17e7dd3 i18n/kor/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-@@ -27,6 +27,9 @@
- 	"onFirstSessionStart": "디버그가 처음으로 시작된 후에만 상태 표시줄에 디버그 표시",
- 	"showInStatusBar": "디버그 상태 표시줄을 표시할 시기를 제어합니다.",
- 	"openDebug": "디버깅 세션 시작 시에 디버그 보기를 열지 여부를 제어합니다",
-+<<<<<<< .our
- 	"enableAllHovers": "디버그할 때 디버그가 아닌 가리키기를 사용하도록 설정할지 여부를 제어합니다. True이면 가리키기를 제공하기 위해 가리키기 공급자를 호출합니다. 이 설정이 true인 경우에도 일반 가리키기는 표시되지 않습니다.",
-+=======
-+>>>>>>> .their
- 	"launch": "전역 디버그 시작 구성입니다. 작업 영역에서 공유되는 \n 'launch.json'에 대한 대체로 사용되어야 합니다."
- }
-\ No newline at end of file
-changed in both
-  base   100644 205122173e457f63e219262520c9ed1cb2038f42 i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 f0485e490c5dc7158ba60cc766e0b791027e8972 i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 53bf2dac9a86b795edf44cd73d0014308c1d11e5 i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-changed in both
-  base   100644 f0dc673516e19ea7b630f7839f14886ee93c995a i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 3b79008f444d2989f35d429d32801582bb6d419c i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 d1ad83723cbdc2daff9d74d2848617de358d4ce8 i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-changed in both
-  base   100644 8c20a9f246157fa0a8a907e3c712ebb62ea29807 i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 7d98f29daa7e57a06988b8e2e9d76dd40150f638 i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 c2d64485c12f2f782f9967c31095901f6ee61446 i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -8,6 +8,10 @@
- 	],
- 	"neverShowAgain": "다시 표시 안 함",
- 	"searchMarketplace": "Marketplace 검색",
-+<<<<<<< .our
-+=======
-+	"showLanguagePackExtensions": "Marketplace에 VS Code를 '{0}' 로캘로 지역화하는 데 유용한 확장이 있습니다.",
-+>>>>>>> .their
- 	"dynamicWorkspaceRecommendation": "이 확장은 {0} 리포지토리의 사용자들에게 인기가 있으므로 관심을 가질 만합니다.",
- 	"exeBasedRecommendation": "{0}이(가) 설치되어 있으므로 이 확장을 권장합니다.",
- 	"fileBasedRecommendation": "최근에 연 파일을 기반으로 확장이 권장됩니다.",
-changed in both
-  base   100644 d88f38093beb02b840189f0932a8c3f15a519404 i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  our    100644 018f63d5c0fb6f63e432765ed1c8c8d45eb5d87b i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  their  100644 c764c2061a4b8d83e27a866b544c891a44550bdc i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-@@ -12,9 +12,13 @@
- 	"recommendedExtensions": "권장",
- 	"otherRecommendedExtensions": "기타 권장 사항",
- 	"workspaceRecommendedExtensions": "작업 영역 권장 사항",
-+<<<<<<< .our
- 	"builtInExtensions": "기능",
- 	"builtInThemesExtensions": "테마",
- 	"builtInBasicsExtensions": "프로그래밍 언어",
-+=======
-+	"builtInExtensions": "기본 제공",
-+>>>>>>> .their
- 	"searchExtensions": "마켓플레이스에서 확장 검색",
- 	"sort by installs": "정렬 기준: 설치 수",
- 	"sort by rating": "정렬 기준: 등급",
-changed in both
-  base   100644 640cb68c0f59f2376e12cbfbdbbc80753f926bd4 i18n/kor/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
-  our    100644 2a348dbd44730e2532ada8bed69d537a8e085d69 i18n/kor/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
-  their  100644 893db96ed7105d3e6af59fcb1b349c251fda3ced i18n/kor/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
-@@ -10,7 +10,11 @@
- 	"malicious": "이 확장은 문제가 있다고 보고되었습니다.",
- 	"installingMarketPlaceExtension": "Marketplace에서 확장을 설치하는 중...",
- 	"uninstallingExtension": "확장을 제거하는 중....",
-+<<<<<<< .our
- 	"enableDependeciesConfirmation": "확장을 사용하도록 설정하면 종속성도 사용하도록 설정됩니다. 계속하시겠습니까?",
-+=======
-+	"enableDependeciesConfirmation": "'{0}'을(를) 사용하도록 설정하면 종속성도 사용하도록 설정됩니다. 계속하시겠습니까?",
-+>>>>>>> .their
- 	"enable": "예",
- 	"doNotEnable": "아니요",
- 	"disableDependeciesConfirmation": "확장의 종속성도 사용하지 않도록 설정하시겠습니까?",
-changed in both
-  base   100644 3010674cced88be6f161468fc6df8e3ae3fd67bc i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 3bf77a27ac7c066f4ce3c283301cd1346b8314d5 i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 3c5dd9bb45916ebf91969a921b316664e45e32e7 i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-changed in both
-  base   100644 b68cddecdb855779d1f4a6f063ce715a0e964bf5 i18n/kor/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  our    100644 0e96fcdac44c2d3253e3fe7e92f0f23065b25765 i18n/kor/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  their  100644 b6d91a6d57556f39caa4ce458eeaa4fd9bf6e524 i18n/kor/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-@@ -7,9 +7,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"fileInputAriaLabel": "파일 이름을 입력합니다. 확인하려면 Enter 키를 누르고, 취소하려면 Esc 키를 누릅니다.",
-+<<<<<<< .our
- 	"createFileFromExplorerInfoMessage": "**{1}**에 **{0}** 만들기",
- 	"renameFileFromExplorerInfoMessage": "이동 및 **{0}**(으)로 이름 바꾸기",
- 	"createFolderFromExplorerInfoMessage": "**{1}**에 **{0}** 폴더 만들기",
-+=======
-+	"constructedPath": "**{1}**에 {0} 만들기",
-+>>>>>>> .their
- 	"filesExplorerViewerAriaLabel": "{0}, 파일 탐색기",
- 	"dropFolders": "작업 영역에 폴더를 추가하시겠습니까?",
- 	"dropFolder": "작업 영역에 폴더를 추가하시겠습니까?",
-changed in both
-  base   100644 a796088e3a792e038b7c2878ad12ef05e9dc8b19 i18n/kor/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  our    100644 6a6e7f152719318ecb9e9ea38a0a26d753597925 i18n/kor/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  their  100644 e80e5a7a2f1dd362f752c34cbd487bf9046c3480 i18n/kor/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-changed in both
-  base   100644 04ac1b08ee278a312348d26665ba6e22b912532e i18n/kor/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 b8f4fa84a25213fae0e380ab22868cdef4e860d3 i18n/kor/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 40920aa65c0c78d090741f8a373b15b874187b57 i18n/kor/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -31,5 +31,9 @@
- 	"search.followSymlinks": "검색하는 동안 symlink를 누를지 여부를 제어합니다.",
- 	"search.smartCase": "패턴이 모두 소문자인 경우 대/소문자를 구분하지 않고 검색하고, 그렇지 않으면 대/소문자를 구분하여 검색합니다.",
- 	"search.globalFindClipboard": "macOS에서 검색 보기가 공유 클립보드 찾기를 읽거나 수정해야 할지를 제어합니다.",
-+<<<<<<< .our
- 	"search.location": "검색을 사이드바의 보기로 표시할지 또는 가로 간격을 늘리기 위해 패널 영역의 패널로 표시할지를 제어합니다."
-+=======
-+	"search.location": "미리 보기: 검색을 사이드바의 보기로 표시할지 또는 가로 간격을 늘리기 위해 패널 영역의 패널로 표시할지를 제어합니다. 다음 릴리스의 패널에서의 검색은 가로 레이아웃이 개선되며 더 이상 미리 보기가 아닙니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 b012a1bdca83c86b8f56d46da09233ea57a34f47 i18n/kor/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
-  our    100644 a6d3822b0a174089521c09dde455fe3e7a4810c4 i18n/kor/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
-  their  100644 5c6abe93d984ba170c45246b227a9f6fdaa342c7 i18n/kor/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
-@@ -10,7 +10,10 @@
- 	"ProblemPatternParser.problemPattern.kindProperty.notFirst": "문제 패턴이 잘못되었습니다. Kind 속성은 첫 번째 요소에만 지정해야 합니다.",
- 	"ProblemPatternParser.problemPattern.missingRegExp": "문제 패턴에 정규식이 없습니다.",
- 	"ProblemPatternParser.problemPattern.missingProperty": "문제 패턴이 잘못되었습니다. 하나 이상의 파일 및 메시지를 포함해야 합니다.",
-+<<<<<<< .our
- 	"ProblemPatternParser.problemPattern.missingLocation": "문제 패턴이 잘못되었습니다. \"파일\" 종류, 줄 또는 위치 일치 그룹을 포함해야 합니다.",
-+=======
-+>>>>>>> .their
- 	"ProblemPatternParser.invalidRegexp": "오류: {0} 문자열은 유효한 정규식이 아닙니다.\n",
- 	"ProblemPatternSchema.regexp": "출력에서 오류, 경고 또는 정보를 찾는 정규식입니다.",
- 	"ProblemPatternSchema.kind": "패턴이 위치(파일 및 줄)와 일치하는지 또는 파일하고만 일치하는지 여부입니다.",
-changed in both
-  base   100644 a74e5096357b407ed90a48dbf60d73f5548cda18 i18n/kor/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 7b483f685d0f32a5b2eb20f1327a18475e2d29ae i18n/kor/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 82af7f681be5ce1595b737a3778d8b443aee9052 i18n/kor/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -31,10 +31,15 @@
- 	"selectProblemMatcher": "작업 출력에서 스캔할 오류 및 경고 유형을 선택",
- 	"customizeParseErrors": "현재 작성 구성에 오류가 있습니다. 작업을 사용자 지정하기 전에 오류를 수정하세요.\n",
- 	"moreThanOneBuildTask": "tasks.json에 여러 빌드 작업이 정의되어 있습니다. 첫 번째 작업을 실행합니다.\n",
-+<<<<<<< .our
- 	"TaskSystem.activeSame.background": "'{0}' 작업이 이미 활성 상태이며 백그라운드 모드입니다.",
- 	"TaskSystem.activeSame.noBackground": "'{0}' 작업은 이미 활성 상태입니다.",
- 	"terminateTask": "작업 종료",
- 	"restartTask": "작업 다시 시작",
-+=======
-+	"TaskSystem.activeSame.background": "'{0}' 작업이 이미 활성 상태로 백그라운드 모드에 있습니다. 종료하려면 [작업] 메뉴에서 '작업 종료...'를 사용하세요.",
-+	"TaskSystem.activeSame.noBackground": "'{0}' 작업이 이미 활성 상태입니다. 종료하려면 [작업] 메뉴에서 '작업 종료...'를 사용하세요.",
-+>>>>>>> .their
- 	"TaskSystem.active": "이미 실행 중인 작업이 있습니다. 다른 작업을 실행하려면 먼저 이 작업을 종료하세요.",
- 	"TaskSystem.restartFailed": "{0} 작업을 종료하고 다시 시작하지 못했습니다.",
- 	"TaskService.noConfiguration": "오류: {0} 작업 검색에서는 다음 구성에 대한 작업을 제공하지 않습니다:\n{1}\n이 작업이 무시됩니다.\n",
-changed in both
-  base   100644 74e005dc72c318cfe3926e7d10d4b9ae8dbe6cd1 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 bc58bba26a36ca2c7cacec97bfa2f02daab82775 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 7c4f7d11b2c7e23f596253efea45f27437a10f3f i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -27,7 +27,10 @@
- 	"terminal.integrated.cursorStyle": "터미널 커서의 스타일을 제어합니다.",
- 	"terminal.integrated.scrollback": "터미널에서 버퍼에 유지하는 최대 줄 수를 제어합니다.",
- 	"terminal.integrated.setLocaleVariables": "로캘 변수가 터미널 시작 시 설정되는지 여부를 제어하며, 기본값은 OS X에서 true이고 기타 플랫폼에서 false입니다.",
-+<<<<<<< .our
- 	"terminal.integrated.rendererType": "터미널이 렌더링되는 방식을 제어하며, 옵션은 \"canvas\"(표준(고속) 캔버스 렌더러, \"dom\"(대체 (fallback) DOM 기반 렌더러) 또는 \"auto\"(VS Code에서 어떤 렌더러가 가장 적절할지 추축하도록 허용)입니다. 이 설정을 적용하려면 VS Code를 다시 로드해야 합니다.",
-+=======
-+>>>>>>> .their
- 	"terminal.integrated.rightClickBehavior": "터미널이 마우스 오른쪽 단추 클릭에 대응하는 방식을 제어합니다. 가능한 값은 'default', 'copyPaste' 및 'selectWord'입니다. 'default'는 상황에 맞는 메뉴를 표시하고, 'copyPaste'는 선택 항목이 있으면 복사하고 없으면 붙여 넣으며, 'selectWord'는 커서 아래의 단어를 선택하고 상황에 맞는 메뉴를 표시합니다.",
- 	"terminal.integrated.cwd": "터미널이 시작될 명시적 시작 경로입니다. 셸 프로세스의 현재 작업 디렉터리(cwd)로 사용됩니다. 루트 디렉터리가 편리한 cwd가 아닌 경우 작업 영역 설정에서 특히 유용하게 사용할 수 있습니다.",
- 	"terminal.integrated.confirmOnExit": "끝낼 때 활성 터미널 세션이 있는지 확인할지 여부입니다.",
-changed in both
-  base   100644 7930de08d802b2e066693a2135f0b15866437fc3 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 0c53998d6e084853fcbcba0b56050a6d820a2b6f i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 ba974a504800db79f15cba87f1e5f074ec37242e i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -21,7 +21,10 @@
- 	"workbench.action.terminal.newWorkspacePlaceholder": "새 터미널의 현재 작업 디렉토리를 선택합니다.",
- 	"workbench.action.terminal.newInActiveWorkspace": "새 통합 터미널 만들기(활성 작업 영역에)",
- 	"workbench.action.terminal.split": "터미널 분할",
-+<<<<<<< .our
- 	"workbench.action.terminal.splitInActiveWorkspace": "터미널 분할(활성 작업 영역에서)",
-+=======
-+>>>>>>> .their
- 	"workbench.action.terminal.focusPreviousPane": "이전 창에 포커스",
- 	"workbench.action.terminal.focusNextPane": "다음 창에 포커스",
- 	"workbench.action.terminal.resizePaneLeft": "창 왼쪽 크기 조정",
-changed in both
-  base   100644 44aabb20800948e8968e96b92e54be897009569d i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-  our    100644 260b52f5f8b41136576748b7b0f1f6a9c2632a85 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-  their  100644 6092a2094acc8b7be278d0576bc9e84c9011a2d1 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-@@ -9,6 +9,7 @@
- 	"terminal.integrated.a11yBlankLine": "빈 줄",
- 	"terminal.integrated.a11yPromptLabel": "터미널 입력",
- 	"terminal.integrated.a11yTooMuchOutput": "발표할 출력이 너무 많음, 읽을 행으로 수동 이동",
-+<<<<<<< .our
- 	"yes": "예",
- 	"terminal.rendererInAllNewTerminals": "새로 만든 터미널은 모두 비 GPU 렌더러를 사용합니다.",
- 	"no": "아니요",
-@@ -19,4 +20,10 @@
- 	"terminal.integrated.waitOnExit": "터미널을 닫으려면 아무 키나 누르세요.",
- 	"terminal.integrated.launchFailed": "터미널 프로세스 명령 '{0}{1}'을(를) 실행하지 못했습니다(종료 코드: {2}).",
- 	"terminal.integrated.launchFailedExtHost": "터미널 프로세스를 시작하지 못했습니다(종료 코드: {0})."
-+=======
-+	"terminal.integrated.copySelection.noSelection": "터미널에 복사할 선택 항목이 없음",
-+	"terminal.integrated.exitedWithCode": "터미널 프로세스가 종료 코드 {0}(으)로 종료되었습니다.",
-+	"terminal.integrated.waitOnExit": "터미널을 닫으려면 아무 키나 누르세요.",
-+	"terminal.integrated.launchFailed": "터미널 프로세스 명령 '{0}{1}'을(를) 실행하지 못했습니다(종료 코드: {2})."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 5bdea659a8cf4c9fae90b1bc323c64ad3bf91799 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
-  our    100644 0798e161a36619c2ac7da5673533cc10ff6e76ed i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
-  their  100644 b95ca94304aa94c209d224fc9cc579180ae863f7 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
-@@ -12,5 +12,6 @@
- 	"split": "분할",
- 	"paste": "붙여넣기",
- 	"selectAll": "모두 선택",
--	"clear": "지우기"
-+	"clear": "지우기",
-+	"split": "분할"
- }
-\ No newline at end of file
-changed in both
-  base   100644 021c1a7ff014c557a836e2ad5d1f688a7ff4a2f3 i18n/kor/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 46a0013cd0e5a09c5cae294dfef72bf6b6e0aeef i18n/kor/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 b925a01c2adb854e022f4c37aa8c9d2216403952 i18n/kor/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -15,6 +15,10 @@
- 	"updateIsReady": "새 {0} 업데이트를 사용할 수 있습니다.",
- 	"noUpdatesAvailable": "현재 사용할 수 있는 업데이트가 없습니다.",
- 	"ok": "확인",
-+<<<<<<< .our
-+=======
-+	"download now": "지금 다운로드",
-+>>>>>>> .their
- 	"thereIsUpdateAvailable": "사용 가능한 업데이트가 있습니다.",
- 	"download now": "지금 다운로드",
- 	"later": "나중에",
-changed in both
-  base   100644 bed0586f43aacf3c38f61c229247cf8cd614877e i18n/kor/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 e81a8a242fb847453d5e2339de27eb2791e53868 i18n/kor/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 5a63e5bb4339cde5734e43d80b0109877a6caebd i18n/kor/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-changed in both
-  base   100644 e0c7d88cbca23724ac5d38207a4b8cffa64623c6 i18n/kor/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
-  our    100644 b38e23eb40dbcb7ce5ef373aaa710f6d4d5e3185 i18n/kor/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
-  their  100644 9ed508e53302b3bd999a1c531d2dff863a8b881c i18n/kor/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
-changed in both
-  base   100644 891cf710c6ee37e070ebde5b613dadf50340251d i18n/kor/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-  our    100644 361d1ad7355f4d1b81d6802085787a7bb15c2052 i18n/kor/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-  their  100644 0622ba5a8bb2730626f0bc2c1b5fe2a61dec9b00 i18n/kor/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-@@ -9,6 +9,7 @@
- 	"netVersionError": "Microsoft .NET Framework 4.5가 필요합니다. 설치하려면 링크를 클릭하세요.",
- 	"installNet": ".NET Framework 4.5 다운로드",
- 	"neverShowAgain": "다시 표시 안 함",
-+<<<<<<< .our
- 	"enospcError": "{0}은(는) 이 큰 작업 영역에서 파일 변경 내용을 감시할 수 없습니다. 지침 링크에 따라 이 문제를 해결하세요.",
- 	"learnMore": "지침",
- 	"fileInvalidPath": "잘못된 파일 리소스({0})",
-@@ -24,6 +25,11 @@
- 	"fileReadOnlyError": "파일이 읽기 전용입니다.",
- 	"fileMoveConflict": "이동/복사할 수 없습니다. 대상에 파일이 이미 있습니다.",
- 	"unableToMoveCopyError": "이동/복사할 수 없습니다. 파일이 포함된 폴더를 파일로 대체합니다.",
-+=======
-+	"netVersionError": "Microsoft .NET Framework 4.5가 필요합니다. 설치하려면 링크를 클릭하세요.",
-+	"learnMore": "지침",
-+	"enospcError": "{0}에 파일 핸들이 부족합니다. 지침 링크를 클릭하여 문제를 해결하세요.",
-+>>>>>>> .their
- 	"binFailed": "'{0}'을(를) 휴지통으로 이동하지 못함",
- 	"trashFailed": "'{0}'을(를) 휴지통으로 이동하지 못함"
- }
-\ No newline at end of file
-merged
-  result 100644 92d933fa23150e358612e8f988f791c2429dc571 i18n/kor/src/vs/workbench/services/files/node/fileService.i18n.json
-  our    100644 d411f384a723903358d48f22eaee747debee2d77 i18n/kor/src/vs/workbench/services/files/node/fileService.i18n.json
-@@ -9,6 +9,7 @@
- 	"fileInvalidPath": "잘못된 파일 리소스({0})",
- 	"fileIsDirectoryError": "파일이 디렉터리입니다.",
- 	"fileNotModifiedError": "파일 수정 안 됨",
-+	"fileTooLargeForHeapError": "파일 크기가 창 메모리 제한을 초과합니다. --max-memory=NEWSIZE 코드를 실행해 보세요.",
- 	"fileTooLargeError": "파일이 너무 커서 열 수 없음",
- 	"fileNotFoundError": "파일을 찾을 수 없습니다({0}).",
- 	"fileBinaryError": "파일이 이진인 것 같으므로 테스트로 열 수 없습니다.",
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ptb/extensions/clojure/package.i18n.json
-  our    100644 d146e27fa42c4da87f196c6447e1097ed27ff432 i18n/ptb/extensions/clojure/package.i18n.json
-  their  100644 978c999faf1f57bfad36144ad662352ba0de2d82 i18n/ptb/extensions/clojure/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Noções Básicas Sobre a Linguagem Clojure",
- 	"description": "Fornece realce de sintaxe e correspondência de suporte e dobramento em arquivos Clojure."
-+=======
-+	"displayName": "Noções Básicas Sobre a Linguagem Clojure"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ptb/extensions/coffeescript/package.i18n.json
-  our    100644 95fe95501c936f6c645d4502cb12e26af14163ce i18n/ptb/extensions/coffeescript/package.i18n.json
-  their  100644 03d413fad325548e64d8b8efd58418a2b6eca695 i18n/ptb/extensions/coffeescript/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Noções Básicas Sobre a Linguagem CoffeeScript",
- 	"description": "Fornece trechos de código, realce de sintaxe, correspondência de suporte e dobramento em arquivos CoffeeScript."
-+=======
-+	"displayName": "Noções Básicas Sobre a Linguagem CoffeeScript"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 15eb6e1d88d785bef054601b5fc910c7dac100da i18n/ptb/extensions/configuration-editing/package.i18n.json
-  our    100644 10996414b61013802772e1787e32ac6afd6958ad i18n/ptb/extensions/configuration-editing/package.i18n.json
-  their  100644 ff707c572bc0d52d075495851b9666915fbf3950 i18n/ptb/extensions/configuration-editing/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Edição de Configuração",
- 	"description": "Fornece recursos (IntelliSense avançado, correção automática) em arquivos de configuração, como configurações, inicialização e arquivos de recomendação de extensão."
-+=======
-+	"displayName": "Edição de Configuração"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ptb/extensions/cpp/package.i18n.json
-  our    100644 08236c7ff81be8964c3f32bff102c90c3832d550 i18n/ptb/extensions/cpp/package.i18n.json
-  their  100644 0ef1e68fec58ba7574b205a010e7f01dbd8d927d i18n/ptb/extensions/cpp/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Noções Básicas Sobre a Linguagem C/C++",
- 	"description": "Fornece trechos de código, realce de sintaxe, correspondência de suporte e dobramento em arquivos C/C++."
-+=======
-+	"displayName": "Noções Básicas Sobre a Linguagem C/C++"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e06749a6e079e1f6d262c63adc54aef537e0ba00 i18n/ptb/extensions/emmet/package.i18n.json
-  our    100644 bd44dd5d5523e2a5800a445af385bb5a762f2233 i18n/ptb/extensions/emmet/package.i18n.json
-  their  100644 f66c3b617c3306cabeea2d1914931b335a0db0f3 i18n/ptb/extensions/emmet/package.i18n.json
-changed in both
-  base   100644 04a44f08244fa5562793be405f69b18e6067e61f i18n/ptb/extensions/extension-editing/package.i18n.json
-  our    100644 5be926c7d74f6b65d7e3aa9e668f710be0e42563 i18n/ptb/extensions/extension-editing/package.i18n.json
-  their  100644 f7701436c083703acd0e4cee18d81fcdac603c2c i18n/ptb/extensions/extension-editing/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Edição de Arquivo de Pacote",
- 	"description": "Fornece IntelliSense para os pontos de extensão de código do VS Code e capacidade de linting em arquivos package.json."
-+=======
-+	"displayName": "Edição de Arquivo de Pacote"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ptb/extensions/fsharp/package.i18n.json
-  our    100644 3d6dee1adb0699e67f1f44b6b1830cc06ed13270 i18n/ptb/extensions/fsharp/package.i18n.json
-  their  100644 a6752d374cfe804604241bf5dbe51f5719109724 i18n/ptb/extensions/fsharp/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Noções Básicas Sobre a Linguagem F#",
- 	"description": "Fornece trechos de código, realce de sintaxe, correspondência de colchetes e oclusão de código em arquivos F#."
-+=======
-+	"displayName": "Noções Básicas Sobre a Linguagem F#"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ptb/extensions/go/package.i18n.json
-  our    100644 203f97d16033d804643299598505ba88f5d09046 i18n/ptb/extensions/go/package.i18n.json
-  their  100644 3425e376a6d8dec1f853e99f1e5da0610717e762 i18n/ptb/extensions/go/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Noções Básicas Sobre a Linguagem Go",
- 	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos Go."
-+=======
-+	"displayName": "Noções Básicas Sobre a Linguagem Go"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ptb/extensions/groovy/package.i18n.json
-  our    100644 abdb1ff0880dc668c2b296b58ebbff60e8157076 i18n/ptb/extensions/groovy/package.i18n.json
-  their  100644 875bfb0802e66bc294895ab91700c4691bbfdb09 i18n/ptb/extensions/groovy/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Noções Básicas Sobre a Linguagem Groovy",
- 	"description": "Fornece trechos de código, realce de sintaxe e correspondência de colchetes em arquivos Groovy."
-+=======
-+	"displayName": "Noções Básicas Sobre a Linguagem Groovy"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ptb/extensions/handlebars/package.i18n.json
-  our    100644 2eb0ec888d599c82718ba10105ab245841f62471 i18n/ptb/extensions/handlebars/package.i18n.json
-  their  100644 7fa3a76c7095aab77252cab0d5bdde4238e7bd9b i18n/ptb/extensions/handlebars/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Noções Básicas Sobre a Linguagem Handlebars",
- 	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos Handlebars."
-+=======
-+	"displayName": "Noções Básicas Sobre a Linguagem Handlebars"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ptb/extensions/hlsl/package.i18n.json
-  our    100644 f00e509b8c74a4c6874889078446b2611c8f3fc8 i18n/ptb/extensions/hlsl/package.i18n.json
-  their  100644 4e272ff2dd7c2751f3370945c7b163eb1ef219e4 i18n/ptb/extensions/hlsl/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Noções Básicas Sobre a Linguagem HLSL",
- 	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos HLSL."
-+=======
-+	"displayName": "Noções Básicas Sobre a Linguagem HLSL"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ptb/extensions/ini/package.i18n.json
-  our    100644 f7e7bd037dd95eaccf207359c3cc81ceacd7ac6b i18n/ptb/extensions/ini/package.i18n.json
-  their  100644 d3c9a58f2d7acbd375e982c340c1185d104a71c7 i18n/ptb/extensions/ini/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Noções Básicas Sobre a Linguagem Ini",
- 	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos Ini."
-+=======
-+	"displayName": "Noções Básicas Sobre a Linguagem Ini"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ptb/extensions/java/package.i18n.json
-  our    100644 207e95a5b2f95a70f7fc462f61a9e9ffab92c7da i18n/ptb/extensions/java/package.i18n.json
-  their  100644 446ed1b1df33e633cf8dda6980b59c739ee1d565 i18n/ptb/extensions/java/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Noções Básicas Sobre a Linguagem Java",
- 	"description": "Fornece trechos de código, realce de sintaxe, correspondência de colchetes e oclusão de código em arquivos Java."
-+=======
-+	"displayName": "Noções Básicas Sobre a Linguagem Java"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ptb/extensions/javascript/package.i18n.json
-  our    100644 582a7ee0bac2275470573fbb19615c634f1d3115 i18n/ptb/extensions/javascript/package.i18n.json
-  their  100644 455ec8a33766dc6134cec82998e030335fde2f40 i18n/ptb/extensions/javascript/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Noções Básicas Sobre a Linguagem JavaScript",
- 	"description": "Fornece realce de sintaxe, correspondência de colchetes e oclusão de código em arquivos JavaScript."
-+=======
-+	"displayName": "Noções Básicas Sobre a Linguagem JavaScript"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ptb/extensions/less/package.i18n.json
-  our    100644 f83a843880ac80ad00aa4f8ed61e6db0523ce9d5 i18n/ptb/extensions/less/package.i18n.json
-  their  100644 498dbc3c94139660551665e78fbbc0ec318d56a1 i18n/ptb/extensions/less/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Noções Básicas Sobre a Linguagem Less",
- 	"description": "Fornece realce de sintaxe, correspondência de colchetes e oclusão de código em arquivos Less."
-+=======
-+	"displayName": "Noções Básicas Sobre a Linguagem Less"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 664cda9a0e0095ff865e212cda61db7a8a22dfa2 i18n/ptb/extensions/log/package.i18n.json
-  our    100644 0f7313e5de8c99dfad5f450d98fa917836141451 i18n/ptb/extensions/log/package.i18n.json
-  their  100644 257db2e6372e98884078d2d2589439de2a98f5ff i18n/ptb/extensions/log/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Log",
- 	"description": "Fornece realce de sintaxe para arquivos com extensão .log."
-+=======
-+	"displayName": "Log"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ptb/extensions/lua/package.i18n.json
-  our    100644 a85199917e7aad189d02452428a0f1fa4bdc74ab i18n/ptb/extensions/lua/package.i18n.json
-  their  100644 c1a61a7ed263b1bde1551bab310606277d4f81d3 i18n/ptb/extensions/lua/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Noções Básicas Sobre a Linguagem Lua",
- 	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos Lua."
-+=======
-+	"displayName": "Noções Básicas Sobre a Linguagem Lua"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ptb/extensions/make/package.i18n.json
-  our    100644 52ddd461b8de69fe47745ae50ca1b755a3aa247d i18n/ptb/extensions/make/package.i18n.json
-  their  100644 9302615da23a8b5a684492fec05de8a17f1631b6 i18n/ptb/extensions/make/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Noções Básicas Sobre a Linguagem Make",
- 	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos Make."
-+=======
-+	"displayName": "Noções Básicas Sobre a Linguagem Make"
-+>>>>>>> .their
- }
-\ No newline at end of file
-added in both
-  our    100644 4295e53ce24599631366dc629cb89a0e9259f12a i18n/ptb/extensions/markdown-basics/package.i18n.json
-  their  100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ptb/extensions/markdown-basics/package.i18n.json
-@@ -5,7 +5,11 @@
- 		"Licensed under the MIT License. See License.txt in the project root for license information.",
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
-+<<<<<<< .our
- 	],
- 	"displayName": "Noções Básicas Sobre a Linguagem Markdown",
- 	"description": "Fornece trechos de código e destaque de sintaxe para Markdown."
-+=======
-+	]
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 71f0888573bcead5de4ee36ecfee1b46ac3e8094 i18n/ptb/extensions/merge-conflict/package.i18n.json
-  our    100644 7c3c080425855225bc7f26c293e92f10fc97cba6 i18n/ptb/extensions/merge-conflict/package.i18n.json
-  their  100644 1aa2e9461562285129cc744898960f5dc1fc857b i18n/ptb/extensions/merge-conflict/package.i18n.json
-@@ -7,7 +7,10 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"displayName": "Mesclar conflitos",
-+<<<<<<< .our
- 	"description": "Realce e comandos para mesclagem de conflitos inline.",
-+=======
-+>>>>>>> .their
- 	"command.category": "Conflito de Mesclagem",
- 	"command.accept.all-current": "Aceitar Todos os Atuais",
- 	"command.accept.all-incoming": "Aceitar todas entradas",
-changed in both
-  base   100644 d0a37a0a04e58f95aa1b66048c6bbc36edaf91c0 i18n/ptb/extensions/npm/package.i18n.json
-  our    100644 8efb19208f1a49d6a7d774e93195885d875ea884 i18n/ptb/extensions/npm/package.i18n.json
-  their  100644 7eb2870be291a8e5395cfa3417d07030e5715250 i18n/ptb/extensions/npm/package.i18n.json
-@@ -12,6 +12,7 @@
- 	"config.npm.runSilent": "Executar comandos npm com a opção '--silent'.",
- 	"config.npm.packageManager": "O Gerenciador de pacotes usado para executar scripts.",
- 	"config.npm.exclude": "Configure padrões glob para pastas que devem ser excluídos da detecção automática de script.",
-+<<<<<<< .our
- 	"config.npm.enableScriptExplorer": "Ativar uma visualização do explorador para scripts npm.",
- 	"npm.parseError": "Deteção de tarefa NPM: falha ao analisar o arquivo {0}",
- 	"taskdef.script": "O script npm para personalizar.",
-@@ -20,4 +21,9 @@
- 	"command.run": "Executar",
- 	"command.debug": "Depurar",
- 	"command.openScript": "Abrir"
-+=======
-+	"npm.parseError": "Deteção de tarefa NPM: falha ao analisar o arquivo {0}",
-+	"taskdef.script": "O script npm para personalizar.",
-+	"taskdef.path": "O caminho para a pasta do arquivo package.json que fornece o script. Pode ser omitido."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ptb/extensions/objective-c/package.i18n.json
-  our    100644 be2418c54c490a60a61a7a6dcc57048251385a53 i18n/ptb/extensions/objective-c/package.i18n.json
-  their  100644 6c21271685ae374d7d2ae23de57554d4d36b6d86 i18n/ptb/extensions/objective-c/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Noções Básicas Sobre a Linguagem Objective-C",
- 	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos Objective-C."
-+=======
-+	"displayName": "Noções Básicas Sobre a Linguagem Objective-C"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ptb/extensions/perl/package.i18n.json
-  our    100644 5b15ff68e470fd99005e082edf60524a0ee2e144 i18n/ptb/extensions/perl/package.i18n.json
-  their  100644 c45067607b625e0b08e95c5ca35e518179494831 i18n/ptb/extensions/perl/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Noções Básicas Sobre a Linguagem Perl",
- 	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos Perl."
-+=======
-+	"displayName": "Noções Básicas Sobre a Linguagem Perl"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a88cd375f355b0f0eee03f941398961ef52a2d1d i18n/ptb/extensions/php/package.i18n.json
-  our    100644 66c4ab05eef3a0d7e137edb360925be457e5e8e5 i18n/ptb/extensions/php/package.i18n.json
-  their  100644 171cc8de307b6a62d1c9c7afd74c37283939c248 i18n/ptb/extensions/php/package.i18n.json
-@@ -6,5 +6,16 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"description": "Fornece realce de sintaxe e suporte a correspondência de colchetes para arquivos PHP."
-+=======
-+	"configuration.suggest.basic": "Configura se as sugestões intrínsecas da linguagem PHP estão habilitadas. O suporte sugere globais e variáveis do PHP.",
-+	"configuration.validate.enable": "Habilita/desabilita a validação interna do PHP.",
-+	"configuration.validate.executablePath": "Aponta para o executável do PHP.",
-+	"configuration.validate.run": "Se o linter é executado ao salvar ou ao digitar.",
-+	"configuration.title": "PHP",
-+	"commands.categroy.php": "PHP",
-+	"command.untrustValidationExecutable": "Desabilita a validação de executável do PHP (definida como configuração do espaço de trabalho)",
-+	"displayName": "Recursos da linguagem PHP"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ptb/extensions/powershell/package.i18n.json
-  our    100644 c8d4a44ac0b314510b6fa1ddeb64c1288a66e851 i18n/ptb/extensions/powershell/package.i18n.json
-  their  100644 8d1fc47c67e91948cf5e9ed236295610b5014fe7 i18n/ptb/extensions/powershell/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Noções Básicas Sobre a Linguagem Powershell",
- 	"description": "Fornece realce de sintaxe, correspondência de colchetes e oclusão de código em arquivos Powershell."
-+=======
-+	"displayName": "Noções Básicas Sobre a Linguagem Powershell"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ptb/extensions/pug/package.i18n.json
-  our    100644 a4a9f443d88f474c2d46c37d97ad65c415a633f2 i18n/ptb/extensions/pug/package.i18n.json
-  their  100644 9898328e3cb1bc4f53326577cde2e8369fe55048 i18n/ptb/extensions/pug/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Noções Básicas Sobre a Linguagem Pug",
- 	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos Pug."
-+=======
-+	"displayName": "Noções Básicas Sobre a Linguagem Pug"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ptb/extensions/python/package.i18n.json
-  our    100644 ee8ff1f709ed0c64e4709b8bc24b828305bf16c4 i18n/ptb/extensions/python/package.i18n.json
-  their  100644 6f1ce258965774b918eb9d8bc5a43ce998b7f13c i18n/ptb/extensions/python/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Noções Básicas Sobre a Linguagem Python",
- 	"description": "Fornece realce de sintaxe, correspondência de colchetes e oclusão de código em arquivos Python."
-+=======
-+	"displayName": "Noções Básicas Sobre a Linguagem Python"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ptb/extensions/r/package.i18n.json
-  our    100644 d6beac66e309aea14e4a77fa8ca907fdf36f5ee0 i18n/ptb/extensions/r/package.i18n.json
-  their  100644 b8dd971968a0d4b75c9c784f77c87d9c80ed9a20 i18n/ptb/extensions/r/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Noções Básicas Sobre a Linguagem R",
- 	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos R."
-+=======
-+	"displayName": "Noções Básicas Sobre a Linguagem R"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ptb/extensions/razor/package.i18n.json
-  our    100644 c79997f74c3d68d23aa7998355d0af3552590dc9 i18n/ptb/extensions/razor/package.i18n.json
-  their  100644 e852ddd68a955403359863c2bafbeb4bfe367f43 i18n/ptb/extensions/razor/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Noções Básicas Sobre a Linguagem Razor",
- 	"description": "Fornece realce de sintaxe, correspondência de colchetes e oclusão de código em arquivos Razor."
-+=======
-+	"displayName": "Noções Básicas Sobre a Linguagem Razor"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ptb/extensions/ruby/package.i18n.json
-  our    100644 11ef2cb215abc8e6437bd0f244be2184a26e4050 i18n/ptb/extensions/ruby/package.i18n.json
-  their  100644 96c639a55b4754e99736bf2ee88b30c9efe07b37 i18n/ptb/extensions/ruby/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Noções Básicas Sobre a Linguagem Ruby",
- 	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos Ruby."
-+=======
-+	"displayName": "Noções Básicas Sobre a Linguagem Ruby"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ptb/extensions/rust/package.i18n.json
-  our    100644 7812f5b58c1b1737d81b596ca1f08b1eb6543d08 i18n/ptb/extensions/rust/package.i18n.json
-  their  100644 423ab816de0ca8398d8978e186453fe94118f756 i18n/ptb/extensions/rust/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Noções Básicas Sobre a Linguagem Rust",
- 	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos Rust."
-+=======
-+	"displayName": "Noções Básicas Sobre a Linguagem Rust"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ptb/extensions/scss/package.i18n.json
-  our    100644 1f732d38a0a8d490f0b8a473d1c1c857d92ecf31 i18n/ptb/extensions/scss/package.i18n.json
-  their  100644 2007a85cbe315925eb3903b55297a35987383ae7 i18n/ptb/extensions/scss/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Noções Básicas Sobre a Linguagem SCSS",
- 	"description": "Fornece realce de sintaxe, correspondência de colchetes e oclusão de código em arquivos SCSS."
-+=======
-+	"displayName": "Noções Básicas Sobre a Linguagem SCSS"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ptb/extensions/shaderlab/package.i18n.json
-  our    100644 6138101920b14e758a2a2d4d85f81b867480d37b i18n/ptb/extensions/shaderlab/package.i18n.json
-  their  100644 f7ded2dce774fdb26d34e50192a8821ca7c0c1ec i18n/ptb/extensions/shaderlab/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Noções Básicas Sobre a Linguagem Shaderlab",
- 	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos Shaderlab."
-+=======
-+	"displayName": "Noções Básicas Sobre a Linguagem Shaderlab"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ptb/extensions/shellscript/package.i18n.json
-  our    100644 f52f15ed9de60fc4261f1a7893b529dac6e0bfbe i18n/ptb/extensions/shellscript/package.i18n.json
-  their  100644 d8764c3903c5bdc8256f094986407dce4df93d94 i18n/ptb/extensions/shellscript/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Noções Básicas Sobre a Linguagem Shell Script",
- 	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos de Script de Shell."
-+=======
-+	"displayName": "Noções Básicas Sobre a Linguagem Shell Script"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ptb/extensions/sql/package.i18n.json
-  our    100644 95abedb5aac862eb3bd75a1cf430f1be3fb89e4a i18n/ptb/extensions/sql/package.i18n.json
-  their  100644 bb7822cba1223b08185720361a505907170c83e5 i18n/ptb/extensions/sql/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Noções Básicas Sobre a Linguagem SQL",
- 	"description": "Fornece realce de sintaxe e correspondência de colchetes nos arquivos SQL."
-+=======
-+	"displayName": "Noções Básicas Sobre a Linguagem SQL"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ptb/extensions/swift/package.i18n.json
-  our    100644 aa1efe8c4911c720c17b58188730ef523464e734 i18n/ptb/extensions/swift/package.i18n.json
-  their  100644 7ca859e9a6e3b6fee75222ea096fa8938f5bd3ba i18n/ptb/extensions/swift/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Noções Básicas Sobre a Linguagem Swift",
- 	"description": "Fornece trechos de código, realce de sintaxe e correspondência de colchetes em arquivos Swift."
-+=======
-+	"displayName": "Noções Básicas Sobre a Linguagem Swift"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ptb/extensions/vb/package.i18n.json
-  our    100644 eaf6b99fa5648e94f522105110f442beaaf1a817 i18n/ptb/extensions/vb/package.i18n.json
-  their  100644 4ce55e9368909b0ced0cc590f9141f71cd79df9a i18n/ptb/extensions/vb/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Noções Básicas Sobre a Linguagem Visual Basic",
- 	"description": "Fornece trechos, destaque de sintaxe, correspondência de colchetes e oclusão em arquivos do Visual Basic."
-+=======
-+	"displayName": "Noções Básicas Sobre a Linguagem Visual Basic"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ptb/extensions/xml/package.i18n.json
-  our    100644 a5b0890198388ae6c4171915a60e3eb8a2def3d3 i18n/ptb/extensions/xml/package.i18n.json
-  their  100644 c021fd6f6b1b4cbc600da7e9d104376e984f0756 i18n/ptb/extensions/xml/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Noções Básicas Sobre a Linguagem XML",
- 	"description": "Fornece realce de sintaxe e suporte a correspondência de colchetes em arquivos XML."
-+=======
-+	"displayName": "Noções Básicas Sobre a Linguagem XML"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ptb/extensions/yaml/package.i18n.json
-  our    100644 4a6a3b45e4817fc0bce606b1b9887c8f2e85bf0f i18n/ptb/extensions/yaml/package.i18n.json
-  their  100644 8b586bfe33c9789ba5390be27f3ee4154aa28a5f i18n/ptb/extensions/yaml/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Noções Básicas Sobre a Linguagem YAML",
- 	"description": "Fornece realce de sintaxe e suporte a correspondência de colchetes em arquivos YAML."
-+=======
-+	"displayName": "Noções Básicas Sobre a Linguagem YAML"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f36166f0691c89f7c01759ba250d0643ef3586e5 i18n/ptb/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  our    100644 ff2a8afaccd1bc003911e136e3320e37fddd4380 i18n/ptb/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  their  100644 6a08afe545ff18000e1fa7778f90ab4e6807a6f4 i18n/ptb/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-changed in both
-  base   100644 76c082510dba2e533342a4baeaf3a512051ef18d i18n/ptb/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  our    100644 3d6196327402f2f599bf6fbd52c22d20ce00ad67 i18n/ptb/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  their  100644 cfbca1eb679977d8554816b820497f943a637a9b i18n/ptb/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-@@ -17,5 +17,20 @@
- 	"issueTitleLabel": "Título",
- 	"issueTitleRequired": "Por favor, digite um título.",
- 	"titleLengthValidation": "O título é muito longo.",
-+<<<<<<< .our
- 	"details": "Por favor informe detalhes."
-+=======
-+	"systemInfo": "Minhas Informações do Sistema",
-+	"sendData": "Enviar meus dados",
-+	"processes": "Processos Atualmente em Execução",
-+	"workspaceStats": "Minhas Estatísticas do Espaço de Trabalho",
-+	"extensions": "Minhas extensões",
-+	"searchedExtensions": "Extensões Pesquisadas",
-+	"settingsSearchDetails": "Detalhes da Pesquisa de Configurações",
-+	"yes": "Sim",
-+	"no": "Não",
-+	"disableExtensions": "desabilitando todas as extensões e recarregando a janela",
-+	"details": "Por favor informe detalhes.",
-+	"loadingData": "Carregando dados..."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c8dc90b9046e2f62fab46966a1221c57147a8c94 i18n/ptb/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 69dfaa48d2b66f351d8413f62573d04c105f2c85 i18n/ptb/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 3ceced97733e81b68193378a63ec12788caee074 i18n/ptb/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -15,7 +15,11 @@
- 	"errorInstallingDependencies": "Erro ao instalar dependências. {0}",
- 	"MarketPlaceDisabled": "Loja não está habilitada.",
- 	"removeError": "Erro ao remover a extensão: {0}. por favor, Saia e Inicie o VS Code antes de tentar novamente.",
-+<<<<<<< .our
- 	"Not a Marketplace extension": "Somente Extensões da Loja podem ser reinstaladas",
-+=======
-+	"Not Market place extension": "Somente Extensões da Loja podem ser reinstaladas",
-+>>>>>>> .their
- 	"notFoundCompatible": "Não foi possível instalar '{0}; não existe nenhuma versão compatível com o VSCode '{1}'.",
- 	"malicious extension": "Não foi possível instalar a extensão, pois foi relatada como problemática.",
- 	"notFoundCompatibleDependency": "Não foi possível instalar porque a extensão dependente '{0}' compatível com a versão atual '{1}' do VS Code não foi encontrada.",
-changed in both
-  base   100644 920264a92db7c9a7bd790a70d54e603983b36f4f i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  our    100644 5396071d2357499831a5c23400da1b7100abbf16 i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  their  100644 e6cb3550cab162d8a0decca741736c4ce1ead91b i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-@@ -25,6 +25,9 @@
- 	"always": "Sempre mostrar depurar na barra de status",
- 	"onFirstSessionStart": "Mostrar depurar na barra de status somente após a depuração ser iniciada pela primeira vez",
- 	"showInStatusBar": "Controla quando a barra de status de depuração deve ser visível",
-+<<<<<<< .our
- 	"openDebug": "Controla se a visualização de depuração deve ser aberta no início da sessão de depuração.",
-+=======
-+>>>>>>> .their
- 	"launch": "Configuração global do lançamento do depurador. Deve ser usado como uma alternativa para o arquivo 'launch.json' que é compartilhado entre os espaços de trabalho"
- }
-\ No newline at end of file
-changed in both
-  base   100644 e3be5723564867e287a97d1d9d9e2cc75e74d6d0 i18n/ptb/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 86302d2d21747526427ebd222c88651b42924842 i18n/ptb/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 ed84158ab3a01515344d70549f7a5546c6101b4b i18n/ptb/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-@@ -61,7 +61,10 @@
- 	"disabled globally": "Desativado",
- 	"disableAll": "Desabilitar Todas as Extensões Instaladas",
- 	"disableAllWorkspace": "Desabilitar Todas as Extensões Instaladas para este Espaço de Trabalho",
-+<<<<<<< .our
- 	"enableAll": "Ativar Todas as Extensões",
-+=======
-+>>>>>>> .their
- 	"openExtensionsFolder": "Abrir a Pasta de Extensões",
- 	"installVSIX": "Instalar do VSIX...",
- 	"installFromVSIX": "Instalar a partir do VSIX",
-changed in both
-  base   100644 1d48771fc7c3ba2af3bac835ef5e388bda66e1ec i18n/ptb/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 08831e79b99c984b5f938c4d959c75ada794a1e4 i18n/ptb/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 485dee67981eec0b8ca3358ed514e212627d34ab i18n/ptb/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -28,6 +28,10 @@
- 	"useIgnoreFiles": "Controla se utiliza arquivos .gitignore e .ignore por padrão ao fazer pesquisas de arquivos.",
- 	"search.quickOpen.includeSymbols": "Configurar para incluir resultados de uma pesquisa símbolo global nos resultados do arquivo para Abertura Rápida.",
- 	"search.followSymlinks": "Controla quando seguir symlinks ao realizar uma busca.",
-+<<<<<<< .our
- 	"search.smartCase": "Faz pesquisas do tipo case-insensitive se o termo for totalmente minúsculo, caso contrário, faz pesquisas do tipo case-sensitive.",
- 	"search.globalFindClipboard": "Controla se a visualização de busca deve ler ou modificar a área de transferência de busca compartilhada no macOS"
-+=======
-+	"search.smartCase": "Faz pesquisas do tipo case-insensitive se o termo for totalmente minúsculo, caso contrário, faz pesquisas do tipo case-sensitive."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 cced62fcaad381f1376b9a8abb7ff4eb1f3759fe i18n/ptb/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 da6e72a8a9829b085b81f04ac2a19502d69acb6e i18n/ptb/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 5847a090e0c41ac555a623ef52cd949bb5d1b2f1 i18n/ptb/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -15,6 +15,10 @@
- 	"updateIsReady": "Nova atualização de {0} disponível.",
- 	"noUpdatesAvailable": "Não há nenhuma atualização disponível no momento.",
- 	"ok": "OK",
-+<<<<<<< .our
-+=======
-+	"download now": "Baixar agora",
-+>>>>>>> .their
- 	"thereIsUpdateAvailable": "Há uma atualização disponível.",
- 	"download now": "Baixar agora",
- 	"later": "Mais tarde",
-changed in both
-  base   100644 0f063fefcddc422d2f5388089ffcd8d20103e660 i18n/rus/extensions/css/package.i18n.json
-  our    100644 f94884afe4ab08854717ecf9bfcce904b5da5115 i18n/rus/extensions/css/package.i18n.json
-  their  100644 a4d164c61223478b66fe3382e03c07fd1d001786 i18n/rus/extensions/css/package.i18n.json
-@@ -6,6 +6,81 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Основы языка CSS",
- 	"description": "Предоставляет подсветку синтаксиса и выделение парных скобок в файлах CSS, LESS и SCSS."
-+=======
-+	"displayName": "Возможности языка CSS",
-+	"description": "Предоставляет широкую поддержку языка для файлов CSS, LESS и SCSS.",
-+	"css.title": "CSS",
-+	"css.lint.argumentsInColorFunction.desc": "Недопустимое число параметров",
-+	"css.lint.boxModel.desc": "Не использовать ширину или высоту при использовании поля или границы",
-+	"css.lint.compatibleVendorPrefixes.desc": "При использовании зависящего от поставщика префикса также указывайте все остальные свойства поставщика",
-+	"css.lint.duplicateProperties.desc": "Не использовать дублирующиеся определения стилей",
-+	"css.lint.emptyRules.desc": "Не использовать пустые наборы правил",
-+	"css.lint.float.desc": "Старайтесь не использовать \"float\". Из-за элементов \"float\" работа кода CSS может легко нарушиться, если изменить один из аспектов разметки.",
-+	"css.lint.fontFaceProperties.desc": "Правило @font-face должно определять свойства src и font-family",
-+	"css.lint.hexColorLength.desc": "Цвета в шестнадцатеричном формате должны содержать три или шесть шестнадцатеричных чисел",
-+	"css.lint.idSelector.desc": "Селекторы не должны содержать идентификаторов, потому что эти правила слишком тесно связаны с HTML.",
-+	"css.lint.ieHack.desc": "Полезные советы для Internet Explorer требуются только при поддержке Internet Explorer 7 и более ранних версий",
-+	"css.lint.important.desc": "Старайтесь не использовать !important, так как это признак того, что весь код CSS стал неуправляемым и его надо переработать.",
-+	"css.lint.importStatement.desc": "Операторы импорта не загружаются параллельно",
-+	"css.lint.propertyIgnoredDueToDisplay.desc": "Свойство проигнорировано из-за значения свойства display. Например, при \"display: inline\" свойства width, height, margin-top, margin-bottom и float не работают",
-+	"css.lint.universalSelector.desc": "Универсальный селектор (*) работает медленно",
-+	"css.lint.unknownProperties.desc": "Неизвестное свойство.",
-+	"css.lint.unknownVendorSpecificProperties.desc": "Неизвестное свойство поставщика.",
-+	"css.lint.vendorPrefix.desc": "При использовании зависящего от поставщика префикса также указывайте стандартное свойство",
-+	"css.lint.zeroUnits.desc": "Для нуля не требуется единица измерения",
-+	"css.trace.server.desc": "Отслеживает обмен данными между VS Code и языковым сервером CSS.",
-+	"css.validate.title": "Управляет проверкой CSS и серьезностью проблем.",
-+	"css.validate.desc": "Включает или отключает все проверки",
-+	"less.title": "LESS",
-+	"less.lint.argumentsInColorFunction.desc": "Недопустимое число параметров",
-+	"less.lint.boxModel.desc": "Не использовать ширину или высоту при использовании поля или границы",
-+	"less.lint.compatibleVendorPrefixes.desc": "При использовании зависящего от поставщика префикса также указывайте все остальные свойства поставщика",
-+	"less.lint.duplicateProperties.desc": "Не использовать дублирующиеся определения стилей",
-+	"less.lint.emptyRules.desc": "Не использовать пустые наборы правил",
-+	"less.lint.float.desc": "Старайтесь не использовать \"float\". Из-за элементов \"float\" работа кода CSS может легко нарушиться, если изменить один из аспектов разметки.",
-+	"less.lint.fontFaceProperties.desc": "Правило @font-face должно определять свойства src и font-family",
-+	"less.lint.hexColorLength.desc": "Цвета в шестнадцатеричном формате должны содержать три или шесть шестнадцатеричных чисел",
-+	"less.lint.idSelector.desc": "Селекторы не должны содержать идентификаторов, потому что эти правила слишком тесно связаны с HTML.",
-+	"less.lint.ieHack.desc": "Полезные советы для Internet Explorer требуются только при поддержке Internet Explorer 7 и более ранних версий",
-+	"less.lint.important.desc": "Старайтесь не использовать !important, так как это признак того, что весь код CSS стал неуправляемым и его надо переработать.",
-+	"less.lint.importStatement.desc": "Операторы импорта не загружаются параллельно",
-+	"less.lint.propertyIgnoredDueToDisplay.desc": "Свойство проигнорировано из-за значения свойства display. Например, при \"display: inline\" свойства width, height, margin-top, margin-bottom и float не работают",
-+	"less.lint.universalSelector.desc": "Универсальный селектор (*) работает медленно",
-+	"less.lint.unknownProperties.desc": "Неизвестное свойство.",
-+	"less.lint.unknownVendorSpecificProperties.desc": "Неизвестное свойство поставщика.",
-+	"less.lint.vendorPrefix.desc": "При использовании зависящего от поставщика префикса также указывайте стандартное свойство",
-+	"less.lint.zeroUnits.desc": "Для нуля не требуется единица измерения",
-+	"less.validate.title": "Управляет проверкой LESS и уровнями серьезности проблем. ",
-+	"less.validate.desc": "Включает или отключает все проверки",
-+	"scss.title": "SCSS (SASS)",
-+	"scss.lint.argumentsInColorFunction.desc": "Недопустимое число параметров",
-+	"scss.lint.boxModel.desc": "Не использовать ширину или высоту при использовании поля или границы",
-+	"scss.lint.compatibleVendorPrefixes.desc": "При использовании зависящего от поставщика префикса также указывайте все остальные свойства поставщика",
-+	"scss.lint.duplicateProperties.desc": "Не использовать дублирующиеся определения стилей",
-+	"scss.lint.emptyRules.desc": "Не использовать пустые наборы правил",
-+	"scss.lint.float.desc": "Старайтесь не использовать \"float\". Из-за элементов \"float\" работа кода CSS может легко нарушиться, если изменить один из аспектов разметки.",
-+	"scss.lint.fontFaceProperties.desc": "Правило @font-face должно определять свойства src и font-family",
-+	"scss.lint.hexColorLength.desc": "Цвета в шестнадцатеричном формате должны содержать три или шесть шестнадцатеричных чисел",
-+	"scss.lint.idSelector.desc": "Селекторы не должны содержать идентификаторов, потому что эти правила слишком тесно связаны с HTML.",
-+	"scss.lint.ieHack.desc": "Полезные советы для Internet Explorer требуются только при поддержке Internet Explorer 7 и более ранних версий",
-+	"scss.lint.important.desc": "Старайтесь не использовать !important, так как это признак того, что весь код CSS стал неуправляемым и его надо переработать.",
-+	"scss.lint.importStatement.desc": "Операторы импорта не загружаются параллельно",
-+	"scss.lint.propertyIgnoredDueToDisplay.desc": "Свойство проигнорировано из-за значения свойства display. Например, при \"display: inline\" свойства width, height, margin-top, margin-bottom и float не работают",
-+	"scss.lint.universalSelector.desc": "Универсальный селектор (*) работает медленно",
-+	"scss.lint.unknownProperties.desc": "Неизвестное свойство.",
-+	"scss.lint.unknownVendorSpecificProperties.desc": "Неизвестное свойство поставщика.",
-+	"scss.lint.vendorPrefix.desc": "При использовании зависящего от поставщика префикса также указывайте стандартное свойство",
-+	"scss.lint.zeroUnits.desc": "Для нуля не требуется единица измерения",
-+	"scss.validate.title": "Управляет проверкой SCSS и уровнями серьезности проблем.",
-+	"scss.validate.desc": "Включает или отключает все проверки",
-+	"less.colorDecorators.enable.desc": "Включает или отключает декораторы цвета.",
-+	"scss.colorDecorators.enable.desc": "Включает или отключает декораторы цвета.",
-+	"css.colorDecorators.enable.desc": "Включает или отключает декораторы цвета.",
-+	"css.colorDecorators.enable.deprecationMessage": "Параметр \"css.colorDecorators.enable\" устарел. Теперь вместо него используется параметр \"editor.colorDecorators\". ",
-+	"scss.colorDecorators.enable.deprecationMessage": "Параметр \"scss.colorDecorators.enable\" устарел. Теперь вместо него используется параметр \"editor.colorDecorators\". ",
-+	"less.colorDecorators.enable.deprecationMessage": "Параметр \"less.colorDecorators.enable\" устарел. Теперь вместо него используется параметр \"editor.colorDecorators\". "
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 271852db3ea0a2e21dd490fd2486b4bf2fe56dca i18n/rus/extensions/emmet/package.i18n.json
-  our    100644 e8a08df3b0fb514f0bab0b0d555c900a23a3deca i18n/rus/extensions/emmet/package.i18n.json
-  their  100644 b9e88e5f37b7a572ee131e8c673009b1c72485e3 i18n/rus/extensions/emmet/package.i18n.json
-@@ -59,7 +59,11 @@
- 	"emmetPreferencesCssWebkitProperties": "Разделенный запятыми список свойств CSS, которые получают префикс разработчика \"webkit\" при использовании в сокращениях Emmet, которые начинаются с \"-\". Чтобы префикс  \"webkit\" никогда не подставлялся, установите в качестве этого параметра пустое значение.",
- 	"emmetPreferencesCssMozProperties": "Разделенный запятыми список свойств CSS, которые получают префикс разработчика \"moz\" при использовании в сокращениях Emmet, которые начинаются с \"-\". Чтобы префикс \"moz\" никогда не подставлялся, установите в качестве этого параметра пустое значение. ",
- 	"emmetPreferencesCssOProperties": "Разделенный запятыми список свойств CSS, которые получают префикс разработчика \"o\" при использовании в сокращениях Emmet, которые начинаются с \"-\". Чтобы префикс \"o\" никогда не подставлялся, установите в качестве этого параметра пустое значение. ",
-+<<<<<<< .our
- 	"emmetPreferencesCssMsProperties": "Разделенный запятыми список свойств CSS, которые получают префикс разработчика \"ms\" при использовании в сокращениях Emmet, которые начинаются с \"-\". Чтобы префикс \"ms\" никогда не подставлялся, установите в качестве этого параметра пустое значение. ",
- 	"emmetPreferencesCssFuzzySearchMinScore": "Минимальное количество очков для нечеткого соответствия сокращения (от 0 до 1). При указании более низких значений возможно увеличение числа ложных срабатываний, при указании более высоких значений - уменьшение числа возможных соответствий.",
- 	"emmetOptimizeStylesheetParsing": "Если значение равно false, весь файл анализируется для определения, является ли текущая позиция допустимой для расширения сокращений Emmet. Когда присвоено значение true, только содержимое вокруг текущей позиции в файлах css/scss/less подвергается синтаксическому анализу."
-+=======
-+	"emmetPreferencesCssMsProperties": "Разделенный запятыми список свойств CSS, которые получают префикс разработчика \"ms\" при использовании в сокращениях Emmet, которые начинаются с \"-\". Чтобы префикс \"ms\" никогда не подставлялся, установите в качестве этого параметра пустое значение. "
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 fe86d4a257c74628677393d1202c5b1d8a941cfd i18n/rus/extensions/git/package.i18n.json
-  our    100644 f033330e3d5aad5041c41da260339bd159e31636 i18n/rus/extensions/git/package.i18n.json
-  their  100644 9b69c39a76d5928d907e5e0c9785e56705ea929c i18n/rus/extensions/git/package.i18n.json
-changed in both
-  base   100644 db24c759f42f47e3982f9de81e27f415f7854079 i18n/rus/extensions/html/package.i18n.json
-  our    100644 42837cfec9de872ae181ce411be0f2cebea5ef66 i18n/rus/extensions/html/package.i18n.json
-  their  100644 97846bbda844907b07e7fac2078e84b9cb86ab0e i18n/rus/extensions/html/package.i18n.json
-@@ -6,6 +6,34 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Основы языка HTML",
- 	"description": "Обеспечивает подсветку синтаксиса, выделение парных скобок и сниппеты в HTML-файлах."
-+=======
-+	"displayName": "Возможности языка HTML",
-+	"description": "Предоставляет широкую поддержку языка для файлов HTML, Razor и Handlebar.",
-+	"html.format.enable.desc": "Включить/отключить модуль форматирования HTML по умолчанию",
-+	"html.format.wrapLineLength.desc": "Максимальное число символов на строку (0 — отключить).",
-+	"html.format.unformatted.desc": "Список тегов, которые не следует повторно форматировать, с разделителями-запятыми. Значение \"NULL\" по умолчанию означает все теги, перечисленные на странице https://www.w3.org/TR/html5/dom.html#phrasing-content.",
-+	"html.format.contentUnformatted.desc": "Разделенный запятыми список тегов, в которых формат содержимого не должен изменяться. Значение null задается по умолчанию для тега pre.",
-+	"html.format.indentInnerHtml.desc": "Отступ в разделах <head> и <body>.",
-+	"html.format.preserveNewLines.desc": "Следует ли сохранять разрывы строк перед элементами. Работает только перед элементами, а не внутри тегов или для текста.",
-+	"html.format.maxPreserveNewLines.desc": "Максимальное число разрывов строк для сохранения в блоке. Чтобы указать неограниченное число строк, используйте \"null\".",
-+	"html.format.indentHandlebars.desc": "Формат и отступ {{#foo}} и {{/foo}}.",
-+	"html.format.endWithNewline.desc": "Завершение символом новой строки.",
-+	"html.format.extraLiners.desc": "Список тегов с разделителями-запятыми и дополнительными новыми строками между ними. Значение \"null\" по умолчанию ставится для \"head, body, /html\".",
-+	"html.format.wrapAttributes.desc": "Перенос атрибутов.",
-+	"html.format.wrapAttributes.auto": "Перенос атрибутов только при превышении длины строки.",
-+	"html.format.wrapAttributes.force": "Перенос всех атрибутов, кроме первого.",
-+	"html.format.wrapAttributes.forcealign": "Перенос всех атрибутов, кроме первого, и сохранение выравнивания.",
-+	"html.format.wrapAttributes.forcemultiline": "Перенос всех атрибутов.",
-+	"html.suggest.angular1.desc": "Определяет, будет ли встроенная поддержка языка HTML предлагать теги и свойства Angular 1.",
-+	"html.suggest.ionic.desc": "Определяет, будет ли встроенная поддержка языка HTML предлагать теги, свойства и значения Ionic.",
-+	"html.suggest.html5.desc": "Определяет, будет ли встроенная поддержка языка HTML предлагать теги, свойства и значения HTML5.",
-+	"html.trace.server.desc": "Отслеживает обмен данными между VS Code и языковым сервером HTML. ",
-+	"html.validate.scripts": "Определяет, будет ли встроенная поддержка языка HTML проверять внедренные сценарии.",
-+	"html.validate.styles": "Определяет, будет ли встроенная поддержка языка HTML проверять внедренные стили.",
-+	"html.experimental.syntaxFolding": "Включает/отключает маркеры свертывания с учетом синтаксиса.",
-+	"html.autoClosingTags": "Включить или отключить автоматическое закрытие тегов HTML. "
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 95b5c0a35535a296b94c6de9115e6b5ade1073ec i18n/rus/extensions/json/package.i18n.json
-  our    100644 85f61bdfc1a6eb903ba45e2ec3c3cbf21f3a407c i18n/rus/extensions/json/package.i18n.json
-  their  100644 5b4b6d24cfd931241fa96ced093254ec434eca3d i18n/rus/extensions/json/package.i18n.json
-@@ -6,6 +6,21 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Основы языка JSON",
- 	"description": "Обеспечивает подсветку синтаксиса и выделение парных скобок в файлах JSON."
-+=======
-+	"displayName": "Возможности языка JSON",
-+	"description": "Предоставляет широкую поддержку языка для файлов JSON.",
-+	"json.schemas.desc": "Связь схем с JSON-файлами в текущем проекте",
-+	"json.schemas.url.desc": "URL-адрес схемы или относительный путь к ней в текущем каталоге",
-+	"json.schemas.fileMatch.desc": "Массив шаблонов файлов, с которым выполняется сравнение, при разрешении JSON-файлов в схемах.",
-+	"json.schemas.fileMatch.item.desc": "Шаблон файла, который может содержать \"*\" и с которым выполняется сравнение, при разрешении JSON-файлов в схемах.",
-+	"json.schemas.schema.desc": "Определение схемы для указанного URL-адреса. Схему необходимо указать только для того, чтобы не обращаться по URL-адресу схемы.",
-+	"json.format.enable.desc": "Включение или отключение модуля форматирования JSON по умолчанию (требуется перезагрузка)",
-+	"json.tracing.desc": "Отслеживает связь между VS Code и языковым сервером JSON.",
-+	"json.colorDecorators.enable.desc": "Включает или отключает декораторы цвета.",
-+	"json.colorDecorators.enable.deprecationMessage": "Параметр \"json.colorDecorators.enable\" устарел. Теперь вместо него используется параметр \"editor.colorDecorators\".",
-+	"json.experimental.syntaxFolding": "Включает/отключает маркеры свертывания с учетом синтаксиса."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ab3d34d7f5f9978e54a86564ac32957347541a9e i18n/rus/extensions/npm/package.i18n.json
-  our    100644 8d7baa6e0dc033bbe07eab95362f11ea8ace26f2 i18n/rus/extensions/npm/package.i18n.json
-  their  100644 1d335e1d83290f12c9753e9a69be36a521d64053 i18n/rus/extensions/npm/package.i18n.json
-@@ -12,6 +12,7 @@
- 	"config.npm.runSilent": "Запускать команды npm с параметром '--silent'.",
- 	"config.npm.packageManager": "Диспетчер пакетов, используемый для запуска сценариев.",
- 	"config.npm.exclude": "Настройте стандартные маски для папок, которые должны быть обработаны с помощью автоматического определения сценария.",
-+<<<<<<< .our
- 	"config.npm.enableScriptExplorer": "Включить представление обозревателя для сценариев npm.",
- 	"config.npm.scriptExplorerAction": "Действие по умолчанию при щелчке в обозревателе сценариев. Допустимые значения: 'open' или 'run', значение по умолчанию – 'open'.",
- 	"npm.parseError": "Определение задач npm: не удалось проанализировать файл {0}",
-@@ -23,4 +24,9 @@
- 	"command.debug": "Отладка",
- 	"command.openScript": "Открыть",
- 	"command.runInstall": "Запустить установку"
-+=======
-+	"npm.parseError": "Определение задач npm: не удалось проанализировать файл {0}",
-+	"taskdef.script": "Скрипт npm для изменения.",
-+	"taskdef.path": "Путь к папке с файлом package.json, который содержит сценарий. Можно опустить."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e520e862551384587b41a4ec83cc63c73faea1d0 i18n/rus/extensions/php/package.i18n.json
-  our    100644 1e2e55fbb4c6054f67ad400b6f785c69d1b25733 i18n/rus/extensions/php/package.i18n.json
-  their  100644 c35bde05b3ae831536a85f7a66a50aa634b0235e i18n/rus/extensions/php/package.i18n.json
-@@ -6,6 +6,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Основы языка PHP",
- 	"description": "Предоставляет подсветку синтаксиса и выделение парных скобок в файлах PHP."
-+=======
-+	"configuration.suggest.basic": "Указывает, включены ли встроенные языковые предложения для PHP. Поддержка предлагает глобальные значения и переменные PHP.",
-+	"configuration.validate.enable": "Включение или отключение встроенной проверки PHP.",
-+	"configuration.validate.executablePath": "Указывает на исполняемый файл PHP.",
-+	"configuration.validate.run": "Запускается ли анализатор кода при сохранении или при печати.",
-+	"configuration.title": "PHP",
-+	"commands.categroy.php": "PHP",
-+	"command.untrustValidationExecutable": "Запретить исполняемый файл проверки PHP (определяется как параметр рабочей области)",
-+	"displayName": "Функции языка PHP",
-+	"description": "Предоставляет IntelliSense, функции жанров и основные функции языка для файлов PHP."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 13e20c0b6a4ac282579c121661a10e106bc3fc76 i18n/rus/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  our    100644 6d3f99cb3bb862ce8d5c4f79bdcea21926967bd4 i18n/rus/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  their  100644 2c957229e71e2de97511137d14768f0131ea2971 i18n/rus/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-@@ -10,6 +10,7 @@
- 	"show": "показать",
- 	"previewOnGitHub": "Предварительный просмотр в GitHub",
- 	"loadingData": "Загрузка данных...",
-+<<<<<<< .our
- 	"rateLimited": "Превышено ограничение на количество запросов GitHub. Подождите.",
- 	"similarIssues": "Похожие проблемы",
- 	"open": "Открыть",
-@@ -19,6 +20,16 @@
- 	"bugReporter": "Отчет об ошибках",
- 	"featureRequest": "Запрос функции",
- 	"performanceIssue": "Проблема с производительностью",
-+=======
-+	"similarIssues": "Похожие проблемы",
-+	"open": "Открыть",
-+	"closed": "Закрыто",
-+	"noResults": "Результаты не найдены",
-+	"settingsSearchIssue": "Проблема с параметрами поиска",
-+	"bugReporter": "Отчет об ошибках",
-+	"performanceIssue": "Проблема с производительностью",
-+	"featureRequest": "Запрос функции",
-+>>>>>>> .their
- 	"stepsToReproduce": "Действия для воспроизведения проблемы",
- 	"bugDescription": "Опишите действия для точного воспроизведения проблемы. Включите фактические и ожидаемые результаты. Поддерживается разметка Markdown в стиле GitHub. Вы можете отредактировать текст проблемы и добавить снимки экрана при просмотре проблемы в GitHub.",
- 	"performanceIssueDesciption": "Когда возникла эта проблема с производительностью? Происходит ли она при запуске или после указанной серии действий? Поддерживается разметка Markdown в стиле GitHub. Вы можете отредактировать текст проблемы и добавить снимки экрана при просмотре проблемы в GitHub.",
-changed in both
-  base   100644 381b3333725be8a3a47de14341d3b30b81c7b69e i18n/rus/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  our    100644 cd7ea704ca059c561476e5115a01c5cebc3018e8 i18n/rus/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  their  100644 6954a9f74427157e75e3a30e82fb424c29380c51 i18n/rus/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-@@ -8,6 +8,7 @@
- 	],
- 	"completeInEnglish": "Заполните форму на английском языке.",
- 	"issueTypeLabel": "Это",
-+<<<<<<< .our
- 	"issueSourceLabel": "Файл в",
- 	"vscode": "Visual Studio Code",
- 	"extension": "Расширение",
-@@ -25,4 +26,25 @@
- 	"sendExtensions": "Включить сведения об активных расширениях ({0})",
- 	"sendSearchedExtensions": "Отправить сведения о расширениях, для которых выполнялся поиск ({0})",
- 	"sendSettingsSearchDetails": "Отправить сведения о параметрах поиска ({0})"
-+=======
-+	"issueTitleLabel": "Название",
-+	"issueTitleRequired": "Введите название.",
-+	"titleLengthValidation": "Название слишком длинное.",
-+	"systemInfo": "Информация о системе",
-+	"sendData": "Отправить мои данные",
-+	"processes": "Запущенные процессы",
-+	"workspaceStats": "Статистика моей рабочей области",
-+	"extensions": "Мои расширения",
-+	"searchedExtensions": "Расширения, для которых выполнялся поиск",
-+	"settingsSearchDetails": "Сведения о параметрах поиска",
-+	"tryDisablingExtensions": "Сохраняется ли проблема после отключения расширений?",
-+	"yes": "Да",
-+	"no": "Нет",
-+	"disableExtensionsLabelText": "Попробуйте воспроизвести проблему после {0}.",
-+	"disableExtensions": "отключение всех расширений и перезагрузка окна",
-+	"showRunningExtensionsLabelText": "Если вы подозреваете, что проблема связана с расширениями, сообщите о проблеме с расширением с помощью {0}.",
-+	"showRunningExtensions": "просмотр всех запущенных расширений",
-+	"details": "Укажите сведения.",
-+	"loadingData": "Загрузка данных..."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 70772a661f9350243b1cbfd67d39d0311438ae83 i18n/rus/src/vs/code/electron-main/menus.i18n.json
-  our    100644 6c6420ff3fff2721736f81d703d8eb2e0907f38c i18n/rus/src/vs/code/electron-main/menus.i18n.json
-  their  100644 eadf56cd71723797534ddcd8567f5ff80c633ff0 i18n/rus/src/vs/code/electron-main/menus.i18n.json
-changed in both
-  base   100644 ed9048727f0a43c8dd8055568f80991fe9aa9337 i18n/rus/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 9d3bc679fc1f2c06c947cdc33c9616b8b522920c i18n/rus/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 4e38fa1d925fd67dc03dc31d6b2d34aa42f4a387 i18n/rus/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -17,7 +17,10 @@
- 	"editorActiveIndentGuide": "Цвет активных направляющих для отступов редактора.",
- 	"editorLineNumbers": "Цвет номеров строк редактора.",
- 	"editorActiveLineNumber": "Цвет номера активной строки редактора",
-+<<<<<<< .our
- 	"deprecatedEditorActiveLineNumber": "Параметр 'Id' является устаревшим. Используйте вместо него параметр 'editorLineNumber.activeForeground'.",
-+=======
-+>>>>>>> .their
- 	"editorRuler": "Цвет линейки редактора.",
- 	"editorCodeLensForeground": "Цвет переднего плана элемента CodeLens в редакторе",
- 	"editorBracketMatchBackground": "Цвет фона парных скобок",
-changed in both
-  base   100644 e76e0535f5b624480ce8d3d105f70d1b9feaaaa0 i18n/rus/src/vs/editor/contrib/format/formatActions.i18n.json
-  our    100644 f69c3cad071c4c9e22e5844f9792ca55c911ea2b i18n/rus/src/vs/editor/contrib/format/formatActions.i18n.json
-  their  100644 f857a184f65d840ee40683bbf81e89f8f5c38b50 i18n/rus/src/vs/editor/contrib/format/formatActions.i18n.json
-changed in both
-  base   100644 1adf7466994e00f8fd2b0e6e6e14bb33784b6004 i18n/rus/src/vs/editor/contrib/links/links.i18n.json
-  our    100644 a500627125354d81bddcb9f93a00642cc62107c7 i18n/rus/src/vs/editor/contrib/links/links.i18n.json
-  their  100644 bee775b604d7157b0b073c195553ca27344f170b i18n/rus/src/vs/editor/contrib/links/links.i18n.json
-changed in both
-  base   100644 ca92cdb0d1299e20e4eb654b8cdcb565de0be95e i18n/rus/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  our    100644 5b31b385ffd5c6dc8e210cee2ebf9889c7b9deb5 i18n/rus/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-  their  100644 1d513afb117efd9039295dd93064b2a2135d95c6 i18n/rus/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
-@@ -10,8 +10,13 @@
- 	"wordHighlightStrong": "Фон символа при доступе для записи, например при записи переменной. Цвет должен быть прозрачным чтобы не перекрывать основных знаков отличия.",
- 	"wordHighlightBorder": "Цвет границы символа при доступе на чтение, например, при считывании переменной.",
- 	"wordHighlightStrongBorder": "Цвет границы символа при доступе на запись, например, при записи переменной. ",
-+<<<<<<< .our
- 	"overviewRulerWordHighlightForeground": "Цвет метки линейки в окне просмотра для выделения символов. Цвет не должен был прозрачным, чтобы не перекрывать основные знаки отличия.",
- 	"overviewRulerWordHighlightStrongForeground": "Цвет метки линейки в окне просмотра для выделения символов с доступом на запись. Цвет не должен был прозрачным, чтобы не перекрывать основные знаки отличия.",
-+=======
-+	"overviewRulerWordHighlightForeground": "Цвет метки линейки в окне просмотра для выделений символов.",
-+	"overviewRulerWordHighlightStrongForeground": "Цвет метки линейки в окне просмотра для выделений символов, доступных для записи. ",
-+>>>>>>> .their
- 	"wordHighlight.next.label": "Перейти к следующему выделению символов",
- 	"wordHighlight.previous.label": "Перейти к предыдущему выделению символов"
- }
-\ No newline at end of file
-changed in both
-  base   100644 5d6e27da2365519204df83d1fc738660815029dc i18n/rus/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 b5b010a1ed08e7bd0639632258a4ace9da636f30 i18n/rus/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 2d37e3e23762dbe2fa210fdf3418414ff1ed618a i18n/rus/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -15,7 +15,11 @@
- 	"errorInstallingDependencies": "Ошибка при установке зависимостей. {0}",
- 	"MarketPlaceDisabled": "Marketplace не включен",
- 	"removeError": "Ошибка при удалении расширения: {0}. Закройте и снова откройте VS Code, затем повторите попытку.",
-+<<<<<<< .our
- 	"Not a Marketplace extension": "Можно переустановить только расширения из Marketplace",
-+=======
-+	"Not Market place extension": "Повторно устанавливать можно только расширения из Marketplace",
-+>>>>>>> .their
- 	"notFoundCompatible": "Невозможно установить '{0}'; нет версии, совместимой с VS Code '{1}'.",
- 	"malicious extension": "Не удается установить расширение, так как оно помечено как проблемное.",
- 	"notFoundCompatibleDependency": "Не удается выполнить установку, так как не найдено зависимое расширение '{0}', совместимое с текущей версией VS Code '{1}'. ",
-changed in both
-  base   100644 fe7f1b27573fe47b799a3e7407d2d419aac4d196 i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 a203da5726ce360e6e4c7bd4be5cee05446e8ca5 i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 7e411db1da289dd16fe7b1e57ba004bc091c5f83 i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -73,11 +73,18 @@
- 	"editorSelectionHighlightBorder": "Цвет границы регионов с тем же содержимым, что и в выделении.",
- 	"editorFindMatch": "Цвет текущего поиска совпадений.",
- 	"findMatchHighlight": "Цвет для других результатов поиска. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
-+<<<<<<< .our
- 	"findRangeHighlight": "Цвет диапазона для ограничения поиска. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
- 	"editorFindMatchBorder": "Цвет границы текущего результата поиска.",
- 	"findMatchHighlightBorder": "Цвет границы других результатов поиска.",
- 	"findRangeHighlightBorder": "Цвет границы диапазона для ограничения поиска. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
- 	"findWidgetResizeBorder": "Цвет границ панели изменения размера для мини-приложения поиска.",
-+=======
-+	"findRangeHighlight": "Выделите диапазон для ограничения поиска. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
-+	"editorFindMatchBorder": "Цвет границы текущего результата поиска.",
-+	"findMatchHighlightBorder": "Цвет границы других результатов поиска.",
-+	"findRangeHighlightBorder": "Цвет границы диапазона для ограничения поиска. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
-+>>>>>>> .their
- 	"hoverHighlight": "Выделение под словом, для которого показано наведение. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
- 	"hoverBackground": "Цвет фона при наведении указателя на редактор.",
- 	"hoverBorder": "Цвет границ при наведении указателя на редактор.",
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/rus/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
-  our    100644 a45e83f260381f88a27dba0ff088ffed0b88928b i18n/rus/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
-  their  100644 79967c51d9e7b9d622fae67dfbdb8dc2b8b8b949 i18n/rus/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
-@@ -6,5 +6,9 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"errorMessage": "Ошибка при восстановлении представления: {0}"
-+=======
-+	"webview.editor.label": "Редактор веб-представления"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/rus/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
-  our    100644 d6c896929e71f67abc26e33487ee3f41a25ba127 i18n/rus/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
-  their  100644 a5d906fdd9827ecc1b9b176b9ef5561a5e3d3997 i18n/rus/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
-@@ -6,7 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"notificationsEmpty": "Новые уведомления отсутствуют",
-+=======
-+>>>>>>> .their
- 	"notifications": "Уведомления",
- 	"notificationsToolbar": "Действия центра уведомлений",
- 	"notificationsList": "Список уведомлений"
-changed in both
-  base   100644 b97a3ba5fa3e65636d2b263eb55accb0aa1fa61a i18n/rus/src/vs/workbench/common/theme.i18n.json
-  our    100644 1ea38452a6e8832b511f19d37e5007a3b201c44b i18n/rus/src/vs/workbench/common/theme.i18n.json
-  their  100644 9c4246b34d29e17a21414039e6173f4da0359a55 i18n/rus/src/vs/workbench/common/theme.i18n.json
-changed in both
-  base   100644 ca8ede0697d25d284a61389a0cb4f059796ad5a3 i18n/rus/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 266dadc0ddcb2cfb8391eafba4890dbacea4172b i18n/rus/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 ca68ead37784314a73043ec57a6bce4e15c2c135 i18n/rus/src/vs/workbench/electron-browser/actions.i18n.json
-changed in both
-  base   100644 5923fdd0e6ec2353ae811d2d33252c0f01818d4a i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 bdb5e10a72aa6a97a13c01acd6d5626456147e68 i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 cf76b9c9591aa24bd13bbe65b2d6faed33bfe6c4 i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
-changed in both
-  base   100644 b757d518924fbfd86b81da2dae246e1a975c17e2 i18n/rus/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  our    100644 c7d8282666638a14a77cd9b7b8ffaf2b23a45b58 i18n/rus/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  their  100644 3a211dd7bc4ab4c45c2e93603fab30c59b6bc669 i18n/rus/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-@@ -17,7 +17,10 @@
- 	"breakpointUnverifieddHover": "Непроверенная точка останова",
- 	"functionBreakpointUnsupported": "Точки останова функций не поддерживаются в этом типе отладки",
- 	"breakpointDirtydHover": "Непроверенная точка останова. Файл был изменен, перезапустите сеанс отладки.",
-+<<<<<<< .our
- 	"logBreakpointUnsupported": "Точки журнала не поддерживаются для этого типа отладки",
-+=======
-+>>>>>>> .their
- 	"conditionalBreakpointUnsupported": "Условные точки останова не поддерживаются этим типом отладки",
- 	"hitBreakpointUnsupported": "Останавливаться на условных точках останова, которые не поддерживаются этим типом отладки"
- }
-\ No newline at end of file
-changed in both
-  base   100644 f0dd8ff74ad07212c6fa84d496ebc28e33b57bce i18n/rus/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
-  our    100644 5be62956db3e22107c49f4bac59b80b8b3f8c8d6 i18n/rus/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
-  their  100644 bffb5741d8fd711398bef677a312e9eb95713da0 i18n/rus/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
-@@ -7,7 +7,11 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"noFolderDebugConfig": "Перед расширенной настройкой отладки откройте папку.",
-+<<<<<<< .our
- 	"inlineBreakpoint": "Внутренняя точка останова",
-+=======
-+	"columnBreakpoint": "Точка останова столбца",
-+>>>>>>> .their
- 	"debug": "Отладка",
- 	"addInlineBreakpoint": "Добавить внутреннюю точку останова"
- }
-\ No newline at end of file
-changed in both
-  base   100644 3551514113ade9760edb075d10f6b60dd43efbac i18n/rus/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  our    100644 c40c0450d63a0a1ac9b7545e7ca88c35a304bd16 i18n/rus/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  their  100644 210c4a89787cfa980da6b52c01004b93fafcd7e1 i18n/rus/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-@@ -27,6 +27,9 @@
- 	"onFirstSessionStart": "Отображать отладку в строке состояния только после первого запуска отладки",
- 	"showInStatusBar": "Определяет видимость для строки состояния отладки",
- 	"openDebug": "Определяет, следует ли открыть представление отладки в начале сеанса отладки.",
-+<<<<<<< .our
- 	"enableAllHovers": "Управляет тем, должны ли отображаться всплывающие сообщения, не связанные с отладкой, во время отладки. Если этот параметр имеет значение true, будут вызваны поставщики всплывающих сообщений, и сообщения будут отображены. Обычные всплывающие сообщения не будут отображаться, даже если этот параметр имеет значение true.",
-+=======
-+>>>>>>> .their
- 	"launch": "Глобальная конфигурация запуска отладки. Должна использоваться в качестве альтернативы для конфигурации \"launch.json\", которая является общей для рабочих пространств"
- }
-\ No newline at end of file
-changed in both
-  base   100644 c65b07d5bd4669409c08b08a0eb22a96caea9b80 i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 23eb63e486d254cf5d707329f4a13e4ae0e33119 i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 fb28b2912a17bf9fa0ecf86ba0f92bd86ec00e2c i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-changed in both
-  base   100644 edb64b6540113fd6b38893edd87a2b6aa7656fc2 i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 bd475832dcfff4640327a5b72df263d4356ba205 i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 af8481a7c6b9b987baf8008cff649749652e0328 i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-changed in both
-  base   100644 1a77178244f07e006e80081bec0e62161e6a4a1d i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 11278b85abb135a3195540e01213542dadbc0081 i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 885c22357917acfa43a587d99083082fb4729d4a i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -8,6 +8,10 @@
- 	],
- 	"neverShowAgain": "Больше не показывать",
- 	"searchMarketplace": "Поиск в Marketplace",
-+<<<<<<< .our
-+=======
-+	"showLanguagePackExtensions": "В Marketplace есть расширения, которые помогут локализовать VS Code на язык \"{0}\"",
-+>>>>>>> .their
- 	"dynamicWorkspaceRecommendation": "Это расширение может вас заинтересовать, потому что оно популярно среди пользователей репозитория {0}.",
- 	"exeBasedRecommendation": "Рекомендуется использовать это расширение, так как установлено {0}.",
- 	"fileBasedRecommendation": "Рекомендуется использовать это расширение (на основе недавно открытых файлов).",
-changed in both
-  base   100644 fc2676c541bdf82c50f159619a26ce5bc21e162b i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  our    100644 2237c231d50e522f4f8d9167763aa06917febb9b i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  their  100644 a5a34da17d1f5aab3654a7aab758b5030a18de44 i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-@@ -12,9 +12,13 @@
- 	"recommendedExtensions": "Рекомендуемое",
- 	"otherRecommendedExtensions": "Другие рекомендации",
- 	"workspaceRecommendedExtensions": "Рекомендации рабочей области",
-+<<<<<<< .our
- 	"builtInExtensions": "Функции",
- 	"builtInThemesExtensions": "Темы",
- 	"builtInBasicsExtensions": "Языки программирования",
-+=======
-+	"builtInExtensions": "Встроенный",
-+>>>>>>> .their
- 	"searchExtensions": "Поиск расширений в Marketplace",
- 	"sort by installs": "Сортировать по: числу установок",
- 	"sort by rating": "Сортировать по: рейтинг",
-changed in both
-  base   100644 854d944c7275e4cf46446263f77224e09c88c4e4 i18n/rus/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
-  our    100644 0a02049f6bebe1cbd6f325c0c02fa2c18c226452 i18n/rus/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
-  their  100644 8bdeff6f3d9d50b0d703be25ee87fe7a16cc658a i18n/rus/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
-@@ -10,7 +10,11 @@
- 	"malicious": "Это расширение помечено как проблемное.",
- 	"installingMarketPlaceExtension": "Установка расширения из Marketplace...",
- 	"uninstallingExtension": "Удаление расширения...",
-+<<<<<<< .our
- 	"enableDependeciesConfirmation": "При включении расширения также будут включены его зависимости. Вы действительно хотите продолжить?",
-+=======
-+	"enableDependeciesConfirmation": "При включении \"{0}\" также будут включены его зависимости. Вы действительно хотите продолжить?",
-+>>>>>>> .their
- 	"enable": "Да",
- 	"doNotEnable": "Нет",
- 	"disableDependeciesConfirmation": "Вы хотели бы также отключить зависимости расширения?",
-changed in both
-  base   100644 920de1dbb72e83e186a9d9ecf5872e93f82d4f5d i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 2c38d1331217bb70a1fc665d1c79c9658eacde43 i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 6be9e34370609048ccd26a2ac486719651a720e0 i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-changed in both
-  base   100644 42c4426c51c4186a178944573a5dd2cd9486aa42 i18n/rus/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  our    100644 b30660862fb648d55c4895c7ccb26b222d765662 i18n/rus/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  their  100644 4d9d86ce6f117ae7f1dc0f5678f7144f34e1387d i18n/rus/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-@@ -7,9 +7,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"fileInputAriaLabel": "Введите имя файла. Нажмите клавишу ВВОД, чтобы подтвердить введенные данные, или ESCAPE для отмены.",
-+<<<<<<< .our
- 	"createFileFromExplorerInfoMessage": "Создать файл **{0}** в **{1}**",
- 	"renameFileFromExplorerInfoMessage": "Переместить и переименовать в **{0}**",
- 	"createFolderFromExplorerInfoMessage": "Создать папку **{0}** в **{1}**",
-+=======
-+	"constructedPath": "Создать {0} в **{1}**",
-+>>>>>>> .their
- 	"filesExplorerViewerAriaLabel": "{0}, Проводник",
- 	"dropFolders": "Вы хотите действительно добавить папки в эту рабочую область?",
- 	"dropFolder": "Вы хотите действительно добавить папку в эту рабочую область?",
-changed in both
-  base   100644 e6984a4fa527805b239d5a3ac7aac95bde2db175 i18n/rus/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-  our    100644 a63d40973586dbf4b8e760b8f38c33a93f46bbeb i18n/rus/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-  their  100644 430f371b6992be23408995df7ed20b77ee775ad7 i18n/rus/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-changed in both
-  base   100644 32bb015871dc394f870aed4e9b5543ca63173aed i18n/rus/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  our    100644 b1ff2f3c4a2f645fbb9eec41aa8aaf1e9cdae2c6 i18n/rus/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  their  100644 1199d8b14270b7d9ab9a272476547db92b838ffb i18n/rus/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-changed in both
-  base   100644 c6c7c3a1e7f259b2899795d3a7bfdf79bb14444d i18n/rus/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 113d804b27033c0eb1fd8478b7abca09ae0f3e64 i18n/rus/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 f4733a91f5abdb6b17a5654ffcacb7b9218bfa66 i18n/rus/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -31,5 +31,9 @@
- 	"search.followSymlinks": "Определяет, нужно ли следовать символическим ссылкам при поиске.",
- 	"search.smartCase": "Выполняет поиск без учета регистра, если шаблон состоит только из букв нижнего регистра; в противном случае выполняет поиск с учетом регистра",
- 	"search.globalFindClipboard": "Определяет, должно ли представление поиска считывать или изменять общий буфер обмена поиска в macOS",
-+<<<<<<< .our
- 	"search.location": "Управляет тем, будет ли панель поиска отображаться в виде представления в боковой колонке или в виде панели в области панели, чтобы освободить пространство по горизонтали."
-+=======
-+	"search.location": "Предварительная версия: управляет тем, будет ли панель поиска отображаться в виде представления в боковой колонке или в виде панели в области панели для освобождения пространства по горизонтали. В следующем выпуске горизонтальное расположение поиска в панели будет улучшено, и этот параметр больше не будет находиться в предварительной версии."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 68b2f4a49ee9cc061928122b593741c84f87f9db i18n/rus/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
-  our    100644 9e1a9301226379a1a9853d968b0442ed95aa6d8c i18n/rus/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
-  their  100644 ccc1b54893dd24546bc65869061365f9145f39a5 i18n/rus/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
-changed in both
-  base   100644 6ac5b4ce535b308aac61d010183f36861dc22c09 i18n/rus/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 3ad2e6ca5f31ca94a9cdd8a18a046b2a9773636b i18n/rus/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 8cccd04ba000557ab6374b03bdf0234b5e5274a6 i18n/rus/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -31,10 +31,15 @@
- 	"selectProblemMatcher": "Выберите, на какие ошибки и предупреждения следует проверять выходные данные задачи",
- 	"customizeParseErrors": "В конфигурации текущей задачи есть ошибки. Исправьте ошибки перед изменением задачи.",
- 	"moreThanOneBuildTask": "В файле tasks.json определено несколько задач сборки. Выполняется первая задача.\n",
-+<<<<<<< .our
- 	"TaskSystem.activeSame.background": "Задача '{0}' уже активна и находится в фоновом режиме.",
- 	"TaskSystem.activeSame.noBackground": "Задача '{0}' уже выполняется.",
- 	"terminateTask": "Завершить задачу",
- 	"restartTask": "Перезапустить задачу",
-+=======
-+	"TaskSystem.activeSame.background": "Задача '{0}' уже активна и находится в фоновом режиме. Чтобы завершить задачу, выберите \"Завершить задачу\" в меню \"Задачи\".",
-+	"TaskSystem.activeSame.noBackground": "Задача '{0}' уже активна. Чтобы завершить задачу, выберите \"Завершить задачу\" из меню \"Задачи\".",
-+>>>>>>> .their
- 	"TaskSystem.active": "Уже выполняется задача. Завершите ее, прежде чем выполнять другую задачу.",
- 	"TaskSystem.restartFailed": "Не удалось завершить и перезапустить задачу {0}",
- 	"TaskService.noConfiguration": "Ошибка: в определении задачи {0} не выявлена задача для следующей конфигурации:\n{1}\nЗадача будет проигнорирована.\n",
-changed in both
-  base   100644 ea9e10c90b4f9ee5639b285e67f0b9a4a76ce153 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 e05b07ca1e0540b56ed4788f50fea5db9d3c3f96 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 d655f6f3a72572ffa11c33a5d498c497f9055df9 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -27,8 +27,12 @@
- 	"terminal.integrated.cursorStyle": "Определяет стиль курсора терминала.",
- 	"terminal.integrated.scrollback": "Определяет предельное число строк в буфере терминала.",
- 	"terminal.integrated.setLocaleVariables": "Управляет заданием переменных при запуске терминала, значение по умолчанию: \"True\" для OS X и \"False\" для других платформ.",
-+<<<<<<< .our
- 	"terminal.integrated.rendererType": "Управляет отображением терминала. Допустимые значения: \"canvas\" (использование стандартного быстрого модуля отображения на основе холста), \"dom\" (использование резервного модуля отображения на основе DOM) и \"auto\" (модуль отображения определяется средой VS Code). После изменения этого параметра необходимо перезапустить VS, чтобы изменения вступили в силу.",
- 	"terminal.integrated.rightClickBehavior": "Управляет тем, как терминал реагирует на щелчок правой кнопкой мыши. Возможные значения: \"default\", \"copyPaste\" и \"selectWord\". При выборе варианта \"default\" будет отображаться контекстное меню, при выборе варианта \"copyPaste\" выделенный текст будет скопирован, а при отсутствии выделенного текста – вставлен, при выборе варианта \"selectWord\" будет выбрано слово, над которым находится курсор, и будет отображено контекстное меню.",
-+=======
-+	"terminal.integrated.rightClickBehavior": "Управляет тем, как терминал реагирует на щелчок правой кнопкой мыши. Возможные значения: 'default', 'copyPaste' и 'selectWord'. При выборе варианта 'default' будет показано контекстное меню, при выборе варианта 'copyPaste' выделенный текст будет скопирован, а при отсутствии выделенного текста - вставлен, при выборе варианта 'selectWord' будет выбрано слово, над которым находится курсор, и показано контекстное меню.",
-+>>>>>>> .their
- 	"terminal.integrated.cwd": "Путь явного запуска, по которому будет запущен терминал. Используется в качестве текущего рабочего каталога (cwd) для процесса оболочки. Это может быть особенно удобно в параметрах рабочей области, если корневой каталог не является подходящим каталогом cwd.",
- 	"terminal.integrated.confirmOnExit": "Указывает, следует ли при выходе выводить подтверждение об имеющихся активных сеансах терминала.",
- 	"terminal.integrated.enableBell": "Определяет, включен ли \"звонок\" терминала.",
-changed in both
-  base   100644 89fbe3e7861b7315eaa79b1b7ab8a47e5bc610b2 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 ea0d455fc7f4fc786ef2ef083f3b437a535a441a i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 17bf9786dc448c39271715a4cc7d617c1a4d1e3a i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -21,7 +21,10 @@
- 	"workbench.action.terminal.newWorkspacePlaceholder": "Выбрать текущий рабочий каталог для нового терминала",
- 	"workbench.action.terminal.newInActiveWorkspace": "Создать новый интегрированный терминал (в активной рабочей области)",
- 	"workbench.action.terminal.split": "Разделить терминал",
-+<<<<<<< .our
- 	"workbench.action.terminal.splitInActiveWorkspace": "Разбить окно терминала (в активной рабочей области)",
-+=======
-+>>>>>>> .their
- 	"workbench.action.terminal.focusPreviousPane": "Перейти на предыдущую область",
- 	"workbench.action.terminal.focusNextPane": "Перейти на следующую область",
- 	"workbench.action.terminal.resizePaneLeft": "Изменить размер области слева",
-changed in both
-  base   100644 d7bb123b0df92b685706c8888352dd9de0bf6657 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-  our    100644 ff481cfdd880da29631a3150be6e33de6483b2b1 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-  their  100644 86dafb69b0f1a05f940166f6812932eabc9e97bc i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-@@ -9,6 +9,7 @@
- 	"terminal.integrated.a11yBlankLine": "Пустая строка",
- 	"terminal.integrated.a11yPromptLabel": "Ввод терминала",
- 	"terminal.integrated.a11yTooMuchOutput": "Объем выходных данных слишком велик для создания оповещения; проверьте строки вручную",
-+<<<<<<< .our
- 	"yes": "Да",
- 	"terminal.rendererInAllNewTerminals": "Во всех созданных терминалах будет использоваться модуль отображения, не связанный с GPU.",
- 	"no": "Нет",
-@@ -19,4 +20,10 @@
- 	"terminal.integrated.waitOnExit": "Нажмите любую клавишу, чтобы закрыть терминал.",
- 	"terminal.integrated.launchFailed": "Не удалось запустить команду процесса терминала \"{0}{1}\" (код выхода: {2})",
- 	"terminal.integrated.launchFailedExtHost": "Не удалось запустить процесс терминала (код выхода: {0})"
-+=======
-+	"terminal.integrated.copySelection.noSelection": "В терминале отсутствует выделенный текст для копирования",
-+	"terminal.integrated.exitedWithCode": "Процесс терминала завершен с кодом выхода: {0}",
-+	"terminal.integrated.waitOnExit": "Нажмите любую клавишу, чтобы закрыть терминал.",
-+	"terminal.integrated.launchFailed": "Не удалось запустить команду процесса терминала \"{0}{1}\" (код выхода: {2})"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 b783131395a6d37718e0487d73fe713a7c89c06b i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
-  our    100644 ef726c94acee90c704377567cf545fd4e6df070b i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
-  their  100644 21822900dfd7f0f458936ed2f635420262e86068 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
-@@ -12,5 +12,6 @@
- 	"split": "Разделить",
- 	"paste": "Вставить",
- 	"selectAll": "Выбрать все",
--	"clear": "Очистить"
-+	"clear": "Очистить",
-+	"split": "Разделить"
- }
-\ No newline at end of file
-changed in both
-  base   100644 9582d9255b223bd82da2988f09d173cdc41b1b53 i18n/rus/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 0aa456751192f6ae65f23c8eacec75c6ffe01fe8 i18n/rus/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 d80a8d53e52d6e6fcd5a5c6f3ee7e8c3b4dc007e i18n/rus/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -15,6 +15,10 @@
- 	"updateIsReady": "Доступно новое обновление {0}.",
- 	"noUpdatesAvailable": "Доступные обновления отсутствуют.",
- 	"ok": "ОК",
-+<<<<<<< .our
-+=======
-+	"download now": "Скачать сейчас",
-+>>>>>>> .their
- 	"thereIsUpdateAvailable": "Доступно обновление.",
- 	"download now": "Скачать сейчас",
- 	"later": "Позже",
-changed in both
-  base   100644 a9a63802981cbd534a0fa186d0870d04f6e80ade i18n/rus/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 466dfbc590c46288cb65b00cb7bf87e50489e811 i18n/rus/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 e4d71e0dc544f4c049bc7ff3b972f8c50b65025d i18n/rus/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-changed in both
-  base   100644 8d9d6a48ce34a974c867208292d4d791a55b7fee i18n/rus/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
-  our    100644 33b2d118ad14d54ae3f865be734bccaf4aae6f9f i18n/rus/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
-  their  100644 e54214e402741d66346f0f7ae58c0828d5430b5e i18n/rus/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
-changed in both
-  base   100644 4093385ee521c009b23520e71b4b4701b3a4a8c3 i18n/rus/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-  our    100644 8ebd66bbd8687e5622cde77b9ebb281a304ed8a9 i18n/rus/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-  their  100644 bd6cb49d41e2b8b18b56f0e9149b7458583680a3 i18n/rus/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-@@ -9,6 +9,7 @@
- 	"netVersionError": "Требуется платформа Microsoft .NET Framework 4.5. Нажмите ссылку, чтобы установить ее.",
- 	"installNet": "Скачать .NET Framework 4.5",
- 	"neverShowAgain": "Больше не показывать",
-+<<<<<<< .our
- 	"enospcError": "{0} не удалось проследить изменения файлов в этой большой рабочей области. Для решения проблемы воспользуйтесь ссылкой на инструкции.",
- 	"learnMore": "Инструкции",
- 	"fileInvalidPath": "Недопустимый ресурс файла ({0})",
-@@ -24,6 +25,11 @@
- 	"fileReadOnlyError": "Файл доступен только для чтения",
- 	"fileMoveConflict": "Невозможно переместить или скопировать файл, так как он уже существует в папке назначения.",
- 	"unableToMoveCopyError": "Невозможно переместить или скопировать файл, так как он заменил бы папку, в которой содержится.",
-+=======
-+	"netVersionError": "Требуется платформа Microsoft .NET Framework 4.5. Нажмите ссылку, чтобы установить ее.",
-+	"learnMore": "Инструкции",
-+	"enospcError": "В {0} закончились дескрипторы файлов. Для решения проблемы воспользуйтесь ссылкой на инструкции.",
-+>>>>>>> .their
- 	"binFailed": "Не удалось переместить \"{0}\" в корзину",
- 	"trashFailed": "Не удалось переместить \"{0}\" в корзину."
- }
-\ No newline at end of file
-merged
-  result 100644 041ccc58fa520a98dae78771800f645f1d1bffa0 i18n/rus/src/vs/workbench/services/files/node/fileService.i18n.json
-  our    100644 10de0847f46ee9702ad03a0d05b0874fadaa8148 i18n/rus/src/vs/workbench/services/files/node/fileService.i18n.json
-@@ -9,6 +9,7 @@
- 	"fileInvalidPath": "Недопустимый ресурс файла ({0})",
- 	"fileIsDirectoryError": "Файл является каталогом",
- 	"fileNotModifiedError": "undefined",
-+	"fileTooLargeForHeapError": "Размер файла превышает объем памяти окна, попробуйте выполнить код с параметром --max-memory=новый_объем_памяти",
- 	"fileTooLargeError": "Не удается открыть файл, так как он имеет слишком большой размер",
- 	"fileNotFoundError": "Файл не найден ({0})",
- 	"fileBinaryError": "Похоже, файл является двоичным, и его нельзя открыть как текстовый.",
-changed in both
-  base   100644 fdcabcf4ece6210e77860b10fd6a26a3bf4fcc5d i18n/trk/extensions/css/package.i18n.json
-  our    100644 66b4b1f0603088d4b36204dc80aa234f4af34f75 i18n/trk/extensions/css/package.i18n.json
-  their  100644 16d27b93d738a4126b697df53d22b17688217078 i18n/trk/extensions/css/package.i18n.json
-@@ -6,6 +6,81 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "CSS Dil Temelleri",
- 	"description": "CSS, LESS ve SCSS dosyaları için söz dizimi vurgulama ve ayraç eşleştirme sağlar."
-+=======
-+	"displayName": "CSS Dili Özellikleri",
-+	"description": "CSS, LESS, SCSS dosyaları için zengin dil desteği sağlar.",
-+	"css.title": "CSS",
-+	"css.lint.argumentsInColorFunction.desc": "Geçersiz sayıda parametre",
-+	"css.lint.boxModel.desc": "Doldurma veya kenarlık kullanırken genişlik veya yükseklik kullanmayın",
-+	"css.lint.compatibleVendorPrefixes.desc": "Satıcıya özgü bir ön ek kullanırken satıcıya özgü diğer tüm özellikleri de dahil ettiğinizden emin olun",
-+	"css.lint.duplicateProperties.desc": "Yinelenen stil tanımları kullanmayın",
-+	"css.lint.emptyRules.desc": "Boş kural kümeleri kullanmayın",
-+	"css.lint.float.desc": "'float' kullanmaktan kaçının. Float'lar, düzenin herhangi bir unsuru değiştiğinde kolayca bozulan kırılgan CSS ile sonuçlanır.",
-+	"css.lint.fontFaceProperties.desc": "@font-face kuralı 'src' ve 'font-family' özelliklerini tanımlamalıdır",
-+	"css.lint.hexColorLength.desc": "Onaltılık renkler üç veya altı onaltılık sayıdan oluşmalıdır",
-+	"css.lint.idSelector.desc": "Bu kurallar HTML'ye çok sıkı bağlı olduğundan seçiciler kimlikleri içermemelidir.",
-+	"css.lint.ieHack.desc": "IE izinsiz girişleri yalnızca IE7 ve daha eski sürümler desteklenirken gereklidir",
-+	"css.lint.important.desc": "!important kullanmaktan kaçının. Tüm CSS'nin belirginlik düzeyi üzerindeki denetimin kaybedildiğinin ve yeniden düzenlenmesi gerektiğinin bir belirtisidir.",
-+	"css.lint.importStatement.desc": "İçe aktarma deyimleri paralel olarak yüklenmez",
-+	"css.lint.propertyIgnoredDueToDisplay.desc": "Özellik gösterim nedeniyle yoksayıldı. Örn. 'display: inline' ile width, height, margin-top, margin-bottom ve float özelliklerinin hiçbir etkisi olmaz",
-+	"css.lint.universalSelector.desc": "Evrensel seçici (*) yavaş olarak bilinir",
-+	"css.lint.unknownProperties.desc": "Bilinmeyen özellik.",
-+	"css.lint.unknownVendorSpecificProperties.desc": "Bilinmeyen satıcıya özel özellik.",
-+	"css.lint.vendorPrefix.desc": "Satıcıya özgü bir ön ek kullanırken standart özelliği de dahil edin",
-+	"css.lint.zeroUnits.desc": "Sıfır için birim gerekmez",
-+	"css.trace.server.desc": "VS Code ve CSS dil sunucusu arasındaki iletişimi izler.",
-+	"css.validate.title": "CSS doğrulamasını ve sorunların önem derecelerini denetler.",
-+	"css.validate.desc": "Tüm doğrulamaları etkinleştirir veya devre dışı bırakır",
-+	"less.title": "LESS",
-+	"less.lint.argumentsInColorFunction.desc": "Geçersiz sayıda parametre",
-+	"less.lint.boxModel.desc": "Doldurma veya kenarlık kullanırken genişlik veya yükseklik kullanmayın",
-+	"less.lint.compatibleVendorPrefixes.desc": "Satıcıya özgü bir ön ek kullanırken satıcıya özgü diğer tüm özellikleri de dahil ettiğinizden emin olun",
-+	"less.lint.duplicateProperties.desc": "Yinelenen stil tanımları kullanmayın",
-+	"less.lint.emptyRules.desc": "Boş kural kümeleri kullanmayın",
-+	"less.lint.float.desc": "'float' kullanmaktan kaçının. Float'lar, düzenin herhangi bir unsuru değiştiğinde kolayca bozulan kırılgan CSS ile sonuçlanır.",
-+	"less.lint.fontFaceProperties.desc": "@font-face kuralı 'src' ve 'font-family' özelliklerini tanımlamalıdır",
-+	"less.lint.hexColorLength.desc": "Onaltılık renkler üç veya altı onaltılık sayıdan oluşmalıdır",
-+	"less.lint.idSelector.desc": "Bu kurallar HTML'ye çok sıkı bağlı olduğundan seçiciler kimlikleri içermemelidir.",
-+	"less.lint.ieHack.desc": "IE izinsiz girişleri yalnızca IE7 ve daha eski sürümler desteklenirken gereklidir",
-+	"less.lint.important.desc": "!important kullanmaktan kaçının. Tüm CSS'nin belirginlik düzeyi üzerindeki denetimin kaybedildiğinin ve yeniden düzenlenmesi gerektiğinin bir belirtisidir.",
-+	"less.lint.importStatement.desc": "İçe aktarma deyimleri paralel olarak yüklenmez",
-+	"less.lint.propertyIgnoredDueToDisplay.desc": "Özellik gösterim nedeniyle yoksayıldı. Örn. 'display: inline' ile width, height, margin-top, margin-bottom ve float özelliklerinin hiçbir etkisi olmaz",
-+	"less.lint.universalSelector.desc": "Evrensel seçici (*) yavaş olarak bilinir",
-+	"less.lint.unknownProperties.desc": "Bilinmeyen özellik.",
-+	"less.lint.unknownVendorSpecificProperties.desc": "Bilinmeyen satıcıya özel özellik.",
-+	"less.lint.vendorPrefix.desc": "Satıcıya özgü bir ön ek kullanırken standart özelliği de dahil edin",
-+	"less.lint.zeroUnits.desc": "Sıfır için birim gerekmez",
-+	"less.validate.title": "LESS doğrulamasını ve sorunların önem derecelerini denetler.",
-+	"less.validate.desc": "Tüm doğrulamaları etkinleştirir veya devre dışı bırakır",
-+	"scss.title": "SCSS (Sass)",
-+	"scss.lint.argumentsInColorFunction.desc": "Geçersiz sayıda parametre",
-+	"scss.lint.boxModel.desc": "Doldurma veya kenarlık kullanırken genişlik veya yükseklik kullanmayın",
-+	"scss.lint.compatibleVendorPrefixes.desc": "Satıcıya özgü bir ön ek kullanırken satıcıya özgü diğer tüm özellikleri de dahil ettiğinizden emin olun",
-+	"scss.lint.duplicateProperties.desc": "Yinelenen stil tanımları kullanmayın",
-+	"scss.lint.emptyRules.desc": "Boş kural kümeleri kullanmayın",
-+	"scss.lint.float.desc": "'float' kullanmaktan kaçının. Float'lar, düzenin herhangi bir unsuru değiştiğinde kolayca bozulan kırılgan CSS ile sonuçlanır.",
-+	"scss.lint.fontFaceProperties.desc": "@font-face kuralı 'src' ve 'font-family' özelliklerini tanımlamalıdır",
-+	"scss.lint.hexColorLength.desc": "Onaltılık renkler üç veya altı onaltılık sayıdan oluşmalıdır",
-+	"scss.lint.idSelector.desc": "Bu kurallar HTML'ye çok sıkı bağlı olduğundan seçiciler kimlikleri içermemelidir.",
-+	"scss.lint.ieHack.desc": "IE izinsiz girişleri yalnızca IE7 ve daha eski sürümler desteklenirken gereklidir",
-+	"scss.lint.important.desc": "!important kullanmaktan kaçının. Tüm CSS'nin belirginlik düzeyi üzerindeki denetimin kaybedildiğinin ve yeniden düzenlenmesi gerektiğinin bir belirtisidir.",
-+	"scss.lint.importStatement.desc": "İçe aktarma deyimleri paralel olarak yüklenmez",
-+	"scss.lint.propertyIgnoredDueToDisplay.desc": "Özellik gösterim nedeniyle yoksayıldı. Örn. 'display: inline' ile width, height, margin-top, margin-bottom ve float özelliklerinin hiçbir etkisi olmaz",
-+	"scss.lint.universalSelector.desc": "Evrensel seçici (*) yavaş olarak bilinir",
-+	"scss.lint.unknownProperties.desc": "Bilinmeyen özellik.",
-+	"scss.lint.unknownVendorSpecificProperties.desc": "Bilinmeyen satıcıya özel özellik.",
-+	"scss.lint.vendorPrefix.desc": "Satıcıya özgü bir ön ek kullanırken standart özelliği de dahil edin",
-+	"scss.lint.zeroUnits.desc": "Sıfır için birim gerekmez",
-+	"scss.validate.title": "SCSS doğrulamasını ve sorunların önem derecelerini denetler.",
-+	"scss.validate.desc": "Tüm doğrulamaları etkinleştirir veya devre dışı bırakır",
-+	"less.colorDecorators.enable.desc": "Renk dekoratörlerini etkinleştirir veya devre dışı bırakır",
-+	"scss.colorDecorators.enable.desc": "Renk dekoratörlerini etkinleştirir veya devre dışı bırakır",
-+	"css.colorDecorators.enable.desc": "Renk dekoratörlerini etkinleştirir veya devre dışı bırakır",
-+	"css.colorDecorators.enable.deprecationMessage": "`css.colorDecorators.enable` ayarı, `editor.colorDecorators` yüzünden kullanım dışıdır.",
-+	"scss.colorDecorators.enable.deprecationMessage": "`scss.colorDecorators.enable` ayarı, `editor.colorDecorators` yüzünden kullanım dışıdır.",
-+	"less.colorDecorators.enable.deprecationMessage": "`less.colorDecorators.enable` ayarı, `editor.colorDecorators` yüzünden kullanım dışıdır."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 3ff640e7d9dd5700380885cfbe2e06f6375a682b i18n/trk/extensions/emmet/package.i18n.json
-  our    100644 da0ca75d8cf264d2aa273bacfc4c88c0e06fd83f i18n/trk/extensions/emmet/package.i18n.json
-  their  100644 f11753f30764fff6c90676a7afe9bcc0d694c623 i18n/trk/extensions/emmet/package.i18n.json
-changed in both
-  base   100644 00e0da3830a10eecdcde95ea66b9ddd850881b94 i18n/trk/extensions/html/package.i18n.json
-  our    100644 7b449502bb09e8eb93e2740266484b88cac8470c i18n/trk/extensions/html/package.i18n.json
-  their  100644 6cae077d9f9f4d2381b7b36a98967545adce474d i18n/trk/extensions/html/package.i18n.json
-@@ -6,6 +6,34 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "HTML Dil Temelleri",
- 	"description": "HTML dosyaları için söz dizimi vurgulama, ayraç eşleştirme ve kod parçacıkları sağlar."
-+=======
-+	"displayName": "HTML Dili Özellikleri",
-+	"description": "HTML, Razor ve Handlebar dosyaları için zengin dil desteği sağlar.",
-+	"html.format.enable.desc": "Varsayılan HTML biçimlendiricisini etkinleştirin/devre dışı bırakın",
-+	"html.format.wrapLineLength.desc": "Satır başına en fazla karakter miktarı (0 = devre dışı bırak)",
-+	"html.format.unformatted.desc": "Yeniden biçimlendirilmeyecek virgülle ayrılmış etiketler listesi. 'null' değeri, https://www.w3.org/TR/html5/dom.html#phrasing-content adresinde listelenen tüm etiketleri varsayılan olarak belirler.",
-+	"html.format.contentUnformatted.desc": "İçeriğin yeniden biçimlendirilmeyeceği virgülle ayrılmış etiketler listesi. 'null' değeri, 'pre' etiketini varsayılan olarak belirler.",
-+	"html.format.indentInnerHtml.desc": "<head> ve <body> bölümlerini girintile.",
-+	"html.format.preserveNewLines.desc": "Ögelerden önceki mevcut satır sonlarının korunup korunmayacağı. Yalnızca ögelerden önce çalışır, etiketler içinde veya metinde çalışmaz.",
-+	"html.format.maxPreserveNewLines.desc": "Bir öbekte korunacak maksimum satır sonu sayısı. Sınırsız için 'null' değerini kullanın.",
-+	"html.format.indentHandlebars.desc": "{{#foo}} ve {{/foo}}'yu biçimlendir ve girintile.",
-+	"html.format.endWithNewline.desc": "Boş bir satırla bitir.",
-+	"html.format.extraLiners.desc": "Kendilerinden önce ek bir boş satır bulunması gereken virgülle ayrılmış etiketler listesi. 'null' değeri, \"head, body, /html\" değerini varsayılan olarak belirler.",
-+	"html.format.wrapAttributes.desc": "Öznitelikleri sarmala.",
-+	"html.format.wrapAttributes.auto": "Öznitelikleri sadece satır uzunluğu aşıldığında sarmala.",
-+	"html.format.wrapAttributes.force": "İlki hariç tüm öznitelikleri sarmala.",
-+	"html.format.wrapAttributes.forcealign": "İlki hariç tüm öznitelikleri sarmala ve hizada tut.",
-+	"html.format.wrapAttributes.forcemultiline": "Tüm öznitelikleri sarmala.",
-+	"html.suggest.angular1.desc": "Yerleşik HTML dili desteğinin Angular V1 etiketlerini ve özelliklerini önerip önermeyeceğini yapılandırır.",
-+	"html.suggest.ionic.desc": "Yerleşik HTML dili desteğinin Ionic etiketlerini, özelliklerini ve değerlerini önerip önermeyeceğini yapılandırır.",
-+	"html.suggest.html5.desc": "Yerleşik HTML dili desteğinin HTML5 etiketlerini, özelliklerini ve değerlerini önerip önermeyeceğini yapılandırır.",
-+	"html.trace.server.desc": "VS Code ve HTML dil sunucusu arasındaki iletişimi izler.",
-+	"html.validate.scripts": "Yerleşik HTML dili desteğinin HTML5 gömülü betikleri doğrulayıp doğrulamayacağını yapılandırır.",
-+	"html.validate.styles": "Yerleşik HTML dili desteğinin HTML5 gömülü stilleri doğrulayıp doğrulamayacağını yapılandırır.",
-+	"html.experimental.syntaxFolding": "Sözdimine duyarlı katlama işaretleyicilerini etkinleştirin/devre dışı bırakın.",
-+	"html.autoClosingTags": "HTML etiketlerinin otomatik kapatılmasını etkinleştirin/devre dışı bırakın"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 cc7602ffc909acea1118a24752fb14a3748d821a i18n/trk/extensions/npm/package.i18n.json
-  our    100644 2139346855fff5ec5963cac4c1aa77b373277a6f i18n/trk/extensions/npm/package.i18n.json
-  their  100644 12bf174d1ffaf7ff65db985882fe7732bcb04b16 i18n/trk/extensions/npm/package.i18n.json
-@@ -12,6 +12,7 @@
- 	"config.npm.runSilent": "npm komutlarını `--silent`(sessiz) seçeneğiyle çalıştır.",
- 	"config.npm.packageManager": "Betikleri çalıştırmada kullanılacak paket yöneticisi.",
- 	"config.npm.exclude": "Otomatik betik algılamadan hariç tutulacak klasörler için glob desenlerini yapılandırın.",
-+<<<<<<< .our
- 	"config.npm.enableScriptExplorer": "npm betikleri için gezgin görünümünü etkinleştir.",
- 	"config.npm.scriptExplorerAction": "Betik gezgininde kullanılan varsayılan tıklama eylemi: 'open' (aç) veya 'run' (çalıştır), varsayılan 'open'dır.",
- 	"npm.parseError": "Npm görev algılama: {0} dosyası ayrıştırılamadı",
-@@ -23,4 +24,9 @@
- 	"command.debug": "Hata Ayıkla",
- 	"command.openScript": "Aç",
- 	"command.runInstall": "Kurulumu Çalıştır"
-+=======
-+	"npm.parseError": "Npm görev algılama: {0} dosyası ayrıştırılamadı",
-+	"taskdef.script": "Özelleştirilecek npm betiği.",
-+	"taskdef.path": "Betiği sağlayan package.json dosyasını içeren klasör yolu. Atlanabilir."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 b854e4679a7c293fc0aa8da443150a1f626a58eb i18n/trk/extensions/php/package.i18n.json
-  our    100644 42f1e7562a4859b749897292f92c5d1ee98d39f5 i18n/trk/extensions/php/package.i18n.json
-  their  100644 dbcdfc169f61fede215a27f4bc53f7fff35d68d8 i18n/trk/extensions/php/package.i18n.json
-@@ -6,6 +6,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "PHP  Dil Temelleri",
- 	"description": "PHP dosyaları için söz dizimi vurgulama ve ayraç eşleştirme sağlar."
-+=======
-+	"configuration.suggest.basic": "Yerleşik PHP dili önerilerinin etkinleştirilip etkinleştirilmediğini yapılandırır. Destek, PHP globalleri ve değişkenleri önerir.",
-+	"configuration.validate.enable": "Yerleşik PHP doğrulamasını etkinleştir/devre dışı bırak.",
-+	"configuration.validate.executablePath": "PHP çalıştırılabilir dosyasına işaret eder.",
-+	"configuration.validate.run": "Doğrulayıcının kayıt esnasında mı tuşlama esnasında mı çalışacağı.",
-+	"configuration.title": "PHP",
-+	"commands.categroy.php": "PHP",
-+	"command.untrustValidationExecutable": "PHP doğrulama yürütülebilir dosyasına izin verme (çalışma alanı ayarı olarak tanımlanır)",
-+	"displayName": "PHP Dil Özellikleri",
-+	"description": "PHP dosyaları için gelişmiş kod tamamlama(IntelliSense), doğrulama ve dil temelleri sağlar."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c49abbf15bf5a40a1485a42f0b2dae1e4f78add1 i18n/trk/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  our    100644 1998afc436b21e1d4b60a22c372c3fee113efbf2 i18n/trk/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  their  100644 9a43ba50fdfd8c66b0ecd8f37fd5dc9d952774b6 i18n/trk/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-@@ -10,11 +10,18 @@
- 	"show": "göster",
- 	"previewOnGitHub": "GitHub'da Önizle",
- 	"loadingData": "Veri yükleniyor...",
-+<<<<<<< .our
- 	"rateLimited": "GitHub sorgu sınırı aşıldı. Lütfen bekleyin.",
- 	"similarIssues": "Benzer sorunlar",
- 	"open": "Aç",
- 	"closed": "Kapalı",
- 	"noSimilarIssues": "Benzer bir sorun bulunmadı",
-+=======
-+	"similarIssues": "Benzer sorunlar",
-+	"open": "Aç",
-+	"closed": "Kapalı",
-+	"noResults": "Sonuç bulunamadı",
-+>>>>>>> .their
- 	"settingsSearchIssue": "Ayar Arama Sorunu",
- 	"bugReporter": "Hata Raporu",
- 	"featureRequest": "Özellik İsteği",
-changed in both
-  base   100644 62bc8fce865b6857d4b003c856cadcbfa911034e i18n/trk/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  our    100644 cc635c3213aa540df09c2e4c4a87b6c4833861d6 i18n/trk/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  their  100644 0045409477d368da1e164733c2bc0ae389e070b4 i18n/trk/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-@@ -8,6 +8,7 @@
- 	],
- 	"completeInEnglish": "Lütfen formu İngilizce olarak doldurunuz.",
- 	"issueTypeLabel": "Bu bir",
-+<<<<<<< .our
- 	"issueSourceLabel": "Dosya konumu: ",
- 	"vscode": "Visual Studio Code",
- 	"extension": "Eklenti",
-@@ -25,4 +26,25 @@
- 	"sendExtensions": " Aktif eklentilerimi dahil et ({0})",
- 	"sendSearchedExtensions": "Aranan eklentileri gönder ({0})",
- 	"sendSettingsSearchDetails": "Ayar arama detaylarını gönder ({0})"
-+=======
-+	"issueTitleLabel": "Başlık",
-+	"issueTitleRequired": "Lütfen bir başlık girin.",
-+	"titleLengthValidation": "Başlık çok uzun.",
-+	"systemInfo": "Sistem Bilgilerim",
-+	"sendData": "Verilerimi gönder",
-+	"processes": "Şu Anda Çalışan İşlemler",
-+	"workspaceStats": "Çalışma Alanı İstatistiklerim",
-+	"extensions": "Eklentilerim",
-+	"searchedExtensions": "Aranan Eklentiler",
-+	"settingsSearchDetails": "Ayar Arama Detayları",
-+	"tryDisablingExtensions": "Eklentiler devre dışı bırakıldığında sorun yeniden oluşturulabiliyor mu?",
-+	"yes": "Evet",
-+	"no": "Hayır",
-+	"disableExtensionsLabelText": "Sorunu {0} sonrasında yeniden oluşturmaya çalışın.",
-+	"disableExtensions": "tüm eklentileri devre dışı bırakıp pencereyi yeniden yükleyin",
-+	"showRunningExtensionsLabelText": "Bunun bir eklenti sorunu olduğundan şüpheleniyorsanız, eklentideki sorunu bildirmek için {0}.",
-+	"showRunningExtensions": "çalışan tüm eklentileri göster",
-+	"details": "Lütfen detayları giriniz.",
-+	"loadingData": "Veri yükleniyor..."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b7375c7657ff4bf384aafc3a5a9006938b55061 i18n/trk/src/vs/code/electron-main/menus.i18n.json
-  our    100644 ace3ab96e0fa1ead7fddaef7b7dca337a5d22633 i18n/trk/src/vs/code/electron-main/menus.i18n.json
-  their  100644 9196e669e0d9475db5d33b01b8c18e3752b28bb8 i18n/trk/src/vs/code/electron-main/menus.i18n.json
-changed in both
-  base   100644 5d60bc4462565ed8b02e29e991365e7a6861daaa i18n/trk/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 8beb681b33236f0693c452fd17c2070b7f15779a i18n/trk/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 9f87cfce52109c844ae857a7643b84538c8fd12a i18n/trk/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -15,7 +15,11 @@
- 	"errorInstallingDependencies": "Bağımlılıklar yüklenirken hata oluştu. {0}",
- 	"MarketPlaceDisabled": "Market etkin değil",
- 	"removeError": "Eklenti kaldırılırken hata oluştu: {0}. Yeniden yüklemeden önce lütfen VS Code'dan çıkın ve tekrar açın.",
-+<<<<<<< .our
- 	"Not a Marketplace extension": "Sadece Market Eklentileri yeniden yüklenebilir",
-+=======
-+	"Not Market place extension": "Sadece Market Eklentileri yeniden yüklenebilir",
-+>>>>>>> .their
- 	"notFoundCompatible": "'{0}' yüklenemiyor; VS Code '{1}' ile uyumlu mevcut bir sürümü yok.",
- 	"malicious extension": "Eklenti sorunlu olarak bildirildiği için yüklenemiyor.",
- 	"notFoundCompatibleDependency": "Yükleme başarısız oldu çünkü, bağımlılığı bulunan '{0}' eklentisinin uyumlu olduğu VS Code'un '{1}' sürümü bulunamadı.",
-changed in both
-  base   100644 39b98d79aef65dbce2e179ebcf883de780e7c7bf i18n/trk/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 fdc69c2c9e4d77a2bba5e0204a27fccdd7aa58e1 i18n/trk/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 1135da6951e2e3b8475288fb9b1a325cbeab9dca i18n/trk/src/vs/platform/theme/common/colorRegistry.i18n.json
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/trk/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
-  our    100644 d58fb353ecc783683e9228abdd183df55cb104ba i18n/trk/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
-  their  100644 4c6d2775a03311a1cd6f0185662c938aba01d2f4 i18n/trk/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
-@@ -6,5 +6,9 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"errorMessage": "Görünüm geri yüklenirken bir hata oluştu:{0}"
-+=======
-+	"webview.editor.label": "web görünümü düzenleyicisi"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/trk/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
-  our    100644 05ae29fe427059dd93b7c5a9a0f69c9cd43b2932 i18n/trk/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
-  their  100644 320cb9f421d251a8e092af21e6ef7197986c109e i18n/trk/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
-@@ -6,7 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"notificationsEmpty": "Yeni bildirim yok",
-+=======
-+>>>>>>> .their
- 	"notifications": "Bildirimler",
- 	"notificationsToolbar": "Bildirim Merkezi Eylemleri",
- 	"notificationsList": "Bildirim Listesi"
-changed in both
-  base   100644 95fbb405883049e7c927b9541b97db1231a47e18 i18n/trk/src/vs/workbench/common/theme.i18n.json
-  our    100644 c3e69879379552f9bae45b018ec024370c6f07fc i18n/trk/src/vs/workbench/common/theme.i18n.json
-  their  100644 760791b1fb89a097397d4e20143d488b668d9b1d i18n/trk/src/vs/workbench/common/theme.i18n.json
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/trk/src/vs/workbench/common/views.i18n.json
-  our    100644 352d616cb2388788962d28d337cb996ea2f9989a i18n/trk/src/vs/workbench/common/views.i18n.json
-  their  100644 08f2962090b07ab56ea85abaabcf5af67fa20127 i18n/trk/src/vs/workbench/common/views.i18n.json
-@@ -6,5 +6,9 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"duplicateId": "'{0}' id'sine sahip bir görünüm '{1}' konumunda zaten kayıtlı"
-+=======
-+	"duplicateId": "'{0}' kimliğine sahip bir görünüm '{1}' konumunda zaten kayıtlı"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 45dc78fea687fed576e068439a779ad410a6539a i18n/trk/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 44732b7e6176ac8f50fe0253110d6ef6cb302c9c i18n/trk/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 62ba73ec28b302c3551165315c816c138e6b75ae i18n/trk/src/vs/workbench/electron-browser/actions.i18n.json
-changed in both
-  base   100644 6bdd102db6e7027edc8d04f2a6ba021e0b90e462 i18n/trk/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 6083c93c0aa8c7594afe0d6fb609d69d65163ece i18n/trk/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 c69d16c0b90ac8eeca6cfdc83818739dc448655f i18n/trk/src/vs/workbench/electron-browser/main.contribution.i18n.json
-changed in both
-  base   100644 6f729c44540e8f8edfcbd52ffaa4d79d16facaf2 i18n/trk/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  our    100644 896aab5629dfd63cb9a0130680b00a270e20d698 i18n/trk/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  their  100644 7be66e01426021a5160b8a5a230b2e7cef43f292 i18n/trk/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-@@ -17,7 +17,10 @@
- 	"breakpointUnverifieddHover": "Doğrulanmamış kesme noktası",
- 	"functionBreakpointUnsupported": "Fonksiyon kesme noktaları bu hata ayıklama türü tarafından desteklenmiyor",
- 	"breakpointDirtydHover": "Doğrulanmamış Kesme Noktası Dosya düzenlendi, lütfen hata ayıklama oturumunu yeniden başlatın.",
-+<<<<<<< .our
- 	"logBreakpointUnsupported": "Günlük noktaları bu hata ayıklama türü tarafından desteklenmiyor",
-+=======
-+>>>>>>> .their
- 	"conditionalBreakpointUnsupported": "Koşullu kesme noktaları bu hata ayıklama türü tarafından desteklenmiyor",
- 	"hitBreakpointUnsupported": "Koşullu kesme noktalarına isabet etme bu hata ayıklama türü tarafından desteklenmiyor"
- }
-\ No newline at end of file
-changed in both
-  base   100644 9a0a5f4eacc07d25528875ca4e7680e53d2ba52e i18n/trk/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
-  our    100644 64d6f8c64c3c8140729a877ebc3d5a21bc65d159 i18n/trk/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
-  their  100644 193b6038cb4faa548c98e28faeaf79d1cb0e5fbd i18n/trk/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
-@@ -7,7 +7,11 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"noFolderDebugConfig": "Gelişmiş hata ayıklama yapılandırması yapmak için lütfen ilk olarak bir klasör açın.",
-+<<<<<<< .our
- 	"inlineBreakpoint": "Satır İçi Kesme Noktası",
-+=======
-+	"columnBreakpoint": "Sütun Kesme Noktası",
-+>>>>>>> .their
- 	"debug": "Hata Ayıklama",
- 	"addInlineBreakpoint": "Satır İçi Kesme Noktası Ekle"
- }
-\ No newline at end of file
-changed in both
-  base   100644 c177d5df06015ed27b8405aa776b342711e19a29 i18n/trk/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  our    100644 fc9660712fbcc4d7d3344b54d730783d0228ef60 i18n/trk/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-  their  100644 4c75dbda268f0264642d489cab3fcba882bfb62e i18n/trk/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
-changed in both
-  base   100644 4cd24fc349969d362f9151ef77b6596e83dba6a5 i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 3b4248d45e7ecb01c6045e1c3d824ba835249478 i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 af1679c27ae4b32bc57d5c9b4e3eca46edf1c470 i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-changed in both
-  base   100644 e7aaf5f6ff5d6f0d33a67828240945a6f663ffd2 i18n/trk/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 69722eca3eea4a8c67f00341a6ba461150a4d6f3 i18n/trk/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 ed1393cf72650f6fee47c371f632626e99c1993a i18n/trk/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-changed in both
-  base   100644 fd0ad46cea9f347a1dbba3a8fbe8de6d282cb54d i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 c1fd4a38b55f33cc75802aa90a13a4a917da2acc i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 f497a3c8bb140d429aa3a3e159842728ed2a53fd i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -8,6 +8,10 @@
- 	],
- 	"neverShowAgain": "Tekrar Gösterme",
- 	"searchMarketplace": "Marketi Ara",
-+<<<<<<< .our
-+=======
-+	"showLanguagePackExtensions": "Markette VS Code'un '{0}' diline çevrilmesine yardımcı olabilecek eklentiler bulunuyor",
-+>>>>>>> .their
- 	"dynamicWorkspaceRecommendation": "Bu eklenti {0} deposundaki kullanıcılar arasında popüler olduğu için ilginizi çekebilir.",
- 	"exeBasedRecommendation": "Bu eklenti, sizde {0} kurulu olduğu için tavsiye ediliyor.",
- 	"fileBasedRecommendation": "Bu eklenti yakınlarda açtığınız dosyalara dayanarak tavsiye ediliyor.",
-changed in both
-  base   100644 fff1a21a45b94e3571ef649010b8b6c0f4e2887e i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
-  our    100644 85e9f33569f15cf9329656412550f85ea322828b i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
-  their  100644 dd252153c0e73e1a76f1021751b35316dccafd28 i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.i18n.json
-@@ -15,6 +15,11 @@
- 	"developer": "Geliştirici",
- 	"extensionsConfigurationTitle": "Eklentiler",
- 	"extensionsAutoUpdate": "Eklentileri otomatik olarak güncelle",
-+<<<<<<< .our
- 	"extensionsIgnoreRecommendations": "\"true\" değeri atanırsa, eklenti tavsiyeleri bildirimleri artık gösterilmez.",
- 	"extensionsShowRecommendationsOnlyOnDemand": "\"true\" değeri atanırsa, kullanıcı tarafından özel olarak istenmedikçe tavsiyeler alınmaz ve gösterilmez."
-+=======
-+	"extensionsIgnoreRecommendations": "\"Doğru\" olarak ayarlanırsa, eklenti tavsiyeleri bildirimleri artık gösterilmez.",
-+	"extensionsShowRecommendationsOnlyOnDemand": "Doğru olarak ayarlanırsa, kullanıcı tarafından özel olarak istenmedikçe tavsiyeler alınmaz ve gösterilmez."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8a7b64b5ad3c19de14de3337b8585b2214969ebb i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  our    100644 059c3d6e6d6383142d7fde26f88119e50f546ac9 i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  their  100644 89dc18d2bf106d0733af725520c07d9e9c8f8597 i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-@@ -12,9 +12,13 @@
- 	"recommendedExtensions": "Tavsiye Edilen",
- 	"otherRecommendedExtensions": "Diğer Tavsiyeler",
- 	"workspaceRecommendedExtensions": "Çalışma Alanı Tavsiyeleri",
-+<<<<<<< .our
- 	"builtInExtensions": "Özellikler",
- 	"builtInThemesExtensions": "Temalar",
- 	"builtInBasicsExtensions": "Programlama Dilleri",
-+=======
-+	"builtInExtensions": "Yerleşik",
-+>>>>>>> .their
- 	"searchExtensions": "Markette Eklenti Ara",
- 	"sort by installs": "Sırala: Yüklenme Sayısına Göre",
- 	"sort by rating": "Sırala: Derecelendirmeye Göre",
-changed in both
-  base   100644 1a7aa8d959a999aa1c80409df890c090e06ce674 i18n/trk/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
-  our    100644 56c41f04369268a782850b59b44f5ac2be12ed08 i18n/trk/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
-  their  100644 e8da73abc2b949e10ddd16e215bb7008a4cdaa94 i18n/trk/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
-@@ -10,7 +10,11 @@
- 	"malicious": "Bu eklentinin sorunlu olduğu bildirildi.",
- 	"installingMarketPlaceExtension": "Marketten eklenti yükleniyor...",
- 	"uninstallingExtension": "Eklenti kaldırılıyor...",
-+<<<<<<< .our
- 	"enableDependeciesConfirmation": "Bir eklentiyi etkinleştirdiğinizde onun bağımlılıkları da etkinleştirilir. Devam etmek istiyor musunuz?",
-+=======
-+	"enableDependeciesConfirmation": "'{0}' eklentisini etkinleştirdiğinizde onun bağımlılıkları da etkinleştirilir. Devam etmek istiyor musunuz?",
-+>>>>>>> .their
- 	"enable": "Evet",
- 	"doNotEnable": "Hayır",
- 	"disableDependeciesConfirmation": "Eklentinin bağımlılıklarını da devre dışı bırakmak ister misiniz?",
-changed in both
-  base   100644 3559272c492ae69fea5e4511049551570561ff4b i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 43e3bf4348f9b7a25892a993e8f5dd85c62e9798 i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 be5917d32873ba9eb768821143642fabe009a9a4 i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-changed in both
-  base   100644 0f152512cf047332c9bb5a1bd59cc9d5d63688ea i18n/trk/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  our    100644 af5f75f59c7096d8e4e8c3fde1587903c351b5b4 i18n/trk/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  their  100644 cc968719081125fecde6c97ad5bf06ec67e1613a i18n/trk/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-@@ -7,9 +7,13 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"fileInputAriaLabel": "Dosya adı girin. Onaylamak için Enter'a, iptal etmek için Escape tuşuna basın.",
-+<<<<<<< .our
- 	"createFileFromExplorerInfoMessage": "**{1}** konumunda **{0}** adlı dosya oluştur",
- 	"renameFileFromExplorerInfoMessage": "Taşı ve **{0}** olarak yeniden adlandır",
- 	"createFolderFromExplorerInfoMessage": "**{1}** konumunda **{0}** adlı klasör oluştur",
-+=======
-+	"constructedPath": "**{1}** içinde {0} oluştur",
-+>>>>>>> .their
- 	"filesExplorerViewerAriaLabel": "{0}, Dosya Gezgini",
- 	"dropFolders": "Klasörleri çalışma alanına eklemek istiyor musunuz?",
- 	"dropFolder": "Klasörü çalışma alanına eklemek istiyor musunuz?",
-changed in both
-  base   100644 15272cac9b7cc971edd9e24c9eb72c89f3f5eeab i18n/trk/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  our    100644 467358d0b9f19ad682f44b3acc88d8457329d682 i18n/trk/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  their  100644 1cd086b7e3856e04bc3aaa8757a4518e7db3ba90 i18n/trk/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-changed in both
-  base   100644 5b8c8c6d6ead3f1dbaeaf82145ef5fd99caf431a i18n/trk/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 9e04840f3efedecf23f5b2d44316f1a7c8399da8 i18n/trk/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 63b497714c2fcff46728b28a2d703f91be512680 i18n/trk/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -31,5 +31,9 @@
- 	"search.followSymlinks": "Arama yaparken sembolik linklerin takip edilip edilmeyeceğini denetler.",
- 	"search.smartCase": "Örüntü tamamen küçük harflerden oluşuyorsa büyük küçük harf duyarlılığı olmadan arar, diğer durumda ise büyük küçük harf duyarlılığı ile arar",
- 	"search.globalFindClipboard": "macOS'de arama görünümünün paylaşılan panoyu okuyup okumamasını veya değiştirip değiştirmemesini denetler",
-+<<<<<<< .our
- 	"search.location": "Aramanın kenar çubuğunda bir görünüm olarak mı yoksa daha fazla yatay boşluk için panel alanında bir panel olarak mı gösterileceğini denetler."
-+=======
-+	"search.location": "Önizleme: aramanın kenar çubuğunda bir görünüm olarak mı yoksa daha fazla yatay boşluk için panel alanında bir panel olarak mı gösterileceğini denetler. Bir sonraki sürümde paneldeki arama, geliştirilmiş yatay düzene sahip olacak ve bu bir önizleme olmaktan çıkacaktır."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 423e8e292e2afaa20e252c702897b9e971375ee7 i18n/trk/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 d266928557d5bfc332011e4d79ff493843cb99d1 i18n/trk/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 1d0ce65d0fbae861f2013b2e7965b64778bb2caa i18n/trk/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -31,10 +31,15 @@
- 	"selectProblemMatcher": "Görev çıktısında taranacak hata ve uyarı türlerini seçin",
- 	"customizeParseErrors": "Geçerli görev yapılandırmasında hatalar var. Lütfen, bir görevi özelleştirmeden önce ilk olarak hataları düzeltin.",
- 	"moreThanOneBuildTask": "tasks.json dosyasında tanımlı çok fazla derleme görevi var. İlk görev çalıştırılıyor.",
-+<<<<<<< .our
- 	"TaskSystem.activeSame.background": "'{0}' görevi zaten aktif ve arka plan modunda.",
- 	"TaskSystem.activeSame.noBackground": "'{0}' görevi zaten aktif.",
- 	"terminateTask": "Görevi Sonlandır",
- 	"restartTask": "Görevi Yeniden Başlat",
-+=======
-+	"TaskSystem.activeSame.background": "'{0}' görevi zaten aktif ve arka plan modunda. Görevi sonlandırmak için Görevler menüsünden 'Görevi Sonlandır...'ı kullanın.",
-+	"TaskSystem.activeSame.noBackground": " '{0}' görevi zaten aktif. Görevi sonlandırmak için Görevler menüsünden 'Görevi Sonlandır...'ı kullanın. ",
-+>>>>>>> .their
- 	"TaskSystem.active": "Çalışan bir görev zaten var. Bir başkasını çalıştırmadan önce bu görevi sonlandırın.",
- 	"TaskSystem.restartFailed": "{0} görevini sonlandırma ve yeniden başlatma başarısız oldu",
- 	"TaskService.noConfiguration": "Hata: {0} görev algılaması aşağıdaki yapılandırma için bir görev eklemesi yapmıyor:\n{1}\nYapılandırma yok sayılacaktır.\n",
-changed in both
-  base   100644 70b35e3951b87d306ac4027e9c14b494a51dbb6a i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 cadddf5c98ca328551b929daa1f8144365a09ca7 i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 25ed67b4e8052d5559f1ac0faa59ec8ea9ea2e16 i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -26,7 +26,11 @@
- 	"terminal.integrated.cursorStyle": "Terminaldeki imlecin stilini denetler.",
- 	"terminal.integrated.scrollback": "Terminalin tamponunda tuttuğu maksimum satır sayısını denetler.",
- 	"terminal.integrated.setLocaleVariables": "Terminal başlangıcında yereli içeren değişkenlerin ayarlanıp ayarlanmayacağını denetler; bu, OS X'de varsayılan olarak açıktır, diğer platformlarda kapalıdır.",
-+<<<<<<< .our
- 	"terminal.integrated.rightClickBehavior": "Terminalin sağ tıklamaya nasıl tepki vereceğini denetler, olası değerler \"default\", \"copyPaste\" ve \"selectWord\"dür. \"default\" bağlam menüsünü gösterir, \"copyPaste\" bir seçim varsa kopyalar yoksa yapıştırır, \"selectWord\" imlecin altındaki sözcüğü seçer ve bağlam menüsünü gösterir.",
-+=======
-+	"terminal.integrated.rightClickBehavior": "Terminalin sağ tıklamaya nasıl tepki vereceğini denetler, olası değerler 'default', 'copyPaste' ve 'selectWord'dür. 'default' bağlam menüsünü gösterir, 'copyPaste' bir seçim varsa kopyalar yoksa yapıştırır, 'selectWord' imlecin altındaki sözcüğü seçer ve bağlam menüsünü gösterir.",
-+>>>>>>> .their
- 	"terminal.integrated.cwd": "Terminalin nerede başlatılacağına ait açık bir yol; bu, kabuk işlemleri için geçerli çalışma klasörü (cwd) olarak kullanılır. Bu, çalışma alanı ayarlarında kök dizini uygun bir cwd değilse özellikle yararlı olabilir.",
- 	"terminal.integrated.confirmOnExit": "Aktif terminal oturumları varken çıkışta onay istenip istenmeyeceği.",
- 	"terminal.integrated.enableBell": "Terminal zilinin etkin olup olmadığı.",
-changed in both
-  base   100644 f2ba7b288d1aeb59fd2563f6adb64a35591ca88e i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 0dfa05cd7919b2b8edd950bcde47408dafdd57f0 i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 fb23f3c189e1688d90db85a8e9432e7f2244c6ec i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -21,7 +21,10 @@
- 	"workbench.action.terminal.newWorkspacePlaceholder": "Yeni terminal için geçerli çalışma dizinini seçin",
- 	"workbench.action.terminal.newInActiveWorkspace": "(Aktif Çalışma Alanında) Yeni Entegre Terminal Oluştur",
- 	"workbench.action.terminal.split": "Terminali Böl",
-+<<<<<<< .our
- 	"workbench.action.terminal.splitInActiveWorkspace": "(Aktif Çalışma Alanında) Terminali Böl",
-+=======
-+>>>>>>> .their
- 	"workbench.action.terminal.focusPreviousPane": "Önceki Bölmeye Odakla",
- 	"workbench.action.terminal.focusNextPane": "Sonraki Bölmeye Odakla",
- 	"workbench.action.terminal.resizePaneLeft": "Bölmeyi Sola Doğru Yeniden Boyutlandır",
-changed in both
-  base   100644 22571079e41f187c33ff9431a021ebda1eba7fbe i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-  our    100644 69d4953e71c1df96cd0358ccbf46ac3587d73122 i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-  their  100644 f5f8b88dc844b92b0207c1254f5799d533159273 i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-@@ -9,6 +9,7 @@
- 	"terminal.integrated.a11yBlankLine": "Boş satır",
- 	"terminal.integrated.a11yPromptLabel": "Terminal girdisi",
- 	"terminal.integrated.a11yTooMuchOutput": "Gösterilecek çok fazla çıktı var, okumak için satırları manuel olarak gezin.",
-+<<<<<<< .our
- 	"yes": "Evet",
- 	"no": "Hayır",
- 	"dontShowAgain": "Tekrar Gösterme",
-@@ -17,4 +18,10 @@
- 	"terminal.integrated.waitOnExit": "Terminali kapatmak için lütfen bir tuşa basın",
- 	"terminal.integrated.launchFailed": "Terminal işlem komutu '{0}{1}' başlatılamadı (çıkış kodu: {2})",
- 	"terminal.integrated.launchFailedExtHost": "Terminal işlemi başlatılamadı (çıkış kodu: {0})"
-+=======
-+	"terminal.integrated.copySelection.noSelection": "Terminalde kopyalanacak bir seçim bulunmuyor",
-+	"terminal.integrated.exitedWithCode": "Terminal işlemi şu çıkış koduyla sonlandı: {0}",
-+	"terminal.integrated.waitOnExit": "Terminali kapatmak için lütfen bir tuşa basın",
-+	"terminal.integrated.launchFailed": "Terminal işlem komutu '{0}{1}' başlatılamadı (çıkış kodu: {2})"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ff039c6064b2c4e8eba5660c5581f54af1bbbe80 i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
-  our    100644 cc4292491fac2fc01d3a01d063887569a8cd8327 i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
-  their  100644 ad9592dd9e32ee3b4561973513a1cd89ca9ec430 i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
-@@ -12,5 +12,6 @@
- 	"split": "Böl",
- 	"paste": "Yapıştır",
- 	"selectAll": "Tümünü Seç",
--	"clear": "Temizle"
-+	"clear": "Temizle",
-+	"split": "Böl"
- }
-\ No newline at end of file
-changed in both
-  base   100644 fb133df71eaa1c5f96326e9e067ec7844720c445 i18n/trk/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 f7e01d490d6d3b9163203a648fd3930fc88e2b59 i18n/trk/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 795a37034f6a76eba67bd9794ba163b93484f5a5 i18n/trk/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -15,6 +15,10 @@
- 	"updateIsReady": "Yeni {0} güncellemesi var.",
- 	"noUpdatesAvailable": "Şu anda mevcut herhangi bir güncelleme yok.",
- 	"ok": "Tamam",
-+<<<<<<< .our
-+=======
-+	"download now": "Şimdi İndir",
-+>>>>>>> .their
- 	"thereIsUpdateAvailable": "Bir güncelleştirme var.",
- 	"download now": "Şimdi İndir",
- 	"later": "Daha Sonra",
-changed in both
-  base   100644 ee86fed4b8dcce4558f196dc8947cd3396b7bf9b i18n/trk/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 75fe13443d1b20eda293b9553d4c868bb1f5c3ac i18n/trk/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 39c5172a27aca84fd3eab7566b6c2fe252cadae0 i18n/trk/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-changed in both
-  base   100644 1a1b99ac2210a9c5aa4031d3928b18cbd4365691 i18n/trk/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
-  our    100644 334fc70777714e823b224069515165a76c85dfb9 i18n/trk/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
-  their  100644 cff52e071dfc7cb7ceb4d443dfd55d4d3d467264 i18n/trk/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
-changed in both
-  base   100644 3d8e27a4bbdba5d73c518639670a30cf6c4e5861 i18n/trk/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-  our    100644 844478e0633a25883c08cf42ec5fe82e36e359ce i18n/trk/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-  their  100644 13fc407f0661dac349cc9de7f8032d80ddc7fb6b i18n/trk/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-@@ -9,6 +9,7 @@
- 	"netVersionError": "Microsoft .NET Framework 4.5 gerekli. Yüklemek için bağlantıyı izleyin.",
- 	"installNet": ".NET Framework 4.5'i İndir",
- 	"neverShowAgain": "Tekrar Gösterme",
-+<<<<<<< .our
- 	"enospcError": "{0}, bu büyük çalışma alanındaki dosya değişikliklerini izleyemiyor. Bu sorunu çözmek için lütfen yönerge bağlantısını izleyin.",
- 	"learnMore": "Talimatlar",
- 	"fileInvalidPath": "Geçersiz dosya kaynağı ({0})",
-@@ -24,6 +25,11 @@
- 	"fileReadOnlyError": "Dosya Salt Okunur",
- 	"fileMoveConflict": "Taşıma/kopyalama yapılamadı. Dosya, hedefte zaten mevcut.",
- 	"unableToMoveCopyError": "Taşıma/kopyalama yapılamadı. Dosya, içinde bulunduğu klasörü değiştiriyor.",
-+=======
-+	"netVersionError": "Microsoft .NET Framework 4.5 gerekli. Yüklemek için bağlantıyı izleyin.",
-+	"learnMore": "Talimatlar",
-+	"enospcError": "{0} için dosya işleçleri bitiyor. Bu sorunu çözmek için lütfen yönerge bağlantısını izleyin.",
-+>>>>>>> .their
- 	"binFailed": "'{0}' geri dönüşüm kutusuna taşınamadı",
- 	"trashFailed": "'{0}' çöpe taşınamadı"
- }
-\ No newline at end of file
-merged
-  result 100644 a9f7d6432318c48db45f19aebbadf3650e3180d3 i18n/trk/src/vs/workbench/services/files/node/fileService.i18n.json
-  our    100644 0032045d6c15d3a28e360ab657c8ecf99dcb85dd i18n/trk/src/vs/workbench/services/files/node/fileService.i18n.json
-@@ -9,6 +9,7 @@
- 	"fileInvalidPath": "Geçersiz dosya kaynağı ({0})",
- 	"fileIsDirectoryError": "Dosya bir dizindir",
- 	"fileNotModifiedError": "Dosya şu tarihten beri değiştirilmemiş:",
-+	"fileTooLargeForHeapError": "Dosya boyutu pencere bellek sınırını aşıyor, lütfen code --max-memory=YENIBOYUT komutunu çalıştırın",
- 	"fileTooLargeError": "Dosya, açmak için çok büyük",
- 	"fileNotFoundError": "Dosya bulunamadı ({0})",
- 	"fileBinaryError": "Dosya ikili olarak görünüyor ve metin olarak açılamıyor",
-changed in both
-  base   100644 1a328c1f464ecd4efc460442365c326f93a53094 package.json
-  our    100644 d0e982ce0b76c5b1b5eb02b673e459e47f3353a4 package.json
-  their  100644 977a6a57273bfced4b57befc0018aabf43b284b9 package.json
-@@ -1,7 +1,12 @@
- {
-   "name": "code-oss-dev",
-+<<<<<<< .our
-   "version": "1.27.0",
-   "distro": "a4155d9780fbbc94ead6cb3017dd0fc3806c57b8",
-+=======
-+  "version": "1.21.1",
-+  "distro": "c2f5517441bb68c5be671fd2e5f71193e7b2682f",
-+>>>>>>> .their
-   "author": {
-     "name": "Microsoft Corporation"
-   },
-changed in both
-  base   100644 162a949f7d5a8860417f85a6ee7967bbc63cb336 src/main.js
-  our    100644 711217d64e2bdc43f33652d0bed34caa052cc331 src/main.js
-  their  100644 6de90ae6ed69abb51e23fe4097b08f4594fc99a9 src/main.js
-@@ -270,6 +270,7 @@
- 
- 	perf.mark('nlsGeneration:start');
- 
-+<<<<<<< .our
- 	let defaultResult = function (locale) {
- 		perf.mark('nlsGeneration:end');
- 		return Promise.resolve({ locale: locale, availableLanguages: {} });
-@@ -295,6 +296,41 @@
- 		return exists(mainPack).then((fileExists) => {
- 			if (!fileExists) {
- 				return defaultResult(initialLocale);
-+=======
-+	let isCoreLangaguage = true;
-+	if (locale) {
-+		isCoreLangaguage = ['de', 'es', 'fr', 'it', 'ja', 'ko', 'ru', 'zh-cn', 'zh-tw'].some((language) => {
-+			return locale === language || locale.startsWith(language + '-');
-+		});
-+	}
-+
-+	if (isCoreLangaguage) {
-+		return Promise.resolve(resolveLocale(locale));
-+	} else {
-+		perf.mark('nlsGeneration:start');
-+		let defaultResult = function() {
-+			perf.mark('nlsGeneration:end');
-+			return Promise.resolve({ locale: locale, availableLanguages: {} });
-+		};
-+		try {
-+			let commit = getCommit();
-+			if (!commit) {
-+				return defaultResult();
-+			}
-+			let configs = getLanguagePackConfigurations();
-+			if (!configs) {
-+				return defaultResult();
-+			}
-+			let initialLocale = locale;
-+			locale = resolveLanguagePackLocale(configs, locale);
-+			if (!locale) {
-+				return defaultResult();
-+			}
-+			let packConfig = configs[locale];
-+			let mainPack;
-+			if (!packConfig || typeof packConfig.hash !== 'string' || !packConfig.translations || typeof (mainPack = packConfig.translations['vscode']) !== 'string') {
-+				return defaultResult();
-+>>>>>>> .their
- 			}
- 			let packId = packConfig.hash + '.' + locale;
- 			let cacheRoot = path.join(userDataPath, 'clp', packId);
-changed in both
-  base   100644 1d58887f40316ffdcab65672835f088a62a234c9 src/vs/base/browser/ui/list/listWidget.ts
-  our    100644 efaf1d52986f5302740f76831d1a7b5015bc7068 src/vs/base/browser/ui/list/listWidget.ts
-  their  100644 040362bf372cbc4b7d55220e699421e0d28fbb9a src/vs/base/browser/ui/list/listWidget.ts
-changed in both
-  base   100644 8d21c881d585cfc426d978363032e6e3098062cf src/vs/code/electron-main/menus.ts
-  our    100644 9d5657cff26b159c842f9790d6387967d829e168 src/vs/code/electron-main/menus.ts
-  their  100644 442e70d33c9e81e4b79bb15ebb1cd570f2937803 src/vs/code/electron-main/menus.ts
-changed in both
-  base   100644 259ab0dc4bb29279532e8235d2896bbc6a330538 src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
-  our    100644 4d4b03519d11c8bcd261e15f4327bc58c04d4c19 src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
-  their  100644 370f06865d399a2eefc394aead9663fed0b6f8f5 src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
-changed in both
-  base   100644 3aef25f681c74c552f157e37b20515f999c87ccd src/vs/editor/contrib/suggest/suggestWidget.ts
-  our    100644 a221be2731d33b2c0a5d84d119cac0233b76a147 src/vs/editor/contrib/suggest/suggestWidget.ts
-  their  100644 969a4af2a3ae822474107076f9e5ef386f75a72a src/vs/editor/contrib/suggest/suggestWidget.ts
-changed in both
-  base   100644 8ce018cb411f7bb734d492ea81e0ee8bba50911b src/vs/platform/update/common/update.ts
-  our    100644 5f187e283ae128388dba38cd5a453c1b2a817445 src/vs/platform/update/common/update.ts
-  their  100644 45688bb94184b74fae81affcd657c13da57a0dac src/vs/platform/update/common/update.ts
-@@ -54,7 +54,11 @@
- }
- 
- export type Uninitialized = { type: StateType.Uninitialized };
-+<<<<<<< .our
- export type Idle = { type: StateType.Idle, updateType: UpdateType };
-+=======
-+export type Idle = { type: StateType.Idle };
-+>>>>>>> .their
- export type CheckingForUpdates = { type: StateType.CheckingForUpdates, context: any };
- export type AvailableForDownload = { type: StateType.AvailableForDownload, update: IUpdate };
- export type Downloading = { type: StateType.Downloading, update: IUpdate };
-@@ -66,7 +70,11 @@
- 
- export const State = {
- 	Uninitialized: { type: StateType.Uninitialized } as Uninitialized,
-+<<<<<<< .our
- 	Idle: (updateType: UpdateType) => ({ type: StateType.Idle, updateType }) as Idle,
-+=======
-+	Idle: { type: StateType.Idle } as Idle,
-+>>>>>>> .their
- 	CheckingForUpdates: (context: any) => ({ type: StateType.CheckingForUpdates, context } as CheckingForUpdates),
- 	AvailableForDownload: (update: IUpdate) => ({ type: StateType.AvailableForDownload, update } as AvailableForDownload),
- 	Downloading: (update: IUpdate) => ({ type: StateType.Downloading, update } as Downloading),
-changed in both
-  base   100644 441bdd138e139b0a66eaa0ba1ba8778f629324d0 src/vs/platform/update/common/updateIpc.ts
-  our    100644 aa2e8fd304e3da483284474d857022629d0c7835 src/vs/platform/update/common/updateIpc.ts
-  their  100644 b52dbc115d220c4533ff76d08752d1597389f0fc src/vs/platform/update/common/updateIpc.ts
-@@ -12,9 +12,12 @@
- import { IUpdateService, State } from './update';
- 
- export interface IUpdateChannel extends IChannel {
-+<<<<<<< .our
- 	listen(event: 'onStateChange'): Event<State>;
- 	listen<T>(command: string, arg?: any): Event<T>;
- 
-+=======
-+>>>>>>> .their
- 	call(command: 'checkForUpdates', arg: any): TPromise<void>;
- 	call(command: 'downloadUpdate'): TPromise<void>;
- 	call(command: 'applyUpdate'): TPromise<void>;
-changed in both
-  base   100644 04e3ccdfeb369ede9e13784af244e9fbee89e742 src/vs/platform/update/electron-main/abstractUpdateService.ts
-  our    100644 b689dd6bd67916ca3e46a27a518e1cfc57d32758 src/vs/platform/update/electron-main/abstractUpdateService.ts
-  their  100644 c947ebba306c0099c2573144f96732abfea02077 src/vs/platform/update/electron-main/abstractUpdateService.ts
-@@ -181,6 +181,10 @@
- 		// noop
- 	}
- 
-+<<<<<<< .our
- 	protected abstract buildUpdateFeedUrl(quality: string): string | undefined;
-+=======
-+	protected abstract setUpdateFeedUrl(quality: string): boolean;
-+>>>>>>> .their
- 	protected abstract doCheckForUpdates(context: any): void;
- }
-changed in both
-  base   100644 25d9cf28beb1bae72436866e64504e880a7c43e6 src/vs/platform/update/electron-main/updateService.darwin.ts
-  our    100644 8ac8357ef63e52b69fcc0b4593970a0405426078 src/vs/platform/update/electron-main/updateService.darwin.ts
-  their  100644 cde35fe74f7b4249c47117200d3a0d4deed28ddc src/vs/platform/update/electron-main/updateService.darwin.ts
-changed in both
-  base   100644 7b0ece17fe3032415606a27492406913a3678187 src/vs/platform/update/electron-main/updateService.linux.ts
-  our    100644 87c60c5d4360ea55dff2b83145f098b858b83c75 src/vs/platform/update/electron-main/updateService.linux.ts
-  their  100644 a87f49d45faa39dfbaaa153402237c32a816cf2f src/vs/platform/update/electron-main/updateService.linux.ts
-@@ -69,7 +69,11 @@
- 					}
- 					*/
- 				this.telemetryService.publicLog('update:notAvailable', { explicit: !!context });
-+<<<<<<< .our
- 				this.setState(State.Idle(UpdateType.Archive));
-+=======
-+				this.setState(State.Idle);
-+>>>>>>> .their
- 			});
- 	}
- 
-changed in both
-  base   100644 ef20367626c463c93d21e7b2f23038c44614a506 src/vs/platform/update/electron-main/updateService.win32.ts
-  our    100644 6f5e750aafa60e074dd88761061c50e1f5691b2d src/vs/platform/update/electron-main/updateService.win32.ts
-  their  100644 d0421d5ba37e45fc0dcf3a4d85ae5483127cfac7 src/vs/platform/update/electron-main/updateService.win32.ts
-@@ -181,7 +181,11 @@
- 					}
- 					*/
- 				this.telemetryService.publicLog('update:notAvailable', { explicit: !!context });
-+<<<<<<< .our
- 				this.setState(State.Idle(getUpdateType()));
-+=======
-+				this.setState(State.Idle);
-+>>>>>>> .their
- 			});
- 	}
- 
-changed in both
-  base   100644 010286e967253123cc0bc7efe7e507a2c6e9fc1c src/vs/workbench/api/node/extHostApiCommands.ts
-  our    100644 46087963ddabb1b6d766fe142aef0e6cd0b577a2 src/vs/workbench/api/node/extHostApiCommands.ts
-  their  100644 2b00ff6d9f6f2c43adda944a7fe5ab58b458bfc2 src/vs/workbench/api/node/extHostApiCommands.ts
-removed in local
-  base   100644 d37e32d52c2022499b9788c0ba3178b908af7bba src/vs/workbench/browser/parts/editor/editorGroupsControl.ts
-  their  100644 72defc1adbb11cfd0a4220a4a953908bc2e030ce src/vs/workbench/browser/parts/editor/editorGroupsControl.ts
-changed in both
-  base   100644 e7b9ac440dbc3957e95966fe8a46d05ef360e230 src/vs/workbench/browser/parts/notifications/notificationsCenter.ts
-  our    100644 fd3ecd2e0079a1e980b0978636a8deec0185e597 src/vs/workbench/browser/parts/notifications/notificationsCenter.ts
-  their  100644 d6baf9a796e583348d3fa022da44f440d2092d4f src/vs/workbench/browser/parts/notifications/notificationsCenter.ts
-@@ -65,7 +65,15 @@
- 		return this._isVisible;
- 	}
- 
-+<<<<<<< .our
- 	show(): void {
-+=======
-+	public show(): void {
-+		if (this.model.notifications.length === 0) {
-+			return; // currently not supporting to show empty (https://github.com/Microsoft/vscode/issues/44509)
-+		}
-+
-+>>>>>>> .their
- 		if (this._isVisible) {
- 			this.notificationsList.show(true /* focus */);
- 
-changed in both
-  base   100644 e5cd87a5e0e20e0c765a84b9e228d936474d6dc1 src/vs/workbench/browser/parts/notifications/notificationsCommands.ts
-  our    100644 9519578fe607712e094dd05f5fe59f403e691075 src/vs/workbench/browser/parts/notifications/notificationsCommands.ts
-  their  100644 469360901d6879310d20253c4ee42fe34ac36ad2 src/vs/workbench/browser/parts/notifications/notificationsCommands.ts
-changed in both
-  base   100644 d4955347dae7ed902c94b5da3f70da30bd66f027 src/vs/workbench/parts/debug/browser/debugEditorModelManager.ts
-  our    100644 4b21fa882fbb0a8432e82ade4907ea9f68000971 src/vs/workbench/parts/debug/browser/debugEditorModelManager.ts
-  their  100644 9c7740f92a00dc0bb15551a0d0b22eaf981150b2 src/vs/workbench/parts/debug/browser/debugEditorModelManager.ts
-removed in local
-  base   100644 6e300d32eed437803ec867773d1578aa308245d5 src/vs/workbench/parts/extensions/browser/extensionsActions.ts
-  their  100644 9f3465b4ac59b159344801418daf9cc61a7f450f src/vs/workbench/parts/extensions/browser/extensionsActions.ts
-removed in local
-  base   100644 00669ce6dad1051230334176e171ad5fbe5070cc src/vs/workbench/parts/html/browser/webview.ts
-  their  100644 7336f5bcafe6146c2aca16535ee19c4abfbf5172 src/vs/workbench/parts/html/browser/webview.ts
-changed in both
-  base   100644 64f46350660cf925ea3243b1313b89efedc90505 src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
-  our    100644 04d9dcba251cf79c28429027cda3ca3b0c10a29c src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
-  their  100644 5e81a88576aafb9bb74d3fd5313372bdafe53d39 src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
-removed in local
-  base   100644 756d45061f0e6fc4fc5ee690469e401751acc238 src/vs/workbench/parts/terminal/electron-browser/terminalTab.ts
-  their  100644 c4921ed69fd312aa0e3fdf908c2f157694a7af00 src/vs/workbench/parts/terminal/electron-browser/terminalTab.ts
-changed in both
-  base   100644 0421848d583e44e23ee97d92ee67ce14a821e053 src/vs/workbench/parts/update/electron-browser/update.ts
-  our    100644 2e468debc61fae01ce2d9c4b673a81993982cc62 src/vs/workbench/parts/update/electron-browser/update.ts
-  their  100644 467c5b27d4587d13f27356511ddac2d81759d108 src/vs/workbench/parts/update/electron-browser/update.ts
-@@ -24,6 +24,7 @@
- import { IUpdateService, State as UpdateState, StateType, IUpdate, UpdateType } from 'vs/platform/update/common/update';
- import * as semver from 'semver';
- import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-+<<<<<<< .our
- import { INotificationService, INotificationHandle } from 'vs/platform/notification/common/notification';
- import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
- import { IWindowService } from 'vs/platform/windows/common/windows';
-@@ -36,6 +37,29 @@
- function showReleaseNotes(instantiationService: IInstantiationService, version: string) {
- 	if (!releaseNotesManager) {
- 		releaseNotesManager = instantiationService.createInstance(ReleaseNotesManager);
-+=======
-+import { INotificationService } from 'vs/platform/notification/common/notification';
-+import { IChoiceService } from 'vs/platform/dialogs/common/dialogs';
-+import { IWindowService } from 'vs/platform/windows/common/windows';
-+
-+const NotNowAction = new Action(
-+	'update.later',
-+	nls.localize('later', "Later"),
-+	null,
-+	true,
-+	() => TPromise.as(true)
-+);
-+
-+const releaseNotesCache: { [version: string]: TPromise<string>; } = Object.create(null);
-+
-+export function loadReleaseNotes(accessor: ServicesAccessor, version: string): TPromise<string> {
-+	const requestService = accessor.get(IRequestService);
-+	const keybindingService = accessor.get(IKeybindingService);
-+	const match = /^(\d+\.\d+)\./.exec(version);
-+
-+	if (!match) {
-+		return TPromise.wrapError<string>(new Error('not found'));
-+>>>>>>> .their
- 	}
- 
- 	return instantiationService.invokeFunction(accessor => releaseNotesManager.show(accessor, version));
-@@ -372,6 +396,10 @@
- 		@INotificationService private notificationService: INotificationService,
- 		@IDialogService private dialogService: IDialogService,
- 		@IUpdateService private updateService: IUpdateService,
-+<<<<<<< .our
-+=======
-+		@IWorkbenchEditorService editorService: IWorkbenchEditorService,
-+>>>>>>> .their
- 		@IActivityService private activityService: IActivityService,
- 		@IWindowService private windowService: IWindowService
- 	) {
-changed in both
-  base   100644 c9e370817e59140c2659ced6673a2417b3dccdaa src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.ts
-  our    100644 13049eb33586080418b399273af4b10cc25e823b src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.ts
-  their  100644 ec96ca675bf9008305a3e1d3c5c9c0bf0425eba7 src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.ts
-changed in both
-  base   100644 b11c79a035af89b4ac83b2c7c1788607e1fe78c2 src/vs/workbench/test/electron-browser/api/extHostApiCommands.test.ts
-  our    100644 cd4ed9a20d72f4c6ea241c059ae710fd28f282f6 src/vs/workbench/test/electron-browser/api/extHostApiCommands.test.ts
-  their  100644 90ac6be2310354deccf4f6bc7f4bc0c5fcc4c3de src/vs/workbench/test/electron-browser/api/extHostApiCommands.test.ts
diff --git a/app/test/fixtures/merge-parser/vscode/merge-release-1.22-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-release-1.22-into-master.txt
deleted file mode 100644
index 62b21c13d21..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-release-1.22-into-master.txt
+++ /dev/null
@@ -1,4276 +0,0 @@
-changed in both
-  base   100644 ccd151d7d3dca2d2fa6f12c06841909293aaad79 build/builtInExtensions.json
-  our    100644 b3efcd2cc657706605008661521b555c93a32c16 build/builtInExtensions.json
-  their  100644 af93dfdc2529f15bdc5c4360fa02033f0f7b4f5e build/builtInExtensions.json
-@@ -1,12 +1,20 @@
- [
- 	{
- 		"name": "ms-vscode.node-debug",
-+<<<<<<< .our
- 		"version": "1.27.2",
-+=======
-+		"version": "1.22.15",
-+>>>>>>> .their
- 		"repo": "https://github.com/Microsoft/vscode-node-debug"
- 	},
- 	{
- 		"name": "ms-vscode.node-debug2",
-+<<<<<<< .our
- 		"version": "1.27.0",
-+=======
-+		"version": "1.22.8",
-+>>>>>>> .their
- 		"repo": "https://github.com/Microsoft/vscode-node-debug2"
- 	}
- ]
-changed in both
-  base   100644 cf4ba401a236147a78526eae599cadb008eeb151 extensions/emmet/src/test/abbreviationAction.test.ts
-  our    100644 b5fb87d8b0791993b65959e4e4c9219aa4e8388c extensions/emmet/src/test/abbreviationAction.test.ts
-  their  100644 3c85a027155273ac41acaf0db92d35038e918a83 extensions/emmet/src/test/abbreviationAction.test.ts
-@@ -435,12 +435,20 @@
- 	});
- 
- 	test('Expand abbreviation with single quotes for jsx', () => {
-+<<<<<<< .our
- 		return workspace.getConfiguration('emmet').update('syntaxProfiles', {jsx: {"attr_quotes": "single"}}, ConfigurationTarget.Global).then(() => {
-+=======
-+		return workspace.getConfiguration('emmet').update('syntaxProfiles', {jsx: {"attr_quotes": "single"}}).then(() => {
-+>>>>>>> .their
- 			return withRandomFileEditor('img', 'javascriptreact', (editor, doc) => {
- 				editor.selection = new Selection(0, 6, 0, 6);
- 				return expandEmmetAbbreviation({ language: 'javascriptreact' }).then(() => {
- 					assert.equal(editor.document.getText(), '<img src=\'\' alt=\'\'/>');
-+<<<<<<< .our
- 					return workspace.getConfiguration('emmet').update('syntaxProfiles', oldValueForSyntaxProfiles ? oldValueForSyntaxProfiles.globalValue : undefined, ConfigurationTarget.Global);
-+=======
-+					return workspace.getConfiguration('emmet').update('syntaxProfiles', {});
-+>>>>>>> .their
- 				});
- 			});
- 		});
-changed in both
-  base   100644 db664524eb1d8891b37dfce921c72550c7cc40f2 extensions/emmet/src/test/tagActions.test.ts
-  our    100644 a5d5ca291d7d027f757ecf4a854670d6f6c9db98 extensions/emmet/src/test/tagActions.test.ts
-  their  100644 ed69ae7d11cfb895c2064bd937041eec7b8ca3a7 extensions/emmet/src/test/tagActions.test.ts
-@@ -286,7 +286,11 @@
- 
- 				return splitJoinTag()!.then(() => {
- 					assert.equal(doc.getText(), expectedContents);
-+<<<<<<< .our
- 					return workspace.getConfiguration('emmet').update('syntaxProfiles', oldValueForSyntaxProfiles ? oldValueForSyntaxProfiles.globalValue : undefined, ConfigurationTarget.Global);
-+=======
-+					return workspace.getConfiguration('emmet').update('syntaxProfiles', {});
-+>>>>>>> .their
- 				});
- 			});
- 		});
-changed in both
-  base   100644 309be6de79a49f6df2a710f8e6b8b1f30f62a9eb extensions/emmet/src/util.ts
-  our    100644 b51d04d6cec49e4cad958e1de44c033b7862b549 extensions/emmet/src/util.ts
-  their  100644 3d0d8e2ac5d7881a50ed956557ac7ba66a1847ba extensions/emmet/src/util.ts
-changed in both
-  base   100644 aa1ce562f003e0b88eb666fea8c1c95406599914 extensions/html-language-features/server/src/htmlServerMain.ts
-  our    100644 ffe5c18df41d8ad255bff032cbca33b62a5b895b extensions/html-language-features/server/src/htmlServerMain.ts
-  their  100644 d86ecb5fd68f8235c4ea477ff29c3e5ad67fde0b extensions/html-language-features/server/src/htmlServerMain.ts
-@@ -262,8 +262,27 @@
- 			connection.telemetry.logEvent({ key: 'html.embbedded.complete', value: { languageId: mode.getId() } });
- 		}
- 
-+<<<<<<< .our
- 		const settings = await getDocumentSettings(document, () => doComplete.length > 2);
- 		const result = doComplete(document, textDocumentPosition.position, settings);
-+=======
-+		cachedCompletionList = null;
-+		const emmetCompletionList = CompletionList.create([], false);
-+
-+		const emmetCompletionParticipant = getEmmetCompletionParticipants(document, textDocumentPosition.position, mode.getId(), emmetSettings, emmetCompletionList);
-+		const completionParticipants = [emmetCompletionParticipant];
-+
-+		let settings = await getDocumentSettings(document, () => doComplete.length > 2);
-+		let result = doComplete(document, textDocumentPosition.position, settings, completionParticipants);
-+		if (emmetCompletionList.isIncomplete) {
-+			emmetCompletionList.items = emmetCompletionList.items || [];
-+			cachedCompletionList = result;
-+			if (emmetCompletionList.items.length && hexColorRegex.test(emmetCompletionList.items[0].label) && result.items.some(x => x.label === emmetCompletionList.items[0].label)) {
-+				emmetCompletionList.items.shift();
-+			}
-+			return CompletionList.create([...emmetCompletionList.items, ...result.items], emmetCompletionList.isIncomplete || result.isIncomplete);
-+		}
-+>>>>>>> .their
- 		return result;
- 
- 	}, null, `Error while computing completions for ${textDocumentPosition.textDocument.uri}`, token);
-changed in both
-  base   100644 e4b92c6fa46f82ba2a9a3251765671ff76042beb extensions/typescript-language-features/package.json
-  our    100644 1f06df0476dc5d308133ff5129ffa65d8caeb6fb extensions/typescript-language-features/package.json
-  their  100644 c5d2444bf11e6c9b3474cfc27f73f8ba860a619f extensions/typescript-language-features/package.json
-@@ -425,6 +425,14 @@
-           "markdownDescription": "%typescript.locale%",
-           "scope": "window"
-         },
-+<<<<<<< .our
-+=======
-+        "typescript.experimental.syntaxFolding": {
-+          "type": "boolean",
-+          "default": false,
-+          "description": "%typescript.experimental.syntaxFolding%"
-+        },
-+>>>>>>> .their
-         "javascript.suggestionActions.enabled": {
-           "type": "boolean",
-           "default": true,
-removed in local
-  base   100644 088e9734ba8239c4ef9025693d71aafdb3a412ee extensions/typescript-language-features/src/features/quickFixProvider.ts
-  their  100644 d4197bfeabb5293e157d64e1f84ce452b289e10f extensions/typescript-language-features/src/features/quickFixProvider.ts
-changed in both
-  base   100644 1fcb4a17477182a4a876633b8a6cbda551ac78ef i18n/chs/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 34456c16f6384eecbdba1d3ed14696eac3704dab i18n/chs/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 122c711fcbbec58025d8d8358f74878296d093bd i18n/chs/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -20,8 +20,13 @@
- 	"later": "稍后",
- 	"updateAvailable": "现有更新可用: {0} {1}",
- 	"installUpdate": "安装更新",
-+<<<<<<< .our
- 	"updateInstalling": "正在后台安装 {0} {1}，我们将在完成后通知您。 ",
- 	"updateAvailableAfterRestart": "重新启动 {0} 即可应用最新更新。",
-+=======
-+	"updateAvailable": "现有可用的更新: {0} {1}",
-+	"updateInstalling": "{0} {1} 正在后台安装，我们会在完成后通知您。",
-+>>>>>>> .their
- 	"updateNow": "立即更新",
- 	"commandPalette": "命令面板...",
- 	"settings": "设置",
-changed in both
-  base   100644 0b1d70297e1b5cf91a01bd3de57803903e63b0d8 i18n/cht/extensions/php/package.i18n.json
-  our    100644 d6cdfe9a0f2cc1fcf95b845133af34269f4312dc i18n/cht/extensions/php/package.i18n.json
-  their  100644 b1995eaa4f998ed45d65a16d31f1fcfb7c0a6675 i18n/cht/extensions/php/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "PHP 語言基礎知識",
-+=======
-+	"displayName": "PHP 語言功能",
-+>>>>>>> .their
- 	"description": "為 PHP 檔案提供語法醒目提示與括弧對應功能。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 0dd95be0c2c5736219707d03fc6d771b648d74e3 i18n/cht/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 66736a4e736cf7b9a66b648bff264434bc450d4c i18n/cht/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 fdc9d8bbad9cee053f5819b53fc025a818703d48 i18n/cht/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -32,7 +32,10 @@
- 	"infoBorder": "編輯器內資訊提示線的邊框色彩",
- 	"hintForeground": "編輯器內提示訊息的提示線前景色彩",
- 	"hintBorder": "編輯器內提示訊息的提示線邊框色彩",
-+<<<<<<< .our
- 	"unnecessaryForeground": "編輯器中不必要程式碼的前景色彩。",
-+=======
-+>>>>>>> .their
- 	"overviewRulerRangeHighlight": "概述反白範圍的尺規標記顏色。不能使用非透明的顏色來隱藏底層的樣式。",
- 	"overviewRuleError": "錯誤的概觀尺規標記色彩。",
- 	"overviewRuleWarning": "警示的概觀尺規標記色彩。",
-changed in both
-  base   100644 3faa343fdfdf735041dff8e2482f6cad7a0d80b9 i18n/cht/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 a2cc538e14e2cfd1305228b36fae8794fa7c56f9 i18n/cht/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 066b714df00596b380c0d1b18e55dbb2dec23bb0 i18n/cht/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-changed in both
-  base   100644 7117ed7c7220a53e3f3b5ea59d2b44f14012313c i18n/cht/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 790929bd611f6dd14a59e2ff8a6640378fde30cb i18n/cht/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 1633b008b0ba21a22ad3fb4e3315da33edf52e29 i18n/cht/src/vs/platform/theme/common/colorRegistry.i18n.json
-changed in both
-  base   100644 4bf77a965be26e6c11a46b26f0bddc5d857798b0 i18n/cht/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  our    100644 074f6b2402f4fe019ee3d9c00f5e2c58606d8173 i18n/cht/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 ca923fa42abcc57e00e9f46f6655e6fd33d388c7 i18n/cht/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -7,7 +7,10 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"timeout.formatOnSave": "在 {0} 毫秒後儲存時中止格式",
-+<<<<<<< .our
- 	"codeActionsOnSave.didTimeout": "在 {0} 毫秒後中止了 codeActionsOnSave",
-+=======
-+>>>>>>> .their
- 	"timeout.onWillSave": "在 1750 亳秒後中止 onWillSaveTextDocument 事件",
- 	"saveParticipants": "執行儲存參與者..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 f8343577d89e8fb835b06e2aee5839841dd54532 i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 bf339c91e8587ec53fe81a294c54ddc0f5aad010 i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 dc922198d0da5de074b1d6f037cb9307d78dd5ee i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -55,7 +55,11 @@
- 	"openFoldersInNewWindow": "控制資料夾應在新視窗中開啟或取代上一個使用中的視窗。\n- default: 除非已從應用程式內挑選資料夾 (例如，透過 [檔案] 功能表)，否則會在新視窗開啟\n- on: 資料夾會在新視窗開啟\n- off: 資料夾會取代上一個使用中視窗\n請注意，在某些情況下會略過此設定 (例如，使用了 -new-window 或 -reuse-window 命令列選項時)。",
- 	"window.openWithoutArgumentsInNewWindow.on": "開啟新空白視窗",
- 	"window.openWithoutArgumentsInNewWindow.off": "聚焦在上一個正在運行的執行個體",
-+<<<<<<< .our
- 	"openWithoutArgumentsInNewWindow": "控制不以引數啟動第二個執行個體時是否要開啟新的空白視窗，或是應聚焦於上一個執行的執行個體。\n- on: 開啟新的空白視窗\n- off: 上一個使用中的執行中執行個體將會受到聚焦\n請注意：仍可能發生忽略此設定的情形 (例如，在使用 -new-window 或 -reuse-window 命令列選項時)。",
-+=======
-+	"openWithoutArgumentsInNewWindow": "控制不以引數啟動第二個執行個體時是否要開啟新的空白視窗，或是應聚焦於上一個執行的執行個體。\n- 開啟: 開啟新的空白視窗\n- 關閉: 上一個使用中的執行中執行個體將會受到聚焦\n請注意，仍可能發生忽略此設定的情形 (例如，在使用 -new-window 或 -reuse-window 命令列選項時)。",
-+>>>>>>> .their
- 	"window.reopenFolders.all": "重新開啟所有視窗。",
- 	"window.reopenFolders.folders": "重新開啟所有資料夾。空白工作區將不會還原。",
- 	"window.reopenFolders.one": "重新開啟上一個使用中的視窗。",
-@@ -80,7 +84,10 @@
- 	"titleBarStyle": "調整視窗標題列的外觀。變更需要完整重新啟動才會套用。",
- 	"window.nativeTabs": "啟用 macOS Sierra 視窗索引標籤。請注意需要完全重新啟動才能套用變更，並且完成設定後原始索引標籤將會停用自訂標題列樣式。",
- 	"window.smoothScrollingWorkaround": "在還原最小化的 VS Code 視窗後，若捲動功能不再流暢，請啟用此因應措施。此因應措施適用於 Microsoft Surface 等具備精確軌跡板發生的捲動延遲問題 (https://github.com/Microsoft/vscode/issues/13612)。啟用此因應措施可能會在將視窗從最小化狀態還原後，導致版面稍微閃爍，但並不會造成任何傷害。",
-+<<<<<<< .our
- 	"window.clickThroughInactive": "若已啟用，按一下非使用中的視窗將會啟動該視窗並觸發其下的元素 (如果可以案的話)。若已停用，按一下非使用中視窗的任一處則只會啟動該視窗，必須再按一下才會觸發元素。",
-+=======
-+>>>>>>> .their
- 	"zenModeConfigurationTitle": "Zen Mode",
- 	"zenMode.fullScreen": "控制開啟 Zen Mode 是否也會將 Workbench 轉換為全螢幕模式。",
- 	"zenMode.centerLayout": "控制開啟 Zen Mode 是否也會置中配置。",
-changed in both
-  base   100644 219551b11e82afde93eaac4b3394aa30908eaf22 i18n/cht/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  our    100644 5b3899db4ffb2882109c34486febad4f0d0318e9 i18n/cht/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  their  100644 033debab2e1167f3581cc542d178d83d469ece66 i18n/cht/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-@@ -17,7 +17,11 @@
- 	"breakpointUnverifieddHover": "未驗證的中斷點",
- 	"functionBreakpointUnsupported": "此偵錯類型不支援函式中斷點",
- 	"breakpointDirtydHover": "未驗證的中斷點。檔案已修改，請重新啟動偵錯工作階段。",
-+<<<<<<< .our
- 	"logBreakpointUnsupported": "此偵錯類型不支援記錄點",
-+=======
-+	"logBreakpointUnsupported": "此偵錯類型不支援紀錄點",
-+>>>>>>> .their
- 	"conditionalBreakpointUnsupported": "此偵錯類型不支援的條件式中斷點",
- 	"hitBreakpointUnsupported": "此偵錯類型不支援點擊條件式中斷點"
- }
-\ No newline at end of file
-changed in both
-  base   100644 c84d5a3227a4aeadf2c4e2e00d7016f5f201f76e i18n/cht/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  our    100644 d80f95667d453bf66d6b75a8ae2e81e8a11d486f i18n/cht/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  their  100644 2c747d5afe2999848f3b386485fd373ab65ea4d2 i18n/cht/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-@@ -8,7 +8,11 @@
- 	],
- 	"toggleBreakpointAction": "偵錯: 切換中斷點",
- 	"conditionalBreakpointEditorAction": "偵錯: 新增條件中斷點...",
-+<<<<<<< .our
- 	"logPointEditorAction": "偵錯: 新增記錄點...",
-+=======
-+	"logPointEditorAction": "偵錯: 新增紀錄點...",
-+>>>>>>> .their
- 	"runToCursor": "執行至游標處",
- 	"debugEvaluate": "偵錯: 評估",
- 	"debugAddToWatch": "偵錯: 加入監看",
-changed in both
-  base   100644 314e9cddf9c8e506e07b2b827ba1f47cc4e46fd1 i18n/cht/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-  our    100644 9c6da9e6ef91ab0baaca35f754725a4ae7dcefff i18n/cht/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-  their  100644 f481d156b0e5088acbbe00e004f02b75f22b6703 i18n/cht/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-@@ -6,9 +6,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"breakpointWidgetLogMessagePlaceholder": "當命中中斷點時向記錄傳送訊息。會以內插值取代 {} 中的運算式。按一下 'Enter' 接受，或是按 'esc' 取消。",
- 	"breakpointWidgetHitCountPlaceholder": "符合叫用次數條件時中斷。按 'Enter' 鍵接受，按 'esc' 鍵取消。",
- 	"breakpointWidgetExpressionPlaceholder": "在運算式評估為 true 時中斷。按 'Enter' 鍵接受，按 'esc' 鍵取消。",
-+=======
-+	"breakpointWidgetLogMessagePlaceholder": "到達中斷點時紀錄訊息。按 'Enter' 鍵接受，按 'esc' 鍵取消。",
-+	"breakpointWidgetHitCountPlaceholder": "符合叫用次數條件時中斷。按 'Enter' 鍵接受，按 'esc' 鍵取消。",
-+	"breakpointWidgetExpressionPlaceholder": "在運算式評估為 true 時中斷。按 'Enter' 鍵接受，按 'esc' 鍵取消。",
-+	"breakpointWidgetLogMessageAriaLabel": "每次到達中斷點時程式將會記錄訊息。按 Enter 鍵接受，或按 Escape 鍵取消。",
-+	"breakpointWidgetHitCountAriaLabel": "程式只會在符合叫用次數時於此處停止。按 Enter 鍵接受，或按 Escape 鍵取消。",
-+	"breakpointWidgetAriaLabel": "程式只有在此條件為 true 時才會在此停止。請按 Enter 鍵接受，或按 Esc 鍵取消。",
-+>>>>>>> .their
- 	"expression": "運算式",
- 	"hitCount": "叫用次數",
- 	"logMessage": "日誌訊息"
-changed in both
-  base   100644 21124f7d54b3abffb58bb36b4fd9617f5127f05a i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  our    100644 5ae66eaf38de2735d7bd3dbe86cbb8ef523d9473 i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  their  100644 95775285344af01308b44db64ce5932011aa6424 i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-@@ -24,6 +24,7 @@
- 	"enableBreakpoints": "啟用資料行 {0} 的內嵌中斷點",
- 	"enableBreakpointOnLine": "啟用行中斷點",
- 	"addBreakpoint": "加入中斷點",
-+<<<<<<< .our
- 	"addConditionalBreakpoint": "新增條件中斷點...",
- 	"addLogPoint": "新增記錄點...",
- 	"breakpointHasCondition": "此 {0} 具有會在移除時消失的 {1}。請考慮改為停用 {0}。",
-@@ -32,5 +33,9 @@
- 	"removeLogPoint": "移除 {0}",
- 	"disableLogPoint": "停用 {0}",
- 	"cancel": "取消",
-+=======
-+	"conditionalBreakpoint": "新增條件中斷點...",
-+	"addLogPoint": "新增紀錄點...",
-+>>>>>>> .their
- 	"addConfiguration": "新增組態..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 d4a12e733fffdea144eded54f3441845da33a68f i18n/cht/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  our    100644 b15f9a6ac6a8909de8d8f39d7c994b78fdd0957c i18n/cht/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  their  100644 e9603c4d092bb9619235848e41c0c70c976edfbc i18n/cht/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-@@ -8,6 +8,24 @@
- 	],
- 	"debugAdapterBinNotFound": "偵錯配接器可執行檔 '{0}' 不存在。",
- 	"debugAdapterCannotDetermineExecutable": "無法判斷偵錯配接器 '{0}' 的可執行檔。",
-+<<<<<<< .our
- 	"unableToLaunchDebugAdapter": "無法從 '{0}' 啟動偵錯配接器。",
- 	"unableToLaunchDebugAdapterNoArgs": "無法啟動偵錯配接器。"
-+=======
-+	"launch.config.comment1": "使用 IntelliSense 以得知可用的屬性。",
-+	"launch.config.comment2": "暫留以檢視現有屬性的描述。",
-+	"launch.config.comment3": "如需詳細資訊，請瀏覽: {0}",
-+	"debugType": "組態的類型。",
-+	"debugTypeNotRecognised": "無法辨識此偵錯類型.請確認已有安裝並啟用相對應的偵錯擴充功能.",
-+	"node2NotSupported": "\"node2\" 已不再支援，請改用 \"node\"，並將 \"protocol\" 屬性設為 \"inspector\"。",
-+	"debugName": "組態的名稱; 出現在啟動組態下拉式功能表中。",
-+	"debugRequest": "要求組態的類型。可以是 [啟動] 或 [附加]。",
-+	"debugServer": "僅限偵錯延伸模組開發: 如果指定了連接埠，VS Code 會嘗試連線至以伺服器模式執行的偵錯配接器",
-+	"debugPrelaunchTask": "偵錯工作階段啟動前要執行的工作。",
-+	"debugPostDebugTask": "偵錯工作階段結束後要執行的工作。",
-+	"debugWindowsConfiguration": "Windows 特定的啟動設定屬性。",
-+	"debugOSXConfiguration": "OS X 特定的啟動設定屬性。",
-+	"debugLinuxConfiguration": "Linux 特定的啟動設定屬性。",
-+	"deprecatedVariables": "'env.'、'config.' 及 'command.' 已標示為即將淘汰，請改用 'env:'、'config:' 及 'command:'。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 4bed8103f5e4faa90810b9b9714b58be83f41013 i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  our    100644 6233388a0658b8bb5644c8edb3109bcd919c8977 i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  their  100644 7fcac98abe0171084561939f8422af960e40102c i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-@@ -14,7 +14,11 @@
- 	"workspaceRecommendedExtensions": "工作區建議",
- 	"builtInExtensions": "功能",
- 	"builtInThemesExtensions": "主題",
-+<<<<<<< .our
- 	"builtInBasicsExtensions": "程式語言",
-+=======
-+	"builtInBasicsExtensions": "語言",
-+>>>>>>> .their
- 	"searchExtensions": "在 Marketplace 中搜尋擴充功能",
- 	"sort by installs": "排序依據: 安裝計數",
- 	"sort by rating": "排序依據: 評等",
-changed in both
-  base   100644 cc6a6ac83fae11379e87f6ec5d399d43f4c89b5c i18n/cht/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-  our    100644 e1655af8772ca891425984734f9bb7ee6aaaf90f i18n/cht/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-  their  100644 d7ae619dc7f2f2fff2f1126dc9bb5b9e74be1bb7 i18n/cht/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-@@ -8,8 +8,13 @@
- 	],
- 	"textFileEditor": "文字檔編輯器",
- 	"createFile": "建立檔案",
-+<<<<<<< .our
- 	"relaunchWithIncreasedMemoryLimit": "以 {0} MB 重新啟動",
- 	"configureMemoryLimit": "設定記憶體限制",
-+=======
-+	"relaunchWithIncreasedMemoryLimit": "重新啟動",
-+	"configureMemoryLimit": "設置",
-+>>>>>>> .their
- 	"fileEditorWithInputAriaLabel": "{0}。文字檔編輯器。",
- 	"fileEditorAriaLabel": "文字檔編輯器。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 313bfa047bca4dda7995d65ae99e84629f31bb65 i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 17eb85d0cba4bf089ef8b48577e75838680e330d i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 b55bc9d97cdc0883d939a79fb0171ffa55b9e89f i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -33,6 +33,7 @@
- 	"trashFailed": "無法使用垃圾筒刪除。您要改為永久刪除嗎？",
- 	"deletePermanentlyButtonLabel": "永久刪除(&&D)",
- 	"retryButtonLabel": "重試(&&R)",
-+<<<<<<< .our
- 	"confirmMoveTrashMessageFilesAndDirectories": "確定要刪除下列 {0} 個檔案/目錄及其內容嗎?",
- 	"confirmMoveTrashMessageMultipleDirectories": "確定要刪除下列 {0} 個目錄及其內容嗎?",
- 	"confirmMoveTrashMessageMultiple": "確定要刪除以下 {0} 個檔案嗎？",
-@@ -44,6 +45,9 @@
- 	"confirmDeleteMessageFolder": "您確定要永久刪除 '{0}' 和其中的內容嗎?",
- 	"confirmDeleteMessageFile": "您確定要永久刪除 '{0}' 嗎?",
- 	"addFiles": "新增檔案",
-+=======
-+	"importFiles": "匯入檔案",
-+>>>>>>> .their
- 	"confirmOverwrite": "目的資料夾中已有同名的檔案或資料夾。要取代它嗎?",
- 	"replaceButtonLabel": "取代(&&R)",
- 	"fileIsAncestor": "要貼上的檔案是在目地資料夾的上層 ",
-changed in both
-  base   100644 c024cac3cb02eb35104c11d80ff01a4325a20e79 i18n/cht/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 be3fbea1a573a3ae7e9cb55afbd7c2737b3d71f0 i18n/cht/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 b257e6cd883a1913e73a0faaaef04c61d29bb495 i18n/cht/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-@@ -35,7 +35,11 @@
- 	"hotExit": "控制是否讓不同工作階段記住未儲存的檔案，並允許在結束編輯器時跳過儲存提示。",
- 	"useExperimentalFileWatcher": "使用新的實驗性檔案監看員。",
- 	"defaultLanguage": "指派給新檔案的預設語言模式。",
-+<<<<<<< .our
- 	"maxMemoryForLargeFilesMB": "控制 VS Code 在重新啟動後常是開啟大型檔案時，可使用多少記憶體。在命令列上指定 --max-memory=NEWSIZE 也能達到相同效果。",
-+=======
-+	"maxMemoryForLargeFilesMB": "應用程式在重新啟動以打開大型檔案時的記憶體限制。如果您希望以更高的限制啟動, 你可以使用 --max-memory=NEWSIZE 參數從命令列啟動應用程式。",
-+>>>>>>> .their
- 	"editorConfigurationTitle": "編輯器",
- 	"formatOnSave": "在儲存時設定檔案格式。格式器必須處於可用狀態、檔案不得自動儲存，且編輯器不得關機。",
- 	"formatOnSaveTimeout": "儲存時格式化超時。指定 formatOnSave 命令的時間限制 (以毫秒為單位)。超過指定超時時間的命令將被取消。",
-changed in both
-  base   100644 3f54e82bcea654ebc6329631d91a62aa3acacb9e i18n/cht/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  our    100644 7e6437084b55609134ec98e1b47e3be7f5cbe68a i18n/cht/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  their  100644 ee61a87b1bd4392abb616192f2662dcbd3bf8dd5 i18n/cht/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-changed in both
-  base   100644 c79987737e6260aa9f91e44bb88d2d72a9f57526 i18n/cht/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-  our    100644 42320096aec9008759f1c221d0d6bf6b06427785 i18n/cht/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-  their  100644 734d07ddaf5e1614cff311623106b7fcf1109fce i18n/cht/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-changed in both
-  base   100644 84c0330c5cb9342519ecaa48b7cfc940bfb0d1f5 i18n/cht/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-  our    100644 45f0712eab001c1f3b7b1d56f414d42c5a608daf i18n/cht/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-  their  100644 1d32ee80c9cb475ebc0b49ee4d721925c473369a i18n/cht/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-changed in both
-  base   100644 02db571b8043d59debf0fe494c78d662f5b78d04 i18n/cht/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 9a7f1ae524570aa14ab8735a1962f8357f3564aa i18n/cht/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 4c9bd3ae056961315543830adbcdecb3f47839c5 i18n/cht/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-changed in both
-  base   100644 08bb4aff71d6c51a50955cf2ea4dc312515867dc i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 b65af1ec7222f34f85465a0e272b45818ced6ea4 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 d1b1d319c2084b793742f428b827229842cbbc8b i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -54,10 +54,17 @@
- 	"nextTerminalFindTerm": "顯示下一個尋找字詞",
- 	"previousTerminalFindTerm": "顯示上一個尋找字詞",
- 	"quickOpenTerm": "切換使用中的終端機 ",
-+<<<<<<< .our
- 	"workbench.action.terminal.scrollToPreviousCommand": "捲動至上一個命令",
- 	"workbench.action.terminal.scrollToNextCommand": "捲動至下一個命令",
- 	"workbench.action.terminal.selectToPreviousCommand": "選取上一個命令",
- 	"workbench.action.terminal.selectToNextCommand": "選取下一個命令",
- 	"workbench.action.terminal.selectToPreviousLine": "選擇上一行",
- 	"workbench.action.terminal.selectToNextLine": "選擇下一行"
-+=======
-+	"workbench.action.terminal.focusPreviousCommand": "聚焦上一個命令",
-+	"workbench.action.terminal.focusNextCommand": "聚焦下一個命令",
-+	"workbench.action.terminal.selectToPreviousCommand": "選取上一個命令",
-+	"workbench.action.terminal.selectToNextCommand": "選取下一個命令"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 325db14549676396cd5bec1cad4e0e499a5752fb i18n/cht/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
-  our    100644 d67fb8af8d51158a541e53fd1e15630f7e772402 i18n/cht/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
-  their  100644 c05369a2738d79c8a4f616424f4d9f2082423963 i18n/cht/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
-@@ -6,5 +6,20 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"stringsOnlySupported": "命令 {0} 未回傳字串結果。僅支援字串作為變數替換的命令結果。"
-+=======
-+	"canNotResolveWorkspaceFolderMultiRoot": "在多資料工作區中無法解析 ${workspaceFolder} 。此變數範圍使用冒號 ( : ) 及資料夾名稱。",
-+	"canNotResolveWorkspaceFolder": "無法解析 $ {workspaceFolder}。請開啟一個資料夾。",
-+	"canNotResolveFolderBasenameMultiRoot": "在多資料工作區中無法解析 ${workspaceFolderBasename}。此變數範圍使用冒號 ( : ) 及資料夾名稱。",
-+	"canNotResolveFolderBasename": "無法解析 ${workspaceFolderBasename}。請開啟一個資料夾。",
-+	"canNotResolveLineNumber": " 無法解析 $ {lineNumber} , 請打開編輯器。",
-+	"canNotResolveSelectedText": "無法解析 $ {selectedText} , 請開啟編輯器。",
-+	"canNotResolveFile": "無法解析 $ {file} , 請開啟編輯器。",
-+	"canNotResolveRelativeFile": "無法解析 $ {relativeFile} , 請開啟編輯器。",
-+	"canNotResolveFileDirname": "無法解析 $ {fileDirname} , 請開啟編輯器。",
-+	"canNotResolveFileExtname": "無法解析 $ {fileExtname} , 請開啟編輯器。",
-+	"canNotResolveFileBasename": "無法解析 $ {fileBasename} , 請開啟編輯器。",
-+	"canNotResolveFileBasenameNoExtension": "無法解析 $ {fileBasenameNoExtension} , 請開啟編輯器。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-merged
-  result 100644 d36af5140caa766c19c77306e0a7c2c45f1063b5 i18n/cht/src/vs/workbench/services/files/node/fileService.i18n.json
-  our    100644 ad99e777e96d2d1848aadc8ca56eb931f70d076e i18n/cht/src/vs/workbench/services/files/node/fileService.i18n.json
-@@ -9,6 +9,7 @@
- 	"fileInvalidPath": "檔案資源 ({0}) 無效",
- 	"fileIsDirectoryError": "檔案是目錄",
- 	"fileNotModifiedError": "未修改檔案的時間",
-+	"fileTooLargeForHeapError": "檔案大小超過預設記憶體限制。請以較高的限制重新啟動。目前的設定已設定為以 {0}MB 重新啟動",
- 	"fileTooLargeError": "檔案太大無法開啟",
- 	"fileNotFoundError": "找不到檔案 ({0})",
- 	"fileBinaryError": "檔案似乎是二進位檔，因此無法當做文字開啟",
-changed in both
-  base   100644 0dac2469d9815dfc5cbecc261ed4f7a984808da5 i18n/deu/extensions/emmet/package.i18n.json
-  our    100644 76a0f1cf2f4933fe2973e0cc716d5590fccebd37 i18n/deu/extensions/emmet/package.i18n.json
-  their  100644 0edaf6e5d6875889d0429872afe23a1967b5e6c3 i18n/deu/extensions/emmet/package.i18n.json
-@@ -60,6 +60,10 @@
- 	"emmetPreferencesCssMozProperties": "Durch Trennzeichen getrennte CSS-Eigenschaften, die das \"moz\"-Herstellerpräfix erhalten, wenn sie in einer Emmet-Abkürzung verwendet werden, die mit \"-\" beginnt. Legen Sie eine leere Zeichenfolge fest, um das \"moz\"-Präfix immer zu vermeiden.",
- 	"emmetPreferencesCssOProperties": "Durch Trennzeichen getrennte CSS-Eigenschaften, die das \"o\"-Herstellerpräfix erhalten, wenn sie in einer Emmet-Abkürzung verwendet werden, die mit \"-\" beginnt. Legen Sie eine leere Zeichenfolge fest, um das \"o\"-Präfix immer zu vermeiden.",
- 	"emmetPreferencesCssMsProperties": "Durch Trennzeichen getrennte CSS-Eigenschaften, die das \"ms\"-Herstellerpräfix erhalten, wenn sie in einer Emmet-Abkürzung verwendet werden, die mit \"-\" beginnt. Legen Sie eine leere Zeichenfolge fest, um das \"ms\"-Präfix immer zu vermeiden.",
-+<<<<<<< .our
- 	"emmetPreferencesCssFuzzySearchMinScore": "Das Mindestergebnis (zwischen 0 und 1), das die Abkürzung mit Fuzzyübereinstimmung erreichen muss. Niedrigere Werte führen zu vielen falsch positiven Übereinstimmungen, höhere Werte verringern unter Umständen die möglichen Übereinstimmungen.",
- 	"emmetOptimizeStylesheetParsing": "Bei der Einstellung FALSE wird die gesamte Datei analysiert, um zu bestimmten, ob die aktuelle Position zum Erweitern von Emmet-Abkürzungen gültig ist. Bei der Einstellung TRUE wird nur der Inhalt um die die aktuelle Position in CSS-/SCSS-/LESS-Dateien analysiert."
-+=======
-+	"emmetPreferencesCssFuzzySearchMinScore": "Das Mindestergebnis (zwischen 0 und 1), das die Abkürzung mit Fuzzyübereinstimmung erreichen muss. Niedrigere Werte führen zu vielen falsch positiven Übereinstimmungen, höhere Werte verringern unter Umständen die möglichen Übereinstimmungen."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 af42eef9ac721d09fff92fac3044d62dcf871fdb i18n/deu/extensions/git/out/commands.i18n.json
-  our    100644 1abad5f86ec11c777f2319fc1588d47f5ea1c8f5 i18n/deu/extensions/git/out/commands.i18n.json
-  their  100644 7efb13a1a102b58fbcfa16e05ec6d0981aa476a6 i18n/deu/extensions/git/out/commands.i18n.json
-changed in both
-  base   100644 ef10b47a8b3d9ee7c866c8860d3a203a44bb3070 i18n/deu/extensions/php/package.i18n.json
-  our    100644 5c068410d3db4868bf1390c91ee395d7944d41c8 i18n/deu/extensions/php/package.i18n.json
-  their  100644 65da88d745b0a2ee9ff1937ec6e7127771df92b9 i18n/deu/extensions/php/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "PHP-Sprachgrundlagen",
-+=======
-+	"displayName": "PHP-Sprachfeatures",
-+>>>>>>> .their
- 	"description": "Bietet Syntaxhervorhebung und Klammernpaare für PHP-Dateien."
- }
-\ No newline at end of file
-changed in both
-  base   100644 cbc53f2c2a67ebb92c78cb389678757bee6a9894 i18n/deu/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 7bcd160f251f75f4318d89da439565bbd4c696e5 i18n/deu/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 fc7ba3f58b4d2c4d8cfd30408c4ac2202ae66e5c i18n/deu/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -32,7 +32,10 @@
- 	"infoBorder": "Rahmenfarbe von Informationsunterstreichungen im Editor.",
- 	"hintForeground": "Vordergrundfarbe der Hinweisunterstreichungen im Editor.",
- 	"hintBorder": "Rahmenfarbe der Hinweisunterstreichungen im Editor.",
-+<<<<<<< .our
- 	"unnecessaryForeground": "Vordergrundfarbe für nicht benötigten Code im Editor.",
-+=======
-+>>>>>>> .their
- 	"overviewRulerRangeHighlight": "Übersichtslineal-Markierungsfarbe für Bereichshervorhebungen. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen.",
- 	"overviewRuleError": "Übersichtslineal-Markierungsfarbe für Fehler.",
- 	"overviewRuleWarning": "Übersichtslineal-Markierungsfarbe für Warnungen.",
-changed in both
-  base   100644 8eaf7a54f3724c5649ee2156b8618855c0b2ac52 i18n/deu/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 efdaa6c50b1a7075eb309307a09334b8e64087d3 i18n/deu/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 fe6e6c0c3168cf1dadb1d5b31eb6ce7bdf55a44e i18n/deu/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -25,6 +25,11 @@
- 	"uninstallDependeciesConfirmation": "Möchten Sie nur \"{0}\" oder auch die zugehörigen Abhängigkeiten deinstallieren?",
- 	"uninstallOnly": "Nur Erweiterung",
- 	"uninstallAll": "Alle deinstallieren",
-+<<<<<<< .our
-+=======
-+	"uninstallConfirmation": "Möchten Sie \"{0}\" deinstallieren?",
-+	"ok": "OK",
-+>>>>>>> .their
- 	"singleDependentError": "Die Erweiterung \"{0}\" kann nicht deinstalliert werden. Die Erweiterung \"{1}\" hängt von dieser Erweiterung ab.",
- 	"twoDependentsError": "Die Erweiterung \"{0}\" kann nicht deinstalliert werden. Die Erweiterungen \"{1}\" und \"{2}\" hängen von dieser Erweiterung ab.",
- 	"multipleDependentsError": "Die Erweiterung \"{0}\" kann nicht deinstalliert werden. Die Erweiterungen \"{1}\" und \"{2}\" sowie weitere hängen von dieser Erweiterung ab.",
-changed in both
-  base   100644 2e98d7310d1843f4ec476394f338e037c5f2d049 i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 b32f03c31fd5ffcb9742f2b1188daade81a7b028 i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 d703cc6af7769bf1beebc2783d069eb6fa9e7330 i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json
-changed in both
-  base   100644 4290f5cc6933ad4c58c724f46473852a3540b00d i18n/deu/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  our    100644 75b2994052291390999698977515572a80141a18 i18n/deu/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 1f1499c09e65d1d58ad0f3e18c461c55620accf2 i18n/deu/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -7,7 +7,10 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"timeout.formatOnSave": "Formatieren beim Speichern nach {0} ms abgebrochen",
-+<<<<<<< .our
- 	"codeActionsOnSave.didTimeout": "codeActionsOnSave nach {0} ms abgebrochen",
-+=======
-+>>>>>>> .their
- 	"timeout.onWillSave": "Bei onWillSaveTextDocument-Ereignis nach 1750 ms abgebrochen",
- 	"saveParticipants": "Speichern von Teilnehmern wird ausgeführt …"
- }
-\ No newline at end of file
-changed in both
-  base   100644 21a380f129721afa0f652f612f85838edbada430 i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 fc92fd392259fb9b2d1dec1cecdbc3c76bdc7440 i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 5237995530882223bb0572ce8fd0b2c74e19b2f3 i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -80,7 +80,10 @@
- 	"titleBarStyle": "Passt das Aussehen der Titelleiste des Fensters an. Zum Anwenden der Änderungen ist ein vollständiger Neustart erforderlich.",
- 	"window.nativeTabs": "Aktiviert MacOS Sierra-Fensterregisterkarten. Beachten Sie, dass zum Übernehmen von Änderungen ein vollständiger Neustart erforderlich ist und durch ggf. konfigurierte native Registerkarten ein benutzerdefinierter Titelleistenstil deaktiviert wird.",
- 	"window.smoothScrollingWorkaround": "Aktivieren Sie diese Problemumgehung, wenn der Bildlauf nach der Wiederherstellung eines minimierten VS Code-Fensters nicht mehr reibungslos funktioniert. Dies ist eine Problemumgehung für ein Problem (https://github.com/Microsoft/vscode/issues/13612), bei dem der Bildlauf auf Geräten mit präzisen Trackpads wie etwa den Surface-Geräten von Microsoft verzögert ist. Wenn Sie diese Problemumgehung aktivieren, flackert die Anzeige nach dem Wiederherstellen eines Fensters aus dem minimierten Zustand unter Umständen ein wenig, ansonsten treten jedoch keine Probleme auf.",
-+<<<<<<< .our
- 	"window.clickThroughInactive": "Ist dies aktiviert, wird beim Klicken auf ein inaktives Fenster das Fenster aktiviert, und das Element unter der Maus wird ausgelöst, wenn es angeklickt werden kann. Wenn es deaktiviert ist, wird durch Klicken auf eine beliebige Stelle in einem inaktiven Fenster nur das Fenster aktiviert, und Sie müssen das Element zusätzlich anklicken.",
-+=======
-+>>>>>>> .their
- 	"zenModeConfigurationTitle": "Zen-Modus",
- 	"zenMode.fullScreen": "Steuert, ob die Workbench durch das Aktivieren des Zen-Modus in den Vollbildmodus wechselt.",
- 	"zenMode.centerLayout": "Steuert, ob das Layout durch Aktivieren des Zen-Modus ebenfalls zentriert wird.",
-changed in both
-  base   100644 6a4e04d332e9281f9901afe11418d3ce23bd41f0 i18n/deu/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  our    100644 b4980d90513329055396eb8b728644dabebdc442 i18n/deu/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  their  100644 876d48c32e88be15cadb0d13f8ec52ab1f5cff7c i18n/deu/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-@@ -17,7 +17,11 @@
- 	"breakpointUnverifieddHover": "Nicht überprüfter Haltepunkt",
- 	"functionBreakpointUnsupported": "Funktionshaltepunkte werden von diesem Debugtyp nicht unterstützt.",
- 	"breakpointDirtydHover": "Nicht überprüfter Haltepunkt. Die Datei wurde geändert. Bitte starten Sie die Debugsitzung neu.",
-+<<<<<<< .our
- 	"logBreakpointUnsupported": "Protokollpunkte werden für diesen Debugtyp nicht unterstützt",
-+=======
-+	"logBreakpointUnsupported": "Protokollpunkte werden für diesen Debugtyp nicht unterstützt.",
-+>>>>>>> .their
- 	"conditionalBreakpointUnsupported": "Bedingte Haltepunkte werden für diesen Debugtyp nicht unterstützt.",
- 	"hitBreakpointUnsupported": "Bedingte Trefferhaltepunkte werden für diesen Debugtyp nicht unterstützt."
- }
-\ No newline at end of file
-changed in both
-  base   100644 d105d95f39c855b412a682dc8c6ff99835ddd618 i18n/deu/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  our    100644 61e2a86a93e2e3c33425de727e05e70bd4224541 i18n/deu/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  their  100644 7540c5e0ca9e06685974b3c70616bee125f00f32 i18n/deu/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-changed in both
-  base   100644 93b4d514d00499c45fe1202d551fc12d6848f11a i18n/deu/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-  our    100644 7cc2728b73cd74d5f35ab99be72e3bcc387ac4fe i18n/deu/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-  their  100644 489604dbfd968a28e0491bc98ebd75d94eb8c316 i18n/deu/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-@@ -6,9 +6,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"breakpointWidgetLogMessagePlaceholder": "Zu protokollierende Nachricht, wenn der Haltepunkt erreicht wird. Ausdrücke innerhalb von {} werden interpoliert. Betätigen Sie die EINGABETASTE, um dies zu akzeptieren, oder ECS, um den Vorgang abzubrechen.",
- 	"breakpointWidgetHitCountPlaceholder": "Unterbrechen, wenn die Bedingung für die Trefferanzahl erfüllt ist. EINGABETASTE zum Akzeptieren, ESC-TASTE zum Abbrechen.",
- 	"breakpointWidgetExpressionPlaceholder": "Unterbrechen, wenn der Ausdruck als TRUE ausgewertet wird. EINGABETASTE zum Akzeptieren, ESC-TASTE zum Abbrechen.",
-+=======
-+	"breakpointWidgetLogMessagePlaceholder": "Zu protokollierende Nachricht, wenn der Haltepunkt erreicht wird. EINGABETASTE zum Akzeptieren, ESC-TASTE zum Abbrechen.",
-+	"breakpointWidgetHitCountPlaceholder": "Unterbrechen, wenn die Bedingung für die Trefferanzahl erfüllt ist. EINGABETASTE zum Akzeptieren, ESC-TASTE zum Abbrechen.",
-+	"breakpointWidgetExpressionPlaceholder": "Unterbrechen, wenn der Ausdruck als TRUE ausgewertet wird. EINGABETASTE zum Akzeptieren, ESC-TASTE zum Abbrechen.",
-+	"breakpointWidgetLogMessageAriaLabel": "Das Programm protokolliert diese Nachricht, wenn der Haltepunkt erreicht wird. Drücken Sie zum Akzeptieren die EINGABETASTE oder ESC, um den Vorgang abzubrechen.",
-+	"breakpointWidgetHitCountAriaLabel": "Das Programm wird nur angehalten, wenn die Bedingung für die Trefferanzahl erfüllt ist. Drücken Sie zum Akzeptieren die EINGABETASTE oder ESC, um den Vorgang abzubrechen.",
-+	"breakpointWidgetAriaLabel": "Das Programm wird nur angehalten, wenn diese Bedingung erfüllt ist. Drücken Sie zum Akzeptieren die EINGABETASTE oder ESC, um den Vorgang abzubrechen.",
-+>>>>>>> .their
- 	"expression": "Ausdruck",
- 	"hitCount": "Trefferanzahl",
- 	"logMessage": "Protokollmeldung"
-changed in both
-  base   100644 ddf54889d34d5ac66ebe1d2121ebca78298cca00 i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  our    100644 7acc6509b24f394f4d1266257c48f3e0fbbaa375 i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  their  100644 3977ebef2a11dac757397eace2517bb2ea9ae003 i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-@@ -24,6 +24,7 @@
- 	"enableBreakpoints": "Inlinehaltepunkt in Spalte {0} aktivieren",
- 	"enableBreakpointOnLine": "Zeilenhaltepunkt aktivieren",
- 	"addBreakpoint": "Haltepunkt hinzufügen",
-+<<<<<<< .our
- 	"addConditionalBreakpoint": "Bedingten Haltepunkt hinzufügen...",
- 	"addLogPoint": "Protokollpunkt hinzufügen …",
- 	"breakpointHasCondition": "Dieser {0} hat eine {1}, die beim Entfernen verloren geht. Deaktivieren Sie stattdessen ggf. den {0}.",
-@@ -32,5 +33,9 @@
- 	"removeLogPoint": "{0} entfernen",
- 	"disableLogPoint": "{0} deaktivieren",
- 	"cancel": "Abbrechen",
-+=======
-+	"conditionalBreakpoint": "Bedingten Haltepunkt hinzufügen...",
-+	"addLogPoint": "Protokollpunkt hinzufügen …",
-+>>>>>>> .their
- 	"addConfiguration": "Konfiguration hinzufügen..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 d9c6aec8ad3637a31ad622d6f3525d6cf8aec8f0 i18n/deu/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  our    100644 9b039afb7e7129891b940975939709ed5db6f52c i18n/deu/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  their  100644 8a5ea291077caa4598dd79f645a6f36ee84c8d0b i18n/deu/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-@@ -8,6 +8,24 @@
- 	],
- 	"debugAdapterBinNotFound": "Die ausführbare Datei \"{0}\" des Debugadapters ist nicht vorhanden.",
- 	"debugAdapterCannotDetermineExecutable": "Die ausführbare Datei \"{0}\" des Debugadapters kann nicht bestimmt werden.",
-+<<<<<<< .our
- 	"unableToLaunchDebugAdapter": "Der Debugadapter kann nicht aus {0} gestartet werden.",
- 	"unableToLaunchDebugAdapterNoArgs": "Debugadapter kann nicht gestartet werden."
-+=======
-+	"launch.config.comment1": "Verwendet IntelliSense zum Ermitteln möglicher Attribute.",
-+	"launch.config.comment2": "Zeigen Sie auf vorhandene Attribute, um die zugehörigen Beschreibungen anzuzeigen.",
-+	"launch.config.comment3": "Weitere Informationen finden Sie unter {0}",
-+	"debugType": "Der Typ der Konfiguration.",
-+	"debugTypeNotRecognised": "Dieser Debugging-Typ wurde nicht erkannt. Bitte installieren und aktivieren Sie die dazugehörige Debugging-Erweiterung.",
-+	"node2NotSupported": "\"node2\" wird nicht mehr unterstützt, verwenden Sie stattdessen \"node\", und legen Sie das Attribut \"protocol\" auf \"inspector\" fest.",
-+	"debugName": "Der Name der Konfiguration. Er wird im Dropdownmenü der Startkonfiguration angezeigt.",
-+	"debugRequest": "Der Anforderungstyp der Konfiguration. Der Wert kann \"launch\" oder \"attach\" sein.",
-+	"debugServer": "Nur für die Entwicklung von Debugerweiterungen: Wenn ein Port angegeben ist, versucht der VS-Code, eine Verbindung mit einem Debugadapter herzustellen, der im Servermodus ausgeführt wird.",
-+	"debugPrelaunchTask": "Ein Task, der ausgeführt werden soll, bevor die Debugsitzung beginnt.",
-+	"debugPostDebugTask": "Ein Task, der ausgeführt werden soll, nachdem die Debugsitzung endet.",
-+	"debugWindowsConfiguration": "Windows-spezifische Startkonfigurationsattribute.",
-+	"debugOSXConfiguration": "OS X-spezifische Startkonfigurationsattribute.",
-+	"debugLinuxConfiguration": "Linux-spezifische Startkonfigurationsattribute.",
-+	"deprecatedVariables": "\"env.\", \"config.\" und \"command.\" sind veraltet, verwenden Sie stattdessen \"env:\", \"config:\" und \"command:\"."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7b308ecd6d441f0eaef6f3ba975853463d461726 i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 cf7a07fdcb5de4fa57ac5ab17021ee98e54c3fc8 i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 a2f215a756f957f924e9374fa63b362726c5327b i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-@@ -61,7 +61,11 @@
- 	"disabled": "Deaktiviert",
- 	"disabled globally": "Deaktiviert",
- 	"disabled workspace": "Für diesen Arbeitsbereich deaktiviert",
-+<<<<<<< .our
- 	"disableAll": "Alle installierten Erweiterungen deaktivieren",
-+=======
-+	"disableAll": "Alle installierten Erweiterungen löschen",
-+>>>>>>> .their
- 	"disableAllWorkspace": "Alle installierten Erweiterungen für diesen Arbeitsbereich deaktivieren",
- 	"enableAll": "Alle Erweiterungen aktivieren",
- 	"enableAllWorkspace": "Alle Erweiterungen für diesen Arbeitsbereich aktivieren",
-changed in both
-  base   100644 179eb06b2349a03ebee4cd80aa206d7b017f9685 i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  our    100644 34a1a3d6da4aff0a786a99cb931978e719f127b5 i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  their  100644 d7c247b55c5267d490279aac862adca9eb1e3717 i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-@@ -13,7 +13,11 @@
- 	"publisher": "Name des Herausgebers",
- 	"install count": "Installationsanzahl",
- 	"rating": "Bewertung",
-+<<<<<<< .our
- 	"repository": "Repository",
-+=======
-+	"repository": "Repositorium",
-+>>>>>>> .their
- 	"license": "Lizenz",
- 	"details": "Details",
- 	"detailstooltip": "Details zur Erweiterung, die aus der Datei \"README.md\" der Erweiterung gerendert wurden",
-changed in both
-  base   100644 a3725fa64c59f98c8e680bc9f2b8db40dc66ce9c i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  our    100644 7344b01b4a3219fe21a92df254af8af45008be39 i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  their  100644 a4f734c3b4ed62ab97c34eef754ad45f01a09684 i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-@@ -14,7 +14,11 @@
- 	"workspaceRecommendedExtensions": "Arbeitsbereich-Empfehlungen",
- 	"builtInExtensions": "Features",
- 	"builtInThemesExtensions": "Designs",
-+<<<<<<< .our
- 	"builtInBasicsExtensions": "Programmiersprachen",
-+=======
-+	"builtInBasicsExtensions": "Sprachen",
-+>>>>>>> .their
- 	"searchExtensions": "Nach Erweiterungen im Marketplace suchen",
- 	"sort by installs": "Sortieren nach: Installationsanzahl",
- 	"sort by rating": "Sortieren nach: Bewertung",
-changed in both
-  base   100644 eeec7c2ad9ddd6ae91dbe3e2ca6f37cbb7eeeed7 i18n/deu/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-  our    100644 58ca31c36dca8c85d69fa11eab2efeefc720091f i18n/deu/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-  their  100644 0ca12a6abedabe202d7ccda76343019c96e8269f i18n/deu/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-@@ -8,8 +8,13 @@
- 	],
- 	"textFileEditor": "Textdatei-Editor",
- 	"createFile": "Datei erstellen",
-+<<<<<<< .our
- 	"relaunchWithIncreasedMemoryLimit": "Mit {0} MB neu starten",
- 	"configureMemoryLimit": "Arbeitsspeicherbeschränkung konfigurieren",
-+=======
-+	"relaunchWithIncreasedMemoryLimit": "Neustarten",
-+	"configureMemoryLimit": "Konfigurieren",
-+>>>>>>> .their
- 	"fileEditorWithInputAriaLabel": "{0}. Textdatei-Editor.",
- 	"fileEditorAriaLabel": "Textdatei-Editor"
- }
-\ No newline at end of file
-changed in both
-  base   100644 4ba0d0b4feae20fb293c7784f2b2a5e6652e0fa7 i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 e5540f790640626d6989cde6c94da0327b708bbf i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 b27a81bffed65ba1053624395e235e685ee8dc35 i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -38,12 +38,27 @@
- 	"confirmMoveTrashMessageMultiple": "Möchten Sie die folgenden {0} Dateien löschen?",
- 	"confirmMoveTrashMessageFolder": "Möchten Sie \"{0}\" samt Inhalt wirklich löschen?",
- 	"confirmMoveTrashMessageFile": "Möchten Sie \"{0}\" wirklich löschen?",
-+<<<<<<< .our
- 	"confirmDeleteMessageFilesAndDirectories": "Möchten Sie die folgenden {0} Dateien/Verzeichnisse und ihren Inhalt dauerhaft löschen?",
- 	"confirmDeleteMessageMultipleDirectories": "Möchten Sie die folgenden {0} Verzeichnisse und ihren Inhalt dauerhaft löschen?",
- 	"confirmDeleteMessageMultiple": "Möchten Sie die folgenden {0} Dateien endgültig löschen?",
- 	"confirmDeleteMessageFolder": "Möchten Sie \"{0}\" samt Inhalt wirklich endgültig löschen?",
- 	"confirmDeleteMessageFile": "Möchten Sie \"{0}\" wirklich endgültig löschen?",
- 	"addFiles": "Dateien hinzufügen",
-+=======
-+	"undoBin": "Die Wiederherstellung kann aus dem Papierkorb erfolgen.",
-+	"undoTrash": "Die Wiederherstellung kann aus dem Papierkorb erfolgen.",
-+	"doNotAskAgain": "Nicht erneut fragen",
-+	"confirmDeleteMessageMultiple": "Möchten Sie die folgenden {0} Dateien endgültig löschen?",
-+	"confirmDeleteMessageFolder": "Möchten Sie \"{0}\" samt Inhalt wirklich endgültig löschen?",
-+	"confirmDeleteMessageFile": "Möchten Sie \"{0}\" wirklich endgültig löschen?",
-+	"irreversible": "Diese Aktion kann nicht rückgängig gemacht werden.",
-+	"binFailed": "Fehler beim Löschen über den Papierkorb. Möchten Sie den Löschvorgang stattdessen dauerhaft ausführen?",
-+	"trashFailed": "Fehler beim Löschen über den Papierkorb. Möchten Sie den Löschvorgang stattdessen dauerhaft ausführen?",
-+	"deletePermanentlyButtonLabel": "En&&dgültig löschen",
-+	"retryButtonLabel": "Wiede&&rholen",
-+	"importFiles": "Dateien importieren",
-+>>>>>>> .their
- 	"confirmOverwrite": "Im Zielordner ist bereits eine Datei oder ein Ordner mit dem gleichen Namen vorhanden. Möchten Sie sie bzw. ihn ersetzen?",
- 	"replaceButtonLabel": "&&Ersetzen",
- 	"fileIsAncestor": "Die einzufügende Datei ist ein Vorgänger des Zielordners",
-changed in both
-  base   100644 3a121e07e4e137d92b9ef0ca51f60c44aa42edb2 i18n/deu/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 99f2be77fbb56221d4c3c1cc8f45e6884be7fd7a i18n/deu/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 82622bce31ce746a8c28ad133bdfe7144b0e82e7 i18n/deu/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-@@ -35,7 +35,11 @@
- 	"hotExit": "Steuert, ob nicht gespeicherten Dateien zwischen den Sitzungen beibehlten werden, die Aufforderung zum Speichern wird beim Beenden des Editors übersprungen.",
- 	"useExperimentalFileWatcher": "Verwenden Sie die neue experimentelle Dateiüberwachung.",
- 	"defaultLanguage": "Der Standardsprachmodus, der neuen Dateien zugewiesen wird.",
-+<<<<<<< .our
- 	"maxMemoryForLargeFilesMB": "Steuert den für VS Code verfügbaren Arbeitsspeicher nach einem Neustart beim Versuch, große Dateien zu öffnen. Gleiche Auswirkung wie beim Festlegen von --max-memory=NEWSIZE in der Befehlszeile.",
-+=======
-+	"maxMemoryForLargeFilesMB": "Die neue Arbeitsspeicherbegrenzung in MB, die von der Anwendung beim Neustart zum Öffnen großer Dateien verwendet werden soll. Wenn Sie den Start mit einer höheren Begrenzung durchführen möchten, können Sie die Anwendung über die Befehlszeile mit --max-memory=NEWSIZE starten.",
-+>>>>>>> .their
- 	"editorConfigurationTitle": "Editor",
- 	"formatOnSave": "Hiermit wird eine Datei beim Speichern formatiert. Es muss ein Formatierer vorhanden sein, die Datei darf nicht automatisch gespeichert werden, und der Editor darf nicht geschlossen werden.",
- 	"formatOnSaveTimeout": "Zeitüberschreitung beim Formatieren während des Speicherns. Legt eine Zeitbegrenzung in Millisekunden für formatOnSave-Befehle fest. Befehle, die länger dauern als die festgelegte Zeitüberschreitung, werden abgebrochen. ",
-changed in both
-  base   100644 10464e3a656eefafb40a825e43a00a7f372e1d15 i18n/deu/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  our    100644 89c8d9fa907d279de7e54d5e05888634d504dacc i18n/deu/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  their  100644 8c13333a13f5f4102db1f78fea7b1960a67c14a7 i18n/deu/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-changed in both
-  base   100644 b1ad2f843d9975490d9aa5231b6580563c7d5712 i18n/deu/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-  our    100644 6f978d7eda1e5d2039c724cd7fa46fbb2de4b11c i18n/deu/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-  their  100644 26d54f425a7bbb676220775de8071e18894ae9e2 i18n/deu/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-changed in both
-  base   100644 778741d8c94e782404fd64147de66b3bc745ecf3 i18n/deu/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
-  our    100644 ed217d3a918e63e85bfa07e9f0b024e93f20f1c3 i18n/deu/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
-  their  100644 2d89a6d6d42b5451132cb36413b2712d288b17c7 i18n/deu/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
-@@ -7,5 +7,9 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"copyMarker": "Kopieren",
-+<<<<<<< .our
- 	"copyMessage": "Nachricht kopieren"
-+=======
-+	"copyMarkerMessage": "Nachricht kopieren"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6b3a52e72b9d7a69d11132f3cdb229d84b76ea16 i18n/deu/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-  our    100644 68082d2d7bd57e3521d8d98d121dd0c9f42fc76e i18n/deu/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-  their  100644 7fafba7473214dab7ca6cf543db95282f394b1eb i18n/deu/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-changed in both
-  base   100644 d9089d4fc044e7258bebd17f19cb4dfdc5546019 i18n/deu/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  our    100644 737a3d57cf844a63ebd59c6462488a0472760d7a i18n/deu/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  their  100644 d1b848d165762bed486678c657691cae62adc75d i18n/deu/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
-+=======
-+	"keybindingsInputName": "Tastenkombinationen",
-+>>>>>>> .their
- 	"showDefaultKeybindings": "Standard-Tastaturbelegungen anzeigen",
- 	"showUserKeybindings": "Benutzer-Tastaturbelegungen anzeigen",
- 	"SearchKeybindings.AriaLabel": "Tastenzuordnungen suchen",
-changed in both
-  base   100644 97d605ad472106d88029fe272e0a3082443c0af8 i18n/deu/src/vs/workbench/parts/search/browser/searchView.i18n.json
-  our    100644 f2f216a0a047fbef56f5094bbd15e808251180f1 i18n/deu/src/vs/workbench/parts/search/browser/searchView.i18n.json
-  their  100644 1eb5a5f8272e5c1a4b418e33050208487162e246 i18n/deu/src/vs/workbench/parts/search/browser/searchView.i18n.json
-@@ -7,10 +7,16 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"moreSearch": "Suchdetails umschalten",
-+<<<<<<< .our
- 	"searchScope.includes": "Einzuschließende Dateien",
- 	"label.includes": "Sucheinschlussmuster",
- 	"searchScope.excludes": "Auszuschließende Dateien",
- 	"label.excludes": "Suchausschlussmuster",
-+=======
-+	"searchIncludeExclude.label": "Einzubeziehende/auszuschließende Dateien",
-+	"searchIncludeExclude.ariaLabel": "Einzubeziehende/auszuschließende Muster suchen",
-+	"searchIncludeExclude.placeholder": "Beispiele: src, !*.ts, test/**/*.log",
-+>>>>>>> .their
- 	"replaceAll.confirmation.title": "Alle ersetzen",
- 	"replaceAll.confirm.button": "&&Ersetzen",
- 	"replaceAll.occurrence.file.message": "{0} Vorkommen in {1} Datei durch \"{2}\" ersetzt.",
-changed in both
-  base   100644 37a1bba4e0c8e37213b131e4851c2d5951f20272 i18n/deu/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 b3a9bfb6f09fdd913393d2a5b333f495988fabdc i18n/deu/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 fcf1a9b591321ace7c404cf7e97661fdc9743fe6 i18n/deu/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-@@ -28,7 +28,10 @@
- 	"JsonSchema.tasks.group.none": "Weist die Aufgabe keiner Gruppe zu.",
- 	"JsonSchema.tasks.group": "Definiert die Ausführungsgruppe, zu der diese Aufgabe gehört. Zum Hinzufügen der Aufgabe zur Buildgruppe wird \"build\" unterstützt und zum Hinzufügen zur Testgruppe \"test\".",
- 	"JsonSchema.tasks.type": "Definiert, ob die Aufgabe als Prozess oder als Befehl innerhalb einer Shell ausgeführt wird.",
-+<<<<<<< .our
- 	"JsonSchema.commandArray": "Der auszuführende Shell-Befehl. Arrayelemente werden mit einem Leerzeichen verknüpft.",
-+=======
-+>>>>>>> .their
- 	"JsonSchema.command.quotedString.value": "Der tatsächliche Sollwert",
- 	"JsonSchema.tasks.quoting.escape": "Fügt mithilfe des Escapezeichens der Shell vor Zeichen Escapezeichen ein (z. B. `  bei PowerShell und \\ bei Bash).",
- 	"JsonSchema.tasks.quoting.strong": "Setzt das Argument mithilfe des starken Anführungszeichens der Shell in Anführungszeichen (z. B. \" bei PowerShell und Bash).",
-changed in both
-  base   100644 b20a17cd7a71f9a8ed5fabe20d49dc87893b9ca0 i18n/deu/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 5e860baf0d874c2a564e21bd9c48c55877bc2bfd i18n/deu/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 270a22e33da8fb4530a3a45cce07cf2517178b1c i18n/deu/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-changed in both
-  base   100644 b47e2f347c047d0710922646a12b4d44e0cc5cae i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 17f468b874b715481031f72251583765b50e478f i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 26d1f5b9d92ca3af460f5e430566fa92bb03f9de i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -54,10 +54,17 @@
- 	"nextTerminalFindTerm": "Nächsten Suchbegriff anzeigen",
- 	"previousTerminalFindTerm": "Vorherigen Suchbegriff anzeigen",
- 	"quickOpenTerm": "Aktives Terminal wechseln",
-+<<<<<<< .our
- 	"workbench.action.terminal.scrollToPreviousCommand": "Zu vorherigem Befehl scrollen",
- 	"workbench.action.terminal.scrollToNextCommand": "Zu nächstem Befehl scrollen",
- 	"workbench.action.terminal.selectToPreviousCommand": "Auswählen bis zu vorherigem Befehl",
- 	"workbench.action.terminal.selectToNextCommand": "Auswählen bis zu nächstem Befehl",
- 	"workbench.action.terminal.selectToPreviousLine": " Auswählen bis zur vorherigen Zeile ",
- 	"workbench.action.terminal.selectToNextLine": "Auswählen bis zur nächsten Zeile"
-+=======
-+	"workbench.action.terminal.focusPreviousCommand": "Fokus auf vorherigen Befehl",
-+	"workbench.action.terminal.focusNextCommand": "Fokus auf nächsten Befehl",
-+	"workbench.action.terminal.selectToPreviousCommand": "Auswählen bis zu vorherigem Befehl",
-+	"workbench.action.terminal.selectToNextCommand": "Auswählen bis zu nächstem Befehl"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/deu/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
-  our    100644 bfc2bc1f14609e4d731f1d750b5b017ddf480686 i18n/deu/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
-  their  100644 7a43ea55cf4cc7f23dbf34687a866380550de9ca i18n/deu/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
-@@ -6,5 +6,20 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"stringsOnlySupported": "Der Befehl {0} hat keine Zeichenfolge als Ergebnis zurückgegeben. Als Ergebnisse für Befehle, die zur Variablenersetzung verwendet werden, werden nur Zeichenfolgen unterstützt."
-+=======
-+	"canNotResolveWorkspaceFolderMultiRoot": "${workspaceFolder} kann nicht in einen Workspace mit mehreren Ordnern aufgelöst werden. Legen Sie mithilfe von : und einem Ordnernamen einen Bereich für diese Variable fest.",
-+	"canNotResolveWorkspaceFolder": "${workspaceFolder} kann nicht aufgelöst werden. Öffnen Sie einen Ordner.",
-+	"canNotResolveFolderBasenameMultiRoot": "${workspaceFolderBasename}  kann nicht in einen Workspace mit mehreren Ordnern aufgelöst werden. Legen Sie mithilfe von : und einem Ordnernamen einen Bereich für diese Variable fest.",
-+	"canNotResolveFolderBasename": "${workspaceFolderBasename} kann nicht aufgelöst werden. Öffnen Sie einen Ordner.",
-+	"canNotResolveLineNumber": "${lineNumber} kann nicht aufgelöst werden. Öffnen Sie einen Editor.",
-+	"canNotResolveSelectedText": "${selectedText} kann nicht aufgelöst werden. Öffnen Sie einen Editor.",
-+	"canNotResolveFile": "${file} kann nicht aufgelöst werden. Öffnen Sie einen Editor.",
-+	"canNotResolveRelativeFile": "${relativeFile} kann nicht aufgelöst werden. Öffnen Sie einen Editor.",
-+	"canNotResolveFileDirname": "${fileDirname} kann nicht aufgelöst werden. Öffnen Sie einen Editor.",
-+	"canNotResolveFileExtname": "${fileExtname} kann nicht aufgelöst werden. Öffnen Sie einen Editor.",
-+	"canNotResolveFileBasename": "${fileBasename} kann nicht aufgelöst werden. Öffnen Sie einen Editor.",
-+	"canNotResolveFileBasenameNoExtension": "${fileBasenameNoExtension} kann nicht aufgelöst werden. Öffnen Sie einen Editor."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d1ad985a6bd1e149bc298f3c8c632bfeeb1ac505 i18n/deu/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-  our    100644 846beeace7a9c66267471e1a113dc80dd82654c5 i18n/deu/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-  their  100644 d30c4b49abc6298285fa355dda93952ff2b3a548 i18n/deu/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-@@ -11,6 +11,7 @@
- 	"neverShowAgain": "Nicht mehr anzeigen",
- 	"enospcError": "{0} kann keine Dateiänderungen in diesem großen Workspace überwachen. Folgen Sie dem Anwendungslink, um das Problem zu beheben.",
- 	"learnMore": "Anweisungen",
-+<<<<<<< .our
- 	"fileInvalidPath": "Ungültige Dateiressource ({0})",
- 	"fileIsDirectoryError": "Die Datei ist ein Verzeichnis",
- 	"fileNotModifiedError": "Datei nicht geändert seit",
-@@ -24,6 +25,9 @@
- 	"fileReadOnlyError": "Die Datei ist schreibgeschützt.",
- 	"fileMoveConflict": "Verschieben/Kopieren kann nicht ausgeführt werden. Die Datei ist am Ziel bereits vorhanden.",
- 	"unableToMoveCopyError": "Der Verschiebe-/Kopiervorgang kann nicht ausgeführt werden. Die Datei würde den Ordner ersetzen, in dem sie enthalten ist.",
-+=======
-+	"enospcError": "{0} kann keine Dateiänderungen in diesem großen Workspace überwachen. Folgen Sie dem Anwendungslink, um das Problem zu beheben.",
-+>>>>>>> .their
- 	"binFailed": "Fehler beim Verschieben von \"{0}\" in den Papierkorb.",
- 	"trashFailed": "Fehler beim Verschieben von \"{0}\" in den Papierkorb."
- }
-\ No newline at end of file
-merged
-  result 100644 df502aec1d28ed686084e263578486bdc323e1e5 i18n/deu/src/vs/workbench/services/files/node/fileService.i18n.json
-  our    100644 a2229be0ceef3b429bbc28d1dcb6e2f94145d317 i18n/deu/src/vs/workbench/services/files/node/fileService.i18n.json
-@@ -9,6 +9,7 @@
- 	"fileInvalidPath": "Ungültige Dateiressource ({0})",
- 	"fileIsDirectoryError": "Die Datei ist ein Verzeichnis",
- 	"fileNotModifiedError": "Datei nicht geändert seit",
-+	"fileTooLargeForHeapError": "Die Dateigröße überschreitet die standardmäßige Speicherbegrenzung. Führen Sie einen Neustart mit einer höheren Begrenzung durch. Die aktuelle Einstellung ist für einen Neustart mit {0} MB konfiguriert.",
- 	"fileTooLargeError": "Die Datei ist zu groß, um sie zu öffnen.",
- 	"fileNotFoundError": "Die Datei wurde nicht gefunden ({0}).",
- 	"fileBinaryError": "Die Datei scheint eine Binärdatei zu sein und kann nicht als Text geöffnet werden.",
-changed in both
-  base   100644 852d92d405c88aab4e4a293c6ab242b3255b18f1 i18n/esn/extensions/emmet/package.i18n.json
-  our    100644 d6c05800c1ebc6febea004f2095561aeefca8479 i18n/esn/extensions/emmet/package.i18n.json
-  their  100644 242638ccbb9475b7f68de9d027fcefb6f55e3283 i18n/esn/extensions/emmet/package.i18n.json
-@@ -60,6 +60,10 @@
- 	"emmetPreferencesCssMozProperties": "Propiedades CSS separadas por comas que obtienen el prefijo de proveedor 'moz' cuando se utilizan en la abreviatura Emmet que comienza con '-'. Establecer en la cadena vacía para evitar siempre el prefijo 'moz'.",
- 	"emmetPreferencesCssOProperties": "Propiedades CSS separadas por comas que obtienen el prefijo de proveedor 'o' cuando se utilizan en la abreviatura Emmet que comienza con '-'. Establecer en la cadena vacía para evitar siempre el prefijo 'o'.",
- 	"emmetPreferencesCssMsProperties": "Propiedades CSS separadas por comas que obtienen el prefijo de proveedor 'ms' cuando se utilizan en la abreviatura Emmet que comienza con '-'. Establecer en la cadena vacía para evitar siempre el prefijo 'ms'.",
-+<<<<<<< .our
- 	"emmetPreferencesCssFuzzySearchMinScore": "La mínima puntuación (de 0 a 1) que se debe alcanzar en la comparación difusa de abreviación. Los valores más bajos pueden producir muchos resultados falsos positivos, los valores más altos pueden reducir posibles coincidencias.",
- 	"emmetOptimizeStylesheetParsing": "Cuando se establece en falso, se analiza el archivo entero para determinar si la posición actual es válida para la expansión de abreviaturas de Emmet. Cuando se establece en verdadero, sólo el contenido alrededor de la posición actual en archivos css, scss/less es analizado."
-+=======
-+	"emmetPreferencesCssFuzzySearchMinScore": "La mínima puntuación (de 0 a 1) que se debe alcanzar en la comparación difusa de abreviación. Los valores más bajos pueden producir muchos resultados falsos positivos, los valores más altos pueden reducir posibles coincidencias."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 53ebb086ddb911cfa791c4312f0c1d723888c12f i18n/esn/extensions/git/out/commands.i18n.json
-  our    100644 022bf20d57e92a28a5ced5a2d0998bc8b0dfe335 i18n/esn/extensions/git/out/commands.i18n.json
-  their  100644 6f66844414293fcee28db9d5c99b52d0c4e4a836 i18n/esn/extensions/git/out/commands.i18n.json
-changed in both
-  base   100644 09a54bc2ce319af1c45f677246f560d0dac7c29a i18n/esn/extensions/markdown-language-features/out/security.i18n.json
-  our    100644 6d04884c9620acff09e0fe37eee0eb79a2dcbf8b i18n/esn/extensions/markdown-language-features/out/security.i18n.json
-  their  100644 c46abaea75d2ac430fee630d0b623cdacb9bfb64 i18n/esn/extensions/markdown-language-features/out/security.i18n.json
-changed in both
-  base   100644 e7b6423f2b66fcbee224782386d465619419a638 i18n/esn/extensions/php/package.i18n.json
-  our    100644 edf1d540da8d8e826f984f378d9f2cef8f946b7b i18n/esn/extensions/php/package.i18n.json
-  their  100644 6c12a714deb54d73ed47f0c29c160d36d907e9dd i18n/esn/extensions/php/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Conceptos básicos del lenguaje PHP",
-+=======
-+	"displayName": "Características del lenguaje PHP",
-+>>>>>>> .their
- 	"description": "Proporciona resaltado de sintaxis y correspondencia de corchetes en archivos PHP."
- }
-\ No newline at end of file
-changed in both
-  base   100644 131e96b837a0eb2f6de43ab7330dd9221c16a8fd i18n/esn/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 e90f2798b359468ab2a777af9b7d68417b46fdb4 i18n/esn/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 da5601c50ae36b658088428774cd6a76d59a55df i18n/esn/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -32,7 +32,10 @@
- 	"infoBorder": "Color del borde de los subrayados ondulados informativos en el editor.",
- 	"hintForeground": "Color de primer plano de pista squigglies en el editor.",
- 	"hintBorder": "Color de borde de pista squigglies en el editor.",
-+<<<<<<< .our
- 	"unnecessaryForeground": "Color de primer plano de código innecesario en el editor.",
-+=======
-+>>>>>>> .their
- 	"overviewRulerRangeHighlight": "Resumen de color de marcador para destacar rangos. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
- 	"overviewRuleError": "Color de marcador de regla de información general para errores. ",
- 	"overviewRuleWarning": "Color de marcador de regla de información general para advertencias.",
-changed in both
-  base   100644 87bd0fe318cd0e4cd739e20e13582031b6ad7765 i18n/esn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 862953cea1ced6aa68869023b06a401296a0b72c i18n/esn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 9eb5de30595dbdd3f63ee47f1b9cb77898584fd7 i18n/esn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -25,6 +25,11 @@
- 	"uninstallDependeciesConfirmation": "¿Quiere desinstalar solo '{0}' o también sus dependencias?",
- 	"uninstallOnly": "Sólo extensión",
- 	"uninstallAll": "Desinstalar todo",
-+<<<<<<< .our
-+=======
-+	"uninstallConfirmation": "¿Seguro que quiere desinstalar '{0}'?",
-+	"ok": "Aceptar",
-+>>>>>>> .their
- 	"singleDependentError": "No se puede desinstalar la extensión '{0}'. La extensión '{1}' depende de esta.",
- 	"twoDependentsError": "No se puede desinstalar la extensión '{0}'. Las extensiones '{1}' y '{2}' dependen de esta.",
- 	"multipleDependentsError": "No se puede desinstalar la extensión '{0}'. Las extensiones '{1}' y '{2}', entre otras, dependen de esta.",
-changed in both
-  base   100644 075049e313b4de97138f2248e818d66e53eef9b1 i18n/esn/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 df47f2d2522b992756f57ce29b59bc070792254f i18n/esn/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 39139e047430fe6359a85b77b58903085b0a1245 i18n/esn/src/vs/platform/theme/common/colorRegistry.i18n.json
-changed in both
-  base   100644 34f590266a9e409019311838b845bbe53926aef8 i18n/esn/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  our    100644 40e2044209fec4e5b919e2e5e83378e9f6815093 i18n/esn/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 754cfd39b02b5ce6b7af40dd2f7723d2413e3d2f i18n/esn/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -7,7 +7,10 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"timeout.formatOnSave": "Anular la aplicación de formato al guardar después de {0} ms",
-+<<<<<<< .our
- 	"codeActionsOnSave.didTimeout": "codeActionsOnSave anulado después de {0} ms",
-+=======
-+>>>>>>> .their
- 	"timeout.onWillSave": "Se anuló onWillSaveTextDocument-event después de 1750 ms",
- 	"saveParticipants": "Ejecutando Guardar Participantes..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 62d7de2c6f0f886ddbf2766231ffcb41da178938 i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 57d447a0a0b664b859bc321a1781f6980e63b0fd i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 9082a4b168bd7448a1f0b83d2342ae2a5213c8f2 i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -80,7 +80,10 @@
- 	"titleBarStyle": "Ajuste la apariencia de la barra de título de la ventana. Se debe realizar un reinicio completo para aplicar los cambios.",
- 	"window.nativeTabs": "Habilita las fichas de ventana en macOS Sierra. Note que los cambios requieren que reinicie el equipo y las fichas nativas deshabilitan cualquier estilo personalizado que haya configurado.",
- 	"window.smoothScrollingWorkaround": "Habilite esta solución alternativa si el desplazamiento deja de ser homogéneo después de restaurar una ventana de VS Code minimizada. Esta es una solución para un problema (https://github.com/Microsoft/vscode/issues/13612) en el que el desplazamiento comienza a sufrir interrupciones en dispositivos con panel táctil de precisión, como los dispositivos Surface de Microsoft. Al habilitar esta solución alternativa, puede parpadear ligeramente la distribución después de restaurar la ventana minimizada, pero no afecta a nada más.",
-+<<<<<<< .our
- 	"window.clickThroughInactive": "Si está habilitado, haciendo clic en una ventana inactiva, activará dicha ventana y disparará el elemento bajo el cursor del ratón si éste es clicable. Si está deshabilitado, haciendo clic en cualquier lugar en una ventana inactiva, solo activará la misma y será necesario un segundo clic en el elemento. ",
-+=======
-+>>>>>>> .their
- 	"zenModeConfigurationTitle": "Modo zen",
- 	"zenMode.fullScreen": "Controla si activar el modo Zen pone también el trabajo en modo de pantalla completa.",
- 	"zenMode.centerLayout": "Controla si al encender el Modo Zen también se centra el diseño.",
-changed in both
-  base   100644 19e1e0cc44d29e9d86a46f2181922a97361770d5 i18n/esn/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  our    100644 b7d4e9cddd0bf1f7c4ee968b757c9316af83ba48 i18n/esn/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  their  100644 cf902af2091c3e0c2d3630f3e30f2b3a1fee997d i18n/esn/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-@@ -17,7 +17,11 @@
- 	"breakpointUnverifieddHover": "Punto de interrupción no comprobado",
- 	"functionBreakpointUnsupported": "Este tipo de depuración no admite puntos de interrupción en funciones",
- 	"breakpointDirtydHover": "Punto de interrupción no comprobado. El archivo se ha modificado, reinicie la sesión de depuración.",
-+<<<<<<< .our
- 	"logBreakpointUnsupported": "Logpoints no son compatible con este tipo de depuración",
-+=======
-+	"logBreakpointUnsupported": "Este tipo de depuración no admite puntos de registro",
-+>>>>>>> .their
- 	"conditionalBreakpointUnsupported": "Este tipo de depuración no es compatible con los puntos de interrupción condicionales.",
- 	"hitBreakpointUnsupported": "Este tipo de depuración no admite el uso de puntos de interrupción condicionales"
- }
-\ No newline at end of file
-changed in both
-  base   100644 77f54a5e29fa18a7ba26458ff16a2aecc1ec5a1f i18n/esn/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  our    100644 712a034280e7aa13ccdc8b4ab89c00d48a86e498 i18n/esn/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  their  100644 83395706f58bd4f9413216db7f4b363a29fa57e6 i18n/esn/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-@@ -8,7 +8,11 @@
- 	],
- 	"toggleBreakpointAction": "Depuración: Alternar punto de interrupción",
- 	"conditionalBreakpointEditorAction": "Depuración: agregar punto de interrupción condicional...",
-+<<<<<<< .our
- 	"logPointEditorAction": "Depuración: Agregar punto de registro...",
-+=======
-+	"logPointEditorAction": "Depurar: agregar punto de registro...",
-+>>>>>>> .their
- 	"runToCursor": "Ejecutar hasta el cursor",
- 	"debugEvaluate": "Depuración: Evaluar",
- 	"debugAddToWatch": "Depuración: Agregar a inspección",
-changed in both
-  base   100644 72b3d080b9d20f3c4280d6f35c63b41c6de7dc3c i18n/esn/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-  our    100644 b238709d15fe83fb203624f12a5790fd95f42849 i18n/esn/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-  their  100644 d574bcb61a9aede12ef417490d452e5fd69ed05f i18n/esn/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-@@ -6,9 +6,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"breakpointWidgetLogMessagePlaceholder": "Mensaje para registrar cuando se alcanza el punto de interrupción. Las expresiones entre {} son interpoladas. 'Enter' para aceptar, 'esc' para cancelar. ",
- 	"breakpointWidgetHitCountPlaceholder": "Interrumpir cuando se alcance el número de llamadas. Presione \"ENTRAR\" para aceptar o \"Esc\" para cancelar.",
- 	"breakpointWidgetExpressionPlaceholder": "Interrumpir cuando la expresión se evalúa como true. Presione \"ENTRAR\" para aceptar o \"Esc\" para cancelar.",
-+=======
-+	"breakpointWidgetLogMessagePlaceholder": "Mensaje que se registra cuando se alcanza un punto de interrupción. \"Entrar\" para aceptar, \"Esc\" para cancelar.",
-+	"breakpointWidgetHitCountPlaceholder": "Interrumpir cuando se alcance el número de llamadas. Presione \"ENTRAR\" para aceptar o \"Esc\" para cancelar.",
-+	"breakpointWidgetExpressionPlaceholder": "Interrumpir cuando la expresión se evalúa como true. Presione \"ENTRAR\" para aceptar o \"Esc\" para cancelar.",
-+	"breakpointWidgetLogMessageAriaLabel": "El programa registrará este mensaje cada vez que se alcance un punto de interrupción. Presione Entrar para aceptar o Esc para cancelar.",
-+	"breakpointWidgetHitCountAriaLabel": "El programa solo se detendrá aquí si se alcanza el número de llamadas. Presione ENTRAR para aceptar o Esc para cancelar.",
-+	"breakpointWidgetAriaLabel": "El programa solo se detendrá aquí si esta condición es true. Presione ENTRAR para aceptar o Esc para cancelar.",
-+>>>>>>> .their
- 	"expression": "Expresión",
- 	"hitCount": "Número de llamadas",
- 	"logMessage": "Mensaje de registro"
-changed in both
-  base   100644 1c8d3ad1e175efb43392ef4461d7173c4d7974d8 i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  our    100644 fcf6be03f0498bef930d9bf9f70c63bd467d0f42 i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  their  100644 83e436d91db65072f4727376a5971e6c9930091e i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-@@ -24,6 +24,7 @@
- 	"enableBreakpoints": "Habilitar el punto de interrupción insertado en la columna {0}",
- 	"enableBreakpointOnLine": "Habilitar punto de interrupción de línea",
- 	"addBreakpoint": "Agregar punto de interrupción",
-+<<<<<<< .our
- 	"addConditionalBreakpoint": "Agregar punto de interrupción condicional...",
- 	"addLogPoint": "Agregar punto de registro",
- 	"breakpointHasCondition": "Este {0} tiene una {1} que se perderá al quitarla. Considere la posibilidad de desactivar el {0} en su lugar.",
-@@ -32,5 +33,9 @@
- 	"removeLogPoint": "Quitar {0}",
- 	"disableLogPoint": "Deshabilitar {0}",
- 	"cancel": "Cancelar",
-+=======
-+	"conditionalBreakpoint": "Agregar punto de interrupción condicional...",
-+	"addLogPoint": "Agregar punto de registro...",
-+>>>>>>> .their
- 	"addConfiguration": "Agregar configuración..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 2bceb504035e5fb5c9bb1fd96e02c8ea1b02bf9b i18n/esn/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  our    100644 3055932755fc85e2cfe5115465d1c1970923bac0 i18n/esn/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  their  100644 2bc654f47e36fef4f1c67e97634eab9eb065a347 i18n/esn/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-@@ -8,6 +8,24 @@
- 	],
- 	"debugAdapterBinNotFound": "El ejecutable del adaptador de depuración \"{0}\" no existe.",
- 	"debugAdapterCannotDetermineExecutable": "No se puede determinar el ejecutable para el adaptador de depuración \"{0}\".",
-+<<<<<<< .our
- 	"unableToLaunchDebugAdapter": "No se puede iniciar el adaptador de depuración desde '{0}'.",
- 	"unableToLaunchDebugAdapterNoArgs": "No se puede iniciar el adaptador de depuración."
-+=======
-+	"launch.config.comment1": "Utilizar IntelliSense para aprender acerca de los posibles atributos.",
-+	"launch.config.comment2": "Mantenga el puntero para ver las descripciones de los existentes atributos ",
-+	"launch.config.comment3": "Para más información, visite: {0}",
-+	"debugType": "Tipo de configuración.",
-+	"debugTypeNotRecognised": "Este tipo de depuración no se reconoce. Compruebe que tiene instalada la correspondiente extensión de depuración y que está habilitada.",
-+	"node2NotSupported": "\"node2\" ya no se admite; use \"node\" en su lugar y establezca el atributo \"protocol\" en \"inspector\".",
-+	"debugName": "Nombre de la configuración. Aparece en el menú desplegable de la configuración de inicio.",
-+	"debugRequest": "Tipo de solicitud de la configuración. Puede ser \"launch\" o \"attach\".",
-+	"debugServer": "Solo para el desarrollo de extensiones de depuración: si se especifica un puerto, VS Code intenta conectarse a un adaptador de depuración que se ejecuta en modo servidor",
-+	"debugPrelaunchTask": "Tarea que se va a ejecutar antes de iniciarse la sesión de depuración.",
-+	"debugPostDebugTask": "Tarea que se ejecutará después de terminar la sesión de depuración.",
-+	"debugWindowsConfiguration": "Atributos de configuración de inicio específicos de Windows.",
-+	"debugOSXConfiguration": "Atributos de configuración de inicio específicos de OS X.",
-+	"debugLinuxConfiguration": "Atributos de configuración de inicio específicos de Linux.",
-+	"deprecatedVariables": "\"env.\", \"config.\" y \"command.\" están en desuso, utilice en su lugar \"env:\", \"config:\" y \"command:\"."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 21701a2c2dd07142da32aa65d4aa5a77e9170b0c i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  our    100644 c17e1a95935a6574438eb39611676f6b936cc1bc i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  their  100644 b632b359f0dfdaf60acd28d32da4d02db14a1318 i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-changed in both
-  base   100644 896424f6a2cdd7d378e516117d20dbcb1fbcdd2b i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  our    100644 a44cd55d9ca2de8be4e5fadbac434ab72717183e i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  their  100644 8a82f2023f03ee3413c74748714e1e25a27076cb i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-@@ -14,7 +14,11 @@
- 	"workspaceRecommendedExtensions": "Recomendaciones de espacio de trabajo",
- 	"builtInExtensions": "Características",
- 	"builtInThemesExtensions": "Temas",
-+<<<<<<< .our
- 	"builtInBasicsExtensions": "Lenguajes de programación",
-+=======
-+	"builtInBasicsExtensions": "Idiomas",
-+>>>>>>> .their
- 	"searchExtensions": "Buscar extensiones en Marketplace",
- 	"sort by installs": "Criterio de ordenación: Número de instalaciones",
- 	"sort by rating": "Criterio de ordenación: Clasificación",
-changed in both
-  base   100644 e7856c7726a3c10327ce7bd1d7c9aea98bd74b6a i18n/esn/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-  our    100644 6a743b771b9254a83bdf35bf62572dcf909e437d i18n/esn/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-  their  100644 328cd97f00ad3101513f6a164c202522546c6263 i18n/esn/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-@@ -8,8 +8,13 @@
- 	],
- 	"textFileEditor": "Editor de archivos de texto",
- 	"createFile": "Crear archivo",
-+<<<<<<< .our
- 	"relaunchWithIncreasedMemoryLimit": "Reiniciar con {0} MB",
- 	"configureMemoryLimit": "Configurar límite de memoria",
-+=======
-+	"relaunchWithIncreasedMemoryLimit": "Reiniciar",
-+	"configureMemoryLimit": "Configurar",
-+>>>>>>> .their
- 	"fileEditorWithInputAriaLabel": "{0}. Editor de archivos de texto.",
- 	"fileEditorAriaLabel": "Editor de archivos de texto."
- }
-\ No newline at end of file
-changed in both
-  base   100644 b540790d3f3cbd270099133e886b98b3b259d7a2 i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 1e23db714d120943226391e3c5ce27170460d94d i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 e18200e6b7f84ce4a718ee6fcf8f71e7c391a920 i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -38,12 +38,27 @@
- 	"confirmMoveTrashMessageMultiple": "¿Está seguro de que desea eliminar los siguientes archivos {0}?",
- 	"confirmMoveTrashMessageFolder": "¿Está seguro de que desea eliminar '{0}' y su contenido?",
- 	"confirmMoveTrashMessageFile": "¿Está seguro de que desea eliminar '{0}'?",
-+<<<<<<< .our
- 	"confirmDeleteMessageFilesAndDirectories": "¿Está seguro de que desea eliminar los {0} archivos o directorios siguientes y su contenido de forma permanente?",
- 	"confirmDeleteMessageMultipleDirectories": "¿Está seguro de que desea eliminar los {0} directorios siguientes y su contenido de forma permanente? ",
- 	"confirmDeleteMessageMultiple": "¿Está seguro de que desea eliminar de forma permanente los siguientes archivos {0}?",
- 	"confirmDeleteMessageFolder": "¿Está seguro de que desea eliminar '{0}' y su contenido de forma permanente?",
- 	"confirmDeleteMessageFile": "¿Está seguro de que desea eliminar '{0}' de forma permanente?",
- 	"addFiles": "Agregar archivos",
-+=======
-+	"undoBin": "Se puede restaurar de la papelera de reciclaje.",
-+	"undoTrash": "Se puede restaurar de la papelera.",
-+	"doNotAskAgain": "No volver a preguntarme",
-+	"confirmDeleteMessageMultiple": "¿Está seguro de que desea eliminar de forma permanente los siguientes archivos {0}?",
-+	"confirmDeleteMessageFolder": "¿Está seguro de que desea eliminar '{0}' y su contenido de forma permanente?",
-+	"confirmDeleteMessageFile": "¿Está seguro de que desea eliminar '{0}' de forma permanente?",
-+	"irreversible": "Esta acción es irreversible.",
-+	"binFailed": "Error al eliminar usando la papelera de reciclaje. ¿Desea eliminar de forma permanente en su lugar?",
-+	"trashFailed": "No se pudo eliminar usando la papelera. ¿Desea eliminar de forma permanente?",
-+	"deletePermanentlyButtonLabel": "&&Eliminar de forma permanente",
-+	"retryButtonLabel": "&&Reintentar",
-+	"importFiles": "Importar archivos",
-+>>>>>>> .their
- 	"confirmOverwrite": "Ya existe un archivo o carpeta con el mismo nombre en la carpeta de destino. ¿Quiere reemplazarlo?",
- 	"replaceButtonLabel": "&&Reemplazar",
- 	"fileIsAncestor": "El archivo que se va a pegar es un antecesor de la carpeta de destino",
-changed in both
-  base   100644 93ee0518a0b571a6f0d7698aa3cc22046da359d1 i18n/esn/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 530360de300c015c0e1de9b17dd26ccddaf04e46 i18n/esn/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 509e8590def84f27649e2bae20a1e5b33b7b9ba1 i18n/esn/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-@@ -35,7 +35,11 @@
- 	"hotExit": "Controla si los archivos no guardados se recuerdan entre las sesiones, lo que permite omitir el mensaje para guardar al salir del editor.",
- 	"useExperimentalFileWatcher": "Utilice el nuevo monitor de archivo experimental.",
- 	"defaultLanguage": "El modo de lenguaje predeterminado que se asigna a nuevos archivos.",
-+<<<<<<< .our
- 	"maxMemoryForLargeFilesMB": "Controla la memoria disponible para VS Code después de reiniciar, cuando se intenta abrir archivos de gran tamaño. Afecta de la misma manera si se especifica --max-memory = NUEVOTAMAÑO en la línea de comandos. ",
-+=======
-+	"maxMemoryForLargeFilesMB": "Nuevo límite de memoria en MB que debe usar la aplicación cuando se reinicie para abrir archivos grandes. Si desea comenzar con un límite superior, puede iniciar la aplicación desde la línea de comandos con --max-memory=NEWSIZE.",
-+>>>>>>> .their
- 	"editorConfigurationTitle": "Editor",
- 	"formatOnSave": "Formatea un archivo al guardarlo. Debe haber un formateador disponible, el archivo no debe guardarse automáticamente y el editor no debe estar cerrándose.",
- 	"formatOnSaveTimeout": "Tiempo de espera de aplicación de formato al guardar. Especifica un límite de tiempo en milisegundos para los comandos formatOnSave. Los comandos que tarden más del tiempo de espera especificado se cancelarán.",
-changed in both
-  base   100644 1bcad541fa7d0c0a87b9e01f0dfaf5ca934b6be1 i18n/esn/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  our    100644 c8dca1d775bcd059f6f0f93622281f64f6f8d22e i18n/esn/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  their  100644 e0b1a1af32f784a9faf92a58979767cc6d32828c i18n/esn/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-changed in both
-  base   100644 8d320c3e36de44fe1be9705ac04cd5597a89833c i18n/esn/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-  our    100644 6fd49793b66342f6b19fe9c86c3269f91d587798 i18n/esn/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-  their  100644 05049c9e3b28574b4892beb11f312785cb40d49c i18n/esn/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-changed in both
-  base   100644 eab6272315ab315d27d6ce9ce43493c9c6d97918 i18n/esn/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-  our    100644 90352e08b0c68e4410f776055d7726932a395f02 i18n/esn/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-  their  100644 385e5e7fa0ea77fe0eedede5dece3ab55a45f4f6 i18n/esn/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-changed in both
-  base   100644 b0f61204eeb14401475bb1b008893a05035ba6e8 i18n/esn/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  our    100644 634545e1c6f01f32015f6ce1bd5a355377917a51 i18n/esn/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  their  100644 4386527ff34bb1503bbe3709bd1a98f51cbe7000 i18n/esn/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
-+=======
-+	"keybindingsInputName": "Métodos abreviados de teclado",
-+>>>>>>> .their
- 	"showDefaultKeybindings": "Mostrar enlaces de teclado predeterminados",
- 	"showUserKeybindings": "Mostrar enlaces de teclado del usuario",
- 	"SearchKeybindings.AriaLabel": "Buscar enlaces de teclado",
-changed in both
-  base   100644 be513ebe447cff91dc46327eed54c7da32eef84b i18n/esn/src/vs/workbench/parts/search/browser/searchView.i18n.json
-  our    100644 0c3d29ae593df25c19d137f3045954d907ba1dc7 i18n/esn/src/vs/workbench/parts/search/browser/searchView.i18n.json
-  their  100644 2747b74cac8f6b60a28e22a1e3e258badb986d02 i18n/esn/src/vs/workbench/parts/search/browser/searchView.i18n.json
-@@ -7,10 +7,16 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"moreSearch": "Alternar detalles de la búsqueda",
-+<<<<<<< .our
- 	"searchScope.includes": "archivos para incluir",
- 	"label.includes": "Buscar patrones de inclusión",
- 	"searchScope.excludes": "archivos para excluir",
- 	"label.excludes": "Buscar patrones de exclusión",
-+=======
-+	"searchIncludeExclude.label": "archivos para incluir o excluir",
-+	"searchIncludeExclude.ariaLabel": "Buscar patrones de inclusión o exclusión",
-+	"searchIncludeExclude.placeholder": "Ejemplos: src, !*.ts, test/**/*.log",
-+>>>>>>> .their
- 	"replaceAll.confirmation.title": "Reemplazar todo",
- 	"replaceAll.confirm.button": "&&Reemplazar",
- 	"replaceAll.occurrence.file.message": "{0} aparición reemplazada en {1} archivo por \"{2}\".",
-changed in both
-  base   100644 41e40ef4d297f359ffbe64aeabab498349c3551e i18n/esn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 7367d0a39f1701be221d6ff3d3d8cae3add9845a i18n/esn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 4f1f33161a75890f593cf32b6220421952329ca9 i18n/esn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-@@ -28,7 +28,10 @@
- 	"JsonSchema.tasks.group.none": "No asigna la tarea a ningún grupo",
- 	"JsonSchema.tasks.group": "Define a qué grupo de ejecución pertenece esta tarea. Admite \"compilación\" para agregarla al grupo de compilación y \"prueba\" para agregarla al grupo de prueba.",
- 	"JsonSchema.tasks.type": "Define si la tarea se ejecuta como un proceso o como un comando dentro de in shell. ",
-+<<<<<<< .our
- 	"JsonSchema.commandArray": "El comando Shell que se ejecutará. Los elementos de la matriz se ensamblarán mediante un carácter de espacio",
-+=======
-+>>>>>>> .their
- 	"JsonSchema.command.quotedString.value": "El valor actual del comando",
- 	"JsonSchema.tasks.quoting.escape": "Carácteres de escape usan el carácter de escape de la linea de comandos (ej.: ' en PowerShell y \\ en Bash)",
- 	"JsonSchema.tasks.quoting.strong": "Cita el argumento usando el carácter de citación doble de la linea de comandos (ej.: \" en PowerShell y Bash) ",
-changed in both
-  base   100644 fb8b41d8a5ef42921b4b695ccb3cfa50208b633e i18n/esn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 cf1ca0ef5c2b17265b6eb266a58dc6112305ccf4 i18n/esn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 cbe068f10d1e7f023f1c11eb450025fcdd9f7dba i18n/esn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-changed in both
-  base   100644 1c13a74b03389ddf12f7b1955b36c28408f9fbd0 i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 21fcf5a4e9d2653bdf22cd882d1fa612baf507de i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 20f4a9bd7ac8903707e9c1f1a0d842fc7049340f i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -54,10 +54,17 @@
- 	"nextTerminalFindTerm": "Mostrar siguiente término de búsqueda",
- 	"previousTerminalFindTerm": "Mostrar término de búsqueda anterior",
- 	"quickOpenTerm": "Cambiar terminal activo",
-+<<<<<<< .our
- 	"workbench.action.terminal.scrollToPreviousCommand": "Desplácese al comando anterior",
- 	"workbench.action.terminal.scrollToNextCommand": "Desplácese al siguiente comando",
- 	"workbench.action.terminal.selectToPreviousCommand": "Seleccionar hasta el comando anterior",
- 	"workbench.action.terminal.selectToNextCommand": "Seleccionar hasta el comando siguiente",
- 	"workbench.action.terminal.selectToPreviousLine": "Seleccione la línea anterior",
- 	"workbench.action.terminal.selectToNextLine": "Seleccione la línea siguiente"
-+=======
-+	"workbench.action.terminal.focusPreviousCommand": "Aplicar el foco al comando anterior",
-+	"workbench.action.terminal.focusNextCommand": "Aplicar el foco al comando siguiente",
-+	"workbench.action.terminal.selectToPreviousCommand": "Seleccionar hasta el comando anterior",
-+	"workbench.action.terminal.selectToNextCommand": "Seleccionar hasta el comando siguiente"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e71ac660c5f2a5fea6e76bb754bfaa14e0d16610 i18n/esn/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
-  our    100644 8e6bbb15ccc9a16cb32210cdd8f68f5c8e755f35 i18n/esn/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
-  their  100644 e9f770cb2be72d23bc794e57cb93154bd2a216c7 i18n/esn/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
-@@ -6,5 +6,20 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"stringsOnlySupported": "El comando {0} no devolvió un resultado de cadena. Sólo se admiten cadenas como resultados para los comandos utilizados para la sustitución de variables."
-+=======
-+	"canNotResolveWorkspaceFolderMultiRoot": "${workspaceFolder} no se puede resolver en una área de trabajo de varias carpetas. Determine el ámbito de estas variables usando : y un nombre de carpeta.",
-+	"canNotResolveWorkspaceFolder": "${workspaceFolder} no se puede resolver. Por favor, abra una carpeta.",
-+	"canNotResolveFolderBasenameMultiRoot": "${workspaceFolderBasename} no se puede resolver en una área de trabajo de varias carpetas. Establezca el alcance de estas variables usando : y un nombre de carpeta.",
-+	"canNotResolveFolderBasename": "${workspaceFolderBasename} no se puede resolver. Por favor, abra una carpeta.",
-+	"canNotResolveLineNumber": "${lineNumber} no se puede resolver, por favor, abra un editor.",
-+	"canNotResolveSelectedText": "${selectedText} no se puede resolver, por favor, abra un editor.",
-+	"canNotResolveFile": "${file} no se puede resolver, por favor, abra un editor.",
-+	"canNotResolveRelativeFile": "${relativeFile} no se puede resolver, por favor, abra un editor.",
-+	"canNotResolveFileDirname": "${fileDirname} no se puede resolver, por favor, abra un editor.",
-+	"canNotResolveFileExtname": "${fileExtname} no se puede resolver, por favor, abra un editor.",
-+	"canNotResolveFileBasename": "${fileBasename} no se puede resolver, por favor, abra un editor.",
-+	"canNotResolveFileBasenameNoExtension": "${fileBasenameNoExtension} no se puede resolver, por favor, abra un editor."
-+>>>>>>> .their
- }
-\ No newline at end of file
-merged
-  result 100644 684f1d5259148973c4b8d5ee2d848746cdfe2e6e i18n/esn/src/vs/workbench/services/files/node/fileService.i18n.json
-  our    100644 69847e82751064f3cffd7bd9062a7dbd2fdc0e69 i18n/esn/src/vs/workbench/services/files/node/fileService.i18n.json
-@@ -9,6 +9,7 @@
- 	"fileInvalidPath": "Recurso de archivo no válido ({0})",
- 	"fileIsDirectoryError": "Archivo es el directorio",
- 	"fileNotModifiedError": "Archivo no modificado desde",
-+	"fileTooLargeForHeapError": "El tamaño del archivo supera el límite de memoria predeterminado. Reinicie con un límite superior. La configuración actual es reiniciar con {0} MB.",
- 	"fileTooLargeError": "Archivo demasiado grande para abrirlo",
- 	"fileNotFoundError": "Archivo no encontrado ({0})",
- 	"fileBinaryError": "El archivo parece ser binario y no se puede abrir como texto",
-changed in both
-  base   100644 bc93fe05e88ddf109424efc03b36be2ed8327545 i18n/fra/extensions/git/out/commands.i18n.json
-  our    100644 95b33e9cb37384a542e0f0621ed506addc05f3b9 i18n/fra/extensions/git/out/commands.i18n.json
-  their  100644 1fe6735dc5d4772bb4c17ed33fe33f97fddfdd55 i18n/fra/extensions/git/out/commands.i18n.json
-changed in both
-  base   100644 20a77bf9902397359ea601ad3ef8b39249288e09 i18n/fra/extensions/php/package.i18n.json
-  our    100644 7432910059505786aeb77409e75866339d62c1a2 i18n/fra/extensions/php/package.i18n.json
-  their  100644 42d994f8072ed8df8abaa4c7a79282b25443b9d1 i18n/fra/extensions/php/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Concepts de base du langage PHP",
-+=======
-+	"displayName": "Fonctionnalités du langage PHP",
-+>>>>>>> .their
- 	"description": "Fournit la coloration syntaxique et la correspondance des parenthèses dans les fichiers PHP."
- }
-\ No newline at end of file
-changed in both
-  base   100644 3b0bc4935156b1368ab5d77b15108689a7e7b123 i18n/fra/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 e3b7be89c4680bacecf118915da9495bb164163d i18n/fra/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 f382fd2543619591f92327dec4e75cc9039d71f9 i18n/fra/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -32,7 +32,10 @@
- 	"infoBorder": "Couleur de bordure de la ligne ondulée marquant les informations dans l'éditeur.",
- 	"hintForeground": "Couleur de premier plan de la ligne ondulée d'indication dans l'éditeur.",
- 	"hintBorder": "Couleur de bordure de la ligne ondulée d'indication dans l'éditeur.",
-+<<<<<<< .our
- 	"unnecessaryForeground": "Couleur de premier plan du code inutile dans l'éditeur.",
-+=======
-+>>>>>>> .their
- 	"overviewRulerRangeHighlight": "Couleur du marqueur de la règle d'aperçu pour des plages mises en surbrillance. La couleur doit ne pas être opaque pour ne pas masquer les décorations du dessous.",
- 	"overviewRuleError": "Couleur du marqueur de la règle d'aperçu pour les erreurs.",
- 	"overviewRuleWarning": "Couleur du marqueur de la règle d'aperçu pour les avertissements.",
-changed in both
-  base   100644 6b8c2481d1f40d9ba0346a2b906c7e8077f20985 i18n/fra/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  our    100644 8e1c626a771393d667c7b3c11b9837bda978f030 i18n/fra/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 6ad0b22d7ed27a50f036ba589a839f8785c8a484 i18n/fra/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -7,7 +7,10 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"timeout.formatOnSave": "Format avorté lors de l'enregistrement après {0} ms",
-+<<<<<<< .our
- 	"codeActionsOnSave.didTimeout": "codeActionsOnSave abandonné au bout de {0} ms",
-+=======
-+>>>>>>> .their
- 	"timeout.onWillSave": "OnWillSaveTextDocument-event avorté après 1750 ms",
- 	"saveParticipants": "Exécution de la sauvegarde des participants..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 ef97b82ec545442e03d0cd26d95bd6dc0902039e i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 1a663cb4405d0c8f86ec154a57cdd2b613d93195 i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 2c9425186bff924f2d0ab3c9ca2bbe1757fca514 i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -80,7 +80,10 @@
- 	"titleBarStyle": "Ajustez l'apparence de la barre de titre de la fenêtre. Vous devez effectuer un redémarrage complet pour que les changements soient appliqués.",
- 	"window.nativeTabs": "Active les onglets macOS Sierra. Notez que vous devez redémarrer l'ordinateur pour appliquer les modifications et que les onglets natifs désactivent tout style de barre de titre personnalisé configuré, le cas échéant.",
- 	"window.smoothScrollingWorkaround": "Activez cette solution de contournement si le défilement n’est plus lissé après la restauration d’une fenêtre de VS Code réduite. Il s’agit d’une solution de contournement pour un problème (https://github.com/Microsoft/vscode/issues/13612) où le défilement commence à laguer sur les périphériques dotés de pavés de précision comme les appareils Surface de Microsoft. Activer cette solution de contournement peut provoquer un peu de scintillement de mise en page après la restauration de la fenêtre depuis l’état minimisé mais est sans danger.",
-+<<<<<<< .our
- 	"window.clickThroughInactive": "Si activée, cliquer sur une fenêtre inactive activera la fenêtre et déclenchera l’élément sous la souris, si elle est cliquable. Si désactivé, cliquer n’importe où sur une fenêtre inactive va seulement l'activer et un second clic sur l’élément sera nécessaire.",
-+=======
-+>>>>>>> .their
- 	"zenModeConfigurationTitle": "Mode Zen",
- 	"zenMode.fullScreen": "Contrôle si l'activation de Zen Mode met également le banc d'essai en mode plein écran.",
- 	"zenMode.centerLayout": "Contrôle si l'activation du mode Zen centre également la disposition.",
-changed in both
-  base   100644 f3007ffa4193b68f457ed858caaa12ed5992ff30 i18n/fra/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  our    100644 ea17513fd0b7438358bedc5e679b748d269562de i18n/fra/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  their  100644 9cefb85297af3519e53c5c86f6be77b7bef7b128 i18n/fra/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-@@ -17,7 +17,11 @@
- 	"breakpointUnverifieddHover": "Point d'arrêt non vérifié",
- 	"functionBreakpointUnsupported": "Les points d'arrêt de fonction ne sont pas pris en charge par ce type de débogage",
- 	"breakpointDirtydHover": "Point d'arrêt non vérifié. Fichier modifié. Redémarrez la session de débogage.",
-+<<<<<<< .our
- 	"logBreakpointUnsupported": "Les points de journalisation ne sont pas pris en charge par ce type de débogage",
-+=======
-+	"logBreakpointUnsupported": "Log points non pris en charge par ce type de débogage",
-+>>>>>>> .their
- 	"conditionalBreakpointUnsupported": "Les points d'arrêt conditionnels ne sont pas pris en charge par ce type de débogage",
- 	"hitBreakpointUnsupported": "Les points d'arrêt conditionnels ne sont pas pris en charge par ce type de débogage"
- }
-\ No newline at end of file
-changed in both
-  base   100644 518d71cfb8fb33959f49f75509a412729e131beb i18n/fra/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  our    100644 c60cc41768e6fed42f5ce8d4a24c89cb2e037162 i18n/fra/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  their  100644 b9f58b85393a7524b6ada3e2e89778aff9b94b91 i18n/fra/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-@@ -8,7 +8,11 @@
- 	],
- 	"toggleBreakpointAction": "Déboguer : activer/désactiver un point d'arrêt",
- 	"conditionalBreakpointEditorAction": "Déboguer : ajouter un point d'arrêt conditionnel...",
-+<<<<<<< .our
- 	"logPointEditorAction": "Débogage : Ajouter un point de journalisation...",
-+=======
-+	"logPointEditorAction": "Déboguer : ajouter un Log point...",
-+>>>>>>> .their
- 	"runToCursor": "Exécuter jusqu'au curseur",
- 	"debugEvaluate": "Déboguer : évaluer",
- 	"debugAddToWatch": "Déboguer : ajouter à la fenêtre Espion",
-changed in both
-  base   100644 bd3746f483c06026adc11dc0abdc6d10273172c5 i18n/fra/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-  our    100644 44f7ce035b6e35faffa68a44fe9f5804c37d8266 i18n/fra/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-  their  100644 98bce49687e9c2fc307c293f2d83bd1c7e89e4ac i18n/fra/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-@@ -6,9 +6,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"breakpointWidgetLogMessagePlaceholder": "Message à loguer lorsque le point d’arrêt est atteint. Les expressions entre {} sont interpolées. 'Entrée' pour accepter,'Echap' pour annuler.",
- 	"breakpointWidgetHitCountPlaceholder": "Arrêt quand le nombre d'accès est atteint. 'Entrée' pour accepter ou 'Échap' pour annuler.",
- 	"breakpointWidgetExpressionPlaceholder": "Arrêt quand l'expression prend la valeur true. 'Entrée' pour accepter ou 'Échap' pour annuler.",
-+=======
-+	"breakpointWidgetLogMessagePlaceholder": "Message à loguer lorsque le point d’arrêt est atteint. 'Enter' pour accepter, 'Échap' pour annuler.",
-+	"breakpointWidgetHitCountPlaceholder": "Arrêt quand le nombre d'accès est atteint. 'Entrée' pour accepter ou 'Échap' pour annuler.",
-+	"breakpointWidgetExpressionPlaceholder": "Arrêt quand l'expression prend la valeur true. 'Entrée' pour accepter ou 'Échap' pour annuler.",
-+	"breakpointWidgetLogMessageAriaLabel": "Le programme enregistrera ce message chaque fois que ce point d’arrêt est atteint. Appuyez sur Entrée pour accepter ou Échap pour annuler.",
-+	"breakpointWidgetHitCountAriaLabel": "Le programme s'arrête ici uniquement si le nombre d'accès est atteint. Appuyez sur Entrée pour accepter, ou sur Échap pour annuler.",
-+	"breakpointWidgetAriaLabel": "Le programme s'arrête ici uniquement si cette condition a la valeur true. Appuyez sur Entrée pour accepter, ou sur Échap pour annuler.",
-+>>>>>>> .their
- 	"expression": "Expression",
- 	"hitCount": "Nombre d'accès",
- 	"logMessage": "Message de log"
-changed in both
-  base   100644 2cdcf5ae1aa32a1194167de33c3483c1742089ad i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  our    100644 c72f6ed139308469b1eda47864e3e1ed2bf00916 i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  their  100644 dfd310163a34b7e95223df060d2755aa7dffe481 i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-@@ -24,6 +24,7 @@
- 	"enableBreakpoints": "Activer le point d’arrêt Inline sur la colonne {0}",
- 	"enableBreakpointOnLine": "Activer le point d'arrêt de la ligne",
- 	"addBreakpoint": "Ajouter un point d'arrêt",
-+<<<<<<< .our
- 	"addConditionalBreakpoint": "Ajouter un point d'arrêt conditionnel...",
- 	"addLogPoint": "Ajouter un point de journalisation...",
- 	"breakpointHasCondition": "Ce {0} a un {1} qui sera perdu en cas de suppression. Désactivez le {0} à la place.",
-@@ -32,5 +33,9 @@
- 	"removeLogPoint": "Supprimer {0}",
- 	"disableLogPoint": "Désactiver {0}",
- 	"cancel": "Annuler",
-+=======
-+	"conditionalBreakpoint": "Ajouter un point d'arrêt conditionnel...",
-+	"addLogPoint": "Ajouter un Log Point",
-+>>>>>>> .their
- 	"addConfiguration": "Ajouter une configuration..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 9a38baf245641a937dd39e0f8908e9fe03b3e512 i18n/fra/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  our    100644 11c71d149dcd965919372e9b079e7b0ec31fc966 i18n/fra/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  their  100644 be75e44565c95fb340c826d6643640b51b46999e i18n/fra/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-@@ -8,6 +8,24 @@
- 	],
- 	"debugAdapterBinNotFound": "L'exécutable d'adaptateur de débogage '{0}' n'existe pas.",
- 	"debugAdapterCannotDetermineExecutable": "Impossible de déterminer l'exécutable pour l'adaptateur de débogage '{0}'.",
-+<<<<<<< .our
- 	"unableToLaunchDebugAdapter": "Impossible de lancer l'adaptateur de débogage à partir de '{0}'.",
- 	"unableToLaunchDebugAdapterNoArgs": "Impossible de lancer l'adaptateur de débogage."
-+=======
-+	"launch.config.comment1": "Utilisez IntelliSense pour en savoir plus sur les attributs possibles.",
-+	"launch.config.comment2": "Pointez pour afficher la description des attributs existants.",
-+	"launch.config.comment3": "Pour plus d'informations, visitez : {0}",
-+	"debugType": "Type de configuration.",
-+	"debugTypeNotRecognised": "Le type de débogage n'est pas reconnu. Vérifiez que vous avez installé l'extension de débogage correspondante et qu'elle est activée.",
-+	"node2NotSupported": "\"node2\" n'est plus pris en charge. Utilisez \"node\" à la place, et affectez la valeur \"inspector\" à l'attribut \"protocol\".",
-+	"debugName": "Le nom de la configuration s'affiche dans le menu déroulant de la configuration de lancement.",
-+	"debugRequest": "Type de requête de configuration. Il peut s'agir de \"launch\" ou \"attach\".",
-+	"debugServer": "Pour le développement d'une extension de débogage uniquement : si un port est spécifié, VS Code tente de se connecter à un adaptateur de débogage s'exécutant en mode serveur",
-+	"debugPrelaunchTask": "Tâche à exécuter avant le démarrage de la session de débogage.",
-+	"debugPostDebugTask": "Tâche à exécuter après que le débogage se termine.",
-+	"debugWindowsConfiguration": "Attributs de configuration de lancement spécifiques à Windows.",
-+	"debugOSXConfiguration": "Attributs de configuration de lancement spécifiques à OS X.",
-+	"debugLinuxConfiguration": "Attributs de configuration de lancement spécifiques à Linux.",
-+	"deprecatedVariables": "env.', 'config.' et 'command.' sont déconseillés. Utilisez 'env:', 'config:' et 'command:' à la place."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c68f4a910927fcdc87cfd867ea2ab3637f71baaf i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  our    100644 0c89b62126cb9cedd41a45c5bb89945d3497fe59 i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  their  100644 7c8133234c39808af627f4574d56047ac8e01258 i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-@@ -44,8 +44,13 @@
- 	"view location": "Emplacement",
- 	"localizations": "Localisations ({0})",
- 	"localizations language id": "Id de langue",
-+<<<<<<< .our
- 	"localizations language name": "Nom de la langue",
- 	"localizations localized language name": "Nom de la langue (localisé)",
-+=======
-+	"localizations language name": "Nom de langue",
-+	"localizations localized language name": "Nom de langue (localisé)",
-+>>>>>>> .their
- 	"colorThemes": "Thèmes de couleurs ({0})",
- 	"iconThemes": "Thèmes d’icônes ({0})",
- 	"colors": "Couleurs ({0})",
-changed in both
-  base   100644 557f45e5910fd9ab623cccc9dd8fa87735b78615 i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  our    100644 f395ede0a046caeae18a2c7db319d8ae7b900356 i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  their  100644 d37374d6f5326622061b7ed44af81d76144e8f36 i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-@@ -14,7 +14,11 @@
- 	"workspaceRecommendedExtensions": "Recommandations de l’espace de travail",
- 	"builtInExtensions": "Fonctionnalités",
- 	"builtInThemesExtensions": "Thèmes",
-+<<<<<<< .our
- 	"builtInBasicsExtensions": "Langages de programmation",
-+=======
-+	"builtInBasicsExtensions": "Langages",
-+>>>>>>> .their
- 	"searchExtensions": "Rechercher des extensions dans Marketplace",
- 	"sort by installs": "Trier par : nombre d'installations",
- 	"sort by rating": "Trier par : évaluation",
-changed in both
-  base   100644 412d69fb5bf367c6f0ee3575326ea122288eb6aa i18n/fra/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-  our    100644 3d2c988d730e15f92019e8071c4ee2a839a4b437 i18n/fra/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-  their  100644 4cbd420efec0a5da843af14f694f1a52e9191098 i18n/fra/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-@@ -8,8 +8,13 @@
- 	],
- 	"textFileEditor": "Éditeur de fichier texte",
- 	"createFile": "Créer un fichier",
-+<<<<<<< .our
- 	"relaunchWithIncreasedMemoryLimit": "Redémarrer avec {0} Mo",
- 	"configureMemoryLimit": "Configurer la limite de mémoire",
-+=======
-+	"relaunchWithIncreasedMemoryLimit": "Relancer",
-+	"configureMemoryLimit": "Configurer",
-+>>>>>>> .their
- 	"fileEditorWithInputAriaLabel": "{0}. Éditeur de fichier texte.",
- 	"fileEditorAriaLabel": "Éditeur de fichier texte."
- }
-\ No newline at end of file
-changed in both
-  base   100644 a31359c7486914a756043a31f319e441fc9059bf i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 fa117de3746fd117674712532fb1af257c3eacf4 i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 cb267faf4455250a1b36f02f41c31616ae670ba8 i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -38,12 +38,27 @@
- 	"confirmMoveTrashMessageMultiple": "Êtes-vous sûr de vouloir supprimer les fichiers {0} suivants ?",
- 	"confirmMoveTrashMessageFolder": "Voulez-vous vraiment supprimer '{0}' et son contenu ?",
- 	"confirmMoveTrashMessageFile": "Voulez-vous vraiment supprimer '{0}' ?",
-+<<<<<<< .our
- 	"confirmDeleteMessageFilesAndDirectories": "Voulez-vous vraiment supprimer définitivement les {0} fichiers/répertoires suivants et leur contenu ?",
- 	"confirmDeleteMessageMultipleDirectories": "Voulez-vous vraiment supprimer définitivement les {0} répertoires suivants et leur contenu ?",
- 	"confirmDeleteMessageMultiple": "Êtes-vous sûr de vouloir supprimer définitivement les fichiers {0} suivants ?",
- 	"confirmDeleteMessageFolder": "Voulez-vous vraiment supprimer définitivement '{0}' et son contenu ?",
- 	"confirmDeleteMessageFile": "Voulez-vous vraiment supprimer définitivement '{0}' ?",
- 	"addFiles": "Ajouter des fichiers",
-+=======
-+	"undoBin": "Vous pouvez restaurer à partir de la Corbeille.",
-+	"undoTrash": "Vous pouvez restaurer à partir de la Poubelle.",
-+	"doNotAskAgain": "Ne plus me demander",
-+	"confirmDeleteMessageMultiple": "Êtes-vous sûr de vouloir supprimer définitivement les fichiers {0} suivants ?",
-+	"confirmDeleteMessageFolder": "Voulez-vous vraiment supprimer définitivement '{0}' et son contenu ?",
-+	"confirmDeleteMessageFile": "Voulez-vous vraiment supprimer définitivement '{0}' ?",
-+	"irreversible": "Cette action est irréversible !",
-+	"binFailed": "Impossible de supprimer en utilisant la corbeille. Voulez-vous supprimer définitivement à la place ?",
-+	"trashFailed": "Impossible de supprimer en utilisant la corbeille. Voulez-vous supprimer définitivement à la place?",
-+	"deletePermanentlyButtonLabel": "Supprimer &&définitivement",
-+	"retryButtonLabel": "&&Réessayer",
-+	"importFiles": "Importer des fichiers",
-+>>>>>>> .their
- 	"confirmOverwrite": "Un fichier ou dossier portant le même nom existe déjà dans le dossier de destination. Voulez-vous le remplacer ?",
- 	"replaceButtonLabel": "&&Remplacer",
- 	"fileIsAncestor": "Le fichier à copier est un ancêtre du dossier de destination",
-changed in both
-  base   100644 e5b80a13c4415d99cb3ee452365e356ff39adb64 i18n/fra/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 a75d38efac11add868250527f11214dd6ff75d12 i18n/fra/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 1bc54a246d33afafe154e329f09be7148bd4764c i18n/fra/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-@@ -35,7 +35,11 @@
- 	"hotExit": "Contrôle si les fichiers non enregistrés sont mémorisés entre les sessions, ce qui permet d'ignorer la demande d'enregistrement à la sortie de l'éditeur.",
- 	"useExperimentalFileWatcher": "Utilisez le nouvel observateur de fichiers expérimental.",
- 	"defaultLanguage": "Mode de langage par défaut affecté aux nouveaux fichiers.",
-+<<<<<<< .our
- 	"maxMemoryForLargeFilesMB": "Contrôle la mémoire disponible pour VS Code après redémarrage en essayant d’ouvrir les fichiers volumineux. Cela a le même effet que de spécifier --max-memory=NEWSIZE sur la ligne de commande.",
-+=======
-+	"maxMemoryForLargeFilesMB": "La nouvelle limite de mémoire en Mo à utiliser par l’application lorsque elle se relance pour ouvrir des fichiers volumineux. Si vous souhaitez commencer avec une limite plus élevée, vous pouvez lancer l’application de ligne de commande avec l’option --max-memory=NEWSIZE.",
-+>>>>>>> .their
- 	"editorConfigurationTitle": "Éditeur",
- 	"formatOnSave": "Met en forme un fichier au moment de l'enregistrement. Un formateur doit être disponible, le fichier ne doit pas être enregistré automatiquement, et l'éditeur ne doit pas être en cours d'arrêt.",
- 	"formatOnSaveTimeout": "Délai d’attente pour formater lors de l'enregistrement. Spécifie le délai en millisecondes pour les commandes formatOnSave. Les commandes prenant plus de temps que le délai d’attente spécifié seront annulées.",
-changed in both
-  base   100644 a5adcd52e7903c1c5f66ec3400363012b91ccc4d i18n/fra/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  our    100644 41c3a1d60501fd1442ed2c9b9f3cac9ed3fd2bbe i18n/fra/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  their  100644 18b9bcc75e033649c379c75912d4e3a63af841ec i18n/fra/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-changed in both
-  base   100644 76289731369588dfda1e7687c592ffade207a9cf i18n/fra/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-  our    100644 9139ee20000e02871db62799f4e3bf44e815f204 i18n/fra/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-  their  100644 4e106f9358a018b284097ba3e909925420d90cad i18n/fra/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-changed in both
-  base   100644 7e415dbd6deaa301538df7e9f971625b57cc53fb i18n/fra/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
-  our    100644 a615adefb9ecb146fc7e84dc4b16f73838dc6bc1 i18n/fra/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
-  their  100644 680339bdc2769284bc10dfd3fc3c2f71092aad6b i18n/fra/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
-@@ -7,5 +7,9 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"copyMarker": "Copier",
-+<<<<<<< .our
- 	"copyMessage": "Copier le Message"
-+=======
-+	"copyMarkerMessage": "Copier le Message"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ced53cc49d43b0ce31faf2f0f7bdcb5fc9ece7cf i18n/fra/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-  our    100644 f31962ae04c1e2044d7f998ce0b53b4b08372ffd i18n/fra/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-  their  100644 d03f909768686ea0ba99cefa0d287b3ffcc0149e i18n/fra/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-changed in both
-  base   100644 10b4d1f5b733937624ca08df1d5eb2b8151e736a i18n/fra/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  our    100644 675ad6e2d506f6eb23037370e188ea4353697fb3 i18n/fra/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  their  100644 ea1782bfd60906e4e2899f07032dfd7e23e10490 i18n/fra/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
-+=======
-+	"keybindingsInputName": "Raccourcis clavier",
-+>>>>>>> .their
- 	"showDefaultKeybindings": "Afficher les raccourcis clavier par défaut",
- 	"showUserKeybindings": "Afficher les raccourcis clavier utilisateur",
- 	"SearchKeybindings.AriaLabel": "Rechercher dans les combinaisons de touches",
-changed in both
-  base   100644 89db9e011193f51c330e90f51ba704a0501447b4 i18n/fra/src/vs/workbench/parts/search/browser/searchView.i18n.json
-  our    100644 4cd20eea1e68cf73a56249541b739d94f4272553 i18n/fra/src/vs/workbench/parts/search/browser/searchView.i18n.json
-  their  100644 c08b4f1e349db065f67f0afd522f2533187e0eab i18n/fra/src/vs/workbench/parts/search/browser/searchView.i18n.json
-@@ -7,10 +7,16 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"moreSearch": "Activer/désactiver les détails de la recherche",
-+<<<<<<< .our
- 	"searchScope.includes": "fichiers à inclure",
- 	"label.includes": "Modèles d'inclusion de recherche",
- 	"searchScope.excludes": "fichiers à exclure",
- 	"label.excludes": "Modèles d'exclusion de recherche",
-+=======
-+	"searchIncludeExclude.label": "fichiers à inclure/exclure",
-+	"searchIncludeExclude.ariaLabel": "Modèles de recherche Include/Exclude",
-+	"searchIncludeExclude.placeholder": "Exemples : src, !*.ts, test/**/*.log",
-+>>>>>>> .their
- 	"replaceAll.confirmation.title": "Tout remplacer",
- 	"replaceAll.confirm.button": "&&Remplacer",
- 	"replaceAll.occurrence.file.message": "{0} occurrence remplacée dans {1} fichier par '{2}'.",
-changed in both
-  base   100644 c560e29a2d5c8abcfe82d2d7c5d5a240f07ede40 i18n/fra/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 673cb698c2a5b3bfb8460611a63585f8ca3fd4e1 i18n/fra/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 9e767348573f40d1601c8c4e12a286fe45bbdc85 i18n/fra/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-@@ -28,7 +28,10 @@
- 	"JsonSchema.tasks.group.none": "N'assigne la tâche à aucun groupe",
- 	"JsonSchema.tasks.group": "Définit le groupe d'exécution auquel la tâche appartient. Prend en charge \"build\" pour l'ajouter au groupe de génération et \"test\" pour l'ajouter au groupe de test.",
- 	"JsonSchema.tasks.type": "Définit si la tâche est exécutée comme un processus ou comme une commande à l’intérieur d’un shell.",
-+<<<<<<< .our
- 	"JsonSchema.commandArray": "La commande shell à exécuter. Les éléments du tableau seront joints en utilisant un caractère d’espacement",
-+=======
-+>>>>>>> .their
- 	"JsonSchema.command.quotedString.value": "La valeur réelle de la commande",
- 	"JsonSchema.tasks.quoting.escape": "Echappe les caractères à l’aide du caractère d’échappement du shell (par exemple: ` sous PowerShell et \\ sous bash).",
- 	"JsonSchema.tasks.quoting.strong": "Entoure l’argument en utilisant le caractère guillemet du shell (par exemple: \" sous PowerShell et bash).",
-changed in both
-  base   100644 61c4bc5cb90d7312fae0c0a5e356250e20fd7111 i18n/fra/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 87d639c304bc4b35cf6eb86239d5ea30fd616b54 i18n/fra/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 ec562803a4adda0526f873e11591aa109d1201d8 i18n/fra/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-changed in both
-  base   100644 6b1951d0758da11ced1443c9460630dd881c67eb i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 8f10773d1a2d0f2302f3cb3b7d0dac64b3d63462 i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 854ab775c53f3bb034280cf29de0768ac74d851e i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -54,10 +54,17 @@
- 	"nextTerminalFindTerm": "Afficher le terme de recherche suivant",
- 	"previousTerminalFindTerm": "Afficher le terme de recherche précédent",
- 	"quickOpenTerm": "Changer de terminal actif",
-+<<<<<<< .our
- 	"workbench.action.terminal.scrollToPreviousCommand": "Faire défiler jusqu'à la commande précédente",
- 	"workbench.action.terminal.scrollToNextCommand": "Faire défiler jusqu'à la prochaine commande",
- 	"workbench.action.terminal.selectToPreviousCommand": "Sélectionnez pour la commande précédente",
- 	"workbench.action.terminal.selectToNextCommand": "Sélectionnez pour la commande suivante",
- 	"workbench.action.terminal.selectToPreviousLine": "Sélectionner pour la ligne précédente",
- 	"workbench.action.terminal.selectToNextLine": "Sélectionner pour la ligne suivante"
-+=======
-+	"workbench.action.terminal.focusPreviousCommand": "Focus sur la commande précédente",
-+	"workbench.action.terminal.focusNextCommand": "Focus sur la commande suivante",
-+	"workbench.action.terminal.selectToPreviousCommand": "Sélectionnez pour la commande précédente",
-+	"workbench.action.terminal.selectToNextCommand": "Sélectionnez pour la commande suivante"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 2c081ca984a3f9362e24f6ba375c14e31d506a4b i18n/fra/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-  our    100644 bd1e8163634b26d29532367b224c1c31d1dad37f i18n/fra/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-  their  100644 268fc2a72c6cda41f454344841a0d4ae4d1c14ce i18n/fra/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-@@ -11,6 +11,7 @@
- 	"neverShowAgain": "Ne plus afficher",
- 	"enospcError": "{0} n’est pas en mesure de surveiller les modifications de fichiers dans ce grand espace de travail. Veuillez suivre le lien d'instructions pour résoudre ce problème.",
- 	"learnMore": "Instructions",
-+<<<<<<< .our
- 	"fileInvalidPath": "Ressource de fichier non valide ({0})",
- 	"fileIsDirectoryError": "Le fichier est un répertoire",
- 	"fileNotModifiedError": "Fichier non modifié depuis",
-@@ -24,6 +25,9 @@
- 	"fileReadOnlyError": "Fichier en lecture seule",
- 	"fileMoveConflict": "Déplacement/copie impossible. Le fichier existe déjà dans la destination.",
- 	"unableToMoveCopyError": "Impossible de déplacer/copier. Le fichier remplace le dossier qui le contient.",
-+=======
-+	"enospcError": "{0} n’est pas en mesure de surveiller les modifications de fichiers dans ce grand espace de travail. Veuillez suivre le lien d'instructions pour résoudre ce problème.",
-+>>>>>>> .their
- 	"binFailed": "Échec du déplacement de '{0}' vers la corbeille",
- 	"trashFailed": "Échec du déplacement de '{0}' vers la corbeille"
- }
-\ No newline at end of file
-merged
-  result 100644 e77aa1c40e28fb057e17f2470117d1d3d3127565 i18n/fra/src/vs/workbench/services/files/node/fileService.i18n.json
-  our    100644 c9a4fd144cdf59fe0e1beb49f1943dbeeeb3374e i18n/fra/src/vs/workbench/services/files/node/fileService.i18n.json
-@@ -9,6 +9,7 @@
- 	"fileInvalidPath": "Ressource de fichier non valide ({0})",
- 	"fileIsDirectoryError": "Le fichier est un répertoire",
- 	"fileNotModifiedError": "Fichier non modifié depuis",
-+	"fileTooLargeForHeapError": "La taille du fichier dépasse la limite de mémoire par défaut. Relancer avec une limite plus élevée. Le paramètre actuel est configuré pour relancer avec {0} Mo",
- 	"fileTooLargeError": "Fichier trop volumineux pour être ouvert",
- 	"fileNotFoundError": "Fichier introuvable ({0})",
- 	"fileBinaryError": "Il semble que le fichier soit binaire. Impossible de l'ouvrir en tant que texte",
-changed in both
-  base   100644 4b669f7fc4943aa0d34753b217a9bf7cae554125 i18n/ita/extensions/emmet/package.i18n.json
-  our    100644 325af035e69c09e1e32c51cdc976ffb0a4047641 i18n/ita/extensions/emmet/package.i18n.json
-  their  100644 9546a82e14e9b05a702a1fb39902370a89dee0bb i18n/ita/extensions/emmet/package.i18n.json
-@@ -60,6 +60,10 @@
- 	"emmetPreferencesCssMozProperties": "Proprietà CSS delimitate da virgola che assumono il prefisso 'moz' del vendor quando utilizzate nelle abbreviazioni di Emmet che iniziano per '-'. Per evitare sempre il prefisso 'moz' impostare stringa vuota.",
- 	"emmetPreferencesCssOProperties": "Proprietà CSS delimitate da virgola che assumono il prefisso 'o' del vendor quando utilizzate nelle abbreviazioni di Emmet che iniziano per '-'. Per evitare sempre il prefisso 'o' impostare stringa vuota.",
- 	"emmetPreferencesCssMsProperties": "Proprietà CSS delimitate da virgola che assumono il prefisso 'ms' del vendor quando utilizzate nelle abbreviazioni di Emmet che iniziano per '-'. Per evitare sempre il prefisso 'ms' impostare stringa vuota.",
-+<<<<<<< .our
- 	"emmetPreferencesCssFuzzySearchMinScore": "Il valore minimo (da 0 a 1) che dovrebbe raggiungere un'abbreviazione di fuzzy-match. I valori più bassi possono produrre molti falsi positivi, i valori più alti possono ridurre le possibili corrispondenze.",
- 	"emmetOptimizeStylesheetParsing": "Se è impostato su false, l'intero file viene analizzato per determinare se la posizione corrente è valida per l'espansione delle abbreviazioni di Emmet. Se è impostato su true, viene analizzato solo il contenuto circostante alla posizione corrente nei file css/scss/less."
-+=======
-+	"emmetPreferencesCssFuzzySearchMinScore": "Il valore minimo (da 0 a 1) che dovrebbe raggiungere un'abbreviazione di fuzzy-match. I valori più bassi possono produrre molti falsi positivi, i valori più alti possono ridurre le possibili corrispondenze."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 13f1df3d818cee76d97324e442478950c86894e2 i18n/ita/extensions/git/out/commands.i18n.json
-  our    100644 b8b9f0490197b0e5904f4f035caca3a7f04c7df9 i18n/ita/extensions/git/out/commands.i18n.json
-  their  100644 792f4a2d3dd38ef1666a3ae1585b12d8f82e6e39 i18n/ita/extensions/git/out/commands.i18n.json
-changed in both
-  base   100644 59850c0a057c81fc41e6a9679a8755b447a50e69 i18n/ita/extensions/php/package.i18n.json
-  our    100644 d8344412ea06e1d3ebcd7a1c9d180341bd3b2e6d i18n/ita/extensions/php/package.i18n.json
-  their  100644 4e30fbb3265efa33aa338aea13eef0d046a65b32 i18n/ita/extensions/php/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Nozioni di base del linguaggio PHP",
-+=======
-+	"displayName": "Funzionalità del linguaggio PHP",
-+>>>>>>> .their
- 	"description": "Offre l'evidenziazione della sintassi e la corrispondenza delle parentesi nei file PHP."
- }
-\ No newline at end of file
-changed in both
-  base   100644 75512d966b726879ce72fce01494cd982c028636 i18n/ita/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 047668b002c0125f22b3c77979675bee2ddbe88f i18n/ita/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 a111011130764a58551aa71a6c229ef4c045fe56 i18n/ita/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -32,7 +32,10 @@
- 	"infoBorder": "Colore del bordo degli squiggle di informazione nell'editor",
- 	"hintForeground": "Colore primo piano degli squiggle di suggerimento nell'editor.",
- 	"hintBorder": "Colore del bordo degli squiggle di suggerimento nell'editor.",
-+<<<<<<< .our
- 	"unnecessaryForeground": "Colore primo piano del codice non necessario nell'editor.",
-+=======
-+>>>>>>> .their
- 	"overviewRulerRangeHighlight": "Colore del marcatore righello panoramica per evidenziazione intervalli. Il colore non deve essere opaco per non nascondere decorazioni sottostanti.",
- 	"overviewRuleError": "Colore del marcatore del righello delle annotazioni per gli errori.",
- 	"overviewRuleWarning": "Colore del marcatore del righello delle annotazioni per gli avvisi.",
-changed in both
-  base   100644 91d39114cd914fc6f46bdd0e4fcb2a8037cbe03a i18n/ita/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 35f8ed83f0da1c4a75798a67e5b16affcd21632f i18n/ita/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 87d656a3dd054746161346cb5a0e4665f5028ea2 i18n/ita/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -25,6 +25,11 @@
- 	"uninstallDependeciesConfirmation": "Disinstallare solo '{0}' o anche le relative dipendenze?",
- 	"uninstallOnly": "Solo Estensioni",
- 	"uninstallAll": "Disinstalla tutti",
-+<<<<<<< .our
-+=======
-+	"uninstallConfirmation": "Disinstallare '{0}'?",
-+	"ok": "OK",
-+>>>>>>> .their
- 	"singleDependentError": "Non è possibile disinstallare l'estensione '{0}'. L'estensione '{1}' dipende da tale estensione.",
- 	"twoDependentsError": "Non è possibile disinstallare l'estensione '{0}'. Le estensioni '{1}' e '{2}' dipendono da tale estensione.",
- 	"multipleDependentsError": "Non è possibile disinstallare l'estensione '{0}'. Alcune estensioni, tra cui '{1}' e '{2}' dipendono da tale estensione.",
-changed in both
-  base   100644 2e5c4543ebf1b3329d5c0cafdd25c231e176563e i18n/ita/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 db040b20535e5fbe6df69ea748baeb36651c5732 i18n/ita/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 ff2aecc6fe1348f7b43867c6c77f240776c2a20d i18n/ita/src/vs/platform/theme/common/colorRegistry.i18n.json
-changed in both
-  base   100644 8488ca775b809887d536bbb1322f506f82a88527 i18n/ita/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  our    100644 475ba817066d79b528abeae699b840a0322796c0 i18n/ita/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 ac0f699ab1ec028162360e0eee2bd2b23fe26d95 i18n/ita/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -7,7 +7,10 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"timeout.formatOnSave": "Comando Formatta dopo salvataggio interrotto dopo {0} ms",
-+<<<<<<< .our
- 	"codeActionsOnSave.didTimeout": "codeActionsOnSave interrotto dopo {0} ms",
-+=======
-+>>>>>>> .their
- 	"timeout.onWillSave": "Evento onWillSaveTextDocument interrotto dopo 1750 ms",
- 	"saveParticipants": "Esecuzione del salvataggio partecipanti..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 e548589e82c742ac8045e5f4edd681566248394d i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 16fec1a5d98f225249a95297ad06c45ba75efafc i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 b0716c351ce3aab8eb11fdbec681efa4d6423966 i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -80,7 +80,10 @@
- 	"titleBarStyle": "Consente di modificare l'aspetto della barra del titolo della finestra. Per applicare le modifiche, è necessario un riavvio completo.",
- 	"window.nativeTabs": "Abilita le finestre di tab per macOS Sierra. La modifica richiede un riavvio. Eventuali personalizzazioni della barra del titolo verranno disabilitate",
- 	"window.smoothScrollingWorkaround": "Abilitare questa soluzione alternativa se lo scorrimento non è più fluido dopo il ripristino di una finestra di VS Code ridotta a icona. Si tratta di una soluzione alternativa per un problema (https://github.com/Microsoft/vscode/issues/13612) in cui si verificano ritardi nello scorrimento in dispositivi con trackpad di precisione, come quelli Surface di Microsoft. Se si abilita questa soluzione alternativa, si potrebbe riscontrare un certo sfarfallio del layout dopo aver ripristinato la finestra ridotta a icona alle dimensioni normali, ma in altre situazioni non produce alcun effetto negativo.",
-+<<<<<<< .our
- 	"window.clickThroughInactive": "Se è abilitata, facendo clic su una finestra inattiva si attiverà non solo la finestra, ma anche l'elemento su cui è posizionato il puntatore del mouse se è selezionabile. Se è disabilitata, facendo clic in un punto qualsiasi in una finestra inattiva verrà attivata solo la finestra e sarà necessario fare di nuovo clic sull'elemento.",
-+=======
-+>>>>>>> .their
- 	"zenModeConfigurationTitle": "Modalità Zen",
- 	"zenMode.fullScreen": "Consente di controllare se attivando la modalità Zen anche l'area di lavoro passa alla modalità schermo intero.",
- 	"zenMode.centerLayout": "Controlla se attivando la modalità Zen viene centrato anche il layout.",
-changed in both
-  base   100644 5e7acab8dbecc642c4e8e14b07024aae30472cef i18n/ita/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  our    100644 656b814006f7667926a1768077ad144830bd3d8a i18n/ita/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  their  100644 b6d5637db01237a30eb113e32983ae17bed73973 i18n/ita/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-changed in both
-  base   100644 f7b3467296b6ca66768e5acdb0733347c311945d i18n/ita/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  our    100644 83bb2032b731649548f395ba120da85ff1ed3b12 i18n/ita/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  their  100644 d7d5ae4ad8681f8e7c7e75c72ca02a8081653e17 i18n/ita/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-changed in both
-  base   100644 885d74b575b6a42b031a7ff3133ff3b4678b7363 i18n/ita/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-  our    100644 10c6796d647907455c3faf8dab6c97d143e37534 i18n/ita/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-  their  100644 cec3cb52bc7038d6c1db275edcd1099cb3f331be i18n/ita/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-@@ -6,9 +6,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"breakpointWidgetLogMessagePlaceholder": "Messaggio da registrare quando viene raggiunto il punto di interruzione. Le espressioni tra parentesi graffe ({}) vengono interpolate. Premere 'INVIO' per accettare, \"ESC\" per annullare.",
- 	"breakpointWidgetHitCountPlaceholder": "Interrompe quando viene soddisfatta la condizione del numero di passaggi. Premere 'INVIO' per accettare oppure 'ESC' per annullare.",
- 	"breakpointWidgetExpressionPlaceholder": "Interrompe quando l'espressione restituisce true. Premere 'INVIO' per accettare oppure 'ESC' per annullare.",
-+=======
-+	"breakpointWidgetLogMessagePlaceholder": "Messaggio da registrare quando il punto di interruzione viene raggiunto. 'INVIO' per accettare, 'ESC' per annullare.",
-+	"breakpointWidgetHitCountPlaceholder": "Interrompe quando viene soddisfatta la condizione del numero di passaggi. Premere 'INVIO' per accettare oppure 'ESC' per annullare.",
-+	"breakpointWidgetExpressionPlaceholder": "Interrompe quando l'espressione restituisce true. Premere 'INVIO' per accettare oppure 'ESC' per annullare.",
-+	"breakpointWidgetLogMessageAriaLabel": "Il programma registrerà questo messaggio ogni volta che questo punto di interruzione viene raggiunto. Premere INVIO per accettare o ESC per annullare.",
-+	"breakpointWidgetHitCountAriaLabel": "Il programma si arresterà in questo punto solo se viene raggiunto il numero di passaggi. Premere INVIO per accettare oppure ESC per annullare.",
-+	"breakpointWidgetAriaLabel": "Il programma si arresterà in questo punto solo se la condizione è vera. Premere INVIO per accettare oppure ESC per annullare.",
-+>>>>>>> .their
- 	"expression": "Espressione",
- 	"hitCount": "Numero di passaggi",
- 	"logMessage": "Messaggio di log"
-changed in both
-  base   100644 171d99b96d1b9c4cb5eed3b97ed8546c6322fc5c i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  our    100644 43601d1a73d0ae182748fee08c0ea21e7d438884 i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  their  100644 bfe608de235efb51a2759e169553297e7cf60407 i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-@@ -24,6 +24,7 @@
- 	"enableBreakpoints": "Abilita punto di interruzione in linea a colonna {0}",
- 	"enableBreakpointOnLine": "Abilita punto di interruzione riga",
- 	"addBreakpoint": "Aggiungi punto di interruzione",
-+<<<<<<< .our
- 	"addConditionalBreakpoint": "Aggiungi punto di interruzione condizionale...",
- 	"addLogPoint": "Aggiungi punto di registrazione...",
- 	"breakpointHasCondition": "Per questo {0} è presente un {1} che verrà perso in seguito alla rimozione. Provare invece a disabilitare il {0}.",
-@@ -32,5 +33,9 @@
- 	"removeLogPoint": "Rimuovi {0}",
- 	"disableLogPoint": "Disabilita {0}",
- 	"cancel": "Annulla",
-+=======
-+	"conditionalBreakpoint": "Aggiungi punto di interruzione condizionale...",
-+	"addLogPoint": "Aggiungi punto di registrazione...",
-+>>>>>>> .their
- 	"addConfiguration": "Aggiungi configurazione..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 98695801004b415cc537aa32e83ef5690688a338 i18n/ita/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  our    100644 3a9023e46622e84a42ee4a7ab34aa864b1ec0e8e i18n/ita/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  their  100644 3fda2c7e2ef3f9b7e037b023a511133f6d4ab955 i18n/ita/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-@@ -8,6 +8,24 @@
- 	],
- 	"debugAdapterBinNotFound": "Il file eseguibile '{0}' dell'adattatore di debug non esiste.",
- 	"debugAdapterCannotDetermineExecutable": "Non è possibile determinare il file eseguibile per l'adattatore di debug '{0}'.",
-+<<<<<<< .our
- 	"unableToLaunchDebugAdapter": "Non è possibile avviare l'adattatore di debug da '{0}'.",
- 	"unableToLaunchDebugAdapterNoArgs": "Non è possibile avviare l'adattatore di debug."
-+=======
-+	"launch.config.comment1": "Usare IntelliSense per informazioni sui possibili attributi.",
-+	"launch.config.comment2": "Al passaggio del mouse vengono visualizzate le descrizioni degli attributi esistenti.",
-+	"launch.config.comment3": "Per ulteriori informazioni, visitare: {0}",
-+	"debugType": "Tipo di configurazione.",
-+	"debugTypeNotRecognised": "Il tipo di debug non è riconosciuto. Assicurarsi di avere un'estensione appropriata per il debug installata e che sia abilitata.",
-+	"node2NotSupported": "\"node2\" non è più supportato. In alternativa, usare \"node\" e impostare l'attributo \"protocol\" su \"inspector\".",
-+	"debugName": "Nome della configurazione. Viene visualizzato nel menu a discesa della configurazione di avvio.",
-+	"debugRequest": "Tipo della richiesta di configurazione. Può essere \"launch\" o \"attach\".",
-+	"debugServer": "Solo per lo sviluppo dell'estensione di debug: se si specifica una porta, Visual Studio Code prova a connettersi a un adattatore di debug in esecuzione in modalità server",
-+	"debugPrelaunchTask": "Attività da eseguire prima dell'avvio della sessione di debug.",
-+	"debugPostDebugTask": "Attività da eseguire dopo il completamento della sessione di debug.",
-+	"debugWindowsConfiguration": "Attributi della configurazione di avvio specifici di Windows.",
-+	"debugOSXConfiguration": "Attributi della configurazione di avvio specifici di OS X.",
-+	"debugLinuxConfiguration": "Attributi della configurazione di avvio specifici di Linux.",
-+	"deprecatedVariables": "'env.', 'config.' e 'command.' sono deprecati. In alternativa, usare 'env:', 'config:' e 'command:'."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 bf455524ce9d97398dda32822451bb441b59a88d i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  our    100644 e979e5172329eb5b17f4bd06838e816aa279aaad i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  their  100644 8f4151488c3a2fd1257092a9faf621e7e8dcd7c9 i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-changed in both
-  base   100644 d9192794c7105465eaa5f8c2d95b9759e21cd2d2 i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  our    100644 17b06f638b8c4e434b5c1e9690e18cec027dc497 i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  their  100644 23239bff10aa88c391be945735be9d7b6d6d2b25 i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-@@ -14,7 +14,11 @@
- 	"workspaceRecommendedExtensions": "Consigli per l'area di lavoro",
- 	"builtInExtensions": "Funzionalità",
- 	"builtInThemesExtensions": "Temi",
-+<<<<<<< .our
- 	"builtInBasicsExtensions": "Linguaggi di programmazione",
-+=======
-+	"builtInBasicsExtensions": "Lingue",
-+>>>>>>> .their
- 	"searchExtensions": "Cerca le estensioni nel Marketplace",
- 	"sort by installs": "Ordina per: conteggio installazioni",
- 	"sort by rating": "Ordina per: classificazione",
-changed in both
-  base   100644 4009655e54b91f882ff11d75a2e97c6b4c36c635 i18n/ita/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-  our    100644 45337827eb33fdf5a293983bf0c72b66f9febc1d i18n/ita/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-  their  100644 569a71f5533dc0e3c52c2e258832c151927c4466 i18n/ita/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-@@ -8,8 +8,13 @@
- 	],
- 	"textFileEditor": "Editor file di testo",
- 	"createFile": "Crea file",
-+<<<<<<< .our
- 	"relaunchWithIncreasedMemoryLimit": "Riavvia con {0} MB",
- 	"configureMemoryLimit": "Configura limite di memoria",
-+=======
-+	"relaunchWithIncreasedMemoryLimit": "Riavvia",
-+	"configureMemoryLimit": "Configura",
-+>>>>>>> .their
- 	"fileEditorWithInputAriaLabel": "{0}. Editor file di testo.",
- 	"fileEditorAriaLabel": "Editor file di testo."
- }
-\ No newline at end of file
-changed in both
-  base   100644 3939225c04f50325f8ff9046db9f15cc08e45d3c i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 be168507f7ffd1be04bdbdbb14365762be628f25 i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 11a4614efd9b26f3991806a9cf594ad2f5d0fb32 i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -38,12 +38,27 @@
- 	"confirmMoveTrashMessageMultiple": "Sei sicuro di voler eliminarei seguenti {0} file?",
- 	"confirmMoveTrashMessageFolder": "Eliminare '{0}' e il relativo contenuto?",
- 	"confirmMoveTrashMessageFile": "Eliminare '{0}'?",
-+<<<<<<< .our
- 	"confirmDeleteMessageFilesAndDirectories": "Eliminare definitivamente i {0} file/directory seguenti e il relativo contenuto?",
- 	"confirmDeleteMessageMultipleDirectories": "Eliminare definitivamente le {0} directory seguenti e il relativo contenuto?",
- 	"confirmDeleteMessageMultiple": "Sei sicuro di voler eliminare permanentemente i seguenti {0} file?",
- 	"confirmDeleteMessageFolder": "Eliminare definitivamente '{0}' e il relativo contenuto?",
- 	"confirmDeleteMessageFile": "Eliminare definitivamente '{0}'?",
- 	"addFiles": "Aggiungi file",
-+=======
-+	"undoBin": "È possibile ripristinare dal Cestino.",
-+	"undoTrash": "È possibile ripristinare dal Cestino.",
-+	"doNotAskAgain": "Non chiedermelo di nuovo",
-+	"confirmDeleteMessageMultiple": "Sei sicuro di voler eliminare permanentemente i seguenti {0} file?",
-+	"confirmDeleteMessageFolder": "Eliminare definitivamente '{0}' e il relativo contenuto?",
-+	"confirmDeleteMessageFile": "Eliminare definitivamente '{0}'?",
-+	"irreversible": "Questa azione è irreversibile.",
-+	"binFailed": "Impossibile eliminare utilizzando il Cestino. Si desidera eliminare definitivamente invece?",
-+	"trashFailed": "Impossibile eliminare utilizzando il Cestino. Si desidera eliminare definitivamente invece?",
-+	"deletePermanentlyButtonLabel": "&& Eliminare in modo permanente",
-+	"retryButtonLabel": "&& Riprova",
-+	"importFiles": "Importa file",
-+>>>>>>> .their
- 	"confirmOverwrite": "Nella cartella di destinazione esiste già un file o una cartella con lo stesso nome. Sovrascrivere?",
- 	"replaceButtonLabel": "&&Sostituisci",
- 	"fileIsAncestor": "Il file da incollare è un predecessore della cartella di destinazione",
-changed in both
-  base   100644 33e0072ede84b08cb02aa9f4612d1f3da8b61d11 i18n/ita/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 a29bf6c8fddc26469df2a03b0634b7525ec1e6dc i18n/ita/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 fa0b575286449d92e3eb2368895e3561002426e6 i18n/ita/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-@@ -35,7 +35,11 @@
- 	"hotExit": "Controlla se i file non salvati verranno memorizzati tra una sessione e l'altra, consentendo di ignorare il prompt di salvataggio alla chiusura dell'editor.",
- 	"useExperimentalFileWatcher": "Usa il nuovo watcher di file sperimentale.",
- 	"defaultLanguage": "Modalità linguaggio predefinita assegnata ai nuovi file.",
-+<<<<<<< .our
- 	"maxMemoryForLargeFilesMB": "Controlla la memoria disponibile per VS Code dopo il riavvio durante il tentativo di aprire file di grandi dimensioni. Il risultato è uguale a quanto si specifica --max-memory=NEWSIZE sulla riga di comando.",
-+=======
-+	"maxMemoryForLargeFilesMB": "Nuovo limite di memoria in MB che l'applicazione userà all'avvio per aprire file di grandi dimensioni. Se si vuole iniziare con limite superiore, è possibile avviare l'applicazione dalla riga di comando specificando --max-memory=NEWSIZE.",
-+>>>>>>> .their
- 	"editorConfigurationTitle": "Editor",
- 	"formatOnSave": "Formatta un file durante il salvataggio. Deve essere disponibile un formattatore, il file non deve essere salvato automaticamente e l'editor non deve essere in fase di chiusura.",
- 	"formatOnSaveTimeout": "Timeout per Formatta dopo il salvataggio. Specifica un limite di tempo in millisecondi per i comandi formatOnSave. I comandi che richiedono più tempo del timeout specificato verranno annullati.",
-changed in both
-  base   100644 fffcdf8e5628b3e2097f600b3a113f2d6eeb9df8 i18n/ita/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  our    100644 a54b8fa48adfae1a9f192c1d397674dd2de20580 i18n/ita/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  their  100644 c84f7fcb27e7a30d913ee3607a98e70e160f9ada i18n/ita/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-changed in both
-  base   100644 1677c2679d4d208b0897f523168d984e3d9c4b55 i18n/ita/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-  our    100644 d821a4ec5e01db07aa4ebd6ca0bffbc505bf90a3 i18n/ita/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-  their  100644 136124db68c1ab037593cd582f2e6c60e5bd7d67 i18n/ita/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-changed in both
-  base   100644 cd233dbc3528bcc839779be9c8ddb986dc4911da i18n/ita/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
-  our    100644 c8c335d94e4ba33123eac126c71f3f690a152344 i18n/ita/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
-  their  100644 65bf7372a09f3685dc1b7bd9e39d84fc662f8188 i18n/ita/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
-@@ -7,5 +7,9 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"copyMarker": "Copia",
-+<<<<<<< .our
- 	"copyMessage": "Copia messaggio "
-+=======
-+	"copyMarkerMessage": "Copia messaggio "
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8425fd2a247c0b85ef55f1074620b83b51bb8629 i18n/ita/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-  our    100644 f06a4d05635080871eed8591893faf436df2f0f3 i18n/ita/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-  their  100644 5036e5a536d82c7ccabd9478d090b6d77c0e20f8 i18n/ita/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-changed in both
-  base   100644 915767115f776a74d9ca8320ac0932858681db78 i18n/ita/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  our    100644 ab7704c8c47164753ebfc517a6fb9394b1465aff i18n/ita/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  their  100644 8a0f5229125e0cd4c258c5a82b9414236a9388f0 i18n/ita/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
-+=======
-+	"keybindingsInputName": "Scelte rapide da tastiera",
-+>>>>>>> .their
- 	"showDefaultKeybindings": "Mostra tasti di scelta rapida predefiniti",
- 	"showUserKeybindings": "Mostra tasti di scelta rapida utente",
- 	"SearchKeybindings.AriaLabel": "Cerca tasti di scelta rapida",
-changed in both
-  base   100644 a0d921fec70ffc4e50e1fa551c855d63e385f869 i18n/ita/src/vs/workbench/parts/search/browser/searchView.i18n.json
-  our    100644 e2aee106234415d5f98623d49849469952f58852 i18n/ita/src/vs/workbench/parts/search/browser/searchView.i18n.json
-  their  100644 522507fa30baf1f475812874b744f5e183ec83ac i18n/ita/src/vs/workbench/parts/search/browser/searchView.i18n.json
-@@ -7,10 +7,16 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"moreSearch": "Attiva/Disattiva dettagli ricerca",
-+<<<<<<< .our
- 	"searchScope.includes": "file da includere",
- 	"label.includes": "Criteri di inclusione per la ricerca",
- 	"searchScope.excludes": "file da escludere",
- 	"label.excludes": "Criteri di esclusione per la ricerca",
-+=======
-+	"searchIncludeExclude.label": "file da includere/escludere",
-+	"searchIncludeExclude.ariaLabel": "Criteri di inclusione/esclusione per la ricerca",
-+	"searchIncludeExclude.placeholder": "Esempi: src, !*.ts, test/**/*.log",
-+>>>>>>> .their
- 	"replaceAll.confirmation.title": "Sostituisci tutto",
- 	"replaceAll.confirm.button": "&&Sostituisci",
- 	"replaceAll.occurrence.file.message": "{0} occorrenza in {1} file è stata sostituita con '{2}'.",
-changed in both
-  base   100644 d2e532ded80f56d7f50608b4cfc6c8f3f261e2d7 i18n/ita/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 96a5512e9db341ff02996bad4ad811078b347739 i18n/ita/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 a83add2496b4f91e8305d1aeaf9b80190ce8dc2a i18n/ita/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-@@ -28,7 +28,10 @@
- 	"JsonSchema.tasks.group.none": "Non assegna l'attività ad alcun gruppo",
- 	"JsonSchema.tasks.group": "Definisce il gruppo di esecuzione a cui appartiene questa attività. Supporta \"build\" per aggiungerlo al gruppo di compilazione e \"test\" per aggiungerlo al gruppo di test.",
- 	"JsonSchema.tasks.type": "Definisce se l'attività viene eseguita come un processo o come un comando all'interno di una shell.",
-+<<<<<<< .our
- 	"JsonSchema.commandArray": "Comando della shell da eseguire. Per unire gli elementi della matrice verrà usato un carattere di spazio",
-+=======
-+>>>>>>> .their
- 	"JsonSchema.command.quotedString.value": "Valore effettivo del comando",
- 	"JsonSchema.tasks.quoting.escape": "Evita i caratteri utilizzando il carattere di escape della shell (per esempio ` sotto PowerShell e \\ sotto bash).",
- 	"JsonSchema.tasks.quoting.strong": "Virgoletta l'argomento utilizzando il carattere di doppio apice della shell (per esempio \" sotto PowerShell e bash).",
-changed in both
-  base   100644 72ae41d5c50515a7a9bad5cb0ddc4245fa01041a i18n/ita/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 83baac91404ff175b394c533850a93d01538ab38 i18n/ita/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 d33e156be686cfb382585e6f0539d4b09e45af50 i18n/ita/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-changed in both
-  base   100644 183e933c6e1d170a5aa5f75d23f58d90b441511b i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 9af26b9889eaa5fa492c1556e3e5203a1ebacbf4 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 53392cd393bd9a765e3fadf8495d4bfb2e8b38db i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -54,10 +54,17 @@
- 	"nextTerminalFindTerm": "Mostra il termine di ricerca successivo",
- 	"previousTerminalFindTerm": "Mostra il termine di ricerca precedente",
- 	"quickOpenTerm": "Cambia terminale attivo",
-+<<<<<<< .our
- 	"workbench.action.terminal.scrollToPreviousCommand": "Scorri al comando precedente",
- 	"workbench.action.terminal.scrollToNextCommand": "Scorri al comando successivo",
- 	"workbench.action.terminal.selectToPreviousCommand": "Aggiungi selezione a comando precedente",
- 	"workbench.action.terminal.selectToNextCommand": "Aggiungi selezione a comando successivo",
- 	"workbench.action.terminal.selectToPreviousLine": "Aggiungi selezione a riga precedente",
- 	"workbench.action.terminal.selectToNextLine": "Aggiungi selezione a riga successiva"
-+=======
-+	"workbench.action.terminal.focusPreviousCommand": "Sposta stato attivo sul comando precedente",
-+	"workbench.action.terminal.focusNextCommand": "Sposta stato attivo sul comando successivo",
-+	"workbench.action.terminal.selectToPreviousCommand": "Aggiungi selezione a comando precedente",
-+	"workbench.action.terminal.selectToNextCommand": "Aggiungi selezione a comando successivo"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ita/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
-  our    100644 39897d5e6c7484770fa48e730831210b2e3c4976 i18n/ita/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
-  their  100644 a038c91770b0ae9bd0b4e899f2f8c2d737e23331 i18n/ita/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
-@@ -6,5 +6,20 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"stringsOnlySupported": "Il comando {0} non ha restituito un risultato in formato stringa. Come risultati dei comandi usati per la sostituzione delle variabili sono supportate solo le stringhe."
-+=======
-+	"canNotResolveWorkspaceFolderMultiRoot": "${workspaceFolder} non può essere risolta in un'area di lavoro a cartelle multiple. Assegnare un ambito alle variabili usando : e un nome di cartella.",
-+	"canNotResolveWorkspaceFolder": "${workspaceFolder} non può essere risolta. Si prega di aprire una cartella.",
-+	"canNotResolveFolderBasenameMultiRoot": "${workspaceFolderBasename} non può essere risolta in un'area di lavoro a cartelle multiple. Assegnare un ambito alle variabili usando : e un nome di cartella.",
-+	"canNotResolveFolderBasename": "${workspaceFolderBasename} non può essere risolta. Si prega di aprire una cartella.",
-+	"canNotResolveLineNumber": "${lineNumber} non può essere risolto, si prega di aprire un editor.",
-+	"canNotResolveSelectedText": "${selectedText} non può essere risolto, si prega di aprire un editor.",
-+	"canNotResolveFile": "${file} non può essere risolto, si prega di aprire un editor.",
-+	"canNotResolveRelativeFile": "${relativeFile} non può essere risolto, si prega di aprire un editor.",
-+	"canNotResolveFileDirname": "${fileDirname} non può essere risolto, si prega di aprire un editor.",
-+	"canNotResolveFileExtname": "${fileExtname} non può essere risolto, si prega di aprire un editor.",
-+	"canNotResolveFileBasename": "${fileBasename} non può essere risolto, si prega di aprire un editor.",
-+	"canNotResolveFileBasenameNoExtension": "${fileBasenameNoExtension} non può essere risolto, si prega di aprire un editor."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 50a2d3795eef4bbbceb1c3a3984a5ca1722ebc9d i18n/ita/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-  our    100644 9d7b1a95836e1168352f251f13c08626caf9c555 i18n/ita/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-  their  100644 d0af38208130d4ac301b8e3faadcf2efb20432db i18n/ita/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-@@ -11,6 +11,7 @@
- 	"neverShowAgain": "Non visualizzare più questo messaggio",
- 	"enospcError": "{0} non è in grado di controllare le modifiche di una grande area di lavoro. Per risolvere questo problema, seguire il collegamento alle istruzioni. ",
- 	"learnMore": "Istruzioni",
-+<<<<<<< .our
- 	"fileInvalidPath": "Risorsa del file non valida ({0})",
- 	"fileIsDirectoryError": "Il File è una Directory",
- 	"fileNotModifiedError": "File non modificato dal giorno",
-@@ -24,6 +25,9 @@
- 	"fileReadOnlyError": "Il file è di sola lettura",
- 	"fileMoveConflict": "Non è possibile eseguire operazioni di spostamento/copia. Il file esiste già nella destinazione.",
- 	"unableToMoveCopyError": "Non è possibile eseguire operazioni di spostamento/copia. Il file sostituirebbe la cartella in cui è contenuto.",
-+=======
-+	"enospcError": "{0} non è in grado di controllare le modifiche di una grande area di lavoro. Per risolvere questo problema, seguire il collegamento alle istruzioni. ",
-+>>>>>>> .their
- 	"binFailed": "Non è stato possibile spostare '{0}' nel Cestino",
- 	"trashFailed": "Non è stato possibile spostare '{0}' nel Cestino"
- }
-\ No newline at end of file
-merged
-  result 100644 178ca30930ec84f7ff65b3d4e69312189ef8b80d i18n/ita/src/vs/workbench/services/files/node/fileService.i18n.json
-  our    100644 e98cc6a8898c4a14c4cb33730d4c482765f69ffa i18n/ita/src/vs/workbench/services/files/node/fileService.i18n.json
-@@ -9,6 +9,7 @@
- 	"fileInvalidPath": "Risorsa del file non valida ({0})",
- 	"fileIsDirectoryError": "Il File è una Directory",
- 	"fileNotModifiedError": "File non modificato dal giorno",
-+	"fileTooLargeForHeapError": "Le dimensioni del file superano il limite di memoria predefinito. Riavviare con un limite superiore. L'impostazione corrente è configurata per l'avvio con {0} MB",
- 	"fileTooLargeError": "File troppo grande per essere aperto",
- 	"fileNotFoundError": "Il file non è stato trovato ({0})",
- 	"fileBinaryError": "Il file sembra essere binario e non può essere aperto come file di testo",
-changed in both
-  base   100644 d4ae14fedae69f26e2d66f03d9af438fd5f188ee i18n/kor/extensions/emmet/package.i18n.json
-  our    100644 517fee7baf0c3ecd5ff03235a1df00c583e6985b i18n/kor/extensions/emmet/package.i18n.json
-  their  100644 1c851b49ee3e3201d9fc36b50b789f1953159c94 i18n/kor/extensions/emmet/package.i18n.json
-@@ -60,6 +60,10 @@
- 	"emmetPreferencesCssMozProperties": "`-`로 시작하는 Emmet 약어에서 사용될 때 'moz' 공급업체 접두사를 가져오는 쉼표로 구분된 CSS 속성입니다. 항상 'moz' 접두사를 사용하지 않으려면 빈 문자열로 설정합니다.",
- 	"emmetPreferencesCssOProperties": "`-`로 시작하는 emmet 약어에서 사용할 때 'o' 공급업체 접두사를 가져오는 쉼표로 구분된 CSS 속성입니다. 항상 'o' 접두사를 사용하지 않으려면 빈 문자열로 설정합니다.",
- 	"emmetPreferencesCssMsProperties": "`-`로 시작하는 emmet 약어에서 사용할 때 'ms' 공급업체 접두사를 가져오는 쉼표로 구분된 CSS 속성입니다. 항상 'ms' 접두사를 사용하지 않으려면 빈 문자열로 설정합니다.",
-+<<<<<<< .our
- 	"emmetPreferencesCssFuzzySearchMinScore": "유사 일치 약어가 획득해야 하는 최소 점수(0에서 1 사이)입니다. 값이 낮을수록 가양성 일치 항목이 늘 수 있고, 값이 높을수록 가능한 일치 항목이 줄 수 있습니다.",
- 	"emmetOptimizeStylesheetParsing": "False로 설정할 경우 전체 파일이 구문 분석되어 현재 위치가 Emmet 약어 확장에 유효한지 확인합니다. True로 설정할 경우 css/scss/less 파일에서 현재 위치 주변의 콘텐츠만 구문 분석합니다."
-+=======
-+	"emmetPreferencesCssFuzzySearchMinScore": "유사 일치 약어가 획득해야 하는 최소 점수(0에서 1 사이)입니다. 값이 낮을수록 가양성 일치 항목이 늘 수 있고, 값이 높을수록 가능한 일치 항목이 줄 수 있습니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 bc4b7753a3281bbbbccbe6c6a36b7f6ded2a16a4 i18n/kor/extensions/git/out/commands.i18n.json
-  our    100644 5c881abd459fc945dcc1b911f43b518f709ac538 i18n/kor/extensions/git/out/commands.i18n.json
-  their  100644 e1ccbbf253f81e2660f109b41e3466a1a4afd284 i18n/kor/extensions/git/out/commands.i18n.json
-changed in both
-  base   100644 a55af556ea00ab857e5ade78cd3e73c5709ed26e i18n/kor/extensions/php/package.i18n.json
-  our    100644 ad3f734a9df9cce84d996510442fc460749c7d2b i18n/kor/extensions/php/package.i18n.json
-  their  100644 f4c77f88fd48a92c1b1affae3d876ed77c0cdc8f i18n/kor/extensions/php/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "PHP 언어 기본",
-+=======
-+	"displayName": "PHP 언어 기능",
-+>>>>>>> .their
- 	"description": "PHP 파일에서 구문 강조 표시 및 괄호 일치를 제공합니다. "
- }
-\ No newline at end of file
-changed in both
-  base   100644 b02180c66026b2b5ccd444dc0ce8c786558741d4 i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 c148a56d8d67892505611b68cdd18b2ba3428134 i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 151deed842acbebefea5cffda41861b4999b7e95 i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -32,7 +32,10 @@
- 	"infoBorder": "편집기 내 정보 표시선의 테두리 색입니다.",
- 	"hintForeground": "편집기에서 힌트 표시선의 전경색입니다.",
- 	"hintBorder": "편집기에서 힌트 표시선의 테두리 색입니다.",
-+<<<<<<< .our
- 	"unnecessaryForeground": "편집기 내 불필요한 코드의 전경색입니다.",
-+=======
-+>>>>>>> .their
- 	"overviewRulerRangeHighlight": "범위 강조의 개요 눈금자 표식 색입니다. 이 색은 불투명해야만 내부 장식을 가리지 않습니다.",
- 	"overviewRuleError": "오류의 개요 눈금자 마커 색입니다.",
- 	"overviewRuleWarning": "경고의 개요 눈금자 마커 색입니다.",
-changed in both
-  base   100644 deafbdf4de77bcfea0c140458ee59fcb9d35bc3a i18n/kor/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 05518f96202309824a89dfbd3498bbcde7102ebd i18n/kor/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 29a28e29329727823e2fcfc980326213da299daa i18n/kor/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -25,6 +25,11 @@
- 	"uninstallDependeciesConfirmation": "'{0}'만 제거할까요, 아니면 종속성도 제거할까요?",
- 	"uninstallOnly": "확장만",
- 	"uninstallAll": "모두 제거",
-+<<<<<<< .our
-+=======
-+	"uninstallConfirmation": "'{0}'을(를) 제거할까요?",
-+	"ok": "확인",
-+>>>>>>> .their
- 	"singleDependentError": "확장 '{0}'을(를) 제거할 수 없습니다. 확장 '{1}'이(가) 이 확장에 종속됩니다.",
- 	"twoDependentsError": "확장 '{0}'을(를) 제거할 수 없습니다. 확장 '{1}' 및 '{2}'이(가) 이 확장에 종속됩니다.",
- 	"multipleDependentsError": "확장 '{0}'을(를) 제거할 수 없습니다. 확장 '{1}', '{2}' 등이 이 확장에 종속됩니다.",
-changed in both
-  base   100644 0a927c21be7b101fa9b553028edc7424386b8a04 i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 44b01274f5b039d38e4cfbd58f3d0758fa5d1e89 i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 2e819fd951d0c6efaa8c163488cc09047e3c0092 i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json
-changed in both
-  base   100644 45094f9c862e5a9bf24d31628b925dd411cb84ee i18n/kor/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  our    100644 e260c7da4c6f560f0c6c1ac69ad396ed1b97cbf2 i18n/kor/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 c4d54f1034d9f15e5d873ea0c0ef259d0e492635 i18n/kor/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -7,7 +7,10 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"timeout.formatOnSave": "저장 시 {0}ms 후에 서식 지정이 중단됨",
-+<<<<<<< .our
- 	"codeActionsOnSave.didTimeout": "{0}밀리초 후 codeActionsOnSave 중단됨",
-+=======
-+>>>>>>> .their
- 	"timeout.onWillSave": "1750ms 후에 onWillSaveTextDocument-event가 중단됨",
- 	"saveParticipants": "실행중인 저장 관계자..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 30e974a33fc53f9dd846e9223ebcc8eb7eea34f0 i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 faff44b17686fcb835995d2bfd92efcfdcc183b1 i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 641eb3e2062f18f7c2bc6e1e5a749c16ed735136 i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -80,7 +80,10 @@
- 	"titleBarStyle": "창 제목 표시줄의 모양을 조정합니다. 변경 내용을 적용하려면 전체 다시 시작해야 합니다.",
- 	"window.nativeTabs": "macOS Sierra 창 탭을 사용하도록 설정합니다. 변경\n 내용을 적용하려면 전체 다시 시작해야 하고, 기본 탭에서\n 사용자 지정 제목 표시줄 스타일(구성된 경우)을 비활성화합니다.",
- 	"window.smoothScrollingWorkaround": "최소화된 VS Code 창을 복원한 후 더 이상 원활하게 스크롤되지 않으면 이 해결 방법을 사용하도록 설정하세요. 이 해결 방법은 Microsoft의 Surface 장치와 같이 정밀 트랙 패드가 장착된 장치에서 스크롤이 지연되기 시작하는 문제(https://github.com/Microsoft/vscode/issues/13612)를 해결합니다. 이 해결 방법을 사용하도록 설정하면 최소화된 상태에서 창을 복원한 후 약간의 레이아웃 깜박거림이 발생할 수 있지만 그 외의 해는 없습니다.",
-+<<<<<<< .our
- 	"window.clickThroughInactive": "사용하도록 설정한 경우 비활성 창을 클릭하면 창도 활성화되고 클릭 가능한 경우 마우스 아래의 요소도 트리거됩니다. 사용하지 않도록 설정한 경우 비활성 창에서 아무곳이나 클릭하면 창만 활성화되며 요소는 또 한번 클릭해야 합니다.",
-+=======
-+>>>>>>> .their
- 	"zenModeConfigurationTitle": "Zen 모드",
- 	"zenMode.fullScreen": "Zen 모드를 켜면 워크벤치도 전체 화면 모드로 전환되는지 여부를 제어합니다.",
- 	"zenMode.centerLayout": "Zen 모드를 켜면 레이아웃도 가운데로 맞춰지는지 여부를 제어합니다.",
-changed in both
-  base   100644 8a6f29b83bfa1eb654a6d4e7ad38962ed0a9b685 i18n/kor/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  our    100644 0495fb536e2135803ed54cf092a02a6c8b292fd8 i18n/kor/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  their  100644 2b0e8c50e7b2021b5370555699c3dd79f3afacfd i18n/kor/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-@@ -17,7 +17,11 @@
- 	"breakpointUnverifieddHover": "확인되지 않은 중단점",
- 	"functionBreakpointUnsupported": "이 디버그 형식은 함수 중단점을 지원하지 않습니다.",
- 	"breakpointDirtydHover": "확인되지 않은 중단점입니다. 파일이 수정되었습니다. 디버그 세션을 다시 시작하세요.",
-+<<<<<<< .our
- 	"logBreakpointUnsupported": "이 디버그 형식에서 지원되지 않는 logpoint",
-+=======
-+	"logBreakpointUnsupported": "이 디버그 형식에서 지원되지 않는 로그 지점",
-+>>>>>>> .their
- 	"conditionalBreakpointUnsupported": "이 디버그 형식에서 지원되지 않는 조건부 중단점",
- 	"hitBreakpointUnsupported": "이 디버그 형식은 조건부 중단점 적중을 지원하지 않습니다."
- }
-\ No newline at end of file
-changed in both
-  base   100644 782e05fd2a4062d2d923b2e4744d053f846732fd i18n/kor/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  our    100644 6a3df39c2499e1d57cd7be82d64220494ab19ab0 i18n/kor/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  their  100644 a942f921e392b43580bf75806a1a7078b74439da i18n/kor/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-@@ -8,7 +8,11 @@
- 	],
- 	"toggleBreakpointAction": "디버그: 중단점 설정/해제",
- 	"conditionalBreakpointEditorAction": "디버그: 조건부 중단점 추가...",
-+<<<<<<< .our
- 	"logPointEditorAction": "디버그 : Logpoint 추가...",
-+=======
-+	"logPointEditorAction": "디버그: 로그 지점 추가...",
-+>>>>>>> .their
- 	"runToCursor": "커서까지 실행",
- 	"debugEvaluate": "디버그: 평가",
- 	"debugAddToWatch": "디버그: 조사식에 추가",
-changed in both
-  base   100644 484e21f6e540375943bb372e9302416229f53257 i18n/kor/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-  our    100644 ff73e8551e533a78c25647fd4092da0503b3fb72 i18n/kor/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-  their  100644 d14c117bac16d14ac695a1d0dff71dc434eefb19 i18n/kor/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-@@ -6,9 +6,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"breakpointWidgetLogMessagePlaceholder": "중단점이 적중될 때 기록할 메시지입니다. {} 내의 식은 보간됩니다. 수락하려면 'Enter' 키를 누르고  취소하려면 'esc' 키를 누르세요.",
- 	"breakpointWidgetHitCountPlaceholder": "적중 횟수 조건이 충족될 경우 중단합니다. 적용하려면 'Enter' 키를 누르고 취소하려면 'Esc' 키를 누릅니다.",
- 	"breakpointWidgetExpressionPlaceholder": "식이 true로 계산될 경우 중단합니다. 적용하려면 'Enter' 키를 누르고 취소하려면 'Esc' 키를 누릅니다.",
-+=======
-+	"breakpointWidgetLogMessagePlaceholder": "중단점이 적중될 때 기록할 메시지입니다. 수락하려면 'Enter' 키를 누르고  취소하려면 'esc' 키를 누르세요.",
-+	"breakpointWidgetHitCountPlaceholder": "적중 횟수 조건이 충족될 경우 중단합니다. 적용하려면 'Enter' 키를 누르고 취소하려면 'Esc' 키를 누릅니다.",
-+	"breakpointWidgetExpressionPlaceholder": "식이 true로 계산될 경우 중단합니다. 적용하려면 'Enter' 키를 누르고 취소하려면 'Esc' 키를 누릅니다.",
-+	"breakpointWidgetLogMessageAriaLabel": "이 중단점이 적중될 때마다 프로그램에서 이 메시지를 기록합니다. 수락하려면 <Enter> 키를 누르고 취소하려면 <Esc> 키를 누르세요.",
-+	"breakpointWidgetHitCountAriaLabel": "적중 횟수가 충족되는 경우에만 프로그램이 여기서 중지됩니다. 수락하려면 <Enter> 키를 누르고, 취소하려면 <Esc> 키를 누르세요.",
-+	"breakpointWidgetAriaLabel": "이 조건이 true인 경우에만 프로그램이 여기서 중지됩니다. 수락하려면 <Enter> 키를 누르고, 취소하려면 <Esc> 키를 누르세요.",
-+>>>>>>> .their
- 	"expression": "식",
- 	"hitCount": "적중 횟수",
- 	"logMessage": "로그 메시지"
-changed in both
-  base   100644 07989327ee8fe6a042e351ef12877e31f91000f0 i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  our    100644 b40f849a9c20da0feb620bdd6d7636a80a878e4b i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  their  100644 b17419f7014d2b900690d329869e8a2584a3f224 i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-@@ -24,6 +24,7 @@
- 	"enableBreakpoints": "{0} 열에서 인라인 중단점 사용",
- 	"enableBreakpointOnLine": "줄 중단점 사용",
- 	"addBreakpoint": "중단점 추가",
-+<<<<<<< .our
- 	"addConditionalBreakpoint": "조건부 중단점 추가...",
- 	"addLogPoint": "Logpoint 추가...",
- 	"breakpointHasCondition": "이 {0}에는 제거 시 손실되는 {1}이(가) 있습니다. 대신 {0}을(를) 사용하지 않도록 설정하세요.",
-@@ -32,5 +33,9 @@
- 	"removeLogPoint": "{0} 제거",
- 	"disableLogPoint": "{0} 사용 안 함",
- 	"cancel": "취소",
-+=======
-+	"conditionalBreakpoint": "조건부 중단점 추가...",
-+	"addLogPoint": "로그 지점 추가...",
-+>>>>>>> .their
- 	"addConfiguration": "구성 추가..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 75d5a4986319c2fb428163c6a165e701a89ebf09 i18n/kor/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  our    100644 e49f8a732d537adaf418b41491fe7b363cf6da78 i18n/kor/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  their  100644 8ed1652209098d0489f896cb717fd4b1bdc87010 i18n/kor/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-@@ -8,6 +8,24 @@
- 	],
- 	"debugAdapterBinNotFound": "디버그 어댑터 실행 파일 '{0}'이(가) 없습니다.",
- 	"debugAdapterCannotDetermineExecutable": "디버그 어댑터 '{0}'에 대한 실행 파일을 확인할 수 없습니다.",
-+<<<<<<< .our
- 	"unableToLaunchDebugAdapter": "'{0}'에서 디버그 어댑터를 시작할 수 없습니다.",
- 	"unableToLaunchDebugAdapterNoArgs": "디버그 어댑터를 시작할 수 없습니다."
-+=======
-+	"launch.config.comment1": "IntelliSense를 사용하여 가능한 특성에 대해 알아보세요.",
-+	"launch.config.comment2": "기존 특성에 대한 설명을 보려면 가리킵니다.",
-+	"launch.config.comment3": "자세한 내용을 보려면 {0}을(를) 방문하세요.",
-+	"debugType": "구성의 형식입니다.",
-+	"debugTypeNotRecognised": "디버그 형식이 인식되지 않습니다. 해당하는 디버그 확장을 설치하고 사용하도록 설정했는지 확인하세요.",
-+	"node2NotSupported": "\"node2\"는 더 이상 지원되지 않습니다. 대신 \"node\"를 사용하고 \"protocol\" 특성을 \"inspector\"로 설정하세요.",
-+	"debugName": "구성 이름이며, 구성 시작 드롭다운 메뉴에 표시됩니다.",
-+	"debugRequest": "구성 형식을 요청합니다. \"시작\" 또는 \"연결\"일 수 있습니다.",
-+	"debugServer": "디버그 확장 배포 전용입니다. 포트가 지정된 경우 VS Code에서는 서버 모드로 실행하는 디버그 어댑터에 연결을 시도합니다.",
-+	"debugPrelaunchTask": "디버그 세션이 시작되기 이전에 실행할 작업입니다.",
-+	"debugPostDebugTask": "디버그 세션 종료 후 실행할 작업입니다.",
-+	"debugWindowsConfiguration": "Windows 특정 시작 구성 특성입니다.",
-+	"debugOSXConfiguration": "OS X 특정 시작 구성 특성입니다.",
-+	"debugLinuxConfiguration": "Linux 특정 시작 구성 특성입니다.",
-+	"deprecatedVariables": "'env.', 'config.' 및 'command.'는 사용되지 않습니다. 대신 'env:', 'config:' 및 'command:'를 사용하세요."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 73fe67dbadfbb320a1be2f79f75ab6d060bad952 i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  our    100644 0ba9ae100f9a8992cae9cf4667a7ead3845b17e1 i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  their  100644 ac0d4279306dd86dc6aef8e72448d92e45e7a5dd i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-changed in both
-  base   100644 d88f38093beb02b840189f0932a8c3f15a519404 i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  our    100644 018f63d5c0fb6f63e432765ed1c8c8d45eb5d87b i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  their  100644 cd44f74708b1b7d0b1238fe83f7581ca2d16ec29 i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-@@ -14,7 +14,11 @@
- 	"workspaceRecommendedExtensions": "작업 영역 권장 사항",
- 	"builtInExtensions": "기능",
- 	"builtInThemesExtensions": "테마",
-+<<<<<<< .our
- 	"builtInBasicsExtensions": "프로그래밍 언어",
-+=======
-+	"builtInBasicsExtensions": "언어",
-+>>>>>>> .their
- 	"searchExtensions": "마켓플레이스에서 확장 검색",
- 	"sort by installs": "정렬 기준: 설치 수",
- 	"sort by rating": "정렬 기준: 등급",
-changed in both
-  base   100644 08350a5a29e916fdd9ea0a22c7185369a5a44ec4 i18n/kor/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-  our    100644 07dded1ffc95a5c8e21d925d7e2f8bcef3291a8a i18n/kor/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-  their  100644 7611e89290b7e2cd232dfc772252af18c7aecdb0 i18n/kor/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-@@ -8,8 +8,13 @@
- 	],
- 	"textFileEditor": "텍스트 파일 편집기",
- 	"createFile": "파일 만들기",
-+<<<<<<< .our
- 	"relaunchWithIncreasedMemoryLimit": "{0}MB로 다시 시작",
- 	"configureMemoryLimit": "메모리 제한 구성",
-+=======
-+	"relaunchWithIncreasedMemoryLimit": "다시 시작",
-+	"configureMemoryLimit": "구성",
-+>>>>>>> .their
- 	"fileEditorWithInputAriaLabel": "{0}. 텍스트 파일 편집기입니다.",
- 	"fileEditorAriaLabel": "텍스트 파일 편집기입니다."
- }
-\ No newline at end of file
-changed in both
-  base   100644 42e37cef1b1b8983fd989b251013dccab101e7c2 i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 3bf77a27ac7c066f4ce3c283301cd1346b8314d5 i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 d9fac99bc9f6ef69452ee392f82e43c03280cec4 i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -38,12 +38,27 @@
- 	"confirmMoveTrashMessageMultiple": "다음 {0}개 파일을 삭제하시겠습니까?",
- 	"confirmMoveTrashMessageFolder": "'{0}'과(와) 해당 내용을 삭제할까요?",
- 	"confirmMoveTrashMessageFile": "'{0}'을(를) 삭제할까요?",
-+<<<<<<< .our
- 	"confirmDeleteMessageFilesAndDirectories": "다음 {0}개 파일/디렉터리 및 해당 내용을 영구히 삭제하시겠습니까?",
- 	"confirmDeleteMessageMultipleDirectories": "다음 {0}개 디렉터리 및 해당 내용을 영구히 삭제하시겠습니까?",
- 	"confirmDeleteMessageMultiple": "다음 {0}개 파일을 영구히 삭제하시겠습니까?",
- 	"confirmDeleteMessageFolder": "'{0}'과(와) 해당 내용을 영구히 삭제할까요?",
- 	"confirmDeleteMessageFile": "'{0}'을(를) 영구히 삭제할까요?",
- 	"addFiles": "파일 추가",
-+=======
-+	"undoBin": "휴지통에서 복원할 수 있습니다.",
-+	"undoTrash": "휴지통에서 복원할 수 있습니다.",
-+	"doNotAskAgain": "이 메시지를 다시 표시 안 함",
-+	"confirmDeleteMessageMultiple": "다음 {0}개 파일을 영구히 삭제하시겠습니까?",
-+	"confirmDeleteMessageFolder": "'{0}'과(와) 해당 내용을 영구히 삭제할까요?",
-+	"confirmDeleteMessageFile": "'{0}'을(를) 영구히 삭제할까요?",
-+	"irreversible": "이 작업은 취소할 수 없습니다.",
-+	"binFailed": "휴지통을 사용하여 삭제하지 못했습니다. 대신 영구히 삭제하시겠습니까?",
-+	"trashFailed": "휴지통을 사용하여 삭제하지 못했습니다. 대신 영구히 삭제하시겠습니까?",
-+	"deletePermanentlyButtonLabel": "영구 삭제 (&&D)",
-+	"retryButtonLabel": "다시 시도 (&&R)",
-+	"importFiles": "파일 가져오기",
-+>>>>>>> .their
- 	"confirmOverwrite": "이름이 같은 파일 또는 폴더가 대상 폴더에 이미 있습니다. 덮어쓸까요?",
- 	"replaceButtonLabel": "바꾸기(&&R)",
- 	"fileIsAncestor": "붙여 넣을 파일이 대상 폴더의 상위 항목입니다.",
-changed in both
-  base   100644 60fac1e96fac0ab19644c39c68be7f314d3266fd i18n/kor/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 86c9a7c9d2ee8cfe00d51c1241e8d08a131418a5 i18n/kor/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 d6497bf9c7636da093abca5de9d51dcf9b10cde1 i18n/kor/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-@@ -35,7 +35,11 @@
- 	"hotExit": "저장하지 않은 파일을 세션 간에 기억하여, 편집기를 종료할 때 저장할지 묻는 메시지를 건너뛸지 여부를 제어합니다.",
- 	"useExperimentalFileWatcher": "새로운 실험 파일 감시자를 사용하세요.",
- 	"defaultLanguage": "새 파일에 할당되는 기본 언어 모드입니다.",
-+<<<<<<< .our
- 	"maxMemoryForLargeFilesMB": "큰 파일을 열려고 할 때 다시 시작한 후 VS Code에 사용 가능한 메모리를 제어합니다. 명령줄에 --max-memory=NEWSIZE를 지정하는 것과 결과가 같습니다. ",
-+=======
-+	"maxMemoryForLargeFilesMB": "큰 파일을 열기 위해 다시 시작할 때 응용 프로그램에서 사용할 메모리의 새로운 한도(MB)입니다. 더 높은 한도로 시작하려면 명령줄에서 --max-memory=NEWSIZE를 사용하여 응용 프로그램을 시작할 수 있습니다.",
-+>>>>>>> .their
- 	"editorConfigurationTitle": "편집기",
- 	"formatOnSave": "파일 저장 시 서식을 지정합니다. 포맷터를 사용할 수 있어야 하며, 파일이 자동으로 저장되지 않아야 하고, 편집기가 종료되지 않아야 합니다.",
- 	"formatOnSaveTimeout": "저장 시 서식 지정의 시간 제한. FormatOnSave 명령에 대한 시간 제한을 밀리초로 지정합니다. 지정된 시간 제한보다 오래 걸리는 명령은 취소됩니다.",
-changed in both
-  base   100644 b6d91a6d57556f39caa4ce458eeaa4fd9bf6e524 i18n/kor/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  our    100644 0e96fcdac44c2d3253e3fe7e92f0f23065b25765 i18n/kor/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  their  100644 3765e145d236a1975f8edc567fc906ea919d2d07 i18n/kor/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-changed in both
-  base   100644 d95a0ea15d21f3717665f725c9c6c386d5514210 i18n/kor/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-  our    100644 2fdfcbff78eb198103281f8bd9dc9582d1b43254 i18n/kor/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-  their  100644 14fbd219509429b756bcc26cdd80fc2988163da7 i18n/kor/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-changed in both
-  base   100644 6422e6f88c1856e32ed0dc246917eacea242f353 i18n/kor/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
-  our    100644 15ccb30fd5d5cca61396dab746189b69d3d18023 i18n/kor/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
-  their  100644 e999d986aef4abdc9a96bf3e18263d0b30c77bea i18n/kor/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
-@@ -7,5 +7,9 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"copyMarker": "복사",
-+<<<<<<< .our
- 	"copyMessage": "메시지 복사"
-+=======
-+	"copyMarkerMessage": "메시지 복사"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a28f95549029eadac6d1b483d060085d23777f6a i18n/kor/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-  our    100644 c7863f2ea1b1541db0ff450d916a257e4cb26ce8 i18n/kor/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-  their  100644 d6cfbe28cef95992200be64c56237fc66d0a6401 i18n/kor/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-changed in both
-  base   100644 e80e5a7a2f1dd362f752c34cbd487bf9046c3480 i18n/kor/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  our    100644 6a6e7f152719318ecb9e9ea38a0a26d753597925 i18n/kor/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  their  100644 a532b28a5a6c7766ff8cf5be2d03d7b6da3e907d i18n/kor/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
-+=======
-+	"keybindingsInputName": "바로 가기 키(&&K)",
-+>>>>>>> .their
- 	"showDefaultKeybindings": "기본 키 바인딩 표시",
- 	"showUserKeybindings": "사용자 키 바인딩 표시",
- 	"SearchKeybindings.AriaLabel": "키 바인딩 검색",
-changed in both
-  base   100644 863a56d6989618e27d325f6f95c864d26bbc6a3e i18n/kor/src/vs/workbench/parts/search/browser/searchView.i18n.json
-  our    100644 c98e307c23bf5e868367c1bc97cd270b8e1c1303 i18n/kor/src/vs/workbench/parts/search/browser/searchView.i18n.json
-  their  100644 d217a637ee2ed6f997d1cbd160759fd505835448 i18n/kor/src/vs/workbench/parts/search/browser/searchView.i18n.json
-@@ -7,10 +7,16 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"moreSearch": "검색 세부 정보 설정/해제",
-+<<<<<<< .our
- 	"searchScope.includes": "포함할 파일",
- 	"label.includes": "패턴 포함 검색",
- 	"searchScope.excludes": "제외할 파일",
- 	"label.excludes": "패턴 제외 검색",
-+=======
-+	"searchIncludeExclude.label": "포함/제외할 파일",
-+	"searchIncludeExclude.ariaLabel": "패턴 포함/제외 검색",
-+	"searchIncludeExclude.placeholder": "예: src, !*.ts, test/**/*.log",
-+>>>>>>> .their
- 	"replaceAll.confirmation.title": "모두 바꾸기",
- 	"replaceAll.confirm.button": "바꾸기(&&R)",
- 	"replaceAll.occurrence.file.message": "{1}개 파일에서 {0}개를 '{2}'(으)로 바꿨습니다.",
-changed in both
-  base   100644 e02ee2a8a5f219383233c14638eb8091416fda48 i18n/kor/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 5dfbb2074f09c64c5ec03adc7d012b25c2bb9e72 i18n/kor/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 abf1b203d31a48bddda7378cc7aba7a9e229f4e7 i18n/kor/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-@@ -28,7 +28,10 @@
- 	"JsonSchema.tasks.group.none": "작업을 그룹에 할당 안 함",
- 	"JsonSchema.tasks.group": "이 작업을 할당할 실행 그룹을 정의합니다. 빌드 그룹에 추가를 위한 \"build'와 테스트 그룹에 추가를 위한 \"test\"를 지원합니다.",
- 	"JsonSchema.tasks.type": "작업이 프로세스로 실행되는지 또는 셸 내의 명령으로 실행되는지를 제어합니다.",
-+<<<<<<< .our
- 	"JsonSchema.commandArray": "실행할 셸 명령입니다. 배열 항목은 공백 문자를 사용하여 연결됩니다.",
-+=======
-+>>>>>>> .their
- 	"JsonSchema.command.quotedString.value": "실제 명령 값",
- 	"JsonSchema.tasks.quoting.escape": "셸의 이스케이프 문자를 사용하여 문자를 이스케이프합니다(예: ` under PowerShell 및 \\ under bash).",
- 	"JsonSchema.tasks.quoting.strong": "셸의 강력한 따옴표 문자를 사용하여 인수를 따옴표 처리합니다(예: \" under PowerShell and bash).",
-changed in both
-  base   100644 9fba55129c8bbe976b3fac079a9bf7132384e399 i18n/kor/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 7b483f685d0f32a5b2eb20f1327a18475e2d29ae i18n/kor/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 f6e1236d35f3ffb5f780c613962c0a5a53ee6409 i18n/kor/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-changed in both
-  base   100644 ba974a504800db79f15cba87f1e5f074ec37242e i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 0c53998d6e084853fcbcba0b56050a6d820a2b6f i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 4d01c4f618665487312c3bc5d13269b61bea73b3 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -54,10 +54,17 @@
- 	"nextTerminalFindTerm": "다음 검색어 표시",
- 	"previousTerminalFindTerm": "이전 검색어 표시",
- 	"quickOpenTerm": "활성 터미널 전환",
-+<<<<<<< .our
- 	"workbench.action.terminal.scrollToPreviousCommand": "이전 명령으로 스크롤",
- 	"workbench.action.terminal.scrollToNextCommand": "다음 명령으로 스크롤",
- 	"workbench.action.terminal.selectToPreviousCommand": "이전 명령까지 선택",
- 	"workbench.action.terminal.selectToNextCommand": "다음 명령까지 선택",
- 	"workbench.action.terminal.selectToPreviousLine": "이전 줄까지 선택",
- 	"workbench.action.terminal.selectToNextLine": "다음 줄까지 선택"
-+=======
-+	"workbench.action.terminal.focusPreviousCommand": "이전 명령에 포커스",
-+	"workbench.action.terminal.focusNextCommand": "다음 명령에 포커스",
-+	"workbench.action.terminal.selectToPreviousCommand": "이전 명령까지 선택",
-+	"workbench.action.terminal.selectToNextCommand": "다음 명령까지 선택"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 83747fca0e86317ce124320d439f4de8bb26b427 i18n/kor/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
-  our    100644 c8a335099ebca478cd0f180b9b02784c265fcc57 i18n/kor/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
-  their  100644 28d30d61c46b6eb60f16eb76aabd380e6e97d028 i18n/kor/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
-@@ -6,5 +6,20 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"stringsOnlySupported": "{0} 명령이 문자열 결과를 반환하지 않았습니다. 변수 대신 사용한 명령의 결과로는 문자열만 지원됩니다."
-+=======
-+	"canNotResolveWorkspaceFolderMultiRoot": "${workspaceFolder} 은(는) 멀티 폴더 작업 영역에서 확인할 수 없습니다. : 와 폴더 이름을 사용하여 변수 범위를 정합니다.",
-+	"canNotResolveWorkspaceFolder": "${workspaceFolder} 을(를) 확인할 수 없습니다. 폴더를 여십시오.",
-+	"canNotResolveFolderBasenameMultiRoot": "${workspaceFolderBasename} 은(는) 멀티 폴더 작업 영역에서 확인할 수 없습니다. : 와 폴더 이름을 사용하여 변수 범위를 정합니다.",
-+	"canNotResolveFolderBasename": "${workspaceFolderBasename} 을(를) 확인할 수 없습니다. 폴더를 여십시오.",
-+	"canNotResolveLineNumber": "${lineNumber} 을(를) 확인할 수 없습니다. 편집기를 여십시오.",
-+	"canNotResolveSelectedText": "${selectedText}을(를) 확인할 수 없습니다. 편집기를 여세요.",
-+	"canNotResolveFile": "${file} 을(를) 확인할 수 없으므로, 편집기를 여십시오.",
-+	"canNotResolveRelativeFile": "${relativeFile} 을(를) 확인할 수 없습니다. 편집기를 여십시오.",
-+	"canNotResolveFileDirname": "${fileDirname} 을(를) 확인할 수 없습니다. 편집기를 여십시오.",
-+	"canNotResolveFileExtname": "${fileExtname} 을(를) 확인할 수 없습니다. 편집기를 여십시오.",
-+	"canNotResolveFileBasename": "${fileBasename} 을(를) 확인할 수 없습니다. 편집기를 여십시오.",
-+	"canNotResolveFileBasenameNoExtension": "${fileBasenameNoExtension} 을(를) 확인할 수 없습니다. 편집기를 여십시오."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 eb17227dbfa871ea4c9f251b99cef6795837ef36 i18n/kor/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-  our    100644 361d1ad7355f4d1b81d6802085787a7bb15c2052 i18n/kor/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-  their  100644 ad13938c9e91493fd1671f3c65e178c53f0b99c4 i18n/kor/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-@@ -11,6 +11,7 @@
- 	"neverShowAgain": "다시 표시 안 함",
- 	"enospcError": "{0}은(는) 이 큰 작업 영역에서 파일 변경 내용을 감시할 수 없습니다. 지침 링크에 따라 이 문제를 해결하세요.",
- 	"learnMore": "지침",
-+<<<<<<< .our
- 	"fileInvalidPath": "잘못된 파일 리소스({0})",
- 	"fileIsDirectoryError": "파일이 디렉터리입니다.",
- 	"fileNotModifiedError": "파일 수정 안 됨",
-@@ -24,6 +25,9 @@
- 	"fileReadOnlyError": "파일이 읽기 전용입니다.",
- 	"fileMoveConflict": "이동/복사할 수 없습니다. 대상에 파일이 이미 있습니다.",
- 	"unableToMoveCopyError": "이동/복사할 수 없습니다. 파일이 포함된 폴더를 파일로 대체합니다.",
-+=======
-+	"enospcError": "{0}은(는) 이 큰 작업 영역에서 파일 변경 내용을 감시할 수 없습니다. 지침 링크에 따라 이 문제를 해결하세요.",
-+>>>>>>> .their
- 	"binFailed": "'{0}'을(를) 휴지통으로 이동하지 못함",
- 	"trashFailed": "'{0}'을(를) 휴지통으로 이동하지 못함"
- }
-\ No newline at end of file
-merged
-  result 100644 10b619a4b38f16558fe789426d6a79e768ddd193 i18n/kor/src/vs/workbench/services/files/node/fileService.i18n.json
-  our    100644 d411f384a723903358d48f22eaee747debee2d77 i18n/kor/src/vs/workbench/services/files/node/fileService.i18n.json
-@@ -9,6 +9,7 @@
- 	"fileInvalidPath": "잘못된 파일 리소스({0})",
- 	"fileIsDirectoryError": "파일이 디렉터리입니다.",
- 	"fileNotModifiedError": "파일 수정 안 됨",
-+	"fileTooLargeForHeapError": "파일 크기가 기본 메모리 제한을 초과합니다. 더 높은 한계로 다시 시작하세요. 현재 설정은 {0}MB로 다시 시작하도록 구성되어 있습니다.",
- 	"fileTooLargeError": "파일이 너무 커서 열 수 없음",
- 	"fileNotFoundError": "파일을 찾을 수 없습니다({0}).",
- 	"fileBinaryError": "파일이 이진인 것 같으므로 테스트로 열 수 없습니다.",
-changed in both
-  base   100644 f66c3b617c3306cabeea2d1914931b335a0db0f3 i18n/ptb/extensions/emmet/package.i18n.json
-  our    100644 bd44dd5d5523e2a5800a445af385bb5a762f2233 i18n/ptb/extensions/emmet/package.i18n.json
-  their  100644 37a69d7d680256517ce4eb07ce7427dd704a201a i18n/ptb/extensions/emmet/package.i18n.json
-@@ -60,6 +60,10 @@
- 	"emmetPreferencesCssMozProperties": "Propriedades CSS separadas por vírgula que recebem o prefixo vendor 'moz' quando utilizado em abreviações do Emmet que iniciam com `-`. Defina como string vazia para sempre evitar o prefixo 'moz'.",
- 	"emmetPreferencesCssOProperties": "Propriedades CSS separadas por vírgula que recebem o prefixo vendor 'o' quando utilizado em abreviações do Emmet que iniciam com `-`. Defina como string vazia para sempre evitar o prefixo 'o'.",
- 	"emmetPreferencesCssMsProperties": "Propriedades CSS separadas por vírgula que recebem o prefixo vendor 'ms' quando utilizado em abreviações do Emmet que iniciam com `-`. Defina como string vazia para sempre evitar o prefixo 'ms'.",
-+<<<<<<< .our
- 	"emmetPreferencesCssFuzzySearchMinScore": "A pontuação mínima (de 0 a 1) que a abreviação difusa deve alcançar. Os valores mais baixos podem produzir muitas correspondências falso-positivas, valores mais elevados podem reduzir possíveis correspondências.\n",
- 	"emmetOptimizeStylesheetParsing": "Quando definido como false, o arquivo inteiro é analisado para determinar se a posição atual é válida para expandir as abreviações Emmet. Quando definido como true, somente o conteúdo em torno da posição atual em arquivos css / scss / less é analisado."
-+=======
-+	"emmetPreferencesCssFuzzySearchMinScore": "A pontuação mínima (de 0 a 1) que a abreviação difusa deve alcançar. Os valores mais baixos podem produzir muitas correspondências falso-positivas, valores mais elevados podem reduzir possíveis correspondências.\n"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7ac6b700d4b62df9c23106c0151727c1c0cf6294 i18n/ptb/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 94d4e2ad2eeafdadb40b9a7361c52cda20aa5187 i18n/ptb/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 85f1badbbd5b7c92556325273249fbaf15e9b87a i18n/ptb/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -32,7 +32,10 @@
- 	"infoBorder": "Cor da borda das linhas de informação no editor.",
- 	"hintForeground": "Cor de primeiro plano de linhas onduladas de dica no editor.",
- 	"hintBorder": "Cor da borda de linhas onduladas de dica no editor.",
-+<<<<<<< .our
- 	"unnecessaryForeground": "Cor de primeiro plano de código desnecessário no editor.",
-+=======
-+>>>>>>> .their
- 	"overviewRulerRangeHighlight": "Visão geral da cor do marcador da régua para destaques do intervalo. A cor não deve ser opaca para não esconder decorações subjacentes.",
- 	"overviewRuleError": "Visão geral da cor do marcador da régua para erros.",
- 	"overviewRuleWarning": "Visão geral da cor do marcador da régua para avisos.",
-changed in both
-  base   100644 9e468f9401d721355b9f4dbebe8eece0a2effaac i18n/ptb/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 a3aea9d9c8c0805d0052884c40ebb83b3447e311 i18n/ptb/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 acef7303c7e3c96cfcf5b9f7a68e6671aa08733d i18n/ptb/src/vs/platform/environment/node/argv.i18n.json
-@@ -29,8 +29,13 @@
- 	"performance": "Comece com o 'Desenvolvedor: Desempenho de inicialização' comando habilitado.",
- 	"prof-startup": "Rodar o CPU profiler durante a inicialização",
- 	"disableExtensions": "Desabilita todas as extensões instaladas.",
-+<<<<<<< .our
- 	"inspect-extensions": "Permite a depuração e profiling de extensões. Verifique as ferramentas de desenvolvedor para obter o URI da conexão.",
- 	"inspect-brk-extensions": "Permite a depuração e profiling de extensões com o host de extensão sendo pausado após o início. Verifique as ferramentas de desenvolvedor para obter o URI da conexão.",
-+=======
-+	"inspect-extensions": "Permite depuração e criação de perfis de extensões. Verifique as ferramentas de desenvolvimento para a conexão uri.",
-+	"inspect-brk-extensions": "Permitir depuração e criação de perfil de extensões com o host de extensão em pausa após o início. Verifique as ferramentas do desenvolvedor para a conexão uri.",
-+>>>>>>> .their
- 	"disableGPU": "Desabilita aceleração de hardware via GPU.",
- 	"uploadLogs": "Envia os registros de atividade da sessão atual para um destino seguro.",
- 	"maxMemory": "Tamanho máximo de memória para uma janela (em Mbytes).",
-changed in both
-  base   100644 fd53e61c4d34d0d28cabf2a7e20493f0f794a9be i18n/ptb/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 69dfaa48d2b66f351d8413f62573d04c105f2c85 i18n/ptb/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 6bd9ed493bf16c4e0ac0e45e8c08d16bfa579c28 i18n/ptb/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -25,6 +25,11 @@
- 	"uninstallDependeciesConfirmation": "Gostaria de desinstalar '{0}' somente, ou suas dependências também?",
- 	"uninstallOnly": "Somente Extensão",
- 	"uninstallAll": "Desinstalar Tudo",
-+<<<<<<< .our
-+=======
-+	"uninstallConfirmation": "Tem certeza que deseja desinstalar '{0}'?",
-+	"ok": "OK",
-+>>>>>>> .their
- 	"singleDependentError": "Não foi possível desinstalar a extensão '{0}'. A extensão '{1}' depende dela.",
- 	"twoDependentsError": "Não foi possível desinstalar a extensão '{0}'. As extensões '{1}' e '{2}' dependem dela.",
- 	"multipleDependentsError": "Não foi possível desinstalar a extensão '{0}'. As extensões '{1}' e '{2}' e outras dependem dela.",
-changed in both
-  base   100644 69ab398eeb1c58a8a88ef2db129abed37e59d03c i18n/ptb/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 62b4a14f179ce17a8ef358da83ed726d39cdb13f i18n/ptb/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 74295c8a145eb8fc633a4ad1d7eb299415421ca4 i18n/ptb/src/vs/workbench/electron-browser/actions.i18n.json
-changed in both
-  base   100644 8fd73e4f40c46957070a53b93fe41d03a759b95c i18n/ptb/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 15dd21d37a31b843a88f5eb322486062a4b034bf i18n/ptb/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 ca1050520df3fb1e8e39e29058c46ef9df7ea3a7 i18n/ptb/src/vs/workbench/electron-browser/main.contribution.i18n.json
-changed in both
-  base   100644 e3be93ecafcbf9bacd478288a3ef070fe7dad2bf i18n/ptb/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  our    100644 4c94ccc38fbddbdb205d736f72a6b2b1d8ad964a i18n/ptb/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  their  100644 cf6647e02940dcfb3b1011020f4fba172e755d2e i18n/ptb/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-changed in both
-  base   100644 fc9ccfbe31541c35d145612b9a05f9ef8b2d64e2 i18n/ptb/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
-  our    100644 b967138c3c12c011c58d6f803a58cf6b3ef2916a i18n/ptb/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
-  their  100644 8d9d177e084c5c04c6a5338addd0575775936c98 i18n/ptb/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
-@@ -7,5 +7,11 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"noFolderDebugConfig": "Primeiro abra uma pasta para fazer uma configuração de depuração avançada.",
-+<<<<<<< .our
- 	"debug": "Depurar"
-+=======
-+	"columnBreakpoint": "Coluna de ponto de parada",
-+	"debug": "Depurar",
-+	"addColumnBreakpoint": "Adicionar Ponto de Interrupção de Coluna"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a29d2cb24392f3bab71a1534d523c602a7217602 i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 7ae7f7f9b7576297c381fe538464cf315327a1cf i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 1551a564cda6e6227b94451ada0b2b6ba22fbb10 i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -29,6 +29,9 @@
- 	"showErrors": "Mostrar erros",
- 	"noFolderWorkspaceDebugError": "O arquivo ativo não pode ser depurado. Certifique-se de que ele está salvo no disco e que tem uma extensão de depuração instalada para esse tipo de arquivo.",
- 	"cancel": "Cancelar",
-+<<<<<<< .our
- 	"DebugTaskNotFound": "Não foi possível encontrar a tarefa '{0}'.",
-+=======
-+>>>>>>> .their
- 	"taskNotTracked": "A tarefa '{0}' não pode ser rastreada."
- }
-\ No newline at end of file
-changed in both
-  base   100644 68f9e1f25bfc85c6ab17d221c53fc29b2f8daa94 i18n/ptb/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  our    100644 18e436b0f51c078a33ff8a7ef00fa4c01b630818 i18n/ptb/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  their  100644 1dae0f36657aac2d3bd896168e325ed65f086ee2 i18n/ptb/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-@@ -8,6 +8,24 @@
- 	],
- 	"debugAdapterBinNotFound": "Executável do adaptador de depuração '{0}' não existe.",
- 	"debugAdapterCannotDetermineExecutable": "Não é possível determinar o executável para o adaptador de depuração '{0}'.",
-+<<<<<<< .our
- 	"unableToLaunchDebugAdapter": "Não é possível executar o adaptador de depuração de '{0}'.",
- 	"unableToLaunchDebugAdapterNoArgs": "Não é possível executar o adaptador de depuração."
-+=======
-+	"launch.config.comment1": "Use o IntelliSense para aprender sobre possíveis atributos.",
-+	"launch.config.comment2": "Passe o mouse para ver as descrições dos atributos existentes.",
-+	"launch.config.comment3": "Para obter mais informações, visite: {0}",
-+	"debugType": "Tipo de configuração.",
-+	"debugTypeNotRecognised": "O tipo de depuração não é reconhecido. Certifique-se de que você tem uma extensão de depuração correspondente instalada e que ela está habilitada.",
-+	"node2NotSupported": "\"node2\" não é mais suportado, use \"node\" ao invés e defina o atributo \"protocol\" para \"inspector\".",
-+	"debugName": "Nome da configuração; aparece no menu drop-down da configuração de lançamento. ",
-+	"debugRequest": "Requer o tipo de configuração. Pode ser \"launch\" ou \"attach\".",
-+	"debugServer": "Somente para o desenvolvimento de extensão de depuração: se uma porta é especificada, o VS Code tenta se conectar a um adaptador de depuração executando em modo de servidor",
-+	"debugPrelaunchTask": "Tarefa para ser executada antes de começar a sessão de depuração.",
-+	"debugPostDebugTask": "Tarefa para ser executada após término da sessão de debug.",
-+	"debugWindowsConfiguration": "Atributos de configuração de lançamento específicos do Windows.",
-+	"debugOSXConfiguration": "Atributos de configuração de lançamento específicos do OS X.",
-+	"debugLinuxConfiguration": "Atributos de configuração de lançamento específicos do Linux.",
-+	"deprecatedVariables": "'env.', 'config.' e 'command.' foram descontinuados, use ' env:', ' config:' e ' command:' em vez disso."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c50dddb316689bfd3745b25edbaf1ef8c1a942af i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  our    100644 e6df41a65a65f5e9267a44ca96ad7c6bfefc0837 i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  their  100644 6390a489a2dbb0995831689de39efe4bc5230e57 i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-@@ -37,6 +37,11 @@
- 	"view location": "Onde",
- 	"localizations": "Localizações ({0})",
- 	"localizations language id": "Id do Idioma",
-+<<<<<<< .our
-+=======
-+	"localizations language name": "Nome do Idioma",
-+	"localizations localized language name": "Nome do Idioma (Localizado)",
-+>>>>>>> .their
- 	"colorThemes": "Temas de cores ({0})",
- 	"iconThemes": "Temas de ícones ({0})",
- 	"colors": "Cores ({0})",
-changed in both
-  base   100644 9afc09662215d9167d85b5676c9e3da2336dcfce i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 ddb9ffa28f8d3daf13de0c0b7197d8da53424c16 i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 d3e1a967a6afdf2437048751b65a5a0e5bf49729 i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -8,6 +8,10 @@
- 	],
- 	"neverShowAgain": "Não mostrar novamente",
- 	"searchMarketplace": "Pesquisar na Loja",
-+<<<<<<< .our
-+=======
-+	"showLanguagePackExtensions": "A loja possui extensões que podem ajudar na localização do VS Code para o local '{0}'",
-+>>>>>>> .their
- 	"dynamicWorkspaceRecommendation": "Esta extensão pode interessá-lo porque é popular entre os usuários do repositório {0}.",
- 	"exeBasedRecommendation": "Esta extensão é recomendada porque você tem {0} instalado.",
- 	"fileBasedRecommendation": "Esta extensão é recomendada baseada nos arquivos que você abriu recentemente.",
-changed in both
-  base   100644 963936e2ac1ccf84da6c3e5e371c00b0923e987f i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  our    100644 5d4dd840e849e249d4865eeefa45bd80e7e4150d i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  their  100644 6646f1509073aef92ef9e8e44cb2644971683dbf i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-@@ -14,6 +14,10 @@
- 	"workspaceRecommendedExtensions": "Recomendações do Espaço de Trabalho",
- 	"builtInExtensions": "Funcionalidades",
- 	"builtInThemesExtensions": "Temas",
-+<<<<<<< .our
-+=======
-+	"builtInBasicsExtensions": "Idiomas",
-+>>>>>>> .their
- 	"searchExtensions": "Pesquisar Extensões na Loja",
- 	"sort by installs": "Ordenar por: Quantidade de Instalações",
- 	"sort by rating": "Ordenar por: Avaliação",
-changed in both
-  base   100644 d626a3f28d4e84dc164a71d1845267110467ae51 i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 6f4dc9047cdb115e21fc423b4a6eca5180a2ad01 i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 b8f1efe7f1617001a73033ac9115246a5cad4230 i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -34,6 +34,13 @@
- 	"confirmDeleteMessageMultiple": "Você tem certeza que deseja excluir permanentemente os seguintes {0} arquivos?",
- 	"confirmDeleteMessageFolder": "Tem certeza de que deseja excluir permanentemente '{0}' e seu conteúdo?",
- 	"confirmDeleteMessageFile": "Tem certeza de que deseja excluir permanentemente '{0}'?",
-+<<<<<<< .our
-+=======
-+	"irreversible": "Esta ação é irreversível!",
-+	"deletePermanentlyButtonLabel": "&&Excluir Permanentemente",
-+	"retryButtonLabel": "&&Tentar Novamente",
-+	"importFiles": "Importar Arquivos",
-+>>>>>>> .their
- 	"confirmOverwrite": "Um arquivo ou pasta com o mesmo nome já existe na pasta de destino. Você quer substituí-lo?",
- 	"replaceButtonLabel": "&&Substituir",
- 	"fileDeleted": "Arquivo para colar foi excluído ou movido no meio-tempo",
-merged
-  result 100644 3533d84f530bbb33031a240513f9ce398306c7fc i18n/ptb/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
-  our    100644 c9dceaeb492e6331e3bf0f803c31ecd200e10290 i18n/ptb/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
-@@ -6,5 +6,6 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+	"openToolsLabel": "Abrir Ferramentas de Desenvolvedor do Webview",
- 	"refreshWebviewLabel": "Recarregar Webviews"
- }
-\ No newline at end of file
-changed in both
-  base   100644 c8a848c68bda7d5397d621125ff753f652b9d339 i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  our    100644 dfb6a734a7bd828d4b5aba3c014e4458b5423834 i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  their  100644 fabb8d4f9494d7333b7f3437d60dcacce427196a i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-changed in both
-  base   100644 213e59f281052f08a3be2d52f990273d8f114794 i18n/ptb/src/vs/workbench/parts/search/browser/searchView.i18n.json
-  our    100644 b3ae68185057b9a794fe9aa335e3a999986822bc i18n/ptb/src/vs/workbench/parts/search/browser/searchView.i18n.json
-  their  100644 283b6f780fe7bb20c7187e275bca13d423e3a01d i18n/ptb/src/vs/workbench/parts/search/browser/searchView.i18n.json
-changed in both
-  base   100644 485dee67981eec0b8ca3358ed514e212627d34ab i18n/ptb/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 08831e79b99c984b5f938c4d959c75ada794a1e4 i18n/ptb/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 f7d0a1eb3fe333ee9182c95c64487d08d11b0b9b i18n/ptb/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -29,5 +29,10 @@
- 	"search.quickOpen.includeSymbols": "Configurar para incluir resultados de uma pesquisa símbolo global nos resultados do arquivo para Abertura Rápida.",
- 	"search.followSymlinks": "Controla quando seguir symlinks ao realizar uma busca.",
- 	"search.smartCase": "Faz pesquisas do tipo case-insensitive se o termo for totalmente minúsculo, caso contrário, faz pesquisas do tipo case-sensitive.",
-+<<<<<<< .our
- 	"search.globalFindClipboard": "Controla se a visualização de busca deve ler ou modificar a área de transferência de busca compartilhada no macOS"
-+=======
-+	"search.globalFindClipboard": "Controla se a visualização de busca deve ler ou modificar a área de transferência de busca compartilhada no macOS",
-+	"search.location": "Visualização: controla se a pesquisa será mostrada como um modo de exibição na barra lateral ou como um painel na área de painéis para mais espaço horizontal. No próximo lançamento, a pesquisa no painel terá um layout horizontal melhorado e este já não será um preview."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a0dc8f3fbc0304a684f95826cda09bdc04f439ac i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 a7fcbfe8b12598411b8516f57bb30b642834b0bc i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 ccb060cdd99013981178a55f44b54a9eda5b39c6 i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-changed in both
-  base   100644 2e5bc67362ff73c481cd2d707cabde34a7e9cb79 i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 5844af8cc38149dcfa5ec9e4de0ec76188e00645 i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 ff88af36c321f7a900d3811370ba43af5af62c28 i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -51,5 +51,6 @@
- 	"workbench.action.terminal.hideFindWidget": "Ocultar Ferramenta de Pesquisa",
- 	"nextTerminalFindTerm": "Mostrar Próximo Termo de Busca",
- 	"previousTerminalFindTerm": "Mostrar Termo de Busca Anterior",
--	"quickOpenTerm": "Alternar o Terminal Ativo"
-+	"quickOpenTerm": "Alternar o Terminal Ativo",
-+	"workbench.action.terminal.focusPreviousCommand": "Foco no Comando Anterior"
- }
-\ No newline at end of file
-changed in both
-  base   100644 b9e88e5f37b7a572ee131e8c673009b1c72485e3 i18n/rus/extensions/emmet/package.i18n.json
-  our    100644 e8a08df3b0fb514f0bab0b0d555c900a23a3deca i18n/rus/extensions/emmet/package.i18n.json
-  their  100644 c19856550d5543ecbcca10aad15a2fa3d4897b09 i18n/rus/extensions/emmet/package.i18n.json
-@@ -60,6 +60,10 @@
- 	"emmetPreferencesCssMozProperties": "Разделенный запятыми список свойств CSS, которые получают префикс разработчика \"moz\" при использовании в сокращениях Emmet, которые начинаются с \"-\". Чтобы префикс \"moz\" никогда не подставлялся, установите в качестве этого параметра пустое значение. ",
- 	"emmetPreferencesCssOProperties": "Разделенный запятыми список свойств CSS, которые получают префикс разработчика \"o\" при использовании в сокращениях Emmet, которые начинаются с \"-\". Чтобы префикс \"o\" никогда не подставлялся, установите в качестве этого параметра пустое значение. ",
- 	"emmetPreferencesCssMsProperties": "Разделенный запятыми список свойств CSS, которые получают префикс разработчика \"ms\" при использовании в сокращениях Emmet, которые начинаются с \"-\". Чтобы префикс \"ms\" никогда не подставлялся, установите в качестве этого параметра пустое значение. ",
-+<<<<<<< .our
- 	"emmetPreferencesCssFuzzySearchMinScore": "Минимальное количество очков для нечеткого соответствия сокращения (от 0 до 1). При указании более низких значений возможно увеличение числа ложных срабатываний, при указании более высоких значений - уменьшение числа возможных соответствий.",
- 	"emmetOptimizeStylesheetParsing": "Если значение равно false, весь файл анализируется для определения, является ли текущая позиция допустимой для расширения сокращений Emmet. Когда присвоено значение true, только содержимое вокруг текущей позиции в файлах css/scss/less подвергается синтаксическому анализу."
-+=======
-+	"emmetPreferencesCssFuzzySearchMinScore": "Минимальное количество очков для нечеткого соответствия сокращения (от 0 до 1). При указании более низких значений возможно увеличение числа ложных срабатываний, при указании более высоких значений - уменьшение числа возможных соответствий."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 5e347fa36d06770fdc39d7ad00006908de71155a i18n/rus/extensions/git/out/commands.i18n.json
-  our    100644 bdd7adadfadc50db48d014178fb19ce838d13900 i18n/rus/extensions/git/out/commands.i18n.json
-  their  100644 c7863b7c96316f1803b3f2cae8b174cd887b6fee i18n/rus/extensions/git/out/commands.i18n.json
-changed in both
-  base   100644 0cab268e7a8713eda7738a042aeb0b81982f350c i18n/rus/extensions/markdown-language-features/out/security.i18n.json
-  our    100644 d51d2ea286dc4220162db79665ba247fc6ad9c0f i18n/rus/extensions/markdown-language-features/out/security.i18n.json
-  their  100644 e57fedc24d6225bfff89936b87ebe3ea901f606d i18n/rus/extensions/markdown-language-features/out/security.i18n.json
-changed in both
-  base   100644 5e16df11f061462b5d8fdaae683b344a794897b9 i18n/rus/extensions/php/package.i18n.json
-  our    100644 1e2e55fbb4c6054f67ad400b6f785c69d1b25733 i18n/rus/extensions/php/package.i18n.json
-  their  100644 0ad440603307baaa814d78f865ecca71321e9b1d i18n/rus/extensions/php/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Основы языка PHP",
-+=======
-+	"displayName": "Функции языка PHP",
-+>>>>>>> .their
- 	"description": "Предоставляет подсветку синтаксиса и выделение парных скобок в файлах PHP."
- }
-\ No newline at end of file
-changed in both
-  base   100644 44453977d44cf49d8f8a493e4107db8ce66f3da2 i18n/rus/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 9d3bc679fc1f2c06c947cdc33c9616b8b522920c i18n/rus/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 1acfd70b90bc162578e7306fe87aa55127294daf i18n/rus/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -32,7 +32,10 @@
- 	"infoBorder": "Цвет границ волнистой линии для выделения информационных сообщений в редакторе. ",
- 	"hintForeground": "Цвет волнистой линии для выделения подсказок в редакторе.",
- 	"hintBorder": "Цвет границ волнистой линии для выделения подсказок в редакторе. ",
-+<<<<<<< .our
- 	"unnecessaryForeground": "Цвет переднего плана ненужного кода в редакторе.",
-+=======
-+>>>>>>> .their
- 	"overviewRulerRangeHighlight": "Цвет метки линейки в окне просмотра для выделений диапазонов. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
- 	"overviewRuleError": "Цвет метки линейки в окне просмотра для ошибок.",
- 	"overviewRuleWarning": "Цвет метки линейки в окне просмотра для предупреждений.",
-changed in both
-  base   100644 908048ebb5a12bfde5615d50afcb8ade293dd217 i18n/rus/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 b5b010a1ed08e7bd0639632258a4ace9da636f30 i18n/rus/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 61b52ee878a7c2b13e97cddf30851a8c074a8e7b i18n/rus/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -25,6 +25,11 @@
- 	"uninstallDependeciesConfirmation": "Вы хотите удалить \"{0}\" отдельно или вместе с зависимостями?",
- 	"uninstallOnly": "Только расширение",
- 	"uninstallAll": "Удалить все",
-+<<<<<<< .our
-+=======
-+	"uninstallConfirmation": "Вы действительно хотите удалить \"{0}\"?",
-+	"ok": "ОК",
-+>>>>>>> .their
- 	"singleDependentError": "Не удается удалить расширение \"{0}\". От него зависит расширение \"{1}\".",
- 	"twoDependentsError": "Не удается удалить расширение \"{0}\". От него зависят расширения \"{1}\" и \"{2}\".",
- 	"multipleDependentsError": "Не удается удалить расширение \"{0}\". От него зависят расширения \"{1}\", \"{2}\" и другие.",
-changed in both
-  base   100644 4fd13e76a7af581290b5dc2add21389c0b9c307e i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 a203da5726ce360e6e4c7bd4be5cee05446e8ca5 i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 681bcf8d8ed16f3c9941a201a1eab81b79eec19e i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json
-changed in both
-  base   100644 37bcdaf055d812e045605594b2d353f0ee340cb6 i18n/rus/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  our    100644 b7b1c72487ebcdd28a2f6de4bbc845fb5f8459a4 i18n/rus/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 4e0cc0deeb308f2247ddb4e9cb8cfe67b630e6a2 i18n/rus/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -7,7 +7,10 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"timeout.formatOnSave": "Форматирование при сохранении прервано через {0} мс",
-+<<<<<<< .our
- 	"codeActionsOnSave.didTimeout": "Метод codeActionsOnSave прерван через {0} мс",
-+=======
-+>>>>>>> .their
- 	"timeout.onWillSave": "Событие onWillSaveTextDocument-event прервано по истечении 1750 мс",
- 	"saveParticipants": "Сохранение участников..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 7a4ee2d7def12666131e6d57feb3fc407e9d8c55 i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 bdb5e10a72aa6a97a13c01acd6d5626456147e68 i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 12656d83a09e6402f6982a0324528674b6a1ceb1 i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -80,7 +80,10 @@
- 	"titleBarStyle": "Настройка внешнего вида заголовка окна. Чтобы применить изменения, потребуется полный перезапуск.",
- 	"window.nativeTabs": "Включает вкладки окна macOS Sierra. Обратите внимание, что для применения этих изменений потребуется полная перезагрузка, и что для всех внутренних вкладок будет отключен пользовательский стиль заголовка, если он был настроен.",
- 	"window.smoothScrollingWorkaround": "Включите это обходное решение, если после восстановления свернутого окна кода VS Code прокрутка не выполняется плавно. Это обходное решение для проблемы (https://github.com/Microsoft/vscode/issues/13612), при которой возникают задержки прокрутки на устройствах с сенсорными панелями высокой точности, такими как устройства Surface от Майкрософт. Включение этого обходного решения может привести к небольшому дрожанию элементов окна во время восстановления, но не имеет других негативных последствий.",
-+<<<<<<< .our
- 	"window.clickThroughInactive": "Если этот параметр включен, то при щелчке в неактивном окне будут активированы как оно, так и элемент управления, на котором находился курсор мыши в момент щелчка, если этот элемент управления должен активироваться по щелчку мыши. Если этот параметр отключен, то при щелчке в любом месте неактивного окна будет активировано только окно, и для активации элемента управления на нем будет нужно щелкнуть еще раз.",
-+=======
-+>>>>>>> .their
- 	"zenModeConfigurationTitle": "Режим Zen",
- 	"zenMode.fullScreen": "Определяет, будет ли переключение в режим Zen переключать рабочее пространство в полноэкранный режим.",
- 	"zenMode.centerLayout": "Определяет, будет ли также выполняться выравнивание по центру при включении режима Zen.",
-changed in both
-  base   100644 3a211dd7bc4ab4c45c2e93603fab30c59b6bc669 i18n/rus/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  our    100644 c7d8282666638a14a77cd9b7b8ffaf2b23a45b58 i18n/rus/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  their  100644 ff219b2d4d418058cfbeda70d9c59bfd174200e9 i18n/rus/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-changed in both
-  base   100644 83f5638058ae5e04cffc93b7604f38be28ad44db i18n/rus/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  our    100644 529030b0956c87703b3826fbbf2739d72dcf1f2b i18n/rus/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  their  100644 63b8dbd0104182bee70beacb97f6a4ad32ddc709 i18n/rus/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-@@ -8,7 +8,11 @@
- 	],
- 	"toggleBreakpointAction": "Отладка: переключить точку останова",
- 	"conditionalBreakpointEditorAction": "Отладка: добавить условную точку останова…",
-+<<<<<<< .our
- 	"logPointEditorAction": "Отладка: добавить точку журнала... ",
-+=======
-+	"logPointEditorAction": "Отладка: Добавить точку журнала...",
-+>>>>>>> .their
- 	"runToCursor": "Выполнить до курсора",
- 	"debugEvaluate": "Отладка: вычисление",
- 	"debugAddToWatch": "Отладка: добавить контрольное значение",
-changed in both
-  base   100644 93dc323939de4d9f996418d9268b1306664316c7 i18n/rus/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-  our    100644 0c479344e19e1328751ca6e3c350f0a4622b49c9 i18n/rus/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-  their  100644 710bb265257b4b5e30215ff9992860728076a743 i18n/rus/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-@@ -6,9 +6,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"breakpointWidgetLogMessagePlaceholder": "Сообщение, которое должно быть записано в журнал при срабатывании точки останова. Выражения в фигурных скобках {} интерполируются. Нажмите клавишу ВВОД, чтобы принять, или ESC, чтобы отменить действие.",
- 	"breakpointWidgetHitCountPlaceholder": "Прервать при определенном количестве обращений. Нажмите клавишу ВВОД, чтобы принять, или ESC для отмены.",
- 	"breakpointWidgetExpressionPlaceholder": "Прервать выполнение, если выражение равно true. Нажмите клавишу ВВОД, чтобы принять, или ESC для отмены.",
-+=======
-+	"breakpointWidgetLogMessagePlaceholder": "Сообщение, которое должно быть записано в журнал при срабатывании точки останова. Нажмите клавишу ВВОД, чтобы принять, или ESC, чтобы отменить действие.",
-+	"breakpointWidgetHitCountPlaceholder": "Прервать при определенном количестве обращений. Нажмите клавишу ВВОД, чтобы принять, или ESC для отмены.",
-+	"breakpointWidgetExpressionPlaceholder": "Прервать выполнение, если выражение равно true. Нажмите клавишу ВВОД, чтобы принять, или ESC для отмены.",
-+	"breakpointWidgetLogMessageAriaLabel": "Программа будет записывать это сообщение в журнал каждый раз при срабатывании точки останова. Нажмите клавишу ВВОД, чтобы принять, или ESC, чтобы отменить действие.",
-+	"breakpointWidgetHitCountAriaLabel": "Выполнение программы прервется в этом месте, только если достигнуто определенное количество обращений. Нажмите клавишу ВВОД для принятия или ESC для отмены.",
-+	"breakpointWidgetAriaLabel": "Выполнение программы прервется в этом месте, только если условие выполнится. Нажмите клавишу ВВОД для принятия или ESC для отмены.",
-+>>>>>>> .their
- 	"expression": "Выражение",
- 	"hitCount": "Количество обращений",
- 	"logMessage": "Сообщение журнала"
-changed in both
-  base   100644 a53c820ee794438bfa15e97f90a86757fb39c259 i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  our    100644 23861effe72edc87caa9cf26eb6c7a34582f889d i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  their  100644 24bbf2ba61a0705731406de1ee1bfa523bd358f8 i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-@@ -24,6 +24,7 @@
- 	"enableBreakpoints": "Включить внутреннюю точку останова в столбце {0} ",
- 	"enableBreakpointOnLine": "Включить точку останова в строке",
- 	"addBreakpoint": "Добавить точку останова",
-+<<<<<<< .our
- 	"addConditionalBreakpoint": "Добавить условную точку останова…",
- 	"addLogPoint": "Добавить точку журнала...",
- 	"breakpointHasCondition": "Этот {0} содержит {1}, который будет утерян при удалении. Попробуйте отключить {0} вместо удаления.",
-@@ -32,5 +33,9 @@
- 	"removeLogPoint": "Удалить {0}",
- 	"disableLogPoint": "Отключить {0}",
- 	"cancel": "Отмена",
-+=======
-+	"conditionalBreakpoint": "Добавить условную точку останова…",
-+	"addLogPoint": "Добавить точку журнала...",
-+>>>>>>> .their
- 	"addConfiguration": "Добавить конфигурацию..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 352c6d325439ec8d52f14a2758bfdd1bf95f9009 i18n/rus/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  our    100644 4d4a7ed83f0f21185a7b07658c2021e06bcfa0df i18n/rus/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  their  100644 818d95b928f957365a8738634e7f99772069b2a6 i18n/rus/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-@@ -8,6 +8,24 @@
- 	],
- 	"debugAdapterBinNotFound": "Исполняемый файл адаптера отладки \"{0}\" не существует.",
- 	"debugAdapterCannotDetermineExecutable": "Невозможно определить исполняемый файл для адаптера отладки \"{0}\".",
-+<<<<<<< .our
- 	"unableToLaunchDebugAdapter": "Не удается запустить адаптер отладки из \"{0}\".",
- 	"unableToLaunchDebugAdapterNoArgs": "Не удается запустить адаптер отладки."
-+=======
-+	"launch.config.comment1": "Используйте IntelliSense, чтобы узнать о возможных атрибутах.",
-+	"launch.config.comment2": "Наведите указатель мыши, чтобы просмотреть описания существующих атрибутов.",
-+	"launch.config.comment3": "Для получения дополнительной информации посетите: {0}",
-+	"debugType": "Тип конфигурации.",
-+	"debugTypeNotRecognised": "Не удается распознать тип отладки. Убедитесь, что соответствующее расширение отладки установлено и включено.",
-+	"node2NotSupported": "Значение \"node2\" больше не поддерживается; используйте \"node\" и задайте для атрибута \"protocol\" значение \"inspector\".",
-+	"debugName": "Имя конфигурации; отображается в раскрывающемся меню конфигурации запуска.",
-+	"debugRequest": "Запросите тип конфигурации. Возможные типы: \"запуск\" и \"подключение\".",
-+	"debugServer": "Только для разработки расширений отладки: если указан порт, VS Code пытается подключиться к адаптеру отладки, запущенному в режиме сервера.",
-+	"debugPrelaunchTask": "Задача, выполняемая перед началом сеанса отладки.",
-+	"debugPostDebugTask": "Задача, которая будет запущена после завершения сеанса отладки.",
-+	"debugWindowsConfiguration": "Атрибуты конфигурации запуска для Windows.",
-+	"debugOSXConfiguration": "Атрибуты конфигурации запуска для OS X.",
-+	"debugLinuxConfiguration": "Атрибуты конфигурации запуска для Linux.",
-+	"deprecatedVariables": "\"env.\", \"config.\" и \"command.\" устарели, используйте \"env:\", \"config:\" и \"command:\"."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 65c42dfa32b3914f08cdfdcdfa9c0f43dbc778d5 i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  our    100644 f164fde4366fa773b48bfe98693ae272b89afd2b i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  their  100644 80214fe333933c85dc938913564565da17a68e22 i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-changed in both
-  base   100644 fc2676c541bdf82c50f159619a26ce5bc21e162b i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  our    100644 2237c231d50e522f4f8d9167763aa06917febb9b i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  their  100644 18330df4a6df63ea5a68f5d7d30d19fbf04a6628 i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-@@ -14,7 +14,11 @@
- 	"workspaceRecommendedExtensions": "Рекомендации рабочей области",
- 	"builtInExtensions": "Функции",
- 	"builtInThemesExtensions": "Темы",
-+<<<<<<< .our
- 	"builtInBasicsExtensions": "Языки программирования",
-+=======
-+	"builtInBasicsExtensions": "Языки",
-+>>>>>>> .their
- 	"searchExtensions": "Поиск расширений в Marketplace",
- 	"sort by installs": "Сортировать по: числу установок",
- 	"sort by rating": "Сортировать по: рейтинг",
-changed in both
-  base   100644 34483f0568a33e88dbc9e35a2c4de92076f2cc3a i18n/rus/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-  our    100644 ffe2bcbd534ed951291a4a93751b509245a9ff04 i18n/rus/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-  their  100644 17cc8bc7ccb3b7859a4ca7f9e212b29185bb2951 i18n/rus/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-@@ -8,8 +8,13 @@
- 	],
- 	"textFileEditor": "Редактор текстовых файлов",
- 	"createFile": "Создать файл",
-+<<<<<<< .our
- 	"relaunchWithIncreasedMemoryLimit": "Перезапустить с объемом памяти {0} МБ",
- 	"configureMemoryLimit": "Настроить ограничение памяти",
-+=======
-+	"relaunchWithIncreasedMemoryLimit": "Запустить повторно",
-+	"configureMemoryLimit": "Настройка",
-+>>>>>>> .their
- 	"fileEditorWithInputAriaLabel": "{0}. Редактор текстовых файлов.",
- 	"fileEditorAriaLabel": "Редактор текстовых файлов."
- }
-\ No newline at end of file
-changed in both
-  base   100644 a22ecce0eb36db951291ed6fc49f39b0849eddcc i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 2c38d1331217bb70a1fc665d1c79c9658eacde43 i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 3cfc86062e0ef0c8abc43528d790496012791032 i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -38,12 +38,27 @@
- 	"confirmMoveTrashMessageMultiple": "Вы действительно хотите удалить следующие файлы ({0})?",
- 	"confirmMoveTrashMessageFolder": "Вы действительно хотите удалить папку \"{0}\" и ее содержимое?",
- 	"confirmMoveTrashMessageFile": "Вы действительно хотите удалить \"{0}\"?",
-+<<<<<<< .our
- 	"confirmDeleteMessageFilesAndDirectories": "Вы уверены, что вы хотите удалить следующие файлы и каталоги ({0}) и их содержимое без возможности восстановления?",
- 	"confirmDeleteMessageMultipleDirectories": "Вы уверены, что вы хотите удалить следующие каталоги ({0}) и их содержимое без возможности восстановления? ",
- 	"confirmDeleteMessageMultiple": "Вы действительно хотите удалить следующие файлы ({0}) без возможности восстановления?",
- 	"confirmDeleteMessageFolder": "Вы действительно хотите удалить папку \"{0}\" и ее содержимое без возможности восстановления?",
- 	"confirmDeleteMessageFile": "Вы действительно хотите удалить \"{0}\" без возможности восстановления?",
- 	"addFiles": "Добавить файлы",
-+=======
-+	"undoBin": "Вы можете выполнить восстановление из корзины.",
-+	"undoTrash": "Вы можете выполнить восстановление из корзины.",
-+	"doNotAskAgain": "Больше не спрашивать",
-+	"confirmDeleteMessageMultiple": "Вы действительно хотите удалить следующие файлы ({0}) без возможности восстановления?",
-+	"confirmDeleteMessageFolder": "Вы действительно хотите удалить папку \"{0}\" и ее содержимое без возможности восстановления?",
-+	"confirmDeleteMessageFile": "Вы действительно хотите удалить \"{0}\" без возможности восстановления?",
-+	"irreversible": "Это действие необратимо.",
-+	"binFailed": "Не удалось выполнить удаление в корзину. Вы хотите выполнить удаление навсегда?",
-+	"trashFailed": "Не удалось выполнить удаление в корзину. Вы действительно хотите выполнить удаление навсегда?",
-+	"deletePermanentlyButtonLabel": "&&Удалить навсегда",
-+	"retryButtonLabel": "&&Повторить",
-+	"importFiles": "Импорт файлов",
-+>>>>>>> .their
- 	"confirmOverwrite": "Файл или папка с таким именем уже существует в конечной папке. Заменить их?",
- 	"replaceButtonLabel": "Заменить",
- 	"fileIsAncestor": "Файл для вставки является предком папки назначения",
-changed in both
-  base   100644 7864917b59e67851283f9fd7cd4150a5422d8609 i18n/rus/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 8abc8c89790838ab546398086d2a394a5956c230 i18n/rus/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 a3b99e05192c71247d9da5fe5907b77363882f27 i18n/rus/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-@@ -35,7 +35,11 @@
- 	"hotExit": "Определяет, запоминаются ли несохраненные файлы между сеансами. В этом случае приглашение на их сохранение при выходе из редактора не появляется.",
- 	"useExperimentalFileWatcher": "Использовать новое экспериментальное средство наблюдения за файлами.",
- 	"defaultLanguage": "Режим языка по умолчанию, который назначается новым файлам.",
-+<<<<<<< .our
- 	"maxMemoryForLargeFilesMB": "Управляет объемом памяти, который доступен VS Code после перезапуска при попытке открытия больших файлов. Действие этого параметра аналогично указанию параметра --max-memory=<новый размер> в командной строке.",
-+=======
-+	"maxMemoryForLargeFilesMB": "Новое ограничение памяти в МБ, которое будет использоваться приложением при повторном запуске для открытия больших файлов. Если вы хотите запустить приложение с увеличенным ограничением, укажите параметр командной строки --max-memory=<новый_размер>.",
-+>>>>>>> .their
- 	"editorConfigurationTitle": "Редактор",
- 	"formatOnSave": "Форматирование файла при сохранении. Модуль форматирования должен быть доступен, файл не должен сохраняться автоматически, а работа редактора не должна завершаться.",
- 	"formatOnSaveTimeout": "Время ожидания форматирования при сохранении. Указывает ограничение времени в миллисекундах для команд форматирования при сохранении. Команды, выполнение которых превышает указанное время ожидания, будут отменены.",
-changed in both
-  base   100644 4d9d86ce6f117ae7f1dc0f5678f7144f34e1387d i18n/rus/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  our    100644 b30660862fb648d55c4895c7ccb26b222d765662 i18n/rus/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  their  100644 bb8f54980755c146178759e5030aed98363acac8 i18n/rus/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-changed in both
-  base   100644 fdff5585e456b298575722bed325c9323f63536e i18n/rus/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-  our    100644 a63d40973586dbf4b8e760b8f38c33a93f46bbeb i18n/rus/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-  their  100644 8fed9fa0086548854b37fd37081944d8103765c9 i18n/rus/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-changed in both
-  base   100644 939ceca5ae7bdb06caaa032d8772f35812bf891d i18n/rus/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-  our    100644 0d3a91c0c6538b744fa4b164a7696d4ba4988350 i18n/rus/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-  their  100644 36314a7275b13f3995f4769e593339f47534ecb2 i18n/rus/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-changed in both
-  base   100644 1199d8b14270b7d9ab9a272476547db92b838ffb i18n/rus/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  our    100644 b1ff2f3c4a2f645fbb9eec41aa8aaf1e9cdae2c6 i18n/rus/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  their  100644 880aeb124f1e44139aaf81898bbe3d8c9129c0a9 i18n/rus/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
-+=======
-+	"keybindingsInputName": "Сочетания клавиш",
-+>>>>>>> .their
- 	"showDefaultKeybindings": "Показать сочетания клавиш по умолчанию",
- 	"showUserKeybindings": "Показать пользовательские сочетания клавиш",
- 	"SearchKeybindings.AriaLabel": "Поиск настраиваемых сочетаний клавиш",
-changed in both
-  base   100644 a577a42bfc06b74a3ad80f3c45afa655d0585390 i18n/rus/src/vs/workbench/parts/search/browser/searchView.i18n.json
-  our    100644 b197ab3521e49957a9edec72b674203f6268c391 i18n/rus/src/vs/workbench/parts/search/browser/searchView.i18n.json
-  their  100644 54b823f7a407bead82df751285a4aab57b17e911 i18n/rus/src/vs/workbench/parts/search/browser/searchView.i18n.json
-@@ -7,10 +7,16 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"moreSearch": "Переключить сведения о поиске",
-+<<<<<<< .our
- 	"searchScope.includes": "включаемые файлы",
- 	"label.includes": "Шаблоны включения в поиск",
- 	"searchScope.excludes": "исключаемые файлы",
- 	"label.excludes": "Шаблоны исключения из поиска",
-+=======
-+	"searchIncludeExclude.label": "файлы для включения/исключения",
-+	"searchIncludeExclude.ariaLabel": "Шаблоны включения в поиск/шаблоны исключения из поиска",
-+	"searchIncludeExclude.placeholder": "Примеры: src, !*.ts, test/**/*.log",
-+>>>>>>> .their
- 	"replaceAll.confirmation.title": "Заменить все",
- 	"replaceAll.confirm.button": "Заменить",
- 	"replaceAll.occurrence.file.message": "Вхождение {0} заменено в {1} файле на \"{2}\".",
-changed in both
-  base   100644 e2928ed26bf6d66b7dccddc5f9f66a9ae4873de5 i18n/rus/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 5406c69914aaafdfca9d082f48774213cbbbd661 i18n/rus/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 f9fa20a44cffa49c8d8462d0b51d765f88977d2b i18n/rus/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-@@ -28,7 +28,10 @@
- 	"JsonSchema.tasks.group.none": "Отменяет связь задачи со всеми группами",
- 	"JsonSchema.tasks.group": "Определяет, к какой группе выполнения принадлежит эта задача. Поддерживаемые значения: \"build\" для добавления задачи к группе сборки и \"test\" для добавления задачи к группе тестирования.",
- 	"JsonSchema.tasks.type": "Определяет, выполняется ли задача в виде процесса или в виде команды оболочки.",
-+<<<<<<< .our
- 	"JsonSchema.commandArray": "Команда оболочки, которая будет выполнена. Элементы массива будут объединены с помощью пробела",
-+=======
-+>>>>>>> .their
- 	"JsonSchema.command.quotedString.value": "Фактическое значение команды",
- 	"JsonSchema.tasks.quoting.escape": "Экранирует символы с помощью escape-символа оболочки (например, \"`\" в PowerShell и\"\\\" в bash).",
- 	"JsonSchema.tasks.quoting.strong": "Заключает аргумент в кавычки с использованием символа двойной кавычки (например, \" в PowerShell и bash).",
-changed in both
-  base   100644 9699d3ddc6b9dd00aaadd4deb611ac3cf2b13a10 i18n/rus/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 3ad2e6ca5f31ca94a9cdd8a18a046b2a9773636b i18n/rus/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 ddd5e270ba0e6d69665ab666862ec2e61c4bf9d7 i18n/rus/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-changed in both
-  base   100644 17bf9786dc448c39271715a4cc7d617c1a4d1e3a i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 ea0d455fc7f4fc786ef2ef083f3b437a535a441a i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 f6166c1ddc512eafba88430dad7a738aecad58b5 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -54,10 +54,17 @@
- 	"nextTerminalFindTerm": "Показать следующий найденный термин",
- 	"previousTerminalFindTerm": "Показать предыдущий найденный термин",
- 	"quickOpenTerm": "Переключить активный терминал",
-+<<<<<<< .our
- 	"workbench.action.terminal.scrollToPreviousCommand": "Перейти к предыдущей команде",
- 	"workbench.action.terminal.scrollToNextCommand": "Перейти к следующей команде",
- 	"workbench.action.terminal.selectToPreviousCommand": "Выбрать предыдущую команду",
- 	"workbench.action.terminal.selectToNextCommand": "Выбрать следующую команду",
- 	"workbench.action.terminal.selectToPreviousLine": "Выделить текст до предыдущей строки",
- 	"workbench.action.terminal.selectToNextLine": "Выделить текст до следующей строки"
-+=======
-+	"workbench.action.terminal.focusPreviousCommand": "Перевести выделение на предыдущую команду",
-+	"workbench.action.terminal.focusNextCommand": "Перевести выделение на следующую команду",
-+	"workbench.action.terminal.selectToPreviousCommand": "Выбрать предыдущую команду",
-+	"workbench.action.terminal.selectToNextCommand": "Выбрать следующую команду"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/rus/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
-  our    100644 200628838fe6c979a9c673cd18449cbf74f5ffff i18n/rus/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
-  their  100644 0f286692f335d565e60086641469d369ee462360 i18n/rus/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
-@@ -6,5 +6,20 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"stringsOnlySupported": "Команда {0} не возвратила строку. Команды, используемые для замены переменных, могут возвращать только строковые значения."
-+=======
-+	"canNotResolveWorkspaceFolderMultiRoot": "Не удалось разрешить папку ${workspaceFolder} в рабочей области с несколькими папками. Укажите область действия этих переменных с помощью : и имени папки.",
-+	"canNotResolveWorkspaceFolder": "Не удалось разрешить папку ${workspaceFolder}. Откройте папку.",
-+	"canNotResolveFolderBasenameMultiRoot": "Не удалось разрешить папку ${workspaceFolderBasename} в рабочей области с несколькими папками. Укажите область действия этих переменных с помощью : и имени папки.",
-+	"canNotResolveFolderBasename": "Не удалось разрешить папку ${workspaceFolderBasename}. Откройте папку. ",
-+	"canNotResolveLineNumber": "Не удалось разрешить ${lineNumber}, откройте редактор.",
-+	"canNotResolveSelectedText": "Не удалось разрешить ${selectedText}, откройте редактор. ",
-+	"canNotResolveFile": "Не удалось разрешить ${file}, откройте редактор. ",
-+	"canNotResolveRelativeFile": "Не удалось разрешить ${relativeFile}, откройте редактор. ",
-+	"canNotResolveFileDirname": "Не удалось разрешить ${fileDirname}, откройте редактор.",
-+	"canNotResolveFileExtname": "Не удалось разрешить ${fileExtname}, откройте редактор. ",
-+	"canNotResolveFileBasename": "Не удалось разрешить ${fileBasename}, откройте редактор. ",
-+	"canNotResolveFileBasenameNoExtension": "Не удалось разрешить ${fileBasenameNoExtension}, откройте редактор. "
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c3b0dd46f650f3e1a0c724beb8df4b6e23028d8c i18n/rus/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-  our    100644 8ebd66bbd8687e5622cde77b9ebb281a304ed8a9 i18n/rus/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-  their  100644 173f67e6d892f26ecea2ea43c9fa375de397ed74 i18n/rus/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-@@ -11,6 +11,7 @@
- 	"neverShowAgain": "Больше не показывать",
- 	"enospcError": "{0} не удалось проследить изменения файлов в этой большой рабочей области. Для решения проблемы воспользуйтесь ссылкой на инструкции.",
- 	"learnMore": "Инструкции",
-+<<<<<<< .our
- 	"fileInvalidPath": "Недопустимый ресурс файла ({0})",
- 	"fileIsDirectoryError": "Файл является каталогом",
- 	"fileNotModifiedError": "undefined",
-@@ -24,6 +25,9 @@
- 	"fileReadOnlyError": "Файл доступен только для чтения",
- 	"fileMoveConflict": "Невозможно переместить или скопировать файл, так как он уже существует в папке назначения.",
- 	"unableToMoveCopyError": "Невозможно переместить или скопировать файл, так как он заменил бы папку, в которой содержится.",
-+=======
-+	"enospcError": "{0} не удалось проследить изменения файлов в этой большой рабочей области. Для решения проблемы воспользуйтесь ссылкой на инструкции.",
-+>>>>>>> .their
- 	"binFailed": "Не удалось переместить \"{0}\" в корзину",
- 	"trashFailed": "Не удалось переместить \"{0}\" в корзину."
- }
-\ No newline at end of file
-merged
-  result 100644 86f192a493a383aa90741d72244bef4252ea8970 i18n/rus/src/vs/workbench/services/files/node/fileService.i18n.json
-  our    100644 10de0847f46ee9702ad03a0d05b0874fadaa8148 i18n/rus/src/vs/workbench/services/files/node/fileService.i18n.json
-@@ -9,6 +9,7 @@
- 	"fileInvalidPath": "Недопустимый ресурс файла ({0})",
- 	"fileIsDirectoryError": "Файл является каталогом",
- 	"fileNotModifiedError": "undefined",
-+	"fileTooLargeForHeapError": "Размер файла превышает ограничение памяти по умолчанию. Выполните запуск повторно, увеличив ограничение. Текущее значение для перезапуска: {0} МБ",
- 	"fileTooLargeError": "Не удается открыть файл, так как он имеет слишком большой размер",
- 	"fileNotFoundError": "Файл не найден ({0})",
- 	"fileBinaryError": "Похоже, файл является двоичным, и его нельзя открыть как текстовый.",
-changed in both
-  base   100644 f11753f30764fff6c90676a7afe9bcc0d694c623 i18n/trk/extensions/emmet/package.i18n.json
-  our    100644 da0ca75d8cf264d2aa273bacfc4c88c0e06fd83f i18n/trk/extensions/emmet/package.i18n.json
-  their  100644 77b4fde3dc21e0b29244d75fb5dde5dd3eb2ec20 i18n/trk/extensions/emmet/package.i18n.json
-@@ -60,6 +60,10 @@
- 	"emmetPreferencesCssMozProperties": "`-` ile başlayan Emmet kısaltmasında kullanıldığında 'moz' önekini alacak virgülle ayrılmış CSS özellikleri. 'moz' önekinden her zaman kaçınmak için boş bir dize olarak ayarlayın.",
- 	"emmetPreferencesCssOProperties": "`-` ile başlayan Emmet kısaltmasında kullanıldığında 'o' önekini alacak virgülle ayrılmış CSS özellikleri. 'o' önekinden her zaman kaçınmak için boş bir dize olarak ayarlayın.",
- 	"emmetPreferencesCssMsProperties": "`-` ile başlayan Emmet kısaltmasında kullanıldığında 'ms' önekini alacak virgülle ayrılmış CSS özellikleri. 'ms' önekinden her zaman kaçınmak için boş bir dize olarak ayarlayın.",
-+<<<<<<< .our
- 	"emmetPreferencesCssFuzzySearchMinScore": "Bulanık eşleştirilmiş kısaltmaların elde etmesi gereken minimum puan (0'dan 1'e kadar). Düşük değerler birçok yanlış pozitif eşleşme oluşturabilir, daha yüksek değerler olası eşleşmeleri azaltabilir.",
- 	"emmetOptimizeStylesheetParsing": "\"false\" değeri atandığında, Emmet kısaltmalarının genişletilmesinde o anki konumun geçerli olup olmadığını belirlemek için tüm dosya ayrıştırılır. \"true\" değeri atandığında, css/scss/less dosyalarında sadece o anki konumun çevresi ayrıştırılır."
-+=======
-+	"emmetPreferencesCssFuzzySearchMinScore": "Bulanık eşleştirilmiş kısaltmaların elde etmesi gereken minimum puan (0'dan 1'e kadar). Düşük değerler birçok yanlış pozitif eşleşme oluşturabilir, daha yüksek değerler olası eşleşmeleri azaltabilir."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 1feaf1cddafc6bf966211601c60d4bfd5f651953 i18n/trk/extensions/git/out/commands.i18n.json
-  our    100644 6794dc4934caa0927c5d65dc1f742c2cefd9cd5b i18n/trk/extensions/git/out/commands.i18n.json
-  their  100644 2883a4dafdfc0588fd491bce29c9e6651c5f3b86 i18n/trk/extensions/git/out/commands.i18n.json
-changed in both
-  base   100644 5b6a365ee4b8e9da027c5354a1046d002ee92ee1 i18n/trk/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-  our    100644 3c92c8ee5f97958caa95c84da374aba6a8cf8c6c i18n/trk/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-  their  100644 3f0ddf6290c956308cc40953ce44bb8f0e80b74c i18n/trk/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-@@ -13,12 +13,18 @@
- 	"vscode.extension.contributes.view.name": "Görünümün insanlar tarafından okunabilir adı. Gösterilecektir",
- 	"vscode.extension.contributes.view.when": "Bu görünümü göstermek için doğru olması gereken koşul",
- 	"vscode.extension.contributes.views": "Görünümleri düzenleyiciye ekler.",
-+<<<<<<< .our
- 	"views.explorer": "Etkinlik Çubuğu'ndaki Gezgin kapsayıcısına görünümler ekler",
- 	"views.debug": "Etkinlik Çubuğu'ndaki Hata Ayıklama kapsayıcısına görünümler ekler",
- 	"views.scm": "Etkinlik Çubuğu'ndaki SCM kapsayıcısına görünümler ekler",
- 	"views.test": "Etkinlik Çubuğu'ndaki Test kapsayıcısına görünümler ekler",
- 	"views.contributed": "Görünümleri katkıda bulunan görünümü kapsayıcısına ekler",
- 	"ViewContainerDoesnotExist": "'{0}' görünüm kapsayıcısı mevcut değil ve ona kayıtlı tüm görünümler 'Explorer'a eklenecektir.",
-+=======
-+	"views.explorer": "Gezgin Görünümü",
-+	"views.debug": "Hata Ayıklama Görünümü",
-+	"locationId.invalid": "`{0}` geçerli bir görünüm konumu değil",
-+>>>>>>> .their
- 	"duplicateView1": "`{1}` konumunda aynı `{0}` id'sine sahip birden çok görünüm kaydedilemiyor",
- 	"duplicateView2": "`{0}` id'sine sahip bir görünüm `{1}` konumunda zaten kayıtlı"
- }
-\ No newline at end of file
-changed in both
-  base   100644 77c86b9a0b6fd5f4a64202e57288a1dc0a2b2acd i18n/trk/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  our    100644 15d5c003a775612763a5b3ad8b2eef344c75ffe7 i18n/trk/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 3f98c05062b027de5b21673a2b3cf2e88ae0e887 i18n/trk/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -7,7 +7,10 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"timeout.formatOnSave": "Kaydederken biçimlendirme {0}ms sonrasında durduruldu",
-+<<<<<<< .our
- 	"codeActionsOnSave.didTimeout": "{0}ms sonra codeActionsOnSave durduruldu",
-+=======
-+>>>>>>> .their
- 	"timeout.onWillSave": "onWillSaveTextDocument olayı 1750ms sonrasında durduruldu",
- 	"saveParticipants": "Katılımcıların Kaydedilmesi İşlemi Çalıştırılıyor..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 d89fb0f61b9af087911f42dbe9af5031b1706863 i18n/trk/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-  our    100644 6c864a500a2e9ea8cb75f88adec6bb872395d1ad i18n/trk/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-  their  100644 cee6d95273312e5887a2b190dfcac9359013a510 i18n/trk/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-changed in both
-  base   100644 8653d80860553804e899422db274f9df9afeb3af i18n/trk/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 6083c93c0aa8c7594afe0d6fb609d69d65163ece i18n/trk/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 f55bdf21090117f6fa467ccef7c2c8654b178635 i18n/trk/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -80,7 +80,10 @@
- 	"titleBarStyle": "Pencere başlık çubuğunun görünümünü ayarlayın. Değişikliklerin uygulanması için tam yeniden başlatma gerekir.",
- 	"window.nativeTabs": "macOS Sierra pencere sekmelerini etkinleştirir. Değişikliklerin uygulanması için tam yeniden başlatma gerekeceğini ve yerel sekmelerin, eğer yapılandırılmışsa özel başlık çubuğu stilini devre dışı bıracağını unutmayın.",
- 	"window.smoothScrollingWorkaround": "Simge durumuna küçültülmüş bir VS Code penceresini tekrar açtıktan sonra kaydırma artık pürüzsüz değilse bu geçici çözümü etkinleştirin. Bu, Microsoft'un Surface cihazları gibi hassas trackpad'ler içeren cihazlarda yaşanan kaydırma gecikmesi sorunu (https://github.com/Microsoft/vscode/issues/13612) için geçici bir çözümdür.",
-+<<<<<<< .our
- 	"window.clickThroughInactive": "Etkinleştirilirse, aktif olmayan bir pencereye tıklandığında hem pencere etkinleştirilir hem de farenin üzerinde bulunduğu öge tıklanabilir durumdaysa tetiklenir. Devre dışı bırakılırsa, aktif olmayan bir pencerenin herhangi bir yerine tıklandığında sadece o pencere etkinleştirilir ve öge için ikinci bir tıklama gerekir.",
-+=======
-+>>>>>>> .their
- 	"zenModeConfigurationTitle": "Zen Modu",
- 	"zenMode.fullScreen": "Zen Moduna geçmenin ayrıca çalışma ekranını tam ekran moduna geçirip geçirmeyeceğini denetler.",
- 	"zenMode.centerLayout": "Zen Modu'nun aktif edilmesinin düzeni ortalayıp ortalamayacağını denetler.",
-changed in both
-  base   100644 7be66e01426021a5160b8a5a230b2e7cef43f292 i18n/trk/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  our    100644 896aab5629dfd63cb9a0130680b00a270e20d698 i18n/trk/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  their  100644 c438c7f7afd0510ed3a14ab79e7b1ad93932023f i18n/trk/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-changed in both
-  base   100644 b06dcece7970e5f93643b0c98ee5e22f13c8596b i18n/trk/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  our    100644 107e35dc98e2f8d34301dcb1130ff0c16bcd647a i18n/trk/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  their  100644 015958ac4d95d5039782fefad41f0765ea87f465 i18n/trk/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-changed in both
-  base   100644 30a355a88d6b9624da4912089b9bc74fa52dc908 i18n/trk/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-  our    100644 6f0d63fe4b5bb187b96181ade2b24b157cf44df2 i18n/trk/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-  their  100644 3b918e4989aac60dcdeb4a4731e975423cd91137 i18n/trk/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-@@ -6,9 +6,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"breakpointWidgetLogMessagePlaceholder": "Bu kesme noktası isabet aldığında günlüğe kaydedilecek mesaj. {} arasındaki ifadeler hesaplanmaktadır. Kabul etmek için 'Enter', iptal etmek için 'Esc' tuşuna basın.",
- 	"breakpointWidgetHitCountPlaceholder": "İsabet sayısı koşulu sağlandığında mola ver. Kabul etmek için 'Enter', iptal etmek için 'Esc' tuşuna basın.",
- 	"breakpointWidgetExpressionPlaceholder": "İfade değerlendirmesi doğru olduğunda mola ver. Kabul etmek için 'Enter', iptal etmek için 'Esc' tuşuna basın.",
-+=======
-+	"breakpointWidgetLogMessagePlaceholder": "Bu kesme noktası isabet aldığında günlüğe kaydedilecek mesaj. Kabul etmek için 'Enter', iptal etmek için 'Esc' tuşuna basın.",
-+	"breakpointWidgetHitCountPlaceholder": "İsabet sayısı koşulu sağlandığında mola ver. Kabul etmek için 'Enter', iptal etmek için 'Esc' tuşuna basın.",
-+	"breakpointWidgetExpressionPlaceholder": "İfade değerlendirmesi doğru olduğunda mola ver. Kabul etmek için 'Enter', iptal etmek için 'Esc' tuşuna basın.",
-+	"breakpointWidgetLogMessageAriaLabel": "Program, bu kesme noktası her isabet aldığında bu mesajı günlüğe kaydeder. Kabul etmek için Enter veya iptal etmek için Escape tuşuna basın. ",
-+	"breakpointWidgetHitCountAriaLabel": "Program, burada sadece isabet sayısı koşulu sağlandığında durur. Kabul etmek için Enter veya iptal etmek için Escape tuşuna basın. ",
-+	"breakpointWidgetAriaLabel": "Program, burada sadece bu koşul doğruysa durur. Kabul etmek için Enter veya iptal etmek için Escape tuşuna basın. ",
-+>>>>>>> .their
- 	"expression": "İfade",
- 	"hitCount": "İsabet Sayısı",
- 	"logMessage": "Günlük Mesajı"
-changed in both
-  base   100644 05751eef2fec6e6705de53fed6db9b7799151e85 i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  our    100644 37a431b186d01be99b6dc3686372e88732c818a6 i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  their  100644 9cad87a5651eda710bf3bf64aa3d74e6eb72f48a i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-@@ -23,6 +23,7 @@
- 	"disableBreakpointOnLine": "Satır Kesme Noktasını Devre Dışı Bırak",
- 	"enableBreakpointOnLine": "Satır Kesme Noktasını Etkinleştir",
- 	"addBreakpoint": "Kesme Noktası Ekle",
-+<<<<<<< .our
- 	"addConditionalBreakpoint": "Koşullu Kesme Noktası Ekle...",
- 	"addLogPoint": "Günlük Noktası Ekle...",
- 	"breakpointHasCondition": "Bu {0}, kaldırıldığında kaybolacak bir {1}'e sahip. Bunun yerine {0}'i kaldırmayı düşünün.",
-@@ -31,5 +32,9 @@
- 	"removeLogPoint": "Kaldır: {0}",
- 	"disableLogPoint": "Devre Dışı Bırak: {0}",
- 	"cancel": "İptal",
-+=======
-+	"conditionalBreakpoint": "Koşullu Kesme Noktası Ekle...",
-+	"addLogPoint": "Günlük Noktası Ekle...",
-+>>>>>>> .their
- 	"addConfiguration": "Yapılandırma Ekle..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 e72bf6372568811c4301ae015d114cb2ba222f56 i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  our    100644 5f574d5497b61ce924ac083a103d74a4034fdba1 i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  their  100644 6a78b248854f055049506773a66687ae15b0ceb7 i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-changed in both
-  base   100644 8a7b64b5ad3c19de14de3337b8585b2214969ebb i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  our    100644 059c3d6e6d6383142d7fde26f88119e50f546ac9 i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  their  100644 5ba84848f1c4efc755e522a44f901f755bdf33d4 i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-@@ -14,7 +14,11 @@
- 	"workspaceRecommendedExtensions": "Çalışma Alanı Tavsiyeleri",
- 	"builtInExtensions": "Özellikler",
- 	"builtInThemesExtensions": "Temalar",
-+<<<<<<< .our
- 	"builtInBasicsExtensions": "Programlama Dilleri",
-+=======
-+	"builtInBasicsExtensions": "Diller",
-+>>>>>>> .their
- 	"searchExtensions": "Markette Eklenti Ara",
- 	"sort by installs": "Sırala: Yüklenme Sayısına Göre",
- 	"sort by rating": "Sırala: Derecelendirmeye Göre",
-changed in both
-  base   100644 fa6e1617b0ff2a883a8a79e2907a2f355a965370 i18n/trk/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-  our    100644 9c34b1e8cf050e2fc1ad69cb2f623440043e1559 i18n/trk/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-  their  100644 17a58aa6da85312f8cf707c30664bfb696b84d51 i18n/trk/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-@@ -8,8 +8,13 @@
- 	],
- 	"textFileEditor": "Metin Dosyası Düzenleyicisi",
- 	"createFile": "Dosya Oluştur",
-+<<<<<<< .our
- 	"relaunchWithIncreasedMemoryLimit": "{0} MB ile Yeniden Başlat",
- 	"configureMemoryLimit": "Bellek Sınırını Yapılandır",
-+=======
-+	"relaunchWithIncreasedMemoryLimit": "Yeniden Başlat",
-+	"configureMemoryLimit": "Yapılandır",
-+>>>>>>> .their
- 	"fileEditorWithInputAriaLabel": "{0}. Metin dosyası düzenleyici.",
- 	"fileEditorAriaLabel": "Metin dosyası düzenleyici."
- }
-\ No newline at end of file
-changed in both
-  base   100644 e0b425c8efd0d9293085fdc659e96a640f379af1 i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 43e3bf4348f9b7a25892a993e8f5dd85c62e9798 i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 e8af3942e6572366afd03e01c33049b4648d42f8 i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -37,6 +37,7 @@
- 	"confirmMoveTrashMessageMultipleDirectories": "Aşağıdaki {0} dizini ve içindekileri silmek istediğinizden emin misiniz?",
- 	"confirmMoveTrashMessageMultiple": "Aşağıdaki {0} dosyayı silmek istediğinizden emin misiniz?",
- 	"confirmMoveTrashMessageFolder": "'{0}' ve içindekileri silmek istediğinizden emin misiniz?",
-+<<<<<<< .our
- 	"confirmMoveTrashMessageFile": "'{0}' ögesini silmek istediğinizden emin misiniz?",
- 	"confirmDeleteMessageFilesAndDirectories": "Aşağıdaki {0} dosyayı/dizini ve içindekileri kalıcı olarak silmek istediğinizden emin misiniz?",
- 	"confirmDeleteMessageMultipleDirectories": "Aşağıdaki {0} dizini ve içindekileri kalıcı olarak silmek istediğinizden emin misiniz?",
-@@ -44,6 +45,21 @@
- 	"confirmDeleteMessageFolder": "'{0}' ögesini ve içindekileri kalıcı olarak silmek istediğinizden emin misiniz?",
- 	"confirmDeleteMessageFile": "'{0}' ögesini kalıcı olarak silmek istediğinizden emin misiniz?",
- 	"addFiles": "Dosya Ekle",
-+=======
-+	"confirmMoveTrashMessageFile": "'{0}' öğesini silmek istediğinize emin misiniz?",
-+	"undoBin": "Geri Dönüşüm Kutusu'ndan geri alabilirsiniz.",
-+	"undoTrash": "Çöp Kutusu'ndan geri alabilirsiniz.",
-+	"doNotAskAgain": "Bir daha sorma",
-+	"confirmDeleteMessageMultiple": "Aşağıdaki {0} dosyayı kalıcı olarak silmek istediğinizden emin misiniz?",
-+	"confirmDeleteMessageFolder": "'{0}' öğesini ve içindekileri kalıcı olarak silmek istediğinizden emin misiniz?",
-+	"confirmDeleteMessageFile": "'{0}' öğesini kalıcı olarak silmek istediğinizden emin misiniz?",
-+	"irreversible": "Bu eylem geri döndürülemez!",
-+	"binFailed": "Geri Dönüşüm Kutusu'nu kullanarak silme başarısız oldu. Bunun yerine, kalıcı olarak silmek ister misiniz?",
-+	"trashFailed": "Çöp Kutusu'nu kullanarak silme başarısız oldu. Bunun yerine, kalıcı olarak silmek ister misiniz?",
-+	"deletePermanentlyButtonLabel": "&&Kalıcı Olarak Sil",
-+	"retryButtonLabel": "&&Yeniden Dene",
-+	"importFiles": "Dosya İçe Aktar",
-+>>>>>>> .their
- 	"confirmOverwrite": "Hedef klasörde aynı ada sahip bir dosya veya klasör zaten var. Değiştirmek istiyor musunuz?",
- 	"replaceButtonLabel": "&&Değiştir",
- 	"fileIsAncestor": "Yapıştırılacak dosya hedef klasörün atalarından biridir",
-changed in both
-  base   100644 16f13358790f3f4cd720ef8bfbf2ffbe52522a92 i18n/trk/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 193fd22e9317327dfd29fb29331773d21ad13c21 i18n/trk/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 954f92a265a44220e4524edb8369049199a022e3 i18n/trk/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-@@ -35,7 +35,11 @@
- 	"hotExit": "Oturumlar arasında kaydedilmemiş dosyaların hatırlanıp hatırlanmayacağını denetler, düzenleyiciden çıkarken kaydetmek için izin istenmesi atlanacaktır.",
- 	"useExperimentalFileWatcher": "Yeni deneysel dosya izleyicisini kullanın.",
- 	"defaultLanguage": "Yeni dosyalara atanan varsayılan dil modu.",
-+<<<<<<< .our
- 	"maxMemoryForLargeFilesMB": "Büyük dosyaları açmaya çalışırken, yeniden başlatma sonrası VS Code için mevcut olacak bellek miktarını denetler. Komut satırında belirtilen --max-memory=YENİBOYUT ile aynı etkiyi gösterir.",
-+=======
-+	"maxMemoryForLargeFilesMB": "Büyük dosyaları yeniden açarken uygulama tarafından kullanılacak MB cinsinden yeni bellek limiti. Daha yüksek bir limitle başlamak isterseniz,  komut satırından uygulamayı --max-memory=YENİBOYUT ile başlatabilirsiniz.",
-+>>>>>>> .their
- 	"editorConfigurationTitle": "Düzenleyici",
- 	"formatOnSave": "Dosyayı kaydederken biçimlendir. Bir biçimlendirici mevcut olmalıdır, dosya otomatik olarak kaydedilmemelidir, ve düzenleyici kapanmıyor olmalıdır.",
- 	"formatOnSaveTimeout": "Dosyayı kaydederken biçimlendirme zaman aşımı. formatOnSave komutlarında kullanılacak milisaniye cinsinden zaman limiti. Belirtilen zaman aşımından daha uzun süren komutlar iptal edilecektir.",
-changed in both
-  base   100644 cc968719081125fecde6c97ad5bf06ec67e1613a i18n/trk/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  our    100644 af5f75f59c7096d8e4e8c3fde1587903c351b5b4 i18n/trk/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  their  100644 338a616735f97304c6bbe158776989f1dd5ba301 i18n/trk/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-changed in both
-  base   100644 7fe7d2ea049a93fd479fd1d422004524a76c3507 i18n/trk/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-  our    100644 ea26bcd9db30fb1fed539aa7a66264003ccf35e0 i18n/trk/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-  their  100644 867ad5576266703e20210a278e7ef4bbbccc0e0a i18n/trk/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-changed in both
-  base   100644 8910520ca78e8c1fc7a37371d5128094aaf4f337 i18n/trk/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-  our    100644 45e5f83680c26e10409cdc5068a3bbcee976704f i18n/trk/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-  their  100644 5f2cbbe7ebd1ac542aa81cb5a61a2db2fbe7529e i18n/trk/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-changed in both
-  base   100644 1cd086b7e3856e04bc3aaa8757a4518e7db3ba90 i18n/trk/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  our    100644 467358d0b9f19ad682f44b3acc88d8457329d682 i18n/trk/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  their  100644 44fd47bb134640be03ea79f2192caec7f77c270f i18n/trk/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
-+=======
-+	"keybindingsInputName": "Klavye Kısayolları",
-+>>>>>>> .their
- 	"showDefaultKeybindings": "Varsayılan Tuş Bağlarını Göster",
- 	"showUserKeybindings": "Kullanıcı Tuş Bağlarını Göster",
- 	"SearchKeybindings.AriaLabel": "Tuş bağlarını ara",
-changed in both
-  base   100644 cb483fdd910438c7a3e526dbec2c28594649e2af i18n/trk/src/vs/workbench/parts/search/browser/searchView.i18n.json
-  our    100644 fc38590cc3008cde13df29309821e754e11630d7 i18n/trk/src/vs/workbench/parts/search/browser/searchView.i18n.json
-  their  100644 21ebadacac71ed2b6b40ee08a678dc548be893bb i18n/trk/src/vs/workbench/parts/search/browser/searchView.i18n.json
-@@ -7,10 +7,16 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"moreSearch": "Arama Detaylarını Aç/Kapat",
-+<<<<<<< .our
- 	"searchScope.includes": "dahil edilecek dosyalar",
- 	"label.includes": "Aramaya Dahil Edilen Kalıplar",
- 	"searchScope.excludes": "hariç tutulacak klasörler",
- 	"label.excludes": "Aramada Hariç Tutulan Kalıplar",
-+=======
-+	"searchIncludeExclude.label": " dahil edilecek/hariç tutulacak dosyalar ",
-+	"searchIncludeExclude.ariaLabel": "Aramaya Dahil Edilen/Hariç Tutulan Kalıplar",
-+	"searchIncludeExclude.placeholder": "Örnekler: src, !*.ts, test/**/*.log",
-+>>>>>>> .their
- 	"replaceAll.confirmation.title": "Tümünü Değiştir",
- 	"replaceAll.confirm.button": "&&Değiştir",
- 	"replaceAll.occurrence.file.message": "{1} dosyadaki {0} tekrarlama '{2}' ile değiştirildi.",
-changed in both
-  base   100644 8a3fbfaad65dd717e9465db7bab67fe4e695f26c i18n/trk/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
-  our    100644 386f5eb3c841e670ce89c483b32c97ecbe3d511f i18n/trk/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
-  their  100644 02224d40eaff21323d7d2df513e3517e05f19687 i18n/trk/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
-changed in both
-  base   100644 5eeb3e4000b0766609ecc66df4bf8925f1a7c45e i18n/trk/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 05f7e742aff55adb4d6b203dba58bf230a657ea7 i18n/trk/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 2af5738ee5a5ff5b4e93b5071ebc5725ec92ef79 i18n/trk/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-changed in both
-  base   100644 fb23f3c189e1688d90db85a8e9432e7f2244c6ec i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 0dfa05cd7919b2b8edd950bcde47408dafdd57f0 i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 422914fecd37a8bff5e609fb0bc6f312b3d7f03d i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -54,10 +54,17 @@
- 	"nextTerminalFindTerm": "Sonraki Arama Terimini Göster",
- 	"previousTerminalFindTerm": "Önceki Arama Terimini Göster",
- 	"quickOpenTerm": "Aktif Terminali Değiştir",
-+<<<<<<< .our
- 	"workbench.action.terminal.scrollToPreviousCommand": "Önceki Komuta Kadar Kaydır",
- 	"workbench.action.terminal.scrollToNextCommand": "Sonraki Komuta Kadar Kaydır",
- 	"workbench.action.terminal.selectToPreviousCommand": "Önceki Komuta Kadar Seç",
- 	"workbench.action.terminal.selectToNextCommand": "Sonraki Komuta Kadar Seç",
- 	"workbench.action.terminal.selectToPreviousLine": "Önceki Satıra Kadar Seç",
- 	"workbench.action.terminal.selectToNextLine": "Sonraki Satıra Kadar Seç"
-+=======
-+	"workbench.action.terminal.focusPreviousCommand": "Önceki Komuta Odakla",
-+	"workbench.action.terminal.focusNextCommand": "Sonraki Komuta Odakla",
-+	"workbench.action.terminal.selectToPreviousCommand": "Önceki Komuta Kadar Seç",
-+	"workbench.action.terminal.selectToNextCommand": "Sonraki Komuta Kadar Seç"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/trk/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
-  our    100644 b0bba1118fb4b6dbafec8b76fd703c823ee8299d i18n/trk/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
-  their  100644 6fd1d3aac3edc9f672ffe824c7355cc4c8223a09 i18n/trk/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
-@@ -6,5 +6,20 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"stringsOnlySupported": "{0} komutu bir dize değeri döndürmedi. Değişken yer değiştirmesi için kullanılan komutların sonuçlarında sadece dizeler desteklenir."
-+=======
-+	"canNotResolveWorkspaceFolderMultiRoot": "Birden çok klasörlü çalışma alanında ${workspaceFolder} çözümlenemiyor. \":\" ve bir klasör adı kullanarak bu değişkenleri test edin.",
-+	"canNotResolveWorkspaceFolder": "${workspaceFolder} çözümlenemiyor. Lütfen bir klasör açın.",
-+	"canNotResolveFolderBasenameMultiRoot": "Birden çok klasörlü çalışma alanında ${workspaceFolderBasename} çözümlenemiyor. \":\" ve bir klasör adı kullanarak bu değişkenleri test edin.",
-+	"canNotResolveFolderBasename": "${workspaceFolderBasename} çözümlenemiyor. Lütfen bir klasör açın.",
-+	"canNotResolveLineNumber": "${lineNumber} çözümlenemiyor, lütfen bir düzenleyici açın.",
-+	"canNotResolveSelectedText": "${selectedText} çözümlenemiyor, lütfen bir düzenleyici açın.",
-+	"canNotResolveFile": "${file} çözümlenemiyor, lütfen bir düzenleyici açın.",
-+	"canNotResolveRelativeFile": "${relativeFile} çözümlenemiyor, lütfen bir düzenleyici açın.",
-+	"canNotResolveFileDirname": "${fileDirname} çözümlenemiyor, lütfen bir düzenleyici açın.",
-+	"canNotResolveFileExtname": "${fileExtname} çözümlenemiyor, lütfen bir düzenleyici açın.",
-+	"canNotResolveFileBasename": "${fileBasename} çözümlenemiyor, lütfen bir düzenleyici açın.",
-+	"canNotResolveFileBasenameNoExtension": "${fileBasenameNoExtension} çözümlenemiyor, lütfen bir düzenleyici açın."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 4d4a6d071a866ba010ed44c88a8a5e09e642402f i18n/trk/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-  our    100644 844478e0633a25883c08cf42ec5fe82e36e359ce i18n/trk/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-  their  100644 1f0b38555f6eaf87c9e87eeea8a5cb7336daa848 i18n/trk/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-@@ -11,6 +11,7 @@
- 	"neverShowAgain": "Tekrar Gösterme",
- 	"enospcError": "{0}, bu büyük çalışma alanındaki dosya değişikliklerini izleyemiyor. Bu sorunu çözmek için lütfen yönerge bağlantısını izleyin.",
- 	"learnMore": "Talimatlar",
-+<<<<<<< .our
- 	"fileInvalidPath": "Geçersiz dosya kaynağı ({0})",
- 	"fileIsDirectoryError": "Dosya bir dizindir",
- 	"fileNotModifiedError": "Dosya şu tarihten beri değiştirilmemiş:",
-@@ -24,6 +25,9 @@
- 	"fileReadOnlyError": "Dosya Salt Okunur",
- 	"fileMoveConflict": "Taşıma/kopyalama yapılamadı. Dosya, hedefte zaten mevcut.",
- 	"unableToMoveCopyError": "Taşıma/kopyalama yapılamadı. Dosya, içinde bulunduğu klasörü değiştiriyor.",
-+=======
-+	"enospcError": "{0}, bu büyük çalışma alanındaki dosya değişikliklerini izleyemiyor. Bu sorunu çözmek için lütfen yönerge bağlantısını izleyin.",
-+>>>>>>> .their
- 	"binFailed": "'{0}' geri dönüşüm kutusuna taşınamadı",
- 	"trashFailed": "'{0}' çöpe taşınamadı"
- }
-\ No newline at end of file
-merged
-  result 100644 fec69c048e45e13c2f1f728cd0c99cb9f1283063 i18n/trk/src/vs/workbench/services/files/node/fileService.i18n.json
-  our    100644 0032045d6c15d3a28e360ab657c8ecf99dcb85dd i18n/trk/src/vs/workbench/services/files/node/fileService.i18n.json
-@@ -9,6 +9,7 @@
- 	"fileInvalidPath": "Geçersiz dosya kaynağı ({0})",
- 	"fileIsDirectoryError": "Dosya bir dizindir",
- 	"fileNotModifiedError": "Dosya şu tarihten beri değiştirilmemiş:",
-+	"fileTooLargeForHeapError": "Dosya boyutu varsayılan bellek limitini aşıyor. Daha yüksek bir limitle yeniden başlatın. Şu anki ayar {0}MB ile yeniden başlatmaya yapılandırılmış",
- 	"fileTooLargeError": "Dosya, açmak için çok büyük",
- 	"fileNotFoundError": "Dosya bulunamadı ({0})",
- 	"fileBinaryError": "Dosya ikili olarak görünüyor ve metin olarak açılamıyor",
-changed in both
-  base   100644 df63c933295cc63acf9e5d785cfd90cffc955f88 i18n/trk/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
-  our    100644 41fb3455077e458ed30319d7ad69c1830105fa99 i18n/trk/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
-  their  100644 7c19d60efdecc0a25649f8c7b4721aa673ba80aa i18n/trk/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
-changed in both
-  base   100644 db98c8793dd0c9319efd5a26273986cd7c8afd0a package.json
-  our    100644 d0e982ce0b76c5b1b5eb02b673e459e47f3353a4 package.json
-  their  100644 2c0ad9351c1991d11d49328228033f6486751ca5 package.json
-@@ -1,7 +1,12 @@
- {
-   "name": "code-oss-dev",
-+<<<<<<< .our
-   "version": "1.27.0",
-   "distro": "a4155d9780fbbc94ead6cb3017dd0fc3806c57b8",
-+=======
-+  "version": "1.22.2",
-+  "distro": "ed36a29ddadc357cdceba6ff5e3e7d5e27893dee",
-+>>>>>>> .their
-   "author": {
-     "name": "Microsoft Corporation"
-   },
-changed in both
-  base   100644 041cf88e4d6f7647e57141925c76a4b0293db8e2 src/vs/editor/common/services/modelServiceImpl.ts
-  our    100644 1a1202dde3c4f6f0ea6c3ead333eb6957cfba556 src/vs/editor/common/services/modelServiceImpl.ts
-  their  100644 066b91472d60cf0c04af76e815ef4b4ed902238a src/vs/editor/common/services/modelServiceImpl.ts
-@@ -86,12 +86,18 @@
- 
- 		let ret = Range.lift(rawMarker);
- 
-+<<<<<<< .our
- 		if (rawMarker.severity === MarkerSeverity.Hint) {
- 			// * never render hints on multiple lines
- 			// * make enough space for three dots
- 			if (Range.spansMultipleLines(ret) || ret.endColumn - ret.startColumn < 2) {
- 				ret = ret.setEndPosition(ret.startLineNumber, ret.startColumn + 2);
- 			}
-+=======
-+		if (rawMarker.severity === MarkerSeverity.Hint && Range.spansMultipleLines(ret)) {
-+			// never render hints on multiple lines
-+			ret = ret.setEndPosition(ret.startLineNumber, ret.startColumn);
-+>>>>>>> .their
- 		}
- 
- 		ret = model.validateRange(ret);
-removed in local
-  base   100644 52f8d0c428ae0c2090a2c3d2668fe7ecffdca04f src/vs/editor/contrib/format/formatCommand.ts
-  their  100644 5b38129e3aef1298da6ebcd124489e252ca9dcdd src/vs/editor/contrib/format/formatCommand.ts
-removed in local
-  base   100644 048b9c35b690d074bb24a2249e63f3665e032bc7 src/vs/editor/contrib/format/test/formatCommand.test.ts
-  their  100644 0a9bbde45932ab9e9cd76e1dbb3c32d47bfa087a src/vs/editor/contrib/format/test/formatCommand.test.ts
-changed in both
-  base   100644 edf3327d480d215d050f9ac31c89f752729b30c8 src/vs/editor/contrib/referenceSearch/referencesWidget.ts
-  our    100644 da6bf29eb682cbe5a76c036b19302efcdf240f36 src/vs/editor/contrib/referenceSearch/referencesWidget.ts
-  their  100644 125595fb2494ff52a538105e6f72e036e7863c91 src/vs/editor/contrib/referenceSearch/referencesWidget.ts
-@@ -703,7 +703,11 @@
- 		this._preview.layout();
- 	}
- 
-+<<<<<<< .our
- 	public setSelection(selection: OneReference): Promise<any> {
-+=======
-+	public setSelection(selection: OneReference): TPromise<any> {
-+>>>>>>> .their
- 		return this._revealReference(selection, true).then(() => {
- 
- 			// show in tree
-@@ -774,7 +778,11 @@
- 		return undefined;
- 	}
- 
-+<<<<<<< .our
- 	private async _revealReference(reference: OneReference, revealParent: boolean): Promise<void> {
-+=======
-+	private async _revealReference(reference: OneReference, revealParent: boolean): TPromise<void> {
-+>>>>>>> .their
- 
- 		// Update widget header
- 		if (reference.uri.scheme !== Schemas.inMemory) {
-changed in both
-  base   100644 ac6b4972b71c1912f0f7f9ca807195efa14ce26c src/vs/platform/extensionManagement/node/extensionManagementService.ts
-  our    100644 fca1b8fcc1eedca233bd95ef59ad6d0d3904e895 src/vs/platform/extensionManagement/node/extensionManagementService.ts
-  their  100644 f13a2deb9636d52eb1ecbf9b3c11c5311487a8bc src/vs/platform/extensionManagement/node/extensionManagementService.ts
-@@ -384,8 +384,13 @@
- 	private extractAndInstall({ zipPath, id, metadata }: InstallableExtension): TPromise<ILocalExtension> {
- 		const tempPath = path.join(this.extensionsPath, `.${id}`);
- 		const extensionPath = path.join(this.extensionsPath, id);
-+<<<<<<< .our
- 		return pfs.rimraf(extensionPath)
- 			.then(() => this.extractAndRename(id, zipPath, tempPath, extensionPath), e => TPromise.wrapError(new ExtensionManagementError(nls.localize('errorDeleting', "Unable to delete the existing folder '{0}' while installing the extension '{1}'. Please delete the folder manually and try again", extensionPath, id), INSTALL_ERROR_DELETING)))
-+=======
-+		return this.extractAndRename(id, zipPath, tempPath, extensionPath)
-+			.then(null, error => this.isWindowsEPERMError(error) ? this.extract(id, zipPath, extensionPath) : TPromise.wrapError(error))
-+>>>>>>> .their
- 			.then(() => {
- 				this.logService.info('Installation completed.', id);
- 				return this.scanExtension(id, this.extensionsPath, LocalExtensionType.User);
-@@ -424,6 +429,7 @@
- 
- 	private rename(id: string, extractPath: string, renamePath: string, retryUntil: number): TPromise<void> {
- 		return pfs.rename(extractPath, renamePath)
-+<<<<<<< .our
- 			.then(null, error => {
- 				if (isWindows && error && error.code === 'EPERM' && Date.now() < retryUntil) {
- 					this.logService.info(`Failed renaming ${extractPath} to ${renamePath} with 'EPERM' error. Trying again...`);
-@@ -464,6 +470,17 @@
- 			}
- 		}
- 		return TPromise.as(null);
-+=======
-+			.then(null, error =>
-+				this.isWindowsEPERMError(error) && Date.now() < retryUntil
-+					? this.rename(id, extractPath, renamePath, retryUntil)
-+					: TPromise.wrapError(error)
-+			);
-+>>>>>>> .their
-+	}
-+
-+	private isWindowsEPERMError(error: any): boolean {
-+		return isWindows && error && error.code === 'EPERM';
- 	}
- 
- 	private rollback(extensions: IGalleryExtension[]): TPromise<void> {
-changed in both
-  base   100644 abc5a96d2076991b93d4960c521a95d2224279e6 src/vs/platform/telemetry/browser/errorTelemetry.ts
-  our    100644 ec06e2c07eef85a9dbde991083fba2510c62b26e src/vs/platform/telemetry/browser/errorTelemetry.ts
-  their  100644 3bab84d8bf7003077c2ef85a5d6d8c2b08b50ee5 src/vs/platform/telemetry/browser/errorTelemetry.ts
-@@ -166,7 +166,11 @@
- 					"${include}": [ "${ErrorEvent}" ]
- 				}
- 			*/
-+<<<<<<< .our
- 			this._telemetryService.publicLog('UnhandledError', error, true);
-+=======
-+			this._telemetryService.publicLog('UnhandledError', error);
-+>>>>>>> .their
- 		}
- 		this._buffer.length = 0;
- 	}
-changed in both
-  base   100644 2f713dd11afd838f175e65dda414663afeeee7e0 src/vs/platform/telemetry/common/telemetryService.ts
-  our    100644 72b7d8569304a3402360a8093d77957eb22d39c3 src/vs/platform/telemetry/common/telemetryService.ts
-  their  100644 992f3e36a96256df40864f40ac1337c8658e451f src/vs/platform/telemetry/common/telemetryService.ts
-@@ -140,10 +140,28 @@
- 				if (!result) {
- 					break;
- 				}
-+<<<<<<< .our
- 				// Anoynimize user file paths that do not need to be retained or cleaned up.
- 				if (!nodeModulesRegex.test(result[0]) && cleanUpIndexes.every(([x, y]) => result.index < x || result.index >= y)) {
- 					updatedStack = updatedStack.slice(0, result.index) + result[0].replace(/./g, 'a') + updatedStack.slice(fileRegex.lastIndex);
- 				}
-+=======
-+				cleanUpIndexes.push([result.index, regexp.lastIndex]);
-+			}
-+		}
-+
-+		const nodeModulesRegex = /^[\\\/]?(node_modules|node_modules\.asar)[\\\/]/;
-+		const fileRegex = /(file:\/\/)?([a-zA-Z]:(\\\\|\\|\/)|(\\\\|\\|\/))?([\w-\._]+(\\\\|\\|\/))+[\w-\._]*/g;
-+		let updatedStack = stack;
-+		while (true) {
-+			const result = fileRegex.exec(stack);
-+			if (!result) {
-+				break;
-+			}
-+			// Anoynimize user file paths that do not need to be retained or cleaned up.
-+			if (!nodeModulesRegex.test(result[0]) && cleanUpIndexes.every(([x, y]) => result.index < x || result.index >= y)) {
-+				updatedStack = updatedStack.slice(0, result.index) + result[0].replace(/./g, 'a') + updatedStack.slice(fileRegex.lastIndex);
-+>>>>>>> .their
- 			}
- 		}
- 
-changed in both
-  base   100644 d3062bc7ff2c02a0fd4175e101d8494c5dd6d71a src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts
-  our    100644 8cd91f0803bf07a93c03212bd1183b3d09b5419f src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts
-  their  100644 d0b935f401d53add6e492edc9d1ebe3bbae525b0 src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts
-@@ -457,6 +457,7 @@
- 		assert.equal(testAppender.events[0].data.callstack.indexOf(settings.filePrefix), -1);
- 		assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.stack[4].replace(settings.randomUserFile, settings.anonymizedRandomUserFile)), -1);
- 		assert.equal(testAppender.events[0].data.callstack.split('\n').length, settings.stack.length);
-+<<<<<<< .our
- 
- 		errorTelemetry.dispose();
- 		service.dispose();
-@@ -512,11 +513,71 @@
- 		assert.notEqual(testAppender.events[0].data.callstack.indexOf('(' + settings.nodeModulePathToRetain), -1);
- 		assert.notEqual(testAppender.events[0].data.callstack.indexOf('(/' + settings.nodeModuleAsarPathToRetain), -1);
- 		assert.notEqual(testAppender.events[0].data.callstack.indexOf('(/' + settings.nodeModulePathToRetain), -1);
-+=======
-+>>>>>>> .their
- 
- 		errorTelemetry.dispose();
- 		service.dispose();
- 	}));
- 
-+<<<<<<< .our
-+=======
-+	test('Unexpected Error Telemetry removes PII but preserves Code file path with node modules', sinon.test(function (this: any) {
-+
-+		let origErrorHandler = Errors.errorHandler.getUnexpectedErrorHandler();
-+		Errors.setUnexpectedErrorHandler(() => { });
-+
-+		try {
-+			let settings = new ErrorTestingSettings();
-+			let testAppender = new TestTelemetryAppender();
-+			let service = new TelemetryService({ appender: testAppender }, undefined);
-+			const errorTelemetry = new ErrorTelemetry(service);
-+
-+			let dangerousPathWithImportantInfoError: any = new Error(settings.dangerousPathWithImportantInfo);
-+			dangerousPathWithImportantInfoError.stack = settings.stack;
-+
-+
-+			Errors.onUnexpectedError(dangerousPathWithImportantInfoError);
-+			this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
-+
-+			assert.notEqual(testAppender.events[0].data.callstack.indexOf('(' + settings.nodeModuleAsarPathToRetain), -1);
-+			assert.notEqual(testAppender.events[0].data.callstack.indexOf('(' + settings.nodeModulePathToRetain), -1);
-+			assert.notEqual(testAppender.events[0].data.callstack.indexOf('(/' + settings.nodeModuleAsarPathToRetain), -1);
-+			assert.notEqual(testAppender.events[0].data.callstack.indexOf('(/' + settings.nodeModulePathToRetain), -1);
-+
-+			errorTelemetry.dispose();
-+			service.dispose();
-+		}
-+		finally {
-+			Errors.setUnexpectedErrorHandler(origErrorHandler);
-+		}
-+	}));
-+
-+	test('Uncaught Error Telemetry removes PII but preserves Code file path', sinon.test(function (this: any) {
-+		let errorStub = sinon.stub();
-+		window.onerror = errorStub;
-+		let settings = new ErrorTestingSettings();
-+		let testAppender = new TestTelemetryAppender();
-+		let service = new TelemetryService({ appender: testAppender }, undefined);
-+		const errorTelemetry = new ErrorTelemetry(service);
-+
-+		let dangerousPathWithImportantInfoError: any = new Error('dangerousPathWithImportantInfo');
-+		dangerousPathWithImportantInfoError.stack = settings.stack;
-+		(<any>window.onerror)(settings.dangerousPathWithImportantInfo, 'test.js', 2, 42, dangerousPathWithImportantInfoError);
-+		this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
-+
-+		assert.equal(errorStub.callCount, 1);
-+
-+		assert.notEqual(testAppender.events[0].data.callstack.indexOf('(' + settings.nodeModuleAsarPathToRetain), -1);
-+		assert.notEqual(testAppender.events[0].data.callstack.indexOf('(' + settings.nodeModulePathToRetain), -1);
-+		assert.notEqual(testAppender.events[0].data.callstack.indexOf('(/' + settings.nodeModuleAsarPathToRetain), -1);
-+		assert.notEqual(testAppender.events[0].data.callstack.indexOf('(/' + settings.nodeModulePathToRetain), -1);
-+
-+		errorTelemetry.dispose();
-+		service.dispose();
-+	}));
-+
-+>>>>>>> .their
- 
- 	test('Unexpected Error Telemetry removes PII but preserves Code file path when PIIPath is configured', sinon.test(function (this: any) {
- 
-changed in both
-  base   100644 243d44f73e58a39a5133ab03a258fa9481712ad5 src/vs/vscode.d.ts
-  our    100644 6000b0300db361418bc31c0585263a9d663705f5 src/vs/vscode.d.ts
-  their  100644 c841a93202a9204f7a19cf908489941bec7bd2d7 src/vs/vscode.d.ts
-changed in both
-  base   100644 b9d2e6ba55d49b8cb69bcf701480311fb4cb9860 src/vs/workbench/api/node/extHostApiCommands.ts
-  our    100644 46087963ddabb1b6d766fe142aef0e6cd0b577a2 src/vs/workbench/api/node/extHostApiCommands.ts
-  their  100644 75176b1ad5e54151a76f38a0c6f1ee852aa3897f src/vs/workbench/api/node/extHostApiCommands.ts
-@@ -263,7 +263,7 @@
- 	// --- command impl
- 
- 	private _register(id: string, handler: (...args: any[]) => any, description?: ICommandHandlerDescription): void {
--		let disposable = this._commands.registerCommand(false, id, handler, this, description);
-+		let disposable = this._commands.registerCommand(true, id, handler, this, description);
- 		this._disposables.push(disposable);
- 	}
- 
-changed in both
-  base   100644 b6ddcfa97a032f2277ee04d731bf5949bce70d2a src/vs/workbench/api/node/extHostTreeViews.ts
-  our    100644 811fc4b464b2bd349271799d4eb443aa81870399 src/vs/workbench/api/node/extHostTreeViews.ts
-  their  100644 9cadef9110132a767d2bd64015e87be3daa0e845 src/vs/workbench/api/node/extHostTreeViews.ts
-@@ -399,7 +399,11 @@
- 		return item;
- 	}
- 
-+<<<<<<< .our
- 	private createHandle(element: T, { id, label, resourceUri }: vscode.TreeItem, parent: TreeNode, returnFirst?: boolean): TreeItemHandle {
-+=======
-+	private createHandle(element: T, { id, label, resourceUri }: vscode.TreeItem, parent: TreeNode, first?: boolean): TreeItemHandle {
-+>>>>>>> .their
- 		if (id) {
- 			return `${ExtHostTreeView.ID_HANDLE_PREFIX}/${id}`;
- 		}
-@@ -410,6 +414,7 @@
- 		const existingHandle = this.nodes.has(element) ? this.nodes.get(element).item.handle : void 0;
- 		const childrenNodes = (this.getChildrenNodes(parent) || []);
- 
-+<<<<<<< .our
- 		let handle: TreeItemHandle;
- 		let counter = 0;
- 		do {
-@@ -419,6 +424,12 @@
- 				// Return if handle does not exist or
- 				// Return if handle is being reused
- 				break;
-+=======
-+		for (let counter = 0; counter <= childrenNodes.length; counter++) {
-+			const handle = `${prefix}/${counter}:${elementId}`;
-+			if (first || !this.elements.has(handle) || existingHandle === handle) {
-+				return handle;
-+>>>>>>> .their
- 			}
- 			counter++;
- 		} while (counter <= childrenNodes.length);
-changed in both
-  base   100644 c980d5e8c9686e5da3f7ac354b5bf6ba864a315c src/vs/workbench/browser/parts/quickinput/quickInput.ts
-  our    100644 d834bd59460d51375417fd865daeb856b353a144 src/vs/workbench/browser/parts/quickinput/quickInput.ts
-  their  100644 23478edf3fea0809fedec978e15d8067294ff691 src/vs/workbench/browser/parts/quickinput/quickInput.ts
-@@ -909,10 +909,15 @@
- 		this._register(list.onLeave(() => {
- 			// Defer to avoid the input field reacting to the triggering key.
- 			setTimeout(() => {
-+<<<<<<< .our
- 				inputBox.setFocus();
- 				if (this.controller instanceof QuickPick && this.controller.canSelectMany) {
- 					list.clearFocus();
- 				}
-+=======
-+				this.inputBox.setFocus();
-+				this.checkboxList.clearFocus();
-+>>>>>>> .their
- 			}, 0);
- 		}));
- 
-removed in local
-  base   100644 d394f9fa10882df1b5ddf83522317d732eee1937 src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
-  their  100644 fa0763bf1aff8786c222979271dfeb95df9057a5 src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
-changed in both
-  base   100644 18cc9b3fe5b8b7808e85343d0e7e39ed8e73cc05 src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
-  our    100644 fe86cf067fdb869c9299c0bb05b084d8e7d78667 src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
-  their  100644 1b0b0af9e0f4fc578cf31090e6be4a15ee32b92c src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
-@@ -10,7 +10,6 @@
- import { SelectBox } from 'vs/base/browser/ui/selectBox/selectBox';
- import * as lifecycle from 'vs/base/common/lifecycle';
- import * as dom from 'vs/base/browser/dom';
--import { Position } from 'vs/editor/common/core/position';
- import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
- import { ZoneWidget } from 'vs/editor/contrib/zoneWidget/zoneWidget';
- import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
-@@ -23,10 +22,13 @@
- import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
- import { IModelService } from 'vs/editor/common/services/modelService';
- import uri from 'vs/base/common/uri';
-+<<<<<<< .our
- import { SuggestRegistry, ISuggestResult, SuggestContext } from 'vs/editor/common/modes';
- import { CancellationToken } from 'vs/base/common/cancellation';
- import { ITextModel } from 'vs/editor/common/model';
- import { provideSuggestionItems } from 'vs/editor/contrib/suggest/suggest';
-+=======
-+>>>>>>> .their
- import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
- import { transparent, editorForeground } from 'vs/platform/theme/common/colorRegistry';
- import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-@@ -215,6 +217,7 @@
- 		};
- 		this.input.getModel().onDidChangeContent(() => setDecorations());
- 		this.themeService.onThemeChange(() => setDecorations());
-+<<<<<<< .our
- 
- 		this.toDispose.push(SuggestRegistry.register({ scheme: DEBUG_SCHEME, hasAccessToAllModels: true }, {
- 			provideCompletionItems: (model: ITextModel, position: Position, _context: SuggestContext, token: CancellationToken): Thenable<ISuggestResult> => {
-@@ -248,6 +251,8 @@
- 				return suggestionsPromise;
- 			}
- 		}));
-+=======
-+>>>>>>> .their
- 	}
- 
- 	private createDecorations(): IDecorationOptions[] {
-@@ -267,21 +272,6 @@
- 		}];
- 	}
- 
--	private isCurlyBracketOpen(): boolean {
--		const value = this.input.getModel().getValue();
--		for (let i = this.input.getPosition().column - 2; i >= 0; i--) {
--			if (value[i] === '{') {
--				return true;
--			}
--
--			if (value[i] === '}') {
--				return false;
--			}
--		}
--
--		return false;
--	}
--
- 	public dispose(): void {
- 		super.dispose();
- 		this.input.dispose();
-changed in both
-  base   100644 6abc54c895a80dd139445fdc098cb3fe05a8bf39 src/vs/workbench/parts/files/common/explorerModel.ts
-  our    100644 49d64d0a561cfc89077f412464843a7b0f047e1f src/vs/workbench/parts/files/common/explorerModel.ts
-  their  100644 e72ab77eb13b1a5fa41aee3dba4c707906cbc219 src/vs/workbench/parts/files/common/explorerModel.ts
-@@ -72,9 +72,13 @@
- 	public etag: string;
- 	private _isDirectory: boolean;
- 	private _isSymbolicLink: boolean;
-+<<<<<<< .our
- 	private _isReadonly: boolean;
- 	private children: Map<string, ExplorerItem>;
- 	private _isError: boolean;
-+=======
-+	private children: Map<string, ExplorerItem>;
-+>>>>>>> .their
- 	public parent: ExplorerItem;
- 
- 	public isDirectoryResolved: boolean;
-@@ -269,6 +273,17 @@
- 		});
- 
- 		return items;
-+<<<<<<< .our
-+=======
-+	}
-+
-+	public getChildrenCount(): number {
-+		if (!this.children) {
-+			return 0;
-+		}
-+
-+		return this.children.size;
-+>>>>>>> .their
- 	}
- 
- 	public getChildrenCount(): number {
-@@ -276,7 +291,16 @@
- 			return 0;
- 		}
- 
-+<<<<<<< .our
- 		return this.children.size;
-+=======
-+		const names: string[] = [];
-+		this.children.forEach(child => {
-+			names.push(child.name);
-+		});
-+
-+		return names;
-+>>>>>>> .their
- 	}
- 
- 	/**
-changed in both
-  base   100644 60493bdca56015a43a58447596a9a0e6d807fab1 src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
-  our    100644 e0204febe1f4826a27ae39de6c0363afc38b208d src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
-  their  100644 1d04e8a2165bf15d78238ffd49f7877b40754a60 src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
-@@ -736,9 +736,24 @@
- 			return true; // always visible
- 		}
- 
-+<<<<<<< .our
- 		// Hide those that match Hidden Patterns
- 		const cached = this.hiddenExpressionPerRoot.get(stat.root.resource.toString());
- 		if (cached && cached.parsed(paths.normalize(path.relative(stat.root.resource.path, stat.resource.path), true), stat.name, name => !!stat.parent.getChild(name))) {
-+=======
-+		// Workaround for O(N^2) complexity (https://github.com/Microsoft/vscode/issues/9962)
-+		let siblingsFn: () => string[];
-+		let siblingCount = stat.parent && stat.parent.getChildrenCount();
-+		if (siblingCount && siblingCount > FileFilter.MAX_SIBLINGS_FILTER_THRESHOLD) {
-+			siblingsFn = () => void 0;
-+		} else {
-+			siblingsFn = () => stat.parent ? stat.parent.getChildrenNames() : void 0;
-+		}
-+
-+		// Hide those that match Hidden Patterns
-+		const expression = this.hiddenExpressionPerRoot.get(stat.root.resource.toString()) || Object.create(null);
-+		if (glob.match(expression, paths.normalize(relative(stat.root.resource.fsPath, stat.resource.fsPath), true), siblingsFn)) {
-+>>>>>>> .their
- 			return false; // hidden through pattern
- 		}
- 
-changed in both
-  base   100644 d0cb9e4f524f1c53ea41d25b7a1682bd3da214cf src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
-  our    100644 6b4da35a3f141112a169ecfa12aadfaea48de26e src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
-  their  100644 9d7bc2cd1ab6ebc29c1e66ee50415d26be589a94 src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
-changed in both
-  base   100644 93cf12eeb33a49f292b2edb150e19eab0a6e730f src/vs/workbench/parts/update/electron-browser/update.ts
-  our    100644 2e468debc61fae01ce2d9c4b673a81993982cc62 src/vs/workbench/parts/update/electron-browser/update.ts
-  their  100644 6aa9e3764798e5fc47ddc4051792fc633b97784c src/vs/workbench/parts/update/electron-browser/update.ts
-@@ -121,7 +121,11 @@
- 		const shouldShowReleaseNotes = configurationService.getValue<boolean>('update.showReleaseNotes');
- 
- 		// was there an update? if so, open release notes
-+<<<<<<< .our
- 		if (shouldShowReleaseNotes && !environmentService.skipReleaseNotes && product.releaseNotesUrl && lastVersion && pkg.version !== lastVersion) {
-+=======
-+		if (!environmentService.skipReleaseNotes && product.releaseNotesUrl && lastVersion && pkg.version !== lastVersion) {
-+>>>>>>> .their
- 			showReleaseNotes(instantiationService, pkg.version)
- 				.then(undefined, () => {
- 					notificationService.prompt(
-changed in both
-  base   100644 9b95fc29698cdfcdb114a4e61c391a899536a0df src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts
-  our    100644 a62fde4bcb8b78766ace6dd70f1caf223e48f3d7 src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts
-  their  100644 969cac303595fa76c0259555d699446fded89f3a src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts
-@@ -444,7 +444,11 @@
- 					assert.deepEqual('treeDataProvider', revealTarget.args[0][0]);
- 					assert.deepEqual({ handle: '0/0:a/0:aa', label: 'aa', collapsibleState: TreeItemCollapsibleState.None, parentHandle: '0/0:a' }, removeUnsetKeys(revealTarget.args[0][1]));
- 					assert.deepEqual([{ handle: '0/0:a', label: 'a', collapsibleState: TreeItemCollapsibleState.Collapsed }], (<Array<any>>revealTarget.args[0][2]).map(arg => removeUnsetKeys(arg)));
-+<<<<<<< .our
- 					assert.deepEqual({ select: true, focus: false }, revealTarget.args[0][3]);
-+=======
-+					assert.equal(void 0, revealTarget.args[0][3]);
-+>>>>>>> .their
- 				}));
- 	});
- 
diff --git a/app/test/fixtures/merge-parser/vscode/merge-release-1.23-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-release-1.23-into-master.txt
deleted file mode 100644
index 2ba523942a1..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-release-1.23-into-master.txt
+++ /dev/null
@@ -1,4214 +0,0 @@
-changed in both
-  base   100644 04632292dc119dffdf2780f563f4ff80469eccb4 OSSREADME.json
-  our    100644 e15cccabcadbd5afb0980967f0af53c135710fc0 OSSREADME.json
-  their  100644 eb9b02a336f636eb874fbc4b6dcf18ddd3aa8622 OSSREADME.json
-@@ -1161,6 +1161,7 @@
- 		"  This Source Code Form is \"Incompatible With Secondary Licenses\", as",
- 		"  defined by the Mozilla Public License, v. 2.0."
- 	]
-+<<<<<<< .our
- },
- {
- 	"isLicense": true,
-@@ -1332,5 +1333,7 @@
- 		"",
- 		"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
- 	]
-+=======
-+>>>>>>> .their
- }
- ]
-changed in both
-  base   100644 4c4a9b9d6b68d7aaa02a6ef506e37fa2ec87d10e ThirdPartyNotices.txt
-  our    100644 80e9fd6e80876df7d8a3a735f4afc2e3a0084651 ThirdPartyNotices.txt
-  their  100644 22e2eeb13a8e0491c0e5c64d31af2774d371249b ThirdPartyNotices.txt
-@@ -21,6 +21,7 @@
- 14.	davidrios/pug-tmbundle (https://github.com/davidrios/pug-tmbundle)
- 15.	definitelytyped (https://github.com/DefinitelyTyped/DefinitelyTyped)
- 16.	demyte/language-cshtml (https://github.com/demyte/language-cshtml)
-+<<<<<<< .our
- 17.	Document Object Model ()
- 18.	dotnet/csharp-tmLanguage version 0.1.0 (https://github.com/dotnet/csharp-tmLanguage)
- 19.	expand-abbreviation version 0.5.8 (https://github.com/emmetio/expand-abbreviation)
-@@ -66,6 +67,50 @@
- 59.	vscode-logfile-highlighter version 1.2.0 (https://github.com/emilast/vscode-logfile-highlighter)
- 60.	vscode-swift version 0.0.1 (https://github.com/owensd/vscode-swift)
- 61.	Web Background Synchronization (https://github.com/WICG/BackgroundSync)
-+=======
-+17.	dotnet/csharp-tmLanguage version 0.1.0 (https://github.com/dotnet/csharp-tmLanguage)
-+18.	expand-abbreviation version 0.5.8 (https://github.com/emmetio/expand-abbreviation)
-+19.	fadeevab/make.tmbundle (https://github.com/fadeevab/make.tmbundle)
-+20.	freebroccolo/atom-language-swift (https://github.com/freebroccolo/atom-language-swift)
-+21.	HTML 5.1 W3C Working Draft version 08 October 2015 (http://www.w3.org/TR/2015/WD-html51-20151008/)
-+22.	Ikuyadeu/vscode-R (https://github.com/Ikuyadeu/vscode-R)
-+23.	Ionic documentation version 1.2.4 (https://github.com/ionic-team/ionic-site)
-+24.	ionide/ionide-fsgrammar (https://github.com/ionide/ionide-fsgrammar)
-+25.	js-beautify version 1.6.8 (https://github.com/beautify-web/js-beautify)
-+26.	Jxck/assert version 1.0.0 (https://github.com/Jxck/assert)
-+27.	language-docker (https://github.com/moby/moby)
-+28.	language-go version 0.39.0 (https://github.com/atom/language-go)
-+29.	language-less (https://github.com/atom/language-less)
-+30.	language-php (https://github.com/atom/language-php)
-+31.	language-rust version 0.4.9 (https://github.com/zargony/atom-language-rust)
-+32.	MagicStack/MagicPython (https://github.com/MagicStack/MagicPython)
-+33.	mdn-data version 1.1.12 (https://github.com/mdn/data)
-+34.	Microsoft/TypeScript-TmLanguage version 0.0.1 (https://github.com/Microsoft/TypeScript-TmLanguage)
-+35.	Microsoft/vscode-JSON.tmLanguage (https://github.com/Microsoft/vscode-JSON.tmLanguage)
-+36.	Microsoft/vscode-mssql (https://github.com/Microsoft/vscode-mssql)
-+37.	mmims/language-batchfile (https://github.com/mmims/language-batchfile)
-+38.	octicons-code version 3.1.0 (https://octicons.github.com)
-+39.	octicons-font version 3.1.0 (https://octicons.github.com)
-+40.	PowerShell/EditorSyntax (https://github.com/powershell/editorsyntax)
-+41.	seti-ui version 0.1.0 (https://github.com/jesseweed/seti-ui)
-+42.	shaders-tmLanguage version 0.1.0 (https://github.com/tgjones/shaders-tmLanguage)
-+43.	textmate/asp.vb.net.tmbundle (https://github.com/textmate/asp.vb.net.tmbundle)
-+44.	textmate/c.tmbundle (https://github.com/textmate/c.tmbundle)
-+45.	textmate/diff.tmbundle (https://github.com/textmate/diff.tmbundle)
-+46.	textmate/git.tmbundle (https://github.com/textmate/git.tmbundle)
-+47.	textmate/groovy.tmbundle (https://github.com/textmate/groovy.tmbundle)
-+48.	textmate/html.tmbundle (https://github.com/textmate/html.tmbundle)
-+49.	textmate/ini.tmbundle (https://github.com/textmate/ini.tmbundle)
-+50.	textmate/javascript.tmbundle (https://github.com/textmate/javascript.tmbundle)
-+51.	textmate/lua.tmbundle (https://github.com/textmate/lua.tmbundle)
-+52.	textmate/markdown.tmbundle (https://github.com/textmate/markdown.tmbundle)
-+53.	textmate/perl.tmbundle (https://github.com/textmate/perl.tmbundle)
-+54.	textmate/ruby.tmbundle (https://github.com/textmate/ruby.tmbundle)
-+55.	textmate/yaml.tmbundle (https://github.com/textmate/yaml.tmbundle)
-+56.	TypeScript-TmLanguage version 0.1.8 (https://github.com/Microsoft/TypeScript-TmLanguage)
-+57.	vscode-logfile-highlighter version 1.2.0 (https://github.com/emilast/vscode-logfile-highlighter)
-+58.	vscode-swift version 0.0.1 (https://github.com/owensd/vscode-swift)
-+>>>>>>> .their
- 
- 
- %% atom/language-c NOTICES AND INFORMATION BEGIN HERE
-changed in both
-  base   100644 50e2e7a1b37e8e7dc9cb953afdb3da3703529edf extensions/css-language-features/client/src/cssMain.ts
-  our    100644 dce55982cb94bb035bdff7d2c558ebd86a9e9f7b extensions/css-language-features/client/src/cssMain.ts
-  their  100644 a7a031bda3c284cc5a7f6fe999569a09738e54d0 extensions/css-language-features/client/src/cssMain.ts
-@@ -10,6 +10,10 @@
- 
- import { languages, window, commands, ExtensionContext, Range, Position, CompletionItem, CompletionItemKind, TextEdit, SnippetString } from 'vscode';
- import { LanguageClient, LanguageClientOptions, ServerOptions, TransportKind, Disposable } from 'vscode-languageclient';
-+<<<<<<< .our
-+=======
-+import { FoldingRangeRequest, FoldingRangeRequestParam, FoldingRangeClientCapabilities, FoldingRangeKind as LSFoldingRangeKind } from 'vscode-languageserver-protocol-foldingprovider';
-+>>>>>>> .their
- 
- // this method is called when vs code is activated
- export function activate(context: ExtensionContext) {
-@@ -99,6 +103,41 @@
- 		});
- 	}
- 
-+<<<<<<< .our
-+=======
-+	function initFoldingProvider(): Disposable {
-+		function getKind(kind: string | undefined): FoldingRangeKind | undefined {
-+			if (kind) {
-+				switch (kind) {
-+					case LSFoldingRangeKind.Comment:
-+						return FoldingRangeKind.Comment;
-+					case LSFoldingRangeKind.Imports:
-+						return FoldingRangeKind.Imports;
-+					case LSFoldingRangeKind.Region:
-+						return FoldingRangeKind.Region;
-+				}
-+			}
-+			return void 0;
-+		}
-+		return languages.registerFoldingRangeProvider(documentSelector, {
-+			provideFoldingRanges(document: TextDocument, context: FoldingContext, token: CancellationToken) {
-+				const param: FoldingRangeRequestParam = {
-+					textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(document)
-+				};
-+				return client.sendRequest(FoldingRangeRequest.type, param, token).then(ranges => {
-+					if (Array.isArray(ranges)) {
-+						return ranges.map(r => new FoldingRange(r.startLine, r.endLine, getKind(r.kind)));
-+					}
-+					return null;
-+				}, error => {
-+					client.logFailedRequest(FoldingRangeRequest.type, error);
-+					return null;
-+				});
-+			}
-+		});
-+	}
-+
-+>>>>>>> .their
- 	commands.registerCommand('_css.applyCodeAction', applyCodeAction);
- 
- 	function applyCodeAction(uri: string, documentVersion: number, edits: TextEdit[]) {
-changed in both
-  base   100644 bf8fa07af2bafe31c5d7bd433d40e1c887926f07 extensions/html-language-features/client/src/htmlMain.ts
-  our    100644 68f8b881d3bcf186706879657e06ddbdb58036d9 extensions/html-language-features/client/src/htmlMain.ts
-  their  100644 313542681127d24445f3f4a8ad0dab524ed0f2d9 extensions/html-language-features/client/src/htmlMain.ts
-@@ -14,6 +14,11 @@
- import { activateTagClosing } from './tagClosing';
- import TelemetryReporter from 'vscode-extension-telemetry';
- 
-+<<<<<<< .our
-+=======
-+import { FoldingRangeRequest, FoldingRangeRequestParam, FoldingRangeClientCapabilities, FoldingRangeKind as LSFoldingRangeKind } from 'vscode-languageserver-protocol-foldingprovider';
-+
-+>>>>>>> .their
- namespace TagCloseRequest {
- 	export const type: RequestType<TextDocumentPositionParams, string, any, any> = new RequestType('html/tag');
- }
-@@ -154,6 +159,41 @@
- 			return null;
- 		}
- 	});
-+<<<<<<< .our
-+=======
-+
-+	function initFoldingProvider(): Disposable {
-+		function getKind(kind: string | undefined): FoldingRangeKind | undefined {
-+			if (kind) {
-+				switch (kind) {
-+					case LSFoldingRangeKind.Comment:
-+						return FoldingRangeKind.Comment;
-+					case LSFoldingRangeKind.Imports:
-+						return FoldingRangeKind.Imports;
-+					case LSFoldingRangeKind.Region:
-+						return FoldingRangeKind.Region;
-+				}
-+			}
-+			return void 0;
-+		}
-+		return languages.registerFoldingRangeProvider(documentSelector, {
-+			provideFoldingRanges(document: TextDocument, context: FoldingContext, token: CancellationToken) {
-+				const param: FoldingRangeRequestParam = {
-+					textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(document)
-+				};
-+				return client.sendRequest(FoldingRangeRequest.type, param, token).then(ranges => {
-+					if (Array.isArray(ranges)) {
-+						return ranges.map(r => new FoldingRange(r.startLine, r.endLine, getKind(r.kind)));
-+					}
-+					return null;
-+				}, error => {
-+					client.logFailedRequest(FoldingRangeRequest.type, error);
-+					return null;
-+				});
-+			}
-+		});
-+	}
-+>>>>>>> .their
- }
- 
- function getPackageInfo(context: ExtensionContext): IPackageInfo | null {
-changed in both
-  base   100644 8c6babddedbec5d5cce285fb3197a020bb0e83ae extensions/html-language-features/server/src/htmlServerMain.ts
-  our    100644 ffe5c18df41d8ad255bff032cbca33b62a5b895b extensions/html-language-features/server/src/htmlServerMain.ts
-  their  100644 7e9253c83e60e92754ad9c361fdf96e417c26e81 extensions/html-language-features/server/src/htmlServerMain.ts
-@@ -170,7 +170,11 @@
- 		const enableFormatter = globalSettings && globalSettings.html && globalSettings.html.format && globalSettings.html.format.enable;
- 		if (enableFormatter) {
- 			if (!formatterRegistration) {
-+<<<<<<< .our
- 				const documentSelector: DocumentSelector = [{ language: 'html' }, { language: 'handlebars' }]; // don't register razor, the formatter does more harm than good
-+=======
-+				let documentSelector: DocumentSelector = [{ language: 'html' }, { language: 'handlebars' }]; // don't register razor, the formatter does more harm than good
-+>>>>>>> .their
- 				formatterRegistration = connection.client.register(DocumentRangeFormattingRequest.type, { documentSelector });
- 			}
- 		} else if (formatterRegistration) {
-changed in both
-  base   100644 53c19c4c22fb718c87585ff218e87f55deffe12d extensions/json-language-features/client/src/jsonMain.ts
-  our    100644 9040304a4f84d9462af713bf2628e4bb49f8d701 extensions/json-language-features/client/src/jsonMain.ts
-  their  100644 2cd653dfa4bfcf4922745c99617da6bf4bfdb64d extensions/json-language-features/client/src/jsonMain.ts
-@@ -12,6 +12,11 @@
- import { LanguageClient, LanguageClientOptions, RequestType, ServerOptions, TransportKind, NotificationType, DidChangeConfigurationNotification } from 'vscode-languageclient';
- import TelemetryReporter from 'vscode-extension-telemetry';
- 
-+<<<<<<< .our
-+=======
-+import { FoldingRangeRequest, FoldingRangeRequestParam, FoldingRangeClientCapabilities, FoldingRangeKind as LSFoldingRangeKind } from 'vscode-languageserver-protocol-foldingprovider';
-+
-+>>>>>>> .their
- import { hash } from './utils/hash';
- 
- namespace VSCodeContentRequest {
-@@ -135,6 +140,41 @@
- 	};
- 	languages.setLanguageConfiguration('json', languageConfiguration);
- 	languages.setLanguageConfiguration('jsonc', languageConfiguration);
-+<<<<<<< .our
-+=======
-+
-+	function initFoldingProvider(): Disposable {
-+		function getKind(kind: string | undefined): FoldingRangeKind | undefined {
-+			if (kind) {
-+				switch (kind) {
-+					case LSFoldingRangeKind.Comment:
-+						return FoldingRangeKind.Comment;
-+					case LSFoldingRangeKind.Imports:
-+						return FoldingRangeKind.Imports;
-+					case LSFoldingRangeKind.Region:
-+						return FoldingRangeKind.Region;
-+				}
-+			}
-+			return void 0;
-+		}
-+		return languages.registerFoldingRangeProvider(documentSelector, {
-+			provideFoldingRanges(document: TextDocument, context: FoldingContext, token: CancellationToken) {
-+				const param: FoldingRangeRequestParam = {
-+					textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(document)
-+				};
-+				return client.sendRequest(FoldingRangeRequest.type, param, token).then(ranges => {
-+					if (Array.isArray(ranges)) {
-+						return ranges.map(r => new FoldingRange(r.startLine, r.endLine, getKind(r.kind)));
-+					}
-+					return null;
-+				}, error => {
-+					client.logFailedRequest(FoldingRangeRequest.type, error);
-+					return null;
-+				});
-+			}
-+		});
-+	}
-+>>>>>>> .their
- }
- 
- export function deactivate(): Promise<any> {
-changed in both
-  base   100644 d4f3c5641f1ea99da454a261fa71193c6cf9debe i18n/chs/extensions/git/out/commands.i18n.json
-  our    100644 04fae89946b4fff2a3f253e57b9b96d137dedd28 i18n/chs/extensions/git/out/commands.i18n.json
-  their  100644 6b84808b73f30551b52fddd601396601b4f7f5ab i18n/chs/extensions/git/out/commands.i18n.json
-@@ -10,8 +10,14 @@
- 	"remote branch at": "{0} 处的远程分支",
- 	"create branch": "$(plus) 创建新分支",
- 	"repourl": "存储库 URL",
-+<<<<<<< .our
- 	"selectFolder": "选择存储库位置",
- 	"cloning": "正在克隆 Git 存储库“{0}”...",
-+=======
-+	"parent": "父目录",
-+	"cloning": "正在克隆 Git 存储库“{0}”...",
-+	"openrepo": "打开存储库",
-+>>>>>>> .their
- 	"proposeopen": "是否要打开已克隆存储库?",
- 	"openrepo": "打开存储库",
- 	"add": "添加到工作区",
-changed in both
-  base   100644 5978906c3fbcc45cc33fd53399c6b57d1d2df37d i18n/chs/extensions/npm/out/npmView.i18n.json
-  our    100644 b826cc7a7f53ce7b9eb9889e43228faf9923081e i18n/chs/extensions/npm/out/npmView.i18n.json
-  their  100644 d5495533349098face36b92e2621c779c5e47ab8 i18n/chs/extensions/npm/out/npmView.i18n.json
-@@ -6,9 +6,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"noScripts": "找不到脚本",
- 	"noDebugOptions": "无法启动“{0}”并进行调试。脚本缺少 Node 调试选项，如 \"--inspect-brk\"。",
- 	"learnMore": "了解详细信息",
- 	"ok": "确定",
- 	"scriptInvalid": "找不到脚本“{0}”。请尝试刷新视图。"
-+=======
-+	"npm.noDebugOptions": "无法启动“{0}”并进行调试。脚本缺少 Node 调试选项，如 \"--inspect-brk\"。",
-+	"npm.scriptInvalid": "找不到脚本“{0}”。请尝试刷新视图。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 b0c78e7ec44401bf64e00d07fad88499176d8249 i18n/chs/extensions/npm/package.i18n.json
-  our    100644 3f53500fe1fade31ff765e96760b3a5c8a6d618f i18n/chs/extensions/npm/package.i18n.json
-  their  100644 26fe779a0bd0050f17307719d73ec8983c0e6267 i18n/chs/extensions/npm/package.i18n.json
-@@ -22,5 +22,10 @@
- 	"command.run": "运行",
- 	"command.debug": "调试",
- 	"command.openScript": "开放",
-+<<<<<<< .our
- 	"command.runInstall": "运行 install"
-+=======
-+	"npm.scriptInvalid": "找不到脚本“{0}”。请尝试刷新视图。",
-+	"npm.noDebugOptions": "无法启动“{0}”并进行调试。脚本缺少 Node 调试选项，如 \"--inspect-brk\"。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 1a8ea044c9f6fb9feb5477b9471e2970a2293859 i18n/chs/src/vs/code/electron-main/menus.i18n.json
-  our    100644 8ef99d97e56fa2367ea176a647acfd2598f9da39 i18n/chs/src/vs/code/electron-main/menus.i18n.json
-  their  100644 14fa6fe64678537151df5b3a9205ccb1cac7bff3 i18n/chs/src/vs/code/electron-main/menus.i18n.json
-changed in both
-  base   100644 446507bbe401bebbd7612e29102e7899a5237fd2 i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 e4c993e2df857650110681bbfaaa48507f4e2ec6 i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 585db34a8cda6199c7a7757c18118d9058e22c8d i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json
-changed in both
-  base   100644 1571b950704ab806e95b844a17866ca152ae4dac i18n/chs/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 9b8e352f2e01c71634dfc189a8ddc9dc7485da94 i18n/chs/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 ccf8bf4ef50803fb684ea8bf9d1bbc7af3363d14 i18n/chs/src/vs/platform/environment/node/argv.i18n.json
-changed in both
-  base   100644 9a0065053178846591463109c062956a4d6439b5 i18n/chs/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 7fee73e8505eefc794b34e899f5cfb2204f92225 i18n/chs/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 0e17b24b64b18a7ac85314da7bb5cfe7bb36e8de i18n/chs/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-changed in both
-  base   100644 66eb4736c071297755a6fac0ccfd756601935582 i18n/chs/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 c983e4e827a53b4bffaaa1c1c11e806845efcb6b i18n/chs/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 3e2117c223ef093f33da97851fa46133200c421e i18n/chs/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -77,7 +77,10 @@
- 	"editorFindMatchBorder": "当前搜索匹配项的边框颜色。",
- 	"findMatchHighlightBorder": "其他搜索匹配项的边框颜色。",
- 	"findRangeHighlightBorder": "搜索限制范围的边框颜色。颜色必须透明，使其不会挡住下方的其他元素。",
-+<<<<<<< .our
- 	"findWidgetResizeBorder": "“查找”小部件中大小调整条的边框颜色。",
-+=======
-+>>>>>>> .their
- 	"hoverHighlight": "文本在悬停提示显示时的高亮颜色。颜色必须透明，使其不会挡住下方的其他元素。",
- 	"hoverBackground": "编辑器悬停提示的背景颜色。",
- 	"hoverBorder": "光标悬停时编辑器的边框颜色。",
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/chs/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
-  our    100644 90f88818479a70b4790fb24d44279cf2265d2ba9 i18n/chs/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
-  their  100644 e28586d2eb3a4b3aecf728c8f94b3613969c8d70 i18n/chs/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
-@@ -6,5 +6,9 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"confirmUrl": "是否允许扩展打开此 URL?"
-+=======
-+	"confirmUrl": "是否让 {0} 扩展打开以下 URL?"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7d9f143a9ac2e430ff20f8f5b48a1e6b2c594aa5 i18n/chs/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
-  our    100644 017005cd335312fbc3489213ef65cb2fb61dd3af i18n/chs/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
-  their  100644 5f7e4407bb627f6f33532a8d1065f400eabd5a5f i18n/chs/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
-@@ -8,6 +8,7 @@
- 	],
- 	"vscode.extension.contributes.views.containers.id": "用于标识容器的唯一 ID，视图能在容器内通过 \"view\" 参与点提供。",
- 	"vscode.extension.contributes.views.containers.title": "人类可读的用于表示此容器的字符串",
-+<<<<<<< .our
- 	"vscode.extension.contributes.views.containers.icon": "容器图标的路径。图标大小为 24x24，并居中放置在 50x40 的区域内，其填充颜色为 \"rgb(215, 218, 224)\" 或 \"#d7dae0\"。所有图片格式均可用，推荐使用 SVG 格式。",
- 	"vscode.extension.contributes.viewsContainers": "向编辑器提供视图容器",
- 	"views.container.activitybar": "向活动栏提供视图容器",
-@@ -15,6 +16,16 @@
- 	"requirearray": "视图容器必须为数组",
- 	"requireidstring": "属性“{0}”是必要属性，其类型必须是 \"string\"。仅支持字母、数字、\"_\" 和 \"-\"。",
- 	"requirestring": "“{0}”是必要属性，其类型必须是 \"string\" ",
-+=======
-+	"vscode.extension.contributes.views.containers.icon": "容器图标的路径。图标大小为 24x24，居中放置在 50x40 的方格内，其填充颜色为 \"rgb(215, 218, 224)\" 或 \"#d7dae0\"。所有图片格式均可用，推荐使用 SVG 格式。",
-+	"vscode.extension.contributes.viewsContainers": "向编辑器提供视图容器",
-+	"views.container.activitybar": "向活动栏提供视图容器",
-+	"test": "测试",
-+	"proposed": "\"viewsContainers\" 参与点仅在以开发模式运行时或附加命令行开关: --enable-proposed-api {1} 时可用",
-+	"requirearray": "视图容器必须为数组",
-+	"requireidstring": "属性“{0}”是必要属性，其类型必须是 \"string\"。仅支持字母、数字、\"_\" 和 \"-\"。",
-+	"requirestring": "属性“{0}”是必要属性，其类型必须是 \"string\"",
-+>>>>>>> .their
- 	"showViewlet": "显示 {0}",
- 	"view": "查看"
- }
-\ No newline at end of file
-changed in both
-  base   100644 1803ba349c0a2ecc84dcbbb7be002c78d91e614e i18n/chs/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
-  our    100644 cf9392bc8dee03a22dbd6234499252b62a43ab82 i18n/chs/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
-  their  100644 c767d56880529a9cf1645ec7da5f767cec8967ce i18n/chs/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
-changed in both
-  base   100644 1a1f6eea1b6c1394ff44d70e5517e4d1fa2e0f52 i18n/chs/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
-  our    100644 50341baaf7df947d76de1c3d61e9b41b62b929b8 i18n/chs/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
-  their  100644 a23959a4c1d541f32ae1fef39362560fb458004f i18n/chs/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"disableFilesExclude": "禁用排除的文件筛选器。",
-+=======
-+	"disableFilesExclude": "禁用文件排除筛选器。",
-+>>>>>>> .their
- 	"clearFilter": "清除筛选。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 a48247a74897590f1c188ccd57f46065b1529ea9 i18n/chs/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 61397c437f22149a7bd941ec158bc6fa9182474a i18n/chs/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 e7e921aa682d6e2c8ee769df17075788e32eaca9 i18n/chs/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-changed in both
-  base   100644 43e4308fb7091843d319e31d9dbf0d64ee5e6bf0 i18n/chs/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-  our    100644 58203e80a7e8a2d837a03243f2a099b7449d4c2f i18n/chs/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-  their  100644 3c4d65cfab7e84576ec886b3389893340673170f i18n/chs/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-changed in both
-  base   100644 c87de21c8fa28da1c7ec7900c572351492a3ab8e i18n/chs/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  our    100644 8d343959d4318fc5914175bbc666001176d1ca2b i18n/chs/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  their  100644 b99594ec6170629886a8ba5f92059d00fab0fe6e i18n/chs/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-changed in both
-  base   100644 b7d543af3f2e4fd6422eadc8a29fef16348ae4ea i18n/cht/extensions/git/out/commands.i18n.json
-  our    100644 f99c465da1ed922e8de7f8c6dfd9a26e886bdd66 i18n/cht/extensions/git/out/commands.i18n.json
-  their  100644 0d7f1946cf2c627c37be3daf4292a91dad686677 i18n/cht/extensions/git/out/commands.i18n.json
-@@ -10,8 +10,14 @@
- 	"remote branch at": "位於 {0} 的遠端分支",
- 	"create branch": "$(plus) 建立新的分支",
- 	"repourl": "儲存庫 URL",
-+<<<<<<< .our
- 	"selectFolder": "選擇儲存庫位置",
- 	"cloning": "正在複製 git 存放庫 '{0}'...",
-+=======
-+	"parent": "父目錄",
-+	"cloning": "正在複製 git 存放庫 '{0}'...",
-+	"openrepo": "開啟儲存庫",
-+>>>>>>> .their
- 	"proposeopen": "要開啟複製的儲存庫嗎?",
- 	"openrepo": "開啟儲存庫",
- 	"add": "新增到工作區",
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/cht/extensions/npm/out/npmView.i18n.json
-  our    100644 1053101f617e10c4810e84531b8100a89da624da i18n/cht/extensions/npm/out/npmView.i18n.json
-  their  100644 0fcedab1eb3bd428ea0745548061cdab84c4c0a0 i18n/cht/extensions/npm/out/npmView.i18n.json
-@@ -6,9 +6,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"noScripts": "找不到指令碼",
- 	"noDebugOptions": "因為指令碼缺少節點偵錯選項 (例如 '--inspect-brk')，所以無法啟動 \"{0}\" 以進行偵錯。",
- 	"learnMore": "深入了解",
- 	"ok": "確定",
- 	"scriptInvalid": "找不到指令碼 \"{0}\"。請嘗試重新整理檢視。"
-+=======
-+	"npm.noDebugOptions": "因為指令碼缺少節點偵錯選項 (例如 '--inspect-brk')，所以無法啟動 \"{0}\" 以進行偵錯。",
-+	"npm.scriptInvalid": "找不到指令碼 \"{0}\"。請嘗試重新整理檢視。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 4ffedea8e58945e839d84418a145d6073f07379d i18n/cht/extensions/npm/package.i18n.json
-  our    100644 e1e497559e0002c1cb7f8161b65cf930f3fd8de7 i18n/cht/extensions/npm/package.i18n.json
-  their  100644 6a4c4425415bee964311d58f4ea990c9484bcf55 i18n/cht/extensions/npm/package.i18n.json
-@@ -12,15 +12,27 @@
- 	"config.npm.runSilent": "以 `--silent` 選項執行 npm 命令。 ",
- 	"config.npm.packageManager": "用來執行指令碼的套件管理員。",
- 	"config.npm.exclude": "為應從自動指令碼偵測排除的資料夾設定 Glob 模式。",
-+<<<<<<< .our
- 	"config.npm.enableScriptExplorer": "啟用 npm 指令碼的總管檢視。",
- 	"config.npm.scriptExplorerAction": "指令碼總管中預設按一下行為: 'open' 或 'run', 預設值為 'open'。",
- 	"npm.parseError": "Npm 工作刪除: 解析檔案 {0} 失敗",
- 	"taskdef.script": "要自訂的 npm 指令碼。",
- 	"taskdef.path": "提供指令碼 package.json 檔案的資料夾路徑。可以省略。",
-+=======
-+	"config.npm.enableScriptExplorer": "當工作區包含 'package.json' 檔案時，啟用 npm 指令碼的總管檢視。",
-+	"npm.parseError": "Npm 工作刪除: 解析檔案 {0} 失敗",
-+	"taskdef.script": "要自訂的 npm 指令碼。",
-+	"taskdef.path": "提供指令碼之 package.json 檔案的資料夾路徑。可以省略。",
-+>>>>>>> .their
- 	"view.name": "Npm 指令碼",
- 	"command.refresh": "重新整理",
- 	"command.run": "執行",
- 	"command.debug": "偵錯",
- 	"command.openScript": "開啟",
-+<<<<<<< .our
- 	"command.runInstall": "執行安裝"
-+=======
-+	"npm.scriptInvalid": "找不到指令碼 '{0}'。請嘗試重新整理檢視。",
-+	"npm.noDebugOptions": "因為指令碼缺少節點偵錯選項 (例如 '--inspect-brk')，所以無法啟動 '{0}' 以進行偵錯。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f48586c4f1df415c8aed6eec70882ad3be0826ed i18n/cht/extensions/typescript-language-features/package.i18n.json
-  our    100644 efbb6f7c43bc0855cfd00cb0b187c9b4f195646c i18n/cht/extensions/typescript-language-features/package.i18n.json
-  their  100644 c7a5d0d5e9c4359e139228acb0c30ee618519627 i18n/cht/extensions/typescript-language-features/package.i18n.json
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/cht/src/vs/base/node/processes.i18n.json
-  our    100644 5989cf789700aef2c4baa997837ae9755e6065c5 i18n/cht/src/vs/base/node/processes.i18n.json
-  their  100644 9512e309432ed22f5c86e4428463eb3e83f8ce42 i18n/cht/src/vs/base/node/processes.i18n.json
-@@ -6,5 +6,9 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"TaskRunner.UNC": "無法在 UNC 磁碟機上執行殼層命令。"
-+=======
-+	"TaskRunner.UNC": "無法在 UNC 磁碟機上執行 shell 命令。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 45db3240b7153bdce7da644c82da935716a1cf78 i18n/cht/src/vs/base/node/zip.i18n.json
-  our    100644 12569f5c94efd9396c9eeadcb62b4a8a4e92a3d4 i18n/cht/src/vs/base/node/zip.i18n.json
-  their  100644 a1a15cb5ec25ea49b927ebf75debf86ca07f034e i18n/cht/src/vs/base/node/zip.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"incompleteExtract": "未完成。已找到 {0} 個項目 (共 {1} 個)",
-+=======
-+	"incompleteExtract": "未完成。已擷取 {0} 個項目 (共 {1} 個)",
-+>>>>>>> .their
- 	"notFound": "在 ZIP 中找不到 {0}。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 17f3a9f8d2c10cd2e9a11f85db04864b6c30d9ba i18n/cht/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  our    100644 59aba8fe0868aff03d0f93f784ef209442ed8b55 i18n/cht/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  their  100644 7983416d3dbd4ef8a0e64fd0c0ab719b1e5e2faa i18n/cht/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-changed in both
-  base   100644 f8df21acfdaf8672c4da4f036e11218b69b0091d i18n/cht/src/vs/code/electron-main/menus.i18n.json
-  our    100644 5f037b2a895deac7820d5f0872d4b9af5505b797 i18n/cht/src/vs/code/electron-main/menus.i18n.json
-  their  100644 ebbacbeaf7eaeea7420d7b275a9564ef4fd3183b i18n/cht/src/vs/code/electron-main/menus.i18n.json
-changed in both
-  base   100644 24534faf5828f82aba4bc3c8874ca73d8a959159 i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 15a1cfb1f061b73d70aaaf6b56b29fe87aab2b5a i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 b5afcd8e75a75df83fd8e062a82679c012ade232 i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json
-changed in both
-  base   100644 6690219f7e0c6e44cc9c0acda476a40efc86578c i18n/cht/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 66736a4e736cf7b9a66b648bff264434bc450d4c i18n/cht/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 be0985019e780a8a1b510d9be3cf6b6457018d53 i18n/cht/src/vs/editor/common/view/editorColorRegistry.i18n.json
-changed in both
-  base   100644 066b714df00596b380c0d1b18e55dbb2dec23bb0 i18n/cht/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 a2cc538e14e2cfd1305228b36fae8794fa7c56f9 i18n/cht/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 e135a1089b1a331ac9d059c9d27a2d3e95abb88e i18n/cht/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-changed in both
-  base   100644 6e1858c002971b72219467441ea78266c7217c9e i18n/cht/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 790929bd611f6dd14a59e2ff8a6640378fde30cb i18n/cht/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 45499691c69e7fcada3699042e8a1dff03e873fc i18n/cht/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -77,7 +77,10 @@
- 	"editorFindMatchBorder": "符合目前搜尋的框線色彩。",
- 	"findMatchHighlightBorder": "符合其他搜尋的框線色彩。",
- 	"findRangeHighlightBorder": "限制搜尋範圍的邊框色彩。不能使用非透明的色彩來隱藏基礎樣式。",
-+<<<<<<< .our
- 	"findWidgetResizeBorder": "尋找小工具的調整列的邊框顏色。",
-+=======
-+>>>>>>> .their
- 	"hoverHighlight": "突顯懸停顯示的文字。不能使用非透明的顏色來隱藏底層的樣式。",
- 	"hoverBackground": "編輯器動態顯示的背景色彩。",
- 	"hoverBorder": "編輯器動態顯示的框線色彩。",
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/cht/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
-  our    100644 16f83c3f147f98c57e16af78fd300448667fb7f4 i18n/cht/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
-  their  100644 71406e911664b4309a53d23883585dcbfe6685e0 i18n/cht/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
-@@ -6,5 +6,9 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"confirmUrl": "允許擴充功能打開此 URL 嗎？"
-+=======
-+	"confirmUrl": "要允許 {0} 延伸模組開啟下列 URL 嗎?"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 efc4571acebe6e3ad850daa79b179edccb379888 i18n/cht/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
-  our    100644 c34b476a9e913991ba7add68a8c022cbd1b063e7 i18n/cht/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
-  their  100644 768c89868b01593779e531ffad72e71586ee29e8 i18n/cht/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
-@@ -8,12 +8,22 @@
- 	],
- 	"vscode.extension.contributes.views.containers.id": "用於識別可透過使用 'views' 參與點參與檢視之容器的唯一識別碼",
- 	"vscode.extension.contributes.views.containers.title": "用於轉譯容器的易讀字串",
-+<<<<<<< .our
- 	"vscode.extension.contributes.views.containers.icon": "容器圖示的路徑。圖示為置於 50x40 區塊中央，且以 'rgb(215, 218, 224)' 或 '#d7dae0' 填滿顏色的 24x24 影像。雖然接受所有影像檔案類型，但建議使用 SVG 作為圖示格式。",
- 	"vscode.extension.contributes.viewsContainers": "提供檢視容器給編輯者",
- 	"views.container.activitybar": "提供檢視容器給活動列",
- 	"test": "測試",
- 	"requirearray": "檢視容器必須為陣列",
- 	"requireidstring": "屬性 ‵{0}` 為必要項且必須為類型 `string`。僅允許英數字元、'_' 與 '-'。",
-+=======
-+	"vscode.extension.contributes.views.containers.icon": "容器圖示的路徑。圖示為置於 50x40 正方形中央，且以 'rgb(215, 218, 224)' 或 '#d7dae0' 填滿顏色的 24x24 影像。雖然接受所有影像檔案類型，但建議使用 SVG 作為圖示格式。",
-+	"vscode.extension.contributes.viewsContainers": "提供檢視容器給編輯者",
-+	"views.container.activitybar": "提供檢視容器給活動列",
-+	"test": "測試",
-+	"proposed": "只有在 dev 不足，或使用下列命令列參數時才能使用 'viewsContainers' 參與: --enable-proposed-api {0}。",
-+	"requirearray": "檢視容器必須為陣列",
-+	"requireidstring": "屬性 ‵{0}` 為必要項且必須為類型 `string`。僅允許英數字元字母、'_'、'-'。",
-+>>>>>>> .their
- 	"requirestring": "屬性 '{0}' 為強制項目且必須屬於 `string` 類型",
- 	"showViewlet": "顯示 {0}",
- 	"view": "檢視"
-changed in both
-  base   100644 0f2f79566226de12080a2cef1124a8c2e1125e17 i18n/cht/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-  our    100644 621e10c3c70a8697b7132e223b79bc286b37c258 i18n/cht/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-  their  100644 905bfa283bdcc279bd433636bae67407a19827ee i18n/cht/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-changed in both
-  base   100644 2c747d5afe2999848f3b386485fd373ab65ea4d2 i18n/cht/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  our    100644 d80f95667d453bf66d6b75a8ae2e81e8a11d486f i18n/cht/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  their  100644 4afe23d64a7ce59dda3f23e42eacfe706ad49030 i18n/cht/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-changed in both
-  base   100644 94fb09e76eba238a3931002fbb51192d3a83a372 i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-  our    100644 ba46f891701adfb7092a6dba679dac4fb50eb21b i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-  their  100644 93abfd36106d7432b4263359f6823de2033606bb i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-@@ -6,6 +6,38 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
-+=======
-+	"vscode.extension.contributes.debuggers": "提供偵錯配接器。",
-+	"vscode.extension.contributes.debuggers.type": "此偵錯配接器的唯一識別碼。",
-+	"vscode.extension.contributes.debuggers.label": "此偵錯配接器的顯示名稱。",
-+	"vscode.extension.contributes.debuggers.program": "偵錯配接器程式的路徑。可以是擴充功能資料夾的絕對或相對路徑。",
-+	"vscode.extension.contributes.debuggers.args": "要傳遞至配接器的選擇性引數。",
-+	"vscode.extension.contributes.debuggers.runtime": "程式屬性不是可執行檔但需要執行階段時的選擇性執行階段。",
-+	"vscode.extension.contributes.debuggers.runtimeArgs": "選擇性執行階段引數。",
-+	"vscode.extension.contributes.debuggers.variables": "從 `launch.json` 中的互動式變數 (例如 ${action.pickProcess}) 對應到命令。",
-+	"vscode.extension.contributes.debuggers.initialConfigurations": "組態，用於產生初始 'launch.json'。",
-+	"vscode.extension.contributes.debuggers.languages": "可將偵錯延伸模組視為「預設偵錯工具」的語言清單。",
-+	"vscode.extension.contributes.debuggers.adapterExecutableCommand": "如有指定，VS Code 會呼叫此命令以決定偵錯配接器的可執行檔路徑及要傳遞的引數。",
-+	"vscode.extension.contributes.debuggers.configurationSnippets": "用於在 'launch.json' 中新增組態的程式碼片段。",
-+	"vscode.extension.contributes.debuggers.configurationAttributes": "JSON 結構描述組態，用於驗證 'launch.json'。",
-+	"vscode.extension.contributes.debuggers.windows": "Windows 特定設定。",
-+	"vscode.extension.contributes.debuggers.windows.runtime": "用於 Windows 的執行階段。",
-+	"vscode.extension.contributes.debuggers.osx": "macOS 特定設定。",
-+	"vscode.extension.contributes.debuggers.osx.runtime": "用於 macOS 的執行階段。",
-+	"vscode.extension.contributes.debuggers.linux": "Linux 特定設定。",
-+	"vscode.extension.contributes.debuggers.linux.runtime": "用於 Linux 的執行階段。",
-+	"vscode.extension.contributes.breakpoints": "提供中斷點。",
-+	"vscode.extension.contributes.breakpoints.language": "允許此語言使用中斷點。",
-+	"app.launch.json.title": "啟動",
-+	"app.launch.json.version": "此檔案格式的版本。",
-+	"app.launch.json.configurations": "組態清單。請使用 IntelliSense 新增新的組態或編輯現有的組態。",
-+	"app.launch.json.compounds": "複合的清單。每個複合都參考將會同時啟動的多重組態。",
-+	"app.launch.json.compound.name": "複合的名稱。顯示於啟動組態下拉式功能表。",
-+	"useUniqueNames": "請使用唯一的組態名稱。",
-+	"app.launch.json.compound.folder": "複合所在的資料夾名稱。",
-+	"app.launch.json.compounds.configurations": "將會作為此複合一部份而啟動之組態的名稱。",
-+>>>>>>> .their
- 	"debugNoType": "偵錯器 'type' 無法省略，且必須為類型 'string'。",
- 	"selectDebug": "選取環境",
- 	"DebugConfig.failed": "無法在 '.vscode' 資料夾 ({0}) 中建立 'launch.json' 檔案。",
-changed in both
-  base   100644 e48c78a24f213a86164c06f8c342aba4ea1aedc8 i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  our    100644 5ae66eaf38de2735d7bd3dbe86cbb8ef523d9473 i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  their  100644 14b63d02d6230d1bff881309d649cfb6d8a81d51 i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-changed in both
-  base   100644 49e59b56429ff0ee036c0c428f2233ac91c7c8c5 i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  our    100644 cab80f74c21631f83449189c695c12cdc0fbf85f i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  their  100644 1a8774452e53b4ab831cd5232823e1e26d1157f4 i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-changed in both
-  base   100644 d431d7870ceb3b60d2641b77b9fbc67cb0be482f i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 17eb85d0cba4bf089ef8b48577e75838680e330d i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 dc0c8bfc2cb1896338b4f14e48abf21cee8e97f6 i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -65,6 +65,7 @@
- 	"emptyFileNameError": "必須提供檔案或資料夾名稱。",
- 	"fileNameStartsWithSlashError": "檔案或資料夾名稱不得以斜線開頭。",
- 	"fileNameExistsError": "這個位置已存在檔案或資料夾 **{0}**。請選擇不同的名稱。",
-+	"fileUsedAsFolderError": "**{0}** 是檔案且不得擁有任何子系。",
- 	"invalidFileNameError": "名稱 **{0}** 不能作為檔案或資料夾名稱。請選擇不同的名稱。",
- 	"filePathTooLongError": "名稱 **{0}** 導致路徑太長。請選擇較短的名稱。",
- 	"compareWithClipboard": "比較使用中的檔案和剪貼簿的檔案",
-changed in both
-  base   100644 f2ac4c2136bc7e8a3f85f2988f525cf8b076e4b1 i18n/cht/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
-  our    100644 3eecc274cd4551c357e2b0267fafda5415f8fa61 i18n/cht/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
-  their  100644 080a6cc9f318500f4dbd70d1644c17dca01aadc2 i18n/cht/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
-@@ -11,7 +11,11 @@
- 	"yes": "是",
- 	"no": "否",
- 	"neverAgain": "不要再顯示",
-+<<<<<<< .our
- 	"install language pack": "在不久之後，VS Code 將只支援格式為 Marketplace 延伸模組的語言套件。請安裝 '{0}' 延伸模組以繼續使用目前設定的語言。",
-+=======
-+	"install language pack": "在不久之後，VS Code 將只支援格式為 Marketplace 延伸模組的語言套件。請安裝 '{0}' 延伸模組已繼續使用目前設定的語言。",
-+>>>>>>> .their
- 	"install": "安裝",
- 	"more information": "詳細資訊...",
- 	"JsonSchema.locale": "要使用的 UI 語言。",
-changed in both
-  base   100644 d9a4412446cae83dd5c476c3367257036f99c9e0 i18n/cht/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 ebc27f353b31e6e9c7c072ddd7a5d4a8a93dc07d i18n/cht/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 55f7e2bb4949432144b02cf0d4bd3edd0985754a i18n/cht/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-changed in both
-  base   100644 70c7d161cc15ec160aa6b9850501e1c198d10e39 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-  our    100644 2737137686c426beed39e10ea8d73accc9f9b5a1 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-  their  100644 451b2ec737a64da067c60b0051b12cae481cecc4 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-changed in both
-  base   100644 5b44b85bd11a19c33d9ff5c1e163df3167b3a13a i18n/cht/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  our    100644 7d5350b520b4d67111b7f41cf915db16407871b6 i18n/cht/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  their  100644 f19c7db0f103c16003c3119d546d9ea569b816a3 i18n/cht/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-changed in both
-  base   100644 7efb13a1a102b58fbcfa16e05ec6d0981aa476a6 i18n/deu/extensions/git/out/commands.i18n.json
-  our    100644 1abad5f86ec11c777f2319fc1588d47f5ea1c8f5 i18n/deu/extensions/git/out/commands.i18n.json
-  their  100644 cdcaf78706ccb579c70c1ad588f067c6bbc94966 i18n/deu/extensions/git/out/commands.i18n.json
-@@ -10,8 +10,14 @@
- 	"remote branch at": "Remotebranch unter {0}",
- 	"create branch": "$(plus) Neuen Branch erstellen",
- 	"repourl": "Repository-URL",
-+<<<<<<< .our
- 	"selectFolder": "Repositoryspeicherort auswählen",
- 	"cloning": "Das Git-Repository \"{0}\" wird geklont …",
-+=======
-+	"parent": "Übergeordnetes Verzeichnis",
-+	"cloning": "Das Git-Repository \"{0}\" wird geklont …",
-+	"openrepo": "Repository öffnen",
-+>>>>>>> .their
- 	"proposeopen": "Möchten Sie das geklonte Repository öffnen?",
- 	"openrepo": "Repository öffnen",
- 	"add": "Zum Arbeitsbereich hinzufügen",
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/deu/extensions/npm/out/npmView.i18n.json
-  our    100644 d672afcae9e388fcfe4a89c3d602a10bcf89e156 i18n/deu/extensions/npm/out/npmView.i18n.json
-  their  100644 e56a09ae55cfd711278bb3c2af5daf2a5c7f6d82 i18n/deu/extensions/npm/out/npmView.i18n.json
-@@ -6,9 +6,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"noScripts": "Keine Skripte gefunden.",
- 	"noDebugOptions": "\"{0}\" konnte nicht zum Debuggen gestartet werden, da die Skripte keine Node-Debugging-Option enthalten wie z. B. \"--inspect-brk\".",
- 	"learnMore": "Weitere Informationen",
- 	"ok": "OK",
- 	"scriptInvalid": "Das Skript \"{0}\" wurde nicht gefunden. Versuchen Sie, die Ansicht zu aktualisieren."
-+=======
-+	"npm.noDebugOptions": "\"{0}\" konnte nicht zum Debuggen gestartet werden, da die Skripte keine Node-Debugging-Option enthalten wie z. B. \"--inspect-brk\".",
-+	"npm.scriptInvalid": "Das Skript \"{0}\" wurde nicht gefunden. Versuchen Sie, die Ansicht zu aktualisieren."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 91063ce0648c5d2ac15000c56291a6ccdd678c4f i18n/deu/extensions/npm/package.i18n.json
-  our    100644 8df75704426af1d4997cfc228d8144b23fc7a25f i18n/deu/extensions/npm/package.i18n.json
-  their  100644 ba906568b83b5a4c10c03bd55cf56312969f72d1 i18n/deu/extensions/npm/package.i18n.json
-@@ -12,15 +12,28 @@
- 	"config.npm.runSilent": "npm-Befehle mit der Option \"--silent\" ausführen.",
- 	"config.npm.packageManager": "Der zu verwendende Paket-Manager, um Skripte auszuführen.",
- 	"config.npm.exclude": "Konfigurieren Sie Globmuster für Ordner, die von der automatischen Skripterkennung ausgeschlossen werden sollen.",
-+<<<<<<< .our
- 	"config.npm.enableScriptExplorer": "Aktiviert eine Exploreransicht für npm-Skripts.",
- 	"config.npm.scriptExplorerAction": "Die im Skript-Explorer verwendete Standardaktion für Klicks. Mögliche Werte sind \"open\" (Standard) und \"run\".",
- 	"npm.parseError": "NPM-Aufgabenerkennung: Fehler beim Analysieren der Datei {0}",
- 	"taskdef.script": "Das anzupassende NPM-Skript.",
- 	"taskdef.path": "Der Pfad zum Ordner der package.json-Datei, die das Skript bereitstellt. Kann weggelassen werden.",
- 	"view.name": "npm-Skripts",
-+=======
-+	"config.npm.enableScriptExplorer": "Explorer-Ansicht für NPM-Skripte aktivieren, wenn der Arbeitsbereich die Datei \"package.json\" enthält.",
-+	"npm.parseError": "NPM-Aufgabenerkennung: Fehler beim Analysieren der Datei {0}",
-+	"taskdef.script": "Das anzupassende NPM-Skript.",
-+	"taskdef.path": "Der Pfad zu dem Ordner der Datei vom Typ \"package.json\", die das Skript bereitstellt. Kann ausgelassen werden.",
-+	"view.name": "NPM-Skripte",
-+>>>>>>> .their
- 	"command.refresh": "Aktualisieren",
- 	"command.run": "Ausführen",
- 	"command.debug": "Debuggen",
- 	"command.openScript": "Öffnen",
-+<<<<<<< .our
- 	"command.runInstall": "Installation ausführen"
-+=======
-+	"npm.scriptInvalid": "Das Skript \"{0}\" wurde nicht gefunden. Versuchen Sie, die Ansicht zu aktualisieren.",
-+	"npm.noDebugOptions": "\"{0}\" konnte nicht zum Debuggen gestartet werden, da die Skripte keine Node-Debugging-Option enthalten wie z. B. \"--inspect-brk\"."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8aa361d46a19145337139d1f85db2f5347338c41 i18n/deu/extensions/typescript-language-features/package.i18n.json
-  our    100644 b4c912aea2b33dc0c067571ea6751f93231153cb i18n/deu/extensions/typescript-language-features/package.i18n.json
-  their  100644 8fa1df1b16981c99d6ad1057d92ac28f0acca7a3 i18n/deu/extensions/typescript-language-features/package.i18n.json
-@@ -59,9 +59,13 @@
- 	"typescript.experimental.syntaxFolding": "Aktiviert bzw. deaktiviert die syntaxabhängigen Faltungsmarkierungen.",
- 	"taskDefinition.tsconfig.description": "Die \"tsconfig\"-Datei, die den TS-Build definiert.",
- 	"javascript.suggestionActions.enabled": "Aktiviert/deaktiviert Vorschlagsdiagnosen für JavaScript-Dateien im Editor. Erfordert TypeScript 2.8 oder höher.",
-+<<<<<<< .our
- 	"typescript.suggestionActions.enabled": "Aktiviert bzw. deaktiviert Vorschlagsdiagnosen für TypeScript-Dateien im Editor. Erfordert TypeScript 2.8 oder höher.",
- 	"typescript.preferences.quoteStyle": "Der bevorzugte Stil für Anführungszeichen bei schnellen Problembehebungen. Mögliche Werte sind \"single\" (einfache Anführungszeichen), \"double\" (doppelte Anführungszeichen) und \"auto\" (hierbei wird der Stil für Anführungszeichen aus bestehenden Importen abgeleitet). Erfordert TypeScript 2.9 oder höher.",
- 	"typescript.preferences.importModuleSpecifier": "Bevorzugter Pfadstil für den automatischen Import. Mögliche Werte sind:\n- \"relative\" (relativ zum Dateispeicherort)\n- \"non-relative\" (nicht-relativ, d. h. auf Grundlage des in der Datei \"jsconfig.json\" oder \"tsconfig.json\" konfigurierten Werts für \"baseUrl\")\n- \"auto\" (ermittelt den jeweils kürzeren Pfadtyp)\nErfordert TypeScript 2.9 oder höher.",
- 	"typescript.showUnused": "Aktiviert bzw. deaktiviert das Hervorheben unbenutzter Variablen im Code. Erforderlich TypeScript 2.9 oder höher.",
- 	"typescript.updateImportsOnFileMove.enabled": "Aktiviert bzw. deaktiviert die automatische Änderungen von Importpfaden, wenn Sie eine Datei in VS Code umbenennen oder verschieben. Mögliche Werte sind \"prompt\" (fordert bei jeder Umbenennung zur Auswahl auf), \"always\" (aktualisiert Pfade automatisch\" und \"never\" (Pfade werden nie geändert). Erfordert TypeScript 2.9 oder höher."
-+=======
-+	"typescript.suggestionActions.enabled": "Aktiviert/deaktiviert Vorschlagsdiagnosen für TypeScript-Dateien im Editor. Erfordert TypeScript 2.8 oder höher."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35d78b937d4af0d7fce22e0b460768a367b4029a i18n/deu/src/vs/base/node/zip.i18n.json
-  our    100644 558084d9d00e9ecd174fdddd04fe98a731b47c4a i18n/deu/src/vs/base/node/zip.i18n.json
-  their  100644 58f771626bae8ad2d4feaf3b812f1a901d047a6e i18n/deu/src/vs/base/node/zip.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"incompleteExtract": "Unvollständig. {0} von {1} Einträgen gefunden",
-+=======
-+	"incompleteExtract": "Unvollständig. {0} von {1} Einträgen wurden extrahiert",
-+>>>>>>> .their
- 	"notFound": "{0} wurde im ZIP nicht gefunden."
- }
-\ No newline at end of file
-changed in both
-  base   100644 3d0b8a3e84dc468ee2349aa4049e5ba7335ff693 i18n/deu/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  our    100644 5bc9127f7c619b851c0cf1328cd211996a08b032 i18n/deu/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  their  100644 ee5978abf0adfc100dd72fba6f0dae3170f159aa i18n/deu/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-changed in both
-  base   100644 5318cd985e49e83057bfa04e4d60cb16f5e33d67 i18n/deu/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  our    100644 b2207b414add0edf1a35b65e634fce205abbcca5 i18n/deu/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  their  100644 50c036699db9b4d762d195c2b10ac120a00745fa i18n/deu/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-changed in both
-  base   100644 aa725d508b2f022a49cc5742b36e1b341bdf1b9a i18n/deu/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
-  our    100644 b9932f0e51797c26200c31e32d322eb857ac7a80 i18n/deu/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
-  their  100644 a692133c830d41bc8462f430d2dbbbf4490431f1 i18n/deu/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
-@@ -11,7 +11,11 @@
- 	"pid": "PID",
- 	"name": "Name",
- 	"killProcess": "Prozess beenden",
-+<<<<<<< .our
- 	"forceKillProcess": "Beenden des Prozesses erzwingen",
- 	"copy": "Kopieren",
- 	"copyAll": "Alles kopieren"
-+=======
-+	"forceKillProcess": "Beenden des Prozesses erzwingen"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 cc2c26f1108354be4e9a0b16c8fe41ef9035ed9c i18n/deu/src/vs/code/electron-main/menus.i18n.json
-  our    100644 2c62aec3f2252906a0cfb94c2bac025ecf6adbb0 i18n/deu/src/vs/code/electron-main/menus.i18n.json
-  their  100644 36a62487016ab1bfb55d864f6d10f18a0a31960a i18n/deu/src/vs/code/electron-main/menus.i18n.json
-changed in both
-  base   100644 37cc27767cded408a8292fbbfb22fc18e99066de i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 0cb95fccc47d309d94aacd1e25b0718fd455d527 i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 f772df3ec923b37a96a5e87deef949c89e0cfc33 i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json
-changed in both
-  base   100644 ae336794beb564cb2bd5bb72ef125a75f32ad147 i18n/deu/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 7bcd160f251f75f4318d89da439565bbd4c696e5 i18n/deu/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 1a2890a424675e8ed24d6e51dc0ec03b8abbb0b7 i18n/deu/src/vs/editor/common/view/editorColorRegistry.i18n.json
-changed in both
-  base   100644 707ff28811b06009bcb90f0c1ccd531420aae430 i18n/deu/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
-  our    100644 87a58e790f129c347762cd604194e93ff72373da i18n/deu/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
-  their  100644 d3a255e1128768647284d39f710c35f58d161d10 i18n/deu/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
-@@ -9,8 +9,13 @@
- 	"quickFixWithKb": "Korrekturen anzeigen ({0})",
- 	"quickFix": "Korrekturen anzeigen",
- 	"quickfix.trigger.label": "Schnelle Problembehebung …",
-+<<<<<<< .our
- 	"editor.action.quickFix.noneMessage": "Keine Codeaktionen verfügbar",
- 	"refactor.label": "Refactoring durchführen...",
-+=======
-+	"editor.action.quickFix.noneMessage": "Keine Code-Aktionen verfügbar",
-+	"refactor.label": "Umgestalten...",
-+>>>>>>> .their
- 	"editor.action.refactor.noneMessage": "Keine Refactorings verfügbar",
- 	"source.label": "Quellaktion…",
- 	"editor.action.source.noneMessage": "Keine Quellaktionen verfügbar",
-changed in both
-  base   100644 fe6e6c0c3168cf1dadb1d5b31eb6ce7bdf55a44e i18n/deu/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 efdaa6c50b1a7075eb309307a09334b8e64087d3 i18n/deu/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 f708991d81c24ed230d8b88c63c878a7fa4c4888 i18n/deu/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-changed in both
-  base   100644 f5a116e6036cd824205aae97da2fde23707f94fe i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 b32f03c31fd5ffcb9742f2b1188daade81a7b028 i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 7f1307cdec5073712c7750783b0e4f9efbac922e i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -77,7 +77,10 @@
- 	"editorFindMatchBorder": "Randfarbe des aktuellen Suchergebnisses.",
- 	"findMatchHighlightBorder": "Randfarbe der anderen Suchtreffer.",
- 	"findRangeHighlightBorder": "Rahmenfarbe des Bereichs zur Einschränkung der Suche. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen.",
-+<<<<<<< .our
- 	"findWidgetResizeBorder": "Rahmenfarbe der Größenänderungsleiste im Suchwidget.",
-+=======
-+>>>>>>> .their
- 	"hoverHighlight": "Hervorhebung eines Worts, unter dem ein Mauszeiger angezeigt wird. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen. ",
- 	"hoverBackground": "Background color of the editor hover.",
- 	"hoverBorder": "Rahmenfarbe des Editor-Mauszeigers.",
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/deu/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
-  our    100644 963c535d992637d16b79e91922b7e29bb61ec10d i18n/deu/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
-  their  100644 3077316f159c595763cea6c89502844ad2d98aed i18n/deu/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
-@@ -6,5 +6,9 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"confirmUrl": "Darf eine Erweiterung diese URL öffnen?"
-+=======
-+	"confirmUrl": "Soll die Erweiterung {0} die folgende URL öffnen?"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 729878b15953e86e739b4eaba345ce256f606217 i18n/deu/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
-  our    100644 f7f318e718831f15f9504e79c55f00c14fd6171e i18n/deu/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
-  their  100644 d4fffac7aa8ba38ee589c81b92ee2577e99ae5c0 i18n/deu/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
-@@ -8,12 +8,22 @@
- 	],
- 	"vscode.extension.contributes.views.containers.id": "Eindeutige ID, die zum Bestimmen des Containers verwendet wird, in dem Ansichten mithilfe des Beitragspunkts \"views\" beigetragen werden können.",
- 	"vscode.extension.contributes.views.containers.title": "Visuell lesbare Zeichenfolge zum Rendern des Containers",
-+<<<<<<< .our
- 	"vscode.extension.contributes.views.containers.icon": "Pfad zum Containersymbol. Symbole sind 24×24 groß und in einem Rechteck (50×40) zentriert. Die Füllfarbe ist \"rgb(215, 218, 224)\" bzw. \"#d7dae0\". Zwar werden alle Bilddateitypen akzeptiert, es werden jedoch SVG-Symbole empfohlen.",
- 	"vscode.extension.contributes.viewsContainers": "Trägt Ansichtencontainer zum Editor bei",
- 	"views.container.activitybar": "Trägt Ansichtencontainer zur Aktivitätsleiste bei",
- 	"test": "Test",
- 	"requirearray": "Ansichtencontainer müssen ein Array sein",
- 	"requireidstring": "Die Eigenschaft \"{0}\" ist erforderlich. Sie muss vom Typ \"string\" sein. Nur alphanumerische Buchstaben sowie \"_\" und \"-\" sind zulässig.",
-+=======
-+	"vscode.extension.contributes.views.containers.icon": "Pfad zum Containersymbol. Symbole sind 24x24 groß und zentriert in einem Rechteck (50x40), und ihre Füllfarbe ist \"rgb(215, 218, 224)\" oder \"#d7dae0\". SVG-Symbole werden empfohlen, es wird allerdings jeder Bilddateityp akzeptiert.",
-+	"vscode.extension.contributes.viewsContainers": "Trägt Ansichtencontainer zum Editor bei",
-+	"views.container.activitybar": "Trägt Ansichtencontainer zur Aktivitätsleiste bei",
-+	"test": "Test",
-+	"proposed": "Der Beitrag \"viewsContainers\" ist nur verfügbar, wenn er außerhalb der Entwicklung ausgeführt wird oder mithilfe des folgenden Befehlszeilenschalters: --enable-proposed-api {0}",
-+	"requirearray": "Ansichtencontainer müssen ein Array sein",
-+	"requireidstring": "Die Eigenschaft \"{0}\" ist erforderlich. Sie muss vom Typ \"string\" sein. Nur alphanumerische Buchstaben, \"_\", \"-\" sind zulässig.",
-+>>>>>>> .their
- 	"requirestring": "Die Eigenschaft \"{0}\" ist erforderlich. Sie muss vom Typ \"string\" sein.",
- 	"showViewlet": "{0} anzeigen",
- 	"view": "Anzeigen"
-changed in both
-  base   100644 659f9528874ef9e8089247784980c76fb8cf5da6 i18n/deu/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-  our    100644 b11a3acca259795aed91745ee15e51fc17845d23 i18n/deu/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-  their  100644 8c99549ea968c08263297bb3534922d70a4a16b5 i18n/deu/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-changed in both
-  base   100644 0ab881816f87e9db5b8d570d8cb05cf9a2751fff i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-  our    100644 7c5d10d550d3b9b70c30888b450dd546ea84dff0 i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-  their  100644 429759ca475b4f3cb01005bb0be6edd11c451d29 i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-@@ -6,6 +6,38 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
-+=======
-+	"vscode.extension.contributes.debuggers": "Trägt Debugadapter bei.",
-+	"vscode.extension.contributes.debuggers.type": "Der eindeutige Bezeichner für diese Debugadapter.",
-+	"vscode.extension.contributes.debuggers.label": "Der Anzeigename für diese Debugadapter.",
-+	"vscode.extension.contributes.debuggers.program": "Der Pfad zum Debugadapterprogramm. Der Pfad ist absolut oder relativ zum Erweiterungsordner.",
-+	"vscode.extension.contributes.debuggers.args": "Optionale Argumente, die an den Adapter übergeben werden sollen.",
-+	"vscode.extension.contributes.debuggers.runtime": "Optionale Laufzeit für den Fall, dass das Programmattribut keine ausführbare Datei ist und eine Laufzeit erfordert.",
-+	"vscode.extension.contributes.debuggers.runtimeArgs": "Optionale Laufzeitargumente.",
-+	"vscode.extension.contributes.debuggers.variables": "Eine Zuordnung von interaktiven Variablen (z. B. \"${action.pickProcess}\") in \"launch.json\" zu einem Befehl.",
-+	"vscode.extension.contributes.debuggers.initialConfigurations": "Konfigurationen zum Generieren der anfänglichen Datei \"launch.json\".",
-+	"vscode.extension.contributes.debuggers.languages": "Liste der Sprachen, für die die Debugerweiterung als \"Standarddebugger\" angesehen werden kann",
-+	"vscode.extension.contributes.debuggers.adapterExecutableCommand": "Wenn dies festgelegt ist, ruft der VS Code diesen Befehl auf, um den ausführbaren Pfad des Debugadapters und die zu übergebenden Argumente zu bestimmen.",
-+	"vscode.extension.contributes.debuggers.configurationSnippets": "Snippets zum Hinzufügen neuer Konfigurationen in \"launch.json\".",
-+	"vscode.extension.contributes.debuggers.configurationAttributes": "JSON-Schemakonfigurationen zum Überprüfen von \"launch.json\".",
-+	"vscode.extension.contributes.debuggers.windows": "Windows-spezifische Einstellungen.",
-+	"vscode.extension.contributes.debuggers.windows.runtime": "Die für Windows verwendete Laufzeit.",
-+	"vscode.extension.contributes.debuggers.osx": "macOS-spezifische Einstellungen.",
-+	"vscode.extension.contributes.debuggers.osx.runtime": "Für macOS verwendete Laufzeit.",
-+	"vscode.extension.contributes.debuggers.linux": "Linux-spezifische Einstellungen.",
-+	"vscode.extension.contributes.debuggers.linux.runtime": "Die für Linux verwendete Laufzeit.",
-+	"vscode.extension.contributes.breakpoints": "Trägt Haltepunkte bei.",
-+	"vscode.extension.contributes.breakpoints.language": "Lässt Haltepunkte für diese Sprache zu.",
-+	"app.launch.json.title": "Starten",
-+	"app.launch.json.version": "Die Version dieses Dateiformats.",
-+	"app.launch.json.configurations": "Die Liste der Konfigurationen. Fügen Sie neue Konfigurationen hinzu, oder bearbeiten Sie vorhandene Konfigurationen mit IntelliSense.",
-+	"app.launch.json.compounds": "Liste der Verbundelemente. Jeder Verbund verweist auf mehrere Konfigurationen, die zusammen gestartet werden.",
-+	"app.launch.json.compound.name": "Name des Verbunds. Wird im Dropdownmenü der Startkonfiguration angezeigt.",
-+	"useUniqueNames": "Verwenden Sie eindeutige Konfigurationsnamen.",
-+	"app.launch.json.compound.folder": "Name des Ordners, in dem sich der Verbund befindet.",
-+	"app.launch.json.compounds.configurations": "Namen von Konfigurationen, die als Bestandteil dieses Verbunds gestartet werden.",
-+>>>>>>> .their
- 	"debugNoType": "Der Debugger \"type\" darf nicht ausgelassen werden und muss den Typ \"string\" aufweisen.",
- 	"selectDebug": "Umgebung auswählen",
- 	"DebugConfig.failed": "Die Datei \"launch.json\" kann nicht im Ordner \".vscode\" erstellt werden ({0}).",
-changed in both
-  base   100644 fa33a362fd9a37a2f4c5978b730d6f2a9df6fdbf i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  our    100644 7acc6509b24f394f4d1266257c48f3e0fbbaa375 i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  their  100644 d71dffbf816e727a90f1311091369407404b138e i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-changed in both
-  base   100644 6789227ba760582e1a7b3edd0ae1bef93302556d i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  our    100644 34a1a3d6da4aff0a786a99cb931978e719f127b5 i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  their  100644 78913a24b24293270d15a7ba9a9fc82f2a25ef20 i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-changed in both
-  base   100644 9f68b999300d621c0271be5e232946b1fc98a4bc i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 e5540f790640626d6989cde6c94da0327b708bbf i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 6eb02028f643cff7fc7783c3d743222313e29972 i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -65,6 +65,7 @@
- 	"emptyFileNameError": "Es muss ein Datei- oder Ordnername angegeben werden.",
- 	"fileNameStartsWithSlashError": "Ein Datei- oder Ordnername darf nicht mit einem Schrägstrich beginnen.",
- 	"fileNameExistsError": "Eine Datei oder ein Ordner **{0}** ist an diesem Ort bereits vorhanden. Wählen Sie einen anderen Namen.",
-+	"fileUsedAsFolderError": "**{0}** ist eine Datei und darf keine Nachfolger haben.",
- 	"invalidFileNameError": "Der Name **{0}** ist als Datei- oder Ordnername ungültig. Bitte wählen Sie einen anderen Namen aus.",
- 	"filePathTooLongError": "Der Name **{0}** führt zu einem Pfad, der zu lang ist. Wählen Sie einen kürzeren Namen.",
- 	"compareWithClipboard": "Aktive Datei mit Zwischenablage vergleichen",
-changed in both
-  base   100644 d69e7a77b170ad509283b7f3a907ff721b1c288f i18n/deu/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
-  our    100644 a450d3a29c284295da79e91ba2f301c1f75dbc43 i18n/deu/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
-  their  100644 d3b6302160abc38c06f6148a4c42f31aa32b1858 i18n/deu/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
-changed in both
-  base   100644 23fd972a5ff9f0cc1b35b702fc7b2a2ccd3595cb i18n/deu/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 24b953a60a63d0739209f04cdbf2997fcdde9b37 i18n/deu/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 5ce5bde4006ef6415806042167cfbc6491cf5e96 i18n/deu/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -31,5 +31,9 @@
- 	"search.followSymlinks": "Steuert, ob Symlinks während der Suche gefolgt werden.",
- 	"search.smartCase": "Sucht ohne Berücksichtigung von Groß-/Kleinschreibung, wenn das Muster kleingeschrieben ist, andernfalls wird mit Berücksichtigung von Groß-/Kleinschreibung gesucht.",
- 	"search.globalFindClipboard": "Steuert, ob die Suchansicht die freigegebene Suchzwischenablage auf macOS lesen oder verändern soll",
-+<<<<<<< .our
- 	"search.location": "Steuert, ob die Suche als Ansicht in der Seitenleiste oder als Bereich angezeigt wird (die zweite Variante bietet mehr Platz in der Horizontalen)."
-+=======
-+	"search.location": "Steuert, ob die Suche als Ansicht in der Seitenleiste oder als Bedienfeld im Bedienfeldbereich angezeigt wird, damit horizontal mehr Platz zur Verfügung steht. In der nächsten Version wird das horizontale Layout im Bedienfeld verbessert, und dies wird keine Vorschau mehr sein."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c66ad2bebf86d4e4a1334d00c3e531b56c2fb8a8 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 17f468b874b715481031f72251583765b50e478f i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 dc99fa23837e46cddcc741f27014543027df93e7 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-changed in both
-  base   100644 d16dc80c2da465c7449f61f1fe49fe234ff8a19e i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-  our    100644 aa2b4267c119832c5968d8d9433c6d265bf82336 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-  their  100644 c4511678dd9a28039d09d52dae156b9aacef9416 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-changed in both
-  base   100644 dbd9faf3c7eec609e81a96a1b44380315370e922 i18n/deu/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 dca9f59735754d2304f7bca4be1c8c6b2470923f i18n/deu/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 7ad30b14c43e974bd4ed268faa8ec5de7ea8c068 i18n/deu/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -20,7 +20,11 @@
- 	"later": "Später",
- 	"updateAvailable": "Ein Update ist verfügbar: {0} {1}",
- 	"installUpdate": "Update installieren",
-+<<<<<<< .our
- 	"updateInstalling": "{0} {1} wird im Hintergrund installiert. Wir informieren Sie, wenn der Vorgng abgeschlossen ist.",
-+=======
-+	"updateInstalling": "{0} {1} wird im Hintergrund installiert. Wir informieren Sie, wenn dies abgeschlossen ist.",
-+>>>>>>> .their
- 	"updateAvailableAfterRestart": "Starten Sie {0} neu, um das neueste Update zu installieren.",
- 	"updateNow": "Jetzt aktualisieren",
- 	"commandPalette": "Befehlspalette...",
-changed in both
-  base   100644 de0f13bcb07c08efa78664f1ec774813dcd2406c i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  our    100644 32b9b62035bd1682e803803a438bf61ea5ca8408 i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  their  100644 a61c1d6c459b58cfee55ea98e856e438e33763ca i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-@@ -28,7 +28,11 @@
- 	"welcomePage.installExtensionPacksDescription": "Unterstützung für {0} und {1} installieren",
- 	"welcomePage.moreExtensions": "mehr",
- 	"welcomePage.installKeymapDescription": "Einstellungen und Tastenzuordnungen",
-+<<<<<<< .our
- 	"welcomePage.installKeymapExtension": "Installieren Sie die Einstellungen und Tastenkombinationen von {0} und {1}.",
-+=======
-+	"welcomePage.installKeymapExtension": "Installieren Sie die Einstellungen und Tastenkombinationen von {0} und {1}",
-+>>>>>>> .their
- 	"welcomePage.others": "Andere",
- 	"welcomePage.colorTheme": "Farbdesign",
- 	"welcomePage.colorThemeDescription": "Passen Sie das Aussehen des Editors und Ihres Codes an Ihre Wünsche an.",
-changed in both
-  base   100644 8b206a77c779d12b041986ab5390dc97c7ed1ab7 i18n/deu/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-  our    100644 6dfaa8e09e1ebf0b9c830edc04ba7a7171df0643 i18n/deu/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-  their  100644 00fa493a4495654d46d4e99fee9a538f1d24051b i18n/deu/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-changed in both
-  base   100644 c75ef9a2b35608be768ab5d1238c866d3f8b0858 i18n/deu/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  our    100644 f971f5bb684d0a7cf682d2a34acf06f1a81459bf i18n/deu/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  their  100644 7555e98e02b15bfeaeb51397cb6b29263eeb4e08 i18n/deu/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-@@ -11,6 +11,10 @@
- 	"fileIsDirectoryError": "Die Datei ist ein Verzeichnis",
- 	"fileNotModifiedError": "Datei nicht geändert seit",
- 	"fileBinaryError": "Die Datei scheint eine Binärdatei zu sein und kann nicht als Text geöffnet werden.",
-+<<<<<<< .our
- 	"err.create": "Fehler beim Erstellen der Datei {0}.",
-+=======
-+	"err.create": "Fehler beim Erstellen der Datei {0}",
-+>>>>>>> .their
- 	"fileMoveConflict": "Verschieben/Kopieren kann nicht ausgeführt werden. Die Datei ist am Ziel bereits vorhanden."
- }
-\ No newline at end of file
-changed in both
-  base   100644 6f66844414293fcee28db9d5c99b52d0c4e4a836 i18n/esn/extensions/git/out/commands.i18n.json
-  our    100644 022bf20d57e92a28a5ced5a2d0998bc8b0dfe335 i18n/esn/extensions/git/out/commands.i18n.json
-  their  100644 628bcce73f8823595734e010bf13dbdf60b0ccc1 i18n/esn/extensions/git/out/commands.i18n.json
-@@ -10,8 +10,14 @@
- 	"remote branch at": "Rama remota en {0}",
- 	"create branch": "$(plus) crear nueva rama",
- 	"repourl": "URL del repositorio",
-+<<<<<<< .our
- 	"selectFolder": "Seleccione la ubicación del repositorio",
- 	"cloning": "Clonación del repositorio git ' {0} '...",
-+=======
-+	"parent": "Directorio principal",
-+	"cloning": "Clonación del repositorio git ' {0} '...",
-+	"openrepo": "Abrir repositorio",
-+>>>>>>> .their
- 	"proposeopen": "¿Desea abrir el repositorio clonado?",
- 	"openrepo": "Abrir repositorio",
- 	"add": "Añadir a espacio de trabajo",
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/esn/extensions/npm/out/npmView.i18n.json
-  our    100644 7b8986ac9731f6e8082d45b2fb033768b73fa474 i18n/esn/extensions/npm/out/npmView.i18n.json
-  their  100644 5d96d5850aac4500130b45b888e0da00f875da0d i18n/esn/extensions/npm/out/npmView.i18n.json
-@@ -6,9 +6,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"noScripts": "No se encontraron scripts",
- 	"noDebugOptions": "No se pudo iniciar \"{0} \" para la depuración porque las secuencias de comandos carecen de una opción de depuración de nodo, por ejemplo \"--inspect-brk\".",
- 	"learnMore": "Más información",
- 	"ok": "Aceptar",
- 	"scriptInvalid": "No se pudo encontrar la secuencia de comandos \"{0}\". Trate de actualizar la vista."
-+=======
-+	"npm.noDebugOptions": "No se pudo iniciar \"{0} \" para la depuración porque las secuencias de comandos carecen de una opción de depuración de nodo, por ejemplo \"--inspect-brk\".",
-+	"npm.scriptInvalid": "No se pudo encontrar la secuencia de comandos \"{0}\". Trate de actualizar la vista."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 57d6dcb65e80fe4addfcd6394ab1367f16caf1e7 i18n/esn/extensions/npm/package.i18n.json
-  our    100644 7e73e482c8e8bbff949c516cd193524915f7859f i18n/esn/extensions/npm/package.i18n.json
-  their  100644 4649fdc6be8af23828b6cdde81d84f582cbb15c9 i18n/esn/extensions/npm/package.i18n.json
-@@ -12,15 +12,27 @@
- 	"config.npm.runSilent": "Ejecutar comandos de npm con la opción '--silent'",
- 	"config.npm.packageManager": "El administrador de paquetes utilizado para ejecutar secuencias de comandos. ",
- 	"config.npm.exclude": "Configura patrones globales para carpetas que deben excluirse de la detección automática de scripts. ",
-+<<<<<<< .our
- 	"config.npm.enableScriptExplorer": "Habilitar una vista de explorador para scripts de npm.",
- 	"config.npm.scriptExplorerAction": "La acción de clic predeterminada utilizada en el explorador de secuencias de comandos: 'abrir' o 'ejecutar', el valor predeterminado es 'abrir'.",
- 	"npm.parseError": "Detección de tareas de nueva gestión pública: no se pudo analizar el archivo {0}",
- 	"taskdef.script": "Script npm que debe personalizarse.",
- 	"taskdef.path": "La ruta de la carpeta del archivo package.json que proporciona la secuencia de comandos. Se puede omitir.",
-+=======
-+	"config.npm.enableScriptExplorer": "Habilitar la vista del Explorador para los scripts de la NMP, cuando el espacio de trabajo contiene un archivo 'package.json'.",
-+	"npm.parseError": "Detección de tareas de nueva gestión pública: no se pudo analizar el archivo {0}",
-+	"taskdef.script": "Script npm que debe personalizarse.",
-+	"taskdef.path": "Ruta de acceso a la carpeta del archivo package.json que proporciona el script. Se puede omitir.",
-+>>>>>>> .their
- 	"view.name": "Scripts Npm ",
- 	"command.refresh": "Actualizar",
- 	"command.run": "Ejecutar",
- 	"command.debug": "Depurar",
- 	"command.openScript": "Abrir",
-+<<<<<<< .our
- 	"command.runInstall": "Ejecutar instalación"
-+=======
-+	"npm.scriptInvalid": "No se pudo encontrar el script '{0}'. Trate de actualizar la vista.",
-+	"npm.noDebugOptions": "No se pudo iniciar ' {0} ' para la depuración porque las secuencias de comandos carecen de una opción de depuración de nodo, por ejemplo '--inspect-brk'."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 4fa8264443e2aa34bc0d23c356ff79d7789882cf i18n/esn/src/vs/code/electron-main/menus.i18n.json
-  our    100644 2173ae65d3ed6bda349c8ed563942ab2c195e7ea i18n/esn/src/vs/code/electron-main/menus.i18n.json
-  their  100644 40f67563e55ee0fbf63e71cf4db712975c1e5da9 i18n/esn/src/vs/code/electron-main/menus.i18n.json
-@@ -145,7 +145,11 @@
- 	"miConditionalBreakpoint": "Punto de interrupción &&condicional...",
- 	"miInlineBreakpoint": "Punt&&o de interrupción en línea",
- 	"miFunctionBreakpoint": "Punto de interrupción de &&función...",
-+<<<<<<< .our
- 	"miLogPoint": "&&Punto de registro",
-+=======
-+	"miLogPoint": "&& Logpoint...",
-+>>>>>>> .their
- 	"miNewBreakpoint": "&&Nuevo punto de interrupción",
- 	"miEnableAllBreakpoints": "Habilitar todos los puntos de interrupción",
- 	"miDisableAllBreakpoints": "&&Deshabilitar todos los puntos de interrupción",
-changed in both
-  base   100644 d841bf48f91f4450cbe3d8c4696c3ae959a2db1a i18n/esn/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 6ad3e3ebd5e87cf26a1b950237c8c58f3d92b674 i18n/esn/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 97f58b07d4b4d0ca4026c357d4456a4e0f15570e i18n/esn/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -16,7 +16,11 @@
- 	"lineNumbers.on": "Los números de línea se muestran como un número absoluto.",
- 	"lineNumbers.relative": "Los números de línea se muestran como distancia en líneas a la posición del cursor.",
- 	"lineNumbers.interval": "Los números de línea se muestran cada 10 líneas.",
-+<<<<<<< .our
- 	"lineNumbers": "Controla la visualización de los números de línea.",
-+=======
-+	"lineNumbers": "Controla la visualización de números de línea.",
-+>>>>>>> .their
- 	"rulers": "Representar reglas verticales después de un cierto número de caracteres monoespacio. Usar multiples valores para multiples reglas. No se dibuja ninguna regla si la matriz esta vacía.",
- 	"wordSeparators": "Caracteres que se usarán como separadores de palabras al realizar operaciones o navegaciones relacionadas con palabras.",
- 	"tabSize": "El número de espacios a los que equivale una tabulación. Este valor se invalida según el contenido del archivo cuando `editor.detectIndentation` está activado.",
-@@ -29,7 +33,11 @@
- 	"scrollBeyondLastColumn": "Controla el número de caracteres adicionales a partir del cual el editor se desplazará horizontalmente",
- 	"smoothScrolling": "Controla si el editor se desplaza con una animación",
- 	"minimap.enabled": "Controla si se muestra el minimapa",
-+<<<<<<< .our
- 	"minimap.side": "Controla en qué lado se muestra el minimapa.",
-+=======
-+	"minimap.side": "Controla el lado dónde rendir el minimapa.",
-+>>>>>>> .their
- 	"minimap.showSlider": "Controla si el control deslizante del minimapa es ocultado automáticamente.",
- 	"minimap.renderCharacters": "Presentar los caracteres reales en una línea (por oposición a bloques de color)",
- 	"minimap.maxColumn": "Limitar el ancho del minimapa para presentar como mucho un número de columnas determinado",
-@@ -78,7 +86,11 @@
- 	"occurrencesHighlight": "Controla si el editor debe resaltar los símbolos semánticos.",
- 	"overviewRulerLanes": "Controla el número de decoraciones que pueden aparecer en la misma posición en la regla de visión general",
- 	"overviewRulerBorder": "Controla si debe dibujarse un borde alrededor de la regla de información general.",
-+<<<<<<< .our
- 	"cursorBlinking": "Controla el estilo de animación del cursor.",
-+=======
-+	"cursorBlinking": "Controlar el estilo de animación del cursor.",
-+>>>>>>> .their
- 	"mouseWheelZoom": "Ampliar la fuente del editor cuando se use la rueda del mouse mientras se presiona Ctrl",
- 	"cursorStyle": "Controla el estilo del cursor. Los valores aceptados son \"block\", \"block-outline\", \"line\", \"line-thin\", \"underline\" y \"underline-thin\"",
- 	"cursorWidth": "Controla el ancho del cursor cuando editor.cursorStyle se establece a 'line'",
-changed in both
-  base   100644 961af167c9ad71977a2f62bc86c98e15b0839125 i18n/esn/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
-  our    100644 de3b9342e2b07c081fc3cafa0aca695aefde5a41 i18n/esn/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
-  their  100644 121ba9263cb8de86db9cc41fd1608982d5740442 i18n/esn/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
-@@ -12,8 +12,13 @@
- 	"editor.action.quickFix.noneMessage": "No hay acciones de código disponibles",
- 	"refactor.label": "Refactorizar...",
- 	"editor.action.refactor.noneMessage": "No hay refactorizaciones disponibles",
-+<<<<<<< .our
- 	"source.label": "Acción de Origen...",
- 	"editor.action.source.noneMessage": "No hay acciones de origen disponibles",
-+=======
-+	"source.label": "Acción de la fuente...",
-+	"editor.action.source.noneMessage": "No hay acciones de fuente disponibles",
-+>>>>>>> .their
- 	"organizeImports.label": "Organizar Importaciones",
- 	"editor.action.organize.noneMessage": "No hay acciones de importación disponibles"
- }
-\ No newline at end of file
-changed in both
-  base   100644 ecbee1e78da24331b0fda67e6328baafd53f7e70 i18n/esn/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 df47f2d2522b992756f57ce29b59bc070792254f i18n/esn/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 ca267f04ff6945b4a1fb408c52c705d3458f0e11 i18n/esn/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -77,7 +77,10 @@
- 	"editorFindMatchBorder": "Color de borde de la coincidencia de búsqueda actual.",
- 	"findMatchHighlightBorder": "Color de borde de otra búsqueda que coincide.",
- 	"findRangeHighlightBorder": "Color de borde de la gama que limita la búsqueda. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
-+<<<<<<< .our
- 	"findWidgetResizeBorder": "Color del borde de la barra de tamaño del widget de búsqueda.",
-+=======
-+>>>>>>> .their
- 	"hoverHighlight": "Resalte debajo de la palabra para la cual se muestra un Hover. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
- 	"hoverBackground": "Color de fondo al mantener el puntero en el editor.",
- 	"hoverBorder": "Color del borde al mantener el puntero en el editor.",
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/esn/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
-  our    100644 5b939de4c5f742143012eece07a10fcc8b9caabd i18n/esn/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
-  their  100644 635a825e0a1b66c9ee6a8efa6c8108419b65d359 i18n/esn/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
-@@ -6,5 +6,9 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"confirmUrl": "¿Permitir a una extensión abrir esta URL?"
-+=======
-+	"confirmUrl": "¿desea que la extensión {0} abra la siguiente URL?"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 9a768d6ca824d88693ba7b9bc02b9fa5ba61ab1f i18n/esn/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
-  our    100644 f7ce405925258ae1b0192736f1f9eeb0ce13c7f0 i18n/esn/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
-  their  100644 90efea7a4ba6efbd5b35151f45d21257b4272c27 i18n/esn/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
-@@ -8,12 +8,22 @@
- 	],
- 	"vscode.extension.contributes.views.containers.id": "Identificador único utilizado para identificar el contenedor en el que se pueden aportar vistas mediante el punto de contribución \"vistas\"",
- 	"vscode.extension.contributes.views.containers.title": "Cadena de texto en lenguaje natural usada para mostrar el contenedor. ",
-+<<<<<<< .our
- 	"vscode.extension.contributes.views.containers.icon": "Ruta para el icono del contenedor. Los iconos son de 24 x 24 centrados en un bloque de 50 x 40 y tienen un color de relleno de 'rgb (215, 218, 224)' o '#d7dae0'. Se recomienda que los iconos sean en SVG, aunque se acepta cualquier tipo de archivo de imagen. ",
- 	"vscode.extension.contributes.viewsContainers": "Contribuye con vistas de contenedores al editor ",
- 	"views.container.activitybar": "Contribuir vistas de contenedores a la barra de actividades",
- 	"test": "Prueba",
- 	"requirearray": "contenedores de vistas deben ser una matriz",
- 	"requireidstring": "la propiedad `{0}` is mandatoria y debe ser del tipo `cadena`. Solo son permitidos carácteres alfanuméricos, '_' y '-'.",
-+=======
-+	"vscode.extension.contributes.views.containers.icon": "Ruta para el icono del contenedor. Los iconos son de 24x24 centrados en un cuadrado 50x40 y tienen un color de relleno de ' RGB (215, 218, 224) ' o ' #d7dae0 '. Se recomienda que los iconos estén en SVG, aunque se acepte cualquier tipo de archivo de imagen.",
-+	"vscode.extension.contributes.viewsContainers": "Contribuye con vistas de contenedores al editor ",
-+	"views.container.activitybar": "Contribuir vistas de contenedores a la barra de actividades",
-+	"test": "Prueba",
-+	"proposed": "la contribución ' viewsContainers ' sólo está disponible cuando se está ejecutando fuera de desarrollo con el siguiente modificador de línea de comandos: --enable-proposed-API {0}",
-+	"requirearray": "contenedores de vistas deben ser una matriz",
-+	"requireidstring": "la propiedad ' {0} ' es obligatoria y debe ser de tipo 'String'. Sólo se permiten letras alfanuméricas, ' _ ', '-'.",
-+>>>>>>> .their
- 	"requirestring": "la propiedad `{0}` es obligatoria y debe ser de tipo \"string\"",
- 	"showViewlet": "Mostrar {0}",
- 	"view": "Ver"
-changed in both
-  base   100644 37e9aafcaca6a6d48f98166f3838a2ba00285498 i18n/esn/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  our    100644 b7d4e9cddd0bf1f7c4ee968b757c9316af83ba48 i18n/esn/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  their  100644 e9308047b469ce13f894e8eb7894ff1a5a0b8525 i18n/esn/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-@@ -6,7 +6,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
--	"logPoint": "Punto de registro",
-+	"logPoint": "Logpoint",
- 	"breakpoint": "Punto de interrupción",
- 	"editBreakpoint": "Editar {0}...",
- 	"removeBreakpoint": "Quitar {0}",
-changed in both
-  base   100644 83395706f58bd4f9413216db7f4b363a29fa57e6 i18n/esn/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  our    100644 712a034280e7aa13ccdc8b4ab89c00d48a86e498 i18n/esn/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  their  100644 4ba559b628331e1090d392944bec4758af063037 i18n/esn/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-@@ -8,7 +8,11 @@
- 	],
- 	"toggleBreakpointAction": "Depuración: Alternar punto de interrupción",
- 	"conditionalBreakpointEditorAction": "Depuración: agregar punto de interrupción condicional...",
-+<<<<<<< .our
- 	"logPointEditorAction": "Depuración: Agregar punto de registro...",
-+=======
-+	"logPointEditorAction": "Depuración: Añadir Logpoint...",
-+>>>>>>> .their
- 	"runToCursor": "Ejecutar hasta el cursor",
- 	"debugEvaluate": "Depuración: Evaluar",
- 	"debugAddToWatch": "Depuración: Agregar a inspección",
-changed in both
-  base   100644 42d36b69237745143f00b30e6698bef40d5a46d5 i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  our    100644 fcf6be03f0498bef930d9bf9f70c63bd467d0f42 i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  their  100644 4620386089f61ed4fd47b4b79dfc5e040aacf12f i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-@@ -6,7 +6,7 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
--	"logPoint": "Punto de registro",
-+	"logPoint": "Logpoint",
- 	"breakpoint": "Punto de interrupción",
- 	"removeBreakpoint": "Quitar {0}",
- 	"editBreakpoint": "Editar {0}...",
-@@ -25,7 +25,11 @@
- 	"enableBreakpointOnLine": "Habilitar punto de interrupción de línea",
- 	"addBreakpoint": "Agregar punto de interrupción",
- 	"addConditionalBreakpoint": "Agregar punto de interrupción condicional...",
-+<<<<<<< .our
- 	"addLogPoint": "Agregar punto de registro",
-+=======
-+	"addLogPoint": "Añadir Logpoint...",
-+>>>>>>> .their
- 	"breakpointHasCondition": "Este {0} tiene una {1} que se perderá al quitarla. Considere la posibilidad de desactivar el {0} en su lugar.",
- 	"message": "mensaje",
- 	"condition": "condición",
-changed in both
-  base   100644 cfe207de40cb4c0549654ac411e5fe9dd6c1d9fb i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  our    100644 c17e1a95935a6574438eb39611676f6b936cc1bc i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  their  100644 b632b359f0dfdaf60acd28d32da4d02db14a1318 i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-changed in both
-  base   100644 6b6e51838a665fbb1808dc823cb60ea2c6fb6703 i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 1e23db714d120943226391e3c5ce27170460d94d i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 426956846148da56092ba8dc6b4dca04c5dd2f18 i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -33,6 +33,7 @@
- 	"trashFailed": "No se pudo eliminar usando la papelera. ¿Desea eliminar de forma permanente?",
- 	"deletePermanentlyButtonLabel": "&&Eliminar de forma permanente",
- 	"retryButtonLabel": "&&Reintentar",
-+<<<<<<< .our
- 	"confirmMoveTrashMessageFilesAndDirectories": "¿Está seguro de que desea eliminar los {0} archivos o directorios siguientes y su contenido?",
- 	"confirmMoveTrashMessageMultipleDirectories": "¿Está seguro de que desea eliminar los {0} directorios siguientes y su contenido? ",
- 	"confirmMoveTrashMessageMultiple": "¿Está seguro de que desea eliminar los siguientes archivos {0}?",
-@@ -40,6 +41,15 @@
- 	"confirmMoveTrashMessageFile": "¿Está seguro de que desea eliminar '{0}'?",
- 	"confirmDeleteMessageFilesAndDirectories": "¿Está seguro de que desea eliminar los {0} archivos o directorios siguientes y su contenido de forma permanente?",
- 	"confirmDeleteMessageMultipleDirectories": "¿Está seguro de que desea eliminar los {0} directorios siguientes y su contenido de forma permanente? ",
-+=======
-+	"confirmMoveTrashMessageFilesAndDirectories": "¿Está seguro que desea eliminar los siguientes archivos/directorios de {0} y su contenido?",
-+	"confirmMoveTrashMessageMultipleDirectories": "¿Está seguro que desea eliminar los siguientes directorios de {0} y su contenido?",
-+	"confirmMoveTrashMessageMultiple": "¿Está seguro de que desea eliminar los siguientes archivos {0}?",
-+	"confirmMoveTrashMessageFolder": "¿Está seguro de que desea eliminar '{0}' y su contenido?",
-+	"confirmMoveTrashMessageFile": "¿Está seguro de que desea eliminar '{0}'?",
-+	"confirmDeleteMessageFilesAndDirectories": "¿Está seguro que desea eliminar permanentemente los archivos/directorios siguientes {0} y su contenido?",
-+	"confirmDeleteMessageMultipleDirectories": "¿Está seguro que desea eliminar permanentemente los siguientes directorios de {0} y su contenido?",
-+>>>>>>> .their
- 	"confirmDeleteMessageMultiple": "¿Está seguro de que desea eliminar de forma permanente los siguientes archivos {0}?",
- 	"confirmDeleteMessageFolder": "¿Está seguro de que desea eliminar '{0}' y su contenido de forma permanente?",
- 	"confirmDeleteMessageFile": "¿Está seguro de que desea eliminar '{0}' de forma permanente?",
-changed in both
-  base   100644 d591b463a2ebf83fc1b77fc9d6a4c4e8fb48eadd i18n/esn/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
-  our    100644 ec042cfefb59113922c9d796f4792e70e5f0d5f6 i18n/esn/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
-  their  100644 2acd632d22e80f62bffdee33dfeec6b69be680f9 i18n/esn/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
-changed in both
-  base   100644 a3e789a9af793662225e64b033e50a4504d9ede2 i18n/esn/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
-  our    100644 62fe295a776bed109dfc524f3bdf545df20cef28 i18n/esn/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
-  their  100644 04f7dd0d774f855b042b4a827a493fce17c786fc i18n/esn/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"disableFilesExclude": "Deshabilitar el filtro de exclusión de archivos.",
-+=======
-+	"disableFilesExclude": "Desactivar filtro de exclusión de archivos.",
-+>>>>>>> .their
- 	"clearFilter": "Borrar el filtro."
- }
-\ No newline at end of file
-changed in both
-  base   100644 fc68212731519d4e26adbb91ef7dd9fa679f4342 i18n/esn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 d7550e4cd76b5e1079a00c63a6ae28b84fca74d3 i18n/esn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 99fee11481cc96b9a6a1c303e60b8370db21db87 i18n/esn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -31,5 +31,9 @@
- 	"search.followSymlinks": "Controla si debe seguir enlaces simbólicos durante la búsqueda.",
- 	"search.smartCase": "Proporciona busquedas de mayúsculas y minúsculas si el patrón es todo en minúsculas, de lo contrario, busca en mayúsculas y minúsculas",
- 	"search.globalFindClipboard": "Controla si la vista de búsqueda debe leer o modificar el portapapeles de búsqueda compartido en macOS",
-+<<<<<<< .our
- 	"search.location": "Controla si la búsqueda se muestra como una vista en la barra lateral o como un panel en el área de paneles para disponer de más espacio horizontal."
-+=======
-+	"search.location": "Controla si la búsqueda se mostrará como una vista en la barra lateral o como un panel en el área del panel para un espacio más horizontal. La siguiente versión de la búsqueda en el panel tendrá un mejor diseño horizontal y esto ya no será una vista previa."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c28887631f1fcebe5af526b7869129d5dc401c20 i18n/esn/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  our    100644 6b8a32ca0b9fbfb7b96cd4e7f9890b9f8d3db2d1 i18n/esn/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-  their  100644 1aeddaa7cdcd432fe1633509b49d731a6acafeab i18n/esn/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
-@@ -27,7 +27,11 @@
- 	"welcomePage.installExtensionPacks": "Herramientas y lenguajes",
- 	"welcomePage.installExtensionPacksDescription": "Instalar soporte para {0} y {1}",
- 	"welcomePage.moreExtensions": "más",
-+<<<<<<< .our
- 	"welcomePage.installKeymapDescription": "Configuración y enlaces de teclado",
-+=======
-+	"welcomePage.installKeymapDescription": "Configuraciones y combinaciones de teclas",
-+>>>>>>> .their
- 	"welcomePage.installKeymapExtension": "Instalar la configuración y los métodos abreviados de teclado de {0} y {1}",
- 	"welcomePage.others": "otros",
- 	"welcomePage.colorTheme": "Tema de color",
-changed in both
-  base   100644 dbb7b5b3009f529fe91b778b9403acf4a6543152 i18n/esn/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-  our    100644 a7a0c7035c619052d97f43fa9ab5fd436ad11fca i18n/esn/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-  their  100644 18188069ebfd0eb3fa7de62cc7765137c146caa8 i18n/esn/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-@@ -8,7 +8,11 @@
- 	],
- 	"vscode.extension.contributes.configuration.title": "Resumen de la configuración. Esta etiqueta se usará en el archivo de configuración como comentario divisor.",
- 	"vscode.extension.contributes.configuration.properties": "Descripción de las propiedades de configuración.",
-+<<<<<<< .our
- 	"scope.application.description": "Configuración específica de la aplicación, que se establece en la Configuración de usuario.",
-+=======
-+	"scope.application.description": "Configuración específica de aplicación, que puede ser configurado en configuración de usuario.",
-+>>>>>>> .their
- 	"scope.window.description": "Configuración específica para ventanas, que se puede definir en la configuración de usuario o de área de trabajo.",
- 	"scope.resource.description": "Configuración específica para recursos, que se puede definir en la configuración de usuario, de área de trabajo o de carpeta.",
- 	"scope.description": "Ámbito donde es aplicable la configuración. Los ámbitos disponibles son \"window\" y \"resource\".",
-changed in both
-  base   100644 1f9de833c22f600c7f709eeba5da8d1bfb6e212a i18n/esn/src/vs/workbench/services/configurationResolver/node/variableResolver.i18n.json
-  our    100644 e96af7d884a325fa88c83db7a7c3b4b058b768b7 i18n/esn/src/vs/workbench/services/configurationResolver/node/variableResolver.i18n.json
-  their  100644 36f359788cfbca7982a3b7709da41fd81cf6be7d i18n/esn/src/vs/workbench/services/configurationResolver/node/variableResolver.i18n.json
-@@ -13,7 +13,11 @@
- 	"noValueForCommand": "{0} ' no se puede resolver porque el comando no tiene ningún valor.",
- 	"canNotFindFolder": "' {0} ' no se puede resolver. No existe la carpeta ' {1} '.",
- 	"canNotResolveWorkspaceFolderMultiRoot": "'{0}' no puede ser resuelto en un espacio de trabajo multicarpeta. Defina el alcance de esta variable utilizando ':' y un nombre de carpeta del espacio de trabajo. ",
-+<<<<<<< .our
- 	"canNotResolveWorkspaceFolder": "\"{0}\" no se puede resolver. Abra una carpeta.",
-+=======
-+	"canNotResolveWorkspaceFolder": "'{0}' no puede ser resuelto. Por favor, abra una carpeta.",
-+>>>>>>> .their
- 	"canNotResolveFile": "'{0}' no puede resolver. Por favor, abra un editor.",
- 	"canNotResolveLineNumber": "' {0} ' no se puede resolver. Asegúrese de tener una línea seleccionada en el editor activo.",
- 	"canNotResolveSelectedText": "' {0} ' no se puede resolver. Asegúrese de tener un texto seleccionado en el editor activo."
-changed in both
-  base   100644 656532917aa165f569fa82897cb7c898c5627c1e i18n/esn/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  our    100644 4b86e7ab2775952921d67856af54454ce0ec3d5d i18n/esn/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  their  100644 e304760f37c3463901db14097c08b84d7218193a i18n/esn/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-changed in both
-  base   100644 1fe6735dc5d4772bb4c17ed33fe33f97fddfdd55 i18n/fra/extensions/git/out/commands.i18n.json
-  our    100644 95b33e9cb37384a542e0f0621ed506addc05f3b9 i18n/fra/extensions/git/out/commands.i18n.json
-  their  100644 d3829c0982f65a2770d3def31395312c03ff55b6 i18n/fra/extensions/git/out/commands.i18n.json
-@@ -10,8 +10,14 @@
- 	"remote branch at": "Branche distante à {0}",
- 	"create branch": "$(plus) Créer nouvelle branche",
- 	"repourl": "URL du dépôt",
-+<<<<<<< .our
- 	"selectFolder": "Sélectionner l'emplacement du dépôt",
- 	"cloning": "Clonage du dépôt Git '{0}'...",
-+=======
-+	"parent": "Répertoire parent",
-+	"cloning": "Clonage du dépôt Git '{0}'...",
-+	"openrepo": "Ouvrir le dépôt",
-+>>>>>>> .their
- 	"proposeopen": "Voulez-vous ouvrir le dépôt cloné ?",
- 	"openrepo": "Ouvrir le dépôt",
- 	"add": "Ajouter à l’espace de travail",
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/fra/extensions/npm/out/npmView.i18n.json
-  our    100644 e6a36b84cbcd372a7248ee95de6a72508e85051b i18n/fra/extensions/npm/out/npmView.i18n.json
-  their  100644 164e1b51e398685a19d4af060f23dd02f99e5431 i18n/fra/extensions/npm/out/npmView.i18n.json
-@@ -6,9 +6,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"noScripts": "Aucun script",
- 	"noDebugOptions": "Impossible de lancer \"{0}\" pour le débogage, car les scripts n'ont pas d'option de débogage de nœud, par exemple, \"--inspect-brk\".",
- 	"learnMore": "En savoir plus",
- 	"ok": "OK",
- 	"scriptInvalid": "Script \"{0}\" introuvable. Essayez d'actualiser la vue."
-+=======
-+	"npm.noDebugOptions": "Impossible de lancer \"{0}\" pour le débogage, car les scripts n'ont pas d'option de débogage de nœud, par exemple, \"--inspect-brk\".",
-+	"npm.scriptInvalid": "Script \"{0}\" introuvable. Essayez d'actualiser la vue."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 372b90c51728f9043e4351e307f1cfc79bf11183 i18n/fra/extensions/npm/package.i18n.json
-  our    100644 dab74867a9ea8aa21e2f332eabe0dca553256787 i18n/fra/extensions/npm/package.i18n.json
-  their  100644 b85f2981ff3da2344fcdc3749acec6c6a3ddafae i18n/fra/extensions/npm/package.i18n.json
-@@ -12,15 +12,27 @@
- 	"config.npm.runSilent": "Exécutez les commandes npm avec l'option `--silent`.",
- 	"config.npm.packageManager": "Le gestionnaire de paquets utilisé pour exécuter des scripts.",
- 	"config.npm.exclude": "Configurer les profils glob pour les dossiers qui doivent être exclus de la détection de script automatique.",
-+<<<<<<< .our
- 	"config.npm.enableScriptExplorer": "Activez une vue Explorateur pour les scripts npm.",
- 	"config.npm.scriptExplorerAction": "Action de clic par défaut utilisée dans l’explorateur de scripts :  'open' ou 'run', la valeur par défaut est 'open'.",
- 	"npm.parseError": "Détection de tâche Npm : impossible d’analyser le fichier {0}",
- 	"taskdef.script": "Le script npm à personnaliser.",
- 	"taskdef.path": "Chemin de dossier du fichier package.json qui fournit le script. Peut être ignoré.",
-+=======
-+	"config.npm.enableScriptExplorer": "Activez une vue Explorateur pour les scripts npm quand l'espace de travail contient un fichier 'package.json'.",
-+	"npm.parseError": "Détection de tâche Npm : impossible d’analyser le fichier {0}",
-+	"taskdef.script": "Le script npm à personnaliser.",
-+	"taskdef.path": "Le chemin d’accès au dossier du fichier package.json qui fournit le script. Peut être oublié.",
-+>>>>>>> .their
- 	"view.name": "Scripts npm",
- 	"command.refresh": "Actualiser",
- 	"command.run": "Exécuter",
- 	"command.debug": "Déboguer",
- 	"command.openScript": "Ouvrir",
-+<<<<<<< .our
- 	"command.runInstall": "Exécuter Install"
-+=======
-+	"npm.scriptInvalid": "Script '{0}' introuvable. Essayez d'actualiser la vue.",
-+	"npm.noDebugOptions": "Impossible de lancer '{0}' pour le débogage, car les scripts n'ont pas d'option de débogage de nœud, par exemple, '--inspect-brk'."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 96efb700a072196e1063eaafbac88fe5202b0a05 i18n/fra/src/vs/code/electron-main/menus.i18n.json
-  our    100644 16a57011e6fe8292ae1edcf0b9eb59b9f28b2c10 i18n/fra/src/vs/code/electron-main/menus.i18n.json
-  their  100644 f96cf1ace9ef60410e7dbfadde4c3b0c641563d3 i18n/fra/src/vs/code/electron-main/menus.i18n.json
-changed in both
-  base   100644 5be706890278b2bb912d230f11c5cc2ee3395c36 i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 1ad1b4ad7ba3d841a13ddfeab561381b182d7f45 i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 7e39a89e939284e6902134669a630fc8176a1672 i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json
-changed in both
-  base   100644 7d6e9ec83606721d7bb75f288537003d3bd30eed i18n/fra/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 30e1e919ce20ea7d38be72764392ce906b3ac7c0 i18n/fra/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 8ae0bac8c1d0fbc709ce2d7e909039c5e6ef4977 i18n/fra/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -77,7 +77,10 @@
- 	"editorFindMatchBorder": "Couleur de bordure du résultat de recherche actif.",
- 	"findMatchHighlightBorder": "Couleur de bordure des autres résultats de recherche.",
- 	"findRangeHighlightBorder": "Couleur de la bordure limitant la recherche. La couleur ne doit pas être opaque pour ne pas masquer les décorations sous-jacentes. ",
-+<<<<<<< .our
- 	"findWidgetResizeBorder": "Couleur de la bordure de la barre de redimensionnement du widget de recherche.",
-+=======
-+>>>>>>> .their
- 	"hoverHighlight": "Mettre en surbrillance ci-dessous le mot pour lequel un survol est affiché. La couleur doit ne pas être opaque afin de ne pas masquer les décorations sous-jacentes.",
- 	"hoverBackground": "Couleur d'arrière-plan du pointage de l'éditeur.",
- 	"hoverBorder": "Couleur de bordure du pointage de l'éditeur.",
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/fra/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
-  our    100644 fa69bb7bd8fbba72c704bffa5d3ea82e69dd4257 i18n/fra/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
-  their  100644 b610699043eb94c611a5a3508f30977f440cb18f i18n/fra/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
-@@ -6,5 +6,9 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"confirmUrl": "Autoriser une extension à ouvrir cette URL ?"
-+=======
-+	"confirmUrl": "Vous voulez laisser l'extension {0} ouvrir l'URL suivante ?"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 2f2efe764899dacb3c76495760cb054ad6b4f108 i18n/fra/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
-  our    100644 60914e5d624dc60ed31cd86ef622b3a744065d85 i18n/fra/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
-  their  100644 698e3a6abb939752b93fcd8d7a3040812d0a8423 i18n/fra/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
-@@ -8,12 +8,22 @@
- 	],
- 	"vscode.extension.contributes.views.containers.id": "Identificateur unique utilisé pour identifier le conteneur dans lequel les vues peuvent être contribuées en utilisant le point de contribution 'views'.",
- 	"vscode.extension.contributes.views.containers.title": "Chaîne lisible par un humain permettant d'afficher le conteneur",
-+<<<<<<< .our
- 	"vscode.extension.contributes.views.containers.icon": "Chemin d’accès à l’icône de conteneur. Les icônes font 24x24, centrées sur un bloc de 50x40 et ont une couleur de remplissage de 'rgb (215, 218, 224)' ou '#d7dae0'. Il est recommandé que les icônes soient en SVG, même si n’importe quel type de fichier image est accepté.",
- 	"vscode.extension.contributes.viewsContainers": "Contribue aux conteneurs de vues vers l’éditeur",
- 	"views.container.activitybar": "Les conteneurs visuels contribuent à la barre d'activité",
- 	"test": "Test",
- 	"requirearray": "les conteneurs de vues doivent être un tableau",
- 	"requireidstring": "la propriété '{0}' est obligatoire et doit être de type 'string'. Seuls les caractères alphanumériques , '_', et '-' sont autorisés.",
-+=======
-+	"vscode.extension.contributes.views.containers.icon": "Chemin de l'icône du conteneur. Les icônes ont une taille de 24x24 centrée dans un rectangle de 50x40, et leur couleur de remplissage est 'rgb(215, 218, 224)' ou '#d7dae0'. Les icônes doivent être de préférence au format SVG, mais tous les types de fichier image sont acceptés.",
-+	"vscode.extension.contributes.viewsContainers": "Contribue aux conteneurs de vues vers l’éditeur",
-+	"views.container.activitybar": "Les conteneurs visuels contribuent à la barre d'activité",
-+	"test": "Test",
-+	"proposed": "La contribution 'viewsContainers' est disponible uniquement pour l'exécution en dehors de dev ou avec le commutateur de ligne de commande suivant : --enable-proposed-api {0}",
-+	"requirearray": "les conteneurs de vues doivent être un tableau",
-+	"requireidstring": "La propriété '{0}' est obligatoire et doit être de type 'string'. Sont autorisés uniquement les caractères alphanumériques, '_', '-'.",
-+>>>>>>> .their
- 	"requirestring": "la propriété '{0}' est obligatoire et doit être de type 'string'",
- 	"showViewlet": "Afficher {0}",
- 	"view": "Affichage"
-changed in both
-  base   100644 b9f58b85393a7524b6ada3e2e89778aff9b94b91 i18n/fra/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  our    100644 c60cc41768e6fed42f5ce8d4a24c89cb2e037162 i18n/fra/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  their  100644 afdaf30af084b184b340a5b73508e243f8a22ffa i18n/fra/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-changed in both
-  base   100644 b483f4e82248689c2fe294ba68197f868cdd796a i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  our    100644 c72f6ed139308469b1eda47864e3e1ed2bf00916 i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  their  100644 59ed71c67586ffca5caacb080512139c89252b0f i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-changed in both
-  base   100644 5c5c91482ed9e071b0e425934ef95259623dbcf5 i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 fa117de3746fd117674712532fb1af257c3eacf4 i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 490bcb83a63d8a54aae4679a35b56bda0ea268d1 i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-changed in both
-  base   100644 708807fba13871d2a9195ad5d309e4e32425b2dd i18n/fra/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
-  our    100644 ce1503b6dfa3219c1f3788d9e72e3e90acdc55e0 i18n/fra/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
-  their  100644 7a8e6c2de06342abee79ea00487b4a9104561de0 i18n/fra/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
-changed in both
-  base   100644 d563780176cee089c86c76446ea853ae82b7fc70 i18n/fra/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 043fb92d98d510a0c65a09cbbe5e12feb8f611fa i18n/fra/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 7cb5620c5e7f7aaf32c42747a80a16df484c678a i18n/fra/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-changed in both
-  base   100644 f79185e93b2965f1cacb3e14c9e87627b0acebf6 i18n/fra/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
-  our    100644 b219305fb3c0934bf0d1c3ad49c4db168d9b4aab i18n/fra/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
-  their  100644 89f92a7c3bc77f701e9fd8f02bba2b72e0857a59 i18n/fra/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
-changed in both
-  base   100644 d4eb257e24dac71e40277e82e9f739482d7e494c i18n/fra/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  our    100644 765129d9a5321e8f52031cdb135764c97f338133 i18n/fra/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  their  100644 652537726d62d99574bf9e6ee75a285a88e582e0 i18n/fra/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-changed in both
-  base   100644 9c1a3de3b6c8cf4478bdffc339cf7a9adcb81b2a i18n/hun/extensions/git/out/commands.i18n.json
-  our    100644 affdd78fc14682c19c792c8ead9202e7167f2315 i18n/hun/extensions/git/out/commands.i18n.json
-  their  100644 b19625ac0d48c413c17ce58ba212f13a6a6da2d4 i18n/hun/extensions/git/out/commands.i18n.json
-@@ -10,8 +10,14 @@
- 	"remote branch at": "Távoli ág, a következőre mutat: {0}",
- 	"create branch": "$(plus) Új ág létrehozása",
- 	"repourl": "Forráskódtár URL-címe",
-+<<<<<<< .our
- 	"selectFolder": "Válassza ki a forráskódtár helyét!",
- 	"cloning": "'{0}' git forráskódtár klónozása...",
-+=======
-+	"parent": "Szülőkönyvtár",
-+	"cloning": "'{0}' git forráskódtár klónozása...",
-+	"openrepo": "Forráskódtár megnyitása",
-+>>>>>>> .their
- 	"proposeopen": "Szeretné megnyitni a klónozott forráskódtárat?",
- 	"openrepo": "Forráskódtár megnyitása",
- 	"add": "Hozzáadás a munkaterülethez",
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/hun/extensions/npm/out/npmView.i18n.json
-  our    100644 b872bf53966a47bf4bc3e394b5ad492a3ea5c8c9 i18n/hun/extensions/npm/out/npmView.i18n.json
-  their  100644 90269483e9ffb184e6f1b530ccba7d7a510116fa i18n/hun/extensions/npm/out/npmView.i18n.json
-@@ -6,9 +6,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"noScripts": "Nem található parancsfájl",
- 	"noDebugOptions": "A(z) „{0}” nem indítható el hibakereséshez, mert a parancsból hiányzik a node hibakeresési kapcsoló, pl. az „--inspect-brk”.",
- 	"learnMore": "További információ",
- 	"ok": "OK",
- 	"scriptInvalid": "A(z) „{0}” parancs nem található. Frissítse a nézetet!"
-+=======
-+	"npm.noDebugOptions": "A(z) „{0}” nem indítható el hibakereséshez, mert a parancsból hiányzik a node hibakeresési kapcsoló, pl. az „--inspect-brk”.",
-+	"npm.scriptInvalid": "A(z) „{0}” parancs nem található. Frissítse a nézetet!"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e4c268ef1d7ec384a20a2c4c1cd697d00741a9b1 i18n/hun/extensions/npm/package.i18n.json
-  our    100644 08255b5c4709454b75a16c8ef42f48e270a52f7d i18n/hun/extensions/npm/package.i18n.json
-  their  100644 79cbd9c9f805f7ef74c9f31a25c0dacd87fadd71 i18n/hun/extensions/npm/package.i18n.json
-@@ -12,15 +12,27 @@
- 	"config.npm.runSilent": "Az npm-parancsok a '--silent' kapcsolóval fussanak.",
- 	"config.npm.packageManager": "A parancsfájlok futtatásához használt csomagkezelő.",
- 	"config.npm.exclude": "Azokat a mappákat leíró globális minta, amelyek ne legyenek vizsgálva az automatikus parancsfájlkeresés közben.",
-+<<<<<<< .our
- 	"config.npm.enableScriptExplorer": "Npm-parancsokat listázó nézet engedélyezése a Fájlkezelőben.",
- 	"config.npm.scriptExplorerAction": "Az alapértelmezett művelet kattintás esetén a parancsnézeten: „open” a megnyitáshoz vagy „run” a futtatáshoz. Az alapértelmezett érték az „open”.",
- 	"npm.parseError": "Npm-feladatok felderítése: nem sikerült beolvasni a következő fájlt: {0}",
- 	"taskdef.script": "A testreszabott npm parancsfájl.",
- 	"taskdef.path": "A parancsfájlt szolgáltató package.json-fájlt tartalmazó mappa elérési útja. Elhagyható.",
-+=======
-+	"config.npm.enableScriptExplorer": "Npm-parancsnézet hozzáadása a Fájlkezelőhöz, ha van „package.json”-fál a munkaterületen.",
-+	"npm.parseError": "Npm-feladatok felderítése: nem sikerült beolvasni a következő fájlt: {0}",
-+	"taskdef.script": "A testreszabott npm parancsfájl.",
-+	"taskdef.path": "Azon mappa elérési útja, amely a parancsfájlt szolgáltató package.json fájlt tartalmazza. Elhagyható.",
-+>>>>>>> .their
- 	"view.name": "Npm-parancsok",
- 	"command.refresh": "Frissítés",
- 	"command.run": "Futtatás",
- 	"command.debug": "Hibakeresés",
- 	"command.openScript": "Megnyitás",
-+<<<<<<< .our
- 	"command.runInstall": "Telepítés futtatása"
-+=======
-+	"npm.scriptInvalid": "A(z) „{0}” parancs nem található. Frissítse a nézetet!",
-+	"npm.noDebugOptions": "A(z) „{0}” nem indítható el hibakereséshez, mert a parancsból hiányzik a node hibakeresési kapcsoló, pl. az „--inspect-brk”."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 59e6eed00dcf9c8716d2396d5eb6c8e8591a005a i18n/hun/extensions/typescript-language-features/package.i18n.json
-  our    100644 06a84e6a3a38feb638b5dcd0930e12c656b45808 i18n/hun/extensions/typescript-language-features/package.i18n.json
-  their  100644 5ffa7df24e83abe70716b672b5f08f7954047ffe i18n/hun/extensions/typescript-language-features/package.i18n.json
-@@ -59,9 +59,13 @@
- 	"typescript.experimental.syntaxFolding": "Szintaxisalapú becsukható kódrészletek engedélyezése vagy letiltása.",
- 	"taskDefinition.tsconfig.description": "A tsconfig-fájl, ami meghatározza a TS-buildet.",
- 	"javascript.suggestionActions.enabled": "Ajánlásokat tartalmazó diagnosztikák engedélyezése vagy letiltása a JavaScript-fájlokban. TypeScript >= 2.8-at igényel.",
-+<<<<<<< .our
- 	"typescript.suggestionActions.enabled": "Ajánlásokat tartalmazó diagnosztikák engedélyezése vagy letiltása a TypeScript-fájlokban. TypeScript >= 2.8-at igényel.",
- 	"typescript.preferences.quoteStyle": "A gyorsjavítások során előnyben részesített idézőjelstílus: „single” esetén aposztróf, „double” esetén idézőjel, „auto” esetén pedig a meglévő importálások alapján van meghatározva a stílus. TypeScript >= 2.9-et igényel.",
- 	"typescript.preferences.importModuleSpecifier": "Az automatikus importálások során beszúrt elérési utak stílusa:\n- „relative” esetén relatív elérési út a fájlhoz képest\n- „non-relative” esetén a „jsconfig.json”-ban vagy a „tsconfig.json”-ban megadott „baseUrl” értéke alapján\n- „auto” a legrövidebb elérési utat jelenti.\nTypeScript >= 2.9-et igényel.",
- 	"typescript.showUnused": "Nem használt változók megjelölése a kódban. TypeScript >= 2.9-et igényel.",
- 	"typescript.updateImportsOnFileMove.enabled": "Importálási utak automatikus aktualizálása fájlok átnevezése vagy áthelyezése során. Lehetséges értékek: „prompt” esetén minden átnevezés esetén rákérdez az alkalmazás, „always” esetén az elérési utak automatikusan aktualizálódnak, „never” esetén pedig az elérési utak nem módosulnak, és nem is jelenik meg kérdés ezzel kapcsolatban. TypeScript >= 2.9-et igényel."
-+=======
-+	"typescript.suggestionActions.enabled": "Ajánlásokat tartalmazó diagnosztikák engedélyezése vagy letiltása a TypeScript-fájlokban. TypeScript >= 2.8-at igényel."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6121ff296fecf6555adaafca42f58c9cad4f2494 i18n/hun/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 2379691d68b1bb47b875192927c6b81fe486ec04 i18n/hun/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 19de8e05102fef5cd2f4520ce4d29a591070363b i18n/hun/src/vs/editor/common/config/commonEditorConfig.i18n.json
-changed in both
-  base   100644 37b143d1111cdc7e29ea500d18439210ec95fe9f i18n/hun/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 b9f948caca15d9f0853c29c47b30338822af7bb9 i18n/hun/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 a470002b64ab69680122853d3c9be5f4e9401ba3 i18n/hun/src/vs/platform/theme/common/colorRegistry.i18n.json
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/hun/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
-  our    100644 4669c26ac4625688c4799fa88c03d6e6da8e2be9 i18n/hun/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
-  their  100644 f6bafd32865b03b74eedc31a39e28484bf30dedb i18n/hun/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
-@@ -6,5 +6,9 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"confirmUrl": "Engedélyezi a hivatkozás megnyitásást egy kiegészítő számára?"
-+=======
-+	"confirmUrl": "Szeretné engedélyezni a(z) {0} kiegészítő számára a következő URL-cím megnyitását?"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 01cbe639634433427c8f14af1616b98a2e1a635e i18n/hun/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
-  our    100644 1635f0d479a493c1965d4226506b6f41f42e1f3d i18n/hun/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
-  their  100644 215c70faf9429446d33816bf254be822420f3045 i18n/hun/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
-@@ -12,6 +12,10 @@
- 	"vscode.extension.contributes.viewsContainers": "Nézetgyűjteményeket szolgáltat a szerkesztőhöz",
- 	"views.container.activitybar": "Nézetgyűjteményeket szolgáltat a tevékenységsávra",
- 	"test": "Teszt",
-+<<<<<<< .our
-+=======
-+	"proposed": "A 'viewsContainers' csak a fejlesztői változatban vagy az --enable-proposed-api {1} kapcsoló használata esetén érhető el.",
-+>>>>>>> .their
- 	"requirearray": "a nézetgyűjteményeket tömbként kell megadni",
- 	"requireidstring": "a(z) `{0}` tulajdonság kötelező és `string` típusúnak kell lennie. Csak alfanumerikus karaktereket, alulvonást és kötőjelet tartalmazhat.",
- 	"requirestring": "a(z) `{0}` tulajdonság kötelező és `string` típusúnak kell lennie",
-changed in both
-  base   100644 7c65da736d723bd60992e76fe75d42e26ae11f7a i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  our    100644 9a21a85261e05f8168dbe245a14ddaf864d039e8 i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  their  100644 ca80e96105e9008d65f75d1e455d74d39add4d87 i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-changed in both
-  base   100644 c9fcc7b9a6b859ec561211c755d31ab393ce60d4 i18n/hun/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 9db97a911ffdf192afd5e70644f8d902d86c6323 i18n/hun/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 abeb33a1bb8779566a112debcc0897840a72e068 i18n/hun/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-changed in both
-  base   100644 6bd71c5eb71cd549ac370b0c03e04573904bd072 i18n/hun/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
-  our    100644 8d361d689017b80963836cc1efed9fed62ad68a9 i18n/hun/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
-  their  100644 fbc4f5faee96f57d9f8cf13eca068a100d968c29 i18n/hun/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
-changed in both
-  base   100644 84dfc238f591f2f6cc288d2737c6c65e9d3e4031 i18n/hun/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 1439e6263aeea9edcee41566036c04020ed9c86f i18n/hun/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 d9c23b4c9eb0439dd76130b13b758fa3ca0a359a i18n/hun/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-changed in both
-  base   100644 ec12a3852ec580058a66b02396ef5b6642aeb5ad i18n/hun/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
-  our    100644 a4201e0c7e75c038b6be63b25b648bac373ced2d i18n/hun/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
-  their  100644 70a754da46631efbf6b31e721e2928a81c8edae1 i18n/hun/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
-@@ -10,7 +10,11 @@
- 	"dependencyFailed": "Nem sikerült feloldani a(z) '{0}' függő feladatot a(z) '{1}' munkaterületi mappában",
- 	"TerminalTaskSystem.terminalName": "Feladat – {0}",
- 	"closeTerminal": "A folytatáshoz nyomjon meg egy billentyűt.",
-+<<<<<<< .our
- 	"reuseTerminal": "A terminál fel lesz használva egy másik feladathoz. A bezáráshoz nyomjon meg egy billentyűt!",
-+=======
-+	"reuseTerminal": "A terminál újra lesz hasznosítva a feladatok által. Nyomjon meg egy billentyűt a bezáráshoz.",
-+>>>>>>> .their
- 	"TerminalTaskSystem": "Rendszerparancsok nem hajthatók végre UNC-meghajtókon a cmd.exe használata esetén.",
- 	"unkownProblemMatcher": "A(z) {0} problémaillesztő nem található. Az illesztő figyelmen kívül lesz hagyva."
- }
-\ No newline at end of file
-changed in both
-  base   100644 91e90e2f957f03d9d20d30ccdc9c4ba88c75ec6f i18n/hun/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  our    100644 7f2659c063a55d4aff7833d69377336452a2b34d i18n/hun/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  their  100644 8b5898129b6028656c47783a2c9f21ef7403b1af i18n/hun/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-changed in both
-  base   100644 792f4a2d3dd38ef1666a3ae1585b12d8f82e6e39 i18n/ita/extensions/git/out/commands.i18n.json
-  our    100644 b8b9f0490197b0e5904f4f035caca3a7f04c7df9 i18n/ita/extensions/git/out/commands.i18n.json
-  their  100644 31523837c4a105b40910349cb6031546e2d5c11d i18n/ita/extensions/git/out/commands.i18n.json
-@@ -10,8 +10,14 @@
- 	"remote branch at": "Ramo remoto in {0}",
- 	"create branch": "$(plus) Crea nuovo branch",
- 	"repourl": "URL del repository",
-+<<<<<<< .our
- 	"selectFolder": "Seleziona il Percorso del Repository",
- 	"cloning": "Clonazione del repository GIT '{0}'...",
-+=======
-+	"parent": "Directory padre",
-+	"cloning": "Clonazione del repository GIT '{0}'...",
-+	"openrepo": "Apri repository",
-+>>>>>>> .their
- 	"proposeopen": "Aprire il repository clonato?",
- 	"openrepo": "Apri repository",
- 	"add": "Aggiungi all'Area di Lavoro",
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ita/extensions/npm/out/npmView.i18n.json
-  our    100644 8d06549b42cdca9aabc2b6b5a78fab3332f3bab3 i18n/ita/extensions/npm/out/npmView.i18n.json
-  their  100644 565aeceec1a8e7650e6528184fc970d0903203dc i18n/ita/extensions/npm/out/npmView.i18n.json
-@@ -6,9 +6,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"noScripts": "Script non trovato",
- 	"noDebugOptions": "Non è possibile avviare \"{0}\" per eseguire il debug perché negli script manca un'opzione di debug dei nodi, ad esempio \"--inspect-brk\".",
- 	"learnMore": "Altre informazioni",
- 	"ok": "OK",
- 	"scriptInvalid": "Non è stato possibile trovare lo script \"{0}\". Provare ad aggiornare la visualizzazione."
-+=======
-+	"npm.noDebugOptions": "Non è possibile avviare \"{0}\" per eseguire il debug perché negli script manca un'opzione di debug dei nodi, ad esempio \"--inspect-brk\".",
-+	"npm.scriptInvalid": "Non è stato possibile trovare lo script \"{0}\". Provare ad aggiornare la visualizzazione."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b390aaf94288fa7cf7b33538112bb6b25672a83 i18n/ita/extensions/npm/package.i18n.json
-  our    100644 35faed0d788c5e82f45e8fdf22618f3516a421ca i18n/ita/extensions/npm/package.i18n.json
-  their  100644 fc81506bb8541a33e4c69bff16ffad98838037f1 i18n/ita/extensions/npm/package.i18n.json
-@@ -12,15 +12,27 @@
- 	"config.npm.runSilent": "Eseguire comandi npm con l'opzione `--silent`.",
- 	"config.npm.packageManager": "Il gestore dei pacchetti utilizzato per eseguire script.",
- 	"config.npm.exclude": "Configura i modelli glob per le cartelle che dovrebbero essere escluse dalla rilevazione automatica di script.",
-+<<<<<<< .our
- 	"config.npm.enableScriptExplorer": "Vedi come Esplora risorse gli script npm.",
- 	"config.npm.scriptExplorerAction": "Azione predefinita per il clic in Esplora script: 'open' o 'run'. L'impostazione predefinita è 'open'.",
- 	"npm.parseError": "Rilevamento attività NPM: Impossibile analizzare il file {0}",
- 	"taskdef.script": "Lo script di npm da personalizzare.",
- 	"taskdef.path": "Il percorso della cartella del file J.json contenente lo script può essere omesso.",
-+=======
-+	"config.npm.enableScriptExplorer": "Abilita una visualizzazione di esplorazione per gli script di npm quando l'area di lavoro contiene un file 'package.json'.",
-+	"npm.parseError": "Rilevamento attività NPM: Impossibile analizzare il file {0}",
-+	"taskdef.script": "Lo script di npm da personalizzare.",
-+	"taskdef.path": "Il percorso della cartella del file package.json che fornisce lo script. Può essere omesso.",
-+>>>>>>> .their
- 	"view.name": "Script di npm",
- 	"command.refresh": "Aggiorna",
- 	"command.run": "Esegui",
- 	"command.debug": "Debug",
- 	"command.openScript": "Apri",
-+<<<<<<< .our
- 	"command.runInstall": "Esegui install"
-+=======
-+	"npm.scriptInvalid": "Non è stato possibile trovare lo script '{0}'. Provare ad aggiornare la visualizzazione.",
-+	"npm.noDebugOptions": "Non è stato possibile avviare '{0}' per eseguire il debug perché negli script manca un'opzione di debug dei nodi, ad esempio '--inspect-brk'."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 9329475d6abc1af3487420caeb2ac7cc51cab279 i18n/ita/extensions/typescript-language-features/package.i18n.json
-  our    100644 63da622e36e246d77c891d62b7d242b50ca5c80e i18n/ita/extensions/typescript-language-features/package.i18n.json
-  their  100644 415fd9fe791179cf6048a0418557ba1b98480daf i18n/ita/extensions/typescript-language-features/package.i18n.json
-@@ -53,6 +53,7 @@
- 	"typescript.problemMatchers.tsc.label": "Problemi TypeScript",
- 	"typescript.problemMatchers.tscWatch.label": "Problemi TypeScript (modalità espressione di controllo)",
- 	"typescript.quickSuggestionsForPaths": "Abilita/disabilita i suggerimenti rapidi quando si digita un percorso di importazione.",
-+<<<<<<< .our
- 	"typescript.locale": "Consente di definire le impostazioni locail usate per segnalare errori JavaScript e TypeScript. Richiede TypeScript >= 2.6.0. Con l'impostazione predefinita 'null' vengono usate le impostazioni locali di VS Code.",
- 	"javascript.implicitProjectConfig.experimentalDecorators": "Abilita/disabilita gli elementi 'experimentalDecorators' per file JavaScript che non fanno parte di un progetto. I file jsconfig.json o tsconfig.json esistenti sovrascrivono questa impostazione. Richiede TypeScript >= 2.3.1.",
- 	"typescript.autoImportSuggestions.enabled": "Abilita/disabilita il suggerimento automatico per gli import. Richiede una versione di TypeScript >= 2.6.1",
-@@ -64,4 +65,13 @@
- 	"typescript.preferences.importModuleSpecifier": "Stile di percorso preferito per le importazioni automatiche:\n- \"relative\", ovvero relativo al percorso del file.\n- \"non-relative\", basato sull'elemento 'baseUrl' configurato in 'jsconfig.json' / 'tsconfig.json'.\n- \"auto\", per derivare il tipo di percorso più breve.\nRichiede TypeScript >= 2.9",
- 	"typescript.showUnused": "Abilita/disabilita l'evidenziazione delle variabili inutilizzate nel codice. Richiede TypeScript > = 2,9",
- 	"typescript.updateImportsOnFileMove.enabled": "Abilita/disabilita l'aggiornamento automatico dei percorsi di importazione quando si rinomina o si sposta un file in VS Code. I valori possibili sono: 'prompt', che chiede conferma per ogni ridenominazione, 'always', che aggiorna automaticamente i percorsi e 'never' che rinomina i percorsi senza chiedere conferma. Richiede TypeScript >= 2.9"
-+=======
-+	"typescript.locale": "Assegna le impostazioni internazionali utilizzate per riportare errori TypeScript. Richiede TypeScript > = 2.6.0. Il valore predefinito 'null' utilizza le impostazioni internazionali di VS Code.",
-+	"javascript.implicitProjectConfig.experimentalDecorators": "Abilita/disabilita 'experimentalDecorators' per i file JavaScript che non fanno parte di un progetto. File jsconfig.json o tsconfig.json esistenti ignorano questa impostazione. Richiede TypeScript >= 2.3.1.",
-+	"typescript.autoImportSuggestions.enabled": "Abilita/Disabilita suggerimenti importazione automatica. Richiede una versione di TypeScript >= 2.6.1",
-+	"typescript.experimental.syntaxFolding": "Abilita/disabilita i marcatori di folding con riconoscimento della sintassi.",
-+	"taskDefinition.tsconfig.description": "File tsconfig che definisce la compilazione TS.",
-+	"javascript.suggestionActions.enabled": "Abilita/disabilita la diagnostica dei suggerimenti per i file JavaScript nell'editor. Richiede TypeScript >= 2.8.",
-+	"typescript.suggestionActions.enabled": "Abilita/disabilita la diagnostica dei suggerimenti per i file TypeScript nell'editor. Richiede TypeScript >= 2.8."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 aeca957cc7ccdd8160f5021b73c0e5647f0f0e21 i18n/ita/src/vs/base/node/zip.i18n.json
-  our    100644 6b7be154b57d1990ec5c1b1098b745396b3121e3 i18n/ita/src/vs/base/node/zip.i18n.json
-  their  100644 942c2322e5469ee4b245d9adaf601d2ee74ac847 i18n/ita/src/vs/base/node/zip.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"incompleteExtract": "Non completato. Trovate {0} di {1} voci",
-+=======
-+	"incompleteExtract": "Operazione incompleta. Sono state estratte {0} di {1} voci",
-+>>>>>>> .their
- 	"notFound": "{0} non è stato trovato all'interno del file ZIP."
- }
-\ No newline at end of file
-changed in both
-  base   100644 0cbefebbb8fb30bcde1179237032fbcc465051f8 i18n/ita/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  our    100644 227d32796a6baa320c796945995dc4dda33fa366 i18n/ita/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  their  100644 6bec92cf6a4e9532a6c0048e0632fa176b84f64b i18n/ita/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-changed in both
-  base   100644 d087b3cb7c7fc704bb5800de3389f07829277474 i18n/ita/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  our    100644 a59dbde663cf3b1122a7f857a3ec49c9a6812924 i18n/ita/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  their  100644 1ab03145d1f5e8ea7d6cbbc4aee20f4b4f823c54 i18n/ita/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-changed in both
-  base   100644 d72487d0df2137d1017b781f348c9b62b7f32816 i18n/ita/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
-  our    100644 edf6b8f4660041c5ff1fd5eda180cacf4c15533a i18n/ita/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
-  their  100644 312cd92898f9b4bf3808f1ded8b7c595e7265c7a i18n/ita/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
-@@ -11,7 +11,11 @@
- 	"pid": "PID",
- 	"name": "Nome",
- 	"killProcess": "Arresta il processo",
-+<<<<<<< .our
- 	"forceKillProcess": "Arresto forzato del processo",
- 	"copy": "Copia",
- 	"copyAll": "Copia tutti"
-+=======
-+	"forceKillProcess": "Arresto forzato del processo"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 4b19663530a31dba0778c8328fdaf4e945dda7fc i18n/ita/src/vs/code/electron-main/menus.i18n.json
-  our    100644 a5f6c5e0343adf224d6df3a61663d9695836512e i18n/ita/src/vs/code/electron-main/menus.i18n.json
-  their  100644 5f21b73e420edb56f2b7c22ea2843a3c5703bcf0 i18n/ita/src/vs/code/electron-main/menus.i18n.json
-changed in both
-  base   100644 c3b6c0b2a85701dc3487272a88324614b431b8a0 i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 f91d8d15e9f7c53e3b2a0166aab270c9bf1f772e i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 53ba37e5824edb21a3fa03e5d9a6a4e14f60dfc1 i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json
-changed in both
-  base   100644 8456c0eb96c8f0464840a97e60b1b9d3ad6b6c77 i18n/ita/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 047668b002c0125f22b3c77979675bee2ddbe88f i18n/ita/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 3ca3c86bce2bebb1bfaf63f1247be845df3e96fb i18n/ita/src/vs/editor/common/view/editorColorRegistry.i18n.json
-changed in both
-  base   100644 e451940b1128be7b2e7f174054a33c6d0466e135 i18n/ita/src/vs/editor/contrib/find/findController.i18n.json
-  our    100644 5c4cb025bfc1660194026a9644375b034b5e86c6 i18n/ita/src/vs/editor/contrib/find/findController.i18n.json
-  their  100644 185c7ac6cf18c8e89ee97062e6b4901b5417e67c i18n/ita/src/vs/editor/contrib/find/findController.i18n.json
-@@ -7,7 +7,11 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"startFindAction": "Trova",
-+<<<<<<< .our
- 	"startFindWithSelectionAction": "Trova nella selezione",
-+=======
-+	"startFindWithSelectionAction": "Trova con selezione",
-+>>>>>>> .their
- 	"findNextMatchAction": "Trova successivo",
- 	"findPreviousMatchAction": "Trova precedente",
- 	"nextSelectionMatchFindAction": "Trova selezione successiva",
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ita/src/vs/editor/contrib/message/messageController.i18n.json
-  our    100644 7a1932aabcc1c1d9218f96a5d36263439e610fc5 i18n/ita/src/vs/editor/contrib/message/messageController.i18n.json
-  their  100644 c77490ad4d64ebfd1e533010d37c30b0ced46bad i18n/ita/src/vs/editor/contrib/message/messageController.i18n.json
-@@ -6,5 +6,9 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"editor.readonly": "Impossibile modificare nell'editor di sola lettura"
-+=======
-+	"editor.readonly": "Non è possibile modificare nell'editor di sola lettura"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 87d656a3dd054746161346cb5a0e4665f5028ea2 i18n/ita/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 35f8ed83f0da1c4a75798a67e5b16affcd21632f i18n/ita/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 fd9808f2ddeb2c961075211ed64b662463fe1531 i18n/ita/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-changed in both
-  base   100644 13f14b0041a9f6399413a8f18921135688b1125f i18n/ita/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 db040b20535e5fbe6df69ea748baeb36651c5732 i18n/ita/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 f7f5fc15522cafdc1d5b18107eeb619649f0ca81 i18n/ita/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -77,7 +77,10 @@
- 	"editorFindMatchBorder": "Colore del bordo della corrispondenza della ricerca corrente.",
- 	"findMatchHighlightBorder": "Colore del bordo delle altre corrispondenze della ricerca.",
- 	"findRangeHighlightBorder": "Colore del bordo dell'intervallo di limite della ricerca. Il colore non deve essere opaco per non nascondere decorazioni sottostanti.",
-+<<<<<<< .our
- 	"findWidgetResizeBorder": "Colore del bordo della barra di ridimensionamento del comando trova.",
-+=======
-+>>>>>>> .their
- 	"hoverHighlight": "Evidenziazione sotto la parola per cui è visualizzata un'area sensibile al passaggio del mouse. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.",
- 	"hoverBackground": "Colore di sfondo dell'area sensibile al passaggio del mouse dell'editor.",
- 	"hoverBorder": "Colore del bordo dell'area sensibile al passaggio del mouse dell'editor.",
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ita/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
-  our    100644 b2a5da8a7dcdb9d4e94ec248c75b0a88b6011ba8 i18n/ita/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
-  their  100644 46a4d388680adb42971c65924dee9f77516065a3 i18n/ita/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
-@@ -6,5 +6,9 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"confirmUrl": "Permettere ad una estensione di aprire questo URL?"
-+=======
-+	"confirmUrl": "Consentire all'estensione {0} di aprire l'URL seguente?"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 490942db41e66f04dda34e07f0586418d0afdd83 i18n/ita/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
-  our    100644 ac822acba0fe7c66add0e5a0abe49ba74518688a i18n/ita/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
-  their  100644 ef90c889f17239a457dae50b10145026bbc01079 i18n/ita/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
-@@ -8,10 +8,18 @@
- 	],
- 	"vscode.extension.contributes.views.containers.id": "ID univoco usato per identificare il contenitore in cui è possibile aggiungere visualizzazioni come contributo usando il punto di aggiunta contributo 'views'",
- 	"vscode.extension.contributes.views.containers.title": "Stringa leggibile usata per il rendering del contenitore",
-+<<<<<<< .our
- 	"vscode.extension.contributes.views.containers.icon": "Percorso dell'icona del contenitore. Le icone, le cui dimensioni sono 24x24, sono centrate in un blocco le cui dimensioni sono 50x40 e sono caratterizzate dal colore di riempimento 'rgb(215, 218, 224)' o '#d7dae0'. Anche se è accettato qualsiasi tipo di file immagine, per le icone è consigliabile usare il formato SVG.",
- 	"vscode.extension.contributes.viewsContainers": "Aggiunge come contributo contenitori di visualizzazioni all'editor",
- 	"views.container.activitybar": "Aggiunge come contributo contenitori di visualizzazioni alla barra attività",
- 	"test": "Test",
-+=======
-+	"vscode.extension.contributes.views.containers.icon": "Percorso dell'icona del contenitore. Le icone, le cui dimensioni sono 24x24, sono centrate in un riquadro le cui dimensioni sono 50x40 e sono caratterizzate dal colore di riempimento 'rgb(215, 218, 224)' o '#d7dae0'. Anche se è accettato qualsiasi tipo di file immagine, per le icone è consigliabile usare il formato SVG.",
-+	"vscode.extension.contributes.viewsContainers": "Aggiunge come contributo contenitori di visualizzazioni all'editor",
-+	"views.container.activitybar": "Aggiunge come contributo contenitori di visualizzazioni alla barra attività",
-+	"test": "Test",
-+	"proposed": "Il contributo 'viewsContainers' è disponibile solo durante l'esecuzione all'esterno dell'ambiente di sviluppo o con l'opzione seguente della riga di comando: --enable-proposed-api {0}",
-+>>>>>>> .their
- 	"requirearray": "i contenitori di visualizzazioni devono essere una matrice",
- 	"requireidstring": "la proprietà `{0}` è obbligatoria e deve essere di tipo `string`. Sono consentiti solo caratteri alfanumerici, '_' e '-'.",
- 	"requirestring": "la proprietà `{0}` è obbligatoria e deve essere di tipo `string`",
-changed in both
-  base   100644 7459163ddb4f996eb0e5c3bfeca74ef3083c6a04 i18n/ita/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-  our    100644 f7b613949dc94479b22404933032cfe5dd1f13c4 i18n/ita/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-  their  100644 68aafa4d9faf6cac479ac56b11986bf227776f8e i18n/ita/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-changed in both
-  base   100644 1655f90169c430cadaa8e19809fb098ac9e4f710 i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-  our    100644 73bdd73c5df0195d83491760c4fa2a706a243147 i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-  their  100644 eb7562f604d865814f556748e751f6079f4d178f i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-@@ -6,6 +6,38 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
-+=======
-+	"vscode.extension.contributes.debuggers": "Adattatori di debug per contributes.",
-+	"vscode.extension.contributes.debuggers.type": "Identificatore univoco per questo adattatore di debug.",
-+	"vscode.extension.contributes.debuggers.label": "Nome visualizzato per questo adattatore di debug.",
-+	"vscode.extension.contributes.debuggers.program": "Percorso del programma dell'adattatore di debug. Il percorso è assoluto o relativo alla cartella delle estensioni.",
-+	"vscode.extension.contributes.debuggers.args": "Argomenti facoltativi da passare all'adattatore.",
-+	"vscode.extension.contributes.debuggers.runtime": "Runtime facoltativo nel caso in cui l'attributo del programma non sia un eseguibile ma richieda un runtime.",
-+	"vscode.extension.contributes.debuggers.runtimeArgs": "Argomenti del runtime facoltativo.",
-+	"vscode.extension.contributes.debuggers.variables": "Mapping tra le variabili interattive, ad esempio ${action.pickProcess}, in `launch.json` e un comando.",
-+	"vscode.extension.contributes.debuggers.initialConfigurations": "Configurazioni per generare la versione iniziale di 'launch.json'.",
-+	"vscode.extension.contributes.debuggers.languages": "Elenco dei linguaggi. per cui l'estensione di debug può essere considerata il \"debugger predefinito\".",
-+	"vscode.extension.contributes.debuggers.adapterExecutableCommand": "Se è specificato, Visual Studio Code chiamerà questo comando per determinare il percorso eseguibile della scheda di debug e gli argomenti da passare.",
-+	"vscode.extension.contributes.debuggers.configurationSnippets": "Frammenti per l'aggiunta di nuove configurazioni in 'launch.json'.",
-+	"vscode.extension.contributes.debuggers.configurationAttributes": "Configurazioni dello schema JSON per la convalida di 'launch.json'.",
-+	"vscode.extension.contributes.debuggers.windows": "Impostazioni specifiche di Windows.",
-+	"vscode.extension.contributes.debuggers.windows.runtime": "Runtime usato per Windows.",
-+	"vscode.extension.contributes.debuggers.osx": "Impostazioni specifiche di macOS.",
-+	"vscode.extension.contributes.debuggers.osx.runtime": "Runtime usato per macOS.",
-+	"vscode.extension.contributes.debuggers.linux": "Impostazioni specifiche di Linux.",
-+	"vscode.extension.contributes.debuggers.linux.runtime": "Runtime usato per Linux.",
-+	"vscode.extension.contributes.breakpoints": "Punti di interruzione per contributes.",
-+	"vscode.extension.contributes.breakpoints.language": "Consente i punti di interruzione per questo linguaggio.",
-+	"app.launch.json.title": "Launch",
-+	"app.launch.json.version": "Versione di questo formato di file.",
-+	"app.launch.json.configurations": "Elenco delle configurazioni. Aggiungere nuove configurazioni o modificare quelle esistenti con IntelliSense.",
-+	"app.launch.json.compounds": "Elenco degli elementi compounds. Ogni elemento compounds fa riferimento a più configurazioni che verranno avviate insieme.",
-+	"app.launch.json.compound.name": "Nome dell'elemento compounds. Viene visualizzato nel menu a discesa della configurazione di avvio.",
-+	"useUniqueNames": "Usare nomi di configurazione univoci.",
-+	"app.launch.json.compound.folder": "Nome della cartella in cui si trova l'elemento compounds.",
-+	"app.launch.json.compounds.configurations": "Nomi delle configurazioni che verranno avviate per questo elemento compounds.",
-+>>>>>>> .their
- 	"debugNoType": "Il \"tipo\" del debugger non può essere omesso e deve essere di tipo \"string\"",
- 	"selectDebug": "Seleziona ambiente",
- 	"DebugConfig.failed": "Non è possibile creare il file 'launch.json' all'interno della cartella '.vscode' ({0}).",
-changed in both
-  base   100644 423e65922d9c2b8d3c66757eb2c12d1a27775146 i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  our    100644 43601d1a73d0ae182748fee08c0ea21e7d438884 i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  their  100644 ffb134eab43a17fe3d32491eedc4bcce836b5697 i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-changed in both
-  base   100644 b89388c1e2b56716e8bea6c78755a8a5b0dc568a i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  our    100644 e979e5172329eb5b17f4bd06838e816aa279aaad i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  their  100644 89f32dfa7a791e92170af32a28b82c4bc954a300 i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-@@ -44,7 +44,11 @@
- 	"view location": "Dove",
- 	"localizations": "Localizzazioni ({0})",
- 	"localizations language id": "ID lingua",
-+<<<<<<< .our
- 	"localizations language name": "Nome del linguaggio",
-+=======
-+	"localizations language name": "Nome della lingua",
-+>>>>>>> .their
- 	"localizations localized language name": "Nome della lingua (localizzato)",
- 	"colorThemes": "Temi colore ({0})",
- 	"iconThemes": "Temi icona ({0})",
-changed in both
-  base   100644 1e7be78fff21d69cb3ff4701677c028b471a4bb5 i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 be168507f7ffd1be04bdbdbb14365762be628f25 i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 dfd904338b2b7cf2c29a51f6bf65c9f2554f47ca i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -65,6 +65,7 @@
- 	"emptyFileNameError": "È necessario specificare un nome file o un nome di cartella.",
- 	"fileNameStartsWithSlashError": "Un nome di file o cartella non può iniziare con una barra.",
- 	"fileNameExistsError": "In questo percorso esiste già un file o una cartella **{0}**. Scegliere un nome diverso.",
-+	"fileUsedAsFolderError": "**{0}** è un file e non può avere discendenti.",
- 	"invalidFileNameError": "Il nome **{0}** non è valido per un nome file o un nome di cartella. Scegliere un nome diverso.",
- 	"filePathTooLongError": "Con il nome **{0}** il percorso diventa troppo lungo. Scegliere un nome più breve.",
- 	"compareWithClipboard": "Confronta il file attivo con gli appunti",
-changed in both
-  base   100644 f0565a5e515056ea9fa3a9a2a9daa8bfa0e2a48a i18n/ita/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
-  our    100644 a9b62477dd3de26d472837e6c729d9451de74f54 i18n/ita/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
-  their  100644 595160a7a9dc53ed9ac5a16b21376d7a8cf10311 i18n/ita/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ita/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
-  our    100644 4d926353419cd46d9aa6a9a3a8d055ca41fb6b5f i18n/ita/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
-  their  100644 4ec323652b4e09d3e3cf67fc2f3104f380814c84 i18n/ita/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
-@@ -7,5 +7,9 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"disableFilesExclude": "Disabilita filtro di esclusione file.",
-+<<<<<<< .our
- 	"clearFilter": "Cancella il filtro."
-+=======
-+	"clearFilter": "Cancella filtro."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 3f0b88cd28f5d153aa422ea853e9e53f758e55b5 i18n/ita/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 13379f4fe2a00cfa238ca2e6341676a8a3328e76 i18n/ita/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 dab16abc980fd407edbafe49699435b6262d7009 i18n/ita/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -31,5 +31,9 @@
- 	"search.followSymlinks": "Controlla se seguire i collegamenti simbolici durante la ricerca.",
- 	"search.smartCase": "Cerca in modo insensibile alle maiuscole/minuscole se il criterio è tutto minuscolo, altrimenti cerca in modalità sensibile a maiuscole/minuscole",
- 	"search.globalFindClipboard": "Controlla se il viewlet di ricerca deve leggere o modificare gli appunti di ricerca condivisi in macOS",
-+<<<<<<< .our
- 	"search.location": "Controlla se la ricerca verrà mostrata come visualizzazione nella barra laterale o come pannello nell'area pannelli per ottenere più spazio orizzontale."
-+=======
-+	"search.location": "Controlla se la ricerca verrà mostrata come visualizzazione nella barra laterale o come pannello nell'area pannelli per ottenere più spazio orizzontale. Nella prossima versione la ricerca nel pannello avrà un layout orizzontale migliorato e non sarà più disponibile in anteprima."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d18ee9b5c9c5c42af144fdf92647d2c0a78d3b87 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 9af26b9889eaa5fa492c1556e3e5203a1ebacbf4 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 42d1b0441a45c5a44cbe14790090a25ba6ce9738 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-changed in both
-  base   100644 26ff40d49d34d2a2cd5af60ac023fe56f86d6cd0 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-  our    100644 343f27488ed5ee62dbeabb654e81d1f94b49e11b i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-  their  100644 e7c8e507835f9513c337d45672bb1b0d5cbdd4d9 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-changed in both
-  base   100644 34686a60cf99e0b117a7ac3ba679b44e942fa55f i18n/ita/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-  our    100644 1ac29db26914afff2f72d41f016deb4cf11bb6f6 i18n/ita/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-  their  100644 4c232882e6c865111388cfe8a94d72086c4b1efb i18n/ita/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-changed in both
-  base   100644 0679938a47a80a6e0d5ed30c16342ce34cd269fd i18n/ita/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  our    100644 b25e5dc4490f42f2acd95fbd251f7ac1e096a7d8 i18n/ita/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  their  100644 053d9ee56385203dc69fab2bb8630bda8f6015f4 i18n/ita/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-changed in both
-  base   100644 9b386d3755bcec55e05a48d2ed07af1775ecc136 i18n/jpn/extensions/git/out/commands.i18n.json
-  our    100644 9e38217888fdc2db31af2a431341d645d8b6b16d i18n/jpn/extensions/git/out/commands.i18n.json
-  their  100644 790d0e373f963b958f37ea7288640a434848bf86 i18n/jpn/extensions/git/out/commands.i18n.json
-@@ -10,8 +10,14 @@
- 	"remote branch at": "{0} でのリモート ブランチ",
- 	"create branch": "$(plus) 新しいブランチを作成",
- 	"repourl": "リポジトリ URL",
-+<<<<<<< .our
- 	"selectFolder": "リポジトリの場所を選択",
- 	"cloning": "Git リポジトリ '{0}' を複製しています...",
-+=======
-+	"parent": "親ディレクトリ",
-+	"cloning": "Git リポジトリ '{0}' を複製しています...",
-+	"openrepo": "リポジトリを開く",
-+>>>>>>> .their
- 	"proposeopen": "クローンしたリポジトリを開きますか?",
- 	"openrepo": "リポジトリを開く",
- 	"add": "ワークスペースに追加",
-changed in both
-  base   100644 66b27154854f0047f2629f066c58acfcbabece24 i18n/jpn/extensions/npm/out/npmView.i18n.json
-  our    100644 b97b06cabbd133f876a915a0ea9ad3a17421edf2 i18n/jpn/extensions/npm/out/npmView.i18n.json
-  their  100644 65a4786ba26583266ccff4581feb2e064ebcae0c i18n/jpn/extensions/npm/out/npmView.i18n.json
-@@ -6,9 +6,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"noScripts": "スクリプトが見つかりません",
- 	"noDebugOptions": "スクリプトの Node デバッグ オプションが不足しているため、\"{0}\" をデバッグ起動できません。例: --inspect-brk\"。",
- 	"learnMore": "詳細情報",
- 	"ok": "OK",
- 	"scriptInvalid": "スクリプト '{0}' が見つかりませんでした。ビューを更新してください。"
-+=======
-+	"npm.noDebugOptions": "スクリプトの Node デバッグ オプションが不足しているため、\"{0}\" をデバッグ起動できません。例: --inspect-brk\"。",
-+	"npm.scriptInvalid": "スクリプト '{0}' が見つかりませんでした。ビューを更新してください。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 30a98e7071155a675c0b7770ab92712f0813fe52 i18n/jpn/extensions/npm/package.i18n.json
-  our    100644 0ff30c62c2a3c39c26a5bdcdaa3a46a93a434f3e i18n/jpn/extensions/npm/package.i18n.json
-  their  100644 dc9753211e4ed80d0f1484bda45aff5293d19596 i18n/jpn/extensions/npm/package.i18n.json
-@@ -22,5 +22,10 @@
- 	"command.run": "実行",
- 	"command.debug": "デバッグ",
- 	"command.openScript": "Open",
-+<<<<<<< .our
- 	"command.runInstall": "インストールを実行"
-+=======
-+	"npm.scriptInvalid": "スクリプト '{0}' が見つかりませんでした。ビューを更新してください。",
-+	"npm.noDebugOptions": "スクリプトの Node デバッグ オプションが不足しているため、\"{0}\" をデバッグ起動できません。例: --inspect-brk\"。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 67126552f238d9d0a1d28c29e6603f2b62d83578 i18n/jpn/src/vs/code/electron-main/menus.i18n.json
-  our    100644 ff7eb3df479fa3b25aa486b1991a4263b1ee917b i18n/jpn/src/vs/code/electron-main/menus.i18n.json
-  their  100644 712508a7ad6cabbc1844ae1e5d60f0a096296661 i18n/jpn/src/vs/code/electron-main/menus.i18n.json
-changed in both
-  base   100644 61fb3badc1a49f20c68e6d17b436d7b87c3ce533 i18n/jpn/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 8a524167aa36e1a9cb85f51526bd76d90fd343d7 i18n/jpn/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 13726b08713b9abe77d2adcfad5b2bd1a20e17db i18n/jpn/src/vs/editor/common/config/commonEditorConfig.i18n.json
-changed in both
-  base   100644 258ab3ea2488b20925e205be22a95804033d8919 i18n/jpn/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
-  our    100644 ee5ed252d7e10ebc0b3728aafb2a7308a4db1225 i18n/jpn/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
-  their  100644 a21d3093051429c997745356663a2841b76f4599 i18n/jpn/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
-@@ -8,12 +8,22 @@
- 	],
- 	"vscode.extension.contributes.views.containers.id": "'views' コントリビューション ポイントを使用して提供できるコンテナを識別するための一意の ID",
- 	"vscode.extension.contributes.views.containers.title": "コンテナーの表示に使用する、人が判別できる文字列",
-+<<<<<<< .our
- 	"vscode.extension.contributes.views.containers.icon": "コンテナ アイコンのパス。アイコンは、50x40 のブロックの中心に配置された 24x24 のサイズで、'rgb(215, 218, 224)' または '#d7dae0' の色で塗りつぶされます。アイコンでは、任意の種類の画像を使用できますが、SVG にすることをお勧めします。",
- 	"vscode.extension.contributes.viewsContainers": "ビュー コンテナをエディターに提供します",
- 	"views.container.activitybar": "アクティビティ バーにビュー コンテナを提供します",
- 	"test": "テスト",
- 	"requirearray": "ビュー コンテナは配列である必要があります",
- 	"requireidstring": "プロパティ '{0}' は必須で、'string' 型でなければなりません。英数字と '_' , '-' のみが使用できます。",
-+=======
-+	"vscode.extension.contributes.views.containers.icon": "コンテナ アイコンのパス。アイコンは、50x40 の四角形の中心に配置された 24x24 のサイズで、'rgb(215, 218, 224)' または '#d7dae0' の色で塗りつぶされます。アイコンでは、任意の種類の画像を使用できますが、SVG にすることをお勧めします。",
-+	"vscode.extension.contributes.viewsContainers": "ビュー コンテナをエディターに提供します",
-+	"views.container.activitybar": "アクティビティ バーにビュー コンテナを提供します",
-+	"test": "テスト",
-+	"proposed": "'viewsContainers' コントリビューションは、dev または次のコマンド ライン スイッチを使用しているときにのみ用いることができます: --enable-proposed-api {0}",
-+	"requirearray": "ビュー コンテナは配列である必要があります",
-+	"requireidstring": "プロパティ '{0}' は必須で、'string' 型でなければなりません。使用できるのは、半角英数字、'_'、'-' のみです。",
-+>>>>>>> .their
- 	"requirestring": " `{0}`  プロパティは必須で、`string` 型でなければなりません",
- 	"showViewlet": "{0} を表示",
- 	"view": "表示"
-changed in both
-  base   100644 08d132073bb1e62111c4dd6f3a9d24207b7c5b1c i18n/jpn/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  our    100644 04da69ca72e6f371509e954df8fe7fc2de884792 i18n/jpn/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  their  100644 8268450015e6a45be9ebcfce824b0dd1cf32b8cc i18n/jpn/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-changed in both
-  base   100644 f610bb7f3a1bc36b23ff5bd04f00b9a19fe056d6 i18n/jpn/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  our    100644 eb83945b7d0abfbb9eff32f805d60fdd0909ec43 i18n/jpn/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  their  100644 777275189624516ae9c7ebe3b5f297f4bf2c3ac9 i18n/jpn/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-changed in both
-  base   100644 f370c5a7367f2512ad40c989bcd9850b8086102c i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  our    100644 566c067b7eecfcf08c220a68d21a9b94120fe7a3 i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  their  100644 48162c6968ad1cbf305e9209d05f50081dd4acde i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-changed in both
-  base   100644 952d29529a3a5c3f16123cc3518ea959facfc46d i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 e65ff7942d87b569809cd4818a0800fdfb729d2c i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 3f5373d85cbb8eea6ad9c86eaf916b9f7d73790d i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-changed in both
-  base   100644 1b654ebed35d5acc569fb37a40eb79df44651e48 i18n/jpn/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
-  our    100644 17369bf498cce999926f766172eec80f2b28e922 i18n/jpn/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
-  their  100644 a821e834d0be970b3153114383c465be705f46b8 i18n/jpn/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
-@@ -11,7 +11,11 @@
- 	"yes": "はい",
- 	"no": "いいえ",
- 	"neverAgain": "今後は表示しない",
-+<<<<<<< .our
- 	"install language pack": "近い将来、VS Code は Marketplace から入手する言語パックのみをサポートするようになります。現在構成している言語を使い続けるためには '{0}' 拡張機能をインストールしてください。",
-+=======
-+	"install language pack": "近い将来、VS Codeはマーケットプレイスの拡張機能のみをサポートします。現在構成されている言語を使い続けるためには、拡張機能 '{0}' をインストールしてください。",
-+>>>>>>> .their
- 	"install": "インストール",
- 	"more information": "詳細情報...",
- 	"JsonSchema.locale": "使用する UI 言語。",
-changed in both
-  base   100644 f6fb99713eca2f16ec4f3ab17a60c93b7b6f752d i18n/jpn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 d63dc1c7de64299d00cc648c70a452e18abf1957 i18n/jpn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 11a7af1bc62424db146c27a2d568118198f9788f i18n/jpn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-changed in both
-  base   100644 aa930ebf26bcd87b8796eeccf979f82b09e9e34f i18n/jpn/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  our    100644 da438326649bf3dd9d5fc83ed7deb703ead893a5 i18n/jpn/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  their  100644 e0d53ae58d71b998c067dd1b074c0f9347c9514d i18n/jpn/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-changed in both
-  base   100644 e1ccbbf253f81e2660f109b41e3466a1a4afd284 i18n/kor/extensions/git/out/commands.i18n.json
-  our    100644 5c881abd459fc945dcc1b911f43b518f709ac538 i18n/kor/extensions/git/out/commands.i18n.json
-  their  100644 7f332b50cf839623757d9140a78de32924bdd1b3 i18n/kor/extensions/git/out/commands.i18n.json
-@@ -10,8 +10,14 @@
- 	"remote branch at": "{0}에서 원격 분기",
- 	"create branch": "$(plus) 새 분기 생성",
- 	"repourl": "리포지토리 URL",
-+<<<<<<< .our
- 	"selectFolder": "리포지토리 위치 선택",
- 	"cloning": "Git 리포지토리 '{0}'을(를) 복제하는 중...",
-+=======
-+	"parent": "부모 디렉터리",
-+	"cloning": "Git 리포지토리 '{0}'을(를) 복제하는 중...",
-+	"openrepo": "리포지토리 열기",
-+>>>>>>> .their
- 	"proposeopen": "복제된 리포지토리를 여시겠습니까?",
- 	"openrepo": "리포지토리 열기",
- 	"add": "작업 영역에 추가",
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/kor/extensions/npm/out/npmView.i18n.json
-  our    100644 1f8713e1e4699c2862a870782463f5f962502d23 i18n/kor/extensions/npm/out/npmView.i18n.json
-  their  100644 94edf3b4b0c61007e88c6348d66bba8e869ad1e9 i18n/kor/extensions/npm/out/npmView.i18n.json
-@@ -6,9 +6,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"noScripts": "스크립트를 찾을 수 없음",
- 	"noDebugOptions": "스크립트에 노드 디버그 옵션(예: '--inspect-brk')이 없으므로 디버깅에 사용할 \"{0}\"을(를) 시작할 수 없습니다.",
- 	"learnMore": "자세한 정보",
- 	"ok": "확인",
- 	"scriptInvalid": "\"{0}\" 스크립트를 찾을 수 없습니다. 뷰로 새로 고쳐 보세요."
-+=======
-+	"npm.noDebugOptions": "스크립트에 노드 디버그 옵션(예: '--inspect-brk')이 없으므로 디버깅에 사용할 \"{0}\"을(를) 시작할 수 없습니다.",
-+	"npm.scriptInvalid": "\"{0}\" 스크립트를 찾을 수 없습니다. 뷰로 새로 고쳐 보세요."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 9d5b756e7da820a85115310fd5eb7f3a8e802955 i18n/kor/extensions/npm/package.i18n.json
-  our    100644 b762a88ac6b09e3d0033e37c5db538576d49fc4b i18n/kor/extensions/npm/package.i18n.json
-  their  100644 ca92d6afeec145c4866c5f43e43c18212cd84f89 i18n/kor/extensions/npm/package.i18n.json
-@@ -12,15 +12,27 @@
- 	"config.npm.runSilent": " `--silent` 옵션으로 npm 명령 실행.",
- 	"config.npm.packageManager": "스크립트를 실행하는 데 사용하는 패키지 관리자.",
- 	"config.npm.exclude": "자동 스크립트 검색에서 제외할 폴더에 대한 Glob 패턴을 구성합니다.",
-+<<<<<<< .our
- 	"config.npm.enableScriptExplorer": "npm 스크립트에 대한 탐색기 뷰를 사용하도록 설정합니다.",
- 	"config.npm.scriptExplorerAction": "스크립트 탐색기에서 사용되는 기본 클릭 동작으로 '열기' 또는 '실행'이며, 기본값은 '열기'입니다.",
- 	"npm.parseError": "Npm 작업 검색: {0} 파일을 구문 분석하지 못했습니다.",
- 	"taskdef.script": "사용자 지정할 npm 스크립트입니다.",
- 	"taskdef.path": "스크립트를 제공하는 package.json 파일의 폴더 경로이며 생략할 수 있습니다.",
-+=======
-+	"config.npm.enableScriptExplorer": "작업 영역에 'package.json' 파일이 포함되어 있는 경우 npm 스크립트에 대한 탐색기 뷰를 사용하도록 설정합니다.",
-+	"npm.parseError": "Npm 작업 검색: {0} 파일을 구문 분석하지 못했습니다.",
-+	"taskdef.script": "사용자 지정할 npm 스크립트입니다.",
-+	"taskdef.path": "스크립트를 제공하는 package.json 파일의 폴더에 대한 경로이며 생략할 수 있습니다.",
-+>>>>>>> .their
- 	"view.name": "Npm 스크립트",
- 	"command.refresh": "새로 고침",
- 	"command.run": "실행",
- 	"command.debug": "디버그",
- 	"command.openScript": "열기",
-+<<<<<<< .our
- 	"command.runInstall": "설치 실행"
-+=======
-+	"npm.scriptInvalid": "'{0}' 스크립트를 찾을 수 없습니다. 뷰를 새로 고쳐 보세요.",
-+	"npm.noDebugOptions": "스크립트에 노드 디버그 옵션(예: '--inspect-brk')이 없으므로 디버깅에 사용할 '{0}'을(를) 시작할 수 없습니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 3f2230bf2840935b1b15e8d5866874270ec2c6ad i18n/kor/extensions/typescript-language-features/package.i18n.json
-  our    100644 984ed51999acf7b77c7daa099fbfb034062e4de6 i18n/kor/extensions/typescript-language-features/package.i18n.json
-  their  100644 8aa324a0170f3bf6d092b390dcb0709d48f8ca55 i18n/kor/extensions/typescript-language-features/package.i18n.json
-@@ -59,9 +59,13 @@
- 	"typescript.experimental.syntaxFolding": "구문 인식 접기 마커를 설정하거나 해제합니다.",
- 	"taskDefinition.tsconfig.description": "TS 빌드를 정의하는 tsconfig 파일입니다.",
- 	"javascript.suggestionActions.enabled": "편집기에서 JavaScript 파일에 대한 제안 진단을 사용하거나 사용하지 않도록 설정합니다. TypeScript 2.8 이상이 필요합니다.",
-+<<<<<<< .our
- 	"typescript.suggestionActions.enabled": "편집기에서 TypeScript 파일에 대한 제안 진단을 사용하거나 사용하지 않도록 설정합니다. TypeScript 2.8 이상이 필요합니다.",
- 	"typescript.preferences.quoteStyle": "빠른 수정에 사용할 기본 따옴표 스타일로 '작은' 따옴표, '큰' 따옴표 또는 '자동'입니다. '자동'이면 기존 가져오기에서 따옴표 형식이 유추됩니다. TypeScript 2.9 이상이 필요합니다.",
- 	"typescript.preferences.importModuleSpecifier": "자동 가져오기에 대한 기본 경로 스타일:\n- 파일 위치에 \"상대적\"\n- 'jsconfig.json' / 'tsconfig.json'에 구성된 'baseUrl'을 기준으로 \"상대적이지 않음\"\n- \"자동\"은 가장 짧은 경로 유형을 유추합니다.\nTypeScript 2.9 이상이 필요합니다.",
- 	"typescript.showUnused": "코드에서 사용되지 않는 변수의 강조 표시를 사용하거나 사용하지 않도록 설정합니다. TypeScript 2.9 이상이 필요합니다.",
- 	"typescript.updateImportsOnFileMove.enabled": "VS Code에서 파일을 이동하거나 이름을 바꿀 때 가져오기 경로의 자동 업데이트를 사용하거나 사용하지 않도록 설정합니다. 가능한 값은 'prompt'(이름을 바꿀 때마다 메시지 표시)', 'always'(경로를 항상 자동으로 업데이트) 및 'never'(경로 이름을 바꾸지 않고 메시지를 다시 표시 안 함)입니다. TypeScript 2.9 이상이 필요합니다."
-+=======
-+	"typescript.suggestionActions.enabled": "편집기에서 TypeScript 파일에 대한 제안 진단을 사용하거나 사용하지 않도록 설정합니다. TypeScript 2.8 이상이 필요합니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f5bbe51e02b9be4f211145b43619bc9eec0b9914 i18n/kor/src/vs/base/node/zip.i18n.json
-  our    100644 0ed982e1ded1a08d9df14c1fff9ea9b29f1f83c9 i18n/kor/src/vs/base/node/zip.i18n.json
-  their  100644 962e062f13a273ca3061dc4fcc01f8ffd075ea27 i18n/kor/src/vs/base/node/zip.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"incompleteExtract": "완료되지 않았습니다. {1}개 항목 중 {0}개를 찾았습니다.",
-+=======
-+	"incompleteExtract": "완료되지 않았습니다. {1}개 항목 중 {0}개가 추출되었습니다.",
-+>>>>>>> .their
- 	"notFound": "zip 파일 내에 {0}이(가) 없습니다."
- }
-\ No newline at end of file
-changed in both
-  base   100644 0d6f74e08a2d7d367af32edb8a10365b3c34d6eb i18n/kor/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  our    100644 76588bffb73908d0aeec139d2a389b29a4d2f55f i18n/kor/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  their  100644 e629243de3e80caf5828921ed083b8592b3b28fd i18n/kor/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-changed in both
-  base   100644 00754823fe4a236a1769d64084301cf2f4e7322d i18n/kor/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  our    100644 ff0a015d193c699649f7844d926e630dbc9f9f24 i18n/kor/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  their  100644 ea3d4e905b8f4284c93f1b28526e84d1ca6e3297 i18n/kor/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-changed in both
-  base   100644 d2f76643375b034210e11ce5f40e4a0eef5b721f i18n/kor/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
-  our    100644 159ef5e93d612d7c804ca8040b5fb4bb72ca6f39 i18n/kor/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
-  their  100644 7fdbd9cc5d449879dcecb3a9876293a97e75dcbb i18n/kor/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
-@@ -8,10 +8,17 @@
- 	],
- 	"cpu": "CPU %",
- 	"memory": "메모리(MB)",
-+<<<<<<< .our
- 	"pid": "PID",
- 	"name": "이름",
- 	"killProcess": "프로세스 종료",
- 	"forceKillProcess": "프로세스 강제 종료",
- 	"copy": "복사",
- 	"copyAll": "모두 복사"
-+=======
-+	"pid": "pid",
-+	"name": "이름",
-+	"killProcess": "프로세스 종료",
-+	"forceKillProcess": "프로세스 강제 종료"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 128f36b11087dd8086252293dbea93f455e9e72f i18n/kor/src/vs/code/electron-main/menus.i18n.json
-  our    100644 a3a33ffe4d84057c71074e546cdf9a1e5529a6c8 i18n/kor/src/vs/code/electron-main/menus.i18n.json
-  their  100644 2a218b9a67ad4a6d06920857d5c3325b782d14e5 i18n/kor/src/vs/code/electron-main/menus.i18n.json
-changed in both
-  base   100644 79e5d8e03e76b701cb7de17dc1468b91b98544b7 i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 c96c0fe1469ce78842b73db686d63d6305f28dfb i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 0571718579149f69295b72b682ff5fd9ff1c5008 i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -16,7 +16,11 @@
- 	"lineNumbers.on": "줄 번호는 절대값으로 렌더링 됩니다.",
- 	"lineNumbers.relative": "줄 번호는 커서 위치에서 줄 간격 거리로 렌더링 됩니다.",
- 	"lineNumbers.interval": "줄 번호는 매 10 줄마다 렌더링이 이루어집니다.",
-+<<<<<<< .our
- 	"lineNumbers": "줄 번호의 표시 여부를 제어합니다.",
-+=======
-+	"lineNumbers": "줄 번호 표시를 제어합니다.",
-+>>>>>>> .their
- 	"rulers": "특정 수의 고정 폭 문자 뒤에 세로 눈금자를 렌더링합니다. 여러 눈금자의 경우 여러 값을 사용합니다. 배열이 비어 있는 경우 눈금자가 그려져 있지 않습니다.",
- 	"wordSeparators": "단어 관련 탐색 또는 작업을 수행할 때 단어 구분 기호로 사용되는 문자입니다.",
- 	"tabSize": "탭 한 개에 해당하는 공백 수입니다. `editor.detectIndentation`이 켜져 있는 경우 이 설정은 파일 콘텐츠에 따라 재정의됩니다.",
-changed in both
-  base   100644 f226af7ac85fb6c68f978fd8f0a37c4bd0c8cd86 i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 c148a56d8d67892505611b68cdd18b2ba3428134 i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 6dd11aae95676bbe7c617749554234541b7a77ea i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/kor/src/vs/editor/contrib/message/messageController.i18n.json
-  our    100644 af6229ea68cfd27b1588cf6216af30c6b3a490b2 i18n/kor/src/vs/editor/contrib/message/messageController.i18n.json
-  their  100644 1ef12fcdba79dbf67fbc7151f2aca109071f1c53 i18n/kor/src/vs/editor/contrib/message/messageController.i18n.json
-@@ -6,5 +6,9 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"editor.readonly": "읽기 전용 편집기에서는 편집할 수 없습니다."
-+=======
-+	"editor.readonly": "읽기 전용 편집기에서 편집할 수 없습니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 29a28e29329727823e2fcfc980326213da299daa i18n/kor/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 05518f96202309824a89dfbd3498bbcde7102ebd i18n/kor/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 79962c1adb5b38726008b87586177ecc1ed77f1b i18n/kor/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-changed in both
-  base   100644 082b43917c9c9801433fde2ee012c050ca957de0 i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 44b01274f5b039d38e4cfbd58f3d0758fa5d1e89 i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 151bdc8fe9ccedd4565625d0f4cd1f82a93bb082 i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -77,7 +77,10 @@
- 	"editorFindMatchBorder": "현재 검색과 일치하는 테두리 색입니다.",
- 	"findMatchHighlightBorder": "다른 검색과 일치하는 테두리 색입니다.",
- 	"findRangeHighlightBorder": "검색을 제한하는 범위의 테두리 색입니다. 이 색은 기본 장식을 가리지 않도록 불투명하지 않아야 합니다.",
-+<<<<<<< .our
- 	"findWidgetResizeBorder": "찾기 위젯의 크기 조정 막대의 테두리 색입니다.",
-+=======
-+>>>>>>> .their
- 	"hoverHighlight": "호버가 표시된 단어 아래를 강조 표시합니다. 색상은 밑의 꾸밈을 가리지 않도록 반드시 불투명이 아니어야 합니다.",
- 	"hoverBackground": "편집기 호버의 배경색.",
- 	"hoverBorder": "편집기 호버의 테두리 색입니다.",
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/kor/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
-  our    100644 684601464046e0f4eb035c86a18d6c4c19fc45b5 i18n/kor/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
-  their  100644 06c3296dbee2001be2bccd1e67b675db01c3dc63 i18n/kor/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
-@@ -6,5 +6,9 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"confirmUrl": "확장이 이 URL을 열도록 허용하겠습니까?"
-+=======
-+	"confirmUrl": "{0} 확장에서 다음 URL을 열도록 허용하시겠습니까?"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 354f883f4b89f5a3f1203401388fd573bf55b972 i18n/kor/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
-  our    100644 4fcdf6229805eb6264e1937c44e75868cb5f9963 i18n/kor/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
-  their  100644 a294bc2701a3025e4ac7775ed89b2836e08c59d0 i18n/kor/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
-@@ -8,12 +8,22 @@
- 	],
- 	"vscode.extension.contributes.views.containers.id": "'뷰' 기여 지점을 사용하여 뷰가 기여될 수 있는 컨테이너를 식별하는 데 사용되는 고유한 ID",
- 	"vscode.extension.contributes.views.containers.title": "컨테이너를 렌더링하는 데 사용되는 사람이 읽을 수 있는 문자열",
-+<<<<<<< .our
- 	"vscode.extension.contributes.views.containers.icon": "컨테이너 아이콘의 경로입니다. 아이콘은 50x40 사각형의 가운데에 있는 24x24 크기이며 채우기 색은 'rgb(215, 218, 224)' 또는 '#d7dae0'입니다. 아이콘의 이미지 파일 형식은 무엇이든 상관없지만 SVG를 사용하는 것이 좋습니다..",
- 	"vscode.extension.contributes.viewsContainers": "뷰 컨테이너를 편집기에 기여합니다.",
- 	"views.container.activitybar": "뷰 컨테이너를 작업 막대에 기여",
- 	"test": "테스트",
- 	"requirearray": "뷰 컨테이너는 배열이어야 합니다.",
- 	"requireidstring": "`{0}` 속성은 필수이며 `string` 형식이어야 합니다. 영숫자와 ,  '_',  '-'만 사용할 수 있습니다.",
-+=======
-+	"vscode.extension.contributes.views.containers.icon": "컨테이너 아이콘의 경로입니다. 아이콘은 50x40 사각형의 가운데에 있는 24x24 크기이며 채우기 색은 'rgb(215, 218, 224)' 또는 '#d7dae0'입니다. 아이콘의 이미지 파일 형식은 무엇이든 상관없지만 SVG를 사용하는 것이 좋습니다.",
-+	"vscode.extension.contributes.viewsContainers": "뷰 컨테이너를 편집기에 기여합니다.",
-+	"views.container.activitybar": "뷰 컨테이너를 작업 막대에 기여",
-+	"test": "테스트",
-+	"proposed": "'viewsContainers' 기여는 dev 외부에서 실행하거나 명령줄 스위치 --enable-proposed-api {0}을(를) 사용하여 실행할 때만 사용할 수 있습니다.",
-+	"requirearray": "뷰 컨테이너는 배열이어야 합니다.",
-+	"requireidstring": "`{0}` 속성은 필수이며 `string` 형식이어야 합니다. 영숫자, '_', '-'만 사용할 수 있습니다.",
-+>>>>>>> .their
- 	"requirestring": "속성 `{0}`은(는) 필수이며 `string` 형식이어야 합니다.",
- 	"showViewlet": "{0} 표시",
- 	"view": "보기"
-changed in both
-  base   100644 28e7371a1534d6276956ec0fefca3cd8745ecd12 i18n/kor/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-  our    100644 d1d8a2f6ed3974f592b71cc06f7743b0360b0d40 i18n/kor/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-  their  100644 9761cf8ad280c470772d0e50b31d23766b06a39b i18n/kor/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-changed in both
-  base   100644 a942f921e392b43580bf75806a1a7078b74439da i18n/kor/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  our    100644 6a3df39c2499e1d57cd7be82d64220494ab19ab0 i18n/kor/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  their  100644 280e4a321c6294c5ffbd22a360460079e7e9e481 i18n/kor/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-@@ -8,7 +8,11 @@
- 	],
- 	"toggleBreakpointAction": "디버그: 중단점 설정/해제",
- 	"conditionalBreakpointEditorAction": "디버그: 조건부 중단점 추가...",
-+<<<<<<< .our
- 	"logPointEditorAction": "디버그 : Logpoint 추가...",
-+=======
-+	"logPointEditorAction": "디버그: Logpoint 추가...",
-+>>>>>>> .their
- 	"runToCursor": "커서까지 실행",
- 	"debugEvaluate": "디버그: 평가",
- 	"debugAddToWatch": "디버그: 조사식에 추가",
-changed in both
-  base   100644 2b16fc7aa13f796755d3bf2239e73c2f571c0d88 i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-  our    100644 dc993a8c3d23ac0936ec4871652b8ef33d88e1dd i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-  their  100644 1dde88576b3444c137e0a81bfc13e37e643bdb23 i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-@@ -6,6 +6,38 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
-+=======
-+	"vscode.extension.contributes.debuggers": "디버그 어댑터를 적용합니다.",
-+	"vscode.extension.contributes.debuggers.type": "이 디버그 어댑터에 대한 고유한 식별자입니다.",
-+	"vscode.extension.contributes.debuggers.label": "이 디버그 어댑터에 대한 이름을 표시합니다.",
-+	"vscode.extension.contributes.debuggers.program": "디버그 어댑터 프로그램의 경로입니다. 절대 경로이거나 확장 폴더의 상대 경로입니다.",
-+	"vscode.extension.contributes.debuggers.args": "어댑터에 전달할 선택적 인수입니다.",
-+	"vscode.extension.contributes.debuggers.runtime": "프로그램 특성이 실행 파일이 아니지만 런타임이 필요한 경우의 선택적 런타임입니다.",
-+	"vscode.extension.contributes.debuggers.runtimeArgs": "선택적 런타임 인수입니다.",
-+	"vscode.extension.contributes.debuggers.variables": "`launch.json`의 대화형 변수(예: ${action.pickProcess})에서 명령으로의 매핑입니다.",
-+	"vscode.extension.contributes.debuggers.initialConfigurations": "초기 'launch.json'을 생성하기 위한 구성입니다.",
-+	"vscode.extension.contributes.debuggers.languages": "디버그 확장이 \"기본 디버거\"로 간주될 수 있는 언어 목록입니다.",
-+	"vscode.extension.contributes.debuggers.adapterExecutableCommand": "지정하는 경우 VS Code에서 이 명령을 호출하여 디버그 어댑터의 실행 파일 경로 및 전달할 인수를 확인합니다.",
-+	"vscode.extension.contributes.debuggers.configurationSnippets": "'launch.json'에 새 구성을 추가하는 코드 조각입니다.",
-+	"vscode.extension.contributes.debuggers.configurationAttributes": "'launch.json'의 유효성 검사를 위한 JSON 스키마 구성입니다.",
-+	"vscode.extension.contributes.debuggers.windows": "Windows 특정 설정",
-+	"vscode.extension.contributes.debuggers.windows.runtime": "Windows에 사용되는 런타임입니다.",
-+	"vscode.extension.contributes.debuggers.osx": "macOS 관련 설정입니다.",
-+	"vscode.extension.contributes.debuggers.osx.runtime": "macOS에 사용되는 런타임입니다.",
-+	"vscode.extension.contributes.debuggers.linux": "Linux 특정 설정",
-+	"vscode.extension.contributes.debuggers.linux.runtime": "Linux에 사용되는 런타임입니다.",
-+	"vscode.extension.contributes.breakpoints": "중단점을 적용합니다.",
-+	"vscode.extension.contributes.breakpoints.language": "이 언어에 대해 중단점을 허용합니다.",
-+	"app.launch.json.title": "시작",
-+	"app.launch.json.version": "이 파일 형식의 버전입니다.",
-+	"app.launch.json.configurations": "구성 목록입니다. IntelliSense를 사용하여 새 구성을 추가하거나 기존 구성을 편집합니다.",
-+	"app.launch.json.compounds": "복합의 목록입니다. 각 복합은 함께 시작되는 여러 구성을 참조합니다.",
-+	"app.launch.json.compound.name": "복합의 이름입니다. 구성 시작 드롭 다운 메뉴에 표시됩니다.",
-+	"useUniqueNames": "고유한 구성 이름을 사용하세요.",
-+	"app.launch.json.compound.folder": "복합형 항목이 있는 폴더의 이름입니다.",
-+	"app.launch.json.compounds.configurations": "이 복합의 일부로 시작되는 구성의 이름입니다.",
-+>>>>>>> .their
- 	"debugNoType": "디버거 '형식'은 생략할 수 없으며 '문자열' 형식이어야 합니다.",
- 	"selectDebug": "환경 선택",
- 	"DebugConfig.failed": "'.vscode' 폴더({0}) 내에 'launch.json' 파일을 만들 수 없습니다.",
-changed in both
-  base   100644 f17252c082dac708bb77d5bf8be39ae2e60770ff i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  our    100644 b40f849a9c20da0feb620bdd6d7636a80a878e4b i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  their  100644 1b78f57c0336bed2e2354afe064a96b513cca192 i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-changed in both
-  base   100644 1de6037ae75176243d5d93eae6350dca9c9eb702 i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  our    100644 0ba9ae100f9a8992cae9cf4667a7ead3845b17e1 i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  their  100644 ac0d4279306dd86dc6aef8e72448d92e45e7a5dd i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-changed in both
-  base   100644 2c49994a801426448f50bc51c3999738f776ce11 i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 3bf77a27ac7c066f4ce3c283301cd1346b8314d5 i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 4db0bd1a4d4cdb54c7a63d56002f1b49b4a34f0b i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -65,6 +65,7 @@
- 	"emptyFileNameError": "파일 또는 폴더 이름을 입력해야 합니다.",
- 	"fileNameStartsWithSlashError": "파일 또는 폴더 이름은 슬래시로 시작할 수 없습니다.",
- 	"fileNameExistsError": "파일 또는 폴더 **{0}**이(가) 이 위치에 이미 있습니다. 다른 이름을 선택하세요.",
-+	"fileUsedAsFolderError": "**{0}**은(는) 파일이며 하위 항목이 있을 수 없습니다.",
- 	"invalidFileNameError": "**{0}**(이)라는 이름은 파일 또는 폴더 이름으로 올바르지 않습니다. 다른 이름을 선택하세요.",
- 	"filePathTooLongError": "**{0}**(이)라는 이름을 사용하면 경로가 너무 길어집니다. 짧은 이름을 선택하세요.",
- 	"compareWithClipboard": "클립보드와 활성 파일 비교",
-changed in both
-  base   100644 89a77ea28d775ec76431b985117293a6f19419cd i18n/kor/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
-  our    100644 66ced1818fdcc0ac94130a3075755fe4e4cbc16f i18n/kor/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
-  their  100644 511e22e0dd6b6d7e609d533d953afbab02654214 i18n/kor/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
-changed in both
-  base   100644 6dd3b8d050472fe7a624f28b55dae3a97bb57ad9 i18n/kor/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 071d294ccc8fe4437d151c87e9b3a4d19cd1a8d5 i18n/kor/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 895fe0cc28807b857fffd2e1f0e5e8abea94d5c3 i18n/kor/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-changed in both
-  base   100644 a894a8df8a0ec64895fda4499917bf08b8b16630 i18n/kor/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 b8f4fa84a25213fae0e380ab22868cdef4e860d3 i18n/kor/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 2d6e06f5493628270509c58e85c4ff9f0a688343 i18n/kor/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -31,5 +31,9 @@
- 	"search.followSymlinks": "검색하는 동안 symlink를 누를지 여부를 제어합니다.",
- 	"search.smartCase": "패턴이 모두 소문자인 경우 대/소문자를 구분하지 않고 검색하고, 그렇지 않으면 대/소문자를 구분하여 검색합니다.",
- 	"search.globalFindClipboard": "macOS에서 검색 보기가 공유 클립보드 찾기를 읽거나 수정해야 할지를 제어합니다.",
-+<<<<<<< .our
- 	"search.location": "검색을 사이드바의 보기로 표시할지 또는 가로 간격을 늘리기 위해 패널 영역의 패널로 표시할지를 제어합니다."
-+=======
-+	"search.location": "검색을 사이드바의 보기로 표시할지 또는 가로 간격을 늘리기 위해 패널 영역의 패널로 표시할지를 제어합니다. 다음 릴리스의 패널에서의 검색은 가로 레이아웃이 개선되며 더 이상 미리 보기가 아닙니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 1d3dab07b1fea11f33977e87055756cd43378ed9 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 0c53998d6e084853fcbcba0b56050a6d820a2b6f i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 3446947ad00026d9e6bd5b5602e2b99b5eab5182 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-changed in both
-  base   100644 6092a2094acc8b7be278d0576bc9e84c9011a2d1 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-  our    100644 260b52f5f8b41136576748b7b0f1f6a9c2632a85 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-  their  100644 5200a408def6ca0e439dc068ac65569ee467319b i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-changed in both
-  base   100644 a8da9f65b7b3b70468c5ea45b70ee4bec7ef57ae i18n/kor/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 46a0013cd0e5a09c5cae294dfef72bf6b6e0aeef i18n/kor/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 766dc7e7a202be447b8be1cf3d82abe6e0f39f1e i18n/kor/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -20,7 +20,11 @@
- 	"later": "나중에",
- 	"updateAvailable": "사용 가능한 업데이트가 있습니다. {0} {1}",
- 	"installUpdate": "업데이트 설치",
-+<<<<<<< .our
- 	"updateInstalling": "{0} {1}이(가) 백그라운드에서 설치되고 있습니다. 설치가 끝나면 알려드리겠습니다.",
-+=======
-+	"updateInstalling": "{0} {1}이(가) 백그라운드로 설치되고 있습니다. 완료되면 알려드리겠습니다.",
-+>>>>>>> .their
- 	"updateAvailableAfterRestart": "최신 업데이트를 적용하려면 {0}을(를) 다시 시작하세요.",
- 	"updateNow": "지금 업데이트",
- 	"commandPalette": "명령 팔레트...",
-changed in both
-  base   100644 7a7934c552fa3424ae61e9870ba574d7690db253 i18n/kor/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-  our    100644 6cd63821229d7991380db65c8167125b14ca4e86 i18n/kor/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-  their  100644 0b7f49a22db88138e8ed8e5e9a0c1cf2eb78875f i18n/kor/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-changed in both
-  base   100644 cdcbe91c8d9958192e1733dacc574242f47e8029 i18n/kor/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  our    100644 ef565fe453fde1417671d5ced994cfb294239811 i18n/kor/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  their  100644 236b72c515acbe6c665bca52761bd07f14d35a03 i18n/kor/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-changed in both
-  base   100644 64a2c5576d933ebcf74d9fece0116d1d1d8f3664 i18n/ptb/extensions/git/out/commands.i18n.json
-  our    100644 614b7d0fe2aa5964fe65add6e8d1ab893a154db4 i18n/ptb/extensions/git/out/commands.i18n.json
-  their  100644 8881040425ef4d06ac9ad9f1bad5916f079bd089 i18n/ptb/extensions/git/out/commands.i18n.json
-@@ -10,7 +10,12 @@
- 	"remote branch at": "Ramo remoto em {0}",
- 	"create branch": "$(plus) criar nova ramificação",
- 	"repourl": "URL do repositório",
-+<<<<<<< .our
- 	"cloning": "Clonando repositório git '{0}'...",
-+=======
-+	"parent": "Diretório pai",
-+	"openrepo": "Abrir Repositório",
-+>>>>>>> .their
- 	"proposeopen": "Gostaria de abrir o repositório clonado?",
- 	"openrepo": "Abrir Repositório",
- 	"init": "Escolher a pasta de trabalho para inicializar o git repo",
-changed in both
-  base   100644 c7b251d97656107008f9ea22b0a8eaaef0581da5 i18n/ptb/src/vs/code/electron-main/menus.i18n.json
-  our    100644 a0ea065a8bc82783d33d375e03e02641423e3c6a i18n/ptb/src/vs/code/electron-main/menus.i18n.json
-  their  100644 68f544d545764c38a9a98d7429c7d925d17e3efd i18n/ptb/src/vs/code/electron-main/menus.i18n.json
-changed in both
-  base   100644 f47bef212db3407afb5141cf0d3f36a7ea244b8d i18n/ptb/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 6c41dd22a5af7308ee2eafe191d717bc6243ff1f i18n/ptb/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 50113666b9e501ba9cbdfbc4444f92d5d1298572 i18n/ptb/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -110,6 +110,9 @@
- 	"selectionClipboard": "Controla se a área primária de transferência Linux deve ser suportada.",
- 	"sideBySide": "Controla se o editor de diff mostra as diff lado a lado ou inline.",
- 	"ignoreTrimWhitespace": "Controla se o editor de diff mostra alterações nos espaços iniciais ou finais como diferenças",
-+<<<<<<< .our
- 	"largeFileOptimizations": "Tratamento especial para arquivos grandes para desabilitar determinados recursos que fazem uso intensivo de memória.",
-+=======
-+>>>>>>> .their
- 	"renderIndicators": "Controla se o editor de diff mostra indicadores +/- para alterações adicionadas/removidas"
- }
-\ No newline at end of file
-changed in both
-  base   100644 bbabad6f63fc2782c6f34064a520775dab6f3730 i18n/ptb/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  our    100644 4c94ccc38fbddbdb205d736f72a6b2b1d8ad964a i18n/ptb/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  their  100644 913eacab9ca650d48d493862132c66fc04f458a1 i18n/ptb/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
-+=======
-+	"breakpoint": "Ponto de interrupção",
-+>>>>>>> .their
- 	"editBreakpoint": "Editar {0}...",
- 	"functionBreakpointsNotSupported": "Pontos de parada de função não são suportados por este tipo de depuração",
- 	"functionBreakpointPlaceholder": "Função de parada",
-changed in both
-  base   100644 7863bd02c76e0061a01184e3e9a9f20675821834 i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  our    100644 c27b617052592c858a64bd239bd7a7f10abbba02 i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  their  100644 81da120c0232e5c1c504ad9bcdba3125c374aed3 i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-@@ -6,6 +6,11 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
-+=======
-+	"breakpoint": "Ponto de interrupção",
-+	"removeBreakpoint": "Remover {0}",
-+>>>>>>> .their
- 	"editBreakpoint": "Editar {0}...",
- 	"disableBreakpoint": "Desabilitar {0}",
- 	"removeBreakpoints": "Remover pontos de interrupção",
-@@ -17,6 +22,12 @@
- 	"enableBreakpointOnLine": "Habilitar o ponto de interrupção de linha",
- 	"addBreakpoint": "Adicionar ponto de interrupção",
- 	"addConditionalBreakpoint": "Adicionar Ponto de Parada Condicional...",
-+<<<<<<< .our
-+=======
-+	"message": "Mensagem",
-+	"condition": "condição",
-+	"removeLogPoint": "Remover {0}",
-+>>>>>>> .their
- 	"disableLogPoint": "Desabilitar {0}",
- 	"cancel": "Cancelar",
- 	"addConfiguration": "Adicionar Configuração..."
-changed in both
-  base   100644 c7863b7c96316f1803b3f2cae8b174cd887b6fee i18n/rus/extensions/git/out/commands.i18n.json
-  our    100644 bdd7adadfadc50db48d014178fb19ce838d13900 i18n/rus/extensions/git/out/commands.i18n.json
-  their  100644 cde4ac40966c61984eccc6be4e28f3f6a2bfb9b0 i18n/rus/extensions/git/out/commands.i18n.json
-@@ -10,8 +10,14 @@
- 	"remote branch at": "Удаленная ветвь в {0}",
- 	"create branch": "$(plus) Создать новую ветвь",
- 	"repourl": "URL-адрес репозитория",
-+<<<<<<< .our
- 	"selectFolder": "Выбрать расположение репозитория",
- 	"cloning": "Клонирование репозитория Git \"{0}\"...",
-+=======
-+	"parent": "Родительский каталог",
-+	"cloning": "Клонирование репозитория Git \"{0}\"...",
-+	"openrepo": "Открыть репозиторий",
-+>>>>>>> .their
- 	"proposeopen": "Вы хотите открыть клонированный репозиторий?",
- 	"openrepo": "Открыть репозиторий",
- 	"add": "Добавить в рабочую область",
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/rus/extensions/npm/out/npmView.i18n.json
-  our    100644 1d9c06d37c0a7d6212b5ff763890874e4f10595c i18n/rus/extensions/npm/out/npmView.i18n.json
-  their  100644 b6387cc4b52233cc92950b6871e46b61bbd275ae i18n/rus/extensions/npm/out/npmView.i18n.json
-@@ -6,9 +6,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"noScripts": "Сценарии не найдены",
- 	"noDebugOptions": "Не удалось запустить \"{0}\" для отладки, так как в сценариях отсутствует параметр отладки узла, например, \"--inspect-brk\".",
- 	"learnMore": "Дополнительные сведения",
- 	"ok": "ОК",
- 	"scriptInvalid": "Не удалось найти сценарий \"{0}\". Попробуйте обновить представление."
-+=======
-+	"npm.noDebugOptions": "Не удалось запустить \"{0}\" для отладки, так как в сценариях отсутствует параметр отладки узла, например, \"--inspect-brk\".",
-+	"npm.scriptInvalid": "Не удалось найти сценарий \"{0}\". Попробуйте обновить представление."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 667c4b2fe285ee3b0f39e469c4c8ead81c6b68ca i18n/rus/extensions/npm/package.i18n.json
-  our    100644 8d7baa6e0dc033bbe07eab95362f11ea8ace26f2 i18n/rus/extensions/npm/package.i18n.json
-  their  100644 ff1cc85f4aab668a799f9d690c2c2fcdc2dd61bc i18n/rus/extensions/npm/package.i18n.json
-@@ -12,15 +12,27 @@
- 	"config.npm.runSilent": "Запускать команды npm с параметром '--silent'.",
- 	"config.npm.packageManager": "Диспетчер пакетов, используемый для запуска сценариев.",
- 	"config.npm.exclude": "Настройте стандартные маски для папок, которые должны быть обработаны с помощью автоматического определения сценария.",
-+<<<<<<< .our
- 	"config.npm.enableScriptExplorer": "Включить представление обозревателя для сценариев npm.",
- 	"config.npm.scriptExplorerAction": "Действие по умолчанию при щелчке в обозревателе сценариев. Допустимые значения: 'open' или 'run', значение по умолчанию – 'open'.",
- 	"npm.parseError": "Определение задач npm: не удалось проанализировать файл {0}",
- 	"taskdef.script": "Скрипт npm для изменения.",
- 	"taskdef.path": "Путь к папке с файлом package.json, который содержит сценарий. Этот параметр можно опустить.",
-+=======
-+	"config.npm.enableScriptExplorer": "Включить представление обозревателя для сценариев npm, если рабочая область содержит файл 'package.json'.",
-+	"npm.parseError": "Определение задач npm: не удалось проанализировать файл {0}",
-+	"taskdef.script": "Скрипт npm для изменения.",
-+	"taskdef.path": "Путь к папке с файлом package.json, который содержит сценарий. Можно опустить.",
-+>>>>>>> .their
- 	"view.name": "Сценарии NPM",
- 	"command.refresh": "Обновить",
- 	"command.run": "Запустить",
- 	"command.debug": "Отладка",
- 	"command.openScript": "Открыть",
-+<<<<<<< .our
- 	"command.runInstall": "Запустить установку"
-+=======
-+	"npm.scriptInvalid": "Не удалось найти сценарий '{0}'. Попробуйте обновить представление.",
-+	"npm.noDebugOptions": "Не удалось запустить '{0}' для отладки, так как в сценариях не указан параметр отладки узла, например, '--inspect-brk'."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 52fae6d258368fb18752a17cae204067a1a589d4 i18n/rus/extensions/typescript-language-features/package.i18n.json
-  our    100644 378947c53afd4e06edd9c48eb57882c2925a47aa i18n/rus/extensions/typescript-language-features/package.i18n.json
-  their  100644 c7f564e29dae186582a00cfd87d6596cad8ff0d8 i18n/rus/extensions/typescript-language-features/package.i18n.json
-@@ -59,9 +59,13 @@
- 	"typescript.experimental.syntaxFolding": "Включает/отключает маркеры свертывания с учетом синтаксиса.",
- 	"taskDefinition.tsconfig.description": "Файл tsconfig, который определяет сборку TS.",
- 	"javascript.suggestionActions.enabled": "Включить/отключить предложения диагностики для файлов JavaScript в редакторе. Требуется TypeScript версии 2.8 или более поздней версии.",
-+<<<<<<< .our
- 	"typescript.suggestionActions.enabled": "Включить/отключить предложения диагностики для файлов TypeScript в редакторе. Требуется TypeScript версии 2.8 или более поздней версии",
- 	"typescript.preferences.quoteStyle": "Предпочтительный стиль кавычек для быстрых исправлений. Допустимые значения: 'single' (одинарные кавычки), 'double' (двойные кавычки) и 'auto' (использовать тип кавычек из предыдущих операций импорта). Требуется TypeScript версии 2.9 или более поздней версии",
- 	"typescript.preferences.importModuleSpecifier": "Предпочитаемый стиль пути для автоматического импорта:\n- \"relative\": относительный путь по отношению к расположению файла.\n- \"non-relative\": относительный путь по отношению к 'baseUrl', указанному в файле 'jsconfig.json' или 'tsconfig.json'.\n- \"auto\": использовать самый короткий тип пути.\nТребуется TypeScript версии 2.9 или более поздней версии",
- 	"typescript.showUnused": "Включить/отключить выделение неиспользуемых переменных в коде. Требуется TypeScript версии 2.9 или более поздней версии",
- 	"typescript.updateImportsOnFileMove.enabled": "Включить/отключить автоматическое обновление путей импорта при переименовании или перемещении файлов в VS Code. Допустимые значения: 'prompt' (выдавать запрос при каждом переименовании), 'always' (обновлять пути автоматически) и 'never' (никогда не изменять пути и не выдавать запросы). Требуется TypeScript версии 2.9 или более поздней версии"
-+=======
-+	"typescript.suggestionActions.enabled": "Включить/отключить предложения диагностики для файлов TypeScript в редакторе. Требуется TypeScript версии 2.8 или более поздней версии."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 21101238cf5ed8b4a774a9a5e06c8c0fa4f1734a i18n/rus/src/vs/base/node/zip.i18n.json
-  our    100644 d4e29cd759bcaaf5beb3afe0d2b44db8b495cf93 i18n/rus/src/vs/base/node/zip.i18n.json
-  their  100644 0fc519469ae75f31ad5ec5c1696686b448cf03c0 i18n/rus/src/vs/base/node/zip.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"incompleteExtract": "Операция не завершена. Найдено {0} из {1} записей",
-+=======
-+	"incompleteExtract": "Операция не завершена. Извлечено {0} из {1} записей",
-+>>>>>>> .their
- 	"notFound": "{0} не найдено в ZIP-архиве."
- }
-\ No newline at end of file
-changed in both
-  base   100644 12574bacd03ade9e5665eb5cd1f96040f6f5fccd i18n/rus/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  our    100644 6d3f99cb3bb862ce8d5c4f79bdcea21926967bd4 i18n/rus/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  their  100644 49cc89f5efe0cff3142d1cc9e3b196fb1bcc9928 i18n/rus/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-changed in both
-  base   100644 bda3982524f8be2185b4eb928a51d88414074f96 i18n/rus/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  our    100644 cd7ea704ca059c561476e5115a01c5cebc3018e8 i18n/rus/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  their  100644 ec1142c973369e3114d50d9277190c5089a629f9 i18n/rus/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-changed in both
-  base   100644 a350741903687d292419f27093e3b84567e09b3a i18n/rus/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
-  our    100644 7531671318adf02e39c1a85b3f08cbefedfe2957 i18n/rus/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
-  their  100644 c07ddc329b8eb5b054df39a5e1aed7e4f47cd905 i18n/rus/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
-@@ -8,10 +8,17 @@
- 	],
- 	"cpu": "Загрузка ЦП (%)",
- 	"memory": "Память (МБ)",
-+<<<<<<< .our
- 	"pid": "идентификатор процесса",
- 	"name": "Имя",
- 	"killProcess": "Завершить процесс",
- 	"forceKillProcess": "Принудительно убить процесс",
- 	"copy": "Копировать",
- 	"copyAll": "Копировать все"
-+=======
-+	"pid": "PID",
-+	"name": "Имя",
-+	"killProcess": "Убить процесс",
-+	"forceKillProcess": "Принудительно убить процесс"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c3ddca62e92feda0533aaa2e265aa6191ed5d2e9 i18n/rus/src/vs/code/electron-main/menus.i18n.json
-  our    100644 6c6420ff3fff2721736f81d703d8eb2e0907f38c i18n/rus/src/vs/code/electron-main/menus.i18n.json
-  their  100644 099597c577cbca3458af83a8b23459c154c7a8b6 i18n/rus/src/vs/code/electron-main/menus.i18n.json
-changed in both
-  base   100644 6ddcb60bb1879b3f2c29077500a2c87caa5c2222 i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 66cf48db0f575d6b4f93e4e908a24029fed35a72 i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 5f9a7a41df4168bb61d0146ade121b981224b052 i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json
-@@ -78,7 +78,11 @@
- 	"occurrencesHighlight": "Определяет, должен ли редактор выделять экземпляры семантических символов.",
- 	"overviewRulerLanes": "Определяет, сколько украшений могут отображаться на одном месте в обзорной линейке.",
- 	"overviewRulerBorder": "Определяет, следует ли рисовать границу на обзорной линейке.",
-+<<<<<<< .our
- 	"cursorBlinking": "Управляет стилем анимации курсора.",
-+=======
-+	"cursorBlinking": "Управление стилем анимации курсора.",
-+>>>>>>> .their
- 	"mouseWheelZoom": "Изменение размера шрифта в редакторе при нажатой клавише CTRL и движении колесика мыши",
- 	"cursorStyle": "Определяет стиль курсора. Допустимые значения: \"block\", \"block-outline\", \"line\", \"line-thin\", \"underline\" и \"underline-thin\"",
- 	"cursorWidth": "Управляет шириной курсора, когда для параметра editor.cursorStyle установлено значение 'line'",
-changed in both
-  base   100644 1acfd70b90bc162578e7306fe87aa55127294daf i18n/rus/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 9d3bc679fc1f2c06c947cdc33c9616b8b522920c i18n/rus/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 c89275c69c2ab33a1867dc3d0d6b4f64c9c86206 i18n/rus/src/vs/editor/common/view/editorColorRegistry.i18n.json
-changed in both
-  base   100644 61b52ee878a7c2b13e97cddf30851a8c074a8e7b i18n/rus/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 b5b010a1ed08e7bd0639632258a4ace9da636f30 i18n/rus/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 e7308bcfc71aa253db6f8461c73d462f7ee01880 i18n/rus/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-changed in both
-  base   100644 3df40ef2fa2e295556b6a0150513dddc16de2330 i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 a203da5726ce360e6e4c7bd4be5cee05446e8ca5 i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 431b0eeb96ebd3f294a4ab684eaac157fbb5e806 i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -77,7 +77,10 @@
- 	"editorFindMatchBorder": "Цвет границы текущего результата поиска.",
- 	"findMatchHighlightBorder": "Цвет границы других результатов поиска.",
- 	"findRangeHighlightBorder": "Цвет границы диапазона для ограничения поиска. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
-+<<<<<<< .our
- 	"findWidgetResizeBorder": "Цвет границ панели изменения размера для мини-приложения поиска.",
-+=======
-+>>>>>>> .their
- 	"hoverHighlight": "Выделение под словом, для которого показано наведение. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
- 	"hoverBackground": "Цвет фона при наведении указателя на редактор.",
- 	"hoverBorder": "Цвет границ при наведении указателя на редактор.",
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/rus/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
-  our    100644 60446b0bda7f3e737a4a86e952124ca9947a80f7 i18n/rus/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
-  their  100644 1d30401977327e92198a7bbbcf1dcf1d020f19cb i18n/rus/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
-@@ -6,5 +6,9 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"confirmUrl": "Разрешить расширению открыть этот URL-адрес?"
-+=======
-+	"confirmUrl": "Вы хотите разрешить расширению {0} открыть следующий URL-адрес?"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 5a602cb684a98125d46c95dd27d0aba25502bcc2 i18n/rus/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
-  our    100644 38da1fad976e805091ed4b06dd7b6b15e9162695 i18n/rus/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
-  their  100644 e0e954461010ee4da9a2ac16b72f77dfa0890660 i18n/rus/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
-@@ -8,10 +8,18 @@
- 	],
- 	"vscode.extension.contributes.views.containers.id": "Уникальный идентификатор, используемый для идентификации контейнера, в котором могут быть размещены представления с помощью точки вклада 'views'",
- 	"vscode.extension.contributes.views.containers.title": "Строка в понятном формате, используемая для отображения контейнера",
-+<<<<<<< .our
- 	"vscode.extension.contributes.views.containers.icon": "Путь к значку контейнера. Значки имеют размер 24x24, расположены в центре прямоугольника размером 50x40 и имеют цвет заливки rgb (215, 218, 224) или #d7dae0. Для значков рекомендуется использовать формат SVG, хотя допускается любой тип изображения.",
- 	"vscode.extension.contributes.viewsContainers": "Добавляет контейнеры представлений в редактор",
- 	"views.container.activitybar": "Добавляет контейнеры представлений на панель действий",
- 	"test": "Проверить",
-+=======
-+	"vscode.extension.contributes.views.containers.icon": "Путь к значку контейнера. Значки имеют размер 24x24, расположены в центре  прямоугольника размером  50x40 и имеют цвет заливки rgb (215, 218, 224) или #d7dae0. Для значков рекомендуется использовать формат SVG, хотя допускается любой тип изображения.",
-+	"vscode.extension.contributes.viewsContainers": "Добавляет контейнеры представлений в редактор",
-+	"views.container.activitybar": "Добавляет контейнеры представлений на панель действий",
-+	"test": "Проверить",
-+	"proposed": "Вклад 'viewsContainers' доступен только при запуске из среды разработки или при запуске с параметром командной строки --enable-proposed-api {0}",
-+>>>>>>> .their
- 	"requirearray": "Контейнер представлений должен быть массивом",
- 	"requireidstring": "Свойство '{0}' является обязательным и должно иметь тип 'string'. Оно может содержать только буквенно-цифровые символы и символы '_' и '-'.",
- 	"requirestring": "свойство \"{0}\" является обязательным и должно иметь тип string",
-changed in both
-  base   100644 69f67e96d484fa29b6bf09b0852e0c062353b0b2 i18n/rus/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-  our    100644 0b8d433c4e50d4d4decc158fdf8055636c428d1b i18n/rus/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-  their  100644 525850cfaaef4da05f20097d9bc0cac2287b05af i18n/rus/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-changed in both
-  base   100644 63b8dbd0104182bee70beacb97f6a4ad32ddc709 i18n/rus/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  our    100644 529030b0956c87703b3826fbbf2739d72dcf1f2b i18n/rus/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  their  100644 48146e99d1fe17322da0aa5c31ccc16176e1e6ba i18n/rus/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-changed in both
-  base   100644 cce426f1e59407060dffd2f6c9431d3fcb3e7283 i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-  our    100644 0ae1d13f646fdfbc6ac7b14d9b5924bcd9d0500c i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-  their  100644 ad2285f09209d72965a291215a3e31a1d8e24241 i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-@@ -6,6 +6,38 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
-+=======
-+	"vscode.extension.contributes.debuggers": "Добавляет адаптеры отладки.",
-+	"vscode.extension.contributes.debuggers.type": "Уникальный идентификатор этого адаптера отладки.",
-+	"vscode.extension.contributes.debuggers.label": "Отображаемое имя этого адаптера отладки.",
-+	"vscode.extension.contributes.debuggers.program": "Путь к программе адаптера отладки. Путь указывается либо как абсолютный, либо относительно папки расширения.",
-+	"vscode.extension.contributes.debuggers.args": "Необязательные аргументы для передачи адаптеру.",
-+	"vscode.extension.contributes.debuggers.runtime": "Дополнительная среда выполнения, используемая в том случае, если атрибут program не указывает на исполняемый файл, но среда выполнения требуется.",
-+	"vscode.extension.contributes.debuggers.runtimeArgs": "Аргументы дополнительной среды выполнения.",
-+	"vscode.extension.contributes.debuggers.variables": "Сопоставление интерактивных переменных (например, ${action.pickProcess}) в \"launch.json\" для команды.",
-+	"vscode.extension.contributes.debuggers.initialConfigurations": "Конфигурации для создания первоначального файла launch.json.",
-+	"vscode.extension.contributes.debuggers.languages": "Список языков, для которых расширение отладки может считаться \"отладчиком по умолчанию\".",
-+	"vscode.extension.contributes.debuggers.adapterExecutableCommand": "Если задано, VS Code будет вызывать эту команду, чтобы определить путь к исполняемому файлу адаптера отладки и передаваемые аргументы.",
-+	"vscode.extension.contributes.debuggers.configurationSnippets": "Фрагменты для добавления новых конфигураций в launch.json.",
-+	"vscode.extension.contributes.debuggers.configurationAttributes": "Конфигурации схемы JSON для проверки launch.json.",
-+	"vscode.extension.contributes.debuggers.windows": "Параметры, связанные с Windows.",
-+	"vscode.extension.contributes.debuggers.windows.runtime": "Среда выполнения, используемая для Windows.",
-+	"vscode.extension.contributes.debuggers.osx": "Параметры, связанные с macOS.",
-+	"vscode.extension.contributes.debuggers.osx.runtime": "Среда выполнения, используемая для macOS.",
-+	"vscode.extension.contributes.debuggers.linux": "Параметры, связанные с Linux.",
-+	"vscode.extension.contributes.debuggers.linux.runtime": "Среда выполнения, используемая для Linux.",
-+	"vscode.extension.contributes.breakpoints": "Добавляет точки останова.",
-+	"vscode.extension.contributes.breakpoints.language": "Разрешить точки останова для этого языка.",
-+	"app.launch.json.title": "Запустить",
-+	"app.launch.json.version": "Версия этого формата файла.",
-+	"app.launch.json.configurations": "Список конфигураций. Добавьте новые конфигурации или измените существующие с помощью IntelliSense.",
-+	"app.launch.json.compounds": "Список составных объектов. Каждый из них ссылается на несколько конфигураций, которые будут запущены вместе.",
-+	"app.launch.json.compound.name": "Имя составного объекта. Отображается в раскрывающемся меню запуска конфигурации.",
-+	"useUniqueNames": "Используйте уникальное имя конфигурации.",
-+	"app.launch.json.compound.folder": "Имя папки, в которой расположен составной объект.",
-+	"app.launch.json.compounds.configurations": "Имена конфигураций, которые будут запущены как часть этого составного объекта.",
-+>>>>>>> .their
- 	"debugNoType": "Параметр 'type' отладчика является обязательным и должен иметь тип 'string'.",
- 	"selectDebug": "Выбор среды",
- 	"DebugConfig.failed": "Не удается создать файл launch.json в папке .vscode ({0}).",
-changed in both
-  base   100644 c00bc52781c369f4e196e1de546cfd980a193112 i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  our    100644 23861effe72edc87caa9cf26eb6c7a34582f889d i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  their  100644 2111299702064eb7d8386a7b63fd43c8542aeaf3 i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-@@ -27,7 +27,11 @@
- 	"addConditionalBreakpoint": "Добавить условную точку останова…",
- 	"addLogPoint": "Добавить точку журнала...",
- 	"breakpointHasCondition": "Этот {0} содержит {1}, который будет утерян при удалении. Попробуйте отключить {0} вместо удаления.",
-+<<<<<<< .our
- 	"message": "сообщение",
-+=======
-+	"message": "Сообщение",
-+>>>>>>> .their
- 	"condition": "Условие",
- 	"removeLogPoint": "Удалить {0}",
- 	"disableLogPoint": "Отключить {0}",
-changed in both
-  base   100644 9dfffd351b81295b77cb717a2076a05fa45fcd02 i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  our    100644 f164fde4366fa773b48bfe98693ae272b89afd2b i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  their  100644 80214fe333933c85dc938913564565da17a68e22 i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-changed in both
-  base   100644 861f3074111c270aed039f443f9412be2a611f53 i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 2c38d1331217bb70a1fc665d1c79c9658eacde43 i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 ebc6fba473a57d1ce0d5a94cff49f8244bc2c3d1 i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -65,6 +65,7 @@
- 	"emptyFileNameError": "Необходимо указать имя файла или папки.",
- 	"fileNameStartsWithSlashError": "Имя папки или файла не может начинаться с косой черты.",
- 	"fileNameExistsError": "Файл или папка **{0}** уже существует в данном расположении. Выберите другое имя.",
-+	"fileUsedAsFolderError": "**{0}** является файлом и не может иметь потомков.",
- 	"invalidFileNameError": "Имя **{0}** недопустимо для файла или папки. Выберите другое имя.",
- 	"filePathTooLongError": "Из-за использования имени **{0}** путь слишком длинный. Выберите более короткое имя.",
- 	"compareWithClipboard": "Сравнить активный файл с буфером обмена",
-changed in both
-  base   100644 06cc07ec6c8e5c962197bff4621d5a86cf72ede4 i18n/rus/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
-  our    100644 92e148db1bc3dfe19eb60002f3fb84bedf31679c i18n/rus/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
-  their  100644 d5124404f9a35a96d27e15bf6ca416dedbb9aef1 i18n/rus/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
-changed in both
-  base   100644 75cbba61a06ab43b14d1d27441c70cbcde0c8a2d i18n/rus/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 113d804b27033c0eb1fd8478b7abca09ae0f3e64 i18n/rus/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 90e23af847066c9fb1e3ffd2f6792bd364fe3100 i18n/rus/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -31,5 +31,9 @@
- 	"search.followSymlinks": "Определяет, нужно ли следовать символическим ссылкам при поиске.",
- 	"search.smartCase": "Выполняет поиск без учета регистра, если шаблон состоит только из букв нижнего регистра; в противном случае выполняет поиск с учетом регистра",
- 	"search.globalFindClipboard": "Определяет, должно ли представление поиска считывать или изменять общий буфер обмена поиска в macOS",
-+<<<<<<< .our
- 	"search.location": "Управляет тем, будет ли панель поиска отображаться в виде представления в боковой колонке или в виде панели в области панели, чтобы освободить пространство по горизонтали."
-+=======
-+	"search.location": "Управляет тем, будет ли панель поиска отображаться в виде представления в боковой колонке или в виде панели в области панели для освобождения пространства по горизонтали. В следующем выпуске горизонтальное расположение поиска в панели будет улучшено, и этот параметр больше не будет находиться в предварительной версии."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e484fadb360072f5716d39c51082ab9a699759eb i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 ea0d455fc7f4fc786ef2ef083f3b437a535a441a i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 73aa5a7d0b84c5835320f35d835f3f3f31cc8cbb i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-changed in both
-  base   100644 86dafb69b0f1a05f940166f6812932eabc9e97bc i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-  our    100644 ff481cfdd880da29631a3150be6e33de6483b2b1 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-  their  100644 f96a099bc5910cecc8042107f64816b98b059b9f i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json
-changed in both
-  base   100644 6f52d0bf69f4e5d13deeac4bebe9dbcd98ffb17e i18n/rus/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-  our    100644 da59adfec73826ca4e574c95a636c7e2613597d0 i18n/rus/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-  their  100644 fa54b92dc5c9130909da100c4f30a62f7a39af81 i18n/rus/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-changed in both
-  base   100644 ca3f9e887a100b5f523ed9414e6b990434426cfd i18n/rus/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  our    100644 2c983a39d579894623f58659f4686ad21c8ac392 i18n/rus/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  their  100644 0a2e735f4ad52049a9a5e8c7685ebfd5f6d1b28f i18n/rus/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-changed in both
-  base   100644 e3403b912e226f2f7061c3e8aafd405515f48e91 i18n/trk/extensions/emmet/package.i18n.json
-  our    100644 da0ca75d8cf264d2aa273bacfc4c88c0e06fd83f i18n/trk/extensions/emmet/package.i18n.json
-  their  100644 9eeb1b4040e8e06f8a268056c8f9e3efd612fe55 i18n/trk/extensions/emmet/package.i18n.json
-@@ -48,7 +48,11 @@
- 	"emmetPreferencesSassBetween": "Sass dosyalarında CSS kısaltmaları genişletilirken CSS özelliği ve değerinin arasına koyulacak sembol",
- 	"emmetPreferencesStylusBetween": "Stylus dosyalarında CSS kısaltmaları genişletilirken CSS özelliği ve değerinin arasına koyulacak sembol",
- 	"emmetShowSuggestionsAsSnippets": "Doğruysa, Emmet önerileri, editor.snippetSuggestions ayarı ile sıralayabilmenizi sağlayan parçacıklar olarak gösterilir.",
-+<<<<<<< .our
- 	"emmetPreferencesBemElementSeparator": "BEM filtresi kullanırken sınıflar için kullanılacak öge ayrıcı",
-+=======
-+	"emmetPreferencesBemElementSeparator": "BEM filtresi kullanırken sınıflar için kullanılacak öğe ayrıcı",
-+>>>>>>> .their
- 	"emmetPreferencesBemModifierSeparator": "BEM filtresi kullanırken sınıflar için kullanılacak niteleyici ayrıcı",
- 	"emmetPreferencesFilterCommentBefore": "Yorum filtresi uygulandığında eşleşen ögenin önüne konulması gereken yorumun tanımı.",
- 	"emmetPreferencesFilterCommentAfter": "Yorum filtresi uygulandığında eşleşen ögenin ardına konulması gereken yorumun tanımı.",
-changed in both
-  base   100644 2883a4dafdfc0588fd491bce29c9e6651c5f3b86 i18n/trk/extensions/git/out/commands.i18n.json
-  our    100644 6794dc4934caa0927c5d65dc1f742c2cefd9cd5b i18n/trk/extensions/git/out/commands.i18n.json
-  their  100644 cc396018359fc625c5f4b7b4709e3e6ab4973d05 i18n/trk/extensions/git/out/commands.i18n.json
-@@ -10,8 +10,14 @@
- 	"remote branch at": "{0} üzerindeki uzak dal",
- 	"create branch": "$(plus) Yeni dal oluştur",
- 	"repourl": "Depo URL'si",
-+<<<<<<< .our
- 	"selectFolder": "Depo Konumunu Seç",
- 	"cloning": "'{0}' git deposu kopyalanıyor...",
-+=======
-+	"parent": "Üst Klasör",
-+	"cloning": "'{0}' git deposu kopyalanıyor...",
-+	"openrepo": "Depoyu Aç",
-+>>>>>>> .their
- 	"proposeopen": "Kopyalanan depoyu açmak ister misiniz?",
- 	"openrepo": "Depoyu Aç",
- 	"add": "Çalışma Alanına Ekle",
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/trk/extensions/npm/out/npmView.i18n.json
-  our    100644 88033f3227521b036fc0eada5f924e574f891e3d i18n/trk/extensions/npm/out/npmView.i18n.json
-  their  100644 a032c07941c7ba6ba8a5f355819e3ec91a05a3cc i18n/trk/extensions/npm/out/npmView.i18n.json
-@@ -6,9 +6,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"noScripts": "Betik bulunamadı",
- 	"noDebugOptions": "Betiklerde node hata ayıklama seçeneği(ör. \"--inspect-brk\") eksik olduğundan hata ayıklamak için \"{0}\" başlatılamadı.",
- 	"learnMore": "Daha Fazla Bilgi Edin",
- 	"ok": "Tamam",
- 	"scriptInvalid": "\"{0}\" betik dosyası bulunamadı. Görünümü yenilemeyi deneyin."
-+=======
-+	"npm.noDebugOptions": "Betiklerde node hata ayıklama seçeneği(ör. \"--inspect-brk\") eksik olduğundan hata ayıklamak için \"{0}\" başlatılamadı.",
-+	"npm.scriptInvalid": "\"{0}\" betik dosyası bulunamadı. Görünümü yenilemeyi deneyin."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 806970ea3486c53a1170b82938782bc831db4698 i18n/trk/extensions/npm/package.i18n.json
-  our    100644 2139346855fff5ec5963cac4c1aa77b373277a6f i18n/trk/extensions/npm/package.i18n.json
-  their  100644 b1dbbb9d927c6c35be98304eae17723050631516 i18n/trk/extensions/npm/package.i18n.json
-@@ -12,15 +12,26 @@
- 	"config.npm.runSilent": "npm komutlarını `--silent`(sessiz) seçeneğiyle çalıştır.",
- 	"config.npm.packageManager": "Betikleri çalıştırmada kullanılacak paket yöneticisi.",
- 	"config.npm.exclude": "Otomatik betik algılamadan hariç tutulacak klasörler için glob desenlerini yapılandırın.",
-+<<<<<<< .our
- 	"config.npm.enableScriptExplorer": "npm betikleri için gezgin görünümünü etkinleştir.",
- 	"config.npm.scriptExplorerAction": "Betik gezgininde kullanılan varsayılan tıklama eylemi: 'open' (aç) veya 'run' (çalıştır), varsayılan 'open'dır.",
-+=======
-+	"config.npm.enableScriptExplorer": "Çalışma alanı bir 'package.json' dosyası içerdiğinde, npm betikleri için gezgin görünümünü etkinleştir.",
-+>>>>>>> .their
- 	"npm.parseError": "Npm görev algılama: {0} dosyası ayrıştırılamadı",
- 	"taskdef.script": "Özelleştirilecek npm betiği.",
- 	"taskdef.path": "Betiği sağlayan package.json dosyasını içeren klasör yolu. Atlanabilir.",
- 	"view.name": "Npm Betikleri",
- 	"command.refresh": "Yenile",
- 	"command.run": "Çalıştır",
-+<<<<<<< .our
- 	"command.debug": "Hata Ayıkla",
- 	"command.openScript": "Aç",
- 	"command.runInstall": "Kurulumu Çalıştır"
-+=======
-+	"command.debug": "Hata Ayıklama",
-+	"command.openScript": "Aç",
-+	"npm.scriptInvalid": "'{0}' betik dosyası bulunamadı. Görünümü yenilemeyi deneyin.",
-+	"npm.noDebugOptions": "Betiklerde node hata ayıklama seçeneği(ör. '--inspect-brk') eksik olduğundan hata ayıklamak için '{0}' başlatılamadı."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 452869e59fe9490e076d5c53689303f393a254c2 i18n/trk/extensions/typescript-language-features/package.i18n.json
-  our    100644 fd84f3134108252f2da2164df9662892ff2b3a8d i18n/trk/extensions/typescript-language-features/package.i18n.json
-  their  100644 1adbd875cd8717811c2c4eb0ce961a368bfb2be3 i18n/trk/extensions/typescript-language-features/package.i18n.json
-@@ -59,9 +59,13 @@
- 	"typescript.experimental.syntaxFolding": "Sözdimine duyarlı katlama işaretleyicilerini etkinleştirin/devre dışı bırakın.",
- 	"taskDefinition.tsconfig.description": "TS derlemesini tanımlayan tsconfig dosyası.",
- 	"javascript.suggestionActions.enabled": "Düzenleyicideki JavaScript dosyalarında öneri tanılamayı etkinleştir veya devre dışı bırak. TypeScript >= 2.8 gerektirir.",
-+<<<<<<< .our
- 	"typescript.suggestionActions.enabled": "Düzenleyicideki TypeScript dosyalarında öneri tanılamayı etkinleştir veya devre dışı bırak. TypeScript >= 2.8 gerektirir.",
- 	"typescript.preferences.quoteStyle": "Hızlı düzeltmeler için tercih edilen tırnak stili: Tek tırnak için 'single', çift tırnak için 'double', veya mevcut olan içe aktarımlardan tespit etmek için 'auto'. TypeScript >= 2.9 gerektirir.",
- 	"typescript.preferences.importModuleSpecifier": "Otomatik içe aktaırmlar için tercih edilen yol stili:\n- \"relative\" dosya konumuna göreli yol.\n- \"non-relative\" 'jsconfig.json' / 'tsconfig.json' dosyanızda yapılandırdığınız 'baseUrl' ayarına göre yol.\n- \"auto\" en kısa yol türü.\nTypeScript >= 2.9 gerektirir.",
- 	"typescript.showUnused": "Koddaki kullanılmayan değişkenlerin vurgulanmasını etkinleştir veya devre dışı bırak. TypeScript >= 2.9 gerektirir.",
- 	"typescript.updateImportsOnFileMove.enabled": "VS Code'da bir dosyanın adını değiştirdiğinizde veya dosyayı taşıdığınızda içe aktarımların otomatik güncellenmesini etkinleştirin veya devre dışı bırakın. Olası değerler: tüm yeniden adlandırmalarda onay için 'prompt', her zaman yolların otomatik olarak güncellenmesi için 'always', yolların hiçbir zaman değişmemesi ve hiçbir zaman onay istenmemesi için 'never'. TypeScript >= 2.9 gerektirir."
-+=======
-+	"typescript.suggestionActions.enabled": "Düzenleyicideki TypeScript dosyalarında öneri tanılamayı etkinleştir veya devre dışı bırak. TypeScript >= 2.8 gerektirir."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 0a4b7eda603eafcd39a0ae04f8070adbcec95acf i18n/trk/src/vs/base/node/zip.i18n.json
-  our    100644 d3dbd75d2e68a9ec7a5c2e79e564df8aa8e93934 i18n/trk/src/vs/base/node/zip.i18n.json
-  their  100644 509c0d4b6bf1f20ecc9d690b0806f6f890d5f6ea i18n/trk/src/vs/base/node/zip.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"incompleteExtract": "Tamamlanmamış. {1} girdinin {0} tanesi bulundu. ",
-+=======
-+	"incompleteExtract": "Tamamlanamadı. {1} girdiden {0} tanesi çıkarıldı",
-+>>>>>>> .their
- 	"notFound": "{0}, zip içerisinde bulunamadı."
- }
-\ No newline at end of file
-changed in both
-  base   100644 bfc5cc5845cdbbf180ec418a011cc01b1e7034dd i18n/trk/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  our    100644 1998afc436b21e1d4b60a22c372c3fee113efbf2 i18n/trk/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-  their  100644 b3174c22b71221b19bbb30b392af263219f79417 i18n/trk/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
-changed in both
-  base   100644 48797829bb8109f6e3046925a35afeb6ac6cd049 i18n/trk/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  our    100644 cc635c3213aa540df09c2e4c4a87b6c4833861d6 i18n/trk/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-  their  100644 e80a0b446f983a75cb72febc50b52a7c4bfd0379 i18n/trk/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
-@@ -11,7 +11,10 @@
- 	"issueSourceLabel": "Dosya konumu: ",
- 	"vscode": "Visual Studio Code",
- 	"extension": "Eklenti",
-+<<<<<<< .our
- 	"disableExtensionsLabelText": "Sorunu {0} sonrasında yeniden oluşturmaya çalışın. Sorun sadece eklentiler aktifken yeniden oluşturulabiliyorsa, büyük olasılıkla eklenti ile ilgili bir sorundur.",
-+=======
-+>>>>>>> .their
- 	"disableExtensions": "tüm eklentileri devre dışı bırakıp pencereyi yeniden yükleyin",
- 	"chooseExtension": "Eklenti",
- 	"issueTitleLabel": "Başlık",
-changed in both
-  base   100644 d79aea5296a81e0c93cf7b035375e4c20bbd946b i18n/trk/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
-  our    100644 3e8bfd40d94e2a8ec5552aa72c8c9f15157e05ec i18n/trk/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
-  their  100644 9e32cb61fb83bf25abc4eec30b0695f3b5a08b05 i18n/trk/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
-@@ -11,7 +11,11 @@
- 	"pid": "pid",
- 	"name": "Adı",
- 	"killProcess": "İşlemi Sonlandır",
-+<<<<<<< .our
- 	"forceKillProcess": "İşlemi Sonlanmaya Zorla",
- 	"copy": "Kopyala",
- 	"copyAll": "Tümünü Kopyala"
-+=======
-+	"forceKillProcess": "İşlemi Sonlanmaya Zorla"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 9196e669e0d9475db5d33b01b8c18e3752b28bb8 i18n/trk/src/vs/code/electron-main/menus.i18n.json
-  our    100644 ace3ab96e0fa1ead7fddaef7b7dca337a5d22633 i18n/trk/src/vs/code/electron-main/menus.i18n.json
-  their  100644 412e67294bb9590e2225055aeee99bbbe2afbc0e i18n/trk/src/vs/code/electron-main/menus.i18n.json
-changed in both
-  base   100644 8ef3a74cede49b7a162f42ad82db6176469e68bb i18n/trk/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 80d2362504c2993d022a2eba3b68977e0e73b16b i18n/trk/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 24729fbbb017f2630ffa5cbcf597b52c86862cc0 i18n/trk/src/vs/editor/common/config/commonEditorConfig.i18n.json
-changed in both
-  base   100644 93a32fa6ed19d68cf731a42ec11bdbfe75999f3f i18n/trk/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 2cef84bd724584b1f220944adb841c7825808a67 i18n/trk/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 beb545775b5a97fa5860c412116c8c35ccfd6e67 i18n/trk/src/vs/editor/common/view/editorColorRegistry.i18n.json
-changed in both
-  base   100644 06d66b62a1eaa4083349750722d150a40db3cb70 i18n/trk/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 8beb681b33236f0693c452fd17c2070b7f15779a i18n/trk/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 281e824753af4e93f90ca0e31a41ea6cbf3a0271 i18n/trk/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-changed in both
-  base   100644 584c401d554eae58c7ff38309ef8627b945361c6 i18n/trk/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 fdc69c2c9e4d77a2bba5e0204a27fccdd7aa58e1 i18n/trk/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 4789787729ef66582c4761fcd4232d10da379f46 i18n/trk/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -77,7 +77,10 @@
- 	"editorFindMatchBorder": "Geçerli arama eşleşmesinin kenarlık rengi.",
- 	"findMatchHighlightBorder": "Diğer arama eşleşmelerinin kenarlık rengi.",
- 	"findRangeHighlightBorder": "Aramayı sınırlandıran aralığın kenarlık rengi. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
-+<<<<<<< .our
- 	"findWidgetResizeBorder": "Gereç bulmak için yeniden boyutlandırma çubuğunun kenarlık rengi.",
-+=======
-+>>>>>>> .their
- 	"hoverHighlight": "Sözcüğün altında yer alan bağlantı vurgusu. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
- 	"hoverBackground": "Düzenleyici bağlantı vurgusunun arka plan rengi.",
- 	"hoverBorder": "Düzenleyici bağlantı vurgusunun kenarlık rengi.",
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/trk/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
-  our    100644 c4def8b43b0382c7100dd0ed1bcee972ba154cbb i18n/trk/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
-  their  100644 034d05ed9f05ad999546ab0a717fabc061e7e391 i18n/trk/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.i18n.json
-@@ -6,5 +6,9 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"confirmUrl": "Bir uzantının bu URL'yi açmasına izin verilsin mi?"
-+=======
-+	"confirmUrl": "{0} eklentisine aşağıdaki URL'i açması için izin vermek istiyor musunuz?"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 dd01b6be52a4225dfbe53b85456a3006c9b7470c i18n/trk/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
-  our    100644 b527b7de844ff6df569f6cbd6b9e671c0c2384df i18n/trk/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
-  their  100644 7253cd5ae13805a0cd7e92d0d4f8c822fc33976c i18n/trk/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
-@@ -6,14 +6,22 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"vscode.extension.contributes.views.containers.id": "'views' (görünümler) ekleme noktası kullanılarak ekleme yapılabilecek görünümlerde, kapsayıcıyı tanımlamakta kullanılacak benzersiz ID",
- 	"vscode.extension.contributes.views.containers.title": "Kapsayıcıda gösterilecek insanlar tarafından okunabilir dize",
- 	"vscode.extension.contributes.views.containers.icon": "Kapsayıcı simgesinin yolu. Simgeler, 50x40'lık bir blok içinde 24x24 olarak ortalanmış ve 'rgb(215, 218, 224)' veya '#d7dae0' dolgu rengine sahiptir. Simgelerin SVG formatında olması tavsiye edilir ancak herhangi bir resim dosyası türü kabul edilir.",
-+=======
-+	"vscode.extension.contributes.views.containers.title": "Kapsayıcıda gösterilecek insanlar tarafından okunabilir dize",
-+	"vscode.extension.contributes.views.containers.icon": "Kapsayıcı simgesinin yolu. Simgeler, 50x40'lık bir dörtgen içinde 24x24 olarak ortalanmış ve 'rgb(215, 218, 224)' veya '#d7dae0' dolgu rengine sahiptir. Simgelerin SVG formatında olması tavsiye edilir ancak herhangi bir resim dosyası türü kabul edilir.",
-+>>>>>>> .their
- 	"vscode.extension.contributes.viewsContainers": "Görünüm kapsayıcılarını düzenleyiciye ekler.",
- 	"views.container.activitybar": "Etkinlik Çubuğu'na görünüm kapsayıcıları ekle",
- 	"test": "Test",
- 	"requirearray": "görünüm kapsayıcıları bir dizi olmalıdır",
-+<<<<<<< .our
- 	"requireidstring": "`{0}` özelliği zorunludur ve `string` türünde olmalıdır. Sadece abecesayısal(alphanumeric), '_', ve '-' karakterlerine izin verilir.",
-+=======
-+>>>>>>> .their
- 	"requirestring": "`{0}` özelliği zorunludur ve `string` türünde olmalıdır",
- 	"showViewlet": "{0}'i Göster",
- 	"view": "Görüntüle"
-changed in both
-  base   100644 c7811e33fabc5c7fd5205976c1c30d9d0e4f0a94 i18n/trk/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-  our    100644 3c92c8ee5f97958caa95c84da374aba6a8cf8c6c i18n/trk/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-  their  100644 6d6068ff25be0793dbef0279ad9d2d105691d0a9 i18n/trk/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-@@ -18,7 +18,10 @@
- 	"views.scm": "Etkinlik Çubuğu'ndaki SCM kapsayıcısına görünümler ekler",
- 	"views.test": "Etkinlik Çubuğu'ndaki Test kapsayıcısına görünümler ekler",
- 	"views.contributed": "Görünümleri katkıda bulunan görünümü kapsayıcısına ekler",
-+<<<<<<< .our
- 	"ViewContainerDoesnotExist": "'{0}' görünüm kapsayıcısı mevcut değil ve ona kayıtlı tüm görünümler 'Explorer'a eklenecektir.",
-+=======
-+>>>>>>> .their
- 	"duplicateView1": "`{1}` konumunda aynı `{0}` id'sine sahip birden çok görünüm kaydedilemiyor",
- 	"duplicateView2": "`{0}` id'sine sahip bir görünüm `{1}` konumunda zaten kayıtlı"
- }
-\ No newline at end of file
-changed in both
-  base   100644 fe54980e241bd983831bc9d405053f927ac01384 i18n/trk/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-  our    100644 7f7bbb5c84b993036a3d362d24dc3b43583468f7 i18n/trk/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-  their  100644 921f6ab59e1ff5afd66e5d3b426fb27d264ce740 i18n/trk/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
-changed in both
-  base   100644 a208d169e68a77bc6213f92d2edc5bda75523146 i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-  our    100644 60d165f6930d7e7b232664d0842137c891794b8b i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-  their  100644 e7d0119445a736f9b84cfbad3df942ba45acfb2f i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
-@@ -6,6 +6,38 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
-+=======
-+	"vscode.extension.contributes.debuggers": "Hata ayıklama bağdaştırıcılarına ekleme yapar.",
-+	"vscode.extension.contributes.debuggers.type": "Bu hata ayıklama bağdaştırıcısnın benzersiz tanımlayıcısı.",
-+	"vscode.extension.contributes.debuggers.label": "Bu hata ayıklama bağdaştırıcısnın görünen adı.",
-+	"vscode.extension.contributes.debuggers.program": "Hata ayıklama bağdaştırıcı programının yolu. Yol, ya mutlak ya da eklenti klasörüne görelidir.",
-+	"vscode.extension.contributes.debuggers.args": "Bağdaştırıcıya iletilecek ek argümanlar.",
-+	"vscode.extension.contributes.debuggers.runtime": "Program özniteliğinin yürütülebilir olmadığı halde bir çalışma zamanını gerektirmesi durumu için isteğe bağlı çalışma zamanı.",
-+	"vscode.extension.contributes.debuggers.runtimeArgs": "İsteğe bağlı çalışma zamanı argümanları.",
-+	"vscode.extension.contributes.debuggers.variables": "`launch.json` dosyasındaki interaktif değişkenlerin (ör. ${action.pickProcess}) bir komuta eşlenmesi.",
-+	"vscode.extension.contributes.debuggers.initialConfigurations": "İlk 'launch.json' dosyasının üretimi için yapılandırmalar.",
-+	"vscode.extension.contributes.debuggers.languages": "Hata ayıklama eklentisinin, \"varsayılan hata ayıklayıcı\" olarak değerlendirilebileceği diller listesi.",
-+	"vscode.extension.contributes.debuggers.adapterExecutableCommand": "Belirtilirse; VS Code, hata ayıklama bağdaştırıcısı yürütülebilir dosyasının yolunu ve ona gönderilecek argümanları belirlemek için bu komutu çağırır.",
-+	"vscode.extension.contributes.debuggers.configurationSnippets": "'launch.json' dosyasına yeni yapılandırmalar ekleme parçacıkları.",
-+	"vscode.extension.contributes.debuggers.configurationAttributes": "'launch.json' dosyasını doğrulayacak JSON şema yapılandırmaları.",
-+	"vscode.extension.contributes.debuggers.windows": "Windows'a özel ayarlar.",
-+	"vscode.extension.contributes.debuggers.windows.runtime": "Windows'da kullanılacak çalışma zamanı.",
-+	"vscode.extension.contributes.debuggers.osx": "macOS'e özel ayarlar.",
-+	"vscode.extension.contributes.debuggers.osx.runtime": "macOS'de kullanılacak çalışma zamanı.",
-+	"vscode.extension.contributes.debuggers.linux": "Linux'a özel ayarlar.",
-+	"vscode.extension.contributes.debuggers.linux.runtime": "Linux'da kullanılacak çalışma zamanı.",
-+	"vscode.extension.contributes.breakpoints": "Kesme noktalarına ekleme yapar.",
-+	"vscode.extension.contributes.breakpoints.language": "Bu dil için kesme noktalarını etkinleştir.",
-+	"app.launch.json.title": "Başlat",
-+	"app.launch.json.version": "Bu dosya biçiminin sürümü.",
-+	"app.launch.json.configurations": "Yapılandırma listesi. IntelliSense kullanarak yeni yapılandırmalar ekleyin veya mevcut olanları düzenleyin.",
-+	"app.launch.json.compounds": "Bileşikler listesi. Her bileşik, birlikte çalıştırılacak birden çok yapılandırmaya başvurur.",
-+	"app.launch.json.compound.name": "Bileşiğin adı. Başlatma yapılandırması açılır kutu menüsünde görünür.",
-+	"useUniqueNames": "Lütfen benzersiz yapılandırma adları kullanın.",
-+	"app.launch.json.compound.folder": "Bileşiğin bulunduğu klasörün adı.",
-+	"app.launch.json.compounds.configurations": "Bu bileşiğin parçası olarak başlatılacak yapılandırmaların adları.",
-+>>>>>>> .their
- 	"debugNoType": "Hata ayıklayıcının 'type' ögesi atlanamaz ve 'dize' türünde olmalıdır.",
- 	"selectDebug": "Ortam Seçin",
- 	"DebugConfig.failed": " '.vscode' klasörü içinde 'launch.json' dosyası oluşturulamıyor ({0}).",
-changed in both
-  base   100644 ad2bc971edf6a73aae32a5c0fcc4119be9d71019 i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  our    100644 37a431b186d01be99b6dc3686372e88732c818a6 i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  their  100644 26a26b98f4e1cf9bc844aa438aa260bc3ff91230 i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-@@ -25,7 +25,10 @@
- 	"addBreakpoint": "Kesme Noktası Ekle",
- 	"addConditionalBreakpoint": "Koşullu Kesme Noktası Ekle...",
- 	"addLogPoint": "Günlük Noktası Ekle...",
-+<<<<<<< .our
- 	"breakpointHasCondition": "Bu {0}, kaldırıldığında kaybolacak bir {1}'e sahip. Bunun yerine {0}'i kaldırmayı düşünün.",
-+=======
-+>>>>>>> .their
- 	"message": "mesaj",
- 	"condition": "koşul",
- 	"removeLogPoint": "Kaldır: {0}",
-changed in both
-  base   100644 dececc5e110f01780da9cb3fbc6b3a2d3652ae44 i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  our    100644 5f574d5497b61ce924ac083a103d74a4034fdba1 i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  their  100644 fc22fcd9e433497dc198ac595b01911e428d1ba1 i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-changed in both
-  base   100644 d5012160947ab812859b21cc0b5398646c5cf2ef i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 43e3bf4348f9b7a25892a993e8f5dd85c62e9798 i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 332acc9b58dd3d093e6eeffe2e054e3973ed06e2 i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -37,12 +37,21 @@
- 	"confirmMoveTrashMessageMultipleDirectories": "Aşağıdaki {0} dizini ve içindekileri silmek istediğinizden emin misiniz?",
- 	"confirmMoveTrashMessageMultiple": "Aşağıdaki {0} dosyayı silmek istediğinizden emin misiniz?",
- 	"confirmMoveTrashMessageFolder": "'{0}' ve içindekileri silmek istediğinizden emin misiniz?",
-+<<<<<<< .our
- 	"confirmMoveTrashMessageFile": "'{0}' ögesini silmek istediğinizden emin misiniz?",
- 	"confirmDeleteMessageFilesAndDirectories": "Aşağıdaki {0} dosyayı/dizini ve içindekileri kalıcı olarak silmek istediğinizden emin misiniz?",
- 	"confirmDeleteMessageMultipleDirectories": "Aşağıdaki {0} dizini ve içindekileri kalıcı olarak silmek istediğinizden emin misiniz?",
- 	"confirmDeleteMessageMultiple": "Aşağıdaki {0} dosyayı kalıcı olarak silmek istediğinizden emin misiniz?",
- 	"confirmDeleteMessageFolder": "'{0}' ögesini ve içindekileri kalıcı olarak silmek istediğinizden emin misiniz?",
- 	"confirmDeleteMessageFile": "'{0}' ögesini kalıcı olarak silmek istediğinizden emin misiniz?",
-+=======
-+	"confirmMoveTrashMessageFile": "'{0}' öğesini silmek istediğinize emin misiniz?",
-+	"confirmDeleteMessageFilesAndDirectories": "Aşağıdaki {0} dosyayı/dizini ve içindekileri kalıcı olarak silmek istediğinizden emin misiniz?",
-+	"confirmDeleteMessageMultipleDirectories": "Aşağıdaki {0} dizini ve içindekileri kalıcı olarak silmek istediğinizden emin misiniz?",
-+	"confirmDeleteMessageMultiple": "Aşağıdaki {0} dosyayı kalıcı olarak silmek istediğinizden emin misiniz?",
-+	"confirmDeleteMessageFolder": "'{0}' öğesini ve içindekileri kalıcı olarak silmek istediğinizden emin misiniz?",
-+	"confirmDeleteMessageFile": "'{0}' öğesini kalıcı olarak silmek istediğinizden emin misiniz?",
-+>>>>>>> .their
- 	"addFiles": "Dosya Ekle",
- 	"confirmOverwrite": "Hedef klasörde aynı ada sahip bir dosya veya klasör zaten var. Değiştirmek istiyor musunuz?",
- 	"replaceButtonLabel": "&&Değiştir",
-changed in both
-  base   100644 7e7b61fe5ed74bec0622e19c8802f9ecc48ac5c0 i18n/trk/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
-  our    100644 0e5a1f747b0fa621e90697980c612b290670af32 i18n/trk/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
-  their  100644 60cd3a5c2b904523bda138d9407598b27c0dce51 i18n/trk/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.i18n.json
-changed in both
-  base   100644 5042337767ac4dec36f1c75fceadb768cee7caac i18n/trk/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 9e04840f3efedecf23f5b2d44316f1a7c8399da8 i18n/trk/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 33b0d22cf5d24c40d1e71b7e1f77643a41865941 i18n/trk/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-changed in both
-  base   100644 02224d40eaff21323d7d2df513e3517e05f19687 i18n/trk/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
-  our    100644 386f5eb3c841e670ce89c483b32c97ecbe3d511f i18n/trk/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
-  their  100644 ed6d7ab0101b35762be25e703bdd277406f0eb45 i18n/trk/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
-changed in both
-  base   100644 1d07db8503d3f7d15aca61a27287e0651a15e87c i18n/trk/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.i18n.json
-  our    100644 e7582c808727ee38d8f3c573f6b2b1a1f4c338b3 i18n/trk/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.i18n.json
-  their  100644 a06658d90796b3c1963d85858a839de112b246d7 i18n/trk/src/vs/workbench/parts/tasks/common/taskDefinitionRegistry.i18n.json
-@@ -6,7 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"TaskDefinition.description": "Gerçek görev türü. '$' ile başlayan türlerin dahili kullanım için ayrılmış olduğunu unutmayın.",
-+=======
-+>>>>>>> .their
- 	"TaskDefinition.properties": "Görev türünün ek özellikleri",
- 	"TaskTypeConfiguration.noType": "Görev türü yapılandırmasında gerekli olan 'taskType' özelliği eksik",
- 	"TaskDefinitionExtPoint": "Görev türlerine ekleme yapar"
-changed in both
-  base   100644 74467e27acec730503d03cf4012d44a54b18d362 i18n/trk/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
-  our    100644 1f10ca399e70af82bda3e069d9f505dcf62dd525 i18n/trk/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
-  their  100644 a28ef74e4d3ccfa3d718c7f87cb5139f5c6fb9c3 i18n/trk/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.i18n.json
-@@ -11,6 +11,9 @@
- 	"TerminalTaskSystem.terminalName": "Görev - {0}",
- 	"closeTerminal": "Terminali kapatmak için lütfen bir tuşa basın.",
- 	"reuseTerminal": "Terminal görevler tarafından tekrar kullanılacak, kapatmak için herhangi bir tuşa basın.",
-+<<<<<<< .our
- 	"TerminalTaskSystem": "cmd.exe kullanarak UNC sürücüsünde kabuk komutu yürütülemiyor.",
-+=======
-+>>>>>>> .their
- 	"unkownProblemMatcher": "{0} sorun eşleştirici çözümlenemiyor. Eşleştirici yok sayılacaktır."
- }
-\ No newline at end of file
-changed in both
-  base   100644 33c53ccb7b336fedd132cf3d05a83363bbe34277 i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 0dfa05cd7919b2b8edd950bcde47408dafdd57f0 i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 d03ac69ef425aa3f9f0d3b562a754e76a6ffaed8 i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-changed in both
-  base   100644 f7f50d5fde301d3bfa9c3384ec41314e50f25aac i18n/trk/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-  our    100644 fe2396494aac70a9285a11da1d2f4add612daabf i18n/trk/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-  their  100644 2c4d1f25e117f80bbbf6c1b6b63eacf67681933e i18n/trk/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/trk/src/vs/workbench/services/configurationResolver/node/variableResolver.i18n.json
-  our    100644 a36997f7e19b0619b080ed72383e40079b50dfe2 i18n/trk/src/vs/workbench/services/configurationResolver/node/variableResolver.i18n.json
-  their  100644 c8bec6ed140740d425cc90edd8ef7a758b6b466f i18n/trk/src/vs/workbench/services/configurationResolver/node/variableResolver.i18n.json
-@@ -8,6 +8,7 @@
- 	],
- 	"missingEnvVarName": "Hiçbir ortam değişkeni adı belirtilmediği için '{0}' çözümlenemiyor.",
- 	"configNotFound": "'{1}' ayarı bulunamadığı için '{0}' çözümlenemiyor.",
-+<<<<<<< .our
- 	"missingConfigName": "Hiçbir ayar adı belirtilmediği için '{0}' çözümlenemiyor.",
- 	"noValueForCommand": "Komut değer içermediği için '{0}' çözümlenemiyor.",
- 	"canNotFindFolder": "'{0}' çözümlenemiyor. '{1}' klasörü yok.",
-@@ -16,4 +17,11 @@
- 	"canNotResolveFile": "'{0}' çözümlenemiyor. Lütfen bir düzenleyici açın.",
- 	"canNotResolveLineNumber": "'{0}' çözümlenemiyor. Lütfen aktif düzenleyicide bir satırın seçili olduğundan emin olun.",
- 	"canNotResolveSelectedText": "'{0}' çözümlenemiyor. Lütfen aktif düzenleyicide seçili metin olduğundan emin olun."
-+=======
-+	"configNoString": "'{1}' yapılandırılmış bir değer olduğu için '{0}' çözümlenemiyor.",
-+	"missingConfigName": "Hiçbir ayar adı belirtilmediği için '{0}' çözümlenemiyor.",
-+	"canNotFindFolder": "'{0}' çözümlenemiyor. '{1}' klasörü yok.",
-+	"canNotResolveWorkspaceFolder": "'{0}' çözümlenemiyor. Lütfen bir klasör açın.",
-+	"canNotResolveFile": "'{0}' çözümlenemiyor. Lütfen bir düzenleyici açın."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 cff52e071dfc7cb7ceb4d443dfd55d4d3d467264 i18n/trk/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
-  our    100644 334fc70777714e823b224069515165a76c85dfb9 i18n/trk/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
-  their  100644 d2953a12304bc24047e891773f42628d4b3508da i18n/trk/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
-changed in both
-  base   100644 7f8a2b8ad2cb30cfc366d5d71479a0b391fa2459 i18n/trk/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  our    100644 0178637fbdf0424ea4af3cebade365489a085e58 i18n/trk/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-  their  100644 1259bcfe672d1b4cde077e7744b83ea347f3bc53 i18n/trk/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
-changed in both
-  base   100644 7d31972f2b7ce36f2ca2b4e1bad6b194e18b6313 package.json
-  our    100644 d0e982ce0b76c5b1b5eb02b673e459e47f3353a4 package.json
-  their  100644 b24c82b45213de1204a11fa70d8dbf6e761a32c0 package.json
-@@ -1,7 +1,12 @@
- {
-   "name": "code-oss-dev",
-+<<<<<<< .our
-   "version": "1.27.0",
-   "distro": "a4155d9780fbbc94ead6cb3017dd0fc3806c57b8",
-+=======
-+  "version": "1.23.1",
-+  "distro": "99ee6cd10c4085ec332caa00285b6d5eb9667efd",
-+>>>>>>> .their
-   "author": {
-     "name": "Microsoft Corporation"
-   },
-changed in both
-  base   100644 2ffe037a5bad41a1007956df1afd244d38fc03cb src/vs/editor/common/modes/languageFeatureRegistry.ts
-  our    100644 9dfd73755f25810dc0206a38608e0686ad3c6501 src/vs/editor/common/modes/languageFeatureRegistry.ts
-  their  100644 c5e4e7010d88c9d725dbf6c2c6c8bc16da7eedb1 src/vs/editor/common/modes/languageFeatureRegistry.ts
-changed in both
-  base   100644 d356d916ed81906482bbca4b9b62c008a275afcb src/vs/editor/contrib/codeAction/codeActionCommands.ts
-  our    100644 5dd721207d459fd50dac8eaf12e5570eb83f025e src/vs/editor/contrib/codeAction/codeActionCommands.ts
-  their  100644 68ee6014f86f0907619812235d77272ac331ee65 src/vs/editor/contrib/codeAction/codeActionCommands.ts
-@@ -275,8 +275,12 @@
- 				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_R,
- 				mac: {
- 					primary: KeyMod.WinCtrl | KeyMod.Shift | KeyCode.KEY_R
-+<<<<<<< .our
- 				},
- 				weight: KeybindingWeight.EditorContrib
-+=======
-+				}
-+>>>>>>> .their
- 			},
- 			menuOpts: {
- 				group: '1_modification',
-changed in both
-  base   100644 61eb637d98cc2814aea72930922ce16e4fa6c116 src/vs/platform/extensionManagement/node/extensionManagementService.ts
-  our    100644 fca1b8fcc1eedca233bd95ef59ad6d0d3904e895 src/vs/platform/extensionManagement/node/extensionManagementService.ts
-  their  100644 62097257f7cc45ce21a69c749c0f0dd521257988 src/vs/platform/extensionManagement/node/extensionManagementService.ts
-@@ -105,6 +105,11 @@
- 	metadata?: IGalleryMetadata;
- }
- 
-+enum Operation {
-+	Install = 1,
-+	Update
-+}
-+
- export class ExtensionManagementService extends Disposable implements IExtensionManagementService {
- 
- 	_serviceBrand: any;
-@@ -228,6 +233,7 @@
- 			}));
- 	}
- 
-+<<<<<<< .our
- 	installFromGallery(extension: IGalleryExtension): TPromise<void> {
- 		let installingExtension = this.installingExtensions.get(extension.identifier.id);
- 		if (!installingExtension) {
-@@ -279,6 +285,25 @@
- 
- 		}
- 		return installingExtension;
-+=======
-+	installFromGallery(extension: IGalleryExtension): TPromise<ILocalExtension> {
-+		this.onInstallExtensions([extension]);
-+		return this.getInstalled(LocalExtensionType.User)
-+			.then(installed => this.collectExtensionsToInstall(extension)
-+				.then(
-+					extensionsToInstall => {
-+						if (extensionsToInstall.length > 1) {
-+							this.onInstallExtensions(extensionsToInstall.slice(1));
-+						}
-+						const operataions: Operation[] = extensionsToInstall.map(e => this.getOperation(e, installed));
-+						return this.downloadAndInstallExtensions(extensionsToInstall)
-+							.then(
-+								locals => this.onDidInstallExtensions(extensionsToInstall, locals, operataions, [])
-+									.then(() => locals.filter(l => areSameExtensions({ id: getGalleryExtensionIdFromLocal(l), uuid: l.identifier.uuid }, extension.identifier)[0])),
-+								errors => this.onDidInstallExtensions(extensionsToInstall, [], operataions, errors));
-+					},
-+					error => this.onDidInstallExtensions([extension], [], [this.getOperation(extension, installed)], [error])));
-+>>>>>>> .their
- 	}
- 
- 	reinstallFromGallery(extension: ILocalExtension): TPromise<void> {
-@@ -298,8 +323,27 @@
- 			});
- 	}
- 
-+<<<<<<< .our
- 	private getOperation(extensionToInstall: IExtensionIdentifier, installed: ILocalExtension[]): InstallOperation {
- 		return installed.some(i => areSameExtensions({ id: getGalleryExtensionIdFromLocal(i), uuid: i.identifier.uuid }, extensionToInstall)) ? InstallOperation.Update : InstallOperation.Install;
-+=======
-+	private getOperation(extensionToInstall: IGalleryExtension, installed: ILocalExtension[]): Operation {
-+		return installed.some(i => areSameExtensions({ id: getGalleryExtensionIdFromLocal(i), uuid: i.identifier.uuid }, extensionToInstall.identifier)) ? Operation.Update : Operation.Install;
-+	}
-+
-+	private collectExtensionsToInstall(extension: IGalleryExtension): TPromise<IGalleryExtension[]> {
-+		return this.galleryService.loadCompatibleVersion(extension)
-+			.then(compatible => {
-+				if (!compatible) {
-+					return TPromise.wrapError<IGalleryExtension[]>(new ExtensionManagementError(nls.localize('notFoundCompatible', "Unable to install '{0}'; there is no available version compatible with VS Code '{1}'.", extension.identifier.id, pkg.version), INSTALL_ERROR_INCOMPATIBLE));
-+				}
-+				return this.getDependenciesToInstall(compatible.properties.dependencies)
-+					.then(
-+						dependenciesToInstall => ([compatible, ...dependenciesToInstall.filter(d => d.identifier.uuid !== compatible.identifier.uuid)]),
-+						error => TPromise.wrapError<IGalleryExtension[]>(new ExtensionManagementError(this.joinErrors(error).message, INSTALL_ERROR_GALLERY)));
-+			},
-+				error => TPromise.wrapError<IGalleryExtension[]>(new ExtensionManagementError(this.joinErrors(error).message, INSTALL_ERROR_GALLERY)));
-+>>>>>>> .their
- 	}
- 
- 	private getTelemetryEvent(operation: InstallOperation): string {
-@@ -347,6 +391,56 @@
- 				error => TPromise.wrapError<InstallableExtension>(new ExtensionManagementError(this.joinErrors(error).message, INSTALL_ERROR_GALLERY)));
- 	}
- 
-+<<<<<<< .our
-+=======
-+	private onInstallExtensions(extensions: IGalleryExtension[]): void {
-+		for (const extension of extensions) {
-+			this.logService.info('Installing extension:', extension.name);
-+			this.installationStartTime.set(extension.identifier.id, new Date().getTime());
-+			const id = getLocalExtensionIdFromGallery(extension, extension.version);
-+			this._onInstallExtension.fire({ identifier: { id, uuid: extension.identifier.uuid }, gallery: extension });
-+		}
-+	}
-+
-+	private onDidInstallExtensions(extensions: IGalleryExtension[], locals: ILocalExtension[], operations: Operation[], errors: Error[]): TPromise<any> {
-+		extensions.forEach((gallery, index) => {
-+			const identifier = { id: getLocalExtensionIdFromGallery(gallery, gallery.version), uuid: gallery.identifier.uuid };
-+			const local = locals[index];
-+			const error = errors[index];
-+			if (local) {
-+				this.logService.info(`Extensions installed successfully:`, gallery.identifier.id);
-+				this._onDidInstallExtension.fire({ identifier, gallery, local });
-+			} else {
-+				const errorCode = error && (<ExtensionManagementError>error).code ? (<ExtensionManagementError>error).code : ERROR_UNKNOWN;
-+				this.logService.error(`Failed to install extension:`, gallery.identifier.id, error ? error.message : errorCode);
-+				this._onDidInstallExtension.fire({ identifier, gallery, error: errorCode });
-+			}
-+			const startTime = this.installationStartTime.get(gallery.identifier.id);
-+			this.reportTelemetry(operations[index] === Operation.Install ? 'extensionGallery:install' : 'extensionGallery:update', getGalleryExtensionTelemetryData(gallery), startTime ? new Date().getTime() - startTime : void 0, error);
-+			this.installationStartTime.delete(gallery.identifier.id);
-+		});
-+		return errors.length ? TPromise.wrapError(this.joinErrors(errors)) : TPromise.as(null);
-+	}
-+
-+	private getDependenciesToInstall(dependencies: string[]): TPromise<IGalleryExtension[]> {
-+		if (dependencies.length) {
-+			return this.getInstalled()
-+				.then(installed => {
-+					const uninstalledDeps = dependencies.filter(d => installed.every(i => getGalleryExtensionId(i.manifest.publisher, i.manifest.name) !== d));
-+					if (uninstalledDeps.length) {
-+						return this.galleryService.loadAllDependencies(uninstalledDeps.map(id => (<IExtensionIdentifier>{ id })))
-+							.then(allDependencies => allDependencies.filter(d => {
-+								const extensionId = getLocalExtensionIdFromGallery(d, d.version);
-+								return installed.every(({ identifier }) => identifier.id !== extensionId);
-+							}));
-+					}
-+					return [];
-+				});
-+		}
-+		return TPromise.as([]);
-+	}
-+
-+>>>>>>> .their
- 	private installExtension(installableExtension: InstallableExtension): TPromise<ILocalExtension> {
- 		return this.unsetUninstalledAndGetLocal(installableExtension.id)
- 			.then(
-changed in both
-  base   100644 dcb29cd3d1f185dfd444fa697cdf612a400a7e7b src/vs/vscode.d.ts
-  our    100644 6000b0300db361418bc31c0585263a9d663705f5 src/vs/vscode.d.ts
-  their  100644 554493ab2b4610c19bfa932e2382cf820ef280fe src/vs/vscode.d.ts
-@@ -3584,7 +3584,10 @@
- 		 * [Region](#FoldingRangeKind.Region). The kind is used to categorize folding ranges and used by commands
- 		 * like 'Fold all comments'. See
- 		 * [FoldingRangeKind](#FoldingRangeKind) for an enumeration of all kinds.
-+<<<<<<< .our
- 		 * If not set, the range is originated from a syntax element.
-+=======
-+>>>>>>> .their
- 		 */
- 		kind?: FoldingRangeKind;
- 
-@@ -3598,6 +3601,7 @@
- 		constructor(start: number, end: number, kind?: FoldingRangeKind);
- 	}
- 
-+<<<<<<< .our
- 	/**
- 	 * An enumeration of specific folding range kinds. The kind is an optional field of a [FoldingRange](#FoldingRange)
- 	 * and is used to distinguish specific folding ranges such as ranges originated from comments. The kind is used by commands like
-@@ -3616,6 +3620,20 @@
- 		/**
- 		 * Kind for folding range representing regions originating from folding markers like `#region` and `#endregion`.
- 		 */
-+=======
-+	export enum FoldingRangeKind {
-+		/**
-+		 * Kind for folding range representing a comment.
-+		 */
-+		Comment = 1,
-+		/**
-+		 * Kind for folding range representing a import.
-+		 */
-+		Imports = 2,
-+		/**
-+		 * Kind for folding range representing regions (for example a folding range marked by `#region` and `#endregion`).
-+		 */
-+>>>>>>> .their
- 		Region = 3
- 	}
- 
-@@ -5055,6 +5073,7 @@
- 	}
- 
- 	/**
-+<<<<<<< .our
- 	 * An object representing an executed Task. It can be used
- 	 * to terminate a task.
- 	 *
-@@ -5207,6 +5226,8 @@
- 	}
- 
- 	/**
-+=======
-+>>>>>>> .their
- 	 * Enumeration of file types. The types `File` and `Directory` can also be
- 	 * a symbolic links, in that use `FileType.File | FileType.SymbolicLink` and
- 	 * `FileType.Directory | FileType.SymbolicLink`.
-@@ -6237,7 +6258,11 @@
- 		 *
- 		 * @return New webview panel.
- 		 */
-+<<<<<<< .our
- 		export function createWebviewPanel(viewType: string, title: string, showOptions: ViewColumn | { viewColumn: ViewColumn, preserveFocus?: boolean }, options?: WebviewPanelOptions & WebviewOptions): WebviewPanel;
-+=======
-+		export function createWebviewPanel(viewType: string, title: string, position: ViewColumn, options?: WebviewPanelOptions & WebviewOptions): WebviewPanel;
-+>>>>>>> .their
- 
- 		/**
- 		 * Set a message to the status bar. This is a short hand for the more powerful
-changed in both
-  base   100644 17f98c7bf0149f07d24df0c01c6ac73d30514479 src/vs/vscode.proposed.d.ts
-  our    100644 3de4a7af9dda9e3e523ba4b5774f1667d66b0b9b src/vs/vscode.proposed.d.ts
-  their  100644 10bc66316788a0850a53369fd393c7f55f8c2f27 src/vs/vscode.proposed.d.ts
-@@ -785,4 +785,12 @@
- 		export const onDidRenameFile: Event<FileRenameEvent>;
- 	}
- 	//#endregion
-+
-+	//#region Joh -> exclusive document filters
-+
-+	export interface DocumentFilter {
-+		exclusive?: boolean;
-+	}
-+
-+	//#endregion
- }
-changed in both
-  base   100644 1599bef1be7303433de864db20fdec9411e4aa7b src/vs/workbench/api/node/extHost.api.impl.ts
-  our    100644 ea64898c5b15cfae4b4ab32d722f4ae4a68f831a src/vs/workbench/api/node/extHost.api.impl.ts
-  their  100644 f35be2cbde20a415e862566dfdfd4e206ad873fe src/vs/workbench/api/node/extHost.api.impl.ts
-@@ -150,7 +150,11 @@
- 		// We only inform once, it is not a warning because we just want to raise awareness and because
- 		// we cannot say if the extension is doing it right or wrong...
- 		let checkSelector = (function () {
-+<<<<<<< .our
- 			let done = (!extension.isUnderDevelopment);
-+=======
-+			let done = initData.environment.extensionDevelopmentPath !== extension.extensionFolderPath;
-+>>>>>>> .their
- 			function informOnce(selector: vscode.DocumentSelector) {
- 				if (!done) {
- 					console.info(`Extension '${extension.id}' uses a document selector without scheme. Learn more about this: https://go.microsoft.com/fwlink/?linkid=872305`);
-changed in both
-  base   100644 67ab3eab780589725183ad64d92428e5ed687f32 src/vs/workbench/api/node/extHost.protocol.ts
-  our    100644 edb764542adfbf0fba64e1b93de7c309bedf0d12 src/vs/workbench/api/node/extHost.protocol.ts
-  their  100644 806c6040d81067243637c24f88064c54d1181111 src/vs/workbench/api/node/extHost.protocol.ts
-changed in both
-  base   100644 69e4e9f72ae3dfb871668e116b735ba57b77d5d2 src/vs/workbench/api/node/extHostLanguageFeatures.ts
-  our    100644 1742acf237818001f5cb6365f849de0335cd9323 src/vs/workbench/api/node/extHostLanguageFeatures.ts
-  their  100644 1725625b2f7d2c7302e7a02f3d2fbe3a962d0085 src/vs/workbench/api/node/extHostLanguageFeatures.ts
-changed in both
-  base   100644 5c98f71fd8252434107ee3fd454ae1449b96ade6 src/vs/workbench/api/node/extHostTypeConverters.ts
-  our    100644 ae449946df0a11f467815b4a7ec498cfdb238842 src/vs/workbench/api/node/extHostTypeConverters.ts
-  their  100644 c8aec09c9dee2c62e5e51a4ea8bf3c71edeab8da src/vs/workbench/api/node/extHostTypeConverters.ts
-@@ -706,6 +706,25 @@
- 			range.kind = FoldingRangeKind.from(r.kind);
- 		}
- 		return range;
-+<<<<<<< .our
-+=======
-+	}
-+}
-+
-+export namespace FoldingRangeKind {
-+	export function from(kind: vscode.FoldingRangeKind | undefined): modes.FoldingRangeKind | undefined {
-+		if (kind) {
-+			switch (kind) {
-+				case types.FoldingRangeKind.Comment:
-+					return modes.FoldingRangeKind.Comment;
-+				case types.FoldingRangeKind.Imports:
-+					return modes.FoldingRangeKind.Imports;
-+				case types.FoldingRangeKind.Region:
-+					return modes.FoldingRangeKind.Region;
-+			}
-+		}
-+		return void 0;
-+>>>>>>> .their
- 	}
- }
- 
-@@ -763,6 +782,7 @@
- 
- export namespace LanguageSelector {
- 
-+<<<<<<< .our
- 	export function from(selector: vscode.DocumentSelector): languageSelector.LanguageSelector {
- 		if (!selector) {
- 			return undefined;
-@@ -778,5 +798,14 @@
- 				exclusive: selector.exclusive
- 			};
- 		}
-+=======
-+	if (selector) {
-+		return {
-+			language: selector.language,
-+			scheme: selector.scheme,
-+			pattern: toGlobPattern(selector.pattern),
-+			exclusive: selector.exclusive
-+		};
-+>>>>>>> .their
- 	}
- }
-changed in both
-  base   100644 1d84be9456667096318430ace00b2c74df7f0013 src/vs/workbench/api/node/extHostTypes.ts
-  our    100644 7e7572fe66c624d470c8506c4a3ebf35efe8320a src/vs/workbench/api/node/extHostTypes.ts
-  their  100644 f08bd230f5124f265ff45fcf4d2c789276496daa src/vs/workbench/api/node/extHostTypes.ts
-@@ -1941,6 +1941,7 @@
- 	Comment = 1,
- 	Imports = 2,
- 	Region = 3
-+<<<<<<< .our
- }
- 
- //#endregion
-@@ -1955,6 +1956,8 @@
- 	 * Determines an item is expanded
- 	 */
- 	Expanded = 1
-+=======
-+>>>>>>> .their
- }
- 
- export class QuickInputButtons {
-changed in both
-  base   100644 e91157377ab33d134defebbfcc5a2817b5aa6124 src/vs/workbench/api/node/extHostWebview.ts
-  our    100644 89302f776704c2cabc429d6a8ced0d9c7839abe0 src/vs/workbench/api/node/extHostWebview.ts
-  their  100644 285c1722e97ea01b5e69819f853a8e89c3a74219 src/vs/workbench/api/node/extHostWebview.ts
-@@ -242,6 +242,7 @@
- 		extensionLocation: URI,
- 		viewType: string,
- 		title: string,
-+<<<<<<< .our
- 		showOptions: vscode.ViewColumn | { viewColumn: vscode.ViewColumn, preserveFocus?: boolean },
- 		options: (vscode.WebviewPanelOptions & vscode.WebviewOptions) = {},
- 	): vscode.WebviewPanel {
-@@ -253,6 +254,15 @@
- 
- 		const handle = ExtHostWebviews.newHandle();
- 		this._proxy.$createWebviewPanel(handle, viewType, title, webviewShowOptions, options, extensionLocation);
-+=======
-+		viewColumn: vscode.ViewColumn,
-+		options: (vscode.WebviewPanelOptions & vscode.WebviewOptions) | undefined,
-+		extensionFolderPath: string
-+	): vscode.WebviewPanel {
-+		options = options || {};
-+		const handle = ExtHostWebviews.webviewHandlePool++ + '';
-+		this._proxy.$createWebviewPanel(handle, viewType, title, typeConverters.fromViewColumn(viewColumn), options, extensionFolderPath);
-+>>>>>>> .their
- 
- 		const webview = new ExtHostWebview(handle, this._proxy, options);
- 		const panel = new ExtHostWebviewPanel(handle, this._proxy, viewType, title, viewColumn, options, webview);
-changed in both
-  base   100644 96ec92771ac7f0be88d964d1c744d799458669fd src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
-  our    100644 773bbe0d763095d8dfa6af1262d5e8a15944139f src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
-  their  100644 366b81fe440c92f643b6909cdf88d67ba6e52e16 src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
-@@ -21,9 +21,14 @@
- import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
- import { KeyCode } from 'vs/base/common/keyCodes';
- import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-+<<<<<<< .our
- import { ActivityAction, ActivityActionItem, ICompositeBarColors, ToggleCompositePinnedAction, ICompositeBar } from 'vs/workbench/browser/parts/compositeBarActions';
- import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
- import URI from 'vs/base/common/uri';
-+=======
-+import { ActivityAction, ActivityActionItem, ICompositeBarColors } from 'vs/workbench/browser/parts/compositebar/compositeBarActions';
-+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-+>>>>>>> .their
- 
- export class ViewletActivityAction extends ActivityAction {
- 
-changed in both
-  base   100644 54c49535f2bca89c496a3e6b901872b914bcbf3e src/vs/workbench/browser/parts/quickinput/quickInput.ts
-  our    100644 d834bd59460d51375417fd865daeb856b353a144 src/vs/workbench/browser/parts/quickinput/quickInput.ts
-  their  100644 d02b457682cacd8ae7197913705495e6fd1c92f8 src/vs/workbench/browser/parts/quickinput/quickInput.ts
-@@ -32,6 +32,7 @@
- import { Button } from 'vs/base/browser/ui/button/button';
- import { dispose, IDisposable } from 'vs/base/common/lifecycle';
- import Severity from 'vs/base/common/severity';
-+<<<<<<< .our
- import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
- import { IContextKeyService, RawContextKey, IContextKey } from 'vs/platform/contextkey/common/contextkey';
- import { ICommandAndKeybindingRule, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-@@ -43,6 +44,9 @@
- import { equals } from 'vs/base/common/arrays';
- import { TimeoutTimer } from 'vs/base/common/async';
- import { getIconClass } from 'vs/workbench/browser/parts/quickinput/quickInputUtils';
-+=======
-+import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
-+>>>>>>> .their
- 
- const $ = dom.$;
- 
-@@ -777,9 +781,13 @@
- 		@IInstantiationService private instantiationService: IInstantiationService,
- 		@IPartService private partService: IPartService,
- 		@IQuickOpenService private quickOpenService: IQuickOpenService,
-+<<<<<<< .our
- 		@IEditorGroupsService private editorGroupService: IEditorGroupsService,
- 		@IKeybindingService private keybindingService: IKeybindingService,
- 		@IContextKeyService private contextKeyService: IContextKeyService,
-+=======
-+		@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
-+>>>>>>> .their
- 		@IThemeService themeService: IThemeService
- 	) {
- 		super(QuickInputService.ID, themeService);
-@@ -916,11 +924,26 @@
- 			}, 0);
- 		}));
- 
-+<<<<<<< .our
- 		const focusTracker = dom.trackFocus(container);
- 		this._register(focusTracker);
- 		this._register(focusTracker.onDidBlur(() => {
- 			if (!this.ui.ignoreFocusOut && !this.environmentService.args['sticky-quickopen'] && this.configurationService.getValue(CLOSE_ON_FOCUS_LOST_CONFIG)) {
- 				this.hide(true);
-+=======
-+		this.toUnbind.push(dom.addDisposableListener(this.container, 'focusout', (e: FocusEvent) => {
-+			if (e.relatedTarget === this.container) {
-+				(<HTMLElement>e.target).focus();
-+				return;
-+			}
-+			for (let element = <Element>e.relatedTarget; element; element = element.parentElement) {
-+				if (element === this.container) {
-+					return;
-+				}
-+			}
-+			if (!this.ignoreFocusLost && !this.environmentService.args['sticky-quickopen'] && this.configurationService.getValue(CLOSE_ON_FOCUS_LOST_CONFIG)) {
-+				this.close(undefined, true);
-+>>>>>>> .their
- 			}
- 		}));
- 		this._register(dom.addDisposableListener(container, dom.EventType.KEY_DOWN, (e: KeyboardEvent) => {
-@@ -1009,6 +1032,7 @@
- 		this.updateStyles();
- 	}
- 
-+<<<<<<< .our
- 	pick<T extends IQuickPickItem, O extends IPickOptions<T>>(picks: TPromise<QuickPickInput<T>[]> | QuickPickInput<T>[], options: O = <O>{}, token: CancellationToken = CancellationToken.None): TPromise<O extends { canPickMany: true } ? T[] : T> {
- 		return new TPromise<O extends { canPickMany: true } ? T[] : T>((doResolve, reject) => {
- 			let resolve = (result: any) => {
-@@ -1161,6 +1185,72 @@
- 			input.show();
- 		});
- 	}
-+=======
-+	private close(ok?: true | Thenable<never>, focusLost?: boolean) {
-+		if (!this.container || this.container.style.display === 'none') {
-+			return TPromise.as(undefined);
-+		}
-+		if (this.controller) {
-+			const resolved = this.controller.resolve(ok);
-+			if (resolved) {
-+				const result = resolved
-+					.then(() => {
-+						this.container.style.display = 'none';
-+						if (!focusLost) {
-+							this.restoreFocus();
-+						}
-+					});
-+				result.then(null, onUnexpectedError);
-+				return result;
-+			}
-+		}
-+		this.container.style.display = 'none';
-+		if (!focusLost) {
-+			this.restoreFocus();
-+		}
-+		return TPromise.as(undefined);
-+	}
-+
-+	private restoreFocus(): void {
-+		const editor = this.editorService.getActiveEditor();
-+		if (editor) {
-+			editor.focus();
-+		}
-+	}
-+
-+	pick<T extends IPickOpenEntry>(picks: TPromise<T[]>, options: IPickOptions = {}, token?: CancellationToken): TPromise<T[]> {
-+		return this.show({
-+			type: 'selectMany',
-+			picks,
-+			placeHolder: options.placeHolder,
-+			matchOnDescription: options.matchOnDescription,
-+			matchOnDetail: options.matchOnDetail,
-+			ignoreFocusLost: options.ignoreFocusLost
-+		}, token);
-+	}
-+
-+	input(options: IInputOptions = {}, token?: CancellationToken): TPromise<string> {
-+		return this.show({
-+			type: 'textInput',
-+			value: options.value,
-+			valueSelection: options.valueSelection,
-+			prompt: options.prompt,
-+			placeHolder: options.placeHolder,
-+			password: options.password,
-+			ignoreFocusLost: options.ignoreFocusLost,
-+			validateInput: options.validateInput,
-+		}, token);
-+	}
-+
-+	show<T extends IPickOpenEntry>(parameters: SelectManyParameters<T>, token?: CancellationToken): TPromise<T[]>;
-+	show(parameters: TextInputParameters, token?: CancellationToken): TPromise<string>;
-+	show<R>(parameters: InputParameters, token: CancellationToken = CancellationToken.None): TPromise<R> {
-+		this.create();
-+		this.quickOpenService.close();
-+		if (this.controller) {
-+			this.controller.resolve();
-+		}
-+>>>>>>> .their
- 
- 	backButton = backButton;
- 
-changed in both
-  base   100644 464731341ecd14fa356af57ba38e778a9f957044 src/vs/workbench/parts/debug/electron-browser/debugService.ts
-  our    100644 a5e2dcee7a0eb14bc388d84c6c7cac591067b1b2 src/vs/workbench/parts/debug/electron-browser/debugService.ts
-  their  100644 fafa45301fbcc512397b4eee6655bab5b341b409 src/vs/workbench/parts/debug/electron-browser/debugService.ts
-@@ -157,6 +157,7 @@
- 		const raw = <RawDebugSession>session.raw;
- 
- 		if (broadcast.channel === EXTENSION_ATTACH_BROADCAST_CHANNEL) {
-+<<<<<<< .our
- 			const initialAttach = session.configuration.request === 'launch';
- 
- 			session.configuration.request = 'attach';
-@@ -174,6 +175,13 @@
- 				this.doCreateSession(root, { resolved: session.configuration, unresolved: session.unresolvedConfiguration }, session.getId());
- 			}
- 
-+=======
-+			this.onSessionEnd(session);
-+
-+			process.configuration.request = 'attach';
-+			process.configuration.port = broadcast.payload.port;
-+			this.doCreateProcess(process.session.root, process.configuration, process.getId());
-+>>>>>>> .their
- 			return;
- 		}
- 
-changed in both
-  base   100644 ea7188eab8e592853b12b1c9095eeeeb3a0ec374 src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts
-  our    100644 69bc170328023443de8604d25d47c4839fd2f82f src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts
-  their  100644 bdcf15d35d8ede121543372090f5357996b1fccf src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts
-@@ -277,7 +277,11 @@
- 		this.content = append(body, $('.content'));
- 	}
- 
-+<<<<<<< .our
- 	setInput(input: ExtensionsInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
-+=======
-+	setInput(input: ExtensionsInput, options: EditorOptions): TPromise<void> {
-+>>>>>>> .their
- 		this.editorLoadComplete = false;
- 		const extension = input.extension;
- 
-@@ -418,6 +422,7 @@
- 		this.navbar.clear();
- 		this.navbar.onChange(this.onNavbarChange.bind(this, extension), this, this.transientDisposables);
- 
-+<<<<<<< .our
- 		if (extension.hasReadme()) {
- 			this.navbar.push(NavbarSection.Readme, localize('details', "Details"), localize('detailstooltip', "Extension details, rendered from the extension's 'README.md' file"));
- 		}
-@@ -438,6 +443,11 @@
- 				}
- 				this.editorLoadComplete = true;
- 			});
-+=======
-+		this.editorLoadComplete = true;
-+		return super.setInput(input, options);
-+	}
-+>>>>>>> .their
- 
- 		return super.setInput(input, options, token);
- 	}
-@@ -461,6 +471,22 @@
- 			this.telemetryService.publicLog('extensionEditor:navbarChange', assign(extension.telemetryData, { navItem: id }));
- 		}
- 
-+<<<<<<< .our
-+=======
-+	private onNavbarChange(extension: IExtension, id: string): void {
-+		if (this.editorLoadComplete) {
-+			/* __GDPR__
-+				"extensionEditor:navbarChange" : {
-+					"navItem": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-+					"${include}": [
-+						"${GalleryExtensionTelemetryData}"
-+					]
-+				}
-+			*/
-+			this.telemetryService.publicLog('extensionEditor:navbarChange', assign(extension.telemetryData, { navItem: id }));
-+		}
-+
-+>>>>>>> .their
- 		this.contentDisposables = dispose(this.contentDisposables);
- 		this.content.innerHTML = '';
- 		this.activeWebview = null;
-changed in both
-  base   100644 89fc28f9bf0b228789bd045054a06eb803c5c4ab src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
-  our    100644 dde370485c80817a804989c810abe2f1db9c0966 src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
-  their  100644 bc61f8e7578a7e6df0c0dc5c6f76d64abe1d0fd5 src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
-@@ -917,8 +917,14 @@
- 		const extension: Extension = installingExtension ? installingExtension : zipPath ? new Extension(this.galleryService, this.stateProvider, [local], null, this.telemetryService) : null;
- 		if (extension) {
- 			this.installing = installingExtension ? this.installing.filter(e => e !== installingExtension) : this.installing;
-+<<<<<<< .our
- 			if (!error) {
- 				const installed = this.installed.filter(e => e.id === extension.id)[0];
-+=======
-+			const installed = this.installed.filter(e => e.id === extension.id)[0];
-+			if (!error) {
-+				extension.local = local;
-+>>>>>>> .their
- 				if (installed) {
- 					const server = this.extensionManagementServerService.getExtensionManagementServer(local.location);
- 					const existingLocal = installed.locals.filter(l => this.extensionManagementServerService.getExtensionManagementServer(l.location).authority === server.authority)[0];
-@@ -934,6 +940,13 @@
- 					this.installed.push(extension);
- 				}
- 			}
-+<<<<<<< .our
-+=======
-+			if (extension.gallery && !installed) {
-+				// Report recommendation telemetry only for gallery extensions that are first time installs
-+				this.reportExtensionRecommendationsTelemetry(installingExtension);
-+			}
-+>>>>>>> .their
- 		}
- 		this._onChange.fire();
- 	}
-changed in both
-  base   100644 175ea3e68f6eeb7c363a6c79cb0929f97dcd6f05 src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.ts
-  our    100644 052de75c677677d839ae5533561df1d9238d3218 src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.ts
-  their  100644 fc32956260008af9d71fa5c614f52f4d8f8cc072 src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.ts
-@@ -113,10 +113,21 @@
- 			return;
- 		}
- 
-+<<<<<<< .our
- 		this.isLanguageInstalled(locale)
- 			.then(installed => {
- 				if (installed) {
- 					return;
-+=======
-+	private getLanguagePackExtension(language: string): TPromise<IGalleryExtension> {
-+		return this.localizationService.getLanguageIds(LanguageType.Core)
-+			.then(coreLanguages => {
-+				if (coreLanguages.some(c => c.toLowerCase() === language)) {
-+					const extensionIdPrefix = language === 'zh-cn' ? 'zh-hans' : language === 'zh-tw' ? 'zh-hant' : language;
-+					const extensionId = product.quality === 'insider' ? `MS-CEINTL.vscode-insiders-language-pack-${extensionIdPrefix}` : `MS-CEINTL.vscode-language-pack-${extensionIdPrefix}`;
-+					return this.galleryService.query({ names: [extensionId], pageSize: 1 })
-+						.then(result => result.total === 1 ? result.firstPage[0] : null);
-+>>>>>>> .their
- 				}
- 
- 				this.galleryService.query({ text: `tag:lp-${locale}` }).then(tagResult => {
-changed in both
-  base   100644 039eb1e356083f4d9c26b1768da826942d80028a src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
-  our    100644 04d9dcba251cf79c28429027cda3ca3b0c10a29c src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
-  their  100644 fa67e5baf081c17113fe4977aad6ce0e0bbfd6b5 src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
-changed in both
-  base   100644 3ecde0d0ba28de8404303e1b05e34734c27b72fd src/vs/workbench/test/electron-browser/api/extHostTypes.test.ts
-  our    100644 d14a9a0469ec26cdc120ec6490c06db8587d4a0c src/vs/workbench/test/electron-browser/api/extHostTypes.test.ts
-  their  100644 3392b29f464de9211e49037ce5d3a059caba7048 src/vs/workbench/test/electron-browser/api/extHostTypes.test.ts
diff --git a/app/test/fixtures/merge-parser/vscode/merge-release-1.24-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-release-1.24-into-master.txt
deleted file mode 100644
index 8b9edba48e6..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-release-1.24-into-master.txt
+++ /dev/null
@@ -1,579 +0,0 @@
-changed in both
-  base   100644 53b17e58366de7bf670af283e98d8170f721bd3e extensions/javascript/syntaxes/JavaScript.tmLanguage.json
-  our    100644 2b6ae46fe6d19c8b95bd6a29234846bf007ccc13 extensions/javascript/syntaxes/JavaScript.tmLanguage.json
-  their  100644 4589797b3e3ab51baf099112731a6eb255d19c75 extensions/javascript/syntaxes/JavaScript.tmLanguage.json
-@@ -4,7 +4,11 @@
- 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
- 		"Once accepted there, we are happy to receive an update request."
- 	],
-+<<<<<<< .our
- 	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/858d33f03943e4ec040e81cbabbc3f7892157c18",
-+=======
-+	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/53ce68bc2e8abcfa9bce7fb555ccd60c5bacd11e",
-+>>>>>>> .their
- 	"name": "JavaScript (with React support)",
- 	"scopeName": "source.js",
- 	"patterns": [
-@@ -398,7 +402,11 @@
- 			"patterns": [
- 				{
- 					"name": "meta.var-single-variable.expr.js",
-+<<<<<<< .our
- 					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
-+=======
-+					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
-+>>>>>>> .their
- 					"beginCaptures": {
- 						"1": {
- 							"name": "meta.definition.variable.js entity.name.function.js"
-@@ -819,7 +827,11 @@
- 					}
- 				},
- 				{
-+<<<<<<< .our
- 					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
-+=======
-+					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
-+>>>>>>> .their
- 					"captures": {
- 						"1": {
- 							"name": "storage.modifier.js"
-@@ -1051,7 +1063,11 @@
- 							"include": "#comment"
- 						},
- 						{
-+<<<<<<< .our
- 							"match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(\\?)?(?=(\\?\\s*)?\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
-+=======
-+							"match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(\\?)?(?=(\\?\\s*)?\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
-+>>>>>>> .their
- 							"captures": {
- 								"1": {
- 									"name": "meta.definition.property.js entity.name.function.js"
-@@ -1881,7 +1897,11 @@
- 							"name": "keyword.operator.assignment.js"
- 						}
- 					},
-+<<<<<<< .our
- 					"end": "(?=\\}|;|^\\s*abstract\\b|^\\s*async\\b|^\\s*class\\b|^\\s*const\\b|^\\s*declare\\b|^\\s*enum\\b|^\\s*export\\b|^\\s*function\\b|^\\s*import\\b|^\\s*interface\\b|^\\s*let\\b|^\\s*module\\b|^\\s*namespace\\b|^\\s*return\\b|^\\s*type\\b|^\\s*var\\b)",
-+=======
-+					"end": "(?=\\}|;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\breturn\\b|\\btype\\b|\\bvar\\b)",
-+>>>>>>> .their
- 					"patterns": [
- 						{
- 							"include": "#type"
-@@ -2405,7 +2425,11 @@
- 				},
- 				{
- 					"name": "meta.object.member.js",
-+<<<<<<< .our
- 					"match": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=:\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
-+=======
-+					"match": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=:\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
-+>>>>>>> .their
- 					"captures": {
- 						"0": {
- 							"name": "meta.object-literal.key.js"
-@@ -2650,7 +2674,11 @@
- 					]
- 				},
- 				{
-+<<<<<<< .our
- 					"begin": "(?<=[(=,]|=>)\\s*(async)?(?=\\s*((((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*))?\\()|(<))\\s*$)",
-+=======
-+					"begin": "(?<=[(=,]|=>)\\s*(async)?(?=\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*))?\\(\\s*$)",
-+>>>>>>> .their
- 					"beginCaptures": {
- 						"1": {
- 							"name": "storage.modifier.async.js"
-@@ -3242,7 +3270,11 @@
- 					"include": "#object-identifiers"
- 				},
- 				{
-+<<<<<<< .our
- 					"match": "(?x)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n))",
-+=======
-+					"match": "(?x)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n))",
-+>>>>>>> .their
- 					"captures": {
- 						"1": {
- 							"name": "punctuation.accessor.js"
-changed in both
-  base   100644 53da32f2dfef29fc7904470b3ffcf3865bb509f1 extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json
-  our    100644 15eeb04d7fc8ceacaff6fc6cd8802f2b80285a4d extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json
-  their  100644 7fb037fb111e1359e096cb375aed27742f91425d extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json
-@@ -4,7 +4,11 @@
- 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
- 		"Once accepted there, we are happy to receive an update request."
- 	],
-+<<<<<<< .our
- 	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/858d33f03943e4ec040e81cbabbc3f7892157c18",
-+=======
-+	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/53ce68bc2e8abcfa9bce7fb555ccd60c5bacd11e",
-+>>>>>>> .their
- 	"name": "JavaScript (with React support)",
- 	"scopeName": "source.js.jsx",
- 	"patterns": [
-@@ -398,7 +402,11 @@
- 			"patterns": [
- 				{
- 					"name": "meta.var-single-variable.expr.js.jsx",
-+<<<<<<< .our
- 					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
-+=======
-+					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
-+>>>>>>> .their
- 					"beginCaptures": {
- 						"1": {
- 							"name": "meta.definition.variable.js.jsx entity.name.function.js.jsx"
-@@ -819,7 +827,11 @@
- 					}
- 				},
- 				{
-+<<<<<<< .our
- 					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
-+=======
-+					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
-+>>>>>>> .their
- 					"captures": {
- 						"1": {
- 							"name": "storage.modifier.js.jsx"
-@@ -1051,7 +1063,11 @@
- 							"include": "#comment"
- 						},
- 						{
-+<<<<<<< .our
- 							"match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(\\?)?(?=(\\?\\s*)?\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
-+=======
-+							"match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(\\?)?(?=(\\?\\s*)?\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
-+>>>>>>> .their
- 							"captures": {
- 								"1": {
- 									"name": "meta.definition.property.js.jsx entity.name.function.js.jsx"
-@@ -1881,7 +1897,11 @@
- 							"name": "keyword.operator.assignment.js.jsx"
- 						}
- 					},
-+<<<<<<< .our
- 					"end": "(?=\\}|;|^\\s*abstract\\b|^\\s*async\\b|^\\s*class\\b|^\\s*const\\b|^\\s*declare\\b|^\\s*enum\\b|^\\s*export\\b|^\\s*function\\b|^\\s*import\\b|^\\s*interface\\b|^\\s*let\\b|^\\s*module\\b|^\\s*namespace\\b|^\\s*return\\b|^\\s*type\\b|^\\s*var\\b)",
-+=======
-+					"end": "(?=\\}|;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\breturn\\b|\\btype\\b|\\bvar\\b)",
-+>>>>>>> .their
- 					"patterns": [
- 						{
- 							"include": "#type"
-@@ -2405,7 +2425,11 @@
- 				},
- 				{
- 					"name": "meta.object.member.js.jsx",
-+<<<<<<< .our
- 					"match": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=:\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
-+=======
-+					"match": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=:\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
-+>>>>>>> .their
- 					"captures": {
- 						"0": {
- 							"name": "meta.object-literal.key.js.jsx"
-@@ -2650,7 +2674,11 @@
- 					]
- 				},
- 				{
-+<<<<<<< .our
- 					"begin": "(?<=[(=,]|=>)\\s*(async)?(?=\\s*((((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*))?\\()|(<))\\s*$)",
-+=======
-+					"begin": "(?<=[(=,]|=>)\\s*(async)?(?=\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*))?\\(\\s*$)",
-+>>>>>>> .their
- 					"beginCaptures": {
- 						"1": {
- 							"name": "storage.modifier.async.js.jsx"
-@@ -3242,7 +3270,11 @@
- 					"include": "#object-identifiers"
- 				},
- 				{
-+<<<<<<< .our
- 					"match": "(?x)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n))",
-+=======
-+					"match": "(?x)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n))",
-+>>>>>>> .their
- 					"captures": {
- 						"1": {
- 							"name": "punctuation.accessor.js.jsx"
-changed in both
-  base   100644 d4d016549ea516dc492185d08e1fe77aaaf11a6d extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json
-  our    100644 6f5bc2d554d4b993862194364e4314708fd8eca1 extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json
-  their  100644 6cc1633cd14c87bdf961b4fb7ad5935ef0bc76bf extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json
-@@ -4,7 +4,11 @@
- 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
- 		"Once accepted there, we are happy to receive an update request."
- 	],
-+<<<<<<< .our
- 	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/858d33f03943e4ec040e81cbabbc3f7892157c18",
-+=======
-+	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/53ce68bc2e8abcfa9bce7fb555ccd60c5bacd11e",
-+>>>>>>> .their
- 	"name": "TypeScript",
- 	"scopeName": "source.ts",
- 	"patterns": [
-@@ -395,7 +399,11 @@
- 			"patterns": [
- 				{
- 					"name": "meta.var-single-variable.expr.ts",
-+<<<<<<< .our
- 					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
-+=======
-+					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
-+>>>>>>> .their
- 					"beginCaptures": {
- 						"1": {
- 							"name": "meta.definition.variable.ts entity.name.function.ts"
-@@ -816,7 +824,11 @@
- 					}
- 				},
- 				{
-+<<<<<<< .our
- 					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
-+=======
-+					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
-+>>>>>>> .their
- 					"captures": {
- 						"1": {
- 							"name": "storage.modifier.ts"
-@@ -1048,7 +1060,11 @@
- 							"include": "#comment"
- 						},
- 						{
-+<<<<<<< .our
- 							"match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(\\?)?(?=(\\?\\s*)?\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
-+=======
-+							"match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(\\?)?(?=(\\?\\s*)?\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
-+>>>>>>> .their
- 							"captures": {
- 								"1": {
- 									"name": "meta.definition.property.ts entity.name.function.ts"
-@@ -1878,7 +1894,11 @@
- 							"name": "keyword.operator.assignment.ts"
- 						}
- 					},
-+<<<<<<< .our
- 					"end": "(?=\\}|;|^\\s*abstract\\b|^\\s*async\\b|^\\s*class\\b|^\\s*const\\b|^\\s*declare\\b|^\\s*enum\\b|^\\s*export\\b|^\\s*function\\b|^\\s*import\\b|^\\s*interface\\b|^\\s*let\\b|^\\s*module\\b|^\\s*namespace\\b|^\\s*return\\b|^\\s*type\\b|^\\s*var\\b)",
-+=======
-+					"end": "(?=\\}|;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\breturn\\b|\\btype\\b|\\bvar\\b)",
-+>>>>>>> .their
- 					"patterns": [
- 						{
- 							"include": "#type"
-@@ -2402,7 +2422,11 @@
- 				},
- 				{
- 					"name": "meta.object.member.ts",
-+<<<<<<< .our
- 					"match": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=:\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
-+=======
-+					"match": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=:\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
-+>>>>>>> .their
- 					"captures": {
- 						"0": {
- 							"name": "meta.object-literal.key.ts"
-@@ -2647,7 +2671,11 @@
- 					]
- 				},
- 				{
-+<<<<<<< .our
- 					"begin": "(?<=[(=,]|=>)\\s*(async)?(?=\\s*((((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*))?\\()|(<))\\s*$)",
-+=======
-+					"begin": "(?<=[(=,]|=>)\\s*(async)?(?=\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*))?\\(\\s*$)",
-+>>>>>>> .their
- 					"beginCaptures": {
- 						"1": {
- 							"name": "storage.modifier.async.ts"
-@@ -3276,7 +3304,11 @@
- 					"include": "#object-identifiers"
- 				},
- 				{
-+<<<<<<< .our
- 					"match": "(?x)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n))",
-+=======
-+					"match": "(?x)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n))",
-+>>>>>>> .their
- 					"captures": {
- 						"1": {
- 							"name": "punctuation.accessor.ts"
-changed in both
-  base   100644 fb007fbda4e596b34b337c640ab8b6d3aeea2757 extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json
-  our    100644 bb8426dd8545f539e96003c5d63587a5dd97b111 extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json
-  their  100644 7f80b22ef0d0b6a51079e1f502d84871915abdcb extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json
-@@ -4,7 +4,11 @@
- 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
- 		"Once accepted there, we are happy to receive an update request."
- 	],
-+<<<<<<< .our
- 	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/858d33f03943e4ec040e81cbabbc3f7892157c18",
-+=======
-+	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/53ce68bc2e8abcfa9bce7fb555ccd60c5bacd11e",
-+>>>>>>> .their
- 	"name": "TypeScriptReact",
- 	"scopeName": "source.tsx",
- 	"patterns": [
-@@ -398,7 +402,11 @@
- 			"patterns": [
- 				{
- 					"name": "meta.var-single-variable.expr.tsx",
-+<<<<<<< .our
- 					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
-+=======
-+					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
-+>>>>>>> .their
- 					"beginCaptures": {
- 						"1": {
- 							"name": "meta.definition.variable.tsx entity.name.function.tsx"
-@@ -819,7 +827,11 @@
- 					}
- 				},
- 				{
-+<<<<<<< .our
- 					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
-+=======
-+					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
-+>>>>>>> .their
- 					"captures": {
- 						"1": {
- 							"name": "storage.modifier.tsx"
-@@ -1051,7 +1063,11 @@
- 							"include": "#comment"
- 						},
- 						{
-+<<<<<<< .our
- 							"match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(\\?)?(?=(\\?\\s*)?\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
-+=======
-+							"match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(\\?)?(?=(\\?\\s*)?\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
-+>>>>>>> .their
- 							"captures": {
- 								"1": {
- 									"name": "meta.definition.property.tsx entity.name.function.tsx"
-@@ -1881,7 +1897,11 @@
- 							"name": "keyword.operator.assignment.tsx"
- 						}
- 					},
-+<<<<<<< .our
- 					"end": "(?=\\}|;|^\\s*abstract\\b|^\\s*async\\b|^\\s*class\\b|^\\s*const\\b|^\\s*declare\\b|^\\s*enum\\b|^\\s*export\\b|^\\s*function\\b|^\\s*import\\b|^\\s*interface\\b|^\\s*let\\b|^\\s*module\\b|^\\s*namespace\\b|^\\s*return\\b|^\\s*type\\b|^\\s*var\\b)",
-+=======
-+					"end": "(?=\\}|;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\breturn\\b|\\btype\\b|\\bvar\\b)",
-+>>>>>>> .their
- 					"patterns": [
- 						{
- 							"include": "#type"
-@@ -2405,7 +2425,11 @@
- 				},
- 				{
- 					"name": "meta.object.member.tsx",
-+<<<<<<< .our
- 					"match": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=:\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
-+=======
-+					"match": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=:\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
-+>>>>>>> .their
- 					"captures": {
- 						"0": {
- 							"name": "meta.object-literal.key.tsx"
-@@ -2650,7 +2674,11 @@
- 					]
- 				},
- 				{
-+<<<<<<< .our
- 					"begin": "(?<=[(=,]|=>)\\s*(async)?(?=\\s*((((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*))?\\()|(<))\\s*$)",
-+=======
-+					"begin": "(?<=[(=,]|=>)\\s*(async)?(?=\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*))?\\(\\s*$)",
-+>>>>>>> .their
- 					"beginCaptures": {
- 						"1": {
- 							"name": "storage.modifier.async.tsx"
-@@ -3242,7 +3270,11 @@
- 					"include": "#object-identifiers"
- 				},
- 				{
-+<<<<<<< .our
- 					"match": "(?x)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n))",
-+=======
-+					"match": "(?x)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*([\\{\\[]\\s*)?$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n))",
-+>>>>>>> .their
- 					"captures": {
- 						"1": {
- 							"name": "punctuation.accessor.tsx"
-changed in both
-  base   100644 f7740f6c5a50619c495336b4ecd78310a514522b extensions/typescript-language-features/src/features/updatePathsOnRename.ts
-  our    100644 44c05cd7b4a3cb2ce3e58d0e3c657b60db530ec0 extensions/typescript-language-features/src/features/updatePathsOnRename.ts
-  their  100644 f7c955c5189c7d0d3e0e61bc7cb0cc0592873474 extensions/typescript-language-features/src/features/updatePathsOnRename.ts
-@@ -49,8 +49,12 @@
- 		oldResource: vscode.Uri,
- 		newResource: vscode.Uri,
- 	): Promise<void> {
-+<<<<<<< .our
- 		const targetResource = await this.getTargetResource(newResource);
- 		if (!targetResource) {
-+=======
-+		if (!this.client.apiVersion.has290Features()) {
-+>>>>>>> .their
- 			return;
- 		}
- 
-changed in both
-  base   100644 143b2f6d6691003b692132f3242e1302de8033f5 package.json
-  our    100644 d0e982ce0b76c5b1b5eb02b673e459e47f3353a4 package.json
-  their  100644 c6186f948e316ffb7f017413e3adb074051333e9 package.json
-@@ -1,7 +1,12 @@
- {
-   "name": "code-oss-dev",
-+<<<<<<< .our
-   "version": "1.27.0",
-   "distro": "a4155d9780fbbc94ead6cb3017dd0fc3806c57b8",
-+=======
-+  "version": "1.24.1",
-+  "distro": "680459b2b8617926a325b0e74e96429c21969bf5",
-+>>>>>>> .their
-   "author": {
-     "name": "Microsoft Corporation"
-   },
-changed in both
-  base   100644 2e0412c87323ab7e8ecd84310c5076ab40ccaaa2 src/vs/editor/common/config/editorOptions.ts
-  our    100644 3a51038033803eb3e426c81c8416ce7c260eb272 src/vs/editor/common/config/editorOptions.ts
-  their  100644 af780797a47f03fc8ce3e3dbfbc8122ddfee1924 src/vs/editor/common/config/editorOptions.ts
-changed in both
-  base   100644 09d8da09e7b542dd3ca1aabbc647d93df1d57cb9 src/vs/editor/contrib/find/findWidget.ts
-  our    100644 86cac532d3fcfd30096dff7b86c46b48fdf58ad8 src/vs/editor/contrib/find/findWidget.ts
-  their  100644 e430e8bc3a8b63c8dbb991632a5241b6394012ef src/vs/editor/contrib/find/findWidget.ts
-@@ -30,7 +30,10 @@
- import { Color } from 'vs/base/common/color';
- import { IConfigurationChangedEvent } from 'vs/editor/common/config/editorOptions';
- import { editorFindRangeHighlight, editorFindMatch, editorFindMatchHighlight, contrastBorder, inputBackground, editorWidgetBackground, inputActiveOptionBorder, widgetShadow, inputForeground, inputBorder, inputValidationInfoBackground, inputValidationInfoBorder, inputValidationWarningBackground, inputValidationWarningBorder, inputValidationErrorBackground, inputValidationErrorBorder, errorForeground, editorWidgetBorder, editorFindMatchBorder, editorFindMatchHighlightBorder, editorFindRangeHighlightBorder, editorWidgetResizeBorder } from 'vs/platform/theme/common/colorRegistry';
-+<<<<<<< .our
- import { ContextScopedFindInput, ContextScopedHistoryInputBox } from 'vs/platform/widget/browser/contextScopedHistoryWidget';
-+=======
-+>>>>>>> .their
- 
- 
- export interface IFindController {
-changed in both
-  base   100644 c47b0080fbf87cb625ba2e5e0185f138b3a06a21 src/vs/editor/contrib/multicursor/multicursor.ts
-  our    100644 c93314e994a890a64bbc5f911b3a9cc2b9d682f8 src/vs/editor/contrib/multicursor/multicursor.ts
-  their  100644 0517d7061a563732a64b9198e151c719f0d2805a src/vs/editor/contrib/multicursor/multicursor.ts
-changed in both
-  base   100644 2542de4c74b4c68119531ca244d91cfa723987dc src/vs/platform/theme/common/colorRegistry.ts
-  our    100644 674f67411d4ee542ee937fac9146ef0768ec982d src/vs/platform/theme/common/colorRegistry.ts
-  their  100644 81dba81236c08514fbe7bf4ee4b06b614bb30925 src/vs/platform/theme/common/colorRegistry.ts
-changed in both
-  base   100644 cc5ebbc10fc0d4f6dd48bb0f462a256dd2ce0f6d src/vs/workbench/api/node/extHost.api.impl.ts
-  our    100644 ea64898c5b15cfae4b4ab32d722f4ae4a68f831a src/vs/workbench/api/node/extHost.api.impl.ts
-  their  100644 6d9aa304416800a22ac22a4be8c285b95c16622d src/vs/workbench/api/node/extHost.api.impl.ts
-changed in both
-  base   100644 b2a57f738b5a0300393a92f1a08c3fb8612c78f8 src/vs/workbench/api/node/extHostLanguageFeatures.ts
-  our    100644 1742acf237818001f5cb6365f849de0335cd9323 src/vs/workbench/api/node/extHostLanguageFeatures.ts
-  their  100644 f64a05f70d0132b11dd613cbcceadfd96945eac5 src/vs/workbench/api/node/extHostLanguageFeatures.ts
-@@ -45,15 +45,25 @@
- 			if (isFalsyOrEmpty(value)) {
- 				return undefined;
- 			}
-+<<<<<<< .our
- 			if (value[0] instanceof DocumentSymbol) {
- 				return (<DocumentSymbol[]>value).map(typeConvert.DocumentSymbol.from);
- 			} else {
- 				return OutlineAdapter._asDocumentSymbolTree(resource, <SymbolInformation[]>value);
-+=======
-+			let [probe] = value;
-+			if (!(probe instanceof Hierarchy)) {
-+				value = OutlineAdapter._asSymbolHierarchy(resource, <SymbolInformation[]>value);
-+>>>>>>> .their
- 			}
- 		});
- 	}
- 
-+<<<<<<< .our
- 	private static _asDocumentSymbolTree(resource: URI, info: SymbolInformation[]): modes.DocumentSymbol[] {
-+=======
-+	private static _asSymbolHierarchy(resource: URI, info: SymbolInformation[]): vscode.Hierarchy<SymbolInformation2>[] {
-+>>>>>>> .their
- 		// first sort by start (and end) and then loop over all elements
- 		// and build a tree based on containment.
- 		info = info.slice(0).sort((a, b) => {
-@@ -66,6 +76,7 @@
- 		let res: modes.DocumentSymbol[] = [];
- 		let parentStack: modes.DocumentSymbol[] = [];
- 		for (let i = 0; i < info.length; i++) {
-+<<<<<<< .our
- 			let element = <modes.DocumentSymbol>{
- 				name: info[i].name,
- 				kind: typeConvert.SymbolKind.from(info[i].kind),
-@@ -74,6 +85,12 @@
- 				selectionRange: typeConvert.Range.from(info[i].location.range),
- 				children: []
- 			};
-+=======
-+			let element = new Hierarchy(new SymbolInformation2(info[i].name, '', info[i].kind, info[i].location.range, info[i].location));
-+			element.parent.containerName = info[i].containerName;
-+			element.parent.location = info[i].location; // todo@joh make this proper
-+			element.parent.location.uri = element.parent.location.uri || resource;
-+>>>>>>> .their
- 
- 			while (true) {
- 				if (parentStack.length === 0) {
-changed in both
-  base   100644 e1fb74ff1cc215fc6a46c2d970aa1393f85b2198 src/vs/workbench/browser/parts/quickinput/quickInput.css
-  our    100644 690286ea03324d7f2df24ff450315cac3c7620b3 src/vs/workbench/browser/parts/quickinput/quickInput.css
-  their  100644 630d3d6ba5f7b14b12d49ed0013a3f3315c4aab4 src/vs/workbench/browser/parts/quickinput/quickInput.css
-@@ -178,6 +178,7 @@
- 
- .quick-input-list .monaco-highlighted-label .highlight {
- 	font-weight: bold;
-+<<<<<<< .our
- }
- 
- .quick-input-list .quick-input-list-separator {
-@@ -219,3 +220,6 @@
- .quick-input-list .monaco-list-row.focused .quick-input-list-entry-action-bar {
- 	display: flex;
- }
-+=======
-+}
-+>>>>>>> .their
-changed in both
-  base   100644 26bb02d0714f539097ddcfd3a52172341fc976b1 src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.ts
-  our    100644 052de75c677677d839ae5533561df1d9238d3218 src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.ts
-  their  100644 6054a08b60be6125ac3d9ff0a4d8bfc55fc8c881 src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.ts
-@@ -106,7 +106,15 @@
- 		if (!this.galleryService.isEnabled()) {
- 			return;
- 		}
-+<<<<<<< .our
- 		if (language === 'en' || language.indexOf('en-') === 0) {
-+=======
-+		if (language !== 'en' && language.indexOf('en-') !== -1) {
-+			this.migrateToMarketplaceLanguagePack(language);
-+			return;
-+		}
-+		if (locale === 'en' || locale.indexOf('en-') !== -1) {
-+>>>>>>> .their
- 			return;
- 		}
- 		if (language === locale || languagePackSuggestionIgnoreList.indexOf(language) > -1) {
-changed in both
-  base   100644 a84fd8ff73d8149d0d3b508741c7d5156ac6c404 src/vs/workbench/parts/outline/electron-browser/outlinePanel.ts
-  our    100644 4c9c93b5db416a94d8f3ef592cd9bb2250cc84fb src/vs/workbench/parts/outline/electron-browser/outlinePanel.ts
-  their  100644 abff8b7c8f71a4075977d5aa785f34e8e2b8e635 src/vs/workbench/parts/outline/electron-browser/outlinePanel.ts
-changed in both
-  base   100644 692f6c7297ae4ecfe4c89fcc664f9d314e0f4cb4 src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
-  our    100644 9ef058f2994595d2b04a5e832c71a30592895aac src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
-  their  100644 b2489acad66cb662bdc0e51341736cf483af97f3 src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
-changed in both
-  base   100644 8106f9cf4837d1af9c2d120f313505b8d401b5ed src/vs/workbench/services/textfile/common/textFileEditorModel.ts
-  our    100644 6faef447dc315ab88c3c3c652840860db088fa46 src/vs/workbench/services/textfile/common/textFileEditorModel.ts
-  their  100644 a625dbdba080f632dc7bcb03189fe99f2b816171 src/vs/workbench/services/textfile/common/textFileEditorModel.ts
-@@ -676,7 +676,11 @@
- 			// be disposed if we are dirty, but if we are not dirty, save() and dispose() can still be triggered
- 			// one after the other without waiting for the save() to complete. If we are disposed(), we risk
- 			// saving contents to disk that are stale (see https://github.com/Microsoft/vscode/issues/50942).
-+<<<<<<< .our
- 			// To fix this issue, we will not store the contents to disk when we got disposed.
-+=======
-+			// To fix this issue, we will not store the contents to disk when we got disposed. 
-+>>>>>>> .their
- 			if (this.disposed) {
- 				return void 0;
- 			}
diff --git a/app/test/fixtures/merge-parser/vscode/merge-release-1.25-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-release-1.25-into-master.txt
deleted file mode 100644
index 14a3042cd64..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-release-1.25-into-master.txt
+++ /dev/null
@@ -1,465 +0,0 @@
-changed in both
-  base   100644 8bd391086c63e7d2c0212c0525f2937ee7bfb4da build/builtInExtensions.json
-  our    100644 b3efcd2cc657706605008661521b555c93a32c16 build/builtInExtensions.json
-  their  100644 ffd89036c8803c4cd97ebe92149bd3d48d2cba51 build/builtInExtensions.json
-@@ -6,7 +6,11 @@
- 	},
- 	{
- 		"name": "ms-vscode.node-debug2",
-+<<<<<<< .our
- 		"version": "1.27.0",
-+=======
-+		"version": "1.25.6",
-+>>>>>>> .their
- 		"repo": "https://github.com/Microsoft/vscode-node-debug2"
- 	}
- ]
-changed in both
-  base   100644 846455906afa95e037dce6798b5213966ce8222d build/win32/code.iss
-  our    100644 4be0ea854b517dc4646718ab1545b6dfa704cf00 build/win32/code.iss
-  their  100644 40a402dfb4dc4799a91a25f70178ced5a46cf55d build/win32/code.iss
-changed in both
-  base   100644 5feec27bcfc2c4423c8b8df0ea93b29e4a03f1f7 extensions/typescript-language-features/src/features/refactor.ts
-  our    100644 bdc5d4eb25e59b5aa85a3091db10f2ddd3528cf0 extensions/typescript-language-features/src/features/refactor.ts
-  their  100644 c4bc4b58116fd214087fb5dd24aecf94330c65b5 extensions/typescript-language-features/src/features/refactor.ts
-@@ -12,7 +12,11 @@
- import TelemetryReporter from '../utils/telemetry';
- import * as typeConverters from '../utils/typeConverters';
- import FormattingOptionsManager from './fileConfigurationManager';
-+<<<<<<< .our
- import { nulToken } from '../utils/cancellation';
-+=======
-+import TelemetryReporter from '../utils/telemetry';
-+>>>>>>> .their
- 
- 
- class ApplyRefactoringCommand implements Command {
-changed in both
-  base   100644 ac25ee879a5702b5417dbfcd118e424f1f6dcf09 extensions/typescript-language-features/src/features/updatePathsOnRename.ts
-  our    100644 44c05cd7b4a3cb2ce3e58d0e3c657b60db530ec0 extensions/typescript-language-features/src/features/updatePathsOnRename.ts
-  their  100644 6f2d1265275352fbd64631ff254616c125d2e07a extensions/typescript-language-features/src/features/updatePathsOnRename.ts
-@@ -81,6 +81,7 @@
- 		this.client.bufferSyncSupport.closeResource(targetResource);
- 		this.client.bufferSyncSupport.openTextDocument(document);
- 
-+<<<<<<< .our
- 		if (!this.client.apiVersion.gte(API.v300) && !fs.lstatSync(newResource.fsPath).isDirectory()) {
- 			// Workaround for https://github.com/Microsoft/vscode/issues/52967
- 			// Never attempt to update import paths if the file does not contain something the looks like an export
-@@ -95,6 +96,16 @@
- 			} catch {
- 				// noop
- 			}
-+=======
-+		// Workaround for https://github.com/Microsoft/vscode/issues/52967
-+		// Never attempt to update import paths if the file does not contain something the looks like an export
-+		const tree = await this.client.execute('navtree', { file: newFile });
-+		const hasExport = (node: Proto.NavigationTree): boolean => {
-+			return !!node.kindModifiers.match(/\bexport\b/g) || !!(node.childItems && node.childItems.some(hasExport));
-+		};
-+		if (!tree.body || !tree.body || !hasExport(tree.body)) {
-+			return;
-+>>>>>>> .their
- 		}
- 
- 		const edits = await this.getEditsForFileRename(targetFile, document, oldFile, newFile);
-changed in both
-  base   100644 1776fd1b8fc5bc4ce1baae7cccfb464b1443de0f extensions/typescript-language-features/src/languageProvider.ts
-  our    100644 aad5f1a3a446efc89ad145359c7294d5f16b3463 extensions/typescript-language-features/src/languageProvider.ts
-  their  100644 2d7cde5e693fbf4775515d3d4676e5aebb5588a3 extensions/typescript-language-features/src/languageProvider.ts
-@@ -57,6 +57,7 @@
- 
- 		const cachedResponse = new CachedNavTreeResponse();
- 
-+<<<<<<< .our
- 		this._register((await import('./features/completions')).register(selector, this.client, this.typingsStatus, this.fileConfigurationManager, this.commandManager));
- 		this._register((await import('./features/definitions')).register(selector, this.client));
- 		this._register((await import('./features/directiveCommentCompletions')).register(selector, this.client));
-@@ -78,6 +79,29 @@
- 		this._register((await import('./features/tagClosing')).register(selector, this.description.id, this.client));
- 		this._register((await import('./features/typeDefinitions')).register(selector, this.client));
- 		this._register((await import('./features/workspaceSymbols')).register(this.client, this.description.modeIds));
-+=======
-+		this.disposables.push((await import('./features/completions')).register(selector, this.client, this.typingsStatus, this.fileConfigurationManager, this.commandManager));
-+		this.disposables.push((await import('./features/definitions')).register(selector, this.client));
-+		this.disposables.push((await import('./features/directiveCommentCompletions')).register(selector, this.client));
-+		this.disposables.push((await import('./features/documentHighlight')).register(selector, this.client));
-+		this.disposables.push((await import('./features/documentSymbol')).register(selector, this.client));
-+		this.disposables.push((await import('./features/folding')).register(selector, this.client));
-+		this.disposables.push((await import('./features/formatting')).register(selector, this.description.id, this.client, this.fileConfigurationManager));
-+		this.disposables.push((await import('./features/hover')).register(selector, this.client));
-+		this.disposables.push((await import('./features/implementations')).register(selector, this.client));
-+		this.disposables.push((await import('./features/implementationsCodeLens')).register(selector, this.description.id, this.client, cachedResponse));
-+		this.disposables.push((await import('./features/jsDocCompletions')).register(selector, this.client, this.commandManager));
-+		this.disposables.push((await import('./features/organizeImports')).register(selector, this.client, this.commandManager, this.fileConfigurationManager));
-+		this.disposables.push((await import('./features/quickFix')).register(selector, this.client, this.fileConfigurationManager, this.commandManager, this.diagnosticsManager, this.telemetryReporter));
-+		this.disposables.push((await import('./features/refactor')).register(selector, this.client, this.fileConfigurationManager, this.commandManager, this.telemetryReporter));
-+		this.disposables.push((await import('./features/references')).register(selector, this.client));
-+		this.disposables.push((await import('./features/referencesCodeLens')).register(selector, this.description.id, this.client, cachedResponse));
-+		this.disposables.push((await import('./features/rename')).register(selector, this.client));
-+		this.disposables.push((await import('./features/signatureHelp')).register(selector, this.client));
-+		this.disposables.push((await import('./features/tagCompletion')).register(selector, this.client));
-+		this.disposables.push((await import('./features/typeDefinitions')).register(selector, this.client));
-+		this.disposables.push((await import('./features/workspaceSymbols')).register(this.client, this.description.modeIds));
-+>>>>>>> .their
- 	}
- 
- 	private configurationChanged(): void {
-changed in both
-  base   100644 6cc9a4487690489ab1f2354751ff2b534f871738 package.json
-  our    100644 d0e982ce0b76c5b1b5eb02b673e459e47f3353a4 package.json
-  their  100644 d5958777d145aaad96624386e3f1fcd8e387dce2 package.json
-@@ -1,7 +1,12 @@
- {
-   "name": "code-oss-dev",
-+<<<<<<< .our
-   "version": "1.27.0",
-   "distro": "a4155d9780fbbc94ead6cb3017dd0fc3806c57b8",
-+=======
-+  "version": "1.25.1",
-+  "distro": "7ee5cda9f4f44b2ba1f1ab290e48f86416914794",
-+>>>>>>> .their
-   "author": {
-     "name": "Microsoft Corporation"
-   },
-changed in both
-  base   100644 624bf52f0c1d18fe9c041c022bb840e64e96edd5 src/main.js
-  our    100644 711217d64e2bdc43f33652d0bed34caa052cc331 src/main.js
-  their  100644 7d265511c5057fed461012fddcb80006cedd137e src/main.js
-changed in both
-  base   100644 6f40d22b0a0d9c894087116b422adb9e70c03ec7 src/vs/base/browser/ui/grid/gridview.ts
-  our    100644 98a9d0ef79cfcb2cccb8ea7ccc636cfb83feac92 src/vs/base/browser/ui/grid/gridview.ts
-  their  100644 12619fee81c6d0fc863b46f8528e505c8d4b6492 src/vs/base/browser/ui/grid/gridview.ts
-changed in both
-  base   100644 50027d9528e91fb0da84b95631ae65eac487eaac src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
-  our    100644 547d1bd99d6c12bde8243ed7766b2a76f887438c src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
-  their  100644 6b7d5948a5b2b35ef32ed8aea90ac98d519d8692 src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
-@@ -43,6 +43,7 @@
- import { DialogChannelClient } from 'vs/platform/dialogs/common/dialogIpc';
- import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
- import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-+import { DefaultURITransformer } from 'vs/base/common/uriIpc';
- 
- export interface ISharedProcessConfiguration {
- 	readonly machineId: string;
-@@ -122,7 +123,7 @@
- 
- 		instantiationService2.invokeFunction(accessor => {
- 			const extensionManagementService = accessor.get(IExtensionManagementService);
--			const channel = new ExtensionManagementChannel(extensionManagementService);
-+			const channel = new ExtensionManagementChannel(extensionManagementService, DefaultURITransformer);
- 			server.registerChannel('extensions', channel);
- 
- 			// clean up deprecated extensions
-changed in both
-  base   100644 36aaa892ac0481a15e372be30383908b56430da0 src/vs/editor/common/config/editorOptions.ts
-  our    100644 3a51038033803eb3e426c81c8416ce7c260eb272 src/vs/editor/common/config/editorOptions.ts
-  their  100644 8849311e709a14c62dc77ba93331e2969f08e1f5 src/vs/editor/common/config/editorOptions.ts
-changed in both
-  base   100644 abdc0f2abd00809e900889eaeac08528308457ff src/vs/editor/contrib/contextmenu/contextmenu.ts
-  our    100644 75de2e1c6d180db9f729c47c03810626364e32ea src/vs/editor/contrib/contextmenu/contextmenu.ts
-  their  100644 a3467f32a75eb8b3b2b61853dd3424719022f4e7 src/vs/editor/contrib/contextmenu/contextmenu.ts
-changed in both
-  base   100644 41851050fb938f6ddce65964858a77fbffd8f896 src/vs/monaco.d.ts
-  our    100644 76dcf491ff9c1973ad61bf5d423713bb1a3b4e44 src/vs/monaco.d.ts
-  their  100644 f39717228d6c28b007f82d48ebe7581f96081e75 src/vs/monaco.d.ts
-changed in both
-  base   100644 c4b1e0f958cfbbec0a0675bf94187c9848646de2 src/vs/platform/actions/common/actions.ts
-  our    100644 f0ba370d22dfa5eb5e51b75ad8f132f6de5991a7 src/vs/platform/actions/common/actions.ts
-  their  100644 e05cc8aa5fe0a0cfd259305f15f9ee1393d3104e src/vs/platform/actions/common/actions.ts
-@@ -100,7 +100,6 @@
- 	static readonly MenubarTasksMenu = new MenuId();
- 	static readonly MenubarPreferencesMenu = new MenuId();
- 	static readonly MenubarHelpMenu = new MenuId();
--	static readonly MenubarTerminalMenu = new MenuId();
- 
- 	readonly id: string = String(MenuId.ID++);
- }
-changed in both
-  base   100644 882efb29b222defebde1b72f6ecb3808fa3890fc src/vs/platform/extensionManagement/common/extensionManagementIpc.ts
-  our    100644 4180af7c8a32f8775cf853609b970a93be7c71ba src/vs/platform/extensionManagement/common/extensionManagementIpc.ts
-  their  100644 fa3e8c9e7c4e60e86a7cccff0479e63ba95ba136 src/vs/platform/extensionManagement/common/extensionManagementIpc.ts
-@@ -33,7 +33,7 @@
- 	onUninstallExtension: Event<IExtensionIdentifier>;
- 	onDidUninstallExtension: Event<DidUninstallExtensionEvent>;
- 
--	constructor(private service: IExtensionManagementService) {
-+	constructor(private service: IExtensionManagementService, private uriTransformer: IURITransformer) {
- 		this.onInstallExtension = buffer(service.onInstallExtension, true);
- 		this.onDidInstallExtension = buffer(service.onDidInstallExtension, true);
- 		this.onUninstallExtension = buffer(service.onUninstallExtension, true);
-@@ -68,6 +68,10 @@
- 	private _transform(extension: ILocalExtension): ILocalExtension {
- 		return extension ? { ...extension, ...{ location: URI.revive(extension.location) } } : extension;
- 	}
-+
-+	private _transform(extension: ILocalExtension): ILocalExtension {
-+		return extension ? { ...extension, ...{ location: URI.revive(this.uriTransformer.transformIncoming(extension.location)) } } : extension;
-+	}
- }
- 
- export class ExtensionManagementChannelClient implements IExtensionManagementService {
-changed in both
-  base   100644 45c911be480d4252b5c2feb3f631a409891f6a5e src/vs/workbench/api/electron-browser/mainThreadTask.ts
-  our    100644 a1b5243fa6c16f6ebb0cd18d9a073d52f0a691f4 src/vs/workbench/api/electron-browser/mainThreadTask.ts
-  their  100644 754f6c50b7c309f9ef34d57f473e15fad3c532fc src/vs/workbench/api/electron-browser/mainThreadTask.ts
-changed in both
-  base   100644 28d47fa6e1503c8f44ed0d526835093c701dee55 src/vs/workbench/browser/parts/editor/editorPart.ts
-  our    100644 eac59365565330f2b5e7b163c09f8ed328092b53 src/vs/workbench/browser/parts/editor/editorPart.ts
-  their  100644 7ecdc0e61c001d20cff0489f4b1da532d006b30b src/vs/workbench/browser/parts/editor/editorPart.ts
-removed in local
-  base   100644 8d877ddba773ea69380df960922c3c7696804bd2 src/vs/workbench/browser/parts/menubar/menubar.contribution.ts
-  their  100644 13625f8f7aa72355b66c9b041d1a66efd9442098 src/vs/workbench/browser/parts/menubar/menubar.contribution.ts
-removed in local
-  base   100644 af50fa982b4df3c156e9d16ac924dfb3c2972d28 src/vs/workbench/browser/parts/menubar/menubarPart.ts
-  their  100644 1417435ebcfcc61bf7460d804d67d2f4c32c1ac7 src/vs/workbench/browser/parts/menubar/menubarPart.ts
-changed in both
-  base   100644 20bec65ef18bc36171eee04262e753b68e7662bc src/vs/workbench/common/editor/textEditorModel.ts
-  our    100644 9b21ddc8f8f66d45e79211963d5f02e9dc7e9bc2 src/vs/workbench/common/editor/textEditorModel.ts
-  their  100644 122b13bbd7da2f4454dc51dca86e22373449daad src/vs/workbench/common/editor/textEditorModel.ts
-@@ -74,6 +74,7 @@
- 	protected createTextEditorModel(value: ITextBufferFactory, resource?: URI, modeId?: string): TPromise<EditorModel> {
- 		const firstLineText = this.getFirstLineText(value);
- 		const mode = this.getOrCreateMode(this.modeService, modeId, firstLineText);
-+
- 		return TPromise.as(this.doCreateTextEditorModel(value, mode, resource));
- 	}
- 
-@@ -141,7 +142,15 @@
- 		return !!this.textEditorModelHandle;
- 	}
- 
-+<<<<<<< .our
- 	dispose(): void {
-+=======
-+	public isReadonly(): boolean {
-+		return true;
-+	}
-+
-+	public dispose(): void {
-+>>>>>>> .their
- 		if (this.modelDisposeListener) {
- 			this.modelDisposeListener.dispose(); // dispose this first because it will trigger another dispose() otherwise
- 			this.modelDisposeListener = null;
-changed in both
-  base   100644 c7033b68d95e91540e5a93f87828bde2d6a19834 src/vs/workbench/common/editor/untitledEditorModel.ts
-  our    100644 9515354418102e8a1da9c4f6fb0af8ad6b6a19e6 src/vs/workbench/common/editor/untitledEditorModel.ts
-  their  100644 8251ebe8bf4efff8891bf4a2064f8900af4d6029 src/vs/workbench/common/editor/untitledEditorModel.ts
-@@ -205,7 +205,18 @@
- 		this.contentChangeEventScheduler.schedule();
- 	}
- 
-+<<<<<<< .our
- 	isReadonly(): boolean {
- 		return false;
-+=======
-+	public isReadonly(): boolean {
-+		return false;
-+	}
-+
-+	public dispose(): void {
-+		super.dispose();
-+
-+		this.toDispose = dispose(this.toDispose);
-+>>>>>>> .their
- 	}
- }
-changed in both
-  base   100644 ac68914351a9871cc813542915a1d0e379a9d74a src/vs/workbench/electron-browser/workbench.ts
-  our    100644 78add76eb65984b5c27c1721cb6482b45327e839 src/vs/workbench/electron-browser/workbench.ts
-  their  100644 e24cc4a9842713ab60a2dbd7abd0afc655cc381f src/vs/workbench/electron-browser/workbench.ts
-@@ -1204,10 +1204,14 @@
- 	getTitleBarOffset(): number {
- 		let offset = 0;
- 		if (this.isVisible(Parts.TITLEBAR_PART)) {
-+<<<<<<< .our
- 			offset = this.workbenchLayout.partLayoutInfo.titlebar.height;
- 			if (isMacintosh || this.menubarVisibility === 'hidden') {
- 				offset /= browser.getZoomFactor();
- 			}
-+=======
-+			offset = this.getContainer(Parts.TITLEBAR_PART).getBoundingClientRect().height;
-+>>>>>>> .their
- 		}
- 
- 		return offset;
-changed in both
-  base   100644 60d0dda62027c05d2add84db47791887b955a87e src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.ts
-  our    100644 f5f797f7475b4322938933d0cca753c44a16a722 src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.ts
-  their  100644 992050fd3387e420c0042756dd9180fde4e1afbb src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.ts
-@@ -47,7 +47,10 @@
- import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
- import { getHover } from 'vs/editor/contrib/hover/getHover';
- import { IEditorHoverOptions } from 'vs/editor/common/config/editorOptions';
-+<<<<<<< .our
- import { CancellationToken } from 'vs/base/common/cancellation';
-+=======
-+>>>>>>> .their
- 
- const HOVER_DELAY = 300;
- const LAUNCH_JSON_REGEX = /launch\.json$/;
-changed in both
-  base   100644 784c508d624f46c7a3eb48d26984fdaa1a12c336 src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
-  our    100644 6f9d4a74f5feb07a450341f183980ee0a10455a9 src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
-  their  100644 fbaf724d4ad850ce9bc05970da8d952e476728c8 src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
-changed in both
-  base   100644 087b2553530b5e8800ff17836ff9495cd93ca4b5 src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts
-  our    100644 645a6674587a8dca8742c11040e726c40a9702ff src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts
-  their  100644 8af34dabf3b7a37d9cc7a493424a857e01eee402 src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts
-@@ -909,7 +909,12 @@
- 		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
- 		@IWindowService private windowService: IWindowService,
- 		@IExtensionService private extensionService: IExtensionService,
-+<<<<<<< .our
- 		@IExtensionEnablementService private extensionEnablementService: IExtensionEnablementService
-+=======
-+		@IExtensionEnablementService private extensionEnablementService: IExtensionEnablementService,
-+		@IExtensionManagementServerService private extensionManagementServerService: IExtensionManagementServerService
-+>>>>>>> .their
- 	) {
- 		super('extensions.reload', localize('reloadAction', "Reload"), ReloadAction.DisabledClass, false);
- 		this.throttler = new Throttler();
-@@ -945,6 +950,7 @@
- 
- 		if (installed && installed.local) {
- 			if (runningExtension) {
-+<<<<<<< .our
- 				const isDifferentVersionRunning = this.extension.version !== runningExtension.version;
- 				if (isDifferentVersionRunning && !isDisabled) {
- 					// Requires reload to run the updated extension
-@@ -959,6 +965,27 @@
- 					this.tooltip = localize('postDisableTooltip', "Reload to deactivate");
- 					this.reloadMessage = localize('postDisableMessage', "Reload this window to deactivate the extension '{0}'?", this.extension.displayName);
- 					return;
-+=======
-+				const runningExtensionServer = this.extensionManagementServerService.getExtensionManagementServer(runningExtension.extensionLocation);
-+				const installedExtensionServer = this.extensionManagementServerService.getExtensionManagementServer(installed.local.location);
-+				const isSameLocation = runningExtensionServer.location.toString() === installedExtensionServer.location.toString();
-+				if (isSameLocation) {
-+					const isDifferentVersionRunning = this.extension.version !== runningExtension.version;
-+					if (isDifferentVersionRunning && !isDisabled) {
-+						// Requires reload to run the updated extension
-+						this.enabled = true;
-+						this.tooltip = localize('postUpdateTooltip', "Reload to update");
-+						this.reloadMessage = localize('postUpdateMessage', "Reload this window to activate the updated extension '{0}'?", this.extension.displayName);
-+						return;
-+					}
-+					if (isDisabled) {
-+						// Requires reload to disable the extension
-+						this.enabled = true;
-+						this.tooltip = localize('postDisableTooltip', "Reload to deactivate");
-+						this.reloadMessage = localize('postDisableMessage', "Reload this window to deactivate the extension '{0}'?", this.extension.displayName);
-+						return;
-+					}
-+>>>>>>> .their
- 				}
- 			} else {
- 				if (!isDisabled) {
-changed in both
-  base   100644 f90c3f99801ba2dae0efb6a0bad811b1664eadcb src/vs/workbench/parts/extensions/electron-browser/extensionsList.ts
-  our    100644 f6663b8a9bc979c4729f336a07398208f26c4aab src/vs/workbench/parts/extensions/electron-browser/extensionsList.ts
-  their  100644 1f032611899e9e86ac54575598b7213e0ed40eaa src/vs/workbench/parts/extensions/electron-browser/extensionsList.ts
-@@ -148,7 +148,11 @@
- 		this.extensionService.getExtensions().then(runningExtensions => {
- 			if (installed && installed.local) {
- 				const installedExtensionServer = this.extensionManagementServerService.getExtensionManagementServer(installed.local.location);
-+<<<<<<< .our
- 				const isSameExtensionRunning = runningExtensions.some(e => areSameExtensions(e, extension) && installedExtensionServer.authority === this.extensionManagementServerService.getExtensionManagementServer(e.extensionLocation).authority);
-+=======
-+				const isSameExtensionRunning = runningExtensions.some(e => areSameExtensions(e, extension) && installedExtensionServer.location.toString() === this.extensionManagementServerService.getExtensionManagementServer(e.extensionLocation).location.toString());
-+>>>>>>> .their
- 				toggleClass(data.root, 'disabled', !isSameExtensionRunning);
- 			} else {
- 				removeClass(data.root, 'disabled');
-changed in both
-  base   100644 2fd5061fa0ef59bea2ef621a53b4b18462cb2ab6 src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
-  our    100644 3bfb6cffba943bf68a9fa9c24fb1903c66dd3fad src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
-  their  100644 e61c9d9603ab58041119d9c9bfe55f32f2b9fecd src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
-changed in both
-  base   100644 c8cf45c864489525c5ca5ac9282ec9bb725b9fc4 src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
-  our    100644 dde370485c80817a804989c810abe2f1db9c0966 src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
-  their  100644 b09e7e2b83eda3dce6e61d19528ca8c01654a074 src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
-@@ -18,7 +18,11 @@
- import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
- import {
- 	IExtensionManagementService, IExtensionGalleryService, ILocalExtension, IGalleryExtension, IQueryOptions, IExtensionManifest,
-+<<<<<<< .our
- 	InstallExtensionEvent, DidInstallExtensionEvent, LocalExtensionType, DidUninstallExtensionEvent, IExtensionEnablementService, IExtensionIdentifier, EnablementState, IExtensionManagementServerService
-+=======
-+	InstallExtensionEvent, DidInstallExtensionEvent, LocalExtensionType, DidUninstallExtensionEvent, IExtensionEnablementService, IExtensionIdentifier, EnablementState, IExtensionTipsService, ExtensionRecommendationSource, IExtensionRecommendation, IExtensionManagementServerService
-+>>>>>>> .their
- } from 'vs/platform/extensionManagement/common/extensionManagement';
- import { getGalleryExtensionIdFromLocal, getGalleryExtensionTelemetryData, getLocalExtensionTelemetryData, areSameExtensions, getMaliciousExtensionsSet } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
- import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-@@ -392,6 +396,10 @@
- 		@ILogService private logService: ILogService,
- 		@IProgressService2 private progressService: IProgressService2,
- 		@IExtensionService private runtimeExtensionService: IExtensionService,
-+<<<<<<< .our
-+=======
-+		@IExtensionTipsService private extensionTipsService: IExtensionTipsService,
-+>>>>>>> .their
- 		@IExtensionManagementServerService private extensionManagementServerService: IExtensionManagementServerService
- 	) {
- 		this.stateProvider = ext => this.getExtensionState(ext);
-@@ -921,7 +929,11 @@
- 				const installed = this.installed.filter(e => e.id === extension.id)[0];
- 				if (installed) {
- 					const server = this.extensionManagementServerService.getExtensionManagementServer(local.location);
-+<<<<<<< .our
- 					const existingLocal = installed.locals.filter(l => this.extensionManagementServerService.getExtensionManagementServer(l.location).authority === server.authority)[0];
-+=======
-+					const existingLocal = installed.locals.filter(l => this.extensionManagementServerService.getExtensionManagementServer(l.location).location.toString() === server.location.toString())[0];
-+>>>>>>> .their
- 					if (existingLocal) {
- 						const locals = [...installed.locals];
- 						locals.splice(installed.locals.indexOf(existingLocal), 1, local);
-changed in both
-  base   100644 3b4181ae3261b1fc6f1c4101e552a0737fdbc10b src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
-  our    100644 e0204febe1f4826a27ae39de6c0363afc38b208d src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
-  their  100644 3f363cbdbd20a083f904c78afcaef17a97acc0ee src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
-changed in both
-  base   100644 2944b605a8c79c885040f28e9aea7b0f4ce8537e src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.ts
-  our    100644 052de75c677677d839ae5533561df1d9238d3218 src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.ts
-  their  100644 340f821e0f471b5fe1c903386515436c2aa2b392 src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.ts
-@@ -119,8 +119,17 @@
- 					return;
- 				}
- 
-+<<<<<<< .our
- 				this.galleryService.query({ text: `tag:lp-${locale}` }).then(tagResult => {
- 					if (tagResult.total === 0) {
-+=======
-+				const extensionIdPostfix = this.getPossibleChineseMapping(locale);
-+				const ceintlExtensionSearch = this.galleryService.query({ names: [`MS-CEINTL.vscode-language-pack-${extensionIdPostfix}`], pageSize: 1 });
-+				const tagSearch = this.galleryService.query({ text: `tag:lp-${locale}`, pageSize: 1 });
-+
-+				TPromise.join([ceintlExtensionSearch, tagSearch]).then(([ceintlResult, tagResult]) => {
-+					if (ceintlResult.total === 0 && tagResult.total === 0) {
-+>>>>>>> .their
- 						return;
- 					}
- 
-changed in both
-  base   100644 d3e4aafb4b2489b636b76f422808928cdb0c614b src/vs/workbench/parts/preferences/browser/media/settingsEditor2.css
-  our    100644 4110f029469987a0e2ace30d646c3e131c94b3df src/vs/workbench/parts/preferences/browser/media/settingsEditor2.css
-  their  100644 b3b54ddc0cc8819221ba656ab1ea6db9f11777ed src/vs/workbench/parts/preferences/browser/media/settingsEditor2.css
-@@ -145,6 +145,10 @@
- 	display: none;
- }
- 
-+.settings-editor.search-mode > .settings-body .settings-tree-container {
-+	max-width: 1100px;
-+}
-+
- .settings-editor.narrow > .settings-body .settings-toc-container {
- 	display: none;
- }
-changed in both
-  base   100644 e86b79e6e54b305bee0ea2280bed13919947971b src/vs/workbench/parts/preferences/browser/settingsTree.ts
-  our    100644 480a73351c9d0eb61722fdd061a2a00dcd5a9574 src/vs/workbench/parts/preferences/browser/settingsTree.ts
-  their  100644 ac53257f46e9fb1fbbe9d88968ea4e3cc217a18b src/vs/workbench/parts/preferences/browser/settingsTree.ts
-changed in both
-  base   100644 f1dcc32c086e0e516f5ce4d907200f95e09c4b64 src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
-  our    100644 c3c0cf180a612dfd0808a2c895eadf00aadfc391 src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
-  their  100644 573b50f75fba7303d9887c5a26a3fab9a2b3bebb src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
diff --git a/app/test/fixtures/merge-parser/vscode/merge-release-1.26-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-release-1.26-into-master.txt
deleted file mode 100644
index 60b0e72730b..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-release-1.26-into-master.txt
+++ /dev/null
@@ -1,682 +0,0 @@
-changed in both
-  base   100644 8f167afc9049e8db15fd3175ce33a6ad4738b9f1 OSSREADME.json
-  our    100644 e15cccabcadbd5afb0980967f0af53c135710fc0 OSSREADME.json
-  their  100644 ddfe2a1fa05af54ab5c44aeb8a7cdcafcf729f19 OSSREADME.json
-@@ -51,7 +51,11 @@
- },
- {
- 	"name": "electron",
-+<<<<<<< .our
- 	"version": "2.0.7",
-+=======
-+	"version": "2.0.5",
-+>>>>>>> .their
- 	"license": "MIT",
- 	"repositoryURL": "https://github.com/electron/electron",
- 	"isProd": true
-changed in both
-  base   100644 663f81987ccc076e4b3e08e95663fdd475e09b93 build/builtInExtensions.json
-  our    100644 b3efcd2cc657706605008661521b555c93a32c16 build/builtInExtensions.json
-  their  100644 e607dada4f85a5d32fa133c9fb0ea836f3a1d185 build/builtInExtensions.json
-@@ -6,7 +6,11 @@
- 	},
- 	{
- 		"name": "ms-vscode.node-debug2",
-+<<<<<<< .our
- 		"version": "1.27.0",
-+=======
-+		"version": "1.26.8",
-+>>>>>>> .their
- 		"repo": "https://github.com/Microsoft/vscode-node-debug2"
- 	}
- ]
-changed in both
-  base   100644 41c826ea71b62bf0e564ddfcac99872abd92bebd extensions/typescript-language-features/package.json
-  our    100644 1f06df0476dc5d308133ff5129ffa65d8caeb6fb extensions/typescript-language-features/package.json
-  their  100644 0e50c0c15cdeb80e9ed53ea6f9b29d65b68939c2 extensions/typescript-language-features/package.json
-changed in both
-  base   100644 4a4588e38b35333ba0d79b6b7a3f80a890cbf3bb package.json
-  our    100644 d0e982ce0b76c5b1b5eb02b673e459e47f3353a4 package.json
-  their  100644 25d4af6706ee427a7162e0db0c5e8742bf8ec3d2 package.json
-@@ -1,7 +1,12 @@
- {
-   "name": "code-oss-dev",
-+<<<<<<< .our
-   "version": "1.27.0",
-   "distro": "a4155d9780fbbc94ead6cb3017dd0fc3806c57b8",
-+=======
-+  "version": "1.26.1",
-+  "distro": "73cb7173636931afba8d741be343ceafb11a177e",
-+>>>>>>> .their
-   "author": {
-     "name": "Microsoft Corporation"
-   },
-@@ -49,7 +54,11 @@
-     "vscode-nsfw": "1.0.17",
-     "vscode-ripgrep": "1.1.0",
-     "vscode-textmate": "^4.0.1",
-+<<<<<<< .our
-     "vscode-xterm": "3.7.0-beta4",
-+=======
-+    "vscode-xterm": "3.6.0-beta13",
-+>>>>>>> .their
-     "winreg": "^1.2.4",
-     "yauzl": "^2.9.1"
-   },
-changed in both
-  base   100644 c09f6334b7f4654eacac6cfeb531defabef081f3 src/vs/base/common/resources.ts
-  our    100644 53357fe29f5f8919d794f7850dfaffd61f179591 src/vs/base/common/resources.ts
-  their  100644 af2d8eaa6a157d980ae81406148fe28fc4ea1dbf src/vs/base/common/resources.ts
-changed in both
-  base   100644 1b10a58da57e62ebfcbf4235da835802bbb3c050 src/vs/code/electron-main/app.ts
-  our    100644 c0185b039e95315e65379ca7cda7ff397219bdf9 src/vs/code/electron-main/app.ts
-  their  100644 a52ce64b90dbb29413f31e75d30df26f5dfeaaca src/vs/code/electron-main/app.ts
-@@ -63,10 +63,15 @@
- import { IMenubarService } from 'vs/platform/menubar/common/menubar';
- import { MenubarService } from 'vs/platform/menubar/electron-main/menubarService';
- import { MenubarChannel } from 'vs/platform/menubar/common/menubarIpc';
-+<<<<<<< .our
- import { IUriLabelService } from 'vs/platform/uriLabel/common/uriLabel';
- import { CodeMenu } from 'vs/code/electron-main/menus';
- import { hasArgs } from 'vs/platform/environment/node/argv';
- import { RunOnceScheduler } from 'vs/base/common/async';
-+=======
-+import { IUriDisplayService } from 'vs/platform/uriDisplay/common/uriDisplay';
-+import { CodeMenu } from 'vs/code/electron-main/menus';
-+>>>>>>> .their
- 
- export class CodeApplication {
- 
-changed in both
-  base   100644 b4bd6f0412ba41d3832e7c6c08b5ded48bc13c7a src/vs/code/electron-main/menubar.ts
-  our    100644 1bbfd9834bb83d9b49a3ce4b6f9cd46089cd2168 src/vs/code/electron-main/menubar.ts
-  their  100644 5605ff20117fd1390258d6c9f76e72f18eec8c26 src/vs/code/electron-main/menubar.ts
-@@ -252,15 +252,6 @@
- 			menubar.append(gotoMenuItem);
- 		}
- 
--		// Terminal
--		const terminalMenu = new Menu();
--		const terminalMenuItem = new MenuItem({ label: this.mnemonicLabel(nls.localize({ key: 'mTerminal', comment: ['&& denotes a mnemonic'] }, "Ter&&minal")), submenu: terminalMenu });
--
--		if (this.shouldDrawMenu('Terminal')) {
--			this.setMenuById(terminalMenu, 'Terminal');
--			menubar.append(terminalMenuItem);
--		}
--
- 		// Debug
- 		const debugMenu = new Menu();
- 		const debugMenuItem = new MenuItem({ label: this.mnemonicLabel(nls.localize({ key: 'mDebug', comment: ['&& denotes a mnemonic'] }, "&&Debug")), submenu: debugMenu });
-added in both
-  our    100644 9d5657cff26b159c842f9790d6387967d829e168 src/vs/code/electron-main/menus.ts
-  their  100644 e367f93d5c309e6d05c32b9a7f8b5f8c944ada12 src/vs/code/electron-main/menus.ts
-@@ -24,7 +24,11 @@
- import { IHistoryMainService } from 'vs/platform/history/common/history';
- import { IWorkspaceIdentifier, getWorkspaceLabel, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
- import URI from 'vs/base/common/uri';
-+<<<<<<< .our
- import { IUriLabelService } from 'vs/platform/uriLabel/common/uriLabel';
-+=======
-+import { IUriDisplayService } from 'vs/platform/uriDisplay/common/uriDisplay';
-+>>>>>>> .their
- 
- interface IMenuItemClickHandler {
- 	inDevTools: (contents: Electron.WebContents) => void;
-@@ -68,7 +72,11 @@
- 		@IEnvironmentService private environmentService: IEnvironmentService,
- 		@ITelemetryService private telemetryService: ITelemetryService,
- 		@IHistoryMainService private historyMainService: IHistoryMainService,
-+<<<<<<< .our
- 		@IUriLabelService private uriLabelService: IUriLabelService
-+=======
-+		@IUriDisplayService private uriDisplayService: IUriDisplayService
-+>>>>>>> .their
- 	) {
- 		this.nativeTabMenuItems = [];
- 
-@@ -242,11 +250,14 @@
- 		const gotoMenuItem = new MenuItem({ label: this.mnemonicLabel(nls.localize({ key: 'mGoto', comment: ['&& denotes a mnemonic'] }, "&&Go")), submenu: gotoMenu });
- 		this.setGotoMenu(gotoMenu);
- 
-+<<<<<<< .our
- 		// Terminal
- 		const terminalMenu = new Menu();
- 		const terminalMenuItem = new MenuItem({ label: this.mnemonicLabel(nls.localize({ key: 'mTerminal', comment: ['&& denotes a mnemonic'] }, "Ter&&minal")), submenu: terminalMenu });
- 		this.setTerminalMenu(terminalMenu);
- 
-+=======
-+>>>>>>> .their
- 		// Debug
- 		const debugMenu = new Menu();
- 		const debugMenuItem = new MenuItem({ label: this.mnemonicLabel(nls.localize({ key: 'mDebug', comment: ['&& denotes a mnemonic'] }, "&&Debug")), submenu: debugMenu });
-@@ -280,7 +291,10 @@
- 		menubar.append(selectionMenuItem);
- 		menubar.append(viewMenuItem);
- 		menubar.append(gotoMenuItem);
-+<<<<<<< .our
- 		menubar.append(terminalMenuItem);
-+=======
-+>>>>>>> .their
- 		menubar.append(debugMenuItem);
- 		menubar.append(taskMenuItem);
- 
-@@ -439,7 +453,10 @@
- 
- 	private getPreferencesMenu(): Electron.MenuItem {
- 		const settings = this.createMenuItem(nls.localize({ key: 'miOpenSettings', comment: ['&& denotes a mnemonic'] }, "&&Settings"), 'workbench.action.openSettings');
-+<<<<<<< .our
- 		const extensions = this.createMenuItem(nls.localize({ key: 'miOpenExtensions', comment: ['&& denotes a mnemonic'] }, '&&Extensions'), 'workbench.view.extensions');
-+=======
-+>>>>>>> .their
- 		const kebindingSettings = this.createMenuItem(nls.localize({ key: 'miOpenKeymap', comment: ['&& denotes a mnemonic'] }, "&&Keyboard Shortcuts"), 'workbench.action.openGlobalKeybindings');
- 		const keymapExtensions = this.createMenuItem(nls.localize({ key: 'miOpenKeymapExtensions', comment: ['&& denotes a mnemonic'] }, "&&Keymap Extensions"), 'workbench.extensions.action.showRecommendedKeymapExtensions');
- 		const snippetsSettings = this.createMenuItem(nls.localize({ key: 'miOpenSnippets', comment: ['&& denotes a mnemonic'] }, "User &&Snippets"), 'workbench.action.openSnippets');
-@@ -448,7 +465,10 @@
- 
- 		const preferencesMenu = new Menu();
- 		preferencesMenu.append(settings);
-+<<<<<<< .our
- 		preferencesMenu.append(extensions);
-+=======
-+>>>>>>> .their
- 		preferencesMenu.append(__separator__());
- 		preferencesMenu.append(kebindingSettings);
- 		preferencesMenu.append(keymapExtensions);
-@@ -496,6 +516,7 @@
- 		let label: string;
- 		let uri: URI;
- 		if (isSingleFolderWorkspaceIdentifier(workspace)) {
-+<<<<<<< .our
- 			label = unmnemonicLabel(getWorkspaceLabel(workspace, this.environmentService, this.uriLabelService, { verbose: true }));
- 			uri = workspace;
- 		} else if (isWorkspaceIdentifier(workspace)) {
-@@ -504,6 +525,16 @@
- 		} else {
- 			uri = URI.file(workspace);
- 			label = unmnemonicLabel(this.uriLabelService.getLabel(uri));
-+=======
-+			label = unmnemonicLabel(getWorkspaceLabel(workspace, this.environmentService, this.uriDisplayService, { verbose: true }));
-+			uri = workspace;
-+		} else if (isWorkspaceIdentifier(workspace)) {
-+			label = getWorkspaceLabel(workspace, this.environmentService, this.uriDisplayService, { verbose: true });
-+			uri = URI.file(workspace.configPath);
-+		} else {
-+			uri = URI.file(workspace);
-+			label = unmnemonicLabel(this.uriDisplayService.getLabel(uri));
-+>>>>>>> .their
- 		}
- 
- 		return new MenuItem(this.likeAction(commandId, {
-@@ -882,6 +913,7 @@
- 		].forEach(item => gotoMenu.append(item));
- 	}
- 
-+<<<<<<< .our
- 	private setTerminalMenu(terminalMenu: Electron.Menu): void {
- 		const newTerminal = this.createMenuItem(nls.localize({ key: 'miNewTerminal', comment: ['&& denotes a mnemonic'] }, "&&New Terminal"), 'workbench.action.terminal.new');
- 		const splitTerminal = this.createMenuItem(nls.localize({ key: 'miSplitTerminal', comment: ['&& denotes a mnemonic'] }, "&&Split Terminal"), 'workbench.action.terminal.split');
-@@ -912,6 +944,8 @@
- 		menuItems.forEach(item => terminalMenu.append(item));
- 	}
- 
-+=======
-+>>>>>>> .their
- 	private setDebugMenu(debugMenu: Electron.Menu): void {
- 		const start = this.createMenuItem(nls.localize({ key: 'miStartDebugging', comment: ['&& denotes a mnemonic'] }, "&&Start Debugging"), 'workbench.action.debug.start');
- 		const startWithoutDebugging = this.createMenuItem(nls.localize({ key: 'miStartWithoutDebugging', comment: ['&& denotes a mnemonic'] }, "Start &&Without Debugging"), 'workbench.action.debug.run');
-@@ -973,7 +1007,10 @@
- 		if (this.currentEnableNativeTabs) {
- 			const hasMultipleWindows = this.windowsMainService.getWindowCount() > 1;
- 
-+<<<<<<< .our
- 			this.nativeTabMenuItems.push(this.createMenuItem(nls.localize('mNewTab', "New Tab"), 'workbench.action.newWindowTab'));
-+=======
-+>>>>>>> .their
- 			this.nativeTabMenuItems.push(this.createMenuItem(nls.localize('mShowPreviousTab', "Show Previous Tab"), 'workbench.action.showPreviousWindowTab', hasMultipleWindows));
- 			this.nativeTabMenuItems.push(this.createMenuItem(nls.localize('mShowNextTab', "Show Next Tab"), 'workbench.action.showNextWindowTab', hasMultipleWindows));
- 			this.nativeTabMenuItems.push(this.createMenuItem(nls.localize('mMoveTabToNewWindow', "Move Tab to New Window"), 'workbench.action.moveWindowTabToNewWindow', hasMultipleWindows));
-@@ -1319,4 +1356,8 @@
- 
- function __separator__(): Electron.MenuItem {
- 	return new MenuItem({ type: 'separator' });
-+<<<<<<< .our
-+}
-+=======
- }
-+>>>>>>> .their
-merged
-  result 100644 5bb9d8adba33a0c638cc28e059bc992ac40add8b src/vs/platform/actions/common/actions.ts
-  our    100644 f0ba370d22dfa5eb5e51b75ad8f132f6de5991a7 src/vs/platform/actions/common/actions.ts
-@@ -100,7 +100,6 @@
- 	static readonly MenubarTasksMenu = new MenuId();
- 	static readonly MenubarPreferencesMenu = new MenuId();
- 	static readonly MenubarHelpMenu = new MenuId();
--	static readonly MenubarTerminalMenu = new MenuId();
- 
- 	readonly id: string = String(MenuId.ID++);
- }
-changed in both
-  base   100644 796cfaffb92a7933b73b49d3d7031e8a3ca9edd6 src/vs/platform/history/electron-main/historyMainService.ts
-  our    100644 3f2657d385162e51b58c9ce88c62add6ba3ec1a3 src/vs/platform/history/electron-main/historyMainService.ts
-  their  100644 518916342b01071767f2ff5be57db947566195ce src/vs/platform/history/electron-main/historyMainService.ts
-@@ -26,12 +26,20 @@
- 
- interface ISerializedRecentlyOpened {
- 	workspaces2: (IWorkspaceIdentifier | string)[]; // IWorkspaceIdentifier or URI.toString()
-+<<<<<<< .our
- 	files2: string[]; // files as URI.toString()
- }
- 
- interface ILegacySerializedRecentlyOpened {
- 	workspaces: (IWorkspaceIdentifier | string | UriComponents)[]; // legacy (UriComponents was also supported for a few insider builds)
- 	files: string[]; // files as paths
-+=======
-+	files: string[];
-+>>>>>>> .their
-+}
-+
-+interface ILegacySerializedRecentlyOpened {
-+	workspaces: (IWorkspaceIdentifier | string | UriComponents)[]; // legacy (UriComponents was also supported for a few insider builds)
- }
- 
- export class HistoryMainService implements IHistoryMainService {
-@@ -271,7 +279,10 @@
- 					}
- 				}
- 			} else if (Array.isArray(storedRecents.workspaces)) {
-+<<<<<<< .our
- 				// TODO@martin legacy support can be removed at some point (6 month?)
-+=======
-+>>>>>>> .their
- 				// format of 1.25 and before
- 				for (const workspace of storedRecents.workspaces) {
- 					if (typeof workspace === 'string') {
-@@ -284,6 +295,7 @@
- 					}
- 				}
- 			}
-+<<<<<<< .our
- 			if (Array.isArray(storedRecents.files2)) {
- 				for (const file of storedRecents.files2) {
- 					if (typeof file === 'string') {
-@@ -294,6 +306,12 @@
- 				for (const file of storedRecents.files) {
- 					if (typeof file === 'string') {
- 						result.files.push(URI.file(file));
-+=======
-+			if (Array.isArray(storedRecents.files)) {
-+				for (const file of storedRecents.files) {
-+					if (typeof file === 'string') {
-+						result.files.push(file);
-+>>>>>>> .their
- 					}
- 				}
- 			}
-@@ -302,7 +320,11 @@
- 	}
- 
- 	private saveRecentlyOpened(recent: IRecentlyOpened): void {
-+<<<<<<< .our
- 		const serialized: ISerializedRecentlyOpened = { workspaces2: [], files2: [] };
-+=======
-+		const serialized: ISerializedRecentlyOpened = { workspaces2: [], files: recent.files };
-+>>>>>>> .their
- 		for (const workspace of recent.workspaces) {
- 			if (isSingleFolderWorkspaceIdentifier(workspace)) {
- 				serialized.workspaces2.push(workspace.toString());
-@@ -310,9 +332,12 @@
- 				serialized.workspaces2.push(workspace);
- 			}
- 		}
-+<<<<<<< .our
- 		for (const file of recent.files) {
- 			serialized.files2.push(file.toString());
- 		}
-+=======
-+>>>>>>> .their
- 		this.stateService.setItem(HistoryMainService.recentlyOpenedStorageKey, serialized);
- 	}
- 
-changed in both
-  base   100644 b4ed6f55eab488ad1302bbc7e30d7ffe795635f7 src/vs/platform/node/product.ts
-  our    100644 dbb84fd473f8212ea96a20a8f12d66c5b703786a src/vs/platform/node/product.ts
-  their  100644 a3dce3929b2bca1fa088832dc9ee386e46db7224 src/vs/platform/node/product.ts
-changed in both
-  base   100644 b1543ed3d2f9f297cb6222076ea75e8d4a0186da src/vs/platform/theme/common/colorRegistry.ts
-  our    100644 674f67411d4ee542ee937fac9146ef0768ec982d src/vs/platform/theme/common/colorRegistry.ts
-  their  100644 8d984bd6f21c8450d851a4c038289b73296eec90 src/vs/platform/theme/common/colorRegistry.ts
-@@ -223,6 +223,14 @@
- 
- export const progressBarBackground = registerColor('progressBar.background', { dark: Color.fromHex('#0E70C0'), light: Color.fromHex('#0E70C0'), hc: contrastBorder }, nls.localize('progressBarBackground', "Background color of the progress bar that can show for long running operations."));
- 
-+<<<<<<< .our
-+=======
-+export const breadcrumbsForeground = registerColor('breadcrumb.foreground', { light: Color.fromHex('#6C6C6C').transparent(.7), dark: Color.fromHex('#CCCCCC').transparent(.7), hc: Color.white.transparent(.7) }, nls.localize('breadcrumbsFocusForeground', "Color of focused breadcrumb items."));
-+export const breadcrumbsFocusForeground = registerColor('breadcrumb.focusForeground', { light: '#6C6C6C', dark: '#CCCCCC', hc: Color.white }, nls.localize('breadcrumbsFocusForeground', "Color of focused breadcrumb items."));
-+export const breadcrumbsActiveSelectionForeground = registerColor('breadcrumb.activeSelectionForeground', { light: '#6C6C6C', dark: '#CCCCCC', hc: Color.white }, nls.localize('breadcrumbsSelectedForegound', "Color of selected breadcrumb items."));
-+export const breadcrumbsPickerBackground = registerColor('breadcrumbPicker.background', { light: '#ECECEC', dark: '#252526', hc: Color.black }, nls.localize('breadcrumbsSelectedBackground', "Background color of breadcrumb item picker."));
-+
-+>>>>>>> .their
- /**
-  * Editor background color.
-  * Because of bug https://monacotools.visualstudio.com/DefaultCollection/Monaco/_workitems/edit/13254
-removed in local
-  base   100644 486aeb0d77e7ff491c92249ce1081606b4bf9308 src/vs/platform/uriDisplay/common/uriDisplay.ts
-  their  100644 cd53cee444feaa967bf2275c495c16fe7fd790bb src/vs/platform/uriDisplay/common/uriDisplay.ts
-changed in both
-  base   100644 98eaf7888ca700629ba1266892ad9135c5089abf src/vs/workbench/api/node/apiCommands.ts
-  our    100644 d04d6b2334c914b4573cb10d4adea8925172017a src/vs/workbench/api/node/apiCommands.ts
-  their  100644 156a9b18147954d4dca508b961735e338eaf27c1 src/vs/workbench/api/node/apiCommands.ts
-@@ -12,6 +12,7 @@
- import { ITextEditorOptions } from 'vs/platform/editor/common/editor';
- import { EditorViewColumn } from 'vs/workbench/api/shared/editor';
- import { EditorGroupLayout } from 'vs/workbench/services/group/common/editorGroupsService';
-+import { isWindows } from 'vs/base/common/platform';
- 
- // -----------------------------------------------------------------
- // The following commands are registered on both sides separately.
-@@ -49,11 +50,18 @@
- 		if (!uri) {
- 			return executor.executeCommand('_files.pickFolderAndOpen', forceNewWindow);
- 		}
-+<<<<<<< .our
- 		let correctedUri = isMalformedFileUri(uri);
- 		if (correctedUri) {
- 			// workaround for #55916 and #55891, will be removed in 1.28
- 			console.warn(`'vscode.openFolder' command invoked with an invalid URI (file:// scheme missing): '${uri}'. Converted to a 'file://' URI: ${correctedUri}`);
- 			uri = correctedUri;
-+=======
-+		if (!uri.scheme || isWindows && uri.scheme.match(/^[a-zA-Z]$/)) {
-+			// workaround for #55916 and #55891, will be removed in 1.28
-+			console.warn(`'vscode.openFolder' command invoked with an invalid URI (file:// scheme missing): '${uri}'. Converted to a 'file://' URI.`);
-+			uri = URI.file((uri.scheme ? uri.scheme + ':' : '') + uri.path);
-+>>>>>>> .their
- 		}
- 
- 		return executor.executeCommand('_files.windowOpen', [uri], forceNewWindow);
-removed in local
-  base   100644 39c87100cce551f263420f6904834d778e9e2aab src/vs/workbench/browser/parts/menubar/menubar.contribution.ts
-  their  100644 04235f1557ddc62d458e20a7ae6f23675f8ef542 src/vs/workbench/browser/parts/menubar/menubar.contribution.ts
-removed in local
-  base   100644 b0cbfbf570f3193ab5f142bbbcca373b9c12cb5c src/vs/workbench/browser/parts/menubar/menubarPart.ts
-  their  100644 2f7e0891892de9bf1d0e8e3cd9b1ad8c6074f822 src/vs/workbench/browser/parts/menubar/menubarPart.ts
-changed in both
-  base   100644 a63062b1035a2a74babcf30cad76bc5c5f7796ba src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
-  our    100644 428a391e24bbf78b82754330a477c9733d9d5fba src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
-  their  100644 e35dd586dd82181150897fae02f537e281974668 src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
-changed in both
-  base   100644 b6b6953d245256eb8e700f5bf342a1eb4d50d1cd src/vs/workbench/electron-browser/window.ts
-  our    100644 b19e6c63fa80338a757edd069d788b28e35bdcb8 src/vs/workbench/electron-browser/window.ts
-  their  100644 f46b093c862fdc9dffff201109d36a050fe88a9c src/vs/workbench/electron-browser/window.ts
-changed in both
-  base   100644 defea5dd0cce8b5e900820a926a0fabbb6b7e729 src/vs/workbench/electron-browser/workbench.ts
-  our    100644 78add76eb65984b5c27c1721cb6482b45327e839 src/vs/workbench/electron-browser/workbench.ts
-  their  100644 410d8fcc188d48692aae13c6ca35b5dec205e020 src/vs/workbench/electron-browser/workbench.ts
-changed in both
-  base   100644 b8d45826a4489e21e6c35732d6afcf0085a73e68 src/vs/workbench/parts/debug/electron-browser/debugService.ts
-  our    100644 a5e2dcee7a0eb14bc388d84c6c7cac591067b1b2 src/vs/workbench/parts/debug/electron-browser/debugService.ts
-  their  100644 61162e90a69902a792aaf58874d941a1a57435cc src/vs/workbench/parts/debug/electron-browser/debugService.ts
-@@ -171,7 +171,9 @@
- 			} else {
- 				const root = raw.root;
- 				raw.disconnect().done(undefined, errors.onUnexpectedError);
--				this.doCreateSession(root, { resolved: session.configuration, unresolved: session.unresolvedConfiguration }, session.getId());
-+				setTimeout(_ => {
-+					this.doCreateSession(root, { resolved: session.configuration, unresolved: session.unresolvedConfiguration }, session.getId());
-+				}, 1000);
- 			}
- 
- 			return;
-changed in both
-  base   100644 8fc5ed3bca172f911cb941e7aa300e1d97bd1963 src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
-  our    100644 3bfb6cffba943bf68a9fa9c24fb1903c66dd3fad src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
-  their  100644 70edc1d5fabc96d5d5c5cd512c403afdba337619 src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
-changed in both
-  base   100644 5930310b95e18f917a88acfaf6160b84a8974345 src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
-  our    100644 dde370485c80817a804989c810abe2f1db9c0966 src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
-  their  100644 650be5868e0a3cb324ea3b7eafdb27e1b21cf2a7 src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
-changed in both
-  base   100644 133884c00ddb28e203b90a104b3b006ab927d115 src/vs/workbench/parts/markers/electron-browser/markersTreeViewer.ts
-  our    100644 20ca3e0b0d0026e1148512f08c0b9be4edd11514 src/vs/workbench/parts/markers/electron-browser/markersTreeViewer.ts
-  their  100644 a9e50477237e7bfc3fcf42a389d4424882ce7e4a src/vs/workbench/parts/markers/electron-browser/markersTreeViewer.ts
-changed in both
-  base   100644 849d454f33dac6022061ddd66b34aa49cc0d4a06 src/vs/workbench/parts/splash/electron-browser/partsSplash.contribution.ts
-  our    100644 5f76b802ea5a6e6aafeb989856a8672f1d126c9d src/vs/workbench/parts/splash/electron-browser/partsSplash.contribution.ts
-  their  100644 4632aaf6efb6ed7dc220c62187dbb4c1320cda14 src/vs/workbench/parts/splash/electron-browser/partsSplash.contribution.ts
-@@ -17,8 +17,12 @@
- import { IDisposable, dispose } from 'vs/base/common/lifecycle';
- import { debounceEvent } from 'vs/base/common/event';
- import { DEFAULT_EDITOR_MIN_DIMENSIONS } from 'vs/workbench/browser/parts/editor/editor';
-+<<<<<<< .our
- import { ColorIdentifier, editorBackground, foreground } from 'vs/platform/theme/common/colorRegistry';
- import { Color } from 'vs/base/common/color';
-+=======
-+import { ColorIdentifier } from 'vs/platform/theme/common/colorRegistry';
-+>>>>>>> .their
- 
- class PartsSplash {
- 
-@@ -45,10 +49,14 @@
- 	}
- 
- 	private _savePartsSplash() {
-+<<<<<<< .our
- 		const baseTheme = getThemeTypeSelector(this._themeService.getTheme().type);
- 		const colorInfo = {
- 			foreground: this._getThemeColor(foreground),
- 			editorBackground: this._getThemeColor(editorBackground),
-+=======
-+		const colorInfo = {
-+>>>>>>> .their
- 			titleBarBackground: this._getThemeColor(themes.TITLE_BAR_ACTIVE_BACKGROUND),
- 			activityBarBackground: this._getThemeColor(themes.ACTIVITY_BAR_BACKGROUND),
- 			sideBarBackground: this._getThemeColor(themes.SIDE_BAR_BACKGROUND),
-@@ -82,6 +90,12 @@
- 		return color ? color.toString() : undefined;
- 	}
- 
-+	private _getThemeColor(id: ColorIdentifier): string {
-+		const theme = this._themeService.getTheme();
-+		const color = theme.getColor(id);
-+		return color ? color.toString() : undefined;
-+	}
-+
- 	private _removePartsSplash(): void {
- 		let element = document.getElementById(PartsSplash._splashElementId);
- 		if (element) {
-removed in remote
-  base   100644 52498a02f5195349043389a3f51361135c2c0723 src/vs/workbench/parts/terminal/common/terminalMenu.ts
-  our    100644 52498a02f5195349043389a3f51361135c2c0723 src/vs/workbench/parts/terminal/common/terminalMenu.ts
-@@ -1,120 +0,0 @@
--/*---------------------------------------------------------------------------------------------
-- *  Copyright (c) Microsoft Corporation. All rights reserved.
-- *  Licensed under the MIT License. See License.txt in the project root for license information.
-- *--------------------------------------------------------------------------------------------*/
--
--import * as nls from 'vs/nls';
--import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
--import { TERMINAL_COMMAND_ID } from 'vs/workbench/parts/terminal/common/terminalCommands';
--import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
--
--export function setupTerminalMenu() {
--
--	// View menu
--
--	MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
--		group: '4_panels',
--		command: {
--			id: TERMINAL_COMMAND_ID.TOGGLE,
--			title: nls.localize({ key: 'miToggleIntegratedTerminal', comment: ['&& denotes a mnemonic'] }, "&&Integrated Terminal")
--		},
--		order: 3
--	});
--
--	// Manage
--	const manageGroup = '1_manage';
--	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
--		group: manageGroup,
--		command: {
--			id: TERMINAL_COMMAND_ID.NEW,
--			title: nls.localize({ key: 'miNewTerminal', comment: ['&& denotes a mnemonic'] }, "&&New Terminal")
--		},
--		order: 1
--	});
--	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
--		group: manageGroup,
--		command: {
--			id: TERMINAL_COMMAND_ID.SPLIT,
--			title: nls.localize({ key: 'miSplitTerminal', comment: ['&& denotes a mnemonic'] }, "&&Split Terminal"),
--			precondition: ContextKeyExpr.has('terminalIsOpen')
--		},
--		order: 2
--	});
--
--	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
--		group: manageGroup,
--		command: {
--			id: TERMINAL_COMMAND_ID.KILL,
--			title: nls.localize({ key: 'miKillTerminal', comment: ['&& denotes a mnemonic'] }, "&&Kill Terminal"),
--			precondition: ContextKeyExpr.has('terminalIsOpen')
--		},
--		order: 3
--	});
--
--	// Run
--	const runGroup = '2_run';
--	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
--		group: runGroup,
--		command: {
--			id: TERMINAL_COMMAND_ID.CLEAR,
--			title: nls.localize({ key: 'miClear', comment: ['&& denotes a mnemonic'] }, "&&Clear"),
--			precondition: ContextKeyExpr.has('terminalIsOpen')
--		},
--		order: 1
--	});
--	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
--		group: runGroup,
--		command: {
--			id: TERMINAL_COMMAND_ID.RUN_ACTIVE_FILE,
--			title: nls.localize({ key: 'miRunActiveFile', comment: ['&& denotes a mnemonic'] }, "Run &&Active File")
--		},
--		order: 2
--	});
--	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
--		group: runGroup,
--		command: {
--			id: TERMINAL_COMMAND_ID.RUN_SELECTED_TEXT,
--			title: nls.localize({ key: 'miRunSelectedText', comment: ['&& denotes a mnemonic'] }, "Run &&Selected Text")
--		},
--		order: 3
--	});
--
--	// Navigation
--	const navigationGroup = '3_navigation';
--	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
--		group: navigationGroup,
--		command: {
--			id: TERMINAL_COMMAND_ID.SCROLL_TO_PREVIOUS_COMMAND,
--			title: nls.localize({ key: 'miScrollToPreviousCommand', comment: ['&& denotes a mnemonic'] }, "Scroll To Previous Command"),
--			precondition: ContextKeyExpr.has('terminalIsOpen')
--		},
--		order: 1
--	});
--	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
--		group: navigationGroup,
--		command: {
--			id: TERMINAL_COMMAND_ID.SCROLL_TO_NEXT_COMMAND,
--			title: nls.localize({ key: 'miScrollToNextCommand', comment: ['&& denotes a mnemonic'] }, "Scroll To Next Command"),
--			precondition: ContextKeyExpr.has('terminalIsOpen')
--		},
--		order: 2
--	});
--	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
--		group: navigationGroup,
--		command: {
--			id: TERMINAL_COMMAND_ID.SELECT_TO_PREVIOUS_COMMAND,
--			title: nls.localize({ key: 'miSelectToPreviousCommand', comment: ['&& denotes a mnemonic'] }, "Select To Previous Command"),
--			precondition: ContextKeyExpr.has('terminalIsOpen')
--		},
--		order: 3
--	});
--	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
--		group: navigationGroup,
--		command: {
--			id: TERMINAL_COMMAND_ID.SELECT_TO_NEXT_COMMAND,
--			title: nls.localize({ key: 'miSelectToNextCommand', comment: ['&& denotes a mnemonic'] }, "Select To Next Command"),
--			precondition: ContextKeyExpr.has('terminalIsOpen')
--		},
--		order: 4
--	});
--}
-changed in both
-  base   100644 4e288255067120a2f2e0e30d5b5c348f01427502 src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
-  our    100644 9ef058f2994595d2b04a5e832c71a30592895aac src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
-  their  100644 074c048a09cb976e2f5d590dbe917e65c877b811 src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
-@@ -37,7 +37,6 @@
- import { TerminalPanel } from 'vs/workbench/parts/terminal/electron-browser/terminalPanel';
- import { TerminalPickerHandler } from 'vs/workbench/parts/terminal/browser/terminalQuickOpen';
- import { setupTerminalCommands, TERMINAL_COMMAND_ID } from 'vs/workbench/parts/terminal/common/terminalCommands';
--import { setupTerminalMenu } from 'vs/workbench/parts/terminal/common/terminalMenu';
- 
- const quickOpenRegistry = (Registry.as<IQuickOpenRegistry>(QuickOpenExtensions.Quickopen));
- 
-@@ -535,6 +534,5 @@
- actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ToggleEscapeSequenceLoggingAction, ToggleEscapeSequenceLoggingAction.ID, ToggleEscapeSequenceLoggingAction.LABEL), 'Terminal: Toggle Escape Sequence Logging', category);
- 
- setupTerminalCommands();
--setupTerminalMenu();
- 
- registerColors();
-changed in both
-  base   100644 2ce9bd83b960352f59226489b3f1ae767fe7a82d src/vs/workbench/parts/update/electron-browser/update.ts
-  our    100644 2e468debc61fae01ce2d9c4b673a81993982cc62 src/vs/workbench/parts/update/electron-browser/update.ts
-  their  100644 04edd26fd77e5fc54160c4dd3155caa68d3b45ea src/vs/workbench/parts/update/electron-browser/update.ts
-@@ -249,10 +249,13 @@
- 		@IOpenerService private openerService: IOpenerService,
- 		@IUpdateService private updateService: IUpdateService
- 	) {
-+<<<<<<< .our
- 		if (!environmentService.isBuilt) {
- 			return;
- 		}
- 
-+=======
-+>>>>>>> .their
- 		const neverShowAgain = new NeverShowAgain(WinUserSetupContribution.KEY_BOTH, this.storageService);
- 
- 		if (!neverShowAgain.shouldShow()) {
-@@ -267,12 +270,22 @@
- 			}
- 
- 			const handle = this.notificationService.prompt(
-+<<<<<<< .our
- 				severity.Info,
- 				nls.localize('usersetupsystem', "You are running the system-wide installation of {0}, while having the user-wide distribution installed as well.", product.nameShort),
- 				[
- 					{ label: nls.localize('ok', "OK"), run: () => null },
- 					{
- 						label: nls.localize('okneveragain', "OK, Don't Show Again"),
-+=======
-+				severity.Warning,
-+				nls.localize('usersetupsystem', "You are running the system-wide installation of {0}, while having the user-wide distribution installed as well. Make sure you're running the {0} version you expect.", product.nameShort),
-+				[
-+					{ label: nls.localize('ok', "OK"), run: () => null },
-+					{
-+						label: nls.localize('neveragain', "Don't Show Again"),
-+						isSecondary: true,
-+>>>>>>> .their
- 						run: () => {
- 							neverShowAgain.action.run(handle);
- 							neverShowAgain.action.dispose();
-changed in both
-  base   100644 f89264988a1761e43f94e0ea3ab80f82af5dd51d src/vs/workbench/services/search/node/searchService.ts
-  our    100644 5bf7b93503cb5ecead2832c567244eabe2f261f3 src/vs/workbench/services/search/node/searchService.ts
-  their  100644 dc0755924b6bb358b0210a7219249145f473b921 src/vs/workbench/services/search/node/searchService.ts
-changed in both
-  base   100644 41e23fc99811fdb6c8d80ca026eef510574e9115 src/vs/workbench/services/textfile/common/textFileEditorModel.ts
-  our    100644 6faef447dc315ab88c3c3c652840860db088fa46 src/vs/workbench/services/textfile/common/textFileEditorModel.ts
-  their  100644 0c3642145b3164f68b07cbb474726b0f76c297bb src/vs/workbench/services/textfile/common/textFileEditorModel.ts
-changed in both
-  base   100644 b0b61b7a439360d1f66858259ab408ba819b2ea9 yarn.lock
-  our    100644 b56aa332449f9eb6db4b03a16548d91df21604bb yarn.lock
-  their  100644 79f54d1676d113d2142fe751cd1aa121ecbef2e3 yarn.lock
diff --git a/app/test/fixtures/merge-parser/vscode/merge-revert-54854-revert-52782-electron-2.0.x-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-revert-54854-revert-52782-electron-2.0.x-into-master.txt
deleted file mode 100644
index 0be5b3b51aa..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-revert-54854-revert-52782-electron-2.0.x-into-master.txt
+++ /dev/null
@@ -1,190 +0,0 @@
-changed in both
-  base   100644 42f08fa0c026dc955c1c38a589b499456fd2f8ae .yarnrc
-  our    100644 58d37cc88fb09a1944c25f4599a9bf93b42a143e .yarnrc
-  their  100644 f1749b387efcf5c522ec6acaf0e0c8382960783d .yarnrc
-@@ -1,3 +1,7 @@
- disturl "https://atom.io/download/electron"
-+<<<<<<< .our
- target "2.0.7"
-+=======
-+target "2.0.5"
-+>>>>>>> .their
- runtime "electron"
-changed in both
-  base   100644 57f7c2075ff5cf0b05321418a6084098965b3a60 resources/linux/debian/control.template
-  our    100644 92dbac93f4519bf4f00f1ab0f0ca33f18aa18e4c resources/linux/debian/control.template
-  their  100644 eeaf96e07513593270ee96b3d906fc11fd591cd0 resources/linux/debian/control.template
-@@ -1,7 +1,11 @@
- Package: @@NAME@@
- Version: @@VERSION@@
- Section: devel
-+<<<<<<< .our
- Depends: libnotify4, libnss3 (>= 2:3.26), gnupg, apt, libxkbfile1, libgconf-2-4, libsecret-1-0, libgtk-3-0 (>= 3.10.0)
-+=======
-+Depends: libnotify4, libnss3, gnupg, apt, libxkbfile1, libgconf-2-4, libsecret-1-0, libgtk-3-0 (>= 3.10.0)
-+>>>>>>> .their
- Priority: optional
- Architecture: @@ARCHITECTURE@@
- Maintainer: Microsoft Corporation <vscode-linux@microsoft.com>
-@@ -12,3 +16,4 @@
- Replaces: visual-studio-@@NAME@@
- Description: Code editing. Redefined.
-  Visual Studio Code is a new choice of tool that combines the simplicity of a code editor with what developers need for the core edit-build-debug cycle. See https://code.visualstudio.com/docs/setup/linux for installation instructions and FAQ.
-+ 
-\ No newline at end of file
-changed in both
-  base   100644 850cda67f2de3d7d6de63db9129e61e34ac9adfc src/main.js
-  our    100644 711217d64e2bdc43f33652d0bed34caa052cc331 src/main.js
-  their  100644 ca00474ba1ea0b5647cdef34a3531c0c0876a9c4 src/main.js
-@@ -81,8 +81,14 @@
- // TODO@Ben Electron 2.0.x: prevent localStorage migration from SQLite to LevelDB due to issues
- app.commandLine.appendSwitch('disable-mojo-local-storage');
- 
-+<<<<<<< .our
- // Force pre-Chrome-60 color profile handling (for https://github.com/Microsoft/vscode/issues/51791)
- app.commandLine.appendSwitch('disable-features', 'ColorCorrectRendering');
-+=======
-+// TODO@Ben Electron 2.0.x: force srgb color profile (for https://github.com/Microsoft/vscode/issues/51791)
-+// This also seems to fix: https://github.com/Microsoft/vscode/issues/48043
-+app.commandLine.appendSwitch('force-color-profile', 'srgb');
-+>>>>>>> .their
- 
- const minimist = require('minimist');
- const paths = require('./paths');
-changed in both
-  base   100644 a16543734c3c5a66df49e28645030928adff3601 src/vs/code/electron-main/app.ts
-  our    100644 c0185b039e95315e65379ca7cda7ff397219bdf9 src/vs/code/electron-main/app.ts
-  their  100644 c95434267003a093913ac7cf317ef317487f70f4 src/vs/code/electron-main/app.ts
-changed in both
-  base   100644 11099c63863158ce791a50976807924cc7992c1e src/vs/code/electron-main/window.ts
-  our    100644 98a4328213e146b214e8da866ab92dc7f9c449a9 src/vs/code/electron-main/window.ts
-  their  100644 a3cd3bc01d4191bea802c62dff4231efcfad508f src/vs/code/electron-main/window.ts
-changed in both
-  base   100644 387e34f62d12aec51cf02a0de623898952c85481 src/vs/editor/browser/widget/codeEditorWidget.ts
-  our    100644 6f588e16445e2740e0f36730ce132f1ff91e44d8 src/vs/editor/browser/widget/codeEditorWidget.ts
-  their  100644 fee65bb4dc381878a8d59e570e19caed611f11b3 src/vs/editor/browser/widget/codeEditorWidget.ts
-changed in both
-  base   100644 13f5812793c1f6fbf6783ce371ab7f7746ff736c src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
-  our    100644 52d0ff4ccf36e18a9e6bb376e85eb8574851026e src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
-  their  100644 298c940d475d37c5481344f30ab43722b806aadf src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
-@@ -22,15 +22,26 @@
- import { IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
- import { ACTIVITY_BAR_BACKGROUND, ACTIVITY_BAR_BORDER, ACTIVITY_BAR_FOREGROUND, ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND, ACTIVITY_BAR_DRAG_AND_DROP_BACKGROUND } from 'vs/workbench/common/theme';
- import { contrastBorder } from 'vs/platform/theme/common/colorRegistry';
-+<<<<<<< .our
- import { CompositeBar } from 'vs/workbench/browser/parts/compositeBar';
- import { isMacintosh } from 'vs/base/common/platform';
- import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
- import { scheduleAtNextAnimationFrame, Dimension, addClass } from 'vs/base/browser/dom';
-+=======
-+import { CompositeBar } from 'vs/workbench/browser/parts/compositebar/compositeBar';
-+import { isMacintosh } from 'vs/base/common/platform';
-+import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
-+import { scheduleAtNextAnimationFrame, Dimension } from 'vs/base/browser/dom';
-+>>>>>>> .their
- import { Color } from 'vs/base/common/color';
- import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
- import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
- import URI from 'vs/base/common/uri';
-+<<<<<<< .our
- import { ToggleCompositePinnedAction } from 'vs/workbench/browser/parts/compositeBarActions';
-+=======
-+import { ToggleCompositePinnedAction } from 'vs/workbench/browser/parts/compositebar/compositeBarActions';
-+>>>>>>> .their
- import { ViewletDescriptor } from 'vs/workbench/browser/viewlet';
- 
- interface IPlaceholderComposite {
-@@ -190,7 +201,32 @@
- 			});
- 		}
- 
-+<<<<<<< .our
- 		return content;
-+=======
-+		// TODO@Ben: workaround for https://github.com/Microsoft/vscode/issues/45700
-+		// It looks like there are rendering glitches on macOS with Chrome 61 when
-+		// using --webkit-mask with a background color that is different from the image
-+		// The workaround is to promote the element onto its own drawing layer. We do
-+		// this only after the workbench has loaded because otherwise there is ugly flicker.
-+		if (isMacintosh) {
-+			this.lifecycleService.when(LifecyclePhase.Running).then(() => {
-+				scheduleAtNextAnimationFrame(() => { // another delay...
-+					scheduleAtNextAnimationFrame(() => { // ...to prevent more flickering on startup
-+						registerThemingParticipant((theme, collector) => {
-+							const activityBarForeground = theme.getColor(ACTIVITY_BAR_FOREGROUND);
-+							if (activityBarForeground && !activityBarForeground.equals(Color.white)) {
-+								// only apply this workaround if the color is different from the image one (white)
-+								collector.addRule('.monaco-workbench .activitybar > .content .monaco-action-bar .action-label { will-change: transform; }');
-+							}
-+						});
-+					});
-+				});
-+			});
-+		}
-+
-+		return $result.getHTMLElement();
-+>>>>>>> .their
- 	}
- 
- 	updateStyles(): void {
-changed in both
-  base   100644 0ba296dc6db1ca806fc8de27b8cf61afd7bb49de src/vs/workbench/services/configuration/node/configurationService.ts
-  our    100644 e954cacc4e16cfd2ccd8cba2d91f9096e6a67588 src/vs/workbench/services/configuration/node/configurationService.ts
-  their  100644 b21ed903322f0f848ed8956acb25f8151b00a781 src/vs/workbench/services/configuration/node/configurationService.ts
-changed in both
-  base   100644 8832ac16a31d6519aee201e9c91d8022ab1f51f2 src/vs/workbench/services/contextview/electron-browser/contextmenuService.ts
-  our    100644 22429b857153939331f29b91c98bd17d6fdbceeb src/vs/workbench/services/contextview/electron-browser/contextmenuService.ts
-  their  100644 c4fdf722b722b76cfe3b2c7e3526eef0e5e37dc1 src/vs/workbench/services/contextview/electron-browser/contextmenuService.ts
-@@ -44,8 +44,23 @@
- 							delegate.onHide(undefined);
- 						}
- 
-+<<<<<<< .our
- 						this._onDidContextMenu.fire();
- 					});
-+=======
-+			return TPromise.timeout(0).then(() => { // https://github.com/Microsoft/vscode/issues/3638
-+				const onHide = once(() => {
-+					if (delegate.onHide) {
-+						delegate.onHide(undefined);
-+					}
-+
-+					this._onDidContextMenu.fire();
-+				});
-+
-+				const menu = this.createMenu(delegate, actions, onHide);
-+				const anchor = delegate.getAnchor();
-+				let x: number, y: number;
-+>>>>>>> .their
- 
- 					const menu = this.createMenu(delegate, actions, onHide);
- 					const anchor = delegate.getAnchor();
-@@ -62,6 +77,7 @@
- 						y = pos.y;
- 					}
- 
-+<<<<<<< .our
- 					let zoom = webFrame.getZoomFactor();
- 					x *= zoom;
- 					y *= zoom;
-@@ -75,6 +91,16 @@
- 					});
- 				}, 0); // https://github.com/Microsoft/vscode/issues/3638
- 			}
-+=======
-+				menu.popup({
-+					window: remote.getCurrentWindow(),
-+					x: Math.floor(x),
-+					y: Math.floor(y),
-+					positioningItem: delegate.autoSelectFirstItem ? 0 : void 0,
-+					callback: () => onHide()
-+				});
-+			});
-+>>>>>>> .their
- 		});
- 	}
- 
-changed in both
-  base   100644 0b6dd68de6e12c2a2ca2fb01c5aaebc19d026c26 src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
-  our    100644 e30e323957d4065215ca39593ac4ac26251c0480 src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
-  their  100644 ab3dda8c90ec38994a0a2c706d9e430c4a0627b3 src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
diff --git a/app/test/fixtures/merge-parser/vscode/merge-rmacfarlane-disable-extensions-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-rmacfarlane-disable-extensions-into-master.txt
deleted file mode 100644
index 9b6e22013d7..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-rmacfarlane-disable-extensions-into-master.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-changed in both
-  base   100644 063a7a4172e00055a6806ac6fca6ba3f94055fdc src/vs/code/electron-main/window.ts
-  our    100644 98a4328213e146b214e8da866ab92dc7f9c449a9 src/vs/code/electron-main/window.ts
-  their  100644 5f99b37e2e2ab86775e5383c9dd5b274f9e90de5 src/vs/code/electron-main/window.ts
-@@ -504,6 +504,7 @@
- 		});
- 	}
- 
-+<<<<<<< .our
- 	addTabbedWindow(window: ICodeWindow): void {
- 		if (isMacintosh) {
- 			this._win.addTabbedWindow(window.win);
-@@ -511,6 +512,9 @@
- 	}
- 
- 	load(config: IWindowConfiguration, isReload?: boolean, disableExtensions?: boolean): void {
-+=======
-+	public load(config: IWindowConfiguration, isReload?: boolean, disableExtensions?: boolean): void {
-+>>>>>>> .their
- 
- 		// If this is the first time the window is loaded, we associate the paths
- 		// directly with the window because we assume the loading will just work
-@@ -551,7 +555,11 @@
- 		}
- 
- 		// Load URL
-+<<<<<<< .our
- 		perf.mark('main:loadWindow');
-+=======
-+		mark('main:loadWindow');
-+>>>>>>> .their
- 		this._win.loadURL(this.getUrl(configuration));
- 
- 		// Make window visible if it did not open in N seconds because this indicates an error
-changed in both
-  base   100644 d912fb8062732dbd1f57e5911248509efa9ed192 src/vs/platform/windows/electron-main/windows.ts
-  our    100644 20b7711912c4db633052e4e4941fa5b15b602380 src/vs/platform/windows/electron-main/windows.ts
-  their  100644 ce2eba8895b79acb60b67a5f7bb1c593bf39421a src/vs/platform/windows/electron-main/windows.ts
-@@ -48,8 +48,11 @@
- 	readyState: ReadyState;
- 	ready(): TPromise<ICodeWindow>;
- 
-+<<<<<<< .our
- 	addTabbedWindow(window: ICodeWindow): void;
- 
-+=======
-+>>>>>>> .their
- 	load(config: IWindowConfiguration, isReload?: boolean, disableExtensions?: boolean): void;
- 	reload(configuration?: IWindowConfiguration, cli?: ParsedArgs): void;
- 
diff --git a/app/test/fixtures/merge-parser/vscode/merge-rmacfarlane-processExplorer-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-rmacfarlane-processExplorer-into-master.txt
deleted file mode 100644
index 5f3a5c35141..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-rmacfarlane-processExplorer-into-master.txt
+++ /dev/null
@@ -1,448 +0,0 @@
-changed in both
-  base   100644 ff35e0a5a6f58dfa842f69afa08f7d56aefdf191 build/gulpfile.vscode.js
-  our    100644 d79071e56bcfc53b3448052cc08bd7247bd7e789 build/gulpfile.vscode.js
-  their  100644 9fa7fc9f28f84549c66ac41a85fe209a85b579ed build/gulpfile.vscode.js
-changed in both
-  base   100644 0293acbb5be3dd8dcf391fa728b4bac721b46e7a src/vs/code/buildfile.js
-  our    100644 1a39a0a0c2c617f7e302734407fb543448b242df src/vs/code/buildfile.js
-  their  100644 2ff372605b728473dec330e4a8a59b5b35913bf1 src/vs/code/buildfile.js
-@@ -11,7 +11,11 @@
- 	if (Array.isArray(exclude) && exclude.length > 0) {
- 		excludes = excludes.concat(exclude);
- 	}
-+<<<<<<< .our
- 	result.exclude = excludes;
-+=======
-+	result.exclude= excludes;
-+>>>>>>> .their
- 
- 	return result;
- }
-@@ -23,8 +27,11 @@
- 		createModuleDescription('vs/code/node/cliProcessMain', ['vs/code/node/cli']),
- 		createModuleDescription('vs/code/electron-browser/issue/issueReporterMain', []),
- 		createModuleDescription('vs/code/electron-browser/sharedProcess/sharedProcessMain', []),
-+<<<<<<< .our
- 		createModuleDescription('vs/code/electron-browser/issue/issueReporterMain', []),
- 		createModuleDescription('vs/platform/driver/node/driver', []),
-+=======
-+>>>>>>> .their
- 		createModuleDescription('vs/code/electron-browser/processExplorer/processExplorerMain', [])
- 	];
- };
-added in both
-  our    100644 012740110f45d7bebe1733902d087bf2e0bafb76 src/vs/code/electron-browser/processExplorer/media/processExplorer.css
-  their  100644 6f38b441592fd287119dd364b34e6007ba327421 src/vs/code/electron-browser/processExplorer/media/processExplorer.css
-@@ -43,18 +43,26 @@
- 	border-bottom: 1px solid #cccccc;
- 	padding: .5rem;
- 	border-top: 1px solid #cccccc;
-+<<<<<<< .our
- 	cursor: default;
-+=======
-+	text-align: center;
-+>>>>>>> .their
- }
- td {
- 	padding: .25rem;
- 	vertical-align: top;
-+<<<<<<< .our
- 	cursor: default;
-+=======
-+>>>>>>> .their
- }
- 
- .centered {
- 	text-align: center;
- }
- 
-+<<<<<<< .our
- .nameLabel{
- 	text-align: left;
- }
-@@ -62,6 +70,10 @@
- .data {
- 	white-space: pre;
- 	padding-left: .5rem;
-+=======
-+.data {
-+	white-space: pre;
-+>>>>>>> .their
- }
- 
- tbody > tr:hover {
-added in both
-  our    100644 0a798fb876db2ef86a3c96b2afe9c5018d68f178 src/vs/code/electron-browser/processExplorer/processExplorer.js
-  their  100644 1fdb4bb8296f1b9458ae472882782731f1f08bfe src/vs/code/electron-browser/processExplorer/processExplorer.js
-@@ -45,8 +45,11 @@
- 	});
- }
- 
-+<<<<<<< .our
- const writeFile = (file, content) => new Promise((c, e) => fs.writeFile(file, content, 'utf8', err => err ? e(err) : c()));
- 
-+=======
-+>>>>>>> .their
- function main() {
- 	const args = parseURLQueryArgs();
- 	const configuration = JSON.parse(args['config'] || '{}') || {};
-@@ -104,6 +107,7 @@
- 				let json = JSON.parse(content);
- 				bundles[bundle] = json;
- 				cb(undefined, json);
-+<<<<<<< .our
- 			}).catch((error) => {
- 				try {
- 					if (nlsConfig._corruptedFile) {
-@@ -113,6 +117,10 @@
- 					cb(error, undefined);
- 				}
- 			});
-+=======
-+			})
-+			.catch(cb);
-+>>>>>>> .their
- 		};
- 	}
- 
-added in both
-  our    100644 fe402f187926e157ed73b15fc022dd347b897753 src/vs/code/electron-browser/processExplorer/processExplorerMain.ts
-  their  100644 1fb3ca60b3be3567e297bdc70ebfcdafbcdf563d src/vs/code/electron-browser/processExplorer/processExplorerMain.ts
-@@ -7,17 +7,28 @@
- 
- import 'vs/css!./media/processExplorer';
- import { listProcesses, ProcessItem } from 'vs/base/node/ps';
-+<<<<<<< .our
- import { remote, webFrame, ipcRenderer, clipboard } from 'electron';
-+=======
-+import { remote, webFrame } from 'electron';
-+>>>>>>> .their
- import { repeat } from 'vs/base/common/strings';
- import { totalmem } from 'os';
- import product from 'vs/platform/node/product';
- import { localize } from 'vs/nls';
-+<<<<<<< .our
- import { ProcessExplorerStyles, ProcessExplorerData } from 'vs/platform/issue/common/issue';
-+=======
-+import { ProcessExplorerData, ProcessExplorerStyles } from '../../../platform/issue/common/issue';
-+>>>>>>> .their
- import * as browser from 'vs/base/browser/browser';
- import * as platform from 'vs/base/common/platform';
- 
- let processList: any[];
-+<<<<<<< .our
- let mapPidToWindowTitle = new Map<number, string>();
-+=======
-+>>>>>>> .their
- 
- function getProcessList(rootProcess: ProcessItem) {
- 	const processes: any[] = [];
-@@ -34,6 +45,7 @@
- 
- 	const MB = 1024 * 1024;
- 
-+<<<<<<< .our
- 	let name = item.name;
- 	if (isRoot) {
- 		name = `${product.applicationName} main`;
-@@ -45,6 +57,10 @@
- 	}
- 
- 	// Format name with indent
-+=======
-+	// Format name with indent
-+	const name = isRoot ? `${product.applicationName} main` : item.name;
-+>>>>>>> .their
- 	const formattedName = isRoot ? name : `${repeat('    ', indent)} ${name}`;
- 	const memory = process.platform === 'win32' ? item.mem : (totalmem() * (item.mem / 100));
- 	processes.push({
-@@ -85,7 +101,11 @@
- 			<th class="cpu">${localize('cpu', "CPU %")}</th>
- 			<th class="memory">${localize('memory', "Memory (MB)")}</th>
- 			<th class="pid">${localize('pid', "pid")}</th>
-+<<<<<<< .our
- 			<th class="nameLabel">${localize('name', "Name")}</th>
-+=======
-+			<th>${localize('name', "Name")}</th>
-+>>>>>>> .their
- 		</tr>`;
- 
- 	processList.forEach(p => {
-@@ -137,22 +157,34 @@
- function showContextMenu(e) {
- 	e.preventDefault();
- 
-+<<<<<<< .our
- 	const menu = new remote.Menu();
- 
- 	const pid = parseInt(e.currentTarget.id);
- 	if (pid && typeof pid === 'number') {
-+=======
-+	const pid = parseInt(e.currentTarget.id);
-+	if (pid && typeof pid === 'number') {
-+		const menu = new remote.Menu();
-+>>>>>>> .their
- 		menu.append(new remote.MenuItem({
- 			label: localize('killProcess', "Kill Process"),
- 			click() {
- 				process.kill(pid, 'SIGTERM');
- 			}
-+<<<<<<< .our
- 		}));
-+=======
-+		})
-+		);
-+>>>>>>> .their
- 
- 		menu.append(new remote.MenuItem({
- 			label: localize('forceKillProcess', "Force Kill Process"),
- 			click() {
- 				process.kill(pid, 'SIGKILL');
- 			}
-+<<<<<<< .our
- 		}));
- 
- 		menu.append(new remote.MenuItem({
-@@ -191,12 +223,20 @@
- 	}
- 
- 	menu.popup({ window: remote.getCurrentWindow() });
-+=======
-+		})
-+		);
-+
-+		menu.popup(remote.getCurrentWindow());
-+	}
-+>>>>>>> .their
- }
- 
- export function startup(data: ProcessExplorerData): void {
- 	applyStyles(data.styles);
- 	applyZoom(data.zoomLevel);
- 
-+<<<<<<< .our
- 	// Map window process pids to titles, annotate process names with this when rendering to distinguish between them
- 	ipcRenderer.on('windowsInfoResponse', (event, windows) => {
- 		mapPidToWindowTitle = new Map<number, string>();
-@@ -219,6 +259,20 @@
- 			}
- 		});
- 	}, 1200);
-+=======
-+	setInterval(() => listProcesses(remote.process.pid).then(processes => {
-+		processList = getProcessList(processes);
-+		updateProcessInfo(processList);
-+
-+		const tableRows = document.getElementsByTagName('tr');
-+		for (let i = 0; i < tableRows.length; i++) {
-+			const tableRow = tableRows[i];
-+			tableRow.addEventListener('click', (e) => {
-+				showContextMenu(e);
-+			});
-+		}
-+	}), 1200);
-+>>>>>>> .their
- 
- 
- 	document.onkeydown = (e: KeyboardEvent) => {
-changed in both
-  base   100644 46d965ac212d1e44f38e25668f1f39ed8d174e86 src/vs/code/electron-main/menus.ts
-  our    100644 9d5657cff26b159c842f9790d6387967d829e168 src/vs/code/electron-main/menus.ts
-  their  100644 dad88c4fc00eaf68009d2543ca4966a10f919592 src/vs/code/electron-main/menus.ts
-changed in both
-  base   100644 8955b50b076ab2a5cc7e07be65443a0272be447b src/vs/platform/issue/common/issue.ts
-  our    100644 46d378dc8d4cd7b20dfb66315d50d0a50e0a12c9 src/vs/platform/issue/common/issue.ts
-  their  100644 228bcdfefb1192358d83a30c0c7e462408fce07b src/vs/platform/issue/common/issue.ts
-@@ -11,8 +11,11 @@
- 
- export const IIssueService = createDecorator<IIssueService>('issueService');
- 
-+<<<<<<< .our
- // Since data sent through the service is serialized to JSON, functions will be lost, so Color objects
- // should not be sent as their 'toString' method will be stripped. Instead convert to strings before sending.
-+=======
-+>>>>>>> .their
- export interface WindowStyles {
- 	backgroundColor: string;
- 	color: string;
-changed in both
-  base   100644 99d73534b5ed94685df395f29c2c944456111cb7 src/vs/platform/issue/common/issueIpc.ts
-  our    100644 d45c1d870ee3c63db989f023028363c389abbdeb src/vs/platform/issue/common/issueIpc.ts
-  their  100644 d804c6579fe48c96cbf9135b4e6bd850d4420858 src/vs/platform/issue/common/issueIpc.ts
-@@ -8,7 +8,10 @@
- import { TPromise } from 'vs/base/common/winjs.base';
- import { IChannel } from 'vs/base/parts/ipc/common/ipc';
- import { IIssueService, IssueReporterData, ProcessExplorerData } from './issue';
-+<<<<<<< .our
- import { Event } from 'vs/base/common/event';
-+=======
-+>>>>>>> .their
- 
- export interface IIssueChannel extends IChannel {
- 	call(command: 'openIssueReporter', arg: IssueReporterData): TPromise<void>;
-changed in both
-  base   100644 7232efc90fba37c39218bdf0b4f7f30cbcdf8d70 src/vs/platform/issue/electron-main/issueService.ts
-  our    100644 cebb4e612373900c38659291fafa9b78f51e1be1 src/vs/platform/issue/electron-main/issueService.ts
-  their  100644 1d589bf8f165f7fdde42bd0e01ec155e245d36d7 src/vs/platform/issue/electron-main/issueService.ts
-@@ -51,6 +51,7 @@
- 		});
- 
- 		this._issueParentWindow = BrowserWindow.getFocusedWindow();
-+<<<<<<< .our
- 		const position = this.getWindowPosition(this._issueParentWindow, 700, 800);
- 		if (!this._issueWindow) {
- 			this._issueWindow = new BrowserWindow({
-@@ -95,6 +96,18 @@
- 			this.launchService.getMainProcessInfo().then(info => {
- 				event.sender.send('windowsInfoResponse', info.windows);
- 			});
-+=======
-+		const position = this.getWindowPosition(this._issueParentWindow, 800, 900);
-+		this._issueWindow = new BrowserWindow({
-+			width: position.width,
-+			height: position.height,
-+			minWidth: 300,
-+			minHeight: 200,
-+			x: position.x,
-+			y: position.y,
-+			title: localize('issueReporter', "Issue Reporter"),
-+			backgroundColor: data.styles.backgroundColor || DEFAULT_BACKGROUND_COLOR
-+>>>>>>> .their
- 		});
- 
- 		// Create as singleton
-@@ -154,6 +167,56 @@
- 		return TPromise.as(null);
- 	}
- 
-+<<<<<<< .our
-+=======
-+	openProcessExplorer(data: ProcessExplorerData): TPromise<void> {
-+		// Create as singleton
-+		if (!this._processExplorerWindow) {
-+			const position = this.getWindowPosition(BrowserWindow.getFocusedWindow(), 800, 300);
-+			this._processExplorerWindow = new BrowserWindow({
-+				skipTaskbar: true,
-+				resizable: true,
-+				width: position.width,
-+				height: position.height,
-+				minWidth: 300,
-+				minHeight: 200,
-+				x: position.x,
-+				y: position.y,
-+				backgroundColor: data.styles.backgroundColor,
-+				title: localize('processExplorer', "Process Explorer")
-+			});
-+
-+			this._processExplorerWindow.setMenuBarVisibility(false);
-+
-+			const windowConfiguration = {
-+				appRoot: this.environmentService.appRoot,
-+				nodeCachedDataDir: this.environmentService.nodeCachedDataDir,
-+				windowId: this._processExplorerWindow.id,
-+				userEnv: this.userEnv,
-+				machineId: this.machineId,
-+				data
-+			};
-+
-+			const environment = parseArgs(process.argv);
-+			const config = objects.assign(environment, windowConfiguration);
-+			for (let key in config) {
-+				if (config[key] === void 0 || config[key] === null || config[key] === '') {
-+					delete config[key]; // only send over properties that have a true value
-+				}
-+			}
-+
-+			this._processExplorerWindow.loadURL(`${require.toUrl('vs/code/electron-browser/processExplorer/processExplorer.html')}?config=${encodeURIComponent(JSON.stringify(config))}`);
-+
-+			this._processExplorerWindow.on('close', () => this._processExplorerWindow = void 0);
-+		}
-+
-+		// Focus
-+		this._processExplorerWindow.focus();
-+
-+		return TPromise.as(null);
-+	}
-+
-+>>>>>>> .their
- 	private getWindowPosition(parentWindow: BrowserWindow, defaultWidth: number, defaultHeight: number) {
- 		// We want the new window to open on the same display that the parent is in
- 		let displayToUse: Electron.Display;
-changed in both
-  base   100644 3e0b42414dbca7cb2a53b42f1de850d2096e7864 src/vs/workbench/electron-browser/actions.ts
-  our    100644 bdd05d8bf604885479f782703b020131fa80ea9f src/vs/workbench/electron-browser/actions.ts
-  their  100644 7abd5ddb6b14dcd5622e52de12789c71da8a24f1 src/vs/workbench/electron-browser/actions.ts
-@@ -573,8 +573,31 @@
- }
- 
- export class OpenProcessExplorer extends Action {
-+<<<<<<< .our
- 	static readonly ID = 'workbench.action.openProcessExplorer';
- 	static readonly LABEL = nls.localize('openProcessExplorer', "Open Process Explorer");
-+=======
-+	public static readonly ID = 'workbench.action.openProcessExplorer';
-+	public static readonly LABEL = nls.localize('openProcessExplorer', "Open Process Explorer");
-+
-+	constructor(
-+		id: string,
-+		label: string,
-+		@IWorkbenchIssueService private issueService: IWorkbenchIssueService
-+	) {
-+		super(id, label);
-+	}
-+
-+	public run(): TPromise<boolean> {
-+		return this.issueService.openProcessExplorer()
-+			.then(() => true);
-+	}
-+}
-+
-+export class ReportPerformanceIssueUsingReporterAction extends Action {
-+	public static readonly ID = 'workbench.action.reportPerformanceIssueUsingReporter';
-+	public static readonly LABEL = nls.localize('reportPerformanceIssue', "Report Performance Issue");
-+>>>>>>> .their
- 
- 	constructor(
- 		id: string,
-changed in both
-  base   100644 c57c28d3c1bb0293419659984deebe6587347a7b src/vs/workbench/electron-browser/main.contribution.ts
-  our    100644 b5ea1f2025fd492a8d56b60ad98cd59a2319f383 src/vs/workbench/electron-browser/main.contribution.ts
-  their  100644 26d69e9073941d91aad39bd4a289c21ee466a9f1 src/vs/workbench/electron-browser/main.contribution.ts
-@@ -14,10 +14,17 @@
- import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/actions';
- import { KeyMod, KeyChord, KeyCode } from 'vs/base/common/keyCodes';
- import { isWindows, isLinux, isMacintosh } from 'vs/base/common/platform';
-+<<<<<<< .our
- import { KeybindingsReferenceAction, OpenDocumentationUrlAction, OpenIntroductoryVideosUrlAction, OpenTipsAndTricksUrlAction, OpenIssueReporterAction, ReportPerformanceIssueUsingReporterAction, ZoomResetAction, ZoomOutAction, ZoomInAction, ToggleFullScreenAction, ToggleMenuBarAction, CloseWorkspaceAction, CloseCurrentWindowAction, SwitchWindow, NewWindowAction, NavigateUpAction, NavigateDownAction, NavigateLeftAction, NavigateRightAction, IncreaseViewSizeAction, DecreaseViewSizeAction, ToggleSharedProcessAction, QuickSwitchWindow, QuickOpenRecentAction, inRecentFilesPickerContextKey, ShowAboutDialogAction, InspectContextKeysAction, OpenProcessExplorer, OpenTwitterUrlAction, OpenRequestFeatureUrlAction, OpenPrivacyStatementUrlAction, OpenLicenseUrlAction, OpenRecentAction } from 'vs/workbench/electron-browser/actions';
- import { registerCommands, QUIT_ID } from 'vs/workbench/electron-browser/commands';
- import { AddRootFolderAction, GlobalRemoveRootFolderAction, OpenWorkspaceAction, SaveWorkspaceAsAction, OpenWorkspaceConfigFileAction, DuplicateWorkspaceInNewWindowAction, OpenFileFolderAction, OpenFileAction, OpenFolderAction } from 'vs/workbench/browser/actions/workspaceActions';
- import { ContextKeyExpr, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-+=======
-+import { KeybindingsReferenceAction, OpenDocumentationUrlAction, OpenIntroductoryVideosUrlAction, OpenTipsAndTricksUrlAction, OpenIssueReporterAction, ReportPerformanceIssueUsingReporterAction, ZoomResetAction, ZoomOutAction, ZoomInAction, ToggleFullScreenAction, ToggleMenuBarAction, CloseWorkspaceAction, CloseCurrentWindowAction, SwitchWindow, NewWindowAction, NavigateUpAction, NavigateDownAction, NavigateLeftAction, NavigateRightAction, IncreaseViewSizeAction, DecreaseViewSizeAction, ShowStartupPerformance, ToggleSharedProcessAction, QuickSwitchWindow, QuickOpenRecentAction, inRecentFilesPickerContextKey, ShowAboutDialogAction, InspectContextKeysAction, OpenProcessExplorer } from 'vs/workbench/electron-browser/actions';
-+import { registerCommands } from 'vs/workbench/electron-browser/commands';
-+import { AddRootFolderAction, GlobalRemoveRootFolderAction, OpenWorkspaceAction, SaveWorkspaceAsAction, OpenWorkspaceConfigFileAction, OpenFolderAsWorkspaceInNewWindowAction, OpenFileFolderAction, OpenFileAction, OpenFolderAction } from 'vs/workbench/browser/actions/workspaceActions';
-+import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-+>>>>>>> .their
- import { inQuickOpenContext, getQuickNavigateHandler } from 'vs/workbench/browser/parts/quickopen/quickopen';
- import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
- import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-changed in both
-  base   100644 7e78f2904a5c547fc6b7faeea41d14ee8d7ce4b0 src/vs/workbench/services/issue/electron-browser/workbenchIssueService.ts
-  our    100644 a3e9e3727bdc52ce0808231122074450038ff33a src/vs/workbench/services/issue/electron-browser/workbenchIssueService.ts
-  their  100644 80d5a39cad23ae86c5da178146939c725f236353 src/vs/workbench/services/issue/electron-browser/workbenchIssueService.ts
-@@ -8,7 +8,11 @@
- import { IssueReporterStyles, IIssueService, IssueReporterData } from 'vs/platform/issue/common/issue';
- import { TPromise } from 'vs/base/common/winjs.base';
- import { ITheme, IThemeService } from 'vs/platform/theme/common/themeService';
-+<<<<<<< .our
- import { textLinkForeground, inputBackground, inputBorder, inputForeground, buttonBackground, buttonHoverBackground, buttonForeground, inputValidationErrorBorder, foreground, inputActiveOptionBorder, scrollbarSliderActiveBackground, scrollbarSliderBackground, scrollbarSliderHoverBackground, editorBackground, editorForeground, listHoverBackground, listHoverForeground, listHighlightForeground, textLinkActiveForeground } from 'vs/platform/theme/common/colorRegistry';
-+=======
-+import { textLinkForeground, inputBackground, inputBorder, inputForeground, buttonBackground, buttonHoverBackground, buttonForeground, inputValidationErrorBorder, foreground, inputActiveOptionBorder, scrollbarSliderActiveBackground, scrollbarSliderBackground, scrollbarSliderHoverBackground, editorBackground, editorForeground, listHoverBackground, listHoverForeground, listHighlightForeground } from 'vs/platform/theme/common/colorRegistry';
-+>>>>>>> .their
- import { SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme';
- import { IExtensionManagementService, IExtensionEnablementService, LocalExtensionType } from 'vs/platform/extensionManagement/common/extensionManagement';
- import { webFrame } from 'electron';
-changed in both
-  base   100644 31396c2aa56afa1fe7b2e59339aaafeaf07db6f9 tslint.json
-  our    100644 1fcafd325b6f3d6c1add5a7ecd5f5623468d2ddd tslint.json
-  their  100644 9a59614556ed9baaf53fc994e2338e20db70e384 tslint.json
diff --git a/app/test/fixtures/merge-parser/vscode/merge-rmacfarlane-scm-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-rmacfarlane-scm-into-master.txt
deleted file mode 100644
index f5ccbc77484..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-rmacfarlane-scm-into-master.txt
+++ /dev/null
@@ -1,304 +0,0 @@
-changed in both
-  base   100644 6dcc58cc6dfa78761d182e1fe108085e8dc3d465 src/vs/vscode.proposed.d.ts
-  our    100644 3de4a7af9dda9e3e523ba4b5774f1667d66b0b9b src/vs/vscode.proposed.d.ts
-  their  100644 df388d0bf106c4500005fc11272b36266462c898 src/vs/vscode.proposed.d.ts
-@@ -785,4 +785,85 @@
- 		export const onDidRenameFile: Event<FileRenameEvent>;
- 	}
- 	//#endregion
-+<<<<<<< .our
-+=======
-+
-+	//#region Matt: Deinition range
-+
-+	/**
-+	 * Information about where a symbol is defined.
-+	 *
-+	 * Provides additional metadata over normal [location](#Location) definitions, including the range of
-+	 * the defining symbol
-+	 */
-+	export interface DefinitionLink {
-+		/**
-+		 * Span of the symbol being defined in the source file.
-+		 *
-+		 * Used as the underlined span for mouse definition hover. Defaults to the word range at
-+		 * the definition position.
-+		 */
-+		origin?: Range;
-+
-+		/**
-+		 * The resource identifier of the definition.
-+		 */
-+		uri: Uri;
-+
-+		/**
-+		 * The full range of the definition.
-+		 *
-+		 * For a class definition for example, this would be the entire body of the class definition.
-+		 */
-+		range: Range;
-+
-+		/**
-+		 * The span of the symbol definition.
-+		 *
-+		 * For a class definition, this would be the class name itself in the class definition.
-+		 */
-+		selectionRange?: Range;
-+	}
-+
-+	export interface DefinitionProvider {
-+		provideDefinition2?(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<Definition | DefinitionLink[]>;
-+	}
-+
-+	//#endregion
-+
-+	//#region scm, Rachel & Peng https://github.com/Microsoft/vscode/issues/53892
-+
-+	export interface ReadonlySourceControl {
-+		/**
-+		 * The id of this source control.
-+		 */
-+		readonly id: string;
-+
-+		/**
-+		 * The human-readable label of this source control.
-+		 */
-+		readonly label: string;
-+
-+		/**
-+		 * The (optional) Uri of the root of this source control.
-+		 */
-+		readonly rootUri: Uri | undefined;
-+	}
-+
-+	export namespace scm {
-+
-+		/**
-+		 * The currently visible [source controls](#ReadonlySourceControl).
-+		 */
-+		export const visibleSourceControls: ReadonlySourceControl[];
-+
-+
-+		/**
-+		 * An [event](#Event) which fires when the visible [source controls](#ReadonlySourceControl) have changed.
-+		 */
-+		export const onDidChangeVisibleSourceControls: Event<ReadonlySourceControl[]>;
-+	}
-+
-+	//#endregion
-+>>>>>>> .their
- }
-changed in both
-  base   100644 8ee8daaee7a6a944575bc9f0093f5925b52afbe8 src/vs/workbench/api/electron-browser/mainThreadSCM.ts
-  our    100644 a6c6f1caa699f0897aa58c37f2ec9eb1ed252503 src/vs/workbench/api/electron-browser/mainThreadSCM.ts
-  their  100644 d66a95d7ad8a9a10b470f4b51fe6bc048505c893 src/vs/workbench/api/electron-browser/mainThreadSCM.ts
-@@ -15,6 +15,7 @@
- import { Command } from 'vs/editor/common/modes';
- import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
- import { ISplice, Sequence } from 'vs/base/common/sequence';
-+import { equals } from 'vs/base/common/arrays';
- 
- class MainThreadSCMResourceGroup implements ISCMResourceGroup {
- 
-@@ -264,6 +265,7 @@
- 	private _repositories: { [handle: number]: ISCMRepository; } = Object.create(null);
- 	private _inputDisposables: { [handle: number]: IDisposable; } = Object.create(null);
- 	private _disposables: IDisposable[] = [];
-+	private _selectedRepositories: number[] = [];
- 
- 	constructor(
- 		extHostContext: IExtHostContext,
-@@ -271,8 +273,18 @@
- 	) {
- 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostSCM);
- 
-+<<<<<<< .our
- 		debounceEvent(scmService.onDidChangeSelectedRepositories, (_, e) => e, 100)
- 			(this.onDidChangeSelectedRepositories, this, this._disposables);
-+=======
-+		this._disposables.push(this.scmService.onDidChangeSelectedRepositories(repositories => {
-+			const handles = repositories.map(repo => (<MainThreadSCMProvider>repo.provider).handle);
-+			if (!equals(handles, this._selectedRepositories)) {
-+				this._selectedRepositories = handles;
-+				this._proxy.$onDidChangeVisibleSourceControls(handles);
-+			}
-+		}));
-+>>>>>>> .their
- 	}
- 
- 	dispose(): void {
-@@ -294,6 +306,11 @@
- 
- 		const inputDisposable = repository.input.onDidChange(value => this._proxy.$onInputBoxValueChange(handle, value));
- 		this._inputDisposables[handle] = inputDisposable;
-+
-+		if (!this._selectedRepositories.length) {
-+			this._selectedRepositories.push(handle);
-+			this._proxy.$onDidChangeVisibleSourceControls(this._selectedRepositories);
-+		}
- 	}
- 
- 	$updateSourceControl(handle: number, features: SCMProviderFeatures): void {
-changed in both
-  base   100644 eea4190baedd577ad17e122f0b48e3b1c15ef95b src/vs/workbench/api/node/extHost.api.impl.ts
-  our    100644 ea64898c5b15cfae4b4ab32d722f4ae4a68f831a src/vs/workbench/api/node/extHost.api.impl.ts
-  their  100644 fb40948c2b31671469c86e1bfd0f0ef8c46edebb src/vs/workbench/api/node/extHost.api.impl.ts
-@@ -611,6 +611,12 @@
- 			},
- 			createSourceControl(id: string, label: string, rootUri?: vscode.Uri) {
- 				return extHostSCM.createSourceControl(extension, id, label, rootUri);
-+			},
-+			get visibleSourceControls() {
-+				return extHostSCM.visibleSourceControls;
-+			},
-+			get onDidChangeVisibleSourceControls() {
-+				return extHostSCM.onDidChangeVisibleSourceControls;
- 			}
- 		};
- 
-changed in both
-  base   100644 c65fd9cf161d1a1cf0a50949d9962ca234440d4f src/vs/workbench/api/node/extHost.protocol.ts
-  our    100644 edb764542adfbf0fba64e1b93de7c309bedf0d12 src/vs/workbench/api/node/extHost.protocol.ts
-  their  100644 90f8e49d979c7567a1e232aa0438d5179ccf2c22 src/vs/workbench/api/node/extHost.protocol.ts
-@@ -882,6 +882,7 @@
- export interface ExtHostSCMShape {
- 	$provideOriginalResource(sourceControlHandle: number, uri: UriComponents): TPromise<UriComponents>;
- 	$onInputBoxValueChange(sourceControlHandle: number, value: string): TPromise<void>;
-+	$onDidChangeVisibleSourceControls(sourceControlHandles: number[]): TPromise<void>;
- 	$executeResourceCommand(sourceControlHandle: number, groupHandle: number, handle: number): TPromise<void>;
- 	$validateInput(sourceControlHandle: number, value: string, cursorPosition: number): TPromise<[string, number] | undefined>;
- 	$setSelectedSourceControls(selectedSourceControlHandles: number[]): TPromise<void>;
-changed in both
-  base   100644 eeafdc4a416a2d8a854795b77f4641ad205ec104 src/vs/workbench/api/node/extHostSCM.ts
-  our    100644 2ce26e505301c7bf67464802924edf770775ef05 src/vs/workbench/api/node/extHostSCM.ts
-  their  100644 edd4159d222693e7b0f674bae42d21120da8da05 src/vs/workbench/api/node/extHostSCM.ts
-@@ -18,6 +18,7 @@
- import * as vscode from 'vscode';
- import { ISplice } from 'vs/base/common/sequence';
- import { ILogService } from 'vs/platform/log/common/log';
-+import { deepFreeze } from 'vs/base/common/objects';
- 
- type ProviderHandle = number;
- type GroupHandle = number;
-@@ -485,7 +486,14 @@
- 	private _onDidChangeActiveProvider = new Emitter<vscode.SourceControl>();
- 	get onDidChangeActiveProvider(): Event<vscode.SourceControl> { return this._onDidChangeActiveProvider.event; }
- 
-+<<<<<<< .our
- 	private _selectedSourceControlHandles = new Set<number>();
-+=======
-+	public visibleSourceControls: vscode.ReadonlySourceControl[] = [];
-+
-+	private _onDidChangeVisibleSourceControls = new Emitter<vscode.ReadonlySourceControl[]>();
-+	get onDidChangeVisibleSourceControls(): Event<vscode.ReadonlySourceControl[]> { return this._onDidChangeVisibleSourceControls.event; }
-+>>>>>>> .their
- 
- 	constructor(
- 		mainContext: IMainContext,
-@@ -584,6 +592,28 @@
- 		return TPromise.as(null);
- 	}
- 
-+	$onDidChangeVisibleSourceControls(sourceControlHandles: number[]): TPromise<void> {
-+		this.logService.trace('ExtHostSCM#$onVisibleSouceControlsChange', sourceControlHandles);
-+
-+		const sourceControls = sourceControlHandles
-+			.map(handle => {
-+				const sourceControl = this._sourceControls.get(handle);
-+				return sourceControl
-+					? deepFreeze({
-+						id: sourceControl.id,
-+						label: sourceControl.label,
-+						rootUri: sourceControl.rootUri
-+					})
-+					: null;
-+			})
-+			.filter(sourceControl => !!sourceControl);
-+
-+		this.visibleSourceControls = sourceControls;
-+		this._onDidChangeVisibleSourceControls.fire(this.visibleSourceControls);
-+
-+		return TPromise.as(null);
-+	}
-+
- 	$executeResourceCommand(sourceControlHandle: number, groupHandle: number, handle: number): TPromise<void> {
- 		this.logService.trace('ExtHostSCM#$executeResourceCommand', sourceControlHandle, groupHandle, handle);
- 
-changed in both
-  base   100644 b369614adb0cdeb13f28ebbfc6094df888e70bef src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts
-  our    100644 4a9da7a25f70fd599ab7b4e7adadf6adf1e52215 src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts
-  their  100644 e6a29091b9972d214d6cf72600713eb47ce838b3 src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts
-@@ -48,7 +48,7 @@
- import * as platform from 'vs/base/common/platform';
- import { format } from 'vs/base/common/strings';
- import { ISpliceable, ISequence, ISplice } from 'vs/base/common/sequence';
--import { firstIndex } from 'vs/base/common/arrays';
-+import { firstIndex, equals } from 'vs/base/common/arrays';
- import { WorkbenchList } from 'vs/platform/list/browser/listService';
- import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
- import { ThrottledDelayer } from 'vs/base/common/async';
-@@ -1278,9 +1278,14 @@
- 				return panel;
- 			});
- 
-+		const oldSelectedRepositories = this.selectedRepositories.slice();
-+		this.repositoryPanels = [...repositoryPanels, ...newRepositoryPanels];
-+		if (this.isVisible() && !equals(oldSelectedRepositories, this.selectedRepositories)) {
-+			this.scmService.changeSelectedRepositories(this.selectedRepositories);
-+		}
-+
- 		// Add new selected panels
- 		let index = repositoryPanels.length + (this.mainPanel ? 1 : 0);
--		this.repositoryPanels = [...repositoryPanels, ...newRepositoryPanels];
- 		newRepositoryPanels.forEach(panel => {
- 			this.addPanels([{ panel, size: panel.minimumSize, index: index++ }]);
- 			panel.repository.focus();
-changed in both
-  base   100644 6a01974b0ee4dad0719e2fa9df44942b20235541 src/vs/workbench/services/scm/common/scm.ts
-  our    100644 40aba5a08c016cd02aec3d4b4d0484bbcdfd4e14 src/vs/workbench/services/scm/common/scm.ts
-  their  100644 50d0386407763cd738b1c98fa7457c134b51ab66 src/vs/workbench/services/scm/common/scm.ts
-@@ -109,10 +109,12 @@
- 	readonly _serviceBrand: any;
- 	readonly onDidAddRepository: Event<ISCMRepository>;
- 	readonly onDidRemoveRepository: Event<ISCMRepository>;
-+	readonly onDidChangeSelectedRepositories: Event<ISCMRepository[]>;
- 
- 	readonly repositories: ISCMRepository[];
- 	readonly selectedRepositories: ISCMRepository[];
- 	readonly onDidChangeSelectedRepositories: Event<ISCMRepository[]>;
- 
- 	registerSCMProvider(provider: ISCMProvider): ISCMRepository;
-+	changeSelectedRepositories(repositories: ISCMRepository[]);
- }
-changed in both
-  base   100644 d062ae056334c4950edb0f3d175b7096c40cd42b src/vs/workbench/services/scm/common/scmService.ts
-  our    100644 83b3e88e06dde7b5d286472eb52df964868a803d src/vs/workbench/services/scm/common/scmService.ts
-  their  100644 c0c977a86a3364beedbe9777bf9b1462b1feb964 src/vs/workbench/services/scm/common/scmService.ts
-@@ -112,6 +112,9 @@
- 	private _onDidRemoveProvider = new Emitter<ISCMRepository>();
- 	get onDidRemoveRepository(): Event<ISCMRepository> { return this._onDidRemoveProvider.event; }
- 
-+	private _onDidChangeSelectedRepositories = new Emitter<ISCMRepository[]>();
-+	get onDidChangeSelectedRepositories(): Event<ISCMRepository[]> { return this._onDidChangeSelectedRepositories.event; }
-+
- 	constructor(@ILogService private logService: ILogService) { }
- 
- 	registerSCMProvider(provider: ISCMProvider): ISCMRepository {
-@@ -151,6 +154,7 @@
- 		return repository;
- 	}
- 
-+<<<<<<< .our
- 	private onDidChangeSelection(): void {
- 		const selectedRepositories = this._repositories.filter(r => r.selected);
- 
-@@ -160,5 +164,9 @@
- 
- 		this._selectedRepositories = this._repositories.filter(r => r.selected);
- 		this._onDidChangeSelectedRepositories.fire(this.selectedRepositories);
-+=======
-+	changeSelectedRepositories(repositories: ISCMRepository[]) {
-+		this._onDidChangeSelectedRepositories.fire(repositories);
-+>>>>>>> .their
- 	}
- }
diff --git a/app/test/fixtures/merge-parser/vscode/merge-roblou-55649-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-roblou-55649-into-master.txt
deleted file mode 100644
index ee036c39981..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-roblou-55649-into-master.txt
+++ /dev/null
@@ -1,670 +0,0 @@
-changed in both
-  base   100644 8f167afc9049e8db15fd3175ce33a6ad4738b9f1 OSSREADME.json
-  our    100644 e15cccabcadbd5afb0980967f0af53c135710fc0 OSSREADME.json
-  their  100644 ddfe2a1fa05af54ab5c44aeb8a7cdcafcf729f19 OSSREADME.json
-@@ -51,7 +51,11 @@
- },
- {
- 	"name": "electron",
-+<<<<<<< .our
- 	"version": "2.0.7",
-+=======
-+	"version": "2.0.5",
-+>>>>>>> .their
- 	"license": "MIT",
- 	"repositoryURL": "https://github.com/electron/electron",
- 	"isProd": true
-changed in both
-  base   100644 663f81987ccc076e4b3e08e95663fdd475e09b93 build/builtInExtensions.json
-  our    100644 b3efcd2cc657706605008661521b555c93a32c16 build/builtInExtensions.json
-  their  100644 e607dada4f85a5d32fa133c9fb0ea836f3a1d185 build/builtInExtensions.json
-@@ -6,7 +6,11 @@
- 	},
- 	{
- 		"name": "ms-vscode.node-debug2",
-+<<<<<<< .our
- 		"version": "1.27.0",
-+=======
-+		"version": "1.26.8",
-+>>>>>>> .their
- 		"repo": "https://github.com/Microsoft/vscode-node-debug2"
- 	}
- ]
-changed in both
-  base   100644 41c826ea71b62bf0e564ddfcac99872abd92bebd extensions/typescript-language-features/package.json
-  our    100644 1f06df0476dc5d308133ff5129ffa65d8caeb6fb extensions/typescript-language-features/package.json
-  their  100644 0e50c0c15cdeb80e9ed53ea6f9b29d65b68939c2 extensions/typescript-language-features/package.json
-changed in both
-  base   100644 4a4588e38b35333ba0d79b6b7a3f80a890cbf3bb package.json
-  our    100644 d0e982ce0b76c5b1b5eb02b673e459e47f3353a4 package.json
-  their  100644 2815fd49ac1e7295ddf0a9cae0394b2c4453d469 package.json
-@@ -1,7 +1,12 @@
- {
-   "name": "code-oss-dev",
-+<<<<<<< .our
-   "version": "1.27.0",
-   "distro": "a4155d9780fbbc94ead6cb3017dd0fc3806c57b8",
-+=======
-+  "version": "1.26.0",
-+  "distro": "73cb7173636931afba8d741be343ceafb11a177e",
-+>>>>>>> .their
-   "author": {
-     "name": "Microsoft Corporation"
-   },
-@@ -49,7 +54,11 @@
-     "vscode-nsfw": "1.0.17",
-     "vscode-ripgrep": "1.1.0",
-     "vscode-textmate": "^4.0.1",
-+<<<<<<< .our
-     "vscode-xterm": "3.7.0-beta4",
-+=======
-+    "vscode-xterm": "3.6.0-beta13",
-+>>>>>>> .their
-     "winreg": "^1.2.4",
-     "yauzl": "^2.9.1"
-   },
-changed in both
-  base   100644 c09f6334b7f4654eacac6cfeb531defabef081f3 src/vs/base/common/resources.ts
-  our    100644 53357fe29f5f8919d794f7850dfaffd61f179591 src/vs/base/common/resources.ts
-  their  100644 af2d8eaa6a157d980ae81406148fe28fc4ea1dbf src/vs/base/common/resources.ts
-changed in both
-  base   100644 1b10a58da57e62ebfcbf4235da835802bbb3c050 src/vs/code/electron-main/app.ts
-  our    100644 c0185b039e95315e65379ca7cda7ff397219bdf9 src/vs/code/electron-main/app.ts
-  their  100644 a52ce64b90dbb29413f31e75d30df26f5dfeaaca src/vs/code/electron-main/app.ts
-@@ -63,10 +63,15 @@
- import { IMenubarService } from 'vs/platform/menubar/common/menubar';
- import { MenubarService } from 'vs/platform/menubar/electron-main/menubarService';
- import { MenubarChannel } from 'vs/platform/menubar/common/menubarIpc';
-+<<<<<<< .our
- import { IUriLabelService } from 'vs/platform/uriLabel/common/uriLabel';
- import { CodeMenu } from 'vs/code/electron-main/menus';
- import { hasArgs } from 'vs/platform/environment/node/argv';
- import { RunOnceScheduler } from 'vs/base/common/async';
-+=======
-+import { IUriDisplayService } from 'vs/platform/uriDisplay/common/uriDisplay';
-+import { CodeMenu } from 'vs/code/electron-main/menus';
-+>>>>>>> .their
- 
- export class CodeApplication {
- 
-changed in both
-  base   100644 b4bd6f0412ba41d3832e7c6c08b5ded48bc13c7a src/vs/code/electron-main/menubar.ts
-  our    100644 1bbfd9834bb83d9b49a3ce4b6f9cd46089cd2168 src/vs/code/electron-main/menubar.ts
-  their  100644 5605ff20117fd1390258d6c9f76e72f18eec8c26 src/vs/code/electron-main/menubar.ts
-@@ -252,15 +252,6 @@
- 			menubar.append(gotoMenuItem);
- 		}
- 
--		// Terminal
--		const terminalMenu = new Menu();
--		const terminalMenuItem = new MenuItem({ label: this.mnemonicLabel(nls.localize({ key: 'mTerminal', comment: ['&& denotes a mnemonic'] }, "Ter&&minal")), submenu: terminalMenu });
--
--		if (this.shouldDrawMenu('Terminal')) {
--			this.setMenuById(terminalMenu, 'Terminal');
--			menubar.append(terminalMenuItem);
--		}
--
- 		// Debug
- 		const debugMenu = new Menu();
- 		const debugMenuItem = new MenuItem({ label: this.mnemonicLabel(nls.localize({ key: 'mDebug', comment: ['&& denotes a mnemonic'] }, "&&Debug")), submenu: debugMenu });
-added in both
-  our    100644 9d5657cff26b159c842f9790d6387967d829e168 src/vs/code/electron-main/menus.ts
-  their  100644 e367f93d5c309e6d05c32b9a7f8b5f8c944ada12 src/vs/code/electron-main/menus.ts
-@@ -24,7 +24,11 @@
- import { IHistoryMainService } from 'vs/platform/history/common/history';
- import { IWorkspaceIdentifier, getWorkspaceLabel, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
- import URI from 'vs/base/common/uri';
-+<<<<<<< .our
- import { IUriLabelService } from 'vs/platform/uriLabel/common/uriLabel';
-+=======
-+import { IUriDisplayService } from 'vs/platform/uriDisplay/common/uriDisplay';
-+>>>>>>> .their
- 
- interface IMenuItemClickHandler {
- 	inDevTools: (contents: Electron.WebContents) => void;
-@@ -68,7 +72,11 @@
- 		@IEnvironmentService private environmentService: IEnvironmentService,
- 		@ITelemetryService private telemetryService: ITelemetryService,
- 		@IHistoryMainService private historyMainService: IHistoryMainService,
-+<<<<<<< .our
- 		@IUriLabelService private uriLabelService: IUriLabelService
-+=======
-+		@IUriDisplayService private uriDisplayService: IUriDisplayService
-+>>>>>>> .their
- 	) {
- 		this.nativeTabMenuItems = [];
- 
-@@ -242,11 +250,14 @@
- 		const gotoMenuItem = new MenuItem({ label: this.mnemonicLabel(nls.localize({ key: 'mGoto', comment: ['&& denotes a mnemonic'] }, "&&Go")), submenu: gotoMenu });
- 		this.setGotoMenu(gotoMenu);
- 
-+<<<<<<< .our
- 		// Terminal
- 		const terminalMenu = new Menu();
- 		const terminalMenuItem = new MenuItem({ label: this.mnemonicLabel(nls.localize({ key: 'mTerminal', comment: ['&& denotes a mnemonic'] }, "Ter&&minal")), submenu: terminalMenu });
- 		this.setTerminalMenu(terminalMenu);
- 
-+=======
-+>>>>>>> .their
- 		// Debug
- 		const debugMenu = new Menu();
- 		const debugMenuItem = new MenuItem({ label: this.mnemonicLabel(nls.localize({ key: 'mDebug', comment: ['&& denotes a mnemonic'] }, "&&Debug")), submenu: debugMenu });
-@@ -280,7 +291,10 @@
- 		menubar.append(selectionMenuItem);
- 		menubar.append(viewMenuItem);
- 		menubar.append(gotoMenuItem);
-+<<<<<<< .our
- 		menubar.append(terminalMenuItem);
-+=======
-+>>>>>>> .their
- 		menubar.append(debugMenuItem);
- 		menubar.append(taskMenuItem);
- 
-@@ -439,7 +453,10 @@
- 
- 	private getPreferencesMenu(): Electron.MenuItem {
- 		const settings = this.createMenuItem(nls.localize({ key: 'miOpenSettings', comment: ['&& denotes a mnemonic'] }, "&&Settings"), 'workbench.action.openSettings');
-+<<<<<<< .our
- 		const extensions = this.createMenuItem(nls.localize({ key: 'miOpenExtensions', comment: ['&& denotes a mnemonic'] }, '&&Extensions'), 'workbench.view.extensions');
-+=======
-+>>>>>>> .their
- 		const kebindingSettings = this.createMenuItem(nls.localize({ key: 'miOpenKeymap', comment: ['&& denotes a mnemonic'] }, "&&Keyboard Shortcuts"), 'workbench.action.openGlobalKeybindings');
- 		const keymapExtensions = this.createMenuItem(nls.localize({ key: 'miOpenKeymapExtensions', comment: ['&& denotes a mnemonic'] }, "&&Keymap Extensions"), 'workbench.extensions.action.showRecommendedKeymapExtensions');
- 		const snippetsSettings = this.createMenuItem(nls.localize({ key: 'miOpenSnippets', comment: ['&& denotes a mnemonic'] }, "User &&Snippets"), 'workbench.action.openSnippets');
-@@ -448,7 +465,10 @@
- 
- 		const preferencesMenu = new Menu();
- 		preferencesMenu.append(settings);
-+<<<<<<< .our
- 		preferencesMenu.append(extensions);
-+=======
-+>>>>>>> .their
- 		preferencesMenu.append(__separator__());
- 		preferencesMenu.append(kebindingSettings);
- 		preferencesMenu.append(keymapExtensions);
-@@ -496,6 +516,7 @@
- 		let label: string;
- 		let uri: URI;
- 		if (isSingleFolderWorkspaceIdentifier(workspace)) {
-+<<<<<<< .our
- 			label = unmnemonicLabel(getWorkspaceLabel(workspace, this.environmentService, this.uriLabelService, { verbose: true }));
- 			uri = workspace;
- 		} else if (isWorkspaceIdentifier(workspace)) {
-@@ -504,6 +525,16 @@
- 		} else {
- 			uri = URI.file(workspace);
- 			label = unmnemonicLabel(this.uriLabelService.getLabel(uri));
-+=======
-+			label = unmnemonicLabel(getWorkspaceLabel(workspace, this.environmentService, this.uriDisplayService, { verbose: true }));
-+			uri = workspace;
-+		} else if (isWorkspaceIdentifier(workspace)) {
-+			label = getWorkspaceLabel(workspace, this.environmentService, this.uriDisplayService, { verbose: true });
-+			uri = URI.file(workspace.configPath);
-+		} else {
-+			uri = URI.file(workspace);
-+			label = unmnemonicLabel(this.uriDisplayService.getLabel(uri));
-+>>>>>>> .their
- 		}
- 
- 		return new MenuItem(this.likeAction(commandId, {
-@@ -882,6 +913,7 @@
- 		].forEach(item => gotoMenu.append(item));
- 	}
- 
-+<<<<<<< .our
- 	private setTerminalMenu(terminalMenu: Electron.Menu): void {
- 		const newTerminal = this.createMenuItem(nls.localize({ key: 'miNewTerminal', comment: ['&& denotes a mnemonic'] }, "&&New Terminal"), 'workbench.action.terminal.new');
- 		const splitTerminal = this.createMenuItem(nls.localize({ key: 'miSplitTerminal', comment: ['&& denotes a mnemonic'] }, "&&Split Terminal"), 'workbench.action.terminal.split');
-@@ -912,6 +944,8 @@
- 		menuItems.forEach(item => terminalMenu.append(item));
- 	}
- 
-+=======
-+>>>>>>> .their
- 	private setDebugMenu(debugMenu: Electron.Menu): void {
- 		const start = this.createMenuItem(nls.localize({ key: 'miStartDebugging', comment: ['&& denotes a mnemonic'] }, "&&Start Debugging"), 'workbench.action.debug.start');
- 		const startWithoutDebugging = this.createMenuItem(nls.localize({ key: 'miStartWithoutDebugging', comment: ['&& denotes a mnemonic'] }, "Start &&Without Debugging"), 'workbench.action.debug.run');
-@@ -973,7 +1007,10 @@
- 		if (this.currentEnableNativeTabs) {
- 			const hasMultipleWindows = this.windowsMainService.getWindowCount() > 1;
- 
-+<<<<<<< .our
- 			this.nativeTabMenuItems.push(this.createMenuItem(nls.localize('mNewTab', "New Tab"), 'workbench.action.newWindowTab'));
-+=======
-+>>>>>>> .their
- 			this.nativeTabMenuItems.push(this.createMenuItem(nls.localize('mShowPreviousTab', "Show Previous Tab"), 'workbench.action.showPreviousWindowTab', hasMultipleWindows));
- 			this.nativeTabMenuItems.push(this.createMenuItem(nls.localize('mShowNextTab', "Show Next Tab"), 'workbench.action.showNextWindowTab', hasMultipleWindows));
- 			this.nativeTabMenuItems.push(this.createMenuItem(nls.localize('mMoveTabToNewWindow', "Move Tab to New Window"), 'workbench.action.moveWindowTabToNewWindow', hasMultipleWindows));
-@@ -1319,4 +1356,8 @@
- 
- function __separator__(): Electron.MenuItem {
- 	return new MenuItem({ type: 'separator' });
-+<<<<<<< .our
-+}
-+=======
- }
-+>>>>>>> .their
-merged
-  result 100644 5bb9d8adba33a0c638cc28e059bc992ac40add8b src/vs/platform/actions/common/actions.ts
-  our    100644 f0ba370d22dfa5eb5e51b75ad8f132f6de5991a7 src/vs/platform/actions/common/actions.ts
-@@ -100,7 +100,6 @@
- 	static readonly MenubarTasksMenu = new MenuId();
- 	static readonly MenubarPreferencesMenu = new MenuId();
- 	static readonly MenubarHelpMenu = new MenuId();
--	static readonly MenubarTerminalMenu = new MenuId();
- 
- 	readonly id: string = String(MenuId.ID++);
- }
-changed in both
-  base   100644 796cfaffb92a7933b73b49d3d7031e8a3ca9edd6 src/vs/platform/history/electron-main/historyMainService.ts
-  our    100644 3f2657d385162e51b58c9ce88c62add6ba3ec1a3 src/vs/platform/history/electron-main/historyMainService.ts
-  their  100644 518916342b01071767f2ff5be57db947566195ce src/vs/platform/history/electron-main/historyMainService.ts
-@@ -26,12 +26,20 @@
- 
- interface ISerializedRecentlyOpened {
- 	workspaces2: (IWorkspaceIdentifier | string)[]; // IWorkspaceIdentifier or URI.toString()
-+<<<<<<< .our
- 	files2: string[]; // files as URI.toString()
- }
- 
- interface ILegacySerializedRecentlyOpened {
- 	workspaces: (IWorkspaceIdentifier | string | UriComponents)[]; // legacy (UriComponents was also supported for a few insider builds)
- 	files: string[]; // files as paths
-+=======
-+	files: string[];
-+>>>>>>> .their
-+}
-+
-+interface ILegacySerializedRecentlyOpened {
-+	workspaces: (IWorkspaceIdentifier | string | UriComponents)[]; // legacy (UriComponents was also supported for a few insider builds)
- }
- 
- export class HistoryMainService implements IHistoryMainService {
-@@ -271,7 +279,10 @@
- 					}
- 				}
- 			} else if (Array.isArray(storedRecents.workspaces)) {
-+<<<<<<< .our
- 				// TODO@martin legacy support can be removed at some point (6 month?)
-+=======
-+>>>>>>> .their
- 				// format of 1.25 and before
- 				for (const workspace of storedRecents.workspaces) {
- 					if (typeof workspace === 'string') {
-@@ -284,6 +295,7 @@
- 					}
- 				}
- 			}
-+<<<<<<< .our
- 			if (Array.isArray(storedRecents.files2)) {
- 				for (const file of storedRecents.files2) {
- 					if (typeof file === 'string') {
-@@ -294,6 +306,12 @@
- 				for (const file of storedRecents.files) {
- 					if (typeof file === 'string') {
- 						result.files.push(URI.file(file));
-+=======
-+			if (Array.isArray(storedRecents.files)) {
-+				for (const file of storedRecents.files) {
-+					if (typeof file === 'string') {
-+						result.files.push(file);
-+>>>>>>> .their
- 					}
- 				}
- 			}
-@@ -302,7 +320,11 @@
- 	}
- 
- 	private saveRecentlyOpened(recent: IRecentlyOpened): void {
-+<<<<<<< .our
- 		const serialized: ISerializedRecentlyOpened = { workspaces2: [], files2: [] };
-+=======
-+		const serialized: ISerializedRecentlyOpened = { workspaces2: [], files: recent.files };
-+>>>>>>> .their
- 		for (const workspace of recent.workspaces) {
- 			if (isSingleFolderWorkspaceIdentifier(workspace)) {
- 				serialized.workspaces2.push(workspace.toString());
-@@ -310,9 +332,12 @@
- 				serialized.workspaces2.push(workspace);
- 			}
- 		}
-+<<<<<<< .our
- 		for (const file of recent.files) {
- 			serialized.files2.push(file.toString());
- 		}
-+=======
-+>>>>>>> .their
- 		this.stateService.setItem(HistoryMainService.recentlyOpenedStorageKey, serialized);
- 	}
- 
-changed in both
-  base   100644 b4ed6f55eab488ad1302bbc7e30d7ffe795635f7 src/vs/platform/node/product.ts
-  our    100644 dbb84fd473f8212ea96a20a8f12d66c5b703786a src/vs/platform/node/product.ts
-  their  100644 a3dce3929b2bca1fa088832dc9ee386e46db7224 src/vs/platform/node/product.ts
-changed in both
-  base   100644 b1543ed3d2f9f297cb6222076ea75e8d4a0186da src/vs/platform/theme/common/colorRegistry.ts
-  our    100644 674f67411d4ee542ee937fac9146ef0768ec982d src/vs/platform/theme/common/colorRegistry.ts
-  their  100644 8d984bd6f21c8450d851a4c038289b73296eec90 src/vs/platform/theme/common/colorRegistry.ts
-@@ -223,6 +223,14 @@
- 
- export const progressBarBackground = registerColor('progressBar.background', { dark: Color.fromHex('#0E70C0'), light: Color.fromHex('#0E70C0'), hc: contrastBorder }, nls.localize('progressBarBackground', "Background color of the progress bar that can show for long running operations."));
- 
-+<<<<<<< .our
-+=======
-+export const breadcrumbsForeground = registerColor('breadcrumb.foreground', { light: Color.fromHex('#6C6C6C').transparent(.7), dark: Color.fromHex('#CCCCCC').transparent(.7), hc: Color.white.transparent(.7) }, nls.localize('breadcrumbsFocusForeground', "Color of focused breadcrumb items."));
-+export const breadcrumbsFocusForeground = registerColor('breadcrumb.focusForeground', { light: '#6C6C6C', dark: '#CCCCCC', hc: Color.white }, nls.localize('breadcrumbsFocusForeground', "Color of focused breadcrumb items."));
-+export const breadcrumbsActiveSelectionForeground = registerColor('breadcrumb.activeSelectionForeground', { light: '#6C6C6C', dark: '#CCCCCC', hc: Color.white }, nls.localize('breadcrumbsSelectedForegound', "Color of selected breadcrumb items."));
-+export const breadcrumbsPickerBackground = registerColor('breadcrumbPicker.background', { light: '#ECECEC', dark: '#252526', hc: Color.black }, nls.localize('breadcrumbsSelectedBackground', "Background color of breadcrumb item picker."));
-+
-+>>>>>>> .their
- /**
-  * Editor background color.
-  * Because of bug https://monacotools.visualstudio.com/DefaultCollection/Monaco/_workitems/edit/13254
-removed in local
-  base   100644 486aeb0d77e7ff491c92249ce1081606b4bf9308 src/vs/platform/uriDisplay/common/uriDisplay.ts
-  their  100644 cd53cee444feaa967bf2275c495c16fe7fd790bb src/vs/platform/uriDisplay/common/uriDisplay.ts
-changed in both
-  base   100644 98eaf7888ca700629ba1266892ad9135c5089abf src/vs/workbench/api/node/apiCommands.ts
-  our    100644 d04d6b2334c914b4573cb10d4adea8925172017a src/vs/workbench/api/node/apiCommands.ts
-  their  100644 156a9b18147954d4dca508b961735e338eaf27c1 src/vs/workbench/api/node/apiCommands.ts
-@@ -12,6 +12,7 @@
- import { ITextEditorOptions } from 'vs/platform/editor/common/editor';
- import { EditorViewColumn } from 'vs/workbench/api/shared/editor';
- import { EditorGroupLayout } from 'vs/workbench/services/group/common/editorGroupsService';
-+import { isWindows } from 'vs/base/common/platform';
- 
- // -----------------------------------------------------------------
- // The following commands are registered on both sides separately.
-@@ -49,11 +50,18 @@
- 		if (!uri) {
- 			return executor.executeCommand('_files.pickFolderAndOpen', forceNewWindow);
- 		}
-+<<<<<<< .our
- 		let correctedUri = isMalformedFileUri(uri);
- 		if (correctedUri) {
- 			// workaround for #55916 and #55891, will be removed in 1.28
- 			console.warn(`'vscode.openFolder' command invoked with an invalid URI (file:// scheme missing): '${uri}'. Converted to a 'file://' URI: ${correctedUri}`);
- 			uri = correctedUri;
-+=======
-+		if (!uri.scheme || isWindows && uri.scheme.match(/^[a-zA-Z]$/)) {
-+			// workaround for #55916 and #55891, will be removed in 1.28
-+			console.warn(`'vscode.openFolder' command invoked with an invalid URI (file:// scheme missing): '${uri}'. Converted to a 'file://' URI.`);
-+			uri = URI.file((uri.scheme ? uri.scheme + ':' : '') + uri.path);
-+>>>>>>> .their
- 		}
- 
- 		return executor.executeCommand('_files.windowOpen', [uri], forceNewWindow);
-removed in local
-  base   100644 39c87100cce551f263420f6904834d778e9e2aab src/vs/workbench/browser/parts/menubar/menubar.contribution.ts
-  their  100644 04235f1557ddc62d458e20a7ae6f23675f8ef542 src/vs/workbench/browser/parts/menubar/menubar.contribution.ts
-removed in local
-  base   100644 b0cbfbf570f3193ab5f142bbbcca373b9c12cb5c src/vs/workbench/browser/parts/menubar/menubarPart.ts
-  their  100644 2f7e0891892de9bf1d0e8e3cd9b1ad8c6074f822 src/vs/workbench/browser/parts/menubar/menubarPart.ts
-changed in both
-  base   100644 a63062b1035a2a74babcf30cad76bc5c5f7796ba src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
-  our    100644 428a391e24bbf78b82754330a477c9733d9d5fba src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
-  their  100644 e35dd586dd82181150897fae02f537e281974668 src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
-changed in both
-  base   100644 b6b6953d245256eb8e700f5bf342a1eb4d50d1cd src/vs/workbench/electron-browser/window.ts
-  our    100644 b19e6c63fa80338a757edd069d788b28e35bdcb8 src/vs/workbench/electron-browser/window.ts
-  their  100644 f46b093c862fdc9dffff201109d36a050fe88a9c src/vs/workbench/electron-browser/window.ts
-changed in both
-  base   100644 b8d45826a4489e21e6c35732d6afcf0085a73e68 src/vs/workbench/parts/debug/electron-browser/debugService.ts
-  our    100644 a5e2dcee7a0eb14bc388d84c6c7cac591067b1b2 src/vs/workbench/parts/debug/electron-browser/debugService.ts
-  their  100644 61162e90a69902a792aaf58874d941a1a57435cc src/vs/workbench/parts/debug/electron-browser/debugService.ts
-@@ -171,7 +171,9 @@
- 			} else {
- 				const root = raw.root;
- 				raw.disconnect().done(undefined, errors.onUnexpectedError);
--				this.doCreateSession(root, { resolved: session.configuration, unresolved: session.unresolvedConfiguration }, session.getId());
-+				setTimeout(_ => {
-+					this.doCreateSession(root, { resolved: session.configuration, unresolved: session.unresolvedConfiguration }, session.getId());
-+				}, 1000);
- 			}
- 
- 			return;
-changed in both
-  base   100644 8fc5ed3bca172f911cb941e7aa300e1d97bd1963 src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
-  our    100644 3bfb6cffba943bf68a9fa9c24fb1903c66dd3fad src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
-  their  100644 70edc1d5fabc96d5d5c5cd512c403afdba337619 src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
-changed in both
-  base   100644 5930310b95e18f917a88acfaf6160b84a8974345 src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
-  our    100644 dde370485c80817a804989c810abe2f1db9c0966 src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
-  their  100644 650be5868e0a3cb324ea3b7eafdb27e1b21cf2a7 src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
-changed in both
-  base   100644 849d454f33dac6022061ddd66b34aa49cc0d4a06 src/vs/workbench/parts/splash/electron-browser/partsSplash.contribution.ts
-  our    100644 5f76b802ea5a6e6aafeb989856a8672f1d126c9d src/vs/workbench/parts/splash/electron-browser/partsSplash.contribution.ts
-  their  100644 4632aaf6efb6ed7dc220c62187dbb4c1320cda14 src/vs/workbench/parts/splash/electron-browser/partsSplash.contribution.ts
-@@ -17,8 +17,12 @@
- import { IDisposable, dispose } from 'vs/base/common/lifecycle';
- import { debounceEvent } from 'vs/base/common/event';
- import { DEFAULT_EDITOR_MIN_DIMENSIONS } from 'vs/workbench/browser/parts/editor/editor';
-+<<<<<<< .our
- import { ColorIdentifier, editorBackground, foreground } from 'vs/platform/theme/common/colorRegistry';
- import { Color } from 'vs/base/common/color';
-+=======
-+import { ColorIdentifier } from 'vs/platform/theme/common/colorRegistry';
-+>>>>>>> .their
- 
- class PartsSplash {
- 
-@@ -45,10 +49,14 @@
- 	}
- 
- 	private _savePartsSplash() {
-+<<<<<<< .our
- 		const baseTheme = getThemeTypeSelector(this._themeService.getTheme().type);
- 		const colorInfo = {
- 			foreground: this._getThemeColor(foreground),
- 			editorBackground: this._getThemeColor(editorBackground),
-+=======
-+		const colorInfo = {
-+>>>>>>> .their
- 			titleBarBackground: this._getThemeColor(themes.TITLE_BAR_ACTIVE_BACKGROUND),
- 			activityBarBackground: this._getThemeColor(themes.ACTIVITY_BAR_BACKGROUND),
- 			sideBarBackground: this._getThemeColor(themes.SIDE_BAR_BACKGROUND),
-@@ -82,6 +90,12 @@
- 		return color ? color.toString() : undefined;
- 	}
- 
-+	private _getThemeColor(id: ColorIdentifier): string {
-+		const theme = this._themeService.getTheme();
-+		const color = theme.getColor(id);
-+		return color ? color.toString() : undefined;
-+	}
-+
- 	private _removePartsSplash(): void {
- 		let element = document.getElementById(PartsSplash._splashElementId);
- 		if (element) {
-removed in remote
-  base   100644 52498a02f5195349043389a3f51361135c2c0723 src/vs/workbench/parts/terminal/common/terminalMenu.ts
-  our    100644 52498a02f5195349043389a3f51361135c2c0723 src/vs/workbench/parts/terminal/common/terminalMenu.ts
-@@ -1,120 +0,0 @@
--/*---------------------------------------------------------------------------------------------
-- *  Copyright (c) Microsoft Corporation. All rights reserved.
-- *  Licensed under the MIT License. See License.txt in the project root for license information.
-- *--------------------------------------------------------------------------------------------*/
--
--import * as nls from 'vs/nls';
--import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
--import { TERMINAL_COMMAND_ID } from 'vs/workbench/parts/terminal/common/terminalCommands';
--import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
--
--export function setupTerminalMenu() {
--
--	// View menu
--
--	MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
--		group: '4_panels',
--		command: {
--			id: TERMINAL_COMMAND_ID.TOGGLE,
--			title: nls.localize({ key: 'miToggleIntegratedTerminal', comment: ['&& denotes a mnemonic'] }, "&&Integrated Terminal")
--		},
--		order: 3
--	});
--
--	// Manage
--	const manageGroup = '1_manage';
--	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
--		group: manageGroup,
--		command: {
--			id: TERMINAL_COMMAND_ID.NEW,
--			title: nls.localize({ key: 'miNewTerminal', comment: ['&& denotes a mnemonic'] }, "&&New Terminal")
--		},
--		order: 1
--	});
--	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
--		group: manageGroup,
--		command: {
--			id: TERMINAL_COMMAND_ID.SPLIT,
--			title: nls.localize({ key: 'miSplitTerminal', comment: ['&& denotes a mnemonic'] }, "&&Split Terminal"),
--			precondition: ContextKeyExpr.has('terminalIsOpen')
--		},
--		order: 2
--	});
--
--	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
--		group: manageGroup,
--		command: {
--			id: TERMINAL_COMMAND_ID.KILL,
--			title: nls.localize({ key: 'miKillTerminal', comment: ['&& denotes a mnemonic'] }, "&&Kill Terminal"),
--			precondition: ContextKeyExpr.has('terminalIsOpen')
--		},
--		order: 3
--	});
--
--	// Run
--	const runGroup = '2_run';
--	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
--		group: runGroup,
--		command: {
--			id: TERMINAL_COMMAND_ID.CLEAR,
--			title: nls.localize({ key: 'miClear', comment: ['&& denotes a mnemonic'] }, "&&Clear"),
--			precondition: ContextKeyExpr.has('terminalIsOpen')
--		},
--		order: 1
--	});
--	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
--		group: runGroup,
--		command: {
--			id: TERMINAL_COMMAND_ID.RUN_ACTIVE_FILE,
--			title: nls.localize({ key: 'miRunActiveFile', comment: ['&& denotes a mnemonic'] }, "Run &&Active File")
--		},
--		order: 2
--	});
--	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
--		group: runGroup,
--		command: {
--			id: TERMINAL_COMMAND_ID.RUN_SELECTED_TEXT,
--			title: nls.localize({ key: 'miRunSelectedText', comment: ['&& denotes a mnemonic'] }, "Run &&Selected Text")
--		},
--		order: 3
--	});
--
--	// Navigation
--	const navigationGroup = '3_navigation';
--	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
--		group: navigationGroup,
--		command: {
--			id: TERMINAL_COMMAND_ID.SCROLL_TO_PREVIOUS_COMMAND,
--			title: nls.localize({ key: 'miScrollToPreviousCommand', comment: ['&& denotes a mnemonic'] }, "Scroll To Previous Command"),
--			precondition: ContextKeyExpr.has('terminalIsOpen')
--		},
--		order: 1
--	});
--	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
--		group: navigationGroup,
--		command: {
--			id: TERMINAL_COMMAND_ID.SCROLL_TO_NEXT_COMMAND,
--			title: nls.localize({ key: 'miScrollToNextCommand', comment: ['&& denotes a mnemonic'] }, "Scroll To Next Command"),
--			precondition: ContextKeyExpr.has('terminalIsOpen')
--		},
--		order: 2
--	});
--	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
--		group: navigationGroup,
--		command: {
--			id: TERMINAL_COMMAND_ID.SELECT_TO_PREVIOUS_COMMAND,
--			title: nls.localize({ key: 'miSelectToPreviousCommand', comment: ['&& denotes a mnemonic'] }, "Select To Previous Command"),
--			precondition: ContextKeyExpr.has('terminalIsOpen')
--		},
--		order: 3
--	});
--	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
--		group: navigationGroup,
--		command: {
--			id: TERMINAL_COMMAND_ID.SELECT_TO_NEXT_COMMAND,
--			title: nls.localize({ key: 'miSelectToNextCommand', comment: ['&& denotes a mnemonic'] }, "Select To Next Command"),
--			precondition: ContextKeyExpr.has('terminalIsOpen')
--		},
--		order: 4
--	});
--}
-changed in both
-  base   100644 4e288255067120a2f2e0e30d5b5c348f01427502 src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
-  our    100644 9ef058f2994595d2b04a5e832c71a30592895aac src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
-  their  100644 074c048a09cb976e2f5d590dbe917e65c877b811 src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
-@@ -37,7 +37,6 @@
- import { TerminalPanel } from 'vs/workbench/parts/terminal/electron-browser/terminalPanel';
- import { TerminalPickerHandler } from 'vs/workbench/parts/terminal/browser/terminalQuickOpen';
- import { setupTerminalCommands, TERMINAL_COMMAND_ID } from 'vs/workbench/parts/terminal/common/terminalCommands';
--import { setupTerminalMenu } from 'vs/workbench/parts/terminal/common/terminalMenu';
- 
- const quickOpenRegistry = (Registry.as<IQuickOpenRegistry>(QuickOpenExtensions.Quickopen));
- 
-@@ -535,6 +534,5 @@
- actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ToggleEscapeSequenceLoggingAction, ToggleEscapeSequenceLoggingAction.ID, ToggleEscapeSequenceLoggingAction.LABEL), 'Terminal: Toggle Escape Sequence Logging', category);
- 
- setupTerminalCommands();
--setupTerminalMenu();
- 
- registerColors();
-changed in both
-  base   100644 2ce9bd83b960352f59226489b3f1ae767fe7a82d src/vs/workbench/parts/update/electron-browser/update.ts
-  our    100644 2e468debc61fae01ce2d9c4b673a81993982cc62 src/vs/workbench/parts/update/electron-browser/update.ts
-  their  100644 04edd26fd77e5fc54160c4dd3155caa68d3b45ea src/vs/workbench/parts/update/electron-browser/update.ts
-@@ -249,10 +249,13 @@
- 		@IOpenerService private openerService: IOpenerService,
- 		@IUpdateService private updateService: IUpdateService
- 	) {
-+<<<<<<< .our
- 		if (!environmentService.isBuilt) {
- 			return;
- 		}
- 
-+=======
-+>>>>>>> .their
- 		const neverShowAgain = new NeverShowAgain(WinUserSetupContribution.KEY_BOTH, this.storageService);
- 
- 		if (!neverShowAgain.shouldShow()) {
-@@ -267,12 +270,22 @@
- 			}
- 
- 			const handle = this.notificationService.prompt(
-+<<<<<<< .our
- 				severity.Info,
- 				nls.localize('usersetupsystem', "You are running the system-wide installation of {0}, while having the user-wide distribution installed as well.", product.nameShort),
- 				[
- 					{ label: nls.localize('ok', "OK"), run: () => null },
- 					{
- 						label: nls.localize('okneveragain', "OK, Don't Show Again"),
-+=======
-+				severity.Warning,
-+				nls.localize('usersetupsystem', "You are running the system-wide installation of {0}, while having the user-wide distribution installed as well. Make sure you're running the {0} version you expect.", product.nameShort),
-+				[
-+					{ label: nls.localize('ok', "OK"), run: () => null },
-+					{
-+						label: nls.localize('neveragain', "Don't Show Again"),
-+						isSecondary: true,
-+>>>>>>> .their
- 						run: () => {
- 							neverShowAgain.action.run(handle);
- 							neverShowAgain.action.dispose();
-changed in both
-  base   100644 41e23fc99811fdb6c8d80ca026eef510574e9115 src/vs/workbench/services/textfile/common/textFileEditorModel.ts
-  our    100644 6faef447dc315ab88c3c3c652840860db088fa46 src/vs/workbench/services/textfile/common/textFileEditorModel.ts
-  their  100644 0c3642145b3164f68b07cbb474726b0f76c297bb src/vs/workbench/services/textfile/common/textFileEditorModel.ts
-changed in both
-  base   100644 b0b61b7a439360d1f66858259ab408ba819b2ea9 yarn.lock
-  our    100644 b56aa332449f9eb6db4b03a16548d91df21604bb yarn.lock
-  their  100644 79f54d1676d113d2142fe751cd1aa121ecbef2e3 yarn.lock
diff --git a/app/test/fixtures/merge-parser/vscode/merge-roblou-caseInsensitiveGlobs-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-roblou-caseInsensitiveGlobs-into-master.txt
deleted file mode 100644
index e9a3b191b80..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-roblou-caseInsensitiveGlobs-into-master.txt
+++ /dev/null
@@ -1,190 +0,0 @@
-changed in both
-  base   100644 7314589644ac972ec61a9b0bfcde867271351298 src/vs/base/common/glob.ts
-  our    100644 6ec8e429211b4bfe577a5acce697c639e25f14de src/vs/base/common/glob.ts
-  their  100644 6c148c0a0d78baafb18f4a29f47218b28d3a5eae src/vs/base/common/glob.ts
-@@ -256,6 +256,8 @@
- 	 * Simplify patterns for use as exclusion filters during tree traversal to skip entire subtrees. Cannot be used outside of a tree traversal.
- 	 */
- 	trimForExclusions?: boolean;
-+
-+	caseSensitive?: boolean;
- }
- 
- interface ParsedStringPattern {
-@@ -298,16 +300,22 @@
- 	// Whitespace trimming
- 	pattern = pattern.trim();
- 
-+	if (!options.caseSensitive) {
-+		pattern = pattern.toLowerCase();
-+	}
-+
-+	// Check cache
-+	const patternKey = `${pattern}_${!!options.trimForExclusions}_${!!options.caseSensitive}`;
-+	let parsedPattern: ParsedStringPattern;
-+	let match: RegExpExecArray;
-+
- 	// Check cache
--	const patternKey = `${pattern}_${!!options.trimForExclusions}`;
--	let parsedPattern = CACHE.get(patternKey);
--	if (parsedPattern) {
--		return wrapRelativePattern(parsedPattern, arg1);
-+	if (CACHE.has(patternKey)) {
-+		parsedPattern = CACHE.get(patternKey);
- 	}
- 
- 	// Check for Trivias
--	let match: RegExpExecArray;
--	if (T1.test(pattern)) { // common pattern: **/*.txt just need endsWith check
-+	else if (T1.test(pattern)) { // common pattern: **/*.txt just need endsWith check
- 		const base = pattern.substr(4); // '**/*'.length === 4
- 		parsedPattern = function (path, basename) {
- 			return path && strings.endsWith(path, base) ? pattern : null;
-@@ -330,7 +338,16 @@
- 	// Cache
- 	CACHE.set(patternKey, parsedPattern);
- 
--	return wrapRelativePattern(parsedPattern, arg1);
-+	const relativePattern = wrapRelativePattern(parsedPattern, arg1);
-+	return options.caseSensitive ?
-+		relativePattern :
-+		wrapCaseInsensitivePattern(relativePattern);
-+}
-+
-+function wrapCaseInsensitivePattern(parsedPattern: ParsedStringPattern): ParsedStringPattern {
-+	return function (path, basename) {
-+		return parsedPattern(path && path.toLowerCase(), basename);
-+	};
- }
- 
- function wrapRelativePattern(parsedPattern: ParsedStringPattern, arg2: string | IRelativePattern): ParsedStringPattern {
-changed in both
-  base   100644 ab62f52ccbef7cac373a7e5b3a08a6ac803a3a45 src/vs/platform/files/common/files.ts
-  our    100644 72b73ed86d2a2250bc747d5e4821c82038379d3b src/vs/platform/files/common/files.ts
-  their  100644 3050b37c5609a506755f782b8d8bd921430d9855 src/vs/platform/files/common/files.ts
-@@ -666,6 +666,7 @@
- 		eol: string;
- 		hotExit: string;
- 		useExperimentalFileWatcher: boolean;
-+		caseSensitiveGlobPatterns: boolean;
- 	};
- }
- 
-changed in both
-  base   100644 3090197c532c28cabb1e2110c29df2226005a105 src/vs/platform/search/common/search.ts
-  our    100644 fff587381bac43d30255840e3244372b02a749ff src/vs/platform/search/common/search.ts
-  their  100644 5bfdb482049d86a3645a29deed2a79fc0f592eac src/vs/platform/search/common/search.ts
-@@ -84,7 +84,11 @@
- 	disregardIgnoreFiles?: boolean;
- 	disregardExcludeSettings?: boolean;
- 	ignoreSymlinks?: boolean;
-+<<<<<<< .our
- 	maxFileSize?: number;
-+=======
-+	caseSensitivePatterns?: boolean;
-+>>>>>>> .their
- }
- 
- export interface IQueryOptions extends ICommonQueryOptions<uri> {
-changed in both
-  base   100644 8bedc8f8563957228553e5a5b7ce76d6c330b153 src/vs/workbench/parts/files/electron-browser/files.contribution.ts
-  our    100644 39594b253a5e15c246b9e7e130e1e282a55088a3 src/vs/workbench/parts/files/electron-browser/files.contribution.ts
-  their  100644 5bcb7159a57815be9eb5ecdb26339ed767b180c6 src/vs/workbench/parts/files/electron-browser/files.contribution.ts
-@@ -307,10 +307,17 @@
- 			'type': 'string',
- 			'description': nls.localize('defaultLanguage', "The default language mode that is assigned to new files.")
- 		},
-+<<<<<<< .our
- 		'files.maxMemoryForLargeFilesMB': {
- 			'type': 'number',
- 			'default': 4096,
- 			'markdownDescription': nls.localize('maxMemoryForLargeFilesMB', "Controls the memory available to VS Code after restart when trying to open large files. Same effect as specifying `--max-memory=NEWSIZE` on the command line.")
-+=======
-+		'files.caseSensitiveGlobPatterns': {
-+			'type': 'boolean',
-+			'default': false,
-+			'description': nls.localize('caseSensitiveGlobPatterns', "Apply glob patterns case-sensitively, anywhere that they are used.")
-+>>>>>>> .their
- 		}
- 	}
- });
-changed in both
-  base   100644 f34af09e3107416bf55175577738e6694f41abf6 src/vs/workbench/parts/search/common/queryBuilder.ts
-  our    100644 08bea8ac1cd1ac176f945e3b17a9312781a25be1 src/vs/workbench/parts/search/common/queryBuilder.ts
-  their  100644 2ca50a053a533770a46fc15ae06f8f65b4039392 src/vs/workbench/parts/search/common/queryBuilder.ts
-@@ -78,7 +78,13 @@
- 			contentPattern.wordSeparators = this.configurationService.getValue<ISearchConfiguration>().editor.wordSeparators;
- 		}
- 
-+<<<<<<< .our
- 		const query: ISearchQuery = {
-+=======
-+		const caseSensitivePatterns = this.configurationService.getValue<ISearchConfiguration>().files.caseSensitiveGlobPatterns;
-+
-+		const query = <ISearchQuery>{
-+>>>>>>> .their
- 			type,
- 			folderQueries,
- 			usingSearchPaths: !!(searchPaths && searchPaths.length),
-@@ -88,6 +94,7 @@
- 				: options.filePattern,
- 			excludePattern,
- 			includePattern,
-+			caseSensitivePatterns,
- 			maxResults: options.maxResults,
- 			sortByScore: options.sortByScore,
- 			cacheKey: options.cacheKey,
-changed in both
-  base   100644 8742487da29f7350137609ed085c510728de8c45 src/vs/workbench/services/search/node/ripgrepTextSearch.ts
-  our    100644 56cb2ff5b994c5cedf419a218e3c64e8305f8766 src/vs/workbench/services/search/node/ripgrepTextSearch.ts
-  their  100644 125a81403ca993d3b9c2f90a294c3e9b095d0109 src/vs/workbench/services/search/node/ripgrepTextSearch.ts
-@@ -445,9 +445,11 @@
- 	const args = ['--hidden', '--heading', '--line-number', '--color', 'ansi', '--colors', 'path:none', '--colors', 'line:none', '--colors', 'match:fg:red', '--colors', 'match:style:nobold'];
- 	args.push(config.contentPattern.isCaseSensitive ? '--case-sensitive' : '--ignore-case');
- 
-+	const globArgName = config.caseSensitivePatterns ? '-g' : '--iglob';
-+
- 	// includePattern can't have siblingClauses
- 	foldersToIncludeGlobs(config.folderQueries, config.includePattern).forEach(globArg => {
--		args.push('-g', globArg);
-+		args.push(globArgName, globArg);
- 	});
- 
- 	let siblingClauses: glob.IExpression;
-@@ -457,10 +459,10 @@
- 	const universalExcludes = findUniversalExcludes(config.folderQueries);
- 	const rgGlobs = foldersToRgExcludeGlobs(config.folderQueries, config.excludePattern, universalExcludes);
- 	rgGlobs.globArgs
--		.forEach(rgGlob => args.push('-g', `!${rgGlob}`));
-+		.forEach(rgGlob => args.push(globArgName, `!${rgGlob}`));
- 	if (universalExcludes) {
- 		universalExcludes
--			.forEach(exclude => args.push('-g', `!${trimTrailingSlash(exclude)}`));
-+			.forEach(exclude => args.push(globArgName, `!${trimTrailingSlash(exclude)}`));
- 	}
- 	siblingClauses = rgGlobs.siblingClauses;
- 
-changed in both
-  base   100644 1c5c4947e7a76b5e78d73c1a8409eea905631cfa src/vs/workbench/services/search/node/search.ts
-  our    100644 3bb3cc19b4d2b15d628016856b37c5db9c390c5b src/vs/workbench/services/search/node/search.ts
-  their  100644 440b77ea93500e78a40645e3d8af99ed95857347 src/vs/workbench/services/search/node/search.ts
-@@ -26,6 +26,7 @@
- 	filePattern?: string;
- 	excludePattern?: IExpression;
- 	includePattern?: IExpression;
-+	caseSensitivePatterns?: boolean;
- 	contentPattern?: IPatternInfo;
- 	maxResults?: number;
- 	exists?: boolean;
-changed in both
-  base   100644 b6307b38dd40d18116241570aeff80ac90b298e4 src/vs/workbench/services/search/node/searchService.ts
-  our    100644 5bf7b93503cb5ecead2832c567244eabe2f261f3 src/vs/workbench/services/search/node/searchService.ts
-  their  100644 30c3f9f72937f0debb3aefef12bf48d5a5a9468e src/vs/workbench/services/search/node/searchService.ts
-@@ -371,6 +371,7 @@
- 			filePattern: query.filePattern,
- 			excludePattern: query.excludePattern,
- 			includePattern: query.includePattern,
-+			caseSensitivePatterns: query.caseSensitivePatterns,
- 			maxResults: query.maxResults,
- 			exists: query.exists,
- 			sortByScore: query.sortByScore,
diff --git a/app/test/fixtures/merge-parser/vscode/merge-roblou-hoverSpreadOperator-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-roblou-hoverSpreadOperator-into-master.txt
deleted file mode 100644
index 38d6390b670..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-roblou-hoverSpreadOperator-into-master.txt
+++ /dev/null
@@ -1,80 +0,0 @@
-changed in both
-  base   100644 c91609db06ae03c7c9d95846cd6b89136ffd8375 src/vs/workbench/parts/debug/electron-browser/debugHover.ts
-  our    100644 6e43c34d40bb7d3287b2fbbc0d6ca55a55efddc4 src/vs/workbench/parts/debug/electron-browser/debugHover.ts
-  their  100644 3cb7b0fac646b1fe4351f5256ca050a597740662 src/vs/workbench/parts/debug/electron-browser/debugHover.ts
-@@ -4,6 +4,7 @@
-  *--------------------------------------------------------------------------------------------*/
- 
- import * as nls from 'vs/nls';
-+import * as strings from 'vs/base/common/strings';
- import * as lifecycle from 'vs/base/common/lifecycle';
- import { TPromise } from 'vs/base/common/winjs.base';
- import { KeyCode } from 'vs/base/common/keyCodes';
-@@ -33,6 +34,8 @@
- const $ = dom.$;
- const MAX_ELEMENTS_SHOWN = 18;
- 
-+const SPREAD_OPERATOR = '...';
-+
- export class DebugHoverWidget implements IContentWidget {
- 
- 	public static readonly ID = 'debug.hoverWidget';
-@@ -139,6 +142,58 @@
- 		return this.domNode;
- 	}
- 
-+<<<<<<< .our
-+=======
-+	private getExactExpressionRange(lineContent: string, range: Range): Range {
-+		let matchingExpression: string = undefined;
-+		let startOffset = 0;
-+
-+		// Some example supported expressions: myVar.prop, a.b.c.d, myVar?.prop, myVar->prop, MyClass::StaticProp, *myVar
-+		// Match any character except a set of characters which often break interesting sub-expressions
-+		let expression: RegExp = /([^()\[\]{}<>\s+\-/%~#^;=|,`!]|\->)+/g;
-+		let result: RegExpExecArray = undefined;
-+
-+		// First find the full expression under the cursor
-+		while (result = expression.exec(lineContent)) {
-+			let match = result[0];
-+			let start = result.index + 1;
-+			let end = start + match.length;
-+
-+			if (strings.startsWith(match, SPREAD_OPERATOR)) {
-+				match = strings.ltrim(match, SPREAD_OPERATOR);
-+				start += SPREAD_OPERATOR.length;
-+			}
-+
-+			if (start <= range.startColumn && end >= range.endColumn) {
-+				matchingExpression = match;
-+				startOffset = start;
-+				break;
-+			}
-+		}
-+
-+		// If there are non-word characters after the cursor, we want to truncate the expression then.
-+		// For example in expression 'a.b.c.d', if the focus was under 'b', 'a.b' would be evaluated.
-+		if (matchingExpression) {
-+			let subExpression: RegExp = /\w+/g;
-+			let subExpressionResult: RegExpExecArray = undefined;
-+			while (subExpressionResult = subExpression.exec(matchingExpression)) {
-+				let subEnd = subExpressionResult.index + 1 + startOffset + subExpressionResult[0].length;
-+				if (subEnd >= range.endColumn) {
-+					break;
-+				}
-+			}
-+
-+			if (subExpressionResult) {
-+				matchingExpression = matchingExpression.substring(0, subExpression.lastIndex);
-+			}
-+		}
-+
-+		return matchingExpression ?
-+			new Range(range.startLineNumber, startOffset, range.endLineNumber, startOffset + matchingExpression.length - 1) :
-+			new Range(range.startLineNumber, 0, range.endLineNumber, 0);
-+	}
-+
-+>>>>>>> .their
- 	public showAt(range: Range, focus: boolean): TPromise<void> {
- 		const pos = range.getStartPosition();
- 
diff --git a/app/test/fixtures/merge-parser/vscode/merge-roblou-promoteExtLogAPI-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-roblou-promoteExtLogAPI-into-master.txt
deleted file mode 100644
index e0e47570917..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-roblou-promoteExtLogAPI-into-master.txt
+++ /dev/null
@@ -1,98 +0,0 @@
-changed in both
-  base   100644 cfcb69a2975988bd249a5c473463ab626b93105f src/vs/vscode.d.ts
-  our    100644 6000b0300db361418bc31c0585263a9d663705f5 src/vs/vscode.d.ts
-  their  100644 7eb22ccc70d39d02ff5db7631e68eda876d5dafb src/vs/vscode.d.ts
-@@ -4539,11 +4539,69 @@
- 		storagePath: string | undefined;
- 
- 		/**
-+<<<<<<< .our
- 		 * An absolute file path of a directory in which the extension can create log files.
- 		 * The directory might not exist on disk and creation is up to the extension. However,
- 		 * the parent directory is guaranteed to be existent.
- 		 */
- 		logPath: string;
-+=======
-+		 * This extension's logger
-+		 */
-+		logger: Logger;
-+	}
-+
-+	/**
-+	 * The severity level of a log message
-+	 */
-+	export enum LogLevel {
-+		Trace = 1,
-+		Debug = 2,
-+		Info = 3,
-+		Warning = 4,
-+		Error = 5,
-+		Critical = 6,
-+		Off = 7
-+	}
-+
-+	/**
-+	 * A logger for writing to an extension's log file, and accessing its dedicated log directory.
-+	 */
-+	export interface Logger {
-+		readonly onDidChangeLogLevel: Event<LogLevel>;
-+		readonly currentLevel: LogLevel;
-+		readonly logDirectory: Thenable<string>;
-+
-+		/**
-+		 * Log a message with level `Trace`
-+		 */
-+		trace(message: string, ...args: any[]): void;
-+
-+		/**
-+		 * Log a message with level `Debug`
-+		 */
-+		debug(message: string, ...args: any[]): void;
-+
-+		/**
-+		 * Log a message with level `Info`
-+		 */
-+		info(message: string, ...args: any[]): void;
-+
-+		/**
-+		 * Log a message with level `Warn`
-+		 */
-+		warn(message: string, ...args: any[]): void;
-+
-+		/**
-+		 * Log a message with level `Error`
-+		 */
-+		error(message: string | Error, ...args: any[]): void;
-+
-+		/**
-+		 * Log a message with level `Critical`
-+		 */
-+		critical(message: string | Error, ...args: any[]): void;
-+>>>>>>> .their
- 	}
- 
- 	/**
-changed in both
-  base   100644 757a2d143394115f021dd8b8335e791d7bc9e5bc src/vs/vscode.proposed.d.ts
-  our    100644 3de4a7af9dda9e3e523ba4b5774f1667d66b0b9b src/vs/vscode.proposed.d.ts
-  their  100644 11c0db76db37b727e9edf701c1373f0d81fe18f5 src/vs/vscode.proposed.d.ts
-@@ -417,6 +417,7 @@
- 		debugAdapterExecutable?(folder: WorkspaceFolder | undefined, token?: CancellationToken): ProviderResult<DebugAdapterExecutable>;
- 	}
- 
-+<<<<<<< .our
- 	//#endregion
- 
- 	//#region Rob, Matt: logging
-@@ -467,6 +468,11 @@
- 		 * @readonly
- 		 */
- 		export const logLevel: LogLevel;
-+=======
-+	export interface RenameInitialValue {
-+		range: Range;
-+		text?: string;
-+>>>>>>> .their
- 	}
- 
- 	//#endregion
diff --git a/app/test/fixtures/merge-parser/vscode/merge-roblou-searchAPIchanges-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-roblou-searchAPIchanges-into-master.txt
deleted file mode 100644
index 1da1e67ee10..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-roblou-searchAPIchanges-into-master.txt
+++ /dev/null
@@ -1,1131 +0,0 @@
-changed in both
-  base   100644 59949ab60c9655824e691cca589b66082141a2db src/vs/vscode.proposed.d.ts
-  our    100644 3de4a7af9dda9e3e523ba4b5774f1667d66b0b9b src/vs/vscode.proposed.d.ts
-  their  100644 949d3e7e4c92ed9fe0bfb76b1d83b344a8dbb1a9 src/vs/vscode.proposed.d.ts
-@@ -161,6 +161,21 @@
- 		preview: TextSearchResultPreview;
- 	}
- 
-+	export interface FileIndexProvider {
-+		provideFileIndex(options: FileSearchOptions, token: CancellationToken): Thenable<Uri[]>;
-+	}
-+
-+	export interface TextSearchProvider {
-+		/**
-+		 * Provide results that match the given text pattern.
-+		 * @param query The parameters for this query.
-+		 * @param options A set of options to consider while searching.
-+		 * @param progress A progress callback that must be invoked for all results.
-+		 * @param token A cancellation token.
-+		 */
-+		provideTextSearchResults?(query: TextSearchQuery, options: TextSearchOptions, progress: Progress<TextSearchResult>, token: CancellationToken): Thenable<void>;
-+	}
-+
- 	/**
- 	 * A FileIndexProvider provides a list of files in the given folder. VS Code will filter that list for searching with quickopen or from other extensions.
- 	 *
-@@ -200,6 +215,7 @@
- 		 * @param progress A progress callback that must be invoked for all results.
- 		 * @param token A cancellation token.
- 		 */
-+<<<<<<< .our
- 		provideFileSearchResults(query: FileSearchQuery, options: FileSearchOptions, token: CancellationToken): Thenable<Uri[]>;
- 	}
- 
-@@ -215,6 +231,15 @@
- 		 * @param token A cancellation token.
- 		 */
- 		provideTextSearchResults(query: TextSearchQuery, options: TextSearchOptions, progress: Progress<TextSearchResult>, token: CancellationToken): Thenable<void>;
-+=======
-+		provideFileSearchResults?(query: FileSearchQuery, options: FileSearchOptions, progress: Progress<Uri>, token: CancellationToken): Thenable<void>;
-+
-+		/**
-+		 * Optional - if the provider makes use of `query.cacheKey`, it can implement this method which is invoked when the cache can be cleared.
-+		 * @param cacheKey The same key that was passed as `query.cacheKey`.
-+		 */
-+		clearCache?(cacheKey: string): void;
-+>>>>>>> .their
- 	}
- 
- 	/**
-@@ -285,7 +310,33 @@
- 		 * @param provider The provider.
- 		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
- 		 */
-+<<<<<<< .our
- 		export function registerFileSearchProvider(scheme: string, provider: FileSearchProvider): Disposable;
-+=======
-+		export function registerFileSearchProvider(scheme: string, provider: SearchProvider): Disposable;
-+
-+		/**
-+		 * Register a text search provider.
-+		 *
-+		 * Only one provider can be registered per scheme.
-+		 *
-+		 * @param scheme The provider will be invoked for workspace folders that have this file scheme.
-+		 * @param provider The provider.
-+		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
-+		 */
-+		export function registerTextSearchProvider(scheme: string, provider: TextSearchProvider): Disposable;
-+
-+		/**
-+		 * Register a file index provider.
-+		 *
-+		 * Only one provider can be registered per scheme.
-+		 *
-+		 * @param scheme The provider will be invoked for workspace folders that have this file scheme.
-+		 * @param provider The provider.
-+		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
-+		 */
-+		export function registerFileIndexProvider(scheme: string, provider: FileIndexProvider): Disposable;
-+>>>>>>> .their
- 
- 		/**
- 		 * Register a text search provider.
-changed in both
-  base   100644 caffd57767b87abe86ffadfaba7ef7e1baf3d192 src/vs/workbench/api/electron-browser/mainThreadSearch.ts
-  our    100644 9028249c12b6df8911921b0b0ad6980bb9c833d3 src/vs/workbench/api/electron-browser/mainThreadSearch.ts
-  their  100644 d88cda816860304294c20f7bc951816f75d1cbd1 src/vs/workbench/api/electron-browser/mainThreadSearch.ts
-changed in both
-  base   100644 7f33441ca834e00a9790a642d29f418d1f855bed src/vs/workbench/api/node/extHost.api.impl.ts
-  our    100644 ea64898c5b15cfae4b4ab32d722f4ae4a68f831a src/vs/workbench/api/node/extHost.api.impl.ts
-  their  100644 504df828bc76e7354606e96b067681107d9f451b src/vs/workbench/api/node/extHost.api.impl.ts
-@@ -580,10 +580,13 @@
- 			registerFileSearchProvider: proposedApiFunction(extension, (scheme, provider) => {
- 				return extHostSearch.registerFileSearchProvider(scheme, provider);
- 			}),
-+<<<<<<< .our
- 			registerSearchProvider: proposedApiFunction(extension, () => {
- 				// Temp for live share in Insiders
- 				return { dispose: () => { } };
- 			}),
-+=======
-+>>>>>>> .their
- 			registerTextSearchProvider: proposedApiFunction(extension, (scheme, provider) => {
- 				return extHostSearch.registerTextSearchProvider(scheme, provider);
- 			}),
-changed in both
-  base   100644 11e0707a3467a81757546b271b99e530cd36de74 src/vs/workbench/api/node/extHost.protocol.ts
-  our    100644 edb764542adfbf0fba64e1b93de7c309bedf0d12 src/vs/workbench/api/node/extHost.protocol.ts
-  their  100644 ba37c355b3593a8e2a512b6e4efc47457ca68d11 src/vs/workbench/api/node/extHost.protocol.ts
-added in both
-  our    100644 90b8a578f1cf76a34063d5e958cf1babbb08df87 src/vs/workbench/api/node/extHostSearch.fileIndex.ts
-  their  100644 1cfb58fc3243ee243cecb4a715cf4b76f77d5f5e src/vs/workbench/api/node/extHostSearch.fileIndex.ts
-@@ -12,14 +12,23 @@
- import * as resources from 'vs/base/common/resources';
- import * as strings from 'vs/base/common/strings';
- import URI from 'vs/base/common/uri';
-+<<<<<<< .our
- import { TPromise } from 'vs/base/common/winjs.base';
- import { compareItemsByScore, IItemAccessor, prepareQuery, ScorerCache } from 'vs/base/parts/quickopen/common/quickOpenScorer';
- import { IFileMatch, IFolderQuery, IRawSearchQuery, ISearchCompleteStats, ISearchQuery } from 'vs/platform/search/common/search';
-+=======
-+import { PPromise, TPromise } from 'vs/base/common/winjs.base';
-+import { compareItemsByScore, IItemAccessor, prepareQuery, ScorerCache } from 'vs/base/parts/quickopen/common/quickOpenScorer';
-+import { ICachedSearchStats, IFileMatch, IFolderQuery, IRawSearchQuery, ISearchCompleteStats, ISearchQuery } from 'vs/platform/search/common/search';
-+>>>>>>> .their
- import * as vscode from 'vscode';
- 
- export interface IInternalFileMatch {
- 	base: URI;
-+<<<<<<< .our
- 	original?: URI;
-+=======
-+>>>>>>> .their
- 	relativePath?: string; // Not present for extraFiles or absolute path matches
- 	basename: string;
- 	size?: number;
-@@ -135,24 +144,37 @@
- 	pathToEntries: { [relativePath: string]: IDirectoryEntry[] };
- }
- 
-+<<<<<<< .our
- // ???
- interface IInternalSearchComplete {
- 	limitHit: boolean;
- 	results: IInternalFileMatch[];
- }
- 
-+=======
-+>>>>>>> .their
- export class FileIndexSearchEngine {
- 	private filePattern: string;
- 	private normalizedFilePatternLowercase: string;
- 	private includePattern: glob.ParsedExpression;
- 	private maxResults: number;
- 	private exists: boolean;
-+<<<<<<< .our
-+=======
-+	// private maxFilesize: number;
-+>>>>>>> .their
- 	private isLimitHit: boolean;
- 	private resultCount: number;
- 	private isCanceled: boolean;
- 
- 	private activeCancellationTokens: Set<CancellationTokenSource>;
- 
-+<<<<<<< .our
-+=======
-+	// private filesWalked: number;
-+	// private directoriesWalked: number;
-+
-+>>>>>>> .their
- 	private globalExcludePattern: glob.ParsedExpression;
- 
- 	constructor(private config: ISearchQuery, private provider: vscode.FileIndexProvider) {
-@@ -160,10 +182,20 @@
- 		this.includePattern = config.includePattern && glob.parse(config.includePattern);
- 		this.maxResults = config.maxResults || null;
- 		this.exists = config.exists;
-+<<<<<<< .our
-+=======
-+		// this.maxFilesize = config.maxFileSize || null;
-+>>>>>>> .their
- 		this.resultCount = 0;
- 		this.isLimitHit = false;
- 		this.activeCancellationTokens = new Set<CancellationTokenSource>();
- 
-+<<<<<<< .our
-+=======
-+		// this.filesWalked = 0;
-+		// this.directoriesWalked = 0;
-+
-+>>>>>>> .their
- 		if (this.filePattern) {
- 			this.normalizedFilePatternLowercase = strings.stripWildcards(this.filePattern).toLowerCase();
- 		}
-@@ -177,6 +209,7 @@
- 		this.activeCancellationTokens = new Set();
- 	}
- 
-+<<<<<<< .our
- 	public search(_onResult: (match: IInternalFileMatch) => void): TPromise<{ isLimitHit: boolean }> {
- 		if (this.config.folderQueries.length !== 1) {
- 			throw new Error('Searches just one folder');
-@@ -185,6 +218,12 @@
- 		const folderQuery = this.config.folderQueries[0];
- 
- 		return new TPromise<{ isLimitHit: boolean }>((resolve, reject) => {
-+=======
-+	public search(): PPromise<{ isLimitHit: boolean }, IInternalFileMatch> {
-+		const folderQueries = this.config.folderQueries;
-+
-+		return new PPromise<{ isLimitHit: boolean }, IInternalFileMatch>((resolve, reject, _onResult) => {
-+>>>>>>> .their
- 			const onResult = (match: IInternalFileMatch) => {
- 				this.resultCount++;
- 				_onResult(match);
-@@ -209,6 +248,7 @@
- 					});
- 			}
- 
-+<<<<<<< .our
- 			return this.searchInFolder(folderQuery, _onResult)
- 				.then(() => {
- 					resolve({ isLimitHit: this.isLimitHit });
-@@ -225,6 +265,26 @@
- 	private searchInFolder(fq: IFolderQuery<URI>, onResult: (match: IInternalFileMatch) => void): TPromise<void> {
- 		let cancellation = new CancellationTokenSource();
- 		return new TPromise((resolve, reject) => {
-+=======
-+			// For each root folder
-+			PPromise.join(folderQueries.map(fq => {
-+				return this.searchInFolder(fq).then(null, null, onResult);
-+			})).then(() => {
-+				resolve({ isLimitHit: this.isLimitHit });
-+			}, (errs: Error[]) => {
-+				const errMsg = errs
-+					.map(err => toErrorMessage(err))
-+					.filter(msg => !!msg)[0];
-+
-+				reject(new Error(errMsg));
-+			});
-+		});
-+	}
-+
-+	private searchInFolder(fq: IFolderQuery<URI>): PPromise<void, IInternalFileMatch> {
-+		let cancellation = new CancellationTokenSource();
-+		return new PPromise((resolve, reject, onResult) => {
-+>>>>>>> .their
- 			const options = this.getSearchOptionsForFolder(fq);
- 			const tree = this.initDirectoryTree();
- 
-@@ -240,7 +300,11 @@
- 				const relativePath = path.relative(fq.folder.path, uri.path);
- 				if (noSiblingsClauses) {
- 					const basename = path.basename(uri.path);
-+<<<<<<< .our
- 					this.matchFile(onResult, { base: fq.folder, relativePath, basename, original: uri });
-+=======
-+					this.matchFile(onResult, { base: fq.folder, relativePath, basename });
-+>>>>>>> .their
- 
- 					return;
- 				}
-@@ -276,7 +340,11 @@
- 		});
- 	}
- 
-+<<<<<<< .our
- 	private getSearchOptionsForFolder(fq: IFolderQuery<URI>): vscode.FileIndexOptions {
-+=======
-+	private getSearchOptionsForFolder(fq: IFolderQuery<URI>): vscode.FileSearchOptions {
-+>>>>>>> .their
- 		const includes = resolvePatternsForProvider(this.config.includePattern, fq.includePattern);
- 		const excludes = resolvePatternsForProvider(this.config.excludePattern, fq.excludePattern);
- 
-@@ -361,6 +429,25 @@
- 		matchDirectory(rootEntries);
- 	}
- 
-+<<<<<<< .our
-+=======
-+	public getStats(): any {
-+		return null;
-+		// return {
-+		// 	fromCache: false,
-+		// 	traversal: Traversal[this.traversal],
-+		// 	errors: this.errors,
-+		// 	fileWalkStartTime: this.fileWalkStartTime,
-+		// 	fileWalkResultTime: Date.now(),
-+		// 	directoriesWalked: this.directoriesWalked,
-+		// 	filesWalked: this.filesWalked,
-+		// 	resultCount: this.resultCount,
-+		// 	cmdForkResultTime: this.cmdForkResultTime,
-+		// 	cmdResultCount: this.cmdResultCount
-+		// };
-+	}
-+
-+>>>>>>> .their
- 	private matchFile(onResult: (result: IInternalFileMatch) => void, candidate: IInternalFileMatch): void {
- 		if (this.isFilePatternMatch(candidate.relativePath) && (!this.includePattern || this.includePattern(candidate.relativePath, candidate.basename))) {
- 			if (this.exists || (this.maxResults && this.resultCount >= this.maxResults)) {
-@@ -395,9 +482,13 @@
- 
- 	private caches: { [cacheKey: string]: Cache; } = Object.create(null);
- 
-+<<<<<<< .our
- 	private readonly folderCacheKeys = new Map<string, Set<string>>();
- 
- 	public fileSearch(config: ISearchQuery, provider: vscode.FileIndexProvider, onBatch: (matches: IFileMatch[]) => void): TPromise<ISearchCompleteStats> {
-+=======
-+	public fileSearch(config: ISearchQuery, provider: vscode.FileIndexProvider, onResult: (matches: IFileMatch[]) => void): TPromise<ISearchCompleteStats> {
-+>>>>>>> .their
- 		if (config.sortByScore) {
- 			let sortedSearch = this.trySortedSearchFromCache(config);
- 			if (!sortedSearch) {
-@@ -409,6 +500,7 @@
- 					config;
- 
- 				const engine = new FileIndexSearchEngine(engineConfig, provider);
-+<<<<<<< .our
- 				sortedSearch = this.doSortedSearch(engine, config);
- 			}
- 
-@@ -417,11 +509,25 @@
- 					this.sendAsBatches(complete.results, onBatch, FileIndexSearchManager.BATCH_SIZE);
- 					c(complete);
- 				}, e);
-+=======
-+				sortedSearch = this.doSortedSearch(engine, provider, config);
-+			}
-+
-+			return new TPromise<ISearchCompleteStats>((c, e) => {
-+				process.nextTick(() => { // allow caller to register progress callback first
-+					sortedSearch.then(([result, rawMatches]) => {
-+						const serializedMatches = rawMatches.map(rawMatch => this.rawMatchToSearchItem(rawMatch));
-+						this.sendProgress(serializedMatches, onResult, FileIndexSearchManager.BATCH_SIZE);
-+						c(result);
-+					}, e, onResult);
-+				});
-+>>>>>>> .their
- 			}, () => {
- 				sortedSearch.cancel();
- 			});
- 		}
- 
-+<<<<<<< .our
- 		const engine = new FileIndexSearchEngine(config, provider);
- 		return this.doSearch(engine)
- 			.then(complete => {
-@@ -442,10 +548,27 @@
- 		this.folderCacheKeys.get(config.cacheKey).add(folderCacheKey);
- 
- 		return folderCacheKey;
-+=======
-+		let searchPromise: TPromise<void, IInternalFileMatch[]>;
-+		return new TPromise<ISearchCompleteStats>((c, e) => {
-+			const engine = new FileIndexSearchEngine(config, provider);
-+			searchPromise = this.doSearch(engine, provider, FileIndexSearchManager.BATCH_SIZE)
-+				.then(c, e, progress => {
-+					if (Array.isArray(progress)) {
-+						onResult(progress.map(m => this.rawMatchToSearchItem(m)));
-+					} else if ((<IInternalFileMatch>progress).relativePath) {
-+						onResult([this.rawMatchToSearchItem(<IInternalFileMatch>progress)]);
-+					}
-+				});
-+		}, () => {
-+			searchPromise.cancel();
-+		});
-+>>>>>>> .their
- 	}
- 
- 	private rawMatchToSearchItem(match: IInternalFileMatch): IFileMatch {
- 		return {
-+<<<<<<< .our
- 			resource: match.original || resources.joinPath(match.base, match.relativePath)
- 		};
- 	}
-@@ -454,14 +577,40 @@
- 		let searchPromise: TPromise<void>;
- 		let allResultsPromise = new TPromise<IInternalSearchComplete>((c, e) => {
- 			searchPromise = this.doSearch(engine).then(c, e);
-+=======
-+			resource: resources.joinPath(match.base, match.relativePath)
-+		};
-+	}
-+
-+	private doSortedSearch(engine: FileIndexSearchEngine, provider: vscode.FileIndexProvider, config: IRawSearchQuery): PPromise<[ISearchCompleteStats, IInternalFileMatch[]]> {
-+		let searchPromise: PPromise<void, IInternalFileMatch[]>;
-+		let allResultsPromise = new PPromise<[ISearchCompleteStats, IInternalFileMatch[]], IInternalFileMatch[]>((c, e, p) => {
-+			let results: IInternalFileMatch[] = [];
-+			searchPromise = this.doSearch(engine, provider, -1)
-+				.then(result => {
-+					c([result, results]);
-+				}, e, progress => {
-+					if (Array.isArray(progress)) {
-+						results = progress;
-+					} else {
-+						p(progress);
-+					}
-+				});
-+>>>>>>> .their
- 		}, () => {
- 			searchPromise.cancel();
- 		});
- 
-+<<<<<<< .our
- 		const folderCacheKey = this.getFolderCacheKey(config);
- 		let cache: Cache;
- 		if (folderCacheKey) {
- 			cache = this.getOrCreateCache(folderCacheKey);
-+=======
-+		let cache: Cache;
-+		if (config.cacheKey) {
-+			cache = this.getOrCreateCache(config.cacheKey);
-+>>>>>>> .their
- 			cache.resultsToSearchCache[config.filePattern] = allResultsPromise;
- 			allResultsPromise.then(null, err => {
- 				delete cache.resultsToSearchCache[config.filePattern];
-@@ -470,6 +619,7 @@
- 		}
- 
- 		let chained: TPromise<void>;
-+<<<<<<< .our
- 		return new TPromise<IInternalSearchComplete>((c, e) => {
- 			chained = allResultsPromise.then(complete => {
- 				const scorerCache: ScorerCache = cache ? cache.scorerCache : Object.create(null);
-@@ -482,6 +632,25 @@
- 						});
- 					});
- 			}, e);
-+=======
-+		return new PPromise<[ISearchCompleteStats, IInternalFileMatch[]]>((c, e, p) => {
-+			chained = allResultsPromise.then(([result, results]) => {
-+				const scorerCache: ScorerCache = cache ? cache.scorerCache : Object.create(null);
-+				const unsortedResultTime = Date.now();
-+				return this.sortResults(config, results, scorerCache)
-+					.then(sortedResults => {
-+						const sortedResultTime = Date.now();
-+
-+						c([{
-+							stats: {
-+								...result.stats,
-+								...{ unsortedResultTime, sortedResultTime }
-+							},
-+							limitHit: result.limitHit || typeof config.maxResults === 'number' && results.length > config.maxResults
-+						}, sortedResults]);
-+					});
-+			}, e, p);
-+>>>>>>> .their
- 		}, () => {
- 			chained.cancel();
- 		});
-@@ -495,13 +664,19 @@
- 		return this.caches[cacheKey] = new Cache();
- 	}
- 
-+<<<<<<< .our
- 	private trySortedSearchFromCache(config: ISearchQuery): TPromise<IInternalSearchComplete> {
- 		const folderCacheKey = this.getFolderCacheKey(config);
- 		const cache = folderCacheKey && this.caches[folderCacheKey];
-+=======
-+	private trySortedSearchFromCache(config: IRawSearchQuery): TPromise<[ISearchCompleteStats, IInternalFileMatch[]]> {
-+		const cache = config.cacheKey && this.caches[config.cacheKey];
-+>>>>>>> .their
- 		if (!cache) {
- 			return undefined;
- 		}
- 
-+<<<<<<< .our
- 		const cached = this.getResultsFromCache(cache, config.filePattern);
- 		if (cached) {
- 			let chained: TPromise<void>;
-@@ -513,6 +688,41 @@
- 								limitHit: complete.limitHit || typeof config.maxResults === 'number' && complete.results.length > config.maxResults,
- 								results: sortedResults
- 							});
-+=======
-+		const cacheLookupStartTime = Date.now();
-+		const cached = this.getResultsFromCache(cache, config.filePattern);
-+		if (cached) {
-+			let chained: TPromise<void>;
-+			return new TPromise<[ISearchCompleteStats, IInternalFileMatch[]]>((c, e) => {
-+				chained = cached.then(([result, results, cacheStats]) => {
-+					const cacheLookupResultTime = Date.now();
-+					return this.sortResults(config, results, cache.scorerCache)
-+						.then(sortedResults => {
-+							const sortedResultTime = Date.now();
-+
-+							const stats: ICachedSearchStats = {
-+								fromCache: true,
-+								cacheLookupStartTime: cacheLookupStartTime,
-+								cacheFilterStartTime: cacheStats.cacheFilterStartTime,
-+								cacheLookupResultTime: cacheLookupResultTime,
-+								cacheEntryCount: cacheStats.cacheFilterResultCount,
-+								resultCount: results.length
-+							};
-+							if (config.sortByScore) {
-+								stats.unsortedResultTime = cacheLookupResultTime;
-+								stats.sortedResultTime = sortedResultTime;
-+							}
-+							if (!cacheStats.cacheWasResolved) {
-+								stats.joined = result.stats;
-+							}
-+							c([
-+								{
-+									limitHit: result.limitHit || typeof config.maxResults === 'number' && results.length > config.maxResults,
-+									stats: stats
-+								},
-+								sortedResults
-+							]);
-+>>>>>>> .their
- 						});
- 				}, e);
- 			}, () => {
-@@ -533,6 +743,7 @@
- 		return arrays.topAsync(results, compare, config.maxResults, 10000);
- 	}
- 
-+<<<<<<< .our
- 	private sendAsBatches(rawMatches: IInternalFileMatch[], onBatch: (batch: IFileMatch[]) => void, batchSize: number) {
- 		const serializedMatches = rawMatches.map(rawMatch => this.rawMatchToSearchItem(rawMatch));
- 		if (batchSize && batchSize > 0) {
-@@ -545,13 +756,31 @@
- 	}
- 
- 	private getResultsFromCache(cache: Cache, searchValue: string): TPromise<IInternalSearchComplete> {
-+=======
-+	private sendProgress(results: IFileMatch[], progressCb: (batch: IFileMatch[]) => void, batchSize: number) {
-+		if (batchSize && batchSize > 0) {
-+			for (let i = 0; i < results.length; i += batchSize) {
-+				progressCb(results.slice(i, i + batchSize));
-+			}
-+		} else {
-+			progressCb(results);
-+		}
-+	}
-+
-+	private getResultsFromCache(cache: Cache, searchValue: string): PPromise<[ISearchCompleteStats, IInternalFileMatch[], CacheStats]> {
-+>>>>>>> .their
- 		if (path.isAbsolute(searchValue)) {
- 			return null; // bypass cache if user looks up an absolute path where matching goes directly on disk
- 		}
- 
- 		// Find cache entries by prefix of search value
- 		const hasPathSep = searchValue.indexOf(path.sep) >= 0;
-+<<<<<<< .our
- 		let cached: TPromise<IInternalSearchComplete>;
-+=======
-+		let cached: PPromise<[ISearchCompleteStats, IInternalFileMatch[]], IInternalFileMatch[]>;
-+		let wasResolved: boolean;
-+>>>>>>> .their
- 		for (let previousSearch in cache.resultsToSearchCache) {
- 
- 			// If we narrow down, we might be able to reuse the cached results
-@@ -561,6 +790,11 @@
- 				}
- 
- 				const c = cache.resultsToSearchCache[previousSearch];
-+<<<<<<< .our
-+=======
-+				c.then(() => { wasResolved = false; });
-+				wasResolved = true;
-+>>>>>>> .their
- 				cached = this.preventCancellation(c);
- 				break;
- 			}
-@@ -570,6 +804,7 @@
- 			return null;
- 		}
- 
-+<<<<<<< .our
- 		return new TPromise<IInternalSearchComplete>((c, e) => {
- 			cached.then(complete => {
- 				// Pattern match on results
-@@ -577,6 +812,17 @@
- 				const normalizedSearchValueLowercase = strings.stripWildcards(searchValue).toLowerCase();
- 				for (let i = 0; i < complete.results.length; i++) {
- 					let entry = complete.results[i];
-+=======
-+		return new PPromise<[ISearchCompleteStats, IInternalFileMatch[], CacheStats]>((c, e, p) => {
-+			cached.then(([complete, cachedEntries]) => {
-+				const cacheFilterStartTime = Date.now();
-+
-+				// Pattern match on results
-+				let results: IInternalFileMatch[] = [];
-+				const normalizedSearchValueLowercase = strings.stripWildcards(searchValue).toLowerCase();
-+				for (let i = 0; i < cachedEntries.length; i++) {
-+					let entry = cachedEntries[i];
-+>>>>>>> .their
- 
- 					// Check if this entry is a match for the search value
- 					if (!strings.fuzzyContains(entry.relativePath, normalizedSearchValueLowercase)) {
-@@ -586,16 +832,26 @@
- 					results.push(entry);
- 				}
- 
-+<<<<<<< .our
- 				c({
- 					limitHit: complete.limitHit,
- 					results
- 				});
- 			}, e);
-+=======
-+				c([complete, results, {
-+					cacheWasResolved: wasResolved,
-+					cacheFilterStartTime: cacheFilterStartTime,
-+					cacheFilterResultCount: cachedEntries.length
-+				}]);
-+			}, e, p);
-+>>>>>>> .their
- 		}, () => {
- 			cached.cancel();
- 		});
- 	}
- 
-+<<<<<<< .our
- 	private doSearch(engine: FileIndexSearchEngine): TPromise<IInternalSearchComplete> {
- 		const results: IInternalFileMatch[] = [];
- 		const onResult = match => results.push(match);
-@@ -606,12 +862,46 @@
- 					results
- 				});
- 			}, e);
-+=======
-+	private doSearch(engine: FileIndexSearchEngine, provider: vscode.FileIndexProvider, batchSize?: number): PPromise<ISearchCompleteStats, IInternalFileMatch[]> {
-+		return new PPromise<ISearchCompleteStats, IInternalFileMatch[]>((c, e, p) => {
-+			let batch: IInternalFileMatch[] = [];
-+			engine.search().then(result => {
-+				if (batch.length) {
-+					p(batch);
-+				}
-+
-+				c({
-+					limitHit: result.isLimitHit,
-+					stats: engine.getStats() // TODO@roblou
-+				});
-+			}, error => {
-+				if (batch.length) {
-+					p(batch);
-+				}
-+
-+				e(error);
-+			}, match => {
-+				if (match) {
-+					if (batchSize) {
-+						batch.push(match);
-+						if (batchSize > 0 && batch.length >= batchSize) {
-+							p(batch);
-+							batch = [];
-+						}
-+					} else {
-+						p([match]);
-+					}
-+				}
-+			});
-+>>>>>>> .their
- 		}, () => {
- 			engine.cancel();
- 		});
- 	}
- 
- 	public clearCache(cacheKey: string): TPromise<void> {
-+<<<<<<< .our
- 		if (!this.folderCacheKeys.has(cacheKey)) {
- 			return TPromise.wrap(undefined);
- 		}
-@@ -629,6 +919,17 @@
- 			// Allow for piled up cancellations to come through first.
- 			process.nextTick(() => {
- 				promise.then(c, e);
-+=======
-+		delete this.caches[cacheKey];
-+		return TPromise.as(undefined);
-+	}
-+
-+	private preventCancellation<C, P>(promise: PPromise<C, P>): PPromise<C, P> {
-+		return new PPromise<C, P>((c, e, p) => {
-+			// Allow for piled up cancellations to come through first.
-+			process.nextTick(() => {
-+				promise.then(c, e, p);
-+>>>>>>> .their
- 			});
- 		}, () => {
- 			// Do not propagate.
-@@ -638,7 +939,11 @@
- 
- class Cache {
- 
-+<<<<<<< .our
- 	public resultsToSearchCache: { [searchValue: string]: TPromise<IInternalSearchComplete>; } = Object.create(null);
-+=======
-+	public resultsToSearchCache: { [searchValue: string]: PPromise<[ISearchCompleteStats, IInternalFileMatch[]], IInternalFileMatch[]>; } = Object.create(null);
-+>>>>>>> .their
- 
- 	public scorerCache: ScorerCache = Object.create(null);
- }
-@@ -657,3 +962,12 @@
- 		return match.relativePath; // e.g. some/path/to/file/myFile.txt
- 	}
- };
-+<<<<<<< .our
-+=======
-+
-+interface CacheStats {
-+	cacheWasResolved: boolean;
-+	cacheFilterStartTime: number;
-+	cacheFilterResultCount: number;
-+}
-+>>>>>>> .their
-changed in both
-  base   100644 e7bcb39550d41f561a14b5aee61c9034d27296fc src/vs/workbench/api/node/extHostSearch.ts
-  our    100644 47b7f055eeef31aa7a32eec27d4340e210379b00 src/vs/workbench/api/node/extHostSearch.ts
-  their  100644 fa38ac0c8ca3fdb3a7014900d47a4d4f6abeb133 src/vs/workbench/api/node/extHostSearch.ts
-@@ -25,7 +25,11 @@
- export class ExtHostSearch implements ExtHostSearchShape {
- 
- 	private readonly _proxy: MainThreadSearchShape;
-+<<<<<<< .our
- 	private readonly _fileSearchProvider = new Map<number, vscode.FileSearchProvider>();
-+=======
-+	private readonly _fileSearchProvider = new Map<number, vscode.SearchProvider>();
-+>>>>>>> .their
- 	private readonly _textSearchProvider = new Map<number, vscode.TextSearchProvider>();
- 	private readonly _fileIndexProvider = new Map<number, vscode.FileIndexProvider>();
- 	private _handlePool: number = 0;
-@@ -46,7 +50,11 @@
- 		return scheme;
- 	}
- 
-+<<<<<<< .our
- 	registerFileSearchProvider(scheme: string, provider: vscode.FileSearchProvider) {
-+=======
-+	registerFileSearchProvider(scheme: string, provider: vscode.SearchProvider) {
-+>>>>>>> .their
- 		const handle = this._handlePool++;
- 		this._fileSearchProvider.set(handle, provider);
- 		this._proxy.$registerFileSearchProvider(handle, this._transformScheme(scheme));
-@@ -80,18 +88,38 @@
- 		const provider = this._fileSearchProvider.get(handle);
- 		const query = reviveQuery(rawQuery);
- 		if (provider) {
-+<<<<<<< .our
- 			return this._fileSearchManager.fileSearch(query, provider, batch => {
- 				this._proxy.$handleFileMatch(handle, session, batch.map(p => p.resource));
-+=======
-+			return this._fileSearchManager.fileSearch(query, provider, progress => {
-+				this._proxy.$handleFileMatch(handle, session, progress.map(p => p.resource));
-+>>>>>>> .their
- 			});
- 		} else {
- 			const indexProvider = this._fileIndexProvider.get(handle);
- 			if (indexProvider) {
-+<<<<<<< .our
- 				return this._fileIndexSearchManager.fileSearch(query, indexProvider, batch => {
- 					this._proxy.$handleFileMatch(handle, session, batch.map(p => p.resource));
-+=======
-+				return this._fileIndexSearchManager.fileSearch(query, indexProvider, progress => {
-+					this._proxy.$handleFileMatch(handle, session, progress.map(p => p.resource));
-+>>>>>>> .their
- 				});
- 			} else {
- 				throw new Error('something went wrong');
- 			}
-+<<<<<<< .our
-+=======
-+		}
-+	}
-+
-+	$clearCache(handle: number, cacheKey: string): TPromise<void> {
-+		const provider = this._fileSearchProvider.get(handle);
-+		if (!provider.clearCache) {
-+			return TPromise.as(undefined);
-+>>>>>>> .their
- 		}
- 	}
- 
-changed in both
-  base   100644 dad4ec1777045a37037a7d1d261f3440a8c17577 src/vs/workbench/services/search/node/searchService.ts
-  our    100644 5bf7b93503cb5ecead2832c567244eabe2f261f3 src/vs/workbench/services/search/node/searchService.ts
-  their  100644 ff28bf7d56c2f38064bb8724120323afb58936c7 src/vs/workbench/services/search/node/searchService.ts
-@@ -53,6 +53,12 @@
- 	}
- 
- 	public registerSearchResultProvider(scheme: string, type: SearchProviderType, provider: ISearchResultProvider): IDisposable {
-+<<<<<<< .our
-+=======
-+		// if (scheme === 'file') {
-+		// 	this.fileSearchProvider = provider;
-+
-+>>>>>>> .their
- 		let list: Map<string, ISearchResultProvider>;
- 		if (type === SearchProviderType.file) {
- 			list = this.fileSearchProviders;
-@@ -126,6 +132,7 @@
- 			const schemesInQuery = query.folderQueries.map(fq => fq.folder.scheme);
- 			const providerActivations = schemesInQuery.map(scheme => this.extensionService.activateByEvent(`onSearch:${scheme}`));
- 
-+<<<<<<< .our
- 			const providerPromise = TPromise.join(providerActivations)
- 				.then(() => this.searchWithProviders(query, onProviderProgress))
- 				.then(completes => {
-@@ -147,6 +154,42 @@
- 					errs = errs.filter(e => !!e);
- 					return TPromise.wrapError(errs[0]);
- 				});
-+=======
-+			const providerPromise = TPromise.join(providerActivations).then(() => {
-+				return TPromise.join(query.folderQueries.map(fq => {
-+					const oneFolderQuery = {
-+						...query,
-+						...{
-+							folderQueries: [fq]
-+						}
-+					};
-+
-+					const provider = query.type === QueryType.File ?
-+						this.fileSearchProviders.get(fq.folder.scheme) || this.fileIndexProviders.get(fq.folder.scheme) :
-+						this.textSearchProviders.get(fq.folder.scheme);
-+
-+					return TPromise.as(provider.search(oneFolderQuery, onProviderProgress));
-+				})).then(completes => {
-+					completes = completes.filter(c => !!c);
-+					if (!completes.length) {
-+						return null;
-+					}
-+
-+					return <ISearchComplete>{
-+						limitHit: completes[0] && completes[0].limitHit,
-+						stats: completes[0].stats,
-+						results: arrays.flatten(completes.map(c => c.results))
-+					};
-+				}, errs => {
-+					if (!Array.isArray(errs)) {
-+						errs = [errs];
-+					}
-+
-+					errs = errs.filter(e => !!e);
-+					return TPromise.wrapError(errs[0]);
-+				});
-+			});
-+>>>>>>> .their
- 
- 			combinedPromise = providerPromise.then(value => {
- 				this.logService.debug(`SearchService#search: ${Date.now() - startTime}ms`);
-@@ -295,12 +338,18 @@
- 	}
- 
- 	public clearCache(cacheKey: string): TPromise<void> {
-+<<<<<<< .our
- 		const clearPs = [
- 			this.diskSearch,
- 			...values(this.fileIndexProviders)
- 		].map(provider => provider && provider.clearCache(cacheKey));
- 
- 		return TPromise.join(clearPs)
-+=======
-+		return TPromise.join([
-+			this.diskSearch
-+		].map(provider => provider && provider.clearCache(cacheKey)))
-+>>>>>>> .their
- 			.then(() => { });
- 	}
- }
-changed in both
-  base   100644 bad1d62b9d77b7e7740a662ad44f29e65c866056 src/vs/workbench/test/electron-browser/api/extHostSearch.test.ts
-  our    100644 d1a70c00f48321c7ae746939043c8aac8b164469 src/vs/workbench/test/electron-browser/api/extHostSearch.test.ts
-  their  100644 f5bfd49e6264b2fe9e64fbc6aef387829fa2a72d src/vs/workbench/test/electron-browser/api/extHostSearch.test.ts
-@@ -66,7 +66,11 @@
- 		await rpcProtocol.sync();
- 	}
- 
-+<<<<<<< .our
- 	async function registerTestFileSearchProvider(provider: vscode.FileSearchProvider, scheme = 'file'): Promise<void> {
-+=======
-+	async function registerTestFileSearchProvider(provider: vscode.SearchProvider, scheme = 'file'): Promise<void> {
-+>>>>>>> .their
- 		disposables.push(extHostSearch.registerFileSearchProvider(scheme, provider));
- 		await rpcProtocol.sync();
- 	}
-@@ -167,7 +171,11 @@
- 
- 		test('no results', async () => {
- 			await registerTestFileSearchProvider({
-+<<<<<<< .our
- 				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Thenable<URI[]> {
-+=======
-+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, progress: vscode.Progress<URI>, token: vscode.CancellationToken): Thenable<void> {
-+>>>>>>> .their
- 					return TPromise.wrap(null);
- 				}
- 			});
-@@ -185,8 +193,14 @@
- 			];
- 
- 			await registerTestFileSearchProvider({
-+<<<<<<< .our
- 				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Thenable<URI[]> {
- 					return TPromise.wrap(reportedResults);
-+=======
-+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, progress: vscode.Progress<URI>, token: vscode.CancellationToken): Thenable<void> {
-+					reportedResults.forEach(r => progress.report(r));
-+					return TPromise.wrap(null);
-+>>>>>>> .their
- 				}
- 			});
- 
-@@ -199,7 +213,11 @@
- 		test('Search canceled', async () => {
- 			let cancelRequested = false;
- 			await registerTestFileSearchProvider({
-+<<<<<<< .our
- 				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Thenable<URI[]> {
-+=======
-+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, progress: vscode.Progress<URI>, token: vscode.CancellationToken): Thenable<void> {
-+>>>>>>> .their
- 					return new TPromise((resolve, reject) => {
- 						token.onCancellationRequested(() => {
- 							cancelRequested = true;
-@@ -215,9 +233,40 @@
- 			assert(!results.length);
- 		});
- 
-+<<<<<<< .our
- 		test('provider returns null', async () => {
- 			await registerTestFileSearchProvider({
- 				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Thenable<URI[]> {
-+=======
-+		test('provider fail', async () => {
-+			const reportedResults = [
-+				'file1.ts',
-+				'file2.ts',
-+				'file3.ts',
-+			];
-+
-+			await registerTestFileSearchProvider({
-+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, progress: vscode.Progress<URI>, token: vscode.CancellationToken): Thenable<void> {
-+					reportedResults
-+						.map(relativePath => joinPath(options.folder, relativePath))
-+						.forEach(r => progress.report(r));
-+
-+					throw new Error('I broke');
-+				}
-+			});
-+
-+			try {
-+				await runFileSearch(getSimpleQuery());
-+				assert(false, 'Expected to fail');
-+			} catch {
-+				// Expected to throw
-+			}
-+		});
-+
-+		test('provider returns null', async () => {
-+			await registerTestFileSearchProvider({
-+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, progress: vscode.Progress<URI>, token: vscode.CancellationToken): Thenable<void> {
-+>>>>>>> .their
- 					return null;
- 				}
- 			});
-@@ -232,7 +281,11 @@
- 
- 		test('all provider calls get global include/excludes', async () => {
- 			await registerTestFileSearchProvider({
-+<<<<<<< .our
- 				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Thenable<URI[]> {
-+=======
-+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, progress: vscode.Progress<URI>, token: vscode.CancellationToken): Thenable<void> {
-+>>>>>>> .their
- 					assert(options.excludes.length === 2 && options.includes.length === 2, 'Missing global include/excludes');
- 					return TPromise.wrap(null);
- 				}
-@@ -261,7 +314,11 @@
- 
- 		test('global/local include/excludes combined', async () => {
- 			await registerTestFileSearchProvider({
-+<<<<<<< .our
- 				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Thenable<URI[]> {
-+=======
-+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, progress: vscode.Progress<URI>, token: vscode.CancellationToken): Thenable<void> {
-+>>>>>>> .their
- 					if (options.folder.toString() === rootFolderA.toString()) {
- 						assert.deepEqual(options.includes.sort(), ['*.ts', 'foo']);
- 						assert.deepEqual(options.excludes.sort(), ['*.js', 'bar']);
-@@ -303,7 +360,11 @@
- 
- 		test('include/excludes resolved correctly', async () => {
- 			await registerTestFileSearchProvider({
-+<<<<<<< .our
- 				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Thenable<URI[]> {
-+=======
-+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, progress: vscode.Progress<URI>, token: vscode.CancellationToken): Thenable<void> {
-+>>>>>>> .their
- 					assert.deepEqual(options.includes.sort(), ['*.jsx', '*.ts']);
- 					assert.deepEqual(options.excludes.sort(), []);
- 
-@@ -346,9 +407,17 @@
- 			];
- 
- 			await registerTestFileSearchProvider({
-+<<<<<<< .our
- 				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Thenable<URI[]> {
- 					return TPromise.wrap(reportedResults
- 						.map(relativePath => joinPath(options.folder, relativePath)));
-+=======
-+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, progress: vscode.Progress<URI>, token: vscode.CancellationToken): Thenable<void> {
-+					reportedResults
-+						.map(relativePath => joinPath(options.folder, relativePath))
-+						.forEach(r => progress.report(r));
-+					return TPromise.wrap(null);
-+>>>>>>> .their
- 				}
- 			});
- 
-@@ -377,7 +446,11 @@
- 		test('multiroot sibling exclude clause', async () => {
- 
- 			await registerTestFileSearchProvider({
-+<<<<<<< .our
- 				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Thenable<URI[]> {
-+=======
-+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, progress: vscode.Progress<URI>, token: vscode.CancellationToken): Thenable<void> {
-+>>>>>>> .their
- 					let reportedResults: URI[];
- 					if (options.folder.fsPath === rootFolderA.fsPath) {
- 						reportedResults = [
-@@ -447,7 +520,13 @@
- 
- 			let wasCanceled = false;
- 			await registerTestFileSearchProvider({
-+<<<<<<< .our
- 				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Thenable<URI[]> {
-+=======
-+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, progress: vscode.Progress<URI>, token: vscode.CancellationToken): Thenable<void> {
-+					reportedResults
-+						.forEach(r => progress.report(r));
-+>>>>>>> .their
- 					token.onCancellationRequested(() => wasCanceled = true);
- 
- 					return TPromise.wrap(reportedResults);
-@@ -483,7 +562,12 @@
- 
- 			let wasCanceled = false;
- 			await registerTestFileSearchProvider({
-+<<<<<<< .our
- 				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Thenable<URI[]> {
-+=======
-+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, progress: vscode.Progress<URI>, token: vscode.CancellationToken): Thenable<void> {
-+					reportedResults.forEach(r => progress.report(r));
-+>>>>>>> .their
- 					token.onCancellationRequested(() => wasCanceled = true);
- 
- 					return TPromise.wrap(reportedResults);
-@@ -518,7 +602,12 @@
- 
- 			let wasCanceled = false;
- 			await registerTestFileSearchProvider({
-+<<<<<<< .our
- 				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Thenable<URI[]> {
-+=======
-+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, progress: vscode.Progress<URI>, token: vscode.CancellationToken): Thenable<void> {
-+					reportedResults.forEach(r => progress.report(r));
-+>>>>>>> .their
- 					token.onCancellationRequested(() => wasCanceled = true);
- 
- 					return TPromise.wrap(reportedResults);
-@@ -548,7 +637,11 @@
- 		test('multiroot max results', async () => {
- 			let cancels = 0;
- 			await registerTestFileSearchProvider({
-+<<<<<<< .our
- 				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Thenable<URI[]> {
-+=======
-+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, progress: vscode.Progress<URI>, token: vscode.CancellationToken): Thenable<void> {
-+>>>>>>> .their
- 					token.onCancellationRequested(() => cancels++);
- 
- 					// Provice results async so it has a chance to invoke every provider
-@@ -593,8 +686,14 @@
- 			];
- 
- 			await registerTestFileSearchProvider({
-+<<<<<<< .our
- 				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Thenable<URI[]> {
- 					return TPromise.wrap(reportedResults);
-+=======
-+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, progress: vscode.Progress<URI>, token: vscode.CancellationToken): Thenable<void> {
-+					reportedResults.forEach(r => progress.report(r));
-+					return TPromise.wrap(null);
-+>>>>>>> .their
- 				}
- 			}, fancyScheme);
- 
-@@ -611,6 +710,37 @@
- 			const { results } = await runFileSearch(query);
- 			compareURIs(results, reportedResults);
- 		});
-+<<<<<<< .our
-+=======
-+
-+		test('uses different cache keys for different folders', async () => {
-+			const cacheKeys: string[] = [];
-+			await registerTestFileSearchProvider({
-+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, progress: vscode.Progress<URI>, token: vscode.CancellationToken): Thenable<void> {
-+					cacheKeys.push(query.cacheKey);
-+					return TPromise.wrap(null);
-+				}
-+			});
-+
-+			const query: ISearchQuery = {
-+				type: QueryType.File,
-+				filePattern: '',
-+				cacheKey: 'cacheKey',
-+				folderQueries: [
-+					{
-+						folder: rootFolderA
-+					},
-+					{
-+						folder: rootFolderB
-+					}
-+				]
-+			};
-+
-+			await runFileSearch(query);
-+			assert.equal(cacheKeys.length, 2);
-+			assert.notEqual(cacheKeys[0], cacheKeys[1]);
-+		});
-+>>>>>>> .their
- 	});
- 
- 	suite('Text:', () => {
diff --git a/app/test/fixtures/merge-parser/vscode/merge-roblou-settingsEditorAsTree-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-roblou-settingsEditorAsTree-into-master.txt
deleted file mode 100644
index b226f03fef5..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-roblou-settingsEditorAsTree-into-master.txt
+++ /dev/null
@@ -1,349 +0,0 @@
-changed in both
-  base   100644 89e5e43dfe4bc8b1cd337f476d0ad86afb5ebf7d src/vs/workbench/parts/preferences/browser/media/settingsEditor2.css
-  our    100644 4110f029469987a0e2ace30d646c3e131c94b3df src/vs/workbench/parts/preferences/browser/media/settingsEditor2.css
-  their  100644 5e81d73f11292ee23a393df4f5957193f2f151e7 src/vs/workbench/parts/preferences/browser/media/settingsEditor2.css
-@@ -208,6 +208,30 @@
- 	cursor: default;
- 	white-space: normal;
- 	height: 100%;
-+<<<<<<< .our
-+=======
-+	min-height: 75px;
-+}
-+
-+.settings-editor > .settings-body > .settings-tree-container .monaco-tree-row .content::before {
-+	content: ' ';
-+	display: inline-block;
-+	position: absolute;
-+	width: 10px;
-+	left: -14px;
-+	top: 0px;
-+	bottom: 0px;
-+}
-+
-+.settings-editor > .settings-body > .settings-tree-container .monaco-tree .monaco-tree-row {
-+	background-color: initial !important;
-+}
-+
-+.settings-editor > .settings-body > .settings-tree-container .setting-item.odd:not(.focused):not(.selected):not(:hover),
-+.settings-editor > .settings-body > .settings-tree-container .monaco-tree:not(:focus) .setting-item.focused.odd:not(.selected):not(:hover),
-+.settings-editor > .settings-body > .settings-tree-container .monaco-tree:not(.focused) .setting-item.focused.odd:not(.selected):not(:hover) {
-+	background-color: rgba(130, 130, 130, 0.04);
-+>>>>>>> .their
- }
- 
- .settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-title {
-@@ -344,9 +368,19 @@
- 	background: url('check.svg') center center no-repeat;
- }
- 
-+<<<<<<< .our
- .vs-dark .settings-editor > .settings-body > .settings-tree-container .setting-item-bool .setting-value-checkbox.checked,
- .hc-black .settings-editor > .settings-body > .settings-tree-container .setting-item-bool .setting-value-checkbox.checked {
- 	background: url('check-inverse.svg') center center no-repeat;
-+=======
-+.settings-editor > .settings-body > .settings-tree-container .setting-item .expand-indicator {
-+	visibility: hidden;
-+	position: absolute;
-+	bottom: -2px;
-+	width: calc(100% - 190px);
-+	text-align: center;
-+	opacity: .5;
-+>>>>>>> .their
- }
- 
- .settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-value {
-changed in both
-  base   100644 5d4beef0caad0a7e305085c3049e5f2c095c2744 src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
-  our    100644 17beb717b3028c0eb8b2d2aa2a0516dc700021b2 src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
-  their  100644 1682efe7f34b6f9971c038d48a5670fe14e92fd7 src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
-@@ -27,8 +27,8 @@
- import { WorkbenchTree } from 'vs/platform/list/browser/listService';
- import { ILogService } from 'vs/platform/log/common/log';
- import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
--import { attachButtonStyler } from 'vs/platform/theme/common/styler';
--import { IThemeService } from 'vs/platform/theme/common/themeService';
-+import { attachButtonStyler, attachStyler } from 'vs/platform/theme/common/styler';
-+import { ICssStyleCollector, ITheme, IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
- import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
- import { EditorOptions, IEditor } from 'vs/workbench/common/editor';
- import { SuggestEnabledInput } from 'vs/workbench/parts/codeEditor/browser/suggestEnabledInput';
-@@ -374,6 +374,7 @@
- 		this.tocTree = this._register(this.instantiationService.createInstance(TOCTree, this.tocTreeContainer,
- 			this.viewState,
- 			{
-+<<<<<<< .our
- 				renderer: tocRenderer
- 			}));
- 
-@@ -382,6 +383,45 @@
- 			if (this.searchResultModel) {
- 				this.viewState.filterToCategory = element;
- 				this.renderTree();
-+=======
-+				ariaLabel: localize('treeAriaLabel', "Settings"),
-+				showLoading: false,
-+				indentPixels: 0,
-+				twistiePixels: 15,
-+			});
-+
-+		this._register(registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
-+			const activeListBackground = theme.getColor('list.activeSelectionBackground');
-+			if (activeListBackground) {
-+				collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .monaco-tree.focused .monaco-tree-row.focused .content::before { background-color: ${activeListBackground}; }`);
-+			}
-+
-+			const inactiveListBackground = theme.getColor('list.inactiveSelectionBackground');
-+			if (inactiveListBackground) {
-+				collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .monaco-tree .monaco-tree-row.focused .content::before { background-color: ${inactiveListBackground}; }`);
-+			}
-+		}));
-+
-+		attachStyler(this.themeService, {
-+			listActiveSelectionBackground: null,
-+			listActiveSelectionForeground: null,
-+			listFocusAndSelectionBackground: null,
-+			listFocusAndSelectionForeground: null,
-+			listFocusBackground: null,
-+			listFocusForeground: null,
-+			listHoverForeground: null,
-+			listHoverBackground: null,
-+			listInactiveSelectionBackground: null,
-+			listInactiveSelectionForeground: null
-+		}, colors => {
-+			this.settingsTree.style(colors);
-+		});
-+
-+		this.settingsTree.onDidChangeFocus(e => {
-+			this.settingsTree.setSelection([e.focus]);
-+			if (this.selectedElement) {
-+				this.settingsTree.refresh(this.selectedElement);
-+>>>>>>> .their
- 			}
- 
- 			if (element && (!e.payload || !e.payload.fromScroll)) {
-changed in both
-  base   100644 d1a7ba413df9556afb5d3fb708e726c8221467a0 src/vs/workbench/parts/preferences/browser/settingsTree.ts
-  our    100644 480a73351c9d0eb61722fdd061a2a00dcd5a9574 src/vs/workbench/parts/preferences/browser/settingsTree.ts
-  their  100644 5c7636e34358445e3c124ddb73418dbc343b749a src/vs/workbench/parts/preferences/browser/settingsTree.ts
-@@ -10,6 +10,7 @@
- import { Button } from 'vs/base/browser/ui/button/button';
- import { Checkbox } from 'vs/base/browser/ui/checkbox/checkbox';
- import { InputBox } from 'vs/base/browser/ui/inputbox/inputBox';
-+import { renderOcticons } from 'vs/base/browser/ui/octiconLabel/octiconLabel';
- import { SelectBox } from 'vs/base/browser/ui/selectBox/selectBox';
- import * as arrays from 'vs/base/common/arrays';
- import { Color, RGBA } from 'vs/base/common/color';
-@@ -34,11 +35,18 @@
- import { editorBackground, focusBorder, foreground, errorForeground, inputValidationErrorBackground, inputValidationErrorBorder } from 'vs/platform/theme/common/colorRegistry';
- import { attachButtonStyler, attachInputBoxStyler, attachSelectBoxStyler, attachStyler } from 'vs/platform/theme/common/styler';
- import { ICssStyleCollector, ITheme, IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-+<<<<<<< .our
- import { ITOCEntry } from 'vs/workbench/parts/preferences/browser/settingsLayout';
- import { ISettingsEditorViewState, isExcludeSetting, SettingsTreeElement, SettingsTreeGroupElement, SettingsTreeNewExtensionsElement, SettingsTreeSettingElement } from 'vs/workbench/parts/preferences/browser/settingsTreeModels';
- import { ExcludeSettingWidget, IExcludeDataItem, settingsHeaderForeground, settingsNumberInputBackground, settingsNumberInputBorder, settingsNumberInputForeground, settingsSelectBackground, settingsSelectBorder, settingsSelectForeground, settingsTextInputBackground, settingsTextInputBorder, settingsTextInputForeground } from 'vs/workbench/parts/preferences/browser/settingsWidgets';
- import { ISetting, ISettingsGroup } from 'vs/workbench/services/preferences/common/preferences';
- import { alert as ariaAlert } from 'vs/base/browser/ui/aria/aria';
-+=======
-+import { SettingsTarget } from 'vs/workbench/parts/preferences/browser/preferencesWidgets';
-+import { ISearchResult, ISetting, ISettingsGroup } from 'vs/workbench/services/preferences/common/preferences';
-+import { DefaultSettingsEditorModel } from 'vs/workbench/services/preferences/common/preferencesModels';
-+import { IMouseEvent } from 'vs/base/browser/mouseEvent';
-+>>>>>>> .their
- 
- const $ = DOM.$;
- 
-@@ -182,8 +190,45 @@
- 		return TPromise.wrap(element && element.parent);
- 	}
- 
-+<<<<<<< .our
- 	shouldAutoexpand(): boolean {
- 		return true;
-+=======
-+	private getRootChildren(root: DefaultSettingsEditorModel): TreeElement[] {
-+		const groupItems: TreeElement[] = root.settingsGroups
-+			.map((g, i) => this.getGroupElement(g, i));
-+
-+		groupItems.splice(1, 0, <IButtonElement>{
-+			id: ALL_SETTINGS_BUTTON_ID,
-+			type: TreeItemType.buttonRow,
-+			parent: root
-+		});
-+
-+		return groupItems;
-+	}
-+
-+	private getGroupChildren(group: ISettingsGroup): ISettingElement[] {
-+		const entries: ISettingElement[] = [];
-+		for (const section of group.sections) {
-+			for (const setting of section.settings) {
-+				entries.push(this.getSettingElement(setting, group));
-+			}
-+		}
-+
-+		return entries;
-+	}
-+
-+	getParent(tree: ITree, element: TreeElement): TPromise<any, any> {
-+		if (!element) {
-+			return null;
-+		}
-+
-+		if (!(element instanceof DefaultSettingsEditorModel)) {
-+			return TPromise.wrap(element.parent);
-+		}
-+
-+		return TPromise.wrap(null);
-+>>>>>>> .their
- 	}
- }
- 
-@@ -613,6 +658,7 @@
- 			otherOverridesElement
- 		};
- 
-+<<<<<<< .our
- 		this.addSettingElementFocusHandler(template);
- 
- 		// Prevent clicks from being handled by list
-@@ -624,6 +670,10 @@
- 				e.browserEvent.stopPropagation();
- 			}
- 		}));
-+=======
-+		// Prevent clicks from being handled by list
-+		toDispose.push(DOM.addDisposableListener(valueElement, 'mousedown', (e: IMouseEvent) => e.stopPropagation()));
-+>>>>>>> .their
- 
- 		return template;
- 	}
-@@ -777,7 +827,14 @@
- 			return this.renderNewExtensionsElement(<SettingsTreeNewExtensionsElement>element, template);
- 		}
- 
-+<<<<<<< .our
- 		return this.renderSettingElement(tree, <SettingsTreeSettingElement>element, templateId, template);
-+=======
-+	private elementIsSelected(tree: ITree, element: TreeElement): boolean {
-+		const selection = tree.getSelection();
-+		const selectedElement: TreeElement = selection && selection[0];
-+		return selectedElement && selectedElement.id === element.id;
-+>>>>>>> .their
- 	}
- 
- 	private renderGroupElement(element: SettingsTreeGroupElement, template: IGroupTitleTemplate): void {
-@@ -811,11 +868,20 @@
- 	private renderSettingElement(tree: ITree, element: SettingsTreeSettingElement, templateId: string, template: ISettingItemTemplate | ISettingBoolItemTemplate): void {
- 		template.context = element;
- 
-+<<<<<<< .our
- 		const setting = element.setting;
- 
- 		DOM.toggleClass(template.containerElement, 'is-configured', element.isConfigured);
- 		DOM.toggleClass(template.containerElement, 'is-expanded', true);
- 		template.containerElement.setAttribute(SettingsRenderer.SETTING_KEY_ATTR, element.setting.key);
-+=======
-+		this.renderValue(element, isSelected, template);
-+
-+		const resetButton = new Button(template.valueElement);
-+		resetButton.element.title = localize('resetButtonTitle', "Reset");
-+		resetButton.element.classList.add('setting-reset-button');
-+		resetButton.element.tabIndex = isSelected ? 0 : -1;
-+>>>>>>> .their
- 
- 		const titleTooltip = setting.key;
- 		template.categoryElement.textContent = element.displayCategory && (element.displayCategory + ': ');
-@@ -866,6 +932,7 @@
- 		return renderedMarkdown;
- 	}
- 
-+<<<<<<< .our
- 	private renderValue(element: SettingsTreeSettingElement, templateId: string, template: ISettingItemTemplate | ISettingBoolItemTemplate): void {
- 		const onChange = value => this._onDidChangeSetting.fire({ key: element.setting.key, value });
- 		template.deprecationWarningElement.innerText = element.setting.deprecationMessage || '';
-@@ -907,9 +974,33 @@
- 		template.checkbox.domNode.setAttribute('id', id + 'item');
- 		template.checkbox.domNode.setAttribute('role', 'treeitem');
- 		template.checkbox.domNode.setAttribute('aria-labelledby', id + 'item ' + id);
-+=======
-+	private renderValue(element: ISettingElement, isSelected: boolean, template: ISettingItemTemplate): void {
-+		const onChange = value => this._onDidChangeSetting.fire({ key: element.setting.key, value });
-+		template.valueElement.innerHTML = '';
-+		if (element.valueType === 'string' && element.enum) {
-+			this.renderEnum(element, isSelected, template, onChange);
-+		} else if (element.valueType === 'boolean') {
-+			this.renderBool(element, isSelected, template, onChange);
-+		} else if (element.valueType === 'string') {
-+			this.renderText(element, isSelected, template, onChange);
-+		} else if (element.valueType === 'number') {
-+			this.renderText(element, isSelected, template, value => onChange(parseInt(value)));
-+		} else {
-+			this.renderEditInSettingsJson(element, isSelected, template);
-+		}
-+	}
-+
-+	private renderBool(element: ISettingElement, isSelected: boolean, template: ISettingItemTemplate, onChange: (value: boolean) => void): void {
-+		const checkboxElement = <HTMLInputElement>DOM.append(template.valueElement, $('input.setting-value-checkbox.setting-value-input'));
-+		checkboxElement.type = 'checkbox';
-+		checkboxElement.checked = element.value;
-+		checkboxElement.tabIndex = isSelected ? 0 : -1;
-+>>>>>>> .their
- 
- 	}
- 
-+<<<<<<< .our
- 	private renderEnum(dataElement: SettingsTreeSettingElement, template: ISettingEnumItemTemplate, onChange: (value: string) => void): void {
- 		const displayOptions = getDisplayEnumOptions(dataElement.setting);
- 		template.selectBox.setOptions(displayOptions);
-@@ -927,6 +1018,16 @@
- 		if (template.controlElement.firstElementChild) {
- 			// SelectBox needs to be treeitem to read correctly within tree
- 			template.controlElement.firstElementChild.setAttribute('role', 'treeitem');
-+=======
-+	private renderEnum(element: ISettingElement, isSelected: boolean, template: ISettingItemTemplate, onChange: (value: string) => void): void {
-+		const idx = element.enum.indexOf(element.value);
-+		const selectBox = new SelectBox(element.enum, idx, this.contextViewService);
-+		template.toDispose.push(selectBox);
-+		template.toDispose.push(attachSelectBoxStyler(selectBox, this.themeService));
-+		selectBox.render(template.valueElement);
-+		if (template.valueElement.firstElementChild) {
-+			template.valueElement.firstElementChild.setAttribute('tabindex', isSelected ? '0' : '-1');
-+>>>>>>> .their
- 		}
- 
- 		template.enumDescriptionElement.innerHTML = '';
-@@ -950,6 +1051,7 @@
- 		// }
- 	}
- 
-+<<<<<<< .our
- 	private renderText(dataElement: SettingsTreeSettingElement, template: ISettingTextItemTemplate, onChange: (value: string) => void): void {
- 		const modifiedText = dataElement.isConfigured ? 'Modified' : '';
- 		const label = ' ' + dataElement.displayCategory + ' ' + dataElement.displayLabel + ' ' + modifiedText;
-@@ -976,6 +1078,25 @@
- 		renderValidations(dataElement, template, true, label);
- 	}
- 
-+=======
-+	private renderText(element: ISettingElement, isSelected: boolean, template: ISettingItemTemplate, onChange: (value: string) => void): void {
-+		const inputBox = new InputBox(template.valueElement, this.contextViewService);
-+		template.toDispose.push(attachInputBoxStyler(inputBox, this.themeService));
-+		template.toDispose.push(inputBox);
-+		inputBox.value = element.value;
-+		inputBox.inputElement.tabIndex = isSelected ? 0 : -1;
-+
-+		template.toDispose.push(
-+			inputBox.onDidChange(e => onChange(e)));
-+	}
-+
-+	private renderEditInSettingsJson(element: ISettingElement, isSelected: boolean, template: ISettingItemTemplate): void {
-+		const openSettingsButton = new Button(template.valueElement, { title: true, buttonBackground: null, buttonHoverBackground: null });
-+		openSettingsButton.onDidClick(() => this._onDidOpenSettings.fire());
-+		openSettingsButton.label = localize('editInSettingsJson', "Edit in settings.json");
-+		openSettingsButton.element.classList.add('edit-in-settings-button');
-+		openSettingsButton.element.tabIndex = isSelected ? 0 : -1;
-+>>>>>>> .their
- 
- 	private renderNumber(dataElement: SettingsTreeSettingElement, template: ISettingTextItemTemplate, onChange: (value: number) => void): void {
- 		const modifiedText = dataElement.isConfigured ? 'Modified' : '';
diff --git a/app/test/fixtures/merge-parser/vscode/merge-roblou-settingsSearchIdChanges-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-roblou-settingsSearchIdChanges-into-master.txt
deleted file mode 100644
index 636aae61c31..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-roblou-settingsSearchIdChanges-into-master.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-changed in both
-  base   100644 526e5e56f5a26259effb9ec9582d8d008a80e6e4 build/gulpfile.vscode.js
-  our    100644 d79071e56bcfc53b3448052cc08bd7247bd7e789 build/gulpfile.vscode.js
-  their  100644 6df51b7e8153c6f9dcd93199819ba49006ca7ae9 build/gulpfile.vscode.js
-@@ -477,6 +477,10 @@
- 
- const allConfigDetailsPath = path.join(os.tmpdir(), 'configuration.json');
- gulp.task('upload-vscode-configuration', ['generate-vscode-configuration'], () => {
-+<<<<<<< .our
-+=======
-+
-+>>>>>>> .their
- 	if (!shouldSetupSettingsSearch()) {
- 		const branch = process.env.BUILD_SOURCEBRANCH;
- 		console.log(`Only runs on master and release branches, not ${branch}`);
-@@ -502,8 +506,12 @@
- });
- 
- function shouldSetupSettingsSearch() {
-+<<<<<<< .our
- 	const branch = process.env.BUILD_SOURCEBRANCH;
- 	return branch && (/\/master$/.test(branch) || branch.indexOf('/release/') >= 0);
-+=======
-+	return true;
-+>>>>>>> .their
- }
- 
- function getSettingsSearchBuildId(packageJson) {
-@@ -511,13 +519,22 @@
- 		const branch = process.env.BUILD_SOURCEBRANCH;
- 		const branchId = branch.indexOf('/release/') >= 0 ? 0 :
- 			/\/master$/.test(branch) ? 1 :
-+<<<<<<< .our
- 				2; // Some unexpected branch
-+=======
-+			2; // Some unexpected branch
-+>>>>>>> .their
- 
- 		const out = cp.execSync(`git rev-list HEAD --count`);
- 		const count = parseInt(out.toString());
- 
-+<<<<<<< .our
- 		// <version number><commit count><branchId (avoid unlikely conflicts)>
- 		// 1.25.1, 1,234,567 commits, master = 1250112345671
-+=======
-+		// <version number><commit count><branchId>
-+		// 1.25.1, 1,234,567 commits, master = 1250112345670
-+>>>>>>> .their
- 		return util.versionStringToNumber(packageJson.version) * 1e8 + count * 10 + branchId;
- 	} catch (e) {
- 		throw new Error('Could not determine build number: ' + e.toString());
diff --git a/app/test/fixtures/merge-parser/vscode/merge-sbatten-submenus-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-sbatten-submenus-into-master.txt
deleted file mode 100644
index 40f13e0b585..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-sbatten-submenus-into-master.txt
+++ /dev/null
@@ -1,296 +0,0 @@
-changed in both
-  base   100644 3856b7dbeb1930dba4c88f28b2261b3bd7cab065 src/vs/base/browser/dom.ts
-  our    100644 55d7a57ba6a391c964d03038ed5c842483b5d1f7 src/vs/base/browser/dom.ts
-  their  100644 6e7c479e58dd5ead5590edb04545bce315f79ead src/vs/base/browser/dom.ts
-@@ -819,7 +819,10 @@
- 	MOUSE_OVER: 'mouseover',
- 	MOUSE_MOVE: 'mousemove',
- 	MOUSE_OUT: 'mouseout',
-+<<<<<<< .our
- 	MOUSE_ENTER: 'mouseenter',
-+=======
-+>>>>>>> .their
- 	MOUSE_LEAVE: 'mouseleave',
- 	CONTEXT_MENU: 'contextmenu',
- 	WHEEL: 'wheel',
-changed in both
-  base   100644 a6d79bdbcb0a7e949c8c2a46e60a04a5cf0f337e src/vs/base/browser/ui/actionbar/actionbar.ts
-  our    100644 0dc7a39304b16126c69b25b0abb4a2effaab717d src/vs/base/browser/ui/actionbar/actionbar.ts
-  their  100644 3fa94537ee5cefa8ab5433b73a28d1ed002f5a1e src/vs/base/browser/ui/actionbar/actionbar.ts
-changed in both
-  base   100644 554b91d60de0b9bebb977315ddab661395ececc8 src/vs/base/browser/ui/menu/menu.css
-  our    100644 bea8dd197779b2014b71574a98c635196409f288 src/vs/base/browser/ui/menu/menu.css
-  their  100644 f94140de0f2e5e3e4b309f74038ee7a36eb7e929 src/vs/base/browser/ui/menu/menu.css
-@@ -65,6 +65,12 @@
- 	line-height: 1;
- }
- 
-+<<<<<<< .our
-+=======
-+.monaco-menu .monaco-action-bar.vertical .submenu-indicator {
-+	padding: 0.8em .5em;
-+}
-+>>>>>>> .their
- 
- .monaco-menu .monaco-action-bar.vertical .action-item.disabled .keybinding,
- .monaco-menu .monaco-action-bar.vertical .action-item.disabled .submenu-indicator {
-changed in both
-  base   100644 512d107f156843d26de6ff3a5a5f8f3873fb8cbc src/vs/base/browser/ui/menu/menu.ts
-  our    100644 9f36741df6322654263d676b9900f0f990c3f088 src/vs/base/browser/ui/menu/menu.ts
-  their  100644 5ea5820cce4a4e6a33e61e983e7d39610020ed05 src/vs/base/browser/ui/menu/menu.ts
-@@ -6,6 +6,7 @@
- 'use strict';
- 
- import 'vs/css!./menu';
-+<<<<<<< .our
- import * as nls from 'vs/nls';
- import { IActionRunner, IAction, Action } from 'vs/base/common/actions';
- import { ActionBar, IActionItemProvider, ActionsOrientation, Separator, ActionItem, IActionItemOptions, BaseActionItem } from 'vs/base/browser/ui/actionbar/actionbar';
-@@ -14,6 +15,16 @@
- import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
- import { $, Builder } from 'vs/base/browser/builder';
- import { RunOnceScheduler } from 'vs/base/common/async';
-+=======
-+import { IDisposable } from 'vs/base/common/lifecycle';
-+import { IActionRunner, IAction, Action } from 'vs/base/common/actions';
-+import { ActionBar, IActionItemProvider, ActionsOrientation, Separator, ActionItem, IActionItemOptions } from 'vs/base/browser/ui/actionbar/actionbar';
-+import { ResolvedKeybinding, KeyCode } from 'vs/base/common/keyCodes';
-+import { Event } from 'vs/base/common/event';
-+import { addClass, EventType, EventHelper, EventLike } from 'vs/base/browser/dom';
-+import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-+import { $ } from 'vs/base/browser/builder';
-+>>>>>>> .their
- 
- export interface IMenuOptions {
- 	context?: any;
-@@ -23,6 +34,22 @@
- 	ariaLabel?: string;
- }
- 
-+<<<<<<< .our
-+=======
-+
-+export class SubmenuAction extends Action {
-+	constructor(label: string, public entries: (SubmenuAction | IAction)[], cssClass?: string) {
-+		super(!!cssClass ? cssClass : 'submenu', label, '', true);
-+	}
-+}
-+
-+interface ISubMenuData {
-+	parent: Menu;
-+	submenu?: Menu;
-+}
-+
-+export class Menu {
-+>>>>>>> .their
- 
- export class SubmenuAction extends Action {
- 	constructor(label: string, public entries: (SubmenuAction | IAction)[], cssClass?: string) {
-@@ -45,9 +72,37 @@
- 		menuContainer.setAttribute('role', 'presentation');
- 		container.appendChild(menuContainer);
- 
-+<<<<<<< .our
- 		super(menuContainer, {
- 			orientation: ActionsOrientation.VERTICAL,
- 			actionItemProvider: action => this.doGetActionItem(action, options, parentData),
-+=======
-+		let parentData: ISubMenuData = {
-+			parent: this
-+		};
-+
-+		const getActionItem = (action: IAction) => {
-+			if (action instanceof Separator) {
-+				return new ActionItem(options.context, action, { icon: true });
-+			} else if (action instanceof SubmenuAction) {
-+				return new SubmenuActionItem(action, action.entries, parentData, options);
-+			} else {
-+				const menuItemOptions: IActionItemOptions = {};
-+				if (options.getKeyBinding) {
-+					const keybinding = options.getKeyBinding(action);
-+					if (keybinding) {
-+						menuItemOptions.keybinding = keybinding.getLabel();
-+					}
-+				}
-+
-+				return new MenuActionItem(options.context, action, menuItemOptions);
-+			}
-+		};
-+
-+		this.actionBar = new ActionBar(menuContainer, {
-+			orientation: ActionsOrientation.VERTICAL,
-+			actionItemProvider: options.actionItemProvider ? options.actionItemProvider : getActionItem,
-+>>>>>>> .their
- 			context: options.context,
- 			actionRunner: options.actionRunner,
- 			ariaLabel: options.ariaLabel
-@@ -399,4 +454,139 @@
- 			this.submenuContainer = null;
- 		}
- 	}
-+}
-+
-+class MenuActionItem extends ActionItem {
-+	static MNEMONIC_REGEX: RegExp = /&&(.)/g;
-+
-+	constructor(ctx: any, action: IAction, options: IActionItemOptions = {}) {
-+		options.isMenu = true;
-+		super(action, action, options);
-+	}
-+
-+	private _addMnemonic(action: IAction, actionItemElement: HTMLElement): void {
-+		let matches = MenuActionItem.MNEMONIC_REGEX.exec(action.label);
-+		if (matches && matches.length === 2) {
-+			let mnemonic = matches[1];
-+
-+			let ariaLabel = action.label.replace(MenuActionItem.MNEMONIC_REGEX, mnemonic);
-+
-+			actionItemElement.accessKey = mnemonic.toLocaleLowerCase();
-+			this.$e.attr('aria-label', ariaLabel);
-+		} else {
-+			this.$e.attr('aria-label', action.label);
-+		}
-+	}
-+
-+	public render(container: HTMLElement): void {
-+		super.render(container);
-+
-+		this._addMnemonic(this.getAction(), container);
-+		this.$e.attr('role', 'menuitem');
-+	}
-+
-+	public _updateLabel(): void {
-+		if (this.options.label) {
-+			let label = this.getAction().label;
-+			if (label && this.options.isMenu) {
-+				label = label.replace(MenuActionItem.MNEMONIC_REGEX, '$1\u0332');
-+			}
-+			this.$e.text(label);
-+		}
-+	}
-+}
-+
-+class SubmenuActionItem extends MenuActionItem {
-+	private mysubmenu: Menu;
-+
-+	constructor(
-+		action: IAction,
-+		private submenuActions: IAction[],
-+		private parentData: ISubMenuData,
-+		private submenuOptions?: IMenuOptions
-+	) {
-+		super(action, action, { label: true, isMenu: true });
-+	}
-+
-+	public render(container: HTMLElement): void {
-+		super.render(container);
-+
-+		this.builder = $(container);
-+		$(this.builder).addClass('monaco-submenu-item');
-+		$('span.submenu-indicator').text('\u25B6').appendTo(this.builder);
-+		this.$e.attr('role', 'menu');
-+
-+		$(this.builder).on(EventType.KEY_UP, (e) => {
-+			let event = new StandardKeyboardEvent(e as KeyboardEvent);
-+			if (event.equals(KeyCode.RightArrow)) {
-+				EventHelper.stop(e, true);
-+
-+				this.createSubmenu();
-+			}
-+		});
-+
-+		$(this.builder).on(EventType.KEY_DOWN, (e) => {
-+			let event = new StandardKeyboardEvent(e as KeyboardEvent);
-+			if (event.equals(KeyCode.RightArrow)) {
-+				EventHelper.stop(e, true);
-+			}
-+		});
-+
-+		$(this.builder).on(EventType.MOUSE_OVER, (e) => {
-+			this.cleanupExistingSubmenu(false);
-+			this.createSubmenu();
-+		});
-+
-+
-+		$(this.builder).on(EventType.MOUSE_LEAVE, (e) => {
-+			this.parentData.parent.focus();
-+			this.cleanupExistingSubmenu(true);
-+		});
-+	}
-+
-+	public onClick(e: EventLike) {
-+		// stop clicking from trying to run an action
-+		EventHelper.stop(e, true);
-+	}
-+
-+	private cleanupExistingSubmenu(force: boolean) {
-+		if (this.parentData.submenu && (force || (this.parentData.submenu !== this.mysubmenu))) {
-+			this.parentData.submenu.dispose();
-+			this.parentData.submenu = null;
-+		}
-+	}
-+
-+	private createSubmenu() {
-+		if (!this.parentData.submenu) {
-+			const submenuContainer = $(this.builder).div({ class: 'monaco-submenu menubar-menu-items-holder context-view' });
-+
-+			$(submenuContainer).style({
-+				'left': `${$(this.builder).getClientArea().width}px`
-+			});
-+
-+			$(submenuContainer).on(EventType.KEY_UP, (e) => {
-+				let event = new StandardKeyboardEvent(e as KeyboardEvent);
-+				if (event.equals(KeyCode.LeftArrow)) {
-+					EventHelper.stop(e, true);
-+
-+					this.parentData.parent.focus();
-+					this.parentData.submenu.dispose();
-+					this.parentData.submenu = null;
-+				}
-+			});
-+
-+			$(submenuContainer).on(EventType.KEY_DOWN, (e) => {
-+				let event = new StandardKeyboardEvent(e as KeyboardEvent);
-+				if (event.equals(KeyCode.LeftArrow)) {
-+					EventHelper.stop(e, true);
-+				}
-+			});
-+
-+
-+			this.parentData.submenu = new Menu(submenuContainer.getHTMLElement(), this.submenuActions, this.submenuOptions);
-+			this.parentData.submenu.focus();
-+
-+			this.mysubmenu = this.parentData.submenu;
-+		}
-+	}
- }
-\ No newline at end of file
-changed in both
-  base   100644 6e58a2d23df35954b38b5736bf78b469e845381a src/vs/platform/actions/common/actions.ts
-  our    100644 f0ba370d22dfa5eb5e51b75ad8f132f6de5991a7 src/vs/platform/actions/common/actions.ts
-  their  100644 c4b1e0f958cfbbec0a0675bf94187c9848646de2 src/vs/platform/actions/common/actions.ts
-removed in local
-  base   100644 b551e1158cb9deee86d65b7940e9214176bd8c3b src/vs/workbench/browser/parts/menubar/menubar.contribution.ts
-  their  100644 a156d5fcc77a6eaad31fb95328b440a21aa03cb0 src/vs/workbench/browser/parts/menubar/menubar.contribution.ts
-removed in local
-  base   100644 6ecc50082dc1318e7626903b24bca7721608eef1 src/vs/workbench/browser/parts/menubar/menubarPart.ts
-  their  100644 ab49bdcac269c1be8f84095a60a507eb2dd6e37b src/vs/workbench/browser/parts/menubar/menubarPart.ts
-changed in both
-  base   100644 6748e7384c3e26f5a7d45059898aacc329d80869 src/vs/workbench/electron-browser/media/shell.css
-  our    100644 1ce2598e143da86c4e183d8447113245812e5270 src/vs/workbench/electron-browser/media/shell.css
-  their  100644 436641f4237a469a79dbf4b7c50f4fa285aadc68 src/vs/workbench/electron-browser/media/shell.css
-@@ -104,6 +104,10 @@
- 	cursor: default;
- }
- 
-+.monaco-shell .monaco-menu .monaco-action-bar.vertical .submenu-indicator {
-+	padding: 0.5em 1em;
-+}
-+
- /* START Keyboard Focus Indication Styles */
- 
- .monaco-shell [tabindex="0"]:focus,
-changed in both
-  base   100644 0e1dd8af193495fb8c96b904d15e9b2e660ddcdc src/vs/workbench/parts/quickopen/browser/commandsHandler.ts
-  our    100644 1454998d2d97d32be1e2ef89cacfacdd941d1525 src/vs/workbench/parts/quickopen/browser/commandsHandler.ts
-  their  100644 c978a3b0cc7e4aa0597c594001989f8e1d30e671 src/vs/workbench/parts/quickopen/browser/commandsHandler.ts
diff --git a/app/test/fixtures/merge-parser/vscode/merge-settings-polish-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-settings-polish-into-master.txt
deleted file mode 100644
index b80092a2d1d..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-settings-polish-into-master.txt
+++ /dev/null
@@ -1,64 +0,0 @@
-changed in both
-  base   100644 01edb6072c1a71cc4ceb46dd4ce3da0a10766a54 src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
-  our    100644 17beb717b3028c0eb8b2d2aa2a0516dc700021b2 src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
-  their  100644 3793973a9fd6223c55ca5ddc2cb9939db8e83a26 src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
-@@ -91,8 +91,11 @@
- 	private inSettingsEditorContextKey: IContextKey<boolean>;
- 	private searchFocusContextKey: IContextKey<boolean>;
- 
-+<<<<<<< .our
- 	private scheduledRefreshes: Map<string, DOM.IFocusTracker>;
- 
-+=======
-+>>>>>>> .their
- 	private tagRegex = /(^|\s)@tag:("([^"]*)"|[^"]\S*)/g;
- 
- 	/** Don't spam warnings */
-@@ -742,6 +745,7 @@
- 				return '';
- 			});
- 		}
-+<<<<<<< .our
- 
- 		query = query.trim();
- 		if (query && query !== '@') {
-@@ -749,6 +753,13 @@
- 			return TPromise.join([
- 				this.localSearchDelayer.trigger(() => this.localFilterPreferences(query, this.searchCancelToken.token)),
- 				this.remoteSearchThrottle.trigger(() => this.remoteSearchPreferences(query, this.searchCancelToken.token), 500)
-+=======
-+		query = query.trim();
-+		if (query) {
-+			return this.searchInProgress = TPromise.join([
-+				this.localSearchDelayer.trigger(() => this.localFilterPreferences(query)),
-+				this.remoteSearchThrottle.trigger(() => this.remoteSearchPreferences(query), 500)
-+>>>>>>> .their
- 			]).then(() => {
- 				if (this.searchCancelToken) {
- 					this.searchCancelToken.dispose();
-changed in both
-  base   100644 e1dfd2f0e4fdb90eedbcffcd091398b63d493bd4 src/vs/workbench/parts/preferences/browser/settingsTree.ts
-  our    100644 480a73351c9d0eb61722fdd061a2a00dcd5a9574 src/vs/workbench/parts/preferences/browser/settingsTree.ts
-  their  100644 7f0205c640eeb0c9cb99f2f2230a596cf3787c4b src/vs/workbench/parts/preferences/browser/settingsTree.ts
-@@ -1093,8 +1093,21 @@
- 			}
- 		}
- 
-+<<<<<<< .our
- 		if (element instanceof SettingsTreeSettingElement && this.viewState.tagFilters) {
- 			return element.matchesAllTags(this.viewState.tagFilters);
-+=======
-+		if (element instanceof SettingsTreeSettingElement && this.viewState.tagFilters && this.viewState.tagFilters.size) {
-+			if (element.tags) {
-+				let hasFilteredTag = true;
-+				this.viewState.tagFilters.forEach(tag => {
-+					hasFilteredTag = hasFilteredTag && element.tags.has(tag);
-+				});
-+				return hasFilteredTag;
-+			} else {
-+				return false;
-+			}
-+>>>>>>> .their
- 		}
- 
- 		if (element instanceof SettingsTreeGroupElement) {
diff --git a/app/test/fixtures/merge-parser/vscode/merge-standalone-0.1.x-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-standalone-0.1.x-into-master.txt
deleted file mode 100644
index 1b8e74f688f..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-standalone-0.1.x-into-master.txt
+++ /dev/null
@@ -1,782 +0,0 @@
-changed in both
-  base   100644 7a816a78631aa18b2d6669886d9a260c11d216ce src/vs/base/browser/browser.ts
-  our    100644 19c46188f3ba487d308c72637ce84fdba83c8908 src/vs/base/browser/browser.ts
-  their  100644 7a54a1d45d7625dc6fdba8225ce483682497d5d8 src/vs/base/browser/browser.ts
-@@ -29,11 +29,43 @@
- 			return;
- 		}
- 
-+<<<<<<< .our
- 		this._zoomLevel = zoomLevel;
- 		// See https://github.com/Microsoft/vscode/issues/26151
- 		this._lastZoomLevelChangeTime = isTrusted ? 0 : Date.now();
- 		this._onDidChangeZoomLevel.fire(this._zoomLevel);
- 	}
-+=======
-+const globals = <IGlobalScope><any>(typeof self === 'object' ? self : global);
-+
-+// MAC:
-+// chrome: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_2) AppleWebKit/535.2 (KHTML, like Gecko) Chrome/15.0.874.100 Safari/535.2"
-+// safari: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_2) AppleWebKit/534.51.22 (KHTML, like Gecko) Version/5.1.1 Safari/534.51.22"
-+//
-+// WINDOWS:
-+// chrome: "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/535.2 (KHTML, like Gecko) Chrome/15.0.874.102 Safari/535.2"
-+// IE: "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.1; WOW64; Trident/5.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Media Center PC 6.0; .NET4.0C; .NET4.0E; MS-RTC LM 8; InfoPath.3; Zune 4.7)"
-+// Opera:	"Opera/9.80 (Windows NT 6.1; U; en) Presto/2.9.168 Version/11.52"
-+// FF: "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:8.0) Gecko/20100101 Firefox/8.0"
-+
-+// LINUX:
-+// chrome: "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.71 Safari/537.36"
-+// firefox: "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:34.0) Gecko/20100101 Firefox/34.0"
-+
-+const userAgent = globals.navigator ? globals.navigator.userAgent : '';
-+
-+// DOCUMENTED FOR FUTURE REFERENCE:
-+// When running IE11 in IE10 document mode, the code below will identify the browser as being IE10,
-+// which is correct because IE11 in IE10 document mode will reimplement all the bugs of IE10
-+export const isIE11 = (userAgent.indexOf('Trident') >= 0 && userAgent.indexOf('MSIE') < 0);
-+export const isIE10 = (userAgent.indexOf('MSIE 10') >= 0);
-+export const isIE9 = (userAgent.indexOf('MSIE 9') >= 0);
-+export const isIE11orEarlier = isIE11 || isIE10 || isIE9;
-+export const isIE10orEarlier = isIE10 || isIE9;
-+export const isIE10orLater = isIE11 || isIE10;
-+export const isEdge = (userAgent.indexOf('Edge/') >= 0);
-+export const isEdgeOrIE = isEdge || isIE11 || isIE10 || isIE9;
-+>>>>>>> .their
- 
- 
- 	// --- Zoom Factor
-added in remote
-  their  100644 3037fc23a0da9489b6306bd1549bfaba154a8935 src/vs/editor/browser/controller/input/textAreaWrapper.ts
-@@ -0,0 +1,187 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+'use strict';
-+
-+import Event, {Emitter} from 'vs/base/common/event';
-+import {Disposable} from 'vs/base/common/lifecycle';
-+import * as browser from 'vs/base/browser/browser';
-+import * as dom from 'vs/base/browser/dom';
-+import {IKeyboardEvent} from 'vs/base/browser/keyboardEvent';
-+import {IClipboardEvent, ICompositionEvent, IKeyboardEventWrapper, ITextAreaWrapper} from 'vs/editor/common/controller/textAreaState';
-+
-+class ClipboardEventWrapper implements IClipboardEvent {
-+
-+	private _event:ClipboardEvent;
-+
-+	constructor(event:ClipboardEvent) {
-+		this._event = event;
-+	}
-+
-+	public canUseTextData(): boolean {
-+		if (this._event.clipboardData) {
-+			return true;
-+		}
-+		if ((<any>window).clipboardData) {
-+			return true;
-+		}
-+		return false;
-+	}
-+
-+	public setTextData(text:string): void {
-+		if (this._event.clipboardData) {
-+			this._event.clipboardData.setData('text/plain', text);
-+			this._event.preventDefault();
-+			return;
-+		}
-+
-+		if ((<any>window).clipboardData) {
-+			(<any>window).clipboardData.setData('Text', text);
-+			this._event.preventDefault();
-+			return;
-+		}
-+
-+		throw new Error('ClipboardEventWrapper.setTextData: Cannot use text data!');
-+	}
-+
-+	public getTextData(): string {
-+		if (this._event.clipboardData) {
-+			this._event.preventDefault();
-+			return this._event.clipboardData.getData('text/plain');
-+		}
-+
-+		if ((<any>window).clipboardData) {
-+			this._event.preventDefault();
-+			return (<any>window).clipboardData.getData('Text');
-+		}
-+
-+		throw new Error('ClipboardEventWrapper.getTextData: Cannot use text data!');
-+	}
-+}
-+
-+class KeyboardEventWrapper implements IKeyboardEventWrapper {
-+
-+	public _actual: IKeyboardEvent;
-+
-+	constructor(actual:IKeyboardEvent) {
-+		this._actual = actual;
-+	}
-+
-+	public equals(keybinding:number): boolean {
-+		return this._actual.equals(keybinding);
-+	}
-+
-+	public preventDefault(): void {
-+		this._actual.preventDefault();
-+	}
-+
-+	public isDefaultPrevented(): boolean {
-+		if (this._actual.browserEvent) {
-+			return this._actual.browserEvent.defaultPrevented;
-+		}
-+		return false;
-+	}
-+}
-+
-+export class TextAreaWrapper extends Disposable implements ITextAreaWrapper {
-+
-+	private _textArea: HTMLTextAreaElement;
-+
-+	private _onKeyDown = this._register(new Emitter<IKeyboardEventWrapper>());
-+	public onKeyDown: Event<IKeyboardEventWrapper> = this._onKeyDown.event;
-+
-+	private _onKeyUp = this._register(new Emitter<IKeyboardEventWrapper>());
-+	public onKeyUp: Event<IKeyboardEventWrapper> = this._onKeyUp.event;
-+
-+	private _onKeyPress = this._register(new Emitter<IKeyboardEventWrapper>());
-+	public onKeyPress: Event<IKeyboardEventWrapper> = this._onKeyPress.event;
-+
-+	private _onCompositionStart = this._register(new Emitter<ICompositionEvent>());
-+	public onCompositionStart: Event<ICompositionEvent> = this._onCompositionStart.event;
-+
-+	private _onCompositionUpdate = this._register(new Emitter<ICompositionEvent>());
-+	public onCompositionUpdate: Event<ICompositionEvent> = this._onCompositionUpdate.event;
-+
-+	private _onCompositionEnd = this._register(new Emitter<ICompositionEvent>());
-+	public onCompositionEnd: Event<ICompositionEvent> = this._onCompositionEnd.event;
-+
-+	private _onInput = this._register(new Emitter<void>());
-+	public onInput: Event<void> = this._onInput.event;
-+
-+	private _onCut = this._register(new Emitter<IClipboardEvent>());
-+	public onCut: Event<IClipboardEvent> = this._onCut.event;
-+
-+	private _onCopy = this._register(new Emitter<IClipboardEvent>());
-+	public onCopy: Event<IClipboardEvent> = this._onCopy.event;
-+
-+	private _onPaste = this._register(new Emitter<IClipboardEvent>());
-+	public onPaste: Event<IClipboardEvent> = this._onPaste.event;
-+
-+	constructor(textArea: HTMLTextAreaElement) {
-+		super();
-+		this._textArea = textArea;
-+
-+		this._register(dom.addStandardDisposableListener(this._textArea, 'keydown', (e) => this._onKeyDown.fire(new KeyboardEventWrapper(e))));
-+		this._register(dom.addStandardDisposableListener(this._textArea, 'keyup', (e) => this._onKeyUp.fire(new KeyboardEventWrapper(e))));
-+		this._register(dom.addStandardDisposableListener(this._textArea, 'keypress', (e) => this._onKeyPress.fire(new KeyboardEventWrapper(e))));
-+		this._register(dom.addDisposableListener(this._textArea, 'compositionstart', (e) => this._onCompositionStart.fire(e)));
-+		this._register(dom.addDisposableListener(this._textArea, 'compositionupdate', (e) => this._onCompositionUpdate.fire(e)));
-+		this._register(dom.addDisposableListener(this._textArea, 'compositionend', (e) => this._onCompositionEnd.fire(e)));
-+		this._register(dom.addDisposableListener(this._textArea, 'input', (e) => this._onInput.fire()));
-+		this._register(dom.addDisposableListener(this._textArea, 'cut', (e:ClipboardEvent) => this._onCut.fire(new ClipboardEventWrapper(e))));
-+		this._register(dom.addDisposableListener(this._textArea, 'copy', (e:ClipboardEvent) => this._onCopy.fire(new ClipboardEventWrapper(e))));
-+		this._register(dom.addDisposableListener(this._textArea, 'paste', (e:ClipboardEvent) => this._onPaste.fire(new ClipboardEventWrapper(e))));
-+	}
-+
-+	public get actual(): HTMLTextAreaElement {
-+		return this._textArea;
-+	}
-+
-+	public getValue(): string {
-+		// console.log('current value: ' + this._textArea.value);
-+		return this._textArea.value;
-+	}
-+
-+	public setValue(reason:string, value:string): void {
-+		// console.log('reason: ' + reason + ', current value: ' + this._textArea.value + ' => new value: ' + value);
-+		this._textArea.value = value;
-+	}
-+
-+	public getSelectionStart(): number {
-+		return this._textArea.selectionStart;
-+	}
-+
-+	public getSelectionEnd(): number {
-+		return this._textArea.selectionEnd;
-+	}
-+
-+	public setSelectionRange(selectionStart:number, selectionEnd:number): void {
-+		let activeElement = document.activeElement;
-+		if (activeElement === this._textArea) {
-+			this._textArea.setSelectionRange(selectionStart, selectionEnd);
-+		} else {
-+			this._setSelectionRangeJumpy(selectionStart, selectionEnd);
-+		}
-+	}
-+
-+	private _setSelectionRangeJumpy(selectionStart:number, selectionEnd:number): void {
-+		try {
-+			let scrollState = dom.saveParentsScrollTop(this._textArea);
-+			this._textArea.focus();
-+			this._textArea.setSelectionRange(selectionStart, selectionEnd);
-+			dom.restoreParentsScrollTop(this._textArea, scrollState);
-+		} catch(e) {
-+			// Sometimes IE throws when setting selection (e.g. textarea is off-DOM)
-+			console.log('an error has been thrown!');
-+		}
-+	}
-+
-+	public isInOverwriteMode(): boolean {
-+		// In IE, pressing Insert will bring the typing into overwrite mode
-+		if (browser.isIE11orEarlier && document.queryCommandValue('OverWrite')) {
-+			return true;
-+		}
-+		return false;
-+	}
-+}
-removed in local
-  base   100644 06739f70f09c0f812a929a5412f9a45257466931 src/vs/editor/browser/controller/keyboardHandler.ts
-  their  100644 36665629cc17f60ad11b70d2e484565e1532ab96 src/vs/editor/browser/controller/keyboardHandler.ts
-changed in both
-  base   100644 57536aca0330ee98d7abaf8413cc16dacd64f0de src/vs/editor/browser/editorBrowser.ts
-  our    100644 d2b256b0ac954a95d910921337989333c3361cd3 src/vs/editor/browser/editorBrowser.ts
-  their  100644 7bb3119d1a783fb70cc4b30fa88a76bfd10db60c src/vs/editor/browser/editorBrowser.ts
-@@ -8,6 +8,7 @@
- import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
- import { IMouseEvent } from 'vs/base/browser/mouseEvent';
- import * as editorCommon from 'vs/editor/common/editorCommon';
-+<<<<<<< .our
- import { Position, IPosition } from 'vs/editor/common/core/position';
- import { Selection } from 'vs/editor/common/core/selection';
- import { Range, IRange } from 'vs/editor/common/core/range';
-@@ -19,6 +20,279 @@
- import { ICursors, CursorConfiguration } from 'vs/editor/common/controller/cursorCommon';
- import { IEditorWhitespace } from 'vs/editor/common/viewLayout/whitespaceComputer';
- import { ITextModel, IIdentifiedSingleEditOperation, IModelDecoration, IModelDeltaDecoration } from 'vs/editor/common/model';
-+=======
-+
-+export interface IDynamicViewOverlay extends IDisposable {
-+	shouldCallRender2(ctx:IRenderingContext): boolean;
-+	render2(lineNumber:number): string[];
-+}
-+
-+export interface IContentWidgetData {
-+	widget: IContentWidget;
-+	position: IContentWidgetPosition;
-+}
-+
-+export interface IOverlayWidgetData {
-+	widget: IOverlayWidget;
-+	position: IOverlayWidgetPosition;
-+}
-+
-+export interface ICodeEditorHelper {
-+	getScrollTop(): number;
-+	setScrollTop(scrollTop:number): void;
-+	getScrollLeft(): number;
-+	setScrollLeft(scrollLeft:number): void;
-+	getScrollHeight(): number;
-+	getScrollWidth(): number;
-+	getVerticalOffsetForPosition(lineNumber:number, column:number): number;
-+	delegateVerticalScrollbarMouseDown(browserEvent:MouseEvent): void;
-+	getOffsetForColumn(lineNumber:number, column:number): number;
-+}
-+
-+export interface IKeyboardHandlerHelper {
-+	viewDomNode:HTMLElement;
-+	textArea:HTMLTextAreaElement;
-+	visibleRangeForPositionRelativeToEditor(lineNumber:number, column:number): editorCommon.VisibleRange;
-+	flushAnyAccumulatedEvents(): void;
-+}
-+
-+export interface IPointerHandlerHelper {
-+	viewDomNode:HTMLElement;
-+	linesContentDomNode:HTMLElement;
-+
-+	focusTextArea(): void;
-+	isDirty(): boolean;
-+
-+	getScrollTop(): number;
-+	setScrollTop(scrollTop:number): void;
-+	getScrollLeft(): number;
-+	setScrollLeft(scrollLeft:number): void;
-+
-+	isAfterLines(verticalOffset:number): boolean;
-+	getLineNumberAtVerticalOffset(verticalOffset: number): number;
-+	getVerticalOffsetForLineNumber(lineNumber: number): number;
-+	getWhitespaceAtVerticalOffset(verticalOffset:number): editorCommon.IViewWhitespaceViewportData;
-+	shouldSuppressMouseDownOnViewZone(viewZoneId:number): boolean;
-+
-+	/**
-+	 * Decode an Editor.IPosition from a rendered dom node
-+	 */
-+	getPositionFromDOMInfo(spanNode:HTMLElement, offset:number): editorCommon.IPosition;
-+
-+	visibleRangeForPosition2(lineNumber:number, column:number): editorCommon.VisibleRange;
-+	getLineWidth(lineNumber:number): number;
-+}
-+
-+export interface IView extends IDisposable {
-+	domNode: HTMLElement;
-+
-+	getInternalEventBus(): IEventEmitter;
-+
-+	createOverviewRuler(cssClassName:string, minimumHeight:number, maximumHeight:number): IOverviewRuler;
-+	getCodeEditorHelper(): ICodeEditorHelper;
-+
-+	getCenteredRangeInViewport(): editorCommon.IEditorRange;
-+
-+	change(callback:(changeAccessor:IViewZoneChangeAccessor) => any): boolean;
-+	getWhitespaces(): editorCommon.IEditorWhitespace[];
-+	renderOnce(callback:() => any): any;
-+
-+	render(now:boolean): void;
-+
-+	focus(): void;
-+	isFocused(): boolean;
-+
-+	saveState(): editorCommon.IViewState;
-+	restoreState(state:editorCommon.IViewState): void;
-+
-+	addContentWidget(widgetData: IContentWidgetData): void;
-+	layoutContentWidget(widgetData: IContentWidgetData): void;
-+	removeContentWidget(widgetData: IContentWidgetData): void;
-+
-+	addOverlayWidget(widgetData: IOverlayWidgetData): void;
-+	layoutOverlayWidget(widgetData: IOverlayWidgetData): void;
-+	removeOverlayWidget(widgetData: IOverlayWidgetData): void;
-+}
-+
-+export interface IViewZoneData {
-+	viewZoneId: number;
-+	positionBefore:editorCommon.IEditorPosition;
-+	positionAfter:editorCommon.IEditorPosition;
-+	position: editorCommon.IEditorPosition;
-+	afterLineNumber: number;
-+}
-+
-+export interface IMouseDispatchData {
-+	position: editorCommon.IEditorPosition;
-+	/**
-+	 * Desired mouse column (e.g. when position.column gets clamped to text length -- clicking after text on a line).
-+	 */
-+	mouseColumn: number;
-+	startedOnLineNumbers: boolean;
-+
-+	inSelectionMode: boolean;
-+	mouseDownCount: number;
-+	altKey: boolean;
-+	ctrlKey: boolean;
-+	metaKey: boolean;
-+	shiftKey: boolean;
-+}
-+
-+export interface IViewController {
-+	dispatchMouse(data:IMouseDispatchData);
-+
-+	moveTo(source:string, position:editorCommon.IEditorPosition): void;
-+
-+	paste(source:string, text:string, pasteOnNewLine:boolean): void;
-+	type(source: string, text: string): void;
-+	replacePreviousChar(source: string, text: string, replaceCharCnt:number): void;
-+	cut(source:string): void;
-+
-+	emitKeyDown(e:IKeyboardEvent): void;
-+	emitKeyUp(e:IKeyboardEvent): void;
-+	emitContextMenu(e:IEditorMouseEvent): void;
-+	emitMouseMove(e:IEditorMouseEvent): void;
-+	emitMouseLeave(e:IEditorMouseEvent): void;
-+	emitMouseUp(e:IEditorMouseEvent): void;
-+	emitMouseDown(e:IEditorMouseEvent): void;
-+}
-+
-+export var ClassNames = {
-+	TEXTAREA_COVER: 'textAreaCover',
-+	TEXTAREA: 'inputarea',
-+	LINES_CONTENT: 'lines-content',
-+	OVERFLOW_GUARD: 'overflow-guard',
-+	VIEW_LINES: 'view-lines',
-+	VIEW_LINE: 'view-line',
-+	SCROLLABLE_ELEMENT: 'editor-scrollable',
-+	CONTENT_WIDGETS: 'contentWidgets',
-+	OVERFLOWING_CONTENT_WIDGETS: 'overflowingContentWidgets',
-+	OVERLAY_WIDGETS: 'overlayWidgets',
-+	MARGIN_VIEW_OVERLAYS: 'margin-view-overlays',
-+	LINE_NUMBERS: 'line-numbers',
-+	GLYPH_MARGIN: 'glyph-margin',
-+	SCROLL_DECORATION: 'scroll-decoration',
-+	VIEW_CURSORS_LAYER: 'cursors-layer',
-+	VIEW_ZONES: 'view-zones'
-+};
-+
-+export interface IRestrictedRenderingContext {
-+	linesViewportData:editorCommon.IViewLinesViewportData;
-+
-+	scrollWidth:number;
-+	scrollHeight:number;
-+
-+	visibleRange:editorCommon.IEditorRange;
-+	bigNumbersDelta:number;
-+
-+	viewportTop:number;
-+	viewportWidth:number;
-+	viewportHeight:number;
-+	viewportLeft:number;
-+
-+	getScrolledTopFromAbsoluteTop(absoluteTop:number): number;
-+	getViewportVerticalOffsetForLineNumber(lineNumber:number): number;
-+	lineIsVisible(lineNumber:number): boolean;
-+
-+	getDecorationsInViewport(): editorCommon.IModelDecoration[];
-+}
-+
-+export interface IRenderingContext extends IRestrictedRenderingContext {
-+
-+	linesVisibleRangesForRange(range:editorCommon.IRange, includeNewLines:boolean): editorCommon.LineVisibleRanges[];
-+
-+	visibleRangeForPosition(position:editorCommon.IPosition): editorCommon.VisibleRange;
-+}
-+
-+export interface IViewEventHandler {
-+	handleEvents(events:IEmitterEvent[]): void;
-+}
-+
-+export interface IViewportInfo {
-+	visibleRange: editorCommon.IEditorRange;
-+	width:number;
-+	height:number;
-+	deltaTop:number;
-+	deltaLeft:number;
-+}
-+
-+export interface IViewPart extends IDisposable {
-+	onBeforeForcedLayout(): void;
-+	onReadAfterForcedLayout(ctx:IRenderingContext): void;
-+	onWriteAfterForcedLayout(): void;
-+}
-+
-+// --- end View Event Handlers & Parts
-+
-+export interface IViewContext {
-+
-+	addEventHandler(eventHandler:IViewEventHandler): void;
-+	removeEventHandler(eventHandler:IViewEventHandler): void;
-+
-+	configuration:editorCommon.IConfiguration;
-+	model: editorCommon.IViewModel;
-+	privateViewEventBus:editorCommon.IViewEventBus;
-+}
-+
-+export interface ILayoutProvider extends IVerticalLayoutProvider, IScrollingProvider {
-+
-+	dispose():void;
-+
-+	getCenteredViewLineNumberInViewport(): number;
-+
-+	getCurrentViewport(): editorCommon.IViewport;
-+
-+	onMaxLineWidthChanged(width:number): void;
-+
-+	saveState(): editorCommon.IViewState;
-+	restoreState(state:editorCommon.IViewState): void;
-+}
-+
-+export interface IScrollingProvider {
-+
-+	getOverviewRulerInsertData(): { parent: HTMLElement; insertBefore: HTMLElement; };
-+	getScrollbarContainerDomNode(): HTMLElement;
-+	delegateVerticalScrollbarMouseDown(browserEvent:MouseEvent): void;
-+
-+	// This is for the glyphs, line numbers, etc.
-+	getScrolledTopFromAbsoluteTop(top:number): number;
-+
-+	getScrollHeight(): number;
-+	getScrollWidth(): number;
-+	getScrollLeft(): number;
-+	setScrollLeft(scrollLeft:number): void;
-+	getScrollTop(): number;
-+	setScrollTop(scrollTop:number): void;
-+}
-+
-+export interface IVerticalLayoutProvider {
-+
-+	/**
-+	 * Compute vertical offset (top) of line number
-+	 */
-+	getVerticalOffsetForLineNumber(lineNumber:number): number;
-+
-+	/**
-+	 * Returns the height in pixels for `lineNumber`.
-+	 */
-+	heightInPxForLine(lineNumber:number): number;
-+
-+	/**
-+	 * Return line number at `verticalOffset` or closest line number
-+	 */
-+	getLineNumberAtVerticalOffset(verticalOffset:number): number;
-+
-+	/**
-+	 * Compute content height (including one extra scroll page if necessary)
-+	 */
-+	getTotalHeight(): number;
-+
-+	/**
-+	 * Compute the lines that need to be rendered in the current viewport position.
-+	 */
-+	getLinesViewportData(): editorCommon.IViewLinesViewportData;
-+}
-+>>>>>>> .their
- 
- /**
-  * A view zone is a full horizontal rectangle that 'pushes' text down.
-removed in local
-  base   100644 25c26feaf80ebb6ca77f3225b25aa700a22d5d72 src/vs/editor/browser/standalone/standaloneEditor.ts
-  their  100644 8fb8261193412c04b54031c6621cb475da8866db src/vs/editor/browser/standalone/standaloneEditor.ts
-removed in local
-  base   100644 910da85c9895f978709f256c3630dd8dcea018de src/vs/editor/browser/standalone/standaloneSchemas.ts
-  their  100644 9a2e8996a754d53609071d514906ebc38a54ecea src/vs/editor/browser/standalone/standaloneSchemas.ts
-changed in both
-  base   100644 bc37d51cb347cba078cc6440f60f9d4753e4b269 src/vs/editor/browser/view/viewImpl.ts
-  our    100644 f619f1adef4f12e7f3e990d008867ec5f137fb73 src/vs/editor/browser/view/viewImpl.ts
-  their  100644 fa1bdd64e771a1533332e84a9a69e8affce7078e src/vs/editor/browser/view/viewImpl.ts
-@@ -286,6 +286,9 @@
- 					return null;
- 				}
- 				return visibleRanges[0];
-+			},
-+			flushAnyAccumulatedEvents: () => {
-+				this._flushAnyAccumulatedEvents();
- 			}
- 		};
- 	}
-removed in local
-  base   100644 bc90a062ca357741e8b55c6052ad6430eacd5455 src/vs/editor/common/controller/textAreaHandler.ts
-  their  100644 3435d91ee7fddb55166da0b9d8c787c08222837f src/vs/editor/common/controller/textAreaHandler.ts
-removed in local
-  base   100644 3a404426832fa23c7db98d79ac56e41169e89d0b src/vs/editor/common/controller/textAreaState.ts
-  their  100644 29fa70f3972ff0e1f1e9fd5a413a2e59882f5ef6 src/vs/editor/common/controller/textAreaState.ts
-removed in local
-  base   100644 611a35378b3c8dd2b9950ebc9b399ec347a8828a src/vs/editor/standalone-languages/all.ts
-  their  100644 ff49458189993f9b7630e6f2c03cb8339a2a69b4 src/vs/editor/standalone-languages/all.ts
-added in both
-  our    100644 0a3be4e87a87e24c296898017f88f8172e1ca964 src/vs/editor/test/browser/controller/imeTester.ts
-  their  100644 4b5495217fde20255b253defa652488bbae8eb24 src/vs/editor/test/browser/controller/imeTester.ts
-@@ -4,6 +4,7 @@
-  *--------------------------------------------------------------------------------------------*/
- 'use strict';
- 
-+<<<<<<< .our
- import { TextAreaInput, ITextAreaInputHost } from 'vs/editor/browser/controller/textAreaInput';
- import { ISimpleModel, TextAreaState, PagedScreenReaderStrategy } from 'vs/editor/browser/controller/textAreaState';
- import { Range, IRange } from 'vs/editor/common/core/range';
-@@ -11,11 +12,21 @@
- import { createFastDomNode } from 'vs/base/browser/fastDomNode';
- import * as browser from 'vs/base/browser/browser';
- import { EndOfLinePreference } from 'vs/editor/common/model';
-+=======
-+import {TextAreaHandler} from 'vs/editor/common/controller/textAreaHandler';
-+import * as browser from 'vs/base/browser/browser';
-+import {TextAreaStrategy, ISimpleModel} from 'vs/editor/common/controller/textAreaState';
-+import {Range} from 'vs/editor/common/core/range';
-+import * as editorCommon from 'vs/editor/common/editorCommon';
-+import {TextAreaWrapper} from 'vs/editor/browser/controller/input/textAreaWrapper';
-+import {Position} from 'vs/editor/common/core/position';
-+>>>>>>> .their
- 
- // To run this test, open imeTester.html
- 
- class SingleLineTestModel implements ISimpleModel {
- 
-+<<<<<<< .our
- 	private _line: string;
- 
- 	constructor(line: string) {
-@@ -35,23 +46,65 @@
- 	}
- 
- 	getModelLineContent(lineNumber: number): string {
-+=======
-+	private _line:string;
-+	private _eol:string;
-+
-+	constructor(line:string) {
-+		this._line = line;
-+		this._eol = '\n';
-+	}
-+
-+	setText(text:string) {
-+		this._line = text;
-+	}
-+
-+	getLineMaxColumn(lineNumber:number): number {
-+		return this._line.length + 1;
-+	}
-+
-+	getEOL(): string {
-+		return this._eol;
-+	}
-+
-+	getValueInRange(range:editorCommon.IRange, eol:editorCommon.EndOfLinePreference): string {
-+		return this._line.substring(range.startColumn - 1, range.endColumn - 1);
-+	}
-+
-+	getModelLineContent(lineNumber:number): string {
-+>>>>>>> .their
- 		return this._line;
- 	}
- 
- 	getLineCount(): number {
- 		return 1;
- 	}
-+<<<<<<< .our
-+=======
-+
-+	convertViewPositionToModelPosition(viewLineNumber:number, viewColumn:number): Position {
-+		return new Position(viewLineNumber, viewColumn);
-+	}
-+>>>>>>> .their
- }
- 
- class TestView {
- 
- 	private _model: SingleLineTestModel;
- 
-+<<<<<<< .our
- 	constructor(model: SingleLineTestModel) {
- 		this._model = model;
- 	}
- 
- 	public paint(output: HTMLElement) {
-+=======
-+	constructor(model:SingleLineTestModel) {
-+		this._model = model;
-+	}
-+
-+	public paint(output:HTMLElement) {
-+>>>>>>> .their
- 		let r = '';
- 		for (let i = 1; i <= this._model.getLineCount(); i++) {
- 			let content = this._model.getModelLineContent(i);
-@@ -61,17 +114,25 @@
- 	}
- }
- 
-+<<<<<<< .our
- function doCreateTest(description: string, inputStr: string, expectedStr: string): HTMLElement {
- 	let cursorOffset: number = 0;
- 	let cursorLength: number = 0;
- 
-+=======
-+function doCreateTest(strategy:TextAreaStrategy, description:string, inputStr:string, expectedStr:string): HTMLElement {
-+>>>>>>> .their
- 	let container = document.createElement('div');
- 	container.className = 'container';
- 
- 	let title = document.createElement('div');
- 	title.className = 'title';
-+<<<<<<< .our
- 
- 	title.innerHTML = description + '. Type <strong>' + inputStr + '</strong>';
-+=======
-+	title.innerHTML = TextAreaStrategy[strategy] + ' strategy: ' + description + '. Type <strong>' + inputStr + '</strong>';
-+>>>>>>> .their
- 	container.appendChild(title);
- 
- 	let startBtn = document.createElement('button');
-@@ -84,6 +145,7 @@
- 	input.setAttribute('cols', '40');
- 	container.appendChild(input);
- 
-+<<<<<<< .our
- 	let model = new SingleLineTestModel('some  text');
- 
- 	const textAreaInputHost: ITextAreaInputHost = {
-@@ -106,6 +168,20 @@
- 	};
- 
- 	let handler = new TextAreaInput(textAreaInputHost, createFastDomNode(input));
-+=======
-+	let textAreaWrapper = new TextAreaWrapper(input);
-+
-+	let model = new SingleLineTestModel('some  text');
-+
-+	let handler = new TextAreaHandler(browser, strategy, textAreaWrapper, model, () => {});
-+
-+	input.onfocus = () => {
-+		handler.setHasFocus(true);
-+	};
-+	input.onblur = () => {
-+		handler.setHasFocus(false);
-+	};
-+>>>>>>> .their
- 
- 	let output = document.createElement('pre');
- 	output.className = 'output';
-@@ -121,6 +197,7 @@
- 
- 	let view = new TestView(model);
- 
-+<<<<<<< .our
- 	let updatePosition = (off: number, len: number) => {
- 		cursorOffset = off;
- 		cursorLength = len;
-@@ -130,6 +207,20 @@
- 
- 	let updateModelAndPosition = (text: string, off: number, len: number) => {
- 		model._setText(text);
-+=======
-+
-+	let cursorOffset: number;
-+	let cursorLength: number;
-+	let updatePosition = (off:number, len:number) => {
-+		cursorOffset = off;
-+		cursorLength = len;
-+		handler.setCursorSelections(new Range(1, 1 + cursorOffset, 1, 1 + cursorOffset + cursorLength), []);
-+		handler.writePlaceholderAndSelectTextAreaSync();
-+	};
-+
-+	let updateModelAndPosition = (text:string, off:number, len:number) => {
-+		model.setText(text);
-+>>>>>>> .their
- 		updatePosition(off, len);
- 		view.paint(output);
- 
-@@ -156,7 +247,11 @@
- 
- 	view.paint(output);
- 
-+<<<<<<< .our
- 	startBtn.onclick = function () {
-+=======
-+	startBtn.onclick = function() {
-+>>>>>>> .their
- 		updateModelAndPosition('some  text', 5, 0);
- 		input.focus();
- 	};
-@@ -172,10 +267,18 @@
- 	{ description: 'Chinese IME 1', in: '.,', out: '。，' },
- 	{ description: 'Chinese IME 2', in: 'ni [Space] hao [Space]', out: '你好' },
- 	{ description: 'Chinese IME 3', in: 'hazni [Space]', out: '哈祝你' },
-+<<<<<<< .our
- 	{ description: 'Mac dead key 1', in: '`.', out: '`.' },
- 	{ description: 'Mac hold key 1', in: 'e long press and 1', out: 'é' }
- ];
- 
- TESTS.forEach((t) => {
- 	document.body.appendChild(doCreateTest(t.description, t.in, t.out));
-+=======
-+];
-+
-+TESTS.forEach((t) => {
-+	document.body.appendChild(doCreateTest(TextAreaStrategy.NVDA, t.description, t.in, t.out));
-+	document.body.appendChild(doCreateTest(TextAreaStrategy.IENarrator, t.description, t.in, t.out));
-+>>>>>>> .their
- });
-removed in local
-  base   100644 11bf927d1eab8b32744594a318a9f0de943831eb src/vs/editor/test/common/mocks/mockTextAreaWrapper.ts
-  their  100644 127647989ab1f5e3514fd902d41bc85ab4f89aed src/vs/editor/test/common/mocks/mockTextAreaWrapper.ts
-removed in local
-  base   100644 041a461573681b6cf9821c91ffa938f70807891c src/vs/text.js
-  their  100644 08fef42b9f68a15c7504347ada97ba34441cc02f src/vs/text.js
diff --git a/app/test/fixtures/merge-parser/vscode/merge-standalone-0.10.x-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-standalone-0.10.x-into-master.txt
deleted file mode 100644
index 98b5cc874e5..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-standalone-0.10.x-into-master.txt
+++ /dev/null
@@ -1,7295 +0,0 @@
-changed in both
-  base   100644 c31756516c7e2a85aa458128892de453d154de9a build/monaco/package.json
-  our    100644 efd919085b2ffc82da8d810c609a9ed217bffb35 build/monaco/package.json
-  their  100644 078e81d5b32dfeee35192ad6dfd9b5a16d99456c build/monaco/package.json
-@@ -1,7 +1,11 @@
- {
-   "name": "monaco-editor-core",
-   "private": true,
-+<<<<<<< .our
-   "version": "0.14.3",
-+=======
-+  "version": "0.10.1",
-+>>>>>>> .their
-   "description": "A browser based code editor",
-   "author": "Microsoft Corporation",
-   "license": "MIT",
-changed in both
-  base   100644 0554a343e08820f227c63d01e01edc674301d78b extensions/emmet/package.json
-  our    100644 d9be62f74d1063d961b7895eab86495b34482691 extensions/emmet/package.json
-  their  100644 d5d98918ec25a91addcf34b342156130dfc6c8cd extensions/emmet/package.json
-@@ -39,7 +39,11 @@
-                         "inMarkupAndStylesheetFilesOnly"
-                     ],
-                     "default": "always",
-+<<<<<<< .our
-                     "markdownDescription": "%emmetShowExpandedAbbreviation%"
-+=======
-+                    "description": "%emmetShowExpandedAbbreviation%"
-+>>>>>>> .their
-                 },
-                 "emmet.showAbbreviationSuggestions": {
-                     "type": "boolean",
-removed in local
-  base   100644 693a00ba7eba4b5988dce6a9274d3428a4c4367a extensions/markdown/src/security.ts
-  their  100644 5c269f7fb265567db8f70e23511e2e2d17400312 extensions/markdown/src/security.ts
-changed in both
-  base   100644 a6d0d75c963a08dc07b7f6a47e52060a07594f56 i18n/chs/extensions/emmet/package.i18n.json
-  our    100644 5cf0382870fbe5abfd1dea23749ad88b51794f9a i18n/chs/extensions/emmet/package.i18n.json
-  their  100644 53857769751cbd8f1495077242e9f636d23bfa8f i18n/chs/extensions/emmet/package.i18n.json
-@@ -32,6 +32,7 @@
- 	"command.decrementNumberByTen": "减少 10",
- 	"emmetSyntaxProfiles": "为指定的语法定义配置文件或使用带有特定规则的配置文件。",
- 	"emmetExclude": "不应展开 Emmet 缩写的语言数组。",
-+<<<<<<< .our
- 	"emmetExtensionsPath": "包含 Emmet 配置文件与代码片段的文件夹路径。",
- 	"emmetShowExpandedAbbreviation": "在建议中显示展开的 Emmet 缩写。\n选择 \"inMarkupAndStylesheetFilesOnly\" 选项将仅应用于 html、haml、jade、slim、xml、xsl、css、scss、sass、less 和 stylus 文件。\n选择 \"always\" 选项将应用于所有适用文件不限于标记或 CSS 的所有部分。",
- 	"emmetShowAbbreviationSuggestions": "显示可能的 Emmet 缩写作为建议。在样式表中或当 emmet.showExpandedAbbreviation 设置为 \"never\" 时不适用。",
-@@ -62,4 +63,11 @@
- 	"emmetPreferencesCssMsProperties": "Emmet 缩写中使用的由 \"-\" 打头有 \"ms\" 前缀的 CSS 属性，使用半角逗号 (\",\") 进行分隔。若要始终避免 \"ms\" 前缀，请设为空字符串。",
- 	"emmetPreferencesCssFuzzySearchMinScore": "显示的缩写模糊匹配应达到的最低分数 (0 到 1 之间)。较低的值可能使匹配错误变多，较高的值可能将不会显示应有的匹配项。",
- 	"emmetOptimizeStylesheetParsing": "当设置为 false 时，将分析整个文件并确定当前位置能否展开 Emmet 缩写。当设置为 true 时，则仅在 CSS/SCSS/LESS 文件中进行分析。"
-+=======
-+	"emmetExtensionsPath": "包含 Emmet 配置文件、片段和首选项的文件夹路径。当 emmet.useNewEmmet 设置为 true 时，只有配置文件才服从于扩展路径。",
-+	"emmetShowExpandedAbbreviation": "显示扩展的 Emmet 缩写作为建议。\n\"inMarkupAndStylesheetFilesOnly\" 选项适用于 html、haml、jade、slim、xml、xsl、css、scss、sass、less 和 stylus。\n\"always\" 选项适用于 markup/css 文件的所有部分。",
-+	"emmetShowAbbreviationSuggestions": "显示可能的 Emmet 缩写作为建议。在风格表中或将 emmet.showExpandedAbbreviation 设置为 \"never\" 时不适用。",
-+	"emmetIncludeLanguages": "启用使用默认不支持的语言的 Emmet 缩写。在此添加该语言与支持 Emmet 的语言之间的映射。示例: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
-+	"emmetVariables": "要用于 Emmet 代码片段的变量"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f7e87a0d5613a93f1778451f22a9c696ea636c42 i18n/chs/extensions/extension-editing/out/extensionLinter.i18n.json
-  our    100644 605e80db79201225087dde7ac9e675add872dd3b i18n/chs/extensions/extension-editing/out/extensionLinter.i18n.json
-  their  100644 6e684ea67b036fdc53762cb4d272038abb22240d i18n/chs/extensions/extension-editing/out/extensionLinter.i18n.json
-changed in both
-  base   100644 0ceae1d9a5946647bfe2526b3781b45d55016c3a i18n/chs/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 1be88d0e515057ba8dbf0bcd7cef8fa6af9d6bf5 i18n/chs/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 19796927f10244781c199383bb70e4a1f76adb89 i18n/chs/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -9,7 +9,20 @@
- 	"openFile": "打开文件...",
- 	"openFolder": "打开文件夹...",
- 	"openFileFolder": "打开...",
-+<<<<<<< .our
- 	"globalRemoveFolderFromWorkspace": "将文件夹从工作区删除…",
-+=======
-+	"reload": "重新加载(&&R)",
-+	"cancel": "取消",
-+	"newWorkspaceFormExisting": "从现有内容新建工作区...",
-+	"select": "选择(&&S)",
-+	"selectWorkspace": "选择文件夹作为工作区",
-+	"addSupported": "需要重载窗口以打开多个文件夹。",
-+	"addFolderToWorkspace": "将文件夹添加到工作区...",
-+	"add": "添加(&&A)",
-+	"addFolderToWorkspaceTitle": "将文件夹添加到工作区",
-+	"removeFolderFromWorkspace": "将文件夹从工作区删除",
-+>>>>>>> .their
- 	"saveWorkspaceAsAction": "将工作区另存为...",
- 	"save": "保存(&&S)",
- 	"saveWorkspace": "保存工作区",
-changed in both
-  base   100644 943141ce567d4721646ac0c798f2baea84327923 i18n/chs/src/vs/workbench/common/theme.i18n.json
-  our    100644 9dff140c48c8d58d62f0adab067f1886bd30d318 i18n/chs/src/vs/workbench/common/theme.i18n.json
-  their  100644 4de0f24ff61fc0510e2ce3259a870dac25b1a462 i18n/chs/src/vs/workbench/common/theme.i18n.json
-changed in both
-  base   100644 f5089c0197a26c4bbd1c666ddf37ce03370a74a2 i18n/chs/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  our    100644 cd6b52432c5724bdc5e159734ac7ba787ed23e4f i18n/chs/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  their  100644 9852244f28dacb2c84d171cecdb4d3d4bcebc685 i18n/chs/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-merged
-  result 100644 83e026a7dbde35f88978675b2be3664004a8becc i18n/chs/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-  our    100644 c14acb9c9cd8f882d969fa957f2f4f98e2fb2c74 i18n/chs/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-@@ -7,8 +7,5 @@
- 	"emmetConfigurationTitle": "Emmet",
- 	"triggerExpansionOnTab": "启用后，按 TAB 键时，将展开 Emmet 缩写。若 emmet.useNewemmet 设置为 true，则不适用。",
- 	"emmetPreferences": "用于修改 Emmet 的某些操作和解决程序的行为的首选项。若 emmet.useNewemmet 设置为 true，则不适用。",
--	"emmetSyntaxProfiles": "为指定的语法定义配置文件或使用带有特定规则的配置文件。",
--	"emmetExclude": "不应展开 Emmet 缩写的语言数组。",
--	"emmetExtensionsPath": "包含 Emmet 配置文件、片段和首选项的文件夹路径。当 emmet.useNewEmmet 设置为 true 时，只有配置文件才服从于扩展路径。",
- 	"useNewEmmet": "试用新版 Emmet 模块（最终会替换旧版单一 Emmet 库）体验所有 Emmet 功能。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 d2cf1b98e7bca78448a1d13455adcefc22cc2116 i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 9fc53ead3b405eb141c09e4bad1572eca1cf588a i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 c70f6d72be0b60635995433f666a9f066341c6e8 i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -14,4 +15,19 @@
- 	"editTtile": "编辑",
- 	"replaceDefaultValue": "在设置中替换",
- 	"copyDefaultValue": "复制到设置"
-+=======
-+	"emptyUserSettingsHeader": "将设置放入此处以覆盖\"默认设置\"。",
-+	"errorInvalidConfiguration": "无法写入设置。请更正文件中的错误/警告，然后重试。",
-+	"emptyWorkspaceSettingsHeader": "将设置放入此处以覆盖\"用户设置\"。",
-+	"emptyFolderSettingsHeader": "将文件夹设置放入此处以覆盖\"工作区设置\"。",
-+	"defaultFolderSettingsTitle": "默认文件夹设置",
-+	"defaultSettingsTitle": "默认设置",
-+	"noSettingsFound": "未找到设置。",
-+	"editTtile": "编辑",
-+	"replaceDefaultValue": "在设置中替换",
-+	"copyDefaultValue": "复制到设置",
-+	"unsupportedPHPExecutablePathSetting": "此设置必须是“用户设置”。若要为工作区配置 PHP，请打开 PHP 文件并单击状态栏中的“PHP 路径”。",
-+	"unsupportedWorkspaceSetting": "此设置必须是“用户设置”。",
-+	"unsupportedWorkbenchSetting": "当前无法应用此设置。将在直接打开此文件夹时应用。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 5645f876d2193e91958c02bff92bb4a6803f7a7c i18n/chs/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 db5d7a07f49a26b2f7df503221d63078c01a6dc6 i18n/chs/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 6af8f4d75746d980b519ffb0667be5367759b938 i18n/chs/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"nextSearchIncludePattern": "显示下一个搜索包含模式",
- 	"previousSearchIncludePattern": "显示上一个搜索包含模式",
- 	"nextSearchExcludePattern": "显示下一个搜索排除模式",
-changed in both
-  base   100644 8bdf54da1723935aabcb23ff3ce14ab06cd4681a i18n/chs/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  our    100644 e6d06592621a01e4beede22526fb784dff427ca8 i18n/chs/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  their  100644 c8d357bdaa13bba222e6542933370045337a5ada i18n/chs/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-changed in both
-  base   100644 b447c9db51b05b9f6cc60d69b91992254d55eefa i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 c2fbe4fef10dc5236ff5c8da48376f2ca681d709 i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 fc4722516d18e4e3d99911a7174ddd4a80b93688 i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-changed in both
-  base   100644 c8746db7afb2f9dede27bb908bf2db91ff4b46aa i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 1becbfa0f08ad931e9c32c280588da0196edc807 i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 8927bceddff2468bcd5867977ccb18abbf2e6161 i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -14,8 +14,11 @@
- 	"workbench.action.terminal.selectAll": "全选",
- 	"workbench.action.terminal.deleteWordLeft": "删除左侧的字符",
- 	"workbench.action.terminal.deleteWordRight": "删除右侧的字符",
-+<<<<<<< .our
- 	"workbench.action.terminal.moveToLineStart": "移动到行首",
- 	"workbench.action.terminal.moveToLineEnd": "移动到行尾",
-+=======
-+>>>>>>> .their
- 	"workbench.action.terminal.new": "新建集成终端",
- 	"workbench.action.terminal.new.short": "新的终端",
- 	"workbench.action.terminal.newWorkspacePlaceholder": "选择当前工作目录新建终端",
-@@ -51,6 +54,7 @@
- 	"workbench.action.terminal.rename.prompt": "输入终端名称",
- 	"workbench.action.terminal.focusFindWidget": "聚焦于查找小组件",
- 	"workbench.action.terminal.hideFindWidget": "隐藏查找小组件",
-+<<<<<<< .our
- 	"nextTerminalFindTerm": "显示下一个搜索结果",
- 	"previousTerminalFindTerm": "显示上一个搜索结果",
- 	"quickOpenTerm": "切换活动终端",
-@@ -60,4 +64,7 @@
- 	"workbench.action.terminal.selectToNextCommand": "选择下一条命令所有内容",
- 	"workbench.action.terminal.selectToPreviousLine": "选择上一行的所有内容",
- 	"workbench.action.terminal.selectToNextLine": "选择下一行的所有内容"
-+=======
-+	"quickOpenTerm": "切换活动终端"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8459b7e494edb1c30730b8ceded6b56cf3264c46 i18n/chs/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 34456c16f6384eecbdba1d3ed14696eac3704dab i18n/chs/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 c6b32fc84ff21cf64df959972c6c0fe7e14fc4ca i18n/chs/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -11,7 +11,12 @@
- 	"read the release notes": "欢迎使用 {0} v{1}! 是否要阅读发布说明?",
- 	"licenseChanged": "我们对许可条款进行了修改，请点击[此处]({0})进行查看。",
- 	"neveragain": "不再显示",
-+<<<<<<< .our
- 	"64bitisavailable": "Windows 64 位版的 {0} 已经发布! 单击[这里]({1})了解更多信息。",
-+=======
-+	"64bitisavailable": "{0} 的 Windows 64 位版本现已可用！",
-+	"learn more": "了解详细信息",
-+>>>>>>> .their
- 	"updateIsReady": "有新的 {0} 的更新可用。",
- 	"noUpdatesAvailable": "当前没有可用的更新。",
- 	"ok": "确定",
-changed in both
-  base   100644 5c2a2259104469dd55dc43a50fd2eeec436a1a22 i18n/chs/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-  our    100644 52ac27ba5d7a4b2f7d1d4e2c5075a744dd7c1778 i18n/chs/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-  their  100644 1f422ca6c00315353adf89a4f14f0e70264ac79c i18n/chs/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-changed in both
-  base   100644 4d604a72c835d54e1575a1ffa0407933349033f1 i18n/chs/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  our    100644 2eb80022de4425a068a5199e1996a315ca606b51 i18n/chs/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  their  100644 2608d40b7c8c8dbbacd6272f7b88fee4a057edb0 i18n/chs/src/vs/workbench/services/configuration/node/configuration.i18n.json
-@@ -9,6 +9,7 @@
- 	"scope.window.description": "特定于窗口的配置，可在“用户”或“工作区”设置中配置。",
- 	"scope.resource.description": "特定于资源的配置，可在“用户”、“工作区”或“文件夹”设置中配置。",
- 	"scope.description": "配置适用的范围。可用范围有“窗口”和“资源”。",
-+<<<<<<< .our
- 	"vscode.extension.contributes.configuration": "用于配置字符串。",
- 	"invalid.title": "configuration.title 必须是字符串",
- 	"vscode.extension.contributes.defaultConfiguration": "按语言提供默认编辑器配置设置。",
-@@ -21,4 +22,13 @@
- 	"workspaceConfig.settings.description": "工作区设置",
- 	"workspaceConfig.extensions.description": "工作区扩展",
- 	"unknownWorkspaceProperty": "未知的工作区配置属性"
-+=======
-+	"invalid.type": "如果进行设置，\"configuration.type\" 必须设置为对象",
-+	"invalid.title": "configuration.title 必须是字符串",
-+	"vscode.extension.contributes.defaultConfiguration": "按语言提供默认编辑器配置设置。",
-+	"invalid.properties": "configuration.properties 必须是对象",
-+	"workspaceConfig.id.description": "工作区标识符。用于存储工作区内部状态。修改标识符可能导致内部状态丢失。",
-+	"workspaceConfig.folders.description": "要在工作区中加载的文件夹列表。必须为文件夹完整路径。例如 \"file:///root/folderA\"",
-+	"workspaceConfig.settings.description": "工作区设置"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c709a1e567fc8500f1f0dec05a1a28a7ffdb194d i18n/chs/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 5acf3a0fa36fa93c78f58cdf2d0b020db420fb68 i18n/chs/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 d494104435ec40cf64fa87ef1b1e4e1ac0638cfd i18n/chs/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -9,6 +9,7 @@
- 	"openTasksConfiguration": "打开任务配置",
- 	"openLaunchConfiguration": "打开启动配置",
- 	"open": "打开设置",
-+<<<<<<< .our
- 	"saveAndRetry": "保存并重试",
- 	"errorUnknownKey": "没有注册配置 {1}，因此无法写入 {0}。",
- 	"errorInvalidWorkspaceConfigurationApplication": "无法将 {0} 写入“工作区设置”。此设置只能写于“用户设置”。",
-@@ -27,6 +28,19 @@
- 	"errorConfigurationFileDirty": "用户设置文件已变更，无法写入。请先保存此文件，然后重试。",
- 	"errorConfigurationFileDirtyWorkspace": "工作区设置文件已变更，无法写入。请先保存此文件，然后重试。",
- 	"errorConfigurationFileDirtyFolder": "文件夹设置文件已变更，无法写入。请先保存“{0}”文件夹设置文件，然后重试。",
-+=======
-+	"close": "关闭",
-+	"saveAndRetry": "保存设置并重试",
-+	"errorUnknownKey": "没有注册配置 {1}，因此无法写入 {0}。",
-+	"errorInvalidFolderConfiguration": "{0} 不支持文件夹资源域，因此无法写入\"文件夹设置\"。",
-+	"errorInvalidUserTarget": "{0} 不支持全局域，因此无法写入\"用户设置\"。",
-+	"errorInvalidFolderTarget": "未提供资源，因此无法写入\"文件夹设置\"。",
-+	"errorNoWorkspaceOpened": "没有打开任何工作区，因此无法写入 {0}。请先打开一个工作区，然后重试。",
-+	"errorInvalidConfiguration": "无法写入设置。请打开 **用户设置** 更正文件中的错误/警告，然后重试。",
-+	"errorInvalidConfigurationWorkspace": "无法写入设置。请打开 **工作区设置** 更正文件中的错误/警告，然后重试。",
-+	"errorConfigurationFileDirty": "文件已变更，因此无法写入设置。请先保存 **用户设置** 文件，然后重试。",
-+	"errorConfigurationFileDirtyWorkspace": "文件已变更，因此无法写入设置。请先保存 **工作区设置** 文件，然后重试。",
-+>>>>>>> .their
- 	"userTarget": "用户设置",
- 	"workspaceTarget": "工作区设置",
- 	"folderTarget": "文件夹设置"
-changed in both
-  base   100644 a35321b4655c4f000dafff5aa8edca576c732397 i18n/cht/extensions/emmet/package.i18n.json
-  our    100644 b3dc8be8bb9ec8fba170590d50c4692dadd9f40f i18n/cht/extensions/emmet/package.i18n.json
-  their  100644 fbee2df0322efb1dfe093f8d3df15896eee6023f i18n/cht/extensions/emmet/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -9,6 +10,8 @@
- 	"description": "VS Code 的 Emnet 支援",
- 	"command.wrapWithAbbreviation": "使用縮寫換行",
- 	"command.wrapIndividualLinesWithAbbreviation": "使用縮寫換每一行",
-+=======
-+>>>>>>> .their
- 	"command.removeTag": "移除標籤",
- 	"command.updateTag": "更新標記",
- 	"command.matchTag": "前往相符的配對",
-@@ -32,6 +35,7 @@
- 	"command.decrementNumberByTen": "依 10 遞減",
- 	"emmetSyntaxProfiles": "為指定的語法定義設定檔，或透過特定規則使用自己的設定檔。",
- 	"emmetExclude": "不應展開 Emmet 縮寫的語言陣列。",
-+<<<<<<< .our
- 	"emmetExtensionsPath": "包含 Emmet 設定檔及程式碼片段的資料夾路徑",
- 	"emmetShowExpandedAbbreviation": "顯示建議之展開的 Emmet 縮寫。\n\"inMarkupAndStylesheetFilesOnly\" 選項適用於 html、haml、jade、slim、xml、xsl、css、scss、sass、less 和 stylus。\n不論 markup/css 為何，該選項「一律」適用於檔案的所有部分。",
- 	"emmetShowAbbreviationSuggestions": "顯示建議可能的 Emmet 縮寫。但在樣式表內或 emmet.showExpandedAbbreviation 設為「永不」時，則不適用。",
-@@ -62,4 +66,11 @@
- 	"emmetPreferencesCssMsProperties": "在以 `-` 開頭的 Emmet 縮寫中使用時，會取得 'ms' 廠商前綴的逗點分隔 CSS 屬性。設定為空白字串可避免總是取得 'ms' 前綴。",
- 	"emmetPreferencesCssFuzzySearchMinScore": "模糊比對的縮寫應該達到最低分數(從 0 到 1)。較低數值可能產生錯誤的比對，較高的數值可能會降低可能的比對。",
- 	"emmetOptimizeStylesheetParsing": "當設定為 false 時，將解析整個檔案以確定目前的位置是否適用於展開 Emmet 縮寫。當設定為 true 時，僅會解析 css/scss/less 檔案中目前位置周圍的內容。"
-+=======
-+	"emmetExtensionsPath": "前往包含 Emmet 設定檔、程式碼片段和喜好設定的資料夾之路徑。emmet.useNewEmmet 設定為 True 時，從延伸模組路徑只會接受設定檔。",
-+	"emmetShowExpandedAbbreviation": "顯示建議之展開的 Emmet 縮寫\n\"inMarkupAndStylesheetFilesOnly\" 選項適用於 html、haml、jade、slim、xml、xsl、css、scss、sass、less 和 stylus。\n不論標記/css 為何，該選項「一律」適用於檔案的所有部分。",
-+	"emmetShowAbbreviationSuggestions": "顯示建議之可能的 Emmet 縮寫。但在樣式表內，或若 emmet.showExpandedAbbreviation 設為「永不」，則不適用。",
-+	"emmetIncludeLanguages": "以預設未支援的語言啟用 Emmet 縮寫。在此新增該語言和 Emmet 支援的語言間之對應。例如: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"} ",
-+	"emmetVariables": "要在 Emmet 程式碼片段中使用的變數"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 425005b7245b29437530f465ed04ae81f8e30d2b i18n/cht/extensions/extension-editing/out/extensionLinter.i18n.json
-  our    100644 67c98d58805f7a295d9a615f22f783bfecb27575 i18n/cht/extensions/extension-editing/out/extensionLinter.i18n.json
-  their  100644 7816e127fc1c804089c73876711e1c552a6b1a63 i18n/cht/extensions/extension-editing/out/extensionLinter.i18n.json
-changed in both
-  base   100644 85a64933fccf24a4f29fad60c350d6d6b6dc7223 i18n/cht/extensions/markdown/out/previewContentProvider.i18n.json
-  our    100644 66d0022701855bf94d8cff40c0e868eeb6fbb549 i18n/cht/extensions/markdown/out/previewContentProvider.i18n.json
-  their  100644 c1054297c7b4a27dc3511459f245e4943d7fe448 i18n/cht/extensions/markdown/out/previewContentProvider.i18n.json
-@@ -4,7 +4,11 @@
-  *--------------------------------------------------------------------------------------------*/
- // Do not edit this file. It is machine generated.
- {
-+<<<<<<< .our
- 	"preview.securityMessage.text": "此文件中的部分內容已停用",
-+=======
-+	"preview.securityMessage.text": "此文件已停用部分內容",
-+>>>>>>> .their
- 	"preview.securityMessage.title": "Markdown 預覽中已停用可能不安全或不安全的內容。請將 Markdown 預覽的安全性設定變更為允許不安全內容，或啟用指令碼",
- 	"preview.securityMessage.label": "內容已停用安全性警告"
- }
-\ No newline at end of file
-changed in both
-  base   100644 9cec2a47a614c3e7fb8cc674197151a62343a068 i18n/cht/extensions/markdown/out/security.i18n.json
-  our    100644 cc4260be39fbcfcea114d06109122da15a50bcfa i18n/cht/extensions/markdown/out/security.i18n.json
-  their  100644 fdfc62ce17ce6b1aa23f39d458b4d2e7b499d11d i18n/cht/extensions/markdown/out/security.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -16,5 +17,11 @@
- 	"enableSecurityWarning.title": "允許此工作區預覽安全性警告",
- 	"disableSecurityWarning.title": "不允許此工作區預覽安全性警告",
- 	"toggleSecurityWarning.description": "不影響內容安全性層級",
-+=======
-+	"preview.showPreviewSecuritySelector.strictTitle": "嚴謹。僅載入安全內容。",
-+	"preview.showPreviewSecuritySelector.currentSelection": "目前的設定",
-+	"preview.showPreviewSecuritySelector.insecureContentTitle": "允許通過 http 載入內容。",
-+	"preview.showPreviewSecuritySelector.scriptsAndAllContent": "允許執行所有內容與指令碼。不建議使用。",
-+>>>>>>> .their
- 	"preview.showPreviewSecuritySelector.title": "選擇此工作區 Markdown 預覽的安全性設定"
- }
-\ No newline at end of file
-changed in both
-  base   100644 74cbc6cffe4b82151105822fcca16e895e57e623 i18n/cht/extensions/npm/package.i18n.json
-  our    100644 e1e497559e0002c1cb7f8161b65cf930f3fd8de7 i18n/cht/extensions/npm/package.i18n.json
-  their  100644 439c8e3bb279cb260144c8e604499d17123648e4 i18n/cht/extensions/npm/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -23,4 +24,8 @@
- 	"command.debug": "偵錯",
- 	"command.openScript": "開啟",
- 	"command.runInstall": "執行安裝"
-+=======
-+	"config.npm.autoDetect": "控制是否自動檢測npm腳本.預設為開啟.",
-+	"config.npm.runSilent": "以 '--silent' 選項執行 npm 命令 "
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/cht/extensions/typescript/out/features/taskProvider.i18n.json
-  our    100644 61ba5737e640ec966e3c9ef97217c53e5e9c01d7 i18n/cht/extensions/typescript/out/features/taskProvider.i18n.json
-  their  100644 f6e962d5d7df1fe1f2dee61c7d44967c93474465 i18n/cht/extensions/typescript/out/features/taskProvider.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,14 @@
- 	],
- 	"buildTscLabel": "建置 - {0}",
- 	"buildAndWatchTscLabel": "監看 - {0}"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"buildAndWatchTscLabel": "監看 - {0}",
-+	"buildTscLabel": "建置 - {0}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/cht/src/vs/code/electron-main/auth.i18n.json
-  our    100644 e6c89f97dd816e01883006cafe664b6545677fcd i18n/cht/src/vs/code/electron-main/auth.i18n.json
-  their  100644 3eef49744675b6c6becc10eb0aac908b1a6156e1 i18n/cht/src/vs/code/electron-main/auth.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"authRequire": "必須進行 Proxy 驗證 ",
- 	"proxyauth": "Proxy {0} 必須進行驗證。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 6448fc6cba36fe8cbb7277b9fc0b12a416ab579d i18n/cht/src/vs/code/electron-main/menus.i18n.json
-  our    100644 5f037b2a895deac7820d5f0872d4b9af5505b797 i18n/cht/src/vs/code/electron-main/menus.i18n.json
-  their  100644 3adbeb6bf92d74ff6b76607d8da558be0f6ff064 i18n/cht/src/vs/code/electron-main/menus.i18n.json
-@@ -24,12 +24,21 @@
- 	"miQuit": "結束 {0}",
- 	"miNewFile": "新增檔案(&&N)",
- 	"miOpen": "開啟(&&O)...",
-+<<<<<<< .our
- 	"miOpenWorkspace": "開啟工作區 (&&k)...",
- 	"miOpenFolder": "開啟資料夾(&&F)...",
- 	"miOpenFile": "開啟檔案(&&O)...",
- 	"miOpenRecent": "開啟最近的檔案(&&R)",
- 	"miSaveWorkspaceAs": "另存工作區為...",
- 	"miAddFolderToWorkspace": "新增資料夾至工作區 (&&A)...",
-+=======
-+	"miOpenWorkspace": "開啟工作區(&&O)...",
-+	"miOpenFolder": "開啟資料夾(&&F)...",
-+	"miOpenFile": "開啟檔案(&&O)...",
-+	"miOpenRecent": "開啟最近的檔案(&&R)",
-+	"miSaveWorkspaceAs": "將工作區另存為(&&S)...",
-+	"miAddFolderToWorkspace": "將資料夾新增到工作區(&&A)",
-+>>>>>>> .their
- 	"miSave": "儲存(&&S)",
- 	"miSaveAs": "另存新檔(&&A)...",
- 	"miSaveAll": "全部儲存(&&L)",
-@@ -176,7 +185,11 @@
- 	"miPrivacyStatement": "隱私權聲明(&&P)",
- 	"miAbout": "關於(&&A)",
- 	"miRunTask": "執行工作(&&R)",
-+<<<<<<< .our
- 	"miBuildTask": "執行建置工作(&&B)...",
-+=======
-+	"miBuildTask": " 執行建置工作(&&B)...",
-+>>>>>>> .their
- 	"miRunningTask": "顯示執行中的工作(&&G)...",
- 	"miRestartTask": "重新開始執行工作(&&E)...",
- 	"miTerminateTask": "終止工作(&&T)...",
-@@ -189,5 +202,11 @@
- 	"miDownloadingUpdate": "正在下載更新...",
- 	"miInstallUpdate": "安裝更新...",
- 	"miInstallingUpdate": "正在安裝更新...",
-+<<<<<<< .our
- 	"miRestartToUpdate": "重新啟動以更新..."
-+=======
-+	"miCheckForUpdates": "查看是否有更新",
-+	"aboutDetail": "\n版本 {0}\n認可 {1}\n日期 {2}\nShell {3}\n轉譯器 {4}\n節點 {5}\n架構 {6}",
-+	"okButton": "確定"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/cht/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
-  our    100644 859ea73188c0049b2000e3a07bf2f988f03e5823 i18n/cht/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
-  their  100644 3a28fce1fa68025791beec112460484ce2011a28 i18n/cht/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"diff.tooLarge": "因其中一個檔案過大而無法比較。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 c05e2bee113bd5996380e859b484dbdf6eec0401 i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 15a1cfb1f061b73d70aaaf6b56b29fe87aab2b5a i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 6989de814a387d64ced8e7c23ff1f2af59a7694b i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json
-changed in both
-  base   100644 a64950d25e3b81d295ef533625681bc43b219652 i18n/cht/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 66736a4e736cf7b9a66b648bff264434bc450d4c i18n/cht/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 a29045e800625ac7796c02837a74e085c2b45b5c i18n/cht/src/vs/editor/common/view/editorColorRegistry.i18n.json
-changed in both
-  base   100644 0de30c3bd71e343bee7a2c8058fc81c929a8a9f4 i18n/cht/src/vs/editor/contrib/find/common/findController.i18n.json
-  our    100644 cbbf89b710f3c38eb241337fd8bfd81392694209 i18n/cht/src/vs/editor/contrib/find/common/findController.i18n.json
-  their  100644 c75e923d0b7ea4e99a3f006bcf19778b1aa5cbab i18n/cht/src/vs/editor/contrib/find/common/findController.i18n.json
-@@ -10,6 +10,15 @@
- 	"nextSelectionMatchFindAction": "尋找下一個選取項目",
- 	"previousSelectionMatchFindAction": "尋找上一個選取項目",
- 	"startReplace": "取代",
-+<<<<<<< .our
-+=======
-+	"addSelectionToNextFindMatch": "將選取項目加入下一個找到的相符項",
-+	"addSelectionToPreviousFindMatch": "將選取項目加入前一個找到的相符項中",
-+	"moveSelectionToNextFindMatch": "將最後一個選擇項目移至下一個找到的相符項",
-+	"moveSelectionToPreviousFindMatch": "將最後一個選擇項目移至前一個找到的相符項",
-+	"selectAllOccurrencesOfFindMatch": "選取所有找到的相符項目",
-+	"changeAll.label": "變更所有發生次數",
-+>>>>>>> .their
- 	"showNextFindTermAction": "顯示下一個尋找字詞",
- 	"showPreviousFindTermAction": "顯示上一個尋找字詞"
- }
-\ No newline at end of file
-changed in both
-  base   100644 79e27db5d9b837d858897dcaa8de4174da7f4750 i18n/cht/src/vs/platform/history/electron-main/historyMainService.i18n.json
-  our    100644 e92cc96c4b4d33d18c32d6ff208f27aa16bd1d25 i18n/cht/src/vs/platform/history/electron-main/historyMainService.i18n.json
-  their  100644 39b78314b9688ffd566da805954ad67a3c83f5fa i18n/cht/src/vs/platform/history/electron-main/historyMainService.i18n.json
-changed in both
-  base   100644 16223f6ab7b5e64add90af0036288a5740b0da6e i18n/cht/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 790929bd611f6dd14a59e2ff8a6640378fde30cb i18n/cht/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 06bbc994c13aee44072a0abc1575cd3c5debcdaf i18n/cht/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -60,7 +60,11 @@
- 	"scrollbarShadow": "指出在捲動該檢視的捲軸陰影。",
- 	"scrollbarSliderBackground": "捲軸滑桿的背景顏色。",
- 	"scrollbarSliderHoverBackground": "動態顯示時捲軸滑桿的背景顏色。",
-+<<<<<<< .our
- 	"scrollbarSliderActiveBackground": "當點擊時捲軸滑桿的背景顏色。",
-+=======
-+	"scrollbarSliderActiveBackground": "使用中狀態下捲軸滑桿的背景顏色。",
-+>>>>>>> .their
- 	"progressBarBackground": "長時間運行進度條的背景色彩.",
- 	"editorBackground": "編輯器的背景色彩。",
- 	"editorForeground": "編輯器的預設前景色彩。",
-changed in both
-  base   100644 db42e723debdbf371fb3138338d04bf0d47e2dc7 i18n/cht/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 fb350c87bdc732a5022e5d51b20bc738ad941987 i18n/cht/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 dd4cec40163af1af46496b254f15d804e87603ca i18n/cht/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -9,6 +9,7 @@
- 	"openFile": "開啟檔案...",
- 	"openFolder": "開啟資料夾...",
- 	"openFileFolder": "開啟...",
-+<<<<<<< .our
- 	"globalRemoveFolderFromWorkspace": "將資料夾從工作區移除...",
- 	"saveWorkspaceAsAction": "另存工作區為...",
- 	"save": "儲存(&&S)",
-@@ -16,4 +17,24 @@
- 	"openWorkspaceAction": "開啟工作區...",
- 	"openWorkspaceConfigFile": "開啟工作區組態檔",
- 	"duplicateWorkspaceInNewWindow": "新視窗中的重覆工作區"
-+=======
-+	"reload": "重新載入(&&R)",
-+	"cancel": "取消",
-+	"newWorkspaceFormExisting": "新的工作區從現有...",
-+	"select": "選取(&&S)",
-+	"selectWorkspace": "為工作區選取資料夾",
-+	"addSupported": "必須要重新載入視窗，才可開啟多個資料夾。",
-+	"addFolderToWorkspace": "將資料夾新增到工作區...",
-+	"add": "新增",
-+	"addFolderToWorkspaceTitle": "將資料夾新增到工作區",
-+	"removeFolderFromWorkspace": "將資料夾從工作區移除",
-+	"saveWorkspaceAsAction": "另存工作區為...",
-+	"saveEmptyWorkspaceNotSupported": "請先開啟工作區以進行儲存。",
-+	"saveNotSupported": "必須重新載入視窗才可儲存工作區。",
-+	"save": "儲存(&&S)",
-+	"saveWorkspace": "儲存工作區",
-+	"openWorkspaceAction": "開啟工作區...",
-+	"newWorkspace": "新增工作區...",
-+	"openWorkspaceConfigFile": "開啟工作區組態檔"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 4e7c8606cb8af492f968241faebfa838dd50f135 i18n/cht/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-  our    100644 c06a79c75c89653cc4fdd1d131f354e9584bf94e i18n/cht/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-  their  100644 bed067ba4a663202e859d5c825b6a24e31a32749 i18n/cht/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,9 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"compositePart.hideSideBarLabel": "隱藏提要欄位",
-+>>>>>>> .their
- 	"focusSideBar": "瀏覽至提要欄位",
- 	"viewCategory": "檢視"
- }
-\ No newline at end of file
-changed in both
-  base   100644 5fde1a301073a079ae4a80a52bbe8e20e346be70 i18n/cht/src/vs/workbench/common/theme.i18n.json
-  our    100644 41a6d8c801b131296a56223489edd198cc2bf33b i18n/cht/src/vs/workbench/common/theme.i18n.json
-  their  100644 e68c905d8515dad4f0105664d2579109403f445f i18n/cht/src/vs/workbench/common/theme.i18n.json
-changed in both
-  base   100644 a76c05ee2f6d366e5e1cba784691c58df209183d i18n/cht/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 8c04c44fd8aa84aafd673c4f7e7c350b8ac52c3b i18n/cht/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 fa6f13944092eaf2443c555ce17f949070849975 i18n/cht/src/vs/workbench/electron-browser/actions.i18n.json
-changed in both
-  base   100644 06d815243f257592379c8a4c1f21ca5fe85199f7 i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 bf339c91e8587ec53fe81a294c54ddc0f5aad010 i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 e2f6f7dff654bb41dd340b243bb6d88c4a3b3276 i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,8 +35,13 @@
- 	"panelDefaultLocation": "控制面板的預設位置。可顯示在 Workbench 的底部或是右方。",
- 	"statusBarVisibility": "控制 Workbench 底端狀態列的可視性。",
- 	"activityBarVisibility": "控制活動列在 workbench 中的可見度。",
-+<<<<<<< .our
- 	"viewVisibility": "控制檢視標頭動作的可見度。檢視標頭動作可為總是可見，或在檢視為焦點或暫留時才可見。",
- 	"fontAliasing": "控制工作台中的字型鋸齒化方法。\n- default: 子像素字型平滑化。在多數非 Retina 的顯示器上，這會使文字變得最鮮明\n- antialiased: 在像素層級上使字型平滑化，與子像素相對。能夠使字型整體顯示較亮\n- none: 停用字型平滑化。顯示的文字會帶有鋸齒狀銳利邊緣\n- auto: 根據顯示器的 DPI 自動套用 `default` 或 `antialiased`。",
-+=======
-+	"closeOnFileDelete": "控制顯示檔案的編輯器是否應在其他處理序刪除或重新命名該檔案時自動關閉。若停用此選項，當發生前述狀況時，編輯器會保持開啟，並呈現已變更的狀態。請注意，從應用程式內刪除一律會關閉編輯器，但已變更的檔案在資料未儲存前一律不會關閉。",
-+	"fontAliasing": "在 Workbench 中控制字型鋸齒化的方法。- 預設: 子像素字型平滑處理。在大部分非 Retina 顯示器上會顯示出最銳利的文字- 已消除鋸齒: 相對於子像素，根據像素層級平滑字型。可讓字型整體顯得較細- 無: 停用字型平滑處理。文字會以鋸齒狀的銳邊顯示 ",
-+>>>>>>> .their
- 	"workbench.fontAliasing.default": "子像素字型平滑處理。在大部分非 Retina 顯示器上會顯示出最銳利的文字。",
- 	"workbench.fontAliasing.antialiased": "相對於子像素，根據像素層級平滑字型。可以讓字型整體顯得較細。",
- 	"workbench.fontAliasing.none": "禁用字體平滑.文字將會顯示鋸齒狀與鋒利的邊緣.",
-changed in both
-  base   100644 21628fd8aa6b759354e19d5ad195f566f5948a4c i18n/cht/src/vs/workbench/electron-browser/window.i18n.json
-  our    100644 a99eb9754bc3a0014907555c92c0c41fb3ae62fe i18n/cht/src/vs/workbench/electron-browser/window.i18n.json
-  their  100644 dfbd17cb4f0f94eb6c11d0728fc547dd9f9e11e7 i18n/cht/src/vs/workbench/electron-browser/window.i18n.json
-@@ -12,5 +12,10 @@
- 	"copy": "複製",
- 	"paste": "貼上",
- 	"selectAll": "全選",
-+<<<<<<< .our
- 	"runningAsRoot": "不建議以 root 身分執行 {0}。"
-+=======
-+	"confirmOpen": "確定要開啟 {0} 工作區嗎?",
-+	"confirmOpenButton": "開啟(&&O)..."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 5e4862406578e468c6624c92ef6503ed847ddf68 i18n/cht/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  our    100644 56556d70235cd8dc10872d36bf84fa1b4f974a29 i18n/cht/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  their  100644 810ba4331057679e400f1f22816edda0081b06dd i18n/cht/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-changed in both
-  base   100644 81362151ea4a175110376f52ab771f5c622cdde6 i18n/cht/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  our    100644 f23815901afa5b319483b39e8acead1be6dfacc5 i18n/cht/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  their  100644 315d0d6089a3ce25ccd56b3d6d554a33af426615 i18n/cht/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-changed in both
-  base   100644 d368fda6a7e0eb522f358ff964a6ff20a3137c34 i18n/cht/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-  our    100644 af127333714633e2cd9ea855bc30064393aa20c4 i18n/cht/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-  their  100644 b7e7de6341d2818ad13f30cf2aa84c8d37a4d188 i18n/cht/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-@@ -6,9 +6,13 @@
- {
- 	"emmetConfigurationTitle": "Emmet",
- 	"triggerExpansionOnTab": "啟用時，按下 TAB 即可展開 Emmet 縮寫。當 emmet.useNewemmet 設定為 true 時不適用。",
-+<<<<<<< .our
- 	"emmetPreferences": "用以修改部分 Emmet 動作及解析程式之行為的喜好設定。emmet.useNewemmet 設定為 true 時不適用。",
- 	"emmetSyntaxProfiles": "為指定的語法定義設定檔，或透過特定規則使用自己的設定檔。",
- 	"emmetExclude": "不應展開 Emmet 縮寫的語言陣列。",
- 	"emmetExtensionsPath": "包含 Emmet 設定檔、片段及喜好設定的資料夾路徑。emmet.useNewEmmet 設定為 true 時僅會從延伸模組路徑接受設定檔。",
-+=======
-+	"emmetPreferences": "用以修改部分 Emmet 動作及解析程式之行為的喜好設定。emmet.useNewemmet 設定為 ture 時不適用。",
-+>>>>>>> .their
- 	"useNewEmmet": "試試所有 Emmet 功能的新 Emmet 模組 (最終會取代舊的單一 Emmet 程式庫)。"
- }
-changed in both
-  base   100644 dce745aeaf805e8ac5d98b1e660b3e8f6b607a17 i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 beddde6d10ce2b9a74005421467ca470c839a054 i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 9d9aab08287be2dfaab830451fccddc1fe19ac94 i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-changed in both
-  base   100644 0dbbb1af8ef020d81d3b4f3e423f75e710b1dae4 i18n/cht/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  our    100644 c32641ccebc8fbed926c69242f64a9fbc36d13e0 i18n/cht/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  their  100644 6e446c4f38c25f0adefd54bad7db04a304fe55a5 i18n/cht/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-@@ -69,7 +69,11 @@
- 	"invalidFileNameError": "名稱 **{0}** 不能作為檔案或資料夾名稱。請選擇不同的名稱。",
- 	"filePathTooLongError": "名稱 **{0}** 導致路徑太長。請選擇較短的名稱。",
- 	"compareWithSaved": "比較使用中的檔案和已儲存的檔案",
-+<<<<<<< .our
- 	"modifiedLabel": "{0} (在磁碟上) ↔ {1}",
- 	"compareWithClipboard": "比較使用中的檔案和剪貼簿的檔案",
- 	"clipboardComparisonLabel": "剪貼簿 ↔ {0}"
-+=======
-+	"modifiedLabel": "{0} (在磁碟上) ↔ {1}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f49cef6b9b302058ec00d2e712d1d0e11d261bdd i18n/cht/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 867d603ca5633a190dd294a861b5733b06da3c8c i18n/cht/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 7b885c7514130a1ea63173630c471a99df4a8a9f i18n/cht/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-@@ -40,6 +40,7 @@
- 	"dynamicHeight": "控制 [開放式編輯器] 區段的高度是否應依元素數目動態調整。",
- 	"autoReveal": "控制總管是否在開啟檔案時自動加以顯示及選取。",
- 	"enableDragAndDrop": "控制總管是否應該允許透過拖放功能移動檔案和資料夾。",
-+<<<<<<< .our
- 	"confirmDragAndDrop": "控制總管是否須要求確認，以透過拖放來移動檔案和資料夾。",
- 	"confirmDelete": "控制總管是否須在透過垃圾桶刪除檔案時要求確認。",
- 	"sortOrder.default": "檔案與資料夾會依照名稱以字母順序排序。資料夾會顯示在檔案前。",
-@@ -50,4 +51,12 @@
- 	"sortOrder": "控制檔案與資料夾在總管中的排列順序。除了預設排序外，您也可以將順序設定為 'mixed' (檔案與資料夾)、'type' (依檔案類型)、'modified' (依最後修改日期) 或 'filesFirst' (將檔案排序在資料夾前)。",
- 	"explorer.decorations.colors": "控制檔案裝飾是否須使用色彩。",
- 	"explorer.decorations.badges": "控制檔案裝飾是否須使用徽章。"
-+=======
-+	"sortOrder.default": "檔案與目錄依照名稱的字母順序排序。目錄顯示於檔案之前。",
-+	"sortOrder.mixed": "檔案與目錄依照名稱的字母順序排序。檔案與目錄交錯排列。",
-+	"sortOrder.filesFirst": "檔案與目錄依照名稱的字母順序排序。檔案顯示於目錄之前。",
-+	"sortOrder.type": "檔案與目錄依照延伸模組的字母順序排序。目錄顯示於檔案之前。",
-+	"sortOrder.modified": "檔案與目錄依照最後修改的日期遞減排序。目錄顯示於檔案之前。",
-+	"sortOrder": "控制總管中檔案和目錄排序的方式。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 91195575caef9fd3f0e15d4cb81b303417cbac24 i18n/cht/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-  our    100644 7a6f0b075f74848503c85069b40013f41dc423f4 i18n/cht/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-  their  100644 4e8368f2a610ada63f62b62fc804ff4cc731b06a i18n/cht/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-@@ -12,5 +12,6 @@
- 	"genericSaveError": "無法儲存 '{0}': {1}",
- 	"staleSaveError": "無法儲存 '{0}': 磁碟上的內容較新。請按一下 [比較]，比較您的版本與磁碟上的版本。",
- 	"compareChanges": "比較",
--	"saveConflictDiffLabel": "{0} (位於磁碟) ↔ {1} (在 {2} 中) - 解決儲存衝突"
-+	"saveConflictDiffLabel": "{0} (位於磁碟) ↔ {1} (在 {2} 中) - 解決儲存衝突",
-+	"userGuide": "在右方使用編輯器工具列中的動作來 **復原** 您的變更，或以您的變更 **覆寫** 磁碟上的內容"
- }
-\ No newline at end of file
-changed in both
-  base   100644 a92d2c49e8bbed71e46196ad2a287c00756dd1a5 i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  our    100644 7de2fa4801f7ec2e9b89f96219fca72b072066be i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  their  100644 f0f4cd2a6a4ea8d62e16b98cee8964196de9fda4 i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-@@ -14,6 +14,10 @@
- 	"openGlobalKeybindingsFile": "開啟鍵盤快速鍵檔案",
- 	"openWorkspaceSettings": "開啟工作區設定",
- 	"openFolderSettings": "開啟資料夾設定",
-+<<<<<<< .our
-+=======
-+	"pickFolder": "選取資料夾",
-+>>>>>>> .their
- 	"configureLanguageBasedSettings": "設定語言專屬設定...",
- 	"languageDescriptionConfigured": "({0})",
- 	"pickLanguage": "選取語言"
-changed in both
-  base   100644 ec85dfcb77816fe9817cb8dd309895c2e111bfd2 i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 912f924cec997084f6bbf36563d0171c3e38d0e5 i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 12df0eb04742fb8530ef3f65c385c383abb2d9cc i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -14,4 +15,19 @@
- 	"editTtile": "編輯",
- 	"replaceDefaultValue": "在設定中取代",
- 	"copyDefaultValue": "複製到設定"
-+=======
-+	"emptyUserSettingsHeader": "將您的設定放置在此以覆寫預設設定。",
-+	"errorInvalidConfiguration": "無法寫入設定.請開啟使用者設定並修正檔案中的錯誤/警告後再試一次.",
-+	"emptyWorkspaceSettingsHeader": "將您的設定放置在此以覆寫使用者設定。",
-+	"emptyFolderSettingsHeader": "將您的資料夾設定放置在此以覆寫工作區設定的資料夾設定。",
-+	"defaultFolderSettingsTitle": "預設資料夾設定",
-+	"defaultSettingsTitle": "預設設定",
-+	"noSettingsFound": "找不到任何設定。",
-+	"editTtile": "編輯",
-+	"replaceDefaultValue": "在設定中取代",
-+	"copyDefaultValue": "複製到設定",
-+	"unsupportedPHPExecutablePathSetting": "這項設定必須是使用者設定。若要設定工作區的 PHP，請開啟 PHP 檔案並按一下狀態列中的 [PHP 路徑]。",
-+	"unsupportedWorkspaceSetting": "這項設定必須是使用者設定。",
-+	"unsupportedWorkbenchSetting": "目前無法套用此設定。要在您直接開啟此資料夾時才會套用。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 68d504b78421876a31ce971c2ef3cdc8f5ccd0af i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-  our    100644 bf6c80d40dab496574eb97873c8671035e53aa62 i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-  their  100644 ea581bd5e89879425a29fbff595afbca3ba18854 i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 17bda120dbd77f09aaae9b33d7a0fd346cfe2603 i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 3a059706c6b5eb843151bff68a94a09cb22fd815 i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -12,4 +13,13 @@
- 	"userSettings": "使用者設定",
- 	"workspaceSettings": "工作區設定",
- 	"folderSettings": "資料夾設定"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"folderSettingsDetails": "資料夾設定"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a4c089ec5ce16abdc1f2850b7e3df35e53a88641 i18n/cht/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  our    100644 9b318b09ce08ab0ea0c2bb529eb879057b9096c4 i18n/cht/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  their  100644 2fbf166712a262be3af438ca3d35ebdce221a5e0 i18n/cht/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-@@ -8,5 +8,11 @@
- 	],
- 	"relaunchSettingMessage": "設定已經變更，必須重新啟動才會生效。",
- 	"relaunchSettingDetail": "請按 [重新啟動] 按鈕以重新啟動 {0} 並啟用設定。",
-+<<<<<<< .our
- 	"restart": "重新啟動(&&R)"
-+=======
-+	"restart": "重新啟動",
-+	"relaunchWorkspaceMessage": "必須重新載入延伸模組系統才可變更此工作區。",
-+	"reload": "重新載入"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 5d095421436354ce0f25de1390666c9e539cd4a0 i18n/cht/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 ba1fd77bc20f96eb0056aa05843bd1bb7818c0eb i18n/cht/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 52826c8f8d8a2de8ed8be1f73ae2e5160d23b74d i18n/cht/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"nextSearchIncludePattern": "顯示下一個搜尋包含模式",
- 	"previousSearchIncludePattern": "顯示上一個搜尋包含模式",
- 	"nextSearchExcludePattern": "顯示下一個搜尋排除模式",
-@@ -16,6 +19,8 @@
- 	"previousReplaceTerm": "顯示上一個搜尋取代字詞",
- 	"findInFiles": "在檔案中尋找",
- 	"replaceInFiles": "檔案中取代",
-+	"findInWorkspace": "在工作區中尋找...",
-+	"findInFolder": "在資料夾中尋找...",
- 	"RefreshAction.label": "重新整理",
- 	"CollapseDeepestExpandedLevelAction.label": "全部摺疊",
- 	"ClearSearchResultsAction.label": "清除",
-changed in both
-  base   100644 0780f0f62bdbe796cdc92508546c85c8df3f208f i18n/cht/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-  our    100644 f9a4b46d6b9113c7745b8a62029d44d607b9ee13 i18n/cht/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-  their  100644 5a3224c66f5b4482613753ff358a57d04f536880 i18n/cht/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"searchFolderMatch.other.label": "其他檔案",
- 	"searchFileMatches": "找到 {0} 個檔案",
- 	"searchFileMatch": "找到 {0} 個檔案",
-changed in both
-  base   100644 ffc0ef1d621fc0a291567eb5da80bb4f268b3ee7 i18n/cht/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  our    100644 4578dbafa9e6c13f1d3fbca1dcd19f0c9ec0aa56 i18n/cht/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  their  100644 7f165c5f71752ac86d09fc541bf64d313e610ffa i18n/cht/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-changed in both
-  base   100644 095028d433ac8d9f422ed56246395f1c3f4bc88b i18n/cht/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 9a7f1ae524570aa14ab8735a1962f8357f3564aa i18n/cht/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 b0bb104792a9819e38fc0aaac2f44ceb9b936922 i18n/cht/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-changed in both
-  base   100644 e34e2f41cb78e95c969037ede5260fab45c4e3e5 i18n/cht/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 a13d5229d23a832c6ada352df9587e856b73629f i18n/cht/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 eccd83ffb960f90625d0eddfff0f230f4a382455 i18n/cht/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -24,17 +24,25 @@
- 	"TaskService.noTestTask1": "未定義任何建置工作。請使用 'isTestCommand' 標記 tasks.json 檔案中的工作。",
- 	"TaskService.noTestTask2": "未定義任何測試工作，請在 tasks.json 檔案中將工作標記為 'test' 群組。",
- 	"TaskServer.noTask": "找不到所要求要執行的工作 {0}。",
-+<<<<<<< .our
- 	"TaskService.associate": "建立關聯",
-+=======
-+>>>>>>> .their
- 	"TaskService.attachProblemMatcher.continueWithout": "在不掃描工作輸出的情況下繼續",
- 	"TaskService.attachProblemMatcher.never": "永不掃描工作輸出",
- 	"TaskService.attachProblemMatcher.learnMoreAbout": "深入了解掃描工作輸出",
- 	"selectProblemMatcher": "選取錯誤和警告的種類以掃描工作輸出",
- 	"customizeParseErrors": "當前的工作組態存在錯誤.請更正錯誤再執行工作.",
- 	"moreThanOneBuildTask": "定義了很多建置工作於tasks.json.執行第一個.",
-+<<<<<<< .our
- 	"TaskSystem.activeSame.background": "工作 '{0}' 已在使用中並且處於背景模式。",
- 	"TaskSystem.activeSame.noBackground": "工作 '{0}' 已在使用中。",
- 	"terminateTask": "終止工作",
- 	"restartTask": "重新啟動工作",
-+=======
-+	"TaskSystem.activeSame.background": "工作 '{0}' 已在使用中，且處於背景模式中。請使用工作功能表的 [終止工作...] 將其終止。",
-+	"TaskSystem.activeSame.noBackground": "工作 '{0}' 已在使用中。請使用工作功能表的 [終止工作...] 將其終止。 ",
-+>>>>>>> .their
- 	"TaskSystem.active": "已有工作在執行。請先終止該工作，然後再執行其他工作。",
- 	"TaskSystem.restartFailed": "無法終止再重新啟動工作 {0}",
- 	"TaskService.noConfiguration": "錯誤: {0} 工作偵測未替下列組態提供工作:\n{1}\n將會忽略該工作。\n",
-@@ -75,8 +83,13 @@
- 	"TaskService.pickDefaultBuildTask": "請選取要用作預設組建工作的工作",
- 	"TaskService.defaultTestTaskExists": "已經將 {0} 標記為預設測試工作。",
- 	"TaskService.pickDefaultTestTask": "請選取要用作預設測試工作的工作",
-+<<<<<<< .our
- 	"TaskService.pickShowTask": "選取要顯示輸出的工作",
- 	"TaskService.noTaskIsRunning": "未執行任何工作",
-+=======
-+	"TaskService.noTaskIsRunning": "沒有執行中的工作。",
-+	"TaskService.pickShowTask": "選取要顯示輸出的工作",
-+>>>>>>> .their
- 	"ShowLogAction.label": "顯示工作記錄檔",
- 	"RunTaskAction.label": "執行工作",
- 	"RestartTaskAction.label": "重新開始執行工作",
-changed in both
-  base   100644 49ff9315f1a721384761f4c4a76a1c82e40fd629 i18n/cht/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  our    100644 b9d0cc54748098528d7d52af4aef0b78d90f5832 i18n/cht/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  their  100644 26d27a86749740c76a7af7158bf0e12f369506ec i18n/cht/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/cht/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  our    100644 7c11d510d10d8533ee23906029dda6ab883d5ac2 i18n/cht/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  their  100644 6416f9621a282e8b7c7e4bc03d9bb9a3897f1f63 i18n/cht/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,6 +10,15 @@
- 	"termEntryAriaLabel": "{0} , 終端機選擇器",
- 	"termCreateEntryAriaLabel": "{0}，建立新的終端機",
- 	"workbench.action.terminal.newplus": "$(plus) 建立新的整合式終端機",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"entryAriaLabel": "{0} , 終端機選擇器",
-+>>>>>>> .their
- 	"noTerminalsMatching": "無相符的終端機",
- 	"noTerminalsFound": "無開啟的終端機"
- }
-\ No newline at end of file
-changed in both
-  base   100644 e4baafd4cb1136efba6f34f3f049a92805be86d9 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 dc4a98ed7869a7cc55922d5bc3bb8ecb137f6a4d i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 1e1fd8854062dd35d0e06e9b2e68f6b6b852f51a i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,9 @@
- 	],
- 	"quickOpen.terminal": "顯示所有已開啟的終端機",
- 	"terminal": "終端機",
-+=======
-+	"quickOpen.terminal": "顯示所有已開啟的終端機",
-+>>>>>>> .their
- 	"terminalIntegratedConfigurationTitle": "整合式終端機",
- 	"terminal.integrated.shell.linux": "終端機在 Linux 上使用的殼層路徑。",
- 	"terminal.integrated.shellArgs.linux": "在 Linux 終端機要使用的命令列引數。",
-@@ -36,8 +40,12 @@
- 	"terminal.integrated.env.osx": "OS X 上的終端機要使用之具有將新增至 VS Code 流程之環境變數的物件",
- 	"terminal.integrated.env.linux": "Linux 上的終端機要使用之具有將新增至 VS Code 流程之環境變數的物件",
- 	"terminal.integrated.env.windows": "Windows 上的終端機要使用之具有將新增至 VS Code 流程之環境變數的物件",
-+<<<<<<< .our
- 	"terminal.integrated.showExitAlert": "當結束代碼非 0，顯示警告訊息 '終端處理序已終止並回傳結束代碼'",
- 	"terminal.integrated.experimentalRestore": "啟動 VS Code 是否會自動還原工作區的終端機工作階段。此設定處於實驗階段，可能會出現 Bug 或在之後有所變更。",
-+=======
-+	"terminal": "終端機",
-+>>>>>>> .their
- 	"terminalCategory": "終端機",
- 	"viewCategory": "檢視"
- }
-\ No newline at end of file
-changed in both
-  base   100644 e7485a609ef8f73b7f501d3d2ecd47baf53fe5e7 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 b65af1ec7222f34f85465a0e272b45818ced6ea4 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 cf821b0c74fc9baea119ad03a3fc0bddce19e192 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -14,8 +14,11 @@
- 	"workbench.action.terminal.selectAll": "全選",
- 	"workbench.action.terminal.deleteWordLeft": "刪除左方文字",
- 	"workbench.action.terminal.deleteWordRight": "刪除右方文字",
-+<<<<<<< .our
- 	"workbench.action.terminal.moveToLineStart": "移至行開端",
- 	"workbench.action.terminal.moveToLineEnd": "移至行尾端",
-+=======
-+>>>>>>> .their
- 	"workbench.action.terminal.new": "建立新的整合式終端機",
- 	"workbench.action.terminal.new.short": "新增終端機",
- 	"workbench.action.terminal.newWorkspacePlaceholder": "為新的終端機選擇目前的工作目錄",
-@@ -51,6 +54,7 @@
- 	"workbench.action.terminal.rename.prompt": "輸入終端機名稱",
- 	"workbench.action.terminal.focusFindWidget": "焦點尋找小工具",
- 	"workbench.action.terminal.hideFindWidget": "隱藏尋找小工具",
-+<<<<<<< .our
- 	"nextTerminalFindTerm": "顯示下一個尋找字詞",
- 	"previousTerminalFindTerm": "顯示上一個尋找字詞",
- 	"quickOpenTerm": "切換使用中的終端機 ",
-@@ -60,4 +64,7 @@
- 	"workbench.action.terminal.selectToNextCommand": "選取下一個命令",
- 	"workbench.action.terminal.selectToPreviousLine": "選擇上一行",
- 	"workbench.action.terminal.selectToNextLine": "選擇下一行"
-+=======
-+	"quickOpenTerm": "切換使用中的終端機"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6016a0077c1c8dbfb26f20abd3dccb8a03b464cc i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 2657899133e07b49fde3b011113a300d729b30b8 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 f80c288cbec285a050d1369d1fdc283ef870e226 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -10,7 +10,10 @@
- 	"terminal.foreground": "終端機的前景色彩。",
- 	"terminalCursor.foreground": "終端機游標的前景色彩。",
- 	"terminalCursor.background": "終端機游標的背景色彩。允許區塊游標重疊於自訂字元色彩。",
-+<<<<<<< .our
- 	"terminal.selectionBackground": "終端機的選取項目背景色彩。",
- 	"terminal.border": "在終端機內將窗格分割之邊界的色彩。預設為 panel.border。",
-+=======
-+>>>>>>> .their
- 	"terminal.ansiColor": "終端機中的 '{0}' ANSI 色彩。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 bcb5723b6fb1b66e0fa4e765c1eb7a3f3e9d27db i18n/cht/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 3fdd15bb8f2f2cfb1dd6d7b789581c43681e05de i18n/cht/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 8bf17270e248057f51fdbeb5aed894df6b8a59cc i18n/cht/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -11,10 +11,16 @@
- 	"read the release notes": "歡迎使用 {0} v{1}! 您要閱讀版本資訊嗎?",
- 	"licenseChanged": "我們的授權條款已變更，請按一下[這裡]({0})查看變更項目。",
- 	"neveragain": "不要再顯示",
-+<<<<<<< .our
- 	"64bitisavailable": "適用於 64 位元 Windows 的 {0} 已正式推出! 若要深入了解，請按一下[這裡]({1})。",
- 	"updateIsReady": "新的 {0} 更新已可用。",
- 	"noUpdatesAvailable": "目前沒有任何可用的更新。",
- 	"ok": "確定",
-+=======
-+	"64bitisavailable": "適用於 Windows 64 位元的 {0} 已可用!",
-+	"learn more": "深入了解",
-+	"updateIsReady": "新的 {0} 更新已可用。",
-+>>>>>>> .their
- 	"thereIsUpdateAvailable": "已有更新可用。",
- 	"download now": "立即下載",
- 	"later": "稍後",
-changed in both
-  base   100644 4acbaf6f0acdab10437ec9ccfab9cb99fcb65e07 i18n/cht/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-  our    100644 0f84b94182873a4113b624f04ff70972b67fa09b i18n/cht/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-  their  100644 d624449b463b2e80390d2c132635bc3ef90ae3af i18n/cht/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-changed in both
-  base   100644 8fd534084bbd4deacc580700ccea246f70097f9b i18n/cht/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  our    100644 2bc73e75628de887e06bdd3449b69211e28f0a91 i18n/cht/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  their  100644 398c82daa4febacef66af69428fab4f2120ec13e i18n/cht/src/vs/workbench/services/configuration/node/configuration.i18n.json
-@@ -9,6 +9,7 @@
- 	"scope.window.description": "視窗特定組態，可在使用者或工作區設定中予以設定。",
- 	"scope.resource.description": "資源特定設定，可在使用者、工作區或資料夾設定中予以設定。",
- 	"scope.description": "組態適用的範圍。可用的範圍為「視窗」和「資源」。",
-+<<<<<<< .our
- 	"vscode.extension.contributes.configuration": "提供組態設定。",
- 	"invalid.title": "'configuration.title' 必須是字串",
- 	"vscode.extension.contributes.defaultConfiguration": "依語言貢獻預設編輯器組態設定。",
-@@ -21,4 +22,13 @@
- 	"workspaceConfig.settings.description": "工作區設定",
- 	"workspaceConfig.extensions.description": "工作區延伸模組",
- 	"unknownWorkspaceProperty": "未知的工作區組態屬性"
-+=======
-+	"invalid.type": "如果已設定，'configuration.type' 必須設定為物件",
-+	"invalid.title": "'configuration.title' 必須是字串",
-+	"vscode.extension.contributes.defaultConfiguration": "依語言貢獻預設編輯器組態設定。",
-+	"invalid.properties": "'configuration.properties' 必須是物件",
-+	"workspaceConfig.id.description": "工作區識別項。用於儲存內部工作區狀態，狀態可能會在變更時遺失。",
-+	"workspaceConfig.folders.description": "要在工作區中載入的資料夾清單。必須為檔案路徑。例如 `file:///root/folderA`",
-+	"workspaceConfig.settings.description": "工作區設定"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 b20ee8ce75fdb33fa3f5b690ac7a3c50dfcab79e i18n/cht/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 d8a57b177d1c5bed0bf72818f809bba5c7dd5e99 i18n/cht/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 8235f18066a43a939162d8765aee24f9244e1d49 i18n/cht/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -9,6 +9,7 @@
- 	"openTasksConfiguration": "開啟工作組態",
- 	"openLaunchConfiguration": "開啟啟動組態",
- 	"open": "開啟設定",
-+<<<<<<< .our
- 	"saveAndRetry": "儲存並重試",
- 	"errorUnknownKey": "因為 {1} 非已註冊的組態，所以無法寫入至 {0}。",
- 	"errorInvalidWorkspaceConfigurationApplication": "無法寫入 {0} 至工作區設定。此設定只能寫入使用者設定中。",
-@@ -27,6 +28,19 @@
- 	"errorConfigurationFileDirty": "因為檔案已變更，所以無法寫入使用者設定。請儲存使用者設定檔案，然後再試一次。",
- 	"errorConfigurationFileDirtyWorkspace": "因為檔案已變更，所以無法寫入工作區設定。請儲存工作區設定檔案，然後再試一次。",
- 	"errorConfigurationFileDirtyFolder": "因為檔案已變更，所以無法寫入資料夾設定。請儲存 '{0}' 資料夾設定檔案，然後再試一次。",
-+=======
-+	"close": "關閉",
-+	"saveAndRetry": "儲存設定並重啟",
-+	"errorUnknownKey": "因為 {1} 非已註冊的組態，所以無法寫入至 {0}。",
-+	"errorInvalidFolderConfiguration": "因為 {0} 不支援資料夾資源範圍，所以無法寫入至資料夾設定。",
-+	"errorInvalidUserTarget": "因為 {0} 不支援全域範圍，所以無法寫入至使用者設定。",
-+	"errorInvalidFolderTarget": "因為未提供資源，所以無法寫入至資料夾設定。",
-+	"errorNoWorkspaceOpened": "因為未開啟工作區，所以無法寫入至 {0}。請先開啟工作區，再試一次。",
-+	"errorInvalidConfiguration": "無法寫入設定.請開啟**使用者設定**並修正錯誤/警告後再試一次.",
-+	"errorInvalidConfigurationWorkspace": "無法寫入設定.請開啟**工作區設定**並修正檔案中的錯誤/警告後再試一次.",
-+	"errorConfigurationFileDirty": "無法寫入設定,因為檔案已變更.請儲存**使用者設定**後再試一次",
-+	"errorConfigurationFileDirtyWorkspace": "無法寫入設定,因檔案已變更.請儲存**工作區設定**後再試一次.",
-+>>>>>>> .their
- 	"userTarget": "使用者設定",
- 	"workspaceTarget": "工作區設定",
- 	"folderTarget": "資料夾設定"
-changed in both
-  base   100644 b10dcde2a95c2fd6c3dd89b15581c97212a0edc7 i18n/cht/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 80a488e2a3e2c61dc5b117e10596d1fd5524e484 i18n/cht/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 bf99a19fd4720326e14bce70e1510979878237e1 i18n/cht/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-@@ -13,6 +13,7 @@
- 	"noIconThemeDesc": "No file icons",
- 	"iconThemeError": "File icon theme is unknown or not installed.",
- 	"workbenchColors": "依目前選擇的彩色佈景主題覆寫顏色",
-+<<<<<<< .our
- 	"editorColors.comments": "設定註解的色彩與樣式",
- 	"editorColors.strings": "設定字串常值的色彩與樣式。",
- 	"editorColors.keywords": "設定關鍵字的色彩與樣式。",
-@@ -21,5 +22,9 @@
- 	"editorColors.functions": "設定函式宣告與參考的色彩與樣式。",
- 	"editorColors.variables": "設定變數宣告與參考的色彩與樣式。",
- 	"editorColors.textMateRules": "使用 TextMate 佈景主題規則設定色彩與樣式 (進階)。",
-+=======
-+	"workbenchColors.deprecated": "此設定不再為實驗性，且已被重新命名為 'workbench.colorCustomizations'",
-+	"workbenchColors.deprecatedDescription": "改用'workbench.colorCustomizations'",
-+>>>>>>> .their
- 	"editorColors": "依目前選取的色彩佈景主題覆寫編輯器色彩與字型樣式。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/deu/extensions/emmet/package.i18n.json
-  our    100644 76a0f1cf2f4933fe2973e0cc716d5590fccebd37 i18n/deu/extensions/emmet/package.i18n.json
-  their  100644 c49db667dd371812806ecc5cf4151a7ae4e8041b i18n/deu/extensions/emmet/package.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,6 +10,14 @@
- 	"description": "Emmet-Unterstützung für VS Code",
- 	"command.wrapWithAbbreviation": "Mit Abkürzung umschließen",
- 	"command.wrapIndividualLinesWithAbbreviation": "Einzelne Zeilen mit Abkürzung umschließen",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"command.removeTag": "Tag entfernen",
- 	"command.updateTag": "Tag aktualisieren",
- 	"command.matchTag": "Gehe zu übereinstimmendem Paar",
-@@ -31,6 +40,7 @@
- 	"command.incrementNumberByTen": "Um 10 erhöhen",
- 	"command.decrementNumberByTen": "Um 10 verringern",
- 	"emmetSyntaxProfiles": "Definieren Sie das Profil für die angegebene Syntax, oder verwenden Sie Ihr eigenes Profil mit bestimmten Regeln.",
-+<<<<<<< .our
- 	"emmetExclude": "Ein Array von Sprachen, in dem Emmet-Abkürzungen nicht erweitert werden sollten.",
- 	"emmetExtensionsPath": "Pfad zu einem Ordner mit Emmet-Profilen und Ausschnitten.",
- 	"emmetShowExpandedAbbreviation": "Zeigt erweiterte Emmet-Abkürzungen als Vorschläge an.\nDie Option inMarkupAndStylesheetFilesOnly gilt für HTML, HAML, Jade, Slim, XML, XSL, CSS, SCSS, Sass, Less und Stylus.\nDie Option \"always\" gilt unabhängig vom Markup/CSS für alle Teile der Datei.",
-@@ -62,4 +72,12 @@
- 	"emmetPreferencesCssMsProperties": "Durch Trennzeichen getrennte CSS-Eigenschaften, die das \"ms\"-Herstellerpräfix erhalten, wenn sie in einer Emmet-Abkürzung verwendet werden, die mit \"-\" beginnt. Legen Sie eine leere Zeichenfolge fest, um das \"ms\"-Präfix immer zu vermeiden.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "Das Mindestergebnis (zwischen 0 und 1), das die Abkürzung mit Fuzzyübereinstimmung erreichen muss. Niedrigere Werte führen zu vielen falsch positiven Übereinstimmungen, höhere Werte verringern unter Umständen die möglichen Übereinstimmungen.",
- 	"emmetOptimizeStylesheetParsing": "Bei der Einstellung FALSE wird die gesamte Datei analysiert, um zu bestimmten, ob die aktuelle Position zum Erweitern von Emmet-Abkürzungen gültig ist. Bei der Einstellung TRUE wird nur der Inhalt um die die aktuelle Position in CSS-/SCSS-/LESS-Dateien analysiert."
-+=======
-+	"emmetExclude": "Ein Array von Sprachen, in dem Emmet-Abkürzungen nicht erweitert werden sollen.",
-+	"emmetExtensionsPath": "Pfad zu einem Ordner mit Emmet-Profilen, -Ausschnitten und -Einstellungen. Wenn emmet.useNewEmmet auf \"true\" festgelegt ist, werden nur Profile vom Erweiterungspfad berücksichtigt. ",
-+	"emmetShowExpandedAbbreviation": "Zeigt erweiterte Emmet-Abkürzungen als Vorschläge an.\nDie Option inMarkupAndStylesheetFilesOnly gilt für HTML, HAML, Jade, Slim, XML, XSL, CSS, SCSS, Sass, Less und Stylus.\nDie Option \"always\" gilt unabhängig vom Markup/CSS für alle Teile der Datei.",
-+	"emmetShowAbbreviationSuggestions": "Zeigt mögliche Emmet-Abkürzungen als Vorschläge an. Diese Option gilt nicht in Stylesheets oder wenn emmet.showExpandedAbbreviation auf \"never\" festgelegt ist.",
-+	"emmetIncludeLanguages": "Aktivieren Sie Emmet-Abkürzungen in Sprachen, die nicht standardmäßig unterstützt werden. Fügen Sie hier ein Mapping zwischen der Sprache und der von Emmet unterstützten Sprache hinzu.\nBeispiel: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
-+	"emmetVariables": "In Emmet-Ausschnitten zu verwendende Variablen"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 03fa4d766d9ae321b3f1b77ee1a09b1ff3bd92de i18n/deu/extensions/extension-editing/out/extensionLinter.i18n.json
-  our    100644 36866190f3efcb5834281b67770828a9ea8c674f i18n/deu/extensions/extension-editing/out/extensionLinter.i18n.json
-  their  100644 31af64199eb2b11604fceafb049f4879af9361ac i18n/deu/extensions/extension-editing/out/extensionLinter.i18n.json
-changed in both
-  base   100644 87d98409dd99a4b49e0999adc799fd273a5d6f12 i18n/deu/extensions/git/out/commands.i18n.json
-  our    100644 1abad5f86ec11c777f2319fc1588d47f5ea1c8f5 i18n/deu/extensions/git/out/commands.i18n.json
-  their  100644 454807d247b19b130b5a0ec64956d5c897ddb717 i18n/deu/extensions/git/out/commands.i18n.json
-changed in both
-  base   100644 62705e93d919c88e3ec1170a9abff8e7c6556b71 i18n/deu/extensions/markdown/out/security.i18n.json
-  our    100644 828b182b8ed53f89b863a57157b6b787f6c91dc0 i18n/deu/extensions/markdown/out/security.i18n.json
-  their  100644 4821397740fda23f6bc0050151f54c4ea413bfc4 i18n/deu/extensions/markdown/out/security.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -16,5 +17,11 @@
- 	"enableSecurityWarning.title": "Vorschau von Sicherheitswarnungen in diesem Arbeitsbereich aktivieren",
- 	"disableSecurityWarning.title": "Vorschau von Sicherheitswarnungen in diesem Arbeitsbereich deaktivieren ",
- 	"toggleSecurityWarning.description": "Hat keinen Einfluss auf die Inhaltssicherheitsebene",
-+=======
-+	"preview.showPreviewSecuritySelector.strictTitle": "Strict. Nur sicheren Inhalt laden.",
-+	"preview.showPreviewSecuritySelector.currentSelection": "Aktuelle Einstellung",
-+	"preview.showPreviewSecuritySelector.insecureContentTitle": "Laden von Inhalten über HTTP zulassen.",
-+	"preview.showPreviewSecuritySelector.scriptsAndAllContent": "Alle Inhalte und Skriptausführung zulassen. Nicht empfohlen.",
-+>>>>>>> .their
- 	"preview.showPreviewSecuritySelector.title": "Sicherheitseinstellungen für die Markdown-Vorschau in diesem Arbeitsbereich auswählen"
- }
-\ No newline at end of file
-changed in both
-  base   100644 df3491b4c052583c360e279bc895be6608fb2c57 i18n/deu/extensions/npm/package.i18n.json
-  our    100644 8df75704426af1d4997cfc228d8144b23fc7a25f i18n/deu/extensions/npm/package.i18n.json
-  their  100644 6d17843d6df9f96161ae53acd02b6b8739c05b6b i18n/deu/extensions/npm/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -23,4 +24,8 @@
- 	"command.debug": "Debuggen",
- 	"command.openScript": "Öffnen",
- 	"command.runInstall": "Installation ausführen"
-+=======
-+	"config.npm.autoDetect": "Steuert, ob die automatische Erkennung von NPM-Skripts aktiviert oder deaktiviert ist. Standardmäßig ist die Funktion aktiviert.",
-+	"config.npm.runSilent": "npm-Befehle mit der Option \"--silent\" ausführen"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/deu/extensions/typescript/out/features/taskProvider.i18n.json
-  our    100644 8d79b969dfa26d3e6da17af9cef214ffe4faad14 i18n/deu/extensions/typescript/out/features/taskProvider.i18n.json
-  their  100644 3c8640b94b25b1219d11b1f029ef421fbcb94931 i18n/deu/extensions/typescript/out/features/taskProvider.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,14 @@
- 	],
- 	"buildTscLabel": "Erstellen – {0}",
- 	"buildAndWatchTscLabel": "Überwachen – {0}"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"buildAndWatchTscLabel": "Überwachen – {0}",
-+	"buildTscLabel": "Erstellen – {0}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/deu/src/vs/code/electron-main/auth.i18n.json
-  our    100644 fa26814a783e517cd40e6eb8f4b73b928c283ce2 i18n/deu/src/vs/code/electron-main/auth.i18n.json
-  their  100644 84f927c08ed962134c11d5173a92bcd8f747379e i18n/deu/src/vs/code/electron-main/auth.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"authRequire": "Proxyauthentifizierung erforderlich",
- 	"proxyauth": "Der Proxy {0} erfordert eine Authentifizierung."
- }
-\ No newline at end of file
-changed in both
-  base   100644 587b2aaa0697d7cc3cc78dba0c566ada02ea7cf2 i18n/deu/src/vs/code/electron-main/menus.i18n.json
-  our    100644 2c62aec3f2252906a0cfb94c2bac025ecf6adbb0 i18n/deu/src/vs/code/electron-main/menus.i18n.json
-  their  100644 9bdce77a2e75c9b5e78e0025bc056c9aa20135ab i18n/deu/src/vs/code/electron-main/menus.i18n.json
-@@ -24,12 +24,21 @@
- 	"miQuit": "{0} beenden",
- 	"miNewFile": "&&Neue Datei",
- 	"miOpen": "&&Öffnen...",
-+<<<<<<< .our
- 	"miOpenWorkspace": "Ar&&beitsbereich öffnen...",
- 	"miOpenFolder": "&&Ordner öffnen...",
- 	"miOpenFile": "Datei &&öffnen...",
- 	"miOpenRecent": "&&Zuletzt verwendete öffnen",
- 	"miSaveWorkspaceAs": "Arbeitsbereich speichern unter...",
- 	"miAddFolderToWorkspace": "Or&&dner zu Arbeitsbereich hinzufügen...",
-+=======
-+	"miOpenWorkspace": "&&Arbeitsbereich öffnen...",
-+	"miOpenFolder": "&&Ordner öffnen...",
-+	"miOpenFile": "Datei &&öffnen...",
-+	"miOpenRecent": "&&Zuletzt verwendete öffnen",
-+	"miSaveWorkspaceAs": "Arbeitsbereich &&speichern unter...",
-+	"miAddFolderToWorkspace": "&&Ordner zum Arbeitsbereich hinzufügen...",
-+>>>>>>> .their
- 	"miSave": "&&Speichern",
- 	"miSaveAs": "Speichern &&unter...",
- 	"miSaveAll": "A&&lles speichern",
-@@ -189,5 +198,11 @@
- 	"miDownloadingUpdate": "Das Update wird heruntergeladen...",
- 	"miInstallUpdate": "Update installieren …",
- 	"miInstallingUpdate": "Update wird installiert...",
-+<<<<<<< .our
- 	"miRestartToUpdate": "Zum Aktualisieren neu starten..."
-+=======
-+	"miCheckForUpdates": "Nach Aktualisierungen suchen...",
-+	"aboutDetail": "\nVersion {0}\nCommit {1}\nDatum {2}\nShell {3}\nRenderer {4}\nKnoten {5}\nArchitektur {6}",
-+	"okButton": "OK"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/deu/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
-  our    100644 ac5ede63bdad3f517c243ff071879566adbbceae i18n/deu/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
-  their  100644 59257f107ffc766067dc0665995a1fe15aeb166b i18n/deu/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"diff.tooLarge": "Kann die Dateien nicht vergleichen, da eine Datei zu groß ist."
- }
-\ No newline at end of file
-changed in both
-  base   100644 c96d13745a4103d8bbf85f7bc914f575aae66dc6 i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 0cb95fccc47d309d94aacd1e25b0718fd455d527 i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 390c1dcac71f278618f820742e452897fafd1e28 i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json
-changed in both
-  base   100644 56e0924a36c8f29bc1b45ad635d4feda8d334958 i18n/deu/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 7bcd160f251f75f4318d89da439565bbd4c696e5 i18n/deu/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 d15ae588852787b74e3102ade3ea959a0839cf9e i18n/deu/src/vs/editor/common/view/editorColorRegistry.i18n.json
-changed in both
-  base   100644 1766611d9a43ced4e1ebee10a06185f7cb9b8533 i18n/deu/src/vs/editor/contrib/find/common/findController.i18n.json
-  our    100644 966c9eafe93d9687633b93001e9f81c1a52554ac i18n/deu/src/vs/editor/contrib/find/common/findController.i18n.json
-  their  100644 a704a48537415cf89b16a1f544157c105f361124 i18n/deu/src/vs/editor/contrib/find/common/findController.i18n.json
-@@ -10,6 +10,15 @@
- 	"nextSelectionMatchFindAction": "Nächste Auswahl suchen",
- 	"previousSelectionMatchFindAction": "Vorherige Auswahl suchen",
- 	"startReplace": "Ersetzen",
-+<<<<<<< .our
-+=======
-+	"addSelectionToNextFindMatch": "Auswahl zur nächsten Übereinstimmungssuche hinzufügen",
-+	"addSelectionToPreviousFindMatch": "Letzte Auswahl zu vorheriger Übereinstimmungssuche hinzufügen",
-+	"moveSelectionToNextFindMatch": "Letzte Auswahl in nächste Übereinstimmungssuche verschieben",
-+	"moveSelectionToPreviousFindMatch": "Letzte Auswahl in vorherige Übereinstimmungssuche verschieben",
-+	"selectAllOccurrencesOfFindMatch": "Alle Vorkommen auswählen und Übereinstimmung suchen",
-+	"changeAll.label": "Alle Vorkommen ändern",
-+>>>>>>> .their
- 	"showNextFindTermAction": "Nächsten Suchbegriff anzeigen",
- 	"showPreviousFindTermAction": "Vorherigen Suchbegriff anzeigen"
- }
-\ No newline at end of file
-changed in both
-  base   100644 88af0de928a075c57bf0edcda7af629cebae0f76 i18n/deu/src/vs/platform/history/electron-main/historyMainService.i18n.json
-  our    100644 45518a8f05289158f9a6a01043e48b1d666c428a i18n/deu/src/vs/platform/history/electron-main/historyMainService.i18n.json
-  their  100644 5d0462e717abf9f06c780a93cc6b7e9a8599fc32 i18n/deu/src/vs/platform/history/electron-main/historyMainService.i18n.json
-changed in both
-  base   100644 a66c145ad23e2875a00249a655ef7abe470978bd i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 b32f03c31fd5ffcb9742f2b1188daade81a7b028 i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 a0b7ad9a177df48dd18c79264275f8d43ae69b35 i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -60,7 +60,11 @@
- 	"scrollbarShadow": "Schatten der Scrollleiste, um anzuzeigen, dass die Ansicht gescrollt wird.",
- 	"scrollbarSliderBackground": "Hintergrundfarbe vom Scrollbar-Schieber",
- 	"scrollbarSliderHoverBackground": "Hintergrundfarbe des Schiebereglers, wenn darauf gezeigt wird.",
-+<<<<<<< .our
- 	"scrollbarSliderActiveBackground": "Hintergrundfarbe des Schiebereglers, wenn darauf geklickt wird.",
-+=======
-+	"scrollbarSliderActiveBackground": "Hintergrundfarbe des Schiebereglers, wenn dieser aktiv ist.",
-+>>>>>>> .their
- 	"progressBarBackground": "Hintergrundfarbe des Fortschrittbalkens, der für lang ausgeführte Vorgänge angezeigt werden kann.",
- 	"editorBackground": "Hintergrundfarbe des Editors.",
- 	"editorForeground": "Standardvordergrundfarbe des Editors.",
-changed in both
-  base   100644 2c55bed538b95582b0288d9d5439abd117bf4051 i18n/deu/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 108a8fac6be8b55e95f04920e7eb7dd21d592b50 i18n/deu/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 a0694aea6d4856cd9db3bb403d7fd1d178419dce i18n/deu/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -9,6 +9,7 @@
- 	"openFile": "Datei öffnen...",
- 	"openFolder": "Ordner öffnen...",
- 	"openFileFolder": "Öffnen...",
-+<<<<<<< .our
- 	"globalRemoveFolderFromWorkspace": "Ordner aus dem Arbeitsbereich entfernen...",
- 	"saveWorkspaceAsAction": "Arbeitsbereich speichern unter...",
- 	"save": "&&Speichern",
-@@ -16,4 +17,24 @@
- 	"openWorkspaceAction": "Arbeitsbereich öffnen...",
- 	"openWorkspaceConfigFile": "Konfigurationsdatei des Arbeitsbereichs öffnen",
- 	"duplicateWorkspaceInNewWindow": "Duplikat des Arbeitsbereichs in neuem Fenster erstellen"
-+=======
-+	"reload": "E&&rneut laden",
-+	"cancel": "Abbrechen",
-+	"newWorkspaceFormExisting": "Neuer Arbeitsbereich aus vorhandenem...",
-+	"select": "Au&&swählen",
-+	"selectWorkspace": "Ordner für den Arbeitsbereich auswählen",
-+	"addSupported": "Zum Öffnen mehrerer Ordner muss das Fenster erneut geladen werden.",
-+	"addFolderToWorkspace": "Ordner zum Arbeitsbereich hinzufügen...",
-+	"add": "&&Hinzufügen",
-+	"addFolderToWorkspaceTitle": "Ordner zum Arbeitsbereich hinzufügen",
-+	"removeFolderFromWorkspace": "Ordner aus dem Arbeitsbereich entfernen",
-+	"saveWorkspaceAsAction": "Arbeitsbereich speichern unter...",
-+	"saveEmptyWorkspaceNotSupported": "Öffnen Sie zum Speichern zunächst einen Arbeitsbereich.",
-+	"saveNotSupported": "Zum Speichern des Arbeitsbereichs muss das Fenster erneut geladen werden.",
-+	"save": "&&Speichern",
-+	"saveWorkspace": "Arbeitsbereich speichern",
-+	"openWorkspaceAction": "Arbeitsbereich öffnen...",
-+	"newWorkspace": "Neuer Arbeitsbereich...",
-+	"openWorkspaceConfigFile": "Konfigurationsdatei des Arbeitsbereichs öffnen"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 fe0b21dfd66febbed8bf102e75453a40160608a1 i18n/deu/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 bfd72770d07a936659f4d75458f1721e0e96ed8a i18n/deu/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 16d380370f6bc4cc58af60318a0b34dfbd39cef1 i18n/deu/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 870bcf2795a5d391ab44802e1eed9744de058680 i18n/deu/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-  our    100644 5aff102ff6f5b6ee71757498b4052435747a48e1 i18n/deu/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-  their  100644 e6a573610242b0b95a887f31475333c9b1137171 i18n/deu/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,9 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"compositePart.hideSideBarLabel": "Randleiste ausblenden",
-+>>>>>>> .their
- 	"focusSideBar": "Fokus in Randleiste",
- 	"viewCategory": "Anzeigen"
- }
-\ No newline at end of file
-changed in both
-  base   100644 20f046bd07c9af448cefee7b7fe475a9e04d8b7c i18n/deu/src/vs/workbench/common/theme.i18n.json
-  our    100644 7230e04365d13635c1ebe9cad1ed0f92866146cc i18n/deu/src/vs/workbench/common/theme.i18n.json
-  their  100644 6cde0d23751ebd6882303500a6983bab550c8c7f i18n/deu/src/vs/workbench/common/theme.i18n.json
-@@ -61,6 +61,7 @@
- 	"titleBarActiveBackground": "Hintergrund der Titelleiste, wenn das Fenster aktiv ist. Diese Farbe wird derzeit nur von MacOS unterstützt.",
- 	"titleBarInactiveBackground": "Hintergrund der Titelleiste, wenn das Fenster inaktiv ist. Diese Farbe wird derzeit nur von MacOS unterstützt.",
- 	"titleBarBorder": "Rahmenfarbe der Titelleiste. Diese Farbe wird derzeit nur unter MacOS unterstützt.",
-+<<<<<<< .our
- 	"notificationCenterBorder": "Rahmenfarbe der Benachrichtigungszentrale. Benachrichtigungen werden unten rechts eingeblendet.",
- 	"notificationToastBorder": "Rahmenfarbe der Popupbenachrichtigung. Benachrichtigungen werden unten rechts eingeblendet.",
- 	"notificationsForeground": "Vordergrundfarbe für Benachrichtigungen. Benachrichtigungen werden unten rechts eingeblendet.",
-@@ -69,4 +70,17 @@
- 	"notificationCenterHeaderForeground": "Vordergrundfarbe für Kopfzeile der Benachrichtigungszentrale. Benachrichtigungen werden unten rechts eingeblendet.",
- 	"notificationCenterHeaderBackground": "Hintergrundfarbe für Kopfzeile der Benachrichtigungszentrale. Benachrichtigungen werden unten rechts eingeblendet.",
- 	"notificationsBorder": "Rahmenfarbe für Benachrichtigungen zum Trennen von anderen Benachrichtigungen in der Benachrichtigungszentrale. Benachrichtigungen werden unten rechts eingeblendet."
-+=======
-+	"notificationsForeground": "Vordergrundfarbe für Benachrichtigungen. Benachrichtigungen werden oben im Fenster eingeblendet.",
-+	"notificationsBackground": "Hintergrundfarbe für Benachrichtigungen. Benachrichtigungen werden oben im Fenster eingeblendet.",
-+	"notificationsButtonBackground": "Hintergrundfarbe der Benachrichtigungsschaltfläche. Benachrichtigungen werden oben im Fenster eingeblendet.",
-+	"notificationsButtonHoverBackground": "Hintergrundfarbe der Benachrichtigungsschaltfläche, wenn darauf gezeigt wird. Benachrichtigungen werden oben im Fenster eingeblendet.",
-+	"notificationsButtonForeground": "Vordergrundfarbe der Benachrichtigungsschaltfläche. Benachrichtigungen werden oben im Fenster eingeblendet.",
-+	"notificationsInfoBackground": "Hintergrundfarbe von Benachrichtigungsinformationen. Benachrichtigungen werden oben im Fenster eingeblendet.",
-+	"notificationsInfoForeground": "Vordergrundfarbe von Benachrichtigungsinformationen. Benachrichtigungen werden oben im Fenster eingeblendet.",
-+	"notificationsWarningBackground": "Hintergrundfarbe von Benachrichtigungswarnungen. Benachrichtigungen werden oben im Fenster eingeblendet.",
-+	"notificationsWarningForeground": "Vordergrundfarbe von Benachrichtigungswarnungen. Benachrichtigungen werden oben im Fenster eingeblendet.",
-+	"notificationsErrorBackground": "Hintergrundfarbe von Benachrichtigungsfehlern. Benachrichtigungen werden oben im Fenster eingeblendet.",
-+	"notificationsErrorForeground": "Vordergrundfarbe von Benachrichtigungsfehlern. Benachrichtigungen werden oben im Fenster eingeblendet."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6af3818bfee8e5b3f41e793e98c9b72f1ec25025 i18n/deu/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 1609e7c92719c7aa89402c8bf0018971f9a1043e i18n/deu/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 fc58109765ade07d20b81f82323a32e9e4aae440 i18n/deu/src/vs/workbench/electron-browser/actions.i18n.json
-changed in both
-  base   100644 624c0ec5539441248b4a9ef99c15411932a20f51 i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 fc92fd392259fb9b2d1dec1cecdbc3c76bdc7440 i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 908ac5f9840805490661d6af4100fed1bd354029 i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,6 +35,7 @@
- 	"panelDefaultLocation": "Steuert die Standardposition des Panels. Dieses kann entweder unterhalb oder rechts von der Workbench angezeigt werden.",
- 	"statusBarVisibility": "Steuert die Sichtbarkeit der Statusleiste im unteren Bereich der Workbench.",
- 	"activityBarVisibility": "Steuert die Sichtbarkeit der Aktivitätsleiste in der Workbench.",
-+<<<<<<< .our
- 	"viewVisibility": "Steuert die Sichtbarkeit von Headeraktionen. Headeraktionen können immer sichtbar sein oder nur sichtbar sein, wenn diese Ansicht fokussiert ist oder mit der Maus darauf gezeigt wird.",
- 	"fontAliasing": "Steuert die Schriftartaliasingmethode in der Workbench.\n - default: Subpixel-Schriftartglättung. Auf den meisten Nicht-Retina-Displays wird Text bei dieser Einstellung am schärfsten dargestellt. \n- antialiased: Glättet die Schriftart auf der Pixelebene (im Gegensatz zur Subpixelebene). Bei dieser Einstellung kann die Schriftart insgesamt heller wirken.\n- none: Deaktiviert die Schriftartglättung. Text wird mit gezackten scharfen Kanten dargestellt.\n- auto: Wendet ausgehend vom DPI der Anzeige automatisch \"default\" oder \"antialiased\" an.",
- 	"workbench.fontAliasing.default": "Subpixel-Schriftartglättung. Auf den meisten Nicht-Retina-Displays wird Text bei dieser Einstellung am schärfsten dargestellt.",
-@@ -43,6 +44,15 @@
- 	"workbench.fontAliasing.auto": "Wendet ausgehend vom DPI der Anzeige automatisch \"default\" oder \"antialiased\" an.",
- 	"enableNaturalLanguageSettingsSearch": "Steuert, ob der Suchmodus mit natürlicher Sprache für die Einstellungen aktiviert werden soll.",
- 	"windowConfigurationTitle": "Fenster",
-+=======
-+	"closeOnFileDelete": "Steuert, ob Editoren, die eine Datei anzeigen, automatisch geschlossen werden sollen, wenn die Datei von einem anderen Prozess umbenannt oder gelöscht wird. Wenn Sie diese Option deaktivieren, bleibt der Editor bei einem solchen Ereignis als geändert offen. Bei Löschvorgängen innerhalb der Anwendung wird der Editor immer geschlossen, und geänderte Dateien werden nie geschlossen, damit Ihre Daten nicht verloren gehen.",
-+	"fontAliasing": "Steuert die Schriftartaliasingmethode in der Workbench.\n- default: Subpixel-Schriftartglättung. Auf den meisten Nicht-Retina-Displays wird Text bei dieser Einstellung am schärfsten dargestellt.\n- antialiased: Glättet die Schriftart auf der Pixelebene (im Gegensatz zur Subpixelebene). Bei dieser Einstellung kann die Schriftart insgesamt heller wirken.\n- none: Deaktiviert die Schriftartglättung. Text wird mit gezackten scharfen Kanten dargestellt.\n",
-+	"workbench.fontAliasing.default": "Subpixel-Schriftartglättung. Auf den meisten Nicht-Retina-Displays wird Text bei dieser Einstellung am schärfsten dargestellt.",
-+	"workbench.fontAliasing.antialiased": "Glättet die Schriftart auf der Pixelebene (im Gegensatz zur Subpixelebene). Bei dieser Einstellung kann die Schriftart insgesamt heller wirken.",
-+	"workbench.fontAliasing.none": "Deaktiviert die Schriftartglättung. Text wird mit gezackten scharfen Kanten dargestellt.",
-+	"swipeToNavigate": "Hiermit navigieren Sie per waagrechtem Wischen mit drei Fingen zwischen geöffneten Dateien.",
-+	"workbenchConfigurationTitle": "Workbench",
-+>>>>>>> .their
- 	"window.openFilesInNewWindow.on": "Dateien werden in einem neuen Fenster geöffnet.",
- 	"window.openFilesInNewWindow.off": "Dateien werden im Fenster mit dem geöffneten Dateiordner oder im letzten aktiven Fenster geöffnet.",
- 	"window.openFilesInNewWindow.defaultMac": "Dateien werden im Fenster mit dem geöffneten Dateiordner oder im letzten aktiven Fenster geöffnet, sofern sie nicht über das Dock oder den Finder geöffnet werden.",
-changed in both
-  base   100644 fcfa5e59e8fdf81b9992c20f1c90353fe5155167 i18n/deu/src/vs/workbench/electron-browser/window.i18n.json
-  our    100644 4c4d3d858c118a5c816610f7b78e3f49ca6d0d66 i18n/deu/src/vs/workbench/electron-browser/window.i18n.json
-  their  100644 00352ea7fda43462db3813ba46dd5f4b8154e0ae i18n/deu/src/vs/workbench/electron-browser/window.i18n.json
-@@ -12,5 +12,10 @@
- 	"copy": "Kopieren",
- 	"paste": "Einfügen",
- 	"selectAll": "Alles auswählen",
-+<<<<<<< .our
- 	"runningAsRoot": "Es wird nicht empfohlen, {0} als Root-Benutzer auszuführen."
-+=======
-+	"confirmOpen": "Sind Sie sicher, dass Sie {0} Arbeitsbereiche öffnen möchten?",
-+	"confirmOpenButton": "&&Öffnen"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 3886214271ecc8b5e3610f8a547dced7cdbe45b2 i18n/deu/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  our    100644 ddda783ca8462bb00a69ac063609b63009b0e769 i18n/deu/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  their  100644 f8f92c8accfaf85b6f77866ad235403d02144ce7 i18n/deu/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-changed in both
-  base   100644 4588894202af0a4c69cf51fe010ef3000cc7db93 i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 d6cc1170dbfaab61ca55376b64654ebe15edb98e i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 7101b4ffb876d56a12bbcce5b4e508d73f3f43ed i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -28,7 +28,13 @@
- 	"preLaunchTaskExitCode": "Der preLaunchTask \"{0}\" wurde mit dem Exitcode {1} beendet.",
- 	"showErrors": "Fehler anzeigen",
- 	"noFolderWorkspaceDebugError": "Debuggen der aktiven Datei ist nicht möglich. Stellen Sie sicher, dass sie auf einem Datenträger gespeichert ist und dass Sie die Debugerweiterung für diesen Dateityp installiert haben.",
-+<<<<<<< .our
- 	"cancel": "Abbrechen",
- 	"DebugTaskNotFound": "Der Task \"{0}\" konnte nicht gefunden werden.",
- 	"taskNotTracked": "Der Task \"{0}\" kann nicht nachverfolgt werden."
-+=======
-+	"NewLaunchConfig": "Richten Sie die Startkonfigurationsdatei für Ihre Anwendung ein. {0}",
-+	"DebugTaskNotFound": "Der preLaunchTask \"{0}\" wurde nicht gefunden.",
-+	"differentTaskRunning": "Die Aufgabe \"{0}\" wird bereits ausgeführt. Die Aufgabe \"{1}\" vor dem Start kann nicht ausgeführt werden."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 57d2b6200423f3560ec630b7fb173184d283237d i18n/deu/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  our    100644 d4395810a2fe1de4942de018b95fcee0dd85b088 i18n/deu/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  their  100644 3de79db297ebde37bcde55d475d1dae0fc159314 i18n/deu/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-merged
-  result 100644 5c81aa23b633da3476852d85a456fa282aa4ae05 i18n/deu/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-  our    100644 c344b63f2642e76618c3fb2a6df96403a5b5bc78 i18n/deu/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-@@ -7,8 +7,5 @@
- 	"emmetConfigurationTitle": "Emmet",
- 	"triggerExpansionOnTab": "Wenn diese Option aktiviert ist, werden Emmet-Abkürzungen beim Drücken der TAB-TASTE erweitert. Nicht zutreffend, wenn emmet.useNewemmet auf \"true\" festgelegt ist.",
- 	"emmetPreferences": "Einstellungen, die zum Ändern des Verhaltens einiger Aktionen und Resolver von Emmet verwendet werden. Nicht zutreffend, wenn emmet.useNewemmet auf \"true\" festgelegt ist.",
--	"emmetSyntaxProfiles": "Definieren Sie das Profil für die angegebene Syntax, oder verwenden Sie Ihr eigenes Profil mit bestimmten Regeln.",
--	"emmetExclude": "Ein Array von Sprachen, in dem Emmet-Abkürzungen nicht erweitert werden sollen.",
--	"emmetExtensionsPath": "Pfad zu einem Ordner mit Emmet-Profilen, -Ausschnitten und -Einstellungen. Wenn emmet.useNewEmmet auf \"true\" festgelegt ist, werden nur Profile vom Erweiterungspfad berücksichtigt.",
- 	"useNewEmmet": "Testen Sie die neuen Emmet-Module (die letztendlich die alte einzelne Emmet-Bibliothek ersetzen) für alle Emmet-Funktionen."
- }
-\ No newline at end of file
-changed in both
-  base   100644 f14a2f53165cd54ca89c3c268e1afcd90307a746 i18n/deu/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  our    100644 ffcb91c35c3b84aa761f9cf48403d04cda0e5ae4 i18n/deu/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  their  100644 0b10a0310640832c8a3915fac3d07fdb8efec6d2 i18n/deu/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-changed in both
-  base   100644 0e32d73283c0620025905bbab284e509d3d2515b i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 cf7a07fdcb5de4fa57ac5ab17021ee98e54c3fc8 i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 39ae9002f33adb326e270912b47af97a866a56d4 i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-changed in both
-  base   100644 72876f0d4f678b46d6769e17f4a17b069b6c2c6d i18n/deu/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
-  our    100644 46de1e8541a805d4182b71abb75b9857226854c4 i18n/deu/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
-  their  100644 bc53701d4ae437060ca49f98787d0548028622e4 i18n/deu/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
-@@ -4,7 +4,11 @@
-  *--------------------------------------------------------------------------------------------*/
- // Do not edit this file. It is machine generated.
- {
-+<<<<<<< .our
- 	"filesCategory": "Datei",
-+=======
-+	"filesCategory": "Dateien",
-+>>>>>>> .their
- 	"revealInSideBar": "In Seitenleiste anzeigen",
- 	"acceptLocalChanges": "Änderungen verwenden und Datenträgerinhalte überschreiben",
- 	"revertLocalChanges": "Änderungen verwerfen und Datenträgerinhalte wiederherstellen"
-changed in both
-  base   100644 074e91a4e393e893480513aabe524f59da0b145c i18n/deu/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  our    100644 146bfaf2e064336bab67d6d79de7ec4303d23e61 i18n/deu/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  their  100644 48a3c7f870d26e5fdfe78eae393ceaaf1abe791d i18n/deu/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-changed in both
-  base   100644 a959a89e774dc4329ff85c5c4d71a075f6b681c8 i18n/deu/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 00a2164ceaa6feb9c7573ae407355c84d09fbc3c i18n/deu/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 5ffcbbdc2703496912ce894b3c30ff0d87edd0a1 i18n/deu/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-@@ -40,6 +40,7 @@
- 	"dynamicHeight": "Steuert, ob sich die Höhe des Abschnitts \"Geöffnete Editoren\" dynamisch an die Anzahl der Elemente anpassen soll.",
- 	"autoReveal": "Steuert, ob der Explorer Dateien beim Öffnen automatisch anzeigen und auswählen soll.",
- 	"enableDragAndDrop": "Steuert, ob der Explorer das Verschieben von Dateien und Ordnern mithilfe von Drag  Drop zulassen soll.",
-+<<<<<<< .our
- 	"confirmDragAndDrop": "Steuert, ob der Explorer um Bestätigung bittet, um Dateien und Ordner per Drag & Drop zu verschieben.",
- 	"confirmDelete": "Steuert, ob der Explorer um Bestätigung bitten soll, wenn Sie eine Datei über den Papierkorb löschen.",
- 	"sortOrder.default": "Dateien und Ordner werden nach ihren Namen in alphabetischer Reihenfolge sortiert. Ordner werden vor Dateien angezeigt. ",
-@@ -50,4 +51,12 @@
- 	"sortOrder": "Steuert die Sortierreihenfolge von Dateien und Ordnern im Explorer. Zusätzlich zur Standardsortierreihenfolge können Sie die Reihenfolge auf \"mixed\" (kombinierte Sortierung von Dateien und Ordnern), \"type\" (nach Dateityp), \"modified\" (nach letztem Änderungsdatum) oder \"filesFirst\" (Dateien vor Ordnern anzeigen) festlegen.",
- 	"explorer.decorations.colors": "Steuert, ob Dateidekorationen Farben verwenden.",
- 	"explorer.decorations.badges": "Steuert, ob Dateidekorationen Badges verwenden."
-+=======
-+	"sortOrder.default": "Dateien und Verzeichnisse werden in alphabetischer Reihenfolge nach Namen sortiert. Verzeichnisse werden vor Dateien angezeigt.",
-+	"sortOrder.mixed": "Dateien und Verzeichnisse werden in alphabetischer Reihenfolge nach Namen sortiert. Dateien und Verzeichnisse werden vermischt angezeigt.",
-+	"sortOrder.filesFirst": "Dateien und Verzeichnisse werden in alphabetischer Reihenfolge nach Namen sortiert. Dateien werden vor Verzeichnissen angezeigt.",
-+	"sortOrder.type": "Dateien und Verzeichnisse werden in alphabetischer Reihenfolge nach Erweiterungen sortiert. Verzeichnisse werden vor Dateien angezeigt.",
-+	"sortOrder.modified": "Dateien und Verzeichnisse werden in absteigender Reihenfolge nach dem Datum der letzten Änderung sortiert. Verzeichnisse werden vor Dateien angezeigt.",
-+	"sortOrder": "Steuert die Sortierung von Dateien und Verzeichnissen im Explorer."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a9804d972b229d4ae3053c3b9f9774ad84f8306c i18n/deu/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-  our    100644 55ed6344bee5a16153879a922530a6ec8eac9933 i18n/deu/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-  their  100644 7bd4f281a16e90c09992384ba94903ce0b0d6fde i18n/deu/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-@@ -12,5 +12,6 @@
- 	"genericSaveError": "Fehler beim Speichern von \"{0}\": {1}.",
- 	"staleSaveError": "Fehler beim Speichern von \"{0}\": Der Inhalt auf dem Datenträger ist neuer. Klicken Sie auf **Vergleichen**, um Ihre Version mit der Version auf dem Datenträger zu vergleichen.",
- 	"compareChanges": "Vergleichen",
--	"saveConflictDiffLabel": "{0} (auf Datenträger) ↔ {1} (in {2}): Speicherkonflikt lösen"
-+	"saveConflictDiffLabel": "{0} (auf Datenträger) ↔ {1} (in {2}): Speicherkonflikt lösen",
-+	"userGuide": "Verwenden Sie die Aktionen auf der Editor-Symbolleiste auf der rechten Seite, um Ihre Änderungen **rückgängig zu machen** oder den Inhalt auf dem Datenträger mit Ihren Änderungen zu **überschreiben**."
- }
-\ No newline at end of file
-changed in both
-  base   100644 157325389a5f25722b7c2bc1bc9b6bbfc5ba3c50 i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  our    100644 69766a391fed29fd2a77d8603a89733b0bed7495 i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  their  100644 73113cf629416b51787bb1eb2cd34deeeb1fe266 i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-@@ -14,6 +14,10 @@
- 	"openGlobalKeybindingsFile": "Datei mit Tastaturkurzbefehlen öffnen",
- 	"openWorkspaceSettings": "Arbeitsbereichseinstellungen öffnen",
- 	"openFolderSettings": "Ordnereinstellungen öffnen",
-+<<<<<<< .our
-+=======
-+	"pickFolder": "Ordner auswählen",
-+>>>>>>> .their
- 	"configureLanguageBasedSettings": "Sprachspezifische Einstellungen konfigurieren...",
- 	"languageDescriptionConfigured": "({0})",
- 	"pickLanguage": "Sprache auswählen"
-changed in both
-  base   100644 e39c41141f00155e6b9dc3e17df012ab5a8e8e0a i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 93e401bd692b17b66ba4a0cb54c6f67464e449ac i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 c7f0245455c7f6d35f2d40d2db5ed9de0c0ad045 i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -14,4 +15,19 @@
- 	"editTtile": "Bearbeiten",
- 	"replaceDefaultValue": "In Einstellungen ersetzen",
- 	"copyDefaultValue": "In Einstellungen kopieren"
-+=======
-+	"emptyUserSettingsHeader": "Platzieren Sie Ihre Einstellungen hier, um die Standardeinstellungen zu überschreiben.",
-+	"errorInvalidConfiguration": "Einstellungen können nicht geschrieben werden. Öffnen Sie die Datei, um Fehler/Warnungen in der Datei zu korrigieren. Versuchen Sie es anschließend noch mal.",
-+	"emptyWorkspaceSettingsHeader": "Platzieren Sie Ihre Einstellungen hier, um die Benutzereinstellungen zu überschreiben.",
-+	"emptyFolderSettingsHeader": "Platzieren Sie Ihre Ordnereinstellungen hier, um die Einstellungen in den Arbeitsbereichseinstellungen zu überschreiben.",
-+	"defaultFolderSettingsTitle": "Standardordnereinstellungen",
-+	"defaultSettingsTitle": "Standardeinstellungen",
-+	"noSettingsFound": "Keine Einstellungen gefunden.",
-+	"editTtile": "Bearbeiten",
-+	"replaceDefaultValue": "In Einstellungen ersetzen",
-+	"copyDefaultValue": "In Einstellungen kopieren",
-+	"unsupportedPHPExecutablePathSetting": "Diese Einstellung muss eine Benutzereinstellung sein. Öffnen Sie zum Konfigurieren von PHP für den Arbeitsbereich eine PHP-Datei, und klicken Sie in der Statusleiste auf \"PHP-Pfad\".",
-+	"unsupportedWorkspaceSetting": "Diese Einstellung muss eine Benutzereinstellung sein.",
-+	"unsupportedWorkbenchSetting": "Diese Einstellung kann jetzt nicht angewendet werden. Sie wird angewendet, wenn Sie den Ordner direkt öffnen."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f28cfa282a3346026a136ee46195ab686b252e00 i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-  our    100644 13bbcc4e6f2e8917c91b8e538c5ae2056a00c878 i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-  their  100644 29ee08e9ffca0c6a66ff9b5869f96bb6c00be649 i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 cfd3784b25185836bda1d8d6784b3e81792155f0 i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 6c90dea80f47d72c434318e2c0963ba5bccd11a8 i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -12,4 +13,13 @@
- 	"userSettings": "Benutzereinstellungen",
- 	"workspaceSettings": "Arbeitsbereichseinstellungen",
- 	"folderSettings": "Ordnereinstellungen"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"folderSettingsDetails": "Ordnereinstellungen"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 30e347510d43c5806741967a6745068f2cd6f432 i18n/deu/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  our    100644 944c8644290b13cdcb690093cff1d8e9a037f81b i18n/deu/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  their  100644 4e537daf3e5002d319bf1dfeabf2273c7fba3744 i18n/deu/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-@@ -8,5 +8,11 @@
- 	],
- 	"relaunchSettingMessage": "Eine Einstellung wurde geändert, welche einen Neustart benötigt.",
- 	"relaunchSettingDetail": "Drücke den Neu starten-Button, um {0} neuzustarten und die Einstellung zu aktivieren.",
-+<<<<<<< .our
- 	"restart": "&&Neu starten"
-+=======
-+	"restart": "Neu starten",
-+	"relaunchWorkspaceMessage": "Dieser Arbeitsbereich erfordert das erneute Laden des Erweiterungssystems.",
-+	"reload": "Neu starten"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 2914ad5ba59e7889a1648a7d2d7ac79bb3aa74f7 i18n/deu/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 1dcdaff92772bd253ab87cb0ce46920ce5c5e6bc i18n/deu/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 b16c9eacc2aec0509c74506a12ffad9ce50eaeda i18n/deu/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"nextSearchIncludePattern": "Nächstes Sucheinschlussmuster anzeigen",
- 	"previousSearchIncludePattern": "Vorheriges Sucheinschlussmuster anzeigen",
- 	"nextSearchExcludePattern": "Nächstes Suchausschlussmuster anzeigen",
-@@ -16,6 +19,8 @@
- 	"previousReplaceTerm": "Vorherigen Such-/Ersetzungsbegriff anzeigen ",
- 	"findInFiles": "In Dateien suchen",
- 	"replaceInFiles": "In Dateien ersetzen",
-+	"findInWorkspace": "In Arbeitsbereich suchen...",
-+	"findInFolder": "In Ordner suchen...",
- 	"RefreshAction.label": "Aktualisieren",
- 	"CollapseDeepestExpandedLevelAction.label": "Alle zuklappen",
- 	"ClearSearchResultsAction.label": "Löschen",
-changed in both
-  base   100644 8ec0049b3b37ba259c8ad15829388e11fff001cb i18n/deu/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-  our    100644 7fc53a6c4eefd13fb550ab2f60913080f68637da i18n/deu/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-  their  100644 66ba97093a94a46a9be324b8085b85c39555ccd4 i18n/deu/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"searchFolderMatch.other.label": "Andere Dateien",
- 	"searchFileMatches": "{0} Dateien gefunden",
- 	"searchFileMatch": "{0} Datei gefunden",
-changed in both
-  base   100644 86e0e518608a25b5f3b0c74109b855024a7aa9d1 i18n/deu/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  our    100644 f2f216a0a047fbef56f5094bbd15e808251180f1 i18n/deu/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  their  100644 b7189463a56677556b81e950b165a0c09f49e0b9 i18n/deu/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-changed in both
-  base   100644 76d6135b7eb9bb3c9309f346b1f52786ee73615d i18n/deu/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 b3a9bfb6f09fdd913393d2a5b333f495988fabdc i18n/deu/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 227a46a1685e61a1c67b2aad2ce5133a1b0ee127 i18n/deu/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-changed in both
-  base   100644 b85cadb9245a83b3bb024d9868956eef54dbc116 i18n/deu/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 5e860baf0d874c2a564e21bd9c48c55877bc2bfd i18n/deu/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 7d2a7a768ee32b2c274aa3e79d9184de3672c26f i18n/deu/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -12,8 +12,12 @@
- 	"totalWarnings": "{0} Warnungen",
- 	"totalInfos": "{0}-Informationen",
- 	"problems": "Probleme",
-+<<<<<<< .our
- 	"building": "Wird gebaut...",
- 	"manyProblems": "Über 10.000",
-+=======
-+	"manyMarkers": "mehr als 99",
-+>>>>>>> .their
- 	"runningTasks": "Aktive Aufgaben anzeigen",
- 	"tasks": "Aufgaben",
- 	"TaskSystem.noHotSwap": "Zum Ändern des Aufgabenausführungsmoduls mit einem aktiven Task muss das Fenster erneut geladen werden.",
-@@ -24,17 +28,25 @@
- 	"TaskService.noTestTask1": "Keine Testaufgabe definiert. Markieren Sie eine Aufgabe mit 'isTestCommand' in der tasks.json-Datei.",
- 	"TaskService.noTestTask2": "Es ist keine Testaufgabe definiert. Markieren Sie eine Aufgabe in der Datei \"tasks.json\" als \"Testgruppe\". ",
- 	"TaskServer.noTask": "Die angeforderte auszuführende Aufgabe {0} wurde nicht gefunden.",
-+<<<<<<< .our
- 	"TaskService.associate": "assoziieren",
-+=======
-+>>>>>>> .their
- 	"TaskService.attachProblemMatcher.continueWithout": "Ohne Überprüfung der Aufgabenausgabe fortsetzen",
- 	"TaskService.attachProblemMatcher.never": "Aufgabenausgabe nie überprüfen",
- 	"TaskService.attachProblemMatcher.learnMoreAbout": "Weitere Informationen zur Überprüfung der Aufgabenausgabe",
- 	"selectProblemMatcher": "Fehler- und Warnungsarten auswählen, auf die die Aufgabenausgabe überprüft werden soll",
- 	"customizeParseErrors": "Die aktuelle Aufgabenkonfiguration weist Fehler auf. Beheben Sie die Fehler, bevor Sie eine Aufgabe anpassen.",
- 	"moreThanOneBuildTask": "In \"tasks.json\" sind mehrere Buildaufgaben definiert. Die erste wird ausgeführt.\n",
-+<<<<<<< .our
- 	"TaskSystem.activeSame.background": "Die Aufgabe \"{0}\" ist bereits aktiv und befindet sich im Hintergrundmodus.",
- 	"TaskSystem.activeSame.noBackground": "Die Aufgabe \"{0}\" ist bereits aktiv.",
- 	"terminateTask": "Aufgabe beenden",
- 	"restartTask": "Aufgabe neu starten",
-+=======
-+	"TaskSystem.activeSame.background": "Die Aufgabe \"{0}\" ist bereits im Hintergrundmodus aktiv. Klicken Sie zum Beenden der Aufgabe im Menü \"Aufgaben\" auf \"Aufgabe beenden\".",
-+	"TaskSystem.activeSame.noBackground": "Die Aufgabe \"{0}\" ist bereits aktiv. Klicken Sie zum Beenden der Aufgabe im Menü \"Aufgaben\" auf \"Aufgabe beenden\".",
-+>>>>>>> .their
- 	"TaskSystem.active": "Eine aktive Aufgabe wird bereits ausgeführt. Beenden Sie diese, bevor Sie eine andere Aufgabe ausführen.",
- 	"TaskSystem.restartFailed": "Fehler beim Beenden und Neustarten der Aufgabe \"{0}\".",
- 	"TaskService.noConfiguration": "Fehler: Die Aufgabenerkennung {0} hat für die folgende Konfiguration keine Aufgabe beigetragen:\n {1}\nDie Aufgabe wird ignoriert.\n",
-@@ -75,8 +87,13 @@
- 	"TaskService.pickDefaultBuildTask": "Als Standardbuildaufgabe zu verwendende Aufgabe auswählen",
- 	"TaskService.defaultTestTaskExists": "{0} ist bereits als Standardtestaufgabe markiert.",
- 	"TaskService.pickDefaultTestTask": "Als Standardtestaufgabe zu verwendende Aufgabe auswählen",
-+<<<<<<< .our
- 	"TaskService.pickShowTask": "Aufgabe zum Anzeigen der Ausgabe auswählen",
- 	"TaskService.noTaskIsRunning": "Es wird keine Aufgabe ausgeführt.",
-+=======
-+	"TaskService.noTaskIsRunning": "Es wird keine Aufgabe ausgeführt.",
-+	"TaskService.pickShowTask": "Aufgabe zum Anzeigen der Ausgabe auswählen",
-+>>>>>>> .their
- 	"ShowLogAction.label": "Taskprotokoll anzeigen",
- 	"RunTaskAction.label": "Task ausführen",
- 	"RestartTaskAction.label": "Ausgeführte Aufgabe neu starten",
-changed in both
-  base   100644 6064eccbd983947832bba2f4dfe2b117945710cc i18n/deu/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  our    100644 4f46618a81282525db957b1ebde7efb9886db7e0 i18n/deu/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  their  100644 06880671c112308c581aa9c5941c879222933ca9 i18n/deu/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/deu/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  our    100644 baf84ca2434746b629839192402548996da51973 i18n/deu/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  their  100644 fefb75a0cf0e759096e87e068ea2ed9340801543 i18n/deu/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,6 +10,15 @@
- 	"termEntryAriaLabel": "{0}, Terminalauswahl",
- 	"termCreateEntryAriaLabel": "{0}, neues Terminal erstellen",
- 	"workbench.action.terminal.newplus": "$(plus) Neues integriertes Terminal erstellen",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"entryAriaLabel": "{0}, Terminalauswahl",
-+>>>>>>> .their
- 	"noTerminalsMatching": "Keine übereinstimmenden Terminals",
- 	"noTerminalsFound": "Keine geöffneten Terminals"
- }
-\ No newline at end of file
-changed in both
-  base   100644 4d0a1893044c792abea39a3afc4621f1d6fecc2d i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 e7e17f13a867ab30a0455dba8cfbc4967b92e2a0 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 0c03c8172266b4ab4a1c4976a18ffe03b02d3f24 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,9 @@
- 	],
- 	"quickOpen.terminal": "Alle geöffneten Terminals anzeigen",
- 	"terminal": "Terminal",
-+=======
-+	"quickOpen.terminal": "Alle geöffneten Terminals anzeigen",
-+>>>>>>> .their
- 	"terminalIntegratedConfigurationTitle": "Integriertes Terminal",
- 	"terminal.integrated.shell.linux": "Der Pfad der Shell, den das Terminal unter Linux verwendet.",
- 	"terminal.integrated.shellArgs.linux": "Die Befehlszeilenargumente, die für das Linux-Terminal verwendet werden sollen.",
-@@ -36,8 +40,12 @@
- 	"terminal.integrated.env.osx": "Objekt mit Umgebungsvariablen, das dem unter OS X vom Terminal zu verwendenden VS Code-Prozess hinzugefügt wird",
- 	"terminal.integrated.env.linux": "Objekt mit Umgebungsvariablen, das dem unter Linux vom Terminal zu verwendenden VS Code-Prozess hinzugefügt wird",
- 	"terminal.integrated.env.windows": "Objekt mit Umgebungsvariablen, das dem unter Windows vom Terminal zu verwendenden VS Code-Prozess hinzugefügt wird",
-+<<<<<<< .our
- 	"terminal.integrated.showExitAlert": "Warnung \"Der Terminalprozess wurde mit folgendem Exitcode beendet\" anzeigen, wenn der Exitcode nicht Null ist.",
- 	"terminal.integrated.experimentalRestore": "Ob aktive Terminalsitzungen für den Arbeitsbereich beim Starten von VS Code automatisch wiederhergestellt werden sollen. Diese Einstellung ist in der Testphase, kann fehlerhaft sein und in Zukunft geändert werden.",
-+=======
-+	"terminal": "Terminal",
-+>>>>>>> .their
- 	"terminalCategory": "Terminal",
- 	"viewCategory": "Anzeigen"
- }
-\ No newline at end of file
-changed in both
-  base   100644 31e96cf587e451a0aea30f6532a173f8a77747c9 i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 17f468b874b715481031f72251583765b50e478f i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 a4c9e32a386ec3b214d0b4b586116b39673a972d i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -14,8 +14,11 @@
- 	"workbench.action.terminal.selectAll": "Alles auswählen",
- 	"workbench.action.terminal.deleteWordLeft": "Wort links löschen",
- 	"workbench.action.terminal.deleteWordRight": "Wort rechts löschen",
-+<<<<<<< .our
- 	"workbench.action.terminal.moveToLineStart": "Zum Zeilenanfang",
- 	"workbench.action.terminal.moveToLineEnd": "Zum Zeilenende",
-+=======
-+>>>>>>> .their
- 	"workbench.action.terminal.new": "Neues integriertes Terminal erstellen",
- 	"workbench.action.terminal.new.short": "Neues Terminal",
- 	"workbench.action.terminal.newWorkspacePlaceholder": "Aktuelles Arbeitsverzeichnis für neues Terminal auswählen",
-@@ -51,6 +54,7 @@
- 	"workbench.action.terminal.rename.prompt": "Terminalnamen eingeben",
- 	"workbench.action.terminal.focusFindWidget": "Widget zum Anzeigen der Suche mit Fokus",
- 	"workbench.action.terminal.hideFindWidget": "Widget zum Ausblenden der Suche",
-+<<<<<<< .our
- 	"nextTerminalFindTerm": "Nächsten Suchbegriff anzeigen",
- 	"previousTerminalFindTerm": "Vorherigen Suchbegriff anzeigen",
- 	"quickOpenTerm": "Aktives Terminal wechseln",
-@@ -60,4 +64,7 @@
- 	"workbench.action.terminal.selectToNextCommand": "Auswählen bis zu nächstem Befehl",
- 	"workbench.action.terminal.selectToPreviousLine": " Auswählen bis zur vorherigen Zeile ",
- 	"workbench.action.terminal.selectToNextLine": "Auswählen bis zur nächsten Zeile"
-+=======
-+	"quickOpenTerm": "Aktives Terminal wechseln"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 9d4810761f24371631240b96e6b04a543431877e i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 84fc7fe0d67567c48c4b669c0d3d08c7386267cc i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 e1d9d37fe1e42e0b79089a0c6ec23beeac903b2e i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -10,7 +10,11 @@
- 	"terminal.foreground": "Die Vordergrundfarbe des Terminal.",
- 	"terminalCursor.foreground": "Die Vordergrundfarbe des Terminalcursors.",
- 	"terminalCursor.background": "Die Hintergrundfarbe des Terminalcursors. Ermöglicht das Anpassen der Farbe eines Zeichens, das von einem Blockcursor überdeckt wird.",
-+<<<<<<< .our
- 	"terminal.selectionBackground": "Die Auswahlvordergrundfarbe des Terminals.",
- 	"terminal.border": "Die Farbe des Rahmens, der Bereiche innerhalb des Terminals teilt. Der Standardwert ist panel.border.",
- 	"terminal.ansiColor": "\"{0}\" ANSI-Farbe im Terminal"
-+=======
-+	"terminal.ansiColor": "\"{0}\": ANSI-Farbe im Terminal"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f579c5cd19f0ef91306edb73995a5ed9810cda82 i18n/deu/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 dca9f59735754d2304f7bca4be1c8c6b2470923f i18n/deu/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 107869007af08bba924f92278a960d32a11d1be4 i18n/deu/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -9,10 +9,21 @@
- 	"releaseNotes": "Anmerkungen zu dieser Version",
- 	"showReleaseNotes": "Anmerkungen zu dieser Version anzeigen",
- 	"read the release notes": "Willkommen bei {0} v{1}! Möchten Sie die Hinweise zu dieser Version lesen?",
-+<<<<<<< .our
- 	"licenseChanged": "Unsere Lizenzbedingungen haben sich geändert. Bitte klicken Sie [hier]({0}), um die neuen Bedingungen zu lesen.",
- 	"neveragain": "Nicht mehr anzeigen",
- 	"64bitisavailable": "{0} für 64-Bit-Windows ist jetzt verfügbar! Klicken Sie [hier]({1}), um mehr zu erfahren.",
- 	"updateIsReady": "Neues {0}-Update verfügbar.",
-+=======
-+	"licenseChanged": "Unsere Lizenzbedingungen haben sich geändert. Bitte lesen Sie die neuen Bedingungen.",
-+	"license": "Lizenz lesen",
-+	"neveragain": "Nie wieder anzeigen",
-+	"64bitisavailable": "{0} für Windows 64 Bit ist jetzt verfügbar!",
-+	"learn more": "Weitere Informationen",
-+	"updateIsReady": "Neues {0}-Update verfügbar.",
-+	"thereIsUpdateAvailable": "Ein Update ist verfügbar.",
-+	"updateAvailable": "{0} wird nach dem Neustart aktualisiert.",
-+>>>>>>> .their
- 	"noUpdatesAvailable": "Zurzeit sind keine Updates verfügbar.",
- 	"ok": "OK",
- 	"thereIsUpdateAvailable": "Ein Update ist verfügbar.",
-changed in both
-  base   100644 b7eb39e941ebe8231e75695c6a51ff43817ba50b i18n/deu/src/vs/workbench/parts/views/browser/views.i18n.json
-  our    100644 17abacb1d8ce3ce6f8ea3e6f4017346dafd45d34 i18n/deu/src/vs/workbench/parts/views/browser/views.i18n.json
-  their  100644 ce39e3ce42163aef36a63c9fe3d7ff586a0d9342 i18n/deu/src/vs/workbench/parts/views/browser/views.i18n.json
-@@ -5,5 +5,9 @@
- // Do not edit this file. It is machine generated.
- {
- 	"viewToolbarAriaLabel": "{0}-Aktionen",
-+<<<<<<< .our
- 	"hideView": "Auf Randleiste ausblenden"
-+=======
-+	"removeView": "Aus Randleiste entfernen"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 465e716820754a5be3ecd5a1cd58e244453ae77c i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-  our    100644 bbdcf9ec8ce1acc993eb679b46f1fae9f13f6a92 i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-  their  100644 dfd27d2d8c3e3a9440d2033a6c0ba6b4a8243a25 i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-changed in both
-  base   100644 57926d3c88c40420a5098d01c515f4bf7590e405 i18n/deu/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  our    100644 d6a37d8334e4fabea5afba7ea495f6b39d9f466f i18n/deu/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  their  100644 e85c685c957a6e74f5ebd23f5a4289f8ca7379e7 i18n/deu/src/vs/workbench/services/configuration/node/configuration.i18n.json
-@@ -9,6 +9,7 @@
- 	"scope.window.description": "Fensterspezifische Konfiguration, die in den Benutzer- oder Arbeitsbereichseinstellungen konfiguriert werden kann.",
- 	"scope.resource.description": "Ressourcenspezifische Konfiguration, die in den Benutzer-, Arbeitsbereichs- oder Ordnereinstellungen konfiguriert werden kann.",
- 	"scope.description": "Bereich, in dem die Konfiguration gültig ist. Verfügbare Gültigkeitsbereiche sind \"window\" und \"resource\".",
-+<<<<<<< .our
- 	"vscode.extension.contributes.configuration": "Trägt Konfigurationseigenschaften bei.",
- 	"invalid.title": "configuration.title muss eine Zeichenfolge sein.",
- 	"vscode.extension.contributes.defaultConfiguration": "Trägt zu Konfigurationeinstellungen des Standard-Editors für die jeweilige Sprache bei.",
-@@ -21,4 +22,13 @@
- 	"workspaceConfig.settings.description": "Arbeitsbereichseinstellungen",
- 	"workspaceConfig.extensions.description": "Arbeitsbereichserweiterungen",
- 	"unknownWorkspaceProperty": "Unbekannte Arbeitsbereichs-Konfigurationseigenschaft"
-+=======
-+	"invalid.type": "Wenn eine Festlegung erfolgt, muss \"configuration.type\" auf \"object\" festgelegt werden.",
-+	"invalid.title": "configuration.title muss eine Zeichenfolge sein.",
-+	"vscode.extension.contributes.defaultConfiguration": "Trägt zu Konfigurationeinstellungen des Standard-Editors für die jeweilige Sprache bei.",
-+	"invalid.properties": "\"configuration.properties\" muss ein Objekt sein.",
-+	"workspaceConfig.id.description": "Arbeitsbereichsbezeichner. Dient zum Speichern des internen Arbeitsbereichszustands, der verloren gehen oder sich ändern kann.",
-+	"workspaceConfig.folders.description": "Liste von Ordnern, die in den Arbeitsbereich geladen werden. Hierbei muss es sich um einen Dateipfad handeln, z.B. \"file:///root/folderA\".",
-+	"workspaceConfig.settings.description": "Arbeitsbereichseinstellungen"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d1f34002c594f81e426dbe19e270d8f75776b61a i18n/deu/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 6e51d0a62d6cbb327e635cf17096e9a085de524c i18n/deu/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 c23b461e1c21857d9c32788cd6400f44145bd3c3 i18n/deu/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -9,6 +9,7 @@
- 	"openTasksConfiguration": "Aufgabenkonfiguration öffnen",
- 	"openLaunchConfiguration": "Startkonfiguration öffnen",
- 	"open": "Einstellungen öffnen",
-+<<<<<<< .our
- 	"saveAndRetry": "Speichern und wiederholen",
- 	"errorUnknownKey": "In {0} kann nicht geschrieben werden, weil {1} keine registrierte Konfiguration ist.",
- 	"errorInvalidWorkspaceConfigurationApplication": "{0} kann nicht in die Arbeitsbereichseinstellungen geschrieben werden. Diese Einstellung kann nur in den Benutzereinstellungen geschrieben werden.",
-@@ -27,6 +28,19 @@
- 	"errorConfigurationFileDirty": "In die Benutzereinstellungen kann nicht geschrieben werden, weil die Datei geändert wurde. Speichern Sie die Datei mit den Benutzereinstellungen, und versuchen Sie es noch mal.",
- 	"errorConfigurationFileDirtyWorkspace": "In die Arbeitsbereichseinstellungen kann nicht geschrieben werden, weil die Datei geändert wurde. Speichern Sie die Datei mit den Arbeitsbereichseinstellungen, und versuchen Sie es noch mal.",
- 	"errorConfigurationFileDirtyFolder": "In die Ordnereinstellungen kann nicht geschrieben werden, da die Datei geändert wurde. Speichern Sie die Datei mit den Ordnereinstellungen \"{0}\" und versuchen Sie es noch mal.",
-+=======
-+	"close": "Schließen",
-+	"saveAndRetry": "Änderungen Speichern und Wiederholen",
-+	"errorUnknownKey": "In {0} kann nicht geschrieben werden, weil {1} keine registrierte Konfiguration ist.",
-+	"errorInvalidFolderConfiguration": "In die Ordnereinstellungen kann nicht geschrieben werden, weil {0} den Gültigkeitsbereich für Ordnerressourcen nicht unterstützt.",
-+	"errorInvalidUserTarget": "In die Benutzereinstellungen kann nicht geschrieben werden, weil {0} den globalen Gültigkeitsbereich nicht unterstützt.",
-+	"errorInvalidFolderTarget": "In die Ordnereinstellungen kann nicht geschrieben werden, weil keine Ressource angegeben ist.",
-+	"errorNoWorkspaceOpened": "In {0} kann nicht geschrieben werden, weil kein Arbeitsbereich geöffnet ist. Öffnen Sie zuerst einen Arbeitsbereich, und versuchen Sie es noch mal.",
-+	"errorInvalidConfiguration": "In die Einstellungen kann nicht geschrieben werden. Öffnen Sie **Benutzereinstellungen**, um Fehler/Warnungen in der Datei zu korrigieren, und versuchen Sie es noch mal.",
-+	"errorInvalidConfigurationWorkspace": "In die Einstellungen kann nicht geschrieben werden. Öffnen Sie die **Arbeitsbereichseinstellungen**, um Fehler/Warnungen in der Datei zu korrigieren, und versuchen Sie es noch mal.",
-+	"errorConfigurationFileDirty": "In die Einstellungen kann nicht geschrieben werden, weil die Datei geändert wurde. Speichern Sie die Datei **Benutzereinstellungen**, und versuchen Sie es noch mal.",
-+	"errorConfigurationFileDirtyWorkspace": "In die Einstellungen kann nicht geschrieben werden, weil die Datei geändert wurde. Speichern Sie die Datei **Arbeitsbereichseinstellungen**, und versuchen Sie es noch mal.",
-+>>>>>>> .their
- 	"userTarget": "Benutzereinstellungen",
- 	"workspaceTarget": "Arbeitsbereichseinstellungen",
- 	"folderTarget": "Ordnereinstellungen"
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/deu/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-  our    100644 559afa0a3598ba26b6ff414d4264783532a2ef4b i18n/deu/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-  their  100644 789de4230c1123dde2c673ed3b9b5aef28fb1648 i18n/deu/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"errorInvalidFile": "In die Datei kann nicht geschrieben werden. Öffnen Sie die Datei, um Fehler/Warnungen in der Datei zu beheben, und versuchen Sie es noch mal.",
- 	"errorFileDirty": "In die Datei kann nicht geschrieben werden, weil sie geändert wurde. Speichern Sie die Datei, und versuchen Sie es noch mal."
- }
-\ No newline at end of file
-changed in both
-  base   100644 374e2c223edafd7ff2e5baa130b77721ed527ed3 i18n/deu/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 66c124a9d5a7fdc4a4f5dd03bfbddf459d3761cb i18n/deu/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 d1ccabcfb834a7c432f2df7a5d086ddedff01bfc i18n/deu/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-@@ -13,6 +13,7 @@
- 	"noIconThemeDesc": "No file icons",
- 	"iconThemeError": "File icon theme is unknown or not installed.",
- 	"workbenchColors": "Überschreibt Farben aus dem derzeit ausgewählte Farbdesign.",
-+<<<<<<< .our
- 	"editorColors.comments": "Legt die Farben und Stile für Kommentare fest.",
- 	"editorColors.strings": "Legt die Farben und Stile für Zeichenfolgenliterale fest.",
- 	"editorColors.keywords": "Legt die Farben und Stile für Schlüsselwörter fest.",
-@@ -21,5 +22,9 @@
- 	"editorColors.functions": "Legt die Farben und Stile für Funktionsdeklarationen und Verweise fest.",
- 	"editorColors.variables": "Legt die Farben und Stile für Variablendeklarationen und Verweise fest.",
- 	"editorColors.textMateRules": "Legt Farben und Stile mithilfe von Textmate-Designregeln fest (erweitert).",
-+=======
-+	"workbenchColors.deprecated": "Diese Einstellung ist nicht mehr experimentell und wurde in \"workbench.colorCustomizations\" umbenannt.",
-+	"workbenchColors.deprecatedDescription": "Verwenden Sie stattdessen \"workbench.colorCustomizations\".",
-+>>>>>>> .their
- 	"editorColors": "Überschreibt Editorfarben und den Schriftschnitt aus dem momentan ausgewählten Farbdesign."
- }
-\ No newline at end of file
-changed in both
-  base   100644 26c61c87280689d7b1fce369e9b02cabf4fcd5e8 i18n/esn/extensions/emmet/package.i18n.json
-  our    100644 d6c05800c1ebc6febea004f2095561aeefca8479 i18n/esn/extensions/emmet/package.i18n.json
-  their  100644 e6b079e4552936063b7c034d3d0124bd82b41bf6 i18n/esn/extensions/emmet/package.i18n.json
-@@ -31,6 +31,7 @@
- 	"command.incrementNumberByTen": "Aumentar por 10",
- 	"command.decrementNumberByTen": "Disminuir por 10",
- 	"emmetSyntaxProfiles": "Defina el perfil de la sintaxis especificada o use su propio perfil con reglas específicas.",
-+<<<<<<< .our
- 	"emmetExclude": "Una serie de idiomas donde no deben ampliar las abreviaturas de Emmet.",
- 	"emmetExtensionsPath": "Ruta de acceso a una carpeta que contiene los perfiles y fragmentos de Emmet.",
- 	"emmetShowExpandedAbbreviation": "Muestra abreviaciones Emmet expandidas como sugerencias. La opción \"inMarkupAndStylesheetFilesOnly\" se aplica a HTML, HAML, Jade, Slim, XML, XSL, CSS, SCSS, SASS, LESS y Stylus. La opción \"always\" se aplica a todas las partes del archivo, independientemente de que sea de marcado o CSS. ",
-@@ -62,4 +63,12 @@
- 	"emmetPreferencesCssMsProperties": "Propiedades CSS separadas por comas que obtienen el prefijo de proveedor 'ms' cuando se utilizan en la abreviatura Emmet que comienza con '-'. Establecer en la cadena vacía para evitar siempre el prefijo 'ms'.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "La mínima puntuación (de 0 a 1) que se debe alcanzar en la comparación difusa de abreviación. Los valores más bajos pueden producir muchos resultados falsos positivos, los valores más altos pueden reducir posibles coincidencias.",
- 	"emmetOptimizeStylesheetParsing": "Cuando se establece en falso, se analiza el archivo entero para determinar si la posición actual es válida para la expansión de abreviaturas de Emmet. Cuando se establece en verdadero, sólo el contenido alrededor de la posición actual en archivos css, scss/less es analizado."
-+=======
-+	"emmetExclude": "Matriz de lenguajes donde no deben expandirse la abreviación Emmet.",
-+	"emmetExtensionsPath": "Ruta de acceso a una carpeta que contiene perfiles de Emmet, fragmentos de código y preferencias. Solo se respetan los perfiles de la ruta de acceso de extensiones cuando emmet.useNewEmmet se establece en true.",
-+	"emmetShowExpandedAbbreviation": "\nMuestra abreviaciones Emmet expandidas como sugerencias. La opción \"inMarkupAndStylesheetFilesOnly\" se aplica a HTML, HAML, Jade, Slim, XML, XSL, CSS, SCSS, SASS, LESS y Stylus. La opción \"always\" se aplica a todas las partes del archivo, independientemente de que sea de marcado o CSS.",
-+	"emmetShowAbbreviationSuggestions": "Muestra posibles abreviaciones Emmet como sugerencias. No se aplica a hojas de estilos ni cuando emmet.showExpandedAbbreviation está establecido en \"never\".",
-+	"emmetIncludeLanguages": "Habilita abreviaciones Emmet en lenguajes que no se admiten de forma predeterminada. Agregue una asignación aquí entre el lenguaje y el lenguaje que admite Emmet.\n Ejemplo: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
-+	"emmetVariables": "Variables para usar en fragmentos de código Emmet"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 4a97190b0ee3e9125fc7569a86f6f3f1dc174919 i18n/esn/extensions/extension-editing/out/extensionLinter.i18n.json
-  our    100644 be1c632d33ad9a44120a81a730ef70678bc4a96c i18n/esn/extensions/extension-editing/out/extensionLinter.i18n.json
-  their  100644 085b35595029ec7e92ae3029bc0b32368a178a23 i18n/esn/extensions/extension-editing/out/extensionLinter.i18n.json
-changed in both
-  base   100644 3a099ab94418f505508479a910813e43624d2888 i18n/esn/src/vs/code/electron-main/menus.i18n.json
-  our    100644 2173ae65d3ed6bda349c8ed563942ab2c195e7ea i18n/esn/src/vs/code/electron-main/menus.i18n.json
-  their  100644 e01c4644bdeedecccebd4979d97ec38910a24fc9 i18n/esn/src/vs/code/electron-main/menus.i18n.json
-@@ -189,5 +189,11 @@
- 	"miDownloadingUpdate": "Descargando actualización...",
- 	"miInstallUpdate": "Instalar actualización...",
- 	"miInstallingUpdate": "Instalando actualización...",
-+<<<<<<< .our
- 	"miRestartToUpdate": "Reiniciar para actualizar..."
-+=======
-+	"miCheckForUpdates": "Buscar actualizaciones...",
-+	"aboutDetail": "\nVersión: {0}\nConfirmación: {1}\nFecha: {2}\nShell: {3}\nRepresentador: {4}\nNodo {5}\nArquitectura {6}",
-+	"okButton": "Aceptar"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d7f7577857c0178652297dfd4a277fdd2ee0907a i18n/esn/src/vs/editor/contrib/find/common/findController.i18n.json
-  our    100644 27d384a1b6819c1c9684fe1acbb034af8aebf02c i18n/esn/src/vs/editor/contrib/find/common/findController.i18n.json
-  their  100644 2928bececece405849e616b93729fb43121c68aa i18n/esn/src/vs/editor/contrib/find/common/findController.i18n.json
-@@ -10,6 +10,15 @@
- 	"nextSelectionMatchFindAction": "Buscar selección siguiente",
- 	"previousSelectionMatchFindAction": "Buscar selección anterior",
- 	"startReplace": "Reemplazar",
-+<<<<<<< .our
-+=======
-+	"addSelectionToNextFindMatch": "Agregar selección hasta la siguiente coincidencia de búsqueda",
-+	"addSelectionToPreviousFindMatch": "Agregar selección hasta la anterior coincidencia de búsqueda",
-+	"moveSelectionToNextFindMatch": "Mover última selección hasta la siguiente coincidencia de búsqueda",
-+	"moveSelectionToPreviousFindMatch": "Mover última selección hasta la anterior coincidencia de búsqueda",
-+	"selectAllOccurrencesOfFindMatch": "Seleccionar todas las repeticiones de coincidencia de búsqueda",
-+	"changeAll.label": "Cambiar todas las ocurrencias",
-+>>>>>>> .their
- 	"showNextFindTermAction": "Mostrar el siguiente término de búsqueda",
- 	"showPreviousFindTermAction": "Mostrar término de búsqueda anterior"
- }
-\ No newline at end of file
-changed in both
-  base   100644 0c23382bea4e472ec4eef6fd26f69c0e64205165 i18n/esn/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 c48bc5883853a0c6c279c545c6c1c9d024a6241b i18n/esn/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 82353f07117243d5ff5018cf74ba67efb87cfa50 i18n/esn/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -9,6 +9,7 @@
- 	"openFile": "Abrir archivo...",
- 	"openFolder": "Abrir carpeta...",
- 	"openFileFolder": "Abrir...",
-+<<<<<<< .our
- 	"globalRemoveFolderFromWorkspace": "Quitar carpeta del Área de trabajo...",
- 	"saveWorkspaceAsAction": "Guardar área de trabajo como...",
- 	"save": "&&Guardar",
-@@ -16,4 +17,24 @@
- 	"openWorkspaceAction": "Abrir área de trabajo...",
- 	"openWorkspaceConfigFile": "Abrir archivo de configuración del área de trabajo",
- 	"duplicateWorkspaceInNewWindow": "Duplicar el área de trabajo en una ventana nueva"
-+=======
-+	"reload": "&&Recargar",
-+	"cancel": "Cancelar",
-+	"newWorkspaceFormExisting": "Nueva área de trabajo a partir de una existente...",
-+	"select": "&&Seleccionar",
-+	"selectWorkspace": "Seleccionar carpetas para el área de trabajo",
-+	"addSupported": "Para abrir varias carpetas, es necesario recargar la ventana.",
-+	"addFolderToWorkspace": "Agregar carpeta al área de trabajo...",
-+	"add": "&& Agregar",
-+	"addFolderToWorkspaceTitle": "Agregar carpeta al área de trabajo",
-+	"removeFolderFromWorkspace": "Quitar carpeta del área de trabajo",
-+	"saveWorkspaceAsAction": "Guardar área de trabajo como...",
-+	"saveEmptyWorkspaceNotSupported": "Abra un área de trabajo antes de guardar.",
-+	"saveNotSupported": "Para guardar el área de trabajo, es necesario recargar la ventana.",
-+	"save": "&&Guardar",
-+	"saveWorkspace": "Guardar área de trabajo",
-+	"openWorkspaceAction": "Abrir área de trabajo...",
-+	"newWorkspace": "Nueva área de trabajo...",
-+	"openWorkspaceConfigFile": "Abrir archivo de configuración del área de trabajo"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f155f261fa1391fc6f10c6cdbe008fdb675c82b9 i18n/esn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 e35e95658e0757a0dd58a01697234694ea4f0954 i18n/esn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 e50bfab447c66d6063a1c89dcb964f82c7be01b3 i18n/esn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 8791cdb4ffb50cec595a210f8de07468bf4c70de i18n/esn/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-  our    100644 9813cd2ca327085170a56ccd1ad7fd899ea9a685 i18n/esn/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-  their  100644 19146d91eec52d3afe8e2f36d367b74d58efb78d i18n/esn/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,9 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"compositePart.hideSideBarLabel": "Ocultar barra lateral",
-+>>>>>>> .their
- 	"focusSideBar": "Enfocar la barra lateral",
- 	"viewCategory": "Ver"
- }
-\ No newline at end of file
-changed in both
-  base   100644 42525c6192bd52a670d1aeadc597582517a5feab i18n/esn/src/vs/workbench/common/theme.i18n.json
-  our    100644 a12ae1a7d50911472b1c450409ccd4fd8e4aba33 i18n/esn/src/vs/workbench/common/theme.i18n.json
-  their  100644 91c8514a3170a03730f25880c6fe49c2d00b35d5 i18n/esn/src/vs/workbench/common/theme.i18n.json
-@@ -61,6 +61,7 @@
- 	"titleBarActiveBackground": "Fondo de la barra de título cuando la ventana está activa. Tenga en cuenta que, actualmente, este color solo se admite en macOS.",
- 	"titleBarInactiveBackground": "Color de fondo de la barra de título cuando la ventana está inactiva. Tenga en cuenta que, actualmente, este color solo se admite en macOS.",
- 	"titleBarBorder": "Color de borde de la barra de título. Tenga en cuenta que, actualmente, este color se admite solo en macOS.",
-+<<<<<<< .our
- 	"notificationCenterBorder": "Color del borde del centro de notificaciones. Las notificaciones se deslizan desde la parte inferior derecha de la ventana.",
- 	"notificationToastBorder": "Color del borde de las notificaciones del sistema. Las notificaciones se deslizan desde la parte inferior derecha de la ventana.",
- 	"notificationsForeground": "Color de primer plano de las notificaciones. Las notificaciones se deslizan desde la parte inferior derecha de la ventana.",
-@@ -69,4 +70,17 @@
- 	"notificationCenterHeaderForeground": "Color de primer plano del encabezado del centro de notificaciones. Las notificaciones se deslizan desde la parte inferior derecha de la ventana.",
- 	"notificationCenterHeaderBackground": "Color de fondo del encabezado del centro de notificaciones. Las notificaciones se deslizan desde la parte inferior derecha de la ventana.",
- 	"notificationsBorder": "Color de borde que separa las notificaciones en el centro de notificaciones. Las notificaciones se deslizan desde la parte inferior derecha de la ventana."
-+=======
-+	"notificationsForeground": "Color de primer plano de las notificaciones. Estas se deslizan en la parte superior de la ventana. ",
-+	"notificationsBackground": "Color de fondo de las notificaciones. Estas se deslizan en la parte superior de la ventana. ",
-+	"notificationsButtonBackground": "Color de fondo del botón de notificaciones. Estas se deslizan en la parte superior de la ventana.",
-+	"notificationsButtonHoverBackground": "Color de fondo del botón de notificaciones al desplazar el ratón sobre él. Estas se deslizan en la parte superior de la ventana.",
-+	"notificationsButtonForeground": "Color de primer plano del botón de notificaciones. Estas se deslizan en la parte superior de la ventana.",
-+	"notificationsInfoBackground": "Color de fondo de la información de notificaciones. Estas se deslizan en la parte superior de la ventana.",
-+	"notificationsInfoForeground": "Color de primer plano de la información de notificaciones. Estas se deslizan en la parte superior de la ventana.",
-+	"notificationsWarningBackground": "Color de fondo del aviso de notificaciones. Estas se deslizan en la parte superior de la ventana.",
-+	"notificationsWarningForeground": "Color de primer plano del aviso de notificaciones. Estas se deslizan en la parte superior de la ventana.",
-+	"notificationsErrorBackground": "Color de fondo del error de notificaciones. Estas se deslizan en la parte superior de la ventana.",
-+	"notificationsErrorForeground": "Color de primer plano del error de notificaciones. Estas se deslizan en la parte superior de la ventana."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d8ddeb3fcda4008a6898b1b170368d03aab35f5b i18n/esn/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 89fe344b57b1d619a163cac9c32cff2261374fbd i18n/esn/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 dfb23a5b69a6f8f1e565b1321020eec7aac2b79d i18n/esn/src/vs/workbench/electron-browser/actions.i18n.json
-changed in both
-  base   100644 dc8d19d2e3a3558f89911ae9264afd9ed19dd979 i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 57d447a0a0b664b859bc321a1781f6980e63b0fd i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 485778c1c8caff53f27f07f38f5ad84cd95783ab i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,6 +35,7 @@
- 	"panelDefaultLocation": "Controla la ubicación predeterminada del panel. Puede mostrarse en la parte inferior o a la derecha de la mesa de banco.",
- 	"statusBarVisibility": "Controla la visibilidad de la barra de estado en la parte inferior del área de trabajo.",
- 	"activityBarVisibility": "Controla la visibilidad de la barra de actividades en el área de trabajo.",
-+<<<<<<< .our
- 	"viewVisibility": "Controla la visibilidad de las acciones en el encabezado de la vista. Las acciones en el encabezado de la vista pueden ser siempre visibles, o solo cuando la vista es enfocada o apuntada.",
- 	"fontAliasing": "Controla el método de suavizado de fuentes en la mesa de trabajo.\n-por defecto: subpíxel suavizado de fuentes. En la mayoría las pantallas retina no dará el texto más agudo - alisado: suavizar la fuente a nivel del píxel, a diferencia de los subpíxeles. Puede hacer que la fuente aparezca más general - ninguno: desactiva el suavizado de fuentes. Texto se mostrará con dentados filos - auto: se aplica el 'default' o 'antialiasing' automáticamente en función de la DPI de la muestra.",
- 	"workbench.fontAliasing.default": "Suavizado de fuentes en subpíxeles. En la mayoría de las pantallas que no son Retina, esta opción muestra el texto más nítido.",
-@@ -43,6 +44,15 @@
- 	"workbench.fontAliasing.auto": "Aplica ' default ' o ' antialiased ' automáticamente basándose en la DPI de las pantallas.",
- 	"enableNaturalLanguageSettingsSearch": "Controla si habilita el modo de búsqueda de lenguaje natural para la configuración.",
- 	"windowConfigurationTitle": "Ventana",
-+=======
-+	"closeOnFileDelete": "Controla si los editores que muestran un archivo deben cerrarse automáticamente cuando otro proceso elimina el archivo o le cambia el nombre. Si se deshabilita esta opción y se da alguna de estas circunstancias, se mantiene el editor abierto con modificaciones. Tenga en cuenta que, cuando se eliminan archivos desde la aplicación, siempre se cierra el editor y que los archivos con modificaciones no se cierran nunca para preservar los datos.",
-+	"fontAliasing": "Controla el método de suavizado de fuentes en el área de trabajo.\n- default: suavizado de fuentes en subpíxeles. En la mayoría de las pantallas que no son Retina, esta opción muestra el texto más nítido.\n- antialiased: suaviza las fuentes en píxeles, en lugar de subpíxeles. Puede hacer que las fuentes se vean más claras en general\n- none: deshabilita el suavizado de fuentes. El texto se muestra con bordes nítidos irregulares.",
-+	"workbench.fontAliasing.default": "Suavizado de fuentes en subpíxeles. En la mayoría de las pantallas que no son Retina, esta opción muestra el texto más nítido.",
-+	"workbench.fontAliasing.antialiased": "Suaviza las fuentes en píxeles, en lugar de subpíxeles. Puede hacer que las fuentes se vean más claras en general.",
-+	"workbench.fontAliasing.none": "Deshabilita el suavizado de fuentes. El texto se muestra con bordes nítidos irregulares.",
-+	"swipeToNavigate": "Navegar entre achivos abiertos utlizando la pulsación de tres dedos para deslizar horizontalmante.",
-+	"workbenchConfigurationTitle": "Área de trabajo",
-+>>>>>>> .their
- 	"window.openFilesInNewWindow.on": "Los archivos se abrirán en una nueva ventana",
- 	"window.openFilesInNewWindow.off": "Los archivos se abrirán en la ventana con la carpeta de archivos abierta o en la última ventana activa",
- 	"window.openFilesInNewWindow.defaultMac": "Los archivos se abrirán en la ventana con la carpeta de archivos abierta o en la última ventana activa, a menos que se abran con Dock o desde Finder.",
-changed in both
-  base   100644 ff93659c0b4766c04545fce5164d554d2b143b93 i18n/esn/src/vs/workbench/electron-browser/window.i18n.json
-  our    100644 e8aa1b0f0ade64091e67095c753c265dcab4edbb i18n/esn/src/vs/workbench/electron-browser/window.i18n.json
-  their  100644 47643628637498cac1e76328c70ca1a8b545f393 i18n/esn/src/vs/workbench/electron-browser/window.i18n.json
-@@ -12,5 +12,10 @@
- 	"copy": "Copiar",
- 	"paste": "Pegar",
- 	"selectAll": "Seleccionar todo",
-+<<<<<<< .our
- 	"runningAsRoot": "No se recomienda ejecutar {0} como usuario root."
-+=======
-+	"confirmOpen": "¿Está seguro que desea abrir {0} áreas de trabajo?",
-+	"confirmOpenButton": "&&Abrir..."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 83815d8f8b2f3e84d7b20a90ff058f6b2e810256 i18n/esn/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  our    100644 f7ca04589cbd9f14b8ad81f3eeeb2d31b025f0be i18n/esn/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  their  100644 a4c0a9b282fb25e21203f52f11914ee0318ed94d i18n/esn/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-changed in both
-  base   100644 ff677b59a60d7db60f598e857c6a74b0719443ab i18n/esn/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  our    100644 decfe5f17ec5766164dc8ed0fd546cc20aa4c84f i18n/esn/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  their  100644 ca947a2308c7eedaea302f64c067730e233ded47 i18n/esn/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-merged
-  result 100644 6ade7c35b51e8b6dfa206838bc9b3fe8fa237170 i18n/esn/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-  our    100644 fd22c3cec4d1ebf0114832174b7c0e40c876e5d1 i18n/esn/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-@@ -7,8 +7,5 @@
- 	"emmetConfigurationTitle": "Emmet",
- 	"triggerExpansionOnTab": "Cuando se habilita, se expanden las abreviaciones Emmet al presionar la tecla TAB. No disponible cuando emmet.useNewemmet se establece en true.",
- 	"emmetPreferences": "Preferencias usadas para modificar el comportamiento de algunas acciones y resoluciones de Emmet. No aplicable cuando emmet.useNewemmet se establece en true.",
--	"emmetSyntaxProfiles": "Defina el perfil de la sintaxis especificada o use su propio perfil con reglas específicas.",
--	"emmetExclude": "Matriz de lenguajes donde no deben expandirse la abreviación Emmet.",
--	"emmetExtensionsPath": "Ruta de acceso a una carpeta que contiene perfiles de Emmet, fragmentos de código y preferencias. Solo se respetan los perfiles de la ruta de acceso de extensiones cuando emmet.useNewEmmet se establece en true.",
- 	"useNewEmmet": "Pruebe los nuevos módulos de Emmet (que finalmente sustituirán a la biblioteca anterior de Emmet) para conocer todas las características de Emmet."
- }
-\ No newline at end of file
-changed in both
-  base   100644 5e236865193d6269c830c1a492ada0d2c55fd245 i18n/esn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 695af76fadee1019c3d4b030faef94140cf218ba i18n/esn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 bd0211073b2c71445f471109e99a21cc28caeb45 i18n/esn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-changed in both
-  base   100644 a58136aa89fa9fe4bdc337f806e71cf429d06cdf i18n/esn/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
-  our    100644 5b4f1d9a867259ee397b0ce30c196d0e0e92f66c i18n/esn/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
-  their  100644 9b4c0a6fb4586073b2c3708789a8064149beaef7 i18n/esn/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
-@@ -4,7 +4,11 @@
-  *--------------------------------------------------------------------------------------------*/
- // Do not edit this file. It is machine generated.
- {
-+<<<<<<< .our
- 	"filesCategory": "Archivo",
-+=======
-+	"filesCategory": "Archivos",
-+>>>>>>> .their
- 	"revealInSideBar": "Mostrar en barra lateral",
- 	"acceptLocalChanges": "Usar los cambios y sobrescribir el contenido del disco",
- 	"revertLocalChanges": "Descartar los cambios y volver al contenido del disco"
-changed in both
-  base   100644 c3a2ac37c7e7f92dcb2868d9b1e108d1eb0e8e68 i18n/esn/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  our    100644 6ceeb1cae46a37cb52e1e026c2b248e26e834bff i18n/esn/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  their  100644 76c6e86ac47f16ccf50bdbfe198034cf268d15a4 i18n/esn/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-@@ -69,7 +69,11 @@
- 	"invalidFileNameError": "El nombre **{0}** no es válido para el archivo o la carpeta. Elija un nombre diferente.",
- 	"filePathTooLongError": "El nombre **{0}** da como resultado una ruta de acceso demasiado larga. Elija un nombre más corto.",
- 	"compareWithSaved": "Comparar el archivo activo con el guardado",
-+<<<<<<< .our
- 	"modifiedLabel": "{0} (en disco) ↔ {1}",
- 	"compareWithClipboard": "Comparar archivo activo con portapapeles",
- 	"clipboardComparisonLabel": "Portapapeles ↔ {0}"
-+=======
-+	"modifiedLabel": "{0} (en disco) ↔ {1}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ad4eeb2b73109bd8f3b7286dde5456825e4d5e75 i18n/esn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 6b7926d2bf7039c9fedbd3b89b2c9e98ee891b0d i18n/esn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 15a2ead2aebb303944fab5393b1f3aaabd5cc681 i18n/esn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-@@ -40,6 +40,7 @@
- 	"dynamicHeight": "Controla si la altura de la sección de editores abiertos debería adaptarse o no de forma dinámica al número de elementos.",
- 	"autoReveal": "Controla si el explorador debe mostrar y seleccionar automáticamente los archivos al abrirlos.",
- 	"enableDragAndDrop": "Controla si el explorador debe permitir mover archivos y carpetas mediante la función arrastrar y colocar.",
-+<<<<<<< .our
- 	"confirmDragAndDrop": "Controla si el explorador debe pedir la confirmación al reubicar archivos o carpetas a través de arrastrar y soltar.",
- 	"confirmDelete": "Controla si el explorador debe pedir la confirmación al borrar un archivo utilizando la papelera.",
- 	"sortOrder.default": "Los archivos y las carpetas se ordenan por nombre alfabéticamente. Las carpetas se muestran antes que los archivos.",
-@@ -50,4 +51,12 @@
- 	"sortOrder": "Controla el criterio de ordenación de los archivos y las carpetas en el explorador. Además del orden \"default\", puede establecer el orden en \"mixed\" (los archivos y las carpetas se ordenan combinados), \"type\" (por tipo de archivo), \"modified\" (por fecha de última modificación) o \"filesFirst\" (los archivos se colocan antes que las carpetas).",
- 	"explorer.decorations.colors": "Controla si las decoraciones de archivo deben utilizar colores. ",
- 	"explorer.decorations.badges": "Controla si las decoraciones de archivo deben utilizar insignias"
-+=======
-+	"sortOrder.default": "Los archivos y directorios se ordenan por nombre, en orden alfabético. Los directorios se muestran antes que los archivos.",
-+	"sortOrder.mixed": "Los archivos y directorios se ordenan por nombre, en orden alfabético. Los archivos se muestran intercalados con los directorios.",
-+	"sortOrder.filesFirst": "Los archivos y directorios se ordenan por nombre, en orden alfabético. Los archivos se muestran antes que los directorios.",
-+	"sortOrder.type": "Los archivos y directorios se ordenan por extensión, en orden alfabético. Los directorios se muestran antes que los archivos.",
-+	"sortOrder.modified": "Los archivos y directorios se ordenan por fecha de última modificación, en orden descendente. Los directorios se muestran antes que los archivos.",
-+	"sortOrder": "Controla el modo en el que se ordenan los archivos y directorios en el explorador."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e5705ac4c784df8a3dd4454a29534038053107b9 i18n/esn/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-  our    100644 186f5cdaa427312a38cea816fd6aefcbf2dffeee i18n/esn/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-  their  100644 7e727b161ff1eb8f3ab2e2b905d4aff2118aa3e3 i18n/esn/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-@@ -12,5 +12,6 @@
- 	"genericSaveError": "No se pudo guardar '{0}': {1}",
- 	"staleSaveError": "No se pudo guardar '{0}': El contenido del disco es más reciente. Haga clic en **Comparar** para comparar su versión con la que hay en el disco.",
- 	"compareChanges": "Comparar",
--	"saveConflictDiffLabel": "0} (on disk) ↔ {1} (in {2}) - Resolver conflicto guardado"
-+	"saveConflictDiffLabel": "0} (on disk) ↔ {1} (in {2}) - Resolver conflicto guardado",
-+	"userGuide": "Use las acciones de la barra de herramientas del editor situada a la derecha para **deshacer** los cambios o **sobrescribir** el contenido del disco con sus cambios"
- }
-\ No newline at end of file
-changed in both
-  base   100644 3131805763058e54cd505f1dfa6f6373733eb214 i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  our    100644 43c2c3d02aa907b50655fd06c6120b273adc682c i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  their  100644 2bfe512b1d5f7114a6089c8c0d2e780c716e182e i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-@@ -14,6 +14,10 @@
- 	"openGlobalKeybindingsFile": "Abrir el archivo de métodos abreviados de teclado",
- 	"openWorkspaceSettings": "Abrir configuración del área de trabajo",
- 	"openFolderSettings": "Abrir Configuración de carpeta",
-+<<<<<<< .our
-+=======
-+	"pickFolder": "Seleccionar carpeta",
-+>>>>>>> .their
- 	"configureLanguageBasedSettings": "Configurar opciones específicas del lenguaje...",
- 	"languageDescriptionConfigured": "({0})",
- 	"pickLanguage": "Seleccionar lenguaje"
-changed in both
-  base   100644 e2e21899134365fe2ad5fb6d9d2b15403a841e26 i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 98610852f746563a7652418cfa26304844d182c0 i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 ed5419507d3d191c1c9ca806689cff34303bfbd9 i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -14,4 +15,19 @@
- 	"editTtile": "Editar",
- 	"replaceDefaultValue": "Reemplazar en Configuración",
- 	"copyDefaultValue": "Copiar en Configuración"
-+=======
-+	"emptyUserSettingsHeader": "Coloque aquí su configuración para sobrescribir la configuración predeterminada.",
-+	"errorInvalidConfiguration": "No se puede escribir la configuración. Corrija los errores o advertencias del archivo y vuelva a intentarlo.",
-+	"emptyWorkspaceSettingsHeader": "Coloque aquí su configuración para sobrescribir la configuración de usuario.",
-+	"emptyFolderSettingsHeader": "Coloque aquí su configuración de carpeta para sobrescribir la que se especifica en la configuración de área de trabajo.",
-+	"defaultFolderSettingsTitle": "Configuración de carpeta predeterminada",
-+	"defaultSettingsTitle": "Configuración predeterminada",
-+	"noSettingsFound": "No se encontró ninguna configuración.",
-+	"editTtile": "Editar",
-+	"replaceDefaultValue": "Reemplazar en Configuración",
-+	"copyDefaultValue": "Copiar en Configuración",
-+	"unsupportedPHPExecutablePathSetting": "Este valor debe estar en la configuración de usuario. Si quiere configurar PHP para el área de trabajo, abra un archivo PHP y haga clic en \"Ruta de acceso PHP\" en la barra de estado.",
-+	"unsupportedWorkspaceSetting": "Este valor debe estar en Configuración de usuario.",
-+	"unsupportedWorkbenchSetting": "Esta configuración no se puede aplicar ahora. Se aplicará al abrir esta carpeta directamente."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7edb56fa42098e55e6a6f364aec11428f54c03e4 i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-  our    100644 15749e4075a6560e7e5d76cae3f4a75f319357f2 i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-  their  100644 d53ba6ae07b45a6139c2289ab72764b70b262f5d i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 ab7d78224458e031f0d5873434caefe0111f3854 i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 2126bfe2fb90bed14f7effb7b34dc1e77b479150 i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -12,4 +13,13 @@
- 	"userSettings": "Configuración de usuario",
- 	"workspaceSettings": "Configuración de área de trabajo",
- 	"folderSettings": "Configuración de Carpeta"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"folderSettingsDetails": "Configuración de carpeta"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 498d20e2ecd409c37697c1f73ccb9a17375ca27f i18n/esn/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  our    100644 2b0101fb6caa5f4582f9e7ff75c9409382316a8d i18n/esn/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  their  100644 a447e55f2de302180642e53747ded56fcaefea36 i18n/esn/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-@@ -8,5 +8,11 @@
- 	],
- 	"relaunchSettingMessage": "Ha cambiado un ajuste que requiere un reinicio para ser efectivo.",
- 	"relaunchSettingDetail": "Pulse el botón de reinicio para reiniciar {0} y habilitar el ajuste.",
-+<<<<<<< .our
- 	"restart": "&& Reiniciar"
-+=======
-+	"restart": "Reiniciar",
-+	"relaunchWorkspaceMessage": "Este cambio de área de trabajo requiere recargar nuestro sistema de extensiones.",
-+	"reload": "Recargar"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 676bea02e78d083517bc3e3be014a2ae3914622f i18n/esn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 08f95963fe8efaa9640a8368bea5bd91b3e1ccb0 i18n/esn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 314acd5b6dd01653d85d184675bd60ee1c6e5f58 i18n/esn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"nextSearchIncludePattern": "Mostrar siguiente búsqueda de patrón include",
- 	"previousSearchIncludePattern": "Mostrar búsqueda anterior de patrón include ",
- 	"nextSearchExcludePattern": "Mostrar siguiente búsqueda de patrón exclude ",
-@@ -16,6 +19,8 @@
- 	"previousReplaceTerm": "Mostrar la búsqueda anterior de Reemplazar término",
- 	"findInFiles": "Buscar en archivos",
- 	"replaceInFiles": "Reemplazar en archivos",
-+	"findInWorkspace": "Buscar en área de trabajo...",
-+	"findInFolder": "Buscar en carpeta...",
- 	"RefreshAction.label": "Actualizar",
- 	"CollapseDeepestExpandedLevelAction.label": "Contraer todo",
- 	"ClearSearchResultsAction.label": "Borrar",
-changed in both
-  base   100644 06b841c9cab76dfb15bb1868d131a72575db207d i18n/esn/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-  our    100644 819a6285c14c28c67f847aba7f0a36adfece768a i18n/esn/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-  their  100644 97148bc69de0f7099b7713b972f9e9d6e3c2e7bf i18n/esn/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"searchFolderMatch.other.label": "Otros archivos",
- 	"searchFileMatches": "{0} archivos encontrados",
- 	"searchFileMatch": "{0} archivo encontrado",
-changed in both
-  base   100644 9dce8d0622c4f8b3f231d0d4914664ccae36abd9 i18n/esn/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  our    100644 0c3d29ae593df25c19d137f3045954d907ba1dc7 i18n/esn/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  their  100644 82a227721a70cccce9ab5c3bc0da44f4bebdd27f i18n/esn/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-changed in both
-  base   100644 021fb81ebaa63f8be286150fa3b2de457da9ed54 i18n/esn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 7367d0a39f1701be221d6ff3d3d8cae3add9845a i18n/esn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 1925eae4febe76bb87b66f4ac0ab55c604c188b5 i18n/esn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-changed in both
-  base   100644 048794026a3772346ae3bf1fd0509b98db8cb5c4 i18n/esn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 cf1ca0ef5c2b17265b6eb266a58dc6112305ccf4 i18n/esn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 feed01daffa5ff60cd67fde09dd5d6737207968e i18n/esn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -12,8 +12,12 @@
- 	"totalWarnings": "{0} advertencias",
- 	"totalInfos": "{0} informaciones",
- 	"problems": "Problemas",
-+<<<<<<< .our
- 	"building": "Compilando...",
- 	"manyProblems": "+10Mil",
-+=======
-+	"manyMarkers": "Más de 99",
-+>>>>>>> .their
- 	"runningTasks": "Mostrar tareas en ejecución",
- 	"tasks": "Tareas",
- 	"TaskSystem.noHotSwap": "Cambiar el motor de ejecución de tareas con una tarea activa ejecutandose, requiere recargar la ventana",
-@@ -24,17 +28,25 @@
- 	"TaskService.noTestTask1": "No se ha definido ninguna tarea de prueba. Marque una tarea con \"isTestCommand\" en el archivo tasks.json.",
- 	"TaskService.noTestTask2": "No se ha definido ninguna tarea de prueba. Marque una tarea con \"test\" en el archivo tasks.json.",
- 	"TaskServer.noTask": "No se encuentra la tarea {0} que se ha solicitado para ejecutarla.",
-+<<<<<<< .our
- 	"TaskService.associate": "asociar",
-+=======
-+>>>>>>> .their
- 	"TaskService.attachProblemMatcher.continueWithout": "Continuar sin examinar la salida de la tarea",
- 	"TaskService.attachProblemMatcher.never": "No examinar nunca la salida de la tarea",
- 	"TaskService.attachProblemMatcher.learnMoreAbout": "Más información acerca del examen de la salida de la tarea",
- 	"selectProblemMatcher": "Seleccione qué tipo de errores y advertencias deben buscarse durante el examen de la salida de la tarea",
- 	"customizeParseErrors": "La configuración actual de tareas contiene errores. Antes de personalizar una tarea, corrija los errores.",
- 	"moreThanOneBuildTask": "Hay muchas tareas de compilación definidas en el archivo tasks.json. Se ejecutará la primera.\n",
-+<<<<<<< .our
- 	"TaskSystem.activeSame.background": "La tarea \"{0}\" ya está activa en segundo plano.",
- 	"TaskSystem.activeSame.noBackground": "La tarea \"{0}\" ya está activa.",
- 	"terminateTask": "Finalizar tarea",
- 	"restartTask": "Reiniciar tarea",
-+=======
-+	"TaskSystem.activeSame.background": "La tarea \"{0}\" ya está activa en segundo plano. Para terminarla, use la opción \"Terminar tarea\" del menú Tareas.",
-+	"TaskSystem.activeSame.noBackground": "La tarea \"{0}\" ya está activa. Para terminarla, use la opción \"Terminar tarea\" del menú Tareas.",
-+>>>>>>> .their
- 	"TaskSystem.active": "Ya hay una tarea en ejecución. Finalícela antes de ejecutar otra tarea.",
- 	"TaskSystem.restartFailed": "No se pudo terminar y reiniciar la tarea {0}",
- 	"TaskService.noConfiguration": "Error: La detección de tarea {0} no encontró una tarea para la siguiente configuración:\n{1}\nLa tarea será omitida.\n",
-@@ -75,8 +87,13 @@
- 	"TaskService.pickDefaultBuildTask": "Seleccione la tarea que se va a utilizar como tarea de compilación predeterminada",
- 	"TaskService.defaultTestTaskExists": "{0} ya se ha marcado como la tarea de prueba predeterminada.",
- 	"TaskService.pickDefaultTestTask": "Seleccione la tarea que se va a usar como la tarea de prueba predeterminada ",
-+<<<<<<< .our
- 	"TaskService.pickShowTask": "Seleccione la tarea de la que desea ver la salida",
- 	"TaskService.noTaskIsRunning": "Ninguna tarea se está ejecutando",
-+=======
-+	"TaskService.noTaskIsRunning": "No hay ninguna tarea en ejecución.",
-+	"TaskService.pickShowTask": "Seleccione la tarea de la que desea ver la salida",
-+>>>>>>> .their
- 	"ShowLogAction.label": "Mostrar registro de tareas",
- 	"RunTaskAction.label": "Ejecutar tarea",
- 	"RestartTaskAction.label": "Reiniciar la tarea en ejecución",
-changed in both
-  base   100644 bb2599901cac4e42180e7997e766b6638e50839d i18n/esn/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  our    100644 c53edb70544eaeed1ed345fd659e584b8c452a64 i18n/esn/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  their  100644 40bf1ce95646af6d20160a59a1bcbfb317a41674 i18n/esn/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/esn/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  our    100644 2dd035c28fdef3fa3b55cd25845e4c542bfe6d90 i18n/esn/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  their  100644 1766210bb77087405636a26d61f7abe0bbe32374 i18n/esn/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,6 +10,15 @@
- 	"termEntryAriaLabel": "{0}, selector de terminal",
- 	"termCreateEntryAriaLabel": "{0}, crear nueva terminal",
- 	"workbench.action.terminal.newplus": "$(plus) Crear nueva terminal integrada",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"entryAriaLabel": "{0}, selector de terminal",
-+>>>>>>> .their
- 	"noTerminalsMatching": "No hay terminales coincidentes",
- 	"noTerminalsFound": "No hay terminales abiertos"
- }
-\ No newline at end of file
-changed in both
-  base   100644 120d6ffbb3d47f4a6ed247915573e0be5f1f0f5f i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 638d95e07783cab2681275875d22dd4b5bb236b5 i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 80e11f38691b0c24e4ddfef0a1c6009ff7d95154 i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,9 @@
- 	],
- 	"quickOpen.terminal": "Mostrar todos los terminales abiertos",
- 	"terminal": "Terminal",
-+=======
-+	"quickOpen.terminal": "Mostrar todos los terminales abiertos",
-+>>>>>>> .their
- 	"terminalIntegratedConfigurationTitle": "Terminal integrado",
- 	"terminal.integrated.shell.linux": "La ruta de acceso del shell que el terminal usa en Linux.",
- 	"terminal.integrated.shellArgs.linux": "Los argumentos de la línea de comandos que se usarán en el terminal de Linux.",
-@@ -36,8 +40,12 @@
- 	"terminal.integrated.env.osx": "Objeto con variables de entorno que se agregarán al proceso de VS Code para que las use el terminal en OS X",
- 	"terminal.integrated.env.linux": "Objeto con variables de entorno que se agregarán al proceso de VS Code para que las use el terminal en Linux",
- 	"terminal.integrated.env.windows": "Objeto con variables de entorno que se agregarán al proceso de VS Code para que las use el terminal en Windows",
-+<<<<<<< .our
- 	"terminal.integrated.showExitAlert": "Mostrar alerta 'El proceso de terminal terminó con el código de salida ' cuando el código de salida no es cero.",
- 	"terminal.integrated.experimentalRestore": "Indica si se restauran automáticamente las sesiones del terminal para el área de trabajo cuando se inicia VS Code. Esta es una opción experimental; puede tener errores y podría cambiar en el futuro.",
-+=======
-+	"terminal": "Terminal",
-+>>>>>>> .their
- 	"terminalCategory": "Terminal",
- 	"viewCategory": "Ver"
- }
-\ No newline at end of file
-changed in both
-  base   100644 a2abb93e39c68f700660af87e1667369bbe5da46 i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 21fcf5a4e9d2653bdf22cd882d1fa612baf507de i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 d4285e26c3012004b7d9a7988765a55b26e2900d i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -14,8 +14,11 @@
- 	"workbench.action.terminal.selectAll": "Seleccionar todo",
- 	"workbench.action.terminal.deleteWordLeft": "Eliminar una palabra a la izquierda",
- 	"workbench.action.terminal.deleteWordRight": "Eliminar una palabra a la derecha",
-+<<<<<<< .our
- 	"workbench.action.terminal.moveToLineStart": "Mover al principio de la línea",
- 	"workbench.action.terminal.moveToLineEnd": "Mover al final de la línea",
-+=======
-+>>>>>>> .their
- 	"workbench.action.terminal.new": "Crear nuevo terminal integrado",
- 	"workbench.action.terminal.new.short": "Nuevo terminal",
- 	"workbench.action.terminal.newWorkspacePlaceholder": "Seleccione el directorio de trabajo actual para el nuevo terminal",
-@@ -51,6 +54,7 @@
- 	"workbench.action.terminal.rename.prompt": "Introducir nombre del terminal",
- 	"workbench.action.terminal.focusFindWidget": "Foco Encontrar Widget",
- 	"workbench.action.terminal.hideFindWidget": "Ocultar Encontrar Widget",
-+<<<<<<< .our
- 	"nextTerminalFindTerm": "Mostrar siguiente término de búsqueda",
- 	"previousTerminalFindTerm": "Mostrar término de búsqueda anterior",
- 	"quickOpenTerm": "Cambiar terminal activo",
-@@ -60,4 +64,7 @@
- 	"workbench.action.terminal.selectToNextCommand": "Seleccionar hasta el comando siguiente",
- 	"workbench.action.terminal.selectToPreviousLine": "Seleccione la línea anterior",
- 	"workbench.action.terminal.selectToNextLine": "Seleccione la línea siguiente"
-+=======
-+	"quickOpenTerm": "Cambiar terminal activo"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d371b1e3d8c96d8eb60031f4700465a659baa5b8 i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 452c57e69431420c6bcfb59a898fee8e18810b50 i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 091847a7181701ffc388f16eccb9ff2543d27599 i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -10,7 +10,11 @@
- 	"terminal.foreground": "El color de primer plano del terminal.",
- 	"terminalCursor.foreground": "Color de primer plano del cursor del terminal.",
- 	"terminalCursor.background": "Color de fondo del cursor del terminal. Permite personalizar el color de un carácter solapado por un cursor de bloque.",
-+<<<<<<< .our
- 	"terminal.selectionBackground": "Color de fondo de selección del terminal.",
- 	"terminal.border": "Color del borde que separa paneles divididos en el terminal. El valor predeterminado es panel.border.",
- 	"terminal.ansiColor": "color ANSI ' {0} ' en el terminal."
-+=======
-+	"terminal.ansiColor": "Color ANSI \"{0}\" en el terminal."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e99da0524bcac96e49becfa9544ec4105a096a07 i18n/esn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 2d994e363264374d23ba6185653395b42a1471ce i18n/esn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 788665ef84b9513d4270d37b09250c937643db65 i18n/esn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -11,10 +11,16 @@
- 	"read the release notes": "{0} v{1}. ¿Quiere leer las notas de la versión?",
- 	"licenseChanged": "Los términos de licencia han cambiado. Haga clic [aquí]({0}) para revisarlos.",
- 	"neveragain": "No volver a mostrar",
-+<<<<<<< .our
- 	"64bitisavailable": "Ya está disponible {0} para Windows de 64 bits. Haga clic [aquí]({1}) para obtener más información.",
- 	"updateIsReady": "Nueva actualización de {0} disponible.",
- 	"noUpdatesAvailable": "Actualmente, no hay actualizaciones disponibles.",
- 	"ok": "Aceptar",
-+=======
-+	"64bitisavailable": "Ya está disponible {0} para Windows de 64 bits.",
-+	"learn more": "Más información",
-+	"updateIsReady": "Nueva actualización de {0} disponible.",
-+>>>>>>> .their
- 	"thereIsUpdateAvailable": "Hay una actualización disponible.",
- 	"download now": "Descargar ahora",
- 	"later": "Más tarde",
-changed in both
-  base   100644 62933f6b509ea5c06df3601765df92605ec2f36d i18n/esn/src/vs/workbench/parts/views/browser/views.i18n.json
-  our    100644 f2487840d9765d6e1cd172f1e43b1dad5a12f21c i18n/esn/src/vs/workbench/parts/views/browser/views.i18n.json
-  their  100644 de9004ff778b5b22c7873eb60af275d113128263 i18n/esn/src/vs/workbench/parts/views/browser/views.i18n.json
-@@ -5,5 +5,9 @@
- // Do not edit this file. It is machine generated.
- {
- 	"viewToolbarAriaLabel": "{0} acciones",
-+<<<<<<< .our
- 	"hideView": "Ocultar en la barra lateral"
-+=======
-+	"removeView": "Quitar de la barra lateral"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c8a34873f9d8da569cbcebdc314a82cd97e734f3 i18n/esn/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-  our    100644 dbd723b12f68e8ad7cc1594d964090b81e98beba i18n/esn/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-  their  100644 f768bb7f55890e9810f24c7b56f12b5d11e07773 i18n/esn/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-changed in both
-  base   100644 05e79aa04fc5e36d1b26d265ed22a8f6d5fdaeee i18n/esn/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  our    100644 7393d6074556b0bd61735f99be1150899407f3cb i18n/esn/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  their  100644 2e9666a093be88316a6da00bc089d8255a36ec78 i18n/esn/src/vs/workbench/services/configuration/node/configuration.i18n.json
-@@ -9,6 +9,7 @@
- 	"scope.window.description": "Configuración específica para ventanas, que se puede definir en la configuración de usuario o de área de trabajo.",
- 	"scope.resource.description": "Configuración específica para recursos, que se puede definir en la configuración de usuario, de área de trabajo o de carpeta.",
- 	"scope.description": "Ámbito donde es aplicable la configuración. Los ámbitos disponibles son \"window\" y \"resource\".",
-+<<<<<<< .our
- 	"vscode.extension.contributes.configuration": "Aporta opciones de configuración.",
- 	"invalid.title": "configuration.title debe ser una cadena",
- 	"vscode.extension.contributes.defaultConfiguration": "Contribuye a la configuración de los parámetros del editor predeterminados por lenguaje.",
-@@ -21,4 +22,13 @@
- 	"workspaceConfig.settings.description": "Configuración de área de trabajo",
- 	"workspaceConfig.extensions.description": "Extensiones del área de trabajo",
- 	"unknownWorkspaceProperty": "Propiedad de configuración de espacio de trabajo desconocida"
-+=======
-+	"invalid.type": "si se establece, \"configuration.type\" debe establecerse en \"object\"",
-+	"invalid.title": "configuration.title debe ser una cadena",
-+	"vscode.extension.contributes.defaultConfiguration": "Contribuye a la configuración de los parámetros del editor predeterminados por lenguaje.",
-+	"invalid.properties": "configuration.properties debe ser un objeto",
-+	"workspaceConfig.id.description": "Identificador del área de trabajo. Se usa para almacenar el estado interno del área de trabajo, que se puede perder al cambiar.",
-+	"workspaceConfig.folders.description": "Lista de carpetas para cargar en el área de trabajo. Debe ser una ruta de acceso de archivo; por ejemplo, \"file:///raíz/carpetaA\"",
-+	"workspaceConfig.settings.description": "Configuración de área de trabajo"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c750b75802ed6877f0ae3e9b853ea3c16fd07935 i18n/esn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 532a6558111964e59cddb3ee4e8da3da36a9d18f i18n/esn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 98bdd1d3bf582e302727c676ed9484b82266e59b i18n/esn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -9,6 +9,7 @@
- 	"openTasksConfiguration": "Abrir configuración de tareas",
- 	"openLaunchConfiguration": "Abrir configuración de inicio",
- 	"open": "Abrir configuración",
-+<<<<<<< .our
- 	"saveAndRetry": "Guardar y reintentar",
- 	"errorUnknownKey": "No se puede escribir en {0} porque {1} no es una configuración registrada.",
- 	"errorInvalidWorkspaceConfigurationApplication": "No se puede escribir {0} en Configuración de área de trabajo; solo se puede escribir en Configuración de usuario.",
-@@ -27,6 +28,19 @@
- 	"errorConfigurationFileDirty": "No se puede escribir en el archivo de configuración de usuario porque se ha modificado. Guarde primero el archivo y vuelva a intentarlo.",
- 	"errorConfigurationFileDirtyWorkspace": "No se puede escribir en el archivo de configuración del área de trabajo porque se ha modificado. Guarde primero el archivo y vuelva a intentarlo.",
- 	"errorConfigurationFileDirtyFolder": "No se puede escribir en el archivo de configuración de carpeta porque se ha modificado. Guarde primero el archivo de configuración de la carpeta \"{0}\" y vuelva a intentarlo.",
-+=======
-+	"close": "Cerrar",
-+	"saveAndRetry": "Guardar la configuración y reintentar. ",
-+	"errorUnknownKey": "No se puede escribir en {0} porque {1} no es una configuración registrada.",
-+	"errorInvalidFolderConfiguration": "No se puede escribir en Configuración de carpeta porque {0} no admite el ámbito del recurso de carpeta.",
-+	"errorInvalidUserTarget": "No se puede escribir en Configuración de usuario porque {0} no admite el ámbito global.",
-+	"errorInvalidFolderTarget": "No se puede escribir en Configuración de carpeta porque no se ha proporcionado ningún recurso.",
-+	"errorNoWorkspaceOpened": "No se puede escribir en {0} porque no hay ninguna área de trabajo abierta. Abra un área de trabajo y vuelva a intentarlo.",
-+	"errorInvalidConfiguration": "No se pudo guardar la configuración. Abra el archivo **Configuración de usuario** para corregir los errores o advertencias del archivo y vuelva a intentarlo.",
-+	"errorInvalidConfigurationWorkspace": "No se pudo guardar la configuración. Abra **Configuración de área de trabajo** para corregir los errores o advertencias del archivo y vuelva a intentarlo.",
-+	"errorConfigurationFileDirty": "No se pudo guardar la configuración porque el archivo se ha modificado. Guarde el archivo **Configuración de usuario** y vuelva a intentarlo.",
-+	"errorConfigurationFileDirtyWorkspace": "No se pudo guardar la configuración porque el archivo se ha modificado. Guarde el archivo **Configuración de área de trabajo** y vuelva a intentarlo.",
-+>>>>>>> .their
- 	"userTarget": "Configuración de usuario",
- 	"workspaceTarget": "Configuración de área de trabajo",
- 	"folderTarget": "Configuración de carpeta"
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/esn/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-  our    100644 55e16aec92fb2aa84070bbb90a6e48fce9bdc3da i18n/esn/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-  their  100644 081d076416688f1e88a1bf5f809dc0e7e11e7f30 i18n/esn/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"errorInvalidFile": "No se puede escribir en el archivo. Abra el archivo para corregir los errores o advertencias y vuelva a intentarlo.",
- 	"errorFileDirty": "No se puede escribir en el archivo porque se ha modificado. Guarde el archivo y vuelva a intentarlo."
- }
-\ No newline at end of file
-changed in both
-  base   100644 e9c42972e4eb3e96d3f1e8d3509f5f0f918a71bb i18n/esn/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 5a34a01efe3be981f2f79fe82b2b70f00f7de801 i18n/esn/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 52d9fd4ec4e1657150c36caba2b71707a73f74f1 i18n/esn/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-@@ -13,6 +13,7 @@
- 	"noIconThemeDesc": "No file icons",
- 	"iconThemeError": "File icon theme is unknown or not installed.",
- 	"workbenchColors": "Reemplaza los colores del tema de color actual",
-+<<<<<<< .our
- 	"editorColors.comments": "Establece los colores y estilos para los comentarios",
- 	"editorColors.strings": "Establece los colores y estilos para los literales de cadena.",
- 	"editorColors.keywords": "Establece los colores y estilos para las palabras clave.",
-@@ -21,5 +22,9 @@
- 	"editorColors.functions": "Establece los colores y estilos para las declaraciones y referencias de funciones.",
- 	"editorColors.variables": "Establece los colores y estilos para las declaraciones y referencias de variables.",
- 	"editorColors.textMateRules": "Establece colores y estilos utilizando las reglas de la tematización de textmate (avanzadas).",
-+=======
-+	"workbenchColors.deprecated": "Esta configuracion no es experimental y se ha cambiado de nombre a 'workbench.colorCustomizations'",
-+	"workbenchColors.deprecatedDescription": "Utilice 'workbench.colorCustomizations' en su lugar",
-+>>>>>>> .their
- 	"editorColors": "Reemplaza los colores y el estilo de fuente del editor del tema de color seleccionado."
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/fra/extensions/emmet/package.i18n.json
-  our    100644 2b38d968d648e0792cab88ddd57aa657ed8e85b3 i18n/fra/extensions/emmet/package.i18n.json
-  their  100644 ad7e209c1bab1c60df741b7f9fa5798e3bb97768 i18n/fra/extensions/emmet/package.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,6 +10,14 @@
- 	"description": "Prise en charge d'Emmet pour VS Code",
- 	"command.wrapWithAbbreviation": "Envelopper avec une abréviation",
- 	"command.wrapIndividualLinesWithAbbreviation": "Envelopper les lignes individuelles avec une abréviation",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"command.removeTag": "Supprimer le Tag",
- 	"command.updateTag": "Mettre à jour le Tag",
- 	"command.matchTag": "Aller à la paire correspondante",
-@@ -31,6 +40,7 @@
- 	"command.incrementNumberByTen": "Incrémenter de 10",
- 	"command.decrementNumberByTen": "Décrémenter de 10",
- 	"emmetSyntaxProfiles": "Définissez le profil pour la syntaxe spécifiée ou utilisez votre propre profil avec des règles spécifiques.",
-+<<<<<<< .our
- 	"emmetExclude": "Un tableau des langages pour lesquels les abréviations Emmet ne devraient pas être développées.",
- 	"emmetExtensionsPath": "Chemin d’accès au dossier contenant les profils Emmet et les extraits.",
- 	"emmetShowExpandedAbbreviation": "Affiche les abréviations Emmet développées sous forme de suggestions.\nL’option \"inMarkupAndStylesheetFilesOnly\" s’applique à haml, jade, slim, xml, xsl, css, html, scss, sass, less et stylus.\nL’option\"always\" s’applique à toutes les parties du fichier indépendamment du balisage/css.",
-@@ -62,4 +72,12 @@
- 	"emmetPreferencesCssMsProperties": "Les propriétés css séparées par des virgules qui ont un préfixe 'ms' vendor lorsqu’elles sont utilisées dans une abréviation emmet qui commence par '-'. Mettre une chaîne vide pour éviter le préfixe 'ms'.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "La note minimale (de 0 à 1) que la correspondance de l'abréviation (fuzzy-matched) devrait atteindre. Des valeurs plus faibles peuvent produire de nombreuses correspondances de faux-positifs, des valeurs plus élevées peuvent réduire les correspondances possibles.",
- 	"emmetOptimizeStylesheetParsing": "Si défini à false, la fichier entier est analysé pour déterminer si la position courante est valide pour l’expansion des abréviations Emmet. Si défini à true, seul le contenu autour de la position actuelle dans les fichiers css/scss/less est analysé."
-+=======
-+	"emmetExclude": "Ensemble de langages où les abréviations emmet ne doivent pas être développées.",
-+	"emmetExtensionsPath": "Chemin d'un dossier contenant les profils, extraits de code et préférences Emmet. Seuls les profils sont honorés à partir du chemin des extensions quand emmet.useNewEmmet est défini sur true.",
-+	"emmetShowExpandedAbbreviation": "Affiche les abréviations Emmet développées sous forme de suggestions.\nL’option \"inMarkupAndStylesheetFilesOnly\" s’applique à html, haml, jade, slim, xml, xsl, css, scss, sass, less et un stylet.\nL’option \"toujours\" s’applique à toutes les parties du fichier indépendamment du balisage/css.",
-+	"emmetShowAbbreviationSuggestions": "Affiche les abréviations Emmet possibles sous forme de suggestions. Non applicable dans les feuilles de style ou quand emmet.showExpandedAbbreviation est défini sur \"jamais\".",
-+	"emmetIncludeLanguages": "Active les abréviations Emmet dans les langages qui ne sont pas pris en charge par défaut. Ajoute un mappage ici entre le langage et le langage Emmet pris en charge .\n Par exemple : {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
-+	"emmetVariables": "Variables à utiliser dans les extraits Emmet"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7f69cac4fb4ced48bdb36d562ed995dafb269475 i18n/fra/extensions/extension-editing/out/extensionLinter.i18n.json
-  our    100644 d3911a1e602c0342caf62e07ddf3705c7fd299e1 i18n/fra/extensions/extension-editing/out/extensionLinter.i18n.json
-  their  100644 c64c3a6f8629dc833ef958acecb94fd1ebf4d238 i18n/fra/extensions/extension-editing/out/extensionLinter.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/fra/extensions/markdown/out/previewContentProvider.i18n.json
-  our    100644 2eb7c81389dcce502544cffb79afa896eb0947f7 i18n/fra/extensions/markdown/out/previewContentProvider.i18n.json
-  their  100644 15ff651f2cb065d333538c0d99c9cef719ccc884 i18n/fra/extensions/markdown/out/previewContentProvider.i18n.json
-@@ -4,7 +4,11 @@
-  *--------------------------------------------------------------------------------------------*/
- // Do not edit this file. It is machine generated.
- {
-+<<<<<<< .our
- 	"preview.securityMessage.text": "Du contenu a été désactivé dans ce document",
-+=======
-+	"preview.securityMessage.text": "Certains contenus a été désactivé dans ce document",
-+>>>>>>> .their
- 	"preview.securityMessage.title": "Le contenu potentiellement dangereux ou précaire a été désactivé dans l’aperçu du format markdown. Modifier le paramètre de sécurité Aperçu Markdown afin d’autoriser les contenus non sécurisés ou activer les scripts",
- 	"preview.securityMessage.label": "Avertissement de sécurité de contenu désactivé"
- }
-\ No newline at end of file
-changed in both
-  base   100644 b6ec4bbef7d05ec17922cc59b7ea95efb8fc589b i18n/fra/extensions/markdown/out/security.i18n.json
-  our    100644 b3c4ab567f3cdf0e0bc77b8eccc8d1f547a63393 i18n/fra/extensions/markdown/out/security.i18n.json
-  their  100644 a91a93c54829c4a724165f671a414a5bd48b37a9 i18n/fra/extensions/markdown/out/security.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -16,5 +17,11 @@
- 	"enableSecurityWarning.title": "Activer l'aperçu d'avertissements de sécurité pour cet espace de travail",
- 	"disableSecurityWarning.title": "Désactiver l'aperçu d'avertissements de sécurité pour cet espace de travail",
- 	"toggleSecurityWarning.description": "N’affecte pas le niveau de sécurité du contenu",
-+=======
-+	"preview.showPreviewSecuritySelector.strictTitle": "Stricte. Charger uniquement le contenu sécurisé.",
-+	"preview.showPreviewSecuritySelector.currentSelection": "Paramètre actuel",
-+	"preview.showPreviewSecuritySelector.insecureContentTitle": "Autoriser le chargement de contenu via http.",
-+	"preview.showPreviewSecuritySelector.scriptsAndAllContent": "Autoriser l’exécution de tous les contenus et scripts. Non recommandé.",
-+>>>>>>> .their
- 	"preview.showPreviewSecuritySelector.title": "Sélectionner les paramètres de sécurité pour les aperçus Markdown dans cet espace de travail"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/fra/extensions/typescript/out/features/taskProvider.i18n.json
-  our    100644 451f7029bacabab17fb9cb543b1797329aaacbf3 i18n/fra/extensions/typescript/out/features/taskProvider.i18n.json
-  their  100644 f90da051c30eb4ff19252d3ecb2ab3501d766f4b i18n/fra/extensions/typescript/out/features/taskProvider.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,14 @@
- 	],
- 	"buildTscLabel": "build - {0}",
- 	"buildAndWatchTscLabel": "watch - {0}"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"buildAndWatchTscLabel": "watch - {0}",
-+	"buildTscLabel": "build - {0}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c4301b43c6762827c9cfceab5fe3c9ffe12eb579 i18n/fra/src/vs/code/electron-main/menus.i18n.json
-  our    100644 16a57011e6fe8292ae1edcf0b9eb59b9f28b2c10 i18n/fra/src/vs/code/electron-main/menus.i18n.json
-  their  100644 8381adf72c936915f9eaa1e9a16251761a678d0c i18n/fra/src/vs/code/electron-main/menus.i18n.json
-@@ -24,12 +24,21 @@
- 	"miQuit": "Quitter {0}",
- 	"miNewFile": "&&Nouveau fichier",
- 	"miOpen": "&&Ouvrir...",
-+<<<<<<< .our
- 	"miOpenWorkspace": "Ouvrir l'espace de travail...",
- 	"miOpenFolder": "Ouvrir le &&dossier",
- 	"miOpenFile": "&&Ouvrir un fichier...",
- 	"miOpenRecent": "Ouvrir les éléments &&récents",
- 	"miSaveWorkspaceAs": "Enregistrer l’espace de travail sous...",
- 	"miAddFolderToWorkspace": "Ajouter un dossier à l'espace de travail...",
-+=======
-+	"miOpenWorkspace": "&&Ouvrir un espace de travail...",
-+	"miOpenFolder": "Ouvrir le &&dossier",
-+	"miOpenFile": "&&Ouvrir un fichier...",
-+	"miOpenRecent": "Ouvrir les éléments &&récents",
-+	"miSaveWorkspaceAs": "&&Enregistrer l’espace de travail sous...",
-+	"miAddFolderToWorkspace": "&&Ajouter un dossier à l'espace de travail...",
-+>>>>>>> .their
- 	"miSave": "&&Enregistrer",
- 	"miSaveAs": "Enregistrer &&sous...",
- 	"miSaveAll": "Enregistrer to&&ut",
-@@ -189,5 +198,11 @@
- 	"miDownloadingUpdate": "Téléchargement de la mise à jour...",
- 	"miInstallUpdate": "Installer la mise à jour...",
- 	"miInstallingUpdate": "Installation de la mise à jour...",
-+<<<<<<< .our
- 	"miRestartToUpdate": "Redémarrer pour mettre à jour..."
-+=======
-+	"miCheckForUpdates": "Rechercher les mises à jour...",
-+	"aboutDetail": "\nVersion {0}\nCommit {1}\nDate {2}\nShell {3}\nRenderer {4}\nNode {5}\nArchitecture {6}",
-+	"okButton": "OK"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7517a404783a2da12ff25e4053e022614e0ec4f6 i18n/fra/src/vs/editor/contrib/find/common/findController.i18n.json
-  our    100644 21889b4123e3ab0c51a61420c30b2adddb59929d i18n/fra/src/vs/editor/contrib/find/common/findController.i18n.json
-  their  100644 2176cea208c5eaa0ca5310602d4add0d86ac5282 i18n/fra/src/vs/editor/contrib/find/common/findController.i18n.json
-@@ -10,6 +10,15 @@
- 	"nextSelectionMatchFindAction": "Sélection suivante",
- 	"previousSelectionMatchFindAction": "Sélection précédente",
- 	"startReplace": "Remplacer",
-+<<<<<<< .our
-+=======
-+	"addSelectionToNextFindMatch": "Ajouter la sélection à la correspondance de recherche suivante",
-+	"addSelectionToPreviousFindMatch": "Ajouter la sélection à la correspondance de recherche précédente",
-+	"moveSelectionToNextFindMatch": "Déplacer la dernière sélection vers la correspondance de recherche suivante",
-+	"moveSelectionToPreviousFindMatch": "Déplacer la dernière sélection à la correspondance de recherche précédente",
-+	"selectAllOccurrencesOfFindMatch": "Sélectionner toutes les occurrences des correspondances de la recherche",
-+	"changeAll.label": "Modifier toutes les occurrences",
-+>>>>>>> .their
- 	"showNextFindTermAction": "Afficher le terme de recherche suivant",
- 	"showPreviousFindTermAction": "Afficher le terme de recherche précédent"
- }
-\ No newline at end of file
-changed in both
-  base   100644 bdfc2772c3939d2335ad3b7fb518d67d2669e6f9 i18n/fra/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 4522e0fd127e1bcf08d6748e14cb70d5513ca327 i18n/fra/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 6f0597c75fb9bb64ec7e9659dce19de8109411c6 i18n/fra/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -9,6 +9,7 @@
- 	"openFile": "Ouvrir un fichier...",
- 	"openFolder": "Ouvrir un dossier...",
- 	"openFileFolder": "Ouvrir...",
-+<<<<<<< .our
- 	"globalRemoveFolderFromWorkspace": "Supprimer le dossier d’espace de travail...",
- 	"saveWorkspaceAsAction": "Enregistrer l’espace de travail sous...",
- 	"save": "&&Enregistrer",
-@@ -16,4 +17,24 @@
- 	"openWorkspaceAction": "Ouvrir un espace de travail...",
- 	"openWorkspaceConfigFile": "Ouvrir le Fichier de Configuration d’espace de travail",
- 	"duplicateWorkspaceInNewWindow": "Dupliquer l'espace de travail dans une Nouvelle fenêtre"
-+=======
-+	"reload": "&&Recharger",
-+	"cancel": "Annuler",
-+	"newWorkspaceFormExisting": "Nouvel espace de travail à partir d'un existant...",
-+	"select": "&&Sélectionner",
-+	"selectWorkspace": "Sélectionner les dossiers pour l’espace de travail",
-+	"addSupported": "Pour ouvrir plusieurs dossiers, un rechargement de la fenêtre est nécessaire.",
-+	"addFolderToWorkspace": "Ajouter un dossier à l'espace de travail...",
-+	"add": "&&Ajouter",
-+	"addFolderToWorkspaceTitle": "Ajouter un dossier à l'espace de travail",
-+	"removeFolderFromWorkspace": "Supprimer le dossier de l'espace de travail",
-+	"saveWorkspaceAsAction": "Enregistrer l’espace de travail sous...",
-+	"saveEmptyWorkspaceNotSupported": "Veuillez d’abord ouvrir un espace de travail pour enregistrer.",
-+	"saveNotSupported": "Pour enregistrer l’espace de travail, un rechargement de la fenêtre est nécessaire.",
-+	"save": "&&Enregistrer",
-+	"saveWorkspace": "Enregistrer l’espace de travail",
-+	"openWorkspaceAction": "Ouvrir un espace de travail...",
-+	"newWorkspace": "Nouvel espace de travail...",
-+	"openWorkspaceConfigFile": "Ouvrir le Fichier de Configuration d’espace de travail"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 9927a31f58e6bd42637c5158d6261570092eb358 i18n/fra/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 1cdd98b12a70baa1c905f59b19493e7b2e495bea i18n/fra/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 2ebd48c5bc85a3fa5c053b7e12394611bbcf4c12 i18n/fra/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 ab3e54a798da942efd8b75ea2526c3a6c72c0159 i18n/fra/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-  our    100644 905c22110d52d6416342fd8550af80f658130a52 i18n/fra/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-  their  100644 7a0ea73a96adc00dfc80ce66c642f04432843c39 i18n/fra/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,9 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"compositePart.hideSideBarLabel": "Masquer la barre latérale",
-+>>>>>>> .their
- 	"focusSideBar": "Focus sur la barre latérale",
- 	"viewCategory": "Affichage"
- }
-\ No newline at end of file
-changed in both
-  base   100644 2c777584371c8b2c3d3ce847ee8503c47b3ad7a1 i18n/fra/src/vs/workbench/common/theme.i18n.json
-  our    100644 67b5e93740c6b4696aa15e5da68929b00e585c36 i18n/fra/src/vs/workbench/common/theme.i18n.json
-  their  100644 4496db1c37401a017f739e62f246fd6e07e1354c i18n/fra/src/vs/workbench/common/theme.i18n.json
-@@ -61,6 +61,7 @@
- 	"titleBarActiveBackground": "Arrière-plan de la barre de titre quand la fenêtre est active. Notez que cette couleur est uniquement prise en charge sur macOS.",
- 	"titleBarInactiveBackground": "Arrière-plan de la barre de titre quand la fenêtre est inactive. Notez que cette couleur est uniquement prise en charge sur macOS.",
- 	"titleBarBorder": "Couleur de bordure de la barre titre. Notez que cette couleur est actuellement uniquement pris en charge sur macOS.",
-+<<<<<<< .our
- 	"notificationCenterBorder": "Couleur de bordure du centre de notifications. Les notifications défilent à partir du bas à droite de la fenêtre.",
- 	"notificationToastBorder": "Couleur de bordure du toast des notifications. Les notifications défilent à partir du bas à droite de la fenêtre.",
- 	"notificationsForeground": "Couleur de premier plan des notifications. Les notifications défilent à partir du bas à droite de la fenêtre.",
-@@ -69,4 +70,17 @@
- 	"notificationCenterHeaderForeground": "Couleur de premier plan de l'en-tête du centre de notifications. Les notifications défilent à partir du bas à droite de la fenêtre.",
- 	"notificationCenterHeaderBackground": "Couleur d'arrière plan de l'en-tête du centre de notifications. Les notifications défilent à partir du bas à droite de la fenêtre.",
- 	"notificationsBorder": "Couleur de bordure séparant des autres notifications dans le centre de notifications. Les notifications défilent à partir du bas à droite de la fenêtre."
-+=======
-+	"notificationsForeground": "Couleur de premier plan des notifications. Les notifications défilent à partir du haut de la fenêtre.",
-+	"notificationsBackground": "Couleur d'arrière-plan des notifications. Les notifications défilent à paritr du haut de la fenêtre.",
-+	"notificationsButtonBackground": "Couleur d'arrière-plan du bouton des notifications. Les notifications défilent à partir du haut de la fenêtre.",
-+	"notificationsButtonHoverBackground": "Couleur d'arrière-plan du bouton des notifications pendant le pointage. Les notifications défilent à partir du haut de la fenêtre.",
-+	"notificationsButtonForeground": "Couleur de premier plan du bouton des notifications. Les notifications défilent à partir du haut de la fenêtre.",
-+	"notificationsInfoBackground": "Couleur d'arrière-plan des informations des notifications. Les notifications défilent à partir du haut de la fenêtre.",
-+	"notificationsInfoForeground": "Couleur de premier plan des informations des notifications. Les notifications défilent à partir du haut de la fenêtre.",
-+	"notificationsWarningBackground": "Couleur d'arrière-plan de l'avertissement des notifications. Les notifications défilent à partir du haut de la fenêtre.",
-+	"notificationsWarningForeground": "Couleur de premier plan de l'avertissement des notifications. Les notifications défilent à partir du haut de la fenêtre.",
-+	"notificationsErrorBackground": "Couleur d'arrière-plan de l'erreur des notifications. Les notifications défilent à partir du haut de la fenêtre.",
-+	"notificationsErrorForeground": "Couleur de premier plan de l'erreur des notifications. Les notifications défilent à partir du haut de la fenêtre."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a082ef906e173c46f00cb5467720263156c97c0e i18n/fra/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 8f9f7eb339d47d55df577bac8ccf306bd77eb0fa i18n/fra/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 55e38a54c343c42b03bdac296610b69ec356c776 i18n/fra/src/vs/workbench/electron-browser/actions.i18n.json
-changed in both
-  base   100644 4753f90d9c4fdaaa445659703e9f8d05b376a6d4 i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 1a663cb4405d0c8f86ec154a57cdd2b613d93195 i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 cd1097afbbd70b14c52ba2263d512bf159291954 i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,6 +35,7 @@
- 	"panelDefaultLocation": "Contrôle l’emplacement par défaut du panneau. Il peut être affiché soit en bas ou à droite du banc d'essai.",
- 	"statusBarVisibility": "Contrôle la visibilité de la barre d'état au bas du banc d'essai.",
- 	"activityBarVisibility": "Contrôle la visibilité de la barre d'activités dans le banc d'essai.",
-+<<<<<<< .our
- 	"viewVisibility": "Contrôle la visibilité des actions d'en-tête de vue. Les actions d'en-tête de vue peuvent être soit toujours visibles, ou uniquement visibles quand cette vue a le focus ou est survolée.",
- 	"fontAliasing": "Contrôle la méthode de font aliasing dans le workbench.\n- default : Lissage des polices de sous-pixel. Sur la plupart des affichages non-ratina, cela vous donnera le texte le plus vif\n- antialiased : Lisse les polices au niveau du pixel, plutôt que les sous-pixels. Peut faire en sorte que la police apparaisse plus fine dans l’ensemble \n- none : Désactive le lissage des polices. Le texte s'affichera avec des bordures dentelées\n- auto: Applique `default` ou `antialiased` automatiquement en se basant sur la résolution de l'affichage.",
- 	"workbench.fontAliasing.default": "Lissage de sous-pixel des polices. Sur la plupart des affichages non-retina, cela vous donnera le texte le plus vif.",
-@@ -43,6 +44,15 @@
- 	"workbench.fontAliasing.auto": "Applique `default` ou `antialiased`automatiquement en se basant sur la résolution de l'affichage.",
- 	"enableNaturalLanguageSettingsSearch": "Contrôle s’il faut activer le mode de recherche en langage naturel pour les paramètres.",
- 	"windowConfigurationTitle": "Fenêtre",
-+=======
-+	"closeOnFileDelete": "Contrôle si les éditeurs qui affichent un fichier doivent se fermer automatiquement quand ce fichier est supprimé ou renommé par un autre processus. Si vous désactivez cette option, l'éditeur reste ouvert dans un état indiquant une intégrité compromise. Notez que la suppression de fichiers à partir de l'application entraîne toujours la fermeture de l'éditeur, et que les fichiers à l'intégrité compromise ne sont jamais fermés pour permettre la conservation de vos données.",
-+	"fontAliasing": "Contrôle la méthode de font aliasing dans le workbench.\n- par défaut : Lissage des polices de sous-pixel. Sur la plupart des affichages non-ratina, cela vous donnera le texte le plus vif\n- crénelées : Lisse les polices au niveau du pixel, plutôt que les sous-pixels. Peut faire en sorte que la police apparaisse plus légère dans l’ensemble \n- none : désactive le lissage des polices. Le texte s'affichera avec des bordures dentelées",
-+	"workbench.fontAliasing.default": "Lissage de sous-pixel des polices. Sur la plupart des affichages non-retina, cela vous donnera le texte le plus vif.",
-+	"workbench.fontAliasing.antialiased": "Lisser les polices au niveau du pixel, plutôt que les sous-pixels. Peut faire en sorte que la police apparaisse plus légère dans l’ensemble.",
-+	"workbench.fontAliasing.none": "Désactive le lissage des polices. Le texte s'affichera avec des bordures dentelées.",
-+	"swipeToNavigate": "Parcourez les fichiers ouverts en faisant glisser trois doigts horizontalement. ",
-+	"workbenchConfigurationTitle": "Banc d'essai",
-+>>>>>>> .their
- 	"window.openFilesInNewWindow.on": "Les fichiers s'ouvrent dans une nouvelle fenêtre",
- 	"window.openFilesInNewWindow.off": "Les fichiers s'ouvrent dans la fenêtre du dossier conteneur ouvert ou dans la dernière fenêtre active",
- 	"window.openFilesInNewWindow.defaultMac": "Les fichiers s'ouvriront dans la fenêtre avec le dossier des fichiers ouvert ou la dernière fenêtre active, à moins qu'ils ne soient ouverts via le Dock ou depuis Finder.",
-changed in both
-  base   100644 52e6b8d12ff6a7d2751282ee43e38ff1cbc624e2 i18n/fra/src/vs/workbench/electron-browser/window.i18n.json
-  our    100644 6e669b2258da3109a79d0d8175b8cfd0b9744d85 i18n/fra/src/vs/workbench/electron-browser/window.i18n.json
-  their  100644 d486ee50b5a96a263d36b476ec708a9a4151dae9 i18n/fra/src/vs/workbench/electron-browser/window.i18n.json
-@@ -12,5 +12,10 @@
- 	"copy": "Copier",
- 	"paste": "Coller",
- 	"selectAll": "Tout Sélectionner",
-+<<<<<<< .our
- 	"runningAsRoot": "Il est déconseillé d’exécuter {0} en tant qu’utilisateur root."
-+=======
-+	"confirmOpen": "Êtes-vous certain de vouloir ouvrir {0} espaces de travail ?",
-+	"confirmOpenButton": "&&Ouvrir..."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 fdf0d48085c83bffe2a4bdcd650c9db5ad80e96c i18n/fra/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  our    100644 979233d172f8263db25eb12ad373b2838a718689 i18n/fra/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  their  100644 207f6a482dd33342e14a2bd69dca953b27d9b93f i18n/fra/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-changed in both
-  base   100644 d60a025a1a0cda0185e27c30f5c1de9401645b4b i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 dc9d0f20d0f5632bb197839a3ff1ba56a6ca08d4 i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 9ddcff0cc12caed5c7dafde26eec94c66e62b30c i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -28,7 +28,13 @@
- 	"preLaunchTaskExitCode": "Le preLaunchTask '{0}' s'est terminé avec le code de sortie {1}.",
- 	"showErrors": "Afficher les erreurs",
- 	"noFolderWorkspaceDebugError": "Impossible de déboguer le fichier actif. Vérifiez qu'il est enregistré sur le disque et qu'une extension de débogage est installée pour ce type de fichier.",
-+<<<<<<< .our
- 	"cancel": "Annuler",
- 	"DebugTaskNotFound": "Tâche '{0}' introuvable.",
- 	"taskNotTracked": "La tâche '{0}' ne peut pas être tracée."
-+=======
-+	"NewLaunchConfig": "Configurez le fichier config de lancement de votre application. {0}",
-+	"DebugTaskNotFound": "preLaunchTask '{0}' introuvable.",
-+	"differentTaskRunning": "La tâche '{0}' est déjà en cours d’exécution. Impossible d’exécuter tâche de pré-lancement '{1}'."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 b4fa3eab63698bf2d7d1b2c6f094448308ec86ad i18n/fra/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  our    100644 a15f1f9ca32a27db95a99dffa5e908bd56d7dd64 i18n/fra/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  their  100644 76fb8ce3e72902541c34908770721316afef299b i18n/fra/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-merged
-  result 100644 48e561613a56f3f957e89112e71b08d357391e18 i18n/fra/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-  our    100644 2d849d42acddcd35c05dcc416ee987f711a3634d i18n/fra/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-@@ -7,8 +7,5 @@
- 	"emmetConfigurationTitle": "Emmet",
- 	"triggerExpansionOnTab": "Une fois les abréviations Emmet activées, elles se développent quand vous appuyez sur la touche Tab. Non applicable quand emmet.useNewemmet est défini sur true.",
- 	"emmetPreferences": "Préférences utilisées pour modifier le comportement de certaines actions et résolutions d'Emmet. Non applicable quand emmet.useNewemmet est défini sur true.",
--	"emmetSyntaxProfiles": "Définissez le profil pour la syntaxe spécifiée ou utilisez votre propre profil avec des règles spécifiques.",
--	"emmetExclude": "Ensemble de langages où les abréviations emmet ne doivent pas être développées.",
--	"emmetExtensionsPath": "Chemin d'un dossier contenant les profils, extraits de code et préférences Emmet. Seuls les profils sont honorés à partir du chemin des extensions quand emmet.useNewEmmet est défini sur true.",
- 	"useNewEmmet": "Essayez les nouveaux modules Emmet (qui remplaceront à terme l'ancienne bibliothèque Emmet) pour toutes les fonctionnalités Emmet."
- }
-\ No newline at end of file
-changed in both
-  base   100644 552e6f9f400c95d6f23081099bac318da780c5ef i18n/fra/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  our    100644 3551b5e036401750ea0c8346808de61f5309a6a0 i18n/fra/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  their  100644 8fadf8b958bad5b0f9ead536beda02b61da7f096 i18n/fra/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-changed in both
-  base   100644 0112a21db366de319a7a5193ffda7b5f497aba67 i18n/fra/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 0057e22b4a8443d5b30bfe0090c058bd31602f8d i18n/fra/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 304d491606739fc3c0039285eb118829cf7b56f7 i18n/fra/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-changed in both
-  base   100644 fdf890d05eef06d8609adc4a736123f0301d8f12 i18n/fra/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
-  our    100644 c0057e5215c73761b92d65b5e39fe74aa4c15151 i18n/fra/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
-  their  100644 2a8a3d2e72cabcc4be68b4c4dfff5f79ac2721d1 i18n/fra/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
-@@ -4,7 +4,11 @@
-  *--------------------------------------------------------------------------------------------*/
- // Do not edit this file. It is machine generated.
- {
-+<<<<<<< .our
- 	"filesCategory": "Fichier",
-+=======
-+	"filesCategory": "Fichiers",
-+>>>>>>> .their
- 	"revealInSideBar": "Afficher dans la barre latérale",
- 	"acceptLocalChanges": "Utiliser vos modifications et écraser les contenus du disque",
- 	"revertLocalChanges": "Ignorer les modifications et revenir au contenu sur le disque"
-changed in both
-  base   100644 9439ba9fff7726de3b8dbe7216e8b5a4fb089945 i18n/fra/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 9693ca31c50911feab4d02a16763cfd2142313b0 i18n/fra/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 91bcea898e715f28bed7c7a06aa3b51dc60c9725 i18n/fra/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-@@ -40,6 +40,7 @@
- 	"dynamicHeight": "Contrôle si la hauteur de la section des éditeurs ouverts doit s'adapter dynamiquement ou non au nombre d'éléments.",
- 	"autoReveal": "Contrôle si l'Explorateur doit automatiquement afficher et sélectionner les fichiers à l'ouverture.",
- 	"enableDragAndDrop": "Contrôle si l'explorateur doit autoriser le déplacement de fichiers et de dossiers par glisser-déplacer.",
-+<<<<<<< .our
- 	"confirmDragAndDrop": "Contrôle si l’Explorateur doit demander confirmation lors du déplacement de fichiers ou de dossiers via glisser-déposer.",
- 	"confirmDelete": "Contrôle si l’explorateur doit demander confirmation lorsque vous supprimez un fichier via la corbeille.",
- 	"sortOrder.default": "Les fichiers et dossiers sont triés par nom, dans l’ordre alphabétique. Les dossiers sont affichés avant les fichiers.",
-@@ -50,4 +51,12 @@
- 	"sortOrder": "Contrôle l'ordre de tri des fichiers et dossiers dans l'explorateur. En plus du tri par défaut, vous pouvez définir l'ordre sur 'mixed' (fichiers et dossiers triés combinés), 'type' (par type de fichier), 'modified' (par date de dernière modification) ou 'fileFirst' (trier les fichiers avant les dossiers).",
- 	"explorer.decorations.colors": "Contrôle si les décorations de fichier doivent utiliser des couleurs.",
- 	"explorer.decorations.badges": "Contrôle si les décorations de fichier doivent utiliser des badges."
-+=======
-+	"sortOrder.default": "Fichiers et répertoires sont triés par leur nom, dans l’ordre alphabétique. Les répertoires sont affichés avant les fichiers.",
-+	"sortOrder.mixed": "Fichiers et répertoires sont triés par leur nom, dans l’ordre alphabétique. Les fichiers sont imbriquées dans des répertoires.",
-+	"sortOrder.filesFirst": "Fichiers et répertoires sont triés par leur nom, dans l’ordre alphabétique. Les fichiers sont affichés avant les répertoires.",
-+	"sortOrder.type": "Fichiers et répertoires sont triés par leurs extensions, dans l’ordre alphabétique. Les répertoires sont affichés avant les fichiers.",
-+	"sortOrder.modified": "Fichiers et répertoires sont triés par date de dernière modification, dans l’ordre décroissant. Les répertoires sont affichés avant les fichiers.",
-+	"sortOrder": "Contrôle le mode de tri des fichiers et des répertoires dans l’explorateur."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 2ecf7ac060da544f45120baaa23904f3a0639d5e i18n/fra/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-  our    100644 f944e7fc14ff13265af3f6fef112a7a5de5ca326 i18n/fra/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-  their  100644 b3844c69018427342f12432ff2be65b0e438b17c i18n/fra/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-@@ -12,5 +12,6 @@
- 	"genericSaveError": "Échec d'enregistrement de '{0}' ({1}).",
- 	"staleSaveError": "Échec de l'enregistrement de '{0}' : le contenu sur disque est plus récent. Cliquez sur **Comparer** pour comparer votre version à celle située sur le disque.",
- 	"compareChanges": "Comparer",
--	"saveConflictDiffLabel": "{0} (sur le disque) ↔ {1} (dans {2}) - Résoudre le conflit d'enregistrement"
-+	"saveConflictDiffLabel": "{0} (sur le disque) ↔ {1} (dans {2}) - Résoudre le conflit d'enregistrement",
-+	"userGuide": "Utiliser les actions dans la barre d’outils de l’éditeur vers la droite pour soit **annuler** vos modifications ou **écraser** le contenu sur le disque avec vos modifications"
- }
-\ No newline at end of file
-changed in both
-  base   100644 61742507b3662fb3aebe4b11318e6f585b157592 i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  our    100644 e838745aa51608675b5f1abeac806b7a4c29cad3 i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  their  100644 829d423c32eed88ed06208ea49a74df195782426 i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-@@ -14,6 +14,10 @@
- 	"openGlobalKeybindingsFile": "Ouvrir le fichier des raccourcis clavier",
- 	"openWorkspaceSettings": "Ouvrir les paramètres d'espace de travail",
- 	"openFolderSettings": "Ouvrir le dossier Paramètres",
-+<<<<<<< .our
-+=======
-+	"pickFolder": "Sélectionner le dossier",
-+>>>>>>> .their
- 	"configureLanguageBasedSettings": "Configurer les paramètres spécifiques au langage...",
- 	"languageDescriptionConfigured": "({0})",
- 	"pickLanguage": "Sélectionner un langage"
-changed in both
-  base   100644 990d1f6a9a97d982872ccdbfd7aa7822ec050601 i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 def18c92de62940f464c192ffdc0811ec055095e i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 3684b913ba7f4787f4aba3652d304d299cd8c070 i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -14,4 +15,19 @@
- 	"editTtile": "Modifier",
- 	"replaceDefaultValue": "Remplacer dans les paramètres",
- 	"copyDefaultValue": "Copier dans Paramètres"
-+=======
-+	"emptyUserSettingsHeader": "Placer vos paramètres ici pour remplacer les paramètres par défaut.",
-+	"errorInvalidConfiguration": "Impossible d'écrire les paramètres. Corrigez les erreurs/avertissements présents dans le fichier, puis réessayez.",
-+	"emptyWorkspaceSettingsHeader": "Placer vos paramètres ici pour remplacer les paramètres utilisateur.",
-+	"emptyFolderSettingsHeader": "Placer les paramètres de votre dossier ici pour remplacer ceux des paramètres de l’espace de travail.",
-+	"defaultFolderSettingsTitle": "Paramètres de dossier par défaut",
-+	"defaultSettingsTitle": "Paramètres par défaut",
-+	"noSettingsFound": "Aucun paramètre.",
-+	"editTtile": "Modifier",
-+	"replaceDefaultValue": "Remplacer dans les paramètres",
-+	"copyDefaultValue": "Copier dans Paramètres",
-+	"unsupportedPHPExecutablePathSetting": "Ce paramètre doit être un paramètre utilisateur. Pour configurer PHP pour l'espace de travail, ouvrez un fichier PHP, puis cliquez sur 'Chemin PHP' dans la barre d'état.",
-+	"unsupportedWorkspaceSetting": "Ce paramètre doit être un paramètre utilisateur.",
-+	"unsupportedWorkbenchSetting": "Ce paramètre ne peut pas être appliqué maintenant. Il est appliqué quand vous ouvrez ce dossier directement."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a71763915a8d5ad9d61baa9aa114a790fb1f0d99 i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-  our    100644 58fa7022cd814e057afdce2cbbafc9d8b5f28b30 i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-  their  100644 3f323a432755fe11c3d2452035d109a9fc62a8f4 i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 40cb14d81b25931ed98c99ed64c659dbe62e387d i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 c4a6584827b8d5c2d94892a3e758a5cde6b369eb i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -12,4 +13,13 @@
- 	"userSettings": "Paramètres utilisateur",
- 	"workspaceSettings": "Paramètres de l'espace de travail",
- 	"folderSettings": "Paramètres de dossier"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"folderSettingsDetails": "Paramètres de dossier"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7507a7f217ace49deaddaa2f034b8ac3c7b37728 i18n/fra/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  our    100644 31cb132ffd591f1fb232c21680adcc5624e5f7bc i18n/fra/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  their  100644 df36de368d34a03dde52e9c0b6f9b627ed246e3d i18n/fra/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-@@ -8,5 +8,11 @@
- 	],
- 	"relaunchSettingMessage": "Un paramètre a changé et nécessite un redémarrage pour être appliqué.",
- 	"relaunchSettingDetail": "Appuyez sur le bouton de redémarrage pour redémarrer {0} et activer le paramètre.",
-+<<<<<<< .our
- 	"restart": "&&Redémarrer"
-+=======
-+	"restart": "Redémarrer",
-+	"relaunchWorkspaceMessage": "Ce changement d’espace de travail nécessite un rechargement de notre système d’extension.",
-+	"reload": "Recharger"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 dd5b8b24dd7f1f47e7dbd0c84c8da968c17215fb i18n/fra/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 7927ac428c9397051edb023d925d6ab74f6c0189 i18n/fra/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 2478230b806fc22ca670def76a32897a33d71eb5 i18n/fra/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"nextSearchIncludePattern": "Afficher le prochain Include Pattern de recherche",
- 	"previousSearchIncludePattern": "Afficher le précédent Include Pattern de recherche",
- 	"nextSearchExcludePattern": "Afficher le prochain Exclude Pattern de recherche",
-@@ -16,6 +19,8 @@
- 	"previousReplaceTerm": "Voir le terme de recherche précédent à remplacer",
- 	"findInFiles": "Chercher dans les fichiers",
- 	"replaceInFiles": "Remplacer dans les fichiers",
-+	"findInWorkspace": "Trouver dans l’espace de travail...",
-+	"findInFolder": "Trouver dans le dossier...",
- 	"RefreshAction.label": "Actualiser",
- 	"CollapseDeepestExpandedLevelAction.label": "Réduire tout",
- 	"ClearSearchResultsAction.label": "Effacer",
-changed in both
-  base   100644 052e41c13ac834a4a073d338cc434d21861bf194 i18n/fra/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-  our    100644 a979901875e3ecf563312ec08ecc18edde6ad1ee i18n/fra/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-  their  100644 9038b91202e9bd43bb0dec03e5b877a44de31e78 i18n/fra/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"searchFolderMatch.other.label": "Autres fichiers",
- 	"searchFileMatches": "{0} fichiers trouvés",
- 	"searchFileMatch": "{0} fichier trouvé",
-changed in both
-  base   100644 ee2441931b50bb93815060a08c9980cf0fd775e8 i18n/fra/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  our    100644 4cd20eea1e68cf73a56249541b739d94f4272553 i18n/fra/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  their  100644 a17af9ee4c5db13e39d7ea2d3daae96c2f76b6ae i18n/fra/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-changed in both
-  base   100644 880bf493d013305e12d0de0cf4e4710c123a1dc4 i18n/fra/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 673cb698c2a5b3bfb8460611a63585f8ca3fd4e1 i18n/fra/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 3c2e0ad14bd7744fe5e0a3932175f2cddd0ea474 i18n/fra/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-changed in both
-  base   100644 3681aebcf343094a424a4703d21eb5d2bb6723c1 i18n/fra/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 87d639c304bc4b35cf6eb86239d5ea30fd616b54 i18n/fra/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 d1909b04f8a2c784737225db44aa8cc3ab9cceb4 i18n/fra/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -12,8 +12,12 @@
- 	"totalWarnings": "{0} avertissements",
- 	"totalInfos": "{0} infos",
- 	"problems": "Problèmes",
-+<<<<<<< .our
- 	"building": "Génération...",
- 	"manyProblems": "10K+",
-+=======
-+	"manyMarkers": "99",
-+>>>>>>> .their
- 	"runningTasks": "Afficher les tâches en cours d'exécution",
- 	"tasks": "Tâches",
- 	"TaskSystem.noHotSwap": "Changer le moteur d’exécution de tâches avec une tâche active en cours d’exécution nécessite de recharger la fenêtre",
-@@ -24,17 +28,25 @@
- 	"TaskService.noTestTask1": "Aucune tâche de test définie. Marquez une tâche avec 'isTestCommand' dans le fichier tasks.json.",
- 	"TaskService.noTestTask2": "Aucune tâche de test définie. Marquez une tâche comme groupe 'test' dans le fichier tasks.json.",
- 	"TaskServer.noTask": "La tâche {0} à exécuter est introuvable.",
-+<<<<<<< .our
- 	"TaskService.associate": "associer",
-+=======
-+>>>>>>> .their
- 	"TaskService.attachProblemMatcher.continueWithout": "Continuer sans analyser la sortie de la tâche",
- 	"TaskService.attachProblemMatcher.never": "Ne jamais vérifier la sortie de la tâche",
- 	"TaskService.attachProblemMatcher.learnMoreAbout": "En savoir plus sur la sortie de la tâche de numérisation",
- 	"selectProblemMatcher": "Sélectionner pour quel type d’erreurs et d’avertissements analyser la sortie de la tâche",
- 	"customizeParseErrors": "La configuration de tâche actuelle contient des erreurs. Corrigez-les avant de personnaliser une tâche. ",
- 	"moreThanOneBuildTask": "De nombreuses tâches de génération sont définies dans le fichier tasks.json. Exécution de la première.\n",
-+<<<<<<< .our
- 	"TaskSystem.activeSame.background": "La tâche '{0}\" est déjà active et en mode arrière-plan.",
- 	"TaskSystem.activeSame.noBackground": "La tâche '{0}' est déjà active.",
- 	"terminateTask": "Terminer la tâche",
- 	"restartTask": "Redémarrer la tâche",
-+=======
-+	"TaskSystem.activeSame.background": "La tâche '{0}' est déjà active et en mode arrière-plan. Pour la terminer, utiliser `Terminer la Tâche...` » dans le menu Tâches.",
-+	"TaskSystem.activeSame.noBackground": "La tâche '{0}' est déjà active. Pour la terminer, il utilise `Terminer la Tâche...` dans le menu Tâches.",
-+>>>>>>> .their
- 	"TaskSystem.active": "Une tâche est déjà en cours d'exécution. Terminez-la avant d'exécuter une autre tâche.",
- 	"TaskSystem.restartFailed": "Échec de la fin de l'exécution de la tâche {0}",
- 	"TaskService.noConfiguration": "Erreur : La détection de la tâche {0} n’a pas contribué à une tâche pour la configuration suivante : {1}, la tâche sera ignorée.\n",
-@@ -75,8 +87,13 @@
- 	"TaskService.pickDefaultBuildTask": "Sélectionner la tâche à utiliser comme tâche de génération par défaut",
- 	"TaskService.defaultTestTaskExists": "{0} est déjà marquée comme tâche de test par défaut.",
- 	"TaskService.pickDefaultTestTask": "Sélectionner la tâche à utiliser comme tâche de test par défaut",
-+<<<<<<< .our
- 	"TaskService.pickShowTask": "Sélectionner la tâche pour montrer sa sortie",
- 	"TaskService.noTaskIsRunning": "Aucune tâche n’est en cours d’exécution",
-+=======
-+	"TaskService.noTaskIsRunning": "Aucune tâche n’est en cours d’exécution.",
-+	"TaskService.pickShowTask": "Sélectionner la tâche pour montrer sa sortie",
-+>>>>>>> .their
- 	"ShowLogAction.label": "Afficher le journal des tâches",
- 	"RunTaskAction.label": "Exécuter la tâche",
- 	"RestartTaskAction.label": "Redémarrer la tâche en cours d'exécution",
-changed in both
-  base   100644 9b94ea398740a8d4bcf95677442564df33b7fc1a i18n/fra/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  our    100644 6d14510f43bd22b198ad6fdceb4967eca1723e41 i18n/fra/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  their  100644 f1bd9170bfd2f0f304c51f46b6cdc48af0695fda i18n/fra/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/fra/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  our    100644 e6b1283332bd10894500ddf69ae8a92a0b1f6a08 i18n/fra/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  their  100644 4c1012b62bf1eb2aeb5e50af757b0540d5371e8b i18n/fra/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,6 +10,15 @@
- 	"termEntryAriaLabel": "{0}, sélecteur de terminaux",
- 	"termCreateEntryAriaLabel": "{0}, créer un terminal",
- 	"workbench.action.terminal.newplus": "$(plus) Créer un terminal intégré",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"entryAriaLabel": "{0}, sélecteur de terminal",
-+>>>>>>> .their
- 	"noTerminalsMatching": "Aucun terminal correspondant",
- 	"noTerminalsFound": "Aucun terminal ouvert"
- }
-\ No newline at end of file
-changed in both
-  base   100644 4eb70b27e6505a3d913d692b5650d17d664c18b6 i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 c9b4f495f668b34a06e07f9e3acab9da423cc6a8 i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 f19cecf97cabcf334d6d6e9e4a7a7b3ba3a11a4c i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,9 @@
- 	],
- 	"quickOpen.terminal": "Afficher tous les terminaux ouverts",
- 	"terminal": "Terminal",
-+=======
-+	"quickOpen.terminal": "Afficher tous les terminaux ouverts",
-+>>>>>>> .their
- 	"terminalIntegratedConfigurationTitle": "Terminal intégré",
- 	"terminal.integrated.shell.linux": "Chemin de l'interpréteur de commandes utilisé par le terminal sur Linux.",
- 	"terminal.integrated.shellArgs.linux": "Arguments de ligne de commande à utiliser sur le terminal Linux.",
-@@ -36,8 +40,12 @@
- 	"terminal.integrated.env.osx": "Objet avec les variables d’environnement qui seront ajoutées au processus VS Code pour être utilisées par le terminal sous OS X",
- 	"terminal.integrated.env.linux": "Objet avec les variables d’environnement qui seront ajoutées au processus VS Code pour être utilisées par le terminal sous Linux",
- 	"terminal.integrated.env.windows": "Objet avec les variables d’environnement qui seront ajoutées au processus VS Code pour être utilisées par le terminal sous Windows",
-+<<<<<<< .our
- 	"terminal.integrated.showExitAlert": "Afficher une alerte `Le processus terminal s’est arrêté avec le code de sortie` lorsque le code de sortie est différent de zéro.",
- 	"terminal.integrated.experimentalRestore": "Si le fait de restaurer automatiquement les sessions du terminal pour l'espace de travail au lancement de VS Code. Il s'agit d'une fonctionnalité expérimentale; elle peut être boguée et peut changer dans le futur.",
-+=======
-+	"terminal": "Terminal",
-+>>>>>>> .their
- 	"terminalCategory": "Terminal",
- 	"viewCategory": "Affichage"
- }
-\ No newline at end of file
-changed in both
-  base   100644 e0a29182e956aeadbe127b8fc1c4dc3e0c3e87d0 i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 8f10773d1a2d0f2302f3cb3b7d0dac64b3d63462 i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 8c92d52774f98668012d409eb02d42a2fd56f9c3 i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -14,8 +14,11 @@
- 	"workbench.action.terminal.selectAll": "Tout Sélectionner",
- 	"workbench.action.terminal.deleteWordLeft": "Supprimer le mot à gauche",
- 	"workbench.action.terminal.deleteWordRight": "Supprimer le mot à droite",
-+<<<<<<< .our
- 	"workbench.action.terminal.moveToLineStart": "Aller au début de la ligne",
- 	"workbench.action.terminal.moveToLineEnd": "Aller à la fin de la ligne",
-+=======
-+>>>>>>> .their
- 	"workbench.action.terminal.new": "Créer un terminal intégré",
- 	"workbench.action.terminal.new.short": "Nouveau terminal",
- 	"workbench.action.terminal.newWorkspacePlaceholder": "Sélectionner le répertoire de travail actuel pour le nouveau terminal",
-@@ -51,6 +54,7 @@
- 	"workbench.action.terminal.rename.prompt": "Entrer le nom du terminal",
- 	"workbench.action.terminal.focusFindWidget": "Focus sur le widget de recherche",
- 	"workbench.action.terminal.hideFindWidget": "Masquer le widget de recherche",
-+<<<<<<< .our
- 	"nextTerminalFindTerm": "Afficher le terme de recherche suivant",
- 	"previousTerminalFindTerm": "Afficher le terme de recherche précédent",
- 	"quickOpenTerm": "Changer de terminal actif",
-@@ -60,4 +64,7 @@
- 	"workbench.action.terminal.selectToNextCommand": "Sélectionnez pour la commande suivante",
- 	"workbench.action.terminal.selectToPreviousLine": "Sélectionner pour la ligne précédente",
- 	"workbench.action.terminal.selectToNextLine": "Sélectionner pour la ligne suivante"
-+=======
-+	"quickOpenTerm": "Changer de terminal actif"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 2a639927b494a60c0250bc95e3eb2e7d42fc2ce6 i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 e89604d819428678dc7ff9b330667ccb471d786a i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 55c06f2a2f3f86a49c180d232a0b5e8832b15df5 i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -10,7 +10,10 @@
- 	"terminal.foreground": "Couleur de premier plan du terminal.",
- 	"terminalCursor.foreground": "La couleur de premier plan du curseur du terminal.",
- 	"terminalCursor.background": "La couleur d’arrière-plan du curseur terminal. Permet de personnaliser la couleur d’un caractère recouvert par un curseur de bloc.",
-+<<<<<<< .our
- 	"terminal.selectionBackground": "La couleur d’arrière-plan de sélection du terminal.",
- 	"terminal.border": "Couleur de bordure qui sépare les volets de fractionnement dans le terminal. La valeur par défaut est panel.border.",
-+=======
-+>>>>>>> .their
- 	"terminal.ansiColor": "Couleur ansi '{0}' dans le terminal."
- }
-\ No newline at end of file
-changed in both
-  base   100644 3b225062d915ef8fe2a6b9aa02fe9dbfe04517ce i18n/fra/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 7338692978cc41a3c9963a6eada047d9ffbf7ca9 i18n/fra/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 12b4156b835781ca1de4186f3756ef0f9112212f i18n/fra/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -11,8 +11,16 @@
- 	"read the release notes": "Bienvenue dans {0} v{1} ! Voulez-vous lire les notes de publication ?",
- 	"licenseChanged": "Nos termes du contrat de licence ont changé. Veuillez cliquer [ici]({0}) pour les consulter.",
- 	"neveragain": "Ne plus afficher",
-+<<<<<<< .our
- 	"64bitisavailable": "{0} pour Windows 64 bits est maintenant disponible ! Cliquez [ici]({0}) pour en savoir plus.",
- 	"updateIsReady": "Nouvelle mise à jour de {0} disponible.",
-+=======
-+	"64bitisavailable": "{0} pour Windows 64 bits est maintenant disponible !",
-+	"learn more": "En savoir plus",
-+	"updateIsReady": "Nouvelle mise à jour de {0} disponible.",
-+	"thereIsUpdateAvailable": "Une mise à jour est disponible.",
-+	"updateAvailable": "{0} sera mis à jour après avoir redémarré.",
-+>>>>>>> .their
- 	"noUpdatesAvailable": "Aucune mise à jour n'est disponible actuellement.",
- 	"ok": "OK",
- 	"thereIsUpdateAvailable": "Une mise à jour est disponible.",
-changed in both
-  base   100644 4868e0b0e11942a2f0db0667e1fc1cf8b851fb0b i18n/fra/src/vs/workbench/parts/views/browser/views.i18n.json
-  our    100644 fcd571da9266a7b7aa4a1a85d89a0851f378cac1 i18n/fra/src/vs/workbench/parts/views/browser/views.i18n.json
-  their  100644 b7b061cf58773d9a570d6c7357b303960fb59fb0 i18n/fra/src/vs/workbench/parts/views/browser/views.i18n.json
-@@ -5,5 +5,9 @@
- // Do not edit this file. It is machine generated.
- {
- 	"viewToolbarAriaLabel": "{0} actions",
-+<<<<<<< .our
- 	"hideView": "Masquer dans la barre latérale"
-+=======
-+	"removeView": "Supprimer de la barre latérale"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 77c399f7d666926a3b1f833b9759bb0fde8f4542 i18n/fra/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  our    100644 10bbc7a9e9670b9a8be87b309aaf0dd19bea459a i18n/fra/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  their  100644 c7bcf7a7820b143333035abb14cb1cf863659a34 i18n/fra/src/vs/workbench/services/configuration/node/configuration.i18n.json
-@@ -9,6 +9,7 @@
- 	"scope.window.description": "Configuration spécifique de la fenêtre, qui peut être configurée dans les paramètres utilisateur ou de l'espace de travail.",
- 	"scope.resource.description": "Configuration spécifique de la ressource, qui peut être configurée dans les paramètres utilisateur, de l'espace de travail ou du dossier.",
- 	"scope.description": "Portée dans laquelle la configuration s’applique. Les portées disponibles sont `window` et `resource`.",
-+<<<<<<< .our
- 	"vscode.extension.contributes.configuration": "Ajoute des paramètres de configuration.",
- 	"invalid.title": "'configuration.title' doit être une chaîne",
- 	"vscode.extension.contributes.defaultConfiguration": "Contribue aux paramètres de configuration d'éditeur par défaut en fonction du langage.",
-@@ -21,4 +22,13 @@
- 	"workspaceConfig.settings.description": "Paramètres de l’espace de travail",
- 	"workspaceConfig.extensions.description": "Extensions de l’espace de travail",
- 	"unknownWorkspaceProperty": "Propriété de configuration d’espace de travail inconnue"
-+=======
-+	"invalid.type": "s'il est défini, 'configuration.type' doit avoir la valeur 'object",
-+	"invalid.title": "'configuration.title' doit être une chaîne",
-+	"vscode.extension.contributes.defaultConfiguration": "Contribue aux paramètres de configuration d'éditeur par défaut en fonction du langage.",
-+	"invalid.properties": "'configuration.properties' doit être un objet",
-+	"workspaceConfig.id.description": "Identificateur d’espace de travail. Utilisé pour stocker l’état d’espace de travail interne, qui peut être perdu lors d'un changement.",
-+	"workspaceConfig.folders.description": "Liste des dossiers à charger dans l’espace de travail. Doit être un chemin d’accès. Par exemple `file:///root/folderA`",
-+	"workspaceConfig.settings.description": "Paramètres de l’espace de travail"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 059a4d8916792b8cbc0a80053689aa75959e6389 i18n/fra/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 2993ced5122221b6a919d7041aa1829b3f2477cf i18n/fra/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 5eacd95546fbf494efedffc16ff70745ea191ddc i18n/fra/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -9,6 +9,7 @@
- 	"openTasksConfiguration": "Ouvrir la configuration des tâches",
- 	"openLaunchConfiguration": "Ouvrir la configuration du lancement",
- 	"open": "Ouvrir les paramètres",
-+<<<<<<< .our
- 	"saveAndRetry": "Enregistrer et Réessayer",
- 	"errorUnknownKey": "Impossible d’écrire dans {0} car {1} n’est pas une configuration recommandée.",
- 	"errorInvalidWorkspaceConfigurationApplication": "Impossible d’écrire {0} dans les paramètres de l’espace de travail. Ce paramètre peut être écrit uniquement dans les paramètres de l’utilisateur.",
-@@ -27,6 +28,19 @@
- 	"errorConfigurationFileDirty": "Impossible d’écrire dans les paramètres de l'utilisateur car le fichier a été modifié. Veuillez s’il vous plaît enregistrer le fichier des paramètres de l'utilisateur et réessayez.",
- 	"errorConfigurationFileDirtyWorkspace": "Impossible d’écrire dans les paramètres de l’espace de travail, car le fichier est en attente de sauvegarde. Veuillez s’il vous plaît enregistrer le fichier des paramètres de l’espace de travail et essayez à nouveau.",
- 	"errorConfigurationFileDirtyFolder": "Impossible d’écrire dans les paramètres de dossier, car le fichier est en attente de sauvegarde. Veuillez s’il vous plaît enregistrer le fichier des paramètres du dossier '{0}' et essayez à nouveau.",
-+=======
-+	"close": "Fermer",
-+	"saveAndRetry": "Enregistrer les paramètres et recommencer",
-+	"errorUnknownKey": "Impossible d’écrire dans {0} car {1} n’est pas une configuration recommandée.",
-+	"errorInvalidFolderConfiguration": "Impossible d’écrire dans les paramètres de dossier parce que {0} ne supporte pas la portée de ressource de dossier.",
-+	"errorInvalidUserTarget": "Impossible d’écrire dans les paramètres utilisateur parce que {0} ne supporte pas de portée globale.",
-+	"errorInvalidFolderTarget": "Impossible d’écrire dans les paramètres de dossier car aucune ressource n’est fournie.",
-+	"errorNoWorkspaceOpened": "Impossible d’écrire dans {0} car aucun espace de travail n’est ouvert. Veuillez ouvrir un espace de travail et essayer à nouveau.",
-+	"errorInvalidConfiguration": "Impossible d'écrire les paramètres. Ouvrez les **Paramètres utilisateur** pour corriger les erreurs/avertissements présents dans le fichier, puis réessayez.",
-+	"errorInvalidConfigurationWorkspace": "Impossible d'écrire les paramètres. Ouvrez les **Paramètres d'espace de travail** pour corriger les erreurs/avertissements présents dans le fichier, puis réessayez.",
-+	"errorConfigurationFileDirty": "Impossible d'écrire les paramètres, car l'intégrité du fichier est compromise. Enregistrez le fichier des **Paramètres utilisateur**, puis réessayez.",
-+	"errorConfigurationFileDirtyWorkspace": "Impossible d'écrire les paramètres, car l'intégrité du fichier est compromise. Enregistrez le fichier des **Paramètres d'espace de travail**, puis réessayez.",
-+>>>>>>> .their
- 	"userTarget": "Paramètres utilisateur",
- 	"workspaceTarget": "Paramètres de l'espace de travail",
- 	"folderTarget": "Paramètres de dossier"
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/fra/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-  our    100644 67780b76187a9447d925cb0ef823da395cd5db48 i18n/fra/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-  their  100644 c071f5c7c670e9d73bce6f1308c991a06431ec05 i18n/fra/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"errorInvalidFile": "Impossible d’écrire dans le fichier. Veuillez ouvrir le fichier pour corriger les erreurs/avertissements dans le fichier et réessayer.",
- 	"errorFileDirty": "Impossible d’écrire dans le fichier parce que le fichier a été modifié. Veuillez enregistrer le fichier et réessayer."
- }
-\ No newline at end of file
-changed in both
-  base   100644 d541e53470bcf759186321b4beb9983f23440d0c i18n/fra/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 7050924f08d64059ea7847ed31aea3e00de2d358 i18n/fra/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 7f988ebf98b27eac5c77216f5ecd399b4e7d4960 i18n/fra/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-@@ -13,6 +13,7 @@
- 	"noIconThemeDesc": "No file icons",
- 	"iconThemeError": "File icon theme is unknown or not installed.",
- 	"workbenchColors": "Remplace les couleurs du thème de couleur sélectionné.",
-+<<<<<<< .our
- 	"editorColors.comments": "Définit les couleurs et les styles des commentaires",
- 	"editorColors.strings": "Définit les couleurs et les styles des littéraux de chaînes.",
- 	"editorColors.keywords": "Définit les couleurs et les styles des mots clés.",
-@@ -21,5 +22,9 @@
- 	"editorColors.functions": "Définit les couleurs et les styles des déclarations et références de fonctions.",
- 	"editorColors.variables": "Définit les couleurs et les styles des déclarations et références de variables.",
- 	"editorColors.textMateRules": "Définit les couleurs et les styles à l’aide de règles de thème textmate (avancé).",
-+=======
-+	"workbenchColors.deprecated": "Le paramètre n'est plus expérimental et a été renommé 'workbench.colorCustomizations'",
-+	"workbenchColors.deprecatedDescription": "Utiliser 'workbench.colorCustomizations' à la place",
-+>>>>>>> .their
- 	"editorColors": "Remplace les couleurs et le style de la police de l’éditeur du thème par la couleur actuellement sélectionnée."
- }
-\ No newline at end of file
-changed in both
-  base   100644 e5c10b00cae357d3329370d0a11e5f51f7177a68 i18n/hun/extensions/emmet/package.i18n.json
-  our    100644 4e87769482abf2ce774993c5210487918395fb71 i18n/hun/extensions/emmet/package.i18n.json
-  their  100644 2f28878d0d926324aacfbc5c36165ba8448a6fdd i18n/hun/extensions/emmet/package.i18n.json
-@@ -32,6 +32,7 @@
- 	"command.decrementNumberByTen": "Csökkentés 10-zel",
- 	"emmetSyntaxProfiles": "Konkrét szintaktika profiljának meghatározása vagy saját profil használata adott szabályokkal.",
- 	"emmetExclude": "Azon nyelvek listája, ahol az Emmet-rövidítések ne legyenek kibontva.",
-+<<<<<<< .our
- 	"emmetExtensionsPath": "Emmet-profilokat és -kódtöredékeket tartalmazó mappa elérési útja.",
- 	"emmetShowExpandedAbbreviation": "Kibontott Emmet-rövidítések megjelenítése javaslatként. Az \"inMarkupAndStylesheetFilesOnly\" beállítás csak a html, haml, jade, slim, xml, xsl, css, scss, sass, less és stylus típusú tartalmat jelenti. Az \"always\" beállítás a fájl összes részére vonatkozik a jelölőnyelvtől/css-től függetlenül.",
- 	"emmetShowAbbreviationSuggestions": "Lehetséges Emmet-rövidítések megjelenítése javaslatként. Nem használható a stíluslapokon vagy ha az emmet.showExpandedAbbreviation értéke \"never\".",
-@@ -62,4 +63,11 @@
- 	"emmetPreferencesCssMsProperties": "CSS-tulajdonságok vesszővel ellátott listája, melyek 'ms' gyártói előtagot kapnak azoknál az Emmet-rövidtéseknél, melyek `-` karakterrel kezdődnek. Állítsa üres szövegre, ha soha nem szeretne 'ms' előtagot használni.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "A minimális pontszám (0-tól 1-ig), amit egy fuzzy keresési találatnak el kell érnie. Az alacsonyabb értékek álpozitív találatokat eredményezhetnek, míg a magasabb értékek szűkítik a lehetséges találatok számát.",
- 	"emmetOptimizeStylesheetParsing": "Ha az értéke false, az egész fájl fel lesz dolgozva annak meghatározásához, hogy az aktuális pozíció ércényes-e Emmet-rövidítések kibontásához. Ha az értéke true, csak az aktuális pozíció körüli tartalom lesz feldolgozva a CSS/SCSS/LESS-fájlokban."
-+=======
-+	"emmetExtensionsPath": "Az Emmet-profilokat, -kódtöredékeket és -beállításokat tartalmazó mappa. Csak a profilok vannak használva a kiegészítőben, ha az emmet.useNewEmmet beállítás értéke true.",
-+	"emmetShowExpandedAbbreviation": "Kibontott emmet-rövidítések megjelenítése javaslatként. Az \"inMarkupAndStylesheetFilesOnly\" beállítás csak a html, haml, jade, slim, xml, xsl, css, scss, sass, less és stylus típusú tartalmat jelenti. Az \"always\" beállítás a fájl összes részére vonatkozik a jelölőnyelvtől/css-től függetlenül.",
-+	"emmetShowAbbreviationSuggestions": "A lehetséges emmet-rövidítések megjelenítése javaslatként. Nem használható a stíluslapokon vagy ha az emmet.showExpandedAbbreviation értéke \"never\".",
-+	"emmetIncludeLanguages": "Emmet-rövidítések engedélyezése olyan nyelvek esetében, amelyek alapértelmezés szerint nem támogatottak. Egy megfeleltetést kell felvenni a nyelv és egy emmet által támogatott nyelv között.\nPl.: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
-+	"emmetVariables": "Az emmet-kódrészletekben használt változók"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 3e085fae59ae803904737cef0ebcd127a7e0253d i18n/hun/extensions/extension-editing/out/extensionLinter.i18n.json
-  our    100644 5528d4e358b801448ec5dba3aaf0582297480dad i18n/hun/extensions/extension-editing/out/extensionLinter.i18n.json
-  their  100644 e3c13b9c6a9995add772c0920214f974605c4cbb i18n/hun/extensions/extension-editing/out/extensionLinter.i18n.json
-merged
-  result 100644 3da57c3d6665519f79f622d8f7c4b0b04309951c i18n/hun/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-  our    100644 66342aeada8f9437147533f9600ef6c47abefb15 i18n/hun/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-@@ -7,8 +7,5 @@
- 	"emmetConfigurationTitle": "Emmet",
- 	"triggerExpansionOnTab": "Ha engedélyezve van, akkor az Emmet-rövidítések a Tab billentyű lenyomásával oldhatók fel. Nem használható, ha az emmet.useNewemmet beállítás értéke true.",
- 	"emmetPreferences": "Beállítások, melyek módosítják az Emmet műveleteinek és feloldó algoritmusainak viselkedését. Nem használható, ha az emmet.useNewemmet beállítás értéke true.",
--	"emmetSyntaxProfiles": "Konkrét szintaktika profiljának meghatározása vagy saját profil használata adott szabályokkal.",
--	"emmetExclude": "Azon nyelvek listája, ahol az Emmet-rövidítések ne legyenek kibontva.",
--	"emmetExtensionsPath": "Az Emmet-profilokat, -kódtöredékeket és -beállításokat tartalmazó mappa. Csak a profilok vannak használva a kiegészítőben, ha az emmet.useNewEmmet beállítás értéke true.",
- 	"useNewEmmet": "Új Emmet-modulok használata az összes Emmet-funkcióhoz (ami előbb-utóbb helyettesíteni fogja az egyedülálló Emmet-könyvtárat)."
- }
-\ No newline at end of file
-changed in both
-  base   100644 7fbc7fb1516a69fbdc0a5ec691159a33a1f123f8 i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 7fcd4f374ab4f60995cadb201b3438b5f1c1d544 i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 ee0b9750f5650ec8052a84dd3dea81872e18858f i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -13,5 +13,12 @@
- 	"newExtensionLabel": "\"{0}\" kiegészítő megjelenítése",
- 	"editTtile": "Szerkesztés",
- 	"replaceDefaultValue": "Csere a beállításokban",
-+<<<<<<< .our
- 	"copyDefaultValue": "Másolás a beállításokba"
-+=======
-+	"copyDefaultValue": "Másolás a beállításokba",
-+	"unsupportedPHPExecutablePathSetting": "Ez a beállítás csak a felhasználói beállításokban szerepelhet. A PHP munkaterülethez történő konfigurálásához nyisson meg egy PHP-fájlt, majd kattintson a PHP-elérési útra az állapotsoron!",
-+	"unsupportedWorkspaceSetting": "Ez a beállítás csak a felhasználói beállításokban szerepelhet.",
-+	"unsupportedWorkbenchSetting": "Ez a beállítás jelenleg nem alkalmazható. Akkor van használatban, ha közvetlenül nyitja meg ezt a mappát."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 557a3b1f1b3bdc60ae0a3804d7505a407326123b i18n/hun/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  our    100644 7156b4ce412c8251e8f04a4b792b1c2d0136b79a i18n/hun/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  their  100644 5864461ae76309347ec98bd0ccd9139bdb37c9dc i18n/hun/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-changed in both
-  base   100644 30ac3bd312722396d493d3790da22866a84dd463 i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 8ec8f827057c19dd6709715ecc51f43540d7d5cc i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 2b495e02924e1ef9343862deb24d0f31d080f850 i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-changed in both
-  base   100644 3abe72be506dc91ec0eef8e438f3d03b7d012a54 i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 b5d8a4cb5cb8f374a5aeb4f4cc4a537c343663e4 i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 1365065ac1fc0cd8af630400851ff72f17cf98d8 i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -51,6 +51,7 @@
- 	"workbench.action.terminal.rename.prompt": "Adja meg a terminál nevét!",
- 	"workbench.action.terminal.focusFindWidget": "Váltás a keresőmodulra",
- 	"workbench.action.terminal.hideFindWidget": "Keresőmodul elrejtése",
-+<<<<<<< .our
- 	"nextTerminalFindTerm": "Következő keresési kifejezés megjelenítése",
- 	"previousTerminalFindTerm": "Előző keresési kifejezés megjelenítése",
- 	"quickOpenTerm": "Aktív terminál váltása",
-@@ -60,4 +61,7 @@
- 	"workbench.action.terminal.selectToNextCommand": "Következő parancs kiválasztása",
- 	"workbench.action.terminal.selectToPreviousLine": "Kijelölés az előző sorig",
- 	"workbench.action.terminal.selectToNextLine": "Kijelölés a következő sorig"
-+=======
-+	"quickOpenTerm": "Aktív terminál váltása"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 300fc7b40dc299d567e4beedb01b6d1bce16698e i18n/hun/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  our    100644 209303272b75dde2c6c8486d048f4d36b4fd9190 i18n/hun/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  their  100644 3388c59ff7981bac7f1311cf7960a294f80c1119 i18n/hun/src/vs/workbench/services/configuration/node/configuration.i18n.json
-@@ -9,7 +9,11 @@
- 	"scope.window.description": "Ablakspecifikus beállítás, ami konfigurálható a felhasználói vagy munkaterületi beállításokban.",
- 	"scope.resource.description": "Erőforrásspecifikus beállítás, ami beállítható a felhasználói, munkaterületi és mappaszintű beállításokban.",
- 	"scope.description": "A hatókör, amire a beállítás vonatkozik. Az elérhető hatókörök: `window` és `resource`.",
-+<<<<<<< .our
- 	"vscode.extension.contributes.configuration": "Konfigurációs beállításokat szolgáltat.",
-+=======
-+	"invalid.type": "ha meg van adva, a 'configuration.type' értékét egy objektumként kell megadnii",
-+>>>>>>> .their
- 	"invalid.title": "a 'configuration.title' értékét karakterláncként kell megadni",
- 	"vscode.extension.contributes.defaultConfiguration": "Adott nyelvre vonatkozóan szerkesztőbeállításokat szolgáltat.",
- 	"invalid.properties": "A 'configuration.properties' értékét egy objektumként kell megadni",
-changed in both
-  base   100644 459dfe9d8c1c6d76a2a67d59c21dc02a2defa3c5 i18n/hun/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 8838896ef923e5351413eebec6f141118ecced3a i18n/hun/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 b5420a3aa08b02a1b7d7efed67faadb7aae5feec i18n/hun/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -9,6 +9,7 @@
- 	"openTasksConfiguration": "Feladatkonfiguráció megnyitása",
- 	"openLaunchConfiguration": "Indítási konfiguráció megnyitása",
- 	"open": "Beállítások megnyitása",
-+<<<<<<< .our
- 	"saveAndRetry": "Mentés és újrapróbálkozás",
- 	"errorUnknownKey": "Nem sikerült írni a következőbe: {0}. A(z) {1} nem regisztrált beállítás.",
- 	"errorInvalidWorkspaceConfigurationApplication": "Nem sikerült írni a munkaterület beállításaiba, mert ez a beállítás csak a felhasználói beállításokban használható. ",
-@@ -27,6 +28,19 @@
- 	"errorConfigurationFileDirty": "Nem sikerült írni a felhasználói beállításokba, mert a fájl módosítva lett. Mentse a felhasználói beállításokat tartalmazó fájlt, majd próbálja újra!",
- 	"errorConfigurationFileDirtyWorkspace": "Nem sikerült írni a munkaterületi beállításokba, mert a fájl módosítva lett. Mentse a munkaterület beállításait tartalmazó fájlt, majd próbálja újra!",
- 	"errorConfigurationFileDirtyFolder": "Nem sikerült írni a mappa beállításait tartalmazó fájlba, mert a fájl módosítva lett. Mentse a(z) '{0}' mappa beállításait tartalmazó fájlt, majd próbálja újra!",
-+=======
-+	"close": "Bezárás",
-+	"saveAndRetry": "Beállítások mentése és újrapróbálkozás",
-+	"errorUnknownKey": "Nem sikerült írni a következőbe: {0}. A(z) {1} nem regisztrált beállítás.",
-+	"errorInvalidFolderConfiguration": "Nem sikerült írni a mappa beállításaiba, mert a(z) {0} nem támogatott mappa típusú erőforrások hatókörében.",
-+	"errorInvalidUserTarget": "Nem sikerült írni a felhasználói beállításokba, mert a(z) {0} nem támogatott globális hatókörben.",
-+	"errorInvalidFolderTarget": "Nem sikerült írni a mappa beállításaiba, mert nincs erőforrás megadva.",
-+	"errorNoWorkspaceOpened": "Nem sikerült írni a következőbe: {0}. Nincs munkaterület megnyitva. Nyisson meg egy munkaterületet, majd próbálja újra!",
-+	"errorInvalidConfiguration": "Nem sikerült írni a beállításokba. Nyissa meg a **Felhasználói beállításokat**, javítsa a hibákat és figyelmeztetéseket a fájlban, majd próbálja újra!",
-+	"errorInvalidConfigurationWorkspace": "Nem sikerült írni a beállításokba. Nyissa meg a **Munkaterült beállításait**, javítsa a hibákat és figyelmeztetéseket a fájlban, majd próbálja újra!",
-+	"errorConfigurationFileDirty": "Nem sikerült írni a beállításokba, mert a fájl módosítva lett. Mentse a **Felhasználói beállítások** fájlt, majd próbálja újra!",
-+	"errorConfigurationFileDirtyWorkspace": "Nem sikerült írni a beállításokba, mert a fájl módosítva lett. Mentse a **Munkaterület beállításai** fájlt, majd próbálja újra!",
-+>>>>>>> .their
- 	"userTarget": "Felhasználói beállítások",
- 	"workspaceTarget": "Munkaterület-beállítások",
- 	"folderTarget": "Mappabeálíltások"
-changed in both
-  base   100644 702045560ca96479bda9b9411bf1d371f3c874c9 i18n/ita/extensions/emmet/package.i18n.json
-  our    100644 325af035e69c09e1e32c51cdc976ffb0a4047641 i18n/ita/extensions/emmet/package.i18n.json
-  their  100644 54c9cc403a2a41e28eee83aa568ddecf22d199e1 i18n/ita/extensions/emmet/package.i18n.json
-@@ -31,6 +31,7 @@
- 	"command.incrementNumberByTen": "Aumenta di 10",
- 	"command.decrementNumberByTen": "Riduci di 10",
- 	"emmetSyntaxProfiles": "Consente di definire il profilo per la sintassi specificata oppure di usare un profilo personalizzato con regole specifiche.",
-+<<<<<<< .our
- 	"emmetExclude": "Una matrice di linguaggi dove le abbreviazioni Emmet non dovrebbero essere espanse.",
- 	"emmetExtensionsPath": "Percorso di una cartella contenente profili e snippet Emmet.'",
- 	"emmetShowExpandedAbbreviation": "Mostra le abbreviazioni Emmet espanse come suggerimenti.\nL'opzione \"inMarkupAndStylesheetFilesOnly\" si applica a html, haml, jade, slim, xml, xsl, css, scss, sass, less e stylus.\nL'opzione \"sempre\" (always) si applica a tutte le parti del file indipendentemente dal markup/css.",
-@@ -62,4 +63,12 @@
- 	"emmetPreferencesCssMsProperties": "Proprietà CSS delimitate da virgola che assumono il prefisso 'ms' del vendor quando utilizzate nelle abbreviazioni di Emmet che iniziano per '-'. Per evitare sempre il prefisso 'ms' impostare stringa vuota.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "Il valore minimo (da 0 a 1) che dovrebbe raggiungere un'abbreviazione di fuzzy-match. I valori più bassi possono produrre molti falsi positivi, i valori più alti possono ridurre le possibili corrispondenze.",
- 	"emmetOptimizeStylesheetParsing": "Se è impostato su false, l'intero file viene analizzato per determinare se la posizione corrente è valida per l'espansione delle abbreviazioni di Emmet. Se è impostato su true, viene analizzato solo il contenuto circostante alla posizione corrente nei file css/scss/less."
-+=======
-+	"emmetExclude": "Matrice di linguaggi in cui le abbreviazioni Emmet non devono essere espanse.",
-+	"emmetExtensionsPath": "Percorso di una cartella contenente profili emmet, frammenti e preferenze . Quando emmet.useNewEmmet è impostato a true, solo i profili vengono gestiti dal percorso delle estensioni.",
-+	"emmetShowExpandedAbbreviation": "Mostra le abbreviazioni emmet espanse come suggerimenti.\nL'opzione \"inMarkupAndStylesheetFilesOnly\" si applica a html, haml, jade, slim, xml, xsl, css, scss, sass, less e stylus.\nL'opzione \"sempre\" (always) si applica a tutte le parti del file indipendentemente dal markup/css.",
-+	"emmetShowAbbreviationSuggestions": "Mostra possibili abbreviazioni emmet come suggerimenti. Non si applica a fogli di stile o quando emmet.showExpandedAbbreviation è impostata a \"mai\" (never).",
-+	"emmetIncludeLanguages": "Abilita le abbreviazioni emmet in linguaggi che non sono normalmente supportati. Aggiungere un mapping tra il linguaggio ed il linguaggio supportato da emmet.\n Ad esempio: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
-+	"emmetVariables": "Variabili da utilizzare nei frammenti di emmet"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 4fb28078ec9d4499a88f6978fc37bd9a593d8322 i18n/ita/extensions/extension-editing/out/extensionLinter.i18n.json
-  our    100644 ffb77fa1af8844a4780620b5955b34dc93a0f44f i18n/ita/extensions/extension-editing/out/extensionLinter.i18n.json
-  their  100644 a8b4072cafe1942f3f070a324988ab13d4d8e777 i18n/ita/extensions/extension-editing/out/extensionLinter.i18n.json
-changed in both
-  base   100644 26d0cd57ac25cccf17f52fff5b14fe94775a32c2 i18n/ita/extensions/git/out/commands.i18n.json
-  our    100644 b8b9f0490197b0e5904f4f035caca3a7f04c7df9 i18n/ita/extensions/git/out/commands.i18n.json
-  their  100644 955f18ac9507c0b5b2d24a44903a4286ff8a22f7 i18n/ita/extensions/git/out/commands.i18n.json
-changed in both
-  base   100644 81907bad2d4d1b77dd6ad7b8b7ad0c8d79be6f3d i18n/ita/extensions/markdown/out/previewContentProvider.i18n.json
-  our    100644 9207358bc4d40c21d04b6b28dd176c9a48857762 i18n/ita/extensions/markdown/out/previewContentProvider.i18n.json
-  their  100644 9a12e1b113c36fe5304e1ef09cade00a2ae4afd4 i18n/ita/extensions/markdown/out/previewContentProvider.i18n.json
-@@ -4,7 +4,11 @@
-  *--------------------------------------------------------------------------------------------*/
- // Do not edit this file. It is machine generated.
- {
-+<<<<<<< .our
- 	"preview.securityMessage.text": "Alcuni contenuti sono stati disabilitati in questo documento",
-+=======
-+	"preview.securityMessage.text": "Alcuni contenuti sono stati disattivati in questo documento",
-+>>>>>>> .their
- 	"preview.securityMessage.title": "Contenuti potenzialmente non sicuri sono stati disattivati nell'anteprima del Markdown. Modificare l'impostazione di protezione dell'anteprima del Markdown per consentire la visualizzazione di contenuto insicuro o abilitare gli script",
- 	"preview.securityMessage.label": "Avviso di sicurezza contenuto disabilitato"
- }
-\ No newline at end of file
-changed in both
-  base   100644 4b1b334651f547ec735bfefa72dbb76ace7100f2 i18n/ita/extensions/markdown/out/security.i18n.json
-  our    100644 17900416bd63016cb376b5bd866dbacf0ec6bdd5 i18n/ita/extensions/markdown/out/security.i18n.json
-  their  100644 5b7d36b109ea6ca6ebd2b571be1d6f4fb6b05627 i18n/ita/extensions/markdown/out/security.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -16,5 +17,11 @@
- 	"enableSecurityWarning.title": "Abilita anteprima degli avvisi di protezione in questa area di lavoro",
- 	"disableSecurityWarning.title": "Disabilita anteprima degli avvisi di protezione in questa area di lavoro",
- 	"toggleSecurityWarning.description": "Non influisce sul livello di sicurezza del contenuto",
-+=======
-+	"preview.showPreviewSecuritySelector.strictTitle": "Strict. Carica solo contenuto protetto.",
-+	"preview.showPreviewSecuritySelector.currentSelection": "Impostazione corrente",
-+	"preview.showPreviewSecuritySelector.insecureContentTitle": "Consente il caricamento di contenuti via http.",
-+	"preview.showPreviewSecuritySelector.scriptsAndAllContent": "Consente l'esecuzione di tutti i contenuti e script. Sconsigliato.",
-+>>>>>>> .their
- 	"preview.showPreviewSecuritySelector.title": "Seleziona impostazioni di protezione per le anteprime Markdown in questa area di lavoro"
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/ita/src/vs/code/electron-main/auth.i18n.json
-  our    100644 674db87b9f5bd5ed58dc33b63fa2954ba609d608 i18n/ita/src/vs/code/electron-main/auth.i18n.json
-  their  100644 354aecd5ccb0c070c75c8aff899a5065c07bbb54 i18n/ita/src/vs/code/electron-main/auth.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"authRequire": "Autenticazione proxy necessaria",
- 	"proxyauth": "Il proxy {0} richiede l'autenticazione."
- }
-\ No newline at end of file
-changed in both
-  base   100644 ad8399e27f9af629ea7a40b87affc69453bfff38 i18n/ita/src/vs/code/electron-main/menus.i18n.json
-  our    100644 a5f6c5e0343adf224d6df3a61663d9695836512e i18n/ita/src/vs/code/electron-main/menus.i18n.json
-  their  100644 17dc1a5be640cc2b4d33f9f71a9a6ce61d379935 i18n/ita/src/vs/code/electron-main/menus.i18n.json
-@@ -24,12 +24,21 @@
- 	"miQuit": "Chiudi {0}",
- 	"miNewFile": "&&Nuovo file",
- 	"miOpen": "&&Apri...",
-+<<<<<<< .our
- 	"miOpenWorkspace": "Aprire Wor&&kspace...",
- 	"miOpenFolder": "Apri &&cartella...",
- 	"miOpenFile": "&&Apri file...",
- 	"miOpenRecent": "Apri &&recenti",
- 	"miSaveWorkspaceAs": "Salva area di lavoro con nome...",
- 	"miAddFolderToWorkspace": "A&&ggiungere cartella all'area di lavoro...",
-+=======
-+	"miOpenWorkspace": "&&Apri area di lavoro...",
-+	"miOpenFolder": "Apri &&cartella...",
-+	"miOpenFile": "&&Apri file...",
-+	"miOpenRecent": "Apri &&recenti",
-+	"miSaveWorkspaceAs": "&&Salva area di lavoro con nome...",
-+	"miAddFolderToWorkspace": "&&Aggiungi cartella all'area di lavoro...",
-+>>>>>>> .their
- 	"miSave": "&&Salva",
- 	"miSaveAs": "Salva con nome...",
- 	"miSaveAll": "Salva &&tutto",
-@@ -189,5 +198,11 @@
- 	"miDownloadingUpdate": "Download dell'aggiornamento...",
- 	"miInstallUpdate": "Installa aggiornamento...",
- 	"miInstallingUpdate": "Installazione dell'aggiornamento...",
-+<<<<<<< .our
- 	"miRestartToUpdate": "Riavvia per aggiornare..."
-+=======
-+	"miCheckForUpdates": "Verifica disponibilità aggiornamenti...",
-+	"aboutDetail": "\nVersione {0}\nCommit {1}\nData {2}\nShell {3}\nRenderer {4}\nNodo {5}\nArchitettura {6}",
-+	"okButton": "OK"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ec56b9229e6a5bc84b8bd609fa288c4f6d8da462 i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 f91d8d15e9f7c53e3b2a0166aab270c9bf1f772e i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 3bf52e527e6ede6f17a79cbeaf1286be631d6814 i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json
-changed in both
-  base   100644 acd2bdb447c6f8eb7c4ddfba5d02209fc3f5b6d1 i18n/ita/src/vs/editor/contrib/find/common/findController.i18n.json
-  our    100644 753c08a072abf07ee50bf0b788eff38c641f8761 i18n/ita/src/vs/editor/contrib/find/common/findController.i18n.json
-  their  100644 0b6e1248aab60b64c0c8f7ae39434e21c71869f8 i18n/ita/src/vs/editor/contrib/find/common/findController.i18n.json
-@@ -10,6 +10,15 @@
- 	"nextSelectionMatchFindAction": "Trova selezione successiva",
- 	"previousSelectionMatchFindAction": "Trova selezione precedente",
- 	"startReplace": "Sostituisci",
-+<<<<<<< .our
-+=======
-+	"addSelectionToNextFindMatch": "Aggiungi selezione a risultato ricerca successivo",
-+	"addSelectionToPreviousFindMatch": "Aggiungi selezione a risultato ricerca precedente",
-+	"moveSelectionToNextFindMatch": "Sposta ultima selezione a risultato ricerca successivo",
-+	"moveSelectionToPreviousFindMatch": "Sposta ultima selezione a risultato ricerca precedente",
-+	"selectAllOccurrencesOfFindMatch": "Seleziona tutte le occorrenze del risultato ricerca",
-+	"changeAll.label": "Cambia tutte le occorrenze",
-+>>>>>>> .their
- 	"showNextFindTermAction": "Mostra il termine di ricerca successivo",
- 	"showPreviousFindTermAction": "Mostra il termine di ricerca precedente"
- }
-\ No newline at end of file
-changed in both
-  base   100644 0375c531a5b488902d70ee2ee25d469f302d74f2 i18n/ita/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 967a9460fbe454ea199d54b4639f97929c5854cd i18n/ita/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 c678682d4f3f868965b382aa8796194222327e44 i18n/ita/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -9,6 +9,7 @@
- 	"openFile": "Apri file...",
- 	"openFolder": "Apri cartella...",
- 	"openFileFolder": "Apri...",
-+<<<<<<< .our
- 	"globalRemoveFolderFromWorkspace": "Rimuovi cartella dall'area di lavoro...",
- 	"saveWorkspaceAsAction": "Salva area di lavoro come...",
- 	"save": "&&Salva",
-@@ -16,4 +17,24 @@
- 	"openWorkspaceAction": "Apri area di lavoro...",
- 	"openWorkspaceConfigFile": "Apri file di configurazione dell'area di lavoro",
- 	"duplicateWorkspaceInNewWindow": "Duplica area di lavoro nella nuova finestra"
-+=======
-+	"reload": "&&Ricarica",
-+	"cancel": "Annulla",
-+	"newWorkspaceFormExisting": "Nuova area di lavoro da una esistente...",
-+	"select": "&&Seleziona",
-+	"selectWorkspace": "Seleziona cartelle per l'area di lavoro",
-+	"addSupported": "Per aprire più cartelle, è necessario ricaricare la finestra.",
-+	"addFolderToWorkspace": "Aggiungi cartella all'area di lavoro...",
-+	"add": "&&Aggiungi",
-+	"addFolderToWorkspaceTitle": "Aggiungi cartella all'area di lavoro",
-+	"removeFolderFromWorkspace": "Rimuovi cartella dall'area di lavoro",
-+	"saveWorkspaceAsAction": "Salva area di lavoro come...",
-+	"saveEmptyWorkspaceNotSupported": "Aprire prima un'area di lavoro da salvare.",
-+	"saveNotSupported": "Per salvare l'area di lavoro, è necessario ricaricare la finestra.",
-+	"save": "&&Salva",
-+	"saveWorkspace": "Salva area di lavoro",
-+	"openWorkspaceAction": "Apri area di lavoro...",
-+	"newWorkspace": "Nuova area di lavoro...",
-+	"openWorkspaceConfigFile": "Apri file di configurazione dell'area di lavoro"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ad121771c6a44313ea205a217713874a62d1e732 i18n/ita/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 52332d26b607badcbfc6c1f6cb20390d01164f46 i18n/ita/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 34ec4817bae4966455cf5b020e3e55e33505f43e i18n/ita/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 3ba6e23918d44e7a5b3339d1fab97d86ab3415f5 i18n/ita/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-  our    100644 f27bb31505eb3962ff3d4e355a3108ad6a5fb52c i18n/ita/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-  their  100644 69d8f45b5e69ab79fd1d9c2cf98400e671c3b2c6 i18n/ita/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,9 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"compositePart.hideSideBarLabel": "Nascondi barra laterale",
-+>>>>>>> .their
- 	"focusSideBar": "Sposta lo stato attivo nella barra laterale",
- 	"viewCategory": "Visualizza"
- }
-\ No newline at end of file
-changed in both
-  base   100644 94f6d56ff31d1a24e80dce299dfc00189c548124 i18n/ita/src/vs/workbench/common/theme.i18n.json
-  our    100644 35f6e5209eb686bd26e13c1a8f96b6d2fe49fc8a i18n/ita/src/vs/workbench/common/theme.i18n.json
-  their  100644 22060bc365d75711d5e0982af4a0e521aff64a7f i18n/ita/src/vs/workbench/common/theme.i18n.json
-@@ -61,6 +61,7 @@
- 	"titleBarActiveBackground": "Colore di sfondo della barra di titolo quando la finestra è attiva. Si noti che questo colore è attualmente solo supportati su macOS.",
- 	"titleBarInactiveBackground": "Colore di sfondo della barra del titolo quando la finestra è inattiva. Si noti che questo colore è attualmente supportato solo su macOS.",
- 	"titleBarBorder": "Colore del bordo della barra di stato. Si noti che questo colore è attualmente supportato solo su macOS.",
-+<<<<<<< .our
- 	"notificationCenterBorder": "Colore del bordo del centro notifiche. Le notifiche scorrono dalla parte inferiore destra della finestra.",
- 	"notificationToastBorder": "Colore del bordo dell'avviso popup di notifica. Le notifiche scorrono dalla parte inferiore destra della finestra.",
- 	"notificationsForeground": "Colore primo piano delle notifiche. Le notifiche scorrono dalla parte inferiore destra della finestra.",
-@@ -69,4 +70,17 @@
- 	"notificationCenterHeaderForeground": "Colore primo piano dell'intestazione del centro notifiche. Le notifiche scorrono dalla parte inferiore destra della finestra.",
- 	"notificationCenterHeaderBackground": "Colore di sfondo dell'intestazione del centro notifiche. Le notifiche scorrono dalla parte inferiore destra della finestra.",
- 	"notificationsBorder": "Colore del bordo che separa le notifiche da altre notifiche nel centro notifiche. Le notifiche scorrono dalla parte inferiore destra della finestra."
-+=======
-+	"notificationsForeground": "Colore primo piano delle notifiche. Le notifiche scorrono dalla parte superiore della finestra.",
-+	"notificationsBackground": "Colore di sfondo delle notifiche. Le notifiche scorrono dalla parte superiore della finestra.",
-+	"notificationsButtonBackground": "Colore di sfondo del pulsante delle notifiche. Le notifiche scorrono dalla parte superiore della finestra.",
-+	"notificationsButtonHoverBackground": "Colore di sfondo del pulsante delle notifiche al passaggio del mouse. Le notifiche scorrono dalla parte superiore della finestra.",
-+	"notificationsButtonForeground": "Colore primo piano del pulsante delle notifiche. Le notifiche scorrono dalla parte superiore della finestra.",
-+	"notificationsInfoBackground": "Colore di sfondo delle notifiche informative. Le notifiche scorrono dalla parte superiore della finestra.",
-+	"notificationsInfoForeground": "Colore primo piano delle notifiche informative. Le notifiche scorrono dalla parte superiore della finestra.",
-+	"notificationsWarningBackground": "Colore di sfondo delle notifiche di avviso. Le notifiche scorrono dalla parte superiore della finestra.",
-+	"notificationsWarningForeground": "Colore primo piano delle notifiche di avviso. Le notifiche scorrono dalla parte superiore della finestra.",
-+	"notificationsErrorBackground": "Colore di sfondo delle notifiche di errore. Le notifiche scorrono dalla parte superiore della finestra.",
-+	"notificationsErrorForeground": "Colore primo piano delle notifiche di errore. Le notifiche scorrono dalla parte superiore della finestra."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ce7aaf644a53c9cc9154e313aa2eb37bea55d460 i18n/ita/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 9737d645d67a50d571dc86669b68ed740de20eba i18n/ita/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 a79d647bc84eaad5ce6eb3d2e29a016c01b00c08 i18n/ita/src/vs/workbench/electron-browser/actions.i18n.json
-changed in both
-  base   100644 310e156f9037debf76cdfb22f7fdaff2963cd69f i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 16fec1a5d98f225249a95297ad06c45ba75efafc i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 59acb53f222b5dbb3bd1b9a82ed342bf7933bc00 i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,6 +35,7 @@
- 	"panelDefaultLocation": "Controlla la posizione predefinita del pannello. Può essere mostrato nella parte inferiore o a destra del banco di lavoro.",
- 	"statusBarVisibility": "Controlla la visibilità della barra di stato nella parte inferiore del workbench.",
- 	"activityBarVisibility": "Controlla la visibilità della barra attività nel workbench.",
-+<<<<<<< .our
- 	"viewVisibility": "Controlla la visibilità delle azioni dell'intestazione della visualizzazione. Le azioni dell'intestazione della visualizzazione possono essere sempre visibili oppure visibili solo quando lo stato attivo è spostato sulla visualizzazione o si passa con il puntatore sulla visualizzazione.",
- 	"fontAliasing": "Controlla il metodo di aliasing dei caratteri nell'area di lavoro.\n- default: anti-aliasing dei caratteri a livello di sub-pixel. Nella maggior parte delle visualizzazioni non retina consentirà di ottenere un testo con il massimo contrasto.\n- antialiased: anti-aliasing dei caratteri a livello di pixel, invece che a livello di sub-pixel. Consente di visualizzare i caratteri più chiari.\n- none: disabilita l'anti-aliasing dei caratteri. Il testo verrà visualizzato con contorni irregolari.\n- auto: applica automaticamente `default` o `antialiased` in base al valore DPI degli schermi.",
- 	"workbench.fontAliasing.default": "Anti-aliasing dei caratteri a livello di sub-pixel. Nella maggior parte delle visualizzazioni non retina consentirà di ottenere un testo con il massimo contrasto.",
-@@ -43,6 +44,15 @@
- 	"workbench.fontAliasing.auto": "Applica automaticamente `default` o `antialiased` in base al valore DPI degli schermi.",
- 	"enableNaturalLanguageSettingsSearch": "Controlla se abilitare la modalità di ricerca in linguaggio naturale per le impostazioni.",
- 	"windowConfigurationTitle": "Finestra",
-+=======
-+	"closeOnFileDelete": "Controlla se gli editor che visualizzano un file devono chiudersi automaticamente quando il file viene eliminato o rinominato da un altro processo. Se si disabilita questa opzione, in una simile circostanza l'editor verrà aperto e i file risulteranno modificati ma non salvati. Nota: se si elimina il file dall'interno dell'applicazione, l'editor verrà sempre chiuso e i file modificati ma non salvati non verranno mai chiusi allo scopo di salvaguardare i dati.",
-+	"fontAliasing": "Controlla il metodo di aliasing dei caratteri nell'area di lavoro.\n- impostazione predefinita: anti-aliasing dei caratteri a livello di sub-pixel. Nella maggior parte delle visualizzazioni non retina consentirà di ottenere un testo con il massimo contrasto.\n- anti-aliasing: anti-aliasing dei caratteri a livello di pixel, invece che a livello di sub-pixel. Consente di visualizzare i caratteri più chiari.\n- nessuno: disabilita l'anti-aliasing dei caratteri. Il testo verrà visualizzato con contorni irregolari.",
-+	"workbench.fontAliasing.default": "Anti-aliasing dei caratteri a livello di sub-pixel. Nella maggior parte delle visualizzazioni non retina consentirà di ottenere un testo con il massimo contrasto.",
-+	"workbench.fontAliasing.antialiased": "Anti-aliasing dei caratteri a livello di pixel, invece che a livello di sub-pixel. Consente di visualizzare i caratteri più chiari.",
-+	"workbench.fontAliasing.none": "Disabilita l'anti-aliasing dei caratteri. Il testo verrà visualizzato con contorni irregolari. ",
-+	"swipeToNavigate": "Scorrere orizzontalmente con tre dita per spostarsi tra i file aperti.",
-+	"workbenchConfigurationTitle": "Area di lavoro",
-+>>>>>>> .their
- 	"window.openFilesInNewWindow.on": "I file verranno aperti in una nuova finestra",
- 	"window.openFilesInNewWindow.off": "I file verranno aperti nella finestra con la cartella dei file aperta o nell'ultima finestra attiva",
- 	"window.openFilesInNewWindow.defaultMac": "I file verranno aperti nella finestra con la cartella dei file aperta o nell'ultima finestra attiva a meno che non vengano aperti tramite il pannello Dock o da Finder",
-changed in both
-  base   100644 424eb5bfbe5e2bbdb12572d48ee7a9652feebbda i18n/ita/src/vs/workbench/electron-browser/window.i18n.json
-  our    100644 44890b35904935df91f62f43dcb119e76f1ea136 i18n/ita/src/vs/workbench/electron-browser/window.i18n.json
-  their  100644 9cc484cd55fa4a4a3a9e5684bbd54e105687f90b i18n/ita/src/vs/workbench/electron-browser/window.i18n.json
-@@ -12,5 +12,10 @@
- 	"copy": "Copia",
- 	"paste": "Incolla",
- 	"selectAll": "Seleziona tutto",
-+<<<<<<< .our
- 	"runningAsRoot": "Non è consigliabile eseguire {0} come utente root."
-+=======
-+	"confirmOpen": "Aprire le aree di lavoro {0}?",
-+	"confirmOpenButton": "&&Apri"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e9aa41595293a9979a315b1c0221357f8693c4e7 i18n/ita/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  our    100644 f41f96b7c06ef68c16637b9d036583a234592b6c i18n/ita/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  their  100644 01c6c92eb4a8eb3f8e525b4d988818c32f65cb0c i18n/ita/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-changed in both
-  base   100644 9df96f524f91cc77216cccfb811c2d5665334335 i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 c085858a8c6aed272feca37cbd61f5b25e9ca236 i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 22fadcc87095b65a95f0a5f0cb7d8a3bfdcab63c i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -28,7 +28,13 @@
- 	"preLaunchTaskExitCode": "L'attività di preavvio '{0}' è stata terminata ed è stato restituito il codice di uscita {1}.",
- 	"showErrors": "Mostra errori",
- 	"noFolderWorkspaceDebugError": "Non è possibile eseguire il debug del file attivo. Assicurarsi che sia salvato su disco e che sia installata un'estensione di debug per tale tipo di file.",
-+<<<<<<< .our
- 	"cancel": "Annulla",
- 	"DebugTaskNotFound": "Impossibile trovare l'attività '{0}'.",
- 	"taskNotTracked": "L'attività '{0}' non può essere rintracciata."
-+=======
-+	"NewLaunchConfig": "Impostare il file di configurazione di avvio per l'applicazione. {0}",
-+	"DebugTaskNotFound": "L'attività di preavvio '{0}' non è stata trovata.",
-+	"differentTaskRunning": "L'attività '{0}' è già in esecuzione. Non è possibile eseguire l'attività di preavvio '{1}'."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c13997bfc292d9bff65fb64110c83127e3e7e65b i18n/ita/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  our    100644 8560eb8087005f6b67c1d2ea250d63444711322a i18n/ita/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  their  100644 cfdee9e4ec21b8992ede41cfc09a5ba4d4ea546e i18n/ita/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-merged
-  result 100644 040e6f9598b143eea0272a5c2817cd654ac7aac3 i18n/ita/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-  our    100644 ef13f9c1246f5e81d39e7a5f038bcca803b048de i18n/ita/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-@@ -7,8 +7,5 @@
- 	"emmetConfigurationTitle": "Emmet",
- 	"triggerExpansionOnTab": "Se abilitate, le abbreviazioni Emmet vengono espanse quando si preme TAB. Non applicabile quando emmet.useNewemmet è impostato su true.",
- 	"emmetPreferences": "Preferenze usate per modificare il comportamento di alcune azioni e i resolver di Emmet. Non applicabile quando emmet.useNewemmet è impostato su true.",
--	"emmetSyntaxProfiles": "Consente di definire il profilo per la sintassi specificata oppure di usare un profilo personalizzato con regole specifiche.",
--	"emmetExclude": "Matrice di linguaggi in cui le abbreviazioni Emmet non devono essere espanse.",
--	"emmetExtensionsPath": "Percorso di una cartella contenente snippet, preferenze e profili Emmet. Quando emmet.useNewEmmet è impostato su true, vengono gestiti solo i profili di questo percorso di estensione.",
- 	"useNewEmmet": "Prova i nuovi moduli emmet (che andrà a sostituire la vecchia libreria singola emmet) per tutte le funzionalità emmet."
- }
-\ No newline at end of file
-changed in both
-  base   100644 adf7b3f404290e74c46bfea58335644aa063f088 i18n/ita/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  our    100644 2e6bc1e73d84675841055020e554bed2fb64eb7d i18n/ita/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  their  100644 1b150a45b5f94b4afe926f7593fd6e0077139c2c i18n/ita/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-changed in both
-  base   100644 2430ac5cd9b3b29fa37118750b6fe63a191687ba i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 8a9cb12815ff71703170d90088b67ed38f90d1c9 i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 13e8e8dfc1551d226735430f58193f3c1c7ef5f4 i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-changed in both
-  base   100644 ffdd66502955969b90340078de979da82d7b77ba i18n/ita/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  our    100644 7d23a38e70345906d2303122bbd907e2d0b21fb4 i18n/ita/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  their  100644 53e6b0a907e6d2f59e5eb7f1e7712a3ddb628b85 i18n/ita/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-@@ -69,7 +69,11 @@
- 	"invalidFileNameError": "Il nome **{0}** non è valido per un nome file o un nome di cartella. Scegliere un nome diverso.",
- 	"filePathTooLongError": "Con il nome **{0}** il percorso diventa troppo lungo. Scegliere un nome più breve.",
- 	"compareWithSaved": "Confronta file attivo con file salvato",
-+<<<<<<< .our
- 	"modifiedLabel": "{0} (su disco) ↔ {1}",
- 	"compareWithClipboard": "Confronta il file attivo con gli appunti",
- 	"clipboardComparisonLabel": "Appunti ↔ {0}"
-+=======
-+	"modifiedLabel": "{0} (su disco) ↔ {1}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8139ec4bf13634ecc5a8e71a5731b8961f21c6bf i18n/ita/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 1f2167be7be1086956a1ada80d0c4b23b8cc1195 i18n/ita/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 c2fa70491efbf929c519986147f9b7d1b23b6778 i18n/ita/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-@@ -40,6 +40,7 @@
- 	"dynamicHeight": "Controlla se l'altezza della sezione degli editor aperti deve essere adattata o meno dinamicamente al numero di elementi.",
- 	"autoReveal": "Controlla se Esplora risorse deve rivelare automaticamente e selezionare i file durante l'apertura.",
- 	"enableDragAndDrop": "Controlla se Esplora risorse deve consentire lo spostamento di file e cartelle tramite trascinamento della selezione.",
-+<<<<<<< .our
- 	"confirmDragAndDrop": "Controlla se Esplora risorse deve chiedere conferma prima di spostare file e cartelle tramite trascinamento della selezione.",
- 	"confirmDelete": "Controlla se Esplora risorse deve chiedere una conferma quando si elimina file tramite il cestino.",
- 	"sortOrder.default": "I file e le cartelle vengono ordinati in ordine alfabetico in base al nome. Le cartelle vengono visualizzate prima dei file.",
-@@ -50,4 +51,12 @@
- 	"sortOrder": "Controlla l'ordinamento di file e cartelle in Esplora risorse. Oltre all'ordinamento predefinito, è possibile impostare l'ordine su 'mixed' (file e cartelle vengono ordinati insieme), 'type' (in base al tipo di file), 'modified' (in base alla data dell'ultima modifica) o 'filesFirst' (i file vengono ordinati prima delle cartelle).",
- 	"explorer.decorations.colors": "Controlli se decorazioni file dovrebbero usare colori.",
- 	"explorer.decorations.badges": "Controlli se decorazioni file devono utilizzare badge."
-+=======
-+	"sortOrder.default": "I file e le directory vengono ordinati in ordine alfabetico in base al nome. Le directory vengono visualizzate prima dei file.",
-+	"sortOrder.mixed": "File e directory vengono ordinate per nome, in ordine alfabetico, in un unico elenco ordinato.",
-+	"sortOrder.filesFirst": "File e directory vengono ordinate per nome, in ordine alfabetico. I file vengono visualizzati prima delle directory.",
-+	"sortOrder.type": "File e directory vengono ordinate secondo le loro estensioni, in ordine alfabetico. Le directory vengono visualizzate prima dei file.",
-+	"sortOrder.modified": "File e directory sono ordinate per data Ultima modifica, in ordine decrescente. Le directory vengono visualizzate prima dei file.",
-+	"sortOrder": "Controlla la modalità di ordinamento di file e directory in Esplora risorse."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 676f0815dcac6bb63ac0a387c2d196ef579e24e1 i18n/ita/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-  our    100644 49ebceb9611a7d647962c205cef0ff00c56d0e9d i18n/ita/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-  their  100644 7e522e82f6b51650e00ae618865457402413aaf9 i18n/ita/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-@@ -12,5 +12,6 @@
- 	"genericSaveError": "Non è stato possibile salvare '{0}': {1}",
- 	"staleSaveError": "Non è stato possibile salvare '{0}': il contenuto sul disco è più recente. Fare clic su **Confronta** per confrontare la versione corrente con quella sul disco.",
- 	"compareChanges": "Confronta",
--	"saveConflictDiffLabel": "{0} (su disco) ↔ {1} (in {2}) - Risolvere conflitto in fase di salvataggio"
-+	"saveConflictDiffLabel": "{0} (su disco) ↔ {1} (in {2}) - Risolvere conflitto in fase di salvataggio",
-+	"userGuide": "Usare le azioni della barra degli strumenti dell'editor a destra per **annullare** le modifiche o per **sovrascrivere** il contenuto su disco con le modifiche"
- }
-\ No newline at end of file
-changed in both
-  base   100644 12a31fb4c16d1bd5bf004f0683dc07c771544340 i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  our    100644 89b7fb9711b0bbc9cde43748de484037bba899db i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  their  100644 b5f2514add45ca6900c2f6fad9d302721a681e15 i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-@@ -14,6 +14,10 @@
- 	"openGlobalKeybindingsFile": "Apri file dei tasti di scelta rapida",
- 	"openWorkspaceSettings": "Apri impostazioni area di lavoro",
- 	"openFolderSettings": "Apri impostazioni cartella",
-+<<<<<<< .our
-+=======
-+	"pickFolder": "Seleziona cartella",
-+>>>>>>> .their
- 	"configureLanguageBasedSettings": "Configura impostazioni specifiche del linguaggio...",
- 	"languageDescriptionConfigured": "({0})",
- 	"pickLanguage": "Seleziona linguaggio"
-changed in both
-  base   100644 cb813bd7a4fde3650fd4db6a7f515ebc6840120e i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 acbb94499ddd6c7a425c0f53ca65dd8e6248c34e i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 237ebccfb3952a37235180c968a27630d349f3b2 i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -14,4 +15,19 @@
- 	"editTtile": "Modifica",
- 	"replaceDefaultValue": "Sostituisci nelle impostazioni",
- 	"copyDefaultValue": "Copia nelle impostazioni"
-+=======
-+	"emptyUserSettingsHeader": "Inserire le impostazioni qui per sovrascrivere quelle predefinite.",
-+	"errorInvalidConfiguration": "Impossibile scrivere nelle impostazioni. Correggere eventuali errori o avvisi nel file e riprovare.",
-+	"emptyWorkspaceSettingsHeader": "Inserire le impostazioni qui per sovrascrivere le impostazioni utente.",
-+	"emptyFolderSettingsHeader": "Inserire le impostazioni cartella qui per sovrascrivere quelle dell'area di lavoro.",
-+	"defaultFolderSettingsTitle": "Impostazioni cartella predefinite",
-+	"defaultSettingsTitle": "Impostazioni predefinite",
-+	"noSettingsFound": "Non sono state trovate impostazioni.",
-+	"editTtile": "Modifica",
-+	"replaceDefaultValue": "Sostituisci nelle impostazioni",
-+	"copyDefaultValue": "Copia nelle impostazioni",
-+	"unsupportedPHPExecutablePathSetting": "Questa deve essere un'impostazione utente. Per configurare PHP per l'area di lavoro, aprire un file PHP e fare clic su 'Percorso PHP' nella barra di stato.",
-+	"unsupportedWorkspaceSetting": "Questa deve essere un'impostazione utente.",
-+	"unsupportedWorkbenchSetting": "Non è possibile applicare ora questa impostazione. Verrà applicata direttamente all'apertura della cartella."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 dcc0829c0a62a843f06ba3c32379c61a13caa476 i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-  our    100644 5ef406c69728828b1062193472b0ce3832fa87d9 i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-  their  100644 6bdc47b5796d5f81b2089340871f57704f1be47e i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 fe346036c36b558ff4bb96cc47cf0bc0e91a4106 i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 0f87df191445fabeead61c7824e41af78aae9b70 i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -12,4 +13,13 @@
- 	"userSettings": "Impostazioni utente",
- 	"workspaceSettings": "Impostazioni area di lavoro",
- 	"folderSettings": "Impostazioni cartella"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"folderSettingsDetails": "Impostazioni cartella"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 b04fcadda7a309f8ee3f94e3c0c314580c417287 i18n/ita/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  our    100644 1b4ea6a446b0325fa66e3be86914f36ccca4943e i18n/ita/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  their  100644 0a301a74cb4c8c94d24ee7810a68f54a7fa90bdf i18n/ita/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-@@ -8,5 +8,11 @@
- 	],
- 	"relaunchSettingMessage": "È necessario riavviare per rendere effettiva un'impostazione modificata.",
- 	"relaunchSettingDetail": "Fare clic sul pulsante di riavvio per riavviare {0} e abilitare l'impostazione.",
-+<<<<<<< .our
- 	"restart": "&&Riavvia"
-+=======
-+	"restart": "Riavvia",
-+	"relaunchWorkspaceMessage": "Questo cambiamento di area di lavoro richiede un ricaricamento del nostro sistema di estensione.",
-+	"reload": "Ricarica"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 21137b24d8a54c4bc897918ce9bd6f37ae8be047 i18n/ita/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 92c227f579048a55e12147b807cef8b2e56a92a0 i18n/ita/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 942721004dfca3e92f7ae25dc131072f09d76ef2 i18n/ita/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"nextSearchIncludePattern": "Mostra i criteri di inclusione per la ricerca successivi",
- 	"previousSearchIncludePattern": "Mostra i criteri di inclusione per la ricerca precedenti",
- 	"nextSearchExcludePattern": "Mostra i criteri di esclusione per la ricerca successivi",
-@@ -16,6 +19,8 @@
- 	"previousReplaceTerm": "Mostra il termine di ricerca/sostituzione precedente",
- 	"findInFiles": "Cerca nei file",
- 	"replaceInFiles": "Sostituisci nei file",
-+	"findInWorkspace": "Trova nell'area di lavoro...",
-+	"findInFolder": "Trova nella cartella...",
- 	"RefreshAction.label": "Aggiorna",
- 	"CollapseDeepestExpandedLevelAction.label": "Comprimi tutto",
- 	"ClearSearchResultsAction.label": "Cancella",
-changed in both
-  base   100644 13608466e81d1a2ce1b9b826b3a38ff7220a5c98 i18n/ita/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-  our    100644 b79d204589effc5ed05889c9cd02d87b42f12993 i18n/ita/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-  their  100644 53c1288f408313a67d69e60e8b53e7a94a122881 i18n/ita/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"searchFolderMatch.other.label": "Altri file",
- 	"searchFileMatches": "{0} file trovati",
- 	"searchFileMatch": "{0} file trovato",
-changed in both
-  base   100644 fbd469a7550daca18dc85ab74e78c09b4083b346 i18n/ita/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  our    100644 e2aee106234415d5f98623d49849469952f58852 i18n/ita/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  their  100644 7ee59ee05da1047d77e9b323683d4564d52cce35 i18n/ita/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-changed in both
-  base   100644 5894505714eacc34e33a674fd27f44497d02620a i18n/ita/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 96a5512e9db341ff02996bad4ad811078b347739 i18n/ita/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 1dd6d34902893a862645eef38e2170f0cc813e06 i18n/ita/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-changed in both
-  base   100644 5e2515ceeda1fb4d1f5091f575ddef8ff18e119a i18n/ita/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 83baac91404ff175b394c533850a93d01538ab38 i18n/ita/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 ca2d8ed9126d9aebcdb34e40a3f097f6205471e0 i18n/ita/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -12,8 +12,12 @@
- 	"totalWarnings": "{0} avvisi",
- 	"totalInfos": "{0} messaggi informativi",
- 	"problems": "Problemi",
-+<<<<<<< .our
- 	"building": "Compilazione in corso...",
- 	"manyProblems": "Più di 10.000",
-+=======
-+	"manyMarkers": "Più di 99",
-+>>>>>>> .their
- 	"runningTasks": "Visualizza attività in esecuzione",
- 	"tasks": "Attività",
- 	"TaskSystem.noHotSwap": "Se si cambia il motore di esecuzione delle attività con un'attività attiva in esecuzione, è necessario ricaricare la finestra",
-@@ -24,17 +28,25 @@
- 	"TaskService.noTestTask1": "Non è stata definita alcuna attività di test. Contrassegnare un'attività con 'isTestCommand' nel file tasks.json.",
- 	"TaskService.noTestTask2": "Non è stata definita alcuna attività di test. Contrassegnare un'attività come gruppo 'test' nel file tasks.json.",
- 	"TaskServer.noTask": "Attività {0} richiesta per l'esecuzione non trovata",
-+<<<<<<< .our
- 	"TaskService.associate": "associare",
-+=======
-+>>>>>>> .their
- 	"TaskService.attachProblemMatcher.continueWithout": "Continua senza analizzare l'output dell'attività",
- 	"TaskService.attachProblemMatcher.never": "Mai analizzare l'output dell'attività",
- 	"TaskService.attachProblemMatcher.learnMoreAbout": "Ulteriori informazioni sull'analisi dell'output della attività",
- 	"selectProblemMatcher": "Selezionare il tipo di errori e di avvisi per cui analizzare l'output dell'attività",
- 	"customizeParseErrors": "La configurazione dell'attività corrente presenta errori. Per favore correggere gli errori prima di personalizzazione un'attività.",
- 	"moreThanOneBuildTask": "tasks.json contiene molte attività di compilazione. È in corso l'esecuzione della prima.\n",
-+<<<<<<< .our
- 	"TaskSystem.activeSame.background": "L'attività '{0}' è già attiva e in modalità background.",
- 	"TaskSystem.activeSame.noBackground": "L'attività '{0}' è già attiva.",
- 	"terminateTask": "Termina attività",
- 	"restartTask": "Riavvia attività",
-+=======
-+	"TaskSystem.activeSame.background": "L'attività '{0}' è già attiva ed in modalità background. Per terminarla, usare `Termina attività` dal menu Attività",
-+	"TaskSystem.activeSame.noBackground": "L'attività '{0}' è già attiva. Per terminarla utilizzare 'Termina attività...' dal menu Attività.",
-+>>>>>>> .their
- 	"TaskSystem.active": "Al momento c'è già un'attività in esecuzione. Terminarla prima di eseguirne un'altra.",
- 	"TaskSystem.restartFailed": "Non è stato possibile terminare e riavviare l'attività {0}",
- 	"TaskService.noConfiguration": "Errore: Il rilevamento di attività {0} non ha contribuito un'attività nella seguente configurazione: \n{1} \nL'attività verrà ignorata.\n",
-@@ -75,8 +87,13 @@
- 	"TaskService.pickDefaultBuildTask": "Selezionare l'attività da usare come attività di compilazione predefinita",
- 	"TaskService.defaultTestTaskExists": "{0} è già contrassegnato come attività di test predefinita.",
- 	"TaskService.pickDefaultTestTask": "Selezionare l'attività da usare come attività di test predefinita",
-+<<<<<<< .our
- 	"TaskService.pickShowTask": "Selezionare l'attività di cui mostrare l'output",
- 	"TaskService.noTaskIsRunning": "Non ci sono attività in esecuzione",
-+=======
-+	"TaskService.noTaskIsRunning": "Nessuna attività è in esecuzione.",
-+	"TaskService.pickShowTask": "Selezionare l'attività di cui mostrare l'output",
-+>>>>>>> .their
- 	"ShowLogAction.label": "Mostra log attività",
- 	"RunTaskAction.label": "Esegui attività",
- 	"RestartTaskAction.label": "Riavvia attività in esecuzione",
-changed in both
-  base   100644 a966fb16e92421f6486f832d88f979aaa443e2c4 i18n/ita/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  our    100644 b89a9a5d2c851fe192929fd8b043499ee5d305db i18n/ita/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  their  100644 e6292d5689eeba6042524dd0906ae515d92b262a i18n/ita/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/ita/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  our    100644 c79317e1e19d3b7bbd1fb15955a5248e2d4c5229 i18n/ita/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  their  100644 93e2514f3de53d328d9e7d7a72676907700f32d2 i18n/ita/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,6 +10,15 @@
- 	"termEntryAriaLabel": "{0}, selettore terminale",
- 	"termCreateEntryAriaLabel": "{0}, crea un nuovo terminale",
- 	"workbench.action.terminal.newplus": "$(plus) Crea nuovo terminale integrato",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"entryAriaLabel": "{0}, selettore terminale",
-+>>>>>>> .their
- 	"noTerminalsMatching": "Nessun terminale corrispondente",
- 	"noTerminalsFound": "Nessun terminale aperto"
- }
-\ No newline at end of file
-changed in both
-  base   100644 9b3321eecb561ee5c4250f3dbc340afce7e2c67d i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 b43f261b33e96573db19620791c6498f01662657 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 c901f072c339e85c13d643f07d8b675520f60b19 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,9 @@
- 	],
- 	"quickOpen.terminal": "Mostra tutti i terminali aperti",
- 	"terminal": "Terminale",
-+=======
-+	"quickOpen.terminal": "Mostra tutti i terminali aperti",
-+>>>>>>> .their
- 	"terminalIntegratedConfigurationTitle": "Terminale integrato",
- 	"terminal.integrated.shell.linux": "Percorso della shell usata dal terminale in Linux.",
- 	"terminal.integrated.shellArgs.linux": "Argomenti della riga di comando da usare nel terminale Linux.",
-@@ -36,8 +40,12 @@
- 	"terminal.integrated.env.osx": "Oggetto con variabili di ambiente che verrà aggiunto al processo VS Code per essere utilizzato dal terminale su OS X",
- 	"terminal.integrated.env.linux": "Oggetto con variabili di ambiente che verrà aggiunto al processo VS Code per essere utilizzato dal terminale su Linux",
- 	"terminal.integrated.env.windows": "Oggetto con variabili di ambiente che verrà aggiunto al processo VS Code per essere utilizzato dal terminale su Windows",
-+<<<<<<< .our
- 	"terminal.integrated.showExitAlert": "Visualizza avviso \"Il processo terminale ha restituito codice di uscita\" quando il codice di uscita è diverso da zero.",
- 	"terminal.integrated.experimentalRestore": "Indica se ripristinare automaticamente le sessioni di terminale per l'area di lavoro all'avvio di VS Code. Si tratta di un'impostazione sperimentale che potrebbe contenere bug e cambiare in futuro.",
-+=======
-+	"terminal": "Terminale",
-+>>>>>>> .their
- 	"terminalCategory": "Terminale",
- 	"viewCategory": "Visualizza"
- }
-\ No newline at end of file
-changed in both
-  base   100644 a676775b5fcd08117cdab1d48029bc02279376c2 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 9af26b9889eaa5fa492c1556e3e5203a1ebacbf4 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 4ebfe88285e5cbc74276049577954d89e0ddad69 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -14,8 +14,11 @@
- 	"workbench.action.terminal.selectAll": "Seleziona tutto",
- 	"workbench.action.terminal.deleteWordLeft": "Elimina parola a sinistra",
- 	"workbench.action.terminal.deleteWordRight": "Elimina la parola a destra",
-+<<<<<<< .our
- 	"workbench.action.terminal.moveToLineStart": "Passa all'inizio della riga",
- 	"workbench.action.terminal.moveToLineEnd": "Passa alla fine della riga",
-+=======
-+>>>>>>> .their
- 	"workbench.action.terminal.new": "Crea nuovo terminale integrato",
- 	"workbench.action.terminal.new.short": "Nuovo terminale",
- 	"workbench.action.terminal.newWorkspacePlaceholder": "Selezionare la cartella di lavoro corrente per un nuovo terminale.",
-@@ -51,6 +54,7 @@
- 	"workbench.action.terminal.rename.prompt": "Immettere il nome del terminale",
- 	"workbench.action.terminal.focusFindWidget": "Stato attivo su widget Trova",
- 	"workbench.action.terminal.hideFindWidget": "Nascondi widget Trova",
-+<<<<<<< .our
- 	"nextTerminalFindTerm": "Mostra il termine di ricerca successivo",
- 	"previousTerminalFindTerm": "Mostra il termine di ricerca precedente",
- 	"quickOpenTerm": "Cambia terminale attivo",
-@@ -60,4 +64,7 @@
- 	"workbench.action.terminal.selectToNextCommand": "Aggiungi selezione a comando successivo",
- 	"workbench.action.terminal.selectToPreviousLine": "Aggiungi selezione a riga precedente",
- 	"workbench.action.terminal.selectToNextLine": "Aggiungi selezione a riga successiva"
-+=======
-+	"quickOpenTerm": "Cambia terminale attivo"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 43f3afaeb3087727e1206563ed8271f819d7fe47 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 7ae3aac58f69dc8b25dec80d0624497a5e9abe14 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 d707ad877b4b90ba4430068830bd11d5a23de704 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -10,7 +10,11 @@
- 	"terminal.foreground": "Il colore di primo piano del terminale.",
- 	"terminalCursor.foreground": "Colore di primo piano del cursore del terminale.",
- 	"terminalCursor.background": "Colore di sfondo del cursore del terminale. Permette di personalizzare il colore di un carattere quando sovrapposto da un blocco cursore.",
-+<<<<<<< .our
- 	"terminal.selectionBackground": "Colore di sfondo di selezione del terminale.",
- 	"terminal.border": "Colore del bordo che separa i riquadri divisi all'interno del terminale. L'impostazione predefinita è panel.border.",
- 	"terminal.ansiColor": "'{0}' colori ANSI nel terminale. "
-+=======
-+	"terminal.ansiColor": "Colore ANSI '{0}' nel terminale."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 9dd33f62814e18b186fefa4391ecce198cf04730 i18n/ita/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 aed35ee0f736e71e25693c29ccc2843fb9df2498 i18n/ita/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 6186bf9ef5bd6fef03226011d387446a022f0717 i18n/ita/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -11,8 +11,16 @@
- 	"read the release notes": "Benvenuti in {0} versione {1}. Leggere le note sulla versione?",
- 	"licenseChanged": "I termini della licenza sono cambiati. Fare clic [qui]({0}) e leggerli con attenzione.",
- 	"neveragain": "Non visualizzare più questo messaggio",
-+<<<<<<< .our
- 	"64bitisavailable": "{0} per Windows a 64 bit è ora disponibile. Per maggiori informazioni, fare clic [qui]({1}).",
- 	"updateIsReady": "Nuovo aggiornamento di {0} disponibile.",
-+=======
-+	"64bitisavailable": "{0} per Windows a 64 bit è ora disponibile!",
-+	"learn more": "Altre informazioni",
-+	"updateIsReady": "Nuovo aggiornamento di {0} disponibile.",
-+	"thereIsUpdateAvailable": "È disponibile un aggiornamento.",
-+	"updateAvailable": "{0} verrà aggiornato dopo il riavvio.",
-+>>>>>>> .their
- 	"noUpdatesAvailable": "Al momento non sono disponibili aggiornamenti.",
- 	"ok": "OK",
- 	"thereIsUpdateAvailable": "È disponibile un aggiornamento.",
-changed in both
-  base   100644 a7b1c66172688f9136bf07fe85537eee22f69853 i18n/ita/src/vs/workbench/parts/views/browser/views.i18n.json
-  our    100644 860e3f239f29bae4b543c63ea0d30b89d5467fc8 i18n/ita/src/vs/workbench/parts/views/browser/views.i18n.json
-  their  100644 13722d5ca475d3cb677211fd8d98707ff8104b37 i18n/ita/src/vs/workbench/parts/views/browser/views.i18n.json
-@@ -5,5 +5,9 @@
- // Do not edit this file. It is machine generated.
- {
- 	"viewToolbarAriaLabel": "Azioni di {0}",
-+<<<<<<< .our
- 	"hideView": "Nascondi da barra laterale"
-+=======
-+	"removeView": "Rimuovere dalla barra laterale"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 300eb2118f1201f283eb3a1e66da168a06ef071b i18n/ita/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-  our    100644 82f6aedb638491aef3f6eb8ed73da8bd42051ffb i18n/ita/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-  their  100644 1f9832cab991258fe647e04ebd44c34fa5ce698b i18n/ita/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-changed in both
-  base   100644 a7e15b8a41426bed20881fa75e94534c6261f1c3 i18n/ita/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  our    100644 b5a489af390ae95c0040c4f75bba1c10766a089e i18n/ita/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  their  100644 2e22df971faf8d86e2b4019cc83273aeab627e9a i18n/ita/src/vs/workbench/services/configuration/node/configuration.i18n.json
-@@ -9,6 +9,7 @@
- 	"scope.window.description": "Configurazione specifica della finestra, che può essere configurata nelle impostazioni dell'utente o dell'area di lavoro.",
- 	"scope.resource.description": "Configurazione specifica di risorse, che possono essere configurate nelle impostazioni utente, in quelle dell'area di lavoro o di una cartella.",
- 	"scope.description": "Ambito in cui la configurazione è applicabile. Gli ambiti disponibili sono 'finestra' e 'risorsa'.",
-+<<<<<<< .our
- 	"vscode.extension.contributes.configuration": "Impostazioni di configurazione di contributes.",
- 	"invalid.title": "'configuration.title' deve essere una stringa",
- 	"vscode.extension.contributes.defaultConfiguration": "Aggiunge come contributo le impostazioni di configurazione predefinite dell'editor in base al linguaggio.",
-@@ -21,4 +22,13 @@
- 	"workspaceConfig.settings.description": "Impostazioni di area di lavoro",
- 	"workspaceConfig.extensions.description": "Estensioni dell'area di lavoro",
- 	"unknownWorkspaceProperty": "La proprietà di configurazione dell'area di lavoro è sconosciuta"
-+=======
-+	"invalid.type": "se impostato, 'configuration.type' deve essere impostato su 'object",
-+	"invalid.title": "'configuration.title' deve essere una stringa",
-+	"vscode.extension.contributes.defaultConfiguration": "Aggiunge come contributo le impostazioni di configurazione predefinite dell'editor in base al linguaggio.",
-+	"invalid.properties": "'configuration.properties' deve essere un oggetto",
-+	"workspaceConfig.id.description": "Identificatore di area di lavoro. Utilizzato per memorizzare lo stato interno dell'area di lavoro, che può essere perso durante un cambiamento.",
-+	"workspaceConfig.folders.description": "Elenco delle cartelle da caricare nell'area di lavoro. Deve essere un percorso di file. ad esempio 'file:///root/folderA'",
-+	"workspaceConfig.settings.description": "Impostazioni di area di lavoro"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 72151489b4a3399a5a1a4265c33ab4a5cf6ef965 i18n/ita/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 73635731361e3644a722328dacbcb86a39a295d3 i18n/ita/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 8cb580b70f0dc2753ce2b283b6274aecf8b053e6 i18n/ita/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -9,6 +9,7 @@
- 	"openTasksConfiguration": "Apri configurazione attività",
- 	"openLaunchConfiguration": "Apri configurazione di avvio",
- 	"open": "Apri impostazioni",
-+<<<<<<< .our
- 	"saveAndRetry": "Salva e riprova",
- 	"errorUnknownKey": "Impossibile scrivere {0} perché {1} non è una configurazione registrata.",
- 	"errorInvalidWorkspaceConfigurationApplication": "Non è possibile scrivere {0} in Impostazioni area di lavoro. Questa impostazione può essere scritta solo in Impostazioni utente.",
-@@ -27,6 +28,19 @@
- 	"errorConfigurationFileDirty": "Non è possibile scrivere nelle impostazioni utente perché il file è stato modificato. Salvare prima il file delle impostazioni utente, quindi riprovare.",
- 	"errorConfigurationFileDirtyWorkspace": "Non è possibile scrivere nelle impostazioni dell'area di lavoro perché il file è stato modificato. Salvare prima il file delle impostazioni dell'area di lavoro, quindi riprovare.",
- 	"errorConfigurationFileDirtyFolder": "Non è possibile scrivere nelle impostazioni della cartella perché il file è stato modificato. Salvare prima il file di impostazioni della cartella '{0}', quindi riprovare.",
-+=======
-+	"close": "Chiudi",
-+	"saveAndRetry": "Salva le impostazioni e riprova",
-+	"errorUnknownKey": "Impossibile scrivere {0} perché {1} non è una configurazione registrata.",
-+	"errorInvalidFolderConfiguration": "Impossibile scrivere nella cartella impostazioni perché {0} non supporta l'ambito di risorsa della cartella.",
-+	"errorInvalidUserTarget": "Impossibile scrivere le impostazioni utente perché {0} non supporta l'ambito globale.",
-+	"errorInvalidFolderTarget": "Impossibile scrivere nella cartella impostazioni perché non viene fornita alcuna risorsa.",
-+	"errorNoWorkspaceOpened": "Impossibile scrivere su {0} poiché nessuna area di lavoro è aperta. Si prega di aprire un'area di lavoro e riprovare.",
-+	"errorInvalidConfiguration": "Impossibile scrivere nelle impostazioni. Si prega di aprire  **Impostazioni utente** per correggere eventuali errori o avvisi nel file e riprovare.",
-+	"errorInvalidConfigurationWorkspace": "Impossibile scrivere in impostazioni. Si prega di aprire **Impostazioni area di lavoro** per correggere eventuali errori o avvisi nel file e riprovare.",
-+	"errorConfigurationFileDirty": "Impossibile scrivere nelle impostazioni perché il file è stato modificato ma non salvato. Si prega di salvare il file **impostazioni utente** e riprovare.",
-+	"errorConfigurationFileDirtyWorkspace": "Non è possibile scrivere in impostazioni perché il file è stato modificato ma non salvato. Salvare il file delle **Impostazioni area di lavoro** e riprovare.",
-+>>>>>>> .their
- 	"userTarget": "Impostazioni utente",
- 	"workspaceTarget": "Impostazioni area di lavoro",
- 	"folderTarget": "Impostazioni della cartella"
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/ita/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-  our    100644 bf0a4aae1080397e29d56822254443ce537de3ab i18n/ita/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-  their  100644 337b884305c827955fae8d3657b7c3e07fc90fa0 i18n/ita/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"errorInvalidFile": "Impossibile scrivere nel file. Si prega di aprire il file per correggere eventuali errori o avvisi nel file e riprovare.",
- 	"errorFileDirty": "Impossibile scrivere nel file perché il file è stato modificato. Si prega di salvare il file e riprovare."
- }
-\ No newline at end of file
-changed in both
-  base   100644 031d6c9544abbc9dcdd5097095d503830734d22b i18n/ita/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 59d0978a765c9fd6ca13b8566191473ce46ff2e1 i18n/ita/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 9a000d601a10fc7425c6583cf86a25cf0987ed76 i18n/ita/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-@@ -13,6 +13,7 @@
- 	"noIconThemeDesc": "No file icons",
- 	"iconThemeError": "File icon theme is unknown or not installed.",
- 	"workbenchColors": "Sostituisce i colori del tema colori attualmente selezionato.",
-+<<<<<<< .our
- 	"editorColors.comments": "Imposta i colori e gli stili per i commenti",
- 	"editorColors.strings": "Imposta i colori e gli stili per i valori letterali stringa.",
- 	"editorColors.keywords": "Imposta i colori e gli stili per le parole chiave.",
-@@ -21,5 +22,9 @@
- 	"editorColors.functions": "Imposta i colori e gli stili per i riferimenti e le dichiarazioni di funzioni.",
- 	"editorColors.variables": "Imposta i colori e gli stili per i riferimenti e le dichiarazioni di variabili.",
- 	"editorColors.textMateRules": "Imposta i colori e gli stili usando le regole di creazione temi di TextMate (impostazione avanzata).",
-+=======
-+	"workbenchColors.deprecated": "L'impostazione non è più sperimentale ed è stata rinominata in 'workbench.colorCustomizations'",
-+	"workbenchColors.deprecatedDescription": "In alternativa, usare 'workbench.colorCustomizations'",
-+>>>>>>> .their
- 	"editorColors": "Sostituisce i colori dell'editor e lo stile dei font nel tema colori attualmente selezionato."
- }
-\ No newline at end of file
-changed in both
-  base   100644 ce72c51b95bd9fd79a6e0e105e69519cd5f00f4f i18n/jpn/extensions/emmet/package.i18n.json
-  our    100644 2ea428b8ba7cebbdb24c299af08c070b4291f172 i18n/jpn/extensions/emmet/package.i18n.json
-  their  100644 a0e470e23f9ae49b1afcb8864c75ec714fc5e840 i18n/jpn/extensions/emmet/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -9,6 +10,8 @@
- 	"description": "VSCode の Emmet サポート",
- 	"command.wrapWithAbbreviation": "ラップ変換",
- 	"command.wrapIndividualLinesWithAbbreviation": "個々の行でラップ変換",
-+=======
-+>>>>>>> .their
- 	"command.removeTag": "タグの削除",
- 	"command.updateTag": "タグの更新",
- 	"command.matchTag": "一致するペアに移動",
-@@ -31,6 +34,7 @@
- 	"command.incrementNumberByTen": "10 ずつ増加",
- 	"command.decrementNumberByTen": "10 ずつ減少",
- 	"emmetSyntaxProfiles": "指定した構文に対してプロファイルを定義するか、特定の規則がある独自のプロファイルをご使用ください。",
-+<<<<<<< .our
- 	"emmetExclude": "Emmet 省略記法を展開すべきでない言語の配列。",
- 	"emmetExtensionsPath": "Emmet のプロファイルとスニペットを含むフォルダーへのパス。",
- 	"emmetShowExpandedAbbreviation": "展開された Emmet 省略記法を候補として表示します。\n\"inMarkupAndStylesheetFilesOnly\" オプションは、html、haml、jade、slim、xml、xsl、css、scss、sass、less、stylus に適用されます。\n\"always\" オプションは markup/css に関係なくファイルのすべての部分に適用されます。",
-@@ -62,4 +66,12 @@
- 	"emmetPreferencesCssMsProperties": "Emmet 省略記法で使用される場合に `-` で始まる 'ms' ベンダー プレフィックスを取得するカンマ区切りの CSS プロパティ。常に 'ms' プレフィックスを避ける場合は空の文字列に設定します。",
- 	"emmetPreferencesCssFuzzySearchMinScore": "あいまい検索の省略形が達成すべき (0 から 1 の) 最小スコア。値が低ければ多くの誤検出が発生する可能性があります。値が高ければ一致する見込みが減る可能性があります。",
- 	"emmetOptimizeStylesheetParsing": "false に設定すると、現在位置が Emmet 略語の展開位置として有効かどうかを判定するためにファイル全体を解析します。true に設定すると、css/scss/less ファイルの現在位置周辺のコンテンツのみを解析します。"
-+=======
-+	"emmetExclude": "emmet 省略記法を展開すべきでない言語の配列。",
-+	"emmetExtensionsPath": "Emmet のプロファイル、スニペット、基本設定を含むフォルダーへのパス。emmet.useNewEmmet が true に設定されている場合、プロファイルのみが拡張パスから受け入れられます。",
-+	"emmetShowExpandedAbbreviation": "候補として、展開された Emmet 省略記法を表示します。\n\"inMarkupAndStylesheetFilesOnly\" オプションは、html、haml、jade、slim、xml、xsl、css、scss、sass、less、および stylus に適用されます。\n\"always\" オプションは、マークアップ / css に関係なく、ファイルのすべての部分に適用されます。",
-+	"emmetShowAbbreviationSuggestions": "候補として考えられる Emmet 省略記法を表示します。 スタイルシートや emmet.showExpandedAbbreviation が \"never\" に設定されている場合は適用されません。",
-+	"emmetIncludeLanguages": "既定でサポートされていない言語で Emmet 省略記法を有効にします。 言語と Emmet がサポートする言語の間にマッピングを追加します。\n例: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
-+	"emmetVariables": "Emmet のスニペットで使用される変数 "
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 41d43b02c1f66f342064622c00a0890115d0dad9 i18n/jpn/extensions/extension-editing/out/extensionLinter.i18n.json
-  our    100644 29e11015a804a1186a5840b869b18fe6a3a72163 i18n/jpn/extensions/extension-editing/out/extensionLinter.i18n.json
-  their  100644 09e430952b7349d60633794eb3f06bb1f0cbba94 i18n/jpn/extensions/extension-editing/out/extensionLinter.i18n.json
-changed in both
-  base   100644 779f48926f3ef595774a18b9694c3d3e1e220a9f i18n/jpn/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 504738102db98241f299da4b50371a12d6a5d3cc i18n/jpn/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 e17dbdefa65d601e291e6e216e61485434e79906 i18n/jpn/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -9,7 +9,20 @@
- 	"openFile": "ファイルを開く...",
- 	"openFolder": "フォルダーを開く...",
- 	"openFileFolder": "開く...",
-+<<<<<<< .our
- 	"globalRemoveFolderFromWorkspace": "ワークスペースからフォルダーを削除...",
-+=======
-+	"reload": "再読み込み(&&R)",
-+	"cancel": "キャンセル",
-+	"newWorkspaceFormExisting": "既存を元に新しいワークスペース...",
-+	"select": "選択(&&S)",
-+	"selectWorkspace": "ワークスペースのフォルダーを選択",
-+	"addSupported": "複数のフォルダーを開くには、ウィンドウの再読み込みが必要です。",
-+	"addFolderToWorkspace": "ワークスペースにフォルダーを追加...",
-+	"add": "追加(&&A)",
-+	"addFolderToWorkspaceTitle": "ワークスペースにフォルダーを追加",
-+	"removeFolderFromWorkspace": "ワークスペースからフォルダーを削除",
-+>>>>>>> .their
- 	"saveWorkspaceAsAction": "名前を付けてワークスペースを保存...",
- 	"save": "保存(&&S)",
- 	"saveWorkspace": "ワークスペースを保存",
-changed in both
-  base   100644 8eef43766e8052a367343ee2707878adbbcd157a i18n/jpn/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  our    100644 2aabd470587713910c03051d128af69e0ce6da7a i18n/jpn/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  their  100644 52c478e6b9508361dd18da29ebc355fe7a6fe88d i18n/jpn/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-merged
-  result 100644 eae7eb92528ad2b4ad11d091bc99bb46f77a17ba i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-  our    100644 e62cceeca51279d4a513fe1b368ca6dbb70061eb i18n/jpn/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-@@ -7,8 +7,5 @@
- 	"emmetConfigurationTitle": "Emmet",
- 	"triggerExpansionOnTab": "有効にすると、TAB キーを押したときに emmet 省略記法が展開されます。emmet.useNewemmet が true に設定されているときは適用されません。",
- 	"emmetPreferences": "Emmet の一部のアクションやリゾルバーの動作の変更に使用される基本設定。emmet.useNewemmet が true に設定されているときは適用されません。",
--	"emmetSyntaxProfiles": "指定した構文に対してプロファイルを定義するか、特定の規則がある独自のプロファイルをご使用ください。",
--	"emmetExclude": "emmet 省略記法を展開すべきでない言語の配列。",
--	"emmetExtensionsPath": "Emmet のプロファイル、スニペット、基本設定を含むフォルダーへのパス。emmet.useNewEmmet が true に設定されている場合、プロファイルのみが拡張パスから受け入れられます。",
- 	"useNewEmmet": "すべての emmet 機能に対して、新しい emmet モジュールをお試しください (最終的に、以前の単一 emmet ライブラリは置き換えられます)。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 4de3a3dae6f0243652321d24feb82b33dbb78aa1 i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 c8dc571e62a5169caab40469ba18a9dcea479c70 i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 72cb0a9b0aee0283c8b7bb6a5a98cb6551c3d732 i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -14,4 +15,19 @@
- 	"editTtile": "編集",
- 	"replaceDefaultValue": "設定を置換",
- 	"copyDefaultValue": "設定にコピー"
-+=======
-+	"emptyUserSettingsHeader": "既定の設定を上書きするには、このファイル内に設定を挿入します。",
-+	"errorInvalidConfiguration": "設定を書き込めません。ファイル内のエラー/警告を修正してからもう一度お試しください。",
-+	"emptyWorkspaceSettingsHeader": "ユーザー設定を上書きするには、このファイル内に設定を挿入します。",
-+	"emptyFolderSettingsHeader": "ワークスペースの設定を上書きするには、このファイル内にフォルダーの設定を挿入します。",
-+	"defaultFolderSettingsTitle": "既定のフォルダー設定",
-+	"defaultSettingsTitle": "既定の設定",
-+	"noSettingsFound": "設定が見つかりません。",
-+	"editTtile": "編集",
-+	"replaceDefaultValue": "設定を置換",
-+	"copyDefaultValue": "設定にコピー",
-+	"unsupportedPHPExecutablePathSetting": "この設定はユーザー設定でなければなりません。ワークスペースのために PHP を構成するには、PHP ファイルを開き、ステータス バーの [PHP パス] をクリックします。",
-+	"unsupportedWorkspaceSetting": "この設定はユーザー設定でなければなりません。",
-+	"unsupportedWorkbenchSetting": "この設定は現在適用できません。このフォルダーを直接開いたときに適用されます。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 47d6b9c337e4799ba23c7e2e42aa5524b4dbbde1 i18n/jpn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 0c0e1ef6922bb2ebfdd24dd39aa82c38ab488084 i18n/jpn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 ab57a31ce38f83ca1384d26d9bac9de8883f7e64 i18n/jpn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"nextSearchIncludePattern": "次の検索包含パターンを表示",
- 	"previousSearchIncludePattern": "前の検索包含パターンを表示",
- 	"nextSearchExcludePattern": "次の検索除外パターンを表示",
-changed in both
-  base   100644 78356e3e0f46be548f853447d45d40a0ab08b5cc i18n/jpn/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  our    100644 e3bc313f7629d61de69d1a7c87f4621737652171 i18n/jpn/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  their  100644 4dee2d5d093e01a8001cf6a02e5126c243155706 i18n/jpn/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-changed in both
-  base   100644 bec8ad0511234592cc1baaae890cb3821ad863ee i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 8021ef7847fd50a81058f6bd7af4fbd030bdc905 i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 f9f3eb982678a652e5adbfac9aeeff29bd9b441c i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-changed in both
-  base   100644 16366e22ca28f9aca9f14253e677c611418e13e0 i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 62e38b3747f8554dd00fc9cb1775537cf7a36bb1 i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 6f1481812dd67ba95cda718a289dd200f73deb54 i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-changed in both
-  base   100644 a046b227b9343b60dd225c2000e5b65dbc587fdc i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 bd0ce9939936ef31eabab48bc5a42980b19e29b3 i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 9be30e57a0445247bbdd211dab4d01091f1e4701 i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -51,6 +51,7 @@
- 	"workbench.action.terminal.rename.prompt": "ターミナルの名前を入力してください",
- 	"workbench.action.terminal.focusFindWidget": "検索ウィジェットにフォーカスする",
- 	"workbench.action.terminal.hideFindWidget": "検索ウィジェットを非表示にする",
-+<<<<<<< .our
- 	"nextTerminalFindTerm": "次の検索語句を表示",
- 	"previousTerminalFindTerm": "前の検索語句を表示",
- 	"quickOpenTerm": "アクティブなターミナルの切り替え",
-@@ -60,4 +61,7 @@
- 	"workbench.action.terminal.selectToNextCommand": "次のコマンドを選択",
- 	"workbench.action.terminal.selectToPreviousLine": "前の行を選択",
- 	"workbench.action.terminal.selectToNextLine": "次の行を選択"
-+=======
-+	"quickOpenTerm": "アクティブなターミナルの切り替え"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 01396d39cfbe1fb66aeed3ab4523479a89004157 i18n/jpn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 be4c3ee187a4c958a13a55a867d75c42dce31777 i18n/jpn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 a9d26fa1a49e9720e28ba5859d7b937bbc1d490f i18n/jpn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -11,7 +11,12 @@
- 	"read the release notes": "{0} v{1} へようこそ! リリース ノートを確認しますか?",
- 	"licenseChanged": "ライセンス条項が変更されました。[こちら]({0}) をクリックして内容をご確認ください。",
- 	"neveragain": "今後は表示しない",
-+<<<<<<< .our
- 	"64bitisavailable": "64 ビット Windows 用の {0} が利用可能になりました！詳細情報は[こちら]({1})をクリックしてください。",
-+=======
-+	"64bitisavailable": "Windows 64 ビット用の {0} が利用可能になりました！",
-+	"learn more": "詳細情報",
-+>>>>>>> .their
- 	"updateIsReady": "新しい更新 {0} が利用可能です。",
- 	"noUpdatesAvailable": "現在入手可能な更新はありません。",
- 	"ok": "OK",
-changed in both
-  base   100644 a0d2093c119b87d7501753be72fe16c7c05c433c i18n/jpn/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  our    100644 60bf4e08cf5bbad037fb33148e8162e4e6ad633a i18n/jpn/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  their  100644 4f492f5ba98c57babe89ff4cb44e5a701595103e i18n/jpn/src/vs/workbench/services/configuration/node/configuration.i18n.json
-@@ -9,6 +9,7 @@
- 	"scope.window.description": "ウィンドウ固有の構成。ユーザーまたはワークスペースの設定で構成できます。",
- 	"scope.resource.description": "リソース固有の構成。ユーザー、ワークスペース、またはフォルダーの設定で構成できます。",
- 	"scope.description": "構成が適用される範囲。 使用可能なスコープは `window` と ` resource` です。",
-+<<<<<<< .our
- 	"vscode.extension.contributes.configuration": "構成の設定を提供します。",
- 	"invalid.title": "'configuration.title' は、文字列である必要があります",
- 	"vscode.extension.contributes.defaultConfiguration": "言語ごとに既定のエディター構成の設定を提供します。",
-@@ -21,4 +22,13 @@
- 	"workspaceConfig.settings.description": "ワークスペースの設定",
- 	"workspaceConfig.extensions.description": "ワークスペースの拡張機能",
- 	"unknownWorkspaceProperty": "不明なワークスペース構成プロパティ"
-+=======
-+	"invalid.type": "設定すると、'configuration.type' は 'オブジェクトに設定されなければなりません",
-+	"invalid.title": "'configuration.title' は、文字列である必要があります",
-+	"vscode.extension.contributes.defaultConfiguration": "言語ごとに既定のエディター構成の設定を提供します。",
-+	"invalid.properties": "'configuration.properties' は、オブジェクトである必要があります",
-+	"workspaceConfig.id.description": "ワークスペース識別子。 ワークスペース内部の状態を保存するために使用されますが、変更時に失われる可能性があります。",
-+	"workspaceConfig.folders.description": "ワークスペースで読み込まれるフォルダーのリスト。ファイル パスである必要があります。例: `file:///root/folderA`",
-+	"workspaceConfig.settings.description": "ワークスペースの設定"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c3d8ee097dcab747accedea1ec6a2ad6defb457c i18n/jpn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 627b2d01b48806d1f5f06d10756e2464690ef51d i18n/jpn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 6a4f8a9515237eb58139490a0df20983be59a2f9 i18n/jpn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -9,6 +9,7 @@
- 	"openTasksConfiguration": "タスク構成を開く",
- 	"openLaunchConfiguration": "起動構成を開く",
- 	"open": "設定を開く",
-+<<<<<<< .our
- 	"saveAndRetry": "保存して再試行",
- 	"errorUnknownKey": "{1} は登録済みの構成ではないため、{0} に書き込むことができません。",
- 	"errorInvalidWorkspaceConfigurationApplication": "{0} をワークスペース設定に書き込めません。この設定はユーザー設定にのみ書き込めます。",
-@@ -27,6 +28,19 @@
- 	"errorConfigurationFileDirty": "ファイルが変更されているため、ユーザー設定を書き込めません。ユーザー設定ファイルを保存してから、もう一度お試しください。",
- 	"errorConfigurationFileDirtyWorkspace": "ファイルが変更されているため、ワークスペース設定を書き込めません。ワークスペース設定ファイルを保存してから、もう一度お試しください。",
- 	"errorConfigurationFileDirtyFolder": "ファイルが変更されているため、フォルダー設定を書き込めません。'{0}' フォルダー設定ファイルを保存してから、もう一度お試しください。",
-+=======
-+	"close": "閉じる",
-+	"saveAndRetry": "設定を保存して再試行",
-+	"errorUnknownKey": "{1} は登録済みの構成ではないため、{0} に書き込むことができません。",
-+	"errorInvalidFolderConfiguration": "{0} はフォルダーのリソース スコープをサポートしていないため、フォルダー設定に書き込むことができません。",
-+	"errorInvalidUserTarget": "{0} はグローバル スコープをサポートしていないため、ユーザー設定に書き込むことができません。",
-+	"errorInvalidFolderTarget": "リソースが指定されていないため、フォルダー設定に書き込むことができません。",
-+	"errorNoWorkspaceOpened": "開いているワークスペースがないため、{0} に書き込むことができません。最初にワークスペースを開いてから、もう一度お試しください。",
-+	"errorInvalidConfiguration": "設定を書き込めません。**User Settings** を開いて、ファイル内のエラー/警告を修正してからもう一度お試しください。",
-+	"errorInvalidConfigurationWorkspace": "設定を書き込めません。**Workspace Settings** を開いて、ファイル内のエラー/警告を修正してからもう一度お試しください。",
-+	"errorConfigurationFileDirty": "ファイルが変更されているため、設定を書き込めません。**User Settings** ファイルを保存してから、もう一度お試しください。",
-+	"errorConfigurationFileDirtyWorkspace": "ファイルが変更されているため、設定を書き込めません。**Workspace Settings** ファイルを保存してから、もう一度お試しください。",
-+>>>>>>> .their
- 	"userTarget": "ユーザー設定",
- 	"workspaceTarget": "ワークスペースの設定",
- 	"folderTarget": "フォルダーの設定"
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/extensions/emmet/package.i18n.json
-  our    100644 517fee7baf0c3ecd5ff03235a1df00c583e6985b i18n/kor/extensions/emmet/package.i18n.json
-  their  100644 79056f5a827f1e8a387f899380955917502e71b0 i18n/kor/extensions/emmet/package.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,6 +10,14 @@
- 	"description": "VS Code에 대한 Emmet 지원",
- 	"command.wrapWithAbbreviation": "약어로 래핑",
- 	"command.wrapIndividualLinesWithAbbreviation": "약어로 개별 줄 래핑",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"command.removeTag": "태그 제거",
- 	"command.updateTag": "태그 업데이트",
- 	"command.matchTag": "일치하는 쌍으로 이동",
-@@ -31,6 +40,7 @@
- 	"command.incrementNumberByTen": "10씩 증가",
- 	"command.decrementNumberByTen": "10씩 감소",
- 	"emmetSyntaxProfiles": "지정된 구문에 대한 프로필을 정의하거나 특정 규칙이 포함된 고유한 프로필을 사용하세요.",
-+<<<<<<< .our
- 	"emmetExclude": "Emmet 약어는 확장하면 안 되는 언어의 배열입니다.",
- 	"emmetExtensionsPath": "Emmet 프로필 및 코드 조각이 포함된 폴더의 경로입니다.'",
- 	"emmetShowExpandedAbbreviation": "확장된 emmet 약어를 제안으로 표시합니다.\n\"inMarkupAndStylesheetFilesOnly\" 옵션이 html, haml, jade, slim, xml, xsl, css, scss, sass, less 및 stylus에 적용됩니다.\n\"always\" 옵션이 마크업/css에 관계없이 파일의 모든 부분에 적용됩니다.",
-@@ -62,4 +72,12 @@
- 	"emmetPreferencesCssMsProperties": "`-`로 시작하는 emmet 약어에서 사용할 때 'ms' 공급업체 접두사를 가져오는 쉼표로 구분된 CSS 속성입니다. 항상 'ms' 접두사를 사용하지 않으려면 빈 문자열로 설정합니다.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "유사 일치 약어가 획득해야 하는 최소 점수(0에서 1 사이)입니다. 값이 낮을수록 가양성 일치 항목이 늘 수 있고, 값이 높을수록 가능한 일치 항목이 줄 수 있습니다.",
- 	"emmetOptimizeStylesheetParsing": "False로 설정할 경우 전체 파일이 구문 분석되어 현재 위치가 Emmet 약어 확장에 유효한지 확인합니다. True로 설정할 경우 css/scss/less 파일에서 현재 위치 주변의 콘텐츠만 구문 분석합니다."
-+=======
-+	"emmetExclude": "Emmet 약어를 확장하면 안 되는 언어의 배열입니다.",
-+	"emmetExtensionsPath": "Emmet 프로필, 코드 조각 및 기본 설정이 포함된 폴더의 경로입니다. emmet.useNewEmmet이 true일 때만 확장 경로의 프로필이 인정됩니다.",
-+	"emmetShowExpandedAbbreviation": "확장된 emmet 약어를 제안으로 표시합니다.\n\"inMarkupAndStylesheetFilesOnly\" 옵션이 html, haml, jade, slim, xml, xsl, css, scss, sass, less 및 stylus에 적용됩니다.\n\"always\" 옵션이 마크업/css에 관계없이 파일의 모든 부분에 적용됩니다.",
-+	"emmetShowAbbreviationSuggestions": "가능한 emmet 약어를 제안으로 표시합니다. 스타일시트에는 적용되지 않고 emmet.showExpandedAbbreviation이 \"never\"로 설정되어 있을 때도 적용되지 않습니다.",
-+	"emmetIncludeLanguages": "기본 지원되지 않는 언어에서 emmet 약어를 사용합니다. 언어와 emmet 지원 언어 사이에 매핑을 추가합니다.\n예: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
-+	"emmetVariables": "emmet 조각에 사용되는 변수"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8a96502e3a796749d61630cce0542fb94fc85e18 i18n/kor/extensions/extension-editing/out/extensionLinter.i18n.json
-  our    100644 1a6b6fec1699050fbebe38ad42640b3e0f0f07d3 i18n/kor/extensions/extension-editing/out/extensionLinter.i18n.json
-  their  100644 f8432086d5138d22c2abb41b372a3d0643d4e544 i18n/kor/extensions/extension-editing/out/extensionLinter.i18n.json
-changed in both
-  base   100644 600483c9e098bc70047c4edcea9a74d36acee23b i18n/kor/extensions/git/out/commands.i18n.json
-  our    100644 5c881abd459fc945dcc1b911f43b518f709ac538 i18n/kor/extensions/git/out/commands.i18n.json
-  their  100644 00b745895764c5ec0bc1cb093fb24872ceec908c i18n/kor/extensions/git/out/commands.i18n.json
-changed in both
-  base   100644 fea668373d19f57e029a7792039d3e31f5301591 i18n/kor/extensions/markdown/out/security.i18n.json
-  our    100644 b7fd641e49324f12cb3e70d0e0b3a99277526769 i18n/kor/extensions/markdown/out/security.i18n.json
-  their  100644 aa64d695e8ccd47e1d63df5ceab31b5e98b2753d i18n/kor/extensions/markdown/out/security.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -16,5 +17,11 @@
- 	"enableSecurityWarning.title": "이 작업 영역에서 미리 보기 보안 경고 사용",
- 	"disableSecurityWarning.title": "이 작업 영역에서 미리보기 보안 경고 사용 안 함",
- 	"toggleSecurityWarning.description": "콘텐츠 보안 수준에 영향을 주지 않습니다.",
-+=======
-+	"preview.showPreviewSecuritySelector.strictTitle": "엄격함. 보안 콘텐츠만 로드.",
-+	"preview.showPreviewSecuritySelector.currentSelection": "현재 설정",
-+	"preview.showPreviewSecuritySelector.insecureContentTitle": "http를 통한 콘텐츠 로드를 허용합니다.",
-+	"preview.showPreviewSecuritySelector.scriptsAndAllContent": "모든 콘텐츠 및 스크립트 실행을 허용합니다. 권장하지 않습니다.",
-+>>>>>>> .their
- 	"preview.showPreviewSecuritySelector.title": "이 작업 영역에 대해 Markdown 미리 보기의 보안 설정 선택"
- }
-\ No newline at end of file
-changed in both
-  base   100644 bae4e5954d08bb38ccbe0ffdc966eaaeeb0d5013 i18n/kor/extensions/npm/package.i18n.json
-  our    100644 b762a88ac6b09e3d0033e37c5db538576d49fc4b i18n/kor/extensions/npm/package.i18n.json
-  their  100644 04e51b003cad423ee7971f81d1a8a2963ea34482 i18n/kor/extensions/npm/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -23,4 +24,8 @@
- 	"command.debug": "디버그",
- 	"command.openScript": "열기",
- 	"command.runInstall": "설치 실행"
-+=======
-+	"config.npm.autoDetect": "npm 스크립트에 대한 자동 검색 여부를 설정합니다. 기본값은 [켜기]입니다.",
-+	"config.npm.runSilent": " `--silent` 옵션으로 npm 명령 실행"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/extensions/typescript/out/features/taskProvider.i18n.json
-  our    100644 6982eedcfd951f2be2d44e134096c815d17a7ef4 i18n/kor/extensions/typescript/out/features/taskProvider.i18n.json
-  their  100644 347d63b00dc1be110cd737d817413bb489cb2acd i18n/kor/extensions/typescript/out/features/taskProvider.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,14 @@
- 	],
- 	"buildTscLabel": "빌드 - {0}",
- 	"buildAndWatchTscLabel": "보기 - {0}"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"buildAndWatchTscLabel": "보기 - {0}",
-+	"buildTscLabel": "빌드 - {0}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/src/vs/code/electron-main/auth.i18n.json
-  our    100644 47f853841b33cd27117be4d7b9d6fa9b9af0ff56 i18n/kor/src/vs/code/electron-main/auth.i18n.json
-  their  100644 4b003737236c7e2a22405547da228b5644f4b586 i18n/kor/src/vs/code/electron-main/auth.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"authRequire": "프록시 인증 필요",
- 	"proxyauth": "프록시 {0}에 인증이 필요합니다."
- }
-\ No newline at end of file
-changed in both
-  base   100644 9f3f01d8dbf4f2aba0210028b7c982d8b0a518e3 i18n/kor/src/vs/code/electron-main/menus.i18n.json
-  our    100644 a3a33ffe4d84057c71074e546cdf9a1e5529a6c8 i18n/kor/src/vs/code/electron-main/menus.i18n.json
-  their  100644 2e4a6564eae28662a064870571bbdfd27b5ae584 i18n/kor/src/vs/code/electron-main/menus.i18n.json
-@@ -24,12 +24,21 @@
- 	"miQuit": "{0} 종료",
- 	"miNewFile": "새 파일(&&N)",
- 	"miOpen": "열기(&&O)...",
-+<<<<<<< .our
- 	"miOpenWorkspace": "작업 영역 열기(&&K)...",
- 	"miOpenFolder": "폴더 열기(&&F)...",
- 	"miOpenFile": "파일 열기(&&O)...",
- 	"miOpenRecent": "최근 항목 열기(&&R)",
- 	"miSaveWorkspaceAs": "작업 영역을 다른 이름으로 저장",
- 	"miAddFolderToWorkspace": "작업 영역에 폴더 추가(&&D)...",
-+=======
-+	"miOpenWorkspace": "작업 영역 열기(&O)...",
-+	"miOpenFolder": "폴더 열기(&&F)...",
-+	"miOpenFile": "파일 열기(&&O)...",
-+	"miOpenRecent": "최근 항목 열기(&&R)",
-+	"miSaveWorkspaceAs": "다른 이름으로 작업 영역 저장(&S)...",
-+	"miAddFolderToWorkspace": "작업 영역에 폴더 추가(&&A)",
-+>>>>>>> .their
- 	"miSave": "저장(&&S)",
- 	"miSaveAs": "다른 이름으로 저장(&&A)...",
- 	"miSaveAll": "모두 저장(&&L)",
-@@ -189,5 +198,11 @@
- 	"miDownloadingUpdate": "업데이트를 다운로드하는 중...",
- 	"miInstallUpdate": "업데이트 설치...",
- 	"miInstallingUpdate": "업데이트를 설치하는 중...",
-+<<<<<<< .our
- 	"miRestartToUpdate": "다시 시작하여 업데이트..."
-+=======
-+	"miCheckForUpdates": "업데이트 확인...",
-+	"aboutDetail": "\n버전 {0}\n커밋 {1}\n날짜 {2}\n셸 {3}\n렌더러 {4}\n노드 {5}\n아키텍처 {6}",
-+	"okButton": "확인"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
-  our    100644 bda85bce0b206ff79c5dce76befaf70badf82add i18n/kor/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
-  their  100644 748a7f2cb394a252b7d6673f26a9c1efcc24f119 i18n/kor/src/vs/editor/browser/widget/diffEditorWidget.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,5 +7,13 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"diff.tooLarge": "파일 1개가 너무 커서 파일을 비교할 수 없습니다."
- }
-\ No newline at end of file
-changed in both
-  base   100644 2c53ffbfb61c1bd3703b26d024e43b6fc44cbf68 i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 c96c0fe1469ce78842b73db686d63d6305f28dfb i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 63a10718dfeec8242710c6c7d6dc08106da68f98 i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json
-changed in both
-  base   100644 dcef1416eba3b36e89704049946067dd61560e9f i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 c148a56d8d67892505611b68cdd18b2ba3428134 i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 f42d9806fbe45b9c215beb1b52271da9bd8e1178 i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json
-changed in both
-  base   100644 8c6b4441dfce30ad18d7018cd01e0486ae75d861 i18n/kor/src/vs/editor/contrib/find/common/findController.i18n.json
-  our    100644 7201d1ab08fc71d8c9ec33ae39fdb857dbf3a0c9 i18n/kor/src/vs/editor/contrib/find/common/findController.i18n.json
-  their  100644 d0e58fa206e360002c7208853a0665c90b28ebfe i18n/kor/src/vs/editor/contrib/find/common/findController.i18n.json
-@@ -10,6 +10,15 @@
- 	"nextSelectionMatchFindAction": "다음 선택 찾기",
- 	"previousSelectionMatchFindAction": "이전 선택 찾기",
- 	"startReplace": "바꾸기",
-+<<<<<<< .our
-+=======
-+	"addSelectionToNextFindMatch": "다음 일치 항목 찾기에 선택 항목 추가",
-+	"addSelectionToPreviousFindMatch": "이전 일치 항목 찾기에 선택 항목 추가",
-+	"moveSelectionToNextFindMatch": "다음 일치 항목 찾기로 마지막 선택 항목 이동",
-+	"moveSelectionToPreviousFindMatch": "마지막 선택 항목을 이전 일치 항목 찾기로 이동",
-+	"selectAllOccurrencesOfFindMatch": "일치 항목 찾기의 모든 항목 선택",
-+	"changeAll.label": "모든 항목 변경",
-+>>>>>>> .their
- 	"showNextFindTermAction": "다음 검색어 표시",
- 	"showPreviousFindTermAction": "이전 검색어 표시"
- }
-\ No newline at end of file
-changed in both
-  base   100644 ee033a6e86d186c6e6815d7bf7efa992f6699b5e i18n/kor/src/vs/platform/history/electron-main/historyMainService.i18n.json
-  our    100644 9400d59c513057d5900bfcbd5bcb8b5890743265 i18n/kor/src/vs/platform/history/electron-main/historyMainService.i18n.json
-  their  100644 74f2992518abeaa3aa267103e02461410bf75ab7 i18n/kor/src/vs/platform/history/electron-main/historyMainService.i18n.json
-changed in both
-  base   100644 ab5da7316c6103edf30c44261039b1a9d3ac518f i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 44b01274f5b039d38e4cfbd58f3d0758fa5d1e89 i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 45f6d8d560c2002727261c71c26991b243b84c8d i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -60,7 +60,11 @@
- 	"scrollbarShadow": "스크롤되는 보기를 나타내는 스크롤 막대 그림자입니다.",
- 	"scrollbarSliderBackground": "스크롤 막대 슬라이버 배경색입니다.",
- 	"scrollbarSliderHoverBackground": "마우스로 가리킬 때 스크롤 막대 슬라이더 배경색입니다.",
-+<<<<<<< .our
- 	"scrollbarSliderActiveBackground": "클릭된 상태일 때 스크롤 막대 슬라이더 배경색입니다.",
-+=======
-+	"scrollbarSliderActiveBackground": "활성 상태일 때 스크롤 막대 슬라이더 배경색입니다.",
-+>>>>>>> .their
- 	"progressBarBackground": "오래 실행 중인 작업에 대해 표시되는 진행률 표시 막대의 배경색입니다.",
- 	"editorBackground": "편집기 배경색입니다.",
- 	"editorForeground": "편집기 기본 전경색입니다.",
-changed in both
-  base   100644 56b8182afa2371ec565fe3b383e32ed8d1076af5 i18n/kor/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 9f392ee6782a9cd3b3d60690870bfb3e051b1e8b i18n/kor/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 0e57f95cfae79754ad9dc747aefe09141723ac88 i18n/kor/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -9,6 +9,7 @@
- 	"openFile": "파일 열기...",
- 	"openFolder": "폴더 열기...",
- 	"openFileFolder": "열기...",
-+<<<<<<< .our
- 	"globalRemoveFolderFromWorkspace": "작업 영역에서 폴더 제거...",
- 	"saveWorkspaceAsAction": "작업 영역을 다른 이름으로 저장",
- 	"save": "저장(&&S)",
-@@ -16,4 +17,24 @@
- 	"openWorkspaceAction": "작업 영역 열기...",
- 	"openWorkspaceConfigFile": "작업 영역 구성 파일 열기",
- 	"duplicateWorkspaceInNewWindow": "새 창에 작업 영역 복제"
-+=======
-+	"reload": "다시 로드(&&R)",
-+	"cancel": "취소",
-+	"newWorkspaceFormExisting": "기존 작업 영역을 바탕으로 새 작업 영역 만들기...",
-+	"select": "선택(&&S)",
-+	"selectWorkspace": "작업 영역 폴더 선택",
-+	"addSupported": "여러 폴더를 열려면 창을 다시 로드해야 합니다.",
-+	"addFolderToWorkspace": "작업 영역에 폴더 추가...",
-+	"add": "추가(&&A)",
-+	"addFolderToWorkspaceTitle": "작업 영역에 폴더 추가",
-+	"removeFolderFromWorkspace": "작업 영역에서 폴더 삭제",
-+	"saveWorkspaceAsAction": "작업 영역을 다른 이름으로 저장",
-+	"saveEmptyWorkspaceNotSupported": "저장하려면 먼저 작업 영역을 여세요.",
-+	"saveNotSupported": "작업 영역을 저장하려면 창을 다시 로드해야 합니다.",
-+	"save": "저장(&&S)",
-+	"saveWorkspace": "작업 영역 저장",
-+	"openWorkspaceAction": "작업 영역 열기...",
-+	"newWorkspace": "새 작업 영역...",
-+	"openWorkspaceConfigFile": "작업 영역 구성 파일 열기"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 0977d6d1b49023bfdcc955aea2c88da8c7a76c67 i18n/kor/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 c3a38e203dc33f498428fe02d849236cb876a123 i18n/kor/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 241bb67c5eee8ce0a274d3f675a332f810f92572 i18n/kor/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 5e2f77ce29d584046b775def4dba3837e6629d07 i18n/kor/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-  our    100644 93f9a5f3a8b11703c482d474163e0bd4ada760f7 i18n/kor/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-  their  100644 d6de51734164ad589ae3565b29422580bde33a62 i18n/kor/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,9 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"compositePart.hideSideBarLabel": "사이드 막대 숨기기",
-+>>>>>>> .their
- 	"focusSideBar": "사이드바에 포커스",
- 	"viewCategory": "보기"
- }
-\ No newline at end of file
-changed in both
-  base   100644 71d7cfe6952de22b112495938f77f82acd153f82 i18n/kor/src/vs/workbench/common/theme.i18n.json
-  our    100644 634f6ea85a754d26140eeb8ed57e39a6ab596db9 i18n/kor/src/vs/workbench/common/theme.i18n.json
-  their  100644 64172c524ed6bce53ff9e333142bae79e1c4bdc3 i18n/kor/src/vs/workbench/common/theme.i18n.json
-@@ -61,6 +61,7 @@
- 	"titleBarActiveBackground": "창을 활성화할 때의 제목 표시줄 전경입니다. 이 색은 현재 macOS에서만 지원됩니다.",
- 	"titleBarInactiveBackground": "창이 비활성화된 경우의 제목 표시줄 배경입니다. 이 색은 현재 macOS에서만 지원됩니다.",
- 	"titleBarBorder": "제목 막대 테두리 색입니다. 현재 이 색상은 macOS에서만 지원됩니다.",
-+<<<<<<< .our
- 	"notificationCenterBorder": "알림 센터 테두리 색입니다. 알림은 창 오른쪽 맨 아래에 표시됩니다.",
- 	"notificationToastBorder": "알림 테두리 색입니다. 알림은 창 오른쪽 맨 아래에 표시됩니다.",
- 	"notificationsForeground": "알림 전경색입니다. 알림은 창 오른쪽 맨 아래에 표시됩니다.",
-@@ -69,4 +70,17 @@
- 	"notificationCenterHeaderForeground": "알림 센터 머리글 전경색입니다. 알림은 창 오른쪽 맨 아래에 표시됩니다.",
- 	"notificationCenterHeaderBackground": "알림 센터 머리글 배경색입니다. 알림은 창 오른쪽 맨 아래에 표시됩니다.",
- 	"notificationsBorder": "알림 센터에서 다른 알림과 구분하는 알림 테두리 색입니다. 알림은 창 오른쪽 맨 아래에 표시됩니다."
-+=======
-+	"notificationsForeground": "알림 전경색입니다. 알림은 창의 위쪽에 표시됩니다.",
-+	"notificationsBackground": "알림 배경색입니다. 알림은 창의 위쪽에 표시됩니다.",
-+	"notificationsButtonBackground": "알림 단추 배경색입니다. 알림은 창의 위쪽에 표시됩니다.",
-+	"notificationsButtonHoverBackground": "떠 있는 알림 단추 배경색입니다. 알림은 창의 위쪽에 표시됩니다.",
-+	"notificationsButtonForeground": "알림 단추 전경색입니다. 알림은 창의 위쪽에 표시됩니다.",
-+	"notificationsInfoBackground": "알림 정보 배경색입니다. 알림은 창의 위쪽에 표시됩니다.",
-+	"notificationsInfoForeground": "알림 정보 전경색입니다. 알림은 창의 위쪽에 표시됩니다.",
-+	"notificationsWarningBackground": "알림 경고 배경색입니다. 알림은 창의 위쪽에 표시됩니다.",
-+	"notificationsWarningForeground": "알림 경고 전경색입니다. 알림은 창의 위쪽에 표시됩니다.",
-+	"notificationsErrorBackground": "알림 오류 배경색입니다. 알림은 창의 위쪽에 표시됩니다.",
-+	"notificationsErrorForeground": "알림 오류 전경색입니다. 알림은 창의 위쪽에 표시됩니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d6e342c7b2244965f9f49a03f8b7b950a26c77fd i18n/kor/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 e913e127345422fb81d57f13fd8b5c25a0d63e10 i18n/kor/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 e9b90f8dbe3eab05fb2305d42588a4bfd5fe8e1b i18n/kor/src/vs/workbench/electron-browser/actions.i18n.json
-changed in both
-  base   100644 96418c6f448fe0fa68e2a7eba4d25c96bce1c874 i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 faff44b17686fcb835995d2bfd92efcfdcc183b1 i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 57a3833e96f18df728132e4eda300aa9bbbfa084 i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,6 +35,7 @@
- 	"panelDefaultLocation": "패널의 기본 위치를 제어합니다. 워크벤치의 아래 또는 오른쪽에 표시될 수 있습니다.",
- 	"statusBarVisibility": "워크벤치 아래쪽에서 상태 표시줄의 표시 유형을 제어합니다.",
- 	"activityBarVisibility": "워크벤치에서 작업 막대의 표시 유형을 제어합니다.",
-+<<<<<<< .our
- 	"viewVisibility": "보기 머리글 작업의 표시 여부를 제어합니다. 보기 머리글 작업은 항상 표시할 수도 있고 보기에 포커스가 있거나 보기를 마우스로 가리킬 때만 표시할 수도 있습니다.",
- 	"fontAliasing": "워크벤치에서 글꼴 앨리어싱 방식을 제어합니다.\n- 기본: 서브 픽셀 글꼴 다듬기. 대부분의 일반 디스플레이에서 가장 선명한 글꼴 제공\n- 안티앨리어싱: 서브 픽셀이 아닌 픽셀 단위에서 글꼴 다듬기. 전반적으로 더 밝은 느낌을 줄 수 있음\n- 없음: 글꼴 다듬기 사용 안 함. 텍스트 모서리가 각지게 표시됨\n- 자동: 디스플레이의 DPI에 따라 `기본` 또는 `안티앨리어싱`을 자동으로 적용합니다.",
- 	"workbench.fontAliasing.default": "서브 픽셀 글꼴 다듬기. 대부분의 일반 디스플레이에서 가장 선명한 텍스트를 제공합니다. ",
-@@ -43,6 +44,15 @@
- 	"workbench.fontAliasing.auto": "디스플레이의 DPI에 따라 `기본` 또는 `안티앨리어싱`을 자동으로 적용합니다.",
- 	"enableNaturalLanguageSettingsSearch": "설정에 대한 자연어 검색 모드를 사용할지 여부를 제어합니다.",
- 	"windowConfigurationTitle": "창",
-+=======
-+	"closeOnFileDelete": "일부 다른 프로세스에서 파일을 삭제하거나 이름을 바꿀 때 파일을 표시하는 편집기를 자동으로 닫을지 여부를 제어합니다. 사용하지 않도록 설정하는 경우 이러한 이벤트가 발생하면 편집기가 더티 상태로 계속 열려 있습니다. 응용 프로그램 내에서 삭제하면 항상 편집기가 닫히고 데이터를 유지하기 위해 더티 파일은 닫히지 않습니다.",
-+	"fontAliasing": "워크벤치에서 글꼴 앨리어싱 방식을 제어합니다.\n- 기본: 서브 픽셀 글꼴 다듬기. 대부분의 일반 디스플레이에서 가장 선명한 글꼴 제공\n- 안티앨리어싱: 서브 픽셀이 아닌 픽셀 단위에서 글꼴 다듬기. 전반적으로 더 밝은 느낌을 줄 수 있음\n- 없음: 글꼴 다듬기 사용 안 함. 텍스트 모서리가 각지게 표시됨",
-+	"workbench.fontAliasing.default": "서브 픽셀 글꼴 다듬기. 대부분의 일반 디스플레이에서 가장 선명한 텍스트를 제공합니다. ",
-+	"workbench.fontAliasing.antialiased": "서브 픽셀이 아닌 픽셀 수준에서 글꼴을 다듬습니다. 전반적으로 글꼴이 더 밝게 표시됩니다.",
-+	"workbench.fontAliasing.none": "글꼴 다듬기를 사용하지 않습니다. 텍스트 가장자리가 각지게 표시됩니다.",
-+	"swipeToNavigate": "세 손가락으로 가로로 살짝 밀어 열려 있는 파일 간을 이동합니다.",
-+	"workbenchConfigurationTitle": "워크벤치",
-+>>>>>>> .their
- 	"window.openFilesInNewWindow.on": "파일이 새 창에서 열립니다.",
- 	"window.openFilesInNewWindow.off": "파일이 파일의 폴더가 열려 있는 창 또는 마지막 활성 창에서 열립니다.",
- 	"window.openFilesInNewWindow.defaultMac": "Dock 또는 Finder를 통해 파일을 연 경우를 제외하고 파일이 파일의 폴더가 열린 창 또는 마지막 활성 창에서 열립니다.",
-changed in both
-  base   100644 25e82009859b6337471de1227baae9692d5ef89e i18n/kor/src/vs/workbench/electron-browser/window.i18n.json
-  our    100644 703e3d8d4269028adc7403f098f2a57162a9f658 i18n/kor/src/vs/workbench/electron-browser/window.i18n.json
-  their  100644 a1dd528439c484d9c337c4c7530afa4862973131 i18n/kor/src/vs/workbench/electron-browser/window.i18n.json
-@@ -12,5 +12,10 @@
- 	"copy": "복사",
- 	"paste": "붙여넣기",
- 	"selectAll": "모두 선택",
-+<<<<<<< .our
- 	"runningAsRoot": "{0}을(를) 루트 사용자로 실행하지 않는 것이 좋습니다."
-+=======
-+	"confirmOpen": "{0} 작업 영역을 여시겠습니까?",
-+	"confirmOpenButton": "열기(&&O)"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 33a1fa482a7a10c469872359aabac624242ce70e i18n/kor/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  our    100644 dd3c2e1891671a9ad308f3ef03becfcb764d3cd7 i18n/kor/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  their  100644 17a439db7451aed3cd75fffe4988416294bbe633 i18n/kor/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-changed in both
-  base   100644 3a1c8cbdce79807cc1c13d7c37c9f0160c3f7bb9 i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 f0485e490c5dc7158ba60cc766e0b791027e8972 i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 08b7596ca511d4d679d67603576b27dd76f531ed i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -28,7 +28,13 @@
- 	"preLaunchTaskExitCode": "preLaunchTask '{0}'이(가) {1} 종료 코드와 함께 종료되었습니다.",
- 	"showErrors": "오류 표시",
- 	"noFolderWorkspaceDebugError": "활성 파일은 디버그할 수 없습니다. 이 파일이 디스크에 저장되어 있고 해당 파일 형식에 대한 디버그 확장이 설치되어 있는지 확인하세요.",
-+<<<<<<< .our
- 	"cancel": "취소",
- 	"DebugTaskNotFound": "작업 '{0}' 을(를) 찾을 수 없습니다.",
- 	"taskNotTracked": "작업 '{0}' 을(를) 추적할 수 없습니다."
-+=======
-+	"NewLaunchConfig": "응용 프로그램에 사용할 구성 시작 파일을 설정하세요. {0}",
-+	"DebugTaskNotFound": "preLaunchTask '{0}'을(를) 찾을 수 없습니다.",
-+	"differentTaskRunning": "'{0}' 작업이 이미 실행 중입니다. 실행 전 작업 '{1}'을(를) 실행할 수 없습니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6de8809b45e61af1d63e0b627e3919cb0487d957 i18n/kor/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  our    100644 a364973604ec4284961f14cfdd0ccf08d6d710b7 i18n/kor/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  their  100644 86af02695e33c4349f543d4fa547a9be7a8de097 i18n/kor/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-merged
-  result 100644 aa4c7b650ce726c1909e8e14b0e673bc244b099b i18n/kor/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-  our    100644 cc42700efc8ccde4573f62bccb584ab0b951aa54 i18n/kor/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-@@ -7,8 +7,5 @@
- 	"emmetConfigurationTitle": "Emmet",
- 	"triggerExpansionOnTab": "사용하도록 설정하면 emmet 약어는 <Tab> 키를 눌렀을 때 확장됩니다. emmet.useNewemmet을 true로 설정하면 적용되지 않습니다.",
- 	"emmetPreferences": "Emmet의 일부 작업 및 해결 프로그램의 동작을 수정하는 데 사용되는 기본 설정입니다. emmet.useNewemmet을 true로 설정하면 적용되지 않습니다.",
--	"emmetSyntaxProfiles": "지정된 구문에 대한 프로필을 정의하거나 특정 규칙이 포함된 고유한 프로필을 사용하세요.",
--	"emmetExclude": "Emmet 약어를 확장하면 안 되는 언어의 배열입니다.",
--	"emmetExtensionsPath": "Emmet 프로필, 코드 조각 및 기본 설정이 포함된 폴더의 경로입니다. emmet.useNewEmmet이 true일 때만 확장 경로의 프로필이 인정됩니다.",
- 	"useNewEmmet": "모든 emmet 기능에 대해 새 emmet 모듈을 사용해 보세요(이전 단일 emmet 라이브러리를 대체함)."
- }
-\ No newline at end of file
-changed in both
-  base   100644 3eb884953bf2e253a100dadbfbecbc88d57b23c3 i18n/kor/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  our    100644 d7e3fbf5baba4bf721149551ff3617009db1827d i18n/kor/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  their  100644 50730f440768cb821b1884c299c5df52891014fd i18n/kor/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-changed in both
-  base   100644 748fbd6e5f8c01227daf8ce913e8569c6cd7e51d i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 3b79008f444d2989f35d429d32801582bb6d419c i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 55a66108426ab39b99d910d449c56e35e8d22f53 i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-changed in both
-  base   100644 272b83e055a11e417843f8e38c3a88706df397a8 i18n/kor/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  our    100644 b962da52ed963be01f95715acc2834881bf51629 i18n/kor/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  their  100644 32bbc3c8291b298f3185fb405ae8d61e128add6e i18n/kor/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-changed in both
-  base   100644 2044ec34d69a4c44a1635f8fc298967fe65af72d i18n/kor/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 64e3a748c1d30ddcf3658546af6b8c004e841f1b i18n/kor/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 a6fa5c340277c18536040bc1bd4fc1e734bc5649 i18n/kor/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-@@ -40,6 +40,7 @@
- 	"dynamicHeight": "열려 있는 편집기 섹션의 높이가 요소 수에 따라 동적으로 조정되는지 여부를 제어합니다.",
- 	"autoReveal": "탐색기에서 파일을 열 때 자동으로 표시하고 선택할지를 제어합니다.",
- 	"enableDragAndDrop": "탐색기에서 끌어서 놓기를 통한 파일 및 폴더 이동을 허용하는지를 제어합니다.",
-+<<<<<<< .our
- 	"confirmDragAndDrop": "끌어서 놓기를 사용하여 파일 및 폴더를 이동하기 위해 탐색기에서 확인을 요청해야 하는지 제어합니다.",
- 	"confirmDelete": "파일을 휴지통에서 삭제할 때 탐색기에서 확인을 요청해야 하는지 제어합니다.",
- 	"sortOrder.default": "파일 및 폴더가 이름을 기준으로 사전순으로 정렬됩니다. 폴더가 파일 앞에 표시됩니다.",
-@@ -50,4 +51,12 @@
- 	"sortOrder": "탐색기에서 파일 및 폴더의 정렬 순서를 제어합니다. 기본 정렬 외에 순서를 'mixed'(파일 및 폴더가 결합되어 정렬), 'type'(파일 형식 기준), 'modified'(마지막으로 수정한 날짜 기준) 또는 'filesFirst'(파일을 폴더 앞에 정렬)로 설정할 수 있습니다.",
- 	"explorer.decorations.colors": "파일 장식에 색을 사용해야 하는지 제어합니다.",
- 	"explorer.decorations.badges": "파일 장식에 배지를 사용해야 하는지 제어합니다."
-+=======
-+	"sortOrder.default": "파일 및 경로는 이름을 기준으로 알파벳순으로 정렬됩니다. 디렉터리가 파일 앞에 표시됩니다.",
-+	"sortOrder.mixed": "파일 및 디렉터리가 이름을 기준으로 알파벳순으로 정렬됩니다. 파일이 디렉터리와 결합됩니다.",
-+	"sortOrder.filesFirst": "파일 및 디렉터리가 이름을 기준으로 알파벳순으로 정렬됩니다. 파일이 디렉터리 앞에 표시됩니다.",
-+	"sortOrder.type": "파일 및 디렉터리가 확장자를 기준으로 알파벳순으로 정렬됩니다. 디렉터리가 파일 앞에 표시됩니다.",
-+	"sortOrder.modified": "파일 및 디렉터리가 마지막으로 수정한 날짜를 기준으로 내림차순 정렬됩니다. 디렉터리가 파일 앞에 표시됩니다.",
-+	"sortOrder": "undefined"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 cbfa5b0cef99ec8345da977d528810fa5d244a3b i18n/kor/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-  our    100644 6cf353ae7129b46c74d8a2ece73bc29603959134 i18n/kor/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-  their  100644 a59e72f5c391f9c5d555515eb949a58666d7d0f7 i18n/kor/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-@@ -12,5 +12,6 @@
- 	"genericSaveError": "'{0}'을(를) 저장하지 못했습니다. {1}",
- 	"staleSaveError": "'{0}'을(를) 저장하지 못했습니다. 디스크의 내용이 최신 버전입니다. 버전을 디스크에 있는 버전과 비교하려면 **비교**를 클릭하세요.",
- 	"compareChanges": "비교",
--	"saveConflictDiffLabel": "{0}(디스크에 있음) ↔ {1}({2}에 있음) - 저장 충돌 해결"
-+	"saveConflictDiffLabel": "{0}(디스크에 있음) ↔ {1}({2}에 있음) - 저장 충돌 해결",
-+	"userGuide": "오른쪽 편집기 도구 모음의 작업을 사용하여 변경 내용을 **실행 취소**하거나 디스크의 콘텐츠를 변경 내용으로 **덮어쓰기**"
- }
-\ No newline at end of file
-changed in both
-  base   100644 474bdeb6edf46a1c2b8f9fbf73073c06b239f528 i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  our    100644 ad061c299ee4ef976122d2a8f6e9baa370867e9b i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  their  100644 392c06bedeb45e9356901bf138ff3b8cc44184a7 i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-@@ -14,6 +14,10 @@
- 	"openGlobalKeybindingsFile": "바로 가기 키 파일 열기",
- 	"openWorkspaceSettings": "작업 영역 설정 열기",
- 	"openFolderSettings": "폴더 설정 열기",
-+<<<<<<< .our
-+=======
-+	"pickFolder": "폴더 선택",
-+>>>>>>> .their
- 	"configureLanguageBasedSettings": "언어별 설정 구성...",
- 	"languageDescriptionConfigured": "({0})",
- 	"pickLanguage": "언어 선택"
-changed in both
-  base   100644 714541e3b4c81c2a75e962e1feaad6013af5b976 i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 952972db109181a066081ea0ee054ff4a0c809ad i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 393b61b671f8a42e7064445336f07f06f5f762e7 i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -14,4 +15,19 @@
- 	"editTtile": "편집",
- 	"replaceDefaultValue": "설정에서 바꾸기",
- 	"copyDefaultValue": "설정에 복사"
-+=======
-+	"emptyUserSettingsHeader": "설정을 여기에 넣어서 기본 설정을 덮어씁니다.",
-+	"errorInvalidConfiguration": "설정에 쓸 수 없습니다. 파일에서 오류/경고를 해결하고 다시 시도하세요.",
-+	"emptyWorkspaceSettingsHeader": "설정을 여기에 넣어서 사용자 설정을 덮어씁니다.",
-+	"emptyFolderSettingsHeader": "폴더 설정을 여기에 넣어서 작업 영역 설정을 덮어씁니다.",
-+	"defaultFolderSettingsTitle": "기본 폴더 설정",
-+	"defaultSettingsTitle": "기본 설정",
-+	"noSettingsFound": "설정을 찾을 수 없습니다.",
-+	"editTtile": "편집",
-+	"replaceDefaultValue": "설정에서 바꾸기",
-+	"copyDefaultValue": "설정에 복사",
-+	"unsupportedPHPExecutablePathSetting": "이 설정은 사용자 설정이어야 합니다. 작업 영역에 대해 PHP를 구성하려면 PHP 파일을 열고 상태 표시줄에서 'PHP 경로'를 클릭합니다.",
-+	"unsupportedWorkspaceSetting": "이 설정은 사용자 설정이어야 합니다.",
-+	"unsupportedWorkbenchSetting": "이 설정은 지금 적용할 수 없으며 이 폴더를 직접 열 경우에 적용됩니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 f43ae31fedacdb1cdde2741f9342b50c5ab23e63 i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-  our    100644 503603410ea6bf6bdfe2187f4cb333a3f5a17aea i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-  their  100644 7c672264d394c998056ddc88e441cc7f6a8e7eae i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 a8bd67a28f391e840f7a35323a824c51031c0c11 i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 16b932871b29f61a36b73fbdf7e039c49a475ec1 i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -12,4 +13,13 @@
- 	"userSettings": "사용자 설정",
- 	"workspaceSettings": "작업 영역 설정",
- 	"folderSettings": "폴더 설정"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"folderSettingsDetails": "폴더 설정"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 4fe2fc0bfe27efd9c8cf6f65e729bd0f7acd8b85 i18n/kor/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  our    100644 112bca1e01f4036334cbaa730dc5d8a1af52991c i18n/kor/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  their  100644 f2e2d333694d65f7245ef777747cfbfae44c53be i18n/kor/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-@@ -8,5 +8,11 @@
- 	],
- 	"relaunchSettingMessage": "설정이 변경되어 다시 시작해야만 적용됩니다.",
- 	"relaunchSettingDetail": "[다시 시작] 단추를 눌러 {0}을(를) 다시 시작하고 설정을 사용하도록 설정하세요.",
-+<<<<<<< .our
- 	"restart": "다시 시작(&&R)"
-+=======
-+	"restart": "다시 시작",
-+	"relaunchWorkspaceMessage": "이 작업 영역을 변경하려면 확장 시스템을 다시 로드해야 합니다.",
-+	"reload": "다시 로드"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7d8570952628fe3c9bd773e5def704d7952be918 i18n/kor/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 071d294ccc8fe4437d151c87e9b3a4d19cd1a8d5 i18n/kor/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 d8c432f8bb004a012f1c3808074610d7cd6dc03b i18n/kor/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"nextSearchIncludePattern": "다음 검색 포함 패턴 표시",
- 	"previousSearchIncludePattern": "이전 검색 포함 패턴 표시",
- 	"nextSearchExcludePattern": "다음 검색 제외 패턴 표시",
-@@ -16,6 +19,8 @@
- 	"previousReplaceTerm": "이전 검색 대체어 표시",
- 	"findInFiles": "파일에서 찾기",
- 	"replaceInFiles": "파일에서 바꾸기",
-+	"findInWorkspace": "작업 영역에서 찾기...",
-+	"findInFolder": "폴더에서 찾기...",
- 	"RefreshAction.label": "새로 고침",
- 	"CollapseDeepestExpandedLevelAction.label": "모두 축소",
- 	"ClearSearchResultsAction.label": "지우기",
-changed in both
-  base   100644 4d21f25e146300f8b406b2915191ba0751c1a47f i18n/kor/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-  our    100644 51d183c82ffdf6c0811c8874f35fecd592ff5557 i18n/kor/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-  their  100644 2c8228cd8e4738400c20b314f1b789c06badb95b i18n/kor/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"searchFolderMatch.other.label": "다른 파일",
- 	"searchFileMatches": "{0}개 파일 찾음",
- 	"searchFileMatch": "{0}개 파일 찾음",
-changed in both
-  base   100644 c58a113000197959668c60b982d2413c3a00c534 i18n/kor/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  our    100644 c98e307c23bf5e868367c1bc97cd270b8e1c1303 i18n/kor/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  their  100644 483e9ae5d54191f6ccfac472a9a76ffe6e224f62 i18n/kor/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-changed in both
-  base   100644 e3482cdc4e3fb031e43e6acafe64f70326b658a9 i18n/kor/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 5dfbb2074f09c64c5ec03adc7d012b25c2bb9e72 i18n/kor/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 d17c30251b6c28821c5bd58bf2f3a0259e13c0cc i18n/kor/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-changed in both
-  base   100644 66187c94e82e2daf9911df95c32fedd949983ef7 i18n/kor/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 7b483f685d0f32a5b2eb20f1327a18475e2d29ae i18n/kor/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 7d8dc6c2c6abb52f1d0cb816c103c5d4238c5879 i18n/kor/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -12,8 +12,12 @@
- 	"totalWarnings": "경고 {0}개",
- 	"totalInfos": "정보 {0}개",
- 	"problems": "문제",
-+<<<<<<< .our
- 	"building": "빌드하고 있습니다...",
- 	"manyProblems": "10K+",
-+=======
-+	"manyMarkers": "99+",
-+>>>>>>> .their
- 	"runningTasks": "실행 중인 작업 표시",
- 	"tasks": "작업",
- 	"TaskSystem.noHotSwap": "실행 중인 활성 작업이 있는 작업 실행 엔진을 변경하면 Window를 다시 로드해야 합니다.",
-@@ -24,17 +28,25 @@
- 	"TaskService.noTestTask1": "정의된 테스트 작업이 없습니다. tasks.json 파일에서 작업을 'isTestCommand'로 표시하세요.",
- 	"TaskService.noTestTask2": "정의된 테스트 작업이 없습니다. tasks.json 파일에서 작업을 'test'로 표시하세요.",
- 	"TaskServer.noTask": "실행하도록 요청한 작업 {0}을(를) 찾을 수 없습니다.",
-+<<<<<<< .our
- 	"TaskService.associate": "연결",
-+=======
-+>>>>>>> .their
- 	"TaskService.attachProblemMatcher.continueWithout": "작업 출력을 스캔하지 않고 계속",
- 	"TaskService.attachProblemMatcher.never": "작업 출력 스캔 안 함",
- 	"TaskService.attachProblemMatcher.learnMoreAbout": "작업 출력 스캔에 대해 자세히 알아보기",
- 	"selectProblemMatcher": "작업 출력에서 스캔할 오류 및 경고 유형을 선택",
- 	"customizeParseErrors": "현재 작성 구성에 오류가 있습니다. 작업을 사용자 지정하기 전에 오류를 수정하세요.\n",
- 	"moreThanOneBuildTask": "tasks.json에 여러 빌드 작업이 정의되어 있습니다. 첫 번째 작업을 실행합니다.\n",
-+<<<<<<< .our
- 	"TaskSystem.activeSame.background": "'{0}' 작업이 이미 활성 상태이며 백그라운드 모드입니다.",
- 	"TaskSystem.activeSame.noBackground": "'{0}' 작업은 이미 활성 상태입니다.",
- 	"terminateTask": "작업 종료",
- 	"restartTask": "작업 다시 시작",
-+=======
-+	"TaskSystem.activeSame.background": "'{0}' 작업이 이미 활성 상태로 백그라운드 모드에 있습니다. 종료하려면 작업 메뉴에서 '작업 종료'를 사용하세요.",
-+	"TaskSystem.activeSame.noBackground": "'{0}' 작업이 이미 활성 상태입니다. 작업을 종료하려면 작업 메뉴에서 '작업 종료'를 사용하세요.",
-+>>>>>>> .their
- 	"TaskSystem.active": "이미 실행 중인 작업이 있습니다. 다른 작업을 실행하려면 먼저 이 작업을 종료하세요.",
- 	"TaskSystem.restartFailed": "{0} 작업을 종료하고 다시 시작하지 못했습니다.",
- 	"TaskService.noConfiguration": "오류: {0} 작업 검색에서는 다음 구성에 대한 작업을 제공하지 않습니다:\n{1}\n이 작업이 무시됩니다.\n",
-@@ -75,8 +87,13 @@
- 	"TaskService.pickDefaultBuildTask": "기본 빌드 작업으로 사용할 작업을 선택",
- 	"TaskService.defaultTestTaskExists": "{0}은(는) 이미 기본 테스트 작업으로 표시되어 있습니다.",
- 	"TaskService.pickDefaultTestTask": "기본 테스트 작업으로 사용할 작업 선택",
-+<<<<<<< .our
- 	"TaskService.pickShowTask": "출력을 표시할 작업 선택",
- 	"TaskService.noTaskIsRunning": "실행 중인 작업이 없습니다.",
-+=======
-+	"TaskService.noTaskIsRunning": "실행 중인 작업이 없습니다.",
-+	"TaskService.pickShowTask": "출력을 표시할 작업 선택",
-+>>>>>>> .their
- 	"ShowLogAction.label": "작업 로그 표시",
- 	"RunTaskAction.label": "작업 실행",
- 	"RestartTaskAction.label": "실행 중인 작업 다시 시작",
-changed in both
-  base   100644 840298c5adbc79c51df4aa33f24f8ba0e34af680 i18n/kor/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  our    100644 13963265fec1836212d41ecacb07eed5e173dace i18n/kor/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  their  100644 9b3adf8165e42882eec3540d79bab51d0950c445 i18n/kor/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  our    100644 ba7f34ebda0d6a112370fe91393ef138e8200a78 i18n/kor/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  their  100644 ae662c4eb21bdc5e35d869e2dedc61321bea3ca9 i18n/kor/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,6 +10,15 @@
- 	"termEntryAriaLabel": "{0}, 터미널 선택기",
- 	"termCreateEntryAriaLabel": "{0}, 새 터미널 만들기",
- 	"workbench.action.terminal.newplus": "$(plus) 새 통합 터미널 만들기",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"entryAriaLabel": "{0}, 터미널 선택기",
-+>>>>>>> .their
- 	"noTerminalsMatching": "일치하는 터미널 없음",
- 	"noTerminalsFound": "열린 터미널 없음"
- }
-\ No newline at end of file
-changed in both
-  base   100644 cd78dbfc40f81a698651c0c6471adbe21b2ce9f9 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 bc58bba26a36ca2c7cacec97bfa2f02daab82775 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 65227b7a9de823bfbbf960d5d116f74cbd5e1536 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,9 @@
- 	],
- 	"quickOpen.terminal": "모든 열려 있는 터미널 표시",
- 	"terminal": "터미널",
-+=======
-+	"quickOpen.terminal": "모든 열려 있는 터미널 표시",
-+>>>>>>> .their
- 	"terminalIntegratedConfigurationTitle": "통합 터미널",
- 	"terminal.integrated.shell.linux": "터미널이 Linux에서 사용하는 셸의 경로입니다.",
- 	"terminal.integrated.shellArgs.linux": "Linux 터미널에 있을 때 사용할 명령줄 인수입니다.",
-@@ -36,8 +40,12 @@
- 	"terminal.integrated.env.osx": "OS X의 터미널이 사용하는 VS Code 프로세스에 추가될 환경 변수를 포함한 개체",
- 	"terminal.integrated.env.linux": "Linux의 터미널에서 사용할 VS Code 프로세스에 추가되는 환경 변수를 포함한 개체",
- 	"terminal.integrated.env.windows": "Windows의 터미널에서 사용할 VS Code 프로세스에 추가되는 환경 변수를 포함한 개체",
-+<<<<<<< .our
- 	"terminal.integrated.showExitAlert": "종료 코드가 0이 아닌 경우 `터미널 프로세스가 종료 코드로 종료되었습니다` 경고를 표시합니다.",
- 	"terminal.integrated.experimentalRestore": "VS Code를 시작할 때 작업 영역에 대한 터미널 세션을 자동으로 복원할지 여부를 지정합니다. 이 설정은 실험적 설정이므로 버그가 있을 수 있고 향후 변경될 수 있습니다.",
-+=======
-+	"terminal": "터미널",
-+>>>>>>> .their
- 	"terminalCategory": "터미널",
- 	"viewCategory": "보기"
- }
-\ No newline at end of file
-changed in both
-  base   100644 601a8942d55fde212e2183a803d84a901360295c i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 0c53998d6e084853fcbcba0b56050a6d820a2b6f i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 493a37e9ad524ad5c29b7fc8001d8646438f71a6 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -14,8 +14,11 @@
- 	"workbench.action.terminal.selectAll": "모두 선택",
- 	"workbench.action.terminal.deleteWordLeft": "왼쪽 단어 삭제",
- 	"workbench.action.terminal.deleteWordRight": "오른쪽 단어 삭제",
-+<<<<<<< .our
- 	"workbench.action.terminal.moveToLineStart": "줄 시작으로 이동",
- 	"workbench.action.terminal.moveToLineEnd": "줄 끝으로 이동",
-+=======
-+>>>>>>> .their
- 	"workbench.action.terminal.new": "새 통합 터미널 만들기",
- 	"workbench.action.terminal.new.short": "새 터미널",
- 	"workbench.action.terminal.newWorkspacePlaceholder": "새 터미널의 현재 작업 디렉토리를 선택합니다.",
-@@ -51,6 +54,7 @@
- 	"workbench.action.terminal.rename.prompt": "터미널 이름 입력",
- 	"workbench.action.terminal.focusFindWidget": "파인드 위젯 포커스",
- 	"workbench.action.terminal.hideFindWidget": "파인드 위젯 숨기기",
-+<<<<<<< .our
- 	"nextTerminalFindTerm": "다음 검색어 표시",
- 	"previousTerminalFindTerm": "이전 검색어 표시",
- 	"quickOpenTerm": "활성 터미널 전환",
-@@ -60,4 +64,7 @@
- 	"workbench.action.terminal.selectToNextCommand": "다음 명령까지 선택",
- 	"workbench.action.terminal.selectToPreviousLine": "이전 줄까지 선택",
- 	"workbench.action.terminal.selectToNextLine": "다음 줄까지 선택"
-+=======
-+	"quickOpenTerm": "활성 터미널 스위치"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 5923a5bf7d5ca280848e6757c78142d7c96e7133 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 d9e00ba07827f3430d124e149c098a234044e854 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 23c1d36b14271b708b4fbe9288aa7ed1ea3d88e8 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -10,7 +10,11 @@
- 	"terminal.foreground": "터미널의 전경색입니다.",
- 	"terminalCursor.foreground": "터미널 커서의 전경색입니다.",
- 	"terminalCursor.background": "터미널 커서의 배경색입니다. 블록 커서와 겹친 문자의 색상을 사용자 정의할 수 있습니다.",
-+<<<<<<< .our
- 	"terminal.selectionBackground": "터미널의 선택 영역 배경색입니다.",
- 	"terminal.border": "터미널 내의 분할 창을 구분하는 테두리의 색입니다. 기본값은 panel.border입니다.",
- 	"terminal.ansiColor": "터미널의 '{0}' ANSI 색상"
-+=======
-+	"terminal.ansiColor": "터미널의 '{0}' ANSI 색입니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 13239987ba2032559fd83262eb133815dd0371db i18n/kor/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 46a0013cd0e5a09c5cae294dfef72bf6b6e0aeef i18n/kor/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 01154954d3d064564cba6969f85cf2862f9b0da9 i18n/kor/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -11,10 +11,16 @@
- 	"read the release notes": "{0} v{1}을(를) 시작합니다. 릴리스 정보를 확인하시겠습니까?",
- 	"licenseChanged": "사용 조건이 변경되었습니다. [여기]({0})를 클릭하여 자세히 읽어보세요.",
- 	"neveragain": "다시 표시 안 함",
-+<<<<<<< .our
- 	"64bitisavailable": "64비트 Windows용 {0}을(를) 사용할 수 있습니다. 자세히 알아보려면 [여기]({1})를 클릭하세요.",
- 	"updateIsReady": "새 {0} 업데이트를 사용할 수 있습니다.",
- 	"noUpdatesAvailable": "현재 사용할 수 있는 업데이트가 없습니다.",
- 	"ok": "확인",
-+=======
-+	"64bitisavailable": "Windows 64비트용 {0} 사용 가능!",
-+	"learn more": "자세한 정보",
-+	"updateIsReady": "새 {0} 업데이트를 사용할 수 있습니다.",
-+>>>>>>> .their
- 	"thereIsUpdateAvailable": "사용 가능한 업데이트가 있습니다.",
- 	"download now": "지금 다운로드",
- 	"later": "나중에",
-changed in both
-  base   100644 8d20ba83c9aa5bc71e82065b368d8f865db112c0 i18n/kor/src/vs/workbench/parts/views/browser/views.i18n.json
-  our    100644 126ed4fd56c3c81bf97ff2799ec1bff37c3acc79 i18n/kor/src/vs/workbench/parts/views/browser/views.i18n.json
-  their  100644 e69a54f9b4fd61c2741b41d08316dd308d8c8a12 i18n/kor/src/vs/workbench/parts/views/browser/views.i18n.json
-@@ -5,5 +5,9 @@
- // Do not edit this file. It is machine generated.
- {
- 	"viewToolbarAriaLabel": "{0} 동작",
-+<<<<<<< .our
- 	"hideView": "사이드바에서 숨기기"
-+=======
-+	"removeView": "undefined"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 20c6758ebabb324f0d24194f3ad95b5bcc8f9d89 i18n/kor/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-  our    100644 aa4def687d8bf40f210c2e8d34023643fb5542c6 i18n/kor/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-  their  100644 375f27f648352b99a3c3209e827586ffbba10dec i18n/kor/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-changed in both
-  base   100644 bea643cae15bf0ccb46fad7d323b1d02a70707b7 i18n/kor/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  our    100644 96b95e7ea94ff23a6df5c6c5dd518571602dc1c9 i18n/kor/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  their  100644 313ae9485ab2e641cb46cb010c23c173578f5692 i18n/kor/src/vs/workbench/services/configuration/node/configuration.i18n.json
-@@ -9,6 +9,7 @@
- 	"scope.window.description": "[사용자] 설정 또는 [작업 영역] 설정에서 구성할 수 있는 창 특정 구성입니다.",
- 	"scope.resource.description": "사용자, 작업 영역 또는 폴더 설정에서 구성할 수 있는 리소스 특정 구성",
- 	"scope.description": "구성이 적용되는 범위입니다. 사용 가능 범위는 '창'과 '리소스'입니다.",
-+<<<<<<< .our
- 	"vscode.extension.contributes.configuration": "구성 설정을 적용합니다.",
- 	"invalid.title": "'configuration.title'은 문자열이어야 합니다.",
- 	"vscode.extension.contributes.defaultConfiguration": "언어별로 기본 편집기 구성 설정을 적용합니다.",
-@@ -21,4 +22,13 @@
- 	"workspaceConfig.settings.description": "작업 영역 설정",
- 	"workspaceConfig.extensions.description": "작업 영역 확장",
- 	"unknownWorkspaceProperty": "알 수 없는 작업 영역 구성 속성"
-+=======
-+	"invalid.type": "설정된 경우 'configuration.type'을 '개체'로 설정해야 합니다.",
-+	"invalid.title": "'configuration.title'은 문자열이어야 합니다.",
-+	"vscode.extension.contributes.defaultConfiguration": "언어별로 기본 편집기 구성 설정을 적용합니다.",
-+	"invalid.properties": "'configuration.properties'는 개체여야 합니다.",
-+	"workspaceConfig.id.description": "작업 영역 식별자입니다. 변경 시 소실될 수 있는 내부 작업 영역 상태를 저장하는 데 사용됩니다.",
-+	"workspaceConfig.folders.description": "작업 영역에 로드할 폴더 목록입니다. 파일 경로를 사용해야 합니다. 예: `file:///root/folderA`",
-+	"workspaceConfig.settings.description": "작업 영역 설정"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 77aa3c54a2973cf078758f4a60476a7dbce13855 i18n/kor/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 e81a8a242fb847453d5e2339de27eb2791e53868 i18n/kor/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 0b398bf4e1f24311af817ff4c298b50aed23341c i18n/kor/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -9,6 +9,7 @@
- 	"openTasksConfiguration": "작업 구성 열기",
- 	"openLaunchConfiguration": "시작 구성 열기",
- 	"open": "설정 열기",
-+<<<<<<< .our
- 	"saveAndRetry": "저장 및 다시 시도",
- 	"errorUnknownKey": "{1}은(는) 등록된 구성이 아니므로 {0}에 쓸 수 없습니다.",
- 	"errorInvalidWorkspaceConfigurationApplication": "{0}을(를) [작업 영역] 설정에 쓸 수 없습니다. 이 설정은 [사용자] 설정에만 쓸 수 있습니다.",
-@@ -27,6 +28,19 @@
- 	"errorConfigurationFileDirty": "사용자 설정 파일이 변경되어 사용자 설정에 쓸 수 없습니다. 먼저 사용자 설정 파일을 저장하고 다시 시도하세요.",
- 	"errorConfigurationFileDirtyWorkspace": "작업 영역 설정 파일이 변경되어 작업 영역 설정에 쓸 수 없습니다. 먼저 작업 영역 설정 파일을 저장하고 다시 시도하세요.",
- 	"errorConfigurationFileDirtyFolder": "폴더 설정 파일이 변경되어 폴더 설정에 쓸 수 없습니다. 먼저 '{0}' 폴더 설정 파일을 저장하고 다시 시도하세요.",
-+=======
-+	"close": "닫기",
-+	"saveAndRetry": "설정 저장 및 다시 시도",
-+	"errorUnknownKey": "{1}은(는) 등록된 구성이 아니므로 {0}에 쓸 수 없습니다.",
-+	"errorInvalidFolderConfiguration": "{0}이(가) 폴더 리소스 범위를 지원하지 않으므로 폴더 설정에 쓸 수 없습니다.",
-+	"errorInvalidUserTarget": "{0}이(가) 글로벌 범위를 지원하지 않으므로 사용자 설정에 쓸 수 없습니다.",
-+	"errorInvalidFolderTarget": "리소스가 제공되지 않으므로 폴더 설정에 쓸 수 없습니다.",
-+	"errorNoWorkspaceOpened": "작업 영역이 열려 있지 않으므로 {0}에 쓸 수 없습니다. 먼저 작업 영역을 열고 다시 시도하세요.",
-+	"errorInvalidConfiguration": "설정에 쓸 수 없습니다. **사용자 설정**을 열어 파일에서 오류/경고를 해결하고 다시 시도하세요.",
-+	"errorInvalidConfigurationWorkspace": "설정에 쓸 수 없습니다. **작업 영역 설정**을 열어 파일에서 오류/경고를 해결하고 다시 시도하세요.",
-+	"errorConfigurationFileDirty": "파일이 변경되어 설정에 쓸 수 없습니다. **사용자 설정** 파일을 저장하고 다시 시도하세요.",
-+	"errorConfigurationFileDirtyWorkspace": "파일이 변경되어 설정에 쓸 수 없습니다. **작업 영역 설정** 파일을 저장하고 다시 시도하세요.",
-+>>>>>>> .their
- 	"userTarget": "사용자 설정",
- 	"workspaceTarget": "작업 영역 설정",
- 	"folderTarget": "폴더 설정"
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/kor/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-  our    100644 58f3403ef49b8254c1c26be159dc56a98ee11db1 i18n/kor/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-  their  100644 72bc3a9126b24a8c7aeceef0fd6541f7604a65d0 i18n/kor/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"errorInvalidFile": "파일에 쓸 수 없습니다. 파일을 열어 오류/경고를 수정한 후 다시 시도하세요.",
- 	"errorFileDirty": "파일이 오염되어 파일에 쓸 수 없습니다. 파일을 저장하고 다시 시도하세요."
- }
-\ No newline at end of file
-changed in both
-  base   100644 a617486e76e99ecf97ccaaf3b946728ccfda5a46 i18n/kor/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 d97177c41e4a5031dad60cb0cfff30a1e2f28fd5 i18n/kor/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 22287eb2a6df047e1bc7b9a4f076d6b8d2165563 i18n/kor/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-@@ -13,6 +13,7 @@
- 	"noIconThemeDesc": "No file icons",
- 	"iconThemeError": "File icon theme is unknown or not installed.",
- 	"workbenchColors": "현재 선택한 색 테마에서 색을 재정의합니다.",
-+<<<<<<< .our
- 	"editorColors.comments": "주석의 색 및 스타일을 설정합니다.",
- 	"editorColors.strings": "문자열 리터럴의 색 및 스타일을 설정합니다.",
- 	"editorColors.keywords": "키워드의 색과 스타일을 설정합니다.",
-@@ -21,5 +22,9 @@
- 	"editorColors.functions": "함수 선언 및 참조의 색 및 스타일을 설정합니다.",
- 	"editorColors.variables": "변수 선언 및 참조의 색 및 스타일을 설정합니다.",
- 	"editorColors.textMateRules": "textmate 테마 설정 규칙을 사용하여 색 및 스타일을 설정합니다(고급).",
-+=======
-+	"workbenchColors.deprecated": "이 설정은 더 이상 실험적 설정이 아니며 이름이\n 'workbench.colorCustomizations'로 변경되었습니다.",
-+	"workbenchColors.deprecatedDescription": "대신 'workbench.colorCustomizations'를 사용합니다.",
-+>>>>>>> .their
- 	"editorColors": "현재 선택된 색 테마에서 편집기 색상과 글꼴 스타일을 재정의합니다."
- }
-\ No newline at end of file
-changed in both
-  base   100644 d1d286c6e2efd6e81cd2355940b882450a8f9005 i18n/ptb/extensions/emmet/package.i18n.json
-  our    100644 bd44dd5d5523e2a5800a445af385bb5a762f2233 i18n/ptb/extensions/emmet/package.i18n.json
-  their  100644 c2b4e23150909c43c73ba8dbfd97721c1bc76fe0 i18n/ptb/extensions/emmet/package.i18n.json
-@@ -31,6 +31,7 @@
- 	"command.incrementNumberByTen": "Incremento de 10",
- 	"command.decrementNumberByTen": "Decrementar por 10",
- 	"emmetSyntaxProfiles": "Definir o perfil para a sintaxe especificada ou usar seu próprio perfil com regras específicas.",
-+<<<<<<< .our
- 	"emmetExclude": "Uma matriz de línguas onde abreviaturas Emmet não devem ser expandidas.",
- 	"emmetExtensionsPath": "Caminho para uma pasta que contém os perfis Emmet e trechos de códigos.'",
- 	"emmetShowExpandedAbbreviation": "Mostrar abreviaturas Emmet expandidas como sugestões.\nA opção \"inMarkupAndStylesheetFilesOnly\" aplica-se a html, haml, jade, slim, xml, xsl, css, scss, sass, less e stylus.\nA opção \"always\" se aplica a todas as partes do arquivo independentemente de marcação/css.",
-@@ -62,4 +63,12 @@
- 	"emmetPreferencesCssMsProperties": "Propriedades CSS separadas por vírgula que recebem o prefixo vendor 'ms' quando utilizado em abreviações do Emmet que iniciam com `-`. Defina como string vazia para sempre evitar o prefixo 'ms'.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "A pontuação mínima (de 0 a 1) que a abreviação difusa deve alcançar. Os valores mais baixos podem produzir muitas correspondências falso-positivas, valores mais elevados podem reduzir possíveis correspondências.\n",
- 	"emmetOptimizeStylesheetParsing": "Quando definido como false, o arquivo inteiro é analisado para determinar se a posição atual é válida para expandir as abreviações Emmet. Quando definido como true, somente o conteúdo em torno da posição atual em arquivos css / scss / less é analisado."
-+=======
-+	"emmetExclude": "Uma matriz de línguagens onde abreviaturas emmet não devem ser expandidas.",
-+	"emmetExtensionsPath": "Caminho para uma pasta que contém perfis de emmet, trechos de código e preferências. Somente perfis são honrados do caminho de extensões quando emmet.useNewEmmet estiver definida como true.'",
-+	"emmetShowExpandedAbbreviation": "Mostra abreviaturas emmet expandidas como sugestões.\nA opção \"inMarkupAndStylesheetFilesOnly\" aplica-se a html, haml, jade, slim, xml, xsl, css, scss, sass, less e stylus.\nA opção \"always\" se aplica a todas as partes do arquivo independentemente de marcação/css.",
-+	"emmetShowAbbreviationSuggestions": "Mostra possíveis abreviaturas emmet como sugestões. Não aplicável em folhas de estilo ou quando emmet.showExpandedAbbreviation é definido como \"nunca\".",
-+	"emmetIncludeLanguages": "Habilita as abreviaturas do emmet em idiomas que não são suportados por padrão. Adicione um mapeamento aqui entre a linguagem e a linguagem emmet suportada.\n Por exemplo: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
-+	"emmetVariables": "Variáveis a serem usadas em trechos de código emmet"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 0fee06973c8b08e341e6dba8f3cc4dd139762867 i18n/ptb/extensions/extension-editing/out/extensionLinter.i18n.json
-  our    100644 514199b2eb4c7a7235895cc4faec19c4b4eaf681 i18n/ptb/extensions/extension-editing/out/extensionLinter.i18n.json
-  their  100644 4a35721116819d493772e604e862f37ce0f23432 i18n/ptb/extensions/extension-editing/out/extensionLinter.i18n.json
-changed in both
-  base   100644 d6108586df8b1ff6fab7bb0bd9ee68e2c4d537ac i18n/ptb/src/vs/base/common/jsonErrorMessages.i18n.json
-  our    100644 c0df2b99ce98bcdadd04ed9815b0b3354d2593a0 i18n/ptb/src/vs/base/common/jsonErrorMessages.i18n.json
-  their  100644 97f0770c0dc0bf45300d512dde96b3c4542b9313 i18n/ptb/src/vs/base/common/jsonErrorMessages.i18n.json
-changed in both
-  base   100644 bf2baf839060849cf84c714ebc9b91e51da423d5 i18n/ptb/src/vs/base/common/keybindingLabels.i18n.json
-  our    100644 88f9db8bef58f10b607d709254accc21c89d65f4 i18n/ptb/src/vs/base/common/keybindingLabels.i18n.json
-  their  100644 5977a200f222330634394fc1a23c8c900a9f02a5 i18n/ptb/src/vs/base/common/keybindingLabels.i18n.json
-changed in both
-  base   100644 40b318ab1590a72883d114b8fbf4ce164a3732b7 i18n/ptb/src/vs/editor/browser/widget/diffReview.i18n.json
-  our    100644 073825f3f56385bac2c761870572d0a8ac4ead8a i18n/ptb/src/vs/editor/browser/widget/diffReview.i18n.json
-  their  100644 d7c36424974ded8bf7df532b5fff62b52494f4d8 i18n/ptb/src/vs/editor/browser/widget/diffReview.i18n.json
-@@ -7,7 +7,11 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"label.close": "Fechar",
-+<<<<<<< .our
- 	"more_lines": "{0} linhas",
-+=======
-+	"header": "Diferença {0} de {1}: original {2}, {3} linhas, modificado {4}, {5} linhas",
-+>>>>>>> .their
- 	"blankLine": "branco",
- 	"equalLine": "original {0}, modificados {1}: {2}",
- 	"insertLine": "+ modificado {0}: {1}",
-merged
-  result 100644 ddbbf126107e57f761e09aaf2d8f86d0b4b5ec08 i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-  our    100644 5188de485d31a72dc0c31c63995e7efed14f0e1c i18n/ptb/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-@@ -7,8 +7,5 @@
- 	"emmetConfigurationTitle": "Emmet",
- 	"triggerExpansionOnTab": "Quando habilitado, abreviações emmet são expandidas ao pressionar TAB. Não aplicável quando emmet.useNewemmet é definido como true.",
- 	"emmetPreferences": "Preferências usadas para modificar o comportamento de algumas ações e resolvedores do Emmet. Não aplicável quando emmet.useNewemmet é definido como true.",
--	"emmetSyntaxProfiles": "Definir o perfil para a sintaxe especificada ou usar seu próprio perfil com regras específicas.",
--	"emmetExclude": "Uma matriz de línguagens onde abreviaturas emmet não devem ser expandidas.",
--	"emmetExtensionsPath": "Caminho para uma pasta que contém perfis emmet, trechos e preferências. Somente perfis são honrados do caminho das extensões quando emmet.useNewEmmet estiver definida como true.",
- 	"useNewEmmet": "Experimente os novos módulos emmet (que irão substituir a antiga biblioteca unica emmet) para todos os recursos emmet."
- }
-\ No newline at end of file
-changed in both
-  base   100644 ccc14607143248b7d8b729eb6cc57076a87003b1 i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 d9d0d18805d748d7acf0de5557a30b4d38564784 i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 1b5d84180e9fcd1f62cac06acc0bed3c07410ca8 i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -13,5 +13,12 @@
- 	"newExtensionLabel": "Mostrar Extensão \"{0}\"",
- 	"editTtile": "Editar",
- 	"replaceDefaultValue": "Substituir nas Configurações",
-+<<<<<<< .our
- 	"copyDefaultValue": "Copiar para Configurações"
-+=======
-+	"copyDefaultValue": "Copiar para Configurações",
-+	"unsupportedPHPExecutablePathSetting": "Essa configuração deve ser uma Configuração de Usuário. Para configurar o PHP para o espaço de trabalho, abra um arquivo PHP e clique em 'Caminho do PHP' na barra de status.",
-+	"unsupportedWorkspaceSetting": "Essa configuração deve ser uma Configuração de Usuário.",
-+	"unsupportedWorkbenchSetting": "Essa configuração não pode ser aplicada agora. Será aplicada quando você abrir esta pasta diretamente."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 1d50c0f64642a61065bdca90b0fe65d05149a534 i18n/ptb/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  our    100644 b3ae68185057b9a794fe9aa335e3a999986822bc i18n/ptb/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  their  100644 104a0a6044a868d25cafefd1b2a63b8b00c2c952 i18n/ptb/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-changed in both
-  base   100644 f46966dd22540bf3c8ae911a39bab3e7afceee0e i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 a7fcbfe8b12598411b8516f57bb30b642834b0bc i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 e247ed12a3dfcb681cd73cf9e672caccbf3c2536 i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-changed in both
-  base   100644 26e13bbf486aaaf40fef4db6513dd7f5bdbb0e2d i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 5844af8cc38149dcfa5ec9e4de0ec76188e00645 i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 8639fd536408851bb9643216d553868d5a975c90 i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -49,7 +49,11 @@
- 	"workbench.action.terminal.rename.prompt": "Digite o nome do terminal",
- 	"workbench.action.terminal.focusFindWidget": "Focalizar Ferramenta de Pesquisa",
- 	"workbench.action.terminal.hideFindWidget": "Ocultar Ferramenta de Pesquisa",
-+<<<<<<< .our
- 	"nextTerminalFindTerm": "Mostrar Próximo Termo de Busca",
- 	"previousTerminalFindTerm": "Mostrar Termo de Busca Anterior",
- 	"quickOpenTerm": "Alternar o Terminal Ativo"
-+=======
-+	"quickOpenTerm": "Trocar o terminal ativo"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7655014ffc05ddbcbcd88effd5fd3f271d1d36ed i18n/ptb/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  our    100644 2cd5ff9947ee5fd942a87c7aaf5c1c28e906b412 i18n/ptb/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  their  100644 532ff1837b5eb51b90e4e0035d202b46103b77df i18n/ptb/src/vs/workbench/services/configuration/node/configuration.i18n.json
-@@ -9,7 +9,11 @@
- 	"scope.window.description": "Janela de configuração específica que pode ser configurada nas configurações do usuário ou área de trabalho.",
- 	"scope.resource.description": "Configuração específica do recurso que pode ser configurada nas configurações do usuário, espaço de trabalho ou pasta.",
- 	"scope.description": "Escopo em que a configuração é aplicável. Escopos disponíveis são 'janela' e 'recurso'.",
-+<<<<<<< .our
- 	"vscode.extension.contributes.configuration": "Contribui às definições de configuração.",
-+=======
-+	"invalid.type": "Se definido, 'configuration.type' deve ser do tipo 'object'",
-+>>>>>>> .their
- 	"invalid.title": "'configuration.title' deve ser um string",
- 	"vscode.extension.contributes.defaultConfiguration": "Contribui às definições de configuração padrão do editor por linguagem.",
- 	"invalid.properties": "'configuration.properties' deve ser um objeto",
-changed in both
-  base   100644 21d2a812bb910811a7286d88c2b4dd0e7f27be2b i18n/ptb/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 68215b632ce90bcb7b46b0cefec04b9e2085133e i18n/ptb/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 22f5d117a1ad95ffde93d1a9b6688c08010f8ae8 i18n/ptb/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -9,6 +9,7 @@
- 	"openTasksConfiguration": "Abrir Configuração de Tarefas",
- 	"openLaunchConfiguration": "Abrir Configuração de Execução",
- 	"open": "Abrir configurações",
-+<<<<<<< .our
- 	"saveAndRetry": "Salvar e tentar novamente",
- 	"errorUnknownKey": "Não é possível gravar {0} porque {1} não é uma configuração registrada.",
- 	"errorInvalidFolderConfiguration": "Não é possível gravar as configurações da pasta porque {0} não suporta o escopo de recurso de pasta.",
-@@ -21,6 +22,19 @@
- 	"errorInvalidConfiguration": "Não é possível escrever nas configurações do usuário. Por favor, abra as configurações do usuário para corrigir erros/avisos e tente novamente.",
- 	"errorInvalidConfigurationWorkspace": "Não é possível escrever nas configurações do espaço de trabalho. Por favor, abra as configurações do espaço de trabalho para corrigir erros/avisos no arquivo e tente novamente.",
- 	"errorInvalidConfigurationFolder": "Não é possível escrever nas configurações de pasta. Por favor, abra as configurações da pasta '{0}' para corrigir erros/avisos e tente novamente.",
-+=======
-+	"close": "Fechar",
-+	"saveAndRetry": "Salvar as configurações e tentar novamente",
-+	"errorUnknownKey": "Não é possível gravar {0} porque {1} não é uma configuração registrada.",
-+	"errorInvalidFolderConfiguration": "Não é possível gravar as configurações da pasta porque {0} não suporta o escopo de recurso de pasta.",
-+	"errorInvalidUserTarget": "Não é possível gravar as configurações do usuário porque {0} não oferece suporte para o escopo global.",
-+	"errorInvalidFolderTarget": "Não é possível gravar as configurações da pasta porque nenhum recurso é fornecido.",
-+	"errorNoWorkspaceOpened": "Não é possível gravar {0} porque nenhum espaço de trabalho está aberto. Por favor, abra um espaço de trabalho primeiro e tente novamente.",
-+	"errorInvalidConfiguration": "Não é possível gravar em configurações. Por favor abra **User Settings** para corrigir erros/avisos no arquivo e tente novamente.",
-+	"errorInvalidConfigurationWorkspace": "Não é possível gravar em configurações. Por favor abra **Workspace Settings** para corrigir erros/avisos no arquivo e tente novamente.",
-+	"errorConfigurationFileDirty": "Não é possível gravar em configurações, porque o arquivo foi alterado. Por favor, salve o arquivo **User Settings** e tente novamente.",
-+	"errorConfigurationFileDirtyWorkspace": "Não é possível gravar em configurações, porque o arquivo foi alterado. Por favor, salve o arquivo **Workspace Settings** e tente novamente.",
-+>>>>>>> .their
- 	"userTarget": "Configurações de Usuário",
- 	"workspaceTarget": "Configurações de Espaço de Trabalho",
- 	"folderTarget": "Configurações de pasta"
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/extensions/emmet/package.i18n.json
-  our    100644 e8a08df3b0fb514f0bab0b0d555c900a23a3deca i18n/rus/extensions/emmet/package.i18n.json
-  their  100644 1f986e96f3c7dc10eb4c3bb4db861f73d73f461a i18n/rus/extensions/emmet/package.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,6 +10,14 @@
- 	"description": "Поддержка Emmet для VS Code",
- 	"command.wrapWithAbbreviation": "Перенести с сокращением",
- 	"command.wrapIndividualLinesWithAbbreviation": "Перенести отдельные строки с сокращением",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"command.removeTag": "Удалить тег",
- 	"command.updateTag": "Обновить тег",
- 	"command.matchTag": "Перейти к соответствующей паре",
-@@ -32,6 +41,7 @@
- 	"command.decrementNumberByTen": "Уменьшить значение на 10",
- 	"emmetSyntaxProfiles": "Задайте профиль для указанного синтаксиса или используйте свой собственный профиль с определенными правилами.",
- 	"emmetExclude": "Массив языков, в которых не должны развертываться сокращения Emmet.",
-+<<<<<<< .our
- 	"emmetExtensionsPath": "Путь к папке, содержащей профили Emmet и фрагменты кода.",
- 	"emmetShowExpandedAbbreviation": "Отображает развернутые сокращения Emmet в виде предложений.\nПараметр \"inMarkupAndStylesheetFilesOnly\" применяется к html, haml, jade, slim, xml, xsl, css, scss, sass, less и stylus .\nПараметр \"always\" применяется ко всем частям файла независимо от разметки и стилей.",
- 	"emmetShowAbbreviationSuggestions": "Отображает возможные сокращения Emmet в виде предложений. Не применяется в таблицах стилей или если параметр emmet.showExpandedAbbreviation имеет значение \"never\".",
-@@ -62,4 +72,11 @@
- 	"emmetPreferencesCssMsProperties": "Разделенный запятыми список свойств CSS, которые получают префикс разработчика \"ms\" при использовании в сокращениях Emmet, которые начинаются с \"-\". Чтобы префикс \"ms\" никогда не подставлялся, установите в качестве этого параметра пустое значение. ",
- 	"emmetPreferencesCssFuzzySearchMinScore": "Минимальное количество очков для нечеткого соответствия сокращения (от 0 до 1). При указании более низких значений возможно увеличение числа ложных срабатываний, при указании более высоких значений - уменьшение числа возможных соответствий.",
- 	"emmetOptimizeStylesheetParsing": "Если значение равно false, весь файл анализируется для определения, является ли текущая позиция допустимой для расширения сокращений Emmet. Когда присвоено значение true, только содержимое вокруг текущей позиции в файлах css/scss/less подвергается синтаксическому анализу."
-+=======
-+	"emmetExtensionsPath": "Путь к папке, содержащей профили Emmet, фрагменты кода и настройки. Если параметр emmet.useNewemmet имеет значение 'true', используются только профили для путей расширения.",
-+	"emmetShowExpandedAbbreviation": "Отображает развернутые сокращения Emmet в виде предложений.\nПараметр \"inMarkupAndStylesheetFilesOnly\" применяется к html, haml, jade, slim, xml, xsl, css, scss, sass, less и stylus .\nПараметр \"always\" применяется ко всем частям файла независимо от разметки и стилей.",
-+	"emmetShowAbbreviationSuggestions": "Отображает возможные сокращения Emmet в виде предложений. Не применяется в таблицах стилей или если параметр emmet.showExpandedAbbreviation имеет значение \"never\".",
-+	"emmetIncludeLanguages": "Включает сокращения Emmet в языках, которые не поддерживаются по умолчанию. Здесь можно указать связь между не поддерживаемым и поддерживаемым языками.\nПример: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
-+	"emmetVariables": "Переменные, которые будут использоваться во фрагментах Emmet"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 cde1c4fa500de7444ac2dc9c80cf9300b2d22797 i18n/rus/extensions/extension-editing/out/extensionLinter.i18n.json
-  our    100644 da9798c314288e14352137e37ea372181d1b3348 i18n/rus/extensions/extension-editing/out/extensionLinter.i18n.json
-  their  100644 44fb90bb411cbf48ac7d42915161328d6533cc5f i18n/rus/extensions/extension-editing/out/extensionLinter.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/extensions/markdown/out/previewContentProvider.i18n.json
-  our    100644 62ff186c85837f620059565d6a81b3be9d408585 i18n/rus/extensions/markdown/out/previewContentProvider.i18n.json
-  their  100644 2b920d1ba956934baf37b83952dd26f593a19595 i18n/rus/extensions/markdown/out/previewContentProvider.i18n.json
-@@ -4,7 +4,11 @@
-  *--------------------------------------------------------------------------------------------*/
- // Do not edit this file. It is machine generated.
- {
-+<<<<<<< .our
- 	"preview.securityMessage.text": "Некоторое содержимое в этом документе было отключено",
-+=======
-+	"preview.securityMessage.text": "Некоторое содержимое этого документа было отключено",
-+>>>>>>> .their
- 	"preview.securityMessage.title": "В предварительном просмотре Markdown было отключено потенциально опасное или ненадежное содержимое. Чтобы разрешить ненадежное содержимое или включить сценарии, измените параметры безопасности предварительного просмотра Markdown.",
- 	"preview.securityMessage.label": "Предупреждение безопасности об отключении содержимого"
- }
-\ No newline at end of file
-changed in both
-  base   100644 9dff589ebb976aaa3b243624b1ecd57c7c4f8860 i18n/rus/extensions/markdown/out/security.i18n.json
-  our    100644 e57fedc24d6225bfff89936b87ebe3ea901f606d i18n/rus/extensions/markdown/out/security.i18n.json
-  their  100644 05e72a6effff012512105afd2b335922725da3a9 i18n/rus/extensions/markdown/out/security.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -16,5 +17,11 @@
- 	"enableSecurityWarning.title": "Включить предварительный просмотр предупреждений системы безопасности в этой рабочей области",
- 	"disableSecurityWarning.title": "Отключить предварительный просмотр предупреждений системы безопасности в этой рабочей области",
- 	"toggleSecurityWarning.description": "Не влияет на уровень безопасности содержимого",
-+=======
-+	"preview.showPreviewSecuritySelector.strictTitle": "Строгий режим. Загружается только безопасное содержимое.",
-+	"preview.showPreviewSecuritySelector.currentSelection": "Текущий параметр",
-+	"preview.showPreviewSecuritySelector.insecureContentTitle": "Разрешить загрузку содержимого по протоколу http.",
-+	"preview.showPreviewSecuritySelector.scriptsAndAllContent": "Разрешить все содержимое и выполнение скриптов. Не рекомендуется.",
-+>>>>>>> .their
- 	"preview.showPreviewSecuritySelector.title": "Установите параметры безопасности для предварительного просмотра Markdown в этой рабочей области"
- }
-\ No newline at end of file
-changed in both
-  base   100644 48afb646815e1ccf0052b9e63568107aef4dd3b9 i18n/rus/extensions/npm/package.i18n.json
-  our    100644 8d7baa6e0dc033bbe07eab95362f11ea8ace26f2 i18n/rus/extensions/npm/package.i18n.json
-  their  100644 f10d56b2585874f5dacc2666bc98465a6405aff1 i18n/rus/extensions/npm/package.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -23,4 +24,8 @@
- 	"command.debug": "Отладка",
- 	"command.openScript": "Открыть",
- 	"command.runInstall": "Запустить установку"
-+=======
-+	"config.npm.autoDetect": "Включает или отключает автоматическое определение сценариев npm. Значение по умолчанию — \"включено\".",
-+	"config.npm.runSilent": "Запускать команды npm с параметром `--silent`"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/extensions/typescript/out/features/taskProvider.i18n.json
-  our    100644 a641634e0773b483755ba4ae179e64a5b993d228 i18n/rus/extensions/typescript/out/features/taskProvider.i18n.json
-  their  100644 0bc8e72f9ce11014857cd5fce2bcecb8d48528de i18n/rus/extensions/typescript/out/features/taskProvider.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -8,4 +9,14 @@
- 	],
- 	"buildTscLabel": "сборка – {0}",
- 	"buildAndWatchTscLabel": "отслеживание – {0}"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"buildAndWatchTscLabel": "отслеживание – {0}",
-+	"buildTscLabel": "сборка – {0}"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/src/vs/code/electron-main/auth.i18n.json
-  our    100644 ba63a0fa3197bd99d8b447ee3e1c9f01d486efe3 i18n/rus/src/vs/code/electron-main/auth.i18n.json
-  their  100644 a419dfadc51880e12e441e87eedcd2b34636913a i18n/rus/src/vs/code/electron-main/auth.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"authRequire": "Требуется проверка подлинности прокси-сервера",
- 	"proxyauth": "Прокси-сервер {0} требует проверки подлинности."
- }
-\ No newline at end of file
-changed in both
-  base   100644 82539b857e7062cd899366b02610d2fcfdbad862 i18n/rus/src/vs/code/electron-main/menus.i18n.json
-  our    100644 6c6420ff3fff2721736f81d703d8eb2e0907f38c i18n/rus/src/vs/code/electron-main/menus.i18n.json
-  their  100644 0893851333b47ccc649331a5106734a4036ba474 i18n/rus/src/vs/code/electron-main/menus.i18n.json
-@@ -24,12 +24,21 @@
- 	"miQuit": "Выйти из {0}",
- 	"miNewFile": "&&Новый файл",
- 	"miOpen": "Открыть...",
-+<<<<<<< .our
- 	"miOpenWorkspace": "Открыть рабочую &&область...",
- 	"miOpenFolder": "Открыть &&папку...",
- 	"miOpenFile": "&&Открыть файл...",
- 	"miOpenRecent": "Открыть &&последние",
- 	"miSaveWorkspaceAs": "Сохранить рабочую область как...",
- 	"miAddFolderToWorkspace": "Доб&&авить папку в рабочую область...",
-+=======
-+	"miOpenWorkspace": "&&Открыть рабочую область...",
-+	"miOpenFolder": "Открыть &&папку...",
-+	"miOpenFile": "&&Открыть файл...",
-+	"miOpenRecent": "Открыть &&последние",
-+	"miSaveWorkspaceAs": "&&Сохранить рабочую область как...",
-+	"miAddFolderToWorkspace": "&& Добавить папку в рабочую область...",
-+>>>>>>> .their
- 	"miSave": "Сохранить",
- 	"miSaveAs": "Сохранить &&как...",
- 	"miSaveAll": "Сохранить &&все",
-@@ -189,5 +198,11 @@
- 	"miDownloadingUpdate": "Скачивается обновление...",
- 	"miInstallUpdate": "Установить обновление...",
- 	"miInstallingUpdate": "Идет установка обновления...",
-+<<<<<<< .our
- 	"miRestartToUpdate": "Перезапустить программу для обновления..."
-+=======
-+	"miCheckForUpdates": "Проверить наличие обновлений...",
-+	"aboutDetail": "\nВерсия {0}\nФиксация {1}\nДата {2}\nОблочка {3}\nОтрисовщик {4}\nУзел {5}\nАрхитектура {6}",
-+	"okButton": "ОК"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 56a590f35d91ee319c1d44673a7f103e2117f039 i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  our    100644 66cf48db0f575d6b4f93e4e908a24029fed35a72 i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json
-  their  100644 898de20dd06175ce0b572b0920c73706736fd9d0 i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json
-changed in both
-  base   100644 fbe127a6eb426f71c59661ec15b8664928a5673b i18n/rus/src/vs/editor/contrib/find/common/findController.i18n.json
-  our    100644 5c6f87afd29e3d4a26efcc3d50060548fd13d051 i18n/rus/src/vs/editor/contrib/find/common/findController.i18n.json
-  their  100644 5cbc15bce8a5b49ebd16d0dcc2664925a6a7e1ed i18n/rus/src/vs/editor/contrib/find/common/findController.i18n.json
-@@ -10,6 +10,15 @@
- 	"nextSelectionMatchFindAction": "Найти следующее выделение",
- 	"previousSelectionMatchFindAction": "Найти предыдущее выделение",
- 	"startReplace": "Заменить",
-+<<<<<<< .our
-+=======
-+	"addSelectionToNextFindMatch": "Добавить выделение в следующее найденное совпадение",
-+	"addSelectionToPreviousFindMatch": "Добавить выделенный фрагмент в предыдущее найденное совпадение",
-+	"moveSelectionToNextFindMatch": "Переместить последнее выделение в следующее найденное совпадение",
-+	"moveSelectionToPreviousFindMatch": "Переместить последний выделенный фрагмент в предыдущее найденное совпадение",
-+	"selectAllOccurrencesOfFindMatch": "Выбрать все вхождения найденных совпадений",
-+	"changeAll.label": "Изменить все вхождения",
-+>>>>>>> .their
- 	"showNextFindTermAction": "Показать следующий найденный термин",
- 	"showPreviousFindTermAction": "Показать предыдущий найденный термин"
- }
-\ No newline at end of file
-changed in both
-  base   100644 1281d5e53dc338f3eb64c0e6846ec51026e8873e i18n/rus/src/vs/platform/history/electron-main/historyMainService.i18n.json
-  our    100644 4930aa8449c8b9acfaa97602ebba3b187b1531b6 i18n/rus/src/vs/platform/history/electron-main/historyMainService.i18n.json
-  their  100644 891764b5aeeaed458c29eae9e33ce67394537f05 i18n/rus/src/vs/platform/history/electron-main/historyMainService.i18n.json
-changed in both
-  base   100644 bf1ce6c7711be9d5f247d285debcab01f8d5500a i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 a203da5726ce360e6e4c7bd4be5cee05446e8ca5 i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 5793df0ed50928aa1251844347a2d65d57a782fb i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json
-@@ -60,7 +60,11 @@
- 	"scrollbarShadow": "Цвет тени полосы прокрутки, которая свидетельствует о том, что содержимое прокручивается.",
- 	"scrollbarSliderBackground": "Цвет фона ползунка полосы прокрутки.",
- 	"scrollbarSliderHoverBackground": "Цвет фона ползунка полосы прокрутки при наведении курсора.",
-+<<<<<<< .our
- 	"scrollbarSliderActiveBackground": "Цвет фона ползунка полосы прокрутки при щелчке по нему.",
-+=======
-+	"scrollbarSliderActiveBackground": "Цвет фона активного ползунка полосы прокрутки.",
-+>>>>>>> .their
- 	"progressBarBackground": "Цвет фона индикатора выполнения, который может отображаться для длительных операций.",
- 	"editorBackground": "Цвет фона редактора.",
- 	"editorForeground": "Цвет переднего плана редактора по умолчанию.",
-changed in both
-  base   100644 77f0bdb5c2bde44276ea9217bd35729ef66c5a5a i18n/rus/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  our    100644 c446918f7398d91df096414504ebb365f7b433fb i18n/rus/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-  their  100644 04cf9479a3b68b7389b03a8e6f536a4d87c13cc6 i18n/rus/src/vs/workbench/browser/actions/workspaceActions.i18n.json
-@@ -9,6 +9,7 @@
- 	"openFile": "Открыть файл...",
- 	"openFolder": "Открыть папку...",
- 	"openFileFolder": "Открыть...",
-+<<<<<<< .our
- 	"globalRemoveFolderFromWorkspace": "Удалить папку из рабочей области...",
- 	"saveWorkspaceAsAction": "Сохранить рабочую область как...",
- 	"save": "Сохранить",
-@@ -16,4 +17,24 @@
- 	"openWorkspaceAction": "Открыть рабочую область...",
- 	"openWorkspaceConfigFile": "Открыть файл конфигурации рабочей области",
- 	"duplicateWorkspaceInNewWindow": "Создать копию рабочей области в новом окне"
-+=======
-+	"reload": "&&Перезагрузить",
-+	"cancel": "Отмена",
-+	"newWorkspaceFormExisting": "Новая рабочая область из существующей...",
-+	"select": "&&Выбрать",
-+	"selectWorkspace": "Выбрать папки для рабочей области",
-+	"addSupported": "Чтобы открыть несколько папок, необходимо перезагрузить окно.",
-+	"addFolderToWorkspace": "Добавить папку в рабочую область...",
-+	"add": "&&Добавить",
-+	"addFolderToWorkspaceTitle": "Добавить папку в рабочую область",
-+	"removeFolderFromWorkspace": "Удалить папку из рабочей области",
-+	"saveWorkspaceAsAction": "Сохранить рабочую область как...",
-+	"saveEmptyWorkspaceNotSupported": "Перед сохранением рабочей области откройте ее. ",
-+	"saveNotSupported": "Чтобы сохранить рабочую область, необходимо перезагрузить окно.",
-+	"save": "Сохранить",
-+	"saveWorkspace": "Сохранить рабочую область",
-+	"openWorkspaceAction": "Открыть рабочую область...",
-+	"newWorkspace": "Создать рабочую область...",
-+	"openWorkspaceConfigFile": "Открыть файл конфигурации рабочей области"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 38dfb4e1703c002ce8fb88bb74d065a5fa28b7cb i18n/rus/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  our    100644 99aca234c7b93506a14c237c3960c0558fba20a4 i18n/rus/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-  their  100644 393b1e55fe555b5c3bccece2611e702147267e1a i18n/rus/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
-changed in both
-  base   100644 1db923803c4019b36091d3b30508c7e3e28d1b49 i18n/rus/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-  our    100644 1ef0f05df26e85532ec4820bdf2161b011019703 i18n/rus/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-  their  100644 3a5b37bf67a56e9cc81dd211415ef10779a43773 i18n/rus/src/vs/workbench/browser/parts/sidebar/sidebarPart.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,9 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+	"compositePart.hideSideBarLabel": "Скрыть боковую панель",
-+>>>>>>> .their
- 	"focusSideBar": "Перевести фокус на боковую панель",
- 	"viewCategory": "Просмотреть"
- }
-\ No newline at end of file
-changed in both
-  base   100644 190db792a178b273e0982f348c9903874ff3ee15 i18n/rus/src/vs/workbench/common/theme.i18n.json
-  our    100644 1ea38452a6e8832b511f19d37e5007a3b201c44b i18n/rus/src/vs/workbench/common/theme.i18n.json
-  their  100644 1e1638c8206cd0b1710579a6673f51666c809159 i18n/rus/src/vs/workbench/common/theme.i18n.json
-@@ -61,6 +61,7 @@
- 	"titleBarActiveBackground": "Фон панели заголовка, если окно активно. Обратите внимание, что этот цвет сейчас поддерживается только в macOS.",
- 	"titleBarInactiveBackground": "Фон панели заголовка, если окно неактивно. Обратите внимание, что этот цвет сейчас поддерживается только в macOS.",
- 	"titleBarBorder": "Цвет границы панели заголовка. Обратите внимание, что этот цвет сейчас поддерживается только в macOS.",
-+<<<<<<< .our
- 	"notificationCenterBorder": "Цвет границы центра уведомлений. Уведомления появляются в нижней правой части окна. ",
- 	"notificationToastBorder": "Цвет границы всплывающего уведомления. Уведомления появляются в нижней правой части окна.",
- 	"notificationsForeground": "Цвет переднего плана уведомления. Уведомления появляются в нижней правой части окна.",
-@@ -69,4 +70,17 @@
- 	"notificationCenterHeaderForeground": "Цвет переднего плана заголовка в центре уведомлений. Уведомления появляются в нижней правой части окна. ",
- 	"notificationCenterHeaderBackground": "Цвет фона заголовка в центре уведомлений. Уведомления появляются в нижней правой части окна. ",
- 	"notificationsBorder": "Цвет границы уведомления, которая отделяет это уведомление от других в центре уведомлений. Уведомления появляются в нижней правой части окна. "
-+=======
-+	"notificationsForeground": "Цвет переднего плана для уведомлений. Уведомления отображаются в верхней части окна.",
-+	"notificationsBackground": "Цвет фона для уведомлений. Уведомления отображаются в верхней части окна.",
-+	"notificationsButtonBackground": "Цвет фона кнопки для уведомлений. Уведомления отображаются в верхней части окна.",
-+	"notificationsButtonHoverBackground": "Цвет фона кнопки для уведомлений при наведении курсора мыши. Уведомления отображаются в верхней части окна.",
-+	"notificationsButtonForeground": "Цвет переднего плана кнопки для уведомлений. Уведомления отображаются в верхней части окна.",
-+	"notificationsInfoBackground": "Цвет фона для информационных сообщений. Уведомления отображаются в верхней части окна. ",
-+	"notificationsInfoForeground": "Цвет переднего плана для информационных сообщений. Уведомления отображаются в верхней части окна. ",
-+	"notificationsWarningBackground": "Цвет фона для предупреждений. Уведомления отображаются в верхней части окна. ",
-+	"notificationsWarningForeground": "Цвет переднего плана для предупреждений. Уведомления отображаются в верхней части окна. ",
-+	"notificationsErrorBackground": "Цвет фона для ошибок. Уведомления отображаются в верхней части окна. ",
-+	"notificationsErrorForeground": "Цвет переднего плана для ошибок. Уведомления отображаются в верхней части окна. "
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 5140913c988c3e3d06041c5911ce99f91633104d i18n/rus/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 266dadc0ddcb2cfb8391eafba4890dbacea4172b i18n/rus/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 cb0068c301afb51cc6e4e61f00631f826a357508 i18n/rus/src/vs/workbench/electron-browser/actions.i18n.json
-changed in both
-  base   100644 73686d728483239ab4a6e5b0b5e4d3456d4319f0 i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 bdb5e10a72aa6a97a13c01acd6d5626456147e68 i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 130cb3a7c8f96cabb6494d8fbdb2767a6014e38f i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -35,6 +35,7 @@
- 	"panelDefaultLocation": "Определяет расположение панели по умолчанию. Она может находиться снизу или справа от рабочего места.",
- 	"statusBarVisibility": "Управляет видимостью строки состояния в нижней части рабочего места.",
- 	"activityBarVisibility": "Управляет видимостью панели действий на рабочем месте.",
-+<<<<<<< .our
- 	"viewVisibility": "Управляет видимостью действий в заголовке представления. Действия в заголовке представления могут быть видимы всегда или видимы только тогда, когда представление получает фокус или на него наводится курсор мыши.",
- 	"fontAliasing": "Управляет методом сглаживания шрифтов в рабочей области.\n- default: субпиксельное сглаживание шрифтов; позволит добиться максимальной четкости текста на большинстве дисплеев за исключением Retina\n- antialiased: сглаживание шрифтов на уровне пикселей, в отличие от субпиксельного сглаживания; позволит сделать шрифт более светлым в целом\n- none: сглаживание шрифтов отключено; текст будет отображаться с неровными острыми краями\n- auto: автоматически применяется режим \"default\" или \"antialiased\" в зависимости от разрешения дисплея (количество точек на дюйм).",
- 	"workbench.fontAliasing.default": "Субпиксельное сглаживание шрифтов; позволит добиться максимальной четкости текста на большинстве дисплеев за исключением Retina.",
-@@ -43,6 +44,15 @@
- 	"workbench.fontAliasing.auto": "Автоматически применяется режим \"default\" или \"antialiased\" в зависимости от разрешения дисплея (количество точек на дюйм).",
- 	"enableNaturalLanguageSettingsSearch": "Определяет, следует ли включить режим поиска естественного языка для параметров.",
- 	"windowConfigurationTitle": "Окно",
-+=======
-+	"closeOnFileDelete": "Определяет, следует ли автоматически закрывать редакторы, когда отображаемый в них файл удален или переименован другим процессом. При отключении этой функции редактор остается открытым в качестве черновика. Обратите внимание, что при удалении из приложения редактор закрывается всегда и что файлы черновиков никогда не закрываются для сохранения данных.",
-+	"fontAliasing": "Управляет методом сглаживания шрифтов в рабочей области.-по умолчанию: субпиксельное сглаживание шрифтов; позволит добиться максимальной четкости текста на большинстве дисплеев за исключением Retina - сглаживание: сглаживание шрифтов на уровне пикселей, в отличие от субпиксельного сглаживания; позволит сделать шрифт более светлым в целом - нет: сглаживание шрифтов отключено; текст будет отображаться с неровными острыми краями ",
-+	"workbench.fontAliasing.default": "Субпиксельное сглаживание шрифтов; позволит добиться максимальной четкости текста на большинстве дисплеев за исключением Retina.",
-+	"workbench.fontAliasing.antialiased": "Сглаживание шрифтов на уровне пикселей, в отличие от субпиксельного сглаживания. Может сделать шрифт светлее в целом.",
-+	"workbench.fontAliasing.none": "Отключает сглаживание шрифтов; текст будет отображаться с неровными острыми краями.",
-+	"swipeToNavigate": "Переключайтесь между открытыми файлами, проводя по экрану по горизонтали тремя пальцами.",
-+	"workbenchConfigurationTitle": "Workbench",
-+>>>>>>> .their
- 	"window.openFilesInNewWindow.on": "Файлы будут открываться в новом окне.",
- 	"window.openFilesInNewWindow.off": "Файлы будут открываться в окне с открытой папкой файлов или последнем активном окне.",
- 	"window.openFilesInNewWindow.defaultMac": "Файлы будут открыты в новом окне с открытой папкой файлов или в последнем активном окне, если они не были открыты с помощью панели Dock или поиска",
-changed in both
-  base   100644 8b4be6fe00b637b36f63436ed5fc49c4885af9ca i18n/rus/src/vs/workbench/electron-browser/window.i18n.json
-  our    100644 1b50f4f1a795fd43ccff439303c3058ab0677b98 i18n/rus/src/vs/workbench/electron-browser/window.i18n.json
-  their  100644 becf8c9a3ade3f5f6076386279e035e9bfef1535 i18n/rus/src/vs/workbench/electron-browser/window.i18n.json
-@@ -12,5 +12,10 @@
- 	"copy": "Копировать",
- 	"paste": "Вставить",
- 	"selectAll": "Выбрать все",
-+<<<<<<< .our
- 	"runningAsRoot": "Не рекомендуется запускать {0} в качестве корневого пользователя."
-+=======
-+	"confirmOpen": "Вы действительно хотите открыть рабочие области {0}?",
-+	"confirmOpenButton": "&&Открыть..."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 575548ac1c853eabb16aa0b05089b18cc1edfbc7 i18n/rus/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  our    100644 4f96620576f3a410b1ea446182daa43ce07b0b3e i18n/rus/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-  their  100644 e0979b269531b647d6b48800a73958aaa8fd43a2 i18n/rus/src/vs/workbench/parts/debug/browser/debugActionItems.i18n.json
-changed in both
-  base   100644 ee52447b162947169085de03f59487ca1a016fee i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 23eb63e486d254cf5d707329f4a13e4ae0e33119 i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 6030f06024ee4fc411f72e2952fb21ee0800d9b4 i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -28,7 +28,13 @@
- 	"preLaunchTaskExitCode": "Выполнение предварительной задачи \"{0}\" завершено с кодом выхода {1}.",
- 	"showErrors": "Показывать ошибки",
- 	"noFolderWorkspaceDebugError": "Нельзя выполнить отладку активного файла. Убедитесь, что файл сохранен на диске и установлено расширение отладки для этого типа файла.",
-+<<<<<<< .our
- 	"cancel": "Отмена",
- 	"DebugTaskNotFound": "Не удалось найти задачу \"{0}\".",
- 	"taskNotTracked": "Не удается отследить задачу \"{0}\"."
-+=======
-+	"NewLaunchConfig": "Настройте файл конфигурации запуска для вашего приложения. {0}",
-+	"DebugTaskNotFound": "Не удалось найти задачу preLaunchTask \"{0}\".",
-+	"differentTaskRunning": "Задача '{0}' уже выполняется. Невозможно запустить предварительную задачу '{1}'."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 bf63a86ed4abb041df809fc50fa111b16d1e62ee i18n/rus/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  our    100644 6c1558c003488082dde47699207223b28eebf91d i18n/rus/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-  their  100644 775b1ec66d27642859880d78b67087a80e045c09 i18n/rus/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.i18n.json
-merged
-  result 100644 f14f85558fea64ee69d49eb862bb08976819a4ed i18n/rus/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-  our    100644 41da05e341f85731c03f542735bf4208bd4a23aa i18n/rus/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-@@ -7,8 +7,5 @@
- 	"emmetConfigurationTitle": "Emmet",
- 	"triggerExpansionOnTab": "Если этот параметр установлен, сокращения Emmet разворачиваются при нажатии клавиши TAB. Не применяется, если параметр emmet.useNewemmet имеет значение 'true'.",
- 	"emmetPreferences": "Настройки, которые используются для изменения поведения некоторых действий и сопоставителей Emmet. Не применяется, если параметр emmet.useNewemmet имеет значение 'true'.",
--	"emmetSyntaxProfiles": "Задайте профиль для указанного синтаксиса или используйте свой собственный профиль с определенными правилами.",
--	"emmetExclude": "Массив языков, в которых не должны развертываться сокращения Emmet.",
--	"emmetExtensionsPath": "Путь к папке, содержащей профили Emmet, фрагменты кода и настройки. Если параметр emmet.useNewemmet имеет значение 'true', используются только профили для пути расширения.",
- 	"useNewEmmet": "Попробуйте новые модули emmet (которые в конечном итоге заменят устаревшую библиотеку emmet), чтобы ознакомиться со всеми функциями emmet."
- }
-\ No newline at end of file
-changed in both
-  base   100644 5d0c8aac61038db995dad0114f7129732b73f64f i18n/rus/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  our    100644 aed4ddc96e0fa43f50c41bf2aa86012d93744f14 i18n/rus/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-  their  100644 4671a2c1d2386d77c57263adca2af6874f936563 i18n/rus/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json
-changed in both
-  base   100644 b01a24938599c2f028d182bf6682c5bd1b46060c i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 bd475832dcfff4640327a5b72df263d4356ba205 i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 ecce4c8d043abae246ac7370b04bf2373d30c75a i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-changed in both
-  base   100644 61dde35c09366008ad91ce2a0622f0c780fff1cc i18n/rus/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
-  our    100644 821930bfc8797aa66e392542a9a207e98e5802c7 i18n/rus/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
-  their  100644 9a2b3bf6390d9a58b7aa2db743c38027ac2c9eba i18n/rus/src/vs/workbench/parts/files/browser/fileActions.contribution.i18n.json
-@@ -4,7 +4,11 @@
-  *--------------------------------------------------------------------------------------------*/
- // Do not edit this file. It is machine generated.
- {
-+<<<<<<< .our
- 	"filesCategory": "Файл",
-+=======
-+	"filesCategory": "Файлы",
-+>>>>>>> .their
- 	"revealInSideBar": "Показать в боковой панели",
- 	"acceptLocalChanges": "Использовать изменения и перезаписать содержимое диска",
- 	"revertLocalChanges": "Отменить изменения и вернуться к содержимому на диске"
-changed in both
-  base   100644 eab30252ca80391e5d68c74f71fab27ffde31bab i18n/rus/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  our    100644 12bee9cd2a35e610f5f68160ed62a575d0331ad1 i18n/rus/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-  their  100644 c78c894bf5227e2d4c8cba3e701e1d80c177dc80 i18n/rus/src/vs/workbench/parts/files/browser/fileActions.i18n.json
-changed in both
-  base   100644 e3d342df049f3895908496eaa86ae4d4a8681a88 i18n/rus/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  our    100644 a4725d2faef4b5a6c23ee7c2ecc46a16530b3341 i18n/rus/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-  their  100644 8332d1fabcf879c7c01606ccee623644190ca2ce i18n/rus/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
-@@ -40,6 +40,7 @@
- 	"dynamicHeight": "Определяет, будет ли высота раздела открытых редакторов динамически адаптироваться к количеству элементов.",
- 	"autoReveal": "Определяет, будет ли проводник автоматически отображать и выбирать файлы при их открытии.",
- 	"enableDragAndDrop": "Определяет, разрешено ли перемещение файлов и папок перетаскиванием в проводнике.",
-+<<<<<<< .our
- 	"confirmDragAndDrop": "Определяет, должно ли запрашиваться подтверждение при перемещении файлов и папок в проводнике.",
- 	"confirmDelete": "Определяет, должно ли запрашиваться подтверждение при удалении файла в корзину.",
- 	"sortOrder.default": "Файлы и папки сортируются по именам в алфавитном порядке. Папки отображаются перед файлами.",
-@@ -50,4 +51,12 @@
- 	"sortOrder": "Управляет порядком сортировки файлов и папок в проводнике. Наряду с сортировкой по умолчанию можно установить следующие варианты сортировки: 'mixed' (файлы и папки сортируются вместе), 'type' (по типу файла), 'modified' (по дате последнего изменения) и 'filesFirst' (сортировать файлы перед папками).",
- 	"explorer.decorations.colors": "Определяет, следует ли использовать цвета в декораторах файла.",
- 	"explorer.decorations.badges": "Определяет, следует ли использовать эмблемы в декораторах файла. "
-+=======
-+	"sortOrder.default": "Файлы и каталоги сортируются по именам в алфавитном порядке. Каталоги отображаются перед файлами.",
-+	"sortOrder.mixed": "Файлы и каталоги сортируются по именам в алфавитном порядке. Файлы чередуются с каталогами.",
-+	"sortOrder.filesFirst": "Файлы и каталоги сортируются по именам в алфавитном порядке. Файлы отображаются перед каталогами. ",
-+	"sortOrder.type": "Файлы и каталоги сортируются по именам в алфавитном порядке. Каталоги отображаются перед файлами. ",
-+	"sortOrder.modified": "Файлы и каталоги сортируются по дате последнего изменения в порядке убывания. Каталоги отображаются перед файлами.",
-+	"sortOrder": "Определяет способ сортировки файлов и каталогов в проводнике."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 990a276ce3588c94b2ee2f182b840bff2b59a7a4 i18n/rus/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-  our    100644 d5622eec39a12463acb3bf3b84df8406aca38203 i18n/rus/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-  their  100644 fa76089bc65010b8fe88410befe2fda5bdf8fe73 i18n/rus/src/vs/workbench/parts/files/browser/saveErrorHandler.i18n.json
-@@ -12,5 +12,6 @@
- 	"genericSaveError": "Не удалось сохранить \"{0}\": {1}",
- 	"staleSaveError": "Не удалось сохранить \"{0}\": содержимое на диске более новое. Чтобы сравнить свою версию с версией на диске, нажмите **Сравнить**.",
- 	"compareChanges": "Сравнить",
--	"saveConflictDiffLabel": "{0} (на диске) ↔ {1} (в {2}) - Разрешить конфликт сохранения"
-+	"saveConflictDiffLabel": "{0} (на диске) ↔ {1} (в {2}) - Разрешить конфликт сохранения",
-+	"userGuide": "Используйте команды на панели инструментов редактора справа для **отмены** изменений или **перезаписи** содержимого на диске с учетом этих изменений"
- }
-\ No newline at end of file
-changed in both
-  base   100644 b82ad2f758e37c0128a69b3cf2c5361e8c02d5d2 i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  our    100644 73f5287abade720146d5385f06b5e028d614a772 i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-  their  100644 e7a2b6b75eca5c1a0cc7a4c77dae281844647694 i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
-@@ -14,6 +14,10 @@
- 	"openGlobalKeybindingsFile": "Открыть файл сочетаний клавиш",
- 	"openWorkspaceSettings": "Открыть параметры рабочей области",
- 	"openFolderSettings": "Открыть параметры папок",
-+<<<<<<< .our
-+=======
-+	"pickFolder": "Выбрать папку",
-+>>>>>>> .their
- 	"configureLanguageBasedSettings": "Настроить параметры языка...",
- 	"languageDescriptionConfigured": "({0})",
- 	"pickLanguage": "Выбрать язык"
-changed in both
-  base   100644 dd141cde1c50dc2e173ef8968196f6047f99926b i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  our    100644 b457921fc6fc12c765888c49560d62815333e020 i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-  their  100644 71bf804e80088112b8ebf6e5159414eafb073b11 i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -14,4 +15,19 @@
- 	"editTtile": "Изменить",
- 	"replaceDefaultValue": "Заменить в параметрах",
- 	"copyDefaultValue": "Копировать в параметры"
-+=======
-+	"emptyUserSettingsHeader": "Укажите параметры здесь, чтобы перезаписать параметры по умолчанию.",
-+	"errorInvalidConfiguration": "Не удается записать параметры. Устраните ошибки и предупреждения в файле и повторите попытку.",
-+	"emptyWorkspaceSettingsHeader": "Укажите параметры здесь, чтобы перезаписать параметры пользователей.",
-+	"emptyFolderSettingsHeader": "Укажите параметры папок здесь, чтобы перезаписать параметры рабочих областей.",
-+	"defaultFolderSettingsTitle": "Параметры папок по умолчанию",
-+	"defaultSettingsTitle": "Параметры по умолчанию",
-+	"noSettingsFound": "Параметры не найдены.",
-+	"editTtile": "Изменить",
-+	"replaceDefaultValue": "Заменить в параметрах",
-+	"copyDefaultValue": "Копировать в параметры",
-+	"unsupportedPHPExecutablePathSetting": "Этот параметр должен быть параметром пользователя. Чтобы настроить в рабочей области PHP, откройте PHP-файл и щелкните \"Путь PHP\" в строке состояния.",
-+	"unsupportedWorkspaceSetting": "Этот параметр должен быть параметром пользователя.",
-+	"unsupportedWorkbenchSetting": "Сейчас применить этот параметр нельзя. Он будет применен, когда вы откроете эту папку напрямую."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d90a4e6c80b1c3c1b58bbb1b52526e80f0efe89f i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-  our    100644 7e702c2b5e93de8692ffe0243a9f0889bfcceb3c i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-  their  100644 870d134266523d084d65420727101c747d174919 i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  our    100644 2639f8a70dc171eed499a24e68b57de977a1debe i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-  their  100644 fbe7b0fc59d0a09ac4f13a85af3e18479e146aa3 i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -12,4 +13,13 @@
- 	"userSettings": "Параметры пользователя",
- 	"workspaceSettings": "Параметры рабочей области",
- 	"folderSettings": "Параметры папок"
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"folderSettingsDetails": "Параметры папок"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 155d4022b8eaad02d00cf55a647933cd0a9ed3ad i18n/rus/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  our    100644 a0702c99bc6adf515a02bc50655ac66d8b369690 i18n/rus/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-  their  100644 cb591fb1f5f21ff745e3f7c6b8efd952ab2d7317 i18n/rus/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.i18n.json
-@@ -8,5 +8,11 @@
- 	],
- 	"relaunchSettingMessage": "После изменения параметра необходима выполнить перезагрузку, чтобы изменения вступили в силу.",
- 	"relaunchSettingDetail": "Нажмите кнопку \"Перезагрузить\", чтобы перезагрузить {0} и включить параметр.",
-+<<<<<<< .our
- 	"restart": "&&Перезапустить"
-+=======
-+	"restart": "Перезапустить",
-+	"relaunchWorkspaceMessage": "Для изменения этой рабочей области требуется перезагрузить нашу систему расширений.",
-+	"reload": "Перезагрузка"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e5f21d40d06215c5a29c27531436657b5b20a2b1 i18n/rus/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  our    100644 012af24286aec719761b0687ebd50b2292e4db5e i18n/rus/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-  their  100644 a60edb8ea779767ce0b1b8e40126c096e8082eaa i18n/rus/src/vs/workbench/parts/search/browser/searchActions.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"nextSearchIncludePattern": "Показать следующий шаблон включения в поиск",
- 	"previousSearchIncludePattern": "Показать предыдущий шаблон включения в поиск ",
- 	"nextSearchExcludePattern": "Показать следующий шаблон исключения из поиска",
-@@ -16,6 +19,8 @@
- 	"previousReplaceTerm": "Показать предыдущее условие поиска и замены",
- 	"findInFiles": "Найти в файлах",
- 	"replaceInFiles": "Заменить в файлах",
-+	"findInWorkspace": "Найти в рабочей области...",
-+	"findInFolder": "Найти в папке...",
- 	"RefreshAction.label": "Обновить",
- 	"CollapseDeepestExpandedLevelAction.label": "Свернуть все",
- 	"ClearSearchResultsAction.label": "Очистить",
-changed in both
-  base   100644 cd394a2c256ae3595abf54197c01dcb233ef7384 i18n/rus/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-  our    100644 d3adc19c362c0be32a82dcdb9b4f38f6d17c183e i18n/rus/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-  their  100644 9d483c5df778ea5767a5155fd8f736f62653edc8 i18n/rus/src/vs/workbench/parts/search/browser/searchResultsView.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -6,6 +7,8 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+>>>>>>> .their
- 	"searchFolderMatch.other.label": "Другие файлы",
- 	"searchFileMatches": "Найдено файлов: {0}",
- 	"searchFileMatch": "Найден {0} файл",
-changed in both
-  base   100644 39d234e38ac3f691ae3a0d2b108355e437fa9102 i18n/rus/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  our    100644 b197ab3521e49957a9edec72b674203f6268c391 i18n/rus/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  their  100644 1359328df0c5cb8ef24d158ed6715012b58bafb9 i18n/rus/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-changed in both
-  base   100644 8892c40326eab5015b51d487d5e37e0b294512b2 i18n/rus/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 5406c69914aaafdfca9d082f48774213cbbbd661 i18n/rus/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 478d79d5732a3b6729494a6797168cddf58a459d i18n/rus/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-changed in both
-  base   100644 b8738833fa754fe6c88f27c641e6554589e325da i18n/rus/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 3ad2e6ca5f31ca94a9cdd8a18a046b2a9773636b i18n/rus/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 c9567d9d0e74067d8b5ab85829404eb6f957e1ad i18n/rus/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-@@ -12,8 +12,12 @@
- 	"totalWarnings": "Предупреждения: {0}",
- 	"totalInfos": "Сообщения: {0}",
- 	"problems": "Проблемы",
-+<<<<<<< .our
- 	"building": "Сборка...",
- 	"manyProblems": "Более 10 тысяч",
-+=======
-+	"manyMarkers": "99+",
-+>>>>>>> .their
- 	"runningTasks": "Показать выполняемые задачи",
- 	"tasks": "Задачи",
- 	"TaskSystem.noHotSwap": "Чтобы изменить подсистему выполнения задач, в которой запущена активная задача, необходимо перезагрузить окно",
-@@ -24,17 +28,25 @@
- 	"TaskService.noTestTask1": "Задача теста не определена. Отметьте задачу с помощью \"isTestCommand\" в файле tasks.json.",
- 	"TaskService.noTestTask2": "Задача теста не определена. Отметьте задачу с помощью группы 'test' в файле tasks.json.",
- 	"TaskServer.noTask": "Запрошенная задача {0} для выполнения не найдена.",
-+<<<<<<< .our
- 	"TaskService.associate": "связать",
-+=======
-+>>>>>>> .their
- 	"TaskService.attachProblemMatcher.continueWithout": "Продолжить без проверки выходных данных задачи",
- 	"TaskService.attachProblemMatcher.never": "Никогда не проверять выходные данные задачи",
- 	"TaskService.attachProblemMatcher.learnMoreAbout": "Дополнительные сведения о проверке выходных данных задачи",
- 	"selectProblemMatcher": "Выберите, на какие ошибки и предупреждения следует проверять выходные данные задачи",
- 	"customizeParseErrors": "В конфигурации текущей задачи есть ошибки. Исправьте ошибки перед изменением задачи.",
- 	"moreThanOneBuildTask": "В файле tasks.json определено несколько задач сборки. Выполняется первая задача.\n",
-+<<<<<<< .our
- 	"TaskSystem.activeSame.background": "Задача '{0}' уже активна и находится в фоновом режиме.",
- 	"TaskSystem.activeSame.noBackground": "Задача '{0}' уже выполняется.",
- 	"terminateTask": "Завершить задачу",
- 	"restartTask": "Перезапустить задачу",
-+=======
-+	"TaskSystem.activeSame.background": "Задача '{0}' уже активна и находится в фоновом режиме. Чтобы завершить задачу, выберите \"Завершить задачу\" в меню \"Задачи\".",
-+	"TaskSystem.activeSame.noBackground": "Задача '{0}' уже активна. Чтобы завершить задачу, выберите \"Завершить задачу\" из меню \"Задачи\".",
-+>>>>>>> .their
- 	"TaskSystem.active": "Уже выполняется задача. Завершите ее, прежде чем выполнять другую задачу.",
- 	"TaskSystem.restartFailed": "Не удалось завершить и перезапустить задачу {0}",
- 	"TaskService.noConfiguration": "Ошибка: в определении задачи {0} не выявлена задача для следующей конфигурации:\n{1}\nЗадача будет проигнорирована.\n",
-@@ -75,8 +87,13 @@
- 	"TaskService.pickDefaultBuildTask": "Выберите задачу, которая будет использоваться в качестве задачи сборки по умолчанию.",
- 	"TaskService.defaultTestTaskExists": "{0} уже помечена как задача сборки по умолчанию. ",
- 	"TaskService.pickDefaultTestTask": "Выберите задачу, которая будет использоваться в качестве задачи тестирования по умолчанию. ",
-+<<<<<<< .our
- 	"TaskService.pickShowTask": "Выберите задачу, выходные данные для которой нужно отобразить",
- 	"TaskService.noTaskIsRunning": "Ни одной задачи не запущено",
-+=======
-+	"TaskService.noTaskIsRunning": "Ни одной задачи не запущено.",
-+	"TaskService.pickShowTask": "Выберите задачу, выходные данные для которой нужно отобразить",
-+>>>>>>> .their
- 	"ShowLogAction.label": "Показать журнал задач",
- 	"RunTaskAction.label": "Выполнить задачу",
- 	"RestartTaskAction.label": "Перезапустить запущенную задачу",
-changed in both
-  base   100644 5f9a68cdb97f93b50890241bb8fa0b0102a28ab4 i18n/rus/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  our    100644 b7b348484d2ec81180585cec523e688a69bfd6fc i18n/rus/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-  their  100644 b89e73645df41663fbfaac4323c26a0a9a031ef2 i18n/rus/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  our    100644 f97f741a841441f81547b7f5c26cdd6055680df5 i18n/rus/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-  their  100644 2353eb8ddd1ae57c4cae589c3f5412550da6f9da i18n/rus/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -9,6 +10,15 @@
- 	"termEntryAriaLabel": "{0}, средство выбора терминалов",
- 	"termCreateEntryAriaLabel": "{0}, создать новый терминал",
- 	"workbench.action.terminal.newplus": "$(plus) Создать новый интегрированный терминал",
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+	"entryAriaLabel": "{0}, средство выбора терминалов",
-+>>>>>>> .their
- 	"noTerminalsMatching": "Терминалы, соответствующие условию, отсутствуют",
- 	"noTerminalsFound": "Открытые терминалы отсутствуют"
- }
-\ No newline at end of file
-changed in both
-  base   100644 ffbac2eb99e0ea5a143c1bb70ece8333b0d34010 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 e05b07ca1e0540b56ed4788f50fea5db9d3c3f96 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 09ebc373f5482f173ef9216d5cf2dff94d20b598 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-@@ -1,4 +1,5 @@
- {
-+<<<<<<< .our
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
- 		"Copyright (c) Microsoft Corporation. All rights reserved.",
-@@ -8,6 +9,9 @@
- 	],
- 	"quickOpen.terminal": "Показать все открытые терминалы",
- 	"terminal": "Терминал",
-+=======
-+	"quickOpen.terminal": "Показать все открытые терминалы",
-+>>>>>>> .their
- 	"terminalIntegratedConfigurationTitle": "Интегрированный терминал",
- 	"terminal.integrated.shell.linux": "Путь оболочки, который используется терминалом в Linux.",
- 	"terminal.integrated.shellArgs.linux": "Аргументы командной строки, которые следует использовать в терминале Linux.",
-@@ -36,8 +40,12 @@
- 	"terminal.integrated.env.osx": "Объект с переменными среды, которые будут добавлены к процессу VS Code для использования в терминале OS X",
- 	"terminal.integrated.env.linux": "Объект с переменными среды, которые будут добавлены к процессу VS Code для использования в терминале Linux ",
- 	"terminal.integrated.env.windows": "Объект с переменными среды, которые будут добавлены к процессу VS Code для использования в терминале Windows",
-+<<<<<<< .our
- 	"terminal.integrated.showExitAlert": "Отображать предупреждение \"Процесс терминала завершен с кодом выхода\", если код выхода не равен нулю.",
- 	"terminal.integrated.experimentalRestore": "Восстанавливать ли сеансы терминала для рабочей области автоматически при запуске VS Code. Это экспериментальный параметр; он может приводить к ошибкам и может быть изменен в будущем.",
-+=======
-+	"terminal": "Терминал",
-+>>>>>>> .their
- 	"terminalCategory": "Терминал",
- 	"viewCategory": "Просмотреть"
- }
-\ No newline at end of file
-changed in both
-  base   100644 32aa44547c4327e0be154304cb9a8146845ada73 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 ea0d455fc7f4fc786ef2ef083f3b437a535a441a i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 e2064127c8ab238a9a9057bd8111d8371ade1908 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -14,8 +14,11 @@
- 	"workbench.action.terminal.selectAll": "Выбрать все",
- 	"workbench.action.terminal.deleteWordLeft": "Удалить слово слева",
- 	"workbench.action.terminal.deleteWordRight": "Удалить слово справа",
-+<<<<<<< .our
- 	"workbench.action.terminal.moveToLineStart": "Перейти к началу строки",
- 	"workbench.action.terminal.moveToLineEnd": "Перейти к концу строки",
-+=======
-+>>>>>>> .their
- 	"workbench.action.terminal.new": "Создание нового интегрированного терминала",
- 	"workbench.action.terminal.new.short": "Новый терминал",
- 	"workbench.action.terminal.newWorkspacePlaceholder": "Выбрать текущий рабочий каталог для нового терминала",
-@@ -51,6 +54,7 @@
- 	"workbench.action.terminal.rename.prompt": "Введите название терминала",
- 	"workbench.action.terminal.focusFindWidget": "Выделить мини-приложение поиска",
- 	"workbench.action.terminal.hideFindWidget": "Скрыть мини-приложение поиска",
-+<<<<<<< .our
- 	"nextTerminalFindTerm": "Показать следующий найденный термин",
- 	"previousTerminalFindTerm": "Показать предыдущий найденный термин",
- 	"quickOpenTerm": "Переключить активный терминал",
-@@ -60,4 +64,7 @@
- 	"workbench.action.terminal.selectToNextCommand": "Выбрать следующую команду",
- 	"workbench.action.terminal.selectToPreviousLine": "Выделить текст до предыдущей строки",
- 	"workbench.action.terminal.selectToNextLine": "Выделить текст до следующей строки"
-+=======
-+	"quickOpenTerm": "Переключить активный терминал"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a43d3077cff1b9cf703d317964bd31c51e83d890 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  our    100644 aca12bf1061a643000b1615902ead62bb39d5223 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-  their  100644 3a2688c515c648212b96cc4c490842b7c49a7043 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
-@@ -10,7 +10,10 @@
- 	"terminal.foreground": "Цвет переднего плана терминала.",
- 	"terminalCursor.foreground": "Цвет переднего плана курсора терминала.",
- 	"terminalCursor.background": "Цвет фона курсора терминала. Позволяет выбрать цвет символа, который перекрывается блочным курсором.",
-+<<<<<<< .our
- 	"terminal.selectionBackground": "Цвет фона выделения терминала.",
- 	"terminal.border": "Цвет границы, которая отделяет области в терминале. По умолчанию используется panel.border.",
-+=======
-+>>>>>>> .their
- 	"terminal.ansiColor": "Цвет ANSI \"{0}\" в терминале."
- }
-\ No newline at end of file
-changed in both
-  base   100644 e74084f36861306b1d8352a452623fc9b4cb5779 i18n/rus/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 0aa456751192f6ae65f23c8eacec75c6ffe01fe8 i18n/rus/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 d10d994409d4786c1b2672b0288a0a2e3b73392e i18n/rus/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -11,10 +11,16 @@
- 	"read the release notes": "Вас приветствует {0} v{1}! Вы хотите прочитать заметки о выпуске?",
- 	"licenseChanged": "Наши условия лицензии изменились. Чтобы ознакомиться с ними, щелкните [здесь]({0}).",
- 	"neveragain": "Больше не показывать",
-+<<<<<<< .our
- 	"64bitisavailable": "{0} для 64-разрядной версии Windows теперь доступен! Дополнительные сведения см. [здесь]({1}).",
- 	"updateIsReady": "Доступно новое обновление {0}.",
- 	"noUpdatesAvailable": "Доступные обновления отсутствуют.",
- 	"ok": "ОК",
-+=======
-+	"64bitisavailable": "{0} для 64-разрядных версий Windows теперь доступен!",
-+	"learn more": "Дополнительные сведения",
-+	"updateIsReady": "Доступно новое обновление {0}.",
-+>>>>>>> .their
- 	"thereIsUpdateAvailable": "Доступно обновление.",
- 	"download now": "Скачать сейчас",
- 	"later": "Позже",
-changed in both
-  base   100644 761072edd67cf6fb14a79a53de792bb8cd9fca3e i18n/rus/src/vs/workbench/parts/views/browser/views.i18n.json
-  our    100644 b0fa6d5e7e3abc8f109624f6c8e2c13655a54270 i18n/rus/src/vs/workbench/parts/views/browser/views.i18n.json
-  their  100644 ad533f8cbf10fb7506003bfed6810788da5b5b00 i18n/rus/src/vs/workbench/parts/views/browser/views.i18n.json
-@@ -5,5 +5,9 @@
- // Do not edit this file. It is machine generated.
- {
- 	"viewToolbarAriaLabel": "Действий: {0}",
-+<<<<<<< .our
- 	"hideView": "Скрыть из боковой панели"
-+=======
-+	"removeView": "Удалить из боковой панели"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 23cea88a1ceee6a440989c6533e259f662a46166 i18n/rus/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-  our    100644 472304cddee7043b300afe794ae73584b5e0577d i18n/rus/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-  their  100644 d11a8867da1bb8f1ce92a910616955affc4bcf54 i18n/rus/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.i18n.json
-changed in both
-  base   100644 a74bc2f57d972fde3753efbe6bc776755e527c63 i18n/rus/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  our    100644 8915524eb9bff2cf02cf7f994fd2d422deaed65c i18n/rus/src/vs/workbench/services/configuration/node/configuration.i18n.json
-  their  100644 1a6d5175801408cc02cd06043f5502b74a91c4cd i18n/rus/src/vs/workbench/services/configuration/node/configuration.i18n.json
-@@ -9,6 +9,7 @@
- 	"scope.window.description": "Конфигурация окна, которая может быть задана в параметрах пользователя или рабочей области.",
- 	"scope.resource.description": "Конфигурации ресурсов, которые могут быть заданы в параметрах пользователей, рабочих областей или папок.",
- 	"scope.description": "Область, в которой применяется конфигурация. Доступные области — 'window' и 'resource'.",
-+<<<<<<< .our
- 	"vscode.extension.contributes.configuration": "Добавляет параметры конфигурации.",
- 	"invalid.title": "configuration.title должно быть строкой",
- 	"vscode.extension.contributes.defaultConfiguration": "Предоставляет параметры конфигурации редактора по умолчанию в соответствии с языком.",
-@@ -21,4 +22,13 @@
- 	"workspaceConfig.settings.description": "Параметры рабочей области",
- 	"workspaceConfig.extensions.description": "Расширения рабочей области",
- 	"unknownWorkspaceProperty": "Неизвестное свойство рабочей области"
-+=======
-+	"invalid.type": "Если тип configuration.type задан, то он должен иметь значение object",
-+	"invalid.title": "configuration.title должно быть строкой",
-+	"vscode.extension.contributes.defaultConfiguration": "Предоставляет параметры конфигурации редактора по умолчанию в соответствии с языком.",
-+	"invalid.properties": "configuration.properties должно быть объектом",
-+	"workspaceConfig.id.description": "Идентификатор рабочей области. Используется для хранения внутреннего состояния рабочей области, которое может быть утеряно во время изменения.",
-+	"workspaceConfig.folders.description": "Список папок, которые будут загружены в рабочую область. Необходимо указывать пути к файлам, например, \"file:///root/folderA\"",
-+	"workspaceConfig.settings.description": "Параметры рабочей области"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 0d0c909172dbc855f1b653c8dbc0618f9156cd06 i18n/rus/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  our    100644 466dfbc590c46288cb65b00cb7bf87e50489e811 i18n/rus/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-  their  100644 66d2499a4375c12dfd28ce75b7ee7cf3405539c5 i18n/rus/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
-@@ -9,6 +9,7 @@
- 	"openTasksConfiguration": "Открыть конфигурацию задач",
- 	"openLaunchConfiguration": "Открыть конфигурацию запуска",
- 	"open": "Открыть параметры",
-+<<<<<<< .our
- 	"saveAndRetry": "Сохранить и повторить",
- 	"errorUnknownKey": "Не удалось записать в {0}, так как {1} не является зарегистрированной конфигурацией.",
- 	"errorInvalidWorkspaceConfigurationApplication": "Не удается записать {0} в параметры рабочей области. Этот параметр можно записать только в параметры пользователя.",
-@@ -27,6 +28,19 @@
- 	"errorConfigurationFileDirty": "Не удается записать параметры пользователя, так как файл был изменен. Сохраните файл параметров пользователя и повторите попытку.",
- 	"errorConfigurationFileDirtyWorkspace": "Не удается записать параметры рабочей области, так как файл был изменен. Сохраните файл параметров рабочей области и повторите попытку. ",
- 	"errorConfigurationFileDirtyFolder": "Не удается записать параметры папки, так как файл был изменен. Сохраните файл параметров папки '{0}' и повторите попытку.",
-+=======
-+	"close": "Закрыть",
-+	"saveAndRetry": "Сохранить параметры и повторить попытку",
-+	"errorUnknownKey": "Не удалось записать в {0}, так как {1} не является зарегистрированной конфигурацией.",
-+	"errorInvalidFolderConfiguration": "Не удается изменить параметры папок, так как {0} не поддерживает область ресурсов папок. ",
-+	"errorInvalidUserTarget": "Не удается изменить параметры пользователей, так как {0} не поддерживает глобальную область.",
-+	"errorInvalidFolderTarget": "Не удается изменить параметры папок, так как ресурс не указан.",
-+	"errorNoWorkspaceOpened": "Не удается записать в {0}, так как не открыта ни одна рабочая область. Откройте рабочую область и повторите попытку.",
-+	"errorInvalidConfiguration": "Не удается записать параметры. Откройте файл **User Settings**, устраните ошибки и предупреждения в файле и повторите попытку.",
-+	"errorInvalidConfigurationWorkspace": "Не удается записать параметры. Откройте файл **Workspace Settings**, устраните ошибки и предупреждения в файле и повторите попытку.",
-+	"errorConfigurationFileDirty": "Не удается записать параметры, так как файл был изменен. Сохраните файл **User Settings** и повторите попытку.",
-+	"errorConfigurationFileDirtyWorkspace": "Не удается записать параметры, так как файл был изменен. Сохраните файл **Workspace Settings** и повторите попытку.",
-+>>>>>>> .their
- 	"userTarget": "Параметры пользователя",
- 	"workspaceTarget": "Параметры рабочей области",
- 	"folderTarget": "Параметры папок"
-changed in both
-  base   100644 8b6ad71cd4e6db3e42f55c9009b9ddb081a5af8a i18n/rus/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-  our    100644 b7d0271fbd9ef29c3bcbab141b27997ab44f9969 i18n/rus/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-  their  100644 8463d1762c16a7702d8c668f58bb03ac1aaa6530 i18n/rus/src/vs/workbench/services/configuration/node/jsonEditingService.i18n.json
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- {
- 	"": [
- 		"--------------------------------------------------------------------------------------------",
-@@ -6,6 +7,14 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+=======
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+// Do not edit this file. It is machine generated.
-+{
-+>>>>>>> .their
- 	"errorInvalidFile": "Не удается выполнить запись в файл. Откройте файл, исправьте ошибки и предупреждения в файле и повторите попытку.",
- 	"errorFileDirty": "Не удается записать сведения в файл, так как файл был изменен. Сохраните файл и повторите попытку."
- }
-\ No newline at end of file
-changed in both
-  base   100644 9a03e746560855f41b46f0dee2465f2396d6cda9 i18n/rus/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  our    100644 73e5413908fbafda8e65fdd1e7768bf4e42a1926 i18n/rus/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-  their  100644 1fc0039118800fe2e7f256c3a7e02425aef4b39b i18n/rus/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json
-@@ -13,6 +13,7 @@
- 	"noIconThemeDesc": "No file icons",
- 	"iconThemeError": "File icon theme is unknown or not installed.",
- 	"workbenchColors": "Переопределяет цвета из выбранной цветовой темы.",
-+<<<<<<< .our
- 	"editorColors.comments": "Задает цвета и стили для комментариев",
- 	"editorColors.strings": "Задает цвета и стили для строковых литералов.",
- 	"editorColors.keywords": "Задает цвета и стили для ключевых слов.",
-@@ -21,5 +22,9 @@
- 	"editorColors.functions": "Задает цвета и стили для объявлений функций и ссылок. ",
- 	"editorColors.variables": "Задает цвета и стили для объявлений переменных и для ссылок. ",
- 	"editorColors.textMateRules": "Задает цвета и стили с использованием правил оформления textmate (расширенный параметр).",
-+=======
-+	"workbenchColors.deprecated": "Параметр больше не является экспериментальным и был переименован в 'workbench.colorCustomizations'",
-+	"workbenchColors.deprecatedDescription": "Используйте параметр 'workbench.colorCustomizations'",
-+>>>>>>> .their
- 	"editorColors": "Переопределяет цвета редактора и стиль шрифта из текущей выбранной цветовой темы."
- }
-\ No newline at end of file
-changed in both
-  base   100644 bd568a64488e267349f9912913dd7d886c029b8e i18n/trk/extensions/emmet/package.i18n.json
-  our    100644 da0ca75d8cf264d2aa273bacfc4c88c0e06fd83f i18n/trk/extensions/emmet/package.i18n.json
-  their  100644 945f529be303e7ce3323f2bc11757519e7917f8a i18n/trk/extensions/emmet/package.i18n.json
-@@ -32,6 +32,7 @@
- 	"command.decrementNumberByTen": "10 Azalt",
- 	"emmetSyntaxProfiles": "Belirtilen sentaks için profil tanımlayın veya kendi profilinizi belirli kurallarla kullanın.",
- 	"emmetExclude": "Emmet kısaltmalarının genişletilmeyeceği bir diller dizisi.",
-+<<<<<<< .our
- 	"emmetExtensionsPath": "Emmet profileri ve parçacıklarını içeren bir klasör yolu.'",
- 	"emmetShowExpandedAbbreviation": "Genişletilmiş Emmet kısaltmalarını öneriler olarak gösterir.\n\"inMarkupAndStylesheetFilesOnly\" seçeneği\" html, haml, jade, xml, xsl, css, scss, sass, less ve stylus'a uygulanır.\n\"always\" seçeneği işaretleme/css'den bağımsız olarak dosyanın tüm bölümlerine uygulanır.",
- 	"emmetShowAbbreviationSuggestions": "Olası Emmet kısaltmalarını öneriler olarak gösterir. Stil dosyalarında veya emmet.showExpandedAbbreviation'a \"never\" değeri atandığında uygulanamaz.",
-@@ -62,4 +63,11 @@
- 	"emmetPreferencesCssMsProperties": "`-` ile başlayan Emmet kısaltmasında kullanıldığında 'ms' önekini alacak virgülle ayrılmış CSS özellikleri. 'ms' önekinden her zaman kaçınmak için boş bir dize olarak ayarlayın.",
- 	"emmetPreferencesCssFuzzySearchMinScore": "Bulanık eşleştirilmiş kısaltmaların elde etmesi gereken minimum puan (0'dan 1'e kadar). Düşük değerler birçok yanlış pozitif eşleşme oluşturabilir, daha yüksek değerler olası eşleşmeleri azaltabilir.",
- 	"emmetOptimizeStylesheetParsing": "\"false\" değeri atandığında, Emmet kısaltmalarının genişletilmesinde o anki konumun geçerli olup olmadığını belirlemek için tüm dosya ayrıştırılır. \"true\" değeri atandığında, css/scss/less dosyalarında sadece o anki konumun çevresi ayrıştırılır."
-+=======
-+	"emmetExtensionsPath": "Emmet profileri, parçacıkları ve tercihlerini içeren bir klasör yolu. emmet.useNewEmmet, 'true' olarak ayarlandığında, yalnızca profiller eklentiler yolundan kabul edilir.",
-+	"emmetShowExpandedAbbreviation": "Genişletilmiş emmet kısaltmalarını öneriler olarak gösterir.\n\"inMarkupAndStylesheetFilesOnly\" seçeneği\" html, haml, jade, xml, xsl, css, scss, sass, less ve stylus'a uygulanır.\n\"always\" seçeneği işaretleme/css'den bağımsız olarak dosyanın tüm bölümlerine uygulanır.",
-+	"emmetShowAbbreviationSuggestions": "Olası emmet kısaltmalarını öneriler olarak gösterir. Stil dosyalarında veya emmet.showExpandedAbbreviation, \"never\" olarak ayarlandığında uygulanamaz.",
-+	"emmetIncludeLanguages": "Varsayılan olarak desteklenmeyen dillerde emmet kısaltmalarını etkinleştirin. Burada dil ile desteklenen emmet destekli dil arasında eşleme ekleyin.",
-+	"emmetVariables": "Emmet parçacıklarında kullanılacak değişkenler"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 3f17e74fb401bba03573ea5e82027792ca176b87 i18n/trk/extensions/extension-editing/out/extensionLinter.i18n.json
-  our    100644 548a560533a7647174cfb35884c3fb051dd6a218 i18n/trk/extensions/extension-editing/out/extensionLinter.i18n.json
-  their  100644 12dd37bc72ba22ba6a2e37346ff90810bf199295 i18n/trk/extensions/extension-editing/out/extensionLinter.i18n.json
-merged
-  result 100644 d7c20ac4f9a27db43c8550e8ea0fafd7e23fff17 i18n/trk/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-  our    100644 55701eb8ca7edcba08365569ef5cef15063535d4 i18n/trk/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
-@@ -7,8 +7,5 @@
- 	"emmetConfigurationTitle": "Emmet",
- 	"triggerExpansionOnTab": "Etkinleştirildiğinde, emmet kısaltmaları TAB tuşuna basıldığında genişletilir. emmet.useNewemmet, 'true' olarak ayarlandığında geçerli değildir.",
- 	"emmetPreferences": "Emmet'in bazı eylemleri ve çözümleyicilerinin davranışını değiştirmek için kullanılacak tercihler. emmet.useNewemmet, 'true' olarak ayarlandığında geçerli değildir.",
--	"emmetSyntaxProfiles": "Belirtilen sentaks için profil tanımlayın veya kendi profilinizi belirli kurallarla kullanın.",
--	"emmetExclude": "Emmet kısaltmalarının genişletilmeyeceği bir diller dizisi.",
--	"emmetExtensionsPath": "Emmet profileri, parçacıkları ve tercihlerini içeren bir klasör yolu. emmet.useNewEmmet, 'true' olarak ayarlandığında, yalnızca profiller eklentiler yolundan kabul edilir.",
- 	"useNewEmmet": "Tüm emmet özellikleri için yeni emmet modüllerini deneyin(sonunda eski tekil emmet kütüphanesinin yerini alacaktır)."
- }
-\ No newline at end of file
-changed in both
-  base   100644 29aaafa9f7d6843f546cdfef52b1cbc1195a4ece i18n/trk/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  our    100644 fc38590cc3008cde13df29309821e754e11630d7 i18n/trk/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-  their  100644 2ad5b6fc3719f24cbc819cf93e60e0b5cfd4dcae i18n/trk/src/vs/workbench/parts/search/browser/searchViewlet.i18n.json
-changed in both
-  base   100644 7ba23fb595cf13e4d218315bf573bad8a9de5368 i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 0dfa05cd7919b2b8edd950bcde47408dafdd57f0 i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 7ded7e9bf4639bddec7d3fdb520cab11c3cfbb8a i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -51,6 +51,7 @@
- 	"workbench.action.terminal.rename.prompt": "Terminal adını girin",
- 	"workbench.action.terminal.focusFindWidget": "Bulma Aracına Odakla",
- 	"workbench.action.terminal.hideFindWidget": "Bulma Aracını Gizle",
-+<<<<<<< .our
- 	"nextTerminalFindTerm": "Sonraki Arama Terimini Göster",
- 	"previousTerminalFindTerm": "Önceki Arama Terimini Göster",
- 	"quickOpenTerm": "Aktif Terminali Değiştir",
-@@ -60,4 +61,7 @@
- 	"workbench.action.terminal.selectToNextCommand": "Sonraki Komuta Kadar Seç",
- 	"workbench.action.terminal.selectToPreviousLine": "Önceki Satıra Kadar Seç",
- 	"workbench.action.terminal.selectToNextLine": "Sonraki Satıra Kadar Seç"
-+=======
-+	"quickOpenTerm": "Aktif terminali değiştir"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d0dfb1d885ced3391b7b123bb305900ac028fd38 src/vs/base/browser/dom.ts
-  our    100644 55d7a57ba6a391c964d03038ed5c842483b5d1f7 src/vs/base/browser/dom.ts
-  their  100644 ad9fe378587cb4c8f16fc0bbf3afcd8c8031a0f5 src/vs/base/browser/dom.ts
-@@ -1122,6 +1122,7 @@
-  * See https://mathiasbynens.github.io/rel-noopener/
-  */
- export function windowOpenNoOpener(url: string): void {
-+<<<<<<< .our
- 	if (platform.isNative || browser.isEdgeWebView) {
- 		// In VSCode, window.open() always returns null...
- 		// The same is true for a WebView (see https://github.com/Microsoft/monaco-editor/issues/628)
-@@ -1132,5 +1133,11 @@
- 			(newTab as any).opener = null;
- 			newTab.location.href = url;
- 		}
-+=======
-+	let newTab = window.open();
-+	if (newTab) {
-+		newTab.opener = null;
-+		newTab.location.href = url;
-+>>>>>>> .their
- 	}
- }
-changed in both
-  base   100644 20d73300814f8e40622dad8ea2ae116bcfaa3b23 src/vs/editor/standalone/browser/simpleServices.ts
-  our    100644 231c2e182c38126cc58ce28e0a84a2cea202f8d7 src/vs/editor/standalone/browser/simpleServices.ts
-  their  100644 a7b7fe78431a99489f68e0e334b4bffa3dd759a8 src/vs/editor/standalone/browser/simpleServices.ts
-@@ -78,6 +78,7 @@
- 	(url: string): boolean;
- }
- 
-+<<<<<<< .our
- function withTypedEditor<T>(widget: editorCommon.IEditor, codeEditorCallback: (editor: ICodeEditor) => T, diffEditorCallback: (editor: IDiffEditor) => T): T {
- 	if (isCodeEditor(widget)) {
- 		// Single Editor
-@@ -85,6 +86,80 @@
- 	} else {
- 		// Diff Editor
- 		return diffEditorCallback(<IDiffEditor>widget);
-+=======
-+export class SimpleEditorService implements IEditorService {
-+	public _serviceBrand: any;
-+
-+	private editor: SimpleEditor;
-+	private openEditorDelegate: IOpenEditorDelegate;
-+
-+	constructor() {
-+		this.openEditorDelegate = null;
-+	}
-+
-+	public setEditor(editor: editorCommon.IEditor): void {
-+		this.editor = new SimpleEditor(editor);
-+	}
-+
-+	public setOpenEditorDelegate(openEditorDelegate: IOpenEditorDelegate): void {
-+		this.openEditorDelegate = openEditorDelegate;
-+	}
-+
-+	public openEditor(typedData: IResourceInput, sideBySide?: boolean): TPromise<IEditor> {
-+		return TPromise.as(this.editor.withTypedEditor(
-+			(editor) => this.doOpenEditor(editor, typedData),
-+			(diffEditor) => (
-+				this.doOpenEditor(diffEditor.getOriginalEditor(), typedData) ||
-+				this.doOpenEditor(diffEditor.getModifiedEditor(), typedData)
-+			)
-+		));
-+	}
-+
-+	private doOpenEditor(editor: editorCommon.ICommonCodeEditor, data: IResourceInput): IEditor {
-+		let model = this.findModel(editor, data);
-+		if (!model) {
-+			if (data.resource) {
-+				if (this.openEditorDelegate) {
-+					this.openEditorDelegate(data.resource.toString());
-+					return null;
-+				} else {
-+					let schema = data.resource.scheme;
-+					if (schema === Schemas.http || schema === Schemas.https) {
-+						// This is a fully qualified http or https URL
-+						dom.windowOpenNoOpener(data.resource.toString());
-+						return this.editor;
-+					}
-+				}
-+			}
-+			return null;
-+		}
-+
-+		let selection = <IRange>data.options.selection;
-+		if (selection) {
-+			if (typeof selection.endLineNumber === 'number' && typeof selection.endColumn === 'number') {
-+				editor.setSelection(selection);
-+				editor.revealRangeInCenter(selection);
-+			} else {
-+				let pos = {
-+					lineNumber: selection.startLineNumber,
-+					column: selection.startColumn
-+				};
-+				editor.setPosition(pos);
-+				editor.revealPositionInCenter(pos);
-+			}
-+		}
-+
-+		return this.editor;
-+	}
-+
-+	private findModel(editor: editorCommon.ICommonCodeEditor, data: IResourceInput): editorCommon.IModel {
-+		let model = editor.getModel();
-+		if (model.uri.toString() !== data.resource.toString()) {
-+			return null;
-+		}
-+
-+		return model;
-+>>>>>>> .their
- 	}
- }
- 
-removed in local
-  base   100644 f6d6e7a0287148f80b960c950838c0fc922f1417 src/vs/platform/opener/browser/openerService.ts
-  their  100644 bf99ecb6b5ca6a186aa9dab8eb876a7372920a81 src/vs/platform/opener/browser/openerService.ts
diff --git a/app/test/fixtures/merge-parser/vscode/merge-standalone-0.11.x-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-standalone-0.11.x-into-master.txt
deleted file mode 100644
index 7929c8e429d..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-standalone-0.11.x-into-master.txt
+++ /dev/null
@@ -1,2599 +0,0 @@
-changed in both
-  base   100644 7412c251294cd65bb7a2f81ce18c00f9a5197696 .gitignore
-  our    100644 6a9804cd2373e8051bf7b31a2c4dacc67eb9fb69 .gitignore
-  their  100644 02cec46f3774a7de8b7d253a40a1e3db7acde174 .gitignore
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- .DS_Store
- npm-debug.log
- Thumbs.db
-@@ -19,3 +20,22 @@
- test_data/
- test-results/
- yarn-error.log
-+=======
-+.DS_Store
-+npm-debug.log
-+Thumbs.db
-+node_modules/
-+.build/
-+out/
-+out-build/
-+out-editor/
-+out-editor-esm/
-+out-editor-min/
-+out-monaco-editor-core/
-+out-vscode/
-+out-vscode-min/
-+build/node_modules
-+coverage/
-+test_data/
-+yarn-error.log
-+>>>>>>> .their
-changed in both
-  base   100644 4fde19e669a8bd7ee823bdaabe45f388fe359a55 build/gulpfile.editor.js
-  our    100644 52d1f0fcf323631277651ff28381ae49c0fa6558 build/gulpfile.editor.js
-  their  100644 a2366ec17201cc7c26e2d9bd32b922c8f77dbb59 build/gulpfile.editor.js
-@@ -12,9 +12,12 @@
- const i18n = require('./lib/i18n');
- const standalone = require('./lib/standalone');
- const cp = require('child_process');
-+<<<<<<< .our
- const compilation = require('./lib/compilation');
- const monacoapi = require('./monaco/api');
- const fs = require('fs');
-+=======
-+>>>>>>> .their
- 
- var root = path.dirname(__dirname);
- var sha1 = util.getVersion(root);
-@@ -99,6 +102,8 @@
- gulp.task('clean-editor-build', util.rimraf('out-editor-build'));
- gulp.task('compile-editor-build', ['clean-editor-build', 'extract-editor-src'], compilation.compileTask('out-editor-src', 'out-editor-build', true));
- 
-+const languages = i18n.defaultLanguages.concat([]);  // i18n.defaultLanguages.concat(process.env.VSCODE_QUALITY !== 'stable' ? i18n.extraLanguages : []);
-+
- gulp.task('clean-optimized-editor', util.rimraf('out-editor'));
- gulp.task('optimize-editor', ['clean-optimized-editor', 'compile-editor-build'], common.optimizeTask({
- 	src: 'out-editor-build',
-@@ -122,6 +127,7 @@
- gulp.task('minify-editor', ['clean-minified-editor', 'optimize-editor'], common.minifyTask('out-editor'));
- 
- gulp.task('clean-editor-esm', util.rimraf('out-editor-esm'));
-+<<<<<<< .our
- gulp.task('extract-editor-esm', ['clean-editor-esm', 'clean-editor-distro', 'extract-editor-src'], function () {
- 	standalone.createESMSourcesAndResources2({
- 		srcFolder: './out-editor-src',
-@@ -145,12 +151,30 @@
- 	});
- });
- gulp.task('compile-editor-esm', ['extract-editor-esm', 'clean-editor-distro'], function () {
-+=======
-+gulp.task('extract-editor-esm', ['clean-editor-esm', 'clean-editor-distro'], function() {
-+	standalone.createESMSourcesAndResources({
-+		entryPoints: [
-+			'vs/editor/editor.main',
-+			'vs/editor/editor.worker'
-+		],
-+		outFolder: './out-editor-esm/src',
-+		outResourcesFolder: './out-monaco-editor-core/esm',
-+		redirects: {
-+			'vs/base/browser/ui/octiconLabel/octiconLabel': 'vs/base/browser/ui/octiconLabel/octiconLabel.mock',
-+			'vs/nls': 'vs/nls.mock',
-+		}
-+	});
-+});
-+gulp.task('compile-editor-esm', ['extract-editor-esm', 'clean-editor-distro'], function() {
-+>>>>>>> .their
- 	const result = cp.spawnSync(`node`, [`../node_modules/.bin/tsc`], {
- 		cwd: path.join(__dirname, '../out-editor-esm')
- 	});
- 	console.log(result.stdout.toString());
- });
- 
-+<<<<<<< .our
- function toExternalDTS(contents) {
- 	let lines = contents.split('\n');
- 	let killNextCloseCurlyBrace = false;
-@@ -186,6 +210,8 @@
- 	return lines.join('\n');
- }
- 
-+=======
-+>>>>>>> .their
- gulp.task('clean-editor-distro', util.rimraf('out-monaco-editor-core'));
- gulp.task('editor-distro', ['clean-editor-distro', 'compile-editor-esm', 'minify-editor', 'optimize-editor'], function () {
- 	return es.merge(
-added in both
-  our    100644 3e2bacc25d536d5cf841f4c455c1fdad871ec336 build/lib/standalone.js
-  their  100644 12511b01d36b4d5a48aa56b9b8dbff41caa111b3 build/lib/standalone.js
-@@ -7,6 +7,7 @@
- var ts = require("typescript");
- var fs = require("fs");
- var path = require("path");
-+<<<<<<< .our
- var tss = require("./treeshaking");
- var REPO_ROOT = path.join(__dirname, '../../');
- var SRC_DIR = path.join(REPO_ROOT, 'src');
-@@ -238,6 +239,173 @@
- }
- exports.createESMSourcesAndResources2 = createESMSourcesAndResources2;
- function transportCSS(module, enqueue, write) {
-+=======
-+var REPO_ROOT = path.join(__dirname, '../../');
-+var SRC_DIR = path.join(REPO_ROOT, 'src');
-+var OUT_EDITOR = path.join(REPO_ROOT, 'out-editor');
-+function createESMSourcesAndResources(options) {
-+    var OUT_FOLDER = path.join(REPO_ROOT, options.outFolder);
-+    var OUT_RESOURCES_FOLDER = path.join(REPO_ROOT, options.outResourcesFolder);
-+    var in_queue = Object.create(null);
-+    var queue = [];
-+    var enqueue = function (module) {
-+        if (in_queue[module]) {
-+            return;
-+        }
-+        in_queue[module] = true;
-+        queue.push(module);
-+    };
-+    var seenDir = {};
-+    var createDirectoryRecursive = function (dir) {
-+        if (seenDir[dir]) {
-+            return;
-+        }
-+        var lastSlash = dir.lastIndexOf('/');
-+        if (lastSlash === -1) {
-+            lastSlash = dir.lastIndexOf('\\');
-+        }
-+        if (lastSlash !== -1) {
-+            createDirectoryRecursive(dir.substring(0, lastSlash));
-+        }
-+        seenDir[dir] = true;
-+        try {
-+            fs.mkdirSync(dir);
-+        }
-+        catch (err) { }
-+    };
-+    seenDir[REPO_ROOT] = true;
-+    var toggleComments = function (fileContents) {
-+        var lines = fileContents.split(/\r\n|\r|\n/);
-+        var mode = 0;
-+        for (var i = 0; i < lines.length; i++) {
-+            var line = lines[i];
-+            if (mode === 0) {
-+                if (/\/\/ ESM-comment-begin/.test(line)) {
-+                    mode = 1;
-+                    continue;
-+                }
-+                if (/\/\/ ESM-uncomment-begin/.test(line)) {
-+                    mode = 2;
-+                    continue;
-+                }
-+                continue;
-+            }
-+            if (mode === 1) {
-+                if (/\/\/ ESM-comment-end/.test(line)) {
-+                    mode = 0;
-+                    continue;
-+                }
-+                lines[i] = '// ' + line;
-+                continue;
-+            }
-+            if (mode === 2) {
-+                if (/\/\/ ESM-uncomment-end/.test(line)) {
-+                    mode = 0;
-+                    continue;
-+                }
-+                lines[i] = line.replace(/^(\s*)\/\/ ?/, function (_, indent) {
-+                    return indent;
-+                });
-+            }
-+        }
-+        return lines.join('\n');
-+    };
-+    var write = function (filePath, contents) {
-+        var absoluteFilePath;
-+        if (/\.ts$/.test(filePath)) {
-+            absoluteFilePath = path.join(OUT_FOLDER, filePath);
-+        }
-+        else {
-+            absoluteFilePath = path.join(OUT_RESOURCES_FOLDER, filePath);
-+        }
-+        createDirectoryRecursive(path.dirname(absoluteFilePath));
-+        if (/(\.ts$)|(\.js$)/.test(filePath)) {
-+            contents = toggleComments(contents.toString());
-+        }
-+        fs.writeFileSync(absoluteFilePath, contents);
-+    };
-+    options.entryPoints.forEach(function (entryPoint) { return enqueue(entryPoint); });
-+    while (queue.length > 0) {
-+        var module_1 = queue.shift();
-+        if (transportCSS(options, module_1, enqueue, write)) {
-+            continue;
-+        }
-+        if (transportResource(options, module_1, enqueue, write)) {
-+            continue;
-+        }
-+        if (transportDTS(options, module_1, enqueue, write)) {
-+            continue;
-+        }
-+        var filename = void 0;
-+        if (options.redirects[module_1]) {
-+            filename = path.join(SRC_DIR, options.redirects[module_1] + '.ts');
-+        }
-+        else {
-+            filename = path.join(SRC_DIR, module_1 + '.ts');
-+        }
-+        var fileContents = fs.readFileSync(filename).toString();
-+        var info = ts.preProcessFile(fileContents);
-+        for (var i = info.importedFiles.length - 1; i >= 0; i--) {
-+            var importedFilename = info.importedFiles[i].fileName;
-+            var pos = info.importedFiles[i].pos;
-+            var end = info.importedFiles[i].end;
-+            var importedFilepath = void 0;
-+            if (/^vs\/css!/.test(importedFilename)) {
-+                importedFilepath = importedFilename.substr('vs/css!'.length) + '.css';
-+            }
-+            else {
-+                importedFilepath = importedFilename;
-+            }
-+            if (/(^\.\/)|(^\.\.\/)/.test(importedFilepath)) {
-+                importedFilepath = path.join(path.dirname(module_1), importedFilepath);
-+            }
-+            enqueue(importedFilepath);
-+            var relativePath = void 0;
-+            if (importedFilepath === path.dirname(module_1)) {
-+                relativePath = '../' + path.basename(path.dirname(module_1));
-+            }
-+            else if (importedFilepath === path.dirname(path.dirname(module_1))) {
-+                relativePath = '../../' + path.basename(path.dirname(path.dirname(module_1)));
-+            }
-+            else {
-+                relativePath = path.relative(path.dirname(module_1), importedFilepath);
-+            }
-+            if (!/(^\.\/)|(^\.\.\/)/.test(relativePath)) {
-+                relativePath = './' + relativePath;
-+            }
-+            fileContents = (fileContents.substring(0, pos + 1)
-+                + relativePath
-+                + fileContents.substring(end + 1));
-+        }
-+        fileContents = fileContents.replace(/import ([a-zA-z0-9]+) = require\(('[^']+')\);/g, function (_, m1, m2) {
-+            return "import * as " + m1 + " from " + m2 + ";";
-+        });
-+        fileContents = fileContents.replace(/Thenable/g, 'PromiseLike');
-+        write(module_1 + '.ts', fileContents);
-+    }
-+    var esm_opts = {
-+        "compilerOptions": {
-+            "outDir": path.relative(path.dirname(OUT_FOLDER), OUT_RESOURCES_FOLDER),
-+            "rootDir": "src",
-+            "module": "es6",
-+            "target": "es5",
-+            "experimentalDecorators": true,
-+            "lib": [
-+                "dom",
-+                "es5",
-+                "es2015.collection",
-+                "es2015.promise"
-+            ],
-+            "types": []
-+        }
-+    };
-+    fs.writeFileSync(path.join(path.dirname(OUT_FOLDER), 'tsconfig.json'), JSON.stringify(esm_opts, null, '\t'));
-+    var monacodts = fs.readFileSync(path.join(SRC_DIR, 'vs/monaco.d.ts')).toString();
-+    fs.writeFileSync(path.join(OUT_FOLDER, 'vs/monaco.d.ts'), monacodts);
-+}
-+exports.createESMSourcesAndResources = createESMSourcesAndResources;
-+function transportCSS(options, module, enqueue, write) {
-+>>>>>>> .their
-     if (!/\.css/.test(module)) {
-         return false;
-     }
-@@ -245,10 +413,17 @@
-     var fileContents = fs.readFileSync(filename).toString();
-     var inlineResources = 'base64'; // see https://github.com/Microsoft/monaco-editor/issues/148
-     var inlineResourcesLimit = 300000; //3000; // see https://github.com/Microsoft/monaco-editor/issues/336
-+<<<<<<< .our
-     var newContents = _rewriteOrInlineUrls(fileContents, inlineResources === 'base64', inlineResourcesLimit);
-     write(module, newContents);
-     return true;
-     function _rewriteOrInlineUrls(contents, forceBase64, inlineByteLimit) {
-+=======
-+    var newContents = _rewriteOrInlineUrls(filename, fileContents, inlineResources === 'base64', inlineResourcesLimit);
-+    write(module, newContents);
-+    return true;
-+    function _rewriteOrInlineUrls(originalFileFSPath, contents, forceBase64, inlineByteLimit) {
-+>>>>>>> .their
-         return _replaceURL(contents, function (url) {
-             var imagePath = path.join(path.dirname(module), url);
-             var fileContents = fs.readFileSync(path.join(SRC_DIR, imagePath));
-@@ -305,3 +480,30 @@
-         return haystack.length >= needle.length && haystack.substr(0, needle.length) === needle;
-     }
- }
-+<<<<<<< .our
-+=======
-+function transportResource(options, module, enqueue, write) {
-+    if (!/\.svg/.test(module)) {
-+        return false;
-+    }
-+    write(module, fs.readFileSync(path.join(SRC_DIR, module)));
-+    return true;
-+}
-+function transportDTS(options, module, enqueue, write) {
-+    if (options.redirects[module] && fs.existsSync(path.join(SRC_DIR, options.redirects[module] + '.ts'))) {
-+        return false;
-+    }
-+    if (!fs.existsSync(path.join(SRC_DIR, module + '.d.ts'))) {
-+        return false;
-+    }
-+    write(module + '.d.ts', fs.readFileSync(path.join(SRC_DIR, module + '.d.ts')));
-+    var filename;
-+    if (options.redirects[module]) {
-+        write(module + '.js', fs.readFileSync(path.join(SRC_DIR, options.redirects[module] + '.js')));
-+    }
-+    else {
-+        write(module + '.js', fs.readFileSync(path.join(SRC_DIR, module + '.js')));
-+    }
-+    return true;
-+}
-+>>>>>>> .their
-added in both
-  our    100644 621b4aea6d488b834c7bbf8a2a0fbee100ad979e build/lib/standalone.ts
-  their  100644 a402cf684056477a5fb344fcc16d5d5bbcc39a99 build/lib/standalone.ts
-@@ -6,6 +6,7 @@
- import * as ts from 'typescript';
- import * as fs from 'fs';
- import * as path from 'path';
-+<<<<<<< .our
- import * as tss from './treeshaking';
- 
- const REPO_ROOT = path.join(__dirname, '../../');
-@@ -273,6 +274,201 @@
- }
- 
- function transportCSS(module: string, enqueue: (module: string) => void, write: (path: string, contents: string | Buffer) => void): boolean {
-+=======
-+
-+const REPO_ROOT = path.join(__dirname, '../../');
-+const SRC_DIR = path.join(REPO_ROOT, 'src');
-+const OUT_EDITOR = path.join(REPO_ROOT, 'out-editor');
-+
-+export interface IOptions {
-+	entryPoints: string[];
-+	outFolder: string;
-+	outResourcesFolder: string;
-+	redirects: { [module: string]: string; };
-+}
-+
-+export function createESMSourcesAndResources(options: IOptions): void {
-+	const OUT_FOLDER = path.join(REPO_ROOT, options.outFolder);
-+	const OUT_RESOURCES_FOLDER = path.join(REPO_ROOT, options.outResourcesFolder);
-+
-+	let in_queue: { [module: string]: boolean; } = Object.create(null);
-+	let queue: string[] = [];
-+
-+	const enqueue = (module: string) => {
-+		if (in_queue[module]) {
-+			return;
-+		}
-+		in_queue[module] = true;
-+		queue.push(module);
-+	};
-+
-+	const seenDir: { [key: string]: boolean; } = {};
-+	const createDirectoryRecursive = (dir: string) => {
-+		if (seenDir[dir]) {
-+			return;
-+		}
-+
-+		let lastSlash = dir.lastIndexOf('/');
-+		if (lastSlash === -1) {
-+			lastSlash = dir.lastIndexOf('\\');
-+		}
-+		if (lastSlash !== -1) {
-+			createDirectoryRecursive(dir.substring(0, lastSlash));
-+		}
-+		seenDir[dir] = true;
-+		try { fs.mkdirSync(dir); } catch (err) { }
-+	};
-+
-+	seenDir[REPO_ROOT] = true;
-+
-+	const toggleComments = (fileContents: string) => {
-+		let lines = fileContents.split(/\r\n|\r|\n/);
-+		let mode = 0;
-+		for (let i = 0; i < lines.length; i++) {
-+			const line = lines[i];
-+
-+			if (mode === 0) {
-+				if (/\/\/ ESM-comment-begin/.test(line)) {
-+					mode = 1;
-+					continue;
-+				}
-+				if (/\/\/ ESM-uncomment-begin/.test(line)) {
-+					mode = 2;
-+					continue;
-+				}
-+				continue;
-+			}
-+
-+			if (mode === 1) {
-+				if (/\/\/ ESM-comment-end/.test(line)) {
-+					mode = 0;
-+					continue;
-+				}
-+				lines[i] = '// ' + line;
-+				continue;
-+			}
-+
-+			if (mode === 2) {
-+				if (/\/\/ ESM-uncomment-end/.test(line)) {
-+					mode = 0;
-+					continue;
-+				}
-+				lines[i] = line.replace(/^(\s*)\/\/ ?/, function (_, indent) {
-+					return indent;
-+				});
-+			}
-+		}
-+
-+		return lines.join('\n');
-+	};
-+
-+	const write = (filePath: string, contents: string | Buffer) => {
-+		let absoluteFilePath: string;
-+		if (/\.ts$/.test(filePath)) {
-+			absoluteFilePath = path.join(OUT_FOLDER, filePath);
-+		} else {
-+			absoluteFilePath = path.join(OUT_RESOURCES_FOLDER, filePath);
-+		}
-+		createDirectoryRecursive(path.dirname(absoluteFilePath));
-+		if (/(\.ts$)|(\.js$)/.test(filePath)) {
-+			contents = toggleComments(contents.toString());
-+		}
-+		fs.writeFileSync(absoluteFilePath, contents);
-+	};
-+
-+	options.entryPoints.forEach((entryPoint) => enqueue(entryPoint));
-+
-+	while (queue.length > 0) {
-+		const module = queue.shift();
-+		if (transportCSS(options, module, enqueue, write)) {
-+			continue;
-+		}
-+		if (transportResource(options, module, enqueue, write)) {
-+			continue;
-+		}
-+		if (transportDTS(options, module, enqueue, write)) {
-+			continue;
-+		}
-+
-+		let filename: string;
-+		if (options.redirects[module]) {
-+			filename = path.join(SRC_DIR, options.redirects[module] + '.ts');
-+		} else {
-+			filename = path.join(SRC_DIR, module + '.ts');
-+		}
-+		let fileContents = fs.readFileSync(filename).toString();
-+
-+		const info = ts.preProcessFile(fileContents);
-+
-+		for (let i = info.importedFiles.length - 1; i >= 0; i--) {
-+			const importedFilename = info.importedFiles[i].fileName;
-+			const pos = info.importedFiles[i].pos;
-+			const end = info.importedFiles[i].end;
-+
-+			let importedFilepath: string;
-+			if (/^vs\/css!/.test(importedFilename)) {
-+				importedFilepath = importedFilename.substr('vs/css!'.length) + '.css';
-+			} else {
-+				importedFilepath = importedFilename;
-+			}
-+			if (/(^\.\/)|(^\.\.\/)/.test(importedFilepath)) {
-+				importedFilepath = path.join(path.dirname(module), importedFilepath);
-+			}
-+
-+			enqueue(importedFilepath);
-+
-+			let relativePath: string;
-+			if (importedFilepath === path.dirname(module)) {
-+				relativePath = '../' + path.basename(path.dirname(module));
-+			} else if (importedFilepath === path.dirname(path.dirname(module))) {
-+				relativePath = '../../' + path.basename(path.dirname(path.dirname(module)));
-+			} else {
-+				relativePath = path.relative(path.dirname(module), importedFilepath);
-+			}
-+			if (!/(^\.\/)|(^\.\.\/)/.test(relativePath)) {
-+				relativePath = './' + relativePath;
-+			}
-+			fileContents = (
-+				fileContents.substring(0, pos + 1)
-+				+ relativePath
-+				+ fileContents.substring(end + 1)
-+			);
-+		}
-+
-+		fileContents = fileContents.replace(/import ([a-zA-z0-9]+) = require\(('[^']+')\);/g, function (_, m1, m2) {
-+			return `import * as ${m1} from ${m2};`;
-+		});
-+		fileContents = fileContents.replace(/Thenable/g, 'PromiseLike');
-+
-+		write(module + '.ts', fileContents);
-+	}
-+
-+	const esm_opts = {
-+		"compilerOptions": {
-+			"outDir": path.relative(path.dirname(OUT_FOLDER), OUT_RESOURCES_FOLDER),
-+			"rootDir": "src",
-+			"module": "es6",
-+			"target": "es5",
-+			"experimentalDecorators": true,
-+			"lib": [
-+				"dom",
-+				"es5",
-+				"es2015.collection",
-+				"es2015.promise"
-+			],
-+			"types": [
-+			]
-+		}
-+	};
-+	fs.writeFileSync(path.join(path.dirname(OUT_FOLDER), 'tsconfig.json'), JSON.stringify(esm_opts, null, '\t'));
-+
-+	const monacodts = fs.readFileSync(path.join(SRC_DIR, 'vs/monaco.d.ts')).toString();
-+	fs.writeFileSync(path.join(OUT_FOLDER, 'vs/monaco.d.ts'), monacodts);
-+
-+}
-+
-+function transportCSS(options: IOptions, module: string, enqueue: (module: string) => void, write: (path: string, contents: string | Buffer) => void): boolean {
-+>>>>>>> .their
- 
- 	if (!/\.css/.test(module)) {
- 		return false;
-@@ -283,11 +479,19 @@
- 	const inlineResources = 'base64'; // see https://github.com/Microsoft/monaco-editor/issues/148
- 	const inlineResourcesLimit = 300000;//3000; // see https://github.com/Microsoft/monaco-editor/issues/336
- 
-+<<<<<<< .our
- 	const newContents = _rewriteOrInlineUrls(fileContents, inlineResources === 'base64', inlineResourcesLimit);
- 	write(module, newContents);
- 	return true;
- 
- 	function _rewriteOrInlineUrls(contents: string, forceBase64: boolean, inlineByteLimit: number): string {
-+=======
-+	const newContents = _rewriteOrInlineUrls(filename, fileContents, inlineResources === 'base64', inlineResourcesLimit);
-+	write(module, newContents);
-+	return true;
-+
-+	function _rewriteOrInlineUrls(originalFileFSPath: string, contents: string, forceBase64: boolean, inlineByteLimit: number): string {
-+>>>>>>> .their
- 		return _replaceURL(contents, (url) => {
- 			let imagePath = path.join(path.dirname(module), url);
- 			let fileContents = fs.readFileSync(path.join(SRC_DIR, imagePath));
-@@ -347,3 +551,36 @@
- 		return haystack.length >= needle.length && haystack.substr(0, needle.length) === needle;
- 	}
- }
-+<<<<<<< .our
-+=======
-+
-+function transportResource(options: IOptions, module: string, enqueue: (module: string) => void, write: (path: string, contents: string | Buffer) => void): boolean {
-+
-+	if (!/\.svg/.test(module)) {
-+		return false;
-+	}
-+
-+	write(module, fs.readFileSync(path.join(SRC_DIR, module)));
-+	return true;
-+}
-+
-+function transportDTS(options: IOptions, module: string, enqueue: (module: string) => void, write: (path: string, contents: string | Buffer) => void): boolean {
-+
-+	if (options.redirects[module] && fs.existsSync(path.join(SRC_DIR, options.redirects[module] + '.ts'))) {
-+		return false;
-+	}
-+
-+	if (!fs.existsSync(path.join(SRC_DIR, module + '.d.ts'))) {
-+		return false;
-+	}
-+
-+	write(module + '.d.ts', fs.readFileSync(path.join(SRC_DIR, module + '.d.ts')));
-+	let filename: string;
-+	if (options.redirects[module]) {
-+		write(module + '.js', fs.readFileSync(path.join(SRC_DIR, options.redirects[module] + '.js')));
-+	} else {
-+		write(module + '.js', fs.readFileSync(path.join(SRC_DIR, module + '.js')));
-+	}
-+	return true;
-+}
-+>>>>>>> .their
-changed in both
-  base   100644 c3c04a5aa56f8d6f827b387f7ba17b800772e2ad build/monaco/monaco.d.ts.recipe
-  our    100644 bebfe72348463fbdce9848d9655a5909083f9f7d build/monaco/monaco.d.ts.recipe
-  their  100644 84d517fc8bb6214add478b5a2333f22347f561b0 build/monaco/monaco.d.ts.recipe
-changed in both
-  base   100644 40cd4f1e2724d3e8cd5b884d4cd8e8af06a2fde4 build/monaco/package.json
-  our    100644 efd919085b2ffc82da8d810c609a9ed217bffb35 build/monaco/package.json
-  their  100644 958b4ee71c30f185a67b324d57f83a50c374a251 build/monaco/package.json
-@@ -1,11 +1,18 @@
- {
-   "name": "monaco-editor-core",
-   "private": true,
-+<<<<<<< .our
-   "version": "0.14.3",
-   "description": "A browser based code editor",
-   "author": "Microsoft Corporation",
-   "license": "MIT",
-   "typings": "./esm/vs/editor/editor.api.d.ts",
-+=======
-+  "version": "0.11.7",
-+  "description": "A browser based code editor",
-+  "author": "Microsoft Corporation",
-+  "license": "MIT",
-+>>>>>>> .their
-   "module": "./esm/vs/editor/editor.main.js",
-   "repository": {
-     "type": "git",
-changed in both
-  base   100644 372ec24968768ca6a040f44a9e2e25ff01d213ff extensions/html/language-configuration.json
-  our    100644 191f54303f197c9c018fd5750183d76233682bbc extensions/html/language-configuration.json
-  their  100644 79ce9f9ce41a4769cfe2e19dda4685d410621c0e extensions/html/language-configuration.json
-changed in both
-  base   100644 3b8d0cb9e28a4eb4ebfc7aa2e6237f34134162ca extensions/html/package.json
-  our    100644 5bcc9be5877c773efa5d16e5dc79ee66b4fba518 extensions/html/package.json
-  their  100644 e0f3e9dd3b699b2131c69f50a16e28f8f012ae48 extensions/html/package.json
-removed in local
-  base   100644 25c6b771052d8ef100cb8edd5181982163f8fb7d extensions/markdown/src/features/previewContentProvider.ts
-  their  100644 f0dd43ff28eff8733c5718f2713ef3dcf5e0459f extensions/markdown/src/features/previewContentProvider.ts
-changed in both
-  base   100644 ad57992cc8800b5cee3a3c4c2244972a6ce20567 extensions/npm/src/main.ts
-  our    100644 02e22490fd765e056a1cc1278aaa50055590dce6 extensions/npm/src/main.ts
-  their  100644 00de7090ed1c7b1a23a4491c9d8baba01a51db1e extensions/npm/src/main.ts
-@@ -56,10 +56,35 @@
- 		watcher.onDidCreate((_e) => invalidateScriptCaches());
- 		context.subscriptions.push(watcher);
- 
-+<<<<<<< .our
- 		let provider: vscode.TaskProvider = new NpmTaskProvider(context);
- 		let disposable = vscode.workspace.registerTaskProvider('npm', provider);
- 		context.subscriptions.push(disposable);
- 		return disposable;
-+=======
-+async function readFile(file: string): Promise<string> {
-+	return new Promise<string>((resolve, reject) => {
-+		fs.readFile(file, (err, data) => {
-+			if (err) {
-+				reject(err);
-+			}
-+			resolve(data.toString());
-+		});
-+	});
-+}
-+
-+interface NpmTaskDefinition extends vscode.TaskDefinition {
-+	script: string;
-+	path?: string;
-+}
-+
-+const buildNames: string[] = ['build', 'compile', 'watch'];
-+function isBuildTask(name: string): boolean {
-+	for (let buildName of buildNames) {
-+		if (name.indexOf(buildName) !== -1) {
-+			return true;
-+		}
-+>>>>>>> .their
- 	}
- 	return undefined;
- }
-@@ -93,5 +118,42 @@
- 	httpRequest.configure(httpSettings.get<string>('proxy', ''), httpSettings.get<boolean>('proxyStrictSSL', true));
- }
- 
-+<<<<<<< .our
- export function deactivate(): void {
-+=======
-+function createTask(script: string, cmd: string, folder: vscode.WorkspaceFolder, packageJsonUri: vscode.Uri, matcher?: any): vscode.Task {
-+
-+	function getTaskName(script: string, file: string) {
-+		if (file.length) {
-+			return `${script} - ${file.substring(0, file.length - 1)}`;
-+		}
-+		return script;
-+	}
-+
-+	function getCommandLine(folder: vscode.WorkspaceFolder, cmd: string): string {
-+		let packageManager = vscode.workspace.getConfiguration('npm', folder.uri).get<string>('packageManager', 'npm');
-+		if (vscode.workspace.getConfiguration('npm', folder.uri).get<boolean>('runSilent')) {
-+			return `${packageManager} --silent ${cmd}`;
-+		}
-+		return `${packageManager} ${cmd}`;
-+	}
-+
-+	function getRelativePath(folder: vscode.WorkspaceFolder, packageJsonUri: vscode.Uri): string {
-+		let rootUri = folder.uri;
-+		let absolutePath = packageJsonUri.path.substring(0, packageJsonUri.path.length - 'package.json'.length);
-+		return absolutePath.substring(rootUri.path.length + 1);
-+	}
-+
-+	let kind: NpmTaskDefinition = {
-+		type: 'npm',
-+		script: script
-+	};
-+	let relativePackageJson = getRelativePath(folder, packageJsonUri);
-+	if (relativePackageJson.length) {
-+		kind.path = getRelativePath(folder, packageJsonUri);
-+	}
-+	let taskName = getTaskName(script, relativePackageJson);
-+	let cwd = path.dirname(packageJsonUri.fsPath);
-+	return new vscode.Task(kind, folder, taskName, 'npm', new vscode.ShellExecution(getCommandLine(folder, cmd), { cwd: cwd }), matcher);
-+>>>>>>> .their
- }
-changed in both
-  base   100644 1d58887f40316ffdcab65672835f088a62a234c9 src/vs/base/browser/ui/list/listWidget.ts
-  our    100644 efaf1d52986f5302740f76831d1a7b5015bc7068 src/vs/base/browser/ui/list/listWidget.ts
-  their  100644 040362bf372cbc4b7d55220e699421e0d28fbb9a src/vs/base/browser/ui/list/listWidget.ts
-changed in both
-  base   100644 46bf06ccb39eb8d696add1d5d6ee141395427243 src/vs/base/browser/ui/octiconLabel/octiconLabel.mock.ts
-  our    100644 7fb29670d641afcf239c0548b050fb6e7ca41b01 src/vs/base/browser/ui/octiconLabel/octiconLabel.mock.ts
-  their  100644 4b628e632f6a8598ff062217a4430f8d5cf8b5bb src/vs/base/browser/ui/octiconLabel/octiconLabel.mock.ts
-@@ -2,10 +2,16 @@
-  *  Copyright (c) Microsoft Corporation. All rights reserved.
-  *  Licensed under the MIT License. See License.txt in the project root for license information.
-  *--------------------------------------------------------------------------------------------*/
-+<<<<<<< .our
- 
- import { escape } from 'vs/base/common/strings';
- 
- export function renderOcticons(text: string): string {
-+=======
-+import { escape } from 'vs/base/common/strings';
-+
-+export function render(text: string): string {
-+>>>>>>> .their
- 	return escape(text);
- }
- 
-changed in both
-  base   100644 cbe277dfb2927f69860c571c89c12f70acfcda24 src/vs/base/common/marked/marked.js
-  our    100644 92e7aaa8b53f82fdc2edda3996a1ce79f0235734 src/vs/base/common/marked/marked.js
-  their  100644 11d29ced080533e22539452105ec49258a336fd1 src/vs/base/common/marked/marked.js
-@@ -1,13 +1,21 @@
- /**
-  * marked - a markdown parser
-  * Copyright (c) 2011-2014, Christopher Jeffrey. (MIT Licensed)
-+<<<<<<< .our
-  * https://github.com/markedjs/marked
-+=======
-+ * https://github.com/chjj/marked
-+>>>>>>> .their
-  */
- 
- var __marked_exports;
- 
-+<<<<<<< .our
- ; (function (root) {
- 'use strict';
-+=======
-+(function() {
-+>>>>>>> .their
- 
- /**
-  * Block-Level Grammar
-@@ -18,6 +26,7 @@
-   code: /^( {4}[^\n]+\n*)+/,
-   fences: noop,
-   hr: /^ {0,3}((?:- *){3,}|(?:_ *){3,}|(?:\* *){3,})(?:\n+|$)/,
-+<<<<<<< .our
-   heading: /^ *(#{1,6}) *([^\n]+?) *(?:#+ *)?(?:\n+|$)/,
-   nptable: noop,
-   blockquote: /^( {0,3}> ?(paragraph|[^\n]*)(?:\n|$))+/,
-@@ -81,6 +90,61 @@
- block.blockquote = edit(block.blockquote)
-   .replace('paragraph', block.paragraph)
-   .getRegex();
-+=======
-+  heading: /^ *(#{1,6}) *([^\n]+?) *#* *(?:\n+|$)/,
-+  nptable: noop,
-+  blockquote: /^( {0,3}> ?(paragraph|[^\n]*)(?:\n|$))+/,
-+  list: /^( *)(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/,
-+  html: /^ *(?:comment *(?:\n|\s*$)|closed *(?:\n{2,}|\s*$)|closing *(?:\n{2,}|\s*$))/,
-+  def: /^ {0,3}\[(label)\]: *\n? *<?([^\s>]+)>?(?:(?: +\n? *| *\n *)(title))? *(?:\n+|$)/,
-+  table: noop,
-+  lheading: /^([^\n]+)\n *(=|-){2,} *(?:\n+|$)/,
-+  paragraph: /^([^\n]+(?:\n?(?!hr|heading|lheading| {0,3}>|tag)[^\n]+)+)/,
-+  text: /^[^\n]+/
-+};
-+
-+block._label = /(?:\\[\[\]]|[^\[\]])+/;
-+block._title = /(?:"(?:\\"|[^"]|"[^"\n]*")*"|'\n?(?:[^'\n]+\n?)*'|\([^()]*\))/;
-+block.def = replace(block.def)
-+  ('label', block._label)
-+  ('title', block._title)
-+  ();
-+
-+block.bullet = /(?:[*+-]|\d+\.)/;
-+block.item = /^( *)(bull) [^\n]*(?:\n(?!\1bull )[^\n]*)*/;
-+block.item = replace(block.item, 'gm')
-+  (/bull/g, block.bullet)
-+  ();
-+
-+block.list = replace(block.list)
-+  (/bull/g, block.bullet)
-+  ('hr', '\\n+(?=\\1?(?:(?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$))')
-+  ('def', '\\n+(?=' + block.def.source + ')')
-+  ();
-+
-+block._tag = '(?!(?:'
-+  + 'a|em|strong|small|s|cite|q|dfn|abbr|data|time|code'
-+  + '|var|samp|kbd|sub|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo'
-+  + '|span|br|wbr|ins|del|img)\\b)\\w+(?!:|[^\\w\\s@]*@)\\b';
-+
-+block.html = replace(block.html)
-+  ('comment', /<!--[\s\S]*?-->/)
-+  ('closed', /<(tag)[\s\S]+?<\/\1>/)
-+  ('closing', /<tag(?:"[^"]*"|'[^']*'|\s[^'"\/>]*)*?\/?>/)
-+  (/tag/g, block._tag)
-+  ();
-+
-+block.paragraph = replace(block.paragraph)
-+  ('hr', block.hr)
-+  ('heading', block.heading)
-+  ('lheading', block.lheading)
-+  ('tag', '<' + block._tag)
-+  ();
-+
-+block.blockquote = replace(block.blockquote)
-+  ('paragraph', block.paragraph)
-+  ();
-+>>>>>>> .their
- 
- /**
-  * Normal Block Grammar
-@@ -98,17 +162,26 @@
-   heading: /^ *(#{1,6}) +([^\n]+?) *#* *(?:\n+|$)/
- });
- 
-+<<<<<<< .our
- block.gfm.paragraph = edit(block.paragraph)
-   .replace('(?!', '(?!'
-     + block.gfm.fences.source.replace('\\1', '\\2') + '|'
-     + block.list.source.replace('\\1', '\\3') + '|')
-   .getRegex();
-+=======
-+block.gfm.paragraph = replace(block.paragraph)
-+  ('(?!', '(?!'
-+  + block.gfm.fences.source.replace('\\1', '\\2') + '|'
-+  + block.list.source.replace('\\1', '\\3') + '|')
-+  ();
-+>>>>>>> .their
- 
- /**
-  * GFM + Tables Block Grammar
-  */
- 
- block.tables = merge({}, block.gfm, {
-+<<<<<<< .our
-   nptable: /^ *([^|\n ].*\|.*)\n *([-:]+ *\|[-| :]*)(?:\n((?:.*[^>\n ].*(?:\n|$))*)\n*|$)/,
-   table: /^ *\|(.+)\n *\|?( *[-:]+[-| :]*)(?:\n((?: *[^>\n ].*(?:\n|$))*)\n*|$)/
- });
-@@ -129,6 +202,10 @@
-       + '\\b)\\w+(?!:|[^\\w\\s@]*@)\\b')
-     .getRegex(),
-   def: /^ *\[([^\]]+)\]: *<?([^\s>]+)>?(?: +(["(][^\n]+[")]))? *(?:\n+|$)/
-+=======
-+  nptable: /^ *(\S.*\|.*)\n *([-:]+ *\|[-| :]*)\n((?:.*\|.*(?:\n|$))*)\n*/,
-+  table: /^ *\|(.+)\n *\|( *[-:]+[-| :]*)\n((?: *\|.*(?:\n|$))*)\n*/
-+>>>>>>> .their
- });
- 
- /**
-@@ -141,9 +218,13 @@
-   this.options = options || marked.defaults;
-   this.rules = block.normal;
- 
-+<<<<<<< .our
-   if (this.options.pedantic) {
-     this.rules = block.pedantic;
-   } else if (this.options.gfm) {
-+=======
-+  if (this.options.gfm) {
-+>>>>>>> .their
-     if (this.options.tables) {
-       this.rules = block.tables;
-     } else {
-@@ -162,7 +243,11 @@
-  * Static Lex Method
-  */
- 
-+<<<<<<< .our
- Lexer.lex = function(src, options) {
-+=======
-+Lexer.lex = function (src, options) {
-+>>>>>>> .their
-   var lexer = new Lexer(options);
-   return lexer.lex(src);
- };
-@@ -171,7 +256,11 @@
-  * Preprocessing
-  */
- 
-+<<<<<<< .our
- Lexer.prototype.lex = function(src) {
-+=======
-+Lexer.prototype.lex = function (src) {
-+>>>>>>> .their
-   src = src
-     .replace(/\r\n|\r/g, '\n')
-     .replace(/\t/g, '    ')
-@@ -185,6 +274,7 @@
-  * Lexing
-  */
- 
-+<<<<<<< .our
- Lexer.prototype.token = function(src, top) {
-   src = src.replace(/^ +$/gm, '');
-   var next,
-@@ -200,6 +290,20 @@
-       isordered,
-       istask,
-       ischecked;
-+=======
-+Lexer.prototype.token = function (src, top) {
-+  var src = src.replace(/^ +$/gm, '')
-+    , next
-+    , loose
-+    , cap
-+    , bull
-+    , b
-+    , item
-+    , space
-+    , i
-+    , tag
-+    , l;
-+>>>>>>> .their
- 
-   while (src) {
-     // newline
-@@ -219,7 +323,11 @@
-       this.tokens.push({
-         type: 'code',
-         text: !this.options.pedantic
-+<<<<<<< .our
-           ? rtrim(cap, '\n')
-+=======
-+          ? cap.replace(/\n+$/, '')
-+>>>>>>> .their
-           : cap
-       });
-       continue;
-@@ -249,6 +357,7 @@
- 
-     // table no leading pipe (gfm)
-     if (top && (cap = this.rules.nptable.exec(src))) {
-+<<<<<<< .our
-       item = {
-         type: 'table',
-         header: splitCells(cap[1].replace(/^ *| *\| *$/g, '')),
-@@ -279,6 +388,36 @@
- 
-         continue;
-       }
-+=======
-+      src = src.substring(cap[0].length);
-+
-+      item = {
-+        type: 'table',
-+        header: cap[1].replace(/^ *| *\| *$/g, '').split(/ *\| */),
-+        align: cap[2].replace(/^ *|\| *$/g, '').split(/ *\| */),
-+        cells: cap[3].replace(/\n$/, '').split('\n')
-+      };
-+
-+      for (i = 0; i < item.align.length; i++) {
-+        if (/^ *-+: *$/.test(item.align[i])) {
-+          item.align[i] = 'right';
-+        } else if (/^ *:-+: *$/.test(item.align[i])) {
-+          item.align[i] = 'center';
-+        } else if (/^ *:-+ *$/.test(item.align[i])) {
-+          item.align[i] = 'left';
-+        } else {
-+          item.align[i] = null;
-+        }
-+      }
-+
-+      for (i = 0; i < item.cells.length; i++) {
-+        item.cells[i] = item.cells[i].split(/ *\| */);
-+      }
-+
-+      this.tokens.push(item);
-+
-+      continue;
-+>>>>>>> .their
-     }
- 
-     // hr
-@@ -316,12 +455,19 @@
-     if (cap = this.rules.list.exec(src)) {
-       src = src.substring(cap[0].length);
-       bull = cap[2];
-+<<<<<<< .our
-       isordered = bull.length > 1;
- 
-       this.tokens.push({
-         type: 'list_start',
-         ordered: isordered,
-         start: isordered ? +bull : ''
-+=======
-+
-+      this.tokens.push({
-+        type: 'list_start',
-+        ordered: bull.length > 1
-+>>>>>>> .their
-       });
- 
-       // Get each top-level item.
-@@ -367,6 +513,7 @@
-           if (!loose) loose = next;
-         }
- 
-+<<<<<<< .our
-         // Check for task list items
-         istask = /^\[[ xX]\] /.test(item);
-         ischecked = undefined;
-@@ -381,6 +528,12 @@
-             : 'list_item_start',
-           task: istask,
-           checked: ischecked
-+=======
-+        this.tokens.push({
-+          type: loose
-+            ? 'loose_item_start'
-+            : 'list_item_start'
-+>>>>>>> .their
-         });
- 
-         // Recurse.
-@@ -416,7 +569,11 @@
-     if (top && (cap = this.rules.def.exec(src))) {
-       src = src.substring(cap[0].length);
-       if (cap[3]) cap[3] = cap[3].substring(1, cap[3].length - 1);
-+<<<<<<< .our
-       tag = cap[1].toLowerCase().replace(/\s+/g, ' ');
-+=======
-+      tag = cap[1].toLowerCase();
-+>>>>>>> .their
-       if (!this.tokens.links[tag]) {
-         this.tokens.links[tag] = {
-           href: cap[2],
-@@ -428,6 +585,7 @@
- 
-     // table (gfm)
-     if (top && (cap = this.rules.table.exec(src))) {
-+<<<<<<< .our
-       item = {
-         type: 'table',
-         header: splitCells(cap[1].replace(/^ *| *\| *$/g, '')),
-@@ -460,6 +618,38 @@
- 
-         continue;
-       }
-+=======
-+      src = src.substring(cap[0].length);
-+
-+      item = {
-+        type: 'table',
-+        header: cap[1].replace(/^ *| *\| *$/g, '').split(/ *\| */),
-+        align: cap[2].replace(/^ *|\| *$/g, '').split(/ *\| */),
-+        cells: cap[3].replace(/(?: *\| *)?\n$/, '').split('\n')
-+      };
-+
-+      for (i = 0; i < item.align.length; i++) {
-+        if (/^ *-+: *$/.test(item.align[i])) {
-+          item.align[i] = 'right';
-+        } else if (/^ *:-+: *$/.test(item.align[i])) {
-+          item.align[i] = 'center';
-+        } else if (/^ *:-+ *$/.test(item.align[i])) {
-+          item.align[i] = 'left';
-+        } else {
-+          item.align[i] = null;
-+        }
-+      }
-+
-+      for (i = 0; i < item.cells.length; i++) {
-+        item.cells[i] = item.cells[i]
-+          .replace(/^ *\| *| *\| *$/g, '')
-+          .split(/ *\| */);
-+      }
-+
-+      this.tokens.push(item);
-+
-+      continue;
-+>>>>>>> .their
-     }
- 
-     // lheading
-@@ -497,7 +687,12 @@
-     }
- 
-     if (src) {
-+<<<<<<< .our
-       throw new Error('Infinite loop on byte: ' + src.charCodeAt(0));
-+=======
-+      throw new
-+        Error('Infinite loop on byte: ' + src.charCodeAt(0));
-+>>>>>>> .their
-     }
-   }
- 
-@@ -509,6 +704,7 @@
-  */
- 
- var inline = {
-+<<<<<<< .our
-   escape: /^\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/,
-   autolink: /^<(scheme:[^\s\x00-\x1f<>]*|email)>/,
-   url: noop,
-@@ -524,11 +720,24 @@
-   strong: /^__([^\s][\s\S]*?[^\s])__(?!_)|^\*\*([^\s][\s\S]*?[^\s])\*\*(?!\*)|^__([^\s])__(?!_)|^\*\*([^\s])\*\*(?!\*)/,
-   em: /^_([^\s][\s\S]*?[^\s_])_(?!_)|^_([^\s_][\s\S]*?[^\s])_(?!_)|^\*([^\s][\s\S]*?[^\s*])\*(?!\*)|^\*([^\s*][\s\S]*?[^\s])\*(?!\*)|^_([^\s_])_(?!_)|^\*([^\s*])\*(?!\*)/,
-   code: /^(`+)\s*([\s\S]*?[^`]?)\s*\1(?!`)/,
-+=======
-+  escape: /^\\([\\`*{}\[\]()#+\-.!_>])/,
-+  autolink: /^<(scheme:[^\s\x00-\x1f<>]*|email)>/,
-+  url: noop,
-+  tag: /^<!--[\s\S]*?-->|^<\/?[a-zA-Z0-9\-]+(?:"[^"]*"|'[^']*'|\s[^<'">\/]*)*?\/?>/,
-+  link: /^!?\[(inside)\]\(href\)/,
-+  reflink: /^!?\[(inside)\]\s*\[([^\]]*)\]/,
-+  nolink: /^!?\[((?:\[[^\]]*\]|\\[\[\]]|[^\[\]])*)\]/,
-+  strong: /^__([\s\S]+?)__(?!_)|^\*\*([\s\S]+?)\*\*(?!\*)/,
-+  em: /^_([^\s_](?:[^_]|__)+?[^\s_])_\b|^\*((?:\*\*|[^*])+?)\*(?!\*)/,
-+  code: /^(`+)(\s*)([\s\S]*?[^`]?)\2\1(?!`)/,
-+>>>>>>> .their
-   br: /^ {2,}\n(?!\s*$)/,
-   del: noop,
-   text: /^[\s\S]+?(?=[\\<!\[`*]|\b_| {2,}\n|$)/
- };
- 
-+<<<<<<< .our
- inline._escapes = /\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/g;
- 
- inline._scheme = /[a-zA-Z][a-zA-Z0-9+.-]{1,31}/;
-@@ -558,6 +767,27 @@
- inline.reflink = edit(inline.reflink)
-   .replace('label', inline._label)
-   .getRegex();
-+=======
-+inline._scheme = /[a-zA-Z][a-zA-Z0-9+.-]{1,31}/;
-+inline._email = /[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+(@)[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+(?![-_])/;
-+
-+inline.autolink = replace(inline.autolink)
-+  ('scheme', inline._scheme)
-+  ('email', inline._email)
-+  ()
-+
-+inline._inside = /(?:\[[^\]]*\]|\\[\[\]]|[^\[\]]|\](?=[^\[]*\]))*/;
-+inline._href = /\s*<?([\s\S]*?)>?(?:\s+['"]([\s\S]*?)['"])?\s*/;
-+
-+inline.link = replace(inline.link)
-+  ('inside', inline._inside)
-+  ('href', inline._href)
-+  ();
-+
-+inline.reflink = replace(inline.reflink)
-+  ('inside', inline._inside)
-+  ();
-+>>>>>>> .their
- 
- /**
-  * Normal Inline Grammar
-@@ -571,6 +801,7 @@
- 
- inline.pedantic = merge({}, inline.normal, {
-   strong: /^__(?=\S)([\s\S]*?\S)__(?!_)|^\*\*(?=\S)([\s\S]*?\S)\*\*(?!\*)/,
-+<<<<<<< .our
-   em: /^_(?=\S)([\s\S]*?\S)_(?!_)|^\*(?=\S)([\s\S]*?\S)\*(?!\*)/,
-   link: edit(/^!?\[(label)\]\((.*?)\)/)
-     .replace('label', inline._label)
-@@ -578,6 +809,9 @@
-   reflink: edit(/^!?\[(label)\]\s*\[([^\]]*)\]/)
-     .replace('label', inline._label)
-     .getRegex()
-+=======
-+  em: /^_(?=\S)([\s\S]*?\S)_(?!_)|^\*(?=\S)([\s\S]*?\S)\*(?!\*)/
-+>>>>>>> .their
- });
- 
- /**
-@@ -585,6 +819,7 @@
-  */
- 
- inline.gfm = merge({}, inline.normal, {
-+<<<<<<< .our
-   escape: edit(inline.escape).replace('])', '~|])').getRegex(),
-   url: edit(/^((?:ftp|https?):\/\/|www\.)(?:[a-zA-Z0-9\-]+\.?)+[^\s<]*|^email/)
-     .replace('email', inline._email)
-@@ -595,6 +830,18 @@
-     .replace(']|', '~]|')
-     .replace('|', '|https?://|ftp://|www\\.|[a-zA-Z0-9.!#$%&\'*+/=?^_`{\\|}~-]+@|')
-     .getRegex()
-+=======
-+  escape: replace(inline.escape)('])', '~|])')(),
-+  url: replace(/^((?:ftp|https?):\/\/|www\.)(?:[a-zA-Z0-9\-]+\.?)+[^\s<]*|^email/)
-+    ('email', inline._email)
-+    (),
-+  _backpedal: /(?:[^?!.,:;*_~()&]+|\([^)]*\)|&(?![a-zA-Z0-9]+;$)|[?!.,:;*_~)]+(?!$))+/,
-+  del: /^~~(?=\S)([\s\S]*?\S)~~/,
-+  text: replace(inline.text)
-+    (']|', '~]|')
-+    ('|', '|https?://|ftp://|www\\.|[a-zA-Z0-9.!#$%&\'*+/=?^_`{\\|}~-]+@|')
-+    ()
-+>>>>>>> .their
- });
- 
- /**
-@@ -602,8 +849,13 @@
-  */
- 
- inline.breaks = merge({}, inline.gfm, {
-+<<<<<<< .our
-   br: edit(inline.br).replace('{2,}', '*').getRegex(),
-   text: edit(inline.gfm.text).replace('{2,}', '*').getRegex()
-+=======
-+  br: replace(inline.br)('{2,}', '*')(),
-+  text: replace(inline.gfm.text)('{2,}', '*')()
-+>>>>>>> .their
- });
- 
- /**
-@@ -614,6 +866,7 @@
-   this.options = options || marked.defaults;
-   this.links = links;
-   this.rules = inline.normal;
-+<<<<<<< .our
-   this.renderer = this.options.renderer || new Renderer();
-   this.renderer.options = this.options;
- 
-@@ -624,11 +877,27 @@
-   if (this.options.pedantic) {
-     this.rules = inline.pedantic;
-   } else if (this.options.gfm) {
-+=======
-+  this.renderer = this.options.renderer || new Renderer;
-+  this.renderer.options = this.options;
-+
-+  if (!this.links) {
-+    throw new
-+      Error('Tokens array requires a `links` property.');
-+  }
-+
-+  if (this.options.gfm) {
-+>>>>>>> .their
-     if (this.options.breaks) {
-       this.rules = inline.breaks;
-     } else {
-       this.rules = inline.gfm;
-     }
-+<<<<<<< .our
-+=======
-+  } else if (this.options.pedantic) {
-+    this.rules = inline.pedantic;
-+>>>>>>> .their
-   }
- }
- 
-@@ -642,7 +911,11 @@
-  * Static Lexing/Compiling Method
-  */
- 
-+<<<<<<< .our
- InlineLexer.output = function(src, links, options) {
-+=======
-+InlineLexer.output = function (src, links, options) {
-+>>>>>>> .their
-   var inline = new InlineLexer(links, options);
-   return inline.output(src);
- };
-@@ -651,6 +924,7 @@
-  * Lexing/Compiling
-  */
- 
-+<<<<<<< .our
- InlineLexer.prototype.output = function(src) {
-   var out = '',
-       link,
-@@ -658,6 +932,14 @@
-       href,
-       title,
-       cap;
-+=======
-+InlineLexer.prototype.output = function (src) {
-+  var out = ''
-+    , link
-+    , text
-+    , href
-+    , cap;
-+>>>>>>> .their
- 
-   while (src) {
-     // escape
-@@ -720,6 +1002,7 @@
-     if (cap = this.rules.link.exec(src)) {
-       src = src.substring(cap[0].length);
-       this.inLink = true;
-+<<<<<<< .our
-       href = cap[2];
-       if (this.options.pedantic) {
-         link = /^([^'"]*[^\s])\s+(['"])(.*)\2/.exec(href);
-@@ -737,6 +1020,11 @@
-       out += this.outputLink(cap, {
-         href: InlineLexer.escapes(href),
-         title: InlineLexer.escapes(title)
-+=======
-+      out += this.outputLink(cap, {
-+        href: cap[2],
-+        title: cap[3]
-+>>>>>>> .their
-       });
-       this.inLink = false;
-       continue;
-@@ -744,7 +1032,11 @@
- 
-     // reflink, nolink
-     if ((cap = this.rules.reflink.exec(src))
-+<<<<<<< .our
-         || (cap = this.rules.nolink.exec(src))) {
-+=======
-+      || (cap = this.rules.nolink.exec(src))) {
-+>>>>>>> .their
-       src = src.substring(cap[0].length);
-       link = (cap[2] || cap[1]).replace(/\s+/g, ' ');
-       link = this.links[link.toLowerCase()];
-@@ -762,21 +1054,33 @@
-     // strong
-     if (cap = this.rules.strong.exec(src)) {
-       src = src.substring(cap[0].length);
-+<<<<<<< .our
-       out += this.renderer.strong(this.output(cap[4] || cap[3] || cap[2] || cap[1]));
-+=======
-+      out += this.renderer.strong(this.output(cap[2] || cap[1]));
-+>>>>>>> .their
-       continue;
-     }
- 
-     // em
-     if (cap = this.rules.em.exec(src)) {
-       src = src.substring(cap[0].length);
-+<<<<<<< .our
-       out += this.renderer.em(this.output(cap[6] || cap[5] || cap[4] || cap[3] || cap[2] || cap[1]));
-+=======
-+      out += this.renderer.em(this.output(cap[2] || cap[1]));
-+>>>>>>> .their
-       continue;
-     }
- 
-     // code
-     if (cap = this.rules.code.exec(src)) {
-       src = src.substring(cap[0].length);
-+<<<<<<< .our
-       out += this.renderer.codespan(escape(cap[2].trim(), true));
-+=======
-+      out += this.renderer.codespan(escape(cap[3].trim(), true));
-+>>>>>>> .their
-       continue;
-     }
- 
-@@ -802,24 +1106,38 @@
-     }
- 
-     if (src) {
-+<<<<<<< .our
-       throw new Error('Infinite loop on byte: ' + src.charCodeAt(0));
-+=======
-+      throw new
-+        Error('Infinite loop on byte: ' + src.charCodeAt(0));
-+>>>>>>> .their
-     }
-   }
- 
-   return out;
- };
- 
-+<<<<<<< .our
- InlineLexer.escapes = function(text) {
-   return text ? text.replace(InlineLexer.rules._escapes, '$1') : text;
- }
- 
-+=======
-+>>>>>>> .their
- /**
-  * Compile Link
-  */
- 
-+<<<<<<< .our
- InlineLexer.prototype.outputLink = function(cap, link) {
-   var href = link.href,
-       title = link.title ? escape(link.title) : null;
-+=======
-+InlineLexer.prototype.outputLink = function (cap, link) {
-+  var href = escape(link.href)
-+    , title = link.title ? escape(link.title) : null;
-+>>>>>>> .their
- 
-   return cap[0].charAt(0) !== '!'
-     ? this.renderer.link(href, title, this.output(cap[1]))
-@@ -830,7 +1148,11 @@
-  * Smartypants Transformations
-  */
- 
-+<<<<<<< .our
- InlineLexer.prototype.smartypants = function(text) {
-+=======
-+InlineLexer.prototype.smartypants = function (text) {
-+>>>>>>> .their
-   if (!this.options.smartypants) return text;
-   return text
-     // em-dashes
-@@ -853,12 +1175,21 @@
-  * Mangle Links
-  */
- 
-+<<<<<<< .our
- InlineLexer.prototype.mangle = function(text) {
-   if (!this.options.mangle) return text;
-   var out = '',
-       l = text.length,
-       i = 0,
-       ch;
-+=======
-+InlineLexer.prototype.mangle = function (text) {
-+  if (!this.options.mangle) return text;
-+  var out = ''
-+    , l = text.length
-+    , i = 0
-+    , ch;
-+>>>>>>> .their
- 
-   for (; i < l; i++) {
-     ch = text.charCodeAt(i);
-@@ -876,10 +1207,17 @@
-  */
- 
- function Renderer(options) {
-+<<<<<<< .our
-   this.options = options || marked.defaults;
- }
- 
- Renderer.prototype.code = function(code, lang, escaped) {
-+=======
-+  this.options = options || {};
-+}
-+
-+Renderer.prototype.code = function (code, lang, escaped) {
-+>>>>>>> .their
-   if (this.options.highlight) {
-     var out = this.options.highlight(code, lang);
-     if (out != null && out !== code) {
-@@ -891,7 +1229,11 @@
-   if (!lang) {
-     return '<pre><code>'
-       + (escaped ? code : escape(code, true))
-+<<<<<<< .our
-       + '</code></pre>';
-+=======
-+      + '\n</code></pre>';
-+>>>>>>> .their
-   }
- 
-   return '<pre><code class="'
-@@ -899,6 +1241,7 @@
-     + escape(lang, true)
-     + '">'
-     + (escaped ? code : escape(code, true))
-+<<<<<<< .our
-     + '</code></pre>\n';
- };
- 
-@@ -956,10 +1299,55 @@
- Renderer.prototype.table = function(header, body) {
-   if (body) body = '<tbody>' + body + '</tbody>';
- 
-+=======
-+    + '\n</code></pre>\n';
-+};
-+
-+Renderer.prototype.blockquote = function (quote) {
-+  return '<blockquote>\n' + quote + '</blockquote>\n';
-+};
-+
-+Renderer.prototype.html = function (html) {
-+  return html;
-+};
-+
-+Renderer.prototype.heading = function (text, level, raw) {
-+  return '<h'
-+    + level
-+    + ' id="'
-+    + this.options.headerPrefix
-+    + raw.toLowerCase().replace(/[^\w]+/g, '-')
-+    + '">'
-+    + text
-+    + '</h'
-+    + level
-+    + '>\n';
-+};
-+
-+Renderer.prototype.hr = function () {
-+  return this.options.xhtml ? '<hr/>\n' : '<hr>\n';
-+};
-+
-+Renderer.prototype.list = function (body, ordered) {
-+  var type = ordered ? 'ol' : 'ul';
-+  return '<' + type + '>\n' + body + '</' + type + '>\n';
-+};
-+
-+Renderer.prototype.listitem = function (text) {
-+  return '<li>' + text + '</li>\n';
-+};
-+
-+Renderer.prototype.paragraph = function (text) {
-+  return '<p>' + text + '</p>\n';
-+};
-+
-+Renderer.prototype.table = function (header, body) {
-+>>>>>>> .their
-   return '<table>\n'
-     + '<thead>\n'
-     + header
-     + '</thead>\n'
-+<<<<<<< .our
-     + body
-     + '</table>\n';
- };
-@@ -972,11 +1360,28 @@
-   var type = flags.header ? 'th' : 'td';
-   var tag = flags.align
-     ? '<' + type + ' align="' + flags.align + '">'
-+=======
-+    + '<tbody>\n'
-+    + body
-+    + '</tbody>\n'
-+    + '</table>\n';
-+};
-+
-+Renderer.prototype.tablerow = function (content) {
-+  return '<tr>\n' + content + '</tr>\n';
-+};
-+
-+Renderer.prototype.tablecell = function (content, flags) {
-+  var type = flags.header ? 'th' : 'td';
-+  var tag = flags.align
-+    ? '<' + type + ' style="text-align:' + flags.align + '">'
-+>>>>>>> .their
-     : '<' + type + '>';
-   return tag + content + '</' + type + '>\n';
- };
- 
- // span level renderer
-+<<<<<<< .our
- Renderer.prototype.strong = function(text) {
-   return '<strong>' + text + '</strong>';
- };
-@@ -998,6 +1403,29 @@
- };
- 
- Renderer.prototype.link = function(href, title, text) {
-+=======
-+Renderer.prototype.strong = function (text) {
-+  return '<strong>' + text + '</strong>';
-+};
-+
-+Renderer.prototype.em = function (text) {
-+  return '<em>' + text + '</em>';
-+};
-+
-+Renderer.prototype.codespan = function (text) {
-+  return '<code>' + text + '</code>';
-+};
-+
-+Renderer.prototype.br = function () {
-+  return this.options.xhtml ? '<br/>' : '<br>';
-+};
-+
-+Renderer.prototype.del = function (text) {
-+  return '<del>' + text + '</del>';
-+};
-+
-+Renderer.prototype.link = function (href, title, text) {
-+>>>>>>> .their
-   if (this.options.sanitize) {
-     try {
-       var prot = decodeURIComponent(unescape(href))
-@@ -1013,12 +1441,16 @@
-   if (this.options.baseUrl && !originIndependentUrl.test(href)) {
-     href = resolveUrl(this.options.baseUrl, href);
-   }
-+<<<<<<< .our
-   try {
-     href = encodeURI(href).replace(/%25/g, '%');
-   } catch (e) {
-     return text;
-   }
-   var out = '<a href="' + escape(href) + '"';
-+=======
-+  var out = '<a href="' + href + '"';
-+>>>>>>> .their
-   if (title) {
-     out += ' title="' + title + '"';
-   }
-@@ -1026,7 +1458,11 @@
-   return out;
- };
- 
-+<<<<<<< .our
- Renderer.prototype.image = function(href, title, text) {
-+=======
-+Renderer.prototype.image = function (href, title, text) {
-+>>>>>>> .their
-   if (this.options.baseUrl && !originIndependentUrl.test(href)) {
-     href = resolveUrl(this.options.baseUrl, href);
-   }
-@@ -1038,7 +1474,11 @@
-   return out;
- };
- 
-+<<<<<<< .our
- Renderer.prototype.text = function(text) {
-+=======
-+Renderer.prototype.text = function (text) {
-+>>>>>>> .their
-   return text;
- };
- 
-@@ -1047,11 +1487,16 @@
-  * returns only the textual part of the token
-  */
- 
-+<<<<<<< .our
- function TextRenderer() {}
-+=======
-+function TextRenderer() { }
-+>>>>>>> .their
- 
- // no need for block level renderers
- 
- TextRenderer.prototype.strong =
-+<<<<<<< .our
- TextRenderer.prototype.em =
- TextRenderer.prototype.codespan =
- TextRenderer.prototype.del =
-@@ -1065,6 +1510,21 @@
- }
- 
- TextRenderer.prototype.br = function() {
-+=======
-+  TextRenderer.prototype.em =
-+  TextRenderer.prototype.codespan =
-+  TextRenderer.prototype.del =
-+  TextRenderer.prototype.text = function (text) {
-+    return text;
-+  }
-+
-+TextRenderer.prototype.link =
-+  TextRenderer.prototype.image = function (href, title, text) {
-+    return '' + text;
-+  }
-+
-+TextRenderer.prototype.br = function () {
-+>>>>>>> .their
-   return '';
- }
- 
-@@ -1076,7 +1536,11 @@
-   this.tokens = [];
-   this.token = null;
-   this.options = options || marked.defaults;
-+<<<<<<< .our
-   this.options.renderer = this.options.renderer || new Renderer();
-+=======
-+  this.options.renderer = this.options.renderer || new Renderer;
-+>>>>>>> .their
-   this.renderer = this.options.renderer;
-   this.renderer.options = this.options;
- }
-@@ -1085,7 +1549,11 @@
-  * Static Parse Method
-  */
- 
-+<<<<<<< .our
- Parser.parse = function(src, options) {
-+=======
-+Parser.parse = function (src, options) {
-+>>>>>>> .their
-   var parser = new Parser(options);
-   return parser.parse(src);
- };
-@@ -1094,6 +1562,7 @@
-  * Parse Loop
-  */
- 
-+<<<<<<< .our
- Parser.prototype.parse = function(src) {
-   this.inline = new InlineLexer(src.links, this.options);
-   // use an InlineLexer with a TextRenderer to extract pure text
-@@ -1101,6 +1570,12 @@
-     src.links,
-     merge({}, this.options, {renderer: new TextRenderer()})
-   );
-+=======
-+Parser.prototype.parse = function (src) {
-+  this.inline = new InlineLexer(src.links, this.options);
-+  // use an InlineLexer with a TextRenderer to extract pure text
-+  this.inlineText = new InlineLexer(src.links, merge({}, this.options, { renderer: new TextRenderer }));
-+>>>>>>> .their
-   this.tokens = src.reverse();
- 
-   var out = '';
-@@ -1115,7 +1590,11 @@
-  * Next Token
-  */
- 
-+<<<<<<< .our
- Parser.prototype.next = function() {
-+=======
-+Parser.prototype.next = function () {
-+>>>>>>> .their
-   return this.token = this.tokens.pop();
- };
- 
-@@ -1123,7 +1602,11 @@
-  * Preview Next Token
-  */
- 
-+<<<<<<< .our
- Parser.prototype.peek = function() {
-+=======
-+Parser.prototype.peek = function () {
-+>>>>>>> .their
-   return this.tokens[this.tokens.length - 1] || 0;
- };
- 
-@@ -1131,7 +1614,11 @@
-  * Parse Text Tokens
-  */
- 
-+<<<<<<< .our
- Parser.prototype.parseText = function() {
-+=======
-+Parser.prototype.parseText = function () {
-+>>>>>>> .their
-   var body = this.token.text;
- 
-   while (this.peek().type === 'text') {
-@@ -1145,7 +1632,11 @@
-  * Parse Current Token
-  */
- 
-+<<<<<<< .our
- Parser.prototype.tok = function() {
-+=======
-+Parser.prototype.tok = function () {
-+>>>>>>> .their
-   switch (this.token.type) {
-     case 'space': {
-       return '';
-@@ -1165,12 +1656,21 @@
-         this.token.escaped);
-     }
-     case 'table': {
-+<<<<<<< .our
-       var header = '',
-           body = '',
-           i,
-           row,
-           cell,
-           j;
-+=======
-+      var header = ''
-+        , body = ''
-+        , i
-+        , row
-+        , cell
-+        , j;
-+>>>>>>> .their
- 
-       // header
-       cell = '';
-@@ -1198,7 +1698,11 @@
-       return this.renderer.table(header, body);
-     }
-     case 'blockquote_start': {
-+<<<<<<< .our
-       body = '';
-+=======
-+      var body = '';
-+>>>>>>> .their
- 
-       while (this.next().type !== 'blockquote_end') {
-         body += this.tok();
-@@ -1207,14 +1711,20 @@
-       return this.renderer.blockquote(body);
-     }
-     case 'list_start': {
-+<<<<<<< .our
-       body = '';
-       var ordered = this.token.ordered,
-           start = this.token.start;
-+=======
-+      var body = ''
-+        , ordered = this.token.ordered;
-+>>>>>>> .their
- 
-       while (this.next().type !== 'list_end') {
-         body += this.tok();
-       }
- 
-+<<<<<<< .our
-       return this.renderer.list(body, ordered, start);
-     }
-     case 'list_item_start': {
-@@ -1223,6 +1733,12 @@
-       if (this.token.task) {
-         body += this.renderer.checkbox(this.token.checked);
-       }
-+=======
-+      return this.renderer.list(body, ordered);
-+    }
-+    case 'list_item_start': {
-+      var body = '';
-+>>>>>>> .their
- 
-       while (this.next().type !== 'list_item_end') {
-         body += this.token.type === 'text'
-@@ -1233,7 +1749,11 @@
-       return this.renderer.listitem(body);
-     }
-     case 'loose_item_start': {
-+<<<<<<< .our
-       body = '';
-+=======
-+      var body = '';
-+>>>>>>> .their
- 
-       while (this.next().type !== 'list_item_end') {
-         body += this.tok();
-@@ -1242,8 +1762,15 @@
-       return this.renderer.listitem(body);
-     }
-     case 'html': {
-+<<<<<<< .our
-       // TODO@matt parse inline content if parameter markdown=1
-       return this.renderer.html(this.token.text);
-+=======
-+      var html = !this.token.pre && !this.options.pedantic
-+        ? this.inline.output(this.token.text)
-+        : this.token.text;
-+      return this.renderer.html(html);
-+>>>>>>> .their
-     }
-     case 'paragraph': {
-       return this.renderer.paragraph(this.inline.output(this.token.text));
-@@ -1269,7 +1796,11 @@
- 
- function unescape(html) {
-   // explicitly match decimal, hex, and named HTML entities
-+<<<<<<< .our
-   return html.replace(/&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/ig, function(_, n) {
-+=======
-+  return html.replace(/&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/ig, function (_, n) {
-+>>>>>>> .their
-     n = n.toLowerCase();
-     if (n === 'colon') return ':';
-     if (n.charAt(0) === '#') {
-@@ -1281,6 +1812,7 @@
-   });
- }
- 
-+<<<<<<< .our
- function edit(regex, opt) {
-   regex = regex.source || regex;
-   opt = opt || '';
-@@ -1294,6 +1826,17 @@
-     getRegex: function() {
-       return new RegExp(regex, opt);
-     }
-+=======
-+function replace(regex, opt) {
-+  regex = regex.source;
-+  opt = opt || '';
-+  return function self(name, val) {
-+    if (!name) return new RegExp(regex, opt);
-+    val = val.source || val;
-+    val = val.replace(/(^|[^\[])\^/g, '$1');
-+    regex = regex.replace(name, val);
-+    return self;
-+>>>>>>> .their
-   };
- }
- 
-@@ -1305,7 +1848,11 @@
-     if (/^[^:]+:\/*[^/]*$/.test(base)) {
-       baseUrls[' ' + base] = base + '/';
-     } else {
-+<<<<<<< .our
-       baseUrls[' ' + base] = rtrim(base, '/', true);
-+=======
-+      baseUrls[' ' + base] = base.replace(/[^/]*$/, '');
-+>>>>>>> .their
-     }
-   }
-   base = baseUrls[' ' + base];
-@@ -1321,6 +1868,7 @@
- var baseUrls = {};
- var originIndependentUrl = /^$|^[a-z][a-z0-9+.-]*:|^[?#]/i;
- 
-+<<<<<<< .our
- function noop() {}
- noop.exec = noop;
- 
-@@ -1328,6 +1876,15 @@
-   var i = 1,
-       target,
-       key;
-+=======
-+function noop() { }
-+noop.exec = noop;
-+
-+function merge(obj) {
-+  var i = 1
-+    , target
-+    , key;
-+>>>>>>> .their
- 
-   for (; i < arguments.length; i++) {
-     target = arguments[i];
-@@ -1341,6 +1898,7 @@
-   return obj;
- }
- 
-+<<<<<<< .our
- function splitCells(tableRow, count) {
-   // ensure that every cell-delimiting pipe has a space
-   // before it to distinguish it from an escaped pipe
-@@ -1398,6 +1956,8 @@
- 
-   return str.substr(0, str.length - suffLen);
- }
-+=======
-+>>>>>>> .their
- 
- /**
-  * Marked
-@@ -1405,6 +1965,7 @@
- 
- function marked(src, opt, callback) {
-   // throw error in case of non string input
-+<<<<<<< .our
-   if (typeof src === 'undefined' || src === null) {
-     throw new Error('marked(): input parameter is undefined or null');
-   }
-@@ -1412,6 +1973,14 @@
-     throw new Error('marked(): input parameter is of type '
-       + Object.prototype.toString.call(src) + ', string expected');
-   }
-+=======
-+  if (typeof src == 'undefined' || src === null)
-+    throw new Error('marked(): input parameter is undefined or null');
-+  if (typeof src != 'string')
-+    throw new Error('marked(): input parameter is of type ' +
-+      Object.prototype.toString.call(src) + ', string expected');
-+
-+>>>>>>> .their
- 
-   if (callback || typeof opt === 'function') {
-     if (!callback) {
-@@ -1421,10 +1990,17 @@
- 
-     opt = merge({}, marked.defaults, opt || {});
- 
-+<<<<<<< .our
-     var highlight = opt.highlight,
-         tokens,
-         pending,
-         i = 0;
-+=======
-+    var highlight = opt.highlight
-+      , tokens
-+      , pending
-+      , i = 0;
-+>>>>>>> .their
- 
-     try {
-       tokens = Lexer.lex(src, opt)
-@@ -1434,7 +2010,11 @@
- 
-     pending = tokens.length;
- 
-+<<<<<<< .our
-     var done = function(err) {
-+=======
-+    var done = function (err) {
-+>>>>>>> .their
-       if (err) {
-         opt.highlight = highlight;
-         return callback(err);
-@@ -1464,11 +2044,19 @@
-     if (!pending) return done();
- 
-     for (; i < tokens.length; i++) {
-+<<<<<<< .our
-       (function(token) {
-         if (token.type !== 'code') {
-           return --pending || done();
-         }
-         return highlight(token.text, token.lang, function(err, code) {
-+=======
-+      (function (token) {
-+        if (token.type !== 'code') {
-+          return --pending || done();
-+        }
-+        return highlight(token.text, token.lang, function (err, code) {
-+>>>>>>> .their
-           if (err) return done(err);
-           if (code == null || code === token.text) {
-             return --pending || done();
-@@ -1486,7 +2074,11 @@
-     if (opt) opt = merge({}, marked.defaults, opt);
-     return Parser.parse(Lexer.lex(src, opt), opt);
-   } catch (e) {
-+<<<<<<< .our
-     e.message += '\nPlease report this to https://github.com/markedjs/marked.';
-+=======
-+    e.message += '\nPlease report this to https://github.com/chjj/marked.';
-+>>>>>>> .their
-     if ((opt || marked.defaults).silent) {
-       return '<p>An error occurred:</p><pre>'
-         + escape(e.message + '', true)
-@@ -1501,6 +2093,7 @@
-  */
- 
- marked.options =
-+<<<<<<< .our
- marked.setOptions = function(opt) {
-   merge(marked.defaults, opt);
-   return marked;
-@@ -1529,6 +2122,31 @@
- }
- 
- marked.defaults = marked.getDefaults();
-+=======
-+  marked.setOptions = function (opt) {
-+    merge(marked.defaults, opt);
-+    return marked;
-+  };
-+
-+marked.defaults = {
-+  gfm: true,
-+  tables: true,
-+  breaks: false,
-+  pedantic: false,
-+  sanitize: false,
-+  sanitizer: null,
-+  mangle: true,
-+  smartLists: false,
-+  silent: false,
-+  highlight: null,
-+  langPrefix: 'lang-',
-+  smartypants: false,
-+  headerPrefix: '',
-+  renderer: new Renderer,
-+  xhtml: false,
-+  baseUrl: null
-+};
-+>>>>>>> .their
- 
- /**
-  * Expose
-@@ -1547,15 +2165,25 @@
- marked.inlineLexer = InlineLexer.output;
- 
- marked.parse = marked;
-+<<<<<<< .our
-+=======
-+
-+>>>>>>> .their
- __marked_exports = marked;
- 
- }).call(this);
- 
- // ESM-comment-begin
- define([], function() {
-+<<<<<<< .our
- return {
-   marked: __marked_exports
- };
-+=======
-+  return {
-+    marked: __marked_exports
-+  };
-+>>>>>>> .their
- });
- // ESM-comment-end
- 
-changed in both
-  base   100644 135f2ac07840f94ce6dcda1a6a8d5d624de24aa9 src/vs/base/common/platform.ts
-  our    100644 277929ed5d02284c4e3e3de3c755086c00b03837 src/vs/base/common/platform.ts
-  their  100644 4e98c088bc9e3c978bfdb7bf0ab74b75cfc4bf27 src/vs/base/common/platform.ts
-changed in both
-  base   100644 aea7370ed16e701f73c1ba05d5fb20acf90728fb src/vs/base/common/winjs.base.js
-  our    100644 d8de83ddd3e544c6faec8ac12be0842e9f8984d7 src/vs/base/common/winjs.base.js
-  their  100644 49debfc70456aa71addf7c834574312da89890c0 src/vs/base/common/winjs.base.js
-@@ -1038,12 +1038,15 @@
-             /// error function.
-             /// </returns>
-             /// </signature>
-+<<<<<<< .our
-             // BEGIN monaco change
-             if (this.then !== Promise_then) {
-                 this.then(onComplete, onError, onProgress);
-                 return;
-             }
-             // END monaco change
-+=======
-+>>>>>>> .their
-             return this._state.then(this, onComplete, onError, onProgress);
-         },
- 
-changed in both
-  base   100644 e7ea8490a75b6b5713caffdd1e1ffd239fabdd9c src/vs/base/common/worker/simpleWorker.ts
-  our    100644 8b0862a816de5e23c2f0f64421099498a32c42be src/vs/base/common/worker/simpleWorker.ts
-  their  100644 0099aac4956a1e9b94d598521bf4487146f363c6 src/vs/base/common/worker/simpleWorker.ts
-changed in both
-  base   100644 52bca4b7a05328ea0f29d67be37ba2efa3e3f72c src/vs/base/worker/defaultWorkerFactory.ts
-  our    100644 4fe3caa24038f5d7d95d3358c6a54bfec1dad81e src/vs/base/worker/defaultWorkerFactory.ts
-  their  100644 344588ad9efb7684b815a107a1cce04899714295 src/vs/base/worker/defaultWorkerFactory.ts
-@@ -7,6 +7,7 @@
- import { globals } from 'vs/base/common/platform';
- import { logOnceWebWorkerWarning, IWorker, IWorkerCallback, IWorkerFactory } from 'vs/base/common/worker/simpleWorker';
- 
-+<<<<<<< .our
- function getWorker(workerId: string, label: string): Worker {
- 	// Option for hosts to overwrite the worker script (used in the standalone editor)
- 	if (globals.MonacoEnvironment) {
-@@ -23,6 +24,19 @@
- 	}
- 	// ESM-comment-end
- 	throw new Error(`You must define a function MonacoEnvironment.getWorkerUrl or MonacoEnvironment.getWorker`);
-+=======
-+function getWorkerUrl(workerId: string, label: string): string {
-+	// Option for hosts to overwrite the worker script url (used in the standalone editor)
-+	if (globals.MonacoEnvironment && typeof globals.MonacoEnvironment.getWorkerUrl === 'function') {
-+		return globals.MonacoEnvironment.getWorkerUrl(workerId, label);
-+	}
-+	// ESM-comment-begin
-+	if (typeof require === 'function') {
-+		return require.toUrl('./' + workerId) + '#' + label;
-+	}
-+	// ESM-comment-end
-+	throw new Error(`You must define a function MonacoEnvironment.getWorkerUrl`);
-+>>>>>>> .their
- }
- 
- /**
-changed in both
-  base   100644 8d21c881d585cfc426d978363032e6e3098062cf src/vs/code/electron-main/menus.ts
-  our    100644 9d5657cff26b159c842f9790d6387967d829e168 src/vs/code/electron-main/menus.ts
-  their  100644 442e70d33c9e81e4b79bb15ebb1cd570f2937803 src/vs/code/electron-main/menus.ts
-changed in both
-  base   100644 c344b8a05c09cf46f5df0abe0a9873d2496888c5 src/vs/editor/browser/controller/textAreaInput.ts
-  our    100644 53169924b40a89453d9315348a7454e0e49c0a03 src/vs/editor/browser/controller/textAreaInput.ts
-  their  100644 ea9cf23d22db68caa5fac953ce118cbb62232461 src/vs/editor/browser/controller/textAreaInput.ts
-@@ -189,6 +189,7 @@
- 			// which breaks this path of code.
- 			if (browser.isEdgeOrIE && locale === 'ja') {
- 				return true;
-+<<<<<<< .our
- 			}
- 
- 			// https://github.com/Microsoft/monaco-editor/issues/545
-@@ -207,6 +208,33 @@
- 
- 			if (compositionDataInValid(e.locale)) {
- 				const [newState, typeInput] = deduceInputFromTextAreaValue(/*couldBeEmojiInput*/false, /*couldBeTypingAtOffset0*/false);
-+=======
-+			}
-+
-+			// https://github.com/Microsoft/monaco-editor/issues/545
-+			// On IE11, we can't trust composition data when typing Chinese as IE11 doesn't emit correct
-+			// events when users type numbers in IME.
-+			// Chinese: zh-Hans-CN, zh-Hans-SG, zh-Hant-TW, zh-Hant-HK
-+			if (browser.isIE && locale.indexOf('zh-Han') === 0) {
-+				return true;
-+			}
-+
-+			return false;
-+		};
-+
-+		this._register(dom.addDisposableListener(textArea.domNode, 'compositionupdate', (e: CompositionEvent) => {
-+			if (browser.isChromev56) {
-+				// See https://github.com/Microsoft/monaco-editor/issues/320
-+				// where compositionupdate .data is broken in Chrome v55 and v56
-+				// See https://bugs.chromium.org/p/chromium/issues/detail?id=677050#c9
-+				// The textArea doesn't get the composition update yet, the value of textarea is still obsolete
-+				// so we can't correct e at this moment.
-+				return;
-+			}
-+
-+			if (compositionDataInValid(e.locale)) {
-+				const [newState, typeInput] = deduceInputFromTextAreaValue(/*couldBeEmojiInput*/false);
-+>>>>>>> .their
- 				this._textAreaState = newState;
- 				this._onType.fire(typeInput);
- 				this._onCompositionUpdate.fire(e);
-@@ -220,8 +248,11 @@
- 		}));
- 
- 		this._register(dom.addDisposableListener(textArea.domNode, 'compositionend', (e: CompositionEvent) => {
-+<<<<<<< .our
- 			this._lastTextAreaEvent = TextAreaInputEventType.compositionend;
- 
-+=======
-+>>>>>>> .their
- 			if (compositionDataInValid(e.locale)) {
- 				// https://github.com/Microsoft/monaco-editor/issues/339
- 				const [newState, typeInput] = deduceInputFromTextAreaValue(/*couldBeEmojiInput*/false, /*couldBeTypingAtOffset0*/false);
-@@ -436,6 +467,12 @@
- 		}
- 		this._hasFocus = newHasFocus;
- 
-+		if (this._isDoingComposition) {
-+			// textarea gets focus, so the state should be clean
-+			// https://github.com/Microsoft/monaco-editor/issues/552
-+			this._isDoingComposition = false;
-+		}
-+
- 		if (this._hasFocus) {
- 			if (browser.isEdge) {
- 				// Edge has a bug where setting the selection range while the focus event
-changed in both
-  base   100644 921165fc844a1ffffaabae0686019f416d9cf666 src/vs/editor/common/config/editorOptions.ts
-  our    100644 3a51038033803eb3e426c81c8416ce7c260eb272 src/vs/editor/common/config/editorOptions.ts
-  their  100644 3703a6e800e536715c1dfc0d23ac6f277e155cdd src/vs/editor/common/config/editorOptions.ts
-changed in both
-  base   100644 259ab0dc4bb29279532e8235d2896bbc6a330538 src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
-  our    100644 4d4b03519d11c8bcd261e15f4327bc58c04d4c19 src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
-  their  100644 f9ab27f12eab4de1d8f2596b03143a1385938018 src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
-changed in both
-  base   100644 bc0a715dda9b77609345449d4a2ef4b13d276023 src/vs/editor/common/model/textModelTokens.ts
-  our    100644 ab4e221927f80cd5f52953dce3c0e93b35c70b88 src/vs/editor/common/model/textModelTokens.ts
-  their  100644 cb7c7bf2c7d18ed36d62ab2066f351d3c74b38de src/vs/editor/common/model/textModelTokens.ts
-changed in both
-  base   100644 cd669a4a94b4e88ed6c049f9f47cd24277afc7c5 src/vs/editor/common/services/editorSimpleWorker.ts
-  our    100644 884fba7fa029c1f7e19eb6f3082961988cc818ec src/vs/editor/common/services/editorSimpleWorker.ts
-  their  100644 b7302571032290d037efb70150e0f9810ba8580a src/vs/editor/common/services/editorSimpleWorker.ts
-@@ -303,7 +303,11 @@
- 	(ctx: IWorkerContext, createData: any): any;
- }
- 
-+<<<<<<< .our
- declare var require: any;
-+=======
-+declare var require;
-+>>>>>>> .their
- 
- /**
-  * @internal
-@@ -529,7 +533,10 @@
- 			}
- 			return TPromise.as(methods);
- 		}
-+<<<<<<< .our
- 		// ESM-comment-begin
-+=======
-+>>>>>>> .their
- 		return new TPromise<any>((c, e) => {
- 			require([moduleId], (foreignModule: { create: IForeignModuleFactory }) => {
- 				this._foreignModule = foreignModule.create(ctx, createData);
-changed in both
-  base   100644 1c84e72264659f53d96eb8c2b4ea5fe8e8b3a30b src/vs/editor/common/services/editorWorkerServiceImpl.ts
-  our    100644 b03f956e9826b1bafdd7709cee73a75adcf8afc8 src/vs/editor/common/services/editorWorkerServiceImpl.ts
-  their  100644 86885e233fcc8bc02153c600e65e5c943cedd491 src/vs/editor/common/services/editorWorkerServiceImpl.ts
-changed in both
-  base   100644 3a2e010a70733409e473a4734eaa753fad8e2508 src/vs/editor/contrib/colorPicker/colorPicker.css
-  our    100644 b1978528c9595fa8972b2a69ebc8fca6d0ada98a src/vs/editor/contrib/colorPicker/colorPicker.css
-  their  100644 68fff1fc3da2bbed565e5531556814fe352403ae src/vs/editor/contrib/colorPicker/colorPicker.css
-@@ -8,7 +8,11 @@
- 	user-select: none;
- }
- 
-+<<<<<<< .our
- .monaco-editor .colorpicker-hover:focus {
-+=======
-+.monaco-editor .colorpicker-hover[tabindex="0"]:focus {
-+>>>>>>> .their
- 	outline: none;
- }
- 
-changed in both
-  base   100644 b44c9fda3be50ec53015c476e355df0ab626de02 src/vs/editor/contrib/snippet/snippetParser.ts
-  our    100644 c839cffd343d30d5d0bcaf38e956939fd254b752 src/vs/editor/contrib/snippet/snippetParser.ts
-  their  100644 2ee46939849adc103335c96ebf45e0baac3f708f src/vs/editor/contrib/snippet/snippetParser.ts
-changed in both
-  base   100644 3aef25f681c74c552f157e37b20515f999c87ccd src/vs/editor/contrib/suggest/suggestWidget.ts
-  our    100644 a221be2731d33b2c0a5d84d119cac0233b76a147 src/vs/editor/contrib/suggest/suggestWidget.ts
-  their  100644 e68013af3c7f60d2083b1be2280940204bea2f53 src/vs/editor/contrib/suggest/suggestWidget.ts
-@@ -364,7 +364,11 @@
- 	private state: State;
- 	private isAuto: boolean;
- 	private loadingTimeout: number;
-+<<<<<<< .our
- 	private currentSuggestionDetails: CancelablePromise<void>;
-+=======
-+	private currentSuggestionDetails: TPromise<void>;
-+>>>>>>> .their
- 	private focusedItem: ICompletionItem;
- 	private ignoreFocusEvents = false;
- 	private completionModel: CompletionModel;
-@@ -576,6 +580,7 @@
- 
- 		this.list.reveal(index);
- 
-+<<<<<<< .our
- 		this.currentSuggestionDetails = createCancelablePromise(token => item.resolve(token));
- 
- 		this.currentSuggestionDetails.then(() => {
-@@ -595,6 +600,18 @@
- 				this.currentSuggestionDetails = null;
- 			}
- 		});
-+=======
-+		this.currentSuggestionDetails = item.resolve()
-+			.then(() => {
-+				if (this.expandDocsSettingFromStorage()) {
-+					this.showDetails();
-+				} else {
-+					removeClass(this.element, 'docs-side');
-+				}
-+			})
-+			.then(null, err => !isPromiseCanceledError(err) && onUnexpectedError(err))
-+			.then(() => this.currentSuggestionDetails = null);
-+>>>>>>> .their
- 
- 		// emit an event
- 		this.onDidFocusEmitter.fire({ item, index, model: this.completionModel });
-@@ -713,6 +730,10 @@
- 			*/
- 			this.telemetryService.publicLog('suggestWidget', { ...stats, ...this.editor.getTelemetryData() });
- 
-+<<<<<<< .our
-+=======
-+			this.focusedItem = null;
-+>>>>>>> .their
- 			this.list.splice(0, this.list.length, this.completionModel.items);
- 
- 			if (isFrozen) {
-added in both
-  our    100644 7bd274aab602c1ca20dbabd57091a7bfaaed2c6d src/vs/editor/editor.api.ts
-  their  100644 dbee1649496a0af5b854292f176e4583fd2895fd src/vs/editor/editor.api.ts
-@@ -35,8 +35,12 @@
- export const Range = api.Range;
- export const Selection = api.Selection;
- export const SelectionDirection = api.SelectionDirection;
-+<<<<<<< .our
- export const MarkerSeverity = api.MarkerSeverity;
- export const MarkerTag = api.MarkerTag;
-+=======
-+export const Severity = api.Severity;
-+>>>>>>> .their
- export const Promise = api.Promise;
- export const Uri = api.Uri;
- export const Token = api.Token;
-changed in both
-  base   100644 b67b0863ad859e61fdeb5cefec517cf78bdf23f3 src/vs/editor/editor.main.ts
-  our    100644 08fd5c9232686fb8b4d7c7bd0b267359955b2ec6 src/vs/editor/editor.main.ts
-  their  100644 3f2c56b5d169a86edc3ed1b014caf1f6308af2fc src/vs/editor/editor.main.ts
-changed in both
-  base   100644 55ce345642e3cf0ed0f3428202d6f366ac28656c src/vs/editor/standalone/browser/standaloneLanguages.ts
-  our    100644 b0287953b31b42b550a9fccdb465b02666dae70f src/vs/editor/standalone/browser/standaloneLanguages.ts
-  their  100644 c0eec9275ac34e5205a38c1dcf670e969624539b src/vs/editor/standalone/browser/standaloneLanguages.ts
-changed in both
-  base   100644 0923605e55d941b51b14d922330b2f7e416571c0 src/vs/editor/test/common/services/editorSimpleWorker.test.ts
-  our    100644 0d55c58d7c19c88e842b8ce075c821eaae2d62b8 src/vs/editor/test/common/services/editorSimpleWorker.test.ts
-  their  100644 0a8b62e8a55e320e8a05e9eb0dafc7ad79369c47 src/vs/editor/test/common/services/editorSimpleWorker.test.ts
-changed in both
-  base   100644 c3566d28a4f7e5b23dc2388cbbb5e6f061c6b82e src/vs/monaco.d.ts
-  our    100644 76dcf491ff9c1973ad61bf5d423713bb1a3b4e44 src/vs/monaco.d.ts
-  their  100644 5c240cb045f608902e0f650d8e716e37e52a8917 src/vs/monaco.d.ts
-changed in both
-  base   100644 93fa74ef128babc8cd093a5251da0b60f00ef721 src/vs/platform/notification/common/notification.ts
-  our    100644 525d8f18a25236e91e1ee09df20eced0cffc2156 src/vs/platform/notification/common/notification.ts
-  their  100644 aa8c4f7c33074afb6ebf0bb5dda6d3ebd29eca59 src/vs/platform/notification/common/notification.ts
-changed in both
-  base   100644 8ce018cb411f7bb734d492ea81e0ee8bba50911b src/vs/platform/update/common/update.ts
-  our    100644 5f187e283ae128388dba38cd5a453c1b2a817445 src/vs/platform/update/common/update.ts
-  their  100644 45688bb94184b74fae81affcd657c13da57a0dac src/vs/platform/update/common/update.ts
-@@ -54,7 +54,11 @@
- }
- 
- export type Uninitialized = { type: StateType.Uninitialized };
-+<<<<<<< .our
- export type Idle = { type: StateType.Idle, updateType: UpdateType };
-+=======
-+export type Idle = { type: StateType.Idle };
-+>>>>>>> .their
- export type CheckingForUpdates = { type: StateType.CheckingForUpdates, context: any };
- export type AvailableForDownload = { type: StateType.AvailableForDownload, update: IUpdate };
- export type Downloading = { type: StateType.Downloading, update: IUpdate };
-@@ -66,7 +70,11 @@
- 
- export const State = {
- 	Uninitialized: { type: StateType.Uninitialized } as Uninitialized,
-+<<<<<<< .our
- 	Idle: (updateType: UpdateType) => ({ type: StateType.Idle, updateType }) as Idle,
-+=======
-+	Idle: { type: StateType.Idle } as Idle,
-+>>>>>>> .their
- 	CheckingForUpdates: (context: any) => ({ type: StateType.CheckingForUpdates, context } as CheckingForUpdates),
- 	AvailableForDownload: (update: IUpdate) => ({ type: StateType.AvailableForDownload, update } as AvailableForDownload),
- 	Downloading: (update: IUpdate) => ({ type: StateType.Downloading, update } as Downloading),
-changed in both
-  base   100644 441bdd138e139b0a66eaa0ba1ba8778f629324d0 src/vs/platform/update/common/updateIpc.ts
-  our    100644 aa2e8fd304e3da483284474d857022629d0c7835 src/vs/platform/update/common/updateIpc.ts
-  their  100644 b52dbc115d220c4533ff76d08752d1597389f0fc src/vs/platform/update/common/updateIpc.ts
-@@ -12,9 +12,12 @@
- import { IUpdateService, State } from './update';
- 
- export interface IUpdateChannel extends IChannel {
-+<<<<<<< .our
- 	listen(event: 'onStateChange'): Event<State>;
- 	listen<T>(command: string, arg?: any): Event<T>;
- 
-+=======
-+>>>>>>> .their
- 	call(command: 'checkForUpdates', arg: any): TPromise<void>;
- 	call(command: 'downloadUpdate'): TPromise<void>;
- 	call(command: 'applyUpdate'): TPromise<void>;
-changed in both
-  base   100644 04e3ccdfeb369ede9e13784af244e9fbee89e742 src/vs/platform/update/electron-main/abstractUpdateService.ts
-  our    100644 b689dd6bd67916ca3e46a27a518e1cfc57d32758 src/vs/platform/update/electron-main/abstractUpdateService.ts
-  their  100644 c947ebba306c0099c2573144f96732abfea02077 src/vs/platform/update/electron-main/abstractUpdateService.ts
-@@ -181,6 +181,10 @@
- 		// noop
- 	}
- 
-+<<<<<<< .our
- 	protected abstract buildUpdateFeedUrl(quality: string): string | undefined;
-+=======
-+	protected abstract setUpdateFeedUrl(quality: string): boolean;
-+>>>>>>> .their
- 	protected abstract doCheckForUpdates(context: any): void;
- }
-changed in both
-  base   100644 25d9cf28beb1bae72436866e64504e880a7c43e6 src/vs/platform/update/electron-main/updateService.darwin.ts
-  our    100644 8ac8357ef63e52b69fcc0b4593970a0405426078 src/vs/platform/update/electron-main/updateService.darwin.ts
-  their  100644 cde35fe74f7b4249c47117200d3a0d4deed28ddc src/vs/platform/update/electron-main/updateService.darwin.ts
-changed in both
-  base   100644 7b0ece17fe3032415606a27492406913a3678187 src/vs/platform/update/electron-main/updateService.linux.ts
-  our    100644 87c60c5d4360ea55dff2b83145f098b858b83c75 src/vs/platform/update/electron-main/updateService.linux.ts
-  their  100644 a87f49d45faa39dfbaaa153402237c32a816cf2f src/vs/platform/update/electron-main/updateService.linux.ts
-@@ -69,7 +69,11 @@
- 					}
- 					*/
- 				this.telemetryService.publicLog('update:notAvailable', { explicit: !!context });
-+<<<<<<< .our
- 				this.setState(State.Idle(UpdateType.Archive));
-+=======
-+				this.setState(State.Idle);
-+>>>>>>> .their
- 			});
- 	}
- 
-changed in both
-  base   100644 ef20367626c463c93d21e7b2f23038c44614a506 src/vs/platform/update/electron-main/updateService.win32.ts
-  our    100644 6f5e750aafa60e074dd88761061c50e1f5691b2d src/vs/platform/update/electron-main/updateService.win32.ts
-  their  100644 d0421d5ba37e45fc0dcf3a4d85ae5483127cfac7 src/vs/platform/update/electron-main/updateService.win32.ts
-@@ -181,7 +181,11 @@
- 					}
- 					*/
- 				this.telemetryService.publicLog('update:notAvailable', { explicit: !!context });
-+<<<<<<< .our
- 				this.setState(State.Idle(getUpdateType()));
-+=======
-+				this.setState(State.Idle);
-+>>>>>>> .their
- 			});
- 	}
- 
-removed in local
-  base   100644 d37e32d52c2022499b9788c0ba3178b908af7bba src/vs/workbench/browser/parts/editor/editorGroupsControl.ts
-  their  100644 72defc1adbb11cfd0a4220a4a953908bc2e030ce src/vs/workbench/browser/parts/editor/editorGroupsControl.ts
-changed in both
-  base   100644 e7b9ac440dbc3957e95966fe8a46d05ef360e230 src/vs/workbench/browser/parts/notifications/notificationsCenter.ts
-  our    100644 fd3ecd2e0079a1e980b0978636a8deec0185e597 src/vs/workbench/browser/parts/notifications/notificationsCenter.ts
-  their  100644 d6baf9a796e583348d3fa022da44f440d2092d4f src/vs/workbench/browser/parts/notifications/notificationsCenter.ts
-@@ -65,7 +65,15 @@
- 		return this._isVisible;
- 	}
- 
-+<<<<<<< .our
- 	show(): void {
-+=======
-+	public show(): void {
-+		if (this.model.notifications.length === 0) {
-+			return; // currently not supporting to show empty (https://github.com/Microsoft/vscode/issues/44509)
-+		}
-+
-+>>>>>>> .their
- 		if (this._isVisible) {
- 			this.notificationsList.show(true /* focus */);
- 
-changed in both
-  base   100644 e5cd87a5e0e20e0c765a84b9e228d936474d6dc1 src/vs/workbench/browser/parts/notifications/notificationsCommands.ts
-  our    100644 9519578fe607712e094dd05f5fe59f403e691075 src/vs/workbench/browser/parts/notifications/notificationsCommands.ts
-  their  100644 469360901d6879310d20253c4ee42fe34ac36ad2 src/vs/workbench/browser/parts/notifications/notificationsCommands.ts
-removed in local
-  base   100644 6e300d32eed437803ec867773d1578aa308245d5 src/vs/workbench/parts/extensions/browser/extensionsActions.ts
-  their  100644 9f3465b4ac59b159344801418daf9cc61a7f450f src/vs/workbench/parts/extensions/browser/extensionsActions.ts
-changed in both
-  base   100644 64f46350660cf925ea3243b1313b89efedc90505 src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
-  our    100644 04d9dcba251cf79c28429027cda3ca3b0c10a29c src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
-  their  100644 5e81a88576aafb9bb74d3fd5313372bdafe53d39 src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
-removed in local
-  base   100644 756d45061f0e6fc4fc5ee690469e401751acc238 src/vs/workbench/parts/terminal/electron-browser/terminalTab.ts
-  their  100644 c4921ed69fd312aa0e3fdf908c2f157694a7af00 src/vs/workbench/parts/terminal/electron-browser/terminalTab.ts
-changed in both
-  base   100644 0421848d583e44e23ee97d92ee67ce14a821e053 src/vs/workbench/parts/update/electron-browser/update.ts
-  our    100644 2e468debc61fae01ce2d9c4b673a81993982cc62 src/vs/workbench/parts/update/electron-browser/update.ts
-  their  100644 467c5b27d4587d13f27356511ddac2d81759d108 src/vs/workbench/parts/update/electron-browser/update.ts
-@@ -24,6 +24,7 @@
- import { IUpdateService, State as UpdateState, StateType, IUpdate, UpdateType } from 'vs/platform/update/common/update';
- import * as semver from 'semver';
- import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-+<<<<<<< .our
- import { INotificationService, INotificationHandle } from 'vs/platform/notification/common/notification';
- import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
- import { IWindowService } from 'vs/platform/windows/common/windows';
-@@ -36,6 +37,29 @@
- function showReleaseNotes(instantiationService: IInstantiationService, version: string) {
- 	if (!releaseNotesManager) {
- 		releaseNotesManager = instantiationService.createInstance(ReleaseNotesManager);
-+=======
-+import { INotificationService } from 'vs/platform/notification/common/notification';
-+import { IChoiceService } from 'vs/platform/dialogs/common/dialogs';
-+import { IWindowService } from 'vs/platform/windows/common/windows';
-+
-+const NotNowAction = new Action(
-+	'update.later',
-+	nls.localize('later', "Later"),
-+	null,
-+	true,
-+	() => TPromise.as(true)
-+);
-+
-+const releaseNotesCache: { [version: string]: TPromise<string>; } = Object.create(null);
-+
-+export function loadReleaseNotes(accessor: ServicesAccessor, version: string): TPromise<string> {
-+	const requestService = accessor.get(IRequestService);
-+	const keybindingService = accessor.get(IKeybindingService);
-+	const match = /^(\d+\.\d+)\./.exec(version);
-+
-+	if (!match) {
-+		return TPromise.wrapError<string>(new Error('not found'));
-+>>>>>>> .their
- 	}
- 
- 	return instantiationService.invokeFunction(accessor => releaseNotesManager.show(accessor, version));
-@@ -372,6 +396,10 @@
- 		@INotificationService private notificationService: INotificationService,
- 		@IDialogService private dialogService: IDialogService,
- 		@IUpdateService private updateService: IUpdateService,
-+<<<<<<< .our
-+=======
-+		@IWorkbenchEditorService editorService: IWorkbenchEditorService,
-+>>>>>>> .their
- 		@IActivityService private activityService: IActivityService,
- 		@IWindowService private windowService: IWindowService
- 	) {
-changed in both
-  base   100644 c9e370817e59140c2659ced6673a2417b3dccdaa src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.ts
-  our    100644 13049eb33586080418b399273af4b10cc25e823b src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.ts
-  their  100644 ec96ca675bf9008305a3e1d3c5c9c0bf0425eba7 src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.ts
diff --git a/app/test/fixtures/merge-parser/vscode/merge-standalone-0.12.x-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-standalone-0.12.x-into-master.txt
deleted file mode 100644
index 2ff236ecd21..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-standalone-0.12.x-into-master.txt
+++ /dev/null
@@ -1,4637 +0,0 @@
-changed in both
-  base   100644 ccd151d7d3dca2d2fa6f12c06841909293aaad79 build/builtInExtensions.json
-  our    100644 b3efcd2cc657706605008661521b555c93a32c16 build/builtInExtensions.json
-  their  100644 af93dfdc2529f15bdc5c4360fa02033f0f7b4f5e build/builtInExtensions.json
-@@ -1,12 +1,20 @@
- [
- 	{
- 		"name": "ms-vscode.node-debug",
-+<<<<<<< .our
- 		"version": "1.27.2",
-+=======
-+		"version": "1.22.15",
-+>>>>>>> .their
- 		"repo": "https://github.com/Microsoft/vscode-node-debug"
- 	},
- 	{
- 		"name": "ms-vscode.node-debug2",
-+<<<<<<< .our
- 		"version": "1.27.0",
-+=======
-+		"version": "1.22.8",
-+>>>>>>> .their
- 		"repo": "https://github.com/Microsoft/vscode-node-debug2"
- 	}
- ]
-changed in both
-  base   100644 958b4ee71c30f185a67b324d57f83a50c374a251 build/monaco/package.json
-  our    100644 efd919085b2ffc82da8d810c609a9ed217bffb35 build/monaco/package.json
-  their  100644 256ca1ff53480886408bcb4fbdde1694daf85c94 build/monaco/package.json
-@@ -1,7 +1,11 @@
- {
-   "name": "monaco-editor-core",
-   "private": true,
-+<<<<<<< .our
-   "version": "0.14.3",
-+=======
-+  "version": "0.12.0",
-+>>>>>>> .their
-   "description": "A browser based code editor",
-   "author": "Microsoft Corporation",
-   "license": "MIT",
-changed in both
-  base   100644 cf4ba401a236147a78526eae599cadb008eeb151 extensions/emmet/src/test/abbreviationAction.test.ts
-  our    100644 b5fb87d8b0791993b65959e4e4c9219aa4e8388c extensions/emmet/src/test/abbreviationAction.test.ts
-  their  100644 3c85a027155273ac41acaf0db92d35038e918a83 extensions/emmet/src/test/abbreviationAction.test.ts
-@@ -435,12 +435,20 @@
- 	});
- 
- 	test('Expand abbreviation with single quotes for jsx', () => {
-+<<<<<<< .our
- 		return workspace.getConfiguration('emmet').update('syntaxProfiles', {jsx: {"attr_quotes": "single"}}, ConfigurationTarget.Global).then(() => {
-+=======
-+		return workspace.getConfiguration('emmet').update('syntaxProfiles', {jsx: {"attr_quotes": "single"}}).then(() => {
-+>>>>>>> .their
- 			return withRandomFileEditor('img', 'javascriptreact', (editor, doc) => {
- 				editor.selection = new Selection(0, 6, 0, 6);
- 				return expandEmmetAbbreviation({ language: 'javascriptreact' }).then(() => {
- 					assert.equal(editor.document.getText(), '<img src=\'\' alt=\'\'/>');
-+<<<<<<< .our
- 					return workspace.getConfiguration('emmet').update('syntaxProfiles', oldValueForSyntaxProfiles ? oldValueForSyntaxProfiles.globalValue : undefined, ConfigurationTarget.Global);
-+=======
-+					return workspace.getConfiguration('emmet').update('syntaxProfiles', {});
-+>>>>>>> .their
- 				});
- 			});
- 		});
-changed in both
-  base   100644 db664524eb1d8891b37dfce921c72550c7cc40f2 extensions/emmet/src/test/tagActions.test.ts
-  our    100644 a5d5ca291d7d027f757ecf4a854670d6f6c9db98 extensions/emmet/src/test/tagActions.test.ts
-  their  100644 ed69ae7d11cfb895c2064bd937041eec7b8ca3a7 extensions/emmet/src/test/tagActions.test.ts
-@@ -286,7 +286,11 @@
- 
- 				return splitJoinTag()!.then(() => {
- 					assert.equal(doc.getText(), expectedContents);
-+<<<<<<< .our
- 					return workspace.getConfiguration('emmet').update('syntaxProfiles', oldValueForSyntaxProfiles ? oldValueForSyntaxProfiles.globalValue : undefined, ConfigurationTarget.Global);
-+=======
-+					return workspace.getConfiguration('emmet').update('syntaxProfiles', {});
-+>>>>>>> .their
- 				});
- 			});
- 		});
-changed in both
-  base   100644 309be6de79a49f6df2a710f8e6b8b1f30f62a9eb extensions/emmet/src/util.ts
-  our    100644 b51d04d6cec49e4cad958e1de44c033b7862b549 extensions/emmet/src/util.ts
-  their  100644 3d0d8e2ac5d7881a50ed956557ac7ba66a1847ba extensions/emmet/src/util.ts
-changed in both
-  base   100644 aa1ce562f003e0b88eb666fea8c1c95406599914 extensions/html-language-features/server/src/htmlServerMain.ts
-  our    100644 ffe5c18df41d8ad255bff032cbca33b62a5b895b extensions/html-language-features/server/src/htmlServerMain.ts
-  their  100644 d86ecb5fd68f8235c4ea477ff29c3e5ad67fde0b extensions/html-language-features/server/src/htmlServerMain.ts
-@@ -262,8 +262,27 @@
- 			connection.telemetry.logEvent({ key: 'html.embbedded.complete', value: { languageId: mode.getId() } });
- 		}
- 
-+<<<<<<< .our
- 		const settings = await getDocumentSettings(document, () => doComplete.length > 2);
- 		const result = doComplete(document, textDocumentPosition.position, settings);
-+=======
-+		cachedCompletionList = null;
-+		const emmetCompletionList = CompletionList.create([], false);
-+
-+		const emmetCompletionParticipant = getEmmetCompletionParticipants(document, textDocumentPosition.position, mode.getId(), emmetSettings, emmetCompletionList);
-+		const completionParticipants = [emmetCompletionParticipant];
-+
-+		let settings = await getDocumentSettings(document, () => doComplete.length > 2);
-+		let result = doComplete(document, textDocumentPosition.position, settings, completionParticipants);
-+		if (emmetCompletionList.isIncomplete) {
-+			emmetCompletionList.items = emmetCompletionList.items || [];
-+			cachedCompletionList = result;
-+			if (emmetCompletionList.items.length && hexColorRegex.test(emmetCompletionList.items[0].label) && result.items.some(x => x.label === emmetCompletionList.items[0].label)) {
-+				emmetCompletionList.items.shift();
-+			}
-+			return CompletionList.create([...emmetCompletionList.items, ...result.items], emmetCompletionList.isIncomplete || result.isIncomplete);
-+		}
-+>>>>>>> .their
- 		return result;
- 
- 	}, null, `Error while computing completions for ${textDocumentPosition.textDocument.uri}`, token);
-changed in both
-  base   100644 e4b92c6fa46f82ba2a9a3251765671ff76042beb extensions/typescript-language-features/package.json
-  our    100644 1f06df0476dc5d308133ff5129ffa65d8caeb6fb extensions/typescript-language-features/package.json
-  their  100644 c5d2444bf11e6c9b3474cfc27f73f8ba860a619f extensions/typescript-language-features/package.json
-@@ -425,6 +425,14 @@
-           "markdownDescription": "%typescript.locale%",
-           "scope": "window"
-         },
-+<<<<<<< .our
-+=======
-+        "typescript.experimental.syntaxFolding": {
-+          "type": "boolean",
-+          "default": false,
-+          "description": "%typescript.experimental.syntaxFolding%"
-+        },
-+>>>>>>> .their
-         "javascript.suggestionActions.enabled": {
-           "type": "boolean",
-           "default": true,
-removed in local
-  base   100644 088e9734ba8239c4ef9025693d71aafdb3a412ee extensions/typescript-language-features/src/features/quickFixProvider.ts
-  their  100644 d4197bfeabb5293e157d64e1f84ce452b289e10f extensions/typescript-language-features/src/features/quickFixProvider.ts
-changed in both
-  base   100644 1fcb4a17477182a4a876633b8a6cbda551ac78ef i18n/chs/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  our    100644 34456c16f6384eecbdba1d3ed14696eac3704dab i18n/chs/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-  their  100644 122c711fcbbec58025d8d8358f74878296d093bd i18n/chs/src/vs/workbench/parts/update/electron-browser/update.i18n.json
-@@ -20,8 +20,13 @@
- 	"later": "稍后",
- 	"updateAvailable": "现有更新可用: {0} {1}",
- 	"installUpdate": "安装更新",
-+<<<<<<< .our
- 	"updateInstalling": "正在后台安装 {0} {1}，我们将在完成后通知您。 ",
- 	"updateAvailableAfterRestart": "重新启动 {0} 即可应用最新更新。",
-+=======
-+	"updateAvailable": "现有可用的更新: {0} {1}",
-+	"updateInstalling": "{0} {1} 正在后台安装，我们会在完成后通知您。",
-+>>>>>>> .their
- 	"updateNow": "立即更新",
- 	"commandPalette": "命令面板...",
- 	"settings": "设置",
-changed in both
-  base   100644 0b1d70297e1b5cf91a01bd3de57803903e63b0d8 i18n/cht/extensions/php/package.i18n.json
-  our    100644 d6cdfe9a0f2cc1fcf95b845133af34269f4312dc i18n/cht/extensions/php/package.i18n.json
-  their  100644 b1995eaa4f998ed45d65a16d31f1fcfb7c0a6675 i18n/cht/extensions/php/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "PHP 語言基礎知識",
-+=======
-+	"displayName": "PHP 語言功能",
-+>>>>>>> .their
- 	"description": "為 PHP 檔案提供語法醒目提示與括弧對應功能。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 0dd95be0c2c5736219707d03fc6d771b648d74e3 i18n/cht/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 66736a4e736cf7b9a66b648bff264434bc450d4c i18n/cht/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 fdc9d8bbad9cee053f5819b53fc025a818703d48 i18n/cht/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -32,7 +32,10 @@
- 	"infoBorder": "編輯器內資訊提示線的邊框色彩",
- 	"hintForeground": "編輯器內提示訊息的提示線前景色彩",
- 	"hintBorder": "編輯器內提示訊息的提示線邊框色彩",
-+<<<<<<< .our
- 	"unnecessaryForeground": "編輯器中不必要程式碼的前景色彩。",
-+=======
-+>>>>>>> .their
- 	"overviewRulerRangeHighlight": "概述反白範圍的尺規標記顏色。不能使用非透明的顏色來隱藏底層的樣式。",
- 	"overviewRuleError": "錯誤的概觀尺規標記色彩。",
- 	"overviewRuleWarning": "警示的概觀尺規標記色彩。",
-changed in both
-  base   100644 3faa343fdfdf735041dff8e2482f6cad7a0d80b9 i18n/cht/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 a2cc538e14e2cfd1305228b36fae8794fa7c56f9 i18n/cht/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 066b714df00596b380c0d1b18e55dbb2dec23bb0 i18n/cht/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-changed in both
-  base   100644 7117ed7c7220a53e3f3b5ea59d2b44f14012313c i18n/cht/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 790929bd611f6dd14a59e2ff8a6640378fde30cb i18n/cht/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 1633b008b0ba21a22ad3fb4e3315da33edf52e29 i18n/cht/src/vs/platform/theme/common/colorRegistry.i18n.json
-changed in both
-  base   100644 4bf77a965be26e6c11a46b26f0bddc5d857798b0 i18n/cht/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  our    100644 074f6b2402f4fe019ee3d9c00f5e2c58606d8173 i18n/cht/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 ca923fa42abcc57e00e9f46f6655e6fd33d388c7 i18n/cht/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -7,7 +7,10 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"timeout.formatOnSave": "在 {0} 毫秒後儲存時中止格式",
-+<<<<<<< .our
- 	"codeActionsOnSave.didTimeout": "在 {0} 毫秒後中止了 codeActionsOnSave",
-+=======
-+>>>>>>> .their
- 	"timeout.onWillSave": "在 1750 亳秒後中止 onWillSaveTextDocument 事件",
- 	"saveParticipants": "執行儲存參與者..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 f8343577d89e8fb835b06e2aee5839841dd54532 i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 bf339c91e8587ec53fe81a294c54ddc0f5aad010 i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 dc922198d0da5de074b1d6f037cb9307d78dd5ee i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -55,7 +55,11 @@
- 	"openFoldersInNewWindow": "控制資料夾應在新視窗中開啟或取代上一個使用中的視窗。\n- default: 除非已從應用程式內挑選資料夾 (例如，透過 [檔案] 功能表)，否則會在新視窗開啟\n- on: 資料夾會在新視窗開啟\n- off: 資料夾會取代上一個使用中視窗\n請注意，在某些情況下會略過此設定 (例如，使用了 -new-window 或 -reuse-window 命令列選項時)。",
- 	"window.openWithoutArgumentsInNewWindow.on": "開啟新空白視窗",
- 	"window.openWithoutArgumentsInNewWindow.off": "聚焦在上一個正在運行的執行個體",
-+<<<<<<< .our
- 	"openWithoutArgumentsInNewWindow": "控制不以引數啟動第二個執行個體時是否要開啟新的空白視窗，或是應聚焦於上一個執行的執行個體。\n- on: 開啟新的空白視窗\n- off: 上一個使用中的執行中執行個體將會受到聚焦\n請注意：仍可能發生忽略此設定的情形 (例如，在使用 -new-window 或 -reuse-window 命令列選項時)。",
-+=======
-+	"openWithoutArgumentsInNewWindow": "控制不以引數啟動第二個執行個體時是否要開啟新的空白視窗，或是應聚焦於上一個執行的執行個體。\n- 開啟: 開啟新的空白視窗\n- 關閉: 上一個使用中的執行中執行個體將會受到聚焦\n請注意，仍可能發生忽略此設定的情形 (例如，在使用 -new-window 或 -reuse-window 命令列選項時)。",
-+>>>>>>> .their
- 	"window.reopenFolders.all": "重新開啟所有視窗。",
- 	"window.reopenFolders.folders": "重新開啟所有資料夾。空白工作區將不會還原。",
- 	"window.reopenFolders.one": "重新開啟上一個使用中的視窗。",
-@@ -80,7 +84,10 @@
- 	"titleBarStyle": "調整視窗標題列的外觀。變更需要完整重新啟動才會套用。",
- 	"window.nativeTabs": "啟用 macOS Sierra 視窗索引標籤。請注意需要完全重新啟動才能套用變更，並且完成設定後原始索引標籤將會停用自訂標題列樣式。",
- 	"window.smoothScrollingWorkaround": "在還原最小化的 VS Code 視窗後，若捲動功能不再流暢，請啟用此因應措施。此因應措施適用於 Microsoft Surface 等具備精確軌跡板發生的捲動延遲問題 (https://github.com/Microsoft/vscode/issues/13612)。啟用此因應措施可能會在將視窗從最小化狀態還原後，導致版面稍微閃爍，但並不會造成任何傷害。",
-+<<<<<<< .our
- 	"window.clickThroughInactive": "若已啟用，按一下非使用中的視窗將會啟動該視窗並觸發其下的元素 (如果可以案的話)。若已停用，按一下非使用中視窗的任一處則只會啟動該視窗，必須再按一下才會觸發元素。",
-+=======
-+>>>>>>> .their
- 	"zenModeConfigurationTitle": "Zen Mode",
- 	"zenMode.fullScreen": "控制開啟 Zen Mode 是否也會將 Workbench 轉換為全螢幕模式。",
- 	"zenMode.centerLayout": "控制開啟 Zen Mode 是否也會置中配置。",
-changed in both
-  base   100644 219551b11e82afde93eaac4b3394aa30908eaf22 i18n/cht/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  our    100644 5b3899db4ffb2882109c34486febad4f0d0318e9 i18n/cht/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  their  100644 033debab2e1167f3581cc542d178d83d469ece66 i18n/cht/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-@@ -17,7 +17,11 @@
- 	"breakpointUnverifieddHover": "未驗證的中斷點",
- 	"functionBreakpointUnsupported": "此偵錯類型不支援函式中斷點",
- 	"breakpointDirtydHover": "未驗證的中斷點。檔案已修改，請重新啟動偵錯工作階段。",
-+<<<<<<< .our
- 	"logBreakpointUnsupported": "此偵錯類型不支援記錄點",
-+=======
-+	"logBreakpointUnsupported": "此偵錯類型不支援紀錄點",
-+>>>>>>> .their
- 	"conditionalBreakpointUnsupported": "此偵錯類型不支援的條件式中斷點",
- 	"hitBreakpointUnsupported": "此偵錯類型不支援點擊條件式中斷點"
- }
-\ No newline at end of file
-changed in both
-  base   100644 c84d5a3227a4aeadf2c4e2e00d7016f5f201f76e i18n/cht/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  our    100644 d80f95667d453bf66d6b75a8ae2e81e8a11d486f i18n/cht/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  their  100644 2c747d5afe2999848f3b386485fd373ab65ea4d2 i18n/cht/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-@@ -8,7 +8,11 @@
- 	],
- 	"toggleBreakpointAction": "偵錯: 切換中斷點",
- 	"conditionalBreakpointEditorAction": "偵錯: 新增條件中斷點...",
-+<<<<<<< .our
- 	"logPointEditorAction": "偵錯: 新增記錄點...",
-+=======
-+	"logPointEditorAction": "偵錯: 新增紀錄點...",
-+>>>>>>> .their
- 	"runToCursor": "執行至游標處",
- 	"debugEvaluate": "偵錯: 評估",
- 	"debugAddToWatch": "偵錯: 加入監看",
-changed in both
-  base   100644 314e9cddf9c8e506e07b2b827ba1f47cc4e46fd1 i18n/cht/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-  our    100644 9c6da9e6ef91ab0baaca35f754725a4ae7dcefff i18n/cht/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-  their  100644 f481d156b0e5088acbbe00e004f02b75f22b6703 i18n/cht/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-@@ -6,9 +6,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"breakpointWidgetLogMessagePlaceholder": "當命中中斷點時向記錄傳送訊息。會以內插值取代 {} 中的運算式。按一下 'Enter' 接受，或是按 'esc' 取消。",
- 	"breakpointWidgetHitCountPlaceholder": "符合叫用次數條件時中斷。按 'Enter' 鍵接受，按 'esc' 鍵取消。",
- 	"breakpointWidgetExpressionPlaceholder": "在運算式評估為 true 時中斷。按 'Enter' 鍵接受，按 'esc' 鍵取消。",
-+=======
-+	"breakpointWidgetLogMessagePlaceholder": "到達中斷點時紀錄訊息。按 'Enter' 鍵接受，按 'esc' 鍵取消。",
-+	"breakpointWidgetHitCountPlaceholder": "符合叫用次數條件時中斷。按 'Enter' 鍵接受，按 'esc' 鍵取消。",
-+	"breakpointWidgetExpressionPlaceholder": "在運算式評估為 true 時中斷。按 'Enter' 鍵接受，按 'esc' 鍵取消。",
-+	"breakpointWidgetLogMessageAriaLabel": "每次到達中斷點時程式將會記錄訊息。按 Enter 鍵接受，或按 Escape 鍵取消。",
-+	"breakpointWidgetHitCountAriaLabel": "程式只會在符合叫用次數時於此處停止。按 Enter 鍵接受，或按 Escape 鍵取消。",
-+	"breakpointWidgetAriaLabel": "程式只有在此條件為 true 時才會在此停止。請按 Enter 鍵接受，或按 Esc 鍵取消。",
-+>>>>>>> .their
- 	"expression": "運算式",
- 	"hitCount": "叫用次數",
- 	"logMessage": "日誌訊息"
-changed in both
-  base   100644 21124f7d54b3abffb58bb36b4fd9617f5127f05a i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  our    100644 5ae66eaf38de2735d7bd3dbe86cbb8ef523d9473 i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  their  100644 95775285344af01308b44db64ce5932011aa6424 i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-@@ -24,6 +24,7 @@
- 	"enableBreakpoints": "啟用資料行 {0} 的內嵌中斷點",
- 	"enableBreakpointOnLine": "啟用行中斷點",
- 	"addBreakpoint": "加入中斷點",
-+<<<<<<< .our
- 	"addConditionalBreakpoint": "新增條件中斷點...",
- 	"addLogPoint": "新增記錄點...",
- 	"breakpointHasCondition": "此 {0} 具有會在移除時消失的 {1}。請考慮改為停用 {0}。",
-@@ -32,5 +33,9 @@
- 	"removeLogPoint": "移除 {0}",
- 	"disableLogPoint": "停用 {0}",
- 	"cancel": "取消",
-+=======
-+	"conditionalBreakpoint": "新增條件中斷點...",
-+	"addLogPoint": "新增紀錄點...",
-+>>>>>>> .their
- 	"addConfiguration": "新增組態..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 d4a12e733fffdea144eded54f3441845da33a68f i18n/cht/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  our    100644 b15f9a6ac6a8909de8d8f39d7c994b78fdd0957c i18n/cht/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  their  100644 e9603c4d092bb9619235848e41c0c70c976edfbc i18n/cht/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-@@ -8,6 +8,24 @@
- 	],
- 	"debugAdapterBinNotFound": "偵錯配接器可執行檔 '{0}' 不存在。",
- 	"debugAdapterCannotDetermineExecutable": "無法判斷偵錯配接器 '{0}' 的可執行檔。",
-+<<<<<<< .our
- 	"unableToLaunchDebugAdapter": "無法從 '{0}' 啟動偵錯配接器。",
- 	"unableToLaunchDebugAdapterNoArgs": "無法啟動偵錯配接器。"
-+=======
-+	"launch.config.comment1": "使用 IntelliSense 以得知可用的屬性。",
-+	"launch.config.comment2": "暫留以檢視現有屬性的描述。",
-+	"launch.config.comment3": "如需詳細資訊，請瀏覽: {0}",
-+	"debugType": "組態的類型。",
-+	"debugTypeNotRecognised": "無法辨識此偵錯類型.請確認已有安裝並啟用相對應的偵錯擴充功能.",
-+	"node2NotSupported": "\"node2\" 已不再支援，請改用 \"node\"，並將 \"protocol\" 屬性設為 \"inspector\"。",
-+	"debugName": "組態的名稱; 出現在啟動組態下拉式功能表中。",
-+	"debugRequest": "要求組態的類型。可以是 [啟動] 或 [附加]。",
-+	"debugServer": "僅限偵錯延伸模組開發: 如果指定了連接埠，VS Code 會嘗試連線至以伺服器模式執行的偵錯配接器",
-+	"debugPrelaunchTask": "偵錯工作階段啟動前要執行的工作。",
-+	"debugPostDebugTask": "偵錯工作階段結束後要執行的工作。",
-+	"debugWindowsConfiguration": "Windows 特定的啟動設定屬性。",
-+	"debugOSXConfiguration": "OS X 特定的啟動設定屬性。",
-+	"debugLinuxConfiguration": "Linux 特定的啟動設定屬性。",
-+	"deprecatedVariables": "'env.'、'config.' 及 'command.' 已標示為即將淘汰，請改用 'env:'、'config:' 及 'command:'。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 4bed8103f5e4faa90810b9b9714b58be83f41013 i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  our    100644 6233388a0658b8bb5644c8edb3109bcd919c8977 i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  their  100644 7fcac98abe0171084561939f8422af960e40102c i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-@@ -14,7 +14,11 @@
- 	"workspaceRecommendedExtensions": "工作區建議",
- 	"builtInExtensions": "功能",
- 	"builtInThemesExtensions": "主題",
-+<<<<<<< .our
- 	"builtInBasicsExtensions": "程式語言",
-+=======
-+	"builtInBasicsExtensions": "語言",
-+>>>>>>> .their
- 	"searchExtensions": "在 Marketplace 中搜尋擴充功能",
- 	"sort by installs": "排序依據: 安裝計數",
- 	"sort by rating": "排序依據: 評等",
-changed in both
-  base   100644 cc6a6ac83fae11379e87f6ec5d399d43f4c89b5c i18n/cht/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-  our    100644 e1655af8772ca891425984734f9bb7ee6aaaf90f i18n/cht/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-  their  100644 d7ae619dc7f2f2fff2f1126dc9bb5b9e74be1bb7 i18n/cht/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-@@ -8,8 +8,13 @@
- 	],
- 	"textFileEditor": "文字檔編輯器",
- 	"createFile": "建立檔案",
-+<<<<<<< .our
- 	"relaunchWithIncreasedMemoryLimit": "以 {0} MB 重新啟動",
- 	"configureMemoryLimit": "設定記憶體限制",
-+=======
-+	"relaunchWithIncreasedMemoryLimit": "重新啟動",
-+	"configureMemoryLimit": "設置",
-+>>>>>>> .their
- 	"fileEditorWithInputAriaLabel": "{0}。文字檔編輯器。",
- 	"fileEditorAriaLabel": "文字檔編輯器。"
- }
-\ No newline at end of file
-changed in both
-  base   100644 313bfa047bca4dda7995d65ae99e84629f31bb65 i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 17eb85d0cba4bf089ef8b48577e75838680e330d i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 b55bc9d97cdc0883d939a79fb0171ffa55b9e89f i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -33,6 +33,7 @@
- 	"trashFailed": "無法使用垃圾筒刪除。您要改為永久刪除嗎？",
- 	"deletePermanentlyButtonLabel": "永久刪除(&&D)",
- 	"retryButtonLabel": "重試(&&R)",
-+<<<<<<< .our
- 	"confirmMoveTrashMessageFilesAndDirectories": "確定要刪除下列 {0} 個檔案/目錄及其內容嗎?",
- 	"confirmMoveTrashMessageMultipleDirectories": "確定要刪除下列 {0} 個目錄及其內容嗎?",
- 	"confirmMoveTrashMessageMultiple": "確定要刪除以下 {0} 個檔案嗎？",
-@@ -44,6 +45,9 @@
- 	"confirmDeleteMessageFolder": "您確定要永久刪除 '{0}' 和其中的內容嗎?",
- 	"confirmDeleteMessageFile": "您確定要永久刪除 '{0}' 嗎?",
- 	"addFiles": "新增檔案",
-+=======
-+	"importFiles": "匯入檔案",
-+>>>>>>> .their
- 	"confirmOverwrite": "目的資料夾中已有同名的檔案或資料夾。要取代它嗎?",
- 	"replaceButtonLabel": "取代(&&R)",
- 	"fileIsAncestor": "要貼上的檔案是在目地資料夾的上層 ",
-changed in both
-  base   100644 c024cac3cb02eb35104c11d80ff01a4325a20e79 i18n/cht/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 be3fbea1a573a3ae7e9cb55afbd7c2737b3d71f0 i18n/cht/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 b257e6cd883a1913e73a0faaaef04c61d29bb495 i18n/cht/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-@@ -35,7 +35,11 @@
- 	"hotExit": "控制是否讓不同工作階段記住未儲存的檔案，並允許在結束編輯器時跳過儲存提示。",
- 	"useExperimentalFileWatcher": "使用新的實驗性檔案監看員。",
- 	"defaultLanguage": "指派給新檔案的預設語言模式。",
-+<<<<<<< .our
- 	"maxMemoryForLargeFilesMB": "控制 VS Code 在重新啟動後常是開啟大型檔案時，可使用多少記憶體。在命令列上指定 --max-memory=NEWSIZE 也能達到相同效果。",
-+=======
-+	"maxMemoryForLargeFilesMB": "應用程式在重新啟動以打開大型檔案時的記憶體限制。如果您希望以更高的限制啟動, 你可以使用 --max-memory=NEWSIZE 參數從命令列啟動應用程式。",
-+>>>>>>> .their
- 	"editorConfigurationTitle": "編輯器",
- 	"formatOnSave": "在儲存時設定檔案格式。格式器必須處於可用狀態、檔案不得自動儲存，且編輯器不得關機。",
- 	"formatOnSaveTimeout": "儲存時格式化超時。指定 formatOnSave 命令的時間限制 (以毫秒為單位)。超過指定超時時間的命令將被取消。",
-changed in both
-  base   100644 3f54e82bcea654ebc6329631d91a62aa3acacb9e i18n/cht/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  our    100644 7e6437084b55609134ec98e1b47e3be7f5cbe68a i18n/cht/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  their  100644 ee61a87b1bd4392abb616192f2662dcbd3bf8dd5 i18n/cht/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-changed in both
-  base   100644 c79987737e6260aa9f91e44bb88d2d72a9f57526 i18n/cht/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-  our    100644 42320096aec9008759f1c221d0d6bf6b06427785 i18n/cht/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-  their  100644 734d07ddaf5e1614cff311623106b7fcf1109fce i18n/cht/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-changed in both
-  base   100644 84c0330c5cb9342519ecaa48b7cfc940bfb0d1f5 i18n/cht/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-  our    100644 45f0712eab001c1f3b7b1d56f414d42c5a608daf i18n/cht/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-  their  100644 1d32ee80c9cb475ebc0b49ee4d721925c473369a i18n/cht/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-changed in both
-  base   100644 02db571b8043d59debf0fe494c78d662f5b78d04 i18n/cht/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 9a7f1ae524570aa14ab8735a1962f8357f3564aa i18n/cht/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 4c9bd3ae056961315543830adbcdecb3f47839c5 i18n/cht/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-changed in both
-  base   100644 08bb4aff71d6c51a50955cf2ea4dc312515867dc i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 b65af1ec7222f34f85465a0e272b45818ced6ea4 i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 d1b1d319c2084b793742f428b827229842cbbc8b i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -54,10 +54,17 @@
- 	"nextTerminalFindTerm": "顯示下一個尋找字詞",
- 	"previousTerminalFindTerm": "顯示上一個尋找字詞",
- 	"quickOpenTerm": "切換使用中的終端機 ",
-+<<<<<<< .our
- 	"workbench.action.terminal.scrollToPreviousCommand": "捲動至上一個命令",
- 	"workbench.action.terminal.scrollToNextCommand": "捲動至下一個命令",
- 	"workbench.action.terminal.selectToPreviousCommand": "選取上一個命令",
- 	"workbench.action.terminal.selectToNextCommand": "選取下一個命令",
- 	"workbench.action.terminal.selectToPreviousLine": "選擇上一行",
- 	"workbench.action.terminal.selectToNextLine": "選擇下一行"
-+=======
-+	"workbench.action.terminal.focusPreviousCommand": "聚焦上一個命令",
-+	"workbench.action.terminal.focusNextCommand": "聚焦下一個命令",
-+	"workbench.action.terminal.selectToPreviousCommand": "選取上一個命令",
-+	"workbench.action.terminal.selectToNextCommand": "選取下一個命令"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 325db14549676396cd5bec1cad4e0e499a5752fb i18n/cht/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
-  our    100644 d67fb8af8d51158a541e53fd1e15630f7e772402 i18n/cht/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
-  their  100644 c05369a2738d79c8a4f616424f4d9f2082423963 i18n/cht/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
-@@ -6,5 +6,20 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"stringsOnlySupported": "命令 {0} 未回傳字串結果。僅支援字串作為變數替換的命令結果。"
-+=======
-+	"canNotResolveWorkspaceFolderMultiRoot": "在多資料工作區中無法解析 ${workspaceFolder} 。此變數範圍使用冒號 ( : ) 及資料夾名稱。",
-+	"canNotResolveWorkspaceFolder": "無法解析 $ {workspaceFolder}。請開啟一個資料夾。",
-+	"canNotResolveFolderBasenameMultiRoot": "在多資料工作區中無法解析 ${workspaceFolderBasename}。此變數範圍使用冒號 ( : ) 及資料夾名稱。",
-+	"canNotResolveFolderBasename": "無法解析 ${workspaceFolderBasename}。請開啟一個資料夾。",
-+	"canNotResolveLineNumber": " 無法解析 $ {lineNumber} , 請打開編輯器。",
-+	"canNotResolveSelectedText": "無法解析 $ {selectedText} , 請開啟編輯器。",
-+	"canNotResolveFile": "無法解析 $ {file} , 請開啟編輯器。",
-+	"canNotResolveRelativeFile": "無法解析 $ {relativeFile} , 請開啟編輯器。",
-+	"canNotResolveFileDirname": "無法解析 $ {fileDirname} , 請開啟編輯器。",
-+	"canNotResolveFileExtname": "無法解析 $ {fileExtname} , 請開啟編輯器。",
-+	"canNotResolveFileBasename": "無法解析 $ {fileBasename} , 請開啟編輯器。",
-+	"canNotResolveFileBasenameNoExtension": "無法解析 $ {fileBasenameNoExtension} , 請開啟編輯器。"
-+>>>>>>> .their
- }
-\ No newline at end of file
-merged
-  result 100644 d36af5140caa766c19c77306e0a7c2c45f1063b5 i18n/cht/src/vs/workbench/services/files/node/fileService.i18n.json
-  our    100644 ad99e777e96d2d1848aadc8ca56eb931f70d076e i18n/cht/src/vs/workbench/services/files/node/fileService.i18n.json
-@@ -9,6 +9,7 @@
- 	"fileInvalidPath": "檔案資源 ({0}) 無效",
- 	"fileIsDirectoryError": "檔案是目錄",
- 	"fileNotModifiedError": "未修改檔案的時間",
-+	"fileTooLargeForHeapError": "檔案大小超過預設記憶體限制。請以較高的限制重新啟動。目前的設定已設定為以 {0}MB 重新啟動",
- 	"fileTooLargeError": "檔案太大無法開啟",
- 	"fileNotFoundError": "找不到檔案 ({0})",
- 	"fileBinaryError": "檔案似乎是二進位檔，因此無法當做文字開啟",
-changed in both
-  base   100644 0dac2469d9815dfc5cbecc261ed4f7a984808da5 i18n/deu/extensions/emmet/package.i18n.json
-  our    100644 76a0f1cf2f4933fe2973e0cc716d5590fccebd37 i18n/deu/extensions/emmet/package.i18n.json
-  their  100644 0edaf6e5d6875889d0429872afe23a1967b5e6c3 i18n/deu/extensions/emmet/package.i18n.json
-@@ -60,6 +60,10 @@
- 	"emmetPreferencesCssMozProperties": "Durch Trennzeichen getrennte CSS-Eigenschaften, die das \"moz\"-Herstellerpräfix erhalten, wenn sie in einer Emmet-Abkürzung verwendet werden, die mit \"-\" beginnt. Legen Sie eine leere Zeichenfolge fest, um das \"moz\"-Präfix immer zu vermeiden.",
- 	"emmetPreferencesCssOProperties": "Durch Trennzeichen getrennte CSS-Eigenschaften, die das \"o\"-Herstellerpräfix erhalten, wenn sie in einer Emmet-Abkürzung verwendet werden, die mit \"-\" beginnt. Legen Sie eine leere Zeichenfolge fest, um das \"o\"-Präfix immer zu vermeiden.",
- 	"emmetPreferencesCssMsProperties": "Durch Trennzeichen getrennte CSS-Eigenschaften, die das \"ms\"-Herstellerpräfix erhalten, wenn sie in einer Emmet-Abkürzung verwendet werden, die mit \"-\" beginnt. Legen Sie eine leere Zeichenfolge fest, um das \"ms\"-Präfix immer zu vermeiden.",
-+<<<<<<< .our
- 	"emmetPreferencesCssFuzzySearchMinScore": "Das Mindestergebnis (zwischen 0 und 1), das die Abkürzung mit Fuzzyübereinstimmung erreichen muss. Niedrigere Werte führen zu vielen falsch positiven Übereinstimmungen, höhere Werte verringern unter Umständen die möglichen Übereinstimmungen.",
- 	"emmetOptimizeStylesheetParsing": "Bei der Einstellung FALSE wird die gesamte Datei analysiert, um zu bestimmten, ob die aktuelle Position zum Erweitern von Emmet-Abkürzungen gültig ist. Bei der Einstellung TRUE wird nur der Inhalt um die die aktuelle Position in CSS-/SCSS-/LESS-Dateien analysiert."
-+=======
-+	"emmetPreferencesCssFuzzySearchMinScore": "Das Mindestergebnis (zwischen 0 und 1), das die Abkürzung mit Fuzzyübereinstimmung erreichen muss. Niedrigere Werte führen zu vielen falsch positiven Übereinstimmungen, höhere Werte verringern unter Umständen die möglichen Übereinstimmungen."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 af42eef9ac721d09fff92fac3044d62dcf871fdb i18n/deu/extensions/git/out/commands.i18n.json
-  our    100644 1abad5f86ec11c777f2319fc1588d47f5ea1c8f5 i18n/deu/extensions/git/out/commands.i18n.json
-  their  100644 7efb13a1a102b58fbcfa16e05ec6d0981aa476a6 i18n/deu/extensions/git/out/commands.i18n.json
-changed in both
-  base   100644 ef10b47a8b3d9ee7c866c8860d3a203a44bb3070 i18n/deu/extensions/php/package.i18n.json
-  our    100644 5c068410d3db4868bf1390c91ee395d7944d41c8 i18n/deu/extensions/php/package.i18n.json
-  their  100644 65da88d745b0a2ee9ff1937ec6e7127771df92b9 i18n/deu/extensions/php/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "PHP-Sprachgrundlagen",
-+=======
-+	"displayName": "PHP-Sprachfeatures",
-+>>>>>>> .their
- 	"description": "Bietet Syntaxhervorhebung und Klammernpaare für PHP-Dateien."
- }
-\ No newline at end of file
-changed in both
-  base   100644 cbc53f2c2a67ebb92c78cb389678757bee6a9894 i18n/deu/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 7bcd160f251f75f4318d89da439565bbd4c696e5 i18n/deu/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 fc7ba3f58b4d2c4d8cfd30408c4ac2202ae66e5c i18n/deu/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -32,7 +32,10 @@
- 	"infoBorder": "Rahmenfarbe von Informationsunterstreichungen im Editor.",
- 	"hintForeground": "Vordergrundfarbe der Hinweisunterstreichungen im Editor.",
- 	"hintBorder": "Rahmenfarbe der Hinweisunterstreichungen im Editor.",
-+<<<<<<< .our
- 	"unnecessaryForeground": "Vordergrundfarbe für nicht benötigten Code im Editor.",
-+=======
-+>>>>>>> .their
- 	"overviewRulerRangeHighlight": "Übersichtslineal-Markierungsfarbe für Bereichshervorhebungen. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen.",
- 	"overviewRuleError": "Übersichtslineal-Markierungsfarbe für Fehler.",
- 	"overviewRuleWarning": "Übersichtslineal-Markierungsfarbe für Warnungen.",
-changed in both
-  base   100644 8eaf7a54f3724c5649ee2156b8618855c0b2ac52 i18n/deu/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 efdaa6c50b1a7075eb309307a09334b8e64087d3 i18n/deu/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 fe6e6c0c3168cf1dadb1d5b31eb6ce7bdf55a44e i18n/deu/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -25,6 +25,11 @@
- 	"uninstallDependeciesConfirmation": "Möchten Sie nur \"{0}\" oder auch die zugehörigen Abhängigkeiten deinstallieren?",
- 	"uninstallOnly": "Nur Erweiterung",
- 	"uninstallAll": "Alle deinstallieren",
-+<<<<<<< .our
-+=======
-+	"uninstallConfirmation": "Möchten Sie \"{0}\" deinstallieren?",
-+	"ok": "OK",
-+>>>>>>> .their
- 	"singleDependentError": "Die Erweiterung \"{0}\" kann nicht deinstalliert werden. Die Erweiterung \"{1}\" hängt von dieser Erweiterung ab.",
- 	"twoDependentsError": "Die Erweiterung \"{0}\" kann nicht deinstalliert werden. Die Erweiterungen \"{1}\" und \"{2}\" hängen von dieser Erweiterung ab.",
- 	"multipleDependentsError": "Die Erweiterung \"{0}\" kann nicht deinstalliert werden. Die Erweiterungen \"{1}\" und \"{2}\" sowie weitere hängen von dieser Erweiterung ab.",
-changed in both
-  base   100644 2e98d7310d1843f4ec476394f338e037c5f2d049 i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 b32f03c31fd5ffcb9742f2b1188daade81a7b028 i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 d703cc6af7769bf1beebc2783d069eb6fa9e7330 i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json
-changed in both
-  base   100644 4290f5cc6933ad4c58c724f46473852a3540b00d i18n/deu/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  our    100644 75b2994052291390999698977515572a80141a18 i18n/deu/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 1f1499c09e65d1d58ad0f3e18c461c55620accf2 i18n/deu/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -7,7 +7,10 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"timeout.formatOnSave": "Formatieren beim Speichern nach {0} ms abgebrochen",
-+<<<<<<< .our
- 	"codeActionsOnSave.didTimeout": "codeActionsOnSave nach {0} ms abgebrochen",
-+=======
-+>>>>>>> .their
- 	"timeout.onWillSave": "Bei onWillSaveTextDocument-Ereignis nach 1750 ms abgebrochen",
- 	"saveParticipants": "Speichern von Teilnehmern wird ausgeführt …"
- }
-\ No newline at end of file
-changed in both
-  base   100644 21a380f129721afa0f652f612f85838edbada430 i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 fc92fd392259fb9b2d1dec1cecdbc3c76bdc7440 i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 5237995530882223bb0572ce8fd0b2c74e19b2f3 i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -80,7 +80,10 @@
- 	"titleBarStyle": "Passt das Aussehen der Titelleiste des Fensters an. Zum Anwenden der Änderungen ist ein vollständiger Neustart erforderlich.",
- 	"window.nativeTabs": "Aktiviert MacOS Sierra-Fensterregisterkarten. Beachten Sie, dass zum Übernehmen von Änderungen ein vollständiger Neustart erforderlich ist und durch ggf. konfigurierte native Registerkarten ein benutzerdefinierter Titelleistenstil deaktiviert wird.",
- 	"window.smoothScrollingWorkaround": "Aktivieren Sie diese Problemumgehung, wenn der Bildlauf nach der Wiederherstellung eines minimierten VS Code-Fensters nicht mehr reibungslos funktioniert. Dies ist eine Problemumgehung für ein Problem (https://github.com/Microsoft/vscode/issues/13612), bei dem der Bildlauf auf Geräten mit präzisen Trackpads wie etwa den Surface-Geräten von Microsoft verzögert ist. Wenn Sie diese Problemumgehung aktivieren, flackert die Anzeige nach dem Wiederherstellen eines Fensters aus dem minimierten Zustand unter Umständen ein wenig, ansonsten treten jedoch keine Probleme auf.",
-+<<<<<<< .our
- 	"window.clickThroughInactive": "Ist dies aktiviert, wird beim Klicken auf ein inaktives Fenster das Fenster aktiviert, und das Element unter der Maus wird ausgelöst, wenn es angeklickt werden kann. Wenn es deaktiviert ist, wird durch Klicken auf eine beliebige Stelle in einem inaktiven Fenster nur das Fenster aktiviert, und Sie müssen das Element zusätzlich anklicken.",
-+=======
-+>>>>>>> .their
- 	"zenModeConfigurationTitle": "Zen-Modus",
- 	"zenMode.fullScreen": "Steuert, ob die Workbench durch das Aktivieren des Zen-Modus in den Vollbildmodus wechselt.",
- 	"zenMode.centerLayout": "Steuert, ob das Layout durch Aktivieren des Zen-Modus ebenfalls zentriert wird.",
-changed in both
-  base   100644 6a4e04d332e9281f9901afe11418d3ce23bd41f0 i18n/deu/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  our    100644 b4980d90513329055396eb8b728644dabebdc442 i18n/deu/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  their  100644 876d48c32e88be15cadb0d13f8ec52ab1f5cff7c i18n/deu/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-@@ -17,7 +17,11 @@
- 	"breakpointUnverifieddHover": "Nicht überprüfter Haltepunkt",
- 	"functionBreakpointUnsupported": "Funktionshaltepunkte werden von diesem Debugtyp nicht unterstützt.",
- 	"breakpointDirtydHover": "Nicht überprüfter Haltepunkt. Die Datei wurde geändert. Bitte starten Sie die Debugsitzung neu.",
-+<<<<<<< .our
- 	"logBreakpointUnsupported": "Protokollpunkte werden für diesen Debugtyp nicht unterstützt",
-+=======
-+	"logBreakpointUnsupported": "Protokollpunkte werden für diesen Debugtyp nicht unterstützt.",
-+>>>>>>> .their
- 	"conditionalBreakpointUnsupported": "Bedingte Haltepunkte werden für diesen Debugtyp nicht unterstützt.",
- 	"hitBreakpointUnsupported": "Bedingte Trefferhaltepunkte werden für diesen Debugtyp nicht unterstützt."
- }
-\ No newline at end of file
-changed in both
-  base   100644 d105d95f39c855b412a682dc8c6ff99835ddd618 i18n/deu/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  our    100644 61e2a86a93e2e3c33425de727e05e70bd4224541 i18n/deu/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  their  100644 7540c5e0ca9e06685974b3c70616bee125f00f32 i18n/deu/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-changed in both
-  base   100644 93b4d514d00499c45fe1202d551fc12d6848f11a i18n/deu/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-  our    100644 7cc2728b73cd74d5f35ab99be72e3bcc387ac4fe i18n/deu/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-  their  100644 489604dbfd968a28e0491bc98ebd75d94eb8c316 i18n/deu/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-@@ -6,9 +6,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"breakpointWidgetLogMessagePlaceholder": "Zu protokollierende Nachricht, wenn der Haltepunkt erreicht wird. Ausdrücke innerhalb von {} werden interpoliert. Betätigen Sie die EINGABETASTE, um dies zu akzeptieren, oder ECS, um den Vorgang abzubrechen.",
- 	"breakpointWidgetHitCountPlaceholder": "Unterbrechen, wenn die Bedingung für die Trefferanzahl erfüllt ist. EINGABETASTE zum Akzeptieren, ESC-TASTE zum Abbrechen.",
- 	"breakpointWidgetExpressionPlaceholder": "Unterbrechen, wenn der Ausdruck als TRUE ausgewertet wird. EINGABETASTE zum Akzeptieren, ESC-TASTE zum Abbrechen.",
-+=======
-+	"breakpointWidgetLogMessagePlaceholder": "Zu protokollierende Nachricht, wenn der Haltepunkt erreicht wird. EINGABETASTE zum Akzeptieren, ESC-TASTE zum Abbrechen.",
-+	"breakpointWidgetHitCountPlaceholder": "Unterbrechen, wenn die Bedingung für die Trefferanzahl erfüllt ist. EINGABETASTE zum Akzeptieren, ESC-TASTE zum Abbrechen.",
-+	"breakpointWidgetExpressionPlaceholder": "Unterbrechen, wenn der Ausdruck als TRUE ausgewertet wird. EINGABETASTE zum Akzeptieren, ESC-TASTE zum Abbrechen.",
-+	"breakpointWidgetLogMessageAriaLabel": "Das Programm protokolliert diese Nachricht, wenn der Haltepunkt erreicht wird. Drücken Sie zum Akzeptieren die EINGABETASTE oder ESC, um den Vorgang abzubrechen.",
-+	"breakpointWidgetHitCountAriaLabel": "Das Programm wird nur angehalten, wenn die Bedingung für die Trefferanzahl erfüllt ist. Drücken Sie zum Akzeptieren die EINGABETASTE oder ESC, um den Vorgang abzubrechen.",
-+	"breakpointWidgetAriaLabel": "Das Programm wird nur angehalten, wenn diese Bedingung erfüllt ist. Drücken Sie zum Akzeptieren die EINGABETASTE oder ESC, um den Vorgang abzubrechen.",
-+>>>>>>> .their
- 	"expression": "Ausdruck",
- 	"hitCount": "Trefferanzahl",
- 	"logMessage": "Protokollmeldung"
-changed in both
-  base   100644 ddf54889d34d5ac66ebe1d2121ebca78298cca00 i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  our    100644 7acc6509b24f394f4d1266257c48f3e0fbbaa375 i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  their  100644 3977ebef2a11dac757397eace2517bb2ea9ae003 i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-@@ -24,6 +24,7 @@
- 	"enableBreakpoints": "Inlinehaltepunkt in Spalte {0} aktivieren",
- 	"enableBreakpointOnLine": "Zeilenhaltepunkt aktivieren",
- 	"addBreakpoint": "Haltepunkt hinzufügen",
-+<<<<<<< .our
- 	"addConditionalBreakpoint": "Bedingten Haltepunkt hinzufügen...",
- 	"addLogPoint": "Protokollpunkt hinzufügen …",
- 	"breakpointHasCondition": "Dieser {0} hat eine {1}, die beim Entfernen verloren geht. Deaktivieren Sie stattdessen ggf. den {0}.",
-@@ -32,5 +33,9 @@
- 	"removeLogPoint": "{0} entfernen",
- 	"disableLogPoint": "{0} deaktivieren",
- 	"cancel": "Abbrechen",
-+=======
-+	"conditionalBreakpoint": "Bedingten Haltepunkt hinzufügen...",
-+	"addLogPoint": "Protokollpunkt hinzufügen …",
-+>>>>>>> .their
- 	"addConfiguration": "Konfiguration hinzufügen..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 d9c6aec8ad3637a31ad622d6f3525d6cf8aec8f0 i18n/deu/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  our    100644 9b039afb7e7129891b940975939709ed5db6f52c i18n/deu/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  their  100644 8a5ea291077caa4598dd79f645a6f36ee84c8d0b i18n/deu/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-@@ -8,6 +8,24 @@
- 	],
- 	"debugAdapterBinNotFound": "Die ausführbare Datei \"{0}\" des Debugadapters ist nicht vorhanden.",
- 	"debugAdapterCannotDetermineExecutable": "Die ausführbare Datei \"{0}\" des Debugadapters kann nicht bestimmt werden.",
-+<<<<<<< .our
- 	"unableToLaunchDebugAdapter": "Der Debugadapter kann nicht aus {0} gestartet werden.",
- 	"unableToLaunchDebugAdapterNoArgs": "Debugadapter kann nicht gestartet werden."
-+=======
-+	"launch.config.comment1": "Verwendet IntelliSense zum Ermitteln möglicher Attribute.",
-+	"launch.config.comment2": "Zeigen Sie auf vorhandene Attribute, um die zugehörigen Beschreibungen anzuzeigen.",
-+	"launch.config.comment3": "Weitere Informationen finden Sie unter {0}",
-+	"debugType": "Der Typ der Konfiguration.",
-+	"debugTypeNotRecognised": "Dieser Debugging-Typ wurde nicht erkannt. Bitte installieren und aktivieren Sie die dazugehörige Debugging-Erweiterung.",
-+	"node2NotSupported": "\"node2\" wird nicht mehr unterstützt, verwenden Sie stattdessen \"node\", und legen Sie das Attribut \"protocol\" auf \"inspector\" fest.",
-+	"debugName": "Der Name der Konfiguration. Er wird im Dropdownmenü der Startkonfiguration angezeigt.",
-+	"debugRequest": "Der Anforderungstyp der Konfiguration. Der Wert kann \"launch\" oder \"attach\" sein.",
-+	"debugServer": "Nur für die Entwicklung von Debugerweiterungen: Wenn ein Port angegeben ist, versucht der VS-Code, eine Verbindung mit einem Debugadapter herzustellen, der im Servermodus ausgeführt wird.",
-+	"debugPrelaunchTask": "Ein Task, der ausgeführt werden soll, bevor die Debugsitzung beginnt.",
-+	"debugPostDebugTask": "Ein Task, der ausgeführt werden soll, nachdem die Debugsitzung endet.",
-+	"debugWindowsConfiguration": "Windows-spezifische Startkonfigurationsattribute.",
-+	"debugOSXConfiguration": "OS X-spezifische Startkonfigurationsattribute.",
-+	"debugLinuxConfiguration": "Linux-spezifische Startkonfigurationsattribute.",
-+	"deprecatedVariables": "\"env.\", \"config.\" und \"command.\" sind veraltet, verwenden Sie stattdessen \"env:\", \"config:\" und \"command:\"."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7b308ecd6d441f0eaef6f3ba975853463d461726 i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  our    100644 cf7a07fdcb5de4fa57ac5ab17021ee98e54c3fc8 i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-  their  100644 a2f215a756f957f924e9374fa63b362726c5327b i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
-@@ -61,7 +61,11 @@
- 	"disabled": "Deaktiviert",
- 	"disabled globally": "Deaktiviert",
- 	"disabled workspace": "Für diesen Arbeitsbereich deaktiviert",
-+<<<<<<< .our
- 	"disableAll": "Alle installierten Erweiterungen deaktivieren",
-+=======
-+	"disableAll": "Alle installierten Erweiterungen löschen",
-+>>>>>>> .their
- 	"disableAllWorkspace": "Alle installierten Erweiterungen für diesen Arbeitsbereich deaktivieren",
- 	"enableAll": "Alle Erweiterungen aktivieren",
- 	"enableAllWorkspace": "Alle Erweiterungen für diesen Arbeitsbereich aktivieren",
-changed in both
-  base   100644 179eb06b2349a03ebee4cd80aa206d7b017f9685 i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  our    100644 34a1a3d6da4aff0a786a99cb931978e719f127b5 i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  their  100644 d7c247b55c5267d490279aac862adca9eb1e3717 i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-@@ -13,7 +13,11 @@
- 	"publisher": "Name des Herausgebers",
- 	"install count": "Installationsanzahl",
- 	"rating": "Bewertung",
-+<<<<<<< .our
- 	"repository": "Repository",
-+=======
-+	"repository": "Repositorium",
-+>>>>>>> .their
- 	"license": "Lizenz",
- 	"details": "Details",
- 	"detailstooltip": "Details zur Erweiterung, die aus der Datei \"README.md\" der Erweiterung gerendert wurden",
-changed in both
-  base   100644 a3725fa64c59f98c8e680bc9f2b8db40dc66ce9c i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  our    100644 7344b01b4a3219fe21a92df254af8af45008be39 i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  their  100644 a4f734c3b4ed62ab97c34eef754ad45f01a09684 i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-@@ -14,7 +14,11 @@
- 	"workspaceRecommendedExtensions": "Arbeitsbereich-Empfehlungen",
- 	"builtInExtensions": "Features",
- 	"builtInThemesExtensions": "Designs",
-+<<<<<<< .our
- 	"builtInBasicsExtensions": "Programmiersprachen",
-+=======
-+	"builtInBasicsExtensions": "Sprachen",
-+>>>>>>> .their
- 	"searchExtensions": "Nach Erweiterungen im Marketplace suchen",
- 	"sort by installs": "Sortieren nach: Installationsanzahl",
- 	"sort by rating": "Sortieren nach: Bewertung",
-changed in both
-  base   100644 eeec7c2ad9ddd6ae91dbe3e2ca6f37cbb7eeeed7 i18n/deu/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-  our    100644 58ca31c36dca8c85d69fa11eab2efeefc720091f i18n/deu/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-  their  100644 0ca12a6abedabe202d7ccda76343019c96e8269f i18n/deu/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-@@ -8,8 +8,13 @@
- 	],
- 	"textFileEditor": "Textdatei-Editor",
- 	"createFile": "Datei erstellen",
-+<<<<<<< .our
- 	"relaunchWithIncreasedMemoryLimit": "Mit {0} MB neu starten",
- 	"configureMemoryLimit": "Arbeitsspeicherbeschränkung konfigurieren",
-+=======
-+	"relaunchWithIncreasedMemoryLimit": "Neustarten",
-+	"configureMemoryLimit": "Konfigurieren",
-+>>>>>>> .their
- 	"fileEditorWithInputAriaLabel": "{0}. Textdatei-Editor.",
- 	"fileEditorAriaLabel": "Textdatei-Editor"
- }
-\ No newline at end of file
-changed in both
-  base   100644 4ba0d0b4feae20fb293c7784f2b2a5e6652e0fa7 i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 e5540f790640626d6989cde6c94da0327b708bbf i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 b27a81bffed65ba1053624395e235e685ee8dc35 i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -38,12 +38,27 @@
- 	"confirmMoveTrashMessageMultiple": "Möchten Sie die folgenden {0} Dateien löschen?",
- 	"confirmMoveTrashMessageFolder": "Möchten Sie \"{0}\" samt Inhalt wirklich löschen?",
- 	"confirmMoveTrashMessageFile": "Möchten Sie \"{0}\" wirklich löschen?",
-+<<<<<<< .our
- 	"confirmDeleteMessageFilesAndDirectories": "Möchten Sie die folgenden {0} Dateien/Verzeichnisse und ihren Inhalt dauerhaft löschen?",
- 	"confirmDeleteMessageMultipleDirectories": "Möchten Sie die folgenden {0} Verzeichnisse und ihren Inhalt dauerhaft löschen?",
- 	"confirmDeleteMessageMultiple": "Möchten Sie die folgenden {0} Dateien endgültig löschen?",
- 	"confirmDeleteMessageFolder": "Möchten Sie \"{0}\" samt Inhalt wirklich endgültig löschen?",
- 	"confirmDeleteMessageFile": "Möchten Sie \"{0}\" wirklich endgültig löschen?",
- 	"addFiles": "Dateien hinzufügen",
-+=======
-+	"undoBin": "Die Wiederherstellung kann aus dem Papierkorb erfolgen.",
-+	"undoTrash": "Die Wiederherstellung kann aus dem Papierkorb erfolgen.",
-+	"doNotAskAgain": "Nicht erneut fragen",
-+	"confirmDeleteMessageMultiple": "Möchten Sie die folgenden {0} Dateien endgültig löschen?",
-+	"confirmDeleteMessageFolder": "Möchten Sie \"{0}\" samt Inhalt wirklich endgültig löschen?",
-+	"confirmDeleteMessageFile": "Möchten Sie \"{0}\" wirklich endgültig löschen?",
-+	"irreversible": "Diese Aktion kann nicht rückgängig gemacht werden.",
-+	"binFailed": "Fehler beim Löschen über den Papierkorb. Möchten Sie den Löschvorgang stattdessen dauerhaft ausführen?",
-+	"trashFailed": "Fehler beim Löschen über den Papierkorb. Möchten Sie den Löschvorgang stattdessen dauerhaft ausführen?",
-+	"deletePermanentlyButtonLabel": "En&&dgültig löschen",
-+	"retryButtonLabel": "Wiede&&rholen",
-+	"importFiles": "Dateien importieren",
-+>>>>>>> .their
- 	"confirmOverwrite": "Im Zielordner ist bereits eine Datei oder ein Ordner mit dem gleichen Namen vorhanden. Möchten Sie sie bzw. ihn ersetzen?",
- 	"replaceButtonLabel": "&&Ersetzen",
- 	"fileIsAncestor": "Die einzufügende Datei ist ein Vorgänger des Zielordners",
-changed in both
-  base   100644 3a121e07e4e137d92b9ef0ca51f60c44aa42edb2 i18n/deu/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 99f2be77fbb56221d4c3c1cc8f45e6884be7fd7a i18n/deu/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 82622bce31ce746a8c28ad133bdfe7144b0e82e7 i18n/deu/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-@@ -35,7 +35,11 @@
- 	"hotExit": "Steuert, ob nicht gespeicherten Dateien zwischen den Sitzungen beibehlten werden, die Aufforderung zum Speichern wird beim Beenden des Editors übersprungen.",
- 	"useExperimentalFileWatcher": "Verwenden Sie die neue experimentelle Dateiüberwachung.",
- 	"defaultLanguage": "Der Standardsprachmodus, der neuen Dateien zugewiesen wird.",
-+<<<<<<< .our
- 	"maxMemoryForLargeFilesMB": "Steuert den für VS Code verfügbaren Arbeitsspeicher nach einem Neustart beim Versuch, große Dateien zu öffnen. Gleiche Auswirkung wie beim Festlegen von --max-memory=NEWSIZE in der Befehlszeile.",
-+=======
-+	"maxMemoryForLargeFilesMB": "Die neue Arbeitsspeicherbegrenzung in MB, die von der Anwendung beim Neustart zum Öffnen großer Dateien verwendet werden soll. Wenn Sie den Start mit einer höheren Begrenzung durchführen möchten, können Sie die Anwendung über die Befehlszeile mit --max-memory=NEWSIZE starten.",
-+>>>>>>> .their
- 	"editorConfigurationTitle": "Editor",
- 	"formatOnSave": "Hiermit wird eine Datei beim Speichern formatiert. Es muss ein Formatierer vorhanden sein, die Datei darf nicht automatisch gespeichert werden, und der Editor darf nicht geschlossen werden.",
- 	"formatOnSaveTimeout": "Zeitüberschreitung beim Formatieren während des Speicherns. Legt eine Zeitbegrenzung in Millisekunden für formatOnSave-Befehle fest. Befehle, die länger dauern als die festgelegte Zeitüberschreitung, werden abgebrochen. ",
-changed in both
-  base   100644 10464e3a656eefafb40a825e43a00a7f372e1d15 i18n/deu/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  our    100644 89c8d9fa907d279de7e54d5e05888634d504dacc i18n/deu/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  their  100644 8c13333a13f5f4102db1f78fea7b1960a67c14a7 i18n/deu/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-changed in both
-  base   100644 b1ad2f843d9975490d9aa5231b6580563c7d5712 i18n/deu/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-  our    100644 6f978d7eda1e5d2039c724cd7fa46fbb2de4b11c i18n/deu/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-  their  100644 26d54f425a7bbb676220775de8071e18894ae9e2 i18n/deu/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-changed in both
-  base   100644 778741d8c94e782404fd64147de66b3bc745ecf3 i18n/deu/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
-  our    100644 ed217d3a918e63e85bfa07e9f0b024e93f20f1c3 i18n/deu/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
-  their  100644 2d89a6d6d42b5451132cb36413b2712d288b17c7 i18n/deu/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
-@@ -7,5 +7,9 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"copyMarker": "Kopieren",
-+<<<<<<< .our
- 	"copyMessage": "Nachricht kopieren"
-+=======
-+	"copyMarkerMessage": "Nachricht kopieren"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 6b3a52e72b9d7a69d11132f3cdb229d84b76ea16 i18n/deu/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-  our    100644 68082d2d7bd57e3521d8d98d121dd0c9f42fc76e i18n/deu/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-  their  100644 7fafba7473214dab7ca6cf543db95282f394b1eb i18n/deu/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-changed in both
-  base   100644 d9089d4fc044e7258bebd17f19cb4dfdc5546019 i18n/deu/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  our    100644 737a3d57cf844a63ebd59c6462488a0472760d7a i18n/deu/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  their  100644 d1b848d165762bed486678c657691cae62adc75d i18n/deu/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
-+=======
-+	"keybindingsInputName": "Tastenkombinationen",
-+>>>>>>> .their
- 	"showDefaultKeybindings": "Standard-Tastaturbelegungen anzeigen",
- 	"showUserKeybindings": "Benutzer-Tastaturbelegungen anzeigen",
- 	"SearchKeybindings.AriaLabel": "Tastenzuordnungen suchen",
-changed in both
-  base   100644 97d605ad472106d88029fe272e0a3082443c0af8 i18n/deu/src/vs/workbench/parts/search/browser/searchView.i18n.json
-  our    100644 f2f216a0a047fbef56f5094bbd15e808251180f1 i18n/deu/src/vs/workbench/parts/search/browser/searchView.i18n.json
-  their  100644 1eb5a5f8272e5c1a4b418e33050208487162e246 i18n/deu/src/vs/workbench/parts/search/browser/searchView.i18n.json
-@@ -7,10 +7,16 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"moreSearch": "Suchdetails umschalten",
-+<<<<<<< .our
- 	"searchScope.includes": "Einzuschließende Dateien",
- 	"label.includes": "Sucheinschlussmuster",
- 	"searchScope.excludes": "Auszuschließende Dateien",
- 	"label.excludes": "Suchausschlussmuster",
-+=======
-+	"searchIncludeExclude.label": "Einzubeziehende/auszuschließende Dateien",
-+	"searchIncludeExclude.ariaLabel": "Einzubeziehende/auszuschließende Muster suchen",
-+	"searchIncludeExclude.placeholder": "Beispiele: src, !*.ts, test/**/*.log",
-+>>>>>>> .their
- 	"replaceAll.confirmation.title": "Alle ersetzen",
- 	"replaceAll.confirm.button": "&&Ersetzen",
- 	"replaceAll.occurrence.file.message": "{0} Vorkommen in {1} Datei durch \"{2}\" ersetzt.",
-changed in both
-  base   100644 37a1bba4e0c8e37213b131e4851c2d5951f20272 i18n/deu/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 b3a9bfb6f09fdd913393d2a5b333f495988fabdc i18n/deu/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 fcf1a9b591321ace7c404cf7e97661fdc9743fe6 i18n/deu/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-@@ -28,7 +28,10 @@
- 	"JsonSchema.tasks.group.none": "Weist die Aufgabe keiner Gruppe zu.",
- 	"JsonSchema.tasks.group": "Definiert die Ausführungsgruppe, zu der diese Aufgabe gehört. Zum Hinzufügen der Aufgabe zur Buildgruppe wird \"build\" unterstützt und zum Hinzufügen zur Testgruppe \"test\".",
- 	"JsonSchema.tasks.type": "Definiert, ob die Aufgabe als Prozess oder als Befehl innerhalb einer Shell ausgeführt wird.",
-+<<<<<<< .our
- 	"JsonSchema.commandArray": "Der auszuführende Shell-Befehl. Arrayelemente werden mit einem Leerzeichen verknüpft.",
-+=======
-+>>>>>>> .their
- 	"JsonSchema.command.quotedString.value": "Der tatsächliche Sollwert",
- 	"JsonSchema.tasks.quoting.escape": "Fügt mithilfe des Escapezeichens der Shell vor Zeichen Escapezeichen ein (z. B. `  bei PowerShell und \\ bei Bash).",
- 	"JsonSchema.tasks.quoting.strong": "Setzt das Argument mithilfe des starken Anführungszeichens der Shell in Anführungszeichen (z. B. \" bei PowerShell und Bash).",
-changed in both
-  base   100644 b20a17cd7a71f9a8ed5fabe20d49dc87893b9ca0 i18n/deu/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 5e860baf0d874c2a564e21bd9c48c55877bc2bfd i18n/deu/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 270a22e33da8fb4530a3a45cce07cf2517178b1c i18n/deu/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-changed in both
-  base   100644 b47e2f347c047d0710922646a12b4d44e0cc5cae i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 17f468b874b715481031f72251583765b50e478f i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 26d1f5b9d92ca3af460f5e430566fa92bb03f9de i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -54,10 +54,17 @@
- 	"nextTerminalFindTerm": "Nächsten Suchbegriff anzeigen",
- 	"previousTerminalFindTerm": "Vorherigen Suchbegriff anzeigen",
- 	"quickOpenTerm": "Aktives Terminal wechseln",
-+<<<<<<< .our
- 	"workbench.action.terminal.scrollToPreviousCommand": "Zu vorherigem Befehl scrollen",
- 	"workbench.action.terminal.scrollToNextCommand": "Zu nächstem Befehl scrollen",
- 	"workbench.action.terminal.selectToPreviousCommand": "Auswählen bis zu vorherigem Befehl",
- 	"workbench.action.terminal.selectToNextCommand": "Auswählen bis zu nächstem Befehl",
- 	"workbench.action.terminal.selectToPreviousLine": " Auswählen bis zur vorherigen Zeile ",
- 	"workbench.action.terminal.selectToNextLine": "Auswählen bis zur nächsten Zeile"
-+=======
-+	"workbench.action.terminal.focusPreviousCommand": "Fokus auf vorherigen Befehl",
-+	"workbench.action.terminal.focusNextCommand": "Fokus auf nächsten Befehl",
-+	"workbench.action.terminal.selectToPreviousCommand": "Auswählen bis zu vorherigem Befehl",
-+	"workbench.action.terminal.selectToNextCommand": "Auswählen bis zu nächstem Befehl"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/deu/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
-  our    100644 bfc2bc1f14609e4d731f1d750b5b017ddf480686 i18n/deu/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
-  their  100644 7a43ea55cf4cc7f23dbf34687a866380550de9ca i18n/deu/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
-@@ -6,5 +6,20 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"stringsOnlySupported": "Der Befehl {0} hat keine Zeichenfolge als Ergebnis zurückgegeben. Als Ergebnisse für Befehle, die zur Variablenersetzung verwendet werden, werden nur Zeichenfolgen unterstützt."
-+=======
-+	"canNotResolveWorkspaceFolderMultiRoot": "${workspaceFolder} kann nicht in einen Workspace mit mehreren Ordnern aufgelöst werden. Legen Sie mithilfe von : und einem Ordnernamen einen Bereich für diese Variable fest.",
-+	"canNotResolveWorkspaceFolder": "${workspaceFolder} kann nicht aufgelöst werden. Öffnen Sie einen Ordner.",
-+	"canNotResolveFolderBasenameMultiRoot": "${workspaceFolderBasename}  kann nicht in einen Workspace mit mehreren Ordnern aufgelöst werden. Legen Sie mithilfe von : und einem Ordnernamen einen Bereich für diese Variable fest.",
-+	"canNotResolveFolderBasename": "${workspaceFolderBasename} kann nicht aufgelöst werden. Öffnen Sie einen Ordner.",
-+	"canNotResolveLineNumber": "${lineNumber} kann nicht aufgelöst werden. Öffnen Sie einen Editor.",
-+	"canNotResolveSelectedText": "${selectedText} kann nicht aufgelöst werden. Öffnen Sie einen Editor.",
-+	"canNotResolveFile": "${file} kann nicht aufgelöst werden. Öffnen Sie einen Editor.",
-+	"canNotResolveRelativeFile": "${relativeFile} kann nicht aufgelöst werden. Öffnen Sie einen Editor.",
-+	"canNotResolveFileDirname": "${fileDirname} kann nicht aufgelöst werden. Öffnen Sie einen Editor.",
-+	"canNotResolveFileExtname": "${fileExtname} kann nicht aufgelöst werden. Öffnen Sie einen Editor.",
-+	"canNotResolveFileBasename": "${fileBasename} kann nicht aufgelöst werden. Öffnen Sie einen Editor.",
-+	"canNotResolveFileBasenameNoExtension": "${fileBasenameNoExtension} kann nicht aufgelöst werden. Öffnen Sie einen Editor."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 d1ad985a6bd1e149bc298f3c8c632bfeeb1ac505 i18n/deu/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-  our    100644 846beeace7a9c66267471e1a113dc80dd82654c5 i18n/deu/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-  their  100644 d30c4b49abc6298285fa355dda93952ff2b3a548 i18n/deu/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-@@ -11,6 +11,7 @@
- 	"neverShowAgain": "Nicht mehr anzeigen",
- 	"enospcError": "{0} kann keine Dateiänderungen in diesem großen Workspace überwachen. Folgen Sie dem Anwendungslink, um das Problem zu beheben.",
- 	"learnMore": "Anweisungen",
-+<<<<<<< .our
- 	"fileInvalidPath": "Ungültige Dateiressource ({0})",
- 	"fileIsDirectoryError": "Die Datei ist ein Verzeichnis",
- 	"fileNotModifiedError": "Datei nicht geändert seit",
-@@ -24,6 +25,9 @@
- 	"fileReadOnlyError": "Die Datei ist schreibgeschützt.",
- 	"fileMoveConflict": "Verschieben/Kopieren kann nicht ausgeführt werden. Die Datei ist am Ziel bereits vorhanden.",
- 	"unableToMoveCopyError": "Der Verschiebe-/Kopiervorgang kann nicht ausgeführt werden. Die Datei würde den Ordner ersetzen, in dem sie enthalten ist.",
-+=======
-+	"enospcError": "{0} kann keine Dateiänderungen in diesem großen Workspace überwachen. Folgen Sie dem Anwendungslink, um das Problem zu beheben.",
-+>>>>>>> .their
- 	"binFailed": "Fehler beim Verschieben von \"{0}\" in den Papierkorb.",
- 	"trashFailed": "Fehler beim Verschieben von \"{0}\" in den Papierkorb."
- }
-\ No newline at end of file
-merged
-  result 100644 df502aec1d28ed686084e263578486bdc323e1e5 i18n/deu/src/vs/workbench/services/files/node/fileService.i18n.json
-  our    100644 a2229be0ceef3b429bbc28d1dcb6e2f94145d317 i18n/deu/src/vs/workbench/services/files/node/fileService.i18n.json
-@@ -9,6 +9,7 @@
- 	"fileInvalidPath": "Ungültige Dateiressource ({0})",
- 	"fileIsDirectoryError": "Die Datei ist ein Verzeichnis",
- 	"fileNotModifiedError": "Datei nicht geändert seit",
-+	"fileTooLargeForHeapError": "Die Dateigröße überschreitet die standardmäßige Speicherbegrenzung. Führen Sie einen Neustart mit einer höheren Begrenzung durch. Die aktuelle Einstellung ist für einen Neustart mit {0} MB konfiguriert.",
- 	"fileTooLargeError": "Die Datei ist zu groß, um sie zu öffnen.",
- 	"fileNotFoundError": "Die Datei wurde nicht gefunden ({0}).",
- 	"fileBinaryError": "Die Datei scheint eine Binärdatei zu sein und kann nicht als Text geöffnet werden.",
-changed in both
-  base   100644 852d92d405c88aab4e4a293c6ab242b3255b18f1 i18n/esn/extensions/emmet/package.i18n.json
-  our    100644 d6c05800c1ebc6febea004f2095561aeefca8479 i18n/esn/extensions/emmet/package.i18n.json
-  their  100644 242638ccbb9475b7f68de9d027fcefb6f55e3283 i18n/esn/extensions/emmet/package.i18n.json
-@@ -60,6 +60,10 @@
- 	"emmetPreferencesCssMozProperties": "Propiedades CSS separadas por comas que obtienen el prefijo de proveedor 'moz' cuando se utilizan en la abreviatura Emmet que comienza con '-'. Establecer en la cadena vacía para evitar siempre el prefijo 'moz'.",
- 	"emmetPreferencesCssOProperties": "Propiedades CSS separadas por comas que obtienen el prefijo de proveedor 'o' cuando se utilizan en la abreviatura Emmet que comienza con '-'. Establecer en la cadena vacía para evitar siempre el prefijo 'o'.",
- 	"emmetPreferencesCssMsProperties": "Propiedades CSS separadas por comas que obtienen el prefijo de proveedor 'ms' cuando se utilizan en la abreviatura Emmet que comienza con '-'. Establecer en la cadena vacía para evitar siempre el prefijo 'ms'.",
-+<<<<<<< .our
- 	"emmetPreferencesCssFuzzySearchMinScore": "La mínima puntuación (de 0 a 1) que se debe alcanzar en la comparación difusa de abreviación. Los valores más bajos pueden producir muchos resultados falsos positivos, los valores más altos pueden reducir posibles coincidencias.",
- 	"emmetOptimizeStylesheetParsing": "Cuando se establece en falso, se analiza el archivo entero para determinar si la posición actual es válida para la expansión de abreviaturas de Emmet. Cuando se establece en verdadero, sólo el contenido alrededor de la posición actual en archivos css, scss/less es analizado."
-+=======
-+	"emmetPreferencesCssFuzzySearchMinScore": "La mínima puntuación (de 0 a 1) que se debe alcanzar en la comparación difusa de abreviación. Los valores más bajos pueden producir muchos resultados falsos positivos, los valores más altos pueden reducir posibles coincidencias."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 53ebb086ddb911cfa791c4312f0c1d723888c12f i18n/esn/extensions/git/out/commands.i18n.json
-  our    100644 022bf20d57e92a28a5ced5a2d0998bc8b0dfe335 i18n/esn/extensions/git/out/commands.i18n.json
-  their  100644 6f66844414293fcee28db9d5c99b52d0c4e4a836 i18n/esn/extensions/git/out/commands.i18n.json
-changed in both
-  base   100644 09a54bc2ce319af1c45f677246f560d0dac7c29a i18n/esn/extensions/markdown-language-features/out/security.i18n.json
-  our    100644 6d04884c9620acff09e0fe37eee0eb79a2dcbf8b i18n/esn/extensions/markdown-language-features/out/security.i18n.json
-  their  100644 c46abaea75d2ac430fee630d0b623cdacb9bfb64 i18n/esn/extensions/markdown-language-features/out/security.i18n.json
-changed in both
-  base   100644 e7b6423f2b66fcbee224782386d465619419a638 i18n/esn/extensions/php/package.i18n.json
-  our    100644 edf1d540da8d8e826f984f378d9f2cef8f946b7b i18n/esn/extensions/php/package.i18n.json
-  their  100644 6c12a714deb54d73ed47f0c29c160d36d907e9dd i18n/esn/extensions/php/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Conceptos básicos del lenguaje PHP",
-+=======
-+	"displayName": "Características del lenguaje PHP",
-+>>>>>>> .their
- 	"description": "Proporciona resaltado de sintaxis y correspondencia de corchetes en archivos PHP."
- }
-\ No newline at end of file
-changed in both
-  base   100644 131e96b837a0eb2f6de43ab7330dd9221c16a8fd i18n/esn/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 e90f2798b359468ab2a777af9b7d68417b46fdb4 i18n/esn/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 da5601c50ae36b658088428774cd6a76d59a55df i18n/esn/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -32,7 +32,10 @@
- 	"infoBorder": "Color del borde de los subrayados ondulados informativos en el editor.",
- 	"hintForeground": "Color de primer plano de pista squigglies en el editor.",
- 	"hintBorder": "Color de borde de pista squigglies en el editor.",
-+<<<<<<< .our
- 	"unnecessaryForeground": "Color de primer plano de código innecesario en el editor.",
-+=======
-+>>>>>>> .their
- 	"overviewRulerRangeHighlight": "Resumen de color de marcador para destacar rangos. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
- 	"overviewRuleError": "Color de marcador de regla de información general para errores. ",
- 	"overviewRuleWarning": "Color de marcador de regla de información general para advertencias.",
-changed in both
-  base   100644 87bd0fe318cd0e4cd739e20e13582031b6ad7765 i18n/esn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 862953cea1ced6aa68869023b06a401296a0b72c i18n/esn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 9eb5de30595dbdd3f63ee47f1b9cb77898584fd7 i18n/esn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -25,6 +25,11 @@
- 	"uninstallDependeciesConfirmation": "¿Quiere desinstalar solo '{0}' o también sus dependencias?",
- 	"uninstallOnly": "Sólo extensión",
- 	"uninstallAll": "Desinstalar todo",
-+<<<<<<< .our
-+=======
-+	"uninstallConfirmation": "¿Seguro que quiere desinstalar '{0}'?",
-+	"ok": "Aceptar",
-+>>>>>>> .their
- 	"singleDependentError": "No se puede desinstalar la extensión '{0}'. La extensión '{1}' depende de esta.",
- 	"twoDependentsError": "No se puede desinstalar la extensión '{0}'. Las extensiones '{1}' y '{2}' dependen de esta.",
- 	"multipleDependentsError": "No se puede desinstalar la extensión '{0}'. Las extensiones '{1}' y '{2}', entre otras, dependen de esta.",
-changed in both
-  base   100644 075049e313b4de97138f2248e818d66e53eef9b1 i18n/esn/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 df47f2d2522b992756f57ce29b59bc070792254f i18n/esn/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 39139e047430fe6359a85b77b58903085b0a1245 i18n/esn/src/vs/platform/theme/common/colorRegistry.i18n.json
-changed in both
-  base   100644 34f590266a9e409019311838b845bbe53926aef8 i18n/esn/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  our    100644 40e2044209fec4e5b919e2e5e83378e9f6815093 i18n/esn/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 754cfd39b02b5ce6b7af40dd2f7723d2413e3d2f i18n/esn/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -7,7 +7,10 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"timeout.formatOnSave": "Anular la aplicación de formato al guardar después de {0} ms",
-+<<<<<<< .our
- 	"codeActionsOnSave.didTimeout": "codeActionsOnSave anulado después de {0} ms",
-+=======
-+>>>>>>> .their
- 	"timeout.onWillSave": "Se anuló onWillSaveTextDocument-event después de 1750 ms",
- 	"saveParticipants": "Ejecutando Guardar Participantes..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 62d7de2c6f0f886ddbf2766231ffcb41da178938 i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 57d447a0a0b664b859bc321a1781f6980e63b0fd i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 9082a4b168bd7448a1f0b83d2342ae2a5213c8f2 i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -80,7 +80,10 @@
- 	"titleBarStyle": "Ajuste la apariencia de la barra de título de la ventana. Se debe realizar un reinicio completo para aplicar los cambios.",
- 	"window.nativeTabs": "Habilita las fichas de ventana en macOS Sierra. Note que los cambios requieren que reinicie el equipo y las fichas nativas deshabilitan cualquier estilo personalizado que haya configurado.",
- 	"window.smoothScrollingWorkaround": "Habilite esta solución alternativa si el desplazamiento deja de ser homogéneo después de restaurar una ventana de VS Code minimizada. Esta es una solución para un problema (https://github.com/Microsoft/vscode/issues/13612) en el que el desplazamiento comienza a sufrir interrupciones en dispositivos con panel táctil de precisión, como los dispositivos Surface de Microsoft. Al habilitar esta solución alternativa, puede parpadear ligeramente la distribución después de restaurar la ventana minimizada, pero no afecta a nada más.",
-+<<<<<<< .our
- 	"window.clickThroughInactive": "Si está habilitado, haciendo clic en una ventana inactiva, activará dicha ventana y disparará el elemento bajo el cursor del ratón si éste es clicable. Si está deshabilitado, haciendo clic en cualquier lugar en una ventana inactiva, solo activará la misma y será necesario un segundo clic en el elemento. ",
-+=======
-+>>>>>>> .their
- 	"zenModeConfigurationTitle": "Modo zen",
- 	"zenMode.fullScreen": "Controla si activar el modo Zen pone también el trabajo en modo de pantalla completa.",
- 	"zenMode.centerLayout": "Controla si al encender el Modo Zen también se centra el diseño.",
-changed in both
-  base   100644 19e1e0cc44d29e9d86a46f2181922a97361770d5 i18n/esn/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  our    100644 b7d4e9cddd0bf1f7c4ee968b757c9316af83ba48 i18n/esn/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  their  100644 cf902af2091c3e0c2d3630f3e30f2b3a1fee997d i18n/esn/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-@@ -17,7 +17,11 @@
- 	"breakpointUnverifieddHover": "Punto de interrupción no comprobado",
- 	"functionBreakpointUnsupported": "Este tipo de depuración no admite puntos de interrupción en funciones",
- 	"breakpointDirtydHover": "Punto de interrupción no comprobado. El archivo se ha modificado, reinicie la sesión de depuración.",
-+<<<<<<< .our
- 	"logBreakpointUnsupported": "Logpoints no son compatible con este tipo de depuración",
-+=======
-+	"logBreakpointUnsupported": "Este tipo de depuración no admite puntos de registro",
-+>>>>>>> .their
- 	"conditionalBreakpointUnsupported": "Este tipo de depuración no es compatible con los puntos de interrupción condicionales.",
- 	"hitBreakpointUnsupported": "Este tipo de depuración no admite el uso de puntos de interrupción condicionales"
- }
-\ No newline at end of file
-changed in both
-  base   100644 77f54a5e29fa18a7ba26458ff16a2aecc1ec5a1f i18n/esn/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  our    100644 712a034280e7aa13ccdc8b4ab89c00d48a86e498 i18n/esn/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  their  100644 83395706f58bd4f9413216db7f4b363a29fa57e6 i18n/esn/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-@@ -8,7 +8,11 @@
- 	],
- 	"toggleBreakpointAction": "Depuración: Alternar punto de interrupción",
- 	"conditionalBreakpointEditorAction": "Depuración: agregar punto de interrupción condicional...",
-+<<<<<<< .our
- 	"logPointEditorAction": "Depuración: Agregar punto de registro...",
-+=======
-+	"logPointEditorAction": "Depurar: agregar punto de registro...",
-+>>>>>>> .their
- 	"runToCursor": "Ejecutar hasta el cursor",
- 	"debugEvaluate": "Depuración: Evaluar",
- 	"debugAddToWatch": "Depuración: Agregar a inspección",
-changed in both
-  base   100644 72b3d080b9d20f3c4280d6f35c63b41c6de7dc3c i18n/esn/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-  our    100644 b238709d15fe83fb203624f12a5790fd95f42849 i18n/esn/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-  their  100644 d574bcb61a9aede12ef417490d452e5fd69ed05f i18n/esn/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-@@ -6,9 +6,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"breakpointWidgetLogMessagePlaceholder": "Mensaje para registrar cuando se alcanza el punto de interrupción. Las expresiones entre {} son interpoladas. 'Enter' para aceptar, 'esc' para cancelar. ",
- 	"breakpointWidgetHitCountPlaceholder": "Interrumpir cuando se alcance el número de llamadas. Presione \"ENTRAR\" para aceptar o \"Esc\" para cancelar.",
- 	"breakpointWidgetExpressionPlaceholder": "Interrumpir cuando la expresión se evalúa como true. Presione \"ENTRAR\" para aceptar o \"Esc\" para cancelar.",
-+=======
-+	"breakpointWidgetLogMessagePlaceholder": "Mensaje que se registra cuando se alcanza un punto de interrupción. \"Entrar\" para aceptar, \"Esc\" para cancelar.",
-+	"breakpointWidgetHitCountPlaceholder": "Interrumpir cuando se alcance el número de llamadas. Presione \"ENTRAR\" para aceptar o \"Esc\" para cancelar.",
-+	"breakpointWidgetExpressionPlaceholder": "Interrumpir cuando la expresión se evalúa como true. Presione \"ENTRAR\" para aceptar o \"Esc\" para cancelar.",
-+	"breakpointWidgetLogMessageAriaLabel": "El programa registrará este mensaje cada vez que se alcance un punto de interrupción. Presione Entrar para aceptar o Esc para cancelar.",
-+	"breakpointWidgetHitCountAriaLabel": "El programa solo se detendrá aquí si se alcanza el número de llamadas. Presione ENTRAR para aceptar o Esc para cancelar.",
-+	"breakpointWidgetAriaLabel": "El programa solo se detendrá aquí si esta condición es true. Presione ENTRAR para aceptar o Esc para cancelar.",
-+>>>>>>> .their
- 	"expression": "Expresión",
- 	"hitCount": "Número de llamadas",
- 	"logMessage": "Mensaje de registro"
-changed in both
-  base   100644 1c8d3ad1e175efb43392ef4461d7173c4d7974d8 i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  our    100644 fcf6be03f0498bef930d9bf9f70c63bd467d0f42 i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  their  100644 83e436d91db65072f4727376a5971e6c9930091e i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-@@ -24,6 +24,7 @@
- 	"enableBreakpoints": "Habilitar el punto de interrupción insertado en la columna {0}",
- 	"enableBreakpointOnLine": "Habilitar punto de interrupción de línea",
- 	"addBreakpoint": "Agregar punto de interrupción",
-+<<<<<<< .our
- 	"addConditionalBreakpoint": "Agregar punto de interrupción condicional...",
- 	"addLogPoint": "Agregar punto de registro",
- 	"breakpointHasCondition": "Este {0} tiene una {1} que se perderá al quitarla. Considere la posibilidad de desactivar el {0} en su lugar.",
-@@ -32,5 +33,9 @@
- 	"removeLogPoint": "Quitar {0}",
- 	"disableLogPoint": "Deshabilitar {0}",
- 	"cancel": "Cancelar",
-+=======
-+	"conditionalBreakpoint": "Agregar punto de interrupción condicional...",
-+	"addLogPoint": "Agregar punto de registro...",
-+>>>>>>> .their
- 	"addConfiguration": "Agregar configuración..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 2bceb504035e5fb5c9bb1fd96e02c8ea1b02bf9b i18n/esn/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  our    100644 3055932755fc85e2cfe5115465d1c1970923bac0 i18n/esn/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  their  100644 2bc654f47e36fef4f1c67e97634eab9eb065a347 i18n/esn/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-@@ -8,6 +8,24 @@
- 	],
- 	"debugAdapterBinNotFound": "El ejecutable del adaptador de depuración \"{0}\" no existe.",
- 	"debugAdapterCannotDetermineExecutable": "No se puede determinar el ejecutable para el adaptador de depuración \"{0}\".",
-+<<<<<<< .our
- 	"unableToLaunchDebugAdapter": "No se puede iniciar el adaptador de depuración desde '{0}'.",
- 	"unableToLaunchDebugAdapterNoArgs": "No se puede iniciar el adaptador de depuración."
-+=======
-+	"launch.config.comment1": "Utilizar IntelliSense para aprender acerca de los posibles atributos.",
-+	"launch.config.comment2": "Mantenga el puntero para ver las descripciones de los existentes atributos ",
-+	"launch.config.comment3": "Para más información, visite: {0}",
-+	"debugType": "Tipo de configuración.",
-+	"debugTypeNotRecognised": "Este tipo de depuración no se reconoce. Compruebe que tiene instalada la correspondiente extensión de depuración y que está habilitada.",
-+	"node2NotSupported": "\"node2\" ya no se admite; use \"node\" en su lugar y establezca el atributo \"protocol\" en \"inspector\".",
-+	"debugName": "Nombre de la configuración. Aparece en el menú desplegable de la configuración de inicio.",
-+	"debugRequest": "Tipo de solicitud de la configuración. Puede ser \"launch\" o \"attach\".",
-+	"debugServer": "Solo para el desarrollo de extensiones de depuración: si se especifica un puerto, VS Code intenta conectarse a un adaptador de depuración que se ejecuta en modo servidor",
-+	"debugPrelaunchTask": "Tarea que se va a ejecutar antes de iniciarse la sesión de depuración.",
-+	"debugPostDebugTask": "Tarea que se ejecutará después de terminar la sesión de depuración.",
-+	"debugWindowsConfiguration": "Atributos de configuración de inicio específicos de Windows.",
-+	"debugOSXConfiguration": "Atributos de configuración de inicio específicos de OS X.",
-+	"debugLinuxConfiguration": "Atributos de configuración de inicio específicos de Linux.",
-+	"deprecatedVariables": "\"env.\", \"config.\" y \"command.\" están en desuso, utilice en su lugar \"env:\", \"config:\" y \"command:\"."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 21701a2c2dd07142da32aa65d4aa5a77e9170b0c i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  our    100644 c17e1a95935a6574438eb39611676f6b936cc1bc i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  their  100644 b632b359f0dfdaf60acd28d32da4d02db14a1318 i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-changed in both
-  base   100644 896424f6a2cdd7d378e516117d20dbcb1fbcdd2b i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  our    100644 a44cd55d9ca2de8be4e5fadbac434ab72717183e i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  their  100644 8a82f2023f03ee3413c74748714e1e25a27076cb i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-@@ -14,7 +14,11 @@
- 	"workspaceRecommendedExtensions": "Recomendaciones de espacio de trabajo",
- 	"builtInExtensions": "Características",
- 	"builtInThemesExtensions": "Temas",
-+<<<<<<< .our
- 	"builtInBasicsExtensions": "Lenguajes de programación",
-+=======
-+	"builtInBasicsExtensions": "Idiomas",
-+>>>>>>> .their
- 	"searchExtensions": "Buscar extensiones en Marketplace",
- 	"sort by installs": "Criterio de ordenación: Número de instalaciones",
- 	"sort by rating": "Criterio de ordenación: Clasificación",
-changed in both
-  base   100644 e7856c7726a3c10327ce7bd1d7c9aea98bd74b6a i18n/esn/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-  our    100644 6a743b771b9254a83bdf35bf62572dcf909e437d i18n/esn/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-  their  100644 328cd97f00ad3101513f6a164c202522546c6263 i18n/esn/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-@@ -8,8 +8,13 @@
- 	],
- 	"textFileEditor": "Editor de archivos de texto",
- 	"createFile": "Crear archivo",
-+<<<<<<< .our
- 	"relaunchWithIncreasedMemoryLimit": "Reiniciar con {0} MB",
- 	"configureMemoryLimit": "Configurar límite de memoria",
-+=======
-+	"relaunchWithIncreasedMemoryLimit": "Reiniciar",
-+	"configureMemoryLimit": "Configurar",
-+>>>>>>> .their
- 	"fileEditorWithInputAriaLabel": "{0}. Editor de archivos de texto.",
- 	"fileEditorAriaLabel": "Editor de archivos de texto."
- }
-\ No newline at end of file
-changed in both
-  base   100644 b540790d3f3cbd270099133e886b98b3b259d7a2 i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 1e23db714d120943226391e3c5ce27170460d94d i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 e18200e6b7f84ce4a718ee6fcf8f71e7c391a920 i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -38,12 +38,27 @@
- 	"confirmMoveTrashMessageMultiple": "¿Está seguro de que desea eliminar los siguientes archivos {0}?",
- 	"confirmMoveTrashMessageFolder": "¿Está seguro de que desea eliminar '{0}' y su contenido?",
- 	"confirmMoveTrashMessageFile": "¿Está seguro de que desea eliminar '{0}'?",
-+<<<<<<< .our
- 	"confirmDeleteMessageFilesAndDirectories": "¿Está seguro de que desea eliminar los {0} archivos o directorios siguientes y su contenido de forma permanente?",
- 	"confirmDeleteMessageMultipleDirectories": "¿Está seguro de que desea eliminar los {0} directorios siguientes y su contenido de forma permanente? ",
- 	"confirmDeleteMessageMultiple": "¿Está seguro de que desea eliminar de forma permanente los siguientes archivos {0}?",
- 	"confirmDeleteMessageFolder": "¿Está seguro de que desea eliminar '{0}' y su contenido de forma permanente?",
- 	"confirmDeleteMessageFile": "¿Está seguro de que desea eliminar '{0}' de forma permanente?",
- 	"addFiles": "Agregar archivos",
-+=======
-+	"undoBin": "Se puede restaurar de la papelera de reciclaje.",
-+	"undoTrash": "Se puede restaurar de la papelera.",
-+	"doNotAskAgain": "No volver a preguntarme",
-+	"confirmDeleteMessageMultiple": "¿Está seguro de que desea eliminar de forma permanente los siguientes archivos {0}?",
-+	"confirmDeleteMessageFolder": "¿Está seguro de que desea eliminar '{0}' y su contenido de forma permanente?",
-+	"confirmDeleteMessageFile": "¿Está seguro de que desea eliminar '{0}' de forma permanente?",
-+	"irreversible": "Esta acción es irreversible.",
-+	"binFailed": "Error al eliminar usando la papelera de reciclaje. ¿Desea eliminar de forma permanente en su lugar?",
-+	"trashFailed": "No se pudo eliminar usando la papelera. ¿Desea eliminar de forma permanente?",
-+	"deletePermanentlyButtonLabel": "&&Eliminar de forma permanente",
-+	"retryButtonLabel": "&&Reintentar",
-+	"importFiles": "Importar archivos",
-+>>>>>>> .their
- 	"confirmOverwrite": "Ya existe un archivo o carpeta con el mismo nombre en la carpeta de destino. ¿Quiere reemplazarlo?",
- 	"replaceButtonLabel": "&&Reemplazar",
- 	"fileIsAncestor": "El archivo que se va a pegar es un antecesor de la carpeta de destino",
-changed in both
-  base   100644 93ee0518a0b571a6f0d7698aa3cc22046da359d1 i18n/esn/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 530360de300c015c0e1de9b17dd26ccddaf04e46 i18n/esn/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 509e8590def84f27649e2bae20a1e5b33b7b9ba1 i18n/esn/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-@@ -35,7 +35,11 @@
- 	"hotExit": "Controla si los archivos no guardados se recuerdan entre las sesiones, lo que permite omitir el mensaje para guardar al salir del editor.",
- 	"useExperimentalFileWatcher": "Utilice el nuevo monitor de archivo experimental.",
- 	"defaultLanguage": "El modo de lenguaje predeterminado que se asigna a nuevos archivos.",
-+<<<<<<< .our
- 	"maxMemoryForLargeFilesMB": "Controla la memoria disponible para VS Code después de reiniciar, cuando se intenta abrir archivos de gran tamaño. Afecta de la misma manera si se especifica --max-memory = NUEVOTAMAÑO en la línea de comandos. ",
-+=======
-+	"maxMemoryForLargeFilesMB": "Nuevo límite de memoria en MB que debe usar la aplicación cuando se reinicie para abrir archivos grandes. Si desea comenzar con un límite superior, puede iniciar la aplicación desde la línea de comandos con --max-memory=NEWSIZE.",
-+>>>>>>> .their
- 	"editorConfigurationTitle": "Editor",
- 	"formatOnSave": "Formatea un archivo al guardarlo. Debe haber un formateador disponible, el archivo no debe guardarse automáticamente y el editor no debe estar cerrándose.",
- 	"formatOnSaveTimeout": "Tiempo de espera de aplicación de formato al guardar. Especifica un límite de tiempo en milisegundos para los comandos formatOnSave. Los comandos que tarden más del tiempo de espera especificado se cancelarán.",
-changed in both
-  base   100644 1bcad541fa7d0c0a87b9e01f0dfaf5ca934b6be1 i18n/esn/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  our    100644 c8dca1d775bcd059f6f0f93622281f64f6f8d22e i18n/esn/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  their  100644 e0b1a1af32f784a9faf92a58979767cc6d32828c i18n/esn/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-changed in both
-  base   100644 8d320c3e36de44fe1be9705ac04cd5597a89833c i18n/esn/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-  our    100644 6fd49793b66342f6b19fe9c86c3269f91d587798 i18n/esn/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-  their  100644 05049c9e3b28574b4892beb11f312785cb40d49c i18n/esn/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-changed in both
-  base   100644 eab6272315ab315d27d6ce9ce43493c9c6d97918 i18n/esn/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-  our    100644 90352e08b0c68e4410f776055d7726932a395f02 i18n/esn/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-  their  100644 385e5e7fa0ea77fe0eedede5dece3ab55a45f4f6 i18n/esn/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-changed in both
-  base   100644 b0f61204eeb14401475bb1b008893a05035ba6e8 i18n/esn/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  our    100644 634545e1c6f01f32015f6ce1bd5a355377917a51 i18n/esn/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  their  100644 4386527ff34bb1503bbe3709bd1a98f51cbe7000 i18n/esn/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
-+=======
-+	"keybindingsInputName": "Métodos abreviados de teclado",
-+>>>>>>> .their
- 	"showDefaultKeybindings": "Mostrar enlaces de teclado predeterminados",
- 	"showUserKeybindings": "Mostrar enlaces de teclado del usuario",
- 	"SearchKeybindings.AriaLabel": "Buscar enlaces de teclado",
-changed in both
-  base   100644 be513ebe447cff91dc46327eed54c7da32eef84b i18n/esn/src/vs/workbench/parts/search/browser/searchView.i18n.json
-  our    100644 0c3d29ae593df25c19d137f3045954d907ba1dc7 i18n/esn/src/vs/workbench/parts/search/browser/searchView.i18n.json
-  their  100644 2747b74cac8f6b60a28e22a1e3e258badb986d02 i18n/esn/src/vs/workbench/parts/search/browser/searchView.i18n.json
-@@ -7,10 +7,16 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"moreSearch": "Alternar detalles de la búsqueda",
-+<<<<<<< .our
- 	"searchScope.includes": "archivos para incluir",
- 	"label.includes": "Buscar patrones de inclusión",
- 	"searchScope.excludes": "archivos para excluir",
- 	"label.excludes": "Buscar patrones de exclusión",
-+=======
-+	"searchIncludeExclude.label": "archivos para incluir o excluir",
-+	"searchIncludeExclude.ariaLabel": "Buscar patrones de inclusión o exclusión",
-+	"searchIncludeExclude.placeholder": "Ejemplos: src, !*.ts, test/**/*.log",
-+>>>>>>> .their
- 	"replaceAll.confirmation.title": "Reemplazar todo",
- 	"replaceAll.confirm.button": "&&Reemplazar",
- 	"replaceAll.occurrence.file.message": "{0} aparición reemplazada en {1} archivo por \"{2}\".",
-changed in both
-  base   100644 41e40ef4d297f359ffbe64aeabab498349c3551e i18n/esn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 7367d0a39f1701be221d6ff3d3d8cae3add9845a i18n/esn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 4f1f33161a75890f593cf32b6220421952329ca9 i18n/esn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-@@ -28,7 +28,10 @@
- 	"JsonSchema.tasks.group.none": "No asigna la tarea a ningún grupo",
- 	"JsonSchema.tasks.group": "Define a qué grupo de ejecución pertenece esta tarea. Admite \"compilación\" para agregarla al grupo de compilación y \"prueba\" para agregarla al grupo de prueba.",
- 	"JsonSchema.tasks.type": "Define si la tarea se ejecuta como un proceso o como un comando dentro de in shell. ",
-+<<<<<<< .our
- 	"JsonSchema.commandArray": "El comando Shell que se ejecutará. Los elementos de la matriz se ensamblarán mediante un carácter de espacio",
-+=======
-+>>>>>>> .their
- 	"JsonSchema.command.quotedString.value": "El valor actual del comando",
- 	"JsonSchema.tasks.quoting.escape": "Carácteres de escape usan el carácter de escape de la linea de comandos (ej.: ' en PowerShell y \\ en Bash)",
- 	"JsonSchema.tasks.quoting.strong": "Cita el argumento usando el carácter de citación doble de la linea de comandos (ej.: \" en PowerShell y Bash) ",
-changed in both
-  base   100644 fb8b41d8a5ef42921b4b695ccb3cfa50208b633e i18n/esn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 cf1ca0ef5c2b17265b6eb266a58dc6112305ccf4 i18n/esn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 cbe068f10d1e7f023f1c11eb450025fcdd9f7dba i18n/esn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-changed in both
-  base   100644 1c13a74b03389ddf12f7b1955b36c28408f9fbd0 i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 21fcf5a4e9d2653bdf22cd882d1fa612baf507de i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 20f4a9bd7ac8903707e9c1f1a0d842fc7049340f i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -54,10 +54,17 @@
- 	"nextTerminalFindTerm": "Mostrar siguiente término de búsqueda",
- 	"previousTerminalFindTerm": "Mostrar término de búsqueda anterior",
- 	"quickOpenTerm": "Cambiar terminal activo",
-+<<<<<<< .our
- 	"workbench.action.terminal.scrollToPreviousCommand": "Desplácese al comando anterior",
- 	"workbench.action.terminal.scrollToNextCommand": "Desplácese al siguiente comando",
- 	"workbench.action.terminal.selectToPreviousCommand": "Seleccionar hasta el comando anterior",
- 	"workbench.action.terminal.selectToNextCommand": "Seleccionar hasta el comando siguiente",
- 	"workbench.action.terminal.selectToPreviousLine": "Seleccione la línea anterior",
- 	"workbench.action.terminal.selectToNextLine": "Seleccione la línea siguiente"
-+=======
-+	"workbench.action.terminal.focusPreviousCommand": "Aplicar el foco al comando anterior",
-+	"workbench.action.terminal.focusNextCommand": "Aplicar el foco al comando siguiente",
-+	"workbench.action.terminal.selectToPreviousCommand": "Seleccionar hasta el comando anterior",
-+	"workbench.action.terminal.selectToNextCommand": "Seleccionar hasta el comando siguiente"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 e71ac660c5f2a5fea6e76bb754bfaa14e0d16610 i18n/esn/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
-  our    100644 8e6bbb15ccc9a16cb32210cdd8f68f5c8e755f35 i18n/esn/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
-  their  100644 e9f770cb2be72d23bc794e57cb93154bd2a216c7 i18n/esn/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
-@@ -6,5 +6,20 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"stringsOnlySupported": "El comando {0} no devolvió un resultado de cadena. Sólo se admiten cadenas como resultados para los comandos utilizados para la sustitución de variables."
-+=======
-+	"canNotResolveWorkspaceFolderMultiRoot": "${workspaceFolder} no se puede resolver en una área de trabajo de varias carpetas. Determine el ámbito de estas variables usando : y un nombre de carpeta.",
-+	"canNotResolveWorkspaceFolder": "${workspaceFolder} no se puede resolver. Por favor, abra una carpeta.",
-+	"canNotResolveFolderBasenameMultiRoot": "${workspaceFolderBasename} no se puede resolver en una área de trabajo de varias carpetas. Establezca el alcance de estas variables usando : y un nombre de carpeta.",
-+	"canNotResolveFolderBasename": "${workspaceFolderBasename} no se puede resolver. Por favor, abra una carpeta.",
-+	"canNotResolveLineNumber": "${lineNumber} no se puede resolver, por favor, abra un editor.",
-+	"canNotResolveSelectedText": "${selectedText} no se puede resolver, por favor, abra un editor.",
-+	"canNotResolveFile": "${file} no se puede resolver, por favor, abra un editor.",
-+	"canNotResolveRelativeFile": "${relativeFile} no se puede resolver, por favor, abra un editor.",
-+	"canNotResolveFileDirname": "${fileDirname} no se puede resolver, por favor, abra un editor.",
-+	"canNotResolveFileExtname": "${fileExtname} no se puede resolver, por favor, abra un editor.",
-+	"canNotResolveFileBasename": "${fileBasename} no se puede resolver, por favor, abra un editor.",
-+	"canNotResolveFileBasenameNoExtension": "${fileBasenameNoExtension} no se puede resolver, por favor, abra un editor."
-+>>>>>>> .their
- }
-\ No newline at end of file
-merged
-  result 100644 684f1d5259148973c4b8d5ee2d848746cdfe2e6e i18n/esn/src/vs/workbench/services/files/node/fileService.i18n.json
-  our    100644 69847e82751064f3cffd7bd9062a7dbd2fdc0e69 i18n/esn/src/vs/workbench/services/files/node/fileService.i18n.json
-@@ -9,6 +9,7 @@
- 	"fileInvalidPath": "Recurso de archivo no válido ({0})",
- 	"fileIsDirectoryError": "Archivo es el directorio",
- 	"fileNotModifiedError": "Archivo no modificado desde",
-+	"fileTooLargeForHeapError": "El tamaño del archivo supera el límite de memoria predeterminado. Reinicie con un límite superior. La configuración actual es reiniciar con {0} MB.",
- 	"fileTooLargeError": "Archivo demasiado grande para abrirlo",
- 	"fileNotFoundError": "Archivo no encontrado ({0})",
- 	"fileBinaryError": "El archivo parece ser binario y no se puede abrir como texto",
-changed in both
-  base   100644 bc93fe05e88ddf109424efc03b36be2ed8327545 i18n/fra/extensions/git/out/commands.i18n.json
-  our    100644 95b33e9cb37384a542e0f0621ed506addc05f3b9 i18n/fra/extensions/git/out/commands.i18n.json
-  their  100644 1fe6735dc5d4772bb4c17ed33fe33f97fddfdd55 i18n/fra/extensions/git/out/commands.i18n.json
-changed in both
-  base   100644 20a77bf9902397359ea601ad3ef8b39249288e09 i18n/fra/extensions/php/package.i18n.json
-  our    100644 7432910059505786aeb77409e75866339d62c1a2 i18n/fra/extensions/php/package.i18n.json
-  their  100644 42d994f8072ed8df8abaa4c7a79282b25443b9d1 i18n/fra/extensions/php/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Concepts de base du langage PHP",
-+=======
-+	"displayName": "Fonctionnalités du langage PHP",
-+>>>>>>> .their
- 	"description": "Fournit la coloration syntaxique et la correspondance des parenthèses dans les fichiers PHP."
- }
-\ No newline at end of file
-changed in both
-  base   100644 3b0bc4935156b1368ab5d77b15108689a7e7b123 i18n/fra/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 e3b7be89c4680bacecf118915da9495bb164163d i18n/fra/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 f382fd2543619591f92327dec4e75cc9039d71f9 i18n/fra/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -32,7 +32,10 @@
- 	"infoBorder": "Couleur de bordure de la ligne ondulée marquant les informations dans l'éditeur.",
- 	"hintForeground": "Couleur de premier plan de la ligne ondulée d'indication dans l'éditeur.",
- 	"hintBorder": "Couleur de bordure de la ligne ondulée d'indication dans l'éditeur.",
-+<<<<<<< .our
- 	"unnecessaryForeground": "Couleur de premier plan du code inutile dans l'éditeur.",
-+=======
-+>>>>>>> .their
- 	"overviewRulerRangeHighlight": "Couleur du marqueur de la règle d'aperçu pour des plages mises en surbrillance. La couleur doit ne pas être opaque pour ne pas masquer les décorations du dessous.",
- 	"overviewRuleError": "Couleur du marqueur de la règle d'aperçu pour les erreurs.",
- 	"overviewRuleWarning": "Couleur du marqueur de la règle d'aperçu pour les avertissements.",
-changed in both
-  base   100644 6b8c2481d1f40d9ba0346a2b906c7e8077f20985 i18n/fra/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  our    100644 8e1c626a771393d667c7b3c11b9837bda978f030 i18n/fra/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 6ad0b22d7ed27a50f036ba589a839f8785c8a484 i18n/fra/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -7,7 +7,10 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"timeout.formatOnSave": "Format avorté lors de l'enregistrement après {0} ms",
-+<<<<<<< .our
- 	"codeActionsOnSave.didTimeout": "codeActionsOnSave abandonné au bout de {0} ms",
-+=======
-+>>>>>>> .their
- 	"timeout.onWillSave": "OnWillSaveTextDocument-event avorté après 1750 ms",
- 	"saveParticipants": "Exécution de la sauvegarde des participants..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 ef97b82ec545442e03d0cd26d95bd6dc0902039e i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 1a663cb4405d0c8f86ec154a57cdd2b613d93195 i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 2c9425186bff924f2d0ab3c9ca2bbe1757fca514 i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -80,7 +80,10 @@
- 	"titleBarStyle": "Ajustez l'apparence de la barre de titre de la fenêtre. Vous devez effectuer un redémarrage complet pour que les changements soient appliqués.",
- 	"window.nativeTabs": "Active les onglets macOS Sierra. Notez que vous devez redémarrer l'ordinateur pour appliquer les modifications et que les onglets natifs désactivent tout style de barre de titre personnalisé configuré, le cas échéant.",
- 	"window.smoothScrollingWorkaround": "Activez cette solution de contournement si le défilement n’est plus lissé après la restauration d’une fenêtre de VS Code réduite. Il s’agit d’une solution de contournement pour un problème (https://github.com/Microsoft/vscode/issues/13612) où le défilement commence à laguer sur les périphériques dotés de pavés de précision comme les appareils Surface de Microsoft. Activer cette solution de contournement peut provoquer un peu de scintillement de mise en page après la restauration de la fenêtre depuis l’état minimisé mais est sans danger.",
-+<<<<<<< .our
- 	"window.clickThroughInactive": "Si activée, cliquer sur une fenêtre inactive activera la fenêtre et déclenchera l’élément sous la souris, si elle est cliquable. Si désactivé, cliquer n’importe où sur une fenêtre inactive va seulement l'activer et un second clic sur l’élément sera nécessaire.",
-+=======
-+>>>>>>> .their
- 	"zenModeConfigurationTitle": "Mode Zen",
- 	"zenMode.fullScreen": "Contrôle si l'activation de Zen Mode met également le banc d'essai en mode plein écran.",
- 	"zenMode.centerLayout": "Contrôle si l'activation du mode Zen centre également la disposition.",
-changed in both
-  base   100644 f3007ffa4193b68f457ed858caaa12ed5992ff30 i18n/fra/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  our    100644 ea17513fd0b7438358bedc5e679b748d269562de i18n/fra/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  their  100644 9cefb85297af3519e53c5c86f6be77b7bef7b128 i18n/fra/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-@@ -17,7 +17,11 @@
- 	"breakpointUnverifieddHover": "Point d'arrêt non vérifié",
- 	"functionBreakpointUnsupported": "Les points d'arrêt de fonction ne sont pas pris en charge par ce type de débogage",
- 	"breakpointDirtydHover": "Point d'arrêt non vérifié. Fichier modifié. Redémarrez la session de débogage.",
-+<<<<<<< .our
- 	"logBreakpointUnsupported": "Les points de journalisation ne sont pas pris en charge par ce type de débogage",
-+=======
-+	"logBreakpointUnsupported": "Log points non pris en charge par ce type de débogage",
-+>>>>>>> .their
- 	"conditionalBreakpointUnsupported": "Les points d'arrêt conditionnels ne sont pas pris en charge par ce type de débogage",
- 	"hitBreakpointUnsupported": "Les points d'arrêt conditionnels ne sont pas pris en charge par ce type de débogage"
- }
-\ No newline at end of file
-changed in both
-  base   100644 518d71cfb8fb33959f49f75509a412729e131beb i18n/fra/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  our    100644 c60cc41768e6fed42f5ce8d4a24c89cb2e037162 i18n/fra/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  their  100644 b9f58b85393a7524b6ada3e2e89778aff9b94b91 i18n/fra/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-@@ -8,7 +8,11 @@
- 	],
- 	"toggleBreakpointAction": "Déboguer : activer/désactiver un point d'arrêt",
- 	"conditionalBreakpointEditorAction": "Déboguer : ajouter un point d'arrêt conditionnel...",
-+<<<<<<< .our
- 	"logPointEditorAction": "Débogage : Ajouter un point de journalisation...",
-+=======
-+	"logPointEditorAction": "Déboguer : ajouter un Log point...",
-+>>>>>>> .their
- 	"runToCursor": "Exécuter jusqu'au curseur",
- 	"debugEvaluate": "Déboguer : évaluer",
- 	"debugAddToWatch": "Déboguer : ajouter à la fenêtre Espion",
-changed in both
-  base   100644 bd3746f483c06026adc11dc0abdc6d10273172c5 i18n/fra/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-  our    100644 44f7ce035b6e35faffa68a44fe9f5804c37d8266 i18n/fra/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-  their  100644 98bce49687e9c2fc307c293f2d83bd1c7e89e4ac i18n/fra/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-@@ -6,9 +6,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"breakpointWidgetLogMessagePlaceholder": "Message à loguer lorsque le point d’arrêt est atteint. Les expressions entre {} sont interpolées. 'Entrée' pour accepter,'Echap' pour annuler.",
- 	"breakpointWidgetHitCountPlaceholder": "Arrêt quand le nombre d'accès est atteint. 'Entrée' pour accepter ou 'Échap' pour annuler.",
- 	"breakpointWidgetExpressionPlaceholder": "Arrêt quand l'expression prend la valeur true. 'Entrée' pour accepter ou 'Échap' pour annuler.",
-+=======
-+	"breakpointWidgetLogMessagePlaceholder": "Message à loguer lorsque le point d’arrêt est atteint. 'Enter' pour accepter, 'Échap' pour annuler.",
-+	"breakpointWidgetHitCountPlaceholder": "Arrêt quand le nombre d'accès est atteint. 'Entrée' pour accepter ou 'Échap' pour annuler.",
-+	"breakpointWidgetExpressionPlaceholder": "Arrêt quand l'expression prend la valeur true. 'Entrée' pour accepter ou 'Échap' pour annuler.",
-+	"breakpointWidgetLogMessageAriaLabel": "Le programme enregistrera ce message chaque fois que ce point d’arrêt est atteint. Appuyez sur Entrée pour accepter ou Échap pour annuler.",
-+	"breakpointWidgetHitCountAriaLabel": "Le programme s'arrête ici uniquement si le nombre d'accès est atteint. Appuyez sur Entrée pour accepter, ou sur Échap pour annuler.",
-+	"breakpointWidgetAriaLabel": "Le programme s'arrête ici uniquement si cette condition a la valeur true. Appuyez sur Entrée pour accepter, ou sur Échap pour annuler.",
-+>>>>>>> .their
- 	"expression": "Expression",
- 	"hitCount": "Nombre d'accès",
- 	"logMessage": "Message de log"
-changed in both
-  base   100644 2cdcf5ae1aa32a1194167de33c3483c1742089ad i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  our    100644 c72f6ed139308469b1eda47864e3e1ed2bf00916 i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  their  100644 dfd310163a34b7e95223df060d2755aa7dffe481 i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-@@ -24,6 +24,7 @@
- 	"enableBreakpoints": "Activer le point d’arrêt Inline sur la colonne {0}",
- 	"enableBreakpointOnLine": "Activer le point d'arrêt de la ligne",
- 	"addBreakpoint": "Ajouter un point d'arrêt",
-+<<<<<<< .our
- 	"addConditionalBreakpoint": "Ajouter un point d'arrêt conditionnel...",
- 	"addLogPoint": "Ajouter un point de journalisation...",
- 	"breakpointHasCondition": "Ce {0} a un {1} qui sera perdu en cas de suppression. Désactivez le {0} à la place.",
-@@ -32,5 +33,9 @@
- 	"removeLogPoint": "Supprimer {0}",
- 	"disableLogPoint": "Désactiver {0}",
- 	"cancel": "Annuler",
-+=======
-+	"conditionalBreakpoint": "Ajouter un point d'arrêt conditionnel...",
-+	"addLogPoint": "Ajouter un Log Point",
-+>>>>>>> .their
- 	"addConfiguration": "Ajouter une configuration..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 9a38baf245641a937dd39e0f8908e9fe03b3e512 i18n/fra/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  our    100644 11c71d149dcd965919372e9b079e7b0ec31fc966 i18n/fra/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  their  100644 be75e44565c95fb340c826d6643640b51b46999e i18n/fra/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-@@ -8,6 +8,24 @@
- 	],
- 	"debugAdapterBinNotFound": "L'exécutable d'adaptateur de débogage '{0}' n'existe pas.",
- 	"debugAdapterCannotDetermineExecutable": "Impossible de déterminer l'exécutable pour l'adaptateur de débogage '{0}'.",
-+<<<<<<< .our
- 	"unableToLaunchDebugAdapter": "Impossible de lancer l'adaptateur de débogage à partir de '{0}'.",
- 	"unableToLaunchDebugAdapterNoArgs": "Impossible de lancer l'adaptateur de débogage."
-+=======
-+	"launch.config.comment1": "Utilisez IntelliSense pour en savoir plus sur les attributs possibles.",
-+	"launch.config.comment2": "Pointez pour afficher la description des attributs existants.",
-+	"launch.config.comment3": "Pour plus d'informations, visitez : {0}",
-+	"debugType": "Type de configuration.",
-+	"debugTypeNotRecognised": "Le type de débogage n'est pas reconnu. Vérifiez que vous avez installé l'extension de débogage correspondante et qu'elle est activée.",
-+	"node2NotSupported": "\"node2\" n'est plus pris en charge. Utilisez \"node\" à la place, et affectez la valeur \"inspector\" à l'attribut \"protocol\".",
-+	"debugName": "Le nom de la configuration s'affiche dans le menu déroulant de la configuration de lancement.",
-+	"debugRequest": "Type de requête de configuration. Il peut s'agir de \"launch\" ou \"attach\".",
-+	"debugServer": "Pour le développement d'une extension de débogage uniquement : si un port est spécifié, VS Code tente de se connecter à un adaptateur de débogage s'exécutant en mode serveur",
-+	"debugPrelaunchTask": "Tâche à exécuter avant le démarrage de la session de débogage.",
-+	"debugPostDebugTask": "Tâche à exécuter après que le débogage se termine.",
-+	"debugWindowsConfiguration": "Attributs de configuration de lancement spécifiques à Windows.",
-+	"debugOSXConfiguration": "Attributs de configuration de lancement spécifiques à OS X.",
-+	"debugLinuxConfiguration": "Attributs de configuration de lancement spécifiques à Linux.",
-+	"deprecatedVariables": "env.', 'config.' et 'command.' sont déconseillés. Utilisez 'env:', 'config:' et 'command:' à la place."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c68f4a910927fcdc87cfd867ea2ab3637f71baaf i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  our    100644 0c89b62126cb9cedd41a45c5bb89945d3497fe59 i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  their  100644 7c8133234c39808af627f4574d56047ac8e01258 i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-@@ -44,8 +44,13 @@
- 	"view location": "Emplacement",
- 	"localizations": "Localisations ({0})",
- 	"localizations language id": "Id de langue",
-+<<<<<<< .our
- 	"localizations language name": "Nom de la langue",
- 	"localizations localized language name": "Nom de la langue (localisé)",
-+=======
-+	"localizations language name": "Nom de langue",
-+	"localizations localized language name": "Nom de langue (localisé)",
-+>>>>>>> .their
- 	"colorThemes": "Thèmes de couleurs ({0})",
- 	"iconThemes": "Thèmes d’icônes ({0})",
- 	"colors": "Couleurs ({0})",
-changed in both
-  base   100644 557f45e5910fd9ab623cccc9dd8fa87735b78615 i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  our    100644 f395ede0a046caeae18a2c7db319d8ae7b900356 i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  their  100644 d37374d6f5326622061b7ed44af81d76144e8f36 i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-@@ -14,7 +14,11 @@
- 	"workspaceRecommendedExtensions": "Recommandations de l’espace de travail",
- 	"builtInExtensions": "Fonctionnalités",
- 	"builtInThemesExtensions": "Thèmes",
-+<<<<<<< .our
- 	"builtInBasicsExtensions": "Langages de programmation",
-+=======
-+	"builtInBasicsExtensions": "Langages",
-+>>>>>>> .their
- 	"searchExtensions": "Rechercher des extensions dans Marketplace",
- 	"sort by installs": "Trier par : nombre d'installations",
- 	"sort by rating": "Trier par : évaluation",
-changed in both
-  base   100644 412d69fb5bf367c6f0ee3575326ea122288eb6aa i18n/fra/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-  our    100644 3d2c988d730e15f92019e8071c4ee2a839a4b437 i18n/fra/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-  their  100644 4cbd420efec0a5da843af14f694f1a52e9191098 i18n/fra/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-@@ -8,8 +8,13 @@
- 	],
- 	"textFileEditor": "Éditeur de fichier texte",
- 	"createFile": "Créer un fichier",
-+<<<<<<< .our
- 	"relaunchWithIncreasedMemoryLimit": "Redémarrer avec {0} Mo",
- 	"configureMemoryLimit": "Configurer la limite de mémoire",
-+=======
-+	"relaunchWithIncreasedMemoryLimit": "Relancer",
-+	"configureMemoryLimit": "Configurer",
-+>>>>>>> .their
- 	"fileEditorWithInputAriaLabel": "{0}. Éditeur de fichier texte.",
- 	"fileEditorAriaLabel": "Éditeur de fichier texte."
- }
-\ No newline at end of file
-changed in both
-  base   100644 a31359c7486914a756043a31f319e441fc9059bf i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 fa117de3746fd117674712532fb1af257c3eacf4 i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 cb267faf4455250a1b36f02f41c31616ae670ba8 i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -38,12 +38,27 @@
- 	"confirmMoveTrashMessageMultiple": "Êtes-vous sûr de vouloir supprimer les fichiers {0} suivants ?",
- 	"confirmMoveTrashMessageFolder": "Voulez-vous vraiment supprimer '{0}' et son contenu ?",
- 	"confirmMoveTrashMessageFile": "Voulez-vous vraiment supprimer '{0}' ?",
-+<<<<<<< .our
- 	"confirmDeleteMessageFilesAndDirectories": "Voulez-vous vraiment supprimer définitivement les {0} fichiers/répertoires suivants et leur contenu ?",
- 	"confirmDeleteMessageMultipleDirectories": "Voulez-vous vraiment supprimer définitivement les {0} répertoires suivants et leur contenu ?",
- 	"confirmDeleteMessageMultiple": "Êtes-vous sûr de vouloir supprimer définitivement les fichiers {0} suivants ?",
- 	"confirmDeleteMessageFolder": "Voulez-vous vraiment supprimer définitivement '{0}' et son contenu ?",
- 	"confirmDeleteMessageFile": "Voulez-vous vraiment supprimer définitivement '{0}' ?",
- 	"addFiles": "Ajouter des fichiers",
-+=======
-+	"undoBin": "Vous pouvez restaurer à partir de la Corbeille.",
-+	"undoTrash": "Vous pouvez restaurer à partir de la Poubelle.",
-+	"doNotAskAgain": "Ne plus me demander",
-+	"confirmDeleteMessageMultiple": "Êtes-vous sûr de vouloir supprimer définitivement les fichiers {0} suivants ?",
-+	"confirmDeleteMessageFolder": "Voulez-vous vraiment supprimer définitivement '{0}' et son contenu ?",
-+	"confirmDeleteMessageFile": "Voulez-vous vraiment supprimer définitivement '{0}' ?",
-+	"irreversible": "Cette action est irréversible !",
-+	"binFailed": "Impossible de supprimer en utilisant la corbeille. Voulez-vous supprimer définitivement à la place ?",
-+	"trashFailed": "Impossible de supprimer en utilisant la corbeille. Voulez-vous supprimer définitivement à la place?",
-+	"deletePermanentlyButtonLabel": "Supprimer &&définitivement",
-+	"retryButtonLabel": "&&Réessayer",
-+	"importFiles": "Importer des fichiers",
-+>>>>>>> .their
- 	"confirmOverwrite": "Un fichier ou dossier portant le même nom existe déjà dans le dossier de destination. Voulez-vous le remplacer ?",
- 	"replaceButtonLabel": "&&Remplacer",
- 	"fileIsAncestor": "Le fichier à copier est un ancêtre du dossier de destination",
-changed in both
-  base   100644 e5b80a13c4415d99cb3ee452365e356ff39adb64 i18n/fra/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 a75d38efac11add868250527f11214dd6ff75d12 i18n/fra/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 1bc54a246d33afafe154e329f09be7148bd4764c i18n/fra/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-@@ -35,7 +35,11 @@
- 	"hotExit": "Contrôle si les fichiers non enregistrés sont mémorisés entre les sessions, ce qui permet d'ignorer la demande d'enregistrement à la sortie de l'éditeur.",
- 	"useExperimentalFileWatcher": "Utilisez le nouvel observateur de fichiers expérimental.",
- 	"defaultLanguage": "Mode de langage par défaut affecté aux nouveaux fichiers.",
-+<<<<<<< .our
- 	"maxMemoryForLargeFilesMB": "Contrôle la mémoire disponible pour VS Code après redémarrage en essayant d’ouvrir les fichiers volumineux. Cela a le même effet que de spécifier --max-memory=NEWSIZE sur la ligne de commande.",
-+=======
-+	"maxMemoryForLargeFilesMB": "La nouvelle limite de mémoire en Mo à utiliser par l’application lorsque elle se relance pour ouvrir des fichiers volumineux. Si vous souhaitez commencer avec une limite plus élevée, vous pouvez lancer l’application de ligne de commande avec l’option --max-memory=NEWSIZE.",
-+>>>>>>> .their
- 	"editorConfigurationTitle": "Éditeur",
- 	"formatOnSave": "Met en forme un fichier au moment de l'enregistrement. Un formateur doit être disponible, le fichier ne doit pas être enregistré automatiquement, et l'éditeur ne doit pas être en cours d'arrêt.",
- 	"formatOnSaveTimeout": "Délai d’attente pour formater lors de l'enregistrement. Spécifie le délai en millisecondes pour les commandes formatOnSave. Les commandes prenant plus de temps que le délai d’attente spécifié seront annulées.",
-changed in both
-  base   100644 a5adcd52e7903c1c5f66ec3400363012b91ccc4d i18n/fra/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  our    100644 41c3a1d60501fd1442ed2c9b9f3cac9ed3fd2bbe i18n/fra/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  their  100644 18b9bcc75e033649c379c75912d4e3a63af841ec i18n/fra/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-changed in both
-  base   100644 76289731369588dfda1e7687c592ffade207a9cf i18n/fra/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-  our    100644 9139ee20000e02871db62799f4e3bf44e815f204 i18n/fra/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-  their  100644 4e106f9358a018b284097ba3e909925420d90cad i18n/fra/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-changed in both
-  base   100644 7e415dbd6deaa301538df7e9f971625b57cc53fb i18n/fra/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
-  our    100644 a615adefb9ecb146fc7e84dc4b16f73838dc6bc1 i18n/fra/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
-  their  100644 680339bdc2769284bc10dfd3fc3c2f71092aad6b i18n/fra/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
-@@ -7,5 +7,9 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"copyMarker": "Copier",
-+<<<<<<< .our
- 	"copyMessage": "Copier le Message"
-+=======
-+	"copyMarkerMessage": "Copier le Message"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 ced53cc49d43b0ce31faf2f0f7bdcb5fc9ece7cf i18n/fra/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-  our    100644 f31962ae04c1e2044d7f998ce0b53b4b08372ffd i18n/fra/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-  their  100644 d03f909768686ea0ba99cefa0d287b3ffcc0149e i18n/fra/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-changed in both
-  base   100644 10b4d1f5b733937624ca08df1d5eb2b8151e736a i18n/fra/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  our    100644 675ad6e2d506f6eb23037370e188ea4353697fb3 i18n/fra/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  their  100644 ea1782bfd60906e4e2899f07032dfd7e23e10490 i18n/fra/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
-+=======
-+	"keybindingsInputName": "Raccourcis clavier",
-+>>>>>>> .their
- 	"showDefaultKeybindings": "Afficher les raccourcis clavier par défaut",
- 	"showUserKeybindings": "Afficher les raccourcis clavier utilisateur",
- 	"SearchKeybindings.AriaLabel": "Rechercher dans les combinaisons de touches",
-changed in both
-  base   100644 89db9e011193f51c330e90f51ba704a0501447b4 i18n/fra/src/vs/workbench/parts/search/browser/searchView.i18n.json
-  our    100644 4cd20eea1e68cf73a56249541b739d94f4272553 i18n/fra/src/vs/workbench/parts/search/browser/searchView.i18n.json
-  their  100644 c08b4f1e349db065f67f0afd522f2533187e0eab i18n/fra/src/vs/workbench/parts/search/browser/searchView.i18n.json
-@@ -7,10 +7,16 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"moreSearch": "Activer/désactiver les détails de la recherche",
-+<<<<<<< .our
- 	"searchScope.includes": "fichiers à inclure",
- 	"label.includes": "Modèles d'inclusion de recherche",
- 	"searchScope.excludes": "fichiers à exclure",
- 	"label.excludes": "Modèles d'exclusion de recherche",
-+=======
-+	"searchIncludeExclude.label": "fichiers à inclure/exclure",
-+	"searchIncludeExclude.ariaLabel": "Modèles de recherche Include/Exclude",
-+	"searchIncludeExclude.placeholder": "Exemples : src, !*.ts, test/**/*.log",
-+>>>>>>> .their
- 	"replaceAll.confirmation.title": "Tout remplacer",
- 	"replaceAll.confirm.button": "&&Remplacer",
- 	"replaceAll.occurrence.file.message": "{0} occurrence remplacée dans {1} fichier par '{2}'.",
-changed in both
-  base   100644 c560e29a2d5c8abcfe82d2d7c5d5a240f07ede40 i18n/fra/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 673cb698c2a5b3bfb8460611a63585f8ca3fd4e1 i18n/fra/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 9e767348573f40d1601c8c4e12a286fe45bbdc85 i18n/fra/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-@@ -28,7 +28,10 @@
- 	"JsonSchema.tasks.group.none": "N'assigne la tâche à aucun groupe",
- 	"JsonSchema.tasks.group": "Définit le groupe d'exécution auquel la tâche appartient. Prend en charge \"build\" pour l'ajouter au groupe de génération et \"test\" pour l'ajouter au groupe de test.",
- 	"JsonSchema.tasks.type": "Définit si la tâche est exécutée comme un processus ou comme une commande à l’intérieur d’un shell.",
-+<<<<<<< .our
- 	"JsonSchema.commandArray": "La commande shell à exécuter. Les éléments du tableau seront joints en utilisant un caractère d’espacement",
-+=======
-+>>>>>>> .their
- 	"JsonSchema.command.quotedString.value": "La valeur réelle de la commande",
- 	"JsonSchema.tasks.quoting.escape": "Echappe les caractères à l’aide du caractère d’échappement du shell (par exemple: ` sous PowerShell et \\ sous bash).",
- 	"JsonSchema.tasks.quoting.strong": "Entoure l’argument en utilisant le caractère guillemet du shell (par exemple: \" sous PowerShell et bash).",
-changed in both
-  base   100644 61c4bc5cb90d7312fae0c0a5e356250e20fd7111 i18n/fra/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 87d639c304bc4b35cf6eb86239d5ea30fd616b54 i18n/fra/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 ec562803a4adda0526f873e11591aa109d1201d8 i18n/fra/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-changed in both
-  base   100644 6b1951d0758da11ced1443c9460630dd881c67eb i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 8f10773d1a2d0f2302f3cb3b7d0dac64b3d63462 i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 854ab775c53f3bb034280cf29de0768ac74d851e i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -54,10 +54,17 @@
- 	"nextTerminalFindTerm": "Afficher le terme de recherche suivant",
- 	"previousTerminalFindTerm": "Afficher le terme de recherche précédent",
- 	"quickOpenTerm": "Changer de terminal actif",
-+<<<<<<< .our
- 	"workbench.action.terminal.scrollToPreviousCommand": "Faire défiler jusqu'à la commande précédente",
- 	"workbench.action.terminal.scrollToNextCommand": "Faire défiler jusqu'à la prochaine commande",
- 	"workbench.action.terminal.selectToPreviousCommand": "Sélectionnez pour la commande précédente",
- 	"workbench.action.terminal.selectToNextCommand": "Sélectionnez pour la commande suivante",
- 	"workbench.action.terminal.selectToPreviousLine": "Sélectionner pour la ligne précédente",
- 	"workbench.action.terminal.selectToNextLine": "Sélectionner pour la ligne suivante"
-+=======
-+	"workbench.action.terminal.focusPreviousCommand": "Focus sur la commande précédente",
-+	"workbench.action.terminal.focusNextCommand": "Focus sur la commande suivante",
-+	"workbench.action.terminal.selectToPreviousCommand": "Sélectionnez pour la commande précédente",
-+	"workbench.action.terminal.selectToNextCommand": "Sélectionnez pour la commande suivante"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 2c081ca984a3f9362e24f6ba375c14e31d506a4b i18n/fra/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-  our    100644 bd1e8163634b26d29532367b224c1c31d1dad37f i18n/fra/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-  their  100644 268fc2a72c6cda41f454344841a0d4ae4d1c14ce i18n/fra/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-@@ -11,6 +11,7 @@
- 	"neverShowAgain": "Ne plus afficher",
- 	"enospcError": "{0} n’est pas en mesure de surveiller les modifications de fichiers dans ce grand espace de travail. Veuillez suivre le lien d'instructions pour résoudre ce problème.",
- 	"learnMore": "Instructions",
-+<<<<<<< .our
- 	"fileInvalidPath": "Ressource de fichier non valide ({0})",
- 	"fileIsDirectoryError": "Le fichier est un répertoire",
- 	"fileNotModifiedError": "Fichier non modifié depuis",
-@@ -24,6 +25,9 @@
- 	"fileReadOnlyError": "Fichier en lecture seule",
- 	"fileMoveConflict": "Déplacement/copie impossible. Le fichier existe déjà dans la destination.",
- 	"unableToMoveCopyError": "Impossible de déplacer/copier. Le fichier remplace le dossier qui le contient.",
-+=======
-+	"enospcError": "{0} n’est pas en mesure de surveiller les modifications de fichiers dans ce grand espace de travail. Veuillez suivre le lien d'instructions pour résoudre ce problème.",
-+>>>>>>> .their
- 	"binFailed": "Échec du déplacement de '{0}' vers la corbeille",
- 	"trashFailed": "Échec du déplacement de '{0}' vers la corbeille"
- }
-\ No newline at end of file
-merged
-  result 100644 e77aa1c40e28fb057e17f2470117d1d3d3127565 i18n/fra/src/vs/workbench/services/files/node/fileService.i18n.json
-  our    100644 c9a4fd144cdf59fe0e1beb49f1943dbeeeb3374e i18n/fra/src/vs/workbench/services/files/node/fileService.i18n.json
-@@ -9,6 +9,7 @@
- 	"fileInvalidPath": "Ressource de fichier non valide ({0})",
- 	"fileIsDirectoryError": "Le fichier est un répertoire",
- 	"fileNotModifiedError": "Fichier non modifié depuis",
-+	"fileTooLargeForHeapError": "La taille du fichier dépasse la limite de mémoire par défaut. Relancer avec une limite plus élevée. Le paramètre actuel est configuré pour relancer avec {0} Mo",
- 	"fileTooLargeError": "Fichier trop volumineux pour être ouvert",
- 	"fileNotFoundError": "Fichier introuvable ({0})",
- 	"fileBinaryError": "Il semble que le fichier soit binaire. Impossible de l'ouvrir en tant que texte",
-changed in both
-  base   100644 4b669f7fc4943aa0d34753b217a9bf7cae554125 i18n/ita/extensions/emmet/package.i18n.json
-  our    100644 325af035e69c09e1e32c51cdc976ffb0a4047641 i18n/ita/extensions/emmet/package.i18n.json
-  their  100644 9546a82e14e9b05a702a1fb39902370a89dee0bb i18n/ita/extensions/emmet/package.i18n.json
-@@ -60,6 +60,10 @@
- 	"emmetPreferencesCssMozProperties": "Proprietà CSS delimitate da virgola che assumono il prefisso 'moz' del vendor quando utilizzate nelle abbreviazioni di Emmet che iniziano per '-'. Per evitare sempre il prefisso 'moz' impostare stringa vuota.",
- 	"emmetPreferencesCssOProperties": "Proprietà CSS delimitate da virgola che assumono il prefisso 'o' del vendor quando utilizzate nelle abbreviazioni di Emmet che iniziano per '-'. Per evitare sempre il prefisso 'o' impostare stringa vuota.",
- 	"emmetPreferencesCssMsProperties": "Proprietà CSS delimitate da virgola che assumono il prefisso 'ms' del vendor quando utilizzate nelle abbreviazioni di Emmet che iniziano per '-'. Per evitare sempre il prefisso 'ms' impostare stringa vuota.",
-+<<<<<<< .our
- 	"emmetPreferencesCssFuzzySearchMinScore": "Il valore minimo (da 0 a 1) che dovrebbe raggiungere un'abbreviazione di fuzzy-match. I valori più bassi possono produrre molti falsi positivi, i valori più alti possono ridurre le possibili corrispondenze.",
- 	"emmetOptimizeStylesheetParsing": "Se è impostato su false, l'intero file viene analizzato per determinare se la posizione corrente è valida per l'espansione delle abbreviazioni di Emmet. Se è impostato su true, viene analizzato solo il contenuto circostante alla posizione corrente nei file css/scss/less."
-+=======
-+	"emmetPreferencesCssFuzzySearchMinScore": "Il valore minimo (da 0 a 1) che dovrebbe raggiungere un'abbreviazione di fuzzy-match. I valori più bassi possono produrre molti falsi positivi, i valori più alti possono ridurre le possibili corrispondenze."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 13f1df3d818cee76d97324e442478950c86894e2 i18n/ita/extensions/git/out/commands.i18n.json
-  our    100644 b8b9f0490197b0e5904f4f035caca3a7f04c7df9 i18n/ita/extensions/git/out/commands.i18n.json
-  their  100644 792f4a2d3dd38ef1666a3ae1585b12d8f82e6e39 i18n/ita/extensions/git/out/commands.i18n.json
-changed in both
-  base   100644 59850c0a057c81fc41e6a9679a8755b447a50e69 i18n/ita/extensions/php/package.i18n.json
-  our    100644 d8344412ea06e1d3ebcd7a1c9d180341bd3b2e6d i18n/ita/extensions/php/package.i18n.json
-  their  100644 4e30fbb3265efa33aa338aea13eef0d046a65b32 i18n/ita/extensions/php/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Nozioni di base del linguaggio PHP",
-+=======
-+	"displayName": "Funzionalità del linguaggio PHP",
-+>>>>>>> .their
- 	"description": "Offre l'evidenziazione della sintassi e la corrispondenza delle parentesi nei file PHP."
- }
-\ No newline at end of file
-changed in both
-  base   100644 75512d966b726879ce72fce01494cd982c028636 i18n/ita/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 047668b002c0125f22b3c77979675bee2ddbe88f i18n/ita/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 a111011130764a58551aa71a6c229ef4c045fe56 i18n/ita/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -32,7 +32,10 @@
- 	"infoBorder": "Colore del bordo degli squiggle di informazione nell'editor",
- 	"hintForeground": "Colore primo piano degli squiggle di suggerimento nell'editor.",
- 	"hintBorder": "Colore del bordo degli squiggle di suggerimento nell'editor.",
-+<<<<<<< .our
- 	"unnecessaryForeground": "Colore primo piano del codice non necessario nell'editor.",
-+=======
-+>>>>>>> .their
- 	"overviewRulerRangeHighlight": "Colore del marcatore righello panoramica per evidenziazione intervalli. Il colore non deve essere opaco per non nascondere decorazioni sottostanti.",
- 	"overviewRuleError": "Colore del marcatore del righello delle annotazioni per gli errori.",
- 	"overviewRuleWarning": "Colore del marcatore del righello delle annotazioni per gli avvisi.",
-changed in both
-  base   100644 91d39114cd914fc6f46bdd0e4fcb2a8037cbe03a i18n/ita/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 35f8ed83f0da1c4a75798a67e5b16affcd21632f i18n/ita/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 87d656a3dd054746161346cb5a0e4665f5028ea2 i18n/ita/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -25,6 +25,11 @@
- 	"uninstallDependeciesConfirmation": "Disinstallare solo '{0}' o anche le relative dipendenze?",
- 	"uninstallOnly": "Solo Estensioni",
- 	"uninstallAll": "Disinstalla tutti",
-+<<<<<<< .our
-+=======
-+	"uninstallConfirmation": "Disinstallare '{0}'?",
-+	"ok": "OK",
-+>>>>>>> .their
- 	"singleDependentError": "Non è possibile disinstallare l'estensione '{0}'. L'estensione '{1}' dipende da tale estensione.",
- 	"twoDependentsError": "Non è possibile disinstallare l'estensione '{0}'. Le estensioni '{1}' e '{2}' dipendono da tale estensione.",
- 	"multipleDependentsError": "Non è possibile disinstallare l'estensione '{0}'. Alcune estensioni, tra cui '{1}' e '{2}' dipendono da tale estensione.",
-changed in both
-  base   100644 2e5c4543ebf1b3329d5c0cafdd25c231e176563e i18n/ita/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 db040b20535e5fbe6df69ea748baeb36651c5732 i18n/ita/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 ff2aecc6fe1348f7b43867c6c77f240776c2a20d i18n/ita/src/vs/platform/theme/common/colorRegistry.i18n.json
-changed in both
-  base   100644 8488ca775b809887d536bbb1322f506f82a88527 i18n/ita/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  our    100644 475ba817066d79b528abeae699b840a0322796c0 i18n/ita/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 ac0f699ab1ec028162360e0eee2bd2b23fe26d95 i18n/ita/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -7,7 +7,10 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"timeout.formatOnSave": "Comando Formatta dopo salvataggio interrotto dopo {0} ms",
-+<<<<<<< .our
- 	"codeActionsOnSave.didTimeout": "codeActionsOnSave interrotto dopo {0} ms",
-+=======
-+>>>>>>> .their
- 	"timeout.onWillSave": "Evento onWillSaveTextDocument interrotto dopo 1750 ms",
- 	"saveParticipants": "Esecuzione del salvataggio partecipanti..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 e548589e82c742ac8045e5f4edd681566248394d i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 16fec1a5d98f225249a95297ad06c45ba75efafc i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 b0716c351ce3aab8eb11fdbec681efa4d6423966 i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -80,7 +80,10 @@
- 	"titleBarStyle": "Consente di modificare l'aspetto della barra del titolo della finestra. Per applicare le modifiche, è necessario un riavvio completo.",
- 	"window.nativeTabs": "Abilita le finestre di tab per macOS Sierra. La modifica richiede un riavvio. Eventuali personalizzazioni della barra del titolo verranno disabilitate",
- 	"window.smoothScrollingWorkaround": "Abilitare questa soluzione alternativa se lo scorrimento non è più fluido dopo il ripristino di una finestra di VS Code ridotta a icona. Si tratta di una soluzione alternativa per un problema (https://github.com/Microsoft/vscode/issues/13612) in cui si verificano ritardi nello scorrimento in dispositivi con trackpad di precisione, come quelli Surface di Microsoft. Se si abilita questa soluzione alternativa, si potrebbe riscontrare un certo sfarfallio del layout dopo aver ripristinato la finestra ridotta a icona alle dimensioni normali, ma in altre situazioni non produce alcun effetto negativo.",
-+<<<<<<< .our
- 	"window.clickThroughInactive": "Se è abilitata, facendo clic su una finestra inattiva si attiverà non solo la finestra, ma anche l'elemento su cui è posizionato il puntatore del mouse se è selezionabile. Se è disabilitata, facendo clic in un punto qualsiasi in una finestra inattiva verrà attivata solo la finestra e sarà necessario fare di nuovo clic sull'elemento.",
-+=======
-+>>>>>>> .their
- 	"zenModeConfigurationTitle": "Modalità Zen",
- 	"zenMode.fullScreen": "Consente di controllare se attivando la modalità Zen anche l'area di lavoro passa alla modalità schermo intero.",
- 	"zenMode.centerLayout": "Controlla se attivando la modalità Zen viene centrato anche il layout.",
-changed in both
-  base   100644 5e7acab8dbecc642c4e8e14b07024aae30472cef i18n/ita/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  our    100644 656b814006f7667926a1768077ad144830bd3d8a i18n/ita/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  their  100644 b6d5637db01237a30eb113e32983ae17bed73973 i18n/ita/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-changed in both
-  base   100644 f7b3467296b6ca66768e5acdb0733347c311945d i18n/ita/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  our    100644 83bb2032b731649548f395ba120da85ff1ed3b12 i18n/ita/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  their  100644 d7d5ae4ad8681f8e7c7e75c72ca02a8081653e17 i18n/ita/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-changed in both
-  base   100644 885d74b575b6a42b031a7ff3133ff3b4678b7363 i18n/ita/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-  our    100644 10c6796d647907455c3faf8dab6c97d143e37534 i18n/ita/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-  their  100644 cec3cb52bc7038d6c1db275edcd1099cb3f331be i18n/ita/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-@@ -6,9 +6,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"breakpointWidgetLogMessagePlaceholder": "Messaggio da registrare quando viene raggiunto il punto di interruzione. Le espressioni tra parentesi graffe ({}) vengono interpolate. Premere 'INVIO' per accettare, \"ESC\" per annullare.",
- 	"breakpointWidgetHitCountPlaceholder": "Interrompe quando viene soddisfatta la condizione del numero di passaggi. Premere 'INVIO' per accettare oppure 'ESC' per annullare.",
- 	"breakpointWidgetExpressionPlaceholder": "Interrompe quando l'espressione restituisce true. Premere 'INVIO' per accettare oppure 'ESC' per annullare.",
-+=======
-+	"breakpointWidgetLogMessagePlaceholder": "Messaggio da registrare quando il punto di interruzione viene raggiunto. 'INVIO' per accettare, 'ESC' per annullare.",
-+	"breakpointWidgetHitCountPlaceholder": "Interrompe quando viene soddisfatta la condizione del numero di passaggi. Premere 'INVIO' per accettare oppure 'ESC' per annullare.",
-+	"breakpointWidgetExpressionPlaceholder": "Interrompe quando l'espressione restituisce true. Premere 'INVIO' per accettare oppure 'ESC' per annullare.",
-+	"breakpointWidgetLogMessageAriaLabel": "Il programma registrerà questo messaggio ogni volta che questo punto di interruzione viene raggiunto. Premere INVIO per accettare o ESC per annullare.",
-+	"breakpointWidgetHitCountAriaLabel": "Il programma si arresterà in questo punto solo se viene raggiunto il numero di passaggi. Premere INVIO per accettare oppure ESC per annullare.",
-+	"breakpointWidgetAriaLabel": "Il programma si arresterà in questo punto solo se la condizione è vera. Premere INVIO per accettare oppure ESC per annullare.",
-+>>>>>>> .their
- 	"expression": "Espressione",
- 	"hitCount": "Numero di passaggi",
- 	"logMessage": "Messaggio di log"
-changed in both
-  base   100644 171d99b96d1b9c4cb5eed3b97ed8546c6322fc5c i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  our    100644 43601d1a73d0ae182748fee08c0ea21e7d438884 i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  their  100644 bfe608de235efb51a2759e169553297e7cf60407 i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-@@ -24,6 +24,7 @@
- 	"enableBreakpoints": "Abilita punto di interruzione in linea a colonna {0}",
- 	"enableBreakpointOnLine": "Abilita punto di interruzione riga",
- 	"addBreakpoint": "Aggiungi punto di interruzione",
-+<<<<<<< .our
- 	"addConditionalBreakpoint": "Aggiungi punto di interruzione condizionale...",
- 	"addLogPoint": "Aggiungi punto di registrazione...",
- 	"breakpointHasCondition": "Per questo {0} è presente un {1} che verrà perso in seguito alla rimozione. Provare invece a disabilitare il {0}.",
-@@ -32,5 +33,9 @@
- 	"removeLogPoint": "Rimuovi {0}",
- 	"disableLogPoint": "Disabilita {0}",
- 	"cancel": "Annulla",
-+=======
-+	"conditionalBreakpoint": "Aggiungi punto di interruzione condizionale...",
-+	"addLogPoint": "Aggiungi punto di registrazione...",
-+>>>>>>> .their
- 	"addConfiguration": "Aggiungi configurazione..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 98695801004b415cc537aa32e83ef5690688a338 i18n/ita/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  our    100644 3a9023e46622e84a42ee4a7ab34aa864b1ec0e8e i18n/ita/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  their  100644 3fda2c7e2ef3f9b7e037b023a511133f6d4ab955 i18n/ita/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-@@ -8,6 +8,24 @@
- 	],
- 	"debugAdapterBinNotFound": "Il file eseguibile '{0}' dell'adattatore di debug non esiste.",
- 	"debugAdapterCannotDetermineExecutable": "Non è possibile determinare il file eseguibile per l'adattatore di debug '{0}'.",
-+<<<<<<< .our
- 	"unableToLaunchDebugAdapter": "Non è possibile avviare l'adattatore di debug da '{0}'.",
- 	"unableToLaunchDebugAdapterNoArgs": "Non è possibile avviare l'adattatore di debug."
-+=======
-+	"launch.config.comment1": "Usare IntelliSense per informazioni sui possibili attributi.",
-+	"launch.config.comment2": "Al passaggio del mouse vengono visualizzate le descrizioni degli attributi esistenti.",
-+	"launch.config.comment3": "Per ulteriori informazioni, visitare: {0}",
-+	"debugType": "Tipo di configurazione.",
-+	"debugTypeNotRecognised": "Il tipo di debug non è riconosciuto. Assicurarsi di avere un'estensione appropriata per il debug installata e che sia abilitata.",
-+	"node2NotSupported": "\"node2\" non è più supportato. In alternativa, usare \"node\" e impostare l'attributo \"protocol\" su \"inspector\".",
-+	"debugName": "Nome della configurazione. Viene visualizzato nel menu a discesa della configurazione di avvio.",
-+	"debugRequest": "Tipo della richiesta di configurazione. Può essere \"launch\" o \"attach\".",
-+	"debugServer": "Solo per lo sviluppo dell'estensione di debug: se si specifica una porta, Visual Studio Code prova a connettersi a un adattatore di debug in esecuzione in modalità server",
-+	"debugPrelaunchTask": "Attività da eseguire prima dell'avvio della sessione di debug.",
-+	"debugPostDebugTask": "Attività da eseguire dopo il completamento della sessione di debug.",
-+	"debugWindowsConfiguration": "Attributi della configurazione di avvio specifici di Windows.",
-+	"debugOSXConfiguration": "Attributi della configurazione di avvio specifici di OS X.",
-+	"debugLinuxConfiguration": "Attributi della configurazione di avvio specifici di Linux.",
-+	"deprecatedVariables": "'env.', 'config.' e 'command.' sono deprecati. In alternativa, usare 'env:', 'config:' e 'command:'."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 bf455524ce9d97398dda32822451bb441b59a88d i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  our    100644 e979e5172329eb5b17f4bd06838e816aa279aaad i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  their  100644 8f4151488c3a2fd1257092a9faf621e7e8dcd7c9 i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-changed in both
-  base   100644 d9192794c7105465eaa5f8c2d95b9759e21cd2d2 i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  our    100644 17b06f638b8c4e434b5c1e9690e18cec027dc497 i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  their  100644 23239bff10aa88c391be945735be9d7b6d6d2b25 i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-@@ -14,7 +14,11 @@
- 	"workspaceRecommendedExtensions": "Consigli per l'area di lavoro",
- 	"builtInExtensions": "Funzionalità",
- 	"builtInThemesExtensions": "Temi",
-+<<<<<<< .our
- 	"builtInBasicsExtensions": "Linguaggi di programmazione",
-+=======
-+	"builtInBasicsExtensions": "Lingue",
-+>>>>>>> .their
- 	"searchExtensions": "Cerca le estensioni nel Marketplace",
- 	"sort by installs": "Ordina per: conteggio installazioni",
- 	"sort by rating": "Ordina per: classificazione",
-changed in both
-  base   100644 4009655e54b91f882ff11d75a2e97c6b4c36c635 i18n/ita/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-  our    100644 45337827eb33fdf5a293983bf0c72b66f9febc1d i18n/ita/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-  their  100644 569a71f5533dc0e3c52c2e258832c151927c4466 i18n/ita/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-@@ -8,8 +8,13 @@
- 	],
- 	"textFileEditor": "Editor file di testo",
- 	"createFile": "Crea file",
-+<<<<<<< .our
- 	"relaunchWithIncreasedMemoryLimit": "Riavvia con {0} MB",
- 	"configureMemoryLimit": "Configura limite di memoria",
-+=======
-+	"relaunchWithIncreasedMemoryLimit": "Riavvia",
-+	"configureMemoryLimit": "Configura",
-+>>>>>>> .their
- 	"fileEditorWithInputAriaLabel": "{0}. Editor file di testo.",
- 	"fileEditorAriaLabel": "Editor file di testo."
- }
-\ No newline at end of file
-changed in both
-  base   100644 3939225c04f50325f8ff9046db9f15cc08e45d3c i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 be168507f7ffd1be04bdbdbb14365762be628f25 i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 11a4614efd9b26f3991806a9cf594ad2f5d0fb32 i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -38,12 +38,27 @@
- 	"confirmMoveTrashMessageMultiple": "Sei sicuro di voler eliminarei seguenti {0} file?",
- 	"confirmMoveTrashMessageFolder": "Eliminare '{0}' e il relativo contenuto?",
- 	"confirmMoveTrashMessageFile": "Eliminare '{0}'?",
-+<<<<<<< .our
- 	"confirmDeleteMessageFilesAndDirectories": "Eliminare definitivamente i {0} file/directory seguenti e il relativo contenuto?",
- 	"confirmDeleteMessageMultipleDirectories": "Eliminare definitivamente le {0} directory seguenti e il relativo contenuto?",
- 	"confirmDeleteMessageMultiple": "Sei sicuro di voler eliminare permanentemente i seguenti {0} file?",
- 	"confirmDeleteMessageFolder": "Eliminare definitivamente '{0}' e il relativo contenuto?",
- 	"confirmDeleteMessageFile": "Eliminare definitivamente '{0}'?",
- 	"addFiles": "Aggiungi file",
-+=======
-+	"undoBin": "È possibile ripristinare dal Cestino.",
-+	"undoTrash": "È possibile ripristinare dal Cestino.",
-+	"doNotAskAgain": "Non chiedermelo di nuovo",
-+	"confirmDeleteMessageMultiple": "Sei sicuro di voler eliminare permanentemente i seguenti {0} file?",
-+	"confirmDeleteMessageFolder": "Eliminare definitivamente '{0}' e il relativo contenuto?",
-+	"confirmDeleteMessageFile": "Eliminare definitivamente '{0}'?",
-+	"irreversible": "Questa azione è irreversibile.",
-+	"binFailed": "Impossibile eliminare utilizzando il Cestino. Si desidera eliminare definitivamente invece?",
-+	"trashFailed": "Impossibile eliminare utilizzando il Cestino. Si desidera eliminare definitivamente invece?",
-+	"deletePermanentlyButtonLabel": "&& Eliminare in modo permanente",
-+	"retryButtonLabel": "&& Riprova",
-+	"importFiles": "Importa file",
-+>>>>>>> .their
- 	"confirmOverwrite": "Nella cartella di destinazione esiste già un file o una cartella con lo stesso nome. Sovrascrivere?",
- 	"replaceButtonLabel": "&&Sostituisci",
- 	"fileIsAncestor": "Il file da incollare è un predecessore della cartella di destinazione",
-changed in both
-  base   100644 33e0072ede84b08cb02aa9f4612d1f3da8b61d11 i18n/ita/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 a29bf6c8fddc26469df2a03b0634b7525ec1e6dc i18n/ita/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 fa0b575286449d92e3eb2368895e3561002426e6 i18n/ita/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-@@ -35,7 +35,11 @@
- 	"hotExit": "Controlla se i file non salvati verranno memorizzati tra una sessione e l'altra, consentendo di ignorare il prompt di salvataggio alla chiusura dell'editor.",
- 	"useExperimentalFileWatcher": "Usa il nuovo watcher di file sperimentale.",
- 	"defaultLanguage": "Modalità linguaggio predefinita assegnata ai nuovi file.",
-+<<<<<<< .our
- 	"maxMemoryForLargeFilesMB": "Controlla la memoria disponibile per VS Code dopo il riavvio durante il tentativo di aprire file di grandi dimensioni. Il risultato è uguale a quanto si specifica --max-memory=NEWSIZE sulla riga di comando.",
-+=======
-+	"maxMemoryForLargeFilesMB": "Nuovo limite di memoria in MB che l'applicazione userà all'avvio per aprire file di grandi dimensioni. Se si vuole iniziare con limite superiore, è possibile avviare l'applicazione dalla riga di comando specificando --max-memory=NEWSIZE.",
-+>>>>>>> .their
- 	"editorConfigurationTitle": "Editor",
- 	"formatOnSave": "Formatta un file durante il salvataggio. Deve essere disponibile un formattatore, il file non deve essere salvato automaticamente e l'editor non deve essere in fase di chiusura.",
- 	"formatOnSaveTimeout": "Timeout per Formatta dopo il salvataggio. Specifica un limite di tempo in millisecondi per i comandi formatOnSave. I comandi che richiedono più tempo del timeout specificato verranno annullati.",
-changed in both
-  base   100644 fffcdf8e5628b3e2097f600b3a113f2d6eeb9df8 i18n/ita/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  our    100644 a54b8fa48adfae1a9f192c1d397674dd2de20580 i18n/ita/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  their  100644 c84f7fcb27e7a30d913ee3607a98e70e160f9ada i18n/ita/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-changed in both
-  base   100644 1677c2679d4d208b0897f523168d984e3d9c4b55 i18n/ita/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-  our    100644 d821a4ec5e01db07aa4ebd6ca0bffbc505bf90a3 i18n/ita/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-  their  100644 136124db68c1ab037593cd582f2e6c60e5bd7d67 i18n/ita/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-changed in both
-  base   100644 cd233dbc3528bcc839779be9c8ddb986dc4911da i18n/ita/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
-  our    100644 c8c335d94e4ba33123eac126c71f3f690a152344 i18n/ita/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
-  their  100644 65bf7372a09f3685dc1b7bd9e39d84fc662f8188 i18n/ita/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
-@@ -7,5 +7,9 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"copyMarker": "Copia",
-+<<<<<<< .our
- 	"copyMessage": "Copia messaggio "
-+=======
-+	"copyMarkerMessage": "Copia messaggio "
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 8425fd2a247c0b85ef55f1074620b83b51bb8629 i18n/ita/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-  our    100644 f06a4d05635080871eed8591893faf436df2f0f3 i18n/ita/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-  their  100644 5036e5a536d82c7ccabd9478d090b6d77c0e20f8 i18n/ita/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-changed in both
-  base   100644 915767115f776a74d9ca8320ac0932858681db78 i18n/ita/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  our    100644 ab7704c8c47164753ebfc517a6fb9394b1465aff i18n/ita/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  their  100644 8a0f5229125e0cd4c258c5a82b9414236a9388f0 i18n/ita/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
-+=======
-+	"keybindingsInputName": "Scelte rapide da tastiera",
-+>>>>>>> .their
- 	"showDefaultKeybindings": "Mostra tasti di scelta rapida predefiniti",
- 	"showUserKeybindings": "Mostra tasti di scelta rapida utente",
- 	"SearchKeybindings.AriaLabel": "Cerca tasti di scelta rapida",
-changed in both
-  base   100644 a0d921fec70ffc4e50e1fa551c855d63e385f869 i18n/ita/src/vs/workbench/parts/search/browser/searchView.i18n.json
-  our    100644 e2aee106234415d5f98623d49849469952f58852 i18n/ita/src/vs/workbench/parts/search/browser/searchView.i18n.json
-  their  100644 522507fa30baf1f475812874b744f5e183ec83ac i18n/ita/src/vs/workbench/parts/search/browser/searchView.i18n.json
-@@ -7,10 +7,16 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"moreSearch": "Attiva/Disattiva dettagli ricerca",
-+<<<<<<< .our
- 	"searchScope.includes": "file da includere",
- 	"label.includes": "Criteri di inclusione per la ricerca",
- 	"searchScope.excludes": "file da escludere",
- 	"label.excludes": "Criteri di esclusione per la ricerca",
-+=======
-+	"searchIncludeExclude.label": "file da includere/escludere",
-+	"searchIncludeExclude.ariaLabel": "Criteri di inclusione/esclusione per la ricerca",
-+	"searchIncludeExclude.placeholder": "Esempi: src, !*.ts, test/**/*.log",
-+>>>>>>> .their
- 	"replaceAll.confirmation.title": "Sostituisci tutto",
- 	"replaceAll.confirm.button": "&&Sostituisci",
- 	"replaceAll.occurrence.file.message": "{0} occorrenza in {1} file è stata sostituita con '{2}'.",
-changed in both
-  base   100644 d2e532ded80f56d7f50608b4cfc6c8f3f261e2d7 i18n/ita/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 96a5512e9db341ff02996bad4ad811078b347739 i18n/ita/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 a83add2496b4f91e8305d1aeaf9b80190ce8dc2a i18n/ita/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-@@ -28,7 +28,10 @@
- 	"JsonSchema.tasks.group.none": "Non assegna l'attività ad alcun gruppo",
- 	"JsonSchema.tasks.group": "Definisce il gruppo di esecuzione a cui appartiene questa attività. Supporta \"build\" per aggiungerlo al gruppo di compilazione e \"test\" per aggiungerlo al gruppo di test.",
- 	"JsonSchema.tasks.type": "Definisce se l'attività viene eseguita come un processo o come un comando all'interno di una shell.",
-+<<<<<<< .our
- 	"JsonSchema.commandArray": "Comando della shell da eseguire. Per unire gli elementi della matrice verrà usato un carattere di spazio",
-+=======
-+>>>>>>> .their
- 	"JsonSchema.command.quotedString.value": "Valore effettivo del comando",
- 	"JsonSchema.tasks.quoting.escape": "Evita i caratteri utilizzando il carattere di escape della shell (per esempio ` sotto PowerShell e \\ sotto bash).",
- 	"JsonSchema.tasks.quoting.strong": "Virgoletta l'argomento utilizzando il carattere di doppio apice della shell (per esempio \" sotto PowerShell e bash).",
-changed in both
-  base   100644 72ae41d5c50515a7a9bad5cb0ddc4245fa01041a i18n/ita/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 83baac91404ff175b394c533850a93d01538ab38 i18n/ita/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 d33e156be686cfb382585e6f0539d4b09e45af50 i18n/ita/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-changed in both
-  base   100644 183e933c6e1d170a5aa5f75d23f58d90b441511b i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 9af26b9889eaa5fa492c1556e3e5203a1ebacbf4 i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 53392cd393bd9a765e3fadf8495d4bfb2e8b38db i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -54,10 +54,17 @@
- 	"nextTerminalFindTerm": "Mostra il termine di ricerca successivo",
- 	"previousTerminalFindTerm": "Mostra il termine di ricerca precedente",
- 	"quickOpenTerm": "Cambia terminale attivo",
-+<<<<<<< .our
- 	"workbench.action.terminal.scrollToPreviousCommand": "Scorri al comando precedente",
- 	"workbench.action.terminal.scrollToNextCommand": "Scorri al comando successivo",
- 	"workbench.action.terminal.selectToPreviousCommand": "Aggiungi selezione a comando precedente",
- 	"workbench.action.terminal.selectToNextCommand": "Aggiungi selezione a comando successivo",
- 	"workbench.action.terminal.selectToPreviousLine": "Aggiungi selezione a riga precedente",
- 	"workbench.action.terminal.selectToNextLine": "Aggiungi selezione a riga successiva"
-+=======
-+	"workbench.action.terminal.focusPreviousCommand": "Sposta stato attivo sul comando precedente",
-+	"workbench.action.terminal.focusNextCommand": "Sposta stato attivo sul comando successivo",
-+	"workbench.action.terminal.selectToPreviousCommand": "Aggiungi selezione a comando precedente",
-+	"workbench.action.terminal.selectToNextCommand": "Aggiungi selezione a comando successivo"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/ita/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
-  our    100644 39897d5e6c7484770fa48e730831210b2e3c4976 i18n/ita/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
-  their  100644 a038c91770b0ae9bd0b4e899f2f8c2d737e23331 i18n/ita/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
-@@ -6,5 +6,20 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"stringsOnlySupported": "Il comando {0} non ha restituito un risultato in formato stringa. Come risultati dei comandi usati per la sostituzione delle variabili sono supportate solo le stringhe."
-+=======
-+	"canNotResolveWorkspaceFolderMultiRoot": "${workspaceFolder} non può essere risolta in un'area di lavoro a cartelle multiple. Assegnare un ambito alle variabili usando : e un nome di cartella.",
-+	"canNotResolveWorkspaceFolder": "${workspaceFolder} non può essere risolta. Si prega di aprire una cartella.",
-+	"canNotResolveFolderBasenameMultiRoot": "${workspaceFolderBasename} non può essere risolta in un'area di lavoro a cartelle multiple. Assegnare un ambito alle variabili usando : e un nome di cartella.",
-+	"canNotResolveFolderBasename": "${workspaceFolderBasename} non può essere risolta. Si prega di aprire una cartella.",
-+	"canNotResolveLineNumber": "${lineNumber} non può essere risolto, si prega di aprire un editor.",
-+	"canNotResolveSelectedText": "${selectedText} non può essere risolto, si prega di aprire un editor.",
-+	"canNotResolveFile": "${file} non può essere risolto, si prega di aprire un editor.",
-+	"canNotResolveRelativeFile": "${relativeFile} non può essere risolto, si prega di aprire un editor.",
-+	"canNotResolveFileDirname": "${fileDirname} non può essere risolto, si prega di aprire un editor.",
-+	"canNotResolveFileExtname": "${fileExtname} non può essere risolto, si prega di aprire un editor.",
-+	"canNotResolveFileBasename": "${fileBasename} non può essere risolto, si prega di aprire un editor.",
-+	"canNotResolveFileBasenameNoExtension": "${fileBasenameNoExtension} non può essere risolto, si prega di aprire un editor."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 50a2d3795eef4bbbceb1c3a3984a5ca1722ebc9d i18n/ita/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-  our    100644 9d7b1a95836e1168352f251f13c08626caf9c555 i18n/ita/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-  their  100644 d0af38208130d4ac301b8e3faadcf2efb20432db i18n/ita/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-@@ -11,6 +11,7 @@
- 	"neverShowAgain": "Non visualizzare più questo messaggio",
- 	"enospcError": "{0} non è in grado di controllare le modifiche di una grande area di lavoro. Per risolvere questo problema, seguire il collegamento alle istruzioni. ",
- 	"learnMore": "Istruzioni",
-+<<<<<<< .our
- 	"fileInvalidPath": "Risorsa del file non valida ({0})",
- 	"fileIsDirectoryError": "Il File è una Directory",
- 	"fileNotModifiedError": "File non modificato dal giorno",
-@@ -24,6 +25,9 @@
- 	"fileReadOnlyError": "Il file è di sola lettura",
- 	"fileMoveConflict": "Non è possibile eseguire operazioni di spostamento/copia. Il file esiste già nella destinazione.",
- 	"unableToMoveCopyError": "Non è possibile eseguire operazioni di spostamento/copia. Il file sostituirebbe la cartella in cui è contenuto.",
-+=======
-+	"enospcError": "{0} non è in grado di controllare le modifiche di una grande area di lavoro. Per risolvere questo problema, seguire il collegamento alle istruzioni. ",
-+>>>>>>> .their
- 	"binFailed": "Non è stato possibile spostare '{0}' nel Cestino",
- 	"trashFailed": "Non è stato possibile spostare '{0}' nel Cestino"
- }
-\ No newline at end of file
-merged
-  result 100644 178ca30930ec84f7ff65b3d4e69312189ef8b80d i18n/ita/src/vs/workbench/services/files/node/fileService.i18n.json
-  our    100644 e98cc6a8898c4a14c4cb33730d4c482765f69ffa i18n/ita/src/vs/workbench/services/files/node/fileService.i18n.json
-@@ -9,6 +9,7 @@
- 	"fileInvalidPath": "Risorsa del file non valida ({0})",
- 	"fileIsDirectoryError": "Il File è una Directory",
- 	"fileNotModifiedError": "File non modificato dal giorno",
-+	"fileTooLargeForHeapError": "Le dimensioni del file superano il limite di memoria predefinito. Riavviare con un limite superiore. L'impostazione corrente è configurata per l'avvio con {0} MB",
- 	"fileTooLargeError": "File troppo grande per essere aperto",
- 	"fileNotFoundError": "Il file non è stato trovato ({0})",
- 	"fileBinaryError": "Il file sembra essere binario e non può essere aperto come file di testo",
-changed in both
-  base   100644 d4ae14fedae69f26e2d66f03d9af438fd5f188ee i18n/kor/extensions/emmet/package.i18n.json
-  our    100644 517fee7baf0c3ecd5ff03235a1df00c583e6985b i18n/kor/extensions/emmet/package.i18n.json
-  their  100644 1c851b49ee3e3201d9fc36b50b789f1953159c94 i18n/kor/extensions/emmet/package.i18n.json
-@@ -60,6 +60,10 @@
- 	"emmetPreferencesCssMozProperties": "`-`로 시작하는 Emmet 약어에서 사용될 때 'moz' 공급업체 접두사를 가져오는 쉼표로 구분된 CSS 속성입니다. 항상 'moz' 접두사를 사용하지 않으려면 빈 문자열로 설정합니다.",
- 	"emmetPreferencesCssOProperties": "`-`로 시작하는 emmet 약어에서 사용할 때 'o' 공급업체 접두사를 가져오는 쉼표로 구분된 CSS 속성입니다. 항상 'o' 접두사를 사용하지 않으려면 빈 문자열로 설정합니다.",
- 	"emmetPreferencesCssMsProperties": "`-`로 시작하는 emmet 약어에서 사용할 때 'ms' 공급업체 접두사를 가져오는 쉼표로 구분된 CSS 속성입니다. 항상 'ms' 접두사를 사용하지 않으려면 빈 문자열로 설정합니다.",
-+<<<<<<< .our
- 	"emmetPreferencesCssFuzzySearchMinScore": "유사 일치 약어가 획득해야 하는 최소 점수(0에서 1 사이)입니다. 값이 낮을수록 가양성 일치 항목이 늘 수 있고, 값이 높을수록 가능한 일치 항목이 줄 수 있습니다.",
- 	"emmetOptimizeStylesheetParsing": "False로 설정할 경우 전체 파일이 구문 분석되어 현재 위치가 Emmet 약어 확장에 유효한지 확인합니다. True로 설정할 경우 css/scss/less 파일에서 현재 위치 주변의 콘텐츠만 구문 분석합니다."
-+=======
-+	"emmetPreferencesCssFuzzySearchMinScore": "유사 일치 약어가 획득해야 하는 최소 점수(0에서 1 사이)입니다. 값이 낮을수록 가양성 일치 항목이 늘 수 있고, 값이 높을수록 가능한 일치 항목이 줄 수 있습니다."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 bc4b7753a3281bbbbccbe6c6a36b7f6ded2a16a4 i18n/kor/extensions/git/out/commands.i18n.json
-  our    100644 5c881abd459fc945dcc1b911f43b518f709ac538 i18n/kor/extensions/git/out/commands.i18n.json
-  their  100644 e1ccbbf253f81e2660f109b41e3466a1a4afd284 i18n/kor/extensions/git/out/commands.i18n.json
-changed in both
-  base   100644 a55af556ea00ab857e5ade78cd3e73c5709ed26e i18n/kor/extensions/php/package.i18n.json
-  our    100644 ad3f734a9df9cce84d996510442fc460749c7d2b i18n/kor/extensions/php/package.i18n.json
-  their  100644 f4c77f88fd48a92c1b1affae3d876ed77c0cdc8f i18n/kor/extensions/php/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "PHP 언어 기본",
-+=======
-+	"displayName": "PHP 언어 기능",
-+>>>>>>> .their
- 	"description": "PHP 파일에서 구문 강조 표시 및 괄호 일치를 제공합니다. "
- }
-\ No newline at end of file
-changed in both
-  base   100644 b02180c66026b2b5ccd444dc0ce8c786558741d4 i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 c148a56d8d67892505611b68cdd18b2ba3428134 i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 151deed842acbebefea5cffda41861b4999b7e95 i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -32,7 +32,10 @@
- 	"infoBorder": "편집기 내 정보 표시선의 테두리 색입니다.",
- 	"hintForeground": "편집기에서 힌트 표시선의 전경색입니다.",
- 	"hintBorder": "편집기에서 힌트 표시선의 테두리 색입니다.",
-+<<<<<<< .our
- 	"unnecessaryForeground": "편집기 내 불필요한 코드의 전경색입니다.",
-+=======
-+>>>>>>> .their
- 	"overviewRulerRangeHighlight": "범위 강조의 개요 눈금자 표식 색입니다. 이 색은 불투명해야만 내부 장식을 가리지 않습니다.",
- 	"overviewRuleError": "오류의 개요 눈금자 마커 색입니다.",
- 	"overviewRuleWarning": "경고의 개요 눈금자 마커 색입니다.",
-changed in both
-  base   100644 deafbdf4de77bcfea0c140458ee59fcb9d35bc3a i18n/kor/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 05518f96202309824a89dfbd3498bbcde7102ebd i18n/kor/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 29a28e29329727823e2fcfc980326213da299daa i18n/kor/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -25,6 +25,11 @@
- 	"uninstallDependeciesConfirmation": "'{0}'만 제거할까요, 아니면 종속성도 제거할까요?",
- 	"uninstallOnly": "확장만",
- 	"uninstallAll": "모두 제거",
-+<<<<<<< .our
-+=======
-+	"uninstallConfirmation": "'{0}'을(를) 제거할까요?",
-+	"ok": "확인",
-+>>>>>>> .their
- 	"singleDependentError": "확장 '{0}'을(를) 제거할 수 없습니다. 확장 '{1}'이(가) 이 확장에 종속됩니다.",
- 	"twoDependentsError": "확장 '{0}'을(를) 제거할 수 없습니다. 확장 '{1}' 및 '{2}'이(가) 이 확장에 종속됩니다.",
- 	"multipleDependentsError": "확장 '{0}'을(를) 제거할 수 없습니다. 확장 '{1}', '{2}' 등이 이 확장에 종속됩니다.",
-changed in both
-  base   100644 0a927c21be7b101fa9b553028edc7424386b8a04 i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 44b01274f5b039d38e4cfbd58f3d0758fa5d1e89 i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 2e819fd951d0c6efaa8c163488cc09047e3c0092 i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json
-changed in both
-  base   100644 45094f9c862e5a9bf24d31628b925dd411cb84ee i18n/kor/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  our    100644 e260c7da4c6f560f0c6c1ac69ad396ed1b97cbf2 i18n/kor/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 c4d54f1034d9f15e5d873ea0c0ef259d0e492635 i18n/kor/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -7,7 +7,10 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"timeout.formatOnSave": "저장 시 {0}ms 후에 서식 지정이 중단됨",
-+<<<<<<< .our
- 	"codeActionsOnSave.didTimeout": "{0}밀리초 후 codeActionsOnSave 중단됨",
-+=======
-+>>>>>>> .their
- 	"timeout.onWillSave": "1750ms 후에 onWillSaveTextDocument-event가 중단됨",
- 	"saveParticipants": "실행중인 저장 관계자..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 30e974a33fc53f9dd846e9223ebcc8eb7eea34f0 i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 faff44b17686fcb835995d2bfd92efcfdcc183b1 i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 641eb3e2062f18f7c2bc6e1e5a749c16ed735136 i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -80,7 +80,10 @@
- 	"titleBarStyle": "창 제목 표시줄의 모양을 조정합니다. 변경 내용을 적용하려면 전체 다시 시작해야 합니다.",
- 	"window.nativeTabs": "macOS Sierra 창 탭을 사용하도록 설정합니다. 변경\n 내용을 적용하려면 전체 다시 시작해야 하고, 기본 탭에서\n 사용자 지정 제목 표시줄 스타일(구성된 경우)을 비활성화합니다.",
- 	"window.smoothScrollingWorkaround": "최소화된 VS Code 창을 복원한 후 더 이상 원활하게 스크롤되지 않으면 이 해결 방법을 사용하도록 설정하세요. 이 해결 방법은 Microsoft의 Surface 장치와 같이 정밀 트랙 패드가 장착된 장치에서 스크롤이 지연되기 시작하는 문제(https://github.com/Microsoft/vscode/issues/13612)를 해결합니다. 이 해결 방법을 사용하도록 설정하면 최소화된 상태에서 창을 복원한 후 약간의 레이아웃 깜박거림이 발생할 수 있지만 그 외의 해는 없습니다.",
-+<<<<<<< .our
- 	"window.clickThroughInactive": "사용하도록 설정한 경우 비활성 창을 클릭하면 창도 활성화되고 클릭 가능한 경우 마우스 아래의 요소도 트리거됩니다. 사용하지 않도록 설정한 경우 비활성 창에서 아무곳이나 클릭하면 창만 활성화되며 요소는 또 한번 클릭해야 합니다.",
-+=======
-+>>>>>>> .their
- 	"zenModeConfigurationTitle": "Zen 모드",
- 	"zenMode.fullScreen": "Zen 모드를 켜면 워크벤치도 전체 화면 모드로 전환되는지 여부를 제어합니다.",
- 	"zenMode.centerLayout": "Zen 모드를 켜면 레이아웃도 가운데로 맞춰지는지 여부를 제어합니다.",
-changed in both
-  base   100644 8a6f29b83bfa1eb654a6d4e7ad38962ed0a9b685 i18n/kor/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  our    100644 0495fb536e2135803ed54cf092a02a6c8b292fd8 i18n/kor/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  their  100644 2b0e8c50e7b2021b5370555699c3dd79f3afacfd i18n/kor/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-@@ -17,7 +17,11 @@
- 	"breakpointUnverifieddHover": "확인되지 않은 중단점",
- 	"functionBreakpointUnsupported": "이 디버그 형식은 함수 중단점을 지원하지 않습니다.",
- 	"breakpointDirtydHover": "확인되지 않은 중단점입니다. 파일이 수정되었습니다. 디버그 세션을 다시 시작하세요.",
-+<<<<<<< .our
- 	"logBreakpointUnsupported": "이 디버그 형식에서 지원되지 않는 logpoint",
-+=======
-+	"logBreakpointUnsupported": "이 디버그 형식에서 지원되지 않는 로그 지점",
-+>>>>>>> .their
- 	"conditionalBreakpointUnsupported": "이 디버그 형식에서 지원되지 않는 조건부 중단점",
- 	"hitBreakpointUnsupported": "이 디버그 형식은 조건부 중단점 적중을 지원하지 않습니다."
- }
-\ No newline at end of file
-changed in both
-  base   100644 782e05fd2a4062d2d923b2e4744d053f846732fd i18n/kor/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  our    100644 6a3df39c2499e1d57cd7be82d64220494ab19ab0 i18n/kor/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  their  100644 a942f921e392b43580bf75806a1a7078b74439da i18n/kor/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-@@ -8,7 +8,11 @@
- 	],
- 	"toggleBreakpointAction": "디버그: 중단점 설정/해제",
- 	"conditionalBreakpointEditorAction": "디버그: 조건부 중단점 추가...",
-+<<<<<<< .our
- 	"logPointEditorAction": "디버그 : Logpoint 추가...",
-+=======
-+	"logPointEditorAction": "디버그: 로그 지점 추가...",
-+>>>>>>> .their
- 	"runToCursor": "커서까지 실행",
- 	"debugEvaluate": "디버그: 평가",
- 	"debugAddToWatch": "디버그: 조사식에 추가",
-changed in both
-  base   100644 484e21f6e540375943bb372e9302416229f53257 i18n/kor/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-  our    100644 ff73e8551e533a78c25647fd4092da0503b3fb72 i18n/kor/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-  their  100644 d14c117bac16d14ac695a1d0dff71dc434eefb19 i18n/kor/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-@@ -6,9 +6,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"breakpointWidgetLogMessagePlaceholder": "중단점이 적중될 때 기록할 메시지입니다. {} 내의 식은 보간됩니다. 수락하려면 'Enter' 키를 누르고  취소하려면 'esc' 키를 누르세요.",
- 	"breakpointWidgetHitCountPlaceholder": "적중 횟수 조건이 충족될 경우 중단합니다. 적용하려면 'Enter' 키를 누르고 취소하려면 'Esc' 키를 누릅니다.",
- 	"breakpointWidgetExpressionPlaceholder": "식이 true로 계산될 경우 중단합니다. 적용하려면 'Enter' 키를 누르고 취소하려면 'Esc' 키를 누릅니다.",
-+=======
-+	"breakpointWidgetLogMessagePlaceholder": "중단점이 적중될 때 기록할 메시지입니다. 수락하려면 'Enter' 키를 누르고  취소하려면 'esc' 키를 누르세요.",
-+	"breakpointWidgetHitCountPlaceholder": "적중 횟수 조건이 충족될 경우 중단합니다. 적용하려면 'Enter' 키를 누르고 취소하려면 'Esc' 키를 누릅니다.",
-+	"breakpointWidgetExpressionPlaceholder": "식이 true로 계산될 경우 중단합니다. 적용하려면 'Enter' 키를 누르고 취소하려면 'Esc' 키를 누릅니다.",
-+	"breakpointWidgetLogMessageAriaLabel": "이 중단점이 적중될 때마다 프로그램에서 이 메시지를 기록합니다. 수락하려면 <Enter> 키를 누르고 취소하려면 <Esc> 키를 누르세요.",
-+	"breakpointWidgetHitCountAriaLabel": "적중 횟수가 충족되는 경우에만 프로그램이 여기서 중지됩니다. 수락하려면 <Enter> 키를 누르고, 취소하려면 <Esc> 키를 누르세요.",
-+	"breakpointWidgetAriaLabel": "이 조건이 true인 경우에만 프로그램이 여기서 중지됩니다. 수락하려면 <Enter> 키를 누르고, 취소하려면 <Esc> 키를 누르세요.",
-+>>>>>>> .their
- 	"expression": "식",
- 	"hitCount": "적중 횟수",
- 	"logMessage": "로그 메시지"
-changed in both
-  base   100644 07989327ee8fe6a042e351ef12877e31f91000f0 i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  our    100644 b40f849a9c20da0feb620bdd6d7636a80a878e4b i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  their  100644 b17419f7014d2b900690d329869e8a2584a3f224 i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-@@ -24,6 +24,7 @@
- 	"enableBreakpoints": "{0} 열에서 인라인 중단점 사용",
- 	"enableBreakpointOnLine": "줄 중단점 사용",
- 	"addBreakpoint": "중단점 추가",
-+<<<<<<< .our
- 	"addConditionalBreakpoint": "조건부 중단점 추가...",
- 	"addLogPoint": "Logpoint 추가...",
- 	"breakpointHasCondition": "이 {0}에는 제거 시 손실되는 {1}이(가) 있습니다. 대신 {0}을(를) 사용하지 않도록 설정하세요.",
-@@ -32,5 +33,9 @@
- 	"removeLogPoint": "{0} 제거",
- 	"disableLogPoint": "{0} 사용 안 함",
- 	"cancel": "취소",
-+=======
-+	"conditionalBreakpoint": "조건부 중단점 추가...",
-+	"addLogPoint": "로그 지점 추가...",
-+>>>>>>> .their
- 	"addConfiguration": "구성 추가..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 75d5a4986319c2fb428163c6a165e701a89ebf09 i18n/kor/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  our    100644 e49f8a732d537adaf418b41491fe7b363cf6da78 i18n/kor/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  their  100644 8ed1652209098d0489f896cb717fd4b1bdc87010 i18n/kor/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-@@ -8,6 +8,24 @@
- 	],
- 	"debugAdapterBinNotFound": "디버그 어댑터 실행 파일 '{0}'이(가) 없습니다.",
- 	"debugAdapterCannotDetermineExecutable": "디버그 어댑터 '{0}'에 대한 실행 파일을 확인할 수 없습니다.",
-+<<<<<<< .our
- 	"unableToLaunchDebugAdapter": "'{0}'에서 디버그 어댑터를 시작할 수 없습니다.",
- 	"unableToLaunchDebugAdapterNoArgs": "디버그 어댑터를 시작할 수 없습니다."
-+=======
-+	"launch.config.comment1": "IntelliSense를 사용하여 가능한 특성에 대해 알아보세요.",
-+	"launch.config.comment2": "기존 특성에 대한 설명을 보려면 가리킵니다.",
-+	"launch.config.comment3": "자세한 내용을 보려면 {0}을(를) 방문하세요.",
-+	"debugType": "구성의 형식입니다.",
-+	"debugTypeNotRecognised": "디버그 형식이 인식되지 않습니다. 해당하는 디버그 확장을 설치하고 사용하도록 설정했는지 확인하세요.",
-+	"node2NotSupported": "\"node2\"는 더 이상 지원되지 않습니다. 대신 \"node\"를 사용하고 \"protocol\" 특성을 \"inspector\"로 설정하세요.",
-+	"debugName": "구성 이름이며, 구성 시작 드롭다운 메뉴에 표시됩니다.",
-+	"debugRequest": "구성 형식을 요청합니다. \"시작\" 또는 \"연결\"일 수 있습니다.",
-+	"debugServer": "디버그 확장 배포 전용입니다. 포트가 지정된 경우 VS Code에서는 서버 모드로 실행하는 디버그 어댑터에 연결을 시도합니다.",
-+	"debugPrelaunchTask": "디버그 세션이 시작되기 이전에 실행할 작업입니다.",
-+	"debugPostDebugTask": "디버그 세션 종료 후 실행할 작업입니다.",
-+	"debugWindowsConfiguration": "Windows 특정 시작 구성 특성입니다.",
-+	"debugOSXConfiguration": "OS X 특정 시작 구성 특성입니다.",
-+	"debugLinuxConfiguration": "Linux 특정 시작 구성 특성입니다.",
-+	"deprecatedVariables": "'env.', 'config.' 및 'command.'는 사용되지 않습니다. 대신 'env:', 'config:' 및 'command:'를 사용하세요."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 73fe67dbadfbb320a1be2f79f75ab6d060bad952 i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  our    100644 0ba9ae100f9a8992cae9cf4667a7ead3845b17e1 i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  their  100644 ac0d4279306dd86dc6aef8e72448d92e45e7a5dd i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-changed in both
-  base   100644 d88f38093beb02b840189f0932a8c3f15a519404 i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  our    100644 018f63d5c0fb6f63e432765ed1c8c8d45eb5d87b i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  their  100644 cd44f74708b1b7d0b1238fe83f7581ca2d16ec29 i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-@@ -14,7 +14,11 @@
- 	"workspaceRecommendedExtensions": "작업 영역 권장 사항",
- 	"builtInExtensions": "기능",
- 	"builtInThemesExtensions": "테마",
-+<<<<<<< .our
- 	"builtInBasicsExtensions": "프로그래밍 언어",
-+=======
-+	"builtInBasicsExtensions": "언어",
-+>>>>>>> .their
- 	"searchExtensions": "마켓플레이스에서 확장 검색",
- 	"sort by installs": "정렬 기준: 설치 수",
- 	"sort by rating": "정렬 기준: 등급",
-changed in both
-  base   100644 08350a5a29e916fdd9ea0a22c7185369a5a44ec4 i18n/kor/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-  our    100644 07dded1ffc95a5c8e21d925d7e2f8bcef3291a8a i18n/kor/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-  their  100644 7611e89290b7e2cd232dfc772252af18c7aecdb0 i18n/kor/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-@@ -8,8 +8,13 @@
- 	],
- 	"textFileEditor": "텍스트 파일 편집기",
- 	"createFile": "파일 만들기",
-+<<<<<<< .our
- 	"relaunchWithIncreasedMemoryLimit": "{0}MB로 다시 시작",
- 	"configureMemoryLimit": "메모리 제한 구성",
-+=======
-+	"relaunchWithIncreasedMemoryLimit": "다시 시작",
-+	"configureMemoryLimit": "구성",
-+>>>>>>> .their
- 	"fileEditorWithInputAriaLabel": "{0}. 텍스트 파일 편집기입니다.",
- 	"fileEditorAriaLabel": "텍스트 파일 편집기입니다."
- }
-\ No newline at end of file
-changed in both
-  base   100644 42e37cef1b1b8983fd989b251013dccab101e7c2 i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 3bf77a27ac7c066f4ce3c283301cd1346b8314d5 i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 d9fac99bc9f6ef69452ee392f82e43c03280cec4 i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -38,12 +38,27 @@
- 	"confirmMoveTrashMessageMultiple": "다음 {0}개 파일을 삭제하시겠습니까?",
- 	"confirmMoveTrashMessageFolder": "'{0}'과(와) 해당 내용을 삭제할까요?",
- 	"confirmMoveTrashMessageFile": "'{0}'을(를) 삭제할까요?",
-+<<<<<<< .our
- 	"confirmDeleteMessageFilesAndDirectories": "다음 {0}개 파일/디렉터리 및 해당 내용을 영구히 삭제하시겠습니까?",
- 	"confirmDeleteMessageMultipleDirectories": "다음 {0}개 디렉터리 및 해당 내용을 영구히 삭제하시겠습니까?",
- 	"confirmDeleteMessageMultiple": "다음 {0}개 파일을 영구히 삭제하시겠습니까?",
- 	"confirmDeleteMessageFolder": "'{0}'과(와) 해당 내용을 영구히 삭제할까요?",
- 	"confirmDeleteMessageFile": "'{0}'을(를) 영구히 삭제할까요?",
- 	"addFiles": "파일 추가",
-+=======
-+	"undoBin": "휴지통에서 복원할 수 있습니다.",
-+	"undoTrash": "휴지통에서 복원할 수 있습니다.",
-+	"doNotAskAgain": "이 메시지를 다시 표시 안 함",
-+	"confirmDeleteMessageMultiple": "다음 {0}개 파일을 영구히 삭제하시겠습니까?",
-+	"confirmDeleteMessageFolder": "'{0}'과(와) 해당 내용을 영구히 삭제할까요?",
-+	"confirmDeleteMessageFile": "'{0}'을(를) 영구히 삭제할까요?",
-+	"irreversible": "이 작업은 취소할 수 없습니다.",
-+	"binFailed": "휴지통을 사용하여 삭제하지 못했습니다. 대신 영구히 삭제하시겠습니까?",
-+	"trashFailed": "휴지통을 사용하여 삭제하지 못했습니다. 대신 영구히 삭제하시겠습니까?",
-+	"deletePermanentlyButtonLabel": "영구 삭제 (&&D)",
-+	"retryButtonLabel": "다시 시도 (&&R)",
-+	"importFiles": "파일 가져오기",
-+>>>>>>> .their
- 	"confirmOverwrite": "이름이 같은 파일 또는 폴더가 대상 폴더에 이미 있습니다. 덮어쓸까요?",
- 	"replaceButtonLabel": "바꾸기(&&R)",
- 	"fileIsAncestor": "붙여 넣을 파일이 대상 폴더의 상위 항목입니다.",
-changed in both
-  base   100644 60fac1e96fac0ab19644c39c68be7f314d3266fd i18n/kor/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 86c9a7c9d2ee8cfe00d51c1241e8d08a131418a5 i18n/kor/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 d6497bf9c7636da093abca5de9d51dcf9b10cde1 i18n/kor/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-@@ -35,7 +35,11 @@
- 	"hotExit": "저장하지 않은 파일을 세션 간에 기억하여, 편집기를 종료할 때 저장할지 묻는 메시지를 건너뛸지 여부를 제어합니다.",
- 	"useExperimentalFileWatcher": "새로운 실험 파일 감시자를 사용하세요.",
- 	"defaultLanguage": "새 파일에 할당되는 기본 언어 모드입니다.",
-+<<<<<<< .our
- 	"maxMemoryForLargeFilesMB": "큰 파일을 열려고 할 때 다시 시작한 후 VS Code에 사용 가능한 메모리를 제어합니다. 명령줄에 --max-memory=NEWSIZE를 지정하는 것과 결과가 같습니다. ",
-+=======
-+	"maxMemoryForLargeFilesMB": "큰 파일을 열기 위해 다시 시작할 때 응용 프로그램에서 사용할 메모리의 새로운 한도(MB)입니다. 더 높은 한도로 시작하려면 명령줄에서 --max-memory=NEWSIZE를 사용하여 응용 프로그램을 시작할 수 있습니다.",
-+>>>>>>> .their
- 	"editorConfigurationTitle": "편집기",
- 	"formatOnSave": "파일 저장 시 서식을 지정합니다. 포맷터를 사용할 수 있어야 하며, 파일이 자동으로 저장되지 않아야 하고, 편집기가 종료되지 않아야 합니다.",
- 	"formatOnSaveTimeout": "저장 시 서식 지정의 시간 제한. FormatOnSave 명령에 대한 시간 제한을 밀리초로 지정합니다. 지정된 시간 제한보다 오래 걸리는 명령은 취소됩니다.",
-changed in both
-  base   100644 b6d91a6d57556f39caa4ce458eeaa4fd9bf6e524 i18n/kor/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  our    100644 0e96fcdac44c2d3253e3fe7e92f0f23065b25765 i18n/kor/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  their  100644 3765e145d236a1975f8edc567fc906ea919d2d07 i18n/kor/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-changed in both
-  base   100644 d95a0ea15d21f3717665f725c9c6c386d5514210 i18n/kor/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-  our    100644 2fdfcbff78eb198103281f8bd9dc9582d1b43254 i18n/kor/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-  their  100644 14fbd219509429b756bcc26cdd80fc2988163da7 i18n/kor/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-changed in both
-  base   100644 6422e6f88c1856e32ed0dc246917eacea242f353 i18n/kor/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
-  our    100644 15ccb30fd5d5cca61396dab746189b69d3d18023 i18n/kor/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
-  their  100644 e999d986aef4abdc9a96bf3e18263d0b30c77bea i18n/kor/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
-@@ -7,5 +7,9 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"copyMarker": "복사",
-+<<<<<<< .our
- 	"copyMessage": "메시지 복사"
-+=======
-+	"copyMarkerMessage": "메시지 복사"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a28f95549029eadac6d1b483d060085d23777f6a i18n/kor/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-  our    100644 c7863f2ea1b1541db0ff450d916a257e4cb26ce8 i18n/kor/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-  their  100644 d6cfbe28cef95992200be64c56237fc66d0a6401 i18n/kor/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-changed in both
-  base   100644 e80e5a7a2f1dd362f752c34cbd487bf9046c3480 i18n/kor/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  our    100644 6a6e7f152719318ecb9e9ea38a0a26d753597925 i18n/kor/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  their  100644 a532b28a5a6c7766ff8cf5be2d03d7b6da3e907d i18n/kor/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
-+=======
-+	"keybindingsInputName": "바로 가기 키(&&K)",
-+>>>>>>> .their
- 	"showDefaultKeybindings": "기본 키 바인딩 표시",
- 	"showUserKeybindings": "사용자 키 바인딩 표시",
- 	"SearchKeybindings.AriaLabel": "키 바인딩 검색",
-changed in both
-  base   100644 863a56d6989618e27d325f6f95c864d26bbc6a3e i18n/kor/src/vs/workbench/parts/search/browser/searchView.i18n.json
-  our    100644 c98e307c23bf5e868367c1bc97cd270b8e1c1303 i18n/kor/src/vs/workbench/parts/search/browser/searchView.i18n.json
-  their  100644 d217a637ee2ed6f997d1cbd160759fd505835448 i18n/kor/src/vs/workbench/parts/search/browser/searchView.i18n.json
-@@ -7,10 +7,16 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"moreSearch": "검색 세부 정보 설정/해제",
-+<<<<<<< .our
- 	"searchScope.includes": "포함할 파일",
- 	"label.includes": "패턴 포함 검색",
- 	"searchScope.excludes": "제외할 파일",
- 	"label.excludes": "패턴 제외 검색",
-+=======
-+	"searchIncludeExclude.label": "포함/제외할 파일",
-+	"searchIncludeExclude.ariaLabel": "패턴 포함/제외 검색",
-+	"searchIncludeExclude.placeholder": "예: src, !*.ts, test/**/*.log",
-+>>>>>>> .their
- 	"replaceAll.confirmation.title": "모두 바꾸기",
- 	"replaceAll.confirm.button": "바꾸기(&&R)",
- 	"replaceAll.occurrence.file.message": "{1}개 파일에서 {0}개를 '{2}'(으)로 바꿨습니다.",
-changed in both
-  base   100644 e02ee2a8a5f219383233c14638eb8091416fda48 i18n/kor/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 5dfbb2074f09c64c5ec03adc7d012b25c2bb9e72 i18n/kor/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 abf1b203d31a48bddda7378cc7aba7a9e229f4e7 i18n/kor/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-@@ -28,7 +28,10 @@
- 	"JsonSchema.tasks.group.none": "작업을 그룹에 할당 안 함",
- 	"JsonSchema.tasks.group": "이 작업을 할당할 실행 그룹을 정의합니다. 빌드 그룹에 추가를 위한 \"build'와 테스트 그룹에 추가를 위한 \"test\"를 지원합니다.",
- 	"JsonSchema.tasks.type": "작업이 프로세스로 실행되는지 또는 셸 내의 명령으로 실행되는지를 제어합니다.",
-+<<<<<<< .our
- 	"JsonSchema.commandArray": "실행할 셸 명령입니다. 배열 항목은 공백 문자를 사용하여 연결됩니다.",
-+=======
-+>>>>>>> .their
- 	"JsonSchema.command.quotedString.value": "실제 명령 값",
- 	"JsonSchema.tasks.quoting.escape": "셸의 이스케이프 문자를 사용하여 문자를 이스케이프합니다(예: ` under PowerShell 및 \\ under bash).",
- 	"JsonSchema.tasks.quoting.strong": "셸의 강력한 따옴표 문자를 사용하여 인수를 따옴표 처리합니다(예: \" under PowerShell and bash).",
-changed in both
-  base   100644 9fba55129c8bbe976b3fac079a9bf7132384e399 i18n/kor/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 7b483f685d0f32a5b2eb20f1327a18475e2d29ae i18n/kor/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 f6e1236d35f3ffb5f780c613962c0a5a53ee6409 i18n/kor/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-changed in both
-  base   100644 ba974a504800db79f15cba87f1e5f074ec37242e i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 0c53998d6e084853fcbcba0b56050a6d820a2b6f i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 4d01c4f618665487312c3bc5d13269b61bea73b3 i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -54,10 +54,17 @@
- 	"nextTerminalFindTerm": "다음 검색어 표시",
- 	"previousTerminalFindTerm": "이전 검색어 표시",
- 	"quickOpenTerm": "활성 터미널 전환",
-+<<<<<<< .our
- 	"workbench.action.terminal.scrollToPreviousCommand": "이전 명령으로 스크롤",
- 	"workbench.action.terminal.scrollToNextCommand": "다음 명령으로 스크롤",
- 	"workbench.action.terminal.selectToPreviousCommand": "이전 명령까지 선택",
- 	"workbench.action.terminal.selectToNextCommand": "다음 명령까지 선택",
- 	"workbench.action.terminal.selectToPreviousLine": "이전 줄까지 선택",
- 	"workbench.action.terminal.selectToNextLine": "다음 줄까지 선택"
-+=======
-+	"workbench.action.terminal.focusPreviousCommand": "이전 명령에 포커스",
-+	"workbench.action.terminal.focusNextCommand": "다음 명령에 포커스",
-+	"workbench.action.terminal.selectToPreviousCommand": "이전 명령까지 선택",
-+	"workbench.action.terminal.selectToNextCommand": "다음 명령까지 선택"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 83747fca0e86317ce124320d439f4de8bb26b427 i18n/kor/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
-  our    100644 c8a335099ebca478cd0f180b9b02784c265fcc57 i18n/kor/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
-  their  100644 28d30d61c46b6eb60f16eb76aabd380e6e97d028 i18n/kor/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
-@@ -6,5 +6,20 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"stringsOnlySupported": "{0} 명령이 문자열 결과를 반환하지 않았습니다. 변수 대신 사용한 명령의 결과로는 문자열만 지원됩니다."
-+=======
-+	"canNotResolveWorkspaceFolderMultiRoot": "${workspaceFolder} 은(는) 멀티 폴더 작업 영역에서 확인할 수 없습니다. : 와 폴더 이름을 사용하여 변수 범위를 정합니다.",
-+	"canNotResolveWorkspaceFolder": "${workspaceFolder} 을(를) 확인할 수 없습니다. 폴더를 여십시오.",
-+	"canNotResolveFolderBasenameMultiRoot": "${workspaceFolderBasename} 은(는) 멀티 폴더 작업 영역에서 확인할 수 없습니다. : 와 폴더 이름을 사용하여 변수 범위를 정합니다.",
-+	"canNotResolveFolderBasename": "${workspaceFolderBasename} 을(를) 확인할 수 없습니다. 폴더를 여십시오.",
-+	"canNotResolveLineNumber": "${lineNumber} 을(를) 확인할 수 없습니다. 편집기를 여십시오.",
-+	"canNotResolveSelectedText": "${selectedText}을(를) 확인할 수 없습니다. 편집기를 여세요.",
-+	"canNotResolveFile": "${file} 을(를) 확인할 수 없으므로, 편집기를 여십시오.",
-+	"canNotResolveRelativeFile": "${relativeFile} 을(를) 확인할 수 없습니다. 편집기를 여십시오.",
-+	"canNotResolveFileDirname": "${fileDirname} 을(를) 확인할 수 없습니다. 편집기를 여십시오.",
-+	"canNotResolveFileExtname": "${fileExtname} 을(를) 확인할 수 없습니다. 편집기를 여십시오.",
-+	"canNotResolveFileBasename": "${fileBasename} 을(를) 확인할 수 없습니다. 편집기를 여십시오.",
-+	"canNotResolveFileBasenameNoExtension": "${fileBasenameNoExtension} 을(를) 확인할 수 없습니다. 편집기를 여십시오."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 eb17227dbfa871ea4c9f251b99cef6795837ef36 i18n/kor/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-  our    100644 361d1ad7355f4d1b81d6802085787a7bb15c2052 i18n/kor/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-  their  100644 ad13938c9e91493fd1671f3c65e178c53f0b99c4 i18n/kor/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-@@ -11,6 +11,7 @@
- 	"neverShowAgain": "다시 표시 안 함",
- 	"enospcError": "{0}은(는) 이 큰 작업 영역에서 파일 변경 내용을 감시할 수 없습니다. 지침 링크에 따라 이 문제를 해결하세요.",
- 	"learnMore": "지침",
-+<<<<<<< .our
- 	"fileInvalidPath": "잘못된 파일 리소스({0})",
- 	"fileIsDirectoryError": "파일이 디렉터리입니다.",
- 	"fileNotModifiedError": "파일 수정 안 됨",
-@@ -24,6 +25,9 @@
- 	"fileReadOnlyError": "파일이 읽기 전용입니다.",
- 	"fileMoveConflict": "이동/복사할 수 없습니다. 대상에 파일이 이미 있습니다.",
- 	"unableToMoveCopyError": "이동/복사할 수 없습니다. 파일이 포함된 폴더를 파일로 대체합니다.",
-+=======
-+	"enospcError": "{0}은(는) 이 큰 작업 영역에서 파일 변경 내용을 감시할 수 없습니다. 지침 링크에 따라 이 문제를 해결하세요.",
-+>>>>>>> .their
- 	"binFailed": "'{0}'을(를) 휴지통으로 이동하지 못함",
- 	"trashFailed": "'{0}'을(를) 휴지통으로 이동하지 못함"
- }
-\ No newline at end of file
-merged
-  result 100644 10b619a4b38f16558fe789426d6a79e768ddd193 i18n/kor/src/vs/workbench/services/files/node/fileService.i18n.json
-  our    100644 d411f384a723903358d48f22eaee747debee2d77 i18n/kor/src/vs/workbench/services/files/node/fileService.i18n.json
-@@ -9,6 +9,7 @@
- 	"fileInvalidPath": "잘못된 파일 리소스({0})",
- 	"fileIsDirectoryError": "파일이 디렉터리입니다.",
- 	"fileNotModifiedError": "파일 수정 안 됨",
-+	"fileTooLargeForHeapError": "파일 크기가 기본 메모리 제한을 초과합니다. 더 높은 한계로 다시 시작하세요. 현재 설정은 {0}MB로 다시 시작하도록 구성되어 있습니다.",
- 	"fileTooLargeError": "파일이 너무 커서 열 수 없음",
- 	"fileNotFoundError": "파일을 찾을 수 없습니다({0}).",
- 	"fileBinaryError": "파일이 이진인 것 같으므로 테스트로 열 수 없습니다.",
-changed in both
-  base   100644 f66c3b617c3306cabeea2d1914931b335a0db0f3 i18n/ptb/extensions/emmet/package.i18n.json
-  our    100644 bd44dd5d5523e2a5800a445af385bb5a762f2233 i18n/ptb/extensions/emmet/package.i18n.json
-  their  100644 37a69d7d680256517ce4eb07ce7427dd704a201a i18n/ptb/extensions/emmet/package.i18n.json
-@@ -60,6 +60,10 @@
- 	"emmetPreferencesCssMozProperties": "Propriedades CSS separadas por vírgula que recebem o prefixo vendor 'moz' quando utilizado em abreviações do Emmet que iniciam com `-`. Defina como string vazia para sempre evitar o prefixo 'moz'.",
- 	"emmetPreferencesCssOProperties": "Propriedades CSS separadas por vírgula que recebem o prefixo vendor 'o' quando utilizado em abreviações do Emmet que iniciam com `-`. Defina como string vazia para sempre evitar o prefixo 'o'.",
- 	"emmetPreferencesCssMsProperties": "Propriedades CSS separadas por vírgula que recebem o prefixo vendor 'ms' quando utilizado em abreviações do Emmet que iniciam com `-`. Defina como string vazia para sempre evitar o prefixo 'ms'.",
-+<<<<<<< .our
- 	"emmetPreferencesCssFuzzySearchMinScore": "A pontuação mínima (de 0 a 1) que a abreviação difusa deve alcançar. Os valores mais baixos podem produzir muitas correspondências falso-positivas, valores mais elevados podem reduzir possíveis correspondências.\n",
- 	"emmetOptimizeStylesheetParsing": "Quando definido como false, o arquivo inteiro é analisado para determinar se a posição atual é válida para expandir as abreviações Emmet. Quando definido como true, somente o conteúdo em torno da posição atual em arquivos css / scss / less é analisado."
-+=======
-+	"emmetPreferencesCssFuzzySearchMinScore": "A pontuação mínima (de 0 a 1) que a abreviação difusa deve alcançar. Os valores mais baixos podem produzir muitas correspondências falso-positivas, valores mais elevados podem reduzir possíveis correspondências.\n"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 7ac6b700d4b62df9c23106c0151727c1c0cf6294 i18n/ptb/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 94d4e2ad2eeafdadb40b9a7361c52cda20aa5187 i18n/ptb/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 85f1badbbd5b7c92556325273249fbaf15e9b87a i18n/ptb/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -32,7 +32,10 @@
- 	"infoBorder": "Cor da borda das linhas de informação no editor.",
- 	"hintForeground": "Cor de primeiro plano de linhas onduladas de dica no editor.",
- 	"hintBorder": "Cor da borda de linhas onduladas de dica no editor.",
-+<<<<<<< .our
- 	"unnecessaryForeground": "Cor de primeiro plano de código desnecessário no editor.",
-+=======
-+>>>>>>> .their
- 	"overviewRulerRangeHighlight": "Visão geral da cor do marcador da régua para destaques do intervalo. A cor não deve ser opaca para não esconder decorações subjacentes.",
- 	"overviewRuleError": "Visão geral da cor do marcador da régua para erros.",
- 	"overviewRuleWarning": "Visão geral da cor do marcador da régua para avisos.",
-changed in both
-  base   100644 9e468f9401d721355b9f4dbebe8eece0a2effaac i18n/ptb/src/vs/platform/environment/node/argv.i18n.json
-  our    100644 a3aea9d9c8c0805d0052884c40ebb83b3447e311 i18n/ptb/src/vs/platform/environment/node/argv.i18n.json
-  their  100644 acef7303c7e3c96cfcf5b9f7a68e6671aa08733d i18n/ptb/src/vs/platform/environment/node/argv.i18n.json
-@@ -29,8 +29,13 @@
- 	"performance": "Comece com o 'Desenvolvedor: Desempenho de inicialização' comando habilitado.",
- 	"prof-startup": "Rodar o CPU profiler durante a inicialização",
- 	"disableExtensions": "Desabilita todas as extensões instaladas.",
-+<<<<<<< .our
- 	"inspect-extensions": "Permite a depuração e profiling de extensões. Verifique as ferramentas de desenvolvedor para obter o URI da conexão.",
- 	"inspect-brk-extensions": "Permite a depuração e profiling de extensões com o host de extensão sendo pausado após o início. Verifique as ferramentas de desenvolvedor para obter o URI da conexão.",
-+=======
-+	"inspect-extensions": "Permite depuração e criação de perfis de extensões. Verifique as ferramentas de desenvolvimento para a conexão uri.",
-+	"inspect-brk-extensions": "Permitir depuração e criação de perfil de extensões com o host de extensão em pausa após o início. Verifique as ferramentas do desenvolvedor para a conexão uri.",
-+>>>>>>> .their
- 	"disableGPU": "Desabilita aceleração de hardware via GPU.",
- 	"uploadLogs": "Envia os registros de atividade da sessão atual para um destino seguro.",
- 	"maxMemory": "Tamanho máximo de memória para uma janela (em Mbytes).",
-changed in both
-  base   100644 fd53e61c4d34d0d28cabf2a7e20493f0f794a9be i18n/ptb/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 69dfaa48d2b66f351d8413f62573d04c105f2c85 i18n/ptb/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 6bd9ed493bf16c4e0ac0e45e8c08d16bfa579c28 i18n/ptb/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -25,6 +25,11 @@
- 	"uninstallDependeciesConfirmation": "Gostaria de desinstalar '{0}' somente, ou suas dependências também?",
- 	"uninstallOnly": "Somente Extensão",
- 	"uninstallAll": "Desinstalar Tudo",
-+<<<<<<< .our
-+=======
-+	"uninstallConfirmation": "Tem certeza que deseja desinstalar '{0}'?",
-+	"ok": "OK",
-+>>>>>>> .their
- 	"singleDependentError": "Não foi possível desinstalar a extensão '{0}'. A extensão '{1}' depende dela.",
- 	"twoDependentsError": "Não foi possível desinstalar a extensão '{0}'. As extensões '{1}' e '{2}' dependem dela.",
- 	"multipleDependentsError": "Não foi possível desinstalar a extensão '{0}'. As extensões '{1}' e '{2}' e outras dependem dela.",
-changed in both
-  base   100644 69ab398eeb1c58a8a88ef2db129abed37e59d03c i18n/ptb/src/vs/workbench/electron-browser/actions.i18n.json
-  our    100644 62b4a14f179ce17a8ef358da83ed726d39cdb13f i18n/ptb/src/vs/workbench/electron-browser/actions.i18n.json
-  their  100644 74295c8a145eb8fc633a4ad1d7eb299415421ca4 i18n/ptb/src/vs/workbench/electron-browser/actions.i18n.json
-changed in both
-  base   100644 8fd73e4f40c46957070a53b93fe41d03a759b95c i18n/ptb/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 15dd21d37a31b843a88f5eb322486062a4b034bf i18n/ptb/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 ca1050520df3fb1e8e39e29058c46ef9df7ea3a7 i18n/ptb/src/vs/workbench/electron-browser/main.contribution.i18n.json
-changed in both
-  base   100644 e3be93ecafcbf9bacd478288a3ef070fe7dad2bf i18n/ptb/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  our    100644 4c94ccc38fbddbdb205d736f72a6b2b1d8ad964a i18n/ptb/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  their  100644 cf6647e02940dcfb3b1011020f4fba172e755d2e i18n/ptb/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-changed in both
-  base   100644 fc9ccfbe31541c35d145612b9a05f9ef8b2d64e2 i18n/ptb/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
-  our    100644 b967138c3c12c011c58d6f803a58cf6b3ef2916a i18n/ptb/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
-  their  100644 8d9d177e084c5c04c6a5338addd0575775936c98 i18n/ptb/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
-@@ -7,5 +7,11 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"noFolderDebugConfig": "Primeiro abra uma pasta para fazer uma configuração de depuração avançada.",
-+<<<<<<< .our
- 	"debug": "Depurar"
-+=======
-+	"columnBreakpoint": "Coluna de ponto de parada",
-+	"debug": "Depurar",
-+	"addColumnBreakpoint": "Adicionar Ponto de Interrupção de Coluna"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a29d2cb24392f3bab71a1534d523c602a7217602 i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  our    100644 7ae7f7f9b7576297c381fe538464cf315327a1cf i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-  their  100644 1551a564cda6e6227b94451ada0b2b6ba22fbb10 i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
-@@ -29,6 +29,9 @@
- 	"showErrors": "Mostrar erros",
- 	"noFolderWorkspaceDebugError": "O arquivo ativo não pode ser depurado. Certifique-se de que ele está salvo no disco e que tem uma extensão de depuração instalada para esse tipo de arquivo.",
- 	"cancel": "Cancelar",
-+<<<<<<< .our
- 	"DebugTaskNotFound": "Não foi possível encontrar a tarefa '{0}'.",
-+=======
-+>>>>>>> .their
- 	"taskNotTracked": "A tarefa '{0}' não pode ser rastreada."
- }
-\ No newline at end of file
-changed in both
-  base   100644 68f9e1f25bfc85c6ab17d221c53fc29b2f8daa94 i18n/ptb/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  our    100644 18e436b0f51c078a33ff8a7ef00fa4c01b630818 i18n/ptb/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  their  100644 1dae0f36657aac2d3bd896168e325ed65f086ee2 i18n/ptb/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-@@ -8,6 +8,24 @@
- 	],
- 	"debugAdapterBinNotFound": "Executável do adaptador de depuração '{0}' não existe.",
- 	"debugAdapterCannotDetermineExecutable": "Não é possível determinar o executável para o adaptador de depuração '{0}'.",
-+<<<<<<< .our
- 	"unableToLaunchDebugAdapter": "Não é possível executar o adaptador de depuração de '{0}'.",
- 	"unableToLaunchDebugAdapterNoArgs": "Não é possível executar o adaptador de depuração."
-+=======
-+	"launch.config.comment1": "Use o IntelliSense para aprender sobre possíveis atributos.",
-+	"launch.config.comment2": "Passe o mouse para ver as descrições dos atributos existentes.",
-+	"launch.config.comment3": "Para obter mais informações, visite: {0}",
-+	"debugType": "Tipo de configuração.",
-+	"debugTypeNotRecognised": "O tipo de depuração não é reconhecido. Certifique-se de que você tem uma extensão de depuração correspondente instalada e que ela está habilitada.",
-+	"node2NotSupported": "\"node2\" não é mais suportado, use \"node\" ao invés e defina o atributo \"protocol\" para \"inspector\".",
-+	"debugName": "Nome da configuração; aparece no menu drop-down da configuração de lançamento. ",
-+	"debugRequest": "Requer o tipo de configuração. Pode ser \"launch\" ou \"attach\".",
-+	"debugServer": "Somente para o desenvolvimento de extensão de depuração: se uma porta é especificada, o VS Code tenta se conectar a um adaptador de depuração executando em modo de servidor",
-+	"debugPrelaunchTask": "Tarefa para ser executada antes de começar a sessão de depuração.",
-+	"debugPostDebugTask": "Tarefa para ser executada após término da sessão de debug.",
-+	"debugWindowsConfiguration": "Atributos de configuração de lançamento específicos do Windows.",
-+	"debugOSXConfiguration": "Atributos de configuração de lançamento específicos do OS X.",
-+	"debugLinuxConfiguration": "Atributos de configuração de lançamento específicos do Linux.",
-+	"deprecatedVariables": "'env.', 'config.' e 'command.' foram descontinuados, use ' env:', ' config:' e ' command:' em vez disso."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c50dddb316689bfd3745b25edbaf1ef8c1a942af i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  our    100644 e6df41a65a65f5e9267a44ca96ad7c6bfefc0837 i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  their  100644 6390a489a2dbb0995831689de39efe4bc5230e57 i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-@@ -37,6 +37,11 @@
- 	"view location": "Onde",
- 	"localizations": "Localizações ({0})",
- 	"localizations language id": "Id do Idioma",
-+<<<<<<< .our
-+=======
-+	"localizations language name": "Nome do Idioma",
-+	"localizations localized language name": "Nome do Idioma (Localizado)",
-+>>>>>>> .their
- 	"colorThemes": "Temas de cores ({0})",
- 	"iconThemes": "Temas de ícones ({0})",
- 	"colors": "Cores ({0})",
-changed in both
-  base   100644 9afc09662215d9167d85b5676c9e3da2336dcfce i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  our    100644 ddb9ffa28f8d3daf13de0c0b7197d8da53424c16 i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-  their  100644 d3e1a967a6afdf2437048751b65a5a0e5bf49729 i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
-@@ -8,6 +8,10 @@
- 	],
- 	"neverShowAgain": "Não mostrar novamente",
- 	"searchMarketplace": "Pesquisar na Loja",
-+<<<<<<< .our
-+=======
-+	"showLanguagePackExtensions": "A loja possui extensões que podem ajudar na localização do VS Code para o local '{0}'",
-+>>>>>>> .their
- 	"dynamicWorkspaceRecommendation": "Esta extensão pode interessá-lo porque é popular entre os usuários do repositório {0}.",
- 	"exeBasedRecommendation": "Esta extensão é recomendada porque você tem {0} instalado.",
- 	"fileBasedRecommendation": "Esta extensão é recomendada baseada nos arquivos que você abriu recentemente.",
-changed in both
-  base   100644 963936e2ac1ccf84da6c3e5e371c00b0923e987f i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  our    100644 5d4dd840e849e249d4865eeefa45bd80e7e4150d i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  their  100644 6646f1509073aef92ef9e8e44cb2644971683dbf i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-@@ -14,6 +14,10 @@
- 	"workspaceRecommendedExtensions": "Recomendações do Espaço de Trabalho",
- 	"builtInExtensions": "Funcionalidades",
- 	"builtInThemesExtensions": "Temas",
-+<<<<<<< .our
-+=======
-+	"builtInBasicsExtensions": "Idiomas",
-+>>>>>>> .their
- 	"searchExtensions": "Pesquisar Extensões na Loja",
- 	"sort by installs": "Ordenar por: Quantidade de Instalações",
- 	"sort by rating": "Ordenar por: Avaliação",
-changed in both
-  base   100644 d626a3f28d4e84dc164a71d1845267110467ae51 i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 6f4dc9047cdb115e21fc423b4a6eca5180a2ad01 i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 b8f1efe7f1617001a73033ac9115246a5cad4230 i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -34,6 +34,13 @@
- 	"confirmDeleteMessageMultiple": "Você tem certeza que deseja excluir permanentemente os seguintes {0} arquivos?",
- 	"confirmDeleteMessageFolder": "Tem certeza de que deseja excluir permanentemente '{0}' e seu conteúdo?",
- 	"confirmDeleteMessageFile": "Tem certeza de que deseja excluir permanentemente '{0}'?",
-+<<<<<<< .our
-+=======
-+	"irreversible": "Esta ação é irreversível!",
-+	"deletePermanentlyButtonLabel": "&&Excluir Permanentemente",
-+	"retryButtonLabel": "&&Tentar Novamente",
-+	"importFiles": "Importar Arquivos",
-+>>>>>>> .their
- 	"confirmOverwrite": "Um arquivo ou pasta com o mesmo nome já existe na pasta de destino. Você quer substituí-lo?",
- 	"replaceButtonLabel": "&&Substituir",
- 	"fileDeleted": "Arquivo para colar foi excluído ou movido no meio-tempo",
-merged
-  result 100644 3533d84f530bbb33031a240513f9ce398306c7fc i18n/ptb/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
-  our    100644 c9dceaeb492e6331e3bf0f803c31ecd200e10290 i18n/ptb/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
-@@ -6,5 +6,6 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+	"openToolsLabel": "Abrir Ferramentas de Desenvolvedor do Webview",
- 	"refreshWebviewLabel": "Recarregar Webviews"
- }
-\ No newline at end of file
-changed in both
-  base   100644 c8a848c68bda7d5397d621125ff753f652b9d339 i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  our    100644 dfb6a734a7bd828d4b5aba3c014e4458b5423834 i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-  their  100644 fabb8d4f9494d7333b7f3437d60dcacce427196a i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
-changed in both
-  base   100644 213e59f281052f08a3be2d52f990273d8f114794 i18n/ptb/src/vs/workbench/parts/search/browser/searchView.i18n.json
-  our    100644 b3ae68185057b9a794fe9aa335e3a999986822bc i18n/ptb/src/vs/workbench/parts/search/browser/searchView.i18n.json
-  their  100644 283b6f780fe7bb20c7187e275bca13d423e3a01d i18n/ptb/src/vs/workbench/parts/search/browser/searchView.i18n.json
-changed in both
-  base   100644 485dee67981eec0b8ca3358ed514e212627d34ab i18n/ptb/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  our    100644 08831e79b99c984b5f938c4d959c75ada794a1e4 i18n/ptb/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-  their  100644 f7d0a1eb3fe333ee9182c95c64487d08d11b0b9b i18n/ptb/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
-@@ -29,5 +29,10 @@
- 	"search.quickOpen.includeSymbols": "Configurar para incluir resultados de uma pesquisa símbolo global nos resultados do arquivo para Abertura Rápida.",
- 	"search.followSymlinks": "Controla quando seguir symlinks ao realizar uma busca.",
- 	"search.smartCase": "Faz pesquisas do tipo case-insensitive se o termo for totalmente minúsculo, caso contrário, faz pesquisas do tipo case-sensitive.",
-+<<<<<<< .our
- 	"search.globalFindClipboard": "Controla se a visualização de busca deve ler ou modificar a área de transferência de busca compartilhada no macOS"
-+=======
-+	"search.globalFindClipboard": "Controla se a visualização de busca deve ler ou modificar a área de transferência de busca compartilhada no macOS",
-+	"search.location": "Visualização: controla se a pesquisa será mostrada como um modo de exibição na barra lateral ou como um painel na área de painéis para mais espaço horizontal. No próximo lançamento, a pesquisa no painel terá um layout horizontal melhorado e este já não será um preview."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 a0dc8f3fbc0304a684f95826cda09bdc04f439ac i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  our    100644 a7fcbfe8b12598411b8516f57bb30b642834b0bc i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-  their  100644 ccb060cdd99013981178a55f44b54a9eda5b39c6 i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
-changed in both
-  base   100644 2e5bc67362ff73c481cd2d707cabde34a7e9cb79 i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 5844af8cc38149dcfa5ec9e4de0ec76188e00645 i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 ff88af36c321f7a900d3811370ba43af5af62c28 i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -51,5 +51,6 @@
- 	"workbench.action.terminal.hideFindWidget": "Ocultar Ferramenta de Pesquisa",
- 	"nextTerminalFindTerm": "Mostrar Próximo Termo de Busca",
- 	"previousTerminalFindTerm": "Mostrar Termo de Busca Anterior",
--	"quickOpenTerm": "Alternar o Terminal Ativo"
-+	"quickOpenTerm": "Alternar o Terminal Ativo",
-+	"workbench.action.terminal.focusPreviousCommand": "Foco no Comando Anterior"
- }
-\ No newline at end of file
-changed in both
-  base   100644 b9e88e5f37b7a572ee131e8c673009b1c72485e3 i18n/rus/extensions/emmet/package.i18n.json
-  our    100644 e8a08df3b0fb514f0bab0b0d555c900a23a3deca i18n/rus/extensions/emmet/package.i18n.json
-  their  100644 c19856550d5543ecbcca10aad15a2fa3d4897b09 i18n/rus/extensions/emmet/package.i18n.json
-@@ -60,6 +60,10 @@
- 	"emmetPreferencesCssMozProperties": "Разделенный запятыми список свойств CSS, которые получают префикс разработчика \"moz\" при использовании в сокращениях Emmet, которые начинаются с \"-\". Чтобы префикс \"moz\" никогда не подставлялся, установите в качестве этого параметра пустое значение. ",
- 	"emmetPreferencesCssOProperties": "Разделенный запятыми список свойств CSS, которые получают префикс разработчика \"o\" при использовании в сокращениях Emmet, которые начинаются с \"-\". Чтобы префикс \"o\" никогда не подставлялся, установите в качестве этого параметра пустое значение. ",
- 	"emmetPreferencesCssMsProperties": "Разделенный запятыми список свойств CSS, которые получают префикс разработчика \"ms\" при использовании в сокращениях Emmet, которые начинаются с \"-\". Чтобы префикс \"ms\" никогда не подставлялся, установите в качестве этого параметра пустое значение. ",
-+<<<<<<< .our
- 	"emmetPreferencesCssFuzzySearchMinScore": "Минимальное количество очков для нечеткого соответствия сокращения (от 0 до 1). При указании более низких значений возможно увеличение числа ложных срабатываний, при указании более высоких значений - уменьшение числа возможных соответствий.",
- 	"emmetOptimizeStylesheetParsing": "Если значение равно false, весь файл анализируется для определения, является ли текущая позиция допустимой для расширения сокращений Emmet. Когда присвоено значение true, только содержимое вокруг текущей позиции в файлах css/scss/less подвергается синтаксическому анализу."
-+=======
-+	"emmetPreferencesCssFuzzySearchMinScore": "Минимальное количество очков для нечеткого соответствия сокращения (от 0 до 1). При указании более низких значений возможно увеличение числа ложных срабатываний, при указании более высоких значений - уменьшение числа возможных соответствий."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 5e347fa36d06770fdc39d7ad00006908de71155a i18n/rus/extensions/git/out/commands.i18n.json
-  our    100644 bdd7adadfadc50db48d014178fb19ce838d13900 i18n/rus/extensions/git/out/commands.i18n.json
-  their  100644 c7863b7c96316f1803b3f2cae8b174cd887b6fee i18n/rus/extensions/git/out/commands.i18n.json
-changed in both
-  base   100644 0cab268e7a8713eda7738a042aeb0b81982f350c i18n/rus/extensions/markdown-language-features/out/security.i18n.json
-  our    100644 d51d2ea286dc4220162db79665ba247fc6ad9c0f i18n/rus/extensions/markdown-language-features/out/security.i18n.json
-  their  100644 e57fedc24d6225bfff89936b87ebe3ea901f606d i18n/rus/extensions/markdown-language-features/out/security.i18n.json
-changed in both
-  base   100644 5e16df11f061462b5d8fdaae683b344a794897b9 i18n/rus/extensions/php/package.i18n.json
-  our    100644 1e2e55fbb4c6054f67ad400b6f785c69d1b25733 i18n/rus/extensions/php/package.i18n.json
-  their  100644 0ad440603307baaa814d78f865ecca71321e9b1d i18n/rus/extensions/php/package.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"displayName": "Основы языка PHP",
-+=======
-+	"displayName": "Функции языка PHP",
-+>>>>>>> .their
- 	"description": "Предоставляет подсветку синтаксиса и выделение парных скобок в файлах PHP."
- }
-\ No newline at end of file
-changed in both
-  base   100644 44453977d44cf49d8f8a493e4107db8ce66f3da2 i18n/rus/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  our    100644 9d3bc679fc1f2c06c947cdc33c9616b8b522920c i18n/rus/src/vs/editor/common/view/editorColorRegistry.i18n.json
-  their  100644 1acfd70b90bc162578e7306fe87aa55127294daf i18n/rus/src/vs/editor/common/view/editorColorRegistry.i18n.json
-@@ -32,7 +32,10 @@
- 	"infoBorder": "Цвет границ волнистой линии для выделения информационных сообщений в редакторе. ",
- 	"hintForeground": "Цвет волнистой линии для выделения подсказок в редакторе.",
- 	"hintBorder": "Цвет границ волнистой линии для выделения подсказок в редакторе. ",
-+<<<<<<< .our
- 	"unnecessaryForeground": "Цвет переднего плана ненужного кода в редакторе.",
-+=======
-+>>>>>>> .their
- 	"overviewRulerRangeHighlight": "Цвет метки линейки в окне просмотра для выделений диапазонов. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
- 	"overviewRuleError": "Цвет метки линейки в окне просмотра для ошибок.",
- 	"overviewRuleWarning": "Цвет метки линейки в окне просмотра для предупреждений.",
-changed in both
-  base   100644 908048ebb5a12bfde5615d50afcb8ade293dd217 i18n/rus/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  our    100644 b5b010a1ed08e7bd0639632258a4ace9da636f30 i18n/rus/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-  their  100644 61b52ee878a7c2b13e97cddf30851a8c074a8e7b i18n/rus/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
-@@ -25,6 +25,11 @@
- 	"uninstallDependeciesConfirmation": "Вы хотите удалить \"{0}\" отдельно или вместе с зависимостями?",
- 	"uninstallOnly": "Только расширение",
- 	"uninstallAll": "Удалить все",
-+<<<<<<< .our
-+=======
-+	"uninstallConfirmation": "Вы действительно хотите удалить \"{0}\"?",
-+	"ok": "ОК",
-+>>>>>>> .their
- 	"singleDependentError": "Не удается удалить расширение \"{0}\". От него зависит расширение \"{1}\".",
- 	"twoDependentsError": "Не удается удалить расширение \"{0}\". От него зависят расширения \"{1}\" и \"{2}\".",
- 	"multipleDependentsError": "Не удается удалить расширение \"{0}\". От него зависят расширения \"{1}\", \"{2}\" и другие.",
-changed in both
-  base   100644 4fd13e76a7af581290b5dc2add21389c0b9c307e i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json
-  our    100644 a203da5726ce360e6e4c7bd4be5cee05446e8ca5 i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json
-  their  100644 681bcf8d8ed16f3c9941a201a1eab81b79eec19e i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json
-changed in both
-  base   100644 37bcdaf055d812e045605594b2d353f0ee340cb6 i18n/rus/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  our    100644 b7b1c72487ebcdd28a2f6de4bbc845fb5f8459a4 i18n/rus/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 4e0cc0deeb308f2247ddb4e9cb8cfe67b630e6a2 i18n/rus/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -7,7 +7,10 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"timeout.formatOnSave": "Форматирование при сохранении прервано через {0} мс",
-+<<<<<<< .our
- 	"codeActionsOnSave.didTimeout": "Метод codeActionsOnSave прерван через {0} мс",
-+=======
-+>>>>>>> .their
- 	"timeout.onWillSave": "Событие onWillSaveTextDocument-event прервано по истечении 1750 мс",
- 	"saveParticipants": "Сохранение участников..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 7a4ee2d7def12666131e6d57feb3fc407e9d8c55 i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 bdb5e10a72aa6a97a13c01acd6d5626456147e68 i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 12656d83a09e6402f6982a0324528674b6a1ceb1 i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -80,7 +80,10 @@
- 	"titleBarStyle": "Настройка внешнего вида заголовка окна. Чтобы применить изменения, потребуется полный перезапуск.",
- 	"window.nativeTabs": "Включает вкладки окна macOS Sierra. Обратите внимание, что для применения этих изменений потребуется полная перезагрузка, и что для всех внутренних вкладок будет отключен пользовательский стиль заголовка, если он был настроен.",
- 	"window.smoothScrollingWorkaround": "Включите это обходное решение, если после восстановления свернутого окна кода VS Code прокрутка не выполняется плавно. Это обходное решение для проблемы (https://github.com/Microsoft/vscode/issues/13612), при которой возникают задержки прокрутки на устройствах с сенсорными панелями высокой точности, такими как устройства Surface от Майкрософт. Включение этого обходного решения может привести к небольшому дрожанию элементов окна во время восстановления, но не имеет других негативных последствий.",
-+<<<<<<< .our
- 	"window.clickThroughInactive": "Если этот параметр включен, то при щелчке в неактивном окне будут активированы как оно, так и элемент управления, на котором находился курсор мыши в момент щелчка, если этот элемент управления должен активироваться по щелчку мыши. Если этот параметр отключен, то при щелчке в любом месте неактивного окна будет активировано только окно, и для активации элемента управления на нем будет нужно щелкнуть еще раз.",
-+=======
-+>>>>>>> .their
- 	"zenModeConfigurationTitle": "Режим Zen",
- 	"zenMode.fullScreen": "Определяет, будет ли переключение в режим Zen переключать рабочее пространство в полноэкранный режим.",
- 	"zenMode.centerLayout": "Определяет, будет ли также выполняться выравнивание по центру при включении режима Zen.",
-changed in both
-  base   100644 3a211dd7bc4ab4c45c2e93603fab30c59b6bc669 i18n/rus/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  our    100644 c7d8282666638a14a77cd9b7b8ffaf2b23a45b58 i18n/rus/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  their  100644 ff219b2d4d418058cfbeda70d9c59bfd174200e9 i18n/rus/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-changed in both
-  base   100644 83f5638058ae5e04cffc93b7604f38be28ad44db i18n/rus/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  our    100644 529030b0956c87703b3826fbbf2739d72dcf1f2b i18n/rus/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  their  100644 63b8dbd0104182bee70beacb97f6a4ad32ddc709 i18n/rus/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-@@ -8,7 +8,11 @@
- 	],
- 	"toggleBreakpointAction": "Отладка: переключить точку останова",
- 	"conditionalBreakpointEditorAction": "Отладка: добавить условную точку останова…",
-+<<<<<<< .our
- 	"logPointEditorAction": "Отладка: добавить точку журнала... ",
-+=======
-+	"logPointEditorAction": "Отладка: Добавить точку журнала...",
-+>>>>>>> .their
- 	"runToCursor": "Выполнить до курсора",
- 	"debugEvaluate": "Отладка: вычисление",
- 	"debugAddToWatch": "Отладка: добавить контрольное значение",
-changed in both
-  base   100644 93dc323939de4d9f996418d9268b1306664316c7 i18n/rus/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-  our    100644 0c479344e19e1328751ca6e3c350f0a4622b49c9 i18n/rus/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-  their  100644 710bb265257b4b5e30215ff9992860728076a743 i18n/rus/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-@@ -6,9 +6,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"breakpointWidgetLogMessagePlaceholder": "Сообщение, которое должно быть записано в журнал при срабатывании точки останова. Выражения в фигурных скобках {} интерполируются. Нажмите клавишу ВВОД, чтобы принять, или ESC, чтобы отменить действие.",
- 	"breakpointWidgetHitCountPlaceholder": "Прервать при определенном количестве обращений. Нажмите клавишу ВВОД, чтобы принять, или ESC для отмены.",
- 	"breakpointWidgetExpressionPlaceholder": "Прервать выполнение, если выражение равно true. Нажмите клавишу ВВОД, чтобы принять, или ESC для отмены.",
-+=======
-+	"breakpointWidgetLogMessagePlaceholder": "Сообщение, которое должно быть записано в журнал при срабатывании точки останова. Нажмите клавишу ВВОД, чтобы принять, или ESC, чтобы отменить действие.",
-+	"breakpointWidgetHitCountPlaceholder": "Прервать при определенном количестве обращений. Нажмите клавишу ВВОД, чтобы принять, или ESC для отмены.",
-+	"breakpointWidgetExpressionPlaceholder": "Прервать выполнение, если выражение равно true. Нажмите клавишу ВВОД, чтобы принять, или ESC для отмены.",
-+	"breakpointWidgetLogMessageAriaLabel": "Программа будет записывать это сообщение в журнал каждый раз при срабатывании точки останова. Нажмите клавишу ВВОД, чтобы принять, или ESC, чтобы отменить действие.",
-+	"breakpointWidgetHitCountAriaLabel": "Выполнение программы прервется в этом месте, только если достигнуто определенное количество обращений. Нажмите клавишу ВВОД для принятия или ESC для отмены.",
-+	"breakpointWidgetAriaLabel": "Выполнение программы прервется в этом месте, только если условие выполнится. Нажмите клавишу ВВОД для принятия или ESC для отмены.",
-+>>>>>>> .their
- 	"expression": "Выражение",
- 	"hitCount": "Количество обращений",
- 	"logMessage": "Сообщение журнала"
-changed in both
-  base   100644 a53c820ee794438bfa15e97f90a86757fb39c259 i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  our    100644 23861effe72edc87caa9cf26eb6c7a34582f889d i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  their  100644 24bbf2ba61a0705731406de1ee1bfa523bd358f8 i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-@@ -24,6 +24,7 @@
- 	"enableBreakpoints": "Включить внутреннюю точку останова в столбце {0} ",
- 	"enableBreakpointOnLine": "Включить точку останова в строке",
- 	"addBreakpoint": "Добавить точку останова",
-+<<<<<<< .our
- 	"addConditionalBreakpoint": "Добавить условную точку останова…",
- 	"addLogPoint": "Добавить точку журнала...",
- 	"breakpointHasCondition": "Этот {0} содержит {1}, который будет утерян при удалении. Попробуйте отключить {0} вместо удаления.",
-@@ -32,5 +33,9 @@
- 	"removeLogPoint": "Удалить {0}",
- 	"disableLogPoint": "Отключить {0}",
- 	"cancel": "Отмена",
-+=======
-+	"conditionalBreakpoint": "Добавить условную точку останова…",
-+	"addLogPoint": "Добавить точку журнала...",
-+>>>>>>> .their
- 	"addConfiguration": "Добавить конфигурацию..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 352c6d325439ec8d52f14a2758bfdd1bf95f9009 i18n/rus/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  our    100644 4d4a7ed83f0f21185a7b07658c2021e06bcfa0df i18n/rus/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-  their  100644 818d95b928f957365a8738634e7f99772069b2a6 i18n/rus/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
-@@ -8,6 +8,24 @@
- 	],
- 	"debugAdapterBinNotFound": "Исполняемый файл адаптера отладки \"{0}\" не существует.",
- 	"debugAdapterCannotDetermineExecutable": "Невозможно определить исполняемый файл для адаптера отладки \"{0}\".",
-+<<<<<<< .our
- 	"unableToLaunchDebugAdapter": "Не удается запустить адаптер отладки из \"{0}\".",
- 	"unableToLaunchDebugAdapterNoArgs": "Не удается запустить адаптер отладки."
-+=======
-+	"launch.config.comment1": "Используйте IntelliSense, чтобы узнать о возможных атрибутах.",
-+	"launch.config.comment2": "Наведите указатель мыши, чтобы просмотреть описания существующих атрибутов.",
-+	"launch.config.comment3": "Для получения дополнительной информации посетите: {0}",
-+	"debugType": "Тип конфигурации.",
-+	"debugTypeNotRecognised": "Не удается распознать тип отладки. Убедитесь, что соответствующее расширение отладки установлено и включено.",
-+	"node2NotSupported": "Значение \"node2\" больше не поддерживается; используйте \"node\" и задайте для атрибута \"protocol\" значение \"inspector\".",
-+	"debugName": "Имя конфигурации; отображается в раскрывающемся меню конфигурации запуска.",
-+	"debugRequest": "Запросите тип конфигурации. Возможные типы: \"запуск\" и \"подключение\".",
-+	"debugServer": "Только для разработки расширений отладки: если указан порт, VS Code пытается подключиться к адаптеру отладки, запущенному в режиме сервера.",
-+	"debugPrelaunchTask": "Задача, выполняемая перед началом сеанса отладки.",
-+	"debugPostDebugTask": "Задача, которая будет запущена после завершения сеанса отладки.",
-+	"debugWindowsConfiguration": "Атрибуты конфигурации запуска для Windows.",
-+	"debugOSXConfiguration": "Атрибуты конфигурации запуска для OS X.",
-+	"debugLinuxConfiguration": "Атрибуты конфигурации запуска для Linux.",
-+	"deprecatedVariables": "\"env.\", \"config.\" и \"command.\" устарели, используйте \"env:\", \"config:\" и \"command:\"."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 65c42dfa32b3914f08cdfdcdfa9c0f43dbc778d5 i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  our    100644 f164fde4366fa773b48bfe98693ae272b89afd2b i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  their  100644 80214fe333933c85dc938913564565da17a68e22 i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-changed in both
-  base   100644 fc2676c541bdf82c50f159619a26ce5bc21e162b i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  our    100644 2237c231d50e522f4f8d9167763aa06917febb9b i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  their  100644 18330df4a6df63ea5a68f5d7d30d19fbf04a6628 i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-@@ -14,7 +14,11 @@
- 	"workspaceRecommendedExtensions": "Рекомендации рабочей области",
- 	"builtInExtensions": "Функции",
- 	"builtInThemesExtensions": "Темы",
-+<<<<<<< .our
- 	"builtInBasicsExtensions": "Языки программирования",
-+=======
-+	"builtInBasicsExtensions": "Языки",
-+>>>>>>> .their
- 	"searchExtensions": "Поиск расширений в Marketplace",
- 	"sort by installs": "Сортировать по: числу установок",
- 	"sort by rating": "Сортировать по: рейтинг",
-changed in both
-  base   100644 34483f0568a33e88dbc9e35a2c4de92076f2cc3a i18n/rus/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-  our    100644 ffe2bcbd534ed951291a4a93751b509245a9ff04 i18n/rus/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-  their  100644 17cc8bc7ccb3b7859a4ca7f9e212b29185bb2951 i18n/rus/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-@@ -8,8 +8,13 @@
- 	],
- 	"textFileEditor": "Редактор текстовых файлов",
- 	"createFile": "Создать файл",
-+<<<<<<< .our
- 	"relaunchWithIncreasedMemoryLimit": "Перезапустить с объемом памяти {0} МБ",
- 	"configureMemoryLimit": "Настроить ограничение памяти",
-+=======
-+	"relaunchWithIncreasedMemoryLimit": "Запустить повторно",
-+	"configureMemoryLimit": "Настройка",
-+>>>>>>> .their
- 	"fileEditorWithInputAriaLabel": "{0}. Редактор текстовых файлов.",
- 	"fileEditorAriaLabel": "Редактор текстовых файлов."
- }
-\ No newline at end of file
-changed in both
-  base   100644 a22ecce0eb36db951291ed6fc49f39b0849eddcc i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 2c38d1331217bb70a1fc665d1c79c9658eacde43 i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 3cfc86062e0ef0c8abc43528d790496012791032 i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -38,12 +38,27 @@
- 	"confirmMoveTrashMessageMultiple": "Вы действительно хотите удалить следующие файлы ({0})?",
- 	"confirmMoveTrashMessageFolder": "Вы действительно хотите удалить папку \"{0}\" и ее содержимое?",
- 	"confirmMoveTrashMessageFile": "Вы действительно хотите удалить \"{0}\"?",
-+<<<<<<< .our
- 	"confirmDeleteMessageFilesAndDirectories": "Вы уверены, что вы хотите удалить следующие файлы и каталоги ({0}) и их содержимое без возможности восстановления?",
- 	"confirmDeleteMessageMultipleDirectories": "Вы уверены, что вы хотите удалить следующие каталоги ({0}) и их содержимое без возможности восстановления? ",
- 	"confirmDeleteMessageMultiple": "Вы действительно хотите удалить следующие файлы ({0}) без возможности восстановления?",
- 	"confirmDeleteMessageFolder": "Вы действительно хотите удалить папку \"{0}\" и ее содержимое без возможности восстановления?",
- 	"confirmDeleteMessageFile": "Вы действительно хотите удалить \"{0}\" без возможности восстановления?",
- 	"addFiles": "Добавить файлы",
-+=======
-+	"undoBin": "Вы можете выполнить восстановление из корзины.",
-+	"undoTrash": "Вы можете выполнить восстановление из корзины.",
-+	"doNotAskAgain": "Больше не спрашивать",
-+	"confirmDeleteMessageMultiple": "Вы действительно хотите удалить следующие файлы ({0}) без возможности восстановления?",
-+	"confirmDeleteMessageFolder": "Вы действительно хотите удалить папку \"{0}\" и ее содержимое без возможности восстановления?",
-+	"confirmDeleteMessageFile": "Вы действительно хотите удалить \"{0}\" без возможности восстановления?",
-+	"irreversible": "Это действие необратимо.",
-+	"binFailed": "Не удалось выполнить удаление в корзину. Вы хотите выполнить удаление навсегда?",
-+	"trashFailed": "Не удалось выполнить удаление в корзину. Вы действительно хотите выполнить удаление навсегда?",
-+	"deletePermanentlyButtonLabel": "&&Удалить навсегда",
-+	"retryButtonLabel": "&&Повторить",
-+	"importFiles": "Импорт файлов",
-+>>>>>>> .their
- 	"confirmOverwrite": "Файл или папка с таким именем уже существует в конечной папке. Заменить их?",
- 	"replaceButtonLabel": "Заменить",
- 	"fileIsAncestor": "Файл для вставки является предком папки назначения",
-changed in both
-  base   100644 7864917b59e67851283f9fd7cd4150a5422d8609 i18n/rus/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 8abc8c89790838ab546398086d2a394a5956c230 i18n/rus/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 a3b99e05192c71247d9da5fe5907b77363882f27 i18n/rus/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-@@ -35,7 +35,11 @@
- 	"hotExit": "Определяет, запоминаются ли несохраненные файлы между сеансами. В этом случае приглашение на их сохранение при выходе из редактора не появляется.",
- 	"useExperimentalFileWatcher": "Использовать новое экспериментальное средство наблюдения за файлами.",
- 	"defaultLanguage": "Режим языка по умолчанию, который назначается новым файлам.",
-+<<<<<<< .our
- 	"maxMemoryForLargeFilesMB": "Управляет объемом памяти, который доступен VS Code после перезапуска при попытке открытия больших файлов. Действие этого параметра аналогично указанию параметра --max-memory=<новый размер> в командной строке.",
-+=======
-+	"maxMemoryForLargeFilesMB": "Новое ограничение памяти в МБ, которое будет использоваться приложением при повторном запуске для открытия больших файлов. Если вы хотите запустить приложение с увеличенным ограничением, укажите параметр командной строки --max-memory=<новый_размер>.",
-+>>>>>>> .their
- 	"editorConfigurationTitle": "Редактор",
- 	"formatOnSave": "Форматирование файла при сохранении. Модуль форматирования должен быть доступен, файл не должен сохраняться автоматически, а работа редактора не должна завершаться.",
- 	"formatOnSaveTimeout": "Время ожидания форматирования при сохранении. Указывает ограничение времени в миллисекундах для команд форматирования при сохранении. Команды, выполнение которых превышает указанное время ожидания, будут отменены.",
-changed in both
-  base   100644 4d9d86ce6f117ae7f1dc0f5678f7144f34e1387d i18n/rus/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  our    100644 b30660862fb648d55c4895c7ccb26b222d765662 i18n/rus/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  their  100644 bb8f54980755c146178759e5030aed98363acac8 i18n/rus/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-changed in both
-  base   100644 fdff5585e456b298575722bed325c9323f63536e i18n/rus/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-  our    100644 a63d40973586dbf4b8e760b8f38c33a93f46bbeb i18n/rus/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-  their  100644 8fed9fa0086548854b37fd37081944d8103765c9 i18n/rus/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-changed in both
-  base   100644 939ceca5ae7bdb06caaa032d8772f35812bf891d i18n/rus/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-  our    100644 0d3a91c0c6538b744fa4b164a7696d4ba4988350 i18n/rus/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-  their  100644 36314a7275b13f3995f4769e593339f47534ecb2 i18n/rus/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-changed in both
-  base   100644 1199d8b14270b7d9ab9a272476547db92b838ffb i18n/rus/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  our    100644 b1ff2f3c4a2f645fbb9eec41aa8aaf1e9cdae2c6 i18n/rus/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  their  100644 880aeb124f1e44139aaf81898bbe3d8c9129c0a9 i18n/rus/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
-+=======
-+	"keybindingsInputName": "Сочетания клавиш",
-+>>>>>>> .their
- 	"showDefaultKeybindings": "Показать сочетания клавиш по умолчанию",
- 	"showUserKeybindings": "Показать пользовательские сочетания клавиш",
- 	"SearchKeybindings.AriaLabel": "Поиск настраиваемых сочетаний клавиш",
-changed in both
-  base   100644 a577a42bfc06b74a3ad80f3c45afa655d0585390 i18n/rus/src/vs/workbench/parts/search/browser/searchView.i18n.json
-  our    100644 b197ab3521e49957a9edec72b674203f6268c391 i18n/rus/src/vs/workbench/parts/search/browser/searchView.i18n.json
-  their  100644 54b823f7a407bead82df751285a4aab57b17e911 i18n/rus/src/vs/workbench/parts/search/browser/searchView.i18n.json
-@@ -7,10 +7,16 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"moreSearch": "Переключить сведения о поиске",
-+<<<<<<< .our
- 	"searchScope.includes": "включаемые файлы",
- 	"label.includes": "Шаблоны включения в поиск",
- 	"searchScope.excludes": "исключаемые файлы",
- 	"label.excludes": "Шаблоны исключения из поиска",
-+=======
-+	"searchIncludeExclude.label": "файлы для включения/исключения",
-+	"searchIncludeExclude.ariaLabel": "Шаблоны включения в поиск/шаблоны исключения из поиска",
-+	"searchIncludeExclude.placeholder": "Примеры: src, !*.ts, test/**/*.log",
-+>>>>>>> .their
- 	"replaceAll.confirmation.title": "Заменить все",
- 	"replaceAll.confirm.button": "Заменить",
- 	"replaceAll.occurrence.file.message": "Вхождение {0} заменено в {1} файле на \"{2}\".",
-changed in both
-  base   100644 e2928ed26bf6d66b7dccddc5f9f66a9ae4873de5 i18n/rus/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 5406c69914aaafdfca9d082f48774213cbbbd661 i18n/rus/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 f9fa20a44cffa49c8d8462d0b51d765f88977d2b i18n/rus/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-@@ -28,7 +28,10 @@
- 	"JsonSchema.tasks.group.none": "Отменяет связь задачи со всеми группами",
- 	"JsonSchema.tasks.group": "Определяет, к какой группе выполнения принадлежит эта задача. Поддерживаемые значения: \"build\" для добавления задачи к группе сборки и \"test\" для добавления задачи к группе тестирования.",
- 	"JsonSchema.tasks.type": "Определяет, выполняется ли задача в виде процесса или в виде команды оболочки.",
-+<<<<<<< .our
- 	"JsonSchema.commandArray": "Команда оболочки, которая будет выполнена. Элементы массива будут объединены с помощью пробела",
-+=======
-+>>>>>>> .their
- 	"JsonSchema.command.quotedString.value": "Фактическое значение команды",
- 	"JsonSchema.tasks.quoting.escape": "Экранирует символы с помощью escape-символа оболочки (например, \"`\" в PowerShell и\"\\\" в bash).",
- 	"JsonSchema.tasks.quoting.strong": "Заключает аргумент в кавычки с использованием символа двойной кавычки (например, \" в PowerShell и bash).",
-changed in both
-  base   100644 9699d3ddc6b9dd00aaadd4deb611ac3cf2b13a10 i18n/rus/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  our    100644 3ad2e6ca5f31ca94a9cdd8a18a046b2a9773636b i18n/rus/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-  their  100644 ddd5e270ba0e6d69665ab666862ec2e61c4bf9d7 i18n/rus/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
-changed in both
-  base   100644 17bf9786dc448c39271715a4cc7d617c1a4d1e3a i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 ea0d455fc7f4fc786ef2ef083f3b437a535a441a i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 f6166c1ddc512eafba88430dad7a738aecad58b5 i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -54,10 +54,17 @@
- 	"nextTerminalFindTerm": "Показать следующий найденный термин",
- 	"previousTerminalFindTerm": "Показать предыдущий найденный термин",
- 	"quickOpenTerm": "Переключить активный терминал",
-+<<<<<<< .our
- 	"workbench.action.terminal.scrollToPreviousCommand": "Перейти к предыдущей команде",
- 	"workbench.action.terminal.scrollToNextCommand": "Перейти к следующей команде",
- 	"workbench.action.terminal.selectToPreviousCommand": "Выбрать предыдущую команду",
- 	"workbench.action.terminal.selectToNextCommand": "Выбрать следующую команду",
- 	"workbench.action.terminal.selectToPreviousLine": "Выделить текст до предыдущей строки",
- 	"workbench.action.terminal.selectToNextLine": "Выделить текст до следующей строки"
-+=======
-+	"workbench.action.terminal.focusPreviousCommand": "Перевести выделение на предыдущую команду",
-+	"workbench.action.terminal.focusNextCommand": "Перевести выделение на следующую команду",
-+	"workbench.action.terminal.selectToPreviousCommand": "Выбрать предыдущую команду",
-+	"workbench.action.terminal.selectToNextCommand": "Выбрать следующую команду"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/rus/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
-  our    100644 200628838fe6c979a9c673cd18449cbf74f5ffff i18n/rus/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
-  their  100644 0f286692f335d565e60086641469d369ee462360 i18n/rus/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
-@@ -6,5 +6,20 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"stringsOnlySupported": "Команда {0} не возвратила строку. Команды, используемые для замены переменных, могут возвращать только строковые значения."
-+=======
-+	"canNotResolveWorkspaceFolderMultiRoot": "Не удалось разрешить папку ${workspaceFolder} в рабочей области с несколькими папками. Укажите область действия этих переменных с помощью : и имени папки.",
-+	"canNotResolveWorkspaceFolder": "Не удалось разрешить папку ${workspaceFolder}. Откройте папку.",
-+	"canNotResolveFolderBasenameMultiRoot": "Не удалось разрешить папку ${workspaceFolderBasename} в рабочей области с несколькими папками. Укажите область действия этих переменных с помощью : и имени папки.",
-+	"canNotResolveFolderBasename": "Не удалось разрешить папку ${workspaceFolderBasename}. Откройте папку. ",
-+	"canNotResolveLineNumber": "Не удалось разрешить ${lineNumber}, откройте редактор.",
-+	"canNotResolveSelectedText": "Не удалось разрешить ${selectedText}, откройте редактор. ",
-+	"canNotResolveFile": "Не удалось разрешить ${file}, откройте редактор. ",
-+	"canNotResolveRelativeFile": "Не удалось разрешить ${relativeFile}, откройте редактор. ",
-+	"canNotResolveFileDirname": "Не удалось разрешить ${fileDirname}, откройте редактор.",
-+	"canNotResolveFileExtname": "Не удалось разрешить ${fileExtname}, откройте редактор. ",
-+	"canNotResolveFileBasename": "Не удалось разрешить ${fileBasename}, откройте редактор. ",
-+	"canNotResolveFileBasenameNoExtension": "Не удалось разрешить ${fileBasenameNoExtension}, откройте редактор. "
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 c3b0dd46f650f3e1a0c724beb8df4b6e23028d8c i18n/rus/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-  our    100644 8ebd66bbd8687e5622cde77b9ebb281a304ed8a9 i18n/rus/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-  their  100644 173f67e6d892f26ecea2ea43c9fa375de397ed74 i18n/rus/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-@@ -11,6 +11,7 @@
- 	"neverShowAgain": "Больше не показывать",
- 	"enospcError": "{0} не удалось проследить изменения файлов в этой большой рабочей области. Для решения проблемы воспользуйтесь ссылкой на инструкции.",
- 	"learnMore": "Инструкции",
-+<<<<<<< .our
- 	"fileInvalidPath": "Недопустимый ресурс файла ({0})",
- 	"fileIsDirectoryError": "Файл является каталогом",
- 	"fileNotModifiedError": "undefined",
-@@ -24,6 +25,9 @@
- 	"fileReadOnlyError": "Файл доступен только для чтения",
- 	"fileMoveConflict": "Невозможно переместить или скопировать файл, так как он уже существует в папке назначения.",
- 	"unableToMoveCopyError": "Невозможно переместить или скопировать файл, так как он заменил бы папку, в которой содержится.",
-+=======
-+	"enospcError": "{0} не удалось проследить изменения файлов в этой большой рабочей области. Для решения проблемы воспользуйтесь ссылкой на инструкции.",
-+>>>>>>> .their
- 	"binFailed": "Не удалось переместить \"{0}\" в корзину",
- 	"trashFailed": "Не удалось переместить \"{0}\" в корзину."
- }
-\ No newline at end of file
-merged
-  result 100644 86f192a493a383aa90741d72244bef4252ea8970 i18n/rus/src/vs/workbench/services/files/node/fileService.i18n.json
-  our    100644 10de0847f46ee9702ad03a0d05b0874fadaa8148 i18n/rus/src/vs/workbench/services/files/node/fileService.i18n.json
-@@ -9,6 +9,7 @@
- 	"fileInvalidPath": "Недопустимый ресурс файла ({0})",
- 	"fileIsDirectoryError": "Файл является каталогом",
- 	"fileNotModifiedError": "undefined",
-+	"fileTooLargeForHeapError": "Размер файла превышает ограничение памяти по умолчанию. Выполните запуск повторно, увеличив ограничение. Текущее значение для перезапуска: {0} МБ",
- 	"fileTooLargeError": "Не удается открыть файл, так как он имеет слишком большой размер",
- 	"fileNotFoundError": "Файл не найден ({0})",
- 	"fileBinaryError": "Похоже, файл является двоичным, и его нельзя открыть как текстовый.",
-changed in both
-  base   100644 f11753f30764fff6c90676a7afe9bcc0d694c623 i18n/trk/extensions/emmet/package.i18n.json
-  our    100644 da0ca75d8cf264d2aa273bacfc4c88c0e06fd83f i18n/trk/extensions/emmet/package.i18n.json
-  their  100644 77b4fde3dc21e0b29244d75fb5dde5dd3eb2ec20 i18n/trk/extensions/emmet/package.i18n.json
-@@ -60,6 +60,10 @@
- 	"emmetPreferencesCssMozProperties": "`-` ile başlayan Emmet kısaltmasında kullanıldığında 'moz' önekini alacak virgülle ayrılmış CSS özellikleri. 'moz' önekinden her zaman kaçınmak için boş bir dize olarak ayarlayın.",
- 	"emmetPreferencesCssOProperties": "`-` ile başlayan Emmet kısaltmasında kullanıldığında 'o' önekini alacak virgülle ayrılmış CSS özellikleri. 'o' önekinden her zaman kaçınmak için boş bir dize olarak ayarlayın.",
- 	"emmetPreferencesCssMsProperties": "`-` ile başlayan Emmet kısaltmasında kullanıldığında 'ms' önekini alacak virgülle ayrılmış CSS özellikleri. 'ms' önekinden her zaman kaçınmak için boş bir dize olarak ayarlayın.",
-+<<<<<<< .our
- 	"emmetPreferencesCssFuzzySearchMinScore": "Bulanık eşleştirilmiş kısaltmaların elde etmesi gereken minimum puan (0'dan 1'e kadar). Düşük değerler birçok yanlış pozitif eşleşme oluşturabilir, daha yüksek değerler olası eşleşmeleri azaltabilir.",
- 	"emmetOptimizeStylesheetParsing": "\"false\" değeri atandığında, Emmet kısaltmalarının genişletilmesinde o anki konumun geçerli olup olmadığını belirlemek için tüm dosya ayrıştırılır. \"true\" değeri atandığında, css/scss/less dosyalarında sadece o anki konumun çevresi ayrıştırılır."
-+=======
-+	"emmetPreferencesCssFuzzySearchMinScore": "Bulanık eşleştirilmiş kısaltmaların elde etmesi gereken minimum puan (0'dan 1'e kadar). Düşük değerler birçok yanlış pozitif eşleşme oluşturabilir, daha yüksek değerler olası eşleşmeleri azaltabilir."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 1feaf1cddafc6bf966211601c60d4bfd5f651953 i18n/trk/extensions/git/out/commands.i18n.json
-  our    100644 6794dc4934caa0927c5d65dc1f742c2cefd9cd5b i18n/trk/extensions/git/out/commands.i18n.json
-  their  100644 2883a4dafdfc0588fd491bce29c9e6651c5f3b86 i18n/trk/extensions/git/out/commands.i18n.json
-changed in both
-  base   100644 5b6a365ee4b8e9da027c5354a1046d002ee92ee1 i18n/trk/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-  our    100644 3c92c8ee5f97958caa95c84da374aba6a8cf8c6c i18n/trk/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-  their  100644 3f0ddf6290c956308cc40953ce44bb8f0e80b74c i18n/trk/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
-@@ -13,12 +13,18 @@
- 	"vscode.extension.contributes.view.name": "Görünümün insanlar tarafından okunabilir adı. Gösterilecektir",
- 	"vscode.extension.contributes.view.when": "Bu görünümü göstermek için doğru olması gereken koşul",
- 	"vscode.extension.contributes.views": "Görünümleri düzenleyiciye ekler.",
-+<<<<<<< .our
- 	"views.explorer": "Etkinlik Çubuğu'ndaki Gezgin kapsayıcısına görünümler ekler",
- 	"views.debug": "Etkinlik Çubuğu'ndaki Hata Ayıklama kapsayıcısına görünümler ekler",
- 	"views.scm": "Etkinlik Çubuğu'ndaki SCM kapsayıcısına görünümler ekler",
- 	"views.test": "Etkinlik Çubuğu'ndaki Test kapsayıcısına görünümler ekler",
- 	"views.contributed": "Görünümleri katkıda bulunan görünümü kapsayıcısına ekler",
- 	"ViewContainerDoesnotExist": "'{0}' görünüm kapsayıcısı mevcut değil ve ona kayıtlı tüm görünümler 'Explorer'a eklenecektir.",
-+=======
-+	"views.explorer": "Gezgin Görünümü",
-+	"views.debug": "Hata Ayıklama Görünümü",
-+	"locationId.invalid": "`{0}` geçerli bir görünüm konumu değil",
-+>>>>>>> .their
- 	"duplicateView1": "`{1}` konumunda aynı `{0}` id'sine sahip birden çok görünüm kaydedilemiyor",
- 	"duplicateView2": "`{0}` id'sine sahip bir görünüm `{1}` konumunda zaten kayıtlı"
- }
-\ No newline at end of file
-changed in both
-  base   100644 77c86b9a0b6fd5f4a64202e57288a1dc0a2b2acd i18n/trk/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  our    100644 15d5c003a775612763a5b3ad8b2eef344c75ffe7 i18n/trk/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-  their  100644 3f98c05062b027de5b21673a2b3cf2e88ae0e887 i18n/trk/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
-@@ -7,7 +7,10 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"timeout.formatOnSave": "Kaydederken biçimlendirme {0}ms sonrasında durduruldu",
-+<<<<<<< .our
- 	"codeActionsOnSave.didTimeout": "{0}ms sonra codeActionsOnSave durduruldu",
-+=======
-+>>>>>>> .their
- 	"timeout.onWillSave": "onWillSaveTextDocument olayı 1750ms sonrasında durduruldu",
- 	"saveParticipants": "Katılımcıların Kaydedilmesi İşlemi Çalıştırılıyor..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 d89fb0f61b9af087911f42dbe9af5031b1706863 i18n/trk/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-  our    100644 6c864a500a2e9ea8cb75f88adec6bb872395d1ad i18n/trk/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-  their  100644 cee6d95273312e5887a2b190dfcac9359013a510 i18n/trk/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
-changed in both
-  base   100644 8653d80860553804e899422db274f9df9afeb3af i18n/trk/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  our    100644 6083c93c0aa8c7594afe0d6fb609d69d65163ece i18n/trk/src/vs/workbench/electron-browser/main.contribution.i18n.json
-  their  100644 f55bdf21090117f6fa467ccef7c2c8654b178635 i18n/trk/src/vs/workbench/electron-browser/main.contribution.i18n.json
-@@ -80,7 +80,10 @@
- 	"titleBarStyle": "Pencere başlık çubuğunun görünümünü ayarlayın. Değişikliklerin uygulanması için tam yeniden başlatma gerekir.",
- 	"window.nativeTabs": "macOS Sierra pencere sekmelerini etkinleştirir. Değişikliklerin uygulanması için tam yeniden başlatma gerekeceğini ve yerel sekmelerin, eğer yapılandırılmışsa özel başlık çubuğu stilini devre dışı bıracağını unutmayın.",
- 	"window.smoothScrollingWorkaround": "Simge durumuna küçültülmüş bir VS Code penceresini tekrar açtıktan sonra kaydırma artık pürüzsüz değilse bu geçici çözümü etkinleştirin. Bu, Microsoft'un Surface cihazları gibi hassas trackpad'ler içeren cihazlarda yaşanan kaydırma gecikmesi sorunu (https://github.com/Microsoft/vscode/issues/13612) için geçici bir çözümdür.",
-+<<<<<<< .our
- 	"window.clickThroughInactive": "Etkinleştirilirse, aktif olmayan bir pencereye tıklandığında hem pencere etkinleştirilir hem de farenin üzerinde bulunduğu öge tıklanabilir durumdaysa tetiklenir. Devre dışı bırakılırsa, aktif olmayan bir pencerenin herhangi bir yerine tıklandığında sadece o pencere etkinleştirilir ve öge için ikinci bir tıklama gerekir.",
-+=======
-+>>>>>>> .their
- 	"zenModeConfigurationTitle": "Zen Modu",
- 	"zenMode.fullScreen": "Zen Moduna geçmenin ayrıca çalışma ekranını tam ekran moduna geçirip geçirmeyeceğini denetler.",
- 	"zenMode.centerLayout": "Zen Modu'nun aktif edilmesinin düzeni ortalayıp ortalamayacağını denetler.",
-changed in both
-  base   100644 7be66e01426021a5160b8a5a230b2e7cef43f292 i18n/trk/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  our    100644 896aab5629dfd63cb9a0130680b00a270e20d698 i18n/trk/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-  their  100644 c438c7f7afd0510ed3a14ab79e7b1ad93932023f i18n/trk/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
-changed in both
-  base   100644 b06dcece7970e5f93643b0c98ee5e22f13c8596b i18n/trk/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  our    100644 107e35dc98e2f8d34301dcb1130ff0c16bcd647a i18n/trk/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-  their  100644 015958ac4d95d5039782fefad41f0765ea87f465 i18n/trk/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
-changed in both
-  base   100644 30a355a88d6b9624da4912089b9bc74fa52dc908 i18n/trk/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-  our    100644 6f0d63fe4b5bb187b96181ade2b24b157cf44df2 i18n/trk/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-  their  100644 3b918e4989aac60dcdeb4a4731e975423cd91137 i18n/trk/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
-@@ -6,9 +6,18 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"breakpointWidgetLogMessagePlaceholder": "Bu kesme noktası isabet aldığında günlüğe kaydedilecek mesaj. {} arasındaki ifadeler hesaplanmaktadır. Kabul etmek için 'Enter', iptal etmek için 'Esc' tuşuna basın.",
- 	"breakpointWidgetHitCountPlaceholder": "İsabet sayısı koşulu sağlandığında mola ver. Kabul etmek için 'Enter', iptal etmek için 'Esc' tuşuna basın.",
- 	"breakpointWidgetExpressionPlaceholder": "İfade değerlendirmesi doğru olduğunda mola ver. Kabul etmek için 'Enter', iptal etmek için 'Esc' tuşuna basın.",
-+=======
-+	"breakpointWidgetLogMessagePlaceholder": "Bu kesme noktası isabet aldığında günlüğe kaydedilecek mesaj. Kabul etmek için 'Enter', iptal etmek için 'Esc' tuşuna basın.",
-+	"breakpointWidgetHitCountPlaceholder": "İsabet sayısı koşulu sağlandığında mola ver. Kabul etmek için 'Enter', iptal etmek için 'Esc' tuşuna basın.",
-+	"breakpointWidgetExpressionPlaceholder": "İfade değerlendirmesi doğru olduğunda mola ver. Kabul etmek için 'Enter', iptal etmek için 'Esc' tuşuna basın.",
-+	"breakpointWidgetLogMessageAriaLabel": "Program, bu kesme noktası her isabet aldığında bu mesajı günlüğe kaydeder. Kabul etmek için Enter veya iptal etmek için Escape tuşuna basın. ",
-+	"breakpointWidgetHitCountAriaLabel": "Program, burada sadece isabet sayısı koşulu sağlandığında durur. Kabul etmek için Enter veya iptal etmek için Escape tuşuna basın. ",
-+	"breakpointWidgetAriaLabel": "Program, burada sadece bu koşul doğruysa durur. Kabul etmek için Enter veya iptal etmek için Escape tuşuna basın. ",
-+>>>>>>> .their
- 	"expression": "İfade",
- 	"hitCount": "İsabet Sayısı",
- 	"logMessage": "Günlük Mesajı"
-changed in both
-  base   100644 05751eef2fec6e6705de53fed6db9b7799151e85 i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  our    100644 37a431b186d01be99b6dc3686372e88732c818a6 i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-  their  100644 9cad87a5651eda710bf3bf64aa3d74e6eb72f48a i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
-@@ -23,6 +23,7 @@
- 	"disableBreakpointOnLine": "Satır Kesme Noktasını Devre Dışı Bırak",
- 	"enableBreakpointOnLine": "Satır Kesme Noktasını Etkinleştir",
- 	"addBreakpoint": "Kesme Noktası Ekle",
-+<<<<<<< .our
- 	"addConditionalBreakpoint": "Koşullu Kesme Noktası Ekle...",
- 	"addLogPoint": "Günlük Noktası Ekle...",
- 	"breakpointHasCondition": "Bu {0}, kaldırıldığında kaybolacak bir {1}'e sahip. Bunun yerine {0}'i kaldırmayı düşünün.",
-@@ -31,5 +32,9 @@
- 	"removeLogPoint": "Kaldır: {0}",
- 	"disableLogPoint": "Devre Dışı Bırak: {0}",
- 	"cancel": "İptal",
-+=======
-+	"conditionalBreakpoint": "Koşullu Kesme Noktası Ekle...",
-+	"addLogPoint": "Günlük Noktası Ekle...",
-+>>>>>>> .their
- 	"addConfiguration": "Yapılandırma Ekle..."
- }
-\ No newline at end of file
-changed in both
-  base   100644 e72bf6372568811c4301ae015d114cb2ba222f56 i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  our    100644 5f574d5497b61ce924ac083a103d74a4034fdba1 i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-  their  100644 6a78b248854f055049506773a66687ae15b0ceb7 i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
-changed in both
-  base   100644 8a7b64b5ad3c19de14de3337b8585b2214969ebb i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  our    100644 059c3d6e6d6383142d7fde26f88119e50f546ac9 i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-  their  100644 5ba84848f1c4efc755e522a44f901f755bdf33d4 i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
-@@ -14,7 +14,11 @@
- 	"workspaceRecommendedExtensions": "Çalışma Alanı Tavsiyeleri",
- 	"builtInExtensions": "Özellikler",
- 	"builtInThemesExtensions": "Temalar",
-+<<<<<<< .our
- 	"builtInBasicsExtensions": "Programlama Dilleri",
-+=======
-+	"builtInBasicsExtensions": "Diller",
-+>>>>>>> .their
- 	"searchExtensions": "Markette Eklenti Ara",
- 	"sort by installs": "Sırala: Yüklenme Sayısına Göre",
- 	"sort by rating": "Sırala: Derecelendirmeye Göre",
-changed in both
-  base   100644 fa6e1617b0ff2a883a8a79e2907a2f355a965370 i18n/trk/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-  our    100644 9c34b1e8cf050e2fc1ad69cb2f623440043e1559 i18n/trk/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-  their  100644 17a58aa6da85312f8cf707c30664bfb696b84d51 i18n/trk/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
-@@ -8,8 +8,13 @@
- 	],
- 	"textFileEditor": "Metin Dosyası Düzenleyicisi",
- 	"createFile": "Dosya Oluştur",
-+<<<<<<< .our
- 	"relaunchWithIncreasedMemoryLimit": "{0} MB ile Yeniden Başlat",
- 	"configureMemoryLimit": "Bellek Sınırını Yapılandır",
-+=======
-+	"relaunchWithIncreasedMemoryLimit": "Yeniden Başlat",
-+	"configureMemoryLimit": "Yapılandır",
-+>>>>>>> .their
- 	"fileEditorWithInputAriaLabel": "{0}. Metin dosyası düzenleyici.",
- 	"fileEditorAriaLabel": "Metin dosyası düzenleyici."
- }
-\ No newline at end of file
-changed in both
-  base   100644 e0b425c8efd0d9293085fdc659e96a640f379af1 i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  our    100644 43e3bf4348f9b7a25892a993e8f5dd85c62e9798 i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-  their  100644 e8af3942e6572366afd03e01c33049b4648d42f8 i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
-@@ -37,6 +37,7 @@
- 	"confirmMoveTrashMessageMultipleDirectories": "Aşağıdaki {0} dizini ve içindekileri silmek istediğinizden emin misiniz?",
- 	"confirmMoveTrashMessageMultiple": "Aşağıdaki {0} dosyayı silmek istediğinizden emin misiniz?",
- 	"confirmMoveTrashMessageFolder": "'{0}' ve içindekileri silmek istediğinizden emin misiniz?",
-+<<<<<<< .our
- 	"confirmMoveTrashMessageFile": "'{0}' ögesini silmek istediğinizden emin misiniz?",
- 	"confirmDeleteMessageFilesAndDirectories": "Aşağıdaki {0} dosyayı/dizini ve içindekileri kalıcı olarak silmek istediğinizden emin misiniz?",
- 	"confirmDeleteMessageMultipleDirectories": "Aşağıdaki {0} dizini ve içindekileri kalıcı olarak silmek istediğinizden emin misiniz?",
-@@ -44,6 +45,21 @@
- 	"confirmDeleteMessageFolder": "'{0}' ögesini ve içindekileri kalıcı olarak silmek istediğinizden emin misiniz?",
- 	"confirmDeleteMessageFile": "'{0}' ögesini kalıcı olarak silmek istediğinizden emin misiniz?",
- 	"addFiles": "Dosya Ekle",
-+=======
-+	"confirmMoveTrashMessageFile": "'{0}' öğesini silmek istediğinize emin misiniz?",
-+	"undoBin": "Geri Dönüşüm Kutusu'ndan geri alabilirsiniz.",
-+	"undoTrash": "Çöp Kutusu'ndan geri alabilirsiniz.",
-+	"doNotAskAgain": "Bir daha sorma",
-+	"confirmDeleteMessageMultiple": "Aşağıdaki {0} dosyayı kalıcı olarak silmek istediğinizden emin misiniz?",
-+	"confirmDeleteMessageFolder": "'{0}' öğesini ve içindekileri kalıcı olarak silmek istediğinizden emin misiniz?",
-+	"confirmDeleteMessageFile": "'{0}' öğesini kalıcı olarak silmek istediğinizden emin misiniz?",
-+	"irreversible": "Bu eylem geri döndürülemez!",
-+	"binFailed": "Geri Dönüşüm Kutusu'nu kullanarak silme başarısız oldu. Bunun yerine, kalıcı olarak silmek ister misiniz?",
-+	"trashFailed": "Çöp Kutusu'nu kullanarak silme başarısız oldu. Bunun yerine, kalıcı olarak silmek ister misiniz?",
-+	"deletePermanentlyButtonLabel": "&&Kalıcı Olarak Sil",
-+	"retryButtonLabel": "&&Yeniden Dene",
-+	"importFiles": "Dosya İçe Aktar",
-+>>>>>>> .their
- 	"confirmOverwrite": "Hedef klasörde aynı ada sahip bir dosya veya klasör zaten var. Değiştirmek istiyor musunuz?",
- 	"replaceButtonLabel": "&&Değiştir",
- 	"fileIsAncestor": "Yapıştırılacak dosya hedef klasörün atalarından biridir",
-changed in both
-  base   100644 16f13358790f3f4cd720ef8bfbf2ffbe52522a92 i18n/trk/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  our    100644 193fd22e9317327dfd29fb29331773d21ad13c21 i18n/trk/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-  their  100644 954f92a265a44220e4524edb8369049199a022e3 i18n/trk/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
-@@ -35,7 +35,11 @@
- 	"hotExit": "Oturumlar arasında kaydedilmemiş dosyaların hatırlanıp hatırlanmayacağını denetler, düzenleyiciden çıkarken kaydetmek için izin istenmesi atlanacaktır.",
- 	"useExperimentalFileWatcher": "Yeni deneysel dosya izleyicisini kullanın.",
- 	"defaultLanguage": "Yeni dosyalara atanan varsayılan dil modu.",
-+<<<<<<< .our
- 	"maxMemoryForLargeFilesMB": "Büyük dosyaları açmaya çalışırken, yeniden başlatma sonrası VS Code için mevcut olacak bellek miktarını denetler. Komut satırında belirtilen --max-memory=YENİBOYUT ile aynı etkiyi gösterir.",
-+=======
-+	"maxMemoryForLargeFilesMB": "Büyük dosyaları yeniden açarken uygulama tarafından kullanılacak MB cinsinden yeni bellek limiti. Daha yüksek bir limitle başlamak isterseniz,  komut satırından uygulamayı --max-memory=YENİBOYUT ile başlatabilirsiniz.",
-+>>>>>>> .their
- 	"editorConfigurationTitle": "Düzenleyici",
- 	"formatOnSave": "Dosyayı kaydederken biçimlendir. Bir biçimlendirici mevcut olmalıdır, dosya otomatik olarak kaydedilmemelidir, ve düzenleyici kapanmıyor olmalıdır.",
- 	"formatOnSaveTimeout": "Dosyayı kaydederken biçimlendirme zaman aşımı. formatOnSave komutlarında kullanılacak milisaniye cinsinden zaman limiti. Belirtilen zaman aşımından daha uzun süren komutlar iptal edilecektir.",
-changed in both
-  base   100644 cc968719081125fecde6c97ad5bf06ec67e1613a i18n/trk/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  our    100644 af5f75f59c7096d8e4e8c3fde1587903c351b5b4 i18n/trk/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-  their  100644 338a616735f97304c6bbe158776989f1dd5ba301 i18n/trk/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
-changed in both
-  base   100644 7fe7d2ea049a93fd479fd1d422004524a76c3507 i18n/trk/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-  our    100644 ea26bcd9db30fb1fed539aa7a66264003ccf35e0 i18n/trk/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-  their  100644 867ad5576266703e20210a278e7ef4bbbccc0e0a i18n/trk/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
-changed in both
-  base   100644 8910520ca78e8c1fc7a37371d5128094aaf4f337 i18n/trk/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-  our    100644 45e5f83680c26e10409cdc5068a3bbcee976704f i18n/trk/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-  their  100644 5f2cbbe7ebd1ac542aa81cb5a61a2db2fbe7529e i18n/trk/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
-changed in both
-  base   100644 1cd086b7e3856e04bc3aaa8757a4518e7db3ba90 i18n/trk/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  our    100644 467358d0b9f19ad682f44b3acc88d8457329d682 i18n/trk/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-  their  100644 44fd47bb134640be03ea79f2192caec7f77c270f i18n/trk/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
-@@ -6,6 +6,10 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
-+=======
-+	"keybindingsInputName": "Klavye Kısayolları",
-+>>>>>>> .their
- 	"showDefaultKeybindings": "Varsayılan Tuş Bağlarını Göster",
- 	"showUserKeybindings": "Kullanıcı Tuş Bağlarını Göster",
- 	"SearchKeybindings.AriaLabel": "Tuş bağlarını ara",
-changed in both
-  base   100644 cb483fdd910438c7a3e526dbec2c28594649e2af i18n/trk/src/vs/workbench/parts/search/browser/searchView.i18n.json
-  our    100644 fc38590cc3008cde13df29309821e754e11630d7 i18n/trk/src/vs/workbench/parts/search/browser/searchView.i18n.json
-  their  100644 21ebadacac71ed2b6b40ee08a678dc548be893bb i18n/trk/src/vs/workbench/parts/search/browser/searchView.i18n.json
-@@ -7,10 +7,16 @@
- 		"Do not edit this file. It is machine generated."
- 	],
- 	"moreSearch": "Arama Detaylarını Aç/Kapat",
-+<<<<<<< .our
- 	"searchScope.includes": "dahil edilecek dosyalar",
- 	"label.includes": "Aramaya Dahil Edilen Kalıplar",
- 	"searchScope.excludes": "hariç tutulacak klasörler",
- 	"label.excludes": "Aramada Hariç Tutulan Kalıplar",
-+=======
-+	"searchIncludeExclude.label": " dahil edilecek/hariç tutulacak dosyalar ",
-+	"searchIncludeExclude.ariaLabel": "Aramaya Dahil Edilen/Hariç Tutulan Kalıplar",
-+	"searchIncludeExclude.placeholder": "Örnekler: src, !*.ts, test/**/*.log",
-+>>>>>>> .their
- 	"replaceAll.confirmation.title": "Tümünü Değiştir",
- 	"replaceAll.confirm.button": "&&Değiştir",
- 	"replaceAll.occurrence.file.message": "{1} dosyadaki {0} tekrarlama '{2}' ile değiştirildi.",
-changed in both
-  base   100644 8a3fbfaad65dd717e9465db7bab67fe4e695f26c i18n/trk/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
-  our    100644 386f5eb3c841e670ce89c483b32c97ecbe3d511f i18n/trk/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
-  their  100644 02224d40eaff21323d7d2df513e3517e05f19687 i18n/trk/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
-changed in both
-  base   100644 5eeb3e4000b0766609ecc66df4bf8925f1a7c45e i18n/trk/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  our    100644 05f7e742aff55adb4d6b203dba58bf230a657ea7 i18n/trk/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-  their  100644 2af5738ee5a5ff5b4e93b5071ebc5725ec92ef79 i18n/trk/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
-changed in both
-  base   100644 fb23f3c189e1688d90db85a8e9432e7f2244c6ec i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  our    100644 0dfa05cd7919b2b8edd950bcde47408dafdd57f0 i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-  their  100644 422914fecd37a8bff5e609fb0bc6f312b3d7f03d i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
-@@ -54,10 +54,17 @@
- 	"nextTerminalFindTerm": "Sonraki Arama Terimini Göster",
- 	"previousTerminalFindTerm": "Önceki Arama Terimini Göster",
- 	"quickOpenTerm": "Aktif Terminali Değiştir",
-+<<<<<<< .our
- 	"workbench.action.terminal.scrollToPreviousCommand": "Önceki Komuta Kadar Kaydır",
- 	"workbench.action.terminal.scrollToNextCommand": "Sonraki Komuta Kadar Kaydır",
- 	"workbench.action.terminal.selectToPreviousCommand": "Önceki Komuta Kadar Seç",
- 	"workbench.action.terminal.selectToNextCommand": "Sonraki Komuta Kadar Seç",
- 	"workbench.action.terminal.selectToPreviousLine": "Önceki Satıra Kadar Seç",
- 	"workbench.action.terminal.selectToNextLine": "Sonraki Satıra Kadar Seç"
-+=======
-+	"workbench.action.terminal.focusPreviousCommand": "Önceki Komuta Odakla",
-+	"workbench.action.terminal.focusNextCommand": "Sonraki Komuta Odakla",
-+	"workbench.action.terminal.selectToPreviousCommand": "Önceki Komuta Kadar Seç",
-+	"workbench.action.terminal.selectToNextCommand": "Sonraki Komuta Kadar Seç"
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 35229bd66995481b7632856d508a67581e8b5c68 i18n/trk/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
-  our    100644 b0bba1118fb4b6dbafec8b76fd703c823ee8299d i18n/trk/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
-  their  100644 6fd1d3aac3edc9f672ffe824c7355cc4c8223a09 i18n/trk/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
-@@ -6,5 +6,20 @@
- 		"--------------------------------------------------------------------------------------------",
- 		"Do not edit this file. It is machine generated."
- 	],
-+<<<<<<< .our
- 	"stringsOnlySupported": "{0} komutu bir dize değeri döndürmedi. Değişken yer değiştirmesi için kullanılan komutların sonuçlarında sadece dizeler desteklenir."
-+=======
-+	"canNotResolveWorkspaceFolderMultiRoot": "Birden çok klasörlü çalışma alanında ${workspaceFolder} çözümlenemiyor. \":\" ve bir klasör adı kullanarak bu değişkenleri test edin.",
-+	"canNotResolveWorkspaceFolder": "${workspaceFolder} çözümlenemiyor. Lütfen bir klasör açın.",
-+	"canNotResolveFolderBasenameMultiRoot": "Birden çok klasörlü çalışma alanında ${workspaceFolderBasename} çözümlenemiyor. \":\" ve bir klasör adı kullanarak bu değişkenleri test edin.",
-+	"canNotResolveFolderBasename": "${workspaceFolderBasename} çözümlenemiyor. Lütfen bir klasör açın.",
-+	"canNotResolveLineNumber": "${lineNumber} çözümlenemiyor, lütfen bir düzenleyici açın.",
-+	"canNotResolveSelectedText": "${selectedText} çözümlenemiyor, lütfen bir düzenleyici açın.",
-+	"canNotResolveFile": "${file} çözümlenemiyor, lütfen bir düzenleyici açın.",
-+	"canNotResolveRelativeFile": "${relativeFile} çözümlenemiyor, lütfen bir düzenleyici açın.",
-+	"canNotResolveFileDirname": "${fileDirname} çözümlenemiyor, lütfen bir düzenleyici açın.",
-+	"canNotResolveFileExtname": "${fileExtname} çözümlenemiyor, lütfen bir düzenleyici açın.",
-+	"canNotResolveFileBasename": "${fileBasename} çözümlenemiyor, lütfen bir düzenleyici açın.",
-+	"canNotResolveFileBasenameNoExtension": "${fileBasenameNoExtension} çözümlenemiyor, lütfen bir düzenleyici açın."
-+>>>>>>> .their
- }
-\ No newline at end of file
-changed in both
-  base   100644 4d4a6d071a866ba010ed44c88a8a5e09e642402f i18n/trk/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-  our    100644 844478e0633a25883c08cf42ec5fe82e36e359ce i18n/trk/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-  their  100644 1f0b38555f6eaf87c9e87eeea8a5cb7336daa848 i18n/trk/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
-@@ -11,6 +11,7 @@
- 	"neverShowAgain": "Tekrar Gösterme",
- 	"enospcError": "{0}, bu büyük çalışma alanındaki dosya değişikliklerini izleyemiyor. Bu sorunu çözmek için lütfen yönerge bağlantısını izleyin.",
- 	"learnMore": "Talimatlar",
-+<<<<<<< .our
- 	"fileInvalidPath": "Geçersiz dosya kaynağı ({0})",
- 	"fileIsDirectoryError": "Dosya bir dizindir",
- 	"fileNotModifiedError": "Dosya şu tarihten beri değiştirilmemiş:",
-@@ -24,6 +25,9 @@
- 	"fileReadOnlyError": "Dosya Salt Okunur",
- 	"fileMoveConflict": "Taşıma/kopyalama yapılamadı. Dosya, hedefte zaten mevcut.",
- 	"unableToMoveCopyError": "Taşıma/kopyalama yapılamadı. Dosya, içinde bulunduğu klasörü değiştiriyor.",
-+=======
-+	"enospcError": "{0}, bu büyük çalışma alanındaki dosya değişikliklerini izleyemiyor. Bu sorunu çözmek için lütfen yönerge bağlantısını izleyin.",
-+>>>>>>> .their
- 	"binFailed": "'{0}' geri dönüşüm kutusuna taşınamadı",
- 	"trashFailed": "'{0}' çöpe taşınamadı"
- }
-\ No newline at end of file
-merged
-  result 100644 fec69c048e45e13c2f1f728cd0c99cb9f1283063 i18n/trk/src/vs/workbench/services/files/node/fileService.i18n.json
-  our    100644 0032045d6c15d3a28e360ab657c8ecf99dcb85dd i18n/trk/src/vs/workbench/services/files/node/fileService.i18n.json
-@@ -9,6 +9,7 @@
- 	"fileInvalidPath": "Geçersiz dosya kaynağı ({0})",
- 	"fileIsDirectoryError": "Dosya bir dizindir",
- 	"fileNotModifiedError": "Dosya şu tarihten beri değiştirilmemiş:",
-+	"fileTooLargeForHeapError": "Dosya boyutu varsayılan bellek limitini aşıyor. Daha yüksek bir limitle yeniden başlatın. Şu anki ayar {0}MB ile yeniden başlatmaya yapılandırılmış",
- 	"fileTooLargeError": "Dosya, açmak için çok büyük",
- 	"fileNotFoundError": "Dosya bulunamadı ({0})",
- 	"fileBinaryError": "Dosya ikili olarak görünüyor ve metin olarak açılamıyor",
-changed in both
-  base   100644 df63c933295cc63acf9e5d785cfd90cffc955f88 i18n/trk/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
-  our    100644 41fb3455077e458ed30319d7ad69c1830105fa99 i18n/trk/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
-  their  100644 7c19d60efdecc0a25649f8c7b4721aa673ba80aa i18n/trk/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
-changed in both
-  base   100644 db98c8793dd0c9319efd5a26273986cd7c8afd0a package.json
-  our    100644 d0e982ce0b76c5b1b5eb02b673e459e47f3353a4 package.json
-  their  100644 b4208c639cc2ed22eb41049cb2cc7199f6323b98 package.json
-@@ -1,7 +1,12 @@
- {
-   "name": "code-oss-dev",
-+<<<<<<< .our
-   "version": "1.27.0",
-   "distro": "a4155d9780fbbc94ead6cb3017dd0fc3806c57b8",
-+=======
-+  "version": "1.22.1",
-+  "distro": "ed36a29ddadc357cdceba6ff5e3e7d5e27893dee",
-+>>>>>>> .their
-   "author": {
-     "name": "Microsoft Corporation"
-   },
-changed in both
-  base   100644 7a5b9af1249497113e74126dfbb1edb8ce167db9 src/vs/base/browser/dom.ts
-  our    100644 55d7a57ba6a391c964d03038ed5c842483b5d1f7 src/vs/base/browser/dom.ts
-  their  100644 12118262491b82ab90c0bbc56130eb9d93a92fbc src/vs/base/browser/dom.ts
-changed in both
-  base   100644 cda6b71cc41ad6153e60ad6b72a4314593665381 src/vs/base/browser/ui/actionbar/actionbar.ts
-  our    100644 0dc7a39304b16126c69b25b0abb4a2effaab717d src/vs/base/browser/ui/actionbar/actionbar.ts
-  their  100644 7d00e10117f235d0be562692fea03a9c73890314 src/vs/base/browser/ui/actionbar/actionbar.ts
-changed in both
-  base   100644 4e98c088bc9e3c978bfdb7bf0ab74b75cfc4bf27 src/vs/base/common/platform.ts
-  our    100644 277929ed5d02284c4e3e3de3c755086c00b03837 src/vs/base/common/platform.ts
-  their  100644 0bb890d29bfca60223b3b2cfe1f1aadd7da2607b src/vs/base/common/platform.ts
-changed in both
-  base   100644 2b6483ae28ba746c859a920680a47b6c70763af1 src/vs/base/common/winjs.polyfill.promise.ts
-  our    100644 e1e094d65211ebb33beb3f52772f5ea248dabc10 src/vs/base/common/winjs.polyfill.promise.ts
-  their  100644 83004958144764a91922028a0e6fbf11d5a651bd src/vs/base/common/winjs.polyfill.promise.ts
-@@ -5,7 +5,10 @@
- 
- import { Promise as WinJSPromise } from './winjs.base';
- import * as platform from 'vs/base/common/platform';
-+<<<<<<< .our
- import { isWinJSPromise } from 'vs/base/common/async';
-+=======
-+>>>>>>> .their
- 
- /**
-  * A polyfill for the native promises. The implementation is based on
-@@ -83,7 +86,11 @@
- 				if (!sync) {
- 					onRejected(err);
- 				} else {
-+<<<<<<< .our
- 					platform.setImmediate(() => onRejected(err));
-+=======
-+					platform.setImmediate(() => onFulfilled(err));
-+>>>>>>> .their
- 				}
- 			}
- 		));
-changed in both
-  base   100644 d89a9095a7b0d98704222dcd1e9cc6ca067f5be3 src/vs/editor/browser/config/configuration.ts
-  our    100644 f83aefc512542c5e5f6fc79243d63db960977013 src/vs/editor/browser/config/configuration.ts
-  their  100644 2a890239887a418fb752379293462f87e0935ac7 src/vs/editor/browser/config/configuration.ts
-changed in both
-  base   100644 a46cc9540118069dd180ee9d6edc93da44618c27 src/vs/editor/browser/widget/codeEditorWidget.ts
-  our    100644 6f588e16445e2740e0f36730ce132f1ff91e44d8 src/vs/editor/browser/widget/codeEditorWidget.ts
-  their  100644 7192a5a2c999143b0bd3b8289f9063fdb6d0cba2 src/vs/editor/browser/widget/codeEditorWidget.ts
-@@ -924,6 +924,7 @@
- 		this.cursor.trigger(source, handlerId, payload);
- 	}
- 
-+<<<<<<< .our
- 	private _triggerEditorCommand(source: string, handlerId: string, payload: any): boolean {
- 		const command = EditorExtensionsRegistry.getEditorCommand(handlerId);
- 		if (command) {
-@@ -935,6 +936,12 @@
- 
- 		return false;
- 	}
-+=======
-+		this._focusTracker = new CodeEditorWidgetFocusTracker(domElement);
-+		this._focusTracker.onChange(() => {
-+			this._editorFocus.setValue(this._focusTracker.hasFocus());
-+		});
-+>>>>>>> .their
- 
- 	public _getCursors(): ICursors {
- 		return this.cursor;
-@@ -1438,7 +1445,11 @@
- 		viewEventBus.onDidGainFocus = () => {
- 			this._editorTextFocus.setValue(true);
- 			// In IE, the focus is not synchronous, so we give it a little help
-+<<<<<<< .our
- 			this._editorWidgetFocus.setValue(true);
-+=======
-+			this._editorFocus.setValue(true);
-+>>>>>>> .their
- 		};
- 
- 		viewEventBus.onDidScroll = (e) => this._onDidScrollChange.fire(e);
-removed in local
-  base   100644 b9c9ca1a3c9a7c6daf0e20c4fe22d4be25a74f50 src/vs/editor/common/commonCodeEditor.ts
-  their  100644 7424170f20c284dd754c7fe2eb204976614910ab src/vs/editor/common/commonCodeEditor.ts
-changed in both
-  base   100644 041cf88e4d6f7647e57141925c76a4b0293db8e2 src/vs/editor/common/services/modelServiceImpl.ts
-  our    100644 1a1202dde3c4f6f0ea6c3ead333eb6957cfba556 src/vs/editor/common/services/modelServiceImpl.ts
-  their  100644 066b91472d60cf0c04af76e815ef4b4ed902238a src/vs/editor/common/services/modelServiceImpl.ts
-@@ -86,12 +86,18 @@
- 
- 		let ret = Range.lift(rawMarker);
- 
-+<<<<<<< .our
- 		if (rawMarker.severity === MarkerSeverity.Hint) {
- 			// * never render hints on multiple lines
- 			// * make enough space for three dots
- 			if (Range.spansMultipleLines(ret) || ret.endColumn - ret.startColumn < 2) {
- 				ret = ret.setEndPosition(ret.startLineNumber, ret.startColumn + 2);
- 			}
-+=======
-+		if (rawMarker.severity === MarkerSeverity.Hint && Range.spansMultipleLines(ret)) {
-+			// never render hints on multiple lines
-+			ret = ret.setEndPosition(ret.startLineNumber, ret.startColumn);
-+>>>>>>> .their
- 		}
- 
- 		ret = model.validateRange(ret);
-changed in both
-  base   100644 2bd89430b41573ceb6da511e165c4cdd9abb959e src/vs/editor/contrib/colorPicker/colorPickerWidget.ts
-  our    100644 5e462f6d9d463a609fd5d9f519eb8fa82b247328 src/vs/editor/contrib/colorPicker/colorPickerWidget.ts
-  their  100644 5a8f2a463a7ad66583932dd4919814119ce1b613 src/vs/editor/contrib/colorPicker/colorPickerWidget.ts
-changed in both
-  base   100644 199089b43bdffe8f8b223651e2a02c7349d10b1c src/vs/editor/contrib/folding/folding.ts
-  our    100644 520ad0ac57dad552f186000fca1b8457e0771fd8 src/vs/editor/contrib/folding/folding.ts
-  their  100644 e4237e2afd6aa30936f865d4182703d53996ac18 src/vs/editor/contrib/folding/folding.ts
-removed in local
-  base   100644 52f8d0c428ae0c2090a2c3d2668fe7ecffdca04f src/vs/editor/contrib/format/formatCommand.ts
-  their  100644 5b38129e3aef1298da6ebcd124489e252ca9dcdd src/vs/editor/contrib/format/formatCommand.ts
-removed in local
-  base   100644 048b9c35b690d074bb24a2249e63f3665e032bc7 src/vs/editor/contrib/format/test/formatCommand.test.ts
-  their  100644 0a9bbde45932ab9e9cd76e1dbb3c32d47bfa087a src/vs/editor/contrib/format/test/formatCommand.test.ts
-changed in both
-  base   100644 abab5279934aad60f64aab5473876da58283f6fe src/vs/editor/contrib/hover/hover.ts
-  our    100644 cfef3c6c71968cc402174825fb4d8c5df0296cfd src/vs/editor/contrib/hover/hover.ts
-  their  100644 940bd118e3dba63307610b7dfa53cbb995981a62 src/vs/editor/contrib/hover/hover.ts
-changed in both
-  base   100644 186c999c232da91314bfaeff1d548220af8bfd51 src/vs/editor/contrib/hover/modesContentHover.ts
-  our    100644 071469c7a18645be06488529ac906bfd2f494be9 src/vs/editor/contrib/hover/modesContentHover.ts
-  their  100644 36b6e611927d341e75397db6a82f45523f2084af src/vs/editor/contrib/hover/modesContentHover.ts
-@@ -23,7 +23,10 @@
- import { IDisposable, Disposable, combinedDisposable } from 'vs/base/common/lifecycle';
- import { getColorPresentations } from 'vs/editor/contrib/colorPicker/color';
- import { IThemeService } from 'vs/platform/theme/common/themeService';
-+<<<<<<< .our
- import { CancellationToken } from 'vs/base/common/cancellation';
-+=======
-+>>>>>>> .their
- const $ = dom.$;
- 
- class ColorHover {
-@@ -171,7 +174,11 @@
- 
- 	constructor(
- 		editor: ICodeEditor,
-+<<<<<<< .our
- 		markdownRenderer: MarkdownRenderer,
-+=======
-+		markdownRenderner: MarkdownRenderer,
-+>>>>>>> .their
- 		private readonly _themeService: IThemeService
- 	) {
- 		super(ModesContentHoverWidget.ID, editor);
-changed in both
-  base   100644 88079826a6db39c3dcd35b56133ec9045f7468f7 src/vs/editor/contrib/referenceSearch/referencesController.ts
-  our    100644 32b8746b7685a87cedfbc993ead916284c3e30f7 src/vs/editor/contrib/referenceSearch/referencesController.ts
-  their  100644 a17fc01643d6f4fd35563efba4b922f1c444f816 src/vs/editor/contrib/referenceSearch/referencesController.ts
-@@ -98,7 +98,11 @@
- 		}));
- 		const storageKey = 'peekViewLayout';
- 		const data = <LayoutData>JSON.parse(this._storageService.get(storageKey, undefined, '{}'));
-+<<<<<<< .our
- 		this._widget = this._instantiationService.createInstance(ReferenceWidget, this._editor, this._defaultTreeKeyboardSupport, data);
-+=======
-+		this._widget = new ReferenceWidget(this._editor, this._defaultTreeKeyboardSupport, data, this._textModelResolverService, this._contextService, this._themeService, this._instantiationService, this._environmentService);
-+>>>>>>> .their
- 		this._widget.setTitle(nls.localize('labelLoading', "Loading..."));
- 		this._widget.show(range);
- 		this._disposables.push(this._widget.onDidClose(() => {
-changed in both
-  base   100644 edf3327d480d215d050f9ac31c89f752729b30c8 src/vs/editor/contrib/referenceSearch/referencesWidget.ts
-  our    100644 da6bf29eb682cbe5a76c036b19302efcdf240f36 src/vs/editor/contrib/referenceSearch/referencesWidget.ts
-  their  100644 3ad55e67dfb014f476b8b7a2664b98b3a8309723 src/vs/editor/contrib/referenceSearch/referencesWidget.ts
-@@ -629,7 +629,11 @@
- 
- 		// tree
- 		container.div({ 'class': 'ref-tree inline' }, (div: Builder) => {
-+<<<<<<< .our
- 			let controller = this._instantiationService.createInstance(Controller, { keyboardSupport: this._defaultTreeKeyboardSupport, clickBehavior: ClickBehavior.ON_MOUSE_UP /* our controller already deals with this */ });
-+=======
-+			var controller = this._instantiationService.createInstance(Controller, { keyboardSupport: this._defaultTreeKeyboardSupport, clickBehavior: ClickBehavior.ON_MOUSE_UP /* our controller already deals with this */ });
-+>>>>>>> .their
- 			this._callOnDispose.push(controller);
- 
- 			let config = <tree.ITreeConfiguration>{
-@@ -703,7 +707,11 @@
- 		this._preview.layout();
- 	}
- 
-+<<<<<<< .our
- 	public setSelection(selection: OneReference): Promise<any> {
-+=======
-+	public setSelection(selection: OneReference): TPromise<any> {
-+>>>>>>> .their
- 		return this._revealReference(selection, true).then(() => {
- 
- 			// show in tree
-@@ -774,7 +782,11 @@
- 		return undefined;
- 	}
- 
-+<<<<<<< .our
- 	private async _revealReference(reference: OneReference, revealParent: boolean): Promise<void> {
-+=======
-+	private async _revealReference(reference: OneReference, revealParent: boolean): TPromise<void> {
-+>>>>>>> .their
- 
- 		// Update widget header
- 		if (reference.uri.scheme !== Schemas.inMemory) {
-changed in both
-  base   100644 cf433d3dc8a0661f3a771e7f7206cc9f226a5d40 src/vs/editor/contrib/suggest/suggestWidget.ts
-  our    100644 a221be2731d33b2c0a5d84d119cac0233b76a147 src/vs/editor/contrib/suggest/suggestWidget.ts
-  their  100644 de265df494f8e43bcf54a80f065bf13f3b85747b src/vs/editor/contrib/suggest/suggestWidget.ts
-@@ -179,6 +179,12 @@
- 	}
- 
- 	disposeTemplate(templateData: ISuggestionTemplateData): void {
-+<<<<<<< .our
-+=======
-+		if (templateData.highlightedLabel) {
-+			templateData.highlightedLabel.dispose();
-+		}
-+>>>>>>> .their
- 		templateData.disposables = dispose(templateData.disposables);
- 	}
- }
-added in both
-  our    100644 3259edf4f8807d3a7e0a1fa2e63b243c1ffc8847 src/vs/editor/standalone/browser/referenceSearch/standaloneReferenceSearch.ts
-  their  100644 4886fd86e1b1b9add65b652eec255d59c89d861c src/vs/editor/standalone/browser/referenceSearch/standaloneReferenceSearch.ts
-@@ -4,6 +4,7 @@
-  *--------------------------------------------------------------------------------------------*/
- 'use strict';
- 
-+<<<<<<< .our
- import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
- import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
- import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-@@ -11,6 +12,19 @@
- import { IStorageService } from 'vs/platform/storage/common/storage';
- import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
- import { registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-+=======
-+import { IEditorService } from 'vs/platform/editor/common/editor';
-+import { IInstantiationService, optional } from 'vs/platform/instantiation/common/instantiation';
-+import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-+import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-+import { IStorageService } from 'vs/platform/storage/common/storage';
-+import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-+import { registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-+import { ITextModelService } from 'vs/editor/common/services/resolverService';
-+import { IThemeService } from 'vs/platform/theme/common/themeService';
-+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-+>>>>>>> .their
- import { INotificationService } from 'vs/platform/notification/common/notification';
- import { ReferencesController } from 'vs/editor/contrib/referenceSearch/referencesController';
- 
-@@ -19,21 +33,44 @@
- 	public constructor(
- 		editor: ICodeEditor,
- 		@IContextKeyService contextKeyService: IContextKeyService,
-+<<<<<<< .our
- 		@ICodeEditorService editorService: ICodeEditorService,
- 		@INotificationService notificationService: INotificationService,
- 		@IInstantiationService instantiationService: IInstantiationService,
- 		@IStorageService storageService: IStorageService,
- 		@IConfigurationService configurationService: IConfigurationService,
-+=======
-+		@IEditorService editorService: IEditorService,
-+		@ITextModelService textModelResolverService: ITextModelService,
-+		@INotificationService notificationService: INotificationService,
-+		@IInstantiationService instantiationService: IInstantiationService,
-+		@IWorkspaceContextService contextService: IWorkspaceContextService,
-+		@IStorageService storageService: IStorageService,
-+		@IThemeService themeService: IThemeService,
-+		@IConfigurationService configurationService: IConfigurationService,
-+		@optional(IEnvironmentService) environmentService: IEnvironmentService
-+>>>>>>> .their
- 	) {
- 		super(
- 			true,
- 			editor,
- 			contextKeyService,
- 			editorService,
-+<<<<<<< .our
-+			notificationService,
-+			instantiationService,
-+			storageService,
-+			configurationService,
-+=======
-+			textModelResolverService,
- 			notificationService,
- 			instantiationService,
-+			contextService,
- 			storageService,
-+			themeService,
- 			configurationService,
-+			environmentService
-+>>>>>>> .their
- 		);
- 	}
- }
-changed in both
-  base   100644 c84ca2cf87dfb199802a59e6db81046124666f3b src/vs/editor/standalone/browser/standaloneServices.ts
-  our    100644 d20dc25b60e240a7a8b6703b158753e12dd5c6f5 src/vs/editor/standalone/browser/standaloneServices.ts
-  their  100644 b1086e4283396ce39300e7a8f536f00cce3c5bf0 src/vs/editor/standalone/browser/standaloneServices.ts
-@@ -43,8 +43,16 @@
- import { INotificationService } from 'vs/platform/notification/common/notification';
- import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
- import { IListService, ListService } from 'vs/platform/list/browser/listService';
-+<<<<<<< .our
- import { IBulkEditService } from 'vs/editor/browser/services/bulkEditService';
- import { IUriLabelService } from 'vs/platform/uriLabel/common/uriLabel';
-+=======
-+
-+export interface IEditorContextViewService extends IContextViewService {
-+	dispose(): void;
-+	setContainer(domNode: HTMLElement): void;
-+}
-+>>>>>>> .their
- 
- export interface IEditorOverrideServices {
- 	[index: string]: any;
-changed in both
-  base   100644 ac6b4972b71c1912f0f7f9ca807195efa14ce26c src/vs/platform/extensionManagement/node/extensionManagementService.ts
-  our    100644 fca1b8fcc1eedca233bd95ef59ad6d0d3904e895 src/vs/platform/extensionManagement/node/extensionManagementService.ts
-  their  100644 f13a2deb9636d52eb1ecbf9b3c11c5311487a8bc src/vs/platform/extensionManagement/node/extensionManagementService.ts
-@@ -384,8 +384,13 @@
- 	private extractAndInstall({ zipPath, id, metadata }: InstallableExtension): TPromise<ILocalExtension> {
- 		const tempPath = path.join(this.extensionsPath, `.${id}`);
- 		const extensionPath = path.join(this.extensionsPath, id);
-+<<<<<<< .our
- 		return pfs.rimraf(extensionPath)
- 			.then(() => this.extractAndRename(id, zipPath, tempPath, extensionPath), e => TPromise.wrapError(new ExtensionManagementError(nls.localize('errorDeleting', "Unable to delete the existing folder '{0}' while installing the extension '{1}'. Please delete the folder manually and try again", extensionPath, id), INSTALL_ERROR_DELETING)))
-+=======
-+		return this.extractAndRename(id, zipPath, tempPath, extensionPath)
-+			.then(null, error => this.isWindowsEPERMError(error) ? this.extract(id, zipPath, extensionPath) : TPromise.wrapError(error))
-+>>>>>>> .their
- 			.then(() => {
- 				this.logService.info('Installation completed.', id);
- 				return this.scanExtension(id, this.extensionsPath, LocalExtensionType.User);
-@@ -424,6 +429,7 @@
- 
- 	private rename(id: string, extractPath: string, renamePath: string, retryUntil: number): TPromise<void> {
- 		return pfs.rename(extractPath, renamePath)
-+<<<<<<< .our
- 			.then(null, error => {
- 				if (isWindows && error && error.code === 'EPERM' && Date.now() < retryUntil) {
- 					this.logService.info(`Failed renaming ${extractPath} to ${renamePath} with 'EPERM' error. Trying again...`);
-@@ -464,6 +470,17 @@
- 			}
- 		}
- 		return TPromise.as(null);
-+=======
-+			.then(null, error =>
-+				this.isWindowsEPERMError(error) && Date.now() < retryUntil
-+					? this.rename(id, extractPath, renamePath, retryUntil)
-+					: TPromise.wrapError(error)
-+			);
-+>>>>>>> .their
-+	}
-+
-+	private isWindowsEPERMError(error: any): boolean {
-+		return isWindows && error && error.code === 'EPERM';
- 	}
- 
- 	private rollback(extensions: IGalleryExtension[]): TPromise<void> {
-changed in both
-  base   100644 abc5a96d2076991b93d4960c521a95d2224279e6 src/vs/platform/telemetry/browser/errorTelemetry.ts
-  our    100644 ec06e2c07eef85a9dbde991083fba2510c62b26e src/vs/platform/telemetry/browser/errorTelemetry.ts
-  their  100644 3bab84d8bf7003077c2ef85a5d6d8c2b08b50ee5 src/vs/platform/telemetry/browser/errorTelemetry.ts
-@@ -166,7 +166,11 @@
- 					"${include}": [ "${ErrorEvent}" ]
- 				}
- 			*/
-+<<<<<<< .our
- 			this._telemetryService.publicLog('UnhandledError', error, true);
-+=======
-+			this._telemetryService.publicLog('UnhandledError', error);
-+>>>>>>> .their
- 		}
- 		this._buffer.length = 0;
- 	}
-changed in both
-  base   100644 2f713dd11afd838f175e65dda414663afeeee7e0 src/vs/platform/telemetry/common/telemetryService.ts
-  our    100644 72b7d8569304a3402360a8093d77957eb22d39c3 src/vs/platform/telemetry/common/telemetryService.ts
-  their  100644 992f3e36a96256df40864f40ac1337c8658e451f src/vs/platform/telemetry/common/telemetryService.ts
-@@ -140,10 +140,28 @@
- 				if (!result) {
- 					break;
- 				}
-+<<<<<<< .our
- 				// Anoynimize user file paths that do not need to be retained or cleaned up.
- 				if (!nodeModulesRegex.test(result[0]) && cleanUpIndexes.every(([x, y]) => result.index < x || result.index >= y)) {
- 					updatedStack = updatedStack.slice(0, result.index) + result[0].replace(/./g, 'a') + updatedStack.slice(fileRegex.lastIndex);
- 				}
-+=======
-+				cleanUpIndexes.push([result.index, regexp.lastIndex]);
-+			}
-+		}
-+
-+		const nodeModulesRegex = /^[\\\/]?(node_modules|node_modules\.asar)[\\\/]/;
-+		const fileRegex = /(file:\/\/)?([a-zA-Z]:(\\\\|\\|\/)|(\\\\|\\|\/))?([\w-\._]+(\\\\|\\|\/))+[\w-\._]*/g;
-+		let updatedStack = stack;
-+		while (true) {
-+			const result = fileRegex.exec(stack);
-+			if (!result) {
-+				break;
-+			}
-+			// Anoynimize user file paths that do not need to be retained or cleaned up.
-+			if (!nodeModulesRegex.test(result[0]) && cleanUpIndexes.every(([x, y]) => result.index < x || result.index >= y)) {
-+				updatedStack = updatedStack.slice(0, result.index) + result[0].replace(/./g, 'a') + updatedStack.slice(fileRegex.lastIndex);
-+>>>>>>> .their
- 			}
- 		}
- 
-changed in both
-  base   100644 d3062bc7ff2c02a0fd4175e101d8494c5dd6d71a src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts
-  our    100644 8cd91f0803bf07a93c03212bd1183b3d09b5419f src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts
-  their  100644 d0b935f401d53add6e492edc9d1ebe3bbae525b0 src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts
-@@ -457,6 +457,7 @@
- 		assert.equal(testAppender.events[0].data.callstack.indexOf(settings.filePrefix), -1);
- 		assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.stack[4].replace(settings.randomUserFile, settings.anonymizedRandomUserFile)), -1);
- 		assert.equal(testAppender.events[0].data.callstack.split('\n').length, settings.stack.length);
-+<<<<<<< .our
- 
- 		errorTelemetry.dispose();
- 		service.dispose();
-@@ -512,11 +513,71 @@
- 		assert.notEqual(testAppender.events[0].data.callstack.indexOf('(' + settings.nodeModulePathToRetain), -1);
- 		assert.notEqual(testAppender.events[0].data.callstack.indexOf('(/' + settings.nodeModuleAsarPathToRetain), -1);
- 		assert.notEqual(testAppender.events[0].data.callstack.indexOf('(/' + settings.nodeModulePathToRetain), -1);
-+=======
-+>>>>>>> .their
- 
- 		errorTelemetry.dispose();
- 		service.dispose();
- 	}));
- 
-+<<<<<<< .our
-+=======
-+	test('Unexpected Error Telemetry removes PII but preserves Code file path with node modules', sinon.test(function (this: any) {
-+
-+		let origErrorHandler = Errors.errorHandler.getUnexpectedErrorHandler();
-+		Errors.setUnexpectedErrorHandler(() => { });
-+
-+		try {
-+			let settings = new ErrorTestingSettings();
-+			let testAppender = new TestTelemetryAppender();
-+			let service = new TelemetryService({ appender: testAppender }, undefined);
-+			const errorTelemetry = new ErrorTelemetry(service);
-+
-+			let dangerousPathWithImportantInfoError: any = new Error(settings.dangerousPathWithImportantInfo);
-+			dangerousPathWithImportantInfoError.stack = settings.stack;
-+
-+
-+			Errors.onUnexpectedError(dangerousPathWithImportantInfoError);
-+			this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
-+
-+			assert.notEqual(testAppender.events[0].data.callstack.indexOf('(' + settings.nodeModuleAsarPathToRetain), -1);
-+			assert.notEqual(testAppender.events[0].data.callstack.indexOf('(' + settings.nodeModulePathToRetain), -1);
-+			assert.notEqual(testAppender.events[0].data.callstack.indexOf('(/' + settings.nodeModuleAsarPathToRetain), -1);
-+			assert.notEqual(testAppender.events[0].data.callstack.indexOf('(/' + settings.nodeModulePathToRetain), -1);
-+
-+			errorTelemetry.dispose();
-+			service.dispose();
-+		}
-+		finally {
-+			Errors.setUnexpectedErrorHandler(origErrorHandler);
-+		}
-+	}));
-+
-+	test('Uncaught Error Telemetry removes PII but preserves Code file path', sinon.test(function (this: any) {
-+		let errorStub = sinon.stub();
-+		window.onerror = errorStub;
-+		let settings = new ErrorTestingSettings();
-+		let testAppender = new TestTelemetryAppender();
-+		let service = new TelemetryService({ appender: testAppender }, undefined);
-+		const errorTelemetry = new ErrorTelemetry(service);
-+
-+		let dangerousPathWithImportantInfoError: any = new Error('dangerousPathWithImportantInfo');
-+		dangerousPathWithImportantInfoError.stack = settings.stack;
-+		(<any>window.onerror)(settings.dangerousPathWithImportantInfo, 'test.js', 2, 42, dangerousPathWithImportantInfoError);
-+		this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
-+
-+		assert.equal(errorStub.callCount, 1);
-+
-+		assert.notEqual(testAppender.events[0].data.callstack.indexOf('(' + settings.nodeModuleAsarPathToRetain), -1);
-+		assert.notEqual(testAppender.events[0].data.callstack.indexOf('(' + settings.nodeModulePathToRetain), -1);
-+		assert.notEqual(testAppender.events[0].data.callstack.indexOf('(/' + settings.nodeModuleAsarPathToRetain), -1);
-+		assert.notEqual(testAppender.events[0].data.callstack.indexOf('(/' + settings.nodeModulePathToRetain), -1);
-+
-+		errorTelemetry.dispose();
-+		service.dispose();
-+	}));
-+
-+>>>>>>> .their
- 
- 	test('Unexpected Error Telemetry removes PII but preserves Code file path when PIIPath is configured', sinon.test(function (this: any) {
- 
-changed in both
-  base   100644 243d44f73e58a39a5133ab03a258fa9481712ad5 src/vs/vscode.d.ts
-  our    100644 6000b0300db361418bc31c0585263a9d663705f5 src/vs/vscode.d.ts
-  their  100644 c841a93202a9204f7a19cf908489941bec7bd2d7 src/vs/vscode.d.ts
-changed in both
-  base   100644 b9d2e6ba55d49b8cb69bcf701480311fb4cb9860 src/vs/workbench/api/node/extHostApiCommands.ts
-  our    100644 46087963ddabb1b6d766fe142aef0e6cd0b577a2 src/vs/workbench/api/node/extHostApiCommands.ts
-  their  100644 75176b1ad5e54151a76f38a0c6f1ee852aa3897f src/vs/workbench/api/node/extHostApiCommands.ts
-@@ -263,7 +263,7 @@
- 	// --- command impl
- 
- 	private _register(id: string, handler: (...args: any[]) => any, description?: ICommandHandlerDescription): void {
--		let disposable = this._commands.registerCommand(false, id, handler, this, description);
-+		let disposable = this._commands.registerCommand(true, id, handler, this, description);
- 		this._disposables.push(disposable);
- 	}
- 
-changed in both
-  base   100644 b6ddcfa97a032f2277ee04d731bf5949bce70d2a src/vs/workbench/api/node/extHostTreeViews.ts
-  our    100644 811fc4b464b2bd349271799d4eb443aa81870399 src/vs/workbench/api/node/extHostTreeViews.ts
-  their  100644 9cadef9110132a767d2bd64015e87be3daa0e845 src/vs/workbench/api/node/extHostTreeViews.ts
-@@ -399,7 +399,11 @@
- 		return item;
- 	}
- 
-+<<<<<<< .our
- 	private createHandle(element: T, { id, label, resourceUri }: vscode.TreeItem, parent: TreeNode, returnFirst?: boolean): TreeItemHandle {
-+=======
-+	private createHandle(element: T, { id, label, resourceUri }: vscode.TreeItem, parent: TreeNode, first?: boolean): TreeItemHandle {
-+>>>>>>> .their
- 		if (id) {
- 			return `${ExtHostTreeView.ID_HANDLE_PREFIX}/${id}`;
- 		}
-@@ -410,6 +414,7 @@
- 		const existingHandle = this.nodes.has(element) ? this.nodes.get(element).item.handle : void 0;
- 		const childrenNodes = (this.getChildrenNodes(parent) || []);
- 
-+<<<<<<< .our
- 		let handle: TreeItemHandle;
- 		let counter = 0;
- 		do {
-@@ -419,6 +424,12 @@
- 				// Return if handle does not exist or
- 				// Return if handle is being reused
- 				break;
-+=======
-+		for (let counter = 0; counter <= childrenNodes.length; counter++) {
-+			const handle = `${prefix}/${counter}:${elementId}`;
-+			if (first || !this.elements.has(handle) || existingHandle === handle) {
-+				return handle;
-+>>>>>>> .their
- 			}
- 			counter++;
- 		} while (counter <= childrenNodes.length);
-changed in both
-  base   100644 c980d5e8c9686e5da3f7ac354b5bf6ba864a315c src/vs/workbench/browser/parts/quickinput/quickInput.ts
-  our    100644 d834bd59460d51375417fd865daeb856b353a144 src/vs/workbench/browser/parts/quickinput/quickInput.ts
-  their  100644 23478edf3fea0809fedec978e15d8067294ff691 src/vs/workbench/browser/parts/quickinput/quickInput.ts
-@@ -909,10 +909,15 @@
- 		this._register(list.onLeave(() => {
- 			// Defer to avoid the input field reacting to the triggering key.
- 			setTimeout(() => {
-+<<<<<<< .our
- 				inputBox.setFocus();
- 				if (this.controller instanceof QuickPick && this.controller.canSelectMany) {
- 					list.clearFocus();
- 				}
-+=======
-+				this.inputBox.setFocus();
-+				this.checkboxList.clearFocus();
-+>>>>>>> .their
- 			}, 0);
- 		}));
- 
-removed in local
-  base   100644 d394f9fa10882df1b5ddf83522317d732eee1937 src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
-  their  100644 fa0763bf1aff8786c222979271dfeb95df9057a5 src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
-changed in both
-  base   100644 ea00cf01d7ef299caef7330f4a110eda89668112 src/vs/workbench/parts/codeEditor/codeEditor.contribution.ts
-  our    100644 d66877173a11e6363e68df153c77b1db5a3da12b src/vs/workbench/parts/codeEditor/codeEditor.contribution.ts
-  their  100644 96f5b32b7f0241d0b63a2d0a3c9994fe58125335 src/vs/workbench/parts/codeEditor/codeEditor.contribution.ts
-added in both
-  our    100644 260c669fa73b734bf654826cf66d5ff69b6ec1dd src/vs/workbench/parts/codeEditor/electron-browser/workbenchReferenceSearch.ts
-  their  100644 ef42c2def1f546ddb7102714ff18dfbbbcb09cac src/vs/workbench/parts/codeEditor/electron-browser/workbenchReferenceSearch.ts
-@@ -4,6 +4,7 @@
-  *--------------------------------------------------------------------------------------------*/
- 'use strict';
- 
-+<<<<<<< .our
- import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
- import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
- import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-@@ -13,27 +14,65 @@
- import { INotificationService } from 'vs/platform/notification/common/notification';
- import { ReferencesController } from 'vs/editor/contrib/referenceSearch/referencesController';
- import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-+=======
-+import { IEditorService } from 'vs/platform/editor/common/editor';
-+import { IInstantiationService, optional } from 'vs/platform/instantiation/common/instantiation';
-+import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-+import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-+import { IStorageService } from 'vs/platform/storage/common/storage';
-+import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-+import { registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-+import { ITextModelService } from 'vs/editor/common/services/resolverService';
-+import { IThemeService } from 'vs/platform/theme/common/themeService';
-+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-+import { INotificationService } from 'vs/platform/notification/common/notification';
-+import { ReferencesController } from 'vs/editor/contrib/referenceSearch/referencesController';
-+>>>>>>> .their
- 
- export class WorkbenchReferencesController extends ReferencesController {
- 
- 	public constructor(
- 		editor: ICodeEditor,
- 		@IContextKeyService contextKeyService: IContextKeyService,
-+<<<<<<< .our
- 		@ICodeEditorService editorService: ICodeEditorService,
- 		@INotificationService notificationService: INotificationService,
- 		@IInstantiationService instantiationService: IInstantiationService,
- 		@IStorageService storageService: IStorageService,
- 		@IConfigurationService configurationService: IConfigurationService,
-+=======
-+		@IEditorService editorService: IEditorService,
-+		@ITextModelService textModelResolverService: ITextModelService,
-+		@INotificationService notificationService: INotificationService,
-+		@IInstantiationService instantiationService: IInstantiationService,
-+		@IWorkspaceContextService contextService: IWorkspaceContextService,
-+		@IStorageService storageService: IStorageService,
-+		@IThemeService themeService: IThemeService,
-+		@IConfigurationService configurationService: IConfigurationService,
-+		@optional(IEnvironmentService) environmentService: IEnvironmentService
-+>>>>>>> .their
- 	) {
- 		super(
- 			false,
- 			editor,
- 			contextKeyService,
- 			editorService,
-+<<<<<<< .our
-+			notificationService,
-+			instantiationService,
-+			storageService,
-+			configurationService,
-+=======
-+			textModelResolverService,
- 			notificationService,
- 			instantiationService,
-+			contextService,
- 			storageService,
-+			themeService,
- 			configurationService,
-+			environmentService
-+>>>>>>> .their
- 		);
- 	}
- }
-changed in both
-  base   100644 18cc9b3fe5b8b7808e85343d0e7e39ed8e73cc05 src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
-  our    100644 fe86cf067fdb869c9299c0bb05b084d8e7d78667 src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
-  their  100644 1b0b0af9e0f4fc578cf31090e6be4a15ee32b92c src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
-@@ -10,7 +10,6 @@
- import { SelectBox } from 'vs/base/browser/ui/selectBox/selectBox';
- import * as lifecycle from 'vs/base/common/lifecycle';
- import * as dom from 'vs/base/browser/dom';
--import { Position } from 'vs/editor/common/core/position';
- import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
- import { ZoneWidget } from 'vs/editor/contrib/zoneWidget/zoneWidget';
- import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
-@@ -23,10 +22,13 @@
- import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
- import { IModelService } from 'vs/editor/common/services/modelService';
- import uri from 'vs/base/common/uri';
-+<<<<<<< .our
- import { SuggestRegistry, ISuggestResult, SuggestContext } from 'vs/editor/common/modes';
- import { CancellationToken } from 'vs/base/common/cancellation';
- import { ITextModel } from 'vs/editor/common/model';
- import { provideSuggestionItems } from 'vs/editor/contrib/suggest/suggest';
-+=======
-+>>>>>>> .their
- import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
- import { transparent, editorForeground } from 'vs/platform/theme/common/colorRegistry';
- import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-@@ -215,6 +217,7 @@
- 		};
- 		this.input.getModel().onDidChangeContent(() => setDecorations());
- 		this.themeService.onThemeChange(() => setDecorations());
-+<<<<<<< .our
- 
- 		this.toDispose.push(SuggestRegistry.register({ scheme: DEBUG_SCHEME, hasAccessToAllModels: true }, {
- 			provideCompletionItems: (model: ITextModel, position: Position, _context: SuggestContext, token: CancellationToken): Thenable<ISuggestResult> => {
-@@ -248,6 +251,8 @@
- 				return suggestionsPromise;
- 			}
- 		}));
-+=======
-+>>>>>>> .their
- 	}
- 
- 	private createDecorations(): IDecorationOptions[] {
-@@ -267,21 +272,6 @@
- 		}];
- 	}
- 
--	private isCurlyBracketOpen(): boolean {
--		const value = this.input.getModel().getValue();
--		for (let i = this.input.getPosition().column - 2; i >= 0; i--) {
--			if (value[i] === '{') {
--				return true;
--			}
--
--			if (value[i] === '}') {
--				return false;
--			}
--		}
--
--		return false;
--	}
--
- 	public dispose(): void {
- 		super.dispose();
- 		this.input.dispose();
-changed in both
-  base   100644 6abc54c895a80dd139445fdc098cb3fe05a8bf39 src/vs/workbench/parts/files/common/explorerModel.ts
-  our    100644 49d64d0a561cfc89077f412464843a7b0f047e1f src/vs/workbench/parts/files/common/explorerModel.ts
-  their  100644 e72ab77eb13b1a5fa41aee3dba4c707906cbc219 src/vs/workbench/parts/files/common/explorerModel.ts
-@@ -72,9 +72,13 @@
- 	public etag: string;
- 	private _isDirectory: boolean;
- 	private _isSymbolicLink: boolean;
-+<<<<<<< .our
- 	private _isReadonly: boolean;
- 	private children: Map<string, ExplorerItem>;
- 	private _isError: boolean;
-+=======
-+	private children: Map<string, ExplorerItem>;
-+>>>>>>> .their
- 	public parent: ExplorerItem;
- 
- 	public isDirectoryResolved: boolean;
-@@ -269,6 +273,17 @@
- 		});
- 
- 		return items;
-+<<<<<<< .our
-+=======
-+	}
-+
-+	public getChildrenCount(): number {
-+		if (!this.children) {
-+			return 0;
-+		}
-+
-+		return this.children.size;
-+>>>>>>> .their
- 	}
- 
- 	public getChildrenCount(): number {
-@@ -276,7 +291,16 @@
- 			return 0;
- 		}
- 
-+<<<<<<< .our
- 		return this.children.size;
-+=======
-+		const names: string[] = [];
-+		this.children.forEach(child => {
-+			names.push(child.name);
-+		});
-+
-+		return names;
-+>>>>>>> .their
- 	}
- 
- 	/**
-changed in both
-  base   100644 60493bdca56015a43a58447596a9a0e6d807fab1 src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
-  our    100644 e0204febe1f4826a27ae39de6c0363afc38b208d src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
-  their  100644 1d04e8a2165bf15d78238ffd49f7877b40754a60 src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
-@@ -736,9 +736,24 @@
- 			return true; // always visible
- 		}
- 
-+<<<<<<< .our
- 		// Hide those that match Hidden Patterns
- 		const cached = this.hiddenExpressionPerRoot.get(stat.root.resource.toString());
- 		if (cached && cached.parsed(paths.normalize(path.relative(stat.root.resource.path, stat.resource.path), true), stat.name, name => !!stat.parent.getChild(name))) {
-+=======
-+		// Workaround for O(N^2) complexity (https://github.com/Microsoft/vscode/issues/9962)
-+		let siblingsFn: () => string[];
-+		let siblingCount = stat.parent && stat.parent.getChildrenCount();
-+		if (siblingCount && siblingCount > FileFilter.MAX_SIBLINGS_FILTER_THRESHOLD) {
-+			siblingsFn = () => void 0;
-+		} else {
-+			siblingsFn = () => stat.parent ? stat.parent.getChildrenNames() : void 0;
-+		}
-+
-+		// Hide those that match Hidden Patterns
-+		const expression = this.hiddenExpressionPerRoot.get(stat.root.resource.toString()) || Object.create(null);
-+		if (glob.match(expression, paths.normalize(relative(stat.root.resource.fsPath, stat.resource.fsPath), true), siblingsFn)) {
-+>>>>>>> .their
- 			return false; // hidden through pattern
- 		}
- 
-changed in both
-  base   100644 d0cb9e4f524f1c53ea41d25b7a1682bd3da214cf src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
-  our    100644 6b4da35a3f141112a169ecfa12aadfaea48de26e src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
-  their  100644 9d7bc2cd1ab6ebc29c1e66ee50415d26be589a94 src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
-changed in both
-  base   100644 93cf12eeb33a49f292b2edb150e19eab0a6e730f src/vs/workbench/parts/update/electron-browser/update.ts
-  our    100644 2e468debc61fae01ce2d9c4b673a81993982cc62 src/vs/workbench/parts/update/electron-browser/update.ts
-  their  100644 6aa9e3764798e5fc47ddc4051792fc633b97784c src/vs/workbench/parts/update/electron-browser/update.ts
-@@ -121,7 +121,11 @@
- 		const shouldShowReleaseNotes = configurationService.getValue<boolean>('update.showReleaseNotes');
- 
- 		// was there an update? if so, open release notes
-+<<<<<<< .our
- 		if (shouldShowReleaseNotes && !environmentService.skipReleaseNotes && product.releaseNotesUrl && lastVersion && pkg.version !== lastVersion) {
-+=======
-+		if (!environmentService.skipReleaseNotes && product.releaseNotesUrl && lastVersion && pkg.version !== lastVersion) {
-+>>>>>>> .their
- 			showReleaseNotes(instantiationService, pkg.version)
- 				.then(undefined, () => {
- 					notificationService.prompt(
-changed in both
-  base   100644 9b95fc29698cdfcdb114a4e61c391a899536a0df src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts
-  our    100644 a62fde4bcb8b78766ace6dd70f1caf223e48f3d7 src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts
-  their  100644 969cac303595fa76c0259555d699446fded89f3a src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts
-@@ -444,7 +444,11 @@
- 					assert.deepEqual('treeDataProvider', revealTarget.args[0][0]);
- 					assert.deepEqual({ handle: '0/0:a/0:aa', label: 'aa', collapsibleState: TreeItemCollapsibleState.None, parentHandle: '0/0:a' }, removeUnsetKeys(revealTarget.args[0][1]));
- 					assert.deepEqual([{ handle: '0/0:a', label: 'a', collapsibleState: TreeItemCollapsibleState.Collapsed }], (<Array<any>>revealTarget.args[0][2]).map(arg => removeUnsetKeys(arg)));
-+<<<<<<< .our
- 					assert.deepEqual({ select: true, focus: false }, revealTarget.args[0][3]);
-+=======
-+					assert.equal(void 0, revealTarget.args[0][3]);
-+>>>>>>> .their
- 				}));
- 	});
- 
diff --git a/app/test/fixtures/merge-parser/vscode/merge-standalone-0.13.x-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-standalone-0.13.x-into-master.txt
deleted file mode 100644
index fc1ff888935..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-standalone-0.13.x-into-master.txt
+++ /dev/null
@@ -1,644 +0,0 @@
-changed in both
-  base   100644 abb7d7856987fd588f7247d45bc636b5b93e8113 build/gulpfile.editor.js
-  our    100644 52d1f0fcf323631277651ff28381ae49c0fa6558 build/gulpfile.editor.js
-  their  100644 3fc14da504529603e52c0e6307d38c858b7aaa0c build/gulpfile.editor.js
-changed in both
-  base   100644 256ca1ff53480886408bcb4fbdde1694daf85c94 build/monaco/package.json
-  our    100644 efd919085b2ffc82da8d810c609a9ed217bffb35 build/monaco/package.json
-  their  100644 aadfb15ab707e9b2ee28ff906e51526da9e58e6b build/monaco/package.json
-@@ -1,7 +1,11 @@
- {
-   "name": "monaco-editor-core",
-   "private": true,
-+<<<<<<< .our
-   "version": "0.14.3",
-+=======
-+  "version": "0.13.2",
-+>>>>>>> .their
-   "description": "A browser based code editor",
-   "author": "Microsoft Corporation",
-   "license": "MIT",
-changed in both
-  base   100644 50e2e7a1b37e8e7dc9cb953afdb3da3703529edf extensions/css-language-features/client/src/cssMain.ts
-  our    100644 dce55982cb94bb035bdff7d2c558ebd86a9e9f7b extensions/css-language-features/client/src/cssMain.ts
-  their  100644 c587c0a5a875feededfe2a5f69b0bb55f13a8166 extensions/css-language-features/client/src/cssMain.ts
-@@ -10,6 +10,10 @@
- 
- import { languages, window, commands, ExtensionContext, Range, Position, CompletionItem, CompletionItemKind, TextEdit, SnippetString } from 'vscode';
- import { LanguageClient, LanguageClientOptions, ServerOptions, TransportKind, Disposable } from 'vscode-languageclient';
-+<<<<<<< .our
-+=======
-+import { FoldingRangeRequest, FoldingRangeRequestParam, FoldingRangeClientCapabilities, FoldingRangeKind as LSFoldingRangeKind } from 'vscode-languageserver-protocol-foldingprovider';
-+>>>>>>> .their
- 
- // this method is called when vs code is activated
- export function activate(context: ExtensionContext) {
-@@ -99,6 +103,41 @@
- 		});
- 	}
- 
-+<<<<<<< .our
-+=======
-+	function initFoldingProvider(): Disposable {
-+		function getKind(kind: string | undefined): FoldingRangeKind | undefined {
-+			if (kind) {
-+				switch (kind) {
-+					case LSFoldingRangeKind.Comment:
-+						return FoldingRangeKind.Comment;
-+					case LSFoldingRangeKind.Imports:
-+						return FoldingRangeKind.Imports;
-+					case LSFoldingRangeKind.Region:
-+						return FoldingRangeKind.Region;
-+				}
-+			}
-+			return void 0;
-+		}
-+		return languages.registerFoldingRangeProvider(documentSelector, {
-+			provideFoldingRanges(document: TextDocument, context: FoldingContext, token: CancellationToken) {
-+				const param: FoldingRangeRequestParam = {
-+					textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(document)
-+				};
-+				return client.sendRequest(FoldingRangeRequest.type, param, token).then(ranges => {
-+					if (Array.isArray(ranges)) {
-+						return ranges.map(r => new FoldingRange(r.startLine, r.endLine, getKind(r.kind)));
-+					}
-+					return null;
-+				}, error => {
-+					client.logFailedRequest(FoldingRangeRequest.type, error);
-+					return null;
-+				});
-+			}
-+		});
-+	}
-+
-+>>>>>>> .their
- 	commands.registerCommand('_css.applyCodeAction', applyCodeAction);
- 
- 	function applyCodeAction(uri: string, documentVersion: number, edits: TextEdit[]) {
-changed in both
-  base   100644 bf8fa07af2bafe31c5d7bd433d40e1c887926f07 extensions/html-language-features/client/src/htmlMain.ts
-  our    100644 68f8b881d3bcf186706879657e06ddbdb58036d9 extensions/html-language-features/client/src/htmlMain.ts
-  their  100644 021a4aa625e161dea6ec031fcb5d5c986874a373 extensions/html-language-features/client/src/htmlMain.ts
-@@ -14,6 +14,11 @@
- import { activateTagClosing } from './tagClosing';
- import TelemetryReporter from 'vscode-extension-telemetry';
- 
-+<<<<<<< .our
-+=======
-+import { FoldingRangeRequest, FoldingRangeRequestParam, FoldingRangeClientCapabilities, FoldingRangeKind as LSFoldingRangeKind } from 'vscode-languageserver-protocol-foldingprovider';
-+
-+>>>>>>> .their
- namespace TagCloseRequest {
- 	export const type: RequestType<TextDocumentPositionParams, string, any, any> = new RequestType('html/tag');
- }
-@@ -154,6 +159,41 @@
- 			return null;
- 		}
- 	});
-+<<<<<<< .our
-+=======
-+
-+	function initFoldingProvider(): Disposable {
-+		function getKind(kind: string | undefined): FoldingRangeKind | undefined {
-+			if (kind) {
-+				switch (kind) {
-+					case LSFoldingRangeKind.Comment:
-+						return FoldingRangeKind.Comment;
-+					case LSFoldingRangeKind.Imports:
-+						return FoldingRangeKind.Imports;
-+					case LSFoldingRangeKind.Region:
-+						return FoldingRangeKind.Region;
-+				}
-+			}
-+			return void 0;
-+		}
-+		return languages.registerFoldingRangeProvider(documentSelector, {
-+			provideFoldingRanges(document: TextDocument, context: FoldingContext, token: CancellationToken) {
-+				const param: FoldingRangeRequestParam = {
-+					textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(document)
-+				};
-+				return client.sendRequest(FoldingRangeRequest.type, param, token).then(ranges => {
-+					if (Array.isArray(ranges)) {
-+						return ranges.map(r => new FoldingRange(r.startLine, r.endLine, getKind(r.kind)));
-+					}
-+					return null;
-+				}, error => {
-+					client.logFailedRequest(FoldingRangeRequest.type, error);
-+					return null;
-+				});
-+			}
-+		});
-+	}
-+>>>>>>> .their
- }
- 
- function getPackageInfo(context: ExtensionContext): IPackageInfo | null {
-changed in both
-  base   100644 53c19c4c22fb718c87585ff218e87f55deffe12d extensions/json-language-features/client/src/jsonMain.ts
-  our    100644 9040304a4f84d9462af713bf2628e4bb49f8d701 extensions/json-language-features/client/src/jsonMain.ts
-  their  100644 2cd653dfa4bfcf4922745c99617da6bf4bfdb64d extensions/json-language-features/client/src/jsonMain.ts
-@@ -12,6 +12,11 @@
- import { LanguageClient, LanguageClientOptions, RequestType, ServerOptions, TransportKind, NotificationType, DidChangeConfigurationNotification } from 'vscode-languageclient';
- import TelemetryReporter from 'vscode-extension-telemetry';
- 
-+<<<<<<< .our
-+=======
-+import { FoldingRangeRequest, FoldingRangeRequestParam, FoldingRangeClientCapabilities, FoldingRangeKind as LSFoldingRangeKind } from 'vscode-languageserver-protocol-foldingprovider';
-+
-+>>>>>>> .their
- import { hash } from './utils/hash';
- 
- namespace VSCodeContentRequest {
-@@ -135,6 +140,41 @@
- 	};
- 	languages.setLanguageConfiguration('json', languageConfiguration);
- 	languages.setLanguageConfiguration('jsonc', languageConfiguration);
-+<<<<<<< .our
-+=======
-+
-+	function initFoldingProvider(): Disposable {
-+		function getKind(kind: string | undefined): FoldingRangeKind | undefined {
-+			if (kind) {
-+				switch (kind) {
-+					case LSFoldingRangeKind.Comment:
-+						return FoldingRangeKind.Comment;
-+					case LSFoldingRangeKind.Imports:
-+						return FoldingRangeKind.Imports;
-+					case LSFoldingRangeKind.Region:
-+						return FoldingRangeKind.Region;
-+				}
-+			}
-+			return void 0;
-+		}
-+		return languages.registerFoldingRangeProvider(documentSelector, {
-+			provideFoldingRanges(document: TextDocument, context: FoldingContext, token: CancellationToken) {
-+				const param: FoldingRangeRequestParam = {
-+					textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(document)
-+				};
-+				return client.sendRequest(FoldingRangeRequest.type, param, token).then(ranges => {
-+					if (Array.isArray(ranges)) {
-+						return ranges.map(r => new FoldingRange(r.startLine, r.endLine, getKind(r.kind)));
-+					}
-+					return null;
-+				}, error => {
-+					client.logFailedRequest(FoldingRangeRequest.type, error);
-+					return null;
-+				});
-+			}
-+		});
-+	}
-+>>>>>>> .their
- }
- 
- export function deactivate(): Promise<any> {
-changed in both
-  base   100644 a326864787f31fd62471cee61eba1c79ef7d2074 src/vs/base/browser/browser.ts
-  our    100644 19c46188f3ba487d308c72637ce84fdba83c8908 src/vs/base/browser/browser.ts
-  their  100644 1954291c847840bb3117b50a873739e8c8663a46 src/vs/base/browser/browser.ts
-@@ -157,6 +157,15 @@
- export const isIPad = (userAgent.indexOf('iPad') >= 0);
- export const isEdgeWebView = isEdge && (userAgent.indexOf('WebView/') >= 0);
- 
-+<<<<<<< .our
-+=======
-+export const isChromev56 = (
-+	userAgent.indexOf('Chrome/56.') >= 0
-+	// Edge likes to impersonate Chrome sometimes
-+	&& userAgent.indexOf('Edge/') === -1
-+);
-+
-+>>>>>>> .their
- export function hasClipboardSupport() {
- 	if (isIE) {
- 		return false;
-changed in both
-  base   100644 d3dd81fac4e3883c692ffb8a3a50eb739850d0d6 src/vs/editor/browser/controller/textAreaInput.ts
-  our    100644 53169924b40a89453d9315348a7454e0e49c0a03 src/vs/editor/browser/controller/textAreaInput.ts
-  their  100644 45ba0fbe90bdb309b7911d7d1b8aee99a83c2ab5 src/vs/editor/browser/controller/textAreaInput.ts
-changed in both
-  base   100644 7103fb97b39aa6353f99198957309325520bd98e src/vs/editor/browser/widget/codeEditorWidget.ts
-  our    100644 6f588e16445e2740e0f36730ce132f1ff91e44d8 src/vs/editor/browser/widget/codeEditorWidget.ts
-  their  100644 afae2c3c2b263b95d6d7c5f8534ad1874def8d41 src/vs/editor/browser/widget/codeEditorWidget.ts
-@@ -1827,6 +1827,7 @@
- 	let hintForeground = theme.getColor(editorHintForeground);
- 	if (hintForeground) {
- 		collector.addRule(`.monaco-editor .${ClassName.EditorHintDecoration} { background: url("data:image/svg+xml,${getDotDotDotSVGData(hintForeground)}") no-repeat bottom left; }`);
-+<<<<<<< .our
- 	}
- 
- 	const unnecessaryForeground = theme.getColor(editorUnnecessaryCodeOpacity);
-@@ -1837,5 +1838,7 @@
- 	const unnecessaryBorder = theme.getColor(editorUnnecessaryCodeBorder);
- 	if (unnecessaryBorder) {
- 		collector.addRule(`.${SHOW_UNUSED_ENABLED_CLASS} .monaco-editor .${ClassName.EditorUnnecessaryDecoration} { border-bottom: 2px dashed ${unnecessaryBorder}; }`);
-+=======
-+>>>>>>> .their
- 	}
- });
-changed in both
-  base   100644 3a122545b631dac5f9e3feb05bfddad50e4d88e1 src/vs/editor/contrib/codelens/codelensController.ts
-  our    100644 23fde7dc577ec0599b59cfb3d324af268c439828 src/vs/editor/contrib/codelens/codelensController.ts
-  their  100644 0cd0fb98162e74c98f45a7b7f6c77b8143ac2ff3 src/vs/editor/contrib/codelens/codelensController.ts
-@@ -292,6 +292,7 @@
- 
- 			const promises = toResolve.map((request, i) => {
- 
-+<<<<<<< .our
- 				const resolvedSymbols = new Array<ICodeLensSymbol>(request.length);
- 				const promises = request.map((request, i) => {
- 					if (typeof request.provider.resolveCodeLens === 'function') {
-@@ -302,6 +303,20 @@
- 					resolvedSymbols[i] = request.symbol;
- 					return Promise.resolve(void 0);
- 				});
-+=======
-+			const resolvedSymbols = new Array<ICodeLensSymbol>(request.length);
-+			const promises = request.map((request, i) => {
-+				if (typeof request.provider.resolveCodeLens === 'function') {
-+					return asWinJsPromise((token) => {
-+						return request.provider.resolveCodeLens(model, request.symbol, token);
-+					}).then(symbol => {
-+						resolvedSymbols[i] = symbol;
-+					});
-+				}
-+				resolvedSymbols[i] = request.symbol;
-+				return TPromise.as(void 0);
-+			});
-+>>>>>>> .their
- 
- 				return Promise.all(promises).then(() => {
- 					lenses[i].updateCommands(resolvedSymbols);
-changed in both
-  base   100644 dcb29cd3d1f185dfd444fa697cdf612a400a7e7b src/vs/vscode.d.ts
-  our    100644 6000b0300db361418bc31c0585263a9d663705f5 src/vs/vscode.d.ts
-  their  100644 cee7ee04bb245fb88abcceeeeba3ed63fc024e20 src/vs/vscode.d.ts
-@@ -3584,7 +3584,10 @@
- 		 * [Region](#FoldingRangeKind.Region). The kind is used to categorize folding ranges and used by commands
- 		 * like 'Fold all comments'. See
- 		 * [FoldingRangeKind](#FoldingRangeKind) for an enumeration of all kinds.
-+<<<<<<< .our
- 		 * If not set, the range is originated from a syntax element.
-+=======
-+>>>>>>> .their
- 		 */
- 		kind?: FoldingRangeKind;
- 
-@@ -3598,6 +3601,7 @@
- 		constructor(start: number, end: number, kind?: FoldingRangeKind);
- 	}
- 
-+<<<<<<< .our
- 	/**
- 	 * An enumeration of specific folding range kinds. The kind is an optional field of a [FoldingRange](#FoldingRange)
- 	 * and is used to distinguish specific folding ranges such as ranges originated from comments. The kind is used by commands like
-@@ -3616,6 +3620,20 @@
- 		/**
- 		 * Kind for folding range representing regions originating from folding markers like `#region` and `#endregion`.
- 		 */
-+=======
-+	export enum FoldingRangeKind {
-+		/**
-+		 * Kind for folding range representing a comment.
-+		 */
-+		Comment = 1,
-+		/**
-+		 * Kind for folding range representing a import.
-+		 */
-+		Imports = 2,
-+		/**
-+		 * Kind for folding range representing regions (for example a folding range marked by `#region` and `#endregion`).
-+		 */
-+>>>>>>> .their
- 		Region = 3
- 	}
- 
-@@ -5055,6 +5073,7 @@
- 	}
- 
- 	/**
-+<<<<<<< .our
- 	 * An object representing an executed Task. It can be used
- 	 * to terminate a task.
- 	 *
-@@ -5207,6 +5226,8 @@
- 	}
- 
- 	/**
-+=======
-+>>>>>>> .their
- 	 * Enumeration of file types. The types `File` and `Directory` can also be
- 	 * a symbolic links, in that use `FileType.File | FileType.SymbolicLink` and
- 	 * `FileType.Directory | FileType.SymbolicLink`.
-@@ -6237,7 +6258,11 @@
- 		 *
- 		 * @return New webview panel.
- 		 */
-+<<<<<<< .our
- 		export function createWebviewPanel(viewType: string, title: string, showOptions: ViewColumn | { viewColumn: ViewColumn, preserveFocus?: boolean }, options?: WebviewPanelOptions & WebviewOptions): WebviewPanel;
-+=======
-+		export function createWebviewPanel(viewType: string, title: string, position: ViewColumn, options?: WebviewPanelOptions & WebviewOptions): WebviewPanel;
-+>>>>>>> .their
- 
- 		/**
- 		 * Set a message to the status bar. This is a short hand for the more powerful
-changed in both
-  base   100644 5c98f71fd8252434107ee3fd454ae1449b96ade6 src/vs/workbench/api/node/extHostTypeConverters.ts
-  our    100644 ae449946df0a11f467815b4a7ec498cfdb238842 src/vs/workbench/api/node/extHostTypeConverters.ts
-  their  100644 149733b823a0dc7cb591257f7f16f89726217e60 src/vs/workbench/api/node/extHostTypeConverters.ts
-@@ -706,6 +706,25 @@
- 			range.kind = FoldingRangeKind.from(r.kind);
- 		}
- 		return range;
-+<<<<<<< .our
-+=======
-+	}
-+}
-+
-+export namespace FoldingRangeKind {
-+	export function from(kind: vscode.FoldingRangeKind | undefined): modes.FoldingRangeKind | undefined {
-+		if (kind) {
-+			switch (kind) {
-+				case types.FoldingRangeKind.Comment:
-+					return modes.FoldingRangeKind.Comment;
-+				case types.FoldingRangeKind.Imports:
-+					return modes.FoldingRangeKind.Imports;
-+				case types.FoldingRangeKind.Region:
-+					return modes.FoldingRangeKind.Region;
-+			}
-+		}
-+		return void 0;
-+>>>>>>> .their
- 	}
- }
- 
-changed in both
-  base   100644 1d84be9456667096318430ace00b2c74df7f0013 src/vs/workbench/api/node/extHostTypes.ts
-  our    100644 7e7572fe66c624d470c8506c4a3ebf35efe8320a src/vs/workbench/api/node/extHostTypes.ts
-  their  100644 492ac346fb978429c1d20148f56d17d359d6f179 src/vs/workbench/api/node/extHostTypes.ts
-@@ -1941,6 +1941,7 @@
- 	Comment = 1,
- 	Imports = 2,
- 	Region = 3
-+<<<<<<< .our
- }
- 
- //#endregion
-@@ -1955,6 +1956,8 @@
- 	 * Determines an item is expanded
- 	 */
- 	Expanded = 1
-+=======
-+>>>>>>> .their
- }
- 
- export class QuickInputButtons {
-changed in both
-  base   100644 e91157377ab33d134defebbfcc5a2817b5aa6124 src/vs/workbench/api/node/extHostWebview.ts
-  our    100644 89302f776704c2cabc429d6a8ced0d9c7839abe0 src/vs/workbench/api/node/extHostWebview.ts
-  their  100644 285c1722e97ea01b5e69819f853a8e89c3a74219 src/vs/workbench/api/node/extHostWebview.ts
-@@ -242,6 +242,7 @@
- 		extensionLocation: URI,
- 		viewType: string,
- 		title: string,
-+<<<<<<< .our
- 		showOptions: vscode.ViewColumn | { viewColumn: vscode.ViewColumn, preserveFocus?: boolean },
- 		options: (vscode.WebviewPanelOptions & vscode.WebviewOptions) = {},
- 	): vscode.WebviewPanel {
-@@ -253,6 +254,15 @@
- 
- 		const handle = ExtHostWebviews.newHandle();
- 		this._proxy.$createWebviewPanel(handle, viewType, title, webviewShowOptions, options, extensionLocation);
-+=======
-+		viewColumn: vscode.ViewColumn,
-+		options: (vscode.WebviewPanelOptions & vscode.WebviewOptions) | undefined,
-+		extensionFolderPath: string
-+	): vscode.WebviewPanel {
-+		options = options || {};
-+		const handle = ExtHostWebviews.webviewHandlePool++ + '';
-+		this._proxy.$createWebviewPanel(handle, viewType, title, typeConverters.fromViewColumn(viewColumn), options, extensionFolderPath);
-+>>>>>>> .their
- 
- 		const webview = new ExtHostWebview(handle, this._proxy, options);
- 		const panel = new ExtHostWebviewPanel(handle, this._proxy, viewType, title, viewColumn, options, webview);
-changed in both
-  base   100644 96ec92771ac7f0be88d964d1c744d799458669fd src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
-  our    100644 773bbe0d763095d8dfa6af1262d5e8a15944139f src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
-  their  100644 366b81fe440c92f643b6909cdf88d67ba6e52e16 src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
-@@ -21,9 +21,14 @@
- import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
- import { KeyCode } from 'vs/base/common/keyCodes';
- import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-+<<<<<<< .our
- import { ActivityAction, ActivityActionItem, ICompositeBarColors, ToggleCompositePinnedAction, ICompositeBar } from 'vs/workbench/browser/parts/compositeBarActions';
- import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
- import URI from 'vs/base/common/uri';
-+=======
-+import { ActivityAction, ActivityActionItem, ICompositeBarColors } from 'vs/workbench/browser/parts/compositebar/compositeBarActions';
-+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-+>>>>>>> .their
- 
- export class ViewletActivityAction extends ActivityAction {
- 
-changed in both
-  base   100644 54c49535f2bca89c496a3e6b901872b914bcbf3e src/vs/workbench/browser/parts/quickinput/quickInput.ts
-  our    100644 d834bd59460d51375417fd865daeb856b353a144 src/vs/workbench/browser/parts/quickinput/quickInput.ts
-  their  100644 f82473876f9a9cc7ba545afa94eceb07ec00a8cc src/vs/workbench/browser/parts/quickinput/quickInput.ts
-@@ -32,6 +32,7 @@
- import { Button } from 'vs/base/browser/ui/button/button';
- import { dispose, IDisposable } from 'vs/base/common/lifecycle';
- import Severity from 'vs/base/common/severity';
-+<<<<<<< .our
- import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
- import { IContextKeyService, RawContextKey, IContextKey } from 'vs/platform/contextkey/common/contextkey';
- import { ICommandAndKeybindingRule, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-@@ -43,6 +44,9 @@
- import { equals } from 'vs/base/common/arrays';
- import { TimeoutTimer } from 'vs/base/common/async';
- import { getIconClass } from 'vs/workbench/browser/parts/quickinput/quickInputUtils';
-+=======
-+import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
-+>>>>>>> .their
- 
- const $ = dom.$;
- 
-@@ -777,9 +781,13 @@
- 		@IInstantiationService private instantiationService: IInstantiationService,
- 		@IPartService private partService: IPartService,
- 		@IQuickOpenService private quickOpenService: IQuickOpenService,
-+<<<<<<< .our
- 		@IEditorGroupsService private editorGroupService: IEditorGroupsService,
- 		@IKeybindingService private keybindingService: IKeybindingService,
- 		@IContextKeyService private contextKeyService: IContextKeyService,
-+=======
-+		@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
-+>>>>>>> .their
- 		@IThemeService themeService: IThemeService
- 	) {
- 		super(QuickInputService.ID, themeService);
-@@ -916,11 +924,26 @@
- 			}, 0);
- 		}));
- 
-+<<<<<<< .our
- 		const focusTracker = dom.trackFocus(container);
- 		this._register(focusTracker);
- 		this._register(focusTracker.onDidBlur(() => {
- 			if (!this.ui.ignoreFocusOut && !this.environmentService.args['sticky-quickopen'] && this.configurationService.getValue(CLOSE_ON_FOCUS_LOST_CONFIG)) {
- 				this.hide(true);
-+=======
-+		this.toUnbind.push(dom.addDisposableListener(this.container, 'focusout', (e: FocusEvent) => {
-+			if (e.relatedTarget === this.container) {
-+				(<HTMLElement>e.target).focus();
-+				return;
-+			}
-+			for (let element = <Element>e.relatedTarget; element; element = element.parentElement) {
-+				if (element === this.container) {
-+					return;
-+				}
-+			}
-+			if (!this.ignoreFocusLost && !this.environmentService.args['sticky-quickopen'] && this.configurationService.getValue(CLOSE_ON_FOCUS_LOST_CONFIG)) {
-+				this.close(undefined, true);
-+>>>>>>> .their
- 			}
- 		}));
- 		this._register(dom.addDisposableListener(container, dom.EventType.KEY_DOWN, (e: KeyboardEvent) => {
-@@ -1009,6 +1032,7 @@
- 		this.updateStyles();
- 	}
- 
-+<<<<<<< .our
- 	pick<T extends IQuickPickItem, O extends IPickOptions<T>>(picks: TPromise<QuickPickInput<T>[]> | QuickPickInput<T>[], options: O = <O>{}, token: CancellationToken = CancellationToken.None): TPromise<O extends { canPickMany: true } ? T[] : T> {
- 		return new TPromise<O extends { canPickMany: true } ? T[] : T>((doResolve, reject) => {
- 			let resolve = (result: any) => {
-@@ -1161,6 +1185,72 @@
- 			input.show();
- 		});
- 	}
-+=======
-+	private close(ok?: true | Thenable<never>, focusLost?: boolean) {
-+		if (this.container.style.display === 'none') {
-+			return TPromise.as(undefined);
-+		}
-+		if (this.controller) {
-+			const resolved = this.controller.resolve(ok);
-+			if (resolved) {
-+				const result = resolved
-+					.then(() => {
-+						this.container.style.display = 'none';
-+						if (!focusLost) {
-+							this.restoreFocus();
-+						}
-+					});
-+				result.then(null, onUnexpectedError);
-+				return result;
-+			}
-+		}
-+		this.container.style.display = 'none';
-+		if (!focusLost) {
-+			this.restoreFocus();
-+		}
-+		return TPromise.as(undefined);
-+	}
-+
-+	private restoreFocus(): void {
-+		const editor = this.editorService.getActiveEditor();
-+		if (editor) {
-+			editor.focus();
-+		}
-+	}
-+
-+	pick<T extends IPickOpenEntry>(picks: TPromise<T[]>, options: IPickOptions = {}, token?: CancellationToken): TPromise<T[]> {
-+		return this.show({
-+			type: 'selectMany',
-+			picks,
-+			placeHolder: options.placeHolder,
-+			matchOnDescription: options.matchOnDescription,
-+			matchOnDetail: options.matchOnDetail,
-+			ignoreFocusLost: options.ignoreFocusLost
-+		}, token);
-+	}
-+
-+	input(options: IInputOptions = {}, token?: CancellationToken): TPromise<string> {
-+		return this.show({
-+			type: 'textInput',
-+			value: options.value,
-+			valueSelection: options.valueSelection,
-+			prompt: options.prompt,
-+			placeHolder: options.placeHolder,
-+			password: options.password,
-+			ignoreFocusLost: options.ignoreFocusLost,
-+			validateInput: options.validateInput,
-+		}, token);
-+	}
-+
-+	show<T extends IPickOpenEntry>(parameters: SelectManyParameters<T>, token?: CancellationToken): TPromise<T[]>;
-+	show(parameters: TextInputParameters, token?: CancellationToken): TPromise<string>;
-+	show<R>(parameters: InputParameters, token: CancellationToken = CancellationToken.None): TPromise<R> {
-+		this.create();
-+		this.quickOpenService.close();
-+		if (this.controller) {
-+			this.controller.resolve();
-+		}
-+>>>>>>> .their
- 
- 	backButton = backButton;
- 
-changed in both
-  base   100644 ea7188eab8e592853b12b1c9095eeeeb3a0ec374 src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts
-  our    100644 69bc170328023443de8604d25d47c4839fd2f82f src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts
-  their  100644 bdcf15d35d8ede121543372090f5357996b1fccf src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts
-@@ -277,7 +277,11 @@
- 		this.content = append(body, $('.content'));
- 	}
- 
-+<<<<<<< .our
- 	setInput(input: ExtensionsInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
-+=======
-+	setInput(input: ExtensionsInput, options: EditorOptions): TPromise<void> {
-+>>>>>>> .their
- 		this.editorLoadComplete = false;
- 		const extension = input.extension;
- 
-@@ -418,6 +422,7 @@
- 		this.navbar.clear();
- 		this.navbar.onChange(this.onNavbarChange.bind(this, extension), this, this.transientDisposables);
- 
-+<<<<<<< .our
- 		if (extension.hasReadme()) {
- 			this.navbar.push(NavbarSection.Readme, localize('details', "Details"), localize('detailstooltip', "Extension details, rendered from the extension's 'README.md' file"));
- 		}
-@@ -438,6 +443,11 @@
- 				}
- 				this.editorLoadComplete = true;
- 			});
-+=======
-+		this.editorLoadComplete = true;
-+		return super.setInput(input, options);
-+	}
-+>>>>>>> .their
- 
- 		return super.setInput(input, options, token);
- 	}
-@@ -461,6 +471,22 @@
- 			this.telemetryService.publicLog('extensionEditor:navbarChange', assign(extension.telemetryData, { navItem: id }));
- 		}
- 
-+<<<<<<< .our
-+=======
-+	private onNavbarChange(extension: IExtension, id: string): void {
-+		if (this.editorLoadComplete) {
-+			/* __GDPR__
-+				"extensionEditor:navbarChange" : {
-+					"navItem": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-+					"${include}": [
-+						"${GalleryExtensionTelemetryData}"
-+					]
-+				}
-+			*/
-+			this.telemetryService.publicLog('extensionEditor:navbarChange', assign(extension.telemetryData, { navItem: id }));
-+		}
-+
-+>>>>>>> .their
- 		this.contentDisposables = dispose(this.contentDisposables);
- 		this.content.innerHTML = '';
- 		this.activeWebview = null;
diff --git a/app/test/fixtures/merge-parser/vscode/merge-standalone-0.14.x-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-standalone-0.14.x-into-master.txt
deleted file mode 100644
index c8bd7b3efbc..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-standalone-0.14.x-into-master.txt
+++ /dev/null
@@ -1,794 +0,0 @@
-changed in both
-  base   100644 8f167afc9049e8db15fd3175ce33a6ad4738b9f1 OSSREADME.json
-  our    100644 e15cccabcadbd5afb0980967f0af53c135710fc0 OSSREADME.json
-  their  100644 ddfe2a1fa05af54ab5c44aeb8a7cdcafcf729f19 OSSREADME.json
-@@ -51,7 +51,11 @@
- },
- {
- 	"name": "electron",
-+<<<<<<< .our
- 	"version": "2.0.7",
-+=======
-+	"version": "2.0.5",
-+>>>>>>> .their
- 	"license": "MIT",
- 	"repositoryURL": "https://github.com/electron/electron",
- 	"isProd": true
-changed in both
-  base   100644 663f81987ccc076e4b3e08e95663fdd475e09b93 build/builtInExtensions.json
-  our    100644 b3efcd2cc657706605008661521b555c93a32c16 build/builtInExtensions.json
-  their  100644 e607dada4f85a5d32fa133c9fb0ea836f3a1d185 build/builtInExtensions.json
-@@ -6,7 +6,11 @@
- 	},
- 	{
- 		"name": "ms-vscode.node-debug2",
-+<<<<<<< .our
- 		"version": "1.27.0",
-+=======
-+		"version": "1.26.8",
-+>>>>>>> .their
- 		"repo": "https://github.com/Microsoft/vscode-node-debug2"
- 	}
- ]
-changed in both
-  base   100644 218d4cdf8f58d8f370dd8b3f3b672dfaf2b362a1 build/monaco/monaco.d.ts.recipe
-  our    100644 bebfe72348463fbdce9848d9655a5909083f9f7d build/monaco/monaco.d.ts.recipe
-  their  100644 5a8f18c5cc391f101ca62a71bcf71a6e0720004f build/monaco/monaco.d.ts.recipe
-changed in both
-  base   100644 256ca1ff53480886408bcb4fbdde1694daf85c94 build/monaco/package.json
-  our    100644 efd919085b2ffc82da8d810c609a9ed217bffb35 build/monaco/package.json
-  their  100644 602e72b3160e741e9edbeb7f1ec07c61025492ea build/monaco/package.json
-@@ -1,7 +1,11 @@
- {
-   "name": "monaco-editor-core",
-   "private": true,
-+<<<<<<< .our
-   "version": "0.14.3",
-+=======
-+  "version": "0.14.6",
-+>>>>>>> .their
-   "description": "A browser based code editor",
-   "author": "Microsoft Corporation",
-   "license": "MIT",
-changed in both
-  base   100644 4a4588e38b35333ba0d79b6b7a3f80a890cbf3bb package.json
-  our    100644 d0e982ce0b76c5b1b5eb02b673e459e47f3353a4 package.json
-  their  100644 2815fd49ac1e7295ddf0a9cae0394b2c4453d469 package.json
-@@ -1,7 +1,12 @@
- {
-   "name": "code-oss-dev",
-+<<<<<<< .our
-   "version": "1.27.0",
-   "distro": "a4155d9780fbbc94ead6cb3017dd0fc3806c57b8",
-+=======
-+  "version": "1.26.0",
-+  "distro": "73cb7173636931afba8d741be343ceafb11a177e",
-+>>>>>>> .their
-   "author": {
-     "name": "Microsoft Corporation"
-   },
-@@ -49,7 +54,11 @@
-     "vscode-nsfw": "1.0.17",
-     "vscode-ripgrep": "1.1.0",
-     "vscode-textmate": "^4.0.1",
-+<<<<<<< .our
-     "vscode-xterm": "3.7.0-beta4",
-+=======
-+    "vscode-xterm": "3.6.0-beta13",
-+>>>>>>> .their
-     "winreg": "^1.2.4",
-     "yauzl": "^2.9.1"
-   },
-changed in both
-  base   100644 221640196a1cb0a1a1210b6db54b3c80745b02cb src/vs/base/browser/ui/menu/menu.css
-  our    100644 bea8dd197779b2014b71574a98c635196409f288 src/vs/base/browser/ui/menu/menu.css
-  their  100644 4f0c0152caa1bf00b563c9284792e99cfb19e4dd src/vs/base/browser/ui/menu/menu.css
-changed in both
-  base   100644 c09f6334b7f4654eacac6cfeb531defabef081f3 src/vs/base/common/resources.ts
-  our    100644 53357fe29f5f8919d794f7850dfaffd61f179591 src/vs/base/common/resources.ts
-  their  100644 af2d8eaa6a157d980ae81406148fe28fc4ea1dbf src/vs/base/common/resources.ts
-changed in both
-  base   100644 1b10a58da57e62ebfcbf4235da835802bbb3c050 src/vs/code/electron-main/app.ts
-  our    100644 c0185b039e95315e65379ca7cda7ff397219bdf9 src/vs/code/electron-main/app.ts
-  their  100644 a52ce64b90dbb29413f31e75d30df26f5dfeaaca src/vs/code/electron-main/app.ts
-@@ -63,10 +63,15 @@
- import { IMenubarService } from 'vs/platform/menubar/common/menubar';
- import { MenubarService } from 'vs/platform/menubar/electron-main/menubarService';
- import { MenubarChannel } from 'vs/platform/menubar/common/menubarIpc';
-+<<<<<<< .our
- import { IUriLabelService } from 'vs/platform/uriLabel/common/uriLabel';
- import { CodeMenu } from 'vs/code/electron-main/menus';
- import { hasArgs } from 'vs/platform/environment/node/argv';
- import { RunOnceScheduler } from 'vs/base/common/async';
-+=======
-+import { IUriDisplayService } from 'vs/platform/uriDisplay/common/uriDisplay';
-+import { CodeMenu } from 'vs/code/electron-main/menus';
-+>>>>>>> .their
- 
- export class CodeApplication {
- 
-changed in both
-  base   100644 b4bd6f0412ba41d3832e7c6c08b5ded48bc13c7a src/vs/code/electron-main/menubar.ts
-  our    100644 1bbfd9834bb83d9b49a3ce4b6f9cd46089cd2168 src/vs/code/electron-main/menubar.ts
-  their  100644 5605ff20117fd1390258d6c9f76e72f18eec8c26 src/vs/code/electron-main/menubar.ts
-@@ -252,15 +252,6 @@
- 			menubar.append(gotoMenuItem);
- 		}
- 
--		// Terminal
--		const terminalMenu = new Menu();
--		const terminalMenuItem = new MenuItem({ label: this.mnemonicLabel(nls.localize({ key: 'mTerminal', comment: ['&& denotes a mnemonic'] }, "Ter&&minal")), submenu: terminalMenu });
--
--		if (this.shouldDrawMenu('Terminal')) {
--			this.setMenuById(terminalMenu, 'Terminal');
--			menubar.append(terminalMenuItem);
--		}
--
- 		// Debug
- 		const debugMenu = new Menu();
- 		const debugMenuItem = new MenuItem({ label: this.mnemonicLabel(nls.localize({ key: 'mDebug', comment: ['&& denotes a mnemonic'] }, "&&Debug")), submenu: debugMenu });
-added in both
-  our    100644 9d5657cff26b159c842f9790d6387967d829e168 src/vs/code/electron-main/menus.ts
-  their  100644 07a51698a469b440a4760891886ca431b4fd1e24 src/vs/code/electron-main/menus.ts
-@@ -24,7 +24,11 @@
- import { IHistoryMainService } from 'vs/platform/history/common/history';
- import { IWorkspaceIdentifier, getWorkspaceLabel, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
- import URI from 'vs/base/common/uri';
-+<<<<<<< .our
- import { IUriLabelService } from 'vs/platform/uriLabel/common/uriLabel';
-+=======
-+import { IUriDisplayService } from 'vs/platform/uriDisplay/common/uriDisplay';
-+>>>>>>> .their
- 
- interface IMenuItemClickHandler {
- 	inDevTools: (contents: Electron.WebContents) => void;
-@@ -68,7 +72,11 @@
- 		@IEnvironmentService private environmentService: IEnvironmentService,
- 		@ITelemetryService private telemetryService: ITelemetryService,
- 		@IHistoryMainService private historyMainService: IHistoryMainService,
-+<<<<<<< .our
- 		@IUriLabelService private uriLabelService: IUriLabelService
-+=======
-+		@IUriDisplayService private uriDisplayService: IUriDisplayService
-+>>>>>>> .their
- 	) {
- 		this.nativeTabMenuItems = [];
- 
-@@ -242,11 +250,14 @@
- 		const gotoMenuItem = new MenuItem({ label: this.mnemonicLabel(nls.localize({ key: 'mGoto', comment: ['&& denotes a mnemonic'] }, "&&Go")), submenu: gotoMenu });
- 		this.setGotoMenu(gotoMenu);
- 
-+<<<<<<< .our
- 		// Terminal
- 		const terminalMenu = new Menu();
- 		const terminalMenuItem = new MenuItem({ label: this.mnemonicLabel(nls.localize({ key: 'mTerminal', comment: ['&& denotes a mnemonic'] }, "Ter&&minal")), submenu: terminalMenu });
- 		this.setTerminalMenu(terminalMenu);
- 
-+=======
-+>>>>>>> .their
- 		// Debug
- 		const debugMenu = new Menu();
- 		const debugMenuItem = new MenuItem({ label: this.mnemonicLabel(nls.localize({ key: 'mDebug', comment: ['&& denotes a mnemonic'] }, "&&Debug")), submenu: debugMenu });
-@@ -280,7 +291,10 @@
- 		menubar.append(selectionMenuItem);
- 		menubar.append(viewMenuItem);
- 		menubar.append(gotoMenuItem);
-+<<<<<<< .our
- 		menubar.append(terminalMenuItem);
-+=======
-+>>>>>>> .their
- 		menubar.append(debugMenuItem);
- 		menubar.append(taskMenuItem);
- 
-@@ -438,8 +452,12 @@
- 	}
- 
- 	private getPreferencesMenu(): Electron.MenuItem {
-+<<<<<<< .our
- 		const settings = this.createMenuItem(nls.localize({ key: 'miOpenSettings', comment: ['&& denotes a mnemonic'] }, "&&Settings"), 'workbench.action.openSettings');
- 		const extensions = this.createMenuItem(nls.localize({ key: 'miOpenExtensions', comment: ['&& denotes a mnemonic'] }, '&&Extensions'), 'workbench.view.extensions');
-+=======
-+		const settings = this.createMenuItem(nls.localize({ key: 'miOpenSettings', comment: ['&& denotes a mnemonic'] }, "&&Settings"), 'workbench.action.openSettings2');
-+>>>>>>> .their
- 		const kebindingSettings = this.createMenuItem(nls.localize({ key: 'miOpenKeymap', comment: ['&& denotes a mnemonic'] }, "&&Keyboard Shortcuts"), 'workbench.action.openGlobalKeybindings');
- 		const keymapExtensions = this.createMenuItem(nls.localize({ key: 'miOpenKeymapExtensions', comment: ['&& denotes a mnemonic'] }, "&&Keymap Extensions"), 'workbench.extensions.action.showRecommendedKeymapExtensions');
- 		const snippetsSettings = this.createMenuItem(nls.localize({ key: 'miOpenSnippets', comment: ['&& denotes a mnemonic'] }, "User &&Snippets"), 'workbench.action.openSnippets');
-@@ -448,7 +466,10 @@
- 
- 		const preferencesMenu = new Menu();
- 		preferencesMenu.append(settings);
-+<<<<<<< .our
- 		preferencesMenu.append(extensions);
-+=======
-+>>>>>>> .their
- 		preferencesMenu.append(__separator__());
- 		preferencesMenu.append(kebindingSettings);
- 		preferencesMenu.append(keymapExtensions);
-@@ -496,6 +517,7 @@
- 		let label: string;
- 		let uri: URI;
- 		if (isSingleFolderWorkspaceIdentifier(workspace)) {
-+<<<<<<< .our
- 			label = unmnemonicLabel(getWorkspaceLabel(workspace, this.environmentService, this.uriLabelService, { verbose: true }));
- 			uri = workspace;
- 		} else if (isWorkspaceIdentifier(workspace)) {
-@@ -504,6 +526,16 @@
- 		} else {
- 			uri = URI.file(workspace);
- 			label = unmnemonicLabel(this.uriLabelService.getLabel(uri));
-+=======
-+			label = unmnemonicLabel(getWorkspaceLabel(workspace, this.environmentService, this.uriDisplayService, { verbose: true }));
-+			uri = workspace;
-+		} else if (isWorkspaceIdentifier(workspace)) {
-+			label = getWorkspaceLabel(workspace, this.environmentService, this.uriDisplayService, { verbose: true });
-+			uri = URI.file(workspace.configPath);
-+		} else {
-+			uri = URI.file(workspace);
-+			label = unmnemonicLabel(this.uriDisplayService.getLabel(uri));
-+>>>>>>> .their
- 		}
- 
- 		return new MenuItem(this.likeAction(commandId, {
-@@ -882,6 +914,7 @@
- 		].forEach(item => gotoMenu.append(item));
- 	}
- 
-+<<<<<<< .our
- 	private setTerminalMenu(terminalMenu: Electron.Menu): void {
- 		const newTerminal = this.createMenuItem(nls.localize({ key: 'miNewTerminal', comment: ['&& denotes a mnemonic'] }, "&&New Terminal"), 'workbench.action.terminal.new');
- 		const splitTerminal = this.createMenuItem(nls.localize({ key: 'miSplitTerminal', comment: ['&& denotes a mnemonic'] }, "&&Split Terminal"), 'workbench.action.terminal.split');
-@@ -912,6 +945,8 @@
- 		menuItems.forEach(item => terminalMenu.append(item));
- 	}
- 
-+=======
-+>>>>>>> .their
- 	private setDebugMenu(debugMenu: Electron.Menu): void {
- 		const start = this.createMenuItem(nls.localize({ key: 'miStartDebugging', comment: ['&& denotes a mnemonic'] }, "&&Start Debugging"), 'workbench.action.debug.start');
- 		const startWithoutDebugging = this.createMenuItem(nls.localize({ key: 'miStartWithoutDebugging', comment: ['&& denotes a mnemonic'] }, "Start &&Without Debugging"), 'workbench.action.debug.run');
-@@ -973,7 +1008,10 @@
- 		if (this.currentEnableNativeTabs) {
- 			const hasMultipleWindows = this.windowsMainService.getWindowCount() > 1;
- 
-+<<<<<<< .our
- 			this.nativeTabMenuItems.push(this.createMenuItem(nls.localize('mNewTab', "New Tab"), 'workbench.action.newWindowTab'));
-+=======
-+>>>>>>> .their
- 			this.nativeTabMenuItems.push(this.createMenuItem(nls.localize('mShowPreviousTab', "Show Previous Tab"), 'workbench.action.showPreviousWindowTab', hasMultipleWindows));
- 			this.nativeTabMenuItems.push(this.createMenuItem(nls.localize('mShowNextTab', "Show Next Tab"), 'workbench.action.showNextWindowTab', hasMultipleWindows));
- 			this.nativeTabMenuItems.push(this.createMenuItem(nls.localize('mMoveTabToNewWindow', "Move Tab to New Window"), 'workbench.action.moveWindowTabToNewWindow', hasMultipleWindows));
-@@ -1319,4 +1357,8 @@
- 
- function __separator__(): Electron.MenuItem {
- 	return new MenuItem({ type: 'separator' });
-+<<<<<<< .our
-+}
-+=======
- }
-+>>>>>>> .their
-changed in both
-  base   100644 a2a5757426433a58882519095d01091fcc97d142 src/vs/editor/contrib/folding/folding.ts
-  our    100644 520ad0ac57dad552f186000fca1b8457e0771fd8 src/vs/editor/contrib/folding/folding.ts
-  their  100644 13751401c44ede6edd49d0b3f51408f2354316eb src/vs/editor/contrib/folding/folding.ts
-changed in both
-  base   100644 d20f7346b8326a4d00670897365b6dea446c054f src/vs/editor/standalone/browser/simpleServices.ts
-  our    100644 231c2e182c38126cc58ce28e0a84a2cea202f8d7 src/vs/editor/standalone/browser/simpleServices.ts
-  their  100644 b3d9dbf7f14deea56fc5121808fe9861d8383a98 src/vs/editor/standalone/browser/simpleServices.ts
-@@ -45,7 +45,11 @@
- import { IModelService } from 'vs/editor/common/services/modelService';
- import { EditOperation } from 'vs/editor/common/core/editOperation';
- import { localize } from 'vs/nls';
-+<<<<<<< .our
- import { IUriLabelService, UriLabelRules } from 'vs/platform/uriLabel/common/uriLabel';
-+=======
-+import { IUriDisplayService, UriDisplayRules } from 'vs/platform/uriDisplay/common/uriDisplay';
-+>>>>>>> .their
- 
- export class SimpleModel implements ITextEditorModel {
- 
-@@ -592,11 +596,19 @@
- 	}
- }
- 
-+<<<<<<< .our
- export class SimpleUriLabelService implements IUriLabelService {
- 	_serviceBrand: any;
- 
- 	private readonly _onDidRegisterFormater: Emitter<{ scheme: string, formater: UriLabelRules }> = new Emitter<{ scheme: string, formater: UriLabelRules }>();
- 	public readonly onDidRegisterFormater: Event<{ scheme: string, formater: UriLabelRules }> = this._onDidRegisterFormater.event;
-+=======
-+export class SimpleUriDisplayService implements IUriDisplayService {
-+	_serviceBrand: any;
-+
-+	private readonly _onDidRegisterFormater: Emitter<{ scheme: string, formater: UriDisplayRules }> = new Emitter<{ scheme: string, formater: UriDisplayRules }>();
-+	public readonly onDidRegisterFormater: Event<{ scheme: string, formater: UriDisplayRules }> = this._onDidRegisterFormater.event;
-+>>>>>>> .their
- 
- 	public getLabel(resource: URI, relative?: boolean): string {
- 		if (resource.scheme === 'file') {
-@@ -605,7 +617,11 @@
- 		return resource.path;
- 	}
- 
-+<<<<<<< .our
- 	public registerFormater(schema: string, formater: UriLabelRules): IDisposable {
-+=======
-+	public registerFormater(schema: string, formater: UriDisplayRules): IDisposable {
-+>>>>>>> .their
- 		throw new Error('Not implemented');
- 	}
- }
-changed in both
-  base   100644 d3275d83f30e9ba73179496cbe99b2d65d40c7d0 src/vs/editor/standalone/browser/standaloneServices.ts
-  our    100644 d20dc25b60e240a7a8b6703b158753e12dd5c6f5 src/vs/editor/standalone/browser/standaloneServices.ts
-  their  100644 49375edbcffdabff108dfa98e62ad36358493a23 src/vs/editor/standalone/browser/standaloneServices.ts
-@@ -33,7 +33,11 @@
- import {
- 	SimpleConfigurationService, SimpleResourceConfigurationService, SimpleMenuService,
- 	SimpleProgressService, StandaloneCommandService, StandaloneKeybindingService, SimpleNotificationService,
-+<<<<<<< .our
- 	StandaloneTelemetryService, SimpleWorkspaceContextService, SimpleDialogService, SimpleBulkEditService, SimpleUriLabelService
-+=======
-+	StandaloneTelemetryService, SimpleWorkspaceContextService, SimpleDialogService, SimpleBulkEditService, SimpleUriDisplayService
-+>>>>>>> .their
- } from 'vs/editor/standalone/browser/simpleServices';
- import { ContextKeyService } from 'vs/platform/contextkey/browser/contextKeyService';
- import { IMenuService } from 'vs/platform/actions/common/actions';
-@@ -44,7 +48,11 @@
- import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
- import { IListService, ListService } from 'vs/platform/list/browser/listService';
- import { IBulkEditService } from 'vs/editor/browser/services/bulkEditService';
-+<<<<<<< .our
- import { IUriLabelService } from 'vs/platform/uriLabel/common/uriLabel';
-+=======
-+import { IUriDisplayService } from 'vs/platform/uriDisplay/common/uriDisplay';
-+>>>>>>> .their
- 
- export interface IEditorOverrideServices {
- 	[index: string]: any;
-@@ -122,7 +130,11 @@
- 
- 	export const contextService = define(IWorkspaceContextService, () => new SimpleWorkspaceContextService());
- 
-+<<<<<<< .our
- 	export const uriLabelService = define(IUriLabelService, () => new SimpleUriLabelService());
-+=======
-+	export const uriDisplayService = define(IUriDisplayService, () => new SimpleUriDisplayService());
-+>>>>>>> .their
- 
- 	export const telemetryService = define(ITelemetryService, () => new StandaloneTelemetryService());
- 
-changed in both
-  base   100644 438105b4d899d3ed6bd3351c7997c86b3e364248 src/vs/monaco.d.ts
-  our    100644 76dcf491ff9c1973ad61bf5d423713bb1a3b4e44 src/vs/monaco.d.ts
-  their  100644 b167c46390106623adecc441fb5674baa85cc80d src/vs/monaco.d.ts
-merged
-  result 100644 5bb9d8adba33a0c638cc28e059bc992ac40add8b src/vs/platform/actions/common/actions.ts
-  our    100644 f0ba370d22dfa5eb5e51b75ad8f132f6de5991a7 src/vs/platform/actions/common/actions.ts
-@@ -100,7 +100,6 @@
- 	static readonly MenubarTasksMenu = new MenuId();
- 	static readonly MenubarPreferencesMenu = new MenuId();
- 	static readonly MenubarHelpMenu = new MenuId();
--	static readonly MenubarTerminalMenu = new MenuId();
- 
- 	readonly id: string = String(MenuId.ID++);
- }
-changed in both
-  base   100644 796cfaffb92a7933b73b49d3d7031e8a3ca9edd6 src/vs/platform/history/electron-main/historyMainService.ts
-  our    100644 3f2657d385162e51b58c9ce88c62add6ba3ec1a3 src/vs/platform/history/electron-main/historyMainService.ts
-  their  100644 518916342b01071767f2ff5be57db947566195ce src/vs/platform/history/electron-main/historyMainService.ts
-@@ -26,12 +26,20 @@
- 
- interface ISerializedRecentlyOpened {
- 	workspaces2: (IWorkspaceIdentifier | string)[]; // IWorkspaceIdentifier or URI.toString()
-+<<<<<<< .our
- 	files2: string[]; // files as URI.toString()
- }
- 
- interface ILegacySerializedRecentlyOpened {
- 	workspaces: (IWorkspaceIdentifier | string | UriComponents)[]; // legacy (UriComponents was also supported for a few insider builds)
- 	files: string[]; // files as paths
-+=======
-+	files: string[];
-+>>>>>>> .their
-+}
-+
-+interface ILegacySerializedRecentlyOpened {
-+	workspaces: (IWorkspaceIdentifier | string | UriComponents)[]; // legacy (UriComponents was also supported for a few insider builds)
- }
- 
- export class HistoryMainService implements IHistoryMainService {
-@@ -271,7 +279,10 @@
- 					}
- 				}
- 			} else if (Array.isArray(storedRecents.workspaces)) {
-+<<<<<<< .our
- 				// TODO@martin legacy support can be removed at some point (6 month?)
-+=======
-+>>>>>>> .their
- 				// format of 1.25 and before
- 				for (const workspace of storedRecents.workspaces) {
- 					if (typeof workspace === 'string') {
-@@ -284,6 +295,7 @@
- 					}
- 				}
- 			}
-+<<<<<<< .our
- 			if (Array.isArray(storedRecents.files2)) {
- 				for (const file of storedRecents.files2) {
- 					if (typeof file === 'string') {
-@@ -294,6 +306,12 @@
- 				for (const file of storedRecents.files) {
- 					if (typeof file === 'string') {
- 						result.files.push(URI.file(file));
-+=======
-+			if (Array.isArray(storedRecents.files)) {
-+				for (const file of storedRecents.files) {
-+					if (typeof file === 'string') {
-+						result.files.push(file);
-+>>>>>>> .their
- 					}
- 				}
- 			}
-@@ -302,7 +320,11 @@
- 	}
- 
- 	private saveRecentlyOpened(recent: IRecentlyOpened): void {
-+<<<<<<< .our
- 		const serialized: ISerializedRecentlyOpened = { workspaces2: [], files2: [] };
-+=======
-+		const serialized: ISerializedRecentlyOpened = { workspaces2: [], files: recent.files };
-+>>>>>>> .their
- 		for (const workspace of recent.workspaces) {
- 			if (isSingleFolderWorkspaceIdentifier(workspace)) {
- 				serialized.workspaces2.push(workspace.toString());
-@@ -310,9 +332,12 @@
- 				serialized.workspaces2.push(workspace);
- 			}
- 		}
-+<<<<<<< .our
- 		for (const file of recent.files) {
- 			serialized.files2.push(file.toString());
- 		}
-+=======
-+>>>>>>> .their
- 		this.stateService.setItem(HistoryMainService.recentlyOpenedStorageKey, serialized);
- 	}
- 
-changed in both
-  base   100644 b4ed6f55eab488ad1302bbc7e30d7ffe795635f7 src/vs/platform/node/product.ts
-  our    100644 dbb84fd473f8212ea96a20a8f12d66c5b703786a src/vs/platform/node/product.ts
-  their  100644 a3dce3929b2bca1fa088832dc9ee386e46db7224 src/vs/platform/node/product.ts
-changed in both
-  base   100644 b1543ed3d2f9f297cb6222076ea75e8d4a0186da src/vs/platform/theme/common/colorRegistry.ts
-  our    100644 674f67411d4ee542ee937fac9146ef0768ec982d src/vs/platform/theme/common/colorRegistry.ts
-  their  100644 8d984bd6f21c8450d851a4c038289b73296eec90 src/vs/platform/theme/common/colorRegistry.ts
-@@ -223,6 +223,14 @@
- 
- export const progressBarBackground = registerColor('progressBar.background', { dark: Color.fromHex('#0E70C0'), light: Color.fromHex('#0E70C0'), hc: contrastBorder }, nls.localize('progressBarBackground', "Background color of the progress bar that can show for long running operations."));
- 
-+<<<<<<< .our
-+=======
-+export const breadcrumbsForeground = registerColor('breadcrumb.foreground', { light: Color.fromHex('#6C6C6C').transparent(.7), dark: Color.fromHex('#CCCCCC').transparent(.7), hc: Color.white.transparent(.7) }, nls.localize('breadcrumbsFocusForeground', "Color of focused breadcrumb items."));
-+export const breadcrumbsFocusForeground = registerColor('breadcrumb.focusForeground', { light: '#6C6C6C', dark: '#CCCCCC', hc: Color.white }, nls.localize('breadcrumbsFocusForeground', "Color of focused breadcrumb items."));
-+export const breadcrumbsActiveSelectionForeground = registerColor('breadcrumb.activeSelectionForeground', { light: '#6C6C6C', dark: '#CCCCCC', hc: Color.white }, nls.localize('breadcrumbsSelectedForegound', "Color of selected breadcrumb items."));
-+export const breadcrumbsPickerBackground = registerColor('breadcrumbPicker.background', { light: '#ECECEC', dark: '#252526', hc: Color.black }, nls.localize('breadcrumbsSelectedBackground', "Background color of breadcrumb item picker."));
-+
-+>>>>>>> .their
- /**
-  * Editor background color.
-  * Because of bug https://monacotools.visualstudio.com/DefaultCollection/Monaco/_workitems/edit/13254
-changed in both
-  base   100644 98eaf7888ca700629ba1266892ad9135c5089abf src/vs/workbench/api/node/apiCommands.ts
-  our    100644 d04d6b2334c914b4573cb10d4adea8925172017a src/vs/workbench/api/node/apiCommands.ts
-  their  100644 1d46c8c81858850247cb86a79ae2c7d5b6385825 src/vs/workbench/api/node/apiCommands.ts
-@@ -12,6 +12,7 @@
- import { ITextEditorOptions } from 'vs/platform/editor/common/editor';
- import { EditorViewColumn } from 'vs/workbench/api/shared/editor';
- import { EditorGroupLayout } from 'vs/workbench/services/group/common/editorGroupsService';
-+import { isWindows } from 'vs/base/common/platform';
- 
- // -----------------------------------------------------------------
- // The following commands are registered on both sides separately.
-@@ -49,11 +50,18 @@
- 		if (!uri) {
- 			return executor.executeCommand('_files.pickFolderAndOpen', forceNewWindow);
- 		}
-+<<<<<<< .our
- 		let correctedUri = isMalformedFileUri(uri);
- 		if (correctedUri) {
- 			// workaround for #55916 and #55891, will be removed in 1.28
- 			console.warn(`'vscode.openFolder' command invoked with an invalid URI (file:// scheme missing): '${uri}'. Converted to a 'file://' URI: ${correctedUri}`);
- 			uri = correctedUri;
-+=======
-+		if (!uri.scheme || isWindows && uri.scheme.match(/^[a-zA-Z]$/)) {
-+			// workaround for #55916 and #55891, will be removed in 1.28
-+			console.warn(`'vscode.openFolder' command invoked with an invalid URI (file:// scheme missing): '${uri}'. Converted to a 'file://' URI.`);
-+			uri = URI.file(uri.toString());
-+>>>>>>> .their
- 		}
- 
- 		return executor.executeCommand('_files.windowOpen', [uri], forceNewWindow);
-removed in local
-  base   100644 39c87100cce551f263420f6904834d778e9e2aab src/vs/workbench/browser/parts/menubar/menubar.contribution.ts
-  their  100644 04235f1557ddc62d458e20a7ae6f23675f8ef542 src/vs/workbench/browser/parts/menubar/menubar.contribution.ts
-removed in local
-  base   100644 b0cbfbf570f3193ab5f142bbbcca373b9c12cb5c src/vs/workbench/browser/parts/menubar/menubarPart.ts
-  their  100644 2f7e0891892de9bf1d0e8e3cd9b1ad8c6074f822 src/vs/workbench/browser/parts/menubar/menubarPart.ts
-changed in both
-  base   100644 fcadf9c40ac723aede0e60047890e6cd8f6f9a13 src/vs/workbench/electron-browser/media/shell.css
-  our    100644 1ce2598e143da86c4e183d8447113245812e5270 src/vs/workbench/electron-browser/media/shell.css
-  their  100644 5279eeb084868a804849dcdf2b7a59fa40eb0ee4 src/vs/workbench/electron-browser/media/shell.css
-@@ -81,12 +81,16 @@
- .monaco-shell .monaco-menu .monaco-action-bar.vertical .action-label:not(.separator),
- .monaco-shell .monaco-menu .monaco-action-bar.vertical .keybinding {
- 	font-size: inherit;
-+<<<<<<< .our
- 	padding: 0 2em;
- }
- 
- .monaco-shell .monaco-menu .monaco-action-bar.vertical .menu-item-check {
- 	font-size: inherit;
- 	width: 2em;
-+=======
-+	padding: 0 1.5em;
-+>>>>>>> .their
- }
- 
- .monaco-shell .monaco-menu .monaco-action-bar.vertical .action-label.separator {
-changed in both
-  base   100644 b8d45826a4489e21e6c35732d6afcf0085a73e68 src/vs/workbench/parts/debug/electron-browser/debugService.ts
-  our    100644 a5e2dcee7a0eb14bc388d84c6c7cac591067b1b2 src/vs/workbench/parts/debug/electron-browser/debugService.ts
-  their  100644 61162e90a69902a792aaf58874d941a1a57435cc src/vs/workbench/parts/debug/electron-browser/debugService.ts
-@@ -171,7 +171,9 @@
- 			} else {
- 				const root = raw.root;
- 				raw.disconnect().done(undefined, errors.onUnexpectedError);
--				this.doCreateSession(root, { resolved: session.configuration, unresolved: session.unresolvedConfiguration }, session.getId());
-+				setTimeout(_ => {
-+					this.doCreateSession(root, { resolved: session.configuration, unresolved: session.unresolvedConfiguration }, session.getId());
-+				}, 1000);
- 			}
- 
- 			return;
-changed in both
-  base   100644 8fc5ed3bca172f911cb941e7aa300e1d97bd1963 src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
-  our    100644 3bfb6cffba943bf68a9fa9c24fb1903c66dd3fad src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
-  their  100644 70edc1d5fabc96d5d5c5cd512c403afdba337619 src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
-changed in both
-  base   100644 849d454f33dac6022061ddd66b34aa49cc0d4a06 src/vs/workbench/parts/splash/electron-browser/partsSplash.contribution.ts
-  our    100644 5f76b802ea5a6e6aafeb989856a8672f1d126c9d src/vs/workbench/parts/splash/electron-browser/partsSplash.contribution.ts
-  their  100644 4632aaf6efb6ed7dc220c62187dbb4c1320cda14 src/vs/workbench/parts/splash/electron-browser/partsSplash.contribution.ts
-@@ -17,8 +17,12 @@
- import { IDisposable, dispose } from 'vs/base/common/lifecycle';
- import { debounceEvent } from 'vs/base/common/event';
- import { DEFAULT_EDITOR_MIN_DIMENSIONS } from 'vs/workbench/browser/parts/editor/editor';
-+<<<<<<< .our
- import { ColorIdentifier, editorBackground, foreground } from 'vs/platform/theme/common/colorRegistry';
- import { Color } from 'vs/base/common/color';
-+=======
-+import { ColorIdentifier } from 'vs/platform/theme/common/colorRegistry';
-+>>>>>>> .their
- 
- class PartsSplash {
- 
-@@ -45,10 +49,14 @@
- 	}
- 
- 	private _savePartsSplash() {
-+<<<<<<< .our
- 		const baseTheme = getThemeTypeSelector(this._themeService.getTheme().type);
- 		const colorInfo = {
- 			foreground: this._getThemeColor(foreground),
- 			editorBackground: this._getThemeColor(editorBackground),
-+=======
-+		const colorInfo = {
-+>>>>>>> .their
- 			titleBarBackground: this._getThemeColor(themes.TITLE_BAR_ACTIVE_BACKGROUND),
- 			activityBarBackground: this._getThemeColor(themes.ACTIVITY_BAR_BACKGROUND),
- 			sideBarBackground: this._getThemeColor(themes.SIDE_BAR_BACKGROUND),
-@@ -82,6 +90,12 @@
- 		return color ? color.toString() : undefined;
- 	}
- 
-+	private _getThemeColor(id: ColorIdentifier): string {
-+		const theme = this._themeService.getTheme();
-+		const color = theme.getColor(id);
-+		return color ? color.toString() : undefined;
-+	}
-+
- 	private _removePartsSplash(): void {
- 		let element = document.getElementById(PartsSplash._splashElementId);
- 		if (element) {
-removed in remote
-  base   100644 52498a02f5195349043389a3f51361135c2c0723 src/vs/workbench/parts/terminal/common/terminalMenu.ts
-  our    100644 52498a02f5195349043389a3f51361135c2c0723 src/vs/workbench/parts/terminal/common/terminalMenu.ts
-@@ -1,120 +0,0 @@
--/*---------------------------------------------------------------------------------------------
-- *  Copyright (c) Microsoft Corporation. All rights reserved.
-- *  Licensed under the MIT License. See License.txt in the project root for license information.
-- *--------------------------------------------------------------------------------------------*/
--
--import * as nls from 'vs/nls';
--import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
--import { TERMINAL_COMMAND_ID } from 'vs/workbench/parts/terminal/common/terminalCommands';
--import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
--
--export function setupTerminalMenu() {
--
--	// View menu
--
--	MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
--		group: '4_panels',
--		command: {
--			id: TERMINAL_COMMAND_ID.TOGGLE,
--			title: nls.localize({ key: 'miToggleIntegratedTerminal', comment: ['&& denotes a mnemonic'] }, "&&Integrated Terminal")
--		},
--		order: 3
--	});
--
--	// Manage
--	const manageGroup = '1_manage';
--	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
--		group: manageGroup,
--		command: {
--			id: TERMINAL_COMMAND_ID.NEW,
--			title: nls.localize({ key: 'miNewTerminal', comment: ['&& denotes a mnemonic'] }, "&&New Terminal")
--		},
--		order: 1
--	});
--	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
--		group: manageGroup,
--		command: {
--			id: TERMINAL_COMMAND_ID.SPLIT,
--			title: nls.localize({ key: 'miSplitTerminal', comment: ['&& denotes a mnemonic'] }, "&&Split Terminal"),
--			precondition: ContextKeyExpr.has('terminalIsOpen')
--		},
--		order: 2
--	});
--
--	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
--		group: manageGroup,
--		command: {
--			id: TERMINAL_COMMAND_ID.KILL,
--			title: nls.localize({ key: 'miKillTerminal', comment: ['&& denotes a mnemonic'] }, "&&Kill Terminal"),
--			precondition: ContextKeyExpr.has('terminalIsOpen')
--		},
--		order: 3
--	});
--
--	// Run
--	const runGroup = '2_run';
--	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
--		group: runGroup,
--		command: {
--			id: TERMINAL_COMMAND_ID.CLEAR,
--			title: nls.localize({ key: 'miClear', comment: ['&& denotes a mnemonic'] }, "&&Clear"),
--			precondition: ContextKeyExpr.has('terminalIsOpen')
--		},
--		order: 1
--	});
--	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
--		group: runGroup,
--		command: {
--			id: TERMINAL_COMMAND_ID.RUN_ACTIVE_FILE,
--			title: nls.localize({ key: 'miRunActiveFile', comment: ['&& denotes a mnemonic'] }, "Run &&Active File")
--		},
--		order: 2
--	});
--	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
--		group: runGroup,
--		command: {
--			id: TERMINAL_COMMAND_ID.RUN_SELECTED_TEXT,
--			title: nls.localize({ key: 'miRunSelectedText', comment: ['&& denotes a mnemonic'] }, "Run &&Selected Text")
--		},
--		order: 3
--	});
--
--	// Navigation
--	const navigationGroup = '3_navigation';
--	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
--		group: navigationGroup,
--		command: {
--			id: TERMINAL_COMMAND_ID.SCROLL_TO_PREVIOUS_COMMAND,
--			title: nls.localize({ key: 'miScrollToPreviousCommand', comment: ['&& denotes a mnemonic'] }, "Scroll To Previous Command"),
--			precondition: ContextKeyExpr.has('terminalIsOpen')
--		},
--		order: 1
--	});
--	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
--		group: navigationGroup,
--		command: {
--			id: TERMINAL_COMMAND_ID.SCROLL_TO_NEXT_COMMAND,
--			title: nls.localize({ key: 'miScrollToNextCommand', comment: ['&& denotes a mnemonic'] }, "Scroll To Next Command"),
--			precondition: ContextKeyExpr.has('terminalIsOpen')
--		},
--		order: 2
--	});
--	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
--		group: navigationGroup,
--		command: {
--			id: TERMINAL_COMMAND_ID.SELECT_TO_PREVIOUS_COMMAND,
--			title: nls.localize({ key: 'miSelectToPreviousCommand', comment: ['&& denotes a mnemonic'] }, "Select To Previous Command"),
--			precondition: ContextKeyExpr.has('terminalIsOpen')
--		},
--		order: 3
--	});
--	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
--		group: navigationGroup,
--		command: {
--			id: TERMINAL_COMMAND_ID.SELECT_TO_NEXT_COMMAND,
--			title: nls.localize({ key: 'miSelectToNextCommand', comment: ['&& denotes a mnemonic'] }, "Select To Next Command"),
--			precondition: ContextKeyExpr.has('terminalIsOpen')
--		},
--		order: 4
--	});
--}
-changed in both
-  base   100644 4e288255067120a2f2e0e30d5b5c348f01427502 src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
-  our    100644 9ef058f2994595d2b04a5e832c71a30592895aac src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
-  their  100644 074c048a09cb976e2f5d590dbe917e65c877b811 src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
-@@ -37,7 +37,6 @@
- import { TerminalPanel } from 'vs/workbench/parts/terminal/electron-browser/terminalPanel';
- import { TerminalPickerHandler } from 'vs/workbench/parts/terminal/browser/terminalQuickOpen';
- import { setupTerminalCommands, TERMINAL_COMMAND_ID } from 'vs/workbench/parts/terminal/common/terminalCommands';
--import { setupTerminalMenu } from 'vs/workbench/parts/terminal/common/terminalMenu';
- 
- const quickOpenRegistry = (Registry.as<IQuickOpenRegistry>(QuickOpenExtensions.Quickopen));
- 
-@@ -535,6 +534,5 @@
- actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ToggleEscapeSequenceLoggingAction, ToggleEscapeSequenceLoggingAction.ID, ToggleEscapeSequenceLoggingAction.LABEL), 'Terminal: Toggle Escape Sequence Logging', category);
- 
- setupTerminalCommands();
--setupTerminalMenu();
- 
- registerColors();
-changed in both
-  base   100644 2ce9bd83b960352f59226489b3f1ae767fe7a82d src/vs/workbench/parts/update/electron-browser/update.ts
-  our    100644 2e468debc61fae01ce2d9c4b673a81993982cc62 src/vs/workbench/parts/update/electron-browser/update.ts
-  their  100644 04edd26fd77e5fc54160c4dd3155caa68d3b45ea src/vs/workbench/parts/update/electron-browser/update.ts
-@@ -249,10 +249,13 @@
- 		@IOpenerService private openerService: IOpenerService,
- 		@IUpdateService private updateService: IUpdateService
- 	) {
-+<<<<<<< .our
- 		if (!environmentService.isBuilt) {
- 			return;
- 		}
- 
-+=======
-+>>>>>>> .their
- 		const neverShowAgain = new NeverShowAgain(WinUserSetupContribution.KEY_BOTH, this.storageService);
- 
- 		if (!neverShowAgain.shouldShow()) {
-@@ -267,12 +270,22 @@
- 			}
- 
- 			const handle = this.notificationService.prompt(
-+<<<<<<< .our
- 				severity.Info,
- 				nls.localize('usersetupsystem', "You are running the system-wide installation of {0}, while having the user-wide distribution installed as well.", product.nameShort),
- 				[
- 					{ label: nls.localize('ok', "OK"), run: () => null },
- 					{
- 						label: nls.localize('okneveragain', "OK, Don't Show Again"),
-+=======
-+				severity.Warning,
-+				nls.localize('usersetupsystem', "You are running the system-wide installation of {0}, while having the user-wide distribution installed as well. Make sure you're running the {0} version you expect.", product.nameShort),
-+				[
-+					{ label: nls.localize('ok', "OK"), run: () => null },
-+					{
-+						label: nls.localize('neveragain', "Don't Show Again"),
-+						isSecondary: true,
-+>>>>>>> .their
- 						run: () => {
- 							neverShowAgain.action.run(handle);
- 							neverShowAgain.action.dispose();
-changed in both
-  base   100644 41e23fc99811fdb6c8d80ca026eef510574e9115 src/vs/workbench/services/textfile/common/textFileEditorModel.ts
-  our    100644 6faef447dc315ab88c3c3c652840860db088fa46 src/vs/workbench/services/textfile/common/textFileEditorModel.ts
-  their  100644 0c3642145b3164f68b07cbb474726b0f76c297bb src/vs/workbench/services/textfile/common/textFileEditorModel.ts
-changed in both
-  base   100644 b0b61b7a439360d1f66858259ab408ba819b2ea9 yarn.lock
-  our    100644 b56aa332449f9eb6db4b03a16548d91df21604bb yarn.lock
-  their  100644 79f54d1676d113d2142fe751cd1aa121ecbef2e3 yarn.lock
diff --git a/app/test/fixtures/merge-parser/vscode/merge-standalone-0.6.x-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-standalone-0.6.x-into-master.txt
deleted file mode 100644
index 17fe74de02c..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-standalone-0.6.x-into-master.txt
+++ /dev/null
@@ -1,252 +0,0 @@
-changed in both
-  base   100644 27f8587867ce78a4840de0250eac9a2a370dc225 build/gulpfile.editor.js
-  our    100644 52d1f0fcf323631277651ff28381ae49c0fa6558 build/gulpfile.editor.js
-  their  100644 fb56d7c575f9d6efb9a7c0fe1793cab01898d41a build/gulpfile.editor.js
-@@ -44,6 +44,12 @@
- 	'!out-build/vs/base/browser/ui/splitview/**/*',
- 	'!out-build/vs/base/browser/ui/toolbar/**/*',
- 	'!out-build/vs/base/browser/ui/octiconLabel/**/*',
-+<<<<<<< .our
-+=======
-+	'!out-build/vs/editor/contrib/defineKeybinding/**/*',
-+	'out-build/vs/base/worker/workerMainCompatibility.html',
-+	'out-build/vs/base/worker/workerMain.{js,js.map}',
-+>>>>>>> .their
- 	'!out-build/vs/workbench/**',
- 	'!**/test/**'
- ];
-changed in both
-  base   100644 29b175e75977c04e65640a76f9fb0f3a885c6f47 build/monaco/ThirdPartyNotices.txt
-  our    100644 45eeffb9f3298b597a40f9d85fccf8adf6d6b9ba build/monaco/ThirdPartyNotices.txt
-  their  100644 ced73100132831b99bd5bc23e60d97200c83d118 build/monaco/ThirdPartyNotices.txt
-@@ -1,3 +1,4 @@
-+<<<<<<< .our
- THIRD-PARTY SOFTWARE NOTICES AND INFORMATION
- Do Not Translate or Localize
- 
-@@ -83,3 +84,128 @@
- THE SOFTWARE.
- =========================================
- END OF chjj-marked NOTICES AND INFORMATION
-+=======
-+THIRD-PARTY SOFTWARE NOTICES AND INFORMATION
-+Do Not Translate or Localize
-+
-+This project incorporates components from the projects listed below. The original copyright notices and the licenses
-+under which Microsoft received such components are set forth below. Microsoft reserves all rights not expressly granted
-+herein, whether by implication, estoppel or otherwise.
-+
-+
-+
-+
-+%% winjs version 4.4.0 (https://github.com/winjs/winjs)
-+=========================================
-+WinJS
-+
-+Copyright (c) Microsoft Corporation
-+
-+All rights reserved.
-+
-+MIT License
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ""Software""), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+
-+=========================================
-+END OF winjs NOTICES AND INFORMATION
-+
-+
-+
-+
-+%% HTML 5.1 W3C Working Draft version 08 October 2015 (http://www.w3.org/TR/2015/WD-html51-20151008/)
-+=========================================
-+Copyright © 2015 W3C® (MIT, ERCIM, Keio, Beihang). This software or document includes material copied
-+from or derived from HTML 5.1 W3C Working Draft (http://www.w3.org/TR/2015/WD-html51-20151008/.)
-+
-+THIS DOCUMENT IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT
-+NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF
-+THE DOCUMENT ARE SUITABLE FOR ANY PURPOSE; NOR THAT THE IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY
-+PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-+
-+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE
-+DOCUMENT OR THE PERFORMANCE OR IMPLEMENTATION OF THE CONTENTS THEREOF.
-+
-+The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to this document or its contents
-+without specific, written prior permission. Title to copyright in this document will at all times remain with copyright holders.
-+=========================================
-+END OF HTML 5.1 W3C Working Draft NOTICES AND INFORMATION
-+
-+
-+
-+
-+%% js-beautify version 1.5.10 (https://github.com/beautify-web/js-beautify)
-+=========================================
-+The MIT License (MIT)
-+
-+Copyright (c) 2007-2013 Einar Lielmanis and contributors.
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+=========================================
-+END OF js-beautify NOTICES AND INFORMATION
-+
-+
-+
-+
-+%% string_scorer version 0.1.20 (https://github.com/joshaven/string_score)
-+=========================================
-+This software is released under the MIT license:
-+
-+Copyright (c) Joshaven Potter
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy of
-+this software and associated documentation files (the "Software"), to deal in
-+the Software without restriction, including without limitation the rights to
-+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-+the Software, and to permit persons to whom the Software is furnished to do so,
-+subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in all
-+copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+=========================================
-+END OF string_scorer NOTICES AND INFORMATION
-+
-+
-+
-+
-+%% chjj-marked NOTICES AND INFORMATION BEGIN HERE
-+=========================================
-+The MIT License (MIT)
-+
-+Copyright (c) 2011-2014, Christopher Jeffrey (https://github.com/chjj/)
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy
-+of this software and associated documentation files (the "Software"), to deal
-+in the Software without restriction, including without limitation the rights
-+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+copies of the Software, and to permit persons to whom the Software is
-+furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in
-+all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-+THE SOFTWARE.
-+=========================================
-+END OF chjj-marked NOTICES AND INFORMATION
-+>>>>>>> .their
-changed in both
-  base   100644 9575f60936299bf2459bfa33db679bd16b23d720 build/monaco/package.json
-  our    100644 efd919085b2ffc82da8d810c609a9ed217bffb35 build/monaco/package.json
-  their  100644 0394ef9c29b941540bdb82fa239f2e5fb42b6b2c build/monaco/package.json
-@@ -1,7 +1,11 @@
- {
-   "name": "monaco-editor-core",
-   "private": true,
-+<<<<<<< .our
-   "version": "0.14.3",
-+=======
-+  "version": "0.6.1",
-+>>>>>>> .their
-   "description": "A browser based code editor",
-   "author": "Microsoft Corporation",
-   "license": "MIT",
-removed in local
-  base   100644 6341ee3386afa8aba209727d81ed1aaeeca4c99b src/vs/editor/browser/controller/keyboardHandler.ts
-  their  100644 a8040a835af695ea701672a43eb6cee65f080c05 src/vs/editor/browser/controller/keyboardHandler.ts
-removed in local
-  base   100644 a7cd30e3c4eaa89ad406ed2c67403280a0ce0def src/vs/editor/browser/standalone/simpleServices.ts
-  their  100644 57ab0735e660711bebcd41603a9d156f8702edfd src/vs/editor/browser/standalone/simpleServices.ts
-removed in local
-  base   100644 9c6ed0740a112f5071d7494325acb02e3652d79f src/vs/editor/browser/standalone/standaloneCodeEditor.ts
-  their  100644 7b7df49ea994fa708460a66131cca1ffb3c2bfc2 src/vs/editor/browser/standalone/standaloneCodeEditor.ts
-removed in local
-  base   100644 a5334880b00d0dc369b99da1bd5286bce3ce7f2b src/vs/editor/browser/standalone/standaloneEditor.ts
-  their  100644 06c9447b36fdb30e0aaa415f0b232b7e10881289 src/vs/editor/browser/standalone/standaloneEditor.ts
-removed in local
-  base   100644 5408ac69bbd6d7a0b787699cf3a0f8b2f9df2614 src/vs/editor/browser/standalone/standaloneServices.ts
-  their  100644 9c1bb4e2c2bde59c7d8776e8760e69635bb81cfb src/vs/editor/browser/standalone/standaloneServices.ts
-removed in local
-  base   100644 ee8ad3804c0cd73a1b52524d24c979d222ac0160 src/vs/editor/common/controller/textAreaHandler.ts
-  their  100644 90c7dcdb48fe2fed646e5c813d0ab199b8b29218 src/vs/editor/common/controller/textAreaHandler.ts
-added in remote
-  their  100644 27303a890e2b226cdddc28b39f3f023b79e260f4 src/vs/editor/test/browser/standalone/simpleServices.test.ts
-@@ -0,0 +1,54 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+'use strict';
-+
-+import * as assert from 'assert';
-+import {ContextKeyService} from 'vs/platform/contextkey/browser/contextKeyService';
-+import {SimpleConfigurationService, SimpleMessageService, SimpleExtensionService, StandaloneKeybindingService, StandaloneCommandService} from 'vs/editor/browser/standalone/simpleServices';
-+import {InstantiationService} from 'vs/platform/instantiation/common/instantiationService';
-+import {ServiceCollection} from 'vs/platform/instantiation/common/serviceCollection';
-+import {KeyCode} from 'vs/base/common/keyCodes';
-+import {IKeyboardEvent} from 'vs/base/browser/keyboardEvent';
-+
-+suite('StandaloneKeybindingService', () => {
-+
-+	class TestStandaloneKeybindingService extends StandaloneKeybindingService {
-+		public dispatch(e: IKeyboardEvent): void {
-+			super._dispatch(e);
-+		}
-+	}
-+
-+	test('issue Microsoft/monaco-editor#167', () => {
-+
-+		let serviceCollection = new ServiceCollection();
-+		const instantiationService = new InstantiationService(serviceCollection, true);
-+
-+		let configurationService = new SimpleConfigurationService();
-+
-+		let contextKeyService = new ContextKeyService(configurationService);
-+
-+		let extensionService = new SimpleExtensionService();
-+
-+		let commandService = new StandaloneCommandService(instantiationService, extensionService);
-+
-+		let messageService = new SimpleMessageService();
-+
-+		let domElement = document.createElement('div');
-+
-+		let keybindingService = new TestStandaloneKeybindingService(contextKeyService, commandService, messageService, domElement);
-+
-+		let commandInvoked = false;
-+		keybindingService.addDynamicKeybinding(KeyCode.F9, () => {
-+			commandInvoked = true;
-+		}, null);
-+
-+		keybindingService.dispatch(<any>{
-+			asKeybinding: () => KeyCode.F9,
-+			preventDefault: () => {}
-+		});
-+
-+		assert.ok(commandInvoked, 'command invoked');
-+	});
-+});
-removed in local
-  base   100644 b6f0f43df9a0afa846cad0f9c8582d1cbf14a491 src/vs/platform/commands/common/commandService.ts
-  their  100644 c71310be8b6f149fb7c91d296c009d13ef126611 src/vs/platform/commands/common/commandService.ts
-removed in local
-  base   100644 1923b3da74f76850affc757bf10fcebc571eb01e src/vs/platform/keybinding/browser/keybindingServiceImpl.ts
-  their  100644 f79d4b4220c1554a63e5e97044cf5060ace5c13f src/vs/platform/keybinding/browser/keybindingServiceImpl.ts
diff --git a/app/test/fixtures/merge-parser/vscode/merge-standalone-0.7.x-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-standalone-0.7.x-into-master.txt
deleted file mode 100644
index b06fddb48b7..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-standalone-0.7.x-into-master.txt
+++ /dev/null
@@ -1,6752 +0,0 @@
-changed in both
-  base   100644 e9b918f69833d1b38d36130f044a948940a0631b build/monaco/package.json
-  our    100644 efd919085b2ffc82da8d810c609a9ed217bffb35 build/monaco/package.json
-  their  100644 2d5c119e81b1c89c6d6444192e6e4676e067f437 build/monaco/package.json
-@@ -1,7 +1,11 @@
- {
-   "name": "monaco-editor-core",
-   "private": true,
-+<<<<<<< .our
-   "version": "0.14.3",
-+=======
-+  "version": "0.7.3",
-+>>>>>>> .their
-   "description": "A browser based code editor",
-   "author": "Microsoft Corporation",
-   "license": "MIT",
-removed in local
-  base   100644 cb7e444264682002e9447232092bf29c48370a6c src/vs/editor/browser/standalone/standaloneLanguages.ts
-  their  100644 1dd17021bec04da15b3921118881f645658c1e96 src/vs/editor/browser/standalone/standaloneLanguages.ts
-removed in local
-  base   100644 28d4a2debea41c2567e8017cc3b1d5efc09e9d29 src/vs/editor/common/commonCodeEditor.ts
-  their  100644 c74baecfea6baa4062f194002e8e82d6044e4923 src/vs/editor/common/commonCodeEditor.ts
-changed in both
-  base   100644 f64c674ec5434983c29a8f05da71a3bda8549249 src/vs/editor/common/editorCommon.ts
-  our    100644 8ab17ce6977a746a13f9fe016e9948d332de49ca src/vs/editor/common/editorCommon.ts
-  their  100644 47bc76baaa3b08c907277d86e7a1d01f170f8fdb src/vs/editor/common/editorCommon.ts
-@@ -458,7 +458,3664 @@
- 	 * @see `ITextModel.changeDecorations`
- 	 * @internal
- 	 */
-+<<<<<<< .our
- 	changeDecorations(callback: (changeAccessor: IModelDecorationsChangeAccessor) => any): any;
-+=======
-+	formatOnType?:boolean;
-+	/**
-+	 * Enable the suggestion box to pop-up on trigger characters.
-+	 * Defaults to true.
-+	 */
-+	suggestOnTriggerCharacters?: boolean;
-+	/**
-+	 * Accept suggestions on ENTER.
-+	 * Defaults to true.
-+	 */
-+	acceptSuggestionOnEnter?: boolean;
-+	/**
-+	 * Enable snippet suggestions. Default to 'true'.
-+	 */
-+	snippetSuggestions?: 'top' | 'bottom' | 'inline' | 'none';
-+	/**
-+	 * Enable tab completion. Defaults to 'false'
-+	 */
-+	tabCompletion?: boolean;
-+	/**
-+	 * Enable word based suggestions. Defaults to 'true'
-+	 */
-+	wordBasedSuggestions?: boolean;
-+	/**
-+	 * Enable selection highlight.
-+	 * Defaults to true.
-+	 */
-+	selectionHighlight?:boolean;
-+	/**
-+	 * Show code lens
-+	 * Defaults to true.
-+	 */
-+	codeLens?: boolean;
-+	/**
-+	 * @deprecated - use codeLens instead
-+	 * @internal
-+	 */
-+	referenceInfos?: boolean;
-+	/**
-+	 * Enable code folding
-+	 * Defaults to true.
-+	 */
-+	folding?: boolean;
-+	/**
-+	 * Enable rendering of whitespace.
-+	 * Defaults to none.
-+	 */
-+	renderWhitespace?: 'none' | 'boundary' | 'all';
-+	/**
-+	 * Enable rendering of control characters.
-+	 * Defaults to false.
-+	 */
-+	renderControlCharacters?: boolean;
-+	/**
-+	 * Enable rendering of indent guides.
-+	 * Defaults to false.
-+	 */
-+	renderIndentGuides?: boolean;
-+	/**
-+	 * Enable rendering of current line highlight.
-+	 * Defaults to true.
-+	 */
-+	renderLineHighlight?: boolean;
-+	/**
-+	 * Inserting and deleting whitespace follows tab stops.
-+	 */
-+	useTabStops?: boolean;
-+	/**
-+	 * The font family
-+	 */
-+	fontFamily?: string;
-+	/**
-+	 * The font weight
-+	 */
-+	fontWeight?: 'normal'|'bold'|'bolder'|'lighter'|'initial'|'inherit'|'100'|'200'|'300'|'400'|'500'|'600'|'700'|'800'|'900';
-+	/**
-+	 * The font size
-+	 */
-+	fontSize?: number;
-+	/**
-+	 * The line height
-+	 */
-+	lineHeight?: number;
-+}
-+
-+/**
-+ * Configuration options for the diff editor.
-+ */
-+export interface IDiffEditorOptions extends IEditorOptions {
-+	/**
-+	 * Allow the user to resize the diff editor split view.
-+	 * Defaults to true.
-+	 */
-+	enableSplitViewResizing?: boolean;
-+	/**
-+	 * Render the differences in two side-by-side editors.
-+	 * Defaults to true.
-+	 */
-+	renderSideBySide?: boolean;
-+	/**
-+	 * Compute the diff by ignoring leading/trailing whitespace
-+	 * Defaults to true.
-+	 */
-+	ignoreTrimWhitespace?: boolean;
-+	/**
-+	 * Original model should be editable?
-+	 * Defaults to false.
-+	 */
-+	originalEditable?: boolean;
-+}
-+
-+export class InternalEditorScrollbarOptions {
-+	_internalEditorScrollbarOptionsBrand: void;
-+
-+	arrowSize:number;
-+	vertical:ScrollbarVisibility;
-+	horizontal:ScrollbarVisibility;
-+	useShadows:boolean;
-+	verticalHasArrows:boolean;
-+	horizontalHasArrows:boolean;
-+	handleMouseWheel: boolean;
-+	horizontalScrollbarSize: number;
-+	horizontalSliderSize: number;
-+	verticalScrollbarSize: number;
-+	verticalSliderSize: number;
-+	mouseWheelScrollSensitivity: number;
-+
-+	/**
-+	 * @internal
-+	 */
-+	constructor(source:{
-+		arrowSize:number;
-+		vertical:ScrollbarVisibility;
-+		horizontal:ScrollbarVisibility;
-+		useShadows:boolean;
-+		verticalHasArrows:boolean;
-+		horizontalHasArrows:boolean;
-+		handleMouseWheel: boolean;
-+		horizontalScrollbarSize: number;
-+		horizontalSliderSize: number;
-+		verticalScrollbarSize: number;
-+		verticalSliderSize: number;
-+		mouseWheelScrollSensitivity: number;
-+	}) {
-+		this.arrowSize = source.arrowSize|0;
-+		this.vertical = source.vertical|0;
-+		this.horizontal = source.horizontal|0;
-+		this.useShadows = Boolean(source.useShadows);
-+		this.verticalHasArrows = Boolean(source.verticalHasArrows);
-+		this.horizontalHasArrows = Boolean(source.horizontalHasArrows);
-+		this.handleMouseWheel = Boolean(source.handleMouseWheel);
-+		this.horizontalScrollbarSize = source.horizontalScrollbarSize|0;
-+		this.horizontalSliderSize = source.horizontalSliderSize|0;
-+		this.verticalScrollbarSize = source.verticalScrollbarSize|0;
-+		this.verticalSliderSize = source.verticalSliderSize|0;
-+		this.mouseWheelScrollSensitivity = Number(source.mouseWheelScrollSensitivity);
-+	}
-+
-+	/**
-+	 * @internal
-+	 */
-+	public equals(other:InternalEditorScrollbarOptions): boolean {
-+		return (
-+			this.arrowSize === other.arrowSize
-+			&& this.vertical === other.vertical
-+			&& this.horizontal === other.horizontal
-+			&& this.useShadows === other.useShadows
-+			&& this.verticalHasArrows === other.verticalHasArrows
-+			&& this.horizontalHasArrows === other.horizontalHasArrows
-+			&& this.handleMouseWheel === other.handleMouseWheel
-+			&& this.horizontalScrollbarSize === other.horizontalScrollbarSize
-+			&& this.horizontalSliderSize === other.horizontalSliderSize
-+			&& this.verticalScrollbarSize === other.verticalScrollbarSize
-+			&& this.verticalSliderSize === other.verticalSliderSize
-+			&& this.mouseWheelScrollSensitivity === other.mouseWheelScrollSensitivity
-+		);
-+	}
-+
-+	/**
-+	 * @internal
-+	 */
-+	public clone(): InternalEditorScrollbarOptions {
-+		return new InternalEditorScrollbarOptions(this);
-+	}
-+}
-+
-+export class EditorWrappingInfo {
-+	_editorWrappingInfoBrand: void;
-+
-+	isViewportWrapping: boolean;
-+	wrappingColumn: number;
-+	wrappingIndent: WrappingIndent;
-+	wordWrapBreakBeforeCharacters: string;
-+	wordWrapBreakAfterCharacters: string;
-+	wordWrapBreakObtrusiveCharacters: string;
-+
-+	/**
-+	 * @internal
-+	 */
-+	constructor(source:{
-+		isViewportWrapping: boolean;
-+		wrappingColumn: number;
-+		wrappingIndent: WrappingIndent;
-+		wordWrapBreakBeforeCharacters: string;
-+		wordWrapBreakAfterCharacters: string;
-+		wordWrapBreakObtrusiveCharacters: string;
-+	}) {
-+		this.isViewportWrapping = Boolean(source.isViewportWrapping);
-+		this.wrappingColumn = source.wrappingColumn|0;
-+		this.wrappingIndent = source.wrappingIndent|0;
-+		this.wordWrapBreakBeforeCharacters = String(source.wordWrapBreakBeforeCharacters);
-+		this.wordWrapBreakAfterCharacters = String(source.wordWrapBreakAfterCharacters);
-+		this.wordWrapBreakObtrusiveCharacters = String(source.wordWrapBreakObtrusiveCharacters);
-+	}
-+
-+	/**
-+	 * @internal
-+	 */
-+	public equals(other:EditorWrappingInfo): boolean {
-+		return (
-+			this.isViewportWrapping === other.isViewportWrapping
-+			&& this.wrappingColumn === other.wrappingColumn
-+			&& this.wrappingIndent === other.wrappingIndent
-+			&& this.wordWrapBreakBeforeCharacters === other.wordWrapBreakBeforeCharacters
-+			&& this.wordWrapBreakAfterCharacters === other.wordWrapBreakAfterCharacters
-+			&& this.wordWrapBreakObtrusiveCharacters === other.wordWrapBreakObtrusiveCharacters
-+		);
-+	}
-+
-+	/**
-+	 * @internal
-+	 */
-+	public clone(): EditorWrappingInfo {
-+		return new EditorWrappingInfo(this);
-+	}
-+}
-+
-+export class InternalEditorViewOptions {
-+	_internalEditorViewOptionsBrand: void;
-+
-+	theme:string;
-+	canUseTranslate3d:boolean;
-+	experimentalScreenReader: boolean;
-+	rulers: number[];
-+	ariaLabel: string;
-+	renderLineNumbers:boolean;
-+	renderCustomLineNumbers: (lineNumber:number)=>string;
-+	renderRelativeLineNumbers: boolean;
-+	selectOnLineNumbers:boolean;
-+	glyphMargin:boolean;
-+	revealHorizontalRightPadding:number;
-+	roundedSelection:boolean;
-+	overviewRulerLanes:number;
-+	cursorBlinking:TextEditorCursorBlinkingStyle;
-+	mouseWheelZoom:boolean;
-+	cursorStyle:TextEditorCursorStyle;
-+	hideCursorInOverviewRuler:boolean;
-+	scrollBeyondLastLine:boolean;
-+	editorClassName: string;
-+	stopRenderingLineAfter: number;
-+	renderWhitespace: 'none' | 'boundary' | 'all';
-+	renderControlCharacters: boolean;
-+	renderIndentGuides: boolean;
-+	renderLineHighlight: boolean;
-+	scrollbar:InternalEditorScrollbarOptions;
-+
-+	/**
-+	 * @internal
-+	 */
-+	constructor(source:{
-+		theme:string;
-+		canUseTranslate3d:boolean;
-+		experimentalScreenReader: boolean;
-+		rulers: number[];
-+		ariaLabel: string;
-+		renderLineNumbers:boolean;
-+		renderCustomLineNumbers: (lineNumber:number)=>string;
-+		renderRelativeLineNumbers: boolean;
-+		selectOnLineNumbers:boolean;
-+		glyphMargin:boolean;
-+		revealHorizontalRightPadding:number;
-+		roundedSelection:boolean;
-+		overviewRulerLanes:number;
-+		cursorBlinking:TextEditorCursorBlinkingStyle;
-+		mouseWheelZoom:boolean;
-+		cursorStyle:TextEditorCursorStyle;
-+		hideCursorInOverviewRuler:boolean;
-+		scrollBeyondLastLine:boolean;
-+		editorClassName: string;
-+		stopRenderingLineAfter: number;
-+		renderWhitespace: 'none' | 'boundary' | 'all';
-+		renderControlCharacters: boolean;
-+		renderIndentGuides: boolean;
-+		renderLineHighlight: boolean;
-+		scrollbar:InternalEditorScrollbarOptions;
-+	}) {
-+		this.theme = String(source.theme);
-+		this.canUseTranslate3d = Boolean(source.canUseTranslate3d);
-+		this.experimentalScreenReader = Boolean(source.experimentalScreenReader);
-+		this.rulers = InternalEditorViewOptions._toSortedIntegerArray(source.rulers);
-+		this.ariaLabel = String(source.ariaLabel);
-+		this.renderLineNumbers = Boolean(source.renderLineNumbers);
-+		this.renderCustomLineNumbers = source.renderCustomLineNumbers;
-+		this.renderRelativeLineNumbers = Boolean(source.renderRelativeLineNumbers);
-+		this.selectOnLineNumbers = Boolean(source.selectOnLineNumbers);
-+		this.glyphMargin = Boolean(source.glyphMargin);
-+		this.revealHorizontalRightPadding = source.revealHorizontalRightPadding|0;
-+		this.roundedSelection = Boolean(source.roundedSelection);
-+		this.overviewRulerLanes = source.overviewRulerLanes|0;
-+		this.cursorBlinking = source.cursorBlinking|0;
-+		this.mouseWheelZoom = Boolean(source.mouseWheelZoom);
-+		this.cursorStyle = source.cursorStyle|0;
-+		this.hideCursorInOverviewRuler = Boolean(source.hideCursorInOverviewRuler);
-+		this.scrollBeyondLastLine = Boolean(source.scrollBeyondLastLine);
-+		this.editorClassName = String(source.editorClassName);
-+		this.stopRenderingLineAfter = source.stopRenderingLineAfter|0;
-+		this.renderWhitespace = source.renderWhitespace;
-+		this.renderControlCharacters = Boolean(source.renderControlCharacters);
-+		this.renderIndentGuides = Boolean(source.renderIndentGuides);
-+		this.renderLineHighlight = Boolean(source.renderLineHighlight);
-+		this.scrollbar = source.scrollbar.clone();
-+	}
-+
-+	private static _toSortedIntegerArray(source:any): number[] {
-+		if (!Array.isArray(source)) {
-+			return [];
-+		}
-+		let arrSource = <any[]>source;
-+		let result = arrSource.map(el => {
-+			let r = parseInt(el, 10);
-+			if (isNaN(r)) {
-+				return 0;
-+			}
-+			return r;
-+		});
-+		result.sort();
-+		return result;
-+	}
-+
-+	private static _numberArraysEqual(a:number[], b:number[]): boolean {
-+		if (a.length !== b.length) {
-+			return false;
-+		}
-+		for (let i = 0; i < a.length; i++) {
-+			if (a[i] !== b[i]) {
-+				return false;
-+			}
-+		}
-+		return true;
-+	}
-+
-+	/**
-+	 * @internal
-+	 */
-+	public equals(other:InternalEditorViewOptions): boolean {
-+		return (
-+			this.theme === other.theme
-+			&& this.canUseTranslate3d === other.canUseTranslate3d
-+			&& this.experimentalScreenReader === other.experimentalScreenReader
-+			&& InternalEditorViewOptions._numberArraysEqual(this.rulers, other.rulers)
-+			&& this.ariaLabel === other.ariaLabel
-+			&& this.renderLineNumbers === other.renderLineNumbers
-+			&& this.renderCustomLineNumbers === other.renderCustomLineNumbers
-+			&& this.renderRelativeLineNumbers === other.renderRelativeLineNumbers
-+			&& this.selectOnLineNumbers === other.selectOnLineNumbers
-+			&& this.glyphMargin === other.glyphMargin
-+			&& this.revealHorizontalRightPadding === other.revealHorizontalRightPadding
-+			&& this.roundedSelection === other.roundedSelection
-+			&& this.overviewRulerLanes === other.overviewRulerLanes
-+			&& this.cursorBlinking === other.cursorBlinking
-+			&& this.mouseWheelZoom === other.mouseWheelZoom
-+			&& this.cursorStyle === other.cursorStyle
-+			&& this.hideCursorInOverviewRuler === other.hideCursorInOverviewRuler
-+			&& this.scrollBeyondLastLine === other.scrollBeyondLastLine
-+			&& this.editorClassName === other.editorClassName
-+			&& this.stopRenderingLineAfter === other.stopRenderingLineAfter
-+			&& this.renderWhitespace === other.renderWhitespace
-+			&& this.renderControlCharacters === other.renderControlCharacters
-+			&& this.renderIndentGuides === other.renderIndentGuides
-+			&& this.renderLineHighlight === other.renderLineHighlight
-+			&& this.scrollbar.equals(other.scrollbar)
-+		);
-+	}
-+
-+	/**
-+	 * @internal
-+	 */
-+	public createChangeEvent(newOpts:InternalEditorViewOptions): IViewConfigurationChangedEvent {
-+		return {
-+			theme: this.theme !== newOpts.theme,
-+			canUseTranslate3d: this.canUseTranslate3d !== newOpts.canUseTranslate3d,
-+			experimentalScreenReader: this.experimentalScreenReader !== newOpts.experimentalScreenReader,
-+			rulers: (!InternalEditorViewOptions._numberArraysEqual(this.rulers, newOpts.rulers)),
-+			ariaLabel: this.ariaLabel !== newOpts.ariaLabel,
-+			renderLineNumbers: this.renderLineNumbers !== newOpts.renderLineNumbers,
-+			renderCustomLineNumbers: this.renderCustomLineNumbers !== newOpts.renderCustomLineNumbers,
-+			renderRelativeLineNumbers: this.renderRelativeLineNumbers !== newOpts.renderRelativeLineNumbers,
-+			selectOnLineNumbers: this.selectOnLineNumbers !== newOpts.selectOnLineNumbers,
-+			glyphMargin: this.glyphMargin !== newOpts.glyphMargin,
-+			revealHorizontalRightPadding: this.revealHorizontalRightPadding !== newOpts.revealHorizontalRightPadding,
-+			roundedSelection: this.roundedSelection !== newOpts.roundedSelection,
-+			overviewRulerLanes: this.overviewRulerLanes !== newOpts.overviewRulerLanes,
-+			cursorBlinking: this.cursorBlinking !== newOpts.cursorBlinking,
-+			mouseWheelZoom: this.mouseWheelZoom !== newOpts.mouseWheelZoom,
-+			cursorStyle: this.cursorStyle !== newOpts.cursorStyle,
-+			hideCursorInOverviewRuler: this.hideCursorInOverviewRuler !== newOpts.hideCursorInOverviewRuler,
-+			scrollBeyondLastLine: this.scrollBeyondLastLine !== newOpts.scrollBeyondLastLine,
-+			editorClassName: this.editorClassName !== newOpts.editorClassName,
-+			stopRenderingLineAfter: this.stopRenderingLineAfter !== newOpts.stopRenderingLineAfter,
-+			renderWhitespace: this.renderWhitespace !== newOpts.renderWhitespace,
-+			renderControlCharacters: this.renderControlCharacters !== newOpts.renderControlCharacters,
-+			renderIndentGuides: this.renderIndentGuides !== newOpts.renderIndentGuides,
-+			renderLineHighlight: this.renderLineHighlight !== newOpts.renderLineHighlight,
-+			scrollbar: (!this.scrollbar.equals(newOpts.scrollbar)),
-+		};
-+	}
-+
-+	/**
-+	 * @internal
-+	 */
-+	public clone(): InternalEditorViewOptions {
-+		return new InternalEditorViewOptions(this);
-+	}
-+}
-+
-+export interface IViewConfigurationChangedEvent {
-+	theme: boolean;
-+	canUseTranslate3d: boolean;
-+	experimentalScreenReader: boolean;
-+	rulers: boolean;
-+	ariaLabel: boolean;
-+	renderLineNumbers: boolean;
-+	renderCustomLineNumbers: boolean;
-+	renderRelativeLineNumbers: boolean;
-+	selectOnLineNumbers: boolean;
-+	glyphMargin: boolean;
-+	revealHorizontalRightPadding: boolean;
-+	roundedSelection: boolean;
-+	overviewRulerLanes: boolean;
-+	cursorBlinking: boolean;
-+	mouseWheelZoom: boolean;
-+	cursorStyle: boolean;
-+	hideCursorInOverviewRuler: boolean;
-+	scrollBeyondLastLine: boolean;
-+	editorClassName: boolean;
-+	stopRenderingLineAfter: boolean;
-+	renderWhitespace: boolean;
-+	renderControlCharacters: boolean;
-+	renderIndentGuides: boolean;
-+	renderLineHighlight: boolean;
-+	scrollbar: boolean;
-+}
-+
-+export class EditorContribOptions {
-+	selectionClipboard: boolean;
-+	hover:boolean;
-+	contextmenu:boolean;
-+	quickSuggestions:boolean;
-+	quickSuggestionsDelay:number;
-+	parameterHints: boolean;
-+	iconsInSuggestions:boolean;
-+	formatOnType:boolean;
-+	suggestOnTriggerCharacters: boolean;
-+	acceptSuggestionOnEnter: boolean;
-+	snippetSuggestions: 'top' | 'bottom' | 'inline' | 'none';
-+	tabCompletion: boolean;
-+	wordBasedSuggestions: boolean;
-+	selectionHighlight:boolean;
-+	codeLens: boolean;
-+	folding: boolean;
-+
-+	/**
-+	 * @internal
-+	 */
-+	constructor(source:{
-+		selectionClipboard: boolean;
-+		hover:boolean;
-+		contextmenu:boolean;
-+		quickSuggestions:boolean;
-+		quickSuggestionsDelay:number;
-+		parameterHints:boolean;
-+		iconsInSuggestions:boolean;
-+		formatOnType:boolean;
-+		suggestOnTriggerCharacters: boolean;
-+		acceptSuggestionOnEnter: boolean;
-+		snippetSuggestions: 'top' | 'bottom' | 'inline' | 'none';
-+		tabCompletion: boolean;
-+		wordBasedSuggestions: boolean;
-+		selectionHighlight:boolean;
-+		codeLens: boolean;
-+		folding: boolean;
-+	}) {
-+		this.selectionClipboard = Boolean(source.selectionClipboard);
-+		this.hover = Boolean(source.hover);
-+		this.contextmenu = Boolean(source.contextmenu);
-+		this.quickSuggestions = Boolean(source.quickSuggestions);
-+		this.quickSuggestionsDelay = source.quickSuggestionsDelay||0;
-+		this.parameterHints = Boolean(source.parameterHints);
-+		this.iconsInSuggestions = Boolean(source.iconsInSuggestions);
-+		this.formatOnType = Boolean(source.formatOnType);
-+		this.suggestOnTriggerCharacters = Boolean(source.suggestOnTriggerCharacters);
-+		this.acceptSuggestionOnEnter = Boolean(source.acceptSuggestionOnEnter);
-+		this.snippetSuggestions = source.snippetSuggestions;
-+		this.tabCompletion = source.tabCompletion;
-+		this.wordBasedSuggestions = source.wordBasedSuggestions;
-+		this.selectionHighlight = Boolean(source.selectionHighlight);
-+		this.codeLens = Boolean(source.codeLens);
-+		this.folding = Boolean(source.folding);
-+	}
-+
-+	/**
-+	 * @internal
-+	 */
-+	public equals(other: EditorContribOptions): boolean {
-+		return (
-+			this.selectionClipboard === other.selectionClipboard
-+			&& this.hover === other.hover
-+			&& this.contextmenu === other.contextmenu
-+			&& this.quickSuggestions === other.quickSuggestions
-+			&& this.quickSuggestionsDelay === other.quickSuggestionsDelay
-+			&& this.parameterHints === other.parameterHints
-+			&& this.iconsInSuggestions === other.iconsInSuggestions
-+			&& this.formatOnType === other.formatOnType
-+			&& this.suggestOnTriggerCharacters === other.suggestOnTriggerCharacters
-+			&& this.acceptSuggestionOnEnter === other.acceptSuggestionOnEnter
-+			&& this.snippetSuggestions === other.snippetSuggestions
-+			&& this.tabCompletion === other.tabCompletion
-+			&& this.wordBasedSuggestions === other.wordBasedSuggestions
-+			&& this.selectionHighlight === other.selectionHighlight
-+			&& this.codeLens === other.codeLens
-+			&& this.folding === other.folding
-+		);
-+	}
-+
-+	/**
-+	 * @internal
-+	 */
-+	public clone(): EditorContribOptions {
-+		return new EditorContribOptions(this);
-+	}
-+}
-+
-+/**
-+ * Internal configuration options (transformed or computed) for the editor.
-+ */
-+export class InternalEditorOptions {
-+	_internalEditorOptionsBrand: void;
-+
-+	lineHeight:number; // todo: move to fontInfo
-+
-+	readOnly:boolean;
-+	// ---- cursor options
-+	wordSeparators: string;
-+	autoClosingBrackets:boolean;
-+	useTabStops: boolean;
-+	tabFocusMode:boolean;
-+	// ---- grouped options
-+	layoutInfo: EditorLayoutInfo;
-+	fontInfo: FontInfo;
-+	viewInfo: InternalEditorViewOptions;
-+	wrappingInfo: EditorWrappingInfo;
-+	contribInfo: EditorContribOptions;
-+
-+	/**
-+	 * @internal
-+	 */
-+	constructor(source: {
-+		lineHeight:number;
-+		readOnly:boolean;
-+		wordSeparators: string;
-+		autoClosingBrackets:boolean;
-+		useTabStops: boolean;
-+		tabFocusMode:boolean;
-+		layoutInfo: EditorLayoutInfo;
-+		fontInfo: FontInfo;
-+		viewInfo: InternalEditorViewOptions;
-+		wrappingInfo: EditorWrappingInfo;
-+		contribInfo: EditorContribOptions;
-+	}) {
-+		this.lineHeight = source.lineHeight|0;
-+		this.readOnly = Boolean(source.readOnly);
-+		this.wordSeparators = String(source.wordSeparators);
-+		this.autoClosingBrackets = Boolean(source.autoClosingBrackets);
-+		this.useTabStops = Boolean(source.useTabStops);
-+		this.tabFocusMode = Boolean(source.tabFocusMode);
-+		this.layoutInfo = source.layoutInfo.clone();
-+		this.fontInfo = source.fontInfo.clone();
-+		this.viewInfo = source.viewInfo.clone();
-+		this.wrappingInfo = source.wrappingInfo.clone();
-+		this.contribInfo = source.contribInfo.clone();
-+	}
-+
-+	/**
-+	 * @internal
-+	 */
-+	public equals(other:InternalEditorOptions): boolean {
-+		return (
-+			this.lineHeight === other.lineHeight
-+			&& this.readOnly === other.readOnly
-+			&& this.wordSeparators === other.wordSeparators
-+			&& this.autoClosingBrackets === other.autoClosingBrackets
-+			&& this.useTabStops === other.useTabStops
-+			&& this.tabFocusMode === other.tabFocusMode
-+			&& this.layoutInfo.equals(other.layoutInfo)
-+			&& this.fontInfo.equals(other.fontInfo)
-+			&& this.viewInfo.equals(other.viewInfo)
-+			&& this.wrappingInfo.equals(other.wrappingInfo)
-+			&& this.contribInfo.equals(other.contribInfo)
-+		);
-+	}
-+
-+	/**
-+	 * @internal
-+	 */
-+	public createChangeEvent(newOpts:InternalEditorOptions): IConfigurationChangedEvent {
-+		return {
-+			lineHeight: (this.lineHeight !== newOpts.lineHeight),
-+			readOnly: (this.readOnly !== newOpts.readOnly),
-+			wordSeparators: (this.wordSeparators !== newOpts.wordSeparators),
-+			autoClosingBrackets: (this.autoClosingBrackets !== newOpts.autoClosingBrackets),
-+			useTabStops: (this.useTabStops !== newOpts.useTabStops),
-+			tabFocusMode: (this.tabFocusMode !== newOpts.tabFocusMode),
-+			layoutInfo: (!this.layoutInfo.equals(newOpts.layoutInfo)),
-+			fontInfo: (!this.fontInfo.equals(newOpts.fontInfo)),
-+			viewInfo: this.viewInfo.createChangeEvent(newOpts.viewInfo),
-+			wrappingInfo: (!this.wrappingInfo.equals(newOpts.wrappingInfo)),
-+			contribInfo: (!this.contribInfo.equals(newOpts.contribInfo)),
-+		};
-+	}
-+
-+	/**
-+	 * @internal
-+	 */
-+	public clone(): InternalEditorOptions {
-+		return new InternalEditorOptions(this);
-+	}
-+}
-+
-+/**
-+ * An event describing that the configuration of the editor has changed.
-+ */
-+export interface IConfigurationChangedEvent {
-+	lineHeight: boolean;
-+	readOnly: boolean;
-+	wordSeparators: boolean;
-+	autoClosingBrackets: boolean;
-+	useTabStops: boolean;
-+	tabFocusMode: boolean;
-+	layoutInfo: boolean;
-+	fontInfo: boolean;
-+	viewInfo: IViewConfigurationChangedEvent;
-+	wrappingInfo: boolean;
-+	contribInfo: boolean;
-+}
-+
-+/**
-+ * Vertical Lane in the overview ruler of the editor.
-+ */
-+export enum OverviewRulerLane {
-+	Left = 1,
-+	Center = 2,
-+	Right = 4,
-+	Full = 7
-+}
-+
-+/**
-+ * Options for rendering a model decoration in the overview ruler.
-+ */
-+export interface IModelDecorationOverviewRulerOptions {
-+	/**
-+	 * CSS color to render in the overview ruler.
-+	 * e.g.: rgba(100, 100, 100, 0.5)
-+	 */
-+	color: string;
-+	/**
-+	 * CSS color to render in the overview ruler.
-+	 * e.g.: rgba(100, 100, 100, 0.5)
-+	 */
-+	darkColor: string;
-+	/**
-+	 * The position in the overview ruler.
-+	 */
-+	position: OverviewRulerLane;
-+}
-+
-+/**
-+ * Options for a model decoration.
-+ */
-+export interface IModelDecorationOptions {
-+	/**
-+	 * Customize the growing behaviour of the decoration when typing at the edges of the decoration.
-+	 * Defaults to TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges
-+	 */
-+	stickiness?:TrackedRangeStickiness;
-+	/**
-+	 * CSS class name describing the decoration.
-+	 */
-+	className?:string;
-+	/**
-+	 * Message to be rendered when hovering over the glyph margin decoration.
-+	 * @internal
-+	 */
-+	glyphMarginHoverMessage?:string;
-+	/**
-+	 * Array of MarkedString to render as the decoration message.
-+	 */
-+	hoverMessage?:MarkedString | MarkedString[];
-+	/**
-+	 * Should the decoration expand to encompass a whole line.
-+	 */
-+	isWholeLine?:boolean;
-+	/**
-+	 * @deprecated : Use `overviewRuler` instead
-+	 */
-+	showInOverviewRuler?:string;
-+	/**
-+	 * If set, render this decoration in the overview ruler.
-+	 */
-+	overviewRuler?:IModelDecorationOverviewRulerOptions;
-+	/**
-+	 * If set, the decoration will be rendered in the glyph margin with this CSS class name.
-+	 */
-+	glyphMarginClassName?:string;
-+	/**
-+	 * If set, the decoration will be rendered in the lines decorations with this CSS class name.
-+	 */
-+	linesDecorationsClassName?:string;
-+	/**
-+	 * If set, the decoration will be rendered inline with the text with this CSS class name.
-+	 * Please use this only for CSS rules that must impact the text. For example, use `className`
-+	 * to have a background color decoration.
-+	 */
-+	inlineClassName?:string;
-+	/**
-+	 * If set, the decoration will be rendered before the text with this CSS class name.
-+	 */
-+	beforeContentClassName?:string;
-+	/**
-+	 * If set, the decoration will be rendered after the text with this CSS class name.
-+	 */
-+	afterContentClassName?:string;
-+}
-+
-+/**
-+ * New model decorations.
-+ */
-+export interface IModelDeltaDecoration {
-+	/**
-+	 * Range that this decoration covers.
-+	 */
-+	range: IRange;
-+	/**
-+	 * Options associated with this decoration.
-+	 */
-+	options: IModelDecorationOptions;
-+}
-+
-+/**
-+ * A tracked range in the model.
-+ * @internal
-+ */
-+export interface IModelTrackedRange {
-+	/**
-+	 * Identifier for a tracked range
-+	 */
-+	id: string;
-+	/**
-+	 * Range that this tracked range covers
-+	 */
-+	range: Range;
-+}
-+
-+/**
-+ * A decoration in the model.
-+ */
-+export interface IModelDecoration {
-+	/**
-+	 * Identifier for a decoration.
-+	 */
-+	id: string;
-+	/**
-+	 * Identifier for a decoration's owener.
-+	 */
-+	ownerId: number;
-+	/**
-+	 * Range that this decoration covers.
-+	 */
-+	range: Range;
-+	/**
-+	 * Options associated with this decoration.
-+	 */
-+	options: IModelDecorationOptions;
-+}
-+
-+/**
-+ * An accessor that can add, change or remove model decorations.
-+ * @internal
-+ */
-+export interface IModelDecorationsChangeAccessor {
-+	/**
-+	 * Add a new decoration.
-+	 * @param range Range that this decoration covers.
-+	 * @param options Options associated with this decoration.
-+	 * @return An unique identifier associated with this decoration.
-+	 */
-+	addDecoration(range:IRange, options:IModelDecorationOptions): string;
-+	/**
-+	 * Change the range that an existing decoration covers.
-+	 * @param id The unique identifier associated with the decoration.
-+	 * @param newRange The new range that this decoration covers.
-+	 */
-+	changeDecoration(id:string, newRange:IRange): void;
-+	/**
-+	 * Change the options associated with an existing decoration.
-+	 * @param id The unique identifier associated with the decoration.
-+	 * @param newOptions The new options associated with this decoration.
-+	 */
-+	changeDecorationOptions(id: string, newOptions:IModelDecorationOptions): void;
-+	/**
-+	 * Remove an existing decoration.
-+	 * @param id The unique identifier associated with the decoration.
-+	 */
-+	removeDecoration(id:string): void;
-+	/**
-+	 * Perform a minimum ammount of operations, in order to transform the decorations
-+	 * identified by `oldDecorations` to the decorations described by `newDecorations`
-+	 * and returns the new identifiers associated with the resulting decorations.
-+	 *
-+	 * @param oldDecorations Array containing previous decorations identifiers.
-+	 * @param newDecorations Array describing what decorations should result after the call.
-+	 * @return An array containing the new decorations identifiers.
-+	 */
-+	deltaDecorations(oldDecorations:string[], newDecorations:IModelDeltaDecoration[]): string[];
-+}
-+
-+/**
-+ * Word inside a model.
-+ */
-+export interface IWordAtPosition {
-+	/**
-+	 * The word.
-+	 */
-+	word: string;
-+	/**
-+	 * The column where the word starts.
-+	 */
-+	startColumn: number;
-+	/**
-+	 * The column where the word ends.
-+	 */
-+	endColumn: number;
-+}
-+
-+/**
-+ * Range of a word inside a model.
-+ * @internal
-+ */
-+export interface IWordRange {
-+	/**
-+	 * The index where the word starts.
-+	 */
-+	start:number;
-+	/**
-+	 * The index where the word ends.
-+	 */
-+	end:number;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface ITokenInfo {
-+	type: string;
-+	lineNumber: number;
-+	startColumn: number;
-+	endColumn: number;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface ITokenIterator {
-+	hasNext(): boolean;
-+	next(): ITokenInfo;
-+	hasPrev(): boolean;
-+	prev(): ITokenInfo;
-+}
-+
-+/**
-+ * End of line character preference.
-+ */
-+export enum EndOfLinePreference {
-+	/**
-+	 * Use the end of line character identified in the text buffer.
-+	 */
-+	TextDefined = 0,
-+	/**
-+	 * Use line feed (\n) as the end of line character.
-+	 */
-+	LF = 1,
-+	/**
-+	 * Use carriage return and line feed (\r\n) as the end of line character.
-+	 */
-+	CRLF = 2
-+}
-+
-+/**
-+ * The default end of line to use when instantiating models.
-+ */
-+export enum DefaultEndOfLine {
-+	/**
-+	 * Use line feed (\n) as the end of line character.
-+	 */
-+	LF = 1,
-+	/**
-+	 * Use carriage return and line feed (\r\n) as the end of line character.
-+	 */
-+	CRLF = 2
-+}
-+
-+/**
-+ * End of line character preference.
-+ */
-+export enum EndOfLineSequence {
-+	/**
-+	 * Use line feed (\n) as the end of line character.
-+	 */
-+	LF = 0,
-+	/**
-+	 * Use carriage return and line feed (\r\n) as the end of line character.
-+	 */
-+	CRLF = 1
-+}
-+
-+/**
-+ * A read-only line marker in the model.
-+ * @internal
-+ */
-+export interface IReadOnlyLineMarker {
-+	id: string;
-+	column: number;
-+}
-+
-+/**
-+ * And identifier for a single edit operation.
-+ */
-+export interface ISingleEditOperationIdentifier {
-+	/**
-+	 * Identifier major
-+	 */
-+	major:number;
-+	/**
-+	 * Identifier minor
-+	 */
-+	minor:number;
-+}
-+
-+/**
-+ * A builder and helper for edit operations for a command.
-+ */
-+export interface IEditOperationBuilder {
-+	/**
-+	 * Add a new edit operation (a replace operation).
-+	 * @param range The range to replace (delete). May be empty to represent a simple insert.
-+	 * @param text The text to replace with. May be null to represent a simple delete.
-+	 */
-+	addEditOperation(range:Range, text:string): void;
-+
-+	/**
-+	 * Track `selection` when applying edit operations.
-+	 * A best effort will be made to not grow/expand the selection.
-+	 * An empty selection will clamp to a nearby character.
-+	 * @param selection The selection to track.
-+	 * @param trackPreviousOnEmpty If set, and the selection is empty, indicates whether the selection
-+	 *           should clamp to the previous or the next character.
-+	 * @return A unique identifer.
-+	 */
-+	trackSelection(selection:Selection, trackPreviousOnEmpty?:boolean): string;
-+}
-+
-+/**
-+ * A helper for computing cursor state after a command.
-+ */
-+export interface ICursorStateComputerData {
-+	/**
-+	 * Get the inverse edit operations of the added edit operations.
-+	 */
-+	getInverseEditOperations(): IIdentifiedSingleEditOperation[];
-+	/**
-+	 * Get a previously tracked selection.
-+	 * @param id The unique identifier returned by `trackSelection`.
-+	 * @return The selection.
-+	 */
-+	getTrackedSelection(id:string): Selection;
-+}
-+
-+/**
-+ * A command that modifies text / cursor state on a model.
-+ */
-+export interface ICommand {
-+	/**
-+	 * Get the edit operations needed to execute this command.
-+	 * @param model The model the command will execute on.
-+	 * @param builder A helper to collect the needed edit operations and to track selections.
-+	 */
-+	getEditOperations(model:ITokenizedModel, builder:IEditOperationBuilder): void;
-+	/**
-+	 * Compute the cursor state after the edit operations were applied.
-+	 * @param model The model the commad has executed on.
-+	 * @param helper A helper to get inverse edit operations and to get previously tracked selections.
-+	 * @return The cursor state after the command executed.
-+	 */
-+	computeCursorState(model:ITokenizedModel, helper:ICursorStateComputerData): Selection;
-+}
-+
-+/**
-+ * A single edit operation, that acts as a simple replace.
-+ * i.e. Replace text at `range` with `text` in model.
-+ */
-+export interface ISingleEditOperation {
-+	/**
-+	 * The range to replace. This can be empty to emulate a simple insert.
-+	 */
-+	range: IRange;
-+	/**
-+	 * The text to replace with. This can be null to emulate a simple delete.
-+	 */
-+	text: string;
-+	/**
-+	 * This indicates that this operation has "insert" semantics.
-+	 * i.e. forceMoveMarkers = true => if `range` is collapsed, all markers at the position will be moved.
-+	 */
-+	forceMoveMarkers?: boolean;
-+}
-+
-+/**
-+ * A single edit operation, that has an identifier.
-+ */
-+export interface IIdentifiedSingleEditOperation {
-+	/**
-+	 * An identifier associated with this single edit operation.
-+	 */
-+	identifier: ISingleEditOperationIdentifier;
-+	/**
-+	 * The range to replace. This can be empty to emulate a simple insert.
-+	 */
-+	range: Range;
-+	/**
-+	 * The text to replace with. This can be null to emulate a simple delete.
-+	 */
-+	text: string;
-+	/**
-+	 * This indicates that this operation has "insert" semantics.
-+	 * i.e. forceMoveMarkers = true => if `range` is collapsed, all markers at the position will be moved.
-+	 */
-+	forceMoveMarkers: boolean;
-+	/**
-+	 * This indicates that this operation is inserting automatic whitespace
-+	 * that can be removed on next model edit operation if `config.trimAutoWhitespace` is true.
-+	 */
-+	isAutoWhitespaceEdit?: boolean;
-+}
-+
-+/**
-+ * A callback that can compute the cursor state after applying a series of edit operations.
-+ */
-+export interface ICursorStateComputer {
-+	/**
-+	 * A callback that can compute the resulting cursors state after some edit operations have been executed.
-+	 */
-+	(inverseEditOperations:IIdentifiedSingleEditOperation[]): Selection[];
-+}
-+
-+export interface ITextModelResolvedOptions {
-+	tabSize: number;
-+	insertSpaces: boolean;
-+	defaultEOL: DefaultEndOfLine;
-+	trimAutoWhitespace: boolean;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface ITextModelCreationOptions {
-+	tabSize: number;
-+	insertSpaces: boolean;
-+	detectIndentation: boolean;
-+	trimAutoWhitespace: boolean;
-+	defaultEOL: DefaultEndOfLine;
-+}
-+
-+export interface ITextModelUpdateOptions {
-+	tabSize?: number;
-+	insertSpaces?: boolean;
-+	trimAutoWhitespace?: boolean;
-+}
-+
-+export interface IModelOptionsChangedEvent {
-+	tabSize: boolean;
-+	insertSpaces: boolean;
-+	trimAutoWhitespace: boolean;
-+}
-+
-+/**
-+ * A textual read-only model.
-+ */
-+export interface ITextModel {
-+
-+	getOptions(): ITextModelResolvedOptions;
-+
-+	/**
-+	 * Get the current version id of the model.
-+	 * Anytime a change happens to the model (even undo/redo),
-+	 * the version id is incremented.
-+	 */
-+	getVersionId(): number;
-+
-+	/**
-+	 * Get the alternative version id of the model.
-+	 * This alternative version id is not always incremented,
-+	 * it will return the same values in the case of undo-redo.
-+	 */
-+	getAlternativeVersionId(): number;
-+
-+	/**
-+	 * Replace the entire text buffer value contained in this model.
-+	 */
-+	setValue(newValue:string): void;
-+
-+	/**
-+	 * Replace the entire text buffer value contained in this model.
-+	 */
-+	setValueFromRawText(newValue:IRawText): void;
-+
-+	/**
-+	 * Get the text stored in this model.
-+	 * @param eol The end of line character preference. Defaults to `EndOfLinePreference.TextDefined`.
-+	 * @param preserverBOM Preserve a BOM character if it was detected when the model was constructed.
-+	 * @return The text.
-+	 */
-+	getValue(eol?:EndOfLinePreference, preserveBOM?:boolean): string;
-+
-+	/**
-+	 * Get the length of the text stored in this model.
-+	 */
-+	getValueLength(eol?:EndOfLinePreference, preserveBOM?:boolean): number;
-+
-+	/**
-+	 * Get the raw text stored in this model.
-+	 */
-+	toRawText(): IRawText;
-+
-+	/**
-+	 * Check if the raw text stored in this model equals another raw text.
-+	 */
-+	equals(other:IRawText): boolean;
-+
-+	/**
-+	 * Get the text in a certain range.
-+	 * @param range The range describing what text to get.
-+	 * @param eol The end of line character preference. This will only be used for multiline ranges. Defaults to `EndOfLinePreference.TextDefined`.
-+	 * @return The text.
-+	 */
-+	getValueInRange(range:IRange, eol?:EndOfLinePreference): string;
-+
-+	/**
-+	 * Get the length of text in a certain range.
-+	 * @param range The range describing what text length to get.
-+	 * @return The text length.
-+	 */
-+	getValueLengthInRange(range:IRange): number;
-+
-+	/**
-+	 * Splits characters in two buckets. First bucket (A) is of characters that
-+	 * sit in lines with length < `LONG_LINE_BOUNDARY`. Second bucket (B) is of
-+	 * characters that sit in lines with length >= `LONG_LINE_BOUNDARY`.
-+	 * If count(B) > count(A) return true. Returns false otherwise.
-+	 * @internal
-+	 */
-+	isDominatedByLongLines(): boolean;
-+
-+	/**
-+	 * Get the number of lines in the model.
-+	 */
-+	getLineCount(): number;
-+
-+	/**
-+	 * Get the text for a certain line.
-+	 */
-+	getLineContent(lineNumber:number): string;
-+
-+	/**
-+	 * @internal
-+	 */
-+	getIndentLevel(lineNumber:number): number;
-+
-+	/**
-+	 * @internal
-+	 */
-+	getIndentRanges(): IndentRange[];
-+
-+	/**
-+	 * @internal
-+	 */
-+	getLineIndentGuide(lineNumber:number): number;
-+
-+	/**
-+	 * Get the text for all lines.
-+	 */
-+	getLinesContent(): string[];
-+
-+	/**
-+	 * Get the end of line sequence predominantly used in the text buffer.
-+	 * @return EOL char sequence (e.g.: '\n' or '\r\n').
-+	 */
-+	getEOL(): string;
-+
-+	/**
-+	 * Change the end of line sequence used in the text buffer.
-+	 */
-+	setEOL(eol: EndOfLineSequence): void;
-+
-+	/**
-+	 * Get the minimum legal column for line at `lineNumber`
-+	 */
-+	getLineMinColumn(lineNumber:number): number;
-+
-+	/**
-+	 * Get the maximum legal column for line at `lineNumber`
-+	 */
-+	getLineMaxColumn(lineNumber:number): number;
-+
-+	/**
-+	 * Returns the column before the first non whitespace character for line at `lineNumber`.
-+	 * Returns 0 if line is empty or contains only whitespace.
-+	 */
-+	getLineFirstNonWhitespaceColumn(lineNumber:number): number;
-+
-+	/**
-+	 * Returns the column after the last non whitespace character for line at `lineNumber`.
-+	 * Returns 0 if line is empty or contains only whitespace.
-+	 */
-+	getLineLastNonWhitespaceColumn(lineNumber:number): number;
-+
-+	/**
-+	 * Create a valid position,
-+	 */
-+	validatePosition(position:IPosition): Position;
-+
-+	/**
-+	 * Advances the given position by the given offest (negative offsets are also accepted)
-+	 * and returns it as a new valid position.
-+	 *
-+	 * If the offset and position are such that their combination goes beyond the beginning or
-+	 * end of the model, throws an exception.
-+	 *
-+	 * If the ofsset is such that the new position would be in the middle of a multi-byte
-+	 * line terminator, throws an exception.
-+	 */
-+	modifyPosition(position: IPosition, offset: number): Position;
-+
-+	/**
-+	 * Create a valid range.
-+	 */
-+	validateRange(range:IRange): Range;
-+
-+	/**
-+	 * Converts the position to a zero-based offset.
-+	 *
-+	 * The position will be [adjusted](#TextDocument.validatePosition).
-+	 *
-+	 * @param position A position.
-+	 * @return A valid zero-based offset.
-+	 */
-+	getOffsetAt(position: IPosition): number;
-+
-+	/**
-+	 * Converts a zero-based offset to a position.
-+	 *
-+	 * @param offset A zero-based offset.
-+	 * @return A valid [position](#Position).
-+	 */
-+	getPositionAt(offset: number): Position;
-+
-+	/**
-+	 * Get a range covering the entire model
-+	 */
-+	getFullModelRange(): Range;
-+
-+	/**
-+	 * Returns iff the model was disposed or not.
-+	 */
-+	isDisposed(): boolean;
-+
-+	/**
-+	 * No mode supports allowed on this model because it is simply too large.
-+	 * (even tokenization would cause too much memory pressure)
-+	 * @internal
-+	 */
-+	isTooLargeForHavingAMode(): boolean;
-+
-+	/**
-+	 * Only basic mode supports allowed on this model because it is simply too large.
-+	 * (tokenization is allowed and other basic supports)
-+	 * @internal
-+	 */
-+	isTooLargeForHavingARichMode(): boolean;
-+
-+	/**
-+	 * Search the model.
-+	 * @param searchString The string used to search. If it is a regular expression, set `isRegex` to true.
-+	 * @param searchOnlyEditableRange Limit the searching to only search inside the editable range of the model.
-+	 * @param isRegex Used to indicate that `searchString` is a regular expression.
-+	 * @param matchCase Force the matching to match lower/upper case exactly.
-+	 * @param wholeWord Force the matching to match entire words only.
-+	 * @param limitResultCount Limit the number of results
-+	 * @return The ranges where the matches are. It is empty if not matches have been found.
-+	 */
-+	findMatches(searchString:string, searchOnlyEditableRange:boolean, isRegex:boolean, matchCase:boolean, wholeWord:boolean, limitResultCount?:number): Range[];
-+	/**
-+	 * Search the model.
-+	 * @param searchString The string used to search. If it is a regular expression, set `isRegex` to true.
-+	 * @param searchScope Limit the searching to only search inside this range.
-+	 * @param isRegex Used to indicate that `searchString` is a regular expression.
-+	 * @param matchCase Force the matching to match lower/upper case exactly.
-+	 * @param wholeWord Force the matching to match entire words only.
-+	 * @param limitResultCount Limit the number of results
-+	 * @return The ranges where the matches are. It is empty if no matches have been found.
-+	 */
-+	findMatches(searchString:string, searchScope:IRange, isRegex:boolean, matchCase:boolean, wholeWord:boolean, limitResultCount?:number): Range[];
-+	/**
-+	 * Search the model for the next match. Loops to the beginning of the model if needed.
-+	 * @param searchString The string used to search. If it is a regular expression, set `isRegex` to true.
-+	 * @param searchStart Start the searching at the specified position.
-+	 * @param isRegex Used to indicate that `searchString` is a regular expression.
-+	 * @param matchCase Force the matching to match lower/upper case exactly.
-+	 * @param wholeWord Force the matching to match entire words only.
-+	 * @return The range where the next match is. It is null if no next match has been found.
-+	 */
-+	findNextMatch(searchString:string, searchStart:IPosition, isRegex:boolean, matchCase:boolean, wholeWord:boolean): Range;
-+	/**
-+	 * Search the model for the previous match. Loops to the end of the model if needed.
-+	 * @param searchString The string used to search. If it is a regular expression, set `isRegex` to true.
-+	 * @param searchStart Start the searching at the specified position.
-+	 * @param isRegex Used to indicate that `searchString` is a regular expression.
-+	 * @param matchCase Force the matching to match lower/upper case exactly.
-+	 * @param wholeWord Force the matching to match entire words only.
-+	 * @return The range where the previous match is. It is null if no previous match has been found.
-+	 */
-+	findPreviousMatch(searchString:string, searchStart:IPosition, isRegex:boolean, matchCase:boolean, wholeWord:boolean): Range;
-+}
-+
-+export interface IReadOnlyModel extends ITextModel {
-+	/**
-+	 * Gets the resource associated with this editor model.
-+	 */
-+	uri: URI;
-+
-+	/**
-+	 * Get the language associated with this model.
-+	 */
-+	getModeId(): string;
-+
-+	/**
-+	 * Get the word under or besides `position`.
-+	 * @param position The position to look for a word.
-+	 * @param skipSyntaxTokens Ignore syntax tokens, as identified by the mode.
-+	 * @return The word under or besides `position`. Might be null.
-+	 */
-+	getWordAtPosition(position:IPosition): IWordAtPosition;
-+
-+	/**
-+	 * Get the word under or besides `position` trimmed to `position`.column
-+	 * @param position The position to look for a word.
-+	 * @param skipSyntaxTokens Ignore syntax tokens, as identified by the mode.
-+	 * @return The word under or besides `position`. Will never be null.
-+	 */
-+	getWordUntilPosition(position:IPosition): IWordAtPosition;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface IRichEditBracket {
-+	modeId: string;
-+	open: string;
-+	close: string;
-+	forwardRegex: RegExp;
-+	reversedRegex: RegExp;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface IFoundBracket {
-+	range: Range;
-+	open: string;
-+	close: string;
-+	isOpen: boolean;
-+}
-+
-+/**
-+ * A model that is tokenized.
-+ */
-+export interface ITokenizedModel extends ITextModel {
-+
-+	/**
-+	 * Tokenize if necessary and get the tokens for the line `lineNumber`.
-+	 * @param lineNumber The line number
-+	 * @param inaccurateTokensAcceptable Are inaccurate tokens acceptable? Defaults to false
-+	 * @internal
-+	 */
-+	getLineTokens(lineNumber:number, inaccurateTokensAcceptable?:boolean): LineTokens;
-+
-+	/**
-+	 * Tokenize if necessary and get the tokenization result for the line `lineNumber`, as returned by the language mode.
-+	 * @internal
-+	 */
-+	getLineContext(lineNumber:number): ILineContext;
-+
-+	/**
-+	 * @internal
-+	 */
-+	_getLineModeTransitions(lineNumber:number): ModeTransition[];
-+
-+	/**
-+	 * Get the current language mode associated with the model.
-+	 */
-+	getMode(): IMode;
-+
-+	/**
-+	 * Get the language associated with this model.
-+	 */
-+	getModeId(): string;
-+
-+	/**
-+	 * Set the current language mode associated with the model.
-+	 * @internal
-+	 */
-+	setMode(languageId:string): void;
-+
-+	/**
-+	 * Returns the true (inner-most) language mode at a given position.
-+	 * @internal
-+	 */
-+	getModeIdAtPosition(lineNumber:number, column:number): string;
-+
-+	/**
-+	 * Get the word under or besides `position`.
-+	 * @param position The position to look for a word.
-+	 * @param skipSyntaxTokens Ignore syntax tokens, as identified by the mode.
-+	 * @return The word under or besides `position`. Might be null.
-+	 */
-+	getWordAtPosition(position:IPosition): IWordAtPosition;
-+
-+	/**
-+	 * Get the word under or besides `position` trimmed to `position`.column
-+	 * @param position The position to look for a word.
-+	 * @param skipSyntaxTokens Ignore syntax tokens, as identified by the mode.
-+	 * @return The word under or besides `position`. Will never be null.
-+	 */
-+	getWordUntilPosition(position:IPosition): IWordAtPosition;
-+
-+	/**
-+	 * Returns an iterator that can be used to read
-+	 * next and previous tokens from the provided position.
-+	 * The iterator is made available through the callback
-+	 * function and can't be used afterwards.
-+	 * @internal
-+	 */
-+	tokenIterator(position: IPosition, callback: (it: ITokenIterator) =>any): any;
-+
-+	/**
-+	 * Find the matching bracket of `request` up, counting brackets.
-+	 * @param request The bracket we're searching for
-+	 * @param position The position at which to start the search.
-+	 * @return The range of the matching bracket, or null if the bracket match was not found.
-+	 * @internal
-+	 */
-+	findMatchingBracketUp(bracket:string, position:IPosition): Range;
-+
-+	// /**
-+	//  * Find the first bracket in the model before `position`.
-+	//  * @param position The position at which to start the search.
-+	//  * @return The info for the first bracket before `position`, or null if there are no more brackets before `positions`.
-+	//  */
-+	// findPrevBracket(position:IPosition): IFoundBracket;
-+
-+	// /**
-+	//  * Find the first bracket in the model after `position`.
-+	//  * @param position The position at which to start the search.
-+	//  * @return The info for the first bracket after `position`, or null if there are no more brackets after `positions`.
-+	//  */
-+	// findNextBracket(position:IPosition): IFoundBracket;
-+
-+	/**
-+	 * Given a `position`, if the position is on top or near a bracket,
-+	 * find the matching bracket of that bracket and return the ranges of both brackets.
-+	 * @param position The position at which to look for a bracket.
-+	 * @internal
-+	 */
-+	matchBracket(position:IPosition): [Range,Range];
-+}
-+
-+/**
-+ * A model that can track markers.
-+ */
-+export interface ITextModelWithMarkers extends ITextModel {
-+	/**
-+	 * @internal
-+	 */
-+	_addMarker(lineNumber:number, column:number, stickToPreviousCharacter:boolean): string;
-+	/**
-+	 * @internal
-+	 */
-+	_changeMarker(id:string, newLineNumber:number, newColumn:number): void;
-+	/**
-+	 * @internal
-+	 */
-+	_changeMarkerStickiness(id:string, newStickToPreviousCharacter:boolean): void;
-+	/**
-+	 * @internal
-+	 */
-+	_getMarker(id:string): Position;
-+	/**
-+	 * @internal
-+	 */
-+	_removeMarker(id:string): void;
-+	/**
-+	 * @internal
-+	 */
-+	_getLineMarkers(lineNumber: number): IReadOnlyLineMarker[];
-+}
-+
-+/**
-+ * A map of changed ranges used during the model internal processing
-+ * @internal
-+ */
-+export interface IChangedTrackedRanges {
-+	[key:string]:IRange;
-+}
-+
-+/**
-+ * Describes the behaviour of decorations when typing/editing near their edges.
-+ */
-+export enum TrackedRangeStickiness {
-+	AlwaysGrowsWhenTypingAtEdges = 0,
-+	NeverGrowsWhenTypingAtEdges = 1,
-+	GrowsOnlyWhenTypingBefore = 2,
-+	GrowsOnlyWhenTypingAfter = 3,
-+}
-+
-+/**
-+ * A model that can track ranges.
-+ */
-+export interface ITextModelWithTrackedRanges extends ITextModel {
-+	/**
-+	 * Start tracking a range (across edit operations).
-+	 * @param range The range to start tracking.
-+	 * @param stickiness The behaviour when typing at the edges of the range.
-+	 * @return A unique identifier for the tracked range.
-+	 * @internal
-+	 */
-+	addTrackedRange(range:IRange, stickiness:TrackedRangeStickiness): string;
-+
-+	/**
-+	 * Change the range of a tracked range.
-+	 * @param id The id of the tracked range, as returned by a `addTrackedRange` call.
-+	 * @param newRange The new range of the tracked range.
-+	 * @internal
-+	 */
-+	changeTrackedRange(id:string, newRange:IRange): void;
-+
-+	/**
-+	 * Change the stickiness (behaviour when typing at the edges of the range) for a tracked range.
-+	 * @param id The id of the tracked range, as returned by a `addTrackedRange` call.
-+	 * @param newStickiness The new behaviour when typing at the edges of the range.
-+	 * @internal
-+	 */
-+	changeTrackedRangeStickiness(id:string, newStickiness:TrackedRangeStickiness): void;
-+
-+	/**
-+	 * Remove a tracked range.
-+	 * @param id The id of the tracked range, as returned by a `addTrackedRaneg` call.
-+	 * @internal
-+	 */
-+	removeTrackedRange(id:string): void;
-+
-+	/**
-+	 * Get the range of a tracked range.
-+	 * @param id The id of the tracked range, as returned by a `addTrackedRaneg` call.
-+	 * @internal
-+	 */
-+	getTrackedRange(id:string): Range;
-+
-+	/**
-+	 * Gets all the tracked ranges for the lines between `startLineNumber` and `endLineNumber` as an array.
-+	 * @param startLineNumber The start line number
-+	 * @param endLineNumber The end line number
-+	 * @return An array with the tracked ranges
-+	 * @internal
-+	 */
-+	getLinesTrackedRanges(startLineNumber:number, endLineNumber:number): IModelTrackedRange[];
-+}
-+
-+/**
-+ * A model that can have decorations.
-+ */
-+export interface ITextModelWithDecorations {
-+	/**
-+	 * Change the decorations. The callback will be called with a change accessor
-+	 * that becomes invalid as soon as the callback finishes executing.
-+	 * This allows for all events to be queued up until the change
-+	 * is completed. Returns whatever the callback returns.
-+	 * @param ownerId Identifies the editor id in which these decorations should appear. If no `ownerId` is provided, the decorations will appear in all editors that attach this model.
-+	 * @internal
-+	 */
-+	changeDecorations(callback: (changeAccessor:IModelDecorationsChangeAccessor)=>any, ownerId?:number): any;
-+
-+	/**
-+	 * Perform a minimum ammount of operations, in order to transform the decorations
-+	 * identified by `oldDecorations` to the decorations described by `newDecorations`
-+	 * and returns the new identifiers associated with the resulting decorations.
-+	 *
-+	 * @param oldDecorations Array containing previous decorations identifiers.
-+	 * @param newDecorations Array describing what decorations should result after the call.
-+	 * @param ownerId Identifies the editor id in which these decorations should appear. If no `ownerId` is provided, the decorations will appear in all editors that attach this model.
-+	 * @return An array containing the new decorations identifiers.
-+	 */
-+	deltaDecorations(oldDecorations:string[], newDecorations:IModelDeltaDecoration[], ownerId?:number): string[];
-+
-+	/**
-+	 * Remove all decorations that have been added with this specific ownerId.
-+	 * @param ownerId The owner id to search for.
-+	 * @internal
-+	 */
-+	removeAllDecorationsWithOwnerId(ownerId:number): void;
-+
-+	/**
-+	 * Get the options associated with a decoration.
-+	 * @param id The decoration id.
-+	 * @return The decoration options or null if the decoration was not found.
-+	 */
-+	getDecorationOptions(id:string): IModelDecorationOptions;
-+
-+	/**
-+	 * Get the range associated with a decoration.
-+	 * @param id The decoration id.
-+	 * @return The decoration range or null if the decoration was not found.
-+	 */
-+	getDecorationRange(id:string): Range;
-+
-+	/**
-+	 * Gets all the decorations for the line `lineNumber` as an array.
-+	 * @param lineNumber The line number
-+	 * @param ownerId If set, it will ignore decorations belonging to other owners.
-+	 * @param filterOutValidation If set, it will ignore decorations specific to validation (i.e. warnings, errors).
-+	 * @return An array with the decorations
-+	 */
-+	getLineDecorations(lineNumber:number, ownerId?:number, filterOutValidation?:boolean): IModelDecoration[];
-+
-+	/**
-+	 * Gets all the decorations for the lines between `startLineNumber` and `endLineNumber` as an array.
-+	 * @param startLineNumber The start line number
-+	 * @param endLineNumber The end line number
-+	 * @param ownerId If set, it will ignore decorations belonging to other owners.
-+	 * @param filterOutValidation If set, it will ignore decorations specific to validation (i.e. warnings, errors).
-+	 * @return An array with the decorations
-+	 */
-+	getLinesDecorations(startLineNumber:number, endLineNumber:number, ownerId?:number, filterOutValidation?:boolean): IModelDecoration[];
-+
-+	/**
-+	 * Gets all the deocorations in a range as an array. Only `startLineNumber` and `endLineNumber` from `range` are used for filtering.
-+	 * So for now it returns all the decorations on the same line as `range`.
-+	 * @param range The range to search in
-+	 * @param ownerId If set, it will ignore decorations belonging to other owners.
-+	 * @param filterOutValidation If set, it will ignore decorations specific to validation (i.e. warnings, errors).
-+	 * @return An array with the decorations
-+	 */
-+	getDecorationsInRange(range:IRange, ownerId?:number, filterOutValidation?:boolean): IModelDecoration[];
-+
-+	/**
-+	 * Gets all the decorations as an array.
-+	 * @param ownerId If set, it will ignore decorations belonging to other owners.
-+	 * @param filterOutValidation If set, it will ignore decorations specific to validation (i.e. warnings, errors).
-+	 */
-+	getAllDecorations(ownerId?:number, filterOutValidation?:boolean): IModelDecoration[];
-+}
-+
-+/**
-+ * An editable text model.
-+ */
-+export interface IEditableTextModel extends ITextModelWithMarkers {
-+
-+	/**
-+	 * Normalize a string containing whitespace according to indentation rules (converts to spaces or to tabs).
-+	 */
-+	normalizeIndentation(str:string): string;
-+
-+	/**
-+	 * Get what is considered to be one indent (e.g. a tab character or 4 spaces, etc.).
-+	 */
-+	getOneIndent(): string;
-+
-+	/**
-+	 * Change the options of this model.
-+	 */
-+	updateOptions(newOpts:ITextModelUpdateOptions): void;
-+
-+	/**
-+	 * Detect the indentation options for this model from its content.
-+	 */
-+	detectIndentation(defaultInsertSpaces:boolean, defaultTabSize:number): void;
-+
-+	/**
-+	 * Push a stack element onto the undo stack. This acts as an undo/redo point.
-+	 * The idea is to use `pushEditOperations` to edit the model and then to
-+	 * `pushStackElement` to create an undo/redo stop point.
-+	 */
-+	pushStackElement(): void;
-+
-+	/**
-+	 * Push edit operations, basically editing the model. This is the preferred way
-+	 * of editing the model. The edit operations will land on the undo stack.
-+	 * @param beforeCursorState The cursor state before the edit operaions. This cursor state will be returned when `undo` or `redo` are invoked.
-+	 * @param editOperations The edit operations.
-+	 * @param cursorStateComputer A callback that can compute the resulting cursors state after the edit operations have been executed.
-+	 * @return The cursor state returned by the `cursorStateComputer`.
-+	 */
-+	pushEditOperations(beforeCursorState:Selection[], editOperations:IIdentifiedSingleEditOperation[], cursorStateComputer:ICursorStateComputer): Selection[];
-+
-+	/**
-+	 * Edit the model without adding the edits to the undo stack.
-+	 * This can have dire consequences on the undo stack! See @pushEditOperations for the preferred way.
-+	 * @param operations The edit operations.
-+	 * @return The inverse edit operations, that, when applied, will bring the model back to the previous state.
-+	 */
-+	applyEdits(operations:IIdentifiedSingleEditOperation[]): IIdentifiedSingleEditOperation[];
-+
-+	/**
-+	 * Undo edit operations until the first previous stop point created by `pushStackElement`.
-+	 * The inverse edit operations will be pushed on the redo stack.
-+	 * @internal
-+	 */
-+	undo(): Selection[];
-+
-+	/**
-+	 * Redo edit operations until the next stop point created by `pushStackElement`.
-+	 * The inverse edit operations will be pushed on the undo stack.
-+	 * @internal
-+	 */
-+	redo(): Selection[];
-+
-+	/**
-+	 * Set an editable range on the model.
-+	 * @internal
-+	 */
-+	setEditableRange(range:IRange): void;
-+
-+	/**
-+	 * Check if the model has an editable range.
-+	 * @internal
-+	 */
-+	hasEditableRange(): boolean;
-+
-+	/**
-+	 * Get the editable range on the model.
-+	 * @internal
-+	 */
-+	getEditableRange(): Range;
-+}
-+
-+/**
-+ * A model.
-+ */
-+export interface IModel extends IReadOnlyModel, IEditableTextModel, ITextModelWithMarkers, ITokenizedModel, ITextModelWithTrackedRanges, ITextModelWithDecorations, IEditorModel {
-+	/**
-+	 * @deprecated Please use `onDidChangeContent` instead.
-+	 * An event emitted when the contents of the model have changed.
-+	 * @internal
-+	 */
-+	onDidChangeRawContent(listener: (e:IModelContentChangedEvent)=>void): IDisposable;
-+	/**
-+	 * An event emitted when the contents of the model have changed.
-+	 */
-+	onDidChangeContent(listener: (e:IModelContentChangedEvent2)=>void): IDisposable;
-+	/**
-+	 * An event emitted when decorations of the model have changed.
-+	 */
-+	onDidChangeDecorations(listener: (e:IModelDecorationsChangedEvent)=>void): IDisposable;
-+	/**
-+	 * An event emitted when the model options have changed.
-+	 */
-+	onDidChangeOptions(listener: (e:IModelOptionsChangedEvent)=>void): IDisposable;
-+	/**
-+	 * An event emitted when the language associated with the model has changed.
-+	 */
-+	onDidChangeMode(listener: (e:IModelModeChangedEvent)=>void): IDisposable;
-+	/**
-+	 * An event emitted right before disposing the model.
-+	 */
-+	onWillDispose(listener: ()=>void): IDisposable;
-+
-+	/**
-+	 * @internal
-+	 */
-+	addBulkListener(listener:BulkListenerCallback):IDisposable;
-+
-+	/**
-+	 * A unique identifier associated with this model.
-+	 */
-+	id: string;
-+
-+	/**
-+	 * Destroy this model. This will unbind the model from the mode
-+	 * and make all necessary clean-up to release this object to the GC.
-+	 * @internal
-+	 */
-+	destroy(): void;
-+
-+	/**
-+	 * Destroy this model. This will unbind the model from the mode
-+	 * and make all necessary clean-up to release this object to the GC.
-+	 */
-+	dispose(): void;
-+
-+	/**
-+	 * @internal
-+	 */
-+	onBeforeAttached(): void;
-+
-+	/**
-+	 * @internal
-+	 */
-+	onBeforeDetached(): void;
-+
-+	/**
-+	 * Returns iff this model is attached to an editor or not.
-+	 * @internal
-+	 */
-+	isAttachedToEditor(): boolean;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface IRangeWithText {
-+	text:string;
-+	range:IRange;
-+}
-+
-+/**
-+ * An event describing that the current mode associated with a model has changed.
-+ */
-+export interface IModelModeChangedEvent {
-+	/**
-+	 * Previous mode
-+	 */
-+	oldMode:IMode;
-+	/**
-+	 * New mode
-+	 */
-+	newMode:IMode;
-+}
-+
-+/**
-+ * An event describing a change in the text of a model.
-+ */
-+export interface IModelContentChangedEvent2 {
-+	/**
-+	 * The range that got replaced.
-+	 */
-+	range: IRange;
-+	/**
-+	 * The length of the range that got replaced.
-+	 */
-+	rangeLength: number;
-+	/**
-+	 * The new text for the range.
-+	 */
-+	text: string;
-+	/**
-+	 * The (new) end-of-line character.
-+	 */
-+	eol: string;
-+	/**
-+	 * The new version id the model has transitioned to.
-+	 */
-+	versionId: number;
-+	/**
-+	 * Flag that indicates that this event was generated while undoing.
-+	 */
-+	isUndoing: boolean;
-+	/**
-+	 * Flag that indicates that this event was generated while redoing.
-+	 */
-+	isRedoing: boolean;
-+}
-+/**
-+ * An event describing a change in the text of a model.
-+ * @internal
-+ */
-+export interface IModelContentChangedEvent {
-+	/**
-+	 * The event type. It can be used to detect the actual event type:
-+	 * 		EditorCommon.EventType.ModelContentChangedFlush => IModelContentChangedFlushEvent
-+	 * 		EditorCommon.EventType.ModelContentChangedLinesDeleted => IModelContentChangedLineChangedEvent
-+	 * 		EditorCommon.EventType.ModelContentChangedLinesInserted => IModelContentChangedLinesDeletedEvent
-+	 * 		EditorCommon.EventType.ModelContentChangedLineChanged => IModelContentChangedLinesInsertedEvent
-+	 */
-+	changeType: string;
-+	/**
-+	 * The new version id the model has transitioned to.
-+	 */
-+	versionId: number;
-+	/**
-+	 * Flag that indicates that this event was generated while undoing.
-+	 */
-+	isUndoing: boolean;
-+	/**
-+	 * Flag that indicates that this event was generated while redoing.
-+	 */
-+	isRedoing: boolean;
-+}
-+
-+/**
-+ * The raw text backing a model.
-+ */
-+export interface IRawText {
-+	/**
-+	 * The entire text length.
-+	 */
-+	length: number;
-+	/**
-+	 * The text split into lines.
-+	 */
-+	lines: string[];
-+	/**
-+	 * The BOM (leading character sequence of the file).
-+	 */
-+	BOM: string;
-+	/**
-+	 * The end of line sequence.
-+	 */
-+	EOL: string;
-+	/**
-+	 * The options associated with this text.
-+	 */
-+	options: ITextModelResolvedOptions;
-+}
-+
-+/**
-+ * An event describing that a model has been reset to a new value.
-+ * @internal
-+ */
-+export interface IModelContentChangedFlushEvent extends IModelContentChangedEvent {
-+	/**
-+	 * The new text content of the model.
-+	 */
-+	detail: IRawText;
-+}
-+/**
-+ * An event describing that a line has changed in a model.
-+ * @internal
-+ */
-+export interface IModelContentChangedLineChangedEvent extends IModelContentChangedEvent {
-+	/**
-+	 * The line that has changed.
-+	 */
-+	lineNumber: number;
-+	/**
-+	 * The new value of the line.
-+	 */
-+	detail: string;
-+}
-+/**
-+ * An event describing that line(s) have been deleted in a model.
-+ * @internal
-+ */
-+export interface IModelContentChangedLinesDeletedEvent extends IModelContentChangedEvent {
-+	/**
-+	 * At what line the deletion began (inclusive).
-+	 */
-+	fromLineNumber: number;
-+	/**
-+	 * At what line the deletion stopped (inclusive).
-+	 */
-+	toLineNumber: number;
-+}
-+/**
-+ * An event describing that line(s) have been inserted in a model.
-+ * @internal
-+ */
-+export interface IModelContentChangedLinesInsertedEvent extends IModelContentChangedEvent {
-+	/**
-+	 * Before what line did the insertion begin
-+	 */
-+	fromLineNumber: number;
-+	/**
-+	 * `toLineNumber` - `fromLineNumber` + 1 denotes the number of lines that were inserted
-+	 */
-+	toLineNumber: number;
-+	/**
-+	 * The text that was inserted
-+	 */
-+	detail: string;
-+}
-+/**
-+ * Decoration data associated with a model decorations changed event.
-+ */
-+export interface IModelDecorationsChangedEventDecorationData {
-+	/**
-+	 * The id of the decoration.
-+	 */
-+	id:string;
-+	/**
-+	 * The owner id of the decoration.
-+	 */
-+	ownerId:number;
-+	/**
-+	 * The range of the decoration.
-+	 */
-+	range:IRange;
-+	/**
-+	 * A flag describing if this is a problem decoration (e.g. warning/error).
-+	 */
-+	isForValidation:boolean;
-+	/**
-+	 * The options for this decoration.
-+	 */
-+	options:IModelDecorationOptions;
-+}
-+/**
-+ * An event describing that model decorations have changed.
-+ */
-+export interface IModelDecorationsChangedEvent {
-+	/**
-+	 * A summary with ids of decorations that have changed.
-+	 */
-+	ids:string[];
-+	/**
-+	 * Lists of details for added or changed decorations.
-+	 */
-+	addedOrChangedDecorations:IModelDecorationsChangedEventDecorationData[];
-+	/**
-+	 * List of ids for removed decorations.
-+	 */
-+	removedDecorations:string[];
-+	/**
-+	 * Details regarding old options.
-+	 */
-+	oldOptions:{[decorationId:string]:IModelDecorationOptions;};
-+	/**
-+	 * Details regarding old ranges.
-+	 */
-+	oldRanges:{[decorationId:string]:IRange;};
-+}
-+/**
-+ * An event describing that a range of lines has been tokenized
-+ */
-+export interface IModelTokensChangedEvent {
-+	/**
-+	 * The start of the range (inclusive)
-+	 */
-+	fromLineNumber:number;
-+	/**
-+	 * The end of the range (inclusive)
-+	 */
-+	toLineNumber:number;
-+}
-+
-+/**
-+ * Describes the reason the cursor has changed its position.
-+ */
-+export enum CursorChangeReason {
-+	/**
-+	 * Unknown or not set.
-+	 */
-+	NotSet = 0,
-+	/**
-+	 * A `model.setValue()` was called.
-+	 */
-+	ContentFlush = 1,
-+	/**
-+	 * The `model` has been changed outside of this cursor and the cursor recovers its position from associated markers.
-+	 */
-+	RecoverFromMarkers = 2,
-+	/**
-+	 * There was an explicit user gesture.
-+	 */
-+	Explicit = 3,
-+	/**
-+	 * There was a Paste.
-+	 */
-+	Paste = 4,
-+	/**
-+	 * There was an Undo.
-+	 */
-+	Undo = 5,
-+	/**
-+	 * There was a Redo.
-+	 */
-+	Redo = 6,
-+}
-+/**
-+ * An event describing that the cursor position has changed.
-+ */
-+export interface ICursorPositionChangedEvent {
-+	/**
-+	 * Primary cursor's position.
-+	 */
-+	position:Position;
-+	/**
-+	 * Primary cursor's view position
-+	 */
-+	viewPosition:Position;
-+	/**
-+	 * Secondary cursors' position.
-+	 */
-+	secondaryPositions:Position[];
-+	/**
-+	 * Secondary cursors' view position.
-+	 */
-+	secondaryViewPositions:Position[];
-+	/**
-+	 * Reason.
-+	 */
-+	reason:CursorChangeReason;
-+	/**
-+	 * Source of the call that caused the event.
-+	 */
-+	source:string;
-+	/**
-+	 * Is the primary cursor in the editable range?
-+	 */
-+	isInEditableRange:boolean;
-+}
-+/**
-+ * An event describing that the cursor selection has changed.
-+ */
-+export interface ICursorSelectionChangedEvent {
-+	/**
-+	 * The primary selection.
-+	 */
-+	selection:Selection;
-+	/**
-+	 * The primary selection in view coordinates.
-+	 */
-+	viewSelection:Selection;
-+	/**
-+	 * The secondary selections.
-+	 */
-+	secondarySelections:Selection[];
-+	/**
-+	 * The secondary selections in view coordinates.
-+	 */
-+	secondaryViewSelections:Selection[];
-+	/**
-+	 * Source of the call that caused the event.
-+	 */
-+	source:string;
-+	/**
-+	 * Reason.
-+	 */
-+	reason:CursorChangeReason;
-+}
-+/**
-+ * @internal
-+ */
-+export enum VerticalRevealType {
-+	Simple = 0,
-+	Center = 1,
-+	CenterIfOutsideViewport = 2,
-+	Top = 3,
-+	Bottom = 4
-+}
-+/**
-+ * An event describing a request to reveal a specific range in the view of the editor.
-+ * @internal
-+ */
-+export interface ICursorRevealRangeEvent {
-+	/**
-+	 * Range to be reavealed.
-+	 */
-+	range:Range;
-+	/**
-+	 * View range to be reavealed.
-+	 */
-+	viewRange:Range;
-+
-+	verticalType: VerticalRevealType;
-+	/**
-+	 * If true: there should be a horizontal & vertical revealing
-+	 * If false: there should be just a vertical revealing
-+	 */
-+	revealHorizontal: boolean;
-+	/**
-+	 * If true: cursor is revealed if outside viewport
-+	 */
-+	revealCursor: boolean;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface ICursorScrollRequestEvent {
-+	deltaLines: number;
-+	revealCursor: boolean;
-+}
-+
-+/**
-+ * An event describing that an editor has had its model reset (i.e. `editor.setModel()`).
-+ */
-+export interface IModelChangedEvent {
-+	/**
-+	 * The `uri` of the previous model or null.
-+	 */
-+	oldModelUrl: URI;
-+	/**
-+	 * The `uri` of the new model or null.
-+	 */
-+	newModelUrl: URI;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface IEditorWhitespace {
-+	id:number;
-+	afterLineNumber:number;
-+	heightInLines:number;
-+}
-+
-+/**
-+ * A description for the overview ruler position.
-+ */
-+export class OverviewRulerPosition {
-+	_overviewRulerPositionBrand: void;
-+
-+	/**
-+	 * Width of the overview ruler
-+	 */
-+	width:number;
-+	/**
-+	 * Height of the overview ruler
-+	 */
-+	height:number;
-+	/**
-+	 * Top position for the overview ruler
-+	 */
-+	top:number;
-+	/**
-+	 * Right position for the overview ruler
-+	 */
-+	right:number;
-+
-+	/**
-+	 * @internal
-+	 */
-+	constructor(source:{
-+		width:number;
-+		height:number;
-+		top:number;
-+		right:number;
-+	}) {
-+		this.width = source.width|0;
-+		this.height = source.height|0;
-+		this.top = source.top|0;
-+		this.right = source.right|0;
-+	}
-+
-+	/**
-+	 * @internal
-+	 */
-+	public equals(other:OverviewRulerPosition): boolean {
-+		return (
-+			this.width === other.width
-+			&& this.height === other.height
-+			&& this.top === other.top
-+			&& this.right === other.right
-+		);
-+	}
-+
-+	/**
-+	 * @internal
-+	 */
-+	public clone(): OverviewRulerPosition {
-+		return new OverviewRulerPosition(this);
-+	}
-+}
-+
-+/**
-+ * The internal layout details of the editor.
-+ */
-+export class EditorLayoutInfo {
-+	_editorLayoutInfoBrand: void;
-+
-+	/**
-+	 * Full editor width.
-+	 */
-+	width:number;
-+	/**
-+	 * Full editor height.
-+	 */
-+	height:number;
-+
-+	/**
-+	 * Left position for the glyph margin.
-+	 */
-+	glyphMarginLeft:number;
-+	/**
-+	 * The width of the glyph margin.
-+	 */
-+	glyphMarginWidth:number;
-+	/**
-+	 * The height of the glyph margin.
-+	 */
-+	glyphMarginHeight:number;
-+
-+	/**
-+	 * Left position for the line numbers.
-+	 */
-+	lineNumbersLeft:number;
-+	/**
-+	 * The width of the line numbers.
-+	 */
-+	lineNumbersWidth:number;
-+	/**
-+	 * The height of the line numbers.
-+	 */
-+	lineNumbersHeight:number;
-+
-+	/**
-+	 * Left position for the line decorations.
-+	 */
-+	decorationsLeft:number;
-+	/**
-+	 * The width of the line decorations.
-+	 */
-+	decorationsWidth:number;
-+	/**
-+	 * The height of the line decorations.
-+	 */
-+	decorationsHeight:number;
-+
-+	/**
-+	 * Left position for the content (actual text)
-+	 */
-+	contentLeft:number;
-+	/**
-+	 * The width of the content (actual text)
-+	 */
-+	contentWidth:number;
-+	/**
-+	 * The height of the content (actual height)
-+	 */
-+	contentHeight:number;
-+
-+	/**
-+	 * The width of the vertical scrollbar.
-+	 */
-+	verticalScrollbarWidth:number;
-+	/**
-+	 * The height of the horizontal scrollbar.
-+	 */
-+	horizontalScrollbarHeight:number;
-+
-+	/**
-+	 * The position of the overview ruler.
-+	 */
-+	overviewRuler:OverviewRulerPosition;
-+
-+	/**
-+	 * @internal
-+	 */
-+	constructor(source:{
-+		width:number;
-+		height:number;
-+		glyphMarginLeft:number;
-+		glyphMarginWidth:number;
-+		glyphMarginHeight:number;
-+		lineNumbersLeft:number;
-+		lineNumbersWidth:number;
-+		lineNumbersHeight:number;
-+		decorationsLeft:number;
-+		decorationsWidth:number;
-+		decorationsHeight:number;
-+		contentLeft:number;
-+		contentWidth:number;
-+		contentHeight:number;
-+		verticalScrollbarWidth:number;
-+		horizontalScrollbarHeight:number;
-+		overviewRuler:OverviewRulerPosition;
-+	}) {
-+		this.width = source.width|0;
-+		this.height = source.height|0;
-+		this.glyphMarginLeft = source.glyphMarginLeft|0;
-+		this.glyphMarginWidth = source.glyphMarginWidth|0;
-+		this.glyphMarginHeight = source.glyphMarginHeight|0;
-+		this.lineNumbersLeft = source.lineNumbersLeft|0;
-+		this.lineNumbersWidth = source.lineNumbersWidth|0;
-+		this.lineNumbersHeight = source.lineNumbersHeight|0;
-+		this.decorationsLeft = source.decorationsLeft|0;
-+		this.decorationsWidth = source.decorationsWidth|0;
-+		this.decorationsHeight = source.decorationsHeight|0;
-+		this.contentLeft = source.contentLeft|0;
-+		this.contentWidth = source.contentWidth|0;
-+		this.contentHeight = source.contentHeight|0;
-+		this.verticalScrollbarWidth = source.verticalScrollbarWidth|0;
-+		this.horizontalScrollbarHeight = source.horizontalScrollbarHeight|0;
-+		this.overviewRuler = source.overviewRuler.clone();
-+	}
-+
-+	/**
-+	 * @internal
-+	 */
-+	public equals(other:EditorLayoutInfo): boolean {
-+		return (
-+			this.width === other.width
-+			&& this.height === other.height
-+			&& this.glyphMarginLeft === other.glyphMarginLeft
-+			&& this.glyphMarginWidth === other.glyphMarginWidth
-+			&& this.glyphMarginHeight === other.glyphMarginHeight
-+			&& this.lineNumbersLeft === other.lineNumbersLeft
-+			&& this.lineNumbersWidth === other.lineNumbersWidth
-+			&& this.lineNumbersHeight === other.lineNumbersHeight
-+			&& this.decorationsLeft === other.decorationsLeft
-+			&& this.decorationsWidth === other.decorationsWidth
-+			&& this.decorationsHeight === other.decorationsHeight
-+			&& this.contentLeft === other.contentLeft
-+			&& this.contentWidth === other.contentWidth
-+			&& this.contentHeight === other.contentHeight
-+			&& this.verticalScrollbarWidth === other.verticalScrollbarWidth
-+			&& this.horizontalScrollbarHeight === other.horizontalScrollbarHeight
-+			&& this.overviewRuler.equals(other.overviewRuler)
-+		);
-+	}
-+
-+	/**
-+	 * @internal
-+	 */
-+	public clone(): EditorLayoutInfo {
-+		return new EditorLayoutInfo(this);
-+	}
-+}
-+
-+/**
-+ * Options for creating the editor.
-+ */
-+export interface ICodeEditorWidgetCreationOptions extends IEditorOptions {
-+	/**
-+	 * The initial model associated with this code editor.
-+	 */
-+	model?:IModel;
-+}
-+
-+/**
-+ * An editor model.
-+ */
-+export interface IEditorModel {
-+}
-+/**
-+ * An editor view state.
-+ */
-+export interface IEditorViewState {
-+}
-+export interface IDimension {
-+	width:number;
-+	height:number;
-+}
-+
-+/**
-+ * A (serializable) state of the cursors.
-+ */
-+export interface ICursorState {
-+	inSelectionMode:boolean;
-+	selectionStart:IPosition;
-+	position:IPosition;
-+}
-+/**
-+ * A (serializable) state of the view.
-+ */
-+export interface IViewState {
-+	scrollTop: number;
-+	scrollTopWithoutViewZones: number;
-+	scrollLeft: number;
-+}
-+/**
-+ * A (serializable) state of the code editor.
-+ */
-+export interface ICodeEditorViewState extends IEditorViewState {
-+	cursorState:ICursorState[];
-+	viewState:IViewState;
-+	contributionsState: {[id:string]:any};
-+}
-+
-+/**
-+ * Type of hit element with the mouse in the editor.
-+ */
-+export enum MouseTargetType {
-+	/**
-+	 * Mouse is on top of an unknown element.
-+	 */
-+	UNKNOWN,
-+	/**
-+	 * Mouse is on top of the textarea used for input.
-+	 */
-+	TEXTAREA,
-+	/**
-+	 * Mouse is on top of the glyph margin
-+	 */
-+	GUTTER_GLYPH_MARGIN,
-+	/**
-+	 * Mouse is on top of the line numbers
-+	 */
-+	GUTTER_LINE_NUMBERS,
-+	/**
-+	 * Mouse is on top of the line decorations
-+	 */
-+	GUTTER_LINE_DECORATIONS,
-+	/**
-+	 * Mouse is on top of the whitespace left in the gutter by a view zone.
-+	 */
-+	GUTTER_VIEW_ZONE,
-+	/**
-+	 * Mouse is on top of text in the content.
-+	 */
-+	CONTENT_TEXT,
-+	/**
-+	 * Mouse is on top of empty space in the content (e.g. after line text or below last line)
-+	 */
-+	CONTENT_EMPTY,
-+	/**
-+	 * Mouse is on top of a view zone in the content.
-+	 */
-+	CONTENT_VIEW_ZONE,
-+	/**
-+	 * Mouse is on top of a content widget.
-+	 */
-+	CONTENT_WIDGET,
-+	/**
-+	 * Mouse is on top of the decorations overview ruler.
-+	 */
-+	OVERVIEW_RULER,
-+	/**
-+	 * Mouse is on top of a scrollbar.
-+	 */
-+	SCROLLBAR,
-+	/**
-+	 * Mouse is on top of an overlay widget.
-+	 */
-+	OVERLAY_WIDGET
-+}
-+
-+/**
-+ * A model for the diff editor.
-+ */
-+export interface IDiffEditorModel extends IEditorModel {
-+	/**
-+	 * Original model.
-+	 */
-+	original: IModel;
-+	/**
-+	 * Modified model.
-+	 */
-+	modified: IModel;
-+}
-+/**
-+ * (Serializable) View state for the diff editor.
-+ */
-+export interface IDiffEditorViewState extends IEditorViewState {
-+	original: ICodeEditorViewState;
-+	modified: ICodeEditorViewState;
-+}
-+/**
-+ * A change
-+ */
-+export interface IChange {
-+	originalStartLineNumber:number;
-+	originalEndLineNumber:number;
-+	modifiedStartLineNumber:number;
-+	modifiedEndLineNumber:number;
-+}
-+/**
-+ * A character level change.
-+ */
-+export interface ICharChange extends IChange {
-+	originalStartColumn:number;
-+	originalEndColumn:number;
-+	modifiedStartColumn:number;
-+	modifiedEndColumn:number;
-+}
-+/**
-+ * A line change
-+ */
-+export interface ILineChange extends IChange {
-+	charChanges:ICharChange[];
-+}
-+/**
-+ * Information about a line in the diff editor
-+ * @internal
-+ */
-+export interface IDiffLineInformation {
-+	equivalentLineNumber: number;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export namespace EditorContextKeys {
-+	/**
-+	 * A context key that is set when the editor's text has focus (cursor is blinking).
-+	 * @internal
-+	 */
-+	export const TextFocus = new RawContextKey<boolean>('editorTextFocus', false);
-+	/**
-+	 * A context key that is set when the editor's text or an editor's widget has focus.
-+	 * @internal
-+	 */
-+	export const Focus = new RawContextKey<boolean>('editorFocus', false);
-+
-+	/**
-+	 * A context key that is set when the editor's text is readonly.
-+	 * @internal
-+	 */
-+	export const ReadOnly = new RawContextKey<boolean>('editorReadonly', false);
-+
-+	/**
-+	 * @internal
-+	 */
-+	export const Writable:ContextKeyExpr = ReadOnly.toNegated();
-+
-+	/**
-+	 * A context key that is set when the editor has a non-collapsed selection.
-+	 * @internal
-+	 */
-+	export const HasNonEmptySelection = new RawContextKey<boolean>('editorHasSelection', false);
-+	/**
-+	 * @internal
-+	 */
-+	export const HasOnlyEmptySelection:ContextKeyExpr = HasNonEmptySelection.toNegated();
-+
-+	/**
-+	 * A context key that is set when the editor has multiple selections (multiple cursors).
-+	 * @internal
-+	 */
-+	export const HasMultipleSelections = new RawContextKey<boolean>('editorHasMultipleSelections', false);
-+	/**
-+	 * @internal
-+	 */
-+	export const HasSingleSelection:ContextKeyExpr = HasMultipleSelections.toNegated();
-+
-+	/**
-+	 * @internal
-+	 */
-+	export const TabMovesFocus = new RawContextKey<boolean>('editorTabMovesFocus', false);
-+	/**
-+	 * @internal
-+	 */
-+	export const TabDoesNotMoveFocus:ContextKeyExpr = TabMovesFocus.toNegated();
-+
-+	/**
-+	 * A context key that is set to the language associated with the model associated with the editor.
-+	 * @internal
-+	 */
-+	export const LanguageId = new RawContextKey<string>('editorLangId', undefined);
-+
-+};
-+
-+
-+/**
-+ * @internal
-+ */
-+export namespace ModeContextKeys {
-+	/**
-+	 * @internal
-+	 */
-+	export const hasCompletionItemProvider = new RawContextKey<boolean>('editorHasCompletionItemProvider', undefined);
-+	/**
-+	 * @internal
-+	 */
-+	export const hasCodeActionsProvider = new RawContextKey<boolean>('editorHasCodeActionsProvider', undefined);
-+	/**
-+	 * @internal
-+	 */
-+	export const hasCodeLensProvider = new RawContextKey<boolean>('editorHasCodeLensProvider', undefined);
-+	/**
-+	 * @internal
-+	 */
-+	export const hasDefinitionProvider = new RawContextKey<boolean>('editorHasDefinitionProvider', undefined);
-+	/**
-+	 * @internal
-+	 */
-+	export const hasHoverProvider = new RawContextKey<boolean>('editorHasHoverProvider', undefined);
-+	/**
-+	 * @internal
-+	 */
-+	export const hasDocumentHighlightProvider = new RawContextKey<boolean>('editorHasDocumentHighlightProvider', undefined);
-+	/**
-+	 * @internal
-+	 */
-+	export const hasDocumentSymbolProvider = new RawContextKey<boolean>('editorHasDocumentSymbolProvider', undefined);
-+	/**
-+	 * @internal
-+	 */
-+	export const hasReferenceProvider = new RawContextKey<boolean>('editorHasReferenceProvider', undefined);
-+	/**
-+	 * @internal
-+	 */
-+	export const hasRenameProvider = new RawContextKey<boolean>('editorHasRenameProvider', undefined);
-+	/**
-+	 * @internal
-+	 */
-+	export const hasFormattingProvider = new RawContextKey<boolean>('editorHasFormattingProvider', undefined);
-+	/**
-+	 * @internal
-+	 */
-+	export const hasSignatureHelpProvider = new RawContextKey<boolean>('editorHasSignatureHelpProvider', undefined);
-+}
-+
-+export class BareFontInfo {
-+	_bareFontInfoBrand: void;
-+
-+	fontFamily: string;
-+	fontWeight: string;
-+	fontSize: number;
-+	lineHeight: number;
-+
-+	/**
-+	 * @internal
-+	 */
-+	constructor(opts: {
-+		fontFamily: string;
-+		fontWeight: string;
-+		fontSize: number;
-+		lineHeight: number;
-+	}) {
-+		this.fontFamily = String(opts.fontFamily);
-+		this.fontWeight = String(opts.fontWeight);
-+		this.fontSize = opts.fontSize;
-+		this.lineHeight = opts.lineHeight|0;
-+	}
-+
-+	/**
-+	 * @internal
-+	 */
-+	public getId(): string {
-+		return this.fontFamily + '-' + this.fontWeight + '-' + this.fontSize + '-' + this.lineHeight + '-';
-+	}
-+}
-+
-+export class FontInfo extends BareFontInfo {
-+	_editorStylingBrand: void;
-+
-+	typicalHalfwidthCharacterWidth:number;
-+	typicalFullwidthCharacterWidth:number;
-+	spaceWidth:number;
-+	maxDigitWidth: number;
-+
-+	/**
-+	 * @internal
-+	 */
-+	constructor(opts:{
-+		fontFamily: string;
-+		fontWeight: string;
-+		fontSize: number;
-+		lineHeight: number;
-+		typicalHalfwidthCharacterWidth:number;
-+		typicalFullwidthCharacterWidth:number;
-+		spaceWidth:number;
-+		maxDigitWidth: number;
-+	}) {
-+		super(opts);
-+		this.typicalHalfwidthCharacterWidth = opts.typicalHalfwidthCharacterWidth;
-+		this.typicalFullwidthCharacterWidth = opts.typicalFullwidthCharacterWidth;
-+		this.spaceWidth = opts.spaceWidth;
-+		this.maxDigitWidth = opts.maxDigitWidth;
-+	}
-+
-+	/**
-+	 * @internal
-+	 */
-+	public equals(other:FontInfo): boolean {
-+		return (
-+			this.fontFamily === other.fontFamily
-+			&& this.fontWeight === other.fontWeight
-+			&& this.fontSize === other.fontSize
-+			&& this.lineHeight === other.lineHeight
-+			&& this.typicalHalfwidthCharacterWidth === other.typicalHalfwidthCharacterWidth
-+			&& this.typicalFullwidthCharacterWidth === other.typicalFullwidthCharacterWidth
-+			&& this.spaceWidth === other.spaceWidth
-+			&& this.maxDigitWidth === other.maxDigitWidth
-+		);
-+	}
-+
-+	/**
-+	 * @internal
-+	 */
-+	public clone(): FontInfo {
-+		return new FontInfo(this);
-+	}
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface IConfiguration {
-+	onDidChange: Event<IConfigurationChangedEvent>;
-+
-+	editor:InternalEditorOptions;
-+
-+	setMaxLineNumber(maxLineNumber:number): void;
-+}
-+
-+// --- view
-+
-+/**
-+ * @internal
-+ */
-+export interface IViewEventNames {
-+	ModelFlushedEvent: string;
-+	LinesDeletedEvent: string;
-+	LinesInsertedEvent: string;
-+	LineChangedEvent: string;
-+	TokensChangedEvent: string;
-+	DecorationsChangedEvent: string;
-+	CursorPositionChangedEvent: string;
-+	CursorSelectionChangedEvent: string;
-+	RevealRangeEvent: string;
-+	LineMappingChangedEvent: string;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export var ViewEventNames = {
-+	ModelFlushedEvent: 'modelFlushedEvent',
-+	LinesDeletedEvent: 'linesDeletedEvent',
-+	LinesInsertedEvent: 'linesInsertedEvent',
-+	LineChangedEvent: 'lineChangedEvent',
-+	TokensChangedEvent: 'tokensChangedEvent',
-+	DecorationsChangedEvent: 'decorationsChangedEvent',
-+	CursorPositionChangedEvent: 'cursorPositionChangedEvent',
-+	CursorSelectionChangedEvent: 'cursorSelectionChangedEvent',
-+	RevealRangeEvent: 'revealRangeEvent',
-+	LineMappingChangedEvent: 'lineMappingChangedEvent',
-+	ScrollRequestEvent: 'scrollRequestEvent'
-+};
-+
-+export interface IScrollEvent {
-+	scrollTop: number;
-+	scrollLeft: number;
-+	scrollWidth: number;
-+	scrollHeight: number;
-+
-+	scrollTopChanged: boolean;
-+	scrollLeftChanged: boolean;
-+	scrollWidthChanged: boolean;
-+	scrollHeightChanged: boolean;
-+}
-+
-+export interface INewScrollPosition {
-+	scrollLeft?: number;
-+	scrollTop?: number;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface IViewLinesDeletedEvent {
-+	/**
-+	 * At what line the deletion began (inclusive).
-+	 */
-+	fromLineNumber: number;
-+	/**
-+	 * At what line the deletion stopped (inclusive).
-+	 */
-+	toLineNumber: number;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface IViewLinesInsertedEvent {
-+	/**
-+	 * Before what line did the insertion begin
-+	 */
-+	fromLineNumber: number;
-+	/**
-+	 * `toLineNumber` - `fromLineNumber` + 1 denotes the number of lines that were inserted
-+	 */
-+	toLineNumber: number;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface IViewLineChangedEvent {
-+	/**
-+	 * The line that has changed.
-+	 */
-+	lineNumber: number;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface IViewTokensChangedEvent {
-+	/**
-+	 * Start line number of range
-+	 */
-+	fromLineNumber: number;
-+	/**
-+	 * End line number of range
-+	 */
-+	toLineNumber: number;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface IViewDecorationsChangedEvent {
-+	/**
-+	 * signals that at least one inline decoration has changed
-+	 */
-+	inlineDecorationsChanged: boolean;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface IViewCursorPositionChangedEvent {
-+	/**
-+	 * Primary cursor's position.
-+	 */
-+	position: Position;
-+	/**
-+	 * Secondary cursors' position.
-+	 */
-+	secondaryPositions: Position[];
-+	/**
-+	 * Is the primary cursor in the editable range?
-+	 */
-+	isInEditableRange: boolean;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface IViewCursorSelectionChangedEvent {
-+	/**
-+	 * The primary selection.
-+	 */
-+	selection: Selection;
-+	/**
-+	 * The secondary selections.
-+	 */
-+	secondarySelections: Selection[];
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface IViewRevealRangeEvent {
-+	/**
-+	 * Range to be reavealed.
-+	 */
-+	range: Range;
-+
-+	verticalType: VerticalRevealType;
-+	/**
-+	 * If true: there should be a horizontal & vertical revealing
-+	 * If false: there should be just a vertical revealing
-+	 */
-+	revealHorizontal: boolean;
-+	/**
-+	 * If true: cursor is revealed if outside viewport
-+	 */
-+	revealCursor: boolean;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface IViewScrollRequestEvent {
-+	deltaLines: number;
-+	revealCursor: boolean;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface IViewWhitespaceViewportData {
-+	id:number;
-+	afterLineNumber:number;
-+	verticalOffset:number;
-+	height:number;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export class Viewport {
-+	_viewportBrand: void;
-+
-+	top: number;
-+	left: number;
-+	width: number;
-+	height: number;
-+
-+	constructor(top:number, left:number, width:number, height:number) {
-+		this.top = top|0;
-+		this.left = left|0;
-+		this.width = width|0;
-+		this.height = height|0;
-+	}
-+}
-+
-+/**
-+ * Description of an action contribution
-+ */
-+export interface IActionDescriptor {
-+	/**
-+	 * An unique identifier of the contributed action.
-+	 */
-+	id: string;
-+	/**
-+	 * A label of the action that will be presented to the user.
-+	 */
-+	label: string;
-+	/**
-+	 * An array of keybindings for the action.
-+	 */
-+	keybindings?: number[];
-+	/**
-+	 * Control if the action should show up in the context menu and where.
-+	 * The context menu of the editor has these default:
-+	 *   navigation - The navigation group comes first in all cases.
-+	 *   1_modification - This group comes next and contains commands that modify your code.
-+	 *   9_cutcopypaste - The last default group with the basic editing commands.
-+	 * You can also create your own group.
-+	 * Defaults to null (don't show in context menu).
-+	 */
-+	contextMenuGroupId?: string;
-+	/**
-+	 * Control the order in the context menu group.
-+	 */
-+	contextMenuOrder?: number;
-+	/**
-+	 * The keybinding rule.
-+	 */
-+	keybindingContext?: string;
-+	/**
-+	 * Method that will be executed when the action is triggered.
-+	 * @param editor The editor instance is passed in as a convinience
-+	 */
-+	run:(editor:ICommonCodeEditor)=>TPromise<void>;
-+}
-+
-+/**
-+ * Data associated with an editor action contribution
-+ * @internal
-+ */
-+export interface IEditorActionDescriptorData {
-+	id:string;
-+	label:string;
-+	alias?:string;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export type IEditorActionContributionCtor = IConstructorSignature2<IEditorActionDescriptorData, ICommonCodeEditor, IEditorContribution>;
-+
-+/**
-+ * @internal
-+ */
-+export type ICommonEditorContributionCtor = IConstructorSignature1<ICommonCodeEditor, IEditorContribution>;
-+
-+export interface IEditorAction {
-+	id: string;
-+	label: string;
-+	alias: string;
-+	isSupported():boolean;
-+	run(): TPromise<void>;
-+}
-+
-+/**
-+ * An editor.
-+ */
-+export interface IEditor {
-+	/**
-+	 * @deprecated. Please use `onDidChangeModelContent` instead.
-+	 * An event emitted when the content of the current model has changed.
-+	 * @internal
-+	 */
-+	onDidChangeModelRawContent(listener: (e:IModelContentChangedEvent)=>void): IDisposable;
-+	/**
-+	 * An event emitted when the content of the current model has changed.
-+	 */
-+	onDidChangeModelContent(listener: (e:IModelContentChangedEvent2)=>void): IDisposable;
-+	/**
-+	 * An event emitted when the language of the current model has changed.
-+	 */
-+	onDidChangeModelMode(listener: (e:IModelModeChangedEvent)=>void): IDisposable;
-+	/**
-+	 * An event emitted when the options of the current model has changed.
-+	 */
-+	onDidChangeModelOptions(listener: (e:IModelOptionsChangedEvent)=>void): IDisposable;
-+	/**
-+	 * An event emitted when the configuration of the editor has changed. (e.g. `editor.updateOptions()`)
-+	 */
-+	onDidChangeConfiguration(listener: (e:IConfigurationChangedEvent)=>void): IDisposable;
-+	/**
-+	 * An event emitted when the cursor position has changed.
-+	 */
-+	onDidChangeCursorPosition(listener: (e:ICursorPositionChangedEvent)=>void): IDisposable;
-+	/**
-+	 * An event emitted when the cursor selection has changed.
-+	 */
-+	onDidChangeCursorSelection(listener: (e:ICursorSelectionChangedEvent)=>void): IDisposable;
-+	/**
-+	 * An event emitted when the editor has been disposed.
-+	 */
-+	onDidDispose(listener: ()=>void): IDisposable;
-+
-+	/**
-+	 * Dispose the editor.
-+	 */
-+	dispose(): void;
-+
-+	/**
-+	 * Get a unique id for this editor instance.
-+	 */
-+	getId(): string;
-+
-+	/**
-+	 * Get the editor type. Please see `EditorType`.
-+	 * This is to avoid an instanceof check
-+	 */
-+	getEditorType(): string;
-+
-+	/**
-+	 * Destroy the editor.
-+	 * @internal
-+	 */
-+	destroy(): void;
-+
-+	/**
-+	 * Update the editor's options after the editor has been created.
-+	 */
-+	updateOptions(newOptions: IEditorOptions): void;
-+
-+	/**
-+	 * Indicates that the editor becomes visible.
-+	 * @internal
-+	 */
-+	onVisible(): void;
-+
-+	/**
-+	 * Indicates that the editor becomes hidden.
-+	 * @internal
-+	 */
-+	onHide(): void;
-+
-+	/**
-+	 * Instructs the editor to remeasure its container. This method should
-+	 * be called when the container of the editor gets resized.
-+	 */
-+	layout(dimension?:IDimension): void;
-+
-+	/**
-+	 * Brings browser focus to the editor text
-+	 */
-+	focus(): void;
-+
-+	/**
-+	 * Returns true if this editor has keyboard focus (e.g. cursor is blinking).
-+	 */
-+	isFocused(): boolean;
-+
-+	/**
-+	 * Add a new action to this editor.
-+	 */
-+	addAction(descriptor:IActionDescriptor): void;
-+
-+	/**
-+	 * Returns all actions associated with this editor.
-+	 */
-+	getActions(): IEditorAction[];
-+
-+	/**
-+	 * Returns all actions associated with this editor.
-+	 */
-+	getSupportedActions(): IEditorAction[];
-+
-+	/**
-+	 * Saves current view state of the editor in a serializable object.
-+	 */
-+	saveViewState(): IEditorViewState;
-+
-+	/**
-+	 * Restores the view state of the editor from a serializable object generated by `saveViewState`.
-+	 */
-+	restoreViewState(state: IEditorViewState): void;
-+
-+	/**
-+	 * Given a position, returns a column number that takes tab-widths into account.
-+	 */
-+	getVisibleColumnFromPosition(position:IPosition): number;
-+
-+	/**
-+	 * Returns the primary position of the cursor.
-+	 */
-+	getPosition(): Position;
-+
-+	/**
-+	 * Set the primary position of the cursor. This will remove any secondary cursors.
-+	 * @param position New primary cursor's position
-+	 */
-+	setPosition(position:IPosition): void;
-+
-+	/**
-+	 * Scroll vertically as necessary and reveal a line.
-+	 */
-+	revealLine(lineNumber: number): void;
-+
-+	/**
-+	 * Scroll vertically as necessary and reveal a line centered vertically.
-+	 */
-+	revealLineInCenter(lineNumber: number): void;
-+
-+	/**
-+	 * Scroll vertically as necessary and reveal a line centered vertically only if it lies outside the viewport.
-+	 */
-+	revealLineInCenterIfOutsideViewport(lineNumber: number): void;
-+
-+	/**
-+	 * Scroll vertically or horizontally as necessary and reveal a position.
-+	 */
-+	revealPosition(position: IPosition): void;
-+
-+	/**
-+	 * Scroll vertically or horizontally as necessary and reveal a position centered vertically.
-+	 */
-+	revealPositionInCenter(position: IPosition): void;
-+
-+	/**
-+	 * Scroll vertically or horizontally as necessary and reveal a position centered vertically only if it lies outside the viewport.
-+	 */
-+	revealPositionInCenterIfOutsideViewport(position: IPosition): void;
-+
-+	/**
-+	 * Returns the primary selection of the editor.
-+	 */
-+	getSelection(): Selection;
-+
-+	/**
-+	 * Returns all the selections of the editor.
-+	 */
-+	getSelections(): Selection[];
-+
-+	/**
-+	 * Set the primary selection of the editor. This will remove any secondary cursors.
-+	 * @param selection The new selection
-+	 */
-+	setSelection(selection:IRange): void;
-+	/**
-+	 * Set the primary selection of the editor. This will remove any secondary cursors.
-+	 * @param selection The new selection
-+	 */
-+	setSelection(selection:Range): void;
-+	/**
-+	 * Set the primary selection of the editor. This will remove any secondary cursors.
-+	 * @param selection The new selection
-+	 */
-+	setSelection(selection:ISelection): void;
-+	/**
-+	 * Set the primary selection of the editor. This will remove any secondary cursors.
-+	 * @param selection The new selection
-+	 */
-+	setSelection(selection:Selection): void;
-+
-+	/**
-+	 * Set the selections for all the cursors of the editor.
-+	 * Cursors will be removed or added, as necessary.
-+	 */
-+	setSelections(selections:ISelection[]): void;
-+
-+	/**
-+	 * Scroll vertically as necessary and reveal lines.
-+	 */
-+	revealLines(startLineNumber: number, endLineNumber: number): void;
-+
-+	/**
-+	 * Scroll vertically as necessary and reveal lines centered vertically.
-+	 */
-+	revealLinesInCenter(lineNumber: number, endLineNumber: number): void;
-+
-+	/**
-+	 * Scroll vertically as necessary and reveal lines centered vertically only if it lies outside the viewport.
-+	 */
-+	revealLinesInCenterIfOutsideViewport(lineNumber: number, endLineNumber: number): void;
-+
-+	/**
-+	 * Scroll vertically or horizontally as necessary and reveal a range.
-+	 */
-+	revealRange(range: IRange): void;
-+
-+	/**
-+	 * Scroll vertically or horizontally as necessary and reveal a range centered vertically.
-+	 */
-+	revealRangeInCenter(range: IRange): void;
-+
-+	/**
-+	 * Scroll vertically or horizontally as necessary and reveal a range centered vertically only if it lies outside the viewport.
-+	 */
-+	revealRangeInCenterIfOutsideViewport(range: IRange): void;
-+
-+
-+	/**
-+	 * Directly trigger a handler or an editor action.
-+	 * @param source The source of the call.
-+	 * @param handlerId The id of the handler or the id of a contribution.
-+	 * @param payload Extra data to be sent to the handler.
-+	 */
-+	trigger(source:string, handlerId:string, payload:any): void;
-+
-+	/**
-+	 * Gets the current model attached to this editor.
-+	 */
-+	getModel(): IEditorModel;
-+
-+	/**
-+	 * Sets the current model attached to this editor.
-+	 * If the previous model was created by the editor via the value key in the options
-+	 * literal object, it will be destroyed. Otherwise, if the previous model was set
-+	 * via setModel, or the model key in the options literal object, the previous model
-+	 * will not be destroyed.
-+	 * It is safe to call setModel(null) to simply detach the current model from the editor.
-+	 */
-+	setModel(model:IEditorModel): void;
-+
-+	/**
-+	 * Change the decorations. All decorations added through this changeAccessor
-+	 * will get the ownerId of the editor (meaning they will not show up in other
-+	 * editors).
-+	 * @see IModel.changeDecorations
-+	 * @internal
-+	 */
-+	changeDecorations(callback: (changeAccessor:IModelDecorationsChangeAccessor)=>any): any;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface ICodeEditorState {
-+	validate(editor:ICommonCodeEditor): boolean;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export enum CodeEditorStateFlag {
-+	Value,
-+	Selection,
-+	Position,
-+	Scroll
-+}
-+
-+/**
-+ * An editor contribution that gets created every time a new editor gets created and gets disposed when the editor gets disposed.
-+ */
-+export interface IEditorContribution {
-+	/**
-+	 * Get a unique identifier for this contribution.
-+	 */
-+	getId(): string;
-+	/**
-+	 * Dispose this contribution.
-+	 */
-+	dispose(): void;
-+	/**
-+	 * Store view state.
-+	 */
-+	saveViewState?(): any;
-+	/**
-+	 * Restore view state.
-+	 */
-+	restoreViewState?(state: any): void;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface IThemeDecorationRenderOptions {
-+	backgroundColor?: string;
-+
-+	outline?: string;
-+	outlineColor?: string;
-+	outlineStyle?: string;
-+	outlineWidth?: string;
-+
-+	border?:string;
-+	borderColor?: string;
-+	borderRadius?: string;
-+	borderSpacing?: string;
-+	borderStyle?: string;
-+	borderWidth?: string;
-+
-+	textDecoration?: string;
-+	cursor?: string;
-+	color?: string;
-+	letterSpacing?: string;
-+
-+	gutterIconPath?: string | URI;
-+	gutterIconSize?: string;
-+
-+	overviewRulerColor?: string;
-+
-+	before?: IContentDecorationRenderOptions;
-+	after?: IContentDecorationRenderOptions;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface IContentDecorationRenderOptions {
-+	contentText?: string;
-+	contentIconPath?: string | URI;
-+
-+	border?: string;
-+	textDecoration?: string;
-+	color?: string;
-+	backgroundColor?: string;
-+
-+	margin?: string;
-+	width?: string;
-+	height?: string;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface IDecorationRenderOptions extends IThemeDecorationRenderOptions {
-+	isWholeLine?: boolean;
-+	overviewRulerLane?: OverviewRulerLane;
-+
-+	light?: IThemeDecorationRenderOptions;
-+	dark?: IThemeDecorationRenderOptions;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface IThemeDecorationInstanceRenderOptions {
-+	before?: IContentDecorationRenderOptions;
-+	after?: IContentDecorationRenderOptions;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface IDecorationInstanceRenderOptions extends IThemeDecorationInstanceRenderOptions {
-+	light?: IThemeDecorationInstanceRenderOptions;
-+	dark?: IThemeDecorationInstanceRenderOptions;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface IDecorationOptions {
-+	range: IRange;
-+	hoverMessage?: MarkedString | MarkedString[];
-+	renderOptions? : IDecorationInstanceRenderOptions;
-+}
-+
-+
-+export interface ICommonCodeEditor extends IEditor {
-+	/**
-+	 * An event emitted when the model of this editor has changed (e.g. `editor.setModel()`).
-+	 */
-+	onDidChangeModel(listener: (e:IModelChangedEvent)=>void): IDisposable;
-+	/**
-+	 * An event emitted when the decorations of the current model have changed.
-+	 */
-+	onDidChangeModelDecorations(listener: (e:IModelDecorationsChangedEvent)=>void): IDisposable;
-+	/**
-+	 * An event emitted when the text inside this editor gained focus (i.e. cursor blinking).
-+	 */
-+	onDidFocusEditorText(listener: ()=>void): IDisposable;
-+	/**
-+	 * An event emitted when the text inside this editor lost focus.
-+	 */
-+	onDidBlurEditorText(listener: ()=>void): IDisposable;
-+	/**
-+	 * An event emitted when the text inside this editor or an editor widget gained focus.
-+	 */
-+	onDidFocusEditor(listener: ()=>void): IDisposable;
-+	/**
-+	 * An event emitted when the text inside this editor or an editor widget lost focus.
-+	 */
-+	onDidBlurEditor(listener: ()=>void): IDisposable;
-+
-+	/**
-+	 * Returns true if this editor or one of its widgets has keyboard focus.
-+	 */
-+	hasWidgetFocus(): boolean;
-+
-+	/**
-+	 * Get a contribution of this editor.
-+	 * @id Unique identifier of the contribution.
-+	 * @return The contribution or null if contribution not found.
-+	 */
-+	getContribution<T extends IEditorContribution>(id: string): T;
-+
-+	/**
-+	 * @internal
-+	 */
-+	captureState(...flags:CodeEditorStateFlag[]): ICodeEditorState;
-+
-+	/**
-+	 * Execute `fn` with the editor's services.
-+	 * @internal
-+	 */
-+	invokeWithinContext<T>(fn:(accessor:ServicesAccessor)=>T): T;
-+
-+	/**
-+	 * Type the getModel() of IEditor.
-+	 */
-+	getModel(): IModel;
-+
-+	/**
-+	 * Returns the current editor's configuration
-+	 */
-+	getConfiguration(): InternalEditorOptions;
-+
-+	/**
-+	 * Returns the 'raw' editor's configuration, as it was applied over the defaults, but without any computed members.
-+	 * @internal
-+	 */
-+	getRawConfiguration(): IEditorOptions;
-+
-+	/**
-+	 * Get value of the current model attached to this editor.
-+	 * @see IModel.getValue
-+	 */
-+	getValue(options?: { preserveBOM: boolean; lineEnding: string; }): string;
-+
-+	/**
-+	 * Set the value of the current model attached to this editor.
-+	 * @see IModel.setValue
-+	 */
-+	setValue(newValue: string): void;
-+
-+	/**
-+	 * Get the scrollWidth of the editor's viewport.
-+	 */
-+	getScrollWidth(): number;
-+	/**
-+	 * Get the scrollLeft of the editor's viewport.
-+	 */
-+	getScrollLeft(): number;
-+
-+	/**
-+	 * Get the scrollHeight of the editor's viewport.
-+	 */
-+	getScrollHeight(): number;
-+	/**
-+	 * Get the scrollTop of the editor's viewport.
-+	 */
-+	getScrollTop(): number;
-+
-+	/**
-+	 * Change the scrollLeft of the editor's viewport.
-+	 */
-+	setScrollLeft(newScrollLeft: number): void;
-+	/**
-+	 * Change the scrollTop of the editor's viewport.
-+	 */
-+	setScrollTop(newScrollTop: number): void;
-+	/**
-+	 * Change the scroll position of the editor's viewport.
-+	 */
-+	setScrollPosition(position: INewScrollPosition): void;
-+
-+	/**
-+	 * Get an action that is a contribution to this editor.
-+	 * @id Unique identifier of the contribution.
-+	 * @return The action or null if action not found.
-+	 */
-+	getAction(id: string): IEditorAction;
-+
-+	/**
-+	 * Execute a command on the editor.
-+	 * @param source The source of the call.
-+	 * @param command The command to execute
-+	 */
-+	executeCommand(source: string, command: ICommand): void;
-+
-+	/**
-+	 * Push an "undo stop" in the undo-redo stack.
-+	 */
-+	pushUndoStop(): boolean;
-+
-+	/**
-+	 * Execute a command on the editor.
-+	 * @param source The source of the call.
-+	 * @param command The command to execute
-+	 */
-+	executeEdits(source: string, edits: IIdentifiedSingleEditOperation[]): boolean;
-+
-+	/**
-+	 * Execute multiple (concommitent) commands on the editor.
-+	 * @param source The source of the call.
-+	 * @param command The commands to execute
-+	 */
-+	executeCommands(source: string, commands: ICommand[]): void;
-+
-+	/**
-+	 * Get all the decorations on a line (filtering out decorations from other editors).
-+	 */
-+	getLineDecorations(lineNumber: number): IModelDecoration[];
-+
-+	/**
-+	 * All decorations added through this call will get the ownerId of this editor.
-+	 * @see IModel.deltaDecorations
-+	 */
-+	deltaDecorations(oldDecorations: string[], newDecorations: IModelDeltaDecoration[]): string[];
-+
-+	/**
-+	 * @internal
-+	 */
-+	setDecorations(decorationTypeKey: string, ranges: IDecorationOptions[]): void;
-+
-+	/**
-+	 * @internal
-+	 */
-+	removeDecorations(decorationTypeKey:string): void;
-+
-+	/**
-+	 * Get the layout info for the editor.
-+	 */
-+	getLayoutInfo(): EditorLayoutInfo;
-+
-+	/**
-+	 * This listener is notified when a keypress produces a visible character.
-+	 * The callback should not do operations on the view, as the view might not be updated to reflect previous typed characters.
-+	 * @param character Character to listen to.
-+	 * @param callback Function to call when `character` is typed.
-+	 * @internal
-+	 */
-+	addTypingListener(character: string, callback: () => void): IDisposable;
-+
-+>>>>>>> .their
- }
- 
- /**
-removed in local
-  base   100644 8b131f667fb5b431cb71b18d946dd4d25dc3fdfc src/vs/editor/contrib/contextmenu/browser/contextmenu.ts
-  their  100644 1e2d9321168b3c5962b5d90c040f785715acec4c src/vs/editor/contrib/contextmenu/browser/contextmenu.ts
-changed in both
-  base   100644 755ddd32afd147ce4a7745e4bde8a9853efc4c9e src/vs/monaco.d.ts
-  our    100644 76dcf491ff9c1973ad61bf5d423713bb1a3b4e44 src/vs/monaco.d.ts
-  their  100644 043b2ee57b52194a9ef6e615613b1ae6c2946a42 src/vs/monaco.d.ts
-@@ -810,6 +810,7 @@
- 	}
- }
- 
-+<<<<<<< .our
- declare namespace monaco.editor {
- 
- 
-@@ -4119,6 +4120,3028 @@
- 	//compatibility:
- 	export type IReadOnlyModel = ITextModel;
- 	export type IModel = ITextModel;
-+=======
-+declare module monaco.editor {
-+
-+
-+    /**
-+     * Create a new editor under `domElement`.
-+     * `domElement` should be empty (not contain other dom nodes).
-+     * The editor will read the size of `domElement`.
-+     */
-+    export function create(domElement: HTMLElement, options?: IEditorConstructionOptions, override?: IEditorOverrideServices): IStandaloneCodeEditor;
-+
-+    /**
-+     * Create a new diff editor under `domElement`.
-+     * `domElement` should be empty (not contain other dom nodes).
-+     * The editor will read the size of `domElement`.
-+     */
-+    export function createDiffEditor(domElement: HTMLElement, options?: IDiffEditorConstructionOptions, override?: IEditorOverrideServices): IStandaloneDiffEditor;
-+
-+    export interface IDiffNavigator {
-+        canNavigate(): boolean;
-+        next(): void;
-+        previous(): void;
-+        dispose(): void;
-+    }
-+
-+    export interface IDiffNavigatorOptions {
-+        followsCaret?: boolean;
-+        ignoreCharChanges?: boolean;
-+        alwaysRevealFirst?: boolean;
-+    }
-+
-+    export function createDiffNavigator(diffEditor: IStandaloneDiffEditor, opts?: IDiffNavigatorOptions): IDiffNavigator;
-+
-+    /**
-+     * Create a new editor model.
-+     * You can specify the language that should be set for this model or let the language be inferred from the `uri`.
-+     */
-+    export function createModel(value: string, language?: string, uri?: Uri): IModel;
-+
-+    /**
-+     * Change the language for a model.
-+     */
-+    export function setModelLanguage(model: IModel, language: string): void;
-+
-+    /**
-+     * Set the markers for a model.
-+     */
-+    export function setModelMarkers(model: IModel, owner: string, markers: IMarkerData[]): void;
-+
-+    /**
-+     * Get the model that has `uri` if it exists.
-+     */
-+    export function getModel(uri: Uri): IModel;
-+
-+    /**
-+     * Get all the created models.
-+     */
-+    export function getModels(): IModel[];
-+
-+    /**
-+     * Emitted when a model is created.
-+     */
-+    export function onDidCreateModel(listener: (model: IModel) => void): IDisposable;
-+
-+    /**
-+     * Emitted right before a model is disposed.
-+     */
-+    export function onWillDisposeModel(listener: (model: IModel) => void): IDisposable;
-+
-+    /**
-+     * Emitted when a different language is set to a model.
-+     */
-+    export function onDidChangeModelLanguage(listener: (e: {
-+        model: IModel;
-+        oldLanguage: string;
-+    }) => void): IDisposable;
-+
-+    /**
-+     * Create a new web worker that has model syncing capabilities built in.
-+     * Specify an AMD module to load that will `create` an object that will be proxied.
-+     */
-+    export function createWebWorker<T>(opts: IWebWorkerOptions): MonacoWebWorker<T>;
-+
-+    /**
-+     * Colorize the contents of `domNode` using attribute `data-lang`.
-+     */
-+    export function colorizeElement(domNode: HTMLElement, options: IColorizerElementOptions): Promise<void>;
-+
-+    /**
-+     * Colorize `text` using language `languageId`.
-+     */
-+    export function colorize(text: string, languageId: string, options: IColorizerOptions): Promise<string>;
-+
-+    /**
-+     * Colorize a line in a model.
-+     */
-+    export function colorizeModelLine(model: IModel, lineNumber: number, tabSize?: number): string;
-+
-+    /**
-+     * A web worker that can provide a proxy to an arbitrary file.
-+     */
-+    export interface MonacoWebWorker<T> {
-+        /**
-+         * Terminate the web worker, thus invalidating the returned proxy.
-+         */
-+        dispose(): void;
-+        /**
-+         * Get a proxy to the arbitrary loaded code.
-+         */
-+        getProxy(): Promise<T>;
-+        /**
-+         * Synchronize (send) the models at `resources` to the web worker,
-+         * making them available in the monaco.worker.getMirrorModels().
-+         */
-+        withSyncedResources(resources: Uri[]): Promise<T>;
-+    }
-+
-+    export interface IWebWorkerOptions {
-+        /**
-+         * The AMD moduleId to load.
-+         * It should export a function `create` that should return the exported proxy.
-+         */
-+        moduleId: string;
-+        /**
-+         * The data to send over when calling create on the module.
-+         */
-+        createData?: any;
-+        /**
-+         * A label to be used to identify the web worker for debugging purposes.
-+         */
-+        label?: string;
-+    }
-+
-+    /**
-+     * The options to create an editor.
-+     */
-+    export interface IEditorConstructionOptions extends ICodeEditorWidgetCreationOptions {
-+        /**
-+         * The initial value of the auto created model in the editor.
-+         * To not create automatically a model, use `model: null`.
-+         */
-+        value?: string;
-+        /**
-+         * The initial language of the auto created model in the editor.
-+         * To not create automatically a model, use `model: null`.
-+         */
-+        language?: string;
-+    }
-+
-+    /**
-+     * The options to create a diff editor.
-+     */
-+    export interface IDiffEditorConstructionOptions extends IDiffEditorOptions {
-+    }
-+
-+    export interface IStandaloneCodeEditor extends ICodeEditor {
-+        addCommand(keybinding: number, handler: ICommandHandler, context: string): string;
-+        createContextKey<T>(key: string, defaultValue: T): IContextKey<T>;
-+        addAction(descriptor: IActionDescriptor): void;
-+    }
-+
-+    export interface IStandaloneDiffEditor extends IDiffEditor {
-+        addCommand(keybinding: number, handler: ICommandHandler, context: string): string;
-+        createContextKey<T>(key: string, defaultValue: T): IContextKey<T>;
-+        addAction(descriptor: IActionDescriptor): void;
-+    }
-+    export interface ICommandHandler {
-+        (...args: any[]): void;
-+    }
-+
-+    export interface IContextKey<T> {
-+        set(value: T): void;
-+        reset(): void;
-+        get(): T;
-+    }
-+
-+    export interface IEditorOverrideServices {
-+    }
-+
-+    /**
-+     * A structure defining a problem/warning/etc.
-+     */
-+    export interface IMarkerData {
-+        code?: string;
-+        severity: Severity;
-+        message: string;
-+        source?: string;
-+        startLineNumber: number;
-+        startColumn: number;
-+        endLineNumber: number;
-+        endColumn: number;
-+    }
-+
-+    export interface IColorizerOptions {
-+        tabSize?: number;
-+    }
-+
-+    export interface IColorizerElementOptions extends IColorizerOptions {
-+        theme?: string;
-+        mimeType?: string;
-+    }
-+
-+    export enum ScrollbarVisibility {
-+        Auto = 1,
-+        Hidden = 2,
-+        Visible = 3,
-+    }
-+
-+    export interface IAction extends IDisposable {
-+        id: string;
-+        label: string;
-+        tooltip: string;
-+        class: string;
-+        enabled: boolean;
-+        checked: boolean;
-+        run(event?: any): Promise<any>;
-+    }
-+
-+    /**
-+     * Configuration options for editor scrollbars
-+     */
-+    export interface IEditorScrollbarOptions {
-+        /**
-+         * The size of arrows (if displayed).
-+         * Defaults to 11.
-+         */
-+        arrowSize?: number;
-+        /**
-+         * Render vertical scrollbar.
-+         * Accepted values: 'auto', 'visible', 'hidden'.
-+         * Defaults to 'auto'.
-+         */
-+        vertical?: string;
-+        /**
-+         * Render horizontal scrollbar.
-+         * Accepted values: 'auto', 'visible', 'hidden'.
-+         * Defaults to 'auto'.
-+         */
-+        horizontal?: string;
-+        /**
-+         * Cast horizontal and vertical shadows when the content is scrolled.
-+         * Defaults to true.
-+         */
-+        useShadows?: boolean;
-+        /**
-+         * Render arrows at the top and bottom of the vertical scrollbar.
-+         * Defaults to false.
-+         */
-+        verticalHasArrows?: boolean;
-+        /**
-+         * Render arrows at the left and right of the horizontal scrollbar.
-+         * Defaults to false.
-+         */
-+        horizontalHasArrows?: boolean;
-+        /**
-+         * Listen to mouse wheel events and react to them by scrolling.
-+         * Defaults to true.
-+         */
-+        handleMouseWheel?: boolean;
-+        /**
-+         * Height in pixels for the horizontal scrollbar.
-+         * Defaults to 10 (px).
-+         */
-+        horizontalScrollbarSize?: number;
-+        /**
-+         * Width in pixels for the vertical scrollbar.
-+         * Defaults to 10 (px).
-+         */
-+        verticalScrollbarSize?: number;
-+        /**
-+         * Width in pixels for the vertical slider.
-+         * Defaults to `verticalScrollbarSize`.
-+         */
-+        verticalSliderSize?: number;
-+        /**
-+         * Height in pixels for the horizontal slider.
-+         * Defaults to `horizontalScrollbarSize`.
-+         */
-+        horizontalSliderSize?: number;
-+    }
-+
-+    /**
-+     * Describes how to indent wrapped lines.
-+     */
-+    export enum WrappingIndent {
-+        /**
-+         * No indentation => wrapped lines begin at column 1.
-+         */
-+        None = 0,
-+        /**
-+         * Same => wrapped lines get the same indentation as the parent.
-+         */
-+        Same = 1,
-+        /**
-+         * Indent => wrapped lines get +1 indentation as the parent.
-+         */
-+        Indent = 2,
-+    }
-+
-+    export type LineNumbersOption = 'on' | 'off' | 'relative' | ((lineNumber: number) => string);
-+
-+    /**
-+     * Configuration options for the editor.
-+     */
-+    export interface IEditorOptions {
-+        /**
-+         * Enable experimental screen reader support.
-+         * Defaults to `true`.
-+         */
-+        experimentalScreenReader?: boolean;
-+        /**
-+         * The aria label for the editor's textarea (when it is focused).
-+         */
-+        ariaLabel?: string;
-+        /**
-+         * Render vertical lines at the specified columns.
-+         * Defaults to empty array.
-+         */
-+        rulers?: number[];
-+        /**
-+         * A string containing the word separators used when doing word navigation.
-+         * Defaults to `~!@#$%^&*()-=+[{]}\\|;:\'",.<>/?
-+         */
-+        wordSeparators?: string;
-+        /**
-+         * Enable Linux primary clipboard.
-+         * Defaults to true.
-+         */
-+        selectionClipboard?: boolean;
-+        /**
-+         * Control the rendering of line numbers.
-+         * If it is a function, it will be invoked when rendering a line number and the return value will be rendered.
-+         * Otherwise, if it is a truey, line numbers will be rendered normally (equivalent of using an identity function).
-+         * Otherwise, line numbers will not be rendered.
-+         * Defaults to true.
-+         */
-+        lineNumbers?: LineNumbersOption;
-+        /**
-+         * Should the corresponding line be selected when clicking on the line number?
-+         * Defaults to true.
-+         */
-+        selectOnLineNumbers?: boolean;
-+        /**
-+         * Control the width of line numbers, by reserving horizontal space for rendering at least an amount of digits.
-+         * Defaults to 5.
-+         */
-+        lineNumbersMinChars?: number;
-+        /**
-+         * Enable the rendering of the glyph margin.
-+         * Defaults to false.
-+         */
-+        glyphMargin?: boolean;
-+        /**
-+         * The width reserved for line decorations (in px).
-+         * Line decorations are placed between line numbers and the editor content.
-+         * Defaults to 10.
-+         */
-+        lineDecorationsWidth?: number;
-+        /**
-+         * When revealing the cursor, a virtual padding (px) is added to the cursor, turning it into a rectangle.
-+         * This virtual padding ensures that the cursor gets revealed before hitting the edge of the viewport.
-+         * Defaults to 30 (px).
-+         */
-+        revealHorizontalRightPadding?: number;
-+        /**
-+         * Render the editor selection with rounded borders.
-+         * Defaults to true.
-+         */
-+        roundedSelection?: boolean;
-+        /**
-+         * Theme to be used for rendering. Consists of two parts, the UI theme and the syntax theme,
-+         * separated by a space.
-+         * The current available UI themes are: 'vs' (default), 'vs-dark', 'hc-black'
-+         * The syntax themes are contributed. The default is 'default-theme'
-+         */
-+        theme?: string;
-+        /**
-+         * Should the editor be read only.
-+         * Defaults to false.
-+         */
-+        readOnly?: boolean;
-+        /**
-+         * Control the behavior and rendering of the scrollbars.
-+         */
-+        scrollbar?: IEditorScrollbarOptions;
-+        /**
-+         * The number of vertical lanes the overview ruler should render.
-+         * Defaults to 2.
-+         */
-+        overviewRulerLanes?: number;
-+        /**
-+         * Control the cursor animation style, possible values are 'blink', 'smooth', 'phase', 'expand' and 'solid'.
-+         * Defaults to 'blink'.
-+         */
-+        cursorBlinking?: string;
-+        /**
-+         * Zoom the font in the editor when using the mouse wheel in combination with holding Ctrl.
-+         * Defaults to false.
-+         */
-+        mouseWheelZoom?: boolean;
-+        /**
-+         * Control the cursor style, either 'block' or 'line'.
-+         * Defaults to 'line'.
-+         */
-+        cursorStyle?: string;
-+        /**
-+         * Enable font ligatures.
-+         * Defaults to false.
-+         */
-+        fontLigatures?: boolean;
-+        /**
-+         * Disable the use of `translate3d`.
-+         * Defaults to false.
-+         */
-+        disableTranslate3d?: boolean;
-+        /**
-+         * Should the cursor be hidden in the overview ruler.
-+         * Defaults to false.
-+         */
-+        hideCursorInOverviewRuler?: boolean;
-+        /**
-+         * Enable that scrolling can go one screen size after the last line.
-+         * Defaults to true.
-+         */
-+        scrollBeyondLastLine?: boolean;
-+        /**
-+         * Enable that the editor will install an interval to check if its container dom node size has changed.
-+         * Enabling this might have a severe performance impact.
-+         * Defaults to false.
-+         */
-+        automaticLayout?: boolean;
-+        /**
-+         * Control the wrapping strategy of the editor.
-+         * Using -1 means no wrapping whatsoever.
-+         * Using 0 means viewport width wrapping (ajusts with the resizing of the editor).
-+         * Using a positive number means wrapping after a fixed number of characters.
-+         * Defaults to 300.
-+         */
-+        wrappingColumn?: number;
-+        /**
-+         * Control the alternate style of viewport wrapping.
-+         * When set to true viewport wrapping is used only when the window width is less than the number of columns specified in the wrappingColumn property. Has no effect if wrappingColumn is not a positive number.
-+         * Defaults to false.
-+         */
-+        wordWrap?: boolean;
-+        /**
-+         * Control indentation of wrapped lines. Can be: 'none', 'same' or 'indent'.
-+         * Defaults to 'none'.
-+         */
-+        wrappingIndent?: string;
-+        /**
-+         * Configure word wrapping characters. A break will be introduced before these characters.
-+         * Defaults to '{([+'.
-+         */
-+        wordWrapBreakBeforeCharacters?: string;
-+        /**
-+         * Configure word wrapping characters. A break will be introduced after these characters.
-+         * Defaults to ' \t})]?|&,;'.
-+         */
-+        wordWrapBreakAfterCharacters?: string;
-+        /**
-+         * Configure word wrapping characters. A break will be introduced after these characters only if no `wordWrapBreakBeforeCharacters` or `wordWrapBreakAfterCharacters` were found.
-+         * Defaults to '.'.
-+         */
-+        wordWrapBreakObtrusiveCharacters?: string;
-+        /**
-+         * Performance guard: Stop rendering a line after x characters.
-+         * Defaults to 10000 if wrappingColumn is -1. Defaults to -1 if wrappingColumn is >= 0.
-+         * Use -1 to never stop rendering
-+         */
-+        stopRenderingLineAfter?: number;
-+        /**
-+         * Enable hover.
-+         * Defaults to true.
-+         */
-+        hover?: boolean;
-+        /**
-+         * Enable custom contextmenu.
-+         * Defaults to true.
-+         */
-+        contextmenu?: boolean;
-+        /**
-+         * A multiplier to be used on the `deltaX` and `deltaY` of mouse wheel scroll events.
-+         * Defaults to 1.
-+         */
-+        mouseWheelScrollSensitivity?: number;
-+        /**
-+         * Enable quick suggestions (shadow suggestions)
-+         * Defaults to true.
-+         */
-+        quickSuggestions?: boolean;
-+        /**
-+         * Quick suggestions show delay (in ms)
-+         * Defaults to 500 (ms)
-+         */
-+        quickSuggestionsDelay?: number;
-+        /**
-+         * Enables parameter hints
-+         */
-+        parameterHints?: boolean;
-+        /**
-+         * Render icons in suggestions box.
-+         * Defaults to true.
-+         */
-+        iconsInSuggestions?: boolean;
-+        /**
-+         * Enable auto closing brackets.
-+         * Defaults to true.
-+         */
-+        autoClosingBrackets?: boolean;
-+        /**
-+         * Enable format on type.
-+         * Defaults to false.
-+         */
-+        formatOnType?: boolean;
-+        /**
-+         * Enable the suggestion box to pop-up on trigger characters.
-+         * Defaults to true.
-+         */
-+        suggestOnTriggerCharacters?: boolean;
-+        /**
-+         * Accept suggestions on ENTER.
-+         * Defaults to true.
-+         */
-+        acceptSuggestionOnEnter?: boolean;
-+        /**
-+         * Enable snippet suggestions. Default to 'true'.
-+         */
-+        snippetSuggestions?: 'top' | 'bottom' | 'inline' | 'none';
-+        /**
-+         * Enable tab completion. Defaults to 'false'
-+         */
-+        tabCompletion?: boolean;
-+        /**
-+         * Enable word based suggestions. Defaults to 'true'
-+         */
-+        wordBasedSuggestions?: boolean;
-+        /**
-+         * Enable selection highlight.
-+         * Defaults to true.
-+         */
-+        selectionHighlight?: boolean;
-+        /**
-+         * Show code lens
-+         * Defaults to true.
-+         */
-+        codeLens?: boolean;
-+        /**
-+         * Enable code folding
-+         * Defaults to true.
-+         */
-+        folding?: boolean;
-+        /**
-+         * Enable rendering of whitespace.
-+         * Defaults to none.
-+         */
-+        renderWhitespace?: 'none' | 'boundary' | 'all';
-+        /**
-+         * Enable rendering of control characters.
-+         * Defaults to false.
-+         */
-+        renderControlCharacters?: boolean;
-+        /**
-+         * Enable rendering of indent guides.
-+         * Defaults to false.
-+         */
-+        renderIndentGuides?: boolean;
-+        /**
-+         * Enable rendering of current line highlight.
-+         * Defaults to true.
-+         */
-+        renderLineHighlight?: boolean;
-+        /**
-+         * Inserting and deleting whitespace follows tab stops.
-+         */
-+        useTabStops?: boolean;
-+        /**
-+         * The font family
-+         */
-+        fontFamily?: string;
-+        /**
-+         * The font weight
-+         */
-+        fontWeight?: 'normal' | 'bold' | 'bolder' | 'lighter' | 'initial' | 'inherit' | '100' | '200' | '300' | '400' | '500' | '600' | '700' | '800' | '900';
-+        /**
-+         * The font size
-+         */
-+        fontSize?: number;
-+        /**
-+         * The line height
-+         */
-+        lineHeight?: number;
-+    }
-+
-+    /**
-+     * Configuration options for the diff editor.
-+     */
-+    export interface IDiffEditorOptions extends IEditorOptions {
-+        /**
-+         * Allow the user to resize the diff editor split view.
-+         * Defaults to true.
-+         */
-+        enableSplitViewResizing?: boolean;
-+        /**
-+         * Render the differences in two side-by-side editors.
-+         * Defaults to true.
-+         */
-+        renderSideBySide?: boolean;
-+        /**
-+         * Compute the diff by ignoring leading/trailing whitespace
-+         * Defaults to true.
-+         */
-+        ignoreTrimWhitespace?: boolean;
-+        /**
-+         * Original model should be editable?
-+         * Defaults to false.
-+         */
-+        originalEditable?: boolean;
-+    }
-+
-+    export class InternalEditorScrollbarOptions {
-+        _internalEditorScrollbarOptionsBrand: void;
-+        arrowSize: number;
-+        vertical: ScrollbarVisibility;
-+        horizontal: ScrollbarVisibility;
-+        useShadows: boolean;
-+        verticalHasArrows: boolean;
-+        horizontalHasArrows: boolean;
-+        handleMouseWheel: boolean;
-+        horizontalScrollbarSize: number;
-+        horizontalSliderSize: number;
-+        verticalScrollbarSize: number;
-+        verticalSliderSize: number;
-+        mouseWheelScrollSensitivity: number;
-+    }
-+
-+    export class EditorWrappingInfo {
-+        _editorWrappingInfoBrand: void;
-+        isViewportWrapping: boolean;
-+        wrappingColumn: number;
-+        wrappingIndent: WrappingIndent;
-+        wordWrapBreakBeforeCharacters: string;
-+        wordWrapBreakAfterCharacters: string;
-+        wordWrapBreakObtrusiveCharacters: string;
-+    }
-+
-+    export class InternalEditorViewOptions {
-+        _internalEditorViewOptionsBrand: void;
-+        theme: string;
-+        canUseTranslate3d: boolean;
-+        experimentalScreenReader: boolean;
-+        rulers: number[];
-+        ariaLabel: string;
-+        renderLineNumbers: boolean;
-+        renderCustomLineNumbers: (lineNumber: number) => string;
-+        renderRelativeLineNumbers: boolean;
-+        selectOnLineNumbers: boolean;
-+        glyphMargin: boolean;
-+        revealHorizontalRightPadding: number;
-+        roundedSelection: boolean;
-+        overviewRulerLanes: number;
-+        cursorBlinking: TextEditorCursorBlinkingStyle;
-+        mouseWheelZoom: boolean;
-+        cursorStyle: TextEditorCursorStyle;
-+        hideCursorInOverviewRuler: boolean;
-+        scrollBeyondLastLine: boolean;
-+        editorClassName: string;
-+        stopRenderingLineAfter: number;
-+        renderWhitespace: 'none' | 'boundary' | 'all';
-+        renderControlCharacters: boolean;
-+        renderIndentGuides: boolean;
-+        renderLineHighlight: boolean;
-+        scrollbar: InternalEditorScrollbarOptions;
-+    }
-+
-+    export interface IViewConfigurationChangedEvent {
-+        theme: boolean;
-+        canUseTranslate3d: boolean;
-+        experimentalScreenReader: boolean;
-+        rulers: boolean;
-+        ariaLabel: boolean;
-+        renderLineNumbers: boolean;
-+        renderCustomLineNumbers: boolean;
-+        renderRelativeLineNumbers: boolean;
-+        selectOnLineNumbers: boolean;
-+        glyphMargin: boolean;
-+        revealHorizontalRightPadding: boolean;
-+        roundedSelection: boolean;
-+        overviewRulerLanes: boolean;
-+        cursorBlinking: boolean;
-+        mouseWheelZoom: boolean;
-+        cursorStyle: boolean;
-+        hideCursorInOverviewRuler: boolean;
-+        scrollBeyondLastLine: boolean;
-+        editorClassName: boolean;
-+        stopRenderingLineAfter: boolean;
-+        renderWhitespace: boolean;
-+        renderControlCharacters: boolean;
-+        renderIndentGuides: boolean;
-+        renderLineHighlight: boolean;
-+        scrollbar: boolean;
-+    }
-+
-+    export class EditorContribOptions {
-+        selectionClipboard: boolean;
-+        hover: boolean;
-+        contextmenu: boolean;
-+        quickSuggestions: boolean;
-+        quickSuggestionsDelay: number;
-+        parameterHints: boolean;
-+        iconsInSuggestions: boolean;
-+        formatOnType: boolean;
-+        suggestOnTriggerCharacters: boolean;
-+        acceptSuggestionOnEnter: boolean;
-+        snippetSuggestions: 'top' | 'bottom' | 'inline' | 'none';
-+        tabCompletion: boolean;
-+        wordBasedSuggestions: boolean;
-+        selectionHighlight: boolean;
-+        codeLens: boolean;
-+        folding: boolean;
-+    }
-+
-+    /**
-+     * Internal configuration options (transformed or computed) for the editor.
-+     */
-+    export class InternalEditorOptions {
-+        _internalEditorOptionsBrand: void;
-+        lineHeight: number;
-+        readOnly: boolean;
-+        wordSeparators: string;
-+        autoClosingBrackets: boolean;
-+        useTabStops: boolean;
-+        tabFocusMode: boolean;
-+        layoutInfo: EditorLayoutInfo;
-+        fontInfo: FontInfo;
-+        viewInfo: InternalEditorViewOptions;
-+        wrappingInfo: EditorWrappingInfo;
-+        contribInfo: EditorContribOptions;
-+    }
-+
-+    /**
-+     * An event describing that the configuration of the editor has changed.
-+     */
-+    export interface IConfigurationChangedEvent {
-+        lineHeight: boolean;
-+        readOnly: boolean;
-+        wordSeparators: boolean;
-+        autoClosingBrackets: boolean;
-+        useTabStops: boolean;
-+        tabFocusMode: boolean;
-+        layoutInfo: boolean;
-+        fontInfo: boolean;
-+        viewInfo: IViewConfigurationChangedEvent;
-+        wrappingInfo: boolean;
-+        contribInfo: boolean;
-+    }
-+
-+    /**
-+     * Vertical Lane in the overview ruler of the editor.
-+     */
-+    export enum OverviewRulerLane {
-+        Left = 1,
-+        Center = 2,
-+        Right = 4,
-+        Full = 7,
-+    }
-+
-+    /**
-+     * Options for rendering a model decoration in the overview ruler.
-+     */
-+    export interface IModelDecorationOverviewRulerOptions {
-+        /**
-+         * CSS color to render in the overview ruler.
-+         * e.g.: rgba(100, 100, 100, 0.5)
-+         */
-+        color: string;
-+        /**
-+         * CSS color to render in the overview ruler.
-+         * e.g.: rgba(100, 100, 100, 0.5)
-+         */
-+        darkColor: string;
-+        /**
-+         * The position in the overview ruler.
-+         */
-+        position: OverviewRulerLane;
-+    }
-+
-+    /**
-+     * Options for a model decoration.
-+     */
-+    export interface IModelDecorationOptions {
-+        /**
-+         * Customize the growing behaviour of the decoration when typing at the edges of the decoration.
-+         * Defaults to TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges
-+         */
-+        stickiness?: TrackedRangeStickiness;
-+        /**
-+         * CSS class name describing the decoration.
-+         */
-+        className?: string;
-+        /**
-+         * Array of MarkedString to render as the decoration message.
-+         */
-+        hoverMessage?: MarkedString | MarkedString[];
-+        /**
-+         * Should the decoration expand to encompass a whole line.
-+         */
-+        isWholeLine?: boolean;
-+        /**
-+         * @deprecated : Use `overviewRuler` instead
-+         */
-+        showInOverviewRuler?: string;
-+        /**
-+         * If set, render this decoration in the overview ruler.
-+         */
-+        overviewRuler?: IModelDecorationOverviewRulerOptions;
-+        /**
-+         * If set, the decoration will be rendered in the glyph margin with this CSS class name.
-+         */
-+        glyphMarginClassName?: string;
-+        /**
-+         * If set, the decoration will be rendered in the lines decorations with this CSS class name.
-+         */
-+        linesDecorationsClassName?: string;
-+        /**
-+         * If set, the decoration will be rendered inline with the text with this CSS class name.
-+         * Please use this only for CSS rules that must impact the text. For example, use `className`
-+         * to have a background color decoration.
-+         */
-+        inlineClassName?: string;
-+        /**
-+         * If set, the decoration will be rendered before the text with this CSS class name.
-+         */
-+        beforeContentClassName?: string;
-+        /**
-+         * If set, the decoration will be rendered after the text with this CSS class name.
-+         */
-+        afterContentClassName?: string;
-+    }
-+
-+    /**
-+     * New model decorations.
-+     */
-+    export interface IModelDeltaDecoration {
-+        /**
-+         * Range that this decoration covers.
-+         */
-+        range: IRange;
-+        /**
-+         * Options associated with this decoration.
-+         */
-+        options: IModelDecorationOptions;
-+    }
-+
-+    /**
-+     * A decoration in the model.
-+     */
-+    export interface IModelDecoration {
-+        /**
-+         * Identifier for a decoration.
-+         */
-+        id: string;
-+        /**
-+         * Identifier for a decoration's owener.
-+         */
-+        ownerId: number;
-+        /**
-+         * Range that this decoration covers.
-+         */
-+        range: Range;
-+        /**
-+         * Options associated with this decoration.
-+         */
-+        options: IModelDecorationOptions;
-+    }
-+
-+    /**
-+     * Word inside a model.
-+     */
-+    export interface IWordAtPosition {
-+        /**
-+         * The word.
-+         */
-+        word: string;
-+        /**
-+         * The column where the word starts.
-+         */
-+        startColumn: number;
-+        /**
-+         * The column where the word ends.
-+         */
-+        endColumn: number;
-+    }
-+
-+    /**
-+     * End of line character preference.
-+     */
-+    export enum EndOfLinePreference {
-+        /**
-+         * Use the end of line character identified in the text buffer.
-+         */
-+        TextDefined = 0,
-+        /**
-+         * Use line feed (\n) as the end of line character.
-+         */
-+        LF = 1,
-+        /**
-+         * Use carriage return and line feed (\r\n) as the end of line character.
-+         */
-+        CRLF = 2,
-+    }
-+
-+    /**
-+     * The default end of line to use when instantiating models.
-+     */
-+    export enum DefaultEndOfLine {
-+        /**
-+         * Use line feed (\n) as the end of line character.
-+         */
-+        LF = 1,
-+        /**
-+         * Use carriage return and line feed (\r\n) as the end of line character.
-+         */
-+        CRLF = 2,
-+    }
-+
-+    /**
-+     * End of line character preference.
-+     */
-+    export enum EndOfLineSequence {
-+        /**
-+         * Use line feed (\n) as the end of line character.
-+         */
-+        LF = 0,
-+        /**
-+         * Use carriage return and line feed (\r\n) as the end of line character.
-+         */
-+        CRLF = 1,
-+    }
-+
-+    /**
-+     * And identifier for a single edit operation.
-+     */
-+    export interface ISingleEditOperationIdentifier {
-+        /**
-+         * Identifier major
-+         */
-+        major: number;
-+        /**
-+         * Identifier minor
-+         */
-+        minor: number;
-+    }
-+
-+    /**
-+     * A builder and helper for edit operations for a command.
-+     */
-+    export interface IEditOperationBuilder {
-+        /**
-+         * Add a new edit operation (a replace operation).
-+         * @param range The range to replace (delete). May be empty to represent a simple insert.
-+         * @param text The text to replace with. May be null to represent a simple delete.
-+         */
-+        addEditOperation(range: Range, text: string): void;
-+        /**
-+         * Track `selection` when applying edit operations.
-+         * A best effort will be made to not grow/expand the selection.
-+         * An empty selection will clamp to a nearby character.
-+         * @param selection The selection to track.
-+         * @param trackPreviousOnEmpty If set, and the selection is empty, indicates whether the selection
-+         *           should clamp to the previous or the next character.
-+         * @return A unique identifer.
-+         */
-+        trackSelection(selection: Selection, trackPreviousOnEmpty?: boolean): string;
-+    }
-+
-+    /**
-+     * A helper for computing cursor state after a command.
-+     */
-+    export interface ICursorStateComputerData {
-+        /**
-+         * Get the inverse edit operations of the added edit operations.
-+         */
-+        getInverseEditOperations(): IIdentifiedSingleEditOperation[];
-+        /**
-+         * Get a previously tracked selection.
-+         * @param id The unique identifier returned by `trackSelection`.
-+         * @return The selection.
-+         */
-+        getTrackedSelection(id: string): Selection;
-+    }
-+
-+    /**
-+     * A command that modifies text / cursor state on a model.
-+     */
-+    export interface ICommand {
-+        /**
-+         * Get the edit operations needed to execute this command.
-+         * @param model The model the command will execute on.
-+         * @param builder A helper to collect the needed edit operations and to track selections.
-+         */
-+        getEditOperations(model: ITokenizedModel, builder: IEditOperationBuilder): void;
-+        /**
-+         * Compute the cursor state after the edit operations were applied.
-+         * @param model The model the commad has executed on.
-+         * @param helper A helper to get inverse edit operations and to get previously tracked selections.
-+         * @return The cursor state after the command executed.
-+         */
-+        computeCursorState(model: ITokenizedModel, helper: ICursorStateComputerData): Selection;
-+    }
-+
-+    /**
-+     * A single edit operation, that acts as a simple replace.
-+     * i.e. Replace text at `range` with `text` in model.
-+     */
-+    export interface ISingleEditOperation {
-+        /**
-+         * The range to replace. This can be empty to emulate a simple insert.
-+         */
-+        range: IRange;
-+        /**
-+         * The text to replace with. This can be null to emulate a simple delete.
-+         */
-+        text: string;
-+        /**
-+         * This indicates that this operation has "insert" semantics.
-+         * i.e. forceMoveMarkers = true => if `range` is collapsed, all markers at the position will be moved.
-+         */
-+        forceMoveMarkers?: boolean;
-+    }
-+
-+    /**
-+     * A single edit operation, that has an identifier.
-+     */
-+    export interface IIdentifiedSingleEditOperation {
-+        /**
-+         * An identifier associated with this single edit operation.
-+         */
-+        identifier: ISingleEditOperationIdentifier;
-+        /**
-+         * The range to replace. This can be empty to emulate a simple insert.
-+         */
-+        range: Range;
-+        /**
-+         * The text to replace with. This can be null to emulate a simple delete.
-+         */
-+        text: string;
-+        /**
-+         * This indicates that this operation has "insert" semantics.
-+         * i.e. forceMoveMarkers = true => if `range` is collapsed, all markers at the position will be moved.
-+         */
-+        forceMoveMarkers: boolean;
-+        /**
-+         * This indicates that this operation is inserting automatic whitespace
-+         * that can be removed on next model edit operation if `config.trimAutoWhitespace` is true.
-+         */
-+        isAutoWhitespaceEdit?: boolean;
-+    }
-+
-+    /**
-+     * A callback that can compute the cursor state after applying a series of edit operations.
-+     */
-+    export interface ICursorStateComputer {
-+        /**
-+         * A callback that can compute the resulting cursors state after some edit operations have been executed.
-+         */
-+        (inverseEditOperations: IIdentifiedSingleEditOperation[]): Selection[];
-+    }
-+
-+    export interface ITextModelResolvedOptions {
-+        tabSize: number;
-+        insertSpaces: boolean;
-+        defaultEOL: DefaultEndOfLine;
-+        trimAutoWhitespace: boolean;
-+    }
-+
-+    export interface ITextModelUpdateOptions {
-+        tabSize?: number;
-+        insertSpaces?: boolean;
-+        trimAutoWhitespace?: boolean;
-+    }
-+
-+    export interface IModelOptionsChangedEvent {
-+        tabSize: boolean;
-+        insertSpaces: boolean;
-+        trimAutoWhitespace: boolean;
-+    }
-+
-+    /**
-+     * A textual read-only model.
-+     */
-+    export interface ITextModel {
-+        getOptions(): ITextModelResolvedOptions;
-+        /**
-+         * Get the current version id of the model.
-+         * Anytime a change happens to the model (even undo/redo),
-+         * the version id is incremented.
-+         */
-+        getVersionId(): number;
-+        /**
-+         * Get the alternative version id of the model.
-+         * This alternative version id is not always incremented,
-+         * it will return the same values in the case of undo-redo.
-+         */
-+        getAlternativeVersionId(): number;
-+        /**
-+         * Replace the entire text buffer value contained in this model.
-+         */
-+        setValue(newValue: string): void;
-+        /**
-+         * Replace the entire text buffer value contained in this model.
-+         */
-+        setValueFromRawText(newValue: IRawText): void;
-+        /**
-+         * Get the text stored in this model.
-+         * @param eol The end of line character preference. Defaults to `EndOfLinePreference.TextDefined`.
-+         * @param preserverBOM Preserve a BOM character if it was detected when the model was constructed.
-+         * @return The text.
-+         */
-+        getValue(eol?: EndOfLinePreference, preserveBOM?: boolean): string;
-+        /**
-+         * Get the length of the text stored in this model.
-+         */
-+        getValueLength(eol?: EndOfLinePreference, preserveBOM?: boolean): number;
-+        /**
-+         * Get the raw text stored in this model.
-+         */
-+        toRawText(): IRawText;
-+        /**
-+         * Check if the raw text stored in this model equals another raw text.
-+         */
-+        equals(other: IRawText): boolean;
-+        /**
-+         * Get the text in a certain range.
-+         * @param range The range describing what text to get.
-+         * @param eol The end of line character preference. This will only be used for multiline ranges. Defaults to `EndOfLinePreference.TextDefined`.
-+         * @return The text.
-+         */
-+        getValueInRange(range: IRange, eol?: EndOfLinePreference): string;
-+        /**
-+         * Get the length of text in a certain range.
-+         * @param range The range describing what text length to get.
-+         * @return The text length.
-+         */
-+        getValueLengthInRange(range: IRange): number;
-+        /**
-+         * Get the number of lines in the model.
-+         */
-+        getLineCount(): number;
-+        /**
-+         * Get the text for a certain line.
-+         */
-+        getLineContent(lineNumber: number): string;
-+        /**
-+         * Get the text for all lines.
-+         */
-+        getLinesContent(): string[];
-+        /**
-+         * Get the end of line sequence predominantly used in the text buffer.
-+         * @return EOL char sequence (e.g.: '\n' or '\r\n').
-+         */
-+        getEOL(): string;
-+        /**
-+         * Change the end of line sequence used in the text buffer.
-+         */
-+        setEOL(eol: EndOfLineSequence): void;
-+        /**
-+         * Get the minimum legal column for line at `lineNumber`
-+         */
-+        getLineMinColumn(lineNumber: number): number;
-+        /**
-+         * Get the maximum legal column for line at `lineNumber`
-+         */
-+        getLineMaxColumn(lineNumber: number): number;
-+        /**
-+         * Returns the column before the first non whitespace character for line at `lineNumber`.
-+         * Returns 0 if line is empty or contains only whitespace.
-+         */
-+        getLineFirstNonWhitespaceColumn(lineNumber: number): number;
-+        /**
-+         * Returns the column after the last non whitespace character for line at `lineNumber`.
-+         * Returns 0 if line is empty or contains only whitespace.
-+         */
-+        getLineLastNonWhitespaceColumn(lineNumber: number): number;
-+        /**
-+         * Create a valid position,
-+         */
-+        validatePosition(position: IPosition): Position;
-+        /**
-+         * Advances the given position by the given offest (negative offsets are also accepted)
-+         * and returns it as a new valid position.
-+         *
-+         * If the offset and position are such that their combination goes beyond the beginning or
-+         * end of the model, throws an exception.
-+         *
-+         * If the ofsset is such that the new position would be in the middle of a multi-byte
-+         * line terminator, throws an exception.
-+         */
-+        modifyPosition(position: IPosition, offset: number): Position;
-+        /**
-+         * Create a valid range.
-+         */
-+        validateRange(range: IRange): Range;
-+        /**
-+         * Converts the position to a zero-based offset.
-+         *
-+         * The position will be [adjusted](#TextDocument.validatePosition).
-+         *
-+         * @param position A position.
-+         * @return A valid zero-based offset.
-+         */
-+        getOffsetAt(position: IPosition): number;
-+        /**
-+         * Converts a zero-based offset to a position.
-+         *
-+         * @param offset A zero-based offset.
-+         * @return A valid [position](#Position).
-+         */
-+        getPositionAt(offset: number): Position;
-+        /**
-+         * Get a range covering the entire model
-+         */
-+        getFullModelRange(): Range;
-+        /**
-+         * Returns iff the model was disposed or not.
-+         */
-+        isDisposed(): boolean;
-+        /**
-+         * Search the model.
-+         * @param searchString The string used to search. If it is a regular expression, set `isRegex` to true.
-+         * @param searchOnlyEditableRange Limit the searching to only search inside the editable range of the model.
-+         * @param isRegex Used to indicate that `searchString` is a regular expression.
-+         * @param matchCase Force the matching to match lower/upper case exactly.
-+         * @param wholeWord Force the matching to match entire words only.
-+         * @param limitResultCount Limit the number of results
-+         * @return The ranges where the matches are. It is empty if not matches have been found.
-+         */
-+        findMatches(searchString: string, searchOnlyEditableRange: boolean, isRegex: boolean, matchCase: boolean, wholeWord: boolean, limitResultCount?: number): Range[];
-+        /**
-+         * Search the model.
-+         * @param searchString The string used to search. If it is a regular expression, set `isRegex` to true.
-+         * @param searchScope Limit the searching to only search inside this range.
-+         * @param isRegex Used to indicate that `searchString` is a regular expression.
-+         * @param matchCase Force the matching to match lower/upper case exactly.
-+         * @param wholeWord Force the matching to match entire words only.
-+         * @param limitResultCount Limit the number of results
-+         * @return The ranges where the matches are. It is empty if no matches have been found.
-+         */
-+        findMatches(searchString: string, searchScope: IRange, isRegex: boolean, matchCase: boolean, wholeWord: boolean, limitResultCount?: number): Range[];
-+        /**
-+         * Search the model for the next match. Loops to the beginning of the model if needed.
-+         * @param searchString The string used to search. If it is a regular expression, set `isRegex` to true.
-+         * @param searchStart Start the searching at the specified position.
-+         * @param isRegex Used to indicate that `searchString` is a regular expression.
-+         * @param matchCase Force the matching to match lower/upper case exactly.
-+         * @param wholeWord Force the matching to match entire words only.
-+         * @return The range where the next match is. It is null if no next match has been found.
-+         */
-+        findNextMatch(searchString: string, searchStart: IPosition, isRegex: boolean, matchCase: boolean, wholeWord: boolean): Range;
-+        /**
-+         * Search the model for the previous match. Loops to the end of the model if needed.
-+         * @param searchString The string used to search. If it is a regular expression, set `isRegex` to true.
-+         * @param searchStart Start the searching at the specified position.
-+         * @param isRegex Used to indicate that `searchString` is a regular expression.
-+         * @param matchCase Force the matching to match lower/upper case exactly.
-+         * @param wholeWord Force the matching to match entire words only.
-+         * @return The range where the previous match is. It is null if no previous match has been found.
-+         */
-+        findPreviousMatch(searchString: string, searchStart: IPosition, isRegex: boolean, matchCase: boolean, wholeWord: boolean): Range;
-+    }
-+
-+    export interface IReadOnlyModel extends ITextModel {
-+        /**
-+         * Gets the resource associated with this editor model.
-+         */
-+        uri: Uri;
-+        /**
-+         * Get the language associated with this model.
-+         */
-+        getModeId(): string;
-+        /**
-+         * Get the word under or besides `position`.
-+         * @param position The position to look for a word.
-+         * @param skipSyntaxTokens Ignore syntax tokens, as identified by the mode.
-+         * @return The word under or besides `position`. Might be null.
-+         */
-+        getWordAtPosition(position: IPosition): IWordAtPosition;
-+        /**
-+         * Get the word under or besides `position` trimmed to `position`.column
-+         * @param position The position to look for a word.
-+         * @param skipSyntaxTokens Ignore syntax tokens, as identified by the mode.
-+         * @return The word under or besides `position`. Will never be null.
-+         */
-+        getWordUntilPosition(position: IPosition): IWordAtPosition;
-+    }
-+
-+    /**
-+     * A model that is tokenized.
-+     */
-+    export interface ITokenizedModel extends ITextModel {
-+        /**
-+         * Get the current language mode associated with the model.
-+         */
-+        getMode(): languages.IMode;
-+        /**
-+         * Get the language associated with this model.
-+         */
-+        getModeId(): string;
-+        /**
-+         * Get the word under or besides `position`.
-+         * @param position The position to look for a word.
-+         * @param skipSyntaxTokens Ignore syntax tokens, as identified by the mode.
-+         * @return The word under or besides `position`. Might be null.
-+         */
-+        getWordAtPosition(position: IPosition): IWordAtPosition;
-+        /**
-+         * Get the word under or besides `position` trimmed to `position`.column
-+         * @param position The position to look for a word.
-+         * @param skipSyntaxTokens Ignore syntax tokens, as identified by the mode.
-+         * @return The word under or besides `position`. Will never be null.
-+         */
-+        getWordUntilPosition(position: IPosition): IWordAtPosition;
-+    }
-+
-+    /**
-+     * A model that can track markers.
-+     */
-+    export interface ITextModelWithMarkers extends ITextModel {
-+    }
-+
-+    /**
-+     * Describes the behaviour of decorations when typing/editing near their edges.
-+     */
-+    export enum TrackedRangeStickiness {
-+        AlwaysGrowsWhenTypingAtEdges = 0,
-+        NeverGrowsWhenTypingAtEdges = 1,
-+        GrowsOnlyWhenTypingBefore = 2,
-+        GrowsOnlyWhenTypingAfter = 3,
-+    }
-+
-+    /**
-+     * A model that can track ranges.
-+     */
-+    export interface ITextModelWithTrackedRanges extends ITextModel {
-+    }
-+
-+    /**
-+     * A model that can have decorations.
-+     */
-+    export interface ITextModelWithDecorations {
-+        /**
-+         * Perform a minimum ammount of operations, in order to transform the decorations
-+         * identified by `oldDecorations` to the decorations described by `newDecorations`
-+         * and returns the new identifiers associated with the resulting decorations.
-+         *
-+         * @param oldDecorations Array containing previous decorations identifiers.
-+         * @param newDecorations Array describing what decorations should result after the call.
-+         * @param ownerId Identifies the editor id in which these decorations should appear. If no `ownerId` is provided, the decorations will appear in all editors that attach this model.
-+         * @return An array containing the new decorations identifiers.
-+         */
-+        deltaDecorations(oldDecorations: string[], newDecorations: IModelDeltaDecoration[], ownerId?: number): string[];
-+        /**
-+         * Get the options associated with a decoration.
-+         * @param id The decoration id.
-+         * @return The decoration options or null if the decoration was not found.
-+         */
-+        getDecorationOptions(id: string): IModelDecorationOptions;
-+        /**
-+         * Get the range associated with a decoration.
-+         * @param id The decoration id.
-+         * @return The decoration range or null if the decoration was not found.
-+         */
-+        getDecorationRange(id: string): Range;
-+        /**
-+         * Gets all the decorations for the line `lineNumber` as an array.
-+         * @param lineNumber The line number
-+         * @param ownerId If set, it will ignore decorations belonging to other owners.
-+         * @param filterOutValidation If set, it will ignore decorations specific to validation (i.e. warnings, errors).
-+         * @return An array with the decorations
-+         */
-+        getLineDecorations(lineNumber: number, ownerId?: number, filterOutValidation?: boolean): IModelDecoration[];
-+        /**
-+         * Gets all the decorations for the lines between `startLineNumber` and `endLineNumber` as an array.
-+         * @param startLineNumber The start line number
-+         * @param endLineNumber The end line number
-+         * @param ownerId If set, it will ignore decorations belonging to other owners.
-+         * @param filterOutValidation If set, it will ignore decorations specific to validation (i.e. warnings, errors).
-+         * @return An array with the decorations
-+         */
-+        getLinesDecorations(startLineNumber: number, endLineNumber: number, ownerId?: number, filterOutValidation?: boolean): IModelDecoration[];
-+        /**
-+         * Gets all the deocorations in a range as an array. Only `startLineNumber` and `endLineNumber` from `range` are used for filtering.
-+         * So for now it returns all the decorations on the same line as `range`.
-+         * @param range The range to search in
-+         * @param ownerId If set, it will ignore decorations belonging to other owners.
-+         * @param filterOutValidation If set, it will ignore decorations specific to validation (i.e. warnings, errors).
-+         * @return An array with the decorations
-+         */
-+        getDecorationsInRange(range: IRange, ownerId?: number, filterOutValidation?: boolean): IModelDecoration[];
-+        /**
-+         * Gets all the decorations as an array.
-+         * @param ownerId If set, it will ignore decorations belonging to other owners.
-+         * @param filterOutValidation If set, it will ignore decorations specific to validation (i.e. warnings, errors).
-+         */
-+        getAllDecorations(ownerId?: number, filterOutValidation?: boolean): IModelDecoration[];
-+    }
-+
-+    /**
-+     * An editable text model.
-+     */
-+    export interface IEditableTextModel extends ITextModelWithMarkers {
-+        /**
-+         * Normalize a string containing whitespace according to indentation rules (converts to spaces or to tabs).
-+         */
-+        normalizeIndentation(str: string): string;
-+        /**
-+         * Get what is considered to be one indent (e.g. a tab character or 4 spaces, etc.).
-+         */
-+        getOneIndent(): string;
-+        /**
-+         * Change the options of this model.
-+         */
-+        updateOptions(newOpts: ITextModelUpdateOptions): void;
-+        /**
-+         * Detect the indentation options for this model from its content.
-+         */
-+        detectIndentation(defaultInsertSpaces: boolean, defaultTabSize: number): void;
-+        /**
-+         * Push a stack element onto the undo stack. This acts as an undo/redo point.
-+         * The idea is to use `pushEditOperations` to edit the model and then to
-+         * `pushStackElement` to create an undo/redo stop point.
-+         */
-+        pushStackElement(): void;
-+        /**
-+         * Push edit operations, basically editing the model. This is the preferred way
-+         * of editing the model. The edit operations will land on the undo stack.
-+         * @param beforeCursorState The cursor state before the edit operaions. This cursor state will be returned when `undo` or `redo` are invoked.
-+         * @param editOperations The edit operations.
-+         * @param cursorStateComputer A callback that can compute the resulting cursors state after the edit operations have been executed.
-+         * @return The cursor state returned by the `cursorStateComputer`.
-+         */
-+        pushEditOperations(beforeCursorState: Selection[], editOperations: IIdentifiedSingleEditOperation[], cursorStateComputer: ICursorStateComputer): Selection[];
-+        /**
-+         * Edit the model without adding the edits to the undo stack.
-+         * This can have dire consequences on the undo stack! See @pushEditOperations for the preferred way.
-+         * @param operations The edit operations.
-+         * @return The inverse edit operations, that, when applied, will bring the model back to the previous state.
-+         */
-+        applyEdits(operations: IIdentifiedSingleEditOperation[]): IIdentifiedSingleEditOperation[];
-+    }
-+
-+    /**
-+     * A model.
-+     */
-+    export interface IModel extends IReadOnlyModel, IEditableTextModel, ITextModelWithMarkers, ITokenizedModel, ITextModelWithTrackedRanges, ITextModelWithDecorations, IEditorModel {
-+        /**
-+         * An event emitted when the contents of the model have changed.
-+         */
-+        onDidChangeContent(listener: (e: IModelContentChangedEvent2) => void): IDisposable;
-+        /**
-+         * An event emitted when decorations of the model have changed.
-+         */
-+        onDidChangeDecorations(listener: (e: IModelDecorationsChangedEvent) => void): IDisposable;
-+        /**
-+         * An event emitted when the model options have changed.
-+         */
-+        onDidChangeOptions(listener: (e: IModelOptionsChangedEvent) => void): IDisposable;
-+        /**
-+         * An event emitted when the language associated with the model has changed.
-+         */
-+        onDidChangeMode(listener: (e: IModelModeChangedEvent) => void): IDisposable;
-+        /**
-+         * An event emitted right before disposing the model.
-+         */
-+        onWillDispose(listener: () => void): IDisposable;
-+        /**
-+         * A unique identifier associated with this model.
-+         */
-+        id: string;
-+        /**
-+         * Destroy this model. This will unbind the model from the mode
-+         * and make all necessary clean-up to release this object to the GC.
-+         */
-+        dispose(): void;
-+    }
-+
-+    /**
-+     * An event describing that the current mode associated with a model has changed.
-+     */
-+    export interface IModelModeChangedEvent {
-+        /**
-+         * Previous mode
-+         */
-+        oldMode: languages.IMode;
-+        /**
-+         * New mode
-+         */
-+        newMode: languages.IMode;
-+    }
-+
-+    /**
-+     * An event describing a change in the text of a model.
-+     */
-+    export interface IModelContentChangedEvent2 {
-+        /**
-+         * The range that got replaced.
-+         */
-+        range: IRange;
-+        /**
-+         * The length of the range that got replaced.
-+         */
-+        rangeLength: number;
-+        /**
-+         * The new text for the range.
-+         */
-+        text: string;
-+        /**
-+         * The (new) end-of-line character.
-+         */
-+        eol: string;
-+        /**
-+         * The new version id the model has transitioned to.
-+         */
-+        versionId: number;
-+        /**
-+         * Flag that indicates that this event was generated while undoing.
-+         */
-+        isUndoing: boolean;
-+        /**
-+         * Flag that indicates that this event was generated while redoing.
-+         */
-+        isRedoing: boolean;
-+    }
-+
-+    /**
-+     * The raw text backing a model.
-+     */
-+    export interface IRawText {
-+        /**
-+         * The entire text length.
-+         */
-+        length: number;
-+        /**
-+         * The text split into lines.
-+         */
-+        lines: string[];
-+        /**
-+         * The BOM (leading character sequence of the file).
-+         */
-+        BOM: string;
-+        /**
-+         * The end of line sequence.
-+         */
-+        EOL: string;
-+        /**
-+         * The options associated with this text.
-+         */
-+        options: ITextModelResolvedOptions;
-+    }
-+
-+    /**
-+     * Decoration data associated with a model decorations changed event.
-+     */
-+    export interface IModelDecorationsChangedEventDecorationData {
-+        /**
-+         * The id of the decoration.
-+         */
-+        id: string;
-+        /**
-+         * The owner id of the decoration.
-+         */
-+        ownerId: number;
-+        /**
-+         * The range of the decoration.
-+         */
-+        range: IRange;
-+        /**
-+         * A flag describing if this is a problem decoration (e.g. warning/error).
-+         */
-+        isForValidation: boolean;
-+        /**
-+         * The options for this decoration.
-+         */
-+        options: IModelDecorationOptions;
-+    }
-+
-+    /**
-+     * An event describing that model decorations have changed.
-+     */
-+    export interface IModelDecorationsChangedEvent {
-+        /**
-+         * A summary with ids of decorations that have changed.
-+         */
-+        ids: string[];
-+        /**
-+         * Lists of details for added or changed decorations.
-+         */
-+        addedOrChangedDecorations: IModelDecorationsChangedEventDecorationData[];
-+        /**
-+         * List of ids for removed decorations.
-+         */
-+        removedDecorations: string[];
-+        /**
-+         * Details regarding old options.
-+         */
-+        oldOptions: {
-+            [decorationId: string]: IModelDecorationOptions;
-+        };
-+        /**
-+         * Details regarding old ranges.
-+         */
-+        oldRanges: {
-+            [decorationId: string]: IRange;
-+        };
-+    }
-+
-+    /**
-+     * An event describing that a range of lines has been tokenized
-+     */
-+    export interface IModelTokensChangedEvent {
-+        /**
-+         * The start of the range (inclusive)
-+         */
-+        fromLineNumber: number;
-+        /**
-+         * The end of the range (inclusive)
-+         */
-+        toLineNumber: number;
-+    }
-+
-+    /**
-+     * Describes the reason the cursor has changed its position.
-+     */
-+    export enum CursorChangeReason {
-+        /**
-+         * Unknown or not set.
-+         */
-+        NotSet = 0,
-+        /**
-+         * A `model.setValue()` was called.
-+         */
-+        ContentFlush = 1,
-+        /**
-+         * The `model` has been changed outside of this cursor and the cursor recovers its position from associated markers.
-+         */
-+        RecoverFromMarkers = 2,
-+        /**
-+         * There was an explicit user gesture.
-+         */
-+        Explicit = 3,
-+        /**
-+         * There was a Paste.
-+         */
-+        Paste = 4,
-+        /**
-+         * There was an Undo.
-+         */
-+        Undo = 5,
-+        /**
-+         * There was a Redo.
-+         */
-+        Redo = 6,
-+    }
-+
-+    /**
-+     * An event describing that the cursor position has changed.
-+     */
-+    export interface ICursorPositionChangedEvent {
-+        /**
-+         * Primary cursor's position.
-+         */
-+        position: Position;
-+        /**
-+         * Primary cursor's view position
-+         */
-+        viewPosition: Position;
-+        /**
-+         * Secondary cursors' position.
-+         */
-+        secondaryPositions: Position[];
-+        /**
-+         * Secondary cursors' view position.
-+         */
-+        secondaryViewPositions: Position[];
-+        /**
-+         * Reason.
-+         */
-+        reason: CursorChangeReason;
-+        /**
-+         * Source of the call that caused the event.
-+         */
-+        source: string;
-+        /**
-+         * Is the primary cursor in the editable range?
-+         */
-+        isInEditableRange: boolean;
-+    }
-+
-+    /**
-+     * An event describing that the cursor selection has changed.
-+     */
-+    export interface ICursorSelectionChangedEvent {
-+        /**
-+         * The primary selection.
-+         */
-+        selection: Selection;
-+        /**
-+         * The primary selection in view coordinates.
-+         */
-+        viewSelection: Selection;
-+        /**
-+         * The secondary selections.
-+         */
-+        secondarySelections: Selection[];
-+        /**
-+         * The secondary selections in view coordinates.
-+         */
-+        secondaryViewSelections: Selection[];
-+        /**
-+         * Source of the call that caused the event.
-+         */
-+        source: string;
-+        /**
-+         * Reason.
-+         */
-+        reason: CursorChangeReason;
-+    }
-+
-+    /**
-+     * An event describing that an editor has had its model reset (i.e. `editor.setModel()`).
-+     */
-+    export interface IModelChangedEvent {
-+        /**
-+         * The `uri` of the previous model or null.
-+         */
-+        oldModelUrl: Uri;
-+        /**
-+         * The `uri` of the new model or null.
-+         */
-+        newModelUrl: Uri;
-+    }
-+
-+    /**
-+     * A description for the overview ruler position.
-+     */
-+    export class OverviewRulerPosition {
-+        _overviewRulerPositionBrand: void;
-+        /**
-+         * Width of the overview ruler
-+         */
-+        width: number;
-+        /**
-+         * Height of the overview ruler
-+         */
-+        height: number;
-+        /**
-+         * Top position for the overview ruler
-+         */
-+        top: number;
-+        /**
-+         * Right position for the overview ruler
-+         */
-+        right: number;
-+    }
-+
-+    /**
-+     * The internal layout details of the editor.
-+     */
-+    export class EditorLayoutInfo {
-+        _editorLayoutInfoBrand: void;
-+        /**
-+         * Full editor width.
-+         */
-+        width: number;
-+        /**
-+         * Full editor height.
-+         */
-+        height: number;
-+        /**
-+         * Left position for the glyph margin.
-+         */
-+        glyphMarginLeft: number;
-+        /**
-+         * The width of the glyph margin.
-+         */
-+        glyphMarginWidth: number;
-+        /**
-+         * The height of the glyph margin.
-+         */
-+        glyphMarginHeight: number;
-+        /**
-+         * Left position for the line numbers.
-+         */
-+        lineNumbersLeft: number;
-+        /**
-+         * The width of the line numbers.
-+         */
-+        lineNumbersWidth: number;
-+        /**
-+         * The height of the line numbers.
-+         */
-+        lineNumbersHeight: number;
-+        /**
-+         * Left position for the line decorations.
-+         */
-+        decorationsLeft: number;
-+        /**
-+         * The width of the line decorations.
-+         */
-+        decorationsWidth: number;
-+        /**
-+         * The height of the line decorations.
-+         */
-+        decorationsHeight: number;
-+        /**
-+         * Left position for the content (actual text)
-+         */
-+        contentLeft: number;
-+        /**
-+         * The width of the content (actual text)
-+         */
-+        contentWidth: number;
-+        /**
-+         * The height of the content (actual height)
-+         */
-+        contentHeight: number;
-+        /**
-+         * The width of the vertical scrollbar.
-+         */
-+        verticalScrollbarWidth: number;
-+        /**
-+         * The height of the horizontal scrollbar.
-+         */
-+        horizontalScrollbarHeight: number;
-+        /**
-+         * The position of the overview ruler.
-+         */
-+        overviewRuler: OverviewRulerPosition;
-+    }
-+
-+    /**
-+     * Options for creating the editor.
-+     */
-+    export interface ICodeEditorWidgetCreationOptions extends IEditorOptions {
-+        /**
-+         * The initial model associated with this code editor.
-+         */
-+        model?: IModel;
-+    }
-+
-+    /**
-+     * An editor model.
-+     */
-+    export interface IEditorModel {
-+    }
-+
-+    /**
-+     * An editor view state.
-+     */
-+    export interface IEditorViewState {
-+    }
-+
-+    export interface IDimension {
-+        width: number;
-+        height: number;
-+    }
-+
-+    /**
-+     * A (serializable) state of the cursors.
-+     */
-+    export interface ICursorState {
-+        inSelectionMode: boolean;
-+        selectionStart: IPosition;
-+        position: IPosition;
-+    }
-+
-+    /**
-+     * A (serializable) state of the view.
-+     */
-+    export interface IViewState {
-+        scrollTop: number;
-+        scrollTopWithoutViewZones: number;
-+        scrollLeft: number;
-+    }
-+
-+    /**
-+     * A (serializable) state of the code editor.
-+     */
-+    export interface ICodeEditorViewState extends IEditorViewState {
-+        cursorState: ICursorState[];
-+        viewState: IViewState;
-+        contributionsState: {
-+            [id: string]: any;
-+        };
-+    }
-+
-+    /**
-+     * Type of hit element with the mouse in the editor.
-+     */
-+    export enum MouseTargetType {
-+        /**
-+         * Mouse is on top of an unknown element.
-+         */
-+        UNKNOWN = 0,
-+        /**
-+         * Mouse is on top of the textarea used for input.
-+         */
-+        TEXTAREA = 1,
-+        /**
-+         * Mouse is on top of the glyph margin
-+         */
-+        GUTTER_GLYPH_MARGIN = 2,
-+        /**
-+         * Mouse is on top of the line numbers
-+         */
-+        GUTTER_LINE_NUMBERS = 3,
-+        /**
-+         * Mouse is on top of the line decorations
-+         */
-+        GUTTER_LINE_DECORATIONS = 4,
-+        /**
-+         * Mouse is on top of the whitespace left in the gutter by a view zone.
-+         */
-+        GUTTER_VIEW_ZONE = 5,
-+        /**
-+         * Mouse is on top of text in the content.
-+         */
-+        CONTENT_TEXT = 6,
-+        /**
-+         * Mouse is on top of empty space in the content (e.g. after line text or below last line)
-+         */
-+        CONTENT_EMPTY = 7,
-+        /**
-+         * Mouse is on top of a view zone in the content.
-+         */
-+        CONTENT_VIEW_ZONE = 8,
-+        /**
-+         * Mouse is on top of a content widget.
-+         */
-+        CONTENT_WIDGET = 9,
-+        /**
-+         * Mouse is on top of the decorations overview ruler.
-+         */
-+        OVERVIEW_RULER = 10,
-+        /**
-+         * Mouse is on top of a scrollbar.
-+         */
-+        SCROLLBAR = 11,
-+        /**
-+         * Mouse is on top of an overlay widget.
-+         */
-+        OVERLAY_WIDGET = 12,
-+    }
-+
-+    /**
-+     * A model for the diff editor.
-+     */
-+    export interface IDiffEditorModel extends IEditorModel {
-+        /**
-+         * Original model.
-+         */
-+        original: IModel;
-+        /**
-+         * Modified model.
-+         */
-+        modified: IModel;
-+    }
-+
-+    /**
-+     * (Serializable) View state for the diff editor.
-+     */
-+    export interface IDiffEditorViewState extends IEditorViewState {
-+        original: ICodeEditorViewState;
-+        modified: ICodeEditorViewState;
-+    }
-+
-+    /**
-+     * A change
-+     */
-+    export interface IChange {
-+        originalStartLineNumber: number;
-+        originalEndLineNumber: number;
-+        modifiedStartLineNumber: number;
-+        modifiedEndLineNumber: number;
-+    }
-+
-+    /**
-+     * A character level change.
-+     */
-+    export interface ICharChange extends IChange {
-+        originalStartColumn: number;
-+        originalEndColumn: number;
-+        modifiedStartColumn: number;
-+        modifiedEndColumn: number;
-+    }
-+
-+    /**
-+     * A line change
-+     */
-+    export interface ILineChange extends IChange {
-+        charChanges: ICharChange[];
-+    }
-+
-+    export class BareFontInfo {
-+        _bareFontInfoBrand: void;
-+        fontFamily: string;
-+        fontWeight: string;
-+        fontSize: number;
-+        lineHeight: number;
-+    }
-+
-+    export class FontInfo extends BareFontInfo {
-+        _editorStylingBrand: void;
-+        typicalHalfwidthCharacterWidth: number;
-+        typicalFullwidthCharacterWidth: number;
-+        spaceWidth: number;
-+        maxDigitWidth: number;
-+    }
-+
-+    export interface INewScrollPosition {
-+        scrollLeft?: number;
-+        scrollTop?: number;
-+    }
-+
-+    /**
-+     * Description of an action contribution
-+     */
-+    export interface IActionDescriptor {
-+        /**
-+         * An unique identifier of the contributed action.
-+         */
-+        id: string;
-+        /**
-+         * A label of the action that will be presented to the user.
-+         */
-+        label: string;
-+        /**
-+         * An array of keybindings for the action.
-+         */
-+        keybindings?: number[];
-+        /**
-+         * Control if the action should show up in the context menu and where.
-+         * The context menu of the editor has these default:
-+         *   navigation - The navigation group comes first in all cases.
-+         *   1_modification - This group comes next and contains commands that modify your code.
-+         *   9_cutcopypaste - The last default group with the basic editing commands.
-+         * You can also create your own group.
-+         * Defaults to null (don't show in context menu).
-+         */
-+        contextMenuGroupId?: string;
-+        /**
-+         * Control the order in the context menu group.
-+         */
-+        contextMenuOrder?: number;
-+        /**
-+         * The keybinding rule.
-+         */
-+        keybindingContext?: string;
-+        /**
-+         * Method that will be executed when the action is triggered.
-+         * @param editor The editor instance is passed in as a convinience
-+         */
-+        run: (editor: ICommonCodeEditor) => Promise<void>;
-+    }
-+
-+    export interface IEditorAction {
-+        id: string;
-+        label: string;
-+        alias: string;
-+        isSupported(): boolean;
-+        run(): Promise<void>;
-+    }
-+
-+    /**
-+     * An editor.
-+     */
-+    export interface IEditor {
-+        /**
-+         * An event emitted when the content of the current model has changed.
-+         */
-+        onDidChangeModelContent(listener: (e: IModelContentChangedEvent2) => void): IDisposable;
-+        /**
-+         * An event emitted when the language of the current model has changed.
-+         */
-+        onDidChangeModelMode(listener: (e: IModelModeChangedEvent) => void): IDisposable;
-+        /**
-+         * An event emitted when the options of the current model has changed.
-+         */
-+        onDidChangeModelOptions(listener: (e: IModelOptionsChangedEvent) => void): IDisposable;
-+        /**
-+         * An event emitted when the configuration of the editor has changed. (e.g. `editor.updateOptions()`)
-+         */
-+        onDidChangeConfiguration(listener: (e: IConfigurationChangedEvent) => void): IDisposable;
-+        /**
-+         * An event emitted when the cursor position has changed.
-+         */
-+        onDidChangeCursorPosition(listener: (e: ICursorPositionChangedEvent) => void): IDisposable;
-+        /**
-+         * An event emitted when the cursor selection has changed.
-+         */
-+        onDidChangeCursorSelection(listener: (e: ICursorSelectionChangedEvent) => void): IDisposable;
-+        /**
-+         * An event emitted when the editor has been disposed.
-+         */
-+        onDidDispose(listener: () => void): IDisposable;
-+        /**
-+         * Dispose the editor.
-+         */
-+        dispose(): void;
-+        /**
-+         * Get a unique id for this editor instance.
-+         */
-+        getId(): string;
-+        /**
-+         * Get the editor type. Please see `EditorType`.
-+         * This is to avoid an instanceof check
-+         */
-+        getEditorType(): string;
-+        /**
-+         * Update the editor's options after the editor has been created.
-+         */
-+        updateOptions(newOptions: IEditorOptions): void;
-+        /**
-+         * Instructs the editor to remeasure its container. This method should
-+         * be called when the container of the editor gets resized.
-+         */
-+        layout(dimension?: IDimension): void;
-+        /**
-+         * Brings browser focus to the editor text
-+         */
-+        focus(): void;
-+        /**
-+         * Returns true if this editor has keyboard focus (e.g. cursor is blinking).
-+         */
-+        isFocused(): boolean;
-+        /**
-+         * Add a new action to this editor.
-+         */
-+        addAction(descriptor: IActionDescriptor): void;
-+        /**
-+         * Returns all actions associated with this editor.
-+         */
-+        getActions(): IEditorAction[];
-+        /**
-+         * Returns all actions associated with this editor.
-+         */
-+        getSupportedActions(): IEditorAction[];
-+        /**
-+         * Saves current view state of the editor in a serializable object.
-+         */
-+        saveViewState(): IEditorViewState;
-+        /**
-+         * Restores the view state of the editor from a serializable object generated by `saveViewState`.
-+         */
-+        restoreViewState(state: IEditorViewState): void;
-+        /**
-+         * Given a position, returns a column number that takes tab-widths into account.
-+         */
-+        getVisibleColumnFromPosition(position: IPosition): number;
-+        /**
-+         * Returns the primary position of the cursor.
-+         */
-+        getPosition(): Position;
-+        /**
-+         * Set the primary position of the cursor. This will remove any secondary cursors.
-+         * @param position New primary cursor's position
-+         */
-+        setPosition(position: IPosition): void;
-+        /**
-+         * Scroll vertically as necessary and reveal a line.
-+         */
-+        revealLine(lineNumber: number): void;
-+        /**
-+         * Scroll vertically as necessary and reveal a line centered vertically.
-+         */
-+        revealLineInCenter(lineNumber: number): void;
-+        /**
-+         * Scroll vertically as necessary and reveal a line centered vertically only if it lies outside the viewport.
-+         */
-+        revealLineInCenterIfOutsideViewport(lineNumber: number): void;
-+        /**
-+         * Scroll vertically or horizontally as necessary and reveal a position.
-+         */
-+        revealPosition(position: IPosition): void;
-+        /**
-+         * Scroll vertically or horizontally as necessary and reveal a position centered vertically.
-+         */
-+        revealPositionInCenter(position: IPosition): void;
-+        /**
-+         * Scroll vertically or horizontally as necessary and reveal a position centered vertically only if it lies outside the viewport.
-+         */
-+        revealPositionInCenterIfOutsideViewport(position: IPosition): void;
-+        /**
-+         * Returns the primary selection of the editor.
-+         */
-+        getSelection(): Selection;
-+        /**
-+         * Returns all the selections of the editor.
-+         */
-+        getSelections(): Selection[];
-+        /**
-+         * Set the primary selection of the editor. This will remove any secondary cursors.
-+         * @param selection The new selection
-+         */
-+        setSelection(selection: IRange): void;
-+        /**
-+         * Set the primary selection of the editor. This will remove any secondary cursors.
-+         * @param selection The new selection
-+         */
-+        setSelection(selection: Range): void;
-+        /**
-+         * Set the primary selection of the editor. This will remove any secondary cursors.
-+         * @param selection The new selection
-+         */
-+        setSelection(selection: ISelection): void;
-+        /**
-+         * Set the primary selection of the editor. This will remove any secondary cursors.
-+         * @param selection The new selection
-+         */
-+        setSelection(selection: Selection): void;
-+        /**
-+         * Set the selections for all the cursors of the editor.
-+         * Cursors will be removed or added, as necessary.
-+         */
-+        setSelections(selections: ISelection[]): void;
-+        /**
-+         * Scroll vertically as necessary and reveal lines.
-+         */
-+        revealLines(startLineNumber: number, endLineNumber: number): void;
-+        /**
-+         * Scroll vertically as necessary and reveal lines centered vertically.
-+         */
-+        revealLinesInCenter(lineNumber: number, endLineNumber: number): void;
-+        /**
-+         * Scroll vertically as necessary and reveal lines centered vertically only if it lies outside the viewport.
-+         */
-+        revealLinesInCenterIfOutsideViewport(lineNumber: number, endLineNumber: number): void;
-+        /**
-+         * Scroll vertically or horizontally as necessary and reveal a range.
-+         */
-+        revealRange(range: IRange): void;
-+        /**
-+         * Scroll vertically or horizontally as necessary and reveal a range centered vertically.
-+         */
-+        revealRangeInCenter(range: IRange): void;
-+        /**
-+         * Scroll vertically or horizontally as necessary and reveal a range centered vertically only if it lies outside the viewport.
-+         */
-+        revealRangeInCenterIfOutsideViewport(range: IRange): void;
-+        /**
-+         * Directly trigger a handler or an editor action.
-+         * @param source The source of the call.
-+         * @param handlerId The id of the handler or the id of a contribution.
-+         * @param payload Extra data to be sent to the handler.
-+         */
-+        trigger(source: string, handlerId: string, payload: any): void;
-+        /**
-+         * Gets the current model attached to this editor.
-+         */
-+        getModel(): IEditorModel;
-+        /**
-+         * Sets the current model attached to this editor.
-+         * If the previous model was created by the editor via the value key in the options
-+         * literal object, it will be destroyed. Otherwise, if the previous model was set
-+         * via setModel, or the model key in the options literal object, the previous model
-+         * will not be destroyed.
-+         * It is safe to call setModel(null) to simply detach the current model from the editor.
-+         */
-+        setModel(model: IEditorModel): void;
-+    }
-+
-+    /**
-+     * An editor contribution that gets created every time a new editor gets created and gets disposed when the editor gets disposed.
-+     */
-+    export interface IEditorContribution {
-+        /**
-+         * Get a unique identifier for this contribution.
-+         */
-+        getId(): string;
-+        /**
-+         * Dispose this contribution.
-+         */
-+        dispose(): void;
-+        /**
-+         * Store view state.
-+         */
-+        saveViewState?(): any;
-+        /**
-+         * Restore view state.
-+         */
-+        restoreViewState?(state: any): void;
-+    }
-+
-+    export interface ICommonCodeEditor extends IEditor {
-+        /**
-+         * An event emitted when the model of this editor has changed (e.g. `editor.setModel()`).
-+         */
-+        onDidChangeModel(listener: (e: IModelChangedEvent) => void): IDisposable;
-+        /**
-+         * An event emitted when the decorations of the current model have changed.
-+         */
-+        onDidChangeModelDecorations(listener: (e: IModelDecorationsChangedEvent) => void): IDisposable;
-+        /**
-+         * An event emitted when the text inside this editor gained focus (i.e. cursor blinking).
-+         */
-+        onDidFocusEditorText(listener: () => void): IDisposable;
-+        /**
-+         * An event emitted when the text inside this editor lost focus.
-+         */
-+        onDidBlurEditorText(listener: () => void): IDisposable;
-+        /**
-+         * An event emitted when the text inside this editor or an editor widget gained focus.
-+         */
-+        onDidFocusEditor(listener: () => void): IDisposable;
-+        /**
-+         * An event emitted when the text inside this editor or an editor widget lost focus.
-+         */
-+        onDidBlurEditor(listener: () => void): IDisposable;
-+        /**
-+         * Returns true if this editor or one of its widgets has keyboard focus.
-+         */
-+        hasWidgetFocus(): boolean;
-+        /**
-+         * Get a contribution of this editor.
-+         * @id Unique identifier of the contribution.
-+         * @return The contribution or null if contribution not found.
-+         */
-+        getContribution<T extends IEditorContribution>(id: string): T;
-+        /**
-+         * Type the getModel() of IEditor.
-+         */
-+        getModel(): IModel;
-+        /**
-+         * Returns the current editor's configuration
-+         */
-+        getConfiguration(): InternalEditorOptions;
-+        /**
-+         * Get value of the current model attached to this editor.
-+         * @see IModel.getValue
-+         */
-+        getValue(options?: {
-+            preserveBOM: boolean;
-+            lineEnding: string;
-+        }): string;
-+        /**
-+         * Set the value of the current model attached to this editor.
-+         * @see IModel.setValue
-+         */
-+        setValue(newValue: string): void;
-+        /**
-+         * Get the scrollWidth of the editor's viewport.
-+         */
-+        getScrollWidth(): number;
-+        /**
-+         * Get the scrollLeft of the editor's viewport.
-+         */
-+        getScrollLeft(): number;
-+        /**
-+         * Get the scrollHeight of the editor's viewport.
-+         */
-+        getScrollHeight(): number;
-+        /**
-+         * Get the scrollTop of the editor's viewport.
-+         */
-+        getScrollTop(): number;
-+        /**
-+         * Change the scrollLeft of the editor's viewport.
-+         */
-+        setScrollLeft(newScrollLeft: number): void;
-+        /**
-+         * Change the scrollTop of the editor's viewport.
-+         */
-+        setScrollTop(newScrollTop: number): void;
-+        /**
-+         * Change the scroll position of the editor's viewport.
-+         */
-+        setScrollPosition(position: INewScrollPosition): void;
-+        /**
-+         * Get an action that is a contribution to this editor.
-+         * @id Unique identifier of the contribution.
-+         * @return The action or null if action not found.
-+         */
-+        getAction(id: string): IEditorAction;
-+        /**
-+         * Execute a command on the editor.
-+         * @param source The source of the call.
-+         * @param command The command to execute
-+         */
-+        executeCommand(source: string, command: ICommand): void;
-+        /**
-+         * Push an "undo stop" in the undo-redo stack.
-+         */
-+        pushUndoStop(): boolean;
-+        /**
-+         * Execute a command on the editor.
-+         * @param source The source of the call.
-+         * @param command The command to execute
-+         */
-+        executeEdits(source: string, edits: IIdentifiedSingleEditOperation[]): boolean;
-+        /**
-+         * Execute multiple (concommitent) commands on the editor.
-+         * @param source The source of the call.
-+         * @param command The commands to execute
-+         */
-+        executeCommands(source: string, commands: ICommand[]): void;
-+        /**
-+         * Get all the decorations on a line (filtering out decorations from other editors).
-+         */
-+        getLineDecorations(lineNumber: number): IModelDecoration[];
-+        /**
-+         * All decorations added through this call will get the ownerId of this editor.
-+         * @see IModel.deltaDecorations
-+         */
-+        deltaDecorations(oldDecorations: string[], newDecorations: IModelDeltaDecoration[]): string[];
-+        /**
-+         * Get the layout info for the editor.
-+         */
-+        getLayoutInfo(): EditorLayoutInfo;
-+    }
-+
-+    export interface ICommonDiffEditor extends IEditor {
-+        /**
-+         * An event emitted when the diff information computed by this diff editor has been updated.
-+         */
-+        onDidUpdateDiff(listener: () => void): IDisposable;
-+        /**
-+         * Type the getModel() of IEditor.
-+         */
-+        getModel(): IDiffEditorModel;
-+        /**
-+         * Get the `original` editor.
-+         */
-+        getOriginalEditor(): ICommonCodeEditor;
-+        /**
-+         * Get the `modified` editor.
-+         */
-+        getModifiedEditor(): ICommonCodeEditor;
-+        /**
-+         * Get the computed diff information.
-+         */
-+        getLineChanges(): ILineChange[];
-+        /**
-+         * @see ICodeEditor.getValue
-+         */
-+        getValue(options?: {
-+            preserveBOM: boolean;
-+            lineEnding: string;
-+        }): string;
-+    }
-+
-+    /**
-+     * The type of the `IEditor`.
-+     */
-+    export var EditorType: {
-+        ICodeEditor: string;
-+        IDiffEditor: string;
-+    };
-+
-+    /**
-+     * Positions in the view for cursor move command.
-+     */
-+    export const CursorMovePosition: {
-+        Left: string;
-+        Right: string;
-+        Up: string;
-+        Down: string;
-+        WrappedLineStart: string;
-+        WrappedLineFirstNonWhitespaceCharacter: string;
-+        WrappedLineColumnCenter: string;
-+        WrappedLineEnd: string;
-+        WrappedLineLastNonWhitespaceCharacter: string;
-+        ViewPortTop: string;
-+        ViewPortCenter: string;
-+        ViewPortBottom: string;
-+        ViewPortIfOutside: string;
-+    };
-+
-+    /**
-+     * Units for Cursor move 'by' argument
-+     */
-+    export const CursorMoveByUnit: {
-+        Line: string;
-+        WrappedLine: string;
-+        Character: string;
-+        HalfLine: string;
-+    };
-+
-+    /**
-+     * Arguments for Cursor move command
-+     */
-+    export interface CursorMoveArguments {
-+        to: string;
-+        select?: boolean;
-+        by?: string;
-+        value?: number;
-+    }
-+
-+    /**
-+     * Directions in the view for editor scroll command.
-+     */
-+    export const EditorScrollDirection: {
-+        Up: string;
-+        Down: string;
-+    };
-+
-+    /**
-+     * Units for editor scroll 'by' argument
-+     */
-+    export const EditorScrollByUnit: {
-+        Line: string;
-+        WrappedLine: string;
-+        Page: string;
-+        HalfPage: string;
-+    };
-+
-+    /**
-+     * Arguments for editor scroll command
-+     */
-+    export interface EditorScrollArguments {
-+        to: string;
-+        by?: string;
-+        value?: number;
-+        revealCursor?: boolean;
-+    }
-+
-+    /**
-+     * Arguments for reveal line command
-+     */
-+    export interface RevealLineArguments {
-+        lineNumber?: number;
-+        at?: string;
-+    }
-+
-+    /**
-+     * Values for reveal line 'at' argument
-+     */
-+    export const RevealLineAtArgument: {
-+        Top: string;
-+        Center: string;
-+        Bottom: string;
-+    };
-+
-+    /**
-+     * Built-in commands.
-+     */
-+    export var Handler: {
-+        ExecuteCommand: string;
-+        ExecuteCommands: string;
-+        CursorLeft: string;
-+        CursorLeftSelect: string;
-+        CursorWordLeft: string;
-+        CursorWordStartLeft: string;
-+        CursorWordEndLeft: string;
-+        CursorWordLeftSelect: string;
-+        CursorWordStartLeftSelect: string;
-+        CursorWordEndLeftSelect: string;
-+        CursorRight: string;
-+        CursorRightSelect: string;
-+        CursorWordRight: string;
-+        CursorWordStartRight: string;
-+        CursorWordEndRight: string;
-+        CursorWordRightSelect: string;
-+        CursorWordStartRightSelect: string;
-+        CursorWordEndRightSelect: string;
-+        CursorUp: string;
-+        CursorUpSelect: string;
-+        CursorDown: string;
-+        CursorDownSelect: string;
-+        CursorPageUp: string;
-+        CursorPageUpSelect: string;
-+        CursorPageDown: string;
-+        CursorPageDownSelect: string;
-+        CursorHome: string;
-+        CursorHomeSelect: string;
-+        CursorEnd: string;
-+        CursorEndSelect: string;
-+        ExpandLineSelection: string;
-+        CursorTop: string;
-+        CursorTopSelect: string;
-+        CursorBottom: string;
-+        CursorBottomSelect: string;
-+        CursorColumnSelectLeft: string;
-+        CursorColumnSelectRight: string;
-+        CursorColumnSelectUp: string;
-+        CursorColumnSelectPageUp: string;
-+        CursorColumnSelectDown: string;
-+        CursorColumnSelectPageDown: string;
-+        CursorMove: string;
-+        AddCursorDown: string;
-+        AddCursorUp: string;
-+        CursorUndo: string;
-+        MoveTo: string;
-+        MoveToSelect: string;
-+        ColumnSelect: string;
-+        CreateCursor: string;
-+        LastCursorMoveToSelect: string;
-+        JumpToBracket: string;
-+        Type: string;
-+        ReplacePreviousChar: string;
-+        CompositionStart: string;
-+        CompositionEnd: string;
-+        Paste: string;
-+        Tab: string;
-+        Indent: string;
-+        Outdent: string;
-+        DeleteLeft: string;
-+        DeleteRight: string;
-+        DeleteWordLeft: string;
-+        DeleteWordStartLeft: string;
-+        DeleteWordEndLeft: string;
-+        DeleteWordRight: string;
-+        DeleteWordStartRight: string;
-+        DeleteWordEndRight: string;
-+        DeleteAllLeft: string;
-+        DeleteAllRight: string;
-+        RemoveSecondaryCursors: string;
-+        CancelSelection: string;
-+        Cut: string;
-+        Undo: string;
-+        Redo: string;
-+        WordSelect: string;
-+        WordSelectDrag: string;
-+        LastCursorWordSelect: string;
-+        LineSelect: string;
-+        LineSelectDrag: string;
-+        LastCursorLineSelect: string;
-+        LastCursorLineSelectDrag: string;
-+        LineInsertBefore: string;
-+        LineInsertAfter: string;
-+        LineBreakInsert: string;
-+        SelectAll: string;
-+        EditorScroll: string;
-+        ScrollLineUp: string;
-+        ScrollLineDown: string;
-+        ScrollPageUp: string;
-+        ScrollPageDown: string;
-+        RevealLine: string;
-+    };
-+
-+    /**
-+     * The style in which the editor's cursor should be rendered.
-+     */
-+    export enum TextEditorCursorStyle {
-+        /**
-+         * As a vertical line (sitting between two characters).
-+         */
-+        Line = 1,
-+        /**
-+         * As a block (sitting on top of a character).
-+         */
-+        Block = 2,
-+        /**
-+         * As a horizontal line (sitting under a character).
-+         */
-+        Underline = 3,
-+    }
-+
-+    /**
-+     * The kind of animation in which the editor's cursor should be rendered.
-+     */
-+    export enum TextEditorCursorBlinkingStyle {
-+        /**
-+         * Hidden
-+         */
-+        Hidden = 0,
-+        /**
-+         * Blinking
-+         */
-+        Blink = 1,
-+        /**
-+         * Blinking with smooth fading
-+         */
-+        Smooth = 2,
-+        /**
-+         * Blinking with prolonged filled state and smooth fading
-+         */
-+        Phase = 3,
-+        /**
-+         * Expand collapse animation on the y axis
-+         */
-+        Expand = 4,
-+        /**
-+         * No-Blinking
-+         */
-+        Solid = 5,
-+    }
-+
-+    /**
-+     * A view zone is a full horizontal rectangle that 'pushes' text down.
-+     * The editor reserves space for view zones when rendering.
-+     */
-+    export interface IViewZone {
-+        /**
-+         * The line number after which this zone should appear.
-+         * Use 0 to place a view zone before the first line number.
-+         */
-+        afterLineNumber: number;
-+        /**
-+         * The column after which this zone should appear.
-+         * If not set, the maxLineColumn of `afterLineNumber` will be used.
-+         */
-+        afterColumn?: number;
-+        /**
-+         * Suppress mouse down events.
-+         * If set, the editor will attach a mouse down listener to the view zone and .preventDefault on it.
-+         * Defaults to false
-+         */
-+        suppressMouseDown?: boolean;
-+        /**
-+         * The height in lines of the view zone.
-+         * If specified, `heightInPx` will be used instead of this.
-+         * If neither `heightInPx` nor `heightInLines` is specified, a default of `heightInLines` = 1 will be chosen.
-+         */
-+        heightInLines?: number;
-+        /**
-+         * The height in px of the view zone.
-+         * If this is set, the editor will give preference to it rather than `heightInLines` above.
-+         * If neither `heightInPx` nor `heightInLines` is specified, a default of `heightInLines` = 1 will be chosen.
-+         */
-+        heightInPx?: number;
-+        /**
-+         * The dom node of the view zone
-+         */
-+        domNode: HTMLElement;
-+        /**
-+         * Callback which gives the relative top of the view zone as it appears (taking scrolling into account).
-+         */
-+        onDomNodeTop?: (top: number) => void;
-+        /**
-+         * Callback which gives the height in pixels of the view zone.
-+         */
-+        onComputedHeight?: (height: number) => void;
-+    }
-+
-+    /**
-+     * An accessor that allows for zones to be added or removed.
-+     */
-+    export interface IViewZoneChangeAccessor {
-+        /**
-+         * Create a new view zone.
-+         * @param zone Zone to create
-+         * @return A unique identifier to the view zone.
-+         */
-+        addZone(zone: IViewZone): number;
-+        /**
-+         * Remove a zone
-+         * @param id A unique identifier to the view zone, as returned by the `addZone` call.
-+         */
-+        removeZone(id: number): void;
-+        /**
-+         * Change a zone's position.
-+         * The editor will rescan the `afterLineNumber` and `afterColumn` properties of a view zone.
-+         */
-+        layoutZone(id: number): void;
-+    }
-+
-+    /**
-+     * A positioning preference for rendering content widgets.
-+     */
-+    export enum ContentWidgetPositionPreference {
-+        /**
-+         * Place the content widget exactly at a position
-+         */
-+        EXACT = 0,
-+        /**
-+         * Place the content widget above a position
-+         */
-+        ABOVE = 1,
-+        /**
-+         * Place the content widget below a position
-+         */
-+        BELOW = 2,
-+    }
-+
-+    /**
-+     * A position for rendering content widgets.
-+     */
-+    export interface IContentWidgetPosition {
-+        /**
-+         * Desired position for the content widget.
-+         * `preference` will also affect the placement.
-+         */
-+        position: IPosition;
-+        /**
-+         * Placement preference for position, in order of preference.
-+         */
-+        preference: ContentWidgetPositionPreference[];
-+    }
-+
-+    /**
-+     * A content widget renders inline with the text and can be easily placed 'near' an editor position.
-+     */
-+    export interface IContentWidget {
-+        /**
-+         * Render this content widget in a location where it could overflow the editor's view dom node.
-+         */
-+        allowEditorOverflow?: boolean;
-+        suppressMouseDown?: boolean;
-+        /**
-+         * Get a unique identifier of the content widget.
-+         */
-+        getId(): string;
-+        /**
-+         * Get the dom node of the content widget.
-+         */
-+        getDomNode(): HTMLElement;
-+        /**
-+         * Get the placement of the content widget.
-+         * If null is returned, the content widget will be placed off screen.
-+         */
-+        getPosition(): IContentWidgetPosition;
-+    }
-+
-+    /**
-+     * A positioning preference for rendering overlay widgets.
-+     */
-+    export enum OverlayWidgetPositionPreference {
-+        /**
-+         * Position the overlay widget in the top right corner
-+         */
-+        TOP_RIGHT_CORNER = 0,
-+        /**
-+         * Position the overlay widget in the bottom right corner
-+         */
-+        BOTTOM_RIGHT_CORNER = 1,
-+        /**
-+         * Position the overlay widget in the top center
-+         */
-+        TOP_CENTER = 2,
-+    }
-+
-+    /**
-+     * A position for rendering overlay widgets.
-+     */
-+    export interface IOverlayWidgetPosition {
-+        /**
-+         * The position preference for the overlay widget.
-+         */
-+        preference: OverlayWidgetPositionPreference;
-+    }
-+
-+    /**
-+     * An overlay widgets renders on top of the text.
-+     */
-+    export interface IOverlayWidget {
-+        /**
-+         * Get a unique identifier of the overlay widget.
-+         */
-+        getId(): string;
-+        /**
-+         * Get the dom node of the overlay widget.
-+         */
-+        getDomNode(): HTMLElement;
-+        /**
-+         * Get the placement of the overlay widget.
-+         * If null is returned, the overlay widget is responsible to place itself.
-+         */
-+        getPosition(): IOverlayWidgetPosition;
-+    }
-+
-+    /**
-+     * Target hit with the mouse in the editor.
-+     */
-+    export interface IMouseTarget {
-+        /**
-+         * The target element
-+         */
-+        element: Element;
-+        /**
-+         * The target type
-+         */
-+        type: MouseTargetType;
-+        /**
-+         * The 'approximate' editor position
-+         */
-+        position: Position;
-+        /**
-+         * Desired mouse column (e.g. when position.column gets clamped to text length -- clicking after text on a line).
-+         */
-+        mouseColumn: number;
-+        /**
-+         * The 'approximate' editor range
-+         */
-+        range: Range;
-+        /**
-+         * Some extra detail.
-+         */
-+        detail: any;
-+    }
-+
-+    /**
-+     * A mouse event originating from the editor.
-+     */
-+    export interface IEditorMouseEvent {
-+        event: IMouseEvent;
-+        target: IMouseTarget;
-+    }
-+
-+    /**
-+     * A rich code editor.
-+     */
-+    export interface ICodeEditor extends ICommonCodeEditor {
-+        /**
-+         * An event emitted on a "mouseup".
-+         */
-+        onMouseUp(listener: (e: IEditorMouseEvent) => void): IDisposable;
-+        /**
-+         * An event emitted on a "mousedown".
-+         */
-+        onMouseDown(listener: (e: IEditorMouseEvent) => void): IDisposable;
-+        /**
-+         * An event emitted on a "contextmenu".
-+         */
-+        onContextMenu(listener: (e: IEditorMouseEvent) => void): IDisposable;
-+        /**
-+         * An event emitted on a "mousemove".
-+         */
-+        onMouseMove(listener: (e: IEditorMouseEvent) => void): IDisposable;
-+        /**
-+         * An event emitted on a "mouseleave".
-+         */
-+        onMouseLeave(listener: (e: IEditorMouseEvent) => void): IDisposable;
-+        /**
-+         * An event emitted on a "keyup".
-+         */
-+        onKeyUp(listener: (e: IKeyboardEvent) => void): IDisposable;
-+        /**
-+         * An event emitted on a "keydown".
-+         */
-+        onKeyDown(listener: (e: IKeyboardEvent) => void): IDisposable;
-+        /**
-+         * An event emitted when the layout of the editor has changed.
-+         */
-+        onDidLayoutChange(listener: (e: EditorLayoutInfo) => void): IDisposable;
-+        /**
-+         * An event emitted when the scroll in the editor has changed.
-+         */
-+        onDidScrollChange(listener: (e: IScrollEvent) => void): IDisposable;
-+        /**
-+         * Returns the editor's dom node
-+         */
-+        getDomNode(): HTMLElement;
-+        /**
-+         * Add a content widget. Widgets must have unique ids, otherwise they will be overwritten.
-+         */
-+        addContentWidget(widget: IContentWidget): void;
-+        /**
-+         * Layout/Reposition a content widget. This is a ping to the editor to call widget.getPosition()
-+         * and update appropiately.
-+         */
-+        layoutContentWidget(widget: IContentWidget): void;
-+        /**
-+         * Remove a content widget.
-+         */
-+        removeContentWidget(widget: IContentWidget): void;
-+        /**
-+         * Add an overlay widget. Widgets must have unique ids, otherwise they will be overwritten.
-+         */
-+        addOverlayWidget(widget: IOverlayWidget): void;
-+        /**
-+         * Layout/Reposition an overlay widget. This is a ping to the editor to call widget.getPosition()
-+         * and update appropiately.
-+         */
-+        layoutOverlayWidget(widget: IOverlayWidget): void;
-+        /**
-+         * Remove an overlay widget.
-+         */
-+        removeOverlayWidget(widget: IOverlayWidget): void;
-+        /**
-+         * Change the view zones. View zones are lost when a new model is attached to the editor.
-+         */
-+        changeViewZones(callback: (accessor: IViewZoneChangeAccessor) => void): void;
-+        /**
-+         * Returns the range that is currently centered in the view port.
-+         */
-+        getCenteredRangeInViewport(): Range;
-+        /**
-+         * Get the horizontal position (left offset) for the column w.r.t to the beginning of the line.
-+         * This method works only if the line `lineNumber` is currently rendered (in the editor's viewport).
-+         * Use this method with caution.
-+         */
-+        getOffsetForColumn(lineNumber: number, column: number): number;
-+        /**
-+         * Force an editor render now.
-+         */
-+        render(): void;
-+        /**
-+         * Get the vertical position (top offset) for the line w.r.t. to the first line.
-+         */
-+        getTopForLineNumber(lineNumber: number): number;
-+        /**
-+         * Get the vertical position (top offset) for the position w.r.t. to the first line.
-+         */
-+        getTopForPosition(lineNumber: number, column: number): number;
-+        /**
-+         * Get the visible position for `position`.
-+         * The result position takes scrolling into account and is relative to the top left corner of the editor.
-+         * Explanation 1: the results of this method will change for the same `position` if the user scrolls the editor.
-+         * Explanation 2: the results of this method will not change if the container of the editor gets repositioned.
-+         * Warning: the results of this method are innacurate for positions that are outside the current editor viewport.
-+         */
-+        getScrolledVisiblePosition(position: IPosition): {
-+            top: number;
-+            left: number;
-+            height: number;
-+        };
-+        /**
-+         * Apply the same font settings as the editor to `target`.
-+         */
-+        applyFontInfo(target: HTMLElement): void;
-+    }
-+
-+    /**
-+     * A rich diff editor.
-+     */
-+    export interface IDiffEditor extends ICommonDiffEditor {
-+        /**
-+         * @see ICodeEditor.getDomNode
-+         */
-+        getDomNode(): HTMLElement;
-+    }
-+>>>>>>> .their
- }
- 
- declare namespace monaco.languages {
-changed in both
-  base   100644 24d687abceeef24008de69fa787695f0872374e4 src/vs/workbench/parts/terminal/electron-browser/media/xterm.css
-  our    100644 be7a3c7a177dbbf6fff0d2b41b43d082ccb7d36f src/vs/workbench/parts/terminal/electron-browser/media/xterm.css
-  their  100644 5e80769f86f104a2c523c241d9c06f3e292769ff src/vs/workbench/parts/terminal/electron-browser/media/xterm.css
-@@ -66,7 +66,12 @@
- 	 * HACK: to fix IE's blinking cursor
- 	 * Move textarea out of the screen to the far left, so that the cursor is not visible.
- 	 */
-+<<<<<<< .our
- 	position: absolute;
-+=======
-+	left: -9999em;
-+	top: -9999em;
-+>>>>>>> .their
- 	opacity: 0;
- 	left: -9999em;
- 	top: 0;
diff --git a/app/test/fixtures/merge-parser/vscode/merge-standalone-0.8.x-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-standalone-0.8.x-into-master.txt
deleted file mode 100644
index ffac5961b2f..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-standalone-0.8.x-into-master.txt
+++ /dev/null
@@ -1,6321 +0,0 @@
-changed in both
-  base   100644 26f602cd68402408bbd17f8fd8b2773351f3c2d4 build/monaco/package.json
-  our    100644 efd919085b2ffc82da8d810c609a9ed217bffb35 build/monaco/package.json
-  their  100644 b24844587aa8ff68b4c1d2087bf5dd7c0751dae8 build/monaco/package.json
-@@ -1,7 +1,11 @@
- {
-   "name": "monaco-editor-core",
-   "private": true,
-+<<<<<<< .our
-   "version": "0.14.3",
-+=======
-+  "version": "0.8.2",
-+>>>>>>> .their
-   "description": "A browser based code editor",
-   "author": "Microsoft Corporation",
-   "license": "MIT",
-removed in local
-  base   100644 e143c6e913aa59f3dffdb2c1a36cec4ffa2d1a1f src/vs/editor/browser/standalone/standaloneCodeEditor.ts
-  their  100644 22c073693df2fc8c21766b778ee6f09413977ff4 src/vs/editor/browser/standalone/standaloneCodeEditor.ts
-removed in local
-  base   100644 4aa0f1e3fa4c2c7a08b29ae6692acddb09b39f2b src/vs/editor/browser/standalone/standaloneEditor.ts
-  their  100644 ab7ba575a68acb6f1fa1484c4155b44a17862935 src/vs/editor/browser/standalone/standaloneEditor.ts
-changed in both
-  base   100644 6bd46d9b65e950f516d0422219f99f6b612a5646 src/vs/editor/browser/widget/codeEditorWidget.ts
-  our    100644 6f588e16445e2740e0f36730ce132f1ff91e44d8 src/vs/editor/browser/widget/codeEditorWidget.ts
-  their  100644 aba15b72080e1713f949a4899b7458cda390d98d src/vs/editor/browser/widget/codeEditorWidget.ts
-@@ -6,7 +6,14 @@
- 
- import 'vs/css!./media/editor';
- import 'vs/css!./media/tokens';
-+<<<<<<< .our
- import * as nls from 'vs/nls';
-+=======
-+import { onUnexpectedError } from 'vs/base/common/errors';
-+import { TPromise } from 'vs/base/common/winjs.base';
-+import { IEventEmitter } from 'vs/base/common/eventEmitter';
-+import * as browser from 'vs/base/browser/browser';
-+>>>>>>> .their
- import * as dom from 'vs/base/browser/dom';
- import { onUnexpectedError } from 'vs/base/common/errors';
- import { Event, Emitter } from 'vs/base/common/event';
-@@ -279,7 +286,11 @@
- 			}
- 		}
- 
-+<<<<<<< .our
- 		EditorExtensionsRegistry.getEditorActions().forEach((action) => {
-+=======
-+		this._getActions().forEach((action) => {
-+>>>>>>> .their
- 			const internalAction = new InternalEditorAction(
- 				action.id,
- 				action.label,
-changed in both
-  base   100644 585718b20ed02bc6a3e3dd712990b606784eec75 src/vs/editor/browser/widget/diffEditorWidget.ts
-  our    100644 481a3d62bd4fdb0fd496aaf0795bb98c9b1d946b src/vs/editor/browser/widget/diffEditorWidget.ts
-  their  100644 9f41b1b89994ec05f8048ef5d5dba55d87b6d918 src/vs/editor/browser/widget/diffEditorWidget.ts
-@@ -24,6 +24,7 @@
- import * as editorBrowser from 'vs/editor/browser/editorBrowser';
- import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditorWidget';
- import { Configuration } from 'vs/editor/browser/config/configuration';
-+<<<<<<< .our
- import { Position, IPosition } from 'vs/editor/common/core/position';
- import { Selection, ISelection } from 'vs/editor/common/core/selection';
- import { InlineDecoration, InlineDecorationType, ViewLineRenderingData } from 'vs/editor/common/viewModel/viewModel';
-@@ -42,6 +43,11 @@
- import { IModelDeltaDecoration, IModelDecorationsChangeAccessor, ITextModel } from 'vs/editor/common/model';
- import { INotificationService } from 'vs/platform/notification/common/notification';
- import { StableEditorScrollState } from 'vs/editor/browser/core/editorState';
-+=======
-+import { Position } from 'vs/editor/common/core/position';
-+import { Selection } from 'vs/editor/common/core/selection';
-+import { InlineDecoration } from 'vs/editor/common/viewModel/viewModel';
-+>>>>>>> .their
- 
- interface IEditorDiffDecorations {
- 	decorations: IModelDeltaDecoration[];
-@@ -400,6 +406,7 @@
- 		this._containerDomElement.appendChild(this._modifiedDomNode);
- 	}
- 
-+<<<<<<< .our
- 	private _createLeftHandSideEditor(options: editorOptions.IDiffEditorOptions, instantiationService: IInstantiationService): void {
- 		this.originalEditor = this._createInnerEditor(instantiationService, this._originalDomNode, this._adjustOptionsForLeftHandSide(options, this._originalIsEditable));
- 
-@@ -470,6 +477,26 @@
- 
- 	protected _createInnerEditor(instantiationService: IInstantiationService, container: HTMLElement, options: editorOptions.IEditorOptions): CodeEditorWidget {
- 		return instantiationService.createInstance(CodeEditorWidget, container, options, {});
-+=======
-+	private _createLeftHandSideEditor(options: editorCommon.IDiffEditorOptions, instantiationService: IInstantiationService): void {
-+		this.originalEditor = this._createInnerEditor(instantiationService, this._originalDomNode, this._adjustOptionsForLeftHandSide(options, this._originalIsEditable));
-+		this._toDispose.push(this.originalEditor.addBulkListener2((events) => this._onOriginalEditorEvents(events)));
-+		this._toDispose.push(this.addEmitter2(this.originalEditor));
-+	}
-+
-+	private _createRightHandSideEditor(options: editorCommon.IDiffEditorOptions, instantiationService: IInstantiationService): void {
-+		this.modifiedEditor = this._createInnerEditor(instantiationService, this._modifiedDomNode, this._adjustOptionsForRightHandSide(options));
-+		this._toDispose.push(this.modifiedEditor.addBulkListener2((events) => this._onModifiedEditorEvents(events)));
-+		this._toDispose.push(this.addEmitter2(this.modifiedEditor));
-+	}
-+
-+	protected _createInnerEditor(instantiationService: IInstantiationService, container: HTMLElement, options: editorCommon.IEditorOptions): CodeEditor {
-+		return instantiationService.createInstance(CodeEditor, container, options);
-+	}
-+
-+	public destroy(): void {
-+		this.dispose();
-+>>>>>>> .their
- 	}
- 
- 	public dispose(): void {
-@@ -716,12 +743,17 @@
- 		this.modifiedEditor.revealRangeInCenter(range, scrollType);
- 	}
- 
-+<<<<<<< .our
- 	public revealRangeInCenterIfOutsideViewport(range: IRange, scrollType: editorCommon.ScrollType = editorCommon.ScrollType.Smooth): void {
- 		this.modifiedEditor.revealRangeInCenterIfOutsideViewport(range, scrollType);
- 	}
- 
- 	public revealRangeAtTop(range: IRange, scrollType: editorCommon.ScrollType = editorCommon.ScrollType.Smooth): void {
- 		this.modifiedEditor.revealRangeAtTop(range, scrollType);
-+=======
-+	public getActions(): editorCommon.IEditorAction[] {
-+		return this.modifiedEditor.getActions();
-+>>>>>>> .their
- 	}
- 
- 	public getSupportedActions(): editorCommon.IEditorAction[] {
-@@ -952,7 +984,11 @@
- 		return clonedOptions;
- 	}
- 
-+<<<<<<< .our
- 	private _adjustOptionsForLeftHandSide(options: editorOptions.IDiffEditorOptions, isEditable: boolean): editorOptions.IEditorOptions {
-+=======
-+	private _adjustOptionsForLeftHandSide(options: editorCommon.IDiffEditorOptions, isEditable: boolean): editorCommon.IEditorOptions {
-+>>>>>>> .their
- 		let result = this._adjustOptionsForSubEditor(options);
- 		result.readOnly = !isEditable;
- 		result.overviewRulerLanes = 1;
-@@ -960,7 +996,11 @@
- 		return result;
- 	}
- 
-+<<<<<<< .our
- 	private _adjustOptionsForRightHandSide(options: editorOptions.IDiffEditorOptions): editorOptions.IEditorOptions {
-+=======
-+	private _adjustOptionsForRightHandSide(options: editorCommon.IDiffEditorOptions): editorCommon.IEditorOptions {
-+>>>>>>> .their
- 		let result = this._adjustOptionsForSubEditor(options);
- 		result.revealHorizontalRightPadding = editorOptions.EDITOR_DEFAULTS.viewInfo.revealHorizontalRightPadding + DiffEditorWidget.ENTIRE_DIFF_OVERVIEW_WIDTH;
- 		result.scrollbar.verticalHasArrows = false;
-removed in local
-  base   100644 d4dec32f0ff442708d4f0405fc60338b6707772b src/vs/editor/common/commonCodeEditor.ts
-  their  100644 cd57a84f5f07c427bd2e3ff0032fd8e47e519780 src/vs/editor/common/commonCodeEditor.ts
-changed in both
-  base   100644 0d5b7e24f8de071d307abed95224e42ed488a469 src/vs/editor/common/editorAction.ts
-  our    100644 575781a80d996448822550e4c904633ef4da23fe src/vs/editor/common/editorAction.ts
-  their  100644 b507e50a5cd313273fd40c6af360952bab6021a0 src/vs/editor/common/editorAction.ts
-@@ -43,7 +43,11 @@
- 			return TPromise.as(void 0);
- 		}
- 
-+<<<<<<< .our
- 		const r = this._run();
- 		return r ? r : TPromise.as(void 0);
-+=======
-+		return TPromise.as(this._run());
-+>>>>>>> .their
- 	}
- }
-changed in both
-  base   100644 441a48481099f749878415cf37751d792450ccda src/vs/editor/common/editorCommon.ts
-  our    100644 8ab17ce6977a746a13f9fe016e9948d332de49ca src/vs/editor/common/editorCommon.ts
-  their  100644 1238d01366e29caebe5df1d480f764b68db9506b src/vs/editor/common/editorCommon.ts
-@@ -94,7 +94,3003 @@
-  */
- export interface IDiffEditorModel {
- 	/**
-+<<<<<<< .our
- 	 * Original model.
-+=======
-+	 * @internal
-+	 */
-+	public clone(): EditorWrappingInfo {
-+		return new EditorWrappingInfo(this);
-+	}
-+}
-+
-+export class InternalEditorViewOptions {
-+	readonly _internalEditorViewOptionsBrand: void;
-+
-+	readonly theme: string;
-+	readonly canUseTranslate3d: boolean;
-+	readonly disableMonospaceOptimizations: boolean;
-+	readonly experimentalScreenReader: boolean;
-+	readonly rulers: number[];
-+	readonly ariaLabel: string;
-+	readonly renderLineNumbers: boolean;
-+	readonly renderCustomLineNumbers: (lineNumber: number) => string;
-+	readonly renderRelativeLineNumbers: boolean;
-+	readonly selectOnLineNumbers: boolean;
-+	readonly glyphMargin: boolean;
-+	readonly revealHorizontalRightPadding: number;
-+	readonly roundedSelection: boolean;
-+	readonly overviewRulerLanes: number;
-+	readonly cursorBlinking: TextEditorCursorBlinkingStyle;
-+	readonly mouseWheelZoom: boolean;
-+	readonly cursorStyle: TextEditorCursorStyle;
-+	readonly hideCursorInOverviewRuler: boolean;
-+	readonly scrollBeyondLastLine: boolean;
-+	readonly editorClassName: string;
-+	readonly stopRenderingLineAfter: number;
-+	readonly renderWhitespace: 'none' | 'boundary' | 'all';
-+	readonly renderControlCharacters: boolean;
-+	readonly renderIndentGuides: boolean;
-+	readonly renderLineHighlight: 'none' | 'gutter' | 'line' | 'all';
-+	readonly scrollbar: InternalEditorScrollbarOptions;
-+	readonly fixedOverflowWidgets: boolean;
-+
-+	/**
-+	 * @internal
-+	 */
-+	constructor(source: {
-+		theme: string;
-+		canUseTranslate3d: boolean;
-+		disableMonospaceOptimizations: boolean;
-+		experimentalScreenReader: boolean;
-+		rulers: number[];
-+		ariaLabel: string;
-+		renderLineNumbers: boolean;
-+		renderCustomLineNumbers: (lineNumber: number) => string;
-+		renderRelativeLineNumbers: boolean;
-+		selectOnLineNumbers: boolean;
-+		glyphMargin: boolean;
-+		revealHorizontalRightPadding: number;
-+		roundedSelection: boolean;
-+		overviewRulerLanes: number;
-+		cursorBlinking: TextEditorCursorBlinkingStyle;
-+		mouseWheelZoom: boolean;
-+		cursorStyle: TextEditorCursorStyle;
-+		hideCursorInOverviewRuler: boolean;
-+		scrollBeyondLastLine: boolean;
-+		editorClassName: string;
-+		stopRenderingLineAfter: number;
-+		renderWhitespace: 'none' | 'boundary' | 'all';
-+		renderControlCharacters: boolean;
-+		renderIndentGuides: boolean;
-+		renderLineHighlight: 'none' | 'gutter' | 'line' | 'all';
-+		scrollbar: InternalEditorScrollbarOptions;
-+		fixedOverflowWidgets: boolean;
-+	}) {
-+		this.theme = String(source.theme);
-+		this.canUseTranslate3d = Boolean(source.canUseTranslate3d);
-+		this.disableMonospaceOptimizations = Boolean(source.disableMonospaceOptimizations);
-+		this.experimentalScreenReader = Boolean(source.experimentalScreenReader);
-+		this.rulers = InternalEditorViewOptions._toSortedIntegerArray(source.rulers);
-+		this.ariaLabel = String(source.ariaLabel);
-+		this.renderLineNumbers = Boolean(source.renderLineNumbers);
-+		this.renderCustomLineNumbers = source.renderCustomLineNumbers;
-+		this.renderRelativeLineNumbers = Boolean(source.renderRelativeLineNumbers);
-+		this.selectOnLineNumbers = Boolean(source.selectOnLineNumbers);
-+		this.glyphMargin = Boolean(source.glyphMargin);
-+		this.revealHorizontalRightPadding = source.revealHorizontalRightPadding | 0;
-+		this.roundedSelection = Boolean(source.roundedSelection);
-+		this.overviewRulerLanes = source.overviewRulerLanes | 0;
-+		this.cursorBlinking = source.cursorBlinking | 0;
-+		this.mouseWheelZoom = Boolean(source.mouseWheelZoom);
-+		this.cursorStyle = source.cursorStyle | 0;
-+		this.hideCursorInOverviewRuler = Boolean(source.hideCursorInOverviewRuler);
-+		this.scrollBeyondLastLine = Boolean(source.scrollBeyondLastLine);
-+		this.editorClassName = String(source.editorClassName);
-+		this.stopRenderingLineAfter = source.stopRenderingLineAfter | 0;
-+		this.renderWhitespace = source.renderWhitespace;
-+		this.renderControlCharacters = Boolean(source.renderControlCharacters);
-+		this.renderIndentGuides = Boolean(source.renderIndentGuides);
-+		this.renderLineHighlight = source.renderLineHighlight;
-+		this.scrollbar = source.scrollbar.clone();
-+		this.fixedOverflowWidgets = Boolean(source.fixedOverflowWidgets);
-+	}
-+
-+	private static _toSortedIntegerArray(source: any): number[] {
-+		if (!Array.isArray(source)) {
-+			return [];
-+		}
-+		let arrSource = <any[]>source;
-+		let result = arrSource.map(el => {
-+			let r = parseInt(el, 10);
-+			if (isNaN(r)) {
-+				return 0;
-+			}
-+			return r;
-+		});
-+		result.sort();
-+		return result;
-+	}
-+
-+	private static _numberArraysEqual(a: number[], b: number[]): boolean {
-+		if (a.length !== b.length) {
-+			return false;
-+		}
-+		for (let i = 0; i < a.length; i++) {
-+			if (a[i] !== b[i]) {
-+				return false;
-+			}
-+		}
-+		return true;
-+	}
-+
-+	/**
-+	 * @internal
-+	 */
-+	public equals(other: InternalEditorViewOptions): boolean {
-+		return (
-+			this.theme === other.theme
-+			&& this.canUseTranslate3d === other.canUseTranslate3d
-+			&& this.disableMonospaceOptimizations === other.disableMonospaceOptimizations
-+			&& this.experimentalScreenReader === other.experimentalScreenReader
-+			&& InternalEditorViewOptions._numberArraysEqual(this.rulers, other.rulers)
-+			&& this.ariaLabel === other.ariaLabel
-+			&& this.renderLineNumbers === other.renderLineNumbers
-+			&& this.renderCustomLineNumbers === other.renderCustomLineNumbers
-+			&& this.renderRelativeLineNumbers === other.renderRelativeLineNumbers
-+			&& this.selectOnLineNumbers === other.selectOnLineNumbers
-+			&& this.glyphMargin === other.glyphMargin
-+			&& this.revealHorizontalRightPadding === other.revealHorizontalRightPadding
-+			&& this.roundedSelection === other.roundedSelection
-+			&& this.overviewRulerLanes === other.overviewRulerLanes
-+			&& this.cursorBlinking === other.cursorBlinking
-+			&& this.mouseWheelZoom === other.mouseWheelZoom
-+			&& this.cursorStyle === other.cursorStyle
-+			&& this.hideCursorInOverviewRuler === other.hideCursorInOverviewRuler
-+			&& this.scrollBeyondLastLine === other.scrollBeyondLastLine
-+			&& this.editorClassName === other.editorClassName
-+			&& this.stopRenderingLineAfter === other.stopRenderingLineAfter
-+			&& this.renderWhitespace === other.renderWhitespace
-+			&& this.renderControlCharacters === other.renderControlCharacters
-+			&& this.renderIndentGuides === other.renderIndentGuides
-+			&& this.renderLineHighlight === other.renderLineHighlight
-+			&& this.scrollbar.equals(other.scrollbar)
-+			&& this.fixedOverflowWidgets === other.fixedOverflowWidgets
-+		);
-+	}
-+
-+	/**
-+	 * @internal
-+	 */
-+	public createChangeEvent(newOpts: InternalEditorViewOptions): IViewConfigurationChangedEvent {
-+		return {
-+			theme: this.theme !== newOpts.theme,
-+			canUseTranslate3d: this.canUseTranslate3d !== newOpts.canUseTranslate3d,
-+			disableMonospaceOptimizations: this.disableMonospaceOptimizations !== newOpts.disableMonospaceOptimizations,
-+			experimentalScreenReader: this.experimentalScreenReader !== newOpts.experimentalScreenReader,
-+			rulers: (!InternalEditorViewOptions._numberArraysEqual(this.rulers, newOpts.rulers)),
-+			ariaLabel: this.ariaLabel !== newOpts.ariaLabel,
-+			renderLineNumbers: this.renderLineNumbers !== newOpts.renderLineNumbers,
-+			renderCustomLineNumbers: this.renderCustomLineNumbers !== newOpts.renderCustomLineNumbers,
-+			renderRelativeLineNumbers: this.renderRelativeLineNumbers !== newOpts.renderRelativeLineNumbers,
-+			selectOnLineNumbers: this.selectOnLineNumbers !== newOpts.selectOnLineNumbers,
-+			glyphMargin: this.glyphMargin !== newOpts.glyphMargin,
-+			revealHorizontalRightPadding: this.revealHorizontalRightPadding !== newOpts.revealHorizontalRightPadding,
-+			roundedSelection: this.roundedSelection !== newOpts.roundedSelection,
-+			overviewRulerLanes: this.overviewRulerLanes !== newOpts.overviewRulerLanes,
-+			cursorBlinking: this.cursorBlinking !== newOpts.cursorBlinking,
-+			mouseWheelZoom: this.mouseWheelZoom !== newOpts.mouseWheelZoom,
-+			cursorStyle: this.cursorStyle !== newOpts.cursorStyle,
-+			hideCursorInOverviewRuler: this.hideCursorInOverviewRuler !== newOpts.hideCursorInOverviewRuler,
-+			scrollBeyondLastLine: this.scrollBeyondLastLine !== newOpts.scrollBeyondLastLine,
-+			editorClassName: this.editorClassName !== newOpts.editorClassName,
-+			stopRenderingLineAfter: this.stopRenderingLineAfter !== newOpts.stopRenderingLineAfter,
-+			renderWhitespace: this.renderWhitespace !== newOpts.renderWhitespace,
-+			renderControlCharacters: this.renderControlCharacters !== newOpts.renderControlCharacters,
-+			renderIndentGuides: this.renderIndentGuides !== newOpts.renderIndentGuides,
-+			renderLineHighlight: this.renderLineHighlight !== newOpts.renderLineHighlight,
-+			scrollbar: (!this.scrollbar.equals(newOpts.scrollbar)),
-+			fixedOverflowWidgets: this.fixedOverflowWidgets !== newOpts.fixedOverflowWidgets
-+		};
-+	}
-+
-+	/**
-+	 * @internal
-+	 */
-+	public clone(): InternalEditorViewOptions {
-+		return new InternalEditorViewOptions(this);
-+	}
-+}
-+
-+export interface IViewConfigurationChangedEvent {
-+	readonly theme: boolean;
-+	readonly canUseTranslate3d: boolean;
-+	readonly disableMonospaceOptimizations: boolean;
-+	readonly experimentalScreenReader: boolean;
-+	readonly rulers: boolean;
-+	readonly ariaLabel: boolean;
-+	readonly renderLineNumbers: boolean;
-+	readonly renderCustomLineNumbers: boolean;
-+	readonly renderRelativeLineNumbers: boolean;
-+	readonly selectOnLineNumbers: boolean;
-+	readonly glyphMargin: boolean;
-+	readonly revealHorizontalRightPadding: boolean;
-+	readonly roundedSelection: boolean;
-+	readonly overviewRulerLanes: boolean;
-+	readonly cursorBlinking: boolean;
-+	readonly mouseWheelZoom: boolean;
-+	readonly cursorStyle: boolean;
-+	readonly hideCursorInOverviewRuler: boolean;
-+	readonly scrollBeyondLastLine: boolean;
-+	readonly editorClassName: boolean;
-+	readonly stopRenderingLineAfter: boolean;
-+	readonly renderWhitespace: boolean;
-+	readonly renderControlCharacters: boolean;
-+	readonly renderIndentGuides: boolean;
-+	readonly renderLineHighlight: boolean;
-+	readonly scrollbar: boolean;
-+	readonly fixedOverflowWidgets: boolean;
-+}
-+
-+export class EditorContribOptions {
-+	readonly selectionClipboard: boolean;
-+	readonly hover: boolean;
-+	readonly contextmenu: boolean;
-+	readonly quickSuggestions: boolean;
-+	readonly quickSuggestionsDelay: number;
-+	readonly parameterHints: boolean;
-+	readonly iconsInSuggestions: boolean;
-+	readonly formatOnType: boolean;
-+	readonly formatOnPaste: boolean;
-+	readonly suggestOnTriggerCharacters: boolean;
-+	readonly acceptSuggestionOnEnter: boolean;
-+	readonly acceptSuggestionOnCommitCharacter: boolean;
-+	readonly snippetSuggestions: 'top' | 'bottom' | 'inline' | 'none';
-+	readonly emptySelectionClipboard: boolean;
-+	readonly tabCompletion: boolean;
-+	readonly wordBasedSuggestions: boolean;
-+	readonly suggestFontSize: number;
-+	readonly suggestLineHeight: number;
-+	readonly selectionHighlight: boolean;
-+	readonly codeLens: boolean;
-+	readonly folding: boolean;
-+
-+	/**
-+	 * @internal
-+	 */
-+	constructor(source: {
-+		selectionClipboard: boolean;
-+		hover: boolean;
-+		contextmenu: boolean;
-+		quickSuggestions: boolean;
-+		quickSuggestionsDelay: number;
-+		parameterHints: boolean;
-+		iconsInSuggestions: boolean;
-+		formatOnType: boolean;
-+		formatOnPaste: boolean;
-+		suggestOnTriggerCharacters: boolean;
-+		acceptSuggestionOnEnter: boolean;
-+		acceptSuggestionOnCommitCharacter: boolean;
-+		snippetSuggestions: 'top' | 'bottom' | 'inline' | 'none';
-+		emptySelectionClipboard: boolean;
-+		tabCompletion: boolean;
-+		wordBasedSuggestions: boolean;
-+		suggestFontSize: number;
-+		suggestLineHeight: number;
-+		selectionHighlight: boolean;
-+		codeLens: boolean;
-+		folding: boolean;
-+	}) {
-+		this.selectionClipboard = Boolean(source.selectionClipboard);
-+		this.hover = Boolean(source.hover);
-+		this.contextmenu = Boolean(source.contextmenu);
-+		this.quickSuggestions = Boolean(source.quickSuggestions);
-+		this.quickSuggestionsDelay = source.quickSuggestionsDelay || 0;
-+		this.parameterHints = Boolean(source.parameterHints);
-+		this.iconsInSuggestions = Boolean(source.iconsInSuggestions);
-+		this.formatOnType = Boolean(source.formatOnType);
-+		this.formatOnPaste = Boolean(source.formatOnPaste);
-+		this.suggestOnTriggerCharacters = Boolean(source.suggestOnTriggerCharacters);
-+		this.acceptSuggestionOnEnter = Boolean(source.acceptSuggestionOnEnter);
-+		this.acceptSuggestionOnCommitCharacter = Boolean(source.acceptSuggestionOnCommitCharacter);
-+		this.snippetSuggestions = source.snippetSuggestions;
-+		this.emptySelectionClipboard = source.emptySelectionClipboard;
-+		this.tabCompletion = source.tabCompletion;
-+		this.wordBasedSuggestions = source.wordBasedSuggestions;
-+		this.suggestFontSize = source.suggestFontSize;
-+		this.suggestLineHeight = source.suggestLineHeight;
-+		this.selectionHighlight = Boolean(source.selectionHighlight);
-+		this.codeLens = Boolean(source.codeLens);
-+		this.folding = Boolean(source.folding);
-+	}
-+
-+	/**
-+	 * @internal
-+	 */
-+	public equals(other: EditorContribOptions): boolean {
-+		return (
-+			this.selectionClipboard === other.selectionClipboard
-+			&& this.hover === other.hover
-+			&& this.contextmenu === other.contextmenu
-+			&& this.quickSuggestions === other.quickSuggestions
-+			&& this.quickSuggestionsDelay === other.quickSuggestionsDelay
-+			&& this.parameterHints === other.parameterHints
-+			&& this.iconsInSuggestions === other.iconsInSuggestions
-+			&& this.formatOnType === other.formatOnType
-+			&& this.formatOnPaste === other.formatOnPaste
-+			&& this.suggestOnTriggerCharacters === other.suggestOnTriggerCharacters
-+			&& this.acceptSuggestionOnEnter === other.acceptSuggestionOnEnter
-+			&& this.acceptSuggestionOnCommitCharacter === other.acceptSuggestionOnCommitCharacter
-+			&& this.snippetSuggestions === other.snippetSuggestions
-+			&& this.emptySelectionClipboard === other.emptySelectionClipboard
-+			&& this.tabCompletion === other.tabCompletion
-+			&& this.wordBasedSuggestions === other.wordBasedSuggestions
-+			&& this.suggestFontSize === other.suggestFontSize
-+			&& this.suggestLineHeight === other.suggestLineHeight
-+			&& this.selectionHighlight === other.selectionHighlight
-+			&& this.codeLens === other.codeLens
-+			&& this.folding === other.folding
-+		);
-+	}
-+
-+	/**
-+	 * @internal
-+	 */
-+	public clone(): EditorContribOptions {
-+		return new EditorContribOptions(this);
-+	}
-+}
-+
-+/**
-+ * Internal configuration options (transformed or computed) for the editor.
-+ */
-+export class InternalEditorOptions {
-+	readonly _internalEditorOptionsBrand: void;
-+
-+	readonly lineHeight: number; // todo: move to fontInfo
-+
-+	readonly readOnly: boolean;
-+	// ---- cursor options
-+	readonly wordSeparators: string;
-+	readonly autoClosingBrackets: boolean;
-+	readonly useTabStops: boolean;
-+	readonly tabFocusMode: boolean;
-+	// ---- grouped options
-+	readonly layoutInfo: EditorLayoutInfo;
-+	readonly fontInfo: FontInfo;
-+	readonly viewInfo: InternalEditorViewOptions;
-+	readonly wrappingInfo: EditorWrappingInfo;
-+	readonly contribInfo: EditorContribOptions;
-+
-+	/**
-+	 * @internal
-+	 */
-+	constructor(source: {
-+		lineHeight: number;
-+		readOnly: boolean;
-+		wordSeparators: string;
-+		autoClosingBrackets: boolean;
-+		useTabStops: boolean;
-+		tabFocusMode: boolean;
-+		layoutInfo: EditorLayoutInfo;
-+		fontInfo: FontInfo;
-+		viewInfo: InternalEditorViewOptions;
-+		wrappingInfo: EditorWrappingInfo;
-+		contribInfo: EditorContribOptions;
-+	}) {
-+		this.lineHeight = source.lineHeight | 0;
-+		this.readOnly = Boolean(source.readOnly);
-+		this.wordSeparators = String(source.wordSeparators);
-+		this.autoClosingBrackets = Boolean(source.autoClosingBrackets);
-+		this.useTabStops = Boolean(source.useTabStops);
-+		this.tabFocusMode = Boolean(source.tabFocusMode);
-+		this.layoutInfo = source.layoutInfo.clone();
-+		this.fontInfo = source.fontInfo.clone();
-+		this.viewInfo = source.viewInfo.clone();
-+		this.wrappingInfo = source.wrappingInfo.clone();
-+		this.contribInfo = source.contribInfo.clone();
-+	}
-+
-+	/**
-+	 * @internal
-+	 */
-+	public equals(other: InternalEditorOptions): boolean {
-+		return (
-+			this.lineHeight === other.lineHeight
-+			&& this.readOnly === other.readOnly
-+			&& this.wordSeparators === other.wordSeparators
-+			&& this.autoClosingBrackets === other.autoClosingBrackets
-+			&& this.useTabStops === other.useTabStops
-+			&& this.tabFocusMode === other.tabFocusMode
-+			&& this.layoutInfo.equals(other.layoutInfo)
-+			&& this.fontInfo.equals(other.fontInfo)
-+			&& this.viewInfo.equals(other.viewInfo)
-+			&& this.wrappingInfo.equals(other.wrappingInfo)
-+			&& this.contribInfo.equals(other.contribInfo)
-+		);
-+	}
-+
-+	/**
-+	 * @internal
-+	 */
-+	public createChangeEvent(newOpts: InternalEditorOptions): IConfigurationChangedEvent {
-+		return {
-+			lineHeight: (this.lineHeight !== newOpts.lineHeight),
-+			readOnly: (this.readOnly !== newOpts.readOnly),
-+			wordSeparators: (this.wordSeparators !== newOpts.wordSeparators),
-+			autoClosingBrackets: (this.autoClosingBrackets !== newOpts.autoClosingBrackets),
-+			useTabStops: (this.useTabStops !== newOpts.useTabStops),
-+			tabFocusMode: (this.tabFocusMode !== newOpts.tabFocusMode),
-+			layoutInfo: (!this.layoutInfo.equals(newOpts.layoutInfo)),
-+			fontInfo: (!this.fontInfo.equals(newOpts.fontInfo)),
-+			viewInfo: this.viewInfo.createChangeEvent(newOpts.viewInfo),
-+			wrappingInfo: (!this.wrappingInfo.equals(newOpts.wrappingInfo)),
-+			contribInfo: (!this.contribInfo.equals(newOpts.contribInfo)),
-+		};
-+	}
-+
-+	/**
-+	 * @internal
-+	 */
-+	public clone(): InternalEditorOptions {
-+		return new InternalEditorOptions(this);
-+	}
-+}
-+
-+/**
-+ * An event describing that the configuration of the editor has changed.
-+ */
-+export interface IConfigurationChangedEvent {
-+	readonly lineHeight: boolean;
-+	readonly readOnly: boolean;
-+	readonly wordSeparators: boolean;
-+	readonly autoClosingBrackets: boolean;
-+	readonly useTabStops: boolean;
-+	readonly tabFocusMode: boolean;
-+	readonly layoutInfo: boolean;
-+	readonly fontInfo: boolean;
-+	readonly viewInfo: IViewConfigurationChangedEvent;
-+	readonly wrappingInfo: boolean;
-+	readonly contribInfo: boolean;
-+}
-+
-+/**
-+ * Vertical Lane in the overview ruler of the editor.
-+ */
-+export enum OverviewRulerLane {
-+	Left = 1,
-+	Center = 2,
-+	Right = 4,
-+	Full = 7
-+}
-+
-+/**
-+ * Options for rendering a model decoration in the overview ruler.
-+ */
-+export interface IModelDecorationOverviewRulerOptions {
-+	/**
-+	 * CSS color to render in the overview ruler.
-+	 * e.g.: rgba(100, 100, 100, 0.5)
-+	 */
-+	color: string;
-+	/**
-+	 * CSS color to render in the overview ruler.
-+	 * e.g.: rgba(100, 100, 100, 0.5)
-+	 */
-+	darkColor: string;
-+	/**
-+	 * The position in the overview ruler.
-+	 */
-+	position: OverviewRulerLane;
-+}
-+
-+/**
-+ * Options for a model decoration.
-+ */
-+export interface IModelDecorationOptions {
-+	/**
-+	 * Customize the growing behaviour of the decoration when typing at the edges of the decoration.
-+	 * Defaults to TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges
-+	 */
-+	stickiness?: TrackedRangeStickiness;
-+	/**
-+	 * CSS class name describing the decoration.
-+	 */
-+	className?: string;
-+	/**
-+	 * Message to be rendered when hovering over the glyph margin decoration.
-+	 */
-+	glyphMarginHoverMessage?: MarkedString | MarkedString[];
-+	/**
-+	 * Array of MarkedString to render as the decoration message.
-+	 */
-+	hoverMessage?: MarkedString | MarkedString[];
-+	/**
-+	 * Should the decoration expand to encompass a whole line.
-+	 */
-+	isWholeLine?: boolean;
-+	/**
-+	 * @deprecated : Use `overviewRuler` instead
-+	 */
-+	showInOverviewRuler?: string;
-+	/**
-+	 * If set, render this decoration in the overview ruler.
-+	 */
-+	overviewRuler?: IModelDecorationOverviewRulerOptions;
-+	/**
-+	 * If set, the decoration will be rendered in the glyph margin with this CSS class name.
-+	 */
-+	glyphMarginClassName?: string;
-+	/**
-+	 * If set, the decoration will be rendered in the lines decorations with this CSS class name.
-+	 */
-+	linesDecorationsClassName?: string;
-+	/**
-+	 * If set, the decoration will be rendered in the margin (covering its full width) with this CSS class name.
-+	 */
-+	marginClassName?: string;
-+	/**
-+	 * If set, the decoration will be rendered inline with the text with this CSS class name.
-+	 * Please use this only for CSS rules that must impact the text. For example, use `className`
-+	 * to have a background color decoration.
-+	 */
-+	inlineClassName?: string;
-+	/**
-+	 * If set, the decoration will be rendered before the text with this CSS class name.
-+	 */
-+	beforeContentClassName?: string;
-+	/**
-+	 * If set, the decoration will be rendered after the text with this CSS class name.
-+	 */
-+	afterContentClassName?: string;
-+}
-+
-+/**
-+ * New model decorations.
-+ */
-+export interface IModelDeltaDecoration {
-+	/**
-+	 * Range that this decoration covers.
-+	 */
-+	range: IRange;
-+	/**
-+	 * Options associated with this decoration.
-+	 */
-+	options: IModelDecorationOptions;
-+}
-+
-+/**
-+ * A decoration in the model.
-+ */
-+export interface IModelDecoration {
-+	/**
-+	 * Identifier for a decoration.
-+	 */
-+	readonly id: string;
-+	/**
-+	 * Identifier for a decoration's owener.
-+	 */
-+	readonly ownerId: number;
-+	/**
-+	 * Range that this decoration covers.
-+	 */
-+	readonly range: Range;
-+	/**
-+	 * Options associated with this decoration.
-+	 */
-+	readonly options: IModelDecorationOptions;
-+	/**
-+	 * A flag describing if this is a problem decoration (e.g. warning/error).
-+	 */
-+	readonly isForValidation: boolean;
-+}
-+
-+/**
-+ * An accessor that can add, change or remove model decorations.
-+ * @internal
-+ */
-+export interface IModelDecorationsChangeAccessor {
-+	/**
-+	 * Add a new decoration.
-+	 * @param range Range that this decoration covers.
-+	 * @param options Options associated with this decoration.
-+	 * @return An unique identifier associated with this decoration.
-+	 */
-+	addDecoration(range: IRange, options: IModelDecorationOptions): string;
-+	/**
-+	 * Change the range that an existing decoration covers.
-+	 * @param id The unique identifier associated with the decoration.
-+	 * @param newRange The new range that this decoration covers.
-+	 */
-+	changeDecoration(id: string, newRange: IRange): void;
-+	/**
-+	 * Change the options associated with an existing decoration.
-+	 * @param id The unique identifier associated with the decoration.
-+	 * @param newOptions The new options associated with this decoration.
-+	 */
-+	changeDecorationOptions(id: string, newOptions: IModelDecorationOptions): void;
-+	/**
-+	 * Remove an existing decoration.
-+	 * @param id The unique identifier associated with the decoration.
-+	 */
-+	removeDecoration(id: string): void;
-+	/**
-+	 * Perform a minimum ammount of operations, in order to transform the decorations
-+	 * identified by `oldDecorations` to the decorations described by `newDecorations`
-+	 * and returns the new identifiers associated with the resulting decorations.
-+	 *
-+	 * @param oldDecorations Array containing previous decorations identifiers.
-+	 * @param newDecorations Array describing what decorations should result after the call.
-+	 * @return An array containing the new decorations identifiers.
-+	 */
-+	deltaDecorations(oldDecorations: string[], newDecorations: IModelDeltaDecoration[]): string[];
-+}
-+
-+/**
-+ * Word inside a model.
-+ */
-+export interface IWordAtPosition {
-+	/**
-+	 * The word.
-+	 */
-+	readonly word: string;
-+	/**
-+	 * The column where the word starts.
-+	 */
-+	readonly startColumn: number;
-+	/**
-+	 * The column where the word ends.
-+	 */
-+	readonly endColumn: number;
-+}
-+
-+/**
-+ * Range of a word inside a model.
-+ * @internal
-+ */
-+export interface IWordRange {
-+	/**
-+	 * The index where the word starts.
-+	 */
-+	readonly start: number;
-+	/**
-+	 * The index where the word ends.
-+	 */
-+	readonly end: number;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface ITokenInfo {
-+	readonly type: StandardTokenType;
-+	readonly lineNumber: number;
-+	readonly startColumn: number;
-+	readonly endColumn: number;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface ITokenIterator {
-+	hasNext(): boolean;
-+	next(): ITokenInfo;
-+	hasPrev(): boolean;
-+	prev(): ITokenInfo;
-+}
-+
-+/**
-+ * End of line character preference.
-+ */
-+export enum EndOfLinePreference {
-+	/**
-+	 * Use the end of line character identified in the text buffer.
-+	 */
-+	TextDefined = 0,
-+	/**
-+	 * Use line feed (\n) as the end of line character.
-+	 */
-+	LF = 1,
-+	/**
-+	 * Use carriage return and line feed (\r\n) as the end of line character.
-+	 */
-+	CRLF = 2
-+}
-+
-+/**
-+ * The default end of line to use when instantiating models.
-+ */
-+export enum DefaultEndOfLine {
-+	/**
-+	 * Use line feed (\n) as the end of line character.
-+	 */
-+	LF = 1,
-+	/**
-+	 * Use carriage return and line feed (\r\n) as the end of line character.
-+	 */
-+	CRLF = 2
-+}
-+
-+/**
-+ * End of line character preference.
-+ */
-+export enum EndOfLineSequence {
-+	/**
-+	 * Use line feed (\n) as the end of line character.
-+	 */
-+	LF = 0,
-+	/**
-+	 * Use carriage return and line feed (\r\n) as the end of line character.
-+	 */
-+	CRLF = 1
-+}
-+
-+/**
-+ * An identifier for a single edit operation.
-+ */
-+export interface ISingleEditOperationIdentifier {
-+	/**
-+	 * Identifier major
-+	 */
-+	major: number;
-+	/**
-+	 * Identifier minor
-+	 */
-+	minor: number;
-+}
-+
-+/**
-+ * A builder and helper for edit operations for a command.
-+ */
-+export interface IEditOperationBuilder {
-+	/**
-+	 * Add a new edit operation (a replace operation).
-+	 * @param range The range to replace (delete). May be empty to represent a simple insert.
-+	 * @param text The text to replace with. May be null to represent a simple delete.
-+	 */
-+	addEditOperation(range: Range, text: string): void;
-+
-+	/**
-+	 * Track `selection` when applying edit operations.
-+	 * A best effort will be made to not grow/expand the selection.
-+	 * An empty selection will clamp to a nearby character.
-+	 * @param selection The selection to track.
-+	 * @param trackPreviousOnEmpty If set, and the selection is empty, indicates whether the selection
-+	 *           should clamp to the previous or the next character.
-+	 * @return A unique identifer.
-+	 */
-+	trackSelection(selection: Selection, trackPreviousOnEmpty?: boolean): string;
-+}
-+
-+/**
-+ * A helper for computing cursor state after a command.
-+ */
-+export interface ICursorStateComputerData {
-+	/**
-+	 * Get the inverse edit operations of the added edit operations.
-+	 */
-+	getInverseEditOperations(): IIdentifiedSingleEditOperation[];
-+	/**
-+	 * Get a previously tracked selection.
-+	 * @param id The unique identifier returned by `trackSelection`.
-+	 * @return The selection.
-+	 */
-+	getTrackedSelection(id: string): Selection;
-+}
-+
-+/**
-+ * A command that modifies text / cursor state on a model.
-+ */
-+export interface ICommand {
-+	/**
-+	 * Get the edit operations needed to execute this command.
-+	 * @param model The model the command will execute on.
-+	 * @param builder A helper to collect the needed edit operations and to track selections.
-+	 */
-+	getEditOperations(model: ITokenizedModel, builder: IEditOperationBuilder): void;
-+	/**
-+	 * Compute the cursor state after the edit operations were applied.
-+	 * @param model The model the commad has executed on.
-+	 * @param helper A helper to get inverse edit operations and to get previously tracked selections.
-+	 * @return The cursor state after the command executed.
-+	 */
-+	computeCursorState(model: ITokenizedModel, helper: ICursorStateComputerData): Selection;
-+}
-+
-+/**
-+ * A single edit operation, that acts as a simple replace.
-+ * i.e. Replace text at `range` with `text` in model.
-+ */
-+export interface ISingleEditOperation {
-+	/**
-+	 * The range to replace. This can be empty to emulate a simple insert.
-+	 */
-+	range: IRange;
-+	/**
-+	 * The text to replace with. This can be null to emulate a simple delete.
-+	 */
-+	text: string;
-+	/**
-+	 * This indicates that this operation has "insert" semantics.
-+	 * i.e. forceMoveMarkers = true => if `range` is collapsed, all markers at the position will be moved.
-+	 */
-+	forceMoveMarkers?: boolean;
-+}
-+
-+/**
-+ * A single edit operation, that has an identifier.
-+ */
-+export interface IIdentifiedSingleEditOperation {
-+	/**
-+	 * An identifier associated with this single edit operation.
-+	 */
-+	identifier: ISingleEditOperationIdentifier;
-+	/**
-+	 * The range to replace. This can be empty to emulate a simple insert.
-+	 */
-+	range: Range;
-+	/**
-+	 * The text to replace with. This can be null to emulate a simple delete.
-+	 */
-+	text: string;
-+	/**
-+	 * This indicates that this operation has "insert" semantics.
-+	 * i.e. forceMoveMarkers = true => if `range` is collapsed, all markers at the position will be moved.
-+	 */
-+	forceMoveMarkers: boolean;
-+	/**
-+	 * This indicates that this operation is inserting automatic whitespace
-+	 * that can be removed on next model edit operation if `config.trimAutoWhitespace` is true.
-+	 */
-+	isAutoWhitespaceEdit?: boolean;
-+}
-+
-+/**
-+ * A callback that can compute the cursor state after applying a series of edit operations.
-+ */
-+export interface ICursorStateComputer {
-+	/**
-+	 * A callback that can compute the resulting cursors state after some edit operations have been executed.
-+	 */
-+	(inverseEditOperations: IIdentifiedSingleEditOperation[]): Selection[];
-+}
-+
-+export class TextModelResolvedOptions {
-+	_textModelResolvedOptionsBrand: void;
-+
-+	readonly tabSize: number;
-+	readonly insertSpaces: boolean;
-+	readonly defaultEOL: DefaultEndOfLine;
-+	readonly trimAutoWhitespace: boolean;
-+
-+	/**
-+	 * @internal
-+	 */
-+	constructor(src: {
-+		tabSize: number;
-+		insertSpaces: boolean;
-+		defaultEOL: DefaultEndOfLine;
-+		trimAutoWhitespace: boolean;
-+	}) {
-+		this.tabSize = src.tabSize | 0;
-+		this.insertSpaces = Boolean(src.insertSpaces);
-+		this.defaultEOL = src.defaultEOL | 0;
-+		this.trimAutoWhitespace = Boolean(src.trimAutoWhitespace);
-+	}
-+
-+	/**
-+	 * @internal
-+	 */
-+	public equals(other: TextModelResolvedOptions): boolean {
-+		return (
-+			this.tabSize === other.tabSize
-+			&& this.insertSpaces === other.insertSpaces
-+			&& this.defaultEOL === other.defaultEOL
-+			&& this.trimAutoWhitespace === other.trimAutoWhitespace
-+		);
-+	}
-+
-+	/**
-+	 * @internal
-+	 */
-+	public createChangeEvent(newOpts: TextModelResolvedOptions): IModelOptionsChangedEvent {
-+		return {
-+			tabSize: this.tabSize !== newOpts.tabSize,
-+			insertSpaces: this.insertSpaces !== newOpts.insertSpaces,
-+			trimAutoWhitespace: this.trimAutoWhitespace !== newOpts.trimAutoWhitespace,
-+		};
-+	}
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface ITextModelCreationOptions {
-+	tabSize: number;
-+	insertSpaces: boolean;
-+	detectIndentation: boolean;
-+	trimAutoWhitespace: boolean;
-+	defaultEOL: DefaultEndOfLine;
-+}
-+
-+export interface ITextModelUpdateOptions {
-+	tabSize?: number;
-+	insertSpaces?: boolean;
-+	trimAutoWhitespace?: boolean;
-+}
-+
-+export interface IModelOptionsChangedEvent {
-+	readonly tabSize: boolean;
-+	readonly insertSpaces: boolean;
-+	readonly trimAutoWhitespace: boolean;
-+}
-+
-+/**
-+ * A textual read-only model.
-+ */
-+export interface ITextModel {
-+
-+	/**
-+	 * @internal
-+	 */
-+	mightContainRTL(): boolean;
-+
-+	/**
-+	 * @internal
-+	 */
-+	mightContainNonBasicASCII(): boolean;
-+
-+	getOptions(): TextModelResolvedOptions;
-+
-+	/**
-+	 * Get the current version id of the model.
-+	 * Anytime a change happens to the model (even undo/redo),
-+	 * the version id is incremented.
-+	 */
-+	getVersionId(): number;
-+
-+	/**
-+	 * Get the alternative version id of the model.
-+	 * This alternative version id is not always incremented,
-+	 * it will return the same values in the case of undo-redo.
-+	 */
-+	getAlternativeVersionId(): number;
-+
-+	/**
-+	 * Replace the entire text buffer value contained in this model.
-+	 */
-+	setValue(newValue: string): void;
-+
-+	/**
-+	 * Replace the entire text buffer value contained in this model.
-+	 * @internal
-+	 */
-+	setValueFromRawText(newValue: IRawText): void;
-+
-+	/**
-+	 * Get the text stored in this model.
-+	 * @param eol The end of line character preference. Defaults to `EndOfLinePreference.TextDefined`.
-+	 * @param preserverBOM Preserve a BOM character if it was detected when the model was constructed.
-+	 * @return The text.
-+	 */
-+	getValue(eol?: EndOfLinePreference, preserveBOM?: boolean): string;
-+
-+	/**
-+	 * Get the length of the text stored in this model.
-+	 */
-+	getValueLength(eol?: EndOfLinePreference, preserveBOM?: boolean): number;
-+
-+	/**
-+	 * Get the raw text stored in this model.
-+	 * @internal
-+	 */
-+	toRawText(): IRawText;
-+
-+	/**
-+	 * Check if the raw text stored in this model equals another raw text.
-+	 * @internal
-+	 */
-+	equals(other: IRawText): boolean;
-+
-+	/**
-+	 * Get the text in a certain range.
-+	 * @param range The range describing what text to get.
-+	 * @param eol The end of line character preference. This will only be used for multiline ranges. Defaults to `EndOfLinePreference.TextDefined`.
-+	 * @return The text.
-+	 */
-+	getValueInRange(range: IRange, eol?: EndOfLinePreference): string;
-+
-+	/**
-+	 * Get the length of text in a certain range.
-+	 * @param range The range describing what text length to get.
-+	 * @return The text length.
-+	 */
-+	getValueLengthInRange(range: IRange): number;
-+
-+	/**
-+	 * Splits characters in two buckets. First bucket (A) is of characters that
-+	 * sit in lines with length < `LONG_LINE_BOUNDARY`. Second bucket (B) is of
-+	 * characters that sit in lines with length >= `LONG_LINE_BOUNDARY`.
-+	 * If count(B) > count(A) return true. Returns false otherwise.
-+	 * @internal
-+	 */
-+	isDominatedByLongLines(): boolean;
-+
-+	/**
-+	 * Get the number of lines in the model.
-+	 */
-+	getLineCount(): number;
-+
-+	/**
-+	 * Get the text for a certain line.
-+	 */
-+	getLineContent(lineNumber: number): string;
-+
-+	/**
-+	 * @internal
-+	 */
-+	getIndentLevel(lineNumber: number): number;
-+
-+	/**
-+	 * @internal
-+	 */
-+	getIndentRanges(): IndentRange[];
-+
-+	/**
-+	 * @internal
-+	 */
-+	getLineIndentGuide(lineNumber: number): number;
-+
-+	/**
-+	 * Get the text for all lines.
-+	 */
-+	getLinesContent(): string[];
-+
-+	/**
-+	 * Get the end of line sequence predominantly used in the text buffer.
-+	 * @return EOL char sequence (e.g.: '\n' or '\r\n').
-+	 */
-+	getEOL(): string;
-+
-+	/**
-+	 * Change the end of line sequence used in the text buffer.
-+	 */
-+	setEOL(eol: EndOfLineSequence): void;
-+
-+	/**
-+	 * Get the minimum legal column for line at `lineNumber`
-+	 */
-+	getLineMinColumn(lineNumber: number): number;
-+
-+	/**
-+	 * Get the maximum legal column for line at `lineNumber`
-+	 */
-+	getLineMaxColumn(lineNumber: number): number;
-+
-+	/**
-+	 * Returns the column before the first non whitespace character for line at `lineNumber`.
-+	 * Returns 0 if line is empty or contains only whitespace.
-+	 */
-+	getLineFirstNonWhitespaceColumn(lineNumber: number): number;
-+
-+	/**
-+	 * Returns the column after the last non whitespace character for line at `lineNumber`.
-+	 * Returns 0 if line is empty or contains only whitespace.
-+	 */
-+	getLineLastNonWhitespaceColumn(lineNumber: number): number;
-+
-+	/**
-+	 * Create a valid position,
-+	 */
-+	validatePosition(position: IPosition): Position;
-+
-+	/**
-+	 * Advances the given position by the given offest (negative offsets are also accepted)
-+	 * and returns it as a new valid position.
-+	 *
-+	 * If the offset and position are such that their combination goes beyond the beginning or
-+	 * end of the model, throws an exception.
-+	 *
-+	 * If the ofsset is such that the new position would be in the middle of a multi-byte
-+	 * line terminator, throws an exception.
-+	 */
-+	modifyPosition(position: IPosition, offset: number): Position;
-+
-+	/**
-+	 * Create a valid range.
-+	 */
-+	validateRange(range: IRange): Range;
-+
-+	/**
-+	 * Converts the position to a zero-based offset.
-+	 *
-+	 * The position will be [adjusted](#TextDocument.validatePosition).
-+	 *
-+	 * @param position A position.
-+	 * @return A valid zero-based offset.
-+	 */
-+	getOffsetAt(position: IPosition): number;
-+
-+	/**
-+	 * Converts a zero-based offset to a position.
-+	 *
-+	 * @param offset A zero-based offset.
-+	 * @return A valid [position](#Position).
-+	 */
-+	getPositionAt(offset: number): Position;
-+
-+	/**
-+	 * Get a range covering the entire model
-+	 */
-+	getFullModelRange(): Range;
-+
-+	/**
-+	 * Returns iff the model was disposed or not.
-+	 */
-+	isDisposed(): boolean;
-+
-+	/**
-+	 * No mode supports allowed on this model because it is simply too large.
-+	 * (even tokenization would cause too much memory pressure)
-+	 * @internal
-+	 */
-+	isTooLargeForHavingAMode(): boolean;
-+
-+	/**
-+	 * Only basic mode supports allowed on this model because it is simply too large.
-+	 * (tokenization is allowed and other basic supports)
-+	 * @internal
-+	 */
-+	isTooLargeForHavingARichMode(): boolean;
-+
-+	/**
-+	 * Search the model.
-+	 * @param searchString The string used to search. If it is a regular expression, set `isRegex` to true.
-+	 * @param searchOnlyEditableRange Limit the searching to only search inside the editable range of the model.
-+	 * @param isRegex Used to indicate that `searchString` is a regular expression.
-+	 * @param matchCase Force the matching to match lower/upper case exactly.
-+	 * @param wholeWord Force the matching to match entire words only.
-+	 * @param captureMatches The result will contain the captured groups.
-+	 * @param limitResultCount Limit the number of results
-+	 * @return The ranges where the matches are. It is empty if not matches have been found.
-+	 */
-+	findMatches(searchString: string, searchOnlyEditableRange: boolean, isRegex: boolean, matchCase: boolean, wholeWord: boolean, captureMatches: boolean, limitResultCount?: number): FindMatch[];
-+	/**
-+	 * Search the model.
-+	 * @param searchString The string used to search. If it is a regular expression, set `isRegex` to true.
-+	 * @param searchScope Limit the searching to only search inside this range.
-+	 * @param isRegex Used to indicate that `searchString` is a regular expression.
-+	 * @param matchCase Force the matching to match lower/upper case exactly.
-+	 * @param wholeWord Force the matching to match entire words only.
-+	 * @param captureMatches The result will contain the captured groups.
-+	 * @param limitResultCount Limit the number of results
-+	 * @return The ranges where the matches are. It is empty if no matches have been found.
-+	 */
-+	findMatches(searchString: string, searchScope: IRange, isRegex: boolean, matchCase: boolean, wholeWord: boolean, captureMatches: boolean, limitResultCount?: number): FindMatch[];
-+	/**
-+	 * Search the model for the next match. Loops to the beginning of the model if needed.
-+	 * @param searchString The string used to search. If it is a regular expression, set `isRegex` to true.
-+	 * @param searchStart Start the searching at the specified position.
-+	 * @param isRegex Used to indicate that `searchString` is a regular expression.
-+	 * @param matchCase Force the matching to match lower/upper case exactly.
-+	 * @param wholeWord Force the matching to match entire words only.
-+	 * @param captureMatches The result will contain the captured groups.
-+	 * @return The range where the next match is. It is null if no next match has been found.
-+	 */
-+	findNextMatch(searchString: string, searchStart: IPosition, isRegex: boolean, matchCase: boolean, wholeWord: boolean, captureMatches: boolean): FindMatch;
-+	/**
-+	 * Search the model for the previous match. Loops to the end of the model if needed.
-+	 * @param searchString The string used to search. If it is a regular expression, set `isRegex` to true.
-+	 * @param searchStart Start the searching at the specified position.
-+	 * @param isRegex Used to indicate that `searchString` is a regular expression.
-+	 * @param matchCase Force the matching to match lower/upper case exactly.
-+	 * @param wholeWord Force the matching to match entire words only.
-+	 * @param captureMatches The result will contain the captured groups.
-+	 * @return The range where the previous match is. It is null if no previous match has been found.
-+	 */
-+	findPreviousMatch(searchString: string, searchStart: IPosition, isRegex: boolean, matchCase: boolean, wholeWord: boolean, captureMatches: boolean): FindMatch;
-+}
-+
-+export class FindMatch {
-+	_findMatchBrand: void;
-+
-+	public readonly range: Range;
-+	public readonly matches: string[];
-+
-+	/**
-+	 * @internal
-+	 */
-+	constructor(range: Range, matches: string[]) {
-+		this.range = range;
-+		this.matches = matches;
-+	}
-+}
-+
-+export interface IReadOnlyModel extends ITextModel {
-+	/**
-+	 * Gets the resource associated with this editor model.
-+	 */
-+	readonly uri: URI;
-+
-+	/**
-+	 * Get the language associated with this model.
-+	 * @internal
-+	 */
-+	getLanguageIdentifier(): LanguageIdentifier;
-+
-+	/**
-+	 * Get the language associated with this model.
-+	 */
-+	getModeId(): string;
-+
-+	/**
-+	 * Get the word under or besides `position`.
-+	 * @param position The position to look for a word.
-+	 * @param skipSyntaxTokens Ignore syntax tokens, as identified by the mode.
-+	 * @return The word under or besides `position`. Might be null.
-+	 */
-+	getWordAtPosition(position: IPosition): IWordAtPosition;
-+
-+	/**
-+	 * Get the word under or besides `position` trimmed to `position`.column
-+	 * @param position The position to look for a word.
-+	 * @param skipSyntaxTokens Ignore syntax tokens, as identified by the mode.
-+	 * @return The word under or besides `position`. Will never be null.
-+	 */
-+	getWordUntilPosition(position: IPosition): IWordAtPosition;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface IFoundBracket {
-+	range: Range;
-+	open: string;
-+	close: string;
-+	isOpen: boolean;
-+}
-+
-+/**
-+ * A model that is tokenized.
-+ */
-+export interface ITokenizedModel extends ITextModel {
-+
-+	/**
-+	 * Tokenize if necessary and get the tokens for the line `lineNumber`.
-+	 * @param lineNumber The line number
-+	 * @param inaccurateTokensAcceptable Are inaccurate tokens acceptable? Defaults to false
-+	 * @internal
-+	 */
-+	getLineTokens(lineNumber: number, inaccurateTokensAcceptable?: boolean): LineTokens;
-+
-+	/**
-+	 * Get the language associated with this model.
-+	 * @internal
-+	 */
-+	getLanguageIdentifier(): LanguageIdentifier;
-+
-+	/**
-+	 * Get the language associated with this model.
-+	 */
-+	getModeId(): string;
-+
-+	/**
-+	 * Set the current language mode associated with the model.
-+	 * @internal
-+	 */
-+	setMode(languageIdentifier: LanguageIdentifier): void;
-+
-+	/**
-+	 * Returns the true (inner-most) language mode at a given position.
-+	 * @internal
-+	 */
-+	getLanguageIdAtPosition(lineNumber: number, column: number): LanguageId;
-+
-+	/**
-+	 * Get the word under or besides `position`.
-+	 * @param position The position to look for a word.
-+	 * @param skipSyntaxTokens Ignore syntax tokens, as identified by the mode.
-+	 * @return The word under or besides `position`. Might be null.
-+	 */
-+	getWordAtPosition(position: IPosition): IWordAtPosition;
-+
-+	/**
-+	 * Get the word under or besides `position` trimmed to `position`.column
-+	 * @param position The position to look for a word.
-+	 * @param skipSyntaxTokens Ignore syntax tokens, as identified by the mode.
-+	 * @return The word under or besides `position`. Will never be null.
-+	 */
-+	getWordUntilPosition(position: IPosition): IWordAtPosition;
-+
-+	/**
-+	 * Returns an iterator that can be used to read
-+	 * next and previous tokens from the provided position.
-+	 * The iterator is made available through the callback
-+	 * function and can't be used afterwards.
-+	 * @internal
-+	 */
-+	tokenIterator(position: IPosition, callback: (it: ITokenIterator) => any): any;
-+
-+	/**
-+	 * Find the matching bracket of `request` up, counting brackets.
-+	 * @param request The bracket we're searching for
-+	 * @param position The position at which to start the search.
-+	 * @return The range of the matching bracket, or null if the bracket match was not found.
-+	 * @internal
-+	 */
-+	findMatchingBracketUp(bracket: string, position: IPosition): Range;
-+
-+	// /**
-+	//  * Find the first bracket in the model before `position`.
-+	//  * @param position The position at which to start the search.
-+	//  * @return The info for the first bracket before `position`, or null if there are no more brackets before `positions`.
-+	//  */
-+	// findPrevBracket(position:IPosition): IFoundBracket;
-+
-+	// /**
-+	//  * Find the first bracket in the model after `position`.
-+	//  * @param position The position at which to start the search.
-+	//  * @return The info for the first bracket after `position`, or null if there are no more brackets after `positions`.
-+	//  */
-+	// findNextBracket(position:IPosition): IFoundBracket;
-+
-+	/**
-+	 * Given a `position`, if the position is on top or near a bracket,
-+	 * find the matching bracket of that bracket and return the ranges of both brackets.
-+	 * @param position The position at which to look for a bracket.
-+	 * @internal
-+	 */
-+	matchBracket(position: IPosition): [Range, Range];
-+}
-+
-+/**
-+ * A model that can track markers.
-+ */
-+export interface ITextModelWithMarkers extends ITextModel {
-+	/**
-+	 * @internal
-+	 */
-+	_addMarker(internalDecorationId: number, lineNumber: number, column: number, stickToPreviousCharacter: boolean): string;
-+	/**
-+	 * @internal
-+	 */
-+	_changeMarker(id: string, newLineNumber: number, newColumn: number): void;
-+	/**
-+	 * @internal
-+	 */
-+	_changeMarkerStickiness(id: string, newStickToPreviousCharacter: boolean): void;
-+	/**
-+	 * @internal
-+	 */
-+	_getMarker(id: string): Position;
-+	/**
-+	 * @internal
-+	 */
-+	_removeMarker(id: string): void;
-+}
-+
-+/**
-+ * Describes the behaviour of decorations when typing/editing near their edges.
-+ */
-+export enum TrackedRangeStickiness {
-+	AlwaysGrowsWhenTypingAtEdges = 0,
-+	NeverGrowsWhenTypingAtEdges = 1,
-+	GrowsOnlyWhenTypingBefore = 2,
-+	GrowsOnlyWhenTypingAfter = 3,
-+}
-+
-+/**
-+ * A model that can have decorations.
-+ */
-+export interface ITextModelWithDecorations {
-+	/**
-+	 * Change the decorations. The callback will be called with a change accessor
-+	 * that becomes invalid as soon as the callback finishes executing.
-+	 * This allows for all events to be queued up until the change
-+	 * is completed. Returns whatever the callback returns.
-+	 * @param ownerId Identifies the editor id in which these decorations should appear. If no `ownerId` is provided, the decorations will appear in all editors that attach this model.
-+	 * @internal
-+	 */
-+	changeDecorations<T>(callback: (changeAccessor: IModelDecorationsChangeAccessor) => T, ownerId?: number): T;
-+
-+	/**
-+	 * Perform a minimum ammount of operations, in order to transform the decorations
-+	 * identified by `oldDecorations` to the decorations described by `newDecorations`
-+	 * and returns the new identifiers associated with the resulting decorations.
-+	 *
-+	 * @param oldDecorations Array containing previous decorations identifiers.
-+	 * @param newDecorations Array describing what decorations should result after the call.
-+	 * @param ownerId Identifies the editor id in which these decorations should appear. If no `ownerId` is provided, the decorations will appear in all editors that attach this model.
-+	 * @return An array containing the new decorations identifiers.
-+	 */
-+	deltaDecorations(oldDecorations: string[], newDecorations: IModelDeltaDecoration[], ownerId?: number): string[];
-+
-+	/**
-+	 * Remove all decorations that have been added with this specific ownerId.
-+	 * @param ownerId The owner id to search for.
-+	 * @internal
-+	 */
-+	removeAllDecorationsWithOwnerId(ownerId: number): void;
-+
-+	/**
-+	 * Get the options associated with a decoration.
-+	 * @param id The decoration id.
-+	 * @return The decoration options or null if the decoration was not found.
-+	 */
-+	getDecorationOptions(id: string): IModelDecorationOptions;
-+
-+	/**
-+	 * Get the range associated with a decoration.
-+	 * @param id The decoration id.
-+	 * @return The decoration range or null if the decoration was not found.
-+	 */
-+	getDecorationRange(id: string): Range;
-+
-+	/**
-+	 * Gets all the decorations for the line `lineNumber` as an array.
-+	 * @param lineNumber The line number
-+	 * @param ownerId If set, it will ignore decorations belonging to other owners.
-+	 * @param filterOutValidation If set, it will ignore decorations specific to validation (i.e. warnings, errors).
-+	 * @return An array with the decorations
-+	 */
-+	getLineDecorations(lineNumber: number, ownerId?: number, filterOutValidation?: boolean): IModelDecoration[];
-+
-+	/**
-+	 * Gets all the decorations for the lines between `startLineNumber` and `endLineNumber` as an array.
-+	 * @param startLineNumber The start line number
-+	 * @param endLineNumber The end line number
-+	 * @param ownerId If set, it will ignore decorations belonging to other owners.
-+	 * @param filterOutValidation If set, it will ignore decorations specific to validation (i.e. warnings, errors).
-+	 * @return An array with the decorations
-+	 */
-+	getLinesDecorations(startLineNumber: number, endLineNumber: number, ownerId?: number, filterOutValidation?: boolean): IModelDecoration[];
-+
-+	/**
-+	 * Gets all the deocorations in a range as an array. Only `startLineNumber` and `endLineNumber` from `range` are used for filtering.
-+	 * So for now it returns all the decorations on the same line as `range`.
-+	 * @param range The range to search in
-+	 * @param ownerId If set, it will ignore decorations belonging to other owners.
-+	 * @param filterOutValidation If set, it will ignore decorations specific to validation (i.e. warnings, errors).
-+	 * @return An array with the decorations
-+	 */
-+	getDecorationsInRange(range: IRange, ownerId?: number, filterOutValidation?: boolean): IModelDecoration[];
-+
-+	/**
-+	 * Gets all the decorations as an array.
-+	 * @param ownerId If set, it will ignore decorations belonging to other owners.
-+	 * @param filterOutValidation If set, it will ignore decorations specific to validation (i.e. warnings, errors).
-+	 */
-+	getAllDecorations(ownerId?: number, filterOutValidation?: boolean): IModelDecoration[];
-+}
-+
-+/**
-+ * An editable text model.
-+ */
-+export interface IEditableTextModel extends ITextModelWithMarkers {
-+
-+	/**
-+	 * Normalize a string containing whitespace according to indentation rules (converts to spaces or to tabs).
-+	 */
-+	normalizeIndentation(str: string): string;
-+
-+	/**
-+	 * Get what is considered to be one indent (e.g. a tab character or 4 spaces, etc.).
-+	 */
-+	getOneIndent(): string;
-+
-+	/**
-+	 * Change the options of this model.
-+	 */
-+	updateOptions(newOpts: ITextModelUpdateOptions): void;
-+
-+	/**
-+	 * Detect the indentation options for this model from its content.
-+	 */
-+	detectIndentation(defaultInsertSpaces: boolean, defaultTabSize: number): void;
-+
-+	/**
-+	 * Push a stack element onto the undo stack. This acts as an undo/redo point.
-+	 * The idea is to use `pushEditOperations` to edit the model and then to
-+	 * `pushStackElement` to create an undo/redo stop point.
-+	 */
-+	pushStackElement(): void;
-+
-+	/**
-+	 * Push edit operations, basically editing the model. This is the preferred way
-+	 * of editing the model. The edit operations will land on the undo stack.
-+	 * @param beforeCursorState The cursor state before the edit operaions. This cursor state will be returned when `undo` or `redo` are invoked.
-+	 * @param editOperations The edit operations.
-+	 * @param cursorStateComputer A callback that can compute the resulting cursors state after the edit operations have been executed.
-+	 * @return The cursor state returned by the `cursorStateComputer`.
-+	 */
-+	pushEditOperations(beforeCursorState: Selection[], editOperations: IIdentifiedSingleEditOperation[], cursorStateComputer: ICursorStateComputer): Selection[];
-+
-+	/**
-+	 * Edit the model without adding the edits to the undo stack.
-+	 * This can have dire consequences on the undo stack! See @pushEditOperations for the preferred way.
-+	 * @param operations The edit operations.
-+	 * @return The inverse edit operations, that, when applied, will bring the model back to the previous state.
-+	 */
-+	applyEdits(operations: IIdentifiedSingleEditOperation[]): IIdentifiedSingleEditOperation[];
-+
-+	/**
-+	 * Undo edit operations until the first previous stop point created by `pushStackElement`.
-+	 * The inverse edit operations will be pushed on the redo stack.
-+	 * @internal
-+	 */
-+	undo(): Selection[];
-+
-+	/**
-+	 * Redo edit operations until the next stop point created by `pushStackElement`.
-+	 * The inverse edit operations will be pushed on the undo stack.
-+	 * @internal
-+	 */
-+	redo(): Selection[];
-+
-+	/**
-+	 * Set an editable range on the model.
-+	 * @internal
-+	 */
-+	setEditableRange(range: IRange): void;
-+
-+	/**
-+	 * Check if the model has an editable range.
-+	 * @internal
-+	 */
-+	hasEditableRange(): boolean;
-+
-+	/**
-+	 * Get the editable range on the model.
-+	 * @internal
-+	 */
-+	getEditableRange(): Range;
-+}
-+
-+/**
-+ * A model.
-+ */
-+export interface IModel extends IReadOnlyModel, IEditableTextModel, ITextModelWithMarkers, ITokenizedModel, ITextModelWithDecorations, IEditorModel {
-+	/**
-+	 * @deprecated Please use `onDidChangeContent` instead.
-+	 * An event emitted when the contents of the model have changed.
-+	 * @internal
-+	 * @event
-+	 */
-+	onDidChangeRawContent(listener: (e: IModelContentChangedEvent) => void): IDisposable;
-+	/**
-+	 * An event emitted when the contents of the model have changed.
-+	 * @event
-+	 */
-+	onDidChangeContent(listener: (e: IModelContentChangedEvent2) => void): IDisposable;
-+	/**
-+	 * An event emitted when decorations of the model have changed.
-+	 * @event
-+	 */
-+	onDidChangeDecorations(listener: (e: IModelDecorationsChangedEvent) => void): IDisposable;
-+	/**
-+	 * An event emitted when the model options have changed.
-+	 * @event
-+	 */
-+	onDidChangeOptions(listener: (e: IModelOptionsChangedEvent) => void): IDisposable;
-+	/**
-+	 * An event emitted when the language associated with the model has changed.
-+	 * @event
-+	 */
-+	onDidChangeLanguage(listener: (e: IModelLanguageChangedEvent) => void): IDisposable;
-+	/**
-+	 * An event emitted right before disposing the model.
-+	 * @event
-+	 */
-+	onWillDispose(listener: () => void): IDisposable;
-+
-+	/**
-+	 * @internal
-+	 */
-+	addBulkListener(listener: BulkListenerCallback): IDisposable;
-+
-+	/**
-+	 * A unique identifier associated with this model.
-+	 */
-+	readonly id: string;
-+
-+	/**
-+	 * Destroy this model. This will unbind the model from the mode
-+	 * and make all necessary clean-up to release this object to the GC.
-+	 * @internal
-+	 */
-+	destroy(): void;
-+
-+	/**
-+	 * Destroy this model. This will unbind the model from the mode
-+	 * and make all necessary clean-up to release this object to the GC.
-+	 */
-+	dispose(): void;
-+
-+	/**
-+	 * @internal
-+	 */
-+	onBeforeAttached(): void;
-+
-+	/**
-+	 * @internal
-+	 */
-+	onBeforeDetached(): void;
-+
-+	/**
-+	 * Returns iff this model is attached to an editor or not.
-+	 * @internal
-+	 */
-+	isAttachedToEditor(): boolean;
-+}
-+
-+/**
-+ * An event describing that the current mode associated with a model has changed.
-+ */
-+export interface IModelLanguageChangedEvent {
-+	/**
-+	 * Previous language
-+	 */
-+	readonly oldLanguage: string;
-+	/**
-+	 * New language
-+	 */
-+	readonly newLanguage: string;
-+}
-+
-+/**
-+ * An event describing a change in the text of a model.
-+ */
-+export interface IModelContentChangedEvent2 {
-+	/**
-+	 * The range that got replaced.
-+	 */
-+	readonly range: IRange;
-+	/**
-+	 * The length of the range that got replaced.
-+	 */
-+	readonly rangeLength: number;
-+	/**
-+	 * The new text for the range.
-+	 */
-+	readonly text: string;
-+	/**
-+	 * The (new) end-of-line character.
-+	 */
-+	readonly eol: string;
-+	/**
-+	 * The new version id the model has transitioned to.
-+	 */
-+	versionId: number;
-+	/**
-+	 * Flag that indicates that this event was generated while undoing.
-+	 */
-+	readonly isUndoing: boolean;
-+	/**
-+	 * Flag that indicates that this event was generated while redoing.
-+	 */
-+	readonly isRedoing: boolean;
-+}
-+/**
-+ * An event describing a change in the text of a model.
-+ * @internal
-+ */
-+export interface IModelContentChangedEvent {
-+	/**
-+	 * The event type. It can be used to detect the actual event type:
-+	 * 		EditorCommon.EventType.ModelContentChangedFlush => IModelContentChangedFlushEvent
-+	 * 		EditorCommon.EventType.ModelContentChangedLinesDeleted => IModelContentChangedLineChangedEvent
-+	 * 		EditorCommon.EventType.ModelContentChangedLinesInserted => IModelContentChangedLinesDeletedEvent
-+	 * 		EditorCommon.EventType.ModelContentChangedLineChanged => IModelContentChangedLinesInsertedEvent
-+	 */
-+	readonly changeType: string;
-+	/**
-+	 * The new version id the model has transitioned to.
-+	 */
-+	versionId: number;
-+	/**
-+	 * Flag that indicates that this event was generated while undoing.
-+	 */
-+	readonly isUndoing: boolean;
-+	/**
-+	 * Flag that indicates that this event was generated while redoing.
-+	 */
-+	readonly isRedoing: boolean;
-+}
-+
-+/**
-+ * The raw text backing a model.
-+ * @internal
-+ */
-+export interface IRawText {
-+	/**
-+	 * The entire text length.
-+	 */
-+	readonly length: number;
-+	/**
-+	 * The text split into lines.
-+	 */
-+	readonly lines: string[];
-+	/**
-+	 * The BOM (leading character sequence of the file).
-+	 */
-+	readonly BOM: string;
-+	/**
-+	 * The end of line sequence.
-+	 */
-+	readonly EOL: string;
-+	/**
-+	 * The text contains Unicode characters classified as "R" or "AL".
-+	 */
-+	readonly containsRTL: boolean;
-+	/**
-+	 * The text contains only characters inside the ASCII range 32-126 or \t \r \n
-+	 */
-+	readonly isBasicASCII: boolean;
-+	/**
-+	 * The options associated with this text.
-+	 */
-+	readonly options: {
-+		readonly tabSize: number;
-+		readonly insertSpaces: boolean;
-+		readonly defaultEOL: DefaultEndOfLine;
-+		readonly trimAutoWhitespace: boolean;
-+	};
-+}
-+
-+/**
-+ * An event describing that a model has been reset to a new value.
-+ * @internal
-+ */
-+export interface IModelContentChangedFlushEvent extends IModelContentChangedEvent {
-+	/**
-+	 * The new text content of the model.
-+	 */
-+	readonly detail: IRawText;
-+}
-+/**
-+ * An event describing that a line has changed in a model.
-+ * @internal
-+ */
-+export interface IModelContentChangedLineChangedEvent extends IModelContentChangedEvent {
-+	/**
-+	 * The line that has changed.
-+	 */
-+	readonly lineNumber: number;
-+	/**
-+	 * The new value of the line.
-+	 */
-+	readonly detail: string;
-+}
-+/**
-+ * An event describing that line(s) have been deleted in a model.
-+ * @internal
-+ */
-+export interface IModelContentChangedLinesDeletedEvent extends IModelContentChangedEvent {
-+	/**
-+	 * At what line the deletion began (inclusive).
-+	 */
-+	readonly fromLineNumber: number;
-+	/**
-+	 * At what line the deletion stopped (inclusive).
-+	 */
-+	readonly toLineNumber: number;
-+}
-+/**
-+ * An event describing that line(s) have been inserted in a model.
-+ * @internal
-+ */
-+export interface IModelContentChangedLinesInsertedEvent extends IModelContentChangedEvent {
-+	/**
-+	 * Before what line did the insertion begin
-+	 */
-+	readonly fromLineNumber: number;
-+	/**
-+	 * `toLineNumber` - `fromLineNumber` + 1 denotes the number of lines that were inserted
-+	 */
-+	readonly toLineNumber: number;
-+	/**
-+	 * The text that was inserted
-+	 */
-+	readonly detail: string;
-+}
-+/**
-+ * An event describing that model decorations have changed.
-+ */
-+export interface IModelDecorationsChangedEvent {
-+	/**
-+	 * Lists of ids for added decorations.
-+	 */
-+	readonly addedDecorations: string[];
-+	/**
-+	 * Lists of ids for changed decorations.
-+	 */
-+	readonly changedDecorations: string[];
-+	/**
-+	 * List of ids for removed decorations.
-+	 */
-+	readonly removedDecorations: string[];
-+}
-+/**
-+ * An event describing that some ranges of lines have been tokenized (their tokens have changed).
-+ */
-+export interface IModelTokensChangedEvent {
-+	readonly ranges: {
-+		/**
-+		 * The start of the range (inclusive)
-+		 */
-+		readonly fromLineNumber: number;
-+		/**
-+		 * The end of the range (inclusive)
-+		 */
-+		readonly toLineNumber: number;
-+	}[];
-+}
-+
-+/**
-+ * Describes the reason the cursor has changed its position.
-+ */
-+export enum CursorChangeReason {
-+	/**
-+	 * Unknown or not set.
-+	 */
-+	NotSet = 0,
-+	/**
-+	 * A `model.setValue()` was called.
-+	 */
-+	ContentFlush = 1,
-+	/**
-+	 * The `model` has been changed outside of this cursor and the cursor recovers its position from associated markers.
-+	 */
-+	RecoverFromMarkers = 2,
-+	/**
-+	 * There was an explicit user gesture.
-+	 */
-+	Explicit = 3,
-+	/**
-+	 * There was a Paste.
-+	 */
-+	Paste = 4,
-+	/**
-+	 * There was an Undo.
-+	 */
-+	Undo = 5,
-+	/**
-+	 * There was a Redo.
-+	 */
-+	Redo = 6,
-+}
-+/**
-+ * An event describing that the cursor position has changed.
-+ */
-+export interface ICursorPositionChangedEvent {
-+	/**
-+	 * Primary cursor's position.
-+	 */
-+	readonly position: Position;
-+	/**
-+	 * Primary cursor's view position
-+	 */
-+	readonly viewPosition: Position;
-+	/**
-+	 * Secondary cursors' position.
-+	 */
-+	readonly secondaryPositions: Position[];
-+	/**
-+	 * Secondary cursors' view position.
-+	 */
-+	readonly secondaryViewPositions: Position[];
-+	/**
-+	 * Reason.
-+	 */
-+	readonly reason: CursorChangeReason;
-+	/**
-+	 * Source of the call that caused the event.
-+	 */
-+	readonly source: string;
-+	/**
-+	 * Is the primary cursor in the editable range?
-+	 */
-+	readonly isInEditableRange: boolean;
-+}
-+/**
-+ * An event describing that the cursor selection has changed.
-+ */
-+export interface ICursorSelectionChangedEvent {
-+	/**
-+	 * The primary selection.
-+	 */
-+	readonly selection: Selection;
-+	/**
-+	 * The primary selection in view coordinates.
-+	 */
-+	readonly viewSelection: Selection;
-+	/**
-+	 * The secondary selections.
-+	 */
-+	readonly secondarySelections: Selection[];
-+	/**
-+	 * The secondary selections in view coordinates.
-+	 */
-+	readonly secondaryViewSelections: Selection[];
-+	/**
-+	 * Source of the call that caused the event.
-+	 */
-+	readonly source: string;
-+	/**
-+	 * Reason.
-+	 */
-+	readonly reason: CursorChangeReason;
-+}
-+/**
-+ * @internal
-+ */
-+export const enum VerticalRevealType {
-+	Simple = 0,
-+	Center = 1,
-+	CenterIfOutsideViewport = 2,
-+	Top = 3,
-+	Bottom = 4
-+}
-+/**
-+ * An event describing a request to reveal a specific range in the view of the editor.
-+ * @internal
-+ */
-+export interface ICursorRevealRangeEvent {
-+	/**
-+	 * Range to be reavealed.
-+	 */
-+	readonly range: Range;
-+	/**
-+	 * View range to be reavealed.
-+	 */
-+	readonly viewRange: Range;
-+
-+	readonly verticalType: VerticalRevealType;
-+	/**
-+	 * If true: there should be a horizontal & vertical revealing
-+	 * If false: there should be just a vertical revealing
-+	 */
-+	readonly revealHorizontal: boolean;
-+	/**
-+	 * If true: cursor is revealed if outside viewport
-+	 */
-+	readonly revealCursor: boolean;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface ICursorScrollRequestEvent {
-+	readonly deltaLines: number;
-+	readonly revealCursor: boolean;
-+}
-+
-+/**
-+ * An event describing that an editor has had its model reset (i.e. `editor.setModel()`).
-+ */
-+export interface IModelChangedEvent {
-+	/**
-+	 * The `uri` of the previous model or null.
-+	 */
-+	readonly oldModelUrl: URI;
-+	/**
-+	 * The `uri` of the new model or null.
-+	 */
-+	readonly newModelUrl: URI;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface IEditorWhitespace {
-+	readonly id: number;
-+	readonly afterLineNumber: number;
-+	readonly heightInLines: number;
-+}
-+
-+/**
-+ * A description for the overview ruler position.
-+ */
-+export class OverviewRulerPosition {
-+	readonly _overviewRulerPositionBrand: void;
-+
-+	/**
-+	 * Width of the overview ruler
-+	 */
-+	readonly width: number;
-+	/**
-+	 * Height of the overview ruler
-+	 */
-+	readonly height: number;
-+	/**
-+	 * Top position for the overview ruler
-+	 */
-+	readonly top: number;
-+	/**
-+	 * Right position for the overview ruler
-+	 */
-+	readonly right: number;
-+
-+	/**
-+	 * @internal
-+	 */
-+	constructor(source: {
-+		width: number;
-+		height: number;
-+		top: number;
-+		right: number;
-+	}) {
-+		this.width = source.width | 0;
-+		this.height = source.height | 0;
-+		this.top = source.top | 0;
-+		this.right = source.right | 0;
-+	}
-+
-+	/**
-+	 * @internal
-+	 */
-+	public equals(other: OverviewRulerPosition): boolean {
-+		return (
-+			this.width === other.width
-+			&& this.height === other.height
-+			&& this.top === other.top
-+			&& this.right === other.right
-+		);
-+	}
-+
-+	/**
-+	 * @internal
-+	 */
-+	public clone(): OverviewRulerPosition {
-+		return new OverviewRulerPosition(this);
-+	}
-+}
-+
-+/**
-+ * The internal layout details of the editor.
-+ */
-+export class EditorLayoutInfo {
-+	readonly _editorLayoutInfoBrand: void;
-+
-+	/**
-+	 * Full editor width.
-+	 */
-+	readonly width: number;
-+	/**
-+	 * Full editor height.
-+	 */
-+	readonly height: number;
-+
-+	/**
-+	 * Left position for the glyph margin.
-+	 */
-+	readonly glyphMarginLeft: number;
-+	/**
-+	 * The width of the glyph margin.
-+	 */
-+	readonly glyphMarginWidth: number;
-+	/**
-+	 * The height of the glyph margin.
-+	 */
-+	readonly glyphMarginHeight: number;
-+
-+	/**
-+	 * Left position for the line numbers.
-+	 */
-+	readonly lineNumbersLeft: number;
-+	/**
-+	 * The width of the line numbers.
-+	 */
-+	readonly lineNumbersWidth: number;
-+	/**
-+	 * The height of the line numbers.
-+	 */
-+	readonly lineNumbersHeight: number;
-+
-+	/**
-+	 * Left position for the line decorations.
-+	 */
-+	readonly decorationsLeft: number;
-+	/**
-+	 * The width of the line decorations.
-+	 */
-+	readonly decorationsWidth: number;
-+	/**
-+	 * The height of the line decorations.
-+	 */
-+	readonly decorationsHeight: number;
-+
-+	/**
-+	 * Left position for the content (actual text)
-+	 */
-+	readonly contentLeft: number;
-+	/**
-+	 * The width of the content (actual text)
-+	 */
-+	readonly contentWidth: number;
-+	/**
-+	 * The height of the content (actual height)
-+	 */
-+	readonly contentHeight: number;
-+
-+	/**
-+	 * The width of the vertical scrollbar.
-+	 */
-+	readonly verticalScrollbarWidth: number;
-+	/**
-+	 * The height of the horizontal scrollbar.
-+	 */
-+	readonly horizontalScrollbarHeight: number;
-+
-+	/**
-+	 * The position of the overview ruler.
-+	 */
-+	readonly overviewRuler: OverviewRulerPosition;
-+
-+	/**
-+	 * @internal
-+	 */
-+	constructor(source: {
-+		width: number;
-+		height: number;
-+		glyphMarginLeft: number;
-+		glyphMarginWidth: number;
-+		glyphMarginHeight: number;
-+		lineNumbersLeft: number;
-+		lineNumbersWidth: number;
-+		lineNumbersHeight: number;
-+		decorationsLeft: number;
-+		decorationsWidth: number;
-+		decorationsHeight: number;
-+		contentLeft: number;
-+		contentWidth: number;
-+		contentHeight: number;
-+		verticalScrollbarWidth: number;
-+		horizontalScrollbarHeight: number;
-+		overviewRuler: OverviewRulerPosition;
-+	}) {
-+		this.width = source.width | 0;
-+		this.height = source.height | 0;
-+		this.glyphMarginLeft = source.glyphMarginLeft | 0;
-+		this.glyphMarginWidth = source.glyphMarginWidth | 0;
-+		this.glyphMarginHeight = source.glyphMarginHeight | 0;
-+		this.lineNumbersLeft = source.lineNumbersLeft | 0;
-+		this.lineNumbersWidth = source.lineNumbersWidth | 0;
-+		this.lineNumbersHeight = source.lineNumbersHeight | 0;
-+		this.decorationsLeft = source.decorationsLeft | 0;
-+		this.decorationsWidth = source.decorationsWidth | 0;
-+		this.decorationsHeight = source.decorationsHeight | 0;
-+		this.contentLeft = source.contentLeft | 0;
-+		this.contentWidth = source.contentWidth | 0;
-+		this.contentHeight = source.contentHeight | 0;
-+		this.verticalScrollbarWidth = source.verticalScrollbarWidth | 0;
-+		this.horizontalScrollbarHeight = source.horizontalScrollbarHeight | 0;
-+		this.overviewRuler = source.overviewRuler.clone();
-+	}
-+
-+	/**
-+	 * @internal
-+	 */
-+	public equals(other: EditorLayoutInfo): boolean {
-+		return (
-+			this.width === other.width
-+			&& this.height === other.height
-+			&& this.glyphMarginLeft === other.glyphMarginLeft
-+			&& this.glyphMarginWidth === other.glyphMarginWidth
-+			&& this.glyphMarginHeight === other.glyphMarginHeight
-+			&& this.lineNumbersLeft === other.lineNumbersLeft
-+			&& this.lineNumbersWidth === other.lineNumbersWidth
-+			&& this.lineNumbersHeight === other.lineNumbersHeight
-+			&& this.decorationsLeft === other.decorationsLeft
-+			&& this.decorationsWidth === other.decorationsWidth
-+			&& this.decorationsHeight === other.decorationsHeight
-+			&& this.contentLeft === other.contentLeft
-+			&& this.contentWidth === other.contentWidth
-+			&& this.contentHeight === other.contentHeight
-+			&& this.verticalScrollbarWidth === other.verticalScrollbarWidth
-+			&& this.horizontalScrollbarHeight === other.horizontalScrollbarHeight
-+			&& this.overviewRuler.equals(other.overviewRuler)
-+		);
-+	}
-+
-+	/**
-+	 * @internal
-+	 */
-+	public clone(): EditorLayoutInfo {
-+		return new EditorLayoutInfo(this);
-+	}
-+}
-+
-+/**
-+ * Options for creating the editor.
-+ */
-+export interface ICodeEditorWidgetCreationOptions extends IEditorOptions {
-+	/**
-+	 * The initial model associated with this code editor.
-+	 */
-+	model?: IModel;
-+}
-+
-+/**
-+ * An editor model.
-+ */
-+export interface IEditorModel {
-+}
-+/**
-+ * An editor view state.
-+ */
-+export interface IEditorViewState {
-+}
-+export interface IDimension {
-+	width: number;
-+	height: number;
-+}
-+
-+/**
-+ * A (serializable) state of the cursors.
-+ */
-+export interface ICursorState {
-+	inSelectionMode: boolean;
-+	selectionStart: IPosition;
-+	position: IPosition;
-+}
-+/**
-+ * A (serializable) state of the view.
-+ */
-+export interface IViewState {
-+	scrollTop: number;
-+	scrollTopWithoutViewZones: number;
-+	scrollLeft: number;
-+}
-+/**
-+ * A (serializable) state of the code editor.
-+ */
-+export interface ICodeEditorViewState extends IEditorViewState {
-+	cursorState: ICursorState[];
-+	viewState: IViewState;
-+	contributionsState: { [id: string]: any };
-+}
-+
-+/**
-+ * Type of hit element with the mouse in the editor.
-+ */
-+export enum MouseTargetType {
-+	/**
-+	 * Mouse is on top of an unknown element.
-+	 */
-+	UNKNOWN,
-+	/**
-+	 * Mouse is on top of the textarea used for input.
-+	 */
-+	TEXTAREA,
-+	/**
-+	 * Mouse is on top of the glyph margin
-+	 */
-+	GUTTER_GLYPH_MARGIN,
-+	/**
-+	 * Mouse is on top of the line numbers
-+	 */
-+	GUTTER_LINE_NUMBERS,
-+	/**
-+	 * Mouse is on top of the line decorations
-+	 */
-+	GUTTER_LINE_DECORATIONS,
-+	/**
-+	 * Mouse is on top of the whitespace left in the gutter by a view zone.
-+	 */
-+	GUTTER_VIEW_ZONE,
-+	/**
-+	 * Mouse is on top of text in the content.
-+	 */
-+	CONTENT_TEXT,
-+	/**
-+	 * Mouse is on top of empty space in the content (e.g. after line text or below last line)
-+	 */
-+	CONTENT_EMPTY,
-+	/**
-+	 * Mouse is on top of a view zone in the content.
-+	 */
-+	CONTENT_VIEW_ZONE,
-+	/**
-+	 * Mouse is on top of a content widget.
-+	 */
-+	CONTENT_WIDGET,
-+	/**
-+	 * Mouse is on top of the decorations overview ruler.
-+	 */
-+	OVERVIEW_RULER,
-+	/**
-+	 * Mouse is on top of a scrollbar.
-+	 */
-+	SCROLLBAR,
-+	/**
-+	 * Mouse is on top of an overlay widget.
-+	 */
-+	OVERLAY_WIDGET
-+}
-+
-+/**
-+ * A model for the diff editor.
-+ */
-+export interface IDiffEditorModel extends IEditorModel {
-+	/**
-+	 * Original model.
-+	 */
-+	original: IModel;
-+	/**
-+	 * Modified model.
-+	 */
-+	modified: IModel;
-+}
-+/**
-+ * (Serializable) View state for the diff editor.
-+ */
-+export interface IDiffEditorViewState extends IEditorViewState {
-+	original: ICodeEditorViewState;
-+	modified: ICodeEditorViewState;
-+}
-+/**
-+ * A change
-+ */
-+export interface IChange {
-+	readonly originalStartLineNumber: number;
-+	readonly originalEndLineNumber: number;
-+	readonly modifiedStartLineNumber: number;
-+	readonly modifiedEndLineNumber: number;
-+}
-+/**
-+ * A character level change.
-+ */
-+export interface ICharChange extends IChange {
-+	readonly originalStartColumn: number;
-+	readonly originalEndColumn: number;
-+	readonly modifiedStartColumn: number;
-+	readonly modifiedEndColumn: number;
-+}
-+/**
-+ * A line change
-+ */
-+export interface ILineChange extends IChange {
-+	readonly charChanges: ICharChange[];
-+}
-+/**
-+ * Information about a line in the diff editor
-+ */
-+export interface IDiffLineInformation {
-+	readonly equivalentLineNumber: number;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export namespace EditorContextKeys {
-+	/**
-+	 * A context key that is set when the editor's text has focus (cursor is blinking).
-+	 * @internal
-+	 */
-+	export const TextFocus = new RawContextKey<boolean>('editorTextFocus', false);
-+	/**
-+	 * A context key that is set when the editor's text or an editor's widget has focus.
-+	 * @internal
-+	 */
-+	export const Focus = new RawContextKey<boolean>('editorFocus', false);
-+
-+	/**
-+	 * A context key that is set when the editor's text is readonly.
-+	 * @internal
-+	 */
-+	export const ReadOnly = new RawContextKey<boolean>('editorReadonly', false);
-+
-+	/**
-+	 * @internal
-+	 */
-+	export const Writable: ContextKeyExpr = ReadOnly.toNegated();
-+
-+	/**
-+	 * A context key that is set when the editor has a non-collapsed selection.
-+	 * @internal
-+	 */
-+	export const HasNonEmptySelection = new RawContextKey<boolean>('editorHasSelection', false);
-+	/**
-+	 * @internal
-+	 */
-+	export const HasOnlyEmptySelection: ContextKeyExpr = HasNonEmptySelection.toNegated();
-+
-+	/**
-+	 * A context key that is set when the editor has multiple selections (multiple cursors).
-+	 * @internal
-+	 */
-+	export const HasMultipleSelections = new RawContextKey<boolean>('editorHasMultipleSelections', false);
-+	/**
-+	 * @internal
-+	 */
-+	export const HasSingleSelection: ContextKeyExpr = HasMultipleSelections.toNegated();
-+
-+	/**
-+	 * @internal
-+	 */
-+	export const TabMovesFocus = new RawContextKey<boolean>('editorTabMovesFocus', false);
-+	/**
-+	 * @internal
-+	 */
-+	export const TabDoesNotMoveFocus: ContextKeyExpr = TabMovesFocus.toNegated();
-+
-+	/**
-+	 * A context key that is set to the language associated with the model associated with the editor.
-+	 * @internal
-+	 */
-+	export const LanguageId = new RawContextKey<string>('editorLangId', undefined);
-+
-+};
-+
-+
-+/**
-+ * @internal
-+ */
-+export namespace ModeContextKeys {
-+	/**
-+	 * @internal
-+	 */
-+	export const hasCompletionItemProvider = new RawContextKey<boolean>('editorHasCompletionItemProvider', undefined);
-+	/**
-+	 * @internal
-+	 */
-+	export const hasCodeActionsProvider = new RawContextKey<boolean>('editorHasCodeActionsProvider', undefined);
-+	/**
-+	 * @internal
-+	 */
-+	export const hasCodeLensProvider = new RawContextKey<boolean>('editorHasCodeLensProvider', undefined);
-+	/**
-+	 * @internal
-+	 */
-+	export const hasDefinitionProvider = new RawContextKey<boolean>('editorHasDefinitionProvider', undefined);
-+	/**
-+	 * @internal
-+	 */
-+	export const hasImplementationProvider = new RawContextKey<boolean>('editorHasImplementationProvider', undefined);
-+	/**
-+	 * @internal
-+	 */
-+	export const hasHoverProvider = new RawContextKey<boolean>('editorHasHoverProvider', undefined);
-+	/**
-+	 * @internal
-+	 */
-+	export const hasDocumentHighlightProvider = new RawContextKey<boolean>('editorHasDocumentHighlightProvider', undefined);
-+	/**
-+	 * @internal
-+	 */
-+	export const hasDocumentSymbolProvider = new RawContextKey<boolean>('editorHasDocumentSymbolProvider', undefined);
-+	/**
-+	 * @internal
-+	 */
-+	export const hasReferenceProvider = new RawContextKey<boolean>('editorHasReferenceProvider', undefined);
-+	/**
-+	 * @internal
-+	 */
-+	export const hasRenameProvider = new RawContextKey<boolean>('editorHasRenameProvider', undefined);
-+	/**
-+	 * @internal
-+	 */
-+	export const hasDocumentFormattingProvider = new RawContextKey<boolean>('editorHasDocumentFormattingProvider', undefined);
-+	/**
-+	 * @internal
-+	 */
-+	export const hasDocumentSelectionFormattingProvider = new RawContextKey<boolean>('editorHasDocumentSelectionFormattingProvider', undefined);
-+	/**
-+	 * @internal
-+	 */
-+	export const hasSignatureHelpProvider = new RawContextKey<boolean>('editorHasSignatureHelpProvider', undefined);
-+	/**
-+	 * @internal
-+	 */
-+	export const isInEmbeddedEditor = new RawContextKey<boolean>('isInEmbeddedEditor', undefined);
-+}
-+
-+
-+
-+/**
-+ * @internal
-+ */
-+export interface IConfiguration {
-+	readonly onDidChange: Event<IConfigurationChangedEvent>;
-+
-+	readonly editor: InternalEditorOptions;
-+
-+	setMaxLineNumber(maxLineNumber: number): void;
-+}
-+
-+// --- view
-+
-+/**
-+ * @internal
-+ */
-+export var ViewEventNames = {
-+	ModelFlushedEvent: 'modelFlushedEvent',
-+	LinesDeletedEvent: 'linesDeletedEvent',
-+	LinesInsertedEvent: 'linesInsertedEvent',
-+	LineChangedEvent: 'lineChangedEvent',
-+	TokensChangedEvent: 'tokensChangedEvent',
-+	DecorationsChangedEvent: 'decorationsChangedEvent',
-+	CursorPositionChangedEvent: 'cursorPositionChangedEvent',
-+	CursorSelectionChangedEvent: 'cursorSelectionChangedEvent',
-+	RevealRangeEvent: 'revealRangeEvent',
-+	LineMappingChangedEvent: 'lineMappingChangedEvent',
-+	ScrollRequestEvent: 'scrollRequestEvent'
-+};
-+
-+export interface IScrollEvent {
-+	readonly scrollTop: number;
-+	readonly scrollLeft: number;
-+	readonly scrollWidth: number;
-+	readonly scrollHeight: number;
-+
-+	readonly scrollTopChanged: boolean;
-+	readonly scrollLeftChanged: boolean;
-+	readonly scrollWidthChanged: boolean;
-+	readonly scrollHeightChanged: boolean;
-+}
-+
-+export interface INewScrollPosition {
-+	scrollLeft?: number;
-+	scrollTop?: number;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface IViewLinesDeletedEvent {
-+	/**
-+	 * At what line the deletion began (inclusive).
-+	 */
-+	readonly fromLineNumber: number;
-+	/**
-+	 * At what line the deletion stopped (inclusive).
-+	 */
-+	readonly toLineNumber: number;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface IViewLinesInsertedEvent {
-+	/**
-+	 * Before what line did the insertion begin
-+	 */
-+	readonly fromLineNumber: number;
-+	/**
-+	 * `toLineNumber` - `fromLineNumber` + 1 denotes the number of lines that were inserted
-+	 */
-+	readonly toLineNumber: number;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface IViewLineChangedEvent {
-+	/**
-+	 * The line that has changed.
-+	 */
-+	readonly lineNumber: number;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface IViewTokensChangedEvent {
-+	readonly ranges: {
-+		/**
-+		 * Start line number of range
-+		 */
-+		readonly fromLineNumber: number;
-+		/**
-+		 * End line number of range
-+		 */
-+		readonly toLineNumber: number;
-+	}[];
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface IViewDecorationsChangedEvent {
-+	_videDecorationsChangedEventBrand: void;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface IViewCursorPositionChangedEvent {
-+	/**
-+	 * Primary cursor's position.
-+	 */
-+	readonly position: Position;
-+	/**
-+	 * Secondary cursors' position.
-+	 */
-+	readonly secondaryPositions: Position[];
-+	/**
-+	 * Is the primary cursor in the editable range?
-+	 */
-+	readonly isInEditableRange: boolean;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface IViewCursorSelectionChangedEvent {
-+	/**
-+	 * The primary selection.
-+	 */
-+	readonly selection: Selection;
-+	/**
-+	 * The secondary selections.
-+	 */
-+	readonly secondarySelections: Selection[];
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface IViewRevealRangeEvent {
-+	/**
-+	 * Range to be reavealed.
-+	 */
-+	readonly range: Range;
-+
-+	readonly verticalType: VerticalRevealType;
-+	/**
-+	 * If true: there should be a horizontal & vertical revealing
-+	 * If false: there should be just a vertical revealing
-+	 */
-+	readonly revealHorizontal: boolean;
-+	/**
-+	 * If true: cursor is revealed if outside viewport
-+	 */
-+	readonly revealCursor: boolean;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface IViewScrollRequestEvent {
-+	readonly deltaLines: number;
-+	readonly revealCursor: boolean;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export interface IViewWhitespaceViewportData {
-+	readonly id: number;
-+	readonly afterLineNumber: number;
-+	readonly verticalOffset: number;
-+	readonly height: number;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export class Viewport {
-+	readonly _viewportBrand: void;
-+
-+	readonly top: number;
-+	readonly left: number;
-+	readonly width: number;
-+	readonly height: number;
-+
-+	constructor(top: number, left: number, width: number, height: number) {
-+		this.top = top | 0;
-+		this.left = left | 0;
-+		this.width = width | 0;
-+		this.height = height | 0;
-+	}
-+}
-+
-+/**
-+ * Description of an action contribution
-+ */
-+export interface IActionDescriptor {
-+	/**
-+	 * An unique identifier of the contributed action.
-+	 */
-+	id: string;
-+	/**
-+	 * A label of the action that will be presented to the user.
-+	 */
-+	label: string;
-+	/**
-+	 * Precondition rule.
-+	 */
-+	precondition?: string;
-+	/**
-+	 * An array of keybindings for the action.
-+	 */
-+	keybindings?: number[];
-+	/**
-+	 * The keybinding rule (condition on top of precondition).
-+	 */
-+	keybindingContext?: string;
-+	/**
-+	 * Control if the action should show up in the context menu and where.
-+	 * The context menu of the editor has these default:
-+	 *   navigation - The navigation group comes first in all cases.
-+	 *   1_modification - This group comes next and contains commands that modify your code.
-+	 *   9_cutcopypaste - The last default group with the basic editing commands.
-+	 * You can also create your own group.
-+	 * Defaults to null (don't show in context menu).
-+	 */
-+	contextMenuGroupId?: string;
-+	/**
-+	 * Control the order in the context menu group.
-+	 */
-+	contextMenuOrder?: number;
-+	/**
-+	 * Method that will be executed when the action is triggered.
-+	 * @param editor The editor instance is passed in as a convinience
-+	 */
-+	run(editor: ICommonCodeEditor): void | TPromise<void>;
-+}
-+
-+/**
-+ * @internal
-+ */
-+export type ICommonEditorContributionCtor = IConstructorSignature1<ICommonCodeEditor, IEditorContribution>;
-+
-+export interface IEditorAction {
-+	readonly id: string;
-+	readonly label: string;
-+	readonly alias: string;
-+	isSupported(): boolean;
-+	run(): TPromise<void>;
-+}
-+
-+/**
-+ * An editor.
-+ */
-+export interface IEditor {
-+	/**
-+	 * @deprecated. Please use `onDidChangeModelContent` instead.
-+	 * An event emitted when the content of the current model has changed.
-+	 * @internal
-+	 * @event
-+	 */
-+	onDidChangeModelRawContent(listener: (e: IModelContentChangedEvent) => void): IDisposable;
-+	/**
-+	 * An event emitted when the content of the current model has changed.
-+	 * @event
-+	 */
-+	onDidChangeModelContent(listener: (e: IModelContentChangedEvent2) => void): IDisposable;
-+	/**
-+	 * An event emitted when the language of the current model has changed.
-+	 * @event
-+	 */
-+	onDidChangeModelLanguage(listener: (e: IModelLanguageChangedEvent) => void): IDisposable;
-+	/**
-+	 * An event emitted when the options of the current model has changed.
-+	 * @event
-+	 */
-+	onDidChangeModelOptions(listener: (e: IModelOptionsChangedEvent) => void): IDisposable;
-+	/**
-+	 * An event emitted when the configuration of the editor has changed. (e.g. `editor.updateOptions()`)
-+	 * @event
-+	 */
-+	onDidChangeConfiguration(listener: (e: IConfigurationChangedEvent) => void): IDisposable;
-+	/**
-+	 * An event emitted when the cursor position has changed.
-+	 * @event
-+	 */
-+	onDidChangeCursorPosition(listener: (e: ICursorPositionChangedEvent) => void): IDisposable;
-+	/**
-+	 * An event emitted when the cursor selection has changed.
-+	 * @event
-+	 */
-+	onDidChangeCursorSelection(listener: (e: ICursorSelectionChangedEvent) => void): IDisposable;
-+	/**
-+	 * An event emitted when the editor has been disposed.
-+	 * @event
-+	 */
-+	onDidDispose(listener: () => void): IDisposable;
-+
-+	/**
-+	 * Dispose the editor.
-+	 */
-+	dispose(): void;
-+
-+	/**
-+	 * Get a unique id for this editor instance.
-+	 */
-+	getId(): string;
-+
-+	/**
-+	 * Get the editor type. Please see `EditorType`.
-+	 * This is to avoid an instanceof check
-+	 */
-+	getEditorType(): string;
-+
-+	/**
-+	 * Destroy the editor.
-+	 * @internal
-+	 */
-+	destroy(): void;
-+
-+	/**
-+	 * Update the editor's options after the editor has been created.
-+	 */
-+	updateOptions(newOptions: IEditorOptions): void;
-+
-+	/**
-+	 * Indicates that the editor becomes visible.
-+	 * @internal
-+	 */
-+	onVisible(): void;
-+
-+	/**
-+	 * Indicates that the editor becomes hidden.
-+	 * @internal
-+	 */
-+	onHide(): void;
-+
-+	/**
-+	 * Instructs the editor to remeasure its container. This method should
-+	 * be called when the container of the editor gets resized.
-+	 */
-+	layout(dimension?: IDimension): void;
-+
-+	/**
-+	 * Brings browser focus to the editor text
-+	 */
-+	focus(): void;
-+
-+	/**
-+	 * Returns true if this editor has keyboard focus (e.g. cursor is blinking).
-+	 */
-+	isFocused(): boolean;
-+
-+	/**
-+	 * Returns all actions associated with this editor.
-+	 */
-+	getActions(): IEditorAction[];
-+
-+	/**
-+	 * Returns all actions associated with this editor.
-+	 */
-+	getSupportedActions(): IEditorAction[];
-+
-+	/**
-+	 * Saves current view state of the editor in a serializable object.
-+	 */
-+	saveViewState(): IEditorViewState;
-+
-+	/**
-+	 * Restores the view state of the editor from a serializable object generated by `saveViewState`.
-+	 */
-+	restoreViewState(state: IEditorViewState): void;
-+
-+	/**
-+	 * Given a position, returns a column number that takes tab-widths into account.
-+	 */
-+	getVisibleColumnFromPosition(position: IPosition): number;
-+
-+	/**
-+	 * Returns the primary position of the cursor.
-+	 */
-+	getPosition(): Position;
-+
-+	/**
-+	 * Set the primary position of the cursor. This will remove any secondary cursors.
-+	 * @param position New primary cursor's position
-+	 */
-+	setPosition(position: IPosition): void;
-+
-+	/**
-+	 * Scroll vertically as necessary and reveal a line.
-+	 */
-+	revealLine(lineNumber: number): void;
-+
-+	/**
-+	 * Scroll vertically as necessary and reveal a line centered vertically.
-+	 */
-+	revealLineInCenter(lineNumber: number): void;
-+
-+	/**
-+	 * Scroll vertically as necessary and reveal a line centered vertically only if it lies outside the viewport.
-+	 */
-+	revealLineInCenterIfOutsideViewport(lineNumber: number): void;
-+
-+	/**
-+	 * Scroll vertically or horizontally as necessary and reveal a position.
-+	 */
-+	revealPosition(position: IPosition): void;
-+
-+	/**
-+	 * Scroll vertically or horizontally as necessary and reveal a position centered vertically.
-+	 */
-+	revealPositionInCenter(position: IPosition): void;
-+
-+	/**
-+	 * Scroll vertically or horizontally as necessary and reveal a position centered vertically only if it lies outside the viewport.
-+	 */
-+	revealPositionInCenterIfOutsideViewport(position: IPosition): void;
-+
-+	/**
-+	 * Returns the primary selection of the editor.
-+	 */
-+	getSelection(): Selection;
-+
-+	/**
-+	 * Returns all the selections of the editor.
-+	 */
-+	getSelections(): Selection[];
-+
-+	/**
-+	 * Set the primary selection of the editor. This will remove any secondary cursors.
-+	 * @param selection The new selection
-+	 */
-+	setSelection(selection: IRange): void;
-+	/**
-+	 * Set the primary selection of the editor. This will remove any secondary cursors.
-+	 * @param selection The new selection
-+	 */
-+	setSelection(selection: Range): void;
-+	/**
-+	 * Set the primary selection of the editor. This will remove any secondary cursors.
-+	 * @param selection The new selection
-+	 */
-+	setSelection(selection: ISelection): void;
-+	/**
-+	 * Set the primary selection of the editor. This will remove any secondary cursors.
-+	 * @param selection The new selection
-+	 */
-+	setSelection(selection: Selection): void;
-+
-+	/**
-+	 * Set the selections for all the cursors of the editor.
-+	 * Cursors will be removed or added, as necessary.
-+	 */
-+	setSelections(selections: ISelection[]): void;
-+
-+	/**
-+	 * Scroll vertically as necessary and reveal lines.
-+	 */
-+	revealLines(startLineNumber: number, endLineNumber: number): void;
-+
-+	/**
-+	 * Scroll vertically as necessary and reveal lines centered vertically.
-+	 */
-+	revealLinesInCenter(lineNumber: number, endLineNumber: number): void;
-+
-+	/**
-+	 * Scroll vertically as necessary and reveal lines centered vertically only if it lies outside the viewport.
-+	 */
-+	revealLinesInCenterIfOutsideViewport(lineNumber: number, endLineNumber: number): void;
-+
-+	/**
-+	 * Scroll vertically or horizontally as necessary and reveal a range.
-+	 */
-+	revealRange(range: IRange): void;
-+
-+	/**
-+	 * Scroll vertically or horizontally as necessary and reveal a range centered vertically.
-+	 */
-+	revealRangeInCenter(range: IRange): void;
-+
-+	/**
-+	 * Scroll vertically or horizontally as necessary and reveal a range at the top of the viewport.
-+	 */
-+	revealRangeAtTop(range: IRange): void;
-+
-+	/**
-+	 * Scroll vertically or horizontally as necessary and reveal a range centered vertically only if it lies outside the viewport.
-+	 */
-+	revealRangeInCenterIfOutsideViewport(range: IRange): void;
-+
-+
-+	/**
-+	 * Directly trigger a handler or an editor action.
-+	 * @param source The source of the call.
-+	 * @param handlerId The id of the handler or the id of a contribution.
-+	 * @param payload Extra data to be sent to the handler.
-+>>>>>>> .their
- 	 */
- 	original: ITextModel;
- 	/**
-@@ -419,12 +3415,22 @@
- 	revealRangeInCenter(range: IRange, scrollType?: ScrollType): void;
- 
- 	/**
-+<<<<<<< .our
- 	 * Scroll vertically or horizontally as necessary and reveal a range at the top of the viewport.
-+=======
-+	 * Get information based on computed diff about a line number from the original model.
-+	 * If the diff computation is not finished or the model is missing, will return null.
-+>>>>>>> .their
- 	 */
- 	revealRangeAtTop(range: IRange, scrollType?: ScrollType): void;
- 
- 	/**
-+<<<<<<< .our
- 	 * Scroll vertically or horizontally as necessary and reveal a range centered vertically only if it lies outside the viewport.
-+=======
-+	 * Get information based on computed diff about a line number from the modified model.
-+	 * If the diff computation is not finished or the model is missing, will return null.
-+>>>>>>> .their
- 	 */
- 	revealRangeInCenterIfOutsideViewport(range: IRange, scrollType?: ScrollType): void;
- 
-removed in local
-  base   100644 19fa5138cc46295f8b55773503d77cf3df008557 src/vs/editor/contrib/diffNavigator/common/diffNavigator.ts
-  their  100644 6327fbdae6f70db1eb70f60b072204c084f450af src/vs/editor/contrib/diffNavigator/common/diffNavigator.ts
-changed in both
-  base   100644 d6af73f63dfe05e76122a1f8924b982f709a2572 src/vs/monaco.d.ts
-  our    100644 76dcf491ff9c1973ad61bf5d423713bb1a3b4e44 src/vs/monaco.d.ts
-  their  100644 d2f5eadf1e98fbba058def565d3c9804eaaa451f src/vs/monaco.d.ts
-@@ -810,6 +810,7 @@
- 	}
- }
- 
-+<<<<<<< .our
- declare namespace monaco.editor {
- 
- 
-@@ -4119,6 +4120,3101 @@
- 	//compatibility:
- 	export type IReadOnlyModel = ITextModel;
- 	export type IModel = ITextModel;
-+=======
-+declare module monaco.editor {
-+
-+
-+    /**
-+     * Create a new editor under `domElement`.
-+     * `domElement` should be empty (not contain other dom nodes).
-+     * The editor will read the size of `domElement`.
-+     */
-+    export function create(domElement: HTMLElement, options?: IEditorConstructionOptions, override?: IEditorOverrideServices): IStandaloneCodeEditor;
-+
-+    /**
-+     * Emitted when an editor is created.
-+     * Creating a diff editor might cause this listener to be invoked with the two editors.
-+     * @event
-+     */
-+    export function onDidCreateEditor(listener: (codeEditor: ICodeEditor) => void): IDisposable;
-+
-+    /**
-+     * Create a new diff editor under `domElement`.
-+     * `domElement` should be empty (not contain other dom nodes).
-+     * The editor will read the size of `domElement`.
-+     */
-+    export function createDiffEditor(domElement: HTMLElement, options?: IDiffEditorConstructionOptions, override?: IEditorOverrideServices): IStandaloneDiffEditor;
-+
-+    export interface IDiffNavigator {
-+        revealFirst: boolean;
-+        canNavigate(): boolean;
-+        next(): void;
-+        previous(): void;
-+        dispose(): void;
-+    }
-+
-+    export interface IDiffNavigatorOptions {
-+        readonly followsCaret?: boolean;
-+        readonly ignoreCharChanges?: boolean;
-+        readonly alwaysRevealFirst?: boolean;
-+    }
-+
-+    export function createDiffNavigator(diffEditor: IStandaloneDiffEditor, opts?: IDiffNavigatorOptions): IDiffNavigator;
-+
-+    /**
-+     * Create a new editor model.
-+     * You can specify the language that should be set for this model or let the language be inferred from the `uri`.
-+     */
-+    export function createModel(value: string, language?: string, uri?: Uri): IModel;
-+
-+    /**
-+     * Change the language for a model.
-+     */
-+    export function setModelLanguage(model: IModel, language: string): void;
-+
-+    /**
-+     * Set the markers for a model.
-+     */
-+    export function setModelMarkers(model: IModel, owner: string, markers: IMarkerData[]): void;
-+
-+    /**
-+     * Get the model that has `uri` if it exists.
-+     */
-+    export function getModel(uri: Uri): IModel;
-+
-+    /**
-+     * Get all the created models.
-+     */
-+    export function getModels(): IModel[];
-+
-+    /**
-+     * Emitted when a model is created.
-+     * @event
-+     */
-+    export function onDidCreateModel(listener: (model: IModel) => void): IDisposable;
-+
-+    /**
-+     * Emitted right before a model is disposed.
-+     * @event
-+     */
-+    export function onWillDisposeModel(listener: (model: IModel) => void): IDisposable;
-+
-+    /**
-+     * Emitted when a different language is set to a model.
-+     * @event
-+     */
-+    export function onDidChangeModelLanguage(listener: (e: {
-+        readonly model: IModel;
-+        readonly oldLanguage: string;
-+    }) => void): IDisposable;
-+
-+    /**
-+     * Create a new web worker that has model syncing capabilities built in.
-+     * Specify an AMD module to load that will `create` an object that will be proxied.
-+     */
-+    export function createWebWorker<T>(opts: IWebWorkerOptions): MonacoWebWorker<T>;
-+
-+    /**
-+     * Colorize the contents of `domNode` using attribute `data-lang`.
-+     */
-+    export function colorizeElement(domNode: HTMLElement, options: IColorizerElementOptions): Promise<void>;
-+
-+    /**
-+     * Colorize `text` using language `languageId`.
-+     */
-+    export function colorize(text: string, languageId: string, options: IColorizerOptions): Promise<string>;
-+
-+    /**
-+     * Colorize a line in a model.
-+     */
-+    export function colorizeModelLine(model: IModel, lineNumber: number, tabSize?: number): string;
-+
-+    /**
-+     * Tokenize `text` using language `languageId`
-+     */
-+    export function tokenize(text: string, languageId: string): Token[][];
-+
-+    /**
-+     * Define a new theme.
-+     */
-+    export function defineTheme(themeName: string, themeData: ITheme): void;
-+
-+    export type BuiltinTheme = 'vs' | 'vs-dark' | 'hc-black';
-+
-+    export interface ITheme {
-+        base: BuiltinTheme;
-+        inherit: boolean;
-+        rules: IThemeRule[];
-+    }
-+
-+    export interface IThemeRule {
-+        token: string;
-+        foreground?: string;
-+        background?: string;
-+        fontStyle?: string;
-+    }
-+
-+    /**
-+     * A web worker that can provide a proxy to an arbitrary file.
-+     */
-+    export interface MonacoWebWorker<T> {
-+        /**
-+         * Terminate the web worker, thus invalidating the returned proxy.
-+         */
-+        dispose(): void;
-+        /**
-+         * Get a proxy to the arbitrary loaded code.
-+         */
-+        getProxy(): Promise<T>;
-+        /**
-+         * Synchronize (send) the models at `resources` to the web worker,
-+         * making them available in the monaco.worker.getMirrorModels().
-+         */
-+        withSyncedResources(resources: Uri[]): Promise<T>;
-+    }
-+
-+    export interface IWebWorkerOptions {
-+        /**
-+         * The AMD moduleId to load.
-+         * It should export a function `create` that should return the exported proxy.
-+         */
-+        moduleId: string;
-+        /**
-+         * The data to send over when calling create on the module.
-+         */
-+        createData?: any;
-+        /**
-+         * A label to be used to identify the web worker for debugging purposes.
-+         */
-+        label?: string;
-+    }
-+
-+    /**
-+     * The options to create an editor.
-+     */
-+    export interface IEditorConstructionOptions extends ICodeEditorWidgetCreationOptions {
-+        /**
-+         * The initial value of the auto created model in the editor.
-+         * To not create automatically a model, use `model: null`.
-+         */
-+        value?: string;
-+        /**
-+         * The initial language of the auto created model in the editor.
-+         * To not create automatically a model, use `model: null`.
-+         */
-+        language?: string;
-+    }
-+
-+    /**
-+     * The options to create a diff editor.
-+     */
-+    export interface IDiffEditorConstructionOptions extends IDiffEditorOptions {
-+    }
-+
-+    export interface IStandaloneCodeEditor extends ICodeEditor {
-+        addCommand(keybinding: number, handler: ICommandHandler, context: string): string;
-+        createContextKey<T>(key: string, defaultValue: T): IContextKey<T>;
-+        addAction(descriptor: IActionDescriptor): IDisposable;
-+    }
-+
-+    export interface IStandaloneDiffEditor extends IDiffEditor {
-+        addCommand(keybinding: number, handler: ICommandHandler, context: string): string;
-+        createContextKey<T>(key: string, defaultValue: T): IContextKey<T>;
-+        addAction(descriptor: IActionDescriptor): IDisposable;
-+        getOriginalEditor(): IStandaloneCodeEditor;
-+        getModifiedEditor(): IStandaloneCodeEditor;
-+    }
-+    export interface ICommandHandler {
-+        (...args: any[]): void;
-+    }
-+
-+    export interface IContextKey<T> {
-+        set(value: T): void;
-+        reset(): void;
-+        get(): T;
-+    }
-+
-+    export interface IEditorOverrideServices {
-+    }
-+
-+    /**
-+     * A structure defining a problem/warning/etc.
-+     */
-+    export interface IMarkerData {
-+        code?: string;
-+        severity: Severity;
-+        message: string;
-+        source?: string;
-+        startLineNumber: number;
-+        startColumn: number;
-+        endLineNumber: number;
-+        endColumn: number;
-+    }
-+
-+    export interface IColorizerOptions {
-+        tabSize?: number;
-+    }
-+
-+    export interface IColorizerElementOptions extends IColorizerOptions {
-+        theme?: string;
-+        mimeType?: string;
-+    }
-+
-+    export enum ScrollbarVisibility {
-+        Auto = 1,
-+        Hidden = 2,
-+        Visible = 3,
-+    }
-+
-+    /**
-+     * Configuration options for editor scrollbars
-+     */
-+    export interface IEditorScrollbarOptions {
-+        /**
-+         * The size of arrows (if displayed).
-+         * Defaults to 11.
-+         */
-+        arrowSize?: number;
-+        /**
-+         * Render vertical scrollbar.
-+         * Accepted values: 'auto', 'visible', 'hidden'.
-+         * Defaults to 'auto'.
-+         */
-+        vertical?: string;
-+        /**
-+         * Render horizontal scrollbar.
-+         * Accepted values: 'auto', 'visible', 'hidden'.
-+         * Defaults to 'auto'.
-+         */
-+        horizontal?: string;
-+        /**
-+         * Cast horizontal and vertical shadows when the content is scrolled.
-+         * Defaults to true.
-+         */
-+        useShadows?: boolean;
-+        /**
-+         * Render arrows at the top and bottom of the vertical scrollbar.
-+         * Defaults to false.
-+         */
-+        verticalHasArrows?: boolean;
-+        /**
-+         * Render arrows at the left and right of the horizontal scrollbar.
-+         * Defaults to false.
-+         */
-+        horizontalHasArrows?: boolean;
-+        /**
-+         * Listen to mouse wheel events and react to them by scrolling.
-+         * Defaults to true.
-+         */
-+        handleMouseWheel?: boolean;
-+        /**
-+         * Height in pixels for the horizontal scrollbar.
-+         * Defaults to 10 (px).
-+         */
-+        horizontalScrollbarSize?: number;
-+        /**
-+         * Width in pixels for the vertical scrollbar.
-+         * Defaults to 10 (px).
-+         */
-+        verticalScrollbarSize?: number;
-+        /**
-+         * Width in pixels for the vertical slider.
-+         * Defaults to `verticalScrollbarSize`.
-+         */
-+        verticalSliderSize?: number;
-+        /**
-+         * Height in pixels for the horizontal slider.
-+         * Defaults to `horizontalScrollbarSize`.
-+         */
-+        horizontalSliderSize?: number;
-+    }
-+
-+    /**
-+     * Describes how to indent wrapped lines.
-+     */
-+    export enum WrappingIndent {
-+        /**
-+         * No indentation => wrapped lines begin at column 1.
-+         */
-+        None = 0,
-+        /**
-+         * Same => wrapped lines get the same indentation as the parent.
-+         */
-+        Same = 1,
-+        /**
-+         * Indent => wrapped lines get +1 indentation as the parent.
-+         */
-+        Indent = 2,
-+    }
-+
-+    export type LineNumbersOption = 'on' | 'off' | 'relative' | ((lineNumber: number) => string);
-+
-+    /**
-+     * Configuration options for the editor.
-+     */
-+    export interface IEditorOptions {
-+        /**
-+         * Enable experimental screen reader support.
-+         * Defaults to `true`.
-+         */
-+        experimentalScreenReader?: boolean;
-+        /**
-+         * The aria label for the editor's textarea (when it is focused).
-+         */
-+        ariaLabel?: string;
-+        /**
-+         * Render vertical lines at the specified columns.
-+         * Defaults to empty array.
-+         */
-+        rulers?: number[];
-+        /**
-+         * A string containing the word separators used when doing word navigation.
-+         * Defaults to `~!@#$%^&*()-=+[{]}\\|;:\'",.<>/?
-+         */
-+        wordSeparators?: string;
-+        /**
-+         * Enable Linux primary clipboard.
-+         * Defaults to true.
-+         */
-+        selectionClipboard?: boolean;
-+        /**
-+         * Control the rendering of line numbers.
-+         * If it is a function, it will be invoked when rendering a line number and the return value will be rendered.
-+         * Otherwise, if it is a truey, line numbers will be rendered normally (equivalent of using an identity function).
-+         * Otherwise, line numbers will not be rendered.
-+         * Defaults to true.
-+         */
-+        lineNumbers?: LineNumbersOption;
-+        /**
-+         * Should the corresponding line be selected when clicking on the line number?
-+         * Defaults to true.
-+         */
-+        selectOnLineNumbers?: boolean;
-+        /**
-+         * Control the width of line numbers, by reserving horizontal space for rendering at least an amount of digits.
-+         * Defaults to 5.
-+         */
-+        lineNumbersMinChars?: number;
-+        /**
-+         * Enable the rendering of the glyph margin.
-+         * Defaults to true in vscode and to false in monaco-editor.
-+         */
-+        glyphMargin?: boolean;
-+        /**
-+         * The width reserved for line decorations (in px).
-+         * Line decorations are placed between line numbers and the editor content.
-+         * You can pass in a string in the format floating point followed by "ch". e.g. 1.3ch.
-+         * Defaults to 10.
-+         */
-+        lineDecorationsWidth?: number | string;
-+        /**
-+         * When revealing the cursor, a virtual padding (px) is added to the cursor, turning it into a rectangle.
-+         * This virtual padding ensures that the cursor gets revealed before hitting the edge of the viewport.
-+         * Defaults to 30 (px).
-+         */
-+        revealHorizontalRightPadding?: number;
-+        /**
-+         * Render the editor selection with rounded borders.
-+         * Defaults to true.
-+         */
-+        roundedSelection?: boolean;
-+        /**
-+         * Theme to be used for rendering.
-+         * The current out-of-the-box available themes are: 'vs' (default), 'vs-dark', 'hc-black'.
-+         * You can create custom themes via `monaco.editor.defineTheme`.
-+         */
-+        theme?: string;
-+        /**
-+         * Should the editor be read only.
-+         * Defaults to false.
-+         */
-+        readOnly?: boolean;
-+        /**
-+         * Control the behavior and rendering of the scrollbars.
-+         */
-+        scrollbar?: IEditorScrollbarOptions;
-+        /**
-+         * Display overflow widgets as `fixed`.
-+         * Defaults to `false`.
-+         */
-+        fixedOverflowWidgets?: boolean;
-+        /**
-+         * The number of vertical lanes the overview ruler should render.
-+         * Defaults to 2.
-+         */
-+        overviewRulerLanes?: number;
-+        /**
-+         * Control the cursor animation style, possible values are 'blink', 'smooth', 'phase', 'expand' and 'solid'.
-+         * Defaults to 'blink'.
-+         */
-+        cursorBlinking?: string;
-+        /**
-+         * Zoom the font in the editor when using the mouse wheel in combination with holding Ctrl.
-+         * Defaults to false.
-+         */
-+        mouseWheelZoom?: boolean;
-+        /**
-+         * Control the cursor style, either 'block' or 'line'.
-+         * Defaults to 'line'.
-+         */
-+        cursorStyle?: string;
-+        /**
-+         * Enable font ligatures.
-+         * Defaults to false.
-+         */
-+        fontLigatures?: boolean;
-+        /**
-+         * Disable the use of `translate3d`.
-+         * Defaults to false.
-+         */
-+        disableTranslate3d?: boolean;
-+        /**
-+         * Disable the optimizations for monospace fonts.
-+         * Defaults to false.
-+         */
-+        disableMonospaceOptimizations?: boolean;
-+        /**
-+         * Should the cursor be hidden in the overview ruler.
-+         * Defaults to false.
-+         */
-+        hideCursorInOverviewRuler?: boolean;
-+        /**
-+         * Enable that scrolling can go one screen size after the last line.
-+         * Defaults to true.
-+         */
-+        scrollBeyondLastLine?: boolean;
-+        /**
-+         * Enable that the editor will install an interval to check if its container dom node size has changed.
-+         * Enabling this might have a severe performance impact.
-+         * Defaults to false.
-+         */
-+        automaticLayout?: boolean;
-+        /**
-+         * Control the wrapping strategy of the editor.
-+         * Using -1 means no wrapping whatsoever.
-+         * Using 0 means viewport width wrapping (ajusts with the resizing of the editor).
-+         * Using a positive number means wrapping after a fixed number of characters.
-+         * Defaults to 300.
-+         */
-+        wrappingColumn?: number;
-+        /**
-+         * Control the alternate style of viewport wrapping.
-+         * When set to true viewport wrapping is used only when the window width is less than the number of columns specified in the wrappingColumn property. Has no effect if wrappingColumn is not a positive number.
-+         * Defaults to false.
-+         */
-+        wordWrap?: boolean;
-+        /**
-+         * Control indentation of wrapped lines. Can be: 'none', 'same' or 'indent'.
-+         * Defaults to 'same' in vscode and to 'none' in monaco-editor.
-+         */
-+        wrappingIndent?: string;
-+        /**
-+         * Configure word wrapping characters. A break will be introduced before these characters.
-+         * Defaults to '{([+'.
-+         */
-+        wordWrapBreakBeforeCharacters?: string;
-+        /**
-+         * Configure word wrapping characters. A break will be introduced after these characters.
-+         * Defaults to ' \t})]?|&,;'.
-+         */
-+        wordWrapBreakAfterCharacters?: string;
-+        /**
-+         * Configure word wrapping characters. A break will be introduced after these characters only if no `wordWrapBreakBeforeCharacters` or `wordWrapBreakAfterCharacters` were found.
-+         * Defaults to '.'.
-+         */
-+        wordWrapBreakObtrusiveCharacters?: string;
-+        /**
-+         * Performance guard: Stop rendering a line after x characters.
-+         * Defaults to 10000 if wrappingColumn is -1. Defaults to -1 if wrappingColumn is >= 0.
-+         * Use -1 to never stop rendering
-+         */
-+        stopRenderingLineAfter?: number;
-+        /**
-+         * Enable hover.
-+         * Defaults to true.
-+         */
-+        hover?: boolean;
-+        /**
-+         * Enable custom contextmenu.
-+         * Defaults to true.
-+         */
-+        contextmenu?: boolean;
-+        /**
-+         * A multiplier to be used on the `deltaX` and `deltaY` of mouse wheel scroll events.
-+         * Defaults to 1.
-+         */
-+        mouseWheelScrollSensitivity?: number;
-+        /**
-+         * Enable quick suggestions (shadow suggestions)
-+         * Defaults to true.
-+         */
-+        quickSuggestions?: boolean;
-+        /**
-+         * Quick suggestions show delay (in ms)
-+         * Defaults to 500 (ms)
-+         */
-+        quickSuggestionsDelay?: number;
-+        /**
-+         * Enables parameter hints
-+         */
-+        parameterHints?: boolean;
-+        /**
-+         * Render icons in suggestions box.
-+         * Defaults to true.
-+         */
-+        iconsInSuggestions?: boolean;
-+        /**
-+         * Enable auto closing brackets.
-+         * Defaults to true.
-+         */
-+        autoClosingBrackets?: boolean;
-+        /**
-+         * Enable format on type.
-+         * Defaults to false.
-+         */
-+        formatOnType?: boolean;
-+        /**
-+         * Enable format on paste.
-+         * Defaults to false.
-+         */
-+        formatOnPaste?: boolean;
-+        /**
-+         * Enable the suggestion box to pop-up on trigger characters.
-+         * Defaults to true.
-+         */
-+        suggestOnTriggerCharacters?: boolean;
-+        /**
-+         * Accept suggestions on ENTER.
-+         * Defaults to true.
-+         */
-+        acceptSuggestionOnEnter?: boolean;
-+        /**
-+         * Accept suggestions on provider defined characters.
-+         * Defaults to true.
-+         */
-+        acceptSuggestionOnCommitCharacter?: boolean;
-+        /**
-+         * Enable snippet suggestions. Default to 'true'.
-+         */
-+        snippetSuggestions?: 'top' | 'bottom' | 'inline' | 'none';
-+        /**
-+         * Copying without a selection copies the current line.
-+         */
-+        emptySelectionClipboard?: boolean;
-+        /**
-+         * Enable tab completion. Defaults to 'false'
-+         */
-+        tabCompletion?: boolean;
-+        /**
-+         * Enable word based suggestions. Defaults to 'true'
-+         */
-+        wordBasedSuggestions?: boolean;
-+        /**
-+         * The font size for the suggest widget.
-+         * Defaults to the editor font size.
-+         */
-+        suggestFontSize?: number;
-+        /**
-+         * The line height for the suggest widget.
-+         * Defaults to the editor line height.
-+         */
-+        suggestLineHeight?: number;
-+        /**
-+         * Enable selection highlight.
-+         * Defaults to true.
-+         */
-+        selectionHighlight?: boolean;
-+        /**
-+         * Show code lens
-+         * Defaults to true.
-+         */
-+        codeLens?: boolean;
-+        /**
-+         * Enable code folding
-+         * Defaults to true in vscode and to false in monaco-editor.
-+         */
-+        folding?: boolean;
-+        /**
-+         * Enable rendering of whitespace.
-+         * Defaults to none.
-+         */
-+        renderWhitespace?: 'none' | 'boundary' | 'all';
-+        /**
-+         * Enable rendering of control characters.
-+         * Defaults to false.
-+         */
-+        renderControlCharacters?: boolean;
-+        /**
-+         * Enable rendering of indent guides.
-+         * Defaults to false.
-+         */
-+        renderIndentGuides?: boolean;
-+        /**
-+         * Enable rendering of current line highlight.
-+         * Defaults to all.
-+         */
-+        renderLineHighlight?: 'none' | 'gutter' | 'line' | 'all';
-+        /**
-+         * Inserting and deleting whitespace follows tab stops.
-+         */
-+        useTabStops?: boolean;
-+        /**
-+         * The font family
-+         */
-+        fontFamily?: string;
-+        /**
-+         * The font weight
-+         */
-+        fontWeight?: 'normal' | 'bold' | 'bolder' | 'lighter' | 'initial' | 'inherit' | '100' | '200' | '300' | '400' | '500' | '600' | '700' | '800' | '900';
-+        /**
-+         * The font size
-+         */
-+        fontSize?: number;
-+        /**
-+         * The line height
-+         */
-+        lineHeight?: number;
-+    }
-+
-+    /**
-+     * Configuration options for the diff editor.
-+     */
-+    export interface IDiffEditorOptions extends IEditorOptions {
-+        /**
-+         * Allow the user to resize the diff editor split view.
-+         * Defaults to true.
-+         */
-+        enableSplitViewResizing?: boolean;
-+        /**
-+         * Render the differences in two side-by-side editors.
-+         * Defaults to true.
-+         */
-+        renderSideBySide?: boolean;
-+        /**
-+         * Compute the diff by ignoring leading/trailing whitespace
-+         * Defaults to true.
-+         */
-+        ignoreTrimWhitespace?: boolean;
-+        /**
-+         * Render +/- indicators for added/deleted changes.
-+         * Defaults to true.
-+         */
-+        renderIndicators?: boolean;
-+        /**
-+         * Original model should be editable?
-+         * Defaults to false.
-+         */
-+        originalEditable?: boolean;
-+    }
-+
-+    export class InternalEditorScrollbarOptions {
-+        readonly _internalEditorScrollbarOptionsBrand: void;
-+        readonly arrowSize: number;
-+        readonly vertical: ScrollbarVisibility;
-+        readonly horizontal: ScrollbarVisibility;
-+        readonly useShadows: boolean;
-+        readonly verticalHasArrows: boolean;
-+        readonly horizontalHasArrows: boolean;
-+        readonly handleMouseWheel: boolean;
-+        readonly horizontalScrollbarSize: number;
-+        readonly horizontalSliderSize: number;
-+        readonly verticalScrollbarSize: number;
-+        readonly verticalSliderSize: number;
-+        readonly mouseWheelScrollSensitivity: number;
-+    }
-+
-+    export class EditorWrappingInfo {
-+        readonly _editorWrappingInfoBrand: void;
-+        readonly isViewportWrapping: boolean;
-+        readonly wrappingColumn: number;
-+        readonly wrappingIndent: WrappingIndent;
-+        readonly wordWrapBreakBeforeCharacters: string;
-+        readonly wordWrapBreakAfterCharacters: string;
-+        readonly wordWrapBreakObtrusiveCharacters: string;
-+    }
-+
-+    export class InternalEditorViewOptions {
-+        readonly _internalEditorViewOptionsBrand: void;
-+        readonly theme: string;
-+        readonly canUseTranslate3d: boolean;
-+        readonly disableMonospaceOptimizations: boolean;
-+        readonly experimentalScreenReader: boolean;
-+        readonly rulers: number[];
-+        readonly ariaLabel: string;
-+        readonly renderLineNumbers: boolean;
-+        readonly renderCustomLineNumbers: (lineNumber: number) => string;
-+        readonly renderRelativeLineNumbers: boolean;
-+        readonly selectOnLineNumbers: boolean;
-+        readonly glyphMargin: boolean;
-+        readonly revealHorizontalRightPadding: number;
-+        readonly roundedSelection: boolean;
-+        readonly overviewRulerLanes: number;
-+        readonly cursorBlinking: TextEditorCursorBlinkingStyle;
-+        readonly mouseWheelZoom: boolean;
-+        readonly cursorStyle: TextEditorCursorStyle;
-+        readonly hideCursorInOverviewRuler: boolean;
-+        readonly scrollBeyondLastLine: boolean;
-+        readonly editorClassName: string;
-+        readonly stopRenderingLineAfter: number;
-+        readonly renderWhitespace: 'none' | 'boundary' | 'all';
-+        readonly renderControlCharacters: boolean;
-+        readonly renderIndentGuides: boolean;
-+        readonly renderLineHighlight: 'none' | 'gutter' | 'line' | 'all';
-+        readonly scrollbar: InternalEditorScrollbarOptions;
-+        readonly fixedOverflowWidgets: boolean;
-+    }
-+
-+    export interface IViewConfigurationChangedEvent {
-+        readonly theme: boolean;
-+        readonly canUseTranslate3d: boolean;
-+        readonly disableMonospaceOptimizations: boolean;
-+        readonly experimentalScreenReader: boolean;
-+        readonly rulers: boolean;
-+        readonly ariaLabel: boolean;
-+        readonly renderLineNumbers: boolean;
-+        readonly renderCustomLineNumbers: boolean;
-+        readonly renderRelativeLineNumbers: boolean;
-+        readonly selectOnLineNumbers: boolean;
-+        readonly glyphMargin: boolean;
-+        readonly revealHorizontalRightPadding: boolean;
-+        readonly roundedSelection: boolean;
-+        readonly overviewRulerLanes: boolean;
-+        readonly cursorBlinking: boolean;
-+        readonly mouseWheelZoom: boolean;
-+        readonly cursorStyle: boolean;
-+        readonly hideCursorInOverviewRuler: boolean;
-+        readonly scrollBeyondLastLine: boolean;
-+        readonly editorClassName: boolean;
-+        readonly stopRenderingLineAfter: boolean;
-+        readonly renderWhitespace: boolean;
-+        readonly renderControlCharacters: boolean;
-+        readonly renderIndentGuides: boolean;
-+        readonly renderLineHighlight: boolean;
-+        readonly scrollbar: boolean;
-+        readonly fixedOverflowWidgets: boolean;
-+    }
-+
-+    export class EditorContribOptions {
-+        readonly selectionClipboard: boolean;
-+        readonly hover: boolean;
-+        readonly contextmenu: boolean;
-+        readonly quickSuggestions: boolean;
-+        readonly quickSuggestionsDelay: number;
-+        readonly parameterHints: boolean;
-+        readonly iconsInSuggestions: boolean;
-+        readonly formatOnType: boolean;
-+        readonly formatOnPaste: boolean;
-+        readonly suggestOnTriggerCharacters: boolean;
-+        readonly acceptSuggestionOnEnter: boolean;
-+        readonly acceptSuggestionOnCommitCharacter: boolean;
-+        readonly snippetSuggestions: 'top' | 'bottom' | 'inline' | 'none';
-+        readonly emptySelectionClipboard: boolean;
-+        readonly tabCompletion: boolean;
-+        readonly wordBasedSuggestions: boolean;
-+        readonly suggestFontSize: number;
-+        readonly suggestLineHeight: number;
-+        readonly selectionHighlight: boolean;
-+        readonly codeLens: boolean;
-+        readonly folding: boolean;
-+    }
-+
-+    /**
-+     * Internal configuration options (transformed or computed) for the editor.
-+     */
-+    export class InternalEditorOptions {
-+        readonly _internalEditorOptionsBrand: void;
-+        readonly lineHeight: number;
-+        readonly readOnly: boolean;
-+        readonly wordSeparators: string;
-+        readonly autoClosingBrackets: boolean;
-+        readonly useTabStops: boolean;
-+        readonly tabFocusMode: boolean;
-+        readonly layoutInfo: EditorLayoutInfo;
-+        readonly fontInfo: FontInfo;
-+        readonly viewInfo: InternalEditorViewOptions;
-+        readonly wrappingInfo: EditorWrappingInfo;
-+        readonly contribInfo: EditorContribOptions;
-+    }
-+
-+    /**
-+     * An event describing that the configuration of the editor has changed.
-+     */
-+    export interface IConfigurationChangedEvent {
-+        readonly lineHeight: boolean;
-+        readonly readOnly: boolean;
-+        readonly wordSeparators: boolean;
-+        readonly autoClosingBrackets: boolean;
-+        readonly useTabStops: boolean;
-+        readonly tabFocusMode: boolean;
-+        readonly layoutInfo: boolean;
-+        readonly fontInfo: boolean;
-+        readonly viewInfo: IViewConfigurationChangedEvent;
-+        readonly wrappingInfo: boolean;
-+        readonly contribInfo: boolean;
-+    }
-+
-+    /**
-+     * Vertical Lane in the overview ruler of the editor.
-+     */
-+    export enum OverviewRulerLane {
-+        Left = 1,
-+        Center = 2,
-+        Right = 4,
-+        Full = 7,
-+    }
-+
-+    /**
-+     * Options for rendering a model decoration in the overview ruler.
-+     */
-+    export interface IModelDecorationOverviewRulerOptions {
-+        /**
-+         * CSS color to render in the overview ruler.
-+         * e.g.: rgba(100, 100, 100, 0.5)
-+         */
-+        color: string;
-+        /**
-+         * CSS color to render in the overview ruler.
-+         * e.g.: rgba(100, 100, 100, 0.5)
-+         */
-+        darkColor: string;
-+        /**
-+         * The position in the overview ruler.
-+         */
-+        position: OverviewRulerLane;
-+    }
-+
-+    /**
-+     * Options for a model decoration.
-+     */
-+    export interface IModelDecorationOptions {
-+        /**
-+         * Customize the growing behaviour of the decoration when typing at the edges of the decoration.
-+         * Defaults to TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges
-+         */
-+        stickiness?: TrackedRangeStickiness;
-+        /**
-+         * CSS class name describing the decoration.
-+         */
-+        className?: string;
-+        /**
-+         * Message to be rendered when hovering over the glyph margin decoration.
-+         */
-+        glyphMarginHoverMessage?: MarkedString | MarkedString[];
-+        /**
-+         * Array of MarkedString to render as the decoration message.
-+         */
-+        hoverMessage?: MarkedString | MarkedString[];
-+        /**
-+         * Should the decoration expand to encompass a whole line.
-+         */
-+        isWholeLine?: boolean;
-+        /**
-+         * @deprecated : Use `overviewRuler` instead
-+         */
-+        showInOverviewRuler?: string;
-+        /**
-+         * If set, render this decoration in the overview ruler.
-+         */
-+        overviewRuler?: IModelDecorationOverviewRulerOptions;
-+        /**
-+         * If set, the decoration will be rendered in the glyph margin with this CSS class name.
-+         */
-+        glyphMarginClassName?: string;
-+        /**
-+         * If set, the decoration will be rendered in the lines decorations with this CSS class name.
-+         */
-+        linesDecorationsClassName?: string;
-+        /**
-+         * If set, the decoration will be rendered in the margin (covering its full width) with this CSS class name.
-+         */
-+        marginClassName?: string;
-+        /**
-+         * If set, the decoration will be rendered inline with the text with this CSS class name.
-+         * Please use this only for CSS rules that must impact the text. For example, use `className`
-+         * to have a background color decoration.
-+         */
-+        inlineClassName?: string;
-+        /**
-+         * If set, the decoration will be rendered before the text with this CSS class name.
-+         */
-+        beforeContentClassName?: string;
-+        /**
-+         * If set, the decoration will be rendered after the text with this CSS class name.
-+         */
-+        afterContentClassName?: string;
-+    }
-+
-+    /**
-+     * New model decorations.
-+     */
-+    export interface IModelDeltaDecoration {
-+        /**
-+         * Range that this decoration covers.
-+         */
-+        range: IRange;
-+        /**
-+         * Options associated with this decoration.
-+         */
-+        options: IModelDecorationOptions;
-+    }
-+
-+    /**
-+     * A decoration in the model.
-+     */
-+    export interface IModelDecoration {
-+        /**
-+         * Identifier for a decoration.
-+         */
-+        readonly id: string;
-+        /**
-+         * Identifier for a decoration's owener.
-+         */
-+        readonly ownerId: number;
-+        /**
-+         * Range that this decoration covers.
-+         */
-+        readonly range: Range;
-+        /**
-+         * Options associated with this decoration.
-+         */
-+        readonly options: IModelDecorationOptions;
-+        /**
-+         * A flag describing if this is a problem decoration (e.g. warning/error).
-+         */
-+        readonly isForValidation: boolean;
-+    }
-+
-+    /**
-+     * Word inside a model.
-+     */
-+    export interface IWordAtPosition {
-+        /**
-+         * The word.
-+         */
-+        readonly word: string;
-+        /**
-+         * The column where the word starts.
-+         */
-+        readonly startColumn: number;
-+        /**
-+         * The column where the word ends.
-+         */
-+        readonly endColumn: number;
-+    }
-+
-+    /**
-+     * End of line character preference.
-+     */
-+    export enum EndOfLinePreference {
-+        /**
-+         * Use the end of line character identified in the text buffer.
-+         */
-+        TextDefined = 0,
-+        /**
-+         * Use line feed (\n) as the end of line character.
-+         */
-+        LF = 1,
-+        /**
-+         * Use carriage return and line feed (\r\n) as the end of line character.
-+         */
-+        CRLF = 2,
-+    }
-+
-+    /**
-+     * The default end of line to use when instantiating models.
-+     */
-+    export enum DefaultEndOfLine {
-+        /**
-+         * Use line feed (\n) as the end of line character.
-+         */
-+        LF = 1,
-+        /**
-+         * Use carriage return and line feed (\r\n) as the end of line character.
-+         */
-+        CRLF = 2,
-+    }
-+
-+    /**
-+     * End of line character preference.
-+     */
-+    export enum EndOfLineSequence {
-+        /**
-+         * Use line feed (\n) as the end of line character.
-+         */
-+        LF = 0,
-+        /**
-+         * Use carriage return and line feed (\r\n) as the end of line character.
-+         */
-+        CRLF = 1,
-+    }
-+
-+    /**
-+     * An identifier for a single edit operation.
-+     */
-+    export interface ISingleEditOperationIdentifier {
-+        /**
-+         * Identifier major
-+         */
-+        major: number;
-+        /**
-+         * Identifier minor
-+         */
-+        minor: number;
-+    }
-+
-+    /**
-+     * A builder and helper for edit operations for a command.
-+     */
-+    export interface IEditOperationBuilder {
-+        /**
-+         * Add a new edit operation (a replace operation).
-+         * @param range The range to replace (delete). May be empty to represent a simple insert.
-+         * @param text The text to replace with. May be null to represent a simple delete.
-+         */
-+        addEditOperation(range: Range, text: string): void;
-+        /**
-+         * Track `selection` when applying edit operations.
-+         * A best effort will be made to not grow/expand the selection.
-+         * An empty selection will clamp to a nearby character.
-+         * @param selection The selection to track.
-+         * @param trackPreviousOnEmpty If set, and the selection is empty, indicates whether the selection
-+         *           should clamp to the previous or the next character.
-+         * @return A unique identifer.
-+         */
-+        trackSelection(selection: Selection, trackPreviousOnEmpty?: boolean): string;
-+    }
-+
-+    /**
-+     * A helper for computing cursor state after a command.
-+     */
-+    export interface ICursorStateComputerData {
-+        /**
-+         * Get the inverse edit operations of the added edit operations.
-+         */
-+        getInverseEditOperations(): IIdentifiedSingleEditOperation[];
-+        /**
-+         * Get a previously tracked selection.
-+         * @param id The unique identifier returned by `trackSelection`.
-+         * @return The selection.
-+         */
-+        getTrackedSelection(id: string): Selection;
-+    }
-+
-+    /**
-+     * A command that modifies text / cursor state on a model.
-+     */
-+    export interface ICommand {
-+        /**
-+         * Get the edit operations needed to execute this command.
-+         * @param model The model the command will execute on.
-+         * @param builder A helper to collect the needed edit operations and to track selections.
-+         */
-+        getEditOperations(model: ITokenizedModel, builder: IEditOperationBuilder): void;
-+        /**
-+         * Compute the cursor state after the edit operations were applied.
-+         * @param model The model the commad has executed on.
-+         * @param helper A helper to get inverse edit operations and to get previously tracked selections.
-+         * @return The cursor state after the command executed.
-+         */
-+        computeCursorState(model: ITokenizedModel, helper: ICursorStateComputerData): Selection;
-+    }
-+
-+    /**
-+     * A single edit operation, that acts as a simple replace.
-+     * i.e. Replace text at `range` with `text` in model.
-+     */
-+    export interface ISingleEditOperation {
-+        /**
-+         * The range to replace. This can be empty to emulate a simple insert.
-+         */
-+        range: IRange;
-+        /**
-+         * The text to replace with. This can be null to emulate a simple delete.
-+         */
-+        text: string;
-+        /**
-+         * This indicates that this operation has "insert" semantics.
-+         * i.e. forceMoveMarkers = true => if `range` is collapsed, all markers at the position will be moved.
-+         */
-+        forceMoveMarkers?: boolean;
-+    }
-+
-+    /**
-+     * A single edit operation, that has an identifier.
-+     */
-+    export interface IIdentifiedSingleEditOperation {
-+        /**
-+         * An identifier associated with this single edit operation.
-+         */
-+        identifier: ISingleEditOperationIdentifier;
-+        /**
-+         * The range to replace. This can be empty to emulate a simple insert.
-+         */
-+        range: Range;
-+        /**
-+         * The text to replace with. This can be null to emulate a simple delete.
-+         */
-+        text: string;
-+        /**
-+         * This indicates that this operation has "insert" semantics.
-+         * i.e. forceMoveMarkers = true => if `range` is collapsed, all markers at the position will be moved.
-+         */
-+        forceMoveMarkers: boolean;
-+        /**
-+         * This indicates that this operation is inserting automatic whitespace
-+         * that can be removed on next model edit operation if `config.trimAutoWhitespace` is true.
-+         */
-+        isAutoWhitespaceEdit?: boolean;
-+    }
-+
-+    /**
-+     * A callback that can compute the cursor state after applying a series of edit operations.
-+     */
-+    export interface ICursorStateComputer {
-+        /**
-+         * A callback that can compute the resulting cursors state after some edit operations have been executed.
-+         */
-+        (inverseEditOperations: IIdentifiedSingleEditOperation[]): Selection[];
-+    }
-+
-+    export class TextModelResolvedOptions {
-+        _textModelResolvedOptionsBrand: void;
-+        readonly tabSize: number;
-+        readonly insertSpaces: boolean;
-+        readonly defaultEOL: DefaultEndOfLine;
-+        readonly trimAutoWhitespace: boolean;
-+    }
-+
-+    export interface ITextModelUpdateOptions {
-+        tabSize?: number;
-+        insertSpaces?: boolean;
-+        trimAutoWhitespace?: boolean;
-+    }
-+
-+    export interface IModelOptionsChangedEvent {
-+        readonly tabSize: boolean;
-+        readonly insertSpaces: boolean;
-+        readonly trimAutoWhitespace: boolean;
-+    }
-+
-+    /**
-+     * A textual read-only model.
-+     */
-+    export interface ITextModel {
-+        getOptions(): TextModelResolvedOptions;
-+        /**
-+         * Get the current version id of the model.
-+         * Anytime a change happens to the model (even undo/redo),
-+         * the version id is incremented.
-+         */
-+        getVersionId(): number;
-+        /**
-+         * Get the alternative version id of the model.
-+         * This alternative version id is not always incremented,
-+         * it will return the same values in the case of undo-redo.
-+         */
-+        getAlternativeVersionId(): number;
-+        /**
-+         * Replace the entire text buffer value contained in this model.
-+         */
-+        setValue(newValue: string): void;
-+        /**
-+         * Get the text stored in this model.
-+         * @param eol The end of line character preference. Defaults to `EndOfLinePreference.TextDefined`.
-+         * @param preserverBOM Preserve a BOM character if it was detected when the model was constructed.
-+         * @return The text.
-+         */
-+        getValue(eol?: EndOfLinePreference, preserveBOM?: boolean): string;
-+        /**
-+         * Get the length of the text stored in this model.
-+         */
-+        getValueLength(eol?: EndOfLinePreference, preserveBOM?: boolean): number;
-+        /**
-+         * Get the text in a certain range.
-+         * @param range The range describing what text to get.
-+         * @param eol The end of line character preference. This will only be used for multiline ranges. Defaults to `EndOfLinePreference.TextDefined`.
-+         * @return The text.
-+         */
-+        getValueInRange(range: IRange, eol?: EndOfLinePreference): string;
-+        /**
-+         * Get the length of text in a certain range.
-+         * @param range The range describing what text length to get.
-+         * @return The text length.
-+         */
-+        getValueLengthInRange(range: IRange): number;
-+        /**
-+         * Get the number of lines in the model.
-+         */
-+        getLineCount(): number;
-+        /**
-+         * Get the text for a certain line.
-+         */
-+        getLineContent(lineNumber: number): string;
-+        /**
-+         * Get the text for all lines.
-+         */
-+        getLinesContent(): string[];
-+        /**
-+         * Get the end of line sequence predominantly used in the text buffer.
-+         * @return EOL char sequence (e.g.: '\n' or '\r\n').
-+         */
-+        getEOL(): string;
-+        /**
-+         * Change the end of line sequence used in the text buffer.
-+         */
-+        setEOL(eol: EndOfLineSequence): void;
-+        /**
-+         * Get the minimum legal column for line at `lineNumber`
-+         */
-+        getLineMinColumn(lineNumber: number): number;
-+        /**
-+         * Get the maximum legal column for line at `lineNumber`
-+         */
-+        getLineMaxColumn(lineNumber: number): number;
-+        /**
-+         * Returns the column before the first non whitespace character for line at `lineNumber`.
-+         * Returns 0 if line is empty or contains only whitespace.
-+         */
-+        getLineFirstNonWhitespaceColumn(lineNumber: number): number;
-+        /**
-+         * Returns the column after the last non whitespace character for line at `lineNumber`.
-+         * Returns 0 if line is empty or contains only whitespace.
-+         */
-+        getLineLastNonWhitespaceColumn(lineNumber: number): number;
-+        /**
-+         * Create a valid position,
-+         */
-+        validatePosition(position: IPosition): Position;
-+        /**
-+         * Advances the given position by the given offest (negative offsets are also accepted)
-+         * and returns it as a new valid position.
-+         *
-+         * If the offset and position are such that their combination goes beyond the beginning or
-+         * end of the model, throws an exception.
-+         *
-+         * If the ofsset is such that the new position would be in the middle of a multi-byte
-+         * line terminator, throws an exception.
-+         */
-+        modifyPosition(position: IPosition, offset: number): Position;
-+        /**
-+         * Create a valid range.
-+         */
-+        validateRange(range: IRange): Range;
-+        /**
-+         * Converts the position to a zero-based offset.
-+         *
-+         * The position will be [adjusted](#TextDocument.validatePosition).
-+         *
-+         * @param position A position.
-+         * @return A valid zero-based offset.
-+         */
-+        getOffsetAt(position: IPosition): number;
-+        /**
-+         * Converts a zero-based offset to a position.
-+         *
-+         * @param offset A zero-based offset.
-+         * @return A valid [position](#Position).
-+         */
-+        getPositionAt(offset: number): Position;
-+        /**
-+         * Get a range covering the entire model
-+         */
-+        getFullModelRange(): Range;
-+        /**
-+         * Returns iff the model was disposed or not.
-+         */
-+        isDisposed(): boolean;
-+        /**
-+         * Search the model.
-+         * @param searchString The string used to search. If it is a regular expression, set `isRegex` to true.
-+         * @param searchOnlyEditableRange Limit the searching to only search inside the editable range of the model.
-+         * @param isRegex Used to indicate that `searchString` is a regular expression.
-+         * @param matchCase Force the matching to match lower/upper case exactly.
-+         * @param wholeWord Force the matching to match entire words only.
-+         * @param captureMatches The result will contain the captured groups.
-+         * @param limitResultCount Limit the number of results
-+         * @return The ranges where the matches are. It is empty if not matches have been found.
-+         */
-+        findMatches(searchString: string, searchOnlyEditableRange: boolean, isRegex: boolean, matchCase: boolean, wholeWord: boolean, captureMatches: boolean, limitResultCount?: number): FindMatch[];
-+        /**
-+         * Search the model.
-+         * @param searchString The string used to search. If it is a regular expression, set `isRegex` to true.
-+         * @param searchScope Limit the searching to only search inside this range.
-+         * @param isRegex Used to indicate that `searchString` is a regular expression.
-+         * @param matchCase Force the matching to match lower/upper case exactly.
-+         * @param wholeWord Force the matching to match entire words only.
-+         * @param captureMatches The result will contain the captured groups.
-+         * @param limitResultCount Limit the number of results
-+         * @return The ranges where the matches are. It is empty if no matches have been found.
-+         */
-+        findMatches(searchString: string, searchScope: IRange, isRegex: boolean, matchCase: boolean, wholeWord: boolean, captureMatches: boolean, limitResultCount?: number): FindMatch[];
-+        /**
-+         * Search the model for the next match. Loops to the beginning of the model if needed.
-+         * @param searchString The string used to search. If it is a regular expression, set `isRegex` to true.
-+         * @param searchStart Start the searching at the specified position.
-+         * @param isRegex Used to indicate that `searchString` is a regular expression.
-+         * @param matchCase Force the matching to match lower/upper case exactly.
-+         * @param wholeWord Force the matching to match entire words only.
-+         * @param captureMatches The result will contain the captured groups.
-+         * @return The range where the next match is. It is null if no next match has been found.
-+         */
-+        findNextMatch(searchString: string, searchStart: IPosition, isRegex: boolean, matchCase: boolean, wholeWord: boolean, captureMatches: boolean): FindMatch;
-+        /**
-+         * Search the model for the previous match. Loops to the end of the model if needed.
-+         * @param searchString The string used to search. If it is a regular expression, set `isRegex` to true.
-+         * @param searchStart Start the searching at the specified position.
-+         * @param isRegex Used to indicate that `searchString` is a regular expression.
-+         * @param matchCase Force the matching to match lower/upper case exactly.
-+         * @param wholeWord Force the matching to match entire words only.
-+         * @param captureMatches The result will contain the captured groups.
-+         * @return The range where the previous match is. It is null if no previous match has been found.
-+         */
-+        findPreviousMatch(searchString: string, searchStart: IPosition, isRegex: boolean, matchCase: boolean, wholeWord: boolean, captureMatches: boolean): FindMatch;
-+    }
-+
-+    export class FindMatch {
-+        _findMatchBrand: void;
-+        readonly range: Range;
-+        readonly matches: string[];
-+    }
-+
-+    export interface IReadOnlyModel extends ITextModel {
-+        /**
-+         * Gets the resource associated with this editor model.
-+         */
-+        readonly uri: Uri;
-+        /**
-+         * Get the language associated with this model.
-+         */
-+        getModeId(): string;
-+        /**
-+         * Get the word under or besides `position`.
-+         * @param position The position to look for a word.
-+         * @param skipSyntaxTokens Ignore syntax tokens, as identified by the mode.
-+         * @return The word under or besides `position`. Might be null.
-+         */
-+        getWordAtPosition(position: IPosition): IWordAtPosition;
-+        /**
-+         * Get the word under or besides `position` trimmed to `position`.column
-+         * @param position The position to look for a word.
-+         * @param skipSyntaxTokens Ignore syntax tokens, as identified by the mode.
-+         * @return The word under or besides `position`. Will never be null.
-+         */
-+        getWordUntilPosition(position: IPosition): IWordAtPosition;
-+    }
-+
-+    /**
-+     * A model that is tokenized.
-+     */
-+    export interface ITokenizedModel extends ITextModel {
-+        /**
-+         * Get the language associated with this model.
-+         */
-+        getModeId(): string;
-+        /**
-+         * Get the word under or besides `position`.
-+         * @param position The position to look for a word.
-+         * @param skipSyntaxTokens Ignore syntax tokens, as identified by the mode.
-+         * @return The word under or besides `position`. Might be null.
-+         */
-+        getWordAtPosition(position: IPosition): IWordAtPosition;
-+        /**
-+         * Get the word under or besides `position` trimmed to `position`.column
-+         * @param position The position to look for a word.
-+         * @param skipSyntaxTokens Ignore syntax tokens, as identified by the mode.
-+         * @return The word under or besides `position`. Will never be null.
-+         */
-+        getWordUntilPosition(position: IPosition): IWordAtPosition;
-+    }
-+
-+    /**
-+     * A model that can track markers.
-+     */
-+    export interface ITextModelWithMarkers extends ITextModel {
-+    }
-+
-+    /**
-+     * Describes the behaviour of decorations when typing/editing near their edges.
-+     */
-+    export enum TrackedRangeStickiness {
-+        AlwaysGrowsWhenTypingAtEdges = 0,
-+        NeverGrowsWhenTypingAtEdges = 1,
-+        GrowsOnlyWhenTypingBefore = 2,
-+        GrowsOnlyWhenTypingAfter = 3,
-+    }
-+
-+    /**
-+     * A model that can have decorations.
-+     */
-+    export interface ITextModelWithDecorations {
-+        /**
-+         * Perform a minimum ammount of operations, in order to transform the decorations
-+         * identified by `oldDecorations` to the decorations described by `newDecorations`
-+         * and returns the new identifiers associated with the resulting decorations.
-+         *
-+         * @param oldDecorations Array containing previous decorations identifiers.
-+         * @param newDecorations Array describing what decorations should result after the call.
-+         * @param ownerId Identifies the editor id in which these decorations should appear. If no `ownerId` is provided, the decorations will appear in all editors that attach this model.
-+         * @return An array containing the new decorations identifiers.
-+         */
-+        deltaDecorations(oldDecorations: string[], newDecorations: IModelDeltaDecoration[], ownerId?: number): string[];
-+        /**
-+         * Get the options associated with a decoration.
-+         * @param id The decoration id.
-+         * @return The decoration options or null if the decoration was not found.
-+         */
-+        getDecorationOptions(id: string): IModelDecorationOptions;
-+        /**
-+         * Get the range associated with a decoration.
-+         * @param id The decoration id.
-+         * @return The decoration range or null if the decoration was not found.
-+         */
-+        getDecorationRange(id: string): Range;
-+        /**
-+         * Gets all the decorations for the line `lineNumber` as an array.
-+         * @param lineNumber The line number
-+         * @param ownerId If set, it will ignore decorations belonging to other owners.
-+         * @param filterOutValidation If set, it will ignore decorations specific to validation (i.e. warnings, errors).
-+         * @return An array with the decorations
-+         */
-+        getLineDecorations(lineNumber: number, ownerId?: number, filterOutValidation?: boolean): IModelDecoration[];
-+        /**
-+         * Gets all the decorations for the lines between `startLineNumber` and `endLineNumber` as an array.
-+         * @param startLineNumber The start line number
-+         * @param endLineNumber The end line number
-+         * @param ownerId If set, it will ignore decorations belonging to other owners.
-+         * @param filterOutValidation If set, it will ignore decorations specific to validation (i.e. warnings, errors).
-+         * @return An array with the decorations
-+         */
-+        getLinesDecorations(startLineNumber: number, endLineNumber: number, ownerId?: number, filterOutValidation?: boolean): IModelDecoration[];
-+        /**
-+         * Gets all the deocorations in a range as an array. Only `startLineNumber` and `endLineNumber` from `range` are used for filtering.
-+         * So for now it returns all the decorations on the same line as `range`.
-+         * @param range The range to search in
-+         * @param ownerId If set, it will ignore decorations belonging to other owners.
-+         * @param filterOutValidation If set, it will ignore decorations specific to validation (i.e. warnings, errors).
-+         * @return An array with the decorations
-+         */
-+        getDecorationsInRange(range: IRange, ownerId?: number, filterOutValidation?: boolean): IModelDecoration[];
-+        /**
-+         * Gets all the decorations as an array.
-+         * @param ownerId If set, it will ignore decorations belonging to other owners.
-+         * @param filterOutValidation If set, it will ignore decorations specific to validation (i.e. warnings, errors).
-+         */
-+        getAllDecorations(ownerId?: number, filterOutValidation?: boolean): IModelDecoration[];
-+    }
-+
-+    /**
-+     * An editable text model.
-+     */
-+    export interface IEditableTextModel extends ITextModelWithMarkers {
-+        /**
-+         * Normalize a string containing whitespace according to indentation rules (converts to spaces or to tabs).
-+         */
-+        normalizeIndentation(str: string): string;
-+        /**
-+         * Get what is considered to be one indent (e.g. a tab character or 4 spaces, etc.).
-+         */
-+        getOneIndent(): string;
-+        /**
-+         * Change the options of this model.
-+         */
-+        updateOptions(newOpts: ITextModelUpdateOptions): void;
-+        /**
-+         * Detect the indentation options for this model from its content.
-+         */
-+        detectIndentation(defaultInsertSpaces: boolean, defaultTabSize: number): void;
-+        /**
-+         * Push a stack element onto the undo stack. This acts as an undo/redo point.
-+         * The idea is to use `pushEditOperations` to edit the model and then to
-+         * `pushStackElement` to create an undo/redo stop point.
-+         */
-+        pushStackElement(): void;
-+        /**
-+         * Push edit operations, basically editing the model. This is the preferred way
-+         * of editing the model. The edit operations will land on the undo stack.
-+         * @param beforeCursorState The cursor state before the edit operaions. This cursor state will be returned when `undo` or `redo` are invoked.
-+         * @param editOperations The edit operations.
-+         * @param cursorStateComputer A callback that can compute the resulting cursors state after the edit operations have been executed.
-+         * @return The cursor state returned by the `cursorStateComputer`.
-+         */
-+        pushEditOperations(beforeCursorState: Selection[], editOperations: IIdentifiedSingleEditOperation[], cursorStateComputer: ICursorStateComputer): Selection[];
-+        /**
-+         * Edit the model without adding the edits to the undo stack.
-+         * This can have dire consequences on the undo stack! See @pushEditOperations for the preferred way.
-+         * @param operations The edit operations.
-+         * @return The inverse edit operations, that, when applied, will bring the model back to the previous state.
-+         */
-+        applyEdits(operations: IIdentifiedSingleEditOperation[]): IIdentifiedSingleEditOperation[];
-+    }
-+
-+    /**
-+     * A model.
-+     */
-+    export interface IModel extends IReadOnlyModel, IEditableTextModel, ITextModelWithMarkers, ITokenizedModel, ITextModelWithDecorations, IEditorModel {
-+        /**
-+         * An event emitted when the contents of the model have changed.
-+         * @event
-+         */
-+        onDidChangeContent(listener: (e: IModelContentChangedEvent2) => void): IDisposable;
-+        /**
-+         * An event emitted when decorations of the model have changed.
-+         * @event
-+         */
-+        onDidChangeDecorations(listener: (e: IModelDecorationsChangedEvent) => void): IDisposable;
-+        /**
-+         * An event emitted when the model options have changed.
-+         * @event
-+         */
-+        onDidChangeOptions(listener: (e: IModelOptionsChangedEvent) => void): IDisposable;
-+        /**
-+         * An event emitted when the language associated with the model has changed.
-+         * @event
-+         */
-+        onDidChangeLanguage(listener: (e: IModelLanguageChangedEvent) => void): IDisposable;
-+        /**
-+         * An event emitted right before disposing the model.
-+         * @event
-+         */
-+        onWillDispose(listener: () => void): IDisposable;
-+        /**
-+         * A unique identifier associated with this model.
-+         */
-+        readonly id: string;
-+        /**
-+         * Destroy this model. This will unbind the model from the mode
-+         * and make all necessary clean-up to release this object to the GC.
-+         */
-+        dispose(): void;
-+    }
-+
-+    /**
-+     * An event describing that the current mode associated with a model has changed.
-+     */
-+    export interface IModelLanguageChangedEvent {
-+        /**
-+         * Previous language
-+         */
-+        readonly oldLanguage: string;
-+        /**
-+         * New language
-+         */
-+        readonly newLanguage: string;
-+    }
-+
-+    /**
-+     * An event describing a change in the text of a model.
-+     */
-+    export interface IModelContentChangedEvent2 {
-+        /**
-+         * The range that got replaced.
-+         */
-+        readonly range: IRange;
-+        /**
-+         * The length of the range that got replaced.
-+         */
-+        readonly rangeLength: number;
-+        /**
-+         * The new text for the range.
-+         */
-+        readonly text: string;
-+        /**
-+         * The (new) end-of-line character.
-+         */
-+        readonly eol: string;
-+        /**
-+         * The new version id the model has transitioned to.
-+         */
-+        versionId: number;
-+        /**
-+         * Flag that indicates that this event was generated while undoing.
-+         */
-+        readonly isUndoing: boolean;
-+        /**
-+         * Flag that indicates that this event was generated while redoing.
-+         */
-+        readonly isRedoing: boolean;
-+    }
-+
-+    /**
-+     * An event describing that model decorations have changed.
-+     */
-+    export interface IModelDecorationsChangedEvent {
-+        /**
-+         * Lists of ids for added decorations.
-+         */
-+        readonly addedDecorations: string[];
-+        /**
-+         * Lists of ids for changed decorations.
-+         */
-+        readonly changedDecorations: string[];
-+        /**
-+         * List of ids for removed decorations.
-+         */
-+        readonly removedDecorations: string[];
-+    }
-+
-+    /**
-+     * An event describing that some ranges of lines have been tokenized (their tokens have changed).
-+     */
-+    export interface IModelTokensChangedEvent {
-+        readonly ranges: {
-+            /**
-+             * The start of the range (inclusive)
-+             */
-+            readonly fromLineNumber: number;
-+            /**
-+             * The end of the range (inclusive)
-+             */
-+            readonly toLineNumber: number;
-+        }[];
-+    }
-+
-+    /**
-+     * Describes the reason the cursor has changed its position.
-+     */
-+    export enum CursorChangeReason {
-+        /**
-+         * Unknown or not set.
-+         */
-+        NotSet = 0,
-+        /**
-+         * A `model.setValue()` was called.
-+         */
-+        ContentFlush = 1,
-+        /**
-+         * The `model` has been changed outside of this cursor and the cursor recovers its position from associated markers.
-+         */
-+        RecoverFromMarkers = 2,
-+        /**
-+         * There was an explicit user gesture.
-+         */
-+        Explicit = 3,
-+        /**
-+         * There was a Paste.
-+         */
-+        Paste = 4,
-+        /**
-+         * There was an Undo.
-+         */
-+        Undo = 5,
-+        /**
-+         * There was a Redo.
-+         */
-+        Redo = 6,
-+    }
-+
-+    /**
-+     * An event describing that the cursor position has changed.
-+     */
-+    export interface ICursorPositionChangedEvent {
-+        /**
-+         * Primary cursor's position.
-+         */
-+        readonly position: Position;
-+        /**
-+         * Primary cursor's view position
-+         */
-+        readonly viewPosition: Position;
-+        /**
-+         * Secondary cursors' position.
-+         */
-+        readonly secondaryPositions: Position[];
-+        /**
-+         * Secondary cursors' view position.
-+         */
-+        readonly secondaryViewPositions: Position[];
-+        /**
-+         * Reason.
-+         */
-+        readonly reason: CursorChangeReason;
-+        /**
-+         * Source of the call that caused the event.
-+         */
-+        readonly source: string;
-+        /**
-+         * Is the primary cursor in the editable range?
-+         */
-+        readonly isInEditableRange: boolean;
-+    }
-+
-+    /**
-+     * An event describing that the cursor selection has changed.
-+     */
-+    export interface ICursorSelectionChangedEvent {
-+        /**
-+         * The primary selection.
-+         */
-+        readonly selection: Selection;
-+        /**
-+         * The primary selection in view coordinates.
-+         */
-+        readonly viewSelection: Selection;
-+        /**
-+         * The secondary selections.
-+         */
-+        readonly secondarySelections: Selection[];
-+        /**
-+         * The secondary selections in view coordinates.
-+         */
-+        readonly secondaryViewSelections: Selection[];
-+        /**
-+         * Source of the call that caused the event.
-+         */
-+        readonly source: string;
-+        /**
-+         * Reason.
-+         */
-+        readonly reason: CursorChangeReason;
-+    }
-+
-+    /**
-+     * An event describing that an editor has had its model reset (i.e. `editor.setModel()`).
-+     */
-+    export interface IModelChangedEvent {
-+        /**
-+         * The `uri` of the previous model or null.
-+         */
-+        readonly oldModelUrl: Uri;
-+        /**
-+         * The `uri` of the new model or null.
-+         */
-+        readonly newModelUrl: Uri;
-+    }
-+
-+    /**
-+     * A description for the overview ruler position.
-+     */
-+    export class OverviewRulerPosition {
-+        readonly _overviewRulerPositionBrand: void;
-+        /**
-+         * Width of the overview ruler
-+         */
-+        readonly width: number;
-+        /**
-+         * Height of the overview ruler
-+         */
-+        readonly height: number;
-+        /**
-+         * Top position for the overview ruler
-+         */
-+        readonly top: number;
-+        /**
-+         * Right position for the overview ruler
-+         */
-+        readonly right: number;
-+    }
-+
-+    /**
-+     * The internal layout details of the editor.
-+     */
-+    export class EditorLayoutInfo {
-+        readonly _editorLayoutInfoBrand: void;
-+        /**
-+         * Full editor width.
-+         */
-+        readonly width: number;
-+        /**
-+         * Full editor height.
-+         */
-+        readonly height: number;
-+        /**
-+         * Left position for the glyph margin.
-+         */
-+        readonly glyphMarginLeft: number;
-+        /**
-+         * The width of the glyph margin.
-+         */
-+        readonly glyphMarginWidth: number;
-+        /**
-+         * The height of the glyph margin.
-+         */
-+        readonly glyphMarginHeight: number;
-+        /**
-+         * Left position for the line numbers.
-+         */
-+        readonly lineNumbersLeft: number;
-+        /**
-+         * The width of the line numbers.
-+         */
-+        readonly lineNumbersWidth: number;
-+        /**
-+         * The height of the line numbers.
-+         */
-+        readonly lineNumbersHeight: number;
-+        /**
-+         * Left position for the line decorations.
-+         */
-+        readonly decorationsLeft: number;
-+        /**
-+         * The width of the line decorations.
-+         */
-+        readonly decorationsWidth: number;
-+        /**
-+         * The height of the line decorations.
-+         */
-+        readonly decorationsHeight: number;
-+        /**
-+         * Left position for the content (actual text)
-+         */
-+        readonly contentLeft: number;
-+        /**
-+         * The width of the content (actual text)
-+         */
-+        readonly contentWidth: number;
-+        /**
-+         * The height of the content (actual height)
-+         */
-+        readonly contentHeight: number;
-+        /**
-+         * The width of the vertical scrollbar.
-+         */
-+        readonly verticalScrollbarWidth: number;
-+        /**
-+         * The height of the horizontal scrollbar.
-+         */
-+        readonly horizontalScrollbarHeight: number;
-+        /**
-+         * The position of the overview ruler.
-+         */
-+        readonly overviewRuler: OverviewRulerPosition;
-+    }
-+
-+    /**
-+     * Options for creating the editor.
-+     */
-+    export interface ICodeEditorWidgetCreationOptions extends IEditorOptions {
-+        /**
-+         * The initial model associated with this code editor.
-+         */
-+        model?: IModel;
-+    }
-+
-+    /**
-+     * An editor model.
-+     */
-+    export interface IEditorModel {
-+    }
-+
-+    /**
-+     * An editor view state.
-+     */
-+    export interface IEditorViewState {
-+    }
-+
-+    export interface IDimension {
-+        width: number;
-+        height: number;
-+    }
-+
-+    /**
-+     * A (serializable) state of the cursors.
-+     */
-+    export interface ICursorState {
-+        inSelectionMode: boolean;
-+        selectionStart: IPosition;
-+        position: IPosition;
-+    }
-+
-+    /**
-+     * A (serializable) state of the view.
-+     */
-+    export interface IViewState {
-+        scrollTop: number;
-+        scrollTopWithoutViewZones: number;
-+        scrollLeft: number;
-+    }
-+
-+    /**
-+     * A (serializable) state of the code editor.
-+     */
-+    export interface ICodeEditorViewState extends IEditorViewState {
-+        cursorState: ICursorState[];
-+        viewState: IViewState;
-+        contributionsState: {
-+            [id: string]: any;
-+        };
-+    }
-+
-+    /**
-+     * Type of hit element with the mouse in the editor.
-+     */
-+    export enum MouseTargetType {
-+        /**
-+         * Mouse is on top of an unknown element.
-+         */
-+        UNKNOWN = 0,
-+        /**
-+         * Mouse is on top of the textarea used for input.
-+         */
-+        TEXTAREA = 1,
-+        /**
-+         * Mouse is on top of the glyph margin
-+         */
-+        GUTTER_GLYPH_MARGIN = 2,
-+        /**
-+         * Mouse is on top of the line numbers
-+         */
-+        GUTTER_LINE_NUMBERS = 3,
-+        /**
-+         * Mouse is on top of the line decorations
-+         */
-+        GUTTER_LINE_DECORATIONS = 4,
-+        /**
-+         * Mouse is on top of the whitespace left in the gutter by a view zone.
-+         */
-+        GUTTER_VIEW_ZONE = 5,
-+        /**
-+         * Mouse is on top of text in the content.
-+         */
-+        CONTENT_TEXT = 6,
-+        /**
-+         * Mouse is on top of empty space in the content (e.g. after line text or below last line)
-+         */
-+        CONTENT_EMPTY = 7,
-+        /**
-+         * Mouse is on top of a view zone in the content.
-+         */
-+        CONTENT_VIEW_ZONE = 8,
-+        /**
-+         * Mouse is on top of a content widget.
-+         */
-+        CONTENT_WIDGET = 9,
-+        /**
-+         * Mouse is on top of the decorations overview ruler.
-+         */
-+        OVERVIEW_RULER = 10,
-+        /**
-+         * Mouse is on top of a scrollbar.
-+         */
-+        SCROLLBAR = 11,
-+        /**
-+         * Mouse is on top of an overlay widget.
-+         */
-+        OVERLAY_WIDGET = 12,
-+    }
-+
-+    /**
-+     * A model for the diff editor.
-+     */
-+    export interface IDiffEditorModel extends IEditorModel {
-+        /**
-+         * Original model.
-+         */
-+        original: IModel;
-+        /**
-+         * Modified model.
-+         */
-+        modified: IModel;
-+    }
-+
-+    /**
-+     * (Serializable) View state for the diff editor.
-+     */
-+    export interface IDiffEditorViewState extends IEditorViewState {
-+        original: ICodeEditorViewState;
-+        modified: ICodeEditorViewState;
-+    }
-+
-+    /**
-+     * A change
-+     */
-+    export interface IChange {
-+        readonly originalStartLineNumber: number;
-+        readonly originalEndLineNumber: number;
-+        readonly modifiedStartLineNumber: number;
-+        readonly modifiedEndLineNumber: number;
-+    }
-+
-+    /**
-+     * A character level change.
-+     */
-+    export interface ICharChange extends IChange {
-+        readonly originalStartColumn: number;
-+        readonly originalEndColumn: number;
-+        readonly modifiedStartColumn: number;
-+        readonly modifiedEndColumn: number;
-+    }
-+
-+    /**
-+     * A line change
-+     */
-+    export interface ILineChange extends IChange {
-+        readonly charChanges: ICharChange[];
-+    }
-+
-+    /**
-+     * Information about a line in the diff editor
-+     */
-+    export interface IDiffLineInformation {
-+        readonly equivalentLineNumber: number;
-+    }
-+
-+    export interface INewScrollPosition {
-+        scrollLeft?: number;
-+        scrollTop?: number;
-+    }
-+
-+    /**
-+     * Description of an action contribution
-+     */
-+    export interface IActionDescriptor {
-+        /**
-+         * An unique identifier of the contributed action.
-+         */
-+        id: string;
-+        /**
-+         * A label of the action that will be presented to the user.
-+         */
-+        label: string;
-+        /**
-+         * Precondition rule.
-+         */
-+        precondition?: string;
-+        /**
-+         * An array of keybindings for the action.
-+         */
-+        keybindings?: number[];
-+        /**
-+         * The keybinding rule (condition on top of precondition).
-+         */
-+        keybindingContext?: string;
-+        /**
-+         * Control if the action should show up in the context menu and where.
-+         * The context menu of the editor has these default:
-+         *   navigation - The navigation group comes first in all cases.
-+         *   1_modification - This group comes next and contains commands that modify your code.
-+         *   9_cutcopypaste - The last default group with the basic editing commands.
-+         * You can also create your own group.
-+         * Defaults to null (don't show in context menu).
-+         */
-+        contextMenuGroupId?: string;
-+        /**
-+         * Control the order in the context menu group.
-+         */
-+        contextMenuOrder?: number;
-+        /**
-+         * Method that will be executed when the action is triggered.
-+         * @param editor The editor instance is passed in as a convinience
-+         */
-+        run(editor: ICommonCodeEditor): void | Promise<void>;
-+    }
-+
-+    export interface IEditorAction {
-+        readonly id: string;
-+        readonly label: string;
-+        readonly alias: string;
-+        isSupported(): boolean;
-+        run(): Promise<void>;
-+    }
-+
-+    /**
-+     * An editor.
-+     */
-+    export interface IEditor {
-+        /**
-+         * An event emitted when the content of the current model has changed.
-+         * @event
-+         */
-+        onDidChangeModelContent(listener: (e: IModelContentChangedEvent2) => void): IDisposable;
-+        /**
-+         * An event emitted when the language of the current model has changed.
-+         * @event
-+         */
-+        onDidChangeModelLanguage(listener: (e: IModelLanguageChangedEvent) => void): IDisposable;
-+        /**
-+         * An event emitted when the options of the current model has changed.
-+         * @event
-+         */
-+        onDidChangeModelOptions(listener: (e: IModelOptionsChangedEvent) => void): IDisposable;
-+        /**
-+         * An event emitted when the configuration of the editor has changed. (e.g. `editor.updateOptions()`)
-+         * @event
-+         */
-+        onDidChangeConfiguration(listener: (e: IConfigurationChangedEvent) => void): IDisposable;
-+        /**
-+         * An event emitted when the cursor position has changed.
-+         * @event
-+         */
-+        onDidChangeCursorPosition(listener: (e: ICursorPositionChangedEvent) => void): IDisposable;
-+        /**
-+         * An event emitted when the cursor selection has changed.
-+         * @event
-+         */
-+        onDidChangeCursorSelection(listener: (e: ICursorSelectionChangedEvent) => void): IDisposable;
-+        /**
-+         * An event emitted when the editor has been disposed.
-+         * @event
-+         */
-+        onDidDispose(listener: () => void): IDisposable;
-+        /**
-+         * Dispose the editor.
-+         */
-+        dispose(): void;
-+        /**
-+         * Get a unique id for this editor instance.
-+         */
-+        getId(): string;
-+        /**
-+         * Get the editor type. Please see `EditorType`.
-+         * This is to avoid an instanceof check
-+         */
-+        getEditorType(): string;
-+        /**
-+         * Update the editor's options after the editor has been created.
-+         */
-+        updateOptions(newOptions: IEditorOptions): void;
-+        /**
-+         * Instructs the editor to remeasure its container. This method should
-+         * be called when the container of the editor gets resized.
-+         */
-+        layout(dimension?: IDimension): void;
-+        /**
-+         * Brings browser focus to the editor text
-+         */
-+        focus(): void;
-+        /**
-+         * Returns true if this editor has keyboard focus (e.g. cursor is blinking).
-+         */
-+        isFocused(): boolean;
-+        /**
-+         * Returns all actions associated with this editor.
-+         */
-+        getActions(): IEditorAction[];
-+        /**
-+         * Returns all actions associated with this editor.
-+         */
-+        getSupportedActions(): IEditorAction[];
-+        /**
-+         * Saves current view state of the editor in a serializable object.
-+         */
-+        saveViewState(): IEditorViewState;
-+        /**
-+         * Restores the view state of the editor from a serializable object generated by `saveViewState`.
-+         */
-+        restoreViewState(state: IEditorViewState): void;
-+        /**
-+         * Given a position, returns a column number that takes tab-widths into account.
-+         */
-+        getVisibleColumnFromPosition(position: IPosition): number;
-+        /**
-+         * Returns the primary position of the cursor.
-+         */
-+        getPosition(): Position;
-+        /**
-+         * Set the primary position of the cursor. This will remove any secondary cursors.
-+         * @param position New primary cursor's position
-+         */
-+        setPosition(position: IPosition): void;
-+        /**
-+         * Scroll vertically as necessary and reveal a line.
-+         */
-+        revealLine(lineNumber: number): void;
-+        /**
-+         * Scroll vertically as necessary and reveal a line centered vertically.
-+         */
-+        revealLineInCenter(lineNumber: number): void;
-+        /**
-+         * Scroll vertically as necessary and reveal a line centered vertically only if it lies outside the viewport.
-+         */
-+        revealLineInCenterIfOutsideViewport(lineNumber: number): void;
-+        /**
-+         * Scroll vertically or horizontally as necessary and reveal a position.
-+         */
-+        revealPosition(position: IPosition): void;
-+        /**
-+         * Scroll vertically or horizontally as necessary and reveal a position centered vertically.
-+         */
-+        revealPositionInCenter(position: IPosition): void;
-+        /**
-+         * Scroll vertically or horizontally as necessary and reveal a position centered vertically only if it lies outside the viewport.
-+         */
-+        revealPositionInCenterIfOutsideViewport(position: IPosition): void;
-+        /**
-+         * Returns the primary selection of the editor.
-+         */
-+        getSelection(): Selection;
-+        /**
-+         * Returns all the selections of the editor.
-+         */
-+        getSelections(): Selection[];
-+        /**
-+         * Set the primary selection of the editor. This will remove any secondary cursors.
-+         * @param selection The new selection
-+         */
-+        setSelection(selection: IRange): void;
-+        /**
-+         * Set the primary selection of the editor. This will remove any secondary cursors.
-+         * @param selection The new selection
-+         */
-+        setSelection(selection: Range): void;
-+        /**
-+         * Set the primary selection of the editor. This will remove any secondary cursors.
-+         * @param selection The new selection
-+         */
-+        setSelection(selection: ISelection): void;
-+        /**
-+         * Set the primary selection of the editor. This will remove any secondary cursors.
-+         * @param selection The new selection
-+         */
-+        setSelection(selection: Selection): void;
-+        /**
-+         * Set the selections for all the cursors of the editor.
-+         * Cursors will be removed or added, as necessary.
-+         */
-+        setSelections(selections: ISelection[]): void;
-+        /**
-+         * Scroll vertically as necessary and reveal lines.
-+         */
-+        revealLines(startLineNumber: number, endLineNumber: number): void;
-+        /**
-+         * Scroll vertically as necessary and reveal lines centered vertically.
-+         */
-+        revealLinesInCenter(lineNumber: number, endLineNumber: number): void;
-+        /**
-+         * Scroll vertically as necessary and reveal lines centered vertically only if it lies outside the viewport.
-+         */
-+        revealLinesInCenterIfOutsideViewport(lineNumber: number, endLineNumber: number): void;
-+        /**
-+         * Scroll vertically or horizontally as necessary and reveal a range.
-+         */
-+        revealRange(range: IRange): void;
-+        /**
-+         * Scroll vertically or horizontally as necessary and reveal a range centered vertically.
-+         */
-+        revealRangeInCenter(range: IRange): void;
-+        /**
-+         * Scroll vertically or horizontally as necessary and reveal a range at the top of the viewport.
-+         */
-+        revealRangeAtTop(range: IRange): void;
-+        /**
-+         * Scroll vertically or horizontally as necessary and reveal a range centered vertically only if it lies outside the viewport.
-+         */
-+        revealRangeInCenterIfOutsideViewport(range: IRange): void;
-+        /**
-+         * Directly trigger a handler or an editor action.
-+         * @param source The source of the call.
-+         * @param handlerId The id of the handler or the id of a contribution.
-+         * @param payload Extra data to be sent to the handler.
-+         */
-+        trigger(source: string, handlerId: string, payload: any): void;
-+        /**
-+         * Gets the current model attached to this editor.
-+         */
-+        getModel(): IEditorModel;
-+        /**
-+         * Sets the current model attached to this editor.
-+         * If the previous model was created by the editor via the value key in the options
-+         * literal object, it will be destroyed. Otherwise, if the previous model was set
-+         * via setModel, or the model key in the options literal object, the previous model
-+         * will not be destroyed.
-+         * It is safe to call setModel(null) to simply detach the current model from the editor.
-+         */
-+        setModel(model: IEditorModel): void;
-+    }
-+
-+    /**
-+     * An editor contribution that gets created every time a new editor gets created and gets disposed when the editor gets disposed.
-+     */
-+    export interface IEditorContribution {
-+        /**
-+         * Get a unique identifier for this contribution.
-+         */
-+        getId(): string;
-+        /**
-+         * Dispose this contribution.
-+         */
-+        dispose(): void;
-+        /**
-+         * Store view state.
-+         */
-+        saveViewState?(): any;
-+        /**
-+         * Restore view state.
-+         */
-+        restoreViewState?(state: any): void;
-+    }
-+
-+    export interface ICommonCodeEditor extends IEditor {
-+        /**
-+         * An event emitted when the model of this editor has changed (e.g. `editor.setModel()`).
-+         * @event
-+         */
-+        onDidChangeModel(listener: (e: IModelChangedEvent) => void): IDisposable;
-+        /**
-+         * An event emitted when the decorations of the current model have changed.
-+         * @event
-+         */
-+        onDidChangeModelDecorations(listener: (e: IModelDecorationsChangedEvent) => void): IDisposable;
-+        /**
-+         * An event emitted when the text inside this editor gained focus (i.e. cursor blinking).
-+         * @event
-+         */
-+        onDidFocusEditorText(listener: () => void): IDisposable;
-+        /**
-+         * An event emitted when the text inside this editor lost focus.
-+         * @event
-+         */
-+        onDidBlurEditorText(listener: () => void): IDisposable;
-+        /**
-+         * An event emitted when the text inside this editor or an editor widget gained focus.
-+         * @event
-+         */
-+        onDidFocusEditor(listener: () => void): IDisposable;
-+        /**
-+         * An event emitted when the text inside this editor or an editor widget lost focus.
-+         * @event
-+         */
-+        onDidBlurEditor(listener: () => void): IDisposable;
-+        /**
-+         * Returns true if this editor or one of its widgets has keyboard focus.
-+         */
-+        hasWidgetFocus(): boolean;
-+        /**
-+         * Get a contribution of this editor.
-+         * @id Unique identifier of the contribution.
-+         * @return The contribution or null if contribution not found.
-+         */
-+        getContribution<T extends IEditorContribution>(id: string): T;
-+        /**
-+         * Type the getModel() of IEditor.
-+         */
-+        getModel(): IModel;
-+        /**
-+         * Returns the current editor's configuration
-+         */
-+        getConfiguration(): InternalEditorOptions;
-+        /**
-+         * Get value of the current model attached to this editor.
-+         * @see IModel.getValue
-+         */
-+        getValue(options?: {
-+            preserveBOM: boolean;
-+            lineEnding: string;
-+        }): string;
-+        /**
-+         * Set the value of the current model attached to this editor.
-+         * @see IModel.setValue
-+         */
-+        setValue(newValue: string): void;
-+        /**
-+         * Get the scrollWidth of the editor's viewport.
-+         */
-+        getScrollWidth(): number;
-+        /**
-+         * Get the scrollLeft of the editor's viewport.
-+         */
-+        getScrollLeft(): number;
-+        /**
-+         * Get the scrollHeight of the editor's viewport.
-+         */
-+        getScrollHeight(): number;
-+        /**
-+         * Get the scrollTop of the editor's viewport.
-+         */
-+        getScrollTop(): number;
-+        /**
-+         * Change the scrollLeft of the editor's viewport.
-+         */
-+        setScrollLeft(newScrollLeft: number): void;
-+        /**
-+         * Change the scrollTop of the editor's viewport.
-+         */
-+        setScrollTop(newScrollTop: number): void;
-+        /**
-+         * Change the scroll position of the editor's viewport.
-+         */
-+        setScrollPosition(position: INewScrollPosition): void;
-+        /**
-+         * Get an action that is a contribution to this editor.
-+         * @id Unique identifier of the contribution.
-+         * @return The action or null if action not found.
-+         */
-+        getAction(id: string): IEditorAction;
-+        /**
-+         * Execute a command on the editor.
-+         * @param source The source of the call.
-+         * @param command The command to execute
-+         */
-+        executeCommand(source: string, command: ICommand): void;
-+        /**
-+         * Push an "undo stop" in the undo-redo stack.
-+         */
-+        pushUndoStop(): boolean;
-+        /**
-+         * Execute edits on the editor.
-+         * @param source The source of the call.
-+         * @param edits The edits to execute.
-+         * @param endCursoState Cursor state after the edits were applied.
-+         */
-+        executeEdits(source: string, edits: IIdentifiedSingleEditOperation[], endCursoState?: Selection[]): boolean;
-+        /**
-+         * Execute multiple (concommitent) commands on the editor.
-+         * @param source The source of the call.
-+         * @param command The commands to execute
-+         */
-+        executeCommands(source: string, commands: ICommand[]): void;
-+        /**
-+         * Get all the decorations on a line (filtering out decorations from other editors).
-+         */
-+        getLineDecorations(lineNumber: number): IModelDecoration[];
-+        /**
-+         * All decorations added through this call will get the ownerId of this editor.
-+         * @see IModel.deltaDecorations
-+         */
-+        deltaDecorations(oldDecorations: string[], newDecorations: IModelDeltaDecoration[]): string[];
-+        /**
-+         * Get the layout info for the editor.
-+         */
-+        getLayoutInfo(): EditorLayoutInfo;
-+    }
-+
-+    export interface ICommonDiffEditor extends IEditor {
-+        /**
-+         * An event emitted when the diff information computed by this diff editor has been updated.
-+         * @event
-+         */
-+        onDidUpdateDiff(listener: () => void): IDisposable;
-+        /**
-+         * Type the getModel() of IEditor.
-+         */
-+        getModel(): IDiffEditorModel;
-+        /**
-+         * Get the `original` editor.
-+         */
-+        getOriginalEditor(): ICommonCodeEditor;
-+        /**
-+         * Get the `modified` editor.
-+         */
-+        getModifiedEditor(): ICommonCodeEditor;
-+        /**
-+         * Get the computed diff information.
-+         */
-+        getLineChanges(): ILineChange[];
-+        /**
-+         * Get information based on computed diff about a line number from the original model.
-+         * If the diff computation is not finished or the model is missing, will return null.
-+         */
-+        getDiffLineInformationForOriginal(lineNumber: number): IDiffLineInformation;
-+        /**
-+         * Get information based on computed diff about a line number from the modified model.
-+         * If the diff computation is not finished or the model is missing, will return null.
-+         */
-+        getDiffLineInformationForModified(lineNumber: number): IDiffLineInformation;
-+        /**
-+         * @see ICodeEditor.getValue
-+         */
-+        getValue(options?: {
-+            preserveBOM: boolean;
-+            lineEnding: string;
-+        }): string;
-+    }
-+
-+    /**
-+     * The type of the `IEditor`.
-+     */
-+    export var EditorType: {
-+        ICodeEditor: string;
-+        IDiffEditor: string;
-+    };
-+
-+    /**
-+     * Positions in the view for cursor move command.
-+     */
-+    export const CursorMovePosition: {
-+        Left: string;
-+        Right: string;
-+        Up: string;
-+        Down: string;
-+        WrappedLineStart: string;
-+        WrappedLineFirstNonWhitespaceCharacter: string;
-+        WrappedLineColumnCenter: string;
-+        WrappedLineEnd: string;
-+        WrappedLineLastNonWhitespaceCharacter: string;
-+        ViewPortTop: string;
-+        ViewPortCenter: string;
-+        ViewPortBottom: string;
-+        ViewPortIfOutside: string;
-+    };
-+
-+    /**
-+     * Units for Cursor move 'by' argument
-+     */
-+    export const CursorMoveByUnit: {
-+        Line: string;
-+        WrappedLine: string;
-+        Character: string;
-+        HalfLine: string;
-+    };
-+
-+    /**
-+     * Arguments for Cursor move command
-+     */
-+    export interface CursorMoveArguments {
-+        to: string;
-+        select?: boolean;
-+        by?: string;
-+        value?: number;
-+    }
-+
-+    /**
-+     * Directions in the view for editor scroll command.
-+     */
-+    export const EditorScrollDirection: {
-+        Up: string;
-+        Down: string;
-+    };
-+
-+    /**
-+     * Units for editor scroll 'by' argument
-+     */
-+    export const EditorScrollByUnit: {
-+        Line: string;
-+        WrappedLine: string;
-+        Page: string;
-+        HalfPage: string;
-+    };
-+
-+    /**
-+     * Arguments for editor scroll command
-+     */
-+    export interface EditorScrollArguments {
-+        to: string;
-+        by?: string;
-+        value?: number;
-+        revealCursor?: boolean;
-+    }
-+
-+    /**
-+     * Arguments for reveal line command
-+     */
-+    export interface RevealLineArguments {
-+        lineNumber?: number;
-+        at?: string;
-+    }
-+
-+    /**
-+     * Values for reveal line 'at' argument
-+     */
-+    export const RevealLineAtArgument: {
-+        Top: string;
-+        Center: string;
-+        Bottom: string;
-+    };
-+
-+    /**
-+     * Built-in commands.
-+     */
-+    export var Handler: {
-+        ExecuteCommand: string;
-+        ExecuteCommands: string;
-+        CursorLeft: string;
-+        CursorLeftSelect: string;
-+        CursorWordLeft: string;
-+        CursorWordStartLeft: string;
-+        CursorWordEndLeft: string;
-+        CursorWordLeftSelect: string;
-+        CursorWordStartLeftSelect: string;
-+        CursorWordEndLeftSelect: string;
-+        CursorRight: string;
-+        CursorRightSelect: string;
-+        CursorWordRight: string;
-+        CursorWordStartRight: string;
-+        CursorWordEndRight: string;
-+        CursorWordRightSelect: string;
-+        CursorWordStartRightSelect: string;
-+        CursorWordEndRightSelect: string;
-+        CursorUp: string;
-+        CursorUpSelect: string;
-+        CursorDown: string;
-+        CursorDownSelect: string;
-+        CursorPageUp: string;
-+        CursorPageUpSelect: string;
-+        CursorPageDown: string;
-+        CursorPageDownSelect: string;
-+        CursorHome: string;
-+        CursorHomeSelect: string;
-+        CursorEnd: string;
-+        CursorEndSelect: string;
-+        ExpandLineSelection: string;
-+        CursorTop: string;
-+        CursorTopSelect: string;
-+        CursorBottom: string;
-+        CursorBottomSelect: string;
-+        CursorColumnSelectLeft: string;
-+        CursorColumnSelectRight: string;
-+        CursorColumnSelectUp: string;
-+        CursorColumnSelectPageUp: string;
-+        CursorColumnSelectDown: string;
-+        CursorColumnSelectPageDown: string;
-+        CursorMove: string;
-+        AddCursorDown: string;
-+        AddCursorUp: string;
-+        CursorUndo: string;
-+        MoveTo: string;
-+        MoveToSelect: string;
-+        ColumnSelect: string;
-+        CreateCursor: string;
-+        LastCursorMoveToSelect: string;
-+        Type: string;
-+        ReplacePreviousChar: string;
-+        CompositionStart: string;
-+        CompositionEnd: string;
-+        Paste: string;
-+        Tab: string;
-+        Indent: string;
-+        Outdent: string;
-+        DeleteLeft: string;
-+        DeleteRight: string;
-+        DeleteWordLeft: string;
-+        DeleteWordStartLeft: string;
-+        DeleteWordEndLeft: string;
-+        DeleteWordRight: string;
-+        DeleteWordStartRight: string;
-+        DeleteWordEndRight: string;
-+        RemoveSecondaryCursors: string;
-+        CancelSelection: string;
-+        Cut: string;
-+        Undo: string;
-+        Redo: string;
-+        WordSelect: string;
-+        WordSelectDrag: string;
-+        LastCursorWordSelect: string;
-+        LineSelect: string;
-+        LineSelectDrag: string;
-+        LastCursorLineSelect: string;
-+        LastCursorLineSelectDrag: string;
-+        LineInsertBefore: string;
-+        LineInsertAfter: string;
-+        LineBreakInsert: string;
-+        SelectAll: string;
-+        EditorScroll: string;
-+        ScrollLineUp: string;
-+        ScrollLineDown: string;
-+        ScrollPageUp: string;
-+        ScrollPageDown: string;
-+        RevealLine: string;
-+    };
-+
-+    /**
-+     * The style in which the editor's cursor should be rendered.
-+     */
-+    export enum TextEditorCursorStyle {
-+        /**
-+         * As a vertical line (sitting between two characters).
-+         */
-+        Line = 1,
-+        /**
-+         * As a block (sitting on top of a character).
-+         */
-+        Block = 2,
-+        /**
-+         * As a horizontal line (sitting under a character).
-+         */
-+        Underline = 3,
-+    }
-+
-+    /**
-+     * The kind of animation in which the editor's cursor should be rendered.
-+     */
-+    export enum TextEditorCursorBlinkingStyle {
-+        /**
-+         * Hidden
-+         */
-+        Hidden = 0,
-+        /**
-+         * Blinking
-+         */
-+        Blink = 1,
-+        /**
-+         * Blinking with smooth fading
-+         */
-+        Smooth = 2,
-+        /**
-+         * Blinking with prolonged filled state and smooth fading
-+         */
-+        Phase = 3,
-+        /**
-+         * Expand collapse animation on the y axis
-+         */
-+        Expand = 4,
-+        /**
-+         * No-Blinking
-+         */
-+        Solid = 5,
-+    }
-+
-+    /**
-+     * A view zone is a full horizontal rectangle that 'pushes' text down.
-+     * The editor reserves space for view zones when rendering.
-+     */
-+    export interface IViewZone {
-+        /**
-+         * The line number after which this zone should appear.
-+         * Use 0 to place a view zone before the first line number.
-+         */
-+        afterLineNumber: number;
-+        /**
-+         * The column after which this zone should appear.
-+         * If not set, the maxLineColumn of `afterLineNumber` will be used.
-+         */
-+        afterColumn?: number;
-+        /**
-+         * Suppress mouse down events.
-+         * If set, the editor will attach a mouse down listener to the view zone and .preventDefault on it.
-+         * Defaults to false
-+         */
-+        suppressMouseDown?: boolean;
-+        /**
-+         * The height in lines of the view zone.
-+         * If specified, `heightInPx` will be used instead of this.
-+         * If neither `heightInPx` nor `heightInLines` is specified, a default of `heightInLines` = 1 will be chosen.
-+         */
-+        heightInLines?: number;
-+        /**
-+         * The height in px of the view zone.
-+         * If this is set, the editor will give preference to it rather than `heightInLines` above.
-+         * If neither `heightInPx` nor `heightInLines` is specified, a default of `heightInLines` = 1 will be chosen.
-+         */
-+        heightInPx?: number;
-+        /**
-+         * The dom node of the view zone
-+         */
-+        domNode: HTMLElement;
-+        /**
-+         * An optional dom node for the view zone that will be placed in the margin area.
-+         */
-+        marginDomNode?: HTMLElement;
-+        /**
-+         * Callback which gives the relative top of the view zone as it appears (taking scrolling into account).
-+         */
-+        onDomNodeTop?: (top: number) => void;
-+        /**
-+         * Callback which gives the height in pixels of the view zone.
-+         */
-+        onComputedHeight?: (height: number) => void;
-+    }
-+
-+    /**
-+     * An accessor that allows for zones to be added or removed.
-+     */
-+    export interface IViewZoneChangeAccessor {
-+        /**
-+         * Create a new view zone.
-+         * @param zone Zone to create
-+         * @return A unique identifier to the view zone.
-+         */
-+        addZone(zone: IViewZone): number;
-+        /**
-+         * Remove a zone
-+         * @param id A unique identifier to the view zone, as returned by the `addZone` call.
-+         */
-+        removeZone(id: number): void;
-+        /**
-+         * Change a zone's position.
-+         * The editor will rescan the `afterLineNumber` and `afterColumn` properties of a view zone.
-+         */
-+        layoutZone(id: number): void;
-+    }
-+
-+    /**
-+     * A positioning preference for rendering content widgets.
-+     */
-+    export enum ContentWidgetPositionPreference {
-+        /**
-+         * Place the content widget exactly at a position
-+         */
-+        EXACT = 0,
-+        /**
-+         * Place the content widget above a position
-+         */
-+        ABOVE = 1,
-+        /**
-+         * Place the content widget below a position
-+         */
-+        BELOW = 2,
-+    }
-+
-+    /**
-+     * A position for rendering content widgets.
-+     */
-+    export interface IContentWidgetPosition {
-+        /**
-+         * Desired position for the content widget.
-+         * `preference` will also affect the placement.
-+         */
-+        position: IPosition;
-+        /**
-+         * Placement preference for position, in order of preference.
-+         */
-+        preference: ContentWidgetPositionPreference[];
-+    }
-+
-+    /**
-+     * A content widget renders inline with the text and can be easily placed 'near' an editor position.
-+     */
-+    export interface IContentWidget {
-+        /**
-+         * Render this content widget in a location where it could overflow the editor's view dom node.
-+         */
-+        allowEditorOverflow?: boolean;
-+        suppressMouseDown?: boolean;
-+        /**
-+         * Get a unique identifier of the content widget.
-+         */
-+        getId(): string;
-+        /**
-+         * Get the dom node of the content widget.
-+         */
-+        getDomNode(): HTMLElement;
-+        /**
-+         * Get the placement of the content widget.
-+         * If null is returned, the content widget will be placed off screen.
-+         */
-+        getPosition(): IContentWidgetPosition;
-+    }
-+
-+    /**
-+     * A positioning preference for rendering overlay widgets.
-+     */
-+    export enum OverlayWidgetPositionPreference {
-+        /**
-+         * Position the overlay widget in the top right corner
-+         */
-+        TOP_RIGHT_CORNER = 0,
-+        /**
-+         * Position the overlay widget in the bottom right corner
-+         */
-+        BOTTOM_RIGHT_CORNER = 1,
-+        /**
-+         * Position the overlay widget in the top center
-+         */
-+        TOP_CENTER = 2,
-+    }
-+
-+    /**
-+     * A position for rendering overlay widgets.
-+     */
-+    export interface IOverlayWidgetPosition {
-+        /**
-+         * The position preference for the overlay widget.
-+         */
-+        preference: OverlayWidgetPositionPreference;
-+    }
-+
-+    /**
-+     * An overlay widgets renders on top of the text.
-+     */
-+    export interface IOverlayWidget {
-+        /**
-+         * Get a unique identifier of the overlay widget.
-+         */
-+        getId(): string;
-+        /**
-+         * Get the dom node of the overlay widget.
-+         */
-+        getDomNode(): HTMLElement;
-+        /**
-+         * Get the placement of the overlay widget.
-+         * If null is returned, the overlay widget is responsible to place itself.
-+         */
-+        getPosition(): IOverlayWidgetPosition;
-+    }
-+
-+    /**
-+     * Target hit with the mouse in the editor.
-+     */
-+    export interface IMouseTarget {
-+        /**
-+         * The target element
-+         */
-+        readonly element: Element;
-+        /**
-+         * The target type
-+         */
-+        readonly type: MouseTargetType;
-+        /**
-+         * The 'approximate' editor position
-+         */
-+        readonly position: Position;
-+        /**
-+         * Desired mouse column (e.g. when position.column gets clamped to text length -- clicking after text on a line).
-+         */
-+        readonly mouseColumn: number;
-+        /**
-+         * The 'approximate' editor range
-+         */
-+        readonly range: Range;
-+        /**
-+         * Some extra detail.
-+         */
-+        readonly detail: any;
-+    }
-+
-+    /**
-+     * A mouse event originating from the editor.
-+     */
-+    export interface IEditorMouseEvent {
-+        readonly event: IMouseEvent;
-+        readonly target: IMouseTarget;
-+    }
-+
-+    /**
-+     * A rich code editor.
-+     */
-+    export interface ICodeEditor extends ICommonCodeEditor {
-+        /**
-+         * An event emitted on a "mouseup".
-+         * @event
-+         */
-+        onMouseUp(listener: (e: IEditorMouseEvent) => void): IDisposable;
-+        /**
-+         * An event emitted on a "mousedown".
-+         * @event
-+         */
-+        onMouseDown(listener: (e: IEditorMouseEvent) => void): IDisposable;
-+        /**
-+         * An event emitted on a "contextmenu".
-+         * @event
-+         */
-+        onContextMenu(listener: (e: IEditorMouseEvent) => void): IDisposable;
-+        /**
-+         * An event emitted on a "mousemove".
-+         * @event
-+         */
-+        onMouseMove(listener: (e: IEditorMouseEvent) => void): IDisposable;
-+        /**
-+         * An event emitted on a "mouseleave".
-+         * @event
-+         */
-+        onMouseLeave(listener: (e: IEditorMouseEvent) => void): IDisposable;
-+        /**
-+         * An event emitted on a "keyup".
-+         * @event
-+         */
-+        onKeyUp(listener: (e: IKeyboardEvent) => void): IDisposable;
-+        /**
-+         * An event emitted on a "keydown".
-+         * @event
-+         */
-+        onKeyDown(listener: (e: IKeyboardEvent) => void): IDisposable;
-+        /**
-+         * An event emitted when the layout of the editor has changed.
-+         * @event
-+         */
-+        onDidLayoutChange(listener: (e: EditorLayoutInfo) => void): IDisposable;
-+        /**
-+         * An event emitted when the scroll in the editor has changed.
-+         * @event
-+         */
-+        onDidScrollChange(listener: (e: IScrollEvent) => void): IDisposable;
-+        /**
-+         * Returns the editor's dom node
-+         */
-+        getDomNode(): HTMLElement;
-+        /**
-+         * Add a content widget. Widgets must have unique ids, otherwise they will be overwritten.
-+         */
-+        addContentWidget(widget: IContentWidget): void;
-+        /**
-+         * Layout/Reposition a content widget. This is a ping to the editor to call widget.getPosition()
-+         * and update appropiately.
-+         */
-+        layoutContentWidget(widget: IContentWidget): void;
-+        /**
-+         * Remove a content widget.
-+         */
-+        removeContentWidget(widget: IContentWidget): void;
-+        /**
-+         * Add an overlay widget. Widgets must have unique ids, otherwise they will be overwritten.
-+         */
-+        addOverlayWidget(widget: IOverlayWidget): void;
-+        /**
-+         * Layout/Reposition an overlay widget. This is a ping to the editor to call widget.getPosition()
-+         * and update appropiately.
-+         */
-+        layoutOverlayWidget(widget: IOverlayWidget): void;
-+        /**
-+         * Remove an overlay widget.
-+         */
-+        removeOverlayWidget(widget: IOverlayWidget): void;
-+        /**
-+         * Change the view zones. View zones are lost when a new model is attached to the editor.
-+         */
-+        changeViewZones(callback: (accessor: IViewZoneChangeAccessor) => void): void;
-+        /**
-+         * Returns the range that is currently centered in the view port.
-+         */
-+        getCenteredRangeInViewport(): Range;
-+        /**
-+         * Get the horizontal position (left offset) for the column w.r.t to the beginning of the line.
-+         * This method works only if the line `lineNumber` is currently rendered (in the editor's viewport).
-+         * Use this method with caution.
-+         */
-+        getOffsetForColumn(lineNumber: number, column: number): number;
-+        /**
-+         * Force an editor render now.
-+         */
-+        render(): void;
-+        /**
-+         * Get the vertical position (top offset) for the line w.r.t. to the first line.
-+         */
-+        getTopForLineNumber(lineNumber: number): number;
-+        /**
-+         * Get the vertical position (top offset) for the position w.r.t. to the first line.
-+         */
-+        getTopForPosition(lineNumber: number, column: number): number;
-+        /**
-+         * Get the hit test target at coordinates `clientX` and `clientY`.
-+         * The coordinates are relative to the top-left of the viewport.
-+         *
-+         * @returns Hit test target or null if the coordinates fall outside the editor or the editor has no model.
-+         */
-+        getTargetAtClientPoint(clientX: number, clientY: number): IMouseTarget;
-+        /**
-+         * Get the visible position for `position`.
-+         * The result position takes scrolling into account and is relative to the top left corner of the editor.
-+         * Explanation 1: the results of this method will change for the same `position` if the user scrolls the editor.
-+         * Explanation 2: the results of this method will not change if the container of the editor gets repositioned.
-+         * Warning: the results of this method are innacurate for positions that are outside the current editor viewport.
-+         */
-+        getScrolledVisiblePosition(position: IPosition): {
-+            top: number;
-+            left: number;
-+            height: number;
-+        };
-+        /**
-+         * Apply the same font settings as the editor to `target`.
-+         */
-+        applyFontInfo(target: HTMLElement): void;
-+    }
-+
-+    /**
-+     * A rich diff editor.
-+     */
-+    export interface IDiffEditor extends ICommonDiffEditor {
-+        /**
-+         * @see ICodeEditor.getDomNode
-+         */
-+        getDomNode(): HTMLElement;
-+    }
-+
-+    export class FontInfo extends BareFontInfo {
-+        readonly _editorStylingBrand: void;
-+        readonly isMonospace: boolean;
-+        readonly typicalHalfwidthCharacterWidth: number;
-+        readonly typicalFullwidthCharacterWidth: number;
-+        readonly spaceWidth: number;
-+        readonly maxDigitWidth: number;
-+    }
-+    export class BareFontInfo {
-+        readonly _bareFontInfoBrand: void;
-+        readonly fontFamily: string;
-+        readonly fontWeight: string;
-+        readonly fontSize: number;
-+        readonly lineHeight: number;
-+    }
-+>>>>>>> .their
- }
- 
- declare namespace monaco.languages {
diff --git a/app/test/fixtures/merge-parser/vscode/merge-triggerExpansionOnTab-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-triggerExpansionOnTab-into-master.txt
deleted file mode 100644
index d8dd86c4cfe..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-triggerExpansionOnTab-into-master.txt
+++ /dev/null
@@ -1,141 +0,0 @@
-changed in both
-  base   100644 3086dbd7b532f99ec2f892b434c4e8662039f845 extensions/emmet/package.json
-  our    100644 d9be62f74d1063d961b7895eab86495b34482691 extensions/emmet/package.json
-  their  100644 866c77d69c8ebc5e521188fad65e089765cc47c4 extensions/emmet/package.json
-@@ -87,6 +87,7 @@
-                     "type": "boolean",
-                     "default": false,
-                     "description": "%emmetTriggerExpansionOnTab%"
-+<<<<<<< .our
-                 },
-                 "emmet.preferences": {
-                     "type": "object",
-@@ -216,6 +217,8 @@
-                     "type": "boolean",
-                     "default": true,
-                     "markdownDescription": "%emmetOptimizeStylesheetParsing%"
-+=======
-+>>>>>>> .their
-                 }
-             }
-         },
-changed in both
-  base   100644 5a21d5bc4790ef86ab1e71cb5bf337a469ab3263 extensions/emmet/package.nls.json
-  our    100644 3f3bf912fd84e40ee4fbf65592c9123e2f4d160a extensions/emmet/package.nls.json
-  their  100644 cafd59328708f3a4d33f9f213864c80eb69aeec3 extensions/emmet/package.nls.json
-@@ -24,6 +24,7 @@
- 	"command.incrementNumberByTen": "Increment by 10",
- 	"command.decrementNumberByTen": "Decrement by 10",
- 	"emmetSyntaxProfiles": "Define profile for specified syntax or use your own profile with specific rules.",
-+<<<<<<< .our
- 	"emmetExclude": "An array of languages where Emmet abbreviations should not be expanded.",
- 	"emmetExtensionsPath": "Path to a folder containing Emmet profiles and snippets.",
- 	"emmetShowExpandedAbbreviation": "Shows expanded Emmet abbreviations as suggestions.\nThe option `\"inMarkupAndStylesheetFilesOnly\"` applies to html, haml, jade, slim, xml, xsl, css, scss, sass, less and stylus.\nThe option `\"always\"` applies to all parts of the file regardless of markup/css.",
-@@ -56,3 +57,13 @@
- 	"emmetPreferencesCssFuzzySearchMinScore": "The minimum score (from 0 to 1) that fuzzy-matched abbreviation should achieve. Lower values may produce many false-positive matches, higher values may reduce possible matches.",
- 	"emmetOptimizeStylesheetParsing": "When set to `false`, the whole file is parsed to determine if current position is valid for expanding Emmet abbreviations. When set to `true`, only the content around the current position in css/scss/less files is parsed."
- }
-+=======
-+	"emmetExclude": "An array of languages where emmet abbreviations should not be expanded.",
-+	"emmetExtensionsPath": "Path to a folder containing emmet profiles and snippets.'",
-+	"emmetShowExpandedAbbreviation": "Shows expanded emmet abbreviations as suggestions.\nThe option \"inMarkupAndStylesheetFilesOnly\" applies to html, haml, jade, slim, xml, xsl, css, scss, sass, less and stylus.\nThe option \"always\" applies to all parts of the file regardless of markup/css.",
-+	"emmetShowAbbreviationSuggestions": "Shows possible emmet abbreviations as suggestions. Not applicable in stylesheets or when emmet.showExpandedAbbreviation is set to \"never\".",
-+	"emmetIncludeLanguages": "Enable emmet abbreviations in languages that are not supported by default. Add a mapping here between the language and emmet supported language.\n Eg: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
-+	"emmetVariables": "Variables to be used in emmet snippets",
-+	"emmetTriggerExpansionOnTab": "When enabled, emmet abbreviations are expanded when pressing TAB."
-+}
-+>>>>>>> .their
-changed in both
-  base   100644 4bb8908f31d4b758324f2a4b9129845b301bc4f8 extensions/emmet/src/abbreviationActions.ts
-  our    100644 26444af31e5994ebc9cddebb9de151cacae3311b extensions/emmet/src/abbreviationActions.ts
-  their  100644 f3d16d0a7aa224cf3e564bff5a911224bea796cc extensions/emmet/src/abbreviationActions.ts
-@@ -225,6 +225,7 @@
- 	});
- }
- 
-+<<<<<<< .our
- export function expandEmmetAbbreviation(args: any): Thenable<boolean | undefined> {
- 	if (!validate() || !vscode.window.activeTextEditor) {
- 		return fallbackTab();
-@@ -241,6 +242,11 @@
- 	}
- 	const syntax = getSyntaxFromArgs(args);
- 	if (!syntax) {
-+=======
-+export function expandEmmetAbbreviation(args): Thenable<boolean> {
-+	const syntax = getSyntaxFromArgs(args);
-+	if (!syntax || !validate()) {
-+>>>>>>> .their
- 		return fallbackTab();
- 	}
- 
-@@ -253,8 +259,13 @@
- 		rootNode = parseDocument(editor.document, false);
- 	}
- 
-+<<<<<<< .our
- 	// When tabbed on a non empty selection, do not treat it as an emmet abbreviation, and fallback to tab instead
- 	if (vscode.workspace.getConfiguration('emmet')['triggerExpansionOnTab'] === true && editor.selections.find(x => !x.isEmpty)) {
-+=======
-+	let rootNode = parseDocument(editor.document);
-+	if (!rootNode) {
-+>>>>>>> .their
- 		return fallbackTab();
- 	}
- 
-@@ -349,11 +360,18 @@
- 	});
- }
- 
-+<<<<<<< .our
- function fallbackTab(): Thenable<boolean | undefined> {
- 	if (vscode.workspace.getConfiguration('emmet')['triggerExpansionOnTab'] === true) {
- 		return vscode.commands.executeCommand('tab');
- 	}
- 	return Promise.resolve(true);
-+=======
-+function fallbackTab(): Thenable<boolean> {
-+	if (vscode.workspace.getConfiguration('emmet')['triggerExpansionOnTab'] === true) {
-+		return vscode.commands.executeCommand('tab');
-+	}
-+>>>>>>> .their
- }
- /**
-  * Checks if given position is a valid location to expand emmet abbreviation.
-changed in both
-  base   100644 b40d18fabcf7a11767324ef5cd5d0006c27fb2cf src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.ts
-  our    100644 42968c4b84603ff59a9acfd4957937949e3cc7cd src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.ts
-  their  100644 fc9136fce72fa856746b6d08c7abb2ba8a7b1351 src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.ts
-@@ -10,8 +10,11 @@
- import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
- import { KeyCode } from 'vs/base/common/keyCodes';
- import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-+<<<<<<< .our
- import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
- import { MenuId } from 'vs/platform/actions/common/actions';
-+=======
-+>>>>>>> .their
- 
- class ExpandAbbreviationAction extends EmmetEditorAction {
- 
-@@ -25,6 +28,7 @@
- 			kbOpts: {
- 				primary: KeyCode.Tab,
- 				kbExpr: ContextKeyExpr.and(
-+<<<<<<< .our
- 					EditorContextKeys.editorTextFocus,
- 					EditorContextKeys.tabDoesNotMoveFocus,
- 					ContextKeyExpr.has('config.emmet.triggerExpansionOnTab')
-@@ -36,6 +40,12 @@
- 				group: '5_insert',
- 				title: nls.localize({ key: 'miEmmetExpandAbbreviation', comment: ['&& denotes a mnemonic'] }, "Emmet: E&&xpand Abbreviation"),
- 				order: 3
-+=======
-+					EditorContextKeys.textFocus,
-+					EditorContextKeys.tabDoesNotMoveFocus,
-+					ContextKeyExpr.has('config.emmet.triggerExpansionOnTab')
-+				)
-+>>>>>>> .their
- 			}
- 		});
- 
diff --git a/app/test/fixtures/merge-parser/vscode/merge-tsalinger-multipath-handling-quoted-backslash-in-linux-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-tsalinger-multipath-handling-quoted-backslash-in-linux-into-master.txt
deleted file mode 100644
index 9f43ac817e7..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-tsalinger-multipath-handling-quoted-backslash-in-linux-into-master.txt
+++ /dev/null
@@ -1,334 +0,0 @@
-changed in both
-  base   100644 b8a144fd5ec3b9c98bc86d57454f9546f50aafac src/vs/base/common/paths.ts
-  our    100644 e5ed22fb7b905feb482624e3e7f407091cdf1024 src/vs/base/common/paths.ts
-  their  100644 53dc12f4cfd65a752aafcfdc5b522c1dba1cdc0d src/vs/base/common/paths.ts
-@@ -4,7 +4,7 @@
-  *--------------------------------------------------------------------------------------------*/
- 'use strict';
- 
--import { isWindows } from 'vs/base/common/platform';
-+import { isWindows, isLinux } from 'vs/base/common/platform';
- import { startsWithIgnoreCase, equalsIgnoreCase } from 'vs/base/common/strings';
- import { CharCode } from 'vs/base/common/charCode';
- 
-@@ -296,7 +296,15 @@
- 
- 	INVALID_FILE_CHARS.lastIndex = 0; // the holy grail of software development
- 	if (INVALID_FILE_CHARS.test(name)) {
--		return false; // check for certain invalid file characters
-+		let isValid = false;
-+		if (isLinux && name.indexOf('/') === -1) {	// forward slashes are not allowed
-+			if (name.search(/^['"].+?\\.+?['"]$/) === 0) {	// name starts & ends with a quote and contains a backslash
-+				isValid = true;	// linux allows names with backslashes as long as they are in quotes. e.g 'file1\name'
-+			}
-+		}
-+		if (!isValid) {
-+			return false; // check for certain invalid file characters
-+		}
- 	}
- 
- 	if (isWindows && WINDOWS_FORBIDDEN_NAMES.test(name)) {
-changed in both
-  base   100644 bc440771caca974ad9ab6607445ef5c7817d9c26 src/vs/workbench/parts/files/common/explorerModel.ts
-  our    100644 49d64d0a561cfc89077f412464843a7b0f047e1f src/vs/workbench/parts/files/common/explorerModel.ts
-  their  100644 f0548a68d169a9649ae6ac9f8a3b387cb94e78d7 src/vs/workbench/parts/files/common/explorerModel.ts
-@@ -15,8 +15,14 @@
- import { toResource, IEditorIdentifier, IEditorInput } from 'vs/workbench/common/editor';
- import { IDisposable, dispose } from 'vs/base/common/lifecycle';
- import { Schemas } from 'vs/base/common/network';
-+<<<<<<< .our
- import { rtrim } from 'vs/base/common/strings';
- import { IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService';
-+=======
-+import { startsWith, startsWithIgnoreCase, rtrim } from 'vs/base/common/strings';
-+// tslint:disable-next-line:import-patterns
-+import * as path from 'path';
-+>>>>>>> .their
- 
- export class Model {
- 
-@@ -311,7 +317,11 @@
- 	}
- 
- 	private updateResource(recursive: boolean): void {
-+<<<<<<< .our
- 		this.resource = resources.joinPath(this.parent.resource, this.name);
-+=======
-+		this.resource = this.parent.resource.with({ path: path.join(this.parent.resource.path, this.name) });
-+>>>>>>> .their
- 
- 		if (recursive) {
- 			if (this.isDirectory && this.children) {
-changed in both
-  base   100644 76a6aacb07fe8eac96a9b69e5ac0408b37f64401 src/vs/workbench/parts/files/electron-browser/fileActions.ts
-  our    100644 2b34716fc38cb7630fc57b1b63eaabafcd472436 src/vs/workbench/parts/files/electron-browser/fileActions.ts
-  their  100644 683d0ce5167d379b19f980c419d5d59271ee02fb src/vs/workbench/parts/files/electron-browser/fileActions.ts
-@@ -14,6 +14,10 @@
- import * as paths from 'vs/base/common/paths';
- import * as resources from 'vs/base/common/resources';
- import URI from 'vs/base/common/uri';
-+<<<<<<< .our
-+=======
-+import { posix, join } from 'path';
-+>>>>>>> .their
- import * as errors from 'vs/base/common/errors';
- import { toErrorMessage } from 'vs/base/common/errorMessage';
- import * as strings from 'vs/base/common/strings';
-@@ -298,8 +302,33 @@
- 	}
- 
- 	public runAction(newName: string): TPromise<any> {
-+<<<<<<< .our
- 		const parentResource = this.element.parent.resource;
- 		const targetResource = resources.joinPath(parentResource, newName);
-+=======
-+		const dirty = this.textFileService.getDirty().filter(d => resources.isEqualOrParent(d, this.element.resource, !isLinux /* ignorecase */));
-+		const dirtyRenamed: URI[] = [];
-+		return TPromise.join(dirty.map(d => {
-+			let renamed: URI;
-+
-+			// If the dirty file itself got moved, just reparent it to the target folder
-+			const targetPath = paths.join(this.element.parent.resource.path, newName);
-+			if (this.element.resource.toString() === d.toString()) {
-+				renamed = this.element.parent.resource.with({ path: targetPath });
-+			}
-+
-+			// Otherwise, a parent of the dirty resource got moved, so we have to reparent more complicated. Example:
-+			else {
-+				renamed = this.element.parent.resource.with({ path: join(targetPath, d.path.substr(this.element.resource.path.length + 1)) });
-+			}
-+
-+			dirtyRenamed.push(renamed);
-+
-+			const model = this.textFileService.models.get(d);
-+
-+			return this.backupFileService.backupResource(renamed, model.createSnapshot(), model.getVersionId());
-+		}))
-+>>>>>>> .their
- 
- 		return this.textFileService.move(this.element.resource, targetResource);
- 	}
-@@ -495,7 +524,11 @@
- 
- 	public runAction(fileName: string): TPromise<any> {
- 		const resource = this.element.parent.resource;
-+<<<<<<< .our
- 		return this.fileService.createFile(resources.joinPath(resource, fileName)).then(stat => {
-+=======
-+		return this.fileService.createFile(resource.with({ path: join(resource.path, fileName) })).then(stat => {
-+>>>>>>> .their
- 			return this.editorService.openEditor({ resource: stat.resource, options: { pinned: true } });
- 		}, (error) => {
- 			this.onErrorWithRetry(error, () => this.runAction(fileName));
-@@ -522,7 +555,11 @@
- 
- 	public runAction(fileName: string): TPromise<any> {
- 		const resource = this.element.parent.resource;
-+<<<<<<< .our
- 		return this.fileService.createFolder(resources.joinPath(resource, fileName)).then(null, (error) => {
-+=======
-+		return this.fileService.createFolder(resource.with({ path: join(resource.path, fileName) })).then(null, (error) => {
-+>>>>>>> .their
- 			this.onErrorWithRetry(error, () => this.runAction(fileName));
- 		});
- 	}
-@@ -833,7 +870,11 @@
- 						resourcesToAdd.forEach(resource => {
- 							addPromisesFactory.push(() => {
- 								const sourceFile = resource;
-+<<<<<<< .our
- 								const targetFile = resources.joinPath(targetElement.resource, resources.basename(sourceFile));
-+=======
-+								const targetFile = targetElement.resource.with({ path: join(targetElement.resource.path, paths.basename(sourceFile.path)) });
-+>>>>>>> .their
- 
- 								// if the target exists and is dirty, make sure to revert it. otherwise the dirty contents
- 								// of the target file would replace the contents of the added file. since we already
-@@ -1466,7 +1507,12 @@
- 		return nls.localize('fileNameStartsWithSlashError', "A file or folder name cannot start with a slash.");
- 	}
- 
-+<<<<<<< .our
- 	const names: string[] = name.split(/[\\/]/).filter(part => !!part);
-+=======
-+	const names: string[] = extractPathSegments(name, isLinux);
-+	const analyzedPath = analyzePath(parent, names);
-+>>>>>>> .their
- 
- 	// Do not allow to overwrite existing file
- 	const childExists = !!parent.getChild(name);
-@@ -1490,6 +1536,57 @@
- 	return null;
- }
- 
-+<<<<<<< .our
-+=======
-+export function extractPathSegments(name: string, isLinux: boolean) {
-+	const slashes: RegExp = /[\\/]/;
-+	if (!isLinux) {
-+		return name.split(slashes).filter(part => !!part);
-+	} else {
-+		const quotedBackslashes: RegExp = /(["'].*?\\.*?["'])/;	// 'folder1\\folder2' shouldn't be split https://github.com/Microsoft/vscode/issues/44693
-+		const partiallySplittedNames: string[] = name.split(quotedBackslashes).filter(part => !!part); // "'folder1\\folder2'/folder3" becomes ["'folder1\folder2'", "/folder3"]
-+		const splittedNames: string[] = [];
-+		for (const part of partiallySplittedNames) {
-+			if (part.search(quotedBackslashes) !== -1) {
-+				splittedNames.push(part);
-+			} else {
-+				part.split(slashes).filter(part => !!part).forEach(p => splittedNames.push(p));
-+			}
-+		}
-+		return splittedNames;
-+	}
-+}
-+
-+function analyzePath(parent: ExplorerItem, pathNames: string[]): { fullPathAlreadyExists: boolean; lastExistingPathSegment: { isFile: boolean; name: string; } } {
-+	let lastExistingPathSegment = { isFile: false, name: '' };
-+
-+	for (const name of pathNames) {
-+		const { exists, child } = alreadyExists(parent, name);
-+
-+		if (exists) {
-+			lastExistingPathSegment = { isFile: !child.isDirectory, name };
-+			parent = child;
-+		} else {
-+			return { fullPathAlreadyExists: false, lastExistingPathSegment };
-+		}
-+	}
-+
-+	return { fullPathAlreadyExists: true, lastExistingPathSegment };
-+}
-+
-+
-+function alreadyExists(parent: ExplorerItem, name: string): { exists: boolean, child: ExplorerItem | undefined } {
-+	let duplicateChild: ExplorerItem;
-+
-+	if (parent && parent.isDirectory) {
-+		duplicateChild = parent.getChild(name);
-+		return { exists: !!duplicateChild, child: duplicateChild };
-+	}
-+
-+	return { exists: false, child: undefined };
-+}
-+
-+>>>>>>> .their
- function trimLongName(name: string): string {
- 	if (name && name.length > 255) {
- 		return `${name.substr(0, 255)}...`;
-changed in both
-  base   100644 1a418a43fc5ba0c2e14f523bb3b9501f5401309b src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
-  our    100644 e0204febe1f4826a27ae39de6c0363afc38b208d src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
-  their  100644 f328fc53a7df30787dcce38ae7fda921907571fa src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
-@@ -1077,17 +1077,77 @@
- 							return this.textFileService.move(source.resource, targetResource, true /* overwrite */).then(null, error => this.notificationService.error(error));
- 						}
- 
-+<<<<<<< .our
- 						return void 0;
- 					});
-+=======
-+				// If the dirty file itself got moved, just reparent it to the target folder
-+				if (source.resource.toString() === d.toString()) {
-+					moved = target.resource.with({ path: path.join(target.resource.path, source.name) });
-+>>>>>>> .their
- 				}
- 
- 				// Any other error
- 				else {
-+<<<<<<< .our
- 					this.notificationService.error(error);
- 				}
- 
- 				return void 0;
- 			});
-+=======
-+					moved = target.resource.with({ path: path.join(target.resource.path, d.path.substr(source.parent.resource.path.length + 1)) });
-+				}
-+
-+				dirtyMoved.push(moved);
-+
-+				const model = this.textFileService.models.get(d);
-+
-+				return this.backupFileService.backupResource(moved, model.createSnapshot(), model.getVersionId());
-+			}))
-+
-+				// 2. soft revert all dirty since we have backed up their contents
-+				.then(() => this.textFileService.revertAll(dirty, { soft: true /* do not attempt to load content from disk */ }))
-+
-+				// 3.) run the move operation
-+				.then(() => {
-+					const targetResource = target.resource.with({ path: path.join(target.resource.path, source.name) });
-+
-+					return this.fileService.moveFile(source.resource, targetResource).then(null, error => {
-+
-+						// Conflict
-+						if ((<FileOperationError>error).fileOperationResult === FileOperationResult.FILE_MOVE_CONFLICT) {
-+							const confirm: IConfirmation = {
-+								message: nls.localize('confirmOverwriteMessage', "'{0}' already exists in the destination folder. Do you want to replace it?", source.name),
-+								detail: nls.localize('irreversible', "This action is irreversible!"),
-+								primaryButton: nls.localize({ key: 'replaceButtonLabel', comment: ['&& denotes a mnemonic'] }, "&&Replace"),
-+								type: 'warning'
-+							};
-+
-+							// Move with overwrite if the user confirms
-+							return this.dialogService.confirm(confirm).then(res => {
-+								if (res.confirmed) {
-+									const targetDirty = this.textFileService.getDirty().filter(d => resources.isEqualOrParent(d, targetResource, !isLinux /* ignorecase */));
-+
-+									// Make sure to revert all dirty in target first to be able to overwrite properly
-+									return this.textFileService.revertAll(targetDirty, { soft: true /* do not attempt to load content from disk */ }).then(() => {
-+
-+										// Then continue to do the move operation
-+										return this.fileService.moveFile(source.resource, targetResource, true).then(onSuccess, error => onError(error, true));
-+									});
-+								}
-+
-+								return onError();
-+							});
-+						}
-+
-+						return onError(error, true);
-+					});
-+				})
-+
-+				// 4.) resolve those that were dirty to load their previous dirty contents from disk
-+				.then(onSuccess, onError);
-+>>>>>>> .their
- 		}, errors.onUnexpectedError);
- 	}
- }
-changed in both
-  base   100644 d072bc62b58fb10fdba41c627f3d44b65894a3be src/vs/workbench/parts/files/test/electron-browser/explorerModel.test.ts
-  our    100644 e88d9dadf02d9731426f8d3052afb402fe2dd7f7 src/vs/workbench/parts/files/test/electron-browser/explorerModel.test.ts
-  their  100644 4a68f7f477ba987e406b907ea92bf329fe828405 src/vs/workbench/parts/files/test/electron-browser/explorerModel.test.ts
-@@ -10,7 +10,7 @@
- import { isLinux, isWindows } from 'vs/base/common/platform';
- import URI from 'vs/base/common/uri';
- import { join } from 'vs/base/common/paths';
--import { validateFileName } from 'vs/workbench/parts/files/electron-browser/fileActions';
-+import { validateFileName, extractPathSegments } from 'vs/workbench/parts/files/electron-browser/fileActions';
- import { ExplorerItem } from 'vs/workbench/parts/files/common/explorerModel';
- 
- function createStat(path: string, name: string, isFolder: boolean, hasChildren: boolean, size: number, mtime: number): ExplorerItem {
-@@ -266,6 +266,21 @@
- 		assert(validateFileName(wsFolder, '/path/to/stat/') !== null);
- 	});
- 
-+	test('Split Multi-Path OS-Specific', function () {
-+		const isLinux = true;
-+		const notLinux = false;
-+		// basic tests
-+		assert.deepStrictEqual(extractPathSegments('folder1', isLinux), ['folder1']);
-+		assert.deepStrictEqual(extractPathSegments('folder1/', isLinux), ['folder1']);
-+		assert.deepStrictEqual(extractPathSegments('folder1/folder2//', notLinux), ['folder1', 'folder2']);
-+		assert.deepStrictEqual(extractPathSegments('folder1\\folder2', isLinux), ['folder1', 'folder2']);
-+
-+		// quoted path segments
-+		assert.deepStrictEqual(extractPathSegments('"folder1\\folder2"', isLinux), ['"folder1\\folder2"']);
-+		assert.deepStrictEqual(extractPathSegments('"folder1//folder2"', isLinux), ['"folder1', 'folder2"']);
-+		assert.deepStrictEqual(extractPathSegments('"folder1\\folder2"', notLinux), ['"folder1', 'folder2"']);
-+	});
-+
- 	test('Merge Local with Disk', function () {
- 		const d = new Date().toUTCString();
- 
diff --git a/app/test/fixtures/merge-parser/vscode/merge-tsalinger-multipath-reveal-children-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-tsalinger-multipath-reveal-children-into-master.txt
deleted file mode 100644
index f149502ed95..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-tsalinger-multipath-reveal-children-into-master.txt
+++ /dev/null
@@ -1,120 +0,0 @@
-changed in both
-  base   100644 ea60112f840405e2c3afe63a982e63c94a691094 src/vs/workbench/parts/files/electron-browser/views/explorerView.ts
-  our    100644 40850fe8f725373739fb0ea2990aa0abb55de3ae src/vs/workbench/parts/files/electron-browser/views/explorerView.ts
-  their  100644 9b37c96fc0f054a7a31864bcee65a4fd819a56a6 src/vs/workbench/parts/files/electron-browser/views/explorerView.ts
-@@ -5,6 +5,7 @@
- 'use strict';
- 
- import * as nls from 'vs/nls';
-+import { relative } from 'path';
- import { TPromise } from 'vs/base/common/winjs.base';
- import URI from 'vs/base/common/uri';
- import { ThrottledDelayer, Delayer } from 'vs/base/common/async';
-@@ -14,8 +15,13 @@
- import * as glob from 'vs/base/common/glob';
- import { Action, IAction } from 'vs/base/common/actions';
- import { memoize } from 'vs/base/common/decorators';
-+<<<<<<< .our
- import { IFilesConfiguration, ExplorerFolderContext, FilesExplorerFocusedContext, ExplorerFocusedContext, SortOrderConfiguration, SortOrder, IExplorerView, ExplorerRootContext, ExplorerResourceReadonlyContext } from 'vs/workbench/parts/files/common/files';
- import { FileOperation, FileOperationEvent, IResolveFileOptions, FileChangeType, FileChangesEvent, IFileService, FILES_EXCLUDE_CONFIG } from 'vs/platform/files/common/files';
-+=======
-+import { IFilesConfiguration, ExplorerFolderContext, FilesExplorerFocusedContext, ExplorerFocusedContext, SortOrderConfiguration, SortOrder, IExplorerView, ExplorerRootContext } from 'vs/workbench/parts/files/common/files';
-+import { FileOperation, FileOperationEvent, IResolveFileOptions, FileChangeType, FileChangesEvent, IFileService, FILES_EXCLUDE_CONFIG, IFileStat } from 'vs/platform/files/common/files';
-+>>>>>>> .their
- import { RefreshViewExplorerAction, NewFolderAction, NewFileAction } from 'vs/workbench/parts/files/electron-browser/fileActions';
- import { FileDragAndDrop, FileFilter, FileSorter, FileController, FileRenderer, FileDataSource, FileViewletState, FileAccessibilityProvider } from 'vs/workbench/parts/files/electron-browser/views/explorerViewer';
- import { toResource } from 'vs/workbench/common/editor';
-@@ -479,34 +485,68 @@
- 
- 		// Add
- 		if (e.operation === FileOperation.CREATE || e.operation === FileOperation.COPY) {
--			const addedElement = e.target;
--			const parentResource = resources.dirname(addedElement.resource);
--			const parents = this.model.findAll(parentResource);
--
--			if (parents.length) {
-+			const addedElement: IFileStat = e.target;
-+
-+			// compute the parent folder URI in which the new elements have been created
-+			let parentResource: URI = addedElement.resource;
-+			let closest = this.model.findClosest(parentResource);
-+			while (!closest && parentResource.path !== '/') {
-+				parentResource = resources.dirname(parentResource);
-+				closest = this.model.findClosest(parentResource);
-+			}
- 
--				// Add the new file to its parent (Model)
--				parents.forEach(p => {
--					// We have to check if the parent is resolved #29177
--					(p.isDirectoryResolved ? TPromise.as(null) : this.fileService.resolveFile(p.resource)).then(stat => {
--						if (stat) {
--							const modelStat = ExplorerItem.create(stat, p.root);
--							ExplorerItem.mergeLocalWithDisk(modelStat, p);
--						}
-+			if (parentResource.path === '/') {
-+				return;
-+			}
- 
--						const childElement = ExplorerItem.create(addedElement, p.root);
--						p.removeChild(childElement); // make sure to remove any previous version of the file if any
--						p.addChild(childElement);
--						// Refresh the Parent (View)
--						this.explorerViewer.refresh(p).then(() => {
--							return this.reveal(childElement, 0.5).then(() => {
--
--								// Focus new element
--								this.explorerViewer.setFocus(childElement);
--							});
--						}).done(null, errors.onUnexpectedError);
-+			const parents: ExplorerItem[] = this.model.findAll(parentResource);
-+			if (parents.length) {
-+				const names: string[] = relative(parentResource.toString(), addedElement.resource.toString()).split(/[\\/]/).filter(Boolean);
-+
-+				// convert names to URIs
-+				const uris: URI[] = [];
-+				names.reduce((prev: URI, curr: string) => {
-+					const uri = prev.with({ path: paths.join(prev.path, curr) });
-+					uris.push(uri);
-+					return uri;
-+				}, parentResource);
-+
-+				// convert URIs to IFileStat
-+				Promise.all(uris.map((uri) => this.fileService.resolveFile(uri))).then((children: IFileStat[]) => {
-+
-+					// Add the new file to its parent (Model)
-+					parents.forEach(p => {
-+						// We have to check if the parent is resolved #29177
-+						(p.isDirectoryResolved ? TPromise.as(null) : this.fileService.resolveFile(p.resource)).then(stat => {
-+							if (stat) {
-+								const modelStat = ExplorerItem.create(stat, p.root);
-+								ExplorerItem.mergeLocalWithDisk(modelStat, p);
-+							}
-+
-+							const childElements: ExplorerItem[] = children.map(item => ExplorerItem.create(item, p.root));
-+
-+							// multi-path case: create children hierarchy
-+							for (let i = 0; i < childElements.length - 1; i++) {
-+								childElements[i].addChild(childElements[i + 1]);
-+							}
-+
-+							const firstElement = childElements[0];
-+							// if only one folder is created: lastElement === firstElement
-+							const lastElement = childElements.length === 1 ? firstElement : childElements[childElements.length - 1];
-+
-+							p.removeChild(firstElement); // make sure to remove any previous version of the file if any
-+							p.addChild(firstElement);
-+							// Refresh the Parent (View)
-+							this.explorerViewer.refresh(p).then(() => {
-+								return this.reveal(lastElement, 0.5).then(() => {
-+
-+									// Focus new element
-+									this.explorerViewer.setFocus(lastElement);
-+								});
-+							}).done(null, errors.onUnexpectedError);
-+						});
- 					});
--				});
-+				}).catch(e => console.log(e));
- 			}
- 		}
- 
diff --git a/app/test/fixtures/merge-parser/vscode/merge-tyriar-30685-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-tyriar-30685-into-master.txt
deleted file mode 100644
index 63be7db3cc2..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-tyriar-30685-into-master.txt
+++ /dev/null
@@ -1,260 +0,0 @@
-changed in both
-  base   100644 4c2bf4a1d4ad294014f15fd8835fe06df7445dc2 src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
-  our    100644 04d9dcba251cf79c28429027cda3ca3b0c10a29c src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
-  their  100644 ae8677f429767faab5a1c772a62f3164a40976a8 src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
-@@ -25,6 +25,7 @@
- import { scrollbarSliderBackground, scrollbarSliderHoverBackground, scrollbarSliderActiveBackground, activeContrastBorder } from 'vs/platform/theme/common/colorRegistry';
- import { TPromise } from 'vs/base/common/winjs.base';
- import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-+<<<<<<< .our
- import { ansiColorIdentifiers, TERMINAL_BACKGROUND_COLOR, TERMINAL_FOREGROUND_COLOR, TERMINAL_CURSOR_FOREGROUND_COLOR, TERMINAL_CURSOR_BACKGROUND_COLOR, TERMINAL_SELECTION_BACKGROUND_COLOR } from 'vs/workbench/parts/terminal/common/terminalColorRegistry';
- import { PANEL_BACKGROUND } from 'vs/workbench/common/theme';
- import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
-@@ -41,6 +42,24 @@
- const NUMBER_OF_FRAMES_TO_MEASURE = 20;
- 
- let Terminal: typeof XTermTerminal;
-+=======
-+import { IHistoryService } from 'vs/workbench/services/history/common/history';
-+import pkg from 'vs/platform/node/package';
-+
-+/** The amount of time to consider terminal errors to be related to the launch */
-+const LAUNCHING_DURATION = 500;
-+
-+let Terminal: typeof XTermTerminal;
-+
-+class StandardTerminalProcessFactory implements ITerminalProcessFactory {
-+	public create(env: { [key: string]: string }): cp.ChildProcess {
-+		return cp.fork('./terminalProcess', [], {
-+			env,
-+			cwd: Uri.parse(path.dirname(require.toUrl('./terminalProcess'))).fsPath
-+		});
-+	}
-+}
-+>>>>>>> .their
- 
- export class TerminalInstance implements ITerminalInstance {
- 	private static readonly EOL_REGEX = /\r?\n/g;
-@@ -58,12 +77,19 @@
- 	private _skipTerminalCommands: string[];
- 	private _title: string;
- 	private _wrapperElement: HTMLDivElement;
--	private _xterm: XTermTerminal;
-+	private _xterm: any;//XTermTerminal;
- 	private _xtermElement: HTMLDivElement;
- 	private _terminalHasTextContextKey: IContextKey<boolean>;
- 	private _cols: number;
- 	private _rows: number;
-+<<<<<<< .our
- 	private _dimensionsOverride: ITerminalDimensions;
-+=======
-+	private _messageTitleListener: (message: { type: string, content: string }) => void;
-+	private _preLaunchInputQueue: string;
-+	private _initialCwd: string;
-+	private _xtermReadyPromise: TPromise<void>;
-+>>>>>>> .their
- 	private _windowsShellHelper: WindowsShellHelper;
- 	private _xtermReadyPromise: Promise<void>;
- 
-@@ -141,16 +167,26 @@
- 		this._logService.trace(`terminalInstance#ctor (id: ${this.id})`, this._shellLaunchConfig);
- 
- 		this._initDimensions();
-+<<<<<<< .our
- 		if (!this.shellLaunchConfig.isRendererOnly) {
- 			this._createProcess();
- 		} else {
- 			this.setTitle(this._shellLaunchConfig.name, false);
-+=======
-+		this._createProcess(this._shellLaunchConfig);
-+
-+		if (platform.isWindows) {
-+			this._processReady.then(() => {
-+				this._windowsShellHelper = new WindowsShellHelper(this._processId, this._shellLaunchConfig.executable);
-+			});
-+>>>>>>> .their
- 		}
- 
- 		this._xtermReadyPromise = this._createXterm();
- 		this._xtermReadyPromise.then(() => {
- 			// Only attach xterm.js to the DOM if the terminal panel has been opened before.
- 			if (_container) {
-+<<<<<<< .our
- 				this._attachToElement(_container);
- 			}
- 		});
-@@ -163,6 +199,11 @@
- 				this.updateAccessibilitySupport();
- 			}
- 		}));
-+=======
-+				this.attachToElement(_container);
-+			}
-+		});
-+>>>>>>> .their
- 	}
- 
- 	public addDisposable(disposable: lifecycle.IDisposable): void {
-@@ -261,6 +302,7 @@
- 	/**
- 	 * Create xterm.js instance and attach data listeners.
- 	 */
-+<<<<<<< .our
- 	protected async _createXterm(): Promise<void> {
- 		if (!Terminal) {
- 			Terminal = (await import('vscode-xterm')).Terminal;
-@@ -295,6 +337,15 @@
- 			rendererType: config.rendererType === 'auto' ? 'canvas' : config.rendererType,
- 			// TODO: Remove this once the setting is removed upstream
- 			experimentalCharAtlas: 'dynamic'
-+=======
-+	protected async _createXterm(): TPromise<void> {
-+		if (!Terminal) {
-+			Terminal = await import('xterm');
-+			Terminal.loadAddon('search');
-+		}
-+		this._xterm = new Terminal({
-+			scrollback: this._configHelper.config.scrollback
-+>>>>>>> .their
- 		});
- 		if (this._shellLaunchConfig.initialText) {
- 			this._xterm.writeln(this._shellLaunchConfig.initialText);
-@@ -331,6 +382,7 @@
- 	}
- 
- 	public attachToElement(container: HTMLElement): void {
-+<<<<<<< .our
- 		// The container did not change, do nothing
- 		if (this._container === container) {
- 			return;
-@@ -403,6 +455,55 @@
- 
- 			// xterm.js currently drops selection on keyup as we need to handle this case.
- 			this._disposables.push(dom.addDisposableListener(this._xterm.element, 'keyup', (event: KeyboardEvent) => {
-+=======
-+		this._xtermReadyPromise.then(() => {
-+			if (this._wrapperElement) {
-+				throw new Error('The terminal instance has already been attached to a container');
-+			}
-+
-+			this._container = container;
-+			this._wrapperElement = document.createElement('div');
-+			dom.addClass(this._wrapperElement, 'terminal-wrapper');
-+			this._xtermElement = document.createElement('div');
-+
-+			this._xterm.open(this._xtermElement, false);
-+			this._xterm.attachCustomKeyEventHandler((event: KeyboardEvent) => {
-+				// Disable all input if the terminal is exiting
-+				if (this._isExiting) {
-+					return false;
-+				}
-+
-+				// Skip processing by xterm.js of keyboard events that resolve to commands described
-+				// within commandsToSkipShell
-+				const standardKeyboardEvent = new StandardKeyboardEvent(event);
-+				const resolveResult = this._keybindingService.softDispatch(standardKeyboardEvent, standardKeyboardEvent.target);
-+				if (resolveResult && this._skipTerminalCommands.some(k => k === resolveResult.commandId)) {
-+					event.preventDefault();
-+					return false;
-+				}
-+
-+				// If tab focus mode is on, tab is not passed to the terminal
-+				if (TabFocus.getTabFocusMode() && event.keyCode === 9) {
-+					return false;
-+				}
-+
-+				// Windows does not get a process title event from terminalProcess so we check the name on enter
-+				// messageTitleListener is falsy when the API/user renames the terminal so we don't override it
-+				if (platform.isWindows && event.keyCode === 13 /* ENTER */ && this._messageTitleListener) {
-+					this._windowsShellHelper.getShellName().then(title => this.setTitle(title, true));
-+				}
-+
-+				return undefined;
-+			});
-+			this._instanceDisposables.push(dom.addDisposableListener(this._xterm.element, 'mouseup', (event: KeyboardEvent) => {
-+				// Wait until mouseup has propagated through the DOM before
-+				// evaluating the new selection state.
-+				setTimeout(() => this._refreshSelectionContextKey(), 0);
-+			}));
-+
-+			// xterm.js currently drops selection on keyup as we need to handle this case.
-+			this._instanceDisposables.push(dom.addDisposableListener(this._xterm.element, 'keyup', (event: KeyboardEvent) => {
-+>>>>>>> .their
- 				// Wait until keyup has propagated through the DOM before evaluating
- 				// the new selection state.
- 				setTimeout(() => this._refreshSelectionContextKey(), 0);
-@@ -412,7 +513,11 @@
- 			const focusTrap: HTMLElement = document.createElement('div');
- 			focusTrap.setAttribute('tabindex', '0');
- 			dom.addClass(focusTrap, 'focus-trap');
-+<<<<<<< .our
- 			this._disposables.push(dom.addDisposableListener(focusTrap, 'focus', (event: FocusEvent) => {
-+=======
-+			this._instanceDisposables.push(dom.addDisposableListener(focusTrap, 'focus', (event: FocusEvent) => {
-+>>>>>>> .their
- 				let currentElement = focusTrap;
- 				while (!dom.hasClass(currentElement, 'part')) {
- 					currentElement = currentElement.parentElement;
-@@ -422,6 +527,7 @@
- 			}));
- 			xtermHelper.insertBefore(focusTrap, this._xterm.textarea);
- 
-+<<<<<<< .our
- 			this._disposables.push(dom.addDisposableListener(this._xterm.textarea, 'focus', (event: KeyboardEvent) => {
- 				this._terminalFocusContextKey.set(true);
- 				this._onFocused.fire(this);
-@@ -434,11 +540,25 @@
- 				this._terminalFocusContextKey.set(true);
- 			}));
- 			this._disposables.push(dom.addDisposableListener(this._xterm.element, 'blur', (event: KeyboardEvent) => {
-+=======
-+			this._instanceDisposables.push(dom.addDisposableListener(this._xterm.textarea, 'focus', (event: KeyboardEvent) => {
-+				this._terminalFocusContextKey.set(true);
-+			}));
-+			this._instanceDisposables.push(dom.addDisposableListener(this._xterm.textarea, 'blur', (event: KeyboardEvent) => {
-+				this._terminalFocusContextKey.reset();
-+				this._refreshSelectionContextKey();
-+			}));
-+			this._instanceDisposables.push(dom.addDisposableListener(this._xterm.element, 'focus', (event: KeyboardEvent) => {
-+				this._terminalFocusContextKey.set(true);
-+			}));
-+			this._instanceDisposables.push(dom.addDisposableListener(this._xterm.element, 'blur', (event: KeyboardEvent) => {
-+>>>>>>> .their
- 				this._terminalFocusContextKey.reset();
- 				this._refreshSelectionContextKey();
- 			}));
- 
- 			this._wrapperElement.appendChild(this._xtermElement);
-+<<<<<<< .our
- 			this._container.appendChild(this._wrapperElement);
- 
- 			if (this._processManager) {
-@@ -514,6 +634,25 @@
- 				textRenderLayer.onGridChanged = originalOnGridChanged;
- 			}
- 		};
-+=======
-+			this._widgetManager = new TerminalWidgetManager(this._configHelper, this._wrapperElement);
-+			this._linkHandler.setWidgetManager(this._widgetManager);
-+			this._container.appendChild(this._wrapperElement);
-+
-+			const computedStyle = window.getComputedStyle(this._container);
-+			const width = parseInt(computedStyle.getPropertyValue('width').replace('px', ''), 10);
-+			const height = parseInt(computedStyle.getPropertyValue('height').replace('px', ''), 10);
-+			this.layout(new Dimension(width, height));
-+			this.setVisible(this._isVisible);
-+			this.updateConfig();
-+
-+			// If IShellLaunchConfig.waitOnExit was true and the process finished before the terminal
-+			// panel was initialized.
-+			if (this._xterm.getOption('disableStdin')) {
-+				this._attachPressAnyKeyToCloseListener();
-+			}
-+		});
-+>>>>>>> .their
- 	}
- 
- 	public registerLinkMatcher(regex: RegExp, handler: (url: string) => void, matchIndex?: number, validationCallback?: (uri: string, callback: (isValid: boolean) => void) => void): number {
-removed in local
-  base   100644 ce211e668a02b03b972948849228b52986573baa src/vs/workbench/parts/terminal/test/electron-browser/terminalInstance.test.ts
-  their  100644 4db5bff6f16a030ad9587e0750b17d249d665783 src/vs/workbench/parts/terminal/test/electron-browser/terminalInstance.test.ts
diff --git a/app/test/fixtures/merge-parser/vscode/merge-tyriar-auto_switch_renderer-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-tyriar-auto_switch_renderer-into-master.txt
deleted file mode 100644
index dbd5c57228e..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-tyriar-auto_switch_renderer-into-master.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-changed in both
-  base   100644 42174a7c0ac36db01bc2af162873b06c7ad13356 src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
-  our    100644 04d9dcba251cf79c28429027cda3ca3b0c10a29c src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
-  their  100644 d85899bb3e961b230dae24985f9fdeafb275b710 src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
-@@ -29,7 +29,7 @@
- import { PANEL_BACKGROUND } from 'vs/workbench/common/theme';
- import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
- import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
--import { INotificationService, Severity, IPromptChoice } from 'vs/platform/notification/common/notification';
-+import { INotificationService } from 'vs/platform/notification/common/notification';
- import { ILogService } from 'vs/platform/log/common/log';
- import { TerminalCommandTracker } from 'vs/workbench/parts/terminal/node/terminalCommandTracker';
- import { TerminalProcessManager } from './terminalProcessManager';
-@@ -477,6 +477,7 @@
- 
- 			const averageTime = frameTimes.reduce((p, c) => p + c) / frameTimes.length;
- 			if (averageTime > SLOW_CANVAS_RENDER_THRESHOLD) {
-+<<<<<<< .our
- 				const promptChoices: IPromptChoice[] = [
- 					{
- 						label: nls.localize('yes', "Yes"),
-@@ -501,6 +502,11 @@
- 					nls.localize('terminal.slowRendering', 'The standard renderer for the integrated terminal appears to be slow on your computer. Would you like to switch to the alternative DOM-based renderer which may improve performance? [Read more about terminal settings](https://code.visualstudio.com/docs/editor/integrated-terminal#_changing-how-the-terminal-is-rendered).'),
- 					promptChoices
- 				);
-+=======
-+				this._configurationService.updateValue('terminal.integrated.rendererType', 'dom', ConfigurationTarget.USER).then(() => {
-+					this._logService.info(`Terminal canvas rendere detected to be slow (${averageTime}ms/frame), falling back to DOM-based renderer.`);
-+				});
-+>>>>>>> .their
- 			}
- 		};
- 
diff --git a/app/test/fixtures/merge-parser/vscode/merge-tyriar-dom_render-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-tyriar-dom_render-into-master.txt
deleted file mode 100644
index a5a8a5e516b..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-tyriar-dom_render-into-master.txt
+++ /dev/null
@@ -1,346 +0,0 @@
-changed in both
-  base   100644 370f0bc132ef62e537e3f01339fdd5099ccf41e0 package.json
-  our    100644 d0e982ce0b76c5b1b5eb02b673e459e47f3353a4 package.json
-  their  100644 cda01e9c540fa1bac0f6ad55439c72971c9a3a90 package.json
-@@ -47,10 +47,16 @@
-     "vscode-chokidar": "1.6.2",
-     "vscode-debugprotocol": "1.31.0",
-     "vscode-nsfw": "1.0.17",
-+<<<<<<< .our
-     "vscode-ripgrep": "1.1.0",
-     "vscode-textmate": "^4.0.1",
-     "vscode-xterm": "3.7.0-beta4",
-     "winreg": "^1.2.4",
-+=======
-+    "vscode-ripgrep": "^0.8.1",
-+    "vscode-textmate": "^3.3.3",
-+    "vscode-xterm": "3.5.0-beta2",
-+>>>>>>> .their
-     "yauzl": "^2.9.1"
-   },
-   "devDependencies": {
-changed in both
-  base   100644 2bbcfac4f8f1fafc92cc3df5ed3841cb8d2716aa src/typings/vscode-xterm.d.ts
-  our    100644 5f1e27de082b20ad0a1b7536a2075477c90e529a src/typings/vscode-xterm.d.ts
-  their  100644 6801d469fd92f9236d0d4faa722d2e74dc98edb1 src/typings/vscode-xterm.d.ts
-@@ -123,6 +123,22 @@
- 		 * Whether to treat option as the meta key.
- 		 */
- 		macOptionIsMeta?: boolean;
-+		/**
-+		 * (EXPERIMENTAL) The type of renderer to use, this allows using the
-+		 * fallback DOM renderer when canvas is too slow for the environment. The
-+		 * following features do not work when the DOM renderer is used:
-+		 *
-+		 * - Links
-+		 * - Line height
-+		 * - Letter spacing
-+		 * - Cursor blink
-+		 * - Cursor style
-+		 *
-+		 * This option is marked as experiemental because it will eventually be
-+		 * moved to an addon. You can only set this option in the constructor (not
-+		 * setOption).
-+		 */
-+		rendererType?: RendererType;
- 
- 		/**
- 		 * Whether holding a modifier key will force normal selection behavior,
-changed in both
-  base   100644 3db04d06bdcd02ed956b5dc8c71450991f0706a3 src/vs/code/electron-main/diagnostics.ts
-  our    100644 3bb9e182899533e24fe8967328f2174571df8e45 src/vs/code/electron-main/diagnostics.ts
-  their  100644 1fb52572284438f76cc8e70bbfd20dbb019d4500 src/vs/code/electron-main/diagnostics.ts
-@@ -16,23 +16,17 @@
- import { isWindows } from 'vs/base/common/platform';
- import { app } from 'electron';
- import { basename } from 'path';
-+<<<<<<< .our
- import URI from 'vs/base/common/uri';
-+=======
-+import { SystemInfo } from 'vs/platform/issue/common/issue';
-+>>>>>>> .their
- 
- export interface VersionInfo {
- 	vscodeVersion: string;
- 	os: string;
- }
- 
--export interface SystemInfo {
--	CPUs?: string;
--	'Memory (System)': string;
--	'Load (avg)'?: string;
--	VM: string;
--	'Screen Reader': string;
--	'Process Argv': string;
--	'GPU Status': Electron.GPUFeatureStatus;
--}
--
- export interface ProcessInfo {
- 	cpu: number;
- 	memory: number;
-changed in both
-  base   100644 228bcdfefb1192358d83a30c0c7e462408fce07b src/vs/platform/issue/common/issue.ts
-  our    100644 46d378dc8d4cd7b20dfb66315d50d0a50e0a12c9 src/vs/platform/issue/common/issue.ts
-  their  100644 60d7c7cac18906169ca7cfa862c24813ddd20b27 src/vs/platform/issue/common/issue.ts
-@@ -81,4 +81,75 @@
- 	_serviceBrand: any;
- 	openReporter(data: IssueReporterData): TPromise<void>;
- 	openProcessExplorer(data: ProcessExplorerData): TPromise<void>;
-+	// TODO: getSystemInfo would make more sense in a diagnostics-related service
-+	getSystemInfo(): TPromise<SystemInfo>;
- }
-+
-+// This interface is copied from Electron to prevent a layer issue
-+export interface GPUFeatureStatus {
-+
-+	// Docs: http://electron.atom.io/docs/api/structures/gpu-feature-status
-+
-+	/**
-+	 * Canvas
-+	 */
-+	'2d_canvas': string;
-+	/**
-+	 * Flash
-+	 */
-+	flash_3d: string;
-+	/**
-+	 * Flash Stage3D
-+	 */
-+	flash_stage3d: string;
-+	/**
-+	 * Flash Stage3D Baseline profile
-+	 */
-+	flash_stage3d_baseline: string;
-+	/**
-+	 * Compositing
-+	 */
-+	gpu_compositing: string;
-+	/**
-+	 * Multiple Raster Threads
-+	 */
-+	multiple_raster_threads: string;
-+	/**
-+	 * Native GpuMemoryBuffers
-+	 */
-+	native_gpu_memory_buffers: string;
-+	/**
-+	 * Rasterization
-+	 */
-+	rasterization: string;
-+	/**
-+	 * Video Decode
-+	 */
-+	video_decode: string;
-+	/**
-+	 * Video Encode
-+	 */
-+	video_encode: string;
-+	/**
-+	 * VPx Video Decode
-+	 */
-+	vpx_decode: string;
-+	/**
-+	 * WebGL
-+	 */
-+	webgl: string;
-+	/**
-+	 * WebGL2
-+	 */
-+	webgl2: string;
-+}
-+
-+export interface SystemInfo {
-+	CPUs?: string;
-+	'Memory (System)': string;
-+	'Load (avg)'?: string;
-+	VM: string;
-+	'Screen Reader': string;
-+	'Process Argv': string;
-+	'GPU Status': GPUFeatureStatus;
-+}
-\ No newline at end of file
-changed in both
-  base   100644 d804c6579fe48c96cbf9135b4e6bd850d4420858 src/vs/platform/issue/common/issueIpc.ts
-  our    100644 d45c1d870ee3c63db989f023028363c389abbdeb src/vs/platform/issue/common/issueIpc.ts
-  their  100644 00f83f110683d11d7049cec767906ddca5e4a216 src/vs/platform/issue/common/issueIpc.ts
-@@ -7,8 +7,12 @@
- 
- import { TPromise } from 'vs/base/common/winjs.base';
- import { IChannel } from 'vs/base/parts/ipc/common/ipc';
-+<<<<<<< .our
- import { IIssueService, IssueReporterData, ProcessExplorerData } from './issue';
- import { Event } from 'vs/base/common/event';
-+=======
-+import { IIssueService, IssueReporterData, ProcessExplorerData, SystemInfo } from 'vs/platform/issue/common/issue';
-+>>>>>>> .their
- 
- export interface IIssueChannel extends IChannel {
- 	call(command: 'openIssueReporter', arg: IssueReporterData): TPromise<void>;
-@@ -30,6 +34,8 @@
- 				return this.service.openReporter(arg);
- 			case 'openProcessExplorer':
- 				return this.service.openProcessExplorer(arg);
-+			case 'getSystemInfo':
-+				return this.service.getSystemInfo();
- 		}
- 		return undefined;
- 	}
-@@ -48,4 +54,8 @@
- 	openProcessExplorer(data: ProcessExplorerData): TPromise<void> {
- 		return this.channel.call('openProcessExplorer', data);
- 	}
-+
-+	getSystemInfo(): TPromise<SystemInfo> {
-+		return this.channel.call('getSystemInfo');
-+	}
- }
-\ No newline at end of file
-changed in both
-  base   100644 d8eceb42c9281255b9abd73ec6722040e873b3ed src/vs/platform/issue/electron-main/issueService.ts
-  our    100644 cebb4e612373900c38659291fafa9b78f51e1be1 src/vs/platform/issue/electron-main/issueService.ts
-  their  100644 bc7a0df7bc1f068aae438132907d23365a23b94d src/vs/platform/issue/electron-main/issueService.ts
-@@ -9,10 +9,10 @@
- import { localize } from 'vs/nls';
- import * as objects from 'vs/base/common/objects';
- import { parseArgs } from 'vs/platform/environment/node/argv';
--import { IIssueService, IssueReporterData, IssueReporterFeatures, ProcessExplorerData } from 'vs/platform/issue/common/issue';
-+import { IIssueService, IssueReporterData, IssueReporterFeatures, ProcessExplorerData, SystemInfo } from 'vs/platform/issue/common/issue';
- import { BrowserWindow, ipcMain, screen } from 'electron';
- import { ILaunchService } from 'vs/code/electron-main/launch';
--import { getPerformanceInfo, PerformanceInfo, getSystemInfo, SystemInfo } from 'vs/code/electron-main/diagnostics';
-+import { getPerformanceInfo, PerformanceInfo, getSystemInfo } from 'vs/code/electron-main/diagnostics';
- import { IEnvironmentService } from 'vs/platform/environment/common/environment';
- import { isMacintosh, IProcessEnvironment } from 'vs/base/common/platform';
- import { ILogService } from 'vs/platform/log/common/log';
-@@ -34,8 +34,9 @@
- 	) { }
- 
- 	openReporter(data: IssueReporterData): TPromise<void> {
-+		// TODO: We don't need this anymore?
- 		ipcMain.on('issueSystemInfoRequest', event => {
--			this.getSystemInformation().then(msg => {
-+			this.getSystemInfo().then(msg => {
- 				event.sender.send('issueSystemInfoResponse', msg);
- 			});
- 		});
-@@ -224,7 +225,7 @@
- 		return state;
- 	}
- 
--	private getSystemInformation(): TPromise<SystemInfo> {
-+	public getSystemInfo(): TPromise<SystemInfo> {
- 		return new Promise((resolve, reject) => {
- 			this.launchService.getMainProcessInfo().then(info => {
- 				resolve(getSystemInfo(info));
-changed in both
-  base   100644 e90284ad14f12a26b820d53b5b24a8d9fbc449d8 src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
-  our    100644 04d9dcba251cf79c28429027cda3ca3b0c10a29c src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
-  their  100644 f696602bf30da75cd81e5bfe057263e3699405be src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
-@@ -33,12 +33,16 @@
- import { ILogService } from 'vs/platform/log/common/log';
- import { TerminalCommandTracker } from 'vs/workbench/parts/terminal/node/terminalCommandTracker';
- import { TerminalProcessManager } from './terminalProcessManager';
-+<<<<<<< .our
- import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
- 
- // How long in milliseconds should an average frame take to render for a notification to appear
- // which suggests the fallback DOM-based renderer
- const SLOW_CANVAS_RENDER_THRESHOLD = 50;
- const NUMBER_OF_FRAMES_TO_MEASURE = 20;
-+=======
-+import { IIssueService } from 'vs/platform/issue/common/issue';
-+>>>>>>> .their
- 
- let Terminal: typeof XTermTerminal;
- 
-@@ -126,7 +130,11 @@
- 		@IThemeService private readonly _themeService: IThemeService,
- 		@IConfigurationService private readonly _configurationService: IConfigurationService,
- 		@ILogService private _logService: ILogService,
-+<<<<<<< .our
- 		@IStorageService private readonly _storageService: IStorageService
-+=======
-+		@IIssueService private _issueService: IIssueService
-+>>>>>>> .their
- 	) {
- 		this._disposables = [];
- 		this._skipTerminalCommands = [];
-@@ -275,7 +283,15 @@
- 		}
- 		const accessibilitySupport = this._configurationService.getValue<IEditorOptions>('editor').accessibilitySupport;
- 		const font = this._configHelper.getFont(undefined, true);
-+<<<<<<< .our
- 		const config = this._configHelper.config;
-+=======
-+
-+		console.log('request sys info');
-+		const info = await this._issueService.getSystemInfo();
-+		console.log('info', info);
-+
-+>>>>>>> .their
- 		this._xterm = new Terminal({
- 			scrollback: config.scrollback,
- 			theme: this._getXtermTheme(),
-@@ -288,6 +304,7 @@
- 			lineHeight: font.lineHeight,
- 			bellStyle: config.enableBell ? 'sound' : 'none',
- 			screenReaderMode: accessibilitySupport === 'on',
-+<<<<<<< .our
- 			macOptionIsMeta: config.macOptionIsMeta,
- 			macOptionClickForcesSelection: config.macOptionClickForcesSelection,
- 			rightClickSelectsWord: config.rightClickBehavior === 'selectWord',
-@@ -295,6 +312,11 @@
- 			rendererType: config.rendererType === 'auto' ? 'canvas' : config.rendererType,
- 			// TODO: Remove this once the setting is removed upstream
- 			experimentalCharAtlas: 'dynamic'
-+=======
-+			macOptionIsMeta: this._configHelper.config.macOptionIsMeta,
-+			rightClickSelectsWord: this._configHelper.config.rightClickBehavior === 'selectWord',
-+			rendererType: 'dom'
-+>>>>>>> .their
- 		});
- 		if (this._shellLaunchConfig.initialText) {
- 			this._xterm.writeln(this._shellLaunchConfig.initialText);
-@@ -983,6 +1005,7 @@
- 
- 			this._xterm.resize(cols, rows);
- 			if (this._isVisible) {
-+<<<<<<< .our
- 				// HACK: Force the renderer to unpause by simulating an IntersectionObserver event.
- 				// This is to fix an issue where dragging the window to the top of the screen to
- 				// maximize on Windows/Linux would fire an event saying that the terminal was not
-@@ -992,6 +1015,14 @@
- 					// HACK: Force a refresh of the screen to ensure links are refresh corrected.
- 					// This can probably be removed when the above hack is fixed in Chromium.
- 					this._xterm.refresh(0, this._xterm.rows - 1);
-+=======
-+				// Force the renderer to unpause by simulating an IntersectionObserver event. This
-+				// is to fix an issue where dragging the window to the top of the screen to maximize
-+				// on Winodws/Linux would fire an event saying that the terminal was not visible.
-+				// This should only force a refresh if one is needed.
-+				if (this._xterm.getOption('rendererType') === 'canvas') {
-+					(<any>this._xterm).renderer.onIntersectionChange({ intersectionRatio: 1 });
-+>>>>>>> .their
- 				}
- 			}
- 		}
-changed in both
-  base   100644 9de31dd99a7a874e3d40cb3c957a1c4f466a7305 yarn.lock
-  our    100644 b56aa332449f9eb6db4b03a16548d91df21604bb yarn.lock
-  their  100644 d58fefbb3bf4a4d3253581d9cc536703488fd46d yarn.lock
-@@ -7916,9 +7916,15 @@
-   dependencies:
-     oniguruma "^7.0.0"
- 
-+<<<<<<< .our
- vscode-xterm@3.7.0-beta4:
-   version "3.7.0-beta4"
-   resolved "https://registry.yarnpkg.com/vscode-xterm/-/vscode-xterm-3.7.0-beta4.tgz#f980d66f94f09ae80e100715dae60715dcae1ac6"
-+=======
-+vscode-xterm@3.5.0-beta2:
-+  version "3.5.0-beta2"
-+  resolved "https://registry.yarnpkg.com/vscode-xterm/-/vscode-xterm-3.5.0-beta2.tgz#a431cc2ae2e1b6c78197d2c12e6b8d079fbe2481"
-+>>>>>>> .their
- 
- vso-node-api@^6.1.2-preview:
-   version "6.1.2-preview"
diff --git a/app/test/fixtures/merge-parser/vscode/merge-tyriar-electron-1.8.2-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-tyriar-electron-1.8.2-into-master.txt
deleted file mode 100644
index 7e7da20bd88..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-tyriar-electron-1.8.2-into-master.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-changed in both
-  base   100644 9158b587adcc03325e344c03f5157e1eb24ea782 .yarnrc
-  our    100644 58d37cc88fb09a1944c25f4599a9bf93b42a143e .yarnrc
-  their  100644 d92b61027d0e3fbf6e4ca53022d41584dbbb30da .yarnrc
-@@ -1,3 +1,7 @@
- disturl "https://atom.io/download/electron"
-+<<<<<<< .our
- target "2.0.7"
-+=======
-+target "1.8.2-beta.4"
-+>>>>>>> .their
- runtime "electron"
-changed in both
-  base   100644 51176c67d93334b9fbfcd5f217cba204e915764f package.json
-  our    100644 d0e982ce0b76c5b1b5eb02b673e459e47f3353a4 package.json
-  their  100644 dacbec56db93aed5da81515729d4ac8a3062e9a7 package.json
-@@ -1,7 +1,12 @@
- {
-   "name": "code-oss-dev",
-+<<<<<<< .our
-   "version": "1.27.0",
-   "distro": "a4155d9780fbbc94ead6cb3017dd0fc3806c57b8",
-+=======
-+  "version": "1.20.0",
-+  "distro": "c149a13812097dbdb4e9c7322e79f087091e226e",
-+>>>>>>> .their
-   "author": {
-     "name": "Microsoft Corporation"
-   },
diff --git a/app/test/fixtures/merge-parser/vscode/merge-tyriar-snap-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-tyriar-snap-into-master.txt
deleted file mode 100644
index 8c6e6a0bd95..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-tyriar-snap-into-master.txt
+++ /dev/null
@@ -1,436 +0,0 @@
-changed in both
-  base   100644 6b4cdd2855fdc2ea9a399d83362633cdb5db8117 build/gulpfile.hygiene.js
-  our    100644 6a4cd05d17fefc0e6fdc6e8d0fd2997f3c2894ff build/gulpfile.hygiene.js
-  their  100644 742c276d7b5d15212c2bc118b50a060e819370b0 build/gulpfile.hygiene.js
-@@ -104,6 +104,7 @@
- 	'!**/*.disabled',
- 	'!**/*.code-workspace',
- 	'!build/**/*.init',
-+	'!resources/linux/snap/electron-launch',
- 	'!resources/linux/snap/snapcraft.yaml',
- 	'!resources/linux/snap/electron-launch',
- 	'!resources/win32/bin/code.js',
-changed in both
-  base   100644 ecbc45df32009bc47b5bee870738165f6823dcfa build/gulpfile.vscode.linux.js
-  our    100644 49f2cad8ad7356d234ea195099b657b71e99718a build/gulpfile.vscode.linux.js
-  their  100644 63776f8efcae2c7fb93cb3afc9381e4b2ce44a3b build/gulpfile.vscode.linux.js
-@@ -180,17 +180,21 @@
- 			.pipe(rename(`usr/share/pixmaps/${product.applicationName}.png`));
- 
- 		const code = gulp.src(binaryDir + '/**/*', { base: binaryDir })
--			.pipe(rename(function (p) { p.dirname = 'usr/share/' + product.applicationName + '/' + p.dirname; }));
-+			.pipe(rename(function (p) { p.dirname = `usr/share/${product.applicationName}/${p.dirname}`; }));
- 
- 		const snapcraft = gulp.src('resources/linux/snap/snapcraft.yaml', { base: '.' })
- 			.pipe(replace('@@NAME@@', product.applicationName))
--			.pipe(replace('@@VERSION@@', packageJson.version))
-+			.pipe(replace('@@VERSION@@', `${packageJson.version}-${linuxPackageRevision}`))
- 			.pipe(rename('snap/snapcraft.yaml'));
- 
-+		const snapUpdate = gulp.src('resources/linux/snap/snapUpdate.sh', { base: '.' })
-+			.pipe(replace('@@NAME@@', product.applicationName))
-+			.pipe(rename(`usr/share/${product.applicationName}/snapUpdate.sh`));
-+
- 		const electronLaunch = gulp.src('resources/linux/snap/electron-launch', { base: '.' })
- 			.pipe(rename('electron-launch'));
- 
--		const all = es.merge(desktop, icon, code, snapcraft, electronLaunch);
-+		const all = es.merge(desktop, icon, code, snapcraft, electronLaunch, snapUpdate);
- 
- 		return all.pipe(vfs.dest(destination));
- 	};
-@@ -200,7 +204,8 @@
- 	const snapBuildPath = getSnapBuildPath(arch);
- 	const snapFilename = `${product.applicationName}-${packageJson.version}-${linuxPackageRevision}-${arch}.snap`;
- 	return shell.task([
--		`chmod +x ${snapBuildPath}/electron-launch`,
-+		`chmod a+x ${snapBuildPath}/electron-launch ${snapBuildPath}/usr/share/${product.applicationName}/snapUpdate.sh`,
-+		`snapcraft --version`,
- 		`cd ${snapBuildPath} && snapcraft snap --output ../${snapFilename}`
- 	]);
- }
-removed in local
-  base   100755 cc1bb74d01fde092d01ce67236f06d3b38e6c786 build/tfs/common/node.sh
-  their  100755 c6cabcf6124bbe20b21866d24683d4afcb048556 build/tfs/common/node.sh
-removed in local
-  base   100755 e23049b5cf4d693f75e408e546cd2109963166cd build/tfs/linux/build.sh
-  their  100755 f6327f28756ae178b960ac8c292cce2a15e9f0fc build/tfs/linux/build.sh
-added in remote
-  their  100755 750ab13175fd2ed92ea4f1b1e3a12ae0d785ff38 build/tfs/linux/release-snap.sh
-@@ -0,0 +1,54 @@
-+#!/bin/bash
-+
-+. ./scripts/env.sh
-+. ./build/tfs/common/common.sh
-+
-+step "Build snap package" \
-+	npm run gulp -- "vscode-linux-$ARCH-build-snap"
-+
-+# Variables
-+PLATFORM_LINUX="linux-$ARCH"
-+PLATFORM_SNAP="linux-snap-$ARCH"
-+REPO="`pwd`"
-+ROOT="$REPO/.."
-+BUILDNAME="VSCode-$PLATFORM_LINUX"
-+BUILD="$ROOT/$BUILDNAME"
-+PACKAGEJSON="$BUILD/resources/app/package.json"
-+VERSION=$(node -p "require(\"$PACKAGEJSON\").version")
-+
-+SNAP_FILENAME="$(ls $REPO/.build/linux/snap/$ARCH/ | grep .snap)"
-+SNAP_PATH="$REPO/.build/linux/snap/$ARCH/$SNAP_FILENAME"
-+
-+step "Publish Snap package" \
-+	node build/tfs/common/publish.js $VSCODE_QUALITY $PLATFORM_SNAP package $SNAP_FILENAME $VERSION true $SNAP_PATH
-+
-+if [ -z "$VSCODE_QUALITY" ]; then
-+	echo "VSCODE_QUALITY is not set, skipping repo package publish"
-+else
-+	if [ -z "$SNAPCRAFT_LOGIN" ] || [ -z "$SNAPCRAFT_MACAROON" ] || [ -z "$SNAPCRAFT_UNBOUND_DISCHARGE" ]; then
-+		echo "SNAPCRAFT* env vars not set, skipping repo package publish"
-+	else
-+		IS_FROZEN="$(node build/tfs/linux/frozen-check.js $VSCODE_QUALITY)"
-+		AUTO_RELEASE=0
-+		if [ "$IS_FROZEN" != "true" ]; then
-+			if [ "$BUILD_SOURCEBRANCH" = "master" ] || [ "$BUILD_SOURCEBRANCH" = "refs/heads/master" ]; then
-+				if [[ $BUILD_QUEUEDBY = *"Project Collection Service Accounts"* || $BUILD_QUEUEDBY = *"Microsoft.VisualStudio.Services.TFS"* ]]; then
-+					if [ "$VSCODE_QUALITY" = "insider" ]; then
-+						AUTO_RELEASE=1
-+					fi
-+				fi
-+			fi
-+		fi
-+
-+		LOGIN_FILE=snapcraft_login_file
-+		echo -e '[login.ubuntu.com]\nmacaroon = '$SNAPCRAFT_MACAROON'\nunbound_discharge = '$SNAPCRAFT_UNBOUND_DISCHARGE'\nemail = '$VSCODE_SNAP_LOGIN'\n' > $LOGIN_FILE
-+		snapcraft login --with $LOGIN_FILE
-+		if [ "$AUTO_RELEASE" = "1" ]; then
-+			echo "Pushing and releasing to Snap Store stable channel"
-+			snapcraft push $SNAP_PATH --release stable
-+		else
-+			echo "Pushing to Snap Store"
-+			snapcraft push $SNAP_PATH
-+		fi
-+	fi
-+fi
-\ No newline at end of file
-removed in local
-  base   100755 1025ac9df48ca335a1732fa1bf13c1237eeb92f0 build/tfs/linux/release.sh
-  their  100755 09e76099758fe27f53b9fdcb4cf49f40185ee769 build/tfs/linux/release.sh
-added in remote
-  their  100644 f2632e12f9b83f4e1320d634578e8bcdce011132 build/tfs/linux/x64-snap/Dockerfile
-@@ -0,0 +1,71 @@
-+FROM microsoft/vsts-agent:ubuntu-16.04-standard
-+MAINTAINER Daniel Imms <daimms@microsoft.com>
-+
-+ARG DEBIAN_FRONTEND=noninteractive
-+RUN apt-get update
-+
-+# Dependencies
-+RUN apt-get install -y build-essential \
-+  gcc-multilib \
-+  g++-multilib \
-+  git \
-+  dpkg-dev \
-+  zip \
-+  rpm \
-+  createrepo \
-+  python-gtk2 \
-+  jq \
-+  xvfb \
-+  fakeroot \
-+  libgtk2.0-0 \
-+  libgconf-2-4 \
-+  libnss3 \
-+  libasound2 \
-+  libxtst6 \
-+  libfuse2 \
-+  libnotify-bin \
-+  libx11-dev \
-+  libxss1 \
-+  libx11-xcb-dev \
-+  libxkbfile-dev \
-+  bc \
-+  bsdmainutils \
-+  libsecret-1-dev
-+
-+# Xvfb
-+# Thanks https://medium.com/@griggheo/running-headless-selenium-webdriver-tests-in-docker-containers-342fdbabf756
-+ADD ./xvfb.init /etc/init.d/xvfb
-+RUN chmod +x /etc/init.d/xvfb
-+RUN update-rc.d xvfb defaults
-+
-+# dbus
-+RUN ln -sf /bin/dbus-daemon /usr/bin/dbus-daemon
-+
-+# nvm
-+ENV NVM_DIR /usr/local/nvm
-+RUN curl https://raw.githubusercontent.com/creationix/nvm/v0.33.8/install.sh | bash
-+
-+# snapcraft
-+# From https://github.com/snapcore/snapcraft/tree/master/docker
-+RUN apt-get update && \
-+  apt-get dist-upgrade --yes && \
-+  apt-get install --yes \
-+  curl sudo squashfs-tools && \
-+  curl -L $(curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/core' | jq '.download_url' -r) --output core.snap && \
-+  mkdir -p /snap/core && unsquashfs -d /snap/core/current core.snap && rm core.snap && \
-+  curl -L $(curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/snapcraft?channel=beta' | jq '.download_url' -r) --output snapcraft.snap && \
-+  mkdir -p /snap/snapcraft && unsquashfs -d /snap/snapcraft/current snapcraft.snap && rm snapcraft.snap && \
-+  mkdir -p /snap/bin && \
-+  echo "#!/bin/sh" > /snap/bin/snapcraft && \
-+  echo 'exec $SNAP/usr/bin/python3 $SNAP/bin/snapcraft "$@"' >> /snap/bin/snapcraft && \
-+  chmod a+x /snap/bin/snapcraft && \
-+  apt-get autoclean --yes && \
-+  apt-get clean --yes
-+ENV SNAP=/snap/snapcraft/current
-+ENV SNAP_NAME=snapcraft
-+ENV SNAP_VERSION=beta
-+ENV PATH=/snap/bin:$PATH
-+# Required by click.
-+ENV LC_ALL C.UTF-8
-+
-+CMD (service xvfb start; service dbus start; export DISPLAY=:10; ./start.sh "16.04")
-\ No newline at end of file
-added in remote
-  their  100755 65f825b2b6e6f869ef7c665310e15e6ac3648bf6 build/tfs/linux/x64-snap/run-agent.sh
-@@ -0,0 +1,15 @@
-+#!/bin/bash
-+
-+if [ ! -f pat ]; then
-+	echo "Error: file pat not found"
-+	exit 1
-+fi
-+
-+docker run \
-+  -e VSTS_ACCOUNT="monacotools" \
-+  -e VSTS_TOKEN="$(cat pat)" \
-+  -e VSTS_AGENT="tb-lnx-x64-snap" \
-+  -e VSTS_POOL="linux-x64-ubuntu-16-04-snap" \
-+  -e VSTS_WORK="/var/vsts/work" \
-+  --name "tb-lnx-x64-snap" \
-+  -it daimms-snap-agent:latest
-\ No newline at end of file
-added in remote
-  their  100644 4d77d253a26496c7c60b3c2bb5ff9c6ca054631d build/tfs/linux/x64-snap/xvfb.init
-@@ -0,0 +1,53 @@
-+#!/bin/bash
-+#
-+# /etc/rc.d/init.d/xvfbd
-+#
-+# chkconfig: 345 95 28
-+# description: Starts/Stops X Virtual Framebuffer server
-+# processname: Xvfb
-+#
-+### BEGIN INIT INFO
-+# Provides:          xvfb
-+# Required-Start:    $remote_fs $syslog
-+# Required-Stop:     $remote_fs $syslog
-+# Default-Start:     2 3 4 5
-+# Default-Stop:      0 1 6
-+# Short-Description: Start xvfb at boot time
-+# Description:       Enable xvfb provided by daemon.
-+### END INIT INFO
-+
-+[ "${NETWORKING}" = "no" ] && exit 0
-+
-+PROG="/usr/bin/Xvfb"
-+PROG_OPTIONS=":10 -ac"
-+PROG_OUTPUT="/tmp/Xvfb.out"
-+
-+case "$1" in
-+	start)
-+		echo "Starting : X Virtual Frame Buffer "
-+		$PROG $PROG_OPTIONS>>$PROG_OUTPUT 2>&1 &
-+		disown -ar
-+	;;
-+	stop)
-+		echo "Shutting down : X Virtual Frame Buffer"
-+		killproc $PROG
-+		RETVAL=$?
-+		[ $RETVAL -eq 0 ] && /bin/rm -f /var/lock/subsys/Xvfb
-+		/var/run/Xvfb.pid
-+		echo
-+	;;
-+	restart|reload)
-+		$0 stop
-+		$0 start
-+		RETVAL=$?
-+	;;
-+	status)
-+		status Xvfb
-+		RETVAL=$?
-+	;;
-+	*)
-+		echo $"Usage: $0 (start|stop|restart|reload|status)"
-+		exit 1
-+esac
-+
-+exit $RETVAL
-\ No newline at end of file
-merged
-  result 100644 9a164d7dfa3acfc38cc582916f16d6ca83df4da1 resources/linux/snap/electron-launch
-  our    100644 65c91d6fc1b6656b93527087287c210d80d0794a resources/linux/snap/electron-launch
-@@ -1,3 +1,6 @@
- #!/bin/sh
- 
-+# Create $XDG_RUNTIME_DIR if it doesn't exist
-+[ -n "$XDG_RUNTIME_DIR" ] && mkdir -p $XDG_RUNTIME_DIR -m 700
-+
- exec "$@" --executed-from="$(pwd)" --pid=$$
-added in remote
-  their  100755 c182e036a62309b015c8d8b3f01625c9022cc53d resources/linux/snap/snapUpdate.sh
-@@ -0,0 +1,2 @@
-+sleep 5
-+code-insiders /Users/daimms/dev/Microsoft/vscode/OSSREADME.json
-\ No newline at end of file
-merged
-  result 100644 2f596682a9ea3cf7e34fe75165c2c1563361f47d resources/linux/snap/snapcraft.yaml
-  our    100644 e8a5d48fdf116ecbce8019b7af8c8532fd5b340b resources/linux/snap/snapcraft.yaml
-@@ -26,8 +26,12 @@
-       # desktop-gtk2 deps below
-       - libxkbcommon0
-       - libgtk2.0-0
--      # - unity-gtk2-module
-+      - libgdk-pixbuf2.0-0
-+      - libglib2.0-bin
-+      - libgtk2.0-bin
-+      - unity-gtk2-module
-       - libappindicator1
-+      - xdg-user-dirs
-     prime:
-       - -usr/share/dh-python
-   electron-launch:
-changed in both
-  base   100644 12d660bb203b3c3ee596cbd2af55035386a9cd01 src/vs/platform/update/electron-main/updateService.linux.ts
-  our    100644 87c60c5d4360ea55dff2b83145f098b858b83c75 src/vs/platform/update/electron-main/updateService.linux.ts
-  their  100644 dc8ecc10a670f7846e5818e556dd42ec437b35bb src/vs/platform/update/electron-main/updateService.linux.ts
-@@ -17,6 +17,9 @@
- import { asJson } from 'vs/base/node/request';
- import { TPromise } from 'vs/base/common/winjs.base';
- import { shell } from 'electron';
-+import { realpath } from 'vs/base/node/pfs';
-+import * as path from 'path';
-+import { spawn } from 'child_process';
- 
- export class LinuxUpdateService extends AbstractUpdateService {
- 
-@@ -44,10 +47,28 @@
- 
- 		this.setState(State.CheckingForUpdates(context));
- 
--		this.requestService.request({ url: this.url })
--			.then<IUpdate>(asJson)
--			.then(update => {
--				if (!update || !update.url || !update.version || !update.productVersion) {
-+		if (process.env.SNAP && process.env.SNAP_REVISION) {
-+			this.checkForSnapUpdate();
-+		} else {
-+			this.requestService.request({ url: this.url })
-+				.then<IUpdate>(asJson)
-+				.then(update => {
-+					if (!update || !update.url || !update.version || !update.productVersion) {
-+						/* __GDPR__
-+								"update:notAvailable" : {
-+									"explicit" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-+								}
-+							*/
-+						this.telemetryService.publicLog('update:notAvailable', { explicit: !!context });
-+
-+						this.setState(State.Idle);
-+					} else {
-+						this.setState(State.AvailableForDownload(update));
-+					}
-+				})
-+				.then(null, err => {
-+					this.logService.error(err);
-+
- 					/* __GDPR__
- 							"update:notAvailable" : {
- 								"explicit" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
-@@ -55,6 +76,7 @@
- 						*/
- 					this.telemetryService.publicLog('update:notAvailable', { explicit: !!context });
- 
-+<<<<<<< .our
- 					this.setState(State.Idle(UpdateType.Archive));
- 				} else {
- 					this.setState(State.AvailableForDownload(update));
-@@ -71,6 +93,25 @@
- 				this.telemetryService.publicLog('update:notAvailable', { explicit: !!context });
- 				this.setState(State.Idle(UpdateType.Archive));
- 			});
-+=======
-+					this.setState(State.Idle);
-+				});
-+		}
-+	}
-+
-+	private checkForSnapUpdate() {
-+		// If the application was installed as a snap, updates happen in the
-+		// background automatically, we just need to check to see if an update
-+		// has already happened.
-+		realpath(`/snap/${product.applicationName}/current`).then(resolvedCurrentSnapPath => {
-+			const currentRevision = path.basename(resolvedCurrentSnapPath);
-+			if (process.env.SNAP_REVISION !== currentRevision) {
-+				this.setState(State.Ready(null));
-+			} else {
-+				this.setState(State.Idle);
-+			}
-+		});
-+>>>>>>> .their
- 	}
- 
- 	protected doDownloadUpdate(state: AvailableForDownload): TPromise<void> {
-@@ -85,4 +126,14 @@
- 		this.setState(State.Idle(UpdateType.Archive));
- 		return TPromise.as(null);
- 	}
-+
-+	protected doQuitAndInstall(): void {
-+		this.logService.trace('update#quitAndInstall(): running raw#quitAndInstall()');
-+
-+		// Allow 3 seconds for VS Code to close
-+		spawn('bash', ['-c', path.join(process.env.SNAP, `usr/share/${product.applicationName}/snapUpdate.sh`)], {
-+			detached: true,
-+			stdio: ['ignore', 'ignore', 'ignore']
-+		});
-+	}
- }
-changed in both
-  base   100644 93cf12eeb33a49f292b2edb150e19eab0a6e730f src/vs/workbench/parts/update/electron-browser/update.ts
-  our    100644 2e468debc61fae01ce2d9c4b673a81993982cc62 src/vs/workbench/parts/update/electron-browser/update.ts
-  their  100644 55677909c525efefdc5a06d43fa95e863b624bc0 src/vs/workbench/parts/update/electron-browser/update.ts
-@@ -535,6 +535,7 @@
- 			return;
- 		}
- 
-+<<<<<<< .our
- 		// windows user fast updates and mac
- 		this.notificationService.prompt(
- 			severity.Info,
-@@ -554,6 +555,25 @@
- 				}
- 			}]
- 		);
-+=======
-+		// TODO: Clean up
-+		let releaseNotesAction: ShowReleaseNotesAction;
-+		if (update) {
-+			releaseNotesAction = this.instantiationService.createInstance(ShowReleaseNotesAction, update.productVersion);
-+		}
-+
-+		const applyUpdateAction = new Action('update.applyUpdate', nls.localize('updateNow', "Update Now"), undefined, true, () =>
-+			this.updateService.quitAndInstall());
-+
-+		const handle = this.notificationService.notify({
-+			severity: severity.Info,
-+			message: nls.localize('updateAvailableAfterRestart', "Restart {0} to apply the latest update.", product.nameLong),
-+			actions: {
-+				primary: releaseNotesAction ? [applyUpdateAction, NotNowAction, releaseNotesAction] : [applyUpdateAction, NotNowAction]
-+			}
-+		});
-+		once(handle.onDidDispose)(() => applyUpdateAction, releaseNotesAction);
-+>>>>>>> .their
- 	}
- 
- 	private shouldShowNotification(): boolean {
diff --git a/app/test/fixtures/merge-parser/vscode/merge-umd-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-umd-into-master.txt
deleted file mode 100644
index c113790c124..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-umd-into-master.txt
+++ /dev/null
@@ -1,196 +0,0 @@
-removed in local
-  base   100644 61046c0aa34256b2d478f5263e5cdcc9cc34d7fd extensions/emmet/npm-shrinkwrap.json
-  their  100644 c6088a4b1cd267088740718ac949ed3a76a9fcc1 extensions/emmet/npm-shrinkwrap.json
-changed in both
-  base   100644 493d6c972b74c0b37b839ab83463ff31ee7629cd extensions/emmet/package.json
-  our    100644 d9be62f74d1063d961b7895eab86495b34482691 extensions/emmet/package.json
-  their  100644 65c85d4a5e336853419a75a78a77a66093a71e31 extensions/emmet/package.json
-@@ -443,9 +443,18 @@
-         "vscode": "1.0.1"
-     },
-     "dependencies": {
-+<<<<<<< .our
-         "@emmetio/css-parser": "ramya-rao-a/css-parser#vscode",
-         "@emmetio/html-matcher": "^0.3.3",
-         "@emmetio/math-expression": "^0.1.1",
-+=======
-+  
-+        "@emmetio/html-matcher": "^0.3.1",
-+        "@emmetio/css-parser": "^0.3.0",
-+        "@emmetio/math-expression": "^0.1.1",
-+        "vscode-emmet-helper": "^1.0.6",
-+        "vscode-languageserver-types": "^3.0.3",
-+>>>>>>> .their
-         "image-size": "^0.5.2",
-         "vscode-emmet-helper": "^1.2.11"
-     }
-changed in both
-  base   100644 2ddfaae1e941ce8b4ca4d4296b76e4c35e3ac7f3 extensions/emmet/src/abbreviationActions.ts
-  our    100644 26444af31e5994ebc9cddebb9de151cacae3311b extensions/emmet/src/abbreviationActions.ts
-  their  100644 f4b30cca8cbbfdd025687680c013d63dbd38d8f0 extensions/emmet/src/abbreviationActions.ts
-@@ -4,6 +4,7 @@
-  *--------------------------------------------------------------------------------------------*/
- 
- import * as vscode from 'vscode';
-+<<<<<<< .our
- import { Node, HtmlNode, Rule, Property, Stylesheet } from 'EmmetNode';
- import { getEmmetHelper, getNode, getInnerRange, getMappingForIncludedLanguages, parseDocument, validate, getEmmetConfiguration, isStyleSheet, getEmmetMode, parsePartialStylesheet, isStyleAttribute, getEmbeddedCssNodeIfAny, isTemplateScript } from './util';
- 
-@@ -14,6 +15,11 @@
- 	'iframe', 'img', 'input', 'ins', 'kbd', 'label', 'map', 'object', 'q',
- 	's', 'samp', 'select', 'small', 'span', 'strike', 'strong', 'sub', 'sup',
- 	'textarea', 'tt', 'u', 'var'];
-+=======
-+import { Node, HtmlNode, Rule } from 'EmmetNode';
-+import { getNode, getInnerRange, getMappingForIncludedLanguages, parseDocument, validate } from './util';
-+import { getExpandOptions, extractAbbreviation, extractAbbreviationFromText, isStyleSheet, isAbbreviationValid, getEmmetMode, expandAbbreviation } from 'vscode-emmet-helper';
-+>>>>>>> .their
- 
- interface ExpandAbbreviationInput {
- 	syntax: string;
-@@ -225,6 +231,7 @@
- 	});
- }
- 
-+<<<<<<< .our
- export function expandEmmetAbbreviation(args: any): Thenable<boolean | undefined> {
- 	if (!validate() || !vscode.window.activeTextEditor) {
- 		return fallbackTab();
-@@ -239,6 +246,9 @@
- 			return fallbackTab();
- 		}
- 	}
-+=======
-+export function expandEmmetAbbreviation(args) {
-+>>>>>>> .their
- 	const syntax = getSyntaxFromArgs(args);
- 	if (!syntax) {
- 		return fallbackTab();
-@@ -595,6 +605,7 @@
- 
- 	try {
- 		// Expand the abbreviation
-+<<<<<<< .our
- 		let expandedText;
- 
- 		if (input.textToWrap) {
-@@ -618,6 +629,13 @@
- 			expandedText = expandedText.replace('\\$TM_SELECTED_TEXT', '$TM_SELECTED_TEXT');
- 		} else {
- 			expandedText = helper.expandAbbreviation(input.abbreviation, expandOptions);
-+=======
-+		let expandedText = expandAbbreviation(input.abbreviation, expandOptions);
-+
-+		// If the expanded text is single line then we dont need the \t we added to $TM_SELECTED_TEXT earlier
-+		if (input.textToWrap && expandedText.indexOf('\n') === -1) {
-+			expandedText = expandedText.replace(/\s*\$TM_SELECTED_TEXT\s*/, '\$TM_SELECTED_TEXT');
-+>>>>>>> .their
- 		}
- 
- 		return expandedText;
-changed in both
-  base   100644 0c5e74f5052e98b1021506655dd4ffcdf3aef58c extensions/emmet/src/extension.ts
-  our    100644 5bdb9338975585a7a0d7fe9747a6ae14f0ce7908 extensions/emmet/src/extension.ts
-  their  100644 eecdeed5c01f0b0638d55465de59f1e4711d572b extensions/emmet/src/extension.ts
-@@ -5,7 +5,11 @@
- 
- import * as vscode from 'vscode';
- import { DefaultCompletionItemProvider } from './defaultCompletionProvider';
-+<<<<<<< .our
- import { expandEmmetAbbreviation, wrapWithAbbreviation, wrapIndividualLinesWithAbbreviation } from './abbreviationActions';
-+=======
-+import { expandEmmetAbbreviation, wrapWithAbbreviation } from './abbreviationActions';
-+>>>>>>> .their
- import { removeTag } from './removeTag';
- import { updateTag } from './updateTag';
- import { matchTag } from './matchTag';
-changed in both
-  base   100644 b8949b3418824358f3a05e862aa75be8f08a41da extensions/emmet/src/splitJoinTag.ts
-  our    100644 a5f1d255c8550889f815b1295ee8afacee6345ba extensions/emmet/src/splitJoinTag.ts
-  their  100644 382bd1841b09c923d2bf0620fe8aee0575148be9 extensions/emmet/src/splitJoinTag.ts
-@@ -5,14 +5,21 @@
- 
- import * as vscode from 'vscode';
- import { HtmlNode } from 'EmmetNode';
-+<<<<<<< .our
- import { getHtmlNode, parseDocument, validate, getEmmetMode, getEmmetConfiguration } from './util';
-+=======
-+import { getNode, parseDocument, validate } from './util';
-+>>>>>>> .their
- 
- export function splitJoinTag() {
- 	if (!validate(false) || !vscode.window.activeTextEditor) {
- 		return;
- 	}
- 
-+<<<<<<< .our
- 	const editor = vscode.window.activeTextEditor;
-+=======
-+>>>>>>> .their
- 	let rootNode = <HtmlNode>parseDocument(editor.document);
- 	if (!rootNode) {
- 		return;
-@@ -29,7 +36,12 @@
- 	});
- }
- 
-+<<<<<<< .our
- function getRangesToReplace(document: vscode.TextDocument, nodeToUpdate: HtmlNode): vscode.TextEdit {
-+=======
-+function getRangesToReplace(document: vscode.TextDocument, selection: vscode.Selection, rootNode: HtmlNode): vscode.TextEdit {
-+	let nodeToUpdate = <HtmlNode>getNode(rootNode, selection.start);
-+>>>>>>> .their
- 	let rangeToReplace: vscode.Range;
- 	let textToReplaceWith: string;
- 
-changed in both
-  base   100644 b70278dd2dff0aa51ec570e1e404c9ce04da6a09 extensions/emmet/src/test/abbreviationAction.test.ts
-  our    100644 b5fb87d8b0791993b65959e4e4c9219aa4e8388c extensions/emmet/src/test/abbreviationAction.test.ts
-  their  100644 9367035f814700af88e19ad76addc60835a87001 extensions/emmet/src/test/abbreviationAction.test.ts
-@@ -7,8 +7,12 @@
- import * as assert from 'assert';
- import { Selection, workspace, CompletionList, CancellationTokenSource, CompletionTriggerKind, ConfigurationTarget } from 'vscode';
- import { withRandomFileEditor, closeAllEditors } from './testUtils';
-+<<<<<<< .our
- import { expandEmmetAbbreviation } from '../abbreviationActions';
- import { DefaultCompletionItemProvider } from '../defaultCompletionProvider';
-+=======
-+import { expandEmmetAbbreviation, wrapWithAbbreviation } from '../abbreviationActions';
-+>>>>>>> .their
- 
- const completionProvider = new DefaultCompletionItemProvider();
- 
-@@ -222,7 +226,11 @@
- 
- 	test('Expand css when inside style tag (HTML)', () => {
- 		return withRandomFileEditor(htmlContents, 'html', (editor, doc) => {
-+<<<<<<< .our
- 			editor.selection = new Selection(13, 16, 13, 19);
-+=======
-+			editor.selection = new Selection(13, 3, 13, 6);
-+>>>>>>> .their
- 			let expandPromise = expandEmmetAbbreviation({ language: 'css' });
- 			if (!expandPromise) {
- 				return Promise.resolve();
-@@ -309,6 +317,7 @@
- 				return Promise.resolve();
- 			}
- 
-+<<<<<<< .our
- 			return completionPromise.then((completionList: CompletionList) => {
- 				if (!completionList.items || !completionList.items.length) {
- 					assert.equal(1, 2, `Problem with expanding m10`);
-@@ -318,6 +327,13 @@
- 				assert.equal(emmetCompletionItem.label, expandedText, `Label of completion item doesnt match.`);
- 				assert.equal((<string>emmetCompletionItem.documentation || '').replace(/\|/g, ''), expandedText, `Docs of completion item doesnt match.`);
- 				assert.equal(emmetCompletionItem.filterText, abbreviation, `FilterText of completion item doesnt match.`);
-+=======
-+	test('Expand abbreviation (CSS)', () => {
-+		return withRandomFileEditor(cssContents, 'css', (editor, doc) => {
-+			editor.selection = new Selection(4, 1, 4, 4);
-+			return expandEmmetAbbreviation(null).then(() => {
-+				assert.equal(editor.document.getText(), cssContents.replace('m10', 'margin: 10px;'));
-+>>>>>>> .their
- 				return Promise.resolve();
- 			});
- 		});
diff --git a/app/test/fixtures/merge-parser/vscode/merge-update-event-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-update-event-into-master.txt
deleted file mode 100644
index b4eb81d4af7..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-update-event-into-master.txt
+++ /dev/null
@@ -1,96 +0,0 @@
-changed in both
-  base   100644 8dacc38fcf8c37d6bd192179f9b4c2615fe301a1 src/vs/platform/extensionManagement/node/extensionManagementService.ts
-  our    100644 fca1b8fcc1eedca233bd95ef59ad6d0d3904e895 src/vs/platform/extensionManagement/node/extensionManagementService.ts
-  their  100644 6742bc215cc69428ad520eb4b234530ae0787e9c src/vs/platform/extensionManagement/node/extensionManagementService.ts
-@@ -228,6 +228,7 @@
- 			}));
- 	}
- 
-+<<<<<<< .our
- 	installFromGallery(extension: IGalleryExtension): TPromise<void> {
- 		let installingExtension = this.installingExtensions.get(extension.identifier.id);
- 		if (!installingExtension) {
-@@ -279,6 +280,25 @@
- 
- 		}
- 		return installingExtension;
-+=======
-+	installFromGallery(extension: IGalleryExtension): TPromise<ILocalExtension> {
-+		this.onInstallExtensions([extension]);
-+		return this.collectExtensionsToInstall(extension)
-+			.then(
-+				extensionsToInstall => {
-+					if (extensionsToInstall.length > 1) {
-+						this.onInstallExtensions(extensionsToInstall.slice(1));
-+					}
-+					return this.getInstalled(LocalExtensionType.User).then(existingExtensions => {
-+						return this.downloadAndInstallExtensions(extensionsToInstall)
-+							.then(
-+								locals => this.onDidInstallExtensions(extensionsToInstall, locals, existingExtensions, [])
-+									.then(() => locals.filter(l => areSameExtensions({ id: getGalleryExtensionIdFromLocal(l), uuid: l.identifier.uuid }, extension.identifier)[0])),
-+								errors => this.onDidInstallExtensions(extensionsToInstall, [], existingExtensions, errors));
-+					});
-+				},
-+				error => this.onDidInstallExtensions([extension], [], [], [error]));
-+>>>>>>> .their
- 	}
- 
- 	reinstallFromGallery(extension: ILocalExtension): TPromise<void> {
-@@ -347,6 +367,57 @@
- 				error => TPromise.wrapError<InstallableExtension>(new ExtensionManagementError(this.joinErrors(error).message, INSTALL_ERROR_GALLERY)));
- 	}
- 
-+<<<<<<< .our
-+=======
-+	private onInstallExtensions(extensions: IGalleryExtension[]): void {
-+		for (const extension of extensions) {
-+			this.logService.info('Installing extension:', extension.name);
-+			this.installationStartTime.set(extension.identifier.id, new Date().getTime());
-+			const id = getLocalExtensionIdFromGallery(extension, extension.version);
-+			this._onInstallExtension.fire({ identifier: { id, uuid: extension.identifier.uuid }, gallery: extension });
-+		}
-+	}
-+
-+	private onDidInstallExtensions(extensions: IGalleryExtension[], locals: ILocalExtension[], existingExtensions: ILocalExtension[], errors: Error[]): TPromise<any> {
-+		extensions.forEach((gallery, index) => {
-+			const identifier = { id: getLocalExtensionIdFromGallery(gallery, gallery.version), uuid: gallery.identifier.uuid };
-+			const eventName = existingExtensions.filter(x => x.identifier.id === identifier.id).length ? 'update' : 'install';
-+			const local = locals[index];
-+			const error = errors[index];
-+			if (local) {
-+				this.logService.info(`Extensions installed successfully:`, gallery.identifier.id);
-+				this._onDidInstallExtension.fire({ identifier, gallery, local });
-+			} else {
-+				const errorCode = error && (<ExtensionManagementError>error).code ? (<ExtensionManagementError>error).code : ERROR_UNKNOWN;
-+				this.logService.error(`Failed to install extension:`, gallery.identifier.id, error ? error.message : errorCode);
-+				this._onDidInstallExtension.fire({ identifier, gallery, error: errorCode });
-+			}
-+			const startTime = this.installationStartTime.get(gallery.identifier.id);
-+			this.reportTelemetry(`extensionGallery:${eventName}`, getGalleryExtensionTelemetryData(gallery), startTime ? new Date().getTime() - startTime : void 0, error);
-+			this.installationStartTime.delete(gallery.identifier.id);
-+		});
-+		return errors.length ? TPromise.wrapError(this.joinErrors(errors)) : TPromise.as(null);
-+	}
-+
-+	private getDependenciesToInstall(dependencies: string[]): TPromise<IGalleryExtension[]> {
-+		if (dependencies.length) {
-+			return this.getInstalled()
-+				.then(installed => {
-+					const uninstalledDeps = dependencies.filter(d => installed.every(i => getGalleryExtensionId(i.manifest.publisher, i.manifest.name) !== d));
-+					if (uninstalledDeps.length) {
-+						return this.galleryService.loadAllDependencies(uninstalledDeps.map(id => (<IExtensionIdentifier>{ id })))
-+							.then(allDependencies => allDependencies.filter(d => {
-+								const extensionId = getLocalExtensionIdFromGallery(d, d.version);
-+								return installed.every(({ identifier }) => identifier.id !== extensionId);
-+							}));
-+					}
-+					return [];
-+				});
-+		}
-+		return TPromise.as([]);
-+	}
-+
-+>>>>>>> .their
- 	private installExtension(installableExtension: InstallableExtension): TPromise<ILocalExtension> {
- 		return this.unsetUninstalledAndGetLocal(installableExtension.id)
- 			.then(
diff --git a/app/test/fixtures/merge-parser/vscode/merge-webview-icons-into-master.txt b/app/test/fixtures/merge-parser/vscode/merge-webview-icons-into-master.txt
deleted file mode 100644
index 7831cc70d07..00000000000
--- a/app/test/fixtures/merge-parser/vscode/merge-webview-icons-into-master.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-changed in both
-  base   100644 963da6581ec174b954726d270803bbb2b879510a extensions/markdown-language-features/package.json
-  our    100644 31171b5aef917e82b3d8b1aa5796c001d210b57e extensions/markdown-language-features/package.json
-  their  100644 98c8ac2b46b06add686074feb7994a371110d4ad extensions/markdown-language-features/package.json
-@@ -26,6 +26,15 @@
- 		"onWebviewPanel:markdown.preview"
- 	],
- 	"contributes": {
-+		"webviews": [
-+			{
-+				"viewType": "markdown.preview",
-+				"icon": {
-+					"light": "./media/Preview.svg",
-+					"dark": "./media/Preview_inverse.svg"
-+				}
-+			}
-+		],
- 		"commands": [
- 			{
- 				"command": "markdown.showPreview",
-changed in both
-  base   100644 c455d3339630a2358b99c57690f1898ec5b0c96d src/vs/workbench/parts/webview/electron-browser/webview.contribution.ts
-  our    100644 45e3dab5b9a839ecf7d615694e1a5e4400ca2cec src/vs/workbench/parts/webview/electron-browser/webview.contribution.ts
-  their  100644 29f34ec1e55191e73872c8a92574ffe23dbcdf9d src/vs/workbench/parts/webview/electron-browser/webview.contribution.ts
-@@ -20,6 +20,7 @@
- import { WebviewEditor } from './webviewEditor';
- import { WebviewEditorInput } from './webviewEditorInput';
- import { IWebviewEditorService, WebviewEditorService } from './webviewEditorService';
-+import './webviewExtensionPoint';
- 
- (Registry.as<IEditorRegistry>(EditorExtensions.Editors)).registerEditor(new EditorDescriptor(
- 	WebviewEditor,
-changed in both
-  base   100644 29ea5220e4daf14fef4b56f23d26f10fa739faa0 src/vs/workbench/parts/webview/electron-browser/webviewEditorInput.ts
-  our    100644 912f937e607af2b55bc869f45cca4acff04b9ca6 src/vs/workbench/parts/webview/electron-browser/webviewEditorInput.ts
-  their  100644 6de4d9829a324eca7765a6e691fabaa7da4afd7e src/vs/workbench/parts/webview/electron-browser/webviewEditorInput.ts
-@@ -123,7 +123,11 @@
- 	public getResource(): URI {
- 		return URI.from({
- 			scheme: 'webview-panel',
-+<<<<<<< .our
- 			path: `webview-panel/webview-${this._id}`
-+=======
-+			path: this.state ? `webview-panel/${this.state.viewType}` : ''
-+>>>>>>> .their
- 		});
- 	}
- 
-added in remote
-  their  100644 0d8975245e60f296ca7ae936aa3c02e046cff483 src/vs/workbench/parts/webview/electron-browser/webviewExtensionPoint.ts
-@@ -0,0 +1,151 @@
-+/*---------------------------------------------------------------------------------------------
-+ *  Copyright (c) Microsoft Corporation. All rights reserved.
-+ *  Licensed under the MIT License. See License.txt in the project root for license information.
-+ *--------------------------------------------------------------------------------------------*/
-+
-+import { join } from 'path';
-+import * as dom from 'vs/base/browser/dom';
-+import { IJSONSchema } from 'vs/base/common/jsonSchema';
-+import { localize } from 'vs/nls';
-+import { ExtensionMessageCollector, ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
-+
-+namespace schema {
-+
-+	export interface IUserFriendlyWebviewDescriptor {
-+		viewType: string;
-+		icon?: {
-+			light: string;
-+			dark: string;
-+		};
-+	}
-+
-+	export function isValidViewDescriptors(viewDescriptors: IUserFriendlyWebviewDescriptor[], collector: ExtensionMessageCollector): boolean {
-+		if (!Array.isArray(viewDescriptors)) {
-+			collector.error(localize('requirearray', "views must be an array"));
-+			return false;
-+		}
-+
-+		for (let descriptor of viewDescriptors) {
-+			if (typeof descriptor.viewType !== 'string') {
-+				collector.error(localize('requirestring', "property `{0}` is mandatory and must be of type `string`", 'viewType'));
-+				return false;
-+			}
-+
-+			if (descriptor.icon) {
-+				if (typeof descriptor.icon.dark !== 'string') {
-+					collector.error(localize('optstring', "property `{0}` can be omitted or must be of type `string`", 'icon.dark'));
-+					return false;
-+				}
-+				if (typeof descriptor.icon.light !== 'string') {
-+					collector.error(localize('optstring', "property `{0}` can be omitted or must be of type `string`", 'icon.light'));
-+					return false;
-+				}
-+			}
-+		}
-+
-+		return true;
-+	}
-+
-+	const webviewDescriptor: IJSONSchema = {
-+		type: 'object',
-+		properties: {
-+			viewType: {
-+				description: localize('vscode.extension.contributes.webview.viewType', 'The unique identifier of the view.'),
-+				type: 'string'
-+			},
-+			icon: {
-+				type: 'object',
-+				properties: {
-+					light: {
-+						type: 'string'
-+					},
-+					dark: {
-+						type: 'string'
-+					}
-+				}
-+			}
-+		}
-+	};
-+
-+	export const webviewsContribution: IJSONSchema = {
-+		description: localize('vscode.extension.contributes.webviews', "Contributes webviews to the editor"),
-+		type: 'array',
-+		items: webviewDescriptor,
-+		default: []
-+	};
-+}
-+
-+
-+ExtensionsRegistry.registerExtensionPoint<schema.IUserFriendlyWebviewDescriptor[]>('webviews', [], schema.webviewsContribution)
-+	.setHandler((extensions) => {
-+		for (let extension of extensions) {
-+			const { value, collector } = extension;
-+
-+			if (!schema.isValidViewDescriptors(value, collector)) {
-+				return;
-+			}
-+
-+			const viewIds: string[] = [];
-+			const viewDescriptors: IWebviewDescriptor[] = value.map(item => {
-+				const viewDescriptor = <IWebviewDescriptor>{
-+					viewType: item.viewType,
-+					icon: item.icon ? {
-+						light: join(extension.description.extensionFolderPath, item.icon.light),
-+						dark: join(extension.description.extensionFolderPath, item.icon.dark),
-+					} : undefined
-+				};
-+
-+				// validate
-+				if (viewIds.indexOf(viewDescriptor.viewType) !== -1) {
-+					collector.error(localize('duplicateView1', "Cannot register multiple webview with same viewtype `{0}`", viewDescriptor.viewType));
-+					return null;
-+				}
-+				// if (registeredViews.some(v => v.id === viewDescriptor.id)) {
-+				// 	collector.error(localize('duplicateView2', "A view with id `{0}` is already registered in the location `{1}`", viewDescriptor.id, viewDescriptor.location.id));
-+				// 	return null;
-+				// }
-+
-+				viewIds.push(viewDescriptor.viewType);
-+				return viewDescriptor;
-+			});
-+
-+			WebviewsRegistry.registerViews(viewDescriptors);
-+		}
-+	});
-+
-+export interface IWebviewDescriptor {
-+	viewType: string;
-+	icon?: {
-+		light: string;
-+		dark: string;
-+	};
-+}
-+
-+export const WebviewsRegistry = new class {
-+	readonly _webviews = new Map<string, IWebviewDescriptor>();
-+	_styleElement: HTMLStyleElement;
-+
-+	constructor() {
-+		this._styleElement = dom.createStyleSheet();
-+		this._styleElement.className = 'webview-icons';
-+	}
-+
-+	public get(viewType: string): IWebviewDescriptor | undefined {
-+		return this._webviews.get(viewType);
-+	}
-+
-+	public registerViews(views: IWebviewDescriptor[]) {
-+		const cssRules: string[] = [];
-+		for (const view of views) {
-+			this._webviews.set(view.viewType, view);
-+			if (view.icon) {
-+				cssRules.push(`.show-file-icons .${escapeCSS(view.viewType)}-name-file-icon::before { background-image: url(${view.icon.light}); }`);
-+			}
-+		}
-+		this._styleElement.innerHTML = cssRules.join('\n');
-+	}
-+};
-+
-+function escapeCSS(str: string) {
-+	return window['CSS'].escape(str);
-+}
diff --git a/app/test/globals.ts b/app/test/globals.ts
index 8912ee61c0e..0458e9e2557 100644
--- a/app/test/globals.ts
+++ b/app/test/globals.ts
@@ -1,10 +1,18 @@
 import Dexie from 'dexie'
-Dexie.dependencies.indexedDB = require('fake-indexeddb')
-Dexie.dependencies.IDBKeyRange = require('fake-indexeddb/lib/FDBKeyRange')
+import {
+  indexedDB as fakeIndexedDB,
+  IDBKeyRange as fakeIDBKeyRange,
+} from 'fake-indexeddb'
+Dexie.dependencies.indexedDB = fakeIndexedDB
+Dexie.dependencies.IDBKeyRange = fakeIDBKeyRange
 
 // shims a bunch of browser specific methods
 // like fetch, requestIdleCallback, etc
 import 'airbnb-browser-shims/browser-only'
+import 'setimmediate'
+
+import { join } from 'path'
+import { readFileSync } from 'fs'
 
 // These constants are defined by Webpack at build time, but since tests aren't
 // built with Webpack we need to make sure these exist at runtime.
@@ -12,6 +20,9 @@ const g: any = global
 g['__WIN32__'] = process.platform === 'win32'
 g['__DARWIN__'] = process.platform === 'darwin'
 g['__LINUX__'] = process.platform === 'linux'
+g['__APP_VERSION__'] = JSON.parse(
+  readFileSync(join(__dirname, '../package.json'), 'utf8')
+).version
 g['__DEV__'] = 'false'
 g['__RELEASE_CHANNEL__'] = 'development'
 g['__UPDATES_URL__'] = ''
@@ -23,3 +34,24 @@ g['log'] = {
   info: () => {},
   debug: () => {},
 } as IDesktopLogger
+
+// eslint-disable-next-line @typescript-eslint/no-extraneous-class
+g.DOMRect = class DOMRect {
+  public constructor() {}
+}
+
+g.ResizeObserver = class ResizeObserver {
+  public constructor(cb: any) {
+    ;(this as any).cb = cb
+  }
+
+  public observe() {
+    ;(this as any).cb([{ borderBoxSize: { inlineSize: 0, blockSize: 0 } }])
+  }
+
+  public unobserve() {}
+}
+
+// structuredClone doesn't exist in JSDOM, see:
+// https://github.com/jsdom/jsdom/issues/3363
+global.structuredClone ??= (x: any) => JSON.parse(JSON.stringify(x))
diff --git a/app/test/helpers/changes-state-helper.ts b/app/test/helpers/changes-state-helper.ts
index b976f7d5dec..a0a7bf523b2 100644
--- a/app/test/helpers/changes-state-helper.ts
+++ b/app/test/helpers/changes-state-helper.ts
@@ -3,6 +3,7 @@ import { WorkingDirectoryStatus } from '../../src/models/status'
 import { merge } from '../../src/lib/merge'
 import { IStatusResult } from '../../src/lib/git'
 import { DefaultCommitMessage } from '../../src/models/commit-message'
+import { RepoRulesInfo } from '../../src/models/repo-rules'
 
 export function createState<K extends keyof IChangesState>(
   pick: Pick<IChangesState, K>
@@ -20,6 +21,7 @@ export function createState<K extends keyof IChangesState>(
     conflictState: null,
     stashEntry: null,
     currentBranchProtected: false,
+    currentRepoRulesInfo: new RepoRulesInfo(),
   }
 
   return merge(baseChangesState, pick)
diff --git a/app/test/helpers/fixture.ts b/app/test/helpers/fixture.ts
new file mode 100644
index 00000000000..b36936fd82a
--- /dev/null
+++ b/app/test/helpers/fixture.ts
@@ -0,0 +1,4 @@
+import { join } from 'path'
+
+export const getFixturePath = (...paths: string[]) =>
+  join(__dirname, '..', 'fixtures', ...paths)
diff --git a/app/test/helpers/github-repo-builder.ts b/app/test/helpers/github-repo-builder.ts
index d1b5fa2d891..5001ce48fd2 100644
--- a/app/test/helpers/github-repo-builder.ts
+++ b/app/test/helpers/github-repo-builder.ts
@@ -37,7 +37,6 @@ export function gitHubRepoFixture({
   owner,
   name,
   parent,
-  defaultBranch,
   endpoint,
   isPrivate,
 }: IGitHubRepoFixtureOptions): GitHubRepository {
@@ -54,7 +53,6 @@ export function gitHubRepoFixture({
     id_counter++,
     isPrivate !== undefined ? isPrivate : null,
     htmlUrl,
-    defaultBranch || 'master',
     `${htmlUrl}.git`,
     null,
     null,
diff --git a/app/test/helpers/local-config.ts b/app/test/helpers/local-config.ts
index 945f12fa578..4785e99fccf 100644
--- a/app/test/helpers/local-config.ts
+++ b/app/test/helpers/local-config.ts
@@ -1,11 +1,11 @@
 import { Repository } from '../../src/models/repository'
-import { GitProcess } from 'dugite'
+import { exec } from 'dugite'
 
 export async function setupLocalConfig(
   repository: Repository,
   localConfig: Iterable<[string, string]>
 ) {
   for (const [key, value] of localConfig) {
-    await GitProcess.exec(['config', key, value], repository.path)
+    await exec(['config', key, value], repository.path)
   }
 }
diff --git a/app/test/helpers/menus/available-spellchecker-languages-helper.ts b/app/test/helpers/menus/available-spellchecker-languages-helper.ts
new file mode 100644
index 00000000000..10c1b5bc1cf
--- /dev/null
+++ b/app/test/helpers/menus/available-spellchecker-languages-helper.ts
@@ -0,0 +1,65 @@
+/**
+ * The list is based on Electron v17.0.1
+ *
+ * Call to session.availableSpellCheckerLanguages
+ * https://www.electronjs.org/docs/latest/api/session#sesavailablespellcheckerlanguages-readonly
+ */
+export function getAvailableSpellcheckerLanguages(): string[] {
+  return [
+    'af',
+    'bg',
+    'ca',
+    'cs',
+    'cy',
+    'da',
+    'de',
+    'de-DE',
+    'el',
+    'en-AU',
+    'en-CA',
+    'en-GB',
+    'en-GB-oxendict',
+    'en-US',
+    'es',
+    'es-419',
+    'es-AR',
+    'es-ES',
+    'es-MX',
+    'es-US',
+    'et',
+    'fa',
+    'fo',
+    'fr',
+    'fr-FR',
+    'he',
+    'hi',
+    'hr',
+    'hu',
+    'hy',
+    'id',
+    'it',
+    'it-IT',
+    'ko',
+    'lt',
+    'lv',
+    'nb',
+    'nl',
+    'pl',
+    'pt',
+    'pt-BR',
+    'pt-PT',
+    'ro',
+    'ru',
+    'sh',
+    'sk',
+    'sl',
+    'sq',
+    'sr',
+    'sv',
+    'ta',
+    'tg',
+    'tr',
+    'uk',
+    'vi',
+  ]
+}
diff --git a/app/test/helpers/repositories.ts b/app/test/helpers/repositories.ts
index 65a5addf28d..e5c569da99d 100644
--- a/app/test/helpers/repositories.ts
+++ b/app/test/helpers/repositories.ts
@@ -3,7 +3,7 @@ import * as FSE from 'fs-extra'
 import { mkdirSync } from './temp'
 import klawSync, { Item } from 'klaw-sync'
 import { Repository } from '../../src/models/repository'
-import { GitProcess } from 'dugite'
+import { exec } from 'dugite'
 import { makeCommit, switchTo } from './repository-scaffolding'
 import { writeFile } from 'fs-extra'
 import { git } from '../../src/lib/git'
@@ -57,7 +57,7 @@ export async function setupFixtureRepository(
  */
 export async function setupEmptyRepository(): Promise<Repository> {
   const repoPath = mkdirSync('desktop-empty-repo-')
-  await GitProcess.exec(['init'], repoPath)
+  await exec(['init'], repoPath)
 
   return new Repository(repoPath, -1, null, false)
 }
@@ -70,7 +70,7 @@ export async function setupEmptyRepository(): Promise<Repository> {
  */
 export async function setupEmptyRepositoryDefaultMain(): Promise<Repository> {
   const repoPath = mkdirSync('desktop-empty-repo-')
-  await GitProcess.exec(['init', '-b', 'main'], repoPath)
+  await exec(['init', '-b', 'main'], repoPath)
 
   return new Repository(repoPath, -1, null, false)
 }
@@ -106,7 +106,7 @@ export async function setupConflictedRepo(): Promise<Repository> {
 
   // create this branch starting from the first commit, but don't checkout it
   // because we want to create a divergent history
-  await GitProcess.exec(['branch', 'other-branch'], repo.path)
+  await exec(['branch', 'other-branch'], repo.path)
 
   const secondCommit = {
     entries: [{ path: 'foo', contents: 'b1' }],
@@ -121,7 +121,7 @@ export async function setupConflictedRepo(): Promise<Repository> {
   }
   await makeCommit(repo, thirdCommit)
 
-  await GitProcess.exec(['merge', 'master'], repo.path)
+  await exec(['merge', 'master'], repo.path)
 
   return repo
 }
@@ -150,7 +150,7 @@ export async function setupConflictedRepoWithUnrelatedCommittedChange(): Promise
 
   // create this branch starting from the first commit, but don't checkout it
   // because we want to create a divergent history
-  await GitProcess.exec(['branch', 'other-branch'], repo.path)
+  await exec(['branch', 'other-branch'], repo.path)
 
   const secondCommit = {
     entries: [{ path: 'foo', contents: 'b1' }],
@@ -167,7 +167,7 @@ export async function setupConflictedRepoWithUnrelatedCommittedChange(): Promise
 
   await writeFile(Path.join(repo.path, 'perlin'), 'noise')
 
-  await GitProcess.exec(['merge', 'master'], repo.path)
+  await exec(['merge', 'master'], repo.path)
 
   return repo
 }
@@ -196,7 +196,7 @@ export async function setupConflictedRepoWithMultipleFiles(): Promise<Repository
 
   // create this branch starting from the first commit, but don't checkout it
   // because we want to create a divergent history
-  await GitProcess.exec(['branch', 'other-branch'], repo.path)
+  await exec(['branch', 'other-branch'], repo.path)
 
   const secondCommit = {
     entries: [
@@ -224,7 +224,7 @@ export async function setupConflictedRepoWithMultipleFiles(): Promise<Repository
 
   await FSE.writeFile(Path.join(repo.path, 'dog'), 'touch')
 
-  await GitProcess.exec(['merge', 'master'], repo.path)
+  await exec(['merge', 'master'], repo.path)
 
   return repo
 }
diff --git a/app/test/helpers/repository-builder-branch-pruner.ts b/app/test/helpers/repository-builder-branch-pruner.ts
index 1e0ca03ae3c..c50ef2aca94 100644
--- a/app/test/helpers/repository-builder-branch-pruner.ts
+++ b/app/test/helpers/repository-builder-branch-pruner.ts
@@ -1,6 +1,6 @@
 import { setupEmptyRepository } from './repositories'
 import { makeCommit, switchTo } from './repository-scaffolding'
-import { GitProcess } from 'dugite'
+import { exec } from 'dugite'
 import { RepositoriesStore, GitStore } from '../../src/lib/stores'
 import { RepositoryStateCache } from '../../src/lib/stores/repository-state-cache'
 import {
@@ -11,6 +11,7 @@ import { IAPIFullRepository, getDotComAPIEndpoint } from '../../src/lib/api'
 import { shell } from './test-app-shell'
 import { StatsStore, StatsDatabase } from '../../src/lib/stats'
 import { UiActivityMonitor } from '../../src/ui/lib/ui-activity-monitor'
+import { fakePost } from '../fake-stats-post'
 
 export async function createRepository() {
   const repo = await setupEmptyRepository()
@@ -26,7 +27,7 @@ export async function createRepository() {
 
   // creating the new branch before switching so that we have distinct changes
   // on both branches and also to ensure a merge commit is needed
-  await GitProcess.exec(['branch', 'other-branch'], repo.path)
+  await exec(['branch', 'other-branch'], repo.path)
 
   const secondCommit = {
     entries: [{ path: 'foo', contents: 'b1' }],
@@ -49,10 +50,10 @@ export async function createRepository() {
   await switchTo(repo, 'master')
 
   // ensure the merge operation always creates a merge commit
-  await GitProcess.exec(['merge', 'other-branch', '--no-ff'], repo.path)
+  await exec(['merge', 'other-branch', '--no-ff'], repo.path)
 
   // clear reflog of all entries, so any branches are considered candidates for pruning
-  await GitProcess.exec(
+  await exec(
     ['reflog', 'expire', '--expire=now', '--expire-unreachable=now', '--all'],
     repo.path
   )
@@ -124,7 +125,8 @@ async function primeCaches(
     shell,
     new StatsStore(
       new StatsDatabase('test-StatsDatabase'),
-      new UiActivityMonitor()
+      new UiActivityMonitor(),
+      fakePost
     )
   )
 
@@ -139,6 +141,7 @@ async function primeCaches(
   repositoriesStateCache.updateBranchesState(repository, () => ({
     tip: gitStore.tip,
     defaultBranch: gitStore.defaultBranch,
+    upstreamDefaultBranch: gitStore.upstreamDefaultBranch,
     allBranches: gitStore.allBranches,
     recentBranches: gitStore.recentBranches,
   }))
diff --git a/app/test/helpers/repository-scaffolding.ts b/app/test/helpers/repository-scaffolding.ts
index ad53ea8c82a..7822664adfb 100644
--- a/app/test/helpers/repository-scaffolding.ts
+++ b/app/test/helpers/repository-scaffolding.ts
@@ -1,4 +1,4 @@
-import { GitProcess } from 'dugite'
+import { exec } from 'dugite'
 import * as FSE from 'fs-extra'
 import * as Path from 'path'
 
@@ -35,10 +35,7 @@ export async function cloneRepository(
 ): Promise<Repository> {
   const newDirectory = mkdirSync('desktop-git-clone-')
 
-  await GitProcess.exec(
-    ['clone', repository.path, '--', newDirectory],
-    __dirname
-  )
+  await exec(['clone', repository.path, '--', newDirectory], __dirname)
 
   return new Repository(newDirectory, -2, null, false)
 }
@@ -52,15 +49,15 @@ export async function makeCommit(repository: Repository, tree: Tree) {
   for (const entry of tree.entries) {
     const fullPath = Path.join(repository.path, entry.path)
     if (entry.contents === null) {
-      await GitProcess.exec(['rm', entry.path], repository.path)
+      await exec(['rm', entry.path], repository.path)
     } else {
       await FSE.writeFile(fullPath, entry.contents)
-      await GitProcess.exec(['add', entry.path], repository.path)
+      await exec(['add', entry.path], repository.path)
     }
   }
 
   const message = tree.commitMessage || 'commit'
-  await GitProcess.exec(['commit', '-m', message], repository.path)
+  await exec(['commit', '-m', message], repository.path)
 }
 
 export async function createBranch(
@@ -68,14 +65,11 @@ export async function createBranch(
   branch: string,
   startPoint: string
 ) {
-  const result = await GitProcess.exec(
-    ['rev-parse', '--verify', branch],
-    repository.path
-  )
+  const result = await exec(['rev-parse', '--verify', branch], repository.path)
 
   if (result.exitCode === 128) {
     // ref does not exists, checkout and create the branch
-    await GitProcess.exec(['branch', branch, startPoint], repository.path)
+    await exec(['branch', branch, startPoint], repository.path)
   } else {
     throw new Error(
       `Branch ${branch} already exists and resolves to '${result.stdout}'`
@@ -84,17 +78,14 @@ export async function createBranch(
 }
 
 export async function switchTo(repository: Repository, branch: string) {
-  const result = await GitProcess.exec(
-    ['rev-parse', '--verify', branch],
-    repository.path
-  )
+  const result = await exec(['rev-parse', '--verify', branch], repository.path)
 
   if (result.exitCode === 128) {
     // ref does not exists, checkout and create the branch
-    await GitProcess.exec(['checkout', '-b', branch], repository.path)
+    await exec(['checkout', '-b', branch], repository.path)
   } else {
     // just switch to the branch
-    await GitProcess.exec(['checkout', branch], repository.path)
+    await exec(['checkout', branch], repository.path)
   }
 }
 
@@ -103,7 +94,7 @@ export async function cloneLocalRepository(
 ): Promise<Repository> {
   const repoPath = mkdirSync('blank-folder')
   const args = ['clone', '--', repository.path, repoPath]
-  const result = await GitProcess.exec(args, repository.path)
+  const result = await exec(args, repository.path)
 
   if (result.exitCode === 128) {
     throw new Error(JSON.stringify(result))
diff --git a/app/test/resolver.js b/app/test/resolver.js
new file mode 100644
index 00000000000..5fcb4a5dd6d
--- /dev/null
+++ b/app/test/resolver.js
@@ -0,0 +1,24 @@
+// See:
+// - https://github.com/microsoft/accessibility-insights-web/pull/5421#issuecomment-1109168149
+// - https://github.com/microsoft/accessibility-insights-web/blob/9ad4e618019298d82732d49d00aafb846fb6bac7/src/tests/common/resolver.js
+
+const shouldRevertToCjs = pkg => {
+  if (pkg.name === 'dexie') {
+    return true
+  } else if (pkg.name === 'uuid' && pkg.version.startsWith('8.')) {
+    return true
+  }
+}
+
+module.exports = (path, options) => {
+  return options.defaultResolver(path, {
+    ...options,
+    packageFilter: pkg => {
+      if (shouldRevertToCjs(pkg)) {
+        delete pkg['exports']
+        delete pkg['module']
+      }
+      return pkg
+    },
+  })
+}
diff --git a/app/test/setup-test-framework.ts b/app/test/setup-test-framework.ts
index e04108867a7..b27d73108f0 100644
--- a/app/test/setup-test-framework.ts
+++ b/app/test/setup-test-framework.ts
@@ -1,8 +1,8 @@
 // set test timeout to 10s
 jest.setTimeout(10000)
 
-import 'jest-extended'
-import 'jest-localstorage-mock'
+import * as matchers from 'jest-extended'
+expect.extend(matchers)
 
 delete process.env['LOCAL_GIT_DIRECTORY']
 delete process.env['GIT_EXEC_PATH']
diff --git a/app/test/unit/accounts-store-test.ts b/app/test/unit/accounts-store-test.ts
index 7c6d07084dd..22c5382a5a1 100644
--- a/app/test/unit/accounts-store-test.ts
+++ b/app/test/unit/accounts-store-test.ts
@@ -16,11 +16,99 @@ describe('AccountsStore', () => {
     it('contains the added user', async () => {
       const newAccountLogin = 'joan'
       await accountsStore.addAccount(
-        new Account(newAccountLogin, '', 'deadbeef', [], '', 1, '')
+        new Account(newAccountLogin, '', 'deadbeef', [], '', 1, '', 'free')
       )
 
       const users = await accountsStore.getAll()
       expect(users[0].login).toBe(newAccountLogin)
     })
   })
+
+  describe('loading persisted users', () => {
+    it('migrates .ghe.com users still using /api/v3 to api. subdomain', async () => {
+      const dataStore = new InMemoryStore()
+      dataStore.setItem(
+        'users',
+        JSON.stringify([
+          {
+            login: 'joan',
+            endpoint: 'https://whatever.ghe.com/api/v3',
+            token: 'deadbeef',
+            emails: [],
+            avatarURL: '',
+            id: 1,
+            name: '',
+            plan: 'free',
+          },
+        ])
+      )
+      accountsStore = new AccountsStore(dataStore, new AsyncInMemoryStore())
+
+      const users = await accountsStore.getAll()
+      expect(users[0].login).toBe('joan')
+      expect(users[0].endpoint).toBe('https://api.whatever.ghe.com/')
+
+      const persistedUsers = JSON.parse(dataStore.getItem('users'))
+      expect(persistedUsers[0].login).toBe('joan')
+      expect(persistedUsers[0].endpoint).toBe('https://api.whatever.ghe.com/')
+    })
+
+    it('does NOT migrate GHE users already using the api. subdomain', async () => {
+      const dataStore = new InMemoryStore()
+      dataStore.setItem(
+        'users',
+        JSON.stringify([
+          {
+            login: 'joan',
+            endpoint: 'https://api.whatever.ghe.com/',
+            token: 'deadbeef',
+            emails: [],
+            avatarURL: '',
+            id: 1,
+            name: '',
+            plan: 'free',
+          },
+        ])
+      )
+      accountsStore = new AccountsStore(dataStore, new AsyncInMemoryStore())
+
+      const users = await accountsStore.getAll()
+      expect(users[0].login).toBe('joan')
+      expect(users[0].endpoint).toBe('https://api.whatever.ghe.com/')
+
+      const persistedUsers = JSON.parse(dataStore.getItem('users'))
+      expect(persistedUsers[0].login).toBe('joan')
+      expect(persistedUsers[0].endpoint).toBe('https://api.whatever.ghe.com/')
+    })
+
+    it('does NOT migrate GHES users still using /api/v3 to api. subdomain', async () => {
+      const dataStore = new InMemoryStore()
+      dataStore.setItem(
+        'users',
+        JSON.stringify([
+          {
+            login: 'joan',
+            endpoint: 'https://my-company-repos.com/api/v3',
+            token: 'deadbeef',
+            emails: [],
+            avatarURL: '',
+            id: 1,
+            name: '',
+            plan: 'free',
+          },
+        ])
+      )
+      accountsStore = new AccountsStore(dataStore, new AsyncInMemoryStore())
+
+      const users = await accountsStore.getAll()
+      expect(users[0].login).toBe('joan')
+      expect(users[0].endpoint).toBe('https://my-company-repos.com/api/v3')
+
+      const persistedUsers = JSON.parse(dataStore.getItem('users'))
+      expect(persistedUsers[0].login).toBe('joan')
+      expect(persistedUsers[0].endpoint).toBe(
+        'https://my-company-repos.com/api/v3'
+      )
+    })
+  })
 })
diff --git a/app/test/unit/app-store-test.ts b/app/test/unit/app-store-test.ts
deleted file mode 100644
index 4239a33af5a..00000000000
--- a/app/test/unit/app-store-test.ts
+++ /dev/null
@@ -1,270 +0,0 @@
-import * as Path from 'path'
-import * as FSE from 'fs-extra'
-import { GitProcess } from 'dugite'
-
-import {
-  AppStore,
-  GitHubUserStore,
-  CloningRepositoriesStore,
-  IssuesStore,
-  SignInStore,
-  RepositoriesStore,
-  AccountsStore,
-  PullRequestStore,
-  PullRequestCoordinator,
-} from '../../src/lib/stores'
-import {
-  TestGitHubUserDatabase,
-  TestStatsDatabase,
-  TestIssuesDatabase,
-  TestRepositoriesDatabase,
-  TestPullRequestDatabase,
-} from '../helpers/databases'
-import {
-  setupEmptyRepository,
-  setupConflictedRepoWithMultipleFiles,
-  setupConflictedRepoWithUnrelatedCommittedChange,
-} from '../helpers/repositories'
-import { InMemoryStore, AsyncInMemoryStore } from '../helpers/stores'
-
-import { StatsStore } from '../../src/lib/stats'
-
-import {
-  RepositorySectionTab,
-  SelectionType,
-  IRepositoryState,
-} from '../../src/lib/app-state'
-import { Repository } from '../../src/models/repository'
-import { Commit } from '../../src/models/commit'
-import { getCommit, IStatusResult } from '../../src/lib/git'
-import { TestActivityMonitor } from '../helpers/test-activity-monitor'
-import { RepositoryStateCache } from '../../src/lib/stores/repository-state-cache'
-import { ApiRepositoriesStore } from '../../src/lib/stores/api-repositories-store'
-import { getStatusOrThrow } from '../helpers/status'
-import { AppFileStatusKind } from '../../src/models/status'
-import { ManualConflictResolution } from '../../src/models/manual-conflict-resolution'
-import { AliveStore } from '../../src/lib/stores/alive-store'
-import { NotificationsStore } from '../../src/lib/stores/notifications-store'
-
-// enable mocked version
-jest.mock('../../src/lib/window-state')
-
-describe('AppStore', () => {
-  async function createAppStore() {
-    const db = new TestGitHubUserDatabase()
-    await db.reset()
-
-    const issuesDb = new TestIssuesDatabase()
-    await issuesDb.reset()
-
-    const statsDb = new TestStatsDatabase()
-    await statsDb.reset()
-
-    const repositoriesDb = new TestRepositoriesDatabase()
-    await repositoriesDb.reset()
-    const repositoriesStore = new RepositoriesStore(repositoriesDb)
-
-    const accountsStore = new AccountsStore(
-      new InMemoryStore(),
-      new AsyncInMemoryStore()
-    )
-
-    const pullRequestCoordinator = new PullRequestCoordinator(
-      new PullRequestStore(new TestPullRequestDatabase(), repositoriesStore),
-      repositoriesStore
-    )
-
-    const githubUserStore = new GitHubUserStore(db)
-
-    const repositoryStateManager = new RepositoryStateCache()
-
-    const apiRepositoriesStore = new ApiRepositoriesStore(accountsStore)
-
-    const aliveStore = new AliveStore(accountsStore)
-
-    const statsStore = new StatsStore(statsDb, new TestActivityMonitor())
-
-    const notificationsStore = new NotificationsStore(
-      accountsStore,
-      aliveStore,
-      pullRequestCoordinator,
-      statsStore
-    )
-    notificationsStore.setNotificationsEnabled(false)
-
-    const appStore = new AppStore(
-      githubUserStore,
-      new CloningRepositoriesStore(),
-      new IssuesStore(issuesDb),
-      statsStore,
-      new SignInStore(),
-      accountsStore,
-      repositoriesStore,
-      pullRequestCoordinator,
-      repositoryStateManager,
-      apiRepositoriesStore,
-      notificationsStore
-    )
-
-    return { appStore, repositoriesStore }
-  }
-
-  it('can select a repository', async () => {
-    const { appStore, repositoriesStore } = await createAppStore()
-
-    const { path } = await setupEmptyRepository()
-    const repositories = await appStore._addRepositories([path])
-    const repo = repositories[0]
-
-    await repositoriesStore.updateLastStashCheckDate(repo)
-
-    await appStore._selectRepository(repo)
-
-    const state = appStore.getState()
-    expect(state.selectedState).not.toBeNull()
-    expect(state.selectedState!.repository.path).toBe(repo.path)
-  })
-
-  describe('undo first commit', () => {
-    function getAppState(appStore: AppStore): IRepositoryState {
-      const selectedState = appStore.getState().selectedState
-      if (selectedState == null) {
-        throw new Error('No selected state for AppStore')
-      }
-
-      switch (selectedState.type) {
-        case SelectionType.Repository:
-          return selectedState.state
-        default:
-          throw new Error(
-            `Got selected state of type ${selectedState.type} which is not supported.`
-          )
-      }
-    }
-
-    let repository: Repository
-    let firstCommit: Commit | null = null
-
-    beforeEach(async () => {
-      repository = await setupEmptyRepository()
-
-      const file = 'README.md'
-      const filePath = Path.join(repository.path, file)
-
-      await FSE.writeFile(filePath, 'SOME WORDS GO HERE\n')
-
-      await GitProcess.exec(['add', file], repository.path)
-      await GitProcess.exec(['commit', '-m', 'added file'], repository.path)
-
-      firstCommit = await getCommit(repository, 'master')
-      expect(firstCommit).not.toBeNull()
-      expect(firstCommit!.parentSHAs).toHaveLength(0)
-    })
-
-    // This test is failing too often for my liking on Windows.
-    //
-    // For the moment, I need to make it skip the CI test suite
-    // but I'd like to better understand why it's failing and
-    // either rewrite the test or fix whatever bug it is
-    // encountering.
-    //
-    // I've opened https://github.com/desktop/desktop/issues/5543
-    // to ensure this isn't forgotten.
-    it.skip('clears the undo commit dialog', async () => {
-      const { appStore } = await createAppStore()
-
-      // select the repository and show the changes view
-      await appStore._selectRepository(repository)
-      await appStore._changeRepositorySection(
-        repository,
-        RepositorySectionTab.Changes
-      )
-
-      let state = getAppState(appStore)
-      expect(state.localCommitSHAs).toHaveLength(1)
-
-      await appStore._undoCommit(repository, firstCommit!, false)
-
-      state = getAppState(appStore)
-      expect(state.localCommitSHAs).toHaveLength(0)
-    })
-  })
-
-  // skipping these tests because its not worth the time it would take
-  // to make them reliable. the underlying problem is that this scenario
-  // triggers an asynchronous call to the stats db that sometimes doesn't
-  // finish before the test is over (which then errors out)
-  describe.skip('_finishConflictedMerge', () => {
-    let appStore: AppStore
-    let repositoriesStore: RepositoriesStore
-
-    beforeEach(async () => {
-      const result = await createAppStore()
-      appStore = result.appStore
-      repositoriesStore = result.repositoriesStore
-    })
-
-    describe('with tracked and untracked files', () => {
-      it('commits tracked files', async () => {
-        let repo = await setupConflictedRepoWithMultipleFiles()
-        repo = (await appStore._addRepositories([repo.path]))[0]
-
-        await repositoriesStore.updateLastStashCheckDate(repo)
-
-        const status = await getStatusOrThrow(repo)
-
-        await appStore._finishConflictedMerge(
-          repo,
-          status.workingDirectory,
-          new Map<string, ManualConflictResolution>()
-        )
-        const newStatus = await getStatusOrThrow(repo)
-        const trackedFiles = newStatus.workingDirectory.files.filter(
-          f => f.status.kind !== AppFileStatusKind.Untracked
-        )
-        expect(trackedFiles).toHaveLength(0)
-      })
-      it('leaves untracked files untracked', async () => {
-        let repo = await setupConflictedRepoWithMultipleFiles()
-        repo = (await appStore._addRepositories([repo.path]))[0]
-
-        await repositoriesStore.updateLastStashCheckDate(repo)
-
-        const status = await getStatusOrThrow(repo)
-        await appStore._finishConflictedMerge(
-          repo,
-          status.workingDirectory,
-          new Map<string, ManualConflictResolution>()
-        )
-        const newStatus = await getStatusOrThrow(repo)
-        const untrackedfiles = newStatus.workingDirectory.files.filter(
-          f => f.status.kind === AppFileStatusKind.Untracked
-        )
-        expect(untrackedfiles).toHaveLength(1)
-      })
-    })
-
-    describe('with unrelated changes that are uncommitted', () => {
-      let repo: Repository, status: IStatusResult
-
-      beforeEach(async () => {
-        repo = await setupConflictedRepoWithUnrelatedCommittedChange()
-        repo = (await appStore._addRepositories([repo.path]))[0]
-        await repositoriesStore.updateLastStashCheckDate(repo)
-        status = await getStatusOrThrow(repo)
-      })
-      it("doesn't commit unrelated changes", async () => {
-        await appStore._finishConflictedMerge(
-          repo,
-          status.workingDirectory,
-          new Map<string, ManualConflictResolution>()
-        )
-        const newStatus = await getStatusOrThrow(repo)
-        const modifiedFiles = newStatus.workingDirectory.files.filter(
-          f => f.status.kind === AppFileStatusKind.Modified
-        )
-        expect(modifiedFiles).toHaveLength(1)
-      })
-    })
-  })
-})
diff --git a/app/test/unit/app-test.tsx b/app/test/unit/app-test.tsx
deleted file mode 100644
index e9d0b4d3cbe..00000000000
--- a/app/test/unit/app-test.tsx
+++ /dev/null
@@ -1,135 +0,0 @@
-import * as React from 'react'
-import * as ReactDOM from 'react-dom'
-import * as TestUtils from 'react-dom/test-utils'
-
-import { App } from '../../src/ui/app'
-import { Dispatcher } from '../../src/ui/dispatcher'
-import {
-  AppStore,
-  GitHubUserStore,
-  CloningRepositoriesStore,
-  IssuesStore,
-  SignInStore,
-  RepositoriesStore,
-  AccountsStore,
-  PullRequestStore,
-  PullRequestCoordinator,
-} from '../../src/lib/stores'
-import { InMemoryDispatcher } from '../helpers/in-memory-dispatcher'
-import {
-  TestGitHubUserDatabase,
-  TestStatsDatabase,
-  TestIssuesDatabase,
-  TestRepositoriesDatabase,
-  TestPullRequestDatabase,
-} from '../helpers/databases'
-import { StatsStore } from '../../src/lib/stats'
-import { InMemoryStore, AsyncInMemoryStore } from '../helpers/stores'
-import { TestActivityMonitor } from '../helpers/test-activity-monitor'
-import { RepositoryStateCache } from '../../src/lib/stores/repository-state-cache'
-import { ApiRepositoriesStore } from '../../src/lib/stores/api-repositories-store'
-import { CommitStatusStore } from '../../src/lib/stores/commit-status-store'
-import { AheadBehindStore } from '../../src/lib/stores/ahead-behind-store'
-import { AliveStore } from '../../src/lib/stores/alive-store'
-import { NotificationsStore } from '../../src/lib/stores/notifications-store'
-
-describe('App', () => {
-  let appStore: AppStore
-  let dispatcher: Dispatcher
-  let statsStore: StatsStore
-  let repositoryStateManager: RepositoryStateCache
-  let githubUserStore: GitHubUserStore
-  let issuesStore: IssuesStore
-  let aheadBehindStore: AheadBehindStore
-
-  beforeEach(async () => {
-    const db = new TestGitHubUserDatabase()
-    await db.reset()
-
-    const issuesDb = new TestIssuesDatabase()
-    await issuesDb.reset()
-
-    const statsDb = new TestStatsDatabase()
-    await statsDb.reset()
-    statsStore = new StatsStore(statsDb, new TestActivityMonitor())
-
-    const repositoriesDb = new TestRepositoriesDatabase()
-    await repositoriesDb.reset()
-    const repositoriesStore = new RepositoriesStore(repositoriesDb)
-
-    const accountsStore = new AccountsStore(
-      new InMemoryStore(),
-      new AsyncInMemoryStore()
-    )
-
-    const pullRequestCoordinator = new PullRequestCoordinator(
-      new PullRequestStore(new TestPullRequestDatabase(), repositoriesStore),
-      repositoriesStore
-    )
-
-    githubUserStore = new GitHubUserStore(db)
-    issuesStore = new IssuesStore(issuesDb)
-
-    repositoryStateManager = new RepositoryStateCache()
-
-    const apiRepositoriesStore = new ApiRepositoriesStore(accountsStore)
-    const commitStatusStore = new CommitStatusStore(accountsStore)
-    aheadBehindStore = new AheadBehindStore()
-
-    const aliveStore = new AliveStore(accountsStore)
-
-    const notificationsStore = new NotificationsStore(
-      accountsStore,
-      aliveStore,
-      pullRequestCoordinator,
-      statsStore
-    )
-    notificationsStore.setNotificationsEnabled(false)
-
-    appStore = new AppStore(
-      githubUserStore,
-      new CloningRepositoriesStore(),
-      issuesStore,
-      statsStore,
-      new SignInStore(),
-      accountsStore,
-      repositoriesStore,
-      pullRequestCoordinator,
-      repositoryStateManager,
-      apiRepositoriesStore,
-      notificationsStore
-    )
-
-    dispatcher = new InMemoryDispatcher(
-      appStore,
-      repositoryStateManager,
-      statsStore,
-      commitStatusStore
-    )
-  })
-
-  it('renders', async () => {
-    const app = TestUtils.renderIntoDocument(
-      <App
-        dispatcher={dispatcher}
-        appStore={appStore}
-        repositoryStateManager={repositoryStateManager}
-        issuesStore={issuesStore}
-        gitHubUserStore={githubUserStore}
-        aheadBehindStore={aheadBehindStore}
-        startTime={0}
-      />
-    ) as unknown as React.Component<any, any>
-    // Give any promises a tick to resolve.
-    await wait(0)
-
-    const node = ReactDOM.findDOMNode(app)
-    expect(node).not.toBeNull()
-  })
-})
-
-function wait(timeout: number): Promise<void> {
-  return new Promise<void>(resolve => {
-    setTimeout(resolve, timeout)
-  })
-}
diff --git a/app/test/unit/branch-pruner-test.ts b/app/test/unit/branch-pruner-test.ts
index d20a04077e5..95e67a37838 100644
--- a/app/test/unit/branch-pruner-test.ts
+++ b/app/test/unit/branch-pruner-test.ts
@@ -6,7 +6,7 @@ import { RepositoryStateCache } from '../../src/lib/stores/repository-state-cach
 import { setupFixtureRepository } from '../helpers/repositories'
 import { shell } from '../helpers/test-app-shell'
 import { TestRepositoriesDatabase } from '../helpers/databases'
-import { GitProcess } from 'dugite'
+import { exec } from 'dugite'
 import {
   createRepository as createPrunedRepository,
   setupRepository,
@@ -14,6 +14,9 @@ import {
 import { StatsStore, StatsDatabase } from '../../src/lib/stats'
 import { UiActivityMonitor } from '../../src/ui/lib/ui-activity-monitor'
 import { offsetFromNow } from '../../src/lib/offset-from'
+import * as FSE from 'fs-extra'
+import * as path from 'path'
+import { fakePost } from '../fake-stats-post'
 
 describe('BranchPruner', () => {
   const onGitStoreUpdated = () => {}
@@ -22,15 +25,16 @@ describe('BranchPruner', () => {
   let gitStoreCache: GitStoreCache
   let repositoriesStore: RepositoriesStore
   let repositoriesStateCache: RepositoryStateCache
-  let onPruneCompleted: jest.Mock<(repository: Repository) => Promise<void>>
 
   beforeEach(async () => {
+    const statsStore = new StatsStore(
+      new StatsDatabase('test-StatsDatabase'),
+      new UiActivityMonitor(),
+      fakePost
+    )
     gitStoreCache = new GitStoreCache(
       shell,
-      new StatsStore(
-        new StatsDatabase('test-StatsDatabase'),
-        new UiActivityMonitor()
-      ),
+      statsStore,
       onGitStoreUpdated,
       onDidError
     )
@@ -38,10 +42,7 @@ describe('BranchPruner', () => {
     const repositoriesDb = new TestRepositoriesDatabase()
     await repositoriesDb.reset()
     repositoriesStore = new RepositoriesStore(repositoriesDb)
-    repositoriesStateCache = new RepositoryStateCache()
-    onPruneCompleted = jest.fn(() => (_: Repository) => {
-      return Promise.resolve()
-    })
+    repositoriesStateCache = new RepositoryStateCache(statsStore)
   })
 
   it('does nothing on non GitHub repositories', async () => {
@@ -60,7 +61,7 @@ describe('BranchPruner', () => {
       gitStoreCache,
       repositoriesStore,
       repositoriesStateCache,
-      onPruneCompleted
+      () => Promise.resolve()
     )
 
     const branchesBeforePruning = await getBranchesFromGit(repo)
@@ -87,7 +88,7 @@ describe('BranchPruner', () => {
       gitStoreCache,
       repositoriesStore,
       repositoriesStateCache,
-      onPruneCompleted
+      () => Promise.resolve()
     )
 
     await branchPruner.start()
@@ -113,7 +114,7 @@ describe('BranchPruner', () => {
       gitStoreCache,
       repositoriesStore,
       repositoriesStateCache,
-      onPruneCompleted
+      () => Promise.resolve()
     )
 
     const branchesBeforePruning = await getBranchesFromGit(repo)
@@ -125,10 +126,11 @@ describe('BranchPruner', () => {
 
   it('does not prune if there is no default branch', async () => {
     const lastPruneDate = new Date(offsetFromNow(-1, 'day'))
-    const path = await setupFixtureRepository('branch-prune-tests')
+    const repoPath = await setupFixtureRepository('branch-prune-tests')
+    FSE.unlink(path.join(repoPath, '.git', 'refs', 'remotes', 'origin', 'HEAD'))
 
     const repo = await setupRepository(
-      path,
+      repoPath,
       repositoriesStore,
       repositoriesStateCache,
       true,
@@ -140,7 +142,7 @@ describe('BranchPruner', () => {
       gitStoreCache,
       repositoriesStore,
       repositoriesStateCache,
-      onPruneCompleted
+      () => Promise.resolve()
     )
 
     const branchesBeforePruning = await getBranchesFromGit(repo)
@@ -167,7 +169,7 @@ describe('BranchPruner', () => {
       gitStoreCache,
       repositoriesStore,
       repositoriesStateCache,
-      onPruneCompleted
+      () => Promise.resolve()
     )
 
     await branchPruner.start()
@@ -208,7 +210,7 @@ describe('BranchPruner', () => {
       gitStoreCache,
       repositoriesStore,
       repositoriesStateCache,
-      onPruneCompleted
+      () => Promise.resolve()
     )
 
     await branchPruner.start()
@@ -220,7 +222,7 @@ describe('BranchPruner', () => {
 })
 
 async function getBranchesFromGit(repository: Repository) {
-  const gitOutput = await GitProcess.exec(['branch'], repository.path)
+  const gitOutput = await exec(['branch'], repository.path)
   return gitOutput.stdout
     .split('\n')
     .filter(s => s.length > 0)
diff --git a/app/test/unit/create-branch-test.ts b/app/test/unit/create-branch-test.ts
index caaa506e2c9..b1252fac909 100644
--- a/app/test/unit/create-branch-test.ts
+++ b/app/test/unit/create-branch-test.ts
@@ -6,18 +6,9 @@ import {
   IBranchTip,
   Branch,
 } from '../../src/models/branch'
-import { CommitIdentity } from '../../src/models/commit-identity'
-
-const stubAuthor: CommitIdentity = {
-  name: 'Brendan Forster',
-  email: 'brendan@example.com',
-  date: new Date(),
-  tzOffset: 0,
-}
 
 const stubTip: IBranchTip = {
   sha: 'deadbeef',
-  author: stubAuthor,
 }
 
 const defaultBranch: Branch = {
diff --git a/app/test/unit/custom-theme-test.ts b/app/test/unit/custom-theme-test.ts
deleted file mode 100644
index 776f1a4cad3..00000000000
--- a/app/test/unit/custom-theme-test.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { ApplicationTheme } from '../../src/ui/lib/application-theme'
-import {
-  buildCustomThemeStyles,
-  CustomThemeDefaults,
-} from '../../src/ui/lib/custom-theme'
-
-describe('CustomTheme', () => {
-  describe('buildCustomThemeStyles', () => {
-    it('sets the first line to body.theme-high-contrast {', () => {
-      const customTheme = CustomThemeDefaults[ApplicationTheme.HighContrast]
-      const customThemeStyles = buildCustomThemeStyles(customTheme)
-      expect(customThemeStyles).toStartWith('body.theme-high-contrast {\n')
-    })
-
-    it('sets the last line to }', () => {
-      const customTheme = CustomThemeDefaults[ApplicationTheme.HighContrast]
-      const customThemeStyles = buildCustomThemeStyles(customTheme)
-      expect(customThemeStyles).toEndWith('}')
-    })
-
-    it('prefaces all variable lines with --', () => {
-      const customTheme = CustomThemeDefaults[ApplicationTheme.HighContrast]
-      const customThemeStyles = buildCustomThemeStyles(customTheme)
-      const styleLines = customThemeStyles.split('\n')
-
-      // skip first and last line
-      for (let i = 1; i < styleLines.length - 1; i++) {
-        const trimmedLine = styleLines[i].trim()
-        if (trimmedLine === '') {
-          continue
-        }
-        expect(trimmedLine).toStartWith('--')
-      }
-    })
-
-    it('ends all variable lines with ;', () => {
-      const customTheme = CustomThemeDefaults[ApplicationTheme.HighContrast]
-      const customThemeStyles = buildCustomThemeStyles(customTheme)
-      const styleLines = customThemeStyles.split('\n')
-
-      // skip first, last line, and empty lines
-      for (let i = 1; i < styleLines.length - 1; i++) {
-        const trimmedLine = styleLines[i].trim()
-        if (trimmedLine === '') {
-          continue
-        }
-        expect(trimmedLine).toEndWith(';')
-      }
-    })
-  })
-})
diff --git a/app/test/unit/diff-parser-test.ts b/app/test/unit/diff-parser-test.ts
index a03581f1d14..e6c6540c388 100644
--- a/app/test/unit/diff-parser-test.ts
+++ b/app/test/unit/diff-parser-test.ts
@@ -256,6 +256,7 @@ index 1910281..257cc56 100644
     expect(lines[i].type).toBe(DiffLineType.Delete)
     expect(lines[i].oldLineNumber).toBe(1)
     expect(lines[i].newLineNumber).toBeNull()
+    expect(lines[i].originalLineNumber).toBe(1)
     expect(lines[i].noTrailingNewLine).toBe(true)
     i++
 
@@ -263,6 +264,7 @@ index 1910281..257cc56 100644
     expect(lines[i].type).toBe(DiffLineType.Add)
     expect(lines[i].oldLineNumber).toBeNull()
     expect(lines[i].newLineNumber).toBe(1)
+    expect(lines[i].originalLineNumber).toBe(2)
     expect(lines[i].noTrailingNewLine).toBe(false)
     i++
   })
@@ -305,6 +307,7 @@ index 1910281..ba0e162 100644
     expect(lines[i].type).toBe(DiffLineType.Delete)
     expect(lines[i].oldLineNumber).toBe(1)
     expect(lines[i].newLineNumber).toBeNull()
+    expect(lines[i].originalLineNumber).toBe(1)
     expect(lines[i].noTrailingNewLine).toBe(true)
     i++
 
@@ -312,6 +315,7 @@ index 1910281..ba0e162 100644
     expect(lines[i].type).toBe(DiffLineType.Add)
     expect(lines[i].oldLineNumber).toBeNull()
     expect(lines[i].newLineNumber).toBe(1)
+    expect(lines[i].originalLineNumber).toBe(2)
     expect(lines[i].noTrailingNewLine).toBe(true)
     i++
   })
diff --git a/app/test/unit/email-test.ts b/app/test/unit/email-test.ts
index 55e3e5a9314..aa6895eea9b 100644
--- a/app/test/unit/email-test.ts
+++ b/app/test/unit/email-test.ts
@@ -19,7 +19,8 @@ describe('emails', () => {
         [],
         '',
         1234,
-        'Caps Lock'
+        'Caps Lock',
+        'free'
       )
 
       expect(lookupPreferredEmail(account)).toBe(
@@ -35,7 +36,8 @@ describe('emails', () => {
         [],
         '',
         1234,
-        'Caps Lock'
+        'Caps Lock',
+        'free'
       )
 
       expect(lookupPreferredEmail(account)).toBe(
@@ -72,7 +74,8 @@ describe('emails', () => {
         emails,
         '',
         -1,
-        'Caps Lock'
+        'Caps Lock',
+        'free'
       )
 
       expect(lookupPreferredEmail(account)).toBe('my-primary-email@example.com')
@@ -107,7 +110,8 @@ describe('emails', () => {
         emails,
         '',
         -1,
-        'Caps Lock'
+        'Caps Lock',
+        'free'
       )
 
       expect(lookupPreferredEmail(account)).toBe('my-primary-email@example.com')
@@ -142,7 +146,8 @@ describe('emails', () => {
         emails,
         '',
         -1,
-        'Caps Lock'
+        'Caps Lock',
+        'free'
       )
 
       expect(lookupPreferredEmail(account)).toBe(
@@ -179,7 +184,8 @@ describe('emails', () => {
         emails,
         '',
         -1,
-        'Caps Lock'
+        'Caps Lock',
+        'free'
       )
 
       expect(lookupPreferredEmail(account)).toBe(
@@ -210,7 +216,8 @@ describe('emails', () => {
         emails,
         '',
         -1,
-        'Caps Lock'
+        'Caps Lock',
+        'free'
       )
 
       expect(lookupPreferredEmail(account)).toBe('shiftkey@example.com')
@@ -241,7 +248,16 @@ describe('emails', () => {
       ]
 
       const endpoint = getDotComAPIEndpoint()
-      const account = new Account('niik', endpoint, '', emails, '', 123, '')
+      const account = new Account(
+        'niik',
+        endpoint,
+        '',
+        emails,
+        '',
+        123,
+        '',
+        'free'
+      )
 
       expect(isAttributableEmailFor(account, 'personal@gmail.com')).toBeTrue()
       expect(isAttributableEmailFor(account, 'company@github.com')).toBeTrue()
@@ -255,7 +271,7 @@ describe('emails', () => {
 
     it('considers stealth emails when account has no emails', () => {
       const endpoint = getDotComAPIEndpoint()
-      const account = new Account('niik', endpoint, '', [], '', 123, '')
+      const account = new Account('niik', endpoint, '', [], '', 123, '', 'free')
 
       expect(
         isAttributableEmailFor(account, 'niik@users.noreply.github.com')
@@ -267,7 +283,7 @@ describe('emails', () => {
 
     it('considers stealth emails for GitHub Enterprise', () => {
       const endpoint = getDotComAPIEndpoint()
-      const account = new Account('niik', endpoint, '', [], '', 123, '')
+      const account = new Account('niik', endpoint, '', [], '', 123, '', 'free')
 
       expect(
         isAttributableEmailFor(account, 'niik@users.noreply.github.com')
@@ -292,7 +308,8 @@ describe('emails', () => {
         ],
         '',
         123,
-        ''
+        '',
+        'free'
       )
 
       expect(isAttributableEmailFor(account, 'niik@github.com')).toBeTrue()
diff --git a/app/test/unit/endpoint-capabilities-test.ts b/app/test/unit/endpoint-capabilities-test.ts
index 8ebe357e23d..b9d1db03e26 100644
--- a/app/test/unit/endpoint-capabilities-test.ts
+++ b/app/test/unit/endpoint-capabilities-test.ts
@@ -19,17 +19,8 @@ describe('endpoint-capabilities', () => {
     })
 
     it('recognizes GHAE', () => {
-      expect(testGHAE(false)).toBeFalse()
-      expect(testGHAE(true)).toBeTrue()
-    })
-
-    // GHAE doesn't advertise the installed version so we'll assume its
-    // capabilities match that of a recent supported version of GHES. This is
-    // defined in the `assumedGHAEVersion` constant in endpoint-capabilities.ts
-    // and needs to be updated periodically.
-    it('assumes GHAE versions', () => {
-      expect(testGHAE('>= 3.2.1')).toBeFalse()
-      expect(testGHAE('>= 3.2.0')).toBeTrue()
+      expect(testGHEDotCom(false)).toBeFalse()
+      expect(testGHEDotCom(true)).toBeTrue()
     })
 
     // If we can't determine the actual version of a GitHub Enterprise Server
@@ -51,7 +42,7 @@ describe('endpoint-capabilities', () => {
       expect(
         testEndpoint('https://api.github.com', {
           dotcom: true,
-          ae: '>= 3.0.0',
+          ghe: false,
           es: '>= 3.0.0',
         })
       ).toBeTrue()
@@ -61,7 +52,7 @@ describe('endpoint-capabilities', () => {
           'https://ghe.io',
           {
             dotcom: false,
-            ae: '>= 4.0.0',
+            ghe: false,
             es: '>= 3.1.0',
           },
           '3.1.0'
@@ -77,7 +68,7 @@ function testDotCom(
 ) {
   return testEndpoint(
     getDotComAPIEndpoint(),
-    { dotcom: constraint, ae: false, es: false },
+    { dotcom: constraint, ghe: false, es: false },
     endpointVersion
   )
 }
@@ -88,20 +79,17 @@ function testGHES(
 ) {
   return testEndpoint(
     'https://ghe.io',
-    { dotcom: false, ae: false, es: constraint },
+    { dotcom: false, ghe: false, es: constraint },
     endpointVersion
   )
 }
 
-function testGHAE(
-  constraint: boolean | string,
-  endpointVersion: string | SemVer | null = null
-) {
-  return testEndpoint(
-    'https://corp.ghe.com',
-    { dotcom: false, ae: constraint, es: false },
-    endpointVersion
-  )
+function testGHEDotCom(constraint: boolean) {
+  return testEndpoint('https://corp.ghe.com', {
+    dotcom: false,
+    ghe: constraint,
+    es: false,
+  })
 }
 
 function testEndpoint(
diff --git a/app/test/unit/find-account-test.ts b/app/test/unit/find-account-test.ts
index a2db2761cc0..a5d9bc5bc45 100644
--- a/app/test/unit/find-account-test.ts
+++ b/app/test/unit/find-account-test.ts
@@ -38,7 +38,8 @@ describe('findAccountForRemoteURL', () => {
       [],
       '',
       1,
-      'GitHub'
+      'GitHub',
+      'free'
     ),
     new Account(
       'joel',
@@ -47,7 +48,8 @@ describe('findAccountForRemoteURL', () => {
       [],
       '',
       2,
-      'My Company'
+      'My Company',
+      'free'
     ),
   ]
 
diff --git a/app/test/unit/format-commit-message-test.ts b/app/test/unit/format-commit-message-test.ts
index fe2d821e172..eefa05a36f0 100644
--- a/app/test/unit/format-commit-message-test.ts
+++ b/app/test/unit/format-commit-message-test.ts
@@ -112,4 +112,24 @@ describe('formatCommitMessage', () => {
         'Signed-Off-By: nerdneha <nerdneha@github.com>\n'
     )
   })
+
+  // note, this relies on the default git config
+  it("doesn't treat --- as end of commit message", async () => {
+    const repo = await setupEmptyRepository()
+    const trailers = [
+      { token: 'Signed-Off-By', value: 'nerdneha <nerdneha@github.com>' },
+    ]
+
+    const summary = 'foo'
+    const description =
+      'hello\n---\nworld\n\nCo-Authored-By: Markus Olsson <niik@github.com>'
+
+    expect(
+      await formatCommitMessage(repo, { summary, description, trailers })
+    ).toBe(
+      'foo\n\nhello\n---\nworld\n\n' +
+        'Co-Authored-By: Markus Olsson <niik@github.com>\n' +
+        'Signed-Off-By: nerdneha <nerdneha@github.com>\n'
+    )
+  })
 })
diff --git a/app/test/unit/git-store-cache-test.ts b/app/test/unit/git-store-cache-test.ts
index c64425b073b..1301620a585 100644
--- a/app/test/unit/git-store-cache-test.ts
+++ b/app/test/unit/git-store-cache-test.ts
@@ -3,6 +3,7 @@ import { GitStoreCache } from '../../src/lib/stores/git-store-cache'
 import { shell } from '../helpers/test-app-shell'
 import { StatsStore, StatsDatabase } from '../../src/lib/stats'
 import { UiActivityMonitor } from '../../src/ui/lib/ui-activity-monitor'
+import { fakePost } from '../fake-stats-post'
 
 describe('GitStoreCache', () => {
   let repository: Repository
@@ -15,7 +16,8 @@ describe('GitStoreCache', () => {
     repository = new Repository('/something/path', 1, null, false)
     statsStore = new StatsStore(
       new StatsDatabase('test-StatsDatabase'),
-      new UiActivityMonitor()
+      new UiActivityMonitor(),
+      fakePost
     )
   })
 
diff --git a/app/test/unit/git-store-test.ts b/app/test/unit/git-store-test.ts
index 391b5a56f0e..48954e24b16 100644
--- a/app/test/unit/git-store-test.ts
+++ b/app/test/unit/git-store-test.ts
@@ -1,6 +1,6 @@
 import * as FSE from 'fs-extra'
 import * as Path from 'path'
-import { GitProcess } from 'dugite'
+import { exec } from 'dugite'
 
 import { shell } from '../helpers/test-app-shell'
 import {
@@ -22,6 +22,7 @@ import {
 import { BranchType } from '../../src/models/branch'
 import { StatsStore, StatsDatabase } from '../../src/lib/stats'
 import { UiActivityMonitor } from '../../src/ui/lib/ui-activity-monitor'
+import { fakePost } from '../fake-stats-post'
 
 describe('GitStore', () => {
   let statsStore: StatsStore
@@ -29,7 +30,8 @@ describe('GitStore', () => {
   beforeEach(() => {
     statsStore = new StatsStore(
       new StatsDatabase('test-StatsDatabase'),
-      new UiActivityMonitor()
+      new UiActivityMonitor(),
+      fakePost
     )
   })
 
@@ -62,8 +64,8 @@ describe('GitStore', () => {
     await FSE.writeFile(licenseFilePath, 'SOME WORDS GO HERE\n')
 
     // commit the readme file but leave the license
-    await GitProcess.exec(['add', readmeFile], repo.path)
-    await GitProcess.exec(['commit', '-m', 'added readme file'], repo.path)
+    await exec(['add', readmeFile], repo.path)
+    await exec(['commit', '-m', 'added readme file'], repo.path)
 
     await FSE.writeFile(readmeFilePath, 'WRITING SOME NEW WORDS\n')
     // setup requires knowing about the current tip
@@ -96,9 +98,9 @@ describe('GitStore', () => {
     await FSE.writeFile(filePath, 'SOME WORDS GO HERE\n')
 
     // commit the file, and then rename it
-    await GitProcess.exec(['add', file], repo.path)
-    await GitProcess.exec(['commit', '-m', 'added file'], repo.path)
-    await GitProcess.exec(['mv', file, renamedFile], repo.path)
+    await exec(['add', file], repo.path)
+    await exec(['commit', '-m', 'added file'], repo.path)
+    await exec(['mv', file, renamedFile], repo.path)
 
     const statusBeforeDiscard = await getStatusOrThrow(repo)
     const filesToDiscard = statusBeforeDiscard.workingDirectory.files
@@ -126,8 +128,8 @@ describe('GitStore', () => {
 
       await FSE.writeFile(filePath, 'SOME WORDS GO HERE\n')
 
-      await GitProcess.exec(['add', file], repository.path)
-      await GitProcess.exec(['commit', '-m', commitMessage], repository.path)
+      await exec(['add', file], repository.path)
+      await exec(['commit', '-m', commitMessage], repository.path)
 
       firstCommit = await getCommit(repository, 'master')
       expect(firstCommit).not.toBeNull()
@@ -191,7 +193,7 @@ describe('GitStore', () => {
       // compare the index state to some other tree-ish
       // 4b825dc642cb6eb9a060e54bf8d69288fbee4904 is the magic empty tree
       // if nothing is staged, this should return no entries
-      const result = await GitProcess.exec(
+      const result = await exec(
         [
           'diff-index',
           '--name-status',
@@ -298,7 +300,7 @@ describe('GitStore', () => {
 
     it('the tracking branch is not cleared when the remote branch is removed', async () => {
       // checkout the other branch after cloning
-      await GitProcess.exec(['checkout', 'some-other-branch'], repository.path)
+      await exec(['checkout', 'some-other-branch'], repository.path)
 
       const gitStore = new GitStore(repository, shell, statsStore)
       await gitStore.loadBranches()
@@ -309,13 +311,10 @@ describe('GitStore', () => {
       expect(currentBranchBefore!.upstream).toBe('origin/some-other-branch')
 
       // delete the ref in the upstream branch
-      await GitProcess.exec(
-        ['branch', '-D', 'some-other-branch'],
-        upstream.path
-      )
+      await exec(['branch', '-D', 'some-other-branch'], upstream.path)
 
       // update the local repository state to remove the remote ref
-      await GitProcess.exec(['fetch', '--prune', '--all'], repository.path)
+      await exec(['fetch', '--prune', '--all'], repository.path)
       await gitStore.loadBranches()
 
       const currentBranchAfter = gitStore.allBranches.find(
diff --git a/app/test/unit/git/apply-test.ts b/app/test/unit/git/apply-test.ts
index 34450ded8f1..5767fbe3884 100644
--- a/app/test/unit/git/apply-test.ts
+++ b/app/test/unit/git/apply-test.ts
@@ -1,4 +1,4 @@
-import { GitProcess } from 'dugite'
+import { exec } from 'dugite'
 import {
   setupTwoCommitRepo,
   setupFixtureRepository,
@@ -38,7 +38,7 @@ describe('git/apply', () => {
         await makeCommit(originalRepo, {
           entries: [{ path: 'just-okay-file', contents: 'okay' }],
         })
-        const result = await GitProcess.exec(
+        const result = await exec(
           ['format-patch', '--stdout', 'HEAD~'],
           originalRepo.path
         )
@@ -53,7 +53,7 @@ describe('git/apply', () => {
       let patch: string
       beforeEach(async () => {
         const originalRepo = await setupTwoCommitRepo()
-        const result = await GitProcess.exec(
+        const result = await exec(
           ['format-patch', '--stdout', 'HEAD~'],
           originalRepo.path
         )
diff --git a/app/test/unit/git/branch-test.ts b/app/test/unit/git/branch-test.ts
index 542c828aa3f..b60c2a18502 100644
--- a/app/test/unit/git/branch-test.ts
+++ b/app/test/unit/git/branch-test.ts
@@ -13,7 +13,7 @@ import {
   IUnbornRepository,
 } from '../../../src/models/tip'
 import { GitStore } from '../../../src/lib/stores'
-import { GitProcess } from 'dugite'
+import { exec } from 'dugite'
 import {
   getBranchesPointedAt,
   createBranch,
@@ -26,6 +26,7 @@ import {
 import { StatsStore, StatsDatabase } from '../../../src/lib/stats'
 import { UiActivityMonitor } from '../../../src/ui/lib/ui-activity-monitor'
 import { assertNonNullable } from '../../../src/lib/fatal-error'
+import { fakePost } from '../../fake-stats-post'
 
 describe('git/branch', () => {
   let statsStore: StatsStore
@@ -33,7 +34,8 @@ describe('git/branch', () => {
   beforeEach(() => {
     statsStore = new StatsStore(
       new StatsDatabase('test-StatsDatabase'),
-      new UiActivityMonitor()
+      new UiActivityMonitor(),
+      fakePost
     )
   })
 
@@ -53,7 +55,7 @@ describe('git/branch', () => {
     it('returns correct ref if checkout occurs', async () => {
       const repository = await setupEmptyRepository()
 
-      await GitProcess.exec(['checkout', '-b', 'not-master'], repository.path)
+      await exec(['checkout', '-b', 'not-master'], repository.path)
 
       const store = new GitStore(repository, shell, statsStore)
       await store.loadStatus()
@@ -93,7 +95,6 @@ describe('git/branch', () => {
       expect(onBranch.branch.tip.sha).toEqual(
         'dfa96676b65e1c0ed43ca25492252a5e384c8efd'
       )
-      expect(onBranch.branch.tip.author.name).toEqual('Brendan Forster')
     })
 
     it('returns non-origin remote', async () => {
@@ -214,7 +215,7 @@ describe('git/branch', () => {
       const [remoteBranch] = await getBranches(mockLocal, remoteRef)
       expect(remoteBranch).not.toBeUndefined()
 
-      await checkoutBranch(mockLocal, null, remoteBranch)
+      await checkoutBranch(mockLocal, remoteBranch, null)
       await git(['checkout', '-'], mockLocal.path, 'checkoutPrevious')
 
       expect(await getBranches(mockLocal, localRef)).toBeArrayOfSize(1)
@@ -227,8 +228,7 @@ describe('git/branch', () => {
 
       await deleteRemoteBranch(
         mockLocal,
-        null,
-        localBranch.upstreamRemoteName!,
+        { name: localBranch.upstreamRemoteName!, url: '' },
         localBranch.upstreamWithoutRemote!
       )
 
@@ -251,7 +251,7 @@ describe('git/branch', () => {
       const [remoteBranch] = await getBranches(mockLocal, remoteRef)
       expect(remoteBranch).not.toBeUndefined()
 
-      await checkoutBranch(mockLocal, null, remoteBranch)
+      await checkoutBranch(mockLocal, remoteBranch, null)
       await git(['checkout', '-'], mockLocal.path, 'checkoutPrevious')
 
       expect(await getBranches(mockLocal, localRef)).toBeArrayOfSize(1)
@@ -269,8 +269,7 @@ describe('git/branch', () => {
 
       await deleteRemoteBranch(
         mockLocal,
-        null,
-        localBranch.upstreamRemoteName!,
+        { name: localBranch.upstreamRemoteName!, url: '' },
         localBranch.upstreamWithoutRemote!
       )
 
diff --git a/app/test/unit/git/checkout-test.ts b/app/test/unit/git/checkout-test.ts
index de1c5ab0967..19a758e4cf9 100644
--- a/app/test/unit/git/checkout-test.ts
+++ b/app/test/unit/git/checkout-test.ts
@@ -10,9 +10,10 @@ import { TipState, IValidBranch } from '../../../src/models/tip'
 import { GitStore } from '../../../src/lib/stores'
 import { Branch, BranchType } from '../../../src/models/branch'
 import { getStatusOrThrow } from '../../helpers/status'
-import { GitProcess } from 'dugite'
+import { exec } from 'dugite'
 import { StatsStore, StatsDatabase } from '../../../src/lib/stats'
 import { UiActivityMonitor } from '../../../src/ui/lib/ui-activity-monitor'
+import { fakePost } from '../../fake-stats-post'
 
 describe('git/checkout', () => {
   let statsStore: StatsStore
@@ -20,7 +21,8 @@ describe('git/checkout', () => {
   beforeEach(() => {
     statsStore = new StatsStore(
       new StatsDatabase('test-StatsDatabase'),
-      new UiActivityMonitor()
+      new UiActivityMonitor(),
+      fakePost
     )
   })
 
@@ -33,15 +35,7 @@ describe('git/checkout', () => {
       upstream: null,
       upstreamWithoutRemote: null,
       type: BranchType.Local,
-      tip: {
-        sha: '',
-        author: {
-          name: '',
-          email: '',
-          date: new Date(),
-          tzOffset: 0,
-        },
-      },
+      tip: { sha: '' },
       remoteName: null,
       upstreamRemoteName: null,
       isDesktopForkRemoteBranch: false,
@@ -50,7 +44,7 @@ describe('git/checkout', () => {
 
     let errorRaised = false
     try {
-      await checkoutBranch(repository, null, branch)
+      await checkoutBranch(repository, branch, null)
     } catch (error) {
       errorRaised = true
       expect(error.message).toBe('fatal: invalid reference: ..\n')
@@ -72,7 +66,7 @@ describe('git/checkout', () => {
       throw new Error(`Could not find branch: commit-with-long-description`)
     }
 
-    await checkoutBranch(repository, null, branches[0])
+    await checkoutBranch(repository, branches[0], null)
 
     const store = new GitStore(repository, shell, statsStore)
     await store.loadStatus()
@@ -107,7 +101,7 @@ describe('git/checkout', () => {
       throw new Error(`Could not find branch: '${secondBranch}'`)
     }
 
-    await checkoutBranch(repository, null, firstRemoteBranch)
+    await checkoutBranch(repository, firstRemoteBranch, null)
 
     const store = new GitStore(repository, shell, statsStore)
     await store.loadStatus()
@@ -141,7 +135,7 @@ describe('git/checkout', () => {
     let errorRaised = false
 
     try {
-      await checkoutBranch(repository, null, remoteBranch)
+      await checkoutBranch(repository, remoteBranch, null)
     } catch (error) {
       errorRaised = true
       expect(error.message).toBe('A branch with that name already exists.')
@@ -156,7 +150,7 @@ describe('git/checkout', () => {
       const repository = new Repository(path, -1, null, false)
 
       // put the repository into a known good state
-      await GitProcess.exec(
+      await exec(
         ['checkout', 'add-private-repo', '-f', '--recurse-submodules'],
         path
       )
@@ -168,7 +162,7 @@ describe('git/checkout', () => {
         throw new Error(`Could not find branch: 'master'`)
       }
 
-      await checkoutBranch(repository, null, masterBranch)
+      await checkoutBranch(repository, masterBranch, null)
 
       const status = await getStatusOrThrow(repository)
 
@@ -180,10 +174,7 @@ describe('git/checkout', () => {
       const repository = new Repository(path, -1, null, false)
 
       // put the repository into a known good state
-      await GitProcess.exec(
-        ['checkout', 'master', '-f', '--recurse-submodules'],
-        path
-      )
+      await exec(['checkout', 'master', '-f', '--recurse-submodules'], path)
 
       const branches = await getBranches(repository)
       const devBranch = branches.find(b => b.name === 'dev')
@@ -192,7 +183,7 @@ describe('git/checkout', () => {
         throw new Error(`Could not find branch: 'dev'`)
       }
 
-      await checkoutBranch(repository, null, devBranch)
+      await checkoutBranch(repository, devBranch, null)
 
       const status = await getStatusOrThrow(repository)
       expect(status.workingDirectory.files).toHaveLength(0)
diff --git a/app/test/unit/git/cherry-pick-test.ts b/app/test/unit/git/cherry-pick-test.ts
index 4588620b873..4d7041c8903 100644
--- a/app/test/unit/git/cherry-pick-test.ts
+++ b/app/test/unit/git/cherry-pick-test.ts
@@ -1,4 +1,4 @@
-import { GitProcess } from 'dugite'
+import { exec } from 'dugite'
 import * as FSE from 'fs-extra'
 import * as Path from 'path'
 import {
@@ -74,11 +74,8 @@ describe('git/cherry-pick', () => {
     await switchTo(repository, featureBranchName)
     const filePath = Path.join(repository.path, 'EMPTY_MESSAGE.md')
     await FSE.writeFile(filePath, '# HELLO WORLD! \nTHINGS GO HERE\n')
-    await GitProcess.exec(['add', filePath], repository.path)
-    await GitProcess.exec(
-      ['commit', '--allow-empty-message', '-m', ''],
-      repository.path
-    )
+    await exec(['add', filePath], repository.path)
+    await exec(['commit', '--allow-empty-message', '-m', ''], repository.path)
 
     featureBranch = await getBranchOrError(repository, featureBranchName)
     await switchTo(repository, targetBranchName)
@@ -122,7 +119,7 @@ describe('git/cherry-pick', () => {
   it('successfully cherry-picks an empty commit', async () => {
     // add empty commit to feature branch
     await switchTo(repository, featureBranchName)
-    await GitProcess.exec(
+    await exec(
       ['commit', '--allow-empty', '-m', 'Empty Commit'],
       repository.path
     )
@@ -143,7 +140,7 @@ describe('git/cherry-pick', () => {
 
     // add empty commit to feature branch
     await switchTo(repository, featureBranchName)
-    await GitProcess.exec(
+    await exec(
       ['commit', '--allow-empty', '-m', 'Empty Commit'],
       repository.path
     )
@@ -363,10 +360,7 @@ describe('git/cherry-pick', () => {
 
       // git diff --check warns if conflict markers exist and will exit with
       // non-zero status if conflicts found
-      const diffCheckBefore = await GitProcess.exec(
-        ['diff', '--check'],
-        repository.path
-      )
+      const diffCheckBefore = await exec(['diff', '--check'], repository.path)
       expect(diffCheckBefore.exitCode).toBeGreaterThan(0)
 
       // resolve conflicts by writing files to disk
@@ -376,10 +370,7 @@ describe('git/cherry-pick', () => {
       )
 
       // diff --check to verify no conflicts exist (exitCode should be 0)
-      const diffCheckAfter = await GitProcess.exec(
-        ['diff', '--check'],
-        repository.path
-      )
+      const diffCheckAfter = await exec(['diff', '--check'], repository.path)
       expect(diffCheckAfter.exitCode).toEqual(0)
 
       result = await continueCherryPick(repository, files)
@@ -400,10 +391,7 @@ describe('git/cherry-pick', () => {
 
       // git diff --check warns if conflict markers exist and will exit with
       // non-zero status if conflicts found
-      const diffCheckBefore = await GitProcess.exec(
-        ['diff', '--check'],
-        repository.path
-      )
+      const diffCheckBefore = await exec(['diff', '--check'], repository.path)
       expect(diffCheckBefore.exitCode).toBeGreaterThan(0)
 
       const manualResolutions = new Map<string, ManualConflictResolution>()
@@ -432,10 +420,7 @@ describe('git/cherry-pick', () => {
 
       // git diff --check warns if conflict markers exist and will exit with
       // non-zero status if conflicts found
-      const diffCheckBefore = await GitProcess.exec(
-        ['diff', '--check'],
-        repository.path
-      )
+      const diffCheckBefore = await exec(['diff', '--check'], repository.path)
       expect(diffCheckBefore.exitCode).toBeGreaterThan(0)
 
       const manualResolutions = new Map<string, ManualConflictResolution>()
diff --git a/app/test/unit/git/commit-test.ts b/app/test/unit/git/commit-test.ts
index 16b844a2c2a..ae8860ee2a0 100644
--- a/app/test/unit/git/commit-test.ts
+++ b/app/test/unit/git/commit-test.ts
@@ -18,7 +18,7 @@ import {
   setupConflictedRepoWithMultipleFiles,
 } from '../../helpers/repositories'
 
-import { GitProcess } from 'dugite'
+import { exec } from 'dugite'
 import {
   WorkingDirectoryFileChange,
   AppFileStatusKind,
@@ -134,9 +134,9 @@ describe('git/commit', () => {
 
       await FSE.writeFile(path.join(repo.path, 'foo'), 'foo\n')
 
-      await GitProcess.exec(['add', 'foo'], repo.path)
-      await GitProcess.exec(['commit', '-m', 'Initial commit'], repo.path)
-      await GitProcess.exec(['mv', 'foo', 'bar'], repo.path)
+      await exec(['add', 'foo'], repo.path)
+      await exec(['commit', '-m', 'Initial commit'], repo.path)
+      await exec(['mv', 'foo', 'bar'], repo.path)
 
       const status = await getStatusOrThrow(repo)
       const files = status.workingDirectory.files
@@ -403,9 +403,9 @@ describe('git/commit', () => {
 
       await FSE.writeFile(path.join(repo.path, 'foo'), 'foo\n')
 
-      await GitProcess.exec(['add', 'foo'], repo.path)
-      await GitProcess.exec(['commit', '-m', 'Initial commit'], repo.path)
-      await GitProcess.exec(['mv', 'foo', 'bar'], repo.path)
+      await exec(['add', 'foo'], repo.path)
+      await exec(['commit', '-m', 'Initial commit'], repo.path)
+      await exec(['mv', 'foo', 'bar'], repo.path)
 
       await FSE.writeFile(path.join(repo.path, 'bar'), 'bar\n')
 
@@ -433,9 +433,9 @@ describe('git/commit', () => {
 
       await FSE.writeFile(path.join(repo.path, 'foo'), 'line1\n')
 
-      await GitProcess.exec(['add', 'foo'], repo.path)
-      await GitProcess.exec(['commit', '-m', 'Initial commit'], repo.path)
-      await GitProcess.exec(['mv', 'foo', 'bar'], repo.path)
+      await exec(['add', 'foo'], repo.path)
+      await exec(['commit', '-m', 'Initial commit'], repo.path)
+      await exec(['mv', 'foo', 'bar'], repo.path)
 
       await FSE.writeFile(path.join(repo.path, 'bar'), 'line1\nline2\nline3\n')
 
@@ -631,14 +631,14 @@ describe('git/commit', () => {
           repository = new Repository(repoPath, -1, null, false)
           fileName = 'my-cool-image.png'
 
-          await GitProcess.exec(['checkout', 'master'], repoPath)
+          await exec(['checkout', 'master'], repoPath)
 
           fileContentsTheirs = await FSE.readFile(
             path.join(repoPath, fileName),
             'utf8'
           )
 
-          await GitProcess.exec(['checkout', 'make-a-change'], repoPath)
+          await exec(['checkout', 'make-a-change'], repoPath)
 
           fileContentsOurs = await FSE.readFile(
             path.join(repoPath, fileName),
@@ -649,7 +649,7 @@ describe('git/commit', () => {
         it('chooses `their` version of a file and commits', async () => {
           const repo = repository
 
-          await GitProcess.exec(['merge', 'master'], repo.path)
+          await exec(['merge', 'master'], repo.path)
 
           const status = await getStatusOrThrow(repo)
           const files = status.workingDirectory.files
@@ -682,7 +682,7 @@ describe('git/commit', () => {
         it('chooses `our` version of a file and commits', async () => {
           const repo = repository
 
-          await GitProcess.exec(['merge', 'master'], repo.path)
+          await exec(['merge', 'master'], repo.path)
 
           const status = await getStatusOrThrow(repo)
           const files = status.workingDirectory.files
@@ -745,7 +745,7 @@ describe('git/commit', () => {
       await FSE.writeFile(firstPath, 'line1\n')
       await FSE.writeFile(secondPath, 'line2\n')
 
-      await GitProcess.exec(['add', '.'], repo.path)
+      await exec(['add', '.'], repo.path)
 
       await FSE.unlink(firstPath)
 
@@ -779,9 +779,9 @@ describe('git/commit', () => {
       const firstPath = path.join(repo.path, 'first')
       await FSE.writeFile(firstPath, 'line1\n')
 
-      await GitProcess.exec(['add', 'first'], repo.path)
-      await GitProcess.exec(['commit', '-am', 'commit first file'], repo.path)
-      await GitProcess.exec(['rm', '--cached', 'first'], repo.path)
+      await exec(['add', 'first'], repo.path)
+      await exec(['commit', '-am', 'commit first file'], repo.path)
+      await exec(['rm', '--cached', 'first'], repo.path)
 
       // if the text is now different, everything is fine
       await FSE.writeFile(firstPath, 'line2\n')
@@ -814,8 +814,8 @@ describe('git/commit', () => {
       await FSE.writeFile(path.join(repo.path, '.gitignore'), '')
 
       // Setup repo to reproduce bug
-      await GitProcess.exec(['add', '.'], repo.path)
-      await GitProcess.exec(['commit', '-m', 'Initial commit'], repo.path)
+      await exec(['add', '.'], repo.path)
+      await exec(['commit', '-m', 'Initial commit'], repo.path)
 
       // Make changes that should remain secret
       await FSE.writeFile(path.join(repo.path, 'secret'), 'Somethign secret\n')
@@ -824,7 +824,7 @@ describe('git/commit', () => {
       await FSE.writeFile(path.join(repo.path, '.gitignore'), 'secret')
 
       // Remove from index to mark as deleted
-      await GitProcess.exec(['rm', '--cached', 'secret'], repo.path)
+      await exec(['rm', '--cached', 'secret'], repo.path)
 
       // Make sure that file is marked as deleted
       const beforeCommit = await getStatusOrThrow(repo)
diff --git a/app/test/unit/git/config-test.ts b/app/test/unit/git/config-test.ts
index 376d8d0297a..dc8ed21ae71 100644
--- a/app/test/unit/git/config-test.ts
+++ b/app/test/unit/git/config-test.ts
@@ -1,4 +1,4 @@
-import { GitProcess } from 'dugite'
+import { exec } from 'dugite'
 import * as Path from 'path'
 
 import { Repository } from '../../../src/models/repository'
@@ -8,10 +8,12 @@ import {
   getGlobalConfigValue,
   setGlobalConfigValue,
   getGlobalBooleanConfigValue,
+  git,
 } from '../../../src/lib/git'
 
 import { mkdirSync } from '../../helpers/temp'
 import { setupFixtureRepository } from '../../helpers/repositories'
+import { realpath } from 'fs/promises'
 
 describe('git/config', () => {
   let repository: Repository
@@ -33,22 +35,53 @@ describe('git/config', () => {
     })
   })
 
+  describe('GIT_CONFIG_PARAMETERS', () => {
+    it('picks them up', async () => {
+      expect(
+        await git(['config', 'desktop.test'], repository.path, '', {
+          successExitCodes: new Set([1]),
+        }).then(x => x.stdout)
+      ).toBeEmpty()
+      expect(
+        await git(['config', 'desktop.test'], repository.path, '', {
+          env: {
+            GIT_CONFIG_PARAMETERS: "'desktop.test=1'",
+          },
+        }).then(x => x.stdout)
+      ).toEqual('1\n')
+    })
+
+    it('takes precedence over GIT_CONFIG_*', async () => {
+      expect(
+        await git(['config', 'user.name'], repository.path, '', {
+          env: {
+            GIT_CONFIG_PARAMETERS: "'user.name=foobar'",
+            GIT_CONFIG_COUNT: '1',
+            GIT_CONFIG_KEY_0: 'user.name',
+            GIT_CONFIG_VALUE_0: 'baz',
+          },
+        }).then(x => x.stdout)
+      ).toEqual('foobar\n')
+    })
+  })
+
   describe('global config', () => {
     const HOME = mkdirSync('global-config-here')
     const env = { HOME }
     const expectedConfigPath = Path.normalize(Path.join(HOME, '.gitconfig'))
+
     const baseArgs = ['config', '-f', expectedConfigPath]
 
     describe('getGlobalConfigPath', () => {
       beforeEach(async () => {
         // getGlobalConfigPath requires at least one entry, so the
         // test needs to setup an existing config value
-        await GitProcess.exec([...baseArgs, 'user.name', 'bar'], __dirname)
+        await exec([...baseArgs, 'user.name', 'bar'], __dirname)
       })
 
       it('gets the config path', async () => {
         const path = await getGlobalConfigPath(env)
-        expect(path).toBe(expectedConfigPath)
+        expect(path).toBe(await realpath(expectedConfigPath))
       })
     })
 
@@ -56,8 +89,8 @@ describe('git/config', () => {
       const key = 'foo.bar'
 
       beforeEach(async () => {
-        await GitProcess.exec([...baseArgs, '--add', key, 'first'], __dirname)
-        await GitProcess.exec([...baseArgs, '--add', key, 'second'], __dirname)
+        await exec([...baseArgs, '--add', key, 'first'], __dirname)
+        await exec([...baseArgs, '--add', key, 'second'], __dirname)
       })
 
       it('will replace all entries for a global value', async () => {
diff --git a/app/test/unit/git/core-test.ts b/app/test/unit/git/core-test.ts
index b61c94a0c75..176a892515e 100644
--- a/app/test/unit/git/core-test.ts
+++ b/app/test/unit/git/core-test.ts
@@ -112,7 +112,6 @@ describe('git/core', () => {
           gitErrorDescription: null,
           stderr,
           stdout: '',
-          combinedOutput: stderr,
         }
       }
 
diff --git a/app/test/unit/git/create-tail-stream-test.ts b/app/test/unit/git/create-tail-stream-test.ts
new file mode 100644
index 00000000000..b41dd6fb8e8
--- /dev/null
+++ b/app/test/unit/git/create-tail-stream-test.ts
@@ -0,0 +1,24 @@
+import { Readable } from 'stream'
+import { createTailStream } from '../../../src/lib/git/create-tail-stream'
+
+describe('createTailStream', () => {
+  it('only keeps the tail of the input stream', async () => {
+    const write = (maxLength: number, ...chunks: string[]) =>
+      Readable.from(chunks)
+        .pipe(createTailStream(maxLength, { encoding: 'utf8' }))
+        .toArray()
+
+    expect(await write(3, 'hello')).toEqual(['llo'])
+    expect(await write(5, 'hello')).toEqual(['hello'])
+    expect(await write(10, 'hello', 'world')).toEqual(['helloworld'])
+    expect(await write(8, 'hello', 'world')).toEqual(['lloworld'])
+    expect(
+      await write(10, '0', '1', '2', '3', '4', '5', '6', '7', '8', '9')
+    ).toEqual(['0123456789'])
+    expect(
+      await write(8, '0', '1', '2', '3', '4', '5', '6', '7', '8', '9')
+    ).toEqual(['23456789'])
+
+    expect(await write(8, ...'helloworld')).toEqual(['lloworld'])
+  })
+})
diff --git a/app/test/unit/git/create-terminal-stream-test.ts b/app/test/unit/git/create-terminal-stream-test.ts
new file mode 100644
index 00000000000..c5ff6c95da5
--- /dev/null
+++ b/app/test/unit/git/create-terminal-stream-test.ts
@@ -0,0 +1,69 @@
+import { createReadStream } from 'fs'
+import { Readable } from 'stream'
+import { createTerminalStream } from '../../../src/lib/create-terminal-stream'
+import { getFixturePath } from '../../helpers/fixture'
+
+describe('terminal-stream', () => {
+  it('can handle git clone progress', async () => {
+    const ts = createTerminalStream()
+    createReadStream(getFixturePath('clone-with-progress-output')).pipe(ts)
+    const actual = await Readable.from(ts)
+      .toArray()
+      .then(chunks => chunks.join(''))
+    const expected =
+      `Cloning into 'linux'...\n` +
+      `remote: Enumerating objects: 10460179, done.        \n` +
+      `remote: Counting objects: 100% (165/165), done.        \n` +
+      `remote: Compressing objects: 100% (106/106), done.        \n` +
+      `remote: Total 10460179 (delta 94), reused 70 (delta 59), pack-reused 10460014 (from 1)        \n` +
+      `Receiving objects: 100% (10460179/10460179), 5.05 GiB | 8.72 MiB/s, done.\n` +
+      `Resolving deltas: 100% (8517403/8517403), done.\n` +
+      `Updating files: 100% (86676/86676), done.\n`
+
+    expect(actual).toEqual(expected)
+  })
+
+  it('can handle all kinds of chunk sizes', async () => {
+    const ts = createTerminalStream()
+    const buf = Buffer.alloc(2048)
+    buf.fill('abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789')
+    const buffers = new Array<Buffer>()
+
+    const outputPromise = Readable.from(ts)
+      .toArray()
+      .then(chunks => chunks.join(''))
+
+    for (let i = 1; i < 2048; i++) {
+      ts.write(buf.subarray(0, i))
+      buffers.push(buf.subarray(0, i))
+    }
+
+    for (let i = 2048; i > 0; i--) {
+      ts.write(buf.subarray(0, i))
+      buffers.push(buf.subarray(0, i))
+    }
+
+    ts.end()
+
+    const actual = await outputPromise
+    const expected = Buffer.concat(buffers).toString()
+
+    expect(actual).toEqual(expected)
+  })
+
+  it('can handle empty buffers', async () => {
+    const ts = createTerminalStream()
+
+    const outputPromise = Readable.from(ts)
+      .toArray()
+      .then(chunks => chunks.join(''))
+
+    ts.write(Buffer.alloc(0))
+    ts.end()
+
+    const actual = await outputPromise
+    const expected = ''
+
+    expect(actual).toEqual(expected)
+  })
+})
diff --git a/app/test/unit/git/credential-test.ts b/app/test/unit/git/credential-test.ts
new file mode 100644
index 00000000000..5a3d99cbe18
--- /dev/null
+++ b/app/test/unit/git/credential-test.ts
@@ -0,0 +1,30 @@
+import {
+  formatCredential,
+  parseCredential,
+} from '../../../src/lib/git/credential'
+
+describe('git/credential', () => {
+  describe('parseCredential', () => {
+    it('expands arrays into numeric entries', async () => {
+      expect([
+        ...parseCredential('wwwauth[]=foo\nwwwauth[]=bar').entries(),
+      ]).toEqual([
+        ['wwwauth[0]', 'foo'],
+        ['wwwauth[1]', 'bar'],
+      ])
+    })
+  })
+
+  describe('formatCredential', () => {
+    it('transforms numbered array entries into unnumbered', async () => {
+      expect(
+        formatCredential(
+          new Map([
+            ['wwwauth[0]', 'foo'],
+            ['wwwauth[1]', 'bar'],
+          ])
+        )
+      ).toBe('wwwauth[]=foo\nwwwauth[]=bar\n')
+    })
+  })
+})
diff --git a/app/test/unit/git/diff-test.ts b/app/test/unit/git/diff-test.ts
index e168655734e..74b329d72a8 100644
--- a/app/test/unit/git/diff-test.ts
+++ b/app/test/unit/git/diff-test.ts
@@ -5,6 +5,7 @@ import { Repository } from '../../../src/models/repository'
 import {
   WorkingDirectoryFileChange,
   AppFileStatusKind,
+  FileChange,
 } from '../../../src/models/status'
 import {
   ITextDiff,
@@ -12,6 +13,7 @@ import {
   DiffSelectionType,
   DiffSelection,
   DiffType,
+  ISubmoduleDiff,
 } from '../../../src/models/diff'
 import {
   setupFixtureRepository,
@@ -23,10 +25,15 @@ import {
   getWorkingDirectoryImage,
   getBlobImage,
   getBinaryPaths,
+  getBranchMergeBaseChangedFiles,
+  getBranchMergeBaseDiff,
+  git,
 } from '../../../src/lib/git'
 import { getStatusOrThrow } from '../../helpers/status'
 
-import { GitProcess } from 'dugite'
+import { GitError as DugiteError, exec } from 'dugite'
+import { makeCommit, switchTo } from '../../helpers/repository-scaffolding'
+import { writeFile } from 'fs/promises'
 
 async function getTextDiff(
   repo: Repository,
@@ -259,9 +266,9 @@ describe('git/diff', () => {
 
       await FSE.writeFile(path.join(repo.path, 'foo'), 'foo\n')
 
-      await GitProcess.exec(['add', 'foo'], repo.path)
-      await GitProcess.exec(['commit', '-m', 'Initial commit'], repo.path)
-      await GitProcess.exec(['mv', 'foo', 'bar'], repo.path)
+      await exec(['add', 'foo'], repo.path)
+      await exec(['commit', '-m', 'Initial commit'], repo.path)
+      await exec(['mv', 'foo', 'bar'], repo.path)
 
       const status = await getStatusOrThrow(repo)
       const files = status.workingDirectory.files
@@ -282,9 +289,9 @@ describe('git/diff', () => {
 
       await FSE.writeFile(path.join(repo.path, 'foo'), 'foo\n')
 
-      await GitProcess.exec(['add', 'foo'], repo.path)
-      await GitProcess.exec(['commit', '-m', 'Initial commit'], repo.path)
-      await GitProcess.exec(['mv', 'foo', 'bar'], repo.path)
+      await exec(['add', 'foo'], repo.path)
+      await exec(['commit', '-m', 'Initial commit'], repo.path)
+      await exec(['mv', 'foo', 'bar'], repo.path)
 
       await FSE.writeFile(path.join(repo.path, 'bar'), 'bar\n')
 
@@ -311,7 +318,7 @@ describe('git/diff', () => {
         'WRITING THE FIRST LINE\n'
       )
 
-      await GitProcess.exec(['add', 'foo'], repo.path)
+      await exec(['add', 'foo'], repo.path)
 
       await FSE.writeFile(path.join(repo.path, 'foo'), 'WRITING OVER THE TOP\n')
 
@@ -342,14 +349,11 @@ describe('git/diff', () => {
         `WRITING MANY LINES ${lineEnding} USING THIS LINE ENDING ${lineEnding} TO SHOW THAT GIT${lineEnding} WILL INSERT IT WITHOUT CHANGING THING ${lineEnding} HA HA BUSINESS`
       )
 
-      await GitProcess.exec(['add', 'foo'], repo.path)
-      await GitProcess.exec(
-        ['commit', '-m', 'commit first file with LF'],
-        repo.path
-      )
+      await exec(['add', 'foo'], repo.path)
+      await exec(['commit', '-m', 'commit first file with LF'], repo.path)
 
       // change config on-the-fly to trigger the line endings change warning
-      await GitProcess.exec(['config', 'core.autocrlf', 'true'], repo.path)
+      await exec(['config', 'core.autocrlf', 'true'], repo.path)
       lineEnding = '\n\n'
 
       await FSE.writeFile(
@@ -394,9 +398,45 @@ describe('git/diff', () => {
         repo = await setupEmptyRepository()
       })
       it('throws since HEAD doesnt exist', () => {
-        expect(getBinaryPaths(repo, 'HEAD')).rejects.toThrow()
+        expect(getBinaryPaths(repo, 'HEAD', [])).rejects.toThrow()
       })
     })
+
+    describe('with files using binary merge driver', () => {
+      let repo: Repository
+      beforeEach(async () => {
+        repo = await setupEmptyRepository()
+        writeFile(path.join(repo.path, 'foo.bin'), 'foo\n')
+        writeFile(
+          path.join(repo.path, '.gitattributes'),
+          '*.bin merge=binary\n'
+        )
+        await git(['add', '.'], repo.path, '')
+        await git(['commit', '-m', 'initial'], repo.path, '')
+        await git(['checkout', '-b', 'branch-a'], repo.path, '')
+        await writeFile(path.join(repo.path, 'foo.bin'), 'bar\n')
+        await git(['commit', '-a', '-m', 'second'], repo.path, '')
+        await git(['checkout', '-'], repo.path, '')
+        await writeFile(path.join(repo.path, 'foo.bin'), 'foozball\n')
+        await git(['commit', '-a', '-m', 'third'], repo.path, '')
+        await git(['merge', 'branch-a'], repo.path, '', {
+          expectedErrors: new Set([DugiteError.MergeConflicts]),
+        })
+      })
+      it('includes plain text files using binary driver', async () => {
+        expect(
+          await getBinaryPaths(repo, 'MERGE_HEAD', [
+            {
+              kind: 'entry',
+              path: 'foo.bin',
+              statusCode: 'UU',
+              submoduleStatusCode: '????',
+            },
+          ])
+        ).toEqual(['foo.bin'])
+      })
+    })
+
     describe('in repo with text only files', () => {
       let repo: Repository
       beforeEach(async () => {
@@ -404,7 +444,7 @@ describe('git/diff', () => {
         repo = new Repository(testRepoPath, -1, null, false)
       })
       it('returns an empty array', async () => {
-        expect(await getBinaryPaths(repo, 'HEAD')).toHaveLength(0)
+        expect(await getBinaryPaths(repo, 'HEAD', [])).toHaveLength(0)
       })
     })
     describe('in repo with image changes', () => {
@@ -416,7 +456,7 @@ describe('git/diff', () => {
         repo = new Repository(testRepoPath, -1, null, false)
       })
       it('returns all changed image files', async () => {
-        expect(await getBinaryPaths(repo, 'HEAD')).toEqual([
+        expect(await getBinaryPaths(repo, 'HEAD', [])).toEqual([
           'modified-image.jpg',
           'new-animated-image.gif',
           'new-image.png',
@@ -430,14 +470,235 @@ describe('git/diff', () => {
           'detect-conflict-in-binary-file'
         )
         repo = new Repository(testRepoPath, -1, null, false)
-        await GitProcess.exec(['checkout', 'make-a-change'], repo.path)
-        await GitProcess.exec(['merge', 'master'], repo.path)
+        await exec(['checkout', 'make-a-change'], repo.path)
+        await exec(['merge', 'master'], repo.path)
       })
       it('returns all conflicted image files', async () => {
-        expect(await getBinaryPaths(repo, 'MERGE_HEAD')).toEqual([
+        expect(await getBinaryPaths(repo, 'MERGE_HEAD', [])).toEqual([
           'my-cool-image.png',
         ])
       })
     })
   })
+
+  describe('with submodules', () => {
+    const submoduleRelativePath: string = path.join('foo', 'submodule')
+    let submodulePath: string
+
+    const getSubmoduleDiff = async () => {
+      const status = await getStatusOrThrow(repository)
+      const file = status.workingDirectory.files[0]
+      const diff = await getWorkingDirectoryDiff(repository, file)
+      expect(diff.kind).toBe(DiffType.Submodule)
+
+      return diff as ISubmoduleDiff
+    }
+
+    beforeEach(async () => {
+      const repoPath = await setupFixtureRepository('submodule-basic-setup')
+      repository = new Repository(repoPath, -1, null, false)
+      submodulePath = path.join(repoPath, submoduleRelativePath)
+    })
+
+    it('can get the diff for a submodule with the right paths', async () => {
+      // Just make any change to the submodule to get a diff
+      await FSE.writeFile(path.join(submodulePath, 'README.md'), 'hello\n')
+
+      const diff = await getSubmoduleDiff()
+      expect(diff.fullPath).toBe(submodulePath)
+      // Even on Windows, the path separator is '/' for this specific attribute
+      expect(diff.path).toBe('foo/submodule')
+    })
+
+    it('can get the diff for a submodule with only modified changes', async () => {
+      // Modify README.md file. Now the submodule has modified changes.
+      await FSE.writeFile(path.join(submodulePath, 'README.md'), 'hello\n')
+
+      const diff = await getSubmoduleDiff()
+      expect(diff.oldSHA).toBeNull()
+      expect(diff.newSHA).toBeNull()
+      expect(diff.status).toMatchObject({
+        commitChanged: false,
+        modifiedChanges: true,
+        untrackedChanges: false,
+      })
+    })
+
+    it('can get the diff for a submodule with only untracked changes', async () => {
+      // Create NEW.md file. Now the submodule has untracked changes.
+      await FSE.writeFile(path.join(submodulePath, 'NEW.md'), 'hello\n')
+
+      const diff = await getSubmoduleDiff()
+      expect(diff.oldSHA).toBeNull()
+      expect(diff.newSHA).toBeNull()
+      expect(diff.status).toMatchObject({
+        commitChanged: false,
+        modifiedChanges: false,
+        untrackedChanges: true,
+      })
+    })
+
+    it('can get the diff for a submodule a commit change', async () => {
+      // Make a change and commit it. Now the submodule has a commit change.
+      await FSE.writeFile(path.join(submodulePath, 'README.md'), 'hello\n')
+      await exec(['commit', '-a', '-m', 'test'], submodulePath)
+
+      const diff = await getSubmoduleDiff()
+      expect(diff.oldSHA).not.toBeNull()
+      expect(diff.newSHA).not.toBeNull()
+      expect(diff.status).toMatchObject({
+        commitChanged: true,
+        modifiedChanges: false,
+        untrackedChanges: false,
+      })
+    })
+
+    it('can get the diff for a submodule a all kinds of changes', async () => {
+      await FSE.writeFile(path.join(submodulePath, 'README.md'), 'hello\n')
+      await exec(['commit', '-a', '-m', 'test'], submodulePath)
+      await FSE.writeFile(path.join(submodulePath, 'README.md'), 'bye\n')
+      await FSE.writeFile(path.join(submodulePath, 'NEW.md'), 'new!!\n')
+
+      const diff = await getSubmoduleDiff()
+      expect(diff.oldSHA).not.toBeNull()
+      expect(diff.newSHA).not.toBeNull()
+      expect(diff.status).toMatchObject({
+        commitChanged: true,
+        modifiedChanges: true,
+        untrackedChanges: true,
+      })
+    })
+  })
+
+  describe('getBranchMergeBaseChangedFiles', () => {
+    it('loads the files changed between two branches if merged', async () => {
+      // create feature branch from initial master commit
+      await exec(['branch', 'feature-branch'], repository.path)
+
+      const firstCommit = {
+        entries: [{ path: 'A.md', contents: 'A' }],
+      }
+      await makeCommit(repository, firstCommit)
+
+      // switch to the feature branch and add feature.md and add foo.md
+      await switchTo(repository, 'feature-branch')
+
+      const secondCommit = {
+        entries: [{ path: 'feature.md', contents: 'feature' }],
+      }
+      await makeCommit(repository, secondCommit)
+
+      /*
+        Now, we have:
+
+           B
+        A  |  -- Feature
+        |  /
+        I -- Master
+
+        If we did `git diff master feature`, we would see files changes
+        from just A and B.
+
+        We are testing `git diff --merge-base master feature`, which will
+        display the diff of the resulting merge of `feature` into `master`.
+        Thus, we will see changes from B only.
+      */
+
+      const changesetData = await getBranchMergeBaseChangedFiles(
+        repository,
+        'master',
+        'feature-branch',
+        'irrelevantToTest'
+      )
+
+      expect(changesetData).not.toBeNull()
+      if (changesetData === null) {
+        return
+      }
+
+      expect(changesetData.files).toHaveLength(1)
+      expect(changesetData.files[0].path).toBe('feature.md')
+    })
+
+    it('returns null for unrelated histories', async () => {
+      // create a second branch that's orphaned from our current branch
+      await exec(['checkout', '--orphan', 'orphaned-branch'], repository.path)
+
+      // add a commit to this new branch
+      await exec(
+        ['commit', '--allow-empty', '-m', `first commit on gh-pages`],
+        repository.path
+      )
+
+      const changesetData = await getBranchMergeBaseChangedFiles(
+        repository,
+        'master',
+        'feature-branch',
+        'irrelevantToTest'
+      )
+
+      expect(changesetData).toBeNull()
+    })
+  })
+
+  describe('getBranchMergeBaseDiff', () => {
+    it('loads the diff of a file between two branches if merged', async () => {
+      // Add foo.md to master
+      const fooPath = path.join(repository.path, 'foo.md')
+      await FSE.writeFile(fooPath, 'foo\n')
+      await exec(['commit', '-a', '-m', 'foo'], repository.path)
+
+      // Create feature branch from commit with foo.md
+      await exec(['branch', 'feature-branch'], repository.path)
+
+      // Commit a line "bar" to foo.md on master branch
+      await FSE.appendFile(fooPath, 'bar\n')
+      await exec(['add', fooPath], repository.path)
+      await exec(['commit', '-m', 'A'], repository.path)
+
+      // switch to the feature branch and add feature to foo.md
+      await switchTo(repository, 'feature-branch')
+
+      // Commit a line of "feature" to foo.md on feature branch
+      await FSE.appendFile(fooPath, 'feature\n')
+      await exec(['add', fooPath], repository.path)
+      await exec(['commit', '-m', 'B'], repository.path)
+
+      /*
+        Now, we have:
+
+           B
+        A  |  -- Feature
+        |  /
+        Foo -- Master
+
+        A adds line of "bar" to foo.md
+        B adds line "feature" to foo.md
+
+        If we did `git diff master feature`, we would see both lines
+        "bar" and "feature" added to foo.md
+
+        We are testing `git diff --merge-base master feature`, which will
+        display the diff of the resulting merge of `feature` into `master`.
+        Thus, we will see changes from B only or the line "feature".
+      */
+
+      const diff = await getBranchMergeBaseDiff(
+        repository,
+        new FileChange('foo.md', { kind: AppFileStatusKind.New }),
+        'master',
+        'feature-branch',
+        false,
+        'irrelevantToTest'
+      )
+      expect(diff.kind).toBe(DiffType.Text)
+
+      if (diff.kind !== DiffType.Text) {
+        return
+      }
+
+      expect(diff.text).not.toContain('bar')
+      expect(diff.text).toContain('feature')
+    })
+  })
 })
diff --git a/app/test/unit/git/for-each-ref-test.ts b/app/test/unit/git/for-each-ref-test.ts
index 84191cb485d..9ea92a780fe 100644
--- a/app/test/unit/git/for-each-ref-test.ts
+++ b/app/test/unit/git/for-each-ref-test.ts
@@ -32,7 +32,6 @@ describe('git/for-each-ref', () => {
       expect(commitWithBody.tip.sha).toBe(
         'dfa96676b65e1c0ed43ca25492252a5e384c8efd'
       )
-      expect(commitWithBody.tip.author.name).toBe('Brendan Forster')
 
       const commitNoBody = branches[1]
       expect(commitNoBody.name).toBe('commit-with-no-body')
@@ -40,13 +39,11 @@ describe('git/for-each-ref', () => {
       expect(commitNoBody.tip.sha).toBe(
         '49ec1e05f39eef8d1ab6200331a028fb3dd96828'
       )
-      expect(commitNoBody.tip.author.name).toBe('Brendan Forster')
 
       const master = branches[2]
       expect(master.name).toBe('master')
       expect(master.upstream).toBeNull()
       expect(master.tip.sha).toBe('b9ccfc3307240b86447bca2bd6c51a4bb4ade493')
-      expect(master.tip.author.name).toBe('Brendan Forster')
     })
 
     it('should return empty list for empty repo', async () => {
diff --git a/app/test/unit/git/format-patch-test.ts b/app/test/unit/git/format-patch-test.ts
index d5092f4181e..1959140520b 100644
--- a/app/test/unit/git/format-patch-test.ts
+++ b/app/test/unit/git/format-patch-test.ts
@@ -8,7 +8,7 @@ import {
   cloneLocalRepository,
   makeCommit,
 } from '../../helpers/repository-scaffolding'
-import { GitProcess } from 'dugite'
+import { exec } from 'dugite'
 
 describe('formatPatch', () => {
   describe('in a repo with commits', () => {
@@ -44,7 +44,7 @@ describe('formatPatch', () => {
       })
       it('will be applied cleanly', async () => {
         const patch = await formatPatch(repository, 'HEAD~', 'HEAD')
-        const result = await GitProcess.exec(['apply'], clonedRepository.path, {
+        const result = await exec(['apply'], clonedRepository.path, {
           stdin: patch,
         })
         expect(result).toBeTruthy()
@@ -57,7 +57,7 @@ describe('formatPatch', () => {
     beforeEach(async () => {
       const path = await setupFixtureRepository('repository-with-105-commits')
       repository = new Repository(path, -1, null, false)
-      const { stdout } = await GitProcess.exec(
+      const { stdout } = await exec(
         ['rev-list', '--max-parents=0', 'HEAD'],
         path
       )
diff --git a/app/test/unit/git/gitignore-test.ts b/app/test/unit/git/gitignore-test.ts
index 9ddc1cf16c9..7d810a21b5b 100644
--- a/app/test/unit/git/gitignore-test.ts
+++ b/app/test/unit/git/gitignore-test.ts
@@ -1,6 +1,6 @@
 import * as FSE from 'fs-extra'
 import * as Path from 'path'
-import { GitProcess } from 'dugite'
+import { exec } from 'dugite'
 
 import { setupEmptyRepository } from '../../helpers/repositories'
 import { getStatusOrThrow } from '../../helpers/status'
@@ -48,9 +48,9 @@ describe('gitignore', () => {
       const { path } = repo
 
       await saveGitIgnore(repo, 'node_modules')
-      await GitProcess.exec(['add', '.gitignore'], path)
+      await exec(['add', '.gitignore'], path)
 
-      const commit = await GitProcess.exec(
+      const commit = await exec(
         ['commit', '-m', 'create the ignore file'],
         path
       )
@@ -73,9 +73,9 @@ describe('gitignore', () => {
       const { path } = repo
 
       await saveGitIgnore(repo, 'node_modules')
-      await GitProcess.exec(['add', '.gitignore'], path)
+      await exec(['add', '.gitignore'], path)
 
-      const commit = await GitProcess.exec(
+      const commit = await exec(
         ['commit', '-m', 'create the ignore file'],
         path
       )
@@ -117,8 +117,8 @@ describe('gitignore', () => {
       const path = repo.path
 
       await saveGitIgnore(repo, '*.txt\n')
-      await GitProcess.exec(['add', '.gitignore'], path)
-      await GitProcess.exec(['commit', '-m', 'create the ignore file'], path)
+      await exec(['add', '.gitignore'], path)
+      await exec(['commit', '-m', 'create the ignore file'], path)
 
       // Create a txt file
       const file = Path.join(repo.path, 'a.txt')
diff --git a/app/test/unit/git/lfs-test.ts b/app/test/unit/git/lfs-test.ts
index 0ae47412a9b..535c25ba166 100644
--- a/app/test/unit/git/lfs-test.ts
+++ b/app/test/unit/git/lfs-test.ts
@@ -6,7 +6,7 @@ import {
   setupEmptyRepository,
 } from '../../helpers/repositories'
 import { Repository } from '../../../src/models/repository'
-import { GitProcess } from 'dugite'
+import { exec } from 'dugite'
 import {
   isUsingLFS,
   isTrackedByLFS,
@@ -27,7 +27,7 @@ describe('git-lfs', () => {
       const path = await setupFixtureRepository('test-repo')
       const repository = new Repository(path, -1, null, false)
 
-      await GitProcess.exec(['lfs', 'track', '*.psd'], repository.path)
+      await exec(['lfs', 'track', '*.psd'], repository.path)
 
       const usingLFS = await isUsingLFS(repository)
       expect(usingLFS).toBe(true)
@@ -53,7 +53,7 @@ describe('git-lfs', () => {
       const readme = Path.join(repository.path, file)
       await writeFile(readme, 'Hello world!')
 
-      await GitProcess.exec(['lfs', 'track', '*.md'], repository.path)
+      await exec(['lfs', 'track', '*.md'], repository.path)
 
       const found = await isTrackedByLFS(repository, file)
       expect(found).toBe(true)
@@ -67,7 +67,7 @@ describe('git-lfs', () => {
       const readme = Path.join(repository.path, file)
       await writeFile(readme, 'Hello world!')
 
-      await GitProcess.exec(['lfs', 'track', '*.md'], repository.path)
+      await exec(['lfs', 'track', '*.md'], repository.path)
 
       const found = await isTrackedByLFS(repository, file)
       expect(found).toBe(true)
@@ -77,7 +77,7 @@ describe('git-lfs', () => {
   describe('filesNotTrackedByLFS', () => {
     it('returns files not listed in Git LFS', async () => {
       const repository = await setupEmptyRepository()
-      await GitProcess.exec(['lfs', 'track', '*.md'], repository.path)
+      await exec(['lfs', 'track', '*.md'], repository.path)
 
       const videoFile = 'some-video-file.mp4'
 
@@ -89,7 +89,7 @@ describe('git-lfs', () => {
 
     it('skips files that are tracked by Git LFS', async () => {
       const repository = await setupEmptyRepository()
-      await GitProcess.exec(['lfs', 'track', '*.png'], repository.path)
+      await exec(['lfs', 'track', '*.png'], repository.path)
 
       const photoFile = 'some-cool-photo.png'
 
@@ -100,7 +100,7 @@ describe('git-lfs', () => {
 
     it('skips files in a subfolder that are tracked', async () => {
       const repository = await setupEmptyRepository()
-      await GitProcess.exec(['lfs', 'track', '*.png'], repository.path)
+      await exec(['lfs', 'track', '*.png'], repository.path)
 
       const photoFileInDirectory = 'app/src/some-cool-photo.png'
       const notFound = await filesNotTrackedByLFS(repository, [
@@ -112,7 +112,7 @@ describe('git-lfs', () => {
 
     it('skips files in a subfolder where the rule only covers the subdirectory', async () => {
       const repository = await setupEmptyRepository()
-      await GitProcess.exec(['lfs', 'track', 'app/src/*.png'], repository.path)
+      await exec(['lfs', 'track', 'app/src/*.png'], repository.path)
 
       const photoFileInDirectory = 'app/src/some-cool-photo.png'
       const notFound = await filesNotTrackedByLFS(repository, [
diff --git a/app/test/unit/git/log-test.ts b/app/test/unit/git/log-test.ts
index f04a2c4d06c..ee8a758375d 100644
--- a/app/test/unit/git/log-test.ts
+++ b/app/test/unit/git/log-test.ts
@@ -83,6 +83,8 @@ describe('git/log', () => {
       expect(first.files[0].status).toEqual({
         kind: AppFileStatusKind.Renamed,
         oldPath: 'NEW.md',
+        renameIncludesModifications: true,
+        submoduleStatus: undefined,
       })
 
       const second = await getChangedFiles(repository, 'c898ca8')
@@ -92,6 +94,8 @@ describe('git/log', () => {
       expect(second.files[0].status).toEqual({
         kind: AppFileStatusKind.Renamed,
         oldPath: 'OLD.md',
+        renameIncludesModifications: false,
+        submoduleStatus: undefined,
       })
     })
 
@@ -111,12 +115,16 @@ describe('git/log', () => {
       expect(changesetData.files[0].status).toEqual({
         kind: AppFileStatusKind.Copied,
         oldPath: 'initial.md',
+        renameIncludesModifications: false,
+        submoduleStatus: undefined,
       })
 
       expect(changesetData.files[1].path).toBe('duplicate.md')
       expect(changesetData.files[1].status).toEqual({
         kind: AppFileStatusKind.Copied,
         oldPath: 'initial.md',
+        renameIncludesModifications: false,
+        submoduleStatus: undefined,
       })
     })
 
@@ -129,4 +137,14 @@ describe('git/log', () => {
       )
     })
   })
+
+  it('detects submodule changes within commits', async () => {
+    const repoPath = await setupFixtureRepository('submodule-basic-setup')
+    repository = new Repository(repoPath, -1, null, false)
+
+    const changesetData = await getChangedFiles(repository, 'HEAD')
+    expect(changesetData.files).toHaveLength(2)
+    expect(changesetData.files[1].path).toBe('foo/submodule')
+    expect(changesetData.files[1].status.submoduleStatus).not.toBeUndefined()
+  })
 })
diff --git a/app/test/unit/git/merge-test.ts b/app/test/unit/git/merge-test.ts
index 2b45457fbf0..e5d5615a431 100644
--- a/app/test/unit/git/merge-test.ts
+++ b/app/test/unit/git/merge-test.ts
@@ -10,7 +10,7 @@ import {
   setupFixtureRepository,
   setupConflictedRepo,
 } from '../../helpers/repositories'
-import { GitProcess } from 'dugite'
+import { exec } from 'dugite'
 import { Repository } from '../../../src/models/repository'
 
 describe('git/merge', () => {
@@ -65,19 +65,16 @@ describe('git/merge', () => {
       const secondBranch = 'gh-pages'
 
       // create the first commit
-      await GitProcess.exec(
+      await exec(
         ['commit', '--allow-empty', '-m', `first commit on master`],
         repository.path
       )
 
       // create a second branch that's orphaned from our current branch
-      await GitProcess.exec(
-        ['checkout', '--orphan', secondBranch],
-        repository.path
-      )
+      await exec(['checkout', '--orphan', secondBranch], repository.path)
 
       // add a commit to this new branch
-      await GitProcess.exec(
+      await exec(
         ['commit', '--allow-empty', '-m', `first commit on gh-pages`],
         repository.path
       )
@@ -101,7 +98,7 @@ describe('git/merge', () => {
       const repository = await setupEmptyRepository()
 
       // create the first commit
-      await GitProcess.exec(
+      await exec(
         ['commit', '--allow-empty', '-m', `first commit on master`],
         repository.path
       )
diff --git a/app/test/unit/git/parse-merge-result-test.ts b/app/test/unit/git/parse-merge-result-test.ts
deleted file mode 100644
index d9a2066a1e6..00000000000
--- a/app/test/unit/git/parse-merge-result-test.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import * as Path from 'path'
-import * as glob from 'glob'
-
-import { MergeTreeError } from '../../../src/models/merge'
-import { ComputedAction } from '../../../src/models/computed-action'
-import { parseMergeTreeResult } from '../../../src/lib/git/merge-tree'
-import { createReadStream } from 'fs'
-
-const fixturePath = (...pathComponents: string[]) =>
-  Path.join(__dirname, '../../fixtures/merge-parser/', ...pathComponents)
-
-const loadMergeTreeOutputs = (context: string) =>
-  glob.sync(fixturePath(context, 'merge-*.txt'))
-
-function extractBranchNames(path: string): { ours: string; theirs: string } {
-  const match = /merge\-(.*)\-into\-(.*).txt/.exec(Path.basename(path))
-
-  if (match && match.length === 3) {
-    return { ours: match[2], theirs: match[1] }
-  }
-
-  throw new Error(`Wrong path for test setup: ${path}`)
-}
-
-describe('parseMergeResult', () => {
-  it('can process a successful merge result', async () => {
-    const path = fixturePath(
-      'desktop',
-      'valid-merge-master-into-script-upgrade.txt'
-    )
-    const result = await parseMergeTreeResult(createReadStream(path))
-    expect(result.kind).toBe(ComputedAction.Clean)
-  })
-
-  it('can report on merge conflicts', async () => {
-    const path = fixturePath(
-      'desktop',
-      'failed-merge-stale-branch-into-master.txt'
-    )
-    const result = await parseMergeTreeResult(createReadStream(path))
-    expect(result.kind).toBe(ComputedAction.Conflicts)
-    expect((result as MergeTreeError).conflictedFiles).toBe(1)
-  })
-
-  const repos = ['desktop/desktop', 'electron/electron', 'microsoft/vscode']
-  for (const repo of repos) {
-    describe(repo, () => {
-      for (const f of loadMergeTreeOutputs(Path.basename(repo))) {
-        const { ours, theirs } = extractBranchNames(f)
-
-        it(`can parse conflicts from merging ${theirs} into ${ours}`, async () => {
-          const result = await parseMergeTreeResult(createReadStream(f))
-          expect(result.kind).toBe(ComputedAction.Conflicts)
-          expect((result as MergeTreeError).conflictedFiles).toBeGreaterThan(0)
-        })
-      }
-    })
-  }
-})
diff --git a/app/test/unit/git/pull/ahead-and-behind-test.ts b/app/test/unit/git/pull/ahead-and-behind-test.ts
index 04e595135bc..cc262ac96bb 100644
--- a/app/test/unit/git/pull/ahead-and-behind-test.ts
+++ b/app/test/unit/git/pull/ahead-and-behind-test.ts
@@ -52,7 +52,7 @@ describe('git/pull', () => {
       }
 
       await makeCommit(repository, changesForLocalRepository)
-      await fetch(repository, null, remote)
+      await fetch(repository, remote)
     })
 
     describe('with pull.rebase=false and pull.ff=false set in config', () => {
@@ -67,7 +67,7 @@ describe('git/pull', () => {
 
         previousTip = await getTipOrError(repository)
 
-        await pull(repository, null, remote)
+        await pull(repository, remote)
 
         newTip = await getTipOrError(repository)
       })
@@ -102,7 +102,7 @@ describe('git/pull', () => {
 
         previousTip = await getTipOrError(repository)
 
-        await pull(repository, null, remote)
+        await pull(repository, remote)
 
         newTip = await getTipOrError(repository)
       })
@@ -132,7 +132,7 @@ describe('git/pull', () => {
 
         previousTip = await getTipOrError(repository)
 
-        await pull(repository, null, remote)
+        await pull(repository, remote)
 
         newTip = await getTipOrError(repository)
       })
@@ -162,7 +162,7 @@ describe('git/pull', () => {
       })
 
       it(`throws an error as the user blocks merge commits on pull`, () => {
-        expect(pull(repository, null, remote)).rejects.toThrow()
+        expect(pull(repository, remote)).rejects.toThrow()
       })
     })
   })
diff --git a/app/test/unit/git/pull/only-ahead-test.ts b/app/test/unit/git/pull/only-ahead-test.ts
index a09020445a1..363d4e0c0cd 100644
--- a/app/test/unit/git/pull/only-ahead-test.ts
+++ b/app/test/unit/git/pull/only-ahead-test.ts
@@ -40,7 +40,7 @@ describe('git/pull', () => {
       }
 
       await makeCommit(repository, changesForLocalRepository)
-      await fetch(repository, null, remote)
+      await fetch(repository, remote)
     })
 
     describe('by default', () => {
@@ -50,7 +50,7 @@ describe('git/pull', () => {
       beforeEach(async () => {
         previousTip = await getTipOrError(repository)
 
-        await pull(repository, null, remote)
+        await pull(repository, remote)
 
         newTip = await getTipOrError(repository)
       })
@@ -85,7 +85,7 @@ describe('git/pull', () => {
 
         previousTip = await getTipOrError(repository)
 
-        await pull(repository, null, remote)
+        await pull(repository, remote)
 
         newTip = await getTipOrError(repository)
       })
@@ -119,7 +119,7 @@ describe('git/pull', () => {
 
         previousTip = await getTipOrError(repository)
 
-        await pull(repository, null, remote)
+        await pull(repository, remote)
 
         newTip = await getTipOrError(repository)
       })
diff --git a/app/test/unit/git/pull/only-behind-test.ts b/app/test/unit/git/pull/only-behind-test.ts
index d02dec88430..cf9b66a48cd 100644
--- a/app/test/unit/git/pull/only-behind-test.ts
+++ b/app/test/unit/git/pull/only-behind-test.ts
@@ -52,7 +52,7 @@ describe('git/pull', () => {
       await makeCommit(remoteRepository, firstCommit)
       await makeCommit(remoteRepository, secondCommit)
 
-      await fetch(repository, null, remote)
+      await fetch(repository, remote)
     })
 
     describe('with pull.rebase=false and pull.ff=false set in config', () => {
@@ -67,7 +67,7 @@ describe('git/pull', () => {
 
         previousTip = await getTipOrError(repository)
 
-        await pull(repository, null, remote)
+        await pull(repository, remote)
 
         newTip = await getTipOrError(repository)
       })
@@ -102,7 +102,7 @@ describe('git/pull', () => {
 
         previousTip = await getTipOrError(repository)
 
-        await pull(repository, null, remote)
+        await pull(repository, remote)
 
         newTip = await getTipOrError(repository)
       })
diff --git a/app/test/unit/git/rebase/detect-conflict-test.ts b/app/test/unit/git/rebase/detect-conflict-test.ts
index db928f9e157..daa1204b55a 100644
--- a/app/test/unit/git/rebase/detect-conflict-test.ts
+++ b/app/test/unit/git/rebase/detect-conflict-test.ts
@@ -1,4 +1,4 @@
-import { GitProcess } from 'dugite'
+import { exec } from 'dugite'
 import * as FSE from 'fs-extra'
 import * as Path from 'path'
 
@@ -186,10 +186,7 @@ describe('git/rebase', () => {
 
       const { files } = afterRebase.workingDirectory
 
-      const diffCheckBefore = await GitProcess.exec(
-        ['diff', '--check'],
-        repository.path
-      )
+      const diffCheckBefore = await exec(['diff', '--check'], repository.path)
 
       expect(diffCheckBefore.exitCode).toBeGreaterThan(0)
 
@@ -204,10 +201,7 @@ describe('git/rebase', () => {
         '# HELLO WORLD! \nTHINGS GO HERE\nALSO FEATURE BRANCH UNDERWAY\n'
       )
 
-      const diffCheckAfter = await GitProcess.exec(
-        ['diff', '--check'],
-        repository.path
-      )
+      const diffCheckAfter = await exec(['diff', '--check'], repository.path)
 
       expect(diffCheckAfter.exitCode).toEqual(0)
 
diff --git a/app/test/unit/git/reflog-test.ts b/app/test/unit/git/reflog-test.ts
index c9623106144..121dedeabdb 100644
--- a/app/test/unit/git/reflog-test.ts
+++ b/app/test/unit/git/reflog-test.ts
@@ -8,7 +8,7 @@ import {
   getBranchCheckouts,
 } from '../../../src/lib/git'
 import { setupFixtureRepository } from '../../helpers/repositories'
-import { GitProcess } from 'dugite'
+import { exec } from 'dugite'
 import { offsetFromNow } from '../../../src/lib/offset-from'
 
 async function createAndCheckout(
@@ -20,7 +20,7 @@ async function createAndCheckout(
   if (branch === undefined) {
     throw new Error(`Unable to create branch: ${name}`)
   }
-  await checkoutBranch(repository, null, branch)
+  await checkoutBranch(repository, branch, null)
 }
 
 describe('git/reflog', () => {
@@ -96,7 +96,7 @@ describe('git/reflog', () => {
     })
 
     it('returns empty when current branch is orphaned', async () => {
-      const result = await GitProcess.exec(
+      const result = await exec(
         ['checkout', '--orphan', 'orphan-branch'],
         repository.path
       )
diff --git a/app/test/unit/git/remote-test.ts b/app/test/unit/git/remote-test.ts
index 4ccfe6572d4..9521fc8de03 100644
--- a/app/test/unit/git/remote-test.ts
+++ b/app/test/unit/git/remote-test.ts
@@ -11,7 +11,8 @@ import {
   setupEmptyDirectory,
 } from '../../helpers/repositories'
 import { findDefaultRemote } from '../../../src/lib/stores/helpers/find-default-remote'
-import { GitProcess } from 'dugite'
+import { exec } from 'dugite'
+import { setConfigValue } from '../../../src/lib/git'
 
 describe('git/remote', () => {
   describe('getRemotes', () => {
@@ -20,6 +21,7 @@ describe('git/remote', () => {
         'repo-with-multiple-remotes'
       )
       const repository = new Repository(testRepoPath, -1, null, false)
+      await addRemote(repository, 'spaces-in-path', '/path/with spaces/foo')
 
       // NB: We don't check for exact URL equality because CircleCI's git config
       // rewrites HTTPS URLs to SSH.
@@ -27,11 +29,18 @@ describe('git/remote', () => {
 
       const result = await getRemotes(repository)
 
+      // Changes the output of git remote -v, see
+      // https://github.com/git/git/blob/9005149a4a77e2d3409c6127bf4fd1a0893c3495/builtin/remote.c#L1223-L1226
+      setConfigValue(repository, 'remote.bassoon.partialclonefilter', 'foo')
+
       expect(result[0].name).toEqual('bassoon')
       expect(result[0].url.endsWith(nwo)).toEqual(true)
 
       expect(result[1].name).toEqual('origin')
       expect(result[1].url.endsWith(nwo)).toEqual(true)
+
+      expect(result[2].name).toEqual('spaces-in-path')
+      expect(result[2].url).toEqual('/path/with spaces/foo')
     })
 
     it('returns remotes sorted alphabetically', async () => {
@@ -40,11 +49,11 @@ describe('git/remote', () => {
       // adding these remotes out-of-order to test how they are then retrieved
       const url = 'https://github.com/desktop/not-found.git'
 
-      await GitProcess.exec(['remote', 'add', 'X', url], repository.path)
-      await GitProcess.exec(['remote', 'add', 'A', url], repository.path)
-      await GitProcess.exec(['remote', 'add', 'L', url], repository.path)
-      await GitProcess.exec(['remote', 'add', 'T', url], repository.path)
-      await GitProcess.exec(['remote', 'add', 'D', url], repository.path)
+      await exec(['remote', 'add', 'X', url], repository.path)
+      await exec(['remote', 'add', 'A', url], repository.path)
+      await exec(['remote', 'add', 'L', url], repository.path)
+      await exec(['remote', 'add', 'T', url], repository.path)
+      await exec(['remote', 'add', 'D', url], repository.path)
 
       const result = await getRemotes(repository)
       expect(result).toHaveLength(5)
@@ -61,6 +70,26 @@ describe('git/remote', () => {
       const remotes = await getRemotes(repository)
       expect(remotes).toHaveLength(0)
     })
+
+    it('returns promisor remote', async () => {
+      const repository = await setupEmptyRepository()
+
+      // Add a remote
+      const url = 'https://github.com/desktop/not-found.git'
+      await exec(['remote', 'add', 'hasBlobFilter', url], repository.path)
+
+      // Fetch a remote and add a filter
+      await exec(['fetch', '--filter=blob:none'], repository.path)
+
+      // Shows that the new remote does have a filter
+      const rawGetRemote = await exec(['remote', '-v'], repository.path)
+      expect(rawGetRemote.stdout).toContain(url + ' (fetch) [blob:none]')
+
+      // Shows that the `getRemote` returns that remote
+      const result = await getRemotes(repository)
+      expect(result).toHaveLength(1)
+      expect(result[0].name).toEqual('hasBlobFilter')
+    })
   })
 
   describe('findDefaultRemote', () => {
diff --git a/app/test/unit/git/reorder-test.ts b/app/test/unit/git/reorder-test.ts
index f8a06c87c42..65e0d20a270 100644
--- a/app/test/unit/git/reorder-test.ts
+++ b/app/test/unit/git/reorder-test.ts
@@ -11,7 +11,7 @@ import { Commit } from '../../../src/models/commit'
 import { Repository } from '../../../src/models/repository'
 import { setupEmptyRepositoryDefaultMain } from '../../helpers/repositories'
 import { makeCommit } from '../../helpers/repository-scaffolding'
-import { GitProcess } from 'dugite'
+import { exec } from 'dugite'
 import { getStatusOrThrow } from '../../helpers/status'
 import { getTempFilePath } from '../../../src/lib/file-system'
 import { reorder } from '../../../src/lib/git/reorder'
@@ -139,7 +139,7 @@ describe('git/reorder', () => {
     let { files } = status.workingDirectory
 
     // resolve conflicts by adding the conflicting file
-    await GitProcess.exec(
+    await exec(
       ['add', Path.join(repository.path, 'second.md')],
       repository.path
     )
diff --git a/app/test/unit/git/reset-test.ts b/app/test/unit/git/reset-test.ts
index 32ef18d37cb..22c7ca2c549 100644
--- a/app/test/unit/git/reset-test.ts
+++ b/app/test/unit/git/reset-test.ts
@@ -4,7 +4,7 @@ import { Repository } from '../../../src/models/repository'
 import { reset, resetPaths, GitResetMode } from '../../../src/lib/git/reset'
 import { getStatusOrThrow } from '../../helpers/status'
 import { setupFixtureRepository } from '../../helpers/repositories'
-import { GitProcess } from 'dugite'
+import { exec } from 'dugite'
 
 import * as FSE from 'fs-extra'
 
@@ -41,16 +41,13 @@ describe('git/reset', () => {
       await FSE.writeFile(filePath, 'Hi world\n')
 
       // stage the file, then delete it to mimic discarding
-      GitProcess.exec(['add', fileName], repoPath)
+      exec(['add', fileName], repoPath)
       await FSE.unlink(filePath)
 
       await resetPaths(repository, GitResetMode.Mixed, 'HEAD', [filePath])
 
       // then checkout the version from the index to restore it
-      await GitProcess.exec(
-        ['checkout-index', '-f', '-u', '-q', '--', fileName],
-        repoPath
-      )
+      await exec(['checkout-index', '-f', '-u', '-q', '--', fileName], repoPath)
 
       const status = await getStatusOrThrow(repository)
       expect(status.workingDirectory.files).toHaveLength(0)
diff --git a/app/test/unit/git/rev-parse-test.ts b/app/test/unit/git/rev-parse-test.ts
index 6e99e01e7cd..85adb2dabac 100644
--- a/app/test/unit/git/rev-parse-test.ts
+++ b/app/test/unit/git/rev-parse-test.ts
@@ -9,8 +9,9 @@ import {
   setupFixtureRepository,
   setupEmptyRepository,
 } from '../../helpers/repositories'
-import { GitProcess } from 'dugite'
+import { exec } from 'dugite'
 import { mkdirSync } from '../../helpers/temp'
+import { writeFile } from 'fs-extra'
 
 describe('git/rev-parse', () => {
   let repository: Repository
@@ -56,7 +57,16 @@ describe('git/rev-parse', () => {
         secondRepoPath,
         ''
       )
-      await git(['submodule', 'add', '../repo2'], firstRepoPath, '')
+
+      await git(
+        [
+          // Git 2.38 (backported into 2.35.5) changed the default here to 'user'
+          ...['-c', 'protocol.file.allow=always'],
+          ...['submodule', 'add', '../repo2'],
+        ],
+        firstRepoPath,
+        ''
+      )
 
       expect(await getRepositoryType(firstRepoPath)).toMatchObject({
         kind: 'regular',
@@ -80,7 +90,7 @@ describe('git/rev-parse', () => {
 
     it('returns bare for initialized bare repository', async () => {
       const path = mkdirSync('no-repository-here')
-      await GitProcess.exec(['init', '--bare'], path)
+      await exec(['init', '--bare'], path)
       expect(await getRepositoryType(path)).toMatchObject({
         kind: 'bare',
       })
@@ -101,5 +111,33 @@ describe('git/rev-parse', () => {
         kind: 'missing',
       })
     })
+
+    it('returns unsafe for unsafe repository', async () => {
+      const previousHomeValue = process.env['HOME']
+
+      // Creating a stub global config so we can unset safe.directory config
+      // which will supersede any system config that might set * to ignore
+      // warnings about a different owner
+      //
+      // This is because safe.directory setting is ignored if found in local
+      // config, environment variables or command line arguments.
+      const testHomeDirectory = mkdirSync('test-home-directory')
+      const gitConfigPath = path.join(testHomeDirectory, '.gitconfig')
+      await writeFile(
+        gitConfigPath,
+        `[safe]
+directory=`
+      )
+
+      process.env['HOME'] = testHomeDirectory
+      process.env['GIT_TEST_ASSUME_DIFFERENT_OWNER'] = '1'
+
+      expect(await getRepositoryType(repository.path)).toMatchObject({
+        kind: 'unsafe',
+      })
+
+      process.env['GIT_TEST_ASSUME_DIFFERENT_OWNER'] = undefined
+      process.env['HOME'] = previousHomeValue
+    })
   })
 })
diff --git a/app/test/unit/git/squash-test.ts b/app/test/unit/git/squash-test.ts
index fb0bfefe055..abf902a44f1 100644
--- a/app/test/unit/git/squash-test.ts
+++ b/app/test/unit/git/squash-test.ts
@@ -13,7 +13,7 @@ import { Repository } from '../../../src/models/repository'
 import { setupEmptyRepositoryDefaultMain } from '../../helpers/repositories'
 import { makeCommit } from '../../helpers/repository-scaffolding'
 import { squash } from '../../../src/lib/git/squash'
-import { GitProcess } from 'dugite'
+import { exec } from 'dugite'
 import { getStatusOrThrow } from '../../helpers/status'
 import { getTempFilePath } from '../../../src/lib/file-system'
 
@@ -224,7 +224,7 @@ describe('git/cherry-pick', () => {
     let { files } = status.workingDirectory
 
     // resolve conflicts by adding the conflicting file
-    await GitProcess.exec(
+    await exec(
       ['add', Path.join(repository.path, 'second.md')],
       repository.path
     )
diff --git a/app/test/unit/git/stash-test.ts b/app/test/unit/git/stash-test.ts
index 3dfbfb8f84d..953cbfa887f 100644
--- a/app/test/unit/git/stash-test.ts
+++ b/app/test/unit/git/stash-test.ts
@@ -2,7 +2,7 @@ import * as FSE from 'fs-extra'
 import * as path from 'path'
 import { Repository } from '../../../src/models/repository'
 import { setupEmptyRepository } from '../../helpers/repositories'
-import { GitProcess } from 'dugite'
+import { exec } from 'dugite'
 import {
   createDesktopStashMessage,
   createDesktopStashEntry,
@@ -28,8 +28,8 @@ describe('git/stash', () => {
       repository = await setupEmptyRepository()
       readme = path.join(repository.path, 'README.md')
       await FSE.writeFile(readme, '')
-      await GitProcess.exec(['add', 'README.md'], repository.path)
-      await GitProcess.exec(['commit', '-m', 'initial commit'], repository.path)
+      await exec(['add', 'README.md'], repository.path)
+      await exec(['commit', '-m', 'initial commit'], repository.path)
     })
 
     it('handles unborn repo by returning empty list', async () => {
@@ -67,8 +67,8 @@ describe('git/stash', () => {
       repository = await setupEmptyRepository()
       readme = path.join(repository.path, 'README.md')
       await FSE.writeFile(readme, '')
-      await GitProcess.exec(['add', 'README.md'], repository.path)
-      await GitProcess.exec(['commit', '-m', 'initial commit'], repository.path)
+      await exec(['add', 'README.md'], repository.path)
+      await exec(['commit', '-m', 'initial commit'], repository.path)
     })
 
     it('creates a stash entry when repo is not unborn or in any kind of conflict or rebase state', async () => {
@@ -114,8 +114,8 @@ describe('git/stash', () => {
       repository = await setupEmptyRepository()
       readme = path.join(repository.path, 'README.md')
       await FSE.writeFile(readme, '')
-      await GitProcess.exec(['add', 'README.md'], repository.path)
-      await GitProcess.exec(['commit', '-m', 'initial commit'], repository.path)
+      await exec(['add', 'README.md'], repository.path)
+      await exec(['commit', '-m', 'initial commit'], repository.path)
     })
 
     it('returns null when no stash entries exist for branch', async () => {
@@ -166,8 +166,8 @@ describe('git/stash', () => {
       repository = await setupEmptyRepository()
       readme = path.join(repository.path, 'README.md')
       await FSE.writeFile(readme, '')
-      await GitProcess.exec(['add', 'README.md'], repository.path)
-      await GitProcess.exec(['commit', '-m', 'initial commit'], repository.path)
+      await exec(['add', 'README.md'], repository.path)
+      await exec(['commit', '-m', 'initial commit'], repository.path)
     })
 
     it('removes the entry identified by `stashSha`', async () => {
@@ -195,6 +195,8 @@ describe('git/stash', () => {
         name: 'refs/stash@{0}',
         branchName: 'master',
         stashSha: 'xyz',
+        tree: 'xyz',
+        parents: ['abc'],
         files: { kind: StashedChangesLoadStates.NotLoaded },
       }
 
@@ -213,6 +215,8 @@ describe('git/stash', () => {
         name: 'refs/stash@{4}',
         branchName: 'master',
         stashSha: 'xyz',
+        tree: 'xyz',
+        parents: ['abc'],
         files: { kind: StashedChangesLoadStates.NotLoaded },
       }
       await generateTestStashEntry(repository, 'master', true)
@@ -237,8 +241,8 @@ describe('git/stash', () => {
       repository = await setupEmptyRepository()
       readme = path.join(repository.path, 'README.md')
       await FSE.writeFile(readme, '')
-      await GitProcess.exec(['add', 'README.md'], repository.path)
-      await GitProcess.exec(['commit', '-m', 'initial commit'], repository.path)
+      await exec(['add', 'README.md'], repository.path)
+      await exec(['commit', '-m', 'initial commit'], repository.path)
     })
     describe('without any conflicts', () => {
       it('restores changes back to the working directory', async () => {
@@ -269,10 +273,7 @@ describe('git/stash', () => {
 
         const readme = path.join(repository.path, 'README.md')
         await FSE.appendFile(readme, generateString())
-        await GitProcess.exec(
-          ['commit', '-am', 'later commit'],
-          repository.path
-        )
+        await exec(['commit', '-am', 'later commit'], repository.path)
 
         let status = await getStatusOrThrow(repository)
         let files = status.workingDirectory.files
@@ -321,7 +322,7 @@ async function stash(
   branchName: string,
   message: string | null
 ): Promise<void> {
-  const result = await GitProcess.exec(
+  const result = await exec(
     ['stash', 'push', '-m', message || createDesktopStashMessage(branchName)],
     repository.path
   )
diff --git a/app/test/unit/git/status-test.ts b/app/test/unit/git/status-test.ts
index 7e4d4332f2c..40c5d498f2b 100644
--- a/app/test/unit/git/status-test.ts
+++ b/app/test/unit/git/status-test.ts
@@ -1,6 +1,6 @@
 import * as path from 'path'
 import * as FSE from 'fs-extra'
-import { GitProcess } from 'dugite'
+import { exec } from 'dugite'
 
 import { Repository } from '../../../src/models/repository'
 
@@ -108,25 +108,19 @@ describe('git/status', () => {
         const repository = await setupEmptyRepository()
         const readme = path.join(repository.path, 'README.md')
         await FSE.writeFile(readme, '')
-        await GitProcess.exec(['add', 'README.md'], repository.path)
-        await GitProcess.exec(
-          ['commit', '-m', 'initial commit'],
-          repository.path
-        )
+        await exec(['add', 'README.md'], repository.path)
+        await exec(['commit', '-m', 'initial commit'], repository.path)
 
         // write a change to the readme into the stash
         await FSE.appendFile(readme, generateString())
-        await GitProcess.exec(['stash'], repository.path)
+        await exec(['stash'], repository.path)
 
         // write a different change to the README and commit it
         await FSE.appendFile(readme, generateString())
-        await GitProcess.exec(
-          ['commit', '-am', 'later commit'],
-          repository.path
-        )
+        await exec(['commit', '-am', 'later commit'], repository.path)
 
         // pop the stash to introduce a conflict into the index
-        await GitProcess.exec(['stash', 'pop'], repository.path)
+        await exec(['stash', 'pop'], repository.path)
 
         const status = await getStatusOrThrow(repository)
         const files = status.workingDirectory.files
@@ -170,13 +164,13 @@ describe('git/status', () => {
           'detect-conflict-in-binary-file'
         )
         repository = new Repository(path, -1, null, false)
-        await GitProcess.exec(['checkout', 'make-a-change'], repository.path)
+        await exec(['checkout', 'make-a-change'], repository.path)
       })
 
       it('parses conflicted image file on merge', async () => {
         const repo = repository
 
-        await GitProcess.exec(['merge', 'master'], repo.path)
+        await exec(['merge', 'master'], repo.path)
 
         const status = await getStatusOrThrow(repo)
         const files = status.workingDirectory.files
@@ -192,10 +186,10 @@ describe('git/status', () => {
       it('parses conflicted image file on merge after removing', async () => {
         const repo = repository
 
-        await GitProcess.exec(['rm', 'my-cool-image.png'], repo.path)
-        await GitProcess.exec(['commit', '-am', 'removed the image'], repo.path)
+        await exec(['rm', 'my-cool-image.png'], repo.path)
+        await exec(['commit', '-am', 'removed the image'], repo.path)
 
-        await GitProcess.exec(['merge', 'master'], repo.path)
+        await exec(['merge', 'master'], repo.path)
 
         const status = await getStatusOrThrow(repo)
         const files = status.workingDirectory.files
@@ -241,9 +235,9 @@ describe('git/status', () => {
 
         await FSE.writeFile(path.join(repo.path, 'foo'), 'foo\n')
 
-        await GitProcess.exec(['add', 'foo'], repo.path)
-        await GitProcess.exec(['commit', '-m', 'Initial commit'], repo.path)
-        await GitProcess.exec(['mv', 'foo', 'bar'], repo.path)
+        await exec(['add', 'foo'], repo.path)
+        await exec(['commit', '-m', 'Initial commit'], repo.path)
+        await exec(['mv', 'foo', 'bar'], repo.path)
 
         const status = await getStatusOrThrow(repo)
         const files = status.workingDirectory.files
@@ -253,6 +247,8 @@ describe('git/status', () => {
         expect(files[0].status).toEqual({
           kind: AppFileStatusKind.Renamed,
           oldPath: 'foo',
+          renameIncludesModifications: false,
+          submoduleStatus: undefined,
         })
       })
 
@@ -267,7 +263,7 @@ describe('git/status', () => {
         // not enable this by default.
         await setupLocalConfig(repository, [['status.renames', 'copies']])
 
-        await GitProcess.exec(['add', '.'], repository.path)
+        await exec(['add', '.'], repository.path)
 
         const status = await getStatusOrThrow(repository)
         const files = status.workingDirectory.files
@@ -281,6 +277,8 @@ describe('git/status', () => {
         expect(files[1].status).toEqual({
           kind: AppFileStatusKind.Copied,
           oldPath: 'CONTRIBUTING.md',
+          renameIncludesModifications: false,
+          submoduleStatus: undefined,
         })
       })
 
@@ -310,5 +308,65 @@ describe('git/status', () => {
         expect(status).toBeNull()
       })
     })
+    describe('with submodules', () => {
+      it('returns the submodule status', async () => {
+        const repoPath = await setupFixtureRepository('submodule-basic-setup')
+        repository = new Repository(repoPath, -1, null, false)
+
+        const submodulePath = path.join(repoPath, 'foo', 'submodule')
+        const checkSubmoduleChanges = async (changes: {
+          modifiedChanges: boolean
+          untrackedChanges: boolean
+          commitChanged: boolean
+        }) => {
+          const status = await getStatusOrThrow(repository)
+          const files = status.workingDirectory.files
+          expect(files).toHaveLength(1)
+
+          const file = files[0]
+          expect(file.path).toBe('foo/submodule')
+          expect(file.status.kind).toBe(AppFileStatusKind.Modified)
+          expect(file.status.submoduleStatus?.modifiedChanges).toBe(
+            changes.modifiedChanges
+          )
+          expect(file.status.submoduleStatus?.untrackedChanges).toBe(
+            changes.untrackedChanges
+          )
+          expect(file.status.submoduleStatus?.commitChanged).toBe(
+            changes.commitChanged
+          )
+        }
+
+        // Modify README.md file. Now the submodule has modified changes.
+        await FSE.writeFile(
+          path.join(submodulePath, 'README.md'),
+          'hello world\n'
+        )
+        await checkSubmoduleChanges({
+          modifiedChanges: true,
+          untrackedChanges: false,
+          commitChanged: false,
+        })
+
+        // Create untracked file in submodule. Now the submodule has both
+        // modified and untracked changes.
+        await FSE.writeFile(path.join(submodulePath, 'test'), 'test\n')
+        await checkSubmoduleChanges({
+          modifiedChanges: true,
+          untrackedChanges: true,
+          commitChanged: false,
+        })
+
+        // Commit the changes within the submodule. Now the submodule has commit
+        // changes.
+        await exec(['add', '.'], submodulePath)
+        await exec(['commit', '-m', 'changes'], submodulePath)
+        await checkSubmoduleChanges({
+          modifiedChanges: false,
+          untrackedChanges: false,
+          commitChanged: true,
+        })
+      })
+    })
   })
 })
diff --git a/app/test/unit/git/submodule-test.ts b/app/test/unit/git/submodule-test.ts
index 37a842e5131..b6edc76dbc8 100644
--- a/app/test/unit/git/submodule-test.ts
+++ b/app/test/unit/git/submodule-test.ts
@@ -37,7 +37,7 @@ describe('git/submodule', () => {
         throw new Error(`Could not find branch: feature-branch`)
       }
 
-      await checkoutBranch(submoduleRepository, null, branches[0])
+      await checkoutBranch(submoduleRepository, branches[0], null)
 
       const result = await listSubmodules(repository)
       expect(result).toHaveLength(1)
@@ -64,7 +64,7 @@ describe('git/submodule', () => {
         throw new Error(`Could not find branch: feature-branch`)
       }
 
-      await checkoutBranch(submoduleRepository, null, branches[0])
+      await checkoutBranch(submoduleRepository, branches[0], null)
 
       let result = await listSubmodules(repository)
       expect(result[0].describe).toBe('heads/feature-branch')
diff --git a/app/test/unit/git/tag-test.ts b/app/test/unit/git/tag-test.ts
index 060dd26207d..21c4e9d2d00 100644
--- a/app/test/unit/git/tag-test.ts
+++ b/app/test/unit/git/tag-test.ts
@@ -19,8 +19,6 @@ import {
   setupFixtureRepository,
   setupLocalForkOfRepository,
 } from '../../helpers/repositories'
-import { Account } from '../../../src/models/account'
-import { getDotComAPIEndpoint } from '../../../src/lib/api'
 import { IRemote } from '../../../src/models/remote'
 import { findDefaultRemote } from '../../../src/lib/stores/helpers/find-default-remote'
 import { getStatusOrThrow } from '../../helpers/status'
@@ -28,21 +26,10 @@ import { assertNonNullable } from '../../../src/lib/fatal-error'
 
 describe('git/tag', () => {
   let repository: Repository
-  let account: Account
 
   beforeEach(async () => {
     const testRepoPath = await setupFixtureRepository('test-repo')
     repository = new Repository(testRepoPath, -1, null, false)
-
-    account = new Account(
-      'monalisa',
-      getDotComAPIEndpoint(),
-      '',
-      [],
-      '',
-      -1,
-      'Mona Lisa'
-    )
   })
 
   describe('createTag', () => {
@@ -54,6 +41,14 @@ describe('git/tag', () => {
       expect(commit!.tags).toEqual(['my-new-tag'])
     })
 
+    it('creates a tag with the a comma in it', async () => {
+      await createTag(repository, 'my-new-tag,has-a-comma', 'HEAD')
+
+      const commit = await getCommit(repository, 'HEAD')
+      expect(commit).not.toBeNull()
+      expect(commit!.tags).toEqual(['my-new-tag,has-a-comma'])
+    })
+
     it('creates multiple tags', async () => {
       await createTag(repository, 'my-new-tag', 'HEAD')
       await createTag(repository, 'another-tag', 'HEAD')
@@ -129,28 +124,26 @@ describe('git/tag', () => {
 
     it('returns an empty array when there are no tags to get pushed', async () => {
       expect(
-        await fetchTagsToPush(repository, account, originRemote, 'master')
+        await fetchTagsToPush(repository, originRemote, 'master')
       ).toIncludeAllMembers([])
     })
 
     it("returns local tags that haven't been pushed", async () => {
       await createTag(repository, 'my-new-tag', 'HEAD')
 
-      expect(
-        await fetchTagsToPush(repository, account, originRemote, 'master')
-      ).toEqual(['my-new-tag'])
+      expect(await fetchTagsToPush(repository, originRemote, 'master')).toEqual(
+        ['my-new-tag']
+      )
     })
 
     it('returns an empty array after pushing the tag', async () => {
       await createTag(repository, 'my-new-tag', 'HEAD')
 
-      await push(repository, account, originRemote, 'master', null, [
-        'my-new-tag',
-      ])
+      await push(repository, originRemote, 'master', null, ['my-new-tag'])
 
-      expect(
-        await fetchTagsToPush(repository, account, originRemote, 'master')
-      ).toEqual([])
+      expect(await fetchTagsToPush(repository, originRemote, 'master')).toEqual(
+        []
+      )
     })
 
     it('does not return a tag created on a non-pushed branch', async () => {
@@ -164,13 +157,13 @@ describe('git/tag', () => {
       const status = await getStatusOrThrow(repository)
       const files = status.workingDirectory.files
 
-      await checkoutBranch(repository, account, branch!)
+      await checkoutBranch(repository, branch!, null)
       const commitSha = await createCommit(repository, 'a commit', files)
       await createTag(repository, 'my-new-tag', commitSha)
 
-      expect(
-        await fetchTagsToPush(repository, account, originRemote, 'master')
-      ).toEqual([])
+      expect(await fetchTagsToPush(repository, originRemote, 'master')).toEqual(
+        []
+      )
     })
 
     it('returns unpushed tags even if it fails to push the branch', async () => {
@@ -186,9 +179,9 @@ describe('git/tag', () => {
 
       await createTag(repository, 'my-new-tag', 'HEAD')
 
-      expect(
-        await fetchTagsToPush(repository, account, originRemote, 'master')
-      ).toEqual(['my-new-tag'])
+      expect(await fetchTagsToPush(repository, originRemote, 'master')).toEqual(
+        ['my-new-tag']
+      )
     })
   })
 })
diff --git a/app/test/unit/helpers/regex-test.ts b/app/test/unit/helpers/regex-test.ts
deleted file mode 100644
index d7fa7fff39e..00000000000
--- a/app/test/unit/helpers/regex-test.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { getCaptures } from '../../../src/lib/helpers/regex'
-
-describe('getCaptures()', () => {
-  let bodyOfText: string
-  const regex = /(.+):matching:(.+)/gi
-  const subject = () => getCaptures(bodyOfText, regex)
-
-  describe('with matches', () => {
-    beforeAll(() => {
-      bodyOfText = `capture me!:matching:capture me too!\nalso capture me!:matching:also capture me too!\n`
-    })
-    it('returns all captures', () => {
-      expect(subject()).toEqual([
-        ['capture me!', 'capture me too!'],
-        ['also capture me!', 'also capture me too!'],
-      ])
-    })
-  })
-  describe('with no matches', () => {
-    beforeAll(() => {
-      bodyOfText = ' '
-    })
-    it('returns empty array', () => {
-      expect(subject()).toEqual([])
-    })
-  })
-
-  it('will error when a non-global regex is provided', () => {
-    const regex = /(.+):matching:(.+)/
-    bodyOfText = `capture me!:matching:capture me too!\nalso capture me!:matching:also capture me too!\n`
-    expect(() => getCaptures(bodyOfText, regex)).toThrow()
-  })
-})
diff --git a/app/test/unit/main-process/spell-checker-menu-test.ts b/app/test/unit/main-process/spell-checker-menu-test.ts
new file mode 100644
index 00000000000..6db4fc513d7
--- /dev/null
+++ b/app/test/unit/main-process/spell-checker-menu-test.ts
@@ -0,0 +1,48 @@
+import {
+  SpellcheckEnglishLabel,
+  getSpellCheckLanguageMenuItemOptions,
+  SpellcheckSystemLabel,
+} from '../../../src/main-process/menu/build-spell-check-menu'
+import { getAvailableSpellcheckerLanguages } from '../../helpers/menus/available-spellchecker-languages-helper'
+
+describe('spell-checker-menu', () => {
+  it('returns null menu item options when both spellchecker language and user language are english', () => {
+    const spellcheckerMenuItem = getSpellCheckLanguageMenuItemOptions(
+      'en-US',
+      ['en-US'],
+      getAvailableSpellcheckerLanguages()
+    )
+
+    expect(spellcheckerMenuItem).toBeNull()
+  })
+
+  it('returns null menu item options when spellchecker language is english, user language is not english and user language is not supported', () => {
+    const spellcheckerMenuItem = getSpellCheckLanguageMenuItemOptions(
+      'zh-CN',
+      ['en-US'],
+      getAvailableSpellcheckerLanguages()
+    )
+
+    expect(spellcheckerMenuItem).toBeNull()
+  })
+
+  it('returns set system language label when spellchecker language is english, user language is not english and user language is supported', () => {
+    const spellcheckerMenuItem = getSpellCheckLanguageMenuItemOptions(
+      'bg',
+      ['en-US'],
+      getAvailableSpellcheckerLanguages()
+    )
+
+    expect(spellcheckerMenuItem?.label).toBe(SpellcheckSystemLabel)
+  })
+
+  it('returns set to english label when spellchecker language is no english', () => {
+    const spellcheckerMenuItem = getSpellCheckLanguageMenuItemOptions(
+      'en-US',
+      ['bg'],
+      getAvailableSpellcheckerLanguages()
+    )
+
+    expect(spellcheckerMenuItem?.label).toBe(SpellcheckEnglishLabel)
+  })
+})
diff --git a/app/test/unit/octicon-test.ts b/app/test/unit/octicon-test.ts
index 0fabeed50bd..b87e6d895f2 100644
--- a/app/test/unit/octicon-test.ts
+++ b/app/test/unit/octicon-test.ts
@@ -1,5 +1,5 @@
 import { iconForRepository } from '../../src/ui/octicons'
-import * as OcticonSymbol from '../../src/ui/octicons/octicons.generated'
+import * as octicons from '../../src/ui/octicons/octicons.generated'
 import { CloningRepository } from '../../src/models/cloning-repository'
 import { Repository } from '../../src/models/repository'
 import { gitHubRepoFixture } from '../helpers/github-repo-builder'
@@ -11,13 +11,13 @@ describe('octicon/iconForRepository', () => {
       'https://github.com/desktop/desktop'
     )
     const icon = iconForRepository(repository)
-    expect(icon).toEqual(OcticonSymbol.desktopDownload)
+    expect(icon).toEqual(octicons.desktopDownload)
   })
 
   it('shows computer icon for non-GitHub repository', () => {
     const repository = new Repository('C:/some/path/to/repo', 1, null, false)
     const icon = iconForRepository(repository)
-    expect(icon).toEqual(OcticonSymbol.deviceDesktop)
+    expect(icon).toEqual(octicons.deviceDesktop)
   })
 
   it('shows repo icon for public GitHub repository', () => {
@@ -33,7 +33,7 @@ describe('octicon/iconForRepository', () => {
       false
     )
     const icon = iconForRepository(repository)
-    expect(icon).toEqual(OcticonSymbol.repo)
+    expect(icon).toEqual(octicons.repo)
   })
 
   it('shows lock icon for private GitHub repository', () => {
@@ -49,7 +49,7 @@ describe('octicon/iconForRepository', () => {
       false
     )
     const icon = iconForRepository(repository)
-    expect(icon).toEqual(OcticonSymbol.lock)
+    expect(icon).toEqual(octicons.lock)
   })
 
   it('shows fork icon for forked GitHub repository', () => {
@@ -66,6 +66,6 @@ describe('octicon/iconForRepository', () => {
       false
     )
     const icon = iconForRepository(repository)
-    expect(icon).toEqual(OcticonSymbol.repoForked)
+    expect(icon).toEqual(octicons.repoForked)
   })
 })
diff --git a/app/test/unit/parse-app-url-test.ts b/app/test/unit/parse-app-url-test.ts
index 058f2020fa4..b297658002f 100644
--- a/app/test/unit/parse-app-url-test.ts
+++ b/app/test/unit/parse-app-url-test.ts
@@ -1,7 +1,6 @@
 import {
   parseAppURL,
   IOpenRepositoryFromURLAction,
-  IOpenRepositoryFromPathAction,
   IOAuthAction,
 } from '../../src/lib/parse-app-url'
 
@@ -155,27 +154,4 @@ describe('parseAppURL', () => {
       expect(openRepo.filepath).toBe('Octokit.Reactive/Octokit.Reactive.csproj')
     })
   })
-
-  describe('openLocalRepo', () => {
-    it('parses local paths', () => {
-      const path = __WIN32__
-        ? 'C:\\Users\\johnsmith\\repo'
-        : '/Users/johnsmith/repo'
-      const result = parseAppURL(
-        `x-github-client://openLocalRepo/${encodeURIComponent(path)}`
-      )
-      expect(result.name).toBe('open-repository-from-path')
-
-      const openRepo = result as IOpenRepositoryFromPathAction
-      expect(openRepo.path).toBe(path)
-    })
-
-    it('deals with not having a local path', () => {
-      let result = parseAppURL(`x-github-client://openLocalRepo/`)
-      expect(result.name).toBe('unknown')
-
-      result = parseAppURL(`x-github-client://openLocalRepo`)
-      expect(result.name).toBe('unknown')
-    })
-  })
 })
diff --git a/app/test/unit/parse-carriage-return-test.ts b/app/test/unit/parse-carriage-return-test.ts
deleted file mode 100644
index 46479a70218..00000000000
--- a/app/test/unit/parse-carriage-return-test.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-import { parseCarriageReturn } from '../../src/lib/parse-carriage-return'
-
-describe('parseCarriageReturn', () => {
-  it('parses git clone output correctly', () => {
-    // The actual, raw, output of a `git clone` call which fails due to a
-    // duplicate ref clash (refspec tomfoolery)
-    const cloneOutput =
-      "Cloning into '/Users/markus/Documents/GitHub/delete-branch-test'...\n" +
-      'remote: Enumerating objects: 8, done.        \n' +
-      'remote: Counting objects:  12% (1/8)        \r' +
-      'remote: Counting objects:  25% (2/8)        \r' +
-      'remote: Counting objects:  37% (3/8)        \r' +
-      'remote: Counting objects:  50% (4/8)        \r' +
-      'remote: Counting objects:  62% (5/8)        \r' +
-      'remote: Counting objects:  75% (6/8)        \r' +
-      'remote: Counting objects:  87% (7/8)        \r' +
-      'remote: Counting objects: 100% (8/8)        \r' +
-      'remote: Counting objects: 100% (8/8), done.        \n' +
-      'remote: Compressing objects:  16% (1/6)        \r' +
-      'remote: Compressing objects:  33% (2/6)        \r' +
-      'remote: Compressing objects:  50% (3/6)        \r' +
-      'remote: Compressing objects:  66% (4/6)        \r' +
-      'remote: Compressing objects:  83% (5/6)        \r' +
-      'remote: Compressing objects: 100% (6/6)        \r' +
-      'remote: Compressing objects: 100% (6/6), done.        \n' +
-      'remote: Total 8 (delta 1), reused 7 (delta 0), pack-reused 0        \n' +
-      '\r' +
-      '                                                                                \r' +
-      'Receiving objects:  12% (1/8)\r' +
-      '\r' +
-      '                                                                                \r' +
-      'Receiving objects:  25% (2/8)\r' +
-      '\r' +
-      '                                                                                \r' +
-      'Receiving objects:  37% (3/8)\r' +
-      '\r' +
-      '                                                                                \r' +
-      'Receiving objects:  50% (4/8)\r' +
-      '\r' +
-      '                                                                                \r' +
-      'Receiving objects:  62% (5/8)\r' +
-      '\r' +
-      '                                                                                \r' +
-      'Receiving objects:  75% (6/8)\r' +
-      '\r' +
-      '                                                                                \r' +
-      'Receiving objects:  87% (7/8)\r' +
-      '\r' +
-      '                                                                                \r' +
-      'Receiving objects: 100% (8/8)\r' +
-      '\r' +
-      '                                                                                \r' +
-      'Receiving objects: 100% (8/8), done.\n' +
-      '\r' +
-      '                                                                                \r' +
-      'Resolving deltas:   0% (0/1)\r' +
-      '\r' +
-      '                                                                                \r' +
-      'Resolving deltas: 100% (1/1)\r' +
-      '\r' +
-      '                                                                                \r' +
-      'Resolving deltas: 100% (1/1), done.\n' +
-      "fatal: multiple updates for ref 'refs/remotes/origin/pr/1' not allowed\n"
-
-    const expected =
-      "Cloning into '/Users/markus/Documents/GitHub/delete-branch-test'...\n" +
-      'remote: Enumerating objects: 8, done.        \n' +
-      'remote: Counting objects: 100% (8/8), done.        \n' +
-      'remote: Compressing objects: 100% (6/6), done.        \n' +
-      'remote: Total 8 (delta 1), reused 7 (delta 0), pack-reused 0        \n' +
-      'Receiving objects: 100% (8/8), done.                                            \n' +
-      'Resolving deltas: 100% (1/1), done.                                             \n' +
-      "fatal: multiple updates for ref 'refs/remotes/origin/pr/1' not allowed\n"
-
-    expect(parseCarriageReturn(cloneOutput)).toBe(expected)
-  })
-
-  it("has no problems with strings that don't contain carriage returns", () => {
-    expect(parseCarriageReturn('foo')).toBe('foo')
-    expect(parseCarriageReturn('foo\nbar')).toBe('foo\nbar')
-  })
-
-  it('handles terminating carriage returns', () => {
-    expect(parseCarriageReturn('foo\r')).toBe('foo')
-    expect(parseCarriageReturn('foo\nbar\r')).toBe('foo\nbar')
-  })
-
-  it('handles strings terminating without newline or CR', () => {
-    expect(parseCarriageReturn('foo\rbar')).toBe('bar')
-    expect(parseCarriageReturn('foo\r\r\r\r\rbar')).toBe('bar')
-  })
-
-  it('treats unicode line separator and paragraph separator as flow text', () => {
-    // https://www.regular-expressions.info/dot.html
-    // [...] JavaScript adds the Unicode line separator \u2028 and paragraph
-    // separator \u2029 on top of that
-    expect(parseCarriageReturn('foo\rfoo\u2028bar\u2029foo')).toBe(
-      'foo\u2028bar\u2029foo'
-    )
-  })
-
-  it('handles remaining characters from previous lines', () => {
-    expect(parseCarriageReturn('foobar\rfooba\rfoob\rfoo\r\fo\rF\r')).toBe(
-      'Foobar'
-    )
-  })
-
-  it("handles Windows' new lines", () => {
-    expect(parseCarriageReturn('A\r\nB\r\nC\r\nD\r\n')).toBe('A\nB\nC\nD\n')
-  })
-})
diff --git a/app/test/unit/path-test.ts b/app/test/unit/path-test.ts
index fad4a886de9..43cc574f6cf 100644
--- a/app/test/unit/path-test.ts
+++ b/app/test/unit/path-test.ts
@@ -33,7 +33,7 @@ describe('path', () => {
     }
   })
 
-  describe('resolveWithin', async () => {
+  describe('resolveWithin', () => {
     const root = process.cwd()
 
     it('fails for paths outside of the root', async () => {
diff --git a/app/test/unit/popup-manager-test.ts b/app/test/unit/popup-manager-test.ts
new file mode 100644
index 00000000000..e9ce1de6d2d
--- /dev/null
+++ b/app/test/unit/popup-manager-test.ts
@@ -0,0 +1,327 @@
+import { PopupManager } from '../../src/lib/popup-manager'
+import { Account } from '../../src/models/account'
+import { Popup, PopupType } from '../../src/models/popup'
+
+let mockId = 0
+jest.mock('../../src/lib/uuid', () => {
+  return { uuid: () => mockId++ }
+})
+
+describe('PopupManager', () => {
+  let popupManager = new PopupManager()
+
+  beforeEach(() => {
+    popupManager = new PopupManager()
+    mockId = 0
+  })
+
+  describe('currentPopup', () => {
+    it('returns null when no popups added', () => {
+      const currentPopup = popupManager.currentPopup
+      expect(currentPopup).toBeNull()
+    })
+
+    it('returns last added non-error popup', () => {
+      const popupAbout: Popup = { type: PopupType.About }
+      const popupSignIn: Popup = { type: PopupType.SignIn }
+      popupManager.addPopup(popupAbout)
+      popupManager.addPopup(popupSignIn)
+
+      const currentPopup = popupManager.currentPopup
+      expect(currentPopup).not.toBeNull()
+      expect(currentPopup?.type).toBe(PopupType.SignIn)
+    })
+
+    it('returns last added error popup', () => {
+      const popupAbout: Popup = { type: PopupType.About }
+      const popupSignIn: Popup = { type: PopupType.SignIn }
+      popupManager.addPopup(popupAbout)
+      popupManager.addErrorPopup(new Error('an error'))
+      popupManager.addPopup(popupSignIn)
+
+      const currentPopup = popupManager.currentPopup
+      expect(currentPopup).not.toBeNull()
+      expect(currentPopup?.type).toBe(PopupType.Error)
+    })
+  })
+
+  describe('isAPopupOpen', () => {
+    it('returns false when no popups added', () => {
+      const isAPopupOpen = popupManager.isAPopupOpen
+      expect(isAPopupOpen).toBeFalse()
+    })
+
+    it('returns last added popup', () => {
+      const popupAbout: Popup = { type: PopupType.About }
+      popupManager.addPopup(popupAbout)
+
+      const isAPopupOpen = popupManager.isAPopupOpen
+      expect(isAPopupOpen).toBeTrue()
+    })
+  })
+
+  describe('getPopupsOfType', () => {
+    it('returns popups of a given type', () => {
+      const popupAbout: Popup = { type: PopupType.About }
+      const popupSignIn: Popup = { type: PopupType.SignIn }
+      popupManager.addPopup(popupAbout)
+      popupManager.addPopup(popupSignIn)
+
+      const aboutPopups = popupManager.getPopupsOfType(PopupType.About)
+      expect(aboutPopups).toBeArrayOfSize(1)
+      expect(aboutPopups.at(0)?.type).toBe(PopupType.About)
+    })
+
+    it('returns empty array if none exist of given type', () => {
+      const popupAbout: Popup = { type: PopupType.About }
+      popupManager.addPopup(popupAbout)
+
+      const signInPopups = popupManager.getPopupsOfType(PopupType.SignIn)
+      expect(signInPopups).toBeArrayOfSize(0)
+    })
+  })
+
+  describe('areTherePopupsOfType', () => {
+    it('returns true if popup of type exists', () => {
+      const popupAbout: Popup = { type: PopupType.About }
+      popupManager.addPopup(popupAbout)
+
+      const areThereAboutPopups = popupManager.areTherePopupsOfType(
+        PopupType.About
+      )
+      expect(areThereAboutPopups).toBeTrue()
+    })
+
+    it('returns false if there are no popups of that type', () => {
+      const popupAbout: Popup = { type: PopupType.About }
+      popupManager.addPopup(popupAbout)
+
+      const areThereSignInPopups = popupManager.areTherePopupsOfType(
+        PopupType.SignIn
+      )
+      expect(areThereSignInPopups).toBeFalse()
+    })
+  })
+
+  describe('addPopup', () => {
+    it('adds a popup to the stack', () => {
+      const popup: Popup = { type: PopupType.About }
+      popupManager.addPopup(popup)
+
+      const popupsOfType = popupManager.getPopupsOfType(PopupType.About)
+      const currentPopup = popupManager.currentPopup
+      expect(popupsOfType).toBeArrayOfSize(1)
+      expect(currentPopup).not.toBeNull()
+      expect(currentPopup?.type).toBe(PopupType.About)
+      expect(currentPopup?.id).toBe(0)
+    })
+
+    it('does not add multiple popups of the same kind to the stack', () => {
+      const popup: Popup = { type: PopupType.About }
+      popupManager.addPopup(popup)
+      popupManager.addPopup(popup)
+
+      const popupsOfType = popupManager.getPopupsOfType(PopupType.About)
+      expect(popupsOfType).toBeArrayOfSize(1)
+    })
+
+    it('adds multiple popups of different types', () => {
+      const popupAbout: Popup = { type: PopupType.About }
+      const popupSignIn: Popup = { type: PopupType.SignIn }
+      popupManager.addPopup(popupAbout)
+      popupManager.addPopup(popupSignIn)
+
+      const aboutPopups = popupManager.getPopupsOfType(PopupType.About)
+      const signInPoups = popupManager.getPopupsOfType(PopupType.SignIn)
+      expect(aboutPopups).toBeArrayOfSize(1)
+      expect(signInPoups).toBeArrayOfSize(1)
+
+      expect(aboutPopups.at(0)?.type).toBe(PopupType.About)
+      expect(signInPoups.at(0)?.type).toBe(PopupType.SignIn)
+    })
+
+    it('trims oldest popup when limit is reached', () => {
+      popupManager = new PopupManager(2)
+      const popupAbout: Popup = { type: PopupType.About }
+      const popupSignIn: Popup = { type: PopupType.SignIn }
+      const popupTermsAndConditions: Popup = {
+        type: PopupType.TermsAndConditions,
+      }
+      popupManager.addPopup(popupAbout)
+      popupManager.addPopup(popupSignIn)
+      popupManager.addPopup(popupTermsAndConditions)
+
+      const aboutPopups = popupManager.getPopupsOfType(PopupType.About)
+      const signInPoups = popupManager.getPopupsOfType(PopupType.SignIn)
+      const termsAndConditionsPoups = popupManager.getPopupsOfType(
+        PopupType.TermsAndConditions
+      )
+      expect(aboutPopups).toBeArrayOfSize(0)
+      expect(signInPoups).toBeArrayOfSize(1)
+      expect(termsAndConditionsPoups).toBeArrayOfSize(1)
+
+      expect(signInPoups.at(0)?.type).toBe(PopupType.SignIn)
+      expect(termsAndConditionsPoups.at(0)?.type).toBe(
+        PopupType.TermsAndConditions
+      )
+    })
+  })
+
+  describe('addErrorPopup', () => {
+    it('adds a popup of type error to the stack', () => {
+      popupManager.addErrorPopup(new Error('an error'))
+
+      const popupsOfType = popupManager.getPopupsOfType(PopupType.Error)
+      const currentPopup = popupManager.currentPopup
+      expect(popupsOfType).toBeArrayOfSize(1)
+      expect(currentPopup).not.toBeNull()
+      expect(currentPopup?.type).toBe(PopupType.Error)
+      expect(currentPopup?.id).toBe(0)
+    })
+
+    it('adds multiple popups of type error to the stack', () => {
+      popupManager.addErrorPopup(new Error('an error'))
+      popupManager.addErrorPopup(new Error('an error'))
+
+      const popupsOfType = popupManager.getPopupsOfType(PopupType.Error)
+      expect(popupsOfType).toBeArrayOfSize(2)
+    })
+
+    it('trims oldest popup when limit is reached', () => {
+      const limit = 2
+      popupManager = new PopupManager(limit)
+      popupManager.addErrorPopup(new Error('an error'))
+      popupManager.addErrorPopup(new Error('an error'))
+      popupManager.addErrorPopup(new Error('an error'))
+      popupManager.addErrorPopup(new Error('an error'))
+
+      const errorPopups = popupManager.getPopupsOfType(PopupType.Error)
+      expect(errorPopups).toBeArrayOfSize(limit)
+    })
+  })
+
+  describe('updatePopup', () => {
+    it('updates the given popup', () => {
+      const mockAccount = new Account(
+        'test',
+        '',
+        'deadbeef',
+        [],
+        '',
+        1,
+        '',
+        'free'
+      )
+      const popupTutorial: Popup = {
+        type: PopupType.CreateTutorialRepository,
+        account: mockAccount,
+      }
+
+      const tutorialPopup = popupManager.addPopup(popupTutorial)
+
+      // Just so update spreader notation will work
+      if (tutorialPopup.type !== PopupType.CreateTutorialRepository) {
+        return
+      }
+
+      const updatedPopup: Popup = {
+        ...tutorialPopup,
+        progress: {
+          kind: 'generic',
+          value: 5,
+        },
+      }
+      popupManager.updatePopup(updatedPopup)
+
+      const result = popupManager.getPopupsOfType(
+        PopupType.CreateTutorialRepository
+      )
+      expect(result).toBeArrayOfSize(1)
+      const resultingPopup = result.at(0)
+      // Would fail first expect if not
+      if (resultingPopup === undefined) {
+        return
+      }
+
+      expect(resultingPopup.type).toBe(PopupType.CreateTutorialRepository)
+      if (resultingPopup.type !== PopupType.CreateTutorialRepository) {
+        return
+      }
+
+      expect(resultingPopup.progress).toBeDefined()
+      expect(resultingPopup.progress?.kind).toBe('generic')
+      expect(resultingPopup.progress?.value).toBe(5)
+    })
+  })
+
+  describe('removePopup', () => {
+    it('deletes popup when give a popup with an id', () => {
+      const popupAbout: Popup = popupManager.addPopup({ type: PopupType.About })
+      popupManager.addPopup({
+        type: PopupType.SignIn,
+      })
+
+      popupManager.removePopup(popupAbout)
+
+      const aboutPopups = popupManager.getPopupsOfType(PopupType.About)
+      expect(aboutPopups).toBeArrayOfSize(0)
+
+      const signInPopups = popupManager.getPopupsOfType(PopupType.SignIn)
+      expect(signInPopups).toBeArrayOfSize(1)
+    })
+
+    it('does not remove popups by type', () => {
+      popupManager.addPopup({ type: PopupType.About })
+      popupManager.addPopup({
+        type: PopupType.SignIn,
+      })
+
+      popupManager.removePopup({ type: PopupType.About })
+
+      const aboutPopups = popupManager.getPopupsOfType(PopupType.About)
+      expect(aboutPopups).toBeArrayOfSize(1)
+
+      const signInPopups = popupManager.getPopupsOfType(PopupType.SignIn)
+      expect(signInPopups).toBeArrayOfSize(1)
+    })
+  })
+
+  describe('removePopupByType', () => {
+    it('removes the popups of a given type', () => {
+      popupManager.addPopup({ type: PopupType.About })
+      popupManager.addPopup({
+        type: PopupType.SignIn,
+      })
+
+      popupManager.removePopupByType(PopupType.About)
+
+      const aboutPopups = popupManager.getPopupsOfType(PopupType.About)
+      expect(aboutPopups).toBeArrayOfSize(0)
+
+      const signInPopups = popupManager.getPopupsOfType(PopupType.SignIn)
+      expect(signInPopups).toBeArrayOfSize(1)
+    })
+  })
+
+  describe('removePopupById', () => {
+    it('removes the popup by its id', () => {
+      const popupAbout: Popup = popupManager.addPopup({ type: PopupType.About })
+      popupManager.addPopup({
+        type: PopupType.SignIn,
+      })
+
+      expect(popupAbout.id).toBeDefined()
+      if (popupAbout.id === undefined) {
+        return
+      }
+
+      popupManager.removePopupById(popupAbout.id)
+
+      const aboutPopups = popupManager.getPopupsOfType(PopupType.About)
+      expect(aboutPopups).toBeArrayOfSize(0)
+
+      const signInPopups = popupManager.getPopupsOfType(PopupType.SignIn)
+      expect(signInPopups).toBeArrayOfSize(1)
+    })
+  })
+})
diff --git a/app/test/unit/remote-parsing-test.ts b/app/test/unit/remote-parsing-test.ts
index ffbca30d503..5dc34428a55 100644
--- a/app/test/unit/remote-parsing-test.ts
+++ b/app/test/unit/remote-parsing-test.ts
@@ -9,6 +9,22 @@ describe('URL remote parsing', () => {
     expect(remote!.name).toBe('repo')
   })
 
+  it('parses HTTPS URLs with a trailing -git suffix', () => {
+    const remote = parseRemote('https://github.com/hubot/repo-git')
+    expect(remote).not.toBeNull()
+    expect(remote!.hostname).toBe('github.com')
+    expect(remote!.owner).toBe('hubot')
+    expect(remote!.name).toBe('repo-git')
+  })
+
+  it('parses HTTPS URLs with a trailing -git and .git suffixes', () => {
+    const remote = parseRemote('https://github.com/hubot/repo-git.git')
+    expect(remote).not.toBeNull()
+    expect(remote!.hostname).toBe('github.com')
+    expect(remote!.owner).toBe('hubot')
+    expect(remote!.name).toBe('repo-git')
+  })
+
   it('parses HTTPS URLs without a trailing git suffix', () => {
     const remote = parseRemote('https://github.com/hubot/repo')
     expect(remote).not.toBeNull()
@@ -41,6 +57,14 @@ describe('URL remote parsing', () => {
     expect(remote!.name).toBe('repo')
   })
 
+  it('parses SSH URLs with custom username', () => {
+    const remote = parseRemote('niik@niik.ghe.com:hubot/repo.git')
+    expect(remote).not.toBeNull()
+    expect(remote!.hostname).toBe('niik.ghe.com')
+    expect(remote!.owner).toBe('hubot')
+    expect(remote!.name).toBe('repo')
+  })
+
   it('parses SSH URLs without the git suffix', () => {
     const remote = parseRemote('git@github.com:hubot/repo')
     expect(remote).not.toBeNull()
@@ -49,6 +73,22 @@ describe('URL remote parsing', () => {
     expect(remote!.name).toBe('repo')
   })
 
+  it('parses SSH URLs without the git suffix but with -git suffix', () => {
+    const remote = parseRemote('git@github.com:hubot/repo-git')
+    expect(remote).not.toBeNull()
+    expect(remote!.hostname).toBe('github.com')
+    expect(remote!.owner).toBe('hubot')
+    expect(remote!.name).toBe('repo-git')
+  })
+
+  it('parses SSH URLs with the .git suffix and -git suffix', () => {
+    const remote = parseRemote('git@github.com:hubot/repo-git.git')
+    expect(remote).not.toBeNull()
+    expect(remote!.hostname).toBe('github.com')
+    expect(remote!.owner).toBe('hubot')
+    expect(remote!.name).toBe('repo-git')
+  })
+
   it('parses SSH URLs with a trailing slash', () => {
     const remote = parseRemote('git@github.com:hubot/repo/')
     expect(remote).not.toBeNull()
@@ -96,4 +136,34 @@ describe('URL remote parsing', () => {
     expect(remote!.owner).toBe('hubot')
     expect(remote!.name).toBe('repo')
   })
+
+  it('does not parse invalid HTTP URLs when missing repo name', () => {
+    const remote = parseRemote('https://github.com/someuser//')
+    expect(remote).toBeNull()
+  })
+
+  it('does not parse invalid SSH URLs when missing repo name ', () => {
+    const remote = parseRemote('git@github.com:hubot/')
+    expect(remote).toBeNull()
+  })
+
+  it('does not parse invalid git URLs when missing repo name', () => {
+    const remote = parseRemote('git:github.com/hubot/')
+    expect(remote).toBeNull()
+  })
+
+  it('does not parse invalid HTTP URLs when missing repo owner', () => {
+    const remote = parseRemote('https://github.com//somerepo')
+    expect(remote).toBeNull()
+  })
+
+  it('does not parse invalid SSH URLs when missing repo owner', () => {
+    const remote = parseRemote('git@github.com:/somerepo')
+    expect(remote).toBeNull()
+  })
+
+  it('does not parse invalid git URLs when missing repo owner', () => {
+    const remote = parseRemote('git:github.com/hubot/')
+    expect(remote).toBeNull()
+  })
 })
diff --git a/app/test/unit/repo-rules-test.ts b/app/test/unit/repo-rules-test.ts
new file mode 100644
index 00000000000..6a9f6a84855
--- /dev/null
+++ b/app/test/unit/repo-rules-test.ts
@@ -0,0 +1,329 @@
+import {
+  APIRepoRuleMetadataOperator,
+  APIRepoRuleType,
+  IAPIRepoRule,
+  IAPIRepoRuleset,
+} from '../../src/lib/api'
+import { parseRepoRules } from '../../src/lib/helpers/repo-rules'
+import {
+  RepoRulesMetadataFailures,
+  RepoRulesMetadataStatus,
+} from '../../src/models/repo-rules'
+import { Repository } from '../../src/models/repository'
+
+const creationRule: IAPIRepoRule = {
+  ruleset_id: 1,
+  type: APIRepoRuleType.Creation,
+}
+
+const creationBypassAlwaysRule: IAPIRepoRule = {
+  ruleset_id: 2,
+  type: APIRepoRuleType.Creation,
+}
+
+const creationBypassPullRequestsOnlyRule: IAPIRepoRule = {
+  ruleset_id: 3,
+  type: APIRepoRuleType.Creation,
+}
+
+const commitMessagePatternStartsWithRule: IAPIRepoRule = {
+  ruleset_id: 1,
+  type: APIRepoRuleType.CommitMessagePattern,
+  parameters: {
+    name: '',
+    negate: false,
+    pattern: 'abc',
+    operator: APIRepoRuleMetadataOperator.StartsWith,
+  },
+}
+
+const commitMessagePatternStartsWithBypassRule: IAPIRepoRule = {
+  ruleset_id: 2,
+  type: APIRepoRuleType.CommitMessagePattern,
+  parameters: {
+    name: '',
+    negate: false,
+    pattern: 'abc',
+    operator: APIRepoRuleMetadataOperator.StartsWith,
+  },
+}
+
+const commitMessagePatternSpecialCharactersRule: IAPIRepoRule = {
+  ruleset_id: 1,
+  type: APIRepoRuleType.CommitMessagePattern,
+  parameters: {
+    name: '',
+    negate: false,
+    pattern: '(a.b.c.)|(d+)\\d', // API response is backslash escaped like this
+    operator: APIRepoRuleMetadataOperator.StartsWith,
+  },
+}
+
+const commitMessagePatternEndsWithRule: IAPIRepoRule = {
+  ruleset_id: 1,
+  type: APIRepoRuleType.CommitMessagePattern,
+  parameters: {
+    name: '',
+    negate: true,
+    pattern: 'end',
+    operator: APIRepoRuleMetadataOperator.EndsWith,
+  },
+}
+
+const commitMessagePatternContainsRule: IAPIRepoRule = {
+  ruleset_id: 1,
+  type: APIRepoRuleType.CommitMessagePattern,
+  parameters: {
+    name: '',
+    negate: true,
+    pattern: 'con',
+    operator: APIRepoRuleMetadataOperator.Contains,
+  },
+}
+
+const commitMessagePatternRegexRule1: IAPIRepoRule = {
+  ruleset_id: 1,
+  type: APIRepoRuleType.CommitMessagePattern,
+  parameters: {
+    name: '',
+    negate: false,
+    pattern: '(a.b.c.)|(d+)',
+    operator: APIRepoRuleMetadataOperator.RegexMatch,
+  },
+}
+
+const commitMessagePatternRegexRule2: IAPIRepoRule = {
+  ruleset_id: 1,
+  type: APIRepoRuleType.CommitMessagePattern,
+  parameters: {
+    name: '',
+    negate: false,
+    pattern: '^\\A(d|e)oo\\d$', // API response is backslash escaped like this
+    operator: APIRepoRuleMetadataOperator.RegexMatch,
+  },
+}
+
+const commitMessagePatternRegexMultiLineRule: IAPIRepoRule = {
+  ruleset_id: 1,
+  type: APIRepoRuleType.CommitMessagePattern,
+  parameters: {
+    name: '',
+    negate: false,
+    pattern: '(?m)^foo',
+    operator: APIRepoRuleMetadataOperator.RegexMatch,
+  },
+}
+
+const rulesets: ReadonlyMap<number, IAPIRepoRuleset> = new Map([
+  [
+    1,
+    {
+      id: 1,
+      current_user_can_bypass: 'never',
+    },
+  ],
+  [
+    2,
+    {
+      id: 2,
+      current_user_can_bypass: 'always',
+    },
+  ],
+])
+
+function validateMetadataRules(
+  rules: RepoRulesMetadataFailures,
+  status: RepoRulesMetadataStatus,
+  bypassesExpected: number,
+  failuresExpected: number
+): void {
+  expect(rules.status).toBe(status)
+  expect(rules.bypassed.length).toBe(bypassesExpected)
+  expect(rules.failed.length).toBe(failuresExpected)
+}
+
+const repo = new Repository('repo1', 1, null, false)
+
+describe('await parseRepoRules', () => {
+  it('cannot bypass when bypass is "never"', async () => {
+    // the creation rule references ruleset ID 1, which has a bypass of 'never'
+    const rules = [creationRule]
+    const result = await parseRepoRules(rules, rulesets, repo)
+    expect(result.creationRestricted).toBe(true)
+  })
+
+  it('can bypass when bypass is "always"', async () => {
+    // the creationBypass rule references ruleset ID 2, which has a bypass of 'always'
+    const rules = [creationBypassAlwaysRule]
+    const result = await parseRepoRules(rules, rulesets, repo)
+    expect(result.creationRestricted).toBe('bypass')
+  })
+
+  it('cannot bypass when at least one bypass mode is "never" or "pull_requests_only"', async () => {
+    const rules = [creationRule, creationBypassAlwaysRule]
+    const result = await parseRepoRules(rules, rulesets, repo)
+    expect(result.creationRestricted).toBe(true)
+
+    const rules2 = [creationRule, creationBypassPullRequestsOnlyRule]
+    const result2 = await parseRepoRules(rules2, rulesets, repo)
+    expect(result2.creationRestricted).toBe(true)
+  })
+
+  it('is not enforced when no rules are provided', async () => {
+    const rules: IAPIRepoRule[] = []
+    const repoRulesInfo = await parseRepoRules(rules, rulesets, repo)
+    expect(repoRulesInfo.creationRestricted).toBe(false)
+  })
+})
+
+describe('repo metadata rules', () => {
+  describe('startsWith rule', () => {
+    it('shows no rules and passes everything when no rules are provided', async () => {
+      const rules: IAPIRepoRule[] = []
+      const repoRulesInfo = await parseRepoRules(rules, rulesets, repo)
+      expect(repoRulesInfo.commitMessagePatterns.hasRules).toBe(false)
+
+      const failedRules =
+        repoRulesInfo.commitMessagePatterns.getFailedRules('abc')
+      validateMetadataRules(failedRules, 'pass', 0, 0)
+    })
+
+    it('has correct matching logic for StartsWith rule', async () => {
+      const rules = [commitMessagePatternStartsWithRule]
+      const repoRulesInfo = await parseRepoRules(rules, rulesets, repo)
+      expect(repoRulesInfo.commitMessagePatterns.hasRules).toBe(true)
+
+      const failedRules =
+        repoRulesInfo.commitMessagePatterns.getFailedRules('def')
+      validateMetadataRules(failedRules, 'fail', 0, 1)
+      expect(failedRules.failed[0].description).toBe('must start with "abc"')
+    })
+
+    it('has correct bypass logic for StartsWith rule', async () => {
+      const rules = [commitMessagePatternStartsWithBypassRule]
+      const repoRulesInfo = await parseRepoRules(rules, rulesets, repo)
+
+      const failedRules =
+        repoRulesInfo.commitMessagePatterns.getFailedRules('def')
+      validateMetadataRules(failedRules, 'bypass', 1, 0)
+      expect(failedRules.bypassed[0].description).toBe('must start with "abc"')
+    })
+
+    it('has correct logic when bypassed rule is included with non-bypassed rule', async () => {
+      const rules = [
+        commitMessagePatternStartsWithRule,
+        commitMessagePatternStartsWithBypassRule,
+      ]
+      const repoRulesInfo = await parseRepoRules(rules, rulesets, repo)
+
+      const failedRules =
+        repoRulesInfo.commitMessagePatterns.getFailedRules('def')
+      validateMetadataRules(failedRules, 'fail', 1, 1)
+      expect(failedRules.bypassed[0].description).toBe('must start with "abc"')
+      expect(failedRules.failed[0].description).toBe('must start with "abc"')
+    })
+
+    it('escapes special characters and otherwise handles regex properly', async () => {
+      const rules = [commitMessagePatternSpecialCharactersRule]
+      const repoRulesInfo = await parseRepoRules(rules, rulesets, repo)
+
+      // if the . in the pattern is interpreted as a regex special character, this will pass
+      const rules1 =
+        repoRulesInfo.commitMessagePatterns.getFailedRules('aabbcc')
+      expect(rules1.status).toBe('fail')
+
+      const rules2 = repoRulesInfo.commitMessagePatterns.getFailedRules('dd')
+      expect(rules2.status).toBe('fail')
+
+      const passedRules =
+        repoRulesInfo.commitMessagePatterns.getFailedRules('(a.b.c.)|(d+)\\d')
+      expect(passedRules.status).toBe('pass')
+    })
+  })
+
+  describe('endsWith rule', () => {
+    it('has correct matching logic for negated EndsWith rule', async () => {
+      const rules = [commitMessagePatternEndsWithRule]
+      const repoRulesInfo = await parseRepoRules(rules, rulesets, repo)
+
+      const failedRules =
+        repoRulesInfo.commitMessagePatterns.getFailedRules('end')
+      validateMetadataRules(failedRules, 'fail', 0, 1)
+      expect(failedRules.failed[0].description).toBe('must not end with "end"')
+
+      const passedRules =
+        repoRulesInfo.commitMessagePatterns.getFailedRules('abc')
+      validateMetadataRules(passedRules, 'pass', 0, 0)
+    })
+  })
+
+  describe('contains rule', () => {
+    it('has correct matching logic for Contains rule', async () => {
+      const rules = [commitMessagePatternContainsRule]
+      const repoRulesInfo = await parseRepoRules(rules, rulesets, repo)
+
+      const failedRules =
+        repoRulesInfo.commitMessagePatterns.getFailedRules('fooconbar')
+      validateMetadataRules(failedRules, 'fail', 0, 1)
+      expect(failedRules.failed[0].description).toBe('must not contain "con"')
+
+      const passedRules =
+        repoRulesInfo.commitMessagePatterns.getFailedRules('foobar')
+      validateMetadataRules(passedRules, 'pass', 0, 0)
+    })
+  })
+
+  describe('regex rule', () => {
+    it('has correct matching logic for RegexMatch rule', async () => {
+      const rules = [
+        commitMessagePatternRegexRule1,
+        commitMessagePatternRegexRule2,
+      ]
+      const repoRulesInfo = await parseRepoRules(rules, rulesets, repo)
+
+      const results1 =
+        repoRulesInfo.commitMessagePatterns.getFailedRules('doo5')
+      validateMetadataRules(results1, 'pass', 0, 0)
+
+      const results2 =
+        repoRulesInfo.commitMessagePatterns.getFailedRules('afbgch')
+      validateMetadataRules(results2, 'fail', 0, 1)
+      expect(results2.failed[0].description).toBe(
+        'must match the regular expression "^\\A(d|e)oo\\d$"'
+      )
+
+      const results3 =
+        repoRulesInfo.commitMessagePatterns.getFailedRules('eoo4')
+      validateMetadataRules(results3, 'fail', 0, 1)
+      expect(results3.failed[0].description).toBe(
+        'must match the regular expression "(a.b.c.)|(d+)"'
+      )
+
+      const results4 =
+        repoRulesInfo.commitMessagePatterns.getFailedRules('fgsa')
+      validateMetadataRules(results4, 'fail', 0, 2)
+      expect(results4.failed[0].description).toBe(
+        'must match the regular expression "(a.b.c.)|(d+)"'
+      )
+      expect(results4.failed[1].description).toBe(
+        'must match the regular expression "^\\A(d|e)oo\\d$"'
+      )
+    })
+
+    it('has correct matching logic for multi-line data', async () => {
+      const rules = [commitMessagePatternRegexMultiLineRule]
+      const repoRulesInfo = await parseRepoRules(rules, rulesets, repo)
+
+      const results1 =
+        repoRulesInfo.commitMessagePatterns.getFailedRules('first line\nfoo')
+      validateMetadataRules(results1, 'pass', 0, 0)
+
+      const results2 =
+        repoRulesInfo.commitMessagePatterns.getFailedRules('asdf\nbar')
+      validateMetadataRules(results2, 'fail', 0, 1)
+      expect(results2.failed[0].description).toBe(
+        'must match the regular expression "(?m)^foo"'
+      )
+    })
+  })
+})
diff --git a/app/test/unit/repositories-clone-grouping-test.ts b/app/test/unit/repositories-clone-grouping-test.ts
index 7455e1648c1..a559d696d63 100644
--- a/app/test/unit/repositories-clone-grouping-test.ts
+++ b/app/test/unit/repositories-clone-grouping-test.ts
@@ -32,7 +32,7 @@ const users = {
 }
 
 describe('clone repository grouping', () => {
-  it('groups repositories by organization', () => {
+  it('groups repositories by owner', () => {
     const repositories: Array<IAPIFullRepository> = [
       {
         clone_url: '',
diff --git a/app/test/unit/repositories-database-test.ts b/app/test/unit/repositories-database-test.ts
index 4a5b97e0afa..138f4809a74 100644
--- a/app/test/unit/repositories-database-test.ts
+++ b/app/test/unit/repositories-database-test.ts
@@ -17,7 +17,6 @@ describe('RepositoriesDatabase', () => {
       name: 'desktop',
       private: false,
       htmlURL: 'http://github.com/desktop/desktop',
-      defaultBranch: 'master',
       cloneURL: 'http://github.com/desktop/desktop.git',
       parentID: null,
       lastPruneDate: null,
@@ -66,7 +65,6 @@ describe('RepositoriesDatabase', () => {
       name: 'desktop',
       private: false,
       htmlURL: 'http://github.com/desktop/desktop',
-      defaultBranch: 'master',
       cloneURL: 'http://github.com/desktop/desktop.git',
       parentID: null,
       lastPruneDate: null,
@@ -78,7 +76,6 @@ describe('RepositoriesDatabase', () => {
       name: 'dugite',
       private: false,
       htmlURL: 'http://github.com/desktop/dugite',
-      defaultBranch: 'master',
       cloneURL: 'http://github.com/desktop/dugite.git',
       parentID: null,
       lastPruneDate: null,
diff --git a/app/test/unit/repository-matching-test.ts b/app/test/unit/repository-matching-test.ts
index 9919cb74b5b..2c6f5f500db 100644
--- a/app/test/unit/repository-matching-test.ts
+++ b/app/test/unit/repository-matching-test.ts
@@ -11,7 +11,16 @@ describe('repository-matching', () => {
   describe('matchGitHubRepository', () => {
     it('matches HTTPS URLs', () => {
       const accounts = [
-        new Account('alovelace', 'https://api.github.com', '', [], '', 1, ''),
+        new Account(
+          'alovelace',
+          'https://api.github.com',
+          '',
+          [],
+          '',
+          1,
+          '',
+          'free'
+        ),
       ]
       const repo = matchGitHubRepository(
         accounts,
@@ -23,7 +32,16 @@ describe('repository-matching', () => {
 
     it('matches HTTPS URLs without the git extension', () => {
       const accounts = [
-        new Account('alovelace', 'https://api.github.com', '', [], '', 1, ''),
+        new Account(
+          'alovelace',
+          'https://api.github.com',
+          '',
+          [],
+          '',
+          1,
+          '',
+          'free'
+        ),
       ]
       const repo = matchGitHubRepository(
         accounts,
@@ -35,7 +53,16 @@ describe('repository-matching', () => {
 
     it('matches git URLs', () => {
       const accounts = [
-        new Account('alovelace', 'https://api.github.com', '', [], '', 1, ''),
+        new Account(
+          'alovelace',
+          'https://api.github.com',
+          '',
+          [],
+          '',
+          1,
+          '',
+          'free'
+        ),
       ]
       const repo = matchGitHubRepository(
         accounts,
@@ -47,7 +74,16 @@ describe('repository-matching', () => {
 
     it('matches SSH URLs', () => {
       const accounts = [
-        new Account('alovelace', 'https://api.github.com', '', [], '', 1, ''),
+        new Account(
+          'alovelace',
+          'https://api.github.com',
+          '',
+          [],
+          '',
+          1,
+          '',
+          'free'
+        ),
       ]
       const repo = matchGitHubRepository(
         accounts,
@@ -66,7 +102,8 @@ describe('repository-matching', () => {
           [],
           '',
           1,
-          ''
+          '',
+          'free'
         ),
       ]
       const repo = matchGitHubRepository(
@@ -163,7 +200,6 @@ describe('repository-matching', () => {
       },
       isPrivate: false,
       htmlURL: 'https://github.com/shiftkey/desktop',
-      defaultBranch: 'master',
       parent: null,
       endpoint: 'https://api.github.com/',
       fork: true,
diff --git a/app/test/unit/repository-state-cache-test.ts b/app/test/unit/repository-state-cache-test.ts
index dc7a559f345..62b58750d49 100644
--- a/app/test/unit/repository-state-cache-test.ts
+++ b/app/test/unit/repository-state-cache-test.ts
@@ -10,6 +10,9 @@ import {
 import { DiffSelection, DiffSelectionType } from '../../src/models/diff'
 import { HistoryTabMode, IDisplayHistory } from '../../src/lib/app-state'
 import { gitHubRepoFixture } from '../helpers/github-repo-builder'
+import { StatsDatabase, StatsStore } from '../../src/lib/stats'
+import { UiActivityMonitor } from '../../src/ui/lib/ui-activity-monitor'
+import { fakePost } from '../fake-stats-post'
 
 function createSamplePullRequest(gitHubRepository: GitHubRepository) {
   return new PullRequest(
@@ -34,9 +37,16 @@ function createSamplePullRequest(gitHubRepository: GitHubRepository) {
 
 describe('RepositoryStateCache', () => {
   let repository: Repository
+  let statsStore: StatsStore
 
   beforeEach(() => {
     repository = new Repository('/something/path', 1, null, false)
+
+    statsStore = new StatsStore(
+      new StatsDatabase('test-StatsDatabase'),
+      new UiActivityMonitor(),
+      fakePost
+    )
   })
 
   it('can update branches state for a repository', () => {
@@ -46,7 +56,7 @@ describe('RepositoryStateCache', () => {
     })
     const firstPullRequest = createSamplePullRequest(gitHubRepository)
 
-    const cache = new RepositoryStateCache()
+    const cache = new RepositoryStateCache(statsStore)
 
     cache.updateBranchesState(repository, () => {
       return {
@@ -71,7 +81,7 @@ describe('RepositoryStateCache', () => {
 
     const summary = 'Hello world!'
 
-    const cache = new RepositoryStateCache()
+    const cache = new RepositoryStateCache(statsStore)
 
     cache.updateChangesState(repository, () => {
       return {
@@ -94,7 +104,7 @@ describe('RepositoryStateCache', () => {
   it('can update compare state for a repository', () => {
     const filterText = 'my-cool-branch'
 
-    const cache = new RepositoryStateCache()
+    const cache = new RepositoryStateCache(statsStore)
 
     cache.updateCompareState(repository, () => {
       const newState: IDisplayHistory = {
diff --git a/app/test/unit/section-list-selection-test.ts b/app/test/unit/section-list-selection-test.ts
new file mode 100644
index 00000000000..5f88d42dcf7
--- /dev/null
+++ b/app/test/unit/section-list-selection-test.ts
@@ -0,0 +1,88 @@
+import {
+  InvalidRowIndexPath,
+  rowIndexPathEquals,
+} from '../../src/ui/lib/list/list-row-index-path'
+import { findNextSelectableRow } from '../../src/ui/lib/list/section-list-selection'
+
+describe('section-list-selection', () => {
+  describe('findNextSelectableRow', () => {
+    const rowCount = [5, 3, 8]
+
+    it('returns first row when selecting down outside list (filter text)', () => {
+      const selectedRow = findNextSelectableRow(rowCount, {
+        direction: 'down',
+        row: InvalidRowIndexPath,
+      })
+      expect(selectedRow?.row).toBe(0)
+    })
+
+    it('returns first selectable row when header is first', () => {
+      const selectedRow = findNextSelectableRow(
+        rowCount,
+        {
+          direction: 'down',
+          row: InvalidRowIndexPath,
+        },
+        row => {
+          if (row.section === 0 && row.row === 0) {
+            return false
+          } else {
+            return true
+          }
+        }
+      )
+      expect(selectedRow?.row).toBe(1)
+    })
+
+    it('returns first row when selecting down from last row', () => {
+      const lastRow = rowCount[0] - 1
+      const selectedRow = findNextSelectableRow(rowCount, {
+        direction: 'down',
+        row: {
+          section: 0,
+          row: lastRow,
+        },
+      })
+      expect(selectedRow?.row).toBe(0)
+    })
+
+    it('returns last row when selecting up from top row', () => {
+      const selectedRow = findNextSelectableRow(rowCount, {
+        direction: 'up',
+        row: {
+          section: 0,
+          row: 0,
+        },
+      })
+      expect(
+        rowIndexPathEquals(selectedRow!, { section: 2, row: 7 })
+      ).toBeTrue()
+    })
+
+    it('returns first row of next section when selecting down from last row of a section', () => {
+      const selectedRow = findNextSelectableRow(rowCount, {
+        direction: 'down',
+        row: {
+          section: 0,
+          row: 4,
+        },
+      })
+      expect(
+        rowIndexPathEquals(selectedRow!, { section: 1, row: 0 })
+      ).toBeTrue()
+    })
+
+    it('returns last row of previous section when selecting up from first row of a section', () => {
+      const selectedRow = findNextSelectableRow(rowCount, {
+        direction: 'up',
+        row: {
+          section: 2,
+          row: 0,
+        },
+      })
+      expect(
+        rowIndexPathEquals(selectedRow!, { section: 1, row: 2 })
+      ).toBeTrue()
+    })
+  })
+})
diff --git a/app/test/unit/stats-store-test.ts b/app/test/unit/stats-store-test.ts
index 0bffaab2720..778e265c02d 100644
--- a/app/test/unit/stats-store-test.ts
+++ b/app/test/unit/stats-store-test.ts
@@ -2,6 +2,7 @@ import { TestStatsDatabase } from '../helpers/databases'
 
 import { StatsStore } from '../../src/lib/stats'
 import { TestActivityMonitor } from '../helpers/test-activity-monitor'
+import { fakePost } from '../fake-stats-post'
 
 describe('StatsStore', () => {
   async function createStatsDb() {
@@ -14,7 +15,7 @@ describe('StatsStore', () => {
     const statsDb = await createStatsDb()
     const activityMonitor = new TestActivityMonitor()
 
-    new StatsStore(statsDb, activityMonitor)
+    new StatsStore(statsDb, activityMonitor, fakePost)
 
     expect(activityMonitor.subscriptionCount).toBe(1)
 
@@ -36,7 +37,7 @@ describe('StatsStore', () => {
     const statsDb = await createStatsDb()
     const activityMonitor = new TestActivityMonitor()
 
-    const store = new StatsStore(statsDb, activityMonitor)
+    const store = new StatsStore(statsDb, activityMonitor, fakePost)
 
     expect(activityMonitor.subscriptionCount).toBe(1)
 
diff --git a/app/test/unit/status-parser-test.ts b/app/test/unit/status-parser-test.ts
index 7ac8d69e1ae..8e985bea610 100644
--- a/app/test/unit/status-parser-test.ts
+++ b/app/test/unit/status-parser-test.ts
@@ -1,12 +1,14 @@
 import {
-  parsePorcelainStatus,
   IStatusEntry,
   IStatusHeader,
+  parsePorcelainStatus,
 } from '../../src/lib/status-parser'
 
+const parse = (input: string) => parsePorcelainStatus(Buffer.from(input))
+
 describe('parsePorcelainStatus', () => {
   it('parses a standard status', () => {
-    const entries = parsePorcelainStatus(
+    const entries = parse(
       [
         '1 .D N... 100644 100644 000000 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 deleted',
         '1 .M N... 100644 100644 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 modified',
@@ -30,7 +32,7 @@ describe('parsePorcelainStatus', () => {
   })
 
   it('parses renames', () => {
-    const entries = parsePorcelainStatus(
+    const entries = parse(
       [
         '2 R. N... 100644 100644 100644 2de0487c2d3e977f5f560b746833f9d7f9a054fd 2de0487c2d3e977f5f560b746833f9d7f9a054fd R100 new\0old',
         '2 RM N... 100644 100644 100644 a3cba7afce66ef37a228e094273c27141db21f36 a3cba7afce66ef37a228e094273c27141db21f36 R100 to\0from',
@@ -55,7 +57,7 @@ describe('parsePorcelainStatus', () => {
     // We don't run status with --ignored so this shouldn't be a problem
     // but we test it all the same
 
-    const entries = parsePorcelainStatus(
+    const entries = parse(
       ['! foo'].join('\0') + '\0'
     ) as ReadonlyArray<IStatusEntry>
 
@@ -66,7 +68,7 @@ describe('parsePorcelainStatus', () => {
     // We don't run status with --ignored so this shouldn't be a problem
     // but we test it all the same
 
-    const entries = parsePorcelainStatus(
+    const entries = parse(
       [
         '# branch.oid 2de0487c2d3e977f5f560b746833f9d7f9a054fd',
         '# branch.head master',
@@ -90,7 +92,7 @@ describe('parsePorcelainStatus', () => {
   it('parses a path which includes a newline', () => {
     const x = `1 D. N... 100644 000000 000000 dc9fb24e86f7445720b39dcb39a7fc0e410d9583 0000000000000000000000000000000000000000 ProjectSID/Images.xcassets/iPhone 67/Status Center/Report X68 Y461
       /.DS_Store`
-    const entries = parsePorcelainStatus(x) as ReadonlyArray<IStatusEntry>
+    const entries = parse(x) as ReadonlyArray<IStatusEntry>
 
     expect(entries).toHaveLength(1)
 
@@ -103,11 +105,19 @@ describe('parsePorcelainStatus', () => {
   it('parses a typechange', () => {
     const x =
       '1 .T N... 120000 120000 100755 6165716e8b408ad09b51d1a37aa1ef50e7f84376 6165716e8b408ad09b51d1a37aa1ef50e7f84376 pdf_linux-x64/lib/libQt5Core.so.5'
-    const entries = parsePorcelainStatus(x) as ReadonlyArray<IStatusEntry>
+    const entries = parse(x) as ReadonlyArray<IStatusEntry>
 
     expect(entries).toHaveLength(1)
 
     expect(entries[0].path).toBe('pdf_linux-x64/lib/libQt5Core.so.5')
     expect(entries[0].statusCode).toBe('.T')
   })
+
+  it('parses submodule changes', () => {
+    const x = `1 .M SCMU 100644 100644 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 submodule/submodule`
+    const entries = parse(x) as ReadonlyArray<IStatusEntry>
+    expect(entries).toHaveLength(1)
+    expect(entries[0].path).toBe('submodule/submodule')
+    expect(entries[0].submoduleStatusCode).toBe('SCMU')
+  })
 })
diff --git a/app/test/unit/stores/updates/update-conflict-state-test.ts b/app/test/unit/stores/updates/update-conflict-state-test.ts
index 5f4590d97ee..7815f1c1640 100644
--- a/app/test/unit/stores/updates/update-conflict-state-test.ts
+++ b/app/test/unit/stores/updates/update-conflict-state-test.ts
@@ -9,12 +9,7 @@ import { IStatsStore } from '../../../../src/lib/stats'
 describe('updateConflictState', () => {
   let statsStore: IStatsStore
   beforeEach(() => {
-    statsStore = {
-      recordMergeAbortedAfterConflicts: jest.fn(),
-      recordMergeSuccessAfterConflicts: jest.fn(),
-      recordRebaseAbortedAfterConflicts: jest.fn(),
-      recordRebaseSuccessAfterConflicts: jest.fn(),
-    }
+    statsStore = { increment: jest.fn() }
   })
 
   const manualResolutions = new Map<string, ManualConflictResolution>([
@@ -120,7 +115,9 @@ describe('updateConflictState', () => {
 
       updateConflictState(prevState, status, statsStore)
 
-      expect(statsStore.recordMergeAbortedAfterConflicts).toHaveBeenCalled()
+      expect(statsStore.increment).toHaveBeenCalledWith(
+        'mergeAbortedAfterConflictsCount'
+      )
     })
 
     it('increments abort counter when conflict resolved and tip has not changed', () => {
@@ -140,7 +137,9 @@ describe('updateConflictState', () => {
 
       updateConflictState(prevState, status, statsStore)
 
-      expect(statsStore.recordMergeAbortedAfterConflicts).toHaveBeenCalled()
+      expect(statsStore.increment).toHaveBeenCalledWith(
+        'mergeAbortedAfterConflictsCount'
+      )
     })
 
     it('increments success counter when conflict resolved and tip has changed', () => {
@@ -160,7 +159,9 @@ describe('updateConflictState', () => {
 
       updateConflictState(prevState, status, statsStore)
 
-      expect(statsStore.recordMergeSuccessAfterConflicts).toHaveBeenCalled()
+      expect(statsStore.increment).toHaveBeenCalledWith(
+        'mergeSuccessAfterConflictsCount'
+      )
     })
   })
 
@@ -265,7 +266,9 @@ describe('updateConflictState', () => {
 
       updateConflictState(prevState, status, statsStore)
 
-      expect(statsStore.recordRebaseAbortedAfterConflicts).toHaveBeenCalled()
+      expect(statsStore.increment).toHaveBeenCalledWith(
+        'rebaseAbortedAfterConflictsCount'
+      )
     })
 
     it('increments abort counter when conflict resolved but tip has not changed', () => {
@@ -287,7 +290,9 @@ describe('updateConflictState', () => {
 
       updateConflictState(prevState, status, statsStore)
 
-      expect(statsStore.recordRebaseAbortedAfterConflicts).toHaveBeenCalled()
+      expect(statsStore.increment).toHaveBeenCalledWith(
+        'rebaseAbortedAfterConflictsCount'
+      )
     })
 
     it('does not increment aborted counter when conflict resolved and tip has changed', () => {
@@ -309,9 +314,9 @@ describe('updateConflictState', () => {
 
       updateConflictState(prevState, status, statsStore)
 
-      expect(
-        statsStore.recordRebaseAbortedAfterConflicts
-      ).not.toHaveBeenCalled()
+      expect(statsStore.increment).not.toHaveBeenCalledWith(
+        'rebaseAbortedAfterConflictsCount'
+      )
     })
   })
 })
diff --git a/app/test/unit/stores/updates/update-remote-url-test.ts b/app/test/unit/stores/updates/update-remote-url-test.ts
index b4ac844eebe..d4e2e718a23 100644
--- a/app/test/unit/stores/updates/update-remote-url-test.ts
+++ b/app/test/unit/stores/updates/update-remote-url-test.ts
@@ -10,6 +10,7 @@ import { setupFixtureRepository } from '../../../helpers/repositories'
 import { addRemote } from '../../../../src/lib/git'
 import { StatsStore, StatsDatabase } from '../../../../src/lib/stats'
 import { UiActivityMonitor } from '../../../../src/ui/lib/ui-activity-monitor'
+import { fakePost } from '../../../fake-stats-post'
 
 describe('Update remote url', () => {
   const apiRepository: IAPIFullRepository = {
@@ -55,7 +56,8 @@ describe('Update remote url', () => {
       shell,
       new StatsStore(
         new StatsDatabase('test-StatsDatabase'),
-        new UiActivityMonitor()
+        new UiActivityMonitor(),
+        fakePost
       )
     )
     await gitStore.loadRemotes()
diff --git a/app/test/unit/text-diff-expansion-test.ts b/app/test/unit/text-diff-expansion-test.ts
index d330178a4ff..68a4c5df85c 100644
--- a/app/test/unit/text-diff-expansion-test.ts
+++ b/app/test/unit/text-diff-expansion-test.ts
@@ -1,7 +1,7 @@
 import * as path from 'path'
 import * as os from 'os'
 import * as FSE from 'fs-extra'
-import { GitProcess } from 'dugite'
+import { exec } from 'dugite'
 import { DiffParser } from '../../src/lib/diff-parser'
 import {
   expandTextDiffHunk,
@@ -42,7 +42,7 @@ async function prepareDiff(
   await FSE.writeFile(path.join(contentFolderPath, 'changed'), modifiedContents)
 
   // Generate diff with 3 lines of context
-  const result = await GitProcess.exec(
+  const result = await exec(
     [
       'diff',
       '-U3',
diff --git a/app/test/unit/text-token-parser-test.ts b/app/test/unit/text-token-parser-test.ts
index 5584a86b04b..95f01450eb1 100644
--- a/app/test/unit/text-token-parser-test.ts
+++ b/app/test/unit/text-token-parser-test.ts
@@ -1,3 +1,4 @@
+import { Emoji } from '../../src/lib/emoji'
 import {
   Tokenizer,
   TokenType,
@@ -7,7 +8,15 @@ import {
 import { Repository } from '../../src/models/repository'
 import { gitHubRepoFixture } from '../helpers/github-repo-builder'
 
-const emoji = new Map<string, string>([[':shipit:', '/some/path.png']])
+const emoji = new Map<string, Emoji>([
+  [
+    ':shipit:',
+    {
+      url: '/some/path.png',
+      aliases: [':shipit:'],
+    },
+  ],
+])
 
 describe('Tokenizer', () => {
   describe('basic tests', () => {
diff --git a/app/test/unit/wrap-rich-text-commit-message-test.ts b/app/test/unit/wrap-rich-text-commit-message-test.ts
index fd76b5f732f..c91b3eaf083 100644
--- a/app/test/unit/wrap-rich-text-commit-message-test.ts
+++ b/app/test/unit/wrap-rich-text-commit-message-test.ts
@@ -6,9 +6,10 @@ import {
 } from '../../src/lib/text-token-parser'
 import { gitHubRepoFixture } from '../helpers/github-repo-builder'
 import { Repository } from '../../src/models/repository'
+import { Emoji } from '../../src/lib/emoji'
 
 describe('wrapRichTextCommitMessage', () => {
-  const emojis = new Map<string, string>()
+  const emojis = new Map<string, Emoji>()
   const repo = new Repository(
     '.',
     -1,
diff --git a/app/webpack.common.ts b/app/webpack.common.ts
index caecc3deda0..25af0923ecf 100644
--- a/app/webpack.common.ts
+++ b/app/webpack.common.ts
@@ -2,15 +2,9 @@ import * as path from 'path'
 import HtmlWebpackPlugin from 'html-webpack-plugin'
 import webpack from 'webpack'
 import merge from 'webpack-merge'
-import { getChannel } from '../script/dist-info'
 import { getReplacements } from './app-info'
 
-const channel = getChannel()
-
 export const externals = ['7zip']
-if (channel === 'development') {
-  externals.push('devtron')
-}
 
 const outputDir = 'out'
 export const replacements = getReplacements()
@@ -81,7 +75,7 @@ export const renderer = merge({}, commonConfig, {
       },
       {
         test: /\.cmd$/,
-        loader: 'file-loader',
+        type: 'asset/resource',
       },
     ],
   },
diff --git a/app/webpack.development.ts b/app/webpack.development.ts
index 8cb68465b04..a87b602d404 100644
--- a/app/webpack.development.ts
+++ b/app/webpack.development.ts
@@ -57,7 +57,7 @@ const rendererConfig = merge({}, common.renderer, config, {
         use: [
           'style-loader',
           { loader: 'css-loader', options: { sourceMap: true } },
-          'sass-loader?sourceMap',
+          { loader: 'sass-loader', options: { sourceMap: true } },
         ],
       },
     ],
@@ -79,7 +79,7 @@ const crashConfig = merge({}, common.crash, config, {
         use: [
           'style-loader',
           { loader: 'css-loader', options: { sourceMap: true } },
-          'sass-loader?sourceMap',
+          { loader: 'sass-loader', options: { sourceMap: true } },
         ],
       },
     ],
diff --git a/app/yarn.lock b/app/yarn.lock
index 7c80ee90e78..4466401f16b 100644
--- a/app/yarn.lock
+++ b/app/yarn.lock
@@ -30,6 +30,25 @@
     enabled "2.0.x"
     kuler "^2.0.0"
 
+"@floating-ui/core@^1.2.6":
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.2.6.tgz#d21ace437cc919cdd8f1640302fa8851e65e75c0"
+  integrity sha512-EvYTiXet5XqweYGClEmpu3BoxmsQ4hkj3QaYA6qEnigCWffTP3vNRwBReTdrwDwo7OoJ3wM8Uoe9Uk4n+d4hfg==
+
+"@floating-ui/dom@^1.2.7":
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.2.7.tgz#c123e4db014b07b97e996cd459245fa217049c6b"
+  integrity sha512-DyqylONj1ZaBnzj+uBnVfzdjjCkFCL2aA9ESHLyUOGSqb03RpbLMImP1ekIQXYs4KLk9jAjJfZAU8hXfWSahEg==
+  dependencies:
+    "@floating-ui/core" "^1.2.6"
+
+"@floating-ui/react-dom@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@floating-ui/react-dom/-/react-dom-2.0.0.tgz#7514baac526c818892bbcc84e1c3115008c029f9"
+  integrity sha512-Ke0oU3SeuABC2C4OFu2mSAwHIP5WUiV98O9YWoHV4Q5aT6E9k06DV0Khi5uYspR8xmmBk08t8ZDcz3TR3ARkEg==
+  dependencies:
+    "@floating-ui/dom" "^1.2.7"
+
 "@github/alive-client@^0.0.2":
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/@github/alive-client/-/alive-client-0.0.2.tgz#77ccf103483f87930ca25ee8d69c4ab7b86be53f"
@@ -48,28 +67,6 @@
   resolved "https://registry.yarnpkg.com/@github/stable-socket/-/stable-socket-1.1.0.tgz#b8598c02df1a935fb0c970252f0b0062f4bdaa29"
   integrity sha512-kzLHnrWGvmXka7AIUnsyF+SO5dP4dxEXX2sMixXW5ngRf3i4RhvXzFNgXVy4qBKsIsg6V3fNb3NOto0z6o4XAw==
 
-"@icons/material@^0.2.4":
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/@icons/material/-/material-0.2.4.tgz#e90c9f71768b3736e76d7dd6783fc6c2afa88bc8"
-  integrity sha512-QPcGmICAPbGLGb6F/yNf/KzKqvFx8z5qx3D1yFqVAjoFmXK35EgyW+cJ57Te3CNsmzblwtzakLGFqHPqrfb4Tw==
-
-"@sindresorhus/is@^0.14.0":
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
-  integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
-
-"@szmarczak/http-timer@^1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"
-  integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==
-  dependencies:
-    defer-to-connect "^1.0.1"
-
-accessibility-developer-tools@^2.11.0:
-  version "2.12.0"
-  resolved "https://registry.yarnpkg.com/accessibility-developer-tools/-/accessibility-developer-tools-2.12.0.tgz#3da0cce9d6ec6373964b84f35db7cfc3df7ab514"
-  integrity sha1-PaDM6dbsY3OWS4TzXbfPw996tRQ=
-
 ansi-html@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
@@ -112,16 +109,16 @@ are-we-there-yet@~1.1.2:
     delegates "^1.0.0"
     readable-stream "^2.0.6"
 
-asap@~2.0.3:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
-  integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
-
 async@^3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/async/-/async-3.2.3.tgz#ac53dafd3f4720ee9e8a160628f18ea91df196c9"
   integrity sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==
 
+b4a@^1.6.4:
+  version "1.6.7"
+  resolved "https://registry.yarnpkg.com/b4a/-/b4a-1.6.7.tgz#a99587d4ebbfbd5a6e3b21bdb5d5fa385767abe4"
+  integrity sha512-OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg==
+
 babel-runtime@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
@@ -131,9 +128,14 @@ babel-runtime@^6.26.0:
     regenerator-runtime "^0.11.0"
 
 balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
+
+bare-events@^2.2.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.5.0.tgz#305b511e262ffd8b9d5616b056464f8e1b3329cc"
+  integrity sha512-/E8dDe9dsbLyh2qrZ64PEPadOQ0F4gbl1sUJOrmph7xOiIxfY8vwab/4bFLh4Y88/Hk/ujKcrQKc+ps0mv873A==
 
 bl@^3.0.0:
   version "3.0.1"
@@ -143,9 +145,9 @@ bl@^3.0.0:
     readable-stream "^3.0.1"
 
 brace-expansion@^1.1.7:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
-  integrity sha1-wHshHHyVLsH479Uad+8NHTmQopI=
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
   dependencies:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
@@ -155,19 +157,6 @@ byline@^5.0.0:
   resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"
   integrity sha1-dBxSFkaOrcRXsDQQEYrXfejB3bE=
 
-cacheable-request@^6.0.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912"
-  integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==
-  dependencies:
-    clone-response "^1.0.2"
-    get-stream "^5.1.0"
-    http-cache-semantics "^4.0.0"
-    keyv "^3.0.0"
-    lowercase-keys "^2.0.0"
-    normalize-url "^4.1.0"
-    responselike "^1.0.2"
-
 chain-function@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/chain-function/-/chain-function-1.0.0.tgz#0d4ab37e7e18ead0bdc47b920764118ce58733dc"
@@ -182,14 +171,7 @@ chalk@^2.3.0:
     escape-string-regexp "^1.0.5"
     supports-color "^4.0.0"
 
-checksum@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/checksum/-/checksum-0.1.1.tgz#dc6527d4c90be8560dbd1ed4cecf3297d528e9e9"
-  integrity sha1-3GUn1MkL6FYNvR7Uzs8yl9Uo6ek=
-  dependencies:
-    optimist "~0.3.5"
-
-chownr@^1.1.1, chownr@^1.1.4:
+chownr@^1.1.1:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
   integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
@@ -199,13 +181,6 @@ classnames@^2.2.3, classnames@^2.2.5:
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d"
   integrity sha1-+zgB1FNGdknvNgPH1hoCvRKb3m0=
 
-clone-response@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
-  integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=
-  dependencies:
-    mimic-response "^1.0.0"
-
 code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
@@ -216,10 +191,20 @@ codemirror-mode-elixir@^1.1.2:
   resolved "https://registry.yarnpkg.com/codemirror-mode-elixir/-/codemirror-mode-elixir-1.1.2.tgz#61227208d2684d928500af6934e4b9c995fb0960"
   integrity sha512-1oIuRVHyUhLv0Za9sEIsI7urAj06EohwO/yVj10bg7aHnimHQ964Wk3uuoPH0Yn8L38EkOd+SwULYpDiCQtoTA==
 
-codemirror@^5.60.0:
-  version "5.60.0"
-  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.60.0.tgz#00a8cfd287d5d8737ceb73987f04aee2fe5860da"
-  integrity sha512-AEL7LhFOlxPlCL8IdTcJDblJm8yrAGib7I+DErJPdZd4l6imx8IMgKK3RblVgBQqz3TZJR4oknQ03bz+uNjBYA==
+codemirror-mode-luau@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/codemirror-mode-luau/-/codemirror-mode-luau-1.0.2.tgz#282689d3f3c10f1bc262c885ce79ff90731d3a72"
+  integrity sha512-WvEIX0mtdp/sHbQqHJLyZJhu9Z6EhKEzcpK+iDrEOAY/tCAA1ThoPYcQ9eFf4qSx/P3qvDnW518mZyBSmtJjWg==
+
+codemirror-mode-zig@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/codemirror-mode-zig/-/codemirror-mode-zig-1.0.7.tgz#589416e4de4bd28636a34cbeed276e6fb2d4b380"
+  integrity sha512-4kvvZ0T7z2zobBoQq/vfcn6TZZFdZr5OhPDHDUqfkT3iK6tW18SkfM7MYbWts7XmAvXPl6wC81i0ppDOCoOXyw==
+
+codemirror@^5.65.17:
+  version "5.65.17"
+  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.65.17.tgz#00d71f34c3518471ae4c0de23a2f8bb39a6df6ca"
+  integrity sha512-1zOsUx3lzAOu/gnMAZkQ9kpIHcPYOc9y1Fbm2UVk5UBPkdq380nhkelG0qUwm1f7wPvTbndu9ZYlug35EwAZRQ==
 
 color-convert@^1.9.0:
   version "1.9.0"
@@ -277,32 +262,27 @@ compare-versions@^3.6.0:
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
 console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
   integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
 
-core-js@^1.0.0:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
-  integrity sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=
-
 core-js@^2.4.0:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.1.tgz#ae6874dc66937789b80754ff5428df66819ca50b"
   integrity sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs=
 
 core-util-is@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
+  integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
 
 cross-spawn@^6.0.0:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
-  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
+  version "6.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.6.tgz#30d0efa0712ddb7eb5a76e1e8721bffafa6b5d57"
+  integrity sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==
   dependencies:
     nice-try "^1.0.4"
     path-key "^2.0.1"
@@ -315,20 +295,6 @@ csstype@^3.0.2:
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.2.tgz#ee5ff8f208c8cd613b389f7b222c9801ca62b3f7"
   integrity sha512-ofovWglpqoqbfLNOTBNZLSbMuGrblAf1efvvArGKOZMBrIoJeu5UsAipQolkijtyQx5MtAzT/J9IHj/CEY1mJw==
 
-debug@^4.0.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
-  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
-  dependencies:
-    ms "^2.1.1"
-
-decompress-response@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
-  integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=
-  dependencies:
-    mimic-response "^1.0.0"
-
 decompress-response@^4.2.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz#414023cc7a302da25ce2ec82d0d5238ccafd8986"
@@ -353,31 +319,26 @@ deep-extend@^0.6.0:
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
   integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
 
-defer-to-connect@^1.0.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.1.tgz#88ae694b93f67b81815a2c8c769aef6574ac8f2f"
-  integrity sha512-J7thop4u3mRTkYRQ+Vpfwy2G5Ehoy82I14+14W4YMDLKdWloI9gSzRbV30s/NckQGVJtPkWNcW4oMAUigTdqiQ==
-
 delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
   integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
 
-desktop-notifications@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/desktop-notifications/-/desktop-notifications-0.2.2.tgz#197a32ee504a894ad074793dab285681c533e5ac"
-  integrity sha512-XMnxdWV6ZfiCzLZNC00n6h30Jt3z8yv21FAPBt/kK6hANI0PaoYWsRKEYya0zMUAX/9lrh429R5OtRGOKWZQSw==
+desktop-notifications@^0.2.4:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/desktop-notifications/-/desktop-notifications-0.2.4.tgz#d51db18be583784a296748efd361fe3a5aefea70"
+  integrity sha512-Au0CbBE4TQ09vsC4/L15FhDsCr/daIyYUY3vkx4S3Y0Sp9EPpbXxBdmz0ry1cOnQ8A47K45zTYsuKP7a+xHm7Q==
   dependencies:
     node-addon-api "^5.0.0"
     prebuild-install "^7.0.1"
     uuid "^8.3.2"
 
-desktop-trampoline@desktop/desktop-trampoline#v0.9.8:
-  version "0.9.8"
-  resolved "https://codeload.github.com/desktop/desktop-trampoline/tar.gz/cbd3dbb31d0d3ea9f325067f48bfbf60b6663a57"
+desktop-trampoline@desktop/desktop-trampoline#v0.9.10:
+  version "0.9.10"
+  resolved "https://codeload.github.com/desktop/desktop-trampoline/tar.gz/8f6ceec51d9434d4ada9022bb7d62f01f1d8f51b"
   dependencies:
-    node-addon-api "^3.1.0"
-    prebuild-install "^6.0.0"
+    node-addon-api "^4.3.0"
+    prebuild-install "^7.1.2"
 
 detect-libc@^1.0.3:
   version "1.0.3"
@@ -389,25 +350,11 @@ detect-libc@^2.0.0:
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.0.tgz#c528bc09bc6d1aa30149228240917c225448f204"
   integrity sha512-S55LzUl8HUav8l9E2PBTlC5PAJrHK7tkM+XXFGD+fbsbkTzhCpG6K05LxJcUOEWzMa4v6ptcMZ9s3fOdJDu0Zw==
 
-devtron@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/devtron/-/devtron-1.4.0.tgz#b5e748bd6e95bbe70bfcc68aae6fe696119441e1"
-  integrity sha1-tedIvW6Vu+cL/MaKrm/mlhGUQeE=
-  dependencies:
-    accessibility-developer-tools "^2.11.0"
-    highlight.js "^9.3.0"
-    humanize-plus "^1.8.1"
-
 dexie@^3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/dexie/-/dexie-3.2.2.tgz#fa6f2a3c0d6ed0766f8d97a03720056f88fe0e01"
   integrity sha512-q5dC3HPmir2DERlX+toCBbHQXW5MsyrFqPFcovkH9N2S/UW/H3H5AWAB6iEOExeraAu+j+zRDG+zg/D7YhH0qg==
 
-dom-classlist@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/dom-classlist/-/dom-classlist-1.0.1.tgz#722814dc2f509d3d7d06f2533ba9ff48eeea59b9"
-  integrity sha1-cigU3C9QnT19BvJTO6n/SO7qWbk=
-
 "dom-helpers@^2.4.0 || ^3.0.0", dom-helpers@^3.3.1:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.4.0.tgz#e9b369700f959f62ecde5a6babde4bccd9169af8"
@@ -423,40 +370,18 @@ dom-helpers@^5.0.1:
     "@babel/runtime" "^7.8.7"
     csstype "^3.0.2"
 
-dom-matches@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/dom-matches/-/dom-matches-2.0.0.tgz#d2728b416a87533980eb089b848d253cf23a758c"
-  integrity sha1-0nKLQWqHUzmA6wibhI0lPPI6dYw=
-
-dompurify@^2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.3.tgz#c1af3eb88be47324432964d8abc75cf4b98d634c"
-  integrity sha512-dqnqRkPMAjOZE0FogZ+ceJNM2dZ3V/yNOuFB7+39qpO93hHhfRpHw3heYQC7DPK9FqbQTfBKUJhiSfz4MvXYwg==
+dompurify@^2.5.4:
+  version "2.5.4"
+  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.5.4.tgz#347e91070963b22db31c7c8d0ce9a0a2c3c08746"
+  integrity sha512-l5NNozANzaLPPe0XaAwvg3uZcHtDBnziX/HjsY1UcDj1MxTK8Dd0Kv096jyPK5HRzs/XM5IMj20dW8Fk+HnbUA==
 
-dugite@^1.109.0:
-  version "1.109.0"
-  resolved "https://registry.yarnpkg.com/dugite/-/dugite-1.109.0.tgz#662f726befeefb47b697d6e08f940be865699b74"
-  integrity sha512-pPAs67j/sF6Y84pfI94VOtjMtCxX17OaNOggP+pJAZ4sA53OvcQj2zPgk87EnZaZoOmQYa0EdlH/tsEQhc+wVA==
+dugite@3.0.0-rc5:
+  version "3.0.0-rc5"
+  resolved "https://registry.yarnpkg.com/dugite/-/dugite-3.0.0-rc5.tgz#03cd2a14963ada9558e38186b3bcfff169183fc3"
+  integrity sha512-Imp6ngSxvc/wM9KaP7rlB8HgxXvyRgrcwOsy3w41HgzqGxWMusAaPLY6OcdejKQHGSOFGHCp7ymeMEF3nIe0rA==
   dependencies:
-    checksum "^0.1.1"
-    got "^9.6.0"
-    mkdirp "^0.5.1"
     progress "^2.0.3"
-    rimraf "^2.5.4"
-    tar "^4.4.7"
-
-duplexer3@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
-  integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=
-
-electron-debug@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/electron-debug/-/electron-debug-3.1.0.tgz#0df17297487fa3c82344d810812853bf67f0bd69"
-  integrity sha512-SWEqLj4MgfV3tGuO5eBLQ5/Nr6M+KPxsnE0bUJZvQebGJus6RAcdmvd7L+l0Ji31h2mmrN23l2tHFtCa2FvurA==
-  dependencies:
-    electron-is-dev "^1.1.0"
-    electron-localshortcut "^3.1.0"
+    tar-stream "^3.1.7"
 
 electron-devtools-installer@^3.2.0:
   version "3.2.0"
@@ -468,26 +393,6 @@ electron-devtools-installer@^3.2.0:
     tslib "^2.1.0"
     unzip-crx-3 "^0.2.0"
 
-electron-is-accelerator@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/electron-is-accelerator/-/electron-is-accelerator-0.1.2.tgz#509e510c26a56b55e17f863a4b04e111846ab27b"
-  integrity sha1-UJ5RDCala1Xhf4Y6SwThEYRqsns=
-
-electron-is-dev@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-1.1.0.tgz#b15a2a600bdc48a51a857d460e05f15b19a2522c"
-  integrity sha512-Z1qA/1oHNowGtSBIcWk0pcLEqYT/j+13xUw/MYOrBUOL4X7VN0i0KCTf5SqyvMPmW5pSPKbo28wkxMxzZ20YnQ==
-
-electron-localshortcut@^3.1.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/electron-localshortcut/-/electron-localshortcut-3.2.1.tgz#cfc83a3eff5e28faf98ddcc87f80a2ce4f623cd3"
-  integrity sha512-DWvhKv36GsdXKnaFFhEiK8kZZA+24/yFLgtTwJJHc7AFgDjNRIBJZ/jq62Y/dWv9E4ypYwrVWN2bVrCYw1uv7Q==
-  dependencies:
-    debug "^4.0.1"
-    electron-is-accelerator "^0.1.0"
-    keyboardevent-from-electron-accelerator "^2.0.0"
-    keyboardevents-areequal "^0.2.1"
-
 electron-window-state@^5.0.3:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/electron-window-state/-/electron-window-state-5.0.3.tgz#4f36d09e3f953d87aff103bf010f460056050aa8"
@@ -501,13 +406,6 @@ enabled@2.0.x:
   resolved "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz#f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2"
   integrity sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==
 
-encoding@^0.1.11:
-  version "0.1.12"
-  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
-  integrity sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=
-  dependencies:
-    iconv-lite "~0.4.13"
-
 end-of-stream@^1.1.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
@@ -550,18 +448,10 @@ expand-template@^2.0.3:
   resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c"
   integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==
 
-fbjs@^0.8.16:
-  version "0.8.16"
-  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
-  integrity sha1-XmdDL1UNxBtXK/VYR7ispk5TN9s=
-  dependencies:
-    core-js "^1.0.0"
-    isomorphic-fetch "^2.1.1"
-    loose-envify "^1.0.0"
-    object-assign "^4.1.0"
-    promise "^7.1.1"
-    setimmediate "^1.0.5"
-    ua-parser-js "^0.7.9"
+fast-fifo@^1.2.0, fast-fifo@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.3.2.tgz#286e31de96eb96d38a97899815740ba2a4f3640c"
+  integrity sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==
 
 fecha@^4.2.0:
   version "4.2.1"
@@ -600,13 +490,6 @@ fs-constants@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
   integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
 
-fs-minipass@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
-  integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
-  dependencies:
-    minipass "^2.6.0"
-
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
@@ -631,37 +514,18 @@ gauge@~2.7.3:
     strip-ansi "^3.0.1"
     wide-align "^1.1.0"
 
-get-stream@^4.0.0, get-stream@^4.1.0:
+get-stream@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
   integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
   dependencies:
     pump "^3.0.0"
 
-get-stream@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz#01203cdc92597f9b909067c3e656cc1f4d3c4dc9"
-  integrity sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==
-  dependencies:
-    pump "^3.0.0"
-
 github-from-package@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce"
   integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=
 
-glob@^7.0.5:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
-  integrity sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 glob@^7.1.3:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
@@ -674,23 +538,6 @@ glob@^7.1.3:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-got@^9.6.0:
-  version "9.6.0"
-  resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85"
-  integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==
-  dependencies:
-    "@sindresorhus/is" "^0.14.0"
-    "@szmarczak/http-timer" "^1.1.2"
-    cacheable-request "^6.0.0"
-    decompress-response "^3.3.0"
-    duplexer3 "^0.1.4"
-    get-stream "^4.1.0"
-    lowercase-keys "^1.0.1"
-    mimic-response "^1.0.1"
-    p-cancelable "^1.0.0"
-    to-readable-stream "^1.0.0"
-    url-parse-lax "^3.0.0"
-
 graceful-fs@^4.1.6:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
@@ -706,35 +553,15 @@ has-unicode@^2.0.0:
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
   integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
 
-highlight.js@^9.3.0:
-  version "9.18.5"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.5.tgz#d18a359867f378c138d6819edfc2a8acd5f29825"
-  integrity sha512-a5bFyofd/BHCX52/8i8uJkjr9DYwXIPnM/plwI6W7ezItLGqzt7X2G2nXuYSfsIJdkwwj/g9DG1LkcGJI/dDoA==
-
 html-entities@^1.2.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
   integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=
 
-http-cache-semantics@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.0.3.tgz#495704773277eeef6e43f9ab2c2c7d259dda25c5"
-  integrity sha512-TcIMG3qeVLgDr1TEd2XvHaTnMPwYQUQMIBLy+5pLSDKYFc7UIqj39w8EGzZkaxoLv/l2K8HaI0t5AVA+YYgUew==
-
-humanize-plus@^1.8.1:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/humanize-plus/-/humanize-plus-1.8.2.tgz#a65b34459ad6367adbb3707a82a3c9f916167030"
-  integrity sha1-pls0RZrWNnrbs3B6gqPJ+RYWcDA=
-
-iconv-lite@~0.4.13:
-  version "0.4.19"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
-  integrity sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==
-
 immediate@~3.0.5:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
-  integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=
+  integrity sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==
 
 inflight@^1.0.4:
   version "1.0.6"
@@ -776,7 +603,7 @@ is-fullwidth-code-point@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
   integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
 
-is-stream@^1.0.1, is-stream@^1.1.0:
+is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
   integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
@@ -789,21 +616,13 @@ is-stream@^2.0.0:
 isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+  integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
 
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
-isomorphic-fetch@^2.1.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
-  integrity sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=
-  dependencies:
-    node-fetch "^1.0.1"
-    whatwg-fetch ">=0.10.0"
-
 js-tokens@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
@@ -814,11 +633,6 @@ js-tokens@^3.0.0:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-json-buffer@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
-  integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=
-
 jsonfile@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
@@ -827,24 +641,14 @@ jsonfile@^4.0.0:
     graceful-fs "^4.1.6"
 
 jszip@^3.1.0:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.7.1.tgz#bd63401221c15625a1228c556ca8a68da6fda3d9"
-  integrity sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.10.1.tgz#34aee70eb18ea1faec2f589208a157d1feb091c2"
+  integrity sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==
   dependencies:
     lie "~3.3.0"
     pako "~1.0.2"
     readable-stream "~2.3.6"
-    set-immediate-shim "~1.0.1"
-
-keyboardevent-from-electron-accelerator@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/keyboardevent-from-electron-accelerator/-/keyboardevent-from-electron-accelerator-2.0.0.tgz#ace21b1aa4e47148815d160057f9edb66567c50c"
-  integrity sha512-iQcmNA0M4ETMNi0kG/q0h/43wZk7rMeKYrXP7sqKIJbHkTU8Koowgzv+ieR/vWJbOwxx5nDC3UnudZ0aLSu4VA==
-
-keyboardevents-areequal@^0.2.1:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/keyboardevents-areequal/-/keyboardevents-areequal-0.2.2.tgz#88191ec738ce9f7591c25e9056de928b40277194"
-  integrity sha512-Nv+Kr33T0mEjxR500q+I6IWisOQ0lK1GGOncV0kWE6n4KFmpcu7RUX5/2B0EUtX51Cb0HjZ9VJsSY3u4cBa0kw==
+    setimmediate "^1.0.5"
 
 keytar@^7.8.0:
   version "7.8.0"
@@ -854,13 +658,6 @@ keytar@^7.8.0:
     node-addon-api "^4.3.0"
     prebuild-install "^7.0.1"
 
-keyv@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9"
-  integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==
-  dependencies:
-    json-buffer "3.0.0"
-
 kuler@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/kuler/-/kuler-2.0.0.tgz#e2c570a3800388fb44407e851531c1d670b061b3"
@@ -873,12 +670,7 @@ lie@~3.3.0:
   dependencies:
     immediate "~3.0.5"
 
-lodash-es@^4.17.15:
-  version "4.17.21"
-  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee"
-  integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==
-
-lodash@^4.0.1, lodash@^4.17.15:
+lodash@^4.17.21:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -894,7 +686,7 @@ logform@^2.3.2, logform@^2.4.0:
     safe-stable-stringify "^2.3.1"
     triple-beam "^1.3.0"
 
-loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.0, loose-envify@^1.3.1:
+loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
   integrity sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=
@@ -908,16 +700,6 @@ loose-envify@^1.4.0:
   dependencies:
     js-tokens "^3.0.0 || ^4.0.0"
 
-lowercase-keys@^1.0.0, lowercase-keys@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
-  integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
-
-lowercase-keys@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
-  integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==
-
 lru-cache@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
@@ -937,11 +719,6 @@ marked@^4.0.10:
   resolved "https://registry.yarnpkg.com/marked/-/marked-4.0.10.tgz#423e295385cc0c3a70fa495e0df68b007b879423"
   integrity sha512-+QvuFj0nGgO970fySghXGmuw+Fd0gD2x3+MqCWLIPf5oxdv1Ka6b2q+z9RP01P/IaKPMEramy+7cNy/Lw8c3hw==
 
-material-colors@^1.2.1:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/material-colors/-/material-colors-1.2.6.tgz#6d1958871126992ceecc72f4bcc4d8f010865f46"
-  integrity sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg==
-
 mem@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178"
@@ -961,10 +738,10 @@ mimic-fn@^2.0.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
-mimic-response@^1.0.0, mimic-response@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
-  integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
+mimic-fn@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-4.0.0.tgz#60a90550d5cb0b239cca65d893b1a53b29871ecc"
+  integrity sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==
 
 mimic-response@^2.0.0:
   version "2.1.0"
@@ -977,9 +754,9 @@ mimic-response@^3.1.0:
   integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==
 
 minimatch@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
+  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
   dependencies:
     brace-expansion "^1.1.7"
 
@@ -988,27 +765,17 @@ minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
   integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
 
-minipass@^2.6.0, minipass@^2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
-  integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
-  dependencies:
-    safe-buffer "^5.1.2"
-    yallist "^3.0.0"
-
-minizlib@^1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
-  integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
-  dependencies:
-    minipass "^2.9.0"
+minimist@^1.2.8:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
+  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
 
 mkdirp-classic@^0.5.3:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
   integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
 
-mkdirp@^0.5.1, mkdirp@^0.5.5:
+mkdirp@^0.5.1:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
   integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
@@ -1064,24 +831,16 @@ node-addon-api@^5.0.0:
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-5.0.0.tgz#7d7e6f9ef89043befdb20c1989c905ebde18c501"
   integrity sha512-CvkDw2OEnme7ybCykJpVcKH+uAOLV2qLqiyla128dN9TkEWfrYmxG6C2boDe5KcNQqZF3orkqzGgOMvZ/JNekA==
 
-node-fetch@^1.0.1:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
-  integrity sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==
-  dependencies:
-    encoding "^0.1.11"
-    is-stream "^1.0.1"
+node-addon-api@^7.0.0:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-7.1.1.tgz#1aba6693b0f255258a049d621329329322aad558"
+  integrity sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==
 
 noop-logger@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2"
   integrity sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI=
 
-normalize-url@^4.1.0:
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a"
-  integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==
-
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -1123,23 +882,11 @@ one-time@^1.0.0:
   dependencies:
     fn.name "1.x.x"
 
-optimist@~0.3.5:
-  version "0.3.7"
-  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.3.7.tgz#c90941ad59e4273328923074d2cf2e7cbc6ec0d9"
-  integrity sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=
-  dependencies:
-    wordwrap "~0.0.2"
-
 os-tmpdir@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
-p-cancelable@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
-  integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==
-
 p-defer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
@@ -1162,6 +909,14 @@ p-limit@^2.2.0:
   dependencies:
     p-try "^2.0.0"
 
+p-memoize@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/p-memoize/-/p-memoize-7.1.1.tgz#53b1d0e6007288f7261cfa11a7603b84c9261bfa"
+  integrity sha512-DZ/bONJILHkQ721hSr/E9wMz5Am/OTJ9P6LhLFo2Tu+jL8044tgc9LwHO8g4PiaYePnlVVRAJcKmgy8J9MVFrA==
+  dependencies:
+    mimic-fn "^4.0.0"
+    type-fest "^3.0.0"
+
 p-try@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.1.0.tgz#c1a0f1030e97de018bb2c718929d2af59463e505"
@@ -1243,10 +998,23 @@ prebuild-install@^7.0.1:
     tar-fs "^2.0.0"
     tunnel-agent "^0.6.0"
 
-prepend-http@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
-  integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
+prebuild-install@^7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.2.tgz#a5fd9986f5a6251fbc47e1e5c65de71e68c0a056"
+  integrity sha512-UnNke3IQb6sgarcZIDU3gbMeTp/9SSU1DAIkil7PrqG1vZlBtY5msYccSKSHDqa3hNg436IXK+SNImReuA1wEQ==
+  dependencies:
+    detect-libc "^2.0.0"
+    expand-template "^2.0.3"
+    github-from-package "0.0.0"
+    minimist "^1.2.3"
+    mkdirp-classic "^0.5.3"
+    napi-build-utils "^1.0.1"
+    node-abi "^3.3.0"
+    pump "^3.0.0"
+    rc "^1.2.7"
+    simple-get "^4.0.0"
+    tar-fs "^2.0.0"
+    tunnel-agent "^0.6.0"
 
 primer-support@^4.0.0:
   version "4.3.0"
@@ -1263,38 +1031,14 @@ progress@^2.0.3:
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
-promise@^7.1.1:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
-  integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
-  dependencies:
-    asap "~2.0.3"
-
-prop-types@^15.5.10, prop-types@^15.6.2, prop-types@^15.7.2:
-  version "15.7.2"
-  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
-  integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
+prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
+  version "15.8.1"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
+  integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
   dependencies:
     loose-envify "^1.4.0"
     object-assign "^4.1.1"
-    react-is "^16.8.1"
-
-prop-types@^15.6.0:
-  version "15.6.0"
-  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856"
-  integrity sha1-zq8IMCL8RrSjX2nhPvda7Q1jmFY=
-  dependencies:
-    fbjs "^0.8.16"
-    loose-envify "^1.3.1"
-    object-assign "^4.1.1"
-
-prop-types@^15.6.1:
-  version "15.6.2"
-  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102"
-  integrity sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ==
-  dependencies:
-    loose-envify "^1.3.1"
-    object-assign "^4.1.1"
+    react-is "^16.13.1"
 
 pump@^3.0.0:
   version "3.0.0"
@@ -1309,6 +1053,11 @@ querystring@^0.2.0:
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
   integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
 
+queue-tick@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/queue-tick/-/queue-tick-1.0.1.tgz#f6f07ac82c1fd60f82e098b417a80e52f1f4c142"
+  integrity sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==
+
 quick-lru@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-3.0.0.tgz#2f96145481567e5bc442c6c4a66e86158405c696"
@@ -1324,18 +1073,17 @@ rc@^1.2.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-react-color@^2.19.3:
-  version "2.19.3"
-  resolved "https://registry.yarnpkg.com/react-color/-/react-color-2.19.3.tgz#ec6c6b4568312a3c6a18420ab0472e146aa5683d"
-  integrity sha512-LEeGE/ZzNLIsFWa1TMe8y5VYqr7bibneWmvJwm1pCn/eNmrabWDh659JSPn9BuaMpEfU83WTOJfnCcjDZwNQTA==
+re2js@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/re2js/-/re2js-0.3.0.tgz#4d69d9bee8cb9eaf5ac35f9db36b23640e533ace"
+  integrity sha512-FKfaeBtpUIbtqSBy5KnlRG3jVRCCPul5EUPzhaTfJ8peGZOVHl90c3jslCv6sW6/vmwMJ3eBXe8zLpoAdDDN8w==
+
+react-confetti@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/react-confetti/-/react-confetti-6.1.0.tgz#03dc4340d955acd10b174dbf301f374a06e29ce6"
+  integrity sha512-7Ypx4vz0+g8ECVxr88W9zhcQpbeujJAVqL14ZnXJ3I23mOI9/oBVTQ3dkJhUmB0D6XOtCZEM6N0Gm9PMngkORw==
   dependencies:
-    "@icons/material" "^0.2.4"
-    lodash "^4.17.15"
-    lodash-es "^4.17.15"
-    material-colors "^1.2.1"
-    prop-types "^15.5.10"
-    reactcss "^1.2.0"
-    tinycolor2 "^1.4.1"
+    tween-functions "^1.2.0"
 
 react-css-transition-replace@^3.0.3:
   version "3.0.3"
@@ -1357,10 +1105,10 @@ react-dom@^16.8.4:
     prop-types "^15.6.2"
     scheduler "^0.13.4"
 
-react-is@^16.8.1:
-  version "16.8.4"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.4.tgz#90f336a68c3a29a096a3d648ab80e87ec61482a2"
-  integrity sha512-PVadd+WaUDOAciICm/J1waJaSvgq+4rHE/K70j0PFqKhkTBsPv/82UGQJNXAngz1fOQLLxI6z1sEDmJDQhCTAA==
+react-is@^16.13.1:
+  version "16.13.1"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
+  integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
 react-lifecycles-compat@^3.0.4:
   version "3.0.4"
@@ -1399,13 +1147,6 @@ react@^16.8.4:
     prop-types "^15.6.2"
     scheduler "^0.13.4"
 
-reactcss@^1.2.0:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/reactcss/-/reactcss-1.2.3.tgz#c00013875e557b1cf0dfd9a368a1c3dab3b548dd"
-  integrity sha512-KiwVUcFu1RErkI97ywr8nvx8dNOpT03rbnma0SSalTYjkrPYaEajR4a/MRt6DZ46K6arDRbWMNHF+xH7G7n/8A==
-  dependencies:
-    lodash "^4.0.1"
-
 readable-stream@^2.0.6, readable-stream@~2.3.6:
   version "2.3.7"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
@@ -1443,28 +1184,14 @@ regenerator-runtime@^0.13.4:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55"
   integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==
 
-registry-js@^1.15.0:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/registry-js/-/registry-js-1.15.0.tgz#eb028503df2358291e2d107fb6dc316f688e47b1"
-  integrity sha512-gNLm7hV3g2M5iKAdcQwoa2Zj8fhkArbzbXyQMVrK/6OfXOCaKnRNqgBnOGOJoJw4uwW9XImJuXijLf1ZKtSR3Q==
+registry-js@^1.16.0:
+  version "1.16.0"
+  resolved "https://registry.yarnpkg.com/registry-js/-/registry-js-1.16.0.tgz#951444f10c0e39c7669e4bde166f9237472a7c7e"
+  integrity sha512-hcMnfKhmCPTA++70qEGwRqctLBdBg+xvG3ZfAPt0ymjdTUFKtVTolelpIDK2qs8DVIurylnfM6BM9uWpVbJr+g==
   dependencies:
     node-addon-api "^3.1.0"
     prebuild-install "^5.3.5"
 
-responselike@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
-  integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=
-  dependencies:
-    lowercase-keys "^1.0.0"
-
-rimraf@^2.5.4:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
-  integrity sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==
-  dependencies:
-    glob "^7.0.5"
-
 rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
@@ -1477,7 +1204,7 @@ rimraf@~2.2.6:
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582"
   integrity sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI=
 
-safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@^5.2.1, safe-buffer@~5.2.0:
+safe-buffer@^5.0.1, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -1500,25 +1227,15 @@ scheduler@^0.13.4:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
-semver@^5.4.1:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
-  integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
-
-semver@^5.5.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+semver@^5.4.1, semver@^5.5.0:
+  version "5.7.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
+  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
-semver@^7.2.1:
-  version "7.3.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
-  integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
-
-semver@^7.3.5:
-  version "7.3.5"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
-  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
+semver@^7.2.1, semver@^7.3.5:
+  version "7.5.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
+  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
   dependencies:
     lru-cache "^6.0.0"
 
@@ -1527,15 +1244,10 @@ set-blocking@~2.0.0:
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
-set-immediate-shim@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
-  integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=
-
 setimmediate@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
-  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
+  integrity sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==
 
 shebang-command@^1.2.0:
   version "1.2.0"
@@ -1596,11 +1308,32 @@ source-map@^0.5.6:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
+split2@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/split2/-/split2-4.2.0.tgz#c9c5920904d148bab0b9f67145f245a86aadbfa4"
+  integrity sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==
+
 stack-trace@0.0.x:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
   integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=
 
+streamx@^2.15.0:
+  version "2.20.1"
+  resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.20.1.tgz#471c4f8b860f7b696feb83d5b125caab2fdbb93c"
+  integrity sha512-uTa0mU6WUC65iUvzKH4X9hEdvSW7rbPxPtwfWiLMSj3qTdQbAiUboZTxauKfpFuGIGa1C2BYijZ7wgdUXICJhA==
+  dependencies:
+    fast-fifo "^1.3.2"
+    queue-tick "^1.0.1"
+    text-decoder "^1.1.0"
+  optionalDependencies:
+    bare-events "^2.2.0"
+
+string-argv@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.2.tgz#2b6d0ef24b656274d957d54e0a4bbf6153dc02b6"
+  integrity sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==
+
 string-width@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
@@ -1689,18 +1422,14 @@ tar-stream@^2.0.0:
     inherits "^2.0.3"
     readable-stream "^3.1.1"
 
-tar@^4.4.7:
-  version "4.4.19"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.19.tgz#2e4d7263df26f2b914dee10c825ab132123742f3"
-  integrity sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==
+tar-stream@^3.1.7:
+  version "3.1.7"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-3.1.7.tgz#24b3fb5eabada19fe7338ed6d26e5f7c482e792b"
+  integrity sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==
   dependencies:
-    chownr "^1.1.4"
-    fs-minipass "^1.2.7"
-    minipass "^2.9.0"
-    minizlib "^1.3.3"
-    mkdirp "^0.5.5"
-    safe-buffer "^5.2.1"
-    yallist "^3.1.1"
+    b4a "^1.6.4"
+    fast-fifo "^1.2.0"
+    streamx "^2.15.0"
 
 temp@^0.8.3:
   version "0.8.3"
@@ -1710,6 +1439,11 @@ temp@^0.8.3:
     os-tmpdir "^1.0.0"
     rimraf "~2.2.6"
 
+text-decoder@^1.1.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/text-decoder/-/text-decoder-1.2.1.tgz#e173f5121d97bfa3ff8723429ad5ba92e1ead67e"
+  integrity sha512-x9v3H/lTKIJKQQe7RPQkLfKAnc9lUTkWDypIQgTzPJAq+5/GCDHonmshfvlsNSj58yyshbIJJDLmU15qNERrXQ==
+
 text-hex@1.0.x:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz#69dc9c1b17446ee79a92bf5b884bb4b9127506f5"
@@ -1720,16 +1454,6 @@ textarea-caret@^3.0.2:
   resolved "https://registry.yarnpkg.com/textarea-caret/-/textarea-caret-3.0.2.tgz#f360c48699aa1abf718680a43a31a850665c2caf"
   integrity sha1-82DEhpmqGr9xhoCkOjGoUGZcLK8=
 
-tinycolor2@^1.4.1:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.2.tgz#3f6a4d1071ad07676d7fa472e1fac40a719d8803"
-  integrity sha512-vJhccZPs965sV/L2sU4oRQVAos0pQXwsvTLkWYdqJ+a8Q5kPFzJTuOFwy7UniPli44NKQGAglksjvOcpo95aZA==
-
-to-readable-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771"
-  integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==
-
 triple-beam@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9"
@@ -1752,10 +1476,15 @@ tunnel-agent@^0.6.0:
   dependencies:
     safe-buffer "^5.0.1"
 
-ua-parser-js@^0.7.9:
-  version "0.7.28"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.28.tgz#8ba04e653f35ce210239c64661685bf9121dec31"
-  integrity sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g==
+tween-functions@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/tween-functions/-/tween-functions-1.2.0.tgz#1ae3a50e7c60bb3def774eac707acbca73bbc3ff"
+  integrity sha512-PZBtLYcCLtEcjL14Fzb1gSxPBeL7nWvGhO5ZFPGqziCcr8uvHp0NDmdjBchp6KHL+tExcg0m3NISmKxhU394dA==
+
+type-fest@^3.0.0:
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-3.13.1.tgz#bb744c1f0678bea7543a2d1ec24e83e68e8c8706"
+  integrity sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==
 
 untildify@^3.0.2:
   version "3.0.2"
@@ -1771,25 +1500,10 @@ unzip-crx-3@^0.2.0:
     mkdirp "^0.5.1"
     yaku "^0.16.6"
 
-url-parse-lax@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
-  integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=
-  dependencies:
-    prepend-http "^2.0.0"
-
-username@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/username/-/username-5.1.0.tgz#a7f9325adce2d0166448cdd55d4985b1360f2508"
-  integrity sha512-PCKbdWw85JsYMvmCv5GH3kXmM66rCd9m1hBEDutPNv94b/pqCMT4NtcKyeWYvLFiE8b+ha1Jdl8XAaUdPn5QTg==
-  dependencies:
-    execa "^1.0.0"
-    mem "^4.3.0"
-
 util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+  integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
 uuid@^3.0.1:
   version "3.1.0"
@@ -1818,11 +1532,6 @@ webpack-hot-middleware@^2.10.0:
     querystring "^0.2.0"
     strip-ansi "^3.0.0"
 
-whatwg-fetch@>=0.10.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz#9c84ec2dcf68187ff00bc64e1274b442176e1c84"
-  integrity sha1-nITsLc9oGH/wC8ZOEnS0QhduHIQ=
-
 which-pm-runs@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb"
@@ -1835,14 +1544,6 @@ which@^1.2.9:
   dependencies:
     isexe "^2.0.0"
 
-wicg-focus-ring@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/wicg-focus-ring/-/wicg-focus-ring-1.0.1.tgz#3868c464ed27b5ca0891329b44c5d1144c0b2095"
-  integrity sha1-OGjEZO0ntcoIkTKbRMXRFEwLIJU=
-  dependencies:
-    dom-classlist "^1.0.1"
-    dom-matches "^2.0.0"
-
 wide-align@^1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
@@ -1850,6 +1551,11 @@ wide-align@^1.1.0:
   dependencies:
     string-width "^1.0.2 || 2"
 
+"windows-argv-parser@file:../vendor/windows-argv-parser":
+  version "0.0.1"
+  dependencies:
+    node-addon-api "^7.0.0"
+
 winston-transport@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.5.0.tgz#6e7b0dd04d393171ed5e4e4905db265f7ab384fa"
@@ -1875,11 +1581,6 @@ winston@^3.6.0:
     triple-beam "^1.3.0"
     winston-transport "^4.5.0"
 
-wordwrap@~0.0.2:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
-  integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
-
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -1890,11 +1591,6 @@ yaku@^0.16.6:
   resolved "https://registry.yarnpkg.com/yaku/-/yaku-0.16.7.tgz#1d195c78aa9b5bf8479c895b9504fd4f0847984e"
   integrity sha1-HRlceKqbW/hHnIlblQT9TwhHmE4=
 
-yallist@^3.0.0, yallist@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
-  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
-
 yallist@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
diff --git a/changelog.json b/changelog.json
index e1388ed14c1..37570be09b1 100644
--- a/changelog.json
+++ b/changelog.json
@@ -1,5 +1,1166 @@
 {
   "releases": {
+    "3.4.13-beta1": [
+      "[Fixed] Fix Branch List context menu showing pull request option when none exists - #19711. Thanks @DylanDevelops!",
+      "[Fixed] The Thank You banner is announced by VoiceOver - #19734",
+      "[Improved] Have CLI invoke the app directly - #19733",
+      "[Improved] Don't execute rev-parse unless we have to - #19694",
+      "[Removed] Remove the tooltip on the CI status indicator - #19735",
+      "[Removed] Drop support for Atom, invoke editors directly - #19744"
+    ],
+    "3.4.12": [
+      "[Fixed] Merge branch dialog updates whether a branch can be merged when changing selection - #19730"
+    ],
+    "3.4.12-beta1": [
+      "[Fixed] Merge branch dialog updates whether a branch can be merged when changing selection - #19730",
+      "[Fixed] Close diff options on mouse down outside of popover - #19644",
+      "[Fixed] Cap output from git at string max length - #19724",
+      "[Improved] Add aria label and aria description to ignore files text area in repository settings - #19684",
+      "[Improved] The link target height of the \"Terms and Conditions\" and \"License and Open Source Notices\" in the about dialog are 24px - #19685",
+      "[Improved] The contrast of the pending checks header text and progress pie chart meets 3:1 contrast requirements - #19687"
+    ],
+    "3.4.11": [
+      "[Fixed] Prevent crash due to excessively long Git output - #19724"
+    ],
+    "3.4.10": [
+      "[Added] Add a banner for communicating when prioritized updates exist - #19655",
+      "[Added] Add \"View Pull Request on GitHub\" Option to the Checked-Out Branch Button and Pull Requests List - #19453. Thanks @DylanDevelops!",
+      "[Fixed] Accurately calculate number of conflicted files in a merge - #8049",
+      "[Fixed] Inform user when a staged renamed file has changes - #17467. Thanks @ssigwart!",
+      "[Fixed] The visual label for the remote url in the repository settings is announced by screen readers - #19647",
+      "[Fixed] Remove duplicate avatar users - #19597",
+      "[Fixed] Fix for indents of clear button in text box - #19613. Thanks @artbutko!",
+      "[Fixed] Screen readers announce the position of the list items in selectable lists such as the history commit list - #19603",
+      "[Fixed] Limit the commit message length we accept - #15355",
+      "[Fixed] Prevent repository not found message for large git status operations - #19583",
+      "[Fixed] Add aria-labelledby and aria-describedby attributes to \"Show whitespace changes?\" popover - #19518",
+      "[Fixed] Fix logical tab order from co-authors text box - #19517",
+      "[Fixed] Allow using Escape to dismiss the commit message warning popover - #19514",
+      "[Improved] Improved appearance of the list of files in 'File size limit exceeded' dialog - #19581",
+      "[Improved] Resize events of resizable elements are announced by screen readers - #19649",
+      "[Improved] Update the names of some JetBrains editors on Linux - #19637. Thanks @ankddev!",
+      "[Improved] Swipe image diffs now handle images with transparency better - #16657 #17735. Thanks @Psychpsyo!",
+      "[Improved] Commit messages now show correct indentation - #17691. Thanks @SuperLlama88888!"
+    ],
+    "3.4.10-beta3": [
+      "[Added] Add a banner for communicating when prioritized updates exist - #19655",
+      "[Fixed] Accurately calculate number of conflicted files in a merge - #8049",
+      "[Fixed] Inform user when a staged renamed file renamed has changes - #17467. Thanks @ssigwart!",
+      "[Fixed] The visual label for the remote url in the repository settings is announced by screen readers - #19647",
+      "[Fixed] Remove duplicate avatar users - #19597",
+      "[Fixed] Fix for indents of clear button in text box - #19613. Thanks @artbutko!",
+      "[Improved] Resize events of resizable elements are announced by screen readers - #19649",
+      "[Improved] Update the names of some JetBrains editors on Linux - #19637. Thanks @ankddev!",
+      "[Improved] Swipe image diffs now handle images with transparency better - #16657 #17735. Thanks @Psychpsyo!",
+      "[Improved] Commit messages now show correct indentation - #17691. Thanks @SuperLlama88888!"
+    ],
+    "3.4.10-beta2": [
+      "[Fixed] Screen readers announce the position of the list items in selectable lists such as the history commit list - #19603",
+      "[Fixed] Limit the commit message length we accept - #15355",
+      "[Fixed] Prevent repository not found message for large git status operations - #19583",
+      "[Improved] Improved appearance of the list of files in 'File size limit exceeded' dialog - #19581"
+    ],
+    "3.4.10-beta1": [
+      "[Added] Add \"View Pull Request on GitHub\" Option to the Checked-Out Branch Button and Pull Requests List - #19453. Thanks @DylanDevelops!",
+      "[Fixed] Add aria-labelledby and aria-describedby attributes to \"Show whitespace changes?\" popover - #19518",
+      "[Fixed] Fix logical tab order from co-authors text box - #19517",
+      "[Fixed] Allow using Escape to dismiss the commit message warning popover - #19514"
+    ],
+    "3.4.9": [
+      "[Fixed] App no longer crash for first time users going through the welcome flow and attempting to sign in more than once - #19442",
+      "[Fixed] Files configured to use the binary merge driver are now treated as binary files when resolving conflicts - #9846",
+      "[Fixed] Fix UI glitch rendering tooltips - #19342",
+      "[Improved] Replace hint text of toggle Co-Authors button with a regular tooltip - #19383",
+      "[Improved] Use OS emojis - #19102",
+      "[Improved] Insert unicode emoji - #19376",
+      "[Improved] Allow resizing Branch and Push/Pull toolbar buttons - #4569 #17388. Thanks @jpedroso!",
+      "[Improved] Upgrade Electron to v32.1.2 - #19334",
+      "[Improved] The commit lists in the \"Commit Reachability\" dialogs are traversable in browse mode of screen readers - #19341",
+      "[Removed] Remove ruleset bypass confirmation modal - #19281. Thanks @lofcz!"
+    ],
+    "3.4.9-beta1": [
+      "[Added] Add support for DDS image files - #5337. Thanks @mkafrin!",
+      "[Fixed] Fix drag and drop by addressing breaking Electron change - #19473",
+      "[Fixed] App no longer crash for first time users going through the welcome flow and attempting to sign in more than once - #19442",
+      "[Improved] Insert unicode emoji - #19376"
+    ],
+    "3.4.8": [
+      "[Fixed] App no longer crash for first time users going through the welcome flow and attempting to sign in more than once"
+    ],
+    "3.4.7": [
+      "[Improved] Support entering GitHub.com as a GitHub Enterprise endpoint - #19342"
+    ],
+    "3.4.7-beta2": [
+      "[Fixed] Fix misaligned resizable toolbar buttons - #19330. Thanks @jpedroso!",
+      "[Fixed] Files configured to use the binary merge driver are now treated as binary files when resolving conflicts - #9846",
+      "[Fixed] Fix UI glitch rendering tooltips - #19342",
+      "[Improved] Support entering GitHub.com as a GitHub Enterprise endpoint - #19342",
+      "[Improved] Replace hint text of toggle Co-Authors button with a regular tooltip - #19383",
+      "[Improved] Use OS emojis - #19102",
+      "[Improved] Upgrade Electron to v32.1.2 - #19334"
+    ],
+    "3.4.7-beta1": [
+      "[Improved] The commit lists in the \"Commit Reachability\" dialogs are traversable in browse mode of screen readers - #19341",
+      "[Removed] Remove ruleset bypass confirmation modal - #19281. Thanks @lofcz!"
+    ],
+    "3.4.6": [
+      "[Fixed] Don't show certificate error dialog when probing for endpoint kind - #18991",
+      "[Fixed] Colorize multi-line strings in toml - #14333",
+      "[Fixed] Unset GIT_SEQUENCE_EDITOR when rebasing - #15413",
+      "[Fixed] Use `api.` subdomain for requests to GHE.com hosts - #19312",
+      "[Fixed] Migrate existing GHE account endpoints to the new `api.` subdomain - #19319",
+      "[Fixed] Right-clicking on diff checkmarks displays the context menu - #19302",
+      "[Fixed] Arguments with spaces are passed correctly to custom editors or shells on Windows - #19218",
+      "[Removed] Remove staggered updates block in about dialog - #19274"
+    ],
+    "3.4.6-beta3": [
+      "[Fixed] Don't show certificate error dialog when probing for endpoint kind - #18991"
+    ],
+    "3.4.6-beta2": [
+      "[Fixed] Colorize multi-line strings in toml - #14333",
+      "[Fixed] Workaround for issues with empty environment variable in third-party tools - #19273",
+      "[Fixed] Unset GIT_SEQUENCE_EDITOR when rebasing - #15413",
+      "[Fixed] Use `api.` subdomain for requests to GHE.com hosts - #19312",
+      "[Fixed] Migrate existing GHE account endpoints to the new `api.` subdomain - #19319",
+      "[Fixed] Right-clicking on diff checkmarks displays the context menu - #19302",
+      "[Removed] Remove staggered updates block in about dialog - #19274"
+    ],
+    "3.4.6-beta1": [
+      "[Fixed] Arguments with spaces are passed correctly to custom editors or shells on Windows - #19218",
+      "[Improved] Allow resizing Branch and Push/Pull toolbar buttons - #4569 #17388. Thanks @jpedroso!"
+    ],
+    "3.4.5-beta2": [
+      "[Fixed] Quotes are preserved in custom integration arguments - #19218",
+      "[Fixed] Symbolic links on Windows can be used as custom editor and shell - #19217"
+    ],
+    "3.4.5": [
+      "[Fixed] Quotes are preserved in custom integration arguments - #19218",
+      "[Fixed] Symbolic links on Windows can be used as custom editor and shell - #19217"
+    ],
+    "3.4.5-beta1": [
+      "[Added] Add Cursor integration for Windows - #19158. Thanks @colinabear!",
+      "[Fixed] Users can clone wiki's - #19152",
+      "[Improved] Inform users when attempting to create a repository out of an existing subdirectory of another repository - #19148",
+      "[Improved] When publishing a new repository, publish the default branch first as opposed to the currently checked out branch - #19151",
+      "[Improved] The \"Create a New Repository\" dialog informs the user of the path to be created - #19147"
+    ],
+    "3.4.4": [
+      "[New] Add support for custom editors and shells - #18954",
+      "[Added] Add Cursor support on macOS - #17462. Thanks @bjorntechCarl!",
+      "[Added] Add JetBrains RustRover support - #18802. Thanks @Radd-Sma!",
+      "[Fixed] The \"Create a New Repository\" dialog allows creation of repositories in repository subfolders - #19137",
+      "[Fixed] Stop improper announcement of \"dialog\" role on the autocompletion suggestions popover - #19114",
+      "[Fixed] The \"Open a Pull Request\" and \"About\" dialog's headings are announced via NVDA - #19107",
+      "[Fixed] The branch selection popover in the \"Open a Pull Request\" dialog does not close on filter clearing - #19106",
+      "[Fixed] The contrast ratio of icon in the diff file warnings is at least 3:1 - #19097",
+      "[Fixed] The \"Push Local Changes\" confirmation dialog users \"alertdialog\" role such that screen readers announce entire dialog contents - #19098",
+      "[Fixed] Emoji's provide descriptions for screen readers - #19101",
+      "[Fixed] Only ask for SSH credentials for the selected repository and only delete them after an authentication error - #19019",
+      "[Improved] Screen readers will announce when users expand context in a diff - #19128",
+      "[Improved] The squash dialog provides visual input labels - #19100",
+      "[Improved] The search inputs across the app provide visual labeling in the form of a search icon - #19103",
+      "[Improved] Use CmdOrCtrl+Q for Exit shortcut on Linux - #19093. Thanks @shiftkey!",
+      "[Improved] Add support for Gnome Console, LXTerminal and Warp shells on Linux - #19092. Thanks @shiftkey!"
+    ],
+    "3.4.4-beta3": [
+      "[Fixed] The custom editor and shell integrations handles when there are no predefined editors or shells - #19160",
+      "[Fixed] The \"Create a New Repository\" dialog allows creation of repositories in repository subfolders - #19137",
+      "[Fixed] Stop improper announcement of \"dialog\" role on the autocompletion suggestions popover - #19114",
+      "[Improved] Screen readers will announce when users expand context in a diff - #19128"
+    ],
+    "3.4.4-beta2": [
+      "[Fixed] The \"Open a Pull Request\" and \"About\" dialog's headings are announced via NVDA - #19107",
+      "[Fixed] The branch selection popover in the \"Open a Pull Request\" dialog does not close on filter clearing - #19106",
+      "[Fixed] Increased contrast ratio of icon in the diff file warnings - #19097",
+      "[Fixed] Use \"alertdialog\" role for \"Push Local Changes\" dialog - #19098",
+      "[Fixed] Add emoji descriptions for screen readers - #19101",
+      "[Improved] The squash dialog provides input labels - #19100",
+      "[Improved] Added search input visual labeling in the form of a search icon - #19103",
+      "[Improved] Use CmdOrCtrl+Q for Exit shortcut on Linux - #19093. Thanks @shiftkey!",
+      "[Improved] Add support for Gnome Console, LXTerminal and Warp shells on Linux - #19092. Thanks @shiftkey!"
+    ],
+    "3.4.4-beta1": [
+      "[New] Add support for custom editors and shells - #18954",
+      "[Added] Add Cursor support on macOS - #17462. Thanks @bjorntechCarl!",
+      "[Added] Add JetBrains RustRover support - #18802. Thanks @Radd-Sma!",
+      "[Fixed] Only ask for SSH credentials for the selected repository and only delete them after an authentication error - #19019"
+    ],
+    "3.4.3": [
+      "[Added] Add Zed as an external editor option for Linux - #18962. Thanks @adil192!",
+      "[Added] Shift + F10 opens context menu's on macOS",
+      "[Fixed] Allow pushing to gists - #19009",
+      "[Fixed] The copy button announces when clicked in VoiceOver.",
+      "[Fixed] Context menu actions in the diff are accessible via keyboard - #18946",
+      "[Fixed] Add/Remove Co-authors hint text is positioned correctly when scrolling through the changes list - #18929",
+      "[Fixed] VoiceOver can now use browser mode on the diff. - #18935",
+      "[Fixed] Increased contrast of several texts and icons in the app - #18922",
+      "[Fixed] Add aria-expanded and aria-controls attributes to Stashed Changes button - #18924",
+      "[Fixed] Hunk header text color contrast ratio is greater than 4.5:1 - #18916"
+    ],
+    "3.4.3-beta3": [
+      "[Added] Add Zed as an external editor option for Linux - #18962. Thanks @adil192!",
+      "[Fixed] Allow pushing to gists - #19009"
+    ],
+    "3.4.3-beta2": [
+      "[Added] Shift + F10 opens context menu's on macOS",
+      "[Fixed] The copy button announces when clicked in VoiceOver."
+    ],
+    "3.4.3-beta1": [
+      "[Fixed] Context menu actions in the diff are accessible via keyboard - #18946",
+      "[Fixed] Add/Remove Co-authors hint text is positioned correctly when scrolling through the changes list - #18929",
+      "[Fixed] VoiceOver can now use browser mode on the diff. - #18935",
+      "[Fixed] Increased contrast of several texts and icons in the app - #18922",
+      "[Fixed] Add aria-expanded and aria-controls attributes to Stashed Changes button - #18924",
+      "[Fixed] Hunk header text color contrast ratio is greater than 4.5:1 - #18916"
+    ],
+    "3.4.2": [
+      "[New] Option to use Git Credential Manager for repositories hosted outside of GitHub.com - #18700",
+      "[New] Allow customizing tab character width in spaces - #15561. Thanks @Repiteo",
+      "[Fixed] Remote urls containing spaces are now displayed in their entirety in the remote settings screen - #18876",
+      "[Fixed] Newly uploaded images are rendered in Pull Request comments and reviews - #18830"
+    ],
+    "3.4.2-beta4": [
+      "[Fixed] Remote urls containing spaces are now displayed in their entirety in the remote settings screen - #18876",
+      "[Fixed] Newly uploaded images are rendered in Pull Request comments and reviews - #18830"
+    ],
+    "3.4.2-beta3": [
+      "[Fixed] Users running Windows on arm64 processors are able to authenticate - #18825"
+    ],
+    "3.4.2-beta2": [
+      "[New] Option to use Git Credential Manager for repositories hosted outside of GitHub.com - #18700"
+    ],
+    "3.4.2-beta1": [
+      "[New] Allow customizing tab character width in spaces - #15561. Thanks @Repiteo",
+      "[Fixed] Using hooks on Windows no longer results in a \"command not found\" error - #18739"
+    ],
+    "3.4.1": [
+      "[Fixed] Using hooks on Windows no longer results in an \"command not found\" error - #18739"
+    ],
+    "3.4.1-beta1": [
+      "[Fixed] Prevent crashes when external editors fail to launch - #17717. Thanks @tsvetilian-ty!",
+      "[Fixed] Fix 'delete branch' message - #18706. Thanks @zetaloop!",
+      "[Improved] Use system feedback to draw user attention when a dialog is shown in background - #17220. Thanks @yuzawa-san!",
+      "[Improved] Upgrade embedded Git to v2.45.1 - #18704",
+      "[Improved] Upgrade Electron to v30.0.8 - #18697"
+    ],
+    "3.4.0": [
+      "[New] Reset to a previous commit - #12393",
+      "[Added] Add accessibility settings to toggle link underlines and diff check marks - #18227, #18035",
+      "[Fixed] Support multiple accounts for remote urls that differ in path - #18676, #18651",
+      "[Fixed] Refreshing repository indicators will not invalidate credentials - #18622",
+      "[Fixed] Clear stored credentials when authentication fails on insecure http hosts - #18588",
+      "[Improved] The generic git auth dialog contents are announced to users of screen readers - #18670",
+      "[Improved] The diff line numbers and line group controls show check marks so color is not the sole medium to determine inclusion into a commit - #18077",
+      "[Improved] Links are underlined by default - #18035"
+    ],
+    "3.3.19-beta2": [
+      "[Fixed] Support multiple accounts for remote urls that differ in path - #18676, #18651",
+      "[Fixed] Refreshing repository indicators will not invalidate credentials - #18622",
+      "[Improved] The generic git auth dialog contents are announced to users of screen readers - #18670"
+    ],
+    "3.3.19-beta1": [
+      "[Fixed] Clear stored credentials when authentication fails on insecure http hosts - #18588"
+    ],
+    "3.3.18": [
+      "[Fixed] Prevent Pull Request comment or review dialog from moving constantly under some circumstances - #18596",
+      "[Fixed] Prevent Pull Request notification dialogs from truncating long Pull Request titles - #18596",
+      "[Fixed] The welcome start flow content does not overlap or clip when zoomed - #18565",
+      "[Fixed] Clear stored credentials when authentication fails on insecure http hosts - #18588",
+      "[Improved] Improved accessibility of checks failed notification dialog by moving \"Re-run checks\" button out of the heading element - #18596",
+      "[Improved] Upgrade embedded Git to v2.43.4 on macOS, and to v2.43.4.windows.1 on Windows"
+    ],
+    "3.3.18-beta3": [
+      "[Improved] Upgrade embedded Git to v2.43.4 on macOS, and to v2.43.4.windows.1 on Windows",
+      "[Removed] Clear stored credentials when authentication fails on insecure http hosts - #18588"
+    ],
+    "3.3.18-beta2": [
+      "[Fixed] Prevent Pull Request comment or review dialog from moving constantly under some circumstances - #18596",
+      "[Fixed] Prevent Pull Request notification dialogs from truncating long Pull Request titles - #18596",
+      "[Fixed] The welcome start flow content does not overlap or clip when zoomed - #18565",
+      "[Improved] Improved accessibility of checks failed notification dialog by moving \"Re-run checks\" button out of the heading element - #18596"
+    ],
+    "3.3.18-beta1": [
+      "[Fixed] Clear stored credentials when authentication fails on insecure http hosts - #18588"
+    ],
+    "3.3.17": [
+      "[Fixed] Pushing and pulling repositories using Git LFS no longer causes an indefinite loop - #18582",
+      "[Improved] Improve the accessibility of the tabs in the preferences dialog for users of screen readers - #18567",
+      "[Improved] Always focus the first focusable element in the preferences dialog on open - #18567"
+    ],
+    "3.3.17-beta1": [
+      "[Fixed] Pushing and pulling repositories using Git LFS no longer causes an indefinite loop - #18582",
+      "[Improved] Improve the accessibility of the tabs in the preferences dialog for users of screen readers - #18567",
+      "[Improved] Always focus the first focusable element in the preferences dialog on open - #18567"
+    ],
+    "3.3.16": [
+      "[Fixed] Resolved auth failures when interacting with repositories hosted on non-GitHub hosts - #18568 #18570 #18569"
+    ],
+    "3.3.16-beta1": [
+      "[Fixed] Resolved auth failures when interacting with repositories hosted on non-GitHub hosts - #18568 #18570 #18569"
+    ],
+    "3.3.15": [
+      "[Added] The diff view now highlights Zig syntax - #17957. Thanks @imkylecat!",
+      "[Fixed] Bring back color to links in PR timeline - #18561",
+      "[Fixed] Remove unnecessary br elements to make the app easier to navigate with screen readers - #18444, #18436",
+      "[Fixed] Prevent clipping of dialog controls and content when app is zoomed - #18412",
+      "[Improved] Make sure the arrow path in a dropdown button can't receive focus - #18562",
+      "[Improved] Increase contrast on modified and conflicted octicons - #18560"
+    ],
+    "3.3.15-beta2": [
+      "[Fixed] Bring back color to links in PR timeline - #18561",
+      "[Improved] Make sure the arrow path in a dropdown button can't receive focus - #18562",
+      "[Improved] Increase contrast on modified and conflicted octicons - #18560",
+      "[Improved] Add banner to announce the accessibility settings - #18460"
+    ],
+    "3.3.15-beta1": [
+      "[New] Reset to a previous commit - #12393",
+      "[Added] The diff view now highlights Zig syntax - #17957. Thanks @imkylecat!",
+      "[Fixed] Remove unnecessary br elements to make the app easier to navigate with screen readers - #18444, #18436",
+      "[Fixed] Prevent clipping of dialog controls and content when app is zoomed - #18412"
+    ],
+    "3.3.14": [
+      "[Fixed] The tab panel semantics in the \"Publish Repository\" and \"Clone a Repository\" are announced by screen readers - #18408",
+      "[Fixed] The check all button in the diff always only represents one selectable group - #18422",
+      "[Fixed] Images diffs of less than 200px in width do not render with a zero width for diff views other than `2-up` - #18405",
+      "[Fixed] Fix list accessibility semantics of the Pull Request list - #18397",
+      "[Fixed] Fix screen reader support of warning dialogs - #18371",
+      "[Fixed] Selecting the \"Configure manually\" radio option does not cause unexpected focus shift to the name input in the Git Configuration page of the welcome flow - #18341",
+      "[Fixed] All dialogs can be closed by pressing Esc - #18335",
+      "[Improved] The force push warning in the push dropdown now has a contrast of 4.5:1 - #18415",
+      "[Improved] Hyphen replacement and invalid sanitized name warnings and errors in the create branch and create repository dialogs are associated to the input by the aria-describedby attribute - #18404",
+      "[Improved] Add VapourSynth script files (.vpy) to test/x-python - #18364. Thanks @couleurm!",
+      "[Improved] The text contrast of tutorial steps when closed is 4.5:1 - #18342",
+      "[Improved] Upgrade to Electron v28.2.3 - #18185",
+      "[Removed] Remove support for macOS 10.13 and 10.14 - #18316"
+    ],
+    "3.3.14-beta2": [
+      "[Fixed] The tab panel semantics in the \"Publish Repository\" and \"Clone a Repository\" are announced by screen readers - #18408",
+      "[Fixed] The check all button in the diff always only represents one selectable group - #18422",
+      "[Improved] The force push warning in the push dropdown now has a contrast of 4.5:1 - #18415"
+    ],
+    "3.3.14-beta1": [
+      "[Fixed] Images diffs of less than 200px in width do not render with a zero width for diff views other than `2-up` - #18405",
+      "[Fixed] Fix list accessibility semantics of the Pull Request list - #18397",
+      "[Fixed] Fix screen reader support of warning dialogs - #18371",
+      "[Fixed] Selecting the \"Configure manually\" radio option does not cause unexpected focus shift to the name input in the Git Configuration page of the welcome flow - #18341",
+      "[Fixed] All dialogs can be closed by pressing Esc - #18335",
+      "[Improved] Hypen replacement and invalid sanitized name warnings and errors in the create branch and create repository dialogs are associated to the input by the aria-describedby attribute - #18404",
+      "[Improved] Add VapourSynth script files (.vpy) to test/x-python - #18364. Thanks @couleurm!",
+      "[Improved] The text contrast of tutorial steps when closed is 4.5:1 - #18342"
+    ],
+    "3.3.13": [
+      "[Fixed] Fix layout issues in 2-up image diffing when images are too small - #18313",
+      "[Fixed] The \"Show whitespace changes?\" popover can be closed by pressing Escape - #18314",
+      "[Fixed] Added announcing the number of results to the diff search via screen readers - #18306",
+      "[Improved] Git errors due to bad config values are surfaced in the UI - #18230",
+      "[Improved] The pull request check run popover is now keyboard accessible - #18276",
+      "[Improved] The pull request check run popover button is now keyboard accessible - #18268",
+      "[Improved] Add the aria-label attribute to our markdown iframes to clarify their purpose to users of screen readers in browse mode.  - #18277",
+      "[Improved] Add support for newer versions of Alacritty shell - #16614. Thanks @lhvy!",
+      "[Improved] Upgrade embedded Git to v2.43.3 on macOS, and to v2.43.0.windows.1 on Windows, and Git LFS to v3.5.1 - #18292"
+    ],
+    "3.3.13-beta1": [
+      "[Fixed] Fix layout issues in 2-up image diffing when images are too small - #18313",
+      "[Fixed] The \"Show whitespace changes?\" popover can be closed by pressing Escape - #18314",
+      "[Removed] Remove support for macOS 10.13 and 10.14 - #18316"
+    ],
+    "3.3.12": [
+      "[Fixed] On Windows, PATH environment variable with values longer than 1024 are not truncated - #18244",
+      "[Improved] Added semantic and keyboard accessible check all button for a groups of consecutive selectable rows in the diff - #18201",
+      "[Improved] Prevent upgrading from macOS 10.13 and 10.14 as soon to be unsupported - #18316",
+      "[Improved] Update banners will only dismiss when closing with the dismiss button - #18319",
+      "[Improved] Add the \"link\" role to the \"Open pull request\" button in tutorial sidebar - #18245"
+    ],
+    "3.3.12-beta3": [
+      "[Fixed] Bring back support for macOS 10.13 and 10.14 and prevent upgrading from them - #18316",
+      "[Fixed] Added announcing the number of results to the diff search via screen readers - #18306",
+      "[Improved] Update banners will only dismiss when closing with the dismiss button - #18319"
+    ],
+    "3.3.12-beta2": [
+      "[Improved] The pull request check run popover is now keyboard accessible - #18276",
+      "[Improved] The pull request check run popover button is now keyboard accessible - #18268",
+      "[Improved] Add the aria-label attribute to our markdown iframes to clarify their purpose to users of screen readers in browse mode.  - #18277",
+      "[Improved] Add support for newer versions of Alacritty shell - #16614. Thanks @lhvy!",
+      "[Improved] Upgrade embedded Git to v2.43.3 on macOS, and to v2.43.0.windows.1 on Windows, and Git LFS to v3.5.1 - #18292",
+      "[Improved] Git errors due to bad config values are surfaced in the UI - #18230"
+    ],
+    "3.3.12-beta1": [
+      "[Fixed] In the changes diff, groups of two rows that represent one line number change have a check all control - #18232",
+      "[Fixed] Copying lines in side by side diffs does not add new lines between each line when pasted - #18249",
+      "[Fixed] On Windows, PATH environment variable with values longer than 1024 are not truncated - #18244",
+      "[Fixed] The last lines in diffs are visible when warning banners are displayed - #18237",
+      "[Improved] Add the \"link\" role to the \"Open pull request\" button in tutorial sidebar - #18245",
+      "[Improved] Upgrade to Electron v28.2.3 - #18185"
+    ],
+    "3.3.11": [
+      "[Fixed] Copying lines in the side by side diff does not add new lines between each line when pasted. - #18249"
+    ],
+    "3.3.10": [
+      "[Fixed] The last lines in diffs are visible when warning banners are displayed - #18237",
+      "[Fixed] Ignore a file's parent directories on Windows. - #1203"
+    ],
+    "3.3.10-beta1": [
+      "[Added] Added visible and semantic check all button for a group of consecutive selectable rows in the diff - #18201",
+      "[Fixed] Ignore a file's parent directories on Windows - #18206",
+      "[Improved] Add a setting for visibility of diff check marks when committing - #18227",
+      "[Improved] Add support for toggling link underlines globally - #18035"
+    ],
+    "3.3.9": [
+      "[Fixed] The line number inclusion controls are semantic checkboxes and are keyboard accessible - #18064",
+      "[Fixed] Copying commit SHAs from submodule diffs is keyboard accessible - #18124",
+      "[Fixed] Show avatars of bot accounts such as dependabot - #12766",
+      "[Fixed] Focus outline is visible on the diff - #18086",
+      "[Fixed] Selecting or deselecting lines in a diff by dragging the mouse now scrolls the contents as needed - #17673",
+      "[Fixed] Last line of diffs can be selected when the file didn't have a new line at the end - #18081",
+      "[Fixed] Promote line endings change warning from icon to a banner, improving its accessibility - #18084",
+      "[Fixed] Amending a commit in non-GitHub repositories restores the commit message - #18061",
+      "[Fixed] The merge dialog submit button is available when conflicts are detected - #18037",
+      "[Fixed] Avatars are once again loading for GitHub Enterprise Server users - #18034",
+      "[Fixed] Lists scroll and render as expected when scrolling by dragging the scrollbar on Windows - #18012",
+      "[Fixed] External editor or shell failure error will open to integration settings - #18021. Thanks @yasuking0304!",
+      "[Improved] Add `pyi` to syntax highlighting - #18141. Thanks @pLeBlanc93!",
+      "[Improved] Syntax highlighting now supports .cmake, .cxx, .hh, .hxx, and .xsd files - #17503. Thanks @DylanDevelops!",
+      "[Improved] Apply Markdown highlighting to .mdx files - #18040. Thanks @bentookey-yotta!",
+      "[Improved] Implemented folder ignore with all parent directories - #1203. Thanks @masecla22!"
+    ],
+    "3.3.9-beta2": [
+      "[Fixed] The line number inclusion controls are semantic checkboxes and are keyboard accessible - #18064",
+      "[Fixed] Copying commit SHAs from submodule diffs is keyboard accessible - #18124",
+      "[Fixed] Show avatars of bot accounts such as dependabot - #12766",
+      "[Fixed] Focus outline is visible on the diff - #18086",
+      "[Fixed] Selecting or deselecting lines in a diff by dragging the mouse now scrolls the contents as needed - #17673",
+      "[Fixed] Last line of diffs can be selected when the file didn't have a new line at the end - #18081",
+      "[Fixed] Promote line endings change warning from icon to a banner, improving its accessibility - #18084",
+      "[Fixed] Amending a commit in non-GitHub repositories restores the commit message - #18061",
+      "[Improved] Add `pyi` to syntax highlighting - #18141. Thanks @pLeBlanc93!",
+      "[Improved] Syntax highlighting now supports .cmake, .cxx, .hh, .hxx, and .xsd files - #17503. Thanks @DylanDevelops!",
+      "[Improved] Apply Markdown highlighting to .mdx files - #18040. Thanks @bentookey-yotta!",
+      "[Improved] The diff line numbers show check marks so color is not the sole medium to determine inclusion into a commit - #18077"
+    ],
+    "3.3.9-beta1": [
+      "[Fixed] The merge dialog submit button is available when conflicts are detected - #18037",
+      "[Fixed] Avatars are once again loading for GitHub Enterprise Server users - #18034",
+      "[Fixed] Lists scroll and render as expected when scrolling by dragging the scrollbar on Windows - #18012",
+      "[Fixed] External editor or shell failure error will open to integration settings - #18021. Thanks @yasuking0304!",
+      "[Improved] Implemented folder ignore with all parent directories - #1203. Thanks @masecla22!"
+    ],
+    "3.3.8": [
+      "[Fixed] The merge dialog submit button is available when conflicts are detected. - #18037",
+      "[Fixed] Avatars are once again loading for GitHub Enterprise Server users. - #18036"
+    ],
+    "3.3.7": [
+      "[Fixed] Merge branch dialog's merge preview no longer shows stale merge check data - #17929",
+      "[Fixed] Co-authors are restored as such when a commit is amended - #17879",
+      "[Fixed] Tags with commas are no longer truncated to the first comma - #17952",
+      "[Fixed] The \"Reveal in Finder\" context menu option in the conflict resolution dialog no longer causes Finder to be unresponsive - #17933",
+      "[Fixed] Clicking on the commit message length warning does not close the squash commit dialog - #17966",
+      "[Fixed] Fix Alacritty bundle ID on macOS - #17940. Thanks @JannesMeyer!",
+      "[Fixed] Merge branch dialog no longer shows flickering merge preview when switching branches - #17948. Thanks @GengShengJia!",
+      "[Fixed] Diff no longer jumps when scrolling after pressing expansion buttons - #17776",
+      "[Fixed] Use list semantics in job step lists for improved accessibility - #17855",
+      "[Fixed] Fix heading levels used in dialogs for improved accessibility - #17848",
+      "[Improved] Replace the \"Default branch name for new repositories\" radio button setting with a more accessible and inclusive textbox input and description - #17844",
+      "[Improved] The \"You're Done\" header is focused after tutorial completion so it is announced and screen reader users are made aware of the completion screen - #17835",
+      "[Improved] Checkboxes always have unique id's for label association - #17839",
+      "[Improved] Better visibility of checkbox focus indicator - #17842",
+      "[Improved] Improve inclusivity and clarification of branch name change warning.  - #17866",
+      "[Improved] Focus moves to closest expansion button or diff container after expansion - #17499",
+      "[Improved] Tooltips can be dismissed with the escape key - #17823, #17836",
+      "[Improved] Semantically grouping our settings radio and checkbox groups so their group headers will be announced to screen reader users. - #17787",
+      "[Improved] The \"Other\" email description is announced on input focus in the git config form - #17785",
+      "[Improved] Move the repository list on the \"Let's get started!\" screen to the left hand side so it can be the first logical tab placement.  - #17821",
+      "[Improved] Increased the specificity of the \"Sign In\" and \"Sign Out\" buttons in the Account settings - #17794"
+    ],
+    "3.3.7-beta3": [
+      "[Fixed] Merge branch dialog's merge preview no longer shows stale merge check data - #17929",
+      "[Fixed] Co-authors are restored as such when a commit is amended - #17879",
+      "[Fixed] Tags with commas are no longer truncated to the first comma - #17952",
+      "[Fixed] The \"Reveal in Finder\" context menu option in the conflict resolution dialog no longer causers Finder to be unresponsive - #17933",
+      "[Fixed] Clicking on the commit message length warning does not close the squash commit dialog - #17966",
+      "[Fixed] Fix Alacritty bundle ID on macOS - #17940. Thanks @JannesMeyer!",
+      "[Fixed] Merge branch dialog no longer shows flickering merge preview when switching branches - #17948. Thanks @GengShengJia!",
+      "[Improved] Improve inclusivity and clarification of branch name change warning.  - #17866"
+    ],
+    "3.3.7-beta2": [
+      "[Fixed] Use list semantics in job step lists for improved accessibility - #17855",
+      "[Fixed] Fix heading levels used in dialogs for improved accessibility - #17848",
+      "[Improved] Replace the \"Default branch name for new repositories\" radio button setting with a more accessible and inclusive textbox input and description - #17844",
+      "[Improved] The \"You're Done\" header is focused after tutorial completion so it is announced and screen reader users are made aware of the completion screen - #17835",
+      "[Improved] Checkboxes always have unique id's for label association - #17839",
+      "[Improved] Better visibility of checkbox focus indicator - #17842",
+      "[Improved] By default, tooltips can be dismissed with the escape key - #17836"
+    ],
+    "3.3.7-beta1": [
+      "[Fixed] Diff no longer jumps when scrolling after pressing expansion buttons - #17776",
+      "[Improved] Focus moves to closes expansion button or diff container after expansion - #17499",
+      "[Improved] Tooltips can be dismissed with the escape key - #17823",
+      "[Improved] Semantically grouping our settings radio and checkbox groups so their group headers will be announced to screen reader users. - #17787",
+      "[Improved] The \"Other\" email description is announced on input focus in the git config form - #17785",
+      "[Improved] Move the repository list on the \"Let's get started!\" screen to the left hand side so it can be the first logical tab placement.  - #17821",
+      "[Improved] Increased the specificity of the \"Sign In\" and \"Sign Out\" buttons in the Account settings - #17794"
+    ],
+    "3.3.6": [
+      "[Fixed] Previewing a pull request with a deleted image file no longer errors with \"The path does not exist on disk\".  - #17659",
+      "[Fixed] Empty lines are included when copying text from diffs - #17652",
+      "[Fixed] A copied full line from a diff now includes a trailing newline  - #17652",
+      "[Fixed] Creating pull requests from a renamed branch uses the branch name in the remote - #17628",
+      "[Fixed] On macOS Sonoma, the VoiceOver regression preventing our dialog headers announcements has been fixed. - #17631",
+      "[Fixed] Squash dialog is not shown again after finishing another squashing operation where uncommitted changes were present and had to be stashed - #17627",
+      "[Improved] Added the ability to open your global .gitconfig file in your selected external editor - #17544. Thanks @DylanDevelops!",
+      "[Improved] Fixed `Github` -> `GitHub` typo in repository settings - #17697. Thanks @WilliamDavidHarrison!",
+      "[Improved] Screen readers announce group name when navigating through grouped lists - #17567",
+      "[Improved] The history commit summary header is now expandable making the tool-tipped meta data keyboard accessible - #17557.",
+      "[Improved] Reordering commits is now keyboard accessible - #17671",
+      "[Improved] The conflicts resolution dialog now has a success banner that is screen reader announced that summarize actions taken - #17687",
+      "[Improved] The pull request branch selection popover header is announced by screen readers. - #17631",
+      "[Improved] Prevent possible duplicate announcement of button labeling to screen reader users - #17706",
+      "[Improved] Improve keyboard and screen reader support for banners - #17542"
+    ],
+    "3.3.6-beta4": [
+      "[Fixed] Previewing a pull request with a deleted image file no longer errors with \"The path does not exist on disk\".  - #17659",
+      "[Improved] Commit summary descriptions are scrollable when the content is long - #17708"
+    ],
+    "3.3.6-beta3": [
+      "[Fixed] A copied full line from a diff now includes a trailing newline  - #17652",
+      "[Fixed] Squash dialog is not shown again after finishing another squashing operation where uncommitted changes were present and had to be stashed - #17627",
+      "[Improved] The conflicts resolution dialog now has a success banner that is screen reader announced that summarize actions taken - #17687",
+      "[Improved] Added the ability to open your global .gitconfig file in your selected external editor - #17544. Thanks @DylanDevelops!",
+      "[Improved] Fixed `Github` -> `GitHub` typo in repository settings - #17697. Thanks @WilliamDavidHarrison!",
+      "[Improved] Reordering commits is now keyboard accessible - #17671",
+      "[Improved] Prevent possible duplicate announcement of button labeling to screen reader users - #17706",
+      "[Improved] Prevent multiple announcing of success banners with Windows NVDA screen reader  - #17705"
+    ],
+    "3.3.6-beta2": [
+      "[Fixed] Empty lines are included when copying text from diffs - #17652"
+    ],
+    "3.3.6-beta1": [
+      "[Fixed] Creating pull requests from a renamed branch uses the branch name in the remote - #17628",
+      "[Fixed] On macOS Sonoma, the VoiceOver regression preventing our dialog headers announcements has been fixed. - #17631",
+      "[Improved] The pull request branch selection popover header is announced by screen readers. - #17631",
+      "[Improved] Improve keyboard and screen reader support for banners - #17542",
+      "[Improved] The commit summary description overflow is limited to two lines when collapsed. - #17618",
+      "[Improved] The commit summary description has a grey background color when expanded. - #17618"
+    ],
+    "3.3.5": [
+      "[Added] Syntax highlighting now supports .cc files - #17503. Thanks @DylanDevelops!",
+      "[Fixed] Long file paths are correctly truncated in the conflicts dialog - #17595"
+    ],
+    "3.3.5-beta1": [
+      "[Added] Syntax highlighting now supports .cc files - #17503. Thanks @DylanDevelops!",
+      "[Fixed] Long file paths are correctly truncated in the conflicts dialog - #17595",
+      "[Fixed] Screen readers announce group name when navigating through grouped lists - #17567",
+      "[Fixed] The history commit summary header is now expandable making the tool-tipped meta data keyboard accessible - #17557."
+    ],
+    "3.3.4": [
+      "[Added] Added Cursor support on macOS - #17462. Thanks @bjorntechCarl!",
+      "[Added] Add support for Pulsar code editor on Linux - #17397. Thanks @Daeraxa!",
+      "[Added] Add Eclipse IDE integrations for macOS - #16991. Thanks @yuzawa-san!",
+      "[Fixed] Fix JetBrains PhpStorm capitalization - #17505. Thanks @imkylecat!",
+      "[Fixed] Screen readers announce contents of error dialog when attempting to perform certain operations while local changes are present - #17519",
+      "[Fixed] Screen readers announce contents of app error dialogs - #17479",
+      "[Fixed] Screen readers announce contents of merge, rebase, interactive rebase abort confirmation dialogs - #17478",
+      "[Fixed] Pasting long texts in the commit summary textbox does not show a scrollbar in the left pane - #17472",
+      "[Fixed] Tab characters in diffs are rendered correctly - #8616",
+      "[Fixed] Close button in release notes dialog can be clicked - #17438",
+      "[Fixed] Scrolling works as expected in the \"Commit Reachability\" dialog - #17421",
+      "[Fixed] Tip of comment bubbles in Pull Request notifications is rendered correctly - #17411",
+      "[Improved] Added a setting to allow toggling the availability of the commit message length warning - #17370. Thanks @rystills!",
+      "[Improved] Added accessibility label to filter textbox in the History tab - #17488",
+      "[Improved] Improved clarity of the structure of dialogs by using `h2` elements for their titles - #17483",
+      "[Improved] Display co-authors button additional information when it's focused via keyboard navigation - #17464",
+      "[Improved] When focusing the rebase/merge/squash button, screen readers announce the outcome of the operation - #17448",
+      "[Improved] Clarified the outcome of toggling the setting under \"Background Updates\" in the \"Advanced\" settings - #17389",
+      "[Improved] Undo link when resolving conflicts is now a button - #17373"
+    ],
+    "3.3.4-beta3": [
+      "[Fixed] Screen readers announce contents of error dialog when attempting to perform certain operations while local changes are present - #17519",
+      "[Fixed] Fix JetBrains PhpStorm capitalization - #17505. Thanks @imkylecat!",
+      "[Improved] Upgrade to Electron v26.2.4 - #17524",
+      "[Improved] Upgrade node to 18.16.1 - #17453"
+    ],
+    "3.3.4-beta2": [
+      "[Added] Added Cursor support on macOS - #17462. Thanks @bjorntechCarl!",
+      "[Fixed] Screen readers announce contents of app error dialogs - #17479",
+      "[Fixed] Screen readers announce contents of merge, rebase, interactive rebase abort confirmation dialogs - #17478",
+      "[Fixed] Pasting long texts in the commit summary textbox does not show a scrollbar in the left pane - #17472",
+      "[Fixed] Tab characters in diffs are rendered correctly - #8616",
+      "[Improved] Added accessibility label to filter textbox in the History tab - #17488",
+      "[Improved] Improved clarity of the structure of dialogs by using `h2` elements for their titles - #17483",
+      "[Improved] Display co-authors button additional information when it's focused via keyboard navigation - #17464",
+      "[Improved] When focusing the rebase/merge/squash button, screen readers announce the outcome of the operation - #17448"
+    ],
+    "3.3.4-beta1": [
+      "[Fixed] Close button in release notes dialog can be clicked - #17438",
+      "[Fixed] Scrolling works as expected in the \"Commit Reachability\" dialog - #17421",
+      "[Improved] Upgrade to Electron v26.2.1 - #17408"
+    ],
+    "3.3.3": ["[Improved] Upgrade to Electron v24.8.3 - #17416"],
+    "3.3.3-beta2": ["[Improved] Upgrade to Electron v24.8.3 - #17416"],
+    "3.3.3-beta1": [
+      "[Added] Add support for Pulsar code editor on Linux - #17397. Thanks @Daeraxa!",
+      "[Added] Add Eclipse IDE integrations for macOS - #16991. Thanks @yuzawa-san!",
+      "[Improved] Added a setting to allow toggling the availability of the commit message length warning - #17370. Thanks @rystills!",
+      "[Improved] Clarified the outcome of toggling the setting under \"Background Updates\" in the \"Advanced\" settings - #17389",
+      "[Fixed] Tip of comment bubbles in Pull Request notifications is rendered correctly - #17411",
+      "[Improved] Undo link when resolving conflicts is now a button - #17373"
+    ],
+    "3.3.2": [
+      "[Fixed] Use forked repository when checking repo rules on forks - #17382. Thanks @vaindil!",
+      "[Fixed] On macOs, the scroll bar only present when scrolling no longer overlaps conflict resolution buttons - #17374",
+      "[Fixed] Allow rebasing even when the branch is a direct descendant of the base branch - #17260",
+      "[Fixed] Branch name pattern regex no longer causes an automatic failure in the \"Create a Branch\" dialog. - #17392",
+      "[Fixed] Make clear button in input text boxes keyboard accessible - #17324",
+      "[Fixed] Make the create and clone repository dialogs accessible when the app is zoomed in and the window is small - #17337",
+      "[Fixed] Fix keyboard navigation in filtered lists - #17311",
+      "[Fixed] Pressing Tab from the \"Select branch to compare…\" filter input textbox focuses on the first branch in the list - #17314",
+      "[Fixed] Fix \"Invalid numstat line\" error when trying to preview a pull request - #17267",
+      "[Improved] After undo, the focus is set to the changes tab instead of the entire document body - #17387",
+      "[Improved] Commit text inputs retain focus while committing - #17283"
+    ],
+    "3.3.2-beta2": [
+      "[Fixed] Use forked repository when checking repo rules on forks - #17382. Thanks @vaindil!",
+      "[Fixed] On macOs, the scroll bar only present when scrolling no longer overlaps conflict resolution buttons - #17374",
+      "[Fixed] Allow rebasing even when the branch is a direct descendant of the base branch - #17260",
+      "[Fixed] Branch name pattern regex no longer causes an automatic failure in the \"Create a Branch\" dialog. - #17392",
+      "[Improved] After undo, the focus is set to the changes tab instead of the entire document body - #17387"
+    ],
+    "3.3.2-beta1": [
+      "[Fixed] Support the repository rule to enforce commit signing - #17310",
+      "[Fixed] Make clear button in input text boxes keyboard accessible - #17324",
+      "[Fixed] Make the create and clone repository dialogs accessible when the app is zoomed in and the window is small - #17337",
+      "[Fixed] Fix keyboard navigation in filtered lists - #17311",
+      "[Fixed] Pressing Tab from the \"Select branch to compare…\" filter input textbox focuses on the first branch in the list - #17314",
+      "[Fixed] Fix \"Invalid numstat line\" error when trying to preview a pull request - #17267",
+      "[Improved] Commit text inputs retain focus while committing - #17283"
+    ],
+    "3.3.1": [
+      "[Fixed] Support the repository rule to enforce commit signing - #17310",
+      "[Fixed] Keyboard navigation in lists reintroduced - #17313"
+    ],
+    "3.3.0": [
+      "[New] Initial support for repository rules - #16707",
+      "[Fixed] Recreate stash after renaming branch - #16442",
+      "[Fixed] Fix loop creating a new repository that already exists, or trying to add a repository that doesn't exist - #17262",
+      "[Fixed] Allow cloning repositories that have git as a suffix - #17221",
+      "[Fixed] Fix accessibility semantics of root items of the app menu bar - #17254",
+      "[Fixed] Double clicking the checkbox of a changed file does not open that file in the external editor - #17229",
+      "[Fixed] Expand buttons in the diff are keyboard navigable. - #17212",
+      "[Improved] Improve light mode color contrast of lines added and deleted - #17206",
+      "[Improved] Dropdown select buttons have aria attributes  - #17271",
+      "[Improved] Dropdown select button menu items are keyboard navigable and have aria attributes - #17271",
+      "[Improved] Prevent interrupting verbose announcements of branch count on branch dropdown open for screen reader users - #17225"
+    ],
+    "3.2.10-beta2": [
+      "[Fixed] Fix loop creating a new repository that already exists, or trying to add a repository that doesn't exist - #17262",
+      "[Fixed] Allow cloning repositories that have git as suffix - #17221",
+      "[Fixed] Fix accessibility semantics of root items of the app menu bar - #17254",
+      "[Improved] Dropdown select buttons have aria attributes  - #17271",
+      "[Improved] Dropdown select buttons menu is keyboard navigable and have aria attributes - #17271",
+      "[Improved] Prevent interrupting verbose announcements of branch count on branch dropdown open for screen reader users - #17225"
+    ],
+    "3.2.10-beta1": ["[Fixed] Fix the inability to log into GHES - #17237"],
+    "3.2.9": ["[Fixed] Fix the inability to log into GHES - #17237"],
+    "3.2.9-beta1": [
+      "[Fixed] Double clicking the checkbox of a changed file does not open that file in the external editor - #17229",
+      "[Fixed] Expand buttons in the diff are keyboard navigable. - #17212",
+      "[Improved] Improve light mode color contrast of lines added and deleted - #17206"
+    ],
+    "3.2.8": [
+      "[New] Checkout a commit from the History tab - #10068. Thanks @kitswas!",
+      "[New] Add Double Click to Open in Default Editor - #2620. Thanks @digitalmaster!",
+      "[New] Show when a repository has been archived in the clone dialog - #7183",
+      "[Added] Add Zed Preview as an external editor option - #17097. Thanks @filiptronicek!",
+      "[Added] Add support for Pulsar code editor on Windows - #17120. Thanks @confused-Techie!",
+      "[Fixed] The force push loading state is screen reader announced - #17116",
+      "[Fixed] Improve readability of file statuses for keyboard-only users - #17192",
+      "[Fixed] Fix detection of VSCodium Insiders for Windows - #17078. Thanks @voidei!",
+      "[Fixed] Enable context menu keyboard shortcut for file lists - #17143",
+      "[Fixed] Adds a workaround for the macOS Ventura `aria-labelledby` and `aria-describedby` regressions such that dialog titles are always announced - #17148",
+      "[Fixed] Screen readers announce the status of files within a commit - #17144",
+      "[Fixed] Fix not recognizing remote for partial clone/fetch - #16284. Thanks @mkafrin!",
+      "[Fixed] Fix association of repositories using nonstandard usernames - #17024",
+      "[Improved] Screen readers announce \"overwrite stash\" and \"discard stash\" confirmation dialogs - #17197",
+      "[Improved] Screen readers announce contents of Delete Tag confirmation dialog - #17166",
+      "[Improved] The stash restore button's description is associated to the restore button - #17204",
+      "[Improved] The delete branch dialog's contents are announced as alert dialogs. - #17210",
+      "[Improved] Improve branch dropdown tabs screen reader support - #17172",
+      "[Improved] The rename dialog warnings are placed before the branch name input - #17164",
+      "[Improved] The \"Restore\" button in stashed changes is not disabled when uncommitted changes are present - #12994. Thanks @samuelko123!",
+      "[Improved] Improve contrast of text to links in dark and light themes - #17092",
+      "[Improved] The errors and warnings in the \"Create a New Repository\" dialog are screen reader announced - #16993",
+      "[Improved] Add `aria-label` and `aria-expanded` attributes to diff options button - #17062",
+      "[Improved] Screen readers announce the number of pull requests found after refreshing the list - #17031",
+      "[Improved] The context menu for the History view items can be invoked by keyboard shortcuts - #17035"
+    ],
+    "3.2.8-beta4": [
+      "[Fixed] Fix selecting/deselecting changed files with the keyboard - #17207. Thanks @koenpunt!",
+      "[Improved] The stash restore button's description is associated to the restore button - #17204",
+      "[Improved] The delete branch dialog's contents are announced as alert dialogs. - #17210"
+    ],
+    "3.2.8-beta3": [
+      "[Added] Add Zed Preview as an external editor option - #17097. Thanks @filiptronicek!",
+      "[Added] Add support for Pulsar code editor on Windows - #17120. Thanks @confused-Techie!",
+      "[Fixed] The force push loading state is screen reader announced - #17116",
+      "[Fixed] Allow screen readers to announce \"overwrite stash\" and \"discard stash\" confirmation dialogs - #17197",
+      "[Fixed] Improve readability of file statuses for keyboard-only users - #17192",
+      "[Fixed] Screen readers announce contents of Delete Tag confirmation dialog - #17166",
+      "[Fixed] Fix detection of VSCodium Insiders for Windows - #17078. Thanks @voidei!",
+      "[Improved] Improve branch dropdown tabs screen reader support - #17172",
+      "[Improved] The rename dialog warnings are placed before the branch name input - #17164",
+      "[Improved] The \"Restore\" button in stashed changes is not disabled when uncommitted changes are present - #12994. Thanks @samuelko123!"
+    ],
+    "3.2.8-beta2": [
+      "[New] Initial support for repository rules - #16707. Thanks @vaindil!",
+      "[Fixed] Enable context menu keyboard shortcut for file lists - #17143",
+      "[Fixed] Adds a workaround for the macOS Ventura `aria-labelledby` and `aria-describedby` regressions such that dialog titles are always announced - #17148",
+      "[Fixed] Screen readers announce branch group names correctly when there are no recent branches - #17142",
+      "[Fixed] Screen readers announce the status of files within a commit - #17144",
+      "[Improved] Improve contrast of text to links in dark and light themes - #17092",
+      "[Improved] The errors and warnings in the \"Create a New Repository\" dialog are screen reader announced - #16993"
+    ],
+    "3.2.8-beta1": [
+      "[Fixed] Fix not recognizing remote for partial clone/fetch - #16284. Thanks @mkafrin!",
+      "[Fixed] Fix association of repositories using nonstandard usernames - #17024",
+      "[Improved] Add aria-label and aria-expanded attributes to diff options button - #17062",
+      "[Improved] Screen readers announce number of pull requests found after refreshing the list - #17031",
+      "[Improved] The context menu for the History view items can be invoked by keyboard shortcuts - #17035"
+    ],
+    "3.2.7": [
+      "[Fixed] Improved performance when selecting and viewing a large number of commits - #16880",
+      "[Fixed] Fix crash using Edit -> Copy menu when no text is selected in the diff - #16876",
+      "[Fixed] Emoji autocomplete list highlights filter text correctly - #16899",
+      "[Fixed] Allow filtering autocomplete results using uppercase characters - #16886"
+    ],
+    "3.2.7-beta2": [
+      "[New] Checkout a commit from the History tab - #10068. Thanks @kitswas!",
+      "[New] Show when a repository has been archived in the clone dialog - #7183",
+      "[Fixed] \"Clone a Repository\" dialog list is keyboard navigable - #16977",
+      "[Improved] Checkboxes in dialogs can receive initial keyboard focus - #17014",
+      "[Improved] The progress state of the pull, push, fetch button is announced by screen readers - #16985",
+      "[Improved] Inline errors are consistently announced by screen readers - #16850",
+      "[Improved] Group title and position is correctly announced by screen readers in repository and branch lists - #16968"
+    ],
+    "3.2.7-beta1": [
+      "[Fixed] Recreate stash after renaming branch - #16442",
+      "[Fixed] Improved performance when selecting and viewing a large number of commits - #16880",
+      "[Fixed] Preferences renamed to Settings on macOS to follow platform convention - #16907",
+      "[Fixed] Allow filtering autocomplete results using uppercase characters - #16886",
+      "[Fixed] Emoji autocomplete list highlights filter text correctly - #16899",
+      "[Fixed] Fix crash using Edit -> Copy menu when no text is selected in the diff - #16876",
+      "[Fixed] The list of the repositories under the filter box on the \"Let's get started!\" page is visible - #16955",
+      "[Improved] The \"pull, push, fetch\" dropdown button has an aria-label for screen reader users - #16839",
+      "[Improved] The aria role of alert is applied to dialog error banners so they are announced by screen readers - #16809",
+      "[Improved] Add Double Click to Open in Default Editor - #2620. Thanks @digitalmaster!",
+      "[Improved] Upgrade to Electron v24.4.0 - #15831"
+    ],
+    "3.2.6": [
+      "[Fixed] The list of the repositories under the filter box on the \"Let's get started!\" page is visible - #16955"
+    ],
+    "3.2.5": [
+      "[Fixed] Entering in double forward slash does not trim the target directory in the cloning dialog - #15842. Thanks @IgnazioGul!",
+      "[Fixed] In the \"No Repositories\" screen, controls at the bottom stay inside window when it is resized - #16502. Thanks @samuelko123!",
+      "[Fixed] Link to editor settings on the tutorial screen - #16636. Thanks @IgnazioGul!",
+      "[Fixed] Fix crash using Edit -> Copy menu when no text is selected in the diff - #16876",
+      "[Improved] Improve screen reader support of the \"Create Alias\" dialog - #16802",
+      "[Improved] Screen readers announce the number of results in filtered lists (like repositories, branches or pull requests) - #16779",
+      "[Improved] Screen readers announce expanded/collapsed state of dropdowns - #16781",
+      "[Improved] The context menu for a branches list items can be invoked by keyboard shortcuts - #16760",
+      "[Improved] The context menu for a repository list item can be invoked by keyboard shortcuts - #16758",
+      "[Improved] Make floating elements more responsive as the window or the UI are resized - #16717",
+      "[Improved] Adds committing avatar popover to see git configuration and ability to open git configuration settings - #16640",
+      "[Improved] Password inputs have a visibility toggle.  - #16714",
+      "[Improved] Welcome flow screen change in context is announced - #16698",
+      "[Improved] Focus the sign in with browser button on opening the enterprise server login screen - #16706",
+      "[Improved] Show the remote branch name if it does not match the local branch name - #13591. Thanks @samuelko123!",
+      "[Improved] Reduce retries of avatars that fail to load - #16592"
+    ],
+    "3.2.4": [
+      "[Fixed] The misattributed commit avatar popover no longer causes the changes list to have scrollbars - #16684",
+      "[Fixed] Autocompletion list is always visible regardless of its position on the screen - #16609, #16650",
+      "[Fixed] Close Squash Commit Message dialog on squash start - #16605",
+      "[Fixed] Multi-commit diffing produces the same results whether you select up to down or down to up - #15883",
+      "[Removed] Remove support for Windows 7, 8, and 8.1 - #16566"
+    ],
+    "3.2.4-beta1": [
+      "[Fixed] Entering in double forward slash does not  target directory in cloning dialog - #15842. Thanks @IgnazioGul!",
+      "[Fixed] In the \"No Repositories\" screen, controls at the bottom stay inside window when it is resized - #16502. Thanks @samuelko123!",
+      "[Fixed] Link to editor settings on the tutorial screen - #16636. Thanks @IgnazioGul!",
+      "[Fixed] Close Squash Commit Message dialog on squash start - #16605",
+      "[Fixed] Multi-commit diffing produces the same results whether you select up to down or down to up - #15883",
+      "[Fixed] The misattributed commit avatar popover no longer causes the changes list to have scrollbars - #16684",
+      "[Fixed] Autocompletion list is always visible regardless of its position on the screen - #16650 #16609",
+      "[Improved] Improve screen reader support of the \"Create Alias\" dialog - #16802",
+      "[Improved] Screen readers announce the number of results in filtered lists (like repositories, branches or pull requests) - #16779",
+      "[Improved] Screen readers announce expanded/collapsed state of dropdowns - #16781",
+      "[Improved] The context menu for a branches list items can be invoked by keyboard shortcuts - #16760",
+      "[Improved] The context menu for a repository list item can be invoked by keyboard shortcuts - #16758",
+      "[Improved] Make floating elements more responsive as the window or the UI are resized - #16717",
+      "[Improved] Adds committing avatar popover to see git configuration and ability to open git configuration settings - #16640",
+      "[Improved] Password inputs have a visibility toggle.  - #16714",
+      "[Improved] Welcome flow screen change in context is announced - #16698",
+      "[Improved] Focus the sign in with browser button on opening the enterprise server login screen - #16706",
+      "[Improved] Show the remote branch name if it does not match the local branch name - #13591. Thanks @samuelko123!",
+      "[Improved] Reduce retries of avatars that fail to load - #16592",
+      "[Removed] Remove support for Windows 7, 8, and 8.1 - #16566"
+    ],
+    "3.2.3": [
+      "[New] Add fetch and force-push actions in a dropdown as an alternative to the main Pull/Push/Publish action button - #15907",
+      "[New] Get notified when someone comments your pull requests - #16226",
+      "[Added] Add support for VimR code editor on macOS. - #16354. Thanks @Elmar-Wiese!",
+      "[Fixed] Preview pull request button in the no local changes suggested next action isn't intermittently disabled - #16368",
+      "[Fixed] NVDA reads number of suggestions when an autocompletion list shows up - #16526",
+      "[Fixed] The undo commit confirmation modal message is screen reader announced - #16472",
+      "[Fixed] Clipping and overlapping of the changes list is fixed at 200% zoom - #16425",
+      "[Fixed] The commit message avatar is now a toggle tip making the commit author details keyboard accessible - #16272",
+      "[Fixed] The commit length hint is keyboard and screen reader accessible - #16449",
+      "[Fixed] The changes list header checkbox tooltip description is announced by screen readers - #16457",
+      "[Fixed] The changes list header checkbox tooltip is keyboard accessible - #16487",
+      "[Fixed] Announce a file's state of inclusion in the commit on the changes list - #16420",
+      "[Fixed] Display focus ring around focused control after dismissing a dialog - #16528",
+      "[Improved] Add icons for tabs in Repository settings dialog - #16432. Thanks @sweezyio!",
+      "[Improved] Use correct name for VSCodium editor - #16511. Thanks @GitMensch!",
+      "[Improved] Styling improvements on Linux to scroll bars and default layouts - #16484. Thanks @shiftkey!",
+      "[Improved] Include remote branches in search for default branch - #15754",
+      "[Improved] Identify the changes list and history commit list as the changes and history tab panels for screen readers - #16463",
+      "[Improved] Windows title bar controls do not interrupt screen readers in browse mode - #16483",
+      "[Improved] Make radio theme selection look like radio buttons. - #16525",
+      "[Improved] Improve accessibility of GitHub Enterprise login flow - #16567",
+      "[Improved] Screen readers announce sign in errors - #16556"
+    ],
+    "3.2.2": ["[Improved] Upgrade embedded Git to 2.39.3"],
+    "3.2.2-beta2": [
+      "[Improved] Improve accessibility of GitHub Enterprise login flow - #16567",
+      "[Improved] Screen readers announce sign in errors - #16556",
+      "[Improved] Include remote branches in search for default branch - #15754",
+      "[Improved] Upgrade embedded Git to 2.39.3",
+      "[Removed] Remove unshipped high contrast theme and dependencies - #16559"
+    ],
+    "3.2.2-beta1": [
+      "[Added] Add support for VimR code editor on macOS. - #16354. Thanks @Elmar-Wiese!",
+      "[Fixed] NVDA reads number of suggestions when an autocompletion list shows up - #16526",
+      "[Fixed] The undo commit confirmation modal message is screen reader announced - #16472",
+      "[Fixed] Clipping and overlapping of the changes list is fixed at 200% zoom - #16425",
+      "[Fixed] Preview pull request button in the no local changes suggested next action isn't intermittently disabled - #16368",
+      "[Fixed] The commit message avatar is now a toggle tip making the commit author details keyboard accessible - #16272",
+      "[Fixed] The commit length hint is keyboard and screen reader accessible - #16449",
+      "[Fixed] The changes list header checkbox tooltip description is announced by screen readers - #16457",
+      "[Fixed] The changes list header checkbox tooltip is keyboard accessible - #16487",
+      "[Fixed] Announce a file's state of inclusion in the commit on the changes list - #16420",
+      "[Fixed] Display focus ring around focused control after dismissing a dialog - #16528",
+      "[Improved] Identify the changes list and history commit list as the changes and history tab panels for screen readers - #16463",
+      "[Improved] Windows title bar controls do not interrupt screen readers in browse mode - #16483",
+      "[Improved] Add icons for tabs in Repository settings dialog - #16432. Thanks @sweezyio!",
+      "[Improved] Use correct name for VSCodium editor - #16511. Thanks @GitMensch!",
+      "[Improved] Styling improvements on Linux to scroll bars and default layouts - #16484. Thanks @shiftkey!",
+      "[Improved] Make radio theme selection look like radio buttons. - #16525"
+    ],
+    "3.2.1": [
+      "[Added] Add Zed as an external editor option - #16026. Thanks @JosephTLyons!",
+      "[Added] Add support for Pulsar code editor on macOS. - #16220. Thanks @mdibella-dev!",
+      "[Fixed] Misattributed warning is announced in 'Git' preferences/options by screen readers - #16239",
+      "[Fixed] Remove check for update error modal when no internet connection or computer has been asleep - #16057",
+      "[Fixed] Update diff after adding or removing trailing newlines to a file - #15638",
+      "[Fixed] The Preferences/Options dialog content is still visible when zoomed - #16317",
+      "[Fixed] Up/down arrow can be used to navigate autocomplete lists like emoji again - #16044",
+      "[Fixed] Large diff messaging styled consistently in pull request preview - #16238",
+      "[Fixed] Fix support of newer versions of RStudio - #16339",
+      "[Improved] Show repositories available for cloning as they're received for users with access to lots of repositories - #16276 #8955 #2770",
+      "[Improved] Update preferences dialog to maintain a consistent size when switching between tabs - #16313",
+      "[Improved] Focus history and changes list when accessed via keyboard shortcut or menu - #16360",
+      "[Improved] On Windows, app level menu bar and menu items are announced by screen readers - #16315",
+      "[Improved] Keyboard shortcuts for resizing app sidebar and file lists - #16332",
+      "[Improved] Misattributed commit popover does not clip when app is zoomed - #16407",
+      "[Improved] Accessibility improvements for the co-authors input - #16335",
+      "[Improved] Commit completion status is announced by screen readers - #16371, #16340",
+      "[Improved] Improve accessibility of dialogs for screen reader users - #16350",
+      "[Improved] Accessibility improvements for autocompletion suggestions - #16324",
+      "[Improved] Learn more links are descriptive for screen readers - #16274",
+      "[Improved] Popover titles are announced by screen readers - #16270",
+      "[Improved] Show offset focus ring for buttons, vertical tabs etc - #16288",
+      "[Improved] Application main menu on Windows doesn't clip when zoom is set to 200% - #16290",
+      "[Improved] Button and text box contrast bumps - #16287",
+      "[Improved] Other email input in \"Git\" preferences/Options and misattributed popover email select have a screen readable label - #16240",
+      "[Improved] Add/remove co-authors button is now keyboard accessible - #16200"
+    ],
+    "3.2.1-beta3": [
+      "[Fixed] Add Zed as an external editor option - #16026. Thanks @JosephTLyons!",
+      "[Improved] Show repositories available for cloning as they're received for users with access to lots of repositories - #16276 #8955 #2770",
+      "[Improved] Users can resize the app sidebar via keyboard shortcuts - #16332",
+      "[Improved] Misattributed commit popover does not clip when app is zoomed - #16407",
+      "[Improved] Make co-authors input text accessible - #16335",
+      "[Improved] Commit completion status is announced by screen readers - #16371",
+      "[Improved] Windows menu scroll bars only present when menu is scrollable - #16367",
+      "[Improved] Committing status after submitting a commit is screen reader announced - #16340"
+    ],
+    "3.2.1-beta2": [
+      "[Added] Add support for Pulsar code editor on macOS. - #16220. Thanks @mdibella-dev!",
+      "[Fixed] Fix support of newer versions of RStudio - #16339",
+      "[Fixed] On Windows, app level menu bar and menu items are announced by screen readers - #16315",
+      "[Fixed] Misattributed warning is announced in 'Git' preferences/options by screen readers - #16239",
+      "[Fixed] Remove check for update error modal when no internet connection or computer has been asleep - #16057",
+      "[Fixed] Update diff after adding or removing trailing newlines to a file - #15638",
+      "[Fixed] The Preferences/Options dialog content is still visible when zoomed - #16317",
+      "[Fixed] Focus history and changes list when accessed via keyboard shortcut or menu - #16360",
+      "[Improved] Improve accessibility of dialogs for screen reader users - #16350",
+      "[Improved] Make autocompletion suggestions more accessible for screen readers - #16324",
+      "[Improved] Preference dialog height doesn't change much between sections - #16313",
+      "[Improved] Learn more links are descriptive for screen readers - #16274",
+      "[Improved] Popover titles are announced by screen readers - #16270",
+      "[Improved] Add offset focus ring for buttons, vertical tabs etc - #16288",
+      "[Improved] Windows app main menu's do not clip when zoom is set to 200% - #16290",
+      "[Improved] Button and text box contrast bumps - #16287"
+    ],
+    "3.2.1-beta1": [
+      "[New] Get notified when someone comments your pull requests - #16226",
+      "[Fixed] Up/down arrow can be used to navigate autocomplete lists like emoji again - #16044",
+      "[Fixed] Large diff messaging styled consistently in pull request preview - #16238",
+      "[Improved] Other email input in \"Git\" preferences/Options and misattributed popover email select have a screen readable label - #16240",
+      "[Improved] Make the add/remove co-authors button keyboard accessible - #16200"
+    ],
+    "3.2.0": [
+      "[New] Preview your pull request - view a diff of changes in your current branch.",
+      "[Added] Add Tabby terminal integration for macOS - #16040. Thanks @ansidev!",
+      "[Added] Add JetBrains DataSpell support - #16020. Thanks @tsvetilian-ty and @jm-rivera!",
+      "[Added] Editors installed with JetBrains Toolbox supported on Linux - #16029. Thanks @adil192!",
+      "[Added] Support for numerous additional editors on Linux - #16030. Thanks @shiftkey!",
+      "[Fixed] Include renamed files in the commit summary changed files tooltip - #15155. Thanks @haykam821!",
+      "[Improved] The context menu for a file in the changed files list can be invoked by keyboard shortcuts - #16114",
+      "[Improved] The file status of a changed file is announced by screen readers - #16098",
+      "[Improved] The changes list announces file selection position with screen readers - #16108",
+      "[Improved] The 'x' close button on dialogs is keyboard accessible - #16110",
+      "[Improved] Focus on first suitable child in sign in flow - #16125",
+      "[Improved] The misattributed warning popover is accessible through keyboard navigation - #16100"
+    ],
+    "3.1.9-beta2": ["[Fixed] Fixed production build startup crash - #16191"],
+    "3.1.9-beta1": [
+      "[Added] Add Tabby terminal integration for macOS - #16040. Thanks @ansidev!",
+      "[Added] Add JetBrains DataSpell support on Windows - #16020. Thanks @tsvetilian-ty!",
+      "[Added] Add JetBrains DataSpell support on macOS- #16020. Thanks @jm-rivera!",
+      "[Added] Editors installed with JetBrains Toolbox supported on Linux - #16029. Thanks @adil192!",
+      "[Added] Support for numerous additional editors on Linux - #16030. Thanks @shiftkey!",
+      "[Fixed] Include renamed files in the commit summary changed files tooltip - #15155. Thanks @haykam821!",
+      "[Improved] The context menu for a file in the changed files list can be invoked by keyboard shortcuts - #16114",
+      "[Improved] The file status of a changed file is announced with voice over - #16098",
+      "[Improved] The changes list announces file selection position with voice over - #16108",
+      "[Improved] The 'x' close button on dialogs is keyboard accessible - #16110",
+      "[Improved] Focus on first suitable child in sign in flow - #16125",
+      "[Improved] The misattributed warning popover is accessible through keyboard navigation - #16100"
+    ],
+    "3.1.8": [
+      "[Added] Add JetBrains CLion support on macOS - #15881. Thanks @tsvetilian-ty!",
+      "[Fixed] Fix crash launching the app on Apple silicon devices - #16011",
+      "[Fixed] Trim leading and trailing whitespace in URLs of repository remotes - #15821. Thanks @Shivareddy-Aluri!",
+      "[Fixed] Fix support for the latest versions of RStudio on Windows - #15810",
+      "[Fixed] Fix support for latest versions of VSCodium on Windows - #15585. Thanks @voidei!"
+    ],
+    "3.1.7": ["[Improved] Upgrade embedded Git to 2.39.2"],
+    "3.1.7-beta1": ["[Improved] Upgrade embedded Git to 2.39.2"],
+    "3.1.6": [
+      "[Improved] Upgrade embedded Git to 2.39.1 and Git LFS to 3.3.0 - #15915"
+    ],
+    "3.1.6-beta2": [
+      "[Fixed] Fix crash launching the app on Apple silicon devices - #16011",
+      "[Fixed] Trim leading and trailing whitespaces in URLs of repository remotes - #15821. Thanks @Shivareddy-Aluri!",
+      "[Fixed] Fix support for the latest versions of RStudio on Windows - #15810"
+    ],
+    "3.1.6-beta1": [
+      "[Added] Add fetch and force-push actions in a dropdown as an alternative to the main Pull/Push/Publish action button - #15907",
+      "[Added] Add JetBrains CLion support on macOS - #15881. Thanks @tsvetilian-ty!",
+      "[Fixed] Fix support for latest versions of VSCodium on Windows - #15585. Thanks @voidei!",
+      "[Improved] Upgrade to Electron v22.0.3 - #15831",
+      "[Improved] Upgrade embedded Git to 2.39.1 and Git LFS to 3.3.0 - #15915"
+    ],
+    "3.1.5": [
+      "[Added] Enable menu option to Force-push branches that have diverged - #15211",
+      "[Added] Add menu option to Fetch the current repository at any time - #7805",
+      "[Added] Add support for JetBrains Toolbox and JetBrains Fleet editor for Windows - #12912. Thanks @tsvetilian-ty!",
+      "[Added] Add support for Emacs editor for Linux - #15857. Thanks @zipperer!",
+      "[Added] Add Jetbrains PhpStorm and WebStorm Editors for Linux - #15375. Thanks @patinthehat!",
+      "[Added] Support VSCodium as an external editor - #15348. Thanks @daniel-ciaglia!",
+      "[Fixed] Hide window instead of hiding the app on macOS - #15511. Thanks @angusdev!",
+      "[Fixed] Only left mouse clicks invoke dragging in the commit list - #15313",
+      "[Fixed] Selected list items stay selected when scrolling - #2957",
+      "[Fixed] Stick to one tooltip at a time in the repository list  - #15583",
+      "[Fixed] Notifications of Pull Request reviews are displayed for forked repositories - #15580",
+      "[Fixed] Notifications when checks of a Pull Request fail are displayed for forked repositories - #15422",
+      "[Fixed] Prevent closing GitHub Desktop while it's being updated - #7055, #5197",
+      "[Fixed] Notifications are shown only when they are relevant to the current repository - #15487",
+      "[Fixed] The repository change indicator is visible if repository list item is selected and in focus - #7651. Thanks @angusdev!",
+      "[Fixed] Tooltips are positioned properly if mouse is not moved - #13636. Thanks @angusdev!",
+      "[Fixed] Tooltips of long commit author emails wrap to multiple lines - #15424. Thanks @angusdev!",
+      "[Fixed] Clone repository progress bar no longer hidden by repository list - #11953. Thanks @angusdev!",
+      "[Improved] Ability to copy tag names from the commit list - #15137. Thanks @Shivareddy-Aluri!",
+      "[Improved] The dropdown selection component is keyboard navigable - #15620",
+      "[Improved] The diff view now highlights Arduino's `.ino` files as C++ source - #15555. Thanks @j-f1!",
+      "[Improved] Close repository list after creating or adding repositories - #15508. Thanks @angusdev!",
+      "[Improved] Always show an error message when an update fails - #15530"
+    ],
+    "3.1.4": ["[Improved] Upgrade embedded Git to 2.35.6"],
+    "3.1.4-beta1": [
+      "[Added] Add support for JetBrains Toolbox and JetBrains Fleet editor for Windows - #12912. Thanks @tsvetilian-ty!",
+      "[Added] Add support for Emacs editor for Linux - #15857. Thanks @zipperer!",
+      "[Added] Add Jetbrains PhpStorm and WebStorm Editors for Linux - #15375. Thanks @patinthehat!",
+      "[Improved] Pull request preview dialog only uses remote branches for base branch options - #15768",
+      "[Improved] Upgrade embedded Git to 2.35.6"
+    ],
+    "3.1.3": [
+      "[Fixed] Disable reorder, squashing, cherry-picking while an action of this type is in progress. - #15468",
+      "[Fixed] Using the key command of 'Shift' + 'ArrowDown' adds the next commit below the current selection to the selection - #15549",
+      "[Fixed] Close 'Resolve conflicts before Rebase' dialog will not disable menu items - #13081. Thanks @angusdev!",
+      "[Fixed] Fix commit shortcut (Ctrl/Cmd + Enter) while amending a commit - #15445"
+    ],
+    "3.1.3-beta4": [
+      "[Fixed] Hide window instead of hiding the app on macOS - #15511. Thanks @angusdev!",
+      "[Fixed] Only left mouse clicks invoke dragging in the commit list - #15313",
+      "[Fixed] Ensure selected list items stay selected when scrolling - #2957",
+      "[Fixed] Stick to one tooltip at a time in the repository list  - #15583",
+      "[Fixed] Preview Pull Request opens when there is not a local default branch - #15704",
+      "[Fixed] Preview Pull Request suggested next action available on first app open without interaction - #15703",
+      "[Improved] Ability to copy tag names from the commit list - #15137. Thanks @Shivareddy-Aluri!",
+      "[Improved] Stacked popups remember their state when hidden due to another popup opening - #15668",
+      "[Improved] Create pull request from pull request preview opens to compare against the user's selected base branch - #15706",
+      "[Improved] On Preview Pull Request dialog, submit button closes the dialog - #15695"
+    ],
+    "3.1.3-beta3": [
+      "[Fixed] Using the key command of 'Shift' + 'ArrowDown' in the commit list adds the next commit to the current selection - #15536",
+      "[Fixed] Notifications of Pull Request reviews are displayed for forked repositories - #15580",
+      "[Fixed] Notifications when checks of a Pull Request fail are displayed for forked repositories - #15422",
+      "[Improved] User can preview a Pull Request from the suggested next actions.  - #15588",
+      "[Improved] The dropdown selection component is keyboard navigable - #15620",
+      "[Improved] 'Preview Pull Request' menu item availability is consistent with other menu items - #15590",
+      "[Improved] The diff view now highlights Arduino's `.ino` files as C++ source - #15555. Thanks @j-f1!",
+      "[Improved] Close repository list after creating or adding repositories - #15508. Thanks @angusdev!",
+      "[Improved] Always show an error message when an update fails - #15530",
+      "[Improved] Popups are stacked. Opening a popup will not discard an existing popup - #15496"
+    ],
+    "3.1.3-beta2": [
+      "[Added] Enable menu option to Force-push branches that have diverged - #15211",
+      "[Added] Add menu option to Fetch the current repository at any time - #7805",
+      "[Added] Support VSCodium as an external editor - #15348. Thanks @daniel-ciaglia!",
+      "[Fixed] Prevent closing the GitHub Desktop while it's being updated - #7055, #5197",
+      "[Fixed] Notifications are shown only when they are relevant to the current repository - #15487",
+      "[Fixed] Disable reorder, squashing, cherry-picking while an action of this type is in progress. - #15468",
+      "[Fixed] Fix repository change indicator not visible if selected and in focus - #7651. Thanks @angusdev!",
+      "[Fixed] Close 'Resolve conflicts before Rebase' dialog will not disable menu items - #13081. Thanks @angusdev!",
+      "[Fixed] Tooltips are positioned properly if mouse is not moved - #13636. Thanks @angusdev!",
+      "[Fixed] Fix tooltips of long commit author emails not breaking properly - #15424. Thanks @angusdev!",
+      "[Fixed] Clone repository progress bar no longer hidden by repository list - #11953. Thanks @angusdev!",
+      "[Fixed] Fix commit shortcut (Ctrl/Cmd + Enter) while amending a commit - #15445",
+      "[Improved] Pull request preview dialog width and height is responsive - #15500"
+    ],
+    "3.1.3-beta1": ["[Improved] Upgrade embedded Git to 2.35.5"],
+    "3.1.2": ["[Improved] Upgrade embedded Git to 2.35.5"],
+    "3.1.2-beta1": [
+      "[Added] You can preview the changes a pull request from your current branch would make - #11517",
+      "[Fixed] App correctly remembers undo commit prompt setting - #15408",
+      "[Improved] Add support for zooming out at the 67%, 75%, 80% and 90% zoom levels - #15401. Thanks @sathvikrijo!",
+      "[Improved] Add option to disable discard stash confirmation - #15379. Thanks @tsvetilian-ty!"
+    ],
+    "3.1.1": [
+      "[Fixed] App correctly remembers undo commit prompt setting - #15408"
+    ],
+    "3.1.0": [
+      "[Added] You can diff a consecutive range of commits - #14682",
+      "[Added] Submodule changes now display an explanatory, interactive diff screen - #15176",
+      "[Fixed] Enable update from upstream default branch when contributing to a fork - #15299",
+      "[Fixed] Fix crash installing updates that were downloaded a long time ago on macOS - #15275",
+      "[Fixed] Tooltips are positioned accurately when the user prefers reduced motion - #15249",
+      "[Improved] Add option to disable Undo Commit confirmation - #15134. Thanks @geophilusd!",
+      "[Improved] Update submodules when fetching, pulling and checking out branches - #8221 #9174"
+    ],
+    "3.0.9-beta1": [
+      "[Fixed] Enable update from upstream default branch when contributing to a fork - #15299",
+      "[Fixed] Fix crash installing updates that were downloaded a long time ago on macOS - #15275",
+      "[Fixed] Tooltips are positioned accurately when the user prefers reduced motion - #15249",
+      "[Fixed] Add option to disable Undo Commit popup - #15134. Thanks @geophilusd!"
+    ],
+    "3.0.8": [
+      "[Fixed] Fix system animations on Windows - #14037",
+      "[Fixed] The app window doesn't overlap the taskbar on Windows - #14263",
+      "[Fixed] The app window doesn't fit on the screen when using scaled UI on Windows - #13940"
+    ],
+    "3.0.8-beta1": [
+      "[Added] Add support for Lite XL editor on Linux & macOS - #15180. Thanks @KaMeHb-UA!",
+      "[Added] Add Neovide support on macOS - #14929. Thanks @Yohannfra!",
+      "[Fixed] Text selection is preserved while scrolling diffs in split mode - #13701",
+      "[Improved] Update submodules when fetching, pulling and checking out branches - #8221 #9174",
+      "[Improved] Avoid truncating long menu item labels on Windows - #14868",
+      "[Improved] Add \"Learn more\" link to \"Commit Reachability\" dialog - #15208",
+      "[Improved] Improve submodule support with a new diff screen with more detailed information - #15176"
+    ],
+    "3.0.7": [
+      "[Fixed] Do not show login prompt when repositories are fetched - #15163",
+      "[Improved] On Apple silicon devices running unoptimized builds, auto-update on first run to an optimized build - #14998"
+    ],
+    "3.0.7-beta1": [
+      "[Added] Add Emacs integration for macOS - #15130. Thanks @zipperer!",
+      "[Fixed] Do not show login prompt when repositories are fetched - #15163"
+    ],
+    "3.0.6": [
+      "[Added] Add Warp terminal integration for macOS - #14329. Thanks @lhvy!",
+      "[Added] Add context menu to the Current Branch and Current Repository toolbar - #13148. Thanks @uttiya10!",
+      "[Fixed] Older versions of Sublime Text and SlickEdit are also recognized as external editors - #15117. Thanks @vbwx!",
+      "[Fixed] Fix commit shortcut (Ctrl/Cmd + Enter) - #14689. Thanks @tsvetilian-ty!",
+      "[Fixed] Add PyCharm Community Edition support on macOS - #15016. Thanks @tsvetilian-ty!",
+      "[Fixed] Unified diff line gutter context menu items for discard changes no longer enabled when whitespace is hidden - #15003",
+      "[Fixed] 'Show Whitespace Changes' popover appears as expected on unified diff - #15003",
+      "[Fixed] On pull or fetch, make sure the default branch is updated to match the repository settings - #14266",
+      "[Fixed] Show 'Email' label on the preferences form when user is not signed in - #13736. Thanks @andymckay!",
+      "[Fixed] Fix invalid URL state while the \"Clone Repository\" modal is open - #7961. Thanks @tsvetilian-ty!",
+      "[Fixed] Fix commit description with three lines overflowing when it shouldn't - #14791. Thanks @HeCorr!",
+      "[Fixed] Fix notifications on Windows 10 builds prior to the Creators Update - #14714",
+      "[Fixed] 'Update from default branch` menu item allows quick merge of upstream - #14145. Thanks @uttiya10!",
+      "[Improved] Add ability to skip staggered release to ensure the latest version is downloaded - #14883"
+    ],
+    "3.0.6-beta3": [
+      "[Fixed] Older versions of Sublime Text and SlickEdit are also recognized as external editors - #15117. Thanks @vbwx!",
+      "[Fixed] Fix commit shortcut (Ctrl/Cmd + Enter) - #14689. Thanks @tsvetilian-ty!",
+      "[Improved] Add ability to skip staggered release to ensure the latest version is downloaded - #14883"
+    ],
+    "3.0.6-beta2": [
+      "[Fixed] Add PyCharm Community Edition support on macOS - #15016. Thanks @tsvetilian-ty!",
+      "[Fixed] Unified diff line gutter context menu items for discard changes no longer enabled when whitespace is hidden - #15003",
+      "[Fixed] 'Show Whitespace Changes' popover appears as expected on unified diff - #15003",
+      "[Fixed] On pull or fetch, make sure the default branch is updated to match the repository settings - #14266",
+      "[Fixed] Show 'Email' label on the preferences form when user is not signed in - #13736. Thanks @andymckay!"
+    ],
+    "3.0.6-beta1": [
+      "[Added] You can diff a consecutive range of commits. - #14682",
+      "[Added] Add Warp terminal integration for macOS - #14329. Thanks @lhvy!",
+      "[Added] Add context menu to the Current Branch and Current Repository toolbar - #13148. Thanks @uttiya10!",
+      "[Fixed] Fix invalid URL state while the \"Clone Repository\" modal is open - #7961. Thanks @tsvetilian-ty!",
+      "[Fixed] Fix commit description with three lines overflowing when it shouldn't - #14791. Thanks @HeCorr!",
+      "[Fixed] Fix notifications on Windows 10 builds prior to the Creators Update - #14714",
+      "[Fixed] 'Update from default branch` menu item allows quick merge of upstream - #14145. Thanks @uttiya10!",
+      "[Improved] On Apple silicon devices running unoptimized builds, auto-update on first run to an optimized build - #14998"
+    ],
+    "3.0.5": [
+      "[Fixed] Surface again Git's warning about unsafe directories and provide a way to trust repositories not owned by the current user"
+    ],
+    "3.0.5-beta1": [
+      "[Fixed] Surface again Git's warning about unsafe directories and provide a way to trust repositories not owned by the current user"
+    ],
+    "3.0.4": ["[Improved] Upgrade embedded Git to 2.35.4"],
+    "3.0.4-beta1": ["[Improved] Upgrade embedded Git to 2.35.4"],
+    "3.0.3": [
+      "[Added] Add Aptana Studio support - #14669. Thanks @tsvetilian-ty!",
+      "[Fixed] Fix crash when user's locale is unsupported by the spellchecker - #14817. Thanks @tsvetilian-ty!",
+      "[Fixed] On Windows, remember the app's zoom level on update - #5315",
+      "[Fixed] Fix Markdown syntax highlighting - #14710",
+      "[Improved] Add context menu option to copy repository paths - #14785. Thanks @novialriptide!",
+      "[Improved] Allow copying paths when multiple files are selected - #14638. Thanks @tsvetilian-ty!",
+      "[Improved] Add support for SSH password prompts when accessing repositories - #14676"
+    ],
+    "3.0.3-beta1": [
+      "[Added] Add Aptana Studio support - #14669. Thanks @tsvetilian-ty!",
+      "[Fixed] Fix crash when user's locale is unsupported by the spellchecker - #14817. Thanks @tsvetilian-ty!",
+      "[Fixed] On Windows, remember the apps zoom level on update - #5315",
+      "[Fixed] Fix Markdown syntax highlighting - #14710",
+      "[Improved] Add context menu option to copy repository paths - #14785. Thanks @novialriptide!",
+      "[Improved] Allow copying paths when multiple files are selected - #14638. Thanks @tsvetilian-ty!",
+      "[Improved] Add support for SSH password prompts when accessing repositories - #14676",
+      "[Improved] Upgrade to Electron v19.0.0 - #14813"
+    ],
     "3.0.2": [
       "[Fixed] Fix crash launching the app on macOS High Sierra - #14712",
       "[Fixed] Terminate all GitHub Desktop processes on Windows when the app is closed - #14733. Thanks @tsvetilian-ty!"
@@ -517,11 +1678,11 @@
       "[Fixed] Disable partial change selection in split view while whitespace changes are hidden - #12129"
     ],
     "2.8.1-beta2": [
-      "[Improved] Add complete support for macOS on Apple Silicon devices - #12091",
-      "[Improved] From now on, macOS x64 builds running on Apple Silicon devices will auto update to arm64 builds"
+      "[Improved] Add complete support for macOS on Apple silicon devices - #12091",
+      "[Improved] From now on, macOS x64 builds running on Apple silicon devices will auto update to arm64 builds"
     ],
     "2.8.1-beta1": [
-      "[New] Preliminary support for macOS on Apple Silicon devices - #9691. Thanks @dennisameling!"
+      "[New] Preliminary support for macOS on Apple silicon devices - #9691. Thanks @dennisameling!"
     ],
     "2.8.0": [
       "[New] Expand diffs to view more context around your changes - #7014",
diff --git a/docs/assets/ado-prompt.png b/docs/assets/ado-prompt.png
new file mode 100644
index 00000000000..541cbca12f9
Binary files /dev/null and b/docs/assets/ado-prompt.png differ
diff --git a/docs/assets/bitbucket-prompt.png b/docs/assets/bitbucket-prompt.png
new file mode 100644
index 00000000000..f4576498216
Binary files /dev/null and b/docs/assets/bitbucket-prompt.png differ
diff --git a/docs/assets/git-credential-manager.png b/docs/assets/git-credential-manager.png
new file mode 100644
index 00000000000..586b9ed7c28
Binary files /dev/null and b/docs/assets/git-credential-manager.png differ
diff --git a/docs/assets/gitlab-prompt.png b/docs/assets/gitlab-prompt.png
new file mode 100644
index 00000000000..b7aa40648e0
Binary files /dev/null and b/docs/assets/gitlab-prompt.png differ
diff --git a/docs/assets/unreachable-commits-demo.gif b/docs/assets/unreachable-commits-demo.gif
new file mode 100644
index 00000000000..d8fb30d99df
Binary files /dev/null and b/docs/assets/unreachable-commits-demo.gif differ
diff --git a/docs/assets/unreachable-commits-history.png b/docs/assets/unreachable-commits-history.png
new file mode 100644
index 00000000000..e8144a19760
Binary files /dev/null and b/docs/assets/unreachable-commits-history.png differ
diff --git a/docs/contributing/linux-testing-and-you.md b/docs/contributing/linux-testing-and-you.md
index 7a5f493e4d1..ccf71b3ab29 100644
--- a/docs/contributing/linux-testing-and-you.md
+++ b/docs/contributing/linux-testing-and-you.md
@@ -43,23 +43,3 @@ $ yarn run package
 If you think you've found a solution, please submit a pull request to [`shiftkey/desktop`](https://github.com/shiftkey/desktop) explaining the change and what it fixes. If you're not quite sure, open an issue on the [`shiftkey/desktop`](https://github.com/shiftkey/desktop) fork explaining what you've found and where you think the problem lies. Maybe someone else has insight into the issue.
 
 [**@shiftkey**](https://github.com/shiftkey) will co-ordinate upstreaming merged pull requests to the main repository.
-
-## Technical Details
-
-We use `electron-packager` to generate the artifacts and `electron-builder` to generate the installer.
-
-`electron-packager` details:
-
-* [API options](https://github.com/electron-userland/electron-packager/blob/development/docs/api.md#options)
-* [`dist-info.js` config file](https://github.com/desktop/desktop/blob/development/script/dist-info.js)
-* [Usage in Desktop](https://github.com/desktop/desktop/blob/development/script/build.ts#L98-L151)
-
-`dist-info.js` contains the various metadata we provide to Desktop as part of packaging. This seems fairly stable, but we might need to tweak some things in here for Linux-specific changes.
-
-`electron-builder` details:
-
-* [API options](https://www.electron.build/configuration/linux)
-* [`electron-builder-linux.yml` config file](https://github.com/desktop/desktop/blob/development/script/electron-builder-linux.yml)
-* [Usage in Desktop](https://github.com/desktop/desktop/blob/development/script/package.ts#L124-L145)
-
-We use `electron-builder-linux.yml` to configure the installers, so please investigate the documentation if you find a problem with an installer to see if something has been overlooked and can be fixed fairly easily.
diff --git a/docs/contributing/setup-windows.md b/docs/contributing/setup-windows.md
index 08b0046e490..4efde30a0b3 100644
--- a/docs/contributing/setup-windows.md
+++ b/docs/contributing/setup-windows.md
@@ -19,7 +19,7 @@ $ node -v
 If you see an error about being unable to find `node`, that probably means you don't have any Node tools installed.
 You can download Node from the [Node.js website](https://nodejs.org/), install the package, and restart your shell.
 
-If you see the output `v12.x.y` or later, you're good to go.
+You can verify that your installed version matches the one currently used by GitHub Desktop by looking at [our .node-version file](https://github.com/desktop/desktop/blob/development/.node-version). Usually the same major version is enough but if you're running into problems building Desktop please try installing that exact version.
 
 **Node.js installation notes:**
  - make sure you allow the Node.js installer to add `node` to the `PATH`.
diff --git a/docs/contributing/setup.md b/docs/contributing/setup.md
index 2b1f3d70208..0003ace7a20 100644
--- a/docs/contributing/setup.md
+++ b/docs/contributing/setup.md
@@ -19,13 +19,13 @@ versions look similar to the below output:
 
 ```shellsession
 $ node -v
-v10.15.4
+v20.17.0
 
 $ yarn -v
-1.15.2
+1.21.1
 
 $ python --version
-Python 2.7.15
+Python 3.9.x
 ```
 
 There are also [additional resources](tooling.md) to configure your favorite
@@ -82,14 +82,6 @@ When running the app in development mode,
 [React Dev Tools](https://chrome.google.com/webstore/detail/react-developer-tools/fmkadmapgofadopljbjfkapdkoienihi?hl=en)
 should automatically install itself on first start when in development mode.
 
-An additional extension, [Devtron](http://electron.atom.io/devtron/), is also
-included but is disabled by default. To enable Devtron, select the Console
-tab in Chrome Developer Tools and run this command:
-
-```js
-require('devtron').install()
-```
-
 ## The Next Steps
 
 You're almost there! Here's a couple of things we recommend you read next:
diff --git a/docs/contributing/tooling.md b/docs/contributing/tooling.md
index 32d65b949dc..a0ecf345ecb 100644
--- a/docs/contributing/tooling.md
+++ b/docs/contributing/tooling.md
@@ -38,7 +38,6 @@ $ yarn start
 At a basic level, the logs from the running app are displayed in the **Console** tab, but other features include:
 
  - [React Dev Tools](https://chrome.google.com/webstore/detail/react-developer-tools/fmkadmapgofadopljbjfkapdkoienihi?hl=en) - enables you to inspect components and view rendering activity in real time
- - [Devtron](http://electron.atom.io/devtron/) - not enabled by default, but you can add this from the console: `require('devtron').install()`
 
 If you are looking to diagnose React performance issues in Desktop, [this post by Ben Schwarz](https://building.calibreapp.com/debugging-react-performance-with-react-16-and-chrome-devtools-c90698a522ad)
 is a great introduction to the workflow enabled by React 16 around measuring and investigating using the **Performance** tab.
diff --git a/docs/contributing/upgrading-dependencies.md b/docs/contributing/upgrading-dependencies.md
index fca0c46f7a2..654df34f25b 100644
--- a/docs/contributing/upgrading-dependencies.md
+++ b/docs/contributing/upgrading-dependencies.md
@@ -10,7 +10,6 @@ In the interest of stability and caution we tend to stay a version (or more) beh
 | Dependency  | Versions Behind Latest |
 | --- | --- |
 | electron | >= 1 major |
-| electron-builder | >= 1 minor |
 | electron-packager | >= 1 major |
 | electron-winstaller | >= 1 minor |
 | typescript | >= 1 minor |
@@ -76,7 +75,6 @@ These are the most important dependencies to the app, and include:
  - `package.json`
    - `@types/node`
    - `electron`
-   - `electron-builder`
    - `electron-packager`
    - `electron-winstaller`
    - `typescript`
diff --git a/docs/contributing/working-with-packages.md b/docs/contributing/working-with-packages.md
index 3483c62cb9b..84bb0c591ed 100644
--- a/docs/contributing/working-with-packages.md
+++ b/docs/contributing/working-with-packages.md
@@ -35,7 +35,7 @@ To see which packages have newer versions available:
 > yarn outdated
 ```
 
-To upgrade a package to it's latest version:
+To upgrade a package to its latest version:
 
 ```sh
 > yarn upgrade --latest [package-name]
diff --git a/docs/integrations/azure-devops.md b/docs/integrations/azure-devops.md
index 2313affbb50..4b1c25ee68e 100644
--- a/docs/integrations/azure-devops.md
+++ b/docs/integrations/azure-devops.md
@@ -1,5 +1,19 @@
 # Authenticating to Azure DevOps with GitHub Desktop
 
+GitHub Desktop now provides support for [Git Credential Manager (GCM)](https://gh.io/gcm), which makes the task of authenticating to Azure DevOps repositories easy and secure. This feature can be enabled by going to **File** > **Options** > **Advanced** on Windows, or **GitHub Desktop** > **Preferences** > **Advanced** on macOS, and then selecting the **Use Git Credential Manager** checkbox.
+
+![screenshot of the GitHub Desktop settings menu with the "Use Git Credential Manager" checkbox outlined](/docs/assets/git-credential-manager.png)
+
+When GCM is enabled all credentials for Azure DevOps will be handled, and stored, outside of GitHub Desktop. GCM supports browser authentication and will avoid the need to create personal access tokens (PATs). 
+
+Your browser will open to authenticate to your Azure DevOps account using GCM when you go to **File** > **Clone Repository** > **URL** and enter the HTTPS clone URL of the repository.
+
+![screenshot of a browser window showing the option to pick a Microsoft account](/docs/assets/ado-prompt.png)
+
+If you would prefer not to use GCM and need to create a personal access token in Azure DevOps you can follow the steps below.
+
+
+
 ## Creating a Personal Access Token in Azure DevOps
 
 To authenticate against Azure DevOps repositories you will need to create a personal access token.
diff --git a/docs/integrations/bitbucket.md b/docs/integrations/bitbucket.md
index d9425f67c99..6d13dd6bca3 100644
--- a/docs/integrations/bitbucket.md
+++ b/docs/integrations/bitbucket.md
@@ -1,16 +1,29 @@
 # Authenticating to Bitbucket with GitHub Desktop
 
+GitHub Desktop now provides support for [Git Credential Manager (GCM)](https://gh.io/gcm), which makes the task of authenticating to Bitbucket repositories easy and secure. This feature can be enabled by going to **File** > **Options** > **Advanced** on Windows, or **GitHub Desktop** > **Preferences** > **Advanced** on macOS, and then selecting the **Use Git Credential Manager** checkbox.
+
+![screenshot of the GitHub Desktop settings menu with the "Use Git Credential Manager" checkbox outlined](/docs/assets/git-credential-manager.png)
+
+When Git Credential Manager is enabled all credentials for Bitbucket will be handled, and stored, outside of GitHub Desktop. Git Credential Manager supports browser authentication and will avoid the need to create personal access tokens (PATs). 
+
+The prompt to authenticate to your Bitbucket account using GCM will be shown when you go to **File** > **Clone Repository** > **URL** and enter the HTTPS clone URL of the repository.
+
+![screenshot of a prompt showing the option to sign in with your browser to an Atlassian account](/docs/assets/bitbucket-prompt.png)
+
+If you would prefer not to use GCM and need to create a personal access token in Bitbucket you can follow the steps below.
+
 ## Creating a Personal Access Token in Bitbucket
 
 To authenticate against Bitbucket repositories you will need to create a personal access token.
 
-1. Go to your Bitbucket account and select **Personal settings** in the user profile dropdown.
+1. Go to your Bitbucket account and select **Personal Bitbucket settings** in the settings dropdown.
 
 2. Select **App passwords**
 
 3. Under **App passwords** click **Create app password**
 
-![](https://user-images.githubusercontent.com/721500/54835632-ead3cd80-4c98-11e9-94fb-f94945581fe7.png)
+![image](https://user-images.githubusercontent.com/38629827/227267197-6b442b6f-ee37-42a6-9e99-3b83a05b9c72.png)
+
 
 4. Under the **Details** section in **Add app password** enter a label for your password
 
@@ -18,7 +31,9 @@ To authenticate against Bitbucket repositories you will need to create a persona
 
 6. Click **Create** to create a new token, and then copy the token to your clipboard.
 
-![](https://user-images.githubusercontent.com/721500/54835624-e8717380-4c98-11e9-89b8-37d286cf99b6.png)
+![image](https://user-images.githubusercontent.com/38629827/227267762-91745d4c-21b0-4164-badd-d69b0c99e95b.png)
+![image](https://user-images.githubusercontent.com/38629827/227267974-fd5c3146-eca8-4976-84d6-26bafaa38348.png)
+
 
 ## Cloning your Bitbucket repository in GitHub Desktop
 
diff --git a/docs/integrations/gitlab.md b/docs/integrations/gitlab.md
index 0cba8d3d42a..3da671f4f9a 100644
--- a/docs/integrations/gitlab.md
+++ b/docs/integrations/gitlab.md
@@ -1,14 +1,26 @@
 # Authenticating to GitLab with GitHub Desktop
 
+GitHub Desktop now provides support for [Git Credential Manager (GCM)](https://gh.io/gcm), which makes the task of authenticating to GitLab repositories easy and secure. This feature can be enabled by going to **File** > **Options** > **Advanced** on Windows, or **GitHub Desktop** > **Preferences** > **Advanced** on macOS, and then selecting the **Use Git Credential Manager** checkbox.
+
+![screenshot of the GitHub Desktop settings menu with the "Use Git Credential Manager" checkbox outlined](/docs/assets/git-credential-manager.png)
+
+When GCM is enabled all credentials for GitLab will be handled, and stored, outside of GitHub Desktop. GCM supports browser authentication and will avoid the need to create personal access tokens (PATs). 
+
+The prompt to authenticate to your GitLab account using GCM will be shown after you enter the HTTPS clone URL of the GitLab repository by going to **File** > **Clone Repository** > **URL**.
+
+![screenshot of a prompt showing the option to sign in with your browser to a GitLab account](/docs/assets/gitlab-prompt.png)
+
+If you would prefer not to use GCM and need to create a personal access token in GitLab you can follow the steps below.
+
 ## Creating a Personal Access Token in GitLab
 
 To authenticate against GitLab repositories you will need to create a personal access token.
 
-1. Go to your GitLab account and select **Settings** in the user profile dropdown.
+1. Go to your GitLab account and select **Edit Profile** in the user profile dropdown.
 
-![](https://user-images.githubusercontent.com/721500/54834720-1f468a00-4c97-11e9-9a0f-4c92224064d0.png)
+![](https://user-images.githubusercontent.com/721500/206245864-025fedb1-88e5-4c58-84dd-0d4b24eff76d.png)
 
-2. Select **Access tokens**
+2. In the left sidebar, select **Access tokens**
 
 3. Under **Add a personal access token** choose a name and set an expiration date for your token.
 
diff --git a/docs/known-issues.md b/docs/known-issues.md
index 357c16d8756..2a8d7b89cbe 100644
--- a/docs/known-issues.md
+++ b/docs/known-issues.md
@@ -61,6 +61,21 @@ This issue seems to be caused by missing permissions for the `~/Library/Caches/c
    the "Read & Write" permissions
  - Start Desktop again and check for updates
 
+### GitHub Desktop prompts admin password to install helper tool very frequently
+
+Related issue: [#13956](https://github.com/desktop/desktop/issues/13956)
+
+Users who use macOS' Migration Assistant to keep their stuff intact when moving to a new computer might run into this problem because the Migration Assistant changes the owner of the `/Applications/GitHub Desktop.app` folder to `root`.
+
+Since GitHub Desktop is able to auto-update by changing the contents of the `/Applications/GitHub Desktop.app` folder, it needs to be able to write to it. If the owner of the folder is not the current user, the user will be prompted for an admin password every time GitHub Desktop tries to update itself.
+
+**Workaround:** you need to restore the ownership and permissions of the application folder to the current user. If your app is located in `/Applications/GitHub Desktop.app`, you can probably do this by just running the following commands in Terminal:
+
+```sh
+sudo chown -R ${USER}:staff /Applications/GitHub\ Desktop.app
+chmod -R g+w /Applications/GitHub\ Desktop.app
+```
+
 ## Windows
 
 ### Window is hidden after detaching secondary monitor
@@ -202,3 +217,11 @@ If either the user or an application has modified the `Command Processor` regist
 `HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Command Processor\`
 
 Check to see if there is an `Autorun` value in either of those location. If there is, deleting that value should resolve the `Authentication failed` error.
+
+### "Not enough resources" error when signing in
+
+Related issue: [#15217](https://github.com/desktop/desktop/issues/15217)
+
+If you see an error that says "Not enough resources are available to process this command" when signing in to GitHub Desktop, it's likely that you have too many credentials stored in Windows Credentials Manager.
+
+**Workaround:** open the Credential Manager application, click on Windows Credentials and go through the list to see if there are some you can delete.
diff --git a/docs/learn-more/unreachable-commits.md b/docs/learn-more/unreachable-commits.md
new file mode 100644
index 00000000000..87b3f4a8042
--- /dev/null
+++ b/docs/learn-more/unreachable-commits.md
@@ -0,0 +1,67 @@
+# Reachable and Unreachable Commits
+
+In Git, every commit will have at least one parent commit except the very first. Additionally, a repository may have any number of branches that begin at any particular commit. Because of this we can create a graph of the history of a commit by following the path from one commit's parent to the another. Given a branch `main`, whose initial commit is `A`, and we add commit `B` and `C`, the resulting graph would be as follows:
+
+```mermaid
+    gitGraph
+       commit id: "A"
+       commit id: "B"
+       commit id: "C"
+```
+
+Since we can follow the graph from `C` to `A`, that means that `A` is **reachable** by or from `C`. This as known as following the ancestral path of `C`.
+
+## Unreachable Commits
+Now, if we create a new branch called `feature-branch` from `C` and commit `D` and `E` and then return to `main` and commit `F`. We would have the resulting graph:
+
+```mermaid
+    gitGraph
+       commit id: "A"
+       commit id: "B"
+       commit id: "C"
+       branch feature-branch
+       checkout feature-branch
+       commit id: "D"
+       commit id: "E"
+       checkout main
+       commit id: "F"
+```
+
+In the above example, `B` is reachable by `F` through the ancestral path of `F`-> `C` -> `B`,  and `B` is reachable by `E` through `E` -> `D` -> `C` -> `B`. However, there is no such path to get to `E` or `D` from `F`. Thus, `E` and `D` are **unreachable** from `F`.
+
+## Git Commands Use the Ancestral Path
+Some Git commands use the ancestral path to determine what to show. One of those is `git diff`, which is used to see the changes between two commits non inclusive of the first commit. If we execute `git diff A..C`, we will receive the set of changes from the commits along the ancestral path from `C` to `A` or `C` -> `B` -> `A`. Thus, we would see changes from `B` and `C`. Likewise, if we executed `git diff B..F`, we will get changes from reachable from `F`; thus, `F` -> `C` -> `B`. But, not changes from `E` and `D` as they are unreachable.
+
+## Merge Commits
+Now, let's say that we merge the `feature-branch` into our `main` branch. Our graph becomes:
+
+```mermaid
+    gitGraph
+       commit id: "A"
+       commit id: "B"
+       commit id: "C"
+       branch feature-branch
+       checkout feature-branch
+       commit id: "D"
+       commit id: "E"
+       checkout main
+       commit id: "F"
+       merge feature-branch tag: "G"
+```
+
+Still `E` and `D` are unreachable by `F`. But, you may think "I merged the `feature-branch` into `main`, so I should be able to see changes from `E` and `D`." This is true if you start at a commit that has them in its ancestral path. That is `G` and it is known as a **merge commit**, and it is special in that it has two parents. The first is `F` as the last commit of the branch being merged into, and `E` as the last commit of the branch being merged. Now, all the commits in this graph are ancestors of `G`. Thus, if we were to execute `git diff B..G`. We will see changes of all ancestral paths of `G` to `B`. Those paths are `G` -> `F` -> `C` -> `B` and `G`-> `E` -> `D` -> `C` -> `B`. Therefore we will see changes from `G`, `F`, `E`, `D`, and `C`.
+
+# GitHub Desktop
+In GitHub Desktop, commits are displayed linearly and in chronological order. Thus, the graph from the previous section `Merge Commits` would look like:
+
+![image](../assets/unreachable-commits-history.png)
+
+In GitHub Desktop, diffing across multiple commits is accomplished through a range selection that results in executing `git diff`, which shows the changes of comparing the first and last commit in the selection (inclusive). Therefore, generating a diff on a branch where merge commits exist may result in unreachable commits being inside a diff selection. The following shows the unreachable commit scenario described above in `Merge Commits`.
+
+![image](../assets/unreachable-commits-demo.gif)
+
+
+
+
+
+
diff --git a/docs/process/releasing-updates.md b/docs/process/releasing-updates.md
deleted file mode 100644
index 0434d8aedbf..00000000000
--- a/docs/process/releasing-updates.md
+++ /dev/null
@@ -1,217 +0,0 @@
-# Releasing Updates
-
-## Channels
-
-We have three channels to which we can release: `production`, `beta`, and `test`.
-
-- `production` is the channel from which the general public downloads and receives updates. It should be stable and polished.
-
-- `beta` is released more often than `production`. We want to ensure `development` is always in a state where it can be released to users, so it should be used as the source for `beta` releases as an opportunity for additional QA before releasing to `production`.
-
-- `test` is unlike the other two. It does not receive updates. Each test release is locked in time. It's used entirely for providing test releases.
-
-## The Process
-
-### 1. GitHub Access Token
-
-From a clean working directory, set the `GITHUB_ACCESS_TOKEN` environment variable to a valid [Personal Access Token](https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/)
-
-To check that this environment variable is set in your shell:
-
-**Bash (macOS, Linux or Git Bash)**
-```shellsession
-$ echo $GITHUB_ACCESS_TOKEN
-```
-
-**Command Prompt**
-```shellsession
-$ echo %GITHUB_ACCESS_TOKEN%
-```
-
-**PowerShell**
-```shellsession
-$ echo $env:GITHUB_ACCESS_TOKEN
-```
-
-If you are creating a new Personal Access Token on GitHub:
-* make the token memorable - use a description like `Desktop Draft Release and Changelog Generator`
-* the `read:org` scope is the **only** required scope for drafting releases
-
-To set this access token as an environment in your shell:
-
-**Bash (macOS, Linux or Git Bash)**
-```shellsession
-$ export GITHUB_ACCESS_TOKEN={your token here}
-```
-
-**Command Prompt**
-```shellsession
-$ set GITHUB_ACCESS_TOKEN={your token here}
-```
-
-**PowerShell**
-```shellsession
-$ $env:GITHUB_ACCESS_TOKEN="{your token here}"
-```
-
-### 2. Create Release Branch
-
-Create a new branch to represent the work that will be released to users:
-
- - for `beta` releases, branch from `development` to ensure the latest changes are published
- - for `production` releases, branch from the latest beta tag
-    - to find this tag: `git tag | grep 'beta' | sort -r | head -n 1`
-
-When naming the branch, ensure you use the `releases/[version]` pattern to ensure all CI platforms are aware of the branch and will build any PRs that target the branch.
-
-### 3. Create Draft Release
-
-Run the script below (which relies on the your personal access token being set), which will determine the next version from what was previously published, based on the desired channel.
-
-For `production` and `beta` releases, run:
-
-```shellsession
-$ yarn draft-release (production|beta|test)
-```
-
-If you are creating a new beta release, the `yarn draft-release beta` command will help you find the new release entries for the changelog.
-
-If you are create a new `production` release, you should just combine and sort the previous `beta` changelog entries.
-
-
-The script will output a draft changelog, which covers everything that's been merged, and probably needs some love.
-The output will then explain the next steps:
-
-If you have pretext release note drafted in `app/static/common/pretext-draft.md`, you can add the `--pretext` flag to generate a pretext change log entry it. Example: `yarn draft-release test --pretext`
-
-```shellsession
-Here's what you should do next:
-
-1. Update the app/package.json 'version' to '1.0.14-beta2' (make sure this aligns with semver format of 'major.minor.patch')
-2. Concatenate this to the beginning of the releases element in the changelog.json as a starting point:
-{
-  "1.0.14-beta2": [
-    "[???] Add RubyMine support for macOS - #3883. Thanks @gssbzn!",
-    "[???] Allow window to accept single click on focus - #3843",
-    "[???] Drop unnecessary comments before issue template - #3906",
-    "[???] First-class changelog script for generating release notes - #3888",
-    "[???] Fix expanded avatar stack overflow - #3884",
-    "[???] Switch to a saner default gravatar size - #3911",
-    "[Fixed] Add a repository settings store - #934",
-    "[Fixed] Ensure renames are detected when viewing commit diffs - #3673",
-    "[Fixed] Line endings are hard, lets go shopping - #3514",
-  ]
-}
-3. Revise the release notes according to https://github.com/desktop/desktop/blob/development/docs/process/writing-release-notes.md
-4. Commit the changes (on development or as new branch) and push them to GitHub
-5. Read this to perform the release: https://github.com/desktop/desktop/blob/development/docs/process/releasing-updates.md
-```
-
-See our [release notes writing guide](./writing-release-notes.md) for more info on how we write and review our release notes.
-
-_Note: You should ensure the `version` in `app/package.json` is set to the new version and follows the [semver format](https://semver.org/) of `major.minor.patch`._
-
-Examples:
-* for prod, `1.1.0` -> `1.1.1` or `1.1.13` -> `1.2.0`
-* for beta, `1.1.0-beta1` -> `1.1.0-beta2` or `1.1.13-beta3` -> `1.2.0-beta1`
-* for test, `1.0.14-test2` -> `1.0.14-test3` or `1.1.14-test3` -> `1.2.0-test1`
-
-Here's an example of the previous changelog draft after it has been edited:
-
-```json
-{
-  "1.0.14-beta2": [
-    "[Added] Add RubyMine support for macOS - #3883. Thanks @gssbzn!",
-    "[Fixed] Allow window to accept single click on focus - #3843",
-    "[Fixed] Expanded avatar list hidden behind commit details - #3884",
-    "[Fixed] Renames not detected when viewing commit diffs - #3673",
-    "[Fixed] Ignore action assumes CRLF when core.autocrlf is unset - #3514",
-    "[Improved] Use smaller default size when rendering Gravatar avatars - #3911",
-  ]
-}
-```
-
-Add your new changelog entries to `changelog.json`, update the version in `app/package.json`, commit the changes, and push this branch to GitHub. This becomes the release branch, and lets other maintainers continue to merge into `development` without affecting your release.
-
-If a maintainer would like to backport a pull request to the next release, it is their responsibility to co-ordinate with the release owner and ensure they are fine with accepting this work.
-
-Once your release branch is ready to review and ship, ask the other maintainers to review and approve the changes!
-
-IMPORTANT NOTE: Do NOT "Update branch" and merge development into the release branch. This might be tempting if the "branch is out-of-date with the base branch" dotcom feature is enabled. However, doing so would inadvertently release everything on development to production or beta 🙀
-
-### 4. Releasing
-
-When you are ready to start the deployment, run this command in chat (where `X.Y.Z-release` is the name of your release branch):
-
-```
-.release! desktop/X.Y.Z-release to {production|beta|test}
-```
-
-We're using `.release` with a bang so that we don't have to wait for any current CI on the branch to finish. This might feel a little wrong, but it's OK since making the release itself will also run CI.
-
-If you're releasing a `production` update, release a `beta` update for the next version too, so that beta users are on the latest release. For example, if the version just released to production is `1.2.0` then the beta release should be `1.2.1-beta0` to indicate there are no new changes on top of what's currently on `production`.
-
-IMPORTANT NOTE: Ensure that you indicate which channel to release to. If not, chatops will default to releasing to production 🙀
-
-### 5. Check for Completed Release
-
-Go to [Central's Deployments](https://central.github.com/deployments) to find your release; you'll see something at the top of the page like:
-```
-desktop/desktop deployed from {YOUR_BRANCH}@{HASH_ABBREVIATION_FOR_COMMIT} to {production|beta|test}
-```
-it will initially specify its state as `State: pending` and will be completed when it says `State: released`
-
-You will also see this in Chat:
-`desktopbot tagged desktop/release-{YOUR_VERSION}`
-
-### 6. Test that your app auto-updates to new version
-
-When the release in Central is in `State: released` for `beta` or `production`, switch to your installed Desktop instance and make sure that the corresponding (prod|beta) app auto-updates.
-
-Testing that an update is detected, downloaded, and applied correctly is very important - if this is somehow broken during development then our users will not likely stay up to date!
-
-If you don't have the app for `beta`, for example, you can always download the previous version on Central to see it update
-
-_Make sure you move your application out of the Downloads folder and into the Applications folder for macOS or it won't auto-update_.
-
-### 7. Merge PR with changelog entries
-
-So that we keep the `changelog.json` up to date. Beta entries will be used for the upcoming production release.
-
-### 8. Check Error Reporting
-
-If an error occurs during the release process, a needle will be reported to Central's [Haystack](https://haystack.githubapp.com/central).
-
-After the release is deployed, you should monitor Desktop's [Haystack](https://haystack.githubapp.com/desktop) closely for 15 minutes to ensure no unexpected needles appear.
-
-#### Final Beta release
-If the active beta is the last beta prior to a production release, extra care should be taken when looking at Desktop's [Haystack](https://haystack.githubapp.com/desktop) roll-ups. The lead engineer responsible for deployment should produce a _Haystack report_ the day before and after the release. The report should contain a list of any new or unexpected errors from the past beta releases in the milestone and be published to the team's Slack channel.
-
-### 9. Celebrate
-
-Once your app updates and you see the visible changes in your app and there are no spikes in errors, celebrate 🎉!!! You did it!
-
-Also it might make sense to continue to monitor Haystack in the background for the next 24 hours.
-
-## Retrying a Failed Release
-
-Sometimes deployments will fail for any reason: one of the CI jobs times out, uploading the builds fails…
-
-When that happens, we should never just re-run the CI jobs, because that could cause problems with the updates of the Windows app.
-
-Instead, we have two options:
-1. Delete the failed release from Central (and its `release-${version}-${channel}` tag, if it exists), and then create a new release from the same branch as usual.
-2. Just create a new version (bumping the version number) and release it instead.
-
-## Stopping a Release Mid-flight
-
-So let's say you kicked off a release with chatops on accident. Here's how you fix that.
-
-When you kicked off the release, a branch with the prefix `__release-${channel}-` was created in the GitHub repo. Use that branch name to find the proper CI jobs below.
-
-1. Delete the pending release from Central
-2. Cancel the GitHub Action release job
-3. Delete the CI release job branch from GitHub
-4. Breathe a sigh of relief
-
-You don't need to do anything with your manually created release branch, that you referred to in the chatops command. Feel free to re-use it.
diff --git a/docs/process/roadmap.md b/docs/process/roadmap.md
index 9e1832931ad..bc82a355052 100644
--- a/docs/process/roadmap.md
+++ b/docs/process/roadmap.md
@@ -1,16 +1,24 @@
 # Roadmap
 
-The following are the larger areas of upcoming work the GitHub Desktop team intends to explore. This is not inclusive of everything we're working on, and it's not written in stone. We'll continue to update it as our priorities evolve.
+The following are the larger areas of upcoming work the GitHub Desktop team intends to explore and has recently shipped. This is not inclusive of everything we're working on (see existing open pull requests for that), and it's not written in stone. We'll attempt to update this intermittently as priorities evolve, but can't guarantee that it stays up to date over time.
 
-#### Native arm64 support for macOS and Windows
+## Major features shipped in previous releases
 
-- Provide support for arm64 Windows machines: [#9691](https://github.com/desktop/desktop/pull/9691)
+#### High signal notifications (2.9.10 and 3.0.0)
 
-## Shipped in previous releases
+- Receive a notification when checks fail: [#13655](https://github.com/desktop/desktop/pull/14175)
+- Receive a notification when your pull request is reviewed: [#14175](https://github.com/desktop/desktop/pull/14175)
 
-#### Native support for Apple Silicon (M1)
+#### Improved commit history: reorder commits, squash commits, amend commits, and create a branch from previous commit (2.9.0)
 
-- Provide support for Apple Silicon (M1) machines: [#9691](https://github.com/desktop/desktop/pull/9691)
+- Reorder commits via drag/drop: [#12384](https://github.com/desktop/desktop/pull/12384)
+- Squash commits via drag/drop: [#12235](https://github.com/desktop/desktop/pull/12235)
+- Amend last commit: [#12353](https://github.com/desktop/desktop/pull/12353)
+- Create a branch from a previous commit: [#12160](https://github.com/desktop/desktop/pull/12160)
+
+#### Native support for Apple silicon machines (2.8.2)
+
+- Provide support for Apple silicon machines: [#9691](https://github.com/desktop/desktop/pull/9691)
 
 #### Expanding diffs (2.8.0)
 
diff --git a/docs/technical/crafting-git-tests.md b/docs/technical/crafting-git-tests.md
index 5444f6c452c..71da33ed221 100644
--- a/docs/technical/crafting-git-tests.md
+++ b/docs/technical/crafting-git-tests.md
@@ -162,11 +162,11 @@ it('returns remotes sorted alphabetically', async () => {
   // adding these remotes out-of-order to test how they are then retrieved
   const url = 'https://github.com/desktop/not-found.git'
 
-  await GitProcess.exec(['remote', 'add', 'X', url], repository.path)
-  await GitProcess.exec(['remote', 'add', 'A', url], repository.path)
-  await GitProcess.exec(['remote', 'add', 'L', url], repository.path)
-  await GitProcess.exec(['remote', 'add', 'T', url], repository.path)
-  await GitProcess.exec(['remote', 'add', 'D', url], repository.path)
+  await exec(['remote', 'add', 'X', url], repository.path)
+  await exec(['remote', 'add', 'A', url], repository.path)
+  await exec(['remote', 'add', 'L', url], repository.path)
+  await exec(['remote', 'add', 'T', url], repository.path)
+  await exec(['remote', 'add', 'D', url], repository.path)
 
   const result = await getRemotes(repository)
   expect(result).toHaveLength(5)
diff --git a/docs/technical/editor-integration.md b/docs/technical/editor-integration.md
index b6b3084ba58..f82fe1e1e9f 100644
--- a/docs/technical/editor-integration.md
+++ b/docs/technical/editor-integration.md
@@ -33,17 +33,24 @@ These editors are currently supported:
  - [SlickEdit](https://www.slickedit.com)
  - [JetBrains IntelliJ Idea](https://www.jetbrains.com/idea/)
  - [JetBrains WebStorm](https://www.jetbrains.com/webstorm/)
- - [JetBrains Phpstorm](https://www.jetbrains.com/phpstorm/)
+ - [JetBrains PhpStorm](https://www.jetbrains.com/phpstorm/)
  - [JetBrains Rider](https://www.jetbrains.com/rider/)
  - [JetBrains CLion](https://www.jetbrains.com/clion/)
  - [JetBrains PyCharm](https://www.jetbrains.com/pycharm/)
  - [JetBrains RubyMine](https://www.jetbrains.com/rubymine/)
  - [JetBrains GoLand](https://www.jetbrains.com/go/)
+ - [JetBrains RustRover](https://www.jetbrains.com/rust/)
  - [Android Studio](https://developer.android.com/studio)
  - [Brackets](http://brackets.io/)
  - [Notepad++](https://notepad-plus-plus.org/)
  - [RStudio](https://rstudio.com/)
  - [Aptana Studio](http://www.aptana.com/)
+ - [JetBrains Fleet](https://www.jetbrains.com/fleet/)
+ - [JetBrains DataSpell](https://www.jetbrains.com/dataspell/)
+ - [Zed](https://zed.dev/) - both Stable and Preview channel
+ - [Pulsar](https://pulsar-edit.dev/)
+ - [Cursor](https://www.cursor.com/)
+
 
 These are defined in a list at the top of the file:
 
@@ -52,7 +59,7 @@ These are defined in a list at the top of the file:
  * This list contains all the external editors supported on Windows. Add a new
  * entry here to add support for your favorite editor.
  **/
-const editors: IWindowsExternalEditor[] = [
+const editors: WindowsExternalEditor[] = [
 ...
 ]
 ```
@@ -68,7 +75,7 @@ The steps for resolving each editor can be found in `findApplication()` and in
 pseudocode looks like this:
 
 ```ts
-async function findApplication(editor: IWindowsExternalEditor): Promise<string | null> {
+async function findApplication(editor: WindowsExternalEditor) {
   // find install location in registry
   // validate installation
   // find executable to launch
@@ -83,7 +90,7 @@ wishes to uninstall. These entries are used by GitHub Desktop to identify
 relevant programs and where they can be located.
 
 The registry locations for each editor are listed in the `registryKeys`
-property. Some editors support multiple install locations, but are structurally 
+property. Some editors support multiple install locations, but are structurally
 the same (for example 64-bit or 32-bit application, or stable and developer
 channels).
 
@@ -95,6 +102,8 @@ channels).
     CurrentUserUninstallKey('{771FD6B0-FA20-440A-A002-3B3BAC16DC50}_is1'),
     // 32-bit version of VSCode (user)
     CurrentUserUninstallKey('{D628A17A-9713-46BF-8D57-E671B46A741E}_is1'),
+    // ARM64 version of VSCode (user)
+    CurrentUserUninstallKey('{D9E514E7-1A56-452D-9337-2990C0DC4310}_is1'),
     // 64-bit version of VSCode (system) - was default before user scope installation
     LocalMachineUninstallKey('{EA457B21-F73E-494C-ACAB-524FDE069978}_is1'),
     // 32-bit version of VSCode (system)
@@ -124,7 +133,7 @@ is the key that Desktop needs to read the registry and find the installation for
 
 As seen in the example above, you can use the following helper functions to
 enumerate the uninstall keys:
- - `LocalMachineUninstallKey` for keys in 
+ - `LocalMachineUninstallKey` for keys in
  `HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall`
  - `Wow64LocalMachineUninstallKey` for keys in
  `HKEY_LOCAL_MACHINE\\SOFTWARE\\WOW6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall`
@@ -143,7 +152,7 @@ you can see this code in `getAppInfo()`:
 
 ```ts
 function getAppInfo(
-  editor: IWindowsExternalEditor,
+  editor: WindowsExternalEditor,
   keys: ReadonlyArray<RegistryValue>
 ): IWindowsAppInformation {
   const displayName = getKeyOrEmpty(keys, 'DisplayName')
@@ -171,16 +180,14 @@ publisher in the `Publisher` registry key, and the install location in the
 setting a different registry key in the `installLocationRegistryKey` attribute
 of your new editor entry in the `editors` list.
 
-The second step is to validate the installation, and this is done in the
-`expectedInstallationChecker` functions defined for each editor entry:
+The second step is to validate the installation:
 
 ```ts
 {
   name: 'Visual Studio Code',
   ...
-  expectedInstallationChecker: (displayName, publisher) =>
-    displayName.startsWith('Microsoft Visual Studio Code') &&
-    publisher === 'Microsoft Corporation',
+  displayNamePrefix: 'Microsoft Visual Studio Code',
+  publisher: 'Microsoft Corporation',
 },
 ```
 
@@ -196,13 +203,44 @@ location with an interface that doesn't change between updates.
 {
   name: 'Visual Studio Code',
   ...
-  executableShimPath: ['bin', 'code.cmd'],
+  executableShimPaths: [['bin', 'code.cmd']],
 },
 ```
 
 Desktop will confirm this file exists on disk before launching - if it's
 missing or lost it won't let you launch the external editor.
 
+### Support for JetBrains Toolbox editors
+
+Now GitHub Desktop support editors installed through JetBrains Toolbox.
+The technique used to achieve that is using `jetBrainsToolboxScriptName` field
+to check if, in the default section for scripts in JetBrainsm Toolbox, a script
+with the corresponding name exists.
+
+```ts
+{
+  name: 'JetBrains PyCharm',
+  ...
+  jetBrainsToolboxScriptName: 'pycharm',
+},
+```
+
+**Note:** Use `jetBrainsToolboxScriptName` field only on the main edition of
+the product. When JetBrains Toolbox generates the scripts, it doesn't consider the
+different editions, so when a new product edition is installed, it generates a
+shell script with the same name that overrides the existing one. So it's
+impossible to differentiate between the various editions of the same product.
+
+**Overriding example:**
+1. Install JetBrains PyCharm Community
+2. At this point, JetBrains Toolbox will generate a shell script called `pycharm`
+3. Install JetBrains PyCharm Professional
+4. JetBrains Toolbox will generate a new script with the same name, `pycharm`
+and will override the script generated for the community version
+
+The current method supports only the default generated JetBrains Toolbox shell
+scripts.
+
 ## macOS
 
 The source for the editor integration on macOS is found in
@@ -211,7 +249,11 @@ The source for the editor integration on macOS is found in
 These editors are currently supported:
 
  - [Atom](https://atom.io/)
+ - [Eclipse](https://www.eclipse.org/downloads/packages/release/)
+     - All IDE variants (Java, JavaEE, C/C++, PHP, etc.) are supported.
  - [MacVim](https://macvim-dev.github.io/macvim/)
+ - [Neovide](https://github.com/neovide/neovide)
+ - [VimR](https://github.com/qvacua/vimr)
  - [Visual Studio Code](https://code.visualstudio.com/) - both stable and Insiders channel
  - [Visual Studio Codium](https://vscodium.com/)
  - [Sublime Text](https://www.sublimetext.com/)
@@ -219,6 +261,7 @@ These editors are currently supported:
  - [JetBrains PhpStorm](https://www.jetbrains.com/phpstorm/)
  - [JetBrains PyCharm](https://www.jetbrains.com/pycharm/)
  - [JetBrains RubyMine](https://www.jetbrains.com/rubymine/)
+ - [JetBrains CLion](https://www.jetbrains.com/clion/)
  - [RStudio](https://rstudio.com/)
  - [TextMate](https://macromates.com)
  - [Brackets](http://brackets.io/)
@@ -233,8 +276,16 @@ These editors are currently supported:
  - [JetBrains GoLand](https://www.jetbrains.com/go/)
  - [Android Studio](https://developer.android.com/studio)
  - [JetBrains Rider](https://www.jetbrains.com/rider/)
+ - [JetBrains RustRover](https://www.jetbrains.com/rust/)
  - [Nova](https://nova.app/)
  - [Aptana Studio](http://www.aptana.com/)
+ - [Emacs](https://www.gnu.org/software/emacs/)
+ - [Lite XL](https://lite-xl.com/)
+ - [JetBrains Fleet](https://www.jetbrains.com/fleet/)
+ - [JetBrains DataSpell](https://www.jetbrains.com/dataspell/)
+ - [Pulsar](https://pulsar-edit.dev/)
+ - [Cursor](https://www.cursor.com/)
+ - [Zed](https://zed.dev/)
 
 These are defined in a list at the top of the file:
 
@@ -267,7 +318,7 @@ The `CFBundleIdentifier` value in the plist is what applications use to
 uniquely identify themselves, for example `com.github.GitHubClient` is the
 identifier for GitHub Desktop.
 
-To find the bundle identifier for an application, using `PhpStorm` as an example, 
+To find the bundle identifier for an application, using `PhpStorm` as an example,
 run `defaults read /Applications/PhpStorm.app/Contents/Info CFBundleIdentifier`.
 
 With this bundle identifier, GitHub Desktop can obtain the install location of
@@ -301,6 +352,28 @@ These editors are currently supported:
  - [Sublime Text](https://www.sublimetext.com/)
  - [Typora](https://typora.io/)
  - [SlickEdit](https://www.slickedit.com)
+ - [Neovim](https://neovim.io/)
+ - [Neovide](https://github.com/neovide/neovide)
+ - [Notepadqq](https://github.com/notepadqq/notepadqq)
+ - [Mousepad](https://github.com/codebrainz/mousepad)
+ - [GNOME Builder](https://apps.gnome.org/Builder/)
+ - [Code](https://github.com/elementary/code)
+ - [Lite XL](https://lite-xl.com/)
+ - [Kate](https://kate-editor.org/)
+ - [JetBrains PHPStorm](https://www.jetbrains.com/phpstorm/)
+ - [JetBrains PyCharm](https://www.jetbrains.com/pycharm/)
+ - [JetBrains WebStorm](https://www.jetbrains.com/webstorm/)
+ - [JetBrains CLion](https://www.jetbrains.com/clion/)
+ - [JetBrains RubyMine](https://www.jetbrains.com/ruby/)
+ - [JetBrains RustRover](https://www.jetbrains.com/rust/)
+ - [JetBrains Rider](https://www.jetbrains.com/rider/)
+ - [IntelliJ Idea](https://www.jetbrains.com/idea/)
+ - [JetBrains Goland](https://www.jetbrains.com/go/)
+ - [Android Studio](https://developer.android.com/studio)
+ - [Emacs](https://www.gnu.org/software/emacs/)
+ - [Pulsar](https://pulsar-edit.dev/)
+ - [Pluma](https://github.com/mate-desktop/pluma)
+ - [Zed](https://zed.dev/)
 
 These are defined in a list at the top of the file:
 
@@ -329,6 +402,6 @@ editor might be found.
 ```ts
 {
   name: 'Visual Studio Code',
-  paths: ['/usr/bin/code'],
+  paths: ['/usr/share/code/bin/code', '/snap/bin/code', '/usr/bin/code'],
 },
 ```
diff --git a/docs/technical/packaging.md b/docs/technical/packaging.md
index d2cd6ce7776..17a0599890c 100644
--- a/docs/technical/packaging.md
+++ b/docs/technical/packaging.md
@@ -107,16 +107,8 @@ Other things to note about the Windows packaging process:
 
 ### Linux
 
-Desktop uses `electron-builder` to generate these three packages:
-
- - `.deb` package for Debian-based distributions
- - `.rpm` package for RPM-based various distributions
- - `.AppImage` package for various distributions (no elevated permissions
-   required)
- - `.snap` package for various distributions
-
-The `script/electron-builder-linux.yml` configuration file contains the details
-applied to each package (if applicable).
+Refer to the [`shiftkey/desktop`](https://github.com/shiftkey/desktop) fork
+for packaging details about Linux.
 
 ## `script/publish.ts`
 
diff --git a/docs/technical/placeholders.md b/docs/technical/placeholders.md
index 2488269da2b..8cecb5f8f67 100644
--- a/docs/technical/placeholders.md
+++ b/docs/technical/placeholders.md
@@ -46,7 +46,6 @@ function getReplacements() {
     __RELEASE_CHANNEL__: s(channel),
     __UPDATES_URL__: s(distInfo.getUpdatesURL()),
     __SHA__: s(gitInfo.getSHA()),
-    __CLI_COMMANDS__: s(getCLICommands()),
     'process.platform': s(process.platform),
     'process.env.NODE_ENV': s(process.env.NODE_ENV || 'development'),
     'process.env.TEST_ENV': s(process.env.TEST_ENV),
diff --git a/docs/technical/shell-integration.md b/docs/technical/shell-integration.md
index 89143d358fe..3045d02e66e 100644
--- a/docs/technical/shell-integration.md
+++ b/docs/technical/shell-integration.md
@@ -45,7 +45,7 @@ export enum Shell {
   GitBash = 'Git Bash',
   Cygwin = 'Cygwin',
   WSL = 'WSL',
-  WindowTerminal = 'Windows Terminal',
+  WindowsTerminal = 'Windows Terminal',
   Alacritty = 'Alacritty',
 }
 ```
@@ -149,6 +149,7 @@ These shells are currently supported:
  - [PowerShell Core](https://github.com/powershell/powershell/)
  - [Kitty](https://sw.kovidgoyal.net/kitty/)
  - [Alacritty](https://github.com/alacritty/alacritty)
+ - [Tabby](https://tabby.sh/)
  - [WezTerm](https://github.com/wez/wezterm)
 
 These are defined in an enum at the top of the file:
@@ -171,13 +172,13 @@ use Hyper as a reference to explain the rest of the process.
 
 ### Step 1: Find the shell application
 
-The `getBundleID()` function is used to map a shell enum to it's bundle ID
-that is defined in it's manifest. You should add a new entry here for your
-shell.
+The `getBundleIDs()` function is used to map a shell enum to the possible bundle IDs
+that are defined in its manifest. You should add a new entry here for your
+shell. An array is returned to handle the case where a shell updates its bundle ID.
 
 ```ts
 case Shell.Hyper:
-  return 'co.zeit.hyper'
+  return ['co.zeit.hyper']
 ```
 
 After that, follow the existing patterns in `getAvailableShells()` and add a
@@ -185,44 +186,33 @@ new entry to lookup the install path for your shell.
 
 ```ts
 export async function getAvailableShells(): Promise<
-  ReadonlyArray<IFoundShell<Shell>>
+  ReadonlyArray<FoundShell<Shell>>
 > {
   const [
-    terminalPath,
-    hyperPath,
-    iTermPath,
-    powerShellCorePath,
-    kittyPath,
+    terminalInfo,
+    hyperInfo,
+    iTermInfo,
+    powerShellCoreInfo,
+    kittyInfo,
   ] = await Promise.all([
-    getShellPath(Shell.Terminal),
-    getShellPath(Shell.Hyper),
-    getShellPath(Shell.iTerm2),
-    getShellPath(Shell.PowerShellCore),
-    getShellPath(Shell.Kitty),
+    getShellInfo(Shell.Terminal),
+    getShellInfo(Shell.Hyper),
+    getShellInfo(Shell.iTerm2),
+    getShellInfo(Shell.PowerShellCore),
+    getShellInfo(Shell.Kitty),
   ])
 
   // other code
 
-  if (hyperPath) {
-    shells.push({ shell: Shell.Hyper, path: hyperPath })
+  if (hyperInfo) {
+    shells.push({ shell: Shell.Hyper, ...hyperInfo })
   }
 
   // other code
 }
 ```
 
-### Step 2: Parse the shell
-
-The `parse()` function is used to parse shell names. You should add a new entry here for your
-shell.
-
-```ts
-if (label === Shell.Hyper) {
-  return Shell.Hyper
-}
-```
-
-### Step 3: Launch the shell
+### Step 2: Launch the shell
 
 The launch step will use the `open` command in macOS to launch a given bundle
 at the path requested by the user. You may not need to make changes here,
@@ -230,12 +220,10 @@ unless your shell behaviour differs significantly from this.
 
 ```ts
 export function launch(
-  foundShell: IFoundShell<Shell>,
+  foundShell: FoundShell<Shell>,
   path: string
 ): ChildProcess {
-  const bundleID = getBundleID(foundShell.shell)
-  const commandArgs = ['-b', bundleID, path]
-  return spawn('open', commandArgs)
+  return spawn('open', ['-b', foundShell.bundleID, path])
 }
 ```
 
@@ -289,7 +277,7 @@ new entry to lookup the install path for your shell.
 
 ```ts
 export async function getAvailableShells(): Promise<
-  ReadonlyArray<IFoundShell<Shell>>
+  ReadonlyArray<FoundShell<Shell>>
 > {
   const [
     gnomeTerminalPath,
@@ -327,7 +315,7 @@ the correct arguments are passed to the command line interface:
 
 ```ts
 export function launch(
-  foundShell: IFoundShell<Shell>,
+  foundShell: FoundShell<Shell>,
   path: string
 ): ChildProcess {
   const shell = foundShell.shell
diff --git a/docs/technical/syntax-highlighting.md b/docs/technical/syntax-highlighting.md
index 42e35fc13a8..0a0b619704d 100644
--- a/docs/technical/syntax-highlighting.md
+++ b/docs/technical/syntax-highlighting.md
@@ -8,7 +8,7 @@ We introduced syntax highlighted diffs in [#3101](https://github.com/desktop/des
 
 We currently support syntax highlighting for the following languages and file types.
 
-JavaScript, JSON, TypeScript, Coffeescript, HTML, Asp, JavaServer Pages, CSS, SCSS, LESS, VUE, Markdown, Yaml, XML, Diff, Objective-C, Scala, C#, Java, C, C++, Kotlin, Ocaml, F#, Swift, sh/bash, SQL, CYPHER, Go, Perl, PHP, Python, Ruby, Clojure, Rust, Elixir, Haxe, R, PowerShell, Visual Basic, Fortran, Lua, Crystal, Julia, sTex, SPARQL, Stylus, Soy, Smalltalk, Slim, HAML, Sieve, Scheme, ReStructuredText, RPM, Q, Puppet, Pug, Protobuf, Properties, Apache Pig, ASCII Armor (PGP), Oz, Pascal, Toml, Dart and Docker.
+JavaScript, JSON, TypeScript, Coffeescript, HTML, Asp, JavaServer Pages, CSS, SCSS, LESS, VUE, Markdown, Yaml, XML, Diff, Objective-C, Scala, C#, Java, C, C++, Kotlin, Ocaml, F#, Swift, sh/bash, SQL, CYPHER, Go, Perl, PHP, Python, Ruby, Clojure, Rust, Elixir, Haxe, R, PowerShell, Visual Basic, Fortran, Lua, Luau, Crystal, Julia, sTex, SPARQL, Stylus, Soy, Smalltalk, Slim, HAML, Sieve, Scheme, ReStructuredText, RPM, Q, Puppet, Pug, Protobuf, Properties, Apache Pig, ASCII Armor (PGP), Oz, Pascal, Toml, Dart, CMake, Zig and Docker.
 
 This list was never meant to be exhaustive, we expect to add more languages going forward but this seemed like a good first step.
 
diff --git a/package.json b/package.json
index 00e9788cc25..d59d46799e7 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   },
   "description": "GitHub Desktop build dependencies",
   "scripts": {
-    "cli": "ts-node --require ./app/test/globals.ts --require ./app/src/cli/dev-commands-global.ts app/src/cli/main.ts",
+    "cli": "ts-node app/src/cli/main.ts",
     "check:eslint": "tsc -P eslint-rules/",
     "test:eslint": "jest eslint-rules/tests/*.test.js",
     "test:unit": "cross-env ELECTRON_RUN_AS_NODE=1 NODE_OPTIONS='--max_old_space_size=4096' ./node_modules/.bin/electron ./node_modules/jest/bin/jest --detectOpenHandles --silent --testLocationInResults --config ./app/jest.unit.config.js",
@@ -25,17 +25,19 @@
     "compile:script": "tsc -P script/tsconfig.json",
     "lint": "yarn prettier && yarn lint:src",
     "lint:fix": "yarn prettier --write && yarn lint:src:fix",
+    "markdownlint": "markdownlint **/*.{md,mdx} --config .markdownlint.js --rules node_modules/@github/markdownlint-github --ignore node_modules --ignore gemoji",
     "prettier": "prettier --check \"./**/*.{ts,tsx,js,json,jsx,scss,html,yaml,yml}\"",
     "lint:src": "yarn eslint-check && yarn eslint",
     "lint:src:fix": "yarn eslint --fix",
     "eslint": "eslint --cache --rulesdir ./eslint-rules \"./eslint-rules/**/*.js\" \"./script/**/*.ts{,x}\" \"./app/{src,typings,test}/**/*.{j,t}s{,x}\" \"./changelog.json\"",
     "eslint-check": "eslint --print-config .eslintrc.* | eslint-config-prettier-check",
-    "publish": "ts-node -P script/tsconfig.json script/publish.ts",
+    "validate-electron-version": "ts-node -P script/tsconfig.json script/validate-electron-version.ts",
     "clean-slate": "rimraf out node_modules app/node_modules && yarn",
     "rebuild-hard:dev": "yarn clean-slate && yarn build:dev",
     "rebuild-hard:prod": "yarn clean-slate && yarn build:prod",
     "draft-release": "ts-node -P script/tsconfig.json script/draft-release/index.ts",
     "draft-release:format": "prettier --check --write changelog.json app/package.json && yarn validate-changelog",
+    "draft-release:pr": "ts-node -P script/tsconfig.json script/draft-release/draft-pull-request.ts",
     "validate-changelog": "ts-node -P script/tsconfig.json script/validate-changelog.ts"
   },
   "author": {
@@ -49,68 +51,61 @@
     "yarn": ">= 1.9"
   },
   "dependencies": {
-    "@primer/octicons": "^10.0.0",
-    "@types/lodash": "^4.14.178",
-    "@types/marked": "^4.0.1",
-    "@types/plist": "^3.0.2",
-    "@types/react-color": "^3.0.4",
-    "@typescript-eslint/eslint-plugin": "^5.10.2",
-    "@typescript-eslint/experimental-utils": "^5.10.2",
-    "@typescript-eslint/parser": "^5.10.2",
-    "@typescript-eslint/typescript-estree": "^5.10.2",
+    "@azure/storage-blob": "^12.25.0",
+    "@babel/core": "^7.25.2",
+    "@babel/plugin-transform-modules-commonjs": "^7.24.8",
+    "@primer/octicons": "^19.0.0",
+    "@typescript-eslint/eslint-plugin": "^6.13.2",
+    "@typescript-eslint/experimental-utils": "^5.62.0",
+    "@typescript-eslint/parser": "^6.13.2",
+    "@typescript-eslint/typescript-estree": "^6.13.2",
     "airbnb-browser-shims": "^3.0.0",
-    "ajv": "^6.12.3",
-    "awesome-node-loader": "^1.1.0",
-    "azure-storage": "^2.10.4",
-    "chalk": "^2.2.0",
-    "cross-env": "^5.0.5",
-    "css-loader": "^6.7.1",
-    "eslint": "^7.3.1",
+    "awesome-node-loader": "^1.1.1",
+    "chalk": "^5.3.0",
+    "cross-env": "^7.0.3",
+    "css-loader": "^7.1.2",
+    "eslint": "^8.55.0",
     "eslint-config-prettier": "^6.11.0",
-    "eslint-plugin-jsdoc": "^37.7.0",
+    "eslint-plugin-jsdoc": "^43.0.1",
     "eslint-plugin-json": "^2.1.1",
     "eslint-plugin-prettier": "^3.1.4",
-    "eslint-plugin-react": "7.26.1",
-    "express": "^4.15.0",
-    "fake-indexeddb": "^2.0.4",
-    "file-loader": "^6.2.0",
+    "eslint-plugin-react": "^7.33.2",
+    "fake-indexeddb": "^5.0.1",
     "front-matter": "^2.3.0",
     "fs-extra": "^9.0.1",
     "glob": "^7.1.2",
-    "html-webpack-plugin": "^5.5.0",
-    "jest": "^26.6.3",
-    "jest-diff": "^25.0.0",
-    "jest-extended": "^0.11.2",
-    "jest-localstorage-mock": "^2.3.0",
-    "jszip": "^3.7.1",
+    "html-webpack-plugin": "^5.6.0",
+    "jest": "^29.7.0",
+    "jest-diff": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
+    "jest-extended": "^4.0.2",
     "klaw-sync": "^3.0.0",
     "legal-eagle": "0.16.0",
-    "mini-css-extract-plugin": "^2.5.3",
-    "parallel-webpack": "^2.3.0",
+    "mini-css-extract-plugin": "^2.9.1",
+    "parallel-webpack": "^2.6.0",
+    "parse-dds": "^1.2.1",
     "prettier": "^2.6.0",
-    "request": "^2.72.0",
-    "rimraf": "^2.5.2",
+    "rimraf": "^6.0.1",
     "sass": "^1.27.0",
-    "sass-loader": "^10.0.3",
-    "semver": "^5.5.0",
-    "split2": "^3.2.2",
+    "sass-loader": "^16.0.0",
+    "semver": "^7.6.3",
     "style-loader": "^3.3.1",
     "to-camel-case": "^1.0.0",
-    "ts-jest": "^26.4.4",
+    "ts-jest": "^29.1.1",
     "ts-loader": "^9",
     "ts-node": "^7.0.0",
-    "typescript": "^4.6.4",
-    "webpack": "^5.68.0",
+    "typescript": "^5.6.3",
+    "webpack": "^5.94.0",
     "webpack-bundle-analyzer": "^4.5.0",
-    "webpack-dev-middleware": "^5.3.1",
+    "webpack-dev-middleware": "^5.3.4",
     "webpack-hot-middleware": "^2.25.1",
-    "webpack-merge": "^5.8.0",
-    "xml2js": "^0.4.16"
+    "webpack-merge": "^6.0.1"
   },
   "devDependencies": {
+    "@github/markdownlint-github": "^0.1.0",
     "@types/byline": "^4.2.31",
     "@types/classnames": "^2.2.2",
-    "@types/codemirror": "5.60.4",
+    "@types/codemirror": "^5.60.15",
     "@types/deep-equal": "^1.0.1",
     "@types/dompurify": "^2.3.1",
     "@types/electron-winstaller": "^4.0.0",
@@ -121,12 +116,17 @@
     "@types/fs-extra": "^7.0.0",
     "@types/fuzzaldrin-plus": "^0.0.1",
     "@types/glob": "^5.0.35",
-    "@types/jest": "^23.3.1",
+    "@types/jest": "^29.5.10",
     "@types/klaw-sync": "^6.0.0",
     "@types/legal-eagle": "^0.15.0",
+    "@types/lodash": "^4.14.178",
+    "@types/marked": "^4.0.1",
     "@types/memoize-one": "^3.1.1",
+    "@types/minimist": "^1.2.5",
     "@types/mri": "^1.1.0",
-    "@types/node": "16.11.11",
+    "@types/node": "22.7.4",
+    "@types/parse-dds": "^1.0.3",
+    "@types/plist": "^3.0.2",
     "@types/prettier": "^2.0.1",
     "@types/react": "^16.8.7",
     "@types/react-css-transition-replace": "^2.1.3",
@@ -136,8 +136,9 @@
     "@types/request": "^2.0.9",
     "@types/reserved-words": "^0.1.0",
     "@types/semver": "^5.5.0",
+    "@types/setimmediate": "^1.0.4",
     "@types/source-map-support": "^0.5.2",
-    "@types/split2": "^2.1.6",
+    "@types/split2": "^4.2.3",
     "@types/strip-ansi": "^3.0.0",
     "@types/temp": "^0.8.29",
     "@types/textarea-caret": "^3.0.0",
@@ -147,16 +148,15 @@
     "@types/untildify": "^3.0.0",
     "@types/username": "^3.0.0",
     "@types/uuid": "^3.4.0",
-    "@types/webpack": "^5.28.0",
-    "@types/webpack-bundle-analyzer": "^4.4.1",
-    "@types/webpack-hot-middleware": "^2.25.6",
-    "@types/webpack-merge": "^5.0.0",
-    "@types/xml2js": "^0.4.0",
-    "electron": "17.0.1",
-    "electron-builder": "^22.7.0",
-    "electron-packager": "^15.1.0",
+    "@types/webgl2": "^0.0.11",
+    "@types/webpack": "^5.28.5",
+    "@types/webpack-bundle-analyzer": "^4.7.0",
+    "@types/webpack-hot-middleware": "^2.25.9",
+    "electron": "32.1.2",
+    "electron-packager": "^17.1.1",
     "electron-winstaller": "^5.0.0",
-    "jest-esm-transformer": "^1.0.0",
+    "eslint-plugin-github": "^4.10.1",
+    "markdownlint-cli": "^0.32.2",
     "reserved-words": "^0.1.2",
     "tsconfig-paths": "^3.9.0"
   }
diff --git a/script/build-platforms.ts b/script/build-platforms.ts
index 447f87257dc..df3c824756a 100644
--- a/script/build-platforms.ts
+++ b/script/build-platforms.ts
@@ -1,27 +1,4 @@
 export function getSha() {
-  if (isCircleCI() && process.env.CIRCLE_SHA1 != null) {
-    return process.env.CIRCLE_SHA1
-  }
-
-  if (isAppveyor() && process.env.APPVEYOR_REPO_COMMIT != null) {
-    return process.env.APPVEYOR_REPO_COMMIT
-  }
-
-  if (isTravis() && process.env.TRAVIS_COMMIT != null) {
-    return process.env.TRAVIS_COMMIT
-  }
-
-  const branchCommitId = process.env.BUILD_SOURCEVERSION
-  // this check is for a CI build from a local branch
-  if (isAzurePipelines() && branchCommitId != null) {
-    return branchCommitId
-  }
-
-  const pullRequestCommitId = process.env.SYSTEM_PULLREQUEST_SOURCECOMMITID
-  if (isAzurePipelines() && pullRequestCommitId != null) {
-    return pullRequestCommitId
-  }
-
   const gitHubSha = process.env.GITHUB_SHA
   if (isGitHubActions() && gitHubSha !== undefined && gitHubSha.length > 0) {
     return gitHubSha
@@ -32,40 +9,6 @@ export function getSha() {
   )
 }
 
-export function isTravis() {
-  return process.platform === 'linux' && process.env.TRAVIS === 'true'
-}
-
-export function isCircleCI() {
-  return process.platform === 'darwin' && process.env.CIRCLECI === 'true'
-}
-
-export function isAppveyor() {
-  return process.platform === 'win32' && process.env.APPVEYOR === 'True'
-}
-
-export function isAzurePipelines() {
-  return (
-    process.env.SYSTEM_TEAMFOUNDATIONCOLLECTIONURI ===
-    'https://github.visualstudio.com/'
-  )
-}
-
 export function isGitHubActions() {
   return process.env.GITHUB_ACTIONS === 'true'
 }
-
-export function getReleaseBranchName(): string {
-  // GitHub Actions
-  if (process.env.GITHUB_REF !== undefined) {
-    return process.env.GITHUB_REF.replace(/^refs\/heads\//, '')
-  }
-
-  return (
-    process.env.CIRCLE_BRANCH || // macOS
-    process.env.APPVEYOR_REPO_BRANCH || // Windows
-    process.env.TRAVIS_BRANCH || // Travis CI
-    process.env.BUILD_SOURCEBRANCHNAME || // Azure Pipelines
-    ''
-  )
-}
diff --git a/script/build.ts b/script/build.ts
index 34ae530b780..07a769c63ad 100755
--- a/script/build.ts
+++ b/script/build.ts
@@ -4,12 +4,7 @@
 import * as path from 'path'
 import * as cp from 'child_process'
 import * as os from 'os'
-import packager, {
-  OfficialArch,
-  OsxNotarizeOptions,
-  OsxSignOptions,
-  Options,
-} from 'electron-packager'
+import packager, { OfficialArch, OsxNotarizeOptions } from 'electron-packager'
 import frontMatter from 'front-matter'
 import { externals } from '../app/webpack.common'
 
@@ -41,7 +36,7 @@ import {
   getIconFileName,
   getDistArchitecture,
 } from './dist-info'
-import { isCircleCI, isGitHubActions } from './build-platforms'
+import { isGitHubActions } from './build-platforms'
 
 import { updateLicenseDump } from './licenses/update-license-dump'
 import { verifyInjectedSassVariables } from './validate-sass/validate-all'
@@ -124,21 +119,6 @@ verifyInjectedSassVariables(outRoot)
     console.log(`Built to ${appPaths}`)
   })
 
-/**
- * The additional packager options not included in the existing typing.
- *
- * See https://github.com/desktop/desktop/issues/2429 for some history on this.
- */
-interface IPackageAdditionalOptions {
-  readonly protocols: ReadonlyArray<{
-    readonly name: string
-    readonly schemes: ReadonlyArray<string>
-  }>
-  readonly osxSign: OsxSignOptions & {
-    readonly hardenedRuntime?: boolean
-  }
-}
-
 function packageApp() {
   // not sure if this is needed anywhere, so I'm just going to inline it here
   // for now and see what the future brings...
@@ -166,14 +146,13 @@ function packageApp() {
   }
 
   // get notarization deets, unless we're not going to publish this
-  const notarizationCredentials = isPublishableBuild
-    ? getNotarizationCredentials()
-    : undefined
+  const osxNotarize = isPublishableBuild ? getNotarizationOptions() : undefined
+
   if (
     isPublishableBuild &&
-    (isCircleCI() || isGitHubActions()) &&
+    isGitHubActions() &&
     process.platform === 'darwin' &&
-    notarizationCredentials === undefined
+    osxNotarize === undefined
   ) {
     // we can't publish a mac build without these
     throw new Error(
@@ -181,7 +160,7 @@ function packageApp() {
     )
   }
 
-  const options: Options & IPackageAdditionalOptions = {
+  return packager({
     name: getExecutableName(),
     platform: toPackagePlatform(process.platform),
     arch: toPackageArch(process.env.TARGET_ARCH),
@@ -199,26 +178,26 @@ function packageApp() {
       new RegExp('/\\.git($|/)'),
       new RegExp('/node_modules/\\.bin($|/)'),
     ],
-    appCopyright: 'Copyright © 2017 GitHub, Inc.',
+    appCopyright: `Copyright © ${new Date().getFullYear()} GitHub, Inc.`,
 
     // macOS
     appBundleId: getBundleID(),
     appCategoryType: 'public.app-category.developer-tools',
     darwinDarkModeSupport: true,
     osxSign: {
-      hardenedRuntime: true,
-      entitlements: entitlementsPath,
-      'entitlements-inherit': entitlementsPath,
+      optionsForFile: (path: string) => ({
+        hardenedRuntime: true,
+        entitlements: entitlementsPath,
+      }),
       type: isPublishableBuild ? 'distribution' : 'development',
       // For development, we will use '-' as the identifier so that codesign
       // will sign the app to run locally. We need to disable 'identity-validation'
       // or otherwise it will replace '-' with one of the regular codesigning
       // identities in our system.
       identity: isDevelopmentBuild ? '-' : undefined,
-      'identity-validation': !isDevelopmentBuild,
-      'gatekeeper-assess': !isDevelopmentBuild,
+      identityValidation: !isDevelopmentBuild,
     },
-    osxNotarize: notarizationCredentials,
+    osxNotarize,
     protocols: [
       {
         name: getBundleID(),
@@ -241,9 +220,7 @@ function packageApp() {
       ProductName: getProductName(),
       InternalName: getProductName(),
     },
-  }
-
-  return packager(options)
+  })
 }
 
 function removeAndCopy(source: string, destination: string) {
@@ -256,6 +233,10 @@ function copyEmoji() {
   const emojiImagesDestination = path.join(outRoot, 'emoji')
   removeAndCopy(emojiImages, emojiImagesDestination)
 
+  // Remove unicode-based emoji images (use the unicode emojis instead)
+  const emojiImagesUnicode = path.join(emojiImagesDestination, 'unicode')
+  rmSync(emojiImagesUnicode, { recursive: true, force: true })
+
   const emojiJSON = path.join(projectRoot, 'gemoji', 'db', 'emoji.json')
   const emojiJSONDestination = path.join(outRoot, 'emoji.json')
   removeAndCopy(emojiJSON, emojiJSONDestination)
@@ -315,21 +296,22 @@ function copyDependencies() {
   console.log('  Installing dependencies via yarn…')
   cp.execSync('yarn install', { cwd: outRoot, env: process.env })
 
-  console.log('  Copying desktop-trampoline…')
+  console.log('  Copying desktop-askpass-trampoline…')
+  const trampolineSource = path.resolve(
+    projectRoot,
+    'app/node_modules/desktop-trampoline/build/Release'
+  )
   const desktopTrampolineDir = path.resolve(outRoot, 'desktop-trampoline')
-  const desktopTrampolineFile =
+  const desktopAskpassTrampolineFile =
     process.platform === 'win32'
-      ? 'desktop-trampoline.exe'
-      : 'desktop-trampoline'
+      ? 'desktop-askpass-trampoline.exe'
+      : 'desktop-askpass-trampoline'
+
   rmSync(desktopTrampolineDir, { recursive: true, force: true })
   mkdirSync(desktopTrampolineDir, { recursive: true })
   copySync(
-    path.resolve(
-      projectRoot,
-      'app/node_modules/desktop-trampoline/build/Release',
-      desktopTrampolineFile
-    ),
-    path.resolve(desktopTrampolineDir, desktopTrampolineFile)
+    path.resolve(trampolineSource, desktopAskpassTrampolineFile),
+    path.resolve(desktopTrampolineDir, desktopAskpassTrampolineFile)
   )
 
   // Dev builds for macOS require a SSH wrapper to use SSH_ASKPASS
@@ -352,33 +334,26 @@ function copyDependencies() {
   mkdirSync(gitDir, { recursive: true })
   copySync(path.resolve(projectRoot, 'app/node_modules/dugite/git'), gitDir)
 
-  if (process.platform === 'win32') {
-    console.log('  Cleaning unneeded Git components…')
-    const files = [
-      'Bitbucket.Authentication.dll',
-      'GitHub.Authentication.exe',
-      'Microsoft.Alm.Authentication.dll',
-      'Microsoft.Alm.Git.dll',
-      'Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll',
-      'Microsoft.IdentityModel.Clients.ActiveDirectory.dll',
-      'Microsoft.Vsts.Authentication.dll',
-      'git-askpass.exe',
-      'git-credential-manager.exe',
-      'WebView2Loader.dll',
-    ]
-
-    const mingwFolder = getDistArchitecture() === 'x64' ? 'mingw64' : 'mingw32'
-    const gitCoreDir = path.join(gitDir, mingwFolder, 'libexec', 'git-core')
-
-    for (const file of files) {
-      const filePath = path.join(gitCoreDir, file)
-      try {
-        unlinkSync(filePath)
-      } catch (err) {
-        // probably already cleaned up
-      }
-    }
-  }
+  console.log('  Copying desktop credential helper…')
+  const mingw = getDistArchitecture() === 'x64' ? 'mingw64' : 'mingw32'
+  const gitCoreDir =
+    process.platform === 'win32'
+      ? path.resolve(outRoot, 'git', mingw, 'libexec', 'git-core')
+      : path.resolve(outRoot, 'git', 'libexec', 'git-core')
+
+  const desktopCredentialHelperTrampolineFile =
+    process.platform === 'win32'
+      ? 'desktop-credential-helper-trampoline.exe'
+      : 'desktop-credential-helper-trampoline'
+
+  const desktopCredentialHelperFile = `git-credential-desktop${
+    process.platform === 'win32' ? '.exe' : ''
+  }`
+
+  copySync(
+    path.resolve(trampolineSource, desktopCredentialHelperTrampolineFile),
+    path.resolve(gitCoreDir, desktopCredentialHelperFile)
+  )
 
   if (process.platform === 'darwin') {
     console.log('  Copying app-path binary…')
@@ -448,14 +423,14 @@ ${licenseText}`
   rmSync(chooseALicense, { recursive: true, force: true })
 }
 
-function getNotarizationCredentials(): OsxNotarizeOptions | undefined {
-  const appleId = process.env.APPLE_ID
-  const appleIdPassword = process.env.APPLE_ID_PASSWORD
-  if (appleId === undefined || appleIdPassword === undefined) {
-    return undefined
-  }
-  return {
-    appleId,
-    appleIdPassword,
-  }
+function getNotarizationOptions(): OsxNotarizeOptions | undefined {
+  const {
+    APPLE_ID: appleId,
+    APPLE_ID_PASSWORD: appleIdPassword,
+    APPLE_TEAM_ID: teamId,
+  } = process.env
+
+  return appleId && appleIdPassword && teamId
+    ? { tool: 'notarytool', appleId, appleIdPassword, teamId }
+    : undefined
 }
diff --git a/script/changelog/api.ts b/script/changelog/api.ts
deleted file mode 100644
index f40f5e51f93..00000000000
--- a/script/changelog/api.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import * as HTTPS from 'https'
-
-export interface IAPIPR {
-  readonly title: string
-  readonly body: string
-  readonly headRefName: string
-}
-
-type GraphQLResponse = {
-  readonly data: {
-    readonly repository: {
-      readonly pullRequest: IAPIPR
-    }
-  }
-}
-
-export function fetchPR(id: number): Promise<IAPIPR | null> {
-  return new Promise((resolve, reject) => {
-    const options: HTTPS.RequestOptions = {
-      host: 'api.github.com',
-      protocol: 'https:',
-      path: '/graphql',
-      method: 'POST',
-      headers: {
-        Authorization: `bearer ${process.env.GITHUB_ACCESS_TOKEN}`,
-        'User-Agent': 'what-the-changelog',
-      },
-    }
-
-    const request = HTTPS.request(options, response => {
-      let received = ''
-      response.on('data', chunk => {
-        received += chunk
-      })
-
-      response.on('end', () => {
-        try {
-          const json: GraphQLResponse = JSON.parse(received)
-          const pr = json.data.repository.pullRequest
-          resolve(pr)
-        } catch (e) {
-          resolve(null)
-        }
-      })
-    })
-
-    const graphql = `
-{
-  repository(owner: "desktop", name: "desktop") {
-    pullRequest(number: ${id}) {
-      title
-      body
-      headRefName
-    }
-  }
-}
-`
-    request.write(JSON.stringify({ query: graphql }))
-
-    request.end()
-  })
-}
diff --git a/script/changelog/parser.ts b/script/changelog/parser.ts
index d7afb1f6486..b54b92b3140 100644
--- a/script/changelog/parser.ts
+++ b/script/changelog/parser.ts
@@ -2,7 +2,7 @@ import * as Path from 'path'
 import * as Fs from 'fs'
 import { gt as greaterThan } from 'semver'
 
-import { fetchPR, IAPIPR } from './api'
+import { fetchPR, IAPIPR } from '../pr-api'
 
 const PlaceholderChangeType = '???'
 const OfficialOwner = 'desktop'
@@ -48,12 +48,21 @@ function capitalized(str: string): string {
  */
 export function findReleaseNote(body: string): string | null | undefined {
   const re = /^Notes: (.+)$/gm
-  const matches = re.exec(body)
-  if (!matches || matches.length < 2) {
+  let lastMatches = null
+
+  // There might be multiple lines starting with "Notes: ", but we're only
+  // interested in the last one.
+  let matches = re.exec(body)
+  while (matches) {
+    lastMatches = matches
+    matches = re.exec(body)
+  }
+
+  if (!lastMatches || lastMatches.length < 2) {
     return undefined
   }
 
-  const note = matches[1].replace(/\.$/, '')
+  const note = lastMatches[1].replace(/\.$/, '')
   return note === 'no-notes' ? null : note
 }
 
@@ -110,7 +119,7 @@ export async function convertToChangelogFormat(
   for (const line of lines) {
     try {
       const commit = parseCommitTitle(line)
-      const pr = await fetchPR(commit.prID)
+      const pr = fetchPR(commit.prID)
       if (!pr) {
         throw new Error(`Unable to get PR from API: ${commit.prID}`)
       }
diff --git a/script/changelog/test/parser-test.ts b/script/changelog/test/parser-test.ts
index 4b771b0c8a4..04a26d0cd9b 100644
--- a/script/changelog/test/parser-test.ts
+++ b/script/changelog/test/parser-test.ts
@@ -84,6 +84,19 @@ Notes: [Fixed] Fix lorem impsum dolor sit amet.
       )
     })
 
+    it('looks for the last Notes entry if there are several', () => {
+      const body = `
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer sollicitudin turpis
+tempor euismod fermentum. Nullam hendrerit neque eget risus faucibus volutpat. Donec
+ultrices, orci quis auctor ultrices, nulla lacus gravida lectus, non rutrum dolor
+quam vel augue.
+Notes: ignore this notes
+
+Notes: These are valid notes
+`
+      expect(findReleaseNote(body)).toBe('These are valid notes')
+    })
+
     it('detected no release notes wanted for the PR', () => {
       const body = `
 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer sollicitudin turpis
diff --git a/script/cleanup-windows-certificate.ps1 b/script/cleanup-windows-certificate.ps1
deleted file mode 100644
index aaf7292e3e4..00000000000
--- a/script/cleanup-windows-certificate.ps1
+++ /dev/null
@@ -1,7 +0,0 @@
-$scriptPath = split-path -parent $MyInvocation.MyCommand.Definition
-
-$file = "$scriptPath\windows-certificate.pfx"
-
-if ((Test-Path $file)) {
-  Remove-Item $file
-}
diff --git a/script/dist-info.ts b/script/dist-info.ts
index ee9de2328c8..e2ae688d55d 100644
--- a/script/dist-info.ts
+++ b/script/dist-info.ts
@@ -2,15 +2,12 @@ import * as Path from 'path'
 import * as Fs from 'fs'
 
 import { getProductName, getVersion } from '../app/package-info'
-import { getReleaseBranchName } from './build-platforms'
 
 const productName = getProductName()
 const version = getVersion()
 
 const projectRoot = Path.join(__dirname, '..')
 
-const publishChannels = ['production', 'test', 'beta']
-
 export function getDistRoot() {
   return Path.join(projectRoot, 'dist')
 }
@@ -101,47 +98,19 @@ export function getWindowsIdentifierName() {
 }
 
 export function getBundleSizes() {
-  // eslint-disable-next-line no-sync
-  const rendererStats = Fs.statSync(
-    Path.join(projectRoot, 'out', 'renderer.js')
-  )
-  // eslint-disable-next-line no-sync
-  const mainStats = Fs.statSync(Path.join(projectRoot, 'out', 'main.js'))
-  return { rendererSize: rendererStats.size, mainSize: mainStats.size }
-}
-
-export function isPublishable(): boolean {
-  const channelFromBranch = getChannelFromBranch()
-  return channelFromBranch !== undefined
-    ? publishChannels.includes(channelFromBranch)
-    : false
-}
-
-export function getChannel() {
-  const channelFromBranch = getChannelFromBranch()
-  return channelFromBranch !== undefined
-    ? channelFromBranch
-    : process.env.NODE_ENV || 'development'
-}
-
-function getChannelFromBranch(): string | undefined {
-  // Branch name format: __release-CHANNEL-DEPLOY_ID
-  const pieces = getReleaseBranchName().split('-')
-  if (pieces.length < 3 || pieces[0] !== '__release') {
-    return
+  const outPath = Path.join(projectRoot, 'out')
+  return {
+    // eslint-disable-next-line no-sync
+    rendererBundleSize: Fs.statSync(Path.join(outPath, 'renderer.js')).size,
+    // eslint-disable-next-line no-sync
+    mainBundleSize: Fs.statSync(Path.join(outPath, 'main.js')).size,
   }
-  return pieces[1]
 }
+export const isPublishable = () =>
+  ['production', 'beta', 'test'].includes(getChannel())
 
-export function getReleaseSHA() {
-  // Branch name format: __release-CHANNEL-DEPLOY_ID
-  const pieces = getReleaseBranchName().split('-')
-  if (pieces.length < 3 || pieces[0] !== '__release') {
-    return null
-  }
-
-  return pieces[2]
-}
+export const getChannel = () =>
+  process.env.RELEASE_CHANNEL ?? process.env.NODE_ENV ?? 'development'
 
 export function getDistArchitecture(): 'arm64' | 'x64' {
   // If a specific npm_config_arch is set, we use that one instead of the OS arch (to support cross compilation)
@@ -177,11 +146,28 @@ export function getUpdatesURL() {
 export function shouldMakeDelta() {
   // Only production and beta channels include deltas. Test releases aren't
   // necessarily sequential so deltas wouldn't make sense.
-  const channelsWithDeltas = ['production', 'beta']
-  return channelsWithDeltas.indexOf(getChannel()) > -1
+  return ['production', 'beta'].includes(getChannel())
 }
 
 export function getIconFileName(): string {
   const baseName = 'icon-logo'
   return getChannel() === 'development' ? `${baseName}-yellow` : baseName
 }
+
+export function getChannelFromReleaseBranch(): string {
+  const branchName = process.env.GITHUB_HEAD_REF ?? ''
+
+  if (!branchName.includes('releases/')) {
+    return 'development'
+  }
+
+  if (getVersion().includes('test')) {
+    return 'test'
+  }
+
+  if (getVersion().includes('beta')) {
+    return 'beta'
+  }
+
+  return 'production'
+}
diff --git a/script/download-nodejs-win-arm64.ps1 b/script/download-nodejs-win-arm64.ps1
deleted file mode 100644
index 15201149d60..00000000000
--- a/script/download-nodejs-win-arm64.ps1
+++ /dev/null
@@ -1,22 +0,0 @@
-# This script can be removed as soon as official Windows arm64 builds are published:
-# https://github.com/nodejs/build/issues/2450#issuecomment-705853342
-
-$nodeVersion = $args[0]
-
-If ($null -eq $nodeVersion) {
-  Write-Error "No NodeJS version given as argument to this file. Run it like download-nodejs-win-arm64.ps1 12.10.1"
-  exit 1
-}
-
-$url = "https://unofficial-builds.nodejs.org/download/release/v$nodeVersion/win-arm64/node.lib"
-$cacheFolder = "$env:LOCALAPPDATA\node-gyp\Cache\$nodeVersion\arm64"
-
-If (!(Test-Path $cacheFolder)) {
-  New-Item -ItemType Directory -Force -Path $cacheFolder
-}
-
-$output = "$cacheFolder\node.lib"
-$start_time = Get-Date
-
-Invoke-WebRequest -Uri $url -OutFile $output
-Write-Output "Downloaded arm64 NodeJS lib $nodeVersion in $((Get-Date).Subtract($start_time).Seconds) second(s)"
diff --git a/script/draft-release/draft-pull-request.ts b/script/draft-release/draft-pull-request.ts
new file mode 100644
index 00000000000..74f4fbafde2
--- /dev/null
+++ b/script/draft-release/draft-pull-request.ts
@@ -0,0 +1,46 @@
+/// <reference path="../globals.d.ts" />
+
+import appPackage from '../../app/package.json'
+import { createPR } from '../pr-api'
+import { sh } from '../sh'
+
+async function getPullRequestContent(
+  contentType: 'title' | 'body',
+  fullVersion: string
+): Promise<string> {
+  const result = await sh(
+    './script/draft-release/release-pr-content.sh',
+    contentType,
+    fullVersion
+  )
+  return result.trim()
+}
+
+const getPullRequestBody = (fullVersion: string) =>
+  getPullRequestContent('body', fullVersion)
+const getPullRequestTitle = (fullVersion: string) =>
+  getPullRequestContent('title', fullVersion)
+
+process.on('unhandledRejection', error => {
+  console.error(error.message)
+})
+
+async function run() {
+  const version = appPackage.version
+  if (version.includes('test')) {
+    console.error('Cannot create a PR for a test version')
+    process.exit(1)
+  }
+
+  console.log(`Creating release Pull Request for ${version}...`)
+  const title = await getPullRequestTitle(version)
+  const body = await getPullRequestBody(version)
+  const response = createPR(title, body, `releases/${version}`)
+  if (response === null) {
+    console.error('Failed to create release Pull Request')
+    process.exit(1)
+  }
+  console.log(`Done: ${response.url}`)
+}
+
+run()
diff --git a/script/draft-release/index.ts b/script/draft-release/index.ts
index 6286a5223e9..ac9d0879e2a 100644
--- a/script/draft-release/index.ts
+++ b/script/draft-release/index.ts
@@ -1,9 +1,17 @@
 /// <reference path="../globals.d.ts" />
 
+import { execSync } from 'child_process'
 import { run } from './run'
 
-if (!process.env.GITHUB_ACCESS_TOKEN) {
-  console.log('You need to provide a GITHUB_ACCESS_TOKEN environment variable')
+try {
+  execSync('gh auth status -h github.com')
+} catch (e) {
+  console.error('You need to authenticate with GitHub CLI')
+  console.error(
+    'Make sure you have GitHub CLI installed (https://github.com/cli/cli?tab=readme-ov-file#installation) and run `gh auth login`'
+  )
+  console.error('Check https://cli.github.com/ for more info')
+
   process.exit(1)
 }
 
diff --git a/script/draft-release/release-pr-content.sh b/script/draft-release/release-pr-content.sh
new file mode 100755
index 00000000000..0d4aaf8c847
--- /dev/null
+++ b/script/draft-release/release-pr-content.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+if [ "$#" -ne 2 ]; then
+  echo "Usage: $0 <title|body> <branch-name>"
+  exit 1
+fi
+
+OUTPUT_TYPE=$1
+BRANCH_NAME=$2
+VERSION=$(echo ${BRANCH_NAME#releases/})
+
+# For title just echo "Release version"
+if [ "$OUTPUT_TYPE" = "title" ]; then
+  echo "Release ${VERSION}"
+  exit 0
+fi
+
+# If output type is not body, exit
+if [ "$OUTPUT_TYPE" != "body" ]; then
+  echo "Unknown output type: $OUTPUT_TYPE"
+  exit 1
+fi
+
+RELEASE_DESCRIPTION="v${VERSION} production release"
+if [[ "$VERSION" == *"-"* ]]; then
+  BUILD_TYPE_AND_NUMBER=$(echo ${VERSION##*-})
+  if [[ "$BUILD_TYPE_AND_NUMBER" != *"beta"* ]]; then
+    echo "Only beta and production builds have release PRs"
+  fi
+  BUILD_TYPE="beta"
+  BUILD_NUMBER=$(echo ${BUILD_TYPE_AND_NUMBER:4})
+  case $BUILD_NUMBER in
+    *1[0-9] | *[04-9]) BUILD_NUMBER_SUFFIX="th";;
+    *1) BUILD_NUMBER_SUFFIX="st";;
+    *2) BUILD_NUMBER_SUFFIX="nd";;
+    *3) BUILD_NUMBER_SUFFIX="rd";;
+  esac
+
+  RELEASE_DESCRIPTION="${BUILD_NUMBER}${BUILD_NUMBER_SUFFIX} beta of the v${VERSION} series"
+fi
+
+echo "## Description
+Looking for the PR for the upcoming ${RELEASE_DESCRIPTION}? Well, you've just found it, congratulations!
+
+## Release checklist
+
+- [ ] Check to see if there are any errors in Sentry that have only occurred since the last production release
+- [ ] Verify that all feature flags are flipped appropriately
+- [ ] If there are any new metrics, ensure that central and desktop.github.com have been updated"
diff --git a/script/draft-release/run.ts b/script/draft-release/run.ts
index fdbfc4b7066..f2b74691043 100644
--- a/script/draft-release/run.ts
+++ b/script/draft-release/run.ts
@@ -85,7 +85,7 @@ function printInstructions(nextVersion: string, entries: Array<string>) {
     'Revise the release notes according to https://github.com/desktop/desktop/blob/development/docs/process/writing-release-notes.md',
     'Lint them with: yarn draft-release:format',
     'Commit these changes (on a "release" branch) and push them to GitHub',
-    'Read this to perform the release: https://github.com/desktop/desktop/blob/development/docs/process/releasing-updates.md',
+    'See the deploy repo for details on performing the release: https://github.com/desktop/deploy',
   ]
   // if an empty list, we assume the new entries have already been
   // written to the changelog file
diff --git a/script/electron-builder-linux.yml b/script/electron-builder-linux.yml
deleted file mode 100644
index b096a6da00f..00000000000
--- a/script/electron-builder-linux.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-productName: 'GitHubDesktop'
-artifactName: '${productName}-${os}-${arch}-${version}.${ext}'
-linux:
-  category: 'GNOME;GTK;Development'
-  packageCategory: 'GNOME;GTK;Development'
-  icon: 'app/static/logos'
-  target:
-    - deb
-    - rpm
-    - snap
-    - AppImage
-  maintainer: 'GitHub, Inc <opensource+desktop@github.com>'
-deb:
-  afterInstall: './script/linux-after-install.sh'
-  afterRemove: './script/linux-after-remove.sh'
-  depends:
-    # default Electron dependencies
-    - gconf2
-    - gconf-service
-    - libnotify4
-    - libappindicator1
-    - libxtst6
-    - libnss3
-    # dugite-native dependencies
-    - libcurl3 | libcurl4
-    # keytar dependencies
-    - libsecret-1-0
-rpm:
-  depends:
-    # default Electron dependencies
-    - libXScrnSaver
-    - libappindicator
-    - libnotify
-    # dugite-native dependencies
-    - libcurl
-    # keytar dependencies
-    - libsecret
-snap:
-  confinement: 'classic'
-  stagePackages:
-    - default
-    - libcurl3
-    - libsecret-1-0
-    - openssh-client
-  plugs:
-    - password-manager-service
diff --git a/script/entitlements-dev.plist b/script/entitlements-dev.plist
index 374fef149dd..985c9eba954 100644
--- a/script/entitlements-dev.plist
+++ b/script/entitlements-dev.plist
@@ -8,5 +8,7 @@
     <true/>
     <key>com.apple.security.cs.disable-library-validation</key>
     <true/>
+    <key>com.apple.security.cs.allow-jit</key>
+    <true/>
   </dict>
 </plist>
diff --git a/script/entitlements.plist b/script/entitlements.plist
index 80e73892e6e..7d3263efd95 100644
--- a/script/entitlements.plist
+++ b/script/entitlements.plist
@@ -6,5 +6,7 @@
     <true/>
     <key>com.apple.security.automation.apple-events</key>
     <true/>
+    <key>com.apple.security.cs.allow-jit</key>
+    <true/>
   </dict>
 </plist>
diff --git a/script/generate-octicons.ts b/script/generate-octicons.ts
index 21f34fc29cc..e62659a1a7b 100644
--- a/script/generate-octicons.ts
+++ b/script/generate-octicons.ts
@@ -9,94 +9,79 @@ import * as fs from 'fs'
 import * as Path from 'path'
 import * as cp from 'child_process'
 import { check } from 'reserved-words'
-
-import xml2js from 'xml2js'
 import toCamelCase from 'to-camel-case'
 
-interface IXML2JSNode {
-  path: {
-    $: {
-      d: string
-      'fill-rule'?: string
-    }
+// Basic type for the @primer/octicons package.
+type OcticonsLib = Record<
+  string,
+  {
+    readonly symbol: string
+    readonly heights: Record<
+      string,
+      {
+        readonly ast: {
+          readonly children: ReadonlyArray<{
+            readonly attributes: {
+              readonly d: string
+            }
+          }>
+        }
+        readonly options: {
+          readonly height: string
+          readonly width: string
+        }
+      }
+    >
   }
-}
+>
 
-interface IOcticonData {
-  readonly jsFriendlyName: string
-  readonly pathData: string
-  readonly width: string
-  readonly height: string
-  readonly fillRule?: string
+interface IOcticonVariant {
+  p: string[]
+  h: number
+  w: number
 }
 
-const viewBoxRe = /0 0 (\d+) (\d+)/
+interface IOcticon {
+  /** JS friendly name of the icon. */
+  readonly name: string
 
-function readXml(xml: string): Promise<IXML2JSNode> {
-  return new Promise((resolve, reject) => {
-    xml2js.parseString(xml, function (err, result: IXML2JSNode) {
-      if (err) {
-        reject(err)
-      } else {
-        resolve(result)
-      }
-    })
-  })
+  /** Size variants of the icon. */
+  readonly variants: Record<PropertyKey, IOcticonVariant>
 }
 
 function getJsFriendlyName(name: string) {
   const sanitizedName = toCamelCase(name)
-
   return check(sanitizedName, 'es6', true) ? sanitizedName + '_' : sanitizedName
 }
 
-async function generateIconData(): Promise<ReadonlyArray<IOcticonData>> {
-  const octicons = require('@primer/octicons')
-
-  const results = new Array<IOcticonData>()
-
-  for (const name of Object.keys(octicons).sort()) {
-    const octicon = octicons[name]
-
-    if (octicon.heights.length === 0) {
-      throw new Error(`Unexpected empty sizes array for ${octicon.symbol}`)
-    }
-
-    // Try to get the 16px version of the SVG data if it exists,
-    // if it doesn't just fallback to the version that is defined.
-    const octiconData =
-      octicon.heights['16'] ?? octicon.heights[Object.keys(octicon.heights)[0]]
+async function generateIconData(): Promise<ReadonlyArray<IOcticon>> {
+  const octicons: OcticonsLib = require('@primer/octicons')
 
-    const viewBox = octiconData.options.viewBox
-    const viewBoxMatch = viewBoxRe.exec(viewBox)
+  return Object.keys(octicons)
+    .sort()
+    .map(name => {
+      const octicon = octicons[name]
 
-    if (!viewBoxMatch) {
-      throw new Error(
-        `Unexpected viewBox format for ${octicon.symbol} - '${viewBox}'`
-      )
-    }
+      if (Object.keys(octicon.heights).length === 0) {
+        throw new Error(`Unexpected empty sizes array for ${octicon.symbol}`)
+      }
 
-    const [, width, height] = viewBoxMatch
+      const variants: Record<PropertyKey, IOcticonVariant> = {}
 
-    const result = await readXml(octiconData.path)
-    const pathData = result.path.$.d
-    const jsFriendlyName = getJsFriendlyName(octicon.symbol)
-    const fillRule = result.path.$['fill-rule']
+      Object.entries(octicon.heights).forEach(([height, data]) => {
+        variants[height] = {
+          p: data.ast.children.map(c => c.attributes.d),
+          h: parseInt(data.options.height, 10),
+          w: parseInt(data.options.width, 10),
+        }
+      })
 
-    results.push({
-      jsFriendlyName,
-      width,
-      height,
-      pathData,
-      fillRule,
+      return { name: getJsFriendlyName(name), variants }
     })
-  }
-
-  return results
 }
 
-generateIconData().then(result => {
-  console.log(`Writing ${result.length} octicons...`)
+generateIconData().then(results => {
+  console.log(`Writing ${results.length} octicons...`)
 
   const out = fs.createWriteStream(
     Path.resolve(__dirname, '../app/src/ui/octicons/octicons.generated.ts'),
@@ -105,23 +90,31 @@ generateIconData().then(result => {
     }
   )
 
-  out.write('/*\n')
-  out.write(
-    ' * This file is automatically generated by the generate-octicons tool.\n'
-  )
-  out.write(' * Manually changing this file will only lead to sadness.\n')
-  out.write(' */\n\n')
+  out.write(`/*
+* This file is automatically generated by the generate-octicons tool.
+* Manually changing this file will only lead to sadness.
+*/
 
-  out.write(
-    "export type OcticonSymbolType = {readonly w: number, readonly h: number, readonly d: string, readonly fr?: React.SVGAttributes<SVGElement>['fillRule']}\n\n"
-  )
+export type OcticonSymbolVariant = {
+  /** SVG path element data */
+  readonly p: string[]
+
+  /** The width of the symbol */
+  readonly w: number
+
+  /** The height of the symbol */
+  readonly h: number
+}
+
+export type OcticonSymbolVariants = Record<PropertyKey, OcticonSymbolVariant>
+
+export type OcticonSymbol = OcticonSymbolVariant | OcticonSymbolVariants\n\n`)
 
-  result.forEach(function (symbol) {
-    const { jsFriendlyName, pathData, width, height, fillRule } = symbol
+  results.forEach(icon => {
     out.write(
-      `export const ${jsFriendlyName}: OcticonSymbolType = {w: ${width}, h: ${height}, d: '${pathData}', fr: ${
-        fillRule ? `'${fillRule}'` : 'undefined'
-      }}\n\n`
+      `export const ${icon.name}: OcticonSymbolVariants = ${JSON.stringify(
+        icon.variants
+      )}\n`
     )
   })
 
diff --git a/script/licenses/license-overrides.ts b/script/licenses/license-overrides.ts
index 7110cafefac..721787f9a65 100644
--- a/script/licenses/license-overrides.ts
+++ b/script/licenses/license-overrides.ts
@@ -38,32 +38,6 @@ export const licenseOverrides: LicenseLookup = {
       'Code is licensed under the AFL or BSD 3-Clause license as part of the Persevere project which is administered under the Dojo foundation, and all contributions require a Dojo CLA.',
   },
 
-  'wicg-focus-ring@1.0.1': {
-    repository: 'git+https://github.com/WICG/focus-ring',
-    license: 'MIT',
-    source:
-      'https://github.com/WICG/focus-ring/blob/4df78f379e4c7dbaa1a5e4ff25cf1b56700b24ee/LICENSE.md',
-    sourceText: `This work is being provided by the copyright holders under the following license.
-
-License
-
-By obtaining and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions.
-
-Permission to copy, modify, and distribute this work, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the work or portions thereof, including modifications:
-
-* The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.
-* Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, the W3C Software and Document Short Notice should be included.
-* Notice of any changes or modifications, through a copyright statement on the new code or document such as "This software or document includes material copied from or derived from [title and URI of the W3C document]. Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
-
-Disclaimers
-
-THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
-
-The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the work without specific, written prior permission. Title to copyright in this work will at all times remain with copyright holders.`,
-  },
-
   'tslib@2.0.0': tslibLicenseOverride,
   'tslib@2.3.1': tslibLicenseOverride,
 }
diff --git a/script/linux-after-install.sh b/script/linux-after-install.sh
deleted file mode 100644
index b6f0a7d1f0c..00000000000
--- a/script/linux-after-install.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-set -e
-
-PROFILE_D_FILE="/etc/profile.d/github-desktop.sh"
-INSTALL_DIR="/opt/${productFilename}"
-SCRIPT=$"#!/bin/sh
-export PATH=\"$INSTALL_DIR:\$PATH\""
-
-case "$1" in
-    configure)
-      echo "$SCRIPT" > "${PROFILE_D_FILE}";
-      . "${PROFILE_D_FILE}";
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-      echo "postinst called with unknown argument \`$1'" >&2
-      exit 1
-    ;;
-esac
-
-exit 0
diff --git a/script/linux-after-remove.sh b/script/linux-after-remove.sh
deleted file mode 100644
index 9a73886e2a5..00000000000
--- a/script/linux-after-remove.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-set -e
-
-PROFILE_D_FILE="/etc/profile.d/github-desktop.sh"
-
-case "$1" in
-    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-      echo "#!/bin/sh" > "${PROFILE_D_FILE}";
-      . "${PROFILE_D_FILE}";
-      rm "${PROFILE_D_FILE}";
-    ;;
-
-    *)
-      echo "postrm called with unknown argument \`$1'" >&2
-      exit 1
-    ;;
-esac
-
-exit 0
diff --git a/script/package.ts b/script/package.ts
index 7f8566adb23..1b1df20ac63 100644
--- a/script/package.ts
+++ b/script/package.ts
@@ -13,25 +13,43 @@ import {
   shouldMakeDelta,
   getUpdatesURL,
   getIconFileName,
+  isPublishable,
+  getBundleSizes,
+  getDistRoot,
+  getDistArchitecture,
 } from './dist-info'
-import { isAppveyor, isGitHubActions } from './build-platforms'
-import { existsSync, rmSync } from 'fs'
+import { isGitHubActions } from './build-platforms'
+import { existsSync, rmSync, writeFileSync } from 'fs'
+import { getVersion } from '../app/package-info'
+import { rename } from 'fs/promises'
+import { join } from 'path'
+import { assertNonNullable } from '../app/src/lib/fatal-error'
 
 const distPath = getDistPath()
 const productName = getProductName()
-const outputDir = path.join(distPath, '..', 'installer')
+const outputDir = getDistRoot()
+
+const assertExistsSync = (path: string) => {
+  if (!existsSync(path)) {
+    throw new Error(`Expected ${path} to exist`)
+  }
+}
 
 if (process.platform === 'darwin') {
   packageOSX()
 } else if (process.platform === 'win32') {
   packageWindows()
-} else if (process.platform === 'linux') {
-  packageLinux()
 } else {
-  console.error(`I dunno how to package for ${process.platform} :(`)
+  console.error(`I don't know how to package for ${process.platform} :(`)
   process.exit(1)
 }
 
+console.log('Writing bundle size info…')
+writeFileSync(
+  path.join(getDistRoot(), 'bundle-size.json'),
+  JSON.stringify(getBundleSizes())
+)
+
 function packageOSX() {
   const dest = getOSXZipPath()
   rmSync(dest, { recursive: true, force: true })
@@ -43,20 +61,6 @@ function packageOSX() {
 }
 
 function packageWindows() {
-  const setupCertificatePath = path.join(
-    __dirname,
-    'setup-windows-certificate.ps1'
-  )
-  const cleanupCertificatePath = path.join(
-    __dirname,
-    'cleanup-windows-certificate.ps1'
-  )
-
-  if (isAppveyor() || isGitHubActions()) {
-    console.log('Installing signing certificate…')
-    cp.execSync(`powershell ${setupCertificatePath}`, { stdio: 'inherit' })
-  }
-
   const iconSource = path.join(
     __dirname,
     '..',
@@ -83,8 +87,7 @@ function packageWindows() {
     process.exit(1)
   }
 
-  const iconUrl =
-    'https://desktop.githubusercontent.com/github-desktop/app-icon.ico'
+  const iconUrl = 'https://desktop.githubusercontent.com/app-icon.ico'
 
   const nugetPkgName = getWindowsIdentifierName()
   const options: electronInstaller.Options = {
@@ -102,48 +105,55 @@ function packageWindows() {
   }
 
   if (shouldMakeDelta()) {
-    options.remoteReleases = getUpdatesURL()
+    const url = new URL(getUpdatesURL())
+    // Make sure Squirrel.Windows isn't affected by partially or completely
+    // disabled releases.
+    url.searchParams.set('bypassStaggeredRelease', '1')
+    options.remoteReleases = url.toString()
   }
 
-  if (isAppveyor() || isGitHubActions()) {
-    const certificatePath = path.join(__dirname, 'windows-certificate.pfx')
-    options.signWithParams = `/f ${certificatePath} /p ${process.env.WINDOWS_CERT_PASSWORD} /tr http://timestamp.digicert.com /td sha256 /fd sha256`
+  if (isGitHubActions() && isPublishable()) {
+    assertNonNullable(process.env.RUNNER_TEMP, 'Missing RUNNER_TEMP env var')
+
+    const acsPath = join(process.env.RUNNER_TEMP, 'acs')
+    const dlibPath = join(acsPath, 'bin', 'x64', 'Azure.CodeSigning.Dlib.dll')
+
+    assertExistsSync(dlibPath)
+
+    const metadataPath = join(acsPath, 'metadata.json')
+    const acsMetadata = {
+      Endpoint: 'https://eus.codesigning.azure.net/',
+      CodeSigningAccountName: 'github-desktop',
+      CertificateProfileName: 'desktop',
+      CorrelationId: `${process.env.GITHUB_SERVER_URL}/${process.env.GITHUB_REPOSITORY}/actions/runs/${process.env.GITHUB_RUN_ID}`,
+    }
+    writeFileSync(metadataPath, JSON.stringify(acsMetadata))
+
+    options.signWithParams = `/v /fd SHA256 /tr "http://timestamp.acs.microsoft.com" /td SHA256 /dlib "${dlibPath}" /dmdf "${metadataPath}"`
   }
 
   console.log('Packaging for Windows…')
   electronInstaller
     .createWindowsInstaller(options)
-    .then(() => {
-      console.log(`Installers created in ${outputDir}`)
-      cp.execSync(`powershell ${cleanupCertificatePath}`)
+    .then(() => console.log(`Installers created in ${outputDir}`))
+    .then(async () => {
+      // electron-winstaller (more specifically Squirrel.Windows) doesn't let
+      // us control the name of the nuget packages but we want them to include
+      // the architecture similar to how the setup exe and msi do so we'll just
+      // have to rename them here after the fact.
+      const arch = getDistArchitecture()
+      const prefix = `${getWindowsIdentifierName()}-${getVersion()}`
+
+      for (const kind of shouldMakeDelta() ? ['full', 'delta'] : ['full']) {
+        const from = join(outputDir, `${prefix}-${kind}.nupkg`)
+        const to = join(outputDir, `${prefix}-${arch}-${kind}.nupkg`)
+
+        console.log(`Renaming ${from} to ${to}`)
+        await rename(from, to)
+      }
     })
     .catch(e => {
-      cp.execSync(`powershell ${cleanupCertificatePath}`)
       console.error(`Error packaging: ${e}`)
       process.exit(1)
     })
 }
-
-function packageLinux() {
-  const electronBuilder = path.resolve(
-    __dirname,
-    '..',
-    'node_modules',
-    '.bin',
-    'electron-builder'
-  )
-
-  const configPath = path.resolve(__dirname, 'electron-builder-linux.yml')
-
-  const args = [
-    'build',
-    '--prepackaged',
-    distPath,
-    '--x64',
-    '--config',
-    configPath,
-  ]
-
-  console.log('Packaging for Linux…')
-  cp.spawnSync(electronBuilder, args, { stdio: 'inherit' })
-}
diff --git a/script/pr-api.ts b/script/pr-api.ts
new file mode 100644
index 00000000000..f0b1869532f
--- /dev/null
+++ b/script/pr-api.ts
@@ -0,0 +1,50 @@
+import { execSync } from 'child_process'
+
+export interface IAPIPR {
+  readonly title: string
+  readonly body: string
+  readonly headRefName: string
+  readonly url: string
+}
+
+export function fetchPR(id: number): IAPIPR | null {
+  try {
+    const response = execSync(
+      `gh pr view ${id} --json title,body,headRefName,url`,
+      {
+        encoding: 'utf8',
+      }
+    )
+
+    return JSON.parse(response)
+  } catch (e) {
+    return null
+  }
+}
+
+export function createPR(
+  title: string,
+  body: string,
+  branch: string
+): IAPIPR | null {
+  try {
+    const response = execSync(
+      `gh pr new --repo desktop/desktop --title "${title}" --body "${body}" --head ${branch}`,
+      {
+        encoding: 'utf8',
+      }
+    )
+
+    // The PR url is the last line of the output
+    const url = response.split('\n').pop() ?? ''
+
+    return {
+      title,
+      body,
+      headRefName: branch,
+      url,
+    }
+  } catch (e) {
+    return null
+  }
+}
diff --git a/script/publish.ts b/script/publish.ts
deleted file mode 100644
index a822721c438..00000000000
--- a/script/publish.ts
+++ /dev/null
@@ -1,253 +0,0 @@
-/* eslint-disable no-sync */
-import * as distInfo from './dist-info'
-import * as gitInfo from '../app/git-info'
-import * as packageInfo from '../app/package-info'
-import * as platforms from './build-platforms'
-
-if (!distInfo.isPublishable()) {
-  console.log('Not a publishable build. Skipping publish.')
-  process.exit(0)
-}
-
-const releaseSHA = distInfo.getReleaseSHA()
-if (releaseSHA == null) {
-  console.log(`No release SHA found for build. Skipping publish.`)
-  process.exit(0)
-}
-
-const currentTipSHA = gitInfo.getSHA()
-if (!currentTipSHA.toUpperCase().startsWith(releaseSHA!.toUpperCase())) {
-  console.log(
-    `Current tip '${currentTipSHA}' does not match release SHA '${releaseSHA}'. Skipping publish.`
-  )
-  process.exit(0)
-}
-
-import * as Fs from 'fs'
-import { execSync } from 'child_process'
-import * as Azure from 'azure-storage'
-import * as Crypto from 'crypto'
-import request from 'request'
-
-console.log('Packaging…')
-execSync('yarn package', { stdio: 'inherit' })
-
-const sha = platforms.getSha().substring(0, 8)
-
-function getSecret() {
-  if (process.env.DEPLOYMENT_SECRET != null) {
-    return process.env.DEPLOYMENT_SECRET
-  }
-
-  throw new Error(
-    `Unable to get deployment secret environment variable. Deployment aborting...`
-  )
-}
-
-console.log('Uploading…')
-
-let uploadPromise = null
-if (process.platform === 'darwin') {
-  uploadPromise = uploadOSXAssets()
-} else if (process.platform === 'win32') {
-  uploadPromise = uploadWindowsAssets()
-} else {
-  console.error(`I dunno how to publish a release for ${process.platform} :(`)
-  process.exit(1)
-}
-
-uploadPromise!
-  .then(artifacts => {
-    const names = artifacts.map(function (item, index) {
-      return item.name
-    })
-    console.log(`Uploaded artifacts: ${names}`)
-    return updateDeploy(artifacts, getSecret())
-  })
-  .catch(e => {
-    console.error(`Publishing failed: ${e}`)
-    process.exit(1)
-  })
-
-function uploadOSXAssets() {
-  const uploads = [upload(distInfo.getOSXZipName(), distInfo.getOSXZipPath())]
-  return Promise.all(uploads)
-}
-
-function uploadWindowsAssets() {
-  // For the nuget packages, include the architecture infix in the asset name
-  // when they're uploaded.
-  const uploads = [
-    upload(
-      distInfo.getWindowsInstallerName(),
-      distInfo.getWindowsInstallerPath()
-    ),
-    upload(
-      distInfo.getWindowsStandaloneName(),
-      distInfo.getWindowsStandalonePath()
-    ),
-    upload(
-      distInfo.getWindowsFullNugetPackageName(true),
-      distInfo.getWindowsFullNugetPackagePath()
-    ),
-  ]
-
-  // Even if we should make a delta, it might not exist (if it's the first time
-  // we publish a nuget package of the app... for example, when we added support
-  // for ARM64).
-  if (
-    distInfo.shouldMakeDelta() &&
-    Fs.existsSync(distInfo.getWindowsDeltaNugetPackagePath())
-  ) {
-    uploads.push(
-      upload(
-        distInfo.getWindowsDeltaNugetPackageName(true),
-        distInfo.getWindowsDeltaNugetPackagePath()
-      )
-    )
-  }
-
-  return Promise.all(uploads)
-}
-
-interface IUploadResult {
-  name: string
-  url: string
-  size: number
-  sha: string
-}
-
-async function upload(assetName: string, assetPath: string) {
-  const azureBlobService = await getAzureBlobService()
-  const container = process.env.AZURE_BLOB_CONTAINER || ''
-  const cleanAssetName = assetName.replace(/ /g, '')
-  const blob = `releases/${packageInfo.getVersion()}-${sha}/${cleanAssetName}`
-  const url = `${process.env.AZURE_STORAGE_URL}/${container}/${blob}`
-
-  return new Promise<IUploadResult>((resolve, reject) => {
-    azureBlobService.createBlockBlobFromLocalFile(
-      container,
-      blob,
-      assetPath,
-      (error: any) => {
-        if (error != null) {
-          reject(error)
-        } else {
-          // eslint-disable-next-line no-sync
-          const stats = Fs.statSync(assetPath)
-          const hash = Crypto.createHash('sha1')
-          hash.setEncoding('hex')
-          const input = Fs.createReadStream(assetPath)
-
-          hash.on('finish', () => {
-            resolve({
-              name: assetName,
-              url,
-              size: stats['size'],
-              sha: hash.read() as string,
-            })
-          })
-
-          input.pipe(hash)
-        }
-      }
-    )
-  })
-}
-
-function getAzureBlobService(): Promise<Azure.BlobService> {
-  return new Promise<Azure.BlobService>((resolve, reject) => {
-    if (
-      process.env.AZURE_STORAGE_ACCOUNT === undefined ||
-      process.env.AZURE_STORAGE_ACCESS_KEY === undefined ||
-      process.env.AZURE_BLOB_CONTAINER === undefined
-    ) {
-      reject('Invalid azure storage credentials')
-      return
-    }
-
-    const blobService = Azure.createBlobService(
-      process.env.AZURE_STORAGE_ACCOUNT,
-      process.env.AZURE_STORAGE_ACCESS_KEY
-    )
-
-    blobService.createContainerIfNotExists(
-      process.env.AZURE_BLOB_CONTAINER,
-      {
-        publicAccessLevel: 'blob',
-      },
-      (error: any) => {
-        if (error !== null) {
-          console.log(error)
-          reject(
-            `Unable to ensure azure blob container - ${process.env.AZURE_BLOB_CONTAINER}. Deployment aborting...`
-          )
-        } else {
-          resolve(blobService)
-        }
-      }
-    )
-  })
-}
-
-function createSignature(body: any, secret: string) {
-  const hmac = Crypto.createHmac('sha1', secret)
-  hmac.update(JSON.stringify(body))
-  return `sha1=${hmac.digest('hex')}`
-}
-
-function getContext() {
-  return (
-    process.platform +
-    (distInfo.getDistArchitecture() === 'arm64' ? '-arm64' : '')
-  )
-}
-
-function updateDeploy(
-  artifacts: ReadonlyArray<IUploadResult>,
-  secret: string
-): Promise<void> {
-  const { rendererSize, mainSize } = distInfo.getBundleSizes()
-  const body = {
-    context: getContext(),
-    branch_name: platforms.getReleaseBranchName(),
-    artifacts,
-    stats: {
-      platform: process.platform,
-      rendererBundleSize: rendererSize,
-      mainBundleSize: mainSize,
-    },
-  }
-  const signature = createSignature(body, secret)
-  const options = {
-    method: 'POST',
-    url: 'https://central.github.com/api/deploy_built',
-    headers: {
-      'X-Hub-Signature': signature,
-    },
-    json: true,
-    body,
-  }
-
-  return new Promise((resolve, reject) => {
-    request(options, (error, response, body) => {
-      if (error) {
-        reject(error)
-        return
-      }
-
-      if (response.statusCode !== 200) {
-        reject(
-          new Error(
-            `Received a non-200 response (${
-              response.statusCode
-            }): ${JSON.stringify(body)}`
-          )
-        )
-        return
-      }
-
-      resolve()
-    })
-  })
-}
diff --git a/script/setup-macos-keychain b/script/setup-macos-keychain
index 311c54449ac..19f38dee45f 100755
--- a/script/setup-macos-keychain
+++ b/script/setup-macos-keychain
@@ -1,10 +1,11 @@
 #!/bin/sh
+set -e
 
-curl -H "Authorization: token ${DESKTOPBOT_TOKEN}" -H 'Accept: application/vnd.github.v3.raw' -O -L https://api.github.com/repos/desktop/desktop-secrets/contents/developer-id-cert.p12
+base64 -D <<<"$APPLE_APPLICATION_CERT" > "$RUNNER_TEMP/cert.p12"
 
 KEY_CHAIN=mac-build.keychain
 security create-keychain -p travis $KEY_CHAIN
-security import developer-id-cert.p12 -k $KEY_CHAIN -P $KEY_PASSWORD -T /usr/bin/codesign
+security import "$RUNNER_TEMP/cert.p12" -k $KEY_CHAIN -P $KEY_PASSWORD -T /usr/bin/codesign
 
 security list-keychain -s $KEY_CHAIN
 security unlock-keychain -p travis $KEY_CHAIN
@@ -15,3 +16,4 @@ security default-keychain -s $KEY_CHAIN
 # set key partition list to avoid UI permission popup that causes hanging at CI
 security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k travis $KEY_CHAIN
 
+rm "$RUNNER_TEMP/cert.p12"
diff --git a/script/setup-windows-certificate.ps1 b/script/setup-windows-certificate.ps1
deleted file mode 100644
index df3b5b2a75f..00000000000
--- a/script/setup-windows-certificate.ps1
+++ /dev/null
@@ -1,9 +0,0 @@
-$scriptPath = split-path -parent $MyInvocation.MyCommand.Definition
-
-$headers = New-Object "System.Collections.Generic.Dictionary[[String],[String]]"
-$headers.Add("Authorization", "token $env:DESKTOPBOT_TOKEN")
-$headers.Add("Accept", 'application/vnd.github.v3.raw')
-
-Invoke-WebRequest 'https://api.github.com/repos/desktop/desktop-secrets/contents/windows-certificate.pfx' `
-              -Headers $headers `
-              -OutFile "$scriptPath\windows-certificate.pfx"
diff --git a/script/start.ts b/script/start.ts
index ec065a9153c..73d57110d71 100644
--- a/script/start.ts
+++ b/script/start.ts
@@ -1,13 +1,13 @@
-import express from 'express'
 import webpack from 'webpack'
-import devMiddleware from 'webpack-dev-middleware'
-import hotMiddleware from 'webpack-hot-middleware'
+import DevMiddleware from 'webpack-dev-middleware'
+import HotMiddleware from 'webpack-hot-middleware'
 
 import { forceUnwrap as u } from '../app/src/lib/fatal-error'
 
 import configs from '../app/webpack.development'
 
 import { run } from './run'
+import { createServer } from 'http'
 
 function getPortOrDefault() {
   const port = process.env.PORT
@@ -40,30 +40,35 @@ if (process.env.NODE_ENV === 'production') {
   startApp()
 } else {
   const rendererConfig = configs[1]
-
-  const server = express()
   const compiler = webpack(rendererConfig)
   const port = getPortOrDefault()
-
   const message = 'Could not find public path from configuration'
-  server.use(
-    devMiddleware(compiler, {
-      publicPath: u(
-        message,
-        u(message, u(message, rendererConfig).output).publicPath
-      ),
-    })
-  )
 
-  server.use(hotMiddleware(compiler))
+  const devMiddleware = DevMiddleware(compiler, {
+    publicPath: u(
+      message,
+      u(message, u(message, rendererConfig).output).publicPath
+    ),
+  })
 
-  server.listen(port, 'localhost', (err: Error | null) => {
-    if (err) {
-      console.log(err)
-      process.exit(1)
-    }
+  const hotMiddleware = HotMiddleware(compiler)
 
+  const server = createServer((req, res) => {
+    devMiddleware(req, res, () => {
+      hotMiddleware(req, res, () => {
+        res.writeHead(404, { 'Content-Type': 'text/plain' })
+        res.end('Not found')
+      })
+    })
+  })
+
+  server.listen(port, 'localhost')
+  server.on('listening', () => {
     console.log(`Server running at http://localhost:${port}`)
     startApp()
   })
+  server.on('error', (err: Error) => {
+    console.error(err)
+    process.exit(1)
+  })
 }
diff --git a/script/validate-changelog.ts b/script/validate-changelog.ts
index ac415d832db..7bee9d6f657 100644
--- a/script/validate-changelog.ts
+++ b/script/validate-changelog.ts
@@ -3,34 +3,7 @@
 import * as Path from 'path'
 import * as Fs from 'fs'
 
-import Ajv, { ErrorObject } from 'ajv'
-
-function handleError(error: string) {
-  console.error(error)
-  process.exit(-1)
-}
-
-function formatErrors(errors: ErrorObject[]): string {
-  return errors
-    .map(error => {
-      const { dataPath, message } = error
-      const additionalProperties = error.params as any
-      const additionalProperty =
-        additionalProperties.additionalProperty as string
-
-      let additionalPropertyText = ''
-
-      if (additionalProperty != null) {
-        additionalPropertyText = `, found: '${additionalProperties.additionalProperty}'`
-      }
-
-      // dataPath starts with a leading "."," which is a bit confusing
-      const element = dataPath.substring(1)
-
-      return ` - ${element} - ${message}${additionalPropertyText}`
-    })
-    .join('\n')
-}
+import assert from 'assert'
 
 const repositoryRoot = Path.dirname(__dirname)
 const changelogPath = Path.join(repositoryRoot, 'changelog.json')
@@ -43,38 +16,41 @@ let changelogObj = null
 try {
   changelogObj = JSON.parse(changelog)
 } catch {
-  handleError(
+  console.error(
     'Unable to parse the contents of changelog.json into a JSON object. Please review the file contents.'
   )
+  process.exit(-1)
 }
 
-const schema = {
-  $schema: 'http://json-schema.org/draft-07/schema#',
-  type: 'object',
-  properties: {
-    releases: {
-      type: 'object',
-      patternProperties: {
-        '^([0-9]+.[0-9]+.[0-9]+)(-beta[0-9]+|-test[0-9]+)?$': {
-          type: 'array',
-          items: {
-            type: 'string',
-          },
-          uniqueItems: true,
-        },
-      },
-      additionalProperties: false,
-    },
-  },
-}
-
-const ajv = new Ajv({ allErrors: true, uniqueItems: true })
-const validate = ajv.compile(schema)
-
-const valid = validate(changelogObj)
+assert(typeof changelogObj === 'object', 'Expected changelog to be an object')
+assert(
+  Object.keys(changelogObj).length === 1,
+  'Expected changelog to have exactly one key'
+)
+assert(
+  typeof changelogObj['releases'] === 'object',
+  'Expected releases property to be an object'
+)
+const releases = Object.keys(changelogObj['releases'])
+assert(releases.length > 0, 'Expected at least one release')
+
+for (const release of releases) {
+  assert(
+    /^([0-9]+.[0-9]+.[0-9]+)(-beta[0-9]+|-test[0-9]+)?$/.test(release),
+    `Release ${release} does not match the expected format`
+  )
+  const changes = changelogObj['releases'][release]
+  assert(
+    Array.isArray(changes),
+    `Expected changes for ${release} to be an array`
+  )
 
-if (!valid && validate.errors != null) {
-  handleError(`Errors: \n${formatErrors(validate.errors)}`)
+  for (const change of changes) {
+    assert(
+      typeof change === 'string',
+      `Expected all changes in ${release} to be strings`
+    )
+  }
 }
 
 console.log('The changelog is totally fine')
diff --git a/script/validate-electron-version.ts b/script/validate-electron-version.ts
new file mode 100644
index 00000000000..9428804965f
--- /dev/null
+++ b/script/validate-electron-version.ts
@@ -0,0 +1,84 @@
+/* eslint-disable no-sync */
+/// <reference path="./globals.d.ts" />
+
+import { readFileSync } from 'fs-extra'
+import { dirname, join } from 'path'
+
+import * as distInfo from './dist-info'
+
+type ChannelToValidate = 'production' | 'beta'
+
+/**
+ * This object states the valid/expected Electron versions for each publishable
+ * channel of GitHub Desktop.
+ *
+ * The purpose of this is to ensure that we don't accidentally publish a
+ * production/beta/test build with the wrong version of Electron, which could
+ * cause really bad regressions to our users, and also the inability to go back
+ * to a previous version of GitHub Desktop without losing all settings.
+ */
+const ValidElectronVersions: Record<ChannelToValidate, string> = {
+  production: '32.1.2',
+  beta: '32.1.2',
+}
+
+// Only when we get a RELEASE_CHANNEL we know we're in the middle of a deployment.
+// In that case, we want to error out if the Electron version is not what we expect.
+const errorOnMismatch = (process.env.RELEASE_CHANNEL ?? '').length > 0
+
+function handleError(message: string): never {
+  if (errorOnMismatch) {
+    console.error(message)
+    process.exit(1)
+  } else {
+    console.warn(message)
+    process.exit(0)
+  }
+}
+
+const channel =
+  process.env.RELEASE_CHANNEL || distInfo.getChannelFromReleaseBranch()
+
+if (!isChannelToValidate(channel)) {
+  console.log(`No need to validate the Electron version of a ${channel} build.`)
+  process.exit(0)
+}
+
+const expectedVersion = ValidElectronVersions[channel]
+const pkg: Package = require('../package.json')
+const actualVersion = pkg.devDependencies?.electron
+const npmrcVersion = resolveVersionInNpmRcFile()
+
+if (actualVersion !== expectedVersion) {
+  handleError(
+    `The Electron version for the ${channel} channel is incorrect. Expected ${expectedVersion} but found ${actualVersion}.`
+  )
+}
+
+if (channel === 'production' && npmrcVersion !== expectedVersion) {
+  handleError(
+    `The Electron version for the ${channel} channel is not correct in the app/.npmrc file. Expected ${expectedVersion} but found ${npmrcVersion}.`
+  )
+}
+
+console.log(
+  `The Electron version for the ${channel} channel is correct: ${actualVersion}.`
+)
+
+function isChannelToValidate(channel: string): channel is ChannelToValidate {
+  return Object.keys(ValidElectronVersions).includes(channel)
+}
+
+function resolveVersionInNpmRcFile() {
+  const root = dirname(__dirname)
+  const path = join(root, 'app', '.npmrc')
+  const text = readFileSync(path, 'utf-8')
+  const version = text.match(/\d+.\d+.\d+/)
+  if (!version) {
+    handleError(
+      `No target version found in the app/.npmrc file. Is this still needed?`
+    )
+  }
+
+  return version[0]
+}
diff --git a/tsconfig.json b/tsconfig.json
index 2ede5bb2249..173066fb0f9 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -15,7 +15,8 @@
     "jsx": "react",
     "strict": true,
     "outDir": "./out",
-    "useUnknownInCatchVariables": false
+    "useUnknownInCatchVariables": false,
+    "lib": ["ES2023"]
   },
   "include": ["app/**/*.ts", "app/**/*.tsx", "app/**/*.d.tsx"],
   "exclude": [
diff --git a/vendor/windows-argv-parser/binding.gyp b/vendor/windows-argv-parser/binding.gyp
new file mode 100644
index 00000000000..a1fc948199a
--- /dev/null
+++ b/vendor/windows-argv-parser/binding.gyp
@@ -0,0 +1,21 @@
+{
+  "targets": [
+    {
+      "target_name": "windows-argv-parser",
+      "sources": [ "main.cc" ],
+      "include_dirs": [
+        "<!@(node -p \"require('node-addon-api').include\")",
+      ],
+      "dependencies": [ "<!(node -p \"require('node-addon-api').targets\"):node_addon_api" ],
+      'cflags!': [ '-fno-exceptions' ],
+      'cflags_cc!': [ '-fno-exceptions' ],
+      'xcode_settings': { 'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
+        'CLANG_CXX_LIBRARY': 'libc++',
+        'MACOSX_DEPLOYMENT_TARGET': '10.7',
+      },
+      'msvs_settings': {
+        'VCCLCompilerTool': { 'ExceptionHandling': 1 },
+      },
+    }
+  ]
+}
diff --git a/vendor/windows-argv-parser/index.ts b/vendor/windows-argv-parser/index.ts
new file mode 100644
index 00000000000..0adfb2870dc
--- /dev/null
+++ b/vendor/windows-argv-parser/index.ts
@@ -0,0 +1,14 @@
+const nativeModule =
+  process.platform === 'win32'
+    ? require('./Release/windows-argv-parser.node')
+    : null
+
+export function parseCommandLineArgv(commandLine: string): string[] {
+  if (!nativeModule) {
+    throw new Error(
+      `The windows-argv-parser module is only available on Windows`
+    )
+  }
+
+  return nativeModule.parseCommandLineArgv(commandLine)
+}
diff --git a/vendor/windows-argv-parser/main.cc b/vendor/windows-argv-parser/main.cc
new file mode 100644
index 00000000000..dfbef797c8a
--- /dev/null
+++ b/vendor/windows-argv-parser/main.cc
@@ -0,0 +1,118 @@
+#include <assert.h>
+#include <stdlib.h>
+#include "napi.h"
+
+#ifdef _WIN32
+#include <windows.h>
+
+// Based on https://stackoverflow.com/a/28789839
+char **split_commandline(const char *cmdline, int *argc)
+{
+    int i;
+    char **argv = NULL;
+    assert(argc);
+
+    if (!cmdline)
+    {
+        return NULL;
+    }
+
+    wchar_t **wargs = NULL;
+    size_t needed = 0;
+    wchar_t *cmdlinew = NULL;
+    size_t len = strlen(cmdline) + 1;
+
+    if (!(cmdlinew = (wchar_t *)calloc(len, sizeof(wchar_t))))
+        goto fail;
+
+    if (!MultiByteToWideChar(CP_ACP, 0, cmdline, -1, cmdlinew, len))
+        goto fail;
+
+    if (!(wargs = CommandLineToArgvW(cmdlinew, argc)))
+        goto fail;
+
+    if (!(argv = (char **)calloc(*argc, sizeof(char *))))
+        goto fail;
+
+    // Convert from wchar_t * to ANSI char *
+    for (i = 0; i < *argc; i++)
+    {
+        // Get the size needed for the target buffer.
+        // CP_ACP = Ansi Codepage.
+        needed = WideCharToMultiByte(CP_ACP, 0, wargs[i], -1,
+                                    NULL, 0, NULL, NULL);
+
+        if (!(argv[i] = (char *)malloc(needed)))
+            goto fail;
+
+        // Do the conversion.
+        needed = WideCharToMultiByte(CP_ACP, 0, wargs[i], -1,
+                                    argv[i], needed, NULL, NULL);
+    }
+
+    if (wargs) LocalFree(wargs);
+    if (cmdlinew) free(cmdlinew);
+    return argv;
+
+fail:
+    if (wargs) LocalFree(wargs);
+    if (cmdlinew) free(cmdlinew);
+
+    if (argv)
+    {
+        for (i = 0; i < *argc; i++)
+        {
+            if (argv[i])
+            {
+                free(argv[i]);
+            }
+        }
+
+        free(argv);
+    }
+
+    return NULL;
+}
+
+Napi::Value ParseCommandLineArgv(const Napi::CallbackInfo& info) {
+  Napi::Env env = info.Env();
+
+  std::string commandLine = info[0].As<Napi::String>();
+
+  // Call split_commandline
+  int argc;
+  char **argv = split_commandline(commandLine.c_str(), &argc);
+
+  // Create an array of strings from argv
+  auto argvArray = Napi::Array::New(env, argc);
+  for (int i = 0; i < argc; i++) {
+    argvArray.Set(i, Napi::String::New(env, argv[i]));
+  }
+
+  // Free memory
+  for (int i = 0; i < argc; i++) {
+    free(argv[i]);
+  }
+  free(argv);
+
+  return argvArray;
+}
+
+#else
+
+Napi::Value ParseCommandLineArgv(const Napi::CallbackInfo& info) {
+  Napi::Env env = info.Env();
+
+  Napi::TypeError::New(env, "Not supported in this platform").
+    ThrowAsJavaScriptException();
+  return env.Undefined();
+}
+
+#endif
+
+Napi::Object Init(Napi::Env env, Napi::Object exports) {
+  exports.Set("parseCommandLineArgv", Napi::Function::New(env, ParseCommandLineArgv));
+  return exports;
+}
+
+NODE_API_MODULE(windowsArgvParser, Init)
diff --git a/vendor/windows-argv-parser/package.json b/vendor/windows-argv-parser/package.json
new file mode 100644
index 00000000000..900e184c99f
--- /dev/null
+++ b/vendor/windows-argv-parser/package.json
@@ -0,0 +1,18 @@
+{
+  "name": "windows-argv-parser",
+  "version": "0.0.1",
+  "description": "Parse a command line string into an array of arguments, using Windows rules.",
+  "license": "MIT",
+  "main": "build/index.js",
+  "scripts": {
+    "build": "tsc",
+    "install": "node-gyp rebuild && tsc"
+  },
+  "dependencies": {
+    "node-addon-api": "^7.0.0"
+  },
+  "devDependencies": {
+    "node-gyp": "^10.1.0",
+    "typescript": "^5.4.5"
+  }
+}
diff --git a/vendor/windows-argv-parser/tsconfig.json b/vendor/windows-argv-parser/tsconfig.json
new file mode 100644
index 00000000000..649c3ab757f
--- /dev/null
+++ b/vendor/windows-argv-parser/tsconfig.json
@@ -0,0 +1,22 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "target": "ES2022",
+    "esModuleInterop": true,
+    "resolveJsonModule": true,
+    "importHelpers": true,
+    "allowUnreachableCode": false,
+    "allowUnusedLabels": false,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true,
+    "noUnusedLocals": true,
+    "sourceMap": true,
+    "strict": true,
+    "outDir": "./build",
+    "useUnknownInCatchVariables": false
+  },
+  "include": ["*.ts"],
+  "exclude": ["node_modules", "build"],
+  "compileOnSave": false
+}
diff --git a/vendor/windows-argv-parser/yarn.lock b/vendor/windows-argv-parser/yarn.lock
new file mode 100644
index 00000000000..bb0b8a2f49d
--- /dev/null
+++ b/vendor/windows-argv-parser/yarn.lock
@@ -0,0 +1,646 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@isaacs/cliui@^8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
+  integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==
+  dependencies:
+    string-width "^5.1.2"
+    string-width-cjs "npm:string-width@^4.2.0"
+    strip-ansi "^7.0.1"
+    strip-ansi-cjs "npm:strip-ansi@^6.0.1"
+    wrap-ansi "^8.1.0"
+    wrap-ansi-cjs "npm:wrap-ansi@^7.0.0"
+
+"@npmcli/agent@^2.0.0":
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/@npmcli/agent/-/agent-2.2.2.tgz#967604918e62f620a648c7975461c9c9e74fc5d5"
+  integrity sha512-OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og==
+  dependencies:
+    agent-base "^7.1.0"
+    http-proxy-agent "^7.0.0"
+    https-proxy-agent "^7.0.1"
+    lru-cache "^10.0.1"
+    socks-proxy-agent "^8.0.3"
+
+"@npmcli/fs@^3.1.0":
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-3.1.1.tgz#59cdaa5adca95d135fc00f2bb53f5771575ce726"
+  integrity sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==
+  dependencies:
+    semver "^7.3.5"
+
+"@pkgjs/parseargs@^0.11.0":
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
+  integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
+
+abbrev@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-2.0.0.tgz#cf59829b8b4f03f89dda2771cb7f3653828c89bf"
+  integrity sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==
+
+agent-base@^7.0.2, agent-base@^7.1.0, agent-base@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.1.tgz#bdbded7dfb096b751a2a087eeeb9664725b2e317"
+  integrity sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==
+  dependencies:
+    debug "^4.3.4"
+
+aggregate-error@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
+  integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
+  dependencies:
+    clean-stack "^2.0.0"
+    indent-string "^4.0.0"
+
+ansi-regex@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
+  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
+
+ansi-regex@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a"
+  integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==
+
+ansi-styles@^4.0.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
+  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
+  dependencies:
+    color-convert "^2.0.1"
+
+ansi-styles@^6.1.0:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
+  integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
+
+balanced-match@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
+
+brace-expansion@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
+  integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
+  dependencies:
+    balanced-match "^1.0.0"
+
+cacache@^18.0.0:
+  version "18.0.3"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-18.0.3.tgz#864e2c18414e1e141ae8763f31e46c2cb96d1b21"
+  integrity sha512-qXCd4rh6I07cnDqh8V48/94Tc/WSfj+o3Gn6NZ0aZovS255bUx8O13uKxRFd2eWG0xgsco7+YItQNPaa5E85hg==
+  dependencies:
+    "@npmcli/fs" "^3.1.0"
+    fs-minipass "^3.0.0"
+    glob "^10.2.2"
+    lru-cache "^10.0.1"
+    minipass "^7.0.3"
+    minipass-collect "^2.0.1"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.4"
+    p-map "^4.0.0"
+    ssri "^10.0.0"
+    tar "^6.1.11"
+    unique-filename "^3.0.0"
+
+chownr@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
+  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
+
+clean-stack@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
+  integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
+
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
+color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
+cross-spawn@^7.0.0:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
+  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  dependencies:
+    path-key "^3.1.0"
+    shebang-command "^2.0.0"
+    which "^2.0.1"
+
+debug@4, debug@^4.3.4:
+  version "4.3.5"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.5.tgz#e83444eceb9fedd4a1da56d671ae2446a01a6e1e"
+  integrity sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==
+  dependencies:
+    ms "2.1.2"
+
+eastasianwidth@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
+  integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
+
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+
+emoji-regex@^9.2.2:
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
+  integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
+
+encoding@^0.1.13:
+  version "0.1.13"
+  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
+  integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
+  dependencies:
+    iconv-lite "^0.6.2"
+
+env-paths@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
+  integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==
+
+err-code@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9"
+  integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==
+
+exponential-backoff@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.1.tgz#64ac7526fe341ab18a39016cd22c787d01e00bf6"
+  integrity sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==
+
+foreground-child@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.2.0.tgz#5eb496c4ebf3bcc4572e8908a45a72f5a1d2d658"
+  integrity sha512-CrWQNaEl1/6WeZoarcM9LHupTo3RpZO2Pdk1vktwzPiQTsJnAKJmm3TACKeG5UZbWDfaH2AbvYxzP96y0MT7fA==
+  dependencies:
+    cross-spawn "^7.0.0"
+    signal-exit "^4.0.1"
+
+fs-minipass@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
+  integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
+  dependencies:
+    minipass "^3.0.0"
+
+fs-minipass@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-3.0.3.tgz#79a85981c4dc120065e96f62086bf6f9dc26cc54"
+  integrity sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==
+  dependencies:
+    minipass "^7.0.3"
+
+glob@^10.2.2, glob@^10.3.10:
+  version "10.4.1"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.1.tgz#0cfb01ab6a6b438177bfe6a58e2576f6efe909c2"
+  integrity sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==
+  dependencies:
+    foreground-child "^3.1.0"
+    jackspeak "^3.1.2"
+    minimatch "^9.0.4"
+    minipass "^7.1.2"
+    path-scurry "^1.11.1"
+
+graceful-fs@^4.2.6:
+  version "4.2.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
+  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
+
+http-cache-semantics@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
+  integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
+
+http-proxy-agent@^7.0.0:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz#9a8b1f246866c028509486585f62b8f2c18c270e"
+  integrity sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==
+  dependencies:
+    agent-base "^7.1.0"
+    debug "^4.3.4"
+
+https-proxy-agent@^7.0.1:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz#8e97b841a029ad8ddc8731f26595bad868cb4168"
+  integrity sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==
+  dependencies:
+    agent-base "^7.0.2"
+    debug "4"
+
+iconv-lite@^0.6.2:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
+  integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3.0.0"
+
+imurmurhash@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
+
+indent-string@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
+  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
+
+ip-address@^9.0.5:
+  version "9.0.5"
+  resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-9.0.5.tgz#117a960819b08780c3bd1f14ef3c1cc1d3f3ea5a"
+  integrity sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==
+  dependencies:
+    jsbn "1.1.0"
+    sprintf-js "^1.1.3"
+
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
+is-lambda@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5"
+  integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==
+
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
+
+isexe@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-3.1.1.tgz#4a407e2bd78ddfb14bea0c27c6f7072dde775f0d"
+  integrity sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==
+
+jackspeak@^3.1.2:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-3.4.0.tgz#a75763ff36ad778ede6a156d8ee8b124de445b4a"
+  integrity sha512-JVYhQnN59LVPFCEcVa2C3CrEKYacvjRfqIQl+h8oi91aLYQVWRYbxjPcv1bUiUy/kLmQaANrYfNMCO3kuEDHfw==
+  dependencies:
+    "@isaacs/cliui" "^8.0.2"
+  optionalDependencies:
+    "@pkgjs/parseargs" "^0.11.0"
+
+jsbn@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040"
+  integrity sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==
+
+lru-cache@^10.0.1, lru-cache@^10.2.0:
+  version "10.2.2"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.2.tgz#48206bc114c1252940c41b25b41af5b545aca878"
+  integrity sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==
+
+make-fetch-happen@^13.0.0:
+  version "13.0.1"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz#273ba2f78f45e1f3a6dca91cede87d9fa4821e36"
+  integrity sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA==
+  dependencies:
+    "@npmcli/agent" "^2.0.0"
+    cacache "^18.0.0"
+    http-cache-semantics "^4.1.1"
+    is-lambda "^1.0.1"
+    minipass "^7.0.2"
+    minipass-fetch "^3.0.0"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.4"
+    negotiator "^0.6.3"
+    proc-log "^4.2.0"
+    promise-retry "^2.0.1"
+    ssri "^10.0.0"
+
+minimatch@^9.0.4:
+  version "9.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51"
+  integrity sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==
+  dependencies:
+    brace-expansion "^2.0.1"
+
+minipass-collect@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-2.0.1.tgz#1621bc77e12258a12c60d34e2276ec5c20680863"
+  integrity sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==
+  dependencies:
+    minipass "^7.0.3"
+
+minipass-fetch@^3.0.0:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-3.0.5.tgz#f0f97e40580affc4a35cc4a1349f05ae36cb1e4c"
+  integrity sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==
+  dependencies:
+    minipass "^7.0.3"
+    minipass-sized "^1.0.3"
+    minizlib "^2.1.2"
+  optionalDependencies:
+    encoding "^0.1.13"
+
+minipass-flush@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
+  integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==
+  dependencies:
+    minipass "^3.0.0"
+
+minipass-pipeline@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
+  integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
+  dependencies:
+    minipass "^3.0.0"
+
+minipass-sized@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70"
+  integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==
+  dependencies:
+    minipass "^3.0.0"
+
+minipass@^3.0.0:
+  version "3.3.6"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a"
+  integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==
+  dependencies:
+    yallist "^4.0.0"
+
+minipass@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
+  integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
+
+"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.2, minipass@^7.0.3, minipass@^7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707"
+  integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==
+
+minizlib@^2.1.1, minizlib@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
+  integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
+  dependencies:
+    minipass "^3.0.0"
+    yallist "^4.0.0"
+
+mkdirp@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+
+ms@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
+negotiator@^0.6.3:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
+  integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
+
+node-addon-api@^7.0.0:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-7.1.1.tgz#1aba6693b0f255258a049d621329329322aad558"
+  integrity sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==
+
+node-gyp@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-10.1.0.tgz#75e6f223f2acb4026866c26a2ead6aab75a8ca7e"
+  integrity sha512-B4J5M1cABxPc5PwfjhbV5hoy2DP9p8lFXASnEN6hugXOa61416tnTZ29x9sSwAd0o99XNIcpvDDy1swAExsVKA==
+  dependencies:
+    env-paths "^2.2.0"
+    exponential-backoff "^3.1.1"
+    glob "^10.3.10"
+    graceful-fs "^4.2.6"
+    make-fetch-happen "^13.0.0"
+    nopt "^7.0.0"
+    proc-log "^3.0.0"
+    semver "^7.3.5"
+    tar "^6.1.2"
+    which "^4.0.0"
+
+nopt@^7.0.0:
+  version "7.2.1"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-7.2.1.tgz#1cac0eab9b8e97c9093338446eddd40b2c8ca1e7"
+  integrity sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==
+  dependencies:
+    abbrev "^2.0.0"
+
+p-map@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
+  integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
+  dependencies:
+    aggregate-error "^3.0.0"
+
+path-key@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
+  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
+
+path-scurry@^1.11.1:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.11.1.tgz#7960a668888594a0720b12a911d1a742ab9f11d2"
+  integrity sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==
+  dependencies:
+    lru-cache "^10.2.0"
+    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
+
+proc-log@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-3.0.0.tgz#fb05ef83ccd64fd7b20bbe9c8c1070fc08338dd8"
+  integrity sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==
+
+proc-log@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-4.2.0.tgz#b6f461e4026e75fdfe228b265e9f7a00779d7034"
+  integrity sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==
+
+promise-retry@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22"
+  integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==
+  dependencies:
+    err-code "^2.0.2"
+    retry "^0.12.0"
+
+retry@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
+  integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==
+
+"safer-buffer@>= 2.1.2 < 3.0.0":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
+
+semver@^7.3.5:
+  version "7.6.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.2.tgz#1e3b34759f896e8f14d6134732ce798aeb0c6e13"
+  integrity sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==
+
+shebang-command@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
+  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
+  dependencies:
+    shebang-regex "^3.0.0"
+
+shebang-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
+  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
+
+signal-exit@^4.0.1:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
+  integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
+
+smart-buffer@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
+  integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
+
+socks-proxy-agent@^8.0.3:
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-8.0.3.tgz#6b2da3d77364fde6292e810b496cb70440b9b89d"
+  integrity sha512-VNegTZKhuGq5vSD6XNKlbqWhyt/40CgoEw8XxD6dhnm8Jq9IEa3nIa4HwnM8XOqU0CdB0BwWVXusqiFXfHB3+A==
+  dependencies:
+    agent-base "^7.1.1"
+    debug "^4.3.4"
+    socks "^2.7.1"
+
+socks@^2.7.1:
+  version "2.8.3"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.8.3.tgz#1ebd0f09c52ba95a09750afe3f3f9f724a800cb5"
+  integrity sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==
+  dependencies:
+    ip-address "^9.0.5"
+    smart-buffer "^4.2.0"
+
+sprintf-js@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.3.tgz#4914b903a2f8b685d17fdf78a70e917e872e444a"
+  integrity sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==
+
+ssri@^10.0.0:
+  version "10.0.6"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-10.0.6.tgz#a8aade2de60ba2bce8688e3fa349bad05c7dc1e5"
+  integrity sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==
+  dependencies:
+    minipass "^7.0.3"
+
+"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0:
+  name string-width-cjs
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string-width@^5.0.1, string-width@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
+  integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==
+  dependencies:
+    eastasianwidth "^0.2.0"
+    emoji-regex "^9.2.2"
+    strip-ansi "^7.0.1"
+
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  name strip-ansi-cjs
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-ansi@^7.0.1:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
+  integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==
+  dependencies:
+    ansi-regex "^6.0.1"
+
+tar@^6.1.11, tar@^6.1.2:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a"
+  integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==
+  dependencies:
+    chownr "^2.0.0"
+    fs-minipass "^2.0.0"
+    minipass "^5.0.0"
+    minizlib "^2.1.1"
+    mkdirp "^1.0.3"
+    yallist "^4.0.0"
+
+typescript@^5.4.5:
+  version "5.4.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611"
+  integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==
+
+unique-filename@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-3.0.0.tgz#48ba7a5a16849f5080d26c760c86cf5cf05770ea"
+  integrity sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==
+  dependencies:
+    unique-slug "^4.0.0"
+
+unique-slug@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-4.0.0.tgz#6bae6bb16be91351badd24cdce741f892a6532e3"
+  integrity sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==
+  dependencies:
+    imurmurhash "^0.1.4"
+
+which@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+  dependencies:
+    isexe "^2.0.0"
+
+which@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/which/-/which-4.0.0.tgz#cd60b5e74503a3fbcfbf6cd6b4138a8bae644c1a"
+  integrity sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==
+  dependencies:
+    isexe "^3.1.1"
+
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
+wrap-ansi@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
+  integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==
+  dependencies:
+    ansi-styles "^6.1.0"
+    string-width "^5.0.1"
+    strip-ansi "^7.0.1"
+
+yallist@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
diff --git a/yarn.lock b/yarn.lock
index ed146d20265..fc4c985c68d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,291 +2,323 @@
 # yarn lockfile v1
 
 
-"7zip-bin@~5.0.3":
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.0.3.tgz#bc5b5532ecafd923a61f2fb097e3b108c0106a3f"
-  integrity sha512-GLyWIFBbGvpKPGo55JyRZAo4lVbnBiD52cKlw/0Vt+wnmKvWJkpZvsjVoaIolyBXDeAQKSicRtqFNPem9w0WYA==
+"@aashutoshrathi/word-wrap@^1.2.3":
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf"
+  integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==
 
-"@babel/code-frame@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8"
-  integrity sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==
+"@ampproject/remapping@^2.2.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.3.0.tgz#ed441b6fa600072520ce18b43d2c8cc8caecc7f4"
+  integrity sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==
   dependencies:
-    "@babel/highlight" "^7.0.0"
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.24"
 
-"@babel/code-frame@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a"
-  integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==
+"@azure/abort-controller@^1.0.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@azure/abort-controller/-/abort-controller-1.1.0.tgz#788ee78457a55af8a1ad342acb182383d2119249"
+  integrity sha512-TrRLIoSQVzfAJX9H1JeFjzAoDGcoK1IYX1UImfceTZpsyYfWr09Ss1aHW1y5TrrR3iq6RZLBwJ3E24uwPhwahw==
   dependencies:
-    "@babel/highlight" "^7.10.4"
+    tslib "^2.2.0"
 
-"@babel/code-frame@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
-  integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==
+"@azure/abort-controller@^2.0.0", "@azure/abort-controller@^2.1.2":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/@azure/abort-controller/-/abort-controller-2.1.2.tgz#42fe0ccab23841d9905812c58f1082d27784566d"
+  integrity sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==
   dependencies:
-    "@babel/highlight" "^7.16.7"
-
-"@babel/compat-data@^7.16.4":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.8.tgz#31560f9f29fdf1868de8cb55049538a1b9732a60"
-  integrity sha512-m7OkX0IdKLKPpBlJtF561YJal5y/jyI5fNfWbPxh2D/nbzzGI4qRyrD8xO2jB24u7l+5I2a43scCG2IrfjC50Q==
+    tslib "^2.6.2"
 
-"@babel/core@^7.1.0", "@babel/core@^7.7.5":
-  version "7.12.9"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.9.tgz#fd450c4ec10cdbb980e2928b7aa7a28484593fc8"
-  integrity sha512-gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ==
+"@azure/core-auth@^1.4.0", "@azure/core-auth@^1.8.0":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@azure/core-auth/-/core-auth-1.8.0.tgz#281b4a6d3309c3e7b15bcd967f01d4c79ae4a1d6"
+  integrity sha512-YvFMowkXzLbXNM11yZtVLhUCmuG0ex7JKOH366ipjmHBhL3vpDcPAeWF+jf0X+jVXwFqo3UhsWUq4kH0ZPdu/g==
+  dependencies:
+    "@azure/abort-controller" "^2.0.0"
+    "@azure/core-util" "^1.1.0"
+    tslib "^2.6.2"
+
+"@azure/core-client@^1.3.0", "@azure/core-client@^1.6.2":
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/@azure/core-client/-/core-client-1.9.2.tgz#6fc69cee2816883ab6c5cdd653ee4f2ff9774f74"
+  integrity sha512-kRdry/rav3fUKHl/aDLd/pDLcB+4pOFwPPTVEExuMyaI5r+JBbMWqRbCY1pn5BniDaU3lRxO9eaQ1AmSMehl/w==
+  dependencies:
+    "@azure/abort-controller" "^2.0.0"
+    "@azure/core-auth" "^1.4.0"
+    "@azure/core-rest-pipeline" "^1.9.1"
+    "@azure/core-tracing" "^1.0.0"
+    "@azure/core-util" "^1.6.1"
+    "@azure/logger" "^1.0.0"
+    tslib "^2.6.2"
+
+"@azure/core-http-compat@^2.0.0":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/@azure/core-http-compat/-/core-http-compat-2.1.2.tgz#d1585ada24ba750dc161d816169b33b35f762f0d"
+  integrity sha512-5MnV1yqzZwgNLLjlizsU3QqOeQChkIXw781Fwh1xdAqJR5AA32IUaq6xv1BICJvfbHoa+JYcaij2HFkhLbNTJQ==
   dependencies:
-    "@babel/code-frame" "^7.10.4"
-    "@babel/generator" "^7.12.5"
-    "@babel/helper-module-transforms" "^7.12.1"
-    "@babel/helpers" "^7.12.5"
-    "@babel/parser" "^7.12.7"
-    "@babel/template" "^7.12.7"
-    "@babel/traverse" "^7.12.9"
-    "@babel/types" "^7.12.7"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.1"
-    json5 "^2.1.2"
-    lodash "^4.17.19"
-    resolve "^1.3.2"
-    semver "^5.4.1"
-    source-map "^0.5.0"
-
-"@babel/core@^7.4.4":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.16.7.tgz#db990f931f6d40cb9b87a0dc7d2adc749f1dcbcf"
-  integrity sha512-aeLaqcqThRNZYmbMqtulsetOQZ/5gbR/dWruUCJcpas4Qoyy+QeagfDsPdMrqwsPRDNxJvBlRiZxxX7THO7qtA==
-  dependencies:
-    "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.16.7"
-    "@babel/helper-compilation-targets" "^7.16.7"
-    "@babel/helper-module-transforms" "^7.16.7"
-    "@babel/helpers" "^7.16.7"
-    "@babel/parser" "^7.16.7"
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.16.7"
-    "@babel/types" "^7.16.7"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.2"
-    json5 "^2.1.2"
-    semver "^6.3.0"
-    source-map "^0.5.0"
+    "@azure/abort-controller" "^2.0.0"
+    "@azure/core-client" "^1.3.0"
+    "@azure/core-rest-pipeline" "^1.3.0"
 
-"@babel/generator@^7.12.5":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.5.tgz#a2c50de5c8b6d708ab95be5e6053936c1884a4de"
-  integrity sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==
+"@azure/core-lro@^2.2.0":
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/@azure/core-lro/-/core-lro-2.5.2.tgz#712439f12b39ade7576f55780a4e005472c67b19"
+  integrity sha512-tucUutPhBwCPu6v16KEFYML81npEL6gnT+iwewXvK5ZD55sr0/Vw2jfQETMiKVeARRrXHB2QQ3SpxxGi1zAUWg==
   dependencies:
-    "@babel/types" "^7.12.5"
-    jsesc "^2.5.1"
-    source-map "^0.5.0"
+    "@azure/abort-controller" "^1.0.0"
+    "@azure/core-util" "^1.2.0"
+    "@azure/logger" "^1.0.0"
+    tslib "^2.2.0"
 
-"@babel/generator@^7.16.7", "@babel/generator@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.8.tgz#359d44d966b8cd059d543250ce79596f792f2ebe"
-  integrity sha512-1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw==
+"@azure/core-paging@^1.1.1":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@azure/core-paging/-/core-paging-1.5.0.tgz#5a5b09353e636072e6a7fc38f7879e11d0afb15f"
+  integrity sha512-zqWdVIt+2Z+3wqxEOGzR5hXFZ8MGKK52x4vFLw8n58pR6ZfKRx3EXYTxTaYxYHc/PexPUTyimcTWFJbji9Z6Iw==
+  dependencies:
+    tslib "^2.2.0"
+
+"@azure/core-rest-pipeline@^1.10.1", "@azure/core-rest-pipeline@^1.3.0", "@azure/core-rest-pipeline@^1.9.1":
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/@azure/core-rest-pipeline/-/core-rest-pipeline-1.17.0.tgz#55dafa1093553c549ed6d8dbca69aa505c7b3aa3"
+  integrity sha512-62Vv8nC+uPId3j86XJ0WI+sBf0jlqTqPUFCBNrGtlaUeQUIXWV/D8GE5A1d+Qx8H7OQojn2WguC8kChD6v0shA==
+  dependencies:
+    "@azure/abort-controller" "^2.0.0"
+    "@azure/core-auth" "^1.8.0"
+    "@azure/core-tracing" "^1.0.1"
+    "@azure/core-util" "^1.9.0"
+    "@azure/logger" "^1.0.0"
+    http-proxy-agent "^7.0.0"
+    https-proxy-agent "^7.0.0"
+    tslib "^2.6.2"
+
+"@azure/core-tracing@^1.0.0", "@azure/core-tracing@^1.0.1", "@azure/core-tracing@^1.1.2":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@azure/core-tracing/-/core-tracing-1.2.0.tgz#7be5d53c3522d639cf19042cbcdb19f71bc35ab2"
+  integrity sha512-UKTiEJPkWcESPYJz3X5uKRYyOcJD+4nYph+KpfdPRnQJVrZfk0KJgdnaAWKfhsBBtAf/D58Az4AvCJEmWgIBAg==
   dependencies:
-    "@babel/types" "^7.16.8"
-    jsesc "^2.5.1"
-    source-map "^0.5.0"
+    tslib "^2.6.2"
 
-"@babel/helper-compilation-targets@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz#06e66c5f299601e6c7da350049315e83209d551b"
-  integrity sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA==
+"@azure/core-util@^1.1.0", "@azure/core-util@^1.6.1", "@azure/core-util@^1.9.0":
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/@azure/core-util/-/core-util-1.10.0.tgz#cf3163382d40343972848c914869864df5d44bdb"
+  integrity sha512-dqLWQsh9Nro1YQU+405POVtXnwrIVqPyfUzc4zXCbThTg7+vNNaiMkwbX9AMXKyoFYFClxmB3s25ZFr3+jZkww==
   dependencies:
-    "@babel/compat-data" "^7.16.4"
-    "@babel/helper-validator-option" "^7.16.7"
-    browserslist "^4.17.5"
-    semver "^6.3.0"
+    "@azure/abort-controller" "^2.0.0"
+    tslib "^2.6.2"
 
-"@babel/helper-environment-visitor@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz#ff484094a839bde9d89cd63cba017d7aae80ecd7"
-  integrity sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==
+"@azure/core-util@^1.2.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@azure/core-util/-/core-util-1.3.0.tgz#ea736a0cb0437ac0d049d57ff627c240b41479ec"
+  integrity sha512-ANP0Er7R2KHHHjwmKzPF9wbd0gXvOX7yRRHeYL1eNd/OaNrMLyfZH/FQasHRVAf6rMXX+EAUpvYwLMFDHDI5Gw==
   dependencies:
-    "@babel/types" "^7.16.7"
+    "@azure/abort-controller" "^1.0.0"
+    tslib "^2.2.0"
 
-"@babel/helper-function-name@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz#d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a"
-  integrity sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==
+"@azure/core-xml@^1.4.3":
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/@azure/core-xml/-/core-xml-1.4.4.tgz#a8656751943bf492762f758d147d33dfcd933d9e"
+  integrity sha512-J4FYAqakGXcbfeZjwjMzjNcpcH4E+JtEBv+xcV1yL0Ydn/6wbQfeFKTCHh9wttAi0lmajHw7yBbHPRG+YHckZQ==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.10.4"
-    "@babel/template" "^7.10.4"
-    "@babel/types" "^7.10.4"
+    fast-xml-parser "^4.4.1"
+    tslib "^2.6.2"
+
+"@azure/logger@^1.0.0":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@azure/logger/-/logger-1.0.4.tgz#28bc6d0e5b3c38ef29296b32d35da4e483593fa1"
+  integrity sha512-ustrPY8MryhloQj7OWGe+HrYx+aoiOxzbXTtgblbV3xwCqpzUK36phH3XNHQKj3EPonyFUuDTfR3qFhTEAuZEg==
+  dependencies:
+    tslib "^2.2.0"
+
+"@azure/storage-blob@^12.25.0":
+  version "12.25.0"
+  resolved "https://registry.yarnpkg.com/@azure/storage-blob/-/storage-blob-12.25.0.tgz#fa9a1d2456cdf6526450a8b73059d2f2e9b1ec76"
+  integrity sha512-oodouhA3nCCIh843tMMbxty3WqfNT+Vgzj3Xo5jqR9UPnzq3d7mzLjlHAYz7lW+b4km3SIgz+NAgztvhm7Z6kQ==
+  dependencies:
+    "@azure/abort-controller" "^2.1.2"
+    "@azure/core-auth" "^1.4.0"
+    "@azure/core-client" "^1.6.2"
+    "@azure/core-http-compat" "^2.0.0"
+    "@azure/core-lro" "^2.2.0"
+    "@azure/core-paging" "^1.1.1"
+    "@azure/core-rest-pipeline" "^1.10.1"
+    "@azure/core-tracing" "^1.1.2"
+    "@azure/core-util" "^1.6.1"
+    "@azure/core-xml" "^1.4.3"
+    "@azure/logger" "^1.0.0"
+    events "^3.0.0"
+    tslib "^2.2.0"
 
-"@babel/helper-function-name@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz#f1ec51551fb1c8956bc8dd95f38523b6cf375f8f"
-  integrity sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==
+"@babel/code-frame@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8"
+  integrity sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.16.7"
-    "@babel/template" "^7.16.7"
-    "@babel/types" "^7.16.7"
+    "@babel/highlight" "^7.0.0"
 
-"@babel/helper-get-function-arity@^7.10.4":
+"@babel/code-frame@^7.10.4":
   version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz#98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2"
-  integrity sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a"
+  integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==
   dependencies:
-    "@babel/types" "^7.10.4"
+    "@babel/highlight" "^7.10.4"
 
-"@babel/helper-get-function-arity@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz#ea08ac753117a669f1508ba06ebcc49156387419"
-  integrity sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==
+"@babel/code-frame@^7.12.13":
+  version "7.23.5"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244"
+  integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==
   dependencies:
-    "@babel/types" "^7.16.7"
+    "@babel/highlight" "^7.23.4"
+    chalk "^2.4.2"
 
-"@babel/helper-hoist-variables@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz#86bcb19a77a509c7b77d0e22323ef588fa58c246"
-  integrity sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==
+"@babel/code-frame@^7.23.5", "@babel/code-frame@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.7.tgz#882fd9e09e8ee324e496bd040401c6f046ef4465"
+  integrity sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==
   dependencies:
-    "@babel/types" "^7.16.7"
+    "@babel/highlight" "^7.24.7"
+    picocolors "^1.0.0"
 
-"@babel/helper-member-expression-to-functions@^7.12.1":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz#aa77bd0396ec8114e5e30787efa78599d874a855"
-  integrity sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==
+"@babel/compat-data@^7.25.2":
+  version "7.25.4"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.25.4.tgz#7d2a80ce229890edcf4cc259d4d696cb4dae2fcb"
+  integrity sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==
+
+"@babel/core@^7.11.6", "@babel/core@^7.12.3":
+  version "7.23.5"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.5.tgz#6e23f2acbcb77ad283c5ed141f824fd9f70101c7"
+  integrity sha512-Cwc2XjUrG4ilcfOw4wBAK+enbdgwAcAJCfGUItPBKR7Mjw4aEfAFYrLxeRp4jWgtNIKn3n2AlBOfwwafl+42/g==
+  dependencies:
+    "@ampproject/remapping" "^2.2.0"
+    "@babel/code-frame" "^7.23.5"
+    "@babel/generator" "^7.23.5"
+    "@babel/helper-compilation-targets" "^7.22.15"
+    "@babel/helper-module-transforms" "^7.23.3"
+    "@babel/helpers" "^7.23.5"
+    "@babel/parser" "^7.23.5"
+    "@babel/template" "^7.22.15"
+    "@babel/traverse" "^7.23.5"
+    "@babel/types" "^7.23.5"
+    convert-source-map "^2.0.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.2.3"
+    semver "^6.3.1"
+
+"@babel/core@^7.25.2":
+  version "7.25.2"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.25.2.tgz#ed8eec275118d7613e77a352894cd12ded8eba77"
+  integrity sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==
+  dependencies:
+    "@ampproject/remapping" "^2.2.0"
+    "@babel/code-frame" "^7.24.7"
+    "@babel/generator" "^7.25.0"
+    "@babel/helper-compilation-targets" "^7.25.2"
+    "@babel/helper-module-transforms" "^7.25.2"
+    "@babel/helpers" "^7.25.0"
+    "@babel/parser" "^7.25.0"
+    "@babel/template" "^7.25.0"
+    "@babel/traverse" "^7.25.2"
+    "@babel/types" "^7.25.2"
+    convert-source-map "^2.0.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.2.3"
+    semver "^6.3.1"
+
+"@babel/generator@^7.23.5", "@babel/generator@^7.25.0", "@babel/generator@^7.25.4":
+  version "7.25.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.25.5.tgz#b31cf05b3fe8c32d206b6dad03bb0aacbde73450"
+  integrity sha512-abd43wyLfbWoxC6ahM8xTkqLpGB2iWBVyuKC9/srhFunCd1SDNrV1s72bBpK4hLj8KLzHBBcOblvLQZBNw9r3w==
   dependencies:
-    "@babel/types" "^7.12.7"
+    "@babel/types" "^7.25.4"
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.25"
+    jsesc "^2.5.1"
 
-"@babel/helper-module-imports@^7.12.1":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz#1bfc0229f794988f76ed0a4d4e90860850b54dfb"
-  integrity sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==
+"@babel/generator@^7.7.2":
+  version "7.23.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.5.tgz#17d0a1ea6b62f351d281350a5f80b87a810c4755"
+  integrity sha512-BPssCHrBD+0YrxviOa3QzpqwhNIXKEtOa2jQrm4FlmkC2apYgRnQcmPWiGZDlGxiNtltnUFolMe8497Esry+jA==
   dependencies:
-    "@babel/types" "^7.12.5"
+    "@babel/types" "^7.23.5"
+    "@jridgewell/gen-mapping" "^0.3.2"
+    "@jridgewell/trace-mapping" "^0.3.17"
+    jsesc "^2.5.1"
 
-"@babel/helper-module-imports@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437"
-  integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==
+"@babel/helper-compilation-targets@^7.22.15", "@babel/helper-compilation-targets@^7.25.2":
+  version "7.25.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz#e1d9410a90974a3a5a66e84ff55ef62e3c02d06c"
+  integrity sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==
   dependencies:
-    "@babel/types" "^7.16.7"
+    "@babel/compat-data" "^7.25.2"
+    "@babel/helper-validator-option" "^7.24.8"
+    browserslist "^4.23.1"
+    lru-cache "^5.1.1"
+    semver "^6.3.1"
 
-"@babel/helper-module-transforms@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz#7954fec71f5b32c48e4b303b437c34453fd7247c"
-  integrity sha512-QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==
+"@babel/helper-module-imports@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz#f2f980392de5b84c3328fc71d38bd81bbb83042b"
+  integrity sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==
   dependencies:
-    "@babel/helper-module-imports" "^7.12.1"
-    "@babel/helper-replace-supers" "^7.12.1"
-    "@babel/helper-simple-access" "^7.12.1"
-    "@babel/helper-split-export-declaration" "^7.11.0"
-    "@babel/helper-validator-identifier" "^7.10.4"
-    "@babel/template" "^7.10.4"
-    "@babel/traverse" "^7.12.1"
-    "@babel/types" "^7.12.1"
-    lodash "^4.17.19"
+    "@babel/traverse" "^7.24.7"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-module-transforms@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz#7665faeb721a01ca5327ddc6bba15a5cb34b6a41"
-  integrity sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-module-imports" "^7.16.7"
-    "@babel/helper-simple-access" "^7.16.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
-    "@babel/helper-validator-identifier" "^7.16.7"
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.16.7"
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-optimise-call-expression@^7.10.4":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.7.tgz#7f94ae5e08721a49467346aa04fd22f750033b9c"
-  integrity sha512-I5xc9oSJ2h59OwyUqjv95HRyzxj53DAubUERgQMrpcCEYQyToeHA+NEcUEsVWB4j53RDeskeBJ0SgRAYHDBckw==
+"@babel/helper-module-transforms@^7.23.3", "@babel/helper-module-transforms@^7.24.8", "@babel/helper-module-transforms@^7.25.2":
+  version "7.25.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz#ee713c29768100f2776edf04d4eb23b8d27a66e6"
+  integrity sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==
   dependencies:
-    "@babel/types" "^7.12.7"
+    "@babel/helper-module-imports" "^7.24.7"
+    "@babel/helper-simple-access" "^7.24.7"
+    "@babel/helper-validator-identifier" "^7.24.7"
+    "@babel/traverse" "^7.25.2"
 
 "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375"
   integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==
 
-"@babel/helper-plugin-utils@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5"
-  integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==
-
-"@babel/helper-replace-supers@^7.12.1":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz#f009a17543bbbbce16b06206ae73b63d3fca68d9"
-  integrity sha512-5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA==
-  dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.12.1"
-    "@babel/helper-optimise-call-expression" "^7.10.4"
-    "@babel/traverse" "^7.12.5"
-    "@babel/types" "^7.12.5"
-
-"@babel/helper-simple-access@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz#32427e5aa61547d38eb1e6eaf5fd1426fdad9136"
-  integrity sha512-OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA==
-  dependencies:
-    "@babel/types" "^7.12.1"
-
-"@babel/helper-simple-access@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz#d656654b9ea08dbb9659b69d61063ccd343ff0f7"
-  integrity sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g==
-  dependencies:
-    "@babel/types" "^7.16.7"
+"@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.8":
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz#94ee67e8ec0e5d44ea7baeb51e571bd26af07878"
+  integrity sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==
 
-"@babel/helper-split-export-declaration@^7.11.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f"
-  integrity sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==
+"@babel/helper-simple-access@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz#bcade8da3aec8ed16b9c4953b74e506b51b5edb3"
+  integrity sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==
   dependencies:
-    "@babel/types" "^7.11.0"
+    "@babel/traverse" "^7.24.7"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-split-export-declaration@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b"
-  integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==
-  dependencies:
-    "@babel/types" "^7.16.7"
+"@babel/helper-string-parser@^7.23.4", "@babel/helper-string-parser@^7.24.8":
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz#5b3329c9a58803d5df425e5785865881a81ca48d"
+  integrity sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==
 
 "@babel/helper-validator-identifier@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2"
   integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==
 
-"@babel/helper-validator-identifier@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad"
-  integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==
+"@babel/helper-validator-identifier@^7.22.20", "@babel/helper-validator-identifier@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz#75b889cfaf9e35c2aaf42cf0d72c8e91719251db"
+  integrity sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==
 
-"@babel/helper-validator-option@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23"
-  integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==
+"@babel/helper-validator-option@^7.24.8":
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz#3725cdeea8b480e86d34df15304806a06975e33d"
+  integrity sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==
 
-"@babel/helpers@^7.12.5":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.5.tgz#1a1ba4a768d9b58310eda516c449913fe647116e"
-  integrity sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA==
+"@babel/helpers@^7.23.5", "@babel/helpers@^7.25.0":
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.25.0.tgz#e69beb7841cb93a6505531ede34f34e6a073650a"
+  integrity sha512-MjgLZ42aCm0oGjJj8CtSM3DB8NOOf8h2l7DCTePJs29u+v7yO/RBX9nShlKMgFnRks/Q4tBAe7Hxnov9VkGwLw==
   dependencies:
-    "@babel/template" "^7.10.4"
-    "@babel/traverse" "^7.12.5"
-    "@babel/types" "^7.12.5"
-
-"@babel/helpers@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.16.7.tgz#7e3504d708d50344112767c3542fc5e357fffefc"
-  integrity sha512-9ZDoqtfY7AuEOt3cxchfii6C7GDyyMBffktR5B2jvWv8u2+efwvpnVKXMWzNehqy68tKgAfSwfdw/lWpthS2bw==
-  dependencies:
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.16.7"
-    "@babel/types" "^7.16.7"
+    "@babel/template" "^7.25.0"
+    "@babel/types" "^7.25.0"
 
 "@babel/highlight@^7.0.0":
   version "7.0.0"
@@ -306,24 +338,32 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/highlight@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.7.tgz#81a01d7d675046f0d96f82450d9d9578bdfd6b0b"
-  integrity sha512-aKpPMfLvGO3Q97V0qhw/V2SWNWlwfJknuwAunU7wZLSfrM4xTBvg7E5opUVi1kJTBKihE38CPg4nBiqX83PWYw==
+"@babel/highlight@^7.23.4", "@babel/highlight@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.7.tgz#a05ab1df134b286558aae0ed41e6c5f731bf409d"
+  integrity sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.16.7"
-    chalk "^2.0.0"
+    "@babel/helper-validator-identifier" "^7.24.7"
+    chalk "^2.4.2"
     js-tokens "^4.0.0"
+    picocolors "^1.0.0"
 
 "@babel/parser@^7.1.0", "@babel/parser@^7.12.7":
   version "7.12.7"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.7.tgz#fee7b39fe809d0e73e5b25eecaf5780ef3d73056"
   integrity sha512-oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg==
 
-"@babel/parser@^7.16.7", "@babel/parser@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.8.tgz#61c243a3875f7d0b0962b0543a33ece6ff2f1f17"
-  integrity sha512-i7jDUfrVBWc+7OKcBzEe5n7fbv3i2fWtxKzzCvOjnzSxMfWMigAhtfJ7qzZNGFNMsCCd67+uz553dYKWXPvCKw==
+"@babel/parser@^7.14.7", "@babel/parser@^7.20.7":
+  version "7.23.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.5.tgz#37dee97c4752af148e1d38c34b856b2507660563"
+  integrity sha512-hOOqoiNXrmGdFbhgCzu6GiURxUgM27Xwd/aPuu8RfHEZPBzL1Z54okAHAQjXfcQNwvrlkAmAp4SlRTZ45vlthQ==
+
+"@babel/parser@^7.23.5", "@babel/parser@^7.25.0", "@babel/parser@^7.25.4":
+  version "7.25.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.25.4.tgz#af4f2df7d02440286b7de57b1c21acfb2a6f257a"
+  integrity sha512-nq+eWrOgdtu3jG5Os4TQP3x3cLA8hR8TvJNjD8vnPa20WGycimcparWnLK4jJhElTK6SDyuJo1weMKO/5LpmLA==
+  dependencies:
+    "@babel/types" "^7.25.4"
 
 "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
@@ -360,6 +400,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
+"@babel/plugin-syntax-jsx@^7.7.2":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz#8f2e4f8a9b5f9aa16067e142c1ac9cd9f810f473"
+  integrity sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
@@ -409,66 +456,61 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-modules-commonjs@^7.4.4":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.8.tgz#cdee19aae887b16b9d331009aa9a219af7c86afe"
-  integrity sha512-oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA==
+"@babel/plugin-syntax-typescript@^7.7.2":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.23.3.tgz#24f460c85dbbc983cd2b9c4994178bcc01df958f"
+  integrity sha512-9EiNjVJOMwCO+43TqoTrgQ8jMwcAd0sWyXi9RPfIsLTj4R2MADDDQXELhffaUx/uJv2AYcxBgPwH6j4TIA4ytQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-simple-access" "^7.16.7"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/template@^7.10.4", "@babel/template@^7.12.7", "@babel/template@^7.3.3":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc"
-  integrity sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==
+"@babel/plugin-transform-modules-commonjs@^7.24.8":
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.8.tgz#ab6421e564b717cb475d6fff70ae7f103536ea3c"
+  integrity sha512-WHsk9H8XxRs3JXKWFiqtQebdh9b/pTk4EgueygFzYlTKAg0Ud985mSevdNjdXdFBATSKVJGQXP1tv6aGbssLKA==
   dependencies:
-    "@babel/code-frame" "^7.10.4"
-    "@babel/parser" "^7.12.7"
-    "@babel/types" "^7.12.7"
+    "@babel/helper-module-transforms" "^7.24.8"
+    "@babel/helper-plugin-utils" "^7.24.8"
+    "@babel/helper-simple-access" "^7.24.7"
+
+"@babel/runtime@^7.20.7":
+  version "7.23.1"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.1.tgz#72741dc4d413338a91dcb044a86f3c0bc402646d"
+  integrity sha512-hC2v6p8ZSI/W0HUzh3V8C5g+NwSKzKPtJwSpTjwl0o297GP9+ZLQSkdvHz46CM3LqyoXxq+5G9komY+eSqSO0g==
+  dependencies:
+    regenerator-runtime "^0.14.0"
 
-"@babel/template@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155"
-  integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==
+"@babel/template@^7.22.15", "@babel/template@^7.25.0":
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.25.0.tgz#e733dc3134b4fede528c15bc95e89cb98c52592a"
+  integrity sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==
   dependencies:
-    "@babel/code-frame" "^7.16.7"
-    "@babel/parser" "^7.16.7"
-    "@babel/types" "^7.16.7"
+    "@babel/code-frame" "^7.24.7"
+    "@babel/parser" "^7.25.0"
+    "@babel/types" "^7.25.0"
 
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.5", "@babel/traverse@^7.12.9":
-  version "7.12.9"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.9.tgz#fad26c972eabbc11350e0b695978de6cc8e8596f"
-  integrity sha512-iX9ajqnLdoU1s1nHt36JDI9KG4k+vmI8WgjK5d+aDTwQbL2fUnzedNedssA645Ede3PM2ma1n8Q4h2ohwXgMXw==
+"@babel/template@^7.3.3":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc"
+  integrity sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==
   dependencies:
     "@babel/code-frame" "^7.10.4"
-    "@babel/generator" "^7.12.5"
-    "@babel/helper-function-name" "^7.10.4"
-    "@babel/helper-split-export-declaration" "^7.11.0"
     "@babel/parser" "^7.12.7"
     "@babel/types" "^7.12.7"
-    debug "^4.1.0"
-    globals "^11.1.0"
-    lodash "^4.17.19"
 
-"@babel/traverse@^7.16.7":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.8.tgz#bab2f2b09a5fe8a8d9cad22cbfe3ba1d126fef9c"
-  integrity sha512-xe+H7JlvKsDQwXRsBhSnq1/+9c+LlQcCK3Tn/l5sbx02HYns/cn7ibp9+RV1sIUqu7hKg91NWsgHurO9dowITQ==
-  dependencies:
-    "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.16.8"
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/helper-hoist-variables" "^7.16.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
-    "@babel/parser" "^7.16.8"
-    "@babel/types" "^7.16.8"
-    debug "^4.1.0"
+"@babel/traverse@^7.23.5", "@babel/traverse@^7.24.7", "@babel/traverse@^7.25.2":
+  version "7.25.4"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.25.4.tgz#648678046990f2957407e3086e97044f13c3e18e"
+  integrity sha512-VJ4XsrD+nOvlXyLzmLzUs/0qjFS4sK30te5yEFlvbbUNEgKaVb2BHZUpAL+ttLPQAHNrsI3zZisbfha5Cvr8vg==
+  dependencies:
+    "@babel/code-frame" "^7.24.7"
+    "@babel/generator" "^7.25.4"
+    "@babel/parser" "^7.25.4"
+    "@babel/template" "^7.25.0"
+    "@babel/types" "^7.25.4"
+    debug "^4.3.1"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3":
+"@babel/types@^7.0.0", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3":
   version "7.12.7"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.7.tgz#6039ff1e242640a29452c9ae572162ec9a8f5d13"
   integrity sha512-MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ==
@@ -477,12 +519,22 @@
     lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.16.7", "@babel/types@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.8.tgz#0ba5da91dd71e0a4e7781a30f22770831062e3c1"
-  integrity sha512-smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg==
+"@babel/types@^7.20.7":
+  version "7.23.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.5.tgz#48d730a00c95109fa4393352705954d74fb5b602"
+  integrity sha512-ON5kSOJwVO6xXVRTvOI0eOnWe7VdUcIpsovGo9U/Br4Ie4UVFQTboO2cYnDhAGU6Fp+UxSiT+pMft0SMHfuq6w==
+  dependencies:
+    "@babel/helper-string-parser" "^7.23.4"
+    "@babel/helper-validator-identifier" "^7.22.20"
+    to-fast-properties "^2.0.0"
+
+"@babel/types@^7.23.5", "@babel/types@^7.24.7", "@babel/types@^7.25.0", "@babel/types@^7.25.2", "@babel/types@^7.25.4":
+  version "7.25.4"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.25.4.tgz#6bcb46c72fdf1012a209d016c07f769e10adcb5f"
+  integrity sha512-zQ1ijeeCXVEh+aNL0RlmkPkG8HUiDcU2pzQQFjtbntgAczRASFzj4H+6+bV+dy1ntKR14I/DypeuRG1uma98iQ==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.16.7"
+    "@babel/helper-string-parser" "^7.24.8"
+    "@babel/helper-validator-identifier" "^7.24.7"
     to-fast-properties "^2.0.0"
 
 "@bcoe/v8-coverage@^0.2.3":
@@ -490,61 +542,157 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@cnakazawa/watch@^1.0.3":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a"
-  integrity sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==
-  dependencies:
-    exec-sh "^0.3.2"
-    minimist "^1.2.0"
+"@discoveryjs/json-ext@0.5.7":
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
+  integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==
 
-"@develar/schema-utils@~2.6.5":
-  version "2.6.5"
-  resolved "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.6.5.tgz#3ece22c5838402419a6e0425f85742b961d9b6c6"
-  integrity sha512-0cp4PsWQ/9avqTVMCtZ+GirikIA36ikvjtHweU4/j8yLtgObI0+JUPhYFScgwlteveGB1rt3Cm8UhN04XayDig==
+"@electron/asar@^3.2.1":
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.4.tgz#7e8635a3c4f6d8b3f8ae6efaf5ecb9fbf3bd9864"
+  integrity sha512-lykfY3TJRRWFeTxccEKdf1I6BLl2Plw81H0bbp4Fc5iEc67foDCa5pjJQULVgo0wF+Dli75f3xVcdb/67FFZ/g==
   dependencies:
-    ajv "^6.12.0"
-    ajv-keywords "^3.4.1"
+    chromium-pickle-js "^0.2.0"
+    commander "^5.0.0"
+    glob "^7.1.6"
+    minimatch "^3.0.4"
 
-"@electron/get@^1.13.0":
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.13.1.tgz#42a0aa62fd1189638bd966e23effaebb16108368"
-  integrity sha512-U5vkXDZ9DwXtkPqlB45tfYnnYBN8PePp1z/XDCupnSpdrxT8/ThCv9WCwPLf9oqiSGZTkH6dx2jDUPuoXpjkcA==
+"@electron/get@^2.0.0":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@electron/get/-/get-2.0.2.tgz#ae2a967b22075e9c25aaf00d5941cd79c21efd7e"
+  integrity sha512-eFZVFoRXb3GFGd7Ak7W4+6jBl9wBtiZ4AaYOse97ej6mKj5tkyO0dUnUChs1IhJZtx1BENo4/p4WUTXpi6vT+g==
   dependencies:
     debug "^4.1.1"
     env-paths "^2.2.0"
     fs-extra "^8.1.0"
-    got "^9.6.0"
+    got "^11.8.5"
     progress "^2.0.3"
     semver "^6.2.0"
     sumchecker "^3.0.1"
   optionalDependencies:
     global-agent "^3.0.0"
-    global-tunnel-ng "^2.7.1"
 
-"@electron/get@^1.6.0":
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.7.1.tgz#41aa60871b9d7e225bbe68135012f88a9ef87012"
-  integrity sha512-+BOIzkmYbe+oOBGqSByq8zXYXCFztccoymR3uNkvX5ckJ/5xU+4peVyEvFyH6+zfv58hCo99RxgIpwuaMfRtRg==
+"@electron/notarize@^1.2.3":
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-1.2.3.tgz#38056a629e5a0b5fd56c975c4828c0f74285b644"
+  integrity sha512-9oRzT56rKh5bspk3KpAVF8lPKHYQrBnRwcgiOeR0hdilVEQmszDaAu0IPCPrwwzJN0ugNs0rRboTreHMt/6mBQ==
   dependencies:
     debug "^4.1.1"
-    env-paths "^2.2.0"
-    fs-extra "^8.1.0"
-    got "^9.6.0"
-    sanitize-filename "^1.6.2"
-    sumchecker "^3.0.0"
-  optionalDependencies:
-    global-agent "^2.0.2"
-    global-tunnel-ng "^2.7.1"
+    fs-extra "^9.0.1"
+
+"@electron/osx-sign@^1.0.1":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@electron/osx-sign/-/osx-sign-1.0.4.tgz#8e91442846471636ca0469426a82b253b9170151"
+  integrity sha512-xfhdEcIOfAZg7scZ9RQPya1G1lWo8/zMCwUXAulq0SfY7ONIW+b9qGyKdMyuMctNYwllrIS+vmxfijSfjeh97g==
+  dependencies:
+    compare-version "^0.1.2"
+    debug "^4.3.4"
+    fs-extra "^10.0.0"
+    isbinaryfile "^4.0.8"
+    minimist "^1.2.6"
+    plist "^3.0.5"
+
+"@electron/universal@^1.3.2":
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.3.4.tgz#bccd94b635d7c85eeed5eabba457eb4ed2be2777"
+  integrity sha512-BdhBgm2ZBnYyYRLRgOjM5VHkyFItsbggJ0MHycOjKWdFGYwK97ZFXH54dTvUWEfha81vfvwr5On6XBjt99uDcg==
+  dependencies:
+    "@electron/asar" "^3.2.1"
+    "@malept/cross-spawn-promise" "^1.1.0"
+    debug "^4.3.1"
+    dir-compare "^3.0.0"
+    fs-extra "^9.0.1"
+    minimatch "^3.0.4"
+    plist "^3.0.4"
+
+"@es-joy/jsdoccomment@~0.37.1":
+  version "0.37.1"
+  resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.37.1.tgz#fa32a41ba12097452693343e09ad4d26d157aedd"
+  integrity sha512-5vxWJ1gEkEF0yRd0O+uK6dHJf7adrxwQSX8PuRiPfFSAbNLnY0ZJfXaZucoz14Jj2N11xn2DnlEPwWRpYpvRjg==
+  dependencies:
+    comment-parser "1.3.1"
+    esquery "^1.5.0"
+    jsdoc-type-pratt-parser "~4.0.0"
+
+"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
+  integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==
+  dependencies:
+    eslint-visitor-keys "^3.3.0"
+
+"@eslint-community/regexpp@^4.5.1":
+  version "4.8.2"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.8.2.tgz#26585b7c0ba36362893d3a3c206ee0c57c389616"
+  integrity sha512-0MGxAVt1m/ZK+LTJp/j0qF7Hz97D9O/FH9Ms3ltnyIdDD57cbb1ACIQTkbHvNXtWDv5TPq7w5Kq56+cNukbo7g==
+
+"@eslint-community/regexpp@^4.6.1":
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63"
+  integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==
+
+"@eslint/eslintrc@^2.1.4":
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad"
+  integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==
+  dependencies:
+    ajv "^6.12.4"
+    debug "^4.3.2"
+    espree "^9.6.0"
+    globals "^13.19.0"
+    ignore "^5.2.0"
+    import-fresh "^3.2.1"
+    js-yaml "^4.1.0"
+    minimatch "^3.1.2"
+    strip-json-comments "^3.1.1"
+
+"@eslint/js@8.55.0":
+  version "8.55.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.55.0.tgz#b721d52060f369aa259cf97392403cb9ce892ec6"
+  integrity sha512-qQfo2mxH5yVom1kacMtZZJFVdW+E70mqHMJvVg6WTLo+VBuQJ4TojZlfWBjK0ve5BdEeNAVxOsl/nvNMpJOaJA==
+
+"@github/browserslist-config@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@github/browserslist-config/-/browserslist-config-1.0.0.tgz#952fe6da3e6b8ed6a368f3a1a08a9d2ef84e8d04"
+  integrity sha512-gIhjdJp/c2beaIWWIlsXdqXVRUz3r2BxBCpfz/F3JXHvSAQ1paMYjLH+maEATtENg+k5eLV7gA+9yPp762ieuw==
+
+"@github/markdownlint-github@^0.1.0":
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/@github/markdownlint-github/-/markdownlint-github-0.1.0.tgz#f4f535215bbc6bde348f96fd1c155d8a1f5f5ccc"
+  integrity sha512-TPmCJ1Z+YpXvU8JDFoHlri+kPbLY7xO/641JBX0prJNqrc1k5XEjUwn/e6svKsbheKldI0s21GNG7hkyaA++2g==
+  dependencies:
+    lodash "^4.17.15"
+
+"@humanwhocodes/config-array@^0.11.13":
+  version "0.11.13"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.13.tgz#075dc9684f40a531d9b26b0822153c1e832ee297"
+  integrity sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==
+  dependencies:
+    "@humanwhocodes/object-schema" "^2.0.1"
+    debug "^4.1.1"
+    minimatch "^3.0.5"
+
+"@humanwhocodes/module-importer@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
+  integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
+
+"@humanwhocodes/object-schema@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz#e5211452df060fa8522b55c7b3c0c4d1981cb044"
+  integrity sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==
 
-"@es-joy/jsdoccomment@~0.18.0":
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.18.0.tgz#2532b2ecb8576d694011b157c447ed6b12534c70"
-  integrity sha512-TjT8KJULV4I6ZiwIoKr6eMs+XpRejqwJ/VA+QPDeFGe9j6bZFKmMJ81EeFsGm6JNZhnzm37aoxVROmTh2PZoyA==
+"@isaacs/cliui@^8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
+  integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==
   dependencies:
-    comment-parser "1.3.0"
-    esquery "^1.4.0"
-    jsdoc-type-pratt-parser "~2.2.2"
+    string-width "^5.1.2"
+    string-width-cjs "npm:string-width@^4.2.0"
+    strip-ansi "^7.0.1"
+    strip-ansi-cjs "npm:strip-ansi@^6.0.1"
+    wrap-ansi "^8.1.0"
+    wrap-ansi-cjs "npm:wrap-ansi@^7.0.0"
 
 "@istanbuljs/load-nyc-config@^1.0.0":
   version "1.1.0"
@@ -562,222 +710,252 @@
   resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd"
   integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==
 
-"@jest/console@^24.7.1":
-  version "24.7.1"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.7.1.tgz#32a9e42535a97aedfe037e725bd67e954b459545"
-  integrity sha512-iNhtIy2M8bXlAOULWVTUxmnelTLFneTNEkHCgPmgd+zNwy9zVddJ6oS5rZ9iwoscNdT5mMwUd0C51v/fSlzItg==
+"@jest/console@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-29.7.0.tgz#cd4822dbdb84529265c5a2bdb529a3c9cc950ffc"
+  integrity sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==
   dependencies:
-    "@jest/source-map" "^24.3.0"
-    chalk "^2.0.1"
-    slash "^2.0.0"
-
-"@jest/console@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.6.2.tgz#4e04bc464014358b03ab4937805ee36a0aeb98f2"
-  integrity sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g==
-  dependencies:
-    "@jest/types" "^26.6.2"
+    "@jest/types" "^29.6.3"
     "@types/node" "*"
     chalk "^4.0.0"
-    jest-message-util "^26.6.2"
-    jest-util "^26.6.2"
+    jest-message-util "^29.7.0"
+    jest-util "^29.7.0"
     slash "^3.0.0"
 
-"@jest/core@^26.6.3":
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.6.3.tgz#7639fcb3833d748a4656ada54bde193051e45fad"
-  integrity sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw==
+"@jest/core@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-29.7.0.tgz#b6cccc239f30ff36609658c5a5e2291757ce448f"
+  integrity sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==
   dependencies:
-    "@jest/console" "^26.6.2"
-    "@jest/reporters" "^26.6.2"
-    "@jest/test-result" "^26.6.2"
-    "@jest/transform" "^26.6.2"
-    "@jest/types" "^26.6.2"
+    "@jest/console" "^29.7.0"
+    "@jest/reporters" "^29.7.0"
+    "@jest/test-result" "^29.7.0"
+    "@jest/transform" "^29.7.0"
+    "@jest/types" "^29.6.3"
     "@types/node" "*"
     ansi-escapes "^4.2.1"
     chalk "^4.0.0"
+    ci-info "^3.2.0"
     exit "^0.1.2"
-    graceful-fs "^4.2.4"
-    jest-changed-files "^26.6.2"
-    jest-config "^26.6.3"
-    jest-haste-map "^26.6.2"
-    jest-message-util "^26.6.2"
-    jest-regex-util "^26.0.0"
-    jest-resolve "^26.6.2"
-    jest-resolve-dependencies "^26.6.3"
-    jest-runner "^26.6.3"
-    jest-runtime "^26.6.3"
-    jest-snapshot "^26.6.2"
-    jest-util "^26.6.2"
-    jest-validate "^26.6.2"
-    jest-watcher "^26.6.2"
-    micromatch "^4.0.2"
-    p-each-series "^2.1.0"
-    rimraf "^3.0.0"
+    graceful-fs "^4.2.9"
+    jest-changed-files "^29.7.0"
+    jest-config "^29.7.0"
+    jest-haste-map "^29.7.0"
+    jest-message-util "^29.7.0"
+    jest-regex-util "^29.6.3"
+    jest-resolve "^29.7.0"
+    jest-resolve-dependencies "^29.7.0"
+    jest-runner "^29.7.0"
+    jest-runtime "^29.7.0"
+    jest-snapshot "^29.7.0"
+    jest-util "^29.7.0"
+    jest-validate "^29.7.0"
+    jest-watcher "^29.7.0"
+    micromatch "^4.0.4"
+    pretty-format "^29.7.0"
     slash "^3.0.0"
     strip-ansi "^6.0.0"
 
-"@jest/environment@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.6.2.tgz#ba364cc72e221e79cc8f0a99555bf5d7577cf92c"
-  integrity sha512-nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA==
+"@jest/environment@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.7.0.tgz#24d61f54ff1f786f3cd4073b4b94416383baf2a7"
+  integrity sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==
   dependencies:
-    "@jest/fake-timers" "^26.6.2"
-    "@jest/types" "^26.6.2"
+    "@jest/fake-timers" "^29.7.0"
+    "@jest/types" "^29.6.3"
     "@types/node" "*"
-    jest-mock "^26.6.2"
+    jest-mock "^29.7.0"
+
+"@jest/expect-utils@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.7.0.tgz#023efe5d26a8a70f21677d0a1afc0f0a44e3a1c6"
+  integrity sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==
+  dependencies:
+    jest-get-type "^29.6.3"
+
+"@jest/expect@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-29.7.0.tgz#76a3edb0cb753b70dfbfe23283510d3d45432bf2"
+  integrity sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==
+  dependencies:
+    expect "^29.7.0"
+    jest-snapshot "^29.7.0"
 
-"@jest/fake-timers@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.6.2.tgz#459c329bcf70cee4af4d7e3f3e67848123535aad"
-  integrity sha512-14Uleatt7jdzefLPYM3KLcnUl1ZNikaKq34enpb5XG9i81JpppDb5muZvonvKyrl7ftEHkKS5L5/eB/kxJ+bvA==
+"@jest/fake-timers@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.7.0.tgz#fd91bf1fffb16d7d0d24a426ab1a47a49881a565"
+  integrity sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==
   dependencies:
-    "@jest/types" "^26.6.2"
-    "@sinonjs/fake-timers" "^6.0.1"
+    "@jest/types" "^29.6.3"
+    "@sinonjs/fake-timers" "^10.0.2"
     "@types/node" "*"
-    jest-message-util "^26.6.2"
-    jest-mock "^26.6.2"
-    jest-util "^26.6.2"
+    jest-message-util "^29.7.0"
+    jest-mock "^29.7.0"
+    jest-util "^29.7.0"
 
-"@jest/globals@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.6.2.tgz#5b613b78a1aa2655ae908eba638cc96a20df720a"
-  integrity sha512-85Ltnm7HlB/KesBUuALwQ68YTU72w9H2xW9FjZ1eL1U3lhtefjjl5c2MiUbpXt/i6LaPRvoOFJ22yCBSfQ0JIA==
+"@jest/globals@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-29.7.0.tgz#8d9290f9ec47ff772607fa864ca1d5a2efae1d4d"
+  integrity sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==
   dependencies:
-    "@jest/environment" "^26.6.2"
-    "@jest/types" "^26.6.2"
-    expect "^26.6.2"
+    "@jest/environment" "^29.7.0"
+    "@jest/expect" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    jest-mock "^29.7.0"
 
-"@jest/reporters@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.6.2.tgz#1f518b99637a5f18307bd3ecf9275f6882a667f6"
-  integrity sha512-h2bW53APG4HvkOnVMo8q3QXa6pcaNt1HkwVsOPMBV6LD/q9oSpxNSYZQYkAnjdMjrJ86UuYeLo+aEZClV6opnw==
+"@jest/reporters@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-29.7.0.tgz#04b262ecb3b8faa83b0b3d321623972393e8f4c7"
+  integrity sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==
   dependencies:
     "@bcoe/v8-coverage" "^0.2.3"
-    "@jest/console" "^26.6.2"
-    "@jest/test-result" "^26.6.2"
-    "@jest/transform" "^26.6.2"
-    "@jest/types" "^26.6.2"
+    "@jest/console" "^29.7.0"
+    "@jest/test-result" "^29.7.0"
+    "@jest/transform" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    "@jridgewell/trace-mapping" "^0.3.18"
+    "@types/node" "*"
     chalk "^4.0.0"
     collect-v8-coverage "^1.0.0"
     exit "^0.1.2"
-    glob "^7.1.2"
-    graceful-fs "^4.2.4"
+    glob "^7.1.3"
+    graceful-fs "^4.2.9"
     istanbul-lib-coverage "^3.0.0"
-    istanbul-lib-instrument "^4.0.3"
+    istanbul-lib-instrument "^6.0.0"
     istanbul-lib-report "^3.0.0"
     istanbul-lib-source-maps "^4.0.0"
-    istanbul-reports "^3.0.2"
-    jest-haste-map "^26.6.2"
-    jest-resolve "^26.6.2"
-    jest-util "^26.6.2"
-    jest-worker "^26.6.2"
+    istanbul-reports "^3.1.3"
+    jest-message-util "^29.7.0"
+    jest-util "^29.7.0"
+    jest-worker "^29.7.0"
     slash "^3.0.0"
-    source-map "^0.6.0"
     string-length "^4.0.1"
-    terminal-link "^2.0.0"
-    v8-to-istanbul "^7.0.0"
-  optionalDependencies:
-    node-notifier "^8.0.0"
+    strip-ansi "^6.0.0"
+    v8-to-istanbul "^9.0.1"
 
-"@jest/source-map@^24.3.0":
-  version "24.3.0"
-  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-24.3.0.tgz#563be3aa4d224caf65ff77edc95cd1ca4da67f28"
-  integrity sha512-zALZt1t2ou8le/crCeeiRYzvdnTzaIlpOWaet45lNSqNJUnXbppUUFR4ZUAlzgDmKee4Q5P/tKXypI1RiHwgag==
+"@jest/schemas@^29.6.3":
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.6.3.tgz#430b5ce8a4e0044a7e3819663305a7b3091c8e03"
+  integrity sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==
   dependencies:
-    callsites "^3.0.0"
-    graceful-fs "^4.1.15"
-    source-map "^0.6.0"
+    "@sinclair/typebox" "^0.27.8"
 
-"@jest/source-map@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.6.2.tgz#29af5e1e2e324cafccc936f218309f54ab69d535"
-  integrity sha512-YwYcCwAnNmOVsZ8mr3GfnzdXDAl4LaenZP5z+G0c8bzC9/dugL8zRmxZzdoTl4IaS3CryS1uWnROLPFmb6lVvA==
+"@jest/source-map@^29.6.3":
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-29.6.3.tgz#d90ba772095cf37a34a5eb9413f1b562a08554c4"
+  integrity sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==
   dependencies:
+    "@jridgewell/trace-mapping" "^0.3.18"
     callsites "^3.0.0"
-    graceful-fs "^4.2.4"
-    source-map "^0.6.0"
+    graceful-fs "^4.2.9"
 
-"@jest/test-result@^24.8.0":
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-24.8.0.tgz#7675d0aaf9d2484caa65e048d9b467d160f8e9d3"
-  integrity sha512-+YdLlxwizlfqkFDh7Mc7ONPQAhA4YylU1s529vVM1rsf67vGZH/2GGm5uO8QzPeVyaVMobCQ7FTxl38QrKRlng==
+"@jest/test-result@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-29.7.0.tgz#8db9a80aa1a097bb2262572686734baed9b1657c"
+  integrity sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==
   dependencies:
-    "@jest/console" "^24.7.1"
-    "@jest/types" "^24.8.0"
+    "@jest/console" "^29.7.0"
+    "@jest/types" "^29.6.3"
     "@types/istanbul-lib-coverage" "^2.0.0"
+    collect-v8-coverage "^1.0.0"
 
-"@jest/test-result@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.6.2.tgz#55da58b62df134576cc95476efa5f7949e3f5f18"
-  integrity sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ==
+"@jest/test-sequencer@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz#6cef977ce1d39834a3aea887a1726628a6f072ce"
+  integrity sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==
   dependencies:
-    "@jest/console" "^26.6.2"
-    "@jest/types" "^26.6.2"
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    collect-v8-coverage "^1.0.0"
+    "@jest/test-result" "^29.7.0"
+    graceful-fs "^4.2.9"
+    jest-haste-map "^29.7.0"
+    slash "^3.0.0"
 
-"@jest/test-sequencer@^26.6.3":
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz#98e8a45100863886d074205e8ffdc5a7eb582b17"
-  integrity sha512-YHlVIjP5nfEyjlrSr8t/YdNfU/1XEt7c5b4OxcXCjyRhjzLYu/rO69/WHPuYcbCWkz8kAeZVZp2N2+IOLLEPGw==
+"@jest/transform@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.7.0.tgz#df2dd9c346c7d7768b8a06639994640c642e284c"
+  integrity sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==
   dependencies:
-    "@jest/test-result" "^26.6.2"
-    graceful-fs "^4.2.4"
-    jest-haste-map "^26.6.2"
-    jest-runner "^26.6.3"
-    jest-runtime "^26.6.3"
-
-"@jest/transform@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.6.2.tgz#5ac57c5fa1ad17b2aae83e73e45813894dcf2e4b"
-  integrity sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA==
-  dependencies:
-    "@babel/core" "^7.1.0"
-    "@jest/types" "^26.6.2"
-    babel-plugin-istanbul "^6.0.0"
+    "@babel/core" "^7.11.6"
+    "@jest/types" "^29.6.3"
+    "@jridgewell/trace-mapping" "^0.3.18"
+    babel-plugin-istanbul "^6.1.1"
     chalk "^4.0.0"
-    convert-source-map "^1.4.0"
-    fast-json-stable-stringify "^2.0.0"
-    graceful-fs "^4.2.4"
-    jest-haste-map "^26.6.2"
-    jest-regex-util "^26.0.0"
-    jest-util "^26.6.2"
-    micromatch "^4.0.2"
-    pirates "^4.0.1"
+    convert-source-map "^2.0.0"
+    fast-json-stable-stringify "^2.1.0"
+    graceful-fs "^4.2.9"
+    jest-haste-map "^29.7.0"
+    jest-regex-util "^29.6.3"
+    jest-util "^29.7.0"
+    micromatch "^4.0.4"
+    pirates "^4.0.4"
     slash "^3.0.0"
-    source-map "^0.6.1"
-    write-file-atomic "^3.0.0"
+    write-file-atomic "^4.0.2"
 
-"@jest/types@^24.8.0":
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.8.0.tgz#f31e25948c58f0abd8c845ae26fcea1491dea7ad"
-  integrity sha512-g17UxVr2YfBtaMUxn9u/4+siG1ptg9IGYAYwvpwn61nBg779RXnjE/m7CxYcIzEt0AbHZZAHSEZNhkE2WxURVg==
+"@jest/types@^29.6.3":
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.6.3.tgz#1131f8cf634e7e84c5e77bab12f052af585fba59"
+  integrity sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==
   dependencies:
+    "@jest/schemas" "^29.6.3"
     "@types/istanbul-lib-coverage" "^2.0.0"
-    "@types/istanbul-reports" "^1.1.1"
-    "@types/yargs" "^12.0.9"
+    "@types/istanbul-reports" "^3.0.0"
+    "@types/node" "*"
+    "@types/yargs" "^17.0.8"
+    chalk "^4.0.0"
 
-"@jest/types@^25.5.0":
-  version "25.5.0"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.5.0.tgz#4d6a4793f7b9599fc3680877b856a97dbccf2a9d"
-  integrity sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==
+"@jridgewell/gen-mapping@^0.3.2", "@jridgewell/gen-mapping@^0.3.5":
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz#dcce6aff74bdf6dad1a95802b69b04a2fcb1fb36"
+  integrity sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==
   dependencies:
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    "@types/istanbul-reports" "^1.1.1"
-    "@types/yargs" "^15.0.0"
-    chalk "^3.0.0"
+    "@jridgewell/set-array" "^1.2.1"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+    "@jridgewell/trace-mapping" "^0.3.24"
+
+"@jridgewell/resolve-uri@^3.1.0":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6"
+  integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==
+
+"@jridgewell/set-array@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.2.1.tgz#558fb6472ed16a4c850b889530e6b36438c49280"
+  integrity sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==
 
-"@jest/types@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz#bef5a532030e1d88a2f5a6d933f84e97226ed48e"
-  integrity sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==
+"@jridgewell/source-map@^0.3.3":
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.6.tgz#9d71ca886e32502eb9362c9a74a46787c36df81a"
+  integrity sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==
   dependencies:
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    "@types/istanbul-reports" "^3.0.0"
-    "@types/node" "*"
-    "@types/yargs" "^15.0.0"
-    chalk "^4.0.0"
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.25"
+
+"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz#3188bcb273a414b0d215fd22a58540b989b9409a"
+  integrity sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==
+
+"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.18":
+  version "0.3.20"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz#72e45707cf240fa6b081d0366f8265b0cd10197f"
+  integrity sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.1.0"
+    "@jridgewell/sourcemap-codec" "^1.4.14"
+
+"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.20", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25":
+  version "0.3.25"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0"
+  integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.1.0"
+    "@jridgewell/sourcemap-codec" "^1.4.14"
+
+"@malept/cross-spawn-promise@^1.1.0":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz#504af200af6b98e198bce768bc1730c6936ae01d"
+  integrity sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ==
+  dependencies:
+    cross-spawn "^7.0.1"
 
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
@@ -792,7 +970,7 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
   integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
 
-"@nodelib/fs.walk@^1.2.3":
+"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
   integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
@@ -800,51 +978,78 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@polka/url@^1.0.0-next.20":
-  version "1.0.0-next.21"
-  resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1"
-  integrity sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==
+"@pkgjs/parseargs@^0.11.0":
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
+  integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
+
+"@pkgr/utils@^2.3.1":
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/@pkgr/utils/-/utils-2.4.2.tgz#9e638bbe9a6a6f165580dc943f138fd3309a2cbc"
+  integrity sha512-POgTXhjrTfbTV63DiFXav4lBHiICLKKwDeaKn9Nphwj7WH6m0hMMCaJkMyRWjgtPFyRKRVoMXXjczsTQRDEhYw==
+  dependencies:
+    cross-spawn "^7.0.3"
+    fast-glob "^3.3.0"
+    is-glob "^4.0.3"
+    open "^9.1.0"
+    picocolors "^1.0.0"
+    tslib "^2.6.0"
+
+"@polka/url@^1.0.0-next.24":
+  version "1.0.0-next.25"
+  resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.25.tgz#f077fdc0b5d0078d30893396ff4827a13f99e817"
+  integrity sha512-j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ==
 
-"@primer/octicons@^10.0.0":
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/@primer/octicons/-/octicons-10.0.0.tgz#81e94ed32545dfd3472c8625a5b345f3ea4c153d"
-  integrity sha512-iuQubq62zXZjPmaqrsfsCZUqIJgZhmA6W0tKzIKGRbkoLnff4TFFCL87hfIRATZ5qZPM4m8ioT8/bXI7WVa9WQ==
+"@primer/octicons@^19.0.0":
+  version "19.8.0"
+  resolved "https://registry.yarnpkg.com/@primer/octicons/-/octicons-19.8.0.tgz#67cad2f55cd1c6e5ccae2670b9c1f595321995d1"
+  integrity sha512-Imze/fyW41Io5fN+27T5EAeXJrgBjMbz6nzU+wYbRylXvIAjLPUvaJPVoStiFlgSU+TjTUJqg5A9rgMDzTyMCg==
   dependencies:
     object-assign "^4.1.1"
 
-"@sindresorhus/is@^0.14.0":
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
-  integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
+"@sinclair/typebox@^0.27.8":
+  version "0.27.8"
+  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.8.tgz#6667fac16c436b5434a387a34dedb013198f6e6e"
+  integrity sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==
+
+"@sindresorhus/is@^4.0.0":
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f"
+  integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==
 
-"@sinonjs/commons@^1.7.0":
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.1.tgz#e7df00f98a203324f6dc7cc606cad9d4a8ab2217"
-  integrity sha512-892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw==
+"@sinonjs/commons@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-3.0.0.tgz#beb434fe875d965265e04722ccfc21df7f755d72"
+  integrity sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA==
   dependencies:
     type-detect "4.0.8"
 
-"@sinonjs/fake-timers@^6.0.1":
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz#293674fccb3262ac782c7aadfdeca86b10c75c40"
-  integrity sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==
+"@sinonjs/fake-timers@^10.0.2":
+  version "10.3.0"
+  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz#55fdff1ecab9f354019129daf4df0dd4d923ea66"
+  integrity sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==
   dependencies:
-    "@sinonjs/commons" "^1.7.0"
+    "@sinonjs/commons" "^3.0.0"
 
-"@szmarczak/http-timer@^1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"
-  integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==
+"@szmarczak/http-timer@^4.0.5":
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz#b4a914bb62e7c272d4e5989fe4440f812ab1d807"
+  integrity sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==
   dependencies:
-    defer-to-connect "^1.0.1"
+    defer-to-connect "^2.0.0"
+
+"@tootallnate/once@2":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
+  integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
 
-"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7":
-  version "7.1.12"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.12.tgz#4d8e9e51eb265552a7e4f1ff2219ab6133bdfb2d"
-  integrity sha512-wMTHiiTiBAAPebqaPiPDLFA4LYPKr6Ph0Xq/6rq1Ur3v66HXyG+clfR9CNETkD7MQS8ZHvpQOtA53DLws5WAEQ==
+"@types/babel__core@^7.1.14":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.5.tgz#3df15f27ba85319caa07ba08d0721889bb39c017"
+  integrity sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==
   dependencies:
-    "@babel/parser" "^7.1.0"
-    "@babel/types" "^7.0.0"
+    "@babel/parser" "^7.20.7"
+    "@babel/types" "^7.20.7"
     "@types/babel__generator" "*"
     "@types/babel__template" "*"
     "@types/babel__traverse" "*"
@@ -864,7 +1069,7 @@
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
 
-"@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6":
+"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
   version "7.0.16"
   resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.16.tgz#0bbbf70c7bc4193210dd27e252c51260a37cd6a7"
   integrity sha512-S63Dt4CZOkuTmpLGGWtT/mQdVORJOpx6SZWGVaP56dda/0Nx5nEe82K7/LAm8zYr6SfMq+1N2OreIOrHAx656w==
@@ -886,15 +1091,25 @@
   dependencies:
     "@types/node" "*"
 
+"@types/cacheable-request@^6.0.1":
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.3.tgz#a430b3260466ca7b5ca5bfd735693b36e7a9d183"
+  integrity sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==
+  dependencies:
+    "@types/http-cache-semantics" "*"
+    "@types/keyv" "^3.1.4"
+    "@types/node" "*"
+    "@types/responselike" "^1.0.0"
+
 "@types/classnames@^2.2.2":
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/@types/classnames/-/classnames-2.2.3.tgz#3f0ff6873da793870e20a260cada55982f38a9e5"
   integrity sha512-x15/Io+JdzrkM9gnX6SWUs/EmqQzd65TD9tcZIAQ1VIdb93XErNuYmB7Yho8JUCE189ipUSESsWvGvYXRRIvYA==
 
-"@types/codemirror@5.60.4":
-  version "5.60.4"
-  resolved "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-5.60.4.tgz#aa19477782fb1bd26f8a0e240ca4241f35c4170e"
-  integrity sha512-SUQgBj9jZ+xj75zgwfgQZt0CManWBISN/YsE0xRmPwO6uDyLNpXO8bn2m59tpevsFw+eQdmx+qY1WjOrUgMDgw==
+"@types/codemirror@^5.60.15":
+  version "5.60.15"
+  resolved "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-5.60.15.tgz#0f82be6f4126d1e59cf4c4830e56dcd49d3c3e8a"
+  integrity sha512-dTOvwEQ+ouKJ/rE9LT1Ue2hmP6H1mZv5+CCnNWu2qtiOe2LQa9lCprEY20HxiDmV/Bxh+dXjywmy5aKvoGjULA==
   dependencies:
     "@types/tern" "*"
 
@@ -904,17 +1119,12 @@
   integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
 
 "@types/connect@*":
-  version "3.4.31"
-  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.31.tgz#1f92d6b117ecc05076c49ecd024f7976e528bad9"
-  integrity sha512-OPSxsP6XqA3984KWDUXq/u05Hu8VWa/2rUVlw/aDUOx87BptIep6xb3NdCxCpKLfLdjZcCE5jR+gouTul3gjdA==
+  version "3.4.38"
+  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.38.tgz#5ba7f3bc4fbbdeaff8dded952e5ff2cc53f8d858"
+  integrity sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==
   dependencies:
     "@types/node" "*"
 
-"@types/debug@^4.1.5":
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.5.tgz#b14efa8852b7768d898906613c23f688713e02cd"
-  integrity sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ==
-
 "@types/deep-equal@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@types/deep-equal/-/deep-equal-1.0.1.tgz#71cfabb247c22bcc16d536111f50c0ed12476b03"
@@ -934,15 +1144,7 @@
   dependencies:
     electron-winstaller "*"
 
-"@types/eslint-scope@^3.7.0":
-  version "3.7.3"
-  resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.3.tgz#125b88504b61e3c8bc6f870882003253005c3224"
-  integrity sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==
-  dependencies:
-    "@types/eslint" "*"
-    "@types/estree" "*"
-
-"@types/eslint@*", "@types/eslint@^8.4.1":
+"@types/eslint@^8.4.1":
   version "8.4.1"
   resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.1.tgz#c48251553e8759db9e656de3efc846954ac32304"
   integrity sha512-GE44+DNEyxxh2Kc6ro/VkIj+9ma0pO0bwv9+uHSyBrikYOHr8zYcdPvnBOp1aw8s+CjRvuSx7CyWqRrNFQ59mA==
@@ -950,16 +1152,16 @@
     "@types/estree" "*"
     "@types/json-schema" "*"
 
-"@types/estree@*", "@types/estree@^0.0.49":
+"@types/estree@*", "@types/estree@^1.0.5":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
+  integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
+
+"@types/estree@^0.0.49":
   version "0.0.49"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.49.tgz#3facb98ebcd4114a4ecef74e0de2175b56fd4464"
   integrity sha512-K1AFuMe8a+pXmfHTtnwBvqoEylNKVeaiKYkjmcEAdytMQVJ/i9Fu7sc13GxgXdO49gkE7Hy8SyJonUZUn+eVaw==
 
-"@types/estree@^0.0.50":
-  version "0.0.50"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83"
-  integrity sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==
-
 "@types/event-kit@^2.4.1":
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/@types/event-kit/-/event-kit-2.4.1.tgz#cc00a9b80bae9a387ea60d5c9031b5eb490cfa34"
@@ -1000,13 +1202,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/fs-extra@^9.0.1":
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.1.tgz#91c8fc4c51f6d5dbe44c2ca9ab09310bd00c7918"
-  integrity sha512-B42Sxuaz09MhC3DDeW5kubRcQ5by4iuVQ0cRRWM2lggLzAa/KVom0Aft/208NgMvNQQZ86s5rVcqDdn/SH0/mg==
-  dependencies:
-    "@types/node" "*"
-
 "@types/fuzzaldrin-plus@^0.0.1":
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/@types/fuzzaldrin-plus/-/fuzzaldrin-plus-0.0.1.tgz#bfe5e25bc5b4066848171baf7a8aaf30e267d30a"
@@ -1021,18 +1216,10 @@
     "@types/minimatch" "*"
     "@types/node" "*"
 
-"@types/glob@^7.1.1":
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183"
-  integrity sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==
-  dependencies:
-    "@types/minimatch" "*"
-    "@types/node" "*"
-
-"@types/graceful-fs@^4.1.2":
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.4.tgz#4ff9f641a7c6d1a3508ff88bc3141b152772e753"
-  integrity sha512-mWA/4zFQhfvOA8zWkXobwJvBD7vzcxgrOQ0J5CH1votGqdq9m7+FwtGaqyCZqC3NyyBkc9z4m+iry4LlqcMWJg==
+"@types/graceful-fs@^4.1.3":
+  version "4.1.9"
+  resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.9.tgz#2a06bc0f68a20ab37b3e36aa238be6abdf49e8b4"
+  integrity sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==
   dependencies:
     "@types/node" "*"
 
@@ -1041,6 +1228,11 @@
   resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz#4fc33a00c1d0c16987b1a20cf92d20614c55ac35"
   integrity sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==
 
+"@types/http-cache-semantics@*":
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812"
+  integrity sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==
+
 "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff"
@@ -1058,14 +1250,6 @@
   dependencies:
     "@types/istanbul-lib-coverage" "*"
 
-"@types/istanbul-reports@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz#7a8cbf6a406f36c8add871625b278eaf0b0d255a"
-  integrity sha512-UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA==
-  dependencies:
-    "@types/istanbul-lib-coverage" "*"
-    "@types/istanbul-lib-report" "*"
-
 "@types/istanbul-reports@^3.0.0":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz#508b13aa344fa4976234e75dddcc34925737d821"
@@ -1073,30 +1257,34 @@
   dependencies:
     "@types/istanbul-lib-report" "*"
 
-"@types/jest@26.x":
-  version "26.0.15"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.15.tgz#12e02c0372ad0548e07b9f4e19132b834cb1effe"
-  integrity sha512-s2VMReFXRg9XXxV+CW9e5Nz8fH2K1aEhwgjUqPPbQd7g95T0laAcvLv032EhFHIa5GHsZ8W7iJEQVaJq6k3Gog==
+"@types/jest@^29.5.10":
+  version "29.5.10"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.10.tgz#a10fc5bab9e426081c12b2ef73d24d4f0c9b7f50"
+  integrity sha512-tE4yxKEphEyxj9s4inideLHktW/x6DwesIwWZ9NN1FKf9zbJYsnhBoA9vrHA/IuIOKwPa5PcFBNV4lpMIOEzyQ==
   dependencies:
-    jest-diff "^26.0.0"
-    pretty-format "^26.0.0"
+    expect "^29.0.0"
+    pretty-format "^29.0.0"
 
-"@types/jest@^23.3.1":
-  version "23.3.1"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-23.3.1.tgz#a4319aedb071d478e6f407d1c4578ec8156829cf"
-  integrity sha512-/UMY+2GkOZ27Vrc51pqC5J8SPd39FKt7kkoGAtWJ8s4msj0b15KehDWIiJpWY3/7tLxBQLLzJhIBhnEsXdzpgw==
+"@types/jsdom@^20.0.0":
+  version "20.0.1"
+  resolved "https://registry.yarnpkg.com/@types/jsdom/-/jsdom-20.0.1.tgz#07c14bc19bd2f918c1929541cdaacae894744808"
+  integrity sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ==
+  dependencies:
+    "@types/node" "*"
+    "@types/tough-cookie" "*"
+    parse5 "^7.0.0"
 
-"@types/json-schema@*":
-  version "7.0.7"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad"
-  integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==
+"@types/json-schema@*", "@types/json-schema@^7.0.8":
+  version "7.0.15"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
+  integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
 
-"@types/json-schema@^7.0.6":
-  version "7.0.6"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0"
-  integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==
+"@types/json-schema@^7.0.12":
+  version "7.0.13"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.13.tgz#02c24f4363176d2d18fc8b70b9f3c54aba178a85"
+  integrity sha512-RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ==
 
-"@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
+"@types/json-schema@^7.0.9":
   version "7.0.9"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
   integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==
@@ -1106,6 +1294,13 @@
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
   integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
 
+"@types/keyv@^3.1.4":
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz#3ccdb1c6751b0c7e52300bcdacd5bcbf8faa75b6"
+  integrity sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==
+  dependencies:
+    "@types/node" "*"
+
 "@types/klaw-sync@^6.0.0":
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/@types/klaw-sync/-/klaw-sync-6.0.0.tgz#ff0b36601efaaa109d513c4ced109311fd06ba36"
@@ -1143,30 +1338,41 @@
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
   integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
+"@types/minimist@^1.2.5":
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.5.tgz#ec10755e871497bcd83efe927e43ec46e8c0747e"
+  integrity sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==
+
 "@types/mri@^1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@types/mri/-/mri-1.1.0.tgz#66555e4d797713789ea0fefdae0898d8170bf5af"
   integrity sha512-fMl88ZoZXOB7VKazJ6wUMpZc9QIn+jcigSFRf2K/rrw4DcXn+/uGxlWX8DDlcE7JkwgIZ7BDH+JgxZPlc/Ap3g==
 
 "@types/node@*":
-  version "12.12.24"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.24.tgz#d4606afd8cf6c609036b854360367d1b2c78931f"
-  integrity sha512-1Ciqv9pqwVtW6FsIUKSZNB82E5Cu1I2bBTj1xuIHXLe/1zYLl3956Nbhg2MzSYHVfl9/rmanjbQIb7LibfCnug==
+  version "22.5.1"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.5.1.tgz#de01dce265f6b99ed32b295962045d10b5b99560"
+  integrity sha512-KkHsxej0j9IW1KKOOAA/XBA0z08UFSrRQHErzEfA3Vgq57eXIMYboIlHJuYIfd+lwCQjtKqUu3UnmKbtUc9yRw==
+  dependencies:
+    undici-types "~6.19.2"
 
-"@types/node@16.11.11":
-  version "16.11.11"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.11.tgz#6ea7342dfb379ea1210835bada87b3c512120234"
-  integrity sha512-KB0sixD67CeecHC33MYn+eYARkqTheIRNuu97y2XMjR7Wu3XibO1vaY6VBV6O/a89SPI81cEUIYT87UqUWlZNw==
+"@types/node@22.7.4":
+  version "22.7.4"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.7.4.tgz#e35d6f48dca3255ce44256ddc05dee1c23353fcc"
+  integrity sha512-y+NPi1rFzDs1NdQHHToqeiX2TIS79SWEAw9GYhkkx8bD0ChpfqC+n2j5OXOCpzfojBEBt6DnEnnG9MY0zk1XLg==
+  dependencies:
+    undici-types "~6.19.2"
 
-"@types/node@^14.6.2":
-  version "14.17.5"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.5.tgz#b59daf6a7ffa461b5648456ca59050ba8e40ed54"
-  integrity sha512-bjqH2cX/O33jXT/UmReo2pM7DIJREPMnarixbQ57DOOzzFaI6D2+IcwaJQaJpv0M1E9TIhPCYVxrkcityLjlqA==
+"@types/node@^20.9.0":
+  version "20.12.12"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.12.tgz#7cbecdf902085cec634fdb362172dfe12b8f2050"
+  integrity sha512-eWLDGF/FOSPtAvEqeRAQ4C8LSA7M1I7i0ky1I8U7kD1J5ITyW3AsRhQrKVoWf5pFKZ2kILsEGJhsI9r93PYnOw==
+  dependencies:
+    undici-types "~5.26.4"
 
-"@types/normalize-package-data@^2.4.0":
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
-  integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==
+"@types/parse-dds@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@types/parse-dds/-/parse-dds-1.0.3.tgz#a1bb00421906094510d88c64af978564d3c35c9b"
+  integrity sha512-LD9BruIpfP6Z9aAJ488h+PwtSwLzM0NO+Rs1l/zjcPLBTqR31OnIGmAvJYhGiHhbOn7R0YXw1gL5bImNiK6HNw==
 
 "@types/plist@^3.0.2":
   version "3.0.2"
@@ -1176,11 +1382,6 @@
     "@types/node" "*"
     xmlbuilder ">=11.0.1"
 
-"@types/prettier@^2.0.0":
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.1.5.tgz#b6ab3bba29e16b821d84e09ecfaded462b816b00"
-  integrity sha512-UEyp8LwZ4Dg30kVU2Q3amHHyTn1jEdhCIE59ANed76GaT1Vp76DD3ZWSAxgCrw6wJ0TqeoBpqmfUHiUDPs//HQ==
-
 "@types/prettier@^2.0.1":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.0.1.tgz#b6e98083f13faa1e5231bfa3bdb1b0feff536b6d"
@@ -1206,14 +1407,6 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react-color@^3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@types/react-color/-/react-color-3.0.4.tgz#c63daf012ad067ac0127bdd86725f079d02082bd"
-  integrity sha512-EswbYJDF1kkrx93/YU+BbBtb46CCtDMvTiGmcOa/c5PETnwTiSWoseJ1oSWeRl/4rUXkhME9bVURvvPg0W5YQw==
-  dependencies:
-    "@types/react" "*"
-    "@types/reactcss" "*"
-
 "@types/react-css-transition-replace@^2.1.3":
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/@types/react-css-transition-replace/-/react-css-transition-replace-2.1.3.tgz#d85923c3fe0522b7c90e96d94a8d5944716b246b"
@@ -1252,13 +1445,6 @@
     "@types/prop-types" "*"
     csstype "^2.2.0"
 
-"@types/reactcss@*":
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/@types/reactcss/-/reactcss-1.2.3.tgz#af28ae11bbb277978b99d04d1eedfd068ca71834"
-  integrity sha512-d2gQQ0IL6hXLnoRfVYZukQNWHuVsE75DzFTLPUuyyEhJS8G2VvlE+qfQQ91SJjaMqlURRCNIsX7Jcsw6cEuJlA==
-  dependencies:
-    "@types/react" "*"
-
 "@types/request@^2.0.9":
   version "2.0.9"
   resolved "https://registry.yarnpkg.com/@types/request/-/request-2.0.9.tgz#125b8a60d8a439e8d87e6d1335c61cccdc18343a"
@@ -1272,11 +1458,28 @@
   resolved "https://registry.yarnpkg.com/@types/reserved-words/-/reserved-words-0.1.0.tgz#a9d5318bb4ac4466862b93fc702542b75d2cd3ac"
   integrity sha512-ls6lSkkhEFm8XSVQjHj47pJoCL9sVK91mwIONw0Iwjqkmy98ForMFYa5+/vb6sytTaK0HSwkzKKYzREPTUhhhg==
 
+"@types/responselike@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29"
+  integrity sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==
+  dependencies:
+    "@types/node" "*"
+
 "@types/semver@^5.5.0":
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45"
   integrity sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ==
 
+"@types/semver@^7.3.12":
+  version "7.5.6"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.6.tgz#c65b2bfce1bec346582c07724e3f8c1017a20339"
+  integrity sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==
+
+"@types/semver@^7.5.0":
+  version "7.5.3"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.3.tgz#9a726e116beb26c24f1ccd6850201e1246122e04"
+  integrity sha512-OxepLK9EuNEIPxWNME+C6WwbRAOOI2o2BaQEGzz5Lu2e4Z5eDnEo+/aVEDMIXywoJitJ7xWd641wrGLZdtwRyw==
+
 "@types/serve-static@*":
   version "1.13.1"
   resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.1.tgz#1d2801fa635d274cd97d4ec07e26b21b44127492"
@@ -1285,6 +1488,11 @@
     "@types/express-serve-static-core" "*"
     "@types/mime" "*"
 
+"@types/setimmediate@^1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@types/setimmediate/-/setimmediate-1.0.4.tgz#c863c763c284ceaf8d31ec1b29362a889864da4f"
+  integrity sha512-rWPw1drMVf5zInxNpgH3nn/h6KkWqwgLT2y/ciAYQ16RAsbXOXe0AmtZ/HyzwPNw+r4GMJuI7IV7YNKO7Fs/xA==
+
 "@types/source-map-support@^0.5.2":
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/@types/source-map-support/-/source-map-support-0.5.2.tgz#35e7446d470e63ec3fff4d7eceee0bc40efad239"
@@ -1293,18 +1501,13 @@
     "@types/node" "*"
     source-map "^0.6.0"
 
-"@types/split2@^2.1.6":
-  version "2.1.6"
-  resolved "https://registry.yarnpkg.com/@types/split2/-/split2-2.1.6.tgz#b095c9e064853824b22c67993d99b066777402b1"
-  integrity sha512-ddaFSOMuy2Rp97l6q/LEteQygvTQJuEZ+SRhxFKR0uXGsdbFDqX/QF2xoGcOqLQ8XV91v01SnAv2vpgihNgW/Q==
+"@types/split2@^4.2.3":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/@types/split2/-/split2-4.2.3.tgz#ddd9b6b8518df6e0a7825851fcd98de12e415f0b"
+  integrity sha512-59OXIlfUsi2k++H6CHgUQKEb2HKRokUA39HY1i1dS8/AIcqVjtAAFdf8u+HxTWK/4FUHMJQlKSZ4I6irCBJ1Zw==
   dependencies:
     "@types/node" "*"
 
-"@types/stack-utils@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
-  integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==
-
 "@types/stack-utils@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz#7036640b4e21cc2f259ae826ce843d277dad8cff"
@@ -1339,6 +1542,11 @@
   resolved "https://registry.yarnpkg.com/@types/to-camel-case/-/to-camel-case-1.0.0.tgz#927ef0a7294d90b1835466c29b64b8ad2a32d8b5"
   integrity sha512-LXJOP0xvOUB4dKu+t7EVhSsM2NauLSZSOGkBS7Wqz3lWHIseCJnMDG+HrZHLFZQ39Fq3jr4RErJyQzfsoOlXSA==
 
+"@types/tough-cookie@*":
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.5.tgz#cb6e2a691b70cb177c6e3ae9c1d2e8b2ea8cd304"
+  integrity sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==
+
 "@types/triple-beam@^1.3.2":
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/@types/triple-beam/-/triple-beam-1.3.2.tgz#38ecb64f01aa0d02b7c8f4222d7c38af6316fef8"
@@ -1369,68 +1577,47 @@
   resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-3.4.9.tgz#fcf01997bbc9f7c09ae5f91383af076d466594e1"
   integrity sha512-XDwyIlt/47l2kWLTzw/mtrpLdB+GPSskR2n/PIcPn+VYhVO77rGhRncIR5GPU0KRzXuqkDO+J5qqrG0Y8P6jzQ==
 
-"@types/webpack-bundle-analyzer@^4.4.1":
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/@types/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.4.1.tgz#bcc2501be10c8cdd1d170bc6b7847b3321f20440"
-  integrity sha512-yQAj3l7bIYL+QRRlNJt6gyP+zrXZOlgaR4wsX0WY4yzZIbv41ZibREfZvuYjxY0iVtvQQlbhx0AeokkCuqUAQg==
+"@types/webgl2@^0.0.11":
+  version "0.0.11"
+  resolved "https://registry.yarnpkg.com/@types/webgl2/-/webgl2-0.0.11.tgz#a54d56775816c86725cc9fefdc3c90619eabce5a"
+  integrity sha512-LFa4je4lUbqDVRNeC2W1ZRM8dOgsGsm23MZO7m/EllCVg07yB65W3eUF4MAM+0LU9X6x/0NTrvXxAW0pmipNdw==
+
+"@types/webpack-bundle-analyzer@^4.7.0":
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/@types/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.7.0.tgz#fe199e724ce3d38705f6f1ba4d62429b7c360541"
+  integrity sha512-c5i2ThslSNSG8W891BRvOd/RoCjI2zwph8maD22b1adtSns20j+0azDDMCK06DiVrzTgnwiDl5Ntmu1YRJw8Sg==
   dependencies:
     "@types/node" "*"
     tapable "^2.2.0"
     webpack "^5"
 
-"@types/webpack-hot-middleware@^2.25.6":
-  version "2.25.6"
-  resolved "https://registry.yarnpkg.com/@types/webpack-hot-middleware/-/webpack-hot-middleware-2.25.6.tgz#4336abd668dc73284a777907cfd00147e794354a"
-  integrity sha512-1Q9ClNvZR30HIsEAHYQL3bXJK1K7IsrqjGMTfIureFjphsGOZ3TkbeoCupbCmi26pSLjVTPHp+pFrJNpOkBSVg==
+"@types/webpack-hot-middleware@^2.25.9":
+  version "2.25.9"
+  resolved "https://registry.yarnpkg.com/@types/webpack-hot-middleware/-/webpack-hot-middleware-2.25.9.tgz#df4dd45b999491cad8f0faa8fb551263104e1570"
+  integrity sha512-fad4T9VfocBjS2fZxlqkGoXoVUAjVp0EEnKBRqPwnhEEDN/FqJoFkSP5t9O1gPH75qsyG2kkT/GSUqSNTn1ZPg==
   dependencies:
     "@types/connect" "*"
     tapable "^2.2.0"
     webpack "^5"
 
-"@types/webpack-merge@^5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@types/webpack-merge/-/webpack-merge-5.0.0.tgz#818a13948c1642bde7e2f4f079335a5f85365699"
-  integrity sha512-CFedsXD/7vmJ66PaC3eavdqqNZujWlvdkGFcizi0QPtDswK75DV7a5GTKzL9Ev6d0okLurq+ebQjwIEFmP9aZw==
-  dependencies:
-    webpack-merge "*"
-
-"@types/webpack@^5.28.0":
-  version "5.28.0"
-  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-5.28.0.tgz#78dde06212f038d77e54116cfe69e88ae9ed2c03"
-  integrity sha512-8cP0CzcxUiFuA9xGJkfeVpqmWTk9nx6CWwamRGCj95ph1SmlRRk9KlCZ6avhCbZd4L68LvYT6l1kpdEnQXrF8w==
+"@types/webpack@^5.28.5":
+  version "5.28.5"
+  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-5.28.5.tgz#0e9d9a15efa09bbda2cef41356ca4ac2031ea9a2"
+  integrity sha512-wR87cgvxj3p6D0Crt1r5avwqffqPXUkNlnQ1mjU93G7gCuFjufZR4I6j8cz5g1F1tTYpfOOFvly+cmIQwL9wvw==
   dependencies:
     "@types/node" "*"
     tapable "^2.2.0"
     webpack "^5"
 
-"@types/xml2js@^0.4.0":
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/@types/xml2js/-/xml2js-0.4.0.tgz#e54a89a0055d5ed69305b2610f970909bf363e45"
-  integrity sha512-3gw0UqFMq7PsfMDwsawD0/L48soXfzOEh0NSAWVO99IZXnhx9LD3nOldHIpGYzZBsrS9NV2vaRFvEdWe+UweXQ==
-  dependencies:
-    "@types/node" "*"
-
 "@types/yargs-parser@*":
   version "15.0.0"
   resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d"
   integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==
 
-"@types/yargs@^12.0.9":
-  version "12.0.12"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-12.0.12.tgz#45dd1d0638e8c8f153e87d296907659296873916"
-  integrity sha512-SOhuU4wNBxhhTHxYaiG5NY4HBhDIDnJF60GU+2LqHAdKKer86//e4yg69aENCtQ04n0ovz+tq2YPME5t5yp4pw==
-
-"@types/yargs@^15.0.0":
-  version "15.0.4"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.4.tgz#7e5d0f8ca25e9d5849f2ea443cf7c402decd8299"
-  integrity sha512-9T1auFmbPZoxHz0enUFlUuKRy3it01R+hlggyVUMtnCTQRunsQYifnSGb8hET4Xo8yiC0o0r1paW3ud5+rbURg==
-  dependencies:
-    "@types/yargs-parser" "*"
-
-"@types/yargs@^15.0.5":
-  version "15.0.5"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.5.tgz#947e9a6561483bdee9adffc983e91a6902af8b79"
-  integrity sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==
+"@types/yargs@^17.0.8":
+  version "17.0.32"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.32.tgz#030774723a2f7faafebf645f4e5a48371dca6229"
+  integrity sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==
   dependencies:
     "@types/yargs-parser" "*"
 
@@ -1441,212 +1628,355 @@
   dependencies:
     "@types/node" "*"
 
-"@typescript-eslint/eslint-plugin@^5.10.2":
-  version "5.10.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.10.2.tgz#f8c1d59fc37bd6d9d11c97267fdfe722c4777152"
-  integrity sha512-4W/9lLuE+v27O/oe7hXJKjNtBLnZE8tQAFpapdxwSVHqtmIoPB1gph3+ahNwVuNL37BX7YQHyGF9Xv6XCnIX2Q==
-  dependencies:
-    "@typescript-eslint/scope-manager" "5.10.2"
-    "@typescript-eslint/type-utils" "5.10.2"
-    "@typescript-eslint/utils" "5.10.2"
-    debug "^4.3.2"
-    functional-red-black-tree "^1.0.1"
-    ignore "^5.1.8"
-    regexpp "^3.2.0"
-    semver "^7.3.5"
-    tsutils "^3.21.0"
-
-"@typescript-eslint/experimental-utils@^5.10.2":
-  version "5.10.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.10.2.tgz#dbb541e2070c7bd6e63d3e3a55b58be73a8fbb34"
-  integrity sha512-stRnIlxDduzxtaVLtEohESoXI1k7J6jvJHGyIkOT2pvXbg5whPM6f9tzJ51bJJxaJTdmvwgVFDNCopFRb2F5Gw==
-  dependencies:
-    "@typescript-eslint/utils" "5.10.2"
-
-"@typescript-eslint/parser@^5.10.2":
-  version "5.10.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.10.2.tgz#b6076d27cc5499ce3f2c625f5ccde946ecb7db9a"
-  integrity sha512-JaNYGkaQVhP6HNF+lkdOr2cAs2wdSZBoalE22uYWq8IEv/OVH0RksSGydk+sW8cLoSeYmC+OHvRyv2i4AQ7Czg==
-  dependencies:
-    "@typescript-eslint/scope-manager" "5.10.2"
-    "@typescript-eslint/types" "5.10.2"
-    "@typescript-eslint/typescript-estree" "5.10.2"
-    debug "^4.3.2"
-
-"@typescript-eslint/scope-manager@5.10.2":
-  version "5.10.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.10.2.tgz#92c0bc935ec00f3d8638cdffb3d0e70c9b879639"
-  integrity sha512-39Tm6f4RoZoVUWBYr3ekS75TYgpr5Y+X0xLZxXqcZNDWZdJdYbKd3q2IR4V9y5NxxiPu/jxJ8XP7EgHiEQtFnw==
-  dependencies:
-    "@typescript-eslint/types" "5.10.2"
-    "@typescript-eslint/visitor-keys" "5.10.2"
-
-"@typescript-eslint/type-utils@5.10.2":
-  version "5.10.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.10.2.tgz#ad5acdf98a7d2ab030bea81f17da457519101ceb"
-  integrity sha512-uRKSvw/Ccs5FYEoXW04Z5VfzF2iiZcx8Fu7DGIB7RHozuP0VbKNzP1KfZkHBTM75pCpsWxIthEH1B33dmGBKHw==
-  dependencies:
-    "@typescript-eslint/utils" "5.10.2"
-    debug "^4.3.2"
+"@typescript-eslint/eslint-plugin@^6.0.0":
+  version "6.7.3"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.7.3.tgz#d98046e9f7102d49a93d944d413c6055c47fafd7"
+  integrity sha512-vntq452UHNltxsaaN+L9WyuMch8bMd9CqJ3zhzTPXXidwbf5mqqKCVXEuvRZUqLJSTLeWE65lQwyXsRGnXkCTA==
+  dependencies:
+    "@eslint-community/regexpp" "^4.5.1"
+    "@typescript-eslint/scope-manager" "6.7.3"
+    "@typescript-eslint/type-utils" "6.7.3"
+    "@typescript-eslint/utils" "6.7.3"
+    "@typescript-eslint/visitor-keys" "6.7.3"
+    debug "^4.3.4"
+    graphemer "^1.4.0"
+    ignore "^5.2.4"
+    natural-compare "^1.4.0"
+    semver "^7.5.4"
+    ts-api-utils "^1.0.1"
+
+"@typescript-eslint/eslint-plugin@^6.13.2":
+  version "6.13.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.13.2.tgz#2e03506c5362a65e43cb132c37c9ce2d3cb51470"
+  integrity sha512-3+9OGAWHhk4O1LlcwLBONbdXsAhLjyCFogJY/cWy2lxdVJ2JrcTF2pTGMaLl2AE7U1l31n8Py4a8bx5DLf/0dQ==
+  dependencies:
+    "@eslint-community/regexpp" "^4.5.1"
+    "@typescript-eslint/scope-manager" "6.13.2"
+    "@typescript-eslint/type-utils" "6.13.2"
+    "@typescript-eslint/utils" "6.13.2"
+    "@typescript-eslint/visitor-keys" "6.13.2"
+    debug "^4.3.4"
+    graphemer "^1.4.0"
+    ignore "^5.2.4"
+    natural-compare "^1.4.0"
+    semver "^7.5.4"
+    ts-api-utils "^1.0.1"
+
+"@typescript-eslint/experimental-utils@^5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.62.0.tgz#14559bf73383a308026b427a4a6129bae2146741"
+  integrity sha512-RTXpeB3eMkpoclG3ZHft6vG/Z30azNHuqY6wKPBHlVMZFuEvrtlEDe8gMqDb+SO+9hjC/pLekeSCryf9vMZlCw==
+  dependencies:
+    "@typescript-eslint/utils" "5.62.0"
+
+"@typescript-eslint/parser@^6.0.0":
+  version "6.7.3"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.7.3.tgz#aaf40092a32877439e5957e18f2d6a91c82cc2fd"
+  integrity sha512-TlutE+iep2o7R8Lf+yoer3zU6/0EAUc8QIBB3GYBc1KGz4c4TRm83xwXUZVPlZ6YCLss4r77jbu6j3sendJoiQ==
+  dependencies:
+    "@typescript-eslint/scope-manager" "6.7.3"
+    "@typescript-eslint/types" "6.7.3"
+    "@typescript-eslint/typescript-estree" "6.7.3"
+    "@typescript-eslint/visitor-keys" "6.7.3"
+    debug "^4.3.4"
+
+"@typescript-eslint/parser@^6.13.2":
+  version "6.13.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.13.2.tgz#390b79cc9a57a5f904d197a201cc4b6bc4f9afb9"
+  integrity sha512-MUkcC+7Wt/QOGeVlM8aGGJZy1XV5YKjTpq9jK6r6/iLsGXhBVaGP5N0UYvFsu9BFlSpwY9kMretzdBH01rkRXg==
+  dependencies:
+    "@typescript-eslint/scope-manager" "6.13.2"
+    "@typescript-eslint/types" "6.13.2"
+    "@typescript-eslint/typescript-estree" "6.13.2"
+    "@typescript-eslint/visitor-keys" "6.13.2"
+    debug "^4.3.4"
+
+"@typescript-eslint/scope-manager@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz#d9457ccc6a0b8d6b37d0eb252a23022478c5460c"
+  integrity sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==
+  dependencies:
+    "@typescript-eslint/types" "5.62.0"
+    "@typescript-eslint/visitor-keys" "5.62.0"
+
+"@typescript-eslint/scope-manager@6.13.2":
+  version "6.13.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.13.2.tgz#5fa4e4adace028dafac212c770640b94e7b61052"
+  integrity sha512-CXQA0xo7z6x13FeDYCgBkjWzNqzBn8RXaE3QVQVIUm74fWJLkJkaHmHdKStrxQllGh6Q4eUGyNpMe0b1hMkXFA==
+  dependencies:
+    "@typescript-eslint/types" "6.13.2"
+    "@typescript-eslint/visitor-keys" "6.13.2"
+
+"@typescript-eslint/scope-manager@6.7.3":
+  version "6.7.3"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.7.3.tgz#07e5709c9bdae3eaf216947433ef97b3b8b7d755"
+  integrity sha512-wOlo0QnEou9cHO2TdkJmzF7DFGvAKEnB82PuPNHpT8ZKKaZu6Bm63ugOTn9fXNJtvuDPanBc78lGUGGytJoVzQ==
+  dependencies:
+    "@typescript-eslint/types" "6.7.3"
+    "@typescript-eslint/visitor-keys" "6.7.3"
+
+"@typescript-eslint/type-utils@6.13.2":
+  version "6.13.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.13.2.tgz#ebec2da14a6bb7122e0fd31eea72a382c39c6102"
+  integrity sha512-Qr6ssS1GFongzH2qfnWKkAQmMUyZSyOr0W54nZNU1MDfo+U4Mv3XveeLZzadc/yq8iYhQZHYT+eoXJqnACM1tw==
+  dependencies:
+    "@typescript-eslint/typescript-estree" "6.13.2"
+    "@typescript-eslint/utils" "6.13.2"
+    debug "^4.3.4"
+    ts-api-utils "^1.0.1"
+
+"@typescript-eslint/type-utils@6.7.3":
+  version "6.7.3"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.7.3.tgz#c2c165c135dda68a5e70074ade183f5ad68f3400"
+  integrity sha512-Fc68K0aTDrKIBvLnKTZ5Pf3MXK495YErrbHb1R6aTpfK5OdSFj0rVN7ib6Tx6ePrZ2gsjLqr0s98NG7l96KSQw==
+  dependencies:
+    "@typescript-eslint/typescript-estree" "6.7.3"
+    "@typescript-eslint/utils" "6.7.3"
+    debug "^4.3.4"
+    ts-api-utils "^1.0.1"
+
+"@typescript-eslint/types@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.62.0.tgz#258607e60effa309f067608931c3df6fed41fd2f"
+  integrity sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==
+
+"@typescript-eslint/types@6.13.2":
+  version "6.13.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.13.2.tgz#c044aac24c2f6cefb8e921e397acad5417dd0ae6"
+  integrity sha512-7sxbQ+EMRubQc3wTfTsycgYpSujyVbI1xw+3UMRUcrhSy+pN09y/lWzeKDbvhoqcRbHdc+APLs/PWYi/cisLPg==
+
+"@typescript-eslint/types@6.7.3":
+  version "6.7.3"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.7.3.tgz#0402b5628a63f24f2dc9d4a678e9a92cc50ea3e9"
+  integrity sha512-4g+de6roB2NFcfkZb439tigpAMnvEIg3rIjWQ+EM7IBaYt/CdJt6em9BJ4h4UpdgaBWdmx2iWsafHTrqmgIPNw==
+
+"@typescript-eslint/typescript-estree@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz#7d17794b77fabcac615d6a48fb143330d962eb9b"
+  integrity sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==
+  dependencies:
+    "@typescript-eslint/types" "5.62.0"
+    "@typescript-eslint/visitor-keys" "5.62.0"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/types@5.10.2":
-  version "5.10.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.10.2.tgz#604d15d795c4601fffba6ecb4587ff9fdec68ce8"
-  integrity sha512-Qfp0qk/5j2Rz3p3/WhWgu4S1JtMcPgFLnmAKAW061uXxKSa7VWKZsDXVaMXh2N60CX9h6YLaBoy9PJAfCOjk3w==
-
-"@typescript-eslint/typescript-estree@5.10.2", "@typescript-eslint/typescript-estree@^5.10.2":
-  version "5.10.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.10.2.tgz#810906056cd3ddcb35aa333fdbbef3713b0fe4a7"
-  integrity sha512-WHHw6a9vvZls6JkTgGljwCsMkv8wu8XU8WaYKeYhxhWXH/atZeiMW6uDFPLZOvzNOGmuSMvHtZKd6AuC8PrwKQ==
+"@typescript-eslint/typescript-estree@6.13.2", "@typescript-eslint/typescript-estree@^6.13.2":
+  version "6.13.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.13.2.tgz#ae556ee154c1acf025b48d37c3ef95a1d55da258"
+  integrity sha512-SuD8YLQv6WHnOEtKv8D6HZUzOub855cfPnPMKvdM/Bh1plv1f7Q/0iFUDLKKlxHcEstQnaUU4QZskgQq74t+3w==
   dependencies:
-    "@typescript-eslint/types" "5.10.2"
-    "@typescript-eslint/visitor-keys" "5.10.2"
-    debug "^4.3.2"
-    globby "^11.0.4"
+    "@typescript-eslint/types" "6.13.2"
+    "@typescript-eslint/visitor-keys" "6.13.2"
+    debug "^4.3.4"
+    globby "^11.1.0"
     is-glob "^4.0.3"
-    semver "^7.3.5"
-    tsutils "^3.21.0"
+    semver "^7.5.4"
+    ts-api-utils "^1.0.1"
+
+"@typescript-eslint/typescript-estree@6.7.3":
+  version "6.7.3"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.7.3.tgz#ec5bb7ab4d3566818abaf0e4a8fa1958561b7279"
+  integrity sha512-YLQ3tJoS4VxLFYHTw21oe1/vIZPRqAO91z6Uv0Ss2BKm/Ag7/RVQBcXTGcXhgJMdA4U+HrKuY5gWlJlvoaKZ5g==
+  dependencies:
+    "@typescript-eslint/types" "6.7.3"
+    "@typescript-eslint/visitor-keys" "6.7.3"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    semver "^7.5.4"
+    ts-api-utils "^1.0.1"
 
-"@typescript-eslint/utils@5.10.2":
-  version "5.10.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.10.2.tgz#1fcd37547c32c648ab11aea7173ec30060ee87a8"
-  integrity sha512-vuJaBeig1NnBRkf7q9tgMLREiYD7zsMrsN1DA3wcoMDvr3BTFiIpKjGiYZoKPllfEwN7spUjv7ZqD+JhbVjEPg==
+"@typescript-eslint/utils@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.62.0.tgz#141e809c71636e4a75daa39faed2fb5f4b10df86"
+  integrity sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==
   dependencies:
+    "@eslint-community/eslint-utils" "^4.2.0"
     "@types/json-schema" "^7.0.9"
-    "@typescript-eslint/scope-manager" "5.10.2"
-    "@typescript-eslint/types" "5.10.2"
-    "@typescript-eslint/typescript-estree" "5.10.2"
+    "@types/semver" "^7.3.12"
+    "@typescript-eslint/scope-manager" "5.62.0"
+    "@typescript-eslint/types" "5.62.0"
+    "@typescript-eslint/typescript-estree" "5.62.0"
     eslint-scope "^5.1.1"
-    eslint-utils "^3.0.0"
-
-"@typescript-eslint/visitor-keys@5.10.2":
-  version "5.10.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.10.2.tgz#fdbf272d8e61c045d865bd6c8b41bea73d222f3d"
-  integrity sha512-zHIhYGGGrFJvvyfwHk5M08C5B5K4bewkm+rrvNTKk1/S15YHR+SA/QUF8ZWscXSfEaB8Nn2puZj+iHcoxVOD/Q==
-  dependencies:
-    "@typescript-eslint/types" "5.10.2"
-    eslint-visitor-keys "^3.0.0"
-
-"@webassemblyjs/ast@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7"
-  integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==
-  dependencies:
-    "@webassemblyjs/helper-numbers" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
-
-"@webassemblyjs/floating-point-hex-parser@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f"
-  integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==
-
-"@webassemblyjs/helper-api-error@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16"
-  integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==
-
-"@webassemblyjs/helper-buffer@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5"
-  integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==
-
-"@webassemblyjs/helper-numbers@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae"
-  integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==
-  dependencies:
-    "@webassemblyjs/floating-point-hex-parser" "1.11.1"
-    "@webassemblyjs/helper-api-error" "1.11.1"
+    semver "^7.3.7"
+
+"@typescript-eslint/utils@6.13.2":
+  version "6.13.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.13.2.tgz#8eb89e53adc6d703a879b131e528807245486f89"
+  integrity sha512-b9Ptq4eAZUym4idijCRzl61oPCwwREcfDI8xGk751Vhzig5fFZR9CyzDz4Sp/nxSLBYxUPyh4QdIDqWykFhNmQ==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.4.0"
+    "@types/json-schema" "^7.0.12"
+    "@types/semver" "^7.5.0"
+    "@typescript-eslint/scope-manager" "6.13.2"
+    "@typescript-eslint/types" "6.13.2"
+    "@typescript-eslint/typescript-estree" "6.13.2"
+    semver "^7.5.4"
+
+"@typescript-eslint/utils@6.7.3":
+  version "6.7.3"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.7.3.tgz#96c655816c373135b07282d67407cb577f62e143"
+  integrity sha512-vzLkVder21GpWRrmSR9JxGZ5+ibIUSudXlW52qeKpzUEQhRSmyZiVDDj3crAth7+5tmN1ulvgKaCU2f/bPRCzg==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.4.0"
+    "@types/json-schema" "^7.0.12"
+    "@types/semver" "^7.5.0"
+    "@typescript-eslint/scope-manager" "6.7.3"
+    "@typescript-eslint/types" "6.7.3"
+    "@typescript-eslint/typescript-estree" "6.7.3"
+    semver "^7.5.4"
+
+"@typescript-eslint/visitor-keys@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz#2174011917ce582875954ffe2f6912d5931e353e"
+  integrity sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==
+  dependencies:
+    "@typescript-eslint/types" "5.62.0"
+    eslint-visitor-keys "^3.3.0"
+
+"@typescript-eslint/visitor-keys@6.13.2":
+  version "6.13.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.13.2.tgz#e0a4a80cf842bb08e6127b903284166ac4a5594c"
+  integrity sha512-OGznFs0eAQXJsp+xSd6k/O1UbFi/K/L7WjqeRoFE7vadjAF9y0uppXhYNQNEqygjou782maGClOoZwPqF0Drlw==
+  dependencies:
+    "@typescript-eslint/types" "6.13.2"
+    eslint-visitor-keys "^3.4.1"
+
+"@typescript-eslint/visitor-keys@6.7.3":
+  version "6.7.3"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.7.3.tgz#83809631ca12909bd2083558d2f93f5747deebb2"
+  integrity sha512-HEVXkU9IB+nk9o63CeICMHxFWbHWr3E1mpilIQBe9+7L/lH97rleFLVtYsfnWB+JVMaiFnEaxvknvmIzX+CqVg==
+  dependencies:
+    "@typescript-eslint/types" "6.7.3"
+    eslint-visitor-keys "^3.4.1"
+
+"@ungap/structured-clone@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
+  integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
+
+"@webassemblyjs/ast@1.12.1", "@webassemblyjs/ast@^1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.12.1.tgz#bb16a0e8b1914f979f45864c23819cc3e3f0d4bb"
+  integrity sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==
+  dependencies:
+    "@webassemblyjs/helper-numbers" "1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+
+"@webassemblyjs/floating-point-hex-parser@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz#dacbcb95aff135c8260f77fa3b4c5fea600a6431"
+  integrity sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==
+
+"@webassemblyjs/helper-api-error@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz#6132f68c4acd59dcd141c44b18cbebbd9f2fa768"
+  integrity sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==
+
+"@webassemblyjs/helper-buffer@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz#6df20d272ea5439bf20ab3492b7fb70e9bfcb3f6"
+  integrity sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==
+
+"@webassemblyjs/helper-numbers@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz#cbce5e7e0c1bd32cf4905ae444ef64cea919f1b5"
+  integrity sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==
+  dependencies:
+    "@webassemblyjs/floating-point-hex-parser" "1.11.6"
+    "@webassemblyjs/helper-api-error" "1.11.6"
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/helper-wasm-bytecode@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1"
-  integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==
+"@webassemblyjs/helper-wasm-bytecode@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz#bb2ebdb3b83aa26d9baad4c46d4315283acd51e9"
+  integrity sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==
 
-"@webassemblyjs/helper-wasm-section@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a"
-  integrity sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==
+"@webassemblyjs/helper-wasm-section@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz#3da623233ae1a60409b509a52ade9bc22a37f7bf"
+  integrity sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==
   dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-buffer" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
-    "@webassemblyjs/wasm-gen" "1.11.1"
+    "@webassemblyjs/ast" "1.12.1"
+    "@webassemblyjs/helper-buffer" "1.12.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/wasm-gen" "1.12.1"
 
-"@webassemblyjs/ieee754@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614"
-  integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==
+"@webassemblyjs/ieee754@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz#bb665c91d0b14fffceb0e38298c329af043c6e3a"
+  integrity sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
-"@webassemblyjs/leb128@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5"
-  integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==
+"@webassemblyjs/leb128@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.6.tgz#70e60e5e82f9ac81118bc25381a0b283893240d7"
+  integrity sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==
   dependencies:
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/utf8@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff"
-  integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==
-
-"@webassemblyjs/wasm-edit@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6"
-  integrity sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-buffer" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
-    "@webassemblyjs/helper-wasm-section" "1.11.1"
-    "@webassemblyjs/wasm-gen" "1.11.1"
-    "@webassemblyjs/wasm-opt" "1.11.1"
-    "@webassemblyjs/wasm-parser" "1.11.1"
-    "@webassemblyjs/wast-printer" "1.11.1"
-
-"@webassemblyjs/wasm-gen@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76"
-  integrity sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
-    "@webassemblyjs/ieee754" "1.11.1"
-    "@webassemblyjs/leb128" "1.11.1"
-    "@webassemblyjs/utf8" "1.11.1"
-
-"@webassemblyjs/wasm-opt@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2"
-  integrity sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-buffer" "1.11.1"
-    "@webassemblyjs/wasm-gen" "1.11.1"
-    "@webassemblyjs/wasm-parser" "1.11.1"
-
-"@webassemblyjs/wasm-parser@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199"
-  integrity sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-api-error" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
-    "@webassemblyjs/ieee754" "1.11.1"
-    "@webassemblyjs/leb128" "1.11.1"
-    "@webassemblyjs/utf8" "1.11.1"
-
-"@webassemblyjs/wast-printer@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0"
-  integrity sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.1"
+"@webassemblyjs/utf8@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a"
+  integrity sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==
+
+"@webassemblyjs/wasm-edit@^1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz#9f9f3ff52a14c980939be0ef9d5df9ebc678ae3b"
+  integrity sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==
+  dependencies:
+    "@webassemblyjs/ast" "1.12.1"
+    "@webassemblyjs/helper-buffer" "1.12.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/helper-wasm-section" "1.12.1"
+    "@webassemblyjs/wasm-gen" "1.12.1"
+    "@webassemblyjs/wasm-opt" "1.12.1"
+    "@webassemblyjs/wasm-parser" "1.12.1"
+    "@webassemblyjs/wast-printer" "1.12.1"
+
+"@webassemblyjs/wasm-gen@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz#a6520601da1b5700448273666a71ad0a45d78547"
+  integrity sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==
+  dependencies:
+    "@webassemblyjs/ast" "1.12.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/ieee754" "1.11.6"
+    "@webassemblyjs/leb128" "1.11.6"
+    "@webassemblyjs/utf8" "1.11.6"
+
+"@webassemblyjs/wasm-opt@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz#9e6e81475dfcfb62dab574ac2dda38226c232bc5"
+  integrity sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==
+  dependencies:
+    "@webassemblyjs/ast" "1.12.1"
+    "@webassemblyjs/helper-buffer" "1.12.1"
+    "@webassemblyjs/wasm-gen" "1.12.1"
+    "@webassemblyjs/wasm-parser" "1.12.1"
+
+"@webassemblyjs/wasm-parser@1.12.1", "@webassemblyjs/wasm-parser@^1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz#c47acb90e6f083391e3fa61d113650eea1e95937"
+  integrity sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==
+  dependencies:
+    "@webassemblyjs/ast" "1.12.1"
+    "@webassemblyjs/helper-api-error" "1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/ieee754" "1.11.6"
+    "@webassemblyjs/leb128" "1.11.6"
+    "@webassemblyjs/utf8" "1.11.6"
+
+"@webassemblyjs/wast-printer@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz#bcecf661d7d1abdaf989d8341a4833e33e2b31ac"
+  integrity sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==
+  dependencies:
+    "@webassemblyjs/ast" "1.12.1"
     "@xtuc/long" "4.2.2"
 
 "@xtuc/ieee754@^1.2.0":
@@ -1659,61 +1989,64 @@
   resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
   integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
-abab@^2.0.3:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"
-  integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==
+abab@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
+  integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
 
-accepts@~1.3.7:
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
-  integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
+acorn-globals@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-7.0.1.tgz#0dbf05c44fa7c94332914c02066d5beff62c40c3"
+  integrity sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==
   dependencies:
-    mime-types "~2.1.24"
-    negotiator "0.6.2"
+    acorn "^8.1.0"
+    acorn-walk "^8.0.2"
 
-acorn-globals@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45"
-  integrity sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==
-  dependencies:
-    acorn "^7.1.1"
-    acorn-walk "^7.1.1"
+acorn-import-attributes@^1.9.5:
+  version "1.9.5"
+  resolved "https://registry.yarnpkg.com/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz#7eb1557b1ba05ef18b5ed0ec67591bfab04688ef"
+  integrity sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==
 
-acorn-import-assertions@^1.7.6:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
-  integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==
+acorn-jsx@^5.3.2:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
+  integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn-jsx@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz#4c66069173d6fdd68ed85239fc256226182b2ebe"
-  integrity sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==
+acorn-walk@^8.0.0:
+  version "8.3.3"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.3.tgz#9caeac29eefaa0c41e3d4c65137de4d6f34df43e"
+  integrity sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw==
+  dependencies:
+    acorn "^8.11.0"
 
-acorn-walk@^7.1.1:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
-  integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
+acorn-walk@^8.0.2:
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.0.tgz#2097665af50fd0cf7a2dfccd2b9368964e66540f"
+  integrity sha512-FS7hV565M5l1R08MXqo8odwMTB02C2UqzB17RVgu9EyuYFBqJZ3/ZY97sQD5FewVu1UyDFc1yztUDrAwT0EypA==
 
-acorn-walk@^8.0.0:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
-  integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
+acorn@^8.0.4, acorn@^8.11.0, acorn@^8.7.1, acorn@^8.8.2:
+  version "8.12.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.12.1.tgz#71616bdccbe25e27a54439e0046e89ca76df2248"
+  integrity sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==
 
-acorn@^7.1.1:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.3.1.tgz#85010754db53c3fbaf3b9ea3e083aa5c5d147ffd"
-  integrity sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA==
+acorn@^8.1.0, acorn@^8.8.1, acorn@^8.9.0:
+  version "8.11.2"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.2.tgz#ca0d78b51895be5390a5903c5b3bdcdaf78ae40b"
+  integrity sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==
 
-acorn@^7.3.1:
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.0.tgz#e1ad486e6c54501634c6c397c5c121daa383607c"
-  integrity sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==
+agent-base@6:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
+  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
+  dependencies:
+    debug "4"
 
-acorn@^8.0.4, acorn@^8.4.1:
-  version "8.7.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
-  integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==
+agent-base@^7.0.2, agent-base@^7.1.0:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.1.tgz#bdbded7dfb096b751a2a087eeeb9664725b2e317"
+  integrity sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==
+  dependencies:
+    debug "^4.3.4"
 
 airbnb-browser-shims@^3.0.0:
   version "3.0.0"
@@ -1760,11 +2093,6 @@ ajv-formats@^2.1.1:
   dependencies:
     ajv "^8.0.0"
 
-ajv-keywords@^3.4.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.1.tgz#b83ca89c5d42d69031f424cad49aada0236c6957"
-  integrity sha512-KWcq3xN8fDjSB+IMoh2VaXVhRI0BBGxoYp3rx7Pkb6z0cFjYR9Q9l4yZqqals0/zsioCmocC5H6UvsGD4MoIBA==
-
 ajv-keywords@^3.5.2:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
@@ -1785,17 +2113,7 @@ ajv@^4.9.2:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"
 
-ajv@^5.1.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.3.0.tgz#4414ff74a50879c208ee5fdc826e32c303549eda"
-  integrity sha1-RBT/dKUIecII7l/cgm4ywwNUnto=
-  dependencies:
-    co "^4.6.0"
-    fast-deep-equal "^1.0.0"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.3.0"
-
-ajv@^6.10.0, ajv@^6.12.0, ajv@^6.12.5, ajv@^6.9.1:
+ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -1805,16 +2123,6 @@ ajv@^6.10.0, ajv@^6.12.0, ajv@^6.12.5, ajv@^6.9.1:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^6.12.3:
-  version "6.12.3"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.3.tgz#18c5af38a111ddeb4f2697bd78d68abc1cabd706"
-  integrity sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
 ajv@^8.0.0, ajv@^8.8.0:
   version "8.10.0"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.10.0.tgz#e573f719bd3af069017e3b66538ab968d040e54d"
@@ -1825,18 +2133,6 @@ ajv@^8.0.0, ajv@^8.8.0:
     require-from-string "^2.0.2"
     uri-js "^4.2.2"
 
-ansi-align@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz#b536b371cf687caaef236c18d3e21fe3797467cb"
-  integrity sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==
-  dependencies:
-    string-width "^3.0.0"
-
-ansi-colors@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
-  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
-
 ansi-escapes@^4.2.1:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61"
@@ -1854,32 +2150,22 @@ ansi-regex@^2.0.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
   integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
 
-ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
-
-ansi-regex@^4.0.0, ansi-regex@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
-  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
-
-ansi-regex@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
-  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
-
 ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
+ansi-regex@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a"
+  integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==
+
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
   integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
 
-ansi-styles@^3.2.0, ansi-styles@^3.2.1:
+ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
   integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
@@ -1901,13 +2187,15 @@ ansi-styles@^4.1.0:
   dependencies:
     color-convert "^2.0.1"
 
-anymatch@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
-  integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
-  dependencies:
-    micromatch "^3.1.4"
-    normalize-path "^2.1.1"
+ansi-styles@^5.0.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
+  integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
+
+ansi-styles@^6.1.0:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
+  integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
 
 anymatch@^3.0.3, anymatch@~3.1.1:
   version "3.1.1"
@@ -1917,38 +2205,10 @@ anymatch@^3.0.3, anymatch@~3.1.1:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-app-builder-bin@3.5.9:
-  version "3.5.9"
-  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.9.tgz#a3ac0c25286bac68357321cb2eaf7128b0bc0a4f"
-  integrity sha512-NSjtqZ3x2kYiDp3Qezsgukx/AUzKPr3Xgf9by4cYt05ILWGAptepeeu0Uv+7MO+41o6ujhLixTou8979JGg2Kg==
-
-app-builder-lib@22.7.0:
-  version "22.7.0"
-  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.7.0.tgz#ccd3e7ece2d46bc209423a77aa142f74aaf65db0"
-  integrity sha512-blRKwV8h0ztualXS50ciCTo39tbuDGNS+ldcy8+KLvKXuT6OpYnSJ7M6MSfPT+xWatshMHJV1rJx3Tl+k/Sn/g==
-  dependencies:
-    "7zip-bin" "~5.0.3"
-    "@develar/schema-utils" "~2.6.5"
-    async-exit-hook "^2.0.1"
-    bluebird-lst "^1.0.9"
-    builder-util "22.7.0"
-    builder-util-runtime "8.7.1"
-    chromium-pickle-js "^0.2.0"
-    debug "^4.2.0"
-    ejs "^3.1.3"
-    electron-publish "22.7.0"
-    fs-extra "^9.0.0"
-    hosted-git-info "^3.0.4"
-    is-ci "^2.0.0"
-    isbinaryfile "^4.0.6"
-    js-yaml "^3.14.0"
-    lazy-val "^1.0.4"
-    minimatch "^3.0.4"
-    normalize-package-data "^2.5.0"
-    read-config-file "6.0.0"
-    sanitize-filename "^1.6.3"
-    semver "^7.3.2"
-    temp-file "^3.3.7"
+are-docs-informative@^0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/are-docs-informative/-/are-docs-informative-0.0.2.tgz#387f0e93f5d45280373d387a59d34c96db321963"
+  integrity sha512-ixiS0nLNNG5jNQzgZJNoUpBKdo9yTYZMGJ+QgT2jmjR7G7+QHRCc4v6LQ3NgE7EBJq+o0ams3waJwkrlBom8Ig==
 
 argparse@^1.0.7:
   version "1.0.10"
@@ -1957,25 +2217,25 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
-arr-diff@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
-  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
-
-arr-flatten@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
-  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
+argparse@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
-arr-union@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
-  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
+aria-query@^5.1.3, aria-query@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.3.0.tgz#650c569e41ad90b51b3d7df5e5eed1c7549c103e"
+  integrity sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==
+  dependencies:
+    dequal "^2.0.3"
 
-array-flatten@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
-  integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
+array-buffer-byte-length@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz#fabe8bc193fea865f317fe7807085ee0dee5aead"
+  integrity sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==
+  dependencies:
+    call-bind "^1.0.2"
+    is-array-buffer "^3.0.1"
 
 array-includes@^3.0.3:
   version "3.0.3"
@@ -1996,16 +2256,33 @@ array-includes@^3.1.3:
     get-intrinsic "^1.1.1"
     is-string "^1.0.7"
 
+array-includes@^3.1.4, array-includes@^3.1.5:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.5.tgz#2c320010db8d31031fd2a5f6b3bbd4b1aad31bdb"
+  integrity sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.19.5"
+    get-intrinsic "^1.1.1"
+    is-string "^1.0.7"
+
+array-includes@^3.1.6:
+  version "3.1.7"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.7.tgz#8cd2e01b26f7a3086cbc87271593fe921c62abda"
+  integrity sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    get-intrinsic "^1.2.1"
+    is-string "^1.0.7"
+
 array-union@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
-array-unique@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
-  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
-
 array.prototype.flat@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.1.tgz#812db8f02cad24d3fab65dd67eabe3b8903494a4"
@@ -2015,6 +2292,26 @@ array.prototype.flat@^1.2.1:
     es-abstract "^1.10.0"
     function-bind "^1.1.1"
 
+array.prototype.flat@^1.2.5:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz#0b0c1567bf57b38b56b4c97b8aa72ab45e4adc7b"
+  integrity sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.19.2"
+    es-shim-unscopables "^1.0.0"
+
+array.prototype.flat@^1.3.1:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz#1476217df8cff17d72ee8f3ba06738db5b387d18"
+  integrity sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    es-shim-unscopables "^1.0.0"
+
 array.prototype.flatmap@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.1.tgz#3103cd4826ef90019c9b0a4839b2535fa6faf4e9"
@@ -2024,14 +2321,39 @@ array.prototype.flatmap@^1.2.1:
     es-abstract "^1.10.0"
     function-bind "^1.1.1"
 
-array.prototype.flatmap@^1.2.4:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.5.tgz#908dc82d8a406930fdf38598d51e7411d18d4446"
-  integrity sha512-08u6rVyi1Lj7oqWbS9nUxliETrtIROT4XGTA4D/LWGten6E3ocm7cy9SIrmNHOL5XVbVuckUp3X6Xyg8/zpvHA==
+array.prototype.flatmap@^1.3.1:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz#c9a7c6831db8e719d6ce639190146c24bbd3e527"
+  integrity sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==
   dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.0"
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    es-shim-unscopables "^1.0.0"
+
+array.prototype.tosorted@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.2.tgz#620eff7442503d66c799d95503f82b475745cefd"
+  integrity sha512-HuQCHOlk1Weat5jzStICBCd83NxiIMwqDg/dHEsoefabn/hJRj5pVdWcPUSpRrwhwxZOsQassMpgN/xRYFBMIg==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    es-shim-unscopables "^1.0.0"
+    get-intrinsic "^1.2.1"
+
+arraybuffer.prototype.slice@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz#98bd561953e3e74bb34938e77647179dfe6e9f12"
+  integrity sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==
+  dependencies:
+    array-buffer-byte-length "^1.0.0"
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    get-intrinsic "^1.2.1"
+    is-array-buffer "^3.0.2"
+    is-shared-array-buffer "^1.0.2"
 
 arrify@^1.0.0:
   version "1.0.1"
@@ -2056,149 +2378,89 @@ asar@^2.0.1:
     mkdirp "^0.5.1"
     tmp-promise "^1.0.5"
 
-asar@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/asar/-/asar-3.0.3.tgz#1fef03c2d6d2de0cbad138788e4f7ae03b129c7b"
-  integrity sha512-k7zd+KoR+n8pl71PvgElcoKHrVNiSXtw7odKbyNpmgKe7EGRF9Pnu3uLOukD37EvavKwVFxOUpqXTIZC5B5Pmw==
-  dependencies:
-    chromium-pickle-js "^0.2.0"
-    commander "^5.0.0"
-    glob "^7.1.6"
-    minimatch "^3.0.4"
-  optionalDependencies:
-    "@types/glob" "^7.1.1"
-
-asn1@~0.2.3:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
-  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
-  dependencies:
-    safer-buffer "~2.1.0"
-
-assert-plus@1.0.0, assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
-
-assign-symbols@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
-  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
+ast-types-flow@^0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"
+  integrity sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==
 
-astral-regex@^1.0.0:
+asynciterator.prototype@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
-  integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
-
-async-exit-hook@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz#8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3"
-  integrity sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw==
-
-async@^3.2.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/async/-/async-3.2.3.tgz#ac53dafd3f4720ee9e8a160628f18ea91df196c9"
-  integrity sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==
+  resolved "https://registry.yarnpkg.com/asynciterator.prototype/-/asynciterator.prototype-1.0.0.tgz#8c5df0514936cdd133604dfcc9d3fb93f09b2b62"
+  integrity sha512-wwHYEIS0Q80f5mosx3L/dfG5t5rjEa9Ft51GTaNt862EnpyGHpgz2RkZvLPp1oF5TnAiTohkEKVEu8pQPJI7Vg==
+  dependencies:
+    has-symbols "^1.0.3"
 
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
+  integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
 
 at-least-node@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
   integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
 
-atob@^2.0.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
-  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
-
 author-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/author-regex/-/author-regex-1.0.0.tgz#d08885be6b9bbf9439fe087c76287245f0a81450"
   integrity sha1-0IiFvmubv5Q5/gh8dihyRfCoFFA=
 
-awesome-node-loader@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/awesome-node-loader/-/awesome-node-loader-1.1.0.tgz#95cf054ec2fa233c38f29ce18cc59b0ef0c002db"
-  integrity sha1-lc8FTsL6Izw48pzhjMWbDvDAAts=
+available-typed-arrays@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
+  integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
+
+awesome-node-loader@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/awesome-node-loader/-/awesome-node-loader-1.1.1.tgz#a402b7f09f72cd1c7b1a65e75180236f2f5438d9"
+  integrity sha512-XpjW2F1NNkWaseKQdNFS/8GiYIQBapTsYBtZzKM479ldeBK24V6rJNA+YBHeyzMes7PVkYQ39+ZDGIpDYeJfww==
   dependencies:
     loader-utils "^1.1.0"
 
-aws-sign2@~0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
-  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
+axe-core@^4.6.2:
+  version "4.8.2"
+  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.8.2.tgz#2f6f3cde40935825cf4465e3c1c9e77b240ff6ae"
+  integrity sha512-/dlp0fxyM3R8YW7MFzaHWXrf4zzbr0vaYb23VBFCl83R7nWNPg/yaQw2Dc8jzCMmDVLhSdzH8MjrsuIUuvX+6g==
 
-aws4@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
-  integrity sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=
+axobject-query@^3.1.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-3.2.1.tgz#39c378a6e3b06ca679f29138151e45b2b32da62a"
+  integrity sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg==
+  dependencies:
+    dequal "^2.0.3"
 
-aws4@^1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
-  integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
-
-azure-storage@^2.10.4:
-  version "2.10.4"
-  resolved "https://registry.yarnpkg.com/azure-storage/-/azure-storage-2.10.4.tgz#c481d207eabc05f57f019b209f7faa8737435104"
-  integrity sha512-zlfRPl4js92JC6+79C2EUmNGYjSknRl8pOiHQF78zy+pbOFOHtlBF6BU/OxPeHQX3gaa6NdEZnVydFxhhndkEw==
-  dependencies:
-    browserify-mime "~1.2.9"
-    extend "^3.0.2"
-    json-edm-parser "0.1.2"
-    md5.js "1.3.4"
-    readable-stream "~2.0.0"
-    request "^2.86.0"
-    underscore "^1.12.1"
-    uuid "^3.0.0"
-    validator "~9.4.1"
-    xml2js "0.2.8"
-    xmlbuilder "^9.0.7"
-
-babel-jest@^26.6.3:
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.6.3.tgz#d87d25cb0037577a0c89f82e5755c5d293c01056"
-  integrity sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA==
-  dependencies:
-    "@jest/transform" "^26.6.2"
-    "@jest/types" "^26.6.2"
-    "@types/babel__core" "^7.1.7"
-    babel-plugin-istanbul "^6.0.0"
-    babel-preset-jest "^26.6.2"
+babel-jest@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.7.0.tgz#f4369919225b684c56085998ac63dbd05be020d5"
+  integrity sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==
+  dependencies:
+    "@jest/transform" "^29.7.0"
+    "@types/babel__core" "^7.1.14"
+    babel-plugin-istanbul "^6.1.1"
+    babel-preset-jest "^29.6.3"
     chalk "^4.0.0"
-    graceful-fs "^4.2.4"
+    graceful-fs "^4.2.9"
     slash "^3.0.0"
 
-babel-plugin-dynamic-import-node@^2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3"
-  integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==
-  dependencies:
-    object.assign "^4.1.0"
-
-babel-plugin-istanbul@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz#e159ccdc9af95e0b570c75b4573b7c34d671d765"
-  integrity sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==
+babel-plugin-istanbul@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73"
+  integrity sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@istanbuljs/load-nyc-config" "^1.0.0"
     "@istanbuljs/schema" "^0.1.2"
-    istanbul-lib-instrument "^4.0.0"
+    istanbul-lib-instrument "^5.0.4"
     test-exclude "^6.0.0"
 
-babel-plugin-jest-hoist@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz#8185bd030348d254c6d7dd974355e6a28b21e62d"
-  integrity sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw==
+babel-plugin-jest-hoist@^29.6.3:
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz#aadbe943464182a8922c3c927c3067ff40d24626"
+  integrity sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==
   dependencies:
     "@babel/template" "^7.3.3"
     "@babel/types" "^7.3.3"
-    "@types/babel__core" "^7.0.0"
+    "@types/babel__core" "^7.1.14"
     "@types/babel__traverse" "^7.0.6"
 
 babel-preset-current-node-syntax@^1.0.0:
@@ -2219,12 +2481,12 @@ babel-preset-current-node-syntax@^1.0.0:
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
     "@babel/plugin-syntax-top-level-await" "^7.8.3"
 
-babel-preset-jest@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz#747872b1171df032252426586881d62d31798fee"
-  integrity sha512-YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ==
+babel-preset-jest@^29.6.3:
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz#fa05fa510e7d493896d7b0dd2033601c840f171c"
+  integrity sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==
   dependencies:
-    babel-plugin-jest-hoist "^26.6.2"
+    babel-plugin-jest-hoist "^29.6.3"
     babel-preset-current-node-syntax "^1.0.0"
 
 balanced-match@^1.0.0:
@@ -2232,40 +2494,15 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
-base64-arraybuffer-es6@0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/base64-arraybuffer-es6/-/base64-arraybuffer-es6-0.3.1.tgz#fdf0e382f4e2f56caf881f48ee0ce01ae79afe48"
-  integrity sha512-TrhBheudYaff9adiTAqjSScjvtmClQ4vF9l4cqkPNkVsA11m4/NRdH4LkZ/tAMmpzzwfI20BXnJ/PTtafECCNA==
-
-base64-js@^1.2.3:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
-  integrity sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==
-
-base@^0.11.1:
-  version "0.11.2"
-  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
-  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
-  dependencies:
-    cache-base "^1.0.1"
-    class-utils "^0.3.5"
-    component-emitter "^1.2.1"
-    define-property "^1.0.0"
-    isobject "^3.0.1"
-    mixin-deep "^1.2.0"
-    pascalcase "^0.1.1"
-
-bcrypt-pbkdf@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
-  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
-  dependencies:
-    tweetnacl "^0.14.3"
+base64-js@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
-big.js@^3.1.3:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
-  integrity sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==
+big-integer@^1.6.44:
+  version "1.6.51"
+  resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.51.tgz#0df92a5d9880560d3ff2d5fd20245c889d130686"
+  integrity sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==
 
 big.js@^5.2.2:
   version "5.2.2"
@@ -2277,76 +2514,27 @@ binary-extensions@^2.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.1.0.tgz#30fa40c9e7fe07dbc895678cd287024dea241dd9"
   integrity sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==
 
-bluebird-lst@^1.0.9:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.9.tgz#a64a0e4365658b9ab5fe875eb9dfb694189bb41c"
-  integrity sha512-7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw==
-  dependencies:
-    bluebird "^3.5.5"
-
 bluebird@^3.0.6, bluebird@^3.1.1, bluebird@^3.5.0:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
   integrity sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==
 
-bluebird@^3.5.5:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
-  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
-
-body-parser@1.19.0:
-  version "1.19.0"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
-  integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==
-  dependencies:
-    bytes "3.1.0"
-    content-type "~1.0.4"
-    debug "2.6.9"
-    depd "~1.1.2"
-    http-errors "1.7.2"
-    iconv-lite "0.4.24"
-    on-finished "~2.3.0"
-    qs "6.7.0"
-    raw-body "2.4.0"
-    type-is "~1.6.17"
-
 boolbase@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
-  integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
+  integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==
 
 boolean@^3.0.1:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.0.2.tgz#df1baa18b6a2b0e70840475e1d93ec8fe75b2570"
   integrity sha512-RwywHlpCRc3/Wh81MiCKun4ydaIFyW5Ea6JbL6sRCVx5q5irDw7pMXBUFYF/jArQ6YrG36q0kpovc9P/Kd3I4g==
 
-boom@4.x.x:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31"
-  integrity sha1-T4owBctKfjiJ90kDD9JbluAdLjE=
-  dependencies:
-    hoek "4.x.x"
-
-boom@5.x.x:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02"
-  integrity sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==
-  dependencies:
-    hoek "4.x.x"
-
-boxen@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/boxen/-/boxen-4.2.0.tgz#e411b62357d6d6d36587c8ac3d5d974daa070e64"
-  integrity sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ==
+bplist-parser@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/bplist-parser/-/bplist-parser-0.2.0.tgz#43a9d183e5bf9d545200ceac3e712f79ebbe8d0e"
+  integrity sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==
   dependencies:
-    ansi-align "^3.0.0"
-    camelcase "^5.3.1"
-    chalk "^3.0.0"
-    cli-boxes "^2.2.0"
-    string-width "^4.1.0"
-    term-size "^2.1.0"
-    type-fest "^0.8.1"
-    widest-line "^3.1.0"
+    big-integer "^1.6.44"
 
 brace-expansion@^1.1.7:
   version "1.1.11"
@@ -2363,49 +2551,32 @@ brace-expansion@^2.0.1:
   dependencies:
     balanced-match "^1.0.0"
 
-braces@^2.3.1:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
-  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
+braces@^3.0.3, braces@~3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
+  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
   dependencies:
-    arr-flatten "^1.1.0"
-    array-unique "^0.3.2"
-    extend-shallow "^2.0.1"
-    fill-range "^4.0.0"
-    isobject "^3.0.1"
-    repeat-element "^1.1.2"
-    snapdragon "^0.8.1"
-    snapdragon-node "^2.0.1"
-    split-string "^3.0.2"
-    to-regex "^3.0.1"
+    fill-range "^7.1.1"
 
-braces@^3.0.1, braces@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+browserslist@^4.21.0:
+  version "4.21.3"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.3.tgz#5df277694eb3c48bc5c4b05af3e8b7e09c5a6d1a"
+  integrity sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ==
   dependencies:
-    fill-range "^7.0.1"
-
-browser-process-hrtime@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
-  integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
-
-browserify-mime@~1.2.9:
-  version "1.2.9"
-  resolved "https://registry.yarnpkg.com/browserify-mime/-/browserify-mime-1.2.9.tgz#aeb1af28de6c0d7a6a2ce40adb68ff18422af31f"
-  integrity sha1-rrGvKN5sDXpqLOQK22j/GEIq8x8=
+    caniuse-lite "^1.0.30001370"
+    electron-to-chromium "^1.4.202"
+    node-releases "^2.0.6"
+    update-browserslist-db "^1.0.5"
 
-browserslist@^4.14.5, browserslist@^4.17.5:
-  version "4.19.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.19.1.tgz#4ac0435b35ab655896c31d53018b6dd5e9e4c9a3"
-  integrity sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==
+browserslist@^4.21.10, browserslist@^4.23.1:
+  version "4.23.3"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.3.tgz#debb029d3c93ebc97ffbc8d9cbb03403e227c800"
+  integrity sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==
   dependencies:
-    caniuse-lite "^1.0.30001286"
-    electron-to-chromium "^1.4.17"
-    escalade "^3.1.1"
-    node-releases "^2.0.1"
-    picocolors "^1.0.0"
+    caniuse-lite "^1.0.30001646"
+    electron-to-chromium "^1.5.4"
+    node-releases "^2.0.18"
+    update-browserslist-db "^1.1.0"
 
 bs-logger@0.x:
   version "0.2.6"
@@ -2426,81 +2597,50 @@ buffer-crc32@~0.2.3:
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
   integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
 
-buffer-from@1.x, buffer-from@^1.1.0:
+buffer-equal@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.1.tgz#2f7651be5b1b3f057fcd6e7ee16cf34767077d90"
+  integrity sha512-QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg==
+
+buffer-from@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
+  integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
+
+buffer-from@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
   integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
 
-buffer-from@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.0.0.tgz#4cb8832d23612589b0406e9e2956c17f06fdf531"
-  integrity sha512-83apNb8KK0Se60UE1+4Ukbe3HbfELJ6UlI4ldtOGs7So4KD26orJM8hIY9lxdzP+UpItH1Yh/Y8GUvNFWFFRxA==
-
-builder-util-runtime@8.7.1:
-  version "8.7.1"
-  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.1.tgz#23c808cddd650d4376a7a1518ec1e80e85c10f00"
-  integrity sha512-uEBH1nAnTvzjcsrh2XI3qOzJ39h0+9kuIuwj+kCc3a07TZNGShfJcai8fFzL3mNgGjEFxoq+XMssR11r+FOFSg==
-  dependencies:
-    debug "^4.2.0"
-    sax "^1.2.4"
-
-builder-util@22.7.0:
-  version "22.7.0"
-  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.7.0.tgz#0776a66e6d6e408a78bed7f17a7ad22516d9e7f0"
-  integrity sha512-UV3MKL0mwjMq2y9JlBf28Cegpj0CrIXcjGkO0TXn+QZ6Yy9rY6lHOuUvpQ19ct2Qh1o+QSwH3Q1nKUf5viJBBg==
-  dependencies:
-    "7zip-bin" "~5.0.3"
-    "@types/debug" "^4.1.5"
-    "@types/fs-extra" "^9.0.1"
-    app-builder-bin "3.5.9"
-    bluebird-lst "^1.0.9"
-    builder-util-runtime "8.7.1"
-    chalk "^4.0.0"
-    debug "^4.2.0"
-    fs-extra "^9.0.0"
-    is-ci "^2.0.0"
-    js-yaml "^3.14.0"
-    source-map-support "^0.5.19"
-    stat-mode "^1.0.0"
-    temp-file "^3.3.7"
-
 builtin-modules@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
   integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=
 
-bytes@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
-  integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
-
-cache-base@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
-  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
+bundle-name@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/bundle-name/-/bundle-name-3.0.0.tgz#ba59bcc9ac785fb67ccdbf104a2bf60c099f0e1a"
+  integrity sha512-PKA4BeSvBpQKQ8iPOGCSiell+N8P+Tf1DlwqmYhpe2gAhKPHn8EYOxVT+ShuGmhg8lN8XiSlS80yiExKXrURlw==
   dependencies:
-    collection-visit "^1.0.0"
-    component-emitter "^1.2.1"
-    get-value "^2.0.6"
-    has-value "^1.0.0"
-    isobject "^3.0.1"
-    set-value "^2.0.0"
-    to-object-path "^0.3.0"
-    union-value "^1.0.0"
-    unset-value "^1.0.0"
+    run-applescript "^5.0.0"
 
-cacheable-request@^6.0.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912"
-  integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==
+cacheable-lookup@^5.0.3:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005"
+  integrity sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==
+
+cacheable-request@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.2.tgz#ea0d0b889364a25854757301ca12b2da77f91d27"
+  integrity sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==
   dependencies:
     clone-response "^1.0.2"
     get-stream "^5.1.0"
     http-cache-semantics "^4.0.0"
-    keyv "^3.0.0"
+    keyv "^4.0.0"
     lowercase-keys "^2.0.0"
-    normalize-url "^4.1.0"
-    responselike "^1.0.2"
+    normalize-url "^6.0.1"
+    responselike "^2.0.0"
 
 call-bind@^1.0.0, call-bind@^1.0.2:
   version "1.0.2"
@@ -2510,6 +2650,15 @@ call-bind@^1.0.0, call-bind@^1.0.2:
     function-bind "^1.1.1"
     get-intrinsic "^1.0.2"
 
+call-bind@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.5.tgz#6fa2b7845ce0ea49bf4d8b9ef64727a2c2e2e513"
+  integrity sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==
+  dependencies:
+    function-bind "^1.1.2"
+    get-intrinsic "^1.2.1"
+    set-function-length "^1.1.1"
+
 callsites@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
@@ -2523,37 +2672,20 @@ camel-case@^4.1.2:
     pascal-case "^3.1.2"
     tslib "^2.0.3"
 
-camelcase@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz#03295527d58bd3cd4aa75363f35b2e8d97be2f42"
-  integrity sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==
-
 camelcase@^5.3.1:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-camelcase@^6.0.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809"
-  integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==
-
-caniuse-lite@^1.0.30001286:
-  version "1.0.30001298"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001298.tgz#0e690039f62e91c3ea581673d716890512e7ec52"
-  integrity sha512-AcKqikjMLlvghZL/vfTHorlQsLDhGRalYf1+GmWCf5SCMziSGjRYQW/JEksj14NaYHIR6KIhrFAy0HV5C25UzQ==
-
-capture-exit@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
-  integrity sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==
-  dependencies:
-    rsvp "^4.8.4"
+camelcase@^6.2.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
+  integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
-caseless@~0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
+caniuse-lite@^1.0.30001370, caniuse-lite@^1.0.30001646:
+  version "1.0.30001653"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001653.tgz#b8af452f8f33b1c77f122780a4aecebea0caca56"
+  integrity sha512-XGWQVB8wFQ2+9NZwZ10GxTYC5hk0Fa+q8cSkr0tgvMhYhMHP/QC+WTgrePMDBWiWc/pV+1ik82Al20XOK25Gcw==
 
 chalk@^1.1.1:
   version "1.1.3"
@@ -2566,7 +2698,7 @@ chalk@^1.1.1:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.2.0:
+chalk@^2.0.0, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -2575,14 +2707,6 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.2.0:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
-  integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
 chalk@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
@@ -2591,7 +2715,7 @@ chalk@^4.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chalk@^4.0.2, chalk@^4.1.0:
+chalk@^4.1.0:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -2599,6 +2723,11 @@ chalk@^4.0.2, chalk@^4.1.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
+chalk@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.3.0.tgz#67c20a7ebef70e7f3970a01f90fa210cb6860385"
+  integrity sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==
+
 char-regex@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
@@ -2620,37 +2749,24 @@ char-regex@^1.0.2:
     fsevents "~2.1.2"
 
 chrome-trace-event@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4"
-  integrity sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==
-  dependencies:
-    tslib "^1.9.0"
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz#05bffd7ff928465093314708c93bdfa9bd1f0f5b"
+  integrity sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==
 
 chromium-pickle-js@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz#04a106672c18b085ab774d983dfa3ea138f22205"
   integrity sha1-BKEGZywYsIWrd02YPfo+oTjyIgU=
 
-ci-info@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
-  integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
-
-cjs-module-lexer@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz#4186fcca0eae175970aee870b9fe2d6cf8d5655f"
-  integrity sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw==
+ci-info@^3.2.0:
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4"
+  integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==
 
-class-utils@^0.3.5:
-  version "0.3.5"
-  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.5.tgz#17e793103750f9627b2176ea34cfd1b565903c80"
-  integrity sha1-F+eTEDdQ+WJ7IXbqNM/RtWWQPIA=
-  dependencies:
-    arr-union "^3.1.0"
-    define-property "^0.2.5"
-    isobject "^3.0.0"
-    lazy-cache "^2.0.2"
-    static-extend "^0.1.1"
+cjs-module-lexer@^1.0.0:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz#6c370ab19f8a3394e318fe682686ec0ac684d107"
+  integrity sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==
 
 classlist-polyfill@^1.2.0:
   version "1.2.0"
@@ -2658,25 +2774,20 @@ classlist-polyfill@^1.2.0:
   integrity sha1-k1vC39lFiodrJ5YXUUY4vKqWSi4=
 
 clean-css@^5.2.2:
-  version "5.2.4"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-5.2.4.tgz#982b058f8581adb2ae062520808fb2429bd487a4"
-  integrity sha512-nKseG8wCzEuji/4yrgM/5cthL9oTDc5UOQyFMvW/Q53oP6gLH690o1NbuTh6Y18nujr7BxlsFuS7gXLnLzKJGg==
+  version "5.3.3"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-5.3.3.tgz#b330653cd3bd6b75009cc25c714cae7b93351ccd"
+  integrity sha512-D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg==
   dependencies:
     source-map "~0.6.0"
 
-cli-boxes@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.0.tgz#538ecae8f9c6ca508e3c3c95b453fe93cb4c168d"
-  integrity sha512-gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w==
-
-cliui@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
-  integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==
+cliui@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
+  integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==
   dependencies:
     string-width "^4.2.0"
-    strip-ansi "^6.0.0"
-    wrap-ansi "^6.2.0"
+    strip-ansi "^6.0.1"
+    wrap-ansi "^7.0.0"
 
 clone-deep@^4.0.1:
   version "4.0.1"
@@ -2704,14 +2815,6 @@ collect-v8-coverage@^1.0.0:
   resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59"
   integrity sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==
 
-collection-visit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
-  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
-  dependencies:
-    map-visit "^1.0.0"
-    object-visit "^1.0.0"
-
 color-convert@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
@@ -2729,7 +2832,7 @@ color-convert@^2.0.1:
 color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+  integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
 
 color-name@~1.1.4:
   version "1.1.4"
@@ -2741,17 +2844,10 @@ colorette@^2.0.10:
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da"
   integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==
 
-combined-stream@1.0.6, combined-stream@~1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
-  integrity sha1-cj599ugBrFYTETp+RFqbactjKBg=
-  dependencies:
-    delayed-stream "~1.0.0"
-
-combined-stream@^1.0.5, combined-stream@~1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
-  integrity sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=
+combined-stream@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
   dependencies:
     delayed-stream "~1.0.0"
 
@@ -2775,210 +2871,120 @@ commander@^8.3.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
   integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
 
-comment-parser@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.3.0.tgz#68beb7dbe0849295309b376406730cd16c719c44"
-  integrity sha512-hRpmWIKgzd81vn0ydoWoyPoALEOnF4wt8yKD35Ib1D6XC2siLiYaiqfGkYrunuKdsXGwpBpHU3+9r+RVw2NZfA==
+commander@~9.4.0:
+  version "9.4.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-9.4.0.tgz#bc4a40918fefe52e22450c111ecd6b7acce6f11c"
+  integrity sha512-sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw==
+
+comment-parser@1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.3.1.tgz#3d7ea3adaf9345594aedee6563f422348f165c1b"
+  integrity sha512-B52sN2VNghyq5ofvUsqZjmk6YkihBX5vMSChmSK9v4ShjKf3Vk5Xcmgpw4o+iIgtrnM/u5FiMpz9VKb8lpBveA==
 
 compare-version@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz#0162ec2d9351f5ddd59a9202cba935366a725080"
   integrity sha1-AWLsLZNR9d3VmpICy6k1NmpyUIA=
 
-component-emitter@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
-  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
-
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concat-stream@^1.6.2:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
-  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
-  dependencies:
-    buffer-from "^1.0.0"
-    inherits "^2.0.3"
-    readable-stream "^2.2.2"
-    typedarray "^0.0.6"
-
-config-chain@^1.1.11:
-  version "1.1.12"
-  resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa"
-  integrity sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==
-  dependencies:
-    ini "^1.3.4"
-    proto-list "~1.2.1"
-
-configstore@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96"
-  integrity sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==
-  dependencies:
-    dot-prop "^5.2.0"
-    graceful-fs "^4.1.2"
-    make-dir "^3.0.0"
-    unique-string "^2.0.0"
-    write-file-atomic "^3.0.0"
-    xdg-basedir "^4.0.0"
-
 console-polyfill@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/console-polyfill/-/console-polyfill-0.3.0.tgz#84900902a18c47a5eba932be75fa44d23e8af861"
   integrity sha512-w+JSDZS7XML43Xnwo2x5O5vxB0ID7T5BdqDtyqT6uiCAX2kZAgcWxNaGqT97tZfSHzfOcvrfsDAodKcJ3UvnXQ==
 
-content-disposition@0.5.3:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
-  integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==
-  dependencies:
-    safe-buffer "5.1.2"
-
-content-type@~1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
-  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
-
-convert-source-map@^1.4.0:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
-  integrity sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU=
-
-convert-source-map@^1.6.0, convert-source-map@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
-  integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
-  dependencies:
-    safe-buffer "~5.1.1"
-
-cookie-signature@1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
-  integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
-
-cookie@0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
-  integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
-
-copy-descriptor@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
-  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
-
-core-js@^2.4.1, core-js@^2.5.3:
-  version "2.5.7"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e"
-  integrity sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==
-
-core-js@^3.6.5:
-  version "3.8.2"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.8.2.tgz#0a1fd6709246da9ca8eff5bb0cbd15fba9ac7044"
-  integrity sha512-FfApuSRgrR6G5s58casCBd9M2k+4ikuu4wbW6pJyYU7bd9zvFc9qf7vr5xmrZOhT9nn+8uwlH1oRR9jTnFoA3A==
-
-core-util-is@1.0.2, core-util-is@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+convert-source-map@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
+  integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
 
-cross-env@^5.0.5:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.1.1.tgz#b6d8ab97f304c0f71dae7277b75fe424c08dfa74"
-  integrity sha512-Wtvr+z0Z06KO1JxjfRRsPC+df7biIOiuV4iZ73cThjFGkH+ULBZq1MkBdywEcJC4cTDbO6c8IjgRjfswx3YTBA==
+create-jest@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/create-jest/-/create-jest-29.7.0.tgz#a355c5b3cb1e1af02ba177fe7afd7feee49a5320"
+  integrity sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==
   dependencies:
-    cross-spawn "^5.1.0"
-    is-windows "^1.0.0"
+    "@jest/types" "^29.6.3"
+    chalk "^4.0.0"
+    exit "^0.1.2"
+    graceful-fs "^4.2.9"
+    jest-config "^29.7.0"
+    jest-util "^29.7.0"
+    prompts "^2.0.1"
 
-cross-spawn@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
-  integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=
+cross-env@^7.0.3:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf"
+  integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==
   dependencies:
-    lru-cache "^4.0.1"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
+    cross-spawn "^7.0.1"
 
-cross-spawn@^6.0.0:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
-  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
+cross-spawn-windows-exe@^1.1.0, cross-spawn-windows-exe@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/cross-spawn-windows-exe/-/cross-spawn-windows-exe-1.2.0.tgz#46253b0f497676e766faf4a7061004618b5ac5ec"
+  integrity sha512-mkLtJJcYbDCxEG7Js6eUnUNndWjyUZwJ3H7bErmmtOYU/Zb99DyUkpamuIZE0b3bhmJyZ7D90uS6f+CGxRRjOw==
   dependencies:
-    nice-try "^1.0.4"
-    path-key "^2.0.1"
-    semver "^5.5.0"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
+    "@malept/cross-spawn-promise" "^1.1.0"
+    is-wsl "^2.2.0"
+    which "^2.0.2"
 
-cross-spawn@^7.0.0, cross-spawn@^7.0.2:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
+  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"
     which "^2.0.1"
 
-cryptiles@3.x.x:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"
-  integrity sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=
-  dependencies:
-    boom "5.x.x"
-
-crypto-random-string@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
-  integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==
-
-css-loader@^6.7.1:
-  version "6.7.1"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.7.1.tgz#e98106f154f6e1baf3fc3bc455cb9981c1d5fd2e"
-  integrity sha512-yB5CNFa14MbPJcomwNh3wLThtkZgcNyI2bNMRt8iE5Z8Vwl7f8vQXFAzn2HDOJvtDq2NTZBUGMSUNNyrv3/+cw==
+css-loader@^7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-7.1.2.tgz#64671541c6efe06b0e22e750503106bdd86880f8"
+  integrity sha512-6WvYYn7l/XEGN8Xu2vWFt9nVzrCn39vKyTEFf/ExEyoksJjjSZV/0/35XPlMbpnr6VGhZIUg5yJrL8tGfes/FA==
   dependencies:
     icss-utils "^5.1.0"
-    postcss "^8.4.7"
-    postcss-modules-extract-imports "^3.0.0"
-    postcss-modules-local-by-default "^4.0.0"
-    postcss-modules-scope "^3.0.0"
+    postcss "^8.4.33"
+    postcss-modules-extract-imports "^3.1.0"
+    postcss-modules-local-by-default "^4.0.5"
+    postcss-modules-scope "^3.2.0"
     postcss-modules-values "^4.0.0"
     postcss-value-parser "^4.2.0"
-    semver "^7.3.5"
+    semver "^7.5.4"
 
 css-select@^4.1.3:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.2.1.tgz#9e665d6ae4c7f9d65dbe69d0316e3221fb274cdd"
-  integrity sha512-/aUslKhzkTNCQUB2qTX84lVmfia9NyjP3WpDGtj/WxhwBzWBYUV3DgUpurHTme8UTPcPlAD1DJ+b0nN/t50zDQ==
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.3.0.tgz#db7129b2846662fd8628cfc496abb2b59e41529b"
+  integrity sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==
   dependencies:
     boolbase "^1.0.0"
-    css-what "^5.1.0"
-    domhandler "^4.3.0"
+    css-what "^6.0.1"
+    domhandler "^4.3.1"
     domutils "^2.8.0"
     nth-check "^2.0.1"
 
-css-what@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe"
-  integrity sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==
+css-what@^6.0.1:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4"
+  integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==
 
 cssesc@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
   integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
-cssom@^0.4.4:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10"
-  integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==
+cssom@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.5.0.tgz#d254fa92cd8b6fbd83811b9fbaed34663cc17c36"
+  integrity sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==
 
 cssom@~0.3.6:
   version "0.3.8"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
   integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
 
-cssstyle@^2.2.0:
+cssstyle@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852"
   integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==
@@ -2995,97 +3001,74 @@ cuint@^0.2.2:
   resolved "https://registry.yarnpkg.com/cuint/-/cuint-0.2.2.tgz#408086d409550c2631155619e9fa7bcadc3b991b"
   integrity sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs=
 
-dashdash@^1.12.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
+damerau-levenshtein@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz#b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7"
+  integrity sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==
+
+data-urls@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-3.0.2.tgz#9cf24a477ae22bcef5cd5f6f0bfbc1d2d3be9143"
+  integrity sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==
   dependencies:
-    assert-plus "^1.0.0"
+    abab "^2.0.6"
+    whatwg-mimetype "^3.0.0"
+    whatwg-url "^11.0.0"
 
-data-urls@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b"
-  integrity sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==
+debounce@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5"
+  integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==
+
+debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4:
+  version "4.3.6"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.6.tgz#2ab2c38fbaffebf8aa95fdfe6d88438c7a13c52b"
+  integrity sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==
   dependencies:
-    abab "^2.0.3"
-    whatwg-mimetype "^2.3.0"
-    whatwg-url "^8.0.0"
+    ms "2.1.2"
 
-debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
+debug@^2.2.0, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
   dependencies:
     ms "2.0.0"
 
-debug@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
-  dependencies:
-    ms "2.0.0"
-
-debug@^4.0.1:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.0.tgz#373687bffa678b38b1cd91f861b63850035ddc87"
-  integrity sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==
+debug@^3.1.0, debug@^3.2.7:
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
+  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
   dependencies:
     ms "^2.1.1"
 
-debug@^4.1.0, debug@^4.1.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
-  integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
-  dependencies:
-    ms "2.1.2"
-
-debug@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1"
-  integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==
-  dependencies:
-    ms "2.1.2"
-
-debug@^4.3.2, debug@^4.3.3:
-  version "4.3.3"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664"
-  integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==
-  dependencies:
-    ms "2.1.2"
-
 debuglog@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
   integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
 
-decamelize@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
-
-decimal.js@^10.2.0:
-  version "10.2.1"
-  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz#238ae7b0f0c793d3e3cea410108b35a2c01426a3"
-  integrity sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==
-
-decode-uri-component@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
-  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
+decimal.js@^10.4.2:
+  version "10.4.3"
+  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23"
+  integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==
 
-decompress-response@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
-  integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=
+decompress-response@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc"
+  integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==
   dependencies:
-    mimic-response "^1.0.0"
+    mimic-response "^3.1.0"
+
+dedent@^1.0.0:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/dedent/-/dedent-1.5.1.tgz#4f3fc94c8b711e9bb2800d185cd6ad20f2a90aff"
+  integrity sha512-+LxW+KLWxu3HW3M2w2ympwtqPrqYRzU8fqi6Fhd18fBALe15blJPI/I4+UHveMVG6lJqB4JNd4UG0S5cnVHwIg==
 
 deep-extend@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
   integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
 
-deep-is@^0.1.3, deep-is@~0.1.3:
+deep-is@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
   integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
@@ -3095,10 +3078,51 @@ deepmerge@^4.2.2:
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
   integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
 
-defer-to-connect@^1.0.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591"
-  integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==
+default-browser-id@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/default-browser-id/-/default-browser-id-3.0.0.tgz#bee7bbbef1f4e75d31f98f4d3f1556a14cea790c"
+  integrity sha512-OZ1y3y0SqSICtE8DE4S8YOE9UZOJ8wO16fKWVP5J1Qz42kV9jcnMVFrEE/noXb/ss3Q4pZIH79kxofzyNNtUNA==
+  dependencies:
+    bplist-parser "^0.2.0"
+    untildify "^4.0.0"
+
+default-browser@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/default-browser/-/default-browser-4.0.0.tgz#53c9894f8810bf86696de117a6ce9085a3cbc7da"
+  integrity sha512-wX5pXO1+BrhMkSbROFsyxUm0i/cJEScyNhA4PPxc41ICuv05ZZB/MX28s8aZx6xjmatvebIapF6hLEKEcpneUA==
+  dependencies:
+    bundle-name "^3.0.0"
+    default-browser-id "^3.0.0"
+    execa "^7.1.1"
+    titleize "^3.0.0"
+
+defer-to-connect@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587"
+  integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==
+
+define-data-property@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.0.tgz#0db13540704e1d8d479a0656cf781267531b9451"
+  integrity sha512-UzGwzcjyv3OtAvolTj1GoyNYzfFR+iqbGjcnBEENZVCpM4/Ng1yhGNvS3lR/xDS74Tb2wGG9WzNSNIOS9UVb2g==
+  dependencies:
+    get-intrinsic "^1.2.1"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.0"
+
+define-data-property@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.1.tgz#c35f7cd0ab09883480d12ac5cb213715587800b3"
+  integrity sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==
+  dependencies:
+    get-intrinsic "^1.2.1"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.0"
+
+define-lazy-prop@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz#dbb19adfb746d7fc6d734a06b72f4a00d021255f"
+  integrity sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==
 
 define-properties@^1.1.2, define-properties@^1.1.3:
   version "1.1.3"
@@ -3107,42 +3131,32 @@ define-properties@^1.1.2, define-properties@^1.1.3:
   dependencies:
     object-keys "^1.0.12"
 
-define-property@^0.2.5:
-  version "0.2.5"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
-  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
-  dependencies:
-    is-descriptor "^0.1.0"
-
-define-property@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
-  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
+define-properties@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1"
+  integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==
   dependencies:
-    is-descriptor "^1.0.0"
+    has-property-descriptors "^1.0.0"
+    object-keys "^1.1.1"
 
-define-property@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
-  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
+define-properties@^1.2.0, define-properties@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c"
+  integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==
   dependencies:
-    is-descriptor "^1.0.2"
-    isobject "^3.0.1"
+    define-data-property "^1.0.1"
+    has-property-descriptors "^1.0.0"
+    object-keys "^1.1.1"
 
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
-
-depd@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
-  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
+  integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
 
-destroy@~1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
-  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
+dequal@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be"
+  integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==
 
 detect-newline@^3.0.0:
   version "3.1.0"
@@ -3162,26 +3176,24 @@ dezalgo@^1.0.0:
     asap "^2.0.0"
     wrappy "1"
 
-diff-sequences@^24.3.0:
-  version "24.3.0"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.3.0.tgz#0f20e8a1df1abddaf4d9c226680952e64118b975"
-  integrity sha512-xLqpez+Zj9GKSnPWS0WZw1igGocZ+uua8+y+5dDNTT934N3QuY1sp2LkHzwiaYQGz60hMq0pjAshdeXm5VUOEw==
-
-diff-sequences@^25.2.6:
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.2.6.tgz#5f467c00edd35352b7bca46d7927d60e687a76dd"
-  integrity sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==
-
-diff-sequences@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz#48ba99157de1923412eed41db6b6d4aa9ca7c0b1"
-  integrity sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==
+diff-sequences@^29.6.3:
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.6.3.tgz#4deaf894d11407c51efc8418012f9e70b84ea921"
+  integrity sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==
 
 diff@^3.1.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
   integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
 
+dir-compare@^3.0.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-3.3.0.tgz#2c749f973b5c4b5d087f11edaae730db31788416"
+  integrity sha512-J7/et3WlGUCxjdnD3HAAzQ6nsnc0WL6DD7WcwJb7c39iH1+AWfg+9OqzJNaI6PkBwBvm1mhZNL9iY/nRiZXlPg==
+  dependencies:
+    buffer-equal "^1.0.0"
+    minimatch "^3.0.4"
+
 dir-glob@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
@@ -3189,18 +3201,6 @@ dir-glob@^3.0.1:
   dependencies:
     path-type "^4.0.0"
 
-dmg-builder@22.7.0:
-  version "22.7.0"
-  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.7.0.tgz#ead7e7c046cbdc52d29d302a4455f6668cdf7d45"
-  integrity sha512-5Ea2YEz6zSNbyGzZD+O9/MzmaXb6oa15cSKWo4JQ1xP4rorOpte7IOj2jcwYjtc+Los2gu1lvT314OC1OZIWgg==
-  dependencies:
-    app-builder-lib "22.7.0"
-    builder-util "22.7.0"
-    fs-extra "^9.0.0"
-    iconv-lite "^0.5.1"
-    js-yaml "^3.14.0"
-    sanitize-filename "^1.6.3"
-
 doctrine@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
@@ -3223,37 +3223,30 @@ dom-converter@^0.2.0:
     utila "~0.4"
 
 dom-serializer@^1.0.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91"
-  integrity sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.4.1.tgz#de5d41b1aea290215dc45a6dae8adcf1d32e2d30"
+  integrity sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==
   dependencies:
     domelementtype "^2.0.1"
     domhandler "^4.2.0"
     entities "^2.0.0"
 
 domelementtype@^2.0.1, domelementtype@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57"
-  integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==
-
-domexception@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90"
-  integrity sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==
-  dependencies:
-    webidl-conversions "^4.0.2"
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
+  integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
 
-domexception@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304"
-  integrity sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==
+domexception@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/domexception/-/domexception-4.0.0.tgz#4ad1be56ccadc86fc76d033353999a8037d03673"
+  integrity sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==
   dependencies:
-    webidl-conversions "^5.0.0"
+    webidl-conversions "^7.0.0"
 
-domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.0.tgz#16c658c626cf966967e306f966b431f77d4a5626"
-  integrity sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g==
+domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c"
+  integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==
   dependencies:
     domelementtype "^2.2.0"
 
@@ -3274,139 +3267,50 @@ dot-case@^3.0.4:
     no-case "^3.0.4"
     tslib "^2.0.3"
 
-dot-prop@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz#c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb"
-  integrity sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==
-  dependencies:
-    is-obj "^2.0.0"
-
-dotenv-expand@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0"
-  integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==
-
-dotenv@^8.2.0:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a"
-  integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==
-
-duplexer3@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
-  integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=
-
 duplexer@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
   integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
 
+eastasianwidth@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
+  integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
+
 easy-stack@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/easy-stack/-/easy-stack-1.0.0.tgz#12c91b3085a37f0baa336e9486eac4bf94e3e788"
   integrity sha1-EskbMIWjfwuqM26UhurEv5Tj54g=
 
-ecc-jsbn@~0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
-  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
-  dependencies:
-    jsbn "~0.1.0"
-    safer-buffer "^2.1.0"
-
-ee-first@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
-  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
-
-ejs@^3.1.3:
-  version "3.1.7"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.7.tgz#c544d9c7f715783dd92f0bddcf73a59e6962d006"
-  integrity sha512-BIar7R6abbUxDA3bfXrO4DSgwo8I+fB5/1zgujl3HLLjwd6+9iOnrT+t3grn2qbk9vOgBubXOFwX2m9axoFaGw==
-  dependencies:
-    jake "^10.8.5"
-
-electron-builder@^22.7.0:
-  version "22.7.0"
-  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.7.0.tgz#a42d08a1654ffc2f7d9e2860829d3cc55d4a0c81"
-  integrity sha512-t6E3oMutpST64YWbZCg7HodEwJOsnjUF1vnDIHm2MW6CFZPX8tlCK6efqaV66LU0E0Nkp/JH6TE5bCqQ1+VdPQ==
-  dependencies:
-    "@types/yargs" "^15.0.5"
-    app-builder-lib "22.7.0"
-    bluebird-lst "^1.0.9"
-    builder-util "22.7.0"
-    builder-util-runtime "8.7.1"
-    chalk "^4.0.0"
-    dmg-builder "22.7.0"
-    fs-extra "^9.0.0"
-    is-ci "^2.0.0"
-    lazy-val "^1.0.4"
-    read-config-file "6.0.0"
-    sanitize-filename "^1.6.3"
-    update-notifier "^4.1.0"
-    yargs "^15.3.1"
-
-electron-notarize@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-1.0.0.tgz#bc925b1ccc3f79e58e029e8c4706572b01a9fd8f"
-  integrity sha512-dsib1IAquMn0onCrNMJ6gtEIZn/azG8hZMCYOuZIMVMUeRMgBYHK1s5TK9P8xAcrAjh/2aN5WYHzgVSWX314og==
-  dependencies:
-    debug "^4.1.1"
-    fs-extra "^9.0.1"
-
-electron-osx-sign@^0.4.11:
-  version "0.4.17"
-  resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.4.17.tgz#2727ca0c79e1e4e5ccd3861fb3da9c3c913b006c"
-  integrity sha512-wUJPmZJQCs1zgdlQgeIpRcvrf7M5/COQaOV68Va1J/SgmWx5KL2otgg+fAae7luw6qz9R8Gvu/Qpe9tAOu/3xQ==
-  dependencies:
-    bluebird "^3.5.0"
-    compare-version "^0.1.2"
-    debug "^2.6.8"
-    isbinaryfile "^3.0.2"
-    minimist "^1.2.0"
-    plist "^3.0.1"
-
-electron-packager@^15.1.0:
-  version "15.1.0"
-  resolved "https://registry.yarnpkg.com/electron-packager/-/electron-packager-15.1.0.tgz#16a3733e4cad26112a2ac36f0b0f35c3b0170eff"
-  integrity sha512-THNm4bz1DfvR9f0g51+NjuAYELflM8+1vhQ/iv/G8vyZNKzSMuFd5doobngQKq3rRsLdPNZVnGqDdgS884d7Og==
-  dependencies:
-    "@electron/get" "^1.6.0"
-    asar "^3.0.0"
+electron-packager@^17.1.1:
+  version "17.1.1"
+  resolved "https://registry.yarnpkg.com/electron-packager/-/electron-packager-17.1.1.tgz#f156fc63d3a66f4e902e4b42992550a172982d59"
+  integrity sha512-r1NDtlajsq7gf2EXgjRfblCVPquvD2yeg+6XGErOKblvxOpDi0iulZLVhgYDP4AEF1P5/HgbX/vwjlkEv7PEIQ==
+  dependencies:
+    "@electron/asar" "^3.2.1"
+    "@electron/get" "^2.0.0"
+    "@electron/notarize" "^1.2.3"
+    "@electron/osx-sign" "^1.0.1"
+    "@electron/universal" "^1.3.2"
+    cross-spawn-windows-exe "^1.2.0"
     debug "^4.0.1"
-    electron-notarize "^1.0.0"
-    electron-osx-sign "^0.4.11"
     extract-zip "^2.0.0"
     filenamify "^4.1.0"
-    fs-extra "^9.0.0"
+    fs-extra "^10.1.0"
     galactus "^0.2.1"
     get-package-info "^1.0.0"
     junk "^3.1.0"
     parse-author "^2.0.0"
     plist "^3.0.0"
-    rcedit "^2.0.0"
+    rcedit "^3.0.1"
     resolve "^1.1.6"
     semver "^7.1.3"
-    yargs-parser "^19.0.1"
-
-electron-publish@22.7.0:
-  version "22.7.0"
-  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.7.0.tgz#d92ba7c4007c9ac1dd070593e48028184fb2dc19"
-  integrity sha512-hmU69xlb6vvAV3QfpHYDlkdZMFdBAgDbptoxbLFrnTq5bOkcL8AaDbvxeoZ4+lvqgs29NwqGpkHo2oN+p/hCfg==
-  dependencies:
-    "@types/fs-extra" "^9.0.1"
-    bluebird-lst "^1.0.9"
-    builder-util "22.7.0"
-    builder-util-runtime "8.7.1"
-    chalk "^4.0.0"
-    fs-extra "^9.0.0"
-    lazy-val "^1.0.4"
-    mime "^2.4.5"
+    yargs-parser "^21.1.1"
 
-electron-to-chromium@^1.4.17:
-  version "1.4.40"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.40.tgz#f5dbced7bfbc7072e5e7ca5487f8f9a42c8bc768"
-  integrity sha512-j+eVIyQGt2EU5xPWUblhpp5P5z5xyAdRgzogBgfe2F5JGV17gr9pfzWBua6DlPL00LavbOjxubWkWkbVQe9Wlw==
+electron-to-chromium@^1.4.202, electron-to-chromium@^1.5.4:
+  version "1.5.13"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.13.tgz#1abf0410c5344b2b829b7247e031f02810d442e6"
+  integrity sha512-lbBcvtIJ4J6sS4tb5TLp1b4LyfCdMkwStzXPyAgVgTRAsep4bvrAGaBOP7ZJtQMNJpSQ9SqG4brWOroNaQtm7Q==
 
 electron-winstaller@*, electron-winstaller@^5.0.0:
   version "5.0.0"
@@ -3419,50 +3323,40 @@ electron-winstaller@*, electron-winstaller@^5.0.0:
     lodash.template "^4.2.2"
     temp "^0.9.0"
 
-electron@17.0.1:
-  version "17.0.1"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-17.0.1.tgz#e6c7ad2be26e7be8a5a9bac16b21920ad2671224"
-  integrity sha512-CBReR/QEOpgwMdt59lWCtj9wC8oHB6aAjMF1lhXcGew132xtp+C5N6EaXb/fmDceVYLouziYjbNcpeXsWrqdpA==
+electron@32.1.2:
+  version "32.1.2"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-32.1.2.tgz#84d1efd95d41224e58a6a9bbd1db4ba80154fc02"
+  integrity sha512-CXe6doFzhmh1U7daOvUzmF6Cj8hssdYWMeEPRnRO6rB9/bbwMlWctcQ7P8NJXhLQ88/vYUJQrJvlJPh8qM0BRQ==
   dependencies:
-    "@electron/get" "^1.13.0"
-    "@types/node" "^14.6.2"
-    extract-zip "^1.0.3"
+    "@electron/get" "^2.0.0"
+    "@types/node" "^20.9.0"
+    extract-zip "^2.0.1"
 
 element-closest@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/element-closest/-/element-closest-2.0.2.tgz#72a740a107453382e28df9ce5dbb5a8df0f966ec"
   integrity sha1-cqdAoQdFM4LijfnOXbtajfD5Zuw=
 
-emittery@^0.7.1:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.7.2.tgz#25595908e13af0f5674ab419396e2fb394cdfa82"
-  integrity sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ==
-
-emoji-regex@^7.0.1:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
-  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
+emittery@^0.13.1:
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.13.1.tgz#c04b8c3457490e0847ae51fced3af52d338e3dad"
+  integrity sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==
 
 emoji-regex@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
-emojis-list@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
-  integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
+emoji-regex@^9.2.2:
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
+  integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
 
 emojis-list@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
   integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
 
-encodeurl@^1.0.2, encodeurl@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
-  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
-
 end-of-stream@^1.1.0:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
@@ -3470,26 +3364,37 @@ end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
-enhanced-resolve@^5.0.0, enhanced-resolve@^5.8.3:
-  version "5.9.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.9.0.tgz#49ac24953ac8452ed8fed2ef1340fc8e043667ee"
-  integrity sha512-weDYmzbBygL7HzGGS26M3hGQx68vehdEg6VUmqSOaFzXExFqlnKuSvsEJCVGQHScS8CQMbrAqftT+AzzHNt/YA==
+enhanced-resolve@^5.0.0:
+  version "5.12.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz#300e1c90228f5b570c4d35babf263f6da7155634"
+  integrity sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==
   dependencies:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
 
-enquirer@^2.3.5:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
-  integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
+enhanced-resolve@^5.17.1:
+  version "5.17.1"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15"
+  integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==
   dependencies:
-    ansi-colors "^4.1.1"
+    graceful-fs "^4.2.4"
+    tapable "^2.2.0"
 
 entities@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
   integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
 
+entities@^4.4.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
+  integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
+
+entities@~3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-3.0.1.tgz#2b887ca62585e96db3903482d336c1006c3001d4"
+  integrity sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==
+
 env-paths@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43"
@@ -3553,6 +3458,80 @@ es-abstract@^1.19.0, es-abstract@^1.19.1:
     string.prototype.trimstart "^1.0.4"
     unbox-primitive "^1.0.1"
 
+es-abstract@^1.19.2, es-abstract@^1.19.5:
+  version "1.20.1"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.1.tgz#027292cd6ef44bd12b1913b828116f54787d1814"
+  integrity sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA==
+  dependencies:
+    call-bind "^1.0.2"
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    function.prototype.name "^1.1.5"
+    get-intrinsic "^1.1.1"
+    get-symbol-description "^1.0.0"
+    has "^1.0.3"
+    has-property-descriptors "^1.0.0"
+    has-symbols "^1.0.3"
+    internal-slot "^1.0.3"
+    is-callable "^1.2.4"
+    is-negative-zero "^2.0.2"
+    is-regex "^1.1.4"
+    is-shared-array-buffer "^1.0.2"
+    is-string "^1.0.7"
+    is-weakref "^1.0.2"
+    object-inspect "^1.12.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.2"
+    regexp.prototype.flags "^1.4.3"
+    string.prototype.trimend "^1.0.5"
+    string.prototype.trimstart "^1.0.5"
+    unbox-primitive "^1.0.2"
+
+es-abstract@^1.22.1:
+  version "1.22.2"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.2.tgz#90f7282d91d0ad577f505e423e52d4c1d93c1b8a"
+  integrity sha512-YoxfFcDmhjOgWPWsV13+2RNjq1F6UQnfs+8TftwNqtzlmFzEXvlUwdrNrYeaizfjQzRMxkZ6ElWMOJIFKdVqwA==
+  dependencies:
+    array-buffer-byte-length "^1.0.0"
+    arraybuffer.prototype.slice "^1.0.2"
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.2"
+    es-set-tostringtag "^2.0.1"
+    es-to-primitive "^1.2.1"
+    function.prototype.name "^1.1.6"
+    get-intrinsic "^1.2.1"
+    get-symbol-description "^1.0.0"
+    globalthis "^1.0.3"
+    gopd "^1.0.1"
+    has "^1.0.3"
+    has-property-descriptors "^1.0.0"
+    has-proto "^1.0.1"
+    has-symbols "^1.0.3"
+    internal-slot "^1.0.5"
+    is-array-buffer "^3.0.2"
+    is-callable "^1.2.7"
+    is-negative-zero "^2.0.2"
+    is-regex "^1.1.4"
+    is-shared-array-buffer "^1.0.2"
+    is-string "^1.0.7"
+    is-typed-array "^1.1.12"
+    is-weakref "^1.0.2"
+    object-inspect "^1.12.3"
+    object-keys "^1.1.1"
+    object.assign "^4.1.4"
+    regexp.prototype.flags "^1.5.1"
+    safe-array-concat "^1.0.1"
+    safe-regex-test "^1.0.0"
+    string.prototype.trim "^1.2.8"
+    string.prototype.trimend "^1.0.7"
+    string.prototype.trimstart "^1.0.7"
+    typed-array-buffer "^1.0.0"
+    typed-array-byte-length "^1.0.0"
+    typed-array-byte-offset "^1.0.0"
+    typed-array-length "^1.0.4"
+    unbox-primitive "^1.0.2"
+    which-typed-array "^1.1.11"
+
 es-abstract@^1.5.1, es-abstract@^1.7.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.9.0.tgz#690829a07cae36b222e7fd9b75c0d0573eb25227"
@@ -3564,10 +3543,46 @@ es-abstract@^1.5.1, es-abstract@^1.7.0:
     is-callable "^1.1.3"
     is-regex "^1.0.4"
 
-es-module-lexer@^0.9.0:
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19"
-  integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==
+es-iterator-helpers@^1.0.12:
+  version "1.0.15"
+  resolved "https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.0.15.tgz#bd81d275ac766431d19305923707c3efd9f1ae40"
+  integrity sha512-GhoY8uYqd6iwUl2kgjTm4CZAf6oo5mHK7BPqx3rKgx893YSsy0LGHV6gfqqQvZt/8xM8xeOnfXBCfqclMKkJ5g==
+  dependencies:
+    asynciterator.prototype "^1.0.0"
+    call-bind "^1.0.2"
+    define-properties "^1.2.1"
+    es-abstract "^1.22.1"
+    es-set-tostringtag "^2.0.1"
+    function-bind "^1.1.1"
+    get-intrinsic "^1.2.1"
+    globalthis "^1.0.3"
+    has-property-descriptors "^1.0.0"
+    has-proto "^1.0.1"
+    has-symbols "^1.0.3"
+    internal-slot "^1.0.5"
+    iterator.prototype "^1.1.2"
+    safe-array-concat "^1.0.1"
+
+es-module-lexer@^1.2.1:
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.5.4.tgz#a8efec3a3da991e60efa6b633a7cad6ab8d26b78"
+  integrity sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==
+
+es-set-tostringtag@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz#338d502f6f674301d710b80c8592de8a15f09cd8"
+  integrity sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==
+  dependencies:
+    get-intrinsic "^1.1.3"
+    has "^1.0.3"
+    has-tostringtag "^1.0.0"
+
+es-shim-unscopables@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241"
+  integrity sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==
+  dependencies:
+    has "^1.0.3"
 
 es-to-primitive@^1.1.1:
   version "1.1.1"
@@ -3602,25 +3617,15 @@ es6-shim@^0.35.3:
   resolved "https://registry.yarnpkg.com/es6-shim/-/es6-shim-0.35.3.tgz#9bfb7363feffff87a6cdb6cd93e405ec3c4b6f26"
   integrity sha1-m/tzY/7//4emzbbNk+QF7DxLbyY=
 
-escalade@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
-  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
-
-escape-goat@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675"
-  integrity sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==
-
-escape-html@~1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
-  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
+escalade@^3.1.1, escalade@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27"
+  integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==
 
 escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+  integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
 
 escape-string-regexp@^2.0.0:
   version "2.0.0"
@@ -3632,18 +3637,22 @@ escape-string-regexp@^4.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-escodegen@^1.14.1:
-  version "1.14.3"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503"
-  integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==
+escodegen@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.1.0.tgz#ba93bbb7a43986d29d6041f99f5262da773e2e17"
+  integrity sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==
   dependencies:
     esprima "^4.0.1"
-    estraverse "^4.2.0"
+    estraverse "^5.2.0"
     esutils "^2.0.2"
-    optionator "^0.8.1"
   optionalDependencies:
     source-map "~0.6.1"
 
+eslint-config-prettier@>=8.0.0:
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz#5a81680ec934beca02c7b1a61cf8ca34b66feab1"
+  integrity sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==
+
 eslint-config-prettier@^6.11.0:
   version "6.11.0"
   resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.11.0.tgz#f6d2238c1290d01c859a8b5c1f7d352a0b0da8b1"
@@ -3651,54 +3660,183 @@ eslint-config-prettier@^6.11.0:
   dependencies:
     get-stdin "^6.0.0"
 
-eslint-plugin-jsdoc@^37.7.0:
-  version "37.7.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-37.7.0.tgz#975d9f18cb0520dde7a2b0db5f4421dfee3fdd17"
-  integrity sha512-vzy3/ltXoGtabRnjLogaEmhGxxIv5B8HK5MJLIrdxFJUvhBppZjuVuLr71DjIBi0jg6bFomwkYKjojt29cN8PA==
+eslint-import-resolver-node@^0.3.6:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd"
+  integrity sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==
   dependencies:
-    "@es-joy/jsdoccomment" "~0.18.0"
-    comment-parser "1.3.0"
-    debug "^4.3.3"
-    escape-string-regexp "^4.0.0"
-    esquery "^1.4.0"
-    regextras "^0.8.0"
-    semver "^7.3.5"
-    spdx-expression-parse "^3.0.1"
+    debug "^3.2.7"
+    resolve "^1.20.0"
 
-eslint-plugin-json@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-json/-/eslint-plugin-json-2.1.2.tgz#5bc1c221984583c0c5ff21c488386e8263a6bbb7"
-  integrity sha512-isM/fsUxS4wN1+nLsWoV5T4gLgBQnsql3nMTr8u+cEls1bL8rRQO5CP5GtxJxaOfbcKqnz401styw+H/P+e78Q==
+eslint-module-utils@^2.7.3:
+  version "2.7.4"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz#4f3e41116aaf13a20792261e61d3a2e7e0583974"
+  integrity sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==
   dependencies:
-    lodash "^4.17.19"
-    vscode-json-languageservice "^3.7.0"
+    debug "^3.2.7"
 
-eslint-plugin-prettier@^3.1.4:
+eslint-plugin-escompat@^3.3.3:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-escompat/-/eslint-plugin-escompat-3.4.0.tgz#cfd8d3b44fd0bc3d07b8ca15e4b0c15de88a0192"
+  integrity sha512-ufTPv8cwCxTNoLnTZBFTQ5SxU2w7E7wiMIS7PSxsgP1eAxFjtSaoZ80LRn64hI8iYziE6kJG6gX/ZCJVxh48Bg==
+  dependencies:
+    browserslist "^4.21.0"
+
+eslint-plugin-eslint-comments@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-eslint-comments/-/eslint-plugin-eslint-comments-3.2.0.tgz#9e1cd7b4413526abb313933071d7aba05ca12ffa"
+  integrity sha512-0jkOl0hfojIHHmEHgmNdqv4fmh7300NdpA9FFpF7zaoLvB/QeXOGNLIo86oAveJFrfB1p05kC8hpEMHM8DwWVQ==
+  dependencies:
+    escape-string-regexp "^1.0.5"
+    ignore "^5.0.5"
+
+eslint-plugin-filenames@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-filenames/-/eslint-plugin-filenames-1.3.2.tgz#7094f00d7aefdd6999e3ac19f72cea058e590cf7"
+  integrity sha512-tqxJTiEM5a0JmRCUYQmxw23vtTxrb2+a3Q2mMOPhFxvt7ZQQJmdiuMby9B/vUAuVMghyP7oET+nIf6EO6CBd/w==
+  dependencies:
+    lodash.camelcase "4.3.0"
+    lodash.kebabcase "4.1.1"
+    lodash.snakecase "4.1.1"
+    lodash.upperfirst "4.3.1"
+
+eslint-plugin-github@^4.10.1:
+  version "4.10.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-github/-/eslint-plugin-github-4.10.1.tgz#b315660ec3734dc01a7a4ddb54490c4d6b37a07c"
+  integrity sha512-1AqQBockOM+m0ZUpwfjWtX0lWdX5cRi/hwJnSNvXoOmz/Hh+ULH6QFz6ENWueTWjoWpgPv0af3bj+snps6o4og==
+  dependencies:
+    "@github/browserslist-config" "^1.0.0"
+    "@typescript-eslint/eslint-plugin" "^6.0.0"
+    "@typescript-eslint/parser" "^6.0.0"
+    aria-query "^5.3.0"
+    eslint-config-prettier ">=8.0.0"
+    eslint-plugin-escompat "^3.3.3"
+    eslint-plugin-eslint-comments "^3.2.0"
+    eslint-plugin-filenames "^1.3.2"
+    eslint-plugin-i18n-text "^1.0.1"
+    eslint-plugin-import "^2.25.2"
+    eslint-plugin-jsx-a11y "^6.7.1"
+    eslint-plugin-no-only-tests "^3.0.0"
+    eslint-plugin-prettier "^5.0.0"
+    eslint-rule-documentation ">=1.0.0"
+    jsx-ast-utils "^3.3.2"
+    prettier "^3.0.0"
+    svg-element-attributes "^1.3.1"
+
+eslint-plugin-i18n-text@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-i18n-text/-/eslint-plugin-i18n-text-1.0.1.tgz#69ce14f9af7d135cbe8114b1b144a57bb83291dc"
+  integrity sha512-3G3UetST6rdqhqW9SfcfzNYMpQXS7wNkJvp6dsXnjzGiku6Iu5hl3B0kmk6lIcFPwYjhQIY+tXVRtK9TlGT7RA==
+
+eslint-plugin-import@^2.25.2:
+  version "2.26.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz#f812dc47be4f2b72b478a021605a59fc6fe8b88b"
+  integrity sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==
+  dependencies:
+    array-includes "^3.1.4"
+    array.prototype.flat "^1.2.5"
+    debug "^2.6.9"
+    doctrine "^2.1.0"
+    eslint-import-resolver-node "^0.3.6"
+    eslint-module-utils "^2.7.3"
+    has "^1.0.3"
+    is-core-module "^2.8.1"
+    is-glob "^4.0.3"
+    minimatch "^3.1.2"
+    object.values "^1.1.5"
+    resolve "^1.22.0"
+    tsconfig-paths "^3.14.1"
+
+eslint-plugin-jsdoc@^43.0.1:
+  version "43.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-43.1.1.tgz#fc72ba21597cc99b1a0dc988aebb9bb57d0ec492"
+  integrity sha512-J2kjjsJ5vBXSyNzqJhceeSGTAgVgZHcPSJKo3vD4tNjUdfky98rR2VfZUDsS1GKL6isyVa8GWvr+Az7Vyg2HXA==
+  dependencies:
+    "@es-joy/jsdoccomment" "~0.37.1"
+    are-docs-informative "^0.0.2"
+    comment-parser "1.3.1"
+    debug "^4.3.4"
+    escape-string-regexp "^4.0.0"
+    esquery "^1.5.0"
+    semver "^7.5.0"
+    spdx-expression-parse "^3.0.1"
+
+eslint-plugin-json@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-json/-/eslint-plugin-json-2.1.2.tgz#5bc1c221984583c0c5ff21c488386e8263a6bbb7"
+  integrity sha512-isM/fsUxS4wN1+nLsWoV5T4gLgBQnsql3nMTr8u+cEls1bL8rRQO5CP5GtxJxaOfbcKqnz401styw+H/P+e78Q==
+  dependencies:
+    lodash "^4.17.19"
+    vscode-json-languageservice "^3.7.0"
+
+eslint-plugin-jsx-a11y@^6.7.1:
+  version "6.7.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.7.1.tgz#fca5e02d115f48c9a597a6894d5bcec2f7a76976"
+  integrity sha512-63Bog4iIethyo8smBklORknVjB0T2dwB8Mr/hIC+fBS0uyHdYYpzM/Ed+YC8VxTjlXHEWFOdmgwcDn1U2L9VCA==
+  dependencies:
+    "@babel/runtime" "^7.20.7"
+    aria-query "^5.1.3"
+    array-includes "^3.1.6"
+    array.prototype.flatmap "^1.3.1"
+    ast-types-flow "^0.0.7"
+    axe-core "^4.6.2"
+    axobject-query "^3.1.1"
+    damerau-levenshtein "^1.0.8"
+    emoji-regex "^9.2.2"
+    has "^1.0.3"
+    jsx-ast-utils "^3.3.3"
+    language-tags "=1.0.5"
+    minimatch "^3.1.2"
+    object.entries "^1.1.6"
+    object.fromentries "^2.0.6"
+    semver "^6.3.0"
+
+eslint-plugin-no-only-tests@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-no-only-tests/-/eslint-plugin-no-only-tests-3.1.0.tgz#f38e4935c6c6c4842bf158b64aaa20c366fe171b"
+  integrity sha512-Lf4YW/bL6Un1R6A76pRZyE1dl1vr31G/ev8UzIc/geCgFWyrKil8hVjYqWVKGB/UIGmb6Slzs9T0wNezdSVegw==
+
+eslint-plugin-prettier@^3.1.4:
   version "3.1.4"
   resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.4.tgz#168ab43154e2ea57db992a2cd097c828171f75c2"
   integrity sha512-jZDa8z76klRqo+TdGDTFJSavwbnWK2ZpqGKNZ+VvweMW516pDUMmQ2koXvxEE4JhzNvTv+radye/bWGBmA6jmg==
   dependencies:
     prettier-linter-helpers "^1.0.0"
 
-eslint-plugin-react@7.26.1:
-  version "7.26.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.26.1.tgz#41bcfe3e39e6a5ac040971c1af94437c80daa40e"
-  integrity sha512-Lug0+NOFXeOE+ORZ5pbsh6mSKjBKXDXItUD2sQoT+5Yl0eoT82DqnXeTMfUare4QVCn9QwXbfzO/dBLjLXwVjQ==
+eslint-plugin-prettier@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-5.0.0.tgz#6887780ed95f7708340ec79acfdf60c35b9be57a"
+  integrity sha512-AgaZCVuYDXHUGxj/ZGu1u8H8CYgDY3iG6w5kUFw4AzMVXzB7VvbKgYR4nATIN+OvUrghMbiDLeimVjVY5ilq3w==
   dependencies:
-    array-includes "^3.1.3"
-    array.prototype.flatmap "^1.2.4"
+    prettier-linter-helpers "^1.0.0"
+    synckit "^0.8.5"
+
+eslint-plugin-react@^7.33.2:
+  version "7.33.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.33.2.tgz#69ee09443ffc583927eafe86ffebb470ee737608"
+  integrity sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw==
+  dependencies:
+    array-includes "^3.1.6"
+    array.prototype.flatmap "^1.3.1"
+    array.prototype.tosorted "^1.1.1"
     doctrine "^2.1.0"
-    estraverse "^5.2.0"
+    es-iterator-helpers "^1.0.12"
+    estraverse "^5.3.0"
     jsx-ast-utils "^2.4.1 || ^3.0.0"
-    minimatch "^3.0.4"
-    object.entries "^1.1.4"
-    object.fromentries "^2.0.4"
-    object.hasown "^1.0.0"
-    object.values "^1.1.4"
-    prop-types "^15.7.2"
-    resolve "^2.0.0-next.3"
-    semver "^6.3.0"
-    string.prototype.matchall "^4.0.5"
+    minimatch "^3.1.2"
+    object.entries "^1.1.6"
+    object.fromentries "^2.0.6"
+    object.hasown "^1.1.2"
+    object.values "^1.1.6"
+    prop-types "^15.8.1"
+    resolve "^2.0.0-next.4"
+    semver "^6.3.1"
+    string.prototype.matchall "^4.0.8"
+
+eslint-rule-documentation@>=1.0.0:
+  version "1.0.23"
+  resolved "https://registry.yarnpkg.com/eslint-rule-documentation/-/eslint-rule-documentation-1.0.23.tgz#4e0886145597a78d24524ec7e0cf18c6fedc23a8"
+  integrity sha512-pWReu3fkohwyvztx/oQWWgld2iad25TfUdi6wvhhaDPIQjHU/pyvlKgXFw1kX31SQK2Nq9MH+vRDWB0ZLy8fYw==
 
 eslint-scope@5.1.1, eslint-scope@^5.1.1:
   version "5.1.1"
@@ -3708,126 +3846,89 @@ eslint-scope@5.1.1, eslint-scope@^5.1.1:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
-eslint-scope@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz#d0f971dfe59c69e0cada684b23d49dbf82600ce5"
-  integrity sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==
-  dependencies:
-    esrecurse "^4.1.0"
-    estraverse "^4.1.1"
-
-eslint-utils@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
-  integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
-  dependencies:
-    eslint-visitor-keys "^1.1.0"
-
-eslint-utils@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672"
-  integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==
+eslint-scope@^7.2.2:
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"
+  integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
   dependencies:
-    eslint-visitor-keys "^2.0.0"
-
-eslint-visitor-keys@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.2.0.tgz#74415ac884874495f78ec2a97349525344c981fa"
-  integrity sha512-WFb4ihckKil6hu3Dp798xdzSfddwKKU3+nGniKF6HfeW6OLd2OUDEPP7TcHtB5+QXOKg2s6B2DaMPE1Nn/kxKQ==
-
-eslint-visitor-keys@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
-  integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
-
-eslint-visitor-keys@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
-  integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
+    esrecurse "^4.3.0"
+    estraverse "^5.2.0"
 
-eslint-visitor-keys@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.2.0.tgz#6fbb166a6798ee5991358bc2daa1ba76cc1254a1"
-  integrity sha512-IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ==
+eslint-visitor-keys@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
+  integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
 
-eslint@^7.3.1:
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.6.0.tgz#522d67cfaea09724d96949c70e7a0550614d64d6"
-  integrity sha512-QlAManNtqr7sozWm5TF4wIH9gmUm2hE3vNRUvyoYAa4y1l5/jxD/PQStEjBMQtCqZmSep8UxrcecI60hOpe61w==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    ajv "^6.10.0"
+eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
+  integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
+
+eslint@^8.55.0:
+  version "8.55.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.55.0.tgz#078cb7b847d66f2c254ea1794fa395bf8e7e03f8"
+  integrity sha512-iyUUAM0PCKj5QpwGfmCAG9XXbZCWsqP/eWAWrG/W0umvjuLRBECwSFdt+rCntju0xEH7teIABPwXpahftIaTdA==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.2.0"
+    "@eslint-community/regexpp" "^4.6.1"
+    "@eslint/eslintrc" "^2.1.4"
+    "@eslint/js" "8.55.0"
+    "@humanwhocodes/config-array" "^0.11.13"
+    "@humanwhocodes/module-importer" "^1.0.1"
+    "@nodelib/fs.walk" "^1.2.8"
+    "@ungap/structured-clone" "^1.2.0"
+    ajv "^6.12.4"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
-    debug "^4.0.1"
+    debug "^4.3.2"
     doctrine "^3.0.0"
-    enquirer "^2.3.5"
-    eslint-scope "^5.1.0"
-    eslint-utils "^2.1.0"
-    eslint-visitor-keys "^1.3.0"
-    espree "^7.2.0"
-    esquery "^1.2.0"
+    escape-string-regexp "^4.0.0"
+    eslint-scope "^7.2.2"
+    eslint-visitor-keys "^3.4.3"
+    espree "^9.6.1"
+    esquery "^1.4.2"
     esutils "^2.0.2"
-    file-entry-cache "^5.0.1"
-    functional-red-black-tree "^1.0.1"
-    glob-parent "^5.0.0"
-    globals "^12.1.0"
-    ignore "^4.0.6"
-    import-fresh "^3.0.0"
+    fast-deep-equal "^3.1.3"
+    file-entry-cache "^6.0.1"
+    find-up "^5.0.0"
+    glob-parent "^6.0.2"
+    globals "^13.19.0"
+    graphemer "^1.4.0"
+    ignore "^5.2.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
-    js-yaml "^3.13.1"
+    is-path-inside "^3.0.3"
+    js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
-    lodash "^4.17.19"
-    minimatch "^3.0.4"
+    lodash.merge "^4.6.2"
+    minimatch "^3.1.2"
     natural-compare "^1.4.0"
-    optionator "^0.9.1"
-    progress "^2.0.0"
-    regexpp "^3.1.0"
-    semver "^7.2.1"
-    strip-ansi "^6.0.0"
-    strip-json-comments "^3.1.0"
-    table "^5.2.3"
+    optionator "^0.9.3"
+    strip-ansi "^6.0.1"
     text-table "^0.2.0"
-    v8-compile-cache "^2.0.3"
 
-espree@^7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-7.2.0.tgz#1c263d5b513dbad0ac30c4991b93ac354e948d69"
-  integrity sha512-H+cQ3+3JYRMEIOl87e7QdHX70ocly5iW4+dttuR8iYSPr/hXKFb+7dBsZ7+u1adC4VrnPlTkv0+OwuPnDop19g==
+espree@^9.6.0, espree@^9.6.1:
+  version "9.6.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
+  integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
   dependencies:
-    acorn "^7.3.1"
-    acorn-jsx "^5.2.0"
-    eslint-visitor-keys "^1.3.0"
+    acorn "^8.9.0"
+    acorn-jsx "^5.3.2"
+    eslint-visitor-keys "^3.4.1"
 
 esprima@^4.0.0, esprima@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
-esquery@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57"
-  integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==
-  dependencies:
-    estraverse "^5.1.0"
-
-esquery@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
-  integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==
+esquery@^1.4.2, esquery@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
+  integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
   dependencies:
     estraverse "^5.1.0"
 
-esrecurse@^4.1.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.0.tgz#fa9568d98d3823f9a41d91e902dcab9ea6e5b163"
-  integrity sha1-+pVo2Y04I/mkHZHpAtyrnqblsWM=
-  dependencies:
-    estraverse "^4.1.0"
-    object-assign "^4.0.1"
-
 esrecurse@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
@@ -3835,197 +3936,83 @@ esrecurse@^4.3.0:
   dependencies:
     estraverse "^5.2.0"
 
-estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
-  integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
+estraverse@^4.1.1:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
+  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
 estraverse@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz#374309d39fd935ae500e7b92e8a6b4c720e59642"
   integrity sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw==
 
-estraverse@^5.2.0:
+estraverse@^5.2.0, estraverse@^5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
   integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
 
 esutils@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
-  integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=
-
-etag@~1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
-  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
 event-pubsub@4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/event-pubsub/-/event-pubsub-4.3.0.tgz#f68d816bc29f1ec02c539dc58c8dd40ce72cb36e"
   integrity sha512-z7IyloorXvKbFx9Bpie2+vMJKKx1fH1EN5yiTfp8CiLOTptSYy1g8H4yDpGlEdshL1PBiFtBHepF2cNsqeEeFQ==
 
-events@^3.2.0:
+events@^3.0.0, events@^3.2.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
   integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
 
-exec-sh@^0.3.2:
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz#3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5"
-  integrity sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==
-
-execa@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
-  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
-  dependencies:
-    cross-spawn "^6.0.0"
-    get-stream "^4.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
-execa@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
-  integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==
+execa@^5.0.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
+  integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
   dependencies:
-    cross-spawn "^7.0.0"
-    get-stream "^5.0.0"
-    human-signals "^1.1.1"
+    cross-spawn "^7.0.3"
+    get-stream "^6.0.0"
+    human-signals "^2.1.0"
     is-stream "^2.0.0"
     merge-stream "^2.0.0"
-    npm-run-path "^4.0.0"
-    onetime "^5.1.0"
-    signal-exit "^3.0.2"
+    npm-run-path "^4.0.1"
+    onetime "^5.1.2"
+    signal-exit "^3.0.3"
     strip-final-newline "^2.0.0"
 
+execa@^7.1.1:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-7.2.0.tgz#657e75ba984f42a70f38928cedc87d6f2d4fe4e9"
+  integrity sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==
+  dependencies:
+    cross-spawn "^7.0.3"
+    get-stream "^6.0.1"
+    human-signals "^4.3.0"
+    is-stream "^3.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^5.1.0"
+    onetime "^6.0.0"
+    signal-exit "^3.0.7"
+    strip-final-newline "^3.0.0"
+
 exit@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
   integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
 
-expand-brackets@^2.1.4:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
-  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
-  dependencies:
-    debug "^2.3.3"
-    define-property "^0.2.5"
-    extend-shallow "^2.0.1"
-    posix-character-classes "^0.1.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
-expect@^24.1.0:
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-24.8.0.tgz#471f8ec256b7b6129ca2524b2a62f030df38718d"
-  integrity sha512-/zYvP8iMDrzaaxHVa724eJBCKqSHmO0FA7EDkBiRHxg6OipmMn1fN+C8T9L9K8yr7UONkOifu6+LLH+z76CnaA==
-  dependencies:
-    "@jest/types" "^24.8.0"
-    ansi-styles "^3.2.0"
-    jest-get-type "^24.8.0"
-    jest-matcher-utils "^24.8.0"
-    jest-message-util "^24.8.0"
-    jest-regex-util "^24.3.0"
-
-expect@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-26.6.2.tgz#c6b996bf26bf3fe18b67b2d0f51fc981ba934417"
-  integrity sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA==
-  dependencies:
-    "@jest/types" "^26.6.2"
-    ansi-styles "^4.0.0"
-    jest-get-type "^26.3.0"
-    jest-matcher-utils "^26.6.2"
-    jest-message-util "^26.6.2"
-    jest-regex-util "^26.0.0"
-
-express@^4.15.0:
-  version "4.17.0"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.17.0.tgz#288af62228a73f4c8ea2990ba3b791bb87cd4438"
-  integrity sha512-1Z7/t3Z5ZnBG252gKUPyItc4xdeaA0X934ca2ewckAsVsw9EG71i++ZHZPYnus8g/s5Bty8IMpSVEuRkmwwPRQ==
-  dependencies:
-    accepts "~1.3.7"
-    array-flatten "1.1.1"
-    body-parser "1.19.0"
-    content-disposition "0.5.3"
-    content-type "~1.0.4"
-    cookie "0.4.0"
-    cookie-signature "1.0.6"
-    debug "2.6.9"
-    depd "~1.1.2"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    finalhandler "~1.1.2"
-    fresh "0.5.2"
-    merge-descriptors "1.0.1"
-    methods "~1.1.2"
-    on-finished "~2.3.0"
-    parseurl "~1.3.3"
-    path-to-regexp "0.1.7"
-    proxy-addr "~2.0.5"
-    qs "6.7.0"
-    range-parser "~1.2.1"
-    safe-buffer "5.1.2"
-    send "0.17.1"
-    serve-static "1.14.1"
-    setprototypeof "1.1.1"
-    statuses "~1.5.0"
-    type-is "~1.6.18"
-    utils-merge "1.0.1"
-    vary "~1.1.2"
-
-extend-shallow@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
-  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
-  dependencies:
-    is-extendable "^0.1.0"
-
-extend-shallow@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
-  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
+expect@^29.0.0, expect@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-29.7.0.tgz#578874590dcb3214514084c08115d8aee61e11bc"
+  integrity sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==
   dependencies:
-    assign-symbols "^1.0.0"
-    is-extendable "^1.0.1"
-
-extend@^3.0.2, extend@~3.0.1, extend@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+    "@jest/expect-utils" "^29.7.0"
+    jest-get-type "^29.6.3"
+    jest-matcher-utils "^29.7.0"
+    jest-message-util "^29.7.0"
+    jest-util "^29.7.0"
 
-extglob@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
-  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
-  dependencies:
-    array-unique "^0.3.2"
-    define-property "^1.0.0"
-    expand-brackets "^2.1.4"
-    extend-shallow "^2.0.1"
-    fragment-cache "^0.2.1"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
-extract-zip@^1.0.3:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927"
-  integrity sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==
-  dependencies:
-    concat-stream "^1.6.2"
-    debug "^2.6.9"
-    mkdirp "^0.5.4"
-    yauzl "^2.10.0"
-
-extract-zip@^2.0.0:
+extract-zip@^2.0.0, extract-zip@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a"
   integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==
@@ -4036,24 +4023,10 @@ extract-zip@^2.0.0:
   optionalDependencies:
     "@types/yauzl" "^2.9.1"
 
-extsprintf@1.3.0, extsprintf@^1.2.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
-
-fake-indexeddb@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/fake-indexeddb/-/fake-indexeddb-2.0.4.tgz#401715deb7fc9501866c9f329bde7742599e2de8"
-  integrity sha1-QBcV3rf8lQGGbJ8ym953QlmeLeg=
-  dependencies:
-    core-js "^2.4.1"
-    realistic-structured-clone "^2.0.1"
-    setimmediate "^1.0.5"
-
-fast-deep-equal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff"
-  integrity sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=
+fake-indexeddb@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/fake-indexeddb/-/fake-indexeddb-5.0.1.tgz#1111a2b6981eaaad03027d816a8536a940d36cee"
+  integrity sha512-vxybH29Owtc6khV/Usy47B1g+eKwyhFiX8nwpCC4td320jvwrKQDH6vNtcJZgUzVxmfsSIlHzLKQzT76JMCO7A==
 
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
@@ -4076,16 +4049,34 @@ fast-glob@^3.2.9:
     merge2 "^1.3.0"
     micromatch "^4.0.4"
 
-fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0:
+fast-glob@^3.3.0:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.1.tgz#784b4e897340f3dbbef17413b3f11acf03c874c4"
+  integrity sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.2"
+    merge2 "^1.3.0"
+    micromatch "^4.0.4"
+
+fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
-fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.4:
+fast-levenshtein@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
+fast-xml-parser@^4.4.1:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.5.0.tgz#2882b7d01a6825dfdf909638f2de0256351def37"
+  integrity sha512-/PlTQCI96+fZMAOLMZK4CWG1ItCbfZ/0jx7UIJFChPNrx7tcEgerUgWbeieCM9MfHInUDyK8DWYZ+YrywDJuTg==
+  dependencies:
+    strnum "^1.0.5"
+
 fastq@^1.6.0:
   version "1.13.0"
   resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c"
@@ -4107,27 +4098,12 @@ fd-slicer@~1.1.0:
   dependencies:
     pend "~1.2.0"
 
-file-entry-cache@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
-  integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==
-  dependencies:
-    flat-cache "^2.0.1"
-
-file-loader@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d"
-  integrity sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==
-  dependencies:
-    loader-utils "^2.0.0"
-    schema-utils "^3.0.0"
-
-filelist@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.3.tgz#448607750376484932f67ef1b9ff07386b036c83"
-  integrity sha512-LwjCsruLWQULGYKy7TX0OPtrL9kLpojOFKc5VCTxdFTV7w5zbsgqVKfnkKG7Qgjtq50gKfO56hJv88OfcGb70Q==
+file-entry-cache@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
+  integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
   dependencies:
-    minimatch "^5.0.1"
+    flat-cache "^3.0.4"
 
 filename-reserved-regex@^2.0.0:
   version "2.0.0"
@@ -4143,36 +4119,13 @@ filenamify@^4.1.0:
     strip-outer "^1.0.1"
     trim-repeated "^1.0.0"
 
-fill-range@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
-  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-number "^3.0.0"
-    repeat-string "^1.6.1"
-    to-regex-range "^2.1.0"
-
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+fill-range@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
   dependencies:
     to-regex-range "^5.0.1"
 
-finalhandler@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
-  integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
-  dependencies:
-    debug "2.6.9"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    on-finished "~2.3.0"
-    parseurl "~1.3.3"
-    statuses "~1.5.0"
-    unpipe "~1.0.0"
-
 find-up@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
@@ -4188,19 +4141,32 @@ find-up@^4.0.0, find-up@^4.1.0:
     locate-path "^5.0.0"
     path-exists "^4.0.0"
 
-flat-cache@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
-  integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==
+find-up@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
+  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
+  dependencies:
+    locate-path "^6.0.0"
+    path-exists "^4.0.0"
+
+flat-cache@^3.0.4:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz#2c0c2d5040c99b1632771a9d105725c0115363ee"
+  integrity sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==
   dependencies:
-    flatted "^2.0.0"
-    rimraf "2.6.3"
-    write "1.0.3"
+    flatted "^3.2.9"
+    keyv "^4.5.3"
+    rimraf "^3.0.2"
 
-flatted@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.0.tgz#55122b6536ea496b4b44893ee2608141d10d9916"
-  integrity sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg==
+flat@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241"
+  integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
+
+flatted@^3.2.9:
+  version "3.2.9"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.9.tgz#7eb4c67ca1ba34232ca9d2d93e9886e611ad7daf"
+  integrity sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==
 
 flora-colossus@^1.0.0:
   version "1.0.0"
@@ -4210,51 +4176,30 @@ flora-colossus@^1.0.0:
     debug "^3.1.0"
     fs-extra "^4.0.0"
 
-for-in@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
-
-forever-agent@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
+for-each@^0.3.3:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
+  integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==
+  dependencies:
+    is-callable "^1.1.3"
 
-form-data@~2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.1.tgz#6fb94fbd71885306d73d15cc497fe4cc4ecd44bf"
-  integrity sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=
+foreground-child@^3.1.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.3.0.tgz#0ac8644c06e431439f8561db8ecf29a7b5519c77"
+  integrity sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==
   dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.5"
-    mime-types "^2.1.12"
+    cross-spawn "^7.0.0"
+    signal-exit "^4.0.1"
 
-form-data@~2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
-  integrity sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=
+form-data@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
+  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
   dependencies:
     asynckit "^0.4.0"
-    combined-stream "1.0.6"
+    combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
-forwarded@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
-  integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
-
-fragment-cache@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
-  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
-  dependencies:
-    map-cache "^0.2.2"
-
-fresh@0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
-  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
-
 front-matter@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/front-matter/-/front-matter-2.3.0.tgz#7203af896ce357ee04e2aa45169ea91ed7f67504"
@@ -4262,6 +4207,15 @@ front-matter@^2.3.0:
   dependencies:
     js-yaml "^3.10.0"
 
+fs-extra@^10.0.0, fs-extra@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
+  integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
+
 fs-extra@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
@@ -4289,7 +4243,7 @@ fs-extra@^8.1.0:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-extra@^9.0.0, fs-extra@^9.0.1:
+fs-extra@^9.0.1:
   version "9.0.1"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.1.tgz#910da0062437ba4c39fedd863f1675ccfefcb9fc"
   integrity sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==
@@ -4299,20 +4253,20 @@ fs-extra@^9.0.0, fs-extra@^9.0.1:
     jsonfile "^6.0.1"
     universalify "^1.0.0"
 
-fs-monkey@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3"
-  integrity sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==
+fs-monkey@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.5.tgz#fe450175f0db0d7ea758102e1d84096acb925788"
+  integrity sha512-8uMbBjrhzW76TYgEV27Y5E//W2f/lTFmx78P2w19FZSxarhI/798APGQyuGCwmkNxgwGRhrLfvWyLBvNtuOmew==
 
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
-fsevents@^2.1.2:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.2.1.tgz#1fb02ded2036a8ac288d507a65962bd87b97628d"
-  integrity sha512-bTLYHSeC0UH/EFXS9KqWnXuOl/wHK5Z/d+ghd5AsFMYN7wIGkUCOJyzy88+wJKkZPGON8u4Z9f6U4FdgURE9qA==
+fsevents@^2.3.2:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
+  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
 
 fsevents@~2.1.2:
   version "2.1.3"
@@ -4324,6 +4278,11 @@ function-bind@^1.0.2, function-bind@^1.1.0, function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
+function-bind@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
+  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
+
 function.prototype.name@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.0.tgz#8bd763cc0af860a859cc5d49384d74b932cd2327"
@@ -4333,10 +4292,30 @@ function.prototype.name@^1.1.0:
     function-bind "^1.1.1"
     is-callable "^1.1.3"
 
-functional-red-black-tree@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
-  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
+function.prototype.name@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621"
+  integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.19.0"
+    functions-have-names "^1.2.2"
+
+function.prototype.name@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.6.tgz#cdf315b7d90ee77a4c6ee216c3c3362da07533fd"
+  integrity sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    functions-have-names "^1.2.3"
+
+functions-have-names@^1.2.2, functions-have-names@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
+  integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
 
 galactus@^0.2.1:
   version "0.2.1"
@@ -4347,12 +4326,12 @@ galactus@^0.2.1:
     flora-colossus "^1.0.0"
     fs-extra "^4.0.0"
 
-gensync@^1.0.0-beta.1, gensync@^1.0.0-beta.2:
+gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
   integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
-get-caller-file@^2.0.1:
+get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
@@ -4366,6 +4345,16 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
     has "^1.0.3"
     has-symbols "^1.0.1"
 
+get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82"
+  integrity sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==
+  dependencies:
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-proto "^1.0.1"
+    has-symbols "^1.0.3"
+
 get-package-info@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/get-package-info/-/get-package-info-1.0.0.tgz#6432796563e28113cd9474dbbd00052985a4999c"
@@ -4386,20 +4375,23 @@ get-stdin@^6.0.0:
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
   integrity sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==
 
-get-stream@^4.0.0, get-stream@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
-  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
-  dependencies:
-    pump "^3.0.0"
+get-stdin@~9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-9.0.0.tgz#3983ff82e03d56f1b2ea0d3e60325f39d703a575"
+  integrity sha512-dVKBjfWisLAicarI2Sf+JuBE/DghV4UzNAVe9yhEJuzeREd3JhOTE9cUaJTeSa77fsbQUK3pcOpJfM59+VKZaA==
 
-get-stream@^5.0.0, get-stream@^5.1.0:
+get-stream@^5.1.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
   integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
   dependencies:
     pump "^3.0.0"
 
+get-stream@^6.0.0, get-stream@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
+  integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
+
 get-symbol-description@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"
@@ -4408,31 +4400,38 @@ get-symbol-description@^1.0.0:
     call-bind "^1.0.2"
     get-intrinsic "^1.1.1"
 
-get-value@^2.0.3, get-value@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
-  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
-
-getpass@^0.1.1:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
-  dependencies:
-    assert-plus "^1.0.0"
-
-glob-parent@^5.0.0, glob-parent@^5.1.2, glob-parent@~5.1.0:
+glob-parent@^5.1.2, glob-parent@~5.1.0:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
   integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
   dependencies:
     is-glob "^4.0.1"
 
+glob-parent@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
+  integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
+  dependencies:
+    is-glob "^4.0.3"
+
 glob-to-regexp@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@^7.0.5, glob@^7.1.1, glob@^7.1.2:
+glob@^11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-11.0.0.tgz#6031df0d7b65eaa1ccb9b29b5ced16cea658e77e"
+  integrity sha512-9UiX/Bl6J2yaBbxKoEBRm4Cipxgok8kQYcOPEhScPwebu2I0HoQOuYdIO6S3hLuWoZgpDpwQZMzTFxgpkyT76g==
+  dependencies:
+    foreground-child "^3.1.0"
+    jackspeak "^4.0.1"
+    minimatch "^10.0.0"
+    minipass "^7.1.2"
+    package-json-from-dist "^1.0.0"
+    path-scurry "^2.0.0"
+
+glob@^7.1.1, glob@^7.1.2:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
   integrity sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==
@@ -4468,18 +4467,16 @@ glob@^7.1.4, glob@^7.1.6:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-global-agent@^2.0.2:
-  version "2.1.12"
-  resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-2.1.12.tgz#e4ae3812b731a9e81cbf825f9377ef450a8e4195"
-  integrity sha512-caAljRMS/qcDo69X9BfkgrihGUgGx44Fb4QQToNQjsiWh+YlQ66uqYVAdA8Olqit+5Ng0nkz09je3ZzANMZcjg==
+glob@~8.0.3:
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e"
+  integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==
   dependencies:
-    boolean "^3.0.1"
-    core-js "^3.6.5"
-    es6-error "^4.1.1"
-    matcher "^3.0.0"
-    roarr "^2.15.3"
-    semver "^7.3.2"
-    serialize-error "^7.0.1"
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^5.0.1"
+    once "^1.3.0"
 
 global-agent@^3.0.0:
   version "3.0.0"
@@ -4493,34 +4490,17 @@ global-agent@^3.0.0:
     semver "^7.3.2"
     serialize-error "^7.0.1"
 
-global-dirs@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.0.1.tgz#acdf3bb6685bcd55cb35e8a052266569e9469201"
-  integrity sha512-5HqUqdhkEovj2Of/ms3IeS/EekcO54ytHRLV4PEY2rhRwrHXLQjeVEES0Lhka0xwNDtGYn58wyC4s5+MHsOO6A==
-  dependencies:
-    ini "^1.3.5"
-
-global-tunnel-ng@^2.7.1:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz#d03b5102dfde3a69914f5ee7d86761ca35d57d8f"
-  integrity sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg==
-  dependencies:
-    encodeurl "^1.0.2"
-    lodash "^4.17.10"
-    npm-conf "^1.1.3"
-    tunnel "^0.0.6"
-
 globals@^11.1.0:
-  version "11.7.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.7.0.tgz#a583faa43055b1aca771914bf68258e2fc125673"
-  integrity sha512-K8BNSPySfeShBQXsahYB/AbbWruVOTyVpgoIDnl8odPpeSfP2J5QO2oLFFdl2j7GfDCtZj2bMKar2T49itTPCg==
+  version "11.12.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
+  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globals@^12.1.0:
-  version "12.4.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8"
-  integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==
+globals@^13.19.0:
+  version "13.23.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.23.0.tgz#ef31673c926a0976e1f61dab4dca57e0c0a8af02"
+  integrity sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==
   dependencies:
-    type-fest "^0.8.1"
+    type-fest "^0.20.2"
 
 globalthis@^1.0.1:
   version "1.0.1"
@@ -4529,7 +4509,14 @@ globalthis@^1.0.1:
   dependencies:
     define-properties "^1.1.3"
 
-globby@^11.0.4:
+globalthis@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf"
+  integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==
+  dependencies:
+    define-properties "^1.1.3"
+
+globby@^11.1.0:
   version "11.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
   integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
@@ -4541,47 +4528,44 @@ globby@^11.0.4:
     merge2 "^1.4.1"
     slash "^3.0.0"
 
-got@^9.6.0:
-  version "9.6.0"
-  resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85"
-  integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==
-  dependencies:
-    "@sindresorhus/is" "^0.14.0"
-    "@szmarczak/http-timer" "^1.1.2"
-    cacheable-request "^6.0.0"
-    decompress-response "^3.3.0"
-    duplexer3 "^0.1.4"
-    get-stream "^4.1.0"
-    lowercase-keys "^1.0.1"
-    mimic-response "^1.0.1"
-    p-cancelable "^1.0.0"
-    to-readable-stream "^1.0.0"
-    url-parse-lax "^3.0.0"
-
-graceful-fs@^4.1.11, graceful-fs@^4.1.2:
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
-  integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
-
-graceful-fs@^4.1.15:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.0.tgz#8d8fdc73977cb04104721cb53666c1ca64cd328b"
-  integrity sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==
-
-graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4:
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
-  integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
+gopd@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
+  integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==
+  dependencies:
+    get-intrinsic "^1.1.3"
+
+got@^11.8.5:
+  version "11.8.6"
+  resolved "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz#276e827ead8772eddbcfc97170590b841823233a"
+  integrity sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==
+  dependencies:
+    "@sindresorhus/is" "^4.0.0"
+    "@szmarczak/http-timer" "^4.0.5"
+    "@types/cacheable-request" "^6.0.1"
+    "@types/responselike" "^1.0.0"
+    cacheable-lookup "^5.0.3"
+    cacheable-request "^7.0.2"
+    decompress-response "^6.0.0"
+    http2-wrapper "^1.0.0-beta.5.2"
+    lowercase-keys "^2.0.0"
+    p-cancelable "^2.0.0"
+    responselike "^2.0.0"
 
-graceful-fs@^4.2.9:
+graceful-fs@^4.1.11, graceful-fs@^4.1.6, graceful-fs@^4.2.0:
   version "4.2.9"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96"
   integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==
 
-growly@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
-  integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
+graceful-fs@^4.1.2, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.9:
+  version "4.2.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
+  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
+
+graphemer@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
+  integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
 
 gzip-size@^6.0.0:
   version "6.0.0"
@@ -4590,27 +4574,6 @@ gzip-size@^6.0.0:
   dependencies:
     duplexer "^0.1.2"
 
-har-schema@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
-
-har-validator@~5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
-  integrity sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=
-  dependencies:
-    ajv "^5.1.0"
-    har-schema "^2.0.0"
-
-har-validator@~5.1.3:
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
-  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
-  dependencies:
-    ajv "^6.12.3"
-    har-schema "^2.0.0"
-
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
@@ -4623,6 +4586,11 @@ has-bigints@^1.0.1:
   resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
   integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==
 
+has-bigints@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa"
+  integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==
+
 has-flag@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
@@ -4631,13 +4599,25 @@ has-flag@^1.0.0:
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+  integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
 
 has-flag@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
+has-property-descriptors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861"
+  integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==
+  dependencies:
+    get-intrinsic "^1.1.1"
+
+has-proto@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0"
+  integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==
+
 has-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
@@ -4653,6 +4633,11 @@ has-symbols@^1.0.2:
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
   integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
 
+has-symbols@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
+  integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
+
 has-tostringtag@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25"
@@ -4660,42 +4645,6 @@ has-tostringtag@^1.0.0:
   dependencies:
     has-symbols "^1.0.2"
 
-has-value@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
-  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
-  dependencies:
-    get-value "^2.0.3"
-    has-values "^0.1.4"
-    isobject "^2.0.0"
-
-has-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
-  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
-  dependencies:
-    get-value "^2.0.6"
-    has-values "^1.0.0"
-    isobject "^3.0.0"
-
-has-values@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
-  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
-
-has-values@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
-  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
-  dependencies:
-    is-number "^3.0.0"
-    kind-of "^4.0.0"
-
-has-yarn@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77"
-  integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==
-
 has@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
@@ -4710,59 +4659,36 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
-hash-base@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
-  integrity sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=
-  dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
-
-hawk@~6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038"
-  integrity sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==
+hasown@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.0.tgz#f4c513d454a57b7c7e1650778de226b11700546c"
+  integrity sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==
   dependencies:
-    boom "4.x.x"
-    cryptiles "3.x.x"
-    hoek "4.x.x"
-    sntp "2.x.x"
+    function-bind "^1.1.2"
 
 he@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
   integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
 
-hoek@4.x.x:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d"
-  integrity sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==
-
 hosted-git-info@^2.1.4:
   version "2.8.9"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
   integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
 
-hosted-git-info@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.4.tgz#be4973eb1fd2737b11c9c7c19380739bb249f60d"
-  integrity sha512-4oT62d2jwSDBbLLFLZE+1vPuQ1h8p9wjrJ8Mqx5TjsyWmBMV5B13eJqn8pvluqubLf3cJPTfiYCIwNwDNmzScQ==
-  dependencies:
-    lru-cache "^5.1.1"
-
-html-encoding-sniffer@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3"
-  integrity sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==
+html-encoding-sniffer@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz#2cb1a8cf0db52414776e5b2a7a04d5dd98158de9"
+  integrity sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==
   dependencies:
-    whatwg-encoding "^1.0.5"
+    whatwg-encoding "^2.0.0"
 
 html-entities@^2.1.0:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.2.tgz#760b404685cb1d794e4f4b744332e3b00dcfe488"
-  integrity sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ==
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.5.2.tgz#201a3cf95d3a15be7099521620d19dfb4f65359f"
+  integrity sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA==
 
-html-escaper@^2.0.0:
+html-escaper@^2.0.0, html-escaper@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
   integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
@@ -4780,10 +4706,10 @@ html-minifier-terser@^6.0.2:
     relateurl "^0.2.7"
     terser "^5.10.0"
 
-html-webpack-plugin@^5.5.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz#c3911936f57681c1f9f4d8b68c158cd9dfe52f50"
-  integrity sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw==
+html-webpack-plugin@^5.6.0:
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.6.0.tgz#50a8fa6709245608cb00e811eacecb8e0d7b7ea0"
+  integrity sha512-iwaY4wzbe48AfKLZ/Cc8k0L+FKG6oSNRaZ8x5A/T/IVDGyXcbHncM9TdDa93wn0FsSm82FhTKW7f3vS61thXAw==
   dependencies:
     "@types/html-minifier-terser" "^6.0.0"
     html-minifier-terser "^6.0.2"
@@ -4802,87 +4728,96 @@ htmlparser2@^6.1.0:
     entities "^2.0.0"
 
 http-cache-semantics@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
-  integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
+  integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
 
-http-errors@1.7.2, http-errors@~1.7.2:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
-  integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==
+http-proxy-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
+  integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
   dependencies:
-    depd "~1.1.2"
-    inherits "2.0.3"
-    setprototypeof "1.1.1"
-    statuses ">= 1.5.0 < 2"
-    toidentifier "1.0.0"
+    "@tootallnate/once" "2"
+    agent-base "6"
+    debug "4"
 
-http-signature@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
+http-proxy-agent@^7.0.0:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz#9a8b1f246866c028509486585f62b8f2c18c270e"
+  integrity sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==
   dependencies:
-    assert-plus "^1.0.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
+    agent-base "^7.1.0"
+    debug "^4.3.4"
 
-human-signals@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
-  integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
+http2-wrapper@^1.0.0-beta.5.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz#b8f55e0c1f25d4ebd08b3b0c2c079f9590800b3d"
+  integrity sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==
+  dependencies:
+    quick-lru "^5.1.1"
+    resolve-alpn "^1.0.0"
 
-iconv-lite@0.4.24:
-  version "0.4.24"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
-  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
+https-proxy-agent@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
+  integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
   dependencies:
-    safer-buffer ">= 2.1.2 < 3"
+    agent-base "6"
+    debug "4"
 
-iconv-lite@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.5.1.tgz#b2425d3c7b18f7219f2ca663d103bddb91718d64"
-  integrity sha512-ONHr16SQvKZNSqjQT9gy5z24Jw+uqfO02/ngBSBoqChZ+W8qXX7GPRa1RoUnzGADw8K63R1BXUMzarCVQBpY8Q==
+https-proxy-agent@^7.0.0:
+  version "7.0.5"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz#9e8b5013873299e11fab6fd548405da2d6c602b2"
+  integrity sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==
   dependencies:
-    safer-buffer ">= 2.1.2 < 3"
+    agent-base "^7.0.2"
+    debug "4"
+
+human-signals@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
+  integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
+
+human-signals@^4.3.0:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-4.3.1.tgz#ab7f811e851fca97ffbd2c1fe9a958964de321b2"
+  integrity sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==
+
+iconv-lite@0.6.3:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
+  integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3.0.0"
 
 icss-utils@^5.0.0, icss-utils@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae"
   integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==
 
-ignore@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
-  integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
-
-ignore@^5.1.8, ignore@^5.2.0:
+ignore@^5.0.5, ignore@^5.2.0, ignore@~5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
   integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
 
+ignore@^5.2.4:
+  version "5.2.4"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
+  integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
+
 ima-babel6-polyfill@^0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/ima-babel6-polyfill/-/ima-babel6-polyfill-0.12.0.tgz#18aa1e4e898b80eddd89fa696e67c75a14e26228"
   integrity sha1-GKoeTomLgO3difppbmfHWhTiYig=
 
-immediate@~3.0.5:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
-  integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=
-
-import-fresh@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.0.0.tgz#a3d897f420cab0e671236897f75bc14b4885c390"
-  integrity sha512-pOnA9tfM3Uwics+SaBLCNyZZZbK+4PTu0OPZtLlMIrv17EdBoC15S9Kn8ckJ9TZTyKb3ywNE5y1yeDxxGA7nTQ==
+import-fresh@^3.2.1:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
+  integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
   dependencies:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
 
-import-lazy@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
-  integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=
-
 import-local@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz#a8cfd0431d1de4a2199703d003e3e62364fa6db6"
@@ -4904,25 +4839,15 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
-inherits@2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
-
-ini@^1.3.4:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
-  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
-
-ini@^1.3.5, ini@~1.3.0:
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84"
-  integrity sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ==
+ini@~3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-3.0.1.tgz#c76ec81007875bc44d544ff7a11a55d12294102d"
+  integrity sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ==
 
 internal-slot@^1.0.3:
   version "1.0.3"
@@ -4933,40 +4858,41 @@ internal-slot@^1.0.3:
     has "^1.0.3"
     side-channel "^1.0.4"
 
+internal-slot@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.5.tgz#f2a2ee21f668f8627a4667f309dc0f4fb6674986"
+  integrity sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==
+  dependencies:
+    get-intrinsic "^1.2.0"
+    has "^1.0.3"
+    side-channel "^1.0.4"
+
 interpret@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.4.tgz#820cdd588b868ffb191a809506d6c9c8f212b1b0"
   integrity sha1-ggzdWIuGj/sZGoCVBtbJyPISsbA=
 
-ip-regex@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
-  integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
-
-ipaddr.js@1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz#37df74e430a0e47550fe54a2defe30d8acd95f65"
-  integrity sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==
-
-is-accessor-descriptor@^0.1.6:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
-  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-accessor-descriptor@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
-  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
+is-array-buffer@^3.0.1, is-array-buffer@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.2.tgz#f2653ced8412081638ecb0ebbd0c41c6e0aecbbe"
+  integrity sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==
   dependencies:
-    kind-of "^6.0.0"
+    call-bind "^1.0.2"
+    get-intrinsic "^1.2.0"
+    is-typed-array "^1.1.10"
 
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
   integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
 
+is-async-function@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-async-function/-/is-async-function-2.0.0.tgz#8e4418efd3e5d3a6ebb0164c05ef5afb69aa9646"
+  integrity sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==
+  dependencies:
+    has-tostringtag "^1.0.0"
+
 is-bigint@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"
@@ -4989,11 +4915,6 @@ is-boolean-object@^1.1.0:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
-is-buffer@^1.1.5:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
-
 is-builtin-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
@@ -5016,99 +4937,58 @@ is-callable@^1.2.4:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
   integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
 
-is-ci@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
-  integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==
-  dependencies:
-    ci-info "^2.0.0"
+is-callable@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
+  integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
 
-is-core-module@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a"
-  integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==
+is-core-module@^2.13.0:
+  version "2.13.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384"
+  integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==
   dependencies:
-    has "^1.0.3"
+    hasown "^2.0.0"
 
-is-core-module@^2.2.0:
-  version "2.8.1"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211"
-  integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==
+is-core-module@^2.8.1, is-core-module@^2.9.0:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.10.0.tgz#9012ede0a91c69587e647514e1d5277019e728ed"
+  integrity sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==
   dependencies:
     has "^1.0.3"
 
-is-data-descriptor@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
-  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-data-descriptor@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
-  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
-  dependencies:
-    kind-of "^6.0.0"
-
 is-date-object@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
   integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=
 
-is-descriptor@^0.1.0:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
-  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
-  dependencies:
-    is-accessor-descriptor "^0.1.6"
-    is-data-descriptor "^0.1.4"
-    kind-of "^5.0.0"
-
-is-descriptor@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.1.tgz#2c6023599bde2de9d5d2c8b9a9d94082036b6ef2"
-  integrity sha512-G3fFVFTqfaqu7r4YuSBHKBAuOaLz8Sy7ekklUpFEliaLMP1Y2ZjoN9jS62YWCAPQrQpMUQSitRlrzibbuCZjdA==
-  dependencies:
-    is-accessor-descriptor "^0.1.6"
-    is-data-descriptor "^0.1.4"
-    kind-of "^5.0.0"
-
-is-descriptor@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
-  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
+is-date-object@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
+  integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==
   dependencies:
-    is-accessor-descriptor "^1.0.0"
-    is-data-descriptor "^1.0.0"
-    kind-of "^6.0.2"
+    has-tostringtag "^1.0.0"
 
 is-docker@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz#4125a88e44e450d384e09047ede71adc2d144156"
   integrity sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==
 
-is-extendable@^0.1.0, is-extendable@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
-  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
-
-is-extendable@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
-  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
-  dependencies:
-    is-plain-object "^2.0.4"
+is-docker@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-3.0.0.tgz#90093aa3106277d8a77a5910dbae71747e15a200"
+  integrity sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==
 
 is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
-is-fullwidth-code-point@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
+is-finalizationregistry@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz#c8749b65f17c133313e661b1289b95ad3dbd62e6"
+  integrity sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==
+  dependencies:
+    call-bind "^1.0.2"
 
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
@@ -5120,6 +5000,13 @@ is-generator-fn@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
   integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
 
+is-generator-function@^1.0.10:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72"
+  integrity sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==
+  dependencies:
+    has-tostringtag "^1.0.0"
+
 is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
@@ -5127,24 +5014,23 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
-is-installed-globally@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.3.1.tgz#679afef819347a72584617fd19497f010b8ed35f"
-  integrity sha512-oiEcGoQbGc+3/iijAijrK2qFpkNoNjsHOm/5V5iaeydyrS/hnwaRCEgH5cpW0P3T1lSjV5piB7S5b5lEugNLhg==
+is-inside-container@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-inside-container/-/is-inside-container-1.0.0.tgz#e81fba699662eb31dbdaf26766a61d4814717ea4"
+  integrity sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==
   dependencies:
-    global-dirs "^2.0.1"
-    is-path-inside "^3.0.1"
+    is-docker "^3.0.0"
+
+is-map@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127"
+  integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==
 
-is-negative-zero@^2.0.1:
+is-negative-zero@^2.0.1, is-negative-zero@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
   integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==
 
-is-npm@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-4.0.0.tgz#c90dd8380696df87a7a6d823c20d0b12bbe3c84d"
-  integrity sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig==
-
 is-number-object@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz#6a7aaf838c7f0686a50b4553f7e54a96494e89f0"
@@ -5152,51 +5038,27 @@ is-number-object@^1.0.4:
   dependencies:
     has-tostringtag "^1.0.0"
 
-is-number@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
-  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-number@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
-  integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
-
 is-number@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
-is-obj@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
-  integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
-
-is-odd@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-2.0.0.tgz#7646624671fd7ea558ccd9a2795182f2958f1b24"
-  integrity sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==
-  dependencies:
-    is-number "^4.0.0"
-
-is-path-inside@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.2.tgz#f5220fc82a3e233757291dddc9c5877f2a1f3017"
-  integrity sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==
+is-path-inside@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
+  integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
 
-is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
+is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
   integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
   dependencies:
     isobject "^3.0.1"
 
-is-potential-custom-element-name@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397"
-  integrity sha1-DFLlS8yjkbssSUsh6GJtczbG45c=
+is-potential-custom-element-name@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
+  integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
 
 is-regex@^1.0.4:
   version "1.0.4"
@@ -5213,21 +5075,33 @@ is-regex@^1.1.4:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
+is-set@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec"
+  integrity sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==
+
 is-shared-array-buffer@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6"
   integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==
 
-is-stream@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
+is-shared-array-buffer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
+  integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==
+  dependencies:
+    call-bind "^1.0.2"
 
 is-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
   integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==
 
+is-stream@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-3.0.0.tgz#e6bfd7aa6bef69f4f472ce9bb681e3e57b4319ac"
+  integrity sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==
+
 is-string@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"
@@ -5259,27 +5133,32 @@ is-symbol@^1.0.3:
   dependencies:
     has-symbols "^1.0.2"
 
-is-typedarray@^1.0.0, is-typedarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
+is-typed-array@^1.1.10, is-typed-array@^1.1.12, is-typed-array@^1.1.9:
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.12.tgz#d0bab5686ef4a76f7a73097b95470ab199c57d4a"
+  integrity sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==
+  dependencies:
+    which-typed-array "^1.1.11"
 
-is-weakref@^1.0.1:
+is-weakmap@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2"
+  integrity sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==
+
+is-weakref@^1.0.1, is-weakref@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
   integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==
   dependencies:
     call-bind "^1.0.2"
 
-is-windows@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.1.tgz#310db70f742d259a16a369202b51af84233310d9"
-  integrity sha1-MQ23D3QtJZoWo2kgK1GvhCMzENk=
-
-is-windows@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
-  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
+is-weakset@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.2.tgz#4569d67a747a1ce5a994dfd4ef6dcea76e7c0a1d"
+  integrity sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.1.1"
 
 is-wsl@^2.2.0:
   version "2.2.0"
@@ -5288,63 +5167,58 @@ is-wsl@^2.2.0:
   dependencies:
     is-docker "^2.0.0"
 
-is-yarn-global@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232"
-  integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==
-
-isarray@1.0.0, isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
-
-isbinaryfile@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.2.tgz#4a3e974ec0cba9004d3fc6cde7209ea69368a621"
-  integrity sha1-Sj6XTsDLqQBNP8bN5yCeppNopiE=
+isarray@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
+  integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
 
-isbinaryfile@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.6.tgz#edcb62b224e2b4710830b67498c8e4e5a4d2610b"
-  integrity sha512-ORrEy+SNVqUhrCaal4hA4fBzhggQQ+BaLntyPOdoEiwlKZW9BZiJXjg3RMiruE4tPEI3pyVPpySHQF/dKWperg==
+isbinaryfile@^4.0.8:
+  version "4.0.10"
+  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz#0c5b5e30c2557a2f06febd37b7322946aaee42b3"
+  integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==
 
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
-isobject@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
-  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
-  dependencies:
-    isarray "1.0.0"
-
-isobject@^3.0.0, isobject@^3.0.1:
+isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
-  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
-
-isstream@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
+  integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
 
 istanbul-lib-coverage@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec"
   integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==
 
-istanbul-lib-instrument@^4.0.0, istanbul-lib-instrument@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d"
-  integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==
+istanbul-lib-coverage@^3.2.0:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz#2d166c4b0644d43a39f04bf6c2edd1e585f31756"
+  integrity sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==
+
+istanbul-lib-instrument@^5.0.4:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz#d10c8885c2125574e1c231cacadf955675e1ce3d"
+  integrity sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==
   dependencies:
-    "@babel/core" "^7.7.5"
+    "@babel/core" "^7.12.3"
+    "@babel/parser" "^7.14.7"
     "@istanbuljs/schema" "^0.1.2"
-    istanbul-lib-coverage "^3.0.0"
+    istanbul-lib-coverage "^3.2.0"
     semver "^6.3.0"
 
+istanbul-lib-instrument@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.1.tgz#71e87707e8041428732518c6fb5211761753fbdf"
+  integrity sha512-EAMEJBsYuyyztxMxW3g7ugGPkrZsV57v0Hmv3mm1uQsmB+QnZuepg731CRaIgeUVSdmsTngOkSnauNF8p7FIhA==
+  dependencies:
+    "@babel/core" "^7.12.3"
+    "@babel/parser" "^7.14.7"
+    "@istanbuljs/schema" "^0.1.2"
+    istanbul-lib-coverage "^3.2.0"
+    semver "^7.5.4"
+
 istanbul-lib-report@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6"
@@ -5363,483 +5237,394 @@ istanbul-lib-source-maps@^4.0.0:
     istanbul-lib-coverage "^3.0.0"
     source-map "^0.6.1"
 
-istanbul-reports@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.2.tgz#d593210e5000683750cb09fc0644e4b6e27fd53b"
-  integrity sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==
+istanbul-reports@^3.1.3:
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.6.tgz#2544bcab4768154281a2f0870471902704ccaa1a"
+  integrity sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==
   dependencies:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
 
-jake@^10.8.5:
-  version "10.8.5"
-  resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz#f2183d2c59382cb274226034543b9c03b8164c46"
-  integrity sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==
+iterator.prototype@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/iterator.prototype/-/iterator.prototype-1.1.2.tgz#5e29c8924f01916cb9335f1ff80619dcff22b0c0"
+  integrity sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==
   dependencies:
-    async "^3.2.3"
-    chalk "^4.0.2"
-    filelist "^1.0.1"
-    minimatch "^3.0.4"
+    define-properties "^1.2.1"
+    get-intrinsic "^1.2.1"
+    has-symbols "^1.0.3"
+    reflect.getprototypeof "^1.0.4"
+    set-function-name "^2.0.1"
 
-jest-changed-files@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.6.2.tgz#f6198479e1cc66f22f9ae1e22acaa0b429c042d0"
-  integrity sha512-fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ==
+jackspeak@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-4.0.1.tgz#9fca4ce961af6083e259c376e9e3541431f5287b"
+  integrity sha512-cub8rahkh0Q/bw1+GxP7aeSe29hHHn2V4m29nnDlvCdlgU+3UGxkZp7Z53jLUdpX3jdTO0nJZUDl3xvbWc2Xog==
   dependencies:
-    "@jest/types" "^26.6.2"
-    execa "^4.0.0"
-    throat "^5.0.0"
+    "@isaacs/cliui" "^8.0.2"
+  optionalDependencies:
+    "@pkgjs/parseargs" "^0.11.0"
+
+jest-changed-files@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-29.7.0.tgz#1c06d07e77c78e1585d020424dedc10d6e17ac3a"
+  integrity sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==
+  dependencies:
+    execa "^5.0.0"
+    jest-util "^29.7.0"
+    p-limit "^3.1.0"
+
+jest-circus@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.7.0.tgz#b6817a45fcc835d8b16d5962d0c026473ee3668a"
+  integrity sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==
+  dependencies:
+    "@jest/environment" "^29.7.0"
+    "@jest/expect" "^29.7.0"
+    "@jest/test-result" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    co "^4.6.0"
+    dedent "^1.0.0"
+    is-generator-fn "^2.0.0"
+    jest-each "^29.7.0"
+    jest-matcher-utils "^29.7.0"
+    jest-message-util "^29.7.0"
+    jest-runtime "^29.7.0"
+    jest-snapshot "^29.7.0"
+    jest-util "^29.7.0"
+    p-limit "^3.1.0"
+    pretty-format "^29.7.0"
+    pure-rand "^6.0.0"
+    slash "^3.0.0"
+    stack-utils "^2.0.3"
 
-jest-cli@^26.6.3:
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.6.3.tgz#43117cfef24bc4cd691a174a8796a532e135e92a"
-  integrity sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg==
+jest-cli@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-29.7.0.tgz#5592c940798e0cae677eec169264f2d839a37995"
+  integrity sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==
   dependencies:
-    "@jest/core" "^26.6.3"
-    "@jest/test-result" "^26.6.2"
-    "@jest/types" "^26.6.2"
+    "@jest/core" "^29.7.0"
+    "@jest/test-result" "^29.7.0"
+    "@jest/types" "^29.6.3"
     chalk "^4.0.0"
+    create-jest "^29.7.0"
     exit "^0.1.2"
-    graceful-fs "^4.2.4"
     import-local "^3.0.2"
-    is-ci "^2.0.0"
-    jest-config "^26.6.3"
-    jest-util "^26.6.2"
-    jest-validate "^26.6.2"
-    prompts "^2.0.1"
-    yargs "^15.4.1"
-
-jest-config@^26.6.3:
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.6.3.tgz#64f41444eef9eb03dc51d5c53b75c8c71f645349"
-  integrity sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==
-  dependencies:
-    "@babel/core" "^7.1.0"
-    "@jest/test-sequencer" "^26.6.3"
-    "@jest/types" "^26.6.2"
-    babel-jest "^26.6.3"
+    jest-config "^29.7.0"
+    jest-util "^29.7.0"
+    jest-validate "^29.7.0"
+    yargs "^17.3.1"
+
+jest-config@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-29.7.0.tgz#bcbda8806dbcc01b1e316a46bb74085a84b0245f"
+  integrity sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==
+  dependencies:
+    "@babel/core" "^7.11.6"
+    "@jest/test-sequencer" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    babel-jest "^29.7.0"
     chalk "^4.0.0"
+    ci-info "^3.2.0"
     deepmerge "^4.2.2"
-    glob "^7.1.1"
-    graceful-fs "^4.2.4"
-    jest-environment-jsdom "^26.6.2"
-    jest-environment-node "^26.6.2"
-    jest-get-type "^26.3.0"
-    jest-jasmine2 "^26.6.3"
-    jest-regex-util "^26.0.0"
-    jest-resolve "^26.6.2"
-    jest-util "^26.6.2"
-    jest-validate "^26.6.2"
-    micromatch "^4.0.2"
-    pretty-format "^26.6.2"
-
-jest-diff@^24.8.0:
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.8.0.tgz#146435e7d1e3ffdf293d53ff97e193f1d1546172"
-  integrity sha512-wxetCEl49zUpJ/bvUmIFjd/o52J+yWcoc5ZyPq4/W1LUKGEhRYDIbP1KcF6t+PvqNrGAFk4/JhtxDq/Nnzs66g==
-  dependencies:
-    chalk "^2.0.1"
-    diff-sequences "^24.3.0"
-    jest-get-type "^24.8.0"
-    pretty-format "^24.8.0"
-
-jest-diff@^25.0.0:
-  version "25.5.0"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.5.0.tgz#1dd26ed64f96667c068cef026b677dfa01afcfa9"
-  integrity sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A==
-  dependencies:
-    chalk "^3.0.0"
-    diff-sequences "^25.2.6"
-    jest-get-type "^25.2.6"
-    pretty-format "^25.5.0"
-
-jest-diff@^26.0.0, jest-diff@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz#1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394"
-  integrity sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==
+    glob "^7.1.3"
+    graceful-fs "^4.2.9"
+    jest-circus "^29.7.0"
+    jest-environment-node "^29.7.0"
+    jest-get-type "^29.6.3"
+    jest-regex-util "^29.6.3"
+    jest-resolve "^29.7.0"
+    jest-runner "^29.7.0"
+    jest-util "^29.7.0"
+    jest-validate "^29.7.0"
+    micromatch "^4.0.4"
+    parse-json "^5.2.0"
+    pretty-format "^29.7.0"
+    slash "^3.0.0"
+    strip-json-comments "^3.1.1"
+
+jest-diff@^29.0.0, jest-diff@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.7.0.tgz#017934a66ebb7ecf6f205e84699be10afd70458a"
+  integrity sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==
   dependencies:
     chalk "^4.0.0"
-    diff-sequences "^26.6.2"
-    jest-get-type "^26.3.0"
-    pretty-format "^26.6.2"
+    diff-sequences "^29.6.3"
+    jest-get-type "^29.6.3"
+    pretty-format "^29.7.0"
 
-jest-docblock@^26.0.0:
-  version "26.0.0"
-  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-26.0.0.tgz#3e2fa20899fc928cb13bd0ff68bd3711a36889b5"
-  integrity sha512-RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w==
+jest-docblock@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-29.7.0.tgz#8fddb6adc3cdc955c93e2a87f61cfd350d5d119a"
+  integrity sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==
   dependencies:
     detect-newline "^3.0.0"
 
-jest-each@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.6.2.tgz#02526438a77a67401c8a6382dfe5999952c167cb"
-  integrity sha512-Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A==
+jest-each@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-29.7.0.tgz#162a9b3f2328bdd991beaabffbb74745e56577d1"
+  integrity sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==
   dependencies:
-    "@jest/types" "^26.6.2"
+    "@jest/types" "^29.6.3"
     chalk "^4.0.0"
-    jest-get-type "^26.3.0"
-    jest-util "^26.6.2"
-    pretty-format "^26.6.2"
-
-jest-environment-jsdom@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz#78d09fe9cf019a357009b9b7e1f101d23bd1da3e"
-  integrity sha512-jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q==
-  dependencies:
-    "@jest/environment" "^26.6.2"
-    "@jest/fake-timers" "^26.6.2"
-    "@jest/types" "^26.6.2"
+    jest-get-type "^29.6.3"
+    jest-util "^29.7.0"
+    pretty-format "^29.7.0"
+
+jest-environment-jsdom@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-29.7.0.tgz#d206fa3551933c3fd519e5dfdb58a0f5139a837f"
+  integrity sha512-k9iQbsf9OyOfdzWH8HDmrRT0gSIcX+FLNW7IQq94tFX0gynPwqDTW0Ho6iMVNjGz/nb+l/vW3dWM2bbLLpkbXA==
+  dependencies:
+    "@jest/environment" "^29.7.0"
+    "@jest/fake-timers" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    "@types/jsdom" "^20.0.0"
     "@types/node" "*"
-    jest-mock "^26.6.2"
-    jest-util "^26.6.2"
-    jsdom "^16.4.0"
-
-jest-environment-node@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.6.2.tgz#824e4c7fb4944646356f11ac75b229b0035f2b0c"
-  integrity sha512-zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag==
-  dependencies:
-    "@jest/environment" "^26.6.2"
-    "@jest/fake-timers" "^26.6.2"
-    "@jest/types" "^26.6.2"
+    jest-mock "^29.7.0"
+    jest-util "^29.7.0"
+    jsdom "^20.0.0"
+
+jest-environment-node@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-29.7.0.tgz#0b93e111dda8ec120bc8300e6d1fb9576e164376"
+  integrity sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==
+  dependencies:
+    "@jest/environment" "^29.7.0"
+    "@jest/fake-timers" "^29.7.0"
+    "@jest/types" "^29.6.3"
     "@types/node" "*"
-    jest-mock "^26.6.2"
-    jest-util "^26.6.2"
+    jest-mock "^29.7.0"
+    jest-util "^29.7.0"
 
-jest-esm-transformer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/jest-esm-transformer/-/jest-esm-transformer-1.0.0.tgz#b6c58f496aa48194f96361a52f5c578fd2209726"
-  integrity sha512-FoPgeMMwy1/CEsc8tBI41i83CEO3x85RJuZi5iAMmWoARXhfgk6Jd7y+4d+z+HCkTKNVDvSWKGRhwjzU9PUbrw==
-  dependencies:
-    "@babel/core" "^7.4.4"
-    "@babel/plugin-transform-modules-commonjs" "^7.4.4"
-
-jest-extended@^0.11.2:
-  version "0.11.2"
-  resolved "https://registry.yarnpkg.com/jest-extended/-/jest-extended-0.11.2.tgz#924f4a6b4c946133faf9ec8fba865de9790f4116"
-  integrity sha512-gwNMXrAPN0IY5L7VXWfSlC2aGo0KHIsGGcW+lTHYpedt5SJksEvBgMxs29iNikiNOz+cqAZY1s/+kYK0jlj4Jw==
-  dependencies:
-    expect "^24.1.0"
-    jest-get-type "^22.4.3"
-    jest-matcher-utils "^22.0.0"
-
-jest-get-type@^22.4.3:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.4.3.tgz#e3a8504d8479342dd4420236b322869f18900ce4"
-  integrity sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w==
-
-jest-get-type@^24.8.0:
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.8.0.tgz#a7440de30b651f5a70ea3ed7ff073a32dfe646fc"
-  integrity sha512-RR4fo8jEmMD9zSz2nLbs2j0zvPpk/KCEz3a62jJWbd2ayNo0cb+KFRxPHVhE4ZmgGJEQp0fosmNz84IfqM8cMQ==
-
-jest-get-type@^25.2.6:
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.2.6.tgz#0b0a32fab8908b44d508be81681487dbabb8d877"
-  integrity sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==
-
-jest-get-type@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0"
-  integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==
-
-jest-haste-map@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.6.2.tgz#dd7e60fe7dc0e9f911a23d79c5ff7fb5c2cafeaa"
-  integrity sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==
-  dependencies:
-    "@jest/types" "^26.6.2"
-    "@types/graceful-fs" "^4.1.2"
+jest-extended@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/jest-extended/-/jest-extended-4.0.2.tgz#d23b52e687cedf66694e6b2d77f65e211e99e021"
+  integrity sha512-FH7aaPgtGYHc9mRjriS0ZEHYM5/W69tLrFTIdzm+yJgeoCmmrSB/luSfMSqWP9O29QWHPEmJ4qmU6EwsZideog==
+  dependencies:
+    jest-diff "^29.0.0"
+    jest-get-type "^29.0.0"
+
+jest-get-type@^29.0.0, jest-get-type@^29.6.3:
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.6.3.tgz#36f499fdcea197c1045a127319c0481723908fd1"
+  integrity sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==
+
+jest-haste-map@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.7.0.tgz#3c2396524482f5a0506376e6c858c3bbcc17b104"
+  integrity sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==
+  dependencies:
+    "@jest/types" "^29.6.3"
+    "@types/graceful-fs" "^4.1.3"
     "@types/node" "*"
     anymatch "^3.0.3"
     fb-watchman "^2.0.0"
-    graceful-fs "^4.2.4"
-    jest-regex-util "^26.0.0"
-    jest-serializer "^26.6.2"
-    jest-util "^26.6.2"
-    jest-worker "^26.6.2"
-    micromatch "^4.0.2"
-    sane "^4.0.3"
-    walker "^1.0.7"
+    graceful-fs "^4.2.9"
+    jest-regex-util "^29.6.3"
+    jest-util "^29.7.0"
+    jest-worker "^29.7.0"
+    micromatch "^4.0.4"
+    walker "^1.0.8"
   optionalDependencies:
-    fsevents "^2.1.2"
-
-jest-jasmine2@^26.6.3:
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz#adc3cf915deacb5212c93b9f3547cd12958f2edd"
-  integrity sha512-kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg==
-  dependencies:
-    "@babel/traverse" "^7.1.0"
-    "@jest/environment" "^26.6.2"
-    "@jest/source-map" "^26.6.2"
-    "@jest/test-result" "^26.6.2"
-    "@jest/types" "^26.6.2"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    co "^4.6.0"
-    expect "^26.6.2"
-    is-generator-fn "^2.0.0"
-    jest-each "^26.6.2"
-    jest-matcher-utils "^26.6.2"
-    jest-message-util "^26.6.2"
-    jest-runtime "^26.6.3"
-    jest-snapshot "^26.6.2"
-    jest-util "^26.6.2"
-    pretty-format "^26.6.2"
-    throat "^5.0.0"
-
-jest-leak-detector@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz#7717cf118b92238f2eba65054c8a0c9c653a91af"
-  integrity sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg==
-  dependencies:
-    jest-get-type "^26.3.0"
-    pretty-format "^26.6.2"
-
-jest-localstorage-mock@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/jest-localstorage-mock/-/jest-localstorage-mock-2.3.0.tgz#86eda98d5af3aed687aebf11dbab3ca0f8fe66ff"
-  integrity sha512-Lk+awEPuIz0PSERHtnsXyMVLvf/4mZ3sZBEjKG5sJHvey2/i2JfQmmb/NHhialMbHXZILBORzuH64YXhWGlLsQ==
-
-jest-matcher-utils@^22.0.0:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-22.4.3.tgz#4632fe428ebc73ebc194d3c7b65d37b161f710ff"
-  integrity sha512-lsEHVaTnKzdAPR5t4B6OcxXo9Vy4K+kRRbG5gtddY8lBEC+Mlpvm1CJcsMESRjzUhzkz568exMV1hTB76nAKbA==
-  dependencies:
-    chalk "^2.0.1"
-    jest-get-type "^22.4.3"
-    pretty-format "^22.4.3"
+    fsevents "^2.3.2"
 
-jest-matcher-utils@^24.8.0:
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-24.8.0.tgz#2bce42204c9af12bde46f83dc839efe8be832495"
-  integrity sha512-lex1yASY51FvUuHgm0GOVj7DCYEouWSlIYmCW7APSqB9v8mXmKSn5+sWVF0MhuASG0bnYY106/49JU1FZNl5hw==
+jest-leak-detector@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz#5b7ec0dadfdfec0ca383dc9aa016d36b5ea4c728"
+  integrity sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==
   dependencies:
-    chalk "^2.0.1"
-    jest-diff "^24.8.0"
-    jest-get-type "^24.8.0"
-    pretty-format "^24.8.0"
+    jest-get-type "^29.6.3"
+    pretty-format "^29.7.0"
 
-jest-matcher-utils@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz#8e6fd6e863c8b2d31ac6472eeb237bc595e53e7a"
-  integrity sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw==
+jest-matcher-utils@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz#ae8fec79ff249fd592ce80e3ee474e83a6c44f12"
+  integrity sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==
   dependencies:
     chalk "^4.0.0"
-    jest-diff "^26.6.2"
-    jest-get-type "^26.3.0"
-    pretty-format "^26.6.2"
+    jest-diff "^29.7.0"
+    jest-get-type "^29.6.3"
+    pretty-format "^29.7.0"
 
-jest-message-util@^24.8.0:
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-24.8.0.tgz#0d6891e72a4beacc0292b638685df42e28d6218b"
-  integrity sha512-p2k71rf/b6ns8btdB0uVdljWo9h0ovpnEe05ZKWceQGfXYr4KkzgKo3PBi8wdnd9OtNh46VpNIJynUn/3MKm1g==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@jest/test-result" "^24.8.0"
-    "@jest/types" "^24.8.0"
-    "@types/stack-utils" "^1.0.1"
-    chalk "^2.0.1"
-    micromatch "^3.1.10"
-    slash "^2.0.0"
-    stack-utils "^1.0.1"
-
-jest-message-util@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.6.2.tgz#58173744ad6fc0506b5d21150b9be56ef001ca07"
-  integrity sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA==
+jest-message-util@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.7.0.tgz#8bc392e204e95dfe7564abbe72a404e28e51f7f3"
+  integrity sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==
   dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@jest/types" "^26.6.2"
+    "@babel/code-frame" "^7.12.13"
+    "@jest/types" "^29.6.3"
     "@types/stack-utils" "^2.0.0"
     chalk "^4.0.0"
-    graceful-fs "^4.2.4"
-    micromatch "^4.0.2"
-    pretty-format "^26.6.2"
+    graceful-fs "^4.2.9"
+    micromatch "^4.0.4"
+    pretty-format "^29.7.0"
     slash "^3.0.0"
-    stack-utils "^2.0.2"
+    stack-utils "^2.0.3"
 
-jest-mock@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.6.2.tgz#d6cb712b041ed47fe0d9b6fc3474bc6543feb302"
-  integrity sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew==
+jest-mock@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.7.0.tgz#4e836cf60e99c6fcfabe9f99d017f3fdd50a6347"
+  integrity sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==
   dependencies:
-    "@jest/types" "^26.6.2"
+    "@jest/types" "^29.6.3"
     "@types/node" "*"
+    jest-util "^29.7.0"
 
 jest-pnp-resolver@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c"
   integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==
 
-jest-regex-util@^24.3.0:
-  version "24.3.0"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.3.0.tgz#d5a65f60be1ae3e310d5214a0307581995227b36"
-  integrity sha512-tXQR1NEOyGlfylyEjg1ImtScwMq8Oh3iJbGTjN7p0J23EuVX1MA8rwU69K4sLbCmwzgCUbVkm0FkSF9TdzOhtg==
-
-jest-regex-util@^26.0.0:
-  version "26.0.0"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-26.0.0.tgz#d25e7184b36e39fd466c3bc41be0971e821fee28"
-  integrity sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==
+jest-regex-util@^29.6.3:
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.6.3.tgz#4a556d9c776af68e1c5f48194f4d0327d24e8a52"
+  integrity sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==
 
-jest-resolve-dependencies@^26.6.3:
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz#6680859ee5d22ee5dcd961fe4871f59f4c784fb6"
-  integrity sha512-pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg==
+jest-resolve-dependencies@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz#1b04f2c095f37fc776ff40803dc92921b1e88428"
+  integrity sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==
   dependencies:
-    "@jest/types" "^26.6.2"
-    jest-regex-util "^26.0.0"
-    jest-snapshot "^26.6.2"
+    jest-regex-util "^29.6.3"
+    jest-snapshot "^29.7.0"
 
-jest-resolve@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.6.2.tgz#a3ab1517217f469b504f1b56603c5bb541fbb507"
-  integrity sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==
+jest-resolve@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-29.7.0.tgz#64d6a8992dd26f635ab0c01e5eef4399c6bcbc30"
+  integrity sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==
   dependencies:
-    "@jest/types" "^26.6.2"
     chalk "^4.0.0"
-    graceful-fs "^4.2.4"
+    graceful-fs "^4.2.9"
+    jest-haste-map "^29.7.0"
     jest-pnp-resolver "^1.2.2"
-    jest-util "^26.6.2"
-    read-pkg-up "^7.0.1"
-    resolve "^1.18.1"
+    jest-util "^29.7.0"
+    jest-validate "^29.7.0"
+    resolve "^1.20.0"
+    resolve.exports "^2.0.0"
     slash "^3.0.0"
 
-jest-runner@^26.6.3:
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.6.3.tgz#2d1fed3d46e10f233fd1dbd3bfaa3fe8924be159"
-  integrity sha512-atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ==
+jest-runner@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-29.7.0.tgz#809af072d408a53dcfd2e849a4c976d3132f718e"
+  integrity sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==
   dependencies:
-    "@jest/console" "^26.6.2"
-    "@jest/environment" "^26.6.2"
-    "@jest/test-result" "^26.6.2"
-    "@jest/types" "^26.6.2"
+    "@jest/console" "^29.7.0"
+    "@jest/environment" "^29.7.0"
+    "@jest/test-result" "^29.7.0"
+    "@jest/transform" "^29.7.0"
+    "@jest/types" "^29.6.3"
     "@types/node" "*"
     chalk "^4.0.0"
-    emittery "^0.7.1"
-    exit "^0.1.2"
-    graceful-fs "^4.2.4"
-    jest-config "^26.6.3"
-    jest-docblock "^26.0.0"
-    jest-haste-map "^26.6.2"
-    jest-leak-detector "^26.6.2"
-    jest-message-util "^26.6.2"
-    jest-resolve "^26.6.2"
-    jest-runtime "^26.6.3"
-    jest-util "^26.6.2"
-    jest-worker "^26.6.2"
-    source-map-support "^0.5.6"
-    throat "^5.0.0"
-
-jest-runtime@^26.6.3:
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.6.3.tgz#4f64efbcfac398331b74b4b3c82d27d401b8fa2b"
-  integrity sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw==
-  dependencies:
-    "@jest/console" "^26.6.2"
-    "@jest/environment" "^26.6.2"
-    "@jest/fake-timers" "^26.6.2"
-    "@jest/globals" "^26.6.2"
-    "@jest/source-map" "^26.6.2"
-    "@jest/test-result" "^26.6.2"
-    "@jest/transform" "^26.6.2"
-    "@jest/types" "^26.6.2"
-    "@types/yargs" "^15.0.0"
+    emittery "^0.13.1"
+    graceful-fs "^4.2.9"
+    jest-docblock "^29.7.0"
+    jest-environment-node "^29.7.0"
+    jest-haste-map "^29.7.0"
+    jest-leak-detector "^29.7.0"
+    jest-message-util "^29.7.0"
+    jest-resolve "^29.7.0"
+    jest-runtime "^29.7.0"
+    jest-util "^29.7.0"
+    jest-watcher "^29.7.0"
+    jest-worker "^29.7.0"
+    p-limit "^3.1.0"
+    source-map-support "0.5.13"
+
+jest-runtime@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-29.7.0.tgz#efecb3141cf7d3767a3a0cc8f7c9990587d3d817"
+  integrity sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==
+  dependencies:
+    "@jest/environment" "^29.7.0"
+    "@jest/fake-timers" "^29.7.0"
+    "@jest/globals" "^29.7.0"
+    "@jest/source-map" "^29.6.3"
+    "@jest/test-result" "^29.7.0"
+    "@jest/transform" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    "@types/node" "*"
     chalk "^4.0.0"
-    cjs-module-lexer "^0.6.0"
+    cjs-module-lexer "^1.0.0"
     collect-v8-coverage "^1.0.0"
-    exit "^0.1.2"
     glob "^7.1.3"
-    graceful-fs "^4.2.4"
-    jest-config "^26.6.3"
-    jest-haste-map "^26.6.2"
-    jest-message-util "^26.6.2"
-    jest-mock "^26.6.2"
-    jest-regex-util "^26.0.0"
-    jest-resolve "^26.6.2"
-    jest-snapshot "^26.6.2"
-    jest-util "^26.6.2"
-    jest-validate "^26.6.2"
+    graceful-fs "^4.2.9"
+    jest-haste-map "^29.7.0"
+    jest-message-util "^29.7.0"
+    jest-mock "^29.7.0"
+    jest-regex-util "^29.6.3"
+    jest-resolve "^29.7.0"
+    jest-snapshot "^29.7.0"
+    jest-util "^29.7.0"
     slash "^3.0.0"
     strip-bom "^4.0.0"
-    yargs "^15.4.1"
-
-jest-serializer@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.6.2.tgz#d139aafd46957d3a448f3a6cdabe2919ba0742d1"
-  integrity sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==
-  dependencies:
-    "@types/node" "*"
-    graceful-fs "^4.2.4"
 
-jest-snapshot@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.6.2.tgz#f3b0af1acb223316850bd14e1beea9837fb39c84"
-  integrity sha512-OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og==
+jest-snapshot@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.7.0.tgz#c2c574c3f51865da1bb329036778a69bf88a6be5"
+  integrity sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==
   dependencies:
-    "@babel/types" "^7.0.0"
-    "@jest/types" "^26.6.2"
-    "@types/babel__traverse" "^7.0.4"
-    "@types/prettier" "^2.0.0"
+    "@babel/core" "^7.11.6"
+    "@babel/generator" "^7.7.2"
+    "@babel/plugin-syntax-jsx" "^7.7.2"
+    "@babel/plugin-syntax-typescript" "^7.7.2"
+    "@babel/types" "^7.3.3"
+    "@jest/expect-utils" "^29.7.0"
+    "@jest/transform" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    babel-preset-current-node-syntax "^1.0.0"
     chalk "^4.0.0"
-    expect "^26.6.2"
-    graceful-fs "^4.2.4"
-    jest-diff "^26.6.2"
-    jest-get-type "^26.3.0"
-    jest-haste-map "^26.6.2"
-    jest-matcher-utils "^26.6.2"
-    jest-message-util "^26.6.2"
-    jest-resolve "^26.6.2"
+    expect "^29.7.0"
+    graceful-fs "^4.2.9"
+    jest-diff "^29.7.0"
+    jest-get-type "^29.6.3"
+    jest-matcher-utils "^29.7.0"
+    jest-message-util "^29.7.0"
+    jest-util "^29.7.0"
     natural-compare "^1.4.0"
-    pretty-format "^26.6.2"
-    semver "^7.3.2"
+    pretty-format "^29.7.0"
+    semver "^7.5.3"
 
-jest-util@^26.1.0, jest-util@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.6.2.tgz#907535dbe4d5a6cb4c47ac9b926f6af29576cbc1"
-  integrity sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==
+jest-util@^29.0.0, jest-util@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.7.0.tgz#23c2b62bfb22be82b44de98055802ff3710fc0bc"
+  integrity sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==
   dependencies:
-    "@jest/types" "^26.6.2"
+    "@jest/types" "^29.6.3"
     "@types/node" "*"
     chalk "^4.0.0"
-    graceful-fs "^4.2.4"
-    is-ci "^2.0.0"
-    micromatch "^4.0.2"
+    ci-info "^3.2.0"
+    graceful-fs "^4.2.9"
+    picomatch "^2.2.3"
 
-jest-validate@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.6.2.tgz#23d380971587150467342911c3d7b4ac57ab20ec"
-  integrity sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ==
+jest-validate@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.7.0.tgz#7bf705511c64da591d46b15fce41400d52147d9c"
+  integrity sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==
   dependencies:
-    "@jest/types" "^26.6.2"
-    camelcase "^6.0.0"
+    "@jest/types" "^29.6.3"
+    camelcase "^6.2.0"
     chalk "^4.0.0"
-    jest-get-type "^26.3.0"
+    jest-get-type "^29.6.3"
     leven "^3.1.0"
-    pretty-format "^26.6.2"
+    pretty-format "^29.7.0"
 
-jest-watcher@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.6.2.tgz#a5b683b8f9d68dbcb1d7dae32172d2cca0592975"
-  integrity sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ==
+jest-watcher@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-29.7.0.tgz#7810d30d619c3a62093223ce6bb359ca1b28a2f2"
+  integrity sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==
   dependencies:
-    "@jest/test-result" "^26.6.2"
-    "@jest/types" "^26.6.2"
+    "@jest/test-result" "^29.7.0"
+    "@jest/types" "^29.6.3"
     "@types/node" "*"
     ansi-escapes "^4.2.1"
     chalk "^4.0.0"
-    jest-util "^26.6.2"
+    emittery "^0.13.1"
+    jest-util "^29.7.0"
     string-length "^4.0.1"
 
-jest-worker@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
-  integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==
-  dependencies:
-    "@types/node" "*"
-    merge-stream "^2.0.0"
-    supports-color "^7.0.0"
-
 jest-worker@^27.4.5:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0"
@@ -5849,14 +5634,25 @@ jest-worker@^27.4.5:
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
-jest@^26.6.3:
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-26.6.3.tgz#40e8fdbe48f00dfa1f0ce8121ca74b88ac9148ef"
-  integrity sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q==
+jest-worker@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.7.0.tgz#acad073acbbaeb7262bd5389e1bcf43e10058d4a"
+  integrity sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==
+  dependencies:
+    "@types/node" "*"
+    jest-util "^29.7.0"
+    merge-stream "^2.0.0"
+    supports-color "^8.0.0"
+
+jest@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-29.7.0.tgz#994676fc24177f088f1c5e3737f5697204ff2613"
+  integrity sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==
   dependencies:
-    "@jest/core" "^26.6.3"
+    "@jest/core" "^29.7.0"
+    "@jest/types" "^29.6.3"
     import-local "^3.0.2"
-    jest-cli "^26.6.3"
+    jest-cli "^29.7.0"
 
 js-message@1.0.5:
   version "1.0.5"
@@ -5883,88 +5679,70 @@ js-yaml@^3.10.0, js-yaml@^3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@^3.14.0:
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482"
-  integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==
+js-yaml@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
   dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
-jsbn@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
+    argparse "^2.0.1"
 
-jsdoc-type-pratt-parser@~2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-2.2.2.tgz#a85e407ac502b444dc23333aa4d6d0dc83f76187"
-  integrity sha512-zRokSWcPLSWkoNzsWn9pq7YYSwDhKyEe+cJYT2qaPqLOOJb5sFSi46BPj81vP+e8chvCNdQL9RG86Bi9EI6MDw==
-
-jsdom@^16.4.0:
-  version "16.4.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.4.0.tgz#36005bde2d136f73eee1a830c6d45e55408edddb"
-  integrity sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w==
-  dependencies:
-    abab "^2.0.3"
-    acorn "^7.1.1"
-    acorn-globals "^6.0.0"
-    cssom "^0.4.4"
-    cssstyle "^2.2.0"
-    data-urls "^2.0.0"
-    decimal.js "^10.2.0"
-    domexception "^2.0.1"
-    escodegen "^1.14.1"
-    html-encoding-sniffer "^2.0.1"
-    is-potential-custom-element-name "^1.0.0"
-    nwsapi "^2.2.0"
-    parse5 "5.1.1"
-    request "^2.88.2"
-    request-promise-native "^1.0.8"
-    saxes "^5.0.0"
+jsdoc-type-pratt-parser@~4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.0.0.tgz#136f0571a99c184d84ec84662c45c29ceff71114"
+  integrity sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ==
+
+jsdom@^20.0.0:
+  version "20.0.3"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.3.tgz#886a41ba1d4726f67a8858028c99489fed6ad4db"
+  integrity sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ==
+  dependencies:
+    abab "^2.0.6"
+    acorn "^8.8.1"
+    acorn-globals "^7.0.0"
+    cssom "^0.5.0"
+    cssstyle "^2.3.0"
+    data-urls "^3.0.2"
+    decimal.js "^10.4.2"
+    domexception "^4.0.0"
+    escodegen "^2.0.0"
+    form-data "^4.0.0"
+    html-encoding-sniffer "^3.0.0"
+    http-proxy-agent "^5.0.0"
+    https-proxy-agent "^5.0.1"
+    is-potential-custom-element-name "^1.0.1"
+    nwsapi "^2.2.2"
+    parse5 "^7.1.1"
+    saxes "^6.0.0"
     symbol-tree "^3.2.4"
-    tough-cookie "^3.0.1"
-    w3c-hr-time "^1.0.2"
-    w3c-xmlserializer "^2.0.0"
-    webidl-conversions "^6.1.0"
-    whatwg-encoding "^1.0.5"
-    whatwg-mimetype "^2.3.0"
-    whatwg-url "^8.0.0"
-    ws "^7.2.3"
-    xml-name-validator "^3.0.0"
+    tough-cookie "^4.1.2"
+    w3c-xmlserializer "^4.0.0"
+    webidl-conversions "^7.0.0"
+    whatwg-encoding "^2.0.0"
+    whatwg-mimetype "^3.0.0"
+    whatwg-url "^11.0.0"
+    ws "^8.11.0"
+    xml-name-validator "^4.0.0"
 
 jsesc@^2.5.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.1.tgz#e421a2a8e20d6b0819df28908f782526b96dd1fe"
-  integrity sha1-5CGiqOINawgZ3yiQj3glJrlt0f4=
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
+  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
-json-buffer@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
-  integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=
-
-json-edm-parser@0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/json-edm-parser/-/json-edm-parser-0.1.2.tgz#1e60b0fef1bc0af67bc0d146dfdde5486cd615b4"
-  integrity sha1-HmCw/vG8CvZ7wNFG393lSGzWFbQ=
-  dependencies:
-    jsonparse "~1.2.0"
+json-buffer@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
+  integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
 
-json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
+json-parse-better-errors@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
-json-parse-even-better-errors@^2.3.0:
+json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
   integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
 
-json-schema-traverse@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
-  integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=
-
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
@@ -5975,11 +5753,6 @@ json-schema-traverse@^1.0.0:
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
   integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
 
-json-schema@0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
-  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
-
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
@@ -5992,35 +5765,33 @@ json-stable-stringify@^1.0.1:
   dependencies:
     jsonify "~0.0.0"
 
-json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
+json-stringify-safe@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
-json5@2.x, json5@^2.1.2:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
-  integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
-  dependencies:
-    minimist "^1.2.5"
-
-json5@^0.5.0:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
-  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
-
 json5@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
-  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
+  integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
   dependencies:
     minimist "^1.2.0"
 
+json5@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
+  integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
+
 jsonc-parser@^2.2.1:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.3.0.tgz#7c7fc988ee1486d35734faaaa866fadb00fa91ee"
   integrity sha512-b0EBt8SWFNnixVdvoR2ZtEGa9ZqLhbJnOjezn+WP+8kspFm+PFYDN8Z4Bc7pRlDjvuVcADSUkroIuTWWn/YiIA==
 
+jsonc-parser@~3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.1.0.tgz#73b8f0e5c940b83d03476bc2e51a20ef0932615d"
+  integrity sha512-DRf0QjnNeCUds3xTjKlQQ3DpJD51GvDjJfnxUVWg6PZTo2otSm+slzNAxU/35hF8/oJIKoG9slq30JYOsF2azg==
+
 jsonfile@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
@@ -6042,21 +5813,6 @@ jsonify@~0.0.0:
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
   integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=
 
-jsonparse@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.2.0.tgz#5c0c5685107160e72fe7489bddea0b44c2bc67bd"
-  integrity sha1-XAxWhRBxYOcv50ib3eoLRMK8Z70=
-
-jsprim@^1.2.2:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
-  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
-  dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.3.0"
-    json-schema "0.2.3"
-    verror "1.10.0"
-
 "jsx-ast-utils@^2.4.1 || ^3.0.0":
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.1.tgz#720b97bfe7d901b927d87c3773637ae8ea48781b"
@@ -6065,48 +5821,44 @@ jsprim@^1.2.2:
     array-includes "^3.1.3"
     object.assign "^4.1.2"
 
-jszip@^3.7.1:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.7.1.tgz#bd63401221c15625a1228c556ca8a68da6fda3d9"
-  integrity sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==
+jsx-ast-utils@^3.3.2:
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz#76b3e6e6cece5c69d49a5792c3d01bd1a0cdc7ea"
+  integrity sha512-fYQHZTZ8jSfmWZ0iyzfwiU4WDX4HpHbMCZ3gPlWYiCl3BoeOTsqKBqnTVfH2rYT7eP5c3sVbeSPHnnJOaTrWiw==
+  dependencies:
+    array-includes "^3.1.5"
+    object.assign "^4.1.3"
+
+jsx-ast-utils@^3.3.3:
+  version "3.3.5"
+  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz#4766bd05a8e2a11af222becd19e15575e52a853a"
+  integrity sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==
   dependencies:
-    lie "~3.3.0"
-    pako "~1.0.2"
-    readable-stream "~2.3.6"
-    set-immediate-shim "~1.0.1"
+    array-includes "^3.1.6"
+    array.prototype.flat "^1.3.1"
+    object.assign "^4.1.4"
+    object.values "^1.1.6"
 
 junk@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/junk/-/junk-3.1.0.tgz#31499098d902b7e98c5d9b9c80f43457a88abfa1"
   integrity sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==
 
-keyv@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9"
-  integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==
-  dependencies:
-    json-buffer "3.0.0"
-
-kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
-  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
+keyv@^4.0.0:
+  version "4.5.2"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.2.tgz#0e310ce73bf7851ec702f2eaf46ec4e3805cce56"
+  integrity sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g==
   dependencies:
-    is-buffer "^1.1.5"
+    json-buffer "3.0.1"
 
-kind-of@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
-  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
+keyv@^4.5.3:
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
+  integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==
   dependencies:
-    is-buffer "^1.1.5"
+    json-buffer "3.0.1"
 
-kind-of@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
-  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
-
-kind-of@^6.0.0, kind-of@^6.0.2:
+kind-of@^6.0.2:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
@@ -6123,29 +5875,17 @@ kleur@^3.0.3:
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
   integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
-klona@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.4.tgz#7bb1e3affb0cb8624547ef7e8f6708ea2e39dfc0"
-  integrity sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==
-
-latest-version@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face"
-  integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==
-  dependencies:
-    package-json "^6.3.0"
+language-subtag-registry@~0.3.2:
+  version "0.3.22"
+  resolved "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz#2e1500861b2e457eba7e7ae86877cbd08fa1fd1d"
+  integrity sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w==
 
-lazy-cache@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-2.0.2.tgz#b9190a4f913354694840859f8a8f7084d8822264"
-  integrity sha1-uRkKT5EzVGlIQIWfio9whNiCImQ=
+language-tags@=1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/language-tags/-/language-tags-1.0.5.tgz#d321dbc4da30ba8bf3024e040fa5c14661f9193a"
+  integrity sha512-qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ==
   dependencies:
-    set-getter "^0.1.0"
-
-lazy-val@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.4.tgz#882636a7245c2cfe6e0a4e3ba6c5d68a137e5c65"
-  integrity sha512-u93kb2fPbIrfzBuLjZE+w+fJbUUMhNDXxNmMfaqNgpfQf1CO5ZSe2LfsnBqVAk7i/2NF48OSoRj+Xe2VT+lE8Q==
+    language-subtag-registry "~0.3.2"
 
 legal-eagle@0.16.0:
   version "0.16.0"
@@ -6168,26 +5908,18 @@ levn@^0.4.1:
     prelude-ls "^1.2.1"
     type-check "~0.4.0"
 
-levn@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
-  dependencies:
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-
-lie@~3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/lie/-/lie-3.3.0.tgz#dcf82dee545f46074daf200c7c1c5a08e0f40f6a"
-  integrity sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==
-  dependencies:
-    immediate "~3.0.5"
-
 lines-and-columns@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
   integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
 
+linkify-it@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-4.0.1.tgz#01f1d5e508190d06669982ba31a7d9f56a5751ec"
+  integrity sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==
+  dependencies:
+    uc.micro "^1.0.1"
+
 load-json-file@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
@@ -6199,27 +5931,18 @@ load-json-file@^2.0.0:
     strip-bom "^3.0.0"
 
 loader-runner@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384"
-  integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1"
+  integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==
 
 loader-utils@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
-  integrity sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=
-  dependencies:
-    big.js "^3.1.3"
-    emojis-list "^2.0.0"
-    json5 "^0.5.0"
-
-loader-utils@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0"
-  integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.2.tgz#29a957f3a63973883eb684f10ffd3d151fec01a3"
+  integrity sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==
   dependencies:
     big.js "^5.2.2"
     emojis-list "^3.0.0"
-    json5 "^2.1.2"
+    json5 "^1.0.1"
 
 locate-path@^2.0.0:
   version "2.0.0"
@@ -6236,6 +5959,13 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
+locate-path@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
+  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
+  dependencies:
+    p-locate "^5.0.0"
+
 lodash._reinterpolate@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
@@ -6246,6 +5976,11 @@ lodash.assign@^4.0.8:
   resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
   integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=
 
+lodash.camelcase@4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
+  integrity sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==
+
 lodash.endswith@^4.0.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/lodash.endswith/-/lodash.endswith-4.2.1.tgz#fed59ac1738ed3e236edd7064ec456448b37bc09"
@@ -6261,15 +5996,25 @@ lodash.get@^4.0.0:
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
   integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
 
+lodash.kebabcase@4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36"
+  integrity sha512-N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g==
+
 lodash.memoize@4.x:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
   integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
 
-lodash.sortby@^4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
-  integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
+lodash.merge@^4.6.2:
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
+  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
+
+lodash.snakecase@4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz#39d714a35357147837aefd64b5dcbb16becd8f8d"
+  integrity sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw==
 
 lodash.template@^4.2.2:
   version "4.4.0"
@@ -6286,7 +6031,12 @@ lodash.templatesettings@^4.0.0:
   dependencies:
     lodash._reinterpolate "~3.0.0"
 
-lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21:
+lodash.upperfirst@4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz#1365edf431480481ef0d1c68957a5ed99d49f7ce"
+  integrity sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg==
+
+lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -6305,23 +6055,15 @@ lower-case@^2.0.2:
   dependencies:
     tslib "^2.0.3"
 
-lowercase-keys@^1.0.0, lowercase-keys@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
-  integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
-
 lowercase-keys@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
   integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==
 
-lru-cache@^4.0.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55"
-  integrity sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==
-  dependencies:
-    pseudomap "^1.0.2"
-    yallist "^2.1.2"
+lru-cache@^11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-11.0.0.tgz#15d93a196f189034d7166caf9fe55e7384c98a21"
+  integrity sha512-Qv32eSV1RSCfhY3fpPE2GNZ8jgM9X7rdAfemLWqTUxwiyIC4jJ6Sy0fZ8H+oLWevO6i4/bizg7c8d8i6bxrzbA==
 
 lru-cache@^5.1.1:
   version "5.1.1"
@@ -6354,24 +6096,51 @@ make-error@^1.1.1:
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.0.tgz#52ad3a339ccf10ce62b4040b708fe707244b8b96"
   integrity sha1-Uq06M5zPEM5itAQLcI/nByRLi5Y=
 
-makeerror@1.0.x:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
-  integrity sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=
-  dependencies:
-    tmpl "1.0.x"
-
-map-cache@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
-  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
-
-map-visit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
-  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
-  dependencies:
-    object-visit "^1.0.0"
+makeerror@1.0.12:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a"
+  integrity sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==
+  dependencies:
+    tmpl "1.0.5"
+
+markdown-it@13.0.1:
+  version "13.0.1"
+  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-13.0.1.tgz#c6ecc431cacf1a5da531423fc6a42807814af430"
+  integrity sha512-lTlxriVoy2criHP0JKRhO2VDG9c2ypWCsT237eDiLqi09rmbKoUetyGHq2uOIRoRS//kfoJckS0eUzzkDR+k2Q==
+  dependencies:
+    argparse "^2.0.1"
+    entities "~3.0.1"
+    linkify-it "^4.0.1"
+    mdurl "^1.0.1"
+    uc.micro "^1.0.5"
+
+markdownlint-cli@^0.32.2:
+  version "0.32.2"
+  resolved "https://registry.yarnpkg.com/markdownlint-cli/-/markdownlint-cli-0.32.2.tgz#b7b5c5808039aef4022aef603efaa607caf8e0de"
+  integrity sha512-xmJT1rGueUgT4yGNwk6D0oqQr90UJ7nMyakXtqjgswAkEhYYqjHew9RY8wDbOmh2R270IWjuKSeZzHDEGPAUkQ==
+  dependencies:
+    commander "~9.4.0"
+    get-stdin "~9.0.0"
+    glob "~8.0.3"
+    ignore "~5.2.0"
+    js-yaml "^4.1.0"
+    jsonc-parser "~3.1.0"
+    markdownlint "~0.26.2"
+    markdownlint-rule-helpers "~0.17.2"
+    minimatch "~5.1.0"
+    run-con "~1.2.11"
+
+markdownlint-rule-helpers@~0.17.2:
+  version "0.17.2"
+  resolved "https://registry.yarnpkg.com/markdownlint-rule-helpers/-/markdownlint-rule-helpers-0.17.2.tgz#64d6e8c66e497e631b0e40cf1cef7ca622a0b654"
+  integrity sha512-XaeoW2NYSlWxMCZM2B3H7YTG6nlaLfkEZWMBhr4hSPlq9MuY2sy83+Xr89jXOqZMZYjvi5nBCGoFh7hHoPKZmA==
+
+markdownlint@~0.26.2:
+  version "0.26.2"
+  resolved "https://registry.yarnpkg.com/markdownlint/-/markdownlint-0.26.2.tgz#11d3d03e7f0dd3c2e239753ee8fd064a861d9237"
+  integrity sha512-2Am42YX2Ex5SQhRq35HxYWDfz1NLEOZWWN25nqd2h3AHRKsGRE+Qg1gt1++exW792eXTrR4jCNHfShfWk9Nz8w==
+  dependencies:
+    markdown-it "13.0.1"
 
 matcher@^3.0.0:
   version "3.0.0"
@@ -6385,30 +6154,17 @@ matchmedia-polyfill@^0.3.1:
   resolved "https://registry.yarnpkg.com/matchmedia-polyfill/-/matchmedia-polyfill-0.3.1.tgz#83e754b3b4a297179fcdb71c3aefa0980bff7b18"
   integrity sha512-3zLYw2mf078kXzJv/At7FzWC4O5BAtiy+D4sRevC/lewLlhMtVHDS35eWhlP+fQzI/UUiBVu+ez0rsJJzW88iQ==
 
-md5.js@1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d"
-  integrity sha1-6b296UogpawYsENA/Fdk1bCdkB0=
-  dependencies:
-    hash-base "^3.0.0"
-    inherits "^2.0.1"
-
-media-typer@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
-  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
+mdurl@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
+  integrity sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==
 
-memfs@^3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.1.tgz#b78092f466a0dce054d63d39275b24c71d3f1305"
-  integrity sha512-1c9VPVvW5P7I85c35zAdEr1TD5+F11IToIHIlrVIcflfnzPkJa0ZoYEoEdYDP8KgPFoSZ/opDrUsAoZWym3mtw==
+memfs@^3.4.3:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.6.0.tgz#d7a2110f86f79dd950a8b6df6d57bc984aa185f6"
+  integrity sha512-EGowvkkgbMcIChjMTMkESFDbZeSh8xZ7kNSF0hAiAN4Jh6jgHCRS0Ga/+C8y6Au+oqpezRHCfPsmJ2+DwAgiwQ==
   dependencies:
-    fs-monkey "1.0.3"
-
-merge-descriptors@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
-  integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
+    fs-monkey "^1.0.4"
 
 merge-stream@^2.0.0:
   version "2.0.0"
@@ -6420,122 +6176,62 @@ merge2@^1.3.0, merge2@^1.4.1:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
-methods@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
-  integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
-
-micromatch@^3.1.10, micromatch@^3.1.4:
-  version "3.1.10"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
-  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
-  dependencies:
-    arr-diff "^4.0.0"
-    array-unique "^0.3.2"
-    braces "^2.3.1"
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    extglob "^2.0.4"
-    fragment-cache "^0.2.1"
-    kind-of "^6.0.2"
-    nanomatch "^1.2.9"
-    object.pick "^1.3.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.2"
-
 micromatch@^4.0.0, micromatch@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
-  integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
-  dependencies:
-    braces "^3.0.1"
-    picomatch "^2.2.3"
-
-micromatch@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
-  integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
-  dependencies:
-    braces "^3.0.1"
-    picomatch "^2.0.5"
-
-mime-db@1.40.0:
-  version "1.40.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
-  integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==
-
-mime-db@1.51.0:
-  version "1.51.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c"
-  integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==
-
-mime-db@~1.30.0:
-  version "1.30.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
-  integrity sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=
-
-mime-db@~1.36.0:
-  version "1.36.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.36.0.tgz#5020478db3c7fe93aad7bbcc4dcf869c43363397"
-  integrity sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw==
-
-mime-types@^2.1.12, mime-types@~2.1.17:
-  version "2.1.17"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
-  integrity sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=
-  dependencies:
-    mime-db "~1.30.0"
-
-mime-types@^2.1.27, mime-types@^2.1.31:
-  version "2.1.34"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24"
-  integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
+  integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
   dependencies:
-    mime-db "1.51.0"
+    braces "^3.0.3"
+    picomatch "^2.3.1"
 
-mime-types@~2.1.19:
-  version "2.1.20"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.20.tgz#930cb719d571e903738520f8470911548ca2cc19"
-  integrity sha512-HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==
-  dependencies:
-    mime-db "~1.36.0"
+mime-db@1.52.0:
+  version "1.52.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
+  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
-mime-types@~2.1.24:
-  version "2.1.24"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81"
-  integrity sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==
+mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31:
+  version "2.1.35"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
+  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
   dependencies:
-    mime-db "1.40.0"
-
-mime@1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
-  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
-
-mime@^2.4.5:
-  version "2.4.6"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz#e5b407c90db442f2beb5b162373d07b69affa4d1"
-  integrity sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==
+    mime-db "1.52.0"
 
 mimic-fn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
-mimic-response@^1.0.0, mimic-response@^1.0.1:
+mimic-fn@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-4.0.0.tgz#60a90550d5cb0b239cca65d893b1a53b29871ecc"
+  integrity sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==
+
+mimic-response@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
   integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
 
-mini-css-extract-plugin@^2.5.3:
-  version "2.5.3"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.5.3.tgz#c5c79f9b22ce9b4f164e9492267358dbe35376d9"
-  integrity sha512-YseMB8cs8U/KCaAGQoqYmfUuhhGW0a9p9XvWXrxVOkE3/IiISTLw4ALNt7JR5B2eYauFM+PQGSbXMDmVbR7Tfw==
+mimic-response@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9"
+  integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==
+
+mini-css-extract-plugin@^2.9.1:
+  version "2.9.1"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.1.tgz#4d184f12ce90582e983ccef0f6f9db637b4be758"
+  integrity sha512-+Vyi+GCCOHnrJ2VPS+6aPoXN2k2jgUzDRhTFLjjTBn23qyXJXkjUWQgTL+mXpF5/A8ixLdCc6kWsoeOjKGejKQ==
   dependencies:
     schema-utils "^4.0.0"
+    tapable "^2.2.1"
+
+minimatch@^10.0.0:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.0.1.tgz#ce0521856b453c86e25f2c4c0d03e6ff7ddc440b"
+  integrity sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==
+  dependencies:
+    brace-expansion "^2.0.1"
 
-minimatch@^3.0.4:
+minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -6549,33 +6245,27 @@ minimatch@^5.0.1:
   dependencies:
     brace-expansion "^2.0.1"
 
+minimatch@~5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz#1717b464f4971b144f6aabe8f2d0b8e4511e09c7"
+  integrity sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==
+  dependencies:
+    brace-expansion "^2.0.1"
+
 minimist@0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
   integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
 
-minimist@^1.1.1, minimist@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
-
-minimist@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
-  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
-
-mixin-deep@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.2.0.tgz#d02b8c6f8b6d4b8f5982d3fd009c4919851c3fe2"
-  integrity sha1-0CuMb4ttS49ZgtP9AJxJGYUcP+I=
-  dependencies:
-    for-in "^1.0.2"
-    is-extendable "^0.1.1"
+minimist@^1.2.0, minimist@^1.2.6:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
+  integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
 
-mkdirp@1.x:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
-  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+minipass@^7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707"
+  integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==
 
 mkdirp@^0.5.1:
   version "0.5.1"
@@ -6584,28 +6274,16 @@ mkdirp@^0.5.1:
   dependencies:
     minimist "0.0.8"
 
-mkdirp@^0.5.4:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
-  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
-  dependencies:
-    minimist "^1.2.5"
-
-mrmime@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-1.0.0.tgz#14d387f0585a5233d291baba339b063752a2398b"
-  integrity sha512-a70zx7zFfVO7XpnQ2IX1Myh9yY4UYvfld/dikWRnsXxbyvMcfz+u6UfgNAtH+k2QqtJuzVpv6eLTx1G2+WKZbQ==
+mrmime@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-2.0.0.tgz#151082a6e06e59a9a39b46b3e14d5cfe92b3abb4"
+  integrity sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==
 
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
-ms@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
-  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
-
 ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
@@ -6616,49 +6294,21 @@ ms@^2.1.1:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
-nanoid@^3.3.4:
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
-  integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
-
-nanomatch@^1.2.9:
-  version "1.2.9"
-  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.9.tgz#879f7150cb2dab7a471259066c104eee6e0fa7c2"
-  integrity sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==
-  dependencies:
-    arr-diff "^4.0.0"
-    array-unique "^0.3.2"
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    fragment-cache "^0.2.1"
-    is-odd "^2.0.0"
-    is-windows "^1.0.2"
-    kind-of "^6.0.2"
-    object.pick "^1.3.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
+nanoid@^3.3.7:
+  version "3.3.8"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.8.tgz#b1be3030bee36aaff18bacb375e5cce521684baf"
+  integrity sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==
 
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
-negotiator@0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
-  integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
-
 neo-async@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
-nice-try@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
-  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
-
 no-case@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d"
@@ -6681,27 +6331,10 @@ node-ipc@^9.1.0:
     js-message "1.0.5"
     js-queue "2.0.0"
 
-node-modules-regexp@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40"
-  integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=
-
-node-notifier@^8.0.0:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.1.tgz#f86e89bbc925f2b068784b31f382afdc6ca56be1"
-  integrity sha512-BvEXF+UmsnAfYfoapKM9nGxnP+Wn7P91YfXmrKnfcYCx6VBeoN5Ez5Ogck6I8Bi5k4RlpqRYaw75pAwzX9OphA==
-  dependencies:
-    growly "^1.3.0"
-    is-wsl "^2.2.0"
-    semver "^7.3.2"
-    shellwords "^0.1.1"
-    uuid "^8.3.0"
-    which "^2.0.2"
-
-node-releases@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5"
-  integrity sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==
+node-releases@^2.0.18, node-releases@^2.0.6:
+  version "2.0.18"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f"
+  integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==
 
 normalize-package-data@^2.0.0, normalize-package-data@^2.3.2:
   version "2.4.0"
@@ -6713,118 +6346,67 @@ normalize-package-data@^2.0.0, normalize-package-data@^2.3.2:
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
-normalize-package-data@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
-  integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
-  dependencies:
-    hosted-git-info "^2.1.4"
-    resolve "^1.10.0"
-    semver "2 || 3 || 4 || 5"
-    validate-npm-package-license "^3.0.1"
-
-normalize-path@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
-  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
-  dependencies:
-    remove-trailing-separator "^1.0.1"
-
 normalize-path@^3.0.0, normalize-path@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
 
-normalize-url@^4.1.0:
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a"
-  integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==
-
-npm-conf@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9"
-  integrity sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==
-  dependencies:
-    config-chain "^1.1.11"
-    pify "^3.0.0"
-
-npm-run-path@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
-  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
-  dependencies:
-    path-key "^2.0.0"
+normalize-url@^6.0.1:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
+  integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==
 
-npm-run-path@^4.0.0:
+npm-run-path@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
   integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
   dependencies:
     path-key "^3.0.0"
 
+npm-run-path@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-5.1.0.tgz#bc62f7f3f6952d9894bd08944ba011a6ee7b7e00"
+  integrity sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==
+  dependencies:
+    path-key "^4.0.0"
+
 nth-check@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2"
-  integrity sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d"
+  integrity sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==
   dependencies:
     boolbase "^1.0.0"
 
-nwsapi@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
-  integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
-
-oauth-sign@~0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
-  integrity sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=
+nwsapi@^2.2.2:
+  version "2.2.7"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.7.tgz#738e0707d3128cb750dddcfe90e4610482df0f30"
+  integrity sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==
 
-oauth-sign@~0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
-  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
-
-object-assign@^4.0.1, object-assign@^4.1.1:
+object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
-
-object-copy@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
-  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
-  dependencies:
-    copy-descriptor "^0.1.0"
-    define-property "^0.2.5"
-    kind-of "^3.0.3"
+  integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
 
 object-inspect@^1.11.0, object-inspect@^1.9.0:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0"
   integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==
 
-object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
+object-inspect@^1.12.0:
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea"
+  integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==
+
+object-inspect@^1.12.3:
+  version "1.12.3"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9"
+  integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==
+
+object-keys@^1.0.12, object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
-object-visit@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
-  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
-  dependencies:
-    isobject "^3.0.0"
-
-object.assign@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
-  integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
-  dependencies:
-    define-properties "^1.1.2"
-    function-bind "^1.1.1"
-    has-symbols "^1.0.0"
-    object-keys "^1.0.11"
-
 object.assign@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
@@ -6835,6 +6417,16 @@ object.assign@^4.1.2:
     has-symbols "^1.0.1"
     object-keys "^1.1.1"
 
+object.assign@^4.1.3, object.assign@^4.1.4:
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f"
+  integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    has-symbols "^1.0.3"
+    object-keys "^1.1.1"
+
 object.entries@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.0.4.tgz#1bf9a4dd2288f5b33f3a993d257661f05d161a5f"
@@ -6845,14 +6437,14 @@ object.entries@^1.0.4:
     function-bind "^1.1.0"
     has "^1.0.1"
 
-object.entries@^1.1.4:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.5.tgz#e1acdd17c4de2cd96d5a08487cfb9db84d881861"
-  integrity sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==
+object.entries@^1.1.6:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.7.tgz#2b47760e2a2e3a752f39dd874655c61a7f03c131"
+  integrity sha512-jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
 
 object.fromentries@^1.0.0:
   version "1.0.0"
@@ -6864,14 +6456,14 @@ object.fromentries@^1.0.0:
     function-bind "^1.1.1"
     has "^1.0.1"
 
-object.fromentries@^2.0.4:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.5.tgz#7b37b205109c21e741e605727fe8b0ad5fa08251"
-  integrity sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw==
+object.fromentries@^2.0.6:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.7.tgz#71e95f441e9a0ea6baf682ecaaf37fa2a8d7e616"
+  integrity sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
 
 object.getownpropertydescriptors@^2.0.3:
   version "2.0.3"
@@ -6881,20 +6473,13 @@ object.getownpropertydescriptors@^2.0.3:
     define-properties "^1.1.2"
     es-abstract "^1.5.1"
 
-object.hasown@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.0.tgz#7232ed266f34d197d15cac5880232f7a4790afe5"
-  integrity sha512-MhjYRfj3GBlhSkDHo6QmvgjRLXQ2zndabdf3nX0yTyZK9rPfxb6uRpAac8HXNLy1GpqWtZ81Qh4v3uOls2sRAg==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
-
-object.pick@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
-  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
+object.hasown@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.3.tgz#6a5f2897bb4d3668b8e79364f98ccf971bda55ae"
+  integrity sha512-fFI4VcYpRHvSLXxP7yiZOMAd331cPfd2p7PFDVbgUsYOfCT3tICVqXWngbjr4m49OvsBwUBQ6O2uQoJvy3RexA==
   dependencies:
-    isobject "^3.0.1"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
 
 object.values@^1.0.4:
   version "1.0.4"
@@ -6906,7 +6491,7 @@ object.values@^1.0.4:
     function-bind "^1.1.0"
     has "^1.0.1"
 
-object.values@^1.1.4:
+object.values@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac"
   integrity sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==
@@ -6915,12 +6500,14 @@ object.values@^1.1.4:
     define-properties "^1.1.3"
     es-abstract "^1.19.1"
 
-on-finished@~2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
-  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
+object.values@^1.1.6:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.7.tgz#617ed13272e7e1071b43973aa1655d9291b8442a"
+  integrity sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==
   dependencies:
-    ee-first "1.1.1"
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
 
 once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
@@ -6929,61 +6516,56 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0:
   dependencies:
     wrappy "1"
 
-onetime@^5.1.0:
+onetime@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
   integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
   dependencies:
     mimic-fn "^2.1.0"
 
+onetime@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-6.0.0.tgz#7c24c18ed1fd2e9bca4bd26806a33613c77d34b4"
+  integrity sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==
+  dependencies:
+    mimic-fn "^4.0.0"
+
+open@^9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/open/-/open-9.1.0.tgz#684934359c90ad25742f5a26151970ff8c6c80b6"
+  integrity sha512-OS+QTnw1/4vrf+9hh1jc1jnYjzSG4ttTBB8UxOwAnInG3Uo4ssetzC1ihqaIHjLJnA5GGlRl6QlZXOTQhRBUvg==
+  dependencies:
+    default-browser "^4.0.0"
+    define-lazy-prop "^3.0.0"
+    is-inside-container "^1.0.0"
+    is-wsl "^2.2.0"
+
 opener@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598"
   integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==
 
-optionator@^0.8.1:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
-  integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=
-  dependencies:
-    deep-is "~0.1.3"
-    fast-levenshtein "~2.0.4"
-    levn "~0.3.0"
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-    wordwrap "~1.0.0"
-
-optionator@^0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
-  integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
+optionator@^0.9.3:
+  version "0.9.3"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64"
+  integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==
   dependencies:
+    "@aashutoshrathi/word-wrap" "^1.2.3"
     deep-is "^0.1.3"
     fast-levenshtein "^2.0.6"
     levn "^0.4.1"
     prelude-ls "^1.2.1"
     type-check "^0.4.0"
-    word-wrap "^1.2.3"
 
 os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
-p-cancelable@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
-  integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==
-
-p-each-series@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.2.0.tgz#105ab0357ce72b202a8a8b94933672657b5e2a9a"
-  integrity sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA==
-
-p-finally@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
-  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
+p-cancelable@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf"
+  integrity sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==
 
 p-limit@^1.1.0:
   version "1.1.0"
@@ -6997,6 +6579,13 @@ p-limit@^2.2.0:
   dependencies:
     p-try "^2.0.0"
 
+p-limit@^3.0.2, p-limit@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
+  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
+  dependencies:
+    yocto-queue "^0.1.0"
+
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
@@ -7011,30 +6600,27 @@ p-locate@^4.1.0:
   dependencies:
     p-limit "^2.2.0"
 
+p-locate@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
+  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
+  dependencies:
+    p-limit "^3.0.2"
+
 p-try@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
   integrity sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==
 
-package-json@^6.3.0:
-  version "6.5.0"
-  resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0"
-  integrity sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==
-  dependencies:
-    got "^9.6.0"
-    registry-auth-token "^4.0.0"
-    registry-url "^5.0.0"
-    semver "^6.2.0"
-
-pako@~1.0.2:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
-  integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
+package-json-from-dist@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz#e501cd3094b278495eb4258d4c9f6d5ac3019f00"
+  integrity sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==
 
-parallel-webpack@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/parallel-webpack/-/parallel-webpack-2.3.0.tgz#a614625e25647cea9655918cb80cf829fa674ff8"
-  integrity sha512-RCIDF+YOqyAJeM8NumtOQ8JYjUXexDRIN4slFNfvUp1RxLB1zLeLZMAwlP6s7l9LhuR5xJ2pv8ckIsdESzSqog==
+parallel-webpack@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/parallel-webpack/-/parallel-webpack-2.6.0.tgz#8a8401adfdeb25ebe9d322cd310801e5ea0c18a9"
+  integrity sha512-aOOLfQ40yWWRt8214F0zNWp0DWbeCs7tJaEur0/XUlYU8Yht1sMTYt+eNrbY4VkM4O/SRSme7cdZJTtIantiOw==
   dependencies:
     ajv "^4.9.2"
     bluebird "^3.0.6"
@@ -7071,6 +6657,11 @@ parse-author@^2.0.0:
   dependencies:
     author-regex "^1.0.0"
 
+parse-dds@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/parse-dds/-/parse-dds-1.2.1.tgz#b16533e00c4db91178b3460271361df4cb328164"
+  integrity sha512-oE88N8mzUi9d26tAaKVc0clxi6AjeTSWpLwgtcEVjXTYY1MW58w8FctmM9gGgvFd6YGu1/eFFYVeDVnlMsKBtA==
+
 parse-json@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
@@ -7078,25 +6669,22 @@ parse-json@^2.2.0:
   dependencies:
     error-ex "^1.2.0"
 
-parse-json@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.1.0.tgz#f96088cdf24a8faa9aea9a009f2d9d942c999646"
-  integrity sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ==
+parse-json@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
+  integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     error-ex "^1.3.1"
     json-parse-even-better-errors "^2.3.0"
     lines-and-columns "^1.1.6"
 
-parse5@5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178"
-  integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==
-
-parseurl@~1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
-  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
+parse5@^7.0.0, parse5@^7.1.1:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32"
+  integrity sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==
+  dependencies:
+    entities "^4.4.0"
 
 pascal-case@^3.1.2:
   version "3.1.2"
@@ -7106,11 +6694,6 @@ pascal-case@^3.1.2:
     no-case "^3.0.4"
     tslib "^2.0.3"
 
-pascalcase@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
-  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
-
 path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
@@ -7126,25 +6709,28 @@ path-is-absolute@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-path-key@^2.0.0, path-key@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
-
 path-key@^3.0.0, path-key@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
-path-parse@^1.0.5, path-parse@^1.0.6:
+path-key@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-4.0.0.tgz#295588dc3aee64154f877adb9d780b81c554bf18"
+  integrity sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==
+
+path-parse@^1.0.5, path-parse@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
-path-to-regexp@0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
-  integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
+path-scurry@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-2.0.0.tgz#9f052289f23ad8bf9397a2a0425e7b8615c58580"
+  integrity sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==
+  dependencies:
+    lru-cache "^11.0.0"
+    minipass "^7.1.2"
 
 path-type@^2.0.0:
   version "2.0.0"
@@ -7168,17 +6754,17 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
-picocolors@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
-  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
+picocolors@^1.0.0, picocolors@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.1.tgz#a8ad579b571952f0e5d25892de5445bcfe25aaa1"
+  integrity sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==
 
-picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1:
+picomatch@^2.0.4, picomatch@^2.2.1:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
   integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
 
-picomatch@^2.2.3:
+picomatch@^2.2.3, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
@@ -7188,17 +6774,10 @@ pify@^2.0.0:
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
   integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
 
-pify@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
-
-pirates@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87"
-  integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==
-  dependencies:
-    node-modules-regexp "^1.0.0"
+pirates@^4.0.4:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9"
+  integrity sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==
 
 pkg-dir@^4.2.0:
   version "4.2.0"
@@ -7207,43 +6786,37 @@ pkg-dir@^4.2.0:
   dependencies:
     find-up "^4.0.0"
 
-plist@^3.0.0, plist@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.1.tgz#a9b931d17c304e8912ef0ba3bdd6182baf2e1f8c"
-  integrity sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ==
+plist@^3.0.0, plist@^3.0.4, plist@^3.0.5:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.6.tgz#7cfb68a856a7834bca6dbfe3218eb9c7740145d3"
+  integrity sha512-WiIVYyrp8TD4w8yCvyeIr+lkmrGRd5u0VbRnU+tP/aRLxP/YadJUYOMZJ/6hIa3oUyVCsycXvtNRgd5XBJIbiA==
   dependencies:
-    base64-js "^1.2.3"
-    xmlbuilder "^9.0.7"
-    xmldom "0.1.x"
+    base64-js "^1.5.1"
+    xmlbuilder "^15.1.1"
 
 pluralize@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45"
   integrity sha1-0aIUg/0iu0HlihL6NCGCMUCJfEU=
 
-posix-character-classes@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
-  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
-
-postcss-modules-extract-imports@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d"
-  integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==
+postcss-modules-extract-imports@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz#b4497cb85a9c0c4b5aabeb759bb25e8d89f15002"
+  integrity sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==
 
-postcss-modules-local-by-default@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c"
-  integrity sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==
+postcss-modules-local-by-default@^4.0.5:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.5.tgz#f1b9bd757a8edf4d8556e8d0f4f894260e3df78f"
+  integrity sha512-6MieY7sIfTK0hYfafw1OMEG+2bg8Q1ocHCpoWLqOKj3JXlKu4G7btkmM/B7lFubYkYWmRSPLZi5chid63ZaZYw==
   dependencies:
     icss-utils "^5.0.0"
     postcss-selector-parser "^6.0.2"
     postcss-value-parser "^4.1.0"
 
-postcss-modules-scope@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06"
-  integrity sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==
+postcss-modules-scope@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.2.0.tgz#a43d28289a169ce2c15c00c4e64c0858e43457d5"
+  integrity sha512-oq+g1ssrsZOsx9M96c5w8laRmvEu9C3adDSjI8oTcbfkrTE8hx/zfyobUoWIxaKPO8bt6S62kxpw5GqypEw1QQ==
   dependencies:
     postcss-selector-parser "^6.0.4"
 
@@ -7267,30 +6840,20 @@ postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-postcss@^8.4.7:
-  version "8.4.14"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.14.tgz#ee9274d5622b4858c1007a74d76e42e56fd21caf"
-  integrity sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==
+postcss@^8.4.33:
+  version "8.4.41"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.41.tgz#d6104d3ba272d882fe18fc07d15dc2da62fa2681"
+  integrity sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==
   dependencies:
-    nanoid "^3.3.4"
-    picocolors "^1.0.0"
-    source-map-js "^1.0.2"
+    nanoid "^3.3.7"
+    picocolors "^1.0.1"
+    source-map-js "^1.2.0"
 
 prelude-ls@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
-prelude-ls@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
-  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
-
-prepend-http@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
-  integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
-
 prettier-linter-helpers@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b"
@@ -7303,6 +6866,11 @@ prettier@^2.6.0:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.6.0.tgz#12f8f504c4d8ddb76475f441337542fa799207d4"
   integrity sha512-m2FgJibYrBGGgQXNzfd0PuDGShJgRavjUoRCw1mZERIWVSXF0iLzLm+aOqTAbLnC3n6JzUhAA8uZnFVghHJ86A==
 
+prettier@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.0.3.tgz#432a51f7ba422d1469096c0fdc28e235db8f9643"
+  integrity sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==
+
 pretty-error@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-4.0.0.tgz#90a703f46dd7234adb46d0f84823e9d1cb8f10d6"
@@ -7311,58 +6879,14 @@ pretty-error@^4.0.0:
     lodash "^4.17.20"
     renderkid "^3.0.0"
 
-pretty-format@^22.4.3:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-22.4.3.tgz#f873d780839a9c02e9664c8a082e9ee79eaac16f"
-  integrity sha512-S4oT9/sT6MN7/3COoOy+ZJeA92VmOnveLHgrwBE3Z1W5N9S2A1QGNYiE1z75DAENbJrXXUb+OWXhpJcg05QKQQ==
-  dependencies:
-    ansi-regex "^3.0.0"
-    ansi-styles "^3.2.0"
-
-pretty-format@^24.8.0:
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.8.0.tgz#8dae7044f58db7cb8be245383b565a963e3c27f2"
-  integrity sha512-P952T7dkrDEplsR+TuY7q3VXDae5Sr7zmQb12JU/NDQa/3CH7/QW0yvqLcGN6jL+zQFKaoJcPc+yJxMTGmosqw==
+pretty-format@^29.0.0, pretty-format@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.7.0.tgz#ca42c758310f365bfa71a0bda0a807160b776812"
+  integrity sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==
   dependencies:
-    "@jest/types" "^24.8.0"
-    ansi-regex "^4.0.0"
-    ansi-styles "^3.2.0"
-    react-is "^16.8.4"
-
-pretty-format@^25.5.0:
-  version "25.5.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.5.0.tgz#7873c1d774f682c34b8d48b6743a2bf2ac55791a"
-  integrity sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==
-  dependencies:
-    "@jest/types" "^25.5.0"
-    ansi-regex "^5.0.0"
-    ansi-styles "^4.0.0"
-    react-is "^16.12.0"
-
-pretty-format@^26.0.0, pretty-format@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93"
-  integrity sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==
-  dependencies:
-    "@jest/types" "^26.6.2"
-    ansi-regex "^5.0.0"
-    ansi-styles "^4.0.0"
-    react-is "^17.0.1"
-
-process-nextick-args@~1.0.6:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
-  integrity sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=
-
-process-nextick-args@~2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
-  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
-
-progress@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz#8a1be366bf8fc23db2bd23f10c6fe920b4389d1f"
-  integrity sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=
+    "@jest/schemas" "^29.6.3"
+    ansi-styles "^5.0.0"
+    react-is "^18.0.0"
 
 progress@^2.0.3:
   version "2.0.3"
@@ -7386,42 +6910,24 @@ prompts@^2.0.1:
     kleur "^3.0.3"
     sisteransi "^1.0.5"
 
-prop-types@^15.7.2:
-  version "15.7.2"
-  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
-  integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
+prop-types@^15.8.1:
+  version "15.8.1"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
+  integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
   dependencies:
     loose-envify "^1.4.0"
     object-assign "^4.1.1"
-    react-is "^16.8.1"
-
-proto-list@~1.2.1:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
-  integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=
-
-proxy-addr@~2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz#34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34"
-  integrity sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==
-  dependencies:
-    forwarded "~0.1.2"
-    ipaddr.js "1.9.0"
+    react-is "^16.13.1"
 
 prr@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"
   integrity sha1-GoS4WQgyVQFBGFPQCB7j+obikmo=
 
-pseudomap@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
-  integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
-
-psl@^1.1.28:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
-  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
+psl@^1.1.33:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7"
+  integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
 
 pump@^3.0.0:
   version "3.0.0"
@@ -7431,53 +6937,31 @@ pump@^3.0.0:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
-punycode@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
-
-punycode@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.0.tgz#5f863edc89b96db09074bad7947bf09056ca4e7d"
-  integrity sha1-X4Y+3Im5bbCQdLrXlHvwkFbKTn0=
-
-punycode@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
-  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
-
-pupa@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.0.1.tgz#dbdc9ff48ffbea4a26a069b6f9f7abb051008726"
-  integrity sha512-hEJH0s8PXLY/cdXh66tNEQGndDrIKNqNC5xmrysZy3i5C3oEoLna7YAOad+7u125+zH1HNXUmGEkrhb3c2VriA==
-  dependencies:
-    escape-goat "^2.0.0"
-
-qs@6.7.0:
-  version "6.7.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
-  integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
-
-qs@~6.5.1:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
-  integrity sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==
+punycode@^2.1.0, punycode@^2.1.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
+  integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
 
-qs@~6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
-  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
+pure-rand@^6.0.0:
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-6.0.4.tgz#50b737f6a925468679bff00ad20eade53f37d5c7"
+  integrity sha512-LA0Y9kxMYv47GIPJy6MI84fqTd2HmYZI83W/kM/SkKfDlajnZYfmXFTxkbY+xSBPkLJxltMa9hIkmdc29eguMA==
 
-querystring@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
-  integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
+querystringify@^2.1.1:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
+  integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
 
 queue-microtask@^1.2.2:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
   integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
 
+quick-lru@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"
+  integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==
+
 raf@^3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.0.tgz#a28876881b4bc2ca9117d4138163ddb80f781575"
@@ -7492,61 +6976,27 @@ randombytes@^2.1.0:
   dependencies:
     safe-buffer "^5.1.0"
 
-range-parser@^1.2.1, range-parser@~1.2.1:
+range-parser@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
   integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
 
-raw-body@2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
-  integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==
-  dependencies:
-    bytes "3.1.0"
-    http-errors "1.7.2"
-    iconv-lite "0.4.24"
-    unpipe "1.0.0"
-
-rc@^1.2.8:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
-  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
+rcedit@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/rcedit/-/rcedit-3.0.1.tgz#ae21b43e49c075f4d84df1929832a12c302f3c90"
+  integrity sha512-XM0Jv40/y4hVAqj/MO70o/IWs4uOsaSoo2mLyk3klFDW+SStLnCtzuQu+1OBTIMGlM8CvaK9ftlYCp6DJ+cMsw==
   dependencies:
-    deep-extend "^0.6.0"
-    ini "~1.3.0"
-    minimist "^1.2.0"
-    strip-json-comments "~2.0.1"
+    cross-spawn-windows-exe "^1.1.0"
 
-rcedit@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/rcedit/-/rcedit-2.1.0.tgz#37ae6ad1fc8d7734b2e445ec3d378ace89d4076d"
-  integrity sha512-Nrd/65LzMjFmKpS9d2fqIxVYdW0M8ovsN0PgZhCrPMQss2yznkp6/zjEQ1a9DzzoGv2uuN3yDJAeHybOD5ZNKA==
-
-react-is@^16.12.0:
+react-is@^16.13.1:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
-react-is@^16.8.1, react-is@^16.8.4:
-  version "16.8.6"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16"
-  integrity sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==
-
-react-is@^17.0.1:
-  version "17.0.1"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339"
-  integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA==
-
-read-config-file@6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.0.0.tgz#224b5dca6a5bdc1fb19e63f89f342680efdb9299"
-  integrity sha512-PHjROSdpceKUmqS06wqwP92VrM46PZSTubmNIMJ5DrMwg1OgenSTSEHIkCa6TiOJ+y/J0xnG1fFwG3M+Oi1aNA==
-  dependencies:
-    dotenv "^8.2.0"
-    dotenv-expand "^5.1.0"
-    js-yaml "^3.13.1"
-    json5 "^2.1.2"
-    lazy-val "^1.0.4"
+react-is@^18.0.0:
+  version "18.2.0"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
+  integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==
 
 read-installed@4.0.3:
   version "4.0.3"
@@ -7582,15 +7032,6 @@ read-pkg-up@^2.0.0:
     find-up "^2.0.0"
     read-pkg "^2.0.0"
 
-read-pkg-up@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507"
-  integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==
-  dependencies:
-    find-up "^4.1.0"
-    read-pkg "^5.2.0"
-    type-fest "^0.8.1"
-
 read-pkg@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
@@ -7600,50 +7041,6 @@ read-pkg@^2.0.0:
     normalize-package-data "^2.3.2"
     path-type "^2.0.0"
 
-read-pkg@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
-  integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==
-  dependencies:
-    "@types/normalize-package-data" "^2.4.0"
-    normalize-package-data "^2.5.0"
-    parse-json "^5.0.0"
-    type-fest "^0.6.0"
-
-readable-stream@^2.2.2, readable-stream@~2.3.6:
-  version "2.3.7"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
-  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
-
-readable-stream@^3.0.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
-  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
-readable-stream@~2.0.0:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
-  integrity sha1-j5A0HmilPMySh4jaz80Rs265t44=
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "~1.0.0"
-    process-nextick-args "~1.0.6"
-    string_decoder "~0.10.x"
-    util-deprecate "~1.0.1"
-
 readdir-scoped-modules@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747"
@@ -7661,30 +7058,22 @@ readdirp@~3.5.0:
   dependencies:
     picomatch "^2.2.1"
 
-realistic-structured-clone@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/realistic-structured-clone/-/realistic-structured-clone-2.0.2.tgz#2f8ec225b1f9af20efc79ac96a09043704414959"
-  integrity sha512-5IEvyfuMJ4tjQOuKKTFNvd+H9GSbE87IcendSBannE28PTrbolgaVg5DdEApRKhtze794iXqVUFKV60GLCNKEg==
-  dependencies:
-    core-js "^2.5.3"
-    domexception "^1.0.1"
-    typeson "^5.8.2"
-    typeson-registry "^1.0.0-alpha.20"
-
-regex-not@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.0.tgz#42f83e39771622df826b02af176525d6a5f157f9"
-  integrity sha1-Qvg+OXcWIt+CawKvF2Ul1qXxV/k=
+reflect.getprototypeof@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.4.tgz#aaccbf41aca3821b87bb71d9dcbc7ad0ba50a3f3"
+  integrity sha512-ECkTw8TmJwW60lOTR+ZkODISW6RQ8+2CL3COqtiJKLd6MmB45hN51HprHFziKLGkAuTGQhBb91V8cy+KHlaCjw==
   dependencies:
-    extend-shallow "^2.0.1"
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    get-intrinsic "^1.2.1"
+    globalthis "^1.0.3"
+    which-builtin-type "^1.1.3"
 
-regex-not@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
-  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
-  dependencies:
-    extend-shallow "^3.0.2"
-    safe-regex "^1.1.0"
+regenerator-runtime@^0.14.0:
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz#5e19d68eb12d486f797e15a3c6a918f7cec5eb45"
+  integrity sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==
 
 regexp.prototype.flags@^1.2.0:
   version "1.2.0"
@@ -7693,52 +7082,28 @@ regexp.prototype.flags@^1.2.0:
   dependencies:
     define-properties "^1.1.2"
 
-regexp.prototype.flags@^1.3.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.1.tgz#b3f4c0059af9e47eca9f3f660e51d81307e72307"
-  integrity sha512-pMR7hBVUUGI7PMA37m2ofIdQCsomVnas+Jn5UPGAHQ+/LlwKm/aTLJHdasmHRzlfeZwHiAOaRSo2rbBDm3nNUQ==
+regexp.prototype.flags@^1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac"
+  integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==
   dependencies:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
+    functions-have-names "^1.2.2"
 
-regexpp@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"
-  integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==
-
-regexpp@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
-  integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
-
-regextras@^0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/regextras/-/regextras-0.8.0.tgz#ec0f99853d4912839321172f608b544814b02217"
-  integrity sha512-k519uI04Z3SaY0fLX843MRXnDeG2+vHOFsyhiPZvNLe7r8rD2YNRjq4BQLZZ0oAr2NrtvZlICsXysGNFPGa3CQ==
-
-registry-auth-token@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.1.1.tgz#40a33be1e82539460f94328b0f7f0f84c16d9479"
-  integrity sha512-9bKS7nTl9+/A1s7tnPeGrUpRcVY+LUh7bfFgzpndALdPfXQBfQV77rQVtqgUV3ti4vc/Ik81Ex8UJDWDQ12zQA==
-  dependencies:
-    rc "^1.2.8"
-
-registry-url@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009"
-  integrity sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==
+regexp.prototype.flags@^1.5.0, regexp.prototype.flags@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz#90ce989138db209f81492edd734183ce99f9677e"
+  integrity sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==
   dependencies:
-    rc "^1.2.8"
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    set-function-name "^2.0.0"
 
 relateurl@^0.2.7:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
-  integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=
-
-remove-trailing-separator@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
-  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
+  integrity sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==
 
 renderkid@^3.0.0:
   version "3.0.0"
@@ -7751,86 +7116,6 @@ renderkid@^3.0.0:
     lodash "^4.17.21"
     strip-ansi "^6.0.1"
 
-repeat-element@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
-  integrity sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=
-
-repeat-string@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
-
-request-promise-core@1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f"
-  integrity sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==
-  dependencies:
-    lodash "^4.17.19"
-
-request-promise-native@^1.0.8:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz#e407120526a5efdc9a39b28a5679bf47b9d9dc28"
-  integrity sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==
-  dependencies:
-    request-promise-core "1.1.4"
-    stealthy-require "^1.1.1"
-    tough-cookie "^2.3.3"
-
-request@^2.72.0:
-  version "2.83.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
-  integrity sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.6.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.1"
-    forever-agent "~0.6.1"
-    form-data "~2.3.1"
-    har-validator "~5.0.3"
-    hawk "~6.0.2"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.17"
-    oauth-sign "~0.8.2"
-    performance-now "^2.1.0"
-    qs "~6.5.1"
-    safe-buffer "^5.1.1"
-    stringstream "~0.0.5"
-    tough-cookie "~2.3.3"
-    tunnel-agent "^0.6.0"
-    uuid "^3.1.0"
-
-request@^2.86.0, request@^2.88.2:
-  version "2.88.2"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
-  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.8.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.6"
-    extend "~3.0.2"
-    forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    har-validator "~5.1.3"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.19"
-    oauth-sign "~0.9.0"
-    performance-now "^2.1.0"
-    qs "~6.5.2"
-    safe-buffer "^5.1.2"
-    tough-cookie "~2.5.0"
-    tunnel-agent "^0.6.0"
-    uuid "^3.3.2"
-
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -7841,16 +7126,21 @@ require-from-string@^2.0.2:
   resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
   integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
 
-require-main-filename@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
-  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
+requires-port@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
+  integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
 
 reserved-words@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/reserved-words/-/reserved-words-0.1.2.tgz#00a0940f98cd501aeaaac316411d9adc52b31ab1"
   integrity sha1-AKCUD5jNUBrqqsMWQR2a3FKzGrE=
 
+resolve-alpn@^1.0.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9"
+  integrity sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==
+
 resolve-cwd@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
@@ -7868,52 +7158,42 @@ resolve-from@^5.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
   integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
 
-resolve-url@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
-  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
+resolve.exports@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.2.tgz#f8c934b8e6a13f539e38b7098e2e36134f01e800"
+  integrity sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==
 
-resolve@^1.1.6, resolve@^1.3.2:
+resolve@^1.1.6:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36"
   integrity sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==
   dependencies:
     path-parse "^1.0.5"
 
-resolve@^1.10.0:
-  version "1.15.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8"
-  integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==
+resolve@^1.20.0, resolve@^1.22.0:
+  version "1.22.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
+  integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
   dependencies:
-    path-parse "^1.0.6"
+    is-core-module "^2.9.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
 
-resolve@^1.18.1:
-  version "1.19.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
-  integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
+resolve@^2.0.0-next.4:
+  version "2.0.0-next.5"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.5.tgz#6b0ec3107e671e52b68cd068ef327173b90dc03c"
+  integrity sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==
   dependencies:
-    is-core-module "^2.1.0"
-    path-parse "^1.0.6"
+    is-core-module "^2.13.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
 
-resolve@^2.0.0-next.3:
-  version "2.0.0-next.3"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.3.tgz#d41016293d4a8586a39ca5d9b5f15cbea1f55e46"
-  integrity sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q==
-  dependencies:
-    is-core-module "^2.2.0"
-    path-parse "^1.0.6"
-
-responselike@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
-  integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=
+responselike@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz#9a0bc8fdc252f3fb1cca68b016591059ba1422bc"
+  integrity sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==
   dependencies:
-    lowercase-keys "^1.0.0"
-
-ret@~0.1.10:
-  version "0.1.15"
-  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
-  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
+    lowercase-keys "^2.0.0"
 
 reusify@^1.0.4:
   version "1.0.4"
@@ -7925,24 +7205,25 @@ ric-shim@^1.0.0:
   resolved "https://registry.yarnpkg.com/ric-shim/-/ric-shim-1.0.0.tgz#a20a8edfcbd05f304b58a1b52a846d53baccacf4"
   integrity sha1-ogqO38vQXzBLWKG1KoRtU7rMrPQ=
 
-rimraf@2.6.3, rimraf@~2.6.2:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
-  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
+rimraf@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
   dependencies:
     glob "^7.1.3"
 
-rimraf@^2.5.2:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
-  integrity sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==
+rimraf@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-6.0.1.tgz#ffb8ad8844dd60332ab15f52bc104bc3ed71ea4e"
+  integrity sha512-9dkvaxAsk/xNXSJzMgFqqMCuFgt2+KsOFek3TMLfo8NCPfWpBmqwyNn5Y+NX56QUYfCtsyhF3ayiboEoUmJk/A==
   dependencies:
-    glob "^7.0.5"
+    glob "^11.0.0"
+    package-json-from-dist "^1.0.0"
 
-rimraf@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+rimraf@~2.6.2:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
+  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
   dependencies:
     glob "^7.1.3"
 
@@ -7958,10 +7239,22 @@ roarr@^2.15.3:
     semver-compare "^1.0.0"
     sprintf-js "^1.1.2"
 
-rsvp@^4.8.4:
-  version "4.8.5"
-  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
-  integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==
+run-applescript@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/run-applescript/-/run-applescript-5.0.0.tgz#e11e1c932e055d5c6b40d98374e0268d9b11899c"
+  integrity sha512-XcT5rBksx1QdIhlFOCtgZkB99ZEouFZ1E2Kc2LHqNW13U3/74YGdkQRmThTwxy4QIyookibDKYZOPqX//6BlAg==
+  dependencies:
+    execa "^5.0.0"
+
+run-con@~1.2.11:
+  version "1.2.11"
+  resolved "https://registry.yarnpkg.com/run-con/-/run-con-1.2.11.tgz#0014ed430bad034a60568dfe7de2235f32e3f3c4"
+  integrity sha512-NEMGsUT+cglWkzEr4IFK21P4Jca45HqiAbIIZIBdX5+UZTB24Mb/21iNGgz9xZa8tL6vbW7CXmq7MFN42+VjNQ==
+  dependencies:
+    deep-extend "^0.6.0"
+    ini "~3.0.0"
+    minimist "^1.2.6"
+    strip-json-comments "~3.1.1"
 
 run-parallel@^1.1.9:
   version "1.2.0"
@@ -7970,65 +7263,41 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
-safe-buffer@5.1.2, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-
-safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
-  integrity sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==
+safe-array-concat@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.0.1.tgz#91686a63ce3adbea14d61b14c99572a8ff84754c"
+  integrity sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.2.1"
+    has-symbols "^1.0.3"
+    isarray "^2.0.5"
 
-safe-buffer@~5.2.0:
+safe-buffer@^5.1.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
-safe-regex@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
-  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
+safe-regex-test@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295"
+  integrity sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==
   dependencies:
-    ret "~0.1.10"
+    call-bind "^1.0.2"
+    get-intrinsic "^1.1.3"
+    is-regex "^1.1.4"
 
-"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
+"safer-buffer@>= 2.1.2 < 3.0.0":
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sane@^4.0.3:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/sane/-/sane-4.1.0.tgz#ed881fd922733a6c461bc189dc2b6c006f3ffded"
-  integrity sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==
-  dependencies:
-    "@cnakazawa/watch" "^1.0.3"
-    anymatch "^2.0.0"
-    capture-exit "^2.0.0"
-    exec-sh "^0.3.2"
-    execa "^1.0.0"
-    fb-watchman "^2.0.0"
-    micromatch "^3.1.4"
-    minimist "^1.1.1"
-    walker "~1.0.5"
-
-sanitize-filename@^1.6.2, sanitize-filename@^1.6.3:
-  version "1.6.3"
-  resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz#755ebd752045931977e30b2025d340d7c9090378"
-  integrity sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==
-  dependencies:
-    truncate-utf8-bytes "^1.0.0"
-
-sass-loader@^10.0.3:
-  version "10.0.3"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.0.3.tgz#9e2f1bfdd6355f2adde4e4835d838b020bf800b0"
-  integrity sha512-W4+FV5oUdYy0PnC11ZoPrcAexODgDCa3ngxoy5X5qBhZYoPz9FPjb6Oox8Aa0ZYEyx34k8AQfOVuvqefOSAAUQ==
+sass-loader@^16.0.0:
+  version "16.0.0"
+  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-16.0.0.tgz#9b8d497e24bc176dc368df2b5b9e90b4ad24bf4e"
+  integrity sha512-n13Z+3rU9A177dk4888czcVFiC8CL9dii4qpXWUg3YIIgZEvi9TCFKjOQcbK0kJM7DJu9VucrZFddvNfYCPwtw==
   dependencies:
-    klona "^2.0.4"
-    loader-utils "^2.0.0"
     neo-async "^2.6.2"
-    schema-utils "^3.0.0"
-    semver "^7.3.2"
 
 sass@^1.27.0:
   version "1.27.0"
@@ -8037,36 +7306,17 @@ sass@^1.27.0:
   dependencies:
     chokidar ">=2.0.0 <4.0.0"
 
-sax@0.5.x:
-  version "0.5.8"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
-  integrity sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=
-
-sax@>=0.6.0, sax@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
-  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
-
-saxes@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d"
-  integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==
+saxes@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/saxes/-/saxes-6.0.0.tgz#fe5b4a4768df4f14a201b1ba6a65c1f3d9988cc5"
+  integrity sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==
   dependencies:
     xmlchars "^2.2.0"
 
-schema-utils@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz#67502f6aa2b66a2d4032b4279a2944978a0913ef"
-  integrity sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==
-  dependencies:
-    "@types/json-schema" "^7.0.6"
-    ajv "^6.12.5"
-    ajv-keywords "^3.5.2"
-
-schema-utils@^3.1.0, schema-utils@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"
-  integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==
+schema-utils@^3.1.1, schema-utils@^3.2.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe"
+  integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==
   dependencies:
     "@types/json-schema" "^7.0.8"
     ajv "^6.12.5"
@@ -8087,55 +7337,39 @@ semver-compare@^1.0.0:
   resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
   integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w=
 
-semver-diff@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b"
-  integrity sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==
-  dependencies:
-    semver "^6.3.0"
-
-"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
-
-semver@7.x, semver@^7.1.3, semver@^7.2.1, semver@^7.3.2:
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
-  integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
-  dependencies:
-    lru-cache "^6.0.0"
+"semver@2 || 3 || 4 || 5":
+  version "5.7.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
+  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
 semver@^6.0.0, semver@^6.2.0, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.3.4, semver@^7.3.5:
-  version "7.3.5"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
-  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
+semver@^6.3.1:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
+
+semver@^7.1.3, semver@^7.3.2, semver@^7.3.4:
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.0.tgz#ed8c5dc8efb6c629c88b23d41dc9bf40c1d96cd0"
+  integrity sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==
   dependencies:
     lru-cache "^6.0.0"
 
-send@0.17.1:
-  version "0.17.1"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
-  integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==
-  dependencies:
-    debug "2.6.9"
-    depd "~1.1.2"
-    destroy "~1.0.4"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    fresh "0.5.2"
-    http-errors "~1.7.2"
-    mime "1.6.0"
-    ms "2.1.1"
-    on-finished "~2.3.0"
-    range-parser "~1.2.1"
-    statuses "~1.5.0"
+semver@^7.3.7, semver@^7.5.3, semver@^7.5.4:
+  version "7.5.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
+  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
+  dependencies:
+    lru-cache "^6.0.0"
+
+semver@^7.5.0, semver@^7.6.3:
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
+  integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
 
 serialize-error@^7.0.1:
   version "7.0.1"
@@ -8144,69 +7378,31 @@ serialize-error@^7.0.1:
   dependencies:
     type-fest "^0.13.1"
 
-serialize-javascript@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8"
-  integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==
+serialize-javascript@^6.0.1:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.2.tgz#defa1e055c83bf6d59ea805d8da862254eb6a6c2"
+  integrity sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==
   dependencies:
     randombytes "^2.1.0"
 
-serve-static@1.14.1:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
-  integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==
-  dependencies:
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    parseurl "~1.3.3"
-    send "0.17.1"
-
-set-blocking@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
-
-set-getter@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/set-getter/-/set-getter-0.1.1.tgz#a3110e1b461d31a9cfc8c5c9ee2e9737ad447102"
-  integrity sha512-9sVWOy+gthr+0G9DzqqLaYNA7+5OKkSmcqjL9cBpDEaZrr3ShQlyX2cZ/O/ozE41oxn/Tt0LGEM/w4Rub3A3gw==
-  dependencies:
-    to-object-path "^0.3.0"
-
-set-immediate-shim@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
-  integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=
-
-set-value@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
-  integrity sha1-fbCPnT0i3H945Trzw79GZuzfzPE=
+set-function-length@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.1.1.tgz#4bc39fafb0307224a33e106a7d35ca1218d659ed"
+  integrity sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==
   dependencies:
-    extend-shallow "^2.0.1"
-    is-extendable "^0.1.1"
-    is-plain-object "^2.0.1"
-    to-object-path "^0.3.0"
+    define-data-property "^1.1.1"
+    get-intrinsic "^1.2.1"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.0"
 
-set-value@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
-  integrity sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==
+set-function-name@^2.0.0, set-function-name@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.1.tgz#12ce38b7954310b9f61faa12701620a0c882793a"
+  integrity sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==
   dependencies:
-    extend-shallow "^2.0.1"
-    is-extendable "^0.1.1"
-    is-plain-object "^2.0.3"
-    split-string "^3.0.1"
-
-setimmediate@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
-  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
-
-setprototypeof@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
-  integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
+    define-data-property "^1.0.1"
+    functions-have-names "^1.2.3"
+    has-property-descriptors "^1.0.0"
 
 shallow-clone@^3.0.0:
   version "3.0.1"
@@ -8215,13 +7411,6 @@ shallow-clone@^3.0.0:
   dependencies:
     kind-of "^6.0.2"
 
-shebang-command@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
-  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
-  dependencies:
-    shebang-regex "^1.0.0"
-
 shebang-command@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
@@ -8229,21 +7418,11 @@ shebang-command@^2.0.0:
   dependencies:
     shebang-regex "^3.0.0"
 
-shebang-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
-
 shebang-regex@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-shellwords@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
-  integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
-
 side-channel@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
@@ -8253,19 +7432,24 @@ side-channel@^1.0.4:
     get-intrinsic "^1.0.2"
     object-inspect "^1.9.0"
 
-signal-exit@^3.0.0, signal-exit@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
-  integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
+signal-exit@^3.0.3, signal-exit@^3.0.7:
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
+  integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
 
-sirv@^1.0.7:
-  version "1.0.19"
-  resolved "https://registry.yarnpkg.com/sirv/-/sirv-1.0.19.tgz#1d73979b38c7fe91fcba49c85280daa9c2363b49"
-  integrity sha512-JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ==
+signal-exit@^4.0.1:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
+  integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
+
+sirv@^2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/sirv/-/sirv-2.0.4.tgz#5dd9a725c578e34e449f332703eb2a74e46a29b0"
+  integrity sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==
   dependencies:
-    "@polka/url" "^1.0.0-next.20"
-    mrmime "^1.0.0"
-    totalist "^1.0.0"
+    "@polka/url" "^1.0.0-next.24"
+    mrmime "^2.0.0"
+    totalist "^3.0.0"
 
 sisteransi@^1.0.5:
   version "1.0.5"
@@ -8277,25 +7461,11 @@ slash@^1.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
   integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
 
-slash@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
-  integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
-
 slash@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
-slice-ansi@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
-  integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==
-  dependencies:
-    ansi-styles "^3.2.0"
-    astral-regex "^1.0.0"
-    is-fullwidth-code-point "^2.0.0"
-
 slide@~1.1.3:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
@@ -8306,76 +7476,20 @@ smoothscroll-polyfill@^0.3.6:
   resolved "https://registry.yarnpkg.com/smoothscroll-polyfill/-/smoothscroll-polyfill-0.3.6.tgz#492be845195157cdc2fc529a95d89e7a71509172"
   integrity sha1-SSvoRRlRV83C/FKaldieenFQkXI=
 
-snapdragon-node@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
-  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
-  dependencies:
-    define-property "^1.0.0"
-    isobject "^3.0.0"
-    snapdragon-util "^3.0.1"
-
-snapdragon-util@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
-  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
-  dependencies:
-    kind-of "^3.2.0"
-
-snapdragon@^0.8.1:
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.1.tgz#e12b5487faded3e3dea0ac91e9400bf75b401370"
-  integrity sha1-4StUh/re0+PeoKyR6UAL91tAE3A=
-  dependencies:
-    base "^0.11.1"
-    debug "^2.2.0"
-    define-property "^0.2.5"
-    extend-shallow "^2.0.1"
-    map-cache "^0.2.2"
-    source-map "^0.5.6"
-    source-map-resolve "^0.5.0"
-    use "^2.0.0"
-
-sntp@2.x.x:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8"
-  integrity sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==
-  dependencies:
-    hoek "4.x.x"
-
-source-map-js@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
-  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
-
-source-map-resolve@^0.5.0:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.1.tgz#7ad0f593f2281598e854df80f19aae4b92d7a11a"
-  integrity sha512-0KW2wvzfxm8NCTb30z0LMNyPqWCdDGE2viwzUaucqJdkTRXtZiSY3I+2A6nVAjmdOy0I4gU8DwnVVGsk9jvP2A==
-  dependencies:
-    atob "^2.0.0"
-    decode-uri-component "^0.2.0"
-    resolve-url "^0.2.1"
-    source-map-url "^0.4.0"
-    urix "^0.1.0"
-
-source-map-support@^0.5.19:
-  version "0.5.19"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
-  integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
+source-map-js@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af"
+  integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==
 
-source-map-support@^0.5.6:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.6.tgz#4435cee46b1aab62b8e8610ce60f788091c51c13"
-  integrity sha512-N4KXEz7jcKqPf2b2vZF11lQIz9W5ZMuUcIOGj243lduidkf2fjkVKJS9vNxVWn3u/uxX38AcE8U9nnH9FPcq+g==
+source-map-support@0.5.13:
+  version "0.5.13"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932"
+  integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
-source-map-support@~0.5.20:
+source-map-support@^0.5.6, source-map-support@~0.5.20:
   version "0.5.21"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
   integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
@@ -8383,26 +7497,11 @@ source-map-support@~0.5.20:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
-source-map-url@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
-  integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
-
-source-map@^0.5.0, source-map@^0.5.6:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
-
 source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-source-map@^0.7.3, source-map@~0.7.2:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
-  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
-
 spdx-correct@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
@@ -8438,20 +7537,6 @@ spdx-license-ids@^3.0.0:
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654"
   integrity sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==
 
-split-string@^3.0.1, split-string@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.0.2.tgz#6129bc92731716e5aa1fb73c333078f0b7c114c8"
-  integrity sha512-d6myUSfwmBz1izkY4r7r7I0PL41rh21qUDYK1OgclmGHeoqQoujduGxMbzw6BlF3HKmJR4sMpbWVo7/Xzg4YBQ==
-  dependencies:
-    extend-shallow "^2.0.1"
-
-split2@^3.2.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/split2/-/split2-3.2.2.tgz#bf2cf2a37d838312c249c89206fd7a17dd12365f"
-  integrity sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==
-  dependencies:
-    readable-stream "^3.0.0"
-
 sprintf-js@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
@@ -8462,56 +7547,13 @@ sprintf-js@~1.0.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
-sshpk@^1.7.0:
-  version "1.16.1"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
-  integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
-  dependencies:
-    asn1 "~0.2.3"
-    assert-plus "^1.0.0"
-    bcrypt-pbkdf "^1.0.0"
-    dashdash "^1.12.0"
-    ecc-jsbn "~0.1.1"
-    getpass "^0.1.1"
-    jsbn "~0.1.0"
-    safer-buffer "^2.0.2"
-    tweetnacl "~0.14.0"
-
-stack-utils@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.1.tgz#d4f33ab54e8e38778b0ca5cfd3b3afb12db68620"
-  integrity sha1-1PM6tU6OOHeLDKXP07OvsS22hiA=
-
-stack-utils@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.3.tgz#cd5f030126ff116b78ccb3c027fe302713b61277"
-  integrity sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==
+stack-utils@^2.0.3:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f"
+  integrity sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==
   dependencies:
     escape-string-regexp "^2.0.0"
 
-stat-mode@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz#68b55cb61ea639ff57136f36b216a291800d1465"
-  integrity sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg==
-
-static-extend@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
-  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
-  dependencies:
-    define-property "^0.2.5"
-    object-copy "^0.1.0"
-
-"statuses@>= 1.5.0 < 2", statuses@~1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
-  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
-
-stealthy-require@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
-  integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
-
 string-length@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.1.tgz#4a973bf31ef77c4edbceadd6af2611996985f8a1"
@@ -8520,16 +7562,16 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-string-width@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
-  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
+"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
   dependencies:
-    emoji-regex "^7.0.1"
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^5.1.0"
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
 
-string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0:
+string-width@^4.1.0, string-width@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
   integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==
@@ -8538,6 +7580,15 @@ string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.0"
 
+string-width@^5.0.1, string-width@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
+  integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==
+  dependencies:
+    eastasianwidth "^0.2.0"
+    emoji-regex "^9.2.2"
+    strip-ansi "^7.0.1"
+
 string.prototype.matchall@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-3.0.0.tgz#66f4d8dd5c6c6cea4dffb55ec5f3184a8dd0dd59"
@@ -8549,18 +7600,19 @@ string.prototype.matchall@^3.0.0:
     has-symbols "^1.0.0"
     regexp.prototype.flags "^1.2.0"
 
-string.prototype.matchall@^4.0.5:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.6.tgz#5abb5dabc94c7b0ea2380f65ba610b3a544b15fa"
-  integrity sha512-6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg==
+string.prototype.matchall@^4.0.8:
+  version "4.0.10"
+  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.10.tgz#a1553eb532221d4180c51581d6072cd65d1ee100"
+  integrity sha512-rGXbGmOEosIQi6Qva94HUjgPs9vKW+dkG7Y8Q5O2OYkWL6wFaTRZO8zM4mhP94uX55wgyrXzfS2aGtGzUL7EJQ==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
-    get-intrinsic "^1.1.1"
-    has-symbols "^1.0.2"
-    internal-slot "^1.0.3"
-    regexp.prototype.flags "^1.3.1"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    get-intrinsic "^1.2.1"
+    has-symbols "^1.0.3"
+    internal-slot "^1.0.5"
+    regexp.prototype.flags "^1.5.0"
+    set-function-name "^2.0.0"
     side-channel "^1.0.4"
 
 string.prototype.padend@^3.0.0:
@@ -8581,13 +7633,40 @@ string.prototype.padstart@^3.0.0:
     es-abstract "^1.4.3"
     function-bind "^1.0.2"
 
-string.prototype.trimend@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
-  integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==
+string.prototype.trim@^1.2.8:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz#f9ac6f8af4bd55ddfa8895e6aea92a96395393bd"
+  integrity sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+
+string.prototype.trimend@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
+  integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+
+string.prototype.trimend@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz#914a65baaab25fbdd4ee291ca7dde57e869cb8d0"
+  integrity sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.19.5"
+
+string.prototype.trimend@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz#1bb3afc5008661d73e2dc015cd4853732d6c471e"
+  integrity sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
 
 string.prototype.trimstart@^1.0.4:
   version "1.0.4"
@@ -8597,29 +7676,30 @@ string.prototype.trimstart@^1.0.4:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
 
-string_decoder@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
-  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
+string.prototype.trimstart@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz#5466d93ba58cfa2134839f81d7f42437e8c01fef"
+  integrity sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==
   dependencies:
-    safe-buffer "~5.2.0"
-
-string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.19.5"
 
-string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+string.prototype.trimstart@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz#d4cdb44b83a4737ffbac2d406e405d43d0184298"
+  integrity sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==
   dependencies:
-    safe-buffer "~5.1.0"
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
 
-stringstream@~0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
-  integrity sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
 
 strip-ansi@^3.0.0:
   version "3.0.1"
@@ -8628,26 +7708,12 @@ strip-ansi@^3.0.0:
   dependencies:
     ansi-regex "^2.0.0"
 
-strip-ansi@^5.1.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
-  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
-  dependencies:
-    ansi-regex "^4.1.0"
-
-strip-ansi@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
-  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
-  dependencies:
-    ansi-regex "^5.0.0"
-
-strip-ansi@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+strip-ansi@^7.0.1:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
+  integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==
   dependencies:
-    ansi-regex "^5.0.1"
+    ansi-regex "^6.0.1"
 
 strip-bom@^3.0.0:
   version "3.0.0"
@@ -8659,26 +7725,21 @@ strip-bom@^4.0.0:
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
   integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==
 
-strip-eof@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
-  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
-
 strip-final-newline@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
   integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
 
-strip-json-comments@^3.1.0:
+strip-final-newline@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-3.0.0.tgz#52894c313fbff318835280aed60ff71ebf12b8fd"
+  integrity sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==
+
+strip-json-comments@^3.1.1, strip-json-comments@~3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
-strip-json-comments@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
-
 strip-outer@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/strip-outer/-/strip-outer-1.0.1.tgz#b2fd2abf6604b9d1e6013057195df836b8a9d631"
@@ -8686,12 +7747,17 @@ strip-outer@^1.0.1:
   dependencies:
     escape-string-regexp "^1.0.2"
 
+strnum@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/strnum/-/strnum-1.0.5.tgz#5c4e829fe15ad4ff0d20c3db5ac97b73c9b072db"
+  integrity sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==
+
 style-loader@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.3.1.tgz#057dfa6b3d4d7c7064462830f9113ed417d38575"
   integrity sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==
 
-sumchecker@^3.0.0, sumchecker@^3.0.1:
+sumchecker@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.1.tgz#6377e996795abb0b6d348e9b3e1dfb24345a8e42"
   integrity sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==
@@ -8717,7 +7783,7 @@ supports-color@^5.3.0:
   dependencies:
     has-flag "^3.0.0"
 
-supports-color@^7.0.0, supports-color@^7.1.0:
+supports-color@^7.1.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
   integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
@@ -8731,13 +7797,15 @@ supports-color@^8.0.0:
   dependencies:
     has-flag "^4.0.0"
 
-supports-hyperlinks@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz#f663df252af5f37c5d49bbd7eeefa9e0b9e59e47"
-  integrity sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA==
-  dependencies:
-    has-flag "^4.0.0"
-    supports-color "^7.0.0"
+supports-preserve-symlinks-flag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
+  integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
+
+svg-element-attributes@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/svg-element-attributes/-/svg-element-attributes-1.3.1.tgz#0c55afac6284291ab563d0913c062cf78a8c0ddb"
+  integrity sha512-Bh05dSOnJBf3miNMqpsormfNtfidA/GxQVakhtn0T4DECWKeXQRQUceYjJ+OxYiiLdGe4Jo9iFV8wICFapFeIA==
 
 symbol-tree@^3.2.4:
   version "3.2.4"
@@ -8751,29 +7819,19 @@ symbol.prototype.description@^1.0.0:
   dependencies:
     has-symbols "^1.0.0"
 
-table@^5.2.3:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/table/-/table-5.4.0.tgz#d772a3216e68829920a41a32c18eda286c95d780"
-  integrity sha512-nHFDrxmbrkU7JAFKqKbDJXfzrX2UBsWmrieXFTGxiI5e4ncg3VqsZeI4EzNmX0ncp4XNGVeoxIWJXfCIXwrsvw==
+synckit@^0.8.5:
+  version "0.8.5"
+  resolved "https://registry.yarnpkg.com/synckit/-/synckit-0.8.5.tgz#b7f4358f9bb559437f9f167eb6bc46b3c9818fa3"
+  integrity sha512-L1dapNV6vu2s/4Sputv8xGsCdAVlb5nRDMFU/E27D44l5U6cw1g0dGd45uLc+OXjNMmF4ntiMdCimzcjFKQI8Q==
   dependencies:
-    ajv "^6.9.1"
-    lodash "^4.17.11"
-    slice-ansi "^2.1.0"
-    string-width "^3.0.0"
+    "@pkgr/utils" "^2.3.1"
+    tslib "^2.5.0"
 
-tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0:
+tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0, tapable@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
   integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
 
-temp-file@^3.3.7:
-  version "3.3.7"
-  resolved "https://registry.yarnpkg.com/temp-file/-/temp-file-3.3.7.tgz#686885d635f872748e384e871855958470aeb18a"
-  integrity sha512-9tBJKt7GZAQt/Rg0QzVWA8Am8c1EFl+CAv04/aBVqlx5oyfQ508sFIABshQ0xbZu6mBrFLWIUXO/bbLYghW70g==
-  dependencies:
-    async-exit-hook "^2.0.1"
-    fs-extra "^8.1.0"
-
 temp@^0.9.0:
   version "0.9.1"
   resolved "https://registry.yarnpkg.com/temp/-/temp-0.9.1.tgz#2d666114fafa26966cd4065996d7ceedd4dd4697"
@@ -8781,37 +7839,25 @@ temp@^0.9.0:
   dependencies:
     rimraf "~2.6.2"
 
-term-size@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.2.0.tgz#1f16adedfe9bdc18800e1776821734086fcc6753"
-  integrity sha512-a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw==
-
-terminal-link@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994"
-  integrity sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==
-  dependencies:
-    ansi-escapes "^4.2.1"
-    supports-hyperlinks "^2.0.0"
-
-terser-webpack-plugin@^5.1.3:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz#0320dcc270ad5372c1e8993fabbd927929773e54"
-  integrity sha512-GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g==
+terser-webpack-plugin@^5.3.10:
+  version "5.3.10"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz#904f4c9193c6fd2a03f693a2150c62a92f40d199"
+  integrity sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==
   dependencies:
+    "@jridgewell/trace-mapping" "^0.3.20"
     jest-worker "^27.4.5"
     schema-utils "^3.1.1"
-    serialize-javascript "^6.0.0"
-    source-map "^0.6.1"
-    terser "^5.7.2"
+    serialize-javascript "^6.0.1"
+    terser "^5.26.0"
 
-terser@^5.10.0, terser@^5.7.2:
-  version "5.10.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.10.0.tgz#b86390809c0389105eb0a0b62397563096ddafcc"
-  integrity sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==
+terser@^5.10.0, terser@^5.26.0:
+  version "5.31.6"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.31.6.tgz#c63858a0f0703988d0266a82fcbf2d7ba76422b1"
+  integrity sha512-PQ4DAriWzKj+qgehQ7LK5bQqCFNMmlhjR2PFFLuqGCpuCAauxemVBWwWOxo3UIwWQx8+Pr61Df++r76wDmkQBg==
   dependencies:
+    "@jridgewell/source-map" "^0.3.3"
+    acorn "^8.8.2"
     commander "^2.20.0"
-    source-map "~0.7.2"
     source-map-support "~0.5.20"
 
 test-exclude@^6.0.0:
@@ -8828,10 +7874,10 @@ text-table@^0.2.0:
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
 
-throat@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b"
-  integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==
+titleize@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/titleize/-/titleize-3.0.0.tgz#71c12eb7fdd2558aa8a44b0be83b8a76694acd53"
+  integrity sha512-KxVu8EYHDPBdUYdKZdKtU2aj2XfEx9AfjXxE/Aj0vT06w2icA09Vus1rh6eSu1y01akYg6BjIK/hxyLJINoMLQ==
 
 tmp-promise@^1.0.5:
   version "1.0.5"
@@ -8848,7 +7894,7 @@ tmp@0.0.33:
   dependencies:
     os-tmpdir "~1.0.2"
 
-tmpl@1.0.x:
+tmpl@1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
   integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==
@@ -8863,33 +7909,13 @@ to-camel-case@^1.0.0:
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
-  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
+  integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==
 
 to-no-case@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/to-no-case/-/to-no-case-1.0.2.tgz#c722907164ef6b178132c8e69930212d1b4aa16a"
   integrity sha1-xyKQcWTvaxeBMsjmmTAhLRtKoWo=
 
-to-object-path@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
-  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
-  dependencies:
-    kind-of "^3.0.2"
-
-to-readable-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771"
-  integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==
-
-to-regex-range@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
-  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
-  dependencies:
-    is-number "^3.0.0"
-    repeat-string "^1.6.1"
-
 to-regex-range@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
@@ -8897,25 +7923,6 @@ to-regex-range@^5.0.1:
   dependencies:
     is-number "^7.0.0"
 
-to-regex@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.1.tgz#15358bee4a2c83bd76377ba1dc049d0f18837aae"
-  integrity sha1-FTWL7kosg712N3uh3ASdDxiDeq4=
-  dependencies:
-    define-property "^0.2.5"
-    extend-shallow "^2.0.1"
-    regex-not "^1.0.0"
-
-to-regex@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
-  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
-  dependencies:
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    regex-not "^1.0.2"
-    safe-regex "^1.1.0"
-
 to-space-case@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/to-space-case/-/to-space-case-1.0.0.tgz#b052daafb1b2b29dc770cea0163e5ec0ebc9fc17"
@@ -8923,51 +7930,25 @@ to-space-case@^1.0.0:
   dependencies:
     to-no-case "^1.0.0"
 
-toidentifier@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
-  integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
-
-totalist@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/totalist/-/totalist-1.1.0.tgz#a4d65a3e546517701e3e5c37a47a70ac97fe56df"
-  integrity sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==
-
-tough-cookie@^2.3.3, tough-cookie@~2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
-  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
-  dependencies:
-    psl "^1.1.28"
-    punycode "^2.1.1"
-
-tough-cookie@^3.0.1:
+totalist@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz#9df4f57e739c26930a018184887f4adb7dca73b2"
-  integrity sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==
-  dependencies:
-    ip-regex "^2.1.0"
-    psl "^1.1.28"
-    punycode "^2.1.1"
-
-tough-cookie@~2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561"
-  integrity sha1-C2GKVWW23qkL80JdBNVe3EdadWE=
-  dependencies:
-    punycode "^1.4.1"
+  resolved "https://registry.yarnpkg.com/totalist/-/totalist-3.0.1.tgz#ba3a3d600c915b1a97872348f79c127475f6acf8"
+  integrity sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==
 
-tr46@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
-  integrity sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=
+tough-cookie@^4.1.2:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf"
+  integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==
   dependencies:
-    punycode "^2.1.0"
+    psl "^1.1.33"
+    punycode "^2.1.1"
+    universalify "^0.2.0"
+    url-parse "^1.5.3"
 
-tr46@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz#03273586def1595ae08fedb38d7733cee91d2479"
-  integrity sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==
+tr46@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-3.0.0.tgz#555c4e297a950617e8eeddef633c87d4d9d6cbf9"
+  integrity sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==
   dependencies:
     punycode "^2.1.1"
 
@@ -8978,29 +7959,24 @@ trim-repeated@^1.0.0:
   dependencies:
     escape-string-regexp "^1.0.2"
 
-truncate-utf8-bytes@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz#405923909592d56f78a5818434b0b78489ca5f2b"
-  integrity sha1-QFkjkJWS1W94pYGENLC3hInKXys=
-  dependencies:
-    utf8-byte-length "^1.0.1"
+ts-api-utils@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.0.3.tgz#f12c1c781d04427313dbac808f453f050e54a331"
+  integrity sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==
 
-ts-jest@^26.4.4:
-  version "26.4.4"
-  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.4.4.tgz#61f13fb21ab400853c532270e52cc0ed7e502c49"
-  integrity sha512-3lFWKbLxJm34QxyVNNCgXX1u4o/RV0myvA2y2Bxm46iGIjKlaY0own9gIckbjZJPn+WaJEnfPPJ20HHGpoq4yg==
+ts-jest@^29.1.1:
+  version "29.1.1"
+  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.1.1.tgz#f58fe62c63caf7bfcc5cc6472082f79180f0815b"
+  integrity sha512-D6xjnnbP17cC85nliwGiL+tpoKN0StpgE0TeOjXQTU6MVCfsB4v7aW05CgQ/1OywGb0x/oy9hHFnN+sczTiRaA==
   dependencies:
-    "@types/jest" "26.x"
     bs-logger "0.x"
-    buffer-from "1.x"
     fast-json-stable-stringify "2.x"
-    jest-util "^26.1.0"
-    json5 "2.x"
+    jest-util "^29.0.0"
+    json5 "^2.2.3"
     lodash.memoize "4.x"
     make-error "1.x"
-    mkdirp "1.x"
-    semver "7.x"
-    yargs-parser "20.x"
+    semver "^7.5.3"
+    yargs-parser "^21.0.1"
 
 ts-loader@^9:
   version "9.2.6"
@@ -9026,6 +8002,16 @@ ts-node@^7.0.0:
     source-map-support "^0.5.6"
     yn "^2.0.0"
 
+tsconfig-paths@^3.14.1:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a"
+  integrity sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==
+  dependencies:
+    "@types/json5" "^0.0.29"
+    json5 "^1.0.1"
+    minimist "^1.2.6"
+    strip-bom "^3.0.0"
+
 tsconfig-paths@^3.9.0:
   version "3.9.0"
   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b"
@@ -9041,15 +8027,20 @@ tslib@^1.8.1:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8"
   integrity sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ==
 
-tslib@^1.9.0:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
-  integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==
+tslib@^2.0.3, tslib@^2.6.2:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.7.0.tgz#d9b40c5c40ab59e8738f297df3087bf1a2690c01"
+  integrity sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==
 
-tslib@^2.0.3:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
-  integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
+tslib@^2.2.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf"
+  integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==
+
+tslib@^2.5.0, tslib@^2.6.0:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
+  integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
 
 tsutils@^3.21.0:
   version "3.21.0"
@@ -9058,23 +8049,6 @@ tsutils@^3.21.0:
   dependencies:
     tslib "^1.8.1"
 
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
-  dependencies:
-    safe-buffer "^5.0.1"
-
-tunnel@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"
-  integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==
-
-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
-
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
@@ -9082,13 +8056,6 @@ type-check@^0.4.0, type-check@~0.4.0:
   dependencies:
     prelude-ls "^1.2.1"
 
-type-check@~0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
-  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
-  dependencies:
-    prelude-ls "~1.1.2"
-
 type-detect@4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
@@ -9104,55 +8071,59 @@ type-fest@^0.13.1:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934"
   integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==
 
-type-fest@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
-  integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==
-
-type-fest@^0.8.1:
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
-  integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
+type-fest@^0.20.2:
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
+  integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
 
-type-is@~1.6.17, type-is@~1.6.18:
-  version "1.6.18"
-  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
-  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
+typed-array-buffer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz#18de3e7ed7974b0a729d3feecb94338d1472cd60"
+  integrity sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==
   dependencies:
-    media-typer "0.3.0"
-    mime-types "~2.1.24"
+    call-bind "^1.0.2"
+    get-intrinsic "^1.2.1"
+    is-typed-array "^1.1.10"
 
-typedarray-to-buffer@^3.1.5:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
-  integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==
+typed-array-byte-length@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz#d787a24a995711611fb2b87a4052799517b230d0"
+  integrity sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==
   dependencies:
-    is-typedarray "^1.0.0"
-
-typedarray@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
-  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    has-proto "^1.0.1"
+    is-typed-array "^1.1.10"
 
-typescript@^4.6.4:
-  version "4.6.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.4.tgz#caa78bbc3a59e6a5c510d35703f6a09877ce45e9"
-  integrity sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==
+typed-array-byte-offset@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz#cbbe89b51fdef9cd6aaf07ad4707340abbc4ea0b"
+  integrity sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==
+  dependencies:
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    has-proto "^1.0.1"
+    is-typed-array "^1.1.10"
 
-typeson-registry@^1.0.0-alpha.20:
-  version "1.0.0-alpha.21"
-  resolved "https://registry.yarnpkg.com/typeson-registry/-/typeson-registry-1.0.0-alpha.21.tgz#8a4e31abb471d482aa0306ad56d35af7633a166a"
-  integrity sha512-D7aj2KAzOaLvzCAYNhoFW536uWwbmSz5gSaO5fWETERLFheCOEIiMifGI4GDyGatxRvUJMz0ydp/ZEYYzs9iwQ==
+typed-array-length@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb"
+  integrity sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==
   dependencies:
-    base64-arraybuffer-es6 "0.3.1"
-    typeson "5.8.2"
-    uuid "3.2.1"
-    whatwg-url "6.4.0"
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    is-typed-array "^1.1.9"
 
-typeson@5.8.2, typeson@^5.8.2:
-  version "5.8.2"
-  resolved "https://registry.yarnpkg.com/typeson/-/typeson-5.8.2.tgz#cc26f45b705760a8777fba5d3c910cc3f0e8d7dd"
-  integrity sha512-AFuyvVdHdkGlVIalOrSFjylmeLeWFtKu77uDjEilP4B9+Jk0DCM1m1A4Q2s3AwROhgiFFVPI8oARaD9S61lOkg==
+typescript@^5.6.3:
+  version "5.6.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.3.tgz#5f3449e31c9d94febb17de03cc081dd56d81db5b"
+  integrity sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==
+
+uc.micro@^1.0.1, uc.micro@^1.0.5:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
+  integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
 
 unbox-primitive@^1.0.1:
   version "1.0.1"
@@ -9164,109 +8135,80 @@ unbox-primitive@^1.0.1:
     has-symbols "^1.0.2"
     which-boxed-primitive "^1.0.2"
 
-underscore@^1.12.1:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.1.tgz#0c1c6bd2df54b6b69f2314066d65b6cde6fcf9d1"
-  integrity sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==
+unbox-primitive@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"
+  integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==
+  dependencies:
+    call-bind "^1.0.2"
+    has-bigints "^1.0.2"
+    has-symbols "^1.0.3"
+    which-boxed-primitive "^1.0.2"
 
 underscore@~1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8"
   integrity sha1-izixDKze9jM3uLJOT/htRa6lKag=
 
-union-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
-  integrity sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=
-  dependencies:
-    arr-union "^3.1.0"
-    get-value "^2.0.6"
-    is-extendable "^0.1.1"
-    set-value "^0.4.3"
+undici-types@~5.26.4:
+  version "5.26.5"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
+  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
 
-unique-string@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d"
-  integrity sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==
-  dependencies:
-    crypto-random-string "^2.0.0"
+undici-types@~6.19.2:
+  version "6.19.8"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02"
+  integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==
 
 universalify@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
   integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
+universalify@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0"
+  integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==
+
 universalify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d"
   integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==
 
-unpipe@1.0.0, unpipe@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
-  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
+universalify@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
+  integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
 
-unset-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
-  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
-  dependencies:
-    has-value "^0.3.1"
-    isobject "^3.0.0"
+untildify@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b"
+  integrity sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==
 
-update-notifier@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.1.0.tgz#4866b98c3bc5b5473c020b1250583628f9a328f3"
-  integrity sha512-w3doE1qtI0/ZmgeoDoARmI5fjDoT93IfKgEGqm26dGUOh8oNpaSTsGNdYRN/SjOuo10jcJGwkEL3mroKzktkew==
-  dependencies:
-    boxen "^4.2.0"
-    chalk "^3.0.0"
-    configstore "^5.0.1"
-    has-yarn "^2.1.0"
-    import-lazy "^2.1.0"
-    is-ci "^2.0.0"
-    is-installed-globally "^0.3.1"
-    is-npm "^4.0.0"
-    is-yarn-global "^0.3.0"
-    latest-version "^5.0.0"
-    pupa "^2.0.1"
-    semver-diff "^3.1.1"
-    xdg-basedir "^4.0.0"
+update-browserslist-db@^1.0.5, update-browserslist-db@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz#7ca61c0d8650766090728046e416a8cde682859e"
+  integrity sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==
+  dependencies:
+    escalade "^3.1.2"
+    picocolors "^1.0.1"
 
 uri-js@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
-  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
+  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
   dependencies:
     punycode "^2.1.0"
 
-urix@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
-  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
-
-url-parse-lax@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
-  integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=
-  dependencies:
-    prepend-http "^2.0.0"
-
-use@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/use/-/use-2.0.2.tgz#ae28a0d72f93bf22422a18a2e379993112dec8e8"
-  integrity sha1-riig1y+TvyJCKhii43mZMRLeyOg=
+url-parse@^1.5.3:
+  version "1.5.10"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"
+  integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==
   dependencies:
-    define-property "^0.2.5"
-    isobject "^3.0.0"
-    lazy-cache "^2.0.2"
-
-utf8-byte-length@^1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61"
-  integrity sha1-9F8VDExm7uloGGUFq5P8u4rWv2E=
+    querystringify "^2.1.1"
+    requires-port "^1.0.0"
 
-util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
+util-deprecate@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
@@ -9279,46 +8221,16 @@ util-extend@^1.0.1:
 utila@~0.4:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c"
-  integrity sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=
-
-utils-merge@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
-  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
-
-uuid@3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"
-  integrity sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==
-
-uuid@^3.0.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
-  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
-
-uuid@^3.1.0, uuid@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
-  integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
-
-uuid@^8.3.0:
-  version "8.3.2"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
-  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
-
-v8-compile-cache@^2.0.3:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz#54bc3cdd43317bca91e35dcaf305b1a7237de745"
-  integrity sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==
+  integrity sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==
 
-v8-to-istanbul@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.0.0.tgz#b4fe00e35649ef7785a9b7fcebcea05f37c332fc"
-  integrity sha512-fLL2rFuQpMtm9r8hrAV2apXX/WqHJ6+IC4/eQVdMDGBUgH/YMV4Gv3duk3kjmyg6uiQWBAA9nJwue4iJUOkHeA==
+v8-to-istanbul@^9.0.1:
+  version "9.2.0"
+  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.2.0.tgz#2ed7644a245cddd83d4e087b9b33b3e62dfd10ad"
+  integrity sha512-/EH/sDgxU2eGxajKdwLCDmQ4FWq+kpi3uCmBGpw1xJtnAxEjlD8j8PEiGWpCIMIs3ciNAgH0d3TTJiUkYzyZjA==
   dependencies:
+    "@jridgewell/trace-mapping" "^0.3.12"
     "@types/istanbul-lib-coverage" "^2.0.1"
-    convert-source-map "^1.6.0"
-    source-map "^0.7.3"
+    convert-source-map "^2.0.0"
 
 validate-npm-package-license@^3.0.1:
   version "3.0.1"
@@ -9328,25 +8240,6 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "~1.0.0"
     spdx-expression-parse "~1.0.0"
 
-validator@~9.4.1:
-  version "9.4.1"
-  resolved "https://registry.yarnpkg.com/validator/-/validator-9.4.1.tgz#abf466d398b561cd243050112c6ff1de6cc12663"
-  integrity sha512-YV5KjzvRmSyJ1ee/Dm5UED0G+1L4GZnLN3w6/T+zZm8scVua4sOhYKWTUrKa0H/tMiJyO9QLHMPN+9mB/aMunA==
-
-vary@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
-  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
-
-verror@1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
-  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
-  dependencies:
-    assert-plus "^1.0.0"
-    core-util-is "1.0.2"
-    extsprintf "^1.2.0"
-
 vscode-json-languageservice@^3.7.0:
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.8.0.tgz#c7e7283f993e3db39fa5501407b023ada6fd3ae3"
@@ -9378,163 +8271,138 @@ vscode-uri@^2.1.2:
   resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-2.1.2.tgz#c8d40de93eb57af31f3c715dd650e2ca2c096f1c"
   integrity sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A==
 
-w3c-hr-time@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"
-  integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==
-  dependencies:
-    browser-process-hrtime "^1.0.0"
-
-w3c-xmlserializer@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz#3e7104a05b75146cc60f564380b7f683acf1020a"
-  integrity sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==
+w3c-xmlserializer@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz#aebdc84920d806222936e3cdce408e32488a3073"
+  integrity sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==
   dependencies:
-    xml-name-validator "^3.0.0"
+    xml-name-validator "^4.0.0"
 
-walker@^1.0.7, walker@~1.0.5:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
-  integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=
+walker@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f"
+  integrity sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==
   dependencies:
-    makeerror "1.0.x"
+    makeerror "1.0.12"
 
-watchpack@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.3.1.tgz#4200d9447b401156eeca7767ee610f8809bc9d25"
-  integrity sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==
+watchpack@^2.4.1:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.2.tgz#2feeaed67412e7c33184e5a79ca738fbd38564da"
+  integrity sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==
   dependencies:
     glob-to-regexp "^0.4.1"
     graceful-fs "^4.1.2"
 
-webidl-conversions@^4.0.1, webidl-conversions@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
-  integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
-
-webidl-conversions@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff"
-  integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==
-
-webidl-conversions@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
-  integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
+webidl-conversions@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a"
+  integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==
 
 webpack-bundle-analyzer@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.5.0.tgz#1b0eea2947e73528754a6f9af3e91b2b6e0f79d5"
-  integrity sha512-GUMZlM3SKwS8Z+CKeIFx7CVoHn3dXFcUAjT/dcZQQmfSZGvitPfMob2ipjai7ovFFqPvTqkEZ/leL4O0YOdAYQ==
+  version "4.10.2"
+  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.10.2.tgz#633af2862c213730be3dbdf40456db171b60d5bd"
+  integrity sha512-vJptkMm9pk5si4Bv922ZbKLV8UTT4zib4FPgXMhgzUny0bfDDkLXAVQs3ly3fS4/TN9ROFtb0NFrm04UXFE/Vw==
   dependencies:
+    "@discoveryjs/json-ext" "0.5.7"
     acorn "^8.0.4"
     acorn-walk "^8.0.0"
-    chalk "^4.1.0"
     commander "^7.2.0"
+    debounce "^1.2.1"
+    escape-string-regexp "^4.0.0"
     gzip-size "^6.0.0"
-    lodash "^4.17.20"
+    html-escaper "^2.0.2"
     opener "^1.5.2"
-    sirv "^1.0.7"
+    picocolors "^1.0.0"
+    sirv "^2.0.3"
     ws "^7.3.1"
 
-webpack-dev-middleware@^5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.1.tgz#aa079a8dedd7e58bfeab358a9af7dab304cee57f"
-  integrity sha512-81EujCKkyles2wphtdrnPg/QqegC/AtqNH//mQkBYSMqwFVCQrxM6ktB2O/SPlZy7LqeEfTbV3cZARGQz6umhg==
+webpack-dev-middleware@^5.3.4:
+  version "5.3.4"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz#eb7b39281cbce10e104eb2b8bf2b63fce49a3517"
+  integrity sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==
   dependencies:
     colorette "^2.0.10"
-    memfs "^3.4.1"
+    memfs "^3.4.3"
     mime-types "^2.1.31"
     range-parser "^1.2.1"
     schema-utils "^4.0.0"
 
 webpack-hot-middleware@^2.25.1:
-  version "2.25.1"
-  resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.25.1.tgz#581f59edf0781743f4ca4c200fd32c9266c6cf7c"
-  integrity sha512-Koh0KyU/RPYwel/khxbsDz9ibDivmUbrRuKSSQvW42KSDdO4w23WI3SkHpSUKHE76LrFnnM/L7JCrpBwu8AXYw==
+  version "2.26.1"
+  resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.26.1.tgz#87214f1e3f9f3acab9271fef9e6ed7b637d719c0"
+  integrity sha512-khZGfAeJx6I8K9zKohEWWYN6KDlVw2DHownoe+6Vtwj1LP9WFgegXnVMSkZ/dBEBtXFwrkkydsaPFlB7f8wU2A==
   dependencies:
     ansi-html-community "0.0.8"
     html-entities "^2.1.0"
-    querystring "^0.2.0"
     strip-ansi "^6.0.0"
 
-webpack-merge@*, webpack-merge@^5.8.0:
-  version "5.8.0"
-  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61"
-  integrity sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==
+webpack-merge@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-6.0.1.tgz#50c776868e080574725abc5869bd6e4ef0a16c6a"
+  integrity sha512-hXXvrjtx2PLYx4qruKl+kyRSLc52V+cCvMxRjmKwoA+CBbbF5GfIBtR6kCvl0fYGqTUPKB+1ktVmTHqMOzgCBg==
   dependencies:
     clone-deep "^4.0.1"
-    wildcard "^2.0.0"
+    flat "^5.0.2"
+    wildcard "^2.0.1"
 
 webpack-sources@^3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
 
-webpack@^5, webpack@^5.68.0:
-  version "5.68.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.68.0.tgz#a653a58ed44280062e47257f260117e4be90d560"
-  integrity sha512-zUcqaUO0772UuuW2bzaES2Zjlm/y3kRBQDVFVCge+s2Y8mwuUTdperGaAv65/NtRL/1zanpSJOq/MD8u61vo6g==
-  dependencies:
-    "@types/eslint-scope" "^3.7.0"
-    "@types/estree" "^0.0.50"
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/wasm-edit" "1.11.1"
-    "@webassemblyjs/wasm-parser" "1.11.1"
-    acorn "^8.4.1"
-    acorn-import-assertions "^1.7.6"
-    browserslist "^4.14.5"
+webpack@^5, webpack@^5.94.0:
+  version "5.94.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.94.0.tgz#77a6089c716e7ab90c1c67574a28da518a20970f"
+  integrity sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==
+  dependencies:
+    "@types/estree" "^1.0.5"
+    "@webassemblyjs/ast" "^1.12.1"
+    "@webassemblyjs/wasm-edit" "^1.12.1"
+    "@webassemblyjs/wasm-parser" "^1.12.1"
+    acorn "^8.7.1"
+    acorn-import-attributes "^1.9.5"
+    browserslist "^4.21.10"
     chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.8.3"
-    es-module-lexer "^0.9.0"
+    enhanced-resolve "^5.17.1"
+    es-module-lexer "^1.2.1"
     eslint-scope "5.1.1"
     events "^3.2.0"
     glob-to-regexp "^0.4.1"
-    graceful-fs "^4.2.9"
-    json-parse-better-errors "^1.0.2"
+    graceful-fs "^4.2.11"
+    json-parse-even-better-errors "^2.3.1"
     loader-runner "^4.2.0"
     mime-types "^2.1.27"
     neo-async "^2.6.2"
-    schema-utils "^3.1.0"
+    schema-utils "^3.2.0"
     tapable "^2.1.1"
-    terser-webpack-plugin "^5.1.3"
-    watchpack "^2.3.1"
+    terser-webpack-plugin "^5.3.10"
+    watchpack "^2.4.1"
     webpack-sources "^3.2.3"
 
-whatwg-encoding@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0"
-  integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==
+whatwg-encoding@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz#e7635f597fd87020858626805a2729fa7698ac53"
+  integrity sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==
   dependencies:
-    iconv-lite "0.4.24"
+    iconv-lite "0.6.3"
 
 whatwg-fetch@^0.11.1:
   version "0.11.1"
   resolved "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-0.11.1.tgz#6d3ded245fdd97cd728e0e2587b54b733949e663"
   integrity sha1-bT3tJF/dl81yjg4lh7VLczlJ5mM=
 
-whatwg-mimetype@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
-  integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
-
-whatwg-url@6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.4.0.tgz#08fdf2b9e872783a7a1f6216260a1d66cc722e08"
-  integrity sha512-Z0CVh/YE217Foyb488eo+iBv+r7eAQ0wSTyApi9n06jhcA3z6Nidg/EGvl0UFkg7kMdKxfBzzr+o9JF+cevgMg==
-  dependencies:
-    lodash.sortby "^4.7.0"
-    tr46 "^1.0.0"
-    webidl-conversions "^4.0.1"
+whatwg-mimetype@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7"
+  integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==
 
-whatwg-url@^8.0.0:
-  version "8.4.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.4.0.tgz#50fb9615b05469591d2b2bd6dfaed2942ed72837"
-  integrity sha512-vwTUFf6V4zhcPkWp/4CQPr1TW9Ml6SF4lVyaIMBdJw5i6qUUJ1QWM4Z6YYVkfka0OUIzVo/0aNtGVGk256IKWw==
+whatwg-url@^11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-11.0.0.tgz#0a849eebb5faf2119b901bb76fd795c2848d4018"
+  integrity sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==
   dependencies:
-    lodash.sortby "^4.7.0"
-    tr46 "^2.0.2"
-    webidl-conversions "^6.1.0"
+    tr46 "^3.0.0"
+    webidl-conversions "^7.0.0"
 
 which-boxed-primitive@^1.0.2:
   version "1.0.2"
@@ -9547,17 +8415,55 @@ which-boxed-primitive@^1.0.2:
     is-string "^1.0.5"
     is-symbol "^1.0.3"
 
-which-module@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
-  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
+which-builtin-type@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/which-builtin-type/-/which-builtin-type-1.1.3.tgz#b1b8443707cc58b6e9bf98d32110ff0c2cbd029b"
+  integrity sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw==
+  dependencies:
+    function.prototype.name "^1.1.5"
+    has-tostringtag "^1.0.0"
+    is-async-function "^2.0.0"
+    is-date-object "^1.0.5"
+    is-finalizationregistry "^1.0.2"
+    is-generator-function "^1.0.10"
+    is-regex "^1.1.4"
+    is-weakref "^1.0.2"
+    isarray "^2.0.5"
+    which-boxed-primitive "^1.0.2"
+    which-collection "^1.0.1"
+    which-typed-array "^1.1.9"
 
-which@^1.2.9:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
+which-collection@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.1.tgz#70eab71ebbbd2aefaf32f917082fc62cdcb70906"
+  integrity sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==
   dependencies:
-    isexe "^2.0.0"
+    is-map "^2.0.1"
+    is-set "^2.0.1"
+    is-weakmap "^2.0.1"
+    is-weakset "^2.0.1"
+
+which-typed-array@^1.1.11:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.11.tgz#99d691f23c72aab6768680805a271b69761ed61a"
+  integrity sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==
+  dependencies:
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    gopd "^1.0.1"
+    has-tostringtag "^1.0.0"
+
+which-typed-array@^1.1.9:
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.13.tgz#870cd5be06ddb616f504e7b039c4c24898184d36"
+  integrity sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==
+  dependencies:
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.4"
+    for-each "^0.3.3"
+    gopd "^1.0.1"
+    has-tostringtag "^1.0.0"
 
 which@^2.0.1, which@^2.0.2:
   version "2.0.2"
@@ -9566,33 +8472,16 @@ which@^2.0.1, which@^2.0.2:
   dependencies:
     isexe "^2.0.0"
 
-widest-line@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca"
-  integrity sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==
-  dependencies:
-    string-width "^4.0.0"
-
-wildcard@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec"
-  integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==
+wildcard@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67"
+  integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==
 
 window-location-origin@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/window-location-origin/-/window-location-origin-0.1.0.tgz#e0a0b3cbe8802c4966b358f859315355d3a15e04"
   integrity sha1-4KCzy+iALElms1j4WTFTVdOhXgQ=
 
-word-wrap@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
-
-wordwrap@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
-  integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
-
 worker-farm@^1.3.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.5.1.tgz#8e9f4a7da4f3c595aa600903051b969390423fa1"
@@ -9601,156 +8490,99 @@ worker-farm@^1.3.1:
     errno "^0.1.4"
     xtend "^4.0.1"
 
-wrap-ansi@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
-  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
   dependencies:
     ansi-styles "^4.0.0"
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
+  integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==
+  dependencies:
+    ansi-styles "^6.1.0"
+    string-width "^5.0.1"
+    strip-ansi "^7.0.1"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
-write-file-atomic@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
-  integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
+write-file-atomic@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd"
+  integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==
   dependencies:
     imurmurhash "^0.1.4"
-    is-typedarray "^1.0.0"
-    signal-exit "^3.0.2"
-    typedarray-to-buffer "^3.1.5"
-
-write@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
-  integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==
-  dependencies:
-    mkdirp "^0.5.1"
-
-ws@^7.2.3:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.3.1.tgz#d0547bf67f7ce4f12a72dfe31262c68d7dc551c8"
-  integrity sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==
+    signal-exit "^3.0.7"
 
 ws@^7.3.1:
-  version "7.5.7"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67"
-  integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==
-
-xdg-basedir@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13"
-  integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==
-
-xml-name-validator@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
-  integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
+  version "7.5.10"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9"
+  integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==
 
-xml2js@0.2.8:
-  version "0.2.8"
-  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.2.8.tgz#9b81690931631ff09d1957549faf54f4f980b3c2"
-  integrity sha1-m4FpCTFjH/CdGVdUn69U9PmAs8I=
-  dependencies:
-    sax "0.5.x"
+ws@^8.11.0:
+  version "8.17.1"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b"
+  integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==
 
-xml2js@^0.4.16:
-  version "0.4.19"
-  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7"
-  integrity sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==
-  dependencies:
-    sax ">=0.6.0"
-    xmlbuilder "~9.0.1"
+xml-name-validator@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz#79a006e2e63149a8600f15430f0a4725d1524835"
+  integrity sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==
 
-xmlbuilder@>=11.0.1:
+xmlbuilder@>=11.0.1, xmlbuilder@^15.1.1:
   version "15.1.1"
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz#9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5"
   integrity sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==
 
-xmlbuilder@^9.0.7:
-  version "9.0.7"
-  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
-  integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=
-
-xmlbuilder@~9.0.1:
-  version "9.0.4"
-  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.4.tgz#519cb4ca686d005a8420d3496f3f0caeecca580f"
-  integrity sha1-UZy0ymhtAFqEINNJbz8MruzKWA8=
-
 xmlchars@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
   integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
 
-xmldom@0.1.x:
-  version "0.1.27"
-  resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
-  integrity sha1-1QH5ezvbQDr4757MIFcxh6rawOk=
-
 xtend@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
   integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
 
-y18n@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4"
-  integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==
-
-yallist@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
-  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
+y18n@^5.0.5:
+  version "5.0.8"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
+  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
 
 yallist@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
-  integrity sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
+  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
 
 yallist@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
-yargs-parser@20.x:
-  version "20.2.4"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
-  integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
+yargs-parser@^21.0.1, yargs-parser@^21.1.1:
+  version "21.1.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
+  integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
 
-yargs-parser@^18.1.2:
-  version "18.1.3"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
-  integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
+yargs@^17.3.1:
+  version "17.7.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
+  integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
   dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
-yargs-parser@^19.0.1:
-  version "19.0.4"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-19.0.4.tgz#99183a3a59268b205c6b04177f2a5bfb46e79ba7"
-  integrity sha512-eXeQm7yXRjPFFyf1voPkZgXQZJjYfjgQUmGPbD2TLtZeIYzvacgWX7sQ5a1HsRgVP+pfKAkRZDNtTGev4h9vhw==
-
-yargs@^15.3.1, yargs@^15.4.1:
-  version "15.4.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
-  integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
-  dependencies:
-    cliui "^6.0.0"
-    decamelize "^1.2.0"
-    find-up "^4.1.0"
-    get-caller-file "^2.0.1"
+    cliui "^8.0.1"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
     require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^4.2.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^18.1.2"
+    string-width "^4.2.3"
+    y18n "^5.0.5"
+    yargs-parser "^21.1.1"
 
 yauzl@^2.10.0:
   version "2.10.0"
@@ -9764,3 +8596,8 @@ yn@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a"
   integrity sha1-5a2ryKz0CPY4X8dklWhMiOavaJo=
+
+yocto-queue@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
+  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==